diff --git a/com.discord/AndroidManifest.xml b/com.discord/AndroidManifest.xml
index 27defdbd92..ab43c52d76 100644
--- a/com.discord/AndroidManifest.xml
+++ b/com.discord/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.discord" platformBuildVersionCode="28" platformBuildVersionName="9">
+<?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="29" platformBuildVersionName="10">
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
     <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
@@ -69,7 +69,7 @@
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:host="discordapp.com" android:pathPattern="/oauth2/authorize" android:scheme="https"/>
+                <data android:host="action" android:pathPattern="/oauth2/authorize" android:scheme="discord"/>
             </intent-filter>
         </activity>
         <service android:name="com.discord.utilities.fcm.NotificationClient$FCMMessagingService">
diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index 3f4fd24262..8797c1725d 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-950.apk
+apkFileName: com.discord-963.apk
 compressionType: false
 doNotCompress:
 - arsc
@@ -140,7 +140,7 @@ packageInfo:
   renameManifestPackage: null
 sdkInfo:
   minSdkVersion: '16'
-  targetSdkVersion: '28'
+  targetSdkVersion: '29'
 sharedLibrary: false
 sparseResources: false
 unknownFiles:
@@ -308,5 +308,5 @@ usesFramework:
   tag: null
 version: 2.4.1-1b91ce-SNAPSHOT
 versionInfo:
-  versionCode: '950'
-  versionName: 9.5.0
+  versionCode: '963'
+  versionName: 9.6.3
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index f47506839e..5863cd1662 100644
--- a/com.discord/assets/crashlytics-build.properties
+++ b/com.discord/assets/crashlytics-build.properties
@@ -3,9 +3,9 @@
 #
 #Do NOT modify, delete, or commit to source control!
 #
-#Fri Aug 30 23:31:58 UTC 2019
-version_name=9.5.0
+#Mon Sep 30 23:00:18 UTC 2019
+version_name=9.6.3
 package_name=com.discord
-build_id=2c940f48-a910-41c7-b7da-a69531b314cc
-version_code=950
+build_id=840df02b-cf80-4d6b-a87d-a2661a9d07da
+version_code=963
 app_name=com.discord
diff --git a/com.discord/assets/images/default_group.png b/com.discord/assets/images/default_group.png
deleted file mode 100644
index 9a39999990..0000000000
Binary files a/com.discord/assets/images/default_group.png and /dev/null differ
diff --git a/com.discord/assets/images/group_dm_icon_0.png b/com.discord/assets/images/group_dm_icon_0.png
new file mode 100644
index 0000000000..12f1daf520
Binary files /dev/null and b/com.discord/assets/images/group_dm_icon_0.png differ
diff --git a/com.discord/assets/images/group_dm_icon_1.png b/com.discord/assets/images/group_dm_icon_1.png
new file mode 100644
index 0000000000..4256898a73
Binary files /dev/null and b/com.discord/assets/images/group_dm_icon_1.png differ
diff --git a/com.discord/assets/images/group_dm_icon_2.png b/com.discord/assets/images/group_dm_icon_2.png
new file mode 100644
index 0000000000..295e9c9867
Binary files /dev/null and b/com.discord/assets/images/group_dm_icon_2.png differ
diff --git a/com.discord/assets/images/group_dm_icon_3.png b/com.discord/assets/images/group_dm_icon_3.png
new file mode 100644
index 0000000000..90416f77aa
Binary files /dev/null and b/com.discord/assets/images/group_dm_icon_3.png differ
diff --git a/com.discord/assets/images/group_dm_icon_4.png b/com.discord/assets/images/group_dm_icon_4.png
new file mode 100644
index 0000000000..9613265d7d
Binary files /dev/null and b/com.discord/assets/images/group_dm_icon_4.png differ
diff --git a/com.discord/assets/images/group_dm_icon_5.png b/com.discord/assets/images/group_dm_icon_5.png
new file mode 100644
index 0000000000..5c8a397ddd
Binary files /dev/null and b/com.discord/assets/images/group_dm_icon_5.png differ
diff --git a/com.discord/assets/images/group_dm_icon_6.png b/com.discord/assets/images/group_dm_icon_6.png
new file mode 100644
index 0000000000..92c1f8f74e
Binary files /dev/null and b/com.discord/assets/images/group_dm_icon_6.png differ
diff --git a/com.discord/assets/images/group_dm_icon_7.png b/com.discord/assets/images/group_dm_icon_7.png
new file mode 100644
index 0000000000..bccb9e670a
Binary files /dev/null and b/com.discord/assets/images/group_dm_icon_7.png differ
diff --git a/com.discord/lib/arm64-v8a/libdiscord.so b/com.discord/lib/arm64-v8a/libdiscord.so
index eac3e91901..1688e0841f 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 20d36e733b..cd1703b974 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 abe1c2772d..9eea5de4f5 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 0e6ad0a270..d57d2c91ff 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 d75d3b6e1a..181f71562a 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/color/rich_presence_spotify_play_button.xml b/com.discord/res/color/rich_presence_spotify_play_button.xml
deleted file mode 100644
index 82b87fd18f..0000000000
--- a/com.discord/res/color/rich_presence_spotify_play_button.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:drawable="@color/primary_300" />
-    <item android:state_enabled="true" android:drawable="@color/spotify" />
-</selector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_happy_color.xml b/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_happy_color.xml
new file mode 100644
index 0000000000..f1f505718e
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_happy_color.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="48.0dip" android:width="48.0dip" android:viewportWidth="48.0" android:viewportHeight="48.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffd836" android:pathData="M48,24A24,24 0,1 1,24 0a24,24 0,0 1,24 24z" />
+    <path android:fillColor="#ffa63a0c" android:pathData="M14.225,11.73L14.225,11.73A2.825,2.83 0,0 1,17.05 14.56L17.05,17.5A2.825,2.83 0,0 1,14.225 20.33L14.225,20.33A2.825,2.83 0,0 1,11.4 17.5L11.4,14.56A2.825,2.83 0,0 1,14.225 11.73z" />
+    <path android:fillColor="#ffa63a0c" android:pathData="M33.775,11.73L33.775,11.73A2.825,2.83 0,0 1,36.6 14.56L36.6,17.5A2.825,2.83 0,0 1,33.775 20.33L33.775,20.33A2.825,2.83 0,0 1,30.95 17.5L30.95,14.56A2.825,2.83 0,0 1,33.775 11.73z" />
+    <path android:fillColor="#ff36393f" android:pathData="M14.22,25.37h19.56v2.27A9.78,9.78 0,0 1,24 37.42a9.78,9.78 0,0 1,-9.78 -9.78v-2.27z" />
+    <path android:fillColor="#ffde420d" android:pathData="M24,37.42a9.78,9.78 0,0 0,9.38 -7,18.91 18.91,0 0,0 -18.76,0 9.78,9.78 0,0 0,9.38 7z" />
+    <path android:fillColor="#ffd8e7ff" android:pathData="M43.06,5.26l0.68,2a0.51,0.51 0,0 0,1 0l0.68,-1.95a0.54,0.54 0,0 1,0.31 -0.32l2,-0.68a0.52,0.52 0,0 0,0 -1l-2,-0.68a0.53,0.53 0,0 1,-0.31 -0.31l-0.68,-2a0.52,0.52 0,0 0,-1 0l-0.68,2a0.54,0.54 0,0 1,-0.32 0.31l-2,0.68a0.51,0.51 0,0 0,0 1l2,0.68a0.56,0.56 0,0 1,0.32 0.27z" />
+    <path android:fillColor="#ffd8e7ff" android:pathData="M3.885,40.23L3.885,40.23A0.705,0.71 0,0 1,4.59 40.94L4.59,41.64A0.705,0.71 0,0 1,3.885 42.35L3.885,42.35A0.705,0.71 0,0 1,3.18 41.64L3.18,40.94A0.705,0.71 0,0 1,3.885 40.23z" />
+    <path android:fillColor="#ffd8e7ff" android:pathData="M3.885,45.88L3.885,45.88A0.705,0.71 0,0 1,4.59 46.59L4.59,47.29A0.705,0.71 0,0 1,3.885 48L3.885,48A0.705,0.71 0,0 1,3.18 47.29L3.18,46.59A0.705,0.71 0,0 1,3.885 45.88z" />
+    <path android:fillColor="#ffd8e7ff" android:pathData="M7.76,44.115L7.76,44.115A0.705,0.71 90,0 1,7.05 44.82L6.35,44.82A0.705,0.71 90,0 1,5.64 44.115L5.64,44.115A0.705,0.71 90,0 1,6.35 43.41L7.05,43.41A0.705,0.71 90,0 1,7.76 44.115z" />
+    <path android:fillColor="#ffd8e7ff" android:pathData="M2.12,44.115L2.12,44.115A0.705,0.71 90,0 1,1.41 44.82L0.71,44.82A0.705,0.71 90,0 1,-0 44.115L-0,44.115A0.705,0.71 90,0 1,0.71 43.41L1.41,43.41A0.705,0.71 90,0 1,2.12 44.115z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_happy_grayscale.xml b/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_happy_grayscale.xml
new file mode 100644
index 0000000000..6c9eb00b71
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_happy_grayscale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="48.0dip" android:width="48.0dip" android:viewportWidth="48.0" android:viewportHeight="48.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff72767d" android:pathData="M48,24A24,24 0,1 1,24 0a24,24 0,0 1,24 24z" />
+    <path android:fillColor="#ff484c54" android:pathData="M14.225,11.73L14.225,11.73A2.825,2.83 0,0 1,17.05 14.56L17.05,17.5A2.825,2.83 0,0 1,14.225 20.33L14.225,20.33A2.825,2.83 0,0 1,11.4 17.5L11.4,14.56A2.825,2.83 0,0 1,14.225 11.73z" />
+    <path android:fillColor="#ff484c54" android:pathData="M33.775,11.73L33.775,11.73A2.825,2.83 0,0 1,36.6 14.56L36.6,17.5A2.825,2.83 0,0 1,33.775 20.33L33.775,20.33A2.825,2.83 0,0 1,30.95 17.5L30.95,14.56A2.825,2.83 0,0 1,33.775 11.73z" />
+    <path android:fillColor="#ff36393f" android:pathData="M14.22,25.37h19.56v2.27A9.78,9.78 0,0 1,24 37.42a9.78,9.78 0,0 1,-9.78 -9.78v-2.27z" />
+    <path android:fillColor="#ff484c54" android:pathData="M24,37.42a9.78,9.78 0,0 0,9.38 -7,18.91 18.91,0 0,0 -18.76,0 9.78,9.78 0,0 0,9.38 7z" />
+    <path android:fillColor="#ff8b8f94" android:pathData="M43.06,5.26l0.68,2a0.51,0.51 0,0 0,1 0l0.68,-1.95a0.54,0.54 0,0 1,0.31 -0.32l2,-0.68a0.52,0.52 0,0 0,0 -1l-2,-0.68a0.53,0.53 0,0 1,-0.31 -0.31l-0.68,-2a0.52,0.52 0,0 0,-1 0l-0.68,2a0.54,0.54 0,0 1,-0.32 0.31l-2,0.68a0.51,0.51 0,0 0,0 1l2,0.68a0.56,0.56 0,0 1,0.32 0.27z" />
+    <path android:fillColor="#ff8b8f94" android:pathData="M3.885,40.23L3.885,40.23A0.705,0.71 0,0 1,4.59 40.94L4.59,41.64A0.705,0.71 0,0 1,3.885 42.35L3.885,42.35A0.705,0.71 0,0 1,3.18 41.64L3.18,40.94A0.705,0.71 0,0 1,3.885 40.23z" />
+    <path android:fillColor="#ff8b8f94" android:pathData="M3.885,45.88L3.885,45.88A0.705,0.71 0,0 1,4.59 46.59L4.59,47.29A0.705,0.71 0,0 1,3.885 48L3.885,48A0.705,0.71 0,0 1,3.18 47.29L3.18,46.59A0.705,0.71 0,0 1,3.885 45.88z" />
+    <path android:fillColor="#ff8b8f94" android:pathData="M7.76,44.115L7.76,44.115A0.705,0.71 90,0 1,7.05 44.82L6.35,44.82A0.705,0.71 90,0 1,5.64 44.115L5.64,44.115A0.705,0.71 90,0 1,6.35 43.41L7.05,43.41A0.705,0.71 90,0 1,7.76 44.115z" />
+    <path android:fillColor="#ff8b8f94" android:pathData="M2.12,44.115L2.12,44.115A0.705,0.71 90,0 1,1.41 44.82L0.71,44.82A0.705,0.71 90,0 1,-0 44.115L-0,44.115A0.705,0.71 90,0 1,0.71 43.41L1.41,43.41A0.705,0.71 90,0 1,2.12 44.115z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_neutral_color.xml b/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_neutral_color.xml
new file mode 100644
index 0000000000..546b2767c3
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_neutral_color.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="48.0dip" android:width="48.0dip" android:viewportWidth="48.0" android:viewportHeight="48.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffd836" android:pathData="M48,24A24,24 0,1 1,24 0a24,24 0,0 1,24 24z" />
+    <path android:fillColor="#ff36393f" android:pathData="M21.4496,33.3714L30.1255,31.5258A1.52,1.52 122.99,0 1,31.9285 32.6962L31.9285,32.6962A1.52,1.52 122.99,0 1,30.758 34.4992L22.0822,36.3449A1.52,1.52 122.99,0 1,20.2792 35.1745L20.2792,35.1745A1.52,1.52 122.99,0 1,21.4496 33.3714z" />
+    <path android:fillColor="#ffa63a0c" android:pathData="M14.285,18.23L14.285,18.23A2.435,2.44 0,0 1,16.72 20.67L16.72,22.69A2.435,2.44 0,0 1,14.285 25.13L14.285,25.13A2.435,2.44 0,0 1,11.85 22.69L11.85,20.67A2.435,2.44 0,0 1,14.285 18.23z" />
+    <path android:fillColor="#ffa63a0c" android:pathData="M33.705,18.23L33.705,18.23A2.435,2.44 0,0 1,36.14 20.67L36.14,22.69A2.435,2.44 0,0 1,33.705 25.13L33.705,25.13A2.435,2.44 0,0 1,31.27 22.69L31.27,20.67A2.435,2.44 0,0 1,33.705 18.23z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_neutral_grayscale.xml b/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_neutral_grayscale.xml
new file mode 100644
index 0000000000..ed816a9bd4
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_neutral_grayscale.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="48.0dip" android:width="48.0dip" android:viewportWidth="48.0" android:viewportHeight="48.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff72767d" android:pathData="M48,24A24,24 0,1 1,24 0a24,24 0,0 1,24 24z" />
+    <path android:fillColor="#ff36393f" android:pathData="M21.4496,33.3714L30.1255,31.5258A1.52,1.52 122.99,0 1,31.9285 32.6962L31.9285,32.6962A1.52,1.52 122.99,0 1,30.758 34.4992L22.0822,36.3449A1.52,1.52 122.99,0 1,20.2792 35.1745L20.2792,35.1745A1.52,1.52 122.99,0 1,21.4496 33.3714z" />
+    <path android:fillColor="#ff484c54" android:pathData="M14.285,18.23L14.285,18.23A2.435,2.44 0,0 1,16.72 20.67L16.72,22.69A2.435,2.44 0,0 1,14.285 25.13L14.285,25.13A2.435,2.44 0,0 1,11.85 22.69L11.85,20.67A2.435,2.44 0,0 1,14.285 18.23z" />
+    <path android:fillColor="#ff484c54" android:pathData="M33.705,18.23L33.705,18.23A2.435,2.44 0,0 1,36.14 20.67L36.14,22.69A2.435,2.44 0,0 1,33.705 25.13L33.705,25.13A2.435,2.44 0,0 1,31.27 22.69L31.27,20.67A2.435,2.44 0,0 1,33.705 18.23z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_sad_color.xml b/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_sad_color.xml
new file mode 100644
index 0000000000..1c81dcfb6a
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_sad_color.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="48.0dip" android:width="48.0dip" android:viewportWidth="48.0" android:viewportHeight="48.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffd836" android:pathData="M48,24A24,24 0,1 1,24 0a24,24 0,0 1,24 24z" />
+    <path android:fillColor="#ff36393f" android:pathData="M29.93,39.35a15.22,15.22 0,0 0,-11.87 0,5.95 5.95,0 0,1 10.15,-3.85 5.83,5.83 0,0 1,1.72 3.85z" />
+    <path android:fillColor="#ffa63a0c" android:pathData="M30.38,26.94L37.04,26.94A1.15,1.145 0,0 1,38.19 28.085L38.19,28.085A1.15,1.145 0,0 1,37.04 29.23L30.38,29.23A1.15,1.145 0,0 1,29.23 28.085L29.23,28.085A1.15,1.145 0,0 1,30.38 26.94z" />
+    <path android:fillColor="#ffa63a0c" android:pathData="M10.96,26.94L17.62,26.94A1.15,1.145 0,0 1,18.77 28.085L18.77,28.085A1.15,1.145 0,0 1,17.62 29.23L10.96,29.23A1.15,1.145 0,0 1,9.81 28.085L9.81,28.085A1.15,1.145 0,0 1,10.96 26.94z" />
+    <path android:fillColor="#ffffffff" android:pathData="M9,9.39l-2.52,5A2.82,2.82 0,0 0,9 18.49a2.81,2.81 0,0 0,2.51 -4.07z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_sad_grayscale.xml b/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_sad_grayscale.xml
new file mode 100644
index 0000000000..ee055a45cf
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_sad_grayscale.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="48.0dip" android:width="48.0dip" android:viewportWidth="48.0" android:viewportHeight="48.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff72767d" android:pathData="M48,24A24,24 0,1 1,24 0a24,24 0,0 1,24 24z" />
+    <path android:fillColor="#ff36393f" android:pathData="M29.93,39.35a15.22,15.22 0,0 0,-11.87 0,5.95 5.95,0 0,1 10.15,-3.85 5.83,5.83 0,0 1,1.72 3.85z" />
+    <path android:fillColor="#ff484c54" android:pathData="M30.38,26.94L37.04,26.94A1.15,1.145 0,0 1,38.19 28.085L38.19,28.085A1.15,1.145 0,0 1,37.04 29.23L30.38,29.23A1.15,1.145 0,0 1,29.23 28.085L29.23,28.085A1.15,1.145 0,0 1,30.38 26.94z" />
+    <path android:fillColor="#ff484c54" android:pathData="M10.96,26.94L17.62,26.94A1.15,1.145 0,0 1,18.77 28.085L18.77,28.085A1.15,1.145 0,0 1,17.62 29.23L10.96,29.23A1.15,1.145 0,0 1,9.81 28.085L9.81,28.085A1.15,1.145 0,0 1,10.96 26.94z" />
+    <path android:fillColor="#ff8b8f94" android:pathData="M9,9.39l-2.52,5A2.82,2.82 0,0 0,9 18.49a2.81,2.81 0,0 0,2.51 -4.07z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_chevron_down_white_12dp.xml b/com.discord/res/drawable-anydpi-v21/ic_chevron_down_white_12dp.xml
new file mode 100644
index 0000000000..722d803835
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_chevron_down_white_12dp.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="12.0" android:viewportHeight="12.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M3.705,4l2.295,2.29l2.295,-2.29l0.705,0.705l-3,3l-3,-3z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_no_stream.xml b/com.discord/res/drawable-anydpi-v21/ic_no_stream.xml
new file mode 100644
index 0000000000..64157a9907
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_no_stream.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="119.0dip" android:width="311.0dip" android:viewportWidth="311.0" android:viewportHeight="119.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffaec7ff" android:pathData="M44.911,117.5H0V110.6C0,99.6 8.942,90.6 19.872,90.6H23.847C26.033,90.6 27.821,88.8 27.821,86.6V62.1C27.821,45.5 41.136,32.1 57.629,32.1H110.191C115.259,32.1 119.333,28 119.333,22.9V22.5C119.333,11.4 128.275,2.5 139.205,2.5C155.301,2.5 177.757,2.5 193.853,2.5C204.783,2.5 213.726,11.5 213.726,22.5V62.5H256.351C286.557,62.5 311,87.1 311,117.5H44.911Z" android:strokeAlpha="0.2" android:fillAlpha="0.2" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M148.048,117.5H179.843V22.5H154.01C150.731,22.5 148.048,25.2 148.048,28.5V117.5Z" />
+    <path android:fillColor="#ff202225" android:pathData="M166.927,69.5H57.629V111.5C57.629,114.8 60.312,117.5 63.591,117.5H160.965C164.244,117.5 166.927,114.8 166.927,111.5V69.5Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M166.927,55.5H57.629V69.5H166.927V55.5Z" />
+    <path android:fillColor="#ff7196ff" android:pathData="M155.003,79.5H69.553V83.5H155.003V79.5Z" />
+    <path android:fillColor="#ff7196ff" android:pathData="M155.003,90.5H69.553V94.5H155.003V90.5Z" />
+    <path android:fillColor="#ff7196ff" android:pathData="M155.003,101.5H69.553V105.5H155.003V101.5Z" />
+    <path android:fillColor="#ffaec7ff" android:pathData="M166.927,41.5H57.629V55.5H166.927V41.5Z" />
+    <path android:fillColor="#ffaec7ff" android:pathData="M87.438,55.5L77.502,69.5H97.374L107.31,55.5H87.438Z" />
+    <path android:fillColor="#ffaec7ff" android:pathData="M127.182,55.5L117.246,69.5H137.118L147.054,55.5H127.182Z" />
+    <path android:fillColor="#ffaec7ff" android:pathData="M156.99,69.5H166.926V55.5L156.99,69.5Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M156.99,41.5L166.926,55.5V41.5H156.99Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M137.118,41.5H117.246L127.182,55.5H147.054L137.118,41.5Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M97.374,41.5H77.502L87.438,55.5H107.31L97.374,41.5Z" />
+    <path android:fillColor="#ffffd836" android:pathData="M58.623,63.5C63.013,63.5 66.572,59.918 66.572,55.5C66.572,51.082 63.013,47.5 58.623,47.5C54.233,47.5 50.674,51.082 50.674,55.5C50.674,59.918 54.233,63.5 58.623,63.5Z" />
+    <path android:fillColor="#ffff9a15" android:pathData="M58.623,59.5C60.818,59.5 62.597,57.709 62.597,55.5C62.597,53.291 60.818,51.5 58.623,51.5C56.428,51.5 54.649,53.291 54.649,55.5C54.649,57.709 56.428,59.5 58.623,59.5Z" />
+    <path android:fillColor="#ff7196ff" android:pathData="M267.281,117.5H179.844V22.5H261.32C264.598,22.5 267.281,25.2 267.281,28.5V117.5Z" />
+    <path android:fillColor="#ffff9a15" android:pathData="M198.424,88.5C192.959,88.5 188.488,93 188.488,98.5C188.488,104 192.959,108.5 198.424,108.5H203.69V88.5H198.424Z" />
+    <path android:fillColor="#ffffd836" android:pathData="M203.69,108.5C209.178,108.5 213.626,104.023 213.626,98.5C213.626,92.977 209.178,88.5 203.69,88.5C198.203,88.5 193.754,92.977 193.754,98.5C193.754,104.023 198.203,108.5 203.69,108.5Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M202.299,97.1C201.802,97.6 200.908,97.6 200.411,97.1L198.523,95.2C198.027,94.7 198.027,93.8 198.523,93.3C199.02,92.8 199.914,92.8 200.411,93.3L202.299,95.2C202.796,95.7 202.796,96.6 202.299,97.1Z" />
+    <path android:fillColor="#ffff9a15" android:pathData="M228.232,88.5C222.768,88.5 218.296,93 218.296,98.5C218.296,104 222.768,108.5 228.232,108.5H233.498V88.5H228.232Z" />
+    <path android:fillColor="#ffffd836" android:pathData="M233.498,108.5C238.986,108.5 243.435,104.023 243.435,98.5C243.435,92.977 238.986,88.5 233.498,88.5C228.011,88.5 223.562,92.977 223.562,98.5C223.562,104.023 228.011,108.5 233.498,108.5Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M233.498,100.5C234.194,100.5 234.79,101.1 234.79,101.8V104.5C234.79,105.2 234.194,105.8 233.498,105.8C232.803,105.8 232.207,105.2 232.207,104.5V101.8C232.207,101.1 232.803,100.5 233.498,100.5Z" />
+    <path android:fillColor="#ffff9a15" android:pathData="M258.041,88.5C252.576,88.5 248.104,93 248.104,98.5C248.104,104 252.576,108.5 258.041,108.5H263.307V88.5H258.041Z" />
+    <path android:fillColor="#ffffd836" android:pathData="M263.307,108.5C268.794,108.5 273.243,104.023 273.243,98.5C273.243,92.977 268.794,88.5 263.307,88.5C257.819,88.5 253.371,92.977 253.371,98.5C253.371,104.023 257.819,108.5 263.307,108.5Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M265.294,98.5C265.294,97.8 265.89,97.2 266.586,97.2H269.268C269.964,97.2 270.56,97.8 270.56,98.5C270.56,99.2 269.964,99.8 269.268,99.8H266.586C265.89,99.8 265.294,99.2 265.294,98.5Z" />
+    <path android:fillColor="#ffaec7ff" android:pathData="M131.057,20L129.765,22.6C129.467,23.2 130.064,23.9 130.759,23.6L133.342,22.3C133.541,22.2 133.74,22.2 133.939,22.3L136.522,23.6C137.118,23.9 137.814,23.3 137.516,22.6L136.224,20C136.125,19.8 136.125,19.6 136.224,19.4L137.516,16.8C137.814,16.2 137.218,15.5 136.522,15.8L133.939,17.1C133.74,17.2 133.541,17.2 133.342,17.1L130.759,15.8C130.163,15.5 129.467,16.1 129.765,16.8L131.057,19.4C131.156,19.5 131.156,19.8 131.057,20Z" />
+    <path android:fillColor="#ff7196ff" android:pathData="M290.631,54C290.035,54 289.637,53.6 289.637,53V52C289.637,51.4 290.035,51 290.631,51C291.227,51 291.625,51.4 291.625,52V53C291.625,53.5 291.128,54 290.631,54Z" />
+    <path android:fillColor="#ff7196ff" android:pathData="M290.631,62C290.035,62 289.637,61.6 289.637,61V60C289.637,59.4 290.035,59 290.631,59C291.227,59 291.625,59.4 291.625,60V61C291.625,61.5 291.128,62 290.631,62Z" />
+    <path android:fillColor="#ff7196ff" android:pathData="M293.115,56.5C293.115,55.9 293.512,55.5 294.109,55.5H295.102C295.698,55.5 296.096,55.9 296.096,56.5C296.096,57.1 295.698,57.5 295.102,57.5H294.109C293.512,57.5 293.115,57 293.115,56.5Z" />
+    <path android:fillColor="#ff7196ff" android:pathData="M285.166,56.5C285.166,55.9 285.564,55.5 286.16,55.5H287.153C287.75,55.5 288.147,55.9 288.147,56.5C288.147,57.1 287.75,57.5 287.153,57.5H286.16C285.564,57.5 285.166,57 285.166,56.5Z" />
+    <path android:fillColor="#ffd4e4ff" android:pathData="M99.858,3C99.262,3 98.864,2.6 98.864,2V1C98.864,0.4 99.262,0 99.858,0C100.454,0 100.851,0.4 100.851,1V2C100.851,2.6 100.454,3 99.858,3Z" />
+    <path android:fillColor="#ffd4e4ff" android:pathData="M99.858,11C99.262,11 98.864,10.6 98.864,10V9C98.864,8.4 99.262,8 99.858,8C100.454,8 100.851,8.4 100.851,9V10C100.851,10.6 100.454,11 99.858,11Z" />
+    <path android:fillColor="#ffd4e4ff" android:pathData="M102.342,5.5C102.342,4.9 102.739,4.5 103.335,4.5H104.329C104.925,4.5 105.323,4.9 105.323,5.5C105.323,6.1 104.925,6.5 104.329,6.5H103.335C102.739,6.5 102.342,6.1 102.342,5.5Z" />
+    <path android:fillColor="#ffd4e4ff" android:pathData="M94.393,5.5C94.393,4.9 94.79,4.5 95.387,4.5H96.38C96.976,4.5 97.374,4.9 97.374,5.5C97.374,6.1 96.976,6.5 96.38,6.5H95.387C94.79,6.5 94.393,6.1 94.393,5.5Z" />
+    <path android:fillColor="#ff202225" android:pathData="M51.966,96.6C51.966,94.7 50.575,92.9 48.687,92.6C46.302,92.2 44.216,94.1 44.216,96.4C44.216,98.5 43.818,100.7 42.725,102.5C42.228,103.4 41.93,104.5 41.93,105.6C42.03,108.8 44.613,111.4 47.693,111.6C51.171,111.8 54.052,109 54.052,105.5C54.052,104.4 53.754,103.4 53.257,102.6C52.463,100.8 51.966,98.7 51.966,96.6Z" />
+    <path android:fillColor="#ff202225" android:pathData="M45.507,118.9C45.011,118.9 44.613,118.5 44.613,118V107C44.613,106.5 45.011,106.1 45.507,106.1C46.004,106.1 46.402,106.5 46.402,107V118C46.302,118.5 45.905,118.9 45.507,118.9Z" />
+    <path android:fillColor="#ff202225" android:pathData="M50.773,118.9C50.277,118.9 49.879,118.5 49.879,118V107C49.879,106.5 50.277,106.1 50.773,106.1C51.27,106.1 51.668,106.5 51.668,107V118C51.668,118.5 51.27,118.9 50.773,118.9Z" />
+    <path android:fillColor="#ff202225" android:pathData="M53.357,104.5C50.277,104.5 48.091,101.6 47.991,101.4C47.693,101 47.793,100.3 48.19,100C48.588,99.7 49.283,99.8 49.581,100.2C49.581,100.2 51.27,102.5 53.357,102.5C54.549,102.5 55.742,101.7 56.834,100.2C57.132,99.8 57.828,99.7 58.225,100C58.623,100.3 58.722,101 58.424,101.4C56.934,103.5 55.245,104.5 53.357,104.5Z" />
+    <path android:fillColor="#ff202225" android:pathData="M294.208,98.5C295.102,96.8 294.705,94.6 293.115,93.5C291.128,92.1 288.445,92.7 287.352,94.8C286.359,96.7 284.967,98.4 283.179,99.5C282.285,100.1 281.589,100.9 281.092,101.9C279.701,104.7 280.695,108.3 283.477,109.9C286.458,111.7 290.333,110.5 291.923,107.5C292.42,106.6 292.618,105.5 292.618,104.5C292.618,102.4 293.214,100.3 294.208,98.5Z" />
+    <path android:fillColor="#ff202225" android:pathData="M289.24,118.9C288.743,118.9 288.346,118.5 288.346,118V107C288.346,106.5 288.743,106.1 289.24,106.1C289.737,106.1 290.134,106.5 290.134,107V118C290.035,118.5 289.637,118.9 289.24,118.9Z" />
+    <path android:fillColor="#ff202225" android:pathData="M297.586,104.2H289.637C289.041,104.2 288.644,103.8 288.644,103.2C288.644,102.6 289.041,102.2 289.637,102.2H297.586C298.182,102.2 298.58,102.6 298.58,103.2C298.58,103.8 298.083,104.2 297.586,104.2Z" />
+    <path android:fillColor="#ff202225" android:pathData="M285.564,101.5C285.266,101.5 284.967,101.4 284.769,101.1L280.297,95.1C279.999,94.7 280.099,94 280.496,93.7C280.894,93.4 281.589,93.5 281.887,93.9L286.359,99.9C286.657,100.3 286.557,101 286.16,101.3C285.961,101.4 285.762,101.5 285.564,101.5Z" />
+    <path android:fillColor="#ff202225" android:pathData="M275.628,110.5C275.329,110.5 275.031,110.4 274.833,110.1C274.535,109.7 274.634,109 275.031,108.7L281.987,103.7C282.384,103.4 283.08,103.5 283.378,103.9C283.676,104.3 283.576,105 283.179,105.3L276.224,110.3C276.025,110.4 275.826,110.5 275.628,110.5Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M204.386,36.6H192.462V48.6H204.386V36.6Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M226.245,36.6H214.322V48.6H226.245V36.6Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M248.104,36.6H236.181V48.6H248.104V36.6Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M269.964,36.6H258.041V48.6H269.964V36.6Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M204.386,53.6H192.462V65.6H204.386V53.6Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M226.245,53.6H214.322V65.6H226.245V53.6Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M248.104,53.6H236.181V65.6H248.104V53.6Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M269.964,53.6H258.041V65.6H269.964V53.6Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M204.386,70.6H192.462V82.6H204.386V70.6Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M226.245,70.6H214.322V82.6H226.245V70.6Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M248.104,70.6H236.181V82.6H248.104V70.6Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M269.964,70.6H258.041V82.6H269.964V70.6Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M188.422,48.641H192.396V36.641H188.422V48.641Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M210.281,48.641H214.255V36.641H210.281V48.641Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M232.141,48.641H236.115V36.641H232.141V48.641Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M254,48.641H257.974V36.641H254V48.641Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M188.422,65.641H192.396V53.641H188.422V65.641Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M210.281,65.641H214.255V53.641H210.281V65.641Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M232.141,65.641H236.115V53.641H232.141V65.641Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M254,65.641H257.974V53.641H254V65.641Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M188.422,82.641H192.396V70.641H188.422V82.641Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M210.281,82.641H214.255V70.641H210.281V82.641Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M232.141,82.641H236.115V70.641H232.141V82.641Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M254,82.641H257.974V70.641H254V82.641Z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_user_profile_action_message.xml b/com.discord/res/drawable-anydpi-v21/ic_user_profile_action_message.xml
new file mode 100644
index 0000000000..9ea7f04fc7
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_user_profile_action_message.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="20.0dip" android:width="21.0dip" android:viewportWidth="21.0" android:viewportHeight="20.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffb9bbbe" android:pathData="M2.998,0C1.8941,0 0.998,0.895 0.998,2V14C0.998,15.104 1.8941,16 2.998,16H5.9981V20L9.998,16H18.998C20.103,16 20.998,15.104 20.998,14V2C20.998,0.895 20.103,0 18.998,0H2.998Z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_user_profile_action_pending.xml b/com.discord/res/drawable-anydpi-v21/ic_user_profile_action_pending.xml
new file mode 100644
index 0000000000..58e06785b7
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_user_profile_action_pending.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="20.0dip" android:width="20.0dip" android:viewportWidth="20.0" android:viewportHeight="20.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#fffaa61a" android:pathData="M10,0C4.4764,0 0,4.4764 0,10C0,15.5236 4.4764,20 10,20C15.5236,20 20,15.5236 20,10C20,4.4764 15.5236,0 10,0ZM10,3.6C10.4422,3.6 10.8,3.9578 10.8,4.4V9.5376L14.5625,11.7126C14.9453,11.9329 15.0703,12.4173 14.85,12.8001C14.6297,13.183 14.1453,13.3079 13.7625,13.0876L9.6873,10.7376C9.656,10.7251 9.6279,10.7048 9.5998,10.6876C9.3607,10.5486 9.1998,10.2954 9.1998,10.0001V4.4001C9.1998,3.9579 9.5578,3.6 10,3.6Z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_user_profile_action_video.xml b/com.discord/res/drawable-anydpi-v21/ic_user_profile_action_video.xml
new file mode 100644
index 0000000000..36d91e4c18
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_user_profile_action_video.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="14.0dip" android:width="20.0dip" android:viewportWidth="20.0" android:viewportHeight="14.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffb9bbbe" android:pathData="M19.526,3.149C19.231,2.966 18.862,2.951 18.553,3.105L16,4.382V2C16,0.897 15.103,0 14,0H2C0.897,0 0,0.897 0,2V12C0,13.104 0.897,14 2,14H14C15.103,14 16,13.104 16,12V9.618L18.553,10.894C18.694,10.965 18.847,11 19,11C19.183,11 19.365,10.949 19.526,10.851C19.82,10.668 20,10.347 20,10V4C20,3.653 19.82,3.332 19.526,3.149Z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_warning_icon_24dp.xml b/com.discord/res/drawable-anydpi-v21/ic_warning_icon_24dp.xml
new file mode 100644
index 0000000000..1fd84d2cba
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_warning_icon_24dp.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="20.0" android:viewportHeight="20.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#fffaa61a" android:pathData="M10,0C4.48,0 0,4.48 0,10C0,15.52 4.48,20 10,20C15.52,20 20,15.52 20,10C20,4.48 15.52,0 10,0ZM11,15H9V13H11V15ZM11,11H9V5H11V11Z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/img_plus_illo.xml b/com.discord/res/drawable-anydpi-v21/img_plus_illo.xml
new file mode 100644
index 0000000000..08583dbb4e
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/img_plus_illo.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="110.0dip" android:width="120.0dip" android:viewportWidth="120.0" android:viewportHeight="110.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff83ddc5" android:pathData="M109.714,101.984V45.023C109.714,36.667 102.943,29.845 94.457,29.845H94.114C89.4,29.845 85.629,26.093 85.629,21.403C85.629,15.264 80.571,10.233 74.4,10.233H47.143V104.884H42.857V110H120C120,107.186 117.686,104.884 114.857,104.884H112.629C111,104.884 109.714,103.605 109.714,101.984Z" />
+    <path android:fillColor="#ffffd836" android:pathData="M34.286,46.047C47.067,46.047 57.429,35.739 57.429,23.023C57.429,10.308 47.067,0 34.286,0C21.504,0 11.143,10.308 11.143,23.023C11.143,35.739 21.504,46.047 34.286,46.047Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M61.714,25.581H47.229C44.314,25.581 42,27.884 42,30.783C42,36.411 37.457,40.93 31.8,40.93H27.086C22.114,40.93 18,45.023 18,49.969V64.806C9.514,64.806 2.571,71.713 2.571,80.155V103.008H61.714V25.581Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M21.686,18.845C24.005,18.845 25.886,16.974 25.886,14.667C25.886,12.359 24.005,10.488 21.686,10.488C19.366,10.488 17.486,12.359 17.486,14.667C17.486,16.974 19.366,18.845 21.686,18.845Z" />
+    <path android:fillColor="#ff202225" android:pathData="M21.686,16.799C22.869,16.799 23.829,15.844 23.829,14.667C23.829,13.489 22.869,12.535 21.686,12.535C20.502,12.535 19.543,13.489 19.543,14.667C19.543,15.844 20.502,16.799 21.686,16.799Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M36.429,18.845C38.748,18.845 40.629,16.974 40.629,14.667C40.629,12.359 38.748,10.488 36.429,10.488C34.109,10.488 32.229,12.359 32.229,14.667C32.229,16.974 34.109,18.845 36.429,18.845Z" />
+    <path android:fillColor="#ff202225" android:pathData="M36.429,16.799C37.612,16.799 38.571,15.844 38.571,14.667C38.571,13.489 37.612,12.535 36.429,12.535C35.245,12.535 34.286,13.489 34.286,14.667C34.286,15.844 35.245,16.799 36.429,16.799Z" />
+    <path android:fillColor="#ff202225" android:pathData="M31.114,24.046H26.914C26.314,24.046 25.886,23.535 25.886,23.023C25.886,22.426 26.4,22 26.914,22H31.114C31.714,22 32.143,22.512 32.143,23.023C32.143,23.62 31.714,24.046 31.114,24.046Z" />
+    <path android:fillColor="#ffaec7ff" android:pathData="M96,35.814H34.286V81.86H96V35.814Z" />
+    <path android:fillColor="#ff7196ff" android:pathData="M96,81.86H36V98.915H96V81.86Z" />
+    <path android:fillColor="#ffd4e4ff" android:pathData="M96,98.915H112.971C116.914,98.915 120,95.76 120,91.923V71.628L104.571,56.279H96V98.915Z" />
+    <path android:fillColor="#ff202225" android:pathData="M62.571,110C68.726,110 73.714,105.037 73.714,98.915C73.714,92.793 68.726,87.829 62.571,87.829C56.417,87.829 51.429,92.793 51.429,98.915C51.429,105.037 56.417,110 62.571,110Z" />
+    <path android:fillColor="#ffaec7ff" android:pathData="M62.571,104.884C65.885,104.884 68.571,102.211 68.571,98.915C68.571,95.618 65.885,92.946 62.571,92.946C59.258,92.946 56.571,95.618 56.571,98.915C56.571,102.211 59.258,104.884 62.571,104.884Z" />
+    <path android:fillColor="#ff7196ff" android:pathData="M29.229,110C34.2,110 38.229,105.992 38.229,101.047C38.229,96.101 34.2,92.093 29.229,92.093H9V110H29.229Z" />
+    <path android:fillColor="#ffd4e4ff" android:pathData="M9,110C13.971,110 18,105.991 18,101.047C18,96.102 13.971,92.093 9,92.093C4.029,92.093 0,96.102 0,101.047C0,105.991 4.029,110 9,110Z" />
+    <path android:fillColor="#ffaec7ff" android:pathData="M9,106.419C11.982,106.419 14.4,104.013 14.4,101.047C14.4,98.08 11.982,95.674 9,95.674C6.018,95.674 3.6,98.08 3.6,101.047C3.6,104.013 6.018,106.419 9,106.419Z" />
+    <path android:fillColor="#ffd4e4ff" android:pathData="M9,102.837C9.994,102.837 10.8,102.035 10.8,101.046C10.8,100.058 9.994,99.256 9,99.256C8.006,99.256 7.2,100.058 7.2,101.046C7.2,102.035 8.006,102.837 9,102.837Z" />
+    <path android:fillColor="#ff7196ff" android:pathData="M50.657,110C55.629,110 59.657,105.992 59.657,101.047C59.657,96.101 55.629,92.093 50.657,92.093H30.429V110H50.657Z" />
+    <path android:fillColor="#ffd4e4ff" android:pathData="M30.429,110C35.399,110 39.429,105.991 39.429,101.047C39.429,96.102 35.399,92.093 30.429,92.093C25.458,92.093 21.429,96.102 21.429,101.047C21.429,105.991 25.458,110 30.429,110Z" />
+    <path android:fillColor="#ffaec7ff" android:pathData="M30.429,106.419C33.411,106.419 35.829,104.013 35.829,101.047C35.829,98.08 33.411,95.674 30.429,95.674C27.446,95.674 25.029,98.08 25.029,101.047C25.029,104.013 27.446,106.419 30.429,106.419Z" />
+    <path android:fillColor="#ffd4e4ff" android:pathData="M30.429,102.837C31.423,102.837 32.229,102.035 32.229,101.046C32.229,100.058 31.423,99.256 30.429,99.256C29.434,99.256 28.629,100.058 28.629,101.046C28.629,102.035 29.434,102.837 30.429,102.837Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M70.286,20.465H49.714V71.628H70.286V20.465Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M85.714,56.279V35.814L34.286,35.814L34.286,56.279L85.714,56.279Z" />
+    <path android:fillColor="#ff202225" android:pathData="M96,110C102.154,110 107.143,105.037 107.143,98.915C107.143,92.793 102.154,87.829 96,87.829C89.846,87.829 84.857,92.793 84.857,98.915C84.857,105.037 89.846,110 96,110Z" />
+    <path android:fillColor="#ffaec7ff" android:pathData="M96,104.884C99.314,104.884 102,102.211 102,98.915C102,95.618 99.314,92.946 96,92.946C92.686,92.946 90,95.618 90,98.915C90,102.211 92.686,104.884 96,104.884Z" />
+    <path android:fillColor="#ffff9a15" android:pathData="M106.286,78.45H99.429V81.86H106.286V78.45Z" />
+    <path android:fillColor="#ff202225" android:pathData="M99.429,75.039V59.69H103.114L116.571,73.077V75.039H99.429Z" />
+    <path android:fillColor="#ff202225" android:pathData="M49.714,56.279H34.286V92.093H49.714V56.279Z" />
+    <path android:fillColor="#ff3e70dd" android:pathData="M34.286,56.279H11.143V92.093H34.286V56.279Z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/$drawable_stream_ended__0.xml b/com.discord/res/drawable-anydpi-v24/$drawable_stream_ended__0.xml
new file mode 100644
index 0000000000..b3941f69b1
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v24/$drawable_stream_ended__0.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gradient android:type="linear" android:startX="44.5651" android:startY="44.6532" android:endX="44.5651" android:endY="115.687"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <item android:color="#ff72767d" android:offset="0.0" />
+    <item android:color="#00ffffff" android:offset="1.0" />
+</gradient>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/drawable_stream_ended.xml b/com.discord/res/drawable-anydpi-v24/drawable_stream_ended.xml
new file mode 100644
index 0000000000..98751d1b95
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v24/drawable_stream_ended.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="125.0dip" android:width="271.0dip" android:viewportWidth="271.0" android:viewportHeight="125.0"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <group>
+        <clip-path android:pathData="M0,0h270.317v125h-270.317z M 0,0" />
+        <path android:fillColor="#ff72767d" android:pathData="M0,124.139V117.769C0,115.186 1.033,112.775 2.841,110.968L16.098,97.71C18.423,95.386 19.714,92.286 19.714,89.015V72.486C19.714,64.91 25.913,58.712 33.488,58.712H224.432C232.008,58.712 238.206,64.91 238.206,72.486V103.478C238.206,106.319 240.53,108.643 243.371,108.643H256.371C262.827,108.643 267.992,113.895 267.992,120.265V124.139H0Z" android:strokeAlpha="0.2" android:fillAlpha="0.2" />
+        <path android:fillColor="#ff36393f" android:pathData="M94.008,63.877H69.043V124.139H94.008V63.877Z" />
+        <path android:fillColor="#ff4f545c" android:pathData="M217.975,63.877H94.008V124.139H217.975V63.877Z" />
+        <path android:fillColor="#ffb9bbbe" android:pathData="M119.835,89.704H94.008V124.139H119.835V89.704Z" />
+        <path android:fillColor="#ffdcddde" android:pathData="M123.278,84.539H94.008V89.704H123.278V84.539Z" />
+        <path android:fillColor="#ff72767d" android:pathData="M94.008,84.539H77.651V89.704H94.008V84.539Z" />
+        <path android:fillColor="#fff6f6f7" android:pathData="M116.391,75.93H94.008V84.539H116.391V75.93Z" />
+        <path android:fillColor="#ffb9bbbe" android:pathData="M94.008,75.93H86.26V84.539H94.008V75.93Z" />
+        <path android:fillColor="#ff72767d" android:pathData="M115.53,94.008H98.313V95.73H115.53V94.008Z" />
+        <path android:fillColor="#ff4f545c" android:pathData="M115.53,95.73H98.313V97.452H115.53V95.73Z" />
+        <path android:fillColor="#ff72767d" android:pathData="M115.53,97.452H98.313V99.174H115.53V97.452Z" />
+        <path android:fillColor="#ff4f545c" android:pathData="M115.53,99.174H98.313V100.895H115.53V99.174Z" />
+        <path android:fillColor="#ff72767d" android:pathData="M115.53,100.895H98.313V102.617H115.53V100.895Z" />
+        <path android:fillColor="#ff4f545c" android:pathData="M115.53,102.617H98.313V104.339H115.53V102.617Z" />
+        <path android:fillColor="#ff72767d" android:pathData="M115.53,104.339H98.313V106.061H115.53V104.339Z" />
+        <path android:fillColor="#ff4f545c" android:pathData="M115.53,106.061H98.313V107.782H115.53V106.061Z" />
+        <path android:fillColor="#ffdcddde" android:pathData="M117.252,107.782H96.591V111.226H117.252V107.782Z" />
+        <path android:fillColor="#ff202225" android:pathData="M94.008,89.704H80.234V124.139H94.008V89.704Z" />
+        <path android:fillColor="#ff36393f" android:pathData="M84.538,107.782H89.704V96.591C89.704,95.127 88.585,94.008 87.121,94.008C85.658,94.008 84.538,95.127 84.538,96.591V107.782Z" />
+        <path android:fillColor="#ff72767d" android:pathData="M209.366,84.539H190.427V113.809H209.366V84.539Z" />
+        <path android:fillColor="#ffb9bbbe" android:pathData="M206.784,87.121H193.01V111.226H206.784V87.121Z" />
+        <path android:fillColor="#ff72767d" android:pathData="M130.117,124.107H181.77V81.063H130.117V124.107Z" />
+        <path android:fillColor="#ff040405" android:pathData="M133.561,124.107H178.327V84.506H133.561V124.107Z" />
+        <path android:fillColor="#ff72767d" android:pathData="M157.714,83.678H154.27V124.139H157.714V83.678Z" />
+        <path android:fillColor="#ff72767d" android:pathData="M162.879,104.769H149.105V111.656H162.879V104.769Z" />
+        <path android:fillColor="#ff72767d" android:pathData="M135.331,30.303H94.008C88.326,30.303 83.678,34.952 83.678,40.634V50.964H135.331V30.303Z" />
+        <path android:fillColor="#ffb9bbbe" android:pathData="M125.861,30.303H190.427C196.109,30.303 200.758,34.952 200.758,40.634V50.964H115.53V40.634C115.53,34.952 120.093,30.303 125.861,30.303Z" />
+        <path android:fillColor="#ff72767d" android:pathData="M118.974,50.964V40.634C118.974,36.846 122.073,33.747 125.861,33.747H190.427C194.215,33.747 197.314,36.846 197.314,40.634V50.964H118.974Z" />
+        <path android:fillColor="#ffdcddde" android:pathData="M221.419,43.216H94.008V68.182H221.419V43.216Z" />
+        <path android:fillColor="#fff6f6f7" android:pathData="M93.96,64.706L217.927,64.706V60.402L93.96,60.402V64.706Z" />
+        <path android:fillColor="#fff6f6f7" android:pathData="M217.975,53.547H94.008V57.851H217.975V53.547Z" />
+        <path android:fillColor="#fff6f6f7" android:pathData="M93.96,50.932L217.927,50.932V46.627L93.96,46.627V50.932Z" />
+        <path android:fillColor="#ffb9bbbe" android:pathData="M94.008,43.216H65.599V68.182H94.008V43.216Z" />
+        <path android:fillColor="#ffdcddde" android:pathData="M68.995,64.706H93.96V60.402H68.995V64.706Z" />
+        <path android:fillColor="#ffdcddde" android:pathData="M68.995,57.819H93.96V53.514H68.995V57.819Z" />
+        <path android:fillColor="#ffdcddde" android:pathData="M68.995,50.932H93.96V46.627H68.995V50.932Z" />
+        <path android:fillColor="#ffb9bbbe" android:pathData="M236.398,2.41C236.398,1.636 236.484,0.775 236.656,0C230.63,1.119 225.981,6.457 225.981,12.827C225.981,20.059 231.835,25.826 238.981,25.826C245.351,25.826 250.689,21.264 251.808,15.151C251.033,15.324 250.258,15.41 249.397,15.41C242.166,15.41 236.398,9.556 236.398,2.41Z" />
+        <path android:fillColor="#ffb9bbbe" android:pathData="M6.973,83.936L5.854,86.174C5.596,86.691 6.112,87.293 6.715,87.035L8.953,85.916C9.125,85.83 9.298,85.83 9.47,85.916L11.708,87.035C12.224,87.293 12.827,86.777 12.569,86.174L11.45,83.936C11.364,83.764 11.364,83.592 11.45,83.419L12.569,81.181C12.827,80.665 12.311,80.062 11.708,80.32L9.47,81.439C9.298,81.525 9.125,81.525 8.953,81.439L6.715,80.32C6.198,80.062 5.596,80.578 5.854,81.181L6.973,83.419C7.059,83.592 7.059,83.764 6.973,83.936Z" />
+        <path android:fillColor="#ff4f545c" android:pathData="M215.651,34.435L214.532,36.674C214.273,37.19 214.79,37.793 215.393,37.534L217.631,36.415C217.803,36.329 217.975,36.329 218.147,36.415L220.386,37.534C220.902,37.793 221.505,37.276 221.247,36.674L220.127,34.435C220.041,34.263 220.041,34.091 220.127,33.919L221.247,31.68C221.505,31.164 220.988,30.561 220.386,30.819L218.147,31.939C217.975,32.025 217.803,32.025 217.631,31.939L215.393,30.819C214.876,30.561 214.273,31.078 214.532,31.68L215.651,33.919C215.737,34.091 215.737,34.263 215.651,34.435Z" />
+        <path android:fillColor="#ffdcddde" android:pathData="M265.582,29.873C265.065,29.873 264.721,29.528 264.721,29.012V28.151C264.721,27.634 265.065,27.29 265.582,27.29C266.098,27.29 266.443,27.634 266.443,28.151V29.012C266.443,29.442 266.012,29.873 265.582,29.873Z" />
+        <path android:fillColor="#ffdcddde" android:pathData="M265.582,36.76C265.065,36.76 264.721,36.415 264.721,35.899V35.038C264.721,34.521 265.065,34.177 265.582,34.177C266.098,34.177 266.443,34.521 266.443,35.038V35.899C266.443,36.329 266.012,36.76 265.582,36.76Z" />
+        <path android:fillColor="#ffdcddde" android:pathData="M267.734,32.025C267.734,31.508 268.078,31.164 268.595,31.164H269.456C269.972,31.164 270.317,31.508 270.317,32.025C270.317,32.541 269.972,32.886 269.456,32.886H268.595C268.078,32.886 267.734,32.455 267.734,32.025Z" />
+        <path android:fillColor="#ffdcddde" android:pathData="M260.847,32.025C260.847,31.508 261.191,31.164 261.708,31.164H262.569C263.085,31.164 263.43,31.508 263.43,32.025C263.43,32.541 263.085,32.886 262.569,32.886H261.708C261.191,32.886 260.847,32.455 260.847,32.025Z" />
+        <path android:fillColor="#ff040505" android:pathData="M41.925,105.802C41.925,104.167 40.72,102.617 39.084,102.359C37.018,102.014 35.21,103.65 35.21,105.63C35.21,107.438 34.866,109.332 33.919,110.882C33.488,111.656 33.23,112.603 33.23,113.55C33.316,116.305 35.554,118.543 38.223,118.716C41.236,118.888 43.733,116.477 43.733,113.464C43.733,112.517 43.474,111.656 43.044,110.968C42.269,109.418 41.925,107.61 41.925,105.802Z" />
+        <path android:fillColor="#ff040505" android:pathData="M36.243,125C35.813,125 35.468,124.656 35.468,124.225V114.756C35.468,114.325 35.813,113.981 36.243,113.981C36.674,113.981 37.018,114.325 37.018,114.756V124.225C37.018,124.656 36.674,125 36.243,125Z" />
+        <path android:fillColor="#ff040505" android:pathData="M40.892,125C40.461,125 40.117,124.656 40.117,124.225V114.756C40.117,114.325 40.461,113.981 40.892,113.981C41.322,113.981 41.667,114.325 41.667,114.756V124.225C41.581,124.656 41.236,125 40.892,125Z" />
+        <path android:fillColor="#ff040505" android:pathData="M205.837,105.802C205.837,104.167 204.632,102.617 202.996,102.359C200.93,102.014 199.122,103.65 199.122,105.63C199.122,107.438 198.778,109.332 197.831,110.882C197.4,111.656 197.142,112.603 197.142,113.55C197.228,116.305 199.466,118.543 202.135,118.716C205.148,118.888 207.645,116.477 207.645,113.464C207.645,112.517 207.386,111.656 206.956,110.968C206.181,109.418 205.837,107.61 205.837,105.802Z" />
+        <path android:fillColor="#ff040505" android:pathData="M200.155,125C199.725,125 199.38,124.656 199.38,124.225V114.756C199.38,114.325 199.725,113.981 200.155,113.981C200.585,113.981 200.93,114.325 200.93,114.756V124.225C200.93,124.656 200.585,125 200.155,125Z" />
+        <path android:fillColor="#ff040505" android:pathData="M204.804,125C204.373,125 204.029,124.656 204.029,124.225V114.756C204.029,114.325 204.373,113.981 204.804,113.981C205.234,113.981 205.579,114.325 205.579,114.756V124.225C205.492,124.656 205.148,125 204.804,125Z" />
+        <path android:fillColor="@drawable/$drawable_stream_ended__0" android:pathData="M18.767,124.139H70.42L49.759,50.103H39.428L18.767,124.139Z" />
+        <path android:fillColor="#ffdcddde" android:pathData="M36.846,50.103H52.342V48.382C52.342,46.488 50.792,44.938 48.898,44.938H40.289C38.395,44.938 36.846,46.488 36.846,48.382V50.103Z" />
+        <path android:fillColor="#00000000" android:pathData="M44.594,47.521V37.534C44.594,33.746 47.607,30.733 51.395,30.733C55.182,30.733 58.196,33.746 58.196,37.534V124.139" android:strokeColor="#ffdcddde" android:strokeWidth="2.0" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/ic_stop_stream_v2.xml b/com.discord/res/drawable-anydpi-v24/ic_stop_stream_v2.xml
new file mode 100644
index 0000000000..f04b7414b2
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v24/ic_stop_stream_v2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="23.0dip" android:width="23.0dip" android:viewportWidth="23.0" android:viewportHeight="23.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,-1h24v24h-24z M 0,0" />
+        <path android:fillColor="#ffffffff" android:pathData="M18,11V14H2V5H13V3H2C1.4696,3 0.9609,3.2107 0.5858,3.5858C0.2107,3.9609 0,4.4696 0,5L0,16C0,16.5304 0.2107,17.0391 0.5858,17.4142C0.9609,17.7893 1.4696,18 2,18H9V20H5V22H15V20H11V18H18C18.5304,18 19.0391,17.7893 19.4142,17.4142C19.7893,17.0391 20,16.5304 20,16V11H18Z" android:fillType="evenOdd" />
+        <path android:fillColor="#ffffffff" android:pathData="M23,2.41L21.59,1L19.12,3.48L16.64,1L15.23,2.41L17.71,4.88L15.23,7.36L16.64,8.77L19.12,6.29L21.59,8.77L23,7.36L20.52,4.88L23,2.41Z" android:fillType="evenOdd" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/ic_user_profile_action_add_friend.xml b/com.discord/res/drawable-anydpi-v24/ic_user_profile_action_add_friend.xml
new file mode 100644
index 0000000000..07fa24a19c
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v24/ic_user_profile_action_add_friend.xml
@@ -0,0 +1,5 @@
+<?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="#ff43b581" android:pathData="M21,3H24V5H21V8H19V5H16V3H19V0H21V3ZM10,12C12.205,12 14,10.205 14,8C14,5.795 12.205,4 10,4C7.795,4 6,5.795 6,8C6,10.205 7.795,12 10,12ZM10,13C5.289,13 2,15.467 2,19V20H18V19C18,15.467 14.711,13 10,13Z" android:fillType="evenOdd" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/ic_user_profile_action_call.xml b/com.discord/res/drawable-anydpi-v24/ic_user_profile_action_call.xml
new file mode 100644
index 0000000000..5c0ecfb45e
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v24/ic_user_profile_action_call.xml
@@ -0,0 +1,5 @@
+<?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="#ffb9bbbe" android:pathData="M11,5V3C16.515,3 21,7.486 21,13H19C19,8.589 15.411,5 11,5ZM17,13H15C15,10.795 13.206,9 11,9V7C14.309,7 17,9.691 17,13ZM11,11V13H13C13,11.896 12.105,11 11,11ZM14,16H18C18.553,16 19,16.447 19,17V21C19,21.553 18.553,22 18,22H13C6.925,22 2,17.075 2,11V6C2,5.447 2.448,5 3,5H7C7.553,5 8,5.447 8,6V10C8,10.553 7.553,11 7,11H6C6.063,14.938 9,18 13,18V17C13,16.447 13.447,16 14,16Z" android:fillType="evenOdd" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-hdpi/drawable_stream_ended.png b/com.discord/res/drawable-hdpi/drawable_stream_ended.png
new file mode 100644
index 0000000000..6ca4a8cd68
Binary files /dev/null and b/com.discord/res/drawable-hdpi/drawable_stream_ended.png differ
diff --git a/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_happy_color.png b/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_happy_color.png
new file mode 100644
index 0000000000..9c9329d5cb
Binary files /dev/null and b/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_happy_color.png differ
diff --git a/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_happy_grayscale.png b/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_happy_grayscale.png
new file mode 100644
index 0000000000..dbf3147e20
Binary files /dev/null and b/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_happy_grayscale.png differ
diff --git a/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_neutral_color.png b/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_neutral_color.png
new file mode 100644
index 0000000000..ad39aa44f4
Binary files /dev/null and b/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_neutral_color.png differ
diff --git a/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_neutral_grayscale.png b/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_neutral_grayscale.png
new file mode 100644
index 0000000000..08b217e176
Binary files /dev/null and b/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_neutral_grayscale.png differ
diff --git a/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_sad_color.png b/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_sad_color.png
new file mode 100644
index 0000000000..eee03d5547
Binary files /dev/null and b/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_sad_color.png differ
diff --git a/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_sad_grayscale.png b/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_sad_grayscale.png
new file mode 100644
index 0000000000..27fde5e3b6
Binary files /dev/null and b/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_sad_grayscale.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_account_youtube.png b/com.discord/res/drawable-hdpi/ic_account_youtube.png
index 028d5402bb..868f306206 100644
Binary files a/com.discord/res/drawable-hdpi/ic_account_youtube.png and b/com.discord/res/drawable-hdpi/ic_account_youtube.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_chevron_down_white_12dp.png b/com.discord/res/drawable-hdpi/ic_chevron_down_white_12dp.png
new file mode 100644
index 0000000000..b4eb4fdb71
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_chevron_down_white_12dp.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_no_stream.png b/com.discord/res/drawable-hdpi/ic_no_stream.png
new file mode 100644
index 0000000000..f089cd23bb
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_no_stream.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_stop_stream_v2.png b/com.discord/res/drawable-hdpi/ic_stop_stream_v2.png
new file mode 100644
index 0000000000..5d73e634a4
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_stop_stream_v2.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_user_profile_action_add_friend.png b/com.discord/res/drawable-hdpi/ic_user_profile_action_add_friend.png
new file mode 100644
index 0000000000..e23608b5f6
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_user_profile_action_add_friend.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_user_profile_action_call.png b/com.discord/res/drawable-hdpi/ic_user_profile_action_call.png
new file mode 100644
index 0000000000..03b99520e8
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_user_profile_action_call.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_user_profile_action_message.png b/com.discord/res/drawable-hdpi/ic_user_profile_action_message.png
new file mode 100644
index 0000000000..4cbf9a183a
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_user_profile_action_message.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_user_profile_action_pending.png b/com.discord/res/drawable-hdpi/ic_user_profile_action_pending.png
new file mode 100644
index 0000000000..d6b2315e69
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_user_profile_action_pending.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_user_profile_action_video.png b/com.discord/res/drawable-hdpi/ic_user_profile_action_video.png
new file mode 100644
index 0000000000..cef891fdb2
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_user_profile_action_video.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_warning_icon_24dp.png b/com.discord/res/drawable-hdpi/ic_warning_icon_24dp.png
new file mode 100644
index 0000000000..70465d7f55
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_warning_icon_24dp.png differ
diff --git a/com.discord/res/drawable-hdpi/img_plus_illo.png b/com.discord/res/drawable-hdpi/img_plus_illo.png
new file mode 100644
index 0000000000..e5a71283c0
Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_plus_illo.png differ
diff --git a/com.discord/res/drawable-ldpi/drawable_stream_ended.png b/com.discord/res/drawable-ldpi/drawable_stream_ended.png
new file mode 100644
index 0000000000..0035077dd4
Binary files /dev/null and b/com.discord/res/drawable-ldpi/drawable_stream_ended.png differ
diff --git a/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_happy_color.png b/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_happy_color.png
new file mode 100644
index 0000000000..833ff43823
Binary files /dev/null and b/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_happy_color.png differ
diff --git a/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_happy_grayscale.png b/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_happy_grayscale.png
new file mode 100644
index 0000000000..da46b990a4
Binary files /dev/null and b/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_happy_grayscale.png differ
diff --git a/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_neutral_color.png b/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_neutral_color.png
new file mode 100644
index 0000000000..fe3c45a570
Binary files /dev/null and b/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_neutral_color.png differ
diff --git a/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_neutral_grayscale.png b/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_neutral_grayscale.png
new file mode 100644
index 0000000000..7021643100
Binary files /dev/null and b/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_neutral_grayscale.png differ
diff --git a/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_sad_color.png b/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_sad_color.png
new file mode 100644
index 0000000000..c2a2b114f5
Binary files /dev/null and b/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_sad_color.png differ
diff --git a/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_sad_grayscale.png b/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_sad_grayscale.png
new file mode 100644
index 0000000000..1ff88a1195
Binary files /dev/null and b/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_sad_grayscale.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_chevron_down_white_12dp.png b/com.discord/res/drawable-ldpi/ic_chevron_down_white_12dp.png
new file mode 100644
index 0000000000..dcd0341aa9
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_chevron_down_white_12dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_no_stream.png b/com.discord/res/drawable-ldpi/ic_no_stream.png
new file mode 100644
index 0000000000..0bec04032e
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_no_stream.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_stop_stream_v2.png b/com.discord/res/drawable-ldpi/ic_stop_stream_v2.png
new file mode 100644
index 0000000000..c30d027449
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_stop_stream_v2.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_user_profile_action_add_friend.png b/com.discord/res/drawable-ldpi/ic_user_profile_action_add_friend.png
new file mode 100644
index 0000000000..5124183481
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_user_profile_action_add_friend.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_user_profile_action_call.png b/com.discord/res/drawable-ldpi/ic_user_profile_action_call.png
new file mode 100644
index 0000000000..a3c5cb47d1
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_user_profile_action_call.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_user_profile_action_message.png b/com.discord/res/drawable-ldpi/ic_user_profile_action_message.png
new file mode 100644
index 0000000000..d81da7a059
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_user_profile_action_message.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_user_profile_action_pending.png b/com.discord/res/drawable-ldpi/ic_user_profile_action_pending.png
new file mode 100644
index 0000000000..33b0c47fc6
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_user_profile_action_pending.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_user_profile_action_video.png b/com.discord/res/drawable-ldpi/ic_user_profile_action_video.png
new file mode 100644
index 0000000000..44755f8885
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_user_profile_action_video.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_warning_icon_24dp.png b/com.discord/res/drawable-ldpi/ic_warning_icon_24dp.png
new file mode 100644
index 0000000000..aa5ca8c52c
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_warning_icon_24dp.png differ
diff --git a/com.discord/res/drawable-ldpi/img_plus_illo.png b/com.discord/res/drawable-ldpi/img_plus_illo.png
new file mode 100644
index 0000000000..5a38fccccf
Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_plus_illo.png differ
diff --git a/com.discord/res/drawable-mdpi/drawable_stream_ended.png b/com.discord/res/drawable-mdpi/drawable_stream_ended.png
new file mode 100644
index 0000000000..b8159e4f24
Binary files /dev/null and b/com.discord/res/drawable-mdpi/drawable_stream_ended.png differ
diff --git a/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_happy_color.png b/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_happy_color.png
new file mode 100644
index 0000000000..e0ea52888a
Binary files /dev/null and b/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_happy_color.png differ
diff --git a/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_happy_grayscale.png b/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_happy_grayscale.png
new file mode 100644
index 0000000000..87bc290ef2
Binary files /dev/null and b/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_happy_grayscale.png differ
diff --git a/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_neutral_color.png b/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_neutral_color.png
new file mode 100644
index 0000000000..f8d16091e7
Binary files /dev/null and b/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_neutral_color.png differ
diff --git a/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_neutral_grayscale.png b/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_neutral_grayscale.png
new file mode 100644
index 0000000000..376e2cfdf1
Binary files /dev/null and b/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_neutral_grayscale.png differ
diff --git a/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_sad_color.png b/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_sad_color.png
new file mode 100644
index 0000000000..700a40bbc4
Binary files /dev/null and b/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_sad_color.png differ
diff --git a/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_sad_grayscale.png b/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_sad_grayscale.png
new file mode 100644
index 0000000000..5492189b7e
Binary files /dev/null and b/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_sad_grayscale.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_chevron_down_white_12dp.png b/com.discord/res/drawable-mdpi/ic_chevron_down_white_12dp.png
new file mode 100644
index 0000000000..2d039c2be8
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_chevron_down_white_12dp.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_no_stream.png b/com.discord/res/drawable-mdpi/ic_no_stream.png
new file mode 100644
index 0000000000..dd26b1f718
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_no_stream.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_stop_stream_v2.png b/com.discord/res/drawable-mdpi/ic_stop_stream_v2.png
new file mode 100644
index 0000000000..70ed9c2f1b
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_stop_stream_v2.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_user_profile_action_add_friend.png b/com.discord/res/drawable-mdpi/ic_user_profile_action_add_friend.png
new file mode 100644
index 0000000000..89bb29691f
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_user_profile_action_add_friend.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_user_profile_action_call.png b/com.discord/res/drawable-mdpi/ic_user_profile_action_call.png
new file mode 100644
index 0000000000..315cb8fc3a
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_user_profile_action_call.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_user_profile_action_message.png b/com.discord/res/drawable-mdpi/ic_user_profile_action_message.png
new file mode 100644
index 0000000000..df2bdf0bac
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_user_profile_action_message.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_user_profile_action_pending.png b/com.discord/res/drawable-mdpi/ic_user_profile_action_pending.png
new file mode 100644
index 0000000000..b9537021b8
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_user_profile_action_pending.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_user_profile_action_video.png b/com.discord/res/drawable-mdpi/ic_user_profile_action_video.png
new file mode 100644
index 0000000000..a300b24aaf
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_user_profile_action_video.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_warning_icon_24dp.png b/com.discord/res/drawable-mdpi/ic_warning_icon_24dp.png
new file mode 100644
index 0000000000..f2364f0722
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_warning_icon_24dp.png differ
diff --git a/com.discord/res/drawable-mdpi/img_plus_illo.png b/com.discord/res/drawable-mdpi/img_plus_illo.png
new file mode 100644
index 0000000000..696466a640
Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_plus_illo.png differ
diff --git a/com.discord/res/drawable-v21/bg_pressed_highlight_brighten.xml b/com.discord/res/drawable-v21/bg_pressed_highlight_brighten.xml
new file mode 100644
index 0000000000..06953b08f2
--- /dev/null
+++ b/com.discord/res/drawable-v21/bg_pressed_highlight_brighten.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ripple_brighten" />
+</selector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-v21/bg_pressed_highlight_darken.xml b/com.discord/res/drawable-v21/bg_pressed_highlight_darken.xml
new file mode 100644
index 0000000000..dd01facb11
--- /dev/null
+++ b/com.discord/res/drawable-v21/bg_pressed_highlight_darken.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ripple_darken" />
+</selector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-v21/ripple_brighten.xml b/com.discord/res/drawable-v21/ripple_brighten.xml
new file mode 100644
index 0000000000..5112668668
--- /dev/null
+++ b/com.discord/res/drawable-v21/ripple_brighten.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/color_clicked_lighter"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffffff" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/com.discord/res/drawable-v21/ripple_darken.xml b/com.discord/res/drawable-v21/ripple_darken.xml
new file mode 100644
index 0000000000..f5b286a40b
--- /dev/null
+++ b/com.discord/res/drawable-v21/ripple_darken.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/color_clicked_darker"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffffff" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/com.discord/res/drawable-xhdpi/asset_default_avatar_80dp.png b/com.discord/res/drawable-xhdpi/asset_default_avatar_80dp.png
new file mode 100644
index 0000000000..21dba76a45
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/asset_default_avatar_80dp.png differ
diff --git a/com.discord/res/drawable-xhdpi/drawable_stream_ended.png b/com.discord/res/drawable-xhdpi/drawable_stream_ended.png
new file mode 100644
index 0000000000..006a67fc64
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/drawable_stream_ended.png differ
diff --git a/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_happy_color.png b/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_happy_color.png
new file mode 100644
index 0000000000..83115f23e8
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_happy_color.png differ
diff --git a/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_happy_grayscale.png b/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_happy_grayscale.png
new file mode 100644
index 0000000000..584923961b
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_happy_grayscale.png differ
diff --git a/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_neutral_color.png b/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_neutral_color.png
new file mode 100644
index 0000000000..9fcc29a6da
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_neutral_color.png differ
diff --git a/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_neutral_grayscale.png b/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_neutral_grayscale.png
new file mode 100644
index 0000000000..ab2fb67e23
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_neutral_grayscale.png differ
diff --git a/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_sad_color.png b/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_sad_color.png
new file mode 100644
index 0000000000..0a6c310d4d
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_sad_color.png differ
diff --git a/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_sad_grayscale.png b/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_sad_grayscale.png
new file mode 100644
index 0000000000..39529e1425
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_sad_grayscale.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_chevron_down_white_12dp.png b/com.discord/res/drawable-xhdpi/ic_chevron_down_white_12dp.png
new file mode 100644
index 0000000000..f0eecadaf9
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_chevron_down_white_12dp.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_no_stream.png b/com.discord/res/drawable-xhdpi/ic_no_stream.png
new file mode 100644
index 0000000000..e59b20c958
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_no_stream.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_stop_stream_v2.png b/com.discord/res/drawable-xhdpi/ic_stop_stream_v2.png
new file mode 100644
index 0000000000..deb825eab7
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_stop_stream_v2.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_user_profile_action_add_friend.png b/com.discord/res/drawable-xhdpi/ic_user_profile_action_add_friend.png
new file mode 100644
index 0000000000..b37787d4a8
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_user_profile_action_add_friend.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_user_profile_action_call.png b/com.discord/res/drawable-xhdpi/ic_user_profile_action_call.png
new file mode 100644
index 0000000000..82d4f51e33
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_user_profile_action_call.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_user_profile_action_message.png b/com.discord/res/drawable-xhdpi/ic_user_profile_action_message.png
new file mode 100644
index 0000000000..372cc9190f
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_user_profile_action_message.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_user_profile_action_pending.png b/com.discord/res/drawable-xhdpi/ic_user_profile_action_pending.png
new file mode 100644
index 0000000000..dc98873a9f
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_user_profile_action_pending.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_user_profile_action_video.png b/com.discord/res/drawable-xhdpi/ic_user_profile_action_video.png
new file mode 100644
index 0000000000..952ad63cce
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_user_profile_action_video.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_warning_icon_24dp.png b/com.discord/res/drawable-xhdpi/ic_warning_icon_24dp.png
new file mode 100644
index 0000000000..dd6896b5e2
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_warning_icon_24dp.png differ
diff --git a/com.discord/res/drawable-xhdpi/img_plus_illo.png b/com.discord/res/drawable-xhdpi/img_plus_illo.png
new file mode 100644
index 0000000000..af39b1a52b
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_plus_illo.png differ
diff --git a/com.discord/res/drawable-xxhdpi/asset_default_avatar_80dp.png b/com.discord/res/drawable-xxhdpi/asset_default_avatar_80dp.png
new file mode 100644
index 0000000000..13e373db8d
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/asset_default_avatar_80dp.png differ
diff --git a/com.discord/res/drawable-xxhdpi/bg_nitro_classic.png b/com.discord/res/drawable-xxhdpi/bg_nitro_classic.png
index 49475b4b2d..e7214b35db 100644
Binary files a/com.discord/res/drawable-xxhdpi/bg_nitro_classic.png and b/com.discord/res/drawable-xxhdpi/bg_nitro_classic.png differ
diff --git a/com.discord/res/drawable-xxhdpi/drawable_stream_ended.png b/com.discord/res/drawable-xxhdpi/drawable_stream_ended.png
new file mode 100644
index 0000000000..9d0defedde
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/drawable_stream_ended.png differ
diff --git a/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_happy_color.png b/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_happy_color.png
new file mode 100644
index 0000000000..c4dbbf7dc2
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_happy_color.png differ
diff --git a/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_happy_grayscale.png b/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_happy_grayscale.png
new file mode 100644
index 0000000000..4678a4b7d8
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_happy_grayscale.png differ
diff --git a/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_neutral_color.png b/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_neutral_color.png
new file mode 100644
index 0000000000..545c2b6ec1
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_neutral_color.png differ
diff --git a/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_neutral_grayscale.png b/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_neutral_grayscale.png
new file mode 100644
index 0000000000..c93be2c6a2
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_neutral_grayscale.png differ
diff --git a/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_sad_color.png b/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_sad_color.png
new file mode 100644
index 0000000000..27acae65ad
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_sad_color.png differ
diff --git a/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_sad_grayscale.png b/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_sad_grayscale.png
new file mode 100644
index 0000000000..9eaf731e7f
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_sad_grayscale.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_chevron_down_white_12dp.png b/com.discord/res/drawable-xxhdpi/ic_chevron_down_white_12dp.png
new file mode 100644
index 0000000000..00f5a68893
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_chevron_down_white_12dp.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_no_stream.png b/com.discord/res/drawable-xxhdpi/ic_no_stream.png
new file mode 100644
index 0000000000..380115e7fb
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_no_stream.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_stop_stream_v2.png b/com.discord/res/drawable-xxhdpi/ic_stop_stream_v2.png
new file mode 100644
index 0000000000..c805f08944
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_stop_stream_v2.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_user_profile_action_add_friend.png b/com.discord/res/drawable-xxhdpi/ic_user_profile_action_add_friend.png
new file mode 100644
index 0000000000..934f3821b7
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_user_profile_action_add_friend.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_user_profile_action_call.png b/com.discord/res/drawable-xxhdpi/ic_user_profile_action_call.png
new file mode 100644
index 0000000000..c61b23a49d
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_user_profile_action_call.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_user_profile_action_message.png b/com.discord/res/drawable-xxhdpi/ic_user_profile_action_message.png
new file mode 100644
index 0000000000..45f71cb51b
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_user_profile_action_message.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_user_profile_action_pending.png b/com.discord/res/drawable-xxhdpi/ic_user_profile_action_pending.png
new file mode 100644
index 0000000000..2a5ff7efea
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_user_profile_action_pending.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_user_profile_action_video.png b/com.discord/res/drawable-xxhdpi/ic_user_profile_action_video.png
new file mode 100644
index 0000000000..d57d71e979
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_user_profile_action_video.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_warning_icon_24dp.png b/com.discord/res/drawable-xxhdpi/ic_warning_icon_24dp.png
new file mode 100644
index 0000000000..e5faf864fe
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_warning_icon_24dp.png differ
diff --git a/com.discord/res/drawable-xxhdpi/asset_loading.png b/com.discord/res/drawable-xxhdpi/img_loading_clyde.png
similarity index 100%
rename from com.discord/res/drawable-xxhdpi/asset_loading.png
rename to com.discord/res/drawable-xxhdpi/img_loading_clyde.png
diff --git a/com.discord/res/drawable-xxhdpi/img_plus_illo.png b/com.discord/res/drawable-xxhdpi/img_plus_illo.png
new file mode 100644
index 0000000000..c375738a92
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_plus_illo.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/drawable_stream_ended.png b/com.discord/res/drawable-xxxhdpi/drawable_stream_ended.png
new file mode 100644
index 0000000000..1f666ee9a3
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/drawable_stream_ended.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_happy_color.png b/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_happy_color.png
new file mode 100644
index 0000000000..683832bba6
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_happy_color.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_happy_grayscale.png b/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_happy_grayscale.png
new file mode 100644
index 0000000000..80e7b84799
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_happy_grayscale.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_neutral_color.png b/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_neutral_color.png
new file mode 100644
index 0000000000..76eb429d41
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_neutral_color.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_neutral_grayscale.png b/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_neutral_grayscale.png
new file mode 100644
index 0000000000..fb0ea86192
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_neutral_grayscale.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_sad_color.png b/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_sad_color.png
new file mode 100644
index 0000000000..91a79fd3e3
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_sad_color.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_sad_grayscale.png b/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_sad_grayscale.png
new file mode 100644
index 0000000000..d5f096773d
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_sad_grayscale.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_chevron_down_white_12dp.png b/com.discord/res/drawable-xxxhdpi/ic_chevron_down_white_12dp.png
new file mode 100644
index 0000000000..5d09fdacb1
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_chevron_down_white_12dp.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_no_stream.png b/com.discord/res/drawable-xxxhdpi/ic_no_stream.png
new file mode 100644
index 0000000000..3c82c8021e
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_no_stream.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_stop_stream_v2.png b/com.discord/res/drawable-xxxhdpi/ic_stop_stream_v2.png
new file mode 100644
index 0000000000..44d8386a25
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_stop_stream_v2.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_add_friend.png b/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_add_friend.png
new file mode 100644
index 0000000000..e33ebdce83
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_add_friend.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_call.png b/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_call.png
new file mode 100644
index 0000000000..284ae3b830
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_call.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_message.png b/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_message.png
new file mode 100644
index 0000000000..dd29c2148a
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_message.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_pending.png b/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_pending.png
new file mode 100644
index 0000000000..c59234584d
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_pending.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_video.png b/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_video.png
new file mode 100644
index 0000000000..69b7d426b5
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_user_profile_action_video.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_warning_icon_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_warning_icon_24dp.png
new file mode 100644
index 0000000000..6a00669c07
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_warning_icon_24dp.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/img_game_presence_nux.png b/com.discord/res/drawable-xxxhdpi/img_game_presence_nux.png
new file mode 100644
index 0000000000..5762275265
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_game_presence_nux.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/asset_loading.png b/com.discord/res/drawable-xxxhdpi/img_loading_clyde.png
similarity index 100%
rename from com.discord/res/drawable-xxxhdpi/asset_loading.png
rename to com.discord/res/drawable-xxxhdpi/img_loading_clyde.png
diff --git a/com.discord/res/drawable-xxxhdpi/img_plus_illo.png b/com.discord/res/drawable-xxxhdpi/img_plus_illo.png
new file mode 100644
index 0000000000..d9e0b6caee
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_plus_illo.png differ
diff --git a/com.discord/res/drawable/bg_pressed_highlight_brighten.xml b/com.discord/res/drawable/bg_pressed_highlight_brighten.xml
new file mode 100644
index 0000000000..9ca78b6732
--- /dev/null
+++ b/com.discord/res/drawable/bg_pressed_highlight_brighten.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false" android:drawable="@android:color/transparent" />
+    <item android:drawable="@color/color_clicked_lighter" />
+</selector>
\ No newline at end of file
diff --git a/com.discord/res/drawable/bg_pressed_highlight_darken.xml b/com.discord/res/drawable/bg_pressed_highlight_darken.xml
new file mode 100644
index 0000000000..d95f4065ad
--- /dev/null
+++ b/com.discord/res/drawable/bg_pressed_highlight_darken.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false" android:drawable="@android:color/transparent" />
+    <item android:drawable="@color/color_clicked_darker" />
+</selector>
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_loading.xml b/com.discord/res/drawable/drawable_bg_loading.xml
similarity index 83%
rename from com.discord/res/drawable/drawable_loading.xml
rename to com.discord/res/drawable/drawable_bg_loading.xml
index 27e6decafc..b2739d7e66 100644
--- a/com.discord/res/drawable/drawable_loading.xml
+++ b/com.discord/res/drawable/drawable_bg_loading.xml
@@ -7,6 +7,6 @@
         </shape>
     </item>
     <item>
-        <bitmap android:gravity="center" android:src="@drawable/asset_loading" android:tileMode="disabled" />
+        <bitmap android:gravity="center" android:src="@drawable/img_loading_clyde" android:tileMode="disabled" />
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_primary_700.xml b/com.discord/res/drawable/drawable_button_primary_700.xml
new file mode 100644
index 0000000000..c73fcaeba7
--- /dev/null
+++ b/com.discord/res/drawable/drawable_button_primary_700.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/drawable_button_primary_700_pressed" />
+    <item android:drawable="@drawable/drawable_button_primary_700_neutral" />
+</selector>
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_primary_700_neutral.xml b/com.discord/res/drawable/drawable_button_primary_700_neutral.xml
new file mode 100644
index 0000000000..063b1aa835
--- /dev/null
+++ b/com.discord/res/drawable/drawable_button_primary_700_neutral.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/primary_700" />
+    <corners android:radius="4.0dip" />
+</shape>
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_primary_700_pressed.xml b/com.discord/res/drawable/drawable_button_primary_700_pressed.xml
new file mode 100644
index 0000000000..6071631add
--- /dev/null
+++ b/com.discord/res/drawable/drawable_button_primary_700_pressed.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/primary_800" />
+    <corners android:radius="4.0dip" />
+</shape>
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_spotify_button_disabled.xml b/com.discord/res/drawable/drawable_spotify_button_disabled.xml
new file mode 100644
index 0000000000..0fc8995ded
--- /dev/null
+++ b/com.discord/res/drawable/drawable_spotify_button_disabled.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset android:insetLeft="@dimen/uikit_btn_inset_horizontal_material" android:insetRight="@dimen/uikit_btn_inset_horizontal_material" android:insetTop="@dimen/uikit_btn_inset_vertical_material" android:insetBottom="@dimen/uikit_btn_inset_vertical_material"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="rectangle">
+        <corners android:radius="@dimen/uikit_btn_corner_radius" />
+        <solid android:color="@color/primary_300" />
+        <padding android:left="@dimen/uikit_btn_padding_horizontal" android:top="@dimen/uikit_btn_padding_vertical" android:right="@dimen/uikit_btn_padding_horizontal" android:bottom="@dimen/uikit_btn_padding_vertical" />
+    </shape>
+</inset>
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_spotify_button_enabled.xml b/com.discord/res/drawable/drawable_spotify_button_enabled.xml
new file mode 100644
index 0000000000..0478f6adbf
--- /dev/null
+++ b/com.discord/res/drawable/drawable_spotify_button_enabled.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset android:insetLeft="@dimen/uikit_btn_inset_horizontal_material" android:insetRight="@dimen/uikit_btn_inset_horizontal_material" android:insetTop="@dimen/uikit_btn_inset_vertical_material" android:insetBottom="@dimen/uikit_btn_inset_vertical_material"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="rectangle">
+        <corners android:radius="@dimen/uikit_btn_corner_radius" />
+        <solid android:color="@color/spotify" />
+        <padding android:left="@dimen/uikit_btn_padding_horizontal" android:top="@dimen/uikit_btn_padding_vertical" android:right="@dimen/uikit_btn_padding_horizontal" android:bottom="@dimen/uikit_btn_padding_vertical" />
+    </shape>
+</inset>
\ No newline at end of file
diff --git a/com.discord/res/drawable/rich_presence_spotify_play_button.xml b/com.discord/res/drawable/rich_presence_spotify_play_button.xml
new file mode 100644
index 0000000000..907c8bfab6
--- /dev/null
+++ b/com.discord/res/drawable/rich_presence_spotify_play_button.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:drawable="@drawable/drawable_spotify_button_disabled" />
+    <item android:state_enabled="true" android:drawable="@drawable/drawable_spotify_button_enabled" />
+</selector>
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/image_upload_dialog.xml b/com.discord/res/layout-v17/image_upload_dialog.xml
new file mode 100644
index 0000000000..a7692b20d7
--- /dev/null
+++ b/com.discord/res/layout-v17/image_upload_dialog.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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" />
+        <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" />
+            <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" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+    <View style="@style/UiKit.Divider" />
+    <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
+        <Button 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.Button.Transparent" />
+        <Button android:id="@id/notice_upload" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:text="@string/upload" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.Button" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/user_profile_header_badge.xml b/com.discord/res/layout-v17/user_profile_header_badge.xml
new file mode 100644
index 0000000000..32fdc8e8ed
--- /dev/null
+++ b/com.discord/res/layout-v17/user_profile_header_badge.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView android:id="@id/user_sheet_badge_image" android:layout_width="20.0dip" android:layout_height="20.0dip" android:layout_marginLeft="6.0dip" android:layout_marginTop="6.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="0.0dip" android:scaleType="fitCenter" android:contentDescription="@string/sample_empty_string" android:layout_marginStart="6.0dip" android:layout_marginEnd="0.0dip" 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-v17/user_profile_header_view.xml b/com.discord/res/layout-v17/user_profile_header_view.xml
new file mode 100644
index 0000000000..9d71791e30
--- /dev/null
+++ b/com.discord/res/layout-v17/user_profile_header_view.xml
@@ -0,0 +1,11 @@
+<?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" 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.widgets.user.profile.UserAvatarPresenceView android:id="@id/user_profile_avatar_presence" 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_marginRight="@dimen/uikit_spacing_large" 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" style="@style/UiKit.ViewGroup.LinearLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@id/user_profile_header_primary_name" android:singleLine="false" style="@style/UiKit.TextView.Bold" />
+        <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" />
+    </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="parent" 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-v17/view_account_credit.xml b/com.discord/res/layout-v17/view_account_credit.xml
new file mode 100644
index 0000000000..759358fdd3
--- /dev/null
+++ b/com.discord/res/layout-v17/view_account_credit.xml
@@ -0,0 +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="32.0dip" android:layout_height="32.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">
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:id="@id/credit_header" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_200" android:ellipsize="end" android:id="@id/credit_info" android:maxLines="2" style="@style/UiKit.TextView" />
+    </LinearLayout>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/credit_time" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" 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-v17/view_premium_settings_tier_2.xml b/com.discord/res/layout-v17/view_premium_settings_tier_2.xml
index e889610b48..ab08881604 100644
--- a/com.discord/res/layout-v17/view_premium_settings_tier_2.xml
+++ b/com.discord/res/layout-v17/view_premium_settings_tier_2.xml
@@ -5,8 +5,8 @@
         <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:layout_marginLeft="@dimen/uikit_spacing_large" 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" />
     </LinearLayout>
-    <TextView android:textSize="20.0sp" android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_tier_2_repositioned_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_repositioned_subtitle" style="@style/UiKit.TextView" />
+    <TextView android:textSize="20.0sp" 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:background="@drawable/button_status_green_500" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" />
     <Button android:id="@id/premium_settings_premium_monthly" style="@style/UiKit.Button.Grey" />
     <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" />
diff --git a/com.discord/res/layout-v17/view_server_settings_icon_name.xml b/com.discord/res/layout-v17/view_server_settings_icon_name.xml
index b4c4754eb3..ec4107ee8e 100644
--- a/com.discord/res/layout-v17/view_server_settings_icon_name.xml
+++ b/com.discord/res/layout-v17/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:background="?selectableItemBackground" 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"
   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.Large.ExtraExtra" />
+    <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" 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" />
     <com.discord.app.AppTextView 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.Semibold" />
     <TextView 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.Semibold" />
-    <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" 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.Form.Field.EditText.Wrap">
+    <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@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.Form.Field.EditText.Wrap">
         <EditText android:id="@id/server_settings_overview_name" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:hint="@string/form_label_server_name" style="@style/UiKit.Form.Field.EditText" />
     </com.google.android.material.textfield.TextInputLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/view_user_avatar_presence.xml b/com.discord/res/layout-v17/view_user_avatar_presence.xml
index bf57834517..1638e7cef7 100644
--- a/com.discord/res/layout-v17/view_user_avatar_presence.xml
+++ b/com.discord/res/layout-v17/view_user_avatar_presence.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout android:id="@id/user_avatar_presence_container" android:layout_width="wrap_content" 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_avatar_presence_avatar" android:layout_centerVertical="true" app:roundWithOverlayColor="?primary_630" style="@style/Avatar.Large" />
-    <RelativeLayout android:layout_width="@dimen/avatar_status_size_extra" android:layout_height="@dimen/avatar_status_size_extra" android:layout_alignRight="@id/user_avatar_presence_avatar" android:layout_alignBottom="@id/user_avatar_presence_avatar" android:layout_alignEnd="@id/user_avatar_presence_avatar">
-        <com.facebook.drawee.view.SimpleDraweeView android:layout_width="fill_parent" android:layout_height="fill_parent" app:placeholderImage="?primary_630" app:roundAsCircle="true" />
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_avatar_presence_indicator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="@dimen/avatar_status_size_extra_margin" android:layout_centerInParent="true" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_avatar_presence_avatar" android:layout_centerVertical="true" app:roundWithOverlayColor="?primary_700" style="@style/Avatar.XXLarge" />
+    <RelativeLayout android:layout_width="@dimen/avatar_status_size_extra_xxlarge" android:layout_height="@dimen/avatar_status_size_extra_xxlarge" android:layout_alignRight="@id/user_avatar_presence_avatar" android:layout_alignBottom="@id/user_avatar_presence_avatar" android:layout_alignEnd="@id/user_avatar_presence_avatar">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_avatar_presence_padding_image" android:layout_width="fill_parent" android:layout_height="fill_parent" app:placeholderImage="?primary_700" app:roundAsCircle="true" />
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_avatar_presence_indicator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="@dimen/avatar_status_size_extra_margin_xxlarge" android:layout_centerInParent="true" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/view_video_call_participant.xml b/com.discord/res/layout-v17/view_video_call_participant.xml
index 3b89ebc48b..476a8236c4 100644
--- a/com.discord/res/layout-v17/view_video_call_participant.xml
+++ b/com.discord/res/layout-v17/view_video_call_participant.xml
@@ -5,6 +5,7 @@
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/participant_bg_avatar" android:layout_width="fill_parent" android:layout_height="fill_parent" />
         <View android:id="@id/participant_bg_letterbox" android:background="@android:color/black" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
         <com.discord.views.VoiceUserView android:id="@id/participant_voice_user_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" app:vuv_avatar_size="@dimen/avatar_size_large" />
+        <com.discord.views.video.AppVideoStreamRenderer android:id="@id/participant_video_stream_renderer" android:layout_width="fill_parent" android:layout_height="fill_parent" app:vcpv_is_overlay="true" app:vcpv_match_video_orientation="false" />
     </RelativeLayout>
     <ImageView android:id="@id/participant_voice_status_indicator" android:background="@drawable/drawable_bg_voice_status_indicator" android:padding="4.0dip" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="8.0dip" android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:layout_marginEnd="8.0dip" android:layout_alignParentEnd="true" />
     <RelativeLayout android:id="@id/participant_video_loading_indicator" android:background="@android:color/black" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent">
diff --git a/com.discord/res/layout-v17/voice_user_list_item_user.xml b/com.discord/res/layout-v17/voice_user_list_item_user.xml
new file mode 100644
index 0000000000..e6b87f2bbd
--- /dev/null
+++ b/com.discord/res/layout-v17/voice_user_list_item_user.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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" 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.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="52.0dip" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" 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="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@id/voice_user_list_item_live_indicator" android:background="@drawable/drawable_rect_rounded_red_500" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/live" android:textAllCaps="true" android:fontFamily="@font/whitney_semibold" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
+    <ImageView android:id="@id/voice_user_list_item_mute_indicator" android:padding="8.0dip" android:src="@drawable/ic_mic_grey_24dp" android:contentDescription="@string/form_label_muted" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/voice_user_list_item_deafen_indicator" android:padding="8.0dip" android:src="@drawable/ic_headset_grey_24dp" android:contentDescription="@string/sound_deafen" style="@style/UiKit.ImageView" />
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/widget_channel_group_dm_settings.xml b/com.discord/res/layout-v17/widget_channel_group_dm_settings.xml
index d11c3ee806..537ae3af38 100644
--- a/com.discord/res/layout-v17/widget_channel_group_dm_settings.xml
+++ b/com.discord/res/layout-v17/widget_channel_group_dm_settings.xml
@@ -7,11 +7,11 @@
     <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">
-                <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.Large.ExtraExtra" />
+                <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" 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: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.Semibold" />
                 <TextView 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.Semibold" />
-                <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" 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.Form.Field.EditText.Wrap">
+                <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@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.Form.Field.EditText.Wrap">
                     <EditText android:id="@id/channel_settings_edit_name" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:hint="@string/form_label_channel_name" style="@style/UiKit.Form.Field.EditText" />
                 </com.google.android.material.textfield.TextInputLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/com.discord/res/layout-v17/widget_guild_invite_share_empty_suggestions.xml b/com.discord/res/layout-v17/widget_guild_invite_share_empty_suggestions.xml
new file mode 100644
index 0000000000..482335d0eb
--- /dev/null
+++ b/com.discord/res/layout-v17/widget_guild_invite_share_empty_suggestions.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
+  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" />
+    </com.google.android.material.appbar.AppBarLayout>
+    <LinearLayout android:id="@id/guild_invite_empty_suggestions_container" android:clipChildren="false" android:clipToPadding="false" android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.Page.LinearLayout">
+        <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:background="@color/primary_600" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large">
+            <ImageView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="@drawable/img_plus_illo" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+            <TextView android:gravity="center" android:id="@id/guild_invite_friends_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/instant_invite_friends" style="@style/UiKit.TextView.H1" />
+            <TextView android:gravity="center" android:id="@id/guild_invite_friends_subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:text="@string/instant_invite_friends_description" style="@style/UiKit.TextView" />
+            <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_empty_suggestions_invite_link" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" 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_empty_suggestions_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/share_invite_link_for_access" />
+            </LinearLayout>
+            <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
+                <TextView android:id="@id/guild_invite_empty_suggestions_settings_invite_link_subtext" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Subtext" />
+                <Button android:id="@id/guild_invite_empty_suggestions_invite_share_btn" android:layout_width="fill_parent" android:text="@string/share_link" style="@style/UiKit.Button" />
+            </LinearLayout>
+        </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" />
+    <com.discord.widgets.guilds.invite.ViewInviteSettingsSheet android:id="@id/invite_settings_bottom_sheet" android:background="?primary_630" style="@style/UiKit.ViewGroup.LinearLayout.BottomSheet" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/widget_main_panel_left.xml b/com.discord/res/layout-v17/widget_main_panel_left.xml
index e7dda81316..05cc35c665 100644
--- a/com.discord/res/layout-v17/widget_main_panel_left.xml
+++ b/com.discord/res/layout-v17/widget_main_panel_left.xml
@@ -5,6 +5,6 @@
     <fragment 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_toRightOf="@id/widget_guilds" android:layout_above="@id/widget_profile_strip" android:layout_toEndOf="@id/widget_guilds" />
     <View android:background="@color/black_alpha_20" android:layout_width="0.25dip" android:layout_height="fill_parent" android:layout_alignRight="@id/widget_guilds" android:layout_alignEnd="@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" />
-    <fragment android:name="com.discord.widgets.user.WidgetUserProfileStrip" android:id="@id/widget_profile_strip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" />
+    <fragment android:name="com.discord.widgets.user.profile.WidgetUserProfileStrip" 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_marginLeft="14.0dip" 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-v17/widget_music_rich_presence.xml b/com.discord/res/layout-v17/widget_music_rich_presence.xml
index 7e793b8019..6ce1750baf 100644
--- a/com.discord/res/layout-v17/widget_music_rich_presence.xml
+++ b/com.discord/res/layout-v17/widget_music_rich_presence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.ConstraintLayout"
+<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.UserSheetRichPresenceContainer"
   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/UiKit.Settings.Item.Header" />
     <androidx.constraintlayout.widget.Guideline android:orientation="vertical" android:id="@id/embed_guideline" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintGuide_begin="@dimen/uikit_spacing_large" />
@@ -18,7 +18,7 @@
             <TextView android:id="@id/rich_presence_music_duration" android:layout_width="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
-    <FrameLayout android:id="@id/rich_presence_play_button" android:background="@color/rich_presence_spotify_play_button" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" 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" android:layout_marginBottom="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground" app:layout_constraintTop_toBottomOf="@id/rich_presence_container_data">
+    <FrameLayout android:id="@id/rich_presence_play_button" android:background="@drawable/rich_presence_spotify_play_button" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" 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" android:layout_marginBottom="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground" app:layout_constraintTop_toBottomOf="@id/rich_presence_container_data">
         <TextView android:textColor="@color/primary_100" android:ellipsize="end" android:gravity="center_vertical" android:layout_gravity="center" android:id="@id/rich_presence_play_button_text" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:text="@string/user_activity_play_on_platform" android:maxLines="1" android:drawableLeft="@drawable/ic_spotify_white_24dp" android:drawablePadding="@dimen/uikit_textsize_medium" android:textAllCaps="true" android:drawableStart="@drawable/ic_spotify_white_24dp" style="@style/UiKit.TextView.Semibold" />
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/widget_notice_nux_overlay.xml b/com.discord/res/layout-v17/widget_notice_nux_overlay.xml
index 55d38a71a4..1ca89a06cd 100644
--- a/com.discord/res/layout-v17/widget_notice_nux_overlay.xml
+++ b/com.discord/res/layout-v17/widget_notice_nux_overlay.xml
@@ -3,7 +3,7 @@
   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="24.0dip" android:text="@string/nux_overlay_title" android:lineSpacingMultiplier="1.0" android:textAllCaps="false" style="@style/UiKit.Dialog.Title" />
+        <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">
             <Button android:id="@id/enable_button" android:text="@string/nux_overlay_enable" style="@style/UiKit.Button" />
diff --git a/com.discord/res/layout-v17/widget_notice_nux_samsung_link.xml b/com.discord/res/layout-v17/widget_notice_nux_samsung_link.xml
new file mode 100644
index 0000000000..91d9bb50af
--- /dev/null
+++ b/com.discord/res/layout-v17/widget_notice_nux_samsung_link.xml
@@ -0,0 +1,13 @@
+<?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"
+  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">
+            <Button android:id="@id/enable_button" android:text="@string/nux_samsung_game_presence_link_enable" style="@style/UiKit.Button" />
+            <Button android:id="@id/cancel_button" android:text="@string/no_thanks" style="@style/UiKit.Button.Transparent" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/widget_platform_rich_prescence.xml b/com.discord/res/layout-v17/widget_platform_rich_prescence.xml
index b260761500..3b449af93d 100644
--- a/com.discord/res/layout-v17/widget_platform_rich_prescence.xml
+++ b/com.discord/res/layout-v17/widget_platform_rich_prescence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.ConstraintLayout"
+<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.UserSheetRichPresenceContainer"
   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/UiKit.Settings.Item.Header" />
     <androidx.constraintlayout.widget.Guideline android:orientation="vertical" android:id="@id/embed_guideline" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintGuide_begin="@dimen/uikit_spacing_large" />
diff --git a/com.discord/res/layout-v17/widget_settings_voice.xml b/com.discord/res/layout-v17/widget_settings_voice.xml
index c2a2de06d2..23f6144f47 100644
--- a/com.discord/res/layout-v17/widget_settings_voice.xml
+++ b/com.discord/res/layout-v17/widget_settings_voice.xml
@@ -2,7 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
   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 app:navigationContentDescription="@string/back" app:navigationIcon="?ic_action_bar_back" app:subtitle="@string/voice" app:title="@string/user_settings" style="@style/AppTheme.Toolbar" />
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/back" app:navigationIcon="?ic_action_bar_back" app:subtitle="@string/user_settings" app:title="@string/voice_and_video" style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
diff --git a/com.discord/res/layout-v17/widget_spectate_report_problem.xml b/com.discord/res/layout-v17/widget_spectate_report_problem.xml
new file mode 100644
index 0000000000..25d102c170
--- /dev/null
+++ b/com.discord/res/layout-v17/widget_spectate_report_problem.xml
@@ -0,0 +1,23 @@
+<?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">
+    <LinearLayout android:id="@id/notice_header_container" style="@style/UiKit.ViewGroup.LinearLayout">
+        <TextView android:id="@id/report_problem_header" android:padding="@dimen/uikit_spacing_large" android:text="@string/stream_report_a_problem" style="@style/UiKit.TextView.H1.Bold" />
+        <View style="@style/UiKit.Divider" />
+    </LinearLayout>
+    <ScrollView android:layout_width="fill_parent" android:layout_height="200.0dip">
+        <RadioGroup android:id="@id/report_error_radio_group" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+            <RadioButton android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/report_error_stream_black" android:layout_width="fill_parent" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_black" style="@style/UiKit.TextView" />
+            <RadioButton android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/report_error_blurry" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_blurry" style="@style/UiKit.TextView" />
+            <RadioButton android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/report_error_lagging" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_lagging" style="@style/UiKit.TextView" />
+            <RadioButton android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/report_error_out_of_sync" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_out_of_sync" style="@style/UiKit.TextView" />
+            <RadioButton android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/report_error_audio_absent" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_audio_missing" style="@style/UiKit.TextView" />
+            <RadioButton android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/report_error_audio_poor" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_audio_poor" style="@style/UiKit.TextView" />
+        </RadioGroup>
+    </ScrollView>
+    <View style="@style/UiKit.Settings.Divider" />
+    <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
+        <Button android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@id/report_problem_cancel" android:background="?selectableItemBackground" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:text="@string/cancel" android:layout_marginStart="@dimen/uikit_spacing_medium" />
+        <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/report_problem_submit" android:background="@drawable/drawable_button_green_neutral" android:padding="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:fontFamily="@font/whitney_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" app:lb_disabled_alpha="0.5" app:lb_text="@string/stream_report_submit" app:lb_text_color="@color/white" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/widget_spectate_stream_full.xml b/com.discord/res/layout-v17/widget_spectate_stream_full.xml
new file mode 100644
index 0000000000..2fe0ddb121
--- /dev/null
+++ b/com.discord/res/layout-v17/widget_spectate_stream_full.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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_header" style="@style/UiKit.TextView.H1.Bold" />
+        <View style="@style/UiKit.Divider" />
+    </LinearLayout>
+    <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:textColor="@color/primary_200" android:id="@id/cancel_premium_grandfathered" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_full_modal_body" android:fontFamily="@font/whitney_bold" style="@style/UiKit.TextView" />
+        <ImageView android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/img_wumpus_tophat_dark" />
+    </LinearLayout>
+    <View style="@style/UiKit.Settings.Divider" />
+    <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
+        <Button android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@id/stream_full_confirm" android:background="@drawable/drawable_button_purple" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:text="@string/okay" android:layout_marginStart="@dimen/uikit_spacing_medium" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/widget_stream_feedback_dialog.xml b/com.discord/res/layout-v17/widget_stream_feedback_dialog.xml
new file mode 100644
index 0000000000..4c2d8b8ddd
--- /dev/null
+++ b/com.discord/res/layout-v17/widget_stream_feedback_dialog.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:animateLayoutChanges="false" 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:padding="@dimen/uikit_spacing_large" android:text="@string/stream_report_a_problem_post_stream" style="@style/UiKit.TextView.H1.Bold" />
+        <View style="@style/UiKit.Divider" />
+    </LinearLayout>
+    <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:animateLayoutChanges="false" style="@style/UiKit.ViewGroup.LinearLayout">
+        <TextView android:textColor="@color/primary_200" android:id="@id/cancel_premium_grandfathered" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_rating_body" android:fontFamily="@font/whitney_bold" style="@style/UiKit.TextView" />
+        <LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="64.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:animateLayoutChanges="false">
+            <ImageView android:id="@id/stream_feedback_sad" 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="@drawable/drawable_stream_feedback_face_sad_grayscale" />
+            <ImageView android:id="@id/stream_feedback_neutral" 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="@drawable/drawable_stream_feedback_face_neutral_grayscale" />
+            <ImageView android:id="@id/stream_feedback_happy" 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="@drawable/drawable_stream_feedback_face_happy_grayscale" />
+        </LinearLayout>
+        <TextView android:textColor="?primary_200" android:id="@id/stream_feedback_reason_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_problem_header_mobile" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
+        <Spinner android:id="@id/stream_feedback_reason_spinner" android:background="?bg_payment_method_spinner_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:popupBackground="?bg_payment_method_spinner_dropdown" />
+    </LinearLayout>
+    <View style="@style/UiKit.Settings.Divider" />
+    <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
+        <Button android:textColor="?primary_300" android:layout_gravity="center_vertical" android:id="@id/stream_feedback_cancel" android:background="@color/transparent" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:foreground="?selectableItemBackground" android:text="@string/cancel" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.Button" />
+        <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/stream_feedback_submit" android:background="@drawable/drawable_button_purple_neutral" android:padding="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:fontFamily="@font/whitney_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" app:lb_disabled_alpha="0.5" app:lb_text="@string/stream_report_submit" app:lb_text_color="@color/white" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/widget_stream_rich_presence.xml b/com.discord/res/layout-v17/widget_stream_rich_presence.xml
index 8f88506794..d92cfe9004 100644
--- a/com.discord/res/layout-v17/widget_stream_rich_presence.xml
+++ b/com.discord/res/layout-v17/widget_stream_rich_presence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.ConstraintLayout"
+<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.UserSheetRichPresenceContainer"
   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/UiKit.Settings.Item.Header" />
     <androidx.constraintlayout.widget.Guideline android:orientation="vertical" android:id="@id/embed_guideline" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintGuide_begin="@dimen/uikit_spacing_large" />
@@ -20,7 +20,7 @@
         <TextView android:id="@id/rich_presence_state" style="@style/UiKit.TextView.Marquee" />
         <TextView android:id="@id/rich_presence_time" style="@style/UiKit.TextView.Marquee" />
     </LinearLayout>
-    <FrameLayout android:id="@id/rich_presence_watch_button" android:background="@color/brand_500" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground" app:layout_constraintEnd_toEndOf="@id/embed_guideline_right" app:layout_constraintLeft_toLeftOf="@id/embed_guideline" app:layout_constraintRight_toRightOf="@id/embed_guideline_right" app:layout_constraintStart_toStartOf="@id/embed_guideline" app:layout_constraintTop_toBottomOf="@id/rich_presence_container_data">
+    <FrameLayout android:id="@id/rich_presence_watch_button" android:background="@color/brand_500" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground" app:layout_constraintEnd_toEndOf="@id/embed_guideline_right" app:layout_constraintLeft_toLeftOf="@id/embed_guideline" app:layout_constraintRight_toRightOf="@id/embed_guideline_right" app:layout_constraintStart_toStartOf="@id/embed_guideline" app:layout_constraintTop_toBottomOf="@id/rich_presence_container_data">
         <TextView android:textColor="@color/primary_100" android:ellipsize="end" android:gravity="center_vertical" android:layout_gravity="center" android:id="@id/rich_presence_play_button_text" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:text="@string/watch_stream" android:maxLines="1" android:drawableLeft="@drawable/ic_live_stream_white_24dp" android:drawablePadding="@dimen/uikit_textsize_medium" android:textAllCaps="true" android:drawableStart="@drawable/ic_live_stream_white_24dp" style="@style/UiKit.TextView.Semibold" />
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/widget_user_profile_header.xml b/com.discord/res/layout-v17/widget_user_profile_header.xml
deleted file mode 100644
index 19fbb8134a..0000000000
--- a/com.discord/res/layout-v17/widget_user_profile_header.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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_large" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable"
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <RelativeLayout android:layout_gravity="center_horizontal" android:id="@id/profile_header_avatar_wrap" 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">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/profile_header_avatar" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginLeft="@dimen/avatar_status_size_hero_margin" android:layout_marginRight="@dimen/avatar_status_size_hero_margin" android:layout_marginBottom="@dimen/avatar_status_size_hero_margin" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" android:layout_marginStart="@dimen/avatar_status_size_hero_margin" android:layout_marginEnd="@dimen/avatar_status_size_hero_margin" app:roundWithOverlayColor="?primary_630" style="@style/Avatar.Hero" />
-        <RelativeLayout android:layout_width="@dimen/avatar_status_size_hero" android:layout_height="@dimen/avatar_status_size_hero" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" style="@style/UiKit.ViewGroup.RelativeLayout">
-            <com.facebook.drawee.view.SimpleDraweeView android:layout_width="fill_parent" android:layout_height="fill_parent" app:placeholderImage="?primary_630" app:roundAsCircle="true" />
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/profile_header_presence_indicator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="@dimen/avatar_status_size_hero_margin" android:layout_centerInParent="true" app:placeholderImage="@drawable/ic_status_invisible_16dp" app:placeholderImageScaleType="fitCenter" app:roundAsCircle="true" />
-        </RelativeLayout>
-    </RelativeLayout>
-    <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
-        <androidx.cardview.widget.CardView android:id="@id/profile_header_badge_wrap_outer" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorPrimary" app:cardCornerRadius="14.0dip">
-            <LinearLayout android:gravity="center" android:id="@id/profile_header_badge_wrap" 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_width="wrap_content" android:layout_height="fill_parent" android:layout_centerInParent="true" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                <LinearLayout android:id="@id/user_profile_header_badges" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
-                <TextView android:textColor="?primary_400" android:id="@id/profile_header_badge_text" android:paddingLeft="6.0dip" android:paddingRight="6.0dip" android:singleLine="true" android:textAllCaps="true" android:paddingStart="6.0dip" android:paddingEnd="6.0dip" style="@style/UiKit.TextView.Subtext.Semibold" />
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
-        <TextView android:id="@id/profile_header_username" android:singleLine="true" style="@style/UiKit.TextView.H1" />
-        <TextView android:id="@id/profile_header_activity_status" android:layout_marginTop="@dimen/uikit_spacing_small" android:singleLine="true" style="@style/UiKit.TextView" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/widget_user_rich_presence.xml b/com.discord/res/layout-v17/widget_user_rich_presence.xml
index c3e30fa37b..7d50eca1bb 100644
--- a/com.discord/res/layout-v17/widget_user_rich_presence.xml
+++ b/com.discord/res/layout-v17/widget_user_rich_presence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.ConstraintLayout"
+<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.UserSheetRichPresenceContainer"
   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/UiKit.Settings.Item.Header" />
     <androidx.constraintlayout.widget.Guideline android:orientation="vertical" android:id="@id/embed_guideline" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintGuide_begin="@dimen/uikit_spacing_large" />
diff --git a/com.discord/res/layout-v17/widget_user_sheet.xml b/com.discord/res/layout-v17/widget_user_sheet.xml
new file mode 100644
index 0000000000..66feb89024
--- /dev/null
+++ b/com.discord/res/layout-v17/widget_user_sheet.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView android:background="?primary_700" style="@style/UiKit.ViewGroup.NestedScrollView"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
+        <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:user_profile_header_background_color="?primary_700" />
+        <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:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <Button android:id="@id/user_sheet_message_action_button" android:text="@string/user_profile_message" android:drawableTop="@drawable/ic_user_profile_action_message" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+            <Button android:id="@id/user_sheet_call_action_button" android:text="@string/user_profile_audio" android:drawableTop="@drawable/ic_user_profile_action_call" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+            <Button android:id="@id/user_sheet_video_action_button" android:text="@string/user_profile_video" android:drawableTop="@drawable/ic_user_profile_action_video" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+            <Button android:textColor="@color/status_green_500" android:id="@id/user_sheet_add_friend_action_button" android:visibility="gone" android:text="@string/user_profile_add_friend" android:drawableTop="@drawable/ic_user_profile_action_add_friend" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+            <Button android:textColor="@color/status_yellow_500" android:id="@id/user_sheet_pending_friend_request_action_button" android:visibility="gone" android:text="@string/user_profile_pending" android:drawableTop="@drawable/ic_user_profile_action_pending" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+        </LinearLayout>
+        <View android:id="@id/user_sheet_incoming_friend_request_divider" android:visibility="gone" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_incoming_friend_request_header" android:visibility="gone" android:text="@string/incoming_friend_request" style="@style/UiKit.Settings.Item.Header" />
+        <LinearLayout android:id="@id/user_sheet_friend_request_incoming_container" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" 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">
+            <Button android:id="@id/user_sheet_friend_request_ignore_button" android:minWidth="0.0dip" android:minHeight="0.0dip" android:text="@string/friend_request_ignore" android:layout_weight="1.0" style="@style/UiKit.Button.Grey" />
+            <Button android:id="@id/user_sheet_friend_request_accept_button" android:text="@string/friend_request_accept" android:layout_weight="1.0" style="@style/UiKit.Button.Green" />
+        </LinearLayout>
+        <LinearLayout android:id="@id/user_sheet_guild_container" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
+            <View android:id="@id/user_sheet_guild_divider" style="@style/UiKit.Divider" />
+            <TextView android:id="@id/user_sheet_guild_header" android:contentDescription="@string/user_profile_guild_name_content_description" style="@style/UiKit.Settings.Item.Header" />
+            <androidx.recyclerview.widget.RecyclerView android:id="@id/user_sheet_roles_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView" />
+        </LinearLayout>
+        <View android:id="@id/user_sheet_activity_divider" android:visibility="gone" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Settings.Divider" />
+        <FrameLayout android:id="@id/rich_presence_container" android:visibility="gone" style="@style/UiKit.ViewGroup" />
+        <View android:id="@id/user_sheet_audio_settings_divider" style="@style/UiKit.Divider" />
+        <LinearLayout android:id="@id/user_sheet_audio_settings_container" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:text="@string/voice_settings" style="@style/UiKit.Settings.Item.Header" />
+            <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                <ImageView android:id="@id/user_sheet_volume_icon" android:src="?ic_volume" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
+                <SeekBar android:id="@id/user_sheet_volume" android:layout_width="fill_parent" android:layout_height="wrap_content" android:maxHeight="8.0dip" android:max="100" android:progressDrawable="@drawable/drawable_settings_progress" android:thumb="@drawable/drawable_thumb_white" />
+            </LinearLayout>
+        </LinearLayout>
+        <androidx.appcompat.widget.SwitchCompat android:id="@id/user_sheet_muted" android:text="@string/form_label_local_mute" style="@style/UiKit.Settings.Item" />
+        <View android:id="@id/user_sheet_actions_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_actions_header" android:text="@string/actions" style="@style/UiKit.Settings.Item.Header" />
+        <TextView android:gravity="center_vertical" android:id="@id/user_sheet_profile" android:text="@string/profile" android:drawableLeft="?ic_account" android:drawableStart="?ic_account" style="@style/UiKit.Settings.Item.Icon" />
+        <View android:id="@id/user_sheet_administrative_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_administrative_header" android:text="@string/administrative" style="@style/UiKit.Settings.Item.Header" />
+        <TextView android:id="@id/user_sheet_server_edit_member" android:visibility="gone" android:text="@string/manage_user" android:drawableLeft="?ic_roles_a60" android:drawableStart="?ic_roles_a60" style="@style/UiKit.Settings.Item.Icon" />
+        <TextView android:id="@id/user_sheet_server_mute" android:visibility="gone" android:text="@string/server_voice_mute" android:drawableLeft="@drawable/ic_mic_red_24dp" android:drawableStart="@drawable/ic_mic_red_24dp" style="@style/UiKit.Settings.Item.Icon" />
+        <TextView android:id="@id/user_sheet_server_deafen" android:visibility="gone" android:text="@string/server_deafen" android:drawableLeft="@drawable/ic_headset_red_24dp" android:drawableStart="@drawable/ic_headset_red_24dp" style="@style/UiKit.Settings.Item.Icon" />
+        <TextView android:id="@id/user_sheet_server_move" android:visibility="gone" android:text="@string/move_to" android:drawableLeft="@drawable/ic_transfer_red_24dp" android:drawableStart="@drawable/ic_transfer_red_24dp" style="@style/UiKit.Settings.Item.Icon" />
+        <TextView android:id="@id/user_sheet_kick" android:visibility="gone" android:text="@string/kick" android:drawableLeft="@drawable/ic_remove_friend_red_24dp" android:drawableStart="@drawable/ic_remove_friend_red_24dp" style="@style/UiKit.Settings.Item.Icon" />
+        <TextView android:id="@id/user_sheet_ban" android:visibility="gone" android:text="@string/ban" android:drawableLeft="@drawable/ic_ban_red_24dp" android:drawableStart="@drawable/ic_ban_red_24dp" style="@style/UiKit.Settings.Item.Icon" />
+        <View android:id="@id/user_sheet_developer_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_developer_header" android:text="@string/developer_mode" style="@style/UiKit.Settings.Item.Header" />
+        <TextView android:id="@id/user_sheet_copy_id" android:visibility="gone" android:text="@string/copy_id" android:drawableLeft="?ic_copy" android:drawableStart="?ic_copy" style="@style/UiKit.Settings.Item.Icon" />
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/com.discord/res/layout-v21/view_server_settings_icon_name.xml b/com.discord/res/layout-v21/view_server_settings_icon_name.xml
index 0d983172fb..e7144a551c 100644
--- a/com.discord/res/layout-v21/view_server_settings_icon_name.xml
+++ b/com.discord/res/layout-v21/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:background="?selectableItemBackground" 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"
   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.Large.ExtraExtra" />
+    <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" />
     <com.discord.app.AppTextView 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.Semibold" />
     <TextView 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.Semibold" />
-    <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" 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.Form.Field.EditText.Wrap">
+    <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@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.Form.Field.EditText.Wrap">
         <EditText android:id="@id/server_settings_overview_name" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:hint="@string/form_label_server_name" style="@style/UiKit.Form.Field.EditText" />
     </com.google.android.material.textfield.TextInputLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v21/widget_channel_group_dm_settings.xml b/com.discord/res/layout-v21/widget_channel_group_dm_settings.xml
index a1893a3814..ac35f882ac 100644
--- a/com.discord/res/layout-v21/widget_channel_group_dm_settings.xml
+++ b/com.discord/res/layout-v21/widget_channel_group_dm_settings.xml
@@ -7,11 +7,11 @@
     <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">
-                <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.Large.ExtraExtra" />
+                <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" />
                 <com.discord.app.AppTextView 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.Semibold" />
                 <TextView 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.Semibold" />
-                <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" 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.Form.Field.EditText.Wrap">
+                <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@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.Form.Field.EditText.Wrap">
                     <EditText android:id="@id/channel_settings_edit_name" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:hint="@string/form_label_channel_name" style="@style/UiKit.Form.Field.EditText" />
                 </com.google.android.material.textfield.TextInputLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/com.discord/res/layout-v21/widget_user_sheet.xml b/com.discord/res/layout-v21/widget_user_sheet.xml
index 653938b0b8..0ebea5ff73 100644
--- a/com.discord/res/layout-v21/widget_user_sheet.xml
+++ b/com.discord/res/layout-v21/widget_user_sheet.xml
@@ -1,19 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView android:background="?primary_630" style="@style/UiKit.ViewGroup.NestedScrollView"
+<androidx.core.widget.NestedScrollView android:background="?primary_700" 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:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-        <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/user_sheet_header" android:focusable="true" android:clickable="true" style="@style/UiKit.Sheet.Header">
-            <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_sheet_header_guideline" style="@style/UiKit.Sheet.Guideline" />
-            <include android:id="@id/user_sheet_avatar_presence" 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_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" 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" layout="@layout/view_user_avatar_presence" />
-            <LinearLayout android:orientation="vertical" android:id="@id/user_sheet_name_wrap" style="@style/UiKit.Sheet.Header.Contents">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/user_sheet_primary_name" android:singleLine="true" style="@style/UiKit.TextView.Bold" />
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/user_sheet_secondary_name" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
-                <androidx.recyclerview.widget.RecyclerView android:id="@id/user_sheet_roles_recycler" android:paddingTop="@dimen/uikit_spacing_xsmall" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView" />
-            </LinearLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-        <View android:id="@id/user_sheet_activity_divider" android:visibility="gone" style="@style/UiKit.Settings.Divider" />
+    <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
+        <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:user_profile_header_background_color="?primary_700" />
+        <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:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <Button android:id="@id/user_sheet_message_action_button" android:text="@string/user_profile_message" android:drawableTop="@drawable/ic_user_profile_action_message" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+            <Button android:id="@id/user_sheet_call_action_button" android:text="@string/user_profile_audio" android:drawableTop="@drawable/ic_user_profile_action_call" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+            <Button android:id="@id/user_sheet_video_action_button" android:text="@string/user_profile_video" android:drawableTop="@drawable/ic_user_profile_action_video" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+            <Button android:textColor="@color/status_green_500" android:id="@id/user_sheet_add_friend_action_button" android:visibility="gone" android:text="@string/user_profile_add_friend" android:drawableTop="@drawable/ic_user_profile_action_add_friend" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+            <Button android:textColor="@color/status_yellow_500" android:id="@id/user_sheet_pending_friend_request_action_button" android:visibility="gone" android:text="@string/user_profile_pending" android:drawableTop="@drawable/ic_user_profile_action_pending" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+        </LinearLayout>
+        <View android:id="@id/user_sheet_incoming_friend_request_divider" android:visibility="gone" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_incoming_friend_request_header" android:visibility="gone" android:text="@string/incoming_friend_request" style="@style/UiKit.Settings.Item.Header" />
+        <LinearLayout android:id="@id/user_sheet_friend_request_incoming_container" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" 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">
+            <Button android:id="@id/user_sheet_friend_request_ignore_button" android:minWidth="0.0dip" android:minHeight="0.0dip" android:text="@string/friend_request_ignore" android:layout_weight="1.0" style="@style/UiKit.Button.Grey" />
+            <Button android:id="@id/user_sheet_friend_request_accept_button" android:text="@string/friend_request_accept" android:layout_weight="1.0" style="@style/UiKit.Button.Green" />
+        </LinearLayout>
+        <LinearLayout android:id="@id/user_sheet_guild_container" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
+            <View android:id="@id/user_sheet_guild_divider" style="@style/UiKit.Divider" />
+            <TextView android:id="@id/user_sheet_guild_header" android:contentDescription="@string/user_profile_guild_name_content_description" style="@style/UiKit.Settings.Item.Header" />
+            <androidx.recyclerview.widget.RecyclerView android:id="@id/user_sheet_roles_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView" />
+        </LinearLayout>
+        <View android:id="@id/user_sheet_activity_divider" android:visibility="gone" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Settings.Divider" />
         <FrameLayout android:id="@id/rich_presence_container" android:visibility="gone" style="@style/UiKit.ViewGroup" />
-        <View android:id="@id/user_sheet_audio_settings_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Settings.Divider" />
+        <View android:id="@id/user_sheet_audio_settings_divider" style="@style/UiKit.Divider" />
         <LinearLayout android:id="@id/user_sheet_audio_settings_container" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:text="@string/voice_settings" style="@style/UiKit.Settings.Item.Header" />
             <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
@@ -22,11 +33,10 @@
             </LinearLayout>
         </LinearLayout>
         <androidx.appcompat.widget.SwitchCompat android:id="@id/user_sheet_muted" android:text="@string/form_label_local_mute" style="@style/UiKit.Settings.Item" />
-        <View android:id="@id/user_sheet_actions_divider" style="@style/UiKit.Settings.Divider" />
-        <TextView android:text="@string/actions" style="@style/UiKit.Settings.Item.Header" />
+        <View android:id="@id/user_sheet_actions_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_actions_header" android:text="@string/actions" style="@style/UiKit.Settings.Item.Header" />
         <TextView android:gravity="center_vertical" android:id="@id/user_sheet_profile" android:text="@string/profile" android:drawableLeft="?ic_account" android:drawableStart="?ic_account" style="@style/UiKit.Settings.Item.Icon" />
-        <TextView android:id="@id/user_sheet_message" android:text="@string/send_message" android:drawableLeft="?ic_chat_bubble" android:drawableStart="?ic_chat_bubble" style="@style/UiKit.Settings.Item.Icon" />
-        <View android:id="@id/user_sheet_administrative_divider" style="@style/UiKit.Settings.Divider" />
+        <View android:id="@id/user_sheet_administrative_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
         <TextView android:id="@id/user_sheet_administrative_header" android:text="@string/administrative" style="@style/UiKit.Settings.Item.Header" />
         <TextView android:id="@id/user_sheet_server_edit_member" android:visibility="gone" android:text="@string/manage_user" android:drawableLeft="?ic_roles_a60" android:drawableStart="?ic_roles_a60" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/user_sheet_server_mute" android:visibility="gone" android:text="@string/server_voice_mute" android:drawableLeft="@drawable/ic_mic_red_24dp" android:drawableStart="@drawable/ic_mic_red_24dp" style="@style/UiKit.Settings.Item.Icon" />
@@ -34,7 +44,7 @@
         <TextView android:id="@id/user_sheet_server_move" android:visibility="gone" android:text="@string/move_to" android:drawableLeft="@drawable/ic_transfer_red_24dp" android:drawableStart="@drawable/ic_transfer_red_24dp" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/user_sheet_kick" android:visibility="gone" android:text="@string/kick" android:drawableLeft="@drawable/ic_remove_friend_red_24dp" android:drawableStart="@drawable/ic_remove_friend_red_24dp" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/user_sheet_ban" android:visibility="gone" android:text="@string/ban" android:drawableLeft="@drawable/ic_ban_red_24dp" android:drawableStart="@drawable/ic_ban_red_24dp" style="@style/UiKit.Settings.Item.Icon" />
-        <View android:id="@id/user_sheet_developer_divider" style="@style/UiKit.Settings.Divider" />
+        <View android:id="@id/user_sheet_developer_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
         <TextView android:id="@id/user_sheet_developer_header" android:text="@string/developer_mode" style="@style/UiKit.Settings.Item.Header" />
         <TextView android:id="@id/user_sheet_copy_id" android:visibility="gone" android:text="@string/copy_id" android:drawableLeft="?ic_copy" android:drawableStart="?ic_copy" style="@style/UiKit.Settings.Item.Icon" />
     </LinearLayout>
diff --git a/com.discord/res/layout/image_upload_dialog.xml b/com.discord/res/layout/image_upload_dialog.xml
new file mode 100644
index 0000000000..3fde48ca65
--- /dev/null
+++ b/com.discord/res/layout/image_upload_dialog.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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" />
+        <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" />
+            <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" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+    <View style="@style/UiKit.Divider" />
+    <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
+        <Button 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.Button.Transparent" />
+        <Button android:id="@id/notice_upload" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:text="@string/upload" style="@style/UiKit.Button" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/layout_account_credits_list.xml b/com.discord/res/layout/layout_account_credits_list.xml
new file mode 100644
index 0000000000..607888f777
--- /dev/null
+++ b/com.discord/res/layout/layout_account_credits_list.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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" app:cardBackgroundColor="?primary_630" 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">
+    <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
+        <com.discord.widgets.settings.premium.AccountCreditView android:id="@id/credit_nitro" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+        <View android:id="@id/credit_nitro_divider" style="@style/UiKit.Divider" />
+        <com.discord.widgets.settings.premium.AccountCreditView android:id="@id/credit_nitro_classic" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+    </LinearLayout>
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/stream_feedback_spinner_item.xml b/com.discord/res/layout/stream_feedback_spinner_item.xml
new file mode 100644
index 0000000000..8628d2a48f
--- /dev/null
+++ b/com.discord/res/layout/stream_feedback_spinner_item.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:textColor="@color/primary_100" android:id="@id/stream_feedback_spinner_text" android:background="@color/primary_660" android:padding="@dimen/uikit_spacing_medium" android:singleLine="true" 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/user_profile_header_badge.xml b/com.discord/res/layout/user_profile_header_badge.xml
new file mode 100644
index 0000000000..56f5a79821
--- /dev/null
+++ b/com.discord/res/layout/user_profile_header_badge.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView android:id="@id/user_sheet_badge_image" android:layout_width="20.0dip" android:layout_height="20.0dip" android:layout_marginLeft="6.0dip" android:layout_marginTop="6.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="0.0dip" android:scaleType="fitCenter" android:contentDescription="@string/sample_empty_string" 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/user_profile_header_view.xml b/com.discord/res/layout/user_profile_header_view.xml
new file mode 100644
index 0000000000..2276fe376f
--- /dev/null
+++ b/com.discord/res/layout/user_profile_header_view.xml
@@ -0,0 +1,11 @@
+<?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" 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.widgets.user.profile.UserAvatarPresenceView android:id="@id/user_profile_avatar_presence" 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_marginRight="@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" style="@style/UiKit.ViewGroup.LinearLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@id/user_profile_header_primary_name" android:singleLine="false" style="@style/UiKit.TextView.Bold" />
+        <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" />
+    </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="parent" 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/view_account_credit.xml b/com.discord/res/layout/view_account_credit.xml
new file mode 100644
index 0000000000..9093c11194
--- /dev/null
+++ b/com.discord/res/layout/view_account_credit.xml
@@ -0,0 +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="32.0dip" android:layout_height="32.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">
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:id="@id/credit_header" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_200" android:ellipsize="end" android:id="@id/credit_info" android:maxLines="2" style="@style/UiKit.TextView" />
+    </LinearLayout>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/credit_time" android:layout_marginRight="@dimen/uikit_spacing_large" 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_application_stream.xml b/com.discord/res/layout/view_application_stream.xml
new file mode 100644
index 0000000000..99f0d9dc37
--- /dev/null
+++ b/com.discord/res/layout/view_application_stream.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-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">
+    <RelativeLayout android:id="@id/participant_video_loading_indicator" android:background="@android:color/black" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent">
+        <ProgressBar android:layout_width="50.0dip" android:layout_height="50.0dip" android:indeterminate="true" android:layout_centerInParent="true" />
+    </RelativeLayout>
+</merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_golive_stream.xml b/com.discord/res/layout/view_golive_stream.xml
new file mode 100644
index 0000000000..48a44e074a
--- /dev/null
+++ b/com.discord/res/layout/view_golive_stream.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge android:layout_width="fill_parent" android:layout_height="fill_parent"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout android:gravity="center_horizontal" android:layout_gravity="center_vertical" android:id="@id/golive_stream_ended" android:background="@color/primary_700" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingBottom="@dimen/uikit_spacing_xxlarge" android:visibility="gone" 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/drawable_stream_ended" android:importantForAccessibility="no" />
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/white" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_ended" android:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView" />
+    </LinearLayout>
+    <com.discord.views.video.AppVideoStreamRenderer android:id="@id/golive_stream_video_renderer" android:background="@color/black" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center" android:id="@id/golive_stream_paused" android:background="@color/black_alpha_70" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" android:text="Stream Paused" android:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView" />
+    <RelativeLayout android:id="@id/golive_stream_loading_indicator" android:background="@color/black" android:layout_width="fill_parent" android:layout_height="fill_parent">
+        <ProgressBar android:layout_width="50.0dip" android:layout_height="50.0dip" android:indeterminate="true" android:layout_centerInParent="true" />
+    </RelativeLayout>
+</merge>
\ 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 88852bbb27..bd72610730 100644
--- a/com.discord/res/layout/view_premium_settings_perks.xml
+++ b/com.discord/res/layout/view_premium_settings_perks.xml
@@ -7,7 +7,7 @@
     <TextView android:text="@string/premium_chat_perks_streaming_mobile" android:drawableLeft="@drawable/ic_nitro_perk_stream_24dp" android:drawableStart="@drawable/ic_nitro_perk_stream_24dp" style="@style/UiKit.TextView.Perk" />
     <TextView android:text="@string/premium_chat_perks_screenshare_mobile" android:drawableLeft="@drawable/ic_nitro_highquality_24dp" android:drawableStart="@drawable/ic_nitro_highquality_24dp" style="@style/UiKit.TextView.Perk" />
     <TextView android:text="@string/premium_chat_perks_custom_emoji_mobile" android:drawableLeft="@drawable/ic_nitro_globalemojis_24dp" android:drawableStart="@drawable/ic_nitro_globalemojis_24dp" style="@style/UiKit.TextView.Perk" />
-    <TextView android:id="@id/premium_perks_upload_text" android:text="@string/premium_chat_perks_upload_mobile" android:drawableLeft="@drawable/ic_upload_24dp" android:drawableStart="@drawable/ic_upload_24dp" style="@style/UiKit.TextView.Perk" />
+    <TextView android:id="@id/premium_perks_upload_text" android:text="@string/premium_chat_perks_description_upload_limit" android:drawableLeft="@drawable/ic_upload_24dp" android:drawableStart="@drawable/ic_upload_24dp" style="@style/UiKit.TextView.Perk" />
     <TextView android:text="@string/premium_chat_perks_rep_mobile" android:drawableLeft="@drawable/ic_nitro_rep_24dp" android:drawableStart="@drawable/ic_nitro_rep_24dp" style="@style/UiKit.TextView.Perk" />
     <TextView android:text="@string/premium_chat_perks_premium_guild_subscription" android:drawableLeft="@drawable/ic_boosted_badge_24dp" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView.Perk" />
 </LinearLayout>
\ No newline at end of file
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 7e191eb7d5..61a36ea40e 100644
--- a/com.discord/res/layout/view_premium_settings_tier_1.xml
+++ b/com.discord/res/layout/view_premium_settings_tier_1.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:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="20.0sp" android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_chat_perks_simple_title_mobile" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="20.0sp" 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">
         <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" />
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 b144174bea..9d5f35c273 100644
--- a/com.discord/res/layout/view_premium_settings_tier_2.xml
+++ b/com.discord/res/layout/view_premium_settings_tier_2.xml
@@ -5,8 +5,8 @@
         <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:layout_marginLeft="@dimen/uikit_spacing_large" android:src="@drawable/img_wumpus_jetpack" android:adjustViewBounds="true" android:scaleX="-1.0" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
     </LinearLayout>
-    <TextView android:textSize="20.0sp" android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_tier_2_repositioned_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_repositioned_subtitle" style="@style/UiKit.TextView" />
+    <TextView android:textSize="20.0sp" 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:background="@drawable/button_status_green_500" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" />
     <Button android:id="@id/premium_settings_premium_monthly" style="@style/UiKit.Button.Grey" />
     <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" />
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 9259f69302..659944ce9d 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:background="?selectableItemBackground" 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"
   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.Large.ExtraExtra" />
+    <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" 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" />
     <com.discord.app.AppTextView 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" 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.Semibold" />
     <TextView 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.Semibold" />
-    <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" 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.Form.Field.EditText.Wrap">
+    <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@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.Form.Field.EditText.Wrap">
         <EditText android:id="@id/server_settings_overview_name" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:hint="@string/form_label_server_name" style="@style/UiKit.Form.Field.EditText" />
     </com.google.android.material.textfield.TextInputLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_user_avatar_presence.xml b/com.discord/res/layout/view_user_avatar_presence.xml
index 384cd10aee..a9e5f4304a 100644
--- a/com.discord/res/layout/view_user_avatar_presence.xml
+++ b/com.discord/res/layout/view_user_avatar_presence.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout android:id="@id/user_avatar_presence_container" android:layout_width="wrap_content" 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_avatar_presence_avatar" android:layout_centerVertical="true" app:roundWithOverlayColor="?primary_630" style="@style/Avatar.Large" />
-    <RelativeLayout android:layout_width="@dimen/avatar_status_size_extra" android:layout_height="@dimen/avatar_status_size_extra" android:layout_alignRight="@id/user_avatar_presence_avatar" android:layout_alignBottom="@id/user_avatar_presence_avatar">
-        <com.facebook.drawee.view.SimpleDraweeView android:layout_width="fill_parent" android:layout_height="fill_parent" app:placeholderImage="?primary_630" app:roundAsCircle="true" />
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_avatar_presence_indicator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="@dimen/avatar_status_size_extra_margin" android:layout_centerInParent="true" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_avatar_presence_avatar" android:layout_centerVertical="true" app:roundWithOverlayColor="?primary_700" style="@style/Avatar.XXLarge" />
+    <RelativeLayout android:layout_width="@dimen/avatar_status_size_extra_xxlarge" android:layout_height="@dimen/avatar_status_size_extra_xxlarge" android:layout_alignRight="@id/user_avatar_presence_avatar" android:layout_alignBottom="@id/user_avatar_presence_avatar">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_avatar_presence_padding_image" android:layout_width="fill_parent" android:layout_height="fill_parent" app:placeholderImage="?primary_700" app:roundAsCircle="true" />
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_avatar_presence_indicator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="@dimen/avatar_status_size_extra_margin_xxlarge" android:layout_centerInParent="true" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
     </RelativeLayout>
 </RelativeLayout>
\ 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 1ccd416894..27ae17461a 100644
--- a/com.discord/res/layout/view_video_call_participant.xml
+++ b/com.discord/res/layout/view_video_call_participant.xml
@@ -5,6 +5,7 @@
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/participant_bg_avatar" android:layout_width="fill_parent" android:layout_height="fill_parent" />
         <View android:id="@id/participant_bg_letterbox" android:background="@android:color/black" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
         <com.discord.views.VoiceUserView android:id="@id/participant_voice_user_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" app:vuv_avatar_size="@dimen/avatar_size_large" />
+        <com.discord.views.video.AppVideoStreamRenderer android:id="@id/participant_video_stream_renderer" android:layout_width="fill_parent" android:layout_height="fill_parent" app:vcpv_is_overlay="true" app:vcpv_match_video_orientation="false" />
     </RelativeLayout>
     <ImageView android:id="@id/participant_voice_status_indicator" android:background="@drawable/drawable_bg_voice_status_indicator" android:padding="4.0dip" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="8.0dip" android:layout_alignParentTop="true" android:layout_alignParentRight="true" />
     <RelativeLayout android:id="@id/participant_video_loading_indicator" android:background="@android:color/black" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent">
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 1e25b91458..3ac2ea8de6 100644
--- a/com.discord/res/layout/voice_user_list_item_user.xml
+++ b/com.discord/res/layout/voice_user_list_item_user.xml
@@ -3,6 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <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="52.0dip" />
     <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" 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="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@id/voice_user_list_item_live_indicator" android:background="@drawable/drawable_rect_rounded_red_500" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/live" android:textAllCaps="true" android:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView" />
     <ImageView android:id="@id/voice_user_list_item_mute_indicator" android:padding="8.0dip" android:src="@drawable/ic_mic_grey_24dp" android:contentDescription="@string/form_label_muted" style="@style/UiKit.ImageView" />
     <ImageView android:id="@id/voice_user_list_item_deafen_indicator" android:padding="8.0dip" android:src="@drawable/ic_headset_grey_24dp" android:contentDescription="@string/sound_deafen" style="@style/UiKit.ImageView" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/voice_user_list_item_user_stream_preview.xml b/com.discord/res/layout/voice_user_list_item_user_stream_preview.xml
new file mode 100644
index 0000000000..3a871dcc66
--- /dev/null
+++ b/com.discord/res/layout/voice_user_list_item_user_stream_preview.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.facebook.drawee.view.SimpleDraweeView android:layout_width="fill_parent" android:layout_height="fill_parent" app:placeholderImage="@drawable/ic_no_stream" app:placeholderImageScaleType="fitCenter" app:viewAspectRatio="1.78" xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:android="http://schemas.android.com/apk/res/android" />
\ 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 c29cc06e03..5d4b9d5912 100644
--- a/com.discord/res/layout/widget_channel_group_dm_settings.xml
+++ b/com.discord/res/layout/widget_channel_group_dm_settings.xml
@@ -7,11 +7,11 @@
     <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">
-                <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.Large.ExtraExtra" />
+                <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" 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: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" 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.Semibold" />
                 <TextView 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.Semibold" />
-                <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" 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.Form.Field.EditText.Wrap">
+                <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@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.Form.Field.EditText.Wrap">
                     <EditText android:id="@id/channel_settings_edit_name" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:hint="@string/form_label_channel_name" style="@style/UiKit.Form.Field.EditText" />
                 </com.google.android.material.textfield.TextInputLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/com.discord/res/layout/widget_friend_request_delete_confirmation.xml b/com.discord/res/layout/widget_friend_request_delete_confirmation.xml
deleted file mode 100644
index 42a271ee57..0000000000
--- a/com.discord/res/layout/widget_friend_request_delete_confirmation.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout style="@style/AppAlertDialog"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:id="@id/friend_request_delete_confirmation_title" android:text="@string/outgoing_friend_request" style="@style/AppAlertDialogHeader" />
-    <LinearLayout style="@style/AppAlertDialogContent">
-        <TextView android:id="@id/friend_request_delete_confirmation_body" android:text="@string/outgoing_friend_request_delete_msg" style="@style/AppAlertDialogText" />
-    </LinearLayout>
-    <LinearLayout style="@style/AppAlertDialogFooter">
-        <TextView android:id="@id/friend_request_delete_confirmation_cancel" android:text="@string/cancel" style="@style/AppAlertDialogButton" />
-        <TextView android:id="@id/friend_request_delete_confirmation_delete" android:text="@string/delete" style="@style/AppAlertDialogButton.Red" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
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
new file mode 100644
index 0000000000..20883b97e0
--- /dev/null
+++ b/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
+  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" />
+    </com.google.android.material.appbar.AppBarLayout>
+    <LinearLayout android:id="@id/guild_invite_empty_suggestions_container" android:clipChildren="false" android:clipToPadding="false" android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.Page.LinearLayout">
+        <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:background="@color/primary_600" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large">
+            <ImageView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="@drawable/img_plus_illo" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+            <TextView android:gravity="center" android:id="@id/guild_invite_friends_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/instant_invite_friends" style="@style/UiKit.TextView.H1" />
+            <TextView android:gravity="center" android:id="@id/guild_invite_friends_subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:text="@string/instant_invite_friends_description" style="@style/UiKit.TextView" />
+            <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_empty_suggestions_invite_link" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" 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" style="@style/UiKit.TextView.Bold" />
+                <ImageView android:id="@id/guild_invite_empty_suggestions_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/share_invite_link_for_access" />
+            </LinearLayout>
+            <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
+                <TextView android:id="@id/guild_invite_empty_suggestions_settings_invite_link_subtext" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Subtext" />
+                <Button android:id="@id/guild_invite_empty_suggestions_invite_share_btn" android:layout_width="fill_parent" android:text="@string/share_link" style="@style/UiKit.Button" />
+            </LinearLayout>
+        </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" />
+    <com.discord.widgets.guilds.invite.ViewInviteSettingsSheet android:id="@id/invite_settings_bottom_sheet" android:background="?primary_630" style="@style/UiKit.ViewGroup.LinearLayout.BottomSheet" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_main_panel_left.xml b/com.discord/res/layout/widget_main_panel_left.xml
index acdbbe6869..1009a3696d 100644
--- a/com.discord/res/layout/widget_main_panel_left.xml
+++ b/com.discord/res/layout/widget_main_panel_left.xml
@@ -5,6 +5,6 @@
     <fragment 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_toRightOf="@id/widget_guilds" android:layout_above="@id/widget_profile_strip" />
     <View android:background="@color/black_alpha_20" android:layout_width="0.25dip" android:layout_height="fill_parent" android:layout_alignRight="@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" />
-    <fragment android:name="com.discord.widgets.user.WidgetUserProfileStrip" android:id="@id/widget_profile_strip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" />
+    <fragment android:name="com.discord.widgets.user.profile.WidgetUserProfileStrip" 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_marginLeft="14.0dip" android:layout_marginTop="136.0dip" android:text="@string/add_a_server_mobile" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Semibold" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_main_panel_loading.xml b/com.discord/res/layout/widget_main_panel_loading.xml
index 91d50fe9fc..a25cb60410 100644
--- a/com.discord/res/layout/widget_main_panel_loading.xml
+++ b/com.discord/res/layout/widget_main_panel_loading.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:id="@id/main_panel_loading" android:background="@color/grey_account" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent"
+<FrameLayout android:id="@id/main_panel_loading" android:background="@color/grey_account" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:background="@drawable/drawable_loading" android:layout_width="fill_parent" android:layout_height="fill_parent" />
-</RelativeLayout>
\ No newline at end of file
+    <ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/img_loading_clyde" />
+</FrameLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_music_rich_presence.xml b/com.discord/res/layout/widget_music_rich_presence.xml
index abe9174d12..733d6f9c19 100644
--- a/com.discord/res/layout/widget_music_rich_presence.xml
+++ b/com.discord/res/layout/widget_music_rich_presence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.ConstraintLayout"
+<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.UserSheetRichPresenceContainer"
   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/UiKit.Settings.Item.Header" />
     <androidx.constraintlayout.widget.Guideline android:orientation="vertical" android:id="@id/embed_guideline" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintGuide_begin="@dimen/uikit_spacing_large" />
@@ -18,7 +18,7 @@
             <TextView android:id="@id/rich_presence_music_duration" android:layout_width="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
-    <FrameLayout android:id="@id/rich_presence_play_button" android:background="@color/rich_presence_spotify_play_button" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" 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" android:layout_marginBottom="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground" app:layout_constraintTop_toBottomOf="@id/rich_presence_container_data">
+    <FrameLayout android:id="@id/rich_presence_play_button" android:background="@drawable/rich_presence_spotify_play_button" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" 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" android:layout_marginBottom="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground" app:layout_constraintTop_toBottomOf="@id/rich_presence_container_data">
         <TextView android:textColor="@color/primary_100" android:ellipsize="end" android:gravity="center_vertical" android:layout_gravity="center" android:id="@id/rich_presence_play_button_text" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:text="@string/user_activity_play_on_platform" android:maxLines="1" android:drawableLeft="@drawable/ic_spotify_white_24dp" android:drawablePadding="@dimen/uikit_textsize_medium" android:textAllCaps="true" android:drawableStart="@drawable/ic_spotify_white_24dp" style="@style/UiKit.TextView.Semibold" />
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 890b417971..71d7399daa 100644
--- a/com.discord/res/layout/widget_notice_nux_overlay.xml
+++ b/com.discord/res/layout/widget_notice_nux_overlay.xml
@@ -3,7 +3,7 @@
   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="24.0dip" android:text="@string/nux_overlay_title" android:lineSpacingMultiplier="1.0" android:textAllCaps="false" style="@style/UiKit.Dialog.Title" />
+        <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" style="@style/UiKit.Dialog.Body" />
         <LinearLayout android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
             <Button android:id="@id/enable_button" android:text="@string/nux_overlay_enable" style="@style/UiKit.Button" />
diff --git a/com.discord/res/layout/widget_notice_nux_samsung_link.xml b/com.discord/res/layout/widget_notice_nux_samsung_link.xml
new file mode 100644
index 0000000000..ab52345246
--- /dev/null
+++ b/com.discord/res/layout/widget_notice_nux_samsung_link.xml
@@ -0,0 +1,13 @@
+<?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"
+  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" style="@style/UiKit.Dialog.Body" />
+        <LinearLayout android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+            <Button android:id="@id/enable_button" android:text="@string/nux_samsung_game_presence_link_enable" style="@style/UiKit.Button" />
+            <Button android:id="@id/cancel_button" android:text="@string/no_thanks" style="@style/UiKit.Button.Transparent" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_platform_rich_prescence.xml b/com.discord/res/layout/widget_platform_rich_prescence.xml
index 99c7090bda..8b1021899f 100644
--- a/com.discord/res/layout/widget_platform_rich_prescence.xml
+++ b/com.discord/res/layout/widget_platform_rich_prescence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.ConstraintLayout"
+<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.UserSheetRichPresenceContainer"
   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/UiKit.Settings.Item.Header" />
     <androidx.constraintlayout.widget.Guideline android:orientation="vertical" android:id="@id/embed_guideline" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintGuide_begin="@dimen/uikit_spacing_large" />
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 0893f76301..ec972fabd1 100644
--- a/com.discord/res/layout/widget_server_settings_emojis_item.xml
+++ b/com.discord/res/layout/widget_server_settings_emojis_item.xml
@@ -1,7 +1,7 @@
 <?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"
   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/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_margin="@dimen/uikit_spacing_medium" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_emoji_placeholder" />
+    <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" />
     <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" />
diff --git a/com.discord/res/layout/widget_settings.xml b/com.discord/res/layout/widget_settings.xml
index 87dd8fb722..ce294c2d8d 100644
--- a/com.discord/res/layout/widget_settings.xml
+++ b/com.discord/res/layout/widget_settings.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:background="?primary_630" style="@style/AppTheme.AppBarLayout">
         <com.google.android.material.appbar.CollapsingToolbarLayout style="@style/AppTheme.CollapsingToolbarLayout">
-            <fragment android:name="com.discord.widgets.user.WidgetUserProfileHeader" android:id="@id/widget_user_profile_header" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="?actionBarSize" app:layout_collapseMode="parallax" />
+            <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@id/user_settings_profile_header_view" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="?actionBarSize" app:layout_collapseMode="parallax" app:user_profile_header_background_color="?primary_630" />
             <androidx.appcompat.widget.Toolbar android:background="?primary_630" style="@style/AppTheme.Toolbar" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/com.discord/res/layout/widget_settings_premium.xml b/com.discord/res/layout/widget_settings_premium.xml
index fa4f1c6bbd..90f125315b 100644
--- a/com.discord/res/layout/widget_settings_premium.xml
+++ b/com.discord/res/layout/widget_settings_premium.xml
@@ -12,7 +12,11 @@
                 <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">
                     <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@id/premium_settings_grandfathered" android:background="@drawable/bg_nitro_grandfathered" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" 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" android:drawableLeft="@drawable/ic_nitro_badge_white" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_nitro_badge_white" style="@style/UiKit.TextView" />
                     <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" 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" 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_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:cardBackgroundColor="?primary_630" />
+                    <com.discord.views.ActiveSubscriptionView android:id="@id/premium_settings_active_subscription" 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:cardBackgroundColor="?primary_630" app:cardElevation="0.0dip" />
+                    <LinearLayout android:id="@id/premium_settings_credit_container" style="@style/UiKit.ViewGroup.LinearLayout">
+                        <TextView android:text="@string/billing_account_credit" style="@style/UiKit.Settings.Item.Header" />
+                        <include layout="@layout/layout_account_credits_list" />
+                    </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" />
diff --git a/com.discord/res/layout/widget_settings_voice.xml b/com.discord/res/layout/widget_settings_voice.xml
index 40ef06d746..53e47518d4 100644
--- a/com.discord/res/layout/widget_settings_voice.xml
+++ b/com.discord/res/layout/widget_settings_voice.xml
@@ -2,7 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
   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 app:navigationContentDescription="@string/back" app:navigationIcon="?ic_action_bar_back" app:subtitle="@string/voice" app:title="@string/user_settings" style="@style/AppTheme.Toolbar" />
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/back" app:navigationIcon="?ic_action_bar_back" app:subtitle="@string/user_settings" app:title="@string/voice_and_video" style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
diff --git a/com.discord/res/layout/widget_spectate.xml b/com.discord/res/layout/widget_spectate.xml
new file mode 100644
index 0000000000..a975b2ac06
--- /dev/null
+++ b/com.discord/res/layout/widget_spectate.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout android:background="@color/black" android:fitsSystemWindows="true" android:keepScreenOn="true" 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.views.video.ApplicationStreamView android:id="@id/application_stream_view" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+    <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">
+            <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar.Transparent" />
+        </com.google.android.material.appbar.AppBarLayout>
+        <include android:visibility="gone" android:layout_width="0.0dip" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/spectate_push_to_talk" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" layout="@layout/widget_spectate_controls" />
+        <Button android:textColor="@color/primary_100" android:id="@id/spectate_push_to_talk" android:background="@drawable/drawable_button_primary_700" android:visibility="gone" android:layout_width="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/keybind_push_to_talk" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Button" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_spectate_controls.xml b/com.discord/res/layout/widget_spectate_controls.xml
new file mode 100644
index 0000000000..38bc786853
--- /dev/null
+++ b/com.discord/res/layout/widget_spectate_controls.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:gravity="center" android:id="@id/spectate_controls" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <ImageView android:id="@id/spectate_controls_disconnect_stream" android:background="@drawable/drawable_circle_primary_700" android:layout_margin="11.0dip" android:src="@drawable/ic_stop_stream_v2" android:contentDescription="@string/video" style="@style/UiKit.Calls.ButtonCircle" />
+    <ImageView android:id="@id/spectate_controls_disconnect_voice" android:background="@drawable/drawable_circle_red" android:layout_margin="11.0dip" android:src="@drawable/ic_call_audio_stop_white_24dp" android:contentDescription="@string/disconnect" style="@style/UiKit.Calls.ButtonCircle" />
+    <ImageView android:id="@id/spectate_controls_mute" android:background="@drawable/drawable_circle_primary_700" android:layout_margin="11.0dip" android:src="@drawable/ic_mic_white_24dp" android:contentDescription="@string/mute" style="@style/UiKit.Calls.ButtonCircle" />
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_spectate_report_problem.xml b/com.discord/res/layout/widget_spectate_report_problem.xml
new file mode 100644
index 0000000000..c050d0a3e4
--- /dev/null
+++ b/com.discord/res/layout/widget_spectate_report_problem.xml
@@ -0,0 +1,23 @@
+<?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">
+    <LinearLayout android:id="@id/notice_header_container" style="@style/UiKit.ViewGroup.LinearLayout">
+        <TextView android:id="@id/report_problem_header" android:padding="@dimen/uikit_spacing_large" android:text="@string/stream_report_a_problem" style="@style/UiKit.TextView.H1.Bold" />
+        <View style="@style/UiKit.Divider" />
+    </LinearLayout>
+    <ScrollView android:layout_width="fill_parent" android:layout_height="200.0dip">
+        <RadioGroup android:id="@id/report_error_radio_group" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+            <RadioButton android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/report_error_stream_black" android:layout_width="fill_parent" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_black" style="@style/UiKit.TextView" />
+            <RadioButton android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/report_error_blurry" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_blurry" style="@style/UiKit.TextView" />
+            <RadioButton android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/report_error_lagging" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_lagging" style="@style/UiKit.TextView" />
+            <RadioButton android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/report_error_out_of_sync" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_out_of_sync" style="@style/UiKit.TextView" />
+            <RadioButton android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/report_error_audio_absent" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_audio_missing" style="@style/UiKit.TextView" />
+            <RadioButton android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/report_error_audio_poor" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_audio_poor" style="@style/UiKit.TextView" />
+        </RadioGroup>
+    </ScrollView>
+    <View style="@style/UiKit.Settings.Divider" />
+    <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
+        <Button android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@id/report_problem_cancel" android:background="?selectableItemBackground" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:text="@string/cancel" />
+        <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/report_problem_submit" android:background="@drawable/drawable_button_green_neutral" android:padding="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:fontFamily="@font/whitney_medium" app:lb_disabled_alpha="0.5" app:lb_text="@string/stream_report_submit" app:lb_text_color="@color/white" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_spectate_stream_full.xml b/com.discord/res/layout/widget_spectate_stream_full.xml
new file mode 100644
index 0000000000..8387a20b08
--- /dev/null
+++ b/com.discord/res/layout/widget_spectate_stream_full.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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_header" style="@style/UiKit.TextView.H1.Bold" />
+        <View style="@style/UiKit.Divider" />
+    </LinearLayout>
+    <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:textColor="@color/primary_200" android:id="@id/cancel_premium_grandfathered" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_full_modal_body" android:fontFamily="@font/whitney_bold" style="@style/UiKit.TextView" />
+        <ImageView android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/img_wumpus_tophat_dark" />
+    </LinearLayout>
+    <View style="@style/UiKit.Settings.Divider" />
+    <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
+        <Button android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@id/stream_full_confirm" android:background="@drawable/drawable_button_purple" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:text="@string/okay" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_spectators.xml b/com.discord/res/layout/widget_spectators.xml
new file mode 100644
index 0000000000..96669a226f
--- /dev/null
+++ b/com.discord/res/layout/widget_spectators.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
+    </com.google.android.material.appbar.AppBarLayout>
+    <RelativeLayout style="@style/UiKit.ViewGroup.RelativeLayout.AppBarScrollingViewBehavior">
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/spectators_list" android:background="?colorPrimary" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+    </RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_stream_feedback_dialog.xml b/com.discord/res/layout/widget_stream_feedback_dialog.xml
new file mode 100644
index 0000000000..26f2c71fa4
--- /dev/null
+++ b/com.discord/res/layout/widget_stream_feedback_dialog.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:animateLayoutChanges="false" 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:padding="@dimen/uikit_spacing_large" android:text="@string/stream_report_a_problem_post_stream" style="@style/UiKit.TextView.H1.Bold" />
+        <View style="@style/UiKit.Divider" />
+    </LinearLayout>
+    <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:animateLayoutChanges="false" style="@style/UiKit.ViewGroup.LinearLayout">
+        <TextView android:textColor="@color/primary_200" android:id="@id/cancel_premium_grandfathered" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_rating_body" android:fontFamily="@font/whitney_bold" style="@style/UiKit.TextView" />
+        <LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="64.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:animateLayoutChanges="false">
+            <ImageView android:id="@id/stream_feedback_sad" 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="@drawable/drawable_stream_feedback_face_sad_grayscale" />
+            <ImageView android:id="@id/stream_feedback_neutral" 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="@drawable/drawable_stream_feedback_face_neutral_grayscale" />
+            <ImageView android:id="@id/stream_feedback_happy" 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="@drawable/drawable_stream_feedback_face_happy_grayscale" />
+        </LinearLayout>
+        <TextView android:textColor="?primary_200" android:id="@id/stream_feedback_reason_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/stream_report_problem_header_mobile" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
+        <Spinner android:id="@id/stream_feedback_reason_spinner" android:background="?bg_payment_method_spinner_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:popupBackground="?bg_payment_method_spinner_dropdown" />
+    </LinearLayout>
+    <View style="@style/UiKit.Settings.Divider" />
+    <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
+        <Button android:textColor="?primary_300" android:layout_gravity="center_vertical" android:id="@id/stream_feedback_cancel" android:background="@color/transparent" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:foreground="?selectableItemBackground" android:text="@string/cancel" style="@style/UiKit.Button" />
+        <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/stream_feedback_submit" android:background="@drawable/drawable_button_purple_neutral" android:padding="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:fontFamily="@font/whitney_medium" app:lb_disabled_alpha="0.5" app:lb_text="@string/stream_report_submit" app:lb_text_color="@color/white" />
+    </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 6f47f58dfd..ffb62276d8 100644
--- a/com.discord/res/layout/widget_stream_rich_presence.xml
+++ b/com.discord/res/layout/widget_stream_rich_presence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.ConstraintLayout"
+<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.UserSheetRichPresenceContainer"
   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/UiKit.Settings.Item.Header" />
     <androidx.constraintlayout.widget.Guideline android:orientation="vertical" android:id="@id/embed_guideline" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintGuide_begin="@dimen/uikit_spacing_large" />
@@ -20,7 +20,7 @@
         <TextView android:id="@id/rich_presence_state" style="@style/UiKit.TextView.Marquee" />
         <TextView android:id="@id/rich_presence_time" style="@style/UiKit.TextView.Marquee" />
     </LinearLayout>
-    <FrameLayout android:id="@id/rich_presence_watch_button" android:background="@color/brand_500" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground" app:layout_constraintEnd_toEndOf="@id/embed_guideline_right" app:layout_constraintLeft_toLeftOf="@id/embed_guideline" app:layout_constraintRight_toRightOf="@id/embed_guideline_right" app:layout_constraintStart_toStartOf="@id/embed_guideline" app:layout_constraintTop_toBottomOf="@id/rich_presence_container_data">
+    <FrameLayout android:id="@id/rich_presence_watch_button" android:background="@color/brand_500" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground" app:layout_constraintEnd_toEndOf="@id/embed_guideline_right" app:layout_constraintLeft_toLeftOf="@id/embed_guideline" app:layout_constraintRight_toRightOf="@id/embed_guideline_right" app:layout_constraintStart_toStartOf="@id/embed_guideline" app:layout_constraintTop_toBottomOf="@id/rich_presence_container_data">
         <TextView android:textColor="@color/primary_100" android:ellipsize="end" android:gravity="center_vertical" android:layout_gravity="center" android:id="@id/rich_presence_play_button_text" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:text="@string/watch_stream" android:maxLines="1" android:drawableLeft="@drawable/ic_live_stream_white_24dp" android:drawablePadding="@dimen/uikit_textsize_medium" android:textAllCaps="true" android:drawableStart="@drawable/ic_live_stream_white_24dp" style="@style/UiKit.TextView.Semibold" />
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_profile.xml b/com.discord/res/layout/widget_user_profile.xml
index f962a3083b..82747ba295 100644
--- a/com.discord/res/layout/widget_user_profile.xml
+++ b/com.discord/res/layout/widget_user_profile.xml
@@ -4,7 +4,7 @@
     <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:paddingBottom="@dimen/uikit_spacing_small" android:layout_marginTop="?actionBarSize" app:layout_collapseMode="parallax" style="@style/UiKit.ViewGroup.LinearLayout">
-                <fragment android:name="com.discord.widgets.user.WidgetUserProfileHeader" android:id="@id/widget_user_profile_header" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+                <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@id/user_profile_header_view" android:layout_width="fill_parent" android:layout_height="wrap_content" app:user_profile_header_background_color="?primary_630" />
                 <LinearLayout android:id="@id/user_profile_friend_request_incoming_container" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                     <Button android:id="@id/user_profile_friend_request_ignore_btn" android:text="@string/friend_request_ignore" style="@style/UiKit.Button.Grey.Fit" />
                     <Button android:id="@id/user_profile_friend_request_accept_btn" android:text="@string/friend_request_accept" style="@style/UiKit.Button.Green.Fit" />
diff --git a/com.discord/res/layout/widget_user_profile_header.xml b/com.discord/res/layout/widget_user_profile_header.xml
deleted file mode 100644
index 03e21efa69..0000000000
--- a/com.discord/res/layout/widget_user_profile_header.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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_large" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable"
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <RelativeLayout android:layout_gravity="center_horizontal" android:id="@id/profile_header_avatar_wrap" 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">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/profile_header_avatar" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginLeft="@dimen/avatar_status_size_hero_margin" android:layout_marginRight="@dimen/avatar_status_size_hero_margin" android:layout_marginBottom="@dimen/avatar_status_size_hero_margin" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" app:roundWithOverlayColor="?primary_630" style="@style/Avatar.Hero" />
-        <RelativeLayout android:layout_width="@dimen/avatar_status_size_hero" android:layout_height="@dimen/avatar_status_size_hero" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.RelativeLayout">
-            <com.facebook.drawee.view.SimpleDraweeView android:layout_width="fill_parent" android:layout_height="fill_parent" app:placeholderImage="?primary_630" app:roundAsCircle="true" />
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/profile_header_presence_indicator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="@dimen/avatar_status_size_hero_margin" android:layout_centerInParent="true" app:placeholderImage="@drawable/ic_status_invisible_16dp" app:placeholderImageScaleType="fitCenter" app:roundAsCircle="true" />
-        </RelativeLayout>
-    </RelativeLayout>
-    <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
-        <androidx.cardview.widget.CardView android:id="@id/profile_header_badge_wrap_outer" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorPrimary" app:cardCornerRadius="14.0dip">
-            <LinearLayout android:gravity="center" android:id="@id/profile_header_badge_wrap" 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_width="wrap_content" android:layout_height="fill_parent" android:layout_centerInParent="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                <LinearLayout android:id="@id/user_profile_header_badges" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
-                <TextView android:textColor="?primary_400" android:id="@id/profile_header_badge_text" android:paddingLeft="6.0dip" android:paddingRight="6.0dip" android:singleLine="true" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext.Semibold" />
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
-        <TextView android:id="@id/profile_header_username" android:singleLine="true" style="@style/UiKit.TextView.H1" />
-        <TextView android:id="@id/profile_header_activity_status" android:layout_marginTop="@dimen/uikit_spacing_small" android:singleLine="true" style="@style/UiKit.TextView" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_profile_header_badge.xml b/com.discord/res/layout/widget_user_profile_header_badge.xml
deleted file mode 100644
index 76e50b8f2d..0000000000
--- a/com.discord/res/layout/widget_user_profile_header_badge.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView android:layout_gravity="center" android:padding="2.0dip" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="24.0dip" android:contentDescription="@string/sample_empty_string" 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/widget_user_rich_presence.xml b/com.discord/res/layout/widget_user_rich_presence.xml
index 04af0c6a54..94f25fb23f 100644
--- a/com.discord/res/layout/widget_user_rich_presence.xml
+++ b/com.discord/res/layout/widget_user_rich_presence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.ConstraintLayout"
+<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.UserSheetRichPresenceContainer"
   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/UiKit.Settings.Item.Header" />
     <androidx.constraintlayout.widget.Guideline android:orientation="vertical" android:id="@id/embed_guideline" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintGuide_begin="@dimen/uikit_spacing_large" />
diff --git a/com.discord/res/layout/widget_user_sheet.xml b/com.discord/res/layout/widget_user_sheet.xml
index 448abdf985..57a84c38ed 100644
--- a/com.discord/res/layout/widget_user_sheet.xml
+++ b/com.discord/res/layout/widget_user_sheet.xml
@@ -1,19 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView android:background="?primary_630" style="@style/UiKit.ViewGroup.NestedScrollView"
+<androidx.core.widget.NestedScrollView android:background="?primary_700" 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:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-        <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/user_sheet_header" android:focusable="true" android:clickable="true" style="@style/UiKit.Sheet.Header">
-            <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_sheet_header_guideline" style="@style/UiKit.Sheet.Guideline" />
-            <include android:id="@id/user_sheet_avatar_presence" 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_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" 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" layout="@layout/view_user_avatar_presence" />
-            <LinearLayout android:orientation="vertical" android:id="@id/user_sheet_name_wrap" style="@style/UiKit.Sheet.Header.Contents">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/user_sheet_primary_name" android:singleLine="true" style="@style/UiKit.TextView.Bold" />
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/user_sheet_secondary_name" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
-                <androidx.recyclerview.widget.RecyclerView android:id="@id/user_sheet_roles_recycler" android:paddingTop="@dimen/uikit_spacing_xsmall" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView" />
-            </LinearLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-        <View android:id="@id/user_sheet_activity_divider" android:visibility="gone" style="@style/UiKit.Settings.Divider" />
+    <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
+        <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:user_profile_header_background_color="?primary_700" />
+        <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:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <Button android:id="@id/user_sheet_message_action_button" android:text="@string/user_profile_message" android:drawableTop="@drawable/ic_user_profile_action_message" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+            <Button android:id="@id/user_sheet_call_action_button" android:text="@string/user_profile_audio" android:drawableTop="@drawable/ic_user_profile_action_call" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+            <Button android:id="@id/user_sheet_video_action_button" android:text="@string/user_profile_video" android:drawableTop="@drawable/ic_user_profile_action_video" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+            <Button android:textColor="@color/status_green_500" android:id="@id/user_sheet_add_friend_action_button" android:visibility="gone" android:text="@string/user_profile_add_friend" android:drawableTop="@drawable/ic_user_profile_action_add_friend" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+            <Button android:textColor="@color/status_yellow_500" android:id="@id/user_sheet_pending_friend_request_action_button" android:visibility="gone" android:text="@string/user_profile_pending" android:drawableTop="@drawable/ic_user_profile_action_pending" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
+        </LinearLayout>
+        <View android:id="@id/user_sheet_incoming_friend_request_divider" android:visibility="gone" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_incoming_friend_request_header" android:visibility="gone" android:text="@string/incoming_friend_request" style="@style/UiKit.Settings.Item.Header" />
+        <LinearLayout android:id="@id/user_sheet_friend_request_incoming_container" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <Button android:id="@id/user_sheet_friend_request_ignore_button" android:minWidth="0.0dip" android:minHeight="0.0dip" android:text="@string/friend_request_ignore" android:layout_weight="1.0" style="@style/UiKit.Button.Grey" />
+            <Button android:id="@id/user_sheet_friend_request_accept_button" android:text="@string/friend_request_accept" android:layout_weight="1.0" style="@style/UiKit.Button.Green" />
+        </LinearLayout>
+        <LinearLayout android:id="@id/user_sheet_guild_container" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
+            <View android:id="@id/user_sheet_guild_divider" style="@style/UiKit.Divider" />
+            <TextView android:id="@id/user_sheet_guild_header" android:contentDescription="@string/user_profile_guild_name_content_description" style="@style/UiKit.Settings.Item.Header" />
+            <androidx.recyclerview.widget.RecyclerView android:id="@id/user_sheet_roles_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView" />
+        </LinearLayout>
+        <View android:id="@id/user_sheet_activity_divider" android:visibility="gone" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Settings.Divider" />
         <FrameLayout android:id="@id/rich_presence_container" android:visibility="gone" style="@style/UiKit.ViewGroup" />
-        <View android:id="@id/user_sheet_audio_settings_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Settings.Divider" />
+        <View android:id="@id/user_sheet_audio_settings_divider" style="@style/UiKit.Divider" />
         <LinearLayout android:id="@id/user_sheet_audio_settings_container" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:text="@string/voice_settings" style="@style/UiKit.Settings.Item.Header" />
             <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
@@ -22,11 +33,10 @@
             </LinearLayout>
         </LinearLayout>
         <androidx.appcompat.widget.SwitchCompat android:id="@id/user_sheet_muted" android:text="@string/form_label_local_mute" style="@style/UiKit.Settings.Item" />
-        <View android:id="@id/user_sheet_actions_divider" style="@style/UiKit.Settings.Divider" />
-        <TextView android:text="@string/actions" style="@style/UiKit.Settings.Item.Header" />
+        <View android:id="@id/user_sheet_actions_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_actions_header" android:text="@string/actions" style="@style/UiKit.Settings.Item.Header" />
         <TextView android:gravity="center_vertical" android:id="@id/user_sheet_profile" android:text="@string/profile" android:drawableLeft="?ic_account" android:drawableStart="?ic_account" style="@style/UiKit.Settings.Item.Icon" />
-        <TextView android:id="@id/user_sheet_message" android:text="@string/send_message" android:drawableLeft="?ic_chat_bubble" android:drawableStart="?ic_chat_bubble" style="@style/UiKit.Settings.Item.Icon" />
-        <View android:id="@id/user_sheet_administrative_divider" style="@style/UiKit.Settings.Divider" />
+        <View android:id="@id/user_sheet_administrative_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
         <TextView android:id="@id/user_sheet_administrative_header" android:text="@string/administrative" style="@style/UiKit.Settings.Item.Header" />
         <TextView android:id="@id/user_sheet_server_edit_member" android:visibility="gone" android:text="@string/manage_user" android:drawableLeft="?ic_roles_a60" android:drawableStart="?ic_roles_a60" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/user_sheet_server_mute" android:visibility="gone" android:text="@string/server_voice_mute" android:drawableLeft="@drawable/ic_mic_red_24dp" android:drawableStart="@drawable/ic_mic_red_24dp" style="@style/UiKit.Settings.Item.Icon" />
@@ -34,7 +44,7 @@
         <TextView android:id="@id/user_sheet_server_move" android:visibility="gone" android:text="@string/move_to" android:drawableLeft="@drawable/ic_transfer_red_24dp" android:drawableStart="@drawable/ic_transfer_red_24dp" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/user_sheet_kick" android:visibility="gone" android:text="@string/kick" android:drawableLeft="@drawable/ic_remove_friend_red_24dp" android:drawableStart="@drawable/ic_remove_friend_red_24dp" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/user_sheet_ban" android:visibility="gone" android:text="@string/ban" android:drawableLeft="@drawable/ic_ban_red_24dp" android:drawableStart="@drawable/ic_ban_red_24dp" style="@style/UiKit.Settings.Item.Icon" />
-        <View android:id="@id/user_sheet_developer_divider" style="@style/UiKit.Settings.Divider" />
+        <View android:id="@id/user_sheet_developer_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
         <TextView android:id="@id/user_sheet_developer_header" android:text="@string/developer_mode" style="@style/UiKit.Settings.Item.Header" />
         <TextView android:id="@id/user_sheet_copy_id" android:visibility="gone" android:text="@string/copy_id" android:drawableLeft="?ic_copy" android:drawableStart="?ic_copy" style="@style/UiKit.Settings.Item.Icon" />
     </LinearLayout>
diff --git a/com.discord/res/menu/menu_guild_call.xml b/com.discord/res/menu/menu_guild_call.xml
index b84021dcb0..ef15350744 100644
--- a/com.discord/res/menu/menu_guild_call.xml
+++ b/com.discord/res/menu/menu_guild_call.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:icon="?ic_person" android:id="@id/menu_spectate_spectators" android:visible="true" android:title="@string/spectators_header" app:showAsAction="ifRoom" />
     <item android:icon="?ic_overlay" android:id="@id/menu_guild_call_overlay_launcher" android:visible="true" android:title="@string/settings_games_toggle_overlay" app:showAsAction="ifRoom" />
     <item android:id="@id/menu_guild_call_channel_settings" android:visible="false" android:title="@string/channel_settings" app:showAsAction="never" />
     <item android:id="@id/menu_guild_call_voice_settings" android:title="@string/voice_settings" app:showAsAction="never" />
diff --git a/com.discord/res/menu/menu_private_call.xml b/com.discord/res/menu/menu_private_call.xml
index 3b847e4a38..70e90ac6eb 100644
--- a/com.discord/res/menu/menu_private_call.xml
+++ b/com.discord/res/menu/menu_private_call.xml
@@ -2,6 +2,7 @@
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:icon="?ic_switch_camera" android:id="@id/menu_private_call_select_camera" android:visible="false" android:title="@string/camera_switch" app:showAsAction="ifRoom" />
+    <item android:icon="?ic_speaker_state" android:id="@id/menu_private_call_toggle_speaker_mode" android:visible="true" android:title="@string/use_speaker" app:showAsAction="always" />
     <item android:icon="?ic_call_participants" android:id="@id/menu_private_call_participants" android:visible="false" android:title="@string/member_list" app:showAsAction="ifRoom" />
     <item android:id="@id/menu_private_call_user_settings" android:visible="false" android:title="@string/user_settings" app:showAsAction="never" />
     <item android:id="@id/menu_private_call_group_settings" android:visible="false" android:title="@string/group_dm_settings" app:showAsAction="never" />
diff --git a/com.discord/res/menu/menu_spectate.xml b/com.discord/res/menu/menu_spectate.xml
new file mode 100644
index 0000000000..a2159216f2
--- /dev/null
+++ b/com.discord/res/menu/menu_spectate.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:icon="@drawable/ic_members_white_24dp" android:id="@id/menu_spectate_spectators" android:title="@string/spectators_header" app:showAsAction="ifRoom" />
+    <item android:icon="@drawable/ic_warning_icon_24dp" android:id="@id/menu_spectate_report_problem" android:visible="true" android:title="@string/stream_report_a_problem" app:showAsAction="ifRoom" />
+</menu>
\ No newline at end of file
diff --git a/com.discord/res/values-bg/plurals.xml b/com.discord/res/values-bg/plurals.xml
index dd85aadcdb..8a2ebf64eb 100644
--- a/com.discord/res/values-bg/plurals.xml
+++ b/com.discord/res/values-bg/plurals.xml
@@ -82,15 +82,6 @@
         <item quantity="other">%d секунди</item>
         <item quantity="one">1 секунда</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d дни</item>
-        <item quantity="one">1 ден</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d члена,</item>
-        <item quantity="zero">0 члена</item>
-        <item quantity="one">1 член</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">дни</item>
         <item quantity="one">ден</item>
@@ -207,16 +198,6 @@
         <item quantity="other">разрешения</item>
         <item quantity="one">разрешение</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Задаване на бавен режим от **!!%d!! секунди**</item>
-        <item quantity="zero">Деактивиран бавен режим</item>
-        <item quantity="one">Задаване на бавен режим от **1 секунда**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Задаване на бавен режим от **!!%d!! секунди**</item>
-        <item quantity="zero">Задаване на деактивиран бавен режим</item>
-        <item quantity="one">Задаване на бавен режим от **1 секунда**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! членове**</item>
         <item quantity="one">**потребител**</item>
@@ -316,10 +297,6 @@
         <item quantity="other">%d нови съобщения</item>
         <item quantity="one">1 ново съобщение</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d дни</item>
-        <item quantity="one">един ден</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d канали</item>
         <item quantity="one">%d канал</item>
@@ -337,10 +314,6 @@
         <item quantity="other">тези съобщения</item>
         <item quantity="one">това съобщение</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** сървъри не са налични поради временно спиране.</item>
-        <item quantity="one">**1** сървър не е наличен поради временно спиране.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d месеца</item>
         <item quantity="one">1 месец</item>
diff --git a/com.discord/res/values-bg/strings.xml b/com.discord/res/values-bg/strings.xml
index 6c35e87bf9..833b31e32e 100644
--- a/com.discord/res/values-bg/strings.xml
+++ b/com.discord/res/values-bg/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"Не можеш да изпратиш покана, защото си невидим или криеш своя статус на игра. Ако предпочиташ да не променяш
 своите настройки, може някой друг да те покани вместо това."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Разбрано!</string>
-    <string name="activity_panel_go_live_hotspot_header">Предавай на живо, за да стриймваш играта директно към твоите приятели!</string>
+    <string name="activity_panel_go_live_hotspot_header">Използвай Go Live, за да стриймваш играта директно към твоите приятели!</string>
     <string name="activity_panel_go_live_tooltip">Предавай на живо</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Сървърът няма гласови канали, в които да стриймва.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Не можеш да стриймваш в този гласов канал.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Навигирай до сървър, за да започнеш да стриймваш.</string>
     <string name="add">Добавяне</string>
     <string name="add_a_comment_optional">Добавяне на коментар (опция)</string>
@@ -159,7 +157,6 @@
     <string name="application_entitlement_code_redemption_confirmation_title">Готово!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Към библиотеката</string>
     <string name="application_entitlement_code_redemption_invalid">Въведен е невалиден код</string>
-    <string name="application_entitlement_code_redemption_prompt">Получи ли код за игра? Въведи го по-долу:</string>
     <string name="application_entitlement_code_redemption_redeem">Активиране</string>
     <string name="application_filter_name_linux">Всички файлове</string>
     <string name="application_filter_name_macos">Приложения</string>
@@ -416,7 +413,6 @@
     <string name="application_store_view_all_news">Виж всички новини</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Този DLC изисква да притежаваш %1$s в Discord, за да можеш да играеш на него. [Научи повече относно DLC.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Съдържание, достъпно за изтегляне</string>
-    <string name="application_store_warning_early_access_description">Тази игра е забавна (така мислим!), но може да има ограничено съдържание, различни бъгове или да създава усещане за незавършеност. [Научи повече относно ранен достъп.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Ранен достъп</string>
     <string name="application_store_warning_requires_desktop_app_description">За да играеш тази игра, трябва да си инсталирал Discord $[декстоп приложение](downloadHook).</string>
     <string name="application_store_warning_requires_desktop_app_title">Изисква десктоп приложение</string>
@@ -539,7 +535,6 @@
     <string name="billing_error_section_card">О, не! Изглежда има проблем с тази карта. Коригирайте полетата и опитайте отново!</string>
     <string name="billing_history">История на таксуването</string>
     <string name="billing_legal_mumbo_jumbo">Юридически щуротии</string>
-    <string name="billing_legal_mumbo_jumbo_label">Приемам [Условията на Услугата на магазина на Discord](%1$s)</string>
     <string name="billing_no_payment_method">Не е запазен метод на плащане</string>
     <string name="billing_no_payment_method_description">Финализирай покупките по-бързо, като запазиш метод на плащане</string>
     <string name="billing_pay_for_it_with">Плащане за него с</string>
@@ -547,12 +542,7 @@
     <string name="billing_payment_breakdown_total">Общо</string>
     <string name="billing_payment_history">Хронология на транзакциите</string>
     <string name="billing_payment_premium">Твоят абонамент</string>
-    <string name="billing_payment_premium_legalese_monthly">Като закупиш %1$s абонамент, ти приемаш нашите [Условия на Услугата на магазина](%2$s). %1$s е автоматичен периодичен абонамент. Ти упълномощаваш Discord да таксува незабавно чрез метода на плащане, предоставен на %3$s, и да продължава да го прави автоматично всеки месец, докато не се откажеш. Можеш да се откажеш по всяко време.</string>
-    <string name="billing_payment_premium_legalese_yearly">Като закупиш %1$s абонамент, ти приемаш нашите [Условия на Услугата на магазина](%2$s). %1$s е автоматичен периодичен абонамент. Ти упълномощаваш Discord да таксува незабавно чрез метода на плащане, предоставен на %3$s, и да продължава да го прави автоматично всяка година, докато не се откажеш. Можеш да се откажеш по всяко време.</string>
     <string name="billing_payment_sources">Методи на плащане</string>
-    <string name="billing_payment_table_header_amount">СУМА</string>
-    <string name="billing_payment_table_header_date">ДАТА</string>
-    <string name="billing_payment_table_header_description">ОПИСАНИЕ</string>
     <string name="billing_premium_refund_text">Може да бъде поискано възстановяване на сума, ако тази покупка е направена през последните %1$s дни. [Нашият дружелюбен помощен център ще ти помогне да си върнете монетите.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Съжаляваме, нямате право на връщане на сумата за тази покупка. Може да бъде поискано възстановяване на сума, ако тази покупка е направена през последните %1$s дни.</string>
     <string name="billing_price_per_month">%1$s/месец</string>
@@ -562,9 +552,7 @@
     <string name="billing_purchase_details_header">Данни за покупка</string>
     <string name="billing_refund_header">Проблеми с покупката?</string>
     <string name="billing_refund_play_time_never_played">Никога не е играна</string>
-    <string name="billing_refund_play_time_subheader">ИЗИГРАНО ВРЕМЕ</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">ДАТА НА ПОКУПКА</string>
     <string name="billing_refund_report_a_problem">Съобщете за проблем</string>
     <string name="billing_refund_request_button">Искане за връщане</string>
     <string name="billing_sales_tax_added">%1$s данък върху продажбите е добавен поради адреса ти на таксуване.</string>
@@ -803,7 +791,6 @@
     <string name="connection_enter_code">Въведи кода, показан на твоя екран</string>
     <string name="connection_invalid_pin">Въведен е невалиден PIN код</string>
     <string name="connection_login_with">или вписване с</string>
-    <string name="connection_problems_body">Провери [състояние на сървъра](%1$s) или туитни на [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Удостоверяване</string>
     <string name="connection_status_awaiting_endpoint">Изчакване на крайна точка</string>
     <string name="connection_status_connected">Свързано</string>
@@ -848,11 +835,10 @@
     <string name="create_category">Създаване на категория</string>
     <string name="create_channel">Създаване на канал</string>
     <string name="create_group_dm">Създаване на групово DM</string>
-    <string name="create_instant_invite">Създаване на момента покана</string>
+    <string name="create_instant_invite">Създай покана</string>
     <string name="create_link">Генериране на връзка</string>
     <string name="create_or_join_modal_header">А, друг сървър?</string>
     <string name="create_server_button_body">Създай нов сървър и покани приятелите си. Безплатно е!</string>
-    <string name="create_server_button_cta">Създаване на сървър</string>
     <string name="create_server_button_cta_mobile">Създаване на нов сървър</string>
     <string name="create_server_button_cta_mobile_desc">Направи си сървър, покани приятелите си, организирай парти!</string>
     <string name="create_server_description">Чрез създаване на сървър, ще имаш достъп до **безплатен** гласов и текстов чат, който да използвате с приятелите си.</string>
@@ -963,7 +949,6 @@
     <string name="disable_email_notifications_failed_suggestion">Имейл известията може би вече са деактивирани или този имейл вече не е свързан с акаунт в Discord.</string>
     <string name="disable_integration_title">Деактивиране на синхронизацията</string>
     <string name="disable_integration_twitch_body">Деактивирайки синхронизацията, избраното поведение за изтекъл абонат се изпълнява, така както ако всички абонати са с изтекъл срок.</string>
-    <string name="disable_integration_youtube_body">Деактивирайки синхронизацията, избраното поведение за изтекъл спонсор се изпълнява, така както ако всички спонсори са с изтекъл срок.</string>
     <string name="disable_notifications_description">Всички десктоп известия ще бъдат деактивирани.</string>
     <string name="disable_notifications_label">Деактивиране на известията</string>
     <string name="disable_sounds_description">Всички звукови ефекти ще бъдат деактивирани.</string>
@@ -979,7 +964,6 @@
     <string name="discord_desc_long">Безплатен и сигурен чат за геймъри, работещ на компютри и телефони.</string>
     <string name="discord_desc_short">Отборен гласов и текстов чат</string>
     <string name="dismiss">Затваряне</string>
-    <string name="dispatch_error_modal_body">Нещо се обърка. Ако проблемът продължава, създайте заявка за поддръжка и копирайте съдържанието на съобщението по-долу.</string>
     <string name="dispatch_error_modal_error_label">Съобщение за грешка (копирай ме и ме постави)</string>
     <string name="dispatch_error_modal_header">Грешка в Discord Dispatch</string>
     <string name="dispatch_error_modal_open_ticket">Създай заявка</string>
@@ -1109,8 +1093,6 @@ AFK времето за изчакване. Това не засяга брау
     <string name="form_help_attenuation">"Намалява звука на останалите приложения с този процент, когато някой говори.
 Задай 0%%, ако искаш да изключиш затихването."</string>
     <string name="form_help_automatic_vad">Когато индикаторът е зелен, това означава, че Discord предава меденото ти гласче.</string>
-    <string name="form_help_bitrate">"**КОЛКО МНОГО БИТОВЕ!** Не е препоръчително да се използват повече от %1$skbps, освен ако не си вманиачен на тема звук,
-защото това ще се отрази отрицателно на хората, използващи мобилни устройства или със слаба връзка, без забележима полза."</string>
     <string name="form_help_certified_voice_processing">"Докато използваш Discord Certified микрофон, определени функции за гласова обработка вече не се изпълняват от Discord,
 но по-скоро микрофона."</string>
     <string name="form_help_channel_permissions">Изборът на роли автоматично настройва основните разрешения за този канал.</string>
@@ -1123,11 +1105,6 @@ AFK времето за изчакване. Това не засяга брау
 всяко съобщение, изпратено в сървъра. Силно препоръчваме да настроите това само за @mentions за публичен Discord"</string>
     <string name="form_help_explicit_content_filter">"Автоматично сканира и изтрива съобщения, изпратени в този сървър, които съдържат нецензурно съдържание. Моля, изберете колко всеобхватно
 филтърът да се прилага за членовете във твоя сървър. **Препоръчваме да зададеш филтър за публичен Discord.**"</string>
-    <string name="form_help_instant_invite_channel">"Ако изберете канал, се генерира връзка за моментна покана за с изпълним модул,
-в противен случай се показват само членовете на линия и гласови канали."</string>
-    <string name="form_help_last_seen">"Премахването ще изрита **%1$s** които не са
-виждани от **%2$s** и нямат възложени роли.
-Те могат да се присъединят към сървъра с помощта на нова моментна покана."</string>
     <string name="form_help_legacy_subsystem">"Определени аудио хардуер драйвери имат проблеми при използване на съвременната аудио подсистема на твоята операционна система.
 Постави отметка в това квадратче за връщане към наследена аудио подсистема."</string>
     <string name="form_help_nsfw">"Потребителите трябва да потвърдят, че са пълнолетни, за да могат да видят съдържанието на този канал.
@@ -1137,7 +1114,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="form_help_qos">"Подсказва на твоя рутер, че пакетите, които Discord изпраща имат висок приоритет.
 Някои рутери или интернет доставчици могат да не се държат добре, когато е зададена тази настройка."</string>
     <string name="form_help_slowmode">Членовете ще бъдат ограничени да изпращат едно съобщение през този интервал, освен ако нямат разрешения за Управление на канал или Управление на съобщения.</string>
-    <string name="form_help_system_channel">Изпращане на съобщение към този канал, когато някой се присъедини към този сървър. Съобщенията са произволни. Това може да се изключи по всяко време.</string>
     <string name="form_help_temporary">Членовете се изритват автоматично при разкачане освен, ако нямат възложена роля.</string>
     <string name="form_help_user_limit">"Ограничава броя потребители, които могат да се свържат към този гласов канал. Потребителите с разрешение за **Местене на членове** могат да
 пренебрегнат това ограничение и да преместят други потребители в този канал."</string>
@@ -1182,8 +1158,8 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="form_label_input_mode">Входен режим</string>
     <string name="form_label_input_sensitivty">Чувствителност на входа</string>
     <string name="form_label_input_volume">Сила на входния звук</string>
-    <string name="form_label_instant_invite">Въведи моментна покана</string>
-    <string name="form_label_instant_invite_channel">Моментна покана за канал</string>
+    <string name="form_label_instant_invite">Въведи покана</string>
+    <string name="form_label_instant_invite_channel">Канала за покани</string>
     <string name="form_label_last_seen">Последно видян</string>
     <string name="form_label_local_mute">Локално изключване на микрофон</string>
     <string name="form_label_max_age">Изтича след</string>
@@ -1251,7 +1227,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="form_label_suppress_everyone">Подтискане на **@everyone** и **@here**</string>
     <string name="form_label_synced_role">Синхронизирана роля</string>
     <string name="form_label_synced_subs">Синхронизирани абонати</string>
-    <string name="form_label_system_channel">Нов канал за съобщения от членове</string>
     <string name="form_label_temporary">Временно членство</string>
     <string name="form_label_tts_notifications">Известия за Text-to-Speech</string>
     <string name="form_label_user_limit">Ограничение за потребители</string>
@@ -1352,7 +1327,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="game_feed_activity_recently_played">Играни наскоро</string>
     <string name="game_feed_activity_streaming_twitch">Стрийминг в Twitch</string>
     <string name="game_feed_current_header_title">В момента се играе</string>
-    <string name="game_feed_settings_visibility">Показване в раздела с игри</string>
     <string name="game_feed_unknown_player">Неизвестен играч</string>
     <string name="game_feed_user_played_days_ago">Игра преди %1$s %2$s</string>
     <string name="game_feed_user_played_hours_ago">Игра преди %1$s %2$s</string>
@@ -1422,6 +1396,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="generate_a_new_link">Генериране на нова връзка</string>
     <string name="get_started">Започвай</string>
     <string name="gif_auto_play_label">Автоматично пускай GIF изображения, когато Discord е на фокус.</string>
+    <string name="go_live_hardware_acceleration_unavailable">Бързо предупреждение – не засичаме хардуерно ускорение. Твоят компютър може да има проблеми с поддръжката на Go Live.</string>
     <string name="go_live_hey">Хей!</string>
     <string name="go_live_listen">Слушай!</string>
     <string name="go_live_look">Виж!</string>
@@ -1435,6 +1410,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="go_live_modal_select_channel_form_title">Избери гласов канал</string>
     <string name="go_live_modal_select_channel_placeholder">Търсене на гласови канали</string>
     <string name="go_live_modal_title">Предавай на живо</string>
+    <string name="go_live_video_drivers_outdated">Твоите видео драйвери не са актуални. Обнови ги за по-добро Go Live качество.</string>
     <string name="grant_temporary_membership">Предоставяне на временно членство</string>
     <string name="group">Група</string>
     <string name="group_dm_add_friends">Добавяне на приятели в DM</string>
@@ -1511,8 +1487,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Предостави** %1$s за **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Преместен от **%1$s** в **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">На позиция **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) създаде текстов канал $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Смени темата на **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Задаване на темата на, като **%1$s**</string>
@@ -1607,6 +1581,8 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="guild_settings_filter_all_actions">Всички действия</string>
     <string name="guild_settings_filter_all_users">Всички потребители</string>
     <string name="guild_settings_filter_user">Филтриране по потребител</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">720 p 60 fps Go Live стриймове</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">1080 p 60 fps Go Live стриймове</string>
     <string name="guild_settings_label_audit_log">Запис на одит</string>
     <string name="guild_settings_label_audit_log_empty_body">Когато модераторите започнат да модерират, можеш да модерираш модерирането от тук.</string>
     <string name="guild_settings_label_audit_log_empty_title">Все още няма записи</string>
@@ -1638,7 +1614,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="help_role_locked_mine">Ролята е заключена, защото това е ролята ти с най-висок ранг. Попитай някой с по-висок ранг или собственик на сървъра за помощ.</string>
     <string name="help_singular_permission">Не можеш да променяш това разрешение, защото премахването му ще го премахне от теб.</string>
     <string name="hide_instant_invites_description">Препоръчително, ако не искаш случайни хора да имат достъп до твоите Discord сървъри.</string>
-    <string name="hide_instant_invites_label">Скриване на връзки с моментна покана</string>
+    <string name="hide_instant_invites_label">Скрий връзки за покани</string>
     <string name="hide_muted">Скриване на %1$s заглушени</string>
     <string name="hide_muted_channels">Скриване на заглушени канали</string>
     <string name="hide_personal_information_description">Скрива имейла, свързаните акаунти, забележки и прави анонимни DiscordTags.</string>
@@ -1686,7 +1662,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="hypesquad_question_11_response_d">Предлагаш Wumpus да избере дайрето вместо това</string>
     <string name="hypesquad_question_12_prompt">Изкачваш върха на най-високата планина и единственото нещо, което те дели от богатството е триглавият дракон най-отгоре, който ти пречи. Какво правиш:</string>
     <string name="hypesquad_question_12_response_a">Впускаш се в боя</string>
-    <string name="hypesquad_question_12_response_b">Гледаш стари филми за Годзила, за да се поучиш от битките му с King Ghidorah</string>
     <string name="hypesquad_question_12_response_c">Опитваш се да убедиш дракона да си разделите богатствата</string>
     <string name="hypesquad_question_12_response_d">Предлагаш на дракона плюшена играчка Wumpus, все пак кой не иска такава?</string>
     <string name="hypesquad_question_13_prompt">Какъв е този звук?:</string>
@@ -1790,14 +1765,14 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="input_mode_ptt_release_delay">Push-to-Talk закъснение след освобождаване на бутона</string>
     <string name="input_mode_vad">Гласова активност</string>
     <string name="install_location_main">Основен</string>
-    <string name="instant_invite">Моментна покана</string>
+    <string name="instant_invite">Покана</string>
     <string name="instant_invite_accept">Приемане на покана</string>
-    <string name="instant_invite_accepted">Моментната покана е приета</string>
-    <string name="instant_invite_accepting">Приемане на моментна покана</string>
+    <string name="instant_invite_accepted">Приета покана</string>
+    <string name="instant_invite_accepting">Приемане на покана</string>
     <string name="instant_invite_ask_for_new_invite">Попитай за нова покана!</string>
     <string name="instant_invite_ask_user_for_new_invite">Попитай %1$s за нова покана!</string>
     <string name="instant_invite_code">Код</string>
-    <string name="instant_invite_expired">Моментната покана е невалидна или е изтекла.</string>
+    <string name="instant_invite_expired">Поканата е невалидна или е изтекла.</string>
     <string name="instant_invite_expires">Изтича</string>
     <string name="instant_invite_failed_to_generate">Неуспешно създаване на връзка за покана.</string>
     <string name="instant_invite_generate">Генериране</string>
@@ -1815,7 +1790,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="instant_invite_regenerate">Регенериране</string>
     <string name="instant_invite_resolved_body">Поканили са те в **%1$s** на **%2$s**.</string>
     <string name="instant_invite_resolved_title">Хей, здравей.</string>
-    <string name="instant_invite_resolving">Разрешаване на моментна покана</string>
+    <string name="instant_invite_resolving">Разрешаване на покана</string>
     <string name="instant_invite_uses">Използвания</string>
     <string name="instant_invite_you_are_already_a_member_of">Вече си член на</string>
     <string name="instant_invite_you_have_been_invited_to_join">Поканили са те да се присъединиш</string>
@@ -1824,7 +1799,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="instant_invites">Покани</string>
     <string name="integration_settings">Настройки на интеграцията</string>
     <string name="integrations">Интеграции</string>
-    <string name="integrations_header">Свързани акаунти в Twitch/YouTube Gaming</string>
     <string name="integrations_pro_tip">За още интеграции, виж [StreamKit на Discord](%1$s).</string>
     <string name="internal_server_error">Възникна вътрешна грешка в сървъра, моля, опитай пак.</string>
     <string name="invalid_animated_emoji_body">Този емотикон не работи, защото е анимиран. Надгради до Discord Nitro, за да осъществиш мечтата си за анимирани емотикони</string>
@@ -1937,13 +1911,13 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="join_afk_channel_body">Изглежда, че се присъедини към AFK канала. Тук не може да се говори.</string>
     <string name="join_call">Присъединяване към обаждане</string>
     <string name="join_server">Присъединяване</string>
-    <string name="join_server_button_body">Въведи моментна покана и се присъедини към сървъра на приятеля си.</string>
+    <string name="join_server_button_body">Въведи покана и се присъедини към сървъра на приятеля си.</string>
     <string name="join_server_button_cta">Присъединяване към сървър</string>
     <string name="join_server_button_cta_mobile">Присъединяване към сървър с връзка за покана</string>
     <string name="join_server_button_cta_mobile_desc">Имаш ли код или връзка за покана? Използвай го тук!</string>
     <string name="join_server_button_cta_named">Присъединяване %1$s</string>
-    <string name="join_server_description">Въведи моментна покана по-долу, за да се присъединиш към съществуващ сървър. Поканата представлява нещо подобно:</string>
-    <string name="join_server_description_mobile">Въведи моментна покана по-горе, за да се присъединиш към съществуващ сървър.</string>
+    <string name="join_server_description">Въведи поканата по-долу, за да се присъединиш към съществуващ сървър. Поканата представлява нещо подобно:</string>
+    <string name="join_server_description_mobile">Въведи поканата по-горе, за да се присъединиш към съществуващ сървър.</string>
     <string name="join_server_title">Присъединяване към сървър</string>
     <string name="join_stream">Присъедини се към стрийм</string>
     <string name="join_video_call">Присъединяване към видео обаждане</string>
@@ -2051,7 +2025,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="link_your_xbox_account_2">Discord е приложение за гласов, текстов и видео чат за геймъри, което е безплатно, сигурно и работи на десктоп и мобилни устройства.</string>
     <string name="listening_to">Слуша **%1$s**</string>
     <string name="live">На живо</string>
-    <string name="live_beta_description">Добре дошли в стрийма! Предаването на живо е в бета версия. Съжаляваме за техническите проблеми</string>
+    <string name="live_beta_description">Добре дошли в стрийма! Go Live е в бета версия. Съжаляваме за техническите проблеми</string>
     <string name="live_on_twitch">На живо в Twitch</string>
     <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Неуспешно зареждане на изображението.
@@ -2213,8 +2187,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="new_permission">Ново разрешение</string>
     <string name="new_terms_ack">Разбирам и приемам тези условия.</string>
     <string name="new_terms_continue">Продължи към Discord</string>
-    <string name="new_terms_description">"За да продължите да използвате Discord, прочетете и приемете
-нашите условия за услугата и политика за поверителност."</string>
     <string name="new_terms_title">Актуализация на условията за услугата и политиката за поверителност</string>
     <string name="new_unreads">Нови непрочетени</string>
     <string name="next">Напред</string>
@@ -2237,14 +2209,11 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="no_emoji_title">Няма емотикони</string>
     <string name="no_input_devices">Няма входни устройства</string>
     <string name="no_input_devices_detected">Не бяха открити устройства за въвеждане. Включи такова устройство и опитай отново.</string>
-    <string name="no_instant_invite">Няма моментна покана</string>
-    <string name="no_integrations">[Свържи](onConnect) своя партньорски Twitch или YouTube Gaming акаунт, за да синхронизираш твоите абонати/спонсори с роля.</string>
+    <string name="no_instant_invite">Няма покана</string>
     <string name="no_integrations_body">Протоколът FR13NDSH1P може да се изпълни само от клиента на Discord</string>
     <string name="no_integrations_label">Няма интеграции</string>
-    <string name="no_invites_body">"Нямате усещане за цел? Като хартиен самолет, реещ се в небесата?
-Вкарайте малко приятели тук, като създадете връзка за моментна покана!"</string>
-    <string name="no_invites_caption">Все още няма моментни покани!</string>
-    <string name="no_invites_label">Все още няма моментни покани</string>
+    <string name="no_invites_caption">Все още няма покани!</string>
+    <string name="no_invites_label">Все още няма покани</string>
     <string name="no_mail_account_title">Няма пощенски акаунт</string>
     <string name="no_mic_body">Инструкции за разрешаване на достъпа до микрофона може да откриеш в помощния център на Discord.</string>
     <string name="no_mic_title">Достъпът до микрофона е отказан</string>
@@ -2261,7 +2230,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="no_reactions_header">Няма реакции</string>
     <string name="no_recent_mentions">И в началото… настана мълчание.</string>
     <string name="no_send_messages_permission_placeholder">Нямаш разрешение да изпращаш съобщения в този канал.</string>
-    <string name="no_system_channel">Няма нови съобщения от членове</string>
     <string name="no_text">Не</string>
     <string name="no_thanks">Не, благодаря</string>
     <string name="no_user_limit">Без ограничение</string>
@@ -2273,7 +2241,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="note">Забележка</string>
     <string name="note_placeholder">Кликни, за да добавиш забележка</string>
     <string name="note_placeholder_mobile">Докосни, за да добавиш забележка</string>
-    <string name="notice_application_test_mode">В момента е активен тестовият режим за **%1$s**. Непубликуваните SKU се показват и няма да се начислят за свързани плащания.</string>
     <string name="notice_application_test_mode_go_to_listing">Премини към SKU</string>
     <string name="notice_connect_spotify">Свържи своя Spotify акаунт, за да покажеш музиката в статуса си!</string>
     <string name="notice_connection_conflict">Твоят глас беше изключен, защото се свърза на друго място.</string>
@@ -2284,7 +2251,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="notice_dispatch_error_disk_low">Нямаш достатъчно място на диска. %1$s е необходимото, но има само %2$s.</string>
     <string name="notice_dispatch_error_file_name_too_long">О, не, тази игра има имена на файлове, които са твърде дълги за Windows. Моля, избери инсталационна директория с по-кратко име.</string>
     <string name="notice_dispatch_error_invalid_drive">О, не, място на инсталация, което избра, не е валидно. Ти избра %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Не успяхме да актуализираме играта. Пусната ли е в момента?</string>
     <string name="notice_dispatch_error_no_manifests">О, не, изглежда няма съдържание за тази игра. Моля, свържи се с поддръжката.</string>
     <string name="notice_dispatch_error_not_entitled">О, не, изглежда не притежаваш тази игра. Свържи се с поддръжката, ако смяташ, че това е грешка.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Изглежда си казал „не“ на скрипт за инсталация. Трябва да кажеш „да“, за да се инсталира играта.</string>
@@ -2299,9 +2265,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="notice_native_apps">Трябва ти опция да говориш с натискане на бутон в цялата система? Свали десктоп приложението!</string>
     <string name="notice_no_input_detected">Изглежда Discord не може да открие входящ сигнал от микрофона ти. Да оправим това… заедно.</string>
     <string name="notice_no_input_detected_help_link_text">Помощ!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Достъпът ти до Nitro изтече. Надграждане от Nitro Classic към Nitro за неограничен достъп до невероятни игри.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Остават само %1$s за Nitro игри! Достъпът ти изтича на **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Благодарим ти, че си сред първите поддръжници на Nitro! Като подарък, за това, че си страхотен/на, получаваш достъп до игрите в Nitro до %1$s.</string>
     <string name="notice_premium_promo_action">Разгледай</string>
     <string name="notice_premium_promo_message">Подкрепи развитието на Discord и получете забавни бонуси!</string>
     <string name="notice_scheduled_maintenance">Discord ще извърши планирана техническа поддръжка на **%1$s** от **%2$s**.</string>
@@ -2371,7 +2334,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Активирано наслагване</string>
     <string name="nux_post_reg_join_server_description">Възползвай се максимално от Discord, като се присъединиш към сървър.</string>
     <string name="nux_post_reg_join_server_skip">Нямам такъв</string>
     <string name="nux_post_reg_join_server_title">Имаш ли покана?</string>
@@ -2416,8 +2378,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="overlay_link_alert_title">Задръж!</string>
     <string name="overlay_menu_get_invite">Вземи връзка за покана</string>
     <string name="overlay_menu_open_discord">Отваряне на Discord</string>
-    <string name="overlay_menu_switch_channels">Превключи каналите</string>
-    <string name="overlay_mobile_toggle_desc">Виж кой говори и имай достъп до преки пътища при свързване с глас докато използваш други приложения</string>
     <string name="overlay_mobile_toggle_label">Активиране на мобилно гласово наслагване</string>
     <string name="overlay_mobile_unauthed">Впиши се в приложението на Discord, за да включиш тази функция.</string>
     <string name="overlay_news_go_live_body">Искаш да стриймваш %1$s към твоите приятели в %2$s?</string>
@@ -2425,7 +2385,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="overlay_news_text_pinning_body">Сега можеш да закачиш текстов чат към играта си!</string>
     <string name="overlay_news_text_pinning_tip">Съвет: Можеш да закачиш чат, като натиснеш $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Надградено наслагване в Discord</string>
-    <string name="overlay_no_results">Потърсихме надлъж и нашир. За съжаление не бяха намерени гласови канали</string>
     <string name="overlay_notification_incoming_call">Входящо обаждане…</string>
     <string name="overlay_notification_settings_disabled">Известията са деактивирани</string>
     <string name="overlay_notification_settings_position">Показване: %1$s</string>
@@ -2435,7 +2394,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="overlay_notifications_settings">Известия с наслагване</string>
     <string name="overlay_notifications_top_left">Горе в ляво</string>
     <string name="overlay_notifications_top_right">Горе в дясно</string>
-    <string name="overlay_private_channels_empty_state">Не, тук няма директни съобщения.</string>
     <string name="overlay_reload">Зареди отново наслагването</string>
     <string name="overlay_settings">Настройки на наслагването</string>
     <string name="overlay_settings_general_tab">Общи</string>
@@ -2457,7 +2415,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="pagination_page_of">Стр. %1$s от %2$s</string>
     <string name="pagination_previous">Назад</string>
     <string name="paginator_of_pages">Стр. %1$s от %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Партньор на Discord</string>
     <string name="party_full">Групата е пълна</string>
     <string name="party_join">Присъедини се към група</string>
@@ -2551,18 +2508,11 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="popout_stay_on_top">Остави отгоре</string>
     <string name="post_code">Пощенски код</string>
     <string name="premium_alert_error_title">Опа, нещо се обърка…</string>
-    <string name="premium_applications_grandfathered_monthly">В знак на благодарност, че подкрепяш Discord, имаш достъп до Nitro игри в продължение на една година. Достъпът ти приключва на **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">В знак на благодарност, че подкрепяш Discord, имаш достъп до Nitro игри в продължение на две години. Достъпът ти приключва на **%1$s**.</string>
-    <string name="premium_applications_subtitle">Неограничен достъп до разрастваща се библиотека от възторжено приветствани игри, които според нас ти и приятелите ти трябва да играете.</string>
-    <string name="premium_applications_title">Множество избрани игри. Една ниска месечна цена.</string>
     <string name="premium_badge_tooltip">Абонат от %1$s</string>
     <string name="premium_cancel_cancel">Не</string>
     <string name="premium_cancel_confirm_body_tier_1">"Отказът ще влезе в сила в края на текущия ти период на таксуване на **%1$s**. Твоят Discord таг ще бъде произволен, ако си го променял.
 
 Можеш да рестартираш абонамента си по всяко време."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Отказът ще влезе в сила в края на текущия ти период на таксуване. На **%1$s** ще изгубиш достъп до всички Nitro игри в твоята библиотека и твоят Discord таг ще бъде избран произволно, ако си го променял.
-
-Ще пазим запазените ти файлове, в случай че промениш решението си. Можеш да подновиш абонамента си по всяко време!"</string>
     <string name="premium_cancel_confirm_new">Да, отказ на %1$s</string>
     <string name="premium_cancel_confirm_title">Отказ на %1$s?</string>
     <string name="premium_cancel_failed_body">Не успяхме да отменим твоя абонамент за Nitro. Моля, опитай пак или се свържи с нашия екип за поддръжка, ако проблемът продължи.</string>
@@ -2579,19 +2529,15 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="premium_chat_perks_description_custom_emoji">Вземи глобален паспорт, за да използваш своите персонализирани емоджита навсякъде.</string>
     <string name="premium_chat_perks_description_discriminator">Избери своя таг, докато си абониран.</string>
     <string name="premium_chat_perks_description_screenshare">Повиши нивото на играта със споделяне на кадри със 720p 60fps или 1080p 30fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Качване на голям размер файл за %1$s от %2$s за споделяне на висококачествено меме.</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Анимирано забавление</string>
     <string name="premium_chat_perks_title_badge">Представлявай твоята поддръжка</string>
     <string name="premium_chat_perks_title_custom_emoji">Глобални персонализирани емоджи</string>
     <string name="premium_chat_perks_title_discriminator">Персонализиран таг на Discord</string>
     <string name="premium_chat_perks_title_screenshare">Видео с по-високо качество</string>
+    <string name="premium_chat_perks_title_streaming">По-добри Go Live стриймове</string>
     <string name="premium_code_redemption_confirmation_blurb">Благодарение на произволен низ от цифри ти вече имаш подобрени чат бонуси за %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">О, супер!</string>
-    <string name="premium_feature_new_chat_perks_header">Получаваш също и няколко подобрени чат бонуса:</string>
-    <string name="premium_feature_new_premium_applications_header">Игри на стойност над %1$s. Виж ги тук:</string>
-    <string name="premium_feature_view_applications">Преглед на всички Nitro игри</string>
     <string name="premium_features_chat_perks">Чат бонуси</string>
-    <string name="premium_features_premium_applications">Безплатни игри</string>
     <string name="premium_grandfathered_warning">В знак на благодарност, че ни подкрепяш, получаваш отстъпка за план Nitro. **Ако се откажеш или промениш своя план, ще изгубиш тази отстъпка.** Предупреждаваме те!!!!!</string>
     <string name="premium_grandfathered_warning_confirm">Направи го въпреки това</string>
     <string name="premium_grandfathered_warning_title">Внимателно, приятелю</string>
@@ -2601,11 +2547,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="premium_not_claimed">Първо регистрирай акаунта си</string>
     <string name="premium_not_claimed_body">Здравей, приятелю! Ако желаеш да купиш Nitro, ще трябва първо да заявиш акаунта си, за да не загубиш нещата си.</string>
     <string name="premium_not_verified">Първо потвърди своя имейл</string>
-    <string name="premium_not_verified_body">"Здравей, приятелю! Ако желаеш да купиш Nitro, ще трябва първо да потвърдиш имейла си. Провери имейла си или
-заяви нов."</string>
-    <string name="premium_payment_applications_os_warning">Nitro игрите се поддържат само от Windows.</string>
     <string name="premium_payment_confirmation_blurb_regular">Сега имаш силата на чат бонусите. Спри да четеш това и отиди да чатиш!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Сега имаш неограничен достъп до толкова много страхотни игри. Спри да четеш това и отиди да ги играеш!!!</string>
     <string name="premium_payment_confirmation_button_regular">К, звучи добре</string>
     <string name="premium_plan_month">Nitro месечно</string>
     <string name="premium_plan_month_tier_1">Nitro Classic месечно</string>
@@ -2626,13 +2568,10 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="premium_upgrade_disabled_current_tooltip">Текущият ти план.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Първо трябва да се откажеш и да оставиш абонамента си да изтече, преди да избереш по-нисък план.</string>
     <string name="premium_upgrade_done_body_tier_1">Сега имаш бонуси за чат!</string>
-    <string name="premium_upgrade_done_body_tier_2">Сега имаш бонуси за чат и достъп до десетки игри.</string>
     <string name="premium_upgrade_done_button_tier_1">Супер!</string>
-    <string name="premium_upgrade_done_button_tier_2">Виж всички Nitro игри</string>
     <string name="premium_upgrade_failed_body">Ъмм.. Надграждането не се получи. Увери се, че информацията за плащане е актуална и опитай пак.</string>
     <string name="premium_upload_promo">Надгради до Discord Nitro за %1$s ограничение за файлове</string>
     <string name="premium_year_free_months">Вземи 2 месеца безплатно!</string>
-    <string name="premium_year_free_months_short">2 месеца безплатно</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / година</string>
     <string name="preview_chat">Преглед на чат</string>
     <string name="priority_speaker">Говорител с приоритет</string>
@@ -2817,7 +2756,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="scope_guilds">Виж в кои сървъри си</string>
     <string name="scope_guilds_empty">Не си в никакви сървъри.</string>
     <string name="scope_guilds_join">Присъединяване на сървъри за теб</string>
-    <string name="scope_guilds_join_description">Използване на моментни покани от твое име.</string>
+    <string name="scope_guilds_join_description">Използвай покани от свое име.</string>
     <string name="scope_identify">Достъп до твоето потребителско име и аватар</string>
     <string name="scope_messages_read">Прочитане на всички съобщения</string>
     <string name="scope_messages_read_description">Това позволява на приложението да чете всички съобщения, достъпни чрез твоя акаунт в Discord</string>
@@ -2883,7 +2822,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="search_filter_on">на</string>
     <string name="search_for_emoji">Намери перфектния емотикон</string>
     <string name="search_for_empty">Търсене</string>
-    <string name="search_for_value">Търсене на: **%1$s**</string>
     <string name="search_group_header_channels">В канал</string>
     <string name="search_group_header_dates">Дати</string>
     <string name="search_group_header_file_name">Името на файла съдържа</string>
@@ -3095,7 +3033,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="stream_capture_paused_details">Прехвърли на твоята игра, за да възобновиш.</string>
     <string name="stream_capture_paused_details_viewer">%1$s минимизира играта… изчакай малко!</string>
     <string name="stream_channel_description">Членовете с това разрешение могат да стриймват в този канал.</string>
-    <string name="stream_description">Членовете с това разрешение могат да в този канал.</string>
     <string name="stream_ended">Този стрийм е приключил. *звук на щурец*</string>
     <string name="stream_ended_button">Стриймът завърши</string>
     <string name="stream_ended_no_spectators">Няма зрители, тъй като стриймът завърши.</string>
@@ -3135,7 +3072,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="stream_report_rating_body_streamer">Кажи ни за впечатленията си от стрийма.</string>
     <string name="stream_report_submit">Изпращане</string>
     <string name="stream_reported">Обратната връзка бе изпратена</string>
-    <string name="stream_reported_body">Благодаря, че докладва за твоя проблем Твоята обратна връзка ни помага да подобрим качеството на стрийма.</string>
     <string name="stream_soundshare_failed">Хей, нещо се обърка и не успяхме да стриймнем звука от твоята игра.</string>
     <string name="streamer_mode">Стрийминг режим</string>
     <string name="streamer_mode_enabled">Стрийминг режимът е разрешен</string>
@@ -3193,7 +3129,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="system_message_guild_member_join_10">Появи се див %1$s.</string>
     <string name="system_message_guild_member_join_11">Swoooosh. %1$s току що се приземи.</string>
     <string name="system_message_guild_member_join_12">Дръжте се. %1$s току що се присъедини към сървъра.</string>
-    <string name="system_message_guild_member_join_13">%1$s току що се присъедини. Скрий бананите.</string>
     <string name="system_message_guild_member_join_14">%1$s току що пристигна. Изглежда твърде OP - трябва нърф.</string>
     <string name="system_message_guild_member_join_15">%1$s току що се плъзна в сървъра.</string>
     <string name="system_message_guild_member_join_16">%1$s се споунна в сървъра.</string>
@@ -3204,7 +3139,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="system_message_guild_member_join_21">Приближава претендент - %1$s се появи!</string>
     <string name="system_message_guild_member_join_22">Това е птица! Това е самолет! Няма значение, оказа се %1$s.</string>
     <string name="system_message_guild_member_join_23">Това е %1$s! Поклон пред слънцето! \\\\[T]/</string>
-    <string name="system_message_guild_member_join_25">Ха! %1$s се присъедини! Активира моята карта - капан!</string>
     <string name="system_message_guild_member_join_26">Живо-здраво, душко! %1$s е тук!</string>
     <string name="system_message_guild_member_join_27">Хей! Слушай! %1$s се присъедини!</string>
     <string name="system_message_guild_member_join_28">Очаквахме те %1$s</string>
@@ -3233,7 +3167,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="temporary_membership_explanation">"Временните членове се изритват автоматично при разкачване освен, ако нямат възложена
  роля"</string>
     <string name="terms_of_service">[Условия на услугата](%1$s)</string>
-    <string name="terms_privacy">С регистрацията си, ти приемаш [Условията на Услугата](%1$s) и [Политиката за Поверителност] на Discord (%2$s).</string>
     <string name="terms_privacy_opt_in">Прочетох и приемам [Условията на Услугата](%1$s) и [Политиката за Поверителност] на Discord (%2$s).</string>
     <string name="terms_privacy_opt_in_tooltip">Трябва да приемеш нашите условия на услугата, за да продължиш</string>
     <string name="test_video">Тестово видео</string>
@@ -3354,8 +3287,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="unsupported_browser">Браузърът не се поддържа</string>
     <string name="unsupported_browser_body">"Изглежда използваш неподдържан браузър. За да може Discord да предложи своите възможности, надстрой своя
 браузър или свали някое от нашите приложения."</string>
-    <string name="unsupported_browser_details">"Желаеш да говориш със своя отбор, нали? Свали последна версия на Chrome, Opera, Firefox 38+ или направо
-Discord клиента, за да говорите още сега!"</string>
     <string name="unsupported_browser_title">Е, това е неприятно</string>
     <string name="unverified_account_body">"Моля, провери своят имейл и следвай инструкциите за потвърждение.
 
@@ -3473,8 +3404,6 @@ Discord клиента, за да говорите още сега!"</string>
     <string name="user_settings_appearance_preview_message_4">Компактният режим ще бъде включен</string>
     <string name="user_settings_appearance_preview_message_5">О, ето го!</string>
     <string name="user_settings_appearance_zoom_tip">Можеш да промениш нивото на мащабиране с %1$s +/- и да нулираш до мащабирането по подразбиране с %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Показване на раздела с игри</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Изключи това, за да скриеш раздела с игри, така че да се концентрираш върху разговорите.</string>
     <string name="user_settings_close_button">Бутон за затваряне</string>
     <string name="user_settings_confirm_logout">Сигурен/на ли си, че искаш да излезеш?</string>
     <string name="user_settings_game_activity">Действие на игра</string>
@@ -3533,8 +3462,6 @@ Push to Talk от Засичане на гласова активност."</str
     <string name="vanity_url_hint_mobile">твоят-url-адрес-тук</string>
     <string name="verfication_expired">Валидността на връзката за потвърждение на е-пощата е изтекла.</string>
     <string name="verfication_expired_suggestion">Впиши се в Discord и изпрати връзката отново</string>
-    <string name="verification_body">"Засякохме нещо нередно.
-За да продължиш да използваш Discord, **ще трябва да потвърдиш, че си човек.**"</string>
     <string name="verification_body_alt">Сега, нека се уверим, че си човек…</string>
     <string name="verification_email_body">Изпратихме нов имейл за потвърждение на **%1$s**, моля, провери входящата и спам кутията.</string>
     <string name="verification_email_error_body">Възникна грешка при изпращане на имейл за потвърждение. Опитай отново по-късно или се свържи с поддръжката.</string>
@@ -3575,8 +3502,6 @@ Push to Talk от Засичане на гласова активност."</str
     <string name="video">Видео</string>
     <string name="video_call">Видео обаждане</string>
     <string name="video_connect">Видео</string>
-    <string name="video_poor_connection_body">Видеото е деактивирано. То ще продължи, когато връзката ти се подобри.</string>
-    <string name="video_poor_connection_title">Лоша връзка</string>
     <string name="video_preview">Визуализация на видео</string>
     <string name="video_settings">Видео настройки</string>
     <string name="video_unavailable">Видеото не е достъпно</string>
diff --git a/com.discord/res/values-cs/plurals.xml b/com.discord/res/values-cs/plurals.xml
index 62a133f5f3..f6965ab6af 100644
--- a/com.discord/res/values-cs/plurals.xml
+++ b/com.discord/res/values-cs/plurals.xml
@@ -103,15 +103,6 @@
         <item quantity="zero">žádné pozice</item>
         <item quantity="one">%d pozice</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d dní</item>
-        <item quantity="one">1 den</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d členů</item>
-        <item quantity="zero">0 členů</item>
-        <item quantity="one">1 člena</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">dny</item>
         <item quantity="one">dnem</item>
@@ -240,18 +231,6 @@
         <item quantity="other">oprávnění</item>
         <item quantity="one">oprávnění</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Pomalý režim nastaven na **!!%d!! vteřin**</item>
-        <item quantity="zero">Pomalý režim vypnut</item>
-        <item quantity="one">Pomalý režim nastaven na **1 vteřinu**</item>
-        <item quantity="few">Pomalý režim nastaven na **!!%d!! vteřiny**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Pomalý režim nastaven na **!!%d!! vteřin**</item>
-        <item quantity="zero">Pomalý režim vypnut</item>
-        <item quantity="one">Pomalý režim nastaven na **1 vteřinu**</item>
-        <item quantity="few">Pomalý režim nastaven na **!!%d!! vteřiny**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! neaktivních členů**</item>
         <item quantity="one">**neaktivního člena**</item>
@@ -326,10 +305,6 @@
         <item quantity="other">%d dny</item>
         <item quantity="one">1 dnem</item>
     </plurals>
-    <plurals name="live_viewers_viewers">
-        <item quantity="other">diváků</item>
-        <item quantity="one">divák</item>
-    </plurals>
     <plurals name="max_uses_description_mobile_maxUses">
         <item quantity="other">%d použití</item>
         <item quantity="zero">neomezené použití</item>
@@ -357,10 +332,6 @@
         <item quantity="other">%d nových zpráv</item>
         <item quantity="one">1 nová zpráva</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d dní</item>
-        <item quantity="one">jeden den</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d kanálů</item>
         <item quantity="one">%d kanál</item>
@@ -381,11 +352,6 @@
         <item quantity="one">zprávu</item>
         <item quantity="few">zprávy</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** serverů je nedostupných kvůli dočasnému výpadku.</item>
-        <item quantity="one">**1** server je nedostupný z důvodu dočasného výpadku.</item>
-        <item quantity="few">**%d** servery jsou nedostupné kvůli dočasnému výpadku.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d měsíců</item>
         <item quantity="one">1 měsíc</item>
diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml
index 048c46ce7d..517d5071c3 100644
--- a/com.discord/res/values-cs/strings.xml
+++ b/com.discord/res/values-cs/strings.xml
@@ -59,9 +59,7 @@
     <string name="activity_invite_private">"Nemůžeš odeslat pozvánku, protože jsi buď neviditelný/-á nebo skrýváš svůj herní stav. Jestli nechceš své nastavení měnit,
 můžeš se místo toho nechat pozvat od někoho jiného."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Rozumím!</string>
-    <string name="activity_panel_go_live_hotspot_header">Go Live zahájí streamování hry přímo vašim přátelům!</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Tento server nemá žádné hlasové kanály k streamování.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Nemůžete streamovat do tohoto kanálu.</string>
+    <string name="activity_panel_go_live_hotspot_header">Použij Go Live ke streamování hry přímo svým přátelům!</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Pro zahájení streamování přejděte na server.</string>
     <string name="add">Přidat</string>
     <string name="add_a_comment_optional">Přidat komentář (volitelné)</string>
@@ -155,7 +153,6 @@ nebezpečné toto oprávnění udělovat."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Máš to mít!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Přejít do knihovny</string>
     <string name="application_entitlement_code_redemption_invalid">Neplatný kód</string>
-    <string name="application_entitlement_code_redemption_prompt">Dostal jsi kód na hru? Zadej ho níže:</string>
     <string name="application_entitlement_code_redemption_redeem">Uplatnit</string>
     <string name="application_filter_name_linux">Všechny soubory</string>
     <string name="application_filter_name_macos">Aplikace</string>
@@ -398,7 +395,6 @@ nebezpečné toto oprávnění udělovat."</string>
     <string name="application_store_view_all_news">Zobrazit všechny novinky</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Abys mohl/a hrát toto DLC, musíš mít na Discordu %1$s. [Zjistit víc o DLC.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Obsah ke stažení</string>
-    <string name="application_store_warning_early_access_description">Tahle hra je zábavná (my si to myslíme!), ale může mít omezený obsah, různé chyby nebo může působit nedokončeně. [Zjistit víc o předběžném přístupu.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Předběžný přístup</string>
     <string name="application_store_warning_requires_desktop_app_description">Abys mohl/a hrát tuto hru, musíš mít v počítači nainstalovanou [aplikaci Discord](downloadHook).</string>
     <string name="application_store_warning_requires_desktop_app_title">Vyžaduje nainstalovanou aplikaci</string>
@@ -459,21 +455,9 @@ nebezpečné toto oprávnění udělovat."</string>
     <string name="back_button_behavior_label_mobile">Chování tlačítka zpět</string>
     <string name="back_button_behavior_mobile">Tlačítko zpět otevře přehled kanálů.</string>
     <string name="ban">Zabanovat</string>
-    <string name="ban_confirm_title">Udeřit zákazovým kladivem na „%1$s“</string>
-    <string name="ban_members">Zakázat člena</string>
-    <string name="ban_members_description">Uživatelé s tímto oprávněním mohou zakazovat všechny ostatní, kteří toto oprávnění nemají.</string>
-    <string name="ban_reason">Důvod pro zákaz</string>
-    <string name="ban_user_body">Určitě chceš vykázat %1$s? Nebude se moct opět připojit, dokud zákaz nezrušíš.</string>
-    <string name="ban_user_confirmed">„%1$s“ byl vykázán ze serveru.</string>
-    <string name="ban_user_error_generic">Jejda… Nepodařilo se vykázat %1$s. Zkus to znovu!</string>
     <string name="ban_user_title">Zabanovat „%1$s“</string>
     <string name="bans">Zákazy</string>
     <string name="bans_header">%1$s</string>
-    <string name="bans_hint">"Zákazy jsou standardně pro účet a IP.
-Uživatel může obejít zákaz IP pomocí proxy.
-Obejít zákaz může být velice obtížné, pokud v [možnostech správce](onModerationClick) zapneš ověření telefonem."</string>
-    <string name="bans_no_results">Dívali jsme se jak jsme nejlépe uměli, ale nenalezli jsme žádné zablokované uživatele, kteří by odpovídali tvému hledání.</string>
-    <string name="bans_no_users_banned">Ještě jsi nikoho nezablokoval/a… ale pokud musíš, neváhej.</string>
     <string name="bans_search_placeholder">Hledat zákazy</string>
     <string name="beep_boop">Bíp bůp. Bůp bíp?</string>
     <string name="beginning_channel">Vítejte na začátku kanálu **#%1$s**.</string>
@@ -520,7 +504,6 @@ Obejít zákaz může být velice obtížné, pokud v [možnostech správce](onM
     <string name="billing_error_section_card">Ajaj! Zdá se, že došlo k problému s touto kartou. Oprav pole a zkus to znovu!</string>
     <string name="billing_history">Fakturační historie</string>
     <string name="billing_legal_mumbo_jumbo">Právnické kecy</string>
-    <string name="billing_legal_mumbo_jumbo_label">Souhlasím s [Podmínkami využívání služeb obchodu Discord Store](%1$s)</string>
     <string name="billing_no_payment_method">Žádná uložená platební metoda</string>
     <string name="billing_no_payment_method_description">Pro rychlejší placení si ulož platební metodu</string>
     <string name="billing_pay_for_it_with">Zaplatit prostřednictvím</string>
@@ -528,12 +511,7 @@ Obejít zákaz může být velice obtížné, pokud v [možnostech správce](onM
     <string name="billing_payment_breakdown_total">Celkem</string>
     <string name="billing_payment_history">Historie transakcí</string>
     <string name="billing_payment_premium">Tvoje předplatné</string>
-    <string name="billing_payment_premium_legalese_monthly">Zakoupením předplatného %1$s souhlasíš s našimi [Podmínkami využívání služeb obchodu](%2$s). %1$s je předplatné, které se opakuje automaticky. Dáváš Discordu oprávnění, abychom ti okamžitě strhli %3$s zvolenou platební metodou a abychom to dělali automaticky každý měsíc, dokud předplatné nezrušíš. Zrušit jej můžeš kdykoliv.</string>
-    <string name="billing_payment_premium_legalese_yearly">Zakoupením předplatného %1$s souhlasíš s našimi [Podmínkami využívání služeb obchodu](%2$s). %1$s je předplatné, které se obnovuje automaticky. Dáváš Discordu oprávnění, abychom ti okamžitě strhli %3$s zvolenou platební metodou a abychom to dělali automaticky každý rok, dokud předplatné nezrušíš. Zrušit jej můžeš kdykoliv.</string>
     <string name="billing_payment_sources">Platební metody</string>
-    <string name="billing_payment_table_header_amount">ČÁSTKA</string>
-    <string name="billing_payment_table_header_date">DATUM</string>
-    <string name="billing_payment_table_header_description">POPIS</string>
     <string name="billing_premium_refund_text">Pokud nákup proběhl během posledních %1$s dní, můžeš požádat o vrácení peněz. [Naše laskavá technická podpora ti pomůže dostat penízky zpět.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Je nám líto, ale za tento nákup ti nemůžeme vrátit peníze. O vrácení peněz můžeš požádat, pokud nákup proběhl během posledních %1$s dní.</string>
     <string name="billing_price_per_month">%1$s / měsíc</string>
@@ -543,9 +521,7 @@ Obejít zákaz může být velice obtížné, pokud v [možnostech správce](onM
     <string name="billing_purchase_details_header">Podrobnosti nákupu</string>
     <string name="billing_refund_header">Došlo k problému s nákupem?</string>
     <string name="billing_refund_play_time_never_played">Nikdy nehráno</string>
-    <string name="billing_refund_play_time_subheader">ODEHRANÝ ČAS</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">DATUM NÁKUPU</string>
     <string name="billing_refund_report_a_problem">Oznámit problém</string>
     <string name="billing_refund_request_button">Požádat o vrácení peněz</string>
     <string name="billing_sales_tax_added">Kvůli tvé fakturační adrese jsme přidali daň %1$s.</string>
@@ -826,7 +802,7 @@ kliknutím na ten malinkaťoulinkatý text dole."</string>
     <string name="create_category">Vytvořit kategorii</string>
     <string name="create_channel">Vytvořit kanál</string>
     <string name="create_group_dm">Vytvořit skupinovou zprávu</string>
-    <string name="create_instant_invite">Vytvořit okamžitou pozvánku</string>
+    <string name="create_instant_invite">Vytvořit pozvánku</string>
     <string name="create_link">Vytvořit odkaz</string>
     <string name="create_or_join_modal_header">Och, další server, co?</string>
     <string name="create_server_button_body">Vytvoř nový server a pozvi své přátelé. Je to zdarma!</string>
@@ -941,7 +917,6 @@ kliknutím na ten malinkaťoulinkatý text dole."</string>
     <string name="disable_email_notifications_failed_suggestion">E-mailová oznámení už jsou vypnutá nebo tento e-mail už není nastavený pro žádný účet na Discordu.</string>
     <string name="disable_integration_title">Vypnout synchronizaci</string>
     <string name="disable_integration_twitch_body">Vypnutím synchronizace dojde k tomu, že chování při vypršení odběratele bude takové, jako by všem odběratelům vypršelo předplatné.</string>
-    <string name="disable_integration_youtube_body">Vypnutí synchronizace spustí vybrané chování pro \\\"prošlého sponzora\\\" pro všechny sponzory.</string>
     <string name="disable_notifications_description">Všechna oznámení na ploše budou vypnutá.</string>
     <string name="disable_notifications_label">Vypnout oznámení</string>
     <string name="disable_sounds_description">Všechny zvukové efekty budou vypnuté.</string>
@@ -957,7 +932,6 @@ kliknutím na ten malinkaťoulinkatý text dole."</string>
     <string name="discord_desc_long">Bezplatný a bezpečný chat pro hráče, který funguje jak na počítači, tak i na vašem mobilu.</string>
     <string name="discord_desc_short">Týmový hlasový a textový chat</string>
     <string name="dismiss">Zahodit</string>
-    <string name="dispatch_error_modal_body">Něco se nepovedlo. Pokud problém přetrvává, založ lístek podpory a zkopíruj do něj obsah zprávy níže.</string>
     <string name="dispatch_error_modal_error_label">Chybová zpráva (zkopíruj a vlož mě)</string>
     <string name="dispatch_error_modal_header">Chyba nástroje Discord Dispatch</string>
     <string name="dispatch_error_modal_open_ticket">Otevřít lístek</string>
@@ -1072,7 +1046,7 @@ kliknutím na ten malinkaťoulinkatý text dole."</string>
     <string name="file_rate_mb">%1$s MB/s</string>
     <string name="file_size_gb">%1$s GB</string>
     <string name="file_size_mb">%1$s MB</string>
-    <string name="file_upload_limit_premium">50 MB</string>
+    <string name="file_upload_limit_premium_tier_1">50 MB</string>
     <string name="file_upload_limit_standard">8 MB</string>
     <string name="filter">Filtr</string>
     <string name="filter_mentions">Filtrovat zmínky</string>
@@ -1094,8 +1068,6 @@ Toto nemá vliv na prohlížeče."</string>
     <string name="form_help_attenuation">"Sníží hlasitost ostatních aplikací o stanovené procento, když někdo mluví.
 Nastavením na 0 %% útlum zcela vypneš."</string>
     <string name="form_help_automatic_vad">Pokud kontrolka svítí zeleně tak Discord přenáší tvůj krásný hlas.</string>
-    <string name="form_help_bitrate">"**VŠECHNY BITY!** Nedoporučujeme nastavovat rychlost nad %1$s kb/s, pokud nejsi audiofil, protože to negativně
-ovlivní mobilní uživatele a uživatele s pomalým připojením, přitom bez znatelné výhody."</string>
     <string name="form_help_certified_voice_processing">"Když používáš Discordem certifikovaný mikrofon, nestará se o některé prvky zpracování hlasu Discord,
 ale přímo samotný mikrofon."</string>
     <string name="form_help_channel_permissions">Vybrané role získají automaticky základní oprávnění pro tento kanál.</string>
@@ -1108,9 +1080,6 @@ aby se zamezilo [tomuto šílenství](%1$s).**"</string>
 všech zprávách odeslaných v tomto serveru. Toto doporučujeme nastavit pouze na @zmínky pro veřejný Discord."</string>
     <string name="form_help_explicit_content_filter">"Automatické prohledávání a odstraňování zpráv s explicitním obsahem odeslaných na tomto serveru. Vyber si,
 v jakém rozsahu se bude filtr vztahovat na členy tvého serveru. **Pro veřejný Discord doporučujeme filtr nastavit.**"</string>
-    <string name="form_help_instant_invite_channel">"Pokud je vybrán kanál, okamžitá pozvánka bude vygenerována s widgetem, 
-jinak budou poskytnuti jen uživatelé, kteří jsou online, a hlasové kanály."</string>
-    <string name="form_help_last_seen">Vyčištění vyhodí **%1$s** kteří nebyli viděni posledních **%2$s** a nejsou přiřazeni k žádným rolím. Budou se pak moci znovu připojit přes pozvánku.</string>
     <string name="form_help_legacy_subsystem">"Určité ovladače zvukového hardwaru vykazují problémy, když používáš moderní zvukový subsystém tvého operačního systému.
 Zaškrtnutím tohoto políčka se vrátíš na starší zvukový subsystém."</string>
     <string name="form_help_nsfw">"Pro sledování obsahu tohoto kanálu budou muset uživatelé potvrdit, že dosáhli plnoletosti.
@@ -1120,7 +1089,6 @@ k uživatelům na tvém webu, pak lze do řetězce dotazu dynamicky přidat &amp
     <string name="form_help_qos">"Tipy k směrovači, které identifikují pakety Discordu jako pakety s vysokou prioritou.
 Některé směrovače nebo poskytovatelé internetu mohou dělat chyby, když je toto nastaveno."</string>
     <string name="form_help_slowmode">Pokud nemají oprávnění „spravovat kanál“ nebo „spravovat zprávy“, budou uživatelé moci odeslat jednu zprávu v uvedeném intervalu.</string>
-    <string name="form_help_system_channel">Kdykoliv se někdo přidá k serveru, odešle se do tohoto kanálu zpráva. Zprávy jsou náhodné a můžeš je kdykoliv vypnout.</string>
     <string name="form_help_temporary">Členové jsou automaticky vyhozeni, pokud se odpojí bez přidělené role.</string>
     <string name="form_help_user_limit">"Limituje počet uživatelů, kteří se můžou připojit do tohoto hlasového kanálu. Uživatelé s oprávněním **Přesunout uživatele**
 ignorují tento limit a můžou přesouvat ostatní uživatele přímo do kanálu."</string>
@@ -1165,8 +1133,8 @@ splňovat následující podmínky. Ty se nevztahují na členy s přidělenou r
     <string name="form_label_input_mode">Režim vstupu</string>
     <string name="form_label_input_sensitivty">Citlivost vstupu</string>
     <string name="form_label_input_volume">Hlasitost vstupu</string>
-    <string name="form_label_instant_invite">Zadat okamžitou pozvánku</string>
-    <string name="form_label_instant_invite_channel">Okamžitá pozvánka do kanálu</string>
+    <string name="form_label_instant_invite">Zadat pozvánku</string>
+    <string name="form_label_instant_invite_channel">Pozvánka do kanálu</string>
     <string name="form_label_last_seen">Naposledy viděn/a</string>
     <string name="form_label_local_mute">Lokální ztlumení</string>
     <string name="form_label_max_age">Vyprší za</string>
@@ -1209,7 +1177,6 @@ splňovat následující podmínky. Ty se nevztahují na členy s přidělenou r
     <string name="form_label_premade_widget">Předpřipravený widget</string>
     <string name="form_label_push_afk_timeout">Časový limit AFK pro nabízená oznámení</string>
     <string name="form_label_qos">Kvalita služeb</string>
-    <string name="form_label_reason_ban">Důvod zákazu</string>
     <string name="form_label_reason_kick">Důvod vyhození</string>
     <string name="form_label_report_reason">Co chceš nahlásit?</string>
     <string name="form_label_role_add">Přidat roli</string>
@@ -1234,7 +1201,6 @@ splňovat následující podmínky. Ty se nevztahují na členy s přidělenou r
     <string name="form_label_suppress_everyone">Potlačit **@everyone** a **@here**</string>
     <string name="form_label_synced_role">Synchronizovaná role</string>
     <string name="form_label_synced_subs">Synchronizovaní odběratelé</string>
-    <string name="form_label_system_channel">Kanál zpráv o nových členech</string>
     <string name="form_label_temporary">Dočasné členství</string>
     <string name="form_label_tts">Převod textu na řeč</string>
     <string name="form_label_tts_notifications">Oznámení převedená z textu na řeč</string>
@@ -1295,7 +1261,6 @@ Děkujeme, že to tu udržuješ v bezpečí a pořádku."</string>
     <string name="game_action_button_game_not_detected">Hra nebyla nalezena</string>
     <string name="game_action_button_install">Instalovat</string>
     <string name="game_action_button_locate">Vyhledat</string>
-    <string name="game_action_button_login_to_buy">Pro nákup se přihlas</string>
     <string name="game_action_button_now_playing">Právě hraje</string>
     <string name="game_action_button_paused">Pozastaveno</string>
     <string name="game_action_button_play">Hrát</string>
@@ -1334,7 +1299,6 @@ Děkujeme, že to tu udržuješ v bezpečí a pořádku."</string>
     <string name="game_feed_activity_recently_played">Nedávno hrané</string>
     <string name="game_feed_activity_streaming_twitch">Streamuje na Twitch</string>
     <string name="game_feed_current_header_title">Právě hraje</string>
-    <string name="game_feed_settings_visibility">Ukázat na záložce her</string>
     <string name="game_feed_unknown_player">Neznámý hráč</string>
     <string name="game_feed_user_played_days_ago">Hrál/a před %1$s %2$s</string>
     <string name="game_feed_user_played_hours_ago">Hrál/a před %1$s %2$s</string>
@@ -1403,6 +1367,7 @@ Děkujeme, že to tu udržuješ v bezpečí a pořádku."</string>
     <string name="generate_a_new_link">Vygenerovat nový odkaz</string>
     <string name="get_started">Začneme</string>
     <string name="gif_auto_play_label">Automaticky přehrávat GIFy, když je Discord v popředí.</string>
+    <string name="go_live_hardware_acceleration_unavailable">Pozor, nepodařilo se nám najít hardwarovou akceleraci. Tvůj počítač může mít problém s podporou služby Go Live.</string>
     <string name="go_live_hey">Zdar!</string>
     <string name="go_live_listen">Poslouchej!</string>
     <string name="go_live_look">Sleduj!</string>
@@ -1414,6 +1379,7 @@ Děkujeme, že to tu udržuješ v bezpečí a pořádku."</string>
     <string name="go_live_modal_overflow_two_users">%1$s a %2$s</string>
     <string name="go_live_modal_select_channel_form_title">Vyber hlasový kanál</string>
     <string name="go_live_modal_select_channel_placeholder">Hledat hlasové kanály</string>
+    <string name="go_live_video_drivers_outdated">Tvé ovladače videa jsou zastaralé. Aktualizuj je a získej výkonnější Go Live.</string>
     <string name="grant_temporary_membership">Udělit dočasné členství</string>
     <string name="group">Skupina</string>
     <string name="group_dm_add_friends">Přidejte přátele do PZ</string>
@@ -1461,8 +1427,6 @@ Děkujeme, že to tu udržuješ v bezpečí a pořádku."</string>
     <string name="guild_settings_action_filter_invite_create">Vytvořit pozvánku</string>
     <string name="guild_settings_action_filter_invite_delete">Odstranit pozvánku</string>
     <string name="guild_settings_action_filter_invite_update">Aktualizovat pozvánku</string>
-    <string name="guild_settings_action_filter_member_ban_add">Zakázat člena</string>
-    <string name="guild_settings_action_filter_member_ban_remove">Zrušit zákaz člena</string>
     <string name="guild_settings_action_filter_member_kick">Vyhodit člena</string>
     <string name="guild_settings_action_filter_member_prune">Pročistit uživatele</string>
     <string name="guild_settings_action_filter_member_role_update">Aktualizovat role členů</string>
@@ -1490,8 +1454,6 @@ Děkujeme, že to tu udržuješ v bezpečí a pořádku."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Uděleno** %1$s pro **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Přesunut z **%1$s** na **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">V pozici **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) vytvořil/a textový kanál $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Téma změněno na **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Téma nastaveno na **%1$s**</string>
@@ -1538,7 +1500,6 @@ Děkujeme, že to tu udržuješ v bezpečí a pořádku."</string>
     <string name="guild_settings_audit_log_invite_temporary_on">**Je** dočasná</string>
     <string name="guild_settings_audit_log_invite_update">$[**%1$s**](userHook) aktualizoval/a pozvánku $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_load_more">Zobrazit více</string>
-    <string name="guild_settings_audit_log_member_ban_add">$[**%1$s**](userHook) dal/a zákaz $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_member_ban_remove">$[**%1$s**](userHook) odstranil/a zákaz pro $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_member_deaf_off">**Zapnul/a** jeho/její poslech</string>
     <string name="guild_settings_audit_log_member_deaf_on">**Vypnul/a** jeho/její poslech</string>
@@ -1587,6 +1548,8 @@ Děkujeme, že to tu udržuješ v bezpečí a pořádku."</string>
     <string name="guild_settings_filter_all_actions">Všechny akce</string>
     <string name="guild_settings_filter_all_users">Všichni uživatelé</string>
     <string name="guild_settings_filter_user">Řadit podle uživatele</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">Streamy Go Live v kvalitě 720p (60 fps)</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">Streamy Go Live v kvalitě 1080p (60 fps)</string>
     <string name="guild_settings_label_audit_log">Protokol auditu</string>
     <string name="guild_settings_label_audit_log_empty_body">Jakmile začnou správci správcovat, tady můžeš správcovat jejich správcování.</string>
     <string name="guild_settings_label_audit_log_empty_title">Zatím žádné záznamy</string>
@@ -1618,7 +1581,7 @@ Pokud máš přístup k uživatelům na tvém webu, pak lze do řetězce dotazu
     <string name="help_role_locked_mine">Role je zamčená protože je to tvoje nejvyšší role. Požádej o pomoc někoho s vyšší hodností nebo Majitele Serveru.</string>
     <string name="help_singular_permission">Nemůžeš upravit toto oprávnění, protože jeho odebrání by ho odebralo i tobě.</string>
     <string name="hide_instant_invites_description">Doporučujeme, pokud nechceš, aby se na tvůj server Discord dostávali náhodní lidé.</string>
-    <string name="hide_instant_invites_label">Skrýt odkazy s okamžitými pozvánkami</string>
+    <string name="hide_instant_invites_label">Skrýt zvací odkazy</string>
     <string name="hide_muted">Skrýt %1$s umlčené</string>
     <string name="hide_muted_channels">Skrýt ztlumené kanály</string>
     <string name="hide_personal_information_description">Schová e-mail, propojené účty, poznámky a anonymizuje DiscordTagy.</string>
@@ -1665,7 +1628,6 @@ Pokud máš přístup k uživatelům na tvém webu, pak lze do řetězce dotazu
     <string name="hypesquad_question_11_response_d">Navrhneš, že by měl Wumpus hrát raději na tamburínu.</string>
     <string name="hypesquad_question_12_prompt">Dosáhl/a jsi vrcholu nejvyšší hory a jediné, co tě dělí od bohatství, je tříhlavý drak, který střeží věž před tebou. Ty:</string>
     <string name="hypesquad_question_12_response_a">Se vrhneš do boje.</string>
-    <string name="hypesquad_question_12_response_b">Se podíváš na staré filmy o Godzille, aby ses přiučil z jejího boje proti King Ghidorah.</string>
     <string name="hypesquad_question_12_response_c">Se pokusíš draka přesvědčit, abyste si poklady rozdělili.</string>
     <string name="hypesquad_question_12_response_d">Drakovi nabídneš plyšového Wumpuse, protože kdo by mu odolal?</string>
     <string name="hypesquad_question_13_prompt">Co je to za zvuk?</string>
@@ -1768,10 +1730,10 @@ Pokud máš přístup k uživatelům na tvém webu, pak lze do řetězce dotazu
     <string name="input_mode_ptt_release_delay">Prodlení po uvolnění klávesy Push to Talk</string>
     <string name="input_mode_vad">Hlasová činnost</string>
     <string name="install_location_main">Hlavní</string>
-    <string name="instant_invite">Okamžitá pozvánka</string>
+    <string name="instant_invite">Pozvánka</string>
     <string name="instant_invite_accept">Přijmout pozvánku</string>
-    <string name="instant_invite_accepted">Okamžitá pozvánka přijata</string>
-    <string name="instant_invite_accepting">Přijímám okamžitou pozvánku</string>
+    <string name="instant_invite_accepted">Pozvánka přijata</string>
+    <string name="instant_invite_accepting">Přijímám pozvánku</string>
     <string name="instant_invite_ask_for_new_invite">Požádej o novou!</string>
     <string name="instant_invite_ask_user_for_new_invite">Požádej %1$s o novou pozvánku!</string>
     <string name="instant_invite_code">Kód</string>
@@ -1793,7 +1755,7 @@ Pokud máš přístup k uživatelům na tvém webu, pak lze do řetězce dotazu
     <string name="instant_invite_regenerate">Vygenerovat znovu</string>
     <string name="instant_invite_resolved_body">Byl/a jsi pozván/a do **%1$s** na **%2$s**.</string>
     <string name="instant_invite_resolved_title">Ahoj!</string>
-    <string name="instant_invite_resolving">Připravuji okamžitou pozvánku</string>
+    <string name="instant_invite_resolving">Připravuji pozvánku</string>
     <string name="instant_invite_uses">Použití</string>
     <string name="instant_invite_you_are_already_a_member_of">Už jsi členem/členkou</string>
     <string name="instant_invite_you_have_been_invited_to_join">Dostal/a jsi pozvánku</string>
@@ -1802,7 +1764,6 @@ Pokud máš přístup k uživatelům na tvém webu, pak lze do řetězce dotazu
     <string name="instant_invites">Pozvánky</string>
     <string name="integration_settings">Nastavení integrace</string>
     <string name="integrations">Propojení</string>
-    <string name="integrations_header">Připojené účty Twitch / YouTube Gaming</string>
     <string name="integrations_pro_tip">Chceš více integrací, Podívej se na [Discord StreamKit](%1$s).</string>
     <string name="internal_server_error">Došlo k interní chybě serveru, zkus to znovu.</string>
     <string name="invalid_animated_emoji_body">Tenhle smajlík nefunguje, protože je animovaný. Přejdi na Discord Nitro a splň si všechny sny o animovaných smajlících.</string>
@@ -1920,8 +1881,8 @@ Chceš se o Discordu dozvědět víc?"</string>
     <string name="join_server_button_cta_mobile">Připojit k serveru pomocí zvacího odkazu</string>
     <string name="join_server_button_cta_mobile_desc">Máš zvací kód nebo odkaz? Vlož ho sem!</string>
     <string name="join_server_button_cta_named">Připojit k %1$s</string>
-    <string name="join_server_description">Chceš-li se připojit k existujícímu serveru, zadej okamžitou pozvánku níže. Pozvánka bude vypadat přibližně takto:</string>
-    <string name="join_server_description_mobile">Pro vstup na existující server zadej okamžitou pozvánku.</string>
+    <string name="join_server_description">Pokud se chceš připojit k existujícímu serveru, zadej pozvánku níže. Pozvánka bude vypadat přibližně takto:</string>
+    <string name="join_server_description_mobile">Pro vstup na existující server zadej pozvánku.</string>
     <string name="join_server_title">Připojit se k serveru</string>
     <string name="join_stream">Přidat se ke streamu</string>
     <string name="join_video_call">Přidat se k videohovoru</string>
@@ -2029,9 +1990,8 @@ zatímco budeš mluvit."</string>
     <string name="link_your_xbox_account_2">Discord je hlasový, textový a videochat pro hráče, který je zdarma, je bezpečný a spustíš ho jak na počítači, tak na mobilu.</string>
     <string name="listening_to">Poslouchá **%1$s**</string>
     <string name="live">Živě</string>
-    <string name="live_beta_description">Vítej na streamu! Go Live je v betě, omlouváme se za výmoly.</string>
+    <string name="live_beta_description">Vítej ve streamu! Go Live běží v beta verzi, omlouváme se za výmoly.</string>
     <string name="live_on_twitch">Živě na Twitch</string>
-    <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Obrázek se nepodařilo nahrát.
 Zkus to znovu."</string>
     <string name="load_more_messages">Načíst více zpráv</string>
@@ -2215,12 +2175,9 @@ naše aktualizované podmínky využívání služeb a zásady ochrany osobních
     <string name="no_emoji_title">Žádný smajlík</string>
     <string name="no_input_devices">Žádná vstupní zařízení</string>
     <string name="no_input_devices_detected">Nebylo nalezeno žádné vstupní zařízení, zapoj prosím alespoň jedno a zkus to znovu.</string>
-    <string name="no_instant_invite">Žádná okamžitá pozvánka</string>
-    <string name="no_integrations">[Připoj](onConnect) svůj partnerský účet na Twitch nebo YouTube Gaming a synchronizuj své odběratele/sponzory do role</string>
+    <string name="no_instant_invite">Žádná pozvánka</string>
     <string name="no_integrations_body">Protokol FR13NDSH1P může být spuštěn pouze z klienta Discordu</string>
     <string name="no_integrations_label">Žádná integrace</string>
-    <string name="no_invites_body">"Bloudíš tu bez cíle? Jako papírová vlaštovka ve větru?
-Vytvoř odkaz s okamžitou pozvánkou a přiveď sem nějaké kamarády!"</string>
     <string name="no_invites_caption">Zatím žádné pozvánky!</string>
     <string name="no_invites_label">Zatím žádné pozvánky</string>
     <string name="no_mail_account_description">Zpětnou vazbu nám prosím pošli na support@discordapp.com a tvá uživatelská data jsme již zkopírovali do schránky.</string>
@@ -2240,7 +2197,6 @@ připnuté zprávy… zatím."</string>
     <string name="no_reactions_header">Žádné reakce</string>
     <string name="no_recent_mentions">A na počátku… bylo ticho.</string>
     <string name="no_send_messages_permission_placeholder">Nemáš oprávnění psát do tohoto kanálu.</string>
-    <string name="no_system_channel">Žádné zprávy o nových členech</string>
     <string name="no_text">Ne</string>
     <string name="no_thanks">Ne, díky</string>
     <string name="no_user_limit">Bez omezení</string>
@@ -2252,7 +2208,6 @@ připnuté zprávy… zatím."</string>
     <string name="note">Poznámka</string>
     <string name="note_placeholder">Kliknutím přidej poznámku</string>
     <string name="note_placeholder_mobile">Klepnutím přidej poznámku</string>
-    <string name="notice_application_test_mode">Testovací režim pro **%1$s** je právě aktivní. Zobrazí se neveřejné SKU a nebudeme ti účtovat žádné platby s tím spojené.</string>
     <string name="notice_application_test_mode_go_to_listing">Přejít na SKU</string>
     <string name="notice_connect_spotify">Připoj svůj účet Spotify a přidej si hudbu do stavu!</string>
     <string name="notice_connection_conflict">Tvůj hlas byl odpojen, protože jsi připojen/a na jiném místě.</string>
@@ -2263,7 +2218,6 @@ připnuté zprávy… zatím."</string>
     <string name="notice_dispatch_error_disk_low">Nemáš dost místa na disku. Potřebuješ %1$s, ale máš pouze %2$s.</string>
     <string name="notice_dispatch_error_file_name_too_long">Ale ne, názvy souborů této hry jsou na Windows příliš dlouhé. Vyber prosím kratší instalační složku.</string>
     <string name="notice_dispatch_error_invalid_drive">Ale ne, cesta k umístění instalace je neplatná. Zadal/a jsi %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Nepodařilo se nám hru aktualizovat. Je právě spuštěná?</string>
     <string name="notice_dispatch_error_no_manifests">Ale ne, vypadá to, že pro tuto hru neexistuje žádný obsah. Obrať se na podporu.</string>
     <string name="notice_dispatch_error_not_entitled">Ale ne, vypadá to, že tuto hru nevlastníš. Jestli jsi přesvědčen/a, že jde o chybu, obrať se na podporu.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Vypadá to, že jsi instalačnímu programu řekl/a ne. Aby se hra nainstalovala, musíš říct ano.</string>
@@ -2278,9 +2232,6 @@ připnuté zprávy… zatím."</string>
     <string name="notice_native_apps">Potřebuješ Push to Talk v celém systému? Stáhni si desktopovou aplikaci.</string>
     <string name="notice_no_input_detected">Vypadá to, že Discord neregistruje žádný vstup z tvého mikrofonu. Spravme to… společně.</string>
     <string name="notice_no_input_detected_help_link_text">Pomoc!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Tvůj přístup do Nitra vypršel. Chceš-li neomezený přístup ke skvělým hrám, přejdi z Nitra Classic na Nitro.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Zbývá ti už jenom %1$s přístupu k hrám v Nitru! Tvůj přístup vyprší **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Děkujeme, že od začátku podporuješ Nitro! Jako dárek za tvou skvělost máš teď přístup k hrám Nitro až do %1$s.</string>
     <string name="notice_premium_promo_action">Koukni na to</string>
     <string name="notice_premium_promo_message">Podpoř vývoj Discordu a získej fajn výhody!</string>
     <string name="notice_scheduled_maintenance">Dne **%1$s** v **%2$s** proběhne plánovaná údržba Discordu.</string>
@@ -2395,15 +2346,12 @@ Překrytí také nemusí fungovat každému. Pokud máš problémy nebo dotazy,
     <string name="overlay_link_alert_title">Zadrž!</string>
     <string name="overlay_menu_get_invite">Získat zvací odkaz</string>
     <string name="overlay_menu_open_discord">Otevřít Discord</string>
-    <string name="overlay_menu_switch_channels">Přepnout kanál</string>
-    <string name="overlay_mobile_toggle_desc">Sledujte, kdo právě mluví a mějte při ruce zkratky, i když během připojení k hlasovému chatu používáte jiné aplikace.</string>
     <string name="overlay_mobile_toggle_label">Povolit mobilní hlasové překrytí</string>
     <string name="overlay_mobile_unauthed">Pro zapnutí této funkce se přihlas do aplikace Discord.</string>
     <string name="overlay_news_go_live_body">Chceš svým přátelům na %1$s streamovat %2$s?</string>
     <string name="overlay_news_text_pinning_body">Teď můžeš do své hry připnout textový chat!</string>
     <string name="overlay_news_text_pinning_tip">Tip: chat připneš stisknutím $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Vylepšené překrytí Discord</string>
-    <string name="overlay_no_results">Hledali jsme široko daleko, ale bohužel jsme nenašli žádné hlasové kanály.</string>
     <string name="overlay_notification_incoming_call">Příchozí hovor…</string>
     <string name="overlay_notification_settings_disabled">Oznámení jsou vypnutá</string>
     <string name="overlay_notification_settings_position">Zobrazuje se: %1$s</string>
@@ -2413,7 +2361,6 @@ Překrytí také nemusí fungovat každému. Pokud máš problémy nebo dotazy,
     <string name="overlay_notifications_settings">Oznámení v překrytí</string>
     <string name="overlay_notifications_top_left">Vlevo nahoře</string>
     <string name="overlay_notifications_top_right">Vpravo nahoře</string>
-    <string name="overlay_private_channels_empty_state">Ne ne, nejsou tu žádné zprávy.</string>
     <string name="overlay_reload">Obnovit překrytí</string>
     <string name="overlay_settings">Nastavení překrytí</string>
     <string name="overlay_settings_general_tab">Obecné</string>
@@ -2435,7 +2382,6 @@ Překrytí také nemusí fungovat každému. Pokud máš problémy nebo dotazy,
     <string name="pagination_page_of">Strana %1$s z %2$s</string>
     <string name="pagination_previous">Předchozí</string>
     <string name="paginator_of_pages">Strana %1$s z %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="party_full">Skupina je plná</string>
     <string name="party_join">Přidat se ke skupině</string>
     <string name="party_joined">Jsi ve skupině</string>
@@ -2528,18 +2474,11 @@ Překrytí také nemusí fungovat každému. Pokud máš problémy nebo dotazy,
     <string name="popout_stay_on_top">Nechat nahoře</string>
     <string name="post_code">PSČ</string>
     <string name="premium_alert_error_title">Jej, něco se pokazilo…</string>
-    <string name="premium_applications_grandfathered_monthly">Jako poděkování za podpoření Discordu získáváš na rok přístup k hrám v Nitru. Tvůj přístup skončí **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">Jako poděkování za podpoření Discordu získáváš na 2 roky přístup k hrám v Nitru. Tvůj přístup skončí **%1$s**.</string>
-    <string name="premium_applications_subtitle">Neomezený přístup k neustále se rozšiřující knihovně kritiky oceněných her, které podle nás stojí za to si zahrát s kamarády.</string>
-    <string name="premium_applications_title">Desítky her. Jeden malý měsíční poplatek.</string>
     <string name="premium_badge_tooltip">Předplatné od %1$s</string>
     <string name="premium_cancel_cancel">Ne</string>
     <string name="premium_cancel_confirm_body_tier_1">"Zrušení provedeme na konci stávajícího zúčtovacího období, dne **%1$s**. Pokud sis změnil/a svůj Discord tag, bude opět náhodný.
 
 Své předplatné můžeš kdykoliv obnovit."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Zrušení provedeme na konci stávajícího zúčtovacího období. Od **%1$s** přijdeš o přístup ke všem hrám v Nitru ve tvé knihovně, a pokud sis změnil/a Discord tag, bude pak opět náhodný.
-
-Soubory uložených her ti uschováme na bezpečném místě pro případ, že by sis to rozmyslel/a. Předplatné můžeš kdykoliv obnovit!"</string>
     <string name="premium_cancel_confirm_new">Jo, zrušit %1$s</string>
     <string name="premium_cancel_confirm_title">Zrušit %1$s?</string>
     <string name="premium_cancel_failed_body">Nepodařilo se nám zrušit tvé předplatné Nitro. Zkus to prosím znovu nebo se obrať na naši podporu, pokud problém přetrvává.</string>
@@ -2556,19 +2495,16 @@ Soubory uložených her ti uschováme na bezpečném místě pro případ, že b
     <string name="premium_chat_perks_description_custom_emoji">Získej mezinárodní povolení používat své vlastní smajlíky kdekoliv.</string>
     <string name="premium_chat_perks_description_discriminator">S platným předplatným si vyber vlastní tag.</string>
     <string name="premium_chat_perks_description_screenshare">Sdílej svoji herní obrazovku v kvalitě 720p (60 fps) nebo 1080p (30 fps).</string>
-    <string name="premium_chat_perks_description_upload_limit">S možností nahrávání větších souborů (z původních %1$s na %2$s) můžeš sdílet memy ve vyšší kvalitě.</string>
+    <string name="premium_chat_perks_streaming_mobile">Lepší streamy Go Live: Streamování v kvalitě zdroje s předplatným Nitro nebo ostré rozlišení v kvalitě až 1080p (60 fps) s předplatným Nitro Classic.</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Animovaná zábava</string>
     <string name="premium_chat_perks_title_badge">Vystav svou podporu</string>
     <string name="premium_chat_perks_title_custom_emoji">Vlastní smajlíci kdekoliv</string>
     <string name="premium_chat_perks_title_discriminator">Vlastní Discord tag</string>
     <string name="premium_chat_perks_title_screenshare">Vyšší kvalita videa</string>
+    <string name="premium_chat_perks_title_streaming">Lepší streamy Go Live</string>
     <string name="premium_code_redemption_confirmation_blurb">Díky náhodné řadě čísel teď získáváš vylepšení chatu na %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">Jů, paráda!</string>
-    <string name="premium_feature_new_chat_perks_header">Zároveň získáš pár vylepšení do chatu:</string>
-    <string name="premium_feature_new_premium_applications_header">Hry v hodnotě přes %1$s. Omrkni je:</string>
-    <string name="premium_feature_view_applications">Zobrazit všechny hry v Nitru</string>
     <string name="premium_features_chat_perks">Vylepšení chatu</string>
-    <string name="premium_features_premium_applications">Hry zdarma</string>
     <string name="premium_grandfathered_warning">Jako poděkování za tvoji podporu dostáváš zlevněné předplatné Nitro. **Zrušením nebo změnou svého plánu o tuto slevu přijdeš.** Varovali jsme tě!</string>
     <string name="premium_grandfathered_warning_confirm">Udělám to i tak</string>
     <string name="premium_grandfathered_warning_title">Opatrně, kamaráde</string>
@@ -2578,10 +2514,7 @@ Soubory uložených her ti uschováme na bezpečném místě pro případ, že b
     <string name="premium_not_claimed">Nejdřív přihlas svůj účet.</string>
     <string name="premium_not_claimed_body">Nazdar, kamaráde! Jestli si chceš koupit Nitro, musíš nejdřív potvrdit svůj účet, abys nepřišel o své věci.</string>
     <string name="premium_not_verified">Nejdřív ověř svůj e-mail</string>
-    <string name="premium_not_verified_body">Nazdar, kamaráde! Jestli si chceš koupit Nitro, musíš nejdřív ověřit svůj e-mail. Zkontroluj si e-maily nebo si vyžádej nový.</string>
-    <string name="premium_payment_applications_os_warning">Hry v Nitru podporují pouze Windows.</string>
     <string name="premium_payment_confirmation_blurb_regular">Právě jsi získal moc vylepšeného chatu. Přestaň tohle číst a jdi chatovat!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Teď máš přístup k tolika úžasným hrám. Přestaň tohle číst a jdi si je zahrát!!!</string>
     <string name="premium_payment_confirmation_button_regular">Oki, to zní dobře</string>
     <string name="premium_plan_month">Měsíční Nitro</string>
     <string name="premium_plan_month_tier_1">Měsíční Nitro Classic</string>
@@ -2602,13 +2535,10 @@ Také poměrně rozdělíme aktuální plán a odečteme ho z ceny za rok. Bude
     <string name="premium_upgrade_disabled_current_tooltip">Tvůj aktuální plán.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Než přejdeš na nižší plán, musíš nejdřív zrušit své předplatné a nechat jej vypršet.</string>
     <string name="premium_upgrade_done_body_tier_1">Získáváš vylepšení chatu!</string>
-    <string name="premium_upgrade_done_body_tier_2">Získáváš vylepšení chatu a přístup k tuctům her.</string>
     <string name="premium_upgrade_done_button_tier_1">Paráda!</string>
-    <string name="premium_upgrade_done_button_tier_2">Zobrazit všechny hry v Nitru</string>
     <string name="premium_upgrade_failed_body">O-ou… Tenhle upgrade se nám nepovedl. Zkontroluj, že jsou tvé platební údaje aktuální, a zkus to znovu.</string>
     <string name="premium_upload_promo">Přejdi na Discord Nitro a získej limit pro soubory %1$s</string>
     <string name="premium_year_free_months">Získej 2 měsíce zdarma!</string>
-    <string name="premium_year_free_months_short">2 měsíce zdarma</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / rok</string>
     <string name="preview_chat">Náhled chatu</string>
     <string name="priority_speaker">Přednostní mluvčí</string>
@@ -2735,7 +2665,6 @@ Určitě to chceš udělat?"</string>
     <string name="return_to_login">Zpět na přihlášení</string>
     <string name="reversed">Stornováno</string>
     <string name="revoke">Odvolat</string>
-    <string name="revoke_ban">Odvolat zákaz</string>
     <string name="ring">Zavolat</string>
     <string name="ro">Rumunština (Rumunsko)</string>
     <string name="role_order_updated">Pořadí rolí bylo aktualizováno.</string>
@@ -2791,7 +2720,7 @@ a pokouší se odeslat data."</string>
     <string name="scope_guilds">Měj přehled, na jakých jsi serverech</string>
     <string name="scope_guilds_empty">Nejsi na žádném serveru.</string>
     <string name="scope_guilds_join">Přidej se k serverům pro tebe</string>
-    <string name="scope_guilds_join_description">Využij okamžité pozvánky pod svým jménem.</string>
+    <string name="scope_guilds_join_description">Využij pozvánky pod svým jménem.</string>
     <string name="scope_identify">Zobrazit tvé uživatelské jméno a postavu</string>
     <string name="scope_messages_read">Přečíst všechny zprávy</string>
     <string name="scope_messages_read_description">Umožní aplikaci číst všechny zprávy dostupné přes tvůj účet na Discordu.</string>
@@ -2856,7 +2785,6 @@ Vyber si, jakou obrazovku chceš sdílet."</string>
     <string name="search_filter_on">dne</string>
     <string name="search_for_emoji">Najít perfektní smajlík</string>
     <string name="search_for_empty">Hledat</string>
-    <string name="search_for_value">Hledat: **%1$s**</string>
     <string name="search_group_header_channels">V kanálu</string>
     <string name="search_group_header_dates">Data</string>
     <string name="search_group_header_file_name">Název souboru obsahuje</string>
@@ -3057,15 +2985,12 @@ Určitě to chceš udělat?"</string>
     <string name="stop_ringing">Zastavit vyzvánění</string>
     <string name="stop_streaming">Zastavit streamování</string>
     <string name="stop_watching">Zastavit sledování</string>
-    <string name="store_payment_legalese_monthly">Čau! Zakoupením %1$s souhlasíš s našimi [podmínkami využívání služeb obchodu](%2$s). %1$s je opakované předplatné, takže ti částku strhneme dnes a potom každý měsíc, dokud předplatné nezrušíš. Zrušit jej můžeš kdykoliv v nabídce uživatelských nastavení.</string>
-    <string name="store_payment_legalese_yearly">Čau! Zakoupením %1$s souhlasíš s našimi [podmínkami využívání služeb obchodu](%2$s). %1$s je opakované předplatné, takže ti částku strhneme dnes a potom každý rok, dokud předplatné nezrušíš. Zrušit jej můžeš kdykoliv v nabídce uživatelských nastavení.</string>
     <string name="stream_bad_spectator">Stream, který sleduješ, má nižší kvalitu videa nebo zvuku. Mohou to způsobovat problémy s připojením.</string>
     <string name="stream_bad_streamer">Tvůj stream má nižší kvalitu videa nebo zvuku. Mohou to způsobovat problémy s připojením.</string>
     <string name="stream_capture_paused">Stream pozastaven</string>
     <string name="stream_capture_paused_details">Pro obnovení přejdi do hry.</string>
     <string name="stream_capture_paused_details_viewer">%1$s minimalizoval hru… vydrž chvilku!</string>
     <string name="stream_channel_description">Uživatelé s tímto oprávněním mohou streamovat do tohoto kanálu.</string>
-    <string name="stream_description">Uživatelé s tímto oprávnění mohou v tomto kanále</string>
     <string name="stream_ended">Tento stream skončil. *ticho po pěšině*</string>
     <string name="stream_ended_button">Stream skončil</string>
     <string name="stream_ended_no_spectators">Nejsou tu žádní diváci, protože stream už skončil.</string>
@@ -3105,7 +3030,6 @@ Určitě to chceš udělat?"</string>
     <string name="stream_report_rating_body_streamer">Popiš nám, jak se ti streamovalo.</string>
     <string name="stream_report_submit">Potvrdit</string>
     <string name="stream_reported">Zpětná vazba odeslána</string>
-    <string name="stream_reported_body">Děkujeme za nahlášení problému! Zpětná vazba nám pomůže zlepšit kvalitu streamu.</string>
     <string name="stream_soundshare_failed">Něco se pokazilo a nemůžeme streamovat zvuk tvé hry.</string>
     <string name="streamer_mode">Streamovací režim</string>
     <string name="streamer_mode_enabled">Streamovací režim povolen</string>
@@ -3163,7 +3087,6 @@ Určitě to chceš udělat?"</string>
     <string name="system_message_guild_member_join_10">Objevil se tu divoký %1$s.</string>
     <string name="system_message_guild_member_join_11">Fííííííí. %1$s právě přistál/a.</string>
     <string name="system_message_guild_member_join_12">Držte se. %1$s se právě přidal/a k serveru.</string>
-    <string name="system_message_guild_member_join_13">%1$s se právě přidal/a. Schovejte banány.</string>
     <string name="system_message_guild_member_join_14">%1$s právě dorazil/a. Vypadá OP – nerfnout, prosím.</string>
     <string name="system_message_guild_member_join_15">%1$s právě proklouznul/a na server.</string>
     <string name="system_message_guild_member_join_16">Na serveru se spawnul/a %1$s.</string>
@@ -3175,7 +3098,6 @@ Určitě to chceš udělat?"</string>
     <string name="system_message_guild_member_join_22">Je to pták? Je to letadlo? Tak nic, je to jen %1$s.</string>
     <string name="system_message_guild_member_join_23">Je to %1$s! Chvalte slunce! \\\\[T]/</string>
     <string name="system_message_guild_member_join_24">%1$s se nikdy nevzdáme. %1$s nikdy nezklameme.</string>
-    <string name="system_message_guild_member_join_25">Ha! %1$s se přidal. Právě jsi aktivoval/amou kartu s pastí!</string>
     <string name="system_message_guild_member_join_26">Nazdar, lásko! %1$s je tu!</string>
     <string name="system_message_guild_member_join_27">Hola! Slyšte! %1$s se přidal!</string>
     <string name="system_message_guild_member_join_28">Očekávali jsme tě, %1$s.</string>
@@ -3291,8 +3213,6 @@ ověřovací aplikaci. **Každý kód lze použít jenom jednou! Všechny dřív
     <string name="unable_to_join_channel_full">Tento kanál je plný.</string>
     <string name="unable_to_join_voice_unsupported_mobile">Na tomto zařízení nejsou podporovány hlasové komunikace.</string>
     <string name="unban">Zrušit zákaz</string>
-    <string name="unban_user_body">Určitě chceš zrušit zákaz pro %1$s?</string>
-    <string name="unban_user_title">Zrušit zákaz pro „%1$s“</string>
     <string name="unblock">Odblokovat</string>
     <string name="unblock_to_jump_body">Nejdřív odblokuj „%1$s“ a pak se můžeš vrhnout na zprávu.</string>
     <string name="unblock_to_jump_title">Tákže… tuto osobu sis zablokoval/a</string>
@@ -3323,7 +3243,6 @@ Ke **stahování aplikací** budeš potřebovat ověřený účet."</string>
     <string name="unread_channels">Nepřečtené kanály</string>
     <string name="unsupported_browser">Nepodporovaný prohlížeč</string>
     <string name="unsupported_browser_body">Vypadá to, že používáš nepodporovaný prohlížeč. Pokud si chceš užít vše, co Discord nabízí, aktualizuj svůj prohlížeč nebo si stáhni jednu z našich aplikací.</string>
-    <string name="unsupported_browser_details">Chceš mluvit se svým týmem, že? Přejdi na nejnovější Chrome, Opera, Firefox 38+, nebo si stáhni Discord klienta a začni mluvit už teď!</string>
     <string name="unsupported_browser_title">No, tak to je trapné</string>
     <string name="unverified_account_body">"Zkontroluj svůj email a postupuj podle pokynů k ověření tvého e-mailu.
 
@@ -3441,8 +3360,6 @@ Podrž klávesu shift pro přímé nahrání."</string>
     <string name="user_settings_appearance_preview_message_4">Zapnou kompaktní zobrazení</string>
     <string name="user_settings_appearance_preview_message_5">A hele, tady je!</string>
     <string name="user_settings_appearance_zoom_tip">Přiblížení můžeš změnit stisknutím %1$s +/- a vrátit jej na výchozí hodnotu stisknutím %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Zobrazit záložku her</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Vypnutím schováš záložku her a budeš se moct plně soustředit na konverzaci.</string>
     <string name="user_settings_close_button">Tlačítko pro zavření</string>
     <string name="user_settings_confirm_logout">Určitě se chceš odhlásit?</string>
     <string name="user_settings_game_activity">Herní aktivita</string>
@@ -3501,8 +3418,6 @@ Ber ale na vědomí, že pak bude server veřejně přístupný každému, kdo o
     <string name="vanity_url_hint_mobile">zde-tva-url</string>
     <string name="verfication_expired">Odkaz na ověření emailu vypršel.</string>
     <string name="verfication_expired_suggestion">Přihlas se k Discordu a znovu odešli odkaz</string>
-    <string name="verification_body">"Odhalili jsme, že se tu děje něco podivného.
-Abys mohl/a dát používat Discord, **musíme tě požádat o ověření, že jsi člověk.**"</string>
     <string name="verification_body_alt">Tak se ujistíme, že jsi člověk…</string>
     <string name="verification_email_body">Na **%1$s** jsme ti poslali nový ověřovací e-mail. Zkontroluj si schránku i složku s nevyžádanou poštou.</string>
     <string name="verification_email_error_body">Při odesílání ověřovacího e-mail došlo k chybě. Zkus to znovu později nebo kontaktuj podporu.</string>
@@ -3543,8 +3458,6 @@ Abys mohl/a dát používat Discord, **musíme tě požádat o ověření, že j
     <string name="video">Grafika</string>
     <string name="video_call">Videohovor</string>
     <string name="video_connect">Grafika</string>
-    <string name="video_poor_connection_body">Vypnuli jsme video. Opět se zapne, až budeš mít lepší připojení.</string>
-    <string name="video_poor_connection_title">Špatné připojení</string>
     <string name="video_preview">Náhled videa</string>
     <string name="video_settings">Nastavení videa</string>
     <string name="video_unavailable">Video není k dispozici</string>
diff --git a/com.discord/res/values-da/plurals.xml b/com.discord/res/values-da/plurals.xml
index e507013bb1..985beb5632 100644
--- a/com.discord/res/values-da/plurals.xml
+++ b/com.discord/res/values-da/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">ingen pladser</item>
         <item quantity="one">%d plads</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d dage,</item>
-        <item quantity="one">1 dag</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d medlemmer</item>
-        <item quantity="zero">0 medlemmer</item>
-        <item quantity="one">1 medlem,</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">dage</item>
         <item quantity="one">dag</item>
@@ -209,16 +200,6 @@
         <item quantity="other">tilladelser</item>
         <item quantity="one">en tilladelse</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Satte langsom tilstand til **!!%d!! sekunder**</item>
-        <item quantity="zero">Deaktiverede langsom tilstand</item>
-        <item quantity="one">Satte langsom tilstand til **1 sekund**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Satte langsom tilstand til **!!%d!! sekunder**</item>
-        <item quantity="zero">Satte langsom tilstand til deaktiveret</item>
-        <item quantity="one">Satte langsom tilstand til **1 sekund**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! medlemmer**</item>
         <item quantity="one">**et medlem**</item>
@@ -318,10 +299,6 @@
         <item quantity="other">%d nye beskeder</item>
         <item quantity="one">1 ny besked</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d dage</item>
-        <item quantity="one">èn dag</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d kanaler</item>
         <item quantity="one">%d kanal</item>
diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml
index 1e824c3ff0..6f808c60d8 100644
--- a/com.discord/res/values-da/strings.xml
+++ b/com.discord/res/values-da/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"Du kan ikke sende en invitation, fordi du enten er usynlig eller skjuler din spillestatus. Hvis du foretrækker ikke at ændre
 dine indstillinger, kan du få nogen til at invitere dig i stedet."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Forstået!</string>
-    <string name="activity_panel_go_live_hotspot_header">Gå Live for at streame dit spil direkte til dine venner!</string>
+    <string name="activity_panel_go_live_hotspot_header">Brug Go Live for at streame dit spil direkte til dine venner!</string>
     <string name="activity_panel_go_live_tooltip">Gå Live</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Denne server har ikke stemmekanaler at streame til.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Du kan ikke streame til din talekanal.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Naviger til en server for at starte streaming.</string>
     <string name="add">Tilføj</string>
     <string name="add_a_comment_optional">Tilføj en kommentar (valgfrit)</string>
@@ -157,7 +155,6 @@ tilladelse at give."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Sådan!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Gå til biblioteket</string>
     <string name="application_entitlement_code_redemption_invalid">Ugyldig kode indtastet</string>
-    <string name="application_entitlement_code_redemption_prompt">Har du modtaget en kode til et spil? Indtast den herunder:</string>
     <string name="application_entitlement_code_redemption_redeem">Indløs</string>
     <string name="application_filter_name_linux">Alle filer</string>
     <string name="application_filter_name_macos">Applikationer</string>
@@ -397,7 +394,6 @@ tilladelse at give."</string>
     <string name="application_store_view_all_news">Se alle nyheder</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Dette indhold, der kan downloades, fordrer, at du ejer %1$s på Discord for at spille. [Få mere at vide om indhold, der kan downloades](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Indhold, der kan downloades</string>
-    <string name="application_store_warning_early_access_description">Dette spil er sjovt (det synes vi), men kan have begrænset indhold, forskellige fejl eller føles utilstrækkeligt. [Få mere at vide om tidlig adgang.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Tidlig adgang</string>
     <string name="application_store_warning_requires_desktop_app_description">For at kunne spille dette spil skal du have Discord $[pc-app](downloadHook) installeret.</string>
     <string name="application_store_warning_requires_desktop_app_title">Kræver pc-app</string>
@@ -520,7 +516,6 @@ men hvis og når du skal, må du ikke tøve."</string>
     <string name="billing_error_section_card">Åh åååh! Det ser ud, som om der er problemer med dette kort. Ret felterne og prøv igen.</string>
     <string name="billing_history">Faktureringshistorik</string>
     <string name="billing_legal_mumbo_jumbo">Juridisk hokus-pokus</string>
-    <string name="billing_legal_mumbo_jumbo_label">Jeg accepterer [Discord butiks-brugsvilkår](%1$s)</string>
     <string name="billing_no_payment_method">Ingen betalingsmetode gemt</string>
     <string name="billing_no_payment_method_description">Gå til kassen hurtigere ved at gemme en betalingsmetode</string>
     <string name="billing_pay_for_it_with">Betal for det med</string>
@@ -528,12 +523,7 @@ men hvis og når du skal, må du ikke tøve."</string>
     <string name="billing_payment_breakdown_total">Sum</string>
     <string name="billing_payment_history">Transaktionshistorik</string>
     <string name="billing_payment_premium">Dit abonnement</string>
-    <string name="billing_payment_premium_legalese_monthly">Ved at købe et %1$s abonnement, accepterer du vores [butiks-brugsvilkår](%2$s). %1$s er et automatisk tilbagevendende abonnement. Du bemyndiger Discord til straks at opkræve betalingsmetoden leveret på %3$s og til at fortsætte med at gøre det automatisk månedligt, indtil du afbestiller. Du kan afbestille når som helst.</string>
-    <string name="billing_payment_premium_legalese_yearly">Ved at købe et %1$s abonnement, accepterer du vores [butiks-brugsvilkår](%2$s). %1$s er et automatisk tilbagevendende abonnement. Du bemyndiger Discord til straks at opkræve betalingsmetoden leveret på %3$s og til at fortsætte med at gøre det automatisk årligt, indtil du afbestiller. Du kan afbestille når som helst.</string>
     <string name="billing_payment_sources">Betalingsmetoder</string>
-    <string name="billing_payment_table_header_amount">BELØB</string>
-    <string name="billing_payment_table_header_date">DATO</string>
-    <string name="billing_payment_table_header_description">BESKRIVELSE</string>
     <string name="billing_premium_refund_text">Man kan anmode om tilbagebetaling, hvis købet blev foretaget inden for de sidste %1$s dage. [Vores venlige hjælpecenter hjælper dig med at få dine mønter tilbage.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Dette køb er desværre ikke berettiget refusion. Man kan anmode om tilbagebetaling, hvis købet blev foretaget inden for de sidste %1$s dage.</string>
     <string name="billing_price_per_month">%1$s / måned</string>
@@ -543,9 +533,7 @@ men hvis og når du skal, må du ikke tøve."</string>
     <string name="billing_purchase_details_header">Detaljer omkring købet</string>
     <string name="billing_refund_header">Problemer med dit køb?</string>
     <string name="billing_refund_play_time_never_played">Aldrig spillet</string>
-    <string name="billing_refund_play_time_subheader">SPILLET TID</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">KØBSDATO</string>
     <string name="billing_refund_report_a_problem">Rapportér et problem</string>
     <string name="billing_refund_request_button">Anmodning om refusion</string>
     <string name="billing_sales_tax_added">%1$s moms er tilføjet pga. din faktureringsadresse</string>
@@ -781,7 +769,6 @@ på den lille bitte tekst nedenfor."</string>
     <string name="connection_enter_code">Indtast koden, som den vises på skærmen</string>
     <string name="connection_invalid_pin">Ugyldig PIN-kode indtastet</string>
     <string name="connection_login_with">eller log ind med</string>
-    <string name="connection_problems_body">Tjek [server status](%1$s) eller tweet [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Godkender</string>
     <string name="connection_status_awaiting_endpoint">Afventer slutpunkt</string>
     <string name="connection_status_connected">Tilsluttet</string>
@@ -826,7 +813,7 @@ på den lille bitte tekst nedenfor."</string>
     <string name="create_category">Opret kategori</string>
     <string name="create_channel">Opret kanal</string>
     <string name="create_group_dm">Opret gruppe DM</string>
-    <string name="create_instant_invite">Opret Instant Invite</string>
+    <string name="create_instant_invite">Opret invitation</string>
     <string name="create_link">Opret link</string>
     <string name="create_or_join_modal_header">Åh, endnu en server?</string>
     <string name="create_server_button_body">Opret en ny server og inviter dine venner. Det er gratis!</string>
@@ -941,7 +928,6 @@ på den lille bitte tekst nedenfor."</string>
     <string name="disable_email_notifications_failed_suggestion">E-mailmeddelelser kan være deaktiveret allerede, eller også er denne e-mail ikke længere tilknyttet en Discord-konto.</string>
     <string name="disable_integration_title">Deaktiver synkronisering</string>
     <string name="disable_integration_twitch_body">Deaktivering af synkronisering vil udføre den valgte, udløbne underadfærd, som om at alle underadfærder er udløbet.</string>
-    <string name="disable_integration_youtube_body">Deaktivering af synkronisering vil udføre den valgte, udløbne adfærd, som om at alle sponsorer er udløbet.</string>
     <string name="disable_notifications_description">Alle pc-meddelelser bliver deaktiveret.</string>
     <string name="disable_notifications_label">Deaktiver meddelelser</string>
     <string name="disable_sounds_description">Alle lydeffekter bliver deaktiveret.</string>
@@ -957,7 +943,6 @@ på den lille bitte tekst nedenfor."</string>
     <string name="discord_desc_long">Gratis og sikker chat for gamere, virker på både computeren og telefonen.</string>
     <string name="discord_desc_short">Gruppér stemme- og beskedchat</string>
     <string name="dismiss">Afskedig</string>
-    <string name="dispatch_error_modal_body">Noget gik galt. Hvis problemet fortsætter, skal du oprette en support-billet og kopiere meddelelsesindholdet nedenfor.</string>
     <string name="dispatch_error_modal_error_label">Fejlmeddelelse (Kopiér og indsæt mig)</string>
     <string name="dispatch_error_modal_header">Discord dispatch-feil</string>
     <string name="dispatch_error_modal_open_ticket">Åbn en billet</string>
@@ -1069,7 +1054,7 @@ på den lille bitte tekst nedenfor."</string>
     <string name="fi">Finsk</string>
     <string name="file_rate_kb">%1$s KB/s</string>
     <string name="file_rate_mb">%1$s MB/s</string>
-    <string name="file_upload_limit_premium">50 MB</string>
+    <string name="file_upload_limit_premium_tier_1">50 MB</string>
     <string name="file_upload_limit_standard">8 MB</string>
     <string name="filter">Sortér</string>
     <string name="filter_mentions">Filternævnte</string>
@@ -1091,8 +1076,6 @@ AFK-timeouten. Browsere er ikke påvirket af dette."</string>
     <string name="form_help_attenuation">"Sænk lydstyrken på andre programmer med denne procent, når nogen taler.
 Sæt den til 0 %% for helt at fjerne dæmpning."</string>
     <string name="form_help_automatic_vad">Hvis indikatoren har en solid grøn farve, udsender Discord din smukke stemme.</string>
-    <string name="form_help_bitrate">"**ALLE DE BITS!** at gå over %1$skbps kan ikke anbefales, medmindre du er en lydfil, fordi det vil påvirke mennesker negativt
-på mobile enheder eller dårlige forbindelser uden mærkbar fordel."</string>
     <string name="form_help_certified_voice_processing">"Når du bruger en Discord-certificeret mikrofon, så håndteres visse stemmebehandlende funktioner ikke længere af Discord,
 men snarere af mikrofonen."</string>
     <string name="form_help_channel_permissions">Valg af roller vil automatisk opsætte grundlæggende tilladelser for denne kanal.</string>
@@ -1105,11 +1088,6 @@ for at undgå [dette vanvid](%1$s).**"</string>
 for hver besked der sendes i denne server eller ej. Vi anbefaler kraftigt kun at sætte @mentions på en offentlig Discord."</string>
     <string name="form_help_explicit_content_filter">"Scan og slet automatisk beskeder, der er sendt i denne server, som indeholder stødende indhold. Vælg hvor bredt
 filteret vil gælde for medlemmer på din server. **Vi anbefaler at sætte et filter for en offentlig Discord-server.**"</string>
-    <string name="form_help_instant_invite_channel">"Hvis en kanal er markeret, vil et link til øjeblikkelig invitation blive genereret med widget'en,
-ellers vil der kun blive leveret onlinemedlemmer og talekanaler."</string>
-    <string name="form_help_last_seen">"Udrensning vil fjerne **%1$s** som ikke er
-blevet set i **%2$s** og som ikke er tildelt nogen roller.
-De kan tilmelde sig igen vha. en ny øjeblikkelig invitation."</string>
     <string name="form_help_legacy_subsystem">"Visse drivere til lydhardware udviser problemer, når dit operativsystems moderne lyd-subsystem anvendes.
 Markér dette afkrydsningsfelt for at falde tilbage til et ældre lyd-subsystem."</string>
     <string name="form_help_nsfw">"Brugerne skal bekræfte, at de er myndige for at se på indholdet i denne kanal.
@@ -1119,7 +1097,6 @@ websteds brugere, kan du dynamisk tilføje &amp;username= til en spørgestreng."
     <string name="form_help_qos">"Meddeler din router, at pakkerne fra Discord har høj prioritet.
 Nogle routere eller internetudbydere kan agere forkert, når dette er indstillet."</string>
     <string name="form_help_slowmode">Medlemmerne vil være begrænset til at sende én besked pr. dette tidsinterval, medmindre de har tilladelse til kanalstyring eller beskedstyring.</string>
-    <string name="form_help_system_channel">Send en besked til denne kanal, når nogen tilslutter sig denne server. Beskederne er randomiserede. Dette kan slås fra når som helst.</string>
     <string name="form_help_temporary">Medlemmer bliver automatisk smidt ud, når de afbryder, medmindre en rolle er tildelt.</string>
     <string name="form_help_user_limit">"Begrænser antallet af brugere, der kan oprette forbindelse til denne lydkanal. Brugere med **Flyt medlemmer** -rettigheden
 kan ignorere denne grænse og kan flytte andre brugere ind i kanalen."</string>
@@ -1164,8 +1141,8 @@ direkte beskedsamtale. Hvis et medlem har en tildelt rolle, gælder dette ikke.
     <string name="form_label_input_mode">Indgangstilstand</string>
     <string name="form_label_input_sensitivty">Indgangsfølsomhed</string>
     <string name="form_label_input_volume">Indgangslydstyrke</string>
-    <string name="form_label_instant_invite">Indtast en øjeblikkelig invitation</string>
-    <string name="form_label_instant_invite_channel">Kanal til øjeblikkelig invitation</string>
+    <string name="form_label_instant_invite">Indtast en invitation</string>
+    <string name="form_label_instant_invite_channel">Kanal til invitation</string>
     <string name="form_label_json_api">JSON-API</string>
     <string name="form_label_last_seen">Sidst set</string>
     <string name="form_label_local_mute">Gør stum lokalt</string>
@@ -1235,7 +1212,6 @@ direkte beskedsamtale. Hvis et medlem har en tildelt rolle, gælder dette ikke.
     <string name="form_label_suppress_everyone">Undertryk **@everyone** og **@here**</string>
     <string name="form_label_synced_role">Synkroniseret rolle</string>
     <string name="form_label_synced_subs">Synkroniserede underroller</string>
-    <string name="form_label_system_channel">Ny kanal til medlemsbeskeder</string>
     <string name="form_label_temporary">Midlertidigt medlemskab</string>
     <string name="form_label_tts">Tekst-til-tale</string>
     <string name="form_label_tts_notifications">Tekst-til-tale meddelelser</string>
@@ -1335,7 +1311,6 @@ for at kunne observere indgangsfølsomheden."</string>
     <string name="game_feed_activity_recently_played">For nyligt spillede</string>
     <string name="game_feed_activity_streaming_twitch">Streamer på Twitch</string>
     <string name="game_feed_current_header_title">Spiller nu</string>
-    <string name="game_feed_settings_visibility">Vis på spilfanen</string>
     <string name="game_feed_unknown_player">Ukendt spiller</string>
     <string name="game_feed_user_played_days_ago">Spillede for %1$s %2$s siden</string>
     <string name="game_feed_user_played_hours_ago">Spillede for %1$s %2$s siden</string>
@@ -1404,6 +1379,7 @@ for at kunne observere indgangsfølsomheden."</string>
     <string name="generate_a_new_link">Opret et nyt link</string>
     <string name="get_started">Kom i gang</string>
     <string name="gif_auto_play_label">Afspil automatisk GIF’er, når Discord er fokuseret.</string>
+    <string name="go_live_hardware_acceleration_unavailable">Et hurtigt heads-up, vi kan ikke registrere hardwareacceleration. Din computer kan have problemer med at understøtte Go Live.</string>
     <string name="go_live_hey">Hej!</string>
     <string name="go_live_listen">Lyt!</string>
     <string name="go_live_look">Se!</string>
@@ -1493,8 +1469,6 @@ for at kunne observere indgangsfølsomheden."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Gav** %1$s til **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Flyttede fra **%1$s** til **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">I position **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) oprettede en tekstkanal $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Ændrede emnet til **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Satte emnet til **%1$s**</string>
@@ -1545,7 +1519,7 @@ for at kunne observere indgangsfølsomheden."</string>
     <string name="guild_settings_audit_log_member_ban_remove">$[**%1$s**](userHook) fjernede udelukkelsen af $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_member_deaf_off">**Ophævede** døvhed</string>
     <string name="guild_settings_audit_log_member_deaf_on">**Gjorde dem** døve</string>
-    <string name="guild_settings_audit_log_member_kick">$[**%1$s**](userHook) smed ud $[**%2$s**](targetHook)</string>
+    <string name="guild_settings_audit_log_member_kick">$[**%1$s**](userHook) smed $[**%2$s**](targetHook) ud</string>
     <string name="guild_settings_audit_log_member_mute_off">**Ophævede** stumhed</string>
     <string name="guild_settings_audit_log_member_mute_on">**Gjorde dem** stumme</string>
     <string name="guild_settings_audit_log_member_nick_change">Ændrede deres kælenavn fra **%1$s** til **%2$s**</string>
@@ -1589,6 +1563,8 @@ for at kunne observere indgangsfølsomheden."</string>
     <string name="guild_settings_filter_all_actions">Alle handlinger</string>
     <string name="guild_settings_filter_all_users">Alle brugere</string>
     <string name="guild_settings_filter_user">Filtrer efter bruger</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">720p 60fps Go Live streamer</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">1080p 60fps Go Live streamer</string>
     <string name="guild_settings_label_audit_log">Revisionslog</string>
     <string name="guild_settings_label_audit_log_empty_body">Når moderatorer begynder at moderere, kan du moderere moderationen her.</string>
     <string name="guild_settings_label_audit_log_empty_title">Endnu ingen logfiler</string>
@@ -1620,7 +1596,7 @@ Hvis du har adgang til dit websteds brugere, kan du dynamisk tilføje &amp;usern
     <string name="help_role_locked_mine">Rollen er låst, fordi det er din højest rangerende rolle. Anmod en med højere rang eller ejeren af serveren om hjælp.</string>
     <string name="help_singular_permission">Du kan ikke ændre denne tilladelse, da det ville fjerne tilladelsen fra dig.</string>
     <string name="hide_instant_invites_description">Dette anbefales, hvis du ikke ønsker, at tilfældige personer får adgang til dine Discord-servere.</string>
-    <string name="hide_instant_invites_label">Skjul øjeblikkelige invitationslinks</string>
+    <string name="hide_instant_invites_label">Skjul invitationslinks</string>
     <string name="hide_muted">Skjul %1$s dæmpede</string>
     <string name="hide_muted_channels">Skjul stumme kanaler</string>
     <string name="hide_personal_information_description">Skjuler e-mail, forbundne konti, noter og anonymiserer DiscordTags.</string>
@@ -1669,7 +1645,6 @@ Hvis du har adgang til dit websteds brugere, kan du dynamisk tilføje &amp;usern
     <string name="hypesquad_question_11_response_d">Foreslår Wumpus, at han måske skulle tage tamburinen i stedet</string>
     <string name="hypesquad_question_12_prompt">Du er nået toppen af det højeste bjerg, og det eneste, der står mellem dig og rigdom, er den trehovede drage af spiret. Du:</string>
     <string name="hypesquad_question_12_response_a">Farer ind i kampen</string>
-    <string name="hypesquad_question_12_response_b">Ser gamle Godzilla-bevægelser for at lære af hans kampe mod kong Ghidorah</string>
     <string name="hypesquad_question_12_response_c">Forsøger at overtale dragen til at dele rigdommene</string>
     <string name="hypesquad_question_12_response_d">Tilbyder dragen et Wumpus-tøjdyr. Hvorfor skulle den ikke ønske sig det?</string>
     <string name="hypesquad_question_13_prompt">Hvad er det for en lyd?</string>
@@ -1771,14 +1746,14 @@ Hvis du har adgang til dit websteds brugere, kan du dynamisk tilføje &amp;usern
     <string name="input_mode_ptt_release_delay">Tryk-og-tal udløs forsinkelse</string>
     <string name="input_mode_vad">Stemmeaktivitet</string>
     <string name="install_location_main">Hoved</string>
-    <string name="instant_invite">Øjeblikkelig invitation</string>
+    <string name="instant_invite">Inviter</string>
     <string name="instant_invite_accept">Acceptér invitation</string>
-    <string name="instant_invite_accepted">Accepterede øjeblikkelig invitation</string>
-    <string name="instant_invite_accepting">Accepterer øjeblikkelig invitation</string>
+    <string name="instant_invite_accepted">Accepteret invitation</string>
+    <string name="instant_invite_accepting">Accepterer invitation</string>
     <string name="instant_invite_ask_for_new_invite">Bed om en ny.</string>
     <string name="instant_invite_ask_user_for_new_invite">Bed %1$s om en ny invitation.</string>
     <string name="instant_invite_code">Kode</string>
-    <string name="instant_invite_expired">Den øjeblikkelige invitation er ugyldig eller udløbet.</string>
+    <string name="instant_invite_expired">Den invitation er ugyldig eller udløbet.</string>
     <string name="instant_invite_expires">Udløber</string>
     <string name="instant_invite_failed_to_generate">Det var ikke muligt at oprette et invitationslink.</string>
     <string name="instant_invite_generate">Generér</string>
@@ -1795,16 +1770,15 @@ Hvis du har adgang til dit websteds brugere, kan du dynamisk tilføje &amp;usern
     <string name="instant_invite_regenerate">Regenerér</string>
     <string name="instant_invite_resolved_body">Du er blevet inviteret til **%1$s** i **%2$s**.</string>
     <string name="instant_invite_resolved_title">Halløj med dig.</string>
-    <string name="instant_invite_resolving">Løser øjeblikkelig invitation</string>
+    <string name="instant_invite_resolving">Løser invitation</string>
     <string name="instant_invite_uses">Anvendelser</string>
     <string name="instant_invite_you_are_already_a_member_of">Du er allerede medlem af</string>
     <string name="instant_invite_you_have_been_invited_to_join">Du er blevet inviteret til at tilmelde dig</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** har inviteret dig til at tilmelde dig</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Du er blevet inviteret til at tilmelde dig en gruppe-DM af</string>
-    <string name="instant_invites">Øjeblikkelige Invitationer</string>
+    <string name="instant_invites">Invitationer</string>
     <string name="integration_settings">Integrationsindstillinger</string>
     <string name="integrations">Integrationer</string>
-    <string name="integrations_header">Tilsluttede Twitch/Youtube-spillekonti</string>
     <string name="integrations_pro_tip">Yderligere oplysninger om integrationer kan ses her [Discords StreamKit](%1$s).</string>
     <string name="internal_server_error">Der opstod en intern serverfejl. Prøv igen.</string>
     <string name="invalid_animated_emoji_body">Denne emoji virker ikke, fordi den er animeret. Opgrader til Discord Nitro for at opfylde alle dine drømme om animerede emojier</string>
@@ -1913,17 +1887,16 @@ Vil du vide mere om Discord?"</string>
     <string name="ip_authorization_succeeded_suggestion">Hvis du fulgte dette link efter at have prøvet at logge ind på pc’en eller mobilen, så gå tilbage for at prøve igen.</string>
     <string name="it">Italiensk</string>
     <string name="ja">Japansk</string>
-    <string name="join">Tilslut</string>
     <string name="join_afk_channel_body">Det ser ud til, at du er tilsluttet AFK-kanalen. Du kan ikke tale i denne kanal.</string>
     <string name="join_call">Deltag i opkald</string>
     <string name="join_server">Tilslut dig</string>
-    <string name="join_server_button_body">Indtast en øjeblikkelig invitation, og bliv en del af din vens server.</string>
+    <string name="join_server_button_body">Indtast en invitation, og bliv en del af din vens server.</string>
     <string name="join_server_button_cta">Tilslut en server</string>
     <string name="join_server_button_cta_mobile">Tilslut dig en server med et invitationslink</string>
     <string name="join_server_button_cta_mobile_desc">Har du en invitationskode eller link? Brug den her!</string>
     <string name="join_server_button_cta_named">Tilslut dig %1$s</string>
-    <string name="join_server_description">Indtast en øjeblikkelig invitation nedenunder for at slutte dig til en eksisterende server. Invitationen vil se nogenlunde sådan ud:</string>
-    <string name="join_server_description_mobile">Angiv en øjeblikkelig invitation ovenfor for at slutte dig til en eksisterende server.</string>
+    <string name="join_server_description">Indtast en invitation nedenunder for at slutte dig til en eksisterende server. Invitationen vil se nogenlunde sådan ud:</string>
+    <string name="join_server_description_mobile">Angiv en invitation ovenfor for at slutte dig til en eksisterende server.</string>
     <string name="join_server_title">Tilslut dig en server</string>
     <string name="join_stream">Deltag i stream</string>
     <string name="join_video_call">Deltag i videoopkald</string>
@@ -2030,7 +2003,7 @@ mens du taler."</string>
     <string name="link_your_xbox_account_1">Knyt din Xbox-konto til Discord for at vise, hvilket spil du spiller.</string>
     <string name="link_your_xbox_account_2">Discord er en tale-, tekst- og video-chat-app til gamere, som er gratis, sikker og virker på pc og mobil.</string>
     <string name="listening_to">Lytter til **%1$s**</string>
-    <string name="live_beta_description">Velkommen til stream! Gå Live er i beta. Beklager, hvis der har været småproblemer</string>
+    <string name="live_beta_description">Velkommen til stream! Go Live er i beta. Beklager, hvis der har været småproblemer</string>
     <string name="live_on_twitch">Live på Twitch</string>
     <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Det var ikke muligt at indlæse billedet.
@@ -2214,14 +2187,11 @@ vores opdaterede servicevilkår og privatlivspolitik."</string>
     <string name="no_emoji_title">Ingen emoji</string>
     <string name="no_input_devices">Ingen indgangsenheder</string>
     <string name="no_input_devices_detected">Der blev ikke fundet nogen indgangsenheder, tilslut en og prøv igen.</string>
-    <string name="no_instant_invite">Ingen øjeblikkelig invitation</string>
-    <string name="no_integrations">[Tilslut](onConnect) din partner Twitch eller YouTube-spillekonto for at synkronisere dine abonnenter/sponsorer til en rolle</string>
+    <string name="no_instant_invite">Ingen invitation</string>
     <string name="no_integrations_body">Protokollen FR13NDSH1P kan kun udføres fra Discord-kunden</string>
     <string name="no_integrations_label">Ingen integrationer</string>
-    <string name="no_invites_body">"Føler du dig ørkesløs? Ligesom et papirfly, der glider hen over himmelen?
-Få nogle venner herinde ved at skabe et link til øjeblikkelig invitation."</string>
-    <string name="no_invites_caption">Endnu ingen øjeblikkelige invitationer.</string>
-    <string name="no_invites_label">Endnu ingen øjeblikkelige invitationer</string>
+    <string name="no_invites_caption">Endnu ingen invitationer!</string>
+    <string name="no_invites_label">Endnu ingen invitationer</string>
     <string name="no_mail_account_description">Send din feedback til support@discordapp.com, og vi har kopieret dine brugeroplysninger til udklipsholderen.</string>
     <string name="no_mail_account_title">Ingen e-mailkonto</string>
     <string name="no_mic_body">Instruktioner for at aktivere adgang til din mikrofon kan findes i Discords hjælpecenter.</string>
@@ -2239,7 +2209,6 @@ ingen fastgjorte beskeder… endnu."</string>
     <string name="no_reactions_header">Ingen reaktioner</string>
     <string name="no_recent_mentions">Og i begyndelsen… var der tavshed.</string>
     <string name="no_send_messages_permission_placeholder">Du har ikke tilladelse til at sende beskeder i denne kanal.</string>
-    <string name="no_system_channel">Ingen nye medlemsbeskeder</string>
     <string name="no_text">Nej</string>
     <string name="no_thanks">Nej tak</string>
     <string name="no_user_limit">Ingen grænse</string>
@@ -2251,7 +2220,6 @@ ingen fastgjorte beskeder… endnu."</string>
     <string name="note">Bemærkning</string>
     <string name="note_placeholder">Klik for at tilføje en bemærkning</string>
     <string name="note_placeholder_mobile">Tryk for at tilføje en bemærkning</string>
-    <string name="notice_application_test_mode">Test-tilstand er aktiv lige nu for **%1$s**. Ikke-publicerede SKU’er vil dukke op, og du skal ikke betale eventuelle tilknyttede betalinger.</string>
     <string name="notice_application_test_mode_go_to_listing">Gå til SKU</string>
     <string name="notice_connect_spotify">Tilslut din Spotify-konto for at vise din musik i din status.</string>
     <string name="notice_connection_conflict">Din stemme er blevet frakoblet, fordi du er forbundet til et andet sted.</string>
@@ -2262,7 +2230,6 @@ ingen fastgjorte beskeder… endnu."</string>
     <string name="notice_dispatch_error_disk_low">Du har ikke nok plads på disken. %1$s er påkrævet, men kun %2$s er tilgængelige.</string>
     <string name="notice_dispatch_error_file_name_too_long">Åh nej, dette spils filnavne er for lange til Windows. Vælg et installationsbibliotek med et kortere navn.</string>
     <string name="notice_dispatch_error_invalid_drive">Åh nej, installationsstedet, du valgte, er ikke gyldigt. Du valgte %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Vi kunne ikke opdatere spillet. Kører spillet lige nu?</string>
     <string name="notice_dispatch_error_no_manifests">Åh nej, det ser ud til, at dette spil ikke har noget indhold. Kontakt support.</string>
     <string name="notice_dispatch_error_not_entitled">Åh nej, det ser ud til, at du ikke ejer dette spil. Kontakt support, hvis du tror, det er en fejl.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Det ser ud til, at du sagde nej til et installations-script. Du skal sige ja for at kunne installere spillet.</string>
@@ -2277,9 +2244,6 @@ ingen fastgjorte beskeder… endnu."</string>
     <string name="notice_native_apps">Har du brug for en global Tryk-og-tal-knap? Få Discord-appen!</string>
     <string name="notice_no_input_detected">Nå, det ser ud til, at Discord ikke registrerer input fra din mikrofon. Lad os ordne det… sammen.</string>
     <string name="notice_no_input_detected_help_link_text">Hjælp!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Din adgang til Nitro er udløbet. Opgrader fra Nitro Classic til Nitro for ubegrænset adgang til fantastiske spil.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Du har kun %1$s tilbage af Nitro-spillene! Din adgang slutter den **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Tak, fordi du er en tidlig Nitro-støtte. Som en gave for at være fantastisk får du nu adgang til Nitro-spil indtil %1$s.</string>
     <string name="notice_premium_promo_action">Tjek det ud</string>
     <string name="notice_premium_promo_message">Støt Discords udvikling, og få sjove godbidder.</string>
     <string name="notice_scheduled_maintenance">Der vil blive udført planlagt vedligeholdelse af Discord den **%1$s** klokken **%2$s**.</string>
@@ -2348,7 +2312,6 @@ Modtog du et invitationslink fra en ven? Indtast dit invitationslink eller kode
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Aktivér Overlay</string>
     <string name="nux_post_reg_join_server_description">Få mest ud af Discord ved at slutte dig til en server.</string>
     <string name="nux_post_reg_join_server_skip">Jeg har ikke nogen</string>
     <string name="nux_post_reg_join_server_title">Har du en invitation?</string>
@@ -2393,7 +2356,6 @@ Overlayet virker måske heller ikke for alle. Hvis du har problemer eller spørg
     <string name="overlay_menu_get_invite">Få invitationslink</string>
     <string name="overlay_menu_open_discord">Åbn Discord</string>
     <string name="overlay_menu_switch_channels">Skift kanaler</string>
-    <string name="overlay_mobile_toggle_desc">Se, hvem der taler og tilgå genveje, imens du anvender andre apps, når du er forbundet til voice</string>
     <string name="overlay_mobile_toggle_label">Slå mobile voice overlay til</string>
     <string name="overlay_mobile_unauthed">Log ind på Discord-appen for at slå denne egenskab til.</string>
     <string name="overlay_news_go_live_body">Vil du streame %1$s til dine venner i %2$s?</string>
@@ -2401,7 +2363,6 @@ Overlayet virker måske heller ikke for alle. Hvis du har problemer eller spørg
     <string name="overlay_news_text_pinning_body">Du kan nu fastgøre en beskedchat til dit spil.</string>
     <string name="overlay_news_text_pinning_tip">Tip: Du kan fastgøre en chat ved at trykke på $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Discord-overlay opgraderet</string>
-    <string name="overlay_no_results">Vi har søgt overalt. Desværre fandt vi ingen stemmekanaler</string>
     <string name="overlay_notification_incoming_call">Indkommende opkald…</string>
     <string name="overlay_notification_settings_disabled">Meddelelser er deaktiveret</string>
     <string name="overlay_notification_settings_position">Viser: %1$s</string>
@@ -2411,7 +2372,6 @@ Overlayet virker måske heller ikke for alle. Hvis du har problemer eller spørg
     <string name="overlay_notifications_settings">Overlay-meddelelser</string>
     <string name="overlay_notifications_top_left">Øverst til venstre</string>
     <string name="overlay_notifications_top_right">Øverst til højre</string>
-    <string name="overlay_private_channels_empty_state">Niks, ingen direkte beskeder her.</string>
     <string name="overlay_reload">Genindlæs overlay</string>
     <string name="overlay_settings">Overlay-indstillinger</string>
     <string name="overlay_settings_general_tab">Generel</string>
@@ -2525,18 +2485,11 @@ Overlayet virker måske heller ikke for alle. Hvis du har problemer eller spørg
     <string name="popout_stay_on_top">Forbliv på top</string>
     <string name="post_code">Postnummer</string>
     <string name="premium_alert_error_title">Hovsa, noget gik galt…</string>
-    <string name="premium_applications_grandfathered_monthly">Som tak for din støtte til Discord har du adgang til Nitro-spil i ét år. Din adgang slutter **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">Som tak for din støtte til Discord har du adgang til Nitro-spil i to år. Din adgang slutter **%1$s**.</string>
-    <string name="premium_applications_subtitle">Ubegrænset adgang til et voksende bibliotek af anmelderroste spil, som vi mener du og dine venner bør spille.</string>
-    <string name="premium_applications_title">Snesevis af udvalgte spil. Èn lav, månedlig pris.</string>
     <string name="premium_badge_tooltip">Abonnent siden %1$s</string>
     <string name="premium_cancel_cancel">Nix</string>
     <string name="premium_cancel_confirm_body_tier_1">"Opsigelse vil træde i kraft ved udgangen af din aktuelle faktureringsperiode den **%1$s**. Dit Discord-tag randomiseres, hvis du har ændret det.
 
 Du kan tegne abonnement igen når som helst."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Opsigelse træder i kraft ved udgangen af din aktuelle faktureringsperiode. Den **%1$s** vil du miste adgangen til alle Nitro-spil i dit bibliotek, og dit Discord-tag vil blive randomiseret, hvis du har ændret det.
-
-Vi gemmer dine gemte filer sikkert, hvis du skulle skifte mening. Du kan tilmelde dig igen til enhver tid!"</string>
     <string name="premium_cancel_confirm_new">Ja, afbestil %1$s</string>
     <string name="premium_cancel_confirm_title">Afbryd %1$s?</string>
     <string name="premium_cancel_failed_body">Vi kunne ikke opsige dit Nitro-abonnement. Prøv igen, eller kontakt vores supportteam, hvis problemet ikke bliver løst.</string>
@@ -2553,19 +2506,15 @@ Vi gemmer dine gemte filer sikkert, hvis du skulle skifte mening. Du kan tilmeld
     <string name="premium_chat_perks_description_custom_emoji">Få et globalt pas til at bruge dine brugerdefinerede emojis hvor som helst.</string>
     <string name="premium_chat_perks_description_discriminator">Vælg dit tag mens du har abonnement.</string>
     <string name="premium_chat_perks_description_screenshare">Skærmdelingsspil med 720p 60fps eller 1080p 30fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Store upload filstørrelse for %1$s fra %2$s for højkvalitets meme-deling.</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Animeret sjov</string>
     <string name="premium_chat_perks_title_badge">Gentag din støtte</string>
     <string name="premium_chat_perks_title_custom_emoji">Globalt brugerdefinerede emojis</string>
     <string name="premium_chat_perks_title_discriminator">Brugerdefineret Discord-tag</string>
     <string name="premium_chat_perks_title_screenshare">Højere videokvalitet</string>
+    <string name="premium_chat_perks_title_streaming">Bedre Go Live Streamer</string>
     <string name="premium_code_redemption_confirmation_blurb">Takket være en tilfældig streng af cifre har du nu forbedrede chat-fordele i %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">Wow, lækkert!</string>
-    <string name="premium_feature_new_chat_perks_header">Du får også nogle forbedrede chat-fordele:</string>
-    <string name="premium_feature_new_premium_applications_header">Over %1$s værdi af spil. Tjek dem ud:</string>
-    <string name="premium_feature_view_applications">Se alle Nitro-spil</string>
     <string name="premium_features_chat_perks">Chat-fordele</string>
-    <string name="premium_features_premium_applications">Gratis spil</string>
     <string name="premium_grandfathered_warning">Som tak for din støtte til os har du nu en Nitro-plan med rabat. **Ved annullering eller ændringer i din plan vil du miste rabatten.** Nu er du advaret!!!!!</string>
     <string name="premium_grandfathered_warning_confirm">Gør det alligevel</string>
     <string name="premium_grandfathered_warning_title">Forsigtig, min ven</string>
@@ -2575,10 +2524,7 @@ Vi gemmer dine gemte filer sikkert, hvis du skulle skifte mening. Du kan tilmeld
     <string name="premium_not_claimed">Gør krav på din konto først</string>
     <string name="premium_not_claimed_body">Hej ven! Hvis du ønsker at købe Nitro, skal du først have din konto, så du ikke mister dine ting.</string>
     <string name="premium_not_verified">Bekræft din email først</string>
-    <string name="premium_not_verified_body">Hej ven! Hvis du ønsker at købe Nitro, skal du først bekræfte din e-mail. Tjek din e-mail, eller anmod om en ny.</string>
-    <string name="premium_payment_applications_os_warning">Nitro-spil understøttes kun i Windows.</string>
     <string name="premium_payment_confirmation_blurb_regular">Du har nu opnået styrken af forbedrede chat-godbidder. Hold op med at læse det her, og gå i gang med at chatte.</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Du har nu ubegrænset adgang til så mange fantastiske spil. Hold op med at læse det her, og gå i gang med at spille.</string>
     <string name="premium_payment_confirmation_button_regular">OK, lyder godt</string>
     <string name="premium_plan_month">Nitro månedligt</string>
     <string name="premium_plan_month_tier_1">Nitro Classic månedligt</string>
@@ -2599,13 +2545,10 @@ Vi opdeler din nuværende plan proportionalt og trækker den fra den årlige pri
     <string name="premium_upgrade_disabled_current_tooltip">Din nuværende plan.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Du skal afbestille først og lade dit abonnement udløbe, før du vælger en plan på et lavere niveau.</string>
     <string name="premium_upgrade_done_body_tier_1">Du har nu forbedrede chat-godbidder.</string>
-    <string name="premium_upgrade_done_body_tier_2">Du har nu forbedrede chat-godbidder og adgang til masser af spil.</string>
     <string name="premium_upgrade_done_button_tier_1">Herligt!</string>
-    <string name="premium_upgrade_done_button_tier_2">Tjek alle Nitro-spil</string>
     <string name="premium_upgrade_failed_body">Øhh… Opgraderingen virkede ikke. Sørg for, at dine betalingsoplysninger er ajour, og prøv igen.</string>
     <string name="premium_upload_promo">Opgrader til Discord Nitro for %1$s filgrænse</string>
     <string name="premium_year_free_months">Få 2 måneder gratis.</string>
-    <string name="premium_year_free_months_short">2 måneder gratis</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / år</string>
     <string name="preview_chat">Forhåndsvis chat</string>
     <string name="priority_speaker">Prioriteret taler</string>
@@ -2634,7 +2577,7 @@ computerprogrammet for at få global Tryk-og-tal."</string>
 mens spillet er i fokus."</string>
     <string name="ptt_permission_title">Tryk-og-tal Mangler Rettigheder</string>
     <string name="quick_dm_blocked">Du kan ikke sende besked til blokerede brugere</string>
-    <string name="quick_dm_user">Besked @%1$s</string>
+    <string name="quick_dm_user">Send besked til @%1$s</string>
     <string name="quick_launcher_empty_text">Discord kan hurtigt starte de fleste spil, du for nylig har spillet på denne computer. Gå videre og start et, for at se det blive vist her!</string>
     <string name="quick_launcher_header">Hurtigstarter</string>
     <string name="quickswitcher_drafts">Udkast</string>
@@ -2787,7 +2730,7 @@ prøver at sende data."</string>
     <string name="scope_guilds">Vid, hvilke servere du er i</string>
     <string name="scope_guilds_empty">Du findes ikke på nogen servere.</string>
     <string name="scope_guilds_join">Deltag i servere for dig</string>
-    <string name="scope_guilds_join_description">Brug øjeblikkelige invitationer på dine vegne.</string>
+    <string name="scope_guilds_join_description">Brug invitationer på dine vegne.</string>
     <string name="scope_identify">Få adgang til dit brugernavn og din avatar</string>
     <string name="scope_messages_read">Læs alle meddelelser</string>
     <string name="scope_messages_read_description">Dette lader appen læse alle tilgængelige beskeder via din Discord-konto</string>
@@ -2850,7 +2793,6 @@ Vælg, hvilken skærm du vil dele."</string>
     <string name="search_filter_on">på</string>
     <string name="search_for_emoji">Find den perfekte emoji</string>
     <string name="search_for_empty">Søg</string>
-    <string name="search_for_value">Søg efter: **%1$s**</string>
     <string name="search_group_header_channels">I kanal</string>
     <string name="search_group_header_dates">Datoer</string>
     <string name="search_group_header_file_name">Filnavn indeholder</string>
@@ -3046,8 +2988,6 @@ Er du sikker på, at du vil gøre dette?"</string>
     <string name="stop_ringing">Stop ringning</string>
     <string name="stop_streaming">Stop med at streame</string>
     <string name="stop_watching">Stop med at se</string>
-    <string name="store_payment_legalese_monthly">Hej! Ved at købe %1$s accepterer du vores [Butiks-servicevilkår](%2$s). %1$s er et løbende abonnement, hvilket betyder, at vi opkræver dig i dag og fortsætter med at opkræve dig månedligt, indtil du afbestiller dit abonnement. Du kan afbestille når som helst på skærmen Brugerindstillinger.</string>
-    <string name="store_payment_legalese_yearly">Hej! Ved at købe %1$s accepterer du vores [Butiks-servicevilkår](%2$s). %1$s er et løbende abonnement, hvilket betyder, at vi opkræver dig i dag og fortsætter med at opkræve dig årligt, indtil du afbestiller dit abonnement. Du kan afbestille når som helst på skærmen Brugerindstillinger.</string>
     <string name="stream">Gå Live</string>
     <string name="stream_bad_spectator">Streamet, som du ser, har reduceret video- eller lydkvalitet lige nu. Dette kan være pga netværksbetingelser.</string>
     <string name="stream_bad_streamer">Dit stream har reduceret video- eller lydkvalitet lige nu. Dette kan være pga netværksbetingelser.</string>
@@ -3055,7 +2995,6 @@ Er du sikker på, at du vil gøre dette?"</string>
     <string name="stream_capture_paused_details">Skift til spillet for at genoptage.</string>
     <string name="stream_capture_paused_details_viewer">%1$s har minimeret spillet… vent venligst!</string>
     <string name="stream_channel_description">Medlemmer med denne tilladelse kan streame til denne kanal.</string>
-    <string name="stream_description">Medlemmer med denne tilladelse kan streame i denne kanal.</string>
     <string name="stream_ended">Stream er slut. *fårekyllinge-lyd*</string>
     <string name="stream_ended_button">Stream er slut</string>
     <string name="stream_ended_no_spectators">Der er ikke nogen tilskuer fordi streamet er slut.</string>
@@ -3095,7 +3034,6 @@ Er du sikker på, at du vil gøre dette?"</string>
     <string name="stream_report_rating_body_streamer">Fortæl os om din streaming oplevelse.</string>
     <string name="stream_report_submit">Indsend</string>
     <string name="stream_reported">Feedback er sendt</string>
-    <string name="stream_reported_body">Tak fordi du rapporterede dit problem! Din feedback hjælper os med at forbedre streamkvalitet.</string>
     <string name="stream_soundshare_failed">Hej, noget gik galt, og vi kunne ikke streame lyden fra dit spil.</string>
     <string name="streamer_mode">Streamer-tilstand</string>
     <string name="streamer_mode_enabled">Streamer-tilstand aktiveret</string>
@@ -3153,7 +3091,6 @@ Er du sikker på, at du vil gøre dette?"</string>
     <string name="system_message_guild_member_join_10">En vild %1$s dukkede op.</string>
     <string name="system_message_guild_member_join_11">Sus. %1$s er lige landet.</string>
     <string name="system_message_guild_member_join_12">Rust jer. %1$s tilsluttede sig lige nu serveren.</string>
-    <string name="system_message_guild_member_join_13">%1$s har netop tilsluttet sig. Skjul dine bananer.</string>
     <string name="system_message_guild_member_join_14">%1$s er netop ankommet. Ser ud som en operation – svæk våbnet.</string>
     <string name="system_message_guild_member_join_15">%1$s gled lige ind i serveren.</string>
     <string name="system_message_guild_member_join_16">En %1$s har lagt æg i serveren.</string>
@@ -3165,7 +3102,6 @@ Er du sikker på, at du vil gøre dette?"</string>
     <string name="system_message_guild_member_join_22">Det er en fugl. Det er et fly. Skidt med det, det er bare %1$s.</string>
     <string name="system_message_guild_member_join_23">Det er %1$s! Ros solen. \\\\[T]/</string>
     <string name="system_message_guild_member_join_24">Opgiv aldrig %1$s . Svigt aldrig %1$s .</string>
-    <string name="system_message_guild_member_join_25">Ha! %1$s har tilsluttet sig. Du aktiverede mit fældekort.</string>
     <string name="system_message_guild_member_join_26">Tillykke, min skat! %1$ser her.</string>
     <string name="system_message_guild_member_join_27">Hej! Hør her! %1$s har tilsluttet sig.</string>
     <string name="system_message_guild_member_join_28">Vi har ventet dig %1$s</string>
@@ -3184,7 +3120,7 @@ Er du sikker på, at du vil gøre dette?"</string>
     <string name="system_message_pinned_message_mobile">%1$s fastgjorde en besked til denne kanal.</string>
     <string name="system_message_pinned_message_no_cta">%1$s fastgjorde en besked til denne kanal.</string>
     <string name="system_message_pinned_message_no_cta_formatted">%1$s fastgjorde en besked til denne kanal.</string>
-    <string name="system_message_recipient_add">%1$s føjet til %2$s gruppen.</string>
+    <string name="system_message_recipient_add">%1$s føjet %2$s til gruppen.</string>
     <string name="system_message_recipient_remove">%1$s fjernet %2$s fra gruppen.</string>
     <string name="system_message_recipient_remove_self">%1$s forlod gruppen.</string>
     <string name="system_permission_grant">Giv tilladelse</string>
@@ -3205,7 +3141,7 @@ Er du sikker på, at du vil gøre dette?"</string>
     <string name="text_channels">Tekstkanaler</string>
     <string name="text_channels_matching">Tekstkanaler, der matcher **%1$s**</string>
     <string name="text_permissions">Beskedtilladelser</string>
-    <string name="textarea_placeholder">Besked %1$s</string>
+    <string name="textarea_placeholder">Send besked i %1$s</string>
     <string name="theme">Tema</string>
     <string name="theme_dark">Mørkt</string>
     <string name="theme_light">Lyst</string>
@@ -3316,8 +3252,6 @@ En påberåbt konto er påkrævet for at **downloade apper**."</string>
     <string name="unsupported_browser">Ikke-understøttet Browser</string>
     <string name="unsupported_browser_body">"Det ser ud til, at du bruger en browser, der ikke er understøttet. For at opleve det Discord har at byde på, kan du opgradere din
 browser eller downloade en af vores apps."</string>
-    <string name="unsupported_browser_details">"Du vil gerne være i stand til at snakke med dit hold, ikke? Skift til den nyeste version af Chrome, Opera, Firefox 38 + eller download
-Discord-kunden for at snakke lige nu!"</string>
     <string name="unsupported_browser_title">Øhm, det her er akavet</string>
     <string name="unverified_account_body">"Tjek din e-mail, og følg instruktionerne for at verificere din e-mail.
 
@@ -3433,8 +3367,6 @@ Hold Shift-tasten nede for at uploade direkte."</string>
     <string name="user_settings_appearance_preview_message_4">Kompakt-tilstand ville blive slået til</string>
     <string name="user_settings_appearance_preview_message_5">Åh, her er den!</string>
     <string name="user_settings_appearance_zoom_tip">Du kan ændre zoom-niveauet med %1$s +/- og sætte zoom tilbage til standard med %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Vis spilfanen</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Slå dette fra for at skjule spilfanen, så du kan fokusere på dine samtaler.</string>
     <string name="user_settings_close_button">Knappen Luk</string>
     <string name="user_settings_confirm_logout">Er du sikker på, at du vil logge ud?</string>
     <string name="user_settings_game_activity">Spilaktivitet</string>
@@ -3454,7 +3386,7 @@ Hold Shift-tasten nede for at uploade direkte."</string>
     <string name="user_settings_games_shortcuts_start_menu_note">Når spil installeres fra Discord Store. Lad dine spil kunne findes via Windows-søgning.</string>
     <string name="user_settings_keybinds_keybind">Tast-tilknytning</string>
     <string name="user_settings_linux_settings">Linux-indstillinger</string>
-    <string name="user_settings_minimize_to_tray_body">Få Discord til at putte sig i din systembakke som en god dreng, når du lukker appen</string>
+    <string name="user_settings_minimize_to_tray_body">Discord lægger sig artigt i systembakken, når du lukker appen</string>
     <string name="user_settings_minimize_to_tray_label">Minimer til Bakken</string>
     <string name="user_settings_my_account">Min konto</string>
     <string name="user_settings_notifications_show_badge_body">Viser en rødt badge på app-ikonet, når du har ulæste beskeder.</string>
@@ -3464,7 +3396,7 @@ Hold Shift-tasten nede for at uploade direkte."</string>
     <string name="user_settings_open_on_startup_body">Spar dig selv for et par klik, og lad Discord modtage dig, når du kommer hjem, som en god dreng</string>
     <string name="user_settings_open_on_startup_label">Åbn Discord</string>
     <string name="user_settings_save">Gem</string>
-    <string name="user_settings_start_minimized_body">Discord starter i baggrunden som en god dreng og kommer ikke i vejen</string>
+    <string name="user_settings_start_minimized_body">Discord starter i baggrunden, opfører sig pænt og kommer ikke i vejen</string>
     <string name="user_settings_start_minimized_label">Start minimeret</string>
     <string name="user_settings_startup_behavior">System-startadfærd</string>
     <string name="user_settings_streamer_notice_body">"Fyld din Discord-fællesskabsserver op med værktøjer, som du allerede bruger til at styrke din stream.
@@ -3492,8 +3424,6 @@ Vær opmærksom på, at dette gør din server offentligt tilgængelig for alle,
     <string name="vanity_url_hint_mobile">din-url-her</string>
     <string name="verfication_expired">E-mail-verifikationslink udløbet.</string>
     <string name="verfication_expired_suggestion">Log ind på Discord, og send linket igen</string>
-    <string name="verification_body">"Vi har opdaget, at noget ud over det sædvanlige foregår her.
-Hvis du vil fortsætte med at bruge Discord, **, skal du bekræfte, at du er et menneske.**"</string>
     <string name="verification_body_alt">Lad os nu sikre os, at du er et menneske…</string>
     <string name="verification_email_body">Vi har sendt dig en ny verifikationse-mail til **%1$s**; tjek både din indbakke og din spammappe.</string>
     <string name="verification_email_error_body">Der opstod en fejl under afsendelse af en verifikationse-mail. Prøv igen senere, eller kontakt support.</string>
@@ -3531,8 +3461,6 @@ Hvis du vil fortsætte med at bruge Discord, **, skal du bekræfte, at du er et
     <string name="verify_phone">Bekræft telefon</string>
     <string name="verifying">Verificerer</string>
     <string name="video_call">Videoopkald</string>
-    <string name="video_poor_connection_body">Video er blevet deaktiveret. Den vil blive aktiveret igen, når forbindelsen bliver bedre.</string>
-    <string name="video_poor_connection_title">Dårlig forbindelse</string>
     <string name="video_preview">Forhåndsvisning video</string>
     <string name="video_settings">Videoindstillinger</string>
     <string name="video_unavailable">Video utilgængelig</string>
diff --git a/com.discord/res/values-de/plurals.xml b/com.discord/res/values-de/plurals.xml
index 4d019ecf22..c05dd0a21d 100644
--- a/com.discord/res/values-de/plurals.xml
+++ b/com.discord/res/values-de/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">Keine Plätze</item>
         <item quantity="one">%d Platz</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">seit %d Tagen</item>
-        <item quantity="one">seit gestern</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d Mitglieder</item>
-        <item quantity="zero">kein Mitglied</item>
-        <item quantity="one">ein Mitglied</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">Tagen</item>
         <item quantity="one">Tag</item>
@@ -212,16 +203,6 @@
         <item quantity="other">mehrere Berechtigungen</item>
         <item quantity="one">eine Berechtigung</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Slow-Modus auf **!!%d!! Sekunden eingestellt**</item>
-        <item quantity="zero">Slow-Modus deaktiviert</item>
-        <item quantity="one">Slow-Modus auf **1 Sekunde eingestellt**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Slow-Modus auf **!!%d!! Sekunden eingestellt**</item>
-        <item quantity="zero">Slow-Modus deaktiviert</item>
-        <item quantity="one">Slow-Modus auf **1 Sekunde eingestellt**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! inaktive Mitglieder**</item>
         <item quantity="one">**ein inaktives Mitglied**</item>
@@ -290,10 +271,6 @@
         <item quantity="other">%d Tagen</item>
         <item quantity="one">einem Tag</item>
     </plurals>
-    <plurals name="live_viewers_viewers">
-        <item quantity="other">Zuschauer</item>
-        <item quantity="one">Zuschauer</item>
-    </plurals>
     <plurals name="max_uses_description_mobile_maxUses">
         <item quantity="other">%d Verwendungen</item>
         <item quantity="zero">Unendlich verwendbar</item>
@@ -321,10 +298,6 @@
         <item quantity="other">%d neue Nachrichten</item>
         <item quantity="one">1 neue Nachricht</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d Tage</item>
-        <item quantity="one">einen Tag</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d Kanäle</item>
         <item quantity="one">%d Kanal</item>
@@ -342,10 +315,6 @@
         <item quantity="other">diese Nachrichten</item>
         <item quantity="one">diese Nachricht</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** Server sind aufgrund einer vorübergehenden Störung nicht verfügbar.</item>
-        <item quantity="one">**1** Server ist aufgrund einer vorübergehenden Störung nicht verfügbar.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d Monate</item>
         <item quantity="one">1 Monat</item>
diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml
index 793f3b06cf..75b91ede7c 100644
--- a/com.discord/res/values-de/strings.xml
+++ b/com.discord/res/values-de/strings.xml
@@ -58,10 +58,8 @@
     <string name="activity_invite_private">"Du kannst keine Einladung senden. Entweder bist du gerade unsichtbar oder du verbirgst deinen Spielstatus.
 Wenn du an deinen Einstellungen nichts ändern willst, kannst du dich auch einladen lassen."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Alles klar!</string>
-    <string name="activity_panel_go_live_hotspot_header">Geh live, um dein Gameplay direkt an deine Freunden zu übertragen!</string>
+    <string name="activity_panel_go_live_hotspot_header">Mit Go Live kannst du dein Gameplay direkt mit deinen Freunden teilen!</string>
     <string name="activity_panel_go_live_tooltip">Live gehen</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Dieser Server verfügt über keine Sprachkanäle über die du streamen könntest.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Du kannst auf diesem Sprachkanal nicht streamen.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Navigiere zu einem Server, um den Stream zu starten.</string>
     <string name="add">Hinzufügen</string>
     <string name="add_a_comment_optional">Kommentar hinzufügen (optional)</string>
@@ -156,7 +154,6 @@ Mit dieser Berechtigung ist vorsichtig umzugehen."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Läuft bei dir!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Zur Bibliothek</string>
     <string name="application_entitlement_code_redemption_invalid">Der Code ist ungültig.</string>
-    <string name="application_entitlement_code_redemption_prompt">Hast du einen Code für ein Spiel? Gib ihn hier ein:</string>
     <string name="application_entitlement_code_redemption_redeem">Einlösen</string>
     <string name="application_filter_name_linux">Alle Dateien</string>
     <string name="application_filter_name_macos">Anwendungen</string>
@@ -381,7 +378,6 @@ Mit dieser Berechtigung ist vorsichtig umzugehen."</string>
     <string name="application_store_view_all_news">Alle Neuigkeiten anzeigen</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Um diesen DLC spielen zu können, musst du %1$s auf Discord haben. [Hier erfährst du mehr zu DLCs.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Herunterladbare Inhalte</string>
-    <string name="application_store_warning_early_access_description">Dieses Spiel macht Spaß (finden wir zumindest), seine Inhalte sind aber eventuell begrenzt, es könnte verschiedene Bugs haben oder sich irgendwie unfertig anfühlen. [Hier erfährst du mehr zum Early Access.](%1$s)</string>
     <string name="application_store_warning_requires_desktop_app_description">Um dieses Spiel spielen zu können, musst du die Discord $[Desktop-App](downloadHook) installiert haben.</string>
     <string name="application_store_warning_requires_desktop_app_title">Desktop-App erforderlich</string>
     <string name="application_store_warning_restricted_in_region_description">Dieses Spiel ist nicht verfügbar in deinem Land. [Hier erfährst du mehr zu Länderbeschränkungen.](%1$s)</string>
@@ -504,7 +500,6 @@ aber wenn es sein muss, muss es sein."</string>
     <string name="billing_error_section_card">Huch, sind das die richtigen Karteninformationen? Bitte fülle die Felder erneut aus!</string>
     <string name="billing_history">Rechnungsverlauf</string>
     <string name="billing_legal_mumbo_jumbo">Kleingedrucktes Kauderwelsch</string>
-    <string name="billing_legal_mumbo_jumbo_label">Ich stimme den [Nutzungsbedingungen des Discord Store](%1$s) zu.</string>
     <string name="billing_no_payment_method">Keine Zahlungsart gespeichert</string>
     <string name="billing_no_payment_method_description">Speichere eine Zahlungsart, um Käufe schneller abzuschließen.</string>
     <string name="billing_pay_for_it_with">Bezahlen mit</string>
@@ -512,12 +507,7 @@ aber wenn es sein muss, muss es sein."</string>
     <string name="billing_payment_breakdown_total">Summe</string>
     <string name="billing_payment_history">Transaktionsverlauf</string>
     <string name="billing_payment_premium">Dein Abonnement</string>
-    <string name="billing_payment_premium_legalese_monthly">Wenn du ein %1$s-Abonnement abschließt, stimmst du automatisch unseren [Nutzungsbedingungen für den Store](%2$s) zu. Das %1$s-Abonnement setzt sich automatisch fort. Du ermächtigst Discord, sofort und danach monatlich %3$s unter der angegebenen Zahlungsart abzubuchen, bis du dein Abonnement kündigst. Du kannst dein Abonnement jederzeit kündigen.</string>
-    <string name="billing_payment_premium_legalese_yearly">Wenn du ein %1$s-Abonnement abschließt, stimmst du automatisch unseren [Nutzungsbedingungen für den Store](%2$s) zu. Das %1$s-Abonnement setzt sich automatisch fort. Du ermächtigst Discord, sofort und danach jährlich %3$s unter der angegebenen Zahlungsart abzubuchen, bis du dein Abonnement kündigst. Du kannst dein Abonnement jederzeit kündigen.</string>
     <string name="billing_payment_sources">Zahlungsarten</string>
-    <string name="billing_payment_table_header_amount">BETRAG</string>
-    <string name="billing_payment_table_header_date">DATUM</string>
-    <string name="billing_payment_table_header_description">BESCHREIBUNG</string>
     <string name="billing_premium_refund_text">Du kannst innerhalb von %1$s Tagen nach Kaufdatum eine Rückerstattung beantragen. [Unser liebenswürdiger Helpdesk steht dir stets zu Diensten.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Dein Kauf kann leider nicht rückerstattet werden. Rückerstattungen sind nur innerhalb von %1$s Tagen nach Kaufdatum möglich.</string>
     <string name="billing_price_per_month">%1$s/Monat</string>
@@ -527,9 +517,7 @@ aber wenn es sein muss, muss es sein."</string>
     <string name="billing_purchase_details_header">Kaufdetails</string>
     <string name="billing_refund_header">Fragen zu deinem Kauf?</string>
     <string name="billing_refund_play_time_never_played">Noch nicht gespielt</string>
-    <string name="billing_refund_play_time_subheader">SPIELZEIT</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">KAUFDATUM</string>
     <string name="billing_refund_report_a_problem">Ein Problem melden</string>
     <string name="billing_refund_request_button">Rückerstattung fordern</string>
     <string name="billing_sales_tax_added">Aufgrund deiner Rechnungsadresse wurden %1$s Mehrwertsteuer hinzugefügt.</string>
@@ -777,7 +765,6 @@ indem du auf den winzig kleinen Text unten klickst."</string>
     <string name="connection_enter_code">Gib den Code so ein, wie er auf deinem Bildschirm angezeigt wird</string>
     <string name="connection_invalid_pin">Ungültigen PIN-Code eingegeben</string>
     <string name="connection_login_with">oder anmelden mit</string>
-    <string name="connection_problems_body">Du kannst hier den [Serverstatus](%1$s) prüfen oder uns über Twitter [@discordapp](%2$s) erreichen.</string>
     <string name="connection_status_authenticating">Authentifiziere</string>
     <string name="connection_status_awaiting_endpoint">Auf Endpunkt warten</string>
     <string name="connection_status_connected">Verbunden</string>
@@ -822,7 +809,7 @@ indem du auf den winzig kleinen Text unten klickst."</string>
     <string name="create_category">Kategorie erstellen</string>
     <string name="create_channel">Kanal erstellen</string>
     <string name="create_group_dm">Gruppenchat erstellen</string>
-    <string name="create_instant_invite">Soforteinladung erstellen</string>
+    <string name="create_instant_invite">Einladung erstellen</string>
     <string name="create_link">Link erstellen</string>
     <string name="create_or_join_modal_header">Oh, noch ein Server, wie?</string>
     <string name="create_server_button_body">Erstelle einen neuen Server und lade deine Freunde ein. Kostenlos!</string>
@@ -877,8 +864,6 @@ indem du auf den winzig kleinen Text unten klickst."</string>
     <string name="data_privacy_update_consents_failed">Wir konnten deine Einstellungen zur Datennutzung nicht übernehmen. Bitte versuch es später noch einmal.</string>
     <string name="date">Datum</string>
     <string name="de">Deutsch</string>
-    <string name="deafen">Lautsprecher deaktivieren</string>
-    <string name="deafen_members">Mitglieder taub schalten</string>
     <string name="deauthorize">Deautorisieren</string>
     <string name="deauthorize_app">Anwendung deautorisieren</string>
     <string name="debug">Debuggen</string>
@@ -937,7 +922,6 @@ indem du auf den winzig kleinen Text unten klickst."</string>
     <string name="disable_email_notifications_failed_suggestion">E-Mail-Benachrichtigungen sind vielleicht schon deaktiviert oder diese E-Mail-Adresse ist nicht mehr mit einem Discord-Account verknüpft.</string>
     <string name="disable_integration_title">Synchronisation deaktivieren</string>
     <string name="disable_integration_twitch_body">Bei deaktivierter Synchronisation wird die ausgewählte Aktion für abgelaufene Abonnenten bei allen Abonnenten ausgeführt.</string>
-    <string name="disable_integration_youtube_body">Bei deaktivierter Synchronisation wird die ausgewählte Aktion für abgelaufene Sponsoren bei allen Sponsoren ausgeführt.</string>
     <string name="disable_notifications_description">Alle Desktop-Benachrichtigungen werden deaktiviert.</string>
     <string name="disable_notifications_label">Benachrichtigungen deaktivieren</string>
     <string name="disable_sounds_description">Alle Soundeffekte werden deaktiviert.</string>
@@ -953,7 +937,6 @@ indem du auf den winzig kleinen Text unten klickst."</string>
     <string name="discord_desc_long">Ein kostenloser und sicherer Chat für Gamer – für Computer und Smartphone.</string>
     <string name="discord_desc_short">Sprach- &amp; Text-Teamchat</string>
     <string name="dismiss">Verwerfen</string>
-    <string name="dispatch_error_modal_body">Hier ist etwas schiefgelaufen. Wenn das Problem bestehen bleibt, erstelle ein Support-Ticket und kopiere die untenstehende Fehlermeldung hinein.</string>
     <string name="dispatch_error_modal_error_label">Fehlermeldung (Du musst mich kopieren und einfügen)</string>
     <string name="dispatch_error_modal_header">Discord Dispatch-Fehler</string>
     <string name="dispatch_error_modal_open_ticket">Ticket erstellen</string>
@@ -1030,7 +1013,6 @@ indem du auf den winzig kleinen Text unten klickst."</string>
     <string name="enable_streamer_mode_label">Streamer-Modus aktivieren</string>
     <string name="enable_twitch_emoji_sync">Erlaube synchronisierten Abonnenten, deine benutzerdefinierten Twitch-Emojis in Discord zu verwenden.</string>
     <string name="enter_email_body">Um deine E-Mail-Adresse zu verifizieren, musst du zuerst eine E-Mail-Adresse eingeben.</string>
-    <string name="enter_phone_description">Bitte gib deine Mobilfunknummer an. Du erhältst anschließend eine SMS mit dem Bestätigungscode.</string>
     <string name="enter_phone_title">Telefonnummer eingeben</string>
     <string name="enter_vanity_url">Vanity-URL eingeben</string>
     <string name="errors_action_to_take">Wir haben den Fehler aufgespürt und setzen uns sofort daran.</string>
@@ -1065,7 +1047,7 @@ indem du auf den winzig kleinen Text unten klickst."</string>
     <string name="file_rate_mb">%1$s MB/s</string>
     <string name="file_size_gb">%1$s GB</string>
     <string name="file_size_mb">%1$s MB</string>
-    <string name="file_upload_limit_premium">50 MB</string>
+    <string name="file_upload_limit_premium_tier_1">50 MB</string>
     <string name="file_upload_limit_standard">8 MB</string>
     <string name="filter_mentions">Erwähnungen filtern</string>
     <string name="filter_options">Filteroptionen</string>
@@ -1086,8 +1068,6 @@ als das AFK-Timeout zulässt. Das betrifft keine Mitglieder, die per Browser ver
     <string name="form_help_attenuation">"Verringert die Lautstärke anderer Programme um die angegebene Prozentzahl, wenn jemand spricht.
 Setze den Wert auf 0 %%, um diese Funktion zu deaktivieren."</string>
     <string name="form_help_automatic_vad">Wenn die Anzeige beständig grün ist, überträgt Discord deine wohlklingende Stimme.</string>
-    <string name="form_help_bitrate">"**ALLE BITS!** Wenn du nicht gerade das Gehör einer Fledermaus hast, lohnt es sich nicht, die Bitrate von %1$s kbps zu überschreiten.
-Und mobile Nutzer oder Nutzer mit einer schlechten Netzwerkverbindung haben davon mehr Nachteile als Vorteile."</string>
     <string name="form_help_certified_voice_processing">"Bei Einsatz eines Discord-zertifizierten Mikrofons werden bestimmte Stimmverarbeitungsfunktionen nicht mehr von
 Discord selbst ausgeführt, sondern vom Mikrofon."</string>
     <string name="form_help_channel_permissions">Durch das Auswählen von Rollen werden automatisch grundlegende Berechtigungen für diesen Kanal erstellt.</string>
@@ -1100,11 +1080,6 @@ um [diesen Wahnsinn](%1$s) zu vermeiden.**"</string>
 eine Benachrichtigung für jede Nachricht, die auf diesem Server gesendet wird, empfangen oder nicht. Wir empfehlen, diese Option bei einem öffentlichen Discord auf @Erwähnungen zu beschränken"</string>
     <string name="form_help_explicit_content_filter">"Durchsucht und löscht automatisch alle Nachrichten mit anstößigem Inhalt. Bitte wähle, wie stark der Filter bei Mitgliedern
 deines Servers greifen soll. **Wir empfehlen einen Filter für öffentliche Discord Server.**"</string>
-    <string name="form_help_instant_invite_channel">"Wenn ein Kanal ausgewählt ist, wird ein Soforteinladungslink mit dem Widget generiert,
-ansonsten werden nur Online-Mitglieder und Sprachkanäle angezeigt."</string>
-    <string name="form_help_last_seen">"Diese Aktion wird **%1$s** entfernen.
-Betroffen sind Mitglieder, welche **%2$s** nicht online waren und denen keine Rolle zugewiesen ist.
-Sie können dem Server über eine Soforteinladung erneut beitreten."</string>
     <string name="form_help_legacy_subsystem">"Bei bestimmten Audio-Hardwaretreibern treten Probleme bei der Verwendung des modernen Audio-Subsystems
 deines Betriebssystems auf. Aktiviere dieses Kontrollkästchen, um ein altes Audio-Subsystem zu verwenden."</string>
     <string name="form_help_nsfw">"Benutzer müssen bestätigen, dass sie volljährig sind, um die Inhalte dieses Kanals sehen zu können.
@@ -1114,7 +1089,6 @@ Falls du Zugriff auf die Benutzernamen deiner Seite hast, kannst du dynamisch &a
     <string name="form_help_qos">"Weist deinen Router darauf hin, dass die Pakete, die Discord überträgt, eine hohe Priorität haben.
 Einige Router oder Internetanbieter können sich merkwürdig verhalten, wenn diese Option aktiviert ist."</string>
     <string name="form_help_slowmode">Mitglieder dürfen ihre nächste Nachricht jeweils nur nach dieser festgelegten Zeit senden, außer sie haben die Berechtigung, den Kanal oder Nachrichten zu verwalten.</string>
-    <string name="form_help_system_channel">Sendet eine Nachricht in diesen Kanal, wenn jemand dem Server beitritt. Die Nachrichten sind zufällig. Diese Option kann jederzeit ausgeschaltet werden.</string>
     <string name="form_help_temporary">Wenn keine Rolle zugewiesen ist, werden Mitglieder bei Trennung der Verbindung automatisch gekickt.</string>
     <string name="form_help_user_limit">"Begrenzt die Anzahl der Teilnehmer, die sich mit diesem Sprachkanal verbinden können. Benutzer mit der Berechtigung
 **Mitglieder verschieben** können die Begrenzung ignorieren und diesem Kanal trotzdem Teilnehmer hinzufügen."</string>
@@ -1158,8 +1132,8 @@ Direktnachrichten senden können. Ist einem Mitglied eine Rolle zugewiesen, ist
     <string name="form_label_input_mode">Eingabemodus</string>
     <string name="form_label_input_sensitivty">Mikrofonempfindlichkeit</string>
     <string name="form_label_input_volume">Eingabelautstärke</string>
-    <string name="form_label_instant_invite">Soforteinladung eingeben</string>
-    <string name="form_label_instant_invite_channel">Kanal für Soforteinladungen</string>
+    <string name="form_label_instant_invite">Einladung eingeben</string>
+    <string name="form_label_instant_invite_channel">Kanal für Einladungen</string>
     <string name="form_label_last_seen">Zuletzt online</string>
     <string name="form_label_local_mute">Lokal stummschalten</string>
     <string name="form_label_max_age">Läuft ab nach</string>
@@ -1227,7 +1201,6 @@ Direktnachrichten senden können. Ist einem Mitglied eine Rolle zugewiesen, ist
     <string name="form_label_suppress_everyone">**@everyone** und **@here** unterdrücken</string>
     <string name="form_label_synced_role">Synchronisierte Rolle</string>
     <string name="form_label_synced_subs">Synchronisierte Abonnenten</string>
-    <string name="form_label_system_channel">Willkommensnachrichten-Kanal</string>
     <string name="form_label_temporary">Temporäre Mitgliedschaft</string>
     <string name="form_label_tts">Text-zu-Sprache</string>
     <string name="form_label_tts_notifications">Text-zu-Sprache-Benachrichtigungen</string>
@@ -1287,7 +1260,6 @@ um die Mikrofonempfindlichkeit beobachten zu können."</string>
     <string name="game_action_button_game_not_detected">Spiel nicht gefunden</string>
     <string name="game_action_button_install">Installieren</string>
     <string name="game_action_button_locate">Suchen</string>
-    <string name="game_action_button_login_to_buy">Zum Kaufen einloggen</string>
     <string name="game_action_button_now_playing">Spielt gerade</string>
     <string name="game_action_button_paused">Angehalten</string>
     <string name="game_action_button_play">Spielen</string>
@@ -1326,7 +1298,6 @@ um die Mikrofonempfindlichkeit beobachten zu können."</string>
     <string name="game_feed_activity_recently_played">Kürzlich gespielt</string>
     <string name="game_feed_activity_streaming_twitch">Streamt auf Twitch</string>
     <string name="game_feed_current_header_title">Spielt gerade</string>
-    <string name="game_feed_settings_visibility">In „Spiele“ anzeigen</string>
     <string name="game_feed_unknown_player">Unbekannter Spieler</string>
     <string name="game_feed_user_played_days_ago">Hat vor %1$s %2$s gespielt</string>
     <string name="game_feed_user_played_hours_ago">Hat vor %1$s %2$s gespielt</string>
@@ -1394,7 +1365,7 @@ um die Mikrofonempfindlichkeit beobachten zu können."</string>
     <string name="generate_a_new_link">Neuen Link generieren</string>
     <string name="get_started">Los geht’s</string>
     <string name="gif_auto_play_label">GIFs automatisch abspielen, wenn Discord im Vordergrund ist.</string>
-    <string name="go_live_changelog_guilds">Du kannst jetzt in den folgenden Servern Live gehen: %1$s</string>
+    <string name="go_live_hardware_acceleration_unavailable">Winzige Warnung: Wir können keine Hardwarebeschleunigung auf deinem Computer erkennen. Unter Umständen können Probleme mit Go Live auftreten.</string>
     <string name="go_live_listen">Hör zu!</string>
     <string name="go_live_look">Sieh mal!</string>
     <string name="go_live_modal_application_form_title">Was du streamst</string>
@@ -1407,7 +1378,7 @@ um die Mikrofonempfindlichkeit beobachten zu können."</string>
     <string name="go_live_modal_select_channel_form_title">Wähle einen Sprachkanal</string>
     <string name="go_live_modal_select_channel_placeholder">Suche nach Sprachkanälen</string>
     <string name="go_live_modal_title">Live gehen</string>
-    <string name="go_live_premium_early_access">Als Danke für deine Nitro Unterstützung kannst du jetzt vor allen Anderen deine Spiele mit Go Live streamen!</string>
+    <string name="go_live_video_drivers_outdated">Deine Videotreiber sind veraltet. Installiere ein Update, um die Leistung von Go Live zu verbessern.</string>
     <string name="grant_temporary_membership">Vorübergehende Mitgliedschaft erlauben</string>
     <string name="group">Gruppe</string>
     <string name="group_dm_add_friends">Freunde zu Direktnachricht hinzufügen</string>
@@ -1484,8 +1455,6 @@ um die Mikrofonempfindlichkeit beobachten zu können."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**%1$s** %2$s **erteilt**</string>
     <string name="guild_settings_audit_log_channel_position_change">Von **%1$s** nach **%2$s** verschoben</string>
     <string name="guild_settings_audit_log_channel_position_create">In Position **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) hat den Textkanal $[**%2$s**](targetHook) erstellt</string>
     <string name="guild_settings_audit_log_channel_topic_change">Thema zu **%1$s** geändert</string>
     <string name="guild_settings_audit_log_channel_topic_create">Thema auf **%1$s** gesetzt</string>
@@ -1534,8 +1503,6 @@ um die Mikrofonempfindlichkeit beobachten zu können."</string>
     <string name="guild_settings_audit_log_load_more">Mehr laden</string>
     <string name="guild_settings_audit_log_member_ban_add">$[**%1$s**](userHook) hat $[**%2$s**](targetHook) gebannt</string>
     <string name="guild_settings_audit_log_member_ban_remove">$[**%1$s**](userHook) hat $[**%2$s**](targetHook) entbannt</string>
-    <string name="guild_settings_audit_log_member_deaf_off">**Taubschaltung aufgehoben**</string>
-    <string name="guild_settings_audit_log_member_deaf_on">**Taubschaltung aktiviert**</string>
     <string name="guild_settings_audit_log_member_kick">$[**%1$s**](userHook) hat $[**%2$s**](targetHook) gekickt</string>
     <string name="guild_settings_audit_log_member_mute_off">**Stummschaltung aufgehoben**</string>
     <string name="guild_settings_audit_log_member_mute_on">**Stummschaltung aktiviert**</string>
@@ -1580,6 +1547,8 @@ um die Mikrofonempfindlichkeit beobachten zu können."</string>
     <string name="guild_settings_filter_all_actions">Alle Aktionen</string>
     <string name="guild_settings_filter_all_users">Alle Benutzer</string>
     <string name="guild_settings_filter_user">Nach Benutzer filtern</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">Go-Live-Streams mit 720p/60fps</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">Go-Live-Streams mit 1080p/60fps</string>
     <string name="guild_settings_label_audit_log">Audit-Log</string>
     <string name="guild_settings_label_audit_log_empty_body">Sobald Moderatoren anfangen, zu moderieren, kannst du hier die Moderation moderieren.</string>
     <string name="guild_settings_label_audit_log_empty_title">Noch keine Protokolle vorhanden</string>
@@ -1598,7 +1567,6 @@ Falls du Zugriff auf die Benutzernamen deiner Seite hast, kannst du dynamisch &a
     <string name="guild_verification_text_account_age">Dein Account muss mindestens %1$s Minuten alt sein, um Nachrichten auf diesem Server senden zu können.</string>
     <string name="guild_verification_text_member_age">Du musst seit mindestens %1$s Minuten Mitglied sein, um auf diesem Server Nachrichten senden zu können.</string>
     <string name="guild_verification_text_not_claimed">Du musst deinen Account beanspruchen und verifizieren, bevor du auf diesem Server Nachrichten senden kannst.</string>
-    <string name="guild_verification_text_not_phone_verified">Du musst deine Identität per Handy bestätigen, bevor du auf diesem Server Nachrichten senden kannst.</string>
     <string name="guild_verification_text_not_verified">Du musst deinen Account verifizieren, bevor du auf diesem Server Nachrichten senden kannst.</string>
     <string name="guild_verified">Verifiziert</string>
     <string name="hardware_acceleration">Hardwarebeschleunigung</string>
@@ -1611,7 +1579,7 @@ Falls du Zugriff auf die Benutzernamen deiner Seite hast, kannst du dynamisch &a
     <string name="help_role_locked_mine">Rolle ist gesperrt, da es deine höchste Rolle ist. Bitte frag jemanden mit einem höheren Rang oder den Servereigentümer um Hilfe.</string>
     <string name="help_singular_permission">Du kannst diese Berechtigung nicht ändern, denn wenn du sie entfernst, würde sie auch von dir entfernt werden.</string>
     <string name="hide_instant_invites_description">Empfohlen, wenn du nicht willst, dass fremde Personen auf deine Discord-Server zugreifen.</string>
-    <string name="hide_instant_invites_label">Soforteinladungslinks verbergen</string>
+    <string name="hide_instant_invites_label">Einladungslinks verbergen</string>
     <string name="hide_muted">%1$s Stummgeschaltete ausblenden</string>
     <string name="hide_muted_channels">Stumme Kanäle ausblenden</string>
     <string name="hide_personal_information_description">Versteckt E-Mail-Adressen, verbundene Accounts und Notizen und anonymisiert Discord-Tags.</string>
@@ -1759,13 +1727,13 @@ Falls du Zugriff auf die Benutzernamen deiner Seite hast, kannst du dynamisch &a
     <string name="input_mode_ptt_release_delay">Push-to-Talk-Verzögerung nach Loslassen der Taste</string>
     <string name="input_mode_vad">Sprachaktivierung</string>
     <string name="install_location_main">Hauptinstallationsverzeichnis</string>
-    <string name="instant_invite">Soforteinladung</string>
+    <string name="instant_invite">Einladung</string>
     <string name="instant_invite_accept">Einladung annehmen</string>
-    <string name="instant_invite_accepted">Soforteinladung angenommen</string>
-    <string name="instant_invite_accepting">Soforteinladung annehmen</string>
+    <string name="instant_invite_accepted">Einladung angenommen</string>
+    <string name="instant_invite_accepting">Einladung annehmen</string>
     <string name="instant_invite_ask_for_new_invite">Frage nach einer neuen!</string>
     <string name="instant_invite_ask_user_for_new_invite">Frag %1$s nach einer neuen Einladung!</string>
-    <string name="instant_invite_expired">Die Soforteinladung ist ungültig oder abgelaufen.</string>
+    <string name="instant_invite_expired">Die Einladung ist ungültig oder abgelaufen.</string>
     <string name="instant_invite_expires">Läuft ab</string>
     <string name="instant_invite_failed_to_generate">Erstellung eines Einladungslinks fehlgeschlagen.</string>
     <string name="instant_invite_generate">Generieren</string>
@@ -1783,16 +1751,15 @@ Falls du Zugriff auf die Benutzernamen deiner Seite hast, kannst du dynamisch &a
     <string name="instant_invite_regenerate">Erneut generieren</string>
     <string name="instant_invite_resolved_body">Du wurdest zu **%1$s** auf **%2$s** eingeladen.</string>
     <string name="instant_invite_resolved_title">Hallo du!</string>
-    <string name="instant_invite_resolving">Soforteinladung zuordnen</string>
+    <string name="instant_invite_resolving">Einladung zuordnen</string>
     <string name="instant_invite_uses">Verwendungen</string>
     <string name="instant_invite_you_are_already_a_member_of">Du bist bereits Mitglied von</string>
     <string name="instant_invite_you_have_been_invited_to_join">Du wurdest eingeladen, beizutreten:</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** hat dich zum Beitritt eingeladen</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Du wurdest in einen Gruppenchat eingeladen, und zwar von</string>
-    <string name="instant_invites">Soforteinladungen</string>
+    <string name="instant_invites">Einladungen</string>
     <string name="integration_settings">Integrationseinstellungen</string>
     <string name="integrations">Integrationen</string>
-    <string name="integrations_header">Verbundene Twitch-/YouTube-Gaming-Accounts</string>
     <string name="integrations_pro_tip">Für mehr Integrationen schau dir [Discords StreamKit](%1$s) an.</string>
     <string name="internal_server_error">Ein interner Serverfehler ist aufgetreten. Bitte versuche es erneut.</string>
     <string name="invalid_animated_emoji_body">Dieses Emoji funktioniert nicht, weil es animiert ist. Hol dir Discord Nitro, um deine Träume von animierten Emojis zu erfüllen.</string>
@@ -1904,13 +1871,13 @@ Willst du mehr über Discord erfahren?"</string>
     <string name="join_afk_channel_body">Du scheinst den AFK-Kanal betreten zu haben. Du kannst in diesem Kanal nicht sprechen.</string>
     <string name="join_call">Anruf beitreten</string>
     <string name="join_server">Beitreten</string>
-    <string name="join_server_button_body">Gib eine Soforteinladung ein und tritt dem Server deines Freundes bei.</string>
+    <string name="join_server_button_body">Gib eine Einladung ein und tritt dem Server deines Freundes bei.</string>
     <string name="join_server_button_cta">Server beitreten</string>
     <string name="join_server_button_cta_mobile">Server über Einladungslink beitreten</string>
     <string name="join_server_button_cta_mobile_desc">Du hast einen Einladungscode oder -link? Verwende ihn hier!</string>
     <string name="join_server_button_cta_named">%1$s beitreten</string>
-    <string name="join_server_description">Gib unten eine Soforteinladung ein, um einem existierenden Server beizutreten. Die Einladung sieht ungefähr so aus:</string>
-    <string name="join_server_description_mobile">Gib oben eine Soforteinladung ein, um einem bestehenden Server beizutreten.</string>
+    <string name="join_server_description">Gib unten eine Einladung ein, um einem existierenden Server beizutreten. Die Einladung sieht ungefähr so aus:</string>
+    <string name="join_server_description_mobile">Gib oben eine Einladung ein, um einem bestehenden Server beizutreten.</string>
     <string name="join_server_title">Tritt einem Server bei</string>
     <string name="join_stream">Stream beitreten</string>
     <string name="join_video_call">Videoanruf beitreten</string>
@@ -1945,7 +1912,6 @@ Willst du mehr über Discord erfahren?"</string>
     <string name="keybind_description_modal_search_emojis">Emojiauswahl wechseln</string>
     <string name="keybind_description_modal_subtitle">Lerne die Kunst der Tastenkombos und werde Meister der Tasten!</string>
     <string name="keybind_description_modal_title">Tastenkombinationen</string>
-    <string name="keybind_description_modal_toggle_deafen">Lautsprecher ein-/ausschalten</string>
     <string name="keybind_description_modal_toggle_help">Hilfe anzeigen</string>
     <string name="keybind_description_modal_toggle_hotkeys">Hotkeys wechseln</string>
     <string name="keybind_description_modal_toggle_mentions">Erwähnungsfenster ein-/ausblenden</string>
@@ -1961,7 +1927,6 @@ Willst du mehr über Discord erfahren?"</string>
     <string name="keybind_description_push_to_talk_priority">"Gedrückt halten, um vorübergehend dein Mikrofon zu aktivieren, während du Push-to-Talk verwendest.
 Andere Sprecher, die keine Very Important Speaker sind, werden leiser gestellt,
 wenn du sprichst."</string>
-    <string name="keybind_description_toggle_deafen">Schaltet deine Lautsprecher ein/aus. Schaltet außerdem dein Mikrofon aus, während die Lautsprecher deaktiviert sind.</string>
     <string name="keybind_description_toggle_mute">Schaltet dein Mikrofon ein/aus.</string>
     <string name="keybind_description_toggle_overlay">Aktiviert/deaktiviert Overlay.</string>
     <string name="keybind_description_toggle_overlay_input_lock">Aktiviert/deaktiviert interaktives Overlay.</string>
@@ -1971,7 +1936,6 @@ wenn du sprichst."</string>
     <string name="keybind_push_to_mute">Push-to-Mute</string>
     <string name="keybind_push_to_talk">Push-to-Talk (Normal)</string>
     <string name="keybind_push_to_talk_priority">Push-to-Talk (Very Important)</string>
-    <string name="keybind_toggle_deafen">Lautsprecher ein-/ausschalten</string>
     <string name="keybind_toggle_mute">Mikrofon ein-/ausschalten</string>
     <string name="keybind_toggle_overlay">Overlay ein-/ausblenden</string>
     <string name="keybind_toggle_overlay_input_lock">Overlay-Sperre (de-)aktivieren</string>
@@ -2017,9 +1981,8 @@ wenn du sprichst."</string>
     <string name="link_your_xbox_account_1">Verbinde deinen Xbox-Account mit Discord, um anzeigen zu lassen, welche Spiele du spielst.</string>
     <string name="link_your_xbox_account_2">Discord ist eine kostenlose und sichere Sprach- und Textchat-App für Gamer – für Computer und Smartphone.</string>
     <string name="listening_to">Hört **%1$s** zu</string>
-    <string name="live_beta_description">Willkommen beim Stream! Live gehen ist in der Beta. Sorry, falls es noch nicht ganz rund läuft.</string>
+    <string name="live_beta_description">Willkommen beim Stream! Go Live ist noch in der Beta. Sorry, falls es noch nicht ganz rund läuft.</string>
     <string name="live_on_twitch">Live auf Twitch</string>
-    <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Das Bild konnte nicht geladen werden.
 Bitte versuche es erneut."</string>
     <string name="load_more_messages">Mehr Nachrichten laden</string>
@@ -2126,7 +2089,6 @@ indem sie eine Nachricht mit @everyone oder @here beginnen."</string>
     <string name="mfa_sms_receive_code">Auth-Code per SMS erhalten</string>
     <string name="mfa_sms_remove">SMS-Authentifizierung entfernen</string>
     <string name="mfa_sms_resend">SMS-Nachricht erneut senden?</string>
-    <string name="microphone_permission_error">Mikrofon konnte nicht aktiviert werden, da die Berechtigungsabfrage abgelehnt wurde.</string>
     <string name="minimum_size">Mindestgröße: **%1$sx%1$s**</string>
     <string name="missed_an_update">Hast du ein Update verpasst? [Schau dir unsere früheren Änderungsprotokolle an](%1$s)</string>
     <string name="missing_entitlement_modal_body">Discord kann **%1$s** nicht mehr für dich starten. Dies kann daran liegen, dass dein Nitro-Abonnement abgelaufen ist, dir der Kauf rückerstattet wurde oder dass **%1$s** aus dem Discord Store entfernt wurde. [Hier findest du weitere Informationen und Kontaktmöglichkeiten für den Support.](%2$s)</string>
@@ -2201,14 +2163,11 @@ geänderten Nutzungsbedingungen und Datenschutzerklärung."</string>
     <string name="no_emoji_title">Kein Emoji</string>
     <string name="no_input_devices">Keine Eingabegeräte</string>
     <string name="no_input_devices_detected">Es wurde kein Aufnahmegerät erkannt. Schließ bitte eines an und versuch es nochmal.</string>
-    <string name="no_instant_invite">Keine Soforteinladung</string>
-    <string name="no_integrations">[Verbinde](onConnect) deinen Twitch- oder YouTube-Gaming-Account, um deine Abonnenten/Sponsoren mit einer Rolle zu synchronisieren</string>
+    <string name="no_instant_invite">Keine Einladungen</string>
     <string name="no_integrations_body">Protokoll FR3UND5CH4FT kann nur vom Discord-Client ausgeführt werden</string>
     <string name="no_integrations_label">Keine Integrationen</string>
-    <string name="no_invites_body">"Fühlst du dich ziellos? Wie ein Papierflugzeug, das durch die Lüfte treibt?
-Lade ein paar Freunde ein, indem du einen Soforteinladungslink erstellst!"</string>
-    <string name="no_invites_caption">Du hast noch keine Soforteinladungen.</string>
-    <string name="no_invites_label">Es gibt noch keine Soforteinladungen.</string>
+    <string name="no_invites_caption">Du hast noch keine Einladungen.</string>
+    <string name="no_invites_label">Es gibt noch keine Einladungen.</string>
     <string name="no_mail_account_description">Schick dein Feedback bitte an support@discordapp.com – wir haben deine Nutzerinformationen in die Zwischenablage kopiert.</string>
     <string name="no_mail_account_title">Kein E-Mail-Konto</string>
     <string name="no_mic_body">Wie du den Zugriff auf dein Mikrofon aktivieren kannst, erfährst du im Discord-Hilfecenter.</string>
@@ -2226,7 +2185,6 @@ angepinnten Nachrichten."</string>
     <string name="no_reactions_header">Keine Reaktionen</string>
     <string name="no_recent_mentions">Und am Anfang … herrschte Stille.</string>
     <string name="no_send_messages_permission_placeholder">Du hast keine Berechtigung, in diesem Kanal Nachrichten zu versenden.</string>
-    <string name="no_system_channel">Keine Willkommensnachrichten für neue Mitglieder</string>
     <string name="no_text">Nein</string>
     <string name="no_thanks">Nein danke</string>
     <string name="no_user_limit">Kein Limit</string>
@@ -2238,7 +2196,6 @@ angepinnten Nachrichten."</string>
     <string name="note">Notiz</string>
     <string name="note_placeholder">Hier klicken, um eine Notiz hinzuzufügen</string>
     <string name="note_placeholder_mobile">Hier tippen, um eine Notiz hinzuzufügen</string>
-    <string name="notice_application_test_mode">Der Testmodus ist momentan für **%1$s** aktiv. Du siehst unveröffentlichte SKUs, ohne dafür zahlen zu müssen.</string>
     <string name="notice_application_test_mode_go_to_listing">Zur SKU</string>
     <string name="notice_connect_spotify">Verbinde deinen Spotify-Account, um deine Musik in deinem Status anzuzeigen!</string>
     <string name="notice_connection_conflict">Deine Verbindung zum Sprachchat wurde getrennt, weil du dich von einem anderen Standort aus verbunden hast.</string>
@@ -2249,7 +2206,6 @@ angepinnten Nachrichten."</string>
     <string name="notice_dispatch_error_disk_low">Du hast nicht genug Speicherplatz. %1$s werden benötigt, es sind aber nur %2$s verfügbar.</string>
     <string name="notice_dispatch_error_file_name_too_long">Ups! Die Dateien dieses Spiels haben Namen, die zu lang für Windows sind. Bitte wähle ein kürzeres Installationsverzeichnis.</string>
     <string name="notice_dispatch_error_invalid_drive">Ups! Das gewählte Installationsverzeichnis ist ungültig. Du hast %1$s gewählt.</string>
-    <string name="notice_dispatch_error_io_permission_denied">Wir konnten das Spiel nicht aktualisieren. Läuft es derzeit?</string>
     <string name="notice_dispatch_error_no_manifests">Ups! Offenbar gibt es keine Inhalte für dieses Spiel. Bitte wende dich an den Support.</string>
     <string name="notice_dispatch_error_not_entitled">Ups! Offenbar besitzt du dieses Spiel gar nicht. Bitte wende dich an den Support, wenn du denkst, dass ein Fehler vorliegt.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Offenbar hast du ein Installationsskript nicht zugelassen. Zur Installation des Spiels musst du zustimmen.</string>
@@ -2264,9 +2220,6 @@ angepinnten Nachrichten."</string>
     <string name="notice_native_apps">Du brauchst systemweites Push-to-Talk? Hol dir die Desktop-App!</string>
     <string name="notice_no_input_detected">Hm, sieht so aus, als würde Discord keine Aufnahme über dein Mikrofon erkennen. Lass uns das wieder in Ordnung bringen … gemeinsam.</string>
     <string name="notice_no_input_detected_help_link_text">Hilfe!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Du hast keinen Zugriff mehr auf Nitro. Upgrade dein Abonnement von Nitro Classic auf Nitro, um unbegrenzten Zugriff auf fantastische Spiele zu erhalten.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Du kannst Nitro-Spiele nur noch %1$s nutzen! Dein Zugriff endet am **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Danke dafür, dass du Nitro schon so lange unterstützt! Weil wir das wirklich zu schätzen wissen und dich echt gern haben, hast du jetzt bis zum %1$s Zugang zu den Nitro-Spielen.</string>
     <string name="notice_premium_promo_action">Probiere es aus</string>
     <string name="notice_premium_promo_message">Unterstütze die Entwicklung von Discord und erhalte tolle Vorteile!</string>
     <string name="notice_scheduled_maintenance">Discord wird am **%1$s** um **%2$s** Uhr geplante Wartungsarbeiten durchführen.</string>
@@ -2336,7 +2289,6 @@ Hast du einen Einladungslink von einem Freund bekommen? Gib deinen Einladungslin
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Overlay aktiviert</string>
     <string name="nux_post_reg_join_server_description">Gib dir das volle Discord-Erlebnis und tritt einem Server bei.</string>
     <string name="nux_post_reg_join_server_skip">Ich habe keine</string>
     <string name="nux_post_reg_join_server_title">Hast du eine Einladung?</string>
@@ -2380,16 +2332,11 @@ Falls du Probleme oder Fragen hast, lies einfach [diesen schicken Hilfeartikel!]
     <string name="overlay_menu_get_invite">Einladungslink holen</string>
     <string name="overlay_menu_open_discord">Discord öffnen</string>
     <string name="overlay_menu_switch_channels">Kanäle wechseln</string>
-    <string name="overlay_mobile_required">Aktiviere das mobile Overlay in den Discord Spracheinstellungen.</string>
-    <string name="overlay_mobile_toggle_desc">Wenn du mit dem Voice-Overlay verbunden bist, siehst du, wer spricht und erhältst Zugriff auf Shortcuts, während du andere Apps nutzt.</string>
     <string name="overlay_mobile_toggle_label">Mobiles Voice-Overlay aktivieren</string>
     <string name="overlay_mobile_unauthed">Diese Funktion kannst du in der Discord-App aktivieren.</string>
     <string name="overlay_news_go_live_body">Möchtest du mit deinen Freunden %1$s auf %2$s streamen?</string>
     <string name="overlay_news_go_live_cta">Live gehen</string>
-    <string name="overlay_news_text_pinning_body">Du kannst jetzt einen Discord-Textchat an dein Spiel anheften!</string>
-    <string name="overlay_news_text_pinning_tip">Tipp: Du kannst einen Chat positionieren, indem du $[pinIcon](pinHook) drückst.</string>
     <string name="overlay_news_text_pinning_title">Upgrade für Discord-Overlay</string>
-    <string name="overlay_no_results">Wir haben weit und breit gesucht. Leider haben wir keine Sprachkanäle gefunden</string>
     <string name="overlay_notification_incoming_call">Eingehender Anruf …</string>
     <string name="overlay_notification_settings_disabled">Benachrichtigungen deaktiviert</string>
     <string name="overlay_notification_settings_position">Anzeige: %1$s</string>
@@ -2399,7 +2346,6 @@ Falls du Probleme oder Fragen hast, lies einfach [diesen schicken Hilfeartikel!]
     <string name="overlay_notifications_settings">Overlay-Benachrichtigungen</string>
     <string name="overlay_notifications_top_left">Oben links</string>
     <string name="overlay_notifications_top_right">Oben rechts</string>
-    <string name="overlay_private_channels_empty_state">Hier gibt’s keine Direktnachrichten.</string>
     <string name="overlay_reload">Overlay neu laden</string>
     <string name="overlay_settings">Overlay-Einstellungen</string>
     <string name="overlay_settings_general_tab">Allgemein</string>
@@ -2421,7 +2367,6 @@ Falls du Probleme oder Fragen hast, lies einfach [diesen schicken Hilfeartikel!]
     <string name="pagination_page_of">Seite %1$s von %2$s</string>
     <string name="pagination_previous">Zurück</string>
     <string name="paginator_of_pages">Seite %1$s von %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Discord-Partner</string>
     <string name="party_full">Gruppe voll</string>
     <string name="party_join">Gruppe beitreten</string>
@@ -2517,18 +2462,11 @@ Falls du Probleme oder Fragen hast, lies einfach [diesen schicken Hilfeartikel!]
     <string name="popout_stay_on_top">Im Vordergrund bleiben</string>
     <string name="post_code">Postleitzahl</string>
     <string name="premium_alert_error_title">Ups, da ist etwas schiefgelaufen …</string>
-    <string name="premium_applications_grandfathered_monthly">Als Dankeschön für deine Unterstützung erhältst du ein Jahr lang Zugriff auf Nitro-Spiele. Dein Zugriff endet am **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">Als Dankeschön für deine Unterstützung erhältst du zwei Jahre lang Zugriff auf Nitro-Spiele. Dein Zugriff endet am **%1$s**.</string>
-    <string name="premium_applications_subtitle">Unbegrenzter Zugang zu einer ständig wachsenden Sammlung hochgelobter Spiele, die wir dir und deinen Freunden wärmstens empfehlen.</string>
-    <string name="premium_applications_title">Haufenweise coole Spiele für einen geringen monatlichen Betrag.</string>
     <string name="premium_badge_tooltip">Abonnent seit %1$s</string>
     <string name="premium_cancel_cancel">Nö</string>
     <string name="premium_cancel_confirm_body_tier_1">"Die Kündigung wird am Ende deines aktuellen Abrechnungszeitraums am **%1$s** wirksam. Du erhältst einen zufälligen Discord-Tag, falls du ihn geändert hast.
 
 Du kannst jederzeit wieder ein Abonnement abschließen."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Die Kündigung wird am Ende deines aktuellen Abrechnungszeitraums wirksam. Am **%1$s** verlierst du den Zugriff auf alle Nitro-Spiele in deiner Bibliothek und du erhältst einen zufälligen Discord-Tag, falls du ihn geändert hast.
-
-Wir sichern deine Daten, und falls du dich umentscheiden solltest, kannst du jederzeit wieder ein Abonnement abschließen."</string>
     <string name="premium_cancel_confirm_new">Okay, %1$s kündigen</string>
     <string name="premium_cancel_confirm_title">%1$s kündigen?</string>
     <string name="premium_cancel_failed_body">Wir konnten dein Nitro-Abonnement nicht kündigen. Bitte versuche es noch einmal oder nimm Kontakt mit unserem Support-Team auf, wenn das Problem bestehen bleibt.</string>
@@ -2545,19 +2483,16 @@ Wir sichern deine Daten, und falls du dich umentscheiden solltest, kannst du jed
     <string name="premium_chat_perks_description_custom_emoji">Hol dir einen globalen Pass, um deine eigenen Emojis überall zu benutzen.</string>
     <string name="premium_chat_perks_description_discriminator">Während deines Abonnements kannst du deinen Discord-Tag frei wählen.</string>
     <string name="premium_chat_perks_description_screenshare">Teile dein Spiel per Bildschirmübertragung mit 720p/60fps oder 1080p/30fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Lade große Dateien von bis zu %1$s statt %2$s hoch, um Memes in bester Qualität zu teilen.</string>
+    <string name="premium_chat_perks_streaming_mobile">Bessere Go-Live-Streams: Streame mit Nitro in Originalauflösung oder mit Nitro Classic mit gestochen scharfen 1080p/60fps</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Animierter Spaß</string>
     <string name="premium_chat_perks_title_badge">Zeig deine Unterstützung</string>
     <string name="premium_chat_perks_title_custom_emoji">Globale personalisierte Emojis</string>
     <string name="premium_chat_perks_title_discriminator">Discord-Tag personalisieren</string>
     <string name="premium_chat_perks_title_screenshare">Videos mit höherer Qualität</string>
+    <string name="premium_chat_perks_title_streaming">Bessere Go-Live-Streams</string>
     <string name="premium_code_redemption_confirmation_blurb">Dank der Magie zufällig zusammengewürfelter Zahlen kannst du die Chat-Zusatzfunktionen für %1$s nutzen!</string>
     <string name="premium_code_redemption_confirmation_button">Das gefällt mir!</string>
-    <string name="premium_feature_new_chat_perks_header">Außerdem erhältst du Zugriff auf wundervolle Chat-Zusatzfunktionen:</string>
-    <string name="premium_feature_new_premium_applications_header">Spiele im Wert von über %1$s. Schau mal rein:</string>
-    <string name="premium_feature_view_applications">Alle Nitro-Spiele anzeigen</string>
     <string name="premium_features_chat_perks">Chat-Zusatzfunktionen</string>
-    <string name="premium_features_premium_applications">Kostenlose Spiele</string>
     <string name="premium_grandfathered_warning">Als Dankeschön für deine Unterstützung hast du ein günstigeres Nitro-Abonnement. **Wenn du dein Abo kündigst oder änderst, geht dein Rabatt über die Planke.** Sag nicht, wir hätten dich nicht gewarnt!!!</string>
     <string name="premium_grandfathered_warning_confirm">Mir egal</string>
     <string name="premium_grandfathered_warning_title">Beim Klabautermann! Meuterei?</string>
@@ -2566,11 +2501,7 @@ Wir sichern deine Daten, und falls du dich umentscheiden solltest, kannst du jed
     <string name="premium_month_subscription">**%1$s%2$s %3$s**/Monat</string>
     <string name="premium_not_claimed">Beanspruche zuerst deinen Account</string>
     <string name="premium_not_claimed_body">Hallo! Wusstest du schon, dass du für Nitro deinen Account beanspruchen musst, damit nichts verloren geht?</string>
-    <string name="premium_not_verified">Bestätige zuerst deine E-Mail-Adresse.</string>
-    <string name="premium_not_verified_body">Hallo! Wusstest du schon, dass du deine E-Mail-Adresse bestätigen musst, bevor du ein Nitro-Abonnement abschließt? Schau nach der Bestätigungs-E-Mail oder fordere eine neue an.</string>
-    <string name="premium_payment_applications_os_warning">Nitro-Spiele werden nur von Windows unterstützt.</string>
     <string name="premium_payment_confirmation_blurb_regular">Dir wurde nun die Macht der erweiterten Chat-Zusatzfunktionen verliehen. Also worauf wartest du noch? Die Chats erwarten dich!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Du hast jetzt unbegrenzten Zugriff auf viele fantastische Spiele. Also worauf wartest du noch? Geh spielen!</string>
     <string name="premium_payment_confirmation_button_regular">OK, klingt gut</string>
     <string name="premium_plan_month">Nitro-Monatsabonnement</string>
     <string name="premium_plan_month_tier_1">Nitro Classic-Monatsabonnement</string>
@@ -2591,13 +2522,10 @@ Wir ziehen dir die Kosten deines aktuellen Abos anteilig vom Jahrespreis ab. Ins
     <string name="premium_upgrade_disabled_current_tooltip">Dein aktuelles Abo</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Du musst zuerst dein Abo kündigen und auslaufen lassen, um ein eingeschränkteres Abo abschließen zu können.</string>
     <string name="premium_upgrade_done_body_tier_1">Du hast jetzt noch mehr Chat-Zusatzfunktionen!</string>
-    <string name="premium_upgrade_done_body_tier_2">Du hast jetzt noch mehr Chat-Zusatzfunktionen und Zugriff auf haufenweise coole Spiele.</string>
     <string name="premium_upgrade_done_button_tier_1">Fantastabulös!</string>
-    <string name="premium_upgrade_done_button_tier_2">Alle Nitro-Spiele anzeigen</string>
     <string name="premium_upgrade_failed_body">Nanu … Dieses Upgrade hat nicht funktioniert. Stell sicher, dass deine Zahlungsinformationen auf dem neuesten Stand sind und versuch es erneut.</string>
     <string name="premium_upload_promo">Upgrade für ein Dateilimit von %1$s auf Discord Nitro</string>
     <string name="premium_year_free_months">Erhalte 2 Monate kostenlos!</string>
-    <string name="premium_year_free_months_short">2 Monate kostenlos</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s**/Jahr</string>
     <string name="preview_chat">Chatvorschau</string>
     <string name="priority_speaker">Very Important Speaker</string>
@@ -2777,12 +2705,10 @@ Daten zu senden."</string>
     <string name="scope_connections_empty">Du hast noch keine Drittanbieter-Verknüpfungen!</string>
     <string name="scope_email">Auf deine E-Mail-Adresse zugreifen</string>
     <string name="scope_email_empty">Du hast noch keine E-Mail-Adresse eingerichtet!</string>
-    <string name="scope_gdm_join">Gruppen-DMs für dich beitreten</string>
-    <string name="scope_gdm_join_description">Dadurch kann die Anwendung Gruppen-DMs beitreten, die sie für dich erstellt hat.</string>
     <string name="scope_guilds">Wissen, auf welchen Servern du bist</string>
     <string name="scope_guilds_empty">Du bist auf keinem Server.</string>
     <string name="scope_guilds_join">Servern für dich beitreten</string>
-    <string name="scope_guilds_join_description">Dadurch werden Soforteinladungen in deinem Namen verwendet.</string>
+    <string name="scope_guilds_join_description">Dadurch werden Einladungen in deinem Namen verwendet.</string>
     <string name="scope_identify">Auf deinen Benutzernamen und Avatar zugreifen</string>
     <string name="scope_messages_read">Alle Nachrichten lesen</string>
     <string name="scope_messages_read_description">Dadurch kann die Anwendung alle Nachrichten lesen, die über deinen Discord-Account zugänglich sind.</string>
@@ -2850,7 +2776,6 @@ Wähle, welchen Bildschirm du übertragen möchtest."</string>
     <string name="search_filter_on">am</string>
     <string name="search_for_emoji">Finde das perfekte Emoji</string>
     <string name="search_for_empty">Suche</string>
-    <string name="search_for_value">Suche nach: **%1$s**</string>
     <string name="search_group_header_channels">Im Kanal</string>
     <string name="search_group_header_dates">Daten</string>
     <string name="search_group_header_file_name">Dateiname enthält</string>
@@ -2887,7 +2812,6 @@ Wähle, welchen Bildschirm du übertragen möchtest."</string>
     <string name="select">Auswählen</string>
     <string name="select_channel_or_category">Wähle einen Kanal oder eine Kategorie …</string>
     <string name="select_sort_mode">Sortiermethode auswählen</string>
-    <string name="self_deafened">Eigene Lautsprecher deaktiviert</string>
     <string name="self_deny_permission_body">"Du kannst **%1$s** diese Berechtigung nicht entziehen, weil du sie dann auch nicht mehr hättest. Erlaube es einer anderen Rolle oder dir selbst,
 bevor du es erneut versuchst."</string>
     <string name="self_deny_permission_title">Ich glaube nicht, dass du das tun willst</string>
@@ -2905,8 +2829,6 @@ bevor du es erneut versuchst."</string>
     <string name="send_tts_messages">TTS-Nachrichten senden</string>
     <string name="send_tts_messages_description">"Mitglieder mit dieser Berechtigung können Text-zu-Sprache-Nachrichten schicken, indem sie eine Nachricht mit /tts (Text-to-Speech) beginnen.
 Diese Nachrichten können von jedem in dem Kanal gehört werden."</string>
-    <string name="server_deafen">Serverweit Lautsprecher deaktivieren</string>
-    <string name="server_deafened">Serverweit Lautsprecher deaktiviert</string>
     <string name="server_emoji">Server-Emojis</string>
     <string name="server_mute">Server stummschalten</string>
     <string name="server_mute_dms">Direktnachrichten stummschalten</string>
@@ -2920,7 +2842,6 @@ Diese Nachrichten können von jedem in dem Kanal gehört werden."</string>
     <string name="server_settings_updated">Die Servereinstellungen wurden aktualisiert.</string>
     <string name="server_sort">%1$s sortieren</string>
     <string name="server_status">Serverstatus</string>
-    <string name="server_undeafen">Serverweit Lautsprecher aktivieren</string>
     <string name="server_unmute">Server-Stummschaltung aufheben</string>
     <string name="server_voice_mute">Server stummschalten</string>
     <string name="server_voice_unmute">Server-Stummschaltung aufheben</string>
@@ -2992,7 +2913,6 @@ Bist du sicher, dass du das tun möchtest?"</string>
     <string name="sort">Sortieren</string>
     <string name="sorting">Sortierung</string>
     <string name="sorting_channels">Kanäle sortieren</string>
-    <string name="sound_deafen">Lautsprecher deaktivieren</string>
     <string name="sound_incoming_ring">Eingehender Anruf</string>
     <string name="sound_message">Nachricht</string>
     <string name="sound_mute">Stummschalten</string>
@@ -3001,7 +2921,6 @@ Bist du sicher, dass du das tun möchtest?"</string>
     <string name="sound_ptt_deactivate">PTT deaktivieren</string>
     <string name="sound_stream_started">Stream gestartet</string>
     <string name="sound_stream_stopped">Stream gestoppt</string>
-    <string name="sound_undeafen">Lautsprecher aktivieren</string>
     <string name="sound_unmute">Stummschaltung aufheben</string>
     <string name="sound_user_join">Benutzer tritt Kanal bei</string>
     <string name="sound_user_leave">Benutzer verlässt Kanal</string>
@@ -3050,8 +2969,6 @@ Bist du sicher, dass du das tun möchtest?"</string>
     <string name="stop_ringing">Auflegen</string>
     <string name="stop_streaming">Streaming beenden</string>
     <string name="stop_watching">Zuschauen beenden</string>
-    <string name="store_payment_legalese_monthly">Hey! Wenn du ein %1$s abschließt, stimmst du automatisch unseren [Nutzungsbedingungen für den Store](%2$s) zu. Ein %1$s setzt sich automatisch fort. Das bedeutet, dass wir heute den Abopreis erheben, und ihn danach monatlich abbuchen, bis du dein Abonnement kündigst. Du kannst dein Abonnement jederzeit in den Benutzereinstellungen kündigen.</string>
-    <string name="store_payment_legalese_yearly">Hey! Wenn du ein %1$s abschließt, stimmst du automatisch unseren [Nutzungsbedingungen für den Store](%2$s) zu. Ein %1$s setzt sich automatisch fort. Das bedeutet, dass wir heute den Abopreis erheben, und ihn danach jährlich abbuchen, bis du dein Abonnement kündigst. Du kannst dein Abonnement jederzeit in den Benutzereinstellungen kündigen.</string>
     <string name="stream">Live gehen</string>
     <string name="stream_bad_spectator">Die Video- oder Audioqualität des Streams, den du anschaust, ist zurzeit reduziert. Dies könnte an den Netzwerkbedingungen liegen.</string>
     <string name="stream_bad_streamer">Die Video- oder Audioqualität deines Streams ist zurzeit reduziert. Dies könnte an den Netzwerkbedingungen liegen.</string>
@@ -3059,7 +2976,6 @@ Bist du sicher, dass du das tun möchtest?"</string>
     <string name="stream_capture_paused_details">Wechsle zu deinem Spiel, um fortzufahren.</string>
     <string name="stream_capture_paused_details_viewer">%1$s hat das Spiel minimiert … Hab Geduld!</string>
     <string name="stream_channel_description">Mitglieder mit dieser Berechtigung können auf diesem Kanal streamen.</string>
-    <string name="stream_description">Mitglieder mit dieser Berechtigung können auf diesem Kanal bestimmte Dinge vornehmen.</string>
     <string name="stream_ended">Dieser Stream wurde beendet. *Grillenzirpen*</string>
     <string name="stream_ended_button">Stream beendet</string>
     <string name="stream_ended_no_spectators">Es gibt keine Zuschauer, da der Stream beendet wurde.</string>
@@ -3099,7 +3015,6 @@ Bist du sicher, dass du das tun möchtest?"</string>
     <string name="stream_report_rating_body_streamer">Erzähl uns von deiner Erfahrung als Streamer.</string>
     <string name="stream_report_submit">Absenden</string>
     <string name="stream_reported">Feedback abgeschickt</string>
-    <string name="stream_reported_body">Vielen Dank, dass du dein Problem gemeldet hast! Dein Feedback hilft uns dabei, die Stream-Qualität zu verbessern.</string>
     <string name="stream_soundshare_failed">Hey, etwas ist schiefgegangen und wir konnten den Ton deines Spiels nicht mehr übertragen.</string>
     <string name="streamer_mode">Streamer-Modus</string>
     <string name="streamer_mode_enabled">Streamer-Modus aktiviert</string>
@@ -3156,7 +3071,6 @@ Bist du sicher, dass du das tun möchtest?"</string>
     <string name="system_message_guild_member_join_10">Ein wildes %1$s erscheint!</string>
     <string name="system_message_guild_member_join_11">Swoooosh. %1$s ist gelandet.</string>
     <string name="system_message_guild_member_join_12">Macht euch bereit. %1$s naht.</string>
-    <string name="system_message_guild_member_join_13">%1$s ist gerade beigetreten. Versteckt eure Bananen.</string>
     <string name="system_message_guild_member_join_14">%1$s ist angekommen. Scheint OP zu sein – bitte nerfen.</string>
     <string name="system_message_guild_member_join_15">%1$s ist gerade auf den Server geschlittert.</string>
     <string name="system_message_guild_member_join_16">Ein %1$s ist auf dem Server gespawnt.</string>
@@ -3167,7 +3081,6 @@ Bist du sicher, dass du das tun möchtest?"</string>
     <string name="system_message_guild_member_join_21">Herausforderer nähert sich – %1$s ist aufgetaucht!</string>
     <string name="system_message_guild_member_join_22">Ist es ein Vogel? Ist es ein Flugzeug? Nein, es ist %1$s.</string>
     <string name="system_message_guild_member_join_23">\\\\[T]/ Gelobt sei die Sonne! %1$s ist da!</string>
-    <string name="system_message_guild_member_join_25">Ha! %1$s ist beigetreten! Du hast gerade meine Fallenkarte aktiviert!</string>
     <string name="system_message_guild_member_join_26">Cheers, Love! %1$s ist da!</string>
     <string name="system_message_guild_member_join_27">Hey! Listen! %1$s ist beigetreten!</string>
     <string name="system_message_guild_member_join_28">Wir haben dich erwartet, %1$s</string>
@@ -3267,7 +3180,6 @@ Authentifizierungs-App verlieren solltest. **Jeder Code kann nur einmal verwende
     <string name="two_fa_login_body">Gib hier den 6-stelligen Authentifizierungscode ein.</string>
     <string name="two_fa_login_footer">Zurück zur Anmeldung</string>
     <string name="two_fa_login_label">Melde dich mit deinem Code an</string>
-    <string name="two_fa_not_verified">Du musst deinen Account bestätigen, bevor du die Zwei-Faktor-Authentifizierung aktivieren kannst.</string>
     <string name="two_fa_qr_body">Öffne die Authentifizierungs-App und scanne das Bild links mit deiner Handykamera.</string>
     <string name="two_fa_qr_label">Scanne den QR-Code</string>
     <string name="two_fa_remove">2FA entfernen</string>
@@ -3297,7 +3209,6 @@ musst du dein Passwort und einen Authentifizierungscode von deinem Handy eingebe
 
 Ein beanspruchter Account ist erforderlich, um **Apps herunterladen zu können**."</string>
     <string name="unclaimed_account_title">Noch nicht beanspruchter Account</string>
-    <string name="undeafen">Lautsprecher aktivieren</string>
     <string name="unfocus_participant">Teilnehmer nicht im Fokus</string>
     <string name="unhandled_link_body">Leider haben wir auf deinem Gerät keine Anwendungen gefunden, die diesen Link verarbeiten können:</string>
     <string name="unhandled_link_title">Unverarbeiteter Link</string>
@@ -3320,8 +3231,6 @@ Ein beanspruchter Account ist erforderlich, um **Apps herunterladen zu können**
     <string name="unsupported_browser">Nicht unterstützter Browser</string>
     <string name="unsupported_browser_body">"Es sieht so aus, als ob du einen nicht unterstützten Browser verwendest.
 Für das perfekte Discord-Erlebnis aktualisiere deinen Browser oder lade eine unserer Apps herunter."</string>
-    <string name="unsupported_browser_details">"Du willst mit deinem Team sprechen können, oder? Wechsle zur aktuellsten Version von Chrome, Opera, Firefox 38+
-oder installiere den Discord-Client, um sofort loszulegen!"</string>
     <string name="unsupported_browser_title">Oha, was ist denn hier los?</string>
     <string name="unverified_account_body">"Bitte prüfe deine E-Mails und folge den Anweisungen, um deine E-Mail-Adresse zu verifizieren.
 
@@ -3438,8 +3347,6 @@ Halte die Shifttaste gedrückt, um es direkt hochzuladen."</string>
     <string name="user_settings_appearance_preview_message_4">Der kompakte Modus eingeschaltet wird</string>
     <string name="user_settings_appearance_preview_message_5">Oh, da ist er ja!</string>
     <string name="user_settings_appearance_zoom_tip">Du kannst die Zoomstufe mit %1$s +/- ändern und mit %1$s+0 auf den Standard-Zoom zurücksetzen.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Spiele anzeigen</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Deaktiviere es, um deine Spiele zu verbergen und dich auf deine Gespräche zu konzentrieren.</string>
     <string name="user_settings_close_button">Schließen-Schaltfläche</string>
     <string name="user_settings_confirm_logout">Bist du sicher, dass du dich abmelden möchtest?</string>
     <string name="user_settings_game_activity">Spieleaktivität</string>
@@ -3498,8 +3405,6 @@ Beachte aber dabei, dass dein Server damit für jeden öffentlich zugänglich is
     <string name="vanity_url_hint_mobile">deine-url-hier</string>
     <string name="verfication_expired">E-Mail-Verifikationslink ist abgelaufen.</string>
     <string name="verfication_expired_suggestion">Bitte melde dich bei Discord an und sende den Link noch einmal</string>
-    <string name="verification_body">"Uns ist etwas Seltsames aufgefallen.
-Bitte **beweise, dass du ein Mensch bist**, um Discord weiterhin zu nutzen."</string>
     <string name="verification_body_alt">Dann lass uns mal sicherstellen, dass du ein Mensch bist …</string>
     <string name="verification_email_body">Wir haben dir eine neue Verifizierungs-E-Mail an **%1$s** geschickt. Bitte überprüfe deinen Posteingang und deinen Spam-Ordner.</string>
     <string name="verification_email_error_body">Beim Senden deiner Verifizierungs-E-Mail ist ein Fehler aufgetreten. Versuche es später erneut oder kontaktiere den Support.</string>
@@ -3517,7 +3422,6 @@ Bitte **beweise, dass du ein Mensch bist**, um Discord weiterhin zu nutzen."</st
     <string name="verification_level_very_high_criteria">Muss über ein verifiziertes Handy auf dem Discord-Account verfügen.</string>
     <string name="verification_open_discord">Weiter zu Discord</string>
     <string name="verification_phone_description">Gib den 6-stelligen Code ein, den wir an dein Telefon gesendet haben.</string>
-    <string name="verification_phone_title">Bestätige deine Nummer</string>
     <string name="verification_title">Irgendetwas ist hier merkwürdig</string>
     <string name="verification_verified">E-Mail-Adresse verifiziert!</string>
     <string name="verification_verifying">E-Mail-Adresse wird verifiziert</string>
@@ -3539,7 +3443,6 @@ Bitte **beweise, dass du ein Mensch bist**, um Discord weiterhin zu nutzen."</st
     <string name="video">Grafik</string>
     <string name="video_call">Videoanruf</string>
     <string name="video_connect">Grafik</string>
-    <string name="video_poor_connection_body">Video wurde deaktiviert. Es wird fortgesetzt, wenn sich deine Verbindung verbessert.</string>
     <string name="video_poor_connection_title">Schlechte Verbindung</string>
     <string name="video_preview">Videovorschau</string>
     <string name="video_settings">Videoeinstellungen</string>
diff --git a/com.discord/res/values-el/plurals.xml b/com.discord/res/values-el/plurals.xml
index 39beca3e01..0de6f7b650 100644
--- a/com.discord/res/values-el/plurals.xml
+++ b/com.discord/res/values-el/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">Καμία θέση</item>
         <item quantity="one">%d θέση</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d ημέρες</item>
-        <item quantity="one">1 ημέρα</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d μέλη</item>
-        <item quantity="zero">0 μέλη</item>
-        <item quantity="one">1 μέλος</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">ημέρες</item>
         <item quantity="one">ημέρα</item>
@@ -212,16 +203,6 @@
         <item quantity="other">άδειες</item>
         <item quantity="one">μια άδεια</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Ορισμός αργής λειτουργίας σε **!!%d!! δευτερόλεπτα**</item>
-        <item quantity="zero">Απενεργοποιημένη αργή λειτουργία</item>
-        <item quantity="one">Ορισμός αργής λειτουργίας σε **1 δευτερόλεπτο**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Ορισμός αργής λειτουργίας σε **!!%d!! δευτερόλεπτα**</item>
-        <item quantity="zero">Απενεργοποίηση αργής λειτουργίας</item>
-        <item quantity="one">Ορισμός αργής λειτουργίας σε **1 δευτερόλεπτο**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! μέλη**</item>
         <item quantity="one">**ένα μέλος**</item>
@@ -321,10 +302,6 @@
         <item quantity="other">%d νέα μηνύματα</item>
         <item quantity="one">1 νέο μήνυμα</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d ημέρες</item>
-        <item quantity="one">μία ημέρα</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d κανάλια</item>
         <item quantity="one">%d κανάλι</item>
diff --git a/com.discord/res/values-el/strings.xml b/com.discord/res/values-el/strings.xml
index 163ca6144a..e78b23c4f1 100644
--- a/com.discord/res/values-el/strings.xml
+++ b/com.discord/res/values-el/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"Δεν μπορείς να στείλεις πρόσκληση, είτε γιατί είσαι αόρατος είτε γιατί έχεις αποκρύψει την κατάσταση παιχνιδιού σου. Αν προτιμάς να μην αλλάξεις
  τις ρυθμίσεις σου, ζήτησε από κάποιον να σε προσκαλέσει."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Το ’πιασα!</string>
-    <string name="activity_panel_go_live_hotspot_header">Χρησιμοποιήστε τη λειτουργία «Πάμε Ζωντανά» για να μεταδώσετε το παιχνίδι απευθείας στους φίλους σας!</string>
+    <string name="activity_panel_go_live_hotspot_header">Χρησιμοποίησε το Go Live για να stream-άρεις απευθείας στους φίλους σου ενώ παίζεις!</string>
     <string name="activity_panel_go_live_tooltip">Πάμε Ζωντανά</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Αυτός ο διακομιστής δεν έχει κανάλια ομιλίας για να κάνετε ζωντανή μετάδοση.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Δεν μπορείτε να κάνετε ζωντανή μετάδοση σε αυτό το κανάλι ομιλίας.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Πλοηγηθείτε σε ένα διακομιστή για να αρχίσετε τη ζωντανή μετάδοση</string>
     <string name="add">Προσθήκη</string>
     <string name="add_a_comment_optional">Προσθήκη σχολίου (προαιρετικό)</string>
@@ -158,7 +156,6 @@
     <string name="application_entitlement_code_redemption_confirmation_title">Τον έλαβες!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Πήγαινε στη βιβλιοθήκη</string>
     <string name="application_entitlement_code_redemption_invalid">Καταχωρίστηκε μη έγκυρος κωδικός</string>
-    <string name="application_entitlement_code_redemption_prompt">Έχεις λάβει κωδικό για ένα παιχνίδι; Γράψε τον παρακάτω:</string>
     <string name="application_entitlement_code_redemption_redeem">Εξαργύρωση</string>
     <string name="application_filter_name_linux">Όλα τα αρχεία</string>
     <string name="application_filter_name_macos">Εφαρμογές</string>
@@ -413,7 +410,6 @@
     <string name="application_store_view_all_news">Δες Όλα τα Νέα</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Για να παίξεις αυτό το DLC, απαιτείται να έχεις το %1$s στο Discord. [Μάθε για τα DLC.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Περιεχόμενο προς λήψη</string>
-    <string name="application_store_warning_early_access_description">Αυτό το παιχνίδι είναι διασκεδαστικό (κατά τη γνώμη μας!), αλλά ίσως έχει περιορισμένο περιεχόμενο, διάφορα σφάλματα, ή να μοιάζει μισοτελειωμένο. [Μάθε για την πρώιμη πρόσβαση.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Πρώιμη Πρόσβαση</string>
     <string name="application_store_warning_requires_desktop_app_description">Για να παίξεις αυτό το παιχνίδι, θα πρέπει να έχεις εγκαταστήσει την $[εφαρμογή υπολογιστή](downloadHook) Discord.</string>
     <string name="application_store_warning_requires_desktop_app_title">Απαιτεί εφαρμογή υπολογιστή</string>
@@ -538,7 +534,6 @@
     <string name="billing_error_section_card">Ωχ! Φαίνεται να υπάρχει κάποιο πρόβλημα με αυτήν την κάρτα. Παρακαλούμε διορθώσετε τα πεδία και ξαναπροσπαθήστε!</string>
     <string name="billing_history">Ιστορικό χρεώσεων</string>
     <string name="billing_legal_mumbo_jumbo">Νομικίστικα «Ακαταλαβίστικα»</string>
-    <string name="billing_legal_mumbo_jumbo_label">Συμφωνώ με τους [Όρους Παροχής Υπηρεσιών του Καταστήματος Discord](%1$s)</string>
     <string name="billing_no_payment_method">Δεν υπάρχει αποθηκευμένη μέθοδος πληρωμής</string>
     <string name="billing_no_payment_method_description">Ολοκλήρωσε τις παραγγελίες σου γρηγορότερα αποθηκεύοντας μια μέθοδο πληρωμής</string>
     <string name="billing_pay_for_it_with">Πληρωμή για αυτό Με</string>
@@ -546,12 +541,7 @@
     <string name="billing_payment_breakdown_total">Σύνολο</string>
     <string name="billing_payment_history">Ιστορικό Συναλλαγών</string>
     <string name="billing_payment_premium">Η Συνδρομή σου</string>
-    <string name="billing_payment_premium_legalese_monthly">Αγοράζοντας μια %1$s συνδρομή, συμφωνείς με τους [Όρους Παροχής Υπηρεσιών του Καταστήματος] μας(%2$s). Η συνδρομή %1$s είναι αυτόματη και περιοδική. Εξουσιοδοτείς την Discord να σε χρεώσει άμεσα με τη μέθοδο πληρωμής που προβλέπεται στο %3$s και να συνεχίσει να σε χρεώνει αυτόματα κάθε μήνα μέχρι να κάνεις ακύρωση. Μπορείς να κάνεις ακύρωση όποια στιγμή θέλεις.</string>
-    <string name="billing_payment_premium_legalese_yearly">Αγοράζοντας μια %1$s συνδρομή, συμφωνείς με τους [Όρους Παροχής Υπηρεσιών του Καταστήματος] μας(%2$s). Η συνδρομή %1$s είναι αυτόματη και περιοδική. Εξουσιοδοτείς την Discord να σε χρεώσει αμέσως με τη μέθοδο πληρωμής που προβλέπεται στο %3$s και να συνεχίσει να σε χρεώνει αυτόματα κάθε χρόνο μέχρι να κάνεις ακύρωση. Μπορείς να κάνεις ακύρωση όποια στιγμή θέλεις.</string>
     <string name="billing_payment_sources">Μέθοδοι Πληρωμής</string>
-    <string name="billing_payment_table_header_amount">ΠΟΣΟ</string>
-    <string name="billing_payment_table_header_date">ΗΜΕΡΟΜΗΝΙΑ</string>
-    <string name="billing_payment_table_header_description">ΠΕΡΙΓΡΑΦΗ</string>
     <string name="billing_premium_refund_text">Μπορείς να ζητήσεις επιστροφή χρημάτων αν αυτή η αγορά πραγματοποιήθηκε τις τελευταίες %1$s ημέρες. [Έχουμε πολύ φιλικό κέντρο υποστήριξης, που θα σε βοηθήσει να πάρεις πίσω τα χρήματά σου].(%2$s)</string>
     <string name="billing_premium_refund_text_unable">Λυπούμαστε, αυτή η αγορά δεν είναι επιλέξιμη για επιστροφή χρημάτων. Μπορείς να ζητήσεις επιστροφή χρημάτων αν αυτή η αγορά πραγματοποιήθηκε τις τελευταίες %1$s ημέρες.</string>
     <string name="billing_price_per_month">%1$s / μήνα</string>
@@ -561,9 +551,7 @@
     <string name="billing_purchase_details_header">Στοιχεία Αγοράς</string>
     <string name="billing_refund_header">Προβλήματα με την αγορά σας;</string>
     <string name="billing_refund_play_time_never_played">Δεν παίχτηκε ποτέ</string>
-    <string name="billing_refund_play_time_subheader">ΧΡΟΝΟΣ ΠΑΙΧΝΙΔΙΟΥ</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">ΗΜΕΡΟΜΗΝΙΑ ΑΓΟΡΑΣ</string>
     <string name="billing_refund_report_a_problem">Αναφέρετε ένα πρόβλημα</string>
     <string name="billing_refund_request_button">Αίτημα Επιστροφής</string>
     <string name="billing_sales_tax_added">Έχει προστεθεί %1$s ως φόρος πωλήσεων βάσει της διεύθυνσης τιμολόγησής σου.</string>
@@ -802,7 +790,6 @@ Avatar"</string>
     <string name="connection_enter_code">Βάλε τον κωδικό όπως εμφανίζεται στην οθόνη σου</string>
     <string name="connection_invalid_pin">Μη έγκυρος κωδικός PIN</string>
     <string name="connection_login_with">ή συνδέσου με</string>
-    <string name="connection_problems_body">Έλεγξε την [κατάσταση διακομιστή](%1$s) ή κάνε tweet [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Έλεγχος ταυτότητας</string>
     <string name="connection_status_awaiting_endpoint">Αναμονή απόκρισης</string>
     <string name="connection_status_connected">Έγινε σύνδεση</string>
@@ -847,11 +834,10 @@ Avatar"</string>
     <string name="create_category">Δημιουργία κατηγορίας</string>
     <string name="create_channel">Δημιουργία καναλιού</string>
     <string name="create_group_dm">Δημιουργία ομάδας άμεσων μηνυμάτων</string>
-    <string name="create_instant_invite">Δημιουργία Άμεσης Πρόσκλησης</string>
+    <string name="create_instant_invite">Δημιουργία πρόσκλησης</string>
     <string name="create_link">Δημιουργία συνδέσμου</string>
     <string name="create_or_join_modal_header">Ω, κι άλλος διακομιστής, ε;</string>
     <string name="create_server_button_body">Δημιούργησε έναν νέο διακομιστή και προσκάλεσε τους φίλους σου. Είναι δωρεάν!</string>
-    <string name="create_server_button_cta">Δημιούργησε έναν διακομιστή</string>
     <string name="create_server_button_cta_mobile">Δημιούργησε έναν νέο διακομιστή</string>
     <string name="create_server_button_cta_mobile_desc">Φτιάξτε έναν διακομιστή, προσκαλέστε τους φίλους σας, κάντε ένα πάρτυ!</string>
     <string name="create_server_description">Δημιουργώντας έναν διακομιστή, θα έχεις πρόσβαση σε **δωρεάν** συνομιλία φωνής και κειμένου που μπορείς να χρησιμοποιήσεις με τους φίλους σου.</string>
@@ -963,7 +949,6 @@ Avatar"</string>
     <string name="disable_email_notifications_failed_suggestion">Οι ειδοποιήσεις ηλεκτρονικού ταχυδρομείου ίσως έχουν ήδη απενεργοποιηθεί ή αυτή η διεύθυνση ηλεκτρονικού ταχυδρομείου δεν έχει πια σχέση με κάποιον λογαριασμό στο Discord.</string>
     <string name="disable_integration_title">Απενεργοποίηση συγχρονισμού</string>
     <string name="disable_integration_twitch_body">Η απενεργοποίηση του συγχρονισμού θα εκτελέσει την επιλεγμένη συμπεριφορά ληγμένου συνδρομητή σαν όλοι οι συνδρομητές να έχουν λήξει.</string>
-    <string name="disable_integration_youtube_body">Η απενεργοποίηση του συγχρονισμού θα εκτελέσει την επιλεγμένη συμπεριφορά ληγμένου χορηγού σαν όλοι οι χορηγοί να έχουν λήξει.</string>
     <string name="disable_notifications_description">Όλες οι ειδοποιήσεις της επιφάνειας εργασίας θα απενεργοποιηθούν.</string>
     <string name="disable_notifications_label">Απενεργοποίηση ειδοποιήσεων</string>
     <string name="disable_sounds_description">Όλα τα ηχητικά εφέ θα απενεργοποιηθούν.</string>
@@ -979,7 +964,6 @@ Avatar"</string>
     <string name="discord_desc_long">Δωρεάν και ασφαλής συνομιλία για παίκτες, λειτουργεί τόσο στον υπολογιστή όσο και στο τηλέφωνό σου.</string>
     <string name="discord_desc_short">Ομαδική φωνητική &amp; γραπτή συνομιλία</string>
     <string name="dismiss">Απόρριψη</string>
-    <string name="dispatch_error_modal_body">Κάτι πήγε στραβά. Αν το πρόβλημα επιμένει, δημιουργήστε ένα δελτίο υποστήριξης και αντιγράψτε το περιεχόμενο του μηνύματος παρακάτω.</string>
     <string name="dispatch_error_modal_error_label">Μήνυμα Σφάλματος (Αντίγραψε και επικόλλησέ με)</string>
     <string name="dispatch_error_modal_header">Σφάλμα Discord Dispatch</string>
     <string name="dispatch_error_modal_open_ticket">Άνοιξε ένα δελτίο</string>
@@ -1108,8 +1092,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="form_help_attenuation">"Χαμηλώνει την ένταση άλλων εφαρμογών κατά το ποσοστό αυτό όταν κάποιος μιλάει.
 Ρύθμισέ το στο 0%% για να το απενεργοποιήσεις τελείως."</string>
     <string name="form_help_automatic_vad">Αν ο δείκτης είναι σταθερά πράσινος, τότε το Discord μεταδίδει την όμορφη φωνή σου.</string>
-    <string name="form_help_bitrate">"** ΟΛΑ ΤΑ BITS!** Η υπέρβαση των %1$skbps δεν συνιστάται εκτός αν είσαι φανατικός της τέλειας ηχητικής ποιότητας, γιατί θα επηρεάσει
-αρνητικά τα άτομα που έχουν φορητές συσκευές ή κακή σύνδεση, χωρίς κάποιο ουσιαστικό όφελος."</string>
     <string name="form_help_certified_voice_processing">"Αν χρησιμοποιείς μικρόφωνο πιστοποιημένο από το Discord, ορισμένες λειτουργίες επεξεργασίας φωνής δεν ρυθμίζονται πια από το Discord,
 αλλά από το μικρόφωνο."</string>
     <string name="form_help_channel_permissions">Επιλέγοντας ρόλους ορίζονται αυτόματα οι βασικές άδειες για αυτό το κανάλι.</string>
@@ -1122,11 +1104,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
 τα μηνύματα αυτού του διακομιστή ή όχι. Αυτή η ρύθμιση συνιστάται να ορίζεται μόνο σε @mentions για έναν δημόσιο διακομιστή Discord"</string>
     <string name="form_help_explicit_content_filter">"Αυτόματη σάρωση και διαγραφή μηνυμάτων που έχουν σταλεί σε αυτόν το διακομιστή και περιέχουν ακατάλληλο περιεχόμενο. Παρακαλούμε επέλεξε κατά πόσο
 το φίλτρο θα εφαρμοστεί στα μέλη του διακομιστή σου. **Συνιστούμε να ορίσεις φίλτρο για δημόσιο διακομιστή Discord.**"</string>
-    <string name="form_help_instant_invite_channel">"Εάν ένα κανάλι είναι επιλεγμένο τότε ένας σύνδεσμος άμεσης πρόσκλησης θα δημιουργηθεί με το widget,
-αλλιώς μόνο συνδεδεμένα μέλη και κανάλια φωνής θα παρέχονται."</string>
-    <string name="form_help_last_seen">"Η εκκαθάριση θα εκδιώξει **%1$s** που δεν έχουν
-εμφανιστεί τις τελευταίες **%2$s** και στα οποία δεν έχει ανατεθεί κάποιος ρόλος.
-Μπορούν να επανασυνδεθούν στο διακομιστή χρησιμοποιώντας μία νέα άμεση πρόσκληση."</string>
     <string name="form_help_legacy_subsystem">"Ορισμένα προγράμματα οδήγησης υλικού ήχου παρουσιάζουν προβλήματα κατά τη χρήση του σύγχρονου υποσυστήματος ήχου του λειτουργικού σου συστήματος.
 Επέλεξε αυτό το πλαίσιο για επιστροφή στη χρήση παλαιού τύπου υποσυστήματος ήχου."</string>
     <string name="form_help_nsfw">"Οι χρήστες θα πρέπει να επιβεβαιώσουν ότι η ηλικία τους είναι κατάλληλη για να δουν περιεχόμενο σε αυτό το κανάλι. Τα κανάλια 
@@ -1136,7 +1113,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="form_help_qos">"Ειδοποίηση του δρομολογητή σου ότι τα πακέτα του Discord που μεταδίδονται είναι υψηλής προτεραιότητας.
 Κάποιοι δρομολογητές ή πάροχοι διαδικτύου ενδέχεται να δυσλειτουργούν όταν αυτή η ρύθμιση είναι ενεργή."</string>
     <string name="form_help_slowmode">Τα μέλη θα περιορίζονται στην αποστολή ενός μηνύματος σε αυτό το διάστημα, εκτός κι αν έχουν άδεια Διαχείρισης Καναλιού ή Διαχείρισης Μηνυμάτων.</string>
-    <string name="form_help_system_channel">Αποστολή μηνύματος σε αυτό το κανάλι όταν κάποιος/α μπαίνει στον διακομιστή. Τα μηνύματα θα είναι τυχαία. Αυτή η επιλογή μπορεί να απενεργοποιηθεί οποιαδήποτε στιγμή.</string>
     <string name="form_help_temporary">Τα μέλη διώχνονται αυτόματα όταν αποσυνδεθούν, εκτός αν τους έχει δοθεί ένας ρόλος.</string>
     <string name="form_help_user_limit">"Περιορίζει τον αριθμό των χρηστών που μπορούν να συνδεθούν σε αυτό το κανάλι ομιλίας. Οι χρήστες με άδεια **Μετακίνησης Μελών** δεν
 δεσμεύονται αυτό το όριο και μπορούν να βάζουν άλλους χρήστες στο κανάλι."</string>
@@ -1180,8 +1156,8 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="form_label_input_mode">Λειτουργία εισόδου</string>
     <string name="form_label_input_sensitivty">Ευαισθησία εισόδου</string>
     <string name="form_label_input_volume">Ένταση εισόδου</string>
-    <string name="form_label_instant_invite">Καταχώρισε μια άμεση πρόσκληση</string>
-    <string name="form_label_instant_invite_channel">Κανάλι άμεσης πρόσκλησης</string>
+    <string name="form_label_instant_invite">Καταχώρισε μια πρόσκληση</string>
+    <string name="form_label_instant_invite_channel">Πρόσκληση καναλιού</string>
     <string name="form_label_last_seen">Τελευταία εμφάνιση</string>
     <string name="form_label_local_mute">Τοπική σίγαση</string>
     <string name="form_label_max_age">Λήξη σε</string>
@@ -1250,7 +1226,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="form_label_suppress_everyone">Καταστολή **@everyone** και **@here**</string>
     <string name="form_label_synced_role">Συγχρονισμένος ρόλος</string>
     <string name="form_label_synced_subs">Συγχρονισμένοι συνδρομητές</string>
-    <string name="form_label_system_channel">Κανάλι για μηνύματα νέων μελών</string>
     <string name="form_label_temporary">Προσωρινό μέλος</string>
     <string name="form_label_tts">Κείμενο σε ομιλία</string>
     <string name="form_label_tts_notifications">Ειδοποιήσεις κειμένου σε ομιλία</string>
@@ -1321,7 +1296,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="game_action_button_queue">Αναμονή Ενημέρωσης</string>
     <string name="game_action_button_queued">Σε αναμονή</string>
     <string name="game_action_button_restricted_in_region">Μη διαθέσιμο στη χώρα σου</string>
-    <string name="game_action_button_unavailable">Μη διαθέσιμο</string>
     <string name="game_action_button_unavailable_tooltip">Διαθέσιμο στις %1$s</string>
     <string name="game_action_button_unavailable_tooltip_plural">Διαθέσιμο στις %1$s ή %2$s</string>
     <string name="game_action_button_uninstalling_1">Απεγκατάσταση</string>
@@ -1352,7 +1326,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="game_feed_activity_recently_played">Παίχτηκε πρόσφατα</string>
     <string name="game_feed_activity_streaming_twitch">Ζωντανά στο Twitch</string>
     <string name="game_feed_current_header_title">Τώρα παίζει</string>
-    <string name="game_feed_settings_visibility">Εμφάνιση στην καρτέλα παιχνιδιών</string>
     <string name="game_feed_unknown_player">Άγνωστος παίκτης</string>
     <string name="game_feed_user_played_days_ago">Έπαιζε πριν %1$s %2$s</string>
     <string name="game_feed_user_played_hours_ago">Έπαιζε πριν %1$s %2$s</string>
@@ -1422,6 +1395,7 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="generate_a_new_link">Δημιούργησε έναν νέο σύνδεσμο</string>
     <string name="get_started">Ξεκίνα</string>
     <string name="gif_auto_play_label">Αυτόματη προβολή GIF όταν το Discord είναι απασχολημένο.</string>
+    <string name="go_live_hardware_acceleration_unavailable">Έχε τον νου σου, δεν μπορούμε να αναγνωρίσουμε τυχόν επιτάχυνση υλικού. Ο υπολογιστής σου ενδέχεται να δυσκολεύεται να υποστηρίξει το Go Live.</string>
     <string name="go_live_hey">Γεια!</string>
     <string name="go_live_listen">Ακούστε!</string>
     <string name="go_live_look">Δείτε!</string>
@@ -1435,6 +1409,7 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="go_live_modal_select_channel_form_title">Επιλέξτε ένα κανάλι ομιλίας</string>
     <string name="go_live_modal_select_channel_placeholder">Αναζήτηση καναλιών ομιλίας</string>
     <string name="go_live_modal_title">Πάμε Ζωντανά</string>
+    <string name="go_live_video_drivers_outdated">Τα προγράμματα οδήγησης βίντεο που έχεις είναι παλιά. Ανανέωσέ τα για να αποκτήσεις καλύτερη επίδοση στη λειτουργία Go Live.</string>
     <string name="grant_temporary_membership">Χορήγηση προσωρινής ιδιότητας μέλους</string>
     <string name="group">Ομάδα</string>
     <string name="group_dm_add_friends">Προσθέστε φίλους στα άμεσα μηνύματα</string>
@@ -1511,8 +1486,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Παραχωρήθηκε** %1$s για **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Μετακινήθηκε από **%1$s** σε **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">Στη θέση **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">Ο χρήστης $[**%1$s**](userHook) δημιούργησε ένα κανάλι κειμένου $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Το θέμα άλλαξε σε **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Το θέμα ορίστηκε σε **%1$s**</string>
@@ -1639,7 +1612,7 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="help_role_locked_mine">Ο ρόλος είναι κλειδωμένος επειδή είναι ο δικός σου ανώτατος ρόλος. Ζήτησε βοήθεια από ένα άτομο με υψηλότερο ρόλο ή από τον ιδιοκτήτη του διακομιστή.</string>
     <string name="help_singular_permission">Δεν μπορείς να τροποποιήσεις αυτήν την άδεια, επειδή η κατάργησή της θα την αφαιρέσει από εσένα.</string>
     <string name="hide_instant_invites_description">Συνιστώμενη επιλογή αν δεν θέλεις να μπαίνουν τυχαία άτομα να μπαίνουν στους διακομιστές σου στο Discord.</string>
-    <string name="hide_instant_invites_label">Απόκρυψη συνδέσμων άμεσων προσκλήσεων</string>
+    <string name="hide_instant_invites_label">Απόκρυψη συνδέσμων προσκλήσεων</string>
     <string name="hide_muted">Απόκρυψη %1$s Σιγάσεων</string>
     <string name="hide_muted_channels">Απόκρυψη σιγασμένων καναλιών</string>
     <string name="hide_personal_information_description">Κρύβει το e-mail, συνδεδεμένους λογαριασμούς, σημειώσεις και κάνει ανώνυμα τα DiscordTags.</string>
@@ -1686,7 +1659,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="hypesquad_question_11_response_d">Του λες ότι είναι καλύτερα να παίξει ντέφι</string>
     <string name="hypesquad_question_12_prompt">Έχεις ανέβει στην κορυφή του ψηλότερου βουνού και το μόνο που σε χωρίζει από τον θησαυρό είναι ο τρικέφαλος δράκος στον πύργο που σου στέκεται εμπόδιο. Εσύ:</string>
     <string name="hypesquad_question_12_response_a">Ορμάς στη μάχη</string>
-    <string name="hypesquad_question_12_response_b">Βλέπεις παλιές ταινίες με τον Γκοτζίλα για να πάρεις ιδέες από τις μάχες του με τον βασιλιά Γκιντόρα.</string>
     <string name="hypesquad_question_12_response_c">Προσπαθείς να πείσεις τον δράκο να μοιραστείτε τον θησαυρό</string>
     <string name="hypesquad_question_12_response_d">Δίνεις στον δράκο ένα αρκουδάκι Wumpus. Πώς γίνεται να μην το θέλει;</string>
     <string name="hypesquad_question_13_prompt">Τι είναι αυτός ο ήχος;</string>
@@ -1788,14 +1760,14 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="input_mode_ptt_release_delay">Καθυστέρηση απελευθέρωσης Push-to-Talk</string>
     <string name="input_mode_vad">Ανίχνευση ομιλίας</string>
     <string name="install_location_main">Κύρια τοποθεσία</string>
-    <string name="instant_invite">Άμεση πρόσκληση</string>
+    <string name="instant_invite">Πρόσκληση</string>
     <string name="instant_invite_accept">Αποδοχή πρόσκλησης</string>
-    <string name="instant_invite_accepted">Η άμεση πρόσκληση έγινε αποδεκτή</string>
-    <string name="instant_invite_accepting">Αποδοχή άμεσης πρόσκλησης</string>
+    <string name="instant_invite_accepted">Αποδέχτηκες την πρόσκληση</string>
+    <string name="instant_invite_accepting">Αποδοχή πρόσκλησης</string>
     <string name="instant_invite_ask_for_new_invite">Ζήτησε νέα πρόσκληση!</string>
     <string name="instant_invite_ask_user_for_new_invite">Ζήτησε από τον χρήστη %1$s νέα πρόσκληση!</string>
     <string name="instant_invite_code">Κωδικός</string>
-    <string name="instant_invite_expired">Η άμεση πρόσκληση είναι άκυρη ή έχει λήξει.</string>
+    <string name="instant_invite_expired">Η πρόσκληση δεν είναι έγκυρη ή έχει λήξει.</string>
     <string name="instant_invite_expires">Λήγει σε</string>
     <string name="instant_invite_failed_to_generate">Αποτυχία δημιουργίας συνδέσμου πρόσκλησης.</string>
     <string name="instant_invite_generate">Δημιουργία</string>
@@ -1813,16 +1785,15 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="instant_invite_regenerate">Επαναδημιουργία</string>
     <string name="instant_invite_resolved_body">Έχεις προσκληθεί στο κανάλι **%1$s** στον διακομιστή **%2$s**.</string>
     <string name="instant_invite_resolved_title">Επ, γεια σου βρε.</string>
-    <string name="instant_invite_resolving">Φόρτωση άμεσης πρόσκλησης</string>
+    <string name="instant_invite_resolving">Φόρτωση πρόσκλησης</string>
     <string name="instant_invite_uses">Χρήσεις</string>
     <string name="instant_invite_you_are_already_a_member_of">Είσαι ήδη μέλος του</string>
     <string name="instant_invite_you_have_been_invited_to_join">Έχεις λάβει πρόσκληση για να γίνεις μέλος στο</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">Ο χρήστης **%1$s** σε έχει προσκαλέσει να γίνεις μέλος</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Έχεις λάβει πρόσκληση για να συμμετάσχεις σε μια ομάδα άμεσων μηνυμάτων από τον χρήστη</string>
-    <string name="instant_invites">Άμεσες προσκλήσεις</string>
+    <string name="instant_invites">Προσκλήσεις</string>
     <string name="integration_settings">Ρυθμίσεις ενσωμάτωσης</string>
     <string name="integrations">Ενσωματώσεις</string>
-    <string name="integrations_header">Συνδεδεμένοι λογαριασμοί Twitch/YouTube Gaming</string>
     <string name="integrations_pro_tip">Για περισσότερες ενσωματώσεις δες το [Discord StreamKit](%1$s).</string>
     <string name="internal_server_error">Παρουσιάστηκε ένα εσωτερικό σφάλμα διακομιστή, προσπάθησε ξανά.</string>
     <string name="invalid_animated_emoji_body">Αυτό το emoji δεν λειτουργεί επειδή είναι κινούμενο. Κάνε αναβάθμιση σε Discord Nitro για να εκπληρώσεις όλα τα όνειρα σου με κινούμενα emoji</string>
@@ -1935,13 +1906,13 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="join_afk_channel_body">Φαίνεται πως έχεις συνδεθεί στον κανάλι AFK. Δεν μπορείς να μιλήσεις σε αυτό το κανάλι.</string>
     <string name="join_call">Συμμετοχή στην κλήση</string>
     <string name="join_server">Γίνε μέλος</string>
-    <string name="join_server_button_body">Καταχώρισε μια άμεση πρόσκληση και συνδέσου στον διακομιστή ενός φίλου.</string>
+    <string name="join_server_button_body">Καταχώρισε μια πρόσκληση και συνδέσου στον διακομιστή ενός φίλου σου.</string>
     <string name="join_server_button_cta">Συνδεθείτε σε διακομιστή</string>
     <string name="join_server_button_cta_mobile">Σύνδεση σε διακομιστή με έναν σύνδεσμο πρόσκλησης</string>
     <string name="join_server_button_cta_mobile_desc">Έχετε κωδικό πρόσκλησης ή σύνδεσμο; Βάλτε το εδώ!</string>
     <string name="join_server_button_cta_named">Σύνδεση στο %1$s</string>
-    <string name="join_server_description">Καταχώρισε μια άμεση πρόσκληση ώστε να συνδεθείς σε έναν υπάρχοντα διακομιστή. Η πρόσκληση μοιάζει κάπως έτσι:</string>
-    <string name="join_server_description_mobile">Καταχώρισε παραπάνω μια άμεση πρόσκληση για να εγγραφείς σε έναν υπάρχοντα διακομιστή.</string>
+    <string name="join_server_description">Καταχώρισε παρακάτω μια πρόσκληση ώστε να συνδεθείς σε έναν υπάρχοντα διακομιστή. Η πρόσκληση μοιάζει κάπως έτσι:</string>
+    <string name="join_server_description_mobile">Καταχώρισε παραπάνω μια πρόσκληση για να συνδεθείς σε έναν υπάρχοντα διακομιστή.</string>
     <string name="join_server_title">Συνδέσου σε διακομιστή</string>
     <string name="join_stream">Μπείτε στη ζωντανή μετάδοση</string>
     <string name="join_video_call">Συμμετοχή στη βιντεοκλήση</string>
@@ -2049,7 +2020,7 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="link_your_xbox_account_2">Το Discord είναι μια εφαρμογή φωνητικών, γραπτών συνομιλιών και βιντεοκλήσεων για gamers. Είναι δωρεάν, ασφαλής και λειτουργεί σε υπολογιστή και κινητή συσκευή.</string>
     <string name="listening_to">Ακούει **%1$s**</string>
     <string name="live">Ζωντανά</string>
-    <string name="live_beta_description">Καλώς ήρθατε στη ζωντανή μετάδοση! Η λειτουργία «Πάμε Ζωντανά» είναι σε δοκιμαστική έκδοση (Beta). Λυπούμαστε για τυχόν προβληματάκια</string>
+    <string name="live_beta_description">Καλώς ήρθες στο stream! Η λειτουργία Go Live είναι σε δοκιμαστική έκδοση (Beta). Σόρρυ αν υπάρχουν προβληματάκια</string>
     <string name="live_on_twitch">Ζωντανά στο Twitch</string>
     <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Αποτυχία φόρτωσης της εικόνας.
@@ -2235,14 +2206,11 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="no_emoji_title">Κανένα emoji</string>
     <string name="no_input_devices">Καμία συσκευή εισόδου</string>
     <string name="no_input_devices_detected">Δεν εντοπίστηκαν συσκευές εισόδου, σύνδεσε μία και προσπάθησε ξανά.</string>
-    <string name="no_instant_invite">Καμία άμεση πρόσκληση</string>
-    <string name="no_integrations">[Σύνδεσε](onConnect) τον συνεργαζόμενο λογαριασμό σου Twitch ή YouTube Gaming για να συγχρονίσεις τους συνδρομητές/χορηγούς σου με έναν ρόλο</string>
+    <string name="no_instant_invite">Καμία πρόσκληση</string>
     <string name="no_integrations_body">Το πρωτόκολλο FR13NDSHIP μπορεί να εκτελεσθεί μόνο από την εφαρμογή-πελάτη Discord</string>
     <string name="no_integrations_label">Καμία ενσωμάτωση</string>
-    <string name="no_invites_body">"Νιώθεις χαμένος; Σαν ένας χαρταετός που βολοδέρνει στους ουρανούς;
-Βρες μερικούς φίλους εδώ δημιουργώντας έναν άμεσο σύνδεσμο πρόσκλησης!"</string>
-    <string name="no_invites_caption">Καμία άμεση πρόσκληση ακόμη!</string>
-    <string name="no_invites_label">Καμία άμεση πρόσκληση ακόμη</string>
+    <string name="no_invites_caption">Καμία πρόσκληση ακόμη!</string>
+    <string name="no_invites_label">Καμία πρόσκληση ακόμη</string>
     <string name="no_mail_account_description">Παρακαλούμε στείλε τα σχόλιά σου στο support@discordapp.com, εμείς αντιγράψαμε τις πληροφορίες χρήστη σου στο πρόχειρο.</string>
     <string name="no_mail_account_title">Δεν υπάρχει λογαριασμός αλληλογραφίας</string>
     <string name="no_mic_body">Οδηγίες για ενεργοποίηση πρόσβασης στο μικρόφωνο μπορείς να βρεις στο κέντρο βοήθειας του Discord.</string>
@@ -2260,7 +2228,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="no_reactions_header">Δεν υπάρχουν αντιδράσεις</string>
     <string name="no_recent_mentions">Εν αρχή ην… σιωπή.</string>
     <string name="no_send_messages_permission_placeholder">Δεν έχεις άδεια αποστολής μηνυμάτων σε αυτό το κανάλι.</string>
-    <string name="no_system_channel">Χωρίς μηνύματα σχετικά με νέα μέλη</string>
     <string name="no_text">Όχι</string>
     <string name="no_thanks">Όχι ευχαριστώ</string>
     <string name="no_user_limit">Κανένα όριο</string>
@@ -2272,7 +2239,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="note">Σημείωση</string>
     <string name="note_placeholder">Κάνε κλικ για να προσθέσεις μια σημείωση</string>
     <string name="note_placeholder_mobile">Πάτησε για να προσθέσεις μια σημείωση</string>
-    <string name="notice_application_test_mode">Η δοκιμαστική λειτουργία είναι ενεργή για **%1$s**. Θα εμφανιστούν αδημοσίευτα SKU και δεν θα χρεωθείς για καμία σχετική πληρωμή.</string>
     <string name="notice_application_test_mode_go_to_listing">Πήγαινε στα SKU</string>
     <string name="notice_connect_spotify">Συνδέστε τον λογαριασμό σου Spotify για να εμφανίζεται η μουσική σου στην κατάστασή σου!</string>
     <string name="notice_connection_conflict">Η φωνή σου αποσυνδέθηκε επειδή έχεις συνδεθεί από άλλη τοποθεσία.</string>
@@ -2283,7 +2249,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="notice_dispatch_error_disk_low">Δεν έχεις αρκετό χώρο στον δίσκο. Απαιτούνται %1$s αλλά μόνο %2$s είναι διαθέσιμα.</string>
     <string name="notice_dispatch_error_file_name_too_long">Ωχ όχι, τα ονόματα των αρχείων αυτού του παιχνιδιού είναι πολύ μεγάλα για τα Windows. Παρακαλούμε διάλεξε έναν συντομότερο φάκελο εγκατάστασης.</string>
     <string name="notice_dispatch_error_invalid_drive">Ωχ όχι, η τοποθεσία εγκατάστασης που επέλεξες δεν είναι έγκυρη. Επέλεξες το %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Δεν καταφέραμε να ενημερώσουμε το παιχνίδι. Λειτουργεί τώρα;</string>
     <string name="notice_dispatch_error_no_manifests">Ωχ όχι, φαίνεται πως δεν υπάρχει περιεχόμενο γι’ αυτό το παιχνίδι. Παρακαλούμε επικοινώνησε με την υποστήριξη.</string>
     <string name="notice_dispatch_error_not_entitled">Ωχ όχι, φαίνεται πως δεν σου ανήκει αυτό το παιχνίδι. Επικοινώνησε με την υποστήριξη αν πιστεύεις ότι έγινε κάποιο λάθος.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Φαίνεται πως δεν έχεις επιτρέψει την εγκατάσταση ενός σεναρίου. Πρέπει να την επιτρέψεις για να εγκατασταθεί το παιχνίδι.</string>
@@ -2298,9 +2263,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="notice_native_apps">Χρειάζεσαι τη λειτουργία Push-to-Talk για ολόκληρο το σύστημα; Κατέβασε την εφαρμογή για υπολογιστή!</string>
     <string name="notice_no_input_detected">Λοιπόν, φαίνεται πως το Discord δεν ανιχνεύει ήχο από το μικρόφωνό σου. Ας το φτιάξουμε αυτό… μαζί.</string>
     <string name="notice_no_input_detected_help_link_text">Βοήθεια!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Η πρόσβασή σου στο Nitro έληξε. Αναβάθμισε το Nitro Classic σε Nitro για απεριόριστη πρόσβαση σε φοβερά παιχνίδια.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Σου απομένει μόνο %1$s για παιχνίδια Nitro! Η πρόσβασή σου λήγει στις **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Ευχαριστούμε που στηρίζεις από νωρίς το Nitro! Για να σε ανταμείψουμε, έχεις πρόσβαση στα παιχνίδια Nitro μέχρι τις %1$s.</string>
     <string name="notice_premium_promo_action">Τσεκάρέ το</string>
     <string name="notice_premium_promo_message">Στήριξε την ανάπτυξη του Discord και κέρδισε διασκεδαστικά προνόμια!</string>
     <string name="notice_scheduled_maintenance">Το Discord θα βρίσκεται υπό προγραμματισμένη συντήρηση στις **%1$s** και ώρα **%2$s**.</string>
@@ -2370,7 +2332,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Η επικάλυψη είναι ενεργοποιημένη</string>
     <string name="nux_post_reg_join_server_description">Αξιοποίησε το Discord στο μέγιστο, συμμετέχοντας σε έναν διακομιστή.</string>
     <string name="nux_post_reg_join_server_skip">Δεν έχω</string>
     <string name="nux_post_reg_join_server_title">Έχεις πρόσκληση;</string>
@@ -2416,7 +2377,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="overlay_menu_get_invite">Πάρτε έναν σύνδεσμο πρόσκλησης</string>
     <string name="overlay_menu_open_discord">Ανοίξτε το Discord</string>
     <string name="overlay_menu_switch_channels">Εναλλαγή καναλιών</string>
-    <string name="overlay_mobile_toggle_desc">Δείτε ποιος μιλάει και αποκτήστε πρόσβαση σε συντομεύσεις ενώ χρησιμοποιείτε άλλες εφαρμογές όταν είστε συνδεδεμένοι με τη φωνή</string>
     <string name="overlay_mobile_toggle_label">Ενεργοποιήστε την επικάλυψη φωνής για κινητά</string>
     <string name="overlay_mobile_unauthed">Συνδεθείτε στη εφαρμογή της Discord για να ενεργοποιήσετε αυτή τη λειτουργία</string>
     <string name="overlay_news_go_live_body">Επιθυμείτε να κάνετε ζωντανή μετάδοση %1$s στους φίλους σας σε %2$s;</string>
@@ -2424,7 +2384,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="overlay_news_text_pinning_body">Τώρα μπορείς να καρφιτσώνεις γραπτές συνομιλίες στο παιχνίδι σου!</string>
     <string name="overlay_news_text_pinning_tip">Συμβουλή: Μπορείς να καρφιτσώσεις μια συνομιλία πατώντας το $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Αναβάθμιση Discord overlay</string>
-    <string name="overlay_no_results">Ψάξαμε παντού Δυστυχώς, δεν βρέθηκαν κανάλια ομιλίας</string>
     <string name="overlay_notification_incoming_call">Εισερχόμενη κλήση…</string>
     <string name="overlay_notification_settings_disabled">Απενεργοποιημένες ειδοποιήσεις</string>
     <string name="overlay_notification_settings_position">Προβολή: %1$s</string>
@@ -2434,7 +2393,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="overlay_notifications_settings">Ειδοποιήσεις επικάλυψης (Overlay)</string>
     <string name="overlay_notifications_top_left">Πάνω αριστερά</string>
     <string name="overlay_notifications_top_right">Πάνω δεξιά</string>
-    <string name="overlay_private_channels_empty_state">Όχι, δεν υπάρχουν προσωπικά μηνύματα εδώ.</string>
     <string name="overlay_reload">Επαναφόρτωση Overlay</string>
     <string name="overlay_settings">Ρυθμίσεις Overlay</string>
     <string name="overlay_settings_general_tab">Γενικά</string>
@@ -2549,18 +2507,11 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="popout_stay_on_top">Παραμονή στην κορυφή</string>
     <string name="post_code">Ταχυδρομικός Κώδικας</string>
     <string name="premium_alert_error_title">Ωχ! Κάτι πήγε στραβά…</string>
-    <string name="premium_applications_grandfathered_monthly">Για να σ’ ευχαριστήσουμε που στηρίζεις το Discord, σου δίνουμε πρόσβαση σε παιχνίδια Nitro για έναν χρόνο. Η πρόσβασή σου λήγει στις **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">Για να σ’ ευχαριστήσουμε που στηρίζεις το Discord, σου δίνουμε πρόσβαση σε παιχνίδια Nitro για δύο χρόνια. Η πρόσβασή σου λήγει στις **%1$s**.</string>
-    <string name="premium_applications_subtitle">Απεριόριστη πρόσβαση σε μια όλο και μεγαλύτερη βιβλιοθήκη βραβευμένων παιχνιδιών που προτείνουμε να παίξετε οπωσδήποτε εσύ και οι φίλοι σου.</string>
-    <string name="premium_applications_title">Δεκάδες διαλεχτά παιχνίδια. Μία ενιαία και χαμηλή μηνιαία τιμή.</string>
     <string name="premium_badge_tooltip">Συνδρομητής από %1$s</string>
     <string name="premium_cancel_cancel">Όχι</string>
     <string name="premium_cancel_confirm_body_tier_1">"Η ακύρωση θα τεθεί σε ισχύ στο τέλος της τρέχουσας περιόδου χρέωσης στις **%1$s**. Η ετικέτα Discord θα γίνει τυχαία αν την έχεις αλλάξει.
 
 Μπορείς να ξεκινήσεις ξανά τη συνδρομή σου όποτε θέλεις."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Η ακύρωση θα τεθεί σε ισχύ στο τέλος της τρέχουσας περιόδου χρέωσης. Στις **%1$s**, θα χάσεις την πρόσβασή σου σε όλα τα παιχνίδια Nitro στη βιβλιοθήκη σου και η ετικέτα του Discord σου θα γίνει τυχαία αν την έχεις αλλάξει.
-
-Θα φυλάξουμε τα αποθηκευμένα σου αρχεία για την περίπτωση που αλλάξεις γνώμη. Μπορείς να γίνεις ξανά συνδρομητής όποτε θέλεις!"</string>
     <string name="premium_cancel_confirm_new">Ω ναι, Ακύρωση %1$s</string>
     <string name="premium_cancel_confirm_title">Ακύρωση %1$s;</string>
     <string name="premium_cancel_failed_body">Δεν μπορέσαμε να ακυρώσουμε τη Nitro συνδρομή σου. Παρακαλούμε προσπάθησε ξανά ή μίλα με την ομάδα υποστήριξης, αν συνεχιστεί αυτό το πρόβλημα.</string>
@@ -2577,7 +2528,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="premium_chat_perks_description_custom_emoji">Απόκτησε ένα διεθνές διαβατήριο για να χρησιμοποιείς τα προσαρμοσμένα σου emoji παντού.</string>
     <string name="premium_chat_perks_description_discriminator">Μπορείς να διαλέξεις την ετικέτα σου όσο είσαι συνδρομητής.</string>
     <string name="premium_chat_perks_description_screenshare">Αναβάθμισε το παιχνίδι σου με μερισμό οθόνης 720p 60fps ή 1080p 30fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Μεγάλο μέγεθος αρχείου μεταφόρτωσης για %1$s από %2$s για να μοιράζεσαι memes σε υψηλή ανάλυση.</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Εικονογραφημένη διασκέδαση</string>
     <string name="premium_chat_perks_title_badge">Δήλωσε την Υποστήριξή Σου</string>
     <string name="premium_chat_perks_title_custom_emoji">Γενικά Προσαρμοσμένα Emojis</string>
@@ -2585,11 +2535,7 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="premium_chat_perks_title_screenshare">Βίντεο Υψηλότερης Ποιότητας</string>
     <string name="premium_code_redemption_confirmation_blurb">Χάρις σε μια τυχαία σειρά ψηφίων, τώρα έχεις βελτιώσει τα προνόμια συνομιλίας για %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">Τι ωραία!</string>
-    <string name="premium_feature_new_chat_perks_header">Θα λάβεις επίσης ορισμένα βελτιωμένα προνόμια συνομιλιών:</string>
-    <string name="premium_feature_new_premium_applications_header">Παιχνίδια αξίας πάνω από %1$s. Δες τα:</string>
-    <string name="premium_feature_view_applications">Προβολή Όλων των Παιχνιδιών Nitro</string>
     <string name="premium_features_chat_perks">Προνόμια Συνομιλίας</string>
-    <string name="premium_features_premium_applications">Δωρεάν Παιχνίδια Nitro</string>
     <string name="premium_grandfathered_warning">Για να σ’ ευχαριστήσουμε για την υποστήριξη, σου δίνουμε έκπτωση στη Nitro συνδρομή σου. **Ακυρώνοντας ή αλλάζοντας τη συνδρομή σου, θα χάσεις αυτήν την έκπτωση.** Εμείς σε προειδοποιήσαμε!!!!!</string>
     <string name="premium_grandfathered_warning_confirm">Κάνε το έτσι κι αλλιώς</string>
     <string name="premium_grandfathered_warning_title">Προσοχή, φίλε</string>
@@ -2599,10 +2545,7 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="premium_not_claimed">Κατοχύρωσε τον λογαριασμό σου πρώτα</string>
     <string name="premium_not_claimed_body">Έι, φίλε! Αν θέλεις να αγοράσεις τη Nitro, θα χρειαστεί να κατοχυρώσεις πρώτα τον λογαριασμό σου για να μην χάσεις το υλικό σου.</string>
     <string name="premium_not_verified">Επιβεβαίωσε πρώτα το email σου</string>
-    <string name="premium_not_verified_body">Έι, φίλε! Αν θέλεις να αγοράσεις το Nitro, πρέπει πρώτα να επαληθεύσεις το email σου. Έλεγξε το email σου ή στείλε νέο αίτημα αποστολής.</string>
-    <string name="premium_payment_applications_os_warning">Τα παιχνίδια Nitro υποστηρίζονται μόνο από τα Windows.</string>
     <string name="premium_payment_confirmation_blurb_regular">Τώρα κέρδισες ενισχυμένα προνόμια συνομιλίας. Σταμάτα να διαβάζεις αυτό το μήνυμα και πήγαινε να τσατάρεις!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Τώρα έχεις απεριόριστη πρόσβαση σε πολλά φοβερά παιχνίδια. Σταμάτα να διαβάζεις αυτό το μήνυμα και πήγαινε να παίξεις!!!</string>
     <string name="premium_payment_confirmation_button_regular">Ντάξει, καλό μου ακούγεται</string>
     <string name="premium_plan_month">Nitro Μηνιαία</string>
     <string name="premium_plan_month_tier_1">Μηνιαίο Nitro Classic</string>
@@ -2623,13 +2566,10 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="premium_upgrade_disabled_current_tooltip">Το τρέχον πρόγραμμά σου.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Πριν διαλέξεις ένα πρόγραμμα κατώτερης κατηγορίας, πρέπει πρώτα να ακυρώσεις τη συνδρομή σου και να περιμένεις να λήξει.</string>
     <string name="premium_upgrade_done_body_tier_1">Τώρα έχεις περισσότερα προνόμια συνομιλίας!</string>
-    <string name="premium_upgrade_done_body_tier_2">Τώρα έχεις περισσότερα προνόμια συνομιλίας και πρόσβαση σε δεκάδες παιχνίδια.</string>
     <string name="premium_upgrade_done_button_tier_1">Τι καλά!</string>
-    <string name="premium_upgrade_done_button_tier_2">Δες όλα τα παιχνίδια Nitro</string>
     <string name="premium_upgrade_failed_body">Εεε.. Αυτή η αναβάθμιση δεν λειτούργησε. Βεβαιώσου ότι τα στοιχεία πληρωμής σου είναι ενημερωμένα και προσπάθησε ξανά.</string>
     <string name="premium_upload_promo">Αναβάθμιση σε Discord Nitro για %1$s όριο αρχείου</string>
     <string name="premium_year_free_months">Κέρδισε 2 μήνες δωρεάν!</string>
-    <string name="premium_year_free_months_short">2 μήνες δωρεάν</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / χρόνο</string>
     <string name="preview_chat">Προεπισκόπηση συνομιλίας</string>
     <string name="priority_speaker">Ομιλητής με προτεραιότητα</string>
@@ -2814,7 +2754,7 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="scope_guilds">Γνωρίζει σε τι διακομιστές είσαι μέλος</string>
     <string name="scope_guilds_empty">Δεν είσαι σε κανέναν διακομιστή.</string>
     <string name="scope_guilds_join">Συμμετέχει σε διακομιστές για εσένα</string>
-    <string name="scope_guilds_join_description">Χρήση άμεσων προσκλήσεων για λογαριασμό σου.</string>
+    <string name="scope_guilds_join_description">Χρήση προσκλήσεων για λογαριασμό σου.</string>
     <string name="scope_identify">Πρόσβαση στο όνομα χρήστη και τη φωτογραφία σου</string>
     <string name="scope_messages_read">Διάβασε όλα τα μηνύματα</string>
     <string name="scope_messages_read_description">Αυτό επιτρέπει στην εφαρμογή να διαβάζει όλα τα μηνύματα που είναι προσβάσιμα μέσω του λογαριασμού Discord σου</string>
@@ -2882,7 +2822,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="search_filter_on">σε</string>
     <string name="search_for_emoji">Βρες το τέλειο emoji</string>
     <string name="search_for_empty">Αναζήτηση</string>
-    <string name="search_for_value">Αναζήτηση για: **%1$s **</string>
     <string name="search_group_header_channels">Στο κανάλι</string>
     <string name="search_group_header_dates">Ημερομηνίες</string>
     <string name="search_group_header_file_name">Το όνομα αρχείου περιέχει</string>
@@ -3087,8 +3026,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="stop_ringing">Τέλος κλήσης</string>
     <string name="stop_streaming">Διακοπή ζωντανής μετάδοσης</string>
     <string name="stop_watching">Διακοπή παρακολούθησης</string>
-    <string name="store_payment_legalese_monthly">Γεια! Αγοράζοντας το %1$s, συμφωνείς με τους [Όρους Παροχής Υπηρεσιών του Καταστήματος] (%2$s). Η %1$s είναι περιοδική συνδρομή, δηλαδή θα σε χρεώσουμε σήμερα και θα συνεχίσουμε να σε χρεώνουμε κάθε μήνα μέχρι να ακυρώσεις τη συνδρομή σου. Μπορείς να ακυρώσεις τη συνδρομή σου όποτε θέλεις, από την οθόνη Ρυθμίσεις Χρήστη.</string>
-    <string name="store_payment_legalese_yearly">Γεια! Αγοράζοντας το %1$s, συμφωνείς με τους [Όρους Παροχής Υπηρεσιών του Καταστήματος] (%2$s). Η %1$s είναι περιοδική συνδρομή, δηλαδή θα σε χρεώσουμε σήμερα και θα συνεχίσουμε να σε χρεώνουμε κάθε χρόνο μέχρι να ακυρώσεις τη συνδρομή σου. Μπορείς να ακυρώσεις τη συνδρομή σου όποτε θέλεις, από την οθόνη Ρυθμίσεις Χρήστη.</string>
     <string name="stream">Πάμε Ζωντανά</string>
     <string name="stream_bad_spectator">Η ζωντανή μετάδοση που παρακολουθείτε, προς το παρόν, έχει μειωμένη ποιότητα εικόνας ή ήχου. Αυτό ίσως οφείλεται στις συνθήκες δικτύου.</string>
     <string name="stream_bad_streamer">Προς το παρόν, η ζωντανή σας μετάδοση έχει μειωμένη ποιότητα εικόνας ή ήχου. Αυτό ίσως οφείλεται στις συνθήκες δικτύου.</string>
@@ -3096,7 +3033,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="stream_capture_paused_details">Πηγαίνετε πίσω στο παιχνίδι σας για να συνεχίσετε.</string>
     <string name="stream_capture_paused_details_viewer">Ο χρήσης %1$s έχει ελαχιστοποιήσει το παιχνίδι… περιμένετε!</string>
     <string name="stream_channel_description">Τα μέλη με αυτή την άδεια μπορούν να κάνουν ζωντανή μετάδοση σε αυτό το κανάλι.</string>
-    <string name="stream_description">Τα μέλη με αυτή την άδεια μπορούν να μπουν σε αυτό το κανάλι.</string>
     <string name="stream_ended">Αυτή η ζωντανή μετάδοση έχει τελειώσει. *ήχος τριζονιού*</string>
     <string name="stream_ended_button">Η ζωντανή μετάδοση έχει τελειώσει</string>
     <string name="stream_ended_no_spectators">Δεν υπάρχουν θεατές, επειδή αυτή η ζωντανή μετάδοση έχει τελειώσει.</string>
@@ -3136,7 +3072,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="stream_report_rating_body_streamer">Πείτε μας για την εμπειρία σας με τη ζωντανή μετάδοση.</string>
     <string name="stream_report_submit">Υποβολή</string>
     <string name="stream_reported">Τα σχόλια υποβλήθηκαν</string>
-    <string name="stream_reported_body">Σας ευχαριστούμε που αναφέρατε το πρόβλημά σας! Τα σχόλιά σας μας βοηθούν να βελτιώσουμε την ποιότητα της ζωντανής μετάδοσης.</string>
     <string name="stream_soundshare_failed">Κάτι πήγε στραβά και δεν μπορέσαμε να μεταδώσουμε ζωντανά τον ήχο από το παιχνίδι σας.</string>
     <string name="streamer_mode">Λειτουργία ζωντανής ροής</string>
     <string name="streamer_mode_enabled">Λειτουργία ζωντανής ροής ενεργοποιημένη</string>
@@ -3194,7 +3129,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="system_message_guild_member_join_10">Ένας άγριος %1$s εμφανίστηκε.</string>
     <string name="system_message_guild_member_join_11">Σγοοοους. Ο χρήστης %1$s μόλις προσγειώθηκε.</string>
     <string name="system_message_guild_member_join_12">Κρατηθείτε γερά. Ο χρήστης %1$s μόλις μπήκε στον διακομιστή.</string>
-    <string name="system_message_guild_member_join_13">Ο χρήστης %1$s μόλις μπήκε. Κρύψτε τις μπανάνες σας.</string>
     <string name="system_message_guild_member_join_14">Ο χρήστης %1$s μόλις έφτασε. Φαίνεται να έχει δύναμη OP - παρακαλώ νερφάρετε.</string>
     <string name="system_message_guild_member_join_15">Ο χρήστης %1$s μόλις μπήκε γλιστρώντας στον διακομιστή.</string>
     <string name="system_message_guild_member_join_16">Ένα %1$s γεννήθηκε στον διακομιστή.</string>
@@ -3206,7 +3140,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="system_message_guild_member_join_22">Είναι πουλί; Είναι αεροπλάνο; Όχι, είναι απλώς ο χρήστης %1$s.</string>
     <string name="system_message_guild_member_join_23">Είναι ο χρήστης %1$s! Δόξα στον ήλιο! \\\\[T]/</string>
     <string name="system_message_guild_member_join_24">Ποτέ δεν πρόκειται να σε παρατήσω [%1$s] (usernameOnClick) . Ποτέ δεν πρόκειται να σε αφήσω [!! %1$s] (usernameOnClick) κάτω.</string>
-    <string name="system_message_guild_member_join_25">Χα! Ο χρήστης %1$s ήρθε! Ενεργοποίησες την κάρτα παγίδα μου!</string>
     <string name="system_message_guild_member_join_26">Εβίβα, αγάπη! Ο χρήστης %1$s είναι εδώ!</string>
     <string name="system_message_guild_member_join_27">Έι! Ακούστε! Ο χρήστης %1$s ήρθε!</string>
     <string name="system_message_guild_member_join_28">Σε περιμέναμε %1$s</string>
@@ -3357,8 +3290,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="unsupported_browser">Μη υποστηριζόμενο πρόγραμμα περιήγησης</string>
     <string name="unsupported_browser_body">"Χρησιμοποιείς ένα πρόγραμμα περιήγησης που δεν υποστηρίζεται. Για να δεις όλα όσα έχει να προσφέρει το Discord, αναβάθμισε το
 πρόγραμμα περιήγησης ή κατέβασε μια από τις εφαρμογές μας."</string>
-    <string name="unsupported_browser_details">"Θες να μπορείς να μιλάς με την ομάδα σου, σωστά; Εγκατέστησε την πιο πρόσφατη έκδοση του Chrome, του Opera, τον Firefox 38 + ή κατέβασε
-την εφαρμογή-πελάτη Discord και ξεκίνα να μιλάς αυτήν τη στιγμή!"</string>
     <string name="unsupported_browser_title">Λοιπόν, αυτή είναι μια αμήχανη στιγμή</string>
     <string name="unverified_account_body">"Παρακαλούμε έλεγξε το email σου και ακολούθησε τις οδηγίες για να το επαληθεύσεις.
 
@@ -3476,8 +3407,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="user_settings_appearance_preview_message_4">H συμπαγής λειτουργία θα ενεργοποιηθεί</string>
     <string name="user_settings_appearance_preview_message_5">Ω, εδώ είναι!</string>
     <string name="user_settings_appearance_zoom_tip">Μπορείς να αλλάξεις το μέγεθος προβολής με %1$s +/-, και να το επαναφέρεις στην προεπιλογή με %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Εμφάνιση καρτέλας παιχνιδιών</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Απενεργοποίησέ τη για να αποκρύψεις την καρτέλα παιχνιδιών και να αφοσιωθείς στις συζητήσεις σου.</string>
     <string name="user_settings_close_button">Κουμπί κλεισίματος</string>
     <string name="user_settings_confirm_logout">Είσαι σίγουρος ότι θες να αποσυνδεθείς;</string>
     <string name="user_settings_game_activity">Δραστηριότητα παιχνιδιού</string>
@@ -3537,8 +3466,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="vanity_url_hint_mobile">το-url-σου-εδώ</string>
     <string name="verfication_expired">Η διεύθυνση επαλήθευσης email έχει λήξει.</string>
     <string name="verfication_expired_suggestion">Συνδέσου στο Discord και στείλε τον σύνδεσμο ξανά</string>
-    <string name="verification_body">"Εντοπίσαμε κάτι ασυνήθιστο.
-Για να συνεχίσεις να χρησιμοποιείς το Discord, **θα πρέπει να επαληθεύσεις ότι είσαι άνθρωπος.**"</string>
     <string name="verification_body_alt">Ας σιγουρευτούμε τώρα ότι είσαι άνθρωπος.</string>
     <string name="verification_email_body">Σου έχουμε στείλει ένα νέο Email επαλήθευσης στο **%1$s**, παρακαλούμε έλεγξε τα εισερχόμενα και ανεπιθύμητα email σου.</string>
     <string name="verification_email_error_body">Παρουσιάστηκε ένα σφάλμα κατά την αποστολή email επαλήθευσης. Προσπάθησε ξανά αργότερα ή επικοινώνησε με την υποστήριξη.</string>
@@ -3579,8 +3506,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="video">Βίντεο</string>
     <string name="video_call">Κλήση βίντεο</string>
     <string name="video_connect">Βίντεο</string>
-    <string name="video_poor_connection_body">Το βίντεο έχει απενεργοποιηθεί. Θα επανέλθει όταν η σύνδεσή σου βελτιωθεί.</string>
-    <string name="video_poor_connection_title">Σύνδεση κακής ποιότητας</string>
     <string name="video_preview">Προεπισκόπηση βίντεο</string>
     <string name="video_settings">Ρυθμίσεις βίντεο</string>
     <string name="video_unavailable">Το βίντεο δεν είναι διαθέσιμο</string>
diff --git a/com.discord/res/values-es-rES/plurals.xml b/com.discord/res/values-es-rES/plurals.xml
index 37b4a390cd..be857b740a 100644
--- a/com.discord/res/values-es-rES/plurals.xml
+++ b/com.discord/res/values-es-rES/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">no hay espacios</item>
         <item quantity="one">%d espacio</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d días</item>
-        <item quantity="one">1 día</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d miembros</item>
-        <item quantity="zero">0 miembros</item>
-        <item quantity="one">1 miembro</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">días</item>
         <item quantity="one">día</item>
@@ -212,16 +203,6 @@
         <item quantity="other">permisos</item>
         <item quantity="one">un permiso</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Ha establecido el modo pausado a **!!%d!! segundos**</item>
-        <item quantity="zero">Ha deshabilitado el modo pausado</item>
-        <item quantity="one">Ha establecido el modo pausado a **1 segundo**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Ha establecido el modo pausado a **!!%d!! segundos**</item>
-        <item quantity="zero">Ha establecido el modo pausado como deshabilitado</item>
-        <item quantity="one">Ha establecido el modo pausado a **1 segundo**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! miembros**</item>
         <item quantity="one">**un miembro**</item>
@@ -321,10 +302,6 @@
         <item quantity="other">%d mensajes nuevos</item>
         <item quantity="one">1 mensaje nuevo</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d días</item>
-        <item quantity="one">un día</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d canales</item>
         <item quantity="one">%d canal</item>
@@ -342,14 +319,6 @@
         <item quantity="other">estos mensajes</item>
         <item quantity="one">este mensaje</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** servidores no están disponibles debido a una interrupción temporal.</item>
-        <item quantity="one">**1** servidor no está disponible debido a una interrupción temporal.</item>
-    </plurals>
-    <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
-        <item quantity="other">%d meses</item>
-        <item quantity="one">1 mes</item>
-    </plurals>
     <plurals name="reaction_tooltip_1_n_n">
         <item quantity="other">%d personas más</item>
         <item quantity="one">1 persona más</item>
diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml
index 35213c25a2..5e9c84d3a0 100644
--- a/com.discord/res/values-es-rES/strings.xml
+++ b/com.discord/res/values-es-rES/strings.xml
@@ -32,10 +32,8 @@
     <string name="activity_invite_private">"No puedes enviar una invitación porque eres invisible o estás ocultando tu estado de juego. Si prefieres no cambiar
 los ajustes, puedes pedirle a alguien que te invite."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">¡Entendido!</string>
-    <string name="activity_panel_go_live_hotspot_header">¡Usa En directo para transmitir tu juego directamente a tus amigos!</string>
+    <string name="activity_panel_go_live_hotspot_header">¡Usa Go Live para transmitir tu juego directamente a tus amigos!</string>
     <string name="activity_panel_go_live_tooltip">En directo</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Este servidor no tiene canales de voz en los que transmitir.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">No puedes transmitir en este canal de voz.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Navega a un servidor para empezar a transmitir.</string>
     <string name="add">Añadir</string>
     <string name="add_a_comment_optional">Añadir un comentario (opcional)</string>
@@ -132,7 +130,6 @@ resulta peligroso."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">¡Ya está!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Ir a la biblioteca</string>
     <string name="application_entitlement_code_redemption_invalid">Código introducido no válido</string>
-    <string name="application_entitlement_code_redemption_prompt">¿Tienes un código para algún juego? Introdúcelo a continuación:</string>
     <string name="application_entitlement_code_redemption_redeem">Canjear</string>
     <string name="application_filter_name_linux">Todos los archivos</string>
     <string name="application_filter_name_macos">Aplicaciones</string>
@@ -167,7 +164,6 @@ resulta peligroso."</string>
     <string name="application_progress_indicator_updating_hours">Actualizando %1$s - Restante: %2$s</string>
     <string name="application_progress_indicator_updating_minutes">Actualizando %1$s - Restante: %2$s</string>
     <string name="application_progress_indicator_updating_seconds">Actualizando %1$s - %2$s</string>
-    <string name="application_store_activity_feed_promotion_subtitle">&lt;3 El equipo Discord</string>
     <string name="application_store_all_news">¡Todas las últimas noticias… con desplazamiento opcional!</string>
     <string name="application_store_browse">Explorar</string>
     <string name="application_store_browse_by_genre_label">Género:</string>
@@ -235,7 +231,6 @@ resulta peligroso."</string>
     <string name="application_store_genre_survival_horror">Terror y supervivencia</string>
     <string name="application_store_genre_track_field">Atletismo</string>
     <string name="application_store_genre_train_simulator">Simulador de tren</string>
-    <string name="application_store_genre_trivia_board_game">Preguntas/Juego de mesa</string>
     <string name="application_store_genre_turn_based_strategy">Estrategia por turnos</string>
     <string name="application_store_genre_vehicular_combat">Combates en vehículos</string>
     <string name="application_store_genre_visual_novel">Novela visual</string>
@@ -373,7 +368,6 @@ resulta peligroso."</string>
     <string name="application_store_view_all_news">Ver todas las noticias</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Para jugar a este DLC debes tener %1$s en Discord. [Más información acerca de los DLC.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Contenido descargable</string>
-    <string name="application_store_warning_early_access_description">Este juego es divertido (¡eso creemos nosotros!), pero puede que tenga contenido limitado, algunos errores o esté incompleto. [Más información acerca del acceso anticipado.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Acceso anticipado</string>
     <string name="application_store_warning_requires_desktop_app_description">Para jugar a este juego, debes tener la $[aplicación de escritorio](downloadHook) de Discord instalada.</string>
     <string name="application_store_warning_requires_desktop_app_title">Hace falta la aplicación de escritorio</string>
@@ -496,19 +490,13 @@ pero si crees que debes hacerlo, ¡no te lo pienses dos veces!"</string>
     <string name="billing_error_section_card">¡Oh, oh! Parece que hay un problema con esta tarjeta. ¡Corrige los campos y vuelve a probar!</string>
     <string name="billing_history">Historial de facturación</string>
     <string name="billing_legal_mumbo_jumbo">Movidas legales</string>
-    <string name="billing_legal_mumbo_jumbo_label">Acepto las [Condiciones del Servicio de la tienda de Discord](%1$s)</string>
     <string name="billing_no_payment_method">No hay métodos de pago guardados</string>
     <string name="billing_no_payment_method_description">Guarda un método de pago para comprar más rápido</string>
     <string name="billing_pay_for_it_with">Pagar con</string>
     <string name="billing_payment_breakdown_taxes">Impuestos</string>
     <string name="billing_payment_history">Historial de transacciones</string>
     <string name="billing_payment_premium">Tu suscripción</string>
-    <string name="billing_payment_premium_legalese_monthly">Al comprar una suscripción %1$s, aceptas nuestras [Condiciones del Servicio de la tienda](%2$s). %1$s es una suscripción de pago periódico. Autorizas a Discord a que realice un cargo de %3$s al método de pago proporcionado y a que siga haciéndolo automáticamente cada mes hasta que la canceles. Puedes cancelarla en cualquier momento.</string>
-    <string name="billing_payment_premium_legalese_yearly">Al comprar una suscripción %1$s, aceptas nuestras [Condiciones del Servicio de la tienda](%2$s). %1$s es una suscripción de pago periódico. Autorizas a Discord a que realice un cargo de %3$s al método de pago proporcionado y a que siga haciéndolo automáticamente cada año hasta que la canceles. Puedes cancelarla en cualquier momento.</string>
     <string name="billing_payment_sources">Métodos de pago</string>
-    <string name="billing_payment_table_header_amount">IMPORTE</string>
-    <string name="billing_payment_table_header_date">FECHA</string>
-    <string name="billing_payment_table_header_description">DESCRIPCIÓN</string>
     <string name="billing_premium_refund_text">Es posible solicitar un reembolso si la compra se realizó en los últimos %1$s días. [Nuestro amable soporte técnico te ayudará a recuperar tus monedas.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Lamentablemente, esta compra no es susceptible de reembolso. Es posible solicitar un reembolso si la compra se realizó en los últimos %1$s días.</string>
     <string name="billing_price_per_month">%1$s / mes</string>
@@ -518,9 +506,7 @@ pero si crees que debes hacerlo, ¡no te lo pienses dos veces!"</string>
     <string name="billing_purchase_details_header">Detalles de compra</string>
     <string name="billing_refund_header">¿Problemas con tu compra?</string>
     <string name="billing_refund_play_time_never_played">Nunca jugado</string>
-    <string name="billing_refund_play_time_subheader">TIEMPO JUGADO</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">FECHA DE COMPRA</string>
     <string name="billing_refund_report_a_problem">Informar de un problema</string>
     <string name="billing_refund_request_button">Solicitar reembolso</string>
     <string name="billing_sales_tax_added">Se ha añadido un impuesto de venta de %1$s debido a tu dirección de facturación.</string>
@@ -546,7 +532,6 @@ pero si crees que debes hacerlo, ¡no te lo pienses dos veces!"</string>
     <string name="bot_dm_send_message_temporarily_disabled">Se ha deshabilitado temporalmente el envío de mensajes a este canal. Vuelve a intentarlo dentro de poco.</string>
     <string name="bot_gdm_explicit_content">¡Oye, tú! Uno de los compañeros de %1$s ha pedido que Discord bloquee los mensajes que nuestros generalmente precisos hámsteres robóticos consideren explícitos. Al parecer has encontrado uno, así que no se ha enviado tu mensaje. Pórtate bien.</string>
     <string name="bot_guild_explicit_content">¡Oye, tú! El propietario de %1$s ha pedido que Discord bloquee los mensajes que nuestros generalmente precisos hámsteres robóticos consideren explícitos. Al parecer has encontrado uno, así que no se ha enviado tu mensaje. Pórtate bien.</string>
-    <string name="bot_requires_email_verification">Tienes que confirmar tu correo electrónico antes de poder enviar mensajes aquí.</string>
     <string name="bot_video_disabled">No parece que tengas suficiente ancho de banda como para recibir el vídeo, así que te lo hemos deshabilitado.</string>
     <string name="browser_app">Aplicaciones de Discord</string>
     <string name="browser_handoff_authenticating_description">Intentando autenticar el cliente de escritorio de Discord. No cierres esta ventana.</string>
@@ -691,7 +676,6 @@ Las URLs personalizadas solo pueden contener letras, números o guiones."</strin
     <string name="close_dm">Cerrar MD</string>
     <string name="close_stream">Cerrar transmisión</string>
     <string name="close_window">Cerrar la ventana</string>
-    <string name="cloud_sync_icon_tooltip_done">Sincronización de Cloud Save completada</string>
     <string name="cloud_sync_icon_tooltip_planning">Comprobando Cloud Saves</string>
     <string name="cloud_sync_icon_tooltip_preparing">Preparando Cloud Saves</string>
     <string name="cloud_sync_icon_tooltip_pulling">Descargando Cloud Saves</string>
@@ -700,7 +684,6 @@ Las URLs personalizadas solo pueden contener letras, números o guiones."</strin
     <string name="cloud_sync_modal_conflict_choice_download">Descargar Cloud Saves</string>
     <string name="cloud_sync_modal_conflict_choice_upload">Subir Local Saves</string>
     <string name="cloud_sync_modal_conflict_description">Los archivos de guardado en local (Local Save) entran en conflicto con los archivos de guardado en la nube (Cloud Save) para **%1$s**. Selecciona qué tipo de guardado prefieres antes de iniciar el juego.</string>
-    <string name="cloud_sync_modal_conflict_header">Conflicto de Cloud Save</string>
     <string name="cloud_sync_modal_conflict_last_modified">Última modificación:</string>
     <string name="cloud_sync_modal_error_description">Un problema impide que Discord sincronice los Cloud Saves para **%1$s.** ¿Quieres jugar de todos modos?</string>
     <string name="cloud_sync_modal_error_header">No se puede sincronizar Cloud Saves</string>
@@ -751,7 +734,6 @@ pulsando el minúsculo texto que hay a continuación."</string>
     <string name="connection_enter_code">Introduce el código como aparece en pantalla</string>
     <string name="connection_invalid_pin">El código PIN introducido no es válido</string>
     <string name="connection_login_with">o inicia sesión con</string>
-    <string name="connection_problems_body">Consulta el [estado del servidor](%1$s) o tuitea a [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Autenticando</string>
     <string name="connection_status_awaiting_endpoint">Esperando terminal</string>
     <string name="connection_status_connected">Conectado</string>
@@ -796,7 +778,7 @@ pulsando el minúsculo texto que hay a continuación."</string>
     <string name="create_category">Crear categoría</string>
     <string name="create_channel">Crear canal</string>
     <string name="create_group_dm">Crear grupo de MD</string>
-    <string name="create_instant_invite">Crear invitación instantánea</string>
+    <string name="create_instant_invite">Crear invitación</string>
     <string name="create_link">Crear enlace</string>
     <string name="create_or_join_modal_header">Oh, otro servidor, ¿eh?</string>
     <string name="create_server_button_body">Crea un nuevo servidor e invita a tus amigos. ¡Es gratis!</string>
@@ -911,7 +893,6 @@ pulsando el minúsculo texto que hay a continuación."</string>
     <string name="disable_email_notifications_failed_suggestion">Puede que ya se hayan deshabilitado las notificaciones de correo electrónico o que este correo electrónico ya no esté asociado a una cuenta de Discord.</string>
     <string name="disable_integration_title">Deshabilitar sincronización</string>
     <string name="disable_integration_twitch_body">Deshabilitar la sincronización imitará el comportamiento seleccionado de suscriptores expirados como si todos los suscriptores hubieran expirado.</string>
-    <string name="disable_integration_youtube_body">Deshabilitar la sincronización imitará el comportamiento seleccionado de patrocinadores expirados como si todos los patrocinadores hubieran expirado.</string>
     <string name="disable_notifications_description">Se deshabilitarán todas las notificaciones de escritorio.</string>
     <string name="disable_notifications_label">Deshabilitar notificaciones</string>
     <string name="disable_sounds_description">Se deshabilitarán todos los efectos de sonido.</string>
@@ -928,7 +909,6 @@ pulsando el minúsculo texto que hay a continuación."</string>
     <string name="discord_desc_short">Chat de voz y texto en equipo</string>
     <string name="discord_rich_presence">Rich Presence de Discord</string>
     <string name="dismiss">Rechazar</string>
-    <string name="dispatch_error_modal_body">Algo ha salido mal. Si el problema sigue produciéndose, crea un ticket de soporte técnico y copia el contenido del siguiente mensaje.</string>
     <string name="dispatch_error_modal_error_label">Mensaje de error (cópiame y pégame)</string>
     <string name="dispatch_error_modal_header">Error de Discord Dispatch</string>
     <string name="dispatch_error_modal_open_ticket">Crear un ticket</string>
@@ -1026,7 +1006,6 @@ pulsando el minúsculo texto que hay a continuación."</string>
     <string name="experiment_mobile_only_user_email_confirmation">¡Yuju, correo electrónico enviado! Revisa si te ha llegado el enlace de descarga a la bandeja de entrada.</string>
     <string name="experiment_mobile_only_user_header">¡Hola, colega!</string>
     <string name="experiment_mobile_only_user_text1">¿Por qué no le echas el guante a Discord para tu ordenador? Aquí tienes un enlace para la aplicación de escritorio: %1$s</string>
-    <string name="experiment_mobile_only_user_text2">¿Por qué no le echas el guante a Discord para tu ordenador? Podemos mandarte el enlace de descarga enseguida.</string>
     <string name="expire_after">Expira después de</string>
     <string name="expires_in">Expira en:</string>
     <string name="explicit_content_filter_disabled">No analizar ningún mensaje.</string>
@@ -1037,7 +1016,7 @@ pulsando el minúsculo texto que hay a continuación."</string>
     <string name="explicit_content_filter_medium_description">Opción recomendada para servidores que usan roles para miembros de confianza.</string>
     <string name="failed">Fallido</string>
     <string name="fi">Finés</string>
-    <string name="file_upload_limit_premium">50 MB</string>
+    <string name="file_upload_limit_premium_tier_1">50 MB</string>
     <string name="file_upload_limit_standard">8 MB</string>
     <string name="filter">Filtrar</string>
     <string name="filter_mentions">Filtrar menciones</string>
@@ -1059,8 +1038,6 @@ el límite de tiempo para AFK. Esto no afecta a los navegadores."</string>
     <string name="form_help_attenuation">"Baja automáticamente el volumen de otras aplicaciones en este porcentaje cuando alguien está hablando.
 Ponlo al 0 %% para deshabilitar por completo la atenuación."</string>
     <string name="form_help_automatic_vad">Si el indicador es verde constante, entonces Discord está transmitiendo tu hermosa voz.</string>
-    <string name="form_help_bitrate">"**¡TODOS LOS BITS!** No es recomendable sobrepasar los %1$s kbps a menos que seas un audiófilo, ya que perjudicará
-a los usuarios conectados mediante dispositivos móviles o con conexiones débiles sin ninguna ventaja notable."</string>
     <string name="form_help_certified_voice_processing">"Al usar un micrófono certificado por Discord, hay ciertas características de procesamiento de voz que no controla Discord,
 sino el micrófono."</string>
     <string name="form_help_channel_permissions">Seleccionar roles configurará automáticamente los permisos básicos para este canal.</string>
@@ -1073,11 +1050,6 @@ con el fin de evitar [esta locura](%1$s).**"</string>
 por cada mensaje enviado en el servidor. Recomendamos encarecidamente ajustarlo solo a @mentions para un Discord público."</string>
     <string name="form_help_explicit_content_filter">"Escanea y elimina automáticamente los mensajes enviados en este servidor que incluyan contenido explícito. Elige hasta qué punto
 se aplicará este filtro a los miembros de tu servidor. **Recomendamos ajustar un filtro para un Discord público.**"</string>
-    <string name="form_help_instant_invite_channel">"Si hay un canal seleccionado, se generará un enlace de invitación instantánea con el widget.
-Si no, solo se proporcionarán los miembros conectados y los canales de voz."</string>
-    <string name="form_help_last_seen">"Purgar expulsará a **%1$s** que no
-se haya(n) conectado en **%2$s** y no disponga(n) de ningún rol.
-Los usuarios expulsados podrán volver a unirse al servidor usando una nueva invitación instantánea."</string>
     <string name="form_help_legacy_subsystem">"Ciertos controladores de hardware de audio presentan problemas al utilizar el moderno subsistema de audio de tu sistema operativo.
 Marca esta casilla para volver a un subsistema de audio anterior."</string>
     <string name="form_help_nsfw">"Los usuarios tendrán que confirmar que son mayores de edad para ver el contenido de este canal.
@@ -1087,7 +1059,6 @@ de tu página, puedes añadir dinámicamente &amp;username= a la cadena de consu
     <string name="form_help_qos">"Sugiere a tu router que los paquetes que Discord transmite son de alta prioridad.
 Al activar esta opción, puede que algunos routers o proveedores de internet dejen de funcionar correctamente."</string>
     <string name="form_help_slowmode">Los miembros solo podrán enviar un mensaje por cada intervalo, a menos que tengan permisos para Gestionar canal o Gestionar mensajes.</string>
-    <string name="form_help_system_channel">Envía un mensaje a este canal cuando alguien se une a este servidor. Los mensajes se aleatorizan. Esta opción se puede desactivar en cualquier momento.</string>
     <string name="form_help_temporary">Se expulsará automáticamente a los miembros cuando se desconecten, a menos que tengan un rol asignado.</string>
     <string name="form_help_user_limit">"Limita el número de usuarios que se pueden conectar a este canal de voz. Los usuarios con el permiso de **Mover miembros**
 pueden ignorar el límite y mover a otros usuarios a este canal."</string>
@@ -1132,8 +1103,8 @@ o iniciar una conversación de mensajes directos. Esto no se aplica si un miembr
     <string name="form_label_input_mode">Modo de entrada</string>
     <string name="form_label_input_sensitivty">Sensibilidad de entrada</string>
     <string name="form_label_input_volume">Volumen de entrada</string>
-    <string name="form_label_instant_invite">Introduce una invitación instantánea</string>
-    <string name="form_label_instant_invite_channel">Canal de invitación instantánea</string>
+    <string name="form_label_instant_invite">Introduce una invitación</string>
+    <string name="form_label_instant_invite_channel">Canal de invitación</string>
     <string name="form_label_last_seen">Visto por última vez</string>
     <string name="form_label_local_mute">Silencio local</string>
     <string name="form_label_max_age">Expira después de</string>
@@ -1194,14 +1165,12 @@ o iniciar una conversación de mensajes directos. Esto no se aplica si un miembr
     <string name="form_label_server_settings">Ajustes del servidor</string>
     <string name="form_label_shortcut">Atajo</string>
     <string name="form_label_slowmode">Modo pausado</string>
-    <string name="form_label_slowmode_cooldown">Intervalo del modo pausado</string>
     <string name="form_label_slowmode_off">Modo pausado desactivado.</string>
     <string name="form_label_sub_expire_behavior">Comportamiento de suscripción expirada</string>
     <string name="form_label_subsystem">Subsistema de audio</string>
     <string name="form_label_suppress_everyone">Silenciar **@everyone** y **@here**</string>
     <string name="form_label_synced_role">Rol sincronizado</string>
     <string name="form_label_synced_subs">Suscriptores sincronizados</string>
-    <string name="form_label_system_channel">Canal de mensajes de nuevos miembros</string>
     <string name="form_label_temporary">Membresía temporal</string>
     <string name="form_label_tts">Texto a voz</string>
     <string name="form_label_tts_notifications">Notificaciones de texto a voz</string>
@@ -1217,12 +1186,6 @@ o iniciar una conversación de mensajes directos. Esto no se aplica si un miembr
     <string name="form_placeholder_reason">Razón</string>
     <string name="form_placeholder_server_name">Introduce un nombre de servidor</string>
     <string name="form_placeholder_username">¿Cómo quieres que te llamen?</string>
-    <string name="form_report_help_text">"Las denuncias se envían al equipo de Confianza y seguridad de Discord, **no al dueño del servidor**.
-
-Crear denuncias falsas y/o abusar del botón de denunciar podría conllevar la prohibición de utilizar dicha característica.
-
-Más información en las [Directivas de la Comunidad de Discord](%1$s).
-Gracias por mantener un entorno seguro."</string>
     <string name="form_warning_input_sensitivty">"No hay ningún dispositivo de entrada habilitado. Tienes que conceder [acceso a tu micrófono](onEnableClick) a Discord
 para poder observar la sensibilidad de entrada."</string>
     <string name="form_warning_video_preview">Debes conceder [acceso a tu cámara](onEnableClick) a Discord para poder generar una vista previa.</string>
@@ -1264,7 +1227,6 @@ para poder observar la sensibilidad de entrada."</string>
     <string name="game_action_button_game_not_detected">Juego no detectado</string>
     <string name="game_action_button_install">Instalar</string>
     <string name="game_action_button_locate">Localizar</string>
-    <string name="game_action_button_login_to_buy">Inicia sesión para comprar</string>
     <string name="game_action_button_now_playing">Jugando ahora</string>
     <string name="game_action_button_paused">En pausa</string>
     <string name="game_action_button_play">Jugar</string>
@@ -1303,7 +1265,6 @@ para poder observar la sensibilidad de entrada."</string>
     <string name="game_feed_activity_recently_played">Jugado recientemente</string>
     <string name="game_feed_activity_streaming_twitch">Transmitiendo en Twitch</string>
     <string name="game_feed_current_header_title">Jugando ahora</string>
-    <string name="game_feed_settings_visibility">Mostrar en la pestaña de juegos</string>
     <string name="game_feed_unknown_player">Jugador desconocido</string>
     <string name="game_feed_user_played_days_ago">Jugó hace %1$s %2$s</string>
     <string name="game_feed_user_played_hours_ago">Ha jugado hace %1$s %2$s</string>
@@ -1356,11 +1317,9 @@ para poder observar la sensibilidad de entrada."</string>
     <string name="game_library_updates_progress_paused">En pausa — %1$s de %2$s (%3$s %%)</string>
     <string name="game_library_updates_progress_pausing">Pausando — %1$s de %2$s (%3$s %%)</string>
     <string name="game_library_updates_progress_planning">Preparando — %1$s %%</string>
-    <string name="game_library_updates_progress_post_install_scripts">Ejecutando comandos — %1$s de %2$s (%3$s %%)</string>
     <string name="game_library_updates_progress_queued">En cola — %1$s of %2$s (%3$s %%)</string>
     <string name="game_library_updates_progress_queued_no_transition">En cola</string>
     <string name="game_library_updates_progress_repairing">Reparando — %1$s de %2$s (%3$s %%)</string>
-    <string name="game_library_updates_progress_verifying">Comprobando instalación — %1$s de %2$s (%3$s %%)</string>
     <string name="game_library_updates_progress_waiting_for_another">Esperando a que se pause otra descarga — %1$s de %2$s (%3$s %%)</string>
     <string name="game_library_updates_progress_waiting_for_another_no_transition">Esperando a que se pause otra descarga</string>
     <string name="game_library_updates_updating">Actualizando — %1$s de %2$s (%3$s %%)</string>
@@ -1372,7 +1331,7 @@ para poder observar la sensibilidad de entrada."</string>
     <string name="generate_a_new_link">Generar un nuevo enlace</string>
     <string name="get_started">Comenzar</string>
     <string name="gif_auto_play_label">Reproducir GIFs automáticamente cuando Discord esté en primer plano.</string>
-    <string name="go_live_changelog_guilds">En Directo ya está disponible en: %1$s</string>
+    <string name="go_live_hardware_acceleration_unavailable">Atención, no detectamos aceleración por hardware. Puede que tu ordenador no sea compatible con Go Live.</string>
     <string name="go_live_hey">¡Ey!</string>
     <string name="go_live_listen">¡Escucha!</string>
     <string name="go_live_look">¡Mira!</string>
@@ -1386,7 +1345,7 @@ para poder observar la sensibilidad de entrada."</string>
     <string name="go_live_modal_select_channel_form_title">Seleccionar un canal de voz</string>
     <string name="go_live_modal_select_channel_placeholder">Buscar canales de voz</string>
     <string name="go_live_modal_title">En directo</string>
-    <string name="go_live_premium_early_access">Como agradecimiento por ser un suscriptor de Nitro, tienes acceso temprano a la transmisión de juegos En Directo!</string>
+    <string name="go_live_video_drivers_outdated">Tus controladores de vídeo están desactualizados. Actualízalos para mejorar el rendimiento de Go Live.</string>
     <string name="grant_temporary_membership">Otorgar membresía temporal</string>
     <string name="group">Grupo</string>
     <string name="group_dm_add_friends">Añadir amigos a MD</string>
@@ -1463,8 +1422,6 @@ para poder observar la sensibilidad de entrada."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Ha concedido** %1$s a **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Ha movido de **%1$s** a **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">En la posición **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) ha creado un canal de texto $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Ha cambiado el tema a **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Ha establecido el tema a **%1$s**</string>
@@ -1490,8 +1447,6 @@ para poder observar la sensibilidad de entrada."</string>
     <string name="guild_settings_audit_log_guild_name_change">Ha establecido el nombre del servidor a **%1$s**</string>
     <string name="guild_settings_audit_log_guild_owner_id_change">Ha transferido la propiedad a **%1$s**</string>
     <string name="guild_settings_audit_log_guild_region_change">Ha establecido la región de voz a **%1$s**</string>
-    <string name="guild_settings_audit_log_guild_system_channel_id_change">Ha establecido el canal para notificaciones de bienvenida a **%1$s**</string>
-    <string name="guild_settings_audit_log_guild_system_channel_id_disable">**Ha deshabilitado** los mensajes de notificación de bienvenida</string>
     <string name="guild_settings_audit_log_guild_update">$[**%1$s**](userHook) ha hecho cambios a $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_guild_vanity_url_code_change">Ha establecido la URL personalizada a **%1$s**</string>
     <string name="guild_settings_audit_log_guild_vanity_url_code_delete">**Ha eliminado** la URL personalizada</string>
@@ -1559,6 +1514,8 @@ para poder observar la sensibilidad de entrada."</string>
     <string name="guild_settings_filter_all_actions">Todas las acciones</string>
     <string name="guild_settings_filter_all_users">Todos los usuarios</string>
     <string name="guild_settings_filter_user">Filtrar por usuario</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">Transmisiones Go Live en 720p 60fps</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">Transmisiones Go Live en 1080p 60fps</string>
     <string name="guild_settings_label_audit_log">Registro de auditoría</string>
     <string name="guild_settings_label_audit_log_empty_body">Una vez que los moderadores comiencen a moderar, aquí podrás moderar la moderación.</string>
     <string name="guild_settings_label_audit_log_empty_title">Aún no hay registros</string>
@@ -1590,7 +1547,7 @@ Si dispones de acceso a los usuarios de tu página, puedes añadir dinámicament
     <string name="help_role_locked_mine">El rol está bloqueado porque es tu rol de rango más alto. Pide ayuda alguien de rango más alto o al propietario del servidor.</string>
     <string name="help_singular_permission">No puedes modificar este permiso porque eliminarlo te lo quitaría a ti.</string>
     <string name="hide_instant_invites_description">Recomendado si no quieres que gente desconocida acceda a tus servidores de Discord.</string>
-    <string name="hide_instant_invites_label">Ocultar enlaces de invitación instantánea</string>
+    <string name="hide_instant_invites_label">Ocultar enlaces de invitación</string>
     <string name="hide_muted">Ocultar %1$s silenciado</string>
     <string name="hide_muted_channels">Ocultar canales silenciados</string>
     <string name="hide_personal_information_description">Oculta el correo electrónico, las cuentas conectadas, las notas y anonimiza las etiquetas de Discord.</string>
@@ -1615,7 +1572,6 @@ Si dispones de acceso a los usuarios de tu página, puedes añadir dinámicament
     <string name="hypesquad_leave_prompt">¿Quieres dejar de ser Hype?</string>
     <string name="hypesquad_newsletter_warning">Los abogados de Wumpus quieren que te digamos que si te unes al HypeSquad te inscribiremos a nuestro boletín informativo.</string>
     <string name="hypesquad_online_badge_tooltip">%1$s del HypeSquad</string>
-    <string name="hypesquad_perk_description_profile_badge">Consigue una insignia de perfil única para representar a la casa del HypeSquad a la que pertenezcas.</string>
     <string name="hypesquad_perk_description_squad_challenges">Representa a tu casa y participa en desafíos contra otras casas del HypeSquad.</string>
     <string name="hypesquad_perk_title_newsletter">Boletín informativo supersecreto</string>
     <string name="hypesquad_perk_title_profile_badge">Insignia de perfil de Hype</string>
@@ -1741,14 +1697,14 @@ Si dispones de acceso a los usuarios de tu página, puedes añadir dinámicament
     <string name="input_mode_ptt_release_delay">Demora al soltar «Pulsar para hablar»</string>
     <string name="input_mode_vad">Actividad de voz</string>
     <string name="install_location_main">Principal</string>
-    <string name="instant_invite">Invitación instantánea</string>
+    <string name="instant_invite">Invitación</string>
     <string name="instant_invite_accept">Aceptar invitación</string>
-    <string name="instant_invite_accepted">Invitación instantánea aceptada</string>
-    <string name="instant_invite_accepting">Aceptando invitación instantánea</string>
+    <string name="instant_invite_accepted">Invitación aceptada</string>
+    <string name="instant_invite_accepting">Aceptando invitación</string>
     <string name="instant_invite_ask_for_new_invite">¡Pide una nueva!</string>
     <string name="instant_invite_ask_user_for_new_invite">¡Pídele una nueva invitación a %1$s!</string>
     <string name="instant_invite_code">Código</string>
-    <string name="instant_invite_expired">La invitación instantánea no es válida o ha expirado.</string>
+    <string name="instant_invite_expired">La invitación no es válida o ha expirado.</string>
     <string name="instant_invite_expires">Expira</string>
     <string name="instant_invite_failed_to_generate">No se ha podido crear un enlace de invitación.</string>
     <string name="instant_invite_generate">Generar</string>
@@ -1766,16 +1722,15 @@ Si dispones de acceso a los usuarios de tu página, puedes añadir dinámicament
     <string name="instant_invite_regenerate">Volver a generar</string>
     <string name="instant_invite_resolved_body">Te han invitado a **%1$s** en **%2$s**.</string>
     <string name="instant_invite_resolved_title">¡Ey, hola!</string>
-    <string name="instant_invite_resolving">Procesando invitación instantánea</string>
+    <string name="instant_invite_resolving">Procesando invitación</string>
     <string name="instant_invite_uses">Usos</string>
     <string name="instant_invite_you_are_already_a_member_of">Ya eres miembro de</string>
     <string name="instant_invite_you_have_been_invited_to_join">Te han invitado a unirte</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** te ha invitado a unirte</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Has recibido una invitación a unirte a un grupo de MD de</string>
-    <string name="instant_invites">Invitaciones instantáneas</string>
+    <string name="instant_invites">Invitaciones</string>
     <string name="integration_settings">Ajustes de integraciones</string>
     <string name="integrations">Integraciones</string>
-    <string name="integrations_header">Cuentas de juegos de Twitch/YouTube conectadas</string>
     <string name="integrations_pro_tip">Para más integraciones, consulta el [StreamKit de Discord](%1$s).</string>
     <string name="internal_server_error">Se ha producido un error interno del servidor, vuelve a intentarlo.</string>
     <string name="invalid_animated_emoji_body">Este emoji no funciona porque es animado. Mejora a Discord Nitro para hacer realidad tus sueños de emojis animados.</string>
@@ -1888,13 +1843,13 @@ Si dispones de acceso a los usuarios de tu página, puedes añadir dinámicament
     <string name="join_afk_channel_body">Parece que te has unido al canal de AFK. No puedes hablar en este canal.</string>
     <string name="join_call">Unirse a llamada</string>
     <string name="join_server">Unirse</string>
-    <string name="join_server_button_body">Introduce una invitación instantánea y únete al servidor de tu amigo.</string>
+    <string name="join_server_button_body">Introduce una invitación y únete al servidor de tu amigo.</string>
     <string name="join_server_button_cta">Unirse a un servidor</string>
     <string name="join_server_button_cta_mobile">Unirse a un servidor con un enlace de invitación</string>
     <string name="join_server_button_cta_mobile_desc">¿Tienes un código o enlace de invitación? ¡Úsalo aquí!</string>
     <string name="join_server_button_cta_named">Unirse a %1$s</string>
-    <string name="join_server_description">Introduce una invitación instantánea a continuación para unirte a un servidor existente. La invitación se parecerá a algo como esto:</string>
-    <string name="join_server_description_mobile">Introduce una invitación instantánea arriba para unirte a un servidor existente.</string>
+    <string name="join_server_description">Introduce una invitación a continuación para unirte a un servidor existente. La invitación se parecerá a algo como esto:</string>
+    <string name="join_server_description_mobile">Introduce una invitación arriba para unirte a un servidor existente.</string>
     <string name="join_server_title">Únete a un servidor</string>
     <string name="join_stream">Unirse a la transmisión</string>
     <string name="join_video_call">Unirse a videollamada</string>
@@ -2002,7 +1957,7 @@ temporalmente mientras hables."</string>
     <string name="link_your_xbox_account_2">Discord es una aplicación de voz, texto y vídeo para jugadores que es gratis y segura, y funciona en escritorio y móviles.</string>
     <string name="listening_to">Escuchando **%1$s**</string>
     <string name="live">En directo</string>
-    <string name="live_beta_description">¡Te damos la bienvenida a la transmisión! En directo está en beta. Lamentamos los posibles contratiempos.</string>
+    <string name="live_beta_description">¡Te damos la bienvenida a la transmisión! Go Live está en beta. Lamentamos los posibles contratiempos.</string>
     <string name="live_on_twitch">En directo en Twitch</string>
     <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"No se ha podido cargar la imagen.
@@ -2098,10 +2053,7 @@ un mensaje con @everyone o @here."</string>
     <string name="metacritic_verdict_universal_acclaim">Aclamación universal</string>
     <string name="mfa_sms_add_phone">Añadir número de teléfono</string>
     <string name="mfa_sms_already_enabled">¡Ya está habilitada!</string>
-    <string name="mfa_sms_auth">Autenticación de seguridad por SMS</string>
     <string name="mfa_sms_auth_current_phone">Tu número de teléfono actual es: %1$s.</string>
-    <string name="mfa_sms_auth_sales_pitch">Añade tu teléfono como un método de A2F de seguridad en caso de que pierdas tu aplicación de autenticación o tus códigos de seguridad.</string>
-    <string name="mfa_sms_confirm_remove_action">Eliminar SMS de seguridad</string>
     <string name="mfa_sms_confirm_remove_body">Esto elimina la posibilidad de iniciar sesión con un código de autenticación por SMS. ¿Seguro que quieres eliminarla?</string>
     <string name="mfa_sms_disabled_partner">Deshabilitada para socios</string>
     <string name="mfa_sms_enable">Habilitar autenticación por SMS</string>
@@ -2111,7 +2063,6 @@ un mensaje con @everyone o @here."</string>
     <string name="mfa_sms_receive_code">Recibir código de autenticación por SMS</string>
     <string name="mfa_sms_remove">Eliminar autenticación por SMS</string>
     <string name="mfa_sms_resend">¿Reenviar SMS?</string>
-    <string name="microphone_permission_error">No se ha podido activar el micrófono porque se ha rechazado el diálogo de permiso.</string>
     <string name="minimum_size">Tamaño mínimo: **%1$sx%1$s**</string>
     <string name="missed_an_update">¿Te has perdido alguna actualización? [Echa un ojo a nuestros historiales de cambios](%1$s)</string>
     <string name="missing_entitlement_modal_body">Discord no puede iniciar **%1$s** porque has perdido el derecho a ello. Esto puede deberse a varias razones, como que tu suscripción Nitro haya caducado, un reembolso o que se haya eliminado **%1$s** de la tienda de Discord. [Consulta este artículo de ayuda para obtener más información o soporte técnico.](%2$s)</string>
@@ -2178,7 +2129,6 @@ nuestras Condiciones del Servicio y Política de Privacidad actualizadas."</stri
     <string name="no_authorized_apps">No hay aplicaciones autorizadas</string>
     <string name="no_authorized_apps_note">Mejora tu experiencia de Discord al autorizar e integrar servicios de terceros</string>
     <string name="no_ban_reason">No se ha proporcionado razón</string>
-    <string name="no_bans">Sin bans</string>
     <string name="no_camera_access">Discord no tiene acceso a tu cámara</string>
     <string name="no_category">Sin categoría</string>
     <string name="no_channel_description">Aquí puedes encontrar tus **mensajes directos** y **servidores**.</string>
@@ -2188,14 +2138,11 @@ nuestras Condiciones del Servicio y Política de Privacidad actualizadas."</stri
     <string name="no_emoji_title">No hay emojis</string>
     <string name="no_input_devices">No hay dispositivos de entrada</string>
     <string name="no_input_devices_detected">No se ha detectado ningún dispositivo de entrada, conecta uno y vuelve a intentarlo.</string>
-    <string name="no_instant_invite">Sin invitación instantánea</string>
-    <string name="no_integrations">[Conecta](onConnect) tu cuenta de juegos de los socios Twitch o YouTube para sincronizar tus suscriptores/patrocinadores a un rol</string>
+    <string name="no_instant_invite">Sin invitación</string>
     <string name="no_integrations_body">El protocolo 4M1ST4D solo se puede ejecutar desde el cliente de Discord</string>
     <string name="no_integrations_label">Sin integraciones</string>
-    <string name="no_invites_body">"¿Te sientes perdido cual avión de papel que surca los cielos?
-¡Crea un enlace de invitación instantánea para traer aquí a unos cuantos amigos!"</string>
-    <string name="no_invites_caption">¡Aún no hay invitaciones instantáneas!</string>
-    <string name="no_invites_label">Aún no hay invitaciones instantáneas</string>
+    <string name="no_invites_caption">¡Aún no hay invitaciones!</string>
+    <string name="no_invites_label">Aún no hay invitaciones</string>
     <string name="no_mail_account_description">Por favor envía tus sugerencias a support@discordapp.com, hemos copiado tu información de usuario a tu portapapeles.</string>
     <string name="no_mail_account_title">No hay cuenta de correo electrónico</string>
     <string name="no_mic_body">Las instrucciones para habilitar el acceso a tu micrófono se encuentran en el Centro de Ayuda de Discord.</string>
@@ -2213,7 +2160,6 @@ ningún mensaje fijado… aún."</string>
     <string name="no_reactions_header">No hay reacciones</string>
     <string name="no_recent_mentions">Y al comienzo… había silencio.</string>
     <string name="no_send_messages_permission_placeholder">No tienes permiso para enviar mensajes en este canal.</string>
-    <string name="no_system_channel">Sin mensajes de nuevos miembros</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>
@@ -2224,7 +2170,6 @@ ningún mensaje fijado… aún."</string>
     <string name="note">Nota</string>
     <string name="note_placeholder">Haz clic para añadir una nota</string>
     <string name="note_placeholder_mobile">Toca para añadir una nota</string>
-    <string name="notice_application_test_mode">El modo de prueba está activado actualmente para **%1$s**. Se mostrarán los SKU sin publicar y no se te cobrará por ningún pago relacionado.</string>
     <string name="notice_application_test_mode_go_to_listing">Ir al SKU</string>
     <string name="notice_connect_spotify">¡Conecta tu cuenta de Spotify para mostrar la música que estás escuchando en tu estado!</string>
     <string name="notice_connection_conflict">Se ha desconectado tu voz porque te has conectado en otra ubicación.</string>
@@ -2235,7 +2180,6 @@ ningún mensaje fijado… aún."</string>
     <string name="notice_dispatch_error_disk_low">No hay suficiente espacio en disco. Hace(n) falta %1$s, pero solo hay disponible %2$s.</string>
     <string name="notice_dispatch_error_file_name_too_long">Oh, no. Los nombres de los archivos de este juego son demasiado largos para Windows. Selecciona un directorio de instalación más corto.</string>
     <string name="notice_dispatch_error_invalid_drive">Oh, no. La ubicación de instalación que has elegido no es válida. Has elegido %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">No hemos podido actualizar el juego. ¿Está actualmente en ejecución?</string>
     <string name="notice_dispatch_error_no_manifests">Oh, no. Parece que no hay contenido para este juego. Ponte en contacto con soporte técnico.</string>
     <string name="notice_dispatch_error_not_entitled">Oh, no. Parece que no tienes este juego. Ponte en contacto con soporte técnico si crees que se trata de un error.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Parece que has rechazado un script de instalación. Tienes que aceptarlo para instalar el juego.</string>
@@ -2250,9 +2194,6 @@ ningún mensaje fijado… aún."</string>
     <string name="notice_native_apps">¿Necesitas que Pulsar para hablar funcione en todo el sistema? ¡Consigue la aplicación de escritorio!</string>
     <string name="notice_no_input_detected">Bueno, parece que Discord no detecta ningún sonido con tu micrófono. Vamos a arreglarlo… juntos.</string>
     <string name="notice_no_input_detected_help_link_text">¡Ayuda!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Tu acceso a Nitro ha expirado. Mejora Nitro Clásico a Nitro para tener acceso ilimitado a juegos alucinantes.</string>
-    <string name="notice_premium_applications_grandfathered_ending">¡Solo te queda(n) %1$s de juegos de Nitro! Tu acceso termina el **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">¡Gracias por ser de los primeros en apoyar Nitro! Como recompensa por ser así de increíble, ahora tienes acceso a los juegos de Nitro hasta el %1$s.</string>
     <string name="notice_premium_promo_action">Échale un ojo</string>
     <string name="notice_premium_promo_message">¡Apoya el desarrollo de Discord y consigue divertidos ventajas!</string>
     <string name="notice_scheduled_maintenance">Discord llevará a cabo un mantenimiento programado el **%1$s** a las **%2$s**.</string>
@@ -2296,9 +2237,6 @@ ningún mensaje fijado… aún."</string>
     <string name="nuf_claim_account_button">Registrar cuenta</string>
     <string name="nuf_claim_account_generic_error">Algo ha fallado gravemente</string>
     <string name="nuf_claim_account_title">Registra tu cuenta</string>
-    <string name="nuf_create_server_body">"¿No tienes un código de invitación? ¡No te preocupes!
-
-Inicia un servidor de Discord para ti y tus amigos. Nosotros proporcionaremos el chat de texto y voz; es 100 %% gratuito."</string>
     <string name="nuf_create_server_button">Crear servidor</string>
     <string name="nuf_create_server_error">Nombre del servidor no válido</string>
     <string name="nuf_create_server_note">Al crear un servidor, aceptas nuestras [Directivas de la Comunidad](https://discordapp.com/guidelines).</string>
@@ -2366,15 +2304,12 @@ Además, puede que el overlay no funcione para todos. Si tienes problemas o preg
     <string name="overlay_menu_get_invite">Obtener enlace de invitación</string>
     <string name="overlay_menu_open_discord">Abrir Discord</string>
     <string name="overlay_menu_switch_channels">Cambiar de canal</string>
-    <string name="overlay_mobile_required">Habilitar Mobile Overlay en los Ajustes de Voz de Discord.</string>
-    <string name="overlay_mobile_toggle_desc">Mira quién está hablando y accede a atajos mientras utilizas otras aplicaciones cuando estés conectado a la voz.</string>
     <string name="overlay_mobile_toggle_label">Habilitar overlay de voz móvil</string>
     <string name="overlay_news_go_live_body">¿Quieres transmitir %1$s para tus amigos de %2$s?</string>
     <string name="overlay_news_go_live_cta">En directo</string>
     <string name="overlay_news_text_pinning_body">¡Ahora puedes fijar un chat de texto a tu juego!</string>
     <string name="overlay_news_text_pinning_tip">Consejo: Puedes fijar un chat pulsando el $[icono de fijar](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Overlay de Discord mejorado</string>
-    <string name="overlay_no_results">Hemos buscado por todas partes. Por desgracia, no hemos encontrado ningún canal de voz.</string>
     <string name="overlay_notification_incoming_call">Llamada entrante…</string>
     <string name="overlay_notification_settings_disabled">Notificaciones deshabilitadas</string>
     <string name="overlay_notification_settings_position">Mostrando: %1$s</string>
@@ -2384,7 +2319,6 @@ Además, puede que el overlay no funcione para todos. Si tienes problemas o preg
     <string name="overlay_notifications_settings">Notificaciones de overlay</string>
     <string name="overlay_notifications_top_left">Arriba a la izquierda</string>
     <string name="overlay_notifications_top_right">Arriba a la derecha</string>
-    <string name="overlay_private_channels_empty_state">Nop, aquí no hay mensajes directos.</string>
     <string name="overlay_reload">Volver a cargar overlay</string>
     <string name="overlay_settings">Ajustes del overlay</string>
     <string name="overlay_settings_title">Ajustes del overlay</string>
@@ -2405,7 +2339,6 @@ Además, puede que el overlay no funcione para todos. Si tienes problemas o preg
     <string name="pagination_page_of">Página %1$s de %2$s</string>
     <string name="pagination_previous">Anterior</string>
     <string name="paginator_of_pages">Página %1$s de %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Socio de Discord</string>
     <string name="party_full">Grupo lleno</string>
     <string name="party_join">Unirse al grupo</string>
@@ -2464,7 +2397,6 @@ Además, puede que el overlay no funcione para todos. Si tienes problemas o preg
     <string name="permission_override_allow">Permitir</string>
     <string name="permission_override_deny">Denegar</string>
     <string name="permission_override_passthrough">Ignorar</string>
-    <string name="permission_overrides">Anulaciones de permisos</string>
     <string name="permissions">Permisos</string>
     <string name="permissions_unsynced">Permisos no sincronizados con: **%1$s**</string>
     <string name="permit_usage_android">Selecciona Discord y después «Permitir acceso de uso»</string>
@@ -2475,7 +2407,6 @@ Además, puede que el overlay no funcione para todos. Si tienes problemas o preg
     <string name="phone">Teléfono</string>
     <string name="pick_a_color">Elegir un color</string>
     <string name="pin">Fijar</string>
-    <string name="pin_confirm">Oh, sí. Ánclalo</string>
     <string name="pin_message">Fijar mensaje</string>
     <string name="pin_message_body">Oye, solo queremos asegurarnos, ¿de verdad quieres fijar este mensaje en #%1$s para la posteridad y la gloria?</string>
     <string name="pin_message_body_mobile">¿Seguro que quieres fijar este mensaje?</string>
@@ -2498,27 +2429,14 @@ Además, puede que el overlay no funcione para todos. Si tienes problemas o preg
     <string name="popout_stay_on_top">Mantener en primer plano</string>
     <string name="post_code">Código postal</string>
     <string name="premium_alert_error_title">Ups, algo ha fallado…</string>
-    <string name="premium_applications_grandfathered_monthly">Para agradecerte tu apoyo a Discord, tendrás acceso a los juegos de Nitro durante un año. Tu acceso termina el **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">Para agradecerte tu apoyo a Discord, tendrás acceso a los juegos de Nitro durante dos años. Tu acceso termina el **%1$s**.</string>
-    <string name="premium_applications_subtitle">Acceso ilimitado a una creciente biblioteca de juegos aclamados por la crítica a los que creemos que tus amigos y tú deberíais jugar.</string>
-    <string name="premium_applications_title">Decenas de juegos cuidadosamente seleccionados. Un solo precio bajo mensual.</string>
     <string name="premium_badge_tooltip">Suscriptor desde %1$s</string>
     <string name="premium_cancel_cancel">Nop</string>
-    <string name="premium_cancel_confirm_body_tier_1">"La cancelación surtirá efecto al final de tu periodo de facturación actual, el **%1$s**. Tu etiqueta de Discord pasará a ser aleatoria si la habías cambiado.
-
-Puedes reanudar tu suscripción en cualquier momento."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"La cancelación surtirá efecto al final del periodo de facturación actual. El **%1$s**, dejarás de tener acceso a todos los juegos de Nitro en tu biblioteca y tu etiqueta de Discord pasará a ser aleatoria si la habías cambiado.
-
-Mantendremos seguros tus archivos de guardado por si cambias de idea. ¡Puedes volver a suscribirte cuando quieras!"</string>
     <string name="premium_cancel_confirm_new">Sip, cancelar %1$s</string>
     <string name="premium_cancel_confirm_title">¿Cancelar %1$s?</string>
     <string name="premium_cancel_failed_body">No hemos podido cancelar tu suscripción Nitro. Vuelve a intentarlo o ponte en contacto con nuestro equipo de soporte técnico si el problema continúa.</string>
     <string name="premium_canceled">Tu suscripción termina el %1$s.</string>
     <string name="premium_cant_upgrade_confirm">Entendido</string>
     <string name="premium_change_discriminator_length_error">Esta etiqueta no es válida. Debe tener 4 dígitos.</string>
-    <string name="premium_change_discriminator_modal_body">Cuando termine tu suscripción Nitro, tu etiqueta de Discord pasará a ser aleatoria. ¿Seguro que quieres cambiar tu etiqueta de Discord?</string>
-    <string name="premium_change_discriminator_modal_confirm">Cambiar etiqueta de Discord</string>
-    <string name="premium_change_discriminator_modal_header">Cambia tu etiqueta de Discord</string>
     <string name="premium_change_discriminator_tooltip">¿Quieres personalizar tu etiqueta? ¡Consigue Nitro!</string>
     <string name="premium_change_discriminator_zero_error">Esta etiqueta no es válida. Debe tener un número mayor a 0.</string>
     <string name="premium_chat_perks_description_animated_avatar_and_emoji">Sube GIFs para usar avatares y emojis animados.</string>
@@ -2526,19 +2444,13 @@ Mantendremos seguros tus archivos de guardado por si cambias de idea. ¡Puedes v
     <string name="premium_chat_perks_description_custom_emoji">Consigue un pasaporte global para usar tus emojis personalizados en cualquier parte.</string>
     <string name="premium_chat_perks_description_discriminator">Escoge tu etiqueta mientras estés suscrito.</string>
     <string name="premium_chat_perks_description_screenshare">Mejora tu compartición de pantalla con 720p 60fps o 1080p 30fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Mayor límite de subida de %1$s, en lugar de %2$s, para compartir memes de alta calidad.</string>
+    <string name="premium_chat_perks_streaming_mobile">Mejores transmisiones Go Live: transmite en calidad original con Nitro o hasta un nítido 1080p 60fps con Nitro Classic</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Diversión animada</string>
     <string name="premium_chat_perks_title_badge">Muestra tu apoyo</string>
     <string name="premium_chat_perks_title_custom_emoji">Emojis personalizados globales</string>
-    <string name="premium_chat_perks_title_discriminator">Etiqueta de Discord personalizada</string>
     <string name="premium_chat_perks_title_screenshare">Mayor calidad de vídeo</string>
-    <string name="premium_code_redemption_confirmation_blurb">¡Gracias a una serie de dígitos aleatorios, ahora tienes ventajas mejoradas del chat durante %1$s!</string>
+    <string name="premium_chat_perks_title_streaming">Mejores transmisiones Go Live</string>
     <string name="premium_code_redemption_confirmation_button">Oh, ¡qué bien!</string>
-    <string name="premium_feature_new_chat_perks_header">También recibes algunas ventajas mejoradas del chat:</string>
-    <string name="premium_feature_new_premium_applications_header">Más de %1$s en juegos. Échales un vistazo:</string>
-    <string name="premium_feature_view_applications">Ver todos los juegos de Nitro</string>
-    <string name="premium_features_chat_perks">Ventajas del chat</string>
-    <string name="premium_features_premium_applications">Juegos gratuitos</string>
     <string name="premium_grandfathered_warning">Como agradecimiento por apoyarnos, tienes un plan de descuento en Nitro. **Si cancelas o cambias tu plan, perderás este descuento.** ¡¡¡¡¡Te hemos avisado!!!!!</string>
     <string name="premium_grandfathered_warning_confirm">Hacerlo de todos modos</string>
     <string name="premium_grandfathered_warning_title">Cuidado, colega</string>
@@ -2548,16 +2460,10 @@ Mantendremos seguros tus archivos de guardado por si cambias de idea. ¡Puedes v
     <string name="premium_not_claimed">Confirma tu cuenta primero</string>
     <string name="premium_not_claimed_body">¡Hola, colega! Si quieres comprar Nitro, primero tendrás que confirmar tu cuenta para que no se pierdan tus cosas.</string>
     <string name="premium_not_verified">Primero, verifica tu correo electrónico</string>
-    <string name="premium_not_verified_body">¡Hola, colega! Si quieres comprar Nitro, primero tendrás que verificar tu correo electrónico. Revisa tu correo electrónico o solicita un nuevo correo electrónico de verificación.</string>
-    <string name="premium_payment_applications_os_warning">Los juegos de Nitro solo son compatibles con Windows.</string>
-    <string name="premium_payment_confirmation_blurb_regular">Ahora tienes el poder de las ventajas mejoradas del chat. ¡¡¡Deja de leer y corre a chatear!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Ahora tienes acceso ilimitado a muchos juegos increíbles. ¡¡¡Deja de leer y corre a jugar!!!</string>
     <string name="premium_payment_confirmation_button_regular">Vale, suena bien</string>
     <string name="premium_plan_month">Nitro mensual</string>
-    <string name="premium_plan_month_tier_1">Nitro Clásico mensual</string>
     <string name="premium_plan_month_tier_2">Nitro mensual</string>
     <string name="premium_plan_year">Nitro anual</string>
-    <string name="premium_plan_year_tier_1">Nitro Clásico anual</string>
     <string name="premium_plan_year_tier_2">Nitro anual</string>
     <string name="premium_promo_autocomplete">Usa emojis personalizados en cualquier parte</string>
     <string name="premium_promo_description">Consigue Discord Nitro para usar emojis animados y personalizados en cualquier servidor.</string>
@@ -2571,14 +2477,10 @@ Calcularemos la parte proporcional a tu plan actual y la restaremos al precio an
     <string name="premium_upgrade_confirm_title">Mejorar a %1$s</string>
     <string name="premium_upgrade_disabled_current_tooltip">Tu plan actual.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Antes de elegir otro plan de menor categoría, tienes que cancelar tu suscripción y dejar que esta termine.</string>
-    <string name="premium_upgrade_done_body_tier_1">¡Ahora tienes ventajas mejoradas del chat!</string>
-    <string name="premium_upgrade_done_body_tier_2">Ahora tienes ventajas mejoradas del chat y acceso a decenas de juegos.</string>
     <string name="premium_upgrade_done_button_tier_1">¡Genial!</string>
-    <string name="premium_upgrade_done_button_tier_2">Consultar todos los juegos de Nitro</string>
     <string name="premium_upgrade_failed_body">Ehh… Esa mejora no ha funcionado. Asegúrate de que tu información de pago está al día y vuelve a intentarlo.</string>
     <string name="premium_upload_promo">Mejora a Discord Nitro para tener un límite de archivo de %1$s</string>
     <string name="premium_year_free_months">¡Consigue 2 meses gratis!</string>
-    <string name="premium_year_free_months_short">2 meses gratis</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / año</string>
     <string name="preview_chat">Previsualizar el chat</string>
     <string name="priority_speaker">Prioridad de palabra</string>
@@ -2762,7 +2664,7 @@ y está intentando enviar datos."</string>
     <string name="scope_guilds">Descubre en qué servidores estás</string>
     <string name="scope_guilds_empty">No estás en ningún servidor.</string>
     <string name="scope_guilds_join">Unirse a servidores por ti</string>
-    <string name="scope_guilds_join_description">Usar invitaciones instantáneas en tu nombre.</string>
+    <string name="scope_guilds_join_description">Usar invitaciones en tu nombre.</string>
     <string name="scope_identify">Acceder a tu nombre de usuario y avatar</string>
     <string name="scope_messages_read">Leer todos los mensajes</string>
     <string name="scope_messages_read_description">Esto permite a la aplicación leer todos los mensajes accesibles a través de tu cuenta de Discord.</string>
@@ -2831,7 +2733,6 @@ Elige qué pantalla te gustaría compartir."</string>
     <string name="search_filter_on">el</string>
     <string name="search_for_emoji">Encuentra el emoji perfecto</string>
     <string name="search_for_empty">Buscar</string>
-    <string name="search_for_value">Buscar: **%1$s**</string>
     <string name="search_group_header_channels">En el canal</string>
     <string name="search_group_header_dates">Fechas</string>
     <string name="search_group_header_file_name">El nombre del archivo contiene</string>
@@ -3032,8 +2933,6 @@ los podrá escuchar cualquiera que tenga abierto el canal."</string>
     <string name="stop_ringing">Detener llamada</string>
     <string name="stop_streaming">Dejar de transmitir</string>
     <string name="stop_watching">Dejar de ver</string>
-    <string name="store_payment_legalese_monthly">¡Ey! Al comprar %1$s, aceptas nuestras [Condiciones del Servicio de la tienda](%2$s). %1$s es una suscripción periódica, lo que significa que te cobraremos hoy y lo seguiremos haciendo mensualmente hasta que canceles la suscripción. Puedes cancelarla en cualquier momento en la pantalla de Ajustes de usuario.</string>
-    <string name="store_payment_legalese_yearly">¡Ey! Al comprar %1$s, aceptas nuestras [Condiciones del Servicio de la tienda](%2$s). %1$s es una suscripción periódica, lo que significa que te cobraremos hoy y lo seguiremos haciendo anualmente hasta que canceles la suscripción. Puedes cancelarla en cualquier momento en la pantalla de Ajustes de usuario.</string>
     <string name="stream">En directo</string>
     <string name="stream_bad_spectator">La calidad del vídeo y audio de la transmisión que estás viendo es reducida. Es posible que se deba al estado de la red.</string>
     <string name="stream_bad_streamer">La calidad del vídeo y audio de tu transmisión es reducida. Es posible que se deba al estado de la red.</string>
@@ -3041,7 +2940,6 @@ los podrá escuchar cualquiera que tenga abierto el canal."</string>
     <string name="stream_capture_paused_details">Vuelve a tu juego para continuar.</string>
     <string name="stream_capture_paused_details_viewer">%1$s ha minimizado el juego… ¡No te muevas!</string>
     <string name="stream_channel_description">Los miembros con este permiso pueden transmitir en este canal.</string>
-    <string name="stream_description">Los miembros con este permiso pueden transmitir en este canal.</string>
     <string name="stream_ended">Esta transmisión ha finalizado. *ruido de grillos*</string>
     <string name="stream_ended_button">Transmisión finalizada</string>
     <string name="stream_ended_no_spectators">No hay espectadores porque la transmisión ha finalizado.</string>
@@ -3081,7 +2979,6 @@ los podrá escuchar cualquiera que tenga abierto el canal."</string>
     <string name="stream_report_rating_body_streamer">Háblanos de tu experiencia realizando transmisiones.</string>
     <string name="stream_report_submit">Enviar</string>
     <string name="stream_reported">Opinión enviada</string>
-    <string name="stream_reported_body">¡Gracias por informarnos de tu problema! Tu opinión nos ayuda a mejorar la calidad de la transmisión.</string>
     <string name="stream_soundshare_failed">Ey, algo ha salido mal y no hemos podido transmitir el sonido del juego.</string>
     <string name="streamer_mode">Modo Streamer</string>
     <string name="streamer_mode_enabled">Modo Streamer habilitado</string>
@@ -3139,7 +3036,6 @@ los podrá escuchar cualquiera que tenga abierto el canal."</string>
     <string name="system_message_guild_member_join_10">Un %1$s salvaje apareció.</string>
     <string name="system_message_guild_member_join_11">Fiuuu. %1$s acaba de aterrizar.</string>
     <string name="system_message_guild_member_join_12">Agarraos. %1$s acaba de unirse al servidor.</string>
-    <string name="system_message_guild_member_join_13">%1$s acaba de unirse. Escondan sus bananas.</string>
     <string name="system_message_guild_member_join_14">%1$s acaba de llegar. Parece OP, nerfeadlo.</string>
     <string name="system_message_guild_member_join_15">%1$s acaba de dejarse caer en el servidor.</string>
     <string name="system_message_guild_member_join_16">Se ha generado un %1$s en el servidor.</string>
@@ -3150,7 +3046,6 @@ los podrá escuchar cualquiera que tenga abierto el canal."</string>
     <string name="system_message_guild_member_join_21">Se aproxima un aspirante: ¡%1$s ha aparecido!</string>
     <string name="system_message_guild_member_join_22">¡Es un pájaro! ¡Es un avión! No he dicho nada, solo es %1$s.</string>
     <string name="system_message_guild_member_join_23">¡Es %1$s! ¡Alabad al sol! \\\\[T]/</string>
-    <string name="system_message_guild_member_join_25">¡Ja! ¡Se ha unido %1$s! ¡Has activado mi carta trampa!</string>
     <string name="system_message_guild_member_join_26">¡Eh, chicos! ¡Llega %1$s!</string>
     <string name="system_message_guild_member_join_27">¡Oye! ¡Escucha! ¡Se ha unido %1$s!</string>
     <string name="system_message_guild_member_join_28">Te estábamos esperando %1$s</string>
@@ -3216,18 +3111,13 @@ tengan un rol asignado"</string>
     <string name="tts_current">Para el canal seleccionado</string>
     <string name="tts_never">Nunca</string>
     <string name="tutorial_close">¡Entendido!</string>
-    <string name="tweet_us">Tuitéanos</string>
     <string name="two_fa">Autenticación de dos factores</string>
     <string name="two_fa_activate">Activar</string>
     <string name="two_fa_auth_code">Código de autenticación de 6 dígitos</string>
-    <string name="two_fa_backup_code_enter">Introduce el código de seguridad de 8 caracteres.</string>
-    <string name="two_fa_backup_code_enter_wrong">Los códigos de seguridad deben tener 8 caracteres y solo pueden contener números y letras.</string>
-    <string name="two_fa_backup_code_hint">Código de seguridad de 8 caracteres</string>
     <string name="two_fa_backup_code_used">usado</string>
     <string name="two_fa_backup_codes_body">"Estos códigos te permitirán entrar en tu cuenta si pierdes
 tu aplicación de autenticación. **¡Cada uno de estos códigos solo se puede utilizar una vez! ¡Los códigos que se hayan generado con anterioridad dejarán de funcionar!**"</string>
     <string name="two_fa_backup_codes_label">Códigos de seguridad</string>
-    <string name="two_fa_backup_codes_sales_pitch">Si pierdes el acceso a tu aplicación de autenticación, seguirás pudiendo acceder a tu cuenta con los códigos de seguridad pregenerados. ¡Guárdalos en algún lugar seguro para reducir el riesgo de perder el acceso a tu cuenta!</string>
     <string name="two_fa_change_account">Cambiar detalles de cuenta</string>
     <string name="two_fa_disable">Deshabilitar autenticación de dos factores</string>
     <string name="two_fa_discord_backup_codes">Estos son tus códigos de seguridad de Discord para la cuenta %1$s. ¡Mantenlos en un lugar seguro!</string>
@@ -3240,10 +3130,8 @@ tu aplicación de autenticación. **¡Cada uno de estos códigos solo se puede u
     <string name="two_fa_enter_sms_token_label">Introduce el código SMS de Discord</string>
     <string name="two_fa_enter_sms_token_sending">Enviando…</string>
     <string name="two_fa_enter_sms_token_sent">Hemos enviado un mensaje a %1$s. Introduce el código que hayas recibido.</string>
-    <string name="two_fa_enter_token_body">Puedes usar un código de seguridad o tu aplicación móvil de autenticación de dos factores.</string>
     <string name="two_fa_enter_token_label">Introduce el código de autenticación de Discord</string>
     <string name="two_fa_generate_codes">Generar nuevos códigos de seguridad</string>
-    <string name="two_fa_generate_codes_confirm_text">Generar nuevos códigos de seguridad anulará los códigos de seguridad antiguos que tengas guardados.</string>
     <string name="two_fa_guild_mfa_warning">En este servidor es obligatoria la autenticación de dos factores. Tus privilegios de administrador están deshabilitados. [Solucionar](onClick)</string>
     <string name="two_fa_guild_mfa_warning_ios">En este servidor es obligatoria la autenticación de dos factores. Tus privilegios de administrador están deshabilitados.</string>
     <string name="two_fa_ios_delete">Actualmente, no puedes eliminar servidores con la A2F habilitada en iOS.</string>
@@ -3301,8 +3189,6 @@ Hace falta una cuenta confirmada para **descargar aplicaciones**."</string>
     <string name="unsupported_browser">Navegador no compatible</string>
     <string name="unsupported_browser_body">"Parece que estás usando un navegador incompatible. Para disfrutar de todas las características que ofrece Discord,
 actualiza tu navegador o descarga una de nuestras aplicaciones."</string>
-    <string name="unsupported_browser_details">"Quieres poder hablar con tu equipo, ¿verdad? ¡Usa la última versión de Chrome, Opera, Firefox 38+ o descarga
-el cliente de Discord para empezar a hablar ahora mismo!"</string>
     <string name="unsupported_browser_title">Vaya, qué incómodo</string>
     <string name="unverified_account_body">"Revisa tu correo electrónico y sigue las instrucciones para verificar tu correo electrónico.
 
@@ -3420,8 +3306,6 @@ Mantén pulsado Máyus para subir directamente."</string>
     <string name="user_settings_appearance_preview_message_4">El modo compacto se activaría</string>
     <string name="user_settings_appearance_preview_message_5">Oh, ¡aquí está!</string>
     <string name="user_settings_appearance_zoom_tip">Puedes cambiar el nivel de zoom con %1$s +/- y restablecer el nivel de zoom con %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Mostrar pestaña de juegos</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Desactiva esto para ocultar la pestaña de juegos y concentrarte en tus conversaciones.</string>
     <string name="user_settings_close_button">Botón Cerrar</string>
     <string name="user_settings_confirm_logout">¿Seguro que quieres cerrar sesión?</string>
     <string name="user_settings_game_activity">Actividad de juegos</string>
@@ -3469,8 +3353,6 @@ Echa un vistazo al [StreamKit de Discord](%1$s)."</string>
     <string name="username_live">%1$s - EN DIRECTO</string>
     <string name="username_required">Nombre de usuario obligatorio.</string>
     <string name="users">Usuarios</string>
-    <string name="vad_permission_body">"En este canal es obligatorio utilizar Pulsar para hablar para el chat de voz. Solo podrás escuchar hasta que pases del modo
-detección de Actividad de voz a Pulsar para hablar."</string>
     <string name="vad_permission_small">Para hablar en este canal debes tener habilitado Pulsar para hablar.</string>
     <string name="vad_permission_title">Pulsar para hablar obligatorio</string>
     <string name="vanity_url">URL personalizada</string>
@@ -3480,8 +3362,6 @@ Ten presente que tu servidor estará disponible públicamente para cualquiera qu
     <string name="vanity_url_hint_mobile">tu-enlace-aqui</string>
     <string name="verfication_expired">El enlace de verificación del correo electrónico ha expirado.</string>
     <string name="verfication_expired_suggestion">Inicia sesión en Discord y reenvía el enlace</string>
-    <string name="verification_body">"Hemos detectado que está ocurriendo algo fuera de lo normal.
-Para seguir usando Discord, **tenemos que verificar que eres humano.**"</string>
     <string name="verification_body_alt">Ahora, asegurémonos de que eres humano…</string>
     <string name="verification_email_body">Te hemos enviado un nuevo correo electrónico de verificación a **%1$s**. Revisa la bandeja de entrada y la carpeta de spam.</string>
     <string name="verification_email_error_body">Ha habido un error al enviarte un correo electrónico de verificación. Vuelve a intentarlo más tarde o ponte en contacto con soporte técnico.</string>
@@ -3522,8 +3402,6 @@ Para seguir usando Discord, **tenemos que verificar que eres humano.**"</string>
     <string name="video">Vídeo</string>
     <string name="video_call">Videollamada</string>
     <string name="video_connect">Vídeo</string>
-    <string name="video_poor_connection_body">Se ha deshabilitado el vídeo. Se volverá a activar cuando mejore tu conexión.</string>
-    <string name="video_poor_connection_title">Conexión débil</string>
     <string name="video_preview">Vista previa de vídeo</string>
     <string name="video_settings">Ajustes de vídeo</string>
     <string name="video_unavailable">Vídeo no disponible</string>
@@ -3606,7 +3484,6 @@ pregunta o necesitas ayuda."</string>
     <string name="xbox_pin_step2">Ve a Ajustes > Conexiones > Añadir</string>
     <string name="xbox_pin_step3">Haz clic en Xbox e introduce el PIN</string>
     <string name="yes_text">Sí</string>
-    <string name="your_discord_tag">Tu etiqueta de Discord</string>
     <string name="your_pin_expires">Tu PIN expira %1$s</string>
     <string name="your_pin_is_expired">Tu PIN ha expirado</string>
     <string name="youre_viewing_older_messages">Estás viendo mensajes antiguos</string>
diff --git a/com.discord/res/values-fi/plurals.xml b/com.discord/res/values-fi/plurals.xml
index 0c6d2da4fe..593ac9c4a7 100644
--- a/com.discord/res/values-fi/plurals.xml
+++ b/com.discord/res/values-fi/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">Ei paikkoja</item>
         <item quantity="one">%d paikka</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d päivään</item>
-        <item quantity="one">yhteen päivään</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d jäsentä, joita</item>
-        <item quantity="zero">nolla jäsentä, joita</item>
-        <item quantity="one">yhden jäsenen, jota</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">päivää</item>
         <item quantity="one">päivä</item>
@@ -212,16 +203,6 @@
         <item quantity="other">oikeuksia</item>
         <item quantity="one">oikeuden</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">asetti etanatilan **!!%d!! sekuntiin**</item>
-        <item quantity="zero">poisti etanatilan käytöstä</item>
-        <item quantity="one">asetti etanatilan **1 sekuntiin**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">asetti etanatilan **!!%d!! sekuntiin**</item>
-        <item quantity="zero">poisti etanatilan käytöstä</item>
-        <item quantity="one">asetti etanatilan **1 sekuntiin**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! jäsentä**</item>
         <item quantity="one">**yhden jäsenen**</item>
@@ -321,10 +302,6 @@
         <item quantity="other">%d uutta viestiä</item>
         <item quantity="one">1 uusi viesti</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d päivän</item>
-        <item quantity="one">yhden päivän</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d kanavaa</item>
         <item quantity="one">%d kanava</item>
@@ -342,10 +319,6 @@
         <item quantity="other">nämä viestit</item>
         <item quantity="one">tämä viesti</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** muuta palvelinta ei ole käytettävissä hetkellisen katkoksen takia.</item>
-        <item quantity="one">**1** palvelin ei ole käytettävissä hetkellisen katkoksen takia.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d kuukauden</item>
         <item quantity="one">1 kuukauden</item>
diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml
index f534bbc9ca..1c54c7c1d0 100644
--- a/com.discord/res/values-fi/strings.xml
+++ b/com.discord/res/values-fi/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"Et voi lähettää kutsua, koska olet joko näkymättömänä tai pelaamistilasi on piilotettu. Jos et halua muuttaa näitä asetuksia,
 voit pyytää jonkun toisen henkilön kutsumaan sinut."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Selvä!</string>
-    <string name="activity_panel_go_live_hotspot_header">Aloita livestriimi, niin voit striimata pelaamisesi suoraan kavereillesi!</string>
+    <string name="activity_panel_go_live_hotspot_header">Käytä Go Live -striimiä, niin voit striimata pelaamisesi suoraan kavereillesi!</string>
     <string name="activity_panel_go_live_tooltip">Livestriimi</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Tällä palvelimella ei ole puhekanavia, jolle striimata.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Et voi striimata tälle puhekanavalle.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Aloita striimaus siirtymällä palvelimelle.</string>
     <string name="add">Lisää</string>
     <string name="add_a_comment_optional">Lisää kommentti (valinnainen)</string>
@@ -159,7 +157,6 @@ myöntäminen voi olla vaarallista."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Sait sen!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Siirry kirjastoon</string>
     <string name="application_entitlement_code_redemption_invalid">Virheellinen koodi annettu</string>
-    <string name="application_entitlement_code_redemption_prompt">Saitko koodin peliä varten? Syötä se tähän:</string>
     <string name="application_entitlement_code_redemption_redeem">Lunasta</string>
     <string name="application_filter_name_linux">Kaikki tiedostot</string>
     <string name="application_filter_name_macos">Sovellukset</string>
@@ -411,7 +408,6 @@ myöntäminen voi olla vaarallista."</string>
     <string name="application_store_view_all_news">Näytä kaikki uutiset</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Tämän DLC:n pelaaminen edellyttää, että omistat sen peruspelin %1$s Discordissa. [Lue lisää DLC-laajennuksista.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Ladattava sisältö</string>
-    <string name="application_store_warning_early_access_description">Tämä peli on hauska (meidän mielestämme!), mutta sen sisällössä voi olla rajoituksia, siinä voi olla ohjelmavirheitä tai se saattaa tuntua epätäydelliseltä. [Lue lisää ennakkojulkaisuista.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Ennakkojulkaisu</string>
     <string name="application_store_warning_requires_desktop_app_description">Tämän pelin pelaaminen edellyttää, että Discordin $[työpöytäsovellus](downloadHook) on asennettu.</string>
     <string name="application_store_warning_requires_desktop_app_title">Työpöytäsovellus tarvitaan</string>
@@ -459,7 +455,6 @@ myöntäminen voi olla vaarallista."</string>
     <string name="authorize">Valtuuta</string>
     <string name="authorized">Valtuutettu</string>
     <string name="authorized_apps">Valtuutetut sovellukset</string>
-    <string name="authorizing">Valtuutettaan</string>
     <string name="auto_toggle_streamer_mode_description">Ota striimaustila automaattisesti käyttöön tai poista se käytöstä, jos OBS tai XSplit on käynnissä tällä tietokoneella.</string>
     <string name="auto_toggle_streamer_mode_label">Automaattisesti käyttöön / pois käytöstä</string>
     <string name="autocomplete_no_results_body">Onkohan tässä kirjoitusvirhe?</string>
@@ -532,7 +527,6 @@ Mutta jos ja kun annat, älä epäröi!"</string>
     <string name="billing_error_section_card">Hups! Tämän kortin käyttämiseen liittyy ongelma. Korjaa kenttien arvot ja yritä uudelleen.</string>
     <string name="billing_history">Laskutushistoria</string>
     <string name="billing_legal_mumbo_jumbo">Oikeudellista höpinää</string>
-    <string name="billing_legal_mumbo_jumbo_label">Hyväksyn [Discord Storen Palveluehdot](%1$s)</string>
     <string name="billing_no_payment_method">Maksutapaa ei ole tallennettu</string>
     <string name="billing_no_payment_method_description">Osta nopeammin tallentamalla maksutapa</string>
     <string name="billing_pay_for_it_with">Käytä maksutapaa</string>
@@ -540,12 +534,7 @@ Mutta jos ja kun annat, älä epäröi!"</string>
     <string name="billing_payment_breakdown_total">Yhteensä</string>
     <string name="billing_payment_history">Tapahtumahistoria</string>
     <string name="billing_payment_premium">Tilauksesi</string>
-    <string name="billing_payment_premium_legalese_monthly">Ostamalla tuotenimikkeen %1$s osoitat hyväksyväsi [Kauppamme Palveluehdot](%2$s). %1$s on automaattisesti uusiutuva tilaus. Valtuutat Discordin veloittamaan sinulta valitsemasi maksutavan mukaisesti välittömästi %3$s ja sen jälkeen tilauksen hinnan automaattisesti kuukausittain, kunnes peruutat tilauksen. Voit peruuttaa tilauksen koska tahansa.</string>
-    <string name="billing_payment_premium_legalese_yearly">Ostamalla tuotenimikkeen %1$s osoitat hyväksyväsi [Kauppamme Palveluehdot](%2$s). %1$s on automaattisesti uusiutuva tilaus. Valtuutat Discordin veloittamaan sinulta valitsemasi maksutavan mukaisesti välittömästi %3$s ja sen jälkeen tilauksen hinnan automaattisesti vuosittain, kunnes peruutat tilauksen. Voit peruuttaa tilauksen koska tahansa.</string>
     <string name="billing_payment_sources">Maksutavat</string>
-    <string name="billing_payment_table_header_amount">SUMMA</string>
-    <string name="billing_payment_table_header_date">PVM</string>
-    <string name="billing_payment_table_header_description">KUVAUS</string>
     <string name="billing_premium_refund_text">Voit pyytää hyvitystä, jos ostos on tehty viimeisten %1$s päivän kuluessa. [Tukipalvelumme ystävällinen henkilökunta auttaa sinua saamaan roposi takaisin.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Valitettavasti tätä ostosta ei voi hyvittää. Hyvitystä voi pyytää, jos ostos on tehty viimeisten %1$s päivän kuluessa.</string>
     <string name="billing_price_per_month">%1$s / kk</string>
@@ -555,9 +544,7 @@ Mutta jos ja kun annat, älä epäröi!"</string>
     <string name="billing_purchase_details_header">Ostoksen tiedot</string>
     <string name="billing_refund_header">Onko sinulla ongelmia ostoksessa?</string>
     <string name="billing_refund_play_time_never_played">Ei koskaan pelattu</string>
-    <string name="billing_refund_play_time_subheader">PELAAMISAIKA</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">OSTOPÄIVÄMÄÄRÄ</string>
     <string name="billing_refund_report_a_problem">Ilmoita ongelmasta</string>
     <string name="billing_refund_request_button">Pyydä hyvitystä</string>
     <string name="billing_sales_tax_added">Maksuun on lisätty myyntiveroja %1$s laskutusosoitteesi perusteella.</string>
@@ -797,7 +784,6 @@ punaisen varoitusviestin käytöstä klikkaamalla alla näkyvää pikkuruista te
     <string name="connection_enter_code">Syötä näytössä lukeva koodi sellaisenaan</string>
     <string name="connection_invalid_pin">Väärä koodi syötetty</string>
     <string name="connection_login_with">tai kirjaudu näillä:</string>
-    <string name="connection_problems_body">Tarkista [palvelimien tila](%1$s) tai twiittaa meille: [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Todennetaan</string>
     <string name="connection_status_awaiting_endpoint">Odotetaan päätelaitetta</string>
     <string name="connection_status_connected">Yhdistetty</string>
@@ -807,7 +793,6 @@ punaisen varoitusviestin käytöstä klikkaamalla alla näkyvää pikkuruista te
     <string name="connection_status_no_route">Ei reittiä</string>
     <string name="connection_status_rtc_connecting">Yhdistetään RTC</string>
     <string name="connection_status_rtc_disconnected">RTC katkaistu</string>
-    <string name="connection_status_stream_connected">Katsellaan läyttäjän %1$s striimiä</string>
     <string name="connection_status_video_connected">Videokuva yhdistetty</string>
     <string name="connection_status_voice_connected">Äänet yhdistetty</string>
     <string name="connection_verified">Vahvistettu</string>
@@ -842,7 +827,7 @@ punaisen varoitusviestin käytöstä klikkaamalla alla näkyvää pikkuruista te
     <string name="create_category">Luo luokka</string>
     <string name="create_channel">Luo kanava</string>
     <string name="create_group_dm">Luo ryhmäkeskustelu</string>
-    <string name="create_instant_invite">Luo pikakutsu</string>
+    <string name="create_instant_invite">Kutsun luonti</string>
     <string name="create_link">Luo linkki</string>
     <string name="create_or_join_modal_header">Oho, toinen palvelin vai?</string>
     <string name="create_server_button_body">Luo palvelin ja kutsu kaverisi sinne. Se on ilmaista!</string>
@@ -957,7 +942,6 @@ punaisen varoitusviestin käytöstä klikkaamalla alla näkyvää pikkuruista te
     <string name="disable_email_notifications_failed_suggestion">Sähköposti-ilmoitukset voivat olla jo pois käytöstä tai tämä sähköpostiosoite ei ole enää yhdistettynä Discord-tiliin.</string>
     <string name="disable_integration_title">Poista synkronointi käytöstä</string>
     <string name="disable_integration_twitch_body">Jos synkronointi poistetaan käytöstä, järjestelmä tekee tilaajien vanhentumistoimenpiteen ikään kuin kaikki tilaukset olisivat vanhentuneet.</string>
-    <string name="disable_integration_youtube_body">Jos synkronointi poistetaan käytöstä, järjestelmä tekee sponsoreiden vanhentumistoimenpiteen ikään kuin kaikki sponsorit olisivat vanhentuneet.</string>
     <string name="disable_notifications_description">Kaikki työpöytäilmoitukset poistetaan käytöstä.</string>
     <string name="disable_notifications_label">Poista ilmoitukset käytöstä</string>
     <string name="disable_sounds_description">Kaikki ääniefektit poistetaan käytöstä.</string>
@@ -974,7 +958,6 @@ punaisen varoitusviestin käytöstä klikkaamalla alla näkyvää pikkuruista te
     <string name="discord_desc_short">Tiimin teksti- ja puhekeskustelu</string>
     <string name="discord_rich_presence">Discordin Rich Presence</string>
     <string name="dismiss">Sulje</string>
-    <string name="dispatch_error_modal_body">Jossain tapahtui virhe. Jos ongelma ei poistu, luo tukiviesti ja kopioi alla oleva viestin sisältö.</string>
     <string name="dispatch_error_modal_error_label">Virheviesti (Kopioi ja liitä minut)</string>
     <string name="dispatch_error_modal_header">Discordin lähetysvirhe</string>
     <string name="dispatch_error_modal_open_ticket">Avaa tukiviesti</string>
@@ -1051,7 +1034,6 @@ punaisen varoitusviestin käytöstä klikkaamalla alla näkyvää pikkuruista te
     <string name="enable_privacy_access">Voit ottaa pääsyn käyttöön yksityisyysasetuksista.</string>
     <string name="enable_streamer_mode_description">Voit määrittää näppäinkomennon striimaustilan käyttöönotolle [näppäinkomentoasetuksissa](onClick).</string>
     <string name="enable_streamer_mode_label">Ota striimaustila käyttöön</string>
-    <string name="enable_twitch_emoji_sync">Salli synkronoitunjen tilaajien käyttää mukautettuja Twitch-emojejasi Discordissa.</string>
     <string name="enter_email_body">Sinun täytyy ensin määrittää sähköpostiosoite, jotta voit vahvistaa sen.</string>
     <string name="enter_phone_description">Anna puhelinnumerosi. Saat vahvistuskoodin tekstiviestissä.</string>
     <string name="enter_phone_title">Anna puhelinnumero</string>
@@ -1088,7 +1070,7 @@ punaisen varoitusviestin käytöstä klikkaamalla alla näkyvää pikkuruista te
     <string name="file_rate_mb">%1$s Mt/s</string>
     <string name="file_size_gb">%1$s Gt</string>
     <string name="file_size_mb">%1$s Mt</string>
-    <string name="file_upload_limit_premium">50 Mt</string>
+    <string name="file_upload_limit_premium_tier_1">50 Mt</string>
     <string name="file_upload_limit_standard">8 Mt</string>
     <string name="filter">Suodata</string>
     <string name="filter_mentions">Suodata maininnat</string>
@@ -1110,8 +1092,6 @@ AFK-aikakatkaisu sallii. Tämä ei koske selaimia."</string>
     <string name="form_help_attenuation">"Laskee muiden sovelluksien äänenvoimakkuutta tämän prosenttiosuuden verran, kun joku puhuu.
 Aseta nollaan prosenttiin, jos haluat poistaa vaimennuksen käytöstä."</string>
     <string name="form_help_automatic_vad">Jos merkkivalo palaa tasaisesti vihreänä, Discord lähettää kaunista puhettasi.</string>
-    <string name="form_help_bitrate">"**KAIKKI BITIT!** %1$s kbps:n ylitystä ei suositella kuin hifistelijöille, sillä se haittaa mobiililaitteiden käyttäjiä ja heikkoja
-yhteyksiä käyttäviä eikä juurikaan paranna äänenlaatua."</string>
     <string name="form_help_certified_voice_processing">"Kun käytät Discordin sertifioimaa mikrofonia, mikrofoni tekee tietyt äänenkäsittelytoiminnot
 Discordin sijasta."</string>
     <string name="form_help_channel_permissions">Roolien valitseminen luo automaattisesti peruskäyttöoikeudet kanavalle.</string>
@@ -1124,11 +1104,6 @@ Discord-palvelimella [tämän hulluuden](%1$s) välttämiseksi.**"</string>
 tällä palvelimella lähetetystä viestistä. Suosittelemme vahvasti pitämään tämän asetuksen vain @maininnoissa julkisella Discord-palvelimella"</string>
     <string name="form_help_explicit_content_filter">"Tarkista ja poista automaattisesti ne viestit tällä palvelimella, jotka sisältävät sopimatonta sisältöä. Valitse,
 kuinka laajasti tätä suodatinta sovelletaan palvelimesi käyttäjiin. **Suosittelemme tämän asetuksen käyttämistä julkisilla Discord-palvelimilla.**"</string>
-    <string name="form_help_instant_invite_channel">"Jos kanava on valittu, pikakutsulinkki luodaan pienoisohjelmalla.
- Muissa tapauksissa vain jäsenluettelo ja puhekanavat ovat käytössä."</string>
-    <string name="form_help_last_seen">"Karsiminen erottaa **%1$s** ei ole 
-nähty yli **%2$s** tai lisätty mihinkään rooliin. 
-He voivat liittyä palvelimelle uudelleen uutta pikakutsua käyttämällä."</string>
     <string name="form_help_legacy_subsystem">"Tiettyjen äänilaitteistojen ohjaimissa voi esiintyä ongelmia, kun käytät käyttöjärjestelmäsi nykyaikaista äänialijärjestelmää.
 Valitse tämä asetus, jos haluat käyttää vanhempaa äänialijärjestelmää."</string>
     <string name="form_help_nsfw">"Käyttäjien täytyy vahvistaa ennen tämän kanavan sisällön katselemista, että he ovat täysi-ikäisiä..
@@ -1138,7 +1113,6 @@ Jos hallinnoit myös sivustosi käyttäjiä, voit dynaamisesti lisätä &amp;use
     <string name="form_help_qos">"Vihjaa reitittimellesi, että paketit joita Discord lähettää, ovat etusijalla.
 Jotkin reitittimet tai internet-palveluntarjoajat saattavat toimia huonosti, kun tämä asetus on käytössä."</string>
     <string name="form_help_slowmode">Jäsenet voivat lähettää vain yhden viestin määritetyllä aikavälillä, ellei heillä ole kanavan tai viestien hallintaoikeuksia.</string>
-    <string name="form_help_system_channel">Tälle kanavalle lähetetään viesti, kun joku liittyy tälle palvelimelle. Viestit ovat satunnaisia. Tämän voi kytkeä pois koska tahansa.</string>
     <string name="form_help_temporary">Mikäli jäsenellä ei ole roolia, hänet erotetaan automaattisesti yhteyden katketessa.</string>
     <string name="form_help_user_limit">"Rajoittaa yhtäaikaisesti tälle kanavalle päästettävien käyttäjien määrää. **Siirrä käyttäjiä** -oikeuden omistavat
 henkilöt voivat ohittaa rajoituksen ja siirtää muita henkilöitä kanavalle rajoituksesta huolimatta."</string>
@@ -1183,8 +1157,8 @@ Tämä ei päde, jos jäsenelle on annettu jokin rooli.
     <string name="form_label_input_mode">Syöttötila</string>
     <string name="form_label_input_sensitivty">Syötön herkkyys</string>
     <string name="form_label_input_volume">Syötön äänenvoimakkuus</string>
-    <string name="form_label_instant_invite">Liitä pikakutsu</string>
-    <string name="form_label_instant_invite_channel">Pikakutsukanava</string>
+    <string name="form_label_instant_invite">Liitä kutsu</string>
+    <string name="form_label_instant_invite_channel">Kutsukanava</string>
     <string name="form_label_json_api">JSON-rajapinta</string>
     <string name="form_label_last_seen">Viimeksi nähty</string>
     <string name="form_label_local_mute">Paikallinen mykistys</string>
@@ -1254,7 +1228,6 @@ Tämä ei päde, jos jäsenelle on annettu jokin rooli.
     <string name="form_label_suppress_everyone">Estä **@everyone** ja **@here**</string>
     <string name="form_label_synced_role">Synkronoitu rooli</string>
     <string name="form_label_synced_subs">Synkronoidut tilaajat</string>
-    <string name="form_label_system_channel">Uusien jäsenten ilmoituskanava</string>
     <string name="form_label_temporary">Väliaikainen jäsenyys</string>
     <string name="form_label_tts">Tekstistä puheeksi</string>
     <string name="form_label_tts_notifications">Tekstistä puheeksi -ilmoitukset</string>
@@ -1317,7 +1290,6 @@ Kiitos, että pidät asiat putipuhtaina."</string>
     <string name="game_action_button_game_not_detected">Peliä ei havaittu</string>
     <string name="game_action_button_install">Asenna</string>
     <string name="game_action_button_locate">Paikanna</string>
-    <string name="game_action_button_login_to_buy">Osta kirjautumalla sisään</string>
     <string name="game_action_button_now_playing">Nyt pelissä</string>
     <string name="game_action_button_paused">Keskeytä</string>
     <string name="game_action_button_play">Pelaa</string>
@@ -1356,7 +1328,6 @@ Kiitos, että pidät asiat putipuhtaina."</string>
     <string name="game_feed_activity_recently_played">Äskettäin pelanneet</string>
     <string name="game_feed_activity_streaming_twitch">Striimaa Twitchiin</string>
     <string name="game_feed_current_header_title">Nyt pelissä</string>
-    <string name="game_feed_settings_visibility">Näytä Pelit-välilehdellä</string>
     <string name="game_feed_unknown_player">Tuntematon pelaaja</string>
     <string name="game_feed_user_played_days_ago">Pelasi %1$s %2$s sitten</string>
     <string name="game_feed_user_played_hours_ago">Pelasi %1$s %2$s sitten</string>
@@ -1426,6 +1397,7 @@ Kiitos, että pidät asiat putipuhtaina."</string>
     <string name="generate_a_new_link">Luo uusi linkki</string>
     <string name="get_started">Aloittaminen</string>
     <string name="gif_auto_play_label">Toista GIF-kuvat automaattisesti Discordin ikkunan ollessa valittuna.</string>
+    <string name="go_live_hardware_acceleration_unavailable">Ihan vain tiedoksi, että laitteistokiihdytystä ei havaittu. Tietokoneesi ei välttämättä tue Go Live -striimiä.</string>
     <string name="go_live_hey">Hei!</string>
     <string name="go_live_listen">Kuuntele!</string>
     <string name="go_live_look">Katso!</string>
@@ -1439,6 +1411,7 @@ Kiitos, että pidät asiat putipuhtaina."</string>
     <string name="go_live_modal_select_channel_form_title">Valitse puhekanava</string>
     <string name="go_live_modal_select_channel_placeholder">Etsi puhekanavia</string>
     <string name="go_live_modal_title">Livestriimi</string>
+    <string name="go_live_video_drivers_outdated">Video-ohjaimesi ovat vanhentuneet. Päivitä ne, niin Go Live -striimi toimii paremmin.</string>
     <string name="grant_temporary_membership">Myönnä väliaikainen jäsenyys</string>
     <string name="group">Ryhmä</string>
     <string name="group_dm_add_friends">Lisää kavereita keskusteluun</string>
@@ -1515,8 +1488,6 @@ Kiitos, että pidät asiat putipuhtaina."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Myönsi** %1$s kohteelle **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Siirretty kohdasta **%1$s** kohtaan **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">Sijainnissa **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) loi tekstikanavan $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Vaihtoi aiheeksi **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Asetti aiheeksi **%1$s**</string>
@@ -1612,6 +1583,8 @@ Kiitos, että pidät asiat putipuhtaina."</string>
     <string name="guild_settings_filter_all_actions">Kaikki toimenpiteet</string>
     <string name="guild_settings_filter_all_users">Kaikki käyttäjät</string>
     <string name="guild_settings_filter_user">Suodata käyttäjittäin</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">720p-tarkkuuden Go Live -striimit 60 fps:n nopeudella</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">1080p-tarkkuuden Go Live -striimit 60 fps:n nopeudella</string>
     <string name="guild_settings_label_audit_log">Valvontaloki</string>
     <string name="guild_settings_label_audit_log_empty_body">Kun valvojat aloittavat valvomisen, voit valvoa heidän valvomistaan täällä.</string>
     <string name="guild_settings_label_audit_log_empty_title">Ei vielä lokeja</string>
@@ -1643,7 +1616,7 @@ Jos hallinnoit myös sivustosi käyttäjiä, voit dynaamisesti lisätä &amp;use
     <string name="help_role_locked_mine">Rooli on lukittu, koska se on sinun korkea-arvoisin roolisi. Pyydä apua palvelimen omistajalta tai korkea-arvoisemmalta käyttäjältä.</string>
     <string name="help_singular_permission">Et voi muokata tätä oikeutta, sillä sen poistaminen aiheuttaisi sen poistamisen myös sinulta.</string>
     <string name="hide_instant_invites_description">Suositellaan, jos et halua satunnaisten ihmisten pääsevän Discord-palvelimillesi.</string>
-    <string name="hide_instant_invites_label">Piilota pikakutsulinkit</string>
+    <string name="hide_instant_invites_label">Piilota kutsulinkit</string>
     <string name="hide_muted">Piilota %1$s mykistettyä</string>
     <string name="hide_muted_channels">Piilota mykistetyt kanavat</string>
     <string name="hide_personal_information_description">Piilottaa sähköpostiosoitteesi, yhdistetyt tilit, muistiinpanot ja anonymisoi DiscordTagit.</string>
@@ -1694,7 +1667,6 @@ Jos hallinnoit myös sivustosi käyttäjiä, voit dynaamisesti lisätä &amp;use
     <string name="hypesquad_question_11_response_d">Ehdotat Wumpukselle, että tamburiini voisi olla hänelle sopivampi soitin.</string>
     <string name="hypesquad_question_12_prompt">Olet noussut korkeimman vuoren huipulle, ja sinut erottaa rikkauksista enää tielläsi seisova tornin kolmipäinen lohikäärme. Mitä teet?</string>
     <string name="hypesquad_question_12_response_a">Hyökkäät suoraan taistoon.</string>
-    <string name="hypesquad_question_12_response_b">Katsot vanhoja Godzilla-leffoja ja perehdyt Godzillan taistelutekniikoihin King Ghidorahia vastaan.</string>
     <string name="hypesquad_question_12_response_c">Yrität suostutella lohikäärmeen jakamaan rikkaudet puoliksi.</string>
     <string name="hypesquad_question_12_response_d">Tarjoat lohharille Wumpus-pehmolelua. Kuka nyt siitä kieltäytyisi?</string>
     <string name="hypesquad_question_13_prompt">Hei, mikä tuo ääni on?</string>
@@ -1797,14 +1769,14 @@ Jos hallinnoit myös sivustosi käyttäjiä, voit dynaamisesti lisätä &amp;use
     <string name="input_mode_ptt_release_delay">Radiopuhelintilan vapautusviive</string>
     <string name="input_mode_vad">Puheentunnistus</string>
     <string name="install_location_main">Päähakemisto</string>
-    <string name="instant_invite">Pikakutsu</string>
+    <string name="instant_invite">Kutsu</string>
     <string name="instant_invite_accept">Hyväksy kutsu</string>
-    <string name="instant_invite_accepted">Pikakutsu hyväksytty</string>
-    <string name="instant_invite_accepting">Hyväksytään pikakutsua</string>
+    <string name="instant_invite_accepted">Kutsu hyväksytty</string>
+    <string name="instant_invite_accepting">Hyväksytään kutsu</string>
     <string name="instant_invite_ask_for_new_invite">Pyydä uusi!</string>
     <string name="instant_invite_ask_user_for_new_invite">Pyydä käyttäjältä %1$s uusi kutsu!</string>
     <string name="instant_invite_code">Koodi</string>
-    <string name="instant_invite_expired">Pikakutsu on virheellinen tai vanhentunut.</string>
+    <string name="instant_invite_expired">Kutsu on virheellinen tai vanhentunut.</string>
     <string name="instant_invite_expires">Vanheneminen</string>
     <string name="instant_invite_failed_to_generate">Kutsulinkkiä ei voitu luoda.</string>
     <string name="instant_invite_generate">Luo</string>
@@ -1822,16 +1794,15 @@ Jos hallinnoit myös sivustosi käyttäjiä, voit dynaamisesti lisätä &amp;use
     <string name="instant_invite_regenerate">Luo uudelleen</string>
     <string name="instant_invite_resolved_body">Sinut on kutsuttu kanavalle **%1$s** palvelimella **%2$s**.</string>
     <string name="instant_invite_resolved_title">Hei siellä.</string>
-    <string name="instant_invite_resolving">Selvitetään pikakutsua</string>
+    <string name="instant_invite_resolving">Selvitetään kutsua</string>
     <string name="instant_invite_uses">Käytöt</string>
     <string name="instant_invite_you_are_already_a_member_of">Olet jo jäsen täällä:</string>
     <string name="instant_invite_you_have_been_invited_to_join">Sinut on kutsuttu</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** on kutsunut sinut</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Sinut on kutsunut ryhmäkeskusteluun, kutsuja on</string>
-    <string name="instant_invites">Pikakutsut</string>
+    <string name="instant_invites">Kutsut</string>
     <string name="integration_settings">Integrointiasetukset</string>
     <string name="integrations">Integroinnit</string>
-    <string name="integrations_header">Yhdistetyt Twitch- ja YouTube Gaming -tilit</string>
     <string name="integrations_pro_tip">Jos haluat lisää integraatioita, katso [Discordin StreamKit](%1$s).</string>
     <string name="internal_server_error">On ilmennyt sisäinen palvelinvirhe, yritä uudelleen.</string>
     <string name="invalid_animated_emoji_body">Tämä emoji ei toimi, koska se on animoitu. Päivitä Discord Nitroon, niin voit käyttää kaikkia unelmiesi animoituja emojeja.</string>
@@ -1944,13 +1915,13 @@ Haluatko lisätietoja Discordista?"</string>
     <string name="join_afk_channel_body">Näyttää siltä, että olet liittynyt AFK-kanavalle. Et voi puhua tällä kanavalla.</string>
     <string name="join_call">Liity puheluun</string>
     <string name="join_server">Liity</string>
-    <string name="join_server_button_body">Syötä pikakutsu ja liity kaverisi palvelimelle.</string>
+    <string name="join_server_button_body">Syötä kutsu ja liity kaverisi palvelimelle.</string>
     <string name="join_server_button_cta">Liity palvelimelle</string>
     <string name="join_server_button_cta_mobile">Liity palvelimelle kutsulinkillä</string>
     <string name="join_server_button_cta_mobile_desc">Onko sinulla kutsukoodi tai -linkki? Käytä sitä täällä.</string>
     <string name="join_server_button_cta_named">Liity palvelimelle %1$s</string>
-    <string name="join_server_description">Liity olemassa olevalle palvelimelle liittämällä pikakutsu alle. Kutsut näyttävät tältä:</string>
-    <string name="join_server_description_mobile">Liity olemassa olevalle palvelimelle liittämällä pikakutsuosoite yläpuolelle.</string>
+    <string name="join_server_description">Liity olemassa olevalle palvelimelle liittämällä kutsu alle. Kutsut näyttävät tältä:</string>
+    <string name="join_server_description_mobile">Liity olemassa olevalle palvelimelle liittämällä kutsuosoite yläpuolelle.</string>
     <string name="join_server_title">Liity palvelimelle</string>
     <string name="join_stream">Liity striimiin</string>
     <string name="join_video_call">Liity videopuheluun</string>
@@ -2057,7 +2028,7 @@ ensisijaisen puhujan roolia."</string>
     <string name="link_your_xbox_account_1">Yhdistä Xbox-tilisi Discordiin, niin voit esitellä muille, mitä pelaat.</string>
     <string name="link_your_xbox_account_2">Discord on ilmainen ja turvallinen pelaajille suunniteltu puhe-, ääni- ja videokeskustelusovellus, joka toimii sekä tietokoneella että puhelimella.</string>
     <string name="listening_to">Kuuntelee: **%1$s**</string>
-    <string name="live_beta_description">Tervetuloa striimiin! Livestriimi on vielä beetavaiheessa, joten pahoittelut mahdollisista häiriöistä</string>
+    <string name="live_beta_description">Tervetuloa striimiin! Go Live -striimi on vielä beetavaiheessa, joten pahoittelut mahdollisista häiriöistä</string>
     <string name="live_on_twitch">Livenä Twitchissä</string>
     <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Kuvan lataus epäonnistui.
@@ -2193,7 +2164,6 @@ ainoastaan sellaisten kanavien välillä, joihin sekä hänellä että siirrett
     <string name="n_days">%1$s</string>
     <string name="need_account">Tarvitsetko tilin?</string>
     <string name="network_error_bad_request">Virheellinen verkkopyyntö on havaittu, yritä uudelleen.</string>
-    <string name="network_error_cloudflare_intermittent">CloudFlare-palvelussa on saattanut esiintyä lyhyä katkos. Yritä uudelleen.</string>
     <string name="network_error_cloudflare_unauthorized">IP-osoitteesi on kieltolistalla CloudFlaressa.</string>
     <string name="network_error_connection">On ilmennyt verkkovirhe. Tarkista yhteytesi ja yritä uudelleen.</string>
     <string name="network_error_forbidden">Kielletty verkkopyyntö on havaittu, yritä uudelleen.</string>
@@ -2243,14 +2213,11 @@ päivitetyt palveluehtomme ja tietosuojakäytäntömme."</string>
     <string name="no_emoji_title">Ei emojia</string>
     <string name="no_input_devices">Ei syöttölaitteita</string>
     <string name="no_input_devices_detected">Syöttölaitteita ei tunnistettu. Liitä laite ja yritä uudelleen.</string>
-    <string name="no_instant_invite">Ei pikakutsua</string>
-    <string name="no_integrations">Synkronoi tilaajiesi/sponsoreidesi roolit [yhdistämällä](onConnect) Twitch- tai YouTube Gaming -kumppanitilisi</string>
+    <string name="no_instant_invite">Ei kutsua</string>
     <string name="no_integrations_body">Y57ÄVYY5-protokollan voi ainoastaan suorittaa Discord-sovelluksella</string>
     <string name="no_integrations_label">Ei integrointeja</string>
-    <string name="no_invites_body">"Tunnetko olosi päämäärättömäksi kuin taivaalla liitelevä paperilennokki?
-Järjestä kaverit paikalle luomalla pikakutsulinkki!"</string>
-    <string name="no_invites_caption">Ei vielä pikakutsuja!</string>
-    <string name="no_invites_label">Ei vielä pikakutsuja</string>
+    <string name="no_invites_caption">Ei vielä kutsuja!</string>
+    <string name="no_invites_label">Ei vielä kutsuja</string>
     <string name="no_mail_account_description">Lähetä palautteesi osoitteeseen support@discordapp.com. Olemme kopioineet käyttäjätietosi leikepöydälle.</string>
     <string name="no_mail_account_title">Ei sähköpostitiliä</string>
     <string name="no_mic_body">Discordin ohjekeskuksessa on ohjeita mikrofonin käytön sallimisesta.</string>
@@ -2268,7 +2235,6 @@ kiinnitettyjä viestejä… vielä."</string>
     <string name="no_reactions_header">Ei reaktioita</string>
     <string name="no_recent_mentions">Ja alussa… oli hiljaisuus.</string>
     <string name="no_send_messages_permission_placeholder">Sinulla ei ole oikeuksia lähettää viestejä tällä kanavalla.</string>
-    <string name="no_system_channel">Ei viestejä uusista jäsenistä</string>
     <string name="no_text">Ei</string>
     <string name="no_thanks">Ei kiitos</string>
     <string name="no_user_limit">Ei rajoitusta</string>
@@ -2280,7 +2246,6 @@ kiinnitettyjä viestejä… vielä."</string>
     <string name="note">Muistiinpano</string>
     <string name="note_placeholder">Lisää muistiinpano klikkaamalla</string>
     <string name="note_placeholder_mobile">Lisää muistiinpano napauttamalla</string>
-    <string name="notice_application_test_mode">**%1$s** on parhaillaan aktivoituna testitilaan. Julkaisemattomat SKU-paketit näytetään, eikä sinulta veloiteta mitään maksuja.</string>
     <string name="notice_application_test_mode_go_to_listing">Siirry SKU-pakettiin</string>
     <string name="notice_connect_spotify">Yhdistä Spotify-tilisi, niin voit näyttää toistamasi musiikin tilatiedoissasi!</string>
     <string name="notice_connection_conflict">Ääniyhteytesi on katkaistu, koska muodostit yhteyden toisesta sijainnista.</string>
@@ -2291,7 +2256,6 @@ kiinnitettyjä viestejä… vielä."</string>
     <string name="notice_dispatch_error_disk_low">Sinulla ei ole riittävästi levytilaa. Sitä tarvitaan %1$s, mutta vain %2$s on vapaana.</string>
     <string name="notice_dispatch_error_file_name_too_long">Voi pahus, tämän pelin tiedostojen nimet ovat liian pitkät Windowsille. Valitse lyhyempi asennushakemistopolku.</string>
     <string name="notice_dispatch_error_invalid_drive">Voi pahus, valitsemasi asennuskohde ei ole kelvollinen. Valitsemasi polku on %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Pelin päivittäminen ei onnistunut. Onkohan se parhaillaan käynnissä?</string>
     <string name="notice_dispatch_error_no_manifests">Voi pahus, tälle pelille ei näytä olevan sisältöä. Ota yhteyttä tukeen.</string>
     <string name="notice_dispatch_error_not_entitled">Voi pahus, et taida omistaa tätä peliä. Ota yhteyttä tukeen, jos kyseessä on mielestäsi virhe.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Et nähtävästi antanut lupaa komentosarjan asentamiseen. Sinun on hyväksyttävä se, jotta peli voidaan asentaa.</string>
@@ -2306,9 +2270,6 @@ kiinnitettyjä viestejä… vielä."</string>
     <string name="notice_native_apps">Tarvitsetko kaikkialla järjestelmässä toimivan radiopuhelinratkaisun? Hanki työpöytäsovellus!</string>
     <string name="notice_no_input_detected">Discord ei havaitse mitään syötettä mikrofonistasi. Korjataan se… yhdessä.</string>
     <string name="notice_no_input_detected_help_link_text">Apua!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Nitro-käyttöoikeutesi on päättynyt. Päivitä Nitro Classic -tilauksesta Nitro-tilaukseen, niin pääset pelaamaan mahtipelejä rajoituksetta.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Nitro-pelit ovat tarjolla sinulle enää %1$s ajan! Käyttöoikeutesi päättyy **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Kiitos, että olet Nitron varhainen tukija! Kiitokseksi mahtavuudestasi voit nyt käyttää Nitro-pelejä %1$s asti.</string>
     <string name="notice_premium_promo_action">Tutustu</string>
     <string name="notice_premium_promo_message">Tue Discordin kehitystä ja saa mukavia lisäetuja!</string>
     <string name="notice_scheduled_maintenance">Discord menee suunnitellulle päivityskatkolle **%1$s** kello **%2$s**.</string>
@@ -2378,7 +2339,6 @@ Saitko kutsulinkin kaveriltasi? Syötä kutsulinkki tai -koodi alle, niin pääs
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Peitetaso käytössä</string>
     <string name="nux_post_reg_join_server_description">Ota Discordista kaikki hyöty irti liittymällä palvelimelle.</string>
     <string name="nux_post_reg_join_server_skip">Ei ole</string>
     <string name="nux_post_reg_join_server_title">Onko sinulla kutsua?</string>
@@ -2424,7 +2384,6 @@ jos sinulla on ongelmia tai kysymyksiä!"</string>
     <string name="overlay_menu_get_invite">Hanki kutsulinkki</string>
     <string name="overlay_menu_open_discord">Avaa Discord</string>
     <string name="overlay_menu_switch_channels">Vaihda kanavia</string>
-    <string name="overlay_mobile_toggle_desc">Katso, ketkä puhuvat, ja käytä pikavalintoja muiden sovellusten käytön aikana, kun olet yhteydessä puhekanavaan</string>
     <string name="overlay_mobile_toggle_label">Ota käyttöön mobiilipuheen peitetaso</string>
     <string name="overlay_mobile_unauthed">Ota tämä ominaisuus käyttöön kirjautumalla Discord-sovellukseen.</string>
     <string name="overlay_news_go_live_body">Haluatko striimata peliä %1$s kavereillesi palvelimella %2$s?</string>
@@ -2432,7 +2391,6 @@ jos sinulla on ongelmia tai kysymyksiä!"</string>
     <string name="overlay_news_text_pinning_body">Voit nyt kiinnittää tekstikeskustelun peliisi!</string>
     <string name="overlay_news_text_pinning_tip">Vinkki: voit kiinnittää keskustelun valitsemalla $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Discord-peitetaso on päivitetty</string>
-    <string name="overlay_no_results">Etsimme parhaamme mukaan. Valitettavasti mitään puhekanavia ei löytynyt.</string>
     <string name="overlay_notification_incoming_call">Saapuva puhelu…</string>
     <string name="overlay_notification_settings_disabled">Ilmoitukset poistettu käytöstä</string>
     <string name="overlay_notification_settings_position">Näkyy: %1$s</string>
@@ -2442,7 +2400,6 @@ jos sinulla on ongelmia tai kysymyksiä!"</string>
     <string name="overlay_notifications_settings">Peitetasoilmoitukset</string>
     <string name="overlay_notifications_top_left">Ylävasen</string>
     <string name="overlay_notifications_top_right">Yläoikea</string>
-    <string name="overlay_private_channels_empty_state">Ehei, täällä ei ole yksityisviestejä.</string>
     <string name="overlay_reload">Lataa peitetaso uudelleen</string>
     <string name="overlay_settings">Peitetasoasetukset</string>
     <string name="overlay_settings_general_tab">Yleinen</string>
@@ -2464,7 +2421,6 @@ jos sinulla on ongelmia tai kysymyksiä!"</string>
     <string name="pagination_page_of">Sivu %1$s/%2$s</string>
     <string name="pagination_previous">Edellinen</string>
     <string name="paginator_of_pages">Sivu %1$s/%2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Discord-kumppani</string>
     <string name="party_full">Ryhmä täynnä</string>
     <string name="party_join">Liity ryhmään</string>
@@ -2557,18 +2513,11 @@ jos sinulla on ongelmia tai kysymyksiä!"</string>
     <string name="popout_stay_on_top">Pidä päällimmäisenä</string>
     <string name="post_code">Postinumero</string>
     <string name="premium_alert_error_title">Hups, jokin meni pieleen…</string>
-    <string name="premium_applications_grandfathered_monthly">Kiitokseksi tuestasi Discordille saat käyttöoikeuden Nitro-peleihin vuoden ajaksi. Käyttöoikeutesi päättyy **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">Kiitokseksi tuestasi Discordille saat käyttöoikeuden Nitro-peleihin kahdeksi vuodeksi. Käyttöoikeutesi päättyy **%1$s**.</string>
-    <string name="premium_applications_subtitle">Rajaton käyttöoikeus kasvavaan kirjastoon ylistettyjä pelejä, joista uskomme sinun ja ystäviesi pitävän.</string>
-    <string name="premium_applications_title">Kymmeniä valikoituja pelejä. Yksi edullinen kuukausihinta.</string>
     <string name="premium_badge_tooltip">Tilaaja %1$s alkaen</string>
     <string name="premium_cancel_cancel">Ei kiitos</string>
     <string name="premium_cancel_confirm_body_tier_1">"Peruutus tulee voimaan kuluvan laskutuskauden lopussa **%1$s**. DiscordTagisi vaihtuu satunnaisesti, jos olet muuttanut sitä.
 
 Voit käynnistää tilauksen uudelleen milloin tahansa."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Peruutus tulee voimaan kuluvan laskutuskauden lopussa. Kaikki kirjastosi Nitro-pelit lakkaavat toimimasta **%1$s**. Samalla DiscordTagisi vaihtuu satunnaisesti, jos olet muuttanut sitä.
-
-Pidämme pelitallenteesi tallessa muuttumattomina siltä varalta, että muutat mielesi. Voit käynnistää tilauksen uudelleen milloin vain haluat!"</string>
     <string name="premium_cancel_confirm_new">Jep, peru %1$s</string>
     <string name="premium_cancel_confirm_title">Peruutetaanko %1$s?</string>
     <string name="premium_cancel_failed_body">Emme pystyneet peruuttamaan Nitro-jäsenyyttäsi. Ole hyvä ja yritä uudelleen, tai ota yhteyttä tukeemme, jos ongelma jatkuu.</string>
@@ -2585,19 +2534,16 @@ Pidämme pelitallenteesi tallessa muuttumattomina siltä varalta, että muutat m
     <string name="premium_chat_perks_description_custom_emoji">Saat yleisen luvan käyttää mukautettuja emojeja aivan kaikkialla.</string>
     <string name="premium_chat_perks_description_discriminator">Voit valita tagisi, kun tilauksesi on voimassa.</string>
     <string name="premium_chat_perks_description_screenshare">Paranna ruudunjakamisen laaduksi jopa 720p 60 fps tai 1 080p 30 fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Ladattavien tiedostojen kokorajoituksen nosto %1$s -> %2$s mahdollistaa korkealaatuisten meemien jakamisen.</string>
+    <string name="premium_chat_perks_streaming_mobile">Parempitasoiset Go Live -striimit: striimaa lähdetarkkuudella Nitrolla tai terävällä, jopa 1080p-tarkkuudella ja 60 fps:n nopeudella Nitro Classicilla.</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Animoitua hupia</string>
     <string name="premium_chat_perks_title_badge">Näytä tukesi</string>
     <string name="premium_chat_perks_title_custom_emoji">Mukautetut emojit yleisesti</string>
     <string name="premium_chat_perks_title_discriminator">Mukautettu DiscordTagi</string>
     <string name="premium_chat_perks_title_screenshare">Korkealaatuisempi videokuva</string>
+    <string name="premium_chat_perks_title_streaming">Parempitasoiset Go Live -striimit</string>
     <string name="premium_code_redemption_confirmation_blurb">Kiitos satunnaisen merkkijonon sinulla on nyt käytössäsi laajennetut keskusteluedut %1$s ajan!</string>
     <string name="premium_code_redemption_confirmation_button">Siistiä!</string>
-    <string name="premium_feature_new_chat_perks_header">Saat myös tehostettuja etuja keskusteluihin:</string>
-    <string name="premium_feature_new_premium_applications_header">Yli %1$s arvosta pelejä. Tutustu valikoimaan:</string>
-    <string name="premium_feature_view_applications">Näytä kaikki Nitro-pelit</string>
     <string name="premium_features_chat_perks">Keskusteluetuja</string>
-    <string name="premium_features_premium_applications">Ilmaisia pelejä</string>
     <string name="premium_grandfathered_warning">Kiitoksena tuestasi meitä kohtaan olet saanut Nitro-tilauksen alennettuun hintaan. **Jos peruutat tilauksen tai muutat siitä, menetät tämän alennuksen.** Älä sitten väitä, ettemme varoittaneet!</string>
     <string name="premium_grandfathered_warning_confirm">Jatka siitä huolimatta</string>
     <string name="premium_grandfathered_warning_title">Odota hetki, ystävä hyvä</string>
@@ -2607,10 +2553,7 @@ Pidämme pelitallenteesi tallessa muuttumattomina siltä varalta, että muutat m
     <string name="premium_not_claimed">Rekisteröi tilisi ensin</string>
     <string name="premium_not_claimed_body">Hei ystävä! Jos haluat ostaa Nitron, sinun on ensin rekisteröitävä tilisi, jotta et menetä juttujasi.</string>
     <string name="premium_not_verified">Vahvista ensin sähköpostisi</string>
-    <string name="premium_not_verified_body">Hei, ystävä! Jos haluat ostaa Nitron, sinun on ensin vahvistettava sähköpostiosoitteesi. Tarkista sähköpostisi tai tee uusi vahvistuspyyntö.</string>
-    <string name="premium_payment_applications_os_warning">Nitro-pelit ovat tuettuja vain Windowsissa.</string>
     <string name="premium_payment_confirmation_blurb_regular">Olet nyt avannut tehostettujen keskusteluetujen voiman. Lopeta siis tämän lukeminen ja lähde keskustelemaan!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Sinulla on nyt rajaton käyttöoikeus tosi moneen mahtavaan peliin. Älä nyt enää tätä lue vaan syöksy pelaamaan!</string>
     <string name="premium_payment_confirmation_button_regular">OK, kuulostaa hyvältä</string>
     <string name="premium_plan_month">Nitron kuukausitilaus</string>
     <string name="premium_plan_month_tier_1">Nitro Classicin kuukausitilaus</string>
@@ -2631,13 +2574,10 @@ Huomioimme myös nykyisen tilauksesi maksut ja vähennämme ne vuosimaksusta. Si
     <string name="premium_upgrade_disabled_current_tooltip">Nykyinen tilauksesi.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Jos haluat vaihtaa suppeampaan tilaukseen, sinun on ensin peruutettava nykyinen tilauksesi ja odotettava, että tilauksesi päättyy.</string>
     <string name="premium_upgrade_done_body_tier_1">Sinulla on nyt käytössäsi laajennetut keskusteluedut!</string>
-    <string name="premium_upgrade_done_body_tier_2">Sinulla on nyt käytössäsi laajennetut keskusteluedut ja kymmenittäin pelejä pelattavaksi.</string>
     <string name="premium_upgrade_done_button_tier_1">Siistiä!</string>
-    <string name="premium_upgrade_done_button_tier_2">Näytä kaikki Nitro-pelit</string>
     <string name="premium_upgrade_failed_body">Öö.. Päivitys ei toiminut. Varmista, että maksutietosi ovat ajan tasalla ja yritä uudelleen.</string>
     <string name="premium_upload_promo">Päivitä Discord Nitroon, niin saat %1$s tiedostokokorajan</string>
     <string name="premium_year_free_months">Saat 2 kk ilmaiseksi!</string>
-    <string name="premium_year_free_months_short">2 kk ilmaiseksi</string>
     <string name="premium_year_subscription">**%1$s %2$s (%3$s)** / vsi</string>
     <string name="preview_chat">Esikatsele keskustelua</string>
     <string name="priority_speaker">Ensisijainen puhuja</string>
@@ -2822,7 +2762,7 @@ ja yrittää lähettää dataa."</string>
     <string name="scope_guilds">Pääsy tietoon siitä, millä palvelimilla olet</string>
     <string name="scope_guilds_empty">Et ole millään palvelimella.</string>
     <string name="scope_guilds_join">Liittyminen palvelimille puolestasi</string>
-    <string name="scope_guilds_join_description">Käyttää pikakutsuja puolestasi.</string>
+    <string name="scope_guilds_join_description">Käyttää kutsuja puolestasi.</string>
     <string name="scope_identify">Pääsy käyttäjänimeesi ja profiilikuvaasi</string>
     <string name="scope_messages_read">Kaikkien viestien lukeminen</string>
     <string name="scope_messages_read_description">Tämä sallii sovelluksen lukea kaikki viestit, joihin on pääsy Discord-tilisi kautta</string>
@@ -2890,7 +2830,6 @@ Valitse, minkä ruudun haluat jakaa."</string>
     <string name="search_filter_on">ajankohtana</string>
     <string name="search_for_emoji">Löydä täydellinen emoji</string>
     <string name="search_for_empty">Hae</string>
-    <string name="search_for_value">Hae: **%1$s**</string>
     <string name="search_group_header_channels">Kanavalta</string>
     <string name="search_group_header_dates">Päivämäärät</string>
     <string name="search_group_header_file_name">Tiedostonimi sisältää</string>
@@ -3095,8 +3034,6 @@ Haluatko varmasti tehdä tämän?"</string>
     <string name="stop_ringing">Hylkää puhelu</string>
     <string name="stop_streaming">Lopeta striimaus</string>
     <string name="stop_watching">Lopeta katselu</string>
-    <string name="store_payment_legalese_monthly">Hei! Ostamalla tilauksen %1$s hyväksyt [kauppamme palveluehdot](%2$s). %1$s on toistuva tilaus, eli laskutamme sinua tänään ja sen jälkeen kuukausittain, kunnes perut tilauksesi. Voit perua tilauksen koska tahansa käyttäjäasetuksista.</string>
-    <string name="store_payment_legalese_yearly">Hei! Ostamalla tilauksen %1$s hyväksyt [kauppamme palveluehdot](%2$s). %1$s on toistuva tilaus, eli laskutamme sinua tänään ja sen jälkeen vuosittain, kunnes perut tilauksesi. Voit perua tilauksen koska tahansa käyttäjäasetuksista.</string>
     <string name="stream">Livestriimi</string>
     <string name="stream_bad_spectator">Katselemasi striimin kuvan- tai äänenlaatu on juuri nyt tavallista heikompi. Tämä voi johtua verkon tilasta.</string>
     <string name="stream_bad_streamer">Striimisi kuvan- tai äänenlaatu on juuri nyt tavallista heikompi. Tämä voi johtua verkon tilasta.</string>
@@ -3104,7 +3041,6 @@ Haluatko varmasti tehdä tämän?"</string>
     <string name="stream_capture_paused_details">Jatka vaihtamalla peliisi.</string>
     <string name="stream_capture_paused_details_viewer">%1$s on pienentänyt pelin… odota rauhassa!</string>
     <string name="stream_channel_description">Tämän oikeuden omaavat jäsenet voivat striimata tälle kanavalle.</string>
-    <string name="stream_description">Tämän oikeuden omaavat jäsenet voivat striimata tällä kanavalla.</string>
     <string name="stream_ended">Tämä striimi on päättynyt. *tyhjyyden kuminaa*</string>
     <string name="stream_ended_button">Striimi on päättynyt</string>
     <string name="stream_ended_no_spectators">Katselijoita ei ole, koska striimi on päättynyt.</string>
@@ -3144,7 +3080,6 @@ Haluatko varmasti tehdä tämän?"</string>
     <string name="stream_report_rating_body_streamer">Kerro meille striimauskokemuksestasi.</string>
     <string name="stream_report_submit">Lähetä</string>
     <string name="stream_reported">Palaute lähetetty</string>
-    <string name="stream_reported_body">Kiitos, että ilmoitit ongelmasta. Palautteesi auttaa meitä parantamaan striimauksen laatua.</string>
     <string name="stream_soundshare_failed">Hei, jokin meni vikaan emmekä voineet striimata ääniä pelistäsi.</string>
     <string name="streamer_mode">Striimaustila</string>
     <string name="streamer_mode_enabled">Striimaustila käytössä</string>
@@ -3182,7 +3117,6 @@ Haluatko varmasti tehdä tämän?"</string>
     <string name="sync_now">Synkronoi nyt</string>
     <string name="sync_permissions">Synkronoi käyttöoikeudet</string>
     <string name="sync_permissions_explanation">Haluatko synkronoida kanavan **%1$s** käyttöoikeudet luokan **%2$s** kanssa?</string>
-    <string name="sync_revoked">Synkonointiyhteys katkaistu! Käyttäjän %1$s on muodostettava yhteys palveluun %2$s uudelleen käyttäjäasetuksistaan.</string>
     <string name="sync_this_account">Synkronoi tähän tiliin</string>
     <string name="sync_with">[Synkronoi luokan %1$s](onClick) kanssa</string>
     <string name="system_message_call_missed">Vastaamaton puhelu käyttäjältä %1$s.</string>
@@ -3202,7 +3136,6 @@ Haluatko varmasti tehdä tämän?"</string>
     <string name="system_message_guild_member_join_10">Villi %1$s ilmestyi.</string>
     <string name="system_message_guild_member_join_11">Vuuuuuuush. %1$s on laskeutunut.</string>
     <string name="system_message_guild_member_join_12">Varokaa, %1$s liittyi juuri palvelimelle.</string>
-    <string name="system_message_guild_member_join_13">%1$s liittyi juuri. Piilottakaa banaaninne.</string>
     <string name="system_message_guild_member_join_14">%1$s liittyi juuri. Liian ylivoimainen – heikentäkää.</string>
     <string name="system_message_guild_member_join_15">%1$s liukui juuri palvelimelle.</string>
     <string name="system_message_guild_member_join_16">%1$s spawnasi juuri palvelimelle.</string>
@@ -3213,7 +3146,6 @@ Haluatko varmasti tehdä tämän?"</string>
     <string name="system_message_guild_member_join_21">Haastaja lähestyy – %1$s on ilmestynyt!</string>
     <string name="system_message_guild_member_join_22">Onko se lintu? Onko se lentokone? Ei kun sehän on %1$s.</string>
     <string name="system_message_guild_member_join_23">Se on %1$s! Ylistetty olkoon aurinko! \\\\[T]/</string>
-    <string name="system_message_guild_member_join_25">Hah! %1$s liittyi! Lankesit ansakorttiini!</string>
     <string name="system_message_guild_member_join_26">Heippa, kultsi! %1$s on täällä!</string>
     <string name="system_message_guild_member_join_27">Hei! Kuuntele! %1$s liittyi!</string>
     <string name="system_message_guild_member_join_28">Olemme odottaneet sinua, %1$s</string>
@@ -3364,8 +3296,6 @@ syötettävä salasana että annettava todennuskoodi puhelimeltasi, jotta pääs
     <string name="unsupported_browser">Selain ei ole tuettu</string>
     <string name="unsupported_browser_body">"Näyttäisi siltä, että käytät selainta jota ei tueta. Jos haluat kokea, mitä Discordilla on tarjota,
 päivitä selaimesi tai lataa jokin sovelluksistamme."</string>
-    <string name="unsupported_browser_details">"Haluat ilmeisesti keskustella tiimisi kanssa? Vaihda uusimpaan Chrome- tai Opera-versioon tai Firefox-versioon 38+
-tai lataa Discord-työpöytäsovellus, niin pääset juttelemaan ääneen!"</string>
     <string name="unsupported_browser_title">Tämäpä kiusallista</string>
     <string name="unverified_account_body">"Tarkista sähköpostisi ja vahvista sähköpostiosoitteesi seuraamalla saamiasi ohjeita.
 
@@ -3483,8 +3413,6 @@ Jos haluat aloittaa lataamisen heti, pidä vaihtonäppäintä painettuna."</stri
     <string name="user_settings_appearance_preview_message_4">Kompaktitila kytketään päälle</string>
     <string name="user_settings_appearance_preview_message_5">Ai, katsos, tässä se on!</string>
     <string name="user_settings_appearance_zoom_tip">Voit vaihtaa suurennuksen tasoa näppäimillä %1$s +/- ja palauttaa suurennuksen oletustasolle näppäimillä %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Näytä Pelit-välilehti</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Poista tämä käytöstä, jos haluat piilottaa Pelit-välilehden ja keskittyä keskusteluihisi.</string>
     <string name="user_settings_close_button">Sulkemispainike</string>
     <string name="user_settings_confirm_logout">Haluatko varmasti kirjautua ulos?</string>
     <string name="user_settings_game_activity">Pelitila</string>
@@ -3543,8 +3471,6 @@ Tämä tekee palvelimesi julkisesti saatavilla olevan kelle tahansa, joka käytt
     <string name="vanity_url_hint_mobile">personoitu-osoite</string>
     <string name="verfication_expired">Sähköpostin vahvistuslinkki on vanhentunut.</string>
     <string name="verfication_expired_suggestion">Kirjaudu sisään Discordiin ja lähetä linkki uudelleen</string>
-    <string name="verification_body">"Olemme havainneet jotain epätavallista olevan meneillään.
-Jotta voisit jatkaa Discordin käyttöä, **todista olevasi ihminen.**"</string>
     <string name="verification_body_alt">Varmistetaan vielä, että olet ihminen…</string>
     <string name="verification_email_body">Olemme lähettäneet sinulle uuden vahvistussähköpostin osoitteeseen **%1$s**, tarkista sekä saapuneet viestisi että roskaposti-kansiosi.</string>
     <string name="verification_email_error_body">Vahvistussähköpostia lähetettäessä tapahtui virhe. Yritä myöhemmin uudelleen tai ota yhteyttä tukeemme.</string>
@@ -3583,8 +3509,6 @@ Jotta voisit jatkaa Discordin käyttöä, **todista olevasi ihminen.**"</string>
     <string name="verify_phone">Varmista puhelinnumero</string>
     <string name="verifying">Vahvistetaan</string>
     <string name="video_call">Videopuhelu</string>
-    <string name="video_poor_connection_body">Video on kytketty pois käytöstä. Se palaa yhteyden parantuessa.</string>
-    <string name="video_poor_connection_title">Heikko yhteys</string>
     <string name="video_preview">Videon esikatselu</string>
     <string name="video_settings">Videoasetukset</string>
     <string name="video_unavailable">Video ei ole käytettävissä</string>
diff --git a/com.discord/res/values-fr/plurals.xml b/com.discord/res/values-fr/plurals.xml
index 205703b912..f1ea8104f9 100644
--- a/com.discord/res/values-fr/plurals.xml
+++ b/com.discord/res/values-fr/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">Aucun emplacement disponible</item>
         <item quantity="one">%d emplacement disponible</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d jours</item>
-        <item quantity="one">1 jour</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d membres</item>
-        <item quantity="zero">0 membre</item>
-        <item quantity="one">1 membre</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">jours</item>
         <item quantity="one">jour</item>
@@ -212,16 +203,6 @@
         <item quantity="other">des permissions</item>
         <item quantity="one">une permission</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">A fixé le mode lent à **!!%d!! secondes**</item>
-        <item quantity="zero">A désactivé le mode lent</item>
-        <item quantity="one">A fixé le mode lent à **1 seconde**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">A fixé le mode lent à **!!%d!! secondes**</item>
-        <item quantity="zero">A désactivé le mode lent</item>
-        <item quantity="one">A fixé le mode lent à **1 seconde**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! membres**</item>
         <item quantity="one">**un membre**</item>
@@ -290,10 +271,6 @@
         <item quantity="other">%d jours</item>
         <item quantity="one">1 jour</item>
     </plurals>
-    <plurals name="live_viewers_viewers">
-        <item quantity="other">spectateurs</item>
-        <item quantity="one">spectateur</item>
-    </plurals>
     <plurals name="max_uses_description_mobile_maxUses">
         <item quantity="other">%d utilisations</item>
         <item quantity="zero">utilisations illimitées</item>
@@ -321,10 +298,6 @@
         <item quantity="other">%d nouveaux messages</item>
         <item quantity="one">1 nouveau message</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d jours</item>
-        <item quantity="one">un jour</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d salons</item>
         <item quantity="one">%d salon</item>
@@ -342,10 +315,6 @@
         <item quantity="other">ces messages</item>
         <item quantity="one">ce message</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">"**%d** serveurs sont indisponibles à cause d'une panne temporaire."</item>
-        <item quantity="one">"**1** serveur est indisponible à cause d'une panne temporaire."</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d mois</item>
         <item quantity="one">1 mois</item>
@@ -385,8 +354,8 @@
         <item quantity="one">%d résultat indexé</item>
     </plurals>
     <plurals name="spotify_listen_along_title_host_count">
-        <item quantity="other"> auditeurs</item>
-        <item quantity="one"> auditeur</item>
+        <item quantity="other">auditeurs</item>
+        <item quantity="one">auditeur</item>
     </plurals>
     <plurals name="total_results_count">
         <item quantity="other">%d résultats</item>
diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml
index 84057bae00..478cfe1897 100644
--- a/com.discord/res/values-fr/strings.xml
+++ b/com.discord/res/values-fr/strings.xml
@@ -58,10 +58,8 @@
     <string name="activity_invite_private">"Tu ne peux pas envoyer d'invitation car ton statut de jeu est soit invisible, soit masqué. Si tu préfères garder
 tes paramètres, tu peux demander à quelqu'un de t'envoyer une invitation."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Compris !</string>
-    <string name="activity_panel_go_live_hotspot_header">Passe en direct pour streamer tes parties directement à tes amis !</string>
+    <string name="activity_panel_go_live_hotspot_header">Streame tes parties directement à tes amis avec Go Live !</string>
     <string name="activity_panel_go_live_tooltip">Passer en direct</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Ce serveur ne possède aucun salon vocal dans lequel streamer.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Tu ne peux pas streamer dans ce salon vocal.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Rends-toi dans un serveur pour commencer à streamer.</string>
     <string name="add">Ajouter</string>
     <string name="add_a_comment_optional">Ajouter un commentaire (facultatif)</string>
@@ -158,7 +156,6 @@ Un grand pouvoir implique de grandes responsabilités, alors penses-y à deux fo
     <string name="application_entitlement_code_redemption_confirmation_title">"C'est bon !"</string>
     <string name="application_entitlement_code_redemption_go_to_library">Aller dans la bibliothèque</string>
     <string name="application_entitlement_code_redemption_invalid">Code saisi invalide</string>
-    <string name="application_entitlement_code_redemption_prompt">Tu as reçu un code pour un jeu ? Saisis-le ci-dessous :</string>
     <string name="application_entitlement_code_redemption_redeem">Utiliser</string>
     <string name="application_filter_name_linux">Tous les fichiers</string>
     <string name="application_filter_name_windows">Exécutables</string>
@@ -229,7 +226,6 @@ Un grand pouvoir implique de grandes responsabilités, alors penses-y à deux fo
     <string name="application_store_genre_basketball">Basket-ball</string>
     <string name="application_store_genre_billiards">Billard</string>
     <string name="application_store_genre_boxing">Boxe</string>
-    <string name="application_store_genre_brawler">Beat them all / Brawler</string>
     <string name="application_store_genre_card_game">Jeu de cartes</string>
     <string name="application_store_genre_driving_racing">Conduite/Course</string>
     <string name="application_store_genre_dual_joystick_shooter">Twin-stick shooter</string>
@@ -402,7 +398,6 @@ Un grand pouvoir implique de grandes responsabilités, alors penses-y à deux fo
     <string name="application_store_view_all_news">Voir toutes les actualités</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Ce DLC nécessite de posséder %1$s sur Discord pour y jouer. [En savoir plus sur les DLC.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Contenu téléchargeable</string>
-    <string name="application_store_warning_early_access_description">"Ce jeu est vraiment fun (c'est notre avis !), mais peut contenir du contenu limité, des bugs, ou sembler incomplet. [En savoir plus sur l'accès anticipé.](%1$s)"</string>
     <string name="application_store_warning_early_access_title">Accès anticipé</string>
     <string name="application_store_warning_requires_desktop_app_description">"Pour jouer à ce jeu, tu dois avoir installé l'$[application de bureau Discord](downloadHook)."</string>
     <string name="application_store_warning_requires_desktop_app_title">Application de bureau requise</string>
@@ -463,7 +458,6 @@ Un grand pouvoir implique de grandes responsabilités, alors penses-y à deux fo
     <string name="back_button_behavior_label_mobile">Comportement du bouton retour</string>
     <string name="back_button_behavior_mobile">Le bouton Retour affiche la liste des salons.</string>
     <string name="ban">Bannir</string>
-    <string name="ban_confirm_title">"Balancer un bon coup de Ban sur '%1$s'"</string>
     <string name="ban_members">Bannir des membres</string>
     <string name="ban_members_description">"Les membres ayant cette permission peuvent bannir les membres qui n'ont pas cette permission."</string>
     <string name="ban_reason">Raison du bannissement</string>
@@ -526,30 +520,21 @@ mais si ça devait s'avérer nécessaire, tu ne dois pas hésiter une seule seco
     <string name="billing_error_section_card">"Oups ! On dirait qu'il y a un problème avec cette carte. Corrige les champs et réessaie, s'il te plaît !"</string>
     <string name="billing_history">Historique de facturation</string>
     <string name="billing_legal_mumbo_jumbo">Charabia juridique</string>
-    <string name="billing_legal_mumbo_jumbo_label">"J'accepte les [Conditions d'Utilisation de la Boutique de Discord](%1$s)"</string>
     <string name="billing_no_payment_method">Aucun mode de paiement enregistré</string>
     <string name="billing_no_payment_method_description">Paie plus rapidement en enregistrant un mode de paiement</string>
     <string name="billing_pay_for_it_with">Payer avec</string>
     <string name="billing_payment_history">Historique des transactions</string>
     <string name="billing_payment_premium">Ton abonnement</string>
-    <string name="billing_payment_premium_legalese_monthly">"En achetant un abonnement %1$s, tu acceptes nos [Conditions d'Utilisation de la Boutique](%2$s). %1$s est un abonnement qui se renouvelle automatiquement. Tu autorises Discord à prélever directement le mode de paiement de %3$s et à continuer de le faire tous les mois jusqu'à ce tu résilies ton abonnement. Tu peux résilier à tout moment."</string>
-    <string name="billing_payment_premium_legalese_yearly">"En achetant un abonnement %1$s, tu acceptes nos [Conditions d'Utilisation de la Boutique](%2$s). %1$s est un abonnement qui se renouvelle automatiquement. Tu autorises Discord à prélever directement le mode de paiement de %3$s et à continuer de le faire tous les ans jusqu'à ce tu résilies ton abonnement. Tu peux résilier à tout moment."</string>
     <string name="billing_payment_sources">Modes de paiement</string>
-    <string name="billing_payment_table_header_amount">MONTANT</string>
     <string name="billing_payment_table_header_date">DATE</string>
     <string name="billing_payment_table_header_description">DESCRIPTION</string>
     <string name="billing_premium_refund_text">"Un remboursement peut être demandé si cet achat a été fait dans les %1$s derniers jours. [Notre gentil centre d'assistance t'aidera à récupérer tes sous.](%2$s)"</string>
     <string name="billing_premium_refund_text_unable">Nous sommes désolés, mais cet achat ne peut pas être remboursé. Un remboursement peut être demandé si cet achat a été fait il y a moins de %1$s jours.</string>
-    <string name="billing_price_per_month">%1$s / mois</string>
-    <string name="billing_price_per_month_upgrade">Passer au niveau supérieur pour %1$s / mois</string>
     <string name="billing_price_per_year">%1$s / an</string>
-    <string name="billing_price_per_year_upgrade">Passer au niveau supérieur pour %1$s / an</string>
     <string name="billing_purchase_details_header">"Détails de l'achat"</string>
     <string name="billing_refund_header">Des problèmes avec ton achat ?</string>
     <string name="billing_refund_play_time_never_played">Jamais joué</string>
-    <string name="billing_refund_play_time_subheader">TEMPS JOUÉ</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">"DATE D'ACHAT"</string>
     <string name="billing_refund_report_a_problem">Signaler un problème</string>
     <string name="billing_refund_request_button">Demande de remboursement</string>
     <string name="billing_sales_tax_added">%1$s en taxe de vente a été ajouté en raison de ton adresse de facturation.</string>
@@ -804,10 +789,7 @@ en cliquant sur le petit texte tout riquiqui ci-dessous."</string>
     <string name="connection_status_connected">Connecté</string>
     <string name="connection_status_connecting">Connexion en cours</string>
     <string name="connection_status_disconnected">Déconnecté</string>
-    <string name="connection_status_ice_checking">Vérification ICE en cours</string>
     <string name="connection_status_no_route">Aucun chemin de connexion</string>
-    <string name="connection_status_rtc_connecting">Connexion RTC</string>
-    <string name="connection_status_rtc_disconnected">RTC déconnecté</string>
     <string name="connection_status_stream_connected">Regarde le stream de %1$s</string>
     <string name="connection_status_video_connected">Vidéo connectée</string>
     <string name="connection_status_voice_connected">Voix connectée</string>
@@ -843,7 +825,7 @@ en cliquant sur le petit texte tout riquiqui ci-dessous."</string>
     <string name="create_category">Créer une catégorie</string>
     <string name="create_channel">Créer un salon</string>
     <string name="create_group_dm">Créer un groupe privé</string>
-    <string name="create_instant_invite">Créer une invitation instantanée</string>
+    <string name="create_instant_invite">Créer une invitation</string>
     <string name="create_link">Créer un lien</string>
     <string name="create_or_join_modal_header">Oh, un autre serveur, hein ?</string>
     <string name="create_server_button_body">"Crée un nouveau serveur et invite tes amis. C'est gratuit !"</string>
@@ -957,7 +939,6 @@ en cliquant sur le petit texte tout riquiqui ci-dessous."</string>
     <string name="disable_email_notifications_failed_suggestion">"Les notifications par e-mail sont peut-être déjà désactivées, ou alors cet e-mail n'est peut-être plus associé à un compte Discord."</string>
     <string name="disable_integration_title">Désactiver la synchronisation</string>
     <string name="disable_integration_twitch_body">"Désactiver la synchronisation déclenchera le comportement sélectionné en cas d'expiration d'un abonnement à tous les abonnements, comme s'ils avaient tous expiré."</string>
-    <string name="disable_integration_youtube_body">"Désactiver la synchronisation va appliquer le comportement sélectionné en cas d'expiration d'un soutien à tous les soutiens, comme s'ils avaient tous expiré."</string>
     <string name="disable_notifications_description">Toutes les notifications sur le bureau seront désactivées.</string>
     <string name="disable_notifications_label">Désactiver les notifications</string>
     <string name="disable_sounds_description">Tous les effets sonores seront désactivés.</string>
@@ -974,7 +955,6 @@ en cliquant sur le petit texte tout riquiqui ci-dessous."</string>
     <string name="discord_desc_short">Chat vocal &amp; textuel en équipe</string>
     <string name="discord_rich_presence">Rich Presence Discord</string>
     <string name="dismiss">Ignorer</string>
-    <string name="dispatch_error_modal_body">"Une erreur s'est produite. Si le problème persiste, crée une demande de support et copie le contenu du message ci-dessous."</string>
     <string name="dispatch_error_modal_error_label">"Message d'erreur (copie et colle-moi)"</string>
     <string name="dispatch_error_modal_header">Erreur de Discord Dispatch</string>
     <string name="dispatch_error_modal_open_ticket">Ouvrir une demande</string>
@@ -1088,7 +1068,7 @@ en cliquant sur le petit texte tout riquiqui ci-dessous."</string>
     <string name="file_rate_mb">%1$s Mo/s</string>
     <string name="file_size_gb">%1$s Go</string>
     <string name="file_size_mb">%1$s Mo</string>
-    <string name="file_upload_limit_premium">50 Mo</string>
+    <string name="file_upload_limit_premium_tier_1">50 Mo</string>
     <string name="file_upload_limit_standard">8 Mo</string>
     <string name="filter">Filtrer</string>
     <string name="filter_mentions">Filtrer les mentions</string>
@@ -1110,8 +1090,6 @@ et les rend muets. Cela n'affecte pas les navigateurs."</string>
     <string name="form_help_attenuation">"Diminue de ce pourcentage le volume des autres applications lorsque quelqu'un parle.
 Paramètre cette valeur à 0 %% pour désactiver complètement l'atténuation."</string>
     <string name="form_help_automatic_vad">"Si l'indicateur est vert, cela signifie que Discord transmet ta magnifique voix."</string>
-    <string name="form_help_bitrate">"**TOUS LES OCTETS !** Dépasser %1$s ko/s n'est recommandé que si tu es un(e) véritable mélomane, car cela aurait un impact négatif
-pour ceux qui utilisent une version portable ou qui ont une mauvaise connexion, et ce sans amélioration perceptible de la qualité sonore."</string>
     <string name="form_help_certified_voice_processing">"En utilisant un micro certifié par Discord, certaines fonctionnalités du traitement de la voix ne sont plus gérées par Discord,
 mais par le micro lui-même."</string>
     <string name="form_help_channel_permissions">Sélectionner des rôles attribuera automatiquement des permissions de base pour ce salon.</string>
@@ -1124,11 +1102,6 @@ afin d'éviter [ce bazar](%1$s).**"</string>
 pour chaque message envoyé dans ce serveur ou non. Pour un serveur Discord public, nous recommandons fortement de paramétrer cela à @mentions uniquement."</string>
     <string name="form_help_explicit_content_filter">"Analyse et supprime automatiquement les messages contenant du contenu explicite envoyés sur ce serveur.
 Merci de choisir le niveau de filtre à appliquer aux membres de ton serveur. **Nous te recommandons de définir un filtre pour un serveur Discord public.**"</string>
-    <string name="form_help_instant_invite_channel">"Si un salon est sélectionné, un lien d'invitation instantanée sera créé avec le widget.
-Sinon, seuls les membres en ligne et les salons vocaux seront proposés."</string>
-    <string name="form_help_last_seen">"Congédier expulsera **%1$s** ne s'étant pas connecté(s)
-depuis **%2$s** et n'ayant aucun rôle assigné.
-Ils pourront réintégrer le serveur en utilisant une nouvelle invitation instantanée."</string>
     <string name="form_help_legacy_subsystem">"Certains pilotes audio peuvent faire face à des problèmes de compatibilité en essayant d'interagir avec le sous-système audio le plus récent de ton système d'exploitation.
 Coche cette case pour utiliser un sous-système audio plus ancien."</string>
     <string name="form_help_nsfw">"Les utilisateurs devront confirmer qu'ils ont l'âge légal pour voir le contenu de ce salon.
@@ -1138,10 +1111,7 @@ aux utilisateurs de ton site, tu peux ajouter dynamiquement la balise &amp;usern
     <string name="form_help_qos">"Informe ton routeur que les paquets transmis par Discord sont de haute priorité.
 Certains routeurs et fournisseurs de services internet peuvent agir de façon inhabituelle lorsque cette fonction est activée."</string>
     <string name="form_help_slowmode">"Les membres n'auront le droit d'envoyer qu'un message lors de cet intervalle de temps, à moins qu'ils ne possèdent les permissions Gérer le salon ou Gérer les messages."</string>
-    <string name="form_help_system_channel">"Envoyer un message dans ce salon lorsque quelqu'un rejoint le serveur. Les messages sont aléatoires. Cette option peut être désactivée à tout moment."</string>
     <string name="form_help_temporary">Les membres seront expulsés automatiquement lors de leur déconnexion, sauf si un rôle leur est assigné.</string>
-    <string name="form_help_user_limit">"Limite le nombre d'utilisateurs pouvant se connecter à ce salon vocal. Les utilisateurs ayant la permission **Déplacer les membres**
-peuvent ignorer cette limite et déplacer d'autres utilisateurs dans le salon."</string>
     <string name="form_help_verification_level">"Les membres du serveur doivent répondre aux critères suivants avant de pouvoir envoyer des messages dans les salons de discussion ou commencer une conversation privée.
 Ces exigences ne s'appliquent pas aux membres ayant un rôle assigné.
 **Nous recommandons de définir un niveau de vérification pour un serveur Discord public.**"</string>
@@ -1183,8 +1153,8 @@ Ces exigences ne s'appliquent pas aux membres ayant un rôle assigné.
     <string name="form_label_input_mode">Activation du micro</string>
     <string name="form_label_input_sensitivty">Sensibilité de la détection de la voix</string>
     <string name="form_label_input_volume">"Volume d'entrée"</string>
-    <string name="form_label_instant_invite">"Entre un lien d'invitation instantanée"</string>
-    <string name="form_label_instant_invite_channel">"Salon de l'invitation instantanée"</string>
+    <string name="form_label_instant_invite">"Entre un lien d'invitation"</string>
+    <string name="form_label_instant_invite_channel">"Salon de l'invitation"</string>
     <string name="form_label_json_api">API JSON</string>
     <string name="form_label_last_seen">Vu pour la dernière fois</string>
     <string name="form_label_local_mute">Rendre muet en local</string>
@@ -1199,7 +1169,6 @@ Ces exigences ne s'appliquent pas aux membres ayant un rôle assigné.
     <string name="form_label_mobile_notifications_label">Activer toutes les notifications</string>
     <string name="form_label_mobile_notifications_os_control_jump">Ajustement des paramètres de notification</string>
     <string name="form_label_mobile_notifications_os_control_jump_help">Les paramètres de notification avancés sont contrôlés par le système.</string>
-    <string name="form_label_mobile_notifications_sound_disable">Désactiver le son</string>
     <string name="form_label_mobile_notifications_sound_message">Son des nouveaux messages</string>
     <string name="form_label_mobile_notifications_system_desc">"Obtiens des notifications à l'extérieur de Discord."</string>
     <string name="form_label_mobile_notifications_system_label">Notifications système</string>
@@ -1252,7 +1221,6 @@ Ces exigences ne s'appliquent pas aux membres ayant un rôle assigné.
     <string name="form_label_suppress_everyone">Désactiver **@everyone** et **@here**</string>
     <string name="form_label_synced_role">Rôle synchronisé</string>
     <string name="form_label_synced_subs">Abonnés synchronisés</string>
-    <string name="form_label_system_channel">Salon de messages de bienvenue</string>
     <string name="form_label_temporary">Membre temporaire</string>
     <string name="form_label_tts">Synthèse vocale (TTS)</string>
     <string name="form_label_tts_notifications">Notifications TTS</string>
@@ -1314,7 +1282,6 @@ pour lui permettre de le détecter."</string>
     <string name="game_action_button_game_not_detected">Jeu non détecté</string>
     <string name="game_action_button_install">Installer</string>
     <string name="game_action_button_locate">Localiser</string>
-    <string name="game_action_button_login_to_buy">Se connecter pour acheter</string>
     <string name="game_action_button_now_playing">En train de jouer</string>
     <string name="game_action_button_paused">Suspendu</string>
     <string name="game_action_button_play">Jouer</string>
@@ -1353,7 +1320,6 @@ pour lui permettre de le détecter."</string>
     <string name="game_feed_activity_recently_played">A récemment joué</string>
     <string name="game_feed_activity_streaming_twitch">Streame en direct sur Twitch</string>
     <string name="game_feed_current_header_title">En train de jouer</string>
-    <string name="game_feed_settings_visibility">"Afficher dans l'onglet Jeux"</string>
     <string name="game_feed_unknown_player">Joueur inconnu</string>
     <string name="game_feed_user_played_days_ago">A joué il y a %1$s %2$s</string>
     <string name="game_feed_user_played_hours_ago">A joué il y a %1$s %2$s</string>
@@ -1389,7 +1355,6 @@ pour lui permettre de le détecter."</string>
     <string name="game_library_time_played_none">jamais joué</string>
     <string name="game_library_time_played_seconds">%1$s %1$s</string>
     <string name="game_library_updates_action_move_up">Déplacer vers le haut</string>
-    <string name="game_library_updates_action_pause">Suspendu</string>
     <string name="game_library_updates_action_remove">Supprimer</string>
     <string name="game_library_updates_action_resume">Reprendre</string>
     <string name="game_library_updates_header_disk">Disque</string>
@@ -1422,7 +1387,7 @@ pour lui permettre de le détecter."</string>
     <string name="generate_a_new_link">Générer un nouveau lien</string>
     <string name="get_started">Commencer</string>
     <string name="gif_auto_play_label">"Animer automatiquement les GIF lorsque Discord est à l'avant-plan."</string>
-    <string name="go_live_changelog_guilds">Passer en direct est maintenant disponible pour : %1$s</string>
+    <string name="go_live_hardware_acceleration_unavailable">"Attention, nous ne pouvons pas détecter l'accélération matérielle. Il est possible que ton ordinateur ait des problèmes avec Go Live."</string>
     <string name="go_live_hey">Salut !</string>
     <string name="go_live_listen">Écoute !</string>
     <string name="go_live_look">Regarde !</string>
@@ -1436,7 +1401,7 @@ pour lui permettre de le détecter."</string>
     <string name="go_live_modal_select_channel_form_title">Sélectionner un salon vocal</string>
     <string name="go_live_modal_select_channel_placeholder">Rechercher des salons vocaux</string>
     <string name="go_live_modal_title">Passer en direct</string>
-    <string name="go_live_premium_early_access">"Pour vous remercier d'être un abonné à Nitro, vous recevez en avance l'option de diffuser des jeux avec Passer en direct !"</string>
+    <string name="go_live_video_drivers_outdated">"Tes pilotes vidéo ne sont plus à jour. Mets-les à jour pour une profiter d'une meilleure performance avec Go Live."</string>
     <string name="grant_temporary_membership">Accorder le statut de membre provisoire</string>
     <string name="group">Groupe</string>
     <string name="group_dm_add_friends">Ajouter des amis au groupe privé</string>
@@ -1513,8 +1478,6 @@ pour lui permettre de le détecter."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">A **accordé** %1$s à **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">A déplacé de **%1$s** vers **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">À la position **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) a créé un salon textuel $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">A remplacé le sujet par **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">A défini **%1$s** comme sujet du salon</string>
@@ -1609,14 +1572,15 @@ pour lui permettre de le détecter."</string>
     <string name="guild_settings_filter_all_actions">Toutes les actions</string>
     <string name="guild_settings_filter_all_users">Tous les utilisateurs</string>
     <string name="guild_settings_filter_user">Filtrer par utilisateur</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">Des streams Go Live avec une qualité de 720 p et 60 fps</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">Des streams Go Live avec une qualité de 1080 p et 60 fps</string>
     <string name="guild_settings_label_audit_log">Logs du serveur</string>
-    <string name="guild_settings_label_audit_log_empty_body">Une fois que les modérateurs commenceront à modérer, tu pourra modérer la modération ici.</string>
+    <string name="guild_settings_label_audit_log_empty_body">Une fois que les modérateurs commenceront à modérer, tu pourras modérer la modération ici.</string>
     <string name="guild_settings_label_audit_log_empty_title">Aucun log pour le moment</string>
     <string name="guild_settings_label_audit_log_error_body">Nous avons cassé quelque chose. Reviens plus tard.</string>
     <string name="guild_settings_label_audit_log_error_title">"C'est gênant"</string>
     <string name="guild_settings_members_all_members">Tous les membres — %1$s</string>
     <string name="guild_settings_members_display_role">Afficher le rôle :</string>
-    <string name="guild_settings_members_server_members">Membres du serveur</string>
     <string name="guild_settings_overview_notice">Attention ! Il reste des modifications non enregistrées !</string>
     <string name="guild_settings_server_invite_background">"Arrière-plan d'invitation de serveur"</string>
     <string name="guild_settings_title_server_widget">Widget du serveur</string>
@@ -1640,7 +1604,7 @@ Si tu as accès aux utilisateurs de ton site, tu peux ajouter dynamiquement la b
     <string name="help_role_locked_mine">"Ce rôle est verrouillé car il s'agit du rôle le plus élevé que tu possèdes. Demande l'aide d'une personne plus haut gradée ou du propriétaire du serveur."</string>
     <string name="help_singular_permission">"Tu ne peux pas modifier cette permission car la supprimer te l'enlèverait."</string>
     <string name="hide_instant_invites_description">Recommandé si tu ne souhaites pas que des inconnus rejoignent tes serveurs Discord.</string>
-    <string name="hide_instant_invites_label">"Masquer les liens d'invitation instantanée"</string>
+    <string name="hide_instant_invites_label">"Masquer les liens d'invitation"</string>
     <string name="hide_muted">Cacher %1$s muet(s)</string>
     <string name="hide_muted_channels">Masquer les salons muets</string>
     <string name="hide_personal_information_description">Masque ton adresse e-mail, tes comptes connectés et tes notes, et rend anonyme les Discord Tags.</string>
@@ -1665,7 +1629,7 @@ Si tu as accès aux utilisateurs de ton site, tu peux ajouter dynamiquement la b
     <string name="hypesquad_leave_prompt">"Tu en as marre d'être trop hype ?"</string>
     <string name="hypesquad_newsletter_warning">"Les avocats de Wumpus voulaient te prévenir que lorsque tu rejoins la HypeSquad, tu t'inscris automatiquement à notre newsletter."</string>
     <string name="hypesquad_online_badge_tooltip">%1$s de la HypeSquad</string>
-    <string name="hypesquad_perk_description_profile_badge">Reçois un badge de profil unique pour représenter la maison de la HypeSquad à laquelle tu appartient.</string>
+    <string name="hypesquad_perk_description_profile_badge">Reçois un badge de profil unique pour représenter la maison de la HypeSquad à laquelle tu appartiens.</string>
     <string name="hypesquad_perk_description_squad_challenges">"Représente ta maison et participe à des défis contre d'autres maisons de la HypeSquad."</string>
     <string name="hypesquad_perk_title_newsletter">Newsletter top secrète</string>
     <string name="hypesquad_perk_title_profile_badge">Badge de profil hype</string>
@@ -1688,7 +1652,6 @@ Si tu as accès aux utilisateurs de ton site, tu peux ajouter dynamiquement la b
     <string name="hypesquad_question_11_response_d">Suggérer à Wumpus de plutôt jouer du tambourin</string>
     <string name="hypesquad_question_12_prompt">"Tu as fait l'ascension du sommet de la plus haute montagne et la seule chose qui te sépare du butin est le dragon à trois têtes qui te barre le chemin. Tu :"</string>
     <string name="hypesquad_question_12_response_a">Engages le combat</string>
-    <string name="hypesquad_question_12_response_b">Regardes des vieux films de Godzilla pour étudier ses attaques contre King Ghidorah</string>
     <string name="hypesquad_question_12_response_c">Essaies de convaincre le dragon de partager le butin</string>
     <string name="hypesquad_question_12_response_d">Offres au dragon un Wumpus en peluche ; comment pourrait-il refuser ?</string>
     <string name="hypesquad_question_13_prompt">"C'était quoi, ce bruit ?"</string>
@@ -1789,13 +1752,13 @@ Si tu as accès aux utilisateurs de ton site, tu peux ajouter dynamiquement la b
     <string name="input_mode_ptt_release_delay">"Délai de déclenchement d'Appuyer-pour-parler"</string>
     <string name="input_mode_vad">Détection de la voix</string>
     <string name="install_location_main">Principal</string>
-    <string name="instant_invite">Invitation instantanée</string>
+    <string name="instant_invite">Inviter</string>
     <string name="instant_invite_accept">"Accepter l'invitation"</string>
-    <string name="instant_invite_accepted">Invitation instantanée acceptée</string>
-    <string name="instant_invite_accepting">"Acceptation de l'invitation instantanée"</string>
+    <string name="instant_invite_accepted">Invitation acceptée</string>
+    <string name="instant_invite_accepting">"Acceptation de l'invitation"</string>
     <string name="instant_invite_ask_for_new_invite">Demandes-en une nouvelle !</string>
     <string name="instant_invite_ask_user_for_new_invite">Demande une nouvelle invitation à %1$s !</string>
-    <string name="instant_invite_expired">"L'invitation instantanée est invalide ou a expiré."</string>
+    <string name="instant_invite_expired">"L'invitation est invalide ou a expiré."</string>
     <string name="instant_invite_expires">Expiration</string>
     <string name="instant_invite_failed_to_generate">"Échec de la création du lien d'invitation."</string>
     <string name="instant_invite_generate">Générer</string>
@@ -1814,16 +1777,15 @@ Si tu as accès aux utilisateurs de ton site, tu peux ajouter dynamiquement la b
     <string name="instant_invite_regenerate">Regénérer</string>
     <string name="instant_invite_resolved_body">Tu as été invité(e) à rejoindre le salon **%1$s** du serveur **%2$s**.</string>
     <string name="instant_invite_resolved_title">Bien le bonjour !</string>
-    <string name="instant_invite_resolving">"Résolution de l'invitation instantanée"</string>
+    <string name="instant_invite_resolving">"Résolution de l'invitation"</string>
     <string name="instant_invite_uses">Utilisations</string>
     <string name="instant_invite_you_are_already_a_member_of">Tu es déjà membre de</string>
     <string name="instant_invite_you_have_been_invited_to_join">Tu as été invité(e) à rejoindre</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">"**%1$s** t'a invité(e) à rejoindre"</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Tu as été invité(e) à rejoindre un groupe privé par</string>
-    <string name="instant_invites">Invitations instantanées</string>
+    <string name="instant_invites">Invitations</string>
     <string name="integration_settings">"Paramètres d'intégration"</string>
     <string name="integrations">Intégrations</string>
-    <string name="integrations_header">Comptes Twitch/YouTube Gaming connectés</string>
     <string name="integrations_pro_tip">"Pour plus d'intégrations, essaie le [StreamKit de Discord](%1$s)."</string>
     <string name="internal_server_error">"Une erreur de serveur interne est survenue, réessaie s'il te plaît."</string>
     <string name="invalid_animated_emoji_body">"Cet émoji ne fonctionne pas car il est animé. Passe à Discord Nitro pour que tes rêves d'émojis animés deviennent enfin réalité"</string>
@@ -1936,13 +1898,13 @@ Tu veux en savoir plus sur Discord ?"</string>
     <string name="join_afk_channel_body">Il semble que tu aies rejoint le salon AFK. Tu ne peux pas parler dans ce salon.</string>
     <string name="join_call">"Se joindre à l'appel"</string>
     <string name="join_server">Rejoindre</string>
-    <string name="join_server_button_body">"Entre un lien d'invitation instantanée et rejoins le serveur de ton ami."</string>
+    <string name="join_server_button_body">"Entre un lien d'invitation et rejoins le serveur de ton ami."</string>
     <string name="join_server_button_cta">Rejoindre un serveur</string>
     <string name="join_server_button_cta_mobile">"Rejoindre un serveur avec un lien d'invitation"</string>
     <string name="join_server_button_cta_mobile_desc">"Tu possèdes un code ou un lien d'invitation ? Saisis-le ici !"</string>
     <string name="join_server_button_cta_named">Rejoindre %1$s</string>
-    <string name="join_server_description">"Entre un lien d'invitation instantanée ci-dessous pour rejoindre un serveur existant. L'invitation ressemblera à quelque chose de ce genre :"</string>
-    <string name="join_server_description_mobile">"Entre un lien d'invitation instantanée ci-dessus pour rejoindre un serveur existant."</string>
+    <string name="join_server_description">"Entre un lien d'invitation ci-dessous pour rejoindre un serveur existant. L'invitation ressemblera à quelque chose de ce genre :"</string>
+    <string name="join_server_description_mobile">"Entre un lien d'invitation ci-dessus pour rejoindre un serveur existant."</string>
     <string name="join_server_title">Rejoindre un serveur</string>
     <string name="join_stream">Rejoindre le stream</string>
     <string name="join_video_call">"Rejoindre l'appel vidéo"</string>
@@ -2008,7 +1970,6 @@ lorsque tu parles."</string>
     <string name="keybind_toggle_overlay">"Activer/Désactiver l'overlay"</string>
     <string name="keybind_toggle_overlay_input_lock">"Verrouiller/Déverrouiller l'overlay"</string>
     <string name="keybind_toggle_stream_mode">Activer/Désactiver le mode streamer</string>
-    <string name="keybind_toggle_voice_mode">Activer/Désactiver la détection la voix</string>
     <string name="keybind_unassigned">Non assigné</string>
     <string name="keybinds">Raccourcis clavier</string>
     <string name="keyboard_behavior_mobile_header">Comportement du clavier</string>
@@ -2050,9 +2011,8 @@ lorsque tu parles."</string>
     <string name="link_your_xbox_account_2">Discord est un chat vocal, textuel et vidéo destiné aux joueurs, qui est gratuit, sécurisé et disponible sur ordinateur et mobile.</string>
     <string name="listening_to">Écoute **%1$s**</string>
     <string name="live">En direct</string>
-    <string name="live_beta_description">Bienvenue sur le stream ! Passer en direct est en bêta. Nous nous excusons pour les petits pépins.</string>
+    <string name="live_beta_description">Bienvenue sur le stream ! Go Live est en bêta. Nous nous excusons pour les petits pépins.</string>
     <string name="live_on_twitch">En direct sur Twitch</string>
-    <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Échec du chargement de l'image.
 Ressaie, s'il te plaît."</string>
     <string name="load_more_messages">Charger plus de messages</string>
@@ -2114,8 +2074,6 @@ Il ne peut être ni assigné manuellement à d'autres membres, ni supprimé."</s
     <string name="mention_everyone">Mentionner tout le monde</string>
     <string name="mention_everyone_autocomplete_description">Notifier toutes les personnes qui ont la permission de voir ce salon.</string>
     <string name="mention_everyone_autocomplete_description_mobile">Notifier tout le monde dans ce salon.</string>
-    <string name="mention_everyone_description">"Les membres ayant cette permission peuvent envoyer des notifications à tous les membres de ce salon
-en commençant leur message par @everyone ou @here."</string>
     <string name="mention_here_autocomplete_description">Notifier toutes les personnes connectées qui ont la permission de voir ce salon.</string>
     <string name="mention_here_autocomplete_description_mobile">Notifier tous les membres connectés dans ce salon.</string>
     <string name="mention_role_autocomplete_description_mobile">Notifier toutes les personnes qui ont ce rôle dans ce salon.</string>
@@ -2234,14 +2192,11 @@ nos Conditions d'Utilisation et notre Politique de Confidentialité mises à jou
     <string name="no_emoji_title">Aucun émoji</string>
     <string name="no_input_devices">"Aucun périphérique d'entrée"</string>
     <string name="no_input_devices_detected">"Aucun périphérique d'entrée n'a pu être détecté. Branches-en un et essaie à nouveau."</string>
-    <string name="no_instant_invite">Aucune invitation instantanée</string>
-    <string name="no_integrations">[Connecte](onConnect) ton compte partenaire Twitch ou YouTube Gaming pour synchroniser tes abonnés/soutiens à un rôle</string>
+    <string name="no_instant_invite">Aucune invitation</string>
     <string name="no_integrations_body">"Le protocole AM1T1É ne peut être exécuté qu'à partir du client Discord"</string>
     <string name="no_integrations_label">Aucune intégration</string>
-    <string name="no_invites_body">"Tu te sens seul(e) au monde ? Un peu comme une barque à la dérive au beau milieu de l'océan ?
-Ramène quelques-uns de tes amis ici en leur envoyant un lien d'invitation instantanée !"</string>
-    <string name="no_invites_caption">"Aucune invitation instantanée pour l'instant !"</string>
-    <string name="no_invites_label">"Aucune invitation instantanée pour l'instant"</string>
+    <string name="no_invites_caption">"Aucune invitation pour l'instant !"</string>
+    <string name="no_invites_label">"Aucune invitation pour l'instant"</string>
     <string name="no_mail_account_description">"Renvoie ton commentaire à support@discordapp.com. Nous avons également copié tes informations d'utilisateur dans le presse-papier."</string>
     <string name="no_mail_account_title">Aucun compte e-mail</string>
     <string name="no_mic_body">"Des instructions pour activer l'accès à ton microphone sont disponibles dans le centre d'aide Discord."</string>
@@ -2259,7 +2214,6 @@ de message épinglé… pour l'instant."</string>
     <string name="no_reactions_header">Aucune réaction</string>
     <string name="no_recent_mentions">"Au commencement… tout n'était que silence."</string>
     <string name="no_send_messages_permission_placeholder">"Tu n'as pas la permission d'envoyer des messages dans ce salon."</string>
-    <string name="no_system_channel">Pas de messages de bienvenue</string>
     <string name="no_text">Non</string>
     <string name="no_thanks">Non merci</string>
     <string name="no_user_limit">Aucune limite</string>
@@ -2270,7 +2224,6 @@ de message épinglé… pour l'instant."</string>
     <string name="not_in_the_voice_channel">Pas dans le salon vocal</string>
     <string name="note_placeholder">Clique pour ajouter une note</string>
     <string name="note_placeholder_mobile">Touche pour ajouter une note</string>
-    <string name="notice_application_test_mode">Le mode de test est actuellement activé pour **%1$s**. Les SKU non publiés apparaîtront et nous ne te facturerons aucun paiement lié aux SKU.</string>
     <string name="notice_application_test_mode_go_to_listing">Aller à SKU</string>
     <string name="notice_connect_spotify">Connecte ton compte Spotify pour afficher la musique que tu écoutes sur ton statut !</string>
     <string name="notice_connection_conflict">"Ta voix a été déconnectée car tu t'es connecté(e) à un autre endroit."</string>
@@ -2281,7 +2234,6 @@ de message épinglé… pour l'instant."</string>
     <string name="notice_dispatch_error_disk_low">Espace disque insuffisant. %1$s est requis, mais seulement %2$s est disponible.</string>
     <string name="notice_dispatch_error_file_name_too_long">"Oh non, les noms de fichier de ce jeu sont trop longs pour Windows. Merci de sélectionner un répertoire d'installation plus court."</string>
     <string name="notice_dispatch_error_invalid_drive">"Oh non, l'emplacement d'installation choisi n'est pas valide. Tu as choisi %1$s"</string>
-    <string name="notice_dispatch_error_io_permission_denied">"Échec de la mise à jour du jeu. Est-il en cours d'exécution ?"</string>
     <string name="notice_dispatch_error_no_manifests">"Oh non, il semble qu'aucun contenu n'est disponible pour ce jeu. Merci de contacter l'équipe de support."</string>
     <string name="notice_dispatch_error_not_entitled">"Oh non, il semble que tu ne possèdes pas ce jeu. Merci de contacter l'équipe de support si tu penses qu'il s'agit d'une erreur."</string>
     <string name="notice_dispatch_error_post_install_cancelled">"Il semble que tu as refusé l'installation d'un script. Tu dois l'accepter pour installer le jeu."</string>
@@ -2296,9 +2248,6 @@ de message épinglé… pour l'instant."</string>
     <string name="notice_native_apps">"Besoin de la fonction Appuyer-pour-parler partout sur ton ordinateur ? Télécharge l'application de bureau Discord !"</string>
     <string name="notice_no_input_detected">Eh bien, on dirait que Discord ne détecte aucun son provenant de ton micro. Réglons ça… ensemble.</string>
     <string name="notice_no_input_detected_help_link_text">"À l'aide !"</string>
-    <string name="notice_premium_applications_grandfathered_ended">Ton accès à Nitro a expiré. Passe de Nitro Classic à Nitro pour obtenir un accès illimité à une palanquée de jeux plus géniaux les uns que les autres.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Il te reste %1$s de jeux Nitro ! Ton accès prend fin le **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">"Merci de soutenir Nitro depuis le début ! Pour te récompenser d'être aussi génial(e), tu as désormais accès aux jeux Nitro jusqu'au %1$s."</string>
     <string name="notice_premium_promo_action">Jettes-y un œil !</string>
     <string name="notice_premium_promo_message">Soutiens le développement de Discord et obtiens de super avantages !</string>
     <string name="notice_scheduled_maintenance">Discord prévoit une période de maintenance le **%1$s** à **%2$s**.</string>
@@ -2367,7 +2316,6 @@ Tu as reçu un lien d'invitation d'un de tes amis ? Entre ton lien d'invitation
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Overlay activé</string>
     <string name="nux_post_reg_join_server_description">Profite au maximum de Discord en rejoignant un serveur.</string>
     <string name="nux_post_reg_join_server_skip">"Je n'en ai pas"</string>
     <string name="nux_post_reg_join_server_title">Tu as une invitation ?</string>
@@ -2412,8 +2360,6 @@ Il se peut aussi que l'overlay ne soit pas compatible pour tout le monde. Si tu
     <string name="overlay_menu_get_invite">"Obtenir un lien d'invitation"</string>
     <string name="overlay_menu_open_discord">Ouvrir Discord</string>
     <string name="overlay_menu_switch_channels">Changer de salon</string>
-    <string name="overlay_mobile_required">"Activez l'Overlay Mobile dans les Paramètres Vocaux de Discord."</string>
-    <string name="overlay_mobile_toggle_desc">"Tu peux voir qui est en train de parler et même accéder à des raccourcis tout en utilisant d'autres applications lorsque tu es connecté en vocal"</string>
     <string name="overlay_mobile_toggle_label">"Activer l'overlay de voix mobile"</string>
     <string name="overlay_mobile_unauthed">"Connecte-toi sur l'application Discord pour activer cette fonctionnalité."</string>
     <string name="overlay_news_go_live_body">Tu souhaites streamer %1$s à tes amis sur %2$s ?</string>
@@ -2421,7 +2367,6 @@ Il se peut aussi que l'overlay ne soit pas compatible pour tout le monde. Si tu
     <string name="overlay_news_text_pinning_body">"Tu peux maintenant épingler le message d'un chat à ton jeu !"</string>
     <string name="overlay_news_text_pinning_tip">Astuce : tu peux épingler un message en appuyant sur $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Overlay Discord amélioré</string>
-    <string name="overlay_no_results">"Nous avons cherché dans tous les recoins, mais malheureusement, aucun salon vocal n'a été trouvé."</string>
     <string name="overlay_notification_incoming_call">Appel entrant…</string>
     <string name="overlay_notification_settings_disabled">Notifications désactivées</string>
     <string name="overlay_notification_settings_position">Affichage : %1$s</string>
@@ -2431,7 +2376,6 @@ Il se peut aussi que l'overlay ne soit pas compatible pour tout le monde. Si tu
     <string name="overlay_notifications_settings">"Notifications de l'overlay"</string>
     <string name="overlay_notifications_top_left">En haut à gauche</string>
     <string name="overlay_notifications_top_right">En haut à droite</string>
-    <string name="overlay_private_channels_empty_state">"Eh non, il n'y a pas de message privé par ici."</string>
     <string name="overlay_reload">"Recharger l'overlay"</string>
     <string name="overlay_settings">"Paramètres de l'overlay"</string>
     <string name="overlay_settings_general_tab">Général</string>
@@ -2453,7 +2397,6 @@ Il se peut aussi que l'overlay ne soit pas compatible pour tout le monde. Si tu
     <string name="pagination_page_of">Page %1$s sur %2$s</string>
     <string name="pagination_previous">Précédent</string>
     <string name="paginator_of_pages">Page %1$s sur %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Partenaire Discord</string>
     <string name="party_full">Groupe complet</string>
     <string name="party_join">Rejoindre le groupe</string>
@@ -2546,18 +2489,11 @@ Il se peut aussi que l'overlay ne soit pas compatible pour tout le monde. Si tu
     <string name="popout_stay_on_top">Garder en premier plan</string>
     <string name="post_code">Code postal</string>
     <string name="premium_alert_error_title">"Oups, une erreur s'est produite…"</string>
-    <string name="premium_applications_grandfathered_monthly">"Pour te remercier de soutenir Discord, on t'offre l'accès aux jeux Nitro pendant un an. Ton accès prend fin le **%1$s**."</string>
-    <string name="premium_applications_grandfathered_yearly">"Pour te remercier de soutenir Discord, on t'offre l'accès aux jeux Nitro pendant 2 ans. Ton accès prend fin le **%1$s**."</string>
-    <string name="premium_applications_subtitle">Obtiens un accès illimité à une bibliothèque grandissante de jeux acclamés par la critique auxquels nous croyons que tes amis et toi devriez jouer.</string>
-    <string name="premium_applications_title">Des douzaines de jeux soigneusement choisis. Un prix mensuel bas.</string>
     <string name="premium_badge_tooltip">Abonné depuis %1$s</string>
     <string name="premium_cancel_cancel">Non</string>
     <string name="premium_cancel_confirm_body_tier_1">"La résiliation prendra effet à la fin de ta période de facturation actuelle, le **%1$s**. Ton Discord Tag sera régénéré aléatoirement si tu l'as changé.
 
 Tu peux te réabonner à tout moment."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"La résiliation prendra effet à la fin de ta période de facturation actuelle. Le **%1$s**, tu perdras l'accès à tous les jeux Nitro dans ta bibliothèque et ton Discord Tag sera régénéré aléatoirement si tu l'as changé.
-
-Nous conserverons tes fichiers sauvegardés au cas où tu changerais d'avis. Tu peux te réabonner à tout moment !"</string>
     <string name="premium_cancel_confirm_new">Ouaip, résilier %1$s</string>
     <string name="premium_cancel_confirm_title">Résilier %1$s ?</string>
     <string name="premium_cancel_failed_body">"Nous n'avons pas pu résilier ton abonnement à Nitro. Réessaie ou prends contact avec notre équipe de support si le problème persiste."</string>
@@ -2574,32 +2510,25 @@ Nous conserverons tes fichiers sauvegardés au cas où tu changerais d'avis. Tu
     <string name="premium_chat_perks_description_custom_emoji">"Obtiens un passeport global pour utiliser tes émojis personnalisés n'importe où."</string>
     <string name="premium_chat_perks_description_discriminator">Choisis ton tag tant que tu es abonné(e).</string>
     <string name="premium_chat_perks_description_screenshare">"Fais passer le partage d'écran à la vitesse supérieure avec le 720p 60fps ou le 1080p 30fps."</string>
-    <string name="premium_chat_perks_description_upload_limit">"La taille d'upload de fichiers passe de %1$s à %2$s, afin de profiter d'un partage de mèmes de haute qualité."</string>
+    <string name="premium_chat_perks_streaming_mobile">"Des streams Go Live de meilleure qualité : streame à la source avec Nitro, ou profite d'un mirifique 1080 p 60 fps avec Nitro Classic"</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Fun animé</string>
     <string name="premium_chat_perks_title_badge">Affiche ton soutien</string>
     <string name="premium_chat_perks_title_custom_emoji">Émojis globaux personnalisés</string>
     <string name="premium_chat_perks_title_discriminator">Discord Tag personnalisé</string>
     <string name="premium_chat_perks_title_screenshare">Meilleure qualité de vidéo</string>
+    <string name="premium_chat_perks_title_streaming">Des streams Go Live de meilleure qualité</string>
     <string name="premium_code_redemption_confirmation_blurb">"Grâce à une obscure série de chiffres, tu profites désormais d'avantages de discussion pour %1$s !"</string>
     <string name="premium_code_redemption_confirmation_button">Oh, stylé !</string>
-    <string name="premium_feature_new_chat_perks_header">Tu recevras aussi des avantages de discussion améliorés :</string>
-    <string name="premium_feature_new_premium_applications_header">Il y en a pour %1$s de jeux ! Jettes-y un œil :</string>
-    <string name="premium_feature_view_applications">Voir tous les jeux Nitro</string>
     <string name="premium_features_chat_perks">Avantages de discussion</string>
-    <string name="premium_features_premium_applications">Jeux gratuits</string>
     <string name="premium_grandfathered_warning">"Pour te remercier de ton soutien, tu disposes maintenant d'une réduction sur ton abonnement Nitro. **Tu perdras cette réduction si tu résilies ou modifies ton abonnement.** Tu ne pourras pas dire qu'on ne t'avais pas prévenu(e) !!!!!"</string>
     <string name="premium_grandfathered_warning_confirm">Le faire quand même</string>
     <string name="premium_grandfathered_warning_title">Fais attention, camarade</string>
     <string name="premium_info_monthly">%1$s (par mois) débités le %2$s.</string>
     <string name="premium_info_yearly">%1$s (par an) débités le %2$s.</string>
-    <string name="premium_month_subscription">**%1$s %2$s %3$s** / mois</string>
     <string name="premium_not_claimed">"Enregistre d'abord ton compte"</string>
     <string name="premium_not_claimed_body">"Salut, l'ami ! Si tu veux acheter Nitro, tu dois d'abord enregistrer ton compte pour ne rien perdre."</string>
     <string name="premium_not_verified">"Vérifie d'abord ton e-mail"</string>
-    <string name="premium_not_verified_body">"Salut, l'ami ! Si tu veux acheter Nitro, tu dois d'abord vérifier ton adresse e-mail. Consulte ta boîte mail ou demande à recevoir un nouvel e-mail.."</string>
-    <string name="premium_payment_applications_os_warning">"Les jeux Nitro ne sont compatibles qu'avec Windows."</string>
     <string name="premium_payment_confirmation_blurb_regular">Tu as reçu le pouvoir des avantages de discussion améliorés. Arrête de lire ça et va papoter !!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">"Tu disposes désormais d'un accès illimité à plein de super jeux. Arrête de lire ça et va jouer !!"</string>
     <string name="premium_payment_confirmation_button_regular">Ok, pourquoi pas</string>
     <string name="premium_plan_month">Nitro mensuel</string>
     <string name="premium_plan_month_tier_1">Nitro Classic mensuel</string>
@@ -2620,14 +2549,10 @@ Nous ajusterons aussi le coût en fonction de ton abonnement en cours et déduir
     <string name="premium_upgrade_disabled_current_tooltip">Ton abonnement actuel.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">"Tu dois d'abord résilier ton abonnement et le laisser expirer avant de choisir un abonnement inférieur."</string>
     <string name="premium_upgrade_done_body_tier_1">"Tu profites désormais d'avantages de discussion améliorés !"</string>
-    <string name="premium_upgrade_done_body_tier_2">"Tu profites désormais d'avantages de discussion améliorés et d'un accès à des douzaines de jeux."</string>
     <string name="premium_upgrade_done_button_tier_1">Stylé !</string>
-    <string name="premium_upgrade_done_button_tier_2">Consulter tous les jeux Nitro</string>
     <string name="premium_upgrade_failed_body">"Mhm… Le passage en Premium n'a pas fonctionné. Assure-toi que tes informations de paiement soient bien à jour et réessaie, s'il te plaît."</string>
     <string name="premium_upload_promo">Passe à Discord Nitro pour une limite de %1$s par fichier</string>
     <string name="premium_year_free_months">Profite de 2 mois gratuits !</string>
-    <string name="premium_year_free_months_short">2 mois gratuits</string>
-    <string name="premium_year_subscription">**%1$s %2$s %3$s** / an</string>
     <string name="preview_chat">Aperçu de la conversation</string>
     <string name="priority_speaker">Voix prioritaire</string>
     <string name="priority_speaker_description">"Les utilisateurs ayant cette permission peuvent être entendus plus facilement lorsqu'ils parlent. Lorsque ce mode est activé,
@@ -2759,7 +2684,6 @@ Tu es sûr(e) de vouloir effectuer cette action ?"</string>
     <string name="role_order_updated">Ordre des rôles mis à jour.</string>
     <string name="roles">Rôles</string>
     <string name="roles_list">%1$s</string>
-    <string name="rtc_connection">Connexion RTC</string>
     <string name="rtc_connection_info">Information de connexion</string>
     <string name="rtc_connection_state_authenticating">"Discord s'est connecté à ton serveur de communication en temps réel et sécurise la connexion."</string>
     <string name="rtc_connection_state_awaiting_endpoint">"Discord est en train de charger un serveur RTC rien que pour toi ! Si ta connexion est bloquée ici,
@@ -2804,12 +2728,11 @@ et tente d'envoyer des données."</string>
     <string name="scope_connections_empty">"Tu n'as pas encore de connexion tierce !"</string>
     <string name="scope_email">Accéder à ton adresse e-mail</string>
     <string name="scope_email_empty">"Tu n'as pas encore défini d'adresse e-mail !"</string>
-    <string name="scope_gdm_join">Se joindre à des groupes privés pour toi</string>
     <string name="scope_gdm_join_description">"Permet à l'application de se joindre aux groupes privés qu'elle a créés pour toi."</string>
     <string name="scope_guilds">Savoir sur quels serveurs tu es</string>
     <string name="scope_guilds_empty">"Tun'es sur aucun serveur."</string>
     <string name="scope_guilds_join">Rejoindre des serveurs pour toi</string>
-    <string name="scope_guilds_join_description">Envoyer des invitations instantanées en ton nom.</string>
+    <string name="scope_guilds_join_description">Envoyer des invitations en ton nom.</string>
     <string name="scope_identify">"Accéder à ton nom d'utilisateur et à ton avatar"</string>
     <string name="scope_messages_read">Lire tous les messages</string>
     <string name="scope_messages_read_description">"Ceci permet à l'application de lire tous les messages accessibles via ton compte Discord"</string>
@@ -2874,7 +2797,6 @@ Choisis quel écran tu souhaites partager."</string>
     <string name="search_filter_on">le</string>
     <string name="search_for_emoji">"Trouve l'émoji parfait"</string>
     <string name="search_for_empty">Rechercher</string>
-    <string name="search_for_value">Rechercher : **%1$s**</string>
     <string name="search_group_header_channels">Dans le salon</string>
     <string name="search_group_header_file_name">Le nom du fichier contient</string>
     <string name="search_group_header_file_type">Format de fichier</string>
@@ -2972,7 +2894,6 @@ Tu es sûr(e) de vouloir faire ça ?"</string>
     <string name="settings_games_no_games_header">Aucun jeu ajouté</string>
     <string name="settings_games_not_playing">À quel jeu tu joues ?</string>
     <string name="settings_games_not_seeing_game">Tu ne trouves pas ton jeu ?</string>
-    <string name="settings_games_now_playing_label">En train de jouer à</string>
     <string name="settings_games_now_playing_state">En train de jouer !</string>
     <string name="settings_games_overlay_off">Overlay : Désactivé</string>
     <string name="settings_games_overlay_on">Overlay : Activé</string>
@@ -3049,7 +2970,6 @@ Tu es sûr(e) de vouloir faire ça ?"</string>
     <string name="spotify_listen_along_stop">Arrêter</string>
     <string name="spotify_listen_along_subtitle_listener">sur Spotify</string>
     <string name="spotify_listen_along_title_host">%1$s %2$s</string>
-    <string name="spotify_listen_along_title_listener">Écouter ensemble</string>
     <string name="spotify_premium_upgrade_body">"Désolé, vieille branche, mais on dirait que tu n'es pas membre Spotify Premium ! Seuls les membres Premium peuvent écouter Spotify en même temps que d'autres utilisateurs."</string>
     <string name="spotify_premium_upgrade_button">Passer à Spotify Premium</string>
     <string name="spotify_premium_upgrade_header">*Scratch de vinyle*</string>
@@ -3075,8 +2995,6 @@ Tu es sûr(e) de vouloir faire ça ?"</string>
     <string name="stop_ringing">"Annuler l'appel"</string>
     <string name="stop_streaming">Arrêter de streamer</string>
     <string name="stop_watching">Arrêter de regarder</string>
-    <string name="store_payment_legalese_monthly">"Hey ! En achetant %1$s, tu acceptes nos [Conditions d'Utilisation de la Boutique](%2$s). %1$s est un abonnement récurrent, ce qui signifie que nous allons te facturer aujourd'hui et continuer à te facturer tous les mois jusqu'à ce que te résilies ton abonnement. Tu peux le résilier à tout moment depuis l'écran des Paramètres utilisateur."</string>
-    <string name="store_payment_legalese_yearly">"Hey ! En achetant %1$s, tu acceptes nos [Conditions d'Utilisation de la Boutique](%2$s). %1$s est un abonnement récurrent, ce qui signifie que nous allons te facturer aujourd'hui et continuer à te facturer tous les ans jusqu'à ce que te résilies ton abonnement. Tu peux le résilier à tout moment depuis l'écran des Paramètres utilisateur."</string>
     <string name="stream">Passer en direct</string>
     <string name="stream_bad_spectator">Le stream que tu es en train de regarder possède actuellement une qualité vidéo ou audio réduite. Ceci est peut-être dû à des problèmes de réseau.</string>
     <string name="stream_bad_streamer">Ton stream possède actuellement une qualité vidéo ou audio réduite. Ceci est peut-être dû à des problèmes de réseau.</string>
@@ -3084,7 +3002,6 @@ Tu es sûr(e) de vouloir faire ça ?"</string>
     <string name="stream_capture_paused_details">Reviens à ton jeu pour continuer.</string>
     <string name="stream_capture_paused_details_viewer">%1$s a minimisé le jeu… ne bouge pas !</string>
     <string name="stream_channel_description">Les membres ayant cette permission peuvent streamer dans ce salon.</string>
-    <string name="stream_description">Les membres ayant cette permission peuvent streamer dans ce salon.</string>
     <string name="stream_ended">Le stream est terminé. *bruits de criquets*</string>
     <string name="stream_ended_button">Stream terminé</string>
     <string name="stream_ended_no_spectators">"Il n'y a aucun spectateur car le stream est terminé."</string>
@@ -3124,7 +3041,6 @@ Tu es sûr(e) de vouloir faire ça ?"</string>
     <string name="stream_report_rating_body_streamer">Parle-nous de ton expérience de streaming.</string>
     <string name="stream_report_submit">Envoyer</string>
     <string name="stream_reported">Commentaires envoyés</string>
-    <string name="stream_reported_body">"Merci d'avoir signalé ton problème ! Tes commentaires nous permettent d'améliorer la qualité du stream."</string>
     <string name="stream_soundshare_failed">"Hey, une erreur s'est produite et nous n'avons pas pu streamer le son de ton jeu."</string>
     <string name="streamer_mode">Mode streamer</string>
     <string name="streamer_mode_enabled">Mode streamer activé</string>
@@ -3181,7 +3097,6 @@ Tu es sûr(e) de vouloir faire ça ?"</string>
     <string name="system_message_guild_member_join_10">Un %1$s sauvage apparaît.</string>
     <string name="system_message_guild_member_join_11">"Swoooosh. %1$s vient juste d'atterrir."</string>
     <string name="system_message_guild_member_join_12">Tenez-vous bien. %1$s a rejoint le serveur.</string>
-    <string name="system_message_guild_member_join_13">%1$s vient de rejoindre le serveur. Cachez vos bananes.</string>
     <string name="system_message_guild_member_join_14">"%1$s vient d'arriver. Il est trop OP - nerf plz."</string>
     <string name="system_message_guild_member_join_15">%1$s vient de se glisser dans le serveur.</string>
     <string name="system_message_guild_member_join_16">Un %1$s est apparu dans le serveur.</string>
@@ -3192,7 +3107,6 @@ Tu es sûr(e) de vouloir faire ça ?"</string>
     <string name="system_message_guild_member_join_21">Challenger en approche - %1$s est apparu(e) !</string>
     <string name="system_message_guild_member_join_22">"C'est un oiseau ! C'est un avion ! Ha, non, c'est juste %1$s."</string>
     <string name="system_message_guild_member_join_23">Voici %1$s ! Loué soit le Soleil ! \\\\[T]/</string>
-    <string name="system_message_guild_member_join_25">Ah ! %1$s nous a rejoint ! Tu as activé ma carte piège !</string>
     <string name="system_message_guild_member_join_26">Hello, mon chou ! %1$s est arrivé(e) !</string>
     <string name="system_message_guild_member_join_27">Hé ! Écoutez ! %1$s nous a rejoint !</string>
     <string name="system_message_guild_member_join_28">Nous vous attendions, %1$s</string>
@@ -3232,7 +3146,7 @@ Tu es sûr(e) de vouloir faire ça ?"</string>
     <string name="text_channels">Salons textuels</string>
     <string name="text_channels_matching">Salon(s) textuel(s) correspondant à **%1$s**</string>
     <string name="text_permissions">Permissions textuelles</string>
-    <string name="textarea_placeholder">Envoyer un message au salon %1$s</string>
+    <string name="textarea_placeholder">Envoyer un message à %1$s</string>
     <string name="theme">Thème</string>
     <string name="theme_dark">Sombre</string>
     <string name="theme_light">Clair</string>
@@ -3346,8 +3260,6 @@ Un compte enregistré est requis pour **télécharger les applications**."</stri
     <string name="unsupported_browser">Navigateur non pris en charge</string>
     <string name="unsupported_browser_body">"On dirait que ton navigateur n'est pas pris en charge. Mets-le à jour ou télécharge l'une de nos applications
 pour profiter de tout de que Discord a à t'offrir."</string>
-    <string name="unsupported_browser_details">"Tu souhaites discuter avec ton équipe ? Passe à la dernière version de Chrome, Opera, Firefox 38+ ou
-télécharge le client Discord dès maintenant !"</string>
     <string name="unsupported_browser_title">"Mhm, c'est un peu gênant"</string>
     <string name="unverified_account_body">"Consulte tes e-mails et suis les instructions afin de vérifier ton adresse e-mail.
 
@@ -3465,8 +3377,6 @@ Maintiens la touche Maj pour uploader directement."</string>
     <string name="user_settings_appearance_preview_message_4">Le mode compact serait activé</string>
     <string name="user_settings_appearance_preview_message_5">Oh, le voilà !</string>
     <string name="user_settings_appearance_zoom_tip">Tu peux modifier le niveau de zoom avec %1$s +/- et rétablir le zoom par défaut avec %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">"Afficher l'onglet Jeux"</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">"Désactive cette option pour masquer l'onglet Jeux et te concentrer sur tes conversations."</string>
     <string name="user_settings_close_button">Bouton « Fermer »</string>
     <string name="user_settings_confirm_logout">Tu es sûr(e) de vouloir te déconnecter ?</string>
     <string name="user_settings_game_activity">Activité de jeu</string>
@@ -3524,8 +3434,6 @@ Il est à noter que ton serveur sera publiquement accessible à tous ceux utilis
     <string name="vanity_url_hint_mobile">ton-url-ici</string>
     <string name="verfication_expired">"Le lien de vérification d'adresse e-mail a expiré."</string>
     <string name="verfication_expired_suggestion">Connecte-toi à Discord et renvoie le lien</string>
-    <string name="verification_body">"Nous avons détecté que quelque chose d'inhabituel se produisait.
-Afin de continuer à utiliser Discord, **nous devons vérifier que tu es bien un humain.**"</string>
     <string name="verification_body_alt">"Bon, laisse-moi m'assurer que tu es un être humain…"</string>
     <string name="verification_email_body">"Nous t'avons envoyé un nouvel e-mail de vérification à l'adresse **%1$s**. Consulte ta boîte de réception ainsi que tes courriers indésirables pour le retrouver."</string>
     <string name="verification_email_error_body">"Une erreur est survenue lors de l'envoi d'un e-mail de vérification. Réessaie plus tard ou contacte l'équipe de support."</string>
@@ -3565,8 +3473,6 @@ Afin de continuer à utiliser Discord, **nous devons vérifier que tu es bien un
     <string name="video">Vidéo</string>
     <string name="video_call">Appel vidéo</string>
     <string name="video_connect">Vidéo</string>
-    <string name="video_poor_connection_body">La vidéo a été désactivée. Elle sera de nouveau activée lorsque tu auras une meilleure connexion.</string>
-    <string name="video_poor_connection_title">Mauvaise connexion</string>
     <string name="video_preview">Aperçu vidéo</string>
     <string name="video_settings">Paramètres vidéo</string>
     <string name="video_unavailable">Vidéo indisponible</string>
diff --git a/com.discord/res/values-hr/plurals.xml b/com.discord/res/values-hr/plurals.xml
index 9dddb524b1..a3c9dbb9c2 100644
--- a/com.discord/res/values-hr/plurals.xml
+++ b/com.discord/res/values-hr/plurals.xml
@@ -101,16 +101,6 @@
         <item quantity="one">%d slobodno mjesto</item>
         <item quantity="few">%d slobodna mjesta</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d dana</item>
-        <item quantity="one">%d dan</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d članova</item>
-        <item quantity="zero">0 članova</item>
-        <item quantity="one">%d člana</item>
-        <item quantity="few">%d člana</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">dana</item>
         <item quantity="one">dan</item>
@@ -245,18 +235,6 @@
         <item quantity="other">dozvole</item>
         <item quantity="one">dozvolu</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Postavi slowmode na **!!%d!! sekundi**</item>
-        <item quantity="zero">Slowmode je onemogućen</item>
-        <item quantity="one">Postavi slowmode na **1 sekundu**</item>
-        <item quantity="few">Postavi slowmode na **!!%d!! sekunde**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Postavi slowmode na **!!%d!! sekundi**</item>
-        <item quantity="zero">Postavi slowmode na onemogućeno</item>
-        <item quantity="one">Postavi slowmode na **1 sekundu**</item>
-        <item quantity="few">Postavi slowmode na **!!%d!! sekunde**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! članova**</item>
         <item quantity="one">** člana**</item>
@@ -359,10 +337,6 @@
         <item quantity="one">%d nova poruka</item>
         <item quantity="few">%d nove poruke</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d dana</item>
-        <item quantity="one">jedan dan</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d kanala</item>
         <item quantity="one">%d kanal</item>
@@ -380,11 +354,6 @@
         <item quantity="other">ove poruke</item>
         <item quantity="one">ovu poruku</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** servera je nedostupno zbog privremenog prekida.</item>
-        <item quantity="one">**1** server je nedostupan zbog privremenog prekida.</item>
-        <item quantity="few">**%d** servera je nedostupno zbog privremenog prekida.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d mjeseci</item>
         <item quantity="one">mjesec dana</item>
diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml
index 5df73fda06..cfb1b701fc 100644
--- a/com.discord/res/values-hr/strings.xml
+++ b/com.discord/res/values-hr/strings.xml
@@ -60,8 +60,6 @@
 onda neka netko pozove tebe."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Kužim!</string>
     <string name="activity_panel_go_live_hotspot_header">Iskoristi funkciju Go Live za streaming tijeka igre ravno svojim prijateljima!</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Ovaj server nema glasovne kanale kroz koje je moguć streaming.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Ne možeš pustiti streaming kroz ovaj glasovni kanal.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Da bi streaming bio pokrenut, treba prvo otići do servera.</string>
     <string name="add">Dodaj</string>
     <string name="add_a_comment_optional">Dodaj komentar (neobavezno)</string>
@@ -153,7 +151,6 @@ onda neka netko pozove tebe."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">To je to!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Idi u biblioteku</string>
     <string name="application_entitlement_code_redemption_invalid">Unesen je neki krivi kôd</string>
-    <string name="application_entitlement_code_redemption_prompt">Imaš kôd za igru? Unesi ga dolje:</string>
     <string name="application_entitlement_code_redemption_redeem">Iskoristi</string>
     <string name="application_filter_name_linux">Sve datoteke</string>
     <string name="application_filter_name_macos">Aplikacije</string>
@@ -386,7 +383,6 @@ onda neka netko pozove tebe."</string>
     <string name="application_store_view_all_news">Pogledaj sve vijesti</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Ovaj DLC zahtijeva da imaš %1$s na Discordu i onda možeš igrati. [Saznaj više o DLC-u](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Sadržaj koji se može preuzeti</string>
-    <string name="application_store_warning_early_access_description">Ova igra je zabavna (barem se nama tako čini!) ali možda nije baš sasvim cijela, ima bugova ili se čini kao da je nezavršena. [Saznaj više o ranom pristupu.] (%1$s)</string>
     <string name="application_store_warning_early_access_title">Rani pristup</string>
     <string name="application_store_warning_requires_desktop_app_description">Da bi igrao ovu igru, treba ti instalacija verzije Discorda za [stolna računala](downloadHook).</string>
     <string name="application_store_warning_requires_desktop_app_title">Zahtijeva aplikaciju za stolna računala</string>
@@ -507,7 +503,6 @@ Zaobilaženje banova se može jako otežati uključivanjem potvrde broja mobitel
     <string name="billing_error_section_card">Ajme! Izgleda da s tom karticom nešto nije u redu. Sredi ta polja i pokušaj ponovno!</string>
     <string name="billing_history">Povijest naplate</string>
     <string name="billing_legal_mumbo_jumbo">Pravne zavrzlame</string>
-    <string name="billing_legal_mumbo_jumbo_label">Slažem se s [Uvjetima Pružanja Usluge za Discord Store](%1$s)</string>
     <string name="billing_no_payment_method">Nijedan način plaćanja nije pohranjen</string>
     <string name="billing_no_payment_method_description">Pohrani način plaćanja i tako osiguraj brža plaćanja u budućnosti</string>
     <string name="billing_pay_for_it_with">Plati s</string>
@@ -515,12 +510,7 @@ Zaobilaženje banova se može jako otežati uključivanjem potvrde broja mobitel
     <string name="billing_payment_breakdown_total">Ukupno</string>
     <string name="billing_payment_history">Povijest transakcija</string>
     <string name="billing_payment_premium">Tvoja pretplata</string>
-    <string name="billing_payment_premium_legalese_monthly">Kupnjom pretplate %1$s, izražavaš pristanak na naše [Uvjete Pružanja Usluge za Discord Store] (%2$s). Plan pretplate %1$s podrazumijeva da se pretplata obnavlja automatski. Odobravaš Discordu da odmah naplati na način koji je naveden u načinu plaćanja za iznos od %3$s i tako nastavi automatski svakog mjeseca dok ne otkažeš. Možeš otkazati u bilo koje vrijeme.</string>
-    <string name="billing_payment_premium_legalese_yearly">Kupnjom pretplate %1$s, izražavaš pristanak na naše [Uvjete Pružanja Usluge za Discord Store] (%2$s). Plan pretplate %1$s podrazumijeva da se pretplata obnavlja automatski. Odobravaš Discordu da odmah naplati na način koji je naveden u načinu plaćanja za iznos od %3$s i tako nastavi automatski svake godine dok ne otkažeš. Možeš otkazati u bilo koje vrijeme.</string>
     <string name="billing_payment_sources">Načini Plaćanja</string>
-    <string name="billing_payment_table_header_amount">IZNOS</string>
-    <string name="billing_payment_table_header_date">DATUM</string>
-    <string name="billing_payment_table_header_description">OPIS</string>
     <string name="billing_premium_refund_text">Povrat se može zatražiti ako je ta kupnja izvršena u zadnjih %1$s dana. [Naš prijateljski nastrojeni helpdesk pomoći će ti da dobiješ natrag svoje novčiće.] (%2$s)</string>
     <string name="billing_premium_refund_text_unable">Žao nam je, ova kupnja ne ispunjava uvjete za povrat novca. Povrat se može zatražiti ako je ta kupnja izvršena tijekom posljednjih %1$s dana.</string>
     <string name="billing_price_per_month">%1$s mjesečno</string>
@@ -530,9 +520,7 @@ Zaobilaženje banova se može jako otežati uključivanjem potvrde broja mobitel
     <string name="billing_purchase_details_header">Podaci o kupnji</string>
     <string name="billing_refund_header">Ima li kakvih problema s kupnjom?</string>
     <string name="billing_refund_play_time_never_played">Nikada nije igrana</string>
-    <string name="billing_refund_play_time_subheader">ODIGRANO VRIJEME</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">DATUM KUPNJE</string>
     <string name="billing_refund_report_a_problem">Prijavi problem</string>
     <string name="billing_refund_request_button">Zatraži povrat novca</string>
     <string name="billing_sales_tax_added">Iznos od %1$s poreza na promet dodan je na temelju tvoje adrese za ispostavu računa.</string>
@@ -617,12 +605,9 @@ Zaobilaženje banova se može jako otežati uključivanjem potvrde broja mobitel
     <string name="category_settings">Postavke kategorije</string>
     <string name="category_settings_have_been_updated">Postavke kategorije su ažurirane.</string>
     <string name="certified">Certificiran</string>
-    <string name="certified_device_recommendation_audio_input_body">Discord je otkrio certificirani uređaj za audio ulaz pod imenom **%1$s%2$s**. Preporučujemo da se prebaciš na njega kako bi stvari radile što bolje.</string>
-    <string name="certified_device_recommendation_audio_output_body">Discord je otkrio certificirani uređaj za audio izlaz pod imenom **%1$s%2$s**. Preporučujemo da se prebaciš na njega kako bi stvari radile što bolje.</string>
     <string name="certified_device_recommendation_cancel">Ne, hvala!</string>
     <string name="certified_device_recommendation_confirm">Prebaci</string>
     <string name="certified_device_recommendation_title">Certificirani uređaj otkriven</string>
-    <string name="certified_device_recommendation_video_input_body">Discord je otkrio certificirani uređaj za video ulaz pod imenom **%1$s%2$s**. Preporučujemo da se prebaciš na njega kako bi stvari radile što bolje.</string>
     <string name="change">Promijeni</string>
     <string name="change_avatar">Promijeni avatar</string>
     <string name="change_category">Promijeni kategoriju</string>
@@ -763,7 +748,6 @@ Zaobilaženje banova se može jako otežati uključivanjem potvrde broja mobitel
     <string name="connection_enter_code">Unesi kôd kako je prikazan na tvojem zaslonu</string>
     <string name="connection_invalid_pin">Unesen je nevažeći PIN kôd</string>
     <string name="connection_login_with">ili se prijavite pomoću</string>
-    <string name="connection_problems_body">Check [status servera](%1$s) ili tweetni [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Provjera autentičnosti</string>
     <string name="connection_status_awaiting_endpoint">Čekanje ishoda</string>
     <string name="connection_status_connected">Povezan</string>
@@ -808,7 +792,7 @@ Zaobilaženje banova se može jako otežati uključivanjem potvrde broja mobitel
     <string name="create_category">Napravi kategoriju</string>
     <string name="create_channel">Napravi kanal</string>
     <string name="create_group_dm">Napravi grupu za izravno dopisivanje</string>
-    <string name="create_instant_invite">Stvaranje instant pozivnice</string>
+    <string name="create_instant_invite">Stvori pozivnicu</string>
     <string name="create_link">Stvori link</string>
     <string name="create_or_join_modal_header">Još jedan server, ha?</string>
     <string name="create_server_button_body">Napravi novi server i pozovi svoje prijatelje. Besplatno je!</string>
@@ -922,7 +906,6 @@ Zaobilaženje banova se može jako otežati uključivanjem potvrde broja mobitel
     <string name="disable_email_notifications_failed_suggestion">Email obavijesti su možda već onemogućene, ili možda ovaj email više nije povezan s Discord računom.</string>
     <string name="disable_integration_title">Onemogući sinkronizaciju</string>
     <string name="disable_integration_twitch_body">Onemogućivanje sinkronizacije će dovesti do isteka članstva svih pretplatnika.</string>
-    <string name="disable_integration_youtube_body">Onemogućivanje sinkronizacije će dovesti do isteka članstva svih sponzora.</string>
     <string name="disable_notifications_description">Sve obavijesti radne površine će biti isključene.</string>
     <string name="disable_notifications_label">Isključi obavijesti</string>
     <string name="disable_sounds_description">Svi zvučni efekti će biti onemogućeni.</string>
@@ -938,7 +921,6 @@ Zaobilaženje banova se može jako otežati uključivanjem potvrde broja mobitel
     <string name="discord_desc_long">Besplatan i siguran chat za gamere, radi na računalu i na tvojem mobitelu.</string>
     <string name="discord_desc_short">Timski glasovni i tekstualni chat</string>
     <string name="dismiss">Odbaci</string>
-    <string name="dispatch_error_modal_body">Nešto je pošlo krivo. Ako se problem nastavi pojavljivati, napravi support ticket i kopiraj sadržaj poruke u nastavku.</string>
     <string name="dispatch_error_modal_error_label">Poruka o pogrešci (kopiraj me pa zalijepi)</string>
     <string name="dispatch_error_modal_header">Greška kod servisa Discord Dispatch</string>
     <string name="dispatch_error_modal_open_ticket">Otvori ticket</string>
@@ -1068,7 +1050,6 @@ Ovom postavkom možeš kontrolirati koliko dugo trebaš biti udaljen/a od tipkov
     <string name="form_help_afk_channel">Automatski prebaci članove u ovaj kanal i utišaj ih kada su neaktivni duže od definiranog AFK vremena. Ovo ne vrijedi za preglednike.</string>
     <string name="form_help_attenuation">Smanji glasnoću ostalih aplikacija za ovaj postotak dok netko priča. Postavi na 0%% za isključenje prigušenja.</string>
     <string name="form_help_automatic_vad">Kada vidiš zeleni indikator, tada Discord prenosi tvoj prekrasan glas.</string>
-    <string name="form_help_bitrate">**SVI BITOVI!** Ne preporuča se više od %1$skbps osim ako si audiofil, jer će negativno utjecati na ljude s lošijom vezom ili na mobilnom uređaju.</string>
     <string name="form_help_certified_voice_processing">Pri korištenju Discord certificiranog mikrofona određene značajke obrade glasa više se ne obrađuju u samom Discordu, već ih obrađuje mikrofon.</string>
     <string name="form_help_channel_permissions">Odabirom uloga će se automatski postaviti osnovne dozvole za ovaj kanal.</string>
     <string name="form_help_custom_code">Koristi bilo koju alfanumeričku vrijednost kao kôd.</string>
@@ -1076,8 +1057,6 @@ Ovom postavkom možeš kontrolirati koliko dugo trebaš biti udaljen/a od tipkov
     <string name="form_help_default_notification_settings">Ovo će odrediti hoće li članovi koji nisu izričito postavili postavke obavijesti primiti obavijest za svaku poruku poslanu u ovom serveru ili ne. **Preporučamo postavljanje samo za @spominjanja za javni Discord kako bi izbjegli [ovu ludost](%1$s).**</string>
     <string name="form_help_default_notification_settings_mobile">Ovo će odrediti hoće li članovi koji nisu izričito postavili postavke obavijesti primiti obavijest za svaku poruku poslanu u ovom serveru ili ne. Preporučamo postavljanje samo za @spominjanja za javni Discord</string>
     <string name="form_help_explicit_content_filter">Automatski skeniraj i obriši poruke poslane na ovaj server koje sadrže eksplicitni sadržaj. Molimo odaberi kako će se filter primjenjivati na članove tvog servera. **Preporučamo da postaviš filter za javni Discord**</string>
-    <string name="form_help_instant_invite_channel">Ako je kanal odabran, stvorit će se link instant pozivnice uz widget, u suprotnom će biti prikazani samo članovi koji su na mreži i glasovni kanali.</string>
-    <string name="form_help_last_seen">Pročišćavanje će izbaciti **%1$s** koji nisu bili viđeni **%2$s** i nije im dodijeljena nijedna uloga. Mogu se ponovno pridružiti serveru koristeći novu instant pozivnicu.</string>
     <string name="form_help_legacy_subsystem">"Neki zvukovni uređaji prikazuju probleme pri korištenju modernog audio podsustava tvog operativnog sustava.
 Stavi kvačicu za povratak na zadani audio podsustav."</string>
     <string name="form_help_nsfw">Korisnik će morati potvrditi da je pravne dobi za prikaz sadržaja u ovom kanalu. NSFW kanali su izuzeti od filtra eksplicitnog sadržaja.</string>
@@ -1085,7 +1064,6 @@ Stavi kvačicu za povratak na zadani audio podsustav."</string>
     <string name="form_help_qos">"Savjetuje tvom ruteru da paketi koje Discord prenosi imaju visok prioritet.
 Neki ruteri ili davatelji internet usluga bi se mogli čudno ponašati kada je ovo uključeno."</string>
     <string name="form_help_slowmode">Članovi će biti ograničeni na slanje jedne poruke po tom intervalu, osim ako nemaju dozvole za upravljanje kanalima ili upravljanje porukama.</string>
-    <string name="form_help_system_channel">Pošalji poruku ovom kanalu kada se netko pridruži ovom serveru. Poruke su nasumične. Možeš ugasiti ovu opciju kad god želiš.</string>
     <string name="form_help_temporary">Članovi su automatski izbačeni kada se odspoje, osim ako im se ne dodijeli uloga.</string>
     <string name="form_help_user_limit">Ograničava broj korisnika koji se mogu povezati u ovaj glasovni kanal. Korisnici s dozvolom **Premještanje članova** ignoriraju ovo ograničenje i mogu premještati ostale korisnike u ovaj kanal.</string>
     <string name="form_help_verification_level">Članovi ovoga servera moraju ispunjavati sljedeće kriterije prije nego što mogu slati poruke u tekstualnim kanalima ili pokrenuti izravni razgovor. Ako član ima dodijeljenu ulogu, to više ne važi. **Preporučujemo da se postavi razina provjere za javni Discord.**</string>
@@ -1127,8 +1105,8 @@ Neki ruteri ili davatelji internet usluga bi se mogli čudno ponašati kada je o
     <string name="form_label_input_mode">Način unosa</string>
     <string name="form_label_input_sensitivty">Ulazna osjetljivost</string>
     <string name="form_label_input_volume">Glasnoća mikrofona</string>
-    <string name="form_label_instant_invite">Unesi instant pozivnicu</string>
-    <string name="form_label_instant_invite_channel">Kanal instant pozivnica</string>
+    <string name="form_label_instant_invite">Unesi pozivnicu</string>
+    <string name="form_label_instant_invite_channel">Kanal pozivnice</string>
     <string name="form_label_last_seen">Zadnji put viđeni</string>
     <string name="form_label_local_mute">Lokalno utišaj</string>
     <string name="form_label_max_age">Istječe nakon</string>
@@ -1194,7 +1172,6 @@ Neki ruteri ili davatelji internet usluga bi se mogli čudno ponašati kada je o
     <string name="form_label_suppress_everyone">Utišaj **@everyone** i **@here**</string>
     <string name="form_label_synced_role">Sinkronizirana uloga</string>
     <string name="form_label_synced_subs">Sinkronizirani pretplatnici</string>
-    <string name="form_label_system_channel">Kanal za poruke o dolasku novih članova</string>
     <string name="form_label_temporary">Privremeno članstvo</string>
     <string name="form_label_tts">Tekst u govor (TTS)</string>
     <string name="form_label_tts_notifications">Tekst-u-govor obavijesti</string>
@@ -1291,7 +1268,6 @@ Hvala ti što čuvaš stvari."</string>
     <string name="game_feed_activity_recently_played">Nedavno igrano</string>
     <string name="game_feed_activity_streaming_twitch">Streaming na Twitchu</string>
     <string name="game_feed_current_header_title">Trenutno igraju</string>
-    <string name="game_feed_settings_visibility">Prikaži na Kartici igara</string>
     <string name="game_feed_unknown_player">Nepoznati igrač</string>
     <string name="game_feed_user_played_days_ago">Posljednje odigrano prije %1$s %2$s</string>
     <string name="game_feed_user_played_hours_ago">Posljednje odigrano prije %1$s %2$s</string>
@@ -1360,6 +1336,7 @@ Hvala ti što čuvaš stvari."</string>
     <string name="generate_a_new_link">Generiraj novi link</string>
     <string name="get_started">Započni</string>
     <string name="gif_auto_play_label">Automatski pokreni GIF-ove kad je Discord fokusiran.</string>
+    <string name="go_live_hardware_acceleration_unavailable">Samo da ti javimo da za sada ne nalazimo da imaš hardversko ubrzavanje. Tvoj komp možda neće moći podržati Go Live.</string>
     <string name="go_live_hey">Hej!</string>
     <string name="go_live_listen">Slušaj!</string>
     <string name="go_live_look">Vidi!</string>
@@ -1371,6 +1348,7 @@ Hvala ti što čuvaš stvari."</string>
     <string name="go_live_modal_overflow_two_users">%1$s i %2$s</string>
     <string name="go_live_modal_select_channel_form_title">Odaberi neki glasovni kanal</string>
     <string name="go_live_modal_select_channel_placeholder">Pretražuj glasovne kanale</string>
+    <string name="go_live_video_drivers_outdated">Video driveri su ti malo zastarjeli. Ako želiš da Go Live radi super, onda ih ažuriraj.</string>
     <string name="grant_temporary_membership">Dopusti privremeno članstvo</string>
     <string name="group">Grupa</string>
     <string name="group_dm_add_friends">Dodaj prijatelje u izravnu poruku</string>
@@ -1446,8 +1424,6 @@ Hvala ti što čuvaš stvari."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Dodijelio/la** %1$s za **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Premjestio/la iz **%1$s** u **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">Na mjestu **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) je stvorio/la tekstualni kanal $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Promijenio/la temu u **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Postavio/la temu - **%1$s**</string>
@@ -1543,6 +1519,8 @@ Hvala ti što čuvaš stvari."</string>
     <string name="guild_settings_filter_all_actions">Sve radnje</string>
     <string name="guild_settings_filter_all_users">Svi korisnici</string>
     <string name="guild_settings_filter_user">Filtriraj po korisniku</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">Go Live streamovi na 720p i uz 60fps</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">Go Live streamovi na 1080p i uz 60fps</string>
     <string name="guild_settings_label_audit_log">Dnevnik aktivnosti</string>
     <string name="guild_settings_label_audit_log_empty_body">Nakon što moderatori započnu moderirati, možeš ovdje moderirati moderiranja.</string>
     <string name="guild_settings_label_audit_log_empty_title">Još nema aktivnosti</string>
@@ -1574,7 +1552,7 @@ Ukoliko imaš pristup članovima svoje stranice, tada možeš dinamički dodati
     <string name="help_role_locked_mine">Uloga je zaključana jer je tvoja najviše rangirana uloga. Molimo te pitaj viši rang ili Vlasnika servera za pomoć.</string>
     <string name="help_singular_permission">Ne možeš uređivati ovu dozvolu jer bi se brisanjem oduzela tebi.</string>
     <string name="hide_instant_invites_description">Preporučeno ako ne želiš da nepoznati ljudi pristupaju tvojim Discord serverima.</string>
-    <string name="hide_instant_invites_label">Sakrij linkove instant pozivnica</string>
+    <string name="hide_instant_invites_label">Sakrij linkove pozivnica</string>
     <string name="hide_muted">Sakrij %1$s utišanih</string>
     <string name="hide_muted_channels">Sakrij utišane kanale</string>
     <string name="hide_personal_information_description">Skriva e-mail, povezane račune, bilješke i anonimizira DiscordTagove.</string>
@@ -1723,14 +1701,14 @@ Ukoliko imaš pristup članovima svoje stranice, tada možeš dinamički dodati
     <string name="input_mode_ptt_release_delay">Vremenska odgoda nakon puštanja tipke Push to talk</string>
     <string name="input_mode_vad">Glasovna aktivnost</string>
     <string name="install_location_main">Glavni</string>
-    <string name="instant_invite">Instant pozivnica</string>
+    <string name="instant_invite">Pozovi</string>
     <string name="instant_invite_accept">Prihvati pozivnicu</string>
-    <string name="instant_invite_accepted">Instant pozivnica je prihvaćena</string>
-    <string name="instant_invite_accepting">Prihvaćanje instant pozivnice</string>
+    <string name="instant_invite_accepted">Prihvaćena pozivnica</string>
+    <string name="instant_invite_accepting">Prihvaćanje pozivnice</string>
     <string name="instant_invite_ask_for_new_invite">Zatraži novu!</string>
     <string name="instant_invite_ask_user_for_new_invite">Pitaj %1$s za novu pozivnicu!</string>
     <string name="instant_invite_code">Kôd</string>
-    <string name="instant_invite_expired">Instant pozivnica je nevažeća ili je istekla.</string>
+    <string name="instant_invite_expired">Pozivnica je nevažeća ili je istekla.</string>
     <string name="instant_invite_expires">Istječe</string>
     <string name="instant_invite_failed_to_generate">Nismo uspjeli napraviti link pozivnice.</string>
     <string name="instant_invite_generate">Generiraj</string>
@@ -1748,16 +1726,15 @@ Ukoliko imaš pristup članovima svoje stranice, tada možeš dinamički dodati
     <string name="instant_invite_regenerate">Regeneriraj</string>
     <string name="instant_invite_resolved_body">Pozvan/a si u **%1$s** na **%2$s**.</string>
     <string name="instant_invite_resolved_title">Pozdrav!</string>
-    <string name="instant_invite_resolving">Uspostavljanje instant pozivnice</string>
+    <string name="instant_invite_resolving">Uspostavljanje pozivnice</string>
     <string name="instant_invite_uses">Korištenja</string>
     <string name="instant_invite_you_are_already_a_member_of">Već jesi član</string>
     <string name="instant_invite_you_have_been_invited_to_join">Pozvan/a si da se pridužiš</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** te pozvao/la da se pridružiš</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Pozvan/a si da se pridužiš privatnoj grupi od korisnika</string>
-    <string name="instant_invites">Instant pozivnice</string>
+    <string name="instant_invites">Pozivnice</string>
     <string name="integration_settings">Postavke integracije</string>
     <string name="integrations">Integracije</string>
-    <string name="integrations_header">Povezani Twitch/YouTube Gaming računi</string>
     <string name="integrations_pro_tip">Za više integracija, posjeti [Discordov StreamKit](%1$s).</string>
     <string name="internal_server_error">Došlo je do unutarnje pogreške poslužitelja, molimo pokušaj ponovno.</string>
     <string name="invalid_animated_emoji_body">Ovaj emoji ne radi jer je animiran. Nadogradi na Discord Nitro i ispuni sve svoje snove o animiranim emojijima</string>
@@ -1870,13 +1847,13 @@ Ukoliko imaš pristup članovima svoje stranice, tada možeš dinamički dodati
     <string name="join_afk_channel_body">Izgleda da se nalaziš u AFK kanalu. U ovom kanalu nije moguće razgovarati.</string>
     <string name="join_call">Pridruži se pozivu</string>
     <string name="join_server">Pridruži se</string>
-    <string name="join_server_button_body">Unesi instant pozivnicu i pridruži se serveru tvojih prijatelja.</string>
+    <string name="join_server_button_body">Unesi pozivnicu i pridruži se serveru tvojih prijatelja.</string>
     <string name="join_server_button_cta">Pridruži se serveru</string>
     <string name="join_server_button_cta_mobile">Pridruži se serveru linkom pozivnice</string>
     <string name="join_server_button_cta_mobile_desc">Imaš li kôd ili link pozivnice? Ovdje ti treba baš to!</string>
     <string name="join_server_button_cta_named">Pridruži se %1$s</string>
-    <string name="join_server_description">Unesi instant pozivnicu ispod da bi se pridružio/la nekom serveru. Pozivnica će izgledati otprilike ovako:</string>
-    <string name="join_server_description_mobile">Unesi instantnu pozivnicu iznad za pridruživanje postojećem serveru.</string>
+    <string name="join_server_description">Unesi pozivnicu ispod da bi se pridružio/la nekom serveru. Pozivnica će izgledati otprilike ovako:</string>
+    <string name="join_server_description_mobile">Unesi pozivnicu iznad za pridruživanje postojećem serveru.</string>
     <string name="join_server_title">Pridruži se serveru</string>
     <string name="join_stream">Pridruži se streamu</string>
     <string name="join_video_call">Pridruži se video pozivu</string>
@@ -2168,13 +2145,11 @@ naše ažurirane Uvjete pružanja usluge i Pravila o zaštiti osobnih podataka."
     <string name="no_emoji_title">Nema emojia</string>
     <string name="no_input_devices">Nema ulaznih uređaja</string>
     <string name="no_input_devices_detected">Ulazni uređaji nisu prepoznati, molimo te da priključiš uređaj i pokušaš ponovno.</string>
-    <string name="no_instant_invite">Bez instant pozivnica</string>
-    <string name="no_integrations">[Poveži](onConnect) svoj Twitch ili You Tube Gaming račun kako bi tvojim pretplatnicima/sponzorima bile dodijeljene uloge</string>
+    <string name="no_instant_invite">Nema pozivnice</string>
     <string name="no_integrations_body">Protokol PR1J473LJ57V0 moguće je izvršiti samo iz Discord klijenta</string>
     <string name="no_integrations_label">Nema integracija</string>
-    <string name="no_invites_body">Osjećaš se besciljno? Kao papirnati avion koji pluta kroz nebo? Dovedi svoje prijatelje ovdje tako što ćeš napraviti instant pozivnicu!</string>
-    <string name="no_invites_caption">Trenutno nema izravnih pozivnica!</string>
-    <string name="no_invites_label">Trenutno nema izravnih pozivnica</string>
+    <string name="no_invites_caption">Za sada nema pozivnica!</string>
+    <string name="no_invites_label">Trenutno nema pozivnica</string>
     <string name="no_mail_account_description">Molimo, pošalji povratne informacije na support@discordapp.com. Mi smo već kopirali tvoje korisničke informacije u međuspremnik.</string>
     <string name="no_mail_account_title">Nema e-mail računa</string>
     <string name="no_mic_body">Upute za omogućivanje pristupa tvom mikrofonu možeš pronaći u Discord Centru za Pomoć.</string>
@@ -2191,7 +2166,6 @@ prikvačenu poruku… zasad."</string>
     <string name="no_reactions_header">Nema reakcija</string>
     <string name="no_recent_mentions">I na početku… bila je tišina.</string>
     <string name="no_send_messages_permission_placeholder">Nemaš dozvolu za slanje poruka u ovom kanalu.</string>
-    <string name="no_system_channel">Bez poruka za nove članove</string>
     <string name="no_text">Ne</string>
     <string name="no_thanks">Ne, hvala</string>
     <string name="no_user_limit">Neograničeno</string>
@@ -2203,7 +2177,6 @@ prikvačenu poruku… zasad."</string>
     <string name="note">Bilješka</string>
     <string name="note_placeholder">Klikni za dodavanje bilješke</string>
     <string name="note_placeholder_mobile">Dodirni za dodavanje nove bilješke</string>
-    <string name="notice_application_test_mode">Za **%1$s** je trenutno aktivno testiranje. Pojavit će se neobjavljeni SKU-ovi i neće ti se naplatiti nikakvi povezani troškovi.</string>
     <string name="notice_application_test_mode_go_to_listing">Idi na SKU</string>
     <string name="notice_connect_spotify">Poveži svoj Spotify račun kako bi prikazao/la svoju glazbu u svojem statusu!</string>
     <string name="notice_connection_conflict">Veza s tvojim glasom je prekinuta jer si se povezao/la na nekoj drugoj lokaciji.</string>
@@ -2214,7 +2187,6 @@ prikvačenu poruku… zasad."</string>
     <string name="notice_dispatch_error_disk_low">Nemaš dovoljno prostora na disku. Potrebno ti je %1$s, a imaš samo %2$s.</string>
     <string name="notice_dispatch_error_file_name_too_long">Ne, ne… Ova igra ima preduge nazive datoteka i Windowsi to ne mogu podnijeti. Odaberi instalacijski direktorij kraćeg imena.</string>
     <string name="notice_dispatch_error_invalid_drive">Ne ide. Neispravno je to mjesto gdje si rekao da instaliramo. Rekao si nam da stavimo u %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Nismo uspjeli ažurirati igru. Možda upravo radi?</string>
     <string name="notice_dispatch_error_no_manifests">Žao nam je, ali izgleda da nema sadržaja za ovu igru. Javi se podršci.</string>
     <string name="notice_dispatch_error_not_entitled">Ne, izgleda da nisi vlasnik ove igre. Ako misliš da to nije u redu, javi se podršci.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Izgleda da si skripti za instalaciju odgovorio neko „Ne“. Ako želiš da se igra instalira, trebaš reći da.</string>
@@ -2229,9 +2201,6 @@ prikvačenu poruku… zasad."</string>
     <string name="notice_native_apps">Želiš opciju Push to Talk koja radi na razini čitavog sustava? Skini aplikaciju za računalo!</string>
     <string name="notice_no_input_detected">Hm, izgleda da Discord ne čuje glas iz tvog mikrofona. Popravimo to… zajedno.</string>
     <string name="notice_no_input_detected_help_link_text">Pomoć!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Istekao ti je pristup za Nitro. Nadogradi s Nitro Classic na Nitro i imaš neograničen pristup nevjerojatnim igrama.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Nitro igre imaš još samo %1$s! Pristup će ti nestati dana **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Hvala što si od početka svim srcem uz Nitro! U znak zahvalnosti za te posebne zasluge, sada imaš pristup Nitro igrama do %1$s.</string>
     <string name="notice_premium_promo_action">Pogledaj ovo</string>
     <string name="notice_premium_promo_message">Podrži razvoj Discorda i dobij zabavne povlastice!</string>
     <string name="notice_scheduled_maintenance">Discord će provoditi planirano održavanje **%1$s** u **%2$s**.</string>
@@ -2301,7 +2270,6 @@ Jesi li primio/la link pozivnice od prijatelja? Unesi svoj link pozivnice ili k
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Prekrivanje omogućeno</string>
     <string name="nux_post_reg_join_server_description">Dobij najviše od Discorda pridruživanjem na server.</string>
     <string name="nux_post_reg_join_server_skip">Nemam ni jednu</string>
     <string name="nux_post_reg_join_server_title">Imaš li pozivnicu?</string>
@@ -2347,14 +2315,12 @@ Također, overlay možda neće raditi svakome. Ako imaš problema ili pitanja, p
     <string name="overlay_menu_get_invite">Uzmi link pozivnice</string>
     <string name="overlay_menu_open_discord">Otvori Discord</string>
     <string name="overlay_menu_switch_channels">Zamijeni kanale</string>
-    <string name="overlay_mobile_toggle_desc">Kad si spojen na zvuk, možeš vidjeti tko govori i pristupiti prečicama koristeći druge aplikacije</string>
     <string name="overlay_mobile_toggle_label">Omogući glasovno prekrivanje za mobitel</string>
     <string name="overlay_mobile_unauthed">Da bi da značajka bila omogućena, prijavi se u aplikaciju Discord.</string>
     <string name="overlay_news_go_live_body">Želiš li pustiti igru %1$s streamingom prijateljima na serveru %2$s?</string>
     <string name="overlay_news_text_pinning_body">Sada možeš pinati SMS chat u svojoj igri!</string>
     <string name="overlay_news_text_pinning_tip">Savjet: Možeš chat pinati tako da pritisneš $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Discord overlay je nadograđen</string>
-    <string name="overlay_no_results">Tražili smo okolo i naokolo. Nažalost, nismo našli nijedan glasovni kanal</string>
     <string name="overlay_notification_incoming_call">Dolazni poziv…</string>
     <string name="overlay_notification_settings_disabled">Obavijesti onemogućene</string>
     <string name="overlay_notification_settings_position">Prikazivanje: %1$s</string>
@@ -2364,7 +2330,6 @@ Također, overlay možda neće raditi svakome. Ako imaš problema ili pitanja, p
     <string name="overlay_notifications_settings">Obavijesti u overlayu</string>
     <string name="overlay_notifications_top_left">Gore lijevo</string>
     <string name="overlay_notifications_top_right">Gore desno</string>
-    <string name="overlay_private_channels_empty_state">Ne, ovdje izravnih poruka nema.</string>
     <string name="overlay_reload">Ponovo učitaj Overlay</string>
     <string name="overlay_settings">Postavke overlaya</string>
     <string name="overlay_settings_general_tab">Općenito</string>
@@ -2386,7 +2351,6 @@ Također, overlay možda neće raditi svakome. Ako imaš problema ili pitanja, p
     <string name="pagination_page_of">Stranica %1$s od %2$s</string>
     <string name="pagination_previous">Prethodni</string>
     <string name="paginator_of_pages">Stranica %1$s od %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Discord partner</string>
     <string name="party_full">Grupa je puna</string>
     <string name="party_join">Pridruži se grupi</string>
@@ -2479,18 +2443,11 @@ Također, overlay možda neće raditi svakome. Ako imaš problema ili pitanja, p
     <string name="popout_stay_on_top">Ostani gore</string>
     <string name="post_code">Poštanski broj</string>
     <string name="premium_alert_error_title">Ups, nešto je pošlo po zlu…</string>
-    <string name="premium_applications_grandfathered_monthly">U ime zahvale što podržavaš Discord, imaš pristup Nitro igrama godinu dana. Pristup imaš do **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">U ime zahvale što podržavaš Discord, imaš pristup Nitro igrama dvije godine. Pristup imaš do **%1$s**.</string>
-    <string name="premium_applications_subtitle">Neograničen pristup rastućoj biblioteci igara koje je kritika proslavila, a mi mislimo da ih ti i tvoji prijatelji trebate igrati.</string>
-    <string name="premium_applications_title">Desetine probranih igara. Neka mala mjesečna naplata.</string>
     <string name="premium_badge_tooltip">Pretplatnik od %1$s</string>
     <string name="premium_cancel_cancel">Ne</string>
     <string name="premium_cancel_confirm_body_tier_1">"Otkazivanje će stupiti na snagu na kraju tekućeg razdoblja naplate dana **%1$s**. Tvoj Discord Tag će biti nasumično odabran ako si ga mijenjao.
 
 Svoju pretplatu možeš obnoviti kada god ti srce želi."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Otkazivanje će stupiti na snagu na kraju tekućeg razdoblja naplate. Dana **%1$s** izgubit ćeš pristup svim Nitro igrama u svojoj biblioteci, a tvoj Discord Tag će biti randomiziran ako si ga promijenio.
-
-Čuvat ćemo tvoje datoteke u kojima si sejvao igre i tvoje zbukove za slučaj da se predomisliš. U bilo kojem se trenutku možeš pretplatiti ponovo!"</string>
     <string name="premium_cancel_confirm_new">Tako je, otkaži %1$s</string>
     <string name="premium_cancel_confirm_title">Otkazati %1$s?</string>
     <string name="premium_cancel_failed_body">Nismo bili u mogućnosti otkazati tvoju Nitro Pretplatu. Pokušaj ponovno ili se javi našem timu za podršku ukoliko se ovaj problem nastavi.</string>
@@ -2507,19 +2464,16 @@ Svoju pretplatu možeš obnoviti kada god ti srce želi."</string>
     <string name="premium_chat_perks_description_custom_emoji">Uzmi propusnicu za cijeli svijet kako bi mogao svoje prilagođene emojije koristiti posvuda.</string>
     <string name="premium_chat_perks_description_discriminator">Odaberi svoj tag koji vrijedi dok imaš pretplatu.</string>
     <string name="premium_chat_perks_description_screenshare">Unaprijedi svoje dijeljenje zaslona sa 720p 60fps ili 1080p 30fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Upload velikih datoteka – sada imaš %1$s umjesto ranijih %2$s kako bi mogao šerati kvalitetne memeove.</string>
+    <string name="premium_chat_perks_streaming_mobile">Bolji Go Live streamovi: streaming na izvoru uz Nitro ili čak do sjajnih 1080p na 60fps uz Nitro Classic</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Animirana zabava</string>
     <string name="premium_chat_perks_title_badge">Pokaži svima svoju podršku</string>
     <string name="premium_chat_perks_title_custom_emoji">Globalni prilagođeni emojiji</string>
     <string name="premium_chat_perks_title_discriminator">Prilagođeni Discord Tag</string>
     <string name="premium_chat_perks_title_screenshare">Video veće kvalitete</string>
+    <string name="premium_chat_perks_title_streaming">Bolji Go Live streamovi</string>
     <string name="premium_code_redemption_confirmation_blurb">Zahvaljujući nasumičnom nizu znamenki, sada imaš opake chat pogodnosti %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">To te ja pitam! :D</string>
-    <string name="premium_feature_new_chat_perks_header">Osim toga, dobit ćeš i neke posebno pojačane pogodnosti za chat:</string>
-    <string name="premium_feature_new_premium_applications_header">Preko %1$s vrijednosti u igrama. Pazi malo kakve sve imamo:</string>
-    <string name="premium_feature_view_applications">Pogledaj sve Nitro igre</string>
     <string name="premium_features_chat_perks">Chat pogodnosti</string>
-    <string name="premium_features_premium_applications">Besplatne igre</string>
     <string name="premium_grandfathered_warning_confirm">Učini to svejedno</string>
     <string name="premium_grandfathered_warning_title">Pazi malo, stari…</string>
     <string name="premium_info_monthly">%1$s i to na dan %2$s.</string>
@@ -2528,10 +2482,7 @@ Svoju pretplatu možeš obnoviti kada god ti srce želi."</string>
     <string name="premium_not_claimed">Najprije preuzmi svoj račun</string>
     <string name="premium_not_claimed_body">Čuj, stari! Ako želiš kupiti Nitro, prvo moraš uzeti svoj račun kako ne bi pogubio ono što imaš.</string>
     <string name="premium_not_verified">Prvo ovjeri svoju adresu e-pošte</string>
-    <string name="premium_not_verified_body">Čuj ovamo! Ako želiš kupiti Nitro, prvo moraš potvrditi svoju adresu e-pošte. Provjeri svoj inboks ili zatraži novi.</string>
-    <string name="premium_payment_applications_os_warning">Nitro igre podržane su samo na Windowsima.</string>
     <string name="premium_payment_confirmation_blurb_regular">Od sada imaš moć unaprijeđenih chat pogodnosti. Nema smisla ovo čitati, rađe odi chatati.</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Imaš neograničen pristup tolikim genijalnim igrama. Prestani čitati ovo i idi igraj se malo!</string>
     <string name="premium_payment_confirmation_button_regular">K, zvuči dobro</string>
     <string name="premium_plan_month">Nitro mjesečno</string>
     <string name="premium_plan_month_tier_1">Nitro Classic mjesečno</string>
@@ -2552,13 +2503,10 @@ Također ćemo izračunati koliko proporcionalno otpada na tvoj sadašnji plan p
     <string name="premium_upgrade_disabled_current_tooltip">Tvoj sadašnji plan pretplate.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Morat ćeš prvo otkazati i pričekati da istekne tvoja pretplata prije nego odabereš plan niže razine.</string>
     <string name="premium_upgrade_done_body_tier_1">Sada imaš jači chat – chat pogodnosti.</string>
-    <string name="premium_upgrade_done_body_tier_2">Sad imaš poboljšane chat perks i pristup desecima igara.</string>
     <string name="premium_upgrade_done_button_tier_1">Slatko!</string>
-    <string name="premium_upgrade_done_button_tier_2">Pogledaj sve Nitro igre</string>
     <string name="premium_upgrade_failed_body">Uhh.. Nadogradnja nije uspjela. Provjeri jesu li podaci o plaćanju ažurirani pa pokušaj ponovno.</string>
     <string name="premium_upload_promo">Nadogradi na Discord Nitro za %1$s limit datoteke</string>
     <string name="premium_year_free_months">Dobij 2 mjeseca besplatno!</string>
-    <string name="premium_year_free_months_short">Dva mjeseca besplatno</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** godišnje</string>
     <string name="preview_chat">Pregledaj chat</string>
     <string name="priority_speaker">Prioritetni zvučnik</string>
@@ -2733,7 +2681,7 @@ Ako ping nije ujednačen ili je više od %5$s ms, treba razmisliti o tome da pit
     <string name="scope_guilds">Treba znati na kojim si serverima</string>
     <string name="scope_guilds_empty">Nisi u nijednom serveru.</string>
     <string name="scope_guilds_join">Pridruživanje serverima umjesto tebe</string>
-    <string name="scope_guilds_join_description">Korištenje instant pozivnica u tvoje ime.</string>
+    <string name="scope_guilds_join_description">Upotreba pozivnica u tvoje ime.</string>
     <string name="scope_identify">Pristup tvom korisničkom imenu i avataru</string>
     <string name="scope_messages_read">Čitanje svih poruka</string>
     <string name="scope_messages_read_description">Ovime dozvoljavaš aplikaciji čitanje svih poruka dostupnih kroz tvoj Discord račun</string>
@@ -2801,7 +2749,6 @@ Odaberi koji zaslon želiš podijeliti."</string>
     <string name="search_filter_on">dana</string>
     <string name="search_for_emoji">Pronađi savršen emoji</string>
     <string name="search_for_empty">Traži</string>
-    <string name="search_for_value">Traži: **%1$s**</string>
     <string name="search_group_header_channels">U kanalu</string>
     <string name="search_group_header_dates">Datumi</string>
     <string name="search_group_header_file_name">Naziv datoteke sadrži</string>
@@ -3002,15 +2949,12 @@ Odaberi koji zaslon želiš podijeliti."</string>
     <string name="stop_ringing">Prestani zvati</string>
     <string name="stop_streaming">Zaustavi streaming</string>
     <string name="stop_watching">Prestani gledanje</string>
-    <string name="store_payment_legalese_monthly">Hej! Kupiš li %1$s, prihvaćaš naše [Uvjete Pružanja Usluge za Discord Store](%2$s). Pretplata na %1$s se automatski obnavlja, što znači da ćemo ti naplatiti danas i nastavit ćemo ti naplaćivati mjesečno sve dok ne otkažeš svoju pretplatu. Pretplatu možeš uvijek otkazati na svojem zaslonu Korisničkih Postavki.</string>
-    <string name="store_payment_legalese_yearly">Hej! Kupiš li %1$s, prihvaćaš naše [Uvjete Pružanja Usluge za Discord Store](%2$s). Pretplata na %1$s se automatski obnavlja, što znači da ćemo ti naplatiti danas i nastavit ćemo ti naplaćivati godišnje sve dok ne otkažeš svoju pretplatu. Pretplatu možeš uvijek otkazati na svojem zaslonu Korisničkih Postavki.</string>
     <string name="stream_bad_spectator">Stream kojeg gledaš ima smanjenu kvalitetu slike ili zvuka. To može biti zbog stanja mreže.</string>
     <string name="stream_bad_streamer">Tvoj stream trenutno ima smanjenu kvalitetu slike ili zvuka. To može biti zbog stanja mreže.</string>
     <string name="stream_capture_paused">Stream pauziran</string>
     <string name="stream_capture_paused_details">Zamijeni svoju igru da bi nastavio.</string>
     <string name="stream_capture_paused_details_viewer">%1$s je minimizirao ili minimizirala igru. Ček’ malo!</string>
     <string name="stream_channel_description">Članovi s ovom dozvolom mogu pustiti stream kroz ovaj kanal.</string>
-    <string name="stream_description">Članovi s ovom dozvolom mogu u ovom kanalu.</string>
     <string name="stream_ended">Stream je gotov. *cvrče cvrčci*</string>
     <string name="stream_ended_button">Stream je završen</string>
     <string name="stream_ended_no_spectators">Nema gledatelja jer je stream ionako gotov.</string>
@@ -3050,7 +2994,6 @@ Odaberi koji zaslon želiš podijeliti."</string>
     <string name="stream_report_rating_body_streamer">Reci nam svoje dojmove o streamingu.</string>
     <string name="stream_report_submit">Pošalji</string>
     <string name="stream_reported">Povratna informacija je poslana</string>
-    <string name="stream_reported_body">Hvala na prijavi problema! Povratne informacije će nam pomoći da poboljšamo streaming.</string>
     <string name="stream_soundshare_failed">Čuj, nešto nije kako treba pa stream tvoje igre nema zvuka.</string>
     <string name="streamer_mode">Streamer način rada</string>
     <string name="streamer_mode_enabled">Streamer Mode uključen</string>
@@ -3107,7 +3050,6 @@ Odaberi koji zaslon želiš podijeliti."</string>
     <string name="system_message_guild_member_join_10">Divlji %1$s se pojavio/la.</string>
     <string name="system_message_guild_member_join_11">Zuuuum. %1$s se upravo prizemljio/la.</string>
     <string name="system_message_guild_member_join_12">Držite se. %1$s se upravo pridružio/la serveru.</string>
-    <string name="system_message_guild_member_join_13">%1$s se upravo pridružio/la. Sakrijte banane.</string>
     <string name="system_message_guild_member_join_14">%1$s je upravo stigao/la. Izgleda premoćno - oslabite ga/ju.</string>
     <string name="system_message_guild_member_join_15">%1$s je upravo doklizao/la na server.</string>
     <string name="system_message_guild_member_join_16">%1$s se stvorio/la na serveru.</string>
@@ -3119,7 +3061,6 @@ Odaberi koji zaslon želiš podijeliti."</string>
     <string name="system_message_guild_member_join_22">To je ptica! To je avion! Ipak ne, to je samo %1$s.</string>
     <string name="system_message_guild_member_join_23">To je %1$s! O, nije li to fantastično! \\\\[T]/</string>
     <string name="system_message_guild_member_join_24">Evo %1$s, evo ludila. %1$s izlazi, izlazim i ja.</string>
-    <string name="system_message_guild_member_join_25">Ha! %1$s se pridružio/la! Aktivirao/la si moju neotkrivenu kartu!</string>
     <string name="system_message_guild_member_join_26">Hej, ljubavi! %1$s je tu!</string>
     <string name="system_message_guild_member_join_27">Hej! Slušaj! %1$s se pridružio/la!</string>
     <string name="system_message_guild_member_join_28">%1$s, očekivali smo te</string>
@@ -3267,7 +3208,6 @@ Potreban ti je preuzet račun za **preuzimanje aplikacija**."</string>
     <string name="unsupported_browser">Nepodržani preglednik</string>
     <string name="unsupported_browser_body">"Izgleda da koristiš nepodržani preglednik. Da bi iskusio/la sve što ti Discord pruža, nadogradi svoj
 preglednik ili preuzmi jednu od naših aplikacija."</string>
-    <string name="unsupported_browser_details">Želiš razgovarati sa svojim timom? Prebaci se na najnoviji Chrome, Operu, Firefox 38+ ili preuzmi Discord aplikaciju i odmah počni razgovarati!</string>
     <string name="unsupported_browser_title">Ups, ovo je neugodno</string>
     <string name="unverified_account_body">"Molimo provjeri svoj e-mail i slijedi upute kako bi ga potvrdio/la.
 Ako nisi dobio/la e-mail ili je istekao, [klikni ovdje](onResendClick) kako bi ga ponovno poslali."</string>
@@ -3384,8 +3324,6 @@ Drži shift za izravan prijenos."</string>
     <string name="user_settings_appearance_preview_message_4">Netko uključiti kompaktan način</string>
     <string name="user_settings_appearance_preview_message_5">Oh, ovdje je!</string>
     <string name="user_settings_appearance_zoom_tip">Možeš promijeniti razinu zumiranja s %1$s +/- i vratiti na zadani zoom s %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Prikaži karticu Igre</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Isključi ovo da bi sakrio karticu s igrama kako bi tvoji razgovori bili u centru pažnje.</string>
     <string name="user_settings_close_button">Gumb za zatvaranje</string>
     <string name="user_settings_confirm_logout">Jesi li siguran/na da se želiš odjaviti?</string>
     <string name="user_settings_game_activity">Aktivnost u igri</string>
@@ -3443,8 +3381,6 @@ Samo znaj da će tako tvoj server biti javno dostupan svima koji će koristiti o
     <string name="vanity_url_hint_mobile">tvoj-url-ovdje</string>
     <string name="verfication_expired">Istekao je link za potvrdu e-maila.</string>
     <string name="verfication_expired_suggestion">Molimo prijavi se na Discord te ponovno pošalji link</string>
-    <string name="verification_body">"Primijetili smo nešto čudno.
-Ukoliko želiš nastaviti s korištenjem Discorda, **morat ćeš potvrditi da si čovjek.**"</string>
     <string name="verification_body_alt">A sad, ajmo potvrditi da si čovjek…</string>
     <string name="verification_email_body">Poslali smo ti novi potvrdni email na **%1$s**, molimo provjeri svoj pretinac ulazne i neželjene pošte.</string>
     <string name="verification_email_error_body">Došlo je do greške pri slanju emaila s potvrdom. Pokušaj ponovno kasnije ili kontaktiraj podršku.</string>
@@ -3483,8 +3419,6 @@ Ukoliko želiš nastaviti s korištenjem Discorda, **morat ćeš potvrditi da si
     <string name="verify_phone">Potvrdi telefon</string>
     <string name="verifying">Potvrđivanje</string>
     <string name="video_call">Video poziv</string>
-    <string name="video_poor_connection_body">Video je onemogućen. Nastavit će se kad ti se veza poboljša.</string>
-    <string name="video_poor_connection_title">Slaba veza</string>
     <string name="video_preview">Pretpregled videozapisa</string>
     <string name="video_settings">Postavke videa</string>
     <string name="video_unavailable">Video nije dostupan</string>
diff --git a/com.discord/res/values-hu/plurals.xml b/com.discord/res/values-hu/plurals.xml
index 1eb4dd4f2d..5f229fdc24 100644
--- a/com.discord/res/values-hu/plurals.xml
+++ b/com.discord/res/values-hu/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">nincs hely</item>
         <item quantity="one">%d hely</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d napja</item>
-        <item quantity="one">1 napja</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d tagot</item>
-        <item quantity="zero">0 tagot</item>
-        <item quantity="one">1 tagot</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">napja</item>
         <item quantity="one">napja</item>
@@ -212,16 +203,6 @@
         <item quantity="other">jogosultságot</item>
         <item quantity="one">egy jogosultságot</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Lassított mód beállítása **!!%d!! másodpercre**</item>
-        <item quantity="zero">Letiltott lassított mód</item>
-        <item quantity="one">Lassított mód beállítása **1 másodpercre**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Lassított mód beállítása **!!%d!! másodpercre**</item>
-        <item quantity="zero">Lassított mód beállítása letiltottra</item>
-        <item quantity="one">Lassított mód beállítása **1 másodpercre**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! taggal**</item>
         <item quantity="one">**egy taggal**</item>
@@ -321,10 +302,6 @@
         <item quantity="other">%d új üzenet</item>
         <item quantity="one">1 új üzenet</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d napod</item>
-        <item quantity="one">egy napod</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d csatorna</item>
         <item quantity="one">%d csatorna</item>
diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml
index 3ed4e19ec8..c80549e1a6 100644
--- a/com.discord/res/values-hu/strings.xml
+++ b/com.discord/res/values-hu/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"Nem tudsz meghívót küldeni, mert láthatatlan vagy, vagy elrejted a játszási állapotodat. Ha nem szeretnéd megváltoztatni
 a beállításaidat, akkor helyette valaki meghívhat."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Megértettem!</string>
-    <string name="activity_panel_go_live_hotspot_header">Indíts élő közvetítést a játékmenetről közvetlenül barátaidnak!</string>
+    <string name="activity_panel_go_live_hotspot_header">Indíts Go Live közvetítést a játékmenetről közvetlenül barátaidnak!</string>
     <string name="activity_panel_go_live_tooltip">Élő közvetítés</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Ezen a szerveren nincs olyan hangcsatorna, amelybe élő közvetítés indítható.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Nem tudsz közvetíteni ebbe a hangcsatornába.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Navigálj egy szerverre az élő közvetítés elindításához.</string>
     <string name="add">Hozzáadás</string>
     <string name="add_a_comment_optional">Megjegyzés (nem kötelező)</string>
@@ -158,7 +156,6 @@ ad."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Megkaptad!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Ugrás a könyvtárba</string>
     <string name="application_entitlement_code_redemption_invalid">Érvénytelen megadott kód</string>
-    <string name="application_entitlement_code_redemption_prompt">Kaptál egy kódot egy játékhoz? Add meg alább:</string>
     <string name="application_entitlement_code_redemption_redeem">Beváltás</string>
     <string name="application_filter_name_linux">Minden fájl</string>
     <string name="application_filter_name_macos">Alkalmazások</string>
@@ -406,7 +403,6 @@ ad."</string>
     <string name="application_store_view_all_news">Az összes hír megjelenítése</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Ez a DLC megköveteli, hogy legyen saját %1$s a Discordon a játékhoz. [További információ a DLC-ről.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Letölthető tartalom</string>
-    <string name="application_store_warning_early_access_description">Ez a játék szórakoztató (úgy gondoljuk!), de korlátozott tartalma, különféle hibái lehetnek vagy hiányosnak tűnhet. [További információ a korai hozzáférésről.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Korai hozzáférés</string>
     <string name="application_store_warning_requires_desktop_app_description">A játék játszásához telepítve kell lennie a következőnek Discord $[asztali alkalmazás](downloadHook).</string>
     <string name="application_store_warning_requires_desktop_app_title">Asztali alkalmazás szükséges</string>
@@ -529,7 +525,6 @@ de amennyiben majd szükséges lesz, ne töprengj sokat rajta."</string>
     <string name="billing_error_section_address">Ó! Úgy néz ki, valami gond van ezzel a címmel. Kérjük, javítsd ki a mezőben levő hibát és próbáld újra!</string>
     <string name="billing_error_section_card">Ó! Úgy néz ki, valami gond van ezzel a kártyával. Kérjük, javítsd ki a mezőkben levő hibákat és próbáld újra!</string>
     <string name="billing_history">Számlázási előzmények</string>
-    <string name="billing_legal_mumbo_jumbo_label">Elfogadom a [Discord áruház általános szerződési feltételeit](%1$s)</string>
     <string name="billing_no_payment_method">Nincs mentett fizetési mód</string>
     <string name="billing_no_payment_method_description">Gyorsabb a fizetés a mentett fizetési móddal</string>
     <string name="billing_pay_for_it_with">Fizetés ezzel:</string>
@@ -537,12 +532,7 @@ de amennyiben majd szükséges lesz, ne töprengj sokat rajta."</string>
     <string name="billing_payment_breakdown_total">Teljes összes</string>
     <string name="billing_payment_history">Vásárlás részletei</string>
     <string name="billing_payment_premium">Az előfizetésed</string>
-    <string name="billing_payment_premium_legalese_monthly">A(z) %1$s előfizetés megvásárlásával elfogadod a következőt: [Áruház általános szerződési feltételek](%2$s). A(z) %1$s egy automatikus megújuló előfizetés. Felhatalmazod a Discordot, hogy a megadott fizetési móddal azonnal beterhelje a(z) %3$s összeget, és ezt ezután havonta automatikusan megtegye, amíg le nem mondod. Bármikor lemondhatod.</string>
-    <string name="billing_payment_premium_legalese_yearly">A(z) %1$s előfizetés megvásárlásával elfogadod a következőt: [Áruház általános szerződési feltételek](%2$s). A(z) %1$s egy automatikus megújuló előfizetés. Felhatalmazod a Discordot, hogy a megadott fizetési móddal azonnal beterhelje a(z) %3$s összeget, és ezt ezután évente automatikusan megtegye, amíg le nem mondod. Bármikor lemondhatod.</string>
     <string name="billing_payment_sources">Fizetési módok</string>
-    <string name="billing_payment_table_header_amount">ÖSSZEG</string>
-    <string name="billing_payment_table_header_date">DÁTUM</string>
-    <string name="billing_payment_table_header_description">LEÍRÁS</string>
     <string name="billing_premium_refund_text">Visszatérítés akkor igényelhető, ha a vásárlás az utóbbi %1$s napban történt. [A barátságos ügyfélszolgálatunk segít, hogy visszaszerezd a pénzed.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Sajnáljuk, erre a vásárlásra visszatérítés nem igényelhető. Visszatérítés akkor igényelhető, ha a vásárlás az utóbbi %1$s napban történt.</string>
     <string name="billing_price_per_month">%1$s / hónap</string>
@@ -552,9 +542,7 @@ de amennyiben majd szükséges lesz, ne töprengj sokat rajta."</string>
     <string name="billing_purchase_details_header">A vásárlás részletei</string>
     <string name="billing_refund_header">Problémák a vásárlásnál?</string>
     <string name="billing_refund_play_time_never_played">Sohasem játszott</string>
-    <string name="billing_refund_play_time_subheader">JÁTSZOTT IDŐ</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">VÁSÁRLÁS DÁTUMA</string>
     <string name="billing_refund_report_a_problem">Probléma bejelentése</string>
     <string name="billing_refund_request_button">Visszatérítés igénylése</string>
     <string name="billing_sales_tax_added">%1$s forgalmi adó lett felszámolva a számlázási cím miatt.</string>
@@ -716,18 +704,10 @@ Egyedi URL-ek csak betűket, számokat és kötőjeleket tartalmazhatnak."</stri
     <string name="close_stream">Élő közvetítés bezárása</string>
     <string name="close_window">Ablak bezárása</string>
     <string name="cloud_sync_icon_tooltip_done">Felhő mentés szinkronizálás kész</string>
-    <string name="cloud_sync_icon_tooltip_planning">Felhő mentések ellenőrzése</string>
-    <string name="cloud_sync_icon_tooltip_preparing">Felhő mentések előkészítése</string>
-    <string name="cloud_sync_icon_tooltip_pulling">Felhő mentések letöltése</string>
-    <string name="cloud_sync_icon_tooltip_pushing">Felhő mentések feltöltése</string>
-    <string name="cloud_sync_icon_tooltip_supported">Felhő mentések támogatása</string>
-    <string name="cloud_sync_modal_conflict_choice_download">Felhő mentések letöltése</string>
     <string name="cloud_sync_modal_conflict_choice_upload">Helyi mentések feltöltése</string>
     <string name="cloud_sync_modal_conflict_description">A helyi mentésű fájlok ütköznek a felhő mentésű fájlokkal a következőben: **%1$s**. A játék elindítása előtt válaszd ki, melyik mentést szeretnéd használni.</string>
     <string name="cloud_sync_modal_conflict_header">Felhő mentési ütközés</string>
     <string name="cloud_sync_modal_conflict_last_modified">Utoljára módosítva:</string>
-    <string name="cloud_sync_modal_error_description">Egy probléma megakadályozza, hogy a Discord szinkronizálja a felhő mentéseket a következőhöz: **%1$s.** Mindenképpen játszani szeretnél?</string>
-    <string name="cloud_sync_modal_error_header">Nem lehet szinkronizálni a felhő mentéseket</string>
     <string name="cloud_sync_modal_or">VAGY</string>
     <string name="collapse_category">Kategória becsukása</string>
     <string name="coming_soon">Hamarosan</string>
@@ -793,7 +773,6 @@ a lenti, egészen aprócska szövegre kattintva."</string>
     <string name="connection_enter_code">Írd be a kódot, ahogy megjelenik a kijelződön</string>
     <string name="connection_invalid_pin">Érvénytelen PIN-kód</string>
     <string name="connection_login_with">vagy jelentkezz be ezzel:</string>
-    <string name="connection_problems_body">Ellenőrizd [szerver állapota](%1$s) vagy tweetelj [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Hitelesítés</string>
     <string name="connection_status_awaiting_endpoint">Várakozás végpontra</string>
     <string name="connection_status_connected">Csatlakozva</string>
@@ -838,7 +817,7 @@ a lenti, egészen aprócska szövegre kattintva."</string>
     <string name="create_category">Kategória létrehozása</string>
     <string name="create_channel">Csatorna létrehozása</string>
     <string name="create_group_dm">Csoportos közvetlen üzenet létrehozása</string>
-    <string name="create_instant_invite">Azonnali meghívó létrehozása</string>
+    <string name="create_instant_invite">Meghívó létrehozása</string>
     <string name="create_link">Link létrehozása</string>
     <string name="create_or_join_modal_header">Na, még egy szerver?</string>
     <string name="create_server_button_body">Készíts egy szervert, és hívd meg a barátaidat. Ingyen van!</string>
@@ -953,7 +932,6 @@ a lenti, egészen aprócska szövegre kattintva."</string>
     <string name="disable_email_notifications_failed_suggestion">Az e-mail értesítések valószínűleg már le vannak tiltva, vagy ez az e-mail már nincs hozzácsatolva a Discord-fiókodhoz.</string>
     <string name="disable_integration_title">Szinkronizálás kikapcsolása</string>
     <string name="disable_integration_twitch_body">A szinkronizálás kikapcsolása az összes előfizetést elavultnak fogja tekinteni, mint a kiválasztott lejárt előfizetést.</string>
-    <string name="disable_integration_youtube_body">A szinkronizálás kikapcsolása az összes szponzort elavultnak fogja tekinteni, mint a kiválasztott lejárt szponzort.</string>
     <string name="disable_notifications_description">Minden asztali értesítést ki lesz kapcsolva.</string>
     <string name="disable_notifications_label">Értesítések kikapcsolása</string>
     <string name="disable_sounds_description">Az összes hangeffekt ki lesz kapcsolva.</string>
@@ -970,7 +948,6 @@ a lenti, egészen aprócska szövegre kattintva."</string>
     <string name="discord_desc_short">Csapatos hang- és szöveges chat</string>
     <string name="discord_rich_presence">Rich Presence engedélyezése</string>
     <string name="dismiss">Elvetés</string>
-    <string name="dispatch_error_modal_body">Valami rosszul ment. Ha a probléma továbbra is fennáll, hozz létre egy ügyfélszolgálati bejegyzést és másold bele az alábbi üzenet tartalmát.</string>
     <string name="dispatch_error_modal_error_label">Hibaüzenet (másolj és illessz be engem)</string>
     <string name="dispatch_error_modal_header">Discord Dispatch hiba</string>
     <string name="dispatch_error_modal_open_ticket">Nyiss egy bejegyzést</string>
@@ -1081,7 +1058,7 @@ a lenti, egészen aprócska szövegre kattintva."</string>
     <string name="failed">Sikertelen</string>
     <string name="fcm_fallback_notification_channel_label">Egyéb</string>
     <string name="fi">Finn</string>
-    <string name="file_upload_limit_premium">50 MB</string>
+    <string name="file_upload_limit_premium_tier_1">50 MB</string>
     <string name="file_upload_limit_standard">8 MB</string>
     <string name="filter">Szűrés</string>
     <string name="filter_mentions">Említések szűrése</string>
@@ -1103,8 +1080,6 @@ mint az AFK-időkorlát. Ez nem befolyásolja a böngészőket."</string>
     <string name="form_help_attenuation">"Halkíts le más alkalmazásokat ennyi százalékkal amikor valaki beszél.
 Állítsd 0%%-ra, hogy kikapcsold."</string>
     <string name="form_help_automatic_vad">Ha a jelzés folytonos zöld, akkor a Discord közvetíti a gyönyörű hangodat.</string>
-    <string name="form_help_bitrate">"**MINDEN BIT SZÁMÍT!** %1$skbps fölé nem ajánlott állítani (kivéve, ha audiofil vagy), mert ez negatívan érintheti
-azokat, akik mobil eszközöket használnak, vagy lassú a kapcsolatuk, ráadásul észrevehető előnyt sem nyújt."</string>
     <string name="form_help_certified_voice_processing">"Ha egy Discord által támogatott mikrofont használsz, bizonyos hangfeldolgozási műveleteket nem a Discord, hanem a mikrofon
 végez el."</string>
     <string name="form_help_channel_permissions">Rangok választásával automatikusan alapértelmezett jogosultságok kerülnek erre a csatornára.</string>
@@ -1117,11 +1092,6 @@ esetén, hogy elkerüld [ezt a szituációt](%1$s).**"</string>
 vonatkozó értékeket az értesítési beállításaikban. Erősen ajánljuk, hogy nyilvános Discord-szerveren csak @említésekre legyen ez beállítva"</string>
     <string name="form_help_explicit_content_filter">"Automatikusan ellenőrzi és törli a szerveren azokat az üzeneteket, amelyek korhatáros tartalommal rendelkeznek. Kérlek, válaszd
 ki, milyen széles körben vonatkozzon ez a szűrő a szervered tagjaira. **Nyilvános Discord-szervereken célszerű szűrőt használni.**"</string>
-    <string name="form_help_instant_invite_channel">"Csatorna kiválasztásakor a widget segítségével létrejön egy Azonnali meghívó,
-máskülönben csak az online tagok és hangcsatornák lesznek megadva."</string>
-    <string name="form_help_last_seen">"A ritkítás **%1$s** fog kirúgni, aki(k)
-már **%2$s** nem lépett/tek be a szerverre és nem kapott/tak valamilyen rangot. Ez(ek) a tag(ok) újra csatlakozhat(nak) a
-szerverhez egy Azonnali meghívóval."</string>
     <string name="form_help_legacy_subsystem">"Bizonyos hardver-illesztőprogramoknál problémák merülhetnek fel, ha az operációs rendszered modern hangalrendszerét használja.
 Pipáld ki ezt az opciót a régi hangalrendszer használatához."</string>
     <string name="form_help_nsfw">"A csatorna megtekintéséhez a felhasználónak meg kell erősítenie azt, hogy nagykorú.
@@ -1131,7 +1101,6 @@ Ha eléred az oldalad felhasználóit, akkor hozzáadhatod a &amp;username= para
     <string name="form_help_qos">"Tudatja a routereddel, hogy a Discord csomagjai kiemelt fontosságúak.
 Néhány router és internet szolgáltató rosszul működhet, ha ez be van állítva."</string>
     <string name="form_help_slowmode">A tagok korlátozva lesznek csak egy üzenet küldésére ezen a intervallumon belül, hacsak nem rendelkeznek Csatornák kezelése vagy Üzenetek kezelése engedéllyel.</string>
-    <string name="form_help_system_channel">Üzenet küldése ebbe a csatornába, amikor valaki csatlakozik a szerverhez. Ezek az üzenetek véletlenszerűek. Ez bármikor kikapcsolható.</string>
     <string name="form_help_temporary">A tagok automatikusan ki lesznek rúgva lecsatlakoztatáskor, ha nem kapnak rangot.</string>
     <string name="form_help_user_limit">"Megadja, hogy hány felhasználó csatlakozhat a hangcsatornához. A **Tagok áthelyezése** jogosultsággal rendelkező felhasználók
 a korlátot figyelmen kívül hagyva is áthelyezhetnek a csatornába más felhasználókat."</string>
@@ -1176,8 +1145,8 @@ közvetlen üzenet beszélgetést indíthassanak. Ez nem érvényes olyan tagokr
     <string name="form_label_input_mode">Beviteli mód</string>
     <string name="form_label_input_sensitivty">Bemeneti érzékenység</string>
     <string name="form_label_input_volume">Bemeneti hangerő</string>
-    <string name="form_label_instant_invite">Azonnali meghívó megadása</string>
-    <string name="form_label_instant_invite_channel">Azonnali meghívó csatorna</string>
+    <string name="form_label_instant_invite">Meghívó megadása</string>
+    <string name="form_label_instant_invite_channel">Csatorna meghívója</string>
     <string name="form_label_last_seen">Utoljára aktív</string>
     <string name="form_label_local_mute">Helyi némítás</string>
     <string name="form_label_max_age">Lejárat</string>
@@ -1245,7 +1214,6 @@ közvetlen üzenet beszélgetést indíthassanak. Ez nem érvényes olyan tagokr
     <string name="form_label_suppress_everyone">**@everyone** és **@here** némítása</string>
     <string name="form_label_synced_role">Szinkronizált rang</string>
     <string name="form_label_synced_subs">Szinkronizált előfizetők</string>
-    <string name="form_label_system_channel">Új tag üzenetek csatornája</string>
     <string name="form_label_temporary">Ideiglenes tagság</string>
     <string name="form_label_tts">Szöveg beszéddé alakítása</string>
     <string name="form_label_tts_notifications">Szöveg beszéddé alakítása értesítések</string>
@@ -1308,7 +1276,6 @@ Köszönjük, hogy fenntartjátok a rendet."</string>
     <string name="game_action_button_game_not_detected">A játék nem lett észlelve</string>
     <string name="game_action_button_install">Telepítés</string>
     <string name="game_action_button_locate">Keresés</string>
-    <string name="game_action_button_login_to_buy">Jelentkezz be a vásárláshoz</string>
     <string name="game_action_button_now_playing">Most játszott</string>
     <string name="game_action_button_paused">Szüneteltetve</string>
     <string name="game_action_button_play">Játszás</string>
@@ -1347,7 +1314,6 @@ Köszönjük, hogy fenntartjátok a rendet."</string>
     <string name="game_feed_activity_recently_played">Nemrég játszott</string>
     <string name="game_feed_activity_streaming_twitch">Twitchen közvetít</string>
     <string name="game_feed_current_header_title">Most játszott</string>
-    <string name="game_feed_settings_visibility">Mutatás a Játékok lapon</string>
     <string name="game_feed_unknown_player">Ismeretlen játékos</string>
     <string name="game_feed_user_played_days_ago">%1$s %2$s játszott</string>
     <string name="game_feed_user_played_hours_ago">%1$s %2$s játszott</string>
@@ -1415,6 +1381,7 @@ Köszönjük, hogy fenntartjátok a rendet."</string>
     <string name="generate_a_new_link">Új link generálása</string>
     <string name="get_started">Vágjunk bele</string>
     <string name="gif_auto_play_label">GIF-ek automatikus lejátszása, amikor a Discord van előtérben.</string>
+    <string name="go_live_hardware_acceleration_unavailable">Gyors helyzetjelentés: nem érzékelünk hardveres gyorsítást. A számítógépen probléma lehet a Go Live támogatásával.</string>
     <string name="go_live_hey">Szia!</string>
     <string name="go_live_listen">Hallgasd!</string>
     <string name="go_live_look">Nézd!</string>
@@ -1428,6 +1395,7 @@ Köszönjük, hogy fenntartjátok a rendet."</string>
     <string name="go_live_modal_select_channel_form_title">Hangcsatorna választása</string>
     <string name="go_live_modal_select_channel_placeholder">Hangcsatornák keresése</string>
     <string name="go_live_modal_title">Élő közvetítés</string>
+    <string name="go_live_video_drivers_outdated">A videókártya meghajtóprogramok régiek. Frissítsd ezeket a jobb Go Live közvetítési élményhez.</string>
     <string name="grant_temporary_membership">Ideiglenes tagság biztosítása</string>
     <string name="group">Csoport</string>
     <string name="group_dm_add_friends">Barátok hozzáadása a csoporthoz</string>
@@ -1504,8 +1472,6 @@ Köszönjük, hogy fenntartjátok a rendet."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**%1$s** %2$s **kapott**</string>
     <string name="guild_settings_audit_log_channel_position_change">Áthelyezve innen: **%1$s** ide: **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">**%1$s** pozícióban</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) létrehozott egy szöveges csatornát: $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Téma megváltoztatva erre: **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Téma beállítva erre: **%1$s**</string>
@@ -1600,6 +1566,8 @@ Köszönjük, hogy fenntartjátok a rendet."</string>
     <string name="guild_settings_filter_all_actions">Minden művelet</string>
     <string name="guild_settings_filter_all_users">Minden felhasználó</string>
     <string name="guild_settings_filter_user">Felhasználó szerinti szűrés</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">720p 60fps Go Live közvetítések</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">1080p 60fps Go Live közvetítések</string>
     <string name="guild_settings_label_audit_log">Vizsgálati napló</string>
     <string name="guild_settings_label_audit_log_empty_body">Amint a moderátorok megkezdik a moderálást, itt moderálhatod a moderálást.</string>
     <string name="guild_settings_label_audit_log_empty_title">Még nem található tevékenységnapló</string>
@@ -1631,7 +1599,7 @@ Ha eléred az oldalad felhasználóit, akkor hozzáadhatod a &amp;username= rés
     <string name="help_role_locked_mine">A rang zárolva van, mert ez a legmagasabb rangod. Kérj segítséget egy magasabb rangú felhasználótól, vagy a szerver tulajdonosától.</string>
     <string name="help_singular_permission">Nem tudod módosítani ezt a jogosultságot, mert az eltávolításával rólad is lekerülne.</string>
     <string name="hide_instant_invites_description">Célszerű, ha nem szeretnéd idegenekkel megosztani a Discord-szervereidet.</string>
-    <string name="hide_instant_invites_label">Azonnali meghívók linkjeinek elrejtése</string>
+    <string name="hide_instant_invites_label">Meghívó linkek elrejtése</string>
     <string name="hide_muted">Némítottak %1$s elrejtése</string>
     <string name="hide_muted_channels">Némított csatornák elrejtése</string>
     <string name="hide_personal_information_description">Elrejti az e-mail címet, csatlakoztatott fiókokat, jegyzeteket, és anonimizálja a DiscordTaget.</string>
@@ -1681,7 +1649,6 @@ Ha eléred az oldalad felhasználóit, akkor hozzáadhatod a &amp;username= rés
     <string name="hypesquad_question_11_response_d">Azt javaslod, hogy Wumpus inkább a tamburinon játsszon</string>
     <string name="hypesquad_question_12_prompt">A legmagasabb hegy csúcsa felé törsz, és csak egyetlen dolog választ el a gazdagságtól: a torony előtted álló háromfejű sárkánya. Erre te:</string>
     <string name="hypesquad_question_12_response_a">Harcolsz</string>
-    <string name="hypesquad_question_12_response_b">Tanulásként megnézed Godzilla mozgását a Ghidorah király elleni harcban</string>
     <string name="hypesquad_question_12_response_c">Megpróbálod meggyőzni a sárkányt, hogy ossza meg veled a gazdagságot</string>
     <string name="hypesquad_question_12_response_d">Felajánlasz a sárkánynak egy Wumpus-plüssjátékot, miért pont ő ne szeretne egyet?</string>
     <string name="hypesquad_question_13_prompt">Mi ez a hang?:</string>
@@ -1782,14 +1749,14 @@ Ha eléred az oldalad felhasználóit, akkor hozzáadhatod a &amp;username= rés
     <string name="input_mode_ptt_limited">Push to Talk (limitált)</string>
     <string name="input_mode_ptt_release_delay">Push to Talk felengedés késleltetés</string>
     <string name="install_location_main">Fő</string>
-    <string name="instant_invite">Azonnali meghívó</string>
+    <string name="instant_invite">Meghívó</string>
     <string name="instant_invite_accept">Meghívó elfogadása</string>
-    <string name="instant_invite_accepted">Azonnali meghívó elfogadva</string>
-    <string name="instant_invite_accepting">Azonnali meghívó elfogadása</string>
+    <string name="instant_invite_accepted">Elfogadott meghívó</string>
+    <string name="instant_invite_accepting">Meghívó elfogadása</string>
     <string name="instant_invite_ask_for_new_invite">Kérj újat!</string>
     <string name="instant_invite_ask_user_for_new_invite">Kérj új meghívót tőle: %1$s!</string>
     <string name="instant_invite_code">Kód</string>
-    <string name="instant_invite_expired">Az azonnali meghívó érvénytelen vagy lejárt.</string>
+    <string name="instant_invite_expired">A meghívó érvénytelen vagy lejárt.</string>
     <string name="instant_invite_expires">Lejárat</string>
     <string name="instant_invite_failed_to_generate">Meghívó link létrehozása sikertelen.</string>
     <string name="instant_invite_generate">Létrehozás</string>
@@ -1807,16 +1774,15 @@ Ha eléred az oldalad felhasználóit, akkor hozzáadhatod a &amp;username= rés
     <string name="instant_invite_regenerate">Újragenerálás</string>
     <string name="instant_invite_resolved_body">Meghívtak a(z) **%1$s** csatornára a(z) **%2$s** szerveren.</string>
     <string name="instant_invite_resolved_title">Nos, szia.</string>
-    <string name="instant_invite_resolving">Azonnali meghívó beolvasása</string>
+    <string name="instant_invite_resolving">Meghívó beolvasása</string>
     <string name="instant_invite_uses">Használat</string>
     <string name="instant_invite_you_are_already_a_member_of">Már tagja vagy ennek:</string>
     <string name="instant_invite_you_have_been_invited_to_join">Meghívtak, hogy csatlakozz</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** meghívott, hogy csatlakozz</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Meghívtak, hogy csatlakozz egy csoportos beszélgetéshez:</string>
-    <string name="instant_invites">Azonnali meghívók</string>
+    <string name="instant_invites">Meghívók</string>
     <string name="integration_settings">Integráció beállításai</string>
     <string name="integrations">Integráció</string>
-    <string name="integrations_header">Csatlakoztatott Twitch/YouTube-fiókok</string>
     <string name="integrations_pro_tip">Több információért látogass el a [Discord StreamKit oldalára](%1$s).</string>
     <string name="internal_server_error">Belső kiszolgálóhiba történt, kérjük próbáld meg újra.</string>
     <string name="invalid_animated_emoji_body">Ilyen emotikont nem adhatsz hozzá, mert animált. Fizess elő Discord Nitróra, hogy beteljesíthesd az animált emotikonos álmaidat.</string>
@@ -1929,13 +1895,13 @@ Szeretnél többet megtudni a Discordról?"</string>
     <string name="join_afk_channel_body">Úgy tűnik, egy AFK (Nincs A Gépnél) csatornához csatlakoztál. Itt nem tudsz beszélni.</string>
     <string name="join_call">Csatlakozás híváshoz</string>
     <string name="join_server">Csatlakozás</string>
-    <string name="join_server_button_body">Adj meg egy Azonnali meghívót, és csatlakozz barátod szerveréhez.</string>
+    <string name="join_server_button_body">Adj meg egy Meghívót, és csatlakozz barátod szerveréhez.</string>
     <string name="join_server_button_cta">Csatlakozás szerverhez</string>
     <string name="join_server_button_cta_mobile">Csatlakozz egy szerverhez meghívó linkkel</string>
     <string name="join_server_button_cta_mobile_desc">Meghívó kódod vagy linked van? Használd itt!</string>
     <string name="join_server_button_cta_named">Csatlakozás ide: %1$s</string>
-    <string name="join_server_description">Adj meg lent egy Azonnali meghívót, hogy csatlakozz egy meglévő szerverhez. A meghívó valahogy így fog kinézni:</string>
-    <string name="join_server_description_mobile">Adj meg fent egy Azonnali meghívót, hogy csatlakozz egy már létező szerverhez.</string>
+    <string name="join_server_description">Adj meg lent egy Meghívót, hogy csatlakozz egy meglévő szerverhez. A meghívó valahogy így fog kinézni:</string>
+    <string name="join_server_description_mobile">Adj meg fent egy Meghívót, hogy csatlakozz egy már létező szerverhez.</string>
     <string name="join_server_title">Csatlakozás szerverhez</string>
     <string name="join_stream">Csatlakozás a közvetítéshez</string>
     <string name="join_video_call">Csatlakozás videohíváshoz</string>
@@ -2043,7 +2009,7 @@ miközben te beszélsz."</string>
     <string name="link_your_xbox_account_2">A Discord egy szöveges, hang- és videochat alkalmazás játékosoknak. Ingyenes, biztonságos, számítógépen és mobilon is működik.</string>
     <string name="listening_to">Hallgatja: **%1$s**</string>
     <string name="live">Élő</string>
-    <string name="live_beta_description">Üdv a közvetítésben! Az élő közvetítés béta fázisban van. Bocs az esetleges bonyodalmakért</string>
+    <string name="live_beta_description">Üdv a közvetítésben! A Go Live béta fázisban van. Bocs az esetleges bonyodalmakért</string>
     <string name="live_on_twitch">Elő műsor Twitch-en</string>
     <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Kép betöltése sikertelen.
@@ -2229,14 +2195,11 @@ Szolgáltatási feltételeket és az Adatvédelmi Szabályzatot."</string>
     <string name="no_emoji_title">Nincs emotikon</string>
     <string name="no_input_devices">Nincs bemeneti eszköz</string>
     <string name="no_input_devices_detected">Nem találhatóak bemeneti eszközök, csatlakoztass egyet, és próbáld újra.</string>
-    <string name="no_instant_invite">Nincs azonnali meghívó</string>
-    <string name="no_integrations">[Csatlakoztasd](onConnect) a partnerszintű Twitch- vagy YouTube Gaming-fiókodat, hogy feliratkozóidat/szponzoraidat ranghoz szinkronizáld</string>
+    <string name="no_instant_invite">Nincs meghívó</string>
     <string name="no_integrations_body">A FR13NDSH1P protokoll csak a Discord-kliensből futtatható</string>
     <string name="no_integrations_label">Nincsenek integrációk</string>
-    <string name="no_invites_body">"Céltalannak érzed magad, mint az égen kúszó papírrepülő?
-Hívd meg pár barátod egy azonnali meghívó link létrehozásával!"</string>
-    <string name="no_invites_caption">Még nincsenek azonnali meghívók!</string>
-    <string name="no_invites_label">Még nincsenek azonnali meghívók</string>
+    <string name="no_invites_caption">Még nincsenek meghívók!</string>
+    <string name="no_invites_label">Még nincsenek meghívóok</string>
     <string name="no_mail_account_description">Kérlek, küldd el a visszajelzésed a support@discordapp.com e-mail címre, már kimásoltuk a felhasználói információdat a vágólapra.</string>
     <string name="no_mail_account_title">Nincs e-mail fiók</string>
     <string name="no_mic_body">Utasításokért a mikrofonod hozzáférésének engedélyezéséhez kövesd a Discord Súgóközpontot.</string>
@@ -2254,7 +2217,6 @@ kitűzött üzenete… egyelőre."</string>
     <string name="no_reactions_header">Nincsenek reakciók</string>
     <string name="no_recent_mentions">És kezdetben… csak a csend volt.</string>
     <string name="no_send_messages_permission_placeholder">Nincs jogosultságod, hogy üzenetet küldj ezen a csatornán.</string>
-    <string name="no_system_channel">Nincs új tag üzenet</string>
     <string name="no_text">Nem</string>
     <string name="no_thanks">Köszönöm, nem</string>
     <string name="no_user_limit">Korlátlan</string>
@@ -2266,7 +2228,6 @@ kitűzött üzenete… egyelőre."</string>
     <string name="note">Jegyzet</string>
     <string name="note_placeholder">Kattints ide jegyzet hozzáadásához</string>
     <string name="note_placeholder_mobile">Érintsd meg itt jegyzet hozzáadásához</string>
-    <string name="notice_application_test_mode">A tesztmód jelenleg aktív a következőhöz: **%1$s**. A kiadatlan SKU-k megjelennek, és nem számolunk fel semmilyen kapcsolódó kifizetést.</string>
     <string name="notice_application_test_mode_go_to_listing">Ugrás az SKU-ra</string>
     <string name="notice_connect_spotify">Csatlakoztasd Spotify-fiókodat, hogy megjelenítsd a jelenleg hallgatott zenédet az állapotodban!</string>
     <string name="notice_connection_conflict">Le lettél csatlakozva a hangos beszélgetésről, mert máshonnan is bejelentkeztél.</string>
@@ -2277,7 +2238,6 @@ kitűzött üzenete… egyelőre."</string>
     <string name="notice_dispatch_error_disk_low">Nincs elegendő lemezterületed. %1$s kellene, de csak %2$s érhető el.</string>
     <string name="notice_dispatch_error_file_name_too_long">Ó, nem, ennek a játéknak a fájlneve túl hosszú a Windowshoz. Válassz rövidebb telepítési könyvtárat.</string>
     <string name="notice_dispatch_error_invalid_drive">Ó, nem, az általad kiválasztott telepítési hely nem érvényes. Ezt választottad: %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Nem sikerült frissíteni a játékot. Jelenleg fut?</string>
     <string name="notice_dispatch_error_no_manifests">Ó, nem, úgy tűnik, hogy nincs tartalom ehhez a játékhoz. Vedd fel a kapcsolatot a támogatással.</string>
     <string name="notice_dispatch_error_not_entitled">Ó, nem, úgy tűnik, hogy nincs a tulajdonodban a játék. Vedd fel a kapcsolatot a támogatással, ha úgy gondolod, hogy ez hiba.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Úgy tűnik, nemet mondtál egy telepítési parancssorra. Igent kell mondanod a játék telepítéséhez.</string>
@@ -2292,9 +2252,6 @@ kitűzött üzenete… egyelőre."</string>
     <string name="notice_native_apps">Szeretnél rendszerre kiterjedő Push to Talk módot? Töltsd le az asztali alkalmazást!</string>
     <string name="notice_no_input_detected">Nos úgy tűnik, hogy a Discord nem érzékel semmit abból, amit mondasz. Javítsuk ki… együtt.</string>
     <string name="notice_no_input_detected_help_link_text">Segítség!</string>
-    <string name="notice_premium_applications_grandfathered_ended">A hozzáférésed a Nitróhoz lejárt. Frissíts a Nitro Classic-ról a Nitróra a csodálatos játékok korlátlan eléréséhez.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Csak %1$s maradt a Nitro játékokkal! A hozzáférésed lejár ekkor: **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Köszönjük, hogy korai Nitro-támogató voltál! A jópofaság jutalmaként hozzáférésed van Nitro-játékokhoz a következő időpontig: %1$s.</string>
     <string name="notice_premium_promo_action">Nézd meg</string>
     <string name="notice_premium_promo_message">Támogasd a Discord fejlesztését, és kapj menő képességeket!</string>
     <string name="notice_scheduled_maintenance">A Discord-rendszert **%1$s** **%2$s** -kor karbantartják.</string>
@@ -2364,7 +2321,6 @@ Meghívó linket kaptál egy barátodtól? Írd be a linket vagy kódot, hogy cs
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Engedélyezett átfedés</string>
     <string name="nux_post_reg_join_server_description">Hozd ki a legtöbbet a Discordból szerverhez való csatlakozással.</string>
     <string name="nux_post_reg_join_server_skip">Nincs egy sem</string>
     <string name="nux_post_reg_join_server_title">Van meghívód?</string>
@@ -2410,7 +2366,6 @@ A játékbeli felület nem biztos, hogy mindenkinek működik. Ha problémád ak
     <string name="overlay_menu_get_invite">Meghívó link szerzése</string>
     <string name="overlay_menu_open_discord">A Discord megnyitása</string>
     <string name="overlay_menu_switch_channels">Csatornák váltása</string>
-    <string name="overlay_mobile_toggle_desc">Nézd meg, ki beszélget, és érd el a parancsikonokat, amikor hanghoz csatlakozva más alkalmazásokat használsz</string>
     <string name="overlay_mobile_toggle_label">Mobil hangsávréteg engedélyezése</string>
     <string name="overlay_mobile_unauthed">Jelentkezz be a Discord-alkalmazásba a funkció engedélyezéséhez.</string>
     <string name="overlay_news_go_live_body">Szeretnéd közvetíteni a(z) %1$s játékot barátaidnak itt: %2$s?</string>
@@ -2418,7 +2373,6 @@ A játékbeli felület nem biztos, hogy mindenkinek működik. Ha problémád ak
     <string name="overlay_news_text_pinning_body">Most kitűzhetsz egy szöveges csevegést a játékodban!</string>
     <string name="overlay_news_text_pinning_tip">Tipp: Csevegést a $[pinIcon](pinHook) megnyomásával tűzhetsz ki</string>
     <string name="overlay_news_text_pinning_title">Discord átfedés frissítve</string>
-    <string name="overlay_no_results">Kerestünk közel és távol. Sajnos nem találtunk hangcsatornát</string>
     <string name="overlay_notification_incoming_call">Bejövő hívás…</string>
     <string name="overlay_notification_settings_disabled">Értesítések letiltva</string>
     <string name="overlay_notification_settings_position">Megjelenítés itt: %1$s</string>
@@ -2428,7 +2382,6 @@ A játékbeli felület nem biztos, hogy mindenkinek működik. Ha problémád ak
     <string name="overlay_notifications_settings">Átfedési értesítések</string>
     <string name="overlay_notifications_top_left">Bal felső</string>
     <string name="overlay_notifications_top_right">Jobb felső</string>
-    <string name="overlay_private_channels_empty_state">Nem, itt nincsenek közvetlen üzenetek.</string>
     <string name="overlay_reload">Átfedés újratöltése</string>
     <string name="overlay_settings">Átfedés beállítások</string>
     <string name="overlay_settings_general_tab">Általános</string>
@@ -2543,18 +2496,11 @@ A játékbeli felület nem biztos, hogy mindenkinek működik. Ha problémád ak
     <string name="post_code">Irányítószám</string>
     <string name="premium">Nitró</string>
     <string name="premium_alert_error_title">Hoppá, valami hiba történt…</string>
-    <string name="premium_applications_grandfathered_monthly">Szeretnénk megköszönni a Discord támogatását, ezért egy éves hozzáférést kapsz a Nitro-játékokhoz. A hozzáférésed lejárata: **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">Szeretnénk megköszönni a Discord támogatását, ezért két éves hozzáférést kapsz a Nitro-játékokhoz. A hozzáférésed lejárata: **%1$s**.</string>
-    <string name="premium_applications_subtitle">Korlátlan hozzáférés az elismert játékok folyamatosan gyarapodó könyvtárához – szerintünk te és barátaid szívesen játszanátok ezekkel.</string>
-    <string name="premium_applications_title">Tucatnyi válogatott játék. Egyetlen alacsony havidíj.</string>
     <string name="premium_badge_tooltip">%1$s óta előfizető</string>
     <string name="premium_cancel_cancel">Nem</string>
     <string name="premium_cancel_confirm_body_tier_1">"A lemondás a jelenlegi számlázási időszak végén lép érvénybe: **.%1$s**Az előfizetést bármikor újraindíthatod. A Discord-címke véletlenszerűen lesz kiválasztva, ha korábban módosítottad azt.
 
 Az előfizetést bármikor újraindíthatod."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"A lemondás a jelenlegi számlázási időszak végén lép érvénybe. A lemondás a jelenlegi számlázási időszak végén lép érvénybe. **%1$s** napján elveszted a hozzáférést az összes Nitro-játékhoz a könyvtáradban, és a Discord-címke véletlenszerűen lesz kiválasztva, ha korábban módosítottad azt.
-
-A mentési fájlokat biztonságban megőrizzük arra az esetre, ha meggondolnád magad. Bármikor újra előfizethetsz!"</string>
     <string name="premium_cancel_confirm_new">Juhé, %1$s megszakítása</string>
     <string name="premium_cancel_confirm_title">%1$s lemondása?</string>
     <string name="premium_cancel_failed_body">Nem tudtuk lemondani a Nitro-előfizetésed. Kérjük próbáld újra, vagy vedd fel a kapcsolatot velünk ha a probléma továbbra is fennáll.</string>
@@ -2571,7 +2517,6 @@ A mentési fájlokat biztonságban megőrizzük arra az esetre, ha meggondolnád
     <string name="premium_chat_perks_description_custom_emoji">Kapsz egy útlevelet, amellyel bárhol használhatod az egyedi emotikonokat.</string>
     <string name="premium_chat_perks_description_discriminator">Válaszd ki a címkédet a feliratkozás idejére.</string>
     <string name="premium_chat_perks_description_screenshare">Növeld a képernyőmegosztásod minőségét 720p 60, vagy akár 1080p 30 fps-re.</string>
-    <string name="premium_chat_perks_description_upload_limit">Nagyméretű feltöltési fájlméret: %1$s (erről: %2$s) a kiváló minőségű képmegosztáshoz.</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Animált szórakozás</string>
     <string name="premium_chat_perks_title_badge">Képviseld a támogatást</string>
     <string name="premium_chat_perks_title_custom_emoji">Globális egyéni emotikonok</string>
@@ -2579,11 +2524,7 @@ A mentési fájlokat biztonságban megőrizzük arra az esetre, ha meggondolnád
     <string name="premium_chat_perks_title_screenshare">Jobb minőségű videó</string>
     <string name="premium_code_redemption_confirmation_blurb">A számjegyek véletlen sorrendjének köszönhetően továbbfejlesztett csevegés jutalmakat kaptál %1$s időtartamra!</string>
     <string name="premium_code_redemption_confirmation_button">Ó, édes!</string>
-    <string name="premium_feature_new_chat_perks_header">Továbbfejlesztett csevegési jutalmat is kapsz:</string>
-    <string name="premium_feature_new_premium_applications_header">Játékok %1$s feletti értékben. Nézd meg:</string>
-    <string name="premium_feature_view_applications">Az összes Nitro-játék megtekintése</string>
     <string name="premium_features_chat_perks">Csevegés jutalom</string>
-    <string name="premium_features_premium_applications">Ingyenes játékok</string>
     <string name="premium_grandfathered_warning">Szeretnénk megköszönni a támogatást, ezért kedvezményes Nitro-előfizetést kapsz. **Az előfizetésed megszüntetésével vagy módosításával elveszíted ezt a kedvezményt.** Figyelmeztettünk!!!!!</string>
     <string name="premium_grandfathered_warning_confirm">Megteszem mindenképp</string>
     <string name="premium_grandfathered_warning_title">Óvatosan arra, barátom</string>
@@ -2593,10 +2534,7 @@ A mentési fájlokat biztonságban megőrizzük arra az esetre, ha meggondolnád
     <string name="premium_not_claimed">Először foglald le a fiókod</string>
     <string name="premium_not_claimed_body">Hé, cimbora! Ha Nitrót szeretnél vásárolni, előbb fiókot kell kérni, hogy ne veszítsd el a dolgaidat.</string>
     <string name="premium_not_verified">Először erősítsd meg az e-mailt</string>
-    <string name="premium_not_verified_body">Hé, cimbora! Ha Nitrót szeretnél vásárolni, előbb meg kell erősíteni az e-mail címed. Ellenőrizd az e-mailjeid, vagy kérj újat.</string>
-    <string name="premium_payment_applications_os_warning">A Nitro-játékok csak Windows-zal kompatibilisek.</string>
     <string name="premium_payment_confirmation_blurb_regular">Most már megszerezted a továbbfejlesztett csevegési jutalmakat. Hagyd abba az olvasást, és menj csevegni!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Most korlátlan hozzáférésed van sok remek játékhoz. Hagyd abba az olvasást, és menj játszani!</string>
     <string name="premium_payment_confirmation_button_regular">K, jól hangzik</string>
     <string name="premium_plan_month">Nitro havi</string>
     <string name="premium_plan_month_tier_1">Nitro Classic havi</string>
@@ -2618,13 +2556,10 @@ A jelenlegi előfizetésed arányosítjuk, és levonjuk az éves díjból. Szám
     <string name="premium_upgrade_disabled_current_tooltip">A jelenlegi előfizetésed.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Először le kell mondani és megvárni, amíg lejár, és csak ezután választhatsz alacsonyabb szintű előfizetést.</string>
     <string name="premium_upgrade_done_body_tier_1">Továbbfejlesztett csevegés jutalmakat kaptál!</string>
-    <string name="premium_upgrade_done_body_tier_2">Most van továbbfejlesztett csevegési jutalmad és hozzáférésed több tucat játékhoz.</string>
     <string name="premium_upgrade_done_button_tier_1">Édes!</string>
-    <string name="premium_upgrade_done_button_tier_2">Nézd meg az összes Nitro-játékot</string>
     <string name="premium_upgrade_failed_body">Hát… Ez a frissítés nem működött. Ellenőrizd a megadott fizetési információk érvényességét, és próbáld újra.</string>
     <string name="premium_upload_promo">Iratkozz fel a Discord Nitróra a %1$s fájllimit eléréséhez</string>
     <string name="premium_year_free_months">2 hónap ingyen!</string>
-    <string name="premium_year_free_months_short">2 hónap ingyen</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / év</string>
     <string name="preview_chat">Beszélgetés előnézete</string>
     <string name="priority_speaker">Elsőbbségi megszólaló</string>
@@ -2809,7 +2744,7 @@ megpróbál adatot küldeni."</string>
     <string name="scope_guilds">Ismerd meg az általad jelenleg használt szerverek listáját</string>
     <string name="scope_guilds_empty">Jelenleg egy szerverre sem vagy belépve.</string>
     <string name="scope_guilds_join">Csatlakozás szerverhez</string>
-    <string name="scope_guilds_join_description">Azonnali meghívók használata a te nevedben.</string>
+    <string name="scope_guilds_join_description">Meghívók használata a te nevedben.</string>
     <string name="scope_identify">Hozzáférés a felhasználónevedhez és a profilképedhez</string>
     <string name="scope_messages_read">Összes üzenet elolvasása</string>
     <string name="scope_messages_read_description">Engedélyezi az alkalmazásnak, hogy az üzeneteid elérhetőek legyenek a Discord-fiókodon keresztül</string>
@@ -2874,7 +2809,6 @@ Válaszd ki a képernyőt, amit meg szeretnél osztani."</string>
     <string name="search_filter_on">ekkor</string>
     <string name="search_for_emoji">Találd meg a tökéletes emotikont</string>
     <string name="search_for_empty">Keresés</string>
-    <string name="search_for_value">Keresési találatok a(z) **%1$s** kifejezésre</string>
     <string name="search_group_header_channels">Ebben a csatornában:</string>
     <string name="search_group_header_dates">Dátumok</string>
     <string name="search_group_header_file_name">Fájlnév tartalmazza ezt:</string>
@@ -3079,8 +3013,6 @@ Biztos vagy ebben?"</string>
     <string name="stop_ringing">Csengetés befejezése</string>
     <string name="stop_streaming">Élő közvetítésed leállítása</string>
     <string name="stop_watching">Megtekintés leállítása</string>
-    <string name="store_payment_legalese_monthly">Üdv! A(z) %1$s megvásárlásával elfogadod a következőt: [Áruház általános szerződési feltételek](%2$s). %1$s megújuló előfizetés, ami azt jelenti, hogy ma beterheljük, majd havonta újra beterheljük, amíg meg nem szünteted az előfizetést. A Felhasználói beállítások képernyőn bármikor lemondhatod.</string>
-    <string name="store_payment_legalese_yearly">Üdv! A(z) %1$s megvásárlásával elfogadod a következőt: [Áruház általános szerződési feltételek](%2$s). %1$s megújuló előfizetés, ami azt jelenti, hogy ma beterheljük, majd évente újra beterheljük, amíg meg nem szünteted az előfizetést. A Felhasználói beállítások képernyőn bármikor lemondhatod.</string>
     <string name="stream">Élő közvetítés</string>
     <string name="stream_bad_spectator">A megtekintett élő közvetítés video- vagy hangminősége lecsökkent. Ez a hálózat állapota miatt lehet.</string>
     <string name="stream_bad_streamer">Az élő közvetítés video- vagy hangminősége lecsökkent. Ez a hálózat állapota miatt lehet.</string>
@@ -3088,7 +3020,6 @@ Biztos vagy ebben?"</string>
     <string name="stream_capture_paused_details">Válts a játékba a folytatáshoz.</string>
     <string name="stream_capture_paused_details_viewer">%1$s kis méretűre állította a játékot… maradj a helyeden!</string>
     <string name="stream_channel_description">A tagok ezzel a jogosultsággal közvetíthetnek a csatornába.</string>
-    <string name="stream_description">A tagok ezzel a jogosultsággal csatlakozhatnak a csatornához.</string>
     <string name="stream_ended">Ez a közvetítés véget ért. *tücsökhang*</string>
     <string name="stream_ended_button">Élő közvetítés véget ért</string>
     <string name="stream_ended_no_spectators">Nincsenek nézők, mert a közvetítés befejeződött.</string>
@@ -3128,7 +3059,6 @@ Biztos vagy ebben?"</string>
     <string name="stream_report_rating_body_streamer">Mondd el, milyen élmény volt a közvetítés.</string>
     <string name="stream_report_submit">Küldés</string>
     <string name="stream_reported">Visszajelzés beküldve</string>
-    <string name="stream_reported_body">Köszönjük a probléma jelentését! A visszajelzés segít a közvetítés minőségének javításában.</string>
     <string name="stream_soundshare_failed">Szia! Valami félrement, és nem tudjuk közvetíteni a hangot a játékból.</string>
     <string name="streamer_mode">Közvetítő mód</string>
     <string name="streamer_mode_enabled">Közvetítő mód bekapcsolva</string>
@@ -3186,7 +3116,6 @@ Biztosan ezt szeretnéd?"</string>
     <string name="system_message_guild_member_join_10">Megjelent egy vad %1$s.</string>
     <string name="system_message_guild_member_join_11">Huss. %1$s most landolt.</string>
     <string name="system_message_guild_member_join_12">Öveket becsatolni! %1$s csatlakozott a szerverhez.</string>
-    <string name="system_message_guild_member_join_13">%1$s csatlakozott. Rejtsétek el a banánjaitokat.</string>
     <string name="system_message_guild_member_join_14">%1$s megérkezett. Szerintem OP, nerfelni kéne.</string>
     <string name="system_message_guild_member_join_15">%1$s épp becsusszant a szerverre.</string>
     <string name="system_message_guild_member_join_16">Egy %1$s lespawnolt a szerverre.</string>
@@ -3198,7 +3127,6 @@ Biztosan ezt szeretnéd?"</string>
     <string name="system_message_guild_member_join_22">Ez egy madár! Ez egy repülő! Mindegy is, ez csak %1$s.</string>
     <string name="system_message_guild_member_join_23">Ez %1$s! Dicsérd a napot! \\\\[T]/</string>
     <string name="system_message_guild_member_join_24">Soha nem hagyom, hogy %1$s feladja. Soha nem hagyom, hogy %1$s veszítsen.</string>
-    <string name="system_message_guild_member_join_25">Há! %1$s csatlakozott! Aktiváltad a csapdámat!</string>
     <string name="system_message_guild_member_join_26">Szervusz, kedves! Itt van %1$s!</string>
     <string name="system_message_guild_member_join_27">Hé! Figyu! %1$s csatlakozott!</string>
     <string name="system_message_guild_member_join_28">Már vártunk téged, %1$s</string>
@@ -3247,7 +3175,6 @@ Biztosan ezt szeretnéd?"</string>
     <string name="this_server_named">Csak %1$s</string>
     <string name="three_users_typing">**%1$s**, **%2$s** és **%3$s** éppen gépel…</string>
     <string name="timeout_error">A művelet túl sokáig tartott, kérjük, próbáld meg újra.</string>
-    <string name="tip_instant_invite_title3">Hívd meg barátaidat</string>
     <string name="title">Cím</string>
     <string name="too_many_animated_emoji">Nincs több hely új animált emotikonoknak.</string>
     <string name="too_many_emoji">Nincs több hely új emotikonoknak.</string>
@@ -3349,8 +3276,6 @@ Egy lefoglalt fiók szükséges ahhoz, hogy **letölts alkalmazásokat**."</stri
     <string name="unsupported_browser">Nem támogatott böngésző</string>
     <string name="unsupported_browser_body">"Úgy tűnik egy nem támogatott böngészőt használsz. Hogy megtapasztald mit ajánl a Discord, frissítsd a
 böngésződ vagy töltsd le valamelyik alkalmazásunkat."</string>
-    <string name="unsupported_browser_details">"Beszélni szeretnél a haverjaiddal, igaz? Válts a legfrissebb Chrome, Opera, Firefox 38+ böngészőre, vagy töltsd
-le a Discord-klienst, hogy elkezdhess beszélgetni!"</string>
     <string name="unsupported_browser_title">Na, ez kínos</string>
     <string name="unverified_account_body">"Ellenőrizd az e-mail fiókod és kövesd az utasításokat, hogy hitelesítsd az e-mail címed.
 
@@ -3468,8 +3393,6 @@ Nyomd a Shift gombot az azonnali feltöltéshez."</string>
     <string name="user_settings_appearance_preview_message_4">A kompakt mód be lesz kapcsolva</string>
     <string name="user_settings_appearance_preview_message_5">Ó, már itt is van!</string>
     <string name="user_settings_appearance_zoom_tip">Megváltoztathatod a nagyítási szintet a(z) %1$s +/- gyorsgombokkal és alapértelmezettre visszaállíthatod a(z) %1$s+0 gyorsgombbal.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Játékok lap megjelenítése</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Kapcsold ki ezt, hogy elrejtsd a Játékok lapot, így a beszélgetésekre koncentrálhatsz.</string>
     <string name="user_settings_close_button">Bezárás gomb</string>
     <string name="user_settings_confirm_logout">Biztos, hogy kijelentkezel?</string>
     <string name="user_settings_game_activity">Játék tevékenység</string>
@@ -3528,8 +3451,6 @@ Ne feledd, ezzel a linkkel a szervered nyilvánosan elérhető bárkinek."</stri
     <string name="vanity_url_hint_mobile">url-címed-ide</string>
     <string name="verfication_expired">Az e-mail megerősítő link lejárt.</string>
     <string name="verfication_expired_suggestion">Kérlek jelentkezz be a Discord-fiókodba. és küldd el újra a linket</string>
-    <string name="verification_body">"Valami szokatlant észleltünk. Hogy folytathasd a
-Discord használatát, **kérjük, erősítsd meg, hogy ember vagy.**"</string>
     <string name="verification_body_alt">Most pedig győződjünk meg arról, hogy ember vagy…</string>
     <string name="verification_email_body">Egy új hitelesítő e-mailt küldtünk ide: **%1$s**. Nézd meg a spam mappádat is.</string>
     <string name="verification_email_error_body">Hiba történt a hitelesítő e-mailed elküldése közben. Próbáld újra később, vagy vedd fel a kapcsolatot a támogatással.</string>
@@ -3570,8 +3491,6 @@ Discord használatát, **kérjük, erősítsd meg, hogy ember vagy.**"</string>
     <string name="video">Videó</string>
     <string name="video_call">Videohívás</string>
     <string name="video_connect">Videó</string>
-    <string name="video_poor_connection_body">A videó szünetel. Folytatódik, amikor a kapcsolat javul.</string>
-    <string name="video_poor_connection_title">Gyenge kapcsolat</string>
     <string name="video_preview">Videó előnézet</string>
     <string name="video_settings">Videobeállítások</string>
     <string name="video_unavailable">Videó nem elérhető</string>
diff --git a/com.discord/res/values-it/plurals.xml b/com.discord/res/values-it/plurals.xml
index f0150245df..353f4faf0f 100644
--- a/com.discord/res/values-it/plurals.xml
+++ b/com.discord/res/values-it/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">Nessuno slot</item>
         <item quantity="one">%d slot</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d giorni</item>
-        <item quantity="one">1 giorno</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d membri</item>
-        <item quantity="zero">0 membri</item>
-        <item quantity="one">1 membro</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">giorni</item>
         <item quantity="one">giorno</item>
@@ -212,16 +203,6 @@
         <item quantity="other">dei permessi</item>
         <item quantity="one">un permesso</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Imposta Slowmode a **!!%d!! secondi**</item>
-        <item quantity="zero">Slowmode disattivato</item>
-        <item quantity="one">Imposta Slowmode a **1 secondo**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Imposta Slowmode a **!!%d!! secondi**</item>
-        <item quantity="zero">Imposta Slowmode disattivato</item>
-        <item quantity="one">Imposta Slowmode a **1 secondo**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! membri** inattivi</item>
         <item quantity="one">**un membro** inattivo</item>
@@ -321,10 +302,6 @@
         <item quantity="other">%d nuovi messaggi</item>
         <item quantity="one">1 nuovo messaggio</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d giorni</item>
-        <item quantity="one">un giorno</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d canali</item>
         <item quantity="one">%d canale</item>
@@ -342,26 +319,10 @@
         <item quantity="other">questi messaggi</item>
         <item quantity="one">questo messaggio</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** server non sono disponibili</item>
-        <item quantity="one">**1** server non è disponibile</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d mesi</item>
         <item quantity="one">1 mese</item>
     </plurals>
-    <plurals name="reaction_tooltip_1_n_n">
-        <item quantity="other">altri %d utenti</item>
-        <item quantity="one">1 altro utente</item>
-    </plurals>
-    <plurals name="reaction_tooltip_2_n_n">
-        <item quantity="other">altri %d utenti</item>
-        <item quantity="one">1 altro utente</item>
-    </plurals>
-    <plurals name="reaction_tooltip_3_n_n">
-        <item quantity="other">altri %d utenti</item>
-        <item quantity="one">1 altro utente</item>
-    </plurals>
     <plurals name="reaction_tooltip_n_n">
         <item quantity="other">%d persone hanno</item>
         <item quantity="one">1 persona ha</item>
@@ -379,11 +340,6 @@
         <item quantity="other">%d risultati</item>
         <item quantity="one">%d risultato</item>
     </plurals>
-    <plurals name="search_still_indexing_hint_count">
-        <item quantity="other">%d risultati</item>
-        <item quantity="zero">Nessun risultato</item>
-        <item quantity="one">%d risultato</item>
-    </plurals>
     <plurals name="spotify_listen_along_title_host_count">
         <item quantity="other">ascoltatori</item>
         <item quantity="one">ascoltatore</item>
diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml
index 2659cffa7d..fb62541b6e 100644
--- a/com.discord/res/values-it/strings.xml
+++ b/com.discord/res/values-it/strings.xml
@@ -3,7 +3,6 @@
     <string name="_continue">Continua</string>
     <string name="_default">Predefinito</string>
     <string name="_new">novità</string>
-    <string name="a11y_nitro_badge">L’utente è abbonato a Nitro.</string>
     <string name="abc_action_bar_home_description">Vai alla home page</string>
     <string name="abc_action_bar_up_description">Vai in alto</string>
     <string name="abc_action_menu_overflow_description">Altre opzioni</string>
@@ -39,15 +38,12 @@
     <string name="account_disabled_description">Non puoi usarlo mentre è disattivato.</string>
     <string name="account_disabled_title">Account disattivato</string>
     <string name="account_management">Gestione account</string>
-    <string name="account_name">Nome dell’account</string>
     <string name="account_scheduled_for_deletion_cancel">Hai cambiato idea? [Ripristina account](onClick)</string>
     <string name="account_scheduled_for_deletion_cancel_mobile">Ripristina account</string>
     <string name="account_scheduled_for_deletion_confirm">Sono sicuro!</string>
-    <string name="account_scheduled_for_deletion_description">È stata pianificata l’autodistruzione a breve del tuo account.</string>
     <string name="account_scheduled_for_deletion_title">Account in fase di eliminazione</string>
     <string name="account_scheduled_for_deletion_undo">Hai cambiato idea?</string>
     <string name="acknowledgements">Riconoscimenti</string>
-    <string name="action_may_take_a_moment">Potrebbe volerci un po’.</string>
     <string name="actions">Azioni</string>
     <string name="activity">Attività</string>
     <string name="activity_invite_modal_header">Invita a giocare a %1$s</string>
@@ -58,10 +54,8 @@
     <string name="activity_invite_private">"Non puoi inviare un invito perché sei invisibile o stai nascondendo il tuo status di gioco. Se preferisci non cambiare
 le tue impostazioni puoi farti invitare da qualcuno."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Capito!</string>
-    <string name="activity_panel_go_live_hotspot_header">Vai In onda e trasmetti il gioco ai tuoi amici!</string>
+    <string name="activity_panel_go_live_hotspot_header">Usa Go Live per trasmettere i tuoi gameplay agli amici!</string>
     <string name="activity_panel_go_live_tooltip">In onda</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Questo server non ha canali vocali sui quali trasmettere.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Non puoi trasmettere in questo canale vocale.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Vai in un server per iniziare lo streaming.</string>
     <string name="add">Aggiungi</string>
     <string name="add_a_comment_optional">Aggiungi un commento (facoltativo)</string>
@@ -103,8 +97,6 @@ le tue impostazioni puoi farti invitare da qualcuno."</string>
     <string name="add_friend_search">Cerca</string>
     <string name="add_friend_self">Non puoi aggiungere te stesso.</string>
     <string name="add_friend_success">Ben fatto! La tua richiesta di amicizia a **%1$s** è accompagnata dal samurai Discord più élite che ci sia.</string>
-    <string name="add_keybind">Aggiungi un’associazione tasti</string>
-    <string name="add_keybind_warning">Quando è visualizzato questo pannello, l’associazione tasti non funziona.</string>
     <string name="add_new_connection">Aggiungi account</string>
     <string name="add_note">Aggiungi una nota</string>
     <string name="add_override">Aggiungi permesso speciale</string>
@@ -124,21 +116,14 @@ Occhio a chi dai questo permesso."</string>
     <string name="all_servers">Tutti i server</string>
     <string name="allow_game_detection_mobile">Permetti a Discord di rilevare a quali giochi per dispositivo mobile stai giocando.</string>
     <string name="allow_server_dms">Permetti ai membri del server di inviarti messaggi diretti.</string>
-    <string name="allow_tts_command">Permetti la riproduzione e l’uso del comando /tts.</string>
     <string name="already_have_account">Hai già un account?</string>
     <string name="amount">Importo</string>
     <string name="animate_emoji">Riproduci gli emoji animati.</string>
     <string name="animate_emoji_note">Voglio che gli emoji si scatenino sulla pista da ballo.</string>
     <string name="animated_emoji">Emoji animati</string>
     <string name="answer">Rispondi</string>
-    <string name="app_download_now">Non hai l’app? **Scaricala ora**</string>
-    <string name="app_information">Informazioni sull’app</string>
-    <string name="app_not_opened">Non è possibile avviare l’app Discord.</string>
     <string name="app_opened_body">Abbiamo inviato le tue informazioni alla tua app Discord. Puoi chiudere questa scheda del browser o continuare sulla versione web.</string>
     <string name="app_opened_title">App Discord avviata</string>
-    <string name="app_opening">Avvio dell’app Discord.</string>
-    <string name="app_opening_mobile_body">Se non riesci ad aprire l’app, copia il codice di invito per unirti una volta finito il download.</string>
-    <string name="app_settings">Impostazioni dell’app</string>
     <string name="appearance">Aspetto</string>
     <string name="application_addon_purchase_confirmation_blurb">%1$s è stato acquistato e sarà disponibile in %2$s.</string>
     <string name="application_context_menu_create_desktop_shortcut">Crea un collegamento sul desktop</string>
@@ -156,7 +141,6 @@ Occhio a chi dai questo permesso."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Ci hai preso!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Vai alla libreria</string>
     <string name="application_entitlement_code_redemption_invalid">Codice inserito non valido</string>
-    <string name="application_entitlement_code_redemption_prompt">Hai ricevuto un codice per un gioco? Inseriscilo qui sotto:</string>
     <string name="application_entitlement_code_redemption_redeem">Riscatta</string>
     <string name="application_filter_name_linux">Tutti i file</string>
     <string name="application_filter_name_macos">Applicazioni</string>
@@ -219,7 +203,6 @@ Occhio a chi dai questo permesso."</string>
     <string name="application_store_early_access_body">"Ottieni l'accesso immediato al gioco e contribuisci al suo sviluppo, ma tieni a mente che si tratta di un gioco incompleto e che in futuro potrebbe subire o meno dei cambiamenti."</string>
     <string name="application_store_expand_downloadable_content">Mostra tutti i DLC</string>
     <string name="application_store_filter_all_genres">Tutti i generi</string>
-    <string name="application_store_first_on_discord">Per primo su Discord</string>
     <string name="application_store_free_with_premium">Gratis con Nitro</string>
     <string name="application_store_genre_action">Azione</string>
     <string name="application_store_genre_action_adventure">Azione-avventura</string>
@@ -273,7 +256,6 @@ Occhio a chi dai questo permesso."</string>
     <string name="application_store_hide_games_in_library">Nascondi giochi dalla libreria</string>
     <string name="application_store_hide_games_in_library_hidden">%1$s nascoto/i</string>
     <string name="application_store_home_footer_main">Grazie per la visita!</string>
-    <string name="application_store_home_footer_sub">Con amore, Il team di Discord</string>
     <string name="application_store_home_view_all_applications">Visualizza tutti i giochi</string>
     <string name="application_store_in_library">Nella libreria</string>
     <string name="application_store_link_copied">Link copiato!</string>
@@ -397,7 +379,6 @@ Occhio a chi dai questo permesso."</string>
     <string name="application_store_view_all_news">Visualizza tutte le notizie</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Per giocare a questo DLC devi possedere %1$s su Discord. [Scopri di più sui DLC.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Contenuto scaricabile</string>
-    <string name="application_store_warning_early_access_description">"Questo gioco è divertente (noi la pensiamo così!) ma potrebbe avere contenuti limitati, vari bug o sembrare incompleto. [Scopri di più sull'accesso anticipato.](%1$s)"</string>
     <string name="application_store_warning_early_access_title">Accesso anticipato</string>
     <string name="application_store_warning_requires_desktop_app_description">"Per avviare questo gioco, devi avere installata $[l'applicazione per desktop](downloadHook) di Discord."</string>
     <string name="application_store_warning_requires_desktop_app_title">"Richiede l'applicazione per desktop"</string>
@@ -418,29 +399,24 @@ Occhio a chi dai questo permesso."</string>
     <string name="applications_and_connections_body">Qui troverai tutte le app che rendono speciale il modo in cui usi Discord. E se te ne dovessi stancare, potrai rimuoverle in qualunque momento.</string>
     <string name="attach_files">Allegare i file</string>
     <string name="attachment_filename_unknown">sconosciuto</string>
-    <string name="attachment_load_failed">Non è possibile caricare l’allegato</string>
     <string name="attachment_processing">Elaborazione in corso…</string>
     <string name="attenuate_while_speaking_others">Quando gli altri parlano</string>
     <string name="attenuate_while_speaking_self">Quando parlo</string>
     <string name="audio_hint_body">"Se il tuo browser non genera un pop-up che ti chiede di autorizzare o negare l'accesso al microfono, aggiorna la pagina e riprova."</string>
     <string name="audio_hint_title">Permetti a Discord di accedere al tuo microfono.</string>
-    <string name="auth_browser_handoff_detecting_description">È in corso un tentativo di rilevare l’account di Discord dal tuo browser predefinito. Dammi solo un secondo…</string>
     <string name="auth_disable_email_notifications_failure_body">Prova a rifarlo. Ci spiace!</string>
     <string name="auth_disable_email_notifications_failure_header">Ops. Non ha funzionato.</string>
-    <string name="auth_disable_email_notifications_success_body">La tua posta è un po’ più leggera.</string>
     <string name="auth_disable_email_notifications_success_header">Notifiche e-mail disattivate</string>
     <string name="auth_expired_suggestion">Accedi per rinviare il link.</string>
     <string name="auth_invalid_invite_body">Questo invito potrebbe essere scaduto, oppure non hai il permesso per accedere.</string>
     <string name="auth_invalid_invite_tip">Perché il mio invito non è valido?</string>
     <string name="auth_invalid_invite_title">Invito non valido</string>
-    <string name="auth_ip_auth_succeeded_suggestion">Se hai seguito questo link dopo aver provato ad accedere dall’applicazione per desktop o per dispositivi mobili, torna indietro e riprova.</string>
     <string name="auth_login_body">Siamo così felici di rivederti!</string>
     <string name="auth_message_invited_by">%1$s ti ha invitato a iscriverti</string>
     <string name="auth_message_invited_to_stream">Sei stato invitato allo stream di %1$s</string>
     <string name="auth_username_tooltip">Puoi cambiarlo in un secondo momento.</string>
     <string name="auth_verfication_expired_suggestion">Accedi e rinvia il link.</string>
     <string name="authorization">Autorizzazioni</string>
-    <string name="authorization_expired">Il link di autorizzazione dell’IP è scaduto.</string>
     <string name="authorization_expired_suggestion">Accedi a Discord per rinviare il link</string>
     <string name="authorize">Autorizza</string>
     <string name="authorized">Autorizzato</string>
@@ -460,27 +436,18 @@ Occhio a chi dai questo permesso."</string>
     <string name="ban">Banna</string>
     <string name="ban_confirm_title">Colpisci %1$s con il martello bannante</string>
     <string name="ban_members">Bannare i membri</string>
-    <string name="ban_members_description">I membri con questo permesso potranno bannare gli utenti che non ce l’hanno.</string>
     <string name="ban_reason">Motivazione del ban</string>
     <string name="ban_user_body">Sei sicuro di voler bannare %1$s? Non potrà più unirsi al server finché non revocherai il ban.</string>
     <string name="ban_user_confirmed">«%1$s» è stato bannato dal server.</string>
     <string name="ban_user_error_generic">Ops… non è stato possibile bannare %1$s. Riprova!</string>
-    <string name="ban_user_title">"Banna '%1$s'"</string>
     <string name="bans">Ban</string>
     <string name="bans_header">%1$s</string>
-    <string name="bans_hint">"Per impostazione predefinita i ban sono eseguiti per account e IP.
-Un utente può aggirare il ban dell’IP utilizzando un proxy.
-Eludere un ban può essere molto difficile abilitando la verifica tramite telefono in [Moderazione](onModerationClick)."</string>
     <string name="bans_no_results">Non abbiamo trovato utenti bannare con i dati indicati.</string>
     <string name="bans_no_users_banned">"Non hai ancora bannato nessuno…
 Ma se e quando vorrai, non esitare!"</string>
     <string name="bans_search_placeholder">Cerca tra i ban</string>
     <string name="beep_boop">Bip bup. Bup bip?</string>
-    <string name="beginning_channel">Benvenuto all’inizio del canale **#%1$s**.</string>
     <string name="beginning_channel_no_history">Non hai il permesso di vedere la cronologia dei messaggi di **#%1$s**.</string>
-    <string name="beginning_chat">Benvenuto all’inizio della chat.</string>
-    <string name="beginning_dm">Questo è l’inizio della cronologia dei tuoi messaggi diretti tra te e **@%1$s**.</string>
-    <string name="beginning_group_dm">Benvenuto all’inizio del gruppo **%1$s**.</string>
     <string name="beginning_group_dm_managed">Uscirai automaticamente dal gruppo quando avrai finito. Buon divertimento!</string>
     <string name="bg">Bulgaro</string>
     <string name="billing">Fatturazione</string>
@@ -528,12 +495,7 @@ Ma se e quando vorrai, non esitare!"</string>
     <string name="billing_payment_breakdown_total">Totale</string>
     <string name="billing_payment_history">Cronologia transazioni</string>
     <string name="billing_payment_premium">Il tuo abbonamento</string>
-    <string name="billing_payment_premium_legalese_monthly">Acquistando un abbonamento %1$s, dichiari di avere letto e accettato i nostri [Termini di Servizio del Negozio](%2$s). %1$s è un abbonamento a rinnovo automatico. Autorizzi Discord ad addebitare immediatamente %3$s dal Metodo di Pagamento fornito e a continuare a farlo in automatico mensilmente fino a che non annullerai il servizio. Potrai cancellare il tuo abbonamento in qualsiasi momento.</string>
-    <string name="billing_payment_premium_legalese_yearly">Acquistando un abbonamento %1$s, dichiari di avere letto e accettato i nostri [Termini di Servizio del Negozio](%2$s). %1$s è un abbonamento a rinnovo automatico. Autorizzi Discord ad addebitare immediatamente %3$s dal metodo di pagamento fornito e a continuare a farlo in automatico annualmente fino a che non annullerai il servizio. Potrai cancellare il tuo abbonamento in qualsiasi momento.</string>
     <string name="billing_payment_sources">Metodi di pagamento</string>
-    <string name="billing_payment_table_header_amount">IMPORTO</string>
-    <string name="billing_payment_table_header_date">DATA</string>
-    <string name="billing_payment_table_header_description">DESCRIZIONE</string>
     <string name="billing_premium_refund_text">"Se l'acquisto è stato effettuato negli ultimi %1$s giorni, puoi chiedere un rimborso. [Il nostro Centro assistenza ti aiuterà cortesemente a riavere il tuo denaro.](%2$s)"</string>
     <string name="billing_premium_refund_text_unable">"Ci dispiace, ma non hai diritto a un rimborso per questo acquisto. Puoi richiedere un rimborso solo se l'acquisto è stato effettuato negli ultimi %1$s giorni."</string>
     <string name="billing_price_per_month">%1$s / Mese</string>
@@ -543,9 +505,7 @@ Ma se e quando vorrai, non esitare!"</string>
     <string name="billing_purchase_details_header">Dettagli acquisto</string>
     <string name="billing_refund_header">Problemi con il tuo acquisto?</string>
     <string name="billing_refund_play_time_never_played">Mai avviato</string>
-    <string name="billing_refund_play_time_subheader">TEMPO DI GIOCO</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">"DATA DELL'ACQUISTO"</string>
     <string name="billing_refund_report_a_problem">Segnala un problema</string>
     <string name="billing_refund_request_button">Richiesta di rimborso</string>
     <string name="billing_sales_tax_added">%1$s di imposta sulle vendite sono stati sommati al tuo Indirizzo di fatturazione.</string>
@@ -568,16 +528,12 @@ Ma se e quando vorrai, non esitare!"</string>
     <string name="bot_dm_explicit_content">Aspetta un attimo! %1$s ha richiesto che Discord blocchi tutti i messaggi ritenuti espliciti dai nostri per lo più esperti robo-criceti. Il tuo messaggio è stato ritenuto esplicito e pertanto non è stato inviato. Comportati bene!</string>
     <string name="bot_dm_rate_limited">Stai inviando troppi messaggi diretti di fila. Aspetta qualche minuto prima di riprovare a contattare questo utente.</string>
     <string name="bot_dm_send_failed">Non è stato possibile recapitare il messaggio per uno dei seguenti motivi: non condividi un server con il destinatario, hai disattivato i messaggi diretti nei server che avete in comune, o il destinatario ti ha bloccato o accetta solo messaggi diretti dagli amici.</string>
-    <string name="bot_dm_send_message_temporarily_disabled">L’invio di messaggi in questo canale è stato temporaneamente disattivato. Riprova tra un po’.</string>
     <string name="bot_gdm_explicit_content">Aspetta un attimo! Uno degli utenti di %1$s ha richiesto che Discord blocchi tutti i messaggi ritenuti espliciti dai nostri per lo più esperti robo-criceti. Il tuo messaggio è stato ritenuto esplicito e pertanto non è stato inviato. Comportati bene!</string>
     <string name="bot_guild_explicit_content">Aspetta un attimo! Il proprietario di %1$s ha richiesto che Discord blocchi tutti i messaggi ritenuti espliciti dai nostri per lo più esperti robo-criceti. Il tuo messaggio è stato ritenuto esplicito e pertanto non è stato inviato. Comportati bene!</string>
-    <string name="bot_requires_email_verification">Devi verificare l’indirizzo e-mail prima di poter inviare messaggi qui dentro.</string>
     <string name="bot_video_disabled">Sembra che tu non abbia abbastanza banda larga per ricevere video, quindi li abbiamo disattivati per te.</string>
     <string name="browser_app">App Discord</string>
     <string name="browser_handoff_authenticating_description">È in corso un tentativo di autenticazione sul Discord Client per PC. Non chiudere questa finestra.</string>
     <string name="browser_handoff_authenticating_title">Autenticazione in corso</string>
-    <string name="browser_handoff_detecting_description">È in corso un tentativo di rilevare l’account di Discord dal tuo browser predefinito, aspetta un attimo.</string>
-    <string name="browser_handoff_detecting_title">Rilevamento dell’account in corso</string>
     <string name="browser_handoff_done_description">È in corso un tentativo di autenticazione sul Discord Client per PC. Non chiudere questa finestra.</string>
     <string name="browser_handoff_done_safe_to_close">Ora puoi chiudere questa finestra.</string>
     <string name="browser_handoff_done_title">Fatto</string>
@@ -586,12 +542,8 @@ Ma se e quando vorrai, non esitare!"</string>
     <string name="browser_handoff_success_body">Vuoi accedere con questo account?</string>
     <string name="browser_handoff_success_cancel">Vuoi accedere con un altro account?</string>
     <string name="browser_handoff_success_title">Ciao %1$s!</string>
-    <string name="browser_input_device_warning">"È impossibile cambiare i dispositivi di ingresso mentre usi il browser. [Scarica](onDownloadClick) l’applicazione per desktop
-per avere il pieno controllo sui dispositivi di ingresso."</string>
     <string name="browser_not_supported">Browser non supportato</string>
     <string name="browser_notifications_enabled_body">Via libera alle notifiche!</string>
-    <string name="browser_output_device_warning">"È impossibile cambiare i dispositivi di uscita mentre usi il browser. [Scarica](onDownloadClick) l’applicazione per desktop
-per avere il pieno controllo sui dispositivi di uscita."</string>
     <string name="bug_hunter_badge_tooltip">Cacciatore di bug di Discord</string>
     <string name="bundle_ready_body">Riavvia Discord per ricevere alcuni miglioramenti!</string>
     <string name="bundle_ready_later">Non ora</string>
@@ -603,8 +555,6 @@ per avere il pieno controllo sui dispositivi di uscita."</string>
     <string name="call_options">Opzioni della chiamata</string>
     <string name="call_unavailable">Chiamata non disponibile</string>
     <string name="call_user">Chiama %1$s</string>
-    <string name="camera_enable_access">Concedi l’accesso alla webcam</string>
-    <string name="camera_no_access">È necessario concedere l’accesso della tua webcam a Discord per videochiamare.</string>
     <string name="camera_no_device">Nessuna webcam rilevata.</string>
     <string name="camera_not_enabled">La webcam non è attivata</string>
     <string name="camera_off">Disattiva la webcam</string>
@@ -621,7 +571,6 @@ per avere il pieno controllo sui dispositivi di uscita."</string>
     <string name="cannot_manage_same_rank">Non puoi gestire questo utente perché il suo ruolo più alto è uguale al tuo.</string>
     <string name="captcha">CAPTCHA</string>
     <string name="captcha_failed">È stato rilevato un errore con il captcha. Per favore, riprova.</string>
-    <string name="captcha_failed_play_services">CAPTCHA non riuscito, è richiesto Google Play Services. Dopo l’installazione o l’aggiornamento, riavvia l’app e riprova.</string>
     <string name="captcha_failed_unsupported">CAPTCHA non riuscito, il dispositivo non è supportato.</string>
     <string name="captcha_issues">Problemi con il CAPTCHA?</string>
     <string name="captcha_open_browser">Apri browser</string>
@@ -634,12 +583,9 @@ per avere il pieno controllo sui dispositivi di uscita."</string>
     <string name="category_settings">Impostazioni categoria</string>
     <string name="category_settings_have_been_updated">Le impostazioni della categoria sono state aggiornate.</string>
     <string name="certified">Certificato</string>
-    <string name="certified_device_recommendation_audio_input_body">Discord ha rilevato un dispositivo certificato di ingresso audio denominato **%1$s %2$s**. Consigliamo di utilizzarlo per un’esperienza ottimale.</string>
-    <string name="certified_device_recommendation_audio_output_body">Discord ha rilevato un dispositivo certificato di uscita audio denominato **%1$s %2$s**. Consigliamo di utilizzarlo per un’esperienza ottimale.</string>
     <string name="certified_device_recommendation_cancel">No, grazie!</string>
     <string name="certified_device_recommendation_confirm">Inverti</string>
     <string name="certified_device_recommendation_title">Dispositivo certificato rilevato</string>
-    <string name="certified_device_recommendation_video_input_body">Discord ha rilevato un dispositivo certificato di ingresso video denominato **%1$s %2$s**. Consigliamo di utilizzarlo per un’esperienza ottimale.</string>
     <string name="change">Cambia</string>
     <string name="change_avatar">"Cambia
 avatar"</string>
@@ -658,7 +604,6 @@ icona"</string>
     <string name="change_log_md_date">2019-07-25</string>
     <string name="change_log_md_revision">1</string>
     <string name="change_log_md_video">https://cdn.discordapp.com/attachments/276789556253163520/603694851384541189/server-folders_THUMBNAIL_v2.png</string>
-    <string name="change_nickname">Cambiare soprannome</string>
     <string name="change_nickname_description">I membri con questo permesso potranno cambiare il proprio nickname.</string>
     <string name="change_nickname_warning">"I nickname sono visibili a tutti gli utenti del server. Non cambiarli a meno che tu non voglia seguire uno stile preciso
 o rimuovere un soprannome offensivo."</string>
@@ -691,7 +636,6 @@ I vanity URL possono contenere solo lettere, numeri e trattini."</string>
     <string name="channel_topic_empty">Nessun argomento impostato.</string>
     <string name="channel_type">Tipo di canale</string>
     <string name="channels">Canali</string>
-    <string name="channels_unavailable_body">Sei in un vicolo cieco. Non hai accesso a nessun canale testuale, oppure non ce n’è nessuno in questo server.</string>
     <string name="channels_unavailable_title">Nessun canale testuale</string>
     <string name="chat_attach_invite_to_listen">Invita %1$s ad ascoltare %2$s</string>
     <string name="chat_attach_invite_to_play_game">Invita %1$s a giocare a %2$s</string>
@@ -701,13 +645,8 @@ I vanity URL possono contenere solo lettere, numeri e trattini."</string>
     <string name="chat_behavior">Comportamento chat</string>
     <string name="checking_for_updates">Controllo aggiornamenti in corso</string>
     <string name="choose">Scegli</string>
-    <string name="choose_an_application">Scegli un’applicazione</string>
-    <string name="claim_account">Crea l’account</string>
     <string name="claim_account_body">Registra il tuo account per mantenere tutti i server e le chat, anche dopo aver chiuso il browser.</string>
     <string name="claim_account_email_to">Grazie! Abbiamo inviato un link di conferma a: **%1$s**</string>
-    <string name="claim_account_get_app">Scarica l’applicazione per desktop</string>
-    <string name="claim_account_promote_app">Scarica la nostra applicazione per desktop per sfruttare appieno l’overlay in gioco, le notifiche desktop e i tasti di scelta rapida di Discord.</string>
-    <string name="claim_account_required_body">Registra il tuo account per usare l’applicazione per desktop di Discord.</string>
     <string name="claim_account_required_email_to">Grazie! Abbiamo inviato un link di conferma a **%1$s**. Clicca il link per verificare il tuo account.</string>
     <string name="clear_cache">Svuota la cache</string>
     <string name="clone_channel">Clona il canale</string>
@@ -732,13 +671,11 @@ I vanity URL possono contenere solo lettere, numeri e trattini."</string>
     <string name="cloud_sync_modal_or">Oppure</string>
     <string name="collapse_category">Comprimi la categoria</string>
     <string name="coming_soon">In arrivo</string>
-    <string name="coming_soon_notifications">Il controllo granulare delle notifiche è disponibile solo sull’applicazione per desktop. Usa per ora le impostazioni delle notifiche di iOS.</string>
     <string name="coming_soon_title">IN ARRIVO!</string>
     <string name="command_giphy_description">Cerca una GIF animata nel Web</string>
     <string name="command_me_description">Scrive il tuo messaggio in corsivo.</string>
     <string name="command_nick_description">Cambia nickname su questo server.</string>
     <string name="command_nick_failure">Non puoi cambiare il tuo nickname su questo server.</string>
-    <string name="command_nick_failure_permission">Non disponi del permesso **Cambiare il nickname** su questo server.</string>
     <string name="command_nick_reset">Il tuo nickname su questo server è stato rimosso.</string>
     <string name="command_nick_success">Il tuo nickname su questo server ora è **%1$s**.</string>
     <string name="command_shrug_description">Aggiunge ¯\\_(ツ)_/¯ in fondo al tuo messaggio.</string>
@@ -774,7 +711,6 @@ I vanity URL possono contenere solo lettere, numeri e trattini."</string>
 sul piccolo testo in fondo."</string>
     <string name="confirm_disable_silence_dont_show">Non visualizzare più questo avviso</string>
     <string name="confirm_disable_silence_title">Non riusciamo a sentirti!</string>
-    <string name="confirm_user_block_body">Sei sicuro di voler bloccare **%1$s**? L’utente verrà anche rimosso dalla tua lista amici, se presente.</string>
     <string name="confirm_user_block_title">Bloccare %1$s?</string>
     <string name="connect">Collegarsi alla chat vocale</string>
     <string name="connect_account_description">Collega questi account per usare le integrazioni speciali di Discord.</string>
@@ -794,13 +730,10 @@ sul piccolo testo in fondo."</string>
     <string name="connection_enter_code">Inserisci il codice che appare sullo schermo</string>
     <string name="connection_invalid_pin">Codice PIN inserito non valido</string>
     <string name="connection_login_with">o accedi con</string>
-    <string name="connection_problems_body">Controlla lo [stato dei server](%1$s) o manda un tweet [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Autenticazione in corso</string>
-    <string name="connection_status_awaiting_endpoint">In attesa dell’endpoint</string>
     <string name="connection_status_connected">Connesso</string>
     <string name="connection_status_connecting">Connessione in corso</string>
     <string name="connection_status_disconnected">Disconnesso</string>
-    <string name="connection_status_ice_checking">Controllo dell’ICE</string>
     <string name="connection_status_no_route">Non raggiungibile</string>
     <string name="connection_status_rtc_connecting">Connessione in corso al server RTC</string>
     <string name="connection_status_rtc_disconnected">Disconnesso dal server RTC</string>
@@ -810,16 +743,12 @@ sul piccolo testo in fondo."</string>
     <string name="connection_verified">Verificato</string>
     <string name="connections">Collegamenti</string>
     <string name="content_matching">Contenuti di %1$s trovati per **%2$s**</string>
-    <string name="context_menu_hint">clicca sull’utente col tasto destro del mouse per vedere più azioni</string>
     <string name="continue_to_webapp">Continua su Discord</string>
     <string name="convert_emoticons">Converti automaticamente le emoticon dei tuoi messaggi in emoji.</string>
     <string name="copied_text">Copiato negli appunti.</string>
     <string name="copy">Copia</string>
-    <string name="copy_channel_topic">Copia l’argomento</string>
-    <string name="copy_id">Copia l’ID</string>
     <string name="copy_image_url">Copia URL immagine</string>
     <string name="copy_link">Copia il link</string>
-    <string name="copy_owner_id">Copia l’ID del proprietario</string>
     <string name="copy_text">Copia il testo</string>
     <string name="copy_username">Copia nome utente</string>
     <string name="country_codes">Prefisso nazione</string>
@@ -830,7 +759,6 @@ sul piccolo testo in fondo."</string>
     <string name="crash_details">Dettagli del crash</string>
     <string name="crash_device">Dispositivo: %1$s</string>
     <string name="crash_device_version">Versione dispositivo: %1$s</string>
-    <string name="crash_disclaimer">Attenzione! L’utilizzo delle app che tentano di personalizzare l’interfaccia utente del dispositivo non sono ufficialmente supportate e potrebbero causare comportamenti indesiderati.</string>
     <string name="crash_source">Origine del crash: %1$s</string>
     <string name="crash_testers_invite">Non tutto è perduto! Entra nel server ufficiale %1$s e facci sapere cosa ti è successo. Cercheremo di risolvere il problema il più presto possibile.</string>
     <string name="crash_timestamp">Orario del crash: %1$s</string>
@@ -839,11 +767,10 @@ sul piccolo testo in fondo."</string>
     <string name="create_category">Crea categoria</string>
     <string name="create_channel">Creare canale</string>
     <string name="create_group_dm">Crea chat di gruppo</string>
-    <string name="create_instant_invite">Creare invito istantaneo</string>
+    <string name="create_instant_invite">Creare invito</string>
     <string name="create_link">Crea link</string>
     <string name="create_or_join_modal_header">Oh, un altro server, eh?</string>
     <string name="create_server_button_body">Crea un nuovo server e invita gli amici. È gratis!</string>
-    <string name="create_server_button_cta">Crea un server</string>
     <string name="create_server_button_cta_mobile">Crea un nuovo server</string>
     <string name="create_server_button_cta_mobile_desc">Crea un server, invita i tuoi amici, fai festa!</string>
     <string name="create_server_description">Creare un server ti fornirà accesso **gratuito** a sistemi di chat vocale e testuale che potrai usare con gli amici.</string>
@@ -851,11 +778,7 @@ sul piccolo testo in fondo."</string>
     <string name="create_server_title">Crea il tuo server</string>
     <string name="create_text_channel">Crea un canale testuale</string>
     <string name="create_voice_channel">Crea un canale vocale</string>
-    <string name="credit_card_error_expiration">C’è qualcosa che non va con la data di scadenza</string>
-    <string name="credit_card_error_number">C’è qualcosa che non va con il numero della tua carta di credito</string>
     <string name="credit_card_error_required">È necessario un numero di carta.</string>
-    <string name="credit_card_error_security_code">C’è qualcosa che non va con il codice di sicurezza</string>
-    <string name="credit_card_error_zip_code">C’è qualcosa che non va con il codice postale</string>
     <string name="credit_card_expiration_date">Data di scadenza</string>
     <string name="credit_card_expiration_date_placeholder">MM/AA</string>
     <string name="credit_card_name">Nome</string>
@@ -871,7 +794,6 @@ sul piccolo testo in fondo."</string>
     <string name="da">Danese</string>
     <string name="data_download_requested_status_note">Recentemente hai richiesto una copia dei tuoi dati e informazioni. Potrai richiederli nuovamente il giorno %1$s</string>
     <string name="data_privacy_controls">Come usiamo i tuoi dati e le tue informazioni</string>
-    <string name="data_privacy_controls_basic_service_note">Per poter fornire i nostri servizi base, dobbiamo memorizzare ed elaborare alcune informazioni, come i tuoi messaggi, i server di cui fai parte e i tuoi messaggi diretti. Utilizzando Discord, ci consenti di fornire questi servizi base. Puoi interrompere l’erogazione dei servizi [disattivando o eliminando il tuo account](onClick).</string>
     <string name="data_privacy_controls_basic_service_title">Discord utilizza le tue informazioni per poter funzionare correttamente</string>
     <string name="data_privacy_controls_personal_data_title">Richiedi tutti i miei dati e informazioni</string>
     <string name="data_privacy_controls_personalization_note_learn_more">Questa impostazione permette di utilizzare le informazioni (ad esempio quali giochi hai giocato) per personalizzare Discord. [Per saperne di più.](%1$s)</string>
@@ -881,12 +803,9 @@ sul piccolo testo in fondo."</string>
     <string name="data_privacy_controls_request_data_failure_title">Oops, qualcosa è andato storto…</string>
     <string name="data_privacy_controls_request_data_modal_cancel">Ho cambiato idea</string>
     <string name="data_privacy_controls_request_data_modal_confirm">Richiedi i miei dati</string>
-    <string name="data_privacy_controls_request_data_modal_note">Potrebbero essere necessari fino a 30 giorni per raccogliere tutti i tuoi dati e informazioni. Invieremo un’e-mail all’indirizzo con cui ti sei registrato quando i documenti saranno pronti.</string>
-    <string name="data_privacy_controls_request_data_modal_success">I nostri criceti della privacy hanno cominciato a raccogliere i tuoi dati e informazioni. Questa operazione può richiedere fino a 30 giorni. Ti invieremo un’e-mail quando avranno finito.</string>
     <string name="data_privacy_controls_request_data_modal_success_title">Richiesta di dati e informazioni inviata</string>
     <string name="data_privacy_controls_request_data_modal_title">Invia una domanda per richiedere i miei dati</string>
     <string name="data_privacy_controls_request_data_note">[Scopri di più](%1$s) per sapere come ottenere una copia dei tuoi dati personali.</string>
-    <string name="data_privacy_controls_request_data_success_body">Ti invieremo un’e-mail con il link di download non appena saranno disponibili.</string>
     <string name="data_privacy_controls_request_data_success_title">Richiesta ricevuta</string>
     <string name="data_privacy_controls_request_data_tooltip">Il tuo account deve essere verificato con un indirizzo e-mail per poter richiedere dati e informazioni. Puoi verificare il tuo account nella sezione Il mio account</string>
     <string name="data_privacy_controls_usage_statistics_title">Permetti a Discord di utilizzare le tue informazioni per migliorare il servizio</string>
@@ -895,9 +814,7 @@ sul piccolo testo in fondo."</string>
     <string name="date">Data</string>
     <string name="de">Tedesco</string>
     <string name="deafen">"Silenzia l'audio"</string>
-    <string name="deafen_members">"Silenziare l'audio degli altri"</string>
     <string name="deauthorize">Rimuovi autorizzazione</string>
-    <string name="deauthorize_app">Rimuovi l’autorizzazione a quest’applicazione</string>
     <string name="decline">Rifiuta</string>
     <string name="default_app_description">- Nessuna specificata -</string>
     <string name="delete">Elimina</string>
@@ -925,9 +842,7 @@ sul piccolo testo in fondo."</string>
     <string name="delete_server_incorrect_name">Non hai inserito correttamente il nome del server</string>
     <string name="delete_server_title">Elimina «%1$s»</string>
     <string name="description">Descrizione</string>
-    <string name="desktop_icon_badge">Attiva l’indicatore dei messaggi non letti</string>
     <string name="desktop_notifications_enable">Attiva le notifiche desktop</string>
-    <string name="desktop_notifications_enable_body">Per le impostazioni specifiche per i canali o i server, fai clic con il pulsante destro del mouse sull’icona del server desiderato e seleziona «Impostazioni delle notifiche».</string>
     <string name="detect_platform_accounts">Rileva automaticamente gli account di altre piattaforme su questo computer.</string>
     <string name="developer_application_test_mode">Modalità test applicazione</string>
     <string name="developer_application_test_mode_activate">Attiva</string>
@@ -939,7 +854,6 @@ sul piccolo testo in fondo."</string>
     <string name="developer_application_test_mode_note">Inserisci il tuo ID Applicazione di Discord per abilitare la modalità test per quella applicazione.</string>
     <string name="developer_application_test_mode_placeholder">ID Applicazione</string>
     <string name="developer_mode">Modalità per sviluppatori</string>
-    <string name="developer_mode_help_text">La modalità per sviluppatori espone gli elementi del menu contestuale utili agli utenti che stanno creando bot usando l’[API di Discord](%1$s).</string>
     <string name="device_no_permission">Dispositivo %1$s</string>
     <string name="device_settings">Impostazioni dispositivo</string>
     <string name="direct_message">Messaggio diretto</string>
@@ -950,10 +864,7 @@ sul piccolo testo in fondo."</string>
     <string name="disable_email_notifications">Ben fatto, hai disattivato le notifiche via e-mail!</string>
     <string name="disable_email_notifications_body">Ora puoi chiudere questa pagina.</string>
     <string name="disable_email_notifications_failed">Ops! Non siamo riusciti a disattivare le notifiche via e-mail per il tuo indirizzo di posta.</string>
-    <string name="disable_email_notifications_failed_suggestion">È possibile che siano già state disattivate in precedenza o che l’indirizzo e-mail non sia più associato a un account di Discord.</string>
     <string name="disable_integration_title">Disattiva la sincronizzazione</string>
-    <string name="disable_integration_twitch_body">Disattivando la sincronizzazione, verrà eseguita l’azione per gli abbonamenti scaduti selezionata come se tutti gli abbonamenti fossero scaduti.</string>
-    <string name="disable_integration_youtube_body">Disattivando la sincronizzazione, verrà eseguita l’azione per le sponsorizzazioni scadute selezionate come se tutte le sponsorizzazioni fossero scadute.</string>
     <string name="disable_notifications_description">Verranno disattivate tutte le notifiche sul desktop in questa modalità.</string>
     <string name="disable_notifications_label">Disattiva le notifiche</string>
     <string name="disable_sounds_description">Verranno disattivati tutti gli effetti sonori in questa modalità.</string>
@@ -963,14 +874,12 @@ sul piccolo testo in fondo."</string>
     <string name="discard_changes_description">Hai delle modifiche non salvate, sei sicuro di volerle scartare?</string>
     <string name="disconnect">Disconnetti</string>
     <string name="disconnect_account">Disconnetti</string>
-    <string name="disconnect_account_body">Scollegando l’account potresti essere rimosso dai server a cui ti sei unito usandolo.</string>
     <string name="disconnect_account_title">Disconnetti %1$s</string>
     <string name="disconnect_from_voice">Disconnettiti dalla chat vocale</string>
     <string name="discord_desc_long">Chat per giocatori gratuita e sicura, funziona sia su desktop che su smartphone.</string>
     <string name="discord_desc_short">Chat vocale e chat testuale per squadre</string>
     <string name="discord_rich_presence">Rich Presence di Discord</string>
     <string name="dismiss">Chiudi</string>
-    <string name="dispatch_error_modal_body">"Qualcosa è andato storto. Se il problema persiste, crea un ticket d'assistenza e copia il contenuto del messaggio qui sotto."</string>
     <string name="dispatch_error_modal_error_label">"Messaggio d'errore (Copiami e inviami)"</string>
     <string name="dispatch_error_modal_header">Errore Discord Dispatch</string>
     <string name="dispatch_error_modal_open_ticket">Apri un ticket</string>
@@ -990,12 +899,10 @@ sul piccolo testo in fondo."</string>
     <string name="download">Scarica</string>
     <string name="download_app">"Scarica l'app"</string>
     <string name="download_apps">Scarica le app</string>
-    <string name="download_desktop_ptb_footer">Questa versione è troppo sperimentale per i tuoi gusti? [Scarica l’ultima build stabile](onClick).</string>
     <string name="download_desktop_stable_footer">Vuoi provare le ultime funzionalità di Discord prima del loro rilascio ufficiale? [Scarica la build pubblica di prova](onClick).</string>
     <string name="download_desktop_title">Usa Discord da casa</string>
     <string name="download_failed">Download fallito</string>
     <string name="download_file_complete">%1$s scaricato</string>
-    <string name="download_mobile_modal_apps_header">Scarica l’app mobile di Discord</string>
     <string name="download_mobile_title">O in movimento</string>
     <string name="duration_days">%1$s</string>
     <string name="duration_hours">%1$s</string>
@@ -1003,7 +910,6 @@ sul piccolo testo in fondo."</string>
     <string name="duration_minutes">%1$s</string>
     <string name="duration_seconds">%1$s</string>
     <string name="early_supporter_tooltip">"Sostenitore della prim'ora"</string>
-    <string name="echo_cancellation">Cancellazione dell’eco</string>
     <string name="edit">Modifica</string>
     <string name="edit_category">Modifica categoria</string>
     <string name="edit_channel">Modifica il canale</string>
@@ -1022,7 +928,6 @@ sul piccolo testo in fondo."</string>
     <string name="elevated_permissions_sound_title">Permessi audio</string>
     <string name="email">E-mail</string>
     <string name="email_invalid">E-mail non valida, controlla e riprova.</string>
-    <string name="email_required">È necessaria un’e-mail valida.</string>
     <string name="email_verification_instructions_body">Abbiamo inviato le istruzioni per cambiare la password a **%1$s**, controlla nella cartella della posta in arrivo e in quella della posta indesiderata.</string>
     <string name="email_verification_instructions_header">Istruzioni inviate</string>
     <string name="embed_links">Incorporare i link</string>
@@ -1039,12 +944,9 @@ sul piccolo testo in fondo."</string>
     <string name="emoji_matching">Emoji trovati per **%1$s**</string>
     <string name="emoji_name">Nome</string>
     <string name="emoji_slots_available">Disponibilità: %1$s</string>
-    <string name="emoji_too_big">Quell’emoji era troppo grande. Gli emoji devono occupare meno di %1$skb in dimensioni.</string>
     <string name="en_gb">Inglese, Regno Unito</string>
     <string name="en_us">Inglese, Stati Uniti</string>
     <string name="enable">Attiva</string>
-    <string name="enable_ingame_overlay">Attiva l’overlay in gioco.</string>
-    <string name="enable_privacy_access">Puoi attivare l’accesso dalle impostazioni privacy.</string>
     <string name="enable_streamer_mode_description">Puoi impostare un tasto con cui attivare o disattivare la Modalità Streamer dalle [Impostazioni di associazione tasti](onClick).</string>
     <string name="enable_streamer_mode_label">Attiva la Modalità Streamer</string>
     <string name="enable_twitch_emoji_sync">Permetti agli utenti abbonati sincronizzati di usare le tue emoticon personalizzate di Twitch su Discord.</string>
@@ -1057,22 +959,16 @@ sul piccolo testo in fondo."</string>
     <string name="errors_restart_app">Ricarica Discord</string>
     <string name="errors_unexpected_crash">Sembra che Discord abbia smesso di funzionare….</string>
     <string name="es_es">Spagnolo</string>
-    <string name="everyone_popout_body">Se includi **%1$s** nel messaggio, menzionerai più di %2$s persone. Sei sicuro?</string>
     <string name="everyone_popout_enter">**INVIO** per mandare il messaggio</string>
     <string name="everyone_popout_esc">**ESC** per modificare</string>
-    <string name="everyone_popout_footer">Che ne dici di menzionare un ruolo o un singolo utente?</string>
     <string name="everyone_popout_send_now">Invia il messaggio</string>
     <string name="exit_full_screen">Esci dallo schermo intero</string>
     <string name="experiment_mobile_only_user_button_cancel">No</string>
-    <string name="experiment_mobile_only_user_button_go">Scarica l’app</string>
     <string name="experiment_mobile_only_user_email_confirmation">Evvai, e-mail inviata! Controlla la tua casella di posta per ottenere il link.</string>
     <string name="experiment_mobile_only_user_header">Salve amico!</string>
-    <string name="experiment_mobile_only_user_text1">Che ne dici di provare l’app di Discord per desktop? Ecco il link per scaricarla: %1$s</string>
-    <string name="experiment_mobile_only_user_text2">Che ne dici di provare l’app di Discord per desktop? Se vuoi, possiamo inviarti un link via e-mail per scaricarla.</string>
     <string name="expire_after">Scadenza dopo</string>
     <string name="expires_in">Scade tra:</string>
     <string name="explicit_content_filter_disabled">Non controllare i messaggi.</string>
-    <string name="explicit_content_filter_disabled_description">Opzione sconsigliata, specialmente per i server pubblici. Non aspettarti l’ora del tè con la nonna.</string>
     <string name="explicit_content_filter_high">Controlla i messaggi inviati da tutti i membri.</string>
     <string name="explicit_content_filter_high_description">Opzione consigliata per quando aspettarsi il meglio dai membri del server non basta.</string>
     <string name="explicit_content_filter_medium">Controlla i messaggi dei membri senza un ruolo.</string>
@@ -1080,7 +976,7 @@ sul piccolo testo in fondo."</string>
     <string name="failed">Non riuscito</string>
     <string name="fcm_fallback_notification_channel_label">Varie</string>
     <string name="fi">Finlandese</string>
-    <string name="file_upload_limit_premium">50 MB</string>
+    <string name="file_upload_limit_premium_tier_1">50 MB</string>
     <string name="file_upload_limit_standard">8 MB</string>
     <string name="filter">Filtro</string>
     <string name="filter_mentions">Filtri delle menzioni</string>
@@ -1088,52 +984,28 @@ sul piccolo testo in fondo."</string>
     <string name="focus_participant">Metti in primo piano questa persona</string>
     <string name="force_sync">Forza la sincronizzazione</string>
     <string name="forgot_password">Hai dimenticato la tua password?</string>
-    <string name="forgot_password_body">Non preoccuparti! Inserisci l’e-mail associata al tuo account, così possiamo verificare che sei tu.</string>
     <string name="form_checkbox_debug_logging">Logging di debug</string>
     <string name="form_checkbox_qos">Attiva priorità alta per i pacchetti per la qualità del servizio</string>
     <string name="form_description_audio_mode_android_call">Se si verificano problemi con il microfono o con le cuffie, prova ad usare questa modalità audio. In caso contrario, utilizza il valore predefinito.</string>
-    <string name="form_description_audio_mode_android_communication">Questa è la modalità audio predefinita per le applicazioni VoIP come Discord. Consigliamo di lasciare questa impostazione inalterata.</string>
     <string name="form_description_push_afk_timeout">"Discord non invierà notifiche push sul tuo dispositivo mobile quando sei al computer.
 Usa questa impostazione per indicare il tempo di inattività prima di ricevere delle notifiche push."</string>
     <string name="form_description_tts">Attiva questa opzione per farti leggere le notifiche da un robot ultrasofisticato.</string>
     <string name="form_error_generic">Oops! Sei incappato in un errore ultra raro. È probabilmente colpa nostra, prova di nuovo o controlla lo [stato dei server](%1$s).</string>
     <string name="form_help_afk_channel">"Gli utenti che superano il periodo di inattività (AFK) massimo vengono spostati in questo canale e silenziati automaticamente.
 Non riguarda gli utenti connessi da browser."</string>
-    <string name="form_help_attenuation">"Riduce il volume delle altre applicazioni di una data percentuale mentre parla qualcuno.
-Sposta il selettore allo 0%% per disattivare l’attenuazione."</string>
-    <string name="form_help_automatic_vad">Quando l’indicatore è verde, Discord sta trasmettendo la tua bella voce.</string>
-    <string name="form_help_bitrate">"**TUTTI QUEI BIT!**A meno che tu non sia un patito dell'audio, ti sconsigliamo di alzare la velocità di trasmissione al di sopra di %1$s Kbps
-per evitare disagi agli utenti connessi tramite dispositivi mobili o dotati di connessione di bassa qualità."</string>
     <string name="form_help_certified_voice_processing">"Se stai utilizzando un microfono certificato da Discord, alcune funzionalità di elaborazione della voce vengono gestite dal microfono,
 non più dal nostro client."</string>
     <string name="form_help_channel_permissions">Selezionando i ruoli verranno configurati automaticamente i permessi del canale.</string>
     <string name="form_help_custom_code">Usa un qualsiasi valore alfanumerico come codice.</string>
     <string name="form_help_debug_logging">Salva i file di log di debug nella cartella dei moduli vocali, che puoi inviarci per la risoluzione dei problemi.</string>
-    <string name="form_help_default_notification_settings">"Questa opzione decide l’azione predefinita per le notifiche del server
-per gli utenti che non hanno configurato le impostazioni delle notifiche. **Consigliamo vivamente di attivare le notifiche solo per le @menzioni per un Discord pubblico per evitare situazioni folli
-come [questa](%1$s).**"</string>
-    <string name="form_help_default_notification_settings_mobile">"Questa opzione decide l’azione predefinita per le notifiche del server per gli utenti che non hanno configurato le impostazioni delle notifiche. 
-Consigliamo vivamente di attivare le notifiche solo per le @menzioni per un Discord pubblico."</string>
-    <string name="form_help_explicit_content_filter">"Attiva la ricerca ed eliminazione automatica dei messaggi con contenuti espliciti in questo server. Scegli il livello dei filtri
-da applicare ai membri del tuo server. **Consigliamo l’utilizzo dei filtri specialmente se il server è pubblico.**"</string>
-    <string name="form_help_instant_invite_channel">"Selezionando un canale, verrà incluso un link d'invito istantaneo con il widget,
-altrimenti verranno mostrati solo i membri online e i canali vocali."</string>
-    <string name="form_help_last_seen">"Il processo espellerà **%1$s** con tempo di inattività pari
-a **%2$s** e a cui non è stato assegnato un ruolo.
-Gli utenti espulsi potranno riunirsi al server solo tramite un nuovo invito istantaneo."</string>
     <string name="form_help_legacy_subsystem">"Certi driver dell'hardware audio vanno in conflitto con il sottosistema audio moderno del tuo sistema operativo.
 Spunta questa casella per usare un sottosistema audio legacy."</string>
     <string name="form_help_nsfw">"Gli utenti dovranno confermare di essere maggiorenni per visualizzare il contenuto di questo canale.
 I canali NSFW (per adulti) sono esenti dal filtro dei contenuti espliciti."</string>
-    <string name="form_help_premade_widget">"Incorpora questo codice HTML sul tuo sito web per usare il fantastico widget prefissato di Discord. Se hai accesso agli utenti del tuo sito,
-puoi anche aggiungere il parametro &amp;username= alla stringa di ricerca."</string>
     <string name="form_help_qos">"Indica al router che i pacchetti inviati da Discord sono di alta priorità.
 Potrebbe causare problemi con certi router o provider."</string>
     <string name="form_help_slowmode">I membri non potranno mandare più di un messaggio per questo intervallo di tempo, a meno che non si posseggano i permessi Gestire canale o Gestire messaggi.</string>
-    <string name="form_help_system_channel">Invia un messaggio su questo canale quando qualcuno si unisce al server. I messaggi sono casuali. Questa opzione può essere disattivata in qualunque momento.</string>
     <string name="form_help_temporary">Gli utenti a cui non viene assegnato un ruolo verranno automaticamente espulsi dal server non appena si disconnetteranno.</string>
-    <string name="form_help_user_limit">"Limita il numero di utenti ai quali è consentito accedere a questo canale vocale. Gli utenti che hanno il permesso **Spostare gli utenti**
-possono ignorare questo limite e spostare altri utenti nel canale."</string>
     <string name="form_help_verification_level">"I membri del server devono soddisfare i seguenti criteri prima di poter inviare messaggi nei canali testuali
 o avviare conversazioni con messaggi diretti. Non conta per i membri a cui viene assegnato un ruolo.
 **Consigliamo di impostare un livello di verifica per un Discord pubblico**"</string>
@@ -1145,9 +1017,7 @@ o avviare conversazioni con messaggi diretti. Non conta per i membri a cui viene
     <string name="form_label_audio_mode_android">Modalità audio</string>
     <string name="form_label_audio_mode_android_call">Modalità chiamata</string>
     <string name="form_label_audio_mode_android_communication">Modalità di comunicazione</string>
-    <string name="form_label_automatic_vad">Determina automaticamente la sensibilità dell’ingresso.</string>
     <string name="form_label_automatic_vad_mobile">Sensibilità automatica</string>
-    <string name="form_label_avatar_size">Dimensioni dell’avatar</string>
     <string name="form_label_bitrate">Velocità di trasmissione</string>
     <string name="form_label_category_permissions">Chi può accedere a questa categoria?</string>
     <string name="form_label_channel_name">Nome del canale</string>
@@ -1171,11 +1041,9 @@ o avviare conversazioni con messaggi diretti. Non conta per i membri a cui viene
     <string name="form_label_hoist_description">Mostra i membri del ruolo in una categoria separata dagli utenti online</string>
     <string name="form_label_input">Ingresso</string>
     <string name="form_label_input_device">Dispositivo di ingresso</string>
-    <string name="form_label_input_mode">Modalità dell’ingresso</string>
-    <string name="form_label_input_sensitivty">Sensibilità dell’ingresso</string>
     <string name="form_label_input_volume">Volume di ingresso</string>
-    <string name="form_label_instant_invite">Inserisci un invito istantaneo</string>
-    <string name="form_label_instant_invite_channel">Canale dell’invito istantaneo</string>
+    <string name="form_label_instant_invite">Inserisci un invito</string>
+    <string name="form_label_instant_invite_channel">"Canale dell'invito"</string>
     <string name="form_label_json_api">API JSON</string>
     <string name="form_label_last_seen">Ultimo accesso</string>
     <string name="form_label_local_mute">Silenziamento locale</string>
@@ -1242,7 +1110,6 @@ o avviare conversazioni con messaggi diretti. Non conta per i membri a cui viene
     <string name="form_label_suppress_everyone">Disattiva **@everyone** e **@here**</string>
     <string name="form_label_synced_role">Ruolo sincronizzato</string>
     <string name="form_label_synced_subs">Abbonati sincronizzati</string>
-    <string name="form_label_system_channel">Canale per i messaggi di benvenuto</string>
     <string name="form_label_temporary">Iscrizione temporanea</string>
     <string name="form_label_tts">Sintesi vocale</string>
     <string name="form_label_tts_notifications">Notifiche con sintesi vocale</string>
@@ -1257,15 +1124,6 @@ o avviare conversazioni con messaggi diretti. Non conta per i membri a cui viene
     <string name="form_placeholder_reason">Motivo</string>
     <string name="form_placeholder_server_name">Inserisci un nome del server</string>
     <string name="form_placeholder_username">Che nome vuoi usare?</string>
-    <string name="form_report_help_text">"Le segnalazioni vengono inviate al nostro team per la sicurezza, **non al proprietario del server**.
-
-Creare false segnalazioni e/o spam tramite il pulsante «Segnala» potrebbero revocare la funzione di segnalazione.
-
-Ulteriori informazioni su le [Linee guida della Comunità di Discord](%1$s).
-Grazie per mantenere le cose al sicuro."</string>
-    <string name="form_warning_input_sensitivty">"Non hai un dispositivo di ingresso attivo. Devi fornire a Discord l’[accesso al tuo microfono](onEnableClick)
-per poter verificare la sensibilità dell’ingresso."</string>
-    <string name="form_warning_video_preview">È necessario concedere l’[accesso della tua webcam](onEnableClick) a Discord per vedere l’anteprima.</string>
     <string name="fr">Francese</string>
     <string name="friend_has_been_deleted">Amicizia rimossa.</string>
     <string name="friend_permitted_source">Chi può inviarti una richiesta di amicizia</string>
@@ -1280,7 +1138,6 @@ per poter verificare la sensibilità dell’ingresso."</string>
     <string name="friend_request_rate_limited_body">Stai inviando troppe richieste di amicizia di fila!</string>
     <string name="friend_request_rate_limited_button">"Rilassati un po'"</string>
     <string name="friend_request_rate_limited_header">"EHI, EHI, RALLENTA UN PO'!"</string>
-    <string name="friend_request_requires_email_validation_body">Devi creare un account e verificare l’indirizzo e-mail ad esso associato prima di poter inviare richieste di amicizia.</string>
     <string name="friend_request_requires_email_validation_button">Torna nella zona di verifica.</string>
     <string name="friend_request_requires_email_validation_header">ASPETTA UN MOMENTO.</string>
     <string name="friend_request_sent">Richiesta di amicizia inviata.</string>
@@ -1331,10 +1188,6 @@ per poter verificare la sensibilità dell’ingresso."</string>
     <string name="game_detected">Stai giocando a: %1$s</string>
     <string name="game_detection_foreground_android">Attiva il Servizio in primo piano di Rilevazione dei giochi</string>
     <string name="game_detection_foreground_info_android">Ciò migliorerà la Rilevazione dei giochi ma mostrerà una notifica costante</string>
-    <string name="game_detection_modal_info_android">"Per attivare la Rilevazione dei giochi, devi fare questo per Discord:
-1) Apri Impostazioni di Accesso utilizzo
-2) Seleziona Discord
-3) Metti \"Permesso di accesso utilizzo\" su attivo"</string>
     <string name="game_detection_open_settings">Apri le impostazioni</string>
     <string name="game_detection_service">Servizio Rilevazione dei giochi</string>
     <string name="game_feed_activity_action_play">Gioca</string>
@@ -1342,7 +1195,6 @@ per poter verificare la sensibilità dell’ingresso."</string>
     <string name="game_feed_activity_recently_played">Ci hanno giocato di recente</string>
     <string name="game_feed_activity_streaming_twitch">Streaming su Twitch</string>
     <string name="game_feed_current_header_title">In gioco</string>
-    <string name="game_feed_settings_visibility">Mostra sulla scheda Giochi</string>
     <string name="game_feed_unknown_player">Giocatore sconosciuto</string>
     <string name="game_feed_user_played_days_ago">Ultimo avvio: %1$s %2$s fa</string>
     <string name="game_feed_user_played_hours_ago">Ultimo avvio: %1$s %2$s fa</string>
@@ -1412,6 +1264,7 @@ per poter verificare la sensibilità dell’ingresso."</string>
     <string name="generate_a_new_link">Genera il nuovo link</string>
     <string name="get_started">Iniziamo</string>
     <string name="gif_auto_play_label">Riproduci automaticamente le GIF quando Discord è in primo piano.</string>
+    <string name="go_live_hardware_acceleration_unavailable">Non riusciamo a rilevare nessun accelerazione hardware. Il tuo computer potrebbe non supportare Go Live.</string>
     <string name="go_live_hey">Ciao!</string>
     <string name="go_live_listen">Ascolta!</string>
     <string name="go_live_look">Guarda!</string>
@@ -1425,12 +1278,11 @@ per poter verificare la sensibilità dell’ingresso."</string>
     <string name="go_live_modal_select_channel_form_title">Seleziona un canale vocale</string>
     <string name="go_live_modal_select_channel_placeholder">Cerca canali vocali</string>
     <string name="go_live_modal_title">In onda</string>
+    <string name="go_live_video_drivers_outdated">I tuoi driver video non sono aggiornati. Aggiornali per ottenere migliori prestazioni Go Live.</string>
     <string name="grant_temporary_membership">Unione temporanea al server</string>
     <string name="group">Gruppo</string>
-    <string name="group_dm_add_friends">Aggiungi amici al gruppo</string>
     <string name="group_dm_add_members">Aggiungi %1$s</string>
     <string name="group_dm_header">Seleziona gli amici</string>
-    <string name="group_dm_invite_empty">Nessun amico trovato che non faccia già parte di questo gruppo.</string>
     <string name="group_dm_invite_full_sub">I gruppi possono avere al massimo 10 utenti.</string>
     <string name="group_dm_invite_link_title">"Oppure, manda un link d'invito ad un amico!"</string>
     <string name="group_dm_invite_no_friends">Non hai amici da aggiungere!</string>
@@ -1501,46 +1353,32 @@ per poter verificare la sensibilità dell’ingresso."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">Ha **garantito** %1$s per **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Spostato da **%1$s** a **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">In **%1$sª** posizione</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) ha creato il canale testuale $[**%2$s**](targetHook)</string>
-    <string name="guild_settings_audit_log_channel_topic_change">Ha cambiato l’argomento del canale in **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_topic_create">Ha impostato l’argomento del canale a **%1$s**</string>
     <string name="guild_settings_audit_log_channel_update">$[**%1$s**](userHook) ha modificato $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_voice_create">$[**%1$s**](userHook) ha creato il canale vocale $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_common_reason">Con il motivo **%1$s**</string>
-    <string name="guild_settings_audit_log_emoji_create">$[**%1$s**](userHook) ha creato l’emoji $[**%2$s**](targetHook)</string>
-    <string name="guild_settings_audit_log_emoji_delete">$[**%1$s**](userHook) ha eliminato l’emoji $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_emoji_name_change">Ha cambiato il nome da **%1$s** a **%2$s**</string>
     <string name="guild_settings_audit_log_emoji_name_create">Con il nome **%1$s**</string>
-    <string name="guild_settings_audit_log_emoji_update">$[**%1$s**](userHook) ha aggiornato l’emoji $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_guild_afk_channel_id_change">Ha impostato **%1$s** come canale AFK (utenti inattivi)</string>
     <string name="guild_settings_audit_log_guild_afk_channel_id_clear">Ha **liberato** il canale AFK (utenti inattivi)</string>
     <string name="guild_settings_audit_log_guild_afk_timeout_change">Ha impostato il periodo di inattività (AFK) massimo a **%1$s** minuti</string>
-    <string name="guild_settings_audit_log_guild_default_message_notifications_change_all_messages">Ha attivato l’impostazione predefinita delle notifiche dei messaggi a **Tutti i messaggi**</string>
-    <string name="guild_settings_audit_log_guild_default_message_notifications_change_only_mentions">Ha attivato l’impostazione predefinita delle notifiche dei messaggi a **Solo le menzioni**</string>
     <string name="guild_settings_audit_log_guild_explicit_content_filter_all_members">Ha impostato il filtro dei contenuti espliciti in modo che controlli i messaggi di **tutti i membri**</string>
     <string name="guild_settings_audit_log_guild_explicit_content_filter_disable">Ha **disattivato** il filtro dei contenuti espliciti</string>
     <string name="guild_settings_audit_log_guild_explicit_content_filter_members_without_roles">Ha impostato il filtro dei contenuti espliciti in modo che controlli i messaggi dei **membri senza ruolo**</string>
-    <string name="guild_settings_audit_log_guild_icon_hash_change">Ha impostato l’icona del server</string>
     <string name="guild_settings_audit_log_guild_mfa_level_disabled">Ha **disattivato** la verifica in due passaggi</string>
     <string name="guild_settings_audit_log_guild_mfa_level_enabled">Ha **attivato** la verifica in due passaggi</string>
     <string name="guild_settings_audit_log_guild_name_change">Ha impostato il nome del server a **%1$s**</string>
     <string name="guild_settings_audit_log_guild_owner_id_change">Ha trasferito il server a **%1$s**</string>
     <string name="guild_settings_audit_log_guild_region_change">Ha cambiato la regione della chat vocale in **%1$s**</string>
-    <string name="guild_settings_audit_log_guild_system_channel_id_change">Ha impostato il canale di benvenuto su **%1$s**</string>
     <string name="guild_settings_audit_log_guild_system_channel_id_disable">Ha **disattivato** i messaggi di benvenuto</string>
     <string name="guild_settings_audit_log_guild_update">$[**%1$s**](userHook) ha modificato $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_guild_vanity_url_code_change">Ha impostato **%1$s** come vanity URL del server</string>
     <string name="guild_settings_audit_log_guild_vanity_url_code_delete">Ha **rimosso** la vanity URL del server</string>
-    <string name="guild_settings_audit_log_guild_widget_channel_id_change">Ha impostato **%1$s** come canale dell’invito del widget</string>
-    <string name="guild_settings_audit_log_guild_widget_channel_id_delete">Ha **rimosso** il canale dell’invito del widget</string>
     <string name="guild_settings_audit_log_guild_widget_disabled">Ha **disattivato** il widget</string>
     <string name="guild_settings_audit_log_guild_widget_enabled">Ha **attivato** il widget</string>
     <string name="guild_settings_audit_log_invite_channel_create">Per il canale **%1$s**</string>
     <string name="guild_settings_audit_log_invite_code_create">Con il codice **%1$s**</string>
     <string name="guild_settings_audit_log_invite_create">$[**%1$s**](userHook) ha creato un invito $[**%2$s**](targetHook)</string>
-    <string name="guild_settings_audit_log_invite_delete">$[**%1$s**](userHook) ha eliminato l’invito $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_invite_max_age_create">Che scade dopo **%1$s**</string>
     <string name="guild_settings_audit_log_invite_max_age_create_infinite">Che non scade **mai**</string>
     <string name="guild_settings_audit_log_invite_max_uses_create">Che scade dopo **%1$s** utilizzi</string>
@@ -1552,9 +1390,7 @@ per poter verificare la sensibilità dell’ingresso."</string>
     <string name="guild_settings_audit_log_member_ban_add">$[**%1$s**](userHook) ha bannato $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_member_ban_remove">$[**%1$s**](userHook) ha revocato il ban a $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_member_deaf_off">Ha **riattivato** il suo audio</string>
-    <string name="guild_settings_audit_log_member_deaf_on">Ha **silenziato** il suo audio</string>
     <string name="guild_settings_audit_log_member_kick">$[**%1$s**](userHook) ha espulso $[**%2$s**](targetHook)</string>
-    <string name="guild_settings_audit_log_member_mute_off">Ha **tolto il silenziamento** al suo microfono</string>
     <string name="guild_settings_audit_log_member_mute_on">Ha **silenziato** il suo microfono</string>
     <string name="guild_settings_audit_log_member_nick_change">Ha cambiato il suo nickname da **%1$s** a **%2$s**</string>
     <string name="guild_settings_audit_log_member_nick_create">Ha impostato il suo nickname a **%1$s**</string>
@@ -1580,7 +1416,6 @@ per poter verificare la sensibilità dell’ingresso."</string>
     <string name="guild_settings_audit_log_role_permissions_granted">Ha **garantito** %1$s</string>
     <string name="guild_settings_audit_log_role_update">$[**%1$s**](userHook) ha aggiornato il ruolo $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_time_at_android">%1$s alle ore %2$s</string>
-    <string name="guild_settings_audit_log_webhook_avatar">Ha cambiato l’avatar</string>
     <string name="guild_settings_audit_log_webhook_channel_change">Ha cambiato il canale a **%1$s**</string>
     <string name="guild_settings_audit_log_webhook_channel_create">Con il canale **%1$s**</string>
     <string name="guild_settings_audit_log_webhook_create">$[**%1$s**](userHook) ha creato il webhook $[**%2$s**](targetHook)</string>
@@ -1588,11 +1423,8 @@ per poter verificare la sensibilità dell’ingresso."</string>
     <string name="guild_settings_audit_log_webhook_name_change">Ha cambiato il nome da **%1$s** a **%2$s**</string>
     <string name="guild_settings_audit_log_webhook_name_create">Con il nome **%1$s**</string>
     <string name="guild_settings_audit_log_webhook_update">$[**%1$s**](userHook) ha aggiornato il webhook $[**%2$s**](targetHook)</string>
-    <string name="guild_settings_default_notification_settings_intro">Questa opzione decide l’azione predefinita per le notifiche del server per gli utenti che non le hanno configurate.</string>
     <string name="guild_settings_default_notification_settings_protip">Consigliamo vivamente di attivare le notifiche solo per le @menzioni per un Discord pubblico per evitare situazioni folli come [questa](%1$s).</string>
     <string name="guild_settings_emoji_alias">Nome emoji</string>
-    <string name="guild_settings_emoji_alias_placeholder">Inserisci il nome dell’emoji</string>
-    <string name="guild_settings_emoji_upload_to_server_message">Non lasciare che i tuoi meme rimangano sogni. Aggiungi fino a un massimo di %1$s emoji personalizzati che tutti possono usare su questo server. Gli emoji animati possono essere usati solo da utenti che hanno Discord Nitro. I nomi degli emoji devono essere lunghi almeno 2 caratteri e possono contenere solo caratteri alfanumerici e trattini bassi. Gli emoji devono occupare meno di %2$skb.</string>
     <string name="guild_settings_filter_action">Filtra per azione</string>
     <string name="guild_settings_filter_all">Tutti</string>
     <string name="guild_settings_filter_all_actions">Tutte le azioni</string>
@@ -1609,9 +1441,6 @@ per poter verificare la sensibilità dell’ingresso."</string>
     <string name="guild_settings_overview_notice">Attenzione! Ci sono delle modifiche non salvate!</string>
     <string name="guild_settings_server_invite_background">Sfondo degli inviti del server</string>
     <string name="guild_settings_title_server_widget">Widget del server</string>
-    <string name="guild_settings_widget_embed_help">"Incorpora questo codice HTML sul tuo sito web per usare il fantastico widget di Discord.
-
-Se hai accesso agli utenti del sito, puoi anche aggiungere dinamicamente il parametro &amp;username= alla stringa di richiesta."</string>
     <string name="guild_settings_widget_enable_widget">Attiva il widget del server</string>
     <string name="guild_verification_text_account_age">Il tuo account deve essere stato creato da almeno %1$s minuti per inviare messaggi in questo server.</string>
     <string name="guild_verification_text_member_age">Devi essere membro da almeno %1$s minuti per inviare messaggi in questo server.</string>
@@ -1620,7 +1449,6 @@ Se hai accesso agli utenti del sito, puoi anche aggiungere dinamicamente il para
     <string name="guild_verification_text_not_verified">Devi verificare il tuo account per inviare messaggi in questo server.</string>
     <string name="guild_verified">Verificato</string>
     <string name="hardware_acceleration">Accelerazione hardware</string>
-    <string name="hardware_acceleration_help_text">Attiva l’accelerazione hardware, che sfrutta la scheda video per rendere Discord più fluido. Disattiva l’opzione se riscontri problemi con la frequenza dei fotogrammi (FPS).</string>
     <string name="help">Aiuto</string>
     <string name="help_desk">Centro assistenza</string>
     <string name="help_missing_manage_roles_permission">Il ruolo è bloccato perché non disponi del permesso «Gestire i ruoli».</string>
@@ -1628,8 +1456,7 @@ Se hai accesso agli utenti del sito, puoi anche aggiungere dinamicamente il para
     <string name="help_role_locked">Il ruolo è bloccato perché è di livello più alto di quello a cui hai accesso.</string>
     <string name="help_role_locked_mine">Il ruolo è bloccato perché è di livello massimo. Chiedi aiuto a un utente di livello più alto o al proprietario del server.</string>
     <string name="help_singular_permission">Non puoi modificare questo permesso perché rimuoverlo lo rimuoverebbe anche a te stesso.</string>
-    <string name="hide_instant_invites_description">Opzione consigliata per evitare l’unione di utenti sconosciuti ai tuoi server di Discord.</string>
-    <string name="hide_instant_invites_label">"Nascondi i link d'invito istantaneo"</string>
+    <string name="hide_instant_invites_label">"Nascondi i link d'invito"</string>
     <string name="hide_muted">Nascondi %1$s canali silenziati</string>
     <string name="hide_muted_channels">Nascondi canali silenziati</string>
     <string name="hide_personal_information_description">Verranno nascosti tutti i dati personali, come indirizzo e-mail, account collegati, note e DiscordTag.</string>
@@ -1675,7 +1502,6 @@ Se hai accesso agli utenti del sito, puoi anche aggiungere dinamicamente il para
     <string name="hypesquad_question_11_response_d">Propongo a Wumpus di suonare piuttosto il tamburello</string>
     <string name="hypesquad_question_12_prompt">"Hai scalato la cima della montagna più alta, e ora l'unica cosa a separarti dalle ricchezze è il drago a tre teste del pinnacolo."</string>
     <string name="hypesquad_question_12_response_a">Mi fiondo nel combattimento</string>
-    <string name="hypesquad_question_12_response_b">Mi guardo i vecchi film di Godzilla per apprendere dai suoi combattimenti contro King Ghidorah</string>
     <string name="hypesquad_question_12_response_c">Cerco di convincere il drago a dividerci le ricchezze</string>
     <string name="hypesquad_question_12_response_d">Offro al drago un pupazzo di Wumpus, come potrebbe dire di no?</string>
     <string name="hypesquad_question_13_prompt">"Cos'è questo rumore?"</string>
@@ -1732,7 +1558,6 @@ Se hai accesso agli utenti del sito, puoi anche aggiungere dinamicamente il para
     <string name="hypesquad_question_9_response_a">Aiuto Wumpus a capire cosa potrebbe stare sbagliando</string>
     <string name="hypesquad_question_9_response_b">Non dico niente e resuscito la squadra</string>
     <string name="hypesquad_question_9_response_c">Mi faccio una risata e propongo di riprovare</string>
-    <string name="hypesquad_question_9_response_d">Butto fuori Wumpus dal party e prendo Clyde come nuovo tank</string>
     <string name="hypesquad_quiz_body_house_1">"L'House of Bravery ti ringrazia per esserti unito alla nostra campagna per proteggere queste terre e mantenere viva l'eredità di Renwil. Il tuo coraggio è paragonabile a quello di mille prodi guerrieri, e senza la tua guida e il tuo valore saremmo molto più prossimi a piombare nel caos."</string>
     <string name="hypesquad_quiz_body_house_2">"L'House of Brilliance ti ringrazia per esserti unito alla nostra campagna per proteggere queste terre e mantenere viva l'eredità di Urdim. Il tuo modo di attuare strategie è proprio quello di un abile stratega e senza il tuo approccio calcolato ad ogni conflitto a cui vai incontro, saremmo molto più prossimi a piombare nel caos."</string>
     <string name="hypesquad_quiz_body_house_3">"L'House of Balance ti ringrazia per esserti unito alla nostra campagna per proteggere queste terre e mantenere viva l'eredità di Arame. La tua capacità di rimanere saldo e deciso in tempi di incertezza è ammirevole. Senza la tua innata comprensione dell'ambiente circostante e del tuo io interiore, saremmo molto più prossimi a piombare nel caos."</string>
@@ -1769,7 +1594,6 @@ Se hai accesso agli utenti del sito, puoi anche aggiungere dinamicamente il para
     <string name="incoming_video_call_ellipsis">Videochiamata in arrivo…</string>
     <string name="inivte_modal_no_thanks">No, grazie</string>
     <string name="inline_attachment_media">…quando sono caricati direttamente su Discord.</string>
-    <string name="inline_attachment_media_help">Le immagini più grandi di %1$sMB non avranno l’anteprima.</string>
     <string name="inline_embed_media">…quando sono inviati come link nella chat testuale.</string>
     <string name="inline_media_label">Mostra le immagini, i video e i lolcat…</string>
     <string name="input_mode_ptt">Push-to-talk</string>
@@ -1777,14 +1601,13 @@ Se hai accesso agli utenti del sito, puoi anche aggiungere dinamicamente il para
     <string name="input_mode_ptt_release_delay">Ritardo per il rilascio del push-to-talk</string>
     <string name="input_mode_vad">Attività vocale</string>
     <string name="install_location_main">Principale</string>
-    <string name="instant_invite">Crea invito istantaneo</string>
-    <string name="instant_invite_accept">Accetta l’invito</string>
-    <string name="instant_invite_accepted">Invito istantaneo accettato</string>
-    <string name="instant_invite_accepting">Accettazione dell’invito istantaneo</string>
+    <string name="instant_invite">Invito</string>
+    <string name="instant_invite_accepted">Invito accettato</string>
+    <string name="instant_invite_accepting">Accetta l’invito</string>
     <string name="instant_invite_ask_for_new_invite">Chiedine uno nuovo!</string>
     <string name="instant_invite_ask_user_for_new_invite">Chiedi a %1$s un nuovo invito!</string>
     <string name="instant_invite_code">Codice</string>
-    <string name="instant_invite_expired">L’invito istantaneo non è valido o è scaduto.</string>
+    <string name="instant_invite_expired">L’invito non è valido o è scaduto.</string>
     <string name="instant_invite_expires">Scadenza</string>
     <string name="instant_invite_failed_to_generate">"Impossibile creare un link d'invito."</string>
     <string name="instant_invite_generate">Genera</string>
@@ -1795,29 +1618,20 @@ Se hai accesso agli utenti del sito, puoi anche aggiungere dinamicamente il para
     <string name="instant_invite_hidden">Nascosto; usa il pulsante di copia</string>
     <string name="instant_invite_invalid_channel">Non puoi creare link di invito per questo canale. Prova su un altro!</string>
     <string name="instant_invite_invite_code">Codice di invito</string>
-    <string name="instant_invite_inviter">Autore dell’invito</string>
-    <string name="instant_invite_looks_like">L’invito sarà simile a questi:</string>
-    <string name="instant_invite_not_allowed">Accidenti. Sembra che tu non possa creare link d’invito per questo server.</string>
     <string name="instant_invite_popout">Condividi questo link con chi vuoi per fornirgli accesso istantaneo a questo canale.</string>
     <string name="instant_invite_regenerate">Rigenera</string>
     <string name="instant_invite_resolved_body">Sei stato invitato al canale **%1$s** del server **%2$s**.</string>
     <string name="instant_invite_resolved_title">Ciao!</string>
-    <string name="instant_invite_resolving">Elaborazione dell’invito istantaneo</string>
+    <string name="instant_invite_resolving">Elaborazione dell’invito</string>
     <string name="instant_invite_uses">Utilizzi</string>
     <string name="instant_invite_you_are_already_a_member_of">Sei già un membro di</string>
     <string name="instant_invite_you_have_been_invited_to_join">Sei stato invitato a unirti a</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** ti ha invitato a partecipare</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Sei stato invitato a entrare in una chat di gruppo da</string>
-    <string name="instant_invites">Inviti istantanei</string>
+    <string name="instant_invites">Inviti</string>
     <string name="integration_settings">Impostazioni delle integrazioni</string>
     <string name="integrations">Integrazioni</string>
-    <string name="integrations_header">Account Twitch/YouTube Gaming collegati</string>
-    <string name="integrations_pro_tip">Per altre app da poter integrare, dai un’occhiata allo [StreamKit di Discord](%1$s).</string>
     <string name="internal_server_error">Si è verificato un errore interno del server, riprovare.</string>
-    <string name="invalid_animated_emoji_body">L’emoji non funziona perché è animato. Abbonati a Discord Nitro per dar vita agli emoji animati dei tuoi sogni</string>
-    <string name="invalid_animated_emoji_body_upgrade">L’emoji non funziona perché è animato. L’abbonamento a Discord Nitro è la soluzione al problema, dai un’occhiata in Impostazioni utente > Nitro per i dettagli</string>
-    <string name="invalid_external_emoji_body">Non puoi usare quell’emoji poiché appartiene a un altro server. Abbonati a Discord Nitro per usare gli emoji di altri server</string>
-    <string name="invalid_external_emoji_body_upgrade">Non puoi usare quell’emoji perché appartiene a un altro server. Discord Nitro risolve tutto questo, vai a Impostazioni utente > Nitro per saperne di più</string>
     <string name="invalid_invite_link_error">"Per favore, inserisci un link d'invito o un codice di invito valido."</string>
     <string name="invalid_request_format">**%1$s** non è scritto in un formato valido. Inserisci un DiscordTag#0000 o un indirizzo e-mail.</string>
     <string name="invalid_text_channel">canale non valido</string>
@@ -1832,7 +1646,6 @@ Se hai accesso agli utenti del sito, puoi anche aggiungere dinamicamente il para
     <string name="invite_button_invalid">Invito non valido</string>
     <string name="invite_button_invalid_owner">Prova ad inviare un nuovo invito!</string>
     <string name="invite_button_join">unisciti a **%1$s**</string>
-    <string name="invite_button_resolving">Elaborazione dell’invito</string>
     <string name="invite_button_stream_ended">%1$s era in onda</string>
     <string name="invite_button_stream_ended_streamer">Eri in onda</string>
     <string name="invite_button_stream_watching">Sta guardando</string>
@@ -1860,7 +1673,6 @@ Se hai accesso agli utenti del sito, puoi anche aggiungere dinamicamente il para
     <string name="invite_embed_invite_to_listen">Invito ad ascoltare assieme su %1$s</string>
     <string name="invite_embed_invite_to_spectate">Invita ad assistere</string>
     <string name="invite_embed_invite_to_watch">Invita a guardare %1$s</string>
-    <string name="invite_embed_join_via_desktop_app">Unisciti tramite l’applicazione per desktop</string>
     <string name="invite_embed_joined">Unito</string>
     <string name="invite_embed_listen_has_ended">Il gruppo di ascolto è terminato!</string>
     <string name="invite_embed_listening_invite">Invita ad ascoltare assieme</string>
@@ -1868,7 +1680,6 @@ Se hai accesso agli utenti del sito, puoi anche aggiungere dinamicamente il para
     <string name="invite_embed_num_open_slots_android">%1$s</string>
     <string name="invite_embed_send_invite">Manda invito</string>
     <string name="invite_embed_spectate">Osserva</string>
-    <string name="invite_embed_spectate_via_desktop_app">Guarda tramite l’applicazione per desktop</string>
     <string name="invite_embed_watch_has_ended">Il gruppo di visione è terminato!</string>
     <string name="invite_expires_days">"Il tuo link d'invito scade tra 1 giorno."</string>
     <string name="invite_expires_days_or_uses">"Il tuo link d'invito scade tra 1 giorno, o dopo %1$s."</string>
@@ -1895,11 +1706,9 @@ Vuoi saperne di più su Discord?"</string>
     <string name="invite_links_never_expires">Questo link non scadrà mai, dovrai disattivarlo dalle impostazioni.</string>
     <string name="invite_members">Invita membri</string>
     <string name="invite_modal_button">Unisciti a **%1$s**</string>
-    <string name="invite_modal_error_default">Impossibile accettare l’invito</string>
     <string name="invite_modal_error_title">Oops…</string>
     <string name="invite_modal_open_button">Vai su **%1$s**</string>
     <string name="invite_no_channels">Gli inviti richiedono un canale, non ci sono canali in questo server.</string>
-    <string name="invite_notice_message">Inizia un’avventura.</string>
     <string name="invite_notice_message_part_2">Invitiamo qualche amico!</string>
     <string name="invite_people">Invita</string>
     <string name="invite_search_for_friends">Cerca nuovi amici</string>
@@ -1916,20 +1725,19 @@ Vuoi saperne di più su Discord?"</string>
     <string name="invites">Inviti</string>
     <string name="ip_address_secured">Indirizzo IP protetto</string>
     <string name="ip_authorization_succeeded">Indirizzo IP autorizzato</string>
-    <string name="ip_authorization_succeeded_suggestion">Se hai seguito questo link dopo aver provato ad accedere dall’applicazione per desktop o per dispositivi mobili, torna indietro e riprova.</string>
     <string name="it">Italiano</string>
     <string name="ja">Giapponese</string>
     <string name="join">Unisciti</string>
     <string name="join_afk_channel_body">Non puoi parlare perché sei nel canale AFK (utenti inattivi).</string>
     <string name="join_call">Unisciti alla chiamata</string>
     <string name="join_server">Unisciti</string>
-    <string name="join_server_button_body">Unisciti al server di un amico tramite invito istantaneo.</string>
+    <string name="join_server_button_body">Unisciti al server di un amico tramite invito.</string>
     <string name="join_server_button_cta">Unisciti a un server</string>
     <string name="join_server_button_cta_mobile">"Entra in un server con un link d'invito"</string>
     <string name="join_server_button_cta_mobile_desc">Hai un codice invito o un link? Usalo qui!</string>
     <string name="join_server_button_cta_named">Unisciti a %1$s</string>
-    <string name="join_server_description">Inserisci l’invito istantaneo qui sotto per unirti a un server esistente. L’invito sarà simile a questi:</string>
-    <string name="join_server_description_mobile">Inserisci un invito istantaneo qui sopra per unirti a un server esistente.</string>
+    <string name="join_server_description">Inserisci l’invito qui sotto per unirti a un server esistente. L’invito sarà simile a questi:</string>
+    <string name="join_server_description_mobile">Inserisci un invito qui sopra per unirti a un server esistente.</string>
     <string name="join_server_title">Unisciti a un server</string>
     <string name="join_stream">Unisciti allo stream</string>
     <string name="join_video_call">Entra in videochiamata</string>
@@ -1946,7 +1754,6 @@ Vuoi saperne di più su Discord?"</string>
     <string name="keybind_conflict">Questa scorciatoia va in conflitto con una di quelle speciali. Abbiamo disattivato la scorciatoia speciale.</string>
     <string name="keybind_description_modal_call_accept">Accetta la chiamata in arrivo</string>
     <string name="keybind_description_modal_call_decline">Rifiuta la chiamata in arrivo</string>
-    <string name="keybind_description_modal_call_start">Avvia chiamata con l’utente o il gruppo</string>
     <string name="keybind_description_modal_create_dm_group">Crea un gruppo privato</string>
     <string name="keybind_description_modal_create_guild">Crea o unisciti a un server</string>
     <string name="keybind_description_modal_easter_egg">Demone furioso</string>
@@ -1969,7 +1776,6 @@ Vuoi saperne di più su Discord?"</string>
     <string name="keybind_description_modal_toggle_hotkeys">Mostra/nascondi scorciatoie</string>
     <string name="keybind_description_modal_toggle_mentions">Mostra/nascondi le menzioni recenti</string>
     <string name="keybind_description_modal_toggle_mute">Attiva/disattiva microfono</string>
-    <string name="keybind_description_modal_toggle_pins">Mostra/nascondi i messaggi fissati</string>
     <string name="keybind_description_modal_toggle_previous_guild">Passa al server più recente o ai messaggi diretti</string>
     <string name="keybind_description_modal_toggle_users">Mostra/nascondi la lista dei membri del canale</string>
     <string name="keybind_description_modal_unread_channels">Naviga tra i canali non letti</string>
@@ -1980,10 +1786,7 @@ Vuoi saperne di più su Discord?"</string>
     <string name="keybind_description_push_to_talk_priority">"Tieni premuto per attivare temporaneamente il tuo microfono quando sei in Modalità push-to-talk. Il volume
 delle persone che non stanno trasmettendo con priorità di trasmissione sarà abbassato temporaneamente
 mentre parli tu."</string>
-    <string name="keybind_description_toggle_deafen">Silenzia o riattiva la riproduzione del tuo microfono. Inoltre disattiva anche il tuo microfono quando l’audio è disattivato.</string>
     <string name="keybind_description_toggle_mute">Attiva o disattiva il microfono.</string>
-    <string name="keybind_description_toggle_overlay">Attiva o disattiva l’overlay.</string>
-    <string name="keybind_description_toggle_overlay_input_lock">Attiva o disattiva il blocco dell’interattività dell’overlay.</string>
     <string name="keybind_description_toggle_streamer_mode">Attiva o disattiva la Modalità Streamer.</string>
     <string name="keybind_description_toggle_voice_mode">Premi per passare dalla modalità ad attività vocale al push-to-talk, e viceversa.</string>
     <string name="keybind_description_unassigned">Questa azione non fa nulla! Scegline una diversa dal menu a tendina.</string>
@@ -1993,7 +1796,6 @@ mentre parli tu."</string>
     <string name="keybind_toggle_deafen">Silenzia/riattiva audio</string>
     <string name="keybind_toggle_mute">Attiva/disattiva microfono</string>
     <string name="keybind_toggle_overlay">Attiva/disattiva overlay</string>
-    <string name="keybind_toggle_overlay_input_lock">Attiva/disattiva blocco dell’overlay</string>
     <string name="keybind_toggle_stream_mode">Attiva/disattiva Modalità Streamer</string>
     <string name="keybind_toggle_voice_mode">Attiva/disattiva VAD</string>
     <string name="keybind_unassigned">Non assegnata</string>
@@ -2004,7 +1806,6 @@ mentre parli tu."</string>
     <string name="kick">Espelli</string>
     <string name="kick_from_server">Espelli</string>
     <string name="kick_members">Espelli membri</string>
-    <string name="kick_members_description">I membri con questo permesso potranno espellere gli utenti che non ce l’hanno.</string>
     <string name="kick_user_body">Sei sicuro di voler espellere %1$s? Potrà riunirsi al server solo con un nuovo invito.</string>
     <string name="kick_user_confirmed">«%1$s» è stato espulso dal server.</string>
     <string name="kick_user_error_generic">Ops… non è stato possibile espellere %1$s. Riprova!</string>
@@ -2026,7 +1827,6 @@ da **%1$s**."</string>
     <string name="leave_group_dm_managed_title">Esci dal gruppo %1$s</string>
     <string name="leave_group_dm_title">Esci da «%1$s»</string>
     <string name="leave_server">Esci dal server</string>
-    <string name="leave_server_body">Sei sicuro di voler uscire da **%1$s**? Se lo fai, potrai rientrarci solo tramite invito.</string>
     <string name="leave_server_body_mobile">Sei sicuro di voler uscire da %1$s?</string>
     <string name="leave_server_title">Esci da «%1$s»</string>
     <string name="library">Libreria</string>
@@ -2034,14 +1834,11 @@ da **%1$s**."</string>
     <string name="link_settings">Impostazioni del link</string>
     <string name="link_your_discord_account">Collega il tuo account di Discord</string>
     <string name="link_your_xbox_account_1">Collega il tuo account Xbox a Discord per mostrare a che gioco stai giocando.</string>
-    <string name="link_your_xbox_account_2">Discord è un’app di chat testuale, vocale e video per giocatori. Gratuita e sicura, funziona sia su desktop che su smartphone.</string>
     <string name="listening_to">Sta ascoltando **%1$s**</string>
     <string name="live">In onda</string>
-    <string name="live_beta_description">Benvenuto nello stream! In onda è in Beta. Ci scusiamo per qualsiasi intoppo</string>
+    <string name="live_beta_description">Benvenuto nello stream! Go Live è in Beta. Ci scusiamo per qualsiasi intoppo</string>
     <string name="live_on_twitch">In diretta su Twitch</string>
     <string name="live_viewers">%1$s %2$s</string>
-    <string name="load_image_error">"Caricamento dell’immagine non riuscito.
-Riprova."</string>
     <string name="load_more_messages">Carica altri messaggi</string>
     <string name="load_reactions_error">Ops, qualcosa è andato storto. Tocca la cacca per riprovare.</string>
     <string name="loading">Caricamento</string>
@@ -2059,9 +1856,7 @@ Riprova."</string>
     <string name="manage_channels_description">I membri con questo permesso potranno modificare o eliminare i canali esistenti, o crearne di nuovi.</string>
     <string name="manage_emojis">Gestire gli emoji</string>
     <string name="manage_messages">Gestire messaggi</string>
-    <string name="manage_messages_description">I membri con questo permesso potranno eliminare i messaggi degli altri utenti o mettere in evidenza qualsiasi messaggio.</string>
     <string name="manage_nicknames">Gestire i soprannomi</string>
-    <string name="manage_nicknames_description">I membri con questo permesso potranno cambiare il nickname degli altri utenti.</string>
     <string name="manage_permissions">Gestire permessi</string>
     <string name="manage_permissions_description">I membri con questo permesso potranno cambiare i permessi del canale.</string>
     <string name="manage_roles">Gestire i ruoli</string>
@@ -2071,10 +1866,7 @@ Riprova."</string>
     <string name="manage_user">Gestisci utente</string>
     <string name="manage_webhooks">Gestire i webhook</string>
     <string name="manage_webhooks_description">I membri con questo permesso potranno creare, modificare ed eliminare i webhook.</string>
-    <string name="managed_role_explaination">"Questo ruolo viene gestito automaticamente da un’integrazione.
-Non può essere assegnato manualmente e non può essere eliminato."</string>
     <string name="mark_as_read">Segna come già letto</string>
-    <string name="masked_link_body">Questo link è mascherato. L’URL di destinazione è **%1$s**. Aprire il link?</string>
     <string name="masked_link_cancel">Annulla</string>
     <string name="masked_link_confirm">Sì!</string>
     <string name="masked_link_trust_this_domain">Fidati di questo link</string>
@@ -2097,7 +1889,6 @@ Non può essere assegnato manualmente e non può essere eliminato."</string>
     <string name="members_header">%1$s</string>
     <string name="members_matching">Membri trovati per **%1$s**</string>
     <string name="members_search_placeholder">Cerca tra i membri</string>
-    <string name="mention">Menziona</string>
     <string name="mention_everyone">Menzionare tutti</string>
     <string name="mention_everyone_autocomplete_description">Invia una notifica a tutti i membri che hanno i permessi per vedere il canale.</string>
     <string name="mention_everyone_autocomplete_description_mobile">Invia una notifica a tutti i membri del canale.</string>
@@ -2140,12 +1931,10 @@ Non può essere assegnato manualmente e non può essere eliminato."</string>
     <string name="mfa_sms_confirm_remove_body">Così facendo non avrai la possibilità di accedere con un codice di verifica tramite SMS. Sei sicuro di volerlo rimuovere?</string>
     <string name="mfa_sms_disabled_partner">Non disponibile per i partner</string>
     <string name="mfa_sms_enable">Attiva la verifica via SMS</string>
-    <string name="mfa_sms_enable_subheader">Ecco cos’altro puoi fare:</string>
     <string name="mfa_sms_phone_number_hide">Nascondi</string>
     <string name="mfa_sms_phone_number_reveal">Rivela</string>
     <string name="mfa_sms_receive_code">Ricevi il codice di autorizzazione via SMS</string>
     <string name="mfa_sms_remove">Rimuovi la verifica via SMS</string>
-    <string name="mfa_sms_resend">Vuoi inviare di nuovo l’SMS?</string>
     <string name="microphone_permission_error">Non è stato possibile togliere il silenziamento al microfono perché la finestra dei permessi è stata chiusa.</string>
     <string name="minimum_size">Dimensioni minime: **%1$sx%1$s**</string>
     <string name="missed_an_update">"Ti sei perso un aggiornamento? [Dai un'occhiata ai vecchi registri dei cambiamenti](%1$s)"</string>
@@ -2153,21 +1942,17 @@ Non può essere assegnato manualmente e non può essere eliminato."</string>
     <string name="missing_entitlement_modal_body_unknown_application">Discord non può avviare questo gioco perché ne hai perso i diritti. Ciò può essere per vari motivi, come un abbonamento Nitro scaduto, un rimborso o se il gioco è stato rimosso dal negozio Discord. [Leggi questo articolo di supporto per maggiori informazioni o assistenza.](%1$s)</string>
     <string name="missing_entitlement_modal_header">Impossibile avviare %1$s</string>
     <string name="missing_entitlement_modal_header_unknown_application">Impossibile avviare il gioco</string>
-    <string name="mobile_enable_hardware_scaling">Attiva l’accelerazione hardware</string>
     <string name="mobile_enable_hardware_scaling_desc">Funzione sperimentale che può migliorare le prestazioni delle videochiamate. Attenzione: può causare problemi di prestazioni.</string>
     <string name="moderation">Moderazione</string>
     <string name="more">Di più</string>
     <string name="move_from_category_to">Sposta da %1$s a</string>
-    <string name="move_members">Spostare gli utenti</string>
     <string name="move_members_description">"I membri con questo permesso potranno spostare gli utenti in un altro canale. Ma lo spostamento sarà possibile
 tra canali ai quali sia loro che l'utente da spostare hanno accesso."</string>
     <string name="move_to">Sposta in</string>
-    <string name="move_to_success">L’utente è stato spostato nel canale selezionato.</string>
     <string name="mute">Silenzia</string>
     <string name="mute_category">Silenzia categoria</string>
     <string name="mute_channel">Silenzia **%1$s**</string>
     <string name="mute_group_dm">Silenzia **%1$s**</string>
-    <string name="mute_members">Disattivare i microfoni</string>
     <string name="mutual_friends">Amici in comune</string>
     <string name="mutual_guilds">Server in comune</string>
     <string name="n_days">%1$s</string>
@@ -2199,9 +1984,6 @@ del giorno %3$s"</string>
     <string name="new_permission">Nuovo permesso</string>
     <string name="new_terms_ack">Ho letto e accetto questi termini.</string>
     <string name="new_terms_continue">Continua su Discord</string>
-    <string name="new_terms_description">"Per continuare ad usare Discord, leggi e accetta i
-nuovi Termini di Servizio e l'Informativa sulla Privacy."</string>
-    <string name="new_terms_title">"I Termini di Servizio e l'Informativa sulla Privacy sono stati aggiornati"</string>
     <string name="new_unreads">Nuovi messaggi non letti</string>
     <string name="next">Avanti</string>
     <string name="nickname">Soprannome</string>
@@ -2217,38 +1999,26 @@ nuovi Termini di Servizio e l'Informativa sulla Privacy."</string>
     <string name="no_camera_access">Discord non ha accesso alla tua webcam</string>
     <string name="no_category">Nessuna categoria</string>
     <string name="no_channel_description">Qui troverai i tuoi **messaggi diretti** e i **server**.</string>
-    <string name="no_emoji">Dai inizio alla festa caricando un emoji</string>
     <string name="no_emoji_body">Nessuno</string>
-    <string name="no_emoji_search_results">Nessun emoji con quel nome</string>
-    <string name="no_emoji_title">Nessun emoji</string>
     <string name="no_input_devices">Nessun dispositivo di ingresso</string>
     <string name="no_input_devices_detected">Nessun dispositivo di ingresso rilevato: collegane uno e riprova.</string>
-    <string name="no_instant_invite">Nessun invito istantaneo</string>
-    <string name="no_integrations">[Collega](onConnect) il tuo account da partner Twitch o YouTube Gaming per sincronizzare gli utenti abbonati/sponsor a un ruolo specifico</string>
+    <string name="no_instant_invite">Nessun invito</string>
     <string name="no_integrations_body">Il protocollo FR13NDSH1P è eseguibile solo dal Discord Client</string>
     <string name="no_integrations_label">Nessuna integrazione</string>
-    <string name="no_invites_body">"Ti senti perso? Come un aeroplanino di carta trasportato alla deriva?
-Aggiungi degli amici con un link d'invito istantaneo!"</string>
-    <string name="no_invites_caption">Ancora nessun invito istantaneo creato!</string>
-    <string name="no_invites_label">Ancora nessun invito istantaneo creato</string>
+    <string name="no_invites_caption">Ancora nessun invito creato!</string>
+    <string name="no_invites_label">Ancora nessun invito creato</string>
     <string name="no_mail_account_description">Invia il tuo feedback a support@discordapp.com, e abbiamo copiato le tue informazioni utente.</string>
     <string name="no_mail_account_title">Nessun account di posta</string>
-    <string name="no_mic_body">Troverai le istruzioni su come riattivare l’accesso al microfono nel Discord Help Center.</string>
     <string name="no_mic_title">Accesso al microfono negato</string>
     <string name="no_mutual_friends">Nessun amico in comune</string>
     <string name="no_mutual_guilds">Nessun server in comune</string>
     <string name="no_output_devices">Nessun dispositivo di uscita</string>
     <string name="no_photo_in_camera_roll">Il «Rullino foto» è vuoto</string>
     <string name="no_photos_access">Discord non ha accesso alle tue foto</string>
-    <string name="no_pins_in_channel">"Questo canale non ha messaggi
-fissati… per ora."</string>
-    <string name="no_pins_in_dm">"Questo messaggio diretto non ha
-messaggi fissati… per ora."</string>
     <string name="no_reactions_body">Che tristezza, un mondo privo di emozioni.</string>
     <string name="no_reactions_header">Nessuna reazione</string>
     <string name="no_recent_mentions">E in principio… ci fu il silenzio.</string>
     <string name="no_send_messages_permission_placeholder">Non hai il permesso necessario per scrivere messaggi in questo canale.</string>
-    <string name="no_system_channel">Nessun messaggio di benvenuto</string>
     <string name="no_thanks">No, grazie</string>
     <string name="no_user_limit">Nessun limite</string>
     <string name="no_video_devices">Nessuna videocamera</string>
@@ -2259,18 +2029,14 @@ messaggi fissati… per ora."</string>
     <string name="note">Nota</string>
     <string name="note_placeholder">Clicca per aggiungere una nota</string>
     <string name="note_placeholder_mobile">Tocca per aggiungere una nota</string>
-    <string name="notice_application_test_mode">La modalità test è attualmente attiva per **%1$s**. Compariranno SKU non pubblicati e non ti saranno addebitati costi per pagamenti relativi.</string>
     <string name="notice_application_test_mode_go_to_listing">Vai allo SKU</string>
     <string name="notice_connect_spotify">Collega il tuo account Spotify per mostrare la tua musica nel tuo stato!</string>
-    <string name="notice_connection_conflict">Sei stato disconnesso dal canale vocale perché ti sei connesso da un’altra posizione.</string>
-    <string name="notice_corrupt_installation">Beh, sembra che l’installazione di Discord sia danneggiata. Cerchiamo di ripararla… insieme.</string>
     <string name="notice_corrupt_installation_help_link_text">Assistenza!</string>
     <string name="notice_dispatch_application_lock_failed">"Discord sta già eseguendo un'operazione su questo gioco. Assicurati che non ci siano altri Discord Client in esecuzione."</string>
     <string name="notice_dispatch_error">Oh no, si è verificato un errore.</string>
     <string name="notice_dispatch_error_disk_low">"Non c'è abbastanza spazio sul disco. Sono necessari %1$s ma solo %2$s sono disponibili."</string>
     <string name="notice_dispatch_error_file_name_too_long">Oh no, questo gioco ha nomi di file troppo lunghi per Windows. Scegli una cartella di installazione più breve.</string>
     <string name="notice_dispatch_error_invalid_drive">Oh no, la posizione di installazione che hai scelto non è valida. Hai scelto %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Non siamo riusciti ad aggiornare il gioco. È in esecuzione al momento?</string>
     <string name="notice_dispatch_error_no_manifests">"Oh no, sembra che non ci siano contenuti per questo gioco. Contatta l'assistenza."</string>
     <string name="notice_dispatch_error_not_entitled">"Oh no, sembra che non possiedi questo gioco. Contatta l'assistenza se pensi che si tratti di un errore."</string>
     <string name="notice_dispatch_error_post_install_cancelled">Sembra che hai rifiutato uno script di installazione. Devi accettare perché il gioco venga installato.</string>
@@ -2282,13 +2048,8 @@ messaggi fissati… per ora."</string>
     <string name="notice_hardware_mute">Beh, sembra che il pulsante di silenziamento del microfono **%1$s %2$s** sia attivo.</string>
     <string name="notice_mfa_sms_backup">Consigliamo di aggiungere un numero di telefono alle tue Impostazioni di verifica in due passaggi come metodo di backup.</string>
     <string name="notice_mfa_sms_backup_button">Aggiungi telefono</string>
-    <string name="notice_native_apps">Vuoi che il push-to-talk funzioni anche quando la finestra non è in primo piano? Scarica l’applicazione per desktop!</string>
     <string name="notice_no_input_detected">Discord non rileva suoni dal tuo microfono. Sistemiamo la cosa… insieme.</string>
     <string name="notice_no_input_detected_help_link_text">Assistenza!</string>
-    <string name="notice_premium_applications_grandfathered_ended">"Il tuo accesso a Nitro è scaduto. Fai l'upgrade da Nitro Classic a Nitro per avere accesso illimitato a giochi fantastici."</string>
-    <string name="notice_premium_applications_grandfathered_ending">Hai a disposizione solo %1$s di giochi Nitro! Il tuo accesso terminerà il giorno **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Grazie per essere giovane sostenitore di Nitro! Come ricompensa per essere tanto fantastico, avrai accesso ai giochi Nitro fino a %1$s.</string>
-    <string name="notice_premium_promo_action">Dagli un’occhiata</string>
     <string name="notice_premium_promo_message">Sostieni lo sviluppo continuato di Discord e ottieni fantastici vantaggi!</string>
     <string name="notice_scheduled_maintenance">Discord sarà sottoposto a manutenzione programmata il giorno **%1$s** alle ore **%2$s**.</string>
     <string name="notice_spotify_auto_paused">Il tuo microfono sta trasmettendo da 30 secondi. La riproduzione di Spotify è stata interrotta.</string>
@@ -2298,7 +2059,6 @@ messaggi fissati… per ora."</string>
     <string name="notice_unclaimed_account">Questo account non è registrato. Completa il processo di registrazione prima di perderlo.</string>
     <string name="notice_unverified_account">Controlla la tua e-mail e segui le istruzioni per verificare il tuo account.</string>
     <string name="notice_video_unsupported_browser">Qualcuno ha appena provato a videochiamarti! Sfortunatamente, questo browser non supporta le videochiamate. Scarica la nostra app desktop per ricevere la chiamata.</string>
-    <string name="notice_whats_this">Cos’è questo?</string>
     <string name="notification_accepted_friend_request">Ha accettato la richiesta di amicizia.</string>
     <string name="notification_body_attachment">Ha caricato %1$s</string>
     <string name="notification_body_start_game">%1$s ha iniziato a giocare a %2$s!</string>
@@ -2341,8 +2101,6 @@ Crea un server di Discord per te e i tuoi amici. Ci penseremo noi a fornirvi le
     <string name="nuf_download_app_body">Scarica la nostra applicazione per desktop per accedere più facilmente ai tuoi server e a funzioni esclusive (incluso il Push-to-talk)!</string>
     <string name="nuf_download_app_button_platform">Scarica per %1$s</string>
     <string name="nuf_download_app_button_type">Scarica %1$s</string>
-    <string name="nuf_download_app_intro">Fiu, quasi finito! Un’ultima cosa prima di salutarci…</string>
-    <string name="nuf_download_app_title">Scarica l’applicazione per desktop</string>
     <string name="nuf_join_server_body_1">Se sì, inserisci il tuo link o il codice di invito per unirti al server!</string>
     <string name="nuf_join_server_body_2">"Siamo davvero felici di averti qui!
 
@@ -2357,7 +2115,6 @@ Hai ricevuto un link d'invito da un amico? Inserisci il tuo link o codice di inv
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Overlay Attivato</string>
     <string name="nux_post_reg_join_server_description">Ottieni il massimo da Discord entrando in un server.</string>
     <string name="nux_post_reg_join_server_skip">Non ne ho</string>
     <string name="nux_post_reg_join_server_title">Hai un invito?</string>
@@ -2368,17 +2125,14 @@ Hai ricevuto un link d'invito da un amico? Inserisci il tuo link o codice di inv
     <string name="oauth2_message_cta">Ora puoi chiudere questa finestra o scheda.</string>
     <string name="oauth2_message_unknown_error">Errore sconosciuto</string>
     <string name="oauth2_security_notice">Questa applicazione **non può** leggere o inviare messaggi a nome tuo.</string>
-    <string name="oauth2_title">Autorizzare l’accesso al tuo account</string>
     <string name="okay">OK</string>
     <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="only_you_can_see_and_delete_these">Solo tu puoi vedere %1$s: %2$s.</string>
-    <string name="open_app">Ho già l’app. Aprila!</string>
     <string name="open_in_browser">Apri nel browser</string>
     <string name="open_in_theater">Apri in modalità teatro</string>
     <string name="open_link">Apri il link</string>
-    <string name="open_original_image">Apri l’originale</string>
     <string name="options">Opzioni</string>
     <string name="other_options">Altre opzioni</string>
     <string name="other_reactions">Altre reazioni</string>
@@ -2388,14 +2142,9 @@ Hai ricevuto un link d'invito da un amico? Inserisci il tuo link o codice di inv
     <string name="outgoing_friend_request">Richiesta di amicizia in uscita</string>
     <string name="outgoing_friend_request_delete_msg">Sei sicuro di voler eliminare la tua richiesta di amicizia a **%1$s**?</string>
     <string name="overlay_channel_chat_hotkey">Premi %1$s per chattare in %2$s</string>
-    <string name="overlay_crashed_title">L’overlay di Discord ha crashato!</string>
-    <string name="overlay_explanation">"Il tuo antivirus potrebbe dare un falso positivo quando attivi l’overlay.
-Inoltre, l’overlay potrebbe non funzionare per tutti. Per problemi o domande, dai un’occhiata a
-[questo articolo di supporto!](%1$s)"</string>
     <string name="overlay_friend_calling">%1$s ti sta chiamando!</string>
     <string name="overlay_in_game_preview_header">Anteprima in gioco</string>
     <string name="overlay_launch_open_tip">Premi %1$s per aprirlo</string>
-    <string name="overlay_launch_title">Usa l’overlay di Discord in gioco</string>
     <string name="overlay_link_alert_body">Stai per aprire questo link su un browser esterno. Vuoi continuare?</string>
     <string name="overlay_link_alert_secondary">Apri e non scocciarmi più.</string>
     <string name="overlay_link_alert_title">Attenzione!</string>
@@ -2409,22 +2158,16 @@ Inoltre, l’overlay potrebbe non funzionare per tutti. Per problemi o domande,
     <string name="overlay_news_go_live_cta">In onda</string>
     <string name="overlay_news_text_pinning_body">Ora puoi appuntare una chat testuale al tuo gioco!</string>
     <string name="overlay_news_text_pinning_tip">Dritta: puoi appuntare una chat premendo $[pinIcon](pinHook)</string>
-    <string name="overlay_news_text_pinning_title">Upgrade dell’Overlay Discord eseguito</string>
-    <string name="overlay_no_results">Abbiamo cercato in lungo e in largo, ma non è stato trovato nessun canale vocale.</string>
     <string name="overlay_notification_incoming_call">Chiamata in arrivo…</string>
     <string name="overlay_notification_settings_disabled">Notifiche disattivate</string>
     <string name="overlay_notification_settings_position">Verranno visualizzate: %1$s</string>
     <string name="overlay_notifications_bottom_left">In basso a sinistra</string>
     <string name="overlay_notifications_bottom_right">In basso a destra</string>
     <string name="overlay_notifications_disabled">Disattivato</string>
-    <string name="overlay_notifications_settings">Notifiche dell’overlay</string>
     <string name="overlay_notifications_top_left">In alto a sinistra</string>
     <string name="overlay_notifications_top_right">In alto a destra</string>
-    <string name="overlay_private_channels_empty_state">No, non ci sono messaggi diretti qui.</string>
     <string name="overlay_reload">Ricarica Overlay</string>
-    <string name="overlay_settings">Impostazioni dell’overlay</string>
     <string name="overlay_settings_general_tab">Generale</string>
-    <string name="overlay_settings_title">Impostazioni dell’overlay</string>
     <string name="overlay_settings_voice_tab">Voce</string>
     <string name="overlay_text_notification_tip">Premi %1$s per aprire</string>
     <string name="overlay_text_notification_tip_unlocked">Dritta: puoi configurare le notifiche in $[impostazioni](settingsHook)</string>
@@ -2442,16 +2185,13 @@ Inoltre, l’overlay potrebbe non funzionare per tutti. Per problemi o domande,
     <string name="pagination_page_of">Pagina %1$s di %2$s</string>
     <string name="pagination_previous">Precedente</string>
     <string name="paginator_of_pages">Pagina %1$s di %2$s</string>
-    <string name="partial_outage">%1$s a causa di un problema tecnico temporaneo.</string>
     <string name="partner_badge_tooltip">Partner di Discord</string>
     <string name="party_full">Gruppo pieno</string>
     <string name="party_join">Unisciti al gruppo</string>
     <string name="party_joined">Nel gruppo</string>
     <string name="party_locked">Bloccato</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>
     <string name="password_manager_open_settings">Apri le impostazioni</string>
-    <string name="password_manager_open_settings_error">Impossibile aprire le Impostazioni dell’accessibilità</string>
     <string name="password_manager_use">Vuoi usare un gestore di password?</string>
     <string name="password_required">Password obbligatoria.</string>
     <string name="paste">Incolla</string>
@@ -2463,7 +2203,6 @@ Inoltre, l’overlay potrebbe non funzionare per tutti. Per problemi o domande,
     <string name="payment_modal_title_change_card">Cambia carta di credito</string>
     <string name="payment_modal_title_change_paypal">Cambia Account PayPal</string>
     <string name="payment_modal_title_new_monthly">%1$s%2$s %3$s al mese</string>
-    <string name="payment_modal_title_new_yearly">%1$s%2$s %3$s all’anno</string>
     <string name="payment_source_billing_address">Indirizzo di fatturazione</string>
     <string name="payment_source_card_ending">%1$s che termina con **%2$s**</string>
     <string name="payment_source_card_ending_in">Carta che termina con %1$s</string>
@@ -2493,40 +2232,21 @@ Inoltre, l’overlay potrebbe non funzionare per tutti. Per problemi o domande,
     <string name="paypal_callback_error">Qualcosa è andato storto, riprova.</string>
     <string name="paypal_callback_success">Account **PayPal** autorizzato. Torna su **Discord** per completare la transazione.</string>
     <string name="pending">In attesa</string>
-    <string name="permission_camera_access_denied">Accesso negato alla webcam - A Discord serve l’accesso alla webcam per poter trasmettere il video.</string>
     <string name="permission_helpdesk">Serve aiuto con i permessi?</string>
-    <string name="permission_media_denied">Accesso ai file multimediali negato: a Discord serve l’accesso ai file multimediali per allegare contenuti.</string>
-    <string name="permission_media_download_denied">Download negato: a Discord serve l’accesso ai file multimediali per scaricare file.</string>
-    <string name="permission_microphone_denied">Accesso al microfono negato: a Discord serve l’accesso all’audio per connettersi alla chiamata.</string>
     <string name="permission_override_allow">Consenti</string>
     <string name="permission_override_deny">Nega</string>
     <string name="permission_override_passthrough">Trasmissione</string>
     <string name="permission_overrides">Permessi speciali</string>
     <string name="permissions">Permessi</string>
     <string name="permissions_unsynced">Permessi non sincronizzati con: **%1$s**</string>
-    <string name="permit_usage_android">Seleziona Discord, poi \"Permesso di accesso utilizzo\"</string>
-    <string name="personalization_disable_modal_body">Disattivando la personalizzazione dell’esperienza utente perderai l’accesso a funzionalità come suggerimenti personalizzati e consigli. Non sarai in grado di recuperarli in futuro!</string>
     <string name="personalization_disable_modal_cancel">No, torna indietro!</string>
     <string name="personalization_disable_modal_confirm">Sì, sono sicuro</string>
     <string name="personalization_disable_modal_title">Vuoi disattivare le personalizzazioni?</string>
     <string name="phone">Telefono</string>
     <string name="pick_a_color">Scegliere un colore</string>
     <string name="pin">Attacca</string>
-    <string name="pin_confirm">Oh, sì. Fissalo</string>
     <string name="pin_message">Attacca il messaggio</string>
-    <string name="pin_message_body">Sei sicuro di voler fissare questo messaggio nel canale #%1$s per la grandezza e la posterità?</string>
-    <string name="pin_message_body_mobile">Sei sicuro di voler fissare questo messaggio?</string>
-    <string name="pin_message_body_private_channel">Sei sicuro di voler fissare questo messaggio nel canale attuale per la grandezza e la posterità?</string>
-    <string name="pin_message_title">Fissa il messaggio. Fissalo per bene.</string>
-    <string name="pin_message_too_many_body">Discord non può fissare il messaggio. Puoi avere al massimo %1$s messaggi fissati nel canale #%2$s.</string>
-    <string name="pin_message_too_many_body_private_channel">Discord non può fissare il messaggio. Puoi avere al massimo %1$s messaggi fissati in questo canale.</string>
-    <string name="pin_message_too_many_title">La spilla si è rotta</string>
-    <string name="pinned_messages">Messaggi fissati</string>
     <string name="pinned_messages_pro_tip">SUGGERIMENTO:</string>
-    <string name="pinned_messages_pro_tip_body_channel">Gli utenti col permesso «Gestire messaggi» possono fissarli facendo tasto destro sui messaggi o con il menu delle opzioni a lato.</string>
-    <string name="pinned_messages_pro_tip_body_dm">Tu e %1$s potete fissare i messaggi facendo tasto destro su di essi o con il menu delle opzioni a lato.</string>
-    <string name="pinned_messages_pro_tip_body_group_dm">I membri del gruppo possono fissare i messaggi facendo tasto destro su di essi o con il menu delle opzioni a lato.</string>
-    <string name="pins_disabled_nsfw">Questo è un canale NSFW (per adulti), e dati i suoi contenuti nessuno dovrebbe visualizzarne i messaggi fissati.</string>
     <string name="pl">Polacco</string>
     <string name="platform_ios">iOS</string>
     <string name="platform_ios_version">iOS 8+</string>
@@ -2537,25 +2257,16 @@ Inoltre, l’overlay potrebbe non funzionare per tutti. Per problemi o domande,
     <string name="popout_stay_on_top">Fissa in cima</string>
     <string name="post_code">CAP</string>
     <string name="premium_alert_error_title">Oops, qualcosa è andato storto…</string>
-    <string name="premium_applications_grandfathered_monthly">"Per ringraziarti del tuo sostegno nei confronti di Discord, avrai accesso ai giochi Nitro per un anno. L'offerta terminerà il giorno **%1$s**."</string>
-    <string name="premium_applications_grandfathered_yearly">"Per ringraziarti del tuo sostegno nei confronti di Discord, avrai accesso ai giochi Nitro per due anni. L'offerta terminerà il giorno **%1$s**."</string>
-    <string name="premium_applications_subtitle">"Ottieni l'accesso illimitato a una libreria in espansione di giochi entusiasmanti a cui pensiamo che tu e i tuoi amici dovreste giocare."</string>
-    <string name="premium_applications_title">Dozzine di giochi selezionati. Un prezzo mensile basso.</string>
     <string name="premium_badge_tooltip">Abbonato fin dal giorno %1$s</string>
     <string name="premium_cancel_cancel">No</string>
     <string name="premium_cancel_confirm_body_tier_1">"La cancellazione sarà effettiva al termine del tuo attuale periodo di fatturazione, il giorno **%1$s**. Il tuo Discord Tag sarà randomizzato se l'hai cambiato.
 
 Potrai rinnovare l'abbonamento in qualunque momento."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"La cancellazione sarà effettiva al termine di questo periodo di fatturazione. Dal **%1$s**, perderai l'accesso a tutti i giochi Nitro nella tua libreria e il Discord Tag sarà randomizzato se l'hai cambiato.
-
-Terremo al sicuro i tuoi file di salvataggio nel caso cambiassi idea. Potrai rinnovare l'abbonamento in qualunque momento!"</string>
     <string name="premium_cancel_confirm_new">Sì, annulla %1$s</string>
     <string name="premium_cancel_confirm_title">Annulla %1$s?</string>
-    <string name="premium_cancel_failed_body">Non è stato possibile annullare il tuo abbonamento Nitro. Riprova o contatta l’assistenza se il problema persiste.</string>
     <string name="premium_canceled">Il tuo abbonamento termina il giorno %1$s.</string>
     <string name="premium_cant_upgrade_confirm">Capito</string>
     <string name="premium_change_discriminator_length_error">Questo tag non è valido. Deve avere almeno 4 cifre.</string>
-    <string name="premium_change_discriminator_modal_body">Quando l’abbonamento Nitro scadrà, il tuo Discord Tag verrà rigenerato casualmente. Vuoi davvero cambiarlo?</string>
     <string name="premium_change_discriminator_modal_confirm">Cambia Discord Tag</string>
     <string name="premium_change_discriminator_modal_header">Cambia il tuo Discord Tag</string>
     <string name="premium_change_discriminator_tooltip">Vuoi personalizzare il tuo tag? Abbonati a Nitro!</string>
@@ -2565,32 +2276,24 @@ Terremo al sicuro i tuoi file di salvataggio nel caso cambiassi idea. Potrai rin
     <string name="premium_chat_perks_description_custom_emoji">Utilizza tutti i tuoi emoji personalizzati ovunque.</string>
     <string name="premium_chat_perks_description_discriminator">Scegli il tuo tag finché sarai abbonato.</string>
     <string name="premium_chat_perks_description_screenshare">Aumenta le prestazioni nella condivisione dello schermo con 720p a 60fps o 1080p a 30fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Caricamento di file grossi per %1$s da %2$s per condivisione di meme di alta qualità.</string>
+    <string name="premium_chat_perks_streaming_mobile">Go Live stream di maggiore qualità: trasmetti dal punto di origine con Nitro o arrivando fino a uno scoppiettante 1080p a 60fps con Nitro Classic</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Divertimento animato</string>
     <string name="premium_chat_perks_title_badge">Sfoggia il tuo supporto</string>
-    <string name="premium_chat_perks_title_custom_emoji">Emoji globali personalizzati</string>
     <string name="premium_chat_perks_title_discriminator">Discord Tag personalizzato</string>
     <string name="premium_chat_perks_title_screenshare">Migliore qualità video</string>
+    <string name="premium_chat_perks_title_streaming">Streaming su Go Live di maggiore qualità</string>
     <string name="premium_code_redemption_confirmation_blurb">Grazie a una serie casuale di caratteri, ora possiedi migliori benefici della chat per %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">Ooh, fighino!</string>
-    <string name="premium_feature_new_chat_perks_header">Ottieni anche migliori benefici della chat:</string>
-    <string name="premium_feature_new_premium_applications_header">"Giochi per un valore complessivo di oltre %1$s. Dai un'occhiata:"</string>
-    <string name="premium_feature_view_applications">Visualizza tutti i giochi Nitro</string>
     <string name="premium_features_chat_perks">Benefici della chat</string>
-    <string name="premium_features_premium_applications">Giochi gratuiti</string>
     <string name="premium_grandfathered_warning">Per ringraziarti del tuo sostegno, ti offriamo un piano Nitro scontato. **Annullando o cambiando il tuo piano, perderai questo sconto.** Sei stato avvertito!!!!!</string>
     <string name="premium_grandfathered_warning_confirm">Fallo lo stesso</string>
     <string name="premium_grandfathered_warning_title">"Fa' attenzione amico"</string>
     <string name="premium_info_monthly">%1$s (mensile) avverrà il giorno %2$s.</string>
     <string name="premium_info_yearly">%1$s (annuale) avverrà il %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / Mese</string>
-    <string name="premium_not_claimed">Registra prima l’account</string>
     <string name="premium_not_claimed_body">Ehi bello! Se vuoi acquistare Nitro, dovrai prima registrare il tuo account così non perderai ogni cosa.</string>
     <string name="premium_not_verified">Verifica prima la tua e-mail</string>
-    <string name="premium_not_verified_body">Ehi, amico! Se vuoi acquistare Nitro, dovrai prima verificare la tua e-mail. Controlla la tua e-mail o richiedine una nuova.</string>
-    <string name="premium_payment_applications_os_warning">I giochi Nitro sono supportati solo su Windows.</string>
     <string name="premium_payment_confirmation_blurb_regular">Ora i benefici della chat delle quali potrai beneficiare sono ancora di più. Smetti di leggere qua e inizia a chattare!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Ora hai accesso illimitato a un sacco di giochi fantastici. Smetti di leggere qua e gioca!!!</string>
     <string name="premium_payment_confirmation_button_regular">Ok, va bene</string>
     <string name="premium_plan_month">Nitro mensile</string>
     <string name="premium_plan_month_tier_1">Nitro Classic mensile</string>
@@ -2598,9 +2301,7 @@ Terremo al sicuro i tuoi file di salvataggio nel caso cambiassi idea. Potrai rin
     <string name="premium_plan_year">Nitro annuale</string>
     <string name="premium_plan_year_tier_1">Nitro Classic annuale</string>
     <string name="premium_plan_year_tier_2">Nitro annuale</string>
-    <string name="premium_promo_autocomplete">Usa gli emoji personalizzati ovunque tu voglia</string>
     <string name="premium_promo_description">Abbonati a Discord Nitro per usare gli emoji personalizzati e animati in qualunque server.</string>
-    <string name="premium_promo_title">Vuoi fare l’upgrade dei tuoi emoji?</string>
     <string name="premium_subtitle">Sostieni lo sviluppo continuato di Discord e ottieni delle funzionalità bonus per il tuo account</string>
     <string name="premium_upgrade_cancel">No</string>
     <string name="premium_upgrade_confirm_body_detailed_month_year">"Fai l'upgrade all'abbonamento annuale e risparmia: due mesi sono gratis. Che affare!!!
@@ -2610,23 +2311,15 @@ Ripartiremo il tuo piano corrente e sarà detratto dal costo annuale. Ti saranno
     <string name="premium_upgrade_disabled_current_tooltip">Il tuo piano attuale.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Dovrai annullare e aspettare che scada il tuo abbonamento prima di poter scegliere un piano di fascia più bassa.</string>
     <string name="premium_upgrade_done_body_tier_1">Ora possiedi migliori benefici della chat!</string>
-    <string name="premium_upgrade_done_body_tier_2">Ora possiedi migliori benefici della chat e hai accesso a dozzine di giochi.</string>
     <string name="premium_upgrade_done_button_tier_1">Tosto!</string>
-    <string name="premium_upgrade_done_button_tier_2">"Dai un'occhiata a tutti i giochi Nitro"</string>
-    <string name="premium_upgrade_failed_body">Non è stato possibile passare all’abbonamento annuale. Assicurati che i dati di pagamento siano corretti e riprova.</string>
     <string name="premium_upload_promo">"Fai l'upgrade a Discord Nitro per aumentare il limite di caricamento a %1$s"</string>
     <string name="premium_year_free_months">2 mesi sono gratis!</string>
-    <string name="premium_year_free_months_short">2 mesi sono gratis</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / Anno</string>
     <string name="preview_chat">Anteprima della chat</string>
     <string name="priority_speaker">Priorità di parola</string>
     <string name="priority_speaker_description">"Gli utenti con questo permesso vengono uditi con più facilità quando parlano. Quando attivata,
 il volume di quelli senza questo permesso sarà abbassato automaticamente."</string>
-    <string name="priority_speaker_description_app">"Gli utenti con questo permesso vengono uditi con più facilità quando parlano. Quando attivata,
-il volume di quelli senza questo permesso sarà abbassato automaticamente. Priorità di parola si
-attiva usando l’associazione tasti **%1$s**."</string>
     <string name="privacy_and_safety">Privacy e sicurezza</string>
-    <string name="privacy_policy">[Informativa sulla Privacy](%1$s)</string>
     <string name="privacy_settings">Impostazioni privacy</string>
     <string name="private_category">Categoria privata</string>
     <string name="private_category_note">Creando una categoria privata, tutti i canali al suo interno ne erediteranno i permessi</string>
@@ -2636,11 +2329,7 @@ attiva usando l’associazione tasti **%1$s**."</string>
     <string name="prune">Rimuovi</string>
     <string name="prune_members">Ridurre membri</string>
     <string name="pt_br">Portoghese, Brasile</string>
-    <string name="ptt_limited_body">"Il push-to-talk (limitato) della versione web funziona solo mentre la scheda è in primo piano.
-Per poterlo usare sempre, scarica l’applicazione per desktop."</string>
     <string name="ptt_limited_title">Ehi, una piccola dritta</string>
-    <string name="ptt_limited_warning">"Il push-to-talk (limitato) della versione web funziona solo mentre la scheda del browser è in primo piano. [Scarica](onDownloadClick)
-l’applicazione per desktop per poterlo usare sempre."</string>
     <string name="ptt_permission_body">"Hai avviato %1$s da amministratore. Riavvia Discord da amministratore per attivare il rilevamento di push-to-talk
 quando il gioco è in primo piano."</string>
     <string name="ptt_permission_title">Per usare push-to-talk devi dare il permesso</string>
@@ -2672,11 +2361,8 @@ quando il gioco è in primo piano."</string>
     <string name="rating_request_body_android">Vai un attimo sul Play Store e lasciaci una valutazione. Ogni piccolo aiuto è prezioso!</string>
     <string name="rating_request_title">Ti piace Discord?</string>
     <string name="reaction_tooltip_1">%1$s ha usato la reazione %2$s</string>
-    <string name="reaction_tooltip_1_n">%1$s e %2$s hanno usato la reazione %3$s</string>
     <string name="reaction_tooltip_2">%1$s e %2$s hanno usato la reazione %3$s</string>
-    <string name="reaction_tooltip_2_n">%1$s, %2$s e %3$s hanno usato la reazione %4$s</string>
     <string name="reaction_tooltip_3">%1$s, %2$s e %3$s hanno usato la reazione %4$s</string>
-    <string name="reaction_tooltip_3_n">%1$s, %2$s, %3$s e %4$s hanno usato la reazione %5$s</string>
     <string name="reaction_tooltip_n">%1$s usato la reazione %2$s</string>
     <string name="reactions">Reazioni</string>
     <string name="reactions_matching">Aggiungere reazione **%1$s**</string>
@@ -2711,25 +2397,20 @@ quando il gioco è in primo piano."</string>
     <string name="remove_friend_body">Sei sicuro di voler rimuovere **%1$s** dalla lista amici?</string>
     <string name="remove_friend_title">Rimuovi %1$s</string>
     <string name="remove_from_group">Rimuovi dal gruppo</string>
-    <string name="remove_icon">Rimuovi l’icona</string>
     <string name="remove_keybind">Rimuovi associazione tasti</string>
     <string name="remove_role_or_user">Rimuovi %1$s</string>
     <string name="remove_synced_role">Rimuovi ruolo</string>
     <string name="remove_vanity_url">Rimuovi vanity URL</string>
-    <string name="render_embeds">Mostra l’anteprima dei siti web associati ai link inviati nella chat testuale.</string>
     <string name="render_embeds_label">Anteprima dei link</string>
     <string name="render_reactions">Mostra le reazioni con emoji ai messaggi.</string>
     <string name="report">Segnala</string>
     <string name="report_message">Segnala il messaggio di %1$s</string>
     <string name="report_server">Segnala il server — %1$s</string>
     <string name="report_title">Sei sicuro di voler segnalare %1$s?</string>
-    <string name="report_user">Segnala l’utente — %1$s</string>
     <string name="reported">Segnalato</string>
     <string name="resend">Invia di nuovo</string>
     <string name="resend_code">Invia di nuovo il codice</string>
-    <string name="resend_email">Rispedisci l’e-mail di verifica!</string>
     <string name="resend_message">Rinvia il messaggio</string>
-    <string name="resend_verification_email">Rinvia l’e-mail di verifica</string>
     <string name="reset">Ripristina</string>
     <string name="reset_nickname">Resetta il nickname</string>
     <string name="reset_notification_override">Ripristina permessi speciali delle notifiche</string>
@@ -2761,16 +2442,6 @@ al proprietario del server di cambiare temporaneamente regione."</string>
 di ristabilire la connessione a breve."</string>
     <string name="rtc_connection_state_ice_checking">"Alza gli scudi! Discord ha stabilito una connessione protetta al tuo server di comunicazione in tempo reale e sta cercando di inviare i dati.
 Se il tuo browser non dovesse riuscire a superare questa fase, leggi [questo articolo di supporto](%1$s) per scoprire come risolvere."</string>
-    <string name="rtc_connection_state_no_route">"D’oh! Discord non riesce a stabilire una connessione UDP al tuo server di comunicazione in tempo reale, ma riproveremo a breve.
-Se Discord non dovesse riuscire a superare questa fase, leggi [questo articolo di supporto](%1$s) per scoprire come risolvere."</string>
-    <string name="rtc_connection_state_rtc_connected">"Discord è connesso al tuo server di comunicazione in tempo reale tramite **%1$s** con un ping medio di **%2$s ms**. L’ultimo
-ping era di **%3$s ms**.
-
-Se il ping non è stabile o se è superiore a %4$s ms, chiedi al proprietario del server di passare a un’altra regione."</string>
-    <string name="rtc_connection_state_rtc_connected_loss_rate">"Discord è connesso al tuo server di comunicazione in tempo reale tramite **%1$s** con un ping medio di **%2$s ms**. L’ultimo
-ping era di **%3$s ms**. Il tasso di perdita dei pacchetti in uscita è del **%4$s%%**.
-
-Se il ping non è stabile o se è superiore a %5$s ms, chiedi al proprietario del server di passare a un’altra regione. Se il tasso di perdita dei pacchetti in uscita è maggiore del %6$s%%, potresti suonare come un robot."</string>
     <string name="rtc_connection_state_rtc_connecting">"Ecco fatto! Discord ha stabilito una connessione protetta al tuo server di comunicazione in tempo reale e
 sta cercando di inviare i dati."</string>
     <string name="rtc_debug_context">Debug connessione RTC: %1$s</string>
@@ -2779,7 +2450,6 @@ sta cercando di inviare i dati."</string>
     <string name="rtc_debug_transport">Traffico</string>
     <string name="rtc_debug_users">Utenti</string>
     <string name="ru">Russo</string>
-    <string name="samsung_welcome_screen">"App per chat vocale e testuale, gratis e sicura, usata da più di 250 milioni di giocatori, ora con caratteristiche esclusive per Samsung come l'overlay vocale da dispositivi mobili."</string>
     <string name="save">Salva</string>
     <string name="save_changes">Salva modifiche</string>
     <string name="save_new_url">Salva nuovo URL</string>
@@ -2797,30 +2467,23 @@ sta cercando di inviare i dati."</string>
     <string name="scope_email">Accedere al tuo indirizzo e-mail</string>
     <string name="scope_email_empty">Non hai ancora aggiunto un indirizzo e-mail!</string>
     <string name="scope_gdm_join">Unirsi alle chat di gruppo per te</string>
-    <string name="scope_gdm_join_description">Consente all’app di unirsi alle chat di gruppo da essa create a nome tuo.</string>
     <string name="scope_guilds">Sapere di quali server fai parte</string>
     <string name="scope_guilds_empty">Non fai ancora parte di un server.</string>
     <string name="scope_guilds_join">Unirsi ai server per te</string>
-    <string name="scope_guilds_join_description">Usare gli inviti istantanei a nome tuo.</string>
+    <string name="scope_guilds_join_description">Usa gli inviti a nome tuo.</string>
     <string name="scope_identify">"Accedere al tuo nome utente e all'avatar"</string>
     <string name="scope_messages_read">Leggere tutti i messaggi</string>
-    <string name="scope_messages_read_description">Consente all’app di leggere tutti i messaggi disponibili al tuo account di Discord</string>
     <string name="scope_rpc">Interagire con il tuo Discord Client</string>
     <string name="scope_rpc_api">Eseguire azioni nel tuo Discord Client</string>
-    <string name="scope_rpc_api_description">Consente all’app di inviare messaggi, cambiare impostazioni, eseguire comandi, ecc.</string>
-    <string name="scope_rpc_description">Consente all’app di collegarsi al tuo Discord Client locale.</string>
     <string name="scope_rpc_notifications_read">Mostrare notifiche al di sopra del tuo Discord Client</string>
-    <string name="scope_rpc_notifications_read_description">Consente all’app di vedere le notifiche che ti inviamo.</string>
     <string name="scope_webhook_incoming">Aggiunge un webhook a un canale</string>
     <string name="scope_webhook_incoming_channel_placeholder">Seleziona un canale</string>
-    <string name="scope_webhook_incoming_description">Consente all’app di inviare messaggi nel canale di Discord scelto</string>
     <string name="screen_share_on">Attiva la condivisione schermo</string>
     <string name="screen_share_options">Altre opzioni di condivisione schermo</string>
     <string name="screenshare_change_windows">Cambia finestre</string>
     <string name="screenshare_description">"Discord vuole condividere i contenuti del tuo schermo con %1$s.
 
 Seleziona quale schermo vuoi condividere."</string>
-    <string name="screenshare_extension_body">Vorresti installare l’estensione per condividere lo schermo?</string>
     <string name="screenshare_extension_title">Estensione richiesta</string>
     <string name="screenshare_frame_rate">Fotogrammi al secondo</string>
     <string name="screenshare_screen">Tutto lo schermo</string>
@@ -2831,8 +2494,6 @@ Seleziona quale schermo vuoi condividere."</string>
     <string name="screenshare_stream_game">Trasmetti %1$s</string>
     <string name="screenshare_stream_quality">Qualità di trasmissione</string>
     <string name="screenshare_unavailable">Condivisione schermo non disponibile</string>
-    <string name="screenshare_unavailable_download_app">Scarica l’applicazione per desktop di Discord sul tuo PC per usare la condivisione dello schermo!</string>
-    <string name="screenshare_window">Finestra dell’applicazione</string>
     <string name="search">Cerca</string>
     <string name="search_actions">Cerca tra le azioni</string>
     <string name="search_answer_date">una data specifica</string>
@@ -2854,7 +2515,6 @@ Seleziona quale schermo vuoi condividere."</string>
     <string name="search_clear_history">Elimina la cronologia</string>
     <string name="search_country">Cerca un paese</string>
     <string name="search_date_picker_hint">Puoi anche scegliere</string>
-    <string name="search_dm_still_indexing">Dobbiamo indicizzare il gruppo prima di poter effettuare la ricerca. Attendi.</string>
     <string name="search_dm_with">Cerca nel messaggio diretto con %1$s</string>
     <string name="search_error">Cavolo, la lente ci è sfuggita di mano! Ehm… ti spiace riprovare la ricerca?</string>
     <string name="search_filter_after">dopo</string>
@@ -2867,18 +2527,14 @@ Seleziona quale schermo vuoi condividere."</string>
     <string name="search_filter_link_from">link da</string>
     <string name="search_filter_mentions">menzioni</string>
     <string name="search_filter_on">il</string>
-    <string name="search_for_emoji">Trova l’emoji perfetto</string>
     <string name="search_for_empty">Cerca</string>
-    <string name="search_for_value">Cerca: **%1$s**</string>
     <string name="search_group_header_channels">Nel canale</string>
     <string name="search_group_header_dates">Date</string>
     <string name="search_group_header_file_name">Il nome del file include</string>
     <string name="search_group_header_file_type">Tipo di file</string>
-    <string name="search_group_header_from">Dall’utente</string>
     <string name="search_group_header_has">Il messaggio include</string>
     <string name="search_group_header_history">Cronologia</string>
     <string name="search_group_header_link_from">Link dal sito web</string>
-    <string name="search_group_header_mentions">Viene menzionato l’utente</string>
     <string name="search_group_header_search_options">Opzioni di ricerca</string>
     <string name="search_guild_still_indexing">Dobbiamo indicizzare il server prima di poter effettuare la ricerca. Attendi.</string>
     <string name="search_hide_blocked_messages">Nascondi %1$s dagli utenti bloccati</string>
@@ -2887,7 +2543,6 @@ Seleziona quale schermo vuoi condividere."</string>
     <string name="search_members_no_result">Nessun membro trovato.</string>
     <string name="search_menu_title">Ricerca</string>
     <string name="search_no_results">Abbiamo cercato in lungo e in largo, ma la ricerca non ha fornito risultati validi.</string>
-    <string name="search_no_results_alt">Nessun risultato trovato. La banana dell’empatia è qui per te.</string>
     <string name="search_num_results_blocked_not_shown">Abbiamo nascosto %1$s dagli utenti che hai bloccato.</string>
     <string name="search_pick_date">Seleziona una data</string>
     <string name="search_recent">Recenti</string>
@@ -2899,14 +2554,12 @@ Seleziona quale schermo vuoi condividere."</string>
     <string name="search_shortcut_week">settimana</string>
     <string name="search_shortcut_year">anno</string>
     <string name="search_shortcut_yesterday">ieri</string>
-    <string name="search_still_indexing_hint">%1$s. L’indicizzazione dei vecchi messaggi è ancora in corso.</string>
     <string name="search_with_google">Cerca su Google</string>
     <string name="searching">Ricerca in corso…</string>
     <string name="security">Sicurezza</string>
     <string name="select">Seleziona</string>
     <string name="select_channel_or_category">Seleziona un canale o una categoria…</string>
     <string name="select_sort_mode">Seleziona modalità di ordine</string>
-    <string name="self_deafened">Audio silenziato localmente</string>
     <string name="self_deny_permission_body">"Non puoi negare questo permesso a **%1$s** senza negarlo anche a te stesso. Aggiungi il permesso a un altro ruolo o a
 te stesso prima di riprovare."</string>
     <string name="self_deny_permission_title">Questo è meglio se non lo fai</string>
@@ -2922,10 +2575,6 @@ te stesso prima di riprovare."</string>
     <string name="send_message_failure">Invio del messaggio non riuscito. Tieni premuto per riprovare.</string>
     <string name="send_messages">Inviare i messaggi</string>
     <string name="send_tts_messages">Usare la sintesi vocale</string>
-    <string name="send_tts_messages_description">"I membri con questo permesso potranno inviare messaggi con sintesi vocale scrivendo /tts all’inizio del messaggio.
-Questi messaggi saranno udibili da chiunque abbia il canale in primo piano."</string>
-    <string name="server_deafen">Silenzia l’audio nel server</string>
-    <string name="server_deafened">Audio silenziato</string>
     <string name="server_emoji">Emoji del server</string>
     <string name="server_mute">Silenziamento nel server</string>
     <string name="server_mute_dms">Silenzia i messaggi diretti</string>
@@ -2939,10 +2588,7 @@ Questi messaggi saranno udibili da chiunque abbia il canale in primo piano."</st
     <string name="server_settings_updated">Impostazioni del server aggiornate.</string>
     <string name="server_sort">Ordina il server %1$s</string>
     <string name="server_status">Stato dei server</string>
-    <string name="server_undeafen">Riattiva l’audio nel server</string>
-    <string name="server_unmute">Togli il silenziamento nel server</string>
     <string name="server_voice_mute">Silenziamento nel server</string>
-    <string name="server_voice_unmute">Togli il silenziamento nel server</string>
     <string name="servers">Server</string>
     <string name="servers_management_title">Ordinare e Gestire Server</string>
     <string name="service_connections_disconnect">Disconnetti</string>
@@ -2958,7 +2604,6 @@ Procedere?"</string>
     <string name="settings_games_add_game">Aggiungilo!</string>
     <string name="settings_games_add_new_game">Aggiungi gioco</string>
     <string name="settings_games_added_games_label">Giochi aggiunti</string>
-    <string name="settings_games_enable_overlay_label">Attiva l’overlay</string>
     <string name="settings_games_game_to_add">Scegli il gioco da aggiungere</string>
     <string name="settings_games_hidden_library_applications_label">Giochi nascosti</string>
     <string name="settings_games_import_explanation">Discord può mostrare e avviare la maggior parte dei giochi che possiedi, a prescindere da dove li hai ottenuti.</string>
@@ -2972,7 +2617,6 @@ Procedere?"</string>
     <string name="settings_games_now_playing_state">Ci sta giocando adesso!</string>
     <string name="settings_games_overlay_off">Overlay: disattivato</string>
     <string name="settings_games_overlay_on">Overlay: attivato</string>
-    <string name="settings_games_overlay_warning">È risaputo che l’overlay dà problemi con questo gioco.</string>
     <string name="settings_games_remove_icon">Rimuovi</string>
     <string name="settings_games_restore_to_library">Riporta alla libreria</string>
     <string name="settings_games_toggle_overlay">Attiva/disattiva overlay</string>
@@ -3034,9 +2678,6 @@ Procedere?"</string>
     <string name="spectators_header">Spettatori</string>
     <string name="spellcheck">Controllo ortografico</string>
     <string name="spotify_app_download">Scarica Spotify</string>
-    <string name="spotify_app_not_found">L’app Spotify non è stata trovata.</string>
-    <string name="spotify_app_not_opened">L’app Spotify non può essere aperta.</string>
-    <string name="spotify_listen_along_info">Cos’è questo?</string>
     <string name="spotify_listen_along_listener">Ascoltatore</string>
     <string name="spotify_listen_along_listeners">Ascoltatori</string>
     <string name="spotify_listen_along_listening_along_count">%1$s in ascolto</string>
@@ -3070,8 +2711,6 @@ Procedere?"</string>
     <string name="stop_ringing">Smetti di squillare</string>
     <string name="stop_streaming">Interrompi lo streaming</string>
     <string name="stop_watching">Smetti di guardare</string>
-    <string name="store_payment_legalese_monthly">"Ehi! Acquistando %1$s, dichiari di aver letto e accettato i nostri [Termini di Servizio del Negozio](%2$s). %1$s è un abbonamento ricorrente, il che significa che ti addebiteremo un pagamento oggi e continueremo ad addebitarti mensilmente fino a quando non annullerai la sottoscrizione. È possibile annullare l'erogazione del servizio in qualsiasi momento nella schermata delle Impostazioni utente."</string>
-    <string name="store_payment_legalese_yearly">"Ehi! Acquistando %1$s, dichiari di aver letto e accettato i nostri [Termini di Servizio del Negozio](%2$s). %1$s è un abbonamento ricorrente, il che significa che ti addebiteremo un pagamento oggi e continueremo ad addebitarti annualmente fino a quando non annullerai la sottoscrizione. È possibile annullare l'erogazione del servizio in qualsiasi momento nella schermata delle Impostazioni utente."</string>
     <string name="stream">In onda</string>
     <string name="stream_bad_spectator">Lo stream che stai guardando ha qualità video o audio ridotta. Questo potrebbe essere causato da problemi di connessione.</string>
     <string name="stream_bad_streamer">Il tuo stream ha qualità video o audio ridotta. Questo potrebbe essere causato da problemi di connessione.</string>
@@ -3079,7 +2718,6 @@ Procedere?"</string>
     <string name="stream_capture_paused_details">Torna al gioco per riprendere.</string>
     <string name="stream_capture_paused_details_viewer">%1$s ha ridotto a icona il gioco…. tieniti forte!</string>
     <string name="stream_channel_description">I membri con questo permesso possono trasmettere in questo canale.</string>
-    <string name="stream_description">I membri con questo permesso possono trasmettere in questo canale.</string>
     <string name="stream_ended">Lo stream è terminato. *suono di grilli*</string>
     <string name="stream_ended_button">Stream terminato</string>
     <string name="stream_ended_no_spectators">Non ci sono spettatori perché lo stream è terminato.</string>
@@ -3119,7 +2757,6 @@ Procedere?"</string>
     <string name="stream_report_rating_body_streamer">Parlaci della tua esperienza da streamer.</string>
     <string name="stream_report_submit">Invia</string>
     <string name="stream_reported">Suggerimento inviato</string>
-    <string name="stream_reported_body">Grazie per averci segnalato il tuo problema! Il tuo feedback ci aiuterà a migliorare la qualità dello stream.</string>
     <string name="stream_soundshare_failed">"Ehi, qualcosa è andato storto e non riusciamo a trasmettere l'audio del tuo gioco."</string>
     <string name="streamer_mode">Modalità Streamer</string>
     <string name="streamer_mode_enabled">Modalità Streamer attivata</string>
@@ -3129,7 +2766,6 @@ Procedere?"</string>
     <string name="streaming_a_game">Streaming di un gioco</string>
     <string name="stripe_unable_to_load">Purtroppo il processore del pagamento non è attualmente disponibile. Riprova più tardi.</string>
     <string name="sub_enabled_servers">Server con abbonamenti attivi</string>
-    <string name="subscriber_information">Dati dell’utente abbonato</string>
     <string name="suggestions">Consigliati</string>
     <string name="support">Assistenza</string>
     <string name="suppressed">Soppresso</string>
@@ -3137,20 +2773,14 @@ Procedere?"</string>
     <string name="suppressed_afk_title">"Ciao, c'è qualcuno?"</string>
     <string name="suppressed_permission_body">Non hai il permesso di parlare in questo canale.</string>
     <string name="sv_se">Svedese</string>
-    <string name="switch_hardware_acceleration">Modifica dell’accelerazione hardware</string>
-    <string name="switch_hardware_acceleration_body">"Devi riavviare Discord per attivare o disattivare l’impostazione accelerazione hardware.
- Procedere?"</string>
     <string name="switch_subsystem">Cambia sottosistema audio</string>
     <string name="switch_subsystem_body">"Devi riavviare Discord per cambiare il sottosistema audio.
 Procedere?"</string>
     <string name="switch_to_compact_mode">Passa a: Modalità Compatta</string>
-    <string name="switch_to_cozy_mode">Passa a: Modalità moderna</string>
     <string name="switch_to_dark_theme">Passa al tema scuro</string>
     <string name="switch_to_light_theme">Passa al tema chiaro</string>
     <string name="switch_to_push_to_talk">Passa al Push-to-talk</string>
-    <string name="switch_to_voice_activity">Passa all’Attività vocale</string>
     <string name="sync">Sincronizza</string>
-    <string name="sync_across_clients_appearance_help">Attivando questa opzione, saranno annullate le impostazioni relative all’aspetto degli altri client, inclusi desktop e browser.</string>
     <string name="sync_across_clients_text">Sincronizza tra i client.</string>
     <string name="sync_across_clients_text_help">Attivando questa opzione, le impostazioni del menu «Testo e immagini» degli altri client, inclusi desktop e browser, verranno sovrascritte.</string>
     <string name="sync_friends">Sincronizza gli amici su Discord</string>
@@ -3177,7 +2807,6 @@ Procedere?"</string>
     <string name="system_message_guild_member_join_10">Appare %1$s selvatico.</string>
     <string name="system_message_guild_member_join_11">Swoooosh. %1$s è appena atterrato.</string>
     <string name="system_message_guild_member_join_12">Preparatevi. %1$s si è appena unito al server.</string>
-    <string name="system_message_guild_member_join_13">%1$s si è appena unito al server. Nascondete le banane.</string>
     <string name="system_message_guild_member_join_14">%1$s è arrivato. Ma è sgravato, nerfatelo.</string>
     <string name="system_message_guild_member_join_15">%1$s è appena scivolato nel server.</string>
     <string name="system_message_guild_member_join_16">%1$s è appena rinato nel server.</string>
@@ -3188,7 +2817,6 @@ Procedere?"</string>
     <string name="system_message_guild_member_join_21">Sfidante in arrivo! %1$s, nuovo avversario!</string>
     <string name="system_message_guild_member_join_22">È un uccello! È un aereo! Ah no, è soltanto %1$s.</string>
     <string name="system_message_guild_member_join_23">È %1$s! Loda il sole! \\\\[T]/</string>
-    <string name="system_message_guild_member_join_25">Ah! %1$s è entrato in campo! Quindi si attiva la mia carta trappola!</string>
     <string name="system_message_guild_member_join_26">Salve! C’è %1$s!</string>
     <string name="system_message_guild_member_join_27">Ehi! Senti qui! È con noi %1$s!</string>
     <string name="system_message_guild_member_join_28">Ti stavamo aspettando, %1$s.</string>
@@ -3203,10 +2831,8 @@ Procedere?"</string>
     <string name="system_message_guild_member_join_37">%1$s è entrato. Fermati un attimo e ascolta!</string>
     <string name="system_message_guild_member_join_38">Le rose sono rosse, le viole sono blu, non so scrivere poesie, %1$s è sul server e anche tu</string>
     <string name="system_message_join_call">Unisciti alla chiamata</string>
-    <string name="system_message_pinned_message">%1$s ha fissato un messaggio al canale. [Mostra tutti i messaggi fissati.](pinsActionOnClick)</string>
     <string name="system_message_pinned_message_mobile">%1$s ha fissato un messaggio al canale.</string>
     <string name="system_message_pinned_message_no_cta">%1$s ha fissato un messaggio al canale.</string>
-    <string name="system_message_pinned_message_no_cta_formatted">%1$s ha fissato un messaggio al canale.</string>
     <string name="system_message_recipient_add">%1$s ha aggiunto %2$s al gruppo.</string>
     <string name="system_message_recipient_remove">%1$s ha rimosso %2$s dal gruppo.</string>
     <string name="system_message_recipient_remove_self">%1$s è uscito dal gruppo.</string>
@@ -3218,8 +2844,6 @@ Procedere?"</string>
     <string name="temporary_membership_explanation">"I membri temporanei saranno espulsi automaticamente quando si disconnetteranno a meno che
 non sia stato assegnato loro un ruolo"</string>
     <string name="terms_of_service">[Termini di Servizio](%1$s)</string>
-    <string name="terms_privacy">"Registrandoti accetti i [Termini di Servizio](%1$s) e l'[Informativa sulla Privacy](%2$s) di Discord."</string>
-    <string name="terms_privacy_opt_in">"Dichiaro di aver letto e di accettare i [Termini di Servizio](%1$s) e l'[Informativa sulla Privacy](%2$s) di Discord."</string>
     <string name="terms_privacy_opt_in_tooltip">Devi accettare i nostri Termini di Servizio per continuare</string>
     <string name="test_video">Prova la videocamera</string>
     <string name="text">Testo</string>
@@ -3236,13 +2860,11 @@ non sia stato assegnato loro un ruolo"</string>
     <string name="this_server">Questo server</string>
     <string name="this_server_named">Solamente %1$s</string>
     <string name="three_users_typing">**%1$s**, **%2$s** e **%3$s** stanno scrivendo…</string>
-    <string name="timeout_error">L’operazione ha impiegato troppo tempo, riprova.</string>
     <string name="tip_instant_invite_title3">Invita i tuoi amici</string>
     <string name="title">Titolo</string>
     <string name="too_many_animated_emoji">Hai finito gli slot per gli emoji animati.</string>
     <string name="too_many_emoji">Hai finito gli slot per gli emoji.</string>
     <string name="too_many_reactions_alert_body">Non è stato possibile aggiungere la reazione poiché questo messaggio ne ha già fin troppe.</string>
-    <string name="too_many_reactions_alert_header">D’oh!</string>
     <string name="total_results">%1$s</string>
     <string name="tr">Turco</string>
     <string name="transfer">Trasferisci</string>
@@ -3262,23 +2884,15 @@ non sia stato assegnato loro un ruolo"</string>
     <string name="two_fa_backup_code_enter_wrong">I codici di backup devono essere lunghi 8 caratteri e possono contenere solo lettere e numeri.</string>
     <string name="two_fa_backup_code_hint">Codice di backup di 8 caratteri</string>
     <string name="two_fa_backup_code_used">usato</string>
-    <string name="two_fa_backup_codes_body">"Questi codici ti permettono di accedere al tuo account in caso tu smarrissi l’app di verifica.
-**Ciascun codice può essere usato una volta sola! Generare nuovi codici renderà quelli precedenti non validi!**"</string>
     <string name="two_fa_backup_codes_label">Codici di backup</string>
-    <string name="two_fa_backup_codes_sales_pitch">Se perdi l’accesso all’app di verifica, puoi sempre accedere al tuo account con i codici di backup pre-generati. Mettili in un posto sicuro per evitare di perdere l’accesso al tuo account!</string>
-    <string name="two_fa_change_account">Cambia i dettagli dell’account</string>
     <string name="two_fa_disable">Disattiva la verifica in due passaggi</string>
-    <string name="two_fa_discord_backup_codes">Questi sono i tuoi codici di backup di Discord per l’account %1$s. Conservali bene!</string>
     <string name="two_fa_download_app_body">Scarica e installa [Authy](%1$s) o [Google Authenticator](%2$s) sul tuo smartphone o tablet.</string>
-    <string name="two_fa_download_app_label">Scarica un’app di verifica</string>
     <string name="two_fa_download_codes">Scarica i codici di backup</string>
     <string name="two_fa_enable">Attiva la verifica in due passaggi</string>
     <string name="two_fa_enable_subheader">Rendi il tuo account più sicuro in tre semplici passi:</string>
     <string name="two_fa_enabled">Verifica in due passaggi attivata</string>
-    <string name="two_fa_enter_sms_token_label">Inserisci il codice all’interno dell’SMS per Discord</string>
     <string name="two_fa_enter_sms_token_sending">Invio…</string>
     <string name="two_fa_enter_sms_token_sent">Abbiamo inviato un messaggio a %1$s. Inserisci il codice che hai ricevuto.</string>
-    <string name="two_fa_enter_token_body">Puoi usare un codice di backup o l’app per la verifica in due passaggi.</string>
     <string name="two_fa_enter_token_label">Digita il codice di verifica di Discord</string>
     <string name="two_fa_generate_codes">Genera nuovi codici di backup</string>
     <string name="two_fa_generate_codes_confirm_text">Generare nuovi codici di backup annullerà quelli che hai già salvato.</string>
@@ -3290,15 +2904,11 @@ non sia stato assegnato loro un ruolo"</string>
     <string name="two_fa_login_footer">Torna alla schermata di accesso</string>
     <string name="two_fa_login_label">Accedi con il tuo codice</string>
     <string name="two_fa_not_verified">Devi verificare il tuo account prima di poter attivare la verifica in due passaggi.</string>
-    <string name="two_fa_qr_body">Apri l’app di verifica e scansiona l’immagine qui a sinistra usando la webcam del dispositivo.</string>
     <string name="two_fa_qr_label">Scansiona il codice QR</string>
     <string name="two_fa_remove">Rimuovi verifica in due passaggi (2FA)</string>
-    <string name="two_fa_sales_pitch">"Proteggi il tuo account di Discord con uno strato aggiuntivo di protezione. Una volta configurato, dovrai
-inserire sia la password che il codice di verifica inviato al tuo dispositivo mobile per eseguire l’accesso."</string>
     <string name="two_fa_success_body">Ci siamo quasi:</string>
     <string name="two_fa_success_header">La verifica in due passaggi è stata attivata! :tada:</string>
     <string name="two_fa_token_required">È necessario un codice di verifica di Discord valido.</string>
-    <string name="two_fa_use_desktop_app">L’attivazione della verifica in due passaggi non è possibile da questo browser. Usa l’applicazione per desktop per attivarla.</string>
     <string name="two_fa_view_backup_codes">Mostra codici di backup</string>
     <string name="two_fa_view_codes">Mostra i codici</string>
     <string name="two_users_typing">**%1$s** e **%2$s** stanno scrivendo…</string>
@@ -3320,37 +2930,24 @@ Solo gli account registrati possono **scaricare le app**."</string>
     <string name="unfocus_participant">Rimuovi dal primo piano questa persona</string>
     <string name="unhandled_link_body">Siamo spiacenti, ma non sono state trovate app associabili a questo link sul tuo dispositivo:</string>
     <string name="unhandled_link_title">Nessuna associazione per questo link</string>
-    <string name="unified_open_install">Continua sull’app Discord</string>
     <string name="unknown_game">Gioco sconosciuto</string>
     <string name="unknown_region">Regione sconosciuta</string>
     <string name="unknown_server">Server sconosciuto</string>
     <string name="unmute">Togli il silenziamento al microfono</string>
-    <string name="unmute_category">Togli il silenziamento alla categoria</string>
     <string name="unnamed">Senza nome</string>
     <string name="unpin">Stacca</string>
     <string name="unpin_confirm">Sì, toglilo.</string>
     <string name="unpin_message">Stacca il messaggio</string>
-    <string name="unpin_message_body">Basta così, immagino. Sei sicuro di voler togliere il messaggio fissato?</string>
-    <string name="unpin_message_context_menu_hint">Tieni premuto Maiusc e clicca su **Togli il messaggio** per non mostrare questa finestra di conferma.</string>
-    <string name="unpin_message_failed_body">Per qualche ragione Discord non è riuscito a togliere il messaggio. Spiacente!</string>
-    <string name="unpin_message_failed_title">La spilla è incastrata!</string>
     <string name="unpin_message_title">Stacca il messaggio</string>
     <string name="unread_channels">Canali non letti</string>
     <string name="unsupported_browser">Browser non supportato</string>
     <string name="unsupported_browser_body">"Stai utilizzando un browser non supportato. Per godere dei benefici che offre Discord, aggiorna il tuo
 browser o scarica una delle nostre app."</string>
-    <string name="unsupported_browser_details">"Se vuoi comunicare con la tua squadra, usa l'ultima versione di Chrome o di Opera, Firefox 38 o superiore,
-o scarica il Discord Client!"</string>
     <string name="unsupported_browser_title">Beh, questo è imbarazzante</string>
-    <string name="unverified_account_body">"Controlla la casella di posta e segui le istruzioni riportate nell’e-mail che hai ricevuto per completare il processo di verifica.
-
-Se non hai ricevuto l’e-mail o se è scaduta, [clicca qui](onResendClick) per riceverne una nuova."</string>
     <string name="unverified_account_title">Account non verificato</string>
-    <string name="update_available">Download dell’aggiornamento in corso</string>
     <string name="update_downloaded">Aggiornamento pronto!</string>
     <string name="update_manually">Aggiornamento disponibile</string>
     <string name="upgrade_plan">"Fai l'upgrade del tuo piano"</string>
-    <string name="upgrade_yearly">"Fai l'upgrade all’abbonamento annuale"</string>
     <string name="upload">Carica</string>
     <string name="upload_area_cancel_all">Annulla tutto</string>
     <string name="upload_area_help">"Puoi aggiungere un commento prima di caricare.
@@ -3359,7 +2956,6 @@ Tieni premuto Maiusc per caricare direttamente."</string>
     <string name="upload_area_invalid_file_type_title">Tipo di file non valido</string>
     <string name="upload_area_leave_a_comment">Aggiungi un commento</string>
     <string name="upload_area_optional">facoltativo</string>
-    <string name="upload_area_title">Trascina qui i file</string>
     <string name="upload_area_title_no_confirmation">Modalità Caricamento immediato!</string>
     <string name="upload_area_too_large_help">La dimensione massima dei file è di %1$s.</string>
     <string name="upload_area_too_large_title">I tuoi file sono troppo potenti</string>
@@ -3373,7 +2969,6 @@ Tieni premuto Maiusc per caricare direttamente."</string>
     <string name="upload_process_file_failed">Impossibile pre-elaborare il file.</string>
     <string name="uploaded_by">Caricata da</string>
     <string name="usage_access">Accesso utilizzo</string>
-    <string name="usage_statistics_disable_modal_body">Disattivando le statistiche di utilizzo perderai l’accesso a nuove funzionalità sperimentali e miglioramenti basati sull’utilizzo di funzioni come la chat vocale. I tuoi vecchi dati e informazioni saranno resi anonimi, il che renderà Discord più stupido.</string>
     <string name="usage_statistics_disable_modal_cancel">No, torna indietro!</string>
     <string name="usage_statistics_disable_modal_confirm">Sì, sono sicuro</string>
     <string name="usage_statistics_disable_modal_title">Vuoi disattivare alcune delle statistiche di utilizzo?</string>
@@ -3395,9 +2990,6 @@ Tieni premuto Maiusc per caricare direttamente."</string>
     <string name="user_activity_cannot_sync_self">Ascolta insieme a qualcun altro, non da solo.</string>
     <string name="user_activity_chat_invite_education">**%1$s** supporta gli inviti alle partite. [Ignora](dismissOnClick)</string>
     <string name="user_activity_connect_platform">Collega %1$s</string>
-    <string name="user_activity_error_desktop_action">Scarica l’app</string>
-    <string name="user_activity_error_desktop_body">La versione browser di Discord è fantastica ma non può fare tutto. Per avviare questo gioco, devi farlo tramite l’app desktop di Discord. Scaricala ora!</string>
-    <string name="user_activity_error_desktop_title">È necessaria l’app per desktop</string>
     <string name="user_activity_error_friends_action">Invia richiesta di amicizia</string>
     <string name="user_activity_error_friends_body">Dovreste essere prima amici per usarlo! Invia una richiesta di amicizia a %1$s. Quando avrà confermato, riprova a cliccare!</string>
     <string name="user_activity_error_friends_title">Richiesta di amicizia!</string>
@@ -3413,7 +3005,6 @@ Tieni premuto Maiusc per caricare direttamente."</string>
     <string name="user_activity_invite_request_waiting">Richiesta di unione alla partita di **%1$s** in corso…</string>
     <string name="user_activity_listen_along">Ascolta assieme</string>
     <string name="user_activity_listen_along_description">Ascolta insieme a %1$s</string>
-    <string name="user_activity_listening_album">nell’album %1$s</string>
     <string name="user_activity_listening_artists">di %1$s</string>
     <string name="user_activity_never_mind">Non importa</string>
     <string name="user_activity_not_detected">%1$s non è stato rilevato</string>
@@ -3446,7 +3037,6 @@ Tieni premuto Maiusc per caricare direttamente."</string>
     <string name="user_management">Gestione degli utenti</string>
     <string name="user_popout_message">Messaggio</string>
     <string name="user_popout_settings">Impostazioni utente</string>
-    <string name="user_popout_wumpus_tooltip">Sono nuovo su Discord, di’ ciao!</string>
     <string name="user_settings">Impostazioni utente</string>
     <string name="user_settings_appearance_colorblind_mode_description">Modifica alcuni aspetti visivi di Discord per facilitare la distinzione dei colori ai daltonici.</string>
     <string name="user_settings_appearance_colorblind_mode_title">Modalità per daltonici</string>
@@ -3458,8 +3048,6 @@ Tieni premuto Maiusc per caricare direttamente."</string>
     <string name="user_settings_appearance_preview_message_4">Verrà attivata la Modalità Compatta</string>
     <string name="user_settings_appearance_preview_message_5">Oh, eccola lì!</string>
     <string name="user_settings_appearance_zoom_tip">Puoi cambiare il livello di zoom con %1$s +/- e ripristinare il livello predefinito con %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Mostra la scheda Giochi</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Disattiva questa opzione per nascondere la scheda Giochi, così potrai concentrarti sulle tue conversazioni.</string>
     <string name="user_settings_close_button">Pulsante chiudi</string>
     <string name="user_settings_confirm_logout">Sei sicuro di volerti disconnettere?</string>
     <string name="user_settings_game_activity">Attività di gioco</string>
@@ -3480,24 +3068,14 @@ Tieni premuto Maiusc per caricare direttamente."</string>
     <string name="user_settings_keybinds_action">Azione</string>
     <string name="user_settings_keybinds_keybind">Associazione tasti</string>
     <string name="user_settings_linux_settings">Impostazioni di Linux</string>
-    <string name="user_settings_minimize_to_tray_body">Lascia che Discord si riduca nell’area di notifica come farebbe un bel cagnolino educato quando chiudi l’app.</string>
-    <string name="user_settings_minimize_to_tray_label">Riduci l’app nell’area di notifica</string>
     <string name="user_settings_my_account">Il mio account</string>
-    <string name="user_settings_notifications_show_badge_body">Mostra un badge rosso sull’icona dell’app quando avrai messaggi non letti.</string>
     <string name="user_settings_notifications_show_badge_label">Attiva il badge dei messaggi non letti</string>
-    <string name="user_settings_notifications_show_flash_body">Quando riceverai delle notifiche, l’icona dell’app che si trova sulla barra della applicazioni lampeggerà.</string>
     <string name="user_settings_notifications_show_flash_label">Attiva il lampeggio nella barra delle applicazioni</string>
     <string name="user_settings_open_on_startup_body">Risparmiati qualche clic e lascia che Discord ti accolga quando torni a casa come farebbe un bel cagnolino educato</string>
     <string name="user_settings_open_on_startup_label">Apri Discord</string>
     <string name="user_settings_save">Salva</string>
     <string name="user_settings_start_minimized_body">Discord si avvierà in background come un bel cagnolino educato e rimarrà nascosto</string>
-    <string name="user_settings_start_minimized_label">Avvia ridotto nell’area di notifica</string>
-    <string name="user_settings_startup_behavior">Comportamento all’avvio del sistema</string>
-    <string name="user_settings_streamer_notice_body">"Aggiungi gli strumenti che usi per migliorare le tue dirette al server della tua comunità di Discord.
-
-Dai un’occhiata allo [StreamKit di Discord](%1$s)."</string>
     <string name="user_settings_streamer_notice_title">Cerchi le integrazioni?</string>
-    <string name="user_settings_unverified_account_body">Controlla la casella di posta e segui le istruzioni riportate nell’e-mail che hai ricevuto per completare il processo di verifica del tuo account. Se non hai ricevuto l’e-mail o se è scaduta, potrai inviarne una nuova.</string>
     <string name="user_settings_voice_add_multiple">Puoi impostare vari tipi di push-to-talk dal [Impostazioni di associazione tasti](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord utilizza il codec audio open source Opus.</string>
     <string name="user_settings_voice_codec_title">Codec audio</string>
@@ -3512,18 +3090,11 @@ al push-to-talk potrai soltanto ascoltare."</string>
     <string name="vad_permission_small">Devi avere il push-to-talk attivato per parlare in questo canale.</string>
     <string name="vad_permission_title">È necessario il push-to-talk</string>
     <string name="vanity_url">URL personalizzato</string>
-    <string name="vanity_url_help">"Facilita l’accesso al tuo server con una vanity URL.
-Questo renderà il server disponibile pubblicamente a chiunque usi il link."</string>
     <string name="vanity_url_help_conflict">Ricorda che potremmo rimuovere la vanity URL se rileviamo un possibile abuso o un conflitto di proprietà intellettuale.</string>
     <string name="vanity_url_hint_mobile">il-tuo-url</string>
-    <string name="verfication_expired">Link per la verifica dell’indirizzo e-mail scaduto.</string>
     <string name="verfication_expired_suggestion">Accedi a Discord e invia di nuovo il link</string>
-    <string name="verification_body">"Abbiamo individuato qualche problema.
-Per continuare a usare Discord, **dobbiamo verificare che tu sia una persona.**"</string>
     <string name="verification_body_alt">Ora, verifichiamo che tu non sia un robot…</string>
     <string name="verification_email_body">Abbiamo inviato una nuova e-mail di verifica a **%1$s**, controlla nella cartella della posta in arrivo e in quella della posta indesiderata.</string>
-    <string name="verification_email_error_body">C’è stato un errore nell’invio dell’e-mail di verifica. Riprova più tardi o contatta l’assistenza.</string>
-    <string name="verification_email_error_title">Errore nell’invio dell’e-mail di verifica</string>
     <string name="verification_email_title">E-mail di verifica</string>
     <string name="verification_footer">Pensi di vedere questo messaggio per un errore?</string>
     <string name="verification_footer_logout">[Esci](logoutOnClick)</string>
@@ -3541,7 +3112,6 @@ Per continuare a usare Discord, **dobbiamo verificare che tu sia una persona.**"
     <string name="verification_phone_title">Verifica il tuo numero</string>
     <string name="verification_title">È successo qualcosa di strano</string>
     <string name="verification_verified">E-mail verificata!</string>
-    <string name="verification_verifying">Verifica dell’e-mail in corso</string>
     <string name="verify">Verifica</string>
     <string name="verify_account">Verifica account</string>
     <string name="verify_by">Verifica tramite</string>
@@ -3553,20 +3123,15 @@ Per continuare a usare Discord, **dobbiamo verificare che tu sia una persona.**"
 **Telefono**"</string>
     <string name="verify_by_recaptcha">Verifica con reCAPTCHA</string>
     <string name="verify_by_recaptcha_description">Dobbiamo assicurarci che tu non sia un robot.</string>
-    <string name="verify_email_body">Controlla la casella di posta e segui le istruzioni riportate nell’e-mail che hai ricevuto per completare il processo di verifica del tuo account. Se non hai ricevuto l’e-mail o se è scaduta, potrai inviarne una nuova.</string>
     <string name="verify_email_body_resent">Abbiamo inviato una nuova e-mail di verifica a **%1$s**, controlla nella cartella della posta in arrivo e in quella della posta indesiderata.</string>
     <string name="verify_phone">Verifica telefono</string>
     <string name="verifying">Verifica in corso</string>
     <string name="video_call">Videochiamata</string>
-    <string name="video_poor_connection_body">La videochiamata è stata disattivata. Riprenderà quando la tua connessione migliorerà.</string>
-    <string name="video_poor_connection_title">Connessione lenta</string>
     <string name="video_preview">Anteprima videocamera</string>
     <string name="video_settings">Impostazioni video</string>
     <string name="video_unavailable">Videochiamata non disponibile</string>
-    <string name="video_unsupported_browser_body">Questo browser non supporta l’uso della fotocamera e la condivisione schermo. Scarica la nostra app desktop per trasmettere la tua faccia e il tuo schermo in tutto il web.</string>
     <string name="video_unsupported_browser_title">Browser non supportato</string>
     <string name="view_audit_log">Visualizzare il registro attività</string>
-    <string name="view_audit_log_description">I membri con questo permesso avranno l’accesso al registro attività del server</string>
     <string name="view_channel">Visualizzare il canale</string>
     <string name="view_profile">"Visualizza 
 profilo"</string>
@@ -3581,7 +3146,6 @@ profilo"</string>
     <string name="voice_channel_show_names">Mostra nomi</string>
     <string name="voice_channels">Canali vocali</string>
     <string name="voice_connect">Voce</string>
-    <string name="voice_disconnect_body">Disconnettersi da questo canale vocale?</string>
     <string name="voice_disconnect_title">Disconnettiti dal canale vocale</string>
     <string name="voice_only">Solo voce</string>
     <string name="voice_permissions">Permessi della chat vocale</string>
@@ -3607,7 +3171,6 @@ profilo"</string>
     <string name="webhook_delete_title">Elimina %1$s</string>
     <string name="webhook_edit">Modifica</string>
     <string name="webhook_error_creating_webhook">Errore con la creazione del webhook</string>
-    <string name="webhook_error_deleting_webhook">Errore con l’eliminazione del webhook</string>
     <string name="webhook_error_internal_server_error">Si è verificato un errore interno del server.</string>
     <string name="webhook_error_max_webhooks_reached">Hai raggiunto il numero massimo di webhook.</string>
     <string name="webhook_error_saving_webhook">Errore con il salvataggio del webhook</string>
@@ -3615,12 +3178,10 @@ profilo"</string>
     <string name="webhook_form_name">Nome</string>
     <string name="webhook_form_url">URL del webhook</string>
     <string name="webhook_form_webhook_url_help">Serve aiuto con la configurazione?</string>
-    <string name="webhook_modal_icon_description">Consigliamo un’immagine di almeno 256x256 pixel</string>
     <string name="webhook_modal_icon_title">Icona webhook</string>
     <string name="webhook_modal_title">Modifica webhook</string>
     <string name="webhook_save">Salva</string>
     <string name="webhooks">Webhook</string>
-    <string name="welcome_message_desktop_apps">**Scarica** l’[applicazione per desktop](onDownloadClick) per poter usare il push-to-talk anche se la finestra non è in primo piano, per ridurre il consumo di banda e l’utilizzo del processore, e molto altro.</string>
     <string name="welcome_message_instant_invite">**Invita gli amici** al server cliccando [qui](onShareClick) non appena sei pronto.</string>
     <string name="welcome_message_mobile_apps">**Resta connesso** al server dal [tuo smartphone](onDownloadClick) e continua a usare Discord anche mentre stai giocando a una console.</string>
     <string name="welcome_message_mobile_instant_invite">Invita i tuoi amici</string>
@@ -3641,7 +3202,6 @@ o ti serve aiuto."</string>
     <string name="whitelisting">Aggiunta in corso alla lista bianca…</string>
     <string name="xbox_authorization_title">Autorizzazione account Xbox</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>
     <string name="xbox_pin_step3">Fai clic sul logo Xbox e inserisci il PIN qui sopra</string>
     <string name="yes_text">Sì</string>
diff --git a/com.discord/res/values-ja/plurals.xml b/com.discord/res/values-ja/plurals.xml
index cb3540bc81..044ca62dd1 100644
--- a/com.discord/res/values-ja/plurals.xml
+++ b/com.discord/res/values-ja/plurals.xml
@@ -40,11 +40,6 @@
         <item quantity="other">%d人</item>
         <item quantity="one">1人</item>
     </plurals>
-    <plurals name="bans_header_bans">
-        <item quantity="other">%d 人のBANされたユーザー</item>
-        <item quantity="zero">BANされたユーザーはいません</item>
-        <item quantity="one">1 人のBANされたユーザー</item>
-    </plurals>
     <plurals name="billing_refund_purchase_date_daysSincePurchase">
         <item quantity="other">%d 日前</item>
         <item quantity="zero">今日</item>
@@ -87,15 +82,6 @@
         <item quantity="zero">空きスロット無し</item>
         <item quantity="one">あと%dスロット</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d日間</item>
-        <item quantity="one">1日</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d人</item>
-        <item quantity="zero">0人</item>
-        <item quantity="one">1人</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">日</item>
         <item quantity="one">日</item>
@@ -212,16 +198,6 @@
         <item quantity="other">許諾</item>
         <item quantity="one">許諾</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">低速モードを**!!%d!!秒**に設定</item>
-        <item quantity="zero">低速モードを無効化</item>
-        <item quantity="one">低速モードを**1秒**に設定</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">低速モードを**!!%d!!秒**に設定</item>
-        <item quantity="zero">低速モードを無効に設定</item>
-        <item quantity="one">低速モードを**1秒**に設定</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!!メンバー**</item>
         <item quantity="one">**メンバー**</item>
@@ -290,10 +266,6 @@
         <item quantity="other">%d日</item>
         <item quantity="one">1日</item>
     </plurals>
-    <plurals name="live_viewers_viewers">
-        <item quantity="other">人</item>
-        <item quantity="one">viewer</item>
-    </plurals>
     <plurals name="max_uses_description_mobile_maxUses">
         <item quantity="other">%d回</item>
         <item quantity="zero">無制限</item>
@@ -322,10 +294,6 @@
 新着メッセージ"</item>
         <item quantity="one">1件の新着メッセージ</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d日</item>
-        <item quantity="one">1日</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%dチャンネル</item>
         <item quantity="one">%dチャンネル</item>
@@ -343,10 +311,6 @@
         <item quantity="other">これらのメッセージ</item>
         <item quantity="one">このメッセージ</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d**個のサーバーが現在ダウンしています。</item>
-        <item quantity="one">**1個**のサーバーが現在ダウンしています。</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%dカ月</item>
         <item quantity="one">1カ月</item>
@@ -367,11 +331,6 @@
         <item quantity="other">%d人</item>
         <item quantity="one">1人</item>
     </plurals>
-    <plurals name="roles_list_numRoles">
-        <item quantity="other">役職</item>
-        <item quantity="zero">役職なし</item>
-        <item quantity="one">役職</item>
-    </plurals>
     <plurals name="search_hide_blocked_messages_count">
         <item quantity="other">%d件</item>
         <item quantity="one">%d件</item>
diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml
index c42b8b13bd..7680b5254b 100644
--- a/com.discord/res/values-ja/strings.xml
+++ b/com.discord/res/values-ja/strings.xml
@@ -32,7 +32,6 @@
     <string name="abc_shareactionprovider_share_with_application">%sと共有</string>
     <string name="abc_toolbar_collapse_description">折りたたむ</string>
     <string name="about_this_app">このアプリについて</string>
-    <string name="accept_request_button">フレンドリクエストを受け取りました</string>
     <string name="accept_request_button_after">リクエストを承認する</string>
     <string name="accessibility_font_scaling_label">チャットの文字の大きさ</string>
     <string name="accessibility_zoom_level_label">拡大率</string>
@@ -61,22 +60,16 @@
     <string name="activity_panel_go_live_hotspot_dismiss_button">分かった！</string>
     <string name="activity_panel_go_live_hotspot_header">Go Liveで直接フレンドにゲームプレイを配信する！</string>
     <string name="activity_panel_go_live_tooltip">Go Live</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">このサーバーには配信するボイスチャンネルがありません。</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">このボイスチャンネルでは配信できません。</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">配信するサーバーに移動。</string>
     <string name="add">追加</string>
     <string name="add_a_comment_optional">コメントを追加（オプション）</string>
     <string name="add_a_member">メンバーを一人追加</string>
-    <string name="add_a_role">役職を追加</string>
     <string name="add_a_server">サーバーを追加</string>
     <string name="add_a_server_mobile">タップしてサーバーを追加！</string>
     <string name="add_channel_or_category">チャンネルまたはカテゴリーを追加</string>
     <string name="add_channel_to_override">チャンネルを追加してデフォルトの通知設定を上書きします</string>
     <string name="add_friend">フレンドに追加</string>
-    <string name="add_friend_add_manually">フレンドリクエストを送信</string>
     <string name="add_friend_already_friends">既にフレンド登録されています</string>
-    <string name="add_friend_button">フレンドリクエストを送信</string>
-    <string name="add_friend_button_after">フレンド登録を申請しました</string>
     <string name="add_friend_confirmation">**%1$s**にリクエストが送信されました</string>
     <string name="add_friend_description">DiscordTagを使ってフレンドを追加できます。</string>
     <string name="add_friend_error_discord_tag_username">DiscordTagは偽りのユーザーネームです。友だちの真のユーザー名とタグを「WumpusWizard#9349」のように入力してください。</string>
@@ -131,7 +124,6 @@
     <string name="amount">金額</string>
     <string name="animate_emoji">アニメ絵文字を再生する</string>
     <string name="animate_emoji_note">絵文字が動くようにしたい。</string>
-    <string name="animated_emoji">動く絵文字</string>
     <string name="answer">応答</string>
     <string name="app_download_now">アプリを持っていませんか？**今すぐダウンロードする**</string>
     <string name="app_information">アプリ情報</string>
@@ -158,7 +150,6 @@
     <string name="application_entitlement_code_redemption_confirmation_title">入手しました！</string>
     <string name="application_entitlement_code_redemption_go_to_library">ライブラリへ進む</string>
     <string name="application_entitlement_code_redemption_invalid">入力されたコードが無効です</string>
-    <string name="application_entitlement_code_redemption_prompt">ゲームのコードをお受け取りになりましたか？以下に入力してください：</string>
     <string name="application_entitlement_code_redemption_redeem">交換する</string>
     <string name="application_filter_name_linux">すべてのファイル</string>
     <string name="application_filter_name_macos">申請</string>
@@ -184,7 +175,6 @@
     <string name="application_library_remove_confirm_body">%1$sはライブラリで非表示になります。ゲームライブラリ設定ページから再表示できます。</string>
     <string name="application_library_remove_confirm_confirm">確信している</string>
     <string name="application_library_remove_confirm_header">ライブラリで非表示</string>
-    <string name="application_library_wumpus_alt">ウンパスが遊べるゲームがないよ！</string>
     <string name="application_progress_indicator_installing">%1$sをダウンロード中</string>
     <string name="application_progress_indicator_installing_hours">%1$sをダウンロード中～%2$sの残り時間</string>
     <string name="application_progress_indicator_installing_minutes">%1$sをダウンロード中～%2$sの残り時間</string>
@@ -194,7 +184,6 @@
     <string name="application_progress_indicator_updating_hours">%1$sを更新中～%2$sの残り時間</string>
     <string name="application_progress_indicator_updating_minutes">%1$sを更新中～%2$sの残り時間</string>
     <string name="application_progress_indicator_updating_seconds">%1$sを更新中～%2$s</string>
-    <string name="application_store_activity_feed_promotion_subtitle">Discord 開発チームより (^o^)</string>
     <string name="application_store_all_news">全ての最新ニュース…とオプション！</string>
     <string name="application_store_browse">閲覧</string>
     <string name="application_store_browse_by_genre_label">ジャンル：</string>
@@ -278,20 +267,17 @@
     <string name="application_store_genre_tower_defense">タワーディフェンス</string>
     <string name="application_store_genre_track_field">陸上競技</string>
     <string name="application_store_genre_train_simulator">列車シミュレータ</string>
-    <string name="application_store_genre_trivia_board_game">トリビア／ボードゲーム</string>
     <string name="application_store_genre_turn_based_strategy">ターン制ストラテジー</string>
     <string name="application_store_genre_vehicular_combat">車両戦闘</string>
     <string name="application_store_genre_visual_novel">ビジュアルノベル</string>
     <string name="application_store_genre_wargame">戦争ゲーム</string>
     <string name="application_store_genre_wrestling">レスリング</string>
-    <string name="application_store_get_premium">サブスクリプションする</string>
     <string name="application_store_hero_carousel_featured_game">注目のゲーム</string>
     <string name="application_store_hero_carousel_featured_premium_game">注目の Nitro ゲーム</string>
     <string name="application_store_hero_carousel_learn_more">詳しくはこちら</string>
     <string name="application_store_hide_games_in_library">ライブラリでゲームを表示しない</string>
     <string name="application_store_hide_games_in_library_hidden">%1$s 非表示</string>
     <string name="application_store_home_footer_main">閲覧してくれてありがとう！</string>
-    <string name="application_store_home_footer_sub">Discord 開発チームより</string>
     <string name="application_store_home_view_all_applications">すべてのゲームを表示する</string>
     <string name="application_store_in_library">ライブラリ内</string>
     <string name="application_store_link_copied">リンクをコピーしました！</string>
@@ -340,30 +326,20 @@
     <string name="application_store_purchase_test_mode">このアプリをテストモードでお使いですので、課金されません。</string>
     <string name="application_store_rating_descriptors_esrb_alcohol_reference">酒類に関する描写</string>
     <string name="application_store_rating_descriptors_esrb_animated_blood">アニメのような流血シーン</string>
-    <string name="application_store_rating_descriptors_esrb_blood">流血</string>
     <string name="application_store_rating_descriptors_esrb_blood_and_gore">流血およびゴア表現</string>
-    <string name="application_store_rating_descriptors_esrb_cartoon_violence">漫画のような暴力行為</string>
     <string name="application_store_rating_descriptors_esrb_comic_mischief">きわどいユーモア</string>
-    <string name="application_store_rating_descriptors_esrb_crude_humor">卑猥なユーモア</string>
     <string name="application_store_rating_descriptors_esrb_drug_reference">ドラッグ描写</string>
-    <string name="application_store_rating_descriptors_esrb_fantasy_violence">ファンタジー世界での暴力行為</string>
     <string name="application_store_rating_descriptors_esrb_in_game_purchases">ゲーム内課金</string>
     <string name="application_store_rating_descriptors_esrb_intense_violence">リアルな暴力行為</string>
-    <string name="application_store_rating_descriptors_esrb_language">若干汚い言葉遣い</string>
     <string name="application_store_rating_descriptors_esrb_lyrics">若干きわどい歌詞を含む</string>
     <string name="application_store_rating_descriptors_esrb_mature_humor">大人向けのユーモア</string>
     <string name="application_store_rating_descriptors_esrb_nudity">裸体描写</string>
     <string name="application_store_rating_descriptors_esrb_partual_nudity">部分的な裸体描写</string>
     <string name="application_store_rating_descriptors_esrb_real_gambling">金品を賭けるギャンブル</string>
-    <string name="application_store_rating_descriptors_esrb_sexual_content">性行為描写</string>
     <string name="application_store_rating_descriptors_esrb_sexual_themes">性的表現</string>
     <string name="application_store_rating_descriptors_esrb_sexual_violence">性的暴力</string>
     <string name="application_store_rating_descriptors_esrb_shares_location">位置情報の共有</string>
     <string name="application_store_rating_descriptors_esrb_simulated_gambling">金品を賭けないギャンブル</string>
-    <string name="application_store_rating_descriptors_esrb_strong_language">七大卑語を含む汚い言葉遣い</string>
-    <string name="application_store_rating_descriptors_esrb_strong_lyrics">かなりきわどい歌詞を含む</string>
-    <string name="application_store_rating_descriptors_esrb_strong_sexual_content">激しい性行為描写</string>
-    <string name="application_store_rating_descriptors_esrb_suggestive_themes">何かをそそのかす表現を含む</string>
     <string name="application_store_rating_descriptors_esrb_tobacco_reference">喫煙に関する描写</string>
     <string name="application_store_rating_descriptors_esrb_unrestricted_internet">無制限のインターネット</string>
     <string name="application_store_rating_descriptors_esrb_use_of_alcohol">飲酒描写</string>
@@ -414,7 +390,6 @@
     <string name="application_store_view_all_news">全ての最新ニュースを読む</string>
     <string name="application_store_warning_dlc_requires_base_application_description">プレイの条件として、Discordで%1$sを所有していることをDLCは求めています。[DLCの詳細](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">ダウンロードコンテンツ</string>
-    <string name="application_store_warning_early_access_description">このゲームはおもしろいです（当方はそう思います！）が、コンテンツが限られ、バグが多種多様で、不完全な感じがするかもしれません。[早期アクセスの詳細](%1$s)</string>
     <string name="application_store_warning_early_access_title">早期アクセス</string>
     <string name="application_store_warning_requires_desktop_app_description">このゲームをプレイするには、Discord$[デスクトップアプリ](downloadHook)をインストールしていなければなりません。</string>
     <string name="application_store_warning_requires_desktop_app_title">デスクトップアプリが必要です</string>
@@ -463,7 +438,6 @@
     <string name="authorized">認証しました</string>
     <string name="authorized_apps">連携済アプリケーション</string>
     <string name="authorizing">認証中</string>
-    <string name="auto_toggle_streamer_mode_description">OBSやXSplitを起動している場合、自動的に有効・無効を切り替えします。</string>
     <string name="auto_toggle_streamer_mode_label">自動切換え</string>
     <string name="autocomplete_no_results_body">打ち間違いかも？</string>
     <string name="autocomplete_no_results_header">見つからないよ！</string>
@@ -484,10 +458,6 @@
     <string name="ban_user_error_generic">おっと… %1$sをBANすることができませんでした。もう一度やり直してください！</string>
     <string name="ban_user_title">「%1$s」をBAN</string>
     <string name="bans">BANしたユーザー</string>
-    <string name="bans_header">%1$s</string>
-    <string name="bans_hint">"BANは通常、ユーザーとIPアドレスに対して行われます。
-ユーザーは、プロキシを使用してIPアドレスの禁止を回避することができます。
-[管理](onModerationClick)で認証レベルを電話認証がされているアカウントのみに設定すると、BAN回避が非常に困難になります。"</string>
     <string name="bans_no_results">検索の結果、該当するBAN済みユーザーは見つかりませんでした。</string>
     <string name="bans_no_users_banned">"あなたは誰もBANしていないようです…
 しかし必要になった時はためらいなく行いましょう。"</string>
@@ -537,7 +507,6 @@
     <string name="billing_error_section_card">おっと！カードに問題があるようです。フィールドを修正して再度お試しください！</string>
     <string name="billing_history">支払い履歴</string>
     <string name="billing_legal_mumbo_jumbo">法律のなんたらかんたら</string>
-    <string name="billing_legal_mumbo_jumbo_label">私は[Discord Storeサービスご利用規約]（%1$s）に同意します</string>
     <string name="billing_no_payment_method">保存されているお支払い方法はありません</string>
     <string name="billing_no_payment_method_description">お支払い方法を保存すると素早く精算できます</string>
     <string name="billing_pay_for_it_with">お支払い方法</string>
@@ -545,8 +514,6 @@
     <string name="billing_payment_breakdown_total">合計</string>
     <string name="billing_payment_history">取引履歴</string>
     <string name="billing_payment_premium">お客さまのサブスクリプション</string>
-    <string name="billing_payment_premium_legalese_monthly">%1$sサブスクリプションを購入することで、当社の[ご利用規約]（%2$s）に合意することになります。%1$sは自動定期サブスクリプションです。Discordがご指定の支払い方法で%3$sをすぐに請求し、お客さまがサブスクリプションを取り消すまで毎月請求することを、お客さまは承認します。いつでもキャンセルすることができます。</string>
-    <string name="billing_payment_premium_legalese_yearly">%1$sサブスクリプションを購入することで、当社の[ご利用規約]（%2$s）に合意することになります。%1$sは自動定期サブスクリプションです。Discordがご指定の支払い方法で%3$sをすぐに請求し、お客さまがサブスクリプションを取り消すまで毎年請求することを、お客さまは承認します。いつでもキャンセルすることができます。</string>
     <string name="billing_payment_sources">お支払い方法</string>
     <string name="billing_payment_table_header_amount">金額</string>
     <string name="billing_payment_table_header_date">日付</string>
@@ -573,7 +540,6 @@
     <string name="billing_step_payment_type">お支払い種類</string>
     <string name="billing_step_paypal">PayPalの詳細情報</string>
     <string name="billing_step_review">確認</string>
-    <string name="billing_subscribe">サブスクリプションする</string>
     <string name="billing_tag_failed">失敗</string>
     <string name="billing_tag_pending">保留中</string>
     <string name="billing_tag_refunded">返金済み</string>
@@ -634,7 +600,6 @@
     <string name="cannot_deny_self_simple">自分自身の権限を無効にすることはできません。</string>
     <string name="cannot_deny_singular_permission">この権限を無効にすると、あなた自身も権限を失うことになります。</string>
     <string name="cannot_manage_higher_rank">この人はあなたよりも上位のロールを持っているため、管理することができません。</string>
-    <string name="cannot_manage_is_owner">この人はサーバーの管理者であるため、あなたがこれを管理することはできません。</string>
     <string name="cannot_manage_same_rank">この人はあなたと同じランクのロールを持っているため、管理することができません。</string>
     <string name="captcha">CAPTCHA</string>
     <string name="captcha_failed">キャプチャ認証に失敗しました。再度お試しください。</string>
@@ -655,8 +620,6 @@
     <string name="certified_device_recommendation_audio_output_body">承認済み音声出力機器**%1$s %2$s**を検出しました。Discordを最適に使用するため、このデバイスへの切り替えをオススメします。</string>
     <string name="certified_device_recommendation_cancel">やめておく</string>
     <string name="certified_device_recommendation_confirm">切り替える</string>
-    <string name="certified_device_recommendation_title">承認済み機器の検出</string>
-    <string name="certified_device_recommendation_video_input_body">承認済みビデオ入力機器**%1$s %2$s**を検出しました。Discordを最適に使用するため、このデバイスへの切り替えをオススメします。</string>
     <string name="change">変更</string>
     <string name="change_avatar">"アバター
 を変更"</string>
@@ -691,7 +654,6 @@
     <string name="channel_locked_short">ロックされたチャンネル</string>
     <string name="channel_locked_to_category">権限は**%1$s**と同期しています</string>
     <string name="channel_members">チャンネルのメンバー</string>
-    <string name="channel_mute_tooltip">チャンネルをミュートすると、@メンション以外の通知と未読表示は通知されなくなります</string>
     <string name="channel_name_required">チャンネル名が必要です。</string>
     <string name="channel_or_category">チャンネルまたはカテゴリー</string>
     <string name="channel_order_updated">チャンネルの順序を更新しました。</string>
@@ -726,7 +688,6 @@
     <string name="claim_account_required_email_to">ありがとうございます！確認リンクを**%1$s**へ送信いたしました。アカウントを確認するリンクをクリックしてください。</string>
     <string name="clear_cache">キャッシュを削除する</string>
     <string name="clone_channel">チャンネルを複製</string>
-    <string name="clone_channel_help">新しいチャンネルは**%1$s**と同じ権限、人数制限、ビットレートで作成されます。</string>
     <string name="close">閉じる</string>
     <string name="close_dm">DMを閉じる</string>
     <string name="close_stream">配信を閉じる</string>
@@ -809,7 +770,6 @@
     <string name="connection_enter_code">画面に表示されるコードを入力してください</string>
     <string name="connection_invalid_pin">無効なPINコードが入力されました</string>
     <string name="connection_login_with">または次でログイン</string>
-    <string name="connection_problems_body">[サーバー状態](%1$s)を確認、または[@discordapp](%2$s)にツイートする。</string>
     <string name="connection_status_authenticating">認証中</string>
     <string name="connection_status_awaiting_endpoint">エンドポイントを待っています。</string>
     <string name="connection_status_connected">接続済み</string>
@@ -861,8 +821,6 @@
     <string name="create_server_button_cta">サーバーを作成</string>
     <string name="create_server_button_cta_mobile">新しいサーバーを作成</string>
     <string name="create_server_button_cta_mobile_desc">サーバーを作成して、フレンドを招待して、楽しんじゃおう！</string>
-    <string name="create_server_description">サーバーを作ることで、**無料**でお友達とボイスおよびテキストチャットを使用することが出来るようになります。</string>
-    <string name="create_server_guidelines">サーバーを作成すると、Discordの**[コミュニティーガイドライン](%1$s)**に同意したことになります。</string>
     <string name="create_server_title">サーバー作成</string>
     <string name="create_text_channel">テキストチャンネルを作成</string>
     <string name="create_voice_channel">ボイスチャンネルを作成</string>
@@ -968,7 +926,6 @@
     <string name="disable_email_notifications_failed_suggestion">メール通知はすでに無効化されているか、このメールアドレスはもうDiscordと関連付けされていないかもしれません。</string>
     <string name="disable_integration_title">同期を無効</string>
     <string name="disable_integration_twitch_body">同期を無効にすると、ある購読の有効期限が切れると、すべての購読の有効期限が切れているように見えます。</string>
-    <string name="disable_integration_youtube_body">同期を無効にすると、あるスポンサーの有効期限が切れると、すべてのスポンサーの有効期限が切れているように見えます。</string>
     <string name="disable_notifications_description">デスクトップ通知を無効にします。</string>
     <string name="disable_notifications_label">通知の無効化</string>
     <string name="disable_sounds_description">サウンド効果が無効になります。</string>
@@ -985,7 +942,6 @@
     <string name="discord_desc_short">チームボイス・テキストチャット</string>
     <string name="discord_rich_presence">DiscordのRich Presence</string>
     <string name="dismiss">却下する</string>
-    <string name="dispatch_error_modal_body">何かしらの問題が発生してしまいました。もし問題が解決しない場合は、サポートチケットをオープンして下記のメッセージをコピーしてください。</string>
     <string name="dispatch_error_modal_error_label">エラーメッセージ（コピペして下さい）</string>
     <string name="dispatch_error_modal_header">Discord Dispatch　エラー</string>
     <string name="dispatch_error_modal_open_ticket">チケットをオープンする</string>
@@ -1061,7 +1017,6 @@
     <string name="enable">有効にする</string>
     <string name="enable_ingame_overlay">ゲーム中のオーバーレイを有効化</string>
     <string name="enable_privacy_access">プライバシー設定からアクセスを有効にすることができます。</string>
-    <string name="enable_streamer_mode_description">[キー割り当て](onClick)から配信モードを切り替えるショートカットを設定することもできます。</string>
     <string name="enable_streamer_mode_label">配信モードを有効にする</string>
     <string name="enable_twitch_emoji_sync">同期した購読者にTwitchでカスタムした絵文字をDiscordで使用することを許可します。</string>
     <string name="enter_email_body">メールアドレスの認証には、まずメールアドレスを入力します。</string>
@@ -1118,11 +1073,8 @@
     <string name="form_help_attenuation">"誰かが話している時に他のアプリの音量を下げます。
 0%%に設定すると減衰を無効にします。"</string>
     <string name="form_help_automatic_vad">インジケーターが緑に点灯している時は、Discordがあなたの美声を送信しています。</string>
-    <string name="form_help_bitrate">"**上げすぎ注意！** モバイル版や回線が貧弱なユーザーに
-悪影響を及ぼすため、音質厨でもない限り%1$skbps以上に調節するのはおすすめしません。"</string>
     <string name="form_help_certified_voice_processing">"Discord認証マイクを使用している間は、特定の音声処理機能はDiscordではなく
 マイク側で処理されます。"</string>
-    <string name="form_help_channel_permissions">役職を選択すると、このチャンネルの基本的な権限が自動で設定されます。</string>
     <string name="form_help_custom_code">コードには任意の英数字が使用できます</string>
     <string name="form_help_debug_logging">トラブルシューティングのために当方に送信できるデバッグログをボイスモジュールフォルダーに保存する。</string>
     <string name="form_help_default_notification_settings">"通知設定を個人で設定していないメンバーに、
@@ -1132,11 +1084,6 @@
 公開Discordの場合は@mentionsのみに設定することを強くおすすめします。"</string>
     <string name="form_help_explicit_content_filter">"このサーバー上で不適切な表現を含むメッセージをスキャンし、自動的に削除します。サーバーのメンバーに対して、
 どの程度フィルターを適用させるか選択してください。**一般公開されているDiscordサーバーでは、フィルターの設定をおすすめします。**"</string>
-    <string name="form_help_instant_invite_channel">"チャンネルが選択されている場合、招待のリンクはウィジェットとして生成されますが、
-そうでない場合は、オンラインメンバーとボイスチャンネルが提供されます。"</string>
-    <string name="form_help_last_seen">"この操作によって **%1$s**のメンバーがキックされます。
-**%2$s**オンラインになっておらず、役職を割り当てられていないメンバーが対象です。
-新しい招待を受けることで再びサーバーに参加できます。"</string>
     <string name="form_help_legacy_subsystem">"お使いのオペレーティングシステムの近代的なオーディオシステムを使用している場合、特定のオーディオハードウェアのドライバに問題が生じる可能性があります。
 従来のオーディオシステムを使用するにはこの設定を有効にしてください。"</string>
     <string name="form_help_nsfw">"ユーザーがこのチャンネル内のコンテンツを閲覧する際に、年齢確認が求められるようになります。
@@ -1146,10 +1093,7 @@
     <string name="form_help_qos">"Discordがルーターへ送信するパケットの優先順位を高くします。
 これが設定されている場合、一部のルーターやインターネットサービスプロバイダーはうまく動かない可能性があります。"</string>
     <string name="form_help_slowmode">メンバーは、チャンネル管理またはメッセージ管理の権限を持っていない限り、設定した間隔につきメッセージを1件しか送信できないようになります。</string>
-    <string name="form_help_system_channel">このサーバーへ新しいメンバーが参加した際、このチャンネルにメッセージを送ります。メッセージの表示はランダムです。この設定はいつでもオフにできます。</string>
     <string name="form_help_temporary">このメンバーはロールが割り当てられていない限り、切断したときに自動的にキックされます。</string>
-    <string name="form_help_user_limit">"このボイスチャンネルに接続できるユーザー数を制限します。**メンバー移動**の権限を持つユーザーはこの制限を
-無視でき、他のユーザーをこのチャンネルに移動することもできます。"</string>
     <string name="form_help_verification_level">"サーバーのメンバーはテキストチャンネルで発言する、あるいは
 ダイレクトメッセージを送信する前に以下の基準を満たさなければなりません。メンバーに何らかのロールが割り当てられている場合は、この限りではありません。
 **一般公開されているDiscordサーバーでは、この認証レベルの設定をおすすめします**"</string>
@@ -1192,7 +1136,7 @@
     <string name="form_label_input_sensitivty">入力感度</string>
     <string name="form_label_input_volume">入力音量</string>
     <string name="form_label_instant_invite">招待を入力</string>
-    <string name="form_label_instant_invite_channel">招待チャンネル</string>
+    <string name="form_label_instant_invite_channel">チャンネルを招待</string>
     <string name="form_label_last_seen">前回のログイン</string>
     <string name="form_label_local_mute">ローカルミュート</string>
     <string name="form_label_max_age">期限</string>
@@ -1215,7 +1159,6 @@
     <string name="form_label_mobile_notifications_wake_device">通知でデバイスを起動させる。</string>
     <string name="form_label_mobile_push_notifications">携帯電話にプッシュ通知を行う</string>
     <string name="form_label_mute_server">**%1$s**からの通知を無効にする</string>
-    <string name="form_label_mute_server_description">このサーバーにおいて自分宛のメッセージ以外の未読メッセージ表示や通知を無効にします。</string>
     <string name="form_label_muted">ミュート中</string>
     <string name="form_label_new_password">新しいパスワード</string>
     <string name="form_label_new_user">新しいユーザーですか？</string>
@@ -1234,7 +1177,6 @@
     <string name="form_label_password">パスワード</string>
     <string name="form_label_phone_number">電話番号</string>
     <string name="form_label_premade_widget">公式ウィジェット</string>
-    <string name="form_label_push_afk_timeout">プッシュ通知AFK時間切れ</string>
     <string name="form_label_qos">サービスの品質</string>
     <string name="form_label_reason_ban">BANの理由</string>
     <string name="form_label_reason_kick">キックの理由</string>
@@ -1261,7 +1203,6 @@
     <string name="form_label_suppress_everyone">**@everyone**と**@here**の通知を行わない</string>
     <string name="form_label_synced_role">ロールを同期しました</string>
     <string name="form_label_synced_subs">購読者を同期しました</string>
-    <string name="form_label_system_channel">新しいメンバー参加時の通知チャンネル</string>
     <string name="form_label_temporary">仮メンバー</string>
     <string name="form_label_tts">テキスト読み上げ</string>
     <string name="form_label_tts_notifications">テキスト読み上げによる通知</string>
@@ -1277,12 +1218,6 @@
     <string name="form_placeholder_reason">理由</string>
     <string name="form_placeholder_server_name">サーバー名を入力してください。</string>
     <string name="form_placeholder_username">ニックネームを入力してください</string>
-    <string name="form_report_help_text">"通報内容は**サーバー所有者ではなく**、Discord信頼・安全性チームに送信されました。
-
-偽の報告を作成したり、通報ボタンを連打したりすると、報告作成機能が停止する可能性があります。
-
-[Discordコミュニティガイドライン](%1$s)で詳細をご確認ください。
-安全、健全に保つ活動へのご協力ありがとうございます。"</string>
     <string name="form_warning_input_sensitivty">"有効な入力デバイスがありません。Discordが入力感度を決定するためには、[マイクへのアクセス](onEnableClick)を
 許可してもらう必要があります。"</string>
     <string name="form_warning_video_preview">プレビューを利用するために、Discordに[カメラのアクセスを許可](onEnableClick)してください。</string>
@@ -1324,7 +1259,6 @@
     <string name="game_action_button_game_not_detected">ゲームを検出できません</string>
     <string name="game_action_button_install">インストールする</string>
     <string name="game_action_button_locate">ロケート</string>
-    <string name="game_action_button_login_to_buy">購入するにはログインして下さい</string>
     <string name="game_action_button_now_playing">プレイ中</string>
     <string name="game_action_button_paused">ポーズ</string>
     <string name="game_action_button_play">プレイ</string>
@@ -1363,7 +1297,6 @@
     <string name="game_feed_activity_recently_played">最近プレイしたゲーム</string>
     <string name="game_feed_activity_streaming_twitch">Twitchで配信中</string>
     <string name="game_feed_current_header_title">プレイ中</string>
-    <string name="game_feed_settings_visibility">ゲームタブに表示</string>
     <string name="game_feed_unknown_player">不明なプレイヤー</string>
     <string name="game_feed_user_played_days_ago">%1$s %2$s前にプレイ</string>
     <string name="game_feed_user_played_hours_ago">%1$s %2$s前にプレイ</string>
@@ -1433,7 +1366,7 @@
     <string name="generate_a_new_link">新しいリンクを生成</string>
     <string name="get_started">始めましょう</string>
     <string name="gif_auto_play_label">Discordに焦点が当たったら自動的にGIFを再生します。</string>
-    <string name="go_live_changelog_guilds">%1$sでGo Liveが利用可能！</string>
+    <string name="go_live_hardware_acceleration_unavailable">あなたのコンピューターのハードウェアの向上を検知できておりません。そのため、Go Liveを行う際に問題が発生してしまう可能性があります。</string>
     <string name="go_live_hey">やあ！</string>
     <string name="go_live_listen">聞いて！</string>
     <string name="go_live_look">見て！</string>
@@ -1447,7 +1380,7 @@
     <string name="go_live_modal_select_channel_form_title">ボイスチャンネルを選択</string>
     <string name="go_live_modal_select_channel_placeholder">ボイスチャンネルを検索</string>
     <string name="go_live_modal_title">Go Live</string>
-    <string name="go_live_premium_early_access">"Go Liveのプレミアム先行アクセス: 'Nitroをサブスクライブしてくださり、ありがとうございます。あなたは、Go Liveによるゲーム配信に先行アクセスができます!"</string>
+    <string name="go_live_video_drivers_outdated">ビデオカードドライバが古くなっています。Go Liveの品質を向上させるためにアップデートしましょう。</string>
     <string name="grant_temporary_membership">一時的なメンバーとして招待</string>
     <string name="group">グループ</string>
     <string name="group_dm_add_friends">DMにフレンドを追加</string>
@@ -1474,8 +1407,6 @@
     <string name="guild_message_notifications_only_mentions">\@mentionsのみ</string>
     <string name="guild_muted_help_text">サーバーは現在ミュートされているため、これらは無効化されています</string>
     <string name="guild_owner">サーバー管理人</string>
-    <string name="guild_security_req_mfa_body">"二要素認証が有効になっているユーザーのみにサーバーの管理操作を可能とすることで、潜在的な危険性を防ぎます。
-**この設定は、このサーバーの所有者が二要素認証をアカウントで有効にしている場合に、変更することが出来ます**。"</string>
     <string name="guild_security_req_mfa_enable">[アカウントで有効にする](onClick)</string>
     <string name="guild_security_req_mfa_guild_disable">二要素認証を不要にする</string>
     <string name="guild_security_req_mfa_guild_enable">二要素認証を必須にする</string>
@@ -1495,8 +1426,6 @@
     <string name="guild_settings_action_filter_invite_create">招待を作成</string>
     <string name="guild_settings_action_filter_invite_delete">招待を削除</string>
     <string name="guild_settings_action_filter_invite_update">招待を更新</string>
-    <string name="guild_settings_action_filter_member_ban_add">メンバーのBAN</string>
-    <string name="guild_settings_action_filter_member_ban_remove">メンバーのBAN解除</string>
     <string name="guild_settings_action_filter_member_kick">メンバーをキック</string>
     <string name="guild_settings_action_filter_member_prune">非アクティブメンバーをキック</string>
     <string name="guild_settings_action_filter_member_role_update">メンバーのロールを更新</string>
@@ -1514,8 +1443,6 @@
     <string name="guild_settings_audit_log_channel_delete">$[**%1$s**](userHook)が$[**%2$s**](targetHook)を削除しました</string>
     <string name="guild_settings_audit_log_channel_name_change">名前を**%1$s**から**%2$s**に変更しました</string>
     <string name="guild_settings_audit_log_channel_name_create">名前を**%1$s**に設定しました</string>
-    <string name="guild_settings_audit_log_channel_nsfw_disabled">NSFWチャンネル設定を解除しました</string>
-    <string name="guild_settings_audit_log_channel_nsfw_enabled">NSFWチャンネルとして設定しました</string>
     <string name="guild_settings_audit_log_channel_overwrite_create">$[**%1$s**](userHook)が$[**%2$s**](targetHook)での追加権限設定を作成しました</string>
     <string name="guild_settings_audit_log_channel_overwrite_delete">$[**%1$s**](userHook)が$[**%2$s**](targetHook)での追加権限設定を削除しました</string>
     <string name="guild_settings_audit_log_channel_overwrite_update">$[**%1$s**](userHook)が$[**%2$s**](targetHook)での追加権限設定を更新しました</string>
@@ -1524,8 +1451,6 @@
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**%1$s**の%2$sを**付与**しました</string>
     <string name="guild_settings_audit_log_channel_position_change">**%1$s**から**%2$s**へ移動しました</string>
     <string name="guild_settings_audit_log_channel_position_create">**%1$s**の場所</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook)がテキストチャンネル$[**%2$s**](targetHook)を作成しました</string>
     <string name="guild_settings_audit_log_channel_topic_change">トピックを**%1$s**に変更しました</string>
     <string name="guild_settings_audit_log_channel_topic_create">トピックを**%1$s**に設定しました</string>
@@ -1572,8 +1497,6 @@
     <string name="guild_settings_audit_log_invite_temporary_on">一時**オン**付き</string>
     <string name="guild_settings_audit_log_invite_update">$[**%1$s**](userHook)が招待$[**%2$s**](targetHook)を更新しました</string>
     <string name="guild_settings_audit_log_load_more">もっと見る</string>
-    <string name="guild_settings_audit_log_member_ban_add">$[**%1$s**](userHook) が $[**%2$s**](targetHook) をBANしました</string>
-    <string name="guild_settings_audit_log_member_ban_remove">$[**%1$s**](userHook) が $[**%2$s**](targetHook) のBANを解除しました</string>
     <string name="guild_settings_audit_log_member_deaf_off">**スピーカーミュート**を解除しました</string>
     <string name="guild_settings_audit_log_member_deaf_on">**スピーカーミュート**しました</string>
     <string name="guild_settings_audit_log_member_kick">$[**%1$s**](userHook)が$[**%2$s**](targetHook)の接続を切りました</string>
@@ -1621,8 +1544,9 @@
     <string name="guild_settings_filter_all_actions">全ての操作</string>
     <string name="guild_settings_filter_all_users">全てのユーザー</string>
     <string name="guild_settings_filter_user">ユーザーでフィルタ</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">720p 60fps Go Liveストリーム</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">1080p 60fps Go Liveストリーム</string>
     <string name="guild_settings_label_audit_log">監査ログ</string>
-    <string name="guild_settings_label_audit_log_empty_body">管理者が管理を開始すると、ここで議論の管理をすることができます。</string>
     <string name="guild_settings_label_audit_log_empty_title">ログはまだありません。</string>
     <string name="guild_settings_label_audit_log_error_body">おや、何かが壊れてしまったみたい。後でもう一度試してみて下さい。</string>
     <string name="guild_settings_label_audit_log_error_title">厄介なことになりましたね</string>
@@ -1645,11 +1569,9 @@
     <string name="hardware_acceleration">ハードウェア アクセラレーション</string>
     <string name="hardware_acceleration_help_text">Discordを快適にするためにGPUを使用するハードウェアアクセラレーションをオンにします。ゲームのFPSの低下が生じる場合はオフにしてください。</string>
     <string name="help">ヘルプ</string>
-    <string name="help_desk">お問い合わせ</string>
     <string name="help_missing_manage_roles_permission">あなたはロールの管理権限がないため、ロール設定はロックされています。</string>
     <string name="help_missing_permission">あなたに割り当てられているロールのいずれもこの権限を変更することを許可されていません。</string>
     <string name="help_role_locked">あなたにとっての最高ランクのロールより上位にあるため、ロール設定はロックされています。</string>
-    <string name="help_role_locked_mine">あなたにとって最高ランクのロールなので、ロール設定はロックされています。より高いランクを持っている方かサーバー所有者に問い合わせてください。</string>
     <string name="help_singular_permission">あなたの権限を削除することになるので、この権限を変更することが出来ません。</string>
     <string name="hide_instant_invites_description">サーバに不特定多数のメンバーを接続させたくない場合は有効にしてください。</string>
     <string name="hide_instant_invites_label">招待リンクを隠す</string>
@@ -1659,7 +1581,6 @@
     <string name="hide_personal_information_label">個人情報を隠す</string>
     <string name="hold_up">ストップ！</string>
     <string name="home">ホーム</string>
-    <string name="how_to_invite_others">こんにちは。ピッポッパッ。このサーバーに友達を招待したい場合は、左上のサーバー名をクリックして[%1$s]を選択します。ピッポッパッ！</string>
     <string name="hr">クロアチア語</string>
     <string name="hu">ハンガリー語</string>
     <string name="hypesquad_attendee_cta">地元のゲームイベントでHypeSquadを代表することにご関心はありますか、ご自分のゲームイベントを調整していますか？[Apply here!](%1$s)</string>
@@ -1700,7 +1621,6 @@
     <string name="hypesquad_question_11_response_d">Wumpusにタンバリンをすすめます</string>
     <string name="hypesquad_question_12_prompt">最高峰の山頂まで登りましたが、尖塔の三頭龍に富を阻まれています。あなたは：</string>
     <string name="hypesquad_question_12_response_a">戦闘に突入します</string>
-    <string name="hypesquad_question_12_response_b">古いゴジラのギドラ王との戦いから学ぶべく、ゴジラの動きを見ます</string>
     <string name="hypesquad_question_12_response_c">富をわけるよう三頭龍を説得します</string>
     <string name="hypesquad_question_12_response_d">ほしいであろうWumpusのぬいぐるみを三頭龍に提案します</string>
     <string name="hypesquad_question_13_prompt">あれは何の音ですか？：</string>
@@ -1748,16 +1668,13 @@
     <string name="hypesquad_question_7_response_b">超人的な速読術</string>
     <string name="hypesquad_question_7_response_c">完璧な腕前</string>
     <string name="hypesquad_question_7_response_d">超睡眠</string>
-    <string name="hypesquad_question_8_prompt">Aggretsukoを見始めましたが、WumpusはWe Bare Bearsを見たがっています。あなたは：</string>
     <string name="hypesquad_question_8_response_a">Wumpusの気が変わればと、デスメタルを歌います。</string>
     <string name="hypesquad_question_8_response_b">We Bare Bearsの方がすごいショーなので、こっちを見ます</string>
-    <string name="hypesquad_question_8_response_c">妥協してAdventure Timeを見ます</string>
     <string name="hypesquad_question_8_response_d">代わりにミントチップアイスを食べます</string>
     <string name="hypesquad_question_9_prompt">Wumpusがボスと早くケンカしすぎたのでチームはダンジョンで消えました。あなたは：</string>
     <string name="hypesquad_question_9_response_a">Wumpusのどこが間違っているかを指導します</string>
     <string name="hypesquad_question_9_response_b">何も言わずにチームを復活させます</string>
     <string name="hypesquad_question_9_response_c">笑い飛ばして、もう一度試してみるようすすめます</string>
-    <string name="hypesquad_question_9_response_d">Wumpusをチームから外し、新しい戦力としてClydeを入れます</string>
     <string name="hypesquad_quiz_body_house_1">House of Braveryより、土地の神聖さを守り、Renwilの遺産を維持する活動にご参加いただいてることに、感謝を申し上げます。お持ちの勇気は何千もの勇敢な戦士の勇気に匹敵し、そのリーダーシップと勇気がなければ、混乱寸前になっていたことでしょう。</string>
     <string name="hypesquad_quiz_body_house_2">House of Brillianceより、土地を守り、Urdimの遺産を維持する活動にご参加いただいてることに、感謝を申し上げます。ご実施の戦略は熟練の戦術家の戦略に匹敵し、紛争へのその計算されたアプローチがなければ、混乱寸前になっていたことでしょう。</string>
     <string name="hypesquad_quiz_body_house_3">House of Balanceより、土地を守り、Arameの遺産を維持する活動にご参加いただいてることに、感謝を申し上げます。不安定な時代に堅実かつ忠実でおられる能力はすばらしいものです。その環境とご自身の内面への湧き出る理解力がなければ、混乱寸前になっていたことでしょう。</string>
@@ -1791,7 +1708,6 @@
     <string name="in_the_voice_channel">音声チャンネル内</string>
     <string name="incoming_call">着信</string>
     <string name="incoming_call_ellipsis">着信中…</string>
-    <string name="incoming_friend_request">フレンドリクエストが届いています</string>
     <string name="incoming_video_call">ビデオ通話の着信</string>
     <string name="incoming_video_call_ellipsis">ビデオ通話 着信中…</string>
     <string name="inivte_modal_no_thanks">やめておく</string>
@@ -1806,8 +1722,8 @@
     <string name="install_location_main">メイン</string>
     <string name="instant_invite">招待</string>
     <string name="instant_invite_accept">招待を受ける</string>
-    <string name="instant_invite_accepted">招待が承認されました</string>
-    <string name="instant_invite_accepting">招待を受け入れています</string>
+    <string name="instant_invite_accepted">招待を承認しました</string>
+    <string name="instant_invite_accepting">招待を承認</string>
     <string name="instant_invite_ask_for_new_invite">新しいものをリクエストする！</string>
     <string name="instant_invite_ask_user_for_new_invite">%1$sに新しい招待コードをリクエストする！</string>
     <string name="instant_invite_code">アクセスコード</string>
@@ -1838,7 +1754,6 @@
     <string name="instant_invites">招待</string>
     <string name="integration_settings">連携サービス設定</string>
     <string name="integrations">連携サービス</string>
-    <string name="integrations_header">Twitch／Youtube Gamingに接続されているアカウント</string>
     <string name="integrations_pro_tip">より詳細な連携はリンクをチェックしてください。[Discordの配信キット](%1$s)</string>
     <string name="internal_server_error">サーバーで内部エラーが発生しました。もう一度お試しください。</string>
     <string name="invalid_animated_emoji_body">この絵文字はアニメ絵文字のため使用できません。Discord Nitroにアップグレードして夢のアニメ絵文字を手に入れよう</string>
@@ -1985,7 +1900,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="keybind_description_modal_mark_server_read">サーバー内のメッセージを既読にする</string>
     <string name="keybind_description_modal_navigate_channels">チャンネル間を移動</string>
     <string name="keybind_description_modal_navigate_servers">サーバー間を移動</string>
-    <string name="keybind_description_modal_quickswitcher">クイックスイッチャーの切り替え</string>
     <string name="keybind_description_modal_return_to_audio_channel">通話中の音声チャンネルへ戻る</string>
     <string name="keybind_description_modal_scroll_chat">チャットを上または下にスクロールする</string>
     <string name="keybind_description_modal_search">検索</string>
@@ -2023,7 +1937,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="keybind_toggle_overlay">オーバーレイの切り替え</string>
     <string name="keybind_toggle_overlay_input_lock">オーバーレイのロック</string>
     <string name="keybind_toggle_stream_mode">配信モードの切替</string>
-    <string name="keybind_toggle_voice_mode">音声入力モードを切り替える</string>
     <string name="keybind_unassigned">未割り当て</string>
     <string name="keybinds">キー割り当て</string>
     <string name="keyboard_behavior_mobile_header">キーボードの動作</string>
@@ -2067,7 +1980,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="live">ライブ</string>
     <string name="live_beta_description">配信にようこそ！Go Liveはまだベータ版ですので、不備がありましたら申し訳ございません。</string>
     <string name="live_on_twitch">Twitchで配信中</string>
-    <string name="live_viewers">視聴者%1$s %2$s</string>
     <string name="load_image_error">"画像の読み込みに失敗しました。
 もう一度やり直してください。"</string>
     <string name="load_more_messages">メッセージをさらに表示</string>
@@ -2083,7 +1995,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="lt">リトアニア語</string>
     <string name="manage_channel">チャンネルの管理</string>
     <string name="manage_channel_description">この権限を持つメンバーは、チャンネルの削除や名前の変更が可能になります。</string>
-    <string name="manage_channels">チャンネル管理</string>
     <string name="manage_channels_description">この権限を持つメンバーは、新しいチャンネルを作成、編集またはチャンネルを削除できます。</string>
     <string name="manage_emojis">絵文字の管理</string>
     <string name="manage_messages">メッセージの管理</string>
@@ -2092,12 +2003,10 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="manage_nicknames_description">この権限を持つユーザーは、他のメンバーのニックネームを変更することができます。</string>
     <string name="manage_permissions">権限の管理</string>
     <string name="manage_permissions_description">この権限を持つメンバーは、チャンネルの権限が変更可能になります。</string>
-    <string name="manage_roles">役職の管理</string>
     <string name="manage_roles_description">この権限を持つメンバーは、新しくロールを作成したり、自身よりも下位の権限を編集または削除することができます。</string>
     <string name="manage_server">サーバー管理</string>
     <string name="manage_server_description">この権限を持つメンバーは、サーバー名の変更と地域の変更ができます。</string>
     <string name="manage_user">ユーザーを管理</string>
-    <string name="manage_webhooks">Webhook の管理</string>
     <string name="manage_webhooks_description">この権限を持つメンバーは、ウェブフックを作成、編集および削除することができます。</string>
     <string name="managed_role_explaination">"このロールは外部サービスとの連携によって自動的に管理されています。
 手動でメンバーの割り当て、削除はできません。"</string>
@@ -2120,21 +2029,17 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="media_hint_title">Discordがカメラへアクセスすることを許可する。</string>
     <string name="member">メンバー</string>
     <string name="member_list">メンバーリスト</string>
-    <string name="member_list_server_owner_help">サーバーの管理者はロールに関係なくすべての権限を持っています。</string>
     <string name="members">メンバー</string>
     <string name="members_header">%1$s</string>
     <string name="members_matching">**%1$s**に一致するメンバー</string>
     <string name="members_search_placeholder">メンバーを検索</string>
     <string name="mention">メンション</string>
-    <string name="mention_everyone">全員宛メンション</string>
     <string name="mention_everyone_autocomplete_description">このチャンネルを見る権限のある全員へ通知をします。</string>
     <string name="mention_everyone_autocomplete_description_mobile">このチャンネルの全員へ通知をします。</string>
     <string name="mention_everyone_description">"この権限を持つメンバーは、
 メッセージの始めに@everyoneまたは@hereを付けることで、チャンネル内の全員へプッシュ通知を送ることができます。"</string>
     <string name="mention_here_autocomplete_description">このチャンネルを見る権限のある、オンライン状態のメンバーへ通知をします。</string>
     <string name="mention_here_autocomplete_description_mobile">このチャンネル上のオンライン状態のメンバーへ通知をします。</string>
-    <string name="mention_role_autocomplete_description_mobile">このチャンネルで、この役職に就いているユーザーへ通知をします。</string>
-    <string name="mention_users_with_role">このチャンネルを見る権限のある役職へと通知をします。</string>
     <string name="mentions">言及</string>
     <string name="mentions_count">%1$sの言及</string>
     <string name="message_display_mode_label">メッセージ表示</string>
@@ -2250,13 +2155,10 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="no_emoji_title">絵文字はありません</string>
     <string name="no_input_devices">入力デバイスがありません。</string>
     <string name="no_input_devices_detected">入力デバイスが検知できませんでした。接続を確認してから再試行してください。</string>
-    <string name="no_instant_invite">招待がありません</string>
-    <string name="no_integrations">あなたのTwitchやYouTube Gamingのアカウントと連携させて購読者やスポンサーをロールに同期しましょう[接続](onConnect)</string>
+    <string name="no_instant_invite">招待なし</string>
     <string name="no_integrations_body">プロトコルFR13NDSH1PはDiscordクライアントからのみ実行できます。</string>
     <string name="no_integrations_label">連携サービスなし</string>
-    <string name="no_invites_body">"当てがない？空飛ぶ紙飛行機のようにさまよってる？
-じゃあ招待リンクを作り、あなたの友達をここへ呼び込みましょう！"</string>
-    <string name="no_invites_caption">即時招待はまだありません！</string>
+    <string name="no_invites_caption">招待はまだありません！</string>
     <string name="no_invites_label">招待がまだありません</string>
     <string name="no_mail_account_description">あなたのユーザー情報をクリップボードにコピーしました。 support@discordapp.com にフィードバックを送信してください。</string>
     <string name="no_mail_account_title">メールアカウントは現在設定されていません</string>
@@ -2275,9 +2177,7 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="no_reactions_header">反応なし</string>
     <string name="no_recent_mentions">そして始まりには…静寂が広がっているのでした。</string>
     <string name="no_send_messages_permission_placeholder">このチャンネルでメッセージを送信する権限がありません。</string>
-    <string name="no_system_channel">新しいメンバーのメッセージはありません</string>
     <string name="no_text">いいえ</string>
-    <string name="no_thanks">いや、やめとく</string>
     <string name="no_user_limit">制限なし</string>
     <string name="no_video_devices">ビデオデバイスがありません</string>
     <string name="noise_suppression">ノイズ抑制</string>
@@ -2287,7 +2187,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="note">メモ</string>
     <string name="note_placeholder">クリックしてメモを追加</string>
     <string name="note_placeholder_mobile">タップしてメモを追加</string>
-    <string name="notice_application_test_mode">**%1$s**は現在、テストモード中です。未公開のSKUが表示され、関連する課金は行われません。</string>
     <string name="notice_application_test_mode_go_to_listing">SKUに進む</string>
     <string name="notice_connect_spotify">お持ちのSpotifyアカウントを接続して、ステータスにご自分の音楽を表示しましょう！</string>
     <string name="notice_connection_conflict">別のデバイスで接続されたため音声チャットの接続が切断されました。</string>
@@ -2298,7 +2197,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="notice_dispatch_error_disk_low">記憶容量の空き領域が足りません。必要な領域は%1$sですが、%2$sしかありません。</string>
     <string name="notice_dispatch_error_file_name_too_long">このゲームのファイル名はWindowsにとって長すぎます。短いインストールディレクトリを選択してください。</string>
     <string name="notice_dispatch_error_invalid_drive">インストール先は有効ではありません。%1$sをお選びです。</string>
-    <string name="notice_dispatch_error_io_permission_denied">ゲームを更新できませんでした。現在実行中ですか？</string>
     <string name="notice_dispatch_error_no_manifests">このゲームのコンテンツがないようです。サポートにご連絡ください。</string>
     <string name="notice_dispatch_error_not_entitled">このゲームをご所有でないようです。エラーである場合は、サポートにご連絡ください。</string>
     <string name="notice_dispatch_error_post_install_cancelled">インストールスクリプトにいいえとお答えになったようです。ゲームをインストールするにはいと言う必要があります。</string>
@@ -2313,9 +2211,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="notice_native_apps">アプリ外でもプッシュトゥトークを利用したいですか？デスクトップアプリをダウンロードしましょう！</string>
     <string name="notice_no_input_detected">Discordでお使いのマイクの入力を検出していないようです。ご一緒に修正しましょう。</string>
     <string name="notice_no_input_detected_help_link_text">助けて！</string>
-    <string name="notice_premium_applications_grandfathered_ended">Nitroへのアクセスは期限切れになっています。Nitro ClassicからNitroにアップグレードすると、驚きのゲームに無制限にアクセスできます。</string>
-    <string name="notice_premium_applications_grandfathered_ending">Nitroゲームの残り時間：%1$s。アクセスの期限は**%2$s**に切れます。</string>
-    <string name="notice_premium_applications_grandfathered_started">Nitroの初期サポーターに御礼申し上げます！感謝の気持ちとして、%1$sまで有効のNitroゲームへのアクセス権を差し上げます。</string>
     <string name="notice_premium_promo_action">お試しください</string>
     <string name="notice_premium_promo_message">Discordの開発をサポートし、楽しい特典を手に入れよう！</string>
     <string name="notice_scheduled_maintenance">Discordは**%1$s**の**%2$s**に定期メンテナンスを実施します。</string>
@@ -2353,15 +2248,11 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="nsfw_note">閲覧注意 (NSFW) チャンネルは18歳以上のユーザーを対象としたコンテンツ用です。</string>
     <string name="nsfw_title">閲覧注意 (NSFW) チャンネル</string>
     <string name="nuf_body">これからはすべて友達とともに物事が進みます。たった数分で**あなたのサーバー**を立ち上げてみませんか？</string>
-    <string name="nuf_body_mobile">始めるにはログインするか登録して下さい</string>
     <string name="nuf_claim_account_body_1">Discordへようこそ！こちらですべてのサーバーと設定を今後のために保存できるよう、まずはアカウントをご登録ください。</string>
     <string name="nuf_claim_account_body_2">アカウントの登録で、すべてのサーバーと設定を今後のために保存することになります！</string>
     <string name="nuf_claim_account_button">アカウントを登録</string>
     <string name="nuf_claim_account_generic_error">すごい問題があったみたいです</string>
     <string name="nuf_claim_account_title">アカウントを登録</string>
-    <string name="nuf_create_server_body">"招待コードがなくてお困りですか？ご心配なく！
-
-ご自分とお友達のためにDiscordサーバーを始めてください。ボイスチャットとテキストチャットを100%%無料でご提供いたします。"</string>
     <string name="nuf_create_server_button">サーバーを作成する</string>
     <string name="nuf_create_server_error">無効なサーバー名</string>
     <string name="nuf_create_server_note">サーバーの作成で、当方の[コミュニティガイドライン](https://discordapp.com/guidelines)に同意することになります。</string>
@@ -2385,7 +2276,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">オーバーレイを有効にしました</string>
     <string name="nux_post_reg_join_server_description">サーバーに参加してDiscordを最大限に活用する</string>
     <string name="nux_post_reg_join_server_skip">持っていません</string>
     <string name="nux_post_reg_join_server_title">招待はお持ちですか？</string>
@@ -2413,8 +2303,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="out_of_date_action">Discordを更新する</string>
     <string name="out_of_date_description">Discordがさらに便利になりました！続行するにはアップデートしてください。</string>
     <string name="out_of_date_title">古いバージョンを使用しています</string>
-    <string name="outgoing_friend_request">フレンドリクエストを送信済み</string>
-    <string name="outgoing_friend_request_delete_msg">本当に**%1$s**への友達申請を取り消しますか？</string>
     <string name="overlay">オーバーレイ</string>
     <string name="overlay_channel_chat_hotkey">%1$sを押して%2$sでチャット</string>
     <string name="overlay_crashed_title">Discordオーバーレイがクラッシュしました！</string>
@@ -2428,11 +2316,8 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="overlay_link_alert_body">外部ブラウザでこのリンクを開こうとしています。続行しますか？</string>
     <string name="overlay_link_alert_secondary">開くので、これ以上聞かないでください。</string>
     <string name="overlay_link_alert_title">ストップ！</string>
-    <string name="overlay_menu_get_invite">招待リンクを生成する</string>
     <string name="overlay_menu_open_discord">Discordを開く</string>
     <string name="overlay_menu_switch_channels">チャンネルを切り替える</string>
-    <string name="overlay_mobile_required">Discordの音声設定で、モバイルオーバーレイを有効にする。</string>
-    <string name="overlay_mobile_toggle_desc">ボイスが有効ならば、他のアプリを使用していても、話者を確認したり、ショートカットをアクセスできます</string>
     <string name="overlay_mobile_toggle_label">モバイルボイスオーバーレイを有効にする</string>
     <string name="overlay_mobile_unauthed">この特典を有効にするには、Discordアプリにログインしてください。</string>
     <string name="overlay_news_go_live_body">%1$sを%2$sでフレンドに配信しますか？</string>
@@ -2440,7 +2325,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="overlay_news_text_pinning_body">ゲームにテキストチャットをピン留めできるようになりました！</string>
     <string name="overlay_news_text_pinning_tip">コツ：$[pinIcon](pinHook)を押してチャットをピン留めします</string>
     <string name="overlay_news_text_pinning_title">Discordオーバーレイが更新されました</string>
-    <string name="overlay_no_results">はるか彼方まで検索したのですが、残念ながらボイスチャンネルは見つかりませんでした</string>
     <string name="overlay_notification_incoming_call">着信中…</string>
     <string name="overlay_notification_settings_disabled">通知は無効です</string>
     <string name="overlay_notification_settings_position">表示中：%1$s</string>
@@ -2450,7 +2334,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="overlay_notifications_settings">オーバーレイ通知</string>
     <string name="overlay_notifications_top_left">左上</string>
     <string name="overlay_notifications_top_right">右上</string>
-    <string name="overlay_private_channels_empty_state">いいえ、ここにはダイレクトメッセージはありません。</string>
     <string name="overlay_reload">オーバーレイをリロード</string>
     <string name="overlay_settings">オーバーレイの設定</string>
     <string name="overlay_settings_general_tab">一般</string>
@@ -2466,13 +2349,10 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="overlay_widget_show_in_game">ゲームでウィンドウを表示する</string>
     <string name="overview">概要</string>
     <string name="overwrite_autocomplete_label">追加：</string>
-    <string name="overwrite_autocomplete_placeholder">役職／メンバー</string>
-    <string name="overwrite_no_role_to_add">このチャンネル上の、全ての役職の権限は上書きされています。</string>
     <string name="pagination_next">次へ</string>
     <string name="pagination_page_of">%1$s ページの %2$s ページ目</string>
     <string name="pagination_previous">前へ</string>
     <string name="paginator_of_pages">%1$s ページの %2$s ページ目</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Discordパートナー</string>
     <string name="party_full">グループ満員</string>
     <string name="party_join">グループに参加</string>
@@ -2552,9 +2432,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="pin_message_too_many_title">ピンが壊れた</string>
     <string name="pinned_messages">ピン留めされたメッセージ</string>
     <string name="pinned_messages_pro_tip">アドバイス:</string>
-    <string name="pinned_messages_pro_tip_body_channel">「メッセージの管理」の権限を持つユーザーは、三点リーダーからピン留めを行うことができます。</string>
-    <string name="pinned_messages_pro_tip_body_dm">あなたと%1$sが三点リーダーからピン留めを行うことができます。</string>
-    <string name="pinned_messages_pro_tip_body_group_dm">グループメンバーの誰もが三点リーダーからピン留めを行うことができます。</string>
     <string name="pins_disabled_nsfw">このチャンネルは閲覧注意 (NSFW) チャンネルのため、ピン留めメッセージは閲覧できません。</string>
     <string name="pl">ポーランド語</string>
     <string name="platform_android_version">Android 4.1以上</string>
@@ -2567,17 +2444,10 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="popout_stay_on_top">最前面に表示</string>
     <string name="post_code">郵便番号</string>
     <string name="premium_alert_error_title">おっと、問題が起きたようです…</string>
-    <string name="premium_applications_grandfathered_monthly">Discordをサポートいただき、ありがとうございます。1年間、Nitroのゲームにアクセスできます。アクセス権の終了日は**%1$s**です。</string>
-    <string name="premium_applications_grandfathered_yearly">Discordをサポートいただき、ありがとうございます。2年間、Nitroのゲームにアクセスできます。アクセス権の終了日は**%1$s**です。</string>
-    <string name="premium_applications_subtitle">お友だちとプレイしそうな定評のあるゲームのライブラリへの無制限のアクセス。</string>
-    <string name="premium_applications_title">たくさんの選りすぐりのゲーム。安い月額料金のみ。</string>
     <string name="premium_badge_tooltip">%1$sからの登録者</string>
     <string name="premium_cancel_cancel">いいえ</string>
     <string name="premium_cancel_confirm_body_tier_1">"キャンセルは、お客さまの現在の請求期間が終了する**%1$s**に有効になります。Discordタグは、変更していた場合に、ランダムになります。
 
-いつでもサブスクリプションを再開できます。"</string>
-    <string name="premium_cancel_confirm_body_tier_2">"キャンセルは、お客さまの現在の請求期間終了時に有効になります。**%1$s**に、現在ご利用のライブラリにあるすべてのNitroゲームへのアクセスを失い、Discordタグをご変更されている場合はタグがランダムになります。お気持ちが変わる場合に備えて、保存ファイルを安全、大切に保ちます。
-
 いつでもサブスクリプションを再開できます。"</string>
     <string name="premium_cancel_confirm_new">おっと、%1$sをキャンセル</string>
     <string name="premium_cancel_confirm_title">%1$sをキャンセルしますか？</string>
@@ -2594,20 +2464,16 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="premium_chat_perks_description_badge">あなたがどれほどの期間Discordをサポートしたのかをプロフィールバッジに表示します。</string>
     <string name="premium_chat_perks_description_custom_emoji">グローバルパスポートを手に入れて、あらゆる場所でカスタム絵文字を使用しましょう。</string>
     <string name="premium_chat_perks_description_discriminator">サブスクリプション期間中、自分のタグを選べます。</string>
-    <string name="premium_chat_perks_description_screenshare">ゲームシェアの画面が720p 60fpsまたは1080p 30fpsに。</string>
-    <string name="premium_chat_perks_description_upload_limit">アップロードできる大型ファイルサイズは%1$sから%2$sになり、高品質なミームを共有。</string>
+    <string name="premium_chat_perks_streaming_mobile">改善されたGo Liveストリーム：Nitroのソースの配信を利用できます。Nitro Classic購読者は鮮明な最高1080p/60fpsを利用できます</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">アニメの楽しみ</string>
     <string name="premium_chat_perks_title_badge">お客さまのサポート担当者</string>
     <string name="premium_chat_perks_title_custom_emoji">グローバルなカスタム絵文字</string>
     <string name="premium_chat_perks_title_discriminator">カスタムDiscordタグ</string>
     <string name="premium_chat_perks_title_screenshare">より質の高いビデオ</string>
+    <string name="premium_chat_perks_title_streaming">改善されたGo Liveストリーム</string>
     <string name="premium_code_redemption_confirmation_blurb">ランダムな数字列により、お客さまが%1$sのチャット特典を入手しました！</string>
     <string name="premium_code_redemption_confirmation_button">素敵！</string>
-    <string name="premium_feature_new_chat_perks_header">強化されたチャット特典もご利用いただけます：</string>
-    <string name="premium_feature_new_premium_applications_header">%1$s強相当のゲーム。ご確認ください：</string>
-    <string name="premium_feature_view_applications">すべてのNitroゲームを表示する</string>
     <string name="premium_features_chat_perks">チャット特典</string>
-    <string name="premium_features_premium_applications">無料ゲーム</string>
     <string name="premium_grandfathered_warning">サポートへの感謝の気持ちとして、Nitroプランに割り引きを適用しました。**計画を取り消したり変更したりすると、この割り引きは失われます。**気をつけてくださいね！</string>
     <string name="premium_grandfathered_warning_confirm">ともかく実行する</string>
     <string name="premium_grandfathered_warning_title">気をつけてね</string>
@@ -2617,10 +2483,7 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="premium_not_claimed">初めにアカウントを登録してください</string>
     <string name="premium_not_claimed_body">こんにちは！Nitroの購入をご希望の場合、まずご自分のものを失わないようにアカウントを指定することが必要です。</string>
     <string name="premium_not_verified">最初にメールを認証します</string>
-    <string name="premium_not_verified_body">こんにちは！Nitroの購入をご希望の場合、まずメールの確認が必要です。メールを確認するか新しいメールをリクエストしてください。</string>
-    <string name="premium_payment_applications_os_warning">NitroゲームをサポートしているのはWindowsのみです。</string>
     <string name="premium_payment_confirmation_blurb_regular">強化されたチャット特典のパワーを手に入れました。これを読むのをやめて、今すぐプレイしに行きましょう！！</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">たくさんの興奮のゲームに無制限アクセスできるようになりました。これを読むのをやめて、今すぐプレイしに行きましょう！！</string>
     <string name="premium_payment_confirmation_button_regular">すごいね</string>
     <string name="premium_plan_month">月間Nitro</string>
     <string name="premium_plan_month_tier_1">月間Nitro Classic</string>
@@ -2641,13 +2504,10 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="premium_upgrade_disabled_current_tooltip">現在のプラン。</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">下位のプランを選択する前に、サブスクリプションの取り消しを行い、期限切れにする必要があります。</string>
     <string name="premium_upgrade_done_body_tier_1">強化されたチャット特典を入手しました！</string>
-    <string name="premium_upgrade_done_body_tier_2">強化されたチャット特典を入手し、たくさんのゲームにアクセスできるようになりました。</string>
     <string name="premium_upgrade_done_button_tier_1">素敵！</string>
-    <string name="premium_upgrade_done_button_tier_2">すべてのNitroゲームを確認する</string>
     <string name="premium_upgrade_failed_body">アップグレードできませんでした。お支払い情報が最新になっているかを確認して、もう一度お試しください。</string>
     <string name="premium_upload_promo">Discord Nitroにアップグレードしてファイル制限を%1$sまで上げる</string>
     <string name="premium_year_free_months">2ヶ月分無料！</string>
-    <string name="premium_year_free_months_short">2カ月間無料</string>
     <string name="premium_year_subscription">年額 **%1$s%2$s %3$s**</string>
     <string name="preview_chat">チャットをプレビュー</string>
     <string name="priority_speaker">優先スピーカー</string>
@@ -2672,19 +2532,14 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="ptt_limited_title">気をつけて！</string>
     <string name="ptt_limited_warning">"(限定された) プッシュトゥトークはこのブラウザタブにフォーカスされている時のみに動作します。デスクトップアプリを [ダウンロード](onDownloadClick)することで、
 いつでもプッシュトゥトークを使えるようになります。"</string>
-    <string name="ptt_permission_body">"管理人として%1$sを配信しました。ゲームプレイ中のプッシュトゥトーク
-検知機能を有効にするため、Discordを管理人として再起動して下さい。"</string>
-    <string name="ptt_permission_title">プッシュトゥトークの許可が必要です</string>
     <string name="quick_dm_blocked">ブロック中のためメッセージ不可</string>
     <string name="quick_dm_user">\@%1$sへメッセージを送信</string>
     <string name="quick_launcher_empty_text">Discordは、このパソコンで最近プレイしたほとんどのゲームをすぐに起動できます。ここに表示されるように、起動してください！</string>
     <string name="quick_launcher_header">クイック起動</string>
     <string name="quickswitcher_drafts">下書き</string>
-    <string name="quickswitcher_empty_cta">クイックスイッチャーの使い方を見る</string>
     <string name="quickswitcher_empty_text">探しものが見つからない？</string>
     <string name="quickswitcher_last_channel">最後に表示したチャンネル</string>
     <string name="quickswitcher_mentions">言及</string>
-    <string name="quickswitcher_notice">クイックスイッチャーを使って素早くDiscord内を動き回ろう。これを押してみて：</string>
     <string name="quickswitcher_placeholder">どこに行きたいですか？</string>
     <string name="quickswitcher_querymode_applications">ゲームから検索</string>
     <string name="quickswitcher_querymode_guilds">サーバー名から検索</string>
@@ -2719,10 +2574,8 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="recent_mentions">最近の言及</string>
     <string name="recent_mentions_direct_only">自分宛のみ</string>
     <string name="recent_mentions_everyone_and_direct">自分＆全員宛</string>
-    <string name="recent_mentions_filter_everyone">\@everyoneのメッセージを含む</string>
     <string name="recent_mentions_filter_explain_everything">すべて</string>
     <string name="recent_mentions_filter_label">表示：</string>
-    <string name="recent_mentions_filter_roles">\@role (役職名) のメッセージを含む</string>
     <string name="recent_mentions_pro_tip">あなたへの言及がここに7日間保存されます。</string>
     <string name="recent_mentions_roles_and_direct">自分＆役職宛</string>
     <string name="reconnect">再接続</string>
@@ -2730,7 +2583,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="region">地域</string>
     <string name="region_select_footer">いつでもサーバー地域を1秒未満の時間で変更できます。</string>
     <string name="region_select_header">サーバーの地域を選択する</string>
-    <string name="register">アカウント登録</string>
     <string name="register_account">アカウントを登録</string>
     <string name="register_body">ログイン情報を入力してください</string>
     <string name="register_title">アカウント作成</string>
@@ -2779,14 +2631,9 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="ring">呼び出す</string>
     <string name="ro">ルーマニア語</string>
     <string name="role_order_updated">ロールの順序を更新しました。</string>
-    <string name="roles">役職</string>
-    <string name="roles_list">%1$s</string>
     <string name="rtc_connection">RTC接続</string>
     <string name="rtc_connection_info">接続情報</string>
     <string name="rtc_connection_state_authenticating">Discordがあなたのリアルタイム通信サーバーへの接続を完了し、接続を保護しています。</string>
-    <string name="rtc_connection_state_awaiting_endpoint">"DiscordはあなたのためにRTCサーバーを立ち上げています。この状態から動かない場合、
-その地域のサーバーがダウンしている可能性があります。あちゃー！[運行状況のページ](%1$s) を確認して詳しい情報を得るか、
-サーバー管理者に一時的な地域変更を依頼してください。"</string>
     <string name="rtc_connection_state_connecting">RTCサーバーの準備が完了し、Discordがサーバーへの接続を試みています。準備はよろしいですね？</string>
     <string name="rtc_connection_state_disconnected">"ハムスターが回し車から落ちてしまったみたいです。Discordとリアルタイム通信サーバーとの接続が中断されました。直ちに接続の再確立を
 試みます。"</string>
@@ -2794,14 +2641,6 @@ Discordについて詳しい情報が必要ですか？"</string>
 ブラウザ版での接続がこの状態から動かなくなる場合、 [この素晴らしい記事](%1$s) を参考にすると問題が解決するかもしれません。"</string>
     <string name="rtc_connection_state_no_route">"ぎゃふん！リアルタイム通信サーバーへのUDP接続を確立できません。直ちに再接続を試みます。
 この段階から進まない場合、 [このカッコいい記事](%1$s) を参考に問題を解決してください。"</string>
-    <string name="rtc_connection_state_rtc_connected">"Discordは、お使いの**%1$s**のリアルタイム通信サーバーに接続されており、平均ピングは**%2$sms**です。最後の
-ピングは**%3$sms**です。
-
-ピングに一貫性がない、または%4$sms以上である場合は、サーバー所有者に別の地域に切り替えてもらうことをご検討ください。"</string>
-    <string name="rtc_connection_state_rtc_connected_loss_rate">"Discordは、お使いの**%1$s**のリアルタイム通信サーバーに接続されており、平均ピングは**%2$sms**です。最後の
-ピングは**%3$sms**です。アウトバウンドパケット廃棄率は**%4$s%%**です。
-
-ピングに一貫性がない、または%5$sms以上である場合は、サーバー所有者に別の地域に切り替えてもらうことをご検討ください。アウトバウンドパケット廃棄率が%6$s%%以上である場合、ロボットのように響くかもしれません。"</string>
     <string name="rtc_connection_state_rtc_connecting">"接続準備完了！Discordはリアルタイム通信サーバーとの安全な接続を確立したため、
 データの送信を試みています。"</string>
     <string name="rtc_debug_context">RTCデバッグ：%1$s</string>
@@ -2819,7 +2658,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="scope_activities_write">現在のアクティビティを更新する</string>
     <string name="scope_activities_write_description">アプリにゲームをプレイ中または配信中であることをDiscordに通知する許可を与えます。</string>
     <string name="scope_bot">Botをサーバーに追加</string>
-    <string name="scope_bot_description">**Manage Server**のサーバーアクセスの許可を取る必要があります</string>
     <string name="scope_bot_permissions">次の権限を許可する</string>
     <string name="scope_bot_permissions_description">これで編集可能なロール**%1$s**が作成されます。</string>
     <string name="scope_bot_server_placeholder">サーバーを選択</string>
@@ -2879,7 +2717,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="search_answer_has_video">動画を検索</string>
     <string name="search_answer_in">指定チャンネル内を検索</string>
     <string name="search_answer_link_from">ウェブサイトで検索</string>
-    <string name="search_answer_mentions">ユーザーへのメンションを検索</string>
     <string name="search_channels">チャンネルを検索</string>
     <string name="search_channels_no_result">チャンネルが見つかりませんでした。</string>
     <string name="search_clear_history">検索履歴を消去</string>
@@ -2898,7 +2735,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="search_filter_on">on</string>
     <string name="search_for_emoji">絵文字を検索する</string>
     <string name="search_for_empty">検索</string>
-    <string name="search_for_value">検索：**%1$s**</string>
     <string name="search_group_header_channels">チャンネル内</string>
     <string name="search_group_header_dates">日付</string>
     <string name="search_group_header_file_name">ファイル名含む</string>
@@ -2921,8 +2757,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="search_pick_date">日時を選択</string>
     <string name="search_recent">新着順</string>
     <string name="search_relevant">関連性</string>
-    <string name="search_roles">役職を検索</string>
-    <string name="search_roles_no_result">役職が見つかりませんでした。</string>
     <string name="search_shortcut_month">月</string>
     <string name="search_shortcut_today">今日</string>
     <string name="search_shortcut_week">週間</string>
@@ -2936,8 +2770,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="select_channel_or_category">チャンネルまたはカテゴリーを選択…</string>
     <string name="select_sort_mode">並べ替えモードを選択</string>
     <string name="self_deafened">スピーカーミュート</string>
-    <string name="self_deny_permission_body">"あなた自身の権限も拒否されてしまうため、**%1$s**への権限の拒否はできません。他の役職またはあなた自身へ、この権限の許可をしてから
-再試行して下さい。"</string>
     <string name="self_deny_permission_title">やめておいた方がいいと思いますよ</string>
     <string name="self_muted">個人ミュート</string>
     <string name="self_xss_header">ストップ！</string>
@@ -3046,8 +2878,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="sound_message">メッセージ</string>
     <string name="sound_mute">ミュート</string>
     <string name="sound_outgoing_ring">発信音</string>
-    <string name="sound_ptt_activate">プッシュトゥトーク ON</string>
-    <string name="sound_ptt_deactivate">プッシュトゥトーク OFF</string>
     <string name="sound_stream_started">配信開始音</string>
     <string name="sound_stream_stopped">配信停止音</string>
     <string name="sound_undeafen">スピーカーミュート解除</string>
@@ -3103,8 +2933,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="stop_ringing">呼び出しを中止</string>
     <string name="stop_streaming">配信を中止</string>
     <string name="stop_watching">視聴を中止</string>
-    <string name="store_payment_legalese_monthly">こんにちは！%1$sを購入することで、当方の[ストアご利用規約](%2$s)に合意することになります。%1$sは定期サブスクリプションです。つまり、今日こちらよりご請求し、お客さまがサブスクリプションを取り消すまで毎月ご請求するということです。ユーザー設定画面で、いつでもキャンセルすることができます。</string>
-    <string name="store_payment_legalese_yearly">こんにちは！%1$sを購入することで、当方の[ストアご利用規約](%2$s)に合意することになります。%1$sは定期サブスクリプションです。つまり、今日こちらよりご請求し、お客さまがサブスクリプションを取り消すまで毎年ご請求するということです。ユーザー設定画面で、いつでもキャンセルすることができます。</string>
     <string name="stream">Go Live</string>
     <string name="stream_bad_spectator">現在、視聴中の配信は動画あるいは音声の品質を落としています。ネットワークの状態が原因かもしれません。</string>
     <string name="stream_bad_streamer">現在、映像あるいは音声の品質を落として配信しています。ネットワークの状態によるものかもしれません。</string>
@@ -3112,7 +2940,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="stream_capture_paused_details">ゲームに切り替えて再開する。</string>
     <string name="stream_capture_paused_details_viewer">%1$sはゲームを最小化しました…少々お待ちください！</string>
     <string name="stream_channel_description">権限を持つメンバーは、このチャンネルで配信できます。</string>
-    <string name="stream_description">権限を持つメンバーは、このチャンネルで可能です。</string>
     <string name="stream_ended">配信が終了しました。（し～ん）</string>
     <string name="stream_ended_button">配信は終了しました</string>
     <string name="stream_ended_no_spectators">配信が終了したため、視聴者はいません。</string>
@@ -3152,7 +2979,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="stream_report_rating_body_streamer">配信経験について教えてください。</string>
     <string name="stream_report_submit">送信</string>
     <string name="stream_reported">フィードバックを送信しました</string>
-    <string name="stream_reported_body">問題を報告してくださいまして、ありがとうございます！あなたのフィードバックは配信品質の向上に繋がります。</string>
     <string name="stream_soundshare_failed">何らかの問題によりゲームの音声が再生できませんでした。</string>
     <string name="streamer_mode">配信モード</string>
     <string name="streamer_mode_enabled">配信モードが有効です</string>
@@ -3177,9 +3003,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="switch_subsystem_body">"オーディオの設定を反映させるにはDiscordを再起動させる必要があります。
 再起動してもよろしいですか？"</string>
     <string name="switch_to_compact_mode">コンパクトモードに切り替え</string>
-    <string name="switch_to_cozy_mode">Cozyモードに切り替える</string>
-    <string name="switch_to_dark_theme">暗いテーマに切り替える</string>
-    <string name="switch_to_light_theme">明るいテーマに切り替える</string>
     <string name="switch_to_push_to_talk">プッシュトゥトークに切り替える</string>
     <string name="switch_to_voice_activity">音声検出に切り替える</string>
     <string name="sync">同期</string>
@@ -3210,7 +3033,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="system_message_guild_member_join_10">あ！野生の%1$sが飛び出してきた！</string>
     <string name="system_message_guild_member_join_11">シューッ… %1$sはただいま着陸しました。</string>
     <string name="system_message_guild_member_join_12">気を引き締めて。%1$sがこのサーバーに参加しました。</string>
-    <string name="system_message_guild_member_join_13">%1$sが参加しました。バナナを隠せ。</string>
     <string name="system_message_guild_member_join_14">%1$sが来たぞ。あいつチートだろ…弱体修正まだ？</string>
     <string name="system_message_guild_member_join_15">%1$sがサーバーに滑り込みました。</string>
     <string name="system_message_guild_member_join_16">%1$sがサーバー上にスポーンしました。</string>
@@ -3222,7 +3044,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="system_message_guild_member_join_22">鳥だ！飛行機だ！あっ、なんだ、ただの%1$sか。</string>
     <string name="system_message_guild_member_join_23">%1$sだよ！太陽を称えよ！\\\\[T]/</string>
     <string name="system_message_guild_member_join_24">ネバ ゴナ ギブ %1$s アップ♪ ネバ ゴナ レット %1$s ダウン♪</string>
-    <string name="system_message_guild_member_join_25">あ！%1$sが加わったぞ！トラップカード発動！</string>
     <string name="system_message_guild_member_join_26">ヤッホー！%1$sに任せて！</string>
     <string name="system_message_guild_member_join_27">ねえ、聞いて！%1$sが加わったよ！</string>
     <string name="system_message_guild_member_join_28">みんなあなたを待っていた、%1$s！</string>
@@ -3331,7 +3152,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="two_fa_sales_pitch">"あなたのDiscordアカウントを二要素認証で保護します。 設定後はログインの際に
 パスワードと携帯電話からの認証コードの入力が必要になります。"</string>
     <string name="two_fa_success_body">ほぼ完了：</string>
-    <string name="two_fa_success_header">二要素がアクティベートされました！：ジャジャーン：</string>
     <string name="two_fa_token_required">有効なDiscordの認証コードが必要です。</string>
     <string name="two_fa_use_desktop_app">このブラウザでは二要素認証の有効化をサポートしていません。二要素認証を有効化するにはデスクトップアプリを利用してください。</string>
     <string name="two_fa_view_backup_codes">バックアップコードを表示</string>
@@ -3341,7 +3161,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="unable_to_join_channel_full">このチャンネルは満員です。</string>
     <string name="unable_to_join_voice_unsupported_mobile">このデバイスではボイスチャットがサポートされていません。</string>
     <string name="unban">BAN解除</string>
-    <string name="unban_user_body">%1$s のBANを解除しますか？</string>
     <string name="unban_user_title">「%1$s」のBANを解除</string>
     <string name="unblock">ブロックを解除</string>
     <string name="unblock_to_jump_body">「%1$s」のブロックを解除すると、そのメッセージへジャンプできるようになります</string>
@@ -3374,8 +3193,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="unsupported_browser">サポートされていないブラウザ</string>
     <string name="unsupported_browser_body">"ブラウザがサポートされていないようですね。Discordを利用するには、
 ブラウザをアップグレードするか、アプリをダウンロードしましょう。"</string>
-    <string name="unsupported_browser_details">"チームと会話ができるようにしたいって？最近のChrome、Opera、Firefox 38+への切り替えをするか、
-the Discordクライアントをダウンロードして今すぐ会話を始めよう！"</string>
     <string name="unsupported_browser_title">あー…これは大変ですね…</string>
     <string name="unverified_account_body">"あなたのメールに記述された手順に沿ってメールの認証を行って下さい。
 
@@ -3415,7 +3232,6 @@ Shiftを押しっぱなしですぐにアップロードします。"</string>
     <string name="use_external_emojis">外部の絵文字の使用</string>
     <string name="use_external_emojis_description">この権限を持つメンバーは、このサーバー上で他のサーバーの絵文字を使うことができます。</string>
     <string name="use_vad">音声検出を使用</string>
-    <string name="use_vad_description">この権限が無効の場合、メンバーはプッシュトゥトークをチャンネル内で使用しなければいけなくなります。</string>
     <string name="user_activity_accept_invite">ゲームを始めて参加</string>
     <string name="user_activity_action_ask_to_join">参加依頼</string>
     <string name="user_activity_action_download_app">ダウンロード</string>
@@ -3433,8 +3249,6 @@ Shiftを押しっぱなしですぐにアップロードします。"</string>
     <string name="user_activity_error_desktop_action">アプリをダウンロードする</string>
     <string name="user_activity_error_desktop_body">Discordのブラウザ版は快適ですが、すべてが可能なわけではありません。このゲームを実行するには、Discordデスクトップアプリを経由する必要があります。ダウンロードしましょう！</string>
     <string name="user_activity_error_desktop_title">デスクトップアプリが必要です</string>
-    <string name="user_activity_error_friends_action">フレンドリクエストを送信</string>
-    <string name="user_activity_error_friends_body">これを使うには、まず友達になる必要があります。%1$sにフレンドリクエストを送信してください。受理されたら、もう一度ボタンをクリックしてください！</string>
     <string name="user_activity_error_friends_title">フレンドになって！</string>
     <string name="user_activity_header_listening">%1$sを再生中</string>
     <string name="user_activity_header_live_on_platform">%1$sでライブ</string>
@@ -3493,16 +3307,12 @@ Shiftを押しっぱなしですぐにアップロードします。"</string>
     <string name="user_settings_appearance_preview_message_4">コンパクトモードがオンになるその時を</string>
     <string name="user_settings_appearance_preview_message_5">ああ、ついに来た！</string>
     <string name="user_settings_appearance_zoom_tip">%1$s+/-で拡大・縮小、%1$s+0でリセットできます。</string>
-    <string name="user_settings_apperannce_disable_games_tab">ゲームタブを表示する</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">オフにするとゲームタブが非表示になり、会話に集中できます。</string>
     <string name="user_settings_close_button">閉じるボタン</string>
     <string name="user_settings_confirm_logout">本当にログアウトしますか？</string>
     <string name="user_settings_game_activity">ゲームアクティビティ</string>
     <string name="user_settings_game_library">ゲームライブラリ</string>
     <string name="user_settings_games_install_location">場所</string>
-    <string name="user_settings_games_install_location_add">インストールする場所を追加する</string>
     <string name="user_settings_games_install_location_make_default">これをデフォルトの場所にする</string>
-    <string name="user_settings_games_install_location_name">場所名をインストールする</string>
     <string name="user_settings_games_install_location_remove">場所を削除する</string>
     <string name="user_settings_games_install_location_space">%1$s／%2$sをご利用可能</string>
     <string name="user_settings_games_install_locations">インストールする場所</string>
@@ -3523,17 +3333,12 @@ Shiftを押しっぱなしですぐにアップロードします。"</string>
     <string name="user_settings_notifications_show_flash_body">新しい通知が来るとタスクバーでアプリが点滅するようになります。</string>
     <string name="user_settings_notifications_show_flash_label">タスクバーの点滅を有効化</string>
     <string name="user_settings_open_on_startup_body">忠犬Discordがあなたの帰りを待ってましたと馳せ参じるので、クリック数を節約できます</string>
-    <string name="user_settings_open_on_startup_label">Discord を開く</string>
     <string name="user_settings_save">保存</string>
     <string name="user_settings_start_minimized_body">忠犬Discordがバックグラウンドで起動し、あなたの作業を妨げないようにします</string>
     <string name="user_settings_start_minimized_label">最小化した状態で起動する</string>
     <string name="user_settings_startup_behavior">システム起動時の動作</string>
-    <string name="user_settings_streamer_notice_body">"お気に入りの配信サポートツールで、きみのDiscordコミュニティサーバーをさらに盛り上げよう。
-
-詳細は [DiscordのStreamKit](%1$s) から。"</string>
     <string name="user_settings_streamer_notice_title">連携サービスをお探しですか？</string>
     <string name="user_settings_unverified_account_body">あなたのアカウントを認証するためメールをチェックして、その説明に従ってください。もしメールが届いていなかったり期限切れになったりした場合、再度メールを送信することができます。</string>
-    <string name="user_settings_voice_add_multiple">プッシュトゥトークのショートカットは[キー割り当て](onClick)で複数追加することができます。</string>
     <string name="user_settings_voice_codec_description">Discordは自然由来の地元産で最良なOpus Voiceコーデックのみを使用しています。</string>
     <string name="user_settings_voice_codec_title">オーディオコーデック</string>
     <string name="user_settings_windows_settings">Windows設定</string>
@@ -3542,10 +3347,6 @@ Shiftを押しっぱなしですぐにアップロードします。"</string>
     <string name="username_live">%1$s - ライブ中</string>
     <string name="username_required">ユーザー名が必要です。</string>
     <string name="users">ユーザー</string>
-    <string name="vad_permission_body">"このチャンネルでのボイスチャットには、プッシュトゥトークが必要です。ボイスアクティビティ検出から
-プッシュトゥトーク・モードへの切り替えを行うまで、聞くことのみが可能となります。"</string>
-    <string name="vad_permission_small">このチャンネルで発言するにはプッシュトゥトークを有効にする必要があります。</string>
-    <string name="vad_permission_title">プッシュトゥトークが必要です</string>
     <string name="vanity_url">バニティURL</string>
     <string name="vanity_url_help">"あなたのサーバーに簡単に参加する為の仮想的なバニティURLを作成できます。
 これはURLを利用しているすべてのユーザーが、サーバーを公開できることに注意してください。"</string>
@@ -3553,8 +3354,6 @@ Shiftを押しっぱなしですぐにアップロードします。"</string>
     <string name="vanity_url_hint_mobile">あなたのURL</string>
     <string name="verfication_expired">メール確認用のリンクの有効期限が切れています。</string>
     <string name="verfication_expired_suggestion">Discordにログインし、リンクを送り直してください。</string>
-    <string name="verification_body">"不自然な操作を感知しました。
-Discordを続けて使うには、**人間であることを確認する必要があります。**"</string>
     <string name="verification_body_alt">さて、人間であることを証明しましょう</string>
     <string name="verification_email_body">再度確認メールを**%1$s**に送りました。受信トレイと迷惑トレイを両方確認してください。</string>
     <string name="verification_email_error_body">確認メールを送信する際にエラーが発生しました。 後で再試行するか、サポートに連絡してください。</string>
@@ -3595,14 +3394,11 @@ Discordを続けて使うには、**人間であることを確認する必要
     <string name="video">動画</string>
     <string name="video_call">ビデオ通話</string>
     <string name="video_connect">動画</string>
-    <string name="video_poor_connection_body">ビデオが無効になっています。接続速度が改善されるとビデオが有効になります。</string>
-    <string name="video_poor_connection_title">接続が安定していません</string>
     <string name="video_preview">ビデオのプレビュー</string>
     <string name="video_settings">ビデオ設定</string>
     <string name="video_unavailable">ビデオを利用できません</string>
     <string name="video_unsupported_browser_body">このブラウザでは動画と画面の共有はサポートされていません。当方のデスクトップクライアントをダウンロードして、お顔や画面をネットで発信してください。</string>
     <string name="video_unsupported_browser_title">このブラウザには対応していません</string>
-    <string name="view_audit_log">管理アクションのログを表示</string>
     <string name="view_audit_log_description">この権限が与えられたメンバーは、サーバーの監査ログへのアクセス権を保有します。</string>
     <string name="view_channel">チャンネルを見る</string>
     <string name="view_profile">プロフィール表示</string>
@@ -3666,8 +3462,6 @@ Discordを続けて使うには、**人間であることを確認する必要
     <string name="welcome_message_mobile_upload_icon">サーバーアイコンを追加する</string>
     <string name="welcome_message_mobile_upload_icon_desc">サーバーアイコンであなたのサーバーに個性を与えましょう。</string>
     <string name="welcome_message_owner_title">サーバーへようこそ、%1$sさん！</string>
-    <string name="welcome_message_support">"質問やヘルプなどが必要な場合、[ヘルプ](%1$s)またはTwitter [@discordapp](%2$s) を通して
-**私たちに連絡**して下さい。"</string>
     <string name="welcome_message_title">サーバーへようこそ、%1$sさん！</string>
     <string name="welcome_message_tutorial">**Discordについて学ぼう** 浮き上がってくる案内表示を追うことであなたのペースで学べます。</string>
     <string name="whats_new">新着情報</string>
diff --git a/com.discord/res/values-ko/plurals.xml b/com.discord/res/values-ko/plurals.xml
index 57137033a0..60f696e3c9 100644
--- a/com.discord/res/values-ko/plurals.xml
+++ b/com.discord/res/values-ko/plurals.xml
@@ -96,27 +96,10 @@
         <item quantity="zero"></item>
         <item quantity="one">초</item>
     </plurals>
-    <plurals name="channel_slowmode_desc_minutes_minutes">
-        <item quantity="other">%d x</item>
-        <item quantity="one">1초</item>
-    </plurals>
-    <plurals name="channel_slowmode_desc_minutes_seconds">
-        <item quantity="other">%d초</item>
-        <item quantity="zero"></item>
-        <item quantity="one">분</item>
-    </plurals>
     <plurals name="channel_slowmode_desc_seconds">
         <item quantity="other">%d초</item>
         <item quantity="one">1초</item>
     </plurals>
-    <plurals name="custom_status_hours_hours">
-        <item quantity="other">%d시간</item>
-        <item quantity="one">%d시간</item>
-    </plurals>
-    <plurals name="custom_status_minutes_minutes">
-        <item quantity="other">%d분</item>
-        <item quantity="one">%d분</item>
-    </plurals>
     <plurals name="duration_days_days">
         <item quantity="other">%d일</item>
         <item quantity="one">1일</item>
@@ -142,14 +125,6 @@
         <item quantity="zero">슬롯 0개</item>
         <item quantity="one">슬롯 %d개</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="one">"1일
-%d일"</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">명</item>
-        <item quantity="one">1명</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">일</item>
         <item quantity="one">일</item>
@@ -246,10 +221,6 @@
         <item quantity="other">%d초 남음</item>
         <item quantity="one">포장 중</item>
     </plurals>
-    <plurals name="gift_embed_expiration_hours">
-        <item quantity="other">%d 시간</item>
-        <item quantity="one">%d 시간</item>
-    </plurals>
     <plurals name="gift_inventory_expires_in_hours">
         <item quantity="other">%d 시간</item>
         <item quantity="one">%d 시간</item>
@@ -385,19 +356,10 @@
         <item quantity="other">%d</item>
         <item quantity="one">1개</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d일</item>
-        <item quantity="one">하루</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">채널 %d개</item>
         <item quantity="one">채널 %d개</item>
     </plurals>
-    <plurals name="num_members_subscribers">
-        <item quantity="other">**%d**명</item>
-        <item quantity="zero">**없음</item>
-        <item quantity="one">**1명</item>
-    </plurals>
     <plurals name="num_subscribers_subscribers">
         <item quantity="other">구독자 **%d**명</item>
         <item quantity="zero">구독자 **없음**</item>
@@ -411,14 +373,6 @@
         <item quantity="other">메시지</item>
         <item quantity="one">메시지</item>
     </plurals>
-    <plurals name="partial_outage_a11y_count">
-        <item quantity="other">%d개의 서버가 복구 중이므로사용이 불가능합니다.</item>
-        <item quantity="one">1개의 서버가 복구 중이므로 사용이 불가능합니다.</item>
-    </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d**개의 서버가 복구 중이므로 사용이 불가능해요.</item>
-        <item quantity="one">**1개**의 서버가 복구 중이므로 사용이 불가능해요.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d개월</item>
         <item quantity="one">1개월</item>
diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml
index 9e1e39ab2d..889f2e4c16 100644
--- a/com.discord/res/values-ko/strings.xml
+++ b/com.discord/res/values-ko/strings.xml
@@ -54,7 +54,6 @@
     <string name="activity">활동</string>
     <string name="activity_feed_card_first_time_user_header">플레이하는 게임의 최신 소식을 접해 보세요</string>
     <string name="activity_feed_card_follow_games">게임 팔로우하기</string>
-    <string name="activity_feed_card_gdpr_body">게임 탭을 더욱 그럴싸하게 만들 수 있을 것 같은데… Discord가 당신이 어떤 게임을 하고 누구와 같이 어울리는지를 알면 도와줄 수 있어요. [개인 정보 보호 설정](onClickPrivacy)에서 언제든지 변경할 수 있어요.</string>
     <string name="activity_feed_card_gdpr_button_no">아니요, 사양할게요</string>
     <string name="activity_feed_card_gdpr_button_yes">네, 그렇게 해 주세요!</string>
     <string name="activity_feed_card_no_games_header">플레이하는 게임의 최신 소식을 접해 보세요</string>
@@ -96,10 +95,8 @@
     <string name="activity_invite_private">"오프라인으로 표시 상태거나 플레이 상태를 숨긴 상태라서 초대장을 보낼 수 없어요. 설정을 바꾸기
 싫으시다면 다른 사람의 초대를 받아야 해요."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">알겠어요!</string>
-    <string name="activity_panel_go_live_hotspot_header">친구들에게 게임 플레이를 직접 방송해 보세요!</string>
+    <string name="activity_panel_go_live_hotspot_header">Go Live로 친구들에게 게임 플레이를 직접 방송해 보세요!</string>
     <string name="activity_panel_go_live_tooltip">Go Live</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">이 서버에는 방송할 음성 채널이 없어요.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">이 음성 채널로 방송할 수 없어요.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">방송을 시작할 서버로 이동해 보세요.</string>
     <string name="add">추가하기</string>
     <string name="add_a_comment_optional">댓글 추가하기(선택사항)</string>
@@ -147,7 +144,6 @@
     <string name="add_note">메모 추가하기</string>
     <string name="add_override">우선 설정 추가하기</string>
     <string name="add_reaction">반응 추가하기</string>
-    <string name="add_reactions">반응 추가</string>
     <string name="add_reactions_description">"이 권한을 가진 멤버는 메시지에 새로운 반응을 추가할 수 있어요. 권한이 없는 멤버도
 이미 추가된 반응을 사용하여 반응할 수 있어요."</string>
     <string name="add_role_label">추가:</string>
@@ -177,7 +173,6 @@
     <string name="app_opened_title">Discord 앱이 실행됨</string>
     <string name="app_opening">Discord 앱을 여는 중.</string>
     <string name="app_opening_mobile_body">앱이 열리지 않으면 앱을 다운로드한 후 초대 코드를 복사하여 참가하세요.</string>
-    <string name="app_permission_connect_label">Discord에 접속하기</string>
     <string name="app_settings">앱 설정</string>
     <string name="appearance">디스플레이</string>
     <string name="application_addon_purchase_confirmation_blurb">%1$s 아이템을 구매했어요. %2$s에서 사용할 수 있어요.</string>
@@ -404,9 +399,6 @@
     <string name="application_store_purchase_test_mode">이 애플리케이션의 테스트 모드를 진행 중이므로 요금이 청구되지 않아요.</string>
     <string name="application_store_purchase_warning_preorder">이 게임은 예약 구매 상태예요. %1$s에 이용 가능해요!</string>
     <string name="application_store_rating_descriptors_esrb_alcohol_reference">알코올 언급</string>
-    <string name="application_store_rating_descriptors_esrb_animated_blood">혈흔 묘사</string>
-    <string name="application_store_rating_descriptors_esrb_blood">혈흔</string>
-    <string name="application_store_rating_descriptors_esrb_blood_and_gore">혈흔 및 잔인함</string>
     <string name="application_store_rating_descriptors_esrb_cartoon_violence">만화적 폭력</string>
     <string name="application_store_rating_descriptors_esrb_comic_mischief">재미있는 장난</string>
     <string name="application_store_rating_descriptors_esrb_crude_humor">거친 유머</string>
@@ -480,7 +472,6 @@
     <string name="application_store_view_all_news">모든 뉴스 보기</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Discord에서 %1$s 게임을 소유해야 실행할 수 있는 DLC예요. [DLC에 대하여 자세히 알아보기.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">다운로드 가능한 콘텐츠</string>
-    <string name="application_store_warning_early_access_description">피드백을 제공해 이 게임 개발자들이 더욱더 재미난 게임으로 완성할 수 있도록 도와주세요! [얼리 액세스에 대하여 자세히 알아보기.](%1$s)</string>
     <string name="application_store_warning_early_access_title">얼리 액세스</string>
     <string name="application_store_warning_requires_desktop_app_description">이 게임을 실행하려면 Discord $[PC 앱](downloadHook)을 설치해야 해요.</string>
     <string name="application_store_warning_requires_desktop_app_title">PC 앱이 필요함</string>
@@ -600,12 +591,8 @@
     <string name="billing_error_rate_limit">짧은 시간 동안 시도한 구매 건수가 너무 많아요. 잠시 기다린 후 다시 시도해 주세요!</string>
     <string name="billing_error_section_address">이런! 이 주소에 문제가 있는 것 같네요. 입력 내용을 수정하고 다시 시도해 주세요!</string>
     <string name="billing_error_section_card">이런! 이 카드에 문제가 있는 것 같네요. 입력 내용을 수정하고 다시 시도해 주세요!</string>
-    <string name="billing_gift_copied">복사됨</string>
-    <string name="billing_gift_refund_text">최근 %1$s일 내에 구매한 내역에 대한 환불을 요청할 수 있습니다. [친절한 지원 센터에서 여러분의 돈을 되찾을 수 있도록 도와드리겠습니다.](%2$s)</string>
-    <string name="billing_gift_refund_text_unable">죄송하지만, 이 구매 내역은 환불할 수 없습니다. 최근 %1$s일 내에 구매한 내역만 환불을 요청할 수 있습니다.</string>
     <string name="billing_history">청구 기록</string>
     <string name="billing_legal_mumbo_jumbo">어렵지만 반드시 알아야 할 법률 문서</string>
-    <string name="billing_legal_mumbo_jumbo_label">[Discord 이용 약관](%1$s)에 동의해요</string>
     <string name="billing_manage_billing">결제 방식 변경하기</string>
     <string name="billing_no_payment_method">저장된 결제 방식이 없어요</string>
     <string name="billing_no_payment_method_description">결제 방식을 저장하여 빠른 결제하기</string>
@@ -653,7 +640,6 @@
     <string name="billing_tag_pending">대기 중</string>
     <string name="billing_tag_refunded">환불됨</string>
     <string name="billing_tag_reversed">반환됨</string>
-    <string name="billing_third_party_eula_label">[%1$s EULA](onClick)에 동의해요</string>
     <string name="block">차단하기</string>
     <string name="blocked">차단 목록</string>
     <string name="blocked_messages">차단한 메시지 %1$s</string>
@@ -667,7 +653,6 @@
     <string name="bot_requires_email_verification">이메일 인증을 해야 메시지를 보낼 수 있어요.</string>
     <string name="bot_video_disabled">영상을 수신할 수 있는 대역폭이 확보되지 않아서 비활성 됐어요.</string>
     <string name="bots_settings_learn_more">자세히 알아보기</string>
-    <string name="bots_settings_remove">님 제거하기</string>
     <string name="browser_app">Discord 앱</string>
     <string name="browser_handoff_authenticating_description">Discord PC 클라이언트를 인증하고 있어요. 이 창을 닫지 마세요.</string>
     <string name="browser_handoff_authenticating_title">인증 중</string>
@@ -728,7 +713,6 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
     <string name="category_settings">카테고리 설정</string>
     <string name="category_settings_have_been_updated">카테고리 설정이 변경되었어요.</string>
     <string name="certified">인증됨</string>
-    <string name="certified_device_recommendation_audio_input_and_output_body">Discord가 인증된 오디오 입력 장치 **%1$s %2$s**을(를) 발견했습니다. 최적의 환경으로 사용하려면 이 옵션으로 바꿔보세요.</string>
     <string name="certified_device_recommendation_audio_input_body">Discord가 인증된 오디오 입력 장치 **%1$s %2$s**을(를) 발견했어요. 최적의 환경으로 사용하려면 이 옵션으로 바꿔보세요.</string>
     <string name="certified_device_recommendation_audio_output_body">Discord가 인증된 오디오 출력 장치 **%1$s %2$s**을(를) 발견했어요. 최적의 환경으로 사용하려면 이 옵션으로 바꿔보세요.</string>
     <string name="certified_device_recommendation_cancel">사양할게요!</string>
@@ -784,8 +768,6 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
     <string name="channel_slowmode_desc">슬로우 모드가 활성화됐어요. 멤버는 %1$s에 한 번만 메시지를 전송할 수 있어요.</string>
     <string name="channel_slowmode_desc_hours">슬로우 모드를 사용 중입니다. 멤버는 %1$s%2$s%3$s에 한 번만 메시지를 전송할 수 있습니다.</string>
     <string name="channel_slowmode_desc_immune">슬로우 모드가 활성화됐지만 당신은 영향을 받지 않아요. 굉장하네요!</string>
-    <string name="channel_slowmode_desc_minutes">"슬로우 모드를 사용 중입니다. 멤버는 %1$s%2$s에 한 번만 메시지를 전송할 수 있습니다.
-"</string>
     <string name="channel_slowmode_desc_short">슬로우 모드가 활성화됐어요.</string>
     <string name="channel_topic_empty">주제가 설정되지 않았습니다.</string>
     <string name="channel_type">채널 유형</string>
@@ -893,7 +875,6 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
     <string name="connection_enter_code">화면에 표시된 번호 입력하기</string>
     <string name="connection_invalid_pin">올바르지 않은 인증 번호</string>
     <string name="connection_login_with">다른 계정으로 로그인</string>
-    <string name="connection_problems_body">[서버 상태](%1$s)를 확인하거나 [@discordapp](%2$s)으로 트윗해주세요.</string>
     <string name="connection_status_authenticating">인증 중</string>
     <string name="connection_status_awaiting_endpoint">연결을 기다리는 중</string>
     <string name="connection_status_connected">연결됨</string>
@@ -941,7 +922,7 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
     <string name="create_category">카테고리 만들기</string>
     <string name="create_channel">채널 만들기</string>
     <string name="create_group_dm">새로운 그룹 메시지 만들기</string>
-    <string name="create_instant_invite">즉석 초대 만들기</string>
+    <string name="create_instant_invite">초대 코드 만들기</string>
     <string name="create_lfg_listings_channel">채널 만들기</string>
     <string name="create_link">링크 만들기</string>
     <string name="create_or_join_modal_header">앗, 다른 서버를 원하시는 건가요?</string>
@@ -973,8 +954,6 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
     <string name="cs">체코어</string>
     <string name="currently_controlling">Discord 제어 중</string>
     <string name="custom_color">사용자 지정 색상</string>
-    <string name="custom_status_hours">%1$s 전</string>
-    <string name="custom_status_minutes">%1$s 전</string>
     <string name="custom_status_today">오늘</string>
     <string name="custom_tabs_mobile_body">링크를 볼 때 외부 브라우저 대신 Chrome 커스텀 탭을 사용해요.</string>
     <string name="custom_tabs_mobile_header">Chrome 커스텀 탭 사용하기</string>
@@ -1005,14 +984,13 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
     <string name="data_privacy_update_consents_failed">지금은 데이터 사용 설정을 업데이트할 수 없어요. 나중에 다시 시도해 주세요.</string>
     <string name="date">날짜</string>
     <string name="de">독일어</string>
-    <string name="deafen">음소거</string>
-    <string name="deafen_members">멤버 오디오 끄기</string>
+    <string name="deafen">헤드셋 음소거</string>
+    <string name="deafen_members">멤버의 헤드셋 음소거하기</string>
     <string name="deauthorize">승인 해제하기</string>
     <string name="deauthorize_app">애플리케이션 승인 해제하기</string>
     <string name="debug">디버그</string>
     <string name="decline">거절하기</string>
     <string name="default_app_description">- 설명이 없어요 -</string>
-    <string name="default_input_placeholder">불러오는 중</string>
     <string name="delete">삭제</string>
     <string name="delete_account">계정 삭제하기</string>
     <string name="delete_account_body">정말로 계정을 삭제하시겠어요? 즉시 계정에서 로그아웃 되며 다시 로그인하실 수 없어요.</string>
@@ -1067,7 +1045,6 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
     <string name="disable_email_notifications_failed_suggestion">메일 알림이 비활성화되어 있거나 메일이 더 이상 Discord 계정과 연결되어 있지 않아요.</string>
     <string name="disable_integration_title">동기화 해제하기</string>
     <string name="disable_integration_twitch_body">동기화를 해제하면 모든 구독자의 구독이 만료된 것처럼 처리돼요.</string>
-    <string name="disable_integration_youtube_body">동기화를 해제하면 선택하셨던 구독이 모두 만료된 것처럼 반영됩니다.</string>
     <string name="disable_notifications_description">모든 알림을 무시해요.</string>
     <string name="disable_notifications_label">알림 비활성화</string>
     <string name="disable_sounds_description">모든 음향 효과가 꺼져요.</string>
@@ -1087,7 +1064,6 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
     <string name="dispatch_error_modal_error_label">오류 메시지(여기를 복사해서 붙여넣기하세요)</string>
     <string name="dispatch_error_modal_header">Discord Dispatch 오류</string>
     <string name="dispatch_error_modal_open_ticket">티켓 열기</string>
-    <string name="display">디스플레이</string>
     <string name="display_activity">상태에 %1$s 표시하기</string>
     <string name="display_on_profile">프로필에 표시하기</string>
     <string name="display_option_always">항상</string>
@@ -1108,7 +1084,6 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
     <string name="download_desktop_title">Discord를 PC에서 사용해 보세요</string>
     <string name="download_failed">다운로드 실패</string>
     <string name="download_file_complete">%1$s 다운로드됨</string>
-    <string name="download_mobile_apps_title">iOS용 Discord 설치하기</string>
     <string name="download_mobile_modal_apps_header">Discord 모바일 앱 받기</string>
     <string name="download_mobile_title">또는 모바일에서도 즐겨보세요</string>
     <string name="duration_days">%1$s</string>
@@ -1210,8 +1185,6 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
 이 설정을 사용하면 푸시 알림이 발송되기 전에 잠수 상태까지 걸리는 시간을 조절할 수 있어요."</string>
     <string name="form_description_tts">이 설정을 켜면 최첨단 로봇이 알림을 읽어준답니다.</string>
     <string name="form_error_generic">이런! 아주 드문 오류가 일어났네요. 아마도 저희 측 문제인 것 같아요. 다시 시도하시거나 [상태 페이지](%1$s)를 확인하세요.</string>
-    <string name="form_help_afk_channel">"멤버가 설정된 제한 시간보다 더 오래 자리를 비우는 경우에는 자동으로 해당 멤버의 마이크를 끄고 잠수 채널로 이동시켜요.
-브라우저 버전을 사용하는 멤버에게는 적용되지 않아요."</string>
     <string name="form_help_attenuation">"누군가 말하면 다른 애플리케이션의 음량을 줄여요.
 이 기능을 끄려면 0%%로 설정하세요."</string>
     <string name="form_help_automatic_vad">녹색 신호가 들어오면 Discord가 당신의 멋진 목소리를 전송하고 있는 거예요.</string>
@@ -1227,10 +1200,6 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
 서버 내 모든 메시지의 알림을 수신하는 것으로 자동 설정돼요. 공개 서버에서는 '@mentions' 만 수신하기로 설정하는 것을 권장해요."</string>
     <string name="form_help_explicit_content_filter">"부적절한 콘텐츠를 포함하고 있는 메시지를 자동으로 스캔해 삭제해요.
 개인 서버인 경우 필터 적용 방식을 자유롭게 결정하세요. **공개 Discord 서버인 경우, 필터 사용을 권장해요.**"</string>
-    <string name="form_help_instant_invite_channel">"채널을 선택하면 widget이 즉석 초대 링크를 생성해요.
-선택하지 않으면 온라인 멤버와 음성 채널만 표시돼요."</string>
-    <string name="form_help_last_seen">"**%1$s** 이상 접속하지 않은 멤버 중역할이 없는 멤버 **%2$s**
-을 추방합니다.정리된 멤버도 초대를 통해 다시 참가할 수 있습니다."</string>
     <string name="form_help_legacy_subsystem">"몇몇 오디오 장치 드라이버는 당신의 운영체제의 기본 오디오 서브시스템과 문제를 일으켜요.
 이 옵션을 체크하면 기존 오디오 서브시스템으로 대체돼요."</string>
     <string name="form_help_nsfw">"이 채널의 콘텐츠를 보기 위해서는 성인 인증이 필요합니다.
@@ -1240,7 +1209,6 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
     <string name="form_help_qos">"Discord가 보내는 패킷을 우선순위로 보내도록 라우터에 알려줍니다.
 일부 라우터나 인터넷 서비스 업체는 이 설정이 적용되어 있을 때 문제가 생길 수도 있어요."</string>
     <string name="form_help_server_banner">이 이미지는 채널 목록 맨 위에 표시돼요.</string>
-    <string name="form_help_server_description">이 소개문은 서버 초대 링크의 외부 임베딩 내에 나타납니다.</string>
     <string name="form_help_slowmode">채널 관리나 메시지 관리 권한이 없는 멤버는 일정 시간마다 메시지를 보낼 수 있어요.</string>
     <string name="form_help_temporary">역할을 부여받지 않은 멤버는 접속 종료 시 자동으로 추방돼요.</string>
     <string name="form_help_user_limit">"음성 채널에 접속할 수 있는 사용자 수를 제한해요. **멤버 이동** 권한을 가진 사용자는
@@ -1287,9 +1255,9 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
     <string name="form_label_input_sensitivty">입력 감도</string>
     <string name="form_label_input_volume">입력 음량</string>
     <string name="form_label_instant_invite">초대 코드를 입력하세요</string>
-    <string name="form_label_instant_invite_channel">즉석 초대 채널 초대</string>
+    <string name="form_label_instant_invite_channel">초대 채널</string>
     <string name="form_label_last_seen">마지막으로 접속한 지</string>
-    <string name="form_label_local_mute">로컬 음소거</string>
+    <string name="form_label_local_mute">로컬 마이크 음소거</string>
     <string name="form_label_max_age">잔여 유효 기간:</string>
     <string name="form_label_max_uses">최대 사용 횟수</string>
     <string name="form_label_member_add">멤버 추가하기</string>
@@ -1305,15 +1273,12 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
     <string name="form_label_mobile_notifications_sound_disable">알림 소리 끄기</string>
     <string name="form_label_mobile_notifications_sound_message">새 메시지 알림 소리</string>
     <string name="form_label_mobile_notifications_system_desc">Discord 푸시 알림 활성화하기.</string>
-    <string name="form_label_mobile_notifications_system_hint">특정 채널 또는 서버에서 알림을 받고 싶으시다면 원하는 서버를 오른쪽 클릭하고 알림 설정을 선택하기.</string>
     <string name="form_label_mobile_notifications_system_label">시스템 알림</string>
     <string name="form_label_mobile_notifications_vibrations">알림 진동 비활성화하기.</string>
     <string name="form_label_mobile_notifications_wake_device">알림으로 기기를 작동시켜요.</string>
     <string name="form_label_mobile_push_notifications">모바일 푸시 알림</string>
-    <string name="form_label_mobile_user_notifications_label">알림 설정</string>
-    <string name="form_label_mute_server">**%1$s** 음소거</string>
+    <string name="form_label_mute_server">**%1$s** 마이크 음소거하기</string>
     <string name="form_label_mute_server_description">서버를 음소거하면 자신이 멘션된 경우 외에는 읽지 않음 표시와 알림을 숨겨요.</string>
-    <string name="form_label_muted">음소거 됨</string>
     <string name="form_label_new_password">새 비밀번호</string>
     <string name="form_label_new_user">새로운 사용자이신가요?</string>
     <string name="form_label_nothing">없음</string>
@@ -1375,12 +1340,6 @@ PC 앱을 [다운로드](onDownloadClick)하세요."</string>
     <string name="form_placeholder_reason">사유</string>
     <string name="form_placeholder_server_name">서버 이름을 입력하세요</string>
     <string name="form_placeholder_username">다른 분들이 뭐라고 불러야 하나요?</string>
-    <string name="form_report_help_text">"제보는 Discord의 신뢰&amp;보안팀으로 전달돼요 - **서버 주인이 아닙니다**.
-
-잘못된 제보를 전달하거나 제보 기능을 남용하면 제보 제출 기능이 제한될 수 있어요. 
-
-더 자세한 사항은 [Discord 커뮤니티 지침](%1$s) 에서 확인하시기 바랍니다.
-편안하고 안전한 게임 환경을 지켜주시는 것에 감사드립니다."</string>
     <string name="form_warning_input_sensitivty">"사용할 수 있는 녹음 장치가 없어요. 입력 감도를 확인하려면
 Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주세요."</string>
     <string name="form_warning_video_preview">미리 보기를 활성화하려면 Discord의 [카메라 액세스](onEnableClick)를 허용해 주세요.</string>
@@ -1422,7 +1381,6 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="game_action_button_game_not_detected">게임이 감지되지 않음</string>
     <string name="game_action_button_install">설치</string>
     <string name="game_action_button_locate">위치 보기</string>
-    <string name="game_action_button_login_to_buy">로그인 후 구입 가능</string>
     <string name="game_action_button_now_playing">플레이 중</string>
     <string name="game_action_button_paused">일시 정지됨</string>
     <string name="game_action_button_play">게임 시작</string>
@@ -1462,7 +1420,6 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="game_feed_activity_recently_played">최근 플레이한 게임</string>
     <string name="game_feed_activity_streaming_twitch">Twitch에서 방송 중</string>
     <string name="game_feed_current_header_title">플레이 중</string>
-    <string name="game_feed_settings_visibility">활동 탭에 나타내기</string>
     <string name="game_feed_unknown_player">알 수 없는 플레이어</string>
     <string name="game_feed_user_played_days_ago">%1$s%2$s 전 플레이</string>
     <string name="game_feed_user_played_hours_ago">%1$s%2$s 전 플레이</string>
@@ -1536,20 +1493,14 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="gif_auto_play_label">Discord 창이 활성화 상태라면 자동으로 GIF를 재생하기.</string>
     <string name="gif_picker_result_type_recent">최신순</string>
     <string name="gift_code_auth_continue_in_browser">브라우저에서 계속하기</string>
-    <string name="gift_code_auth_gifted">선택되셨습니다!</string>
-    <string name="gift_code_auth_verification_sent">전송됨</string>
     <string name="gift_confirmation_button_go_to_library">라이브러리로 가기</string>
     <string name="gift_confirmation_button_subscription_success">좋아요!</string>
-    <string name="gift_confirmation_button_success_premium_games">모든 Nitro 게임 확인하기</string>
-    <string name="gift_confirmation_header_success_nitro">You got %1$s</string>
     <string name="gift_embed_button_accept">수락</string>
-    <string name="gift_embed_expiration">링크 만료까지 %1$s</string>
     <string name="gift_embed_invalid_tagline_other">선물 링크가 만료됐거나 취소됐어요. 발송자가 새로운 링크를 생성하여 다시 보낼 수 있어요.</string>
     <string name="gift_embed_invalid_tagline_self">선물 링크가 만료됐거나 취소됐어요. 새로운 링크를 생성하여 다시 보낼 수 있어요.</string>
     <string name="gift_inventory_expires_in">링크 만료까지 %1$s</string>
-    <string name="gift_inventory_hidden">비공개 링크. 복사 버튼을 사용하세요</string>
     <string name="gift_inventory_redeem_codes">코드 교환</string>
-    <string name="go_live_changelog_guilds">다음 서버에서 Go Live 이용하기: %1$s</string>
+    <string name="go_live_hardware_acceleration_unavailable">잠시만요! 하드웨어 가속을 감지할 수 없어요. 컴퓨터가 Go Live를 지원하는데 문제가 있는 것 같아요.</string>
     <string name="go_live_hey">하이!</string>
     <string name="go_live_listen">들어보세요!</string>
     <string name="go_live_look">보세요!</string>
@@ -1563,7 +1514,7 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="go_live_modal_select_channel_form_title">음성 채널 선택</string>
     <string name="go_live_modal_select_channel_placeholder">음성 채널 찾기</string>
     <string name="go_live_modal_title">Go Live</string>
-    <string name="go_live_premium_early_access">Nitro 구독자이신 것에 감사한 마음으로, \"Go Live\" 기능에 얼리 엑세스 권한을 드립니다!</string>
+    <string name="go_live_video_drivers_outdated">비디오 드라이버가 최신 버전이 아니에요. 업데이트하고 Go Live 퍼포먼스를 높이세요.</string>
     <string name="grant_temporary_membership">임시 멤버 자격 부여</string>
     <string name="group">그룹</string>
     <string name="group_dm_add_friends">개인 메시지에 친구 추가하기</string>
@@ -1598,7 +1549,7 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="guild_members_header">멤버 %1$s명</string>
     <string name="guild_members_search_no_result">멤버를 찾을 수 없어요.</string>
     <string name="guild_message_notifications_only_mentions">\@mentions만</string>
-    <string name="guild_muted_help_text">서버가 현재 음소거 상태이므로, 이 설정은 비활성화되었어요.</string>
+    <string name="guild_muted_help_text">서버 알림이 꺼진 상태이므로, 이 설정은 비활성화되었어요.</string>
     <string name="guild_owner">서버 주인</string>
     <string name="guild_partnered">Discord 파트너</string>
     <string name="guild_security_req_mfa_body">"2단계 인증을 활성화하지 않은 사용자의 권한을 제한하여 악성 테러를 방지해요.
@@ -1667,7 +1618,6 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="guild_settings_audit_log_guild_afk_channel_id_change">잠수 채널을 **%1$s** 채널로 설정함</string>
     <string name="guild_settings_audit_log_guild_afk_channel_id_clear">잠수 채널을 **청소**함</string>
     <string name="guild_settings_audit_log_guild_afk_timeout_change">잠수 제한 시간을 **%1$s**분으로 설정함</string>
-    <string name="guild_settings_audit_log_guild_banner_hash_change">서버 아이콘으로 설정함</string>
     <string name="guild_settings_audit_log_guild_default_message_notifications_change_all_messages">기본 메시지 알림 설정을 **모든 메시지**로 설정함</string>
     <string name="guild_settings_audit_log_guild_default_message_notifications_change_only_mentions">기본 메시지 알림 설정을 **멘션된 메시지**로 설정함</string>
     <string name="guild_settings_audit_log_guild_explicit_content_filter_all_members">**모든 멤버**의 메시지를 스캔하기 위해 유해 콘텐츠 필터 설정함</string>
@@ -1684,11 +1634,6 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="guild_settings_audit_log_guild_update">$[**%1$s**](userHook) 님이 $[**%2$s**](targetHook) 항목을 변경했어요</string>
     <string name="guild_settings_audit_log_guild_vanity_url_code_change">**%1$s** 고유 URL을 설정함</string>
     <string name="guild_settings_audit_log_guild_vanity_url_code_delete">고유 URL을 **제거**함</string>
-    <string name="guild_settings_audit_log_guild_verification_level_change_high">guild 보안 수준을 **높음**으로 설정함</string>
-    <string name="guild_settings_audit_log_guild_verification_level_change_low">guild 보안 수준을**낮음**으로 설정함</string>
-    <string name="guild_settings_audit_log_guild_verification_level_change_medium">guild 보안 수준을 **중간**으로 설정함</string>
-    <string name="guild_settings_audit_log_guild_verification_level_change_none">guild 보안 수준을 **없음**으로 설정함</string>
-    <string name="guild_settings_audit_log_guild_verification_level_change_very_high">guild 보안 수준을 **매우 높음**으로 설정함</string>
     <string name="guild_settings_audit_log_guild_widget_channel_id_change">widget 채널을 **%1$s** 채널로 설정함</string>
     <string name="guild_settings_audit_log_guild_widget_channel_id_delete">widget 채널을 **삭제**함</string>
     <string name="guild_settings_audit_log_guild_widget_disabled">widget을 **비활성화**함</string>
@@ -1707,11 +1652,10 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="guild_settings_audit_log_load_more">더 불러오기</string>
     <string name="guild_settings_audit_log_member_ban_add">$[**%1$s**](userHook) 님이 $[**%2$s**](targetHook) 님을 차단했어요</string>
     <string name="guild_settings_audit_log_member_ban_remove">$[**%1$s**](userHook) 님이 $[**%2$s**](targetHook) 님의 차단을 해제했어요</string>
-    <string name="guild_settings_audit_log_member_deaf_off">멤버들의 무음 상태를 **해제함**</string>
-    <string name="guild_settings_audit_log_member_deaf_on">멤버들이 **들을 수 없게 함**</string>
+    <string name="guild_settings_audit_log_member_deaf_off">멤버들의 **헤드셋 음소거 해제함**</string>
+    <string name="guild_settings_audit_log_member_deaf_on">멤버들의 **헤드셋 음소거함**</string>
     <string name="guild_settings_audit_log_member_kick">$[**%1$s**](userHook) 님이 $[**%2$s**](targetHook) 님을 추방했어요</string>
-    <string name="guild_settings_audit_log_member_mute_off">멤버들의 **음소거를 해제함**</string>
-    <string name="guild_settings_audit_log_member_mute_on">멤버들 **음소거** 상태 활성화함</string>
+    <string name="guild_settings_audit_log_member_mute_off">멤버들의 **마이크 음소거 해제함**</string>
     <string name="guild_settings_audit_log_member_nick_change">멤버들의 별명을 **%1$s**에서 **%2$s**(으)로 변경함</string>
     <string name="guild_settings_audit_log_member_nick_create">멤버들의 별명을 **%1$s**(으)로 설정함</string>
     <string name="guild_settings_audit_log_member_nick_delete">멤버들의 별명**%1$s**을(를) **제거함**</string>
@@ -1755,7 +1699,8 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="guild_settings_filter_all_actions">모든 작업</string>
     <string name="guild_settings_filter_all_users">모든 사용자</string>
     <string name="guild_settings_filter_user">사용자별 필터링</string>
-    <string name="guild_settings_icon_recommend">서버 이미지 해상도는 최소 512x512를 추천합니다.</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">720p 60fps Go Live 방송</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">1080p 60fps Go Live 방송</string>
     <string name="guild_settings_label_audit_log">감사 로그</string>
     <string name="guild_settings_label_audit_log_empty_body">관리자들이 관리를 시작하면, 이곳에서 관리 내역을 관리할 수 있어요.</string>
     <string name="guild_settings_label_audit_log_empty_title">로그 없음</string>
@@ -1789,7 +1734,7 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="hide_instant_invites_description">Discord 서버에 불특정다수가 참여하는 것을 바라지 않는다면 체크하세요.</string>
     <string name="hide_instant_invites_label">초대 링크 숨기기</string>
     <string name="hide_muted">%1$s 개의 음소거 된 채널 접기</string>
-    <string name="hide_muted_channels">소리 꺼진 채널 숨기기</string>
+    <string name="hide_muted_channels">알림 끈 채널 숨기기</string>
     <string name="hide_personal_information_description">이메일, 연결된 계정, 노트를 가리고 DiscordTags를 익명화해요.</string>
     <string name="hide_personal_information_label">개인정보 숨기기</string>
     <string name="hold_up">잠시만요</string>
@@ -1834,7 +1779,6 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="hypesquad_question_11_response_d">Wumpus에게 차라리 탬버린을 맡으라고 권하기</string>
     <string name="hypesquad_question_12_prompt">세상에서 가장 높은 산 정상에 도달하기 직전인데 머리 3개 달린 용이 앞을 가로막자 당신은…</string>
     <string name="hypesquad_question_12_response_a">바로 전투 모드 실행</string>
-    <string name="hypesquad_question_12_response_b">고질라와 킹기도라의 전투 장면을 시청하면서 싸우는 방법을 배우기</string>
     <string name="hypesquad_question_12_response_c">용보고 돈을 나누자고 설득하기</string>
     <string name="hypesquad_question_12_response_d">용에게 누구도 거부할 수 없을 정도로 귀여운 Wumpus 인형을 바치기</string>
     <string name="hypesquad_question_13_prompt">이게 무슨 소리죠?</string>
@@ -1927,7 +1871,6 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="incoming_friend_request">받은 친구 요청</string>
     <string name="incoming_video_call">수신 영상 통화</string>
     <string name="incoming_video_call_ellipsis">영상 통화 수신 중…</string>
-    <string name="incompatible_browser">또는[지원 가능한 브라우저](%1$s)에서 이 페이지를 여세요.</string>
     <string name="inivte_modal_no_thanks">사양할게요</string>
     <string name="inline_attachment_media">Discord에 직접 올렸을 때.</string>
     <string name="inline_attachment_media_help">%1$sMB 보다 큰 용량의 이미지는 미리 보기가 지원되지 않아요.</string>
@@ -1938,10 +1881,10 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="input_mode_ptt_release_delay">눌러서 말하기 유지 시간</string>
     <string name="input_mode_vad">음성 감지</string>
     <string name="install_location_main">주 위치</string>
-    <string name="instant_invite">즉석 초대</string>
+    <string name="instant_invite">초대</string>
     <string name="instant_invite_accept">초대 수락하기</string>
-    <string name="instant_invite_accepted">즉석 초대 수락됨</string>
-    <string name="instant_invite_accepting">즉석 초대 수락 중</string>
+    <string name="instant_invite_accepted">수락한 초대</string>
+    <string name="instant_invite_accepting">초대 수락하는 중</string>
     <string name="instant_invite_ask_for_new_invite">새 초대장을 부탁해 보세요!</string>
     <string name="instant_invite_ask_user_for_new_invite">%1$s 님에게 새 초대장을 부탁해 보세요!</string>
     <string name="instant_invite_code">코드</string>
@@ -1963,17 +1906,15 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="instant_invite_regenerate">재생성하기</string>
     <string name="instant_invite_resolved_body">**%1$s** 서버의 **%2$s** 채널로 초대받았어요.</string>
     <string name="instant_invite_resolved_title">앗, 안녕하세요.</string>
-    <string name="instant_invite_resolving">즉석 초대 확인 중</string>
+    <string name="instant_invite_resolving">초대 확인 중</string>
     <string name="instant_invite_uses">사용 횟수</string>
     <string name="instant_invite_you_are_already_a_member_of">이미 가입됨:</string>
     <string name="instant_invite_you_have_been_invited_to_join">초대 받음:</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** 님이 초대함:</string>
-    <string name="instant_invites">즉석 초대</string>
+    <string name="instant_invites">초대</string>
     <string name="integration_settings">연동 설정</string>
     <string name="integrations">연동</string>
-    <string name="integrations_header">연결된 Twitch/Youtube Gaming 계정</string>
     <string name="integrations_pro_tip">더 많은 기능을 사용하시려면 [Discord StreamKit](%1$s) 를 확인하세요.</string>
-    <string name="interaction_required_title">확인이 필요합니다</string>
     <string name="internal_server_error">내부 서버 오류가 발생했어요. 다시 시도해 주세요.</string>
     <string name="invalid_animated_emoji_body">움직이는 이모티콘이라서 사용할 수가 없네요. Discord Nitro로 업그레이드해서 자유롭게 움직이는 이모티콘도 사용해 보세요!</string>
     <string name="invalid_animated_emoji_body_upgrade">움직이는 이모티콘이라서 사용할 수가 없네요. Discord Nitro로 이 문제를 해결할 수 있을 것 같은데, 자세한 건 사용자 설정 > Nitro를 확인하세요.</string>
@@ -2078,7 +2019,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="invite_url">초대 URL</string>
     <string name="invites">초대</string>
     <string name="ios_iap_generic_billing_error">결제 과정에서 문제가 생겼어요. 다시 시도해 주세요!</string>
-    <string name="ios_iap_restore_subscription_success">완료</string>
     <string name="ip_address_secured">IP 주소 보호 중</string>
     <string name="ip_authorization_succeeded">IP 주소 승인됨</string>
     <string name="ip_authorization_succeeded_suggestion">PC나 모바일 앱에서 로그인 시도 후 이 링크를 누르셨다면 뒤로 가기를 누르고 다시 시도해 주시기 바랍니다.</string>
@@ -2127,14 +2067,13 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="keybind_description_modal_scroll_chat">채팅을 위나 아래로 스크롤하기</string>
     <string name="keybind_description_modal_search">검색하기</string>
     <string name="keybind_description_modal_search_emojis">이모티콘 선택기 전환하기</string>
-    <string name="keybind_description_modal_search_gifs">이모지 선택기 전환하기</string>
     <string name="keybind_description_modal_subtitle">이걸 마스터하여 최고의 Discord Discord Revolution 플레이어가 되기</string>
     <string name="keybind_description_modal_title">키보드 콤보</string>
-    <string name="keybind_description_modal_toggle_deafen">소리 상태 전환하기</string>
+    <string name="keybind_description_modal_toggle_deafen">헤드셋 음소거 전환하기</string>
     <string name="keybind_description_modal_toggle_help">도움말</string>
     <string name="keybind_description_modal_toggle_hotkeys">단축키 전환하기</string>
     <string name="keybind_description_modal_toggle_mentions">멘션 팝업 전환하기</string>
-    <string name="keybind_description_modal_toggle_mute">마이크 상태 전환하기</string>
+    <string name="keybind_description_modal_toggle_mute">소리 끄기 전환하기</string>
     <string name="keybind_description_modal_toggle_pins">메시지 고정 팝업 전환하기</string>
     <string name="keybind_description_modal_toggle_previous_guild">마지막 서버와 개인 메시지 사이를 전환하기</string>
     <string name="keybind_description_modal_toggle_users">채널 멤버 목록 전환하기</string>
@@ -2146,18 +2085,18 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="keybind_description_push_to_talk_priority">"눌러서 말하기 모드일 때 단축키를 누르고 있는 동안 잠시 마이크를 켜요. 우선 발언 권한이 없는
 다른 사람들의 음량은 자동으로
 낮아져요."</string>
-    <string name="keybind_description_toggle_deafen">스피커 재생상태를 전환해요. 음소거 상태일때는 마이크도 꺼져요.</string>
+    <string name="keybind_description_toggle_deafen">스피커 재생상태를 전환해요. 헤드셋 음소거 상태일 때는 마이크도 꺼져요.</string>
     <string name="keybind_description_toggle_mute">마이크 전송을 켜거나 끄기.</string>
     <string name="keybind_description_toggle_overlay">오버레이를 켜거나 끕니다.</string>
     <string name="keybind_description_toggle_overlay_input_lock">오버레이 조작을 잠금으로 전환해요.</string>
     <string name="keybind_description_toggle_streamer_mode">방송 모드를 적용/비활성화해요.</string>
     <string name="keybind_description_toggle_voice_mode">녹음 모드를 눌러서 말하기와 음성 감지 사이에서 전환해요.</string>
     <string name="keybind_description_unassigned">이 작업은 아무 소용이 없어요! 드롭다운 목록에서 다른 옵션을 선택해 주세요.</string>
-    <string name="keybind_push_to_mute">눌러서 마이크 끄기</string>
+    <string name="keybind_push_to_mute">눌러서 마이크 음소거하기</string>
     <string name="keybind_push_to_talk">눌러서 말하기(보통)</string>
     <string name="keybind_push_to_talk_priority">눌러서 말하기(우선)</string>
-    <string name="keybind_toggle_deafen">소리 상태 전환하기</string>
-    <string name="keybind_toggle_mute">마이크 상태 전환하기</string>
+    <string name="keybind_toggle_deafen">헤드셋 음소거 전환하기</string>
+    <string name="keybind_toggle_mute">마이크 음소거 전환하기</string>
     <string name="keybind_toggle_overlay">오버레이 전환</string>
     <string name="keybind_toggle_overlay_input_lock">오버레이 잠금 전환하기</string>
     <string name="keybind_toggle_stream_mode">방송 모드 적용</string>
@@ -2198,9 +2137,7 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="leave_server_body">이 서버에서 나가면 다시 초대를 받아야 하는데 정말 **%1$s**에서 나갈건가요?</string>
     <string name="leave_server_body_mobile">%1$s에서 나가시겠어요?</string>
     <string name="leave_server_title">"'%1$s' 서버 퇴장"</string>
-    <string name="lfg_create_button">새로운 그룹 메시지 만들기</string>
     <string name="lfg_edit_modal_description_label">본문</string>
-    <string name="lfg_group_full">만원</string>
     <string name="lfg_listing_age_minutes">%1$s%2$s 전 플레이</string>
     <string name="lfg_listing_age_seconds">%1$s %2$s</string>
     <string name="library">라이브러리</string>
@@ -2211,7 +2148,7 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="link_your_xbox_account_2">Discord는 무료에, 안전하고, PC는 물론 모바일에서도 이용 가능한 음성, 텍스트, 영상 채팅 앱이에요.</string>
     <string name="listening_to">**%1$s** 듣는 중</string>
     <string name="live">라이브</string>
-    <string name="live_beta_description">방송에 잘 왔어요! Go Live는 베타 상태이므로 일시적 오류가 있어도 양해해 주세요</string>
+    <string name="live_beta_description">방송에 잘 왔어요! Go Live는 베타 버전이므로 일시적 오류가 있어도 양해해 주세요</string>
     <string name="live_on_twitch">Twitch에서 방송 중</string>
     <string name="load_image_error">"이미지를 불러오지 못했어요.
 다시 시도해 주세요."</string>
@@ -2322,7 +2259,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="mfa_sms_receive_code">SMS로 인증 코드 전송하기</string>
     <string name="mfa_sms_remove">SMS 인증 제거하기</string>
     <string name="mfa_sms_resend">SMS를 다시 재전송할까요?</string>
-    <string name="microphone_permission_error">권한 요청이 거부되어 마이크 음소거를 해제하지 못했어요.</string>
     <string name="minimum_size">최소 크기: **%1$sx%1$s**</string>
     <string name="missed_an_update">업데이트 내용을 놓쳤나요? [여기에서 최근 변경 사항을 확인해 보세요](%1$s).</string>
     <string name="missing_entitlement_modal_body">**%1$s**의 실행 자격을 잃었기 때문에 실행할 수 없어요. 여기에는 Nitro 구독 만료, 환불, **%1$s**이(가) Discord 스토어에서 삭제되는 등 여러 가지 이유가 있을 수 있어요. [자세한 정보나 지원은 이 도움말을 확인하세요.](%2$s)</string>
@@ -2339,11 +2275,11 @@ Discord에 대해 더 알고 싶으신가요?"</string>
 해당 채널에 입장할 권한이 있어야 해요."</string>
     <string name="move_to">이동하기:</string>
     <string name="move_to_success">선택한 채널로 사용자를 이동했어요.</string>
-    <string name="mute">음소거</string>
-    <string name="mute_category">카테고리 소리 끄기</string>
-    <string name="mute_channel">**%1$s** 소리 끄기</string>
-    <string name="mute_group_dm">**%1$s** 소리 끄기</string>
-    <string name="mute_members">멤버 마이크 끄기</string>
+    <string name="mute">마이크 음소거</string>
+    <string name="mute_category">카테고리 알림 끄기</string>
+    <string name="mute_channel">**%1$s** 알림 끄기</string>
+    <string name="mute_group_dm">**%1$s** 알림 끄기</string>
+    <string name="mute_members">멤버들의 마이크 음소거하기</string>
     <string name="mutual_friends">같이 아는 친구</string>
     <string name="mutual_guilds">같이 있는 서버</string>
     <string name="n_days">%1$s</string>
@@ -2373,14 +2309,12 @@ Discord에 대해 더 알고 싶으신가요?"</string>
 읽지 않은 메시지가 %3$s개 있어요"</string>
     <string name="new_override">새로운 우선 설정</string>
     <string name="new_permission">새 권한</string>
-    <string name="new_terms_ack">이 약관에 동의해요.</string>
     <string name="new_terms_continue">Discord로 계속하기</string>
     <string name="new_terms_description">"Discord를 계속 이용하기 위해 업데이트된
 서비스 이용 약관과 개인정보 보호 정책을 읽고 동의해주시길 바랍니다."</string>
     <string name="new_terms_title">서비스 이용 약관과 개인정보 관련 업데이트</string>
     <string name="new_unreads">읽지 않은 메시지</string>
     <string name="news_channel_publish">발행</string>
-    <string name="news_channel_published">발행인</string>
     <string name="next">다음</string>
     <string name="nickname">별명</string>
     <string name="nickname_changed">별명을 %1$s(으)로 변경됨.</string>
@@ -2401,14 +2335,11 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="no_emoji_title">이모티콘 없음</string>
     <string name="no_input_devices">입력 장치 없음</string>
     <string name="no_input_devices_detected">녹음 장치를 찾을 수 없어요. 장치를 다시 연결한 후 다시 시도해 주세요.</string>
-    <string name="no_instant_invite">즉석 초대 없음</string>
-    <string name="no_integrations">구독자/스폰서에게 역할을 지정하기 위해 Twitch나 YouTube Gaming 계정을 [동기화](onConnect)</string>
+    <string name="no_instant_invite">초대 없음</string>
     <string name="no_integrations_body">프로토콜 FR13NDSH1P는 Discord 클라이언트에서만 실행될 수 있어요</string>
     <string name="no_integrations_label">연동 없음</string>
-    <string name="no_invites_body">"쓸쓸하다고요? 발만 동동 굴리지 말고
-초대 링크를 만들어서 친구들을 초대해 보세요!"</string>
     <string name="no_invites_caption">아직 초대를 받지 않았어요!</string>
-    <string name="no_invites_label">현재 초대 없음</string>
+    <string name="no_invites_label">아직 초대를 받지 않았어요</string>
     <string name="no_mail_account_description">피드백은 support@discordapp.com 으로 보내 주시길 바랍니다. 클립보드에 사용자 정보를 복사 하였습니다.</string>
     <string name="no_mail_account_title">이메일 계정 없음</string>
     <string name="no_mic_body">Discord 지원 센터에서 마이크를 허용하는 방법을 확인할 수 있어요.</string>
@@ -2424,7 +2355,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
 고정된 메시지가 없네요… 아직은."</string>
     <string name="no_reactions_body">아무 감정도 없는 냉정한 세상이네요.</string>
     <string name="no_reactions_header">반응 없음</string>
-    <string name="no_recent_mentions">긁적긁적… 텅텅 비어있네요.</string>
     <string name="no_send_messages_permission_placeholder">이 채널 내에서 메시지를 보낼 권한이 없어요.</string>
     <string name="no_text">아니요</string>
     <string name="no_thanks">사양할게요</string>
@@ -2456,16 +2386,11 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="notice_dispatch_error_with_code">이런, 오류가 발생했어요. 코드: %1$s</string>
     <string name="notice_dispatch_install_script_progress">게임을 실행하기 전 Discord가 설치할 게 있어요. (%1$s 중 %2$s) 설치 중.</string>
     <string name="notice_dispatch_install_script_progress_with_name">게임을 실행하기 전 Discord가 설치할 게 있어요. %1$s(%2$s 중 %3$s) 설치 중.</string>
-    <string name="notice_hardware_mute">이런, **%1$s %2$s** 마이크의 하드웨어 음소거가 켜진 것 같네요.</string>
     <string name="notice_mfa_sms_backup">혹시 모르니 2단계 인증 설정에 전화번호를 추가하는 게 좋아요.</string>
     <string name="notice_mfa_sms_backup_button">전화번호 추가하기</string>
     <string name="notice_native_apps">브라우저 밖에서도 눌러서 말하기가 필요하다면 PC 앱을 받아보세요!</string>
     <string name="notice_no_input_detected">Discord가 마이크 입력을 감지하지 못했어요. 같이 힘을 합쳐서 해결해 봐요.</string>
     <string name="notice_no_input_detected_help_link_text">도와줘요!</string>
-    <string name="notice_no_input_detected_settings">Discord가 마이크 입력을 감지하지 못했습니다. 어디 같이 힘을 합쳐서 해결해보자고요.</string>
-    <string name="notice_premium_applications_grandfathered_ended">Nitro 이용권이 만료되었어요. Nitro Classic에서 Nitro로 업그레이드하고 신나는 게임들을 무제한으로 이용해 보세요.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Nitro 게임을 이용할 수 있는 시간이 %1$s 밖에 남지 않았어요! 액세스 권한이 **%2$s**에 종료돼요.</string>
-    <string name="notice_premium_applications_grandfathered_started">Nitro의 초기 서포터가 되어줘서 고마워요! 그래서 감사의 선물로 Nitro 게임을 %1$s까지 사용할 수 있게 해드릴게요.</string>
     <string name="notice_premium_promo_action">한번 사용해봐요!</string>
     <string name="notice_premium_promo_message">Discord의 개발을 지원하고 재미있는 특전을 받아보세요!</string>
     <string name="notice_scheduled_maintenance">Discord 서버 점검이 **%1$s** **%2$s**에 있을 예정이에요.</string>
@@ -2514,7 +2439,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
 직접 친구들이 참가할 수 있는 Discord 서버를 만들어 보세요. 음성 및 텍스트 채팅은 100%% 공짜로 제공된답니다!"</string>
     <string name="nuf_create_server_button">서버 만들기</string>
     <string name="nuf_create_server_error">올바르지 않은 서버 이름</string>
-    <string name="nuf_create_server_note">서버도 만들고, 친구들도 초대하고, 파티를 열어 보세요! 서버를 만들면 Discord의 [커뮤니티 지침](https://discordapp.com/guidelines)에 동의하는 것이에요.</string>
     <string name="nuf_create_server_title">서버 만들기</string>
     <string name="nuf_download_app_body">PC 앱을 다운로드해 더 쉽게 서버에 참가하고 앱 전용 기능 (눌러서 말하기 등)을 사용해 보세요!</string>
     <string name="nuf_download_app_button_platform">%1$s용 다운로드</string>
@@ -2529,11 +2453,9 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="nuf_join_server_input_label">초대 링크 또는 코드</string>
     <string name="nuf_join_server_input_note">예시: https://discord.gg/qJq5C, https://discord.gg/discord-devs, qJq5C</string>
     <string name="nuf_join_server_title_1">초대 링크를 받았나요?</string>
-    <string name="nuf_join_server_title_2">Discord에 오신 걸 환영해요!</string>
     <string name="nuf_title">Discord에 오신 걸 환영해요, %1$s 님.</string>
     <string name="nuf_title_mobile">Discord에 오신 걸 환영합니다</string>
     <string name="nuf_welcome_carousel_1_body_mobile">2억 명 이상의 게이머가 사용하는 Discord에 참여해서 친구들과 함께 무료로 채팅해 보세요.</string>
-    <string name="nuf_welcome_carousel_1_title_mobile">Discord에 오신 걸 환영해요</string>
     <string name="nuf_welcome_carousel_2_body_mobile">나의 서버는 친구들과 어울릴 수 있는 곳이에요. 나만의 이모티콘을 추가하거나 음성 채팅을 시작하세요!</string>
     <string name="nuf_welcome_carousel_2_title_mobile">서버 만들기</string>
     <string name="nuf_welcome_carousel_3_body_mobile">Discord에서는 셀 수 없이 다양한 사용자 맞춤 설정으로 손쉽게 게임 그룹을 조직할 수 있어요.</string>
@@ -2543,10 +2465,8 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="nuf_welcome_carousel_5_body_mobile">온라인 상태인 친구가 누구이고 어떤 게임을 하는지 확인해 보세요.</string>
     <string name="nuf_welcome_carousel_5_title_mobile">게임 중인 친구 확인하기</string>
     <string name="num_channels">%1$s</string>
-    <string name="num_members">멤버 %1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">오버레이 활성화</string>
     <string name="nux_post_reg_join_server_description">서버에 참가해 Discord의 모든 기능을 사용해 보세요.</string>
     <string name="nux_post_reg_join_server_skip">없어요.</string>
     <string name="nux_post_reg_join_server_title">초대장을 받으셨나요?</string>
@@ -2592,7 +2512,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="overlay_menu_get_invite">초대 링크 만들기</string>
     <string name="overlay_menu_open_discord">Discord 열기</string>
     <string name="overlay_menu_switch_channels">채널 전환하기</string>
-    <string name="overlay_mobile_required">Discord의 음성 설정에 들어가 모바일 오버레이를 활성화하기.</string>
     <string name="overlay_mobile_toggle_desc">음성 연결 중 다른 앱을 사용하면서 채팅 참여자를 확인하고 바로 가기를 사용할 수 있어요.</string>
     <string name="overlay_mobile_toggle_label">모바일 음성 오버레이 활성화하기</string>
     <string name="overlay_mobile_unauthed">이 기능을 활성화하려면 Discord 앱에 로그인하세요.</string>
@@ -2601,7 +2520,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="overlay_news_text_pinning_body">이제 게임에 텍스트 채팅을 고정할 수 있어요!</string>
     <string name="overlay_news_text_pinning_tip">팁: $[pinIcon](pinHook)을 누르면 채팅을 고정할 수 있어요.</string>
     <string name="overlay_news_text_pinning_title">Discord 오버레이 업그레이드 완료</string>
-    <string name="overlay_no_results">샅샅이 뒤졌지만, 음성 채널을 찾지 못했어요.</string>
     <string name="overlay_notification_incoming_call">전화 수신 중…</string>
     <string name="overlay_notification_settings_disabled">알림 비활성화됨</string>
     <string name="overlay_notification_settings_position">표시 중: %1$s</string>
@@ -2611,7 +2529,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="overlay_notifications_settings">오버레이 알림</string>
     <string name="overlay_notifications_top_left">좌측 상단</string>
     <string name="overlay_notifications_top_right">우측 상단</string>
-    <string name="overlay_private_channels_empty_state">개인 메시지가 온 게 하나도 없네요.</string>
     <string name="overlay_reload">오버레이 다시 불러오기</string>
     <string name="overlay_settings">오버레이 설정하기</string>
     <string name="overlay_settings_general_tab">일반</string>
@@ -2633,8 +2550,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="pagination_page_of">%1$s 페이지 중 %2$s 페이지</string>
     <string name="pagination_previous">이전</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</string>
     <string name="partner_badge_tooltip">Discord 파트너</string>
     <string name="party_full">만원</string>
     <string name="party_join">그룹 참가하기</string>
@@ -2652,8 +2567,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="payment_modal_button_change_card">신용카드 정보 업데이트</string>
     <string name="payment_modal_button_change_paypal">PayPal 계정 정보 업데이트</string>
     <string name="payment_modal_button_premium">%1$s 구독하기</string>
-    <string name="payment_modal_per_month">한 달:</string>
-    <string name="payment_modal_per_year">1년:</string>
     <string name="payment_modal_subtitle">Discord Nitro 구독</string>
     <string name="payment_modal_title_change_card">신용카드 변경하기</string>
     <string name="payment_modal_title_change_paypal">PayPal 계정 변경하기</string>
@@ -2670,10 +2583,7 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="payment_source_credit_card">신용카드</string>
     <string name="payment_source_delete">결제 방식 삭제하기</string>
     <string name="payment_source_delete_disabled_tooltip">Nitro 구독을 사용 중이라면 이 결제 방식을 삭제할 수 없어요.</string>
-    <string name="payment_source_edit_help_card">"카드 유효 기간 또는 다른 카드 정보를 수정하려면 '새 결제 추가하기' 버튼을 사용하세요."</string>
     <string name="payment_source_edit_help_paypal">PayPal 결제 정보를 수정하려면, [PayPal.com](%1$s)을 방문하세요.</string>
-    <string name="payment_source_edit_saved">결제 정보</string>
-    <string name="payment_source_edit_title">결제 방식</string>
     <string name="payment_source_expiration_date">만료일</string>
     <string name="payment_source_information">결제 정보</string>
     <string name="payment_source_invalid">유효하지 않은 결제 수단</string>
@@ -2736,7 +2646,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="pl">폴란드어</string>
     <string name="platform_android_version">안드로이드 v16 이상</string>
     <string name="platform_ios_version">Apple iOS 8 이상</string>
-    <string name="play_full_video">예고편 전체 재생하기</string>
     <string name="playing_game">**%1$s** 하는 중</string>
     <string name="popout_player">팝업창</string>
     <string name="popout_remove_from_top">맨 위에서 제거하기</string>
@@ -2745,21 +2654,11 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="post_code">우편번호</string>
     <string name="premium_activated">Nitro가 활성화됐어요</string>
     <string name="premium_alert_error_title">이런, 무언가가 잘못되었어요…</string>
-    <string name="premium_applications_grandfathered_monthly">Discord에 아낌없는 애정을 보여주신 것에 감사드리는 의미로, 1년 Nitro 게임 이용권을 드려요. 이 이용권은 **%1$s**에 만료돼요.</string>
-    <string name="premium_applications_grandfathered_yearly">Discord에 아낌없는 애정을 보여주신 것에 감사드리는 의미로, 2년 Nitro 게임 이용권을 드려요. 이 이용권은 **%1$s**에 만료돼요.</string>
-    <string name="premium_applications_subtitle">친구들과 함께 인기 게임들을 무제한으로 이용해 보세요. 게임은 추가될 예정이에요.</string>
-    <string name="premium_applications_title">수십 개의 엄선된 게임을 저렴한 월정액으로 즐겨보세요.</string>
     <string name="premium_badge_tooltip">구독 시작 날짜: %1$s</string>
     <string name="premium_cancel_cancel">아니요</string>
     <string name="premium_cancel_confirm_body_tier_1">"취소는 현재 청구 기간 최종일인 **%1$s**에 실행돼요. Discord Tag를 변경했다면 태그는 무작위로 정해져요.
 
 구독은 언제든 재시작할 수 있어요."</string>
-    <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">취소는 현재 청구 기간 최종일인 **%1$s**에 실행됩니다. Discord 태그를 변경했다면 태그는 무작위로 정해집니다.구독은 언제든 재시작할 수 있습니다.</string>
-    <string name="premium_cancel_confirm_body_tier_2">"취소는 현재 청구 기간 최종일인 **%1$s**에 실행돼요. 라이브러리에 있는 모든 Nitro 게임을 이용할 수 없게 돼요. Discord Tag를 변경했다면 태그는 무작위로 정해져요.
-
-혹시 마음을 바꿀 수도 있으니 세이브 파일을 안전하게 보관하고 있겠어요. 구독은 언제든 재시작할 수 있어요!"</string>
-    <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">취소는 현재 청구 기간 최종일인 **%1$s**에 실행됩니다. 라이브러리에 있는 모든 Nitro 게임을 이용할 수 없게 됩니다. Discord 태그를 변경했다면 태그는 무작위로 정해집니다.혹시 마음을 바꿀 수도 있으니 세이브 파일을 안전하게 보관하고 있겠습니다. 구독은 언제든 재시작할 수 있습니다!</string>
-    <string name="premium_cancel_confirm_mobile">네, Nitro를 취소할래요</string>
     <string name="premium_cancel_confirm_new">네, %1$s 구독을 취소할래요</string>
     <string name="premium_cancel_confirm_title">%1$s 플랜을 취소할까요?</string>
     <string name="premium_cancel_failed_body">Nitro 구독을 취소하지 못했어요. 다시 시도해 보시거나 이 문제가 지속된다면 지원팀에 문의해 주세요.</string>
@@ -2772,30 +2671,20 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="premium_change_discriminator_tooltip">태그를 바꾸고 싶으세요? Nitro에 가입하세요!</string>
     <string name="premium_change_discriminator_zero_error">이 태그는 올바르지 않아요. 태그는 0보다 큰 숫자여야 해요.</string>
     <string name="premium_chat_perks_custom_emoji_mobile">사용자 지정 이모지를 모든 서버에서 사용하세요.</string>
-    <string name="premium_chat_perks_description_animated_avatar_and_emoji">GIF 파일을 업로드해 움직이는 아바타와 이모티콘을 이용하세요.</string>
-    <string name="premium_chat_perks_description_badge">Discord를 얼마나 오래 지원했는지 특별 프로필 배지로 보여주세요.</string>
-    <string name="premium_chat_perks_description_custom_emoji">세계 여권 이모티콘을 어디에서나 사용하기.</string>
     <string name="premium_chat_perks_description_discriminator">Nitro를 구독하는 동안 사용할 태그 선택하기.</string>
-    <string name="premium_chat_perks_description_screenshare">화면 공유를 720p 60fps나 1080p 30fps로 업그레이드하세요.</string>
-    <string name="premium_chat_perks_description_upload_limit">고퀄의 짤을 나눌 수 있도록 파일 크기 제한이 %1$s에서 %2$s으로 증가.</string>
+    <string name="premium_chat_perks_streaming_mobile">Go Live 품질 상승: Nitro는 소스 품질, Nitro Classic은 최대 1080p 60FPS로 방송할 수 있어요.</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">움직이는 아바타 아이콘</string>
     <string name="premium_chat_perks_title_badge">Discord Nitro의 멤버만의 배지도 받으세요!</string>
     <string name="premium_chat_perks_title_custom_emoji">사용자 지정 이모티콘</string>
     <string name="premium_chat_perks_title_discriminator">사용자 지정 Discord Tag</string>
     <string name="premium_chat_perks_title_screenshare">고품질 동영상</string>
-    <string name="premium_chat_perks_title_upload_limit">업로드 제한 부스트</string>
+    <string name="premium_chat_perks_title_streaming">Go Live 품질 상승</string>
     <string name="premium_code_redemption_confirmation_blurb">코드를 입력해 주셔서 감사합니다. 이제 향상된 채팅 특전을 %1$s 동안 이용하실 수 있어요!</string>
     <string name="premium_code_redemption_confirmation_button">완료!</string>
-    <string name="premium_feature_new_chat_perks_header">향상된 채팅 특전:</string>
-    <string name="premium_feature_new_premium_applications_header">%1$s 상당의 게임이 포함되어 있어요. 게임 목록:</string>
-    <string name="premium_feature_view_applications">모든 Nitro 게임 보기</string>
     <string name="premium_features_chat_perks">채팅 특전</string>
-    <string name="premium_features_premium_applications">무료 게임</string>
-    <string name="premium_features_premium_applications_mobile">무료 게임과 게임 특전이에요.</string>
     <string name="premium_grandfathered_warning">저희를 지원해주신 것에 대한 감사의 표시로 Nitro 플랜을 할인해드릴게요. **현재 플랜을 취소하거나 변경하면 할인을 받지 못해요.** 분명히 경고했어요!!!!!</string>
     <string name="premium_grandfathered_warning_confirm">그래도 진행하기</string>
     <string name="premium_grandfathered_warning_title">친구, 조심하게</string>
-    <string name="premium_guild_subscribe_search_guild_placeholder">서버 검색 중</string>
     <string name="premium_guild_subscribe_select_guild_header">서버 선택하기</string>
     <string name="premium_guild_subscription_select_server_button">서버 선택하기</string>
     <string name="premium_included">Nitro에 포함되는 혜택:</string>
@@ -2805,13 +2694,9 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="premium_not_claimed">먼저 계정을 등록하세요</string>
     <string name="premium_not_claimed_body">반가워요! Nitro를 구매하려면 계정을 먼저 인증해야 해요. 그래야 구매 내역을 안전하게 보관할 수 있어요.</string>
     <string name="premium_not_verified">이메일을 먼저 인증하세요</string>
-    <string name="premium_not_verified_body">반가워요! Nitro를 구입하려면 이메일을 먼저 인증해야 합니다. 이메일을 확인하거나 인증을 재요청하세요.</string>
     <string name="premium_past_due">구독이 연체되었어요. 결제 정보를 추가하거나 업데이트하지 않으면 구독이 **%1$s**에 종료돼요.</string>
-    <string name="premium_payment_applications_os_warning">Nitro 게임은 Windows에서만 지원돼요.</string>
     <string name="premium_payment_confirmation_blurb_iap">이제 Nitro 구독을 통해서 %1$s(을)를 등록할 수 있어요. 어서 해보죠!!!</string>
     <string name="premium_payment_confirmation_blurb_regular">향상된 채팅 특전들을 누려보세요. 지금 당장!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">이제 정말 많은 게임들을 무제한으로 즐길 수 있어요. 이걸 읽을 게 아니라 당장 게임을 하러 가세요!!!</string>
-    <string name="premium_payment_confirmation_button_iap">%1$s 구독하기</string>
     <string name="premium_payment_confirmation_button_regular">좋아요</string>
     <string name="premium_payment_select">선택하기</string>
     <string name="premium_plan_month">Nitro 월정액</string>
@@ -2820,7 +2705,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="premium_plan_year">Nitro 연정액</string>
     <string name="premium_plan_year_tier_1">Nitro Classic 연정액</string>
     <string name="premium_plan_year_tier_2">Nitro 연정액</string>
-    <string name="premium_promo_autocomplete">사용자 지정 이모티콘을 어디에서나 사용하세요</string>
     <string name="premium_promo_description">움직이는 이모티콘와 사용자 지정 이모티콘을 Discord Nitro를 통해 아무 서버에서나 이용하세요.</string>
     <string name="premium_promo_title">더 많은 이모티콘 혜택을 누리고 싶은가요?</string>
     <string name="premium_required">Nitro가 필요해요</string>
@@ -2844,19 +2728,13 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="premium_upgrade_confirm_button">업그레이드</string>
     <string name="premium_upgrade_confirm_title">%1$s 플랜으로 업그레이드</string>
     <string name="premium_upgrade_disabled_current_tooltip">현재 사용 중인 플랜.</string>
-    <string name="premium_upgrade_disabled_lower_tier_tooltip">낮은 단계의 구독 플랜을 선택하기 전 현재 구독 플랜을 취소한 뒤 만료일까지 기다려야 합니다.</string>
     <string name="premium_upgrade_done_body_tier_1">이제 향상된 채팅 특전을 누려보세요!</string>
-    <string name="premium_upgrade_done_body_tier_2">이제 향상된 채팅 특전과 수십 개의 게임을 이용해 보세요!</string>
     <string name="premium_upgrade_done_button_tier_1">좋아요!</string>
-    <string name="premium_upgrade_done_button_tier_2">모든 Nitro 게임 확인하기</string>
     <string name="premium_upgrade_failed_body">어… 업그레이드가 실패했어요. 결제 정보를 올바로 입력했는지 확인하고 다시 시도해 주세요.</string>
     <string name="premium_upgrade_required_body">잠시만요! 이 혜택을 얻으려면 Nitro가 필요해요. Nitro Classic을 보유하고 있어요.</string>
     <string name="premium_upload_promo">업로드 파일 크기 제한을 %1$s(으)로 늘리고 싶다면 Discord Nitro로 업그레이드하세요.</string>
     <string name="premium_upsell_emoji_description_mobile">움직이는 이모지와 사용자 지정 이모지를 **Discord Nitro**를 통해 아무 서버에서나 이용하세요.</string>
-    <string name="premium_upsell_emoji_passive_mobile">더 많은 이모지 혜택을 누리고 싶은가요?</string>
-    <string name="premium_upsell_upload_active_mobile">파일이 너무 크고 아름답습니다</string>
     <string name="premium_year_free_months">2개월 무료!</string>
-    <string name="premium_year_free_months_short">2개월 무료</string>
     <string name="premium_year_subscription">연간 **%1$s%2$s%3$s**</string>
     <string name="preorder_sku_name">%1$s (예약 구매)</string>
     <string name="preview_chat">채팅 미리 보기</string>
@@ -2885,7 +2763,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="ptt_permission_body">"%1$s을(를) 관리자 권한으로 실행하셨네요. Discord를 관리자 권한으로 다시 시작해야만
 게임에서 눌러서 말하기를 감지할 수 있어요."</string>
     <string name="ptt_permission_title">눌러서 말하기를 사용하려면 관리자 권한이 필요해요</string>
-    <string name="publish_followed_news_generic_body">뭔가 잘못됐습니다.</string>
     <string name="quick_dm_blocked">차단한 사용자에게는 메시지를 전송할 수 없어요</string>
     <string name="quick_dm_user">\@%1$s 님에게 메시지 보내기</string>
     <string name="quick_launcher_empty_text">Discord가 이 컴퓨터에서 최근 플레이한 게임을 빠르게 실행해드려요. 게임을 실행해서 여기에 표시되는지 확인해 보세요!</string>
@@ -2981,8 +2858,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="reset_password_title">비밀번호 변경하기</string>
     <string name="reset_to_default">기본값으로 재설정하기</string>
     <string name="reset_voice_settings">음성 설정 초기화</string>
-    <string name="reset_voice_settings_body">"음성 설정을 새로 바꾸면 모든 로컬 음량과 음소거 설정이 초기화돼요.
-그래도 이 작업을 계속하시겠어요?"</string>
     <string name="resubscribe">재구독</string>
     <string name="retry">다시 시도</string>
     <string name="return_to_login">로그인으로 돌아가기</string>
@@ -3027,7 +2902,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="save">저장</string>
     <string name="save_changes">변경사항 저장하기</string>
     <string name="save_media_failure_help_mobile">시스템 네트워크와 사진 앱의 개인정보 설정을 확인해 보세요.</string>
-    <string name="save_media_success_mobile">저장</string>
     <string name="save_new_url">새 URL 저장하기</string>
     <string name="scope_activities_read">활동 피드 액세스</string>
     <string name="scope_activities_read_description">"앱에서 활동 피드의 '플레이 중'과 '최근 플레이한 게임' 섹션의 정보를 읽을 수 있어요."</string>
@@ -3117,7 +2991,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="search_for_emoji">딱 맞는 이모티콘 찾기</string>
     <string name="search_for_empty">검색하기</string>
     <string name="search_for_value">검색: **%1$s**</string>
-    <string name="search_from_suggestions">검색: %1$s</string>
     <string name="search_group_header_channels">채널 내</string>
     <string name="search_group_header_dates">날짜</string>
     <string name="search_group_header_file_name">파일명에 다음의 키워드를 포함:</string>
@@ -3154,16 +3027,14 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="select">선택하기</string>
     <string name="select_channel_or_category">채널 또는 카테고리를 선택하기…</string>
     <string name="select_sort_mode">분류 모드 선택하기</string>
-    <string name="self_deafened">본인이 음소거함</string>
+    <string name="self_deafened">본인이 헤드셋 음소거함</string>
     <string name="self_deny_permission_body">"**%1$s** 님의 권한을 제한하면 당신의 권한도 제한되므로 이 권한을 제한할 수 없어요. 다른 역할을 부여하거나
 직접 역할을 부여받은 후 다시 시도해 주세요."</string>
     <string name="self_deny_permission_title">실수로 누르신 거죠?</string>
-    <string name="self_muted">자체 음소거</string>
+    <string name="self_muted">자체 마이크 음소거</string>
     <string name="self_xss_header">잠깐만요!</string>
-    <string name="self_xss_line_1">누가 속일려고 복사/붙여넣기하라고 하는것 같은데…조심하세요.</string>
     <string name="self_xss_line_2">아무거나 여기에 붙여넣기하면 원하지 않는 외부 사람에게 Discord 계정 액세스 권한을 넘겨 주게 될 수도 있어요!</string>
     <string name="self_xss_line_3">지금 뭘 하는 건지 확실히 아는 게 아니라면, 그냥 안전하게 가만히 있으세요…</string>
-    <string name="self_xss_line_4">지금 뭘 하는 건지 확실히 아는 거라면, 우리 회사에 당장 입사하는건 어때요? %1$s</string>
     <string name="send">보내기</string>
     <string name="send_dm">메시지 보내기</string>
     <string name="send_message">메시지 보내기</string>
@@ -3172,12 +3043,11 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="send_tts_messages">TTS 메시지 보내기</string>
     <string name="send_tts_messages_description">"이 권한을 가진 멤버는 /tts 명령어를 사용해 텍스트 음성 변환(TTS) 메시지를 보낼 수 있어요. 음성 메시지는
 채널을 보고 있는 모든 사람에게 전달돼요."</string>
-    <string name="server_deafen">서버 음소거</string>
-    <string name="server_deafened">서버에서 음소거함</string>
-    <string name="server_desciption_empty">귀하의 서버에 대해 간단하게 설명해 주세요.</string>
+    <string name="server_deafen">서버 헤드셋 음소거</string>
+    <string name="server_deafened">서버에서 헤드셋 음소거함</string>
     <string name="server_emoji">서버 이모티콘</string>
     <string name="server_mute">서버 소리 끄기</string>
-    <string name="server_mute_dms">개인 메시지 소리 끄기</string>
+    <string name="server_mute_dms">개인 메시지 알림 끄기</string>
     <string name="server_muted">서버에서 마이크 끔</string>
     <string name="server_name_required">서버 이름을 입력해 주세요.</string>
     <string name="server_notification">서버 알림</string>
@@ -3188,14 +3058,13 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="server_settings_updated">서버 설정이 변경되었어요.</string>
     <string name="server_sort">%1$s 정렬하기</string>
     <string name="server_status">서버 상태</string>
-    <string name="server_undeafen">서버 음소거 해제하기</string>
+    <string name="server_undeafen">서버 헤드셋 음소거 해제하기</string>
     <string name="server_unmute">서버 소리 켜기</string>
-    <string name="server_voice_mute">서버 음성 끄기</string>
-    <string name="server_voice_unmute">서버 음성 켜기</string>
+    <string name="server_voice_mute">서버 마이크 음소거</string>
+    <string name="server_voice_unmute">서버 마이크 음소거 해제하기</string>
     <string name="servers">서버</string>
     <string name="servers_management_title">서버 정렬 및 관리하기</string>
     <string name="service_connections_disconnect">연결 끊기</string>
-    <string name="set_debug_logging">디버그 로그 설정 변경하기</string>
     <string name="set_debug_logging_body">"디버그 로그 설정을 변경하려면 Discord를 재시작해야 해요.
 그래도 이 작업을 계속 하시겠어요?"</string>
     <string name="set_invite_link_never_expire">이 링크를 만료되지 않도록 하기</string>
@@ -3239,7 +3108,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="settings_sync">클라이언트 간 동기화하기.</string>
     <string name="settings_webhooks_empty_body">웹후크를 생성하기.</string>
     <string name="settings_webhooks_empty_title">웹후크 없음</string>
-    <string name="settings_webhooks_intro">Webhook은 자동화된 메시지와 데이터 업데이트를 서버의 채팅 채널로 바로 보낼 수 있는 쉽고 간편한 기능이랍니다. [자세히 알아보기](%1$s)</string>
     <string name="setup">설정</string>
     <string name="setup_vanity_url">고유 URL 설정하기</string>
     <string name="several_users_typing">여러 사람이 입력하고 있어요…</string>
@@ -3257,28 +3125,26 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="show_current_game">현재 플레이 중인 게임 이름을 상태 메시지에 표시하기.</string>
     <string name="show_current_game_desc">이 기능은 PC나 특정 파트너 플랫폼에서 게임할 때만 사용할 수 있어요.</string>
     <string name="show_muted">%1$s 음소거를 표시</string>
-    <string name="show_muted_channels">소리 꺼진 채널 표시</string>
+    <string name="show_muted_channels">알림 끈 채널 표시하기</string>
     <string name="show_spoiler_always">항상</string>
     <string name="show_spoiler_content">스포일러 콘텐츠 보이기</string>
     <string name="show_spoiler_content_help">스포일러 콘텐츠가 보이는 방법을 설정해요.</string>
     <string name="show_spoiler_on_click">클릭으로 설정</string>
     <string name="show_spoiler_on_servers_i_mod">서버에서 관리하겠어요</string>
     <string name="skip">건너뛰기</string>
-    <string name="skip_all_tips">팁 건너뛰기</string>
     <string name="sort">정렬</string>
     <string name="sorting">분류 중</string>
     <string name="sorting_channels">채널 분류 중</string>
-    <string name="sound_deafen">음소거</string>
+    <string name="sound_deafen">헤드셋 음소거</string>
     <string name="sound_incoming_ring">수신음</string>
     <string name="sound_message">메시지</string>
-    <string name="sound_mute">음소거</string>
     <string name="sound_outgoing_ring">발신음</string>
     <string name="sound_ptt_activate">눌러서 말하기 활성화</string>
     <string name="sound_ptt_deactivate">눌러서 말하기 비활성화</string>
     <string name="sound_stream_started">방송 시작됨</string>
     <string name="sound_stream_stopped">방송 중지됨</string>
-    <string name="sound_undeafen">음소거 해제하기</string>
-    <string name="sound_unmute">음소거 해제</string>
+    <string name="sound_undeafen">헤드셋 음소거 해제하기</string>
+    <string name="sound_unmute">마이크 음소거 해제</string>
     <string name="sound_user_join">사용자 참가</string>
     <string name="sound_user_leave">사용자 퇴장</string>
     <string name="sound_user_moved">사용자 이동됨</string>
@@ -3341,7 +3207,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="stream_capture_paused_details">계속하려면 게임으로 돌아가세요.</string>
     <string name="stream_capture_paused_details_viewer">%1$s 님이 게임을 최소화했어요… 잠시 기다리세요!</string>
     <string name="stream_channel_description">이 권한을 가지고 있는 멤버가 이 채널로 방송을 시작할 수 있어요.</string>
-    <string name="stream_description">이 권한을 가지고 있는 멤버가 채널에서 실행할 수 있어요.</string>
     <string name="stream_ended">이 방송은 종료됐어요. *귀뚜라미 소리*</string>
     <string name="stream_ended_button">방송 종료</string>
     <string name="stream_ended_no_spectators">방송이 종료되어 관전자가 없어요.</string>
@@ -3381,7 +3246,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="stream_report_rating_body_streamer">방송 경험에 대해 알려주세요.</string>
     <string name="stream_report_submit">전송</string>
     <string name="stream_reported">피드백 전송됨</string>
-    <string name="stream_reported_body">문제를 신고해 주셔서 감사합니다! 피드백은 방송 품질 개선에 큰 도움이 된답니다.</string>
     <string name="stream_soundshare_failed">문제가 생겨 게임에서 사운드를 송출할 수 없어요.</string>
     <string name="streamer_mode">방송 모드</string>
     <string name="streamer_mode_enabled">방송 모드 활성화됨</string>
@@ -3479,8 +3343,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
 접속 종료 시 추방돼요."</string>
     <string name="terms_of_service">[서비스 이용 약관](%1$s)</string>
     <string name="terms_privacy">등록하는 순간 Discord의 [서비스 이용 약관](%1$s)와 [개인정보 보호 정책](%2$s)에 동의하게 됩니다.</string>
-    <string name="terms_privacy_opt_in">Discord의 [서비스 이용 약관](%1$s)과 [개인정보 보호 정책](%2$s)을 읽었으며 동의해요.</string>
-    <string name="terms_privacy_opt_in_tooltip">계속하려면 서비스 이용 약관에 동의해야 해요</string>
     <string name="test_video">영상 테스트</string>
     <string name="text">문자</string>
     <string name="text_and_images">텍스트 및 사진</string>
@@ -3513,7 +3375,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="tr">터키어</string>
     <string name="transfer">전송</string>
     <string name="transfer_ownership">소유권 이전하기</string>
-    <string name="transfer_ownership_acknowledge">이 서버의 소유권을 **%1$s** 님에게 이전하는 데 동의해요.</string>
     <string name="transfer_ownership_to_user">%1$s 님에게 소유권 이전하기</string>
     <string name="try_again">다시 시도하기</string>
     <string name="tts_alls">모든 채널</string>
@@ -3568,7 +3429,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="two_fa_success_body_mobile">귀하의 Discord 계정이 이제 다중 보호돼요</string>
     <string name="two_fa_success_header">2단계 인증이 활성화 되었어요! 짠!</string>
     <string name="two_fa_token_required">유효한 Discord 인증 코드가 필요해요.</string>
-    <string name="two_fa_use_desktop_app">현재 브라우저에서는 2단계 인증을 활성화할 수 없어요. DiscordPC 앱을 이용해 주세요.</string>
     <string name="two_fa_view_backup_codes">복구 코드 보기</string>
     <string name="two_fa_view_codes">코드 보기</string>
     <string name="two_users_typing">**%1$s** 님과 **%2$s** 님이 입력하고 있어요…</string>
@@ -3586,7 +3446,7 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
 
 **앱을 다운로드**하려면 등록된 계정이 필요해요."</string>
     <string name="unclaimed_account_title">미등록 계정</string>
-    <string name="undeafen">음소거 해제하기</string>
+    <string name="undeafen">헤드셋 음소거 해제하기</string>
     <string name="unfocus_participant">원래대로</string>
     <string name="unhandled_link_body">죄송합니다. 이 링크를 열 수 있는 애플리케이션이 설치되지 않았어요:</string>
     <string name="unhandled_link_title">처리되지 않은 링크</string>
@@ -3594,8 +3454,8 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="unknown_game">알 수 없는 게임</string>
     <string name="unknown_region">알 수 없는 지역</string>
     <string name="unknown_server">알 수 없는 서버</string>
-    <string name="unmute">음소거 해제</string>
-    <string name="unmute_category">카테고리 소리 켜기</string>
+    <string name="unmute">마이크 음소거 해제하기</string>
+    <string name="unmute_category">카테고리 알림 켜기</string>
     <string name="unnamed">이름 없음</string>
     <string name="unpin">고정 해제</string>
     <string name="unpin_confirm">네, 해제해 주세요.</string>
@@ -3609,8 +3469,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="unsupported_browser">지원되지 않는 브라우저</string>
     <string name="unsupported_browser_body">"지원되지 않는 브라우저를 사용하고 계신 것 같네요. 브라우저를 업그레이드하거나 앱을 받아야
 Discord에서 제공하는 기능을 즐길 수 있어요."</string>
-    <string name="unsupported_browser_details">"팀과 이야기하고 싶으신 거죠? 최신 버전의 Chrome, Opera, Firefox 38+로 바꾸거나
-Discord 클라이언트를 받아 지금 바로 대화를 시작하세요!"</string>
     <string name="unsupported_browser_title">음, 이건 영 좋지 않네요</string>
     <string name="unverified_account_body">"이메일을 확인하여 설명을 따라 인증해 주세요.
 
@@ -3649,7 +3507,6 @@ Shift 키를 누른 상태로 놓으면 바로 올릴 수 있어요."</string>
     <string name="usage_statistics_disable_modal_cancel">아니요, 돌아갈래요!</string>
     <string name="usage_statistics_disable_modal_confirm">네, 확실해요</string>
     <string name="usage_statistics_disable_modal_title">사용량 통계를 끄시겠어요?</string>
-    <string name="use_external_emojis">외부 이모티콘 사용</string>
     <string name="use_external_emojis_description">이 권한을 가진 멤버는 다른 서버에 있는 이모티콘을 이 서버에서 사용하실 수 있어요.</string>
     <string name="use_vad">음성 감지 사용</string>
     <string name="use_vad_description">이 권한이 허용되지 않는 경우 이 채널에서 눌러서 말하기를 사용해야 해요.</string>
@@ -3733,8 +3590,6 @@ Shift 키를 누른 상태로 놓으면 바로 올릴 수 있어요."</string>
     <string name="user_settings_appearance_preview_message_4">기다리고 있어요</string>
     <string name="user_settings_appearance_preview_message_5">아, 여기 있네요!</string>
     <string name="user_settings_appearance_zoom_tip">%1$s +/-로 확대/축소 수준을 조절할 수 있고, %1$s+0으로 기본 확대/축소 값으로 돌아갈 수 있어요.</string>
-    <string name="user_settings_apperannce_disable_games_tab">활동 탭 표시</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">이 설정을 끄면 활동 탭을 숨기고 대화에 집중할 수 있습니다.</string>
     <string name="user_settings_available_codes">복구 코드 사용 가능</string>
     <string name="user_settings_close_button">닫기 버튼</string>
     <string name="user_settings_confirm_logout">정말로 로그아웃하시겠어요?</string>
@@ -3802,8 +3657,6 @@ Shift 키를 누른 상태로 놓으면 바로 올릴 수 있어요."</string>
     <string name="vanity_url_help">"고유 URL로 서버 접속을 더 손쉽게 만들어 보세요.
 주의: 모르는 사람들에게는 URL을 노출하지 마세요."</string>
     <string name="vanity_url_help_conflict">고유 URL을 악용하거나 지적 재산 침해가 발생한다면 고유 URL이 압수될 수도 있어요.</string>
-    <string name="vanity_url_help_extended">**%1$s** 주소를 통하여 모든 사람들이 이 서버에 액세스할 수 있습니다</string>
-    <string name="vanity_url_help_extended_link">%1$s]%2$s 주소를 통하여 모든 사람들이 이 서버에 액세스할 수 있습니다</string>
     <string name="vanity_url_hint_mobile">당신의-url-이에요</string>
     <string name="verfication_expired">이메일 인증 링크가 만료되었어요.</string>
     <string name="verfication_expired_suggestion">Discord에 로그인해서 링크를 다시 보내 보세요.</string>
@@ -3831,7 +3684,6 @@ Discord를 계속 이용하려면 **계정을 인증해야 해요.**"</string>
     <string name="verification_title">여기 무슨 일이 벌어지고 있는 것 같은데요</string>
     <string name="verification_verified">이메일 인증 완료!</string>
     <string name="verification_verifying">이메일 인증 중</string>
-    <string name="verify">인증</string>
     <string name="verify_account">계정 인증</string>
     <string name="verify_by">인증 방법</string>
     <string name="verify_by_email">이메일로 인증하기</string>
@@ -3872,7 +3724,6 @@ Discord를 계속 이용하려면 **계정을 인증해야 해요.**"</string>
     <string name="voice_channel_show_names">이름 표시하기</string>
     <string name="voice_channels">음성 채널</string>
     <string name="voice_connect">음성</string>
-    <string name="voice_disconnect_body">이 음성 채널에서 나가시겠어요?</string>
     <string name="voice_disconnect_title">음성 채널 나가기</string>
     <string name="voice_only">음성 전용</string>
     <string name="voice_permissions">음성 권한</string>
@@ -3912,7 +3763,6 @@ Discord를 계속 이용하려면 **계정을 인증해야 해요.**"</string>
     <string name="webhook_save">저장</string>
     <string name="webhooks">웹후크</string>
     <string name="welcome_message_desktop_apps">**시스템 전반에서 눌러서 말하기를 사용하거나 CPU와 대역대를 적게 사용하는 등 더 많은 기능이 필요하다면 ** [PC 앱](onDownloadClick)을 받아보세요.</string>
-    <string name="welcome_message_instant_invite">**친구를 초대하고 싶다면** [공유 버튼](onShareClick)을 눌러보세요.</string>
     <string name="welcome_message_mobile_apps">**[스마트폰]**에서 앱을 다운로드하면(onDownloadClick) 밖에서나 콘슬 게임 중에도 Discord를 이용할 수 있어요.</string>
     <string name="welcome_message_mobile_instant_invite">친구 초대하기</string>
     <string name="welcome_message_mobile_instant_invite_desc">서버에는 친구들이 많을수록 좋죠. 친구들을 불러오세요!</string>
diff --git a/com.discord/res/values-lt/plurals.xml b/com.discord/res/values-lt/plurals.xml
index de3a6bad17..5de9b861e5 100644
--- a/com.discord/res/values-lt/plurals.xml
+++ b/com.discord/res/values-lt/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">nebėra laisvų vietų</item>
         <item quantity="one">%d vieta</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d dienas</item>
-        <item quantity="one">1 dieną</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d narius</item>
-        <item quantity="zero">0 narių</item>
-        <item quantity="one">1 narį</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">dienas</item>
         <item quantity="one">dieną</item>
@@ -212,16 +203,6 @@
         <item quantity="other">leidimus</item>
         <item quantity="one">leidimą</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Lėtasis režimas nustatytas **!!%d!! sekundėms**</item>
-        <item quantity="zero">I</item>
-        <item quantity="one">Lėtasis režimas išjungtas **Lėtasis režimas nustatytas**1 sekundei</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Nustatyti lėtąjį režimą **!!%d!! sekundėms**</item>
-        <item quantity="zero">Išjungti lėtąjį režimą</item>
-        <item quantity="one">Nustatyti lėtąjį režimą **1 sekundei**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! narius**</item>
         <item quantity="one">**narį**</item>
@@ -290,10 +271,6 @@
         <item quantity="other">%d dienas(-ų)</item>
         <item quantity="one">1 dieną</item>
     </plurals>
-    <plurals name="live_viewers_viewers">
-        <item quantity="other">stebėtojai</item>
-        <item quantity="one">stebėtojas</item>
-    </plurals>
     <plurals name="max_uses_description_mobile_maxUses">
         <item quantity="other">%d panaudojimai</item>
         <item quantity="zero">neriboti panaudojimai</item>
@@ -321,10 +298,6 @@
         <item quantity="other">%d nauji pranešimai</item>
         <item quantity="one">1 naujas pranešimas</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d dienų</item>
-        <item quantity="one">viena diena</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d kanalus</item>
         <item quantity="one">%d kanalo</item>
@@ -342,10 +315,6 @@
         <item quantity="other">šias žinutes</item>
         <item quantity="one">šią žinute</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** serveriai nepasiekiami dėl laikinų gedimų.</item>
-        <item quantity="one">**1** serveris nepasiekiamas dėl laikinų gedimų.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d mėnesių</item>
         <item quantity="one">1 mėnesiui</item>
diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml
index 71e5d6dde0..924f945fd3 100644
--- a/com.discord/res/values-lt/strings.xml
+++ b/com.discord/res/values-lt/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"Negali siųsti pakvietimo, nes esi nematomas arba slepi savo žaidimo būseną. Jei nenori keisti
 savo nustatymų, paprašyk, kad tave pakviestų kitas asmuo."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Supratau!</string>
-    <string name="activity_panel_go_live_hotspot_header">Įsijunkite Translacijos pradžia ir transliuokite žaidimą tiesiai savo draugams!</string>
+    <string name="activity_panel_go_live_hotspot_header">Naudok Go Live ir tiesiogiai transliuok žaidimą draugams!</string>
     <string name="activity_panel_go_live_tooltip">Transliacijos pradžia</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Šiame serveryje nėra balso kanalų, į kuriuos galima transliuoti.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Jūs negalite transliuoti šiame balso kanale.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Eik į serverį, kad pradėtum transliuoti.</string>
     <string name="add">Pridėti</string>
     <string name="add_a_comment_optional">Rašyti komentarą (pasirinktinai)</string>
@@ -159,7 +157,6 @@ teisę atsakingai."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Įsigijai!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Eiti į biblioteką</string>
     <string name="application_entitlement_code_redemption_invalid">Įvestas neteisingas kodas</string>
-    <string name="application_entitlement_code_redemption_prompt">Gavai žaidimo kodą? Įvesk apačioje:</string>
     <string name="application_entitlement_code_redemption_redeem">Panaudok</string>
     <string name="application_filter_name_linux">Visi failai</string>
     <string name="application_filter_name_macos">Programos</string>
@@ -407,7 +404,6 @@ teisę atsakingai."</string>
     <string name="application_store_view_all_news">Peržiūrėti visas naujienas</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Kad galėtum žaisti šį DLC, Discord reikia turėti %1$s. [Sužinok apie DLC.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Reikiamas atsisiųsti turinys</string>
-    <string name="application_store_warning_early_access_description">Šis žaidimas yra smagus (tikrai taip manome!), bet jo turinys gali būti ribotas, gali pasitaikyti klaidų arba atrodyti, kad jis yra nebaigtas. [Sužinok apie išankstinę prieigą.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Išankstinė prieiga</string>
     <string name="application_store_warning_requires_desktop_app_description">Kad galėtum žaisti šį žaidimą, turi būti įdiegta Discord $[kompiuterio programa](downloadHook).</string>
     <string name="application_store_warning_requires_desktop_app_title">Reikalinga kompiuterio programa</string>
@@ -530,7 +526,6 @@ bet jei turi tai padaryti, nedvejok!"</string>
     <string name="billing_error_section_address">O ne! Atrodo, kažkas negerai su šiuo adresu. Patikslink duomenis ir bandyk dar kartą!</string>
     <string name="billing_error_section_card">O ne! Atrodo, kažkas negerai su šia kortele. Patikslink duomenis ir bandyk dar kartą!</string>
     <string name="billing_history">Mokėjimų istorija</string>
-    <string name="billing_legal_mumbo_jumbo_label">Sutinku su [Discord Parduotuvės Naudojimo Sąlygos](%1$s)</string>
     <string name="billing_no_payment_method">Neįrašytas joks mokėjimo būdas</string>
     <string name="billing_no_payment_method_description">Įrašyk mokėjimo būdą ir apsipirk greičiau</string>
     <string name="billing_pay_for_it_with">Mokėk už tai Naudodamas</string>
@@ -538,12 +533,7 @@ bet jei turi tai padaryti, nedvejok!"</string>
     <string name="billing_payment_breakdown_total">Iš viso</string>
     <string name="billing_payment_history">Operacijų istorija</string>
     <string name="billing_payment_premium">Tavo Prenumerata</string>
-    <string name="billing_payment_premium_legalese_monthly">Įsigydamas %1$s prenumeratą, sutinki su mūsų [Parduotuvės Naudojimo Sąlygos](%2$s). %1$s pratęsiama prenumerata. Įgalioji Discord nedelsiant nuskaityti mokestį %3$s nurodytu mokėjimo būdu ir toliau automatiškai tai daryti kas mėnesį, kol prenumeratą atšauksi. Atšaukti gali bet kuriuo metu.</string>
-    <string name="billing_payment_premium_legalese_yearly">Įsigydamas %1$s prenumeratą, sutinki su mūsų [Parduotuvės Naudojimo Sąlygos](%2$s). %1$s pratęsiama prenumerata. Įgalioji Discord nedelsiant nuskaityti mokestį %3$s nurodytu mokėjimo būdu ir toliau automatiškai tai daryti kasmet, kol prenumeratą atšauksi. Atšaukti gali bet kuriuo metu.</string>
     <string name="billing_payment_sources">Mokėjimo Būdai</string>
-    <string name="billing_payment_table_header_amount">SUMA</string>
-    <string name="billing_payment_table_header_date">DATA</string>
-    <string name="billing_payment_table_header_description">APRAŠAS</string>
     <string name="billing_premium_refund_text">Lėšų grąžinimo galima prašyti, jei pirkimas buvo atliktas per paskutinę (-es) %1$s d. [Mūsų paslaugūs pagalbos tarnybos darbuotojai padės susigrąžinti savo monetas.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Deja, šiam pirkimui lėšų grąžinimas negali būti taikomas. Lėšų grąžinimo galima prašyti, jei pirkimas buvo atliktas per paskutinę (-es) %1$s d.</string>
     <string name="billing_price_per_month">%1$s / Mėnesiui</string>
@@ -553,9 +543,7 @@ bet jei turi tai padaryti, nedvejok!"</string>
     <string name="billing_purchase_details_header">Pirkimo informacija</string>
     <string name="billing_refund_header">Kyla problemų pirkimo metu?</string>
     <string name="billing_refund_play_time_never_played">Niekada nežaista</string>
-    <string name="billing_refund_play_time_subheader">ŽAISTAS LAIKAS</string>
     <string name="billing_refund_purchase_date">Prieš %1$s</string>
-    <string name="billing_refund_purchase_date_subheader">PIRKIMO DATA</string>
     <string name="billing_refund_report_a_problem">Pranešti apie problemą</string>
     <string name="billing_refund_request_button">Prašyti lėšų grąžinimo</string>
     <string name="billing_sales_tax_added">%1$s prie tavo atsiskaitymo adreso buvo pridėtas mokėtinas pardavimo mokestis.</string>
@@ -840,7 +828,7 @@ mažytį užrašą apačioje."</string>
     <string name="create_category">Sukurti Kategoriją</string>
     <string name="create_channel">Sukurti kanalą</string>
     <string name="create_group_dm">Sukurti AŽ grupę</string>
-    <string name="create_instant_invite">Sukurti Greitąjį Pakvietimą</string>
+    <string name="create_instant_invite">Sukurti kvietimą</string>
     <string name="create_link">Kurti nuorodą</string>
     <string name="create_or_join_modal_header">Aha, dar vienas serveris, ar ne?</string>
     <string name="create_server_button_body">Sukurk naują serverį ir pakviesk savo draugus. Tai visiškai nemokama!</string>
@@ -954,7 +942,6 @@ mažytį užrašą apačioje."</string>
     <string name="disable_email_notifications_failed_suggestion">El. pašto pranešimai jau išjungti arba šis el. paštas jau nebesusijęs su Discord paskyra.</string>
     <string name="disable_integration_title">Išjungti sinchronizavimą</string>
     <string name="disable_integration_twitch_body">Išjungiant sinchronizaciją pasikeis pasirinkta pasibaigusi prenumerata tarsi visos būtų pasibaigusios.</string>
-    <string name="disable_integration_youtube_body">Išjungiant sinchronizaciją pasikeis pasirinktas pasibaigęs rėmėjo laikas tarsi visi būtų pasibaigę.</string>
     <string name="disable_notifications_description">Visi darbalaukio pranešimai bus išjungti.</string>
     <string name="disable_notifications_label">Išjungti pranešimus</string>
     <string name="disable_sounds_description">Visi garso efektai bus išjungti.</string>
@@ -970,7 +957,6 @@ mažytį užrašą apačioje."</string>
     <string name="discord_desc_long">Nemokama ir saugi komunikacija žaidėjams, veikia tavo mobiliajame telefone ir kompiuteryje.</string>
     <string name="discord_desc_short">Komandos balso ir teksto pokalbiai</string>
     <string name="dismiss">Atmesti</string>
-    <string name="dispatch_error_modal_body">Iškilo problema. Jei problema išlieka, sukurk palaikymo kvitą ir nukopijuok žemiau pateiktą pranešimą.</string>
     <string name="dispatch_error_modal_error_label">Klaidos pranešimas (nukopijuok ir įklijuok mane)</string>
     <string name="dispatch_error_modal_header">Discord Dispatch klaida</string>
     <string name="dispatch_error_modal_open_ticket">Sukurti kvitą</string>
@@ -1016,7 +1002,6 @@ mažytį užrašą apačioje."</string>
     <string name="edit_voice_channel_no_permission">Tu neturi teisių redaguoti šį balso kanalą.</string>
     <string name="editing_message">Redaguojama žinutė</string>
     <string name="el">Graikų</string>
-    <string name="elevated_permissions_sound_body">„Discord“ negali transliuoti žaidimo garso dėl trūkstamų leidimų. Suteikti „Discord“ administratoriaus leidimus, kad galėtum draugams nusiųsti nuostabiąsias garso bangas?</string>
     <string name="elevated_permissions_sound_no_sound_button">Transliuoti be garso</string>
     <string name="elevated_permissions_sound_request_access_button">Suteikti prieigą</string>
     <string name="elevated_permissions_sound_title">Garso leidimai</string>
@@ -1102,8 +1087,6 @@ AFK laiką. Tai neturi įtakos naršyklių naudotojams."</string>
     <string name="form_help_attenuation">"Sumažink kitos programėlės garsumą kalbant kitam. %% nurodo, kaip smarkiai programėlė bus
 nutildyta, 0%% išjungia šią funkciją."</string>
     <string name="form_help_automatic_vad">Jei rodiklis yra žalias, tai Discord transliuoja tavo nuostabų balsą.</string>
-    <string name="form_help_bitrate">"**VISUS BITUS! ** Viršyti %1$skbps nerekomenduojama, nebent esate audiofilas, nes tai neigiamai
-paveiks žmones, naudojančius mobiliuosius įrenginius arba prastus ryšius be pastebimos naudos."</string>
     <string name="form_help_certified_voice_processing">"Naudojant Discord sertifikuota mikrofoną tam tikros balso apdorojimo funkcijos nebėra tvarkomos Discord,
 bet paties mikrofono."</string>
     <string name="form_help_channel_permissions">Rolių parinkimas automatiškai sukonfigūruos pagrindines teises šiam kanalui.</string>
@@ -1116,11 +1099,6 @@ išsiųsta šiame serveryje arba ne. **Mes rekomenduojame nustatyti tik @paminė
 kiekvieną išsiųstą žinutę šiame serveryje, ar ne. Mes rekomenduojame nustatyti šį nustatymą ant @paminėjimai viešam Discord kanalui"</string>
     <string name="form_help_explicit_content_filter">"Automatiškai nuskenuoti ir ištrinti žinutes, išsiųstas šiame serveryje, kurių turinys yra nepadoraus pobūdžio. Pasirink, kaip plačiai
 filtras bus taikomas tavo serverio naudotojams. **Rekomenduojame nustatyti filtrą viešame serveryje.**"</string>
-    <string name="form_help_instant_invite_channel">"Jeigu kanalas pasirinktas, tada greitojo pakvietimo nuoroda bus sukurta su priedu,
-kitu atveju tik prisijungę nariai ir balso pokalbių kanalai bus pasiekiami."</string>
-    <string name="form_help_last_seen">"Apkarpymas nuspirs **%1$s**, kurie nebuvo aktyvūs
-per paskutinę (-es) **%2$s** ir nėra priskirti rolei.
-Jie gali iš naujo prisijungti prie serverio naudodami Naują Pakvietimą."</string>
     <string name="form_help_legacy_subsystem">"Tam tikros garso techninės įrangos tvarkyklės eksponuoja problemų naudojant tavo Operacinės Sistemos modernią garso posistemę.
 Pažymėk šį kvadratėlį, kad grįžtum į seną garso posistemę."</string>
     <string name="form_help_nsfw">"Naudotojai turės patvirtinti, kad jie yra pilnamečiai, norėdami peržiūrėti turinį šiame kanale. 
@@ -1130,7 +1108,6 @@ turi prieigą prie savo tinklalapio vartotojų, gali lengvai pridėti &amp;usern
     <string name="form_help_qos">"Patariama tavo maršrutizatoriui, kad paketai, kuriuos perduoda Discord, yra aukšto prioriteto.
 Kai kurie maršrutizatoriai ar interneto serviso teikėjai gali sutrikti, kai tai nustatyta."</string>
     <string name="form_help_slowmode">Nariai galės siųsti tik vieną pranešimą per šį intervalą, nebent jie turi leidimus Tvarkyti Kanalą arba Tvarkyti Pranešimus.</string>
-    <string name="form_help_system_channel">Nusiųsti žinutę į šį kanalą, kai kas nors prisijungia prie šio serverio. Žinutės yra atsitiktinės. Šitai bet kada galima išjungti.</string>
     <string name="form_help_temporary">Atsijungiant iš serverio nariai automatiškai išmetami, nebent jie turi priskirtą rolę.</string>
     <string name="form_help_user_limit">"Riboja, kiek naudotojų gali prisijungti į šį balso kanalą. Naudotojai su **Perkelti Narius** teise
 nepaisyk šios ribos ir galima perkelti kitus naudotojus į kanalą."</string>
@@ -1175,8 +1152,8 @@ inicijuoti asmeninio pranešimo pokalbį. Jei narys turi priskirtą vartotojo va
     <string name="form_label_input_mode">Įvesties Rėžimas</string>
     <string name="form_label_input_sensitivty">Įvesties Jautrumas</string>
     <string name="form_label_input_volume">Įvesties Garsumas</string>
-    <string name="form_label_instant_invite">Įvesk greitąjį pakvietimą</string>
-    <string name="form_label_instant_invite_channel">Greitojo Pakvietimo Kanalas</string>
+    <string name="form_label_instant_invite">Įvesk kvietimą</string>
+    <string name="form_label_instant_invite_channel">Kvietimo kanalas</string>
     <string name="form_label_last_seen">Paskutinį kartą matytas</string>
     <string name="form_label_local_mute">Lokalus Nutildymas</string>
     <string name="form_label_max_age">Baigsis Po</string>
@@ -1245,7 +1222,6 @@ inicijuoti asmeninio pranešimo pokalbį. Jei narys turi priskirtą vartotojo va
     <string name="form_label_suppress_everyone">Neleisti naudoti **@everyone** ir **@here**</string>
     <string name="form_label_synced_role">Sinchronizuota Rolė</string>
     <string name="form_label_synced_subs">Sinchronizuoti Prenumeratoriai</string>
-    <string name="form_label_system_channel">Naujų Narysčių Pranešimų Kanalas</string>
     <string name="form_label_temporary">Laikina Narystė</string>
     <string name="form_label_tts">Funkcija Text-to-Speech</string>
     <string name="form_label_tts_notifications">Tekstas-į-Kalbą Pranešimai</string>
@@ -1308,7 +1284,6 @@ programėlei Discord, norėdamas keisti įvesties jautrumą."</string>
     <string name="game_action_button_game_not_detected">Žaidimas neaptiktas</string>
     <string name="game_action_button_install">Įdiegti</string>
     <string name="game_action_button_locate">Rasti</string>
-    <string name="game_action_button_login_to_buy">Prisijungti ir pirkti</string>
     <string name="game_action_button_now_playing">Dabar žaidžia</string>
     <string name="game_action_button_paused">Pristabdyta</string>
     <string name="game_action_button_play">Žaisti</string>
@@ -1347,7 +1322,6 @@ programėlei Discord, norėdamas keisti įvesties jautrumą."</string>
     <string name="game_feed_activity_recently_played">Neseniai žaista</string>
     <string name="game_feed_activity_streaming_twitch">Transliuojama per Twitch</string>
     <string name="game_feed_current_header_title">Dabar žaidžia</string>
-    <string name="game_feed_settings_visibility">Rodyti Žaidimų Skirtuke</string>
     <string name="game_feed_unknown_player">Nežinomas Žaidėjas</string>
     <string name="game_feed_user_played_days_ago">Žaidė prieš %1$s %2$s</string>
     <string name="game_feed_user_played_hours_ago">Žaidė prieš %1$s %2$s</string>
@@ -1417,6 +1391,7 @@ programėlei Discord, norėdamas keisti įvesties jautrumą."</string>
     <string name="generate_a_new_link">Sukurti naują nuorodą</string>
     <string name="get_started">Pradžia</string>
     <string name="gif_auto_play_label">Automatiškai paleisit GIF, kai Discord yra atidarytas.</string>
+    <string name="go_live_hardware_acceleration_unavailable">Trumpa informacija: neaptikome aparatinio spartinimo. Tavo kompiuteriui gali kilti problemų, palaikant Go Live.</string>
     <string name="go_live_hey">Ei!</string>
     <string name="go_live_listen">Klausyk!</string>
     <string name="go_live_look">Žiūrėk!</string>
@@ -1430,6 +1405,7 @@ programėlei Discord, norėdamas keisti įvesties jautrumą."</string>
     <string name="go_live_modal_select_channel_form_title">Pasirinkite balso kanalą</string>
     <string name="go_live_modal_select_channel_placeholder">Ieškoti balso kanalų</string>
     <string name="go_live_modal_title">Transliacijos pradžia</string>
+    <string name="go_live_video_drivers_outdated">Tavo vaizdo tvarkyklės pasenusios. Atnaujink jas ir mėgaukis geresniu Go Live veikimu.</string>
     <string name="grant_temporary_membership">Suteikti laikiną narystę</string>
     <string name="group">Grupė</string>
     <string name="group_dm_add_friends">Pridėti Draugus į AŽ</string>
@@ -1506,8 +1482,6 @@ programėlei Discord, norėdamas keisti įvesties jautrumą."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Skyrė** %1$s vartotojui**%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Perkėlė iš **%1$s** į **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">Pozicijoje **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) sukūrė teksto kanalą $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Pakeitė temą į **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Pakeitė temą į **%1$s**</string>
@@ -1603,6 +1577,8 @@ programėlei Discord, norėdamas keisti įvesties jautrumą."</string>
     <string name="guild_settings_filter_all_actions">Visi Veiksmai</string>
     <string name="guild_settings_filter_all_users">Visus Naudotojus</string>
     <string name="guild_settings_filter_user">Filtruoti pagal naudotoją</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">720p 60 fps Go Live transliacijos</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">1080p 60 fps Go Live transliacijos</string>
     <string name="guild_settings_label_audit_log">Veiksmų Žurnalas</string>
     <string name="guild_settings_label_audit_log_empty_body">Kai moderatoriai pradės moderuoti, tu galėsi moderuoti moderavimą čia.</string>
     <string name="guild_settings_label_audit_log_empty_title">Žurnalų Kol Kas Nėra</string>
@@ -1634,7 +1610,7 @@ Jei turi priėjimą prie savo svetainės naudotojų, gali dinamiškai pridėti &
     <string name="help_role_locked_mine">Rolė užrakinta nes ji yra tavo aukščiausio rango rolė. Paklausk aukštesnio rango arba Serverio Savininko dėl pagalbos.</string>
     <string name="help_singular_permission">Tu negali keisti šios teisės, nes pašalinant ją, ji bus atimta iš tavęs.</string>
     <string name="hide_instant_invites_description">Rekomenduojama, jei nenori, kad atsitiktiniai žmonės turėtų prieigą prie tavo Discord serverių.</string>
-    <string name="hide_instant_invites_label">Slėpti greitųjų pakvietimų nuorodas</string>
+    <string name="hide_instant_invites_label">Slėpti kvietimų nuorodas</string>
     <string name="hide_muted">Slėpti %1$s nutildytus</string>
     <string name="hide_muted_channels">Paslėpti Prislopintus Kanalus</string>
     <string name="hide_personal_information_description">Slepia el. pašto adresą, prijungtas paskyras ir anonimizuoja DiscordTags.</string>
@@ -1681,7 +1657,6 @@ Jei turi priėjimą prie savo svetainės naudotojų, gali dinamiškai pridėti &
     <string name="hypesquad_question_11_response_d">Pasiūlysi, kad Wumpus pradėtų groti būgnu su žvangučiais</string>
     <string name="hypesquad_question_12_prompt">Užlipai į pačio aukščiausio kalno viršūnę. Vienintelis dalykas, skiriantis tave nuo turtų – tavo kelyje esantis trigalvis drakonas. Tu:</string>
     <string name="hypesquad_question_12_response_a">Veršiesi į mūšį</string>
-    <string name="hypesquad_question_12_response_b">Žiūri senus filmus apie Godzilą, kad pasimokytum iš jos kovų su King Ghidorah</string>
     <string name="hypesquad_question_12_response_c">Bandysi įtikinti drakoną, kad šis pasidalytų turtus</string>
     <string name="hypesquad_question_12_response_d">Pasiūlysi drakonui pliušinį Wumpus. Kas gali jo nenorėti?</string>
     <string name="hypesquad_question_13_prompt">Kas čia per garsas?</string>
@@ -1784,14 +1759,14 @@ Jei turi priėjimą prie savo svetainės naudotojų, gali dinamiškai pridėti &
     <string name="input_mode_ptt_release_delay">Funkcijos Push to talk aktyvumo laikas</string>
     <string name="input_mode_vad">Funkcija Voice Activity</string>
     <string name="install_location_main">Pagrindinis</string>
-    <string name="instant_invite">Greitasis Pakvietimas</string>
+    <string name="instant_invite">Kvietimas</string>
     <string name="instant_invite_accept">Priimti Pakvietimą</string>
-    <string name="instant_invite_accepted">Greitasis pakvietimas priimtas</string>
-    <string name="instant_invite_accepting">Priimamas greitasis pakvietimas</string>
+    <string name="instant_invite_accepted">Kvietimas priimtas</string>
+    <string name="instant_invite_accepting">Priimamas kvietimas</string>
     <string name="instant_invite_ask_for_new_invite">Prašykite naujo pakvietimo!</string>
     <string name="instant_invite_ask_user_for_new_invite">Prašykite %1$s naujo pakvietimo!</string>
     <string name="instant_invite_code">Kodas</string>
-    <string name="instant_invite_expired">Greitasis pakvietimas neteisingas arba baigėsi.</string>
+    <string name="instant_invite_expired">Kvietimas negalioja arba baigėsi jo galiojimas.</string>
     <string name="instant_invite_expires">Baigsis</string>
     <string name="instant_invite_failed_to_generate">Pakvietimo nuorodos sukurti nepavyko.</string>
     <string name="instant_invite_generate">Sukurti</string>
@@ -1809,16 +1784,15 @@ Jei turi priėjimą prie savo svetainės naudotojų, gali dinamiškai pridėti &
     <string name="instant_invite_regenerate">Atkurti</string>
     <string name="instant_invite_resolved_body">Tu buvai pakviestas į **%1$s** kanalą **%2$s** serveryje.</string>
     <string name="instant_invite_resolved_title">O, sveiki.</string>
-    <string name="instant_invite_resolving">Kuriamas greitasis pakvietimas</string>
+    <string name="instant_invite_resolving">Sprendžiamas kvietimas</string>
     <string name="instant_invite_uses">Naudojimų</string>
     <string name="instant_invite_you_are_already_a_member_of">Jau esate narys</string>
     <string name="instant_invite_you_have_been_invited_to_join">Tu buvai pakviestas prisijungti</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** pakvietė prisijungti prie</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Šis asmuo pakvietė tave prisijungti prie tiesioginio grupės pranešimo:</string>
-    <string name="instant_invites">Greitieji Pakvietimai</string>
+    <string name="instant_invites">Kvietimai</string>
     <string name="integration_settings">Integravimo Parametrai</string>
     <string name="integrations">Integracijos</string>
-    <string name="integrations_header">Pridėtos Twitch/YouTube Žaidimų Paskyros</string>
     <string name="integrations_pro_tip">"Dėl daugiau integracijų apsilankykite [Discord's StreamKit](%1$s)."</string>
     <string name="internal_server_error">Įvyko vidinė serverio klaida, bandyk dar kartą.</string>
     <string name="invalid_animated_emoji_body">Šis jaustukas neveikia, nes jis animuotas. Įsigykite Discord Nitro, kad išpildytum visas savo animuotas jaustukų svajones</string>
@@ -1931,13 +1905,13 @@ Nori daugiau sužinoti apie Discord?"</string>
     <string name="join_afk_channel_body">Atrodo, prisijungei prie AFK kanalo. Negali kalbėti šiame kanale.</string>
     <string name="join_call">Prisijungti prie skambučio</string>
     <string name="join_server">Prisijungti</string>
-    <string name="join_server_button_body">Įvesk greitąjį pakvietimą ir prisijunk prie savo draugų serverio.</string>
+    <string name="join_server_button_body">Norėdamas prisijungti prie draugo serverio, įvesk kvietimą.</string>
     <string name="join_server_button_cta">Prisijungti prie serverio</string>
     <string name="join_server_button_cta_mobile">Prisijunk prie serverio su pakvietimo nuoroda</string>
     <string name="join_server_button_cta_mobile_desc">Turi pakvietimo kodą arba nuorodą? Įvesk ją čia!</string>
     <string name="join_server_button_cta_named">Prisijungti prie %1$s</string>
-    <string name="join_server_description">Įvesk Greitojo Pakvietimo nuorodą žemiau, norėdamas prisijungti prie esamo serverio. Nuorodos pavyzdžiai:</string>
-    <string name="join_server_description_mobile">Įvesk Greitojo Pakvietimo nuorodą viršuje, kad prisijungtum prie egzistuojančio serverio.</string>
+    <string name="join_server_description">Norėdamas prisijungti prie esamo serverio, įvesk kvietimą žemiau. Kvietimas atrodys maždaug taip:</string>
+    <string name="join_server_description_mobile">Norėdamas prisijungti prie esamo serverio, įvesk kvietimą aukščiau.</string>
     <string name="join_server_title">Prisijungti prie Serverio</string>
     <string name="join_stream">Prisijungti prie transliacijos</string>
     <string name="join_video_call">Prisijungti prie vaizdo skambučio</string>
@@ -2045,9 +2019,8 @@ Nori daugiau sužinoti apie Discord?"</string>
     <string name="link_your_xbox_account_2">Discord yra balso, žinučių bei vaizdo pokalbių programa žaidėjams, kuri nemokama, saugi ir gali dirbti darbalaukyje bei mobiliajame telefone.</string>
     <string name="listening_to">Klausosi **%1$s**</string>
     <string name="live">Gyvai</string>
-    <string name="live_beta_description">Sveiki prisijungę! Translacijos pradžia veikia beta režimu. Atsiprašome, jei kas negerai</string>
+    <string name="live_beta_description">Sveikas prisijungęs! Go Live veikia beta režimu. Atsiprašome, jei kas negerai.</string>
     <string name="live_on_twitch">Tiesiogiai Twitch</string>
-    <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Nepavyko užkrauti nuotraukos.
 Pabandyk iš naujo."</string>
     <string name="load_more_messages">Įkelti daugiau pranešimų</string>
@@ -2207,8 +2180,6 @@ kanalus, kur jie abu, t. y. perkeliantis ir perkeliamas narys, turi prieigą."</
     <string name="new_permission">Naujas Leidimas</string>
     <string name="new_terms_ack">Aš suprantu ir sutinku su šiomis sąlygomis.</string>
     <string name="new_terms_continue">Toliau naudoti Discord</string>
-    <string name="new_terms_description">"Norėdami ir toliau naudoti Discord, perskaityk ir sutik su
-mūsų atnaujintomis paslaugų teikimo sąlygomis ir privatumo politika."</string>
     <string name="new_terms_title">Paslaugų teikimo sąlygų ir privatumo atnaujinimas</string>
     <string name="new_unreads">Nauji neperžiūrėti</string>
     <string name="next">Toliau</string>
@@ -2231,14 +2202,11 @@ mūsų atnaujintomis paslaugų teikimo sąlygomis ir privatumo politika."</strin
     <string name="no_emoji_title">Jokių Jaustukų</string>
     <string name="no_input_devices">Įvesties Įrenginių Neaptikta</string>
     <string name="no_input_devices_detected">Neaptikta jokių įvesties įrenginių, prijunk ir bandyk dar kartą.</string>
-    <string name="no_instant_invite">Greitojo Pakvietimo Nėra</string>
-    <string name="no_integrations">[Susiekite](onConnect) savo Twitch ar YouTube Žaidimų paskyrą, kad sinchronizuotų prenumeratorius/rėmėjus į roles</string>
+    <string name="no_instant_invite">Kvietimo nėra</string>
     <string name="no_integrations_body">Protokolas FR13NDSH1P gali būti vykdomi tik iš Discord programos</string>
     <string name="no_integrations_label">Be Integracijos</string>
-    <string name="no_invites_body">"Jaučiatės betikslis? Kaip popieriaus lėktuvėlis nardantis danguje? 
-Pasikvieskite draugus sukurdami greita pakvietimo nuorodą!"</string>
-    <string name="no_invites_caption">Dar nėra greitųjų pakvietimų!</string>
-    <string name="no_invites_label">Jokių greitų kvietimų dar nesukurta</string>
+    <string name="no_invites_caption">Kvietimų dar nėra!</string>
+    <string name="no_invites_label">Kvietimų dar nėra</string>
     <string name="no_mail_account_description">Siųsk savo atsiliepimus į support@discordapp.com ir mes nukopijavome tavo naudotojo informaciją į iškarpinę.</string>
     <string name="no_mail_account_title">Nėra Pašto Paskyros</string>
     <string name="no_mic_body">Nuorodą, kaip įjungti savo mikrofono prieigą, gali rasti Discord Pagalbos Centre.</string>
@@ -2256,7 +2224,6 @@ jokių prisegtų žinučių… Kol kas."</string>
     <string name="no_reactions_header">Nėra reakcijų</string>
     <string name="no_recent_mentions">O pradžioje… buvo tyla.</string>
     <string name="no_send_messages_permission_placeholder">Neturi leidimo siųsti žinutes šiame kanale.</string>
-    <string name="no_system_channel">Jokių Naujų Narystės Pranešimų</string>
     <string name="no_text">Ne</string>
     <string name="no_thanks">Ne, ačiū</string>
     <string name="no_user_limit">Neapribota</string>
@@ -2268,7 +2235,6 @@ jokių prisegtų žinučių… Kol kas."</string>
     <string name="note">Pastaba</string>
     <string name="note_placeholder">Spustelėk, kad pridėtum užrašą</string>
     <string name="note_placeholder_mobile">Spustelėk, kad pridėtum užrašą</string>
-    <string name="notice_application_test_mode">Šiuo metu aktyvus **%1$s** bandymo režimas. Bus rodomi nepaskelbti SKU, o tu nebūsi apmokestintas už jokius susijusius mokėjimus.</string>
     <string name="notice_application_test_mode_go_to_listing">Eiti į SKU</string>
     <string name="notice_connect_spotify">Prijunk savo Spotify paskyrą, kad tavo būsenoje rodytų, kokią muziką klausai!</string>
     <string name="notice_connection_conflict">Tavo balsas buvo atjungtas, nes prisijungei kitoje vietoje.</string>
@@ -2279,7 +2245,6 @@ jokių prisegtų žinučių… Kol kas."</string>
     <string name="notice_dispatch_error_disk_low">Tavo diske nėra pakankami vietos. Reikia %1$s, tačiau pasiekiama tik %2$s.</string>
     <string name="notice_dispatch_error_file_name_too_long">O ne, šio žaidimo failų pavadinimai per ilgi Windows sistemai. Pasirink trumpesnį diegimo katalogą.</string>
     <string name="notice_dispatch_error_invalid_drive">O ne, pasirinkta diegimo vieta netinkama. Pasirinkai %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Mums nepavyko atnaujinti žaidimo. Ar jis šiuo metu paleistas?</string>
     <string name="notice_dispatch_error_no_manifests">O ne, atrodo, kad nėra šiam žaidimui skirto turinio. Susisiek su pagalbos tarnyba.</string>
     <string name="notice_dispatch_error_not_entitled">O ne, atrodo, kad neturi šio žaidimo. Jei manai, kad įvyko klaida, susisiek su pagalbos tarnyba.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Atrodo, kai nesutikai su įdiegimo scenarijumi. Turi su juo sutikti, kad būtų galima įdiegti žaidimą.</string>
@@ -2294,9 +2259,6 @@ jokių prisegtų žinučių… Kol kas."</string>
     <string name="notice_native_apps">Reikia tiesioginio bendravimo Push to talk funkcijos? Parsisiųsk programėlę į kompiuterį!</string>
     <string name="notice_no_input_detected">Panašu, kad Discord programa negali aptikti tavo mikrofono. Pabandykime sutvarkyti tai kartu.</string>
     <string name="notice_no_input_detected_help_link_text">Padėkite!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Tavo prieiga prie Nitro baigė galioti. Atnaujink Nitro Classic į Nitro, kad turėtum neribotą prieigą prie puikių žaidimų.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Tau liko tik %1$s Nitro žaidimų! Tavo prieiga baigiasi **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Dėkojame, kad esi ankstyvasis Nitro rėmėjas! Kadangi esi nuostabus, turime tau dovaną – nuo šiol turi prieigą prie Nitro žaidimų iki %1$s.</string>
     <string name="notice_premium_promo_action">Pažiūrėti</string>
     <string name="notice_premium_promo_message">Paremk Discord kūrimą ir gauk idomių privilegijų!</string>
     <string name="notice_scheduled_maintenance">Discord neveiks dėl tvarkymų nuo **%1$s** iki **%2$s**.</string>
@@ -2366,7 +2328,6 @@ Ar gavai pakvietimo nuorodą iš draugo? Įvesk savo pakvietimo nuorodą arba ko
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Įgalinta perdanga</string>
     <string name="nux_post_reg_join_server_description">Išnaudok visas Discord funkcijas prisijungęs prie serverio.</string>
     <string name="nux_post_reg_join_server_skip">Aš neturiu tokio</string>
     <string name="nux_post_reg_join_server_title">Ar tu turi pakvietimą?</string>
@@ -2412,15 +2373,12 @@ Be to, perdanga gali neveikti visiems. Jei turite problemų ar klausimų patikri
     <string name="overlay_menu_get_invite">Gauti pakvietimo nuorodą</string>
     <string name="overlay_menu_open_discord">Atidaryti Discord</string>
     <string name="overlay_menu_switch_channels">Perjungti kanalus</string>
-    <string name="overlay_mobile_toggle_desc">Matyk, kas kalba, ir pasiek sparčiuosius klavišus naudodamas (-a) kitas programas, kai naudojiesi balso funkcija</string>
     <string name="overlay_mobile_toggle_label">Įjungti mobiliąją balso perdangą</string>
-    <string name="overlay_mobile_unauthed">Prisijunk prie „Discord“ programėlės ir įjunk šią funkciją.</string>
     <string name="overlay_news_go_live_body">Nori transliuoti „%1$s“ draugams, esantiems %2$s?</string>
     <string name="overlay_news_go_live_cta">Transliacijos pradžia</string>
     <string name="overlay_news_text_pinning_body">Dabar prie savo žaidimo gali prisegti tekstinį pokalbį!</string>
     <string name="overlay_news_text_pinning_tip">Patarimas. Gali prisegti pokalbį spustelėdamas $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Discord Perdanga Atnaujinta</string>
-    <string name="overlay_no_results">Ieškojome skersai ir išilgai. Deja, neradome balso kanalų</string>
     <string name="overlay_notification_incoming_call">Gaunamas skambutis…</string>
     <string name="overlay_notification_settings_disabled">Pranešimai Išjungti</string>
     <string name="overlay_notification_settings_position">Rodoma: %1$s</string>
@@ -2430,7 +2388,6 @@ Be to, perdanga gali neveikti visiems. Jei turite problemų ar klausimų patikri
     <string name="overlay_notifications_settings">Perdangos Pranešimai</string>
     <string name="overlay_notifications_top_left">Viršuje kairėje</string>
     <string name="overlay_notifications_top_right">Viršuje dešinėje</string>
-    <string name="overlay_private_channels_empty_state">Ne, čia nėra jokių tiesioginių pranešimų.</string>
     <string name="overlay_reload">Iš Naujo Paleisti Perdangą</string>
     <string name="overlay_settings">Perdangos parametrai</string>
     <string name="overlay_settings_general_tab">Bendras</string>
@@ -2452,7 +2409,6 @@ Be to, perdanga gali neveikti visiems. Jei turite problemų ar klausimų patikri
     <string name="pagination_page_of">%1$s puslapis iš %2$s</string>
     <string name="pagination_previous">Ankstesnis</string>
     <string name="paginator_of_pages">%1$s puslapis iš %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Discord partneris</string>
     <string name="party_full">Grupė Pilna</string>
     <string name="party_join">Prisijungti Prie Grupės</string>
@@ -2544,18 +2500,11 @@ Be to, perdanga gali neveikti visiems. Jei turite problemų ar klausimų patikri
     <string name="popout_stay_on_top">Palikti viršuje</string>
     <string name="post_code">Pašto Indeksas</string>
     <string name="premium_alert_error_title">Oi, kažkas įvyko ne taip…</string>
-    <string name="premium_applications_grandfathered_monthly">Norėdami padėkoti už paramą Discord, vieniems metams suteikiame prieigą prie Nitro žaidimų. Tavo prieiga baigsis **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">Norėdami padėkoti už paramą Discord, dvejiems metams suteikiame prieigą prie Nitro žaidimų. Tavo prieiga baigsis **%1$s**.</string>
-    <string name="premium_applications_subtitle">Gauk neribotą prieigą prie mūsų sparčiai gausėjančios kritikų pripažintų žaidimų bibliotekos, kuri neabejotinai patiks tau ir tavo draugams.</string>
-    <string name="premium_applications_title">Dešimtys kuruojamų žaidimų. Už nedidelę mėnesio kainą.</string>
     <string name="premium_badge_tooltip">Prenumeratorius nuo %1$s</string>
     <string name="premium_cancel_cancel">Ne</string>
     <string name="premium_cancel_confirm_body_tier_1">"Atšaukimas įsigalios tavo dabartinio atsiskaitymo laikotarpio pabaigoje **%1$s**. Jei pakeitei savo Discord žymę, ji bus paskirta atsitiktine tvarka.
 
 Savo prenumeratą gali bet kada atnaujinti."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Atšaukimas įsigalios tavo dabartinio atsiskaitymo laikotarpio pabaigoje. **%1$s** prarasi prieigą prie visų savo bibliotekoje esančių Nitro žaidimų, o tavo Discord žymė bus paskirta atsitiktine tvarka, jei ją pakeitei
-
-Tavo išsaugotus failus laikysime saugioje vietoje, jei persigalvotum. Gali bet kada atnaujinti prenumeratą!"</string>
     <string name="premium_cancel_confirm_new">Taip, Atšaukti %1$s</string>
     <string name="premium_cancel_confirm_title">Atšaukti %1$s?</string>
     <string name="premium_cancel_failed_body">Mes negalėjome atšaukti prenumeratos Nitro. Bandyk dar kartą arba susisiek su mūsų pagalbos komanda, jei problema neišnyksta.</string>
@@ -2572,19 +2521,15 @@ Tavo išsaugotus failus laikysime saugioje vietoje, jei persigalvotum. Gali bet
     <string name="premium_chat_perks_description_custom_emoji">Gauk leidimą naudoti savo pasirinktinius jaustukus bet kur.</string>
     <string name="premium_chat_perks_description_discriminator">Kol turi prenumeratą, pasirink savo žymę.</string>
     <string name="premium_chat_perks_description_screenshare">Pagerink savo ekrano dalijimosi vaizdu galimybes su 720p 60fps arba 1080p 30fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Didelis įkeliamų failų dydis %1$s nuo %2$s, kad galima būtų kokybiškai dalytis.</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Animuotos Linksmybės</string>
     <string name="premium_chat_perks_title_badge">Pakartok Savo Mokėjimą</string>
     <string name="premium_chat_perks_title_custom_emoji">Bendri Pasirenkami Jaustukai</string>
     <string name="premium_chat_perks_title_discriminator">Pasirinkta Discord Žymė</string>
     <string name="premium_chat_perks_title_screenshare">Geresnės Kokybės Vaizdo Įrašai</string>
+    <string name="premium_chat_perks_title_streaming">Geresnės Go Live transliacijos</string>
     <string name="premium_code_redemption_confirmation_blurb">Dėl atsitiktinių skaičių sekos dabar papildomos pokalbių funkcijos jums suteiktos %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">O, Kaip Malonu!</string>
-    <string name="premium_feature_new_chat_perks_header">Taip pat gausi papildomų pokalbių funkcijų:</string>
-    <string name="premium_feature_new_premium_applications_header">Daugiau nei %1$s vertės žaidimai. Peržiūrėk juos:</string>
-    <string name="premium_feature_view_applications">Peržiūrėk Visus Nitro Žaidimus</string>
     <string name="premium_features_chat_perks">Papildomos Pokalbių Funkcijos</string>
-    <string name="premium_features_premium_applications">Nemokami Žaidimai</string>
     <string name="premium_grandfathered_warning">Norėdami padėkoti už paramą mums, suteikėme Nitro planą su nuolaida. **Atšaukęs ar pakeitęs savo planą šios nuolaidos neteksi.** Buvai įspėtas!!!!!</string>
     <string name="premium_grandfathered_warning_confirm">Vis tiek tai padaryk</string>
     <string name="premium_grandfathered_warning_title">Atsargiai, Mielasis</string>
@@ -2594,10 +2539,7 @@ Tavo išsaugotus failus laikysime saugioje vietoje, jei persigalvotum. Gali bet
     <string name="premium_not_claimed">Patvirtink savo paskyrą pirmiausiai</string>
     <string name="premium_not_claimed_body">Labas, bičiuli! Jeigu nori įsigyti Nitro, pirma turi gauti paskyrą, kad neprarastum savo dalykų.</string>
     <string name="premium_not_verified">Pirmiausia patvirtink savo el. pašto adresą</string>
-    <string name="premium_not_verified_body">Sveikas, drauge! Jei nori įsigyti Nitro, pirmiausia turėsi patvirtinti savo el. paštą. Pasitikrink el. paštą arba paprašyk naujo.</string>
-    <string name="premium_payment_applications_os_warning">Nitro žaidimai palaikomi tik Windows sistemoje.</string>
     <string name="premium_payment_confirmation_blurb_regular">Nuo šiol turi patobulintų pokalbių funkcijų galią. Baik skaityti ir eik kalbėti!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Nuo šiol turi neribotą prieigą prie daugybės puikių žaidimų. Baik skaityti ir eik jų žaisti!!!</string>
     <string name="premium_payment_confirmation_button_regular">Gerai, skamba puikiai</string>
     <string name="premium_plan_month">Nitro Mėnesio Prenumerata</string>
     <string name="premium_plan_month_tier_1">Nitro Classic mėnesinė prenumerata</string>
@@ -2618,13 +2560,10 @@ Apskaičiuosime mokestį už tavo dabartinį planą ir atimsime jį iš metinės
     <string name="premium_upgrade_disabled_current_tooltip">Dabartinis tavo planas.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Jeigu nori pasirinkti žemesnio lygio planą, pirma turi atšaukti ir palaukti, kol baigsis tavo prenumerata.</string>
     <string name="premium_upgrade_done_body_tier_1">Dabar turi patobulintas pokalbių funkcijas!</string>
-    <string name="premium_upgrade_done_body_tier_2">Dabar turi patobulintas pokalbių funkcijas ir prieigą prie daugybės žaidimų.</string>
     <string name="premium_upgrade_done_button_tier_1">Puiku!</string>
-    <string name="premium_upgrade_done_button_tier_2">Peržiūrėti visus Nitro žaidimus.</string>
     <string name="premium_upgrade_failed_body">Ach.. Šis pagerinimas neveikia. Patikrink savo mokėjimo informaciją, ar ji galioja, ir pabandyk dar kartą.</string>
     <string name="premium_upload_promo">Įsigyk Discord Nitro ir gauk %1$s failų dydžio limitą</string>
     <string name="premium_year_free_months">Gauk 2 mėnesius nemokamai!</string>
-    <string name="premium_year_free_months_short">2 mėnesiai nemokamai</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s ** / metams</string>
     <string name="preview_chat">Peržiūrėti Pokalbį</string>
     <string name="priority_speaker">Prioritetinis Kalbėtojas</string>
@@ -2787,14 +2726,12 @@ bando išsiųsti duomenis."</string>
     <string name="rtc_debug_transport">Perdavimas</string>
     <string name="rtc_debug_users">Naudotojai</string>
     <string name="ru">Rusų k.</string>
-    <string name="samsung_welcome_screen">Nemokama, saugi balso ir teksto pokalbių programėlė, naudojama daugiau nei 250 milijonų žaidėjų – dabar su tokiomis išskirtinėmis „Siemens“ funkcijomis, kaip mobilioji balso perdanga.</string>
     <string name="save">Išsaugoti</string>
     <string name="save_changes">Išsaugoti pakeitimus</string>
     <string name="save_new_url">Išsaugoti Naują URL</string>
     <string name="scope_activities_read">Pasiekti tavo veiklos santrauką</string>
     <string name="scope_activities_read_description">Jis leidžia programėlei skaityti informaciją iš tavo veiklos santraukos dalių „Žaidžia“ ir „Neseniai žaidė“.</string>
     <string name="scope_activities_write">Atnaujinti dabartinę veiklą</string>
-    <string name="scope_activities_write_description">Jis leidžia programėlei pranešti „Discord“, kada žaidi arba transliuoji žaidimą.</string>
     <string name="scope_bot">Pridėti botą prie serverio</string>
     <string name="scope_bot_description">Tam reikia turėti **serverio valdymo** leidimą šiame serveryje.</string>
     <string name="scope_bot_permissions">Leisti šias teises</string>
@@ -2809,7 +2746,7 @@ bando išsiųsti duomenis."</string>
     <string name="scope_guilds">Žinok, kokiuose serveriuose esi</string>
     <string name="scope_guilds_empty">Tu nedalyvauji jokiose serveriuose.</string>
     <string name="scope_guilds_join">Prisijungti į serverius už tave</string>
-    <string name="scope_guilds_join_description">Naudoti momentinius pakvietimus tavo vardu.</string>
+    <string name="scope_guilds_join_description">Naudoti kvietimus tavo vardu.</string>
     <string name="scope_identify">Prieiga prie tavo naudotojo vardo ir pseudo portreto</string>
     <string name="scope_messages_read">Pažymėti visas žinutes perskaitytomis</string>
     <string name="scope_messages_read_description">Tai leidžia programai skaityti visus pranešimus, pasiekiamus per Discord paskyrą</string>
@@ -2878,7 +2815,6 @@ Pasirinkite, kuriuo ekranu norite pasidalyti."</string>
     <string name="search_filter_on">įjungtas</string>
     <string name="search_for_emoji">Rasti tinkama jaustuką</string>
     <string name="search_for_empty">Ieškoti</string>
-    <string name="search_for_value">Ieškoti: **%1$s**</string>
     <string name="search_group_header_channels">Kanale</string>
     <string name="search_group_header_dates">Datos</string>
     <string name="search_group_header_file_name">Failo Pavadinime Yra</string>
@@ -3083,8 +3019,6 @@ Ar tikrai nori tęsti?"</string>
     <string name="stop_ringing">Nustoti skambinti</string>
     <string name="stop_streaming">Nebetransliuoti</string>
     <string name="stop_watching">Nebestebėti</string>
-    <string name="store_payment_legalese_monthly">Sveikas! Įsigydamas %1$s, sutinki su mūsų [Parduotuvės paslaugų teikimo sąlygomis](%2$s). %1$s yra pasikartojanti prenumerata, o tai reiškia, kad šiandien nuskaitysime mokestį ir toliau jį nuskaitysime kas mėnesį iki prenumeratos atšaukimo. Gali ją bet kada atšaukti savo naudotojo nustatymų ekrane.</string>
-    <string name="store_payment_legalese_yearly">Sveikas! Įsigydamas %1$s, sutinki su mūsų [Parduotuvės paslaugų teikimo sąlygomis](%2$s). %1$s yra pasikartojanti prenumerata, o tai reiškia, kad šiandien nuskaitysime mokestį ir toliau jį nuskaitysime kasmet iki prenumeratos atšaukimo. Gali ją bet kada atšaukti savo naudotojo nustatymų ekrane.</string>
     <string name="stream">Transliacijos pradžia</string>
     <string name="stream_bad_spectator">Suprastėjo transliacijos, kurią žiūri, vaizdo arba garso kokybė. Taip galėjo nutikti dėl tinklo sąlygų.</string>
     <string name="stream_bad_streamer">Suprastėjo tavo transliacijos vaizdo arba garso kokybė. Taip galėjo nutikti dėl tinklo sąlygų.</string>
@@ -3092,7 +3026,6 @@ Ar tikrai nori tęsti?"</string>
     <string name="stream_capture_paused_details">Grįžkite į žaidimą ir atkurkite transliaciją.</string>
     <string name="stream_capture_paused_details_viewer">%1$s sumažino žaidimą… Likite ramus!</string>
     <string name="stream_channel_description">Nariai su šiuo leidimu gali transliuoti šiame kanale.</string>
-    <string name="stream_description">Nariai su šiuo leidimu gali būti šiame kanale.</string>
     <string name="stream_ended">Transliacija baigėsi. *svirplio čirpimas*</string>
     <string name="stream_ended_button">Transliacija baigėsi</string>
     <string name="stream_ended_no_spectators">Stebėtojų nėra, nes transliacija baigėsi.</string>
@@ -3105,7 +3038,6 @@ Ar tikrai nori tęsti?"</string>
     <string name="stream_preview_loading">Generuojama peržiūra…</string>
     <string name="stream_preview_paused">Jūsų transliacija vis dar vyksta!</string>
     <string name="stream_preview_paused_subtext">Mes pristabdėme šią peržiūrą, kad išsaugotume jūsų išteklius.</string>
-    <string name="stream_quality_unlock">Atrakinti su „Nitro“</string>
     <string name="stream_reconnecting_error">Jūs buvote atjungtas (-a)…</string>
     <string name="stream_reconnecting_error_subtext">Sėdėkite ramiai, tuoj jus grąžinsime!</string>
     <string name="stream_report_a_problem">Pranešti apie problemą</string>
@@ -3132,7 +3064,6 @@ Ar tikrai nori tęsti?"</string>
     <string name="stream_report_rating_body_streamer">Papasakokite savo transliacijos patirtį.</string>
     <string name="stream_report_submit">Pateikti</string>
     <string name="stream_reported">Atsiliepimas pateiktas</string>
-    <string name="stream_reported_body">Dėkojame, kad pranešei apie problemą! Tavo atsiliepimai padeda pagerinti transliacijų kokybę.</string>
     <string name="stream_soundshare_failed">Ei, kažkas nutiko ir nepavyksta transliuoti žaidimo garso.</string>
     <string name="streamer_mode">Transliavimo režimas</string>
     <string name="streamer_mode_enabled">Transliavimo režimas įjungtas</string>
@@ -3190,7 +3121,6 @@ Ar tikrai norite tęsti?"</string>
     <string name="system_message_guild_member_join_10">Laukinis %1$s pasirodė.</string>
     <string name="system_message_guild_member_join_11">Swoooosshh. %1$s ką tik nusileido.</string>
     <string name="system_message_guild_member_join_12">Laikykis. %1$s ką tik prisijungė.</string>
-    <string name="system_message_guild_member_join_13">%1$s ką tik prisijungė. Paslėpk savo bananus.</string>
     <string name="system_message_guild_member_join_14">%1$s ką tik atvyko. Atrodo galingas – nunerfink.</string>
     <string name="system_message_guild_member_join_15">%1$s ką tik įslinko į serverį.</string>
     <string name="system_message_guild_member_join_16">%1$s ką tik atsirado serveryje.</string>
@@ -3202,7 +3132,6 @@ Ar tikrai norite tęsti?"</string>
     <string name="system_message_guild_member_join_22">Tai paukštis! Tai lėktuvas! Nieko tokio, tai tik %1$s.</string>
     <string name="system_message_guild_member_join_23">Tai %1$s! Šlovinkim saulę! \\\\[T]/</string>
     <string name="system_message_guild_member_join_24">Niekada nepasiduosiu %1$s. Niekada nenuvilsiu %1$s.</string>
-    <string name="system_message_guild_member_join_25">Ha! %1$s prisijungė! Suaktyvavai mano spąstų kortelę!</string>
     <string name="system_message_guild_member_join_26">Į sveikatą, meile! %1$s yra čia!</string>
     <string name="system_message_guild_member_join_27">Sveikas! Klausyk! %1$s prisijungė!</string>
     <string name="system_message_guild_member_join_28">Mes tavęs jau seniai laukiame %1$s</string>
@@ -3353,8 +3282,6 @@ Patvirtinta paskyra reikalinga norint **atsisiųsti programas**."</string>
     <string name="unsupported_browser">Nepalaikoma Naršyklė</string>
     <string name="unsupported_browser_body">"Tu naudoji nepalaikomą naršyklę. Norėdamas patirti visas Discord siūlomas funkcijas, atnaujink savo naršyklę arba atsisiųsk
 vieną iš mūsų programėlių."</string>
-    <string name="unsupported_browser_details">"Tu nori kalbėti su savo komanda, ar ne? Atsinaujink į naujausią Chrome, Opera, Firefox 38+ versiją arba parsisiųsk
-Discord Klientą ir pradėk pokalbį su savo komanda dabar!"</string>
     <string name="unsupported_browser_title">Na, tai nepatogu</string>
     <string name="unverified_account_body">"Prašome patikrinti savo elektroninį paštą ir sekite elektroninio pašto adreso patvirtinimo instrukcijas.
 
@@ -3472,8 +3399,6 @@ Laikyk mygtuką shift tiesioginiam įkėlimui."</string>
     <string name="user_settings_appearance_preview_message_4">Kompaktiškas režimas būtų įjungtas</string>
     <string name="user_settings_appearance_preview_message_5">O, štai jis!</string>
     <string name="user_settings_appearance_zoom_tip">Galite keisti mastelio lygį su %1$s +/– ir iš naujo nustatyti numatytąją mastelį su %1$s + 0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Rodyti žaidimų skirtuką</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Išjunk šią parinktį, kad žaidimų skirtukas būtų paslėptas ir galėtum susitelkti į pokalbius.</string>
     <string name="user_settings_close_button">Uždarymo Mygtukas</string>
     <string name="user_settings_confirm_logout">Ar tikrai nori atsijungti?</string>
     <string name="user_settings_game_activity">Žaidimo Veikla</string>
@@ -3532,8 +3457,6 @@ Būk atidus, kad tai padaro tavo serverį viešai prieinamą visiems, kurie naud
     <string name="vanity_url_hint_mobile">jūsų-url-čia</string>
     <string name="verfication_expired">El. Pašto patvirtinimo nuorodos laikas baigėsi.</string>
     <string name="verfication_expired_suggestion">Prisijunk į Discord norėdamas persiųsti nuorodą</string>
-    <string name="verification_body">"Aptikome, kad vyksta kažkas neįprasto.
-Kad tęstum naudojimąsi Discord **mums reikės, kad patvirtintum, kad esi žmogus**"</string>
     <string name="verification_body_alt">Dabar, įsitikinkime, kad esi žmogus…</string>
     <string name="verification_email_body">Mes išsiuntėme tau naują patvirtinimo el. laišką į **%1$s**, patikrink savo pašto dėžutę ir šlamšto aplanką.</string>
     <string name="verification_email_error_body">Įvyko klaida siunčiant patvirtinimo el. laišką. Pabandyk vėliau arba susisiek su pagalbos tarnyba.</string>
@@ -3574,8 +3497,6 @@ Kad tęstum naudojimąsi Discord **mums reikės, kad patvirtintum, kad esi žmog
     <string name="video">Vaizdo įrašas</string>
     <string name="video_call">Vaizdo skambutis</string>
     <string name="video_connect">Vaizdo įrašas</string>
-    <string name="video_poor_connection_body">Vaizdo įrašas išjungtas. Jis sugrįš, kai jūsų ryšis pagerės.</string>
-    <string name="video_poor_connection_title">Prastas ryšys</string>
     <string name="video_preview">Vaizdo Peržiūra</string>
     <string name="video_settings">Vaizdo Nustatymai</string>
     <string name="video_unavailable">Vaizdas Negalimas</string>
diff --git a/com.discord/res/values-nl/plurals.xml b/com.discord/res/values-nl/plurals.xml
index d609aa3990..cdbeeee0ae 100644
--- a/com.discord/res/values-nl/plurals.xml
+++ b/com.discord/res/values-nl/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">geen slots</item>
         <item quantity="one">%d slot</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d dagen</item>
-        <item quantity="one">1 dag</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d leden</item>
-        <item quantity="zero">0 leden</item>
-        <item quantity="one">1 lid</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">dagen</item>
         <item quantity="one">dag</item>
@@ -212,16 +203,6 @@
         <item quantity="other">toestemmingen</item>
         <item quantity="one">een toestemming</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Slow-modus ingesteld op **!!%d!! seconden**</item>
-        <item quantity="zero">Slow-modus uitgeschakeld</item>
-        <item quantity="one">Slow-modus ingesteld op **1 seconde**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Slow-modus ingesteld op**!!%d!! seconden**</item>
-        <item quantity="zero">Ingestelde slow-modus uitgeschakeld</item>
-        <item quantity="one">Slow-modus ingesteld op **1 seconde**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! leden**</item>
         <item quantity="one">**een lid**</item>
@@ -313,10 +294,6 @@
         <item quantity="other">%d nieuwe berichten</item>
         <item quantity="one">1 nieuw bericht</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d dagen</item>
-        <item quantity="one">een dag</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d kanalen</item>
         <item quantity="one">%d kanaal</item>
@@ -334,10 +311,6 @@
         <item quantity="other">deze berichten</item>
         <item quantity="one">dit bericht</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** servers zijn niet beschikbaar vanwege een tijdelijke storing.</item>
-        <item quantity="one">**1** server is niet beschikbaar vanwege een tijdelijke storing.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d maanden</item>
         <item quantity="one">1 maand</item>
diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml
index 1a28f4f20d..b1e8f0970d 100644
--- a/com.discord/res/values-nl/strings.xml
+++ b/com.discord/res/values-nl/strings.xml
@@ -58,10 +58,8 @@
     <string name="activity_invite_private">"Je kunt geen uitnodiging verzenden omdat je onzichtbaar bent of je afspeelstatus verbergt. Als je je instellingen liever niet wilt wijzigen,
 kun je in plaats daarvan iemand uitnodigen."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Begrepen!</string>
-    <string name="activity_panel_go_live_hotspot_header">Ga live om gameplay rechtstreeks naar je vrienden te streamen!</string>
+    <string name="activity_panel_go_live_hotspot_header">Gebruik Go Live om gameplay rechtstreeks naar je vrienden te streamen!</string>
     <string name="activity_panel_go_live_tooltip">Live gaan</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Deze server beschikt niet over spraakkanalen om naar te streamen.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Je kan niet streamen naar dit spraakkanaal.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Navigeer naar een server om te starten met streamen.</string>
     <string name="add">Toevoegen</string>
     <string name="add_a_comment_optional">Voeg een opmerking toe (optioneel)</string>
@@ -156,7 +154,6 @@ Het is gevaarlijk om deze machtiging te verlenen."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Het is je gelukt!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Naar de bibliotheek</string>
     <string name="application_entitlement_code_redemption_invalid">Ongeldige code ingegeven</string>
-    <string name="application_entitlement_code_redemption_prompt">Een code ontvangen voor een game? Geef ze hieronder in:</string>
     <string name="application_entitlement_code_redemption_redeem">Verzilveren</string>
     <string name="application_filter_name_linux">Alle documenten</string>
     <string name="application_filter_name_macos">Applicaties</string>
@@ -385,7 +382,6 @@ Het is gevaarlijk om deze machtiging te verlenen."</string>
     <string name="application_store_staff_pick">Discord-personeelsfavoriet</string>
     <string name="application_store_view_all_news">Bekijk de laatste Nieuwtjes</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Deze DLC vereist dat je %1$s bezit op Discord om te spelen. [Meer informatie over DLC.](%2$s)</string>
-    <string name="application_store_warning_early_access_description">Deze game is leuk (vinden wij!) maar heeft mogelijk een beperkte inhoud, diverse bugs of voelt onvolledig aan. [Meer informatie over vroege toegang.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Vroegtijdige toegang</string>
     <string name="application_store_warning_requires_desktop_app_description">Om deze game te kunnen spelen, moet je de Discord $[desktop-app](downloadHook) geïnstalleerd hebben.</string>
     <string name="application_store_warning_requires_desktop_app_title">Vereist desktop-app</string>
@@ -474,7 +470,6 @@ maar als en wanneer het moet, moet je niet aarzelen!"</string>
     <string name="bg">Bulgaars</string>
     <string name="billing">Facturatie</string>
     <string name="billing_accept_terms_tooltip">Accepteer onze servicevoorwaarden om verder te gaan</string>
-    <string name="billing_add_payment_method">Voeg een betalingswijze toe</string>
     <string name="billing_address">Factuuradres</string>
     <string name="billing_address_address">Adres</string>
     <string name="billing_address_address2">Adresregel 2 (Optioneel)</string>
@@ -496,28 +491,17 @@ maar als en wanneer het moet, moet je niet aarzelen!"</string>
     <string name="billing_application_consumable_refund_text_unable">In-game content kan niet terugbetaald worden. Als er een probleem is met je aankoop, [contacteer dan onze support.](%1$s)</string>
     <string name="billing_application_refund_text">Een terugbetaling kan aangevraagd worden indien deze aankoop werd uitgevoerd in de laatste %1$s dagen en de game niet langer dan %2$s uren werd gespeeld. [Onze vriendelijke helpdesk zal je helpen je munten terug te krijgen.](%3$s)</string>
     <string name="billing_application_refund_text_unable">Onze excuses, deze aankoop komt niet in aanmerking voor restituties. Er kan een restitutie worden aangevraagd als deze aankoop de afgelopen %1$s dagen is gedaan en de game korter dan %2$s uren is gespeeld.</string>
-    <string name="billing_change_payment_source">Betalingswijze aanpassen</string>
-    <string name="billing_error_add_payment_source_streamer_mode">Je kunt geen nieuwe betalingswijze toevoegen terwijl je Streamer-Modus gebruikt.</string>
     <string name="billing_error_gateway">Er ging iets fout bij het verwerken van je betaling, gelieve het opnieuw te proberen!</string>
     <string name="billing_error_rate_limit">Je hebt te snel te veel aankopen proberen te doen. Gelieve even te wachten en het opnieuw te proberen!</string>
     <string name="billing_error_section_address">Uh oh! Blijkbaar is er een probleem met dit adres. Gelieve de velden te corrigeren en het opnieuw te proberen!</string>
     <string name="billing_error_section_card">Uh oh! Blijkbaar is er een probleem met deze kaart. Gelieve de velden te corrigeren en het opnieuw te proberen!</string>
     <string name="billing_history">Factuuroverzicht</string>
     <string name="billing_legal_mumbo_jumbo">Juridisch geklets</string>
-    <string name="billing_legal_mumbo_jumbo_label">Ik ga akkoord met de [Discord Store Servicevoorwaarden](%1$s)</string>
-    <string name="billing_no_payment_method">Geen betalingswijze opgeslagen</string>
-    <string name="billing_no_payment_method_description">Check sneller uit door een betalingswijze op te slaan</string>
     <string name="billing_pay_for_it_with">Betaal ervoor met</string>
     <string name="billing_payment_breakdown_taxes">Btw</string>
     <string name="billing_payment_breakdown_total">Totaal</string>
     <string name="billing_payment_history">Transactieoverzicht</string>
     <string name="billing_payment_premium">Jouw abonnement</string>
-    <string name="billing_payment_premium_legalese_monthly">Door een %1$s abonnement aan te kopen, ga je akkoord met onze [Store-Servicevoorwaarden]%2$s %1$s is een automatisch herhalend abonnement. Je geeft Discord de toestemming om je gelijk het aangerekende bedrag van %3$s via de gekozen betalingswijze aan te rekenen, en dit maandelijks automatisch te blijven doen totdat je opzegt. Je kan op elk moment opzeggen.</string>
-    <string name="billing_payment_premium_legalese_yearly">Door een %1$s abonnement aan te kopen, ga je akkoord met onze [Store-Servicevoorwaarden]%2$s. %1$s is een automatisch herhalend abonnement. Je geeft Discord de toestemming om je gelijk het aangerekende bedrag van %3$s via de gekozen betalingswijze aan te rekenen, en dit elk jaar automatisch te blijven doen totdat je opzegt. Je kan op elk moment opzeggen.</string>
-    <string name="billing_payment_sources">Betalingswijzen</string>
-    <string name="billing_payment_table_header_amount">BEDRAG</string>
-    <string name="billing_payment_table_header_date">DATUM</string>
-    <string name="billing_payment_table_header_description">OMSCHRIJVING</string>
     <string name="billing_premium_refund_text">Een terugbetaling kan aangevraagd worden indien deze aankoop werd uitgevoerd in de laatste %1$s dagen. [Onze vriendelijke helpdesk zal je helpen je munten terug te krijgen.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Onze excuses, deze aankoop komt niet in aanmerking voor restituties. Er kan een restitutie worden aangevraagd als deze aankoop de afgelopen %1$s dagen is gedaan.</string>
     <string name="billing_price_per_month">%1$s / maand</string>
@@ -527,14 +511,11 @@ maar als en wanneer het moet, moet je niet aarzelen!"</string>
     <string name="billing_purchase_details_header">Aankoop-details</string>
     <string name="billing_refund_header">Ondervind je problemen met je aankoop?</string>
     <string name="billing_refund_play_time_never_played">Nooit gespeeld</string>
-    <string name="billing_refund_play_time_subheader">GESPEELDE TIJD</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">AANKOOPDATUM</string>
     <string name="billing_refund_report_a_problem">Een probleem melden</string>
     <string name="billing_refund_request_button">Terugbetaling Aanvragen</string>
     <string name="billing_sales_tax_added">%1$s aan verkoopstaks werd toegevoegd omwille van je factuuradres.</string>
     <string name="billing_sales_tax_included">Belasting is inbegrepen in de prijs.</string>
-    <string name="billing_secure_tooltip">Je betalingswijze wordt gecodeerd en opgeslagen met een beveiligd betalingsverwerkingsysteem.</string>
     <string name="billing_step_address">Adres</string>
     <string name="billing_step_credit_card_information">Betalingsinformatie</string>
     <string name="billing_step_payment_type">Betalingswijze</string>
@@ -765,7 +746,6 @@ de pietepeuterige tekst hieronder."</string>
     <string name="connect_to_video">Verbinden met video</string>
     <string name="connect_to_voice">Verbinden met Spraak</string>
     <string name="connect_voice_only">Verbinden met Spraak</string>
-    <string name="connected_account_revoked">Dit account is ingetrokken. Wil je [reconnect](onReconnect)?</string>
     <string name="connected_account_verify_failure">Kon je **%1$s** account niet met **Discord** verbinden</string>
     <string name="connected_account_verify_success">Je **%1$s** account is verbonden met **Discord**</string>
     <string name="connected_account_verifying">Je **%1$s** account wordt verbonden met **Discord**</string>
@@ -777,7 +757,6 @@ de pietepeuterige tekst hieronder."</string>
     <string name="connection_enter_code">Voer de code in zoals deze op je scherm wordt weergegeven</string>
     <string name="connection_invalid_pin">Ongeldige pincode ingevoerd</string>
     <string name="connection_login_with">of log in met</string>
-    <string name="connection_problems_body">Raadpleeg [server status](%1$s) of stuur een tweet naar [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Autoriseren</string>
     <string name="connection_status_awaiting_endpoint">In afwachting van eindpunt</string>
     <string name="connection_status_connected">Verbonden</string>
@@ -822,11 +801,10 @@ de pietepeuterige tekst hieronder."</string>
     <string name="create_category">Categorie maken</string>
     <string name="create_channel">Creëer kanaal</string>
     <string name="create_group_dm">Maak groeps-DM</string>
-    <string name="create_instant_invite">Directe uitnodiging creëren</string>
+    <string name="create_instant_invite">Uitnodiging creëren</string>
     <string name="create_link">Maak link</string>
     <string name="create_or_join_modal_header">Oh, dus een andere server?</string>
     <string name="create_server_button_body">Maak een nieuwe server aan en nodig vrienden uit. Het is gratis!</string>
-    <string name="create_server_button_cta">Maak een server aan</string>
     <string name="create_server_button_cta_mobile">Een nieuwe server aanmaken</string>
     <string name="create_server_button_cta_mobile_desc">Maak een server, nodig je vrienden uit en geef een feestje!</string>
     <string name="create_server_description">Door een server te maken, krijg je toegang tot **gratis** spraak- en tekstchat om met je vrienden te gebruiken.</string>
@@ -937,7 +915,6 @@ de pietepeuterige tekst hieronder."</string>
     <string name="disable_email_notifications_failed_suggestion">E-mailmeldingen zijn mogelijk al uitgeschakeld of deze e-mail is mogelijk niet langer gekoppeld aan een Discord-account.</string>
     <string name="disable_integration_title">Synchronisatie uitschakelen</string>
     <string name="disable_integration_twitch_body">Als je synchronisatie uitschakelt, voert het geselecteerde verlopen subgedrag uit alsof alle subs zijn verlopen.</string>
-    <string name="disable_integration_youtube_body">Als je synchronisatie uitschakelt, voert het geselecteerde verlopen sponsorgedrag uit alsof alle sponsors zijn verlopen.</string>
     <string name="disable_notifications_description">Alle bureaubladmeldingen worden uitgeschakeld.</string>
     <string name="disable_notifications_label">Meldingen uitschakelen</string>
     <string name="disable_sounds_description">Alle geluidseffecten worden uitgeschakeld.</string>
@@ -953,7 +930,6 @@ de pietepeuterige tekst hieronder."</string>
     <string name="discord_desc_long">Gratis en veilige chat voor gamers, werkt op jouw desktop en smartphone.</string>
     <string name="discord_desc_short">Teamspraak en tekstchat</string>
     <string name="dismiss">Afwijzen</string>
-    <string name="dispatch_error_modal_body">Er is iets fout gegaan. Als het probleem zich blijft voordoen, creëer dan een support-ticket en kopieer de inhoud van de boodschap onderaan.</string>
     <string name="dispatch_error_modal_error_label">Foutmelding (Kopieer en plak me)</string>
     <string name="dispatch_error_modal_header">Discord dispatch fout</string>
     <string name="dispatch_error_modal_open_ticket">Creëer een ticket</string>
@@ -1063,7 +1039,7 @@ de pietepeuterige tekst hieronder."</string>
     <string name="failed">Mislukt</string>
     <string name="fcm_fallback_notification_channel_label">Overige</string>
     <string name="fi">Fins</string>
-    <string name="file_upload_limit_premium">50 MB</string>
+    <string name="file_upload_limit_premium_tier_1">50 MB</string>
     <string name="file_upload_limit_standard">8 MB</string>
     <string name="filter_mentions">Op vermeldingen filteren</string>
     <string name="filter_options">Op opties filteren</string>
@@ -1084,8 +1060,6 @@ AFK-timeout. Dit heeft geen invloed op browsers."</string>
     <string name="form_help_attenuation">"Verlaag het volume van andere applicaties met dit percentage wanneer iemand spreekt.
 Stel in op 0%% om demping volledig uit te schakelen."</string>
     <string name="form_help_automatic_vad">Als het lampje ononderbroken groen is, verzendt Discord je mooie stem.</string>
-    <string name="form_help_bitrate">"**ALLE BITS!** Als je boven %1$skbps wordt niet aanbevolen, tenzij je een audiofiel bent, omdat het mensen
-op mobiele apparaten of slechte verbindingen nadelig zal beïnvloeden zonder merkbaar voordeel."</string>
     <string name="form_help_certified_voice_processing">"Tijdens het gebruik van een Discord Certified-microfoon worden bepaalde functies voor spraakverwerking niet langer afgehandeld door Discord zelf, 
 maar door de microfoon."</string>
     <string name="form_help_channel_permissions">Door rollen te selecteren, worden automatisch basisrechten voor dit kanaal ingesteld.</string>
@@ -1098,11 +1072,6 @@ om deze [gekheid] te voorkomen(%1$s).**"</string>
 voor elk bericht dat op deze server wordt verstuurd of niet. We raden ten zeerste aan om dit alleen in te stellen voor @mentions voor een openbare Discord"</string>
     <string name="form_help_explicit_content_filter">"Scan en verwijder automatisch berichten die op deze server zijn verzonden en die expliciete inhoud bevatten. Kies hoe breed
 de filter wordt toegepast op leden op je server. **We raden aan om een filter in te stellen voor een openbare Discord.**"</string>
-    <string name="form_help_instant_invite_channel">"Als een kanaal wordt geselecteerd, wordt een directe uitnodigingslink gegenereerd met de widget,
-en anders worden alleen online leden en spraakkanalen verstrekt."</string>
-    <string name="form_help_last_seen">"Snoeien zal **%1$s** een kick geven die 
-al **%2$s** gezien zijn en geen rol hebben toegewezen gekregen.
-Ze kunnen met een nieuwe directe uitnodiging opnieuw lid worden van de server."</string>
     <string name="form_help_legacy_subsystem">"Bepaalde stuurprogramma's voor audiobestanden vertonen problemen bij het gebruik van het moderne audiosubsysteem van je besturingssysteem.
 Vink dit vakje aan om terug te keren naar een verouderd audiosubsysteem."</string>
     <string name="form_help_nsfw">"Gebruikers moeten bevestigen dat ze de wettelijke leeftijd hebben bereikt om de inhoud van dit kanaal te bekijken.
@@ -1112,7 +1081,6 @@ site, kunje dynamisch &amp;username= aan de querystring toevoegen."</string>
     <string name="form_help_qos">"Hints voor je router dat de pakketten die Discord verzendt, hoge prioriteit hebben.
 Sommige routers of internetserviceproviders kunnen zich misdragen wanneer deze is ingesteld."</string>
     <string name="form_help_slowmode">Leden zijn beperkt tot het verzenden van één bericht per interval, tenzij ze beschikken over de machtiging Kanaal beheren of Berichten beheren.</string>
-    <string name="form_help_system_channel">Stuur een bericht naar dit kanaal wanneer iemand zich bij deze server voegt. Berichten zijn willekeurig. Dit kan op elk moment worden uitgeschakeld.</string>
     <string name="form_help_temporary">Leden worden automatisch gekickt als ze de verbinding verbreken, tenzij een rol is toegewezen.</string>
     <string name="form_help_user_limit">"Beperkt het aantal gebruikers dat verbinding kan maken met dit spraakkanaal. Gebruikers met de machtiging om **Leden te verplaatsen**
 negeren deze limiet en kunnen andere gebruikers naar het kanaal verplaatsen."</string>
@@ -1157,8 +1125,8 @@ direct berichtengesprek kunnen starten. Als een lid een toegewezen rol heeft, is
     <string name="form_label_input_mode">Invoermodus</string>
     <string name="form_label_input_sensitivty">Invoergevoeligheid</string>
     <string name="form_label_input_volume">Invoervolume</string>
-    <string name="form_label_instant_invite">Voer een directe uitnodiging in</string>
-    <string name="form_label_instant_invite_channel">Kanaal directe uitnodiging</string>
+    <string name="form_label_instant_invite">Voer een uitnodiging in</string>
+    <string name="form_label_instant_invite_channel">Uitnodiging kanaal</string>
     <string name="form_label_json_api">JSON-API</string>
     <string name="form_label_last_seen">Laatst gezien</string>
     <string name="form_label_local_mute">Lokaal dempen</string>
@@ -1226,7 +1194,6 @@ direct berichtengesprek kunnen starten. Als een lid een toegewezen rol heeft, is
     <string name="form_label_suppress_everyone">Onderdruk **@everyone** en **@here**</string>
     <string name="form_label_synced_role">Gesynchroniseerde rol</string>
     <string name="form_label_synced_subs">Gesynchroniseerde subs</string>
-    <string name="form_label_system_channel">Berichtenkanaal van nieuwe leden</string>
     <string name="form_label_temporary">Tijdelijk lidmaatschap</string>
     <string name="form_label_tts">Tekst naar spraak</string>
     <string name="form_label_tts_notifications">Tekst-naar-spraak-meldingen</string>
@@ -1283,7 +1250,6 @@ Bedankt dat je de dingen veilig en gezond houdt."</string>
     <string name="game_action_button_game_not_detected">Game niet gedetecteerd</string>
     <string name="game_action_button_install">Installeer</string>
     <string name="game_action_button_locate">Zoeken</string>
-    <string name="game_action_button_login_to_buy">Log in om aan te kopen</string>
     <string name="game_action_button_now_playing">Speelt nu</string>
     <string name="game_action_button_paused">Gepauzeerd</string>
     <string name="game_action_button_play">Speel</string>
@@ -1321,7 +1287,6 @@ Bedankt dat je de dingen veilig en gezond houdt."</string>
     <string name="game_feed_activity_recently_played">Recent gespeeld</string>
     <string name="game_feed_activity_streaming_twitch">Streamt op Twitch</string>
     <string name="game_feed_current_header_title">Speelt nu</string>
-    <string name="game_feed_settings_visibility">Weergeven op Games-tabblad</string>
     <string name="game_feed_unknown_player">Onbekende speler</string>
     <string name="game_feed_user_played_days_ago">Speelde %1$s %2$s geleden</string>
     <string name="game_feed_user_played_hours_ago">Speelde %1$s %2$s geleden</string>
@@ -1389,6 +1354,7 @@ Bedankt dat je de dingen veilig en gezond houdt."</string>
     <string name="generate_a_new_link">Een nieuwe link genereren</string>
     <string name="get_started">Ga aan de slag</string>
     <string name="gif_auto_play_label">"Speel automatisch GIF's af wanneer Discord gericht is."</string>
+    <string name="go_live_hardware_acceleration_unavailable">Let op, we kunnen geen hardwareversnelling waarnemen. Je computer ondervindt mogelijk problemen met het ondersteunen van Go Live.</string>
     <string name="go_live_hey">Hoi!</string>
     <string name="go_live_listen">Luister!</string>
     <string name="go_live_look">Kijk!</string>
@@ -1402,6 +1368,7 @@ Bedankt dat je de dingen veilig en gezond houdt."</string>
     <string name="go_live_modal_select_channel_form_title">Selecteer een spraakkanaal</string>
     <string name="go_live_modal_select_channel_placeholder">Zoek naar spraakkanalen</string>
     <string name="go_live_modal_title">Live gaan</string>
+    <string name="go_live_video_drivers_outdated">Jouw videodrivers zijn verouderd. Update ze voor betere Go Live-prestaties.</string>
     <string name="grant_temporary_membership">Verleen tijdelijk lidmaatschap</string>
     <string name="group">Groep</string>
     <string name="group_dm_add_friends">Voeg vrienden toe op DM</string>
@@ -1478,8 +1445,6 @@ Bedankt dat je de dingen veilig en gezond houdt."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Verleende** %1$s voor **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Verplaatst van **%1$s** naar **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">In positie **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) creëerde een tekstkanaal $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Het onderwerp gewijzigd in **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Onderwerp ingesteld op **%1$s**</string>
@@ -1574,6 +1539,8 @@ Bedankt dat je de dingen veilig en gezond houdt."</string>
     <string name="guild_settings_filter_all_actions">Alle acties</string>
     <string name="guild_settings_filter_all_users">Alle gebruikers</string>
     <string name="guild_settings_filter_user">Filteren op gebruiker</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">720p 60fps Go Live-streams</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">1080p 60fps Go Live-streams</string>
     <string name="guild_settings_label_audit_log">Audit-logboek</string>
     <string name="guild_settings_label_audit_log_empty_body">Zodra moderators beginnen te modereren, kun je de moderatie hier modereren.</string>
     <string name="guild_settings_label_audit_log_empty_title">Nog geen logboeken</string>
@@ -1605,7 +1572,7 @@ Als je toegang hebt tot de gebruikers van jesite, kun je dynamisch &amp;username
     <string name="help_role_locked_mine">De rol is vergrendeld omdat het je hoogste rol is. Vraag een hogere rang of servereigenaar om hulp.</string>
     <string name="help_singular_permission">Je kunt deze toestemming niet wijzigen, omdat het verwijderen ervan die van jou zou verwijderen.</string>
     <string name="hide_instant_invites_description">Aanbevolen als je niet wilt dat willekeurige mensen toegang krijgen tot je Discord-servers.</string>
-    <string name="hide_instant_invites_label">Directe uitnodigingslinks verbergen</string>
+    <string name="hide_instant_invites_label">Uitnodigingslinks verbergen</string>
     <string name="hide_muted">Verberg %1$s gedempte kanalen</string>
     <string name="hide_muted_channels">Gedempte kanalen verbergen</string>
     <string name="hide_personal_information_description">Verbergt e-mail, verbonden accounts, notities en anonimiseert DiscordTags.</string>
@@ -1655,7 +1622,6 @@ Als je toegang hebt tot de gebruikers van jesite, kun je dynamisch &amp;username
     <string name="hypesquad_question_11_response_d">Stelt voor dat Wumpus de tamboerijn oppikt</string>
     <string name="hypesquad_question_12_prompt">Je staat op top van de hoogste berg en het enige dat je van rijkdom scheidt is de driekoppige draak van de torenspits die je in de weg staat. Jij:</string>
     <string name="hypesquad_question_12_response_a">Gaat het gevecht aan</string>
-    <string name="hypesquad_question_12_response_b">Bekijkt oude Godzilla-bewegingen om te leren van zijn gevechten tegen koning Ghidorah</string>
     <string name="hypesquad_question_12_response_c">Probeer de draak te overtuigen om de rijkdommen te splitsen</string>
     <string name="hypesquad_question_12_response_d">Bied de draak een Wumpus-pluche aan, hoe kan hij deze weigeren?</string>
     <string name="hypesquad_question_13_prompt">Wat is dat geluid?:</string>
@@ -1756,13 +1722,13 @@ Als je toegang hebt tot de gebruikers van jesite, kun je dynamisch &amp;username
     <string name="input_mode_ptt_release_delay">Push to Talk Vertraging vrijgeven</string>
     <string name="input_mode_vad">Spraakactiviteit</string>
     <string name="install_location_main">Hoofdmenu</string>
-    <string name="instant_invite">Directe uitnodiging</string>
+    <string name="instant_invite">Uitnodiging</string>
     <string name="instant_invite_accept">Uitnodiging accepteren</string>
-    <string name="instant_invite_accepted">Directe uitnodiging geaccepteerd</string>
-    <string name="instant_invite_accepting">Directe uitnodiging wordt geaccepteerd</string>
+    <string name="instant_invite_accepted">Uitnodiging geaccepteerd</string>
+    <string name="instant_invite_accepting">Uitnodiging accepteren</string>
     <string name="instant_invite_ask_for_new_invite">Vraag een nieuwe!</string>
     <string name="instant_invite_ask_user_for_new_invite">Vraag %1$s om een nieuwe uitnodiging!</string>
-    <string name="instant_invite_expired">De directe uitnodiging is ongeldig of is verlopen.</string>
+    <string name="instant_invite_expired">De uitnodiging is ongeldig of verlopen.</string>
     <string name="instant_invite_expires">Vervalt</string>
     <string name="instant_invite_failed_to_generate">Kan geen uitnodigingslink maken.</string>
     <string name="instant_invite_generate">Genereren</string>
@@ -1779,16 +1745,15 @@ Als je toegang hebt tot de gebruikers van jesite, kun je dynamisch &amp;username
     <string name="instant_invite_regenerate">Regenereren</string>
     <string name="instant_invite_resolved_body">Je bent uitgenodigd op **%1$s** in **%2$s**.</string>
     <string name="instant_invite_resolved_title">Hee hallo.</string>
-    <string name="instant_invite_resolving">Directe uitnodiging oplossen</string>
+    <string name="instant_invite_resolving">Uitnodiging oplossen</string>
     <string name="instant_invite_uses">Gebruik</string>
     <string name="instant_invite_you_are_already_a_member_of">Je bent al lid van</string>
     <string name="instant_invite_you_have_been_invited_to_join">Je bent uitgenodigd om mee te doen</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** nodigt je uit om mee te doen</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Je bent uitgenodigd om lid te worden van een groeps-DM door</string>
-    <string name="instant_invites">Directe uitnodigingen</string>
+    <string name="instant_invites">Uitnodigingen</string>
     <string name="integration_settings">Integratie-instellingen</string>
     <string name="integrations">Integraties</string>
-    <string name="integrations_header">Verbonden Twitch/YouTube gaming-accounts</string>
     <string name="integrations_pro_tip">"Ga voor meer integraties naar [Discord's StreamKit](%1$s)."</string>
     <string name="internal_server_error">Er is een interne serverfout opgetreden. Probeer het opnieuw.</string>
     <string name="invalid_animated_emoji_body">Deze emoji werkt niet omdat deze is geanimeerd. Upgrade naar Discord Nitro om al je geanimeerde emoji-dromen te vervullen</string>
@@ -1895,13 +1860,13 @@ Wil je meer weten over Discord?"</string>
     <string name="join_afk_channel_body">Het lijkt erop dat je je bij het AFK-kanaal hebt aangesloten. Je kunt niet in dit kanaal spreken.</string>
     <string name="join_call">Meedoen met oproep</string>
     <string name="join_server">Deelnemen</string>
-    <string name="join_server_button_body">Voer een directe uitnodiging in en sluit je aan bij de server van je vriend.</string>
+    <string name="join_server_button_body">Voer een uitnodiging in en sluit je aan bij de server van je vriend.</string>
     <string name="join_server_button_cta">Deelnemen aan een server</string>
     <string name="join_server_button_cta_mobile">Aan server deelnemen met een uitnodigingslink</string>
     <string name="join_server_button_cta_mobile_desc">Heb je een uitnodigingscode of link? Gebruik hem hier!</string>
     <string name="join_server_button_cta_named">Deelnemen aan %1$s</string>
-    <string name="join_server_description">Voer hieronder een directe uitnodiging in om je aan te sluiten bij een bestaande server. De uitnodiging ziet er ongeveer zo uit:</string>
-    <string name="join_server_description_mobile">Voer hierboven een directe uitnodiging in om je aan te sluiten bij een bestaande server.</string>
+    <string name="join_server_description">Voer hieronder een uitnodiging in om je aan te sluiten bij een bestaande server. De uitnodiging ziet er ongeveer zo uit:</string>
+    <string name="join_server_description_mobile">Voer hierboven een uitnodiging in om je aan te sluiten bij een bestaande server.</string>
     <string name="join_server_title">Aan server deelnemen</string>
     <string name="join_stream">Deelnemen aan stream</string>
     <string name="join_video_call">Meedoen met videogesprek</string>
@@ -2007,7 +1972,7 @@ terwijl je spreekt."</string>
     <string name="link_your_xbox_account_1">Koppel je Xbox-account aan Discord om te laten zien welke game je speelt.</string>
     <string name="link_your_xbox_account_2">Discord is een alles-in-één spraak- en tekstchat voor gamers die gratis en veilig is en op zowel je computer als je telefoon werkt.</string>
     <string name="listening_to">Luistert naar **%1$s**</string>
-    <string name="live_beta_description">Welkom bij de stream! Go Live is in beta. Onze excuses voor enige problemen</string>
+    <string name="live_beta_description">Welkom bij de stream! Go Live is in beta. Onze excuses voor eventuele problemen</string>
     <string name="live_on_twitch">Live op Twitch</string>
     <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Kon afbeelding niet laden.
@@ -2193,14 +2158,11 @@ Discord te kunnen blijven gebruiken."</string>
     <string name="no_emoji_title">Geen emoji</string>
     <string name="no_input_devices">Geen invoerapparaten</string>
     <string name="no_input_devices_detected">We kunnen geen invoerapparaten detecteren, sluit er een aan en probeer het opnieuw.</string>
-    <string name="no_instant_invite">Geen directe uitnodiging</string>
-    <string name="no_integrations">[Verbind](onConnect) je gekoppelde Twitch- of YouTube Gaming-account om je abonnees/sponsors te synchroniseren met een rol</string>
+    <string name="no_instant_invite">Geen uitnodiging</string>
     <string name="no_integrations_body">Protocol FR13NDSH1P kan alleen vanuit een Discordclient worden uitgevoerd</string>
     <string name="no_integrations_label">Geen integraties</string>
-    <string name="no_invites_body">"Voel je je doelloos? Zoals een papieren vliegtuigje dat door de lucht zweeft?
-Haal een paar vrienden hierheen door een directe uitnodiging te maken!"</string>
-    <string name="no_invites_caption">Nog geen directe uitnodigingen!</string>
-    <string name="no_invites_label">Nog geen directe uitnodigingen</string>
+    <string name="no_invites_caption">Nog geen uitnodigingen!</string>
+    <string name="no_invites_label">Nog geen uitnodigingen</string>
     <string name="no_mail_account_description">Stuur je feedback naar support@discordapp.com en we hebben je gebruikersinformatie gekopieerd naar het klembord.</string>
     <string name="no_mail_account_title">Geen e-mailaccount</string>
     <string name="no_mic_body">Instructies voor toegang tot je microfoon zijn te vinden in het Helpcentrum van Discord.</string>
@@ -2218,7 +2180,6 @@ vastgepinde berichten, althans nog niet."</string>
     <string name="no_reactions_header">Geen reacties</string>
     <string name="no_recent_mentions">En in het begin… was er stilte.</string>
     <string name="no_send_messages_permission_placeholder">Je bent niet gemachtigd om berichten in dit kanaal te sturen.</string>
-    <string name="no_system_channel">Geen berichten van nieuwe leden</string>
     <string name="no_text">Nee</string>
     <string name="no_thanks">Nee, bedankt</string>
     <string name="no_user_limit">Geen beperking</string>
@@ -2230,7 +2191,6 @@ vastgepinde berichten, althans nog niet."</string>
     <string name="note">Notitie</string>
     <string name="note_placeholder">Klik om een notitie toe te voegen</string>
     <string name="note_placeholder_mobile">Tik om een notitie toe te voegen</string>
-    <string name="notice_application_test_mode">"Testmodus is momenteel actief voor **%1$s**. Niet-gepubliceerde SKU's worden weergegeven en er worden geen kosten in rekening gebracht voor gerelateerde betalingen."</string>
     <string name="notice_application_test_mode_go_to_listing">Ga naar SKU</string>
     <string name="notice_connect_spotify">Verbind je Spotify-account om je muziek in je status weer te geven!</string>
     <string name="notice_connection_conflict">Je stem is verbroken omdat je op een andere locatie bent verbonden.</string>
@@ -2240,7 +2200,6 @@ vastgepinde berichten, althans nog niet."</string>
     <string name="notice_dispatch_error_disk_low">Je hebt niet genoeg schijfruimte. %1$s is nodig maar er is maar %2$s beschikbaar.</string>
     <string name="notice_dispatch_error_file_name_too_long">Oh nee, deze game heeft bestandsnamen die te lang zijn voor Windows. Selecteer een kortere installatiemap.</string>
     <string name="notice_dispatch_error_invalid_drive">Oh nee, de installatielocatie die je hebt gekozen is niet geldig. Je koos %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">We hebben de game niet bijgewerkt. Is hij momenteel actief?</string>
     <string name="notice_dispatch_error_no_manifests">Oh nee, het lijkt erop dat er geen inhoud is voor deze game. Neem contact op met ondersteuning.</string>
     <string name="notice_dispatch_error_not_entitled">Oh nee, het lijkt erop dat je deze game niet bezit. Neem contact op met ondersteuning als je denkt dat dit een fout is.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Het lijkt erop dat je nee hebt gezegd tegen een installatiescript. Je moet ja zeggen om de game te installeren.</string>
@@ -2254,9 +2213,6 @@ vastgepinde berichten, althans nog niet."</string>
     <string name="notice_mfa_sms_backup_button">Voeg telefoon toe</string>
     <string name="notice_native_apps">Wil je een systeemwijde push-to-talk? Download de desktop-app!</string>
     <string name="notice_no_input_detected">Nou, het lijkt erop dat Discord geen enkele input van je microfoon detecteert. Laten we dat samen oplossen.</string>
-    <string name="notice_premium_applications_grandfathered_ended">Je toegang tot Nitro is verlopen. Upgrade van Nitro Classic naar Nitro voor onbeperkte toegang tot geweldige games.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Je hebt nog maar %1$s Nitro-games beschikbaar! Je toegang eindigt op **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Bedankt dat je een vroege Nitro-supporter bent! Als geschenk omdat je zo geweldig bent, heb je nu tot %1$s toegang tot Nitro-games.</string>
     <string name="notice_premium_promo_action">Bekijk ze</string>
     <string name="notice_premium_promo_message">Ondersteun de ontwikkeling van Discord en krijg leuke voordelen!</string>
     <string name="notice_scheduled_maintenance">Discord ondergaat gepland onderhoud op **%1$s** om **%2$s**.</string>
@@ -2325,7 +2281,6 @@ Ontving je een uitnodigingslink van een vriend? Voer je uitnodigingslink of -cod
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Overlay ingeschakeld</string>
     <string name="nux_post_reg_join_server_description">Haal het maximale uit Discord door lid te worden van een server.</string>
     <string name="nux_post_reg_join_server_skip">Ik heb er geen</string>
     <string name="nux_post_reg_join_server_title">Heb je een uitnodiging?</string>
@@ -2368,8 +2323,6 @@ Ook kan de overlay niet voor iedereen werken. Als je problemen of vragen hebt, r
     <string name="overlay_link_alert_secondary">Open en stoor me niet opnieuw.</string>
     <string name="overlay_link_alert_title">Ho even!</string>
     <string name="overlay_menu_get_invite">Krijg uitnodigingslink</string>
-    <string name="overlay_menu_switch_channels">Kanalen veranderen</string>
-    <string name="overlay_mobile_toggle_desc">Bekijk wie er aan het praten is en krijg toegang tot shortcuts bij het gebruiken van andere apps wanneer spraak is ingeschakeld</string>
     <string name="overlay_mobile_toggle_label">Inschakelen mobiele spraakoverlay</string>
     <string name="overlay_mobile_unauthed">Log in bij de Discord-app om deze functie in te schakelen.</string>
     <string name="overlay_news_go_live_body">Wil je je %1$s streamen naar je vrienden in %2$s?</string>
@@ -2377,7 +2330,6 @@ Ook kan de overlay niet voor iedereen werken. Als je problemen of vragen hebt, r
     <string name="overlay_news_text_pinning_body">Je kunt nu een tekstchat vastpinnen aan je game!</string>
     <string name="overlay_news_text_pinning_tip">Tip: Je kunt een chat vastpinnen door op $[pinIcon](pinHook) te drukken</string>
     <string name="overlay_news_text_pinning_title">Discord-overlay bijgewerkt</string>
-    <string name="overlay_no_results">We hebben overal gezocht, maar konden geen spraakkanalen vinden</string>
     <string name="overlay_notification_incoming_call">Inkomende oproep…</string>
     <string name="overlay_notification_settings_disabled">Meldingen uitgeschakeld</string>
     <string name="overlay_notification_settings_position">Toont: %1$s</string>
@@ -2387,7 +2339,6 @@ Ook kan de overlay niet voor iedereen werken. Als je problemen of vragen hebt, r
     <string name="overlay_notifications_settings">Overlay-meldingen</string>
     <string name="overlay_notifications_top_left">Linksboven</string>
     <string name="overlay_notifications_top_right">Rechtsboven</string>
-    <string name="overlay_private_channels_empty_state">Nee, geen directe berichten hier.</string>
     <string name="overlay_reload">Overlay opnieuw laden</string>
     <string name="overlay_settings">Overlay-instellingen</string>
     <string name="overlay_settings_general_tab">Algemeen</string>
@@ -2409,7 +2360,6 @@ Ook kan de overlay niet voor iedereen werken. Als je problemen of vragen hebt, r
     <string name="pagination_page_of">Pagina %1$s van %2$s</string>
     <string name="pagination_previous">Vorige</string>
     <string name="paginator_of_pages">Pagina %1$s van %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Discord-partner</string>
     <string name="party_full">Groep is vol</string>
     <string name="party_join">Word lid van groep</string>
@@ -2438,22 +2388,17 @@ Ook kan de overlay niet voor iedereen werken. Als je problemen of vragen hebt, r
     <string name="payment_source_card_number">Kaartnummer</string>
     <string name="payment_source_confirm_paypal_details">Bevestig je PayPal-details in je browser!</string>
     <string name="payment_source_credit_card">Kredietkaart</string>
-    <string name="payment_source_delete">Verwijder betalingswijze</string>
-    <string name="payment_source_delete_disabled_tooltip">Deze betalingswijze kan niet verwijderd worden terwijl je een actief abonnement hebt bij Nitro.</string>
     <string name="payment_source_edit_help_paypal">Om je PayPal betalingsinformatie te bewerken, ga naar [PayPal.com](%1$s).</string>
     <string name="payment_source_expiration_date">Vervaldatum</string>
     <string name="payment_source_expiration_date_placeholder">MM/JJ</string>
     <string name="payment_source_information">Betalingsinformatie</string>
-    <string name="payment_source_make_default">Stel dit in als mijn standaard betalingswijze.</string>
     <string name="payment_source_name">Naam op kaart</string>
     <string name="payment_source_name_error_required">Naam is vereist.</string>
     <string name="payment_source_name_placeholder">Hoe heet je, reiziger?</string>
     <string name="payment_source_paypal_details">Paypal-details</string>
     <string name="payment_source_paypal_reopen">Open je venster opnieuw</string>
-    <string name="payment_source_title">Betalingswijze</string>
     <string name="payment_source_type">Betalingswijze</string>
     <string name="payment_source_type_select">Selecteer een betalingswijze</string>
-    <string name="payment_sources_add">Voeg een nieuwe betalingswijze toe</string>
     <string name="payment_steps_go_back">Terug</string>
     <string name="paypal_account_verifying">Verbinden met PayPal</string>
     <string name="paypal_callback_error">Er ging iets fout, gelieve het opnieuw te proberen.</string>
@@ -2501,18 +2446,11 @@ Ook kan de overlay niet voor iedereen werken. Als je problemen of vragen hebt, r
     <string name="popout_return">Terug naar app</string>
     <string name="popout_stay_on_top">Blijf aan de top</string>
     <string name="premium_alert_error_title">Oeps, er ging iets fout…</string>
-    <string name="premium_applications_grandfathered_monthly">Om je te bedanken voor het ondersteunen van Discord, krijg je gedurende een jaar toegang tot Nitro-games. Dit aanbod eindigt op **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">Om je te bedanken voor het ondersteunen van Discord, krijg je gedurende twee jaar toegang tot Nitro-games. Dit aanbod eindigt op **%1$s**.</string>
-    <string name="premium_applications_subtitle">Onbeperkte toegang tot een groeiende bibliotheek geweldige games die jij en je vrienden ongetwijfeld moeten spelen.</string>
-    <string name="premium_applications_title">Talloze aanbevolen games. Een lage maandelijkse prijs.</string>
     <string name="premium_badge_tooltip">Abonnee sinds %1$s</string>
     <string name="premium_cancel_cancel">Neuh</string>
     <string name="premium_cancel_confirm_body_tier_1">"Je annulering zal van kracht gaan op het einde van je huidige facturatieperiode op **%1$s**. Je Discord Tag wordt willekeurig verdeeld als je deze hebt gewijzigd
 
 Je kan op elk moment een nieuw abonnement starten."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Je annulering zal van kracht gaan op het einde van je huidige facturatieperiode. Op **%1$s**, zal je de toegang verliezen tot alle Nitro-games in je bibliotheek en je Discord Tag zal willekeurig worden als je hem had aangepast.
-
-We zullen je save-bestanden veilig bijhouden mocht je van mening veranderen. Je kan je op elk moment opnieuw inschrijven!"</string>
     <string name="premium_cancel_confirm_new">Yep, annuleren %1$s</string>
     <string name="premium_cancel_confirm_title">%1$sAnnuleren?</string>
     <string name="premium_cancel_failed_body">We kunnen je Nitro-abonnement niet annuleren. Probeer het opnieuw of neem contact op met ons ondersteuningsteam als dit probleem zich blijft voordoen.</string>
@@ -2529,19 +2467,15 @@ We zullen je save-bestanden veilig bijhouden mocht je van mening veranderen. Je
     <string name="premium_chat_perks_description_custom_emoji">Haal een globaal paspoort om je gepersonaliseerde emoji overal te gebruiken.</string>
     <string name="premium_chat_perks_description_discriminator">Kies je tag terwijl je lid bent van Nitro.</string>
     <string name="premium_chat_perks_description_screenshare">Verbeter je game met schermdelen met 720p 60fps of 1080p 30fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Grotere bestandgrootte upload voor %1$s van %2$s voor het delen van meme van hoge kwaliteit.</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Geanimeerd plezier</string>
     <string name="premium_chat_perks_title_badge">Laat zien dat je steunt</string>
     <string name="premium_chat_perks_title_custom_emoji">Globale gepersonaliseerde emoji</string>
     <string name="premium_chat_perks_title_discriminator">Gepersonaliseerde Discord Tag</string>
     <string name="premium_chat_perks_title_screenshare">Video van hogere kwaliteit</string>
+    <string name="premium_chat_perks_title_streaming">Betere Go Live-streams</string>
     <string name="premium_code_redemption_confirmation_blurb">Dankzij een willekeurige string cijfers, heb je nu verbeterde chatvoordelen gedurende %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">Nou, cool!</string>
-    <string name="premium_feature_new_chat_perks_header">Je krijgt ook wat verbeterde chatvoordelen:</string>
-    <string name="premium_feature_new_premium_applications_header">Meer dan %1$s aan games. Bekijk ze hier:</string>
-    <string name="premium_feature_view_applications">Bekijk alle Nitro-games</string>
     <string name="premium_features_chat_perks">Chatvoordelen</string>
-    <string name="premium_features_premium_applications">Gratis games</string>
     <string name="premium_grandfathered_warning">Als bedankje voor je steun heb je een Nitro-plan met korting. **Als je je abonnement annuleert of wijzigt, verlies je deze korting.** Je bent gewaarschuwd!!!!!</string>
     <string name="premium_grandfathered_warning_confirm">Doe het toch maar</string>
     <string name="premium_grandfathered_warning_title">Pas op, vriend</string>
@@ -2551,10 +2485,7 @@ We zullen je save-bestanden veilig bijhouden mocht je van mening veranderen. Je
     <string name="premium_not_claimed">Claim eerst je account</string>
     <string name="premium_not_claimed_body">Hi buddy! Als je Nitro wilt aankopen zal je eerst een account moeten aanmaken zodat je alles kan bijhouden.</string>
     <string name="premium_not_verified">Controleer eerst je e-mail</string>
-    <string name="premium_not_verified_body">Hé vriend! Als je Nitro wilt kopen, moet je eerst je e-mail verifieren. Controleer je e-mail of vraag een nieuwe aan.</string>
-    <string name="premium_payment_applications_os_warning">Nitro-games worden alleen ondersteund op Windows.</string>
     <string name="premium_payment_confirmation_blurb_regular">Je hebt nu de kracht van verbeterde chatvoordelen. Stop met lezen en ga chatten!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Je hebt nu onbeperkte toegang tot enorm veel geweldige games. Stop met lezen en ga ze spelen!!!</string>
     <string name="premium_payment_confirmation_button_regular">Oké, klinkt goed</string>
     <string name="premium_plan_month">Nitro maandelijks</string>
     <string name="premium_plan_month_tier_1">Nitro Classic maandelijks</string>
@@ -2575,13 +2506,10 @@ We zullen ook je huidige plan verrekenen en aftrekken van de jaarlijkse prijs. J
     <string name="premium_upgrade_disabled_current_tooltip">Je huidige plan.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Je moet eerst annuleren en je abonnement laten verlopen, voor je een lager plan kan kiezen.</string>
     <string name="premium_upgrade_done_body_tier_1">Je hebt nu verbeterde chatvoordelen!</string>
-    <string name="premium_upgrade_done_body_tier_2">Je hebt nu verbeterde chatvoordelen en toegang tot tientallen games!</string>
     <string name="premium_upgrade_done_button_tier_1">Cool!</string>
-    <string name="premium_upgrade_done_button_tier_2">Bekijk alle Nitro-games</string>
     <string name="premium_upgrade_failed_body">Ojee.. die upgrade werkte niet. Zorg ervoor dat je betalingsinformatie up-to-date is en probeer het opnieuw.</string>
     <string name="premium_upload_promo">Upgrade naar Discord Nitro voor %1$s bestandslimiet</string>
     <string name="premium_year_free_months">Krijg 2 maanden gratis!</string>
-    <string name="premium_year_free_months_short">2 maand gratis</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s**/jaar</string>
     <string name="preview_chat">Voorbeeld chat</string>
     <string name="priority_speaker">Prioriteitsspreker</string>
@@ -2604,8 +2532,6 @@ geactiveerd door de **%1$s** toetsencombinatie te gebruiken."</string>
     <string name="ptt_limited_body">"Push to Talk (Beperkt) werkt alleen wanneer dit browsertabblad focus heeft. Download de desktop-applicatie
 voor systeemwijde Push to Talk."</string>
     <string name="ptt_limited_title">Hoi, even ter herinnering</string>
-    <string name="ptt_limited_warning">"Push to Talk (Beperkt) werkt alleen wanneer dit browsertabblad focus heeft. [Download](onDownloadClick) de
-desktop-applicatie voor systeemwijde Push to Talk."</string>
     <string name="ptt_permission_body">"Je hebt %1$s opgestart als beheerder. Start Discord opnieuw als beheerder om Push-to-talk
 detectie in te schakelen terwijl de game focus heeft."</string>
     <string name="ptt_permission_title">Push-to-talk vraagt om toestemming</string>
@@ -2763,7 +2689,7 @@ gegevens te verzenden."</string>
     <string name="scope_guilds">Weten in welke servers je zit</string>
     <string name="scope_guilds_empty">Je zit niet op een server.</string>
     <string name="scope_guilds_join">Neem deel aan servers voor jou</string>
-    <string name="scope_guilds_join_description">Gebruik namens jou directe uitnodigingen.</string>
+    <string name="scope_guilds_join_description">Gebruik namens jou uitnodigingen.</string>
     <string name="scope_identify">Toegang tot je gebruikersnaam en avatar</string>
     <string name="scope_messages_read">Alle berichten lezen</string>
     <string name="scope_messages_read_description">Hierdoor kan de app alle berichten lezen die toegankelijk zijn via je Discord-account</string>
@@ -2825,7 +2751,6 @@ Kies het scherm dat je wilt delen."</string>
     <string name="search_filter_on">op</string>
     <string name="search_for_emoji">Zoek de perfecte emoji</string>
     <string name="search_for_empty">Zoeken</string>
-    <string name="search_for_value">Zoeken naar: **%1$s**</string>
     <string name="search_group_header_channels">In kanaal</string>
     <string name="search_group_header_dates">Datums</string>
     <string name="search_group_header_file_name">Bestandsnaam bevat</string>
@@ -3022,8 +2947,6 @@ Weet je zeker dat je dit wilt doen?"</string>
     <string name="stop_ringing">Belgeluid stoppen</string>
     <string name="stop_streaming">Streamen stoppen</string>
     <string name="stop_watching">Bekijken stoppen</string>
-    <string name="store_payment_legalese_monthly">Hoi! Door %1$s aan te kopen ga je akkoord met onze [Store-Servicevoorwaarden](%2$s). %1$s is een periodiek abonnement, wat betekent dat we je vandaag zullen aanrekenen en je maandelijks blijven factureren tot je je abonnement opzegt. Je kan op elk moment opzeggen via je scherm Gebruikersinstellingen.</string>
-    <string name="store_payment_legalese_yearly">Hoi! Door %1$s aan te kopen ga je akkoord met onze [Store-Servicevoorwaarden](%2$s). %1$s is een periodiek abonnement, wat betekent dat we je vandaag zullen aanrekenen en je jaarlijks blijven factureren tot je je abonnement opzegt. Je kan op elk moment opzeggen via je scherm Gebruikersinstellingen.</string>
     <string name="stream">Live gaan</string>
     <string name="stream_bad_spectator">De stream die je momenteel bekijkt ondervindt verminderde video- of audiokwaliteit. Dit kan het gevolg zijn van een netwerkconditie.</string>
     <string name="stream_bad_streamer">Je stream ondervindt momenteel verminderde video- of audiokwaliteit. Dit kan het gevolg zijn van een netwerkconditie.</string>
@@ -3031,7 +2954,6 @@ Weet je zeker dat je dit wilt doen?"</string>
     <string name="stream_capture_paused_details">Ga naar je spel om verder te gaan.</string>
     <string name="stream_capture_paused_details_viewer">%1$s heeft het spel geminimaliseerd… even geduld!</string>
     <string name="stream_channel_description">Leden met deze toelating kunnen in dit kanaal streamen.</string>
-    <string name="stream_description">Leden met deze toelating kunnen in dit kanaal.</string>
     <string name="stream_ended">Deze stream is gestopt. *krekelgeluid*</string>
     <string name="stream_ended_button">Stream beëindigd</string>
     <string name="stream_ended_no_spectators">Er zijn geen kijkers want de stream werd beëindigd.</string>
@@ -3071,7 +2993,6 @@ Weet je zeker dat je dit wilt doen?"</string>
     <string name="stream_report_rating_body_streamer">Vertel ons over je ervaring bij het streamen.</string>
     <string name="stream_report_submit">Verzenden</string>
     <string name="stream_reported">Feedback verzonden</string>
-    <string name="stream_reported_body">Bedankt om je probleem te rapporteren! Je feedback helpt ons om de kwaliteit van de stream te verbeteren.</string>
     <string name="stream_soundshare_failed">Hoi, er ging iets mis en we konden het geluid van je game niet streamen.</string>
     <string name="streamer_mode">Streamer-modus</string>
     <string name="streamer_mode_enabled">Streamer-modus ingeschakeld</string>
@@ -3129,7 +3050,6 @@ Weet je zeker dat je dit wilt doen?"</string>
     <string name="system_message_guild_member_join_10">Een wilde %1$s is verschenen.</string>
     <string name="system_message_guild_member_join_11">Swoooosh. %1$s is zojuist geland.</string>
     <string name="system_message_guild_member_join_12">Hou je vast. %1$s is zojuist op de server gekomen.</string>
-    <string name="system_message_guild_member_join_13">%1$s is er net bijgekomen. Verberg je bananen.</string>
     <string name="system_message_guild_member_join_14">%1$s is zojuist gearriveerd. Lijkt OP - nerf.</string>
     <string name="system_message_guild_member_join_15">%1$s schoof in de server.</string>
     <string name="system_message_guild_member_join_16">Een %1$s is op de server geboren.</string>
@@ -3140,7 +3060,6 @@ Weet je zeker dat je dit wilt doen?"</string>
     <string name="system_message_guild_member_join_21">Uitdager in aantocht - %1$s is verschenen!</string>
     <string name="system_message_guild_member_join_22">Het is een vogel! Het is een vliegtuig! Laat maar, het is gewoon %1$s.</string>
     <string name="system_message_guild_member_join_23">Het is %1$s! Prijs de zon! \\\\[T]/</string>
-    <string name="system_message_guild_member_join_25">Ha! %1$s doet mee! Je hebt mijn valkaart geactiveerd!</string>
     <string name="system_message_guild_member_join_26">Cheers, love! %1$s is er!</string>
     <string name="system_message_guild_member_join_27">Hoi! Luister eens! %1$s doet mee!</string>
     <string name="system_message_guild_member_join_28">We hadden je al verwacht %1$s</string>
@@ -3293,8 +3212,6 @@ Een geclaimd account is vereist om **apps te downloaden**."</string>
     <string name="unsupported_browser">Niet-ondersteunde browser</string>
     <string name="unsupported_browser_body">"Het lijkt erop dat je een niet-ondersteunde browser gebruikt. Om te ervaren wat Discord te bieden heeft, upgrade je
 browser of download je een van onze apps."</string>
-    <string name="unsupported_browser_details">"Je wilt met je team kunnen praten, toch? Schakel over naar de nieuwste Chrome, Opera, Firefox 38+ of download
-de Discord Client om meteen te beginnen met praten!"</string>
     <string name="unsupported_browser_title">Nou, dit is een beetje gênant.</string>
     <string name="unverified_account_body">"Controleer je e-mail en volg de instructies om je account te verifiëren.
 
@@ -3411,8 +3328,6 @@ Houd shift ingedrukt om direct te uploaden."</string>
     <string name="user_settings_appearance_preview_message_4">Compactmodus zal ingeschakeld worden</string>
     <string name="user_settings_appearance_preview_message_5">Oh hier is hij!</string>
     <string name="user_settings_appearance_zoom_tip">Je kunt het zoomniveau wijzigen met %1$s +/- en resetten naar de standaardzoom met %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Toon Games-tabblad</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Schakel dit uit om het tabblad met games te verbergen, zodat AnnBal123 je kunt concentreren op je gesprekken.</string>
     <string name="user_settings_close_button">Knop Sluiten</string>
     <string name="user_settings_confirm_logout">Weet je zeker dat je wilt uitloggen?</string>
     <string name="user_settings_game_activity">Game-activiteiten</string>
@@ -3467,8 +3382,6 @@ Wees ervan bewust dat je server hierdoor openbaar beschikbaar wordt voor iederee
     <string name="vanity_url_hint_mobile">jouw-link-hier</string>
     <string name="verfication_expired">De e-mailverificatielink is verlopen.</string>
     <string name="verfication_expired_suggestion">Log in op Discord en verzend de link opnieuw.</string>
-    <string name="verification_body">"We hebben iets vreemds gezien.
-Om Discord te blijven gebruiken, **moeten we je verifiëren dat je een mens bent**."</string>
     <string name="verification_body_alt">Laten we controleren of je een mens bent…</string>
     <string name="verification_email_body">We hebben een nieuwe verificatiemail verzonden naar **%1$s**. Controleer je inbox en ongewenste e-mail.</string>
     <string name="verification_email_error_body">Er ging iets fout bij het verzenden van de verificatiemail. Probeer het later opnieuw of neem contact op met ondersteuning.</string>
@@ -3507,8 +3420,6 @@ Om Discord te blijven gebruiken, **moeten we je verifiëren dat je een mens bent
     <string name="verify_phone">Telefoon verifiëren</string>
     <string name="verifying">Bezig met verifiëren</string>
     <string name="video_call">Videogesprek</string>
-    <string name="video_poor_connection_body">Video is uitgeschakeld. Hij wordt hervat wanneer je verbinding verbetert.</string>
-    <string name="video_poor_connection_title">Slechte verbinding</string>
     <string name="video_preview">Videovoorbeeld</string>
     <string name="video_settings">Videoinstellingen</string>
     <string name="video_unavailable">Video niet beschikbaar</string>
diff --git a/com.discord/res/values-no/plurals.xml b/com.discord/res/values-no/plurals.xml
index c866d9de3b..8763334c65 100644
--- a/com.discord/res/values-no/plurals.xml
+++ b/com.discord/res/values-no/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">ingen plass</item>
         <item quantity="one">%d plass</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d dager</item>
-        <item quantity="one">1 dag</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d medlemmer</item>
-        <item quantity="zero">0 medlemmer</item>
-        <item quantity="one">1 medlem</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">dager</item>
         <item quantity="one">dag</item>
@@ -209,16 +200,6 @@
         <item quantity="other">tillatelser</item>
         <item quantity="one">en tillatelse</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Angi saktemodus til **!!%d!! sekunder**</item>
-        <item quantity="zero">Deaktivert saktemodus</item>
-        <item quantity="one">Angi saktemodus til **1 sekund**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Angi saktemodus til **!!%d!! sekunder**</item>
-        <item quantity="zero">Angi når saktemodus blir deaktivert</item>
-        <item quantity="one">Angi saktemodus til **1 sekund**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! medlemmer**</item>
         <item quantity="one">**et medlem**</item>
@@ -287,10 +268,6 @@
         <item quantity="other">%d dager</item>
         <item quantity="one">1 dag</item>
     </plurals>
-    <plurals name="live_viewers_viewers">
-        <item quantity="other">seer</item>
-        <item quantity="one">seere</item>
-    </plurals>
     <plurals name="max_uses_description_mobile_maxUses">
         <item quantity="other">%d benyttelser</item>
         <item quantity="zero">ubegrenset antall benyttelser</item>
@@ -318,10 +295,6 @@
         <item quantity="other">%d nye meldinger</item>
         <item quantity="one">1 ny melding</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%ddager</item>
-        <item quantity="one">en dag</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d kanaler</item>
         <item quantity="one">%d kanal</item>
@@ -339,10 +312,6 @@
         <item quantity="other">disse meldingene</item>
         <item quantity="one">denne meldingen</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** servere er utilgjengelige grunnet midlertidig driftsstans.</item>
-        <item quantity="one">**1** server er utilgjengelig grunnet midlertidig driftsstans.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d måneder</item>
         <item quantity="one">1 måned</item>
diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml
index fa6348f75c..292842abaa 100644
--- a/com.discord/res/values-no/strings.xml
+++ b/com.discord/res/values-no/strings.xml
@@ -32,10 +32,8 @@
     <string name="activity_invite_private">"Du kan ikke sende en invitasjon fordi du enten er usynlig eller skjuler spillstatusen din. Hvis du foretrekker å ikke endre
 innstillingene dine, kan du få noen til å invitere deg i stedet."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Forstått!</string>
-    <string name="activity_panel_go_live_hotspot_header">Send live for å strømme spilling direkte til vennene dine!</string>
+    <string name="activity_panel_go_live_hotspot_header">Bruk Go Live for å strømme spilling direkte til vennene dine!</string>
     <string name="activity_panel_go_live_tooltip">Send live</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Denne serveren har ingen kanaler å strømme til.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Du kan ikke strømme til denne talekanalen.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Naviger til en server for å begynne å strømme.</string>
     <string name="add">Legg til</string>
     <string name="add_a_comment_optional">Legg til en kommentar (valgfritt)</string>
@@ -130,7 +128,6 @@ rettighet å gi fra seg."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Du fikk den!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Gå til bibliotek</string>
     <string name="application_entitlement_code_redemption_invalid">Ugyldig kode angitt</string>
-    <string name="application_entitlement_code_redemption_prompt">Har du mottatt en kode for et spill? Angi den under:</string>
     <string name="application_entitlement_code_redemption_redeem">Løs inn</string>
     <string name="application_filter_name_linux">Alle filer</string>
     <string name="application_filter_name_macos">Applikasjoner</string>
@@ -361,7 +358,6 @@ rettighet å gi fra seg."</string>
     <string name="application_store_view_all_news">Se alle nyheter</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Denne DLC-en krever at du eier %1$s på Discord for å kunne spille. [Lær om DLC.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Nedlastbart innhold</string>
-    <string name="application_store_warning_early_access_description">Dette spillet er morsomt (synes vi!), men kan ha begrenset innhold, ulike feil eller føles ufullstendig. [Finn ut mer om tidlig tilgang.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Tidlig tilgang</string>
     <string name="application_store_warning_requires_desktop_app_description">For å kunne spille dette spillet må du ha Discords $[skrivebordsprogram](downloadHook) installert.</string>
     <string name="application_store_warning_requires_desktop_app_title">Krever skrivebordsprogramet</string>
@@ -483,7 +479,6 @@ men ikke nøl hvis og når du må gjøre det!"</string>
     <string name="billing_error_section_card">Å nei! Det ser ut til å være et problem med dette kortet. Endre på feltene og prøv igjen!</string>
     <string name="billing_history">Faktureringshistorikk</string>
     <string name="billing_legal_mumbo_jumbo">Juridisk tåkeprat</string>
-    <string name="billing_legal_mumbo_jumbo_label">Jeg godtar [Discord Store Terms of Service](%1$s)</string>
     <string name="billing_no_payment_method">Ingen betalingsmåte lagret</string>
     <string name="billing_no_payment_method_description">Gå raskere til kassen ved å lagre en betalingsmåte</string>
     <string name="billing_pay_for_it_with">Betal med</string>
@@ -491,12 +486,7 @@ men ikke nøl hvis og når du må gjøre det!"</string>
     <string name="billing_payment_breakdown_total">Sum</string>
     <string name="billing_payment_history">Transaksjonshistorikk</string>
     <string name="billing_payment_premium">Ditt abonnement</string>
-    <string name="billing_payment_premium_legalese_monthly">Når du kjøper et abonnement på %1$s, godtar du våre [Store Terms of Service](%2$s). %1$s er et automatisk fornyet abonnement. Du gir Discord tillatelse til å umiddelbart belaste betalingsmåten du har angitt på %3$s og til å fortsette å gjøre det automatisk hver måned, frem til du avslutter. Du kan avslutte når som helst.</string>
-    <string name="billing_payment_premium_legalese_yearly">Når du kjøper et abonnement på %1$s, godtar du våre [Store Terms of Service](%2$s). %1$s er et automatisk fornyet abonnement. Du gir Discord tillatelse til å umiddelbart belaste betalingsmåten du har angitt på %3$s og til å fortsette å gjøre det automatisk hvert år, frem til du avslutter. Du kan avslutte når som helst.</string>
     <string name="billing_payment_sources">Betalingsmåter</string>
-    <string name="billing_payment_table_header_amount">BELØP</string>
-    <string name="billing_payment_table_header_date">DATO</string>
-    <string name="billing_payment_table_header_description">BESKRIVELSE</string>
     <string name="billing_premium_refund_text">En tilbakebetaling kan bli forespurt om dette kjøpet ble gjort de siste %1$s dagene. [Den behjelpelige serviceavdelingen vår hjelper deg med å få myntene tilbake.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Vi beklager, dette kjøpet er ikke kvalifisert for tilbakebetaling. En tilbakebetaling kan bli forespurt om dette kjøpet ble gjort de siste %1$s dagene.</string>
     <string name="billing_price_per_month">%1$s / måned</string>
@@ -506,9 +496,7 @@ men ikke nøl hvis og når du må gjøre det!"</string>
     <string name="billing_purchase_details_header">Kjøpsdetaljer</string>
     <string name="billing_refund_header">Har du problemer med kjøpet ditt?</string>
     <string name="billing_refund_play_time_never_played">Aldri spilt</string>
-    <string name="billing_refund_play_time_subheader">TID SPILT</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">KJØPSDATO</string>
     <string name="billing_refund_report_a_problem">Rapporter et problem</string>
     <string name="billing_refund_request_button">Be om tilbakebetaling</string>
     <string name="billing_sales_tax_added">%1$s i MVA er lagt til på grunn av faktureringsadressen.</string>
@@ -774,11 +762,10 @@ bittelille teksten nedenfor."</string>
     <string name="create_category">Opprett kategori</string>
     <string name="create_channel">Opprett en Kanal</string>
     <string name="create_group_dm">Opprett gruppe-DM</string>
-    <string name="create_instant_invite">Opprett umiddelbar invitasjon</string>
+    <string name="create_instant_invite">Opprett en invitasjon</string>
     <string name="create_link">Opprett lenke</string>
     <string name="create_or_join_modal_header">Åh, enda en server?</string>
     <string name="create_server_button_body">Opprett en ny server og inviter vennene dine. Det er gratis!</string>
-    <string name="create_server_button_cta">Opprett en Server</string>
     <string name="create_server_button_cta_mobile">Opprett en ny Server</string>
     <string name="create_server_button_cta_mobile_desc">Lag en server, inviter vennene dine, ha en fest!</string>
     <string name="create_server_description">Ved å lage en server, får du tilgang til **gratis** tale og chatting blant vennene dine.</string>
@@ -889,7 +876,6 @@ bittelille teksten nedenfor."</string>
     <string name="disable_email_notifications_failed_suggestion">E-postvarsler kan allerede være deaktivert, eller det kan hende at denne e-postadressen ikke lenger er tilknyttet en Discord-konto.</string>
     <string name="disable_integration_title">Slå av synkronisering</string>
     <string name="disable_integration_twitch_body">Hvis du slår av synkronisering, utløses den valgte handlingen for utløpt abonnement, som om alle abonnenter har utløpt.</string>
-    <string name="disable_integration_youtube_body">Hvis du slår av synkronisering, utføres de valgte handlingene for utløpte sponsorer, som om alle sponsorer har utløpt.</string>
     <string name="disable_notifications_description">Alle skrivebordsvarsler deaktiveres.</string>
     <string name="disable_notifications_label">Deaktiver varsler</string>
     <string name="disable_sounds_description">Alle lydeffekter deaktiveres.</string>
@@ -905,7 +891,6 @@ bittelille teksten nedenfor."</string>
     <string name="discord_desc_long">Gratis og sikker chat for spillere – virker både på PC og telefon.</string>
     <string name="discord_desc_short">Muntlig og skriftlig chat for lag</string>
     <string name="dismiss">Avvis</string>
-    <string name="dispatch_error_modal_body">Noe gikk galt. Hvis problemet vedvarer, opprett en støtteforespørsel og kopier innholdet i meldingen nedenfor.</string>
     <string name="dispatch_error_modal_error_label">Feilmelding (Kopier og lim meg inn)</string>
     <string name="dispatch_error_modal_header">Discord dispatch-feil</string>
     <string name="dispatch_error_modal_open_ticket">Åpne en forespørsel</string>
@@ -1016,7 +1001,7 @@ bittelille teksten nedenfor."</string>
     <string name="fi">Finsk</string>
     <string name="file_rate_kb">%1$s KB/s</string>
     <string name="file_rate_mb">%1$s MB/s</string>
-    <string name="file_upload_limit_premium">50 MB</string>
+    <string name="file_upload_limit_premium_tier_1">50 MB</string>
     <string name="file_upload_limit_standard">8 MB</string>
     <string name="filter_mentions">Filternevninger</string>
     <string name="filter_options">Filteralternativer</string>
@@ -1037,8 +1022,6 @@ AFK tidsgrensen. Dette påvirker ikke nettlesere."</string>
     <string name="form_help_attenuation">"Senk volumet til andre programmer med denn prosenten når noen snakker.
 Sett til 0 %% for å deaktivere demping."</string>
     <string name="form_help_automatic_vad">Dersom indikatoren lyser grønt så overfører Discord den vakre stemmen din.</string>
-    <string name="form_help_bitrate">"**ALLE BITENE!** Det anbefales ikke å gå over %1$skbps med mindre du er en audiofil fordi det kommer til å
-påvirke folk på mobilenheter eller med dårlige forbindelser uten merkbar fordel."</string>
     <string name="form_help_certified_voice_processing">"Når du bruker en Discord-sertifisert mikrofon, blir enkelte talebehandlingsfunksjoner ikke lenger håndtert av Discord selv,
 men av mikrofonen."</string>
     <string name="form_help_channel_permissions">Hvis du velger roller her, konfigurerer du automatisk enkle rettigheter for denne kanalen.</string>
@@ -1051,11 +1034,6 @@ kan unngå [denne galskapen](%1$s).**"</string>
 alle meldinger som sendes på denne serveren. Vi anbefaler på det sterkeste å sette denne til bare @mentions for en offentlig Discord"</string>
     <string name="form_help_explicit_content_filter">"Skann og slett automatisk meldinger som inneholder eksplisitt innhold, som sendes i denne serveren. Velg hvor bredt
 filteret gjelder for medlemmer på serveren din. **Vi anbefaler at du angir et filter for en offentlig Discord.**"</string>
-    <string name="form_help_instant_invite_channel">"Dersom en kanal er valgt, blir en direkteinvitasjon-lenke generert med modulen,
-ellers vises bare de påloggede medlemmene og stemmekanalene."</string>
-    <string name="form_help_last_seen">"Opprydningen vil sparke ut **%1$s** uten noen tildelt rolle som ikke har
-vært sett på **%2$s**.
-Vedommende kan bli med i serveren på nytt ved hjelp av en ny invitasjon."</string>
     <string name="form_help_legacy_subsystem">"Noen lyddrivere oppfører seg ikke riktig når du bruker operativsystemets nyere lydsystem.
 Kryss av i denne boksen for å bruke det gamle systemet."</string>
     <string name="form_help_nsfw">"Brukere må bekrefte at de er over lovlig alder for å se innholdet på denne kanalen.
@@ -1065,7 +1043,6 @@ nettsiden din, kan du dynamisk legge til &amp;username= i spørrestrengen."</str
     <string name="form_help_qos">"Hinter til ruteren din at pakker som Discord sender, skal prioriteres.
 Noen rutere eller internettleverandører kan oppføre seg dårlig når dette er aktivert."</string>
     <string name="form_help_slowmode">Medlemmene kommer til å bli begrenset til å sende en melding per dette intervallet, med mindre de har tillatelsene Administrer kanal eller Administrer meldinger.</string>
-    <string name="form_help_system_channel">Send en melding til denne kanalen når noen blir med på denne serveren. Meldingene er randomisert. Dette kan slås av når som helst.</string>
     <string name="form_help_temporary">Medlemmer blir automatisk sparket ut når de frakobles med mindre en rolle er tildelt.</string>
     <string name="form_help_user_limit">"Begrenser antallet brukere som kan koble til i denne samtalen. Brukere med **Flytt medlemmer**-tillatelsen
 kan forandre dette tallet og kan flytte andre brukere inn i samtalen."</string>
@@ -1109,8 +1086,8 @@ direktemelding. Hvis et medlem har en tilordnet rolle, gjelder ikke dette.
     <string name="form_label_input_mode">Inngangsmodus</string>
     <string name="form_label_input_sensitivty">Inngangsfølsomhet</string>
     <string name="form_label_input_volume">Inngangsvolum</string>
-    <string name="form_label_instant_invite">Angi en direkteinvitasjon</string>
-    <string name="form_label_instant_invite_channel">Kanal for direkteinvitasjon</string>
+    <string name="form_label_instant_invite">Legg inn en invitasjon</string>
+    <string name="form_label_instant_invite_channel">Inviter kanal</string>
     <string name="form_label_last_seen">Sist sett</string>
     <string name="form_label_local_mute">Demp Lokalt</string>
     <string name="form_label_max_age">Utløper etter</string>
@@ -1178,7 +1155,6 @@ direktemelding. Hvis et medlem har en tilordnet rolle, gjelder ikke dette.
     <string name="form_label_suppress_everyone">Demp **@alle** og **@her**</string>
     <string name="form_label_synced_role">Synkronisert rolle</string>
     <string name="form_label_synced_subs">Synkroniserte abonnenter</string>
-    <string name="form_label_system_channel">Meldingskanal for nye medlemmer</string>
     <string name="form_label_temporary">Midlertidig Medlemskap</string>
     <string name="form_label_tts">Tekst-til-tale</string>
     <string name="form_label_tts_notifications">Varsler for tekst-til-tale</string>
@@ -1278,7 +1254,6 @@ for å kunne observere inndatafølsomheten."</string>
     <string name="game_feed_activity_recently_played">Nylig spilt</string>
     <string name="game_feed_activity_streaming_twitch">Strømmer på Twitch</string>
     <string name="game_feed_current_header_title">Spiller nå</string>
-    <string name="game_feed_settings_visibility">Vis i spillfanen</string>
     <string name="game_feed_unknown_player">Ukjent spiller</string>
     <string name="game_feed_user_played_days_ago">Spilte for %1$s %2$s siden</string>
     <string name="game_feed_user_played_hours_ago">Spilte for %1$s %2$s siden</string>
@@ -1347,6 +1322,7 @@ for å kunne observere inndatafølsomheten."</string>
     <string name="generate_a_new_link">Generer en ny lenke</string>
     <string name="get_started">Kom igang</string>
     <string name="gif_auto_play_label">Spill automatisk GIF-er når Discord er i fokus.</string>
+    <string name="go_live_hardware_acceleration_unavailable">Én kjapp ting, vi finner ingen maskinvareakselerasjon. Datamaskinen din kan ha problemer med å støtte Go Live.</string>
     <string name="go_live_hey">Hei!</string>
     <string name="go_live_listen">Hør!</string>
     <string name="go_live_look">Se!</string>
@@ -1360,6 +1336,7 @@ for å kunne observere inndatafølsomheten."</string>
     <string name="go_live_modal_select_channel_form_title">Velg en talekanal</string>
     <string name="go_live_modal_select_channel_placeholder">Søk etter talekanaler</string>
     <string name="go_live_modal_title">Send live</string>
+    <string name="go_live_video_drivers_outdated">Videodriverne dine er utdaterte. Oppdater dem for å få bedre ytelse når du Go Live.</string>
     <string name="grant_temporary_membership">Gi midlertidig medlemskap</string>
     <string name="group">Gruppe</string>
     <string name="group_dm_add_friends">Legg til venner til DM</string>
@@ -1436,8 +1413,6 @@ for å kunne observere inndatafølsomheten."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Ga** %1$s til **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Flyttet fra **%1$s** til **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">I posisjon **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) opprettet en tekstkanal $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Endret emnet til **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Angi emnet til **%1$s**</string>
@@ -1532,6 +1507,8 @@ for å kunne observere inndatafølsomheten."</string>
     <string name="guild_settings_filter_all_actions">Alle handlingene</string>
     <string name="guild_settings_filter_all_users">Alle brukerne</string>
     <string name="guild_settings_filter_user">Filtrer etter bruker</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">720 p 60 fps Go Live-strømmer</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">1080 p 60 fps Go Live-strømmer</string>
     <string name="guild_settings_label_audit_log">Revisjonslogg</string>
     <string name="guild_settings_label_audit_log_empty_body">Når moderatorer begynner å moderere, kan du moderere moderasjonen her.</string>
     <string name="guild_settings_label_audit_log_empty_title">Ingen logger enda</string>
@@ -1563,7 +1540,7 @@ Hvis du har tilgang til brukerne på nettsiden din, kan du dynamisk legge til &a
     <string name="help_role_locked_mine">Rollen er låst fordi det er din høyeste rang. Spør noen med en høyere rang eller server-eieren om hjelp.</string>
     <string name="help_singular_permission">Du kan ikke endre denne rettigheten fordi den vil også bli fjernet fra deg.</string>
     <string name="hide_instant_invites_description">Anbefales hvis du ikke vil at tilfeldige personer skal få tilgang til Discord-serverne dine.</string>
-    <string name="hide_instant_invites_label">Skjul øyeblikkelige invitasjonslenker</string>
+    <string name="hide_instant_invites_label">Skjul invitasjonslenker</string>
     <string name="hide_muted">Skjul %1$s dempede</string>
     <string name="hide_muted_channels">Skjul dempede kanaler</string>
     <string name="hide_personal_information_description">Skjuler e-postadresse, tilkoblede kontoer, notater og anonymiserer DiscordTags.</string>
@@ -1610,7 +1587,6 @@ Hvis du har tilgang til brukerne på nettsiden din, kan du dynamisk legge til &a
     <string name="hypesquad_question_11_response_d">Foreslår at Wumpus kanskje skal plukke opp tamburinen i stedet</string>
     <string name="hypesquad_question_12_prompt">Du klatret til toppen av det høyeste fjellet, og det eneste som skiller deg fra rikdom er den trehodede dragen på spiret som står i veien for deg. Du:</string>
     <string name="hypesquad_question_12_response_a">Braser inn i kamp</string>
-    <string name="hypesquad_question_12_response_b">Ser gamle Godzilla-filmer for å lære av hans kamper mot King Ghidorah</string>
     <string name="hypesquad_question_12_response_c">Prøver å overbevise dragen om å dele på rikdommen</string>
     <string name="hypesquad_question_12_response_d">Tilbyr dragen en Wumpus-bamse, hvordan kan den ikke ha lyst på den?</string>
     <string name="hypesquad_question_13_prompt">Hva er det slags lyd?:</string>
@@ -1711,14 +1687,14 @@ Hvis du har tilgang til brukerne på nettsiden din, kan du dynamisk legge til &a
     <string name="input_mode_ptt_release_delay">Forsinkelse etter slipp av trykk-og-snakk-tast</string>
     <string name="input_mode_vad">Taleaktivitet</string>
     <string name="install_location_main">Primær</string>
-    <string name="instant_invite">Direkte Invitasjon</string>
+    <string name="instant_invite">Inviter</string>
     <string name="instant_invite_accept">Godta invitasjonen</string>
-    <string name="instant_invite_accepted">Direkteinvitasjonen er akseptert</string>
-    <string name="instant_invite_accepting">Aksepterer direkteinvitasjon</string>
+    <string name="instant_invite_accepted">Godtatt invitasjon</string>
+    <string name="instant_invite_accepting">Aksepterer invitasjonen</string>
     <string name="instant_invite_ask_for_new_invite">Spør om en ny en!</string>
     <string name="instant_invite_ask_user_for_new_invite">Spør %1$s om en ny invitasjon!</string>
     <string name="instant_invite_code">Kode</string>
-    <string name="instant_invite_expired">Denne direkteinvitasjonen er ugyldig eller har utløpt.</string>
+    <string name="instant_invite_expired">Invitasjonen er ugyldig eller har utløpt.</string>
     <string name="instant_invite_expires">Utløper</string>
     <string name="instant_invite_failed_to_generate">Kunne ikke lage en invitasjonslenke.</string>
     <string name="instant_invite_generate">Generer</string>
@@ -1736,16 +1712,15 @@ Hvis du har tilgang til brukerne på nettsiden din, kan du dynamisk legge til &a
     <string name="instant_invite_regenerate">Regenerer</string>
     <string name="instant_invite_resolved_body">Du er invitert til **%1$s** i **%2$s**.</string>
     <string name="instant_invite_resolved_title">Men heisann.</string>
-    <string name="instant_invite_resolving">Løser direkteinvitasjonen</string>
+    <string name="instant_invite_resolving">Løser invitasjonen</string>
     <string name="instant_invite_uses">Bruker</string>
     <string name="instant_invite_you_are_already_a_member_of">Du er allerede et medlem av</string>
     <string name="instant_invite_you_have_been_invited_to_join">Du har blitt invitert til å bli med</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** har invitert deg til å bli med</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Du har blitt invitert til å bli med en gruppe-DM av</string>
-    <string name="instant_invites">Direkte invitasjoner</string>
+    <string name="instant_invites">Invitasjoner</string>
     <string name="integration_settings">Innstillinger for integrering</string>
     <string name="integrations">Integreringer</string>
-    <string name="integrations_header">Tilkoblede Twitch/Youtube-spillkontoer</string>
     <string name="integrations_pro_tip">Sjekk [Discords StreamKit](%1$s) for å finne flere integreringer.</string>
     <string name="internal_server_error">En intern serverfeil har oppstått. Prøv igjen.</string>
     <string name="invalid_animated_emoji_body">Denne emojien fungerer ikke siden den er animert. Oppgrader til Discord Nitro for å oppfylle alle dine drømmer om animerte emojier</string>
@@ -1858,13 +1833,13 @@ Har du lyst til å vite mer om Discord?"</string>
     <string name="join_afk_channel_body">Det virker som om du har koblet deg til AFK-kanalen. Du kan ikke snakke i denne kanalen.</string>
     <string name="join_call">Bli med i samtalen</string>
     <string name="join_server">Meld deg på</string>
-    <string name="join_server_button_body">Angi en direkte invitasjon og bli med på serveren til vennene dine.</string>
+    <string name="join_server_button_body">Legg inn en invitasjon, og bli med på en venns server.</string>
     <string name="join_server_button_cta">Bli med i en server</string>
     <string name="join_server_button_cta_mobile">Koble til en server med en invitasjonslenke</string>
     <string name="join_server_button_cta_mobile_desc">Har du en invitasjonskode eller ‑lenke? Bruk den her!</string>
     <string name="join_server_button_cta_named">Bli med %1$s</string>
-    <string name="join_server_description">Angi en direkteinvitasjon nedenfor for å koble til en eksisterende server. Invitasjonen ser omtrent slik ut:</string>
-    <string name="join_server_description_mobile">Angi en direkteinvitasjon ovenfor for å koble til en eksisterende server.</string>
+    <string name="join_server_description">Legg inn en invitasjon under for å bli med på en eksisterende server. Invitasjonen vil se ut omtrent som dette:</string>
+    <string name="join_server_description_mobile">Legg inn en invitasjon over for å bli med på en eksisterende server.</string>
     <string name="join_server_title">Koble til en server</string>
     <string name="join_stream">Bli med på strømmen</string>
     <string name="join_video_call">Bli med i videosamtalen</string>
@@ -1971,9 +1946,8 @@ mens du snakker."</string>
     <string name="link_your_xbox_account_1">Koble Xbox-kontoen din til Discord for å vise hvilket spill du spiller.</string>
     <string name="link_your_xbox_account_2">Discord er en tale-, tekst- og videochatteapp for spillere som er gratis, sikker og fungerer på PC og mobil.</string>
     <string name="listening_to">Hører på **%1$s**</string>
-    <string name="live_beta_description">Velkommen til strømmen! Send live er i beta. Vi beklager eventuelle feil</string>
+    <string name="live_beta_description">Velkommen til strømmen! Go Live er i beta. Vi beklager eventuelle feil</string>
     <string name="live_on_twitch">Live på Twitch</string>
-    <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Kunne ikke laste inn bildet.
 Prøv igjen."</string>
     <string name="load_more_messages">Last inn flere meldinger</string>
@@ -2157,13 +2131,10 @@ de oppdaterte vilkårene våre for bruk og personvernoppdateringen."</string>
     <string name="no_emoji_title">Ingen emoji</string>
     <string name="no_input_devices">Ingen inndataenheter</string>
     <string name="no_input_devices_detected">Ingen inndataenheter ble oppdaget, plugg inn en enhet og prøv på nytt.</string>
-    <string name="no_instant_invite">Ingen direkteinvitasjon</string>
-    <string name="no_integrations">[Koble til](onConnect) Twitch- eller YouTube-spillkontoen din for å synkronisere abonnementene/sponsorene dine til en rolle</string>
+    <string name="no_instant_invite">Ingen invitasjoner</string>
     <string name="no_integrations_body">Protokollen FR13NDSH1P kan bare kjøres fra Discord-klienten</string>
     <string name="no_integrations_label">Ingen integreringer</string>
-    <string name="no_invites_body">"Føler du deg meningsløs? Som et papirfly som driver med vinden?
-Få noen venner inn her ved å opprette en lenke til direkteinvitasjon!"</string>
-    <string name="no_invites_caption">Ingen direkteinvitasjoner enda!</string>
+    <string name="no_invites_caption">Ingen invitasjoner enda!</string>
     <string name="no_invites_label">Ingen invitasjoner enda</string>
     <string name="no_mail_account_description">Send tilbakemelding til support@discordapp.com, så kopierer vi brukeropplysningene dine til utklippstavlen.</string>
     <string name="no_mail_account_title">Ingen postadresse</string>
@@ -2182,7 +2153,6 @@ ingen festede meldinger … enda."</string>
     <string name="no_reactions_header">Ingen reaksjoner</string>
     <string name="no_recent_mentions">Og i begynnelsen … var det stillhet.</string>
     <string name="no_send_messages_permission_placeholder">Du har ikke tillatelse til å sende meldinger i denne kanalen.</string>
-    <string name="no_system_channel">Meldinger om nye medlemmer</string>
     <string name="no_text">Nei</string>
     <string name="no_thanks">Nei takk</string>
     <string name="no_user_limit">Ingen grense</string>
@@ -2194,7 +2164,6 @@ ingen festede meldinger … enda."</string>
     <string name="note">Notat</string>
     <string name="note_placeholder">Klikk for å legge til et notat</string>
     <string name="note_placeholder_mobile">Trykk for å legge til et notat</string>
-    <string name="notice_application_test_mode">Testmodus er for øyeblikket aktiv for **%1$s**. Upubliserte SKU-er vises, og du blir ikke belastet for eventuelle relaterte betalinger.</string>
     <string name="notice_application_test_mode_go_to_listing">Gå til SKU</string>
     <string name="notice_connect_spotify">Koble til Spotify-kontoen din for å vise musikken din i statusen din!</string>
     <string name="notice_connection_conflict">Stemmen din ble frakoblet fordi du koblet til et annet sted.</string>
@@ -2205,7 +2174,6 @@ ingen festede meldinger … enda."</string>
     <string name="notice_dispatch_error_disk_low">Du har ikke nok diskplass. %1$s er nødvendig, men bare %2$s er tilgjengelig.</string>
     <string name="notice_dispatch_error_file_name_too_long">Å nei, dette spillet har filnavn som er for lange for Windows. Velg en kortere installasjonkatalog.</string>
     <string name="notice_dispatch_error_invalid_drive">Å nei, installasjonsposisjonen du valgte, er ikke gyldig. Du valgte %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Vi klarte ikke å oppdatere spillet. Kjører det for øyeblikket?</string>
     <string name="notice_dispatch_error_no_manifests">Å nei, det ser ut til at det ikke er noe innhold for dette spillet. Kontakt brukerstøtte.</string>
     <string name="notice_dispatch_error_not_entitled">Å nei, det ser ut til at du ikke eier dette spillet. Kontakt brukerstøtte hvis du mener at dette er en feil.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Det ser ut til at du sa nei til et installasjonsskript. Du må si ja for at spillet skal installeres.</string>
@@ -2220,9 +2188,6 @@ ingen festede meldinger … enda."</string>
     <string name="notice_native_apps">Vil du ha systemomfattende trykk-og-snakk? Last ned Discord-appen!</string>
     <string name="notice_no_input_detected">Vel, det ser ut til at Discord ikke oppdager noen inndata fra mikrofonen din. La oss fikse det … sammen.</string>
     <string name="notice_no_input_detected_help_link_text">Hjelp!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Tilgangen din til Nitro er utløpt. Oppgrader fra Nitro Classic til Nitro for å få ubegrenset tilgang til fantastiske spill.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Du har bare %1$s igjen med Nitro-spill! Din tilgang utløper **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Takk for at du er en tidlig Nitro-supporter! Som gave for å være fantastisk, har du nå tilgang til Nitro-spill frem til %1$s.</string>
     <string name="notice_premium_promo_action">Sjekk det</string>
     <string name="notice_premium_promo_message">Støtt Discords utvikling og få morsomme fordeler!</string>
     <string name="notice_scheduled_maintenance">Discord gjennomgår planlagt vedlikehold **%1$s** klokken **%2$s**.</string>
@@ -2292,7 +2257,6 @@ Har du mottatt en invitasjonslenke fra en venn? Skriv inn invitasjonslenken elle
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Aktiverte Overlay</string>
     <string name="nux_post_reg_join_server_description">Få mest mulig ut av Discord ved å bli med på en server.</string>
     <string name="nux_post_reg_join_server_skip">Jeg har ikke en</string>
     <string name="nux_post_reg_join_server_title">Har du en invitasjon?</string>
@@ -2338,7 +2302,6 @@ I tillegg fungerer ikke overlegget for alle. Hvis du har problemer eller spørsm
     <string name="overlay_menu_get_invite">Få invitasjonslenke</string>
     <string name="overlay_menu_open_discord">Åpne Discord</string>
     <string name="overlay_menu_switch_channels">Bytt kanaler</string>
-    <string name="overlay_mobile_toggle_desc">Se hvem som snakker og få tilgang til snarveier mens du bruker andre apper mens du er koblet til stemme</string>
     <string name="overlay_mobile_toggle_label">Tillat mobilt stemme-overlay</string>
     <string name="overlay_mobile_unauthed">Logg deg inn på Discord-appen for å aktivere dette innholdet.</string>
     <string name="overlay_news_go_live_body">Vil du strømme %1$s til vennene dine i %2$s?</string>
@@ -2346,7 +2309,6 @@ I tillegg fungerer ikke overlegget for alle. Hvis du har problemer eller spørsm
     <string name="overlay_news_text_pinning_body">Du kan nå feste en tekstchat til spillet ditt!</string>
     <string name="overlay_news_text_pinning_tip">Tips: Du kan feste en chat ved å trykke $[festeikon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Discord overlegget er oppdatert</string>
-    <string name="overlay_no_results">Vi har søkt nært og fjernt. Dessverre fant vi ingen stemmekanaler</string>
     <string name="overlay_notification_incoming_call">Innkommende anrop …</string>
     <string name="overlay_notification_settings_disabled">Varslinger er deaktivert</string>
     <string name="overlay_notification_settings_position">Viser: %1$s</string>
@@ -2356,7 +2318,6 @@ I tillegg fungerer ikke overlegget for alle. Hvis du har problemer eller spørsm
     <string name="overlay_notifications_settings">Varsler for overlegg</string>
     <string name="overlay_notifications_top_left">Oppe til venstre</string>
     <string name="overlay_notifications_top_right">Oppe til høyre</string>
-    <string name="overlay_private_channels_empty_state">Niks, ingen direktemeldinger her.</string>
     <string name="overlay_reload">Last inn Overlay på nytt</string>
     <string name="overlay_settings">Overleggsinnstillinger</string>
     <string name="overlay_settings_general_tab">Generelt</string>
@@ -2378,7 +2339,6 @@ I tillegg fungerer ikke overlegget for alle. Hvis du har problemer eller spørsm
     <string name="pagination_page_of">Side %1$s av %2$s</string>
     <string name="pagination_previous">Tidligere</string>
     <string name="paginator_of_pages">Side %1$s av %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Discord-partner</string>
     <string name="party_full">Gruppen er full</string>
     <string name="party_join">Bli med i en gruppe</string>
@@ -2471,18 +2431,11 @@ I tillegg fungerer ikke overlegget for alle. Hvis du har problemer eller spørsm
     <string name="popout_stay_on_top">Bli på toppen</string>
     <string name="post_code">Postnummer</string>
     <string name="premium_alert_error_title">Oops, noe gikk galt …</string>
-    <string name="premium_applications_grandfathered_monthly">Som takk for at du har støttet Discord, får du tilgang til Nitro-spill i ett år. Tilgangen din utløper **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">Som takk for at du har støttet Discord, får du tilgang til Nitro-spill i 2 år. Tilgangen din utløper **%1$s**.</string>
-    <string name="premium_applications_subtitle">Ubegrenset tilgang til et voksende bibliotek med kritikerroste spill vi mener at du og vennene dine burde spille.</string>
-    <string name="premium_applications_title">Flere titalls kuraterte spill. Én lav månedspris.</string>
     <string name="premium_badge_tooltip">Abonnent siden %1$s</string>
     <string name="premium_cancel_cancel">Niks</string>
     <string name="premium_cancel_confirm_body_tier_1">"Avbestillingen trer i kraft fra slutten av den nåværende faktureringsperioden din den **%1$s**. Discord-taggen din blir randomisert hvis du har endret den.
 
 Du kan når som helst starte abonnementet på nytt."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Avbestillingen trer i kraft fra slutten av den nåværende faktureringsperioden din. Den **%1$s** mister du tilgang til alle Nitro-spill i biblioteket ditt, og Discord-taggen randomiseres hvis du har endret den.
-
-Vi oppbevarer filene dine trygt og sikkert, hvis du skulle ombestemme deg. Du kan abonnere på nytt når som helst!"</string>
     <string name="premium_cancel_confirm_new">Jepp, avslutt %1$s</string>
     <string name="premium_cancel_confirm_title">Avbryte %1$s?</string>
     <string name="premium_cancel_failed_body">Vi klarte ikke å avslutte Nitro-abonnementet ditt. Prøv igjen eller kontakt støtteteamet vårt hvis dette problemet fortsetter.</string>
@@ -2499,19 +2452,16 @@ Vi oppbevarer filene dine trygt og sikkert, hvis du skulle ombestemme deg. Du ka
     <string name="premium_chat_perks_description_custom_emoji">Lag et globalt pass slik at du kan bruke egendefinerte emojier hvor som helst.</string>
     <string name="premium_chat_perks_description_discriminator">Velg taggen som skal brukes så lenge du abonnerer.</string>
     <string name="premium_chat_perks_description_screenshare">Få bedre skjermkvalitet med 720p 60 fps eller 1080p 30 fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Stor opplastingsfilstørrelse for %1$sfra %2$s for meme-deling i høy kvalitet.</string>
+    <string name="premium_chat_perks_streaming_mobile">Bedre Go Live-strømmer: Strøm ved kilden med Nitro eller opptil skarpe 1080p 60 fps med Nitro Classic</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Animert moro</string>
     <string name="premium_chat_perks_title_badge">Vis din støtte</string>
     <string name="premium_chat_perks_title_custom_emoji">Globale tilpassede emojier</string>
     <string name="premium_chat_perks_title_discriminator">Egendefinert Discord-tag</string>
     <string name="premium_chat_perks_title_screenshare">Video i høy kvalitet</string>
+    <string name="premium_chat_perks_title_streaming">Bedre Go Live-strømmer</string>
     <string name="premium_code_redemption_confirmation_blurb">Takket være en tilfeldig streng med sifre har du nå bedre chattefordeler i %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">Oi, kult!</string>
-    <string name="premium_feature_new_chat_perks_header">Du får også noen forbedrede chattefordeler:</string>
-    <string name="premium_feature_new_premium_applications_header">Spill til en verdi av %1$s. Sjekk dem:</string>
-    <string name="premium_feature_view_applications">Se alle Nitro-spill</string>
     <string name="premium_features_chat_perks">Chattefordeler</string>
-    <string name="premium_features_premium_applications">Gratis spill</string>
     <string name="premium_grandfathered_warning">Som takk for at du støtter oss, har du et rabattert Nitro-abonnement. **Ved å avslutte eller endre abonnementet, kommer du til å miste denne rabatten.** Du har blitt advart!!!!!</string>
     <string name="premium_grandfathered_warning_confirm">Gjør det likevel</string>
     <string name="premium_grandfathered_warning_title">Forsiktig der, venn</string>
@@ -2521,10 +2471,7 @@ Vi oppbevarer filene dine trygt og sikkert, hvis du skulle ombestemme deg. Du ka
     <string name="premium_not_claimed">Hent kontoen først</string>
     <string name="premium_not_claimed_body">Hei du! Hvis du vil kjøpe Nitro, må du først gjøre krav på kontoen din, slik at du ikke mister noe.</string>
     <string name="premium_not_verified">Bekreft e-postadressen din først</string>
-    <string name="premium_not_verified_body">Hei du! Hvis du vil kjøpe Nitro, må du først bekrefte e-postadressen din. Sjekk e-postadressen eller be om en ny.</string>
-    <string name="premium_payment_applications_os_warning">Nitro-spill støttes bare på Windows.</string>
     <string name="premium_payment_confirmation_blurb_regular">Du har nå fått kraften til bedre chattefordeler. Slutt å lese dette og sett i gang med chattingen!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Du har nå ubegrenset tilgang til så mange fantastiske spill. Slutt å lese dette og gå og spill dem!!!</string>
     <string name="premium_payment_confirmation_button_regular">Ok, høres bra ut</string>
     <string name="premium_plan_month">Nitro månedlig</string>
     <string name="premium_plan_month_tier_1">Nitro Classic månedlig</string>
@@ -2545,13 +2492,10 @@ Vi fordeler ditt nåværende abonnement proporsjonalt og trekker det fra årspri
     <string name="premium_upgrade_disabled_current_tooltip">Ditt nåværende abonnement.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Du må avbryte først og la abonnementet utløpe før du velger et rimeligere abonnement.</string>
     <string name="premium_upgrade_done_body_tier_1">Nå har du bedre chattefordeler!</string>
-    <string name="premium_upgrade_done_body_tier_2">Nå har du bedre chattefordeler og tilgang til dusinvis med spill.</string>
     <string name="premium_upgrade_done_button_tier_1">Kult!</string>
-    <string name="premium_upgrade_done_button_tier_2">Sjekk alle Nitro-spillene</string>
     <string name="premium_upgrade_failed_body">Ehh … Den oppgraderingen fungerte ikke. Sørg for at betalingsinformasjonen din er oppdatert, og prøv igjen.</string>
     <string name="premium_upload_promo">Oppgrader til Discord Nitro for å få en filgrense på %1$s</string>
     <string name="premium_year_free_months">Få 2 måneder gratis!</string>
-    <string name="premium_year_free_months_short">2 måneder gratis</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / år</string>
     <string name="preview_chat">Forhåndsvis chat</string>
     <string name="priority_speaker">Prioritert taler</string>
@@ -2733,7 +2677,7 @@ forsøker å sende data."</string>
     <string name="scope_guilds">Vit hvilke servere du er på</string>
     <string name="scope_guilds_empty">Du er ikke i noen servere.</string>
     <string name="scope_guilds_join">Bli med i servere for deg</string>
-    <string name="scope_guilds_join_description">Bruk øyeblikkelig invitasjoner på dine vegne.</string>
+    <string name="scope_guilds_join_description">Bruk invitasjoner på dine vegne.</string>
     <string name="scope_identify">Tilgang til brukernavn og avatar</string>
     <string name="scope_messages_read">Les alle meldinger</string>
     <string name="scope_messages_read_description">Dette gjør det mulig for appen å lese alle meldinger som er tilgjengelige via Discord-kontoen din</string>
@@ -2798,7 +2742,6 @@ Velg hvilken skjerm du vil dele."</string>
     <string name="search_filter_on">den</string>
     <string name="search_for_emoji">Finn den perfekte emojien</string>
     <string name="search_for_empty">Søk</string>
-    <string name="search_for_value">Søk etter: **%1$s**</string>
     <string name="search_group_header_channels">I kanalen</string>
     <string name="search_group_header_dates">Datoer</string>
     <string name="search_group_header_file_name">Filnavnet inneholder</string>
@@ -2998,8 +2941,6 @@ Er du sikker på at du vil gjøre dette?"</string>
     <string name="stop_ringing">Slutt å ringe</string>
     <string name="stop_streaming">Slutt å strømme</string>
     <string name="stop_watching">Slutt å se på</string>
-    <string name="store_payment_legalese_monthly">Hei! Når du kjøper %1$s, godtar du våre [Vilkår for Bruk av Store](%2$s). %1$s er et automatisk fornyende abonnement. Det betyr at vi belaster deg i dag og fortsetter å belaste deg månedlig, frem til du avslutter abonnementet. Du kan avslutte abonnementet når som helst ved å gå til brukerinnstillinger.</string>
-    <string name="store_payment_legalese_yearly">Hei! Når du kjøper %1$s, godtar du våre [Vilkår for Bruk av Store](%2$s). %1$s er et automatisk fornyende abonnement. Det betyr at vi belaster deg i dag og fortsetter å belaste deg årlig, frem til du avslutter abonnementet. Du kan avslutte abonnementet når som helst ved å gå til brukerinnstillinger.</string>
     <string name="stream">Send live</string>
     <string name="stream_bad_spectator">Strømmen du ser på har for øyeblikket redusert lyd‑ eller bildekvalitet. Dette kan være forårsaket av nettverksproblemer.</string>
     <string name="stream_bad_streamer">Strømmen din har for øyeblikket redusert lyd‑ eller bildekvalitet. Dette kan være forårsaket av nettverksproblemer.</string>
@@ -3007,7 +2948,6 @@ Er du sikker på at du vil gjøre dette?"</string>
     <string name="stream_capture_paused_details">Bytt til spillet ditt for å fortsette.</string>
     <string name="stream_capture_paused_details_viewer">%1$s har minimert spillet … vent litt!</string>
     <string name="stream_channel_description">Medlemmer med denne tillatelsen kan strømme til denne kanalen.</string>
-    <string name="stream_description">Medlemmer med denne tillatelsen kan i denne kanalen.</string>
     <string name="stream_ended">Denne strømmen er avsluttet. *gresshoppelyd*</string>
     <string name="stream_ended_button">Strøm avsluttet</string>
     <string name="stream_ended_no_spectators">Det er ingen tilskuere fordi strømmen er over.</string>
@@ -3047,7 +2987,6 @@ Er du sikker på at du vil gjøre dette?"</string>
     <string name="stream_report_rating_body_streamer">Fortell oss om hvordan du opplevde strømmen.</string>
     <string name="stream_report_submit">Send inn</string>
     <string name="stream_reported">Tilbakemelding sendt inn</string>
-    <string name="stream_reported_body">Takk for at du rapporterte problemet ditt! Tilbakemeldingen din hjelper oss med å forbedre strømmekvaliteten.</string>
     <string name="stream_soundshare_failed">Hei, noe gikk galt og vi kunne ikke strømme lyden fra spillet ditt.</string>
     <string name="streamer_mode">Strømmermodus</string>
     <string name="streamer_mode_enabled">Strømmemodus er aktivert</string>
@@ -3105,7 +3044,6 @@ Er du sikker på at du vil gjøre dette?"</string>
     <string name="system_message_guild_member_join_10">En vill %1$s dukket opp.</string>
     <string name="system_message_guild_member_join_11">Swoooosh. %1$s landet nettopp.</string>
     <string name="system_message_guild_member_join_12">Hold dere fast. %1$s ble nettopp med i serveren.</string>
-    <string name="system_message_guild_member_join_13">%1$s ble nettopp med. Gjem bananene.</string>
     <string name="system_message_guild_member_join_14">%1$s kom nettopp. Virker OP – nerf det.</string>
     <string name="system_message_guild_member_join_15">%1$s bare gled inn i serveren.</string>
     <string name="system_message_guild_member_join_16">En %1$s dukket opp i serveren.</string>
@@ -3117,7 +3055,6 @@ Er du sikker på at du vil gjøre dette?"</string>
     <string name="system_message_guild_member_join_22">Det er en fugl! Det er et fly! Glem det, det er bare %1$s.</string>
     <string name="system_message_guild_member_join_23">Det er %1$s! Lovpris solen! \\\\[T]/</string>
     <string name="system_message_guild_member_join_24">Kommer aldri til å gi %1$s opp. Kommer aldri til å skuffe %1$s.</string>
-    <string name="system_message_guild_member_join_25">Ha! %1$s har blitt med! Du aktiverte fellekortet mitt!</string>
     <string name="system_message_guild_member_join_26">Skål, kjære! %1$s er her!</string>
     <string name="system_message_guild_member_join_27">Hei! Hør! %1$s har blitt med!</string>
     <string name="system_message_guild_member_join_28">Vi har ventet deg, %1$s</string>
@@ -3267,8 +3204,6 @@ En hentet konto er nødvendig for å **laste ned apper**."</string>
     <string name="unsupported_browser">Nettleser støttes ikke</string>
     <string name="unsupported_browser_body">"Det ser ut som du bruker en nettleser som ikke støttes. For å oppleve hva Discord har å tilby, oppgrader
 nettleseren din eller last ned en av appene våre."</string>
-    <string name="unsupported_browser_details">"Du ønsker å snakke med laget ditt, ikke sant? Bytt til nyeste versjon av Chrome, Opera, Firefox 38+, eller last ned
-Discord-klienten for å starte med én gang!"</string>
     <string name="unsupported_browser_title">Vel, dette er pinlig</string>
     <string name="unverified_account_body">"Sjekk e-posten din og følg instruksjonene for å bekrefte.
 
@@ -3386,8 +3321,6 @@ Hold shift for å laste opp direkte."</string>
     <string name="user_settings_appearance_preview_message_4">Kompaktmodus kommer til å bli slått på</string>
     <string name="user_settings_appearance_preview_message_5">Åh, her er den!</string>
     <string name="user_settings_appearance_zoom_tip">Du kan endre zoomnivået med %1$s +/- og tilbakestille til standard zoom med %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Vis spillfanen</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Slå av denne for å skjule spillfanen, slik at du kan fokusere på samtalene dine.</string>
     <string name="user_settings_close_button">Lukk knapp</string>
     <string name="user_settings_confirm_logout">Er du sikker på at du vil logge ut?</string>
     <string name="user_settings_game_activity">Spillaktivitet</string>
@@ -3445,8 +3378,6 @@ Vær oppmerksom på at dette gjør at serveren din er offentlig tilgjengelig for
     <string name="vanity_url_hint_mobile">din-nettadresse-her</string>
     <string name="verfication_expired">Lenken til e-postbekreftelsen er utløpt.</string>
     <string name="verfication_expired_suggestion">Logg på Discord for å sende lenker</string>
-    <string name="verification_body">"Vi har oppdaget at noe utenom det vanlige foregår.
-For å fortsette å bruke Discord **må du bekrefte at du er et menneske.**"</string>
     <string name="verification_body_alt">La oss nå sørge for at du er et menneske …</string>
     <string name="verification_email_body">Vi har sendt deg en ny e-postbekreftelse til **%1$s**, sjekk både innboksen og søppelposten.</string>
     <string name="verification_email_error_body">Det oppsto en feil da vi sendte deg en e-postbekreftelse. Prøv igjen senere, eller kontakt brukerstøtte.</string>
@@ -3485,8 +3416,6 @@ For å fortsette å bruke Discord **må du bekrefte at du er et menneske.**"</st
     <string name="verify_phone">Bekreft telefon</string>
     <string name="verifying">Bekrefter</string>
     <string name="video_call">Videosamtale</string>
-    <string name="video_poor_connection_body">Videoen har blitt deaktivert. Den fortsetter når forbindelsen forbedres.</string>
-    <string name="video_poor_connection_title">Dårlig forbindelse</string>
     <string name="video_preview">Forhåndsvisning av video</string>
     <string name="video_settings">Videoinnstillinger</string>
     <string name="video_unavailable">Video er utilgjengelig</string>
diff --git a/com.discord/res/values-pl/plurals.xml b/com.discord/res/values-pl/plurals.xml
index 0107feb91d..959e3e334f 100644
--- a/com.discord/res/values-pl/plurals.xml
+++ b/com.discord/res/values-pl/plurals.xml
@@ -97,15 +97,6 @@
         <item quantity="one">%d dostępne miejsce</item>
         <item quantity="few">%ddostępne miejsca</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d dni</item>
-        <item quantity="one">1 dnia</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d członków</item>
-        <item quantity="zero">0 członków</item>
-        <item quantity="one">1 członka</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">dni</item>
         <item quantity="one">dzień</item>
@@ -225,16 +216,6 @@
         <item quantity="one">uprawnienie</item>
         <item quantity="few">uprawnienia</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Włączono tryb powolny na **!!%d!! sek.**</item>
-        <item quantity="zero">Tryb powolny wyłączony</item>
-        <item quantity="one">Włączono tryb powolny na **1 sek.**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Wyłączono tryb powolny na **!!%d!! sek.**</item>
-        <item quantity="zero">Wyłączono tryb powolny</item>
-        <item quantity="one">Wyłączono tryb powolny na **1 sek.**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! członków**</item>
         <item quantity="one">**członka**</item>
@@ -332,15 +313,6 @@
         <item quantity="other">%d nowe wiadomości</item>
         <item quantity="one">1 nowa wiadomość</item>
     </plurals>
-    <plurals name="new_messages_with_date_count">
-        <item quantity="other">%d nowych wiadomości</item>
-        <item quantity="one">1 nowa wiadomość</item>
-        <item quantity="few">%d nowe wiadomości</item>
-    </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d dni</item>
-        <item quantity="one">dzień</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d kanałów</item>
         <item quantity="one">%d kanał</item>
@@ -359,11 +331,6 @@
         <item quantity="other">te wiadomości</item>
         <item quantity="one">tę wiadomość</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** serwerów jest niedostępnych z uwagi na chwilową awarię.</item>
-        <item quantity="one">**1** serwer jest niedostępny z uwagi na chwilową awarię.</item>
-        <item quantity="few">**%d** serwery są niedostępne z uwagi na chwilową awarię.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d miesiące/miesięcy</item>
         <item quantity="one">1 miesiąc</item>
diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml
index 1d2043677f..0fb5800ddd 100644
--- a/com.discord/res/values-pl/strings.xml
+++ b/com.discord/res/values-pl/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"Nie możesz wysłać zaproszenia, ponieważ jesteś niewidoczny(-a) albo ukrywasz swój status grania. Jeżeli nie chcesz zmieniać
 swoich ustawień, możesz poprosić o wysłanie zaproszenia Tobie."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Zrozumiano!</string>
-    <string name="activity_panel_go_live_hotspot_header">Nadawaj na żywo, aby bezpośrednio streamować grę znajomym!</string>
+    <string name="activity_panel_go_live_hotspot_header">Skorzystaj z Go Live, aby bezpośrednio streamować grę znajomym!</string>
     <string name="activity_panel_go_live_tooltip">Nadawaj na żywo</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Na tym serwerze nie ma kanałów głosowych, na których można streamować.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Nie możesz streamować w tym kanale głosowym.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Przejdź do serwera, aby rozpocząć streamowanie.</string>
     <string name="add">Dodaj</string>
     <string name="add_a_comment_optional">Dodaj komentarz (opcjonalnie)</string>
@@ -157,7 +155,6 @@ może być ryzykowne."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Gotowe!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Przejdź do biblioteki</string>
     <string name="application_entitlement_code_redemption_invalid">Wprowadzono nieprawidłowy kod</string>
-    <string name="application_entitlement_code_redemption_prompt">Masz kod do gry? Wprowadź go poniżej:</string>
     <string name="application_entitlement_code_redemption_redeem">Zrealizuj</string>
     <string name="application_filter_name_linux">Wszystkie pliki</string>
     <string name="application_filter_name_macos">Aplikacje</string>
@@ -282,7 +279,6 @@ może być ryzykowne."</string>
     <string name="application_store_hide_games_in_library">Nie pokazuj gier w bibliotece</string>
     <string name="application_store_hide_games_in_library_hidden">Ukryto %1$s w bibliotece</string>
     <string name="application_store_home_footer_main">Dzięki za przeglądanie!</string>
-    <string name="application_store_home_footer_sub">Z pozdrowieniami, zespół Discorda</string>
     <string name="application_store_home_view_all_applications">Wyświetl wszystkie gry</string>
     <string name="application_store_in_library">W bibliotece</string>
     <string name="application_store_link_copied">Link skopiowany!</string>
@@ -295,7 +291,6 @@ może być ryzykowne."</string>
     <string name="application_store_navigation_browse">Przeglądaj</string>
     <string name="application_store_new_release">Nowa gra</string>
     <string name="application_store_online_coop">Tryb współpracy on-line</string>
-    <string name="application_store_online_multiplayer">Tryb wieloosobowy online</string>
     <string name="application_store_purchase_application">Kup grę</string>
     <string name="application_store_purchase_bundle">Kup pakiet</string>
     <string name="application_store_purchase_confirmation_blurb">Możesz zainstalować grę %1$s poniżej i po zakończeniu instalacji uruchomić ją z poziomu zakładki Biblioteka. Miłej zabawy!</string>
@@ -408,7 +403,6 @@ może być ryzykowne."</string>
     <string name="application_store_view_all_news">Wyświetl wszystkie aktualności</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Ta zawartość do pobrania wymaga posiadania własnego %1$s w Discordzie, aby możliwa była gra. [Dowiedz się o zawartości do pobrania.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Zawartość do pobrania</string>
-    <string name="application_store_warning_early_access_description">Ta gra jest wciągająca (tak nam się wydaje!), ale jej treść może być niepełna, mogą się pojawić różne błędy lub czegoś może brakować. [Dowiedz się więcej o wczesnym dostępie](%1$s)</string>
     <string name="application_store_warning_early_access_title">Wczesny dostęp</string>
     <string name="application_store_warning_requires_desktop_app_description">Aby zagrać w tę grę, musisz mieć zainstalowaną aplikację Discorda $[aplikacja na komputer stacjonarny](downloadHook).</string>
     <string name="application_store_warning_requires_desktop_app_title">Wymaga aplikacji na komputer stacjonarny</string>
@@ -482,7 +476,6 @@ może być ryzykowne."</string>
     <string name="bans_hint">"Bany są domyślnie nakładane na konto i IP.
 Użytkownicy mogą omijać blokadę IP poprzez używanie proxy.
 Omijanie blokady może być stosunkowo utrudnione stosując weryfikację telefonu w ustawieniach [Moderacji](onModerationClick)."</string>
-    <string name="bans_no_results">Szukaliśmy w najdalszych zakątkach, ale nie udało nam się znaleźć użytkownika pasującego do tej nazwy.</string>
     <string name="bans_no_users_banned">"Nikogo nie zbanowałeś…
 ale jeżeli zajdzie taka potrzeba, to nie wahaj się!"</string>
     <string name="bans_search_placeholder">Szukaj banów</string>
@@ -515,21 +508,18 @@ ale jeżeli zajdzie taka potrzeba, to nie wahaj się!"</string>
     <string name="billing_address_state">Województwo</string>
     <string name="billing_address_state_error_required">Nazwa województwa jest wymagana</string>
     <string name="billing_address_zip_code">Kod pocztowy</string>
-    <string name="billing_address_zip_code_error_length">Kod musi składać się z 5 cyfr</string>
     <string name="billing_address_zip_code_error_required">Kod pocztowy jest wymagany</string>
     <string name="billing_address_zip_code_invalid">Kod pocztowy jest nieprawidłowy</string>
     <string name="billing_application_consumable_refund_text_unable">Nie można zażądać zwrotu pieniędzy za treść gry. Jeżeli pojawił się problem z Twoim zakupem, [skontaktuj się z naszą pomocą techniczną.](%1$s)</string>
     <string name="billing_application_refund_text">Zwrot pieniędzy przysługuje, jeśli zakupu dokonano w ciągu ostatnich %1$s dni, a w grę grano mniej niż %2$s godz. [Nasz pomocny zespół obsługi klienta pomoże Ci odzyskać pieniądze.](%3$s)</string>
     <string name="billing_application_refund_text_unable">Przepraszamy, w przypadku tego zakupu nie przysługuje zwrot pieniędzy. Zwrot pieniędzy przysługuje, jeśli zakupu dokonano w ciągu ostatnich %1$s dni, a w grę grano mniej niż %2$s godz.</string>
     <string name="billing_change_payment_source">Zmień metodę płatności</string>
-    <string name="billing_error_add_payment_source_streamer_mode">Nie możesz dodać nowych źródeł płatności, będąc w trybie streamera.</string>
     <string name="billing_error_gateway">Podczas przetwarzania płatności coś poszło nie tak, spróbuj ponownie!</string>
     <string name="billing_error_rate_limit">Dokonujesz zbyt wielu zakupów zbyt szybko. Zaczekaj chwilkę i spróbuj ponownie!</string>
     <string name="billing_error_section_address">Ups! Wygląda na to, że wystąpił problem z Twoim adresem. Popraw dane i spróbuj ponownie!</string>
     <string name="billing_error_section_card">Ups! Wygląda na to, że wystąpił problem z Twoją kartą. Popraw dane i spróbuj ponownie!</string>
     <string name="billing_history">Historia rozliczeń</string>
     <string name="billing_legal_mumbo_jumbo">Żargon prawniczy</string>
-    <string name="billing_legal_mumbo_jumbo_label">Akceptuję [Warunki Korzystania z Usługi Sklepu Discord](%1$s)</string>
     <string name="billing_no_payment_method">Brak zapisanej metody płatności</string>
     <string name="billing_no_payment_method_description">Rozliczaj się szybciej, zapisując metodę płatności</string>
     <string name="billing_pay_for_it_with">Zapłać przy użyciu</string>
@@ -537,12 +527,7 @@ ale jeżeli zajdzie taka potrzeba, to nie wahaj się!"</string>
     <string name="billing_payment_breakdown_total">Łącznie</string>
     <string name="billing_payment_history">Historia transakcji</string>
     <string name="billing_payment_premium">Twoja subskrypcja</string>
-    <string name="billing_payment_premium_legalese_monthly">Nabywając subskrypcję %1$s, akceptujesz nasze [Warunki Korzystania z Usługi Sklepu](%2$s). %1$s jest powtarzającą się subskrypcją. Zgadzasz się na to, że Discord od razu pobierze opłatę za pośrednictwem Metody Płatności w wysokości %3$s i będzie ją pobierać automatycznie co miesiąc, dopóki nie anulujesz swojej subskrypcji. Możesz ją anulować w każdej chwili.</string>
-    <string name="billing_payment_premium_legalese_yearly">Nabywając subskrypcję %1$s, akceptujesz nasze [Warunki Korzystania z Usługi Sklepu](%2$s). %1$s jest powtarzającą się subskrypcją. Zgadzasz się na to, że Discord od razu pobierze opłatę za pośrednitwem Metody Płatności w wysokości %3$s i będzie ją pobierać automatycznie co rok, dopóki nie anulujesz swojej subskrypcji. Możesz ją anulować w każdej chwili.</string>
     <string name="billing_payment_sources">Metody płatności</string>
-    <string name="billing_payment_table_header_amount">ILOŚĆ</string>
-    <string name="billing_payment_table_header_date">DATA</string>
-    <string name="billing_payment_table_header_description">OPIS</string>
     <string name="billing_premium_refund_text">Zwrot pieniędzy przysługuje, jeśli zakupu dokonano w ciągu ostatnich %1$s dni. [Nasz pomocny Zespół obsługi klienta pomoże Ci odzyskać pieniądze.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Przepraszamy, w przypadku tego zakupu nie przysługuje zwrot pieniędzy. Zwrot pieniędzy przysługuje, jeśli zakupu dokonano w ciągu ostatnich %1$s dni.</string>
     <string name="billing_price_per_month">%1$s / miesiąc</string>
@@ -552,9 +537,7 @@ ale jeżeli zajdzie taka potrzeba, to nie wahaj się!"</string>
     <string name="billing_purchase_details_header">Szczegóły zakupu</string>
     <string name="billing_refund_header">Problemy z zakupem?</string>
     <string name="billing_refund_play_time_never_played">Nigdy nie grano</string>
-    <string name="billing_refund_play_time_subheader">CZAS GRANIA</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">DATA ZAKUPU</string>
     <string name="billing_refund_report_a_problem">Zgłoś problem</string>
     <string name="billing_refund_request_button">Poproś o zwrot pieniędzy</string>
     <string name="billing_sales_tax_added">Ze względu na Twój adres rozliczeniowy dodany został podatek obrotowy w wysokości %1$s.</string>
@@ -564,7 +547,6 @@ ale jeżeli zajdzie taka potrzeba, to nie wahaj się!"</string>
     <string name="billing_step_credit_card_information">Informacje dotyczące płatności</string>
     <string name="billing_step_payment_type">Rodzaj płatności</string>
     <string name="billing_step_paypal">Informacje dotyczące konta PayPal</string>
-    <string name="billing_step_review">Przegląd</string>
     <string name="billing_subscribe">Subskrybuj</string>
     <string name="billing_tag_failed">Nieudane</string>
     <string name="billing_tag_pending">Oczekujące</string>
@@ -595,12 +577,8 @@ ale jeżeli zajdzie taka potrzeba, to nie wahaj się!"</string>
     <string name="browser_handoff_success_body">Chcesz zalogować się, korzystając z tego konta?</string>
     <string name="browser_handoff_success_cancel">Przełączyć na inne konto?</string>
     <string name="browser_handoff_success_title">Hej, %1$s!</string>
-    <string name="browser_input_device_warning">"Urządzenia nagrywania nie mogą być zmieniane podczas używania Discorda na przeglądarki. [Pobierz](onDownloadClick) Discorda na komputer stacjonarny,
-aby uzyskać pełną kontrolę nad urządzeniami nagrywania."</string>
     <string name="browser_not_supported">Przeglądarka nie jest obsługiwana</string>
     <string name="browser_notifications_enabled_body">Szastu prastu! Powiadomienia działają!</string>
-    <string name="browser_output_device_warning">"Urządzenia odtwarzania nie mogą być zmieniane podczas używania Discorda na przeglądarki. [Pobierz](onDownloadClick) Discorda na
-komputer stacjonarny, aby uzyskać pełną kontrolę nad urządzeniami odtwarzania."</string>
     <string name="bug_hunter_badge_tooltip">Łowca Bugów Discorda</string>
     <string name="bundle_ready_body">Zrestartuj Discorda dla nowych ulepszeń!</string>
     <string name="bundle_ready_later">Nie teraz</string>
@@ -647,7 +625,6 @@ komputer stacjonarny, aby uzyskać pełną kontrolę nad urządzeniami odtwarzan
     <string name="certified_device_recommendation_cancel">Nie, dzięki!</string>
     <string name="certified_device_recommendation_confirm">Przełącz</string>
     <string name="certified_device_recommendation_title">Wykryto certyfikowane urządzenie</string>
-    <string name="certified_device_recommendation_video_input_body">Discord wykrył certyfikowane urządzenie wejście wideo o nazwie **%1$s %2$s**. Zalecamy przełączenie się na nie, aby zapewnić optymalną obsługę.</string>
     <string name="change">Zmień</string>
     <string name="change_avatar">"Zmień
 awatar"</string>
@@ -666,9 +643,6 @@ lub nie poprawiasz niewłaściwego pseudonimu."</string>
     <string name="change_phone_number">Zmienić numer telefonu?</string>
     <string name="change_plan">Zmień plan</string>
     <string name="change_url">Zmień link</string>
-    <string name="change_vanity_url">Zmień niestandardowy adres</string>
-    <string name="change_vanity_url_error">"Niestandardowy adres nie może być zmieniony, bo zawiera niedozwolone znaki, jest za krótki lub jest już zajęty.
-Niestandardowy adres może zawierać tylko litery, liczby i myślniki."</string>
     <string name="channel">Kanał</string>
     <string name="channel_has_been_deleted">Kanał został usunięty.</string>
     <string name="channel_locked">Nie masz wystarczających uprawnień do wejścia na ten kanał.</string>
@@ -702,11 +676,9 @@ Niestandardowy adres może zawierać tylko litery, liczby i myślniki."</string>
     <string name="choose">Wybierz</string>
     <string name="choose_an_application">Wybierz aplikację</string>
     <string name="claim_account">Zajmij konto</string>
-    <string name="claim_account_body">Załóż konto, aby zachować wszystkie serwery i wiadomości nawet po zamknięciu przeglądarki.</string>
     <string name="claim_account_email_to">Dzięki! Wysłaliśmy link potwierdzający na: **%1$s**</string>
     <string name="claim_account_get_app">Pobierz aplikację na komputer stacjonarny</string>
     <string name="claim_account_promote_app">Pobierz naszą aplikację na komputer stacjonarny, aby skorzystać z pełni możliwości Discorda, w tym nakładki wewnątrz gry, powiadomień na pulpicie i globalnych skrótów klawiszowych.</string>
-    <string name="claim_account_required_body">Potwierdź własność swojego konta, aby móc używać aplikacji na komputer stacjonarny Discorda.</string>
     <string name="claim_account_required_email_to">Dzięki! Wysłaliśmy link potwierdzający na **%1$s**. Kliknij go, aby zweryfikować swoje konto.</string>
     <string name="clear_cache">Wyczyść pamięć podręczną</string>
     <string name="clone_channel">Sklonuj kanał</string>
@@ -793,7 +765,6 @@ malutki tekst poniżej."</string>
     <string name="connection_enter_code">Wpisz kod, kiedy pojawi się on na ekranie</string>
     <string name="connection_invalid_pin">Nieprawidłowy kod PIN</string>
     <string name="connection_login_with">lub zaloguj poprzez</string>
-    <string name="connection_problems_body">Sprawdź [status serwera](%1$s) albo napisz tweeta [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Uwierzytelnianie</string>
     <string name="connection_status_awaiting_endpoint">Oczekiwanie na punkt końcowy</string>
     <string name="connection_status_connected">Połączono</string>
@@ -838,7 +809,7 @@ malutki tekst poniżej."</string>
     <string name="create_category">Stwórz kategorię</string>
     <string name="create_channel">Utworzenie kanału</string>
     <string name="create_group_dm">Stwórz prywatną rozmowę grupową</string>
-    <string name="create_instant_invite">Tworzenie zaproszeń błyskawicznych</string>
+    <string name="create_instant_invite">Tworzenie zaproszenia</string>
     <string name="create_link">Utwórz link</string>
     <string name="create_or_join_modal_header">Oho, kolejny serwer?</string>
     <string name="create_server_button_body">Utwórz nowy serwer i zaproś swoich znajomych. To nic nie kosztuje!</string>
@@ -939,7 +910,6 @@ malutki tekst poniżej."</string>
     <string name="developer_application_test_mode_note">Wprowadź swoje ID aplikacji Discorda, aby włączyć tryb testowy tej aplikacji.</string>
     <string name="developer_application_test_mode_placeholder">ID aplikacji</string>
     <string name="developer_mode">Tryb dewelopera</string>
-    <string name="developer_mode_help_text">Tryb dewelopera dodaje dodatkowe funkcje pomocne dla osób piszących boty przy użyciu [API Discorda](%1$s).</string>
     <string name="device_no_permission">Urządzenie %1$s</string>
     <string name="device_settings">Ustawienia urządzenia</string>
     <string name="direct_message">Prywatna wiadomość</string>
@@ -953,7 +923,6 @@ malutki tekst poniżej."</string>
     <string name="disable_email_notifications_failed_suggestion">Powiadomienia e-mail już mogą być wyłączone lub ten adres e-mail może nie być powiązany z kontem Discorda.</string>
     <string name="disable_integration_title">Wyłącz synchronizację</string>
     <string name="disable_integration_twitch_body">Wyłączenie synchronizacji wykona akcję wygaśnięcia subskrypcji dla wszystkich subskrybentów.</string>
-    <string name="disable_integration_youtube_body">Wyłączenie synchronizacji wykona akcję wygaśnięcia sponsoringu dla wszystkich sponsorów.</string>
     <string name="disable_notifications_description">Wszystkie powiadomienia będą wyłączone.</string>
     <string name="disable_notifications_label">Wyłącz powiadomienia</string>
     <string name="disable_sounds_description">Wszystkie efekty dźwiękowe będą wyłączone.</string>
@@ -970,7 +939,6 @@ malutki tekst poniżej."</string>
     <string name="discord_desc_short">Grupowy czat głosowy i tekstowy</string>
     <string name="discord_rich_presence">Rich Presence Discorda</string>
     <string name="dismiss">Odrzuć</string>
-    <string name="dispatch_error_modal_body">Coś poszło nie tak. Jeśli problem nie ustąpi, utwórz bilet wsparcia i wklej do niego treść poniższej wiadomości.</string>
     <string name="dispatch_error_modal_error_label">Wiadomość błędu (skopiuj i wklej mnie)</string>
     <string name="dispatch_error_modal_header">Błąd: Discord Dispatch</string>
     <string name="dispatch_error_modal_open_ticket">Otwórz bilet</string>
@@ -1009,7 +977,6 @@ malutki tekst poniżej."</string>
     <string name="edit_channel">Edytuj kanał</string>
     <string name="edit_message">Edytuj wiadomość</string>
     <string name="edit_note">Edytuj notkę</string>
-    <string name="edit_overview">Edytuj skrócony opis</string>
     <string name="edit_roles">Edytowanie ról</string>
     <string name="edit_textarea_help">klawisz esc, aby [anulować](onCancel) • klawisz enter, aby [zapisać](onSave)</string>
     <string name="edit_user">Edytuj %1$s</string>
@@ -1039,7 +1006,6 @@ malutki tekst poniżej."</string>
     <string name="emoji_matching">Emoji pasujące do **%1$s**</string>
     <string name="emoji_name">Nazwa</string>
     <string name="emoji_slots_available">%1$s</string>
-    <string name="emoji_too_big">Ta emotka była za duża! Emotki muszą mieć mniej niż %1$skb.</string>
     <string name="en_gb">Angielski (Wielka Brytania)</string>
     <string name="en_us">Angielski (Stany Zjednoczone)</string>
     <string name="enable">Włącz</string>
@@ -1047,17 +1013,14 @@ malutki tekst poniżej."</string>
     <string name="enable_privacy_access">Możesz włączyć dostęp w ustawieniach prywatności.</string>
     <string name="enable_streamer_mode_description">Możesz stworzyć skrót klawiszowy do przełączania trybu streamowania w [Ustawieniach skrótów klawiszowych](onClick).</string>
     <string name="enable_streamer_mode_label">Włącz tryb streamowania</string>
-    <string name="enable_twitch_emoji_sync">Włącz niestandardowe emotikony Twitch dla zsynchronizowanych subskrybentów.</string>
     <string name="enter_email_body">Aby zweryfikować Twój adres e-mail, musisz najpierw wprowadzić adres e-mail.</string>
     <string name="enter_phone_description">Wprowadź swój numer telefonu. Otrzymasz wiadomość ze swoim kodem weryfikacyjnym.</string>
     <string name="enter_phone_title">Wprowadź numer telefonu</string>
-    <string name="enter_vanity_url">Wprowadź niestandardowy adres</string>
     <string name="errors_action_to_take">Namierzyliśmy błąd i rozprawimy się z nim jak najszybciej.</string>
     <string name="errors_reload">Odśwież</string>
     <string name="errors_restart_app">Zrestartuj Discorda</string>
     <string name="errors_unexpected_crash">Wygląda na to, że Discord nieoczekiwanie uległ awarii….</string>
     <string name="es_es">Hiszpański</string>
-    <string name="everyone_popout_body">Używając **%1$s**, oznaczysz %2$s+ osób. Na pewno chcesz to zrobić?</string>
     <string name="everyone_popout_enter">Wciśnij **ENTER**, aby wysłać</string>
     <string name="everyone_popout_esc">Wciśnij **ESC**, aby edytować</string>
     <string name="everyone_popout_footer">Może zamiast tego spróbuj wspomnieć rolę lub poszczególnych użytkowników?</string>
@@ -1086,22 +1049,15 @@ malutki tekst poniżej."</string>
     <string name="focus_participant">Przybliż tę osobę</string>
     <string name="force_sync">Wymuś synchronizację</string>
     <string name="forgot_password">Nie pamiętasz hasła?</string>
-    <string name="forgot_password_body">Spokojnie! Wprowadź adres email związany z Twoim kontem, abyśmy mogli zweryfikować, czy to Ty.</string>
     <string name="form_checkbox_debug_logging">Logowanie debugowania</string>
     <string name="form_checkbox_qos">Użyj pakietów z wysokim priorytetem (QoS)</string>
     <string name="form_description_audio_mode_android_call">Jeśli doświadczasz problemów z mikrofonem lub słuchawkami, spróbuj użyć tego trybu audio. W przeciwnym razie, pozostaw ustawienie domyślne.</string>
     <string name="form_description_audio_mode_android_communication">To jest domyślny tryb audio dla aplikacji VoIP takich jak Discord. Zalecamy pozostawienie tego ustawienia.</string>
-    <string name="form_description_push_afk_timeout">"Discord unika wysyłania powiadomień na Twoje urządzenie mobilne, gdy jesteś przy komputerze.
-Użyj tego ustawienia, aby kontrolować, jak długo musisz być AFK, aby otrzymywać powiadomienia na telefon."</string>
     <string name="form_description_tts">Włącz je, jeśli chcesz, aby nowoczesny robot wypowiadał na głos powiadomienia dla Ciebie.</string>
     <string name="form_error_generic">Ups! Pojawił się niezwykle rzadki błąd. To najprawdopodobniej nasza wina, więc spróbuj ponownie albo sprawdź [naszą stronę statusu] (%1$s).</string>
-    <string name="form_help_afk_channel">"Użytkownicy będący nieaktywni przez dłuższy czas zostaną automatycznie wyciszeni i przeniesieni
-do tego kanału. Opcja nie dotyczy przeglądarek."</string>
     <string name="form_help_attenuation">"Obniż dźwięk innych aplikacji o ten procent, podczas gdy inni użytkownicy coś mówią.
 Ustaw na 0%%, aby całkowicie wyłączyć tłumienie."</string>
     <string name="form_help_automatic_vad">Jeśli wskaźnik jest zielony, Discord nadaje Twój piękny głos.</string>
-    <string name="form_help_bitrate">"**WSZYSTKIE BITY!** Nie zalecamy więcej niż %1$skb/s, chyba że jesteś audiofilem. Nie poprawi to jakości w znaczący sposób, a wpłynie
-negatywnie na osoby z urządzeniami mobilnymi i słabymi połączeniami."</string>
     <string name="form_help_certified_voice_processing">"Podczas korzystania z mikrofonu zatwierdzonego przez Discorda, niektóre opcje przetwarzania głosu nie są obsługiwane przez nas,
 a przez sam mikrofon."</string>
     <string name="form_help_channel_permissions">Wybranie ról automatycznie ustawi podstawowe uprawnienia dla tego kanału.</string>
@@ -1112,23 +1068,13 @@ otrzymają je dla każdej wiadomości wysłanej na tym serwerze. **Zalecamy usta
 aby uniknąć [takiego sajgonu](%1$s).**"</string>
     <string name="form_help_default_notification_settings_mobile">"To pozwoli określić, czy członkowie, którzy nie ustawili ręcznie powiadomień, będą je otrzymywać dla
 każdej wysłanej wiadomości na tym serwerze. Wysoce zalecamy ustawienie tej opcji na powiadamiane tylko dla @wzmianki dla publicznego serwera Discorda"</string>
-    <string name="form_help_explicit_content_filter">"Automatycznie skanuje i usuwa wiadomości zawierające nieodpowiednie treści na tym serwerze. Wybierz w jakim stopniu
-filtr będzie stosowany do członków na Twoim serwerze. **Zalecamy ustawienie filtra dla publicznego serwera.**"</string>
-    <string name="form_help_instant_invite_channel">"Jeśli kanał jest zaznaczony, link z zaproszeniem błyskawicznym zostanie wygenerowany z widżetem,
-w przeciwnym razie zostaną objęci tylko członkowie online i kanały głosowe."</string>
-    <string name="form_help_last_seen">"Czyszczenie wyrzuci **%1$s**, którzy nie byli
-aktywni od **%2$s** i nie są przypisani do żadnej roli.
-Członkowie mogą z powrotem dołączyć do serwera, używając nowego zaproszenia błyskawicznego."</string>
     <string name="form_help_legacy_subsystem">"Niektóre sterowniki dźwięku wykazują problemy podczas używania nowoczesnego podsystemu dźwiękowego Twojego systemu operacyjnego.
 Zaznacz tę opcję, aby powrócić do starszego podsystemu dźwiękowego."</string>
     <string name="form_help_nsfw">"Użytkownicy będą musieli potwierdzić, że są powyżej wieku pełnoletności, aby wyświetlać zawartość w tym kanale.
 Kanały NSFW nie są skanowane przez filtr nieodpowiednich zawartości."</string>
-    <string name="form_help_premade_widget">"Wstaw ten kod HTML na swoją stronę, aby użyć pięknego, przygotowanego przez nas, widżetu Discorda. Jeżeli masz dostęp do loginów swoich
-użytkowników, możesz dynamicznie dodać &amp;username= do zapytania."</string>
     <string name="form_help_qos">"Wskazuje Twojemu routerowi, że pakiety, które przesyła Discord są o wysokim priorytecie.
 Niektóre routery lub usługodawcy internetowi mogą zachowywać się niepoprawnie, gdy to ustawienie zostanie włączone."</string>
     <string name="form_help_slowmode">Członkowie będą mogli wysyłać tylko jedną wiadomość w tym przedziale czasowym, chyba że mają uprawnienia Zarządzanie kanałem albo Zarządzanie wiadomościami.</string>
-    <string name="form_help_system_channel">Wyślij wiadomość na ten kanał, gdy ktoś dołączy do tego serwera. Wiadomości są wybierane losowo. Można wyłączyć tę funkcję w każdej chwili.</string>
     <string name="form_help_temporary">Członkowie są automatycznie wyrzucani przy rozłączeniu, chyba że przypisano im rolę.</string>
     <string name="form_help_user_limit">"Ogranicza liczbę użytkowników mogących połączyć się z tym kanałem głosowym. Użytkownicy posiadający uprawnienie **Przenoszenie członków** nie podlegają
 ograniczeniu i mogą swobodnie przenosić użytkowników do tego kanału."</string>
@@ -1164,17 +1110,15 @@ Nie dotyczy użytkowników mających przypisaną rolę.
     <string name="form_label_display_names">Pokazuj nazwy</string>
     <string name="form_label_display_users">Pokazuj użytkowników</string>
     <string name="form_label_email">Adres e-mail</string>
-    <string name="form_label_enable_widget">Aktywuj widżet</string>
     <string name="form_label_expire_grace_period">Karencja</string>
     <string name="form_label_explicit_content_filter">Filtr nieodpowiedniej zawartości</string>
     <string name="form_label_hoist_description">Wyświetl użytkowników tej roli oddzielnie od użytkowników online.</string>
     <string name="form_label_input">Wejście</string>
     <string name="form_label_input_device">Urządzenie nagrywania</string>
-    <string name="form_label_input_mode">Rodzaj przechwytywania</string>
     <string name="form_label_input_sensitivty">Czułość wejściowa</string>
     <string name="form_label_input_volume">Głośność nagrywania</string>
-    <string name="form_label_instant_invite">Wprowadź zaproszenie błyskawiczne</string>
-    <string name="form_label_instant_invite_channel">Kanał zaproszeń błyskawicznych</string>
+    <string name="form_label_instant_invite">Wprowadź zaproszenie</string>
+    <string name="form_label_instant_invite_channel">Kanał zaproszeń</string>
     <string name="form_label_last_seen">Ostatnio widziany(-a)</string>
     <string name="form_label_local_mute">Wyciszenie lokalne</string>
     <string name="form_label_max_age">Wygasa po</string>
@@ -1214,7 +1158,6 @@ Nie dotyczy użytkowników mających przypisaną rolę.
     <string name="form_label_overlay_text_chat_notifications">Pokaż powiadomienia czatu tekstowego</string>
     <string name="form_label_password">Hasło</string>
     <string name="form_label_phone_number">Numer telefonu</string>
-    <string name="form_label_premade_widget">Predefiniowany widżet</string>
     <string name="form_label_push_afk_timeout">Limit czasu AFK dla powiadomień</string>
     <string name="form_label_qos">Jakość usług</string>
     <string name="form_label_reason_ban">Powód bana</string>
@@ -1242,7 +1185,6 @@ Nie dotyczy użytkowników mających przypisaną rolę.
     <string name="form_label_suppress_everyone">Ignoruj **@everyone** i **@here**</string>
     <string name="form_label_synced_role">Zsynchronizowana rola</string>
     <string name="form_label_synced_subs">Zsynchronizowani subskrybenci</string>
-    <string name="form_label_system_channel">Kanał wysyłania wiadomości o nowych członkach</string>
     <string name="form_label_temporary">Tymczasowe członkostwo</string>
     <string name="form_label_tts">TTS</string>
     <string name="form_label_tts_notifications">Powiadomienia TTS</string>
@@ -1304,7 +1246,6 @@ aby móc obserwować czułość wejściową."</string>
     <string name="game_action_button_game_not_detected">Nie wykryto gry</string>
     <string name="game_action_button_install">Zainstaluj</string>
     <string name="game_action_button_locate">Znajdź</string>
-    <string name="game_action_button_login_to_buy">Zaloguj się, aby kupić</string>
     <string name="game_action_button_now_playing">W grze</string>
     <string name="game_action_button_paused">Zapauzowano</string>
     <string name="game_action_button_play">Graj</string>
@@ -1312,7 +1253,6 @@ aby móc obserwować czułość wejściową."</string>
     <string name="game_action_button_queue">Aktualizacja kolejki</string>
     <string name="game_action_button_queued">W kolejce</string>
     <string name="game_action_button_restricted_in_region">Niedostępne w Twoim kraju</string>
-    <string name="game_action_button_unavailable">Niedostępne</string>
     <string name="game_action_button_unavailable_tooltip">Dostępne na %1$s</string>
     <string name="game_action_button_unavailable_tooltip_plural">Dostępne na %1$s albo %2$s</string>
     <string name="game_action_button_uninstalling_1">Odinstalowywanie</string>
@@ -1343,7 +1283,6 @@ aby móc obserwować czułość wejściową."</string>
     <string name="game_feed_activity_recently_played">Ostatnio zagrane</string>
     <string name="game_feed_activity_streaming_twitch">Transmituje na Twitchu</string>
     <string name="game_feed_current_header_title">W grze</string>
-    <string name="game_feed_settings_visibility">Pokaż w zakładce Gry</string>
     <string name="game_feed_unknown_player">Nieznany gracz</string>
     <string name="game_feed_user_played_days_ago">Grano %1$s %2$s temu</string>
     <string name="game_feed_user_played_hours_ago">W grze %1$s %2$s temu</string>
@@ -1413,7 +1352,7 @@ aby móc obserwować czułość wejściową."</string>
     <string name="generate_a_new_link">Wygeneruj nowy link</string>
     <string name="get_started">Rozpocznij</string>
     <string name="gif_auto_play_label">Automatycznie odtwarzaj GIFy, kiedy okno Discorda jest aktywne.</string>
-    <string name="go_live_changelog_guilds">Nadawaj na żywo jest już dostępne na: %1$s</string>
+    <string name="go_live_hardware_acceleration_unavailable">Uwaga, nie możemy wykryć akceleracji sprzętowej. Twój komputer może mieć problemy z obsługą Go Live.</string>
     <string name="go_live_hey">Hej!</string>
     <string name="go_live_listen">Słuchaj!</string>
     <string name="go_live_look">Oglądaj!</string>
@@ -1427,13 +1366,12 @@ aby móc obserwować czułość wejściową."</string>
     <string name="go_live_modal_select_channel_form_title">Wybierz kanał głosowy</string>
     <string name="go_live_modal_select_channel_placeholder">Szukaj kanałów głosowych</string>
     <string name="go_live_modal_title">Nadawaj na żywo</string>
-    <string name="go_live_premium_early_access">Jako podziękowanie za wspieranie nas przez Discord Nitro, opcja streamowania gier Nadawaj na żywo jest dla Ciebie dostępna już teraz!</string>
+    <string name="go_live_video_drivers_outdated">Twoje sterowniki wideo są nieaktualne. Zaktualizuj je, by podnieść wydajność Go Live.</string>
     <string name="grant_temporary_membership">Przyznaj tymczasowe członkostwo</string>
     <string name="group">Grupa</string>
     <string name="group_dm_add_friends">Dodaj znajomych do rozmowy prywatnej</string>
     <string name="group_dm_add_members">Dodaj %1$s</string>
     <string name="group_dm_header">Wybierz znajomych</string>
-    <string name="group_dm_invite_empty">Nie znaleziono znajomych, których obecnie nie ma w tej prywatnej rozmowie grupowej.</string>
     <string name="group_dm_invite_full_sub">Grupy mają limit 10 członków.</string>
     <string name="group_dm_invite_link_title">Lub wyślij link z zaproszeniem do znajomych!</string>
     <string name="group_dm_invite_no_friends">Nie masz żadnych znajomych do dodania!</string>
@@ -1504,8 +1442,6 @@ aby móc obserwować czułość wejściową."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Przyznano** %1$s dla **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Przeniesiono z **%1$s** do **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">W pozycji **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) stworzył(-a) kanał tekstowy $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Ustawiono temat kanału na **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Ustawiono temat na **%1$s**</string>
@@ -1534,12 +1470,6 @@ aby móc obserwować czułość wejściową."</string>
     <string name="guild_settings_audit_log_guild_system_channel_id_change">Ustawiono kanał powitalny na **%1$s**</string>
     <string name="guild_settings_audit_log_guild_system_channel_id_disable">**Wyłączono** wiadomości powitalne</string>
     <string name="guild_settings_audit_log_guild_update">$[**%1$s**](userHook) wprowadził(-a) zmiany do $[**%2$s**](targetHook)</string>
-    <string name="guild_settings_audit_log_guild_vanity_url_code_change">Ustawiono niestandardowy adres URL na **%1$s**</string>
-    <string name="guild_settings_audit_log_guild_vanity_url_code_delete">**Usunięto** niestandardowy adres URL</string>
-    <string name="guild_settings_audit_log_guild_widget_channel_id_change">Ustawiono kanał widżetu na **%1$s**</string>
-    <string name="guild_settings_audit_log_guild_widget_channel_id_delete">**Usunięto** kanał widżetu</string>
-    <string name="guild_settings_audit_log_guild_widget_disabled">**Wyłączono** widżet</string>
-    <string name="guild_settings_audit_log_guild_widget_enabled">**Włączono** widżet</string>
     <string name="guild_settings_audit_log_invite_channel_create">Dla kanału **%1$s**</string>
     <string name="guild_settings_audit_log_invite_code_create">Z kodem **%1$s**</string>
     <string name="guild_settings_audit_log_invite_create">$[**%1$s**](userHook) utworzył(-a) zaproszenie $[**%2$s**](targetHook)</string>
@@ -1600,6 +1530,8 @@ aby móc obserwować czułość wejściową."</string>
     <string name="guild_settings_filter_all_actions">Wszystkie działania</string>
     <string name="guild_settings_filter_all_users">Wszyscy użytkownicy</string>
     <string name="guild_settings_filter_user">Filtruj według użytkownika</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">Streamy Go Live w jakości 720p 60fps</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">Streamy Go Live w jakości 1080p 60fps</string>
     <string name="guild_settings_label_audit_log">Dziennik zdarzeń</string>
     <string name="guild_settings_label_audit_log_empty_body">Kiedy moderatorzy rozpoczną moderację, możesz moderować moderatorów tutaj.</string>
     <string name="guild_settings_label_audit_log_empty_title">Brak dzienników</string>
@@ -1610,16 +1542,8 @@ aby móc obserwować czułość wejściową."</string>
     <string name="guild_settings_members_server_members">Członkowie serwera</string>
     <string name="guild_settings_overview_notice">Uważaj! Masz niezapisane zmiany!</string>
     <string name="guild_settings_server_invite_background">Tło ekranu zapraszania na serwer</string>
-    <string name="guild_settings_title_server_widget">Widżet serwera</string>
-    <string name="guild_settings_widget_embed_help">"Umieść ten kod HTML na swoją stronę, aby użyć przygotowanego przez nas, pięknego widżetu Discorda.
-
-Jeżeli masz dostęp do loginów swoich użytkowników, możesz dynamicznie dodać &amp;username= do zapytania."</string>
-    <string name="guild_settings_widget_enable_widget">Włącz widżet serwera</string>
     <string name="guild_verification_text_account_age">Twoje konto musi istnieć przynajmniej %1$s minut, aby wysyłać wiadomości na tym serwerze.</string>
     <string name="guild_verification_text_member_age">Musisz być członkiem przez co najmniej %1$s minut, aby wysyłać wiadomości na tym serwerze.</string>
-    <string name="guild_verification_text_not_claimed">Musisz najpierw założyć i potwierdzić swoje konto, aby wysyłać wiadomości na tym serwerze.</string>
-    <string name="guild_verification_text_not_phone_verified">Musisz najpierw potwierdzić swoją tożsamość poprzez telefon, aby wysyłać wiadomości na tym serwerze.</string>
-    <string name="guild_verification_text_not_verified">Musisz najpierw potwierdzić swoje konto, aby wysyłać wiadomości na tym serwerze.</string>
     <string name="guild_verified">Zweryfikowany</string>
     <string name="hardware_acceleration">Akceleracja sprzętowa</string>
     <string name="hardware_acceleration_help_text">Włącza akcelerację sprzętową, która korzystając z mocy obliczeniowej Twojej karty graficznej sprawia, że Discord jest płynniejszy. Wyłącz akcelerację sprzętową, jeśli masz spadki FPSów w grach.</string>
@@ -1630,8 +1554,7 @@ Jeżeli masz dostęp do loginów swoich użytkowników, możesz dynamicznie doda
     <string name="help_role_locked">Ta rola jest zablokowana, ponieważ jest wyższa niż Twoja najwyższa rola.</string>
     <string name="help_role_locked_mine">Ta rola jest zablokowana, gdyż jest Twoją najwyższą rolą. Poproś o pomoc kogoś z jeszcze wyższą rolą lub samego właściciela serwera.</string>
     <string name="help_singular_permission">Nie możesz usunąć tego uprawnienia, bo usunąłbyś je także sobie.</string>
-    <string name="hide_instant_invites_description">Zalecane, jeśli nie chcesz aby przypadkowe osoby miały dostęp do Twoich serwerów.</string>
-    <string name="hide_instant_invites_label">Ukryj linki do zaproszeń błyskawicznych</string>
+    <string name="hide_instant_invites_label">Ukryj linki z zaproszeniem</string>
     <string name="hide_muted">Ukryj %1$s</string>
     <string name="hide_muted_channels">Ukryj wyciszone kanały</string>
     <string name="hide_personal_information_description">Ukrywa e-mail, połączone konta, notki i anonimizuje tagi Discorda.</string>
@@ -1657,14 +1580,12 @@ Jeżeli masz dostęp do loginów swoich użytkowników, możesz dynamicznie doda
     <string name="hypesquad_membership_heading">Dom %1$s</string>
     <string name="hypesquad_newsletter_warning">Prawnicy Wumpusa chcą poinformować, że dołączając do HypeSquadu, zgadzasz się na otrzymywanie newsletterów.</string>
     <string name="hypesquad_online_badge_tooltip">Dom %1$s HypeSquadu</string>
-    <string name="hypesquad_perk_description_profile_badge">Zdobądź unikatową odznakę profilową, dzięki której pokażesz, do jakiego domu HypeSquadu należysz.</string>
     <string name="hypesquad_perk_description_squad_challenges">Zostań reprezentantem swojego domu i zmierz się z innymi domami HypeSquadu.</string>
     <string name="hypesquad_perk_title_newsletter">Supertajny newsletter</string>
     <string name="hypesquad_perk_title_profile_badge">Hajpowa odznaka profilowa</string>
     <string name="hypesquad_perk_title_squad_challenges">Wyzwania Squadu</string>
     <string name="hypesquad_perks_heading">Perki za hajp</string>
     <string name="hypesquad_question_0_prompt">Wumpus pojawia się w drzwiach wejściowych a Ty:</string>
-    <string name="hypesquad_question_0_response_a">Krzyczysz „LEROY JENKINS” i biegniesz prosto do niego.</string>
     <string name="hypesquad_question_0_response_b">Wpadasz w konsternację, ponieważ Wumpus to fikcyjna postać, a Ty jesteś na urlopie.</string>
     <string name="hypesquad_question_0_response_c">Zapraszasz Wumpusa do domu i oferujesz mu zimny napój.</string>
     <string name="hypesquad_question_0_response_d">Mdlejesz, ponieważ niezbyt dobrze sobie radzisz z niespodziankami.</string>
@@ -1680,7 +1601,6 @@ Jeżeli masz dostęp do loginów swoich użytkowników, możesz dynamicznie doda
     <string name="hypesquad_question_11_response_d">Sugerujesz, żeby Wumpus zabrał się lepiej za grę na tamburynie.</string>
     <string name="hypesquad_question_12_prompt">Wchodzisz na szczyt najwyższej góry i jedyną rzeczą oddzielającą Cię od bogactwa, jest trzygłowy smok, który staje Ci na drodze. Co robisz?</string>
     <string name="hypesquad_question_12_response_a">Ruszasz do walki.</string>
-    <string name="hypesquad_question_12_response_b">Oglądasz stare filmy z Godzillą, aby nauczyć się co nieco z jego walk z Królem Ghidorą.</string>
     <string name="hypesquad_question_12_response_c">Starasz się przekonać smoka, żeby podzielił się z Tobą bogactwem.</string>
     <string name="hypesquad_question_12_response_d">Oferujesz smokowi przytulankę Wumpusa, czyż mógłby się jej oprzeć?</string>
     <string name="hypesquad_question_13_prompt">Co to za dźwięk?:</string>
@@ -1738,7 +1658,6 @@ Jeżeli masz dostęp do loginów swoich użytkowników, możesz dynamicznie doda
     <string name="hypesquad_question_9_response_b">Nic nie mówisz i wskrzeszasz drużynę.</string>
     <string name="hypesquad_question_9_response_c">Śmiejesz się i proponujesz, żeby spróbować jeszcze raz.</string>
     <string name="hypesquad_question_9_response_d">"Wykopujesz Wumpusa i mianujesz Clyde'a nowym tankiem."</string>
-    <string name="hypesquad_quiz_body_house_1">House of Braveryi dziękuje za to, że razem z nami chcesz chronić świętość krainy i troszczyć się o spuściznę Renwilu. Twoja odwaga jest porównywalna z odwagą tysiąca dzielnych wojowników i gdyby nie Twoje przywództwo oraz męstwo, bylibyśmy na prostej drodze do pogrążenia się w chaosie.</string>
     <string name="hypesquad_quiz_body_house_2">House of Brilliance dziękuje za to, że razem z nami chcesz chronić krainę i troszczyć się o spuściznę Urdimu. Opracowujesz strategie niczym mistrzowski taktyk, a gdyby nie Twoje przemyślane podejście do wszelkich problemów, które spotykasz na swojej drodze, bylibyśmy na prostej drodze do pogrążenia się w chaosie.</string>
     <string name="hypesquad_quiz_body_house_3">House of Balance dziękuje za to, że razem z nami chcesz chronić krainę i troszczyć się o spuściznę Arame. Twoja umiejętność zachowania zimnej krwi w chwilach niepewności jest godna podziwu. Gdyby nie Twoje naturalne zrozumienie zarówno swojego środowiska, jak i swojego wnętrza, bylibyśmy na prostej drodze do pogrążenia się w chaosie.</string>
     <string name="hypesquad_quiz_cancel">Anuluj</string>
@@ -1784,18 +1703,17 @@ Jeżeli masz dostęp do loginów swoich użytkowników, możesz dynamicznie doda
     <string name="input_mode_ptt_release_delay">Opóźnienie zakończenia Naciśnij i Mów</string>
     <string name="input_mode_vad">Aktywność Głosowa</string>
     <string name="install_location_main">Domyślna</string>
-    <string name="instant_invite">Zaproszenie błyskawiczne</string>
+    <string name="instant_invite">Zaproszenie</string>
     <string name="instant_invite_accept">Zaakceptuj zaproszenie</string>
-    <string name="instant_invite_accepted">Zaakceptowano zaproszenie błyskawicznego</string>
-    <string name="instant_invite_accepting">Akceptowanie zaproszenia błyskawicznego</string>
+    <string name="instant_invite_accepted">Zaakceptowane zaproszenie</string>
+    <string name="instant_invite_accepting">Akceptowanie zaproszenie</string>
     <string name="instant_invite_ask_for_new_invite">Poproś o nowe!</string>
     <string name="instant_invite_ask_user_for_new_invite">Poproś %1$s o nowe zaproszenie!</string>
     <string name="instant_invite_code">Kod</string>
-    <string name="instant_invite_expired">To zaproszenie błyskawiczne jest przedawnione, bądź nieprawidłowe.</string>
+    <string name="instant_invite_expired">To zaproszenie jest przedawnione, bądź nieprawidłowe.</string>
     <string name="instant_invite_expires">Wygasa</string>
     <string name="instant_invite_failed_to_generate">Nie udało się utworzyć linka z zaproszeniem.</string>
     <string name="instant_invite_generate">Generuj</string>
-    <string name="instant_invite_generated_by_widget">Wygenerowane przez widżet</string>
     <string name="instant_invite_guild_by_user">$[**%1$s**](guildNameHook) przez **%2$s**</string>
     <string name="instant_invite_guild_members_online">%1$s online</string>
     <string name="instant_invite_guild_members_total">%1$s</string>
@@ -1809,27 +1727,24 @@ Jeżeli masz dostęp do loginów swoich użytkowników, możesz dynamicznie doda
     <string name="instant_invite_regenerate">Regeneruj</string>
     <string name="instant_invite_resolved_body">Zaproszono Cię do **%1$s** w **%2$s**.</string>
     <string name="instant_invite_resolved_title">Cześć!</string>
-    <string name="instant_invite_resolving">Przetwarzanie zaproszenia błyskawicznego</string>
+    <string name="instant_invite_resolving">Przetwarzanie zaproszenia</string>
     <string name="instant_invite_uses">Użyć</string>
     <string name="instant_invite_you_are_already_a_member_of">Jesteś już członkiem</string>
     <string name="instant_invite_you_have_been_invited_to_join">Zaproszono Cię do dołączenia</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** zaprosił(-a) Cię do dołączenia</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Otrzymano zaproszenie do dołączenia do prywatnej rozmowy grupowej od</string>
-    <string name="instant_invites">Zaproszenia błyskawiczne</string>
+    <string name="instant_invites">Zaproszenia</string>
     <string name="integration_settings">Ustawienia integracji</string>
     <string name="integrations">Integracje</string>
-    <string name="integrations_header">Połączone konta Twitch/YouTube Gaming</string>
     <string name="integrations_pro_tip">Dla większej integracji sprawdź [StreamKit Discorda](%1$s).</string>
     <string name="internal_server_error">Wystąpił błąd wewnętrzny serwera, spróbuj ponownie.</string>
     <string name="invalid_animated_emoji_body">To emoji tutaj nie zadziała, ponieważ jest animowane. Wykup Discord Nitro, aby spełnić marzenie o animowanych emoji</string>
     <string name="invalid_animated_emoji_body_upgrade">To emoji tutaj nie zadziała, ponieważ jest animowane. Discord Nitro rozwiąże ten problem, sprawdź Ustawienia użytkownika > Nitro po więcej informacji</string>
     <string name="invalid_external_emoji_body">To emoji nie zadziała tutaj, ponieważ pochodzi z innego serwera. Wykup Discord Nitro, aby używać emoji z innych serwerów</string>
     <string name="invalid_external_emoji_body_upgrade">To emoji tutaj nie zadziała, ponieważ pochodzi z innego serwera. Discord Nitro rozwiąże ten problem, sprawdź Ustawienia użytkownika > Nitro po więcej informacji</string>
-    <string name="invalid_invite_link_error">Proszę wprowadzić prawidłowy link lub kod zaproszenia.</string>
     <string name="invalid_request_format">**%1$s** jest w niepoprawnym formacie. Podaj DiscordTag#0000 lub e-mail.</string>
     <string name="invalid_text_channel">nieprawidłowy-kanał</string>
     <string name="invalid_voice_channel">Nieprawidłowy kanał</string>
-    <string name="invite_banner_does_not_expire">Ten link nigdy nie wygaśnie. Możesz zarządzać wszystkimi zaproszeniami w ustawieniach serwera</string>
     <string name="invite_banner_invite_to_server">Wyślij ten link znajomym, aby dodać ich na ten serwer</string>
     <string name="invite_banner_share_invite_link_for_access">Serwery istnieją po to, aby się nimi dzielić.</string>
     <string name="invite_button_accepted">dołączono do **%1$s**</string>
@@ -1847,11 +1762,9 @@ Jeżeli masz dostęp do loginów swoich użytkowników, możesz dynamicznie doda
     <string name="invite_button_streaming">%1$s nadaje na żywo!</string>
     <string name="invite_button_streaming_subtext">w %1$s</string>
     <string name="invite_button_title_invited">Otrzymano zaproszenie do dołączenia do serwera</string>
-    <string name="invite_button_title_invited_group_dm">Otrzymano zaproszenie do dołączenia do rozmowy grupowej</string>
     <string name="invite_button_title_invited_invalid">Otrzymałeś(-łaś) zaproszenie, ale…</string>
     <string name="invite_button_title_invited_stream">Zaproszono Cię do oglądania streamu</string>
     <string name="invite_button_title_inviter">Wysłałeś(-łaś) zaproszenie dołączenia do serwera</string>
-    <string name="invite_button_title_inviter_group_dm">Wysłałeś(-łaś) zaproszenie do dołączenia do rozmowy grupowej</string>
     <string name="invite_button_title_inviter_invalid">Wysłałeś(-łaś) zaproszenie, ale…</string>
     <string name="invite_button_title_inviter_stream">Wysłałeś(-łaś) zaproszenie do oglądania streamu</string>
     <string name="invite_button_title_streaming">Zaproś do oglądania streamu</string>
@@ -1931,13 +1844,13 @@ Czy chcesz dowiedzieć się więcej o Discordzie?"</string>
     <string name="join_afk_channel_body">Wygląda na to, że dołączyłeś(-łaś) do kanału AFK. Nie możesz mówić na tym kanale.</string>
     <string name="join_call">Dołącz do rozmowy</string>
     <string name="join_server">Dołącz</string>
-    <string name="join_server_button_body">Wprowadź zaproszenie błyskawiczne, aby dołączyć do serwera swojego znajomego.</string>
+    <string name="join_server_button_body">Wprowadź zaproszenie, aby dołączyć do serwera swojego znajomego.</string>
     <string name="join_server_button_cta">Dołącz do serwera</string>
     <string name="join_server_button_cta_mobile">Dołącz do serwera poprzez link z zaproszeniem błyskawicznym</string>
     <string name="join_server_button_cta_mobile_desc">Masz kod lub link z zaproszeniem? Użyj ich tutaj!</string>
     <string name="join_server_button_cta_named">Dołącz do %1$s</string>
-    <string name="join_server_description">Wprowadź zaproszenie błyskawiczne poniżej, aby dołączyć do istniejącego serwera. Zaproszenie będzie wyglądało podobnie do tych:</string>
-    <string name="join_server_description_mobile">Wprowadź zaproszenie błyskawiczne powyżej, aby dołączyć do istniejącego serwera.</string>
+    <string name="join_server_description">Wprowadź zaproszenie poniżej, aby dołączyć do istniejącego serwera. Zaproszenie będzie wyglądało podobnie do tych:</string>
+    <string name="join_server_description_mobile">Wprowadź zaproszenie powyżej, aby dołączyć do istniejącego serwera.</string>
     <string name="join_server_title">Dołącz do serwera</string>
     <string name="join_stream">Dołącz do streamu</string>
     <string name="join_video_call">Dołącz do rozmowy wideo</string>
@@ -1976,7 +1889,6 @@ Czy chcesz dowiedzieć się więcej o Discordzie?"</string>
     <string name="keybind_description_modal_toggle_help">Uzyskaj wsparcie</string>
     <string name="keybind_description_modal_toggle_hotkeys">Przełącz skróty klawiszowe</string>
     <string name="keybind_description_modal_toggle_mentions">Przełącz okienko wzmianek</string>
-    <string name="keybind_description_modal_toggle_mute">Przełącz wyłączenie mikrofonu</string>
     <string name="keybind_description_modal_toggle_pins">Przełącz przypięte wiadomości</string>
     <string name="keybind_description_modal_toggle_previous_guild">Przełącz pomiędzy ostatnim serwerem a prywatnymi wiadomościami</string>
     <string name="keybind_description_modal_toggle_users">Przełącz listę członków kanału</string>
@@ -2003,7 +1915,6 @@ na czas, kiedy Ty mówisz."</string>
     <string name="keybind_toggle_overlay">Przełącz nakładkę</string>
     <string name="keybind_toggle_overlay_input_lock">Przełącz blokadę nakładki</string>
     <string name="keybind_toggle_stream_mode">Przełącz tryb streamowania</string>
-    <string name="keybind_toggle_voice_mode">Przełącz detekcję Aktywności Głosowej</string>
     <string name="keybind_unassigned">Nieprzypisane</string>
     <string name="keybinds">Skróty klawiszowe</string>
     <string name="keyboard_behavior_mobile_header">Zachowanie klawiatury</string>
@@ -2045,7 +1956,7 @@ na czas, kiedy Ty mówisz."</string>
     <string name="link_your_xbox_account_2">Discord to aplikacja do rozmów głosowych, tekstowych oraz wideo dla graczy. Jest darmowa, bezpieczna oraz dostępna na komputery i urządzenia mobilne.</string>
     <string name="listening_to">Słucha **%1$s**</string>
     <string name="live">Na żywo</string>
-    <string name="live_beta_description">Witaj w streamie! Nadawaj na żywo jest w fazie beta. Wybacz ewentualne niedociągnięcia</string>
+    <string name="live_beta_description">Witaj w streamie! Go Live jest w fazie beta. Wybacz ewentualne niedociągnięcia</string>
     <string name="live_on_twitch">Streamuje na Twitchu</string>
     <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Nie udało się załadować obrazka.
@@ -2105,12 +2016,8 @@ Nie może być ręcznie przypisana członkom ani usunięta."</string>
     <string name="members_header">%1$s</string>
     <string name="members_matching">Członkowie pasujący do **%1$s**</string>
     <string name="members_search_placeholder">Szukaj członków</string>
-    <string name="mention">Powiadamianie</string>
-    <string name="mention_everyone">Powiadamianie wszystkich</string>
     <string name="mention_everyone_autocomplete_description">Powiadom wszystkich posiadających uprawnienia do wyświetlenia tego kanału.</string>
     <string name="mention_everyone_autocomplete_description_mobile">Powiadom wszystkich użytkowników na tym kanale.</string>
-    <string name="mention_everyone_description">"Członkowie z tym uprawnieniem mogą wysyłać powiadomienia Push wszystkim członkom tego kanału poprzez
-wiadomość z @everyone lub @here."</string>
     <string name="mention_here_autocomplete_description">Powiadom dostępnych użytkowników, którzy mają uprawnienia do wyświetlania tego kanału.</string>
     <string name="mention_here_autocomplete_description_mobile">Powiadom dostępnych członków na tym kanale.</string>
     <string name="mention_role_autocomplete_description_mobile">Powiadom użytkowników z tą rolą na tym kanale.</string>
@@ -2129,7 +2036,6 @@ wiadomość z @everyone lub @here."</string>
     <string name="message_tts">%1$s powiedział(-a) %2$s</string>
     <string name="message_tts_deleted_role">Usunięta rola</string>
     <string name="message_unpinned">Wiadomość odpięta.</string>
-    <string name="message_warning_mention_everyone_body">Oznaczysz wkrótce %1$s. Na pewno?</string>
     <string name="message_warning_mention_everyone_title">Łoł!</string>
     <string name="messages">Wiadomości</string>
     <string name="metacritic_num_critic_ratings">W oparciu o %1$s ocen</string>
@@ -2154,7 +2060,6 @@ wiadomość z @everyone lub @here."</string>
     <string name="mfa_sms_receive_code">Otrzymaj kod uwierzytelniający z SMS</string>
     <string name="mfa_sms_remove">Usuń uwierzytelnianie za pomocą SMS</string>
     <string name="mfa_sms_resend">Wysłać ponownie SMSa?</string>
-    <string name="microphone_permission_error">Mikrofon pozostał wyciszony, ponieważ okno dialogowe zostało odrzucone.</string>
     <string name="minimum_size">Minimalny rozmiar: **%1$sx%1$s **</string>
     <string name="missed_an_update">Ominęła Cię aktualizacja? [Sprawdź dzienniki zmian](%1$s)</string>
     <string name="missing_entitlement_modal_body">Discord nie może uruchomić **%1$s**, ponieważ nie masz już uprawnień do tej aplikacji. Może się tak dziać z różnych powodów, takich jak wygasła subskrypcja Nitro, zwrot, lub jeżeli **%1$s** usunięto ze Sklepu Discorda. [Zobacz ten artykuł pomocy, aby uzyskać więcej informacji lub wsparcie.](%2$s)</string>
@@ -2201,13 +2106,10 @@ kanałów, do których mają dostęp przenoszeni oraz przenoszący."</string>
     <string name="new_messages_divider">Nowe wiadomości</string>
     <string name="new_messages_estimated">%1$s+ nowych wiadomości od %2$s</string>
     <string name="new_messages_estimated_with_date">%1$s+ nowych wiadomości od %2$s dnia %3$s</string>
-    <string name="new_messages_with_date">%1$s od %2$s dnia %3$s</string>
     <string name="new_override">Dodaj nadpisanie</string>
     <string name="new_permission">Nowe uprawnienie</string>
     <string name="new_terms_ack">Zapoznałem(-łam) się i zgadzam się z tymi warunkami.</string>
     <string name="new_terms_continue">Przejdź do Discorda</string>
-    <string name="new_terms_description">"Aby dalej używać Discorda, zapoznaj się i wyraź zgodę na
-zaktualizowane Warunki korzystania z usługi oraz Politykę prywatności."</string>
     <string name="new_terms_title">Aktualizacja Warunków Korzystania z Usługi i Polityki Prywatności</string>
     <string name="new_unreads">Nowe nieprzeczytane wiadomości</string>
     <string name="next">Dalej</string>
@@ -2230,14 +2132,11 @@ zaktualizowane Warunki korzystania z usługi oraz Politykę prywatności."</stri
     <string name="no_emoji_title">Brak emoji</string>
     <string name="no_input_devices">Brak urządzeń nagrywania</string>
     <string name="no_input_devices_detected">Nie wykryto żadnych urządzeń nagrywania, podłącz je i spróbuj ponownie.</string>
-    <string name="no_instant_invite">Brak zaproszeń błyskawicznych</string>
-    <string name="no_integrations">[Połącz](onConnect) swoje konto Twitch lub YouTube Gaming, aby zsynchronizować swoich subskrybentów/sponsorów z rolami</string>
+    <string name="no_instant_invite">Brak zaproszenia</string>
     <string name="no_integrations_body">Protokół PRZYJ4ŹN1 może być uruchomiony tylko z klienta Discorda</string>
     <string name="no_integrations_label">Brak integracji</string>
-    <string name="no_invites_body">"Czujesz się bez znaczenia? Jak papierowy samolocik dryfujący po niebie?
-Zdobądź nowych znajomych tutaj, tworząc link do błyskawicznego zaproszenia!"</string>
-    <string name="no_invites_caption">Brak zaproszeń błyskawicznych!</string>
-    <string name="no_invites_label">Brak błyskawicznych zaproszeń</string>
+    <string name="no_invites_caption">Brak zaproszeń!</string>
+    <string name="no_invites_label">Brak zaproszeń</string>
     <string name="no_mail_account_description">Wyślij swoje uwagi na support@discordapp.com. W tym czasie skopiowaliśmy Twoje dane użytkownika do systemowego schowka – są gotowe do wklejenia.</string>
     <string name="no_mail_account_title">Konto bez adresu e-mail</string>
     <string name="no_mic_body">Instrukcje dotyczące włączania dostępu do mikrofonu można znaleźć w Centrum Pomocy Discorda.</string>
@@ -2245,7 +2144,6 @@ Zdobądź nowych znajomych tutaj, tworząc link do błyskawicznego zaproszenia!"
     <string name="no_mutual_friends">Brak wspólnych znajomych</string>
     <string name="no_mutual_guilds">Brak wspólnych serwerów</string>
     <string name="no_output_devices">Brak urządzeń odtwarzania</string>
-    <string name="no_photo_in_camera_roll">Brak zdjęć z aparatu</string>
     <string name="no_photos_access">Discord nie ma dostępu do Twoich zdjęć</string>
     <string name="no_pins_in_channel">"Ten kanał nie ma żadnych
 przypiętych wiadomości… jeszcze."</string>
@@ -2255,7 +2153,6 @@ przypiętych wiadomości… jeszcze."</string>
     <string name="no_reactions_header">Brak reakcji</string>
     <string name="no_recent_mentions">Na początku… była cisza.</string>
     <string name="no_send_messages_permission_placeholder">Nie masz uprawnień do wysyłania wiadomości na tym kanale.</string>
-    <string name="no_system_channel">Brak wiadomości o nowych członkach</string>
     <string name="no_text">Nie</string>
     <string name="no_thanks">Nie, dzięki</string>
     <string name="no_user_limit">Bez limitu</string>
@@ -2267,7 +2164,6 @@ przypiętych wiadomości… jeszcze."</string>
     <string name="note">Notka</string>
     <string name="note_placeholder">Kliknij, aby dodać notkę</string>
     <string name="note_placeholder_mobile">Stuknij, aby dodać notatkę</string>
-    <string name="notice_application_test_mode">Tryb testowy jest obecnie aktywny dla **%1$s**. Pojawią się nieopublikowane SKU i nie zostaną pobrane powiązane płatności.</string>
     <string name="notice_application_test_mode_go_to_listing">Przejdź do SKU</string>
     <string name="notice_connect_spotify">Połącz swoje konto Spotify, aby wyświetlać odtwarzaną muzykę w swoim statusie!</string>
     <string name="notice_connection_conflict">Rozłączono Cię, ponieważ połączyłeś(-łaś) się z innego miejsca.</string>
@@ -2278,7 +2174,6 @@ przypiętych wiadomości… jeszcze."</string>
     <string name="notice_dispatch_error_disk_low">Nie masz wystarczająco miejsca na dysku. Wymagane jest %1$s, ale dostępne jest tylko %2$s.</string>
     <string name="notice_dispatch_error_file_name_too_long">O nie, ta gra ma pliki, których nazwy są za długie dla systemu Windows. Wybierz krótszy katalog.</string>
     <string name="notice_dispatch_error_invalid_drive">O nie, lokalizacja wybrana przez Ciebie do instalacji jest nieprawidłowa. Wybrałeś(-łaś) %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Nie udało nam się zaktualizować gry. Czy jest właśnie uruchomiona?</string>
     <string name="notice_dispatch_error_no_manifests">O nie, wygląda na to, że nie ma treści tej gry. Skontaktuj się z pomocą techniczną.</string>
     <string name="notice_dispatch_error_not_entitled">O nie, wygląda na to, że nie jesteś właścicielem tej gry. Skontaktuj się z pomocą techniczną, jeśli uważasz, że jest to błąd.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Wygląda na to, że nie zatwierdziłeś(-łaś) skryptu instalacyjnego. Musisz go zatwierdzić, aby móc zainstalować grę.</string>
@@ -2293,9 +2188,6 @@ przypiętych wiadomości… jeszcze."</string>
     <string name="notice_native_apps">Potrzebujesz ogólnosystemowego Naciśnij i Mów? Pobierz aplikację na komputer stacjonarny!</string>
     <string name="notice_no_input_detected">Cóż, wygląda na to, że Discord nie wykrywa żadnego sygnału z Twojego mikrofonu. Naprawmy to… razem.</string>
     <string name="notice_no_input_detected_help_link_text">Pomocy!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Twój dostęp do Nitro wygasł. Przejdź z Nitro Classic na Nitro, aby uzyskać nieograniczony dostęp do wspaniałych gier.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Twój dostęp do gier Nitro kończy się za %1$s! Dostęp dobiega końca w dniu **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Dziękujemy za to, że od pierwszych dni wspierasz Nitro! W ramach podziękowań za to, że jesteś cool, masz teraz dostęp do gier Nitro do dnia %1$s.</string>
     <string name="notice_premium_promo_action">Wypróbuj</string>
     <string name="notice_premium_promo_message">Wesprzyj rozwój Discorda i zdobądź odjazdowe dodatki!</string>
     <string name="notice_scheduled_maintenance">Discord przejdzie w stan zaplanowanej konserwacji od godziny **%1$s** dnia **%2$s**.</string>
@@ -2365,7 +2257,6 @@ Znajomy wysłał Ci zaproszenie? Podaj link z zaproszeniem lub kod poniżej, aby
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Włączona nakładka</string>
     <string name="nux_post_reg_join_server_description">Skorzystaj w pełni z możliwości Discorda, dołączając na serwer.</string>
     <string name="nux_post_reg_join_server_skip">Nie mam</string>
     <string name="nux_post_reg_join_server_title">Posiadasz zaproszenie?</string>
@@ -2419,7 +2310,6 @@ Nakładka również może nie zadziałać u wszystkich. Jeśli masz problemy lub
     <string name="overlay_news_text_pinning_body">Możesz teraz przypiąć czat tekstowy do swojej gry!</string>
     <string name="overlay_news_text_pinning_tip">Wskazówka: Możesz przypiąć czat, naciskając $[IkonaPrzypinania](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Nakładka Discorda została zaktualizowana</string>
-    <string name="overlay_no_results">Szukaliśmy wzdłuż i wszerz. Niestety, nie znaleźliśmy żadnych kanałów głosowych.</string>
     <string name="overlay_notification_incoming_call">Połączenie przychodzące…</string>
     <string name="overlay_notification_settings_disabled">Powiadomienia wyłączone</string>
     <string name="overlay_notification_settings_position">Wyświetlanie: %1$s</string>
@@ -2429,7 +2319,6 @@ Nakładka również może nie zadziałać u wszystkich. Jeśli masz problemy lub
     <string name="overlay_notifications_settings">Powiadomienia z nakładki</string>
     <string name="overlay_notifications_top_left">Lewy górny róg</string>
     <string name="overlay_notifications_top_right">Prawy górny róg</string>
-    <string name="overlay_private_channels_empty_state">Nic z tego, brak prywatnych wiadomości.</string>
     <string name="overlay_reload">Załaduj ponownie nakładkę</string>
     <string name="overlay_settings">Ustawienia nakładki</string>
     <string name="overlay_settings_general_tab">Ogólne</string>
@@ -2443,7 +2332,6 @@ Nakładka również może nie zadziałać u wszystkich. Jeśli masz problemy lub
     <string name="overlay_voice_channels_empty_state">Nic z tego, brak kanałów głosowych.</string>
     <string name="overlay_widget_hide_in_game">Ukryj okno w grze</string>
     <string name="overlay_widget_show_in_game">Pokaż okno w grze</string>
-    <string name="overview">Podgląd</string>
     <string name="overwrite_autocomplete_label">Dodaj:</string>
     <string name="overwrite_autocomplete_placeholder">Rola/Członek</string>
     <string name="overwrite_no_role_to_add">Każda rola nadpisała uprawnienia na tym kanale.</string>
@@ -2451,7 +2339,6 @@ Nakładka również może nie zadziałać u wszystkich. Jeśli masz problemy lub
     <string name="pagination_page_of">Strona %1$s z %2$s</string>
     <string name="pagination_previous">Poprzednie</string>
     <string name="paginator_of_pages">Strona %1$s z %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Partner Discorda</string>
     <string name="party_full">Grupa pełna</string>
     <string name="party_join">Dołącz do grupy</string>
@@ -2532,9 +2419,6 @@ Nakładka również może nie zadziałać u wszystkich. Jeśli masz problemy lub
     <string name="pin_message_too_many_title">Pinezki popękały</string>
     <string name="pinned_messages">Przypięte wiadomości</string>
     <string name="pinned_messages_pro_tip">DOBRA RADA:</string>
-    <string name="pinned_messages_pro_tip_body_channel">Użytkownicy z uprawnieniem \\\"Zarządzanie wiadomościami\\\" mogą przypinać wiadomości z menu wielokropka.</string>
-    <string name="pinned_messages_pro_tip_body_dm">Ty i %1$s możecie przypinać wiadomość z menu wielokropka.</string>
-    <string name="pinned_messages_pro_tip_body_group_dm">Każdy członek grupy może przypiąć wiadomość z jej menu wielokropka.</string>
     <string name="pins_disabled_nsfw">Ten kanał jest oznaczony jako NSFW i z powodu jego zawartości przypięte w nim wiadomości nie powinny być wyświetlane przez nikogo.</string>
     <string name="pl">Polski</string>
     <string name="playing_game">W grze **%1$s**</string>
@@ -2544,18 +2428,11 @@ Nakładka również może nie zadziałać u wszystkich. Jeśli masz problemy lub
     <string name="popout_stay_on_top">Zawsze na wierzchu</string>
     <string name="post_code">Kod pocztowy</string>
     <string name="premium_alert_error_title">Ups, coś poszło nie tak…</string>
-    <string name="premium_applications_grandfathered_monthly">W ramach podziękowań za to, że wspierasz Discorda, przyznajemy Ci dostęp do gier Nitro na rok. Ten dostęp kończy się w dniu **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">W ramach podziękowań za to, że wspierasz Discorda, przyznajemy Ci dostęp do gier Nitro na 2 lata. Ten dostęp kończy się w dniu **%1$s**.</string>
-    <string name="premium_applications_subtitle">Nieograniczony dostęp do rosnącej biblioteki cieszących się dużym uznaniem gier, w które Ty i Twoi znajomi powinniście zagrać.</string>
-    <string name="premium_applications_title">Dziesiątki wyselekcjonowanych gier. Jedna niska opłata miesięczna.</string>
     <string name="premium_badge_tooltip">Subskrybent od %1$s</string>
     <string name="premium_cancel_cancel">Nie</string>
     <string name="premium_cancel_confirm_body_tier_1">"Subskrypcja zostanie anulowana pod koniec Twojego obecnego okresu rozliczeniowego dnia **%1$s**. Twój tag Discorda zostanie wybrany losowo, jeżeli został przez Ciebie zmieniony.
 
 Możesz odnowić swoją subskrypcję w każdej chwili."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Subskrypcja zostanie anulowana pod koniec Twojego obecnego okresu rozliczeniowego. W dniu **%1$s** utracisz dostęp do wszystkich gier Nitro w bibliotece, a Twój tag Discorda zostanie wybrany losowo, jeżeli został przez Ciebie zmieniony.
-
-Zachowamy zapisane przez Ciebie pliki, dzięki czemu zawsze możesz zmienić zdanie. Możesz odnowić subskrypcję w każdej chwili!"</string>
     <string name="premium_cancel_confirm_new">Tak, anuluj %1$s</string>
     <string name="premium_cancel_confirm_title">Anulować %1$s?</string>
     <string name="premium_cancel_failed_body">Nie byliśmy w stanie anulować Twojej subskrypcji Nitro. Proszę spróbować ponownie lub skontaktować się z naszym zespołem wsparcia, jeżeli ten problem będzie się powtarzał.</string>
@@ -2567,24 +2444,17 @@ Zachowamy zapisane przez Ciebie pliki, dzięki czemu zawsze możesz zmienić zda
     <string name="premium_change_discriminator_modal_header">Zmień swój tag Discorda</string>
     <string name="premium_change_discriminator_tooltip">Chcesz dostosować swój tag? Wypróbuj Nitro!</string>
     <string name="premium_change_discriminator_zero_error">Ten tag jest nieprawidłowy. Muszą one być większe niż 0.</string>
-    <string name="premium_chat_perks_description_animated_avatar_and_emoji">Prześlij gify z animowanymi avatarami i emojami.</string>
-    <string name="premium_chat_perks_description_badge">Pokaż, jak długo wspierasz Discorda, poprzez specjalną odznakę na profilu.</string>
     <string name="premium_chat_perks_description_custom_emoji">Zdobądź globalną przepustkę na używanie swoich niestandardowych emoji w dowolnym miejscu.</string>
     <string name="premium_chat_perks_description_discriminator">Wybierz swój tag na czas subskrypcji.</string>
-    <string name="premium_chat_perks_description_screenshare">Zwiększ jakość współdzielenia ekranu do 720p 60 fps lub 1080p 30 fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Większy rozmiar przesyłanego pliku (%1$s z %2$s) dla dzielenia się memami o wysokiej jakości.</string>
+    <string name="premium_chat_perks_streaming_mobile">Lepsze streamy Go Live: streamuj w jakości w jakości źródłowej na Nitro lub nawet w świetnej jakości 1080p 60 FPS na Nitro Classic</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Animowana zabawa</string>
     <string name="premium_chat_perks_title_badge">Pochwal się swoim wsparciem</string>
-    <string name="premium_chat_perks_title_custom_emoji">Globalne niestandardowe emoje</string>
     <string name="premium_chat_perks_title_discriminator">Niestandardowy tag Discorda</string>
     <string name="premium_chat_perks_title_screenshare">Wideo w wyższej jakości</string>
+    <string name="premium_chat_perks_title_streaming">Lepsze streamy Go Live</string>
     <string name="premium_code_redemption_confirmation_blurb">Dzięki losowemu ciągowi cyfr możesz teraz korzystać z urozmaiceń czatu przez %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">Ooch, cudnie!</string>
-    <string name="premium_feature_new_chat_perks_header">Otrzymujesz też niektóre urozmaicenia czatu:</string>
-    <string name="premium_feature_new_premium_applications_header">Gry warte ponad %1$s. Sprawdź je:</string>
-    <string name="premium_feature_view_applications">Wyświetl wszystkie gry Nitro</string>
     <string name="premium_features_chat_perks">Urozmaicenia czatu</string>
-    <string name="premium_features_premium_applications">Darmowe gry</string>
     <string name="premium_grandfathered_warning">W ramach podziękowań za to, że nas wspierasz, zaoferowaliśmy Ci zniżkę na plan Nitro. **Anulując lub zmieniając swój plan, stracisz tę zniżkę.** Ostrzegaliśmy Cię!</string>
     <string name="premium_grandfathered_warning_confirm">Zrób to i tak</string>
     <string name="premium_grandfathered_warning_title">Uważaj, przyjacielu</string>
@@ -2592,12 +2462,8 @@ Zachowamy zapisane przez Ciebie pliki, dzięki czemu zawsze możesz zmienić zda
     <string name="premium_info_yearly">Opłata %1$s (roczna) pobierana jest w dniu %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** miesięcznie</string>
     <string name="premium_not_claimed">Najpierw zajmij konto</string>
-    <string name="premium_not_claimed_body">Hej przyjacielu! Jeśli chcesz kupić Nitro, musisz najpierw zarejestrować swoje konto, aby nie stracić swoich rzeczy.</string>
     <string name="premium_not_verified">Najpierw zweryfikuj swój adres e-mail</string>
-    <string name="premium_not_verified_body">Hej, przyjacielu! Jeśli chcesz kupić Nitro, musisz najpierw zweryfikować swój adres e-mail. Sprawdź swoją pocztę albo zażądaj nowego adresu.</string>
-    <string name="premium_payment_applications_os_warning">Gry Nitro są kompatybilne tylko z systemem Windows.</string>
     <string name="premium_payment_confirmation_blurb_regular">Możesz teraz korzystać z urozmaiceń czatu. Więc przestań to czytać i siadaj do czatu!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Masz teraz nieograniczony dostęp do tak wielu świetnych gier. Zatem przestań to czytać i zabierz się za granie!</string>
     <string name="premium_payment_confirmation_button_regular">OK, brzmi w porzo</string>
     <string name="premium_plan_month">Miesięczna subskrypcja Nitro</string>
     <string name="premium_plan_month_tier_1">Miesięczna subskrypcja Nitro Classic</string>
@@ -2618,13 +2484,10 @@ Odliczymy koszt obecnego planu od ceny rocznej. Pobrane zostanie **%1$s**."</str
     <string name="premium_upgrade_disabled_current_tooltip">Twój bieżący plan.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Zanim wybierzesz plan niższego szczebla, musisz anulować swoją subskrypcję i poczekać, aż wygaśnie.</string>
     <string name="premium_upgrade_done_body_tier_1">Możesz teraz korzystać z urozmaiceń czatu!</string>
-    <string name="premium_upgrade_done_body_tier_2">Możesz teraz korzystać z urozmaiceń czatu i masz dostęp do dziesiątek gier.</string>
     <string name="premium_upgrade_done_button_tier_1">Cudnie!</string>
-    <string name="premium_upgrade_done_button_tier_2">Sprawdź wszystkie gry Nitro</string>
     <string name="premium_upgrade_failed_body">Uhh… To ulepszenie nie zadziałało. Upewnij się, że Twoje dane dotyczące wybranego sposobu płatności są aktualne i spróbuj ponownie.</string>
     <string name="premium_upload_promo">Ulepsz do Discord Nitro, aby zwiększyć limit plików do %1$s</string>
     <string name="premium_year_free_months">Otrzymaj 2 miesiące za darmo!</string>
-    <string name="premium_year_free_months_short">2 miesiące za darmo</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** rocznie</string>
     <string name="preview_chat">Podgląd czatu</string>
     <string name="priority_speaker">Priorytetowy rozmówca</string>
@@ -2644,8 +2507,6 @@ można aktywować, korzystając ze skrótu klawiszowego **%1$s**."</string>
     <string name="prune">Wyczyść</string>
     <string name="prune_members">Wyczyszczanie członków</string>
     <string name="pt_br">Portugalski, Brazylijski</string>
-    <string name="ptt_limited_body">"Naciśnij i Mów (ograniczone) będzie działać tylko, kiedy ta karta przeglądarki jest aktywna. Pobierz aplikację na komputer stacjonarn
-dla ogólnosystemowego Naciśnij i Mów."</string>
     <string name="ptt_limited_title">Hej, mała uwaga</string>
     <string name="ptt_limited_warning">"Naciśnij i Mów (ograniczone) będzie działać tylko, kiedy karta przeglądarki jest aktywna. [Pobierz](onDownloadClick) aplikację na
 komputer stacjonarny dla ogólnosystemowego Naciśnij i Mów."</string>
@@ -2722,7 +2583,6 @@ podczas rozgrywki."</string>
     <string name="remove_keybind">Usuń skrót klawiszowy</string>
     <string name="remove_role_or_user">Usuń %1$s</string>
     <string name="remove_synced_role">Usuń rolę</string>
-    <string name="remove_vanity_url">Usuń niestandardowy adres</string>
     <string name="render_embeds">Pokazuj informacje podglądu stron internetowych z linków wklejanych do czatu.</string>
     <string name="render_embeds_label">Podgląd linków</string>
     <string name="render_reactions">Pokazuj reakcje emoji w wiadomościach.</string>
@@ -2760,9 +2620,6 @@ Na pewno chcesz to zrobić?"</string>
     <string name="rtc_connection">Połączenie z serwerem RTC</string>
     <string name="rtc_connection_info">Informacje o połączeniu</string>
     <string name="rtc_connection_state_authenticating">Discord jest połączony z Twoim serwerem komunikacji w czasie rzeczywistym i zabezpiecza połączenie.</string>
-    <string name="rtc_connection_state_awaiting_endpoint">"Discord utrzymuje serwer RTC dla Ciebie! Jeśli Twoje połączenie zacina się na tym kroku to możliwe, że
-mamy problemy z serwerami w danym regionie. A niech to! Sprawdź naszą [stronę statusu usług](%1$s), aby uzyskać więcej informacji lub poproś właściciela
-o tymczasową zmianę regionu serwera."</string>
     <string name="rtc_connection_state_connecting">Serwer RTC został przeniesiony i Discord stara się z nim połączyć. Zaraz zaczynamy.</string>
     <string name="rtc_connection_state_disconnected">"Coś się posypało. Discord stracił połączenie z Twoim serwerem komunikacji w czasie rzeczywistym. Za chwilę
 spróbujemy je odzyskać."</string>
@@ -2803,12 +2660,10 @@ i spróbuje teraz wysłać dane."</string>
     <string name="scope_connections_empty">Nie masz jeszcze żadnych połączonych kont!</string>
     <string name="scope_email">Uzyskaj dostęp do Twojego adresu e-mail</string>
     <string name="scope_email_empty">Nie masz jeszcze ustawionego e-maila!</string>
-    <string name="scope_gdm_join">Dołącz do rozmów grupowych dla Ciebie</string>
-    <string name="scope_gdm_join_description">To pozwala aplikacji na dołączanie do grupowych rozmów w Twoim imieniu, gdy zostaną utworzone.</string>
     <string name="scope_guilds">Poznaj listę Twoich serwerów</string>
     <string name="scope_guilds_empty">Nie masz jeszcze żadnych serwerów!</string>
     <string name="scope_guilds_join">Dołącz do serwerów dla Ciebie</string>
-    <string name="scope_guilds_join_description">Korzysta z zaproszeń błyskawicznych w Twoim imieniu.</string>
+    <string name="scope_guilds_join_description">Korzysta z zaproszeń w Twoim imieniu.</string>
     <string name="scope_identify">Uzyskaj dostęp do Twojej nazwy użytkownika i awataru</string>
     <string name="scope_messages_read">Przeczytaj wszystkie wiadomości</string>
     <string name="scope_messages_read_description">To pozwala aplikacji na czytanie wszystkich wiadomości na Twoim koncie Discorda</string>
@@ -2822,7 +2677,6 @@ i spróbuje teraz wysłać dane."</string>
     <string name="scope_webhook_incoming_channel_placeholder">Wybierz kanał</string>
     <string name="scope_webhook_incoming_description">To pozwala aplikacji na wysyłanie wiadomości na kanał na Discordzie</string>
     <string name="screen_share_on">Włącz współdzielenie ekranu</string>
-    <string name="screen_share_options">Więcej opcji udostępniania ekranu</string>
     <string name="screenshare_change_windows">Zmień okno</string>
     <string name="screenshare_description">"Discord chciałby współdzielić zawartość Twojego ekranu z %1$s.
 
@@ -2877,7 +2731,6 @@ Wybierz, który ekran chcesz współdzielić."</string>
     <string name="search_filter_on">dnia</string>
     <string name="search_for_emoji">Znajdź idealne emoji</string>
     <string name="search_for_empty">Szukaj</string>
-    <string name="search_for_value">Szukaj: **%1$s**</string>
     <string name="search_group_header_channels">W kanale</string>
     <string name="search_group_header_dates">Daty</string>
     <string name="search_group_header_file_name">Nazwa pliku zawiera</string>
@@ -2987,7 +2840,6 @@ Czy na pewno chcesz to zrobić?"</string>
     <string name="settings_games_toggle_overlay">Przełącz nakładkę</string>
     <string name="settings_games_verified_icon">Zweryfikowana</string>
     <string name="settings_invite_tip">Oto lista wszystkich aktywnych linków z zaproszeniem. Możesz odwołać którekolwiek z nich lub [utworzyć nowe](onCreateInvite).</string>
-    <string name="settings_invite_tip_without_create">Oto lista wszystkich Twoich aktywnych linków zaproszeń. Możesz wyłączyć każdy z nich.</string>
     <string name="settings_notice_message">Uważaj – masz niezapisane zmiany!</string>
     <string name="settings_permissions_delete_body">Czy na pewno chcesz usunąć uprawnienia **%1$s**? Tej akcji nie można cofnąć.</string>
     <string name="settings_permissions_delete_title">Usuń ustawienia uprawnień</string>
@@ -2999,7 +2851,6 @@ Czy na pewno chcesz to zrobić?"</string>
     <string name="settings_webhooks_empty_body">Stwórz webhooka, aby zobaczyć magię</string>
     <string name="settings_webhooks_empty_title">Brak webhooków</string>
     <string name="setup">Konfiguracja</string>
-    <string name="setup_vanity_url">Ustaw niestandardowy adres</string>
     <string name="several_users_typing">Kilka osób pisze…</string>
     <string name="share">Udostępnij</string>
     <string name="share_invite_link_for_access">Podziel się tym linkiem z innymi, aby udzielić im dostępu do tego serwera</string>
@@ -3082,16 +2933,13 @@ Czy na pewno chcesz to zrobić?"</string>
     <string name="stop_ringing">Zakończ dzwonienie</string>
     <string name="stop_streaming">Zakończ streamowanie</string>
     <string name="stop_watching">Zakończ oglądanie</string>
-    <string name="store_payment_legalese_monthly">Hej! Kupując %1$s, akceptujesz nasze [Warunki Korzystania z Usługi Sklepu](%2$s). %1$s jest subskrypcją cykliczną, co oznacza, że zaczniemy pobierać opłaty od dzisiaj i będziemy je kontynuować co miesiąc, dopóki nie anulujesz swojej subskrypcji. Możesz to zrobić w dowolnym momencie w swoich Ustawieniach użytkownika.</string>
-    <string name="store_payment_legalese_yearly">Hej! Kupując %1$s, akceptujesz nasze [Warunki Korzystania z Usługi Sklepu](%2$s). %1$s jest subskrypcją cykliczną, co oznacza, że zaczniemy pobierać opłaty od dzisiaj i będziemy je kontynuować co rok, dopóki nie anulujesz swojej subskrypcji. Możesz to zrobić w dowolnym momencie w swoich Ustawieniach użytkownika.</string>
     <string name="stream">Nadawaj na żywo</string>
     <string name="stream_bad_spectator">Obecnie jakość obrazu i dźwięku oglądanego przez Ciebie streamu jest niższa. Może to wynikać z problemów z siecią.</string>
     <string name="stream_bad_streamer">Obecnie jakość obrazu i dźwięku Twojego streamu jest niższa. Może to wynikać z problemów z siecią.</string>
     <string name="stream_capture_paused">Wstrzymano stream</string>
     <string name="stream_capture_paused_details">Wróć do gry, aby go wznowić.</string>
     <string name="stream_capture_paused_details_viewer">%1$s ma zminimalizowaną grę… Chwileczkę!</string>
-    <string name="stream_channel_description">Członkowie z tym uprawnieniem mogą streamować na te kanał.</string>
-    <string name="stream_description">Członkowie z tym uprawnieniem mogą streamować w tym kanale.</string>
+    <string name="stream_channel_description">Członkowie z tym uprawnieniem mogą streamować na tym kanale.</string>
     <string name="stream_ended">Ten stream się zakończył. *cisza, aż w uszach dzwoni*</string>
     <string name="stream_ended_button">Zakończono stream</string>
     <string name="stream_ended_no_spectators">Nie ma obserwatorów, ponieważ stream się zakończył.</string>
@@ -3131,7 +2979,6 @@ Czy na pewno chcesz to zrobić?"</string>
     <string name="stream_report_rating_body_streamer">Opowiedz nam o swoim doświadczeniu streamowania.</string>
     <string name="stream_report_submit">Wyślij</string>
     <string name="stream_reported">Wysłano informacje zwrotne</string>
-    <string name="stream_reported_body">Dziękujemy za zgłoszenie problemu! Dzięki informacjom zwrotnym możemy poprawiać jakość streamu.</string>
     <string name="stream_soundshare_failed">Coś poszło nie tak i nie udało nam się przetransmitować dźwięku z Twojej gry.</string>
     <string name="streamer_mode">Tryb streamowania</string>
     <string name="streamer_mode_enabled">Tryb streamowania włączony</string>
@@ -3189,7 +3036,6 @@ Czy na pewno chcesz to zrobić?"</string>
     <string name="system_message_guild_member_join_10">Pojawił się dziki użytkownik %1$s.</string>
     <string name="system_message_guild_member_join_11">Swoooosh. %1$s właśnie wylądował(-a).</string>
     <string name="system_message_guild_member_join_12">Przygotujcie się. %1$s właśnie dołączył(-a) na serwer.</string>
-    <string name="system_message_guild_member_join_13">%1$s właśnie dołączył(-a). Chowajcie banany.</string>
     <string name="system_message_guild_member_join_14">%1$s właśnie się pojawił(-a). Wygląda na OP, uważajcie.</string>
     <string name="system_message_guild_member_join_15">%1$s właśnie prześlizgnął(-ęła) się na serwer.</string>
     <string name="system_message_guild_member_join_16">%1$s właśnie pojawił(-a) się na serwerze.</string>
@@ -3201,7 +3047,6 @@ Czy na pewno chcesz to zrobić?"</string>
     <string name="system_message_guild_member_join_22">To ptak! To samolot! A nie, to tylko %1$s.</string>
     <string name="system_message_guild_member_join_23">To %1$s! Niech chwała będzie słońcu! \\\\[T]/</string>
     <string name="system_message_guild_member_join_24">♪ Never gonna give %1$s up. Never gonna let %1$s down. ♪</string>
-    <string name="system_message_guild_member_join_25">Ha! %1$s dołączył(-a)! Aktywowała się moja karta pułapki!</string>
     <string name="system_message_guild_member_join_26">Hejka, słońca! %1$s przybył(-a)!</string>
     <string name="system_message_guild_member_join_27">Hej! Posłuchajcie! %1$s dołączył(-a)!</string>
     <string name="system_message_guild_member_join_28">Czekaliśmy na Ciebie %1$s</string>
@@ -3281,7 +3126,6 @@ aplikacji uwierzytelniającej. **Każdy kod może być użyty tylko raz! Wszystk
     <string name="two_fa_backup_codes_sales_pitch">Jeśli stracisz dostęp do swojej aplikacji uwierzytelniającej, możesz w dalszym ciągu mieć dostęp do swojego konta za pomocą wcześniej wygenerowanych kodów zapasowych. Zapisz je w bezpiecznym miejscu, aby zmniejszyć ryzyko utraty dostępu do swojego konta!</string>
     <string name="two_fa_change_account">Zmień szczegóły konta</string>
     <string name="two_fa_disable">Wyłącz uwierzytelnienie dwuetapowe</string>
-    <string name="two_fa_discord_backup_codes">To są Twoje zapasowe kody do konta %1$s. Tylko ich pilnuj!</string>
     <string name="two_fa_download_app_body">Pobierz i zainstaluj [Authy](%1$s) albo [Google Authenticator](%2$s) na swoim telefonie lub tablecie.</string>
     <string name="two_fa_download_app_label">Pobierz aplikację uwierzytelniającą</string>
     <string name="two_fa_download_codes">Pobierz kody zapasowe</string>
@@ -3311,7 +3155,6 @@ aby się zalogować, będziesz potrzebować jednocześnie hasła do swojego kont
     <string name="two_fa_success_body">Już prawie gotowe:</string>
     <string name="two_fa_success_header">Uwierzytelnienie dwuetapowe jest włączone! :tada:</string>
     <string name="two_fa_token_required">Poprawny kod uwierzytelniający Discorda jest wymagany.</string>
-    <string name="two_fa_use_desktop_app">Włącznie uwierzytelnienia dwuetapowego nie jest obsługiwane w tej przeglądarce. Użyj Discorda w wersji na komputer stacjonarny, aby je włączyć.</string>
     <string name="two_fa_view_backup_codes">Pokaż zapasowe kody</string>
     <string name="two_fa_view_codes">Pokaż kody</string>
     <string name="two_users_typing">**%1$s** i **%2$s** piszą…</string>
@@ -3333,7 +3176,6 @@ Zajęte konto jest wymagane, aby **pobierać aplikacje**."</string>
     <string name="unfocus_participant">Oddal tę osobę</string>
     <string name="unhandled_link_body">Przepraszamy, na Twoim urządzeniu nie została znaleziona żadna aplikacja obsługująca ten link:</string>
     <string name="unhandled_link_title">Nieobsługiwany link</string>
-    <string name="unified_open_install">Przejdź do Discorda</string>
     <string name="unknown_game">Nieznana gra</string>
     <string name="unknown_region">Nieznany region</string>
     <string name="unknown_server">Nieznany serwer</string>
@@ -3343,17 +3185,13 @@ Zajęte konto jest wymagane, aby **pobierać aplikacje**."</string>
     <string name="unpin">Odepnij</string>
     <string name="unpin_confirm">Odpinamy, dzięki!</string>
     <string name="unpin_message">Odepnij wiadomość</string>
-    <string name="unpin_message_body">Koniec imprezy. Na pewno chcesz odpiąć tę wiadomość?</string>
     <string name="unpin_message_context_menu_hint">Możesz przytrzymać Shift podczas klikania **Odepnij wiadomość**, aby pominąć to potwierdzenie.</string>
     <string name="unpin_message_failed_body">Discord z jakiegoś powodu nie dał rady odpiąć tej wiadomości. Dzwoń po szwagra!</string>
-    <string name="unpin_message_failed_title">Pinezki utknęły!</string>
     <string name="unpin_message_title">Odepnij wiadomość</string>
     <string name="unread_channels">Nieprzeczytane kanały</string>
     <string name="unsupported_browser">Nieobsługiwana przeglądarka</string>
     <string name="unsupported_browser_body">"Wygląda na to że używasz nieobsługiwanej przeglądarki. Aby w pełni skorzystać z tego, co Discord ma do zaoferowania, uaktualnij swoją
 przeglądarkę lub pobierz jedną z naszych aplikacji."</string>
-    <string name="unsupported_browser_details">"Chcesz rozmawiać ze swoją drużyną, co? Przejdź na najnowszego Chrome, Operę, Firefoksa 38+ lub pobierz
-Discorda na komputer stacjonarny i zacznij już teraz!"</string>
     <string name="unsupported_browser_title">Ups, niezręczna sytuacja</string>
     <string name="unverified_account_body">"Sprawdź swoją pocztę i postępuj zgodnie z instrukcją, aby zweryfikować adres e-mail.
 
@@ -3373,7 +3211,6 @@ Przytrzymaj Shift, aby wysłać natychmiast."</string>
     <string name="upload_area_leave_a_comment">Dodaj komentarz</string>
     <string name="upload_area_optional">opcjonalne</string>
     <string name="upload_area_title">Przeciągnij i upuść</string>
-    <string name="upload_area_title_no_confirmation">Błyskawiczne przesyłanie!</string>
     <string name="upload_area_too_large_help">Maksymalny rozmiar pliku to %1$s.</string>
     <string name="upload_area_too_large_title">Twoje pliki są zbyt potężne</string>
     <string name="upload_area_upload_failed_help">[Kliknij tutaj, aby spróbować ponownie](onClick)</string>
@@ -3459,7 +3296,6 @@ Przytrzymaj Shift, aby wysłać natychmiast."</string>
     <string name="user_management">Zarządzanie użytkownikami</string>
     <string name="user_popout_message">Wyślij wiadomość</string>
     <string name="user_popout_settings">Ustawienia użytkownika</string>
-    <string name="user_popout_wumpus_tooltip">Jestem nowy(-a), przywitaj się!</string>
     <string name="user_settings">Ustawienia użytkownika</string>
     <string name="user_settings_appearance_colorblind_mode_description">Zmień niektóre aspekty graficzne Discorda by lepiej odpowiadały daltonistom.</string>
     <string name="user_settings_appearance_colorblind_mode_title">Tryb dla daltonistów</string>
@@ -3471,8 +3307,6 @@ Przytrzymaj Shift, aby wysłać natychmiast."</string>
     <string name="user_settings_appearance_preview_message_4">Tryb kompaktowy zostanie włączony</string>
     <string name="user_settings_appearance_preview_message_5">Oto i on!</string>
     <string name="user_settings_appearance_zoom_tip">Możesz zmienić poziom przybliżenia poprzez %1$s +/- lub zresetować do domyślnego poziomu dzięki %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Pokaż zakładkę Gry</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Wyłącz to, aby ukryć zakładkę Gry i móc skupić się na rozmowach.</string>
     <string name="user_settings_close_button">Przycisk Zamknij</string>
     <string name="user_settings_confirm_logout">Na pewno chcesz się wylogować?</string>
     <string name="user_settings_game_activity">Aktywność w grze</string>
@@ -3511,7 +3345,6 @@ Przytrzymaj Shift, aby wysłać natychmiast."</string>
 Obczaj [StreamKit Discorda](%1$s)."</string>
     <string name="user_settings_streamer_notice_title">Szukasz połączeń?</string>
     <string name="user_settings_unverified_account_body">Sprawdź swój e-mail i podążaj za instrukcjami, aby zweryfikować swoje konto. W razie gdyby nie otrzymano wiadomości lub gdyby wygasła, możesz spróbować wysłać ją ponownie.</string>
-    <string name="user_settings_voice_add_multiple">Możesz dodać wiele skrótów klawiszowych do Naciśnij i Mów w [Opcjach skrótów klawiszowych](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord używa najbardziej naturalnego, lokalnie wydobywanego kodeku Opus Voice.</string>
     <string name="user_settings_voice_codec_title">Kodek audio</string>
     <string name="user_settings_windows_settings">Ustawienia Windowsa</string>
@@ -3524,15 +3357,9 @@ Obczaj [StreamKit Discorda](%1$s)."</string>
 Naciśnij i Mów z wykrywania Aktywności Głosowej."</string>
     <string name="vad_permission_small">Musisz mieć włączone Naciśnij i Mów, aby rozmawiać na tym kanale.</string>
     <string name="vad_permission_title">Wymagane Naciśnij i Mów</string>
-    <string name="vanity_url">Niestandardowy adres URL</string>
-    <string name="vanity_url_help">"Sprawia, że Twój serwer jest łatwo dostępny poprzez fikuśny niestandardowy adres Twojego autorstwa.
-Weź pod uwagę, że serwer będzie dostępny dla wszystkich, którzy mają ten link."</string>
-    <string name="vanity_url_help_conflict">Pamiętaj, że gdy odkryjemy nadużycie, lub jeśli zaistnieje konflikt własności intelektualnej, możemy odebrać adres niestandardowy tego serwera.</string>
     <string name="vanity_url_hint_mobile">twój-adres-url-tutaj</string>
     <string name="verfication_expired">Link weryfikujący adres e-mail wygasł.</string>
     <string name="verfication_expired_suggestion">Zaloguj się do Discorda, aby ponownie wysłać link</string>
-    <string name="verification_body">"Wykryliśmy coś nietypowego.
-Aby używać dalej Discorda, **musisz potwierdzić, że jesteś człowiekiem.**"</string>
     <string name="verification_body_alt">A teraz upewnijmy się, że jesteś człowiekiem…</string>
     <string name="verification_email_body">Wysłaliśmy Tobie e-mail weryfikacyjny na adres **%1$s**, sprawdź swoją skrzynkę odbiorczą lub folder spam.</string>
     <string name="verification_email_error_body">Wystąpił błąd podczas wysyłania e-maila weryfikacyjnego. Spróbuj ponownie później, lub skontaktuj się z pomocą.</string>
@@ -3573,8 +3400,6 @@ Aby używać dalej Discorda, **musisz potwierdzić, że jesteś człowiekiem.**"
     <string name="video">Wideo</string>
     <string name="video_call">Połączenie wideo</string>
     <string name="video_connect">Wideo</string>
-    <string name="video_poor_connection_body">Obraz wideo został wyłączony, ale powróci, gdy Twoje połączenie internetowe się poprawi.</string>
-    <string name="video_poor_connection_title">Słabe połączenie</string>
     <string name="video_preview">Podgląd wideo</string>
     <string name="video_settings">Ustawienia wideo</string>
     <string name="video_unavailable">Wideo jest niedostępne</string>
diff --git a/com.discord/res/values-pt-rBR/plurals.xml b/com.discord/res/values-pt-rBR/plurals.xml
index d8c8391b7d..b17cfc0f71 100644
--- a/com.discord/res/values-pt-rBR/plurals.xml
+++ b/com.discord/res/values-pt-rBR/plurals.xml
@@ -83,15 +83,6 @@
         <item quantity="zero">sem espaços disponíveis</item>
         <item quantity="one">%d espaço disponível</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d dias</item>
-        <item quantity="one">1 dia</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d membros</item>
-        <item quantity="zero">0 membros</item>
-        <item quantity="one">1 membro</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">dias</item>
         <item quantity="one">dia</item>
@@ -208,16 +199,6 @@
         <item quantity="other">permissões</item>
         <item quantity="one">uma permissão</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">definiu Modo Lento para **!!%d!! segundos**</item>
-        <item quantity="zero">Desativou o Modo Lento</item>
-        <item quantity="one">definiu o Modo Lento para **1 segundo**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">definir Modo Lento para **!!%d!! segundos**</item>
-        <item quantity="zero">Desativar Modo Lento</item>
-        <item quantity="one">Definir Modo Lento para **1 segundo**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! membros**</item>
         <item quantity="one">**1 membro**</item>
@@ -317,10 +298,6 @@
         <item quantity="other">%d mensagens novas</item>
         <item quantity="one">1 mensagem nova</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d dias</item>
-        <item quantity="one">um dia</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d canais</item>
         <item quantity="one">%d canal</item>
@@ -338,10 +315,6 @@
         <item quantity="other">estas mensagens</item>
         <item quantity="one">esta mensagem</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** servidores não estão disponíveis devido a uma interrupção temporária.</item>
-        <item quantity="one">**1** servidor não está disponível devido a uma interrupção temporária.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d meses</item>
         <item quantity="one">1 mês</item>
diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml
index 984ce57492..f01a46dbca 100644
--- a/com.discord/res/values-pt-rBR/strings.xml
+++ b/com.discord/res/values-pt-rBR/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"Não é possível enviar um convite porque você está ou invisível ou escondendo seu status de jogo. Se quiser manter
 suas configurações como estão, é só pedir pra alguém te convidar."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Entendi!</string>
-    <string name="activity_panel_go_live_hotspot_header">Transmita seu jogo diretamente para seus amigos com o Ao Vivo!</string>
+    <string name="activity_panel_go_live_hotspot_header">Transmita seu jogo diretamente para seus amigos com o Go Live!</string>
     <string name="activity_panel_go_live_tooltip">Ao Vivo</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Este servidor não tem canais de voz nos quais transmitir.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Você não pode transmitir para este canal de voz.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Navegue para um servidor para começar a transmitir.</string>
     <string name="add">Adicionar</string>
     <string name="add_a_comment_optional">Adicionar um comentário (opcional)</string>
@@ -78,7 +76,6 @@ suas configurações como estão, é só pedir pra alguém te convidar."</string
     <string name="add_friend_button">Enviar pedido de amizade</string>
     <string name="add_friend_button_after">Pedido de amizade enviado</string>
     <string name="add_friend_confirmation">Pedido enviado a **%1$s**</string>
-    <string name="add_friend_description">Você pode adicionar amigos com a tag do Discord deles.</string>
     <string name="add_friend_error_discord_tag_username">TagDiscord é um nome de usuário inválido. Insira o nome de usuário e a tag do seu amigo… tipo MestreWumpus#9349</string>
     <string name="add_friend_error_invalid_discord_tag">**%1$s** contratou um samurai para matar todos os pedidos de amizade. Você precisará pedir que ele(a) te adicione.</string>
     <string name="add_friend_error_numbers_only">Somos mais do que números… somos pessoas! Insira um nome de usuário e tag como ReiWumpus#1202</string>
@@ -91,8 +88,6 @@ suas configurações como estão, é só pedir pra alguém te convidar."</string
     <string name="add_friend_input_hint">TagDiscord#0000</string>
     <string name="add_friend_nearby_connection_error">Ative os serviços de localização, o Bluetooth e o Wi-Fi (todos eles!). Em seguida, reconecte-se à internet para ativar o Nearby.</string>
     <string name="add_friend_nearby_connection_error_ios">Ative o Bluetooth e a WiFi para ligar o Nearby.</string>
-    <string name="add_friend_nearby_disable_scanning">Desativar Busca por Jogadores Próximos</string>
-    <string name="add_friend_nearby_enable">Iniciar Busca por Jogadores Próximos</string>
     <string name="add_friend_nearby_enable_settings_android">Ative o Nearby nas configurações do sistema -> Google -> Nearby para encontrar amigos por perto!</string>
     <string name="add_friend_nearby_generic_error">Houve um problema ao usar o Nearby. Tente novamente</string>
     <string name="add_friend_nearby_info">Encontre amigos por perto com o Nearby! Não esqueça de pedir pra eles ligarem a chavinha também.</string>
@@ -100,7 +95,6 @@ suas configurações como estão, é só pedir pra alguém te convidar."</string
     <string name="add_friend_nearby_looking">Procurando amigos na redondezas. Garanta que seus futuros amigos também estejam nesta tela e usando o Nearby!</string>
     <string name="add_friend_nearby_stopped">A conexão do Nearby foi interrompida.</string>
     <string name="add_friend_no_capitalization">Os nomes de usuário diferenciam maiúsculas de minúsculas e precisam de uma tag.</string>
-    <string name="add_friend_not_found">Não encontramos ninguém com essa tag do Discord.</string>
     <string name="add_friend_placeholder">Digite uma TagDiscord#0000</string>
     <string name="add_friend_search">Buscar</string>
     <string name="add_friend_self">Você não pode brincar consigo mesmo(a).</string>
@@ -136,10 +130,7 @@ Pense bem antes de conceder essa permissão."</string>
     <string name="answer">Atender</string>
     <string name="app_download_now">Não tem o aplicativo? **Baixe agora**</string>
     <string name="app_information">Informações do aplicativo</string>
-    <string name="app_not_opened">O aplicativo do Discord não pôde ser aberto.</string>
-    <string name="app_opened_body">Enviamos os dados para o seu aplicativo do Discord. Você pode fechar essa guia do navegador ou continuar com a versão para navegador.</string>
     <string name="app_opened_title">Discord iniciado</string>
-    <string name="app_opening">Abrindo o aplicativo do Discord.</string>
     <string name="app_opening_mobile_body">Caso você não consiga abrir o aplicativo, copie o código de convite para entrar assim que o aplicativo for baixado.</string>
     <string name="app_settings">Config. do aplicativo</string>
     <string name="appearance">Aparência</string>
@@ -159,7 +150,6 @@ Pense bem antes de conceder essa permissão."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Vai que é tua!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Ir para a biblioteca</string>
     <string name="application_entitlement_code_redemption_invalid">Código inválido</string>
-    <string name="application_entitlement_code_redemption_prompt">Ganhou um código para um jogo? Insira-o abaixo:</string>
     <string name="application_entitlement_code_redemption_redeem">Resgatar</string>
     <string name="application_filter_name_linux">Todos os arquivos</string>
     <string name="application_filter_name_macos">Aplicativos</string>
@@ -406,10 +396,7 @@ Pense bem antes de conceder essa permissão."</string>
     <string name="application_store_view_all_news">Ver todas as notícias</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Para jogar este DLC, você precisa ter %1$s no Discord. [Saiba mais sobre DLC.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Conteúdo para download</string>
-    <string name="application_store_warning_early_access_description">Este jogo é legal (na nossa opinião!) mas pode ter conteúdo limitado, bugs a rodo, ou parecer meio incompleto. [Saiba mais sobre acesso antecipado.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Acesso antecipado</string>
-    <string name="application_store_warning_requires_desktop_app_description">Para jogar este jogo, você precisa ter o $[aplicativo](downloadHook) do Discord para computador instalado.</string>
-    <string name="application_store_warning_requires_desktop_app_title">Requer o app de computador</string>
     <string name="application_store_warning_restricted_in_region_description">Este jogo não está disponível no seu país. [Saiba mais sobre restrições regionais.](%1$s)</string>
     <string name="application_store_warning_restricted_in_region_title">Restrito no País</string>
     <string name="application_store_warning_unavailable_in_language_description">Este jogo não possui opções de áudio, interface ou legendas no idioma que você está usando no momento.</string>
@@ -442,7 +429,6 @@ Pense bem antes de conceder essa permissão."</string>
     <string name="auth_invalid_invite_body">Este convite pode ter expirado, ou talvez você não tenha permissão para entrar.</string>
     <string name="auth_invalid_invite_tip">Por que meu convite é inválido?</string>
     <string name="auth_invalid_invite_title">Convite inválido</string>
-    <string name="auth_ip_auth_succeeded_suggestion">Se você seguiu este link depois de tentar conectar-se através do aplicativo no computador ou para dispositivos móveis, volte e tente novamente.</string>
     <string name="auth_login_body">Estamos muito animados em te ver novamente!</string>
     <string name="auth_message_invited_by">%1$s convidou você para se juntar</string>
     <string name="auth_message_invited_to_stream">Você foi convidado(a) para a transmissão de %1$s via</string>
@@ -531,19 +517,13 @@ mas se e quando precisar, não hesite!"</string>
     <string name="billing_error_section_card">Eita! Parece que tem algum problema com este cartão. Corrija os campos e tente novamente!</string>
     <string name="billing_history">Histórico de cobrança</string>
     <string name="billing_legal_mumbo_jumbo">Blábláblá Jurídico</string>
-    <string name="billing_legal_mumbo_jumbo_label">Eu concordo com os [Termos de Serviço da Loja Discord](%1$s)</string>
     <string name="billing_no_payment_method">Nenhum método de pagamento salvo</string>
     <string name="billing_no_payment_method_description">Salve um método de pagamento para concluir seus pedidos mais rapidamente</string>
     <string name="billing_pay_for_it_with">Pagar com</string>
     <string name="billing_payment_breakdown_taxes">Impostos</string>
     <string name="billing_payment_history">Histórico de transações</string>
     <string name="billing_payment_premium">Sua Assinatura</string>
-    <string name="billing_payment_premium_legalese_monthly">Ao comprar uma assinatura %1$s, você está concordando com os [Termos de Serviço da Loja](%2$s). %1$s é uma assinatura recorrente. Você autoriza o Discord a cobrar %3$s do método de pagamento fornecido e que continuemos a cobrar automaticamente a cada mês até você cancelar a assinatura. Você pode cancelá-la a qualquer momento.</string>
-    <string name="billing_payment_premium_legalese_yearly">Ao comprar uma assinatura %1$s, você está concordando com os [Termos de Serviço da Loja](%2$s). %1$s é uma assinatura recorrente. Você autoriza o Discord a cobrar %3$s do método de pagamento fornecido e que continuemos a cobrar automaticamente a cada ano até você cancelar a assinatura. Você pode cancelá-la a qualquer momento.</string>
     <string name="billing_payment_sources">Métodos de Pagamento</string>
-    <string name="billing_payment_table_header_amount">QUANTIA</string>
-    <string name="billing_payment_table_header_date">DATA</string>
-    <string name="billing_payment_table_header_description">DESCRIÇÃO</string>
     <string name="billing_premium_refund_text">Você pode solicitar um reembolso se a compra tiver sido feita nos últimos %1$s dias. [Nossos simpáticos atendentes vão te ajudar a recuperar suas moedas.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Desculpe, esta compra não pode ser reembolsada. Você pode solicitar um reembolso se a compra tiver sido feita nos últimos %1$s dias.</string>
     <string name="billing_price_per_month">%1$s / Mês</string>
@@ -553,9 +533,7 @@ mas se e quando precisar, não hesite!"</string>
     <string name="billing_purchase_details_header">Detalhes da compra</string>
     <string name="billing_refund_header">Problemas com a compra?</string>
     <string name="billing_refund_play_time_never_played">Nunca jogado</string>
-    <string name="billing_refund_play_time_subheader">TEMPO DE JOGO</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">DATA DA COMPRA</string>
     <string name="billing_refund_report_a_problem">Relatar um problema</string>
     <string name="billing_refund_request_button">Pedir reembolso</string>
     <string name="billing_sales_tax_added">%1$s em impostos foram adicionados devido ao seu endereço de cobrança.</string>
@@ -584,11 +562,9 @@ mas se e quando precisar, não hesite!"</string>
     <string name="bot_requires_email_verification">Você precisa verificar seu e-mail antes de poder enviar mensagens aqui.</string>
     <string name="bot_video_disabled">Não parece que sua conexão seja rápida o bastante para receber vídeos, então os desativamos para você.</string>
     <string name="browser_app">Aplicativos do Discord</string>
-    <string name="browser_handoff_authenticating_description">Tentando autenticar o cliente de computador do Discord. Não feche esta janela.</string>
     <string name="browser_handoff_authenticating_title">Autenticando</string>
     <string name="browser_handoff_detecting_description">Tentando detectar a conta do Discord do seu navegador padrão. Isso deve demorar só um pouquinho.</string>
     <string name="browser_handoff_detecting_title">Detectando conta</string>
-    <string name="browser_handoff_done_description">Tentando autenticar o cliente de computador do Discord. Não feche esta janela.</string>
     <string name="browser_handoff_done_safe_to_close">Você já pode fechar esta janela.</string>
     <string name="browser_handoff_done_title">Pronto</string>
     <string name="browser_handoff_failed_title">Falha de autenticação</string>
@@ -596,12 +572,8 @@ mas se e quando precisar, não hesite!"</string>
     <string name="browser_handoff_success_body">Deseja entrar com esta conta?</string>
     <string name="browser_handoff_success_cancel">Mudar para outra conta?</string>
     <string name="browser_handoff_success_title">Olá, %1$s!</string>
-    <string name="browser_input_device_warning">"Dispositivos de entrada não podem ser alterados no navegador. [Baixe](onDownloadClick) o aplicativo no computador
-para ter controle total sobre os dispositivos de entrada."</string>
     <string name="browser_not_supported">Navegador incompatível</string>
     <string name="browser_notifications_enabled_body">Vuush! Notificações a caminho!</string>
-    <string name="browser_output_device_warning">"Dispositivos de saída não podem ser alterados no navegador. [Baixe](onDownloadClick) o aplicativo no computador
-para ter controle total sobre os dispositivos de saída."</string>
     <string name="bug_hunter_badge_tooltip">Caçador(a) de bugs do Discord</string>
     <string name="bundle_ready_body">Reinicie o Discord para concluir a atualização!</string>
     <string name="bundle_ready_later">Agora não</string>
@@ -710,13 +682,9 @@ Os URL personalizados podem conter apenas letras, números ou traços."</string>
     <string name="chat_behavior">Comportamento do chat</string>
     <string name="checking_for_updates">Buscando atualizações</string>
     <string name="choose">Escolha</string>
-    <string name="choose_an_application">Escolha um aplicativo</string>
     <string name="claim_account">Criar esta conta</string>
     <string name="claim_account_body">Vincule sua conta para manter todos os seus servidores e conversas, mesmo depois de fechar o navegador.</string>
     <string name="claim_account_email_to">Valeu! Enviamos um link de confirmação para: **%1$s**</string>
-    <string name="claim_account_get_app">Obter o aplicativo no computador</string>
-    <string name="claim_account_promote_app">Obtenha nosso aplicativo de área de trabalho para tirar o máximo de proveito do Discord com uma sobreposição no jogo, notificações na área de trabalho e teclas de atalho globais.</string>
-    <string name="claim_account_required_body">Vincule sua conta para usar o aplicativo no computador.</string>
     <string name="claim_account_required_email_to">Valeu! Já enviamos um link de confirmação para **%1$s**. Basta clicar neste link para verificar a sua conta.</string>
     <string name="clear_cache">Limpar cache</string>
     <string name="clone_channel">Clonar canal</string>
@@ -741,13 +709,10 @@ Os URL personalizados podem conter apenas letras, números ou traços."</string>
     <string name="cloud_sync_modal_or">OU</string>
     <string name="collapse_category">Recolher categoria</string>
     <string name="coming_soon">Em breve</string>
-    <string name="coming_soon_notifications">No momento, só é possível escolher quais notificações receber no aplicativo no computador. Por enquanto, utilize as configurações de notificação do iOS.</string>
     <string name="coming_soon_title">EM BREVE!</string>
     <string name="command_giphy_description">Procura GIFs animados na internet</string>
     <string name="command_me_description">Exibir o texto com ênfase.</string>
-    <string name="command_nick_description">Muda seu apelido neste servidor.</string>
     <string name="command_nick_failure">Seu apelido não pode ser alterado neste servidor.</string>
-    <string name="command_nick_failure_permission">Você não tem a permissão de **Mudar Apelido** neste servidor.</string>
     <string name="command_nick_reset">Seu apelido neste servidor foi redefinido.</string>
     <string name="command_nick_success">Seu apelido neste servidor foi alterado para **%1$s**.</string>
     <string name="command_shrug_description">Insere ¯\\_(ツ)_/¯ na sua mensagem.</string>
@@ -803,7 +768,6 @@ clicando no textinho abaixo."</string>
     <string name="connection_enter_code">Insira o código como aparece em sua tela</string>
     <string name="connection_invalid_pin">Código PIN inválido</string>
     <string name="connection_login_with">ou entre com</string>
-    <string name="connection_problems_body">Confira o [estado do servidor](%1$s) ou mande um tuíte [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Autenticando</string>
     <string name="connection_status_awaiting_endpoint">Esperando o terminal</string>
     <string name="connection_status_connected">Conectado</string>
@@ -811,8 +775,6 @@ clicando no textinho abaixo."</string>
     <string name="connection_status_disconnected">Desconectado</string>
     <string name="connection_status_ice_checking">Verificando ICE</string>
     <string name="connection_status_no_route">Sem rota</string>
-    <string name="connection_status_rtc_connecting">Conectando RTC</string>
-    <string name="connection_status_rtc_disconnected">RTC desconectado</string>
     <string name="connection_status_stream_connected">Assistindo a transmissão de %1$s</string>
     <string name="connection_status_video_connected">Vídeo conectado</string>
     <string name="connection_status_voice_connected">Voz conectada</string>
@@ -847,8 +809,7 @@ clicando no textinho abaixo."</string>
     <string name="create">Criar</string>
     <string name="create_category">Criar categoria</string>
     <string name="create_channel">Criar canal</string>
-    <string name="create_group_dm">Criar grupo</string>
-    <string name="create_instant_invite">Criar um convite instantâneo</string>
+    <string name="create_instant_invite">Criar convite</string>
     <string name="create_link">Criar link</string>
     <string name="create_or_join_modal_header">Ah, outro servidor, hein?</string>
     <string name="create_server_button_body">Crie um novo servidor e convide seus amigos. É grátis!</string>
@@ -950,7 +911,6 @@ clicando no textinho abaixo."</string>
     <string name="developer_application_test_mode_note">Insira a ID do aplicativo do Discord para ativar o modo de teste dele.</string>
     <string name="developer_application_test_mode_placeholder">ID do Aplicativo</string>
     <string name="developer_mode">Modo desenvolvedor</string>
-    <string name="developer_mode_help_text">O modo desenvolvedor expõe itens no menu de contexto que são úteis para quem programa bots usando a [API do Discord](%1$s).</string>
     <string name="device_no_permission">Dispositivo %1$s</string>
     <string name="device_settings">Configurações do dispositivo</string>
     <string name="direct_message">Mensagem direta</string>
@@ -964,7 +924,6 @@ clicando no textinho abaixo."</string>
     <string name="disable_email_notifications_failed_suggestion">Ou as notificações por e-mail já foram desativadas ou este e-mail já não está mais associado a uma conta do Discord.</string>
     <string name="disable_integration_title">Desativar sincronização</string>
     <string name="disable_integration_twitch_body">Ao desativar a sincronização, o \"comportamento para inscritos expirados\" será executado como se todos os inscritos estivessem expirados.</string>
-    <string name="disable_integration_youtube_body">Ao desativar a sincronização, o \"comportamento para patrocinadores expirados\" será executado como se todos os inscritos estivessem expirados.</string>
     <string name="disable_notifications_description">Todas as notificações da área de trabalho serão desativadas.</string>
     <string name="disable_notifications_label">Desativar notificações</string>
     <string name="disable_sounds_description">Todos os efeitos sonoros serão desativados.</string>
@@ -981,7 +940,6 @@ clicando no textinho abaixo."</string>
     <string name="discord_desc_short">Bate-papo de voz e texto em equipe</string>
     <string name="discord_rich_presence">Rich Presence do Discord</string>
     <string name="dismiss">Ignorar</string>
-    <string name="dispatch_error_modal_body">Algo deu ruim. Se o problema persistir, crie um tíquete de suporte e copie o conteúdo da mensagem abaixo.</string>
     <string name="dispatch_error_modal_error_label">Mensagem de erro (Me copia e me cola :D)</string>
     <string name="dispatch_error_modal_header">Erro de Discord Dispatch</string>
     <string name="dispatch_error_modal_open_ticket">Criar um tíquete</string>
@@ -999,14 +957,11 @@ clicando no textinho abaixo."</string>
     <string name="done">Pronto</string>
     <string name="dont_show_again">Não me mostre isso novamente.</string>
     <string name="download">Baixar</string>
-    <string name="download_app">Baixar aplicativo</string>
-    <string name="download_apps">Baixar aplicativos</string>
     <string name="download_desktop_ptb_footer">Tá verde demais pro seu gosto? [Baixe a versão estável](onClick).</string>
     <string name="download_desktop_stable_footer">Quer sentir o gostinho do que vem por aí? [Baixe a versão pública de testes](onClick).</string>
     <string name="download_desktop_title">Tenha o Discord em casa</string>
     <string name="download_failed">Falha ao baixar</string>
     <string name="download_file_complete">%1$s baixado</string>
-    <string name="download_mobile_modal_apps_header">Obtenha o aplicativo móvel do Discord</string>
     <string name="download_mobile_title">Ou onde você for</string>
     <string name="duration_days">%1$s</string>
     <string name="duration_hours">%1$s</string>
@@ -1077,8 +1032,6 @@ clicando no textinho abaixo."</string>
     <string name="experiment_mobile_only_user_button_go">Baixe o aplicativo</string>
     <string name="experiment_mobile_only_user_email_confirmation">Uhuuul, e-mail enviado! Confira sua caixa de entrada para obter o link de download.</string>
     <string name="experiment_mobile_only_user_header">Fala, chefia!</string>
-    <string name="experiment_mobile_only_user_text1">Por que não experimenta o Discord para seu computador? Aqui está o link para obtê-lo: %1$s</string>
-    <string name="experiment_mobile_only_user_text2">Por que não experimenta o Discord para seu computador? Podemos te enviar um link por e-mail para baixá-lo agora mesmo.</string>
     <string name="expire_after">Expira após</string>
     <string name="expires_in">Expira em:</string>
     <string name="explicit_content_filter_disabled">Não analisar nenhuma mensagem.</string>
@@ -1110,8 +1063,6 @@ o limite de ausência. Isso não afeta navegadores."</string>
     <string name="form_help_attenuation">"Diminui o volume de outros aplicativos nesta porcentagem quando alguém estiver falando.
 Deixe em 0%% para desativar completamente a atenuação."</string>
     <string name="form_help_automatic_vad">Se o indicador estiver verde sólido, então o Discord estará transmitindo sua linda voz.</string>
-    <string name="form_help_bitrate">"**TODOS OS BITS!** Usar mais de %1$skbps não é recomendado, exceto se você for um audiófilo. Isso prejudicará pessoas
-em dispositivos móveis ou conexões ruins sem benefícios notáveis."</string>
     <string name="form_help_certified_voice_processing">"Ao utilizar um microfone certificado pelo Discord, algumas funcionalidades de processamento de voz não são mais controladas pelo próprio Discord,
 e sim pelo microfone."</string>
     <string name="form_help_channel_permissions">Selecionar cargos configurará automaticamente as permissões básicas deste canal.</string>
@@ -1124,11 +1075,6 @@ em servidores públicos, a fim de evitar [esta loucura](%1$s).**"</string>
 para cada mensagem enviada neste servidor. É altamente recomendável que você defina isso apenas para @menções em servidores públicos"</string>
     <string name="form_help_explicit_content_filter">"Analisar e excluir automaticamente mensagens enviadas neste servidor que contêm conteúdo explícito. Escolha o quão amplamente
 o filtro será aplicado aos membros em seu servidor. **Recomendamos configurar um filtro se seu servidor do Discord for público.**"</string>
-    <string name="form_help_instant_invite_channel">"Se um canal for selecionado, um link de convite instantâneo será gerado com o widget.
-Caso contrário, somente os membros conectados e canais de voz serão mostrados."</string>
-    <string name="form_help_last_seen">"A remoção expulsará **%1$s** que não
-são vistos há **%2$s** e não possuem nenhum cargo.
-Os usuários expulsos podem voltar ao servidor usando um novo convite instantâneo."</string>
     <string name="form_help_legacy_subsystem">"Certos drivers para hardware de áudio apresentam problemas ao usar o subsistema moderno de áudio do seu sistema operacional.
 Marque esta caixa para voltar ao subsistema de áudio padrão."</string>
     <string name="form_help_nsfw">"Os usuários deverão confirmar que são maiores de idade para ver o conteúdo deste canal.
@@ -1138,7 +1084,6 @@ do seu site, pode adicionar dinamicamente &amp;username= aos parâmetros do URL.
     <string name="form_help_qos">"Informa ao roteador que os pacotes do Discord são de alta prioridade.
 Alguns roteadores ou provedores de internet podem ficar de birra com isto ligado."</string>
     <string name="form_help_slowmode">Membros só poderão mandar uma mensagem a cada intervalo deste, a menos que tenham permissões de Gerenciar Mensagens ou Gerenciar Canal.</string>
-    <string name="form_help_system_channel">Envia uma mensagem neste canal quando alguém entra no servidor. As mensagens são aleatórias. Isso pode ser desativado a qualquer momento.</string>
     <string name="form_help_temporary">Membros são expulsos automaticamente quando se desconectam, exceto se um cargo for atribuído.</string>
     <string name="form_help_user_limit">"Limita o número de usuários que podem se conectar a este canal de voz. Os usuários com a permissão **Mover Membros** podem ignorar
 este limite e mover outros usuários ao canal."</string>
@@ -1183,8 +1128,8 @@ Isso não se aplica a membros que recebem um cargo.
     <string name="form_label_input_mode">Modo de entrada</string>
     <string name="form_label_input_sensitivty">Sensibilidade de entrada</string>
     <string name="form_label_input_volume">Volume de entrada</string>
-    <string name="form_label_instant_invite">Insira um convite instantâneo</string>
-    <string name="form_label_instant_invite_channel">Canal de convite instantâneo</string>
+    <string name="form_label_instant_invite">Insira um convite</string>
+    <string name="form_label_instant_invite_channel">Canal de convite</string>
     <string name="form_label_json_api">API JSON</string>
     <string name="form_label_last_seen">Vistos pela última vez</string>
     <string name="form_label_local_mute">Silenciar localmente</string>
@@ -1227,7 +1172,6 @@ Isso não se aplica a membros que recebem um cargo.
     <string name="form_label_password">Senha</string>
     <string name="form_label_phone_number">Número de telefone</string>
     <string name="form_label_premade_widget">Widget pronto</string>
-    <string name="form_label_push_afk_timeout">Intervalo de ausência para notificações no aplicativo móvel</string>
     <string name="form_label_qos">Qualidade de serviço</string>
     <string name="form_label_reason_ban">Motivo do banimento</string>
     <string name="form_label_reason_kick">Motivo da expulsão</string>
@@ -1254,7 +1198,6 @@ Isso não se aplica a membros que recebem um cargo.
     <string name="form_label_suppress_everyone">Silenciar **@everyone** e **@here**</string>
     <string name="form_label_synced_role">Cargo sincronizado</string>
     <string name="form_label_synced_subs">Inscritos sincronizados</string>
-    <string name="form_label_system_channel">Canal de mensagens de boas-vindas</string>
     <string name="form_label_temporary">Associação temporária</string>
     <string name="form_label_tts">Texto-para-voz</string>
     <string name="form_label_tts_notifications">Notificações de texto-para-voz</string>
@@ -1269,12 +1212,6 @@ Isso não se aplica a membros que recebem um cargo.
     <string name="form_placeholder_reason">Motivo</string>
     <string name="form_placeholder_server_name">Digite o nome do servidor</string>
     <string name="form_placeholder_username">Como o pessoal vai te chamar?</string>
-    <string name="form_report_help_text">"As denúncias são enviadas para a equipe de confiança e segurança do Discord - **não ao proprietário do servidor**.
-
-Criar denúncias falsas e/ou abusar do botão de denúncia pode resultar em uma suspensão da capacidade de denunciar.
-
-Saiba mais nas [diretrizes da comunidade do Discord](%1$s).
-Agradecemos por manter as coisas seguras."</string>
     <string name="form_warning_input_sensitivty">"Nenhum dispositivo de entrada ativado. Você deve permitir que o Discord [acesse o seu microfone](onEnableClick)
 para poder observar a sensibilidade."</string>
     <string name="form_warning_video_preview">Você deve conceder ao Discord [acesso à sua câmera](onEnableClick) para poder ver a prévia.</string>
@@ -1320,7 +1257,6 @@ para poder observar a sensibilidade."</string>
     <string name="game_action_button_now_playing">Jogando</string>
     <string name="game_action_button_paused">Pausado</string>
     <string name="game_action_button_play">Jogar</string>
-    <string name="game_action_button_play_disabled_desktop_app">Iniciar através do aplicativo no computador</string>
     <string name="game_action_button_queue">Atualizar fila</string>
     <string name="game_action_button_queued">Na fila</string>
     <string name="game_action_button_restricted_in_region">Indisponível no seu país</string>
@@ -1355,7 +1291,6 @@ para poder observar a sensibilidade."</string>
     <string name="game_feed_activity_recently_played">Jogaram recentemente</string>
     <string name="game_feed_activity_streaming_twitch">Transmitindo no Twitch</string>
     <string name="game_feed_current_header_title">Jogando</string>
-    <string name="game_feed_settings_visibility">Mostrar na guia de jogos</string>
     <string name="game_feed_unknown_player">Jogador desconhecido</string>
     <string name="game_feed_user_played_days_ago">Jogou há %1$s %2$s</string>
     <string name="game_feed_user_played_hours_ago">Jogou há %1$s %2$s</string>
@@ -1424,7 +1359,7 @@ para poder observar a sensibilidade."</string>
     <string name="generate_a_new_link">Gerar um novo link</string>
     <string name="get_started">Comece agora</string>
     <string name="gif_auto_play_label">Reproduzir GIFs automaticamente quando o Discord estiver em primeiro plano.</string>
-    <string name="go_live_changelog_guilds">Ao Vivo está agora disponível em: %1$s</string>
+    <string name="go_live_hardware_acceleration_unavailable">Ô, atenção aí! Não detectamos aceleração de hardware. Seu computador pode ter problemas com o Go Live.</string>
     <string name="go_live_hey">Aí!</string>
     <string name="go_live_listen">Escuta!</string>
     <string name="go_live_look">Olha!</string>
@@ -1438,7 +1373,7 @@ para poder observar a sensibilidade."</string>
     <string name="go_live_modal_select_channel_form_title">Escolha um canal de voz</string>
     <string name="go_live_modal_select_channel_placeholder">Procurando canais de voz</string>
     <string name="go_live_modal_title">Ao Vivo</string>
-    <string name="go_live_premium_early_access">Como obrigado por ser assinante Nitro, você tem acesso antecipado para streamar jogos com o Ao Vivo!</string>
+    <string name="go_live_video_drivers_outdated">Seus drivers de vídeo estão desatualizados. Atualize-os para ter uma experiência melhor com o Go Live.</string>
     <string name="grant_temporary_membership">Permitir associação temporária</string>
     <string name="group">Grupo</string>
     <string name="group_dm_add_friends">Adicionar amigos à MD</string>
@@ -1448,7 +1383,6 @@ para poder observar a sensibilidade."</string>
     <string name="group_dm_invite_full_sub">Os grupos têm um limite de 10 membros.</string>
     <string name="group_dm_invite_link_title">Ou, envie um convite a um amigo!</string>
     <string name="group_dm_invite_no_friends">Você não tem amigos para adicionar!</string>
-    <string name="group_dm_invite_not_friends">Você precisa ser amigo de **%1$s** para criar uma MD em grupo.</string>
     <string name="group_dm_invite_remaining">%1$s</string>
     <string name="group_dm_invite_successful_mobile">%1$s foi adicionado ao grupo.</string>
     <string name="group_dm_invite_to">Para:</string>
@@ -1465,8 +1399,6 @@ para poder observar a sensibilidade."</string>
     <string name="guild_message_notifications_only_mentions">Apenas @menções</string>
     <string name="guild_muted_help_text">O servidor está silenciado, logo, estes estão desativados</string>
     <string name="guild_owner">Dono(a) do servidor</string>
-    <string name="guild_security_req_mfa_body">"Evite ações administrativas potencialmente perigosas para os usuários que não usam a verificação em duas etapas.
-**Esta configuração só pode ser alterada pelo proprietário do servidor se o mesmo possuir a verificação em duas etapas ativada em sua conta**."</string>
     <string name="guild_security_req_mfa_enable">[Ativar em sua conta.](onClick)</string>
     <string name="guild_security_req_mfa_guild_disable">Desativar a verificação em duas etapas</string>
     <string name="guild_security_req_mfa_guild_enable">Ativar a verificação em duas etapas</string>
@@ -1515,8 +1447,6 @@ para poder observar a sensibilidade."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Concedeu** %1$s para **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Moveu de **%1$s** para **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">Na posição **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) criou o canal de texto $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Mudou o tópico para **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Definiu o tópico para **%1$s**</string>
@@ -1612,6 +1542,8 @@ para poder observar a sensibilidade."</string>
     <string name="guild_settings_filter_all_actions">Todas as ações</string>
     <string name="guild_settings_filter_all_users">Todos os usuários</string>
     <string name="guild_settings_filter_user">Filtrar por usuário</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">Transmissões no Go Live em 720p e 60fps</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">Transmissões no Go Live em 1080p e 60fps</string>
     <string name="guild_settings_label_audit_log">Registro de auditoria</string>
     <string name="guild_settings_label_audit_log_empty_body">Quando os moderadores começarem a moderar, você poderá moderar a moderação aqui.</string>
     <string name="guild_settings_label_audit_log_empty_title">Ainda não há registros</string>
@@ -1640,10 +1572,9 @@ Caso você tenha acesso aos usuários do seu site, pode adicionar dinamicamente
     <string name="help_missing_manage_roles_permission">O cargo está bloqueado porque você não tem a permissão \"Gerenciar Cargos\".</string>
     <string name="help_missing_permission">Você não pode modificar esta permissão porque nenhum de seus cargos a possui.</string>
     <string name="help_role_locked">O cargo está bloqueado porque é de um nível mais elevado em relação ao seu maior cargo.</string>
-    <string name="help_role_locked_mine">Este cargo está bloqueado pois é o seu maior cargo. Peça ajuda a um usuário de cargo mais alto ou ao dono do servidor.</string>
     <string name="help_singular_permission">Você não pode modificar esta permissão pois ela será removida de você.</string>
     <string name="hide_instant_invites_description">Recomendado caso você não queira pessoas desconhecidas acessando os seus servidores do Discord.</string>
-    <string name="hide_instant_invites_label">Ocultar links de convite instantâneo</string>
+    <string name="hide_instant_invites_label">Esconder links de convite</string>
     <string name="hide_muted">Ocultar %1$s silenciado(s)</string>
     <string name="hide_muted_channels">Ocultar canais silenciados</string>
     <string name="hide_personal_information_description">Oculta e-mail, contas conectadas, notas e anonimiza tags do Discord.</string>
@@ -1690,7 +1621,6 @@ Caso você tenha acesso aos usuários do seu site, pode adicionar dinamicamente
     <string name="hypesquad_question_11_response_d">Sugerir que seria melhor ele tocar pandeiro</string>
     <string name="hypesquad_question_12_prompt">Você subiu até o topo da montanha mais alta, e a única coisa que te separa do tesouro é o dragão de três cabeças que protege o pináculo. Você:</string>
     <string name="hypesquad_question_12_response_a">Salta para o combate</string>
-    <string name="hypesquad_question_12_response_b">Assiste antigos filmes do Godzilla para ver como ele lutava com o Rei Ghidorah</string>
     <string name="hypesquad_question_12_response_c">Tentar convencer o dragão a dividir o tesouro</string>
     <string name="hypesquad_question_12_response_d">Oferecer uma pelúcia do Wumpus para o dragão. Quem poderia recusar?</string>
     <string name="hypesquad_question_13_prompt">Que barulho é esse?</string>
@@ -1793,14 +1723,14 @@ Caso você tenha acesso aos usuários do seu site, pode adicionar dinamicamente
     <string name="input_mode_ptt_release_delay">Atraso na voz após soltar o Aperte para Falar</string>
     <string name="input_mode_vad">Detecção de Voz</string>
     <string name="install_location_main">Principal</string>
-    <string name="instant_invite">Convite instantâneo</string>
+    <string name="instant_invite">Convite</string>
     <string name="instant_invite_accept">Aceitar convite</string>
-    <string name="instant_invite_accepted">Convite instantâneo aceito</string>
-    <string name="instant_invite_accepting">Aceitando convite instantâneo</string>
+    <string name="instant_invite_accepted">Convite aceito</string>
+    <string name="instant_invite_accepting">Aceitando convite</string>
     <string name="instant_invite_ask_for_new_invite">Peça um novo!</string>
     <string name="instant_invite_ask_user_for_new_invite">Peça a %1$s um novo convite!</string>
     <string name="instant_invite_code">Código</string>
-    <string name="instant_invite_expired">O convite instantâneo expirou ou não é mais válido.</string>
+    <string name="instant_invite_expired">O convite expirou ou não é mais válido.</string>
     <string name="instant_invite_expires">Expira em</string>
     <string name="instant_invite_failed_to_generate">Falha ao criar um link de convite.</string>
     <string name="instant_invite_generate">Gerar</string>
@@ -1818,17 +1748,14 @@ Caso você tenha acesso aos usuários do seu site, pode adicionar dinamicamente
     <string name="instant_invite_regenerate">Gerar novamente</string>
     <string name="instant_invite_resolved_body">Você foi convidado(a) para **%1$s** em **%2$s**.</string>
     <string name="instant_invite_resolved_title">Opa, e aí!</string>
-    <string name="instant_invite_resolving">Processando convite instantâneo</string>
+    <string name="instant_invite_resolving">Processando convite</string>
     <string name="instant_invite_uses">Usos</string>
     <string name="instant_invite_you_are_already_a_member_of">Você já é um membro de</string>
     <string name="instant_invite_you_have_been_invited_to_join">Você foi convidado(a) para entrar</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** te convidou para entrar</string>
-    <string name="instant_invite_you_have_been_invited_to_join_group_dm">Você foi convidado(a) a entrar em um grupo de MD por</string>
-    <string name="instant_invites">Convites instantâneos</string>
+    <string name="instant_invites">Convites</string>
     <string name="integration_settings">Configurações de integração</string>
     <string name="integrations">Integrações</string>
-    <string name="integrations_header">Contas do Twitch/YouTube Gaming conectadas</string>
-    <string name="integrations_pro_tip">Para mais integrações, confira o [Kit de Stream do Discord](%1$s).</string>
     <string name="internal_server_error">Ocorreu um erro interno no servidor. Tente novamente.</string>
     <string name="invalid_animated_emoji_body">Este emoji não funciona porque é animado. Atualize para o Discord Nitro para realizar todos os seus sonhos de ter emojis animados</string>
     <string name="invalid_animated_emoji_body_upgrade">Este emoji não funciona porque é animado. O Discord Nitro pode resolver isso. Dê uma olhada nas Configurações de Usuário > Nitro para mais detalhes</string>
@@ -1856,11 +1783,9 @@ Caso você tenha acesso aos usuários do seu site, pode adicionar dinamicamente
     <string name="invite_button_streaming">%1$s está ao vivo!</string>
     <string name="invite_button_streaming_subtext">em %1$s</string>
     <string name="invite_button_title_invited">Você foi convidado(a) a entrar em um servidor</string>
-    <string name="invite_button_title_invited_group_dm">Você foi convidado(a) a entrar em um grupo de MD</string>
     <string name="invite_button_title_invited_invalid">Você recebeu um convite, mas…</string>
     <string name="invite_button_title_invited_stream">Você foi convidado(a) para assistir uma transmissão</string>
     <string name="invite_button_title_inviter">Você enviou um convite para entrar em um servidor</string>
-    <string name="invite_button_title_inviter_group_dm">Você enviou um convite para entrar em um grupo de MD</string>
     <string name="invite_button_title_inviter_invalid">Você enviou um convite, mas…</string>
     <string name="invite_button_title_inviter_stream">Você enviou um convite para assistir uma transmissão</string>
     <string name="invite_button_title_streaming">Convidar para assistir transmissão</string>
@@ -1877,7 +1802,6 @@ Caso você tenha acesso aos usuários do seu site, pode adicionar dinamicamente
     <string name="invite_embed_invite_to_listen">Convite para ouvir junto no %1$s</string>
     <string name="invite_embed_invite_to_spectate">Convidar para assistir</string>
     <string name="invite_embed_invite_to_watch">Convidar para assistir %1$s</string>
-    <string name="invite_embed_join_via_desktop_app">Entrar através do aplicativo no computador</string>
     <string name="invite_embed_joined">Entrou</string>
     <string name="invite_embed_listen_has_ended">O convite para ouvir já expirou!</string>
     <string name="invite_embed_listening_invite">Convite para ouvir junto</string>
@@ -1885,7 +1809,6 @@ Caso você tenha acesso aos usuários do seu site, pode adicionar dinamicamente
     <string name="invite_embed_num_open_slots_android">%1$s</string>
     <string name="invite_embed_send_invite">Enviar convite</string>
     <string name="invite_embed_spectate">Assistir ao jogo</string>
-    <string name="invite_embed_spectate_via_desktop_app">Assistir através do aplicativo no computador</string>
     <string name="invite_embed_watch_has_ended">O convite para assistir já expirou!</string>
     <string name="invite_expires_days">Seu link de convite expira em 1 dia.</string>
     <string name="invite_expires_days_or_uses">Seu link de convite expira em 1 dia, ou após %1$s.</string>
@@ -1940,13 +1863,13 @@ Quer saber mais sobre o Discord?"</string>
     <string name="join_afk_channel_body">Parece que você entrou no canal de ausentes. Você não pode falar neste canal.</string>
     <string name="join_call">Juntar-se à chamada</string>
     <string name="join_server">Juntar-se</string>
-    <string name="join_server_button_body">Insira um convite instantâneo e entre no servidor dos seus amigos.</string>
+    <string name="join_server_button_body">Insira um convite e entre no servidor dos seus amigos.</string>
     <string name="join_server_button_cta">Entrar em um servidor</string>
     <string name="join_server_button_cta_mobile">Entrar em um servidor com um link de convite</string>
     <string name="join_server_button_cta_mobile_desc">Tem um código ou link de convite? Use-o aqui!</string>
     <string name="join_server_button_cta_named">Entrar em %1$s</string>
-    <string name="join_server_description">Insira um convite instantâneo abaixo para entrar em um servidor existente. O convite será parecido com um desses:</string>
-    <string name="join_server_description_mobile">Insira um convite instantâneo acima para entrar em um servidor existente.</string>
+    <string name="join_server_description">Insira um convite abaixo para entrar em um servidor existente. O convite será parecido com um desses:</string>
+    <string name="join_server_description_mobile">Insira um convite acima para entrar em um servidor existente.</string>
     <string name="join_server_title">Entrar em um servidor</string>
     <string name="join_stream">Entrar na transmissão</string>
     <string name="join_video_call">Entrar na chamada de vídeo</string>
@@ -2054,7 +1977,7 @@ a menos que **%1$s** adicione você novamente."</string>
     <string name="link_your_xbox_account_2">O Discord é um aplicativo de chat de voz, texto e vídeo para jogadores. Ele é grátis, seguro e funciona tanto no computador quanto no celular.</string>
     <string name="listening_to">Ouvindo **%1$s**</string>
     <string name="live">Ao Vivo</string>
-    <string name="live_beta_description">Bem-vindo(a) à transmissão! O Ao Vivo está no beta. Desculpe quaisquer engasgos.</string>
+    <string name="live_beta_description">Bem-vindo(a) à transmissão! O Go Live está no beta. Desculpe quaisquer engasgos.</string>
     <string name="live_on_twitch">Ao vivo no Twitch</string>
     <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Falha ao carregar a imagem.
@@ -2109,7 +2032,6 @@ Não é possível atribuí-lo a membros ou excluí-lo manualmente."</string>
     <string name="media_hint_title">Permita que o Discord acesse sua câmera.</string>
     <string name="member">Membro</string>
     <string name="member_list">Lista de membros</string>
-    <string name="member_list_server_owner_help">Esta pessoa é a responsável pelo servidor e sempre tem todas as permissões, independentemente dos cargos.</string>
     <string name="members">Membros</string>
     <string name="members_header">%1$s</string>
     <string name="members_matching">Resultados de membros para **%1$s**</string>
@@ -2152,7 +2074,6 @@ começando uma mensagem com @everyone ou @here."</string>
     <string name="mfa_sms_already_enabled">Já está ativada!</string>
     <string name="mfa_sms_auth">Autenticação de segurança por SMS</string>
     <string name="mfa_sms_auth_current_phone">Seu número de telefone atual é: %1$s.</string>
-    <string name="mfa_sms_auth_sales_pitch">Adicione seu telefone como um método alternativo para a verificação em duas etapas no caso de você perder seu aplicativo de verificação ou seus códigos de recuperação.</string>
     <string name="mfa_sms_confirm_remove_action">Remover segurança por SMS</string>
     <string name="mfa_sms_confirm_remove_body">Isso remove a capacidade de se conectar com um código de autenticação através de SMS. Deseja mesmo remover isso?</string>
     <string name="mfa_sms_disabled_partner">Desativado para parceiros</string>
@@ -2240,14 +2161,11 @@ nossos Termos de serviço e Política de privacidade atualizados."</string>
     <string name="no_emoji_title">Sem emojis</string>
     <string name="no_input_devices">Sem dispositivos de entrada</string>
     <string name="no_input_devices_detected">Nenhum dispositivo de entrada detectado. Conecte um dispositivo e tente novamente.</string>
-    <string name="no_instant_invite">Sem convite instantâneo</string>
-    <string name="no_integrations">[Conecte](onConnect) sua conta associada do Twitch ou YouTube Gaming para sincronizar seus inscritos/patrocinadores a um cargo</string>
+    <string name="no_instant_invite">Sem convite</string>
     <string name="no_integrations_body">O protocolo 4M1Z4D3 só pode ser executado no cliente do Discord</string>
     <string name="no_integrations_label">Sem integrações</string>
-    <string name="no_invites_body">"Sentindo-se perdido? Como um avião de papel sem rumo pelos céus?
-Crie um link de convite instantâneo e chame alguns amigos para cá!"</string>
-    <string name="no_invites_caption">Nenhum convite instantâneo!</string>
-    <string name="no_invites_label">Nenhum convite instantâneo</string>
+    <string name="no_invites_caption">Nenhum convite!</string>
+    <string name="no_invites_label">Nenhum convite</string>
     <string name="no_mail_account_description">Envie seus comentários para support@discordapp.com. Copiamos a sua informação de usuário para a área de transferência.</string>
     <string name="no_mail_account_title">Nenhuma conta de e-mail</string>
     <string name="no_mic_body">As instruções para permitir acesso ao seu microfone podem ser encontradas na Central de Ajuda do Discord.</string>
@@ -2265,7 +2183,6 @@ mensagens fixadas… ainda."</string>
     <string name="no_reactions_header">Sem reações</string>
     <string name="no_recent_mentions">E no começo… havia silêncio.</string>
     <string name="no_send_messages_permission_placeholder">Você não tem permissão para enviar mensagens neste canal.</string>
-    <string name="no_system_channel">Sem mensagens de boas-vindas</string>
     <string name="no_text">Não</string>
     <string name="no_thanks">Não, valeu</string>
     <string name="no_user_limit">Sem limite</string>
@@ -2277,7 +2194,6 @@ mensagens fixadas… ainda."</string>
     <string name="note">Nota</string>
     <string name="note_placeholder">Clique para adicionar uma nota</string>
     <string name="note_placeholder_mobile">Toque para adicionar uma nota</string>
-    <string name="notice_application_test_mode">O modo de teste está ativado para **%1$s**. SKUs não publicados aparecerão e você não será cobrado(a) por pagamentos relacionados.</string>
     <string name="notice_application_test_mode_go_to_listing">Ir para o SKU</string>
     <string name="notice_connect_spotify">Conecte sua conta do Spotify para mostrar no seu status o que você está ouvindo!</string>
     <string name="notice_connection_conflict">Sua voz foi desconectada porque você se conectou em outro local.</string>
@@ -2288,7 +2204,6 @@ mensagens fixadas… ainda."</string>
     <string name="notice_dispatch_error_disk_low">Você não tem espaço de disco suficiente. Necessário: %1$s / Disponível: %2$s</string>
     <string name="notice_dispatch_error_file_name_too_long">Carambolas, este jogo tem arquivos com nomes longos demais para o Windows. Selecione um diretório de instalação mais curto.</string>
     <string name="notice_dispatch_error_invalid_drive">Porca miséria, o local de instalação que você escolheu não é válido. Você selecionou \"%1$s\"</string>
-    <string name="notice_dispatch_error_io_permission_denied">Não conseguimos atualizar o jogo. Você está com ele aberto?</string>
     <string name="notice_dispatch_error_no_manifests">Vixe, parece que não existe conteúdo para este jogo. Entre em contato com o suporte.</string>
     <string name="notice_dispatch_error_not_entitled">Ih, rapaz, parece que você não tem esse jogo. Se isto for um erro nosso, entre em contato com o suporte.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Parece que você negou um script de instalação. Você precisa aceitá-lo para que o jogo seja instalado.</string>
@@ -2300,12 +2215,8 @@ mensagens fixadas… ainda."</string>
     <string name="notice_hardware_mute">Bem, parece que o botão de silenciamento do microfone **%1$s %2$s** está ativado.</string>
     <string name="notice_mfa_sms_backup">Recomendamos adicionar um número de telefone nas suas configurações de verificação em duas etapas como uma opção alternativa de segurança.</string>
     <string name="notice_mfa_sms_backup_button">Adicionar telefone</string>
-    <string name="notice_native_apps">Precisa de um sistema com Aperte Para Falar? Baixe o aplicativo no computador!</string>
     <string name="notice_no_input_detected">Bem, parece que o Discord não está detectando nenhuma entrada do seu microfone. Vamos consertar isso… juntos.</string>
     <string name="notice_no_input_detected_help_link_text">Me ajuda!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Seu acesso ao Nitro expirou. Melhore seu plano do Nitro Classic para o Nitro para ter acesso ilimitado a jogos incríveis.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Você só tem %1$s restantes de acesso aos jogos Nitro! Seu acesso termina em **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Agradecemos por apoiar o Nitro desde o começo! Por ser tão incrível, estamos te dando acesso aos jogos do Nitro até %1$s.</string>
     <string name="notice_premium_promo_action">Confira</string>
     <string name="notice_premium_promo_message">Apoie o desenvolvimento do Discord e obtenha vantagens divertidas!</string>
     <string name="notice_scheduled_maintenance">O Discord estará em manutenção programada em **%1$s** às **%2$s**.</string>
@@ -2315,7 +2226,6 @@ mensagens fixadas… ainda."</string>
     <string name="notice_survey_prompt">Você gostaria de responder a umas perguntinhas sobre o Discord? Por favor, vaaai!</string>
     <string name="notice_unclaimed_account">Ninguém vinculou essa conta ainda. Vincule-a antes que ela se perca como lágrimas na chuva.</string>
     <string name="notice_unverified_account">Confira seu e-mail e siga as instruções para verificar sua conta.</string>
-    <string name="notice_video_unsupported_browser">Alguém acabou de fazer uma chamada de vídeo para você! Infelizmente, as chamadas de vídeo não são compatíveis neste navegador. Baixe nosso cliente no computador para receber a chamada.</string>
     <string name="notice_whats_this">O que é isso?</string>
     <string name="notification_accepted_friend_request">Pedido de amizade aceito.</string>
     <string name="notification_body_attachment">%1$s enviado</string>
@@ -2360,7 +2270,6 @@ Crie um servidor do Discord para você e seus amigos. O chat de voz e texto fica
     <string name="nuf_download_app_button_platform">Baixe para %1$s</string>
     <string name="nuf_download_app_button_type">Baixar %1$s</string>
     <string name="nuf_download_app_intro">Ufa, quase lá! Mas antes de terminarmos…</string>
-    <string name="nuf_download_app_title">Baixar aplicativo no computador</string>
     <string name="nuf_join_server_body_1">Se tiver, insira seu link ou código de convite para entrar no servidor!</string>
     <string name="nuf_join_server_body_2">"É muito bom te ver por aqui!
 
@@ -2375,7 +2284,6 @@ Você recebeu um link de convite de um amigo? Insira seu link ou código de conv
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Sobreposição ativada</string>
     <string name="nux_post_reg_join_server_description">Junte-se a um servidor para aproveitar o Discord ao máximo.</string>
     <string name="nux_post_reg_join_server_skip">Eu não tenho um</string>
     <string name="nux_post_reg_join_server_title">Você tem um convite?</string>
@@ -2421,8 +2329,6 @@ Além disso, a sobreposição pode não funcionar para todos. Se estiver com pro
     <string name="overlay_menu_get_invite">Obter link de convite</string>
     <string name="overlay_menu_open_discord">Abrir o Discord</string>
     <string name="overlay_menu_switch_channels">Trocar de canal</string>
-    <string name="overlay_mobile_required">Ative a sobreposição nas configurações de voz do Discord.</string>
-    <string name="overlay_mobile_toggle_desc">Veja quem está falando e acesse atalhos enquanto usa outros aplicativos e está com a voz conectada</string>
     <string name="overlay_mobile_toggle_label">Ativar Sobreposição de Voz Móvel</string>
     <string name="overlay_mobile_unauthed">Entre no aplicativo Discord para ativar esse recurso.</string>
     <string name="overlay_news_go_live_body">Quer transmitir %1$s para seus amigos em %2$s?</string>
@@ -2430,7 +2336,6 @@ Além disso, a sobreposição pode não funcionar para todos. Se estiver com pro
     <string name="overlay_news_text_pinning_body">Agora você pode fixar um bate-papo de texto no seu jogo!</string>
     <string name="overlay_news_text_pinning_tip">Dica: para fixar o bate-papo, pressione $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Sobreposição do Discord melhorada</string>
-    <string name="overlay_no_results">Buscamos por toda parte. Infelizmente, não encontramos nenhum canal de voz.</string>
     <string name="overlay_notification_incoming_call">Chamada recebida…</string>
     <string name="overlay_notification_settings_disabled">Notificações desativadas</string>
     <string name="overlay_notification_settings_position">Mostrando: %1$s</string>
@@ -2440,7 +2345,6 @@ Além disso, a sobreposição pode não funcionar para todos. Se estiver com pro
     <string name="overlay_notifications_settings">Notificações da sobreposição</string>
     <string name="overlay_notifications_top_left">Canto superior esquerdo</string>
     <string name="overlay_notifications_top_right">Canto superior direito</string>
-    <string name="overlay_private_channels_empty_state">Tem mensagem direta aqui, não.</string>
     <string name="overlay_reload">Recarregar sobreposição</string>
     <string name="overlay_settings">Configurações da sobreposição</string>
     <string name="overlay_settings_general_tab">Geral</string>
@@ -2462,7 +2366,6 @@ Além disso, a sobreposição pode não funcionar para todos. Se estiver com pro
     <string name="pagination_page_of">Página %1$s de %2$s</string>
     <string name="pagination_previous">Anterior</string>
     <string name="paginator_of_pages">Página %1$s de %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Parceiro(a) do Discord</string>
     <string name="party_full">Grupo lotado</string>
     <string name="party_join">Entrar no grupo</string>
@@ -2545,8 +2448,6 @@ Além disso, a sobreposição pode não funcionar para todos. Se estiver com pro
     <string name="pinned_messages">Mensagens fixadas</string>
     <string name="pinned_messages_pro_tip">Fica a dica:</string>
     <string name="pinned_messages_pro_tip_body_channel">Usuários com \"Gerenciar mensagens\" podem fixar mensagens.</string>
-    <string name="pinned_messages_pro_tip_body_dm">Você e %1$s podem fixar mensagens no menu dos três pontos.</string>
-    <string name="pinned_messages_pro_tip_body_group_dm">Qualquer membro pode fixar uma mensagem a partir do menu dos três pontos.</string>
     <string name="pins_disabled_nsfw">Este canal é de conteúdo adulto e, devido ao seu conteúdo, as mensagens fixadas não devem ser vistas por ninguém.</string>
     <string name="pl">Polonês</string>
     <string name="playing_game">Jogando **%1$s**</string>
@@ -2556,47 +2457,32 @@ Além disso, a sobreposição pode não funcionar para todos. Se estiver com pro
     <string name="popout_stay_on_top">Mostrar sempre</string>
     <string name="post_code">CEP</string>
     <string name="premium_alert_error_title">Ops, algo deu errado…</string>
-    <string name="premium_applications_grandfathered_monthly">Como agradecimento por apoiar o Discord, você ganhou acesso aos jogos do Nitro por 1 ano. Seu acesso termina em **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">Como agradecimento por apoiar o Discord, você ganhou acesso aos jogos do Nitro por 2 anos. Seu acesso termina em **%1$s**.</string>
-    <string name="premium_applications_subtitle">Acesso ilimitado a uma biblioteca (em franca expansão!) de jogos aclamados que recomendamos que você e seus amigos joguem.</string>
-    <string name="premium_applications_title">Dezenas de jogos selecionados, tudo por um precinho mensal.</string>
     <string name="premium_badge_tooltip">Assinante desde %1$s</string>
     <string name="premium_cancel_cancel">Melhor não</string>
     <string name="premium_cancel_confirm_body_tier_1">"O cancelamento ocorrerá no fim do período pago atual, **%1$s**. Sua Tag Discord será randomizada, caso você a tenha mudado.
 
 Você pode voltar a assinar a qualquer momento."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"O cancelamento ocorrerá no fim do período pago atual. Em **%1$s**, você perderá o acesso a todos os jogos Nitro na sua biblioteca e sua Tag Discord será randomizada, caso você a tenha mudado.
-
-Seus jogos salvos estarão guardadinhos com cuidado, caso você mude de ideia. A qualquer momento, você pode retomar sua assinatura!"</string>
     <string name="premium_cancel_confirm_new">Pode cancelar %1$s</string>
     <string name="premium_cancel_confirm_title">Cancelar %1$s?</string>
     <string name="premium_cancel_failed_body">Não foi possível cancelar a sua assinatura Nitro. Tente novamente ou entre em contato com nossa equipe de assistência se esse problema persistir.</string>
     <string name="premium_canceled">Sua assinatura termina em %1$s.</string>
     <string name="premium_cant_upgrade_confirm">Entendi</string>
     <string name="premium_change_discriminator_length_error">Esta tag é inválida. As tags devem conter 4 dígitos.</string>
-    <string name="premium_change_discriminator_modal_body">Quando sua assinatura Nitro terminar, sua tag do Discord será regenerada aleatoriamente. Deseja mesmo mudar sua tag do Discord?</string>
-    <string name="premium_change_discriminator_modal_confirm">Mudar tag do Discord</string>
-    <string name="premium_change_discriminator_modal_header">Mudar sua tag do Discord</string>
     <string name="premium_change_discriminator_tooltip">Quer personalizar sua tag? Assine o Nitro!</string>
     <string name="premium_change_discriminator_zero_error">Esta tag é inválida. As tags devem ser maiores que 0.</string>
     <string name="premium_chat_perks_description_animated_avatar_and_emoji">Suba GIFs como avatares animados e emojis.</string>
     <string name="premium_chat_perks_description_badge">Mostre há quanto tempo você apoia o Discord com um emblema especial no seu perfil.</string>
-    <string name="premium_chat_perks_description_custom_emoji">Ganhe passe livre para usar seus emojis personalizados em qualquer lugar.</string>
     <string name="premium_chat_perks_description_discriminator">Escolha a tag que você quer usar enquanto for assinante.</string>
     <string name="premium_chat_perks_description_screenshare">Melhore a qualidade do compartilhamento de tela com 720p 60fps ou 1080p 30fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">O tamanho máximo dos seus arquivos aumenta de %1$s para %2$s, para você compartilhar memes da mais alta qualidade.</string>
+    <string name="premium_chat_perks_streaming_mobile">Transmissões melhores no Go Live: transmita na qualidade fonte com o Nitro ou em até lindos 1080p a 60fps com o Nitro Classic</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Diversão Animada</string>
     <string name="premium_chat_perks_title_badge">Mostre seu apoio</string>
     <string name="premium_chat_perks_title_custom_emoji">Emojis Personalizados Globais</string>
-    <string name="premium_chat_perks_title_discriminator">Tag do Discord personalizada</string>
     <string name="premium_chat_perks_title_screenshare">Vídeo de Maior Qualidade</string>
+    <string name="premium_chat_perks_title_streaming">Transmissões melhores no Go Live</string>
     <string name="premium_code_redemption_confirmation_blurb">Graças a uma combinação aleatória de algarismos, você ganhou vantagens no bate-papo por %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">Ô delícia!</string>
-    <string name="premium_feature_new_chat_perks_header">Você também ganhará algumas vantagens para o bate-papo:</string>
-    <string name="premium_feature_new_premium_applications_header">Mais de %1$s em jogos. Confira:</string>
-    <string name="premium_feature_view_applications">Ver todos os jogos do Nitro</string>
     <string name="premium_features_chat_perks">Vantagens de bate-papo</string>
-    <string name="premium_features_premium_applications">Jogos grátis</string>
     <string name="premium_grandfathered_warning">Como agradecimento pelo apoio, seu plano Nitro agora tem desconto. **Ao cancelar ou mudar seu plano, você perderá este desconto.** Fica a dica!!!!</string>
     <string name="premium_grandfathered_warning_confirm">Continuar Mesmo Assim</string>
     <string name="premium_grandfathered_warning_title">Cuidado Aí, Caubói</string>
@@ -2606,10 +2492,7 @@ Seus jogos salvos estarão guardadinhos com cuidado, caso você mude de ideia. A
     <string name="premium_not_claimed">Crie sua conta primeiro</string>
     <string name="premium_not_claimed_body">E aí, camarada! Se quiser comprar o Nitro, primeiro vai precisar resgatar sua conta, assim você não perde nada.</string>
     <string name="premium_not_verified">Verifique seu e-mail primeiro</string>
-    <string name="premium_not_verified_body">E aí, camarada! Se quiser comprar o Nitro, primeiro vai precisar verificar seu e-mail. Veja sua caixa de entrada ou requisite uma nova mensagem.</string>
-    <string name="premium_payment_applications_os_warning">Os jogos do Nitro só são compatíveis com Windows.</string>
     <string name="premium_payment_confirmation_blurb_regular">Você recebeu a bênção das vantagens no bate-papo. Para de ler isso e vai conversar!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Agora você tem acesso ilimitado a um monte de jogos incríveis. Para de ler isso e vai jogar!!</string>
     <string name="premium_payment_confirmation_button_regular">Valeu, falou</string>
     <string name="premium_plan_month">Nitro Mensal</string>
     <string name="premium_plan_month_tier_1">Nitro Classic Mensal</string>
@@ -2630,13 +2513,10 @@ Vamos contabilizar seu plano atual e descontar o valor dele do valor anual. A co
     <string name="premium_upgrade_disabled_current_tooltip">Seu plano atual.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Você precisa cancelar seu plano atual e deixá-lo expirar antes de optar por um plano inferior.</string>
     <string name="premium_upgrade_done_body_tier_1">Você ganhou vantagens no bate-papo!</string>
-    <string name="premium_upgrade_done_body_tier_2">Agora você tem vantagens no bate-papo e acesso a dúzias de jogos.</string>
     <string name="premium_upgrade_done_button_tier_1">Maravilha!</string>
-    <string name="premium_upgrade_done_button_tier_2">Confira todos os jogos do Nitro</string>
     <string name="premium_upgrade_failed_body">Ih… O aprimoramento não funcionou. Certifique-se de que suas informações de pagamento estão atualizadas e tente novamente.</string>
     <string name="premium_upload_promo">Atualize para o Discord Nitro para possuir um limite de envio de %1$s</string>
     <string name="premium_year_free_months">Ganhe 2 meses grátis!</string>
-    <string name="premium_year_free_months_short">2 meses grátis</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / Ano</string>
     <string name="preview_chat">Pré-visualizar conversa</string>
     <string name="priority_speaker">Voz Prioritária</string>
@@ -2656,11 +2536,7 @@ use o atalho **%1$s**."</string>
     <string name="prune">Remover</string>
     <string name="prune_members">Remover membros inativos</string>
     <string name="pt_br">Português, Brasil</string>
-    <string name="ptt_limited_body">"O Aperte para Falar (limitado) só funciona quando a guia do navegador estiver em primeiro plano.
-Baixe a versão de computador para usar o Aperte para Falar pleno."</string>
     <string name="ptt_limited_title">Ei, só um recado</string>
-    <string name="ptt_limited_warning">"O Aperte para Falar (limitado) só funciona quando a guia do navegador estiver em primeiro plano.
-Para usá-lo a qualquer momento, [baixe](onDownloadClick) o aplicativo no computador."</string>
     <string name="ptt_permission_body">"Você iniciou %1$s como administrador. Abra novamente o Discord como administrador para que o
 Aperte para Falar possa ser usado enquanto o jogo estiver em primeiro plano."</string>
     <string name="ptt_permission_title">Aperte para Falar precisa de permissão</string>
@@ -2770,27 +2646,14 @@ Deseja mesmo fazer isso?"</string>
     <string name="role_order_updated">Ordem de cargos atualizada.</string>
     <string name="roles">Cargos</string>
     <string name="roles_list">%1$s</string>
-    <string name="rtc_connection">Conexão RTC</string>
     <string name="rtc_connection_info">Informações da conexão</string>
     <string name="rtc_connection_state_authenticating">O Discord se conectou ao seu servidor de comunicação em tempo real e está protegendo a conexão.</string>
-    <string name="rtc_connection_state_awaiting_endpoint">"O Discord está preparando um servidor RTC para você! Se sua conexão está travando por aqui, podemos estar passando por uma
-interrupção na região. Meodeos! Confira nossa [página de estado do serviço](%1$s) para mais informações ou peça ao proprietário do seu servidor
-para mudar temporariamente a região."</string>
-    <string name="rtc_connection_state_connecting">Um servidor RTC foi alocado para você e o Discord está tentando se conectar a ele. Aperte os cintos.</string>
     <string name="rtc_connection_state_disconnected">"Os hamsters podem ter caído de suas rodas. A conexão do Discord com seu servidor de comunicação em tempo real foi interrompida.
 Tentaremos restabelecer a conexão em um momento."</string>
     <string name="rtc_connection_state_ice_checking">"Escudos de pé! O Discord estabeleceu uma conexão segura com ao seu servidor de comunicação em tempo real e está tentando enviar dados.
 Se a conexão do seu navegador estiver parada nesta etapa, confira [este maravilhoso artigo](%1$s) para ajudá-lo a resolver o problema."</string>
     <string name="rtc_connection_state_no_route">"Caramba. O Discord não conseguiu estabelecer uma conexão UDP com o seu servidor de comunicação em tempo real. Vamos tentar de novo em alguns instantes.
 Se o Discord continuar preso nesta etapa, confira [este lindo artigo](%1$s) para ajudar a resolver o problema."</string>
-    <string name="rtc_connection_state_rtc_connected">"O Discord está conectado ao servidor de comunicação em tempo real em **%1$s** com uma latência média de **%2$sms**.
-O último registro de latência foi de **%3$sms**.
-
-Se a latência estiver oscilando ou for maior que %4$sms, considere pedir para o proprietário do servidor mudar de região."</string>
-    <string name="rtc_connection_state_rtc_connected_loss_rate">"O Discord está conectado ao seu servidor de comunicação em tempo real em **%1$s** com um ping médio de **%2$s ms**. O último
-ping foi de **%3$s ms**. A perda de pacotes enviados é de **%4$s%%**.
-
-Se o ping não estiver consistente ou acima de %5$s ms, considere pedir que o dono do servidor o mude para outra região. Se a perda de pacotes estiver acima de %6$s%%, você pode acabar falando feito um robô."</string>
     <string name="rtc_connection_state_rtc_connecting">"Armado e preparado! O Discord estabeleceu uma conexão segura com o servidor de comunicação em tempo real e
 está tentando enviar dados."</string>
     <string name="rtc_debug_context">Depuração de CTR: %1$s</string>
@@ -2816,12 +2679,11 @@ está tentando enviar dados."</string>
     <string name="scope_connections_empty">Você ainda não tem conexões de terceiros!</string>
     <string name="scope_email">Acessar seu endereço de e-mail</string>
     <string name="scope_email_empty">Você ainda não configurou um e-mail!</string>
-    <string name="scope_gdm_join">Entrar em MDs de grupos por você</string>
     <string name="scope_gdm_join_description">Isto permite que o aplicativo acesse grupos privados em seu nome.</string>
     <string name="scope_guilds">Saber em que servidores você está</string>
     <string name="scope_guilds_empty">Você não está em um servidor.</string>
     <string name="scope_guilds_join">Entrar em servidores para você</string>
-    <string name="scope_guilds_join_description">Usar convites instantâneos em seu nome.</string>
+    <string name="scope_guilds_join_description">Usar convites em seu nome.</string>
     <string name="scope_identify">Acessar seu nome de usuário e avatar</string>
     <string name="scope_messages_read">Ler todas as mensagens</string>
     <string name="scope_messages_read_description">Isto permite ao aplicativo ler todas as mensagens acessíveis através da sua conta do Discord</string>
@@ -2851,7 +2713,6 @@ Escolha qual tela você gostaria de compartilhar."</string>
     <string name="screenshare_stream_game">Transmitir %1$s</string>
     <string name="screenshare_stream_quality">Qualidade da transmissão</string>
     <string name="screenshare_unavailable">Compartilhamento de tela indisponível</string>
-    <string name="screenshare_unavailable_download_app">Baixe o aplicativo do Discord no computador para usar o compartilhamento de tela!</string>
     <string name="screenshare_window">Janela do aplicativo</string>
     <string name="search">Buscar</string>
     <string name="search_actions">Buscar ações</string>
@@ -2889,7 +2750,6 @@ Escolha qual tela você gostaria de compartilhar."</string>
     <string name="search_filter_on">no dia</string>
     <string name="search_for_emoji">Encontre o emoji perfeito</string>
     <string name="search_for_empty">Buscar</string>
-    <string name="search_for_value">Buscar por: **%1$s**</string>
     <string name="search_group_header_channels">No canal</string>
     <string name="search_group_header_dates">Datas</string>
     <string name="search_group_header_file_name">O nome do arquivo contém</string>
@@ -2926,7 +2786,6 @@ Escolha qual tela você gostaria de compartilhar."</string>
     <string name="select">Selecionar</string>
     <string name="select_channel_or_category">Selecione um canal ou categoria…</string>
     <string name="select_sort_mode">Ordenar por</string>
-    <string name="self_deafened">Silenciou-se</string>
     <string name="self_deny_permission_body">"Você não pode negar esta permissão a **%1$s** porque ela também será negada a você. Permita outro cargo ou a
 você mesmo(a) antes de tentar de novo."</string>
     <string name="self_deny_permission_title">Com certeza você não quer fazer isso</string>
@@ -3093,8 +2952,6 @@ Deseja mesmo fazer isso?"</string>
     <string name="stop_ringing">Parar de tocar</string>
     <string name="stop_streaming">Parar de transmitir</string>
     <string name="stop_watching">Parar de assistir</string>
-    <string name="store_payment_legalese_monthly">Oi! Ao comprar o %1$s, você concorda com os [Termos de Serviço da Loja](%2$s). O %1$s é uma assinatura recorrente, o que significa que te cobraremos hoje e continuaremos a cobrar mensalmente até você cancelar sua assinatura. Acesse as Configurações de Usuário a qualquer momento para cancelar.</string>
-    <string name="store_payment_legalese_yearly">Oi! Ao comprar o %1$s, você concorda com os [Termos de Serviço da Loja](%2$s). O %1$s é uma assinatura recorrente, o que significa que te cobraremos hoje e continuaremos a cobrar mensalmente até você cancelar sua assinatura. Acesse as Configurações de Usuário a qualquer momento para cancelar.</string>
     <string name="stream">Ao Vivo</string>
     <string name="stream_bad_spectator">A transmissão está com qualidade de vídeo e áudio prejudicadas. Isso pode ser devido a problemas de conexão.</string>
     <string name="stream_bad_streamer">Sua transmissão está com qualidade de vídeo e áudio prejudicadas. Isso pode ser devido a problemas de conexão.</string>
@@ -3102,7 +2959,6 @@ Deseja mesmo fazer isso?"</string>
     <string name="stream_capture_paused_details">Mude para seu jogo para continuar.</string>
     <string name="stream_capture_paused_details_viewer">%1$s minimizou o jogo… Guentaí um pouquim!</string>
     <string name="stream_channel_description">Membros com esta permissão podem transmitir neste canal.</string>
-    <string name="stream_description">Membros com esta permissão podem neste canal.</string>
     <string name="stream_ended">Esta transmissão acabou. *cri cri cri*</string>
     <string name="stream_ended_button">Transmissão encerrada</string>
     <string name="stream_ended_no_spectators">Não há espectadores porque a transmissão terminou.</string>
@@ -3142,7 +2998,6 @@ Deseja mesmo fazer isso?"</string>
     <string name="stream_report_rating_body_streamer">Conte-nos como foi sua experiência com a transmissão.</string>
     <string name="stream_report_submit">Enviar</string>
     <string name="stream_reported">Comentário enviado</string>
-    <string name="stream_reported_body">Agradecemos por relatar seu problema! Seus comentários nos ajudam a melhorar a qualidade do jogo.</string>
     <string name="stream_soundshare_failed">Oi, algo deu errado e não foi possível transmitir o som do seu jogo.</string>
     <string name="streamer_mode">Modo streamer</string>
     <string name="streamer_mode_enabled">Modo streamer ativado</string>
@@ -3200,7 +3055,6 @@ Deseja mesmo fazer isso?"</string>
     <string name="system_message_guild_member_join_10">Um %1$s selvagem apareceu.</string>
     <string name="system_message_guild_member_join_11">Vuuuush. %1$s acabou de aterrissar.</string>
     <string name="system_message_guild_member_join_12">Preparem-se. %1$s acabou de entrar no servidor.</string>
-    <string name="system_message_guild_member_join_13">%1$s acabou de entrar. Escondam suas bananas.</string>
     <string name="system_message_guild_member_join_14">%1$s acabou de chegar. Pede pra nerfar, noob.</string>
     <string name="system_message_guild_member_join_15">%1$s acabou de cair de paraquedas no servidor.</string>
     <string name="system_message_guild_member_join_16">%1$s acabou de nascer no servidor.</string>
@@ -3211,8 +3065,6 @@ Deseja mesmo fazer isso?"</string>
     <string name="system_message_guild_member_join_21">Desafiante à vista - %1$s apareceu!</string>
     <string name="system_message_guild_member_join_22">É um pássaro! É um avião! Ah não, é só o(a) %1$s.</string>
     <string name="system_message_guild_member_join_23">É %1$s! Glória ao sol! \\\\[T]//</string>
-    <string name="system_message_guild_member_join_24">Olha que coisa mais linda, mais cheia de graça, é %1$s, que vem e que passa… Tô falando de você mesmo, %1$s.</string>
-    <string name="system_message_guild_member_join_25">Ha! %1$s entrou! Você ativou minha carta armadilha!</string>
     <string name="system_message_guild_member_join_26">Obrigada, querido! %1$s está aqui!</string>
     <string name="system_message_guild_member_join_27">Ei! Se liga! %1$s entrou!</string>
     <string name="system_message_guild_member_join_28">Estávamos esperando por você, %1$s</string>
@@ -3309,12 +3161,10 @@ seu aplicativo de verificação. **Cada código só pode ser usado uma vez! Qual
     <string name="two_fa_guild_mfa_warning">Este servidor requer verificação em duas etapas. Seus privilégios de administrador estão desativados. [Resolver](onClick)</string>
     <string name="two_fa_guild_mfa_warning_ios">Este servidor requer verificação em duas etapas. Seus privilégios de administrador estão desativados.</string>
     <string name="two_fa_ios_delete">No momento, você não pode excluir servidores com a verificação em duas etapas ativada no iOS.</string>
-    <string name="two_fa_key">Chave da verificação (digitação manual)</string>
     <string name="two_fa_login_body">Digite o código de verificação de 6 dígitos gerado.</string>
     <string name="two_fa_login_footer">Voltar ao início de sessão</string>
     <string name="two_fa_login_label">Entre com seu código</string>
     <string name="two_fa_not_verified">Você deve verificar sua conta antes de ativar a verificação em duas etapas.</string>
-    <string name="two_fa_qr_body">Abra o aplicativo de verificação e escaneie a imagem à esquerda, usando a câmera do seu celular.</string>
     <string name="two_fa_qr_label">Escaneie o código QR</string>
     <string name="two_fa_remove">Remover verificação em duas etapas</string>
     <string name="two_fa_sales_pitch">"Proteja sua conta do Discord com uma camada extra de segurança. Uma vez configurada,
@@ -3322,7 +3172,6 @@ serão necessários tanto a senha quanto um código de verificação de seu disp
     <string name="two_fa_success_body">Falta pouco:</string>
     <string name="two_fa_success_header">A verificação em duas etapas está ativada! :tada:</string>
     <string name="two_fa_token_required">Um código de verificação válido do Discord é necessário.</string>
-    <string name="two_fa_use_desktop_app">A ativação da verificação em duas etapas não é compatível neste navegador. Use o aplicativo para computador para ativá-la.</string>
     <string name="two_fa_view_backup_codes">Ver códigos de recuperação</string>
     <string name="two_fa_view_codes">Ver códigos</string>
     <string name="two_users_typing">**%1$s** e **%2$s** estão digitando…</string>
@@ -3363,8 +3212,6 @@ serão necessários tanto a senha quanto um código de verificação de seu disp
     <string name="unsupported_browser">Navegador incompatível</string>
     <string name="unsupported_browser_body">"Parece que você está usando um navegador incompatível. Para experimentar tudo que o Discord tem a oferecer,
 atualize seu navegador ou baixe um dos nossos aplicativos."</string>
-    <string name="unsupported_browser_details">"Você quer poder falar com seu time, certo? Atualize para a última versão do Chrome, Opera, Firefox 38+ ou baixe
-o cliente do Discord para começar a falar agora mesmo!"</string>
     <string name="unsupported_browser_title">Eita, que saia justa</string>
     <string name="unverified_account_body">"Dê uma conferida no seu e-mail e siga as instruções para verificá-lo.
 
@@ -3420,7 +3267,6 @@ Pressione Shift para enviar diretamente."</string>
     <string name="user_activity_chat_invite_education">**%1$s** permite convites de jogo. [Dispensar](dismissOnClick)</string>
     <string name="user_activity_connect_platform">Conectar %1$s</string>
     <string name="user_activity_error_desktop_action">Baixe o aplicativo</string>
-    <string name="user_activity_error_desktop_body">A versão de navegador do Discord é maravilhosa, mas não é capaz de fazer tudo. Para executar este jogo, você precisará usar o aplicativo do Discord no computador. Baixe agora mesmo!</string>
     <string name="user_activity_error_desktop_title">Requer o aplicativo para área de trabalho</string>
     <string name="user_activity_error_friends_action">Enviar pedido de amizade</string>
     <string name="user_activity_error_friends_body">Vocês precisam ser amigos antes de usarem isso! Envie um pedido de amizade para %1$s. Quando ele for confirmado, clique novamente no botão!</string>
@@ -3482,8 +3328,6 @@ Pressione Shift para enviar diretamente."</string>
     <string name="user_settings_appearance_preview_message_4">O modo compacto vai ligar</string>
     <string name="user_settings_appearance_preview_message_5">Ah, aqui está!</string>
     <string name="user_settings_appearance_zoom_tip">Você pode mudar o nível de zoom com %1$s +/- e retornar ao zoom padrão com %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Mostrar a guia de jogos</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Desative isso para ocultar a guia de jogos, assim você pode se concentrar em suas conversas.</string>
     <string name="user_settings_close_button">Botão \"Fechar\"</string>
     <string name="user_settings_confirm_logout">Deseja mesmo sair?</string>
     <string name="user_settings_game_activity">Atividade de jogo</string>
@@ -3517,9 +3361,6 @@ Pressione Shift para enviar diretamente."</string>
     <string name="user_settings_start_minimized_body">O Discord abre em segundo plano sem te incomodar, como um bom garoto</string>
     <string name="user_settings_start_minimized_label">Iniciar minimizado</string>
     <string name="user_settings_startup_behavior">Comportamento durante a inicialização do sistema</string>
-    <string name="user_settings_streamer_notice_body">"Dê vida ao servidor da sua comunidade do Discord com ferramentas que você já está usando para melhorar sua transmissão.
-
-Confira o [Kit de Stream do Discord](%1$s)."</string>
     <string name="user_settings_streamer_notice_title">Procurando integrações?</string>
     <string name="user_settings_unverified_account_body">Dê uma conferida no seu e-mail e siga as instruções para verificar sua conta. Se você não recebeu um e-mail ou se ele já expirou, você pode reenviá-lo.</string>
     <string name="user_settings_voice_add_multiple">Você pode adicionar múltiplos atalhos de Aperte para Falar nas [Configurações de Atalho](onClick).</string>
@@ -3542,8 +3383,6 @@ Saiba que isso torna o seu servidor publicamente disponível para qualquer pesso
     <string name="vanity_url_hint_mobile">seu-url-aqui</string>
     <string name="verfication_expired">O link de verificação de e-mail expirou.</string>
     <string name="verfication_expired_suggestion">Entre no Discord e reenvie o link</string>
-    <string name="verification_body">"Detectamos algo fora do comum.
-Para continuar usando o Discord, **precisamos que você confirme que é um ser humano.**"</string>
     <string name="verification_body_alt">Agora, bora ver se você é humano mesmo…</string>
     <string name="verification_email_body">Enviamos um novo e-mail de verificação para **%1$s**. Verifique sua caixa de entrada e de spam.</string>
     <string name="verification_email_error_body">Houve um erro ao enviar seu e-mail de verificação. Tente novamente mais tarde ou entre em contato com a assistência.</string>
@@ -3584,12 +3423,9 @@ Para continuar usando o Discord, **precisamos que você confirme que é um ser h
     <string name="video">Vídeo</string>
     <string name="video_call">Chamada de vídeo</string>
     <string name="video_connect">Vídeo</string>
-    <string name="video_poor_connection_body">O vídeo foi desativado. Ele será retomado quando sua conexão melhorar.</string>
-    <string name="video_poor_connection_title">Conexão fraca</string>
     <string name="video_preview">Prévia de vídeo</string>
     <string name="video_settings">Configurações de vídeo</string>
     <string name="video_unavailable">Vídeo indisponível</string>
-    <string name="video_unsupported_browser_body">Chamadas de vídeo e compartilhamento de tela são incompatíveis neste navegador. Baixe nosso cliente no computador para transmitir o seu rosto e tela através da rede.</string>
     <string name="video_unsupported_browser_title">Navegador incompatível</string>
     <string name="view_audit_log">Ver o registro de auditoria</string>
     <string name="view_audit_log_description">Membros com esta permissão têm acesso ao registro de auditoria do servidor</string>
@@ -3606,7 +3442,6 @@ Para continuar usando o Discord, **precisamos que você confirme que é um ser h
     <string name="voice_channel_show_names">Mostrar nomes</string>
     <string name="voice_channels">Canais de voz</string>
     <string name="voice_connect">Voz</string>
-    <string name="voice_disconnect_body">Desconectar-se deste canal de voz?</string>
     <string name="voice_disconnect_title">Desconectar voz</string>
     <string name="voice_only">Apenas voz</string>
     <string name="voice_permissions">Permissões de voz</string>
@@ -3644,7 +3479,6 @@ Para continuar usando o Discord, **precisamos que você confirme que é um ser h
     <string name="webhook_modal_icon_title">Ícone do webhook</string>
     <string name="webhook_modal_title">Editar webhook</string>
     <string name="webhook_save">Salvar</string>
-    <string name="welcome_message_desktop_apps">**Baixe** a [versão de computador](onDownloadClick) para um Aperte para Falar independente, baixo uso de internet e CPU e mais.</string>
     <string name="welcome_message_instant_invite">**Convide os seus amigos** para esse servidor clicando no [botão de compartilhar](onShareClick) quando for conveniente.</string>
     <string name="welcome_message_mobile_apps">**Permaneça conectado(a)** ao seu servidor com [seu celular](onDownloadClick) e use o Discord até mesmo enquanto joga em um console.</string>
     <string name="welcome_message_mobile_instant_invite">Convide seus amigos</string>
@@ -3669,7 +3503,6 @@ de dúvidas ou se você precisar de ajuda."</string>
     <string name="xbox_pin_step2">Vá para Configurações do usuário > Conexões > Adicionar</string>
     <string name="xbox_pin_step3">Clique no Xbox e insira o PIN acima</string>
     <string name="yes_text">Sim</string>
-    <string name="your_discord_tag">Sua tag do Discord</string>
     <string name="your_pin_expires">Seu PIN expira em %1$s</string>
     <string name="your_pin_is_expired">Seu PIN expirou</string>
     <string name="youre_viewing_older_messages">Você está visualizando mensagens antigas</string>
diff --git a/com.discord/res/values-ro/plurals.xml b/com.discord/res/values-ro/plurals.xml
index 49183979e6..129fab38df 100644
--- a/com.discord/res/values-ro/plurals.xml
+++ b/com.discord/res/values-ro/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">niciun loc</item>
         <item quantity="one">%d loc</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d zile</item>
-        <item quantity="one">1 zi</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d membri</item>
-        <item quantity="zero">0 membri</item>
-        <item quantity="one">1 membru</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">zile</item>
         <item quantity="one">zi</item>
@@ -212,16 +203,6 @@
         <item quantity="other">unele permisiuni</item>
         <item quantity="one">o permisiune</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">A setat regimul lent la **!!%d!! secunde**</item>
-        <item quantity="zero">A dezactivat regimul lent</item>
-        <item quantity="one">A setat regimul lent la **1 secundă**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">A setat regimul lent la **!!%d!! secunde**</item>
-        <item quantity="zero">A setat regimul lent ca dezactivat</item>
-        <item quantity="one">A setat regimul lent la **1 secundă**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! membri**</item>
         <item quantity="one">**un membru**</item>
@@ -321,10 +302,6 @@
         <item quantity="other">%d mesaje noi</item>
         <item quantity="one">1 mesaj nou</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d zile</item>
-        <item quantity="one">o zi</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d canale</item>
         <item quantity="one">%d canal</item>
@@ -342,10 +319,6 @@
         <item quantity="other">aceste mesaje</item>
         <item quantity="one">acest mesaj</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** servere sunt indisponibile din cauza unei întreruperi temporare.</item>
-        <item quantity="one">**1** server este indisponibil din cauza unei întreruperi temporare.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d luni</item>
         <item quantity="one">1 lună</item>
diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml
index b43e070496..48fa7126cd 100644
--- a/com.discord/res/values-ro/strings.xml
+++ b/com.discord/res/values-ro/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"Nu poți trimite o invitație pentru că, fie ești invizibil(ă), fie ți-ai ascuns statusul de joc. Dacă preferi să nu îți schimbi
 setările, poți să rogi în schimb pe cineva să te invite."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Am înțeles!</string>
-    <string name="activity_panel_go_live_hotspot_header">Transmite în direct ca să faci streaming la gameplay pentru prieteni!</string>
+    <string name="activity_panel_go_live_hotspot_header">Folosește Go Live ca să faci streaming la gameplay pentru prieteni!</string>
     <string name="activity_panel_go_live_tooltip">Transmite în direct</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Acest server nu are canale de voce pentru streaming.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Nu poți face streaming pe acest canal de voce.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Navighează pe un server pentru a face streaming.</string>
     <string name="add">Adaugă</string>
     <string name="add_a_comment_optional">Adaugă un comentariu (Opțional)</string>
@@ -158,7 +156,6 @@ acorzi această permisiune."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Ai înțeles!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Mergi la bibliotecă</string>
     <string name="application_entitlement_code_redemption_invalid">Codul introdus este incorect</string>
-    <string name="application_entitlement_code_redemption_prompt">Ai primit un cod pentru un joc? Introdu-l mai jos:</string>
     <string name="application_entitlement_code_redemption_redeem">Valorifică</string>
     <string name="application_filter_name_linux">Toate fișierele</string>
     <string name="application_filter_name_macos">Aplicații</string>
@@ -390,7 +387,6 @@ acorzi această permisiune."</string>
     <string name="application_store_view_all_news">Vezi toate știrile</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Acest DLC necesită ca tu să deții %1$s pe Discord pentru a putea juca. [Află mai multe despre DLC.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Conţinut ce poate fi descărcat</string>
-    <string name="application_store_warning_early_access_description">Acest joc este distractiv (după părerea noastră!), dar este posibil să aibă un conţinut limitat, diferite erori sau să pară incomplet. [Află mai multe despre accesul timpuriu.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Acces timpuriu</string>
     <string name="application_store_warning_requires_desktop_app_description">Pentru a putea juca acest joc, trebuie să ai instalat Discord $[aplicația desktop](downloadHook).</string>
     <string name="application_store_warning_requires_desktop_app_title">Necesită aplicația desktop</string>
@@ -513,19 +509,13 @@ Ocolirea interzicerilor poate fi făcută foarte dificilă prin activarea verifi
     <string name="billing_error_section_card">Of! Se pare că este o problemă cu acest card. Te rugăm să corectezi câmpurile și apoi să încerci din nou!</string>
     <string name="billing_history">Istoric facturare</string>
     <string name="billing_legal_mumbo_jumbo">Păsărească legală</string>
-    <string name="billing_legal_mumbo_jumbo_label">Sunt de acord cu [Condițiile de Prestare a Serviciilor pentru magazinul Discord](%1$s)</string>
     <string name="billing_no_payment_method">Nicio metodă de plată nu a fost salvată</string>
     <string name="billing_no_payment_method_description">Finalizează mai rapid salvând o metodă de plată</string>
     <string name="billing_pay_for_it_with">Plătește cu</string>
     <string name="billing_payment_breakdown_taxes">Impozite</string>
     <string name="billing_payment_history">Istoric tranzacţii</string>
     <string name="billing_payment_premium">Abonamentul tău</string>
-    <string name="billing_payment_premium_legalese_monthly">Prin achiziționarea unui abonament %1$s, ești de acord cu [Condițiile de Prestare a Serviciilor pentru magazin](%2$s). %1$s este un abonament recurent. Autorizezi Discord să te taxeze imediat folosind metoda de plata disponibilă, la prețul de %3$s și să continue să te taxeze automat lunar până când vei anula abonamentul. Acesta poate fi anulat oricând.</string>
-    <string name="billing_payment_premium_legalese_yearly">Prin achiziționarea unui abonament %1$s, ești de acord cu [Condițiile de Prestare a Serviciilor pentru magazin](%2$s). %1$s este un abonament recurent. Autorizezi Discord să te taxeze imediat folosind metoda de plata disponibilă, la prețul de %3$s și să continue să te taxeze automat anual până când vei anula abonamentul. Acesta poate fi anulat oricând.</string>
     <string name="billing_payment_sources">Metode de plată</string>
-    <string name="billing_payment_table_header_amount">SUMA</string>
-    <string name="billing_payment_table_header_date">DATA</string>
-    <string name="billing_payment_table_header_description">DESCRIERE</string>
     <string name="billing_premium_refund_text">Se poate solicita rambursarea banilor în cazul în care achiziția a fost făcută în ultimele %1$s zile. [Echipa noastră prietenoasă de asistență te va ajuta să-ți primești bănuții înapoi.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Ne pare rău, achiziția nu este eligibilă pentru restituire. Se poate solicita rambursarea banilor în cazul în care achiziția a fost făcută în ultimele %1$s zile.</string>
     <string name="billing_price_per_month">%1$s / lună</string>
@@ -535,9 +525,7 @@ Ocolirea interzicerilor poate fi făcută foarte dificilă prin activarea verifi
     <string name="billing_purchase_details_header">Detalii achiziție</string>
     <string name="billing_refund_header">Ai probleme cu achiziția ta?</string>
     <string name="billing_refund_play_time_never_played">Nu a fost jucat niciodată</string>
-    <string name="billing_refund_play_time_subheader">TIMP DE JOC</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">DATA ACHIZIȚIEI</string>
     <string name="billing_refund_report_a_problem">Raportează o problemă</string>
     <string name="billing_refund_request_button">Solicită restituire</string>
     <string name="billing_sales_tax_added">%1$s a fost adăugată la taxele pe vânzare din cauza adresei tale de facturare.</string>
@@ -776,7 +764,6 @@ textul extra-minuscul de mai jos."</string>
     <string name="connection_enter_code">Introdu codul așa cum apare pe ecranul tău</string>
     <string name="connection_invalid_pin">Codul PIN introdus este incorect</string>
     <string name="connection_login_with">sau conectează-te cu</string>
-    <string name="connection_problems_body">Verifică [stare server](%1$s) sau trimite un tweet la adresa [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">În curs de autentificare</string>
     <string name="connection_status_awaiting_endpoint">Se așteaptă endpoint</string>
     <string name="connection_status_connected">Conectat</string>
@@ -821,7 +808,7 @@ textul extra-minuscul de mai jos."</string>
     <string name="create_category">Creează o categorie</string>
     <string name="create_channel">Creează canal</string>
     <string name="create_group_dm">Creează un grup de mesaje directe</string>
-    <string name="create_instant_invite">Creează o invitație instantă</string>
+    <string name="create_instant_invite">Creează invitație</string>
     <string name="create_link">Creează un link</string>
     <string name="create_or_join_modal_header">Oh, un alt server, nu-i așa?</string>
     <string name="create_server_button_body">Creează un server nou și invită-ți prietenii. Este gratuit!</string>
@@ -936,7 +923,6 @@ textul extra-minuscul de mai jos."</string>
     <string name="disable_email_notifications_failed_suggestion">Notificările prin e-mail ar putea fi deja dezactivate sau această adresă de e-mail ar putea să nu mai fie asociată cu un cont Discord.</string>
     <string name="disable_integration_title">Dezactivează sincronizarea</string>
     <string name="disable_integration_twitch_body">Dezactivarea sincronizării va executa comportamentul abonatului expirat care a fost selectat ca și cum toți abonații ar fi expirat.</string>
-    <string name="disable_integration_youtube_body">Dezactivarea sincronizării va executa comportamentul sponsorului expirat care a fost selectat ca și cum toți sponsorii ar fi expirat.</string>
     <string name="disable_notifications_description">Toate notificările desktop vor fi dezactivate.</string>
     <string name="disable_notifications_label">Dezactivează notificările</string>
     <string name="disable_sounds_description">Toate efectele sonore vor fi dezactivate.</string>
@@ -953,7 +939,6 @@ textul extra-minuscul de mai jos."</string>
     <string name="discord_desc_short">Chat prin voce și text în echipă</string>
     <string name="discord_rich_presence">Rich Presence de la Discord</string>
     <string name="dismiss">Ignoră</string>
-    <string name="dispatch_error_modal_body">Ceva nu a funcționat corect. Dacă problema persistă, creează un tichet de asistenţă și copiază conținutul mesajului mai jos.</string>
     <string name="dispatch_error_modal_error_label">Mesaj de eroare (Copiază-mă și lipește-mă)</string>
     <string name="dispatch_error_modal_header">Eroare Discord Dispatch</string>
     <string name="dispatch_error_modal_open_ticket">Deschide un tichet</string>
@@ -1083,8 +1068,6 @@ pauza AFK. Acest lucru nu afectează browser-ele."</string>
     <string name="form_help_attenuation">"Scade volumul altor aplicații cu acest procentaj atunci când cineva vorbește.
 Setează la 0%% pentru a dezactiva complet atenuarea."</string>
     <string name="form_help_automatic_vad">Dacă indicatorul este verde solid, atunci Discord transmite vocea ta superbă.</string>
-    <string name="form_help_bitrate">"**TOȚI BIȚII!** Depășirea ratei de %1$skbps nu este recomandată dacă nu ești un audiofil, deoarece va afecta
-negativ persoanele care folosesc dispozitive mobile sau care au conexiuni slabe fără vreun beneficiu notabil."</string>
     <string name="form_help_certified_voice_processing">"În timpul folosirii unui microfon Discord certificat, anumite funcții de procesare vocală nu mai sunt mânuite de Discord,
 ci mai degrabă de microfon."</string>
     <string name="form_help_channel_permissions">Selectarea rolurilor va configura automat permisiunile de bază pentru acest canal.</string>
@@ -1097,11 +1080,6 @@ ca să eviți [această nebunie](%1$s).**"</string>
 pentru fiecare mesaj trimis pe acest server. Recomandăm cu insistență să setezi aceasta la doar @mentions în cazul în care folosești un server Discord public"</string>
     <string name="form_help_explicit_content_filter">"Scanează și șterge automat mesajele trimise pe acest server care includ conținut explicit. Te rugăm să alegi în ce măsură 
 va fi aplicat filtrul asupra membrilor de pe server-ul tău. **Recomandăm setarea unui filtru pentru un server Discord public.**"</string>
-    <string name="form_help_instant_invite_channel">"Dacă un canal este selectat, atunci un link cu o invitație instantă va fi generat cu ajutorul widget-ului;
-altfel, doar membrii online și canalele de voce vor fi furnizate."</string>
-    <string name="form_help_last_seen">"Prin eliminare, vor fi excluși: **%1$s** care nu au
-fost văzuți în decurs de **%2$s** și nu au niciun rol.
-Ei pot să reintre în server folosind o invitație instantă nouă."</string>
     <string name="form_help_legacy_subsystem">"Anumite drivere ale hardware-ului audio manifestă probleme atunci când se utilizează subsistemul audio modern al sistemului tău de operare.
 Bifează această căsuță pentru a reveni la un subsistem audio vechi."</string>
     <string name="form_help_nsfw">"Utilizatorii trebuie să confirme că au vârsta legală pentru a vedea conținutul acestui canal. 
@@ -1111,7 +1089,6 @@ utilizatorii site-ului tău, atunci poți adăuga în mod dinamic &amp;username=
     <string name="form_help_qos">"Sugerează router-ului tău că pachetele transmise de Discord au prioritate ridicată.
 Unele router-e sau unii furnizori de servicii de internet pot reacționa anormal atunci când această setare este activată."</string>
     <string name="form_help_slowmode">Membrii vor fi restricţionaţi neputând trimite decât un singur mesaj în acest interval, cu excepţia cazului în care dispun de permisiuni „Gestionează canalul” sau „Gestionează mesajele”.</string>
-    <string name="form_help_system_channel">Trimite un mesaj către acest canal de fiecare dată când cineva se alătură server-ului. Această comandă poate fi dezactivată oricând.</string>
     <string name="form_help_temporary">Membrii sunt dați afară automat când se deconectează, cu excepția cazului în care li s-a atribuit un rol.</string>
     <string name="form_help_user_limit">"Limitează numărul de utilizatori care se pot conecta la acest canal de voce. Utilizatorii cu permisiunea **Mută membri** 
 ignoră această limită și pot muta alți utilizatori pe canal."</string>
@@ -1155,8 +1132,8 @@ mesaje directe. Dacă un membru are un rol atribuit, atunci aceasta nu se aplic
     <string name="form_label_input_mode">Mod de intrare</string>
     <string name="form_label_input_sensitivty">Sensibilitatea de intrare</string>
     <string name="form_label_input_volume">Volum de intrare</string>
-    <string name="form_label_instant_invite">Introdu o invitație instantă</string>
-    <string name="form_label_instant_invite_channel">Canalul pentru invitația instantă</string>
+    <string name="form_label_instant_invite">Introdu o invitație</string>
+    <string name="form_label_instant_invite_channel">Invită canalul</string>
     <string name="form_label_json_api">API JSON</string>
     <string name="form_label_last_seen">Văzut ultima dată</string>
     <string name="form_label_local_mute">Amuțește la nivel local</string>
@@ -1226,7 +1203,6 @@ mesaje directe. Dacă un membru are un rol atribuit, atunci aceasta nu se aplic
     <string name="form_label_suppress_everyone">Dezactivează **@everyone** și **@here**</string>
     <string name="form_label_synced_role">Rol sincronizat</string>
     <string name="form_label_synced_subs">Abonați sincronizați</string>
-    <string name="form_label_system_channel">Canal pentru mesaje de la membri noi</string>
     <string name="form_label_temporary">Membru temporar</string>
     <string name="form_label_tts">Text-în-vorbire</string>
     <string name="form_label_tts_notifications">Notificări Text-to-Speech</string>
@@ -1287,7 +1263,6 @@ pentru a putea observa sensibilitatea de intrare."</string>
     <string name="game_action_button_game_not_detected">Jocul nu a fost detectat</string>
     <string name="game_action_button_install">Instalează</string>
     <string name="game_action_button_locate">Localizează</string>
-    <string name="game_action_button_login_to_buy">Autentifică-te pentru a cumpăra</string>
     <string name="game_action_button_now_playing">Se joacă acum</string>
     <string name="game_action_button_paused">În pauză</string>
     <string name="game_action_button_play">Joacă</string>
@@ -1326,7 +1301,6 @@ pentru a putea observa sensibilitatea de intrare."</string>
     <string name="game_feed_activity_recently_played">Jucat recent</string>
     <string name="game_feed_activity_streaming_twitch">Transmite live pe Twitch</string>
     <string name="game_feed_current_header_title">Se joacă acum</string>
-    <string name="game_feed_settings_visibility">Arată în fila de jocuri</string>
     <string name="game_feed_unknown_player">Jucător neidentificat</string>
     <string name="game_feed_user_played_days_ago">S-a jucat acum %1$s %2$s</string>
     <string name="game_feed_user_played_hours_ago">S-a jucat acum %1$s %2$s</string>
@@ -1395,6 +1369,7 @@ pentru a putea observa sensibilitatea de intrare."</string>
     <string name="generate_a_new_link">Generează un link nou</string>
     <string name="get_started">Să începem</string>
     <string name="gif_auto_play_label">Pornește automat GIF-urile atunci când Discord este evidențiat.</string>
+    <string name="go_live_hardware_acceleration_unavailable">Avertizare rapidă - nu reușim să detectăm accelerarea hardware. Este posibil ca computerul tău să aibă probleme cu Go Live.</string>
     <string name="go_live_hey">Salut!</string>
     <string name="go_live_listen">Ascultă!</string>
     <string name="go_live_look">Privește!</string>
@@ -1408,6 +1383,7 @@ pentru a putea observa sensibilitatea de intrare."</string>
     <string name="go_live_modal_select_channel_form_title">Selectează un canal de voce</string>
     <string name="go_live_modal_select_channel_placeholder">Caută canale de voce</string>
     <string name="go_live_modal_title">Transmite în direct</string>
+    <string name="go_live_video_drivers_outdated">Driverele video nu sunt la zi. Pentru o performanță mai bună a funcției Go Live, actualizează-le.</string>
     <string name="grant_temporary_membership">Acordă temporar calitatea de membru</string>
     <string name="group">Grup</string>
     <string name="group_dm_add_friends">Adaugă prieteni în conversația prin mesaje directe</string>
@@ -1484,8 +1460,6 @@ pentru a putea observa sensibilitatea de intrare."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">I-a **acordat** %1$s lui **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">A mutat de la **%1$s** la **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">În poziția **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) a creat canalul de text $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">A schimbat subiectul în **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">A setat subiectul ca **%1$s**</string>
@@ -1580,6 +1554,8 @@ pentru a putea observa sensibilitatea de intrare."</string>
     <string name="guild_settings_filter_all_actions">Toate acțiunile</string>
     <string name="guild_settings_filter_all_users">Toți utilizatorii</string>
     <string name="guild_settings_filter_user">Filtrează după utilizator</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">Stream-uri Go Live la 720p 60fps</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">Stream-uri Go Live la 1080p 60fps</string>
     <string name="guild_settings_label_audit_log">Jurnalul server-ului</string>
     <string name="guild_settings_label_audit_log_empty_body">Odată ce moderatorii încep moderarea, poți să moderezi moderarea aici.</string>
     <string name="guild_settings_label_audit_log_empty_title">Nicio intrare încă</string>
@@ -1611,7 +1587,7 @@ Dacă ai acces la utilizatorii site-ului tău, atunci poți adăuga în mod dina
     <string name="help_role_locked_mine">Rolul este blocat pentru că este rolul tău cel mai înalt. Te rugăm să întrebi pe cineva cu rang mai înalt sau pe Proprietarul server-ului pentru ajutor.</string>
     <string name="help_singular_permission">Nu poți modifica această permisiune deoarece ștergerea acesteia o va șterge și pentru tine.</string>
     <string name="hide_instant_invites_description">Recomandat dacă nu vrei ca oricine să intre pe serverele tale Discord.</string>
-    <string name="hide_instant_invites_label">Ascunde link-urile cu invitații instante</string>
+    <string name="hide_instant_invites_label">Ascunde link-urile de invitație</string>
     <string name="hide_muted">Ascunde %1$s amuțite</string>
     <string name="hide_muted_channels">Ascunde canale amuțite</string>
     <string name="hide_personal_information_description">Ascunde e-mail-ul, conturile conectate și face ca EticheteleDiscord să devină anonime.</string>
@@ -1764,14 +1740,14 @@ Dacă ai acces la utilizatorii site-ului tău, atunci poți adăuga în mod dina
     <string name="input_mode_ptt_release_delay">Întârzierea eliberării tastei Push to Talk</string>
     <string name="input_mode_vad">Activitate Vocală</string>
     <string name="install_location_main">Principală (implicită)</string>
-    <string name="instant_invite">Invitație instantă</string>
+    <string name="instant_invite">Invită</string>
     <string name="instant_invite_accept">Acceptă Invitația</string>
-    <string name="instant_invite_accepted">Invitația instantă a fost acceptată</string>
-    <string name="instant_invite_accepting">Se acceptă invitația instantă</string>
+    <string name="instant_invite_accepted">A acceptat invitația</string>
+    <string name="instant_invite_accepting">Se acceptă invitația</string>
     <string name="instant_invite_ask_for_new_invite">Cere una nouă!</string>
     <string name="instant_invite_ask_user_for_new_invite">Cere-i o invitație nouă lui %1$s!</string>
     <string name="instant_invite_code">Cod</string>
-    <string name="instant_invite_expired">Invitația instantă este nevalidă sau a expirat.</string>
+    <string name="instant_invite_expired">Invitația este nevalidă sau a expirat.</string>
     <string name="instant_invite_expires">Expiră</string>
     <string name="instant_invite_failed_to_generate">Nu s-a putut crea un link de invitație.</string>
     <string name="instant_invite_generate">Generează</string>
@@ -1788,16 +1764,15 @@ Dacă ai acces la utilizatorii site-ului tău, atunci poți adăuga în mod dina
     <string name="instant_invite_regenerate">Regenerează</string>
     <string name="instant_invite_resolved_body">Ai fost invitat pe **%1$s** în **%2$s**.</string>
     <string name="instant_invite_resolved_title">Salutare.</string>
-    <string name="instant_invite_resolving">Se rezolvă invitația instantă</string>
+    <string name="instant_invite_resolving">Se rezolvă invitația</string>
     <string name="instant_invite_uses">Utilizări</string>
     <string name="instant_invite_you_are_already_a_member_of">Ești deja membru al</string>
     <string name="instant_invite_you_have_been_invited_to_join">Ai fost invitat să te alături</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** te-a invitat să te alături</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Ai fost invitat să te alături unui grup de mesaje directe de către</string>
-    <string name="instant_invites">Invitații instante</string>
+    <string name="instant_invites">Invitații</string>
     <string name="integration_settings">Setări de integrare</string>
     <string name="integrations">Integrări</string>
-    <string name="integrations_header">Conturi Twitch/YouTube Gaming conectate</string>
     <string name="integrations_pro_tip">Pentru mai multe integrări vezi [StreamKit-ul Discord](%1$s).</string>
     <string name="internal_server_error">Server-ul a întâmpinat o eroare internă; te rugăm să încerci din nou.</string>
     <string name="invalid_animated_emoji_body">Acest emoji nu funcționează pentru că este animat. Treci la Discord Nitro ca visele tale cu emoji-uri animate să devină realitate</string>
@@ -1910,13 +1885,13 @@ Vrei să știi mai multe despre Discord?"</string>
     <string name="join_afk_channel_body">Se pare că ai intrat pe canalul AFK. Nu poți vorbi pe acest canal.</string>
     <string name="join_call">Alătură-te apelului</string>
     <string name="join_server">Alătură-te</string>
-    <string name="join_server_button_body">Introdu o invitație instantă și alătură-te server-ului prietenului tău.</string>
+    <string name="join_server_button_body">Introdu o invitație și alătură-te server-ului prietenului tău.</string>
     <string name="join_server_button_cta">Alătură-te unui server</string>
     <string name="join_server_button_cta_mobile">Alătură-te unui server cu un link de invitație</string>
     <string name="join_server_button_cta_mobile_desc">Ai un cod sau link de invitație? Pune-l aici!</string>
     <string name="join_server_button_cta_named">Alătură-te server-ului %1$s</string>
-    <string name="join_server_description">Introdu o invitație instantă mai jos pentru a te alătura unui server existent. Invitația va arăta astfel:</string>
-    <string name="join_server_description_mobile">Introdu o invitație instantă mai sus pentru a te alătura unui server existent.</string>
+    <string name="join_server_description">Introdu o invitație mai jos pentru a te alătura unui server existent. Invitația va arăta astfel:</string>
+    <string name="join_server_description_mobile">Introdu o invitație mai sus pentru a te alătura unui server existent.</string>
     <string name="join_server_title">Alătură-te unui server</string>
     <string name="join_stream">Alătură-te stream-ului</string>
     <string name="join_video_call">Alătură-te apelului video</string>
@@ -2021,9 +1996,8 @@ atunci când vorbești tu."</string>
     <string name="link_your_discord_account">Asociază-ți contul Discord</string>
     <string name="link_your_xbox_account_1">Conectează-ți contul Xbox cu Discord pentru a arăta ce jocuri joci.</string>
     <string name="link_your_xbox_account_2">Discord este o aplicație de chat voce, text și video pentru gameri; este gratuită, securizată și funcționează pe desktop și mobil.</string>
-    <string name="listening_to">Ascultă pe **%1$s**\"</string>
     <string name="live">În direct</string>
-    <string name="live_beta_description">Bine ai venit pe stream! Funcția Transmite în direct este în beta. Scuze dacă dai de erori</string>
+    <string name="live_beta_description">Bine ai venit pe stream! Funcția Go Live este în beta. Scuze dacă dai de erori</string>
     <string name="live_on_twitch">Live pe Twitch</string>
     <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Încărcarea imaginii a eșuat.
@@ -2209,14 +2183,11 @@ Politica de confidențialitate și Condițiile de prestare a serviciilor actuali
     <string name="no_emoji_title">Niciun emoji</string>
     <string name="no_input_devices">Niciun dispozitiv de intrare</string>
     <string name="no_input_devices_detected">Niciun dispozitiv de intrare nu a putut fi detectat; te rugăm să inserezi unul și să încerci din nou.</string>
-    <string name="no_instant_invite">Nicio invitație instantă</string>
-    <string name="no_integrations">[Conectează-ți](onConnect) contul de parteneriat Twitch sau YouTube Gaming pentru a-ți sincroniza abonații/sponsorii cu un rol</string>
+    <string name="no_instant_invite">Nicio invitație</string>
     <string name="no_integrations_body">Protocolul PR13T3N13 se poate executa numai din clientul Discord</string>
     <string name="no_integrations_label">Nicio integrare</string>
-    <string name="no_invites_body">"Te simți fără rost? Ca un avion de hârtie plutind prin aer?
-Invită-ți niște prieteni aici creând un link cu o invitație instantă!"</string>
-    <string name="no_invites_caption">Nicio invitație instantă încă!</string>
-    <string name="no_invites_label">Încă nicio invitație instantă</string>
+    <string name="no_invites_caption">Încă nicio invitație!</string>
+    <string name="no_invites_label">Încă nicio invitație</string>
     <string name="no_mail_account_description">Te rog trimite feedback-ul tău la support@discordapp.com și am copiat informațiile tale de utilizator în clipboard.</string>
     <string name="no_mail_account_title">Niciun cont e-mail</string>
     <string name="no_mic_body">Instrucțiunile pentru permiterea accesului la microfon pot fi găsite în Centrul de asistență Discord.</string>
@@ -2234,7 +2205,6 @@ niciun mesaj fixat.. încă."</string>
     <string name="no_reactions_header">Nicio reacție</string>
     <string name="no_recent_mentions">Și la Început… era liniște.</string>
     <string name="no_send_messages_permission_placeholder">Nu ai permisiunea de a trimite mesaje pe acest canal.</string>
-    <string name="no_system_channel">Niciun mesaj de la membri noi</string>
     <string name="no_text">Nu</string>
     <string name="no_thanks">Nu, mulțumesc</string>
     <string name="no_user_limit">Nicio limită</string>
@@ -2246,7 +2216,6 @@ niciun mesaj fixat.. încă."</string>
     <string name="note">Notiță</string>
     <string name="note_placeholder">Dă click pentru a adăuga o notiță</string>
     <string name="note_placeholder_mobile">Atinge pentru a adăuga o notiță</string>
-    <string name="notice_application_test_mode">Modul de testare este în prezent activ pentru **%1$s**. SKU-urile nepublicate vor fi afișate, iar tu nu vei fi taxat pentru nicio plată asociată acestora.</string>
     <string name="notice_application_test_mode_go_to_listing">Mergi la SKU</string>
     <string name="notice_connect_spotify">Conectează-ți contul de Spotify dacă vrei ca melodiile pe care le asculți să fie afișate în status-ul tău!</string>
     <string name="notice_connection_conflict">Vocea ta a fost deconectată deoarece te-ai conectat dintr-o locație diferită.</string>
@@ -2257,7 +2226,6 @@ niciun mesaj fixat.. încă."</string>
     <string name="notice_dispatch_error_disk_low">Nu ai suficient spaţiu pe disc. Ai nevoie de %1$s dar numai %2$s sunt disponibili.</string>
     <string name="notice_dispatch_error_file_name_too_long">Of, nu, acest joc conține nume de fișiere prea lungi pentru Windows. Selectează un registru de instalare mai scurt.</string>
     <string name="notice_dispatch_error_invalid_drive">Of, nu, locaţia de instalare aleasă de tine nu este validă. Ai ales %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Nu am reușit să actualizăm jocul. Acesta este în curs de rulare?</string>
     <string name="notice_dispatch_error_no_manifests">Of, nu, se pare că nu există niciun conţinut pentru acest joc. Contactează echipa de asistenţă.</string>
     <string name="notice_dispatch_error_not_entitled">Of, nu, se pare că nu deții acest joc. Contactează echipa de asistenţă dacă crezi că s-a produs o eroare.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Se pare că ai ales să spui nu unui script de instalare. Trebuie să spui da pentru ca jocul să poată fi instalat.</string>
@@ -2272,9 +2240,6 @@ niciun mesaj fixat.. încă."</string>
     <string name="notice_native_apps">Ai nevoie de opțiunea Push to Talk global? Descarcă aplicația pentru desktop!</string>
     <string name="notice_no_input_detected">Ei bine, se pare că Discord nu detectează niciun sunet de la microfonul tău. Hai să reparăm asta… împreună.</string>
     <string name="notice_no_input_detected_help_link_text">Ajutor!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Accesul tău la Nitro a expirat. Fă upgrade de la Nitro Classic la Nitro pentru a avea acces nelimitat la jocuri extraordinare.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Mai ai doar %1$s rămasă(e) de jocuri Nitro! Accesul tău se încheie pe **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Îți mulțumim pentru că ești unul dintre susținătorii timpurii ai programului Nitro! Fiindcă ești foarte tare, îți facem cadou dreptul de acces la jocurile Nitro până pe %1$s.</string>
     <string name="notice_premium_promo_action">Încearcă-l</string>
     <string name="notice_premium_promo_message">Susține dezvoltarea Discord și primește avantaje șmechere!</string>
     <string name="notice_scheduled_maintenance">Discord va fi supus întreținerii programate pe **%1$s** la **%2$s**.</string>
@@ -2344,7 +2309,6 @@ Ai primit link-ul de invitație de la un prieten? Introdu codul sau link-ul mai
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Overlay activat</string>
     <string name="nux_post_reg_join_server_description">Bucură-te la maximum de Discord alăturându-te unui server.</string>
     <string name="nux_post_reg_join_server_skip">Nu am unul</string>
     <string name="nux_post_reg_join_server_title">Ai o invitație?</string>
@@ -2389,7 +2353,6 @@ De asemenea, overlay-ul s-ar putea să nu funcționeze pentru toată lumea. Dac
     <string name="overlay_menu_get_invite">Primește link de invitație</string>
     <string name="overlay_menu_open_discord">Deschide Discord</string>
     <string name="overlay_menu_switch_channels">Schimbă canalul</string>
-    <string name="overlay_mobile_toggle_desc">Când ești conectat/ă la funcția vocală, vezi cine vorbește și ai acces la comenzi rapide atunci când folosești alte aplicații</string>
     <string name="overlay_mobile_toggle_label">Activează Overlay vocal pe dispozitivele mobile</string>
     <string name="overlay_mobile_unauthed">Autentifică-te în aplicația Discord pentru a activa această funcție.</string>
     <string name="overlay_news_go_live_body">Vrei să faci streaming la %1$s prietenilor tăi pe %2$s?</string>
@@ -2397,7 +2360,6 @@ De asemenea, overlay-ul s-ar putea să nu funcționeze pentru toată lumea. Dac
     <string name="overlay_news_text_pinning_body">Acum poți asocia un chat prin mesaje text la jocul tău!</string>
     <string name="overlay_news_text_pinning_tip">Sfat: poți asocia un chat apăsând $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Overlay Discord cu upgrade făcut</string>
-    <string name="overlay_no_results">Am căutat în lung și în lat. Din păcate, nu am găsit niciun canal de voce</string>
     <string name="overlay_notification_incoming_call">Apel în intrare…</string>
     <string name="overlay_notification_settings_disabled">Notificări dezactivate</string>
     <string name="overlay_notification_settings_position">Se afișează: %1$s</string>
@@ -2407,7 +2369,6 @@ De asemenea, overlay-ul s-ar putea să nu funcționeze pentru toată lumea. Dac
     <string name="overlay_notifications_settings">Notificări overlay</string>
     <string name="overlay_notifications_top_left">Stânga sus</string>
     <string name="overlay_notifications_top_right">Dreapta sus</string>
-    <string name="overlay_private_channels_empty_state">Nup, niciun mesaj direct aici.</string>
     <string name="overlay_reload">Reîncarcă overlay</string>
     <string name="overlay_settings">Setări overlay</string>
     <string name="overlay_settings_general_tab">Informații generale</string>
@@ -2429,7 +2390,6 @@ De asemenea, overlay-ul s-ar putea să nu funcționeze pentru toată lumea. Dac
     <string name="pagination_page_of">Pagina %1$s din %2$s</string>
     <string name="pagination_previous">Anterior</string>
     <string name="paginator_of_pages">Pagina %1$s din %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Partener Discord</string>
     <string name="party_full">Grup plin</string>
     <string name="party_join">Alătură-te grupului</string>
@@ -2453,7 +2413,7 @@ De asemenea, overlay-ul s-ar putea să nu funcționeze pentru toată lumea. Dac
     <string name="payment_modal_title_new_yearly">%1$s%2$s %3$s pe an</string>
     <string name="payment_source_billing_address">Adresă de facturare</string>
     <string name="payment_source_card_ending">%1$s care se termină în **%2$s**</string>
-    <string name="payment_source_card_ending_in">Cardul expiră la data de %1$s</string>
+    <string name="payment_source_card_ending_in">Cardul se termină în %1$s</string>
     <string name="payment_source_card_expires">Expiră în %1$s %2$s</string>
     <string name="payment_source_card_number">Numărul cardului</string>
     <string name="payment_source_confirm_paypal_details">Confirmă detaliile PayPal în browser-ul tău!</string>
@@ -2522,18 +2482,11 @@ De asemenea, overlay-ul s-ar putea să nu funcționeze pentru toată lumea. Dac
     <string name="popout_stay_on_top">Păstrează deasupra</string>
     <string name="post_code">Cod poștal</string>
     <string name="premium_alert_error_title">Ups, ceva nu a mers bine…</string>
-    <string name="premium_applications_grandfathered_monthly">În semn de mulțumire pentru că susții Discord, ai acces la jocurile Nitro timp de un an. Accesul tău expiră la **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">În semn de mulțumire pentru că susții Discord, ai acces la jocurile Nitro timp de doi ani. Accesul tău expiră la **%1$s**.</string>
-    <string name="premium_applications_subtitle">Acces nelimitat la o bibliotecă în creștere de jocuri foarte apreciate de cunoscători pe care credem că ar trebui să le joci cu prietenii tăi.</string>
-    <string name="premium_applications_title">Zeci de jocuri calitative. Un singur tarif lunar redus.</string>
     <string name="premium_badge_tooltip">Abonat de la %1$s</string>
     <string name="premium_cancel_cancel">Nup</string>
     <string name="premium_cancel_confirm_body_tier_1">"Anularea va intra în vigoare la sfârșitul perioadei curente de facturare pe **%1$s**. Dacă ai schimbat-o, Eticheta ta Discord va fi randomizată.
 
 Te poți reabona oricând."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Anularea va intra în vigoare la sfârșitul perioadei curente de facturare. Pe **%1$s**, vei pierde dreptul de acces la toate jocurile Nitro din biblioteca ta și Eticheta ta Discord va fi randomizată dacă ai schimbat-o.
-
-Îți vom păstra fișierele salvate în siguranță în cazul în care te răzgândești. Te poți reabona oricând!"</string>
     <string name="premium_cancel_confirm_new">Dap, anulează %1$s</string>
     <string name="premium_cancel_confirm_title">Anulează %1$s?</string>
     <string name="premium_cancel_failed_body">Nu am putut să îți anulăm abonamentul Nitro. Încearcă din nou sau lasă un mesaj echipei de asistență dacă problema persistă.</string>
@@ -2550,19 +2503,16 @@ Te poți reabona oricând."</string>
     <string name="premium_chat_perks_description_custom_emoji">Obține un pașaport universal pentru a-ți utiliza oriunde emoji-urile personalizate.</string>
     <string name="premium_chat_perks_description_discriminator">Alege-ți eticheta pe perioada în care ai abonament.</string>
     <string name="premium_chat_perks_description_screenshare">Îmbunătățește-ți partajarea ecranului cu 720p - 60fps sau 1080p - 30fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Încărcare fișiere de mari dimensiuni pentru %1$s de la %2$s pentru a partaja meme de înaltă calitate.</string>
+    <string name="premium_chat_perks_streaming_mobile">Stream-uri Go Live mai bune: Fă streaming la sursă cu Nitro sau obține o imagine clară la 1080p 60fps cu Nitro Classic</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Distracție animată</string>
     <string name="premium_chat_perks_title_badge">Arată cât de mult susții Discord</string>
     <string name="premium_chat_perks_title_custom_emoji">Emoji-uri globale personalizate</string>
     <string name="premium_chat_perks_title_discriminator">Etichetă Discord personalizată</string>
     <string name="premium_chat_perks_title_screenshare">Materiale video de calitate mai bună</string>
+    <string name="premium_chat_perks_title_streaming">Stream-uri Go Live mai bune</string>
     <string name="premium_code_redemption_confirmation_blurb">Mulțumită unui șir aleatoriu de cifre, beneficiezi acum de avantaje îmbunătăţite pentru chat timp de %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">Vai, ce drăguț!</string>
-    <string name="premium_feature_new_chat_perks_header">Vei obține, de asemenea, și câteva avantaje sporite pentru chat:</string>
-    <string name="premium_feature_new_premium_applications_header">Jocuri în valoare de peste %1$s. Aruncă o privire:</string>
-    <string name="premium_feature_view_applications">Vezi toate jocurile Nitro</string>
     <string name="premium_features_chat_perks">Avantaje chat</string>
-    <string name="premium_features_premium_applications">Jocuri gratuite</string>
     <string name="premium_grandfathered_warning">În semn de mulțumire pentru că ne susții, beneficiezi de un plan Nitro cu reducere. **În cazul în care anulezi sau schimbi planul, vei pierde această reducere.** Ai fost avertizat(ă)!!!!!</string>
     <string name="premium_grandfathered_warning_confirm">Fă-o oricum</string>
     <string name="premium_grandfathered_warning_title">Fii atent, amice</string>
@@ -2572,10 +2522,7 @@ Te poți reabona oricând."</string>
     <string name="premium_not_claimed">Înregistrează-ți contul mai întâi</string>
     <string name="premium_not_claimed_body">Salutare, prietene! Dacă vrei să cumperi Nitro, va trebui mai întâi să-ți revendici contul ca să nu îți pierzi chestiile.</string>
     <string name="premium_not_verified">Mai întâi verifică-ți e-mailul</string>
-    <string name="premium_not_verified_body">Salutare, prietene! Dacă vrei să cumperi Nitro, va trebui să îți verifici mai întâi e-mail-ul. Verifică-ți e-mail-ul sau solicită unul nou.</string>
-    <string name="premium_payment_applications_os_warning">Jocurile Nitro sunt suportate numai de Windows.</string>
     <string name="premium_payment_confirmation_blurb_regular">Acum te bucuri de puterea avantajelor îmbunătăţite pentru chat. Nu mai citi chestia asta, du-te și stai pe chat!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Acum ai acces nelimitat la foarte multe jocuri extraordinare. Nu mai citi chestia asta, începe a juca chiar acum!!!</string>
     <string name="premium_payment_confirmation_button_regular">OK, sună bine</string>
     <string name="premium_plan_month">Nitro lunar</string>
     <string name="premium_plan_month_tier_1">Nitro Classic lunar</string>
@@ -2596,13 +2543,10 @@ Te poți reabona oricând."</string>
     <string name="premium_upgrade_disabled_current_tooltip">Planul tău actual.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Trebuie mai întâi să anulezi și să aștepți până îți expiră abonamentul înainte de a alege un plan de nivel inferior.</string>
     <string name="premium_upgrade_done_body_tier_1">Acum beneficiezi de avantaje îmbunătăţite pentru chat!</string>
-    <string name="premium_upgrade_done_body_tier_2">Acum beneficiezi de avantaje îmbunătăţite pentru chat și de acces la zeci de jocuri.</string>
     <string name="premium_upgrade_done_button_tier_1">Ce drăguț!</string>
-    <string name="premium_upgrade_done_button_tier_2">Verifică toate jocurile Nitro</string>
     <string name="premium_upgrade_failed_body">Uhh.. nu s-a putut face upgrade-ul. Asigură-te că informațiile de plată sunt la zi și încearcă din nou.</string>
     <string name="premium_upload_promo">Fă upgrade la Discord Nitro pentru o limită de upload fișiere de %1$s</string>
     <string name="premium_year_free_months">Obține 2 luni gratuite!</string>
-    <string name="premium_year_free_months_short">2 luni gratuite</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s ** / an</string>
     <string name="preview_chat">Previzualizează chat</string>
     <string name="priority_speaker">Vorbitor prioritar</string>
@@ -2787,7 +2731,7 @@ Dacă ping-ul nu este consistent sau este mai mare decât %5$s ms, îți recoman
     <string name="scope_guilds">Să știe pe ce servere te afli</string>
     <string name="scope_guilds_empty">Nu ești pe niciun server.</string>
     <string name="scope_guilds_join">Să se alăture serverelor pentru tine</string>
-    <string name="scope_guilds_join_description">Să folosească invitații instante în numele tău.</string>
+    <string name="scope_guilds_join_description">Să folosească invitații în numele tău.</string>
     <string name="scope_identify">Să-ți acceseze numele de utilizator şi avatar-ul</string>
     <string name="scope_messages_read">Să citească toate mesajele</string>
     <string name="scope_messages_read_description">Aceasta permite aplicației să citească toate mesajele accesibile prin intermediul contului tău Discord</string>
@@ -2855,7 +2799,6 @@ Alege ecranul pe care vrei să-l partajezi."</string>
     <string name="search_filter_on">pe</string>
     <string name="search_for_emoji">Găsește emoji-ul perfect</string>
     <string name="search_for_empty">Caută</string>
-    <string name="search_for_value">Caută: **%1$s**</string>
     <string name="search_group_header_channels">Pe canal</string>
     <string name="search_group_header_dates">Date</string>
     <string name="search_group_header_file_name">Numele fișierului conține</string>
@@ -3057,8 +3000,6 @@ Ești sigur că vrei să continui?"</string>
     <string name="stop_ringing">Anulează apelul</string>
     <string name="stop_streaming">Încheie streaming-ul</string>
     <string name="stop_watching">Nu mai urmări</string>
-    <string name="store_payment_legalese_monthly">Salutare! Prin achiziționarea %1$s, ești de acord cu [Condițiile de Prestare a Serviciilor pentru magazin](%2$s). %1$s este un abonament recurent, ceea ce înseamnă că te vom taxa astăzi și vom continua să te taxăm lunar, până când vei anula abonamentul. Poți face acest lucru oricând accesând fereastra ta Setări utilizator.</string>
-    <string name="store_payment_legalese_yearly">Salutare! Prin achiziționarea %1$s, ești de acord cu [Condițiile de Prestare a Serviciilor pentru magazin](%2$s). %1$s este un abonament recurent, ceea ce înseamnă că te vom taxa astăzi și vom continua să te taxăm anual, până când vei anula abonamentul. Poți face acest lucru oricând accesând fereastra ta Setări utilizator.</string>
     <string name="stream">Transmite în direct</string>
     <string name="stream_bad_spectator">Stream-ul pe care îl urmărești în prezent are o calitate video sau audio redusă. Acest lucru se poate datora condițiilor de rețea.</string>
     <string name="stream_bad_streamer">În prezent, stream-ul tău are o calitate video sau audio redusă. Acest lucru se poate datora condițiilor de rețea.</string>
@@ -3066,7 +3007,6 @@ Ești sigur că vrei să continui?"</string>
     <string name="stream_capture_paused_details">Revino la joc pentru a relua.</string>
     <string name="stream_capture_paused_details_viewer">%1$s a minimizat jocul… stai un pic!</string>
     <string name="stream_channel_description">Membrii cu această permisiune pot face streaming pe acest canal.</string>
-    <string name="stream_description">Membrii cu această permisiune pot în acest canal.</string>
     <string name="stream_ended">Acest stream s-a încheiat. *sunete de greieri*</string>
     <string name="stream_ended_button">Stream încheiat</string>
     <string name="stream_ended_no_spectators">Nu există spectatori, deoarece stream-ul s-a încheiat.</string>
@@ -3106,7 +3046,6 @@ Ești sigur că vrei să continui?"</string>
     <string name="stream_report_rating_body_streamer">Spune-ne despre experiența de streaming.</string>
     <string name="stream_report_submit">Trimite</string>
     <string name="stream_reported">Feedback trimis</string>
-    <string name="stream_reported_body">Îți mulțumim că ne-ai raportat problema! Feedback-ul ne va ajuta să îmbunătățim calitatea streaming-ului.</string>
     <string name="stream_soundshare_failed">Hei, ceva a mers prost și nu am putut face streaming la sunetul din joc.</string>
     <string name="streamer_mode">Mod Streamer</string>
     <string name="streamer_mode_enabled">Modul Streamer a fost activat</string>
@@ -3164,7 +3103,6 @@ Ești sigur că vrei să continui?"</string>
     <string name="system_message_guild_member_join_10">Un %1$s sălbatic a apărut.</string>
     <string name="system_message_guild_member_join_11">Swoooosh. %1$s tocmai a aterizat.</string>
     <string name="system_message_guild_member_join_12">Țineți-vă bine. %1$s tocmai a intrat pe server.</string>
-    <string name="system_message_guild_member_join_13">%1$s tocmai a intrat. Ascundeți-vă bananele.</string>
     <string name="system_message_guild_member_join_14">%1$s tocmai a aterizat. Pare OP - avem nevoie de un nerf.</string>
     <string name="system_message_guild_member_join_15">%1$s tocmai a alunecat în server.</string>
     <string name="system_message_guild_member_join_16">Un %1$s a fost generat direct pe server.</string>
@@ -3175,7 +3113,6 @@ Ești sigur că vrei să continui?"</string>
     <string name="system_message_guild_member_join_21">Se aproprie un competitor - A apărut %1$s!</string>
     <string name="system_message_guild_member_join_22">E o pasăre! Ba nu, e un avion! Nu mai contează, este doar %1$s.</string>
     <string name="system_message_guild_member_join_23">Este %1$s! Lăudat fie soarele! \\\\[T]/</string>
-    <string name="system_message_guild_member_join_25">Ha! %1$s s-a alăturat! Mi-ai activat trap card-ul!</string>
     <string name="system_message_guild_member_join_26">Noroc, iubire! %1$s e aici!</string>
     <string name="system_message_guild_member_join_27">Hei! Ascultă! %1$s s-a alăturat!</string>
     <string name="system_message_guild_member_join_28">Te-am așteptat, %1$s</string>
@@ -3324,8 +3261,6 @@ Ai nevoie de un cont înregistrat pentru a **descărca aplicații**."</string>
     <string name="unsupported_browser">Browser incompatibil</string>
     <string name="unsupported_browser_body">"Se pare că utilizezi un browser incompatibil. Pentru a beneficia pe deplin de experiența oferită de Discord, actualizează browser-ul
 tău sau descarcă una din aplicațiile noastre."</string>
-    <string name="unsupported_browser_details">"Dorești să poți vorbi cu echipa ta, corect? Actualizează la ultima versiune Chrome, Opera, Firefox 38+ sau descarcă
-aplicația Discord și începe să te bucuri de conversații chiar acum!"</string>
     <string name="unsupported_browser_title">Ei bine, asta e jenant</string>
     <string name="unverified_account_body">"Te rugăm să îți verifici e-mail-ul și să urmezi instrucțiunile pentru a-l verifica.
 
@@ -3443,8 +3378,6 @@ Dacă nu ai primit un e-mail de la noi sau acesta a expirat, [click aici](onRese
     <string name="user_settings_appearance_preview_message_4">Modul Compact va fi activat</string>
     <string name="user_settings_appearance_preview_message_5">Oh, aici este!</string>
     <string name="user_settings_appearance_zoom_tip">Poți schimba nivelul de zoom cu %1$s +/- și reseta la mărirea normală cu %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Arată lista cu jocuri</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Dezactivează această opțiune pentru a ascunde lista cu jocuri, astfel încât să te poți concentra asupra conversațiilor tale.</string>
     <string name="user_settings_close_button">Buton de închidere</string>
     <string name="user_settings_confirm_logout">Ești sigur că vrei să te deconectezi?</string>
     <string name="user_settings_game_activity">Activitate joc</string>
@@ -3503,8 +3436,6 @@ Nu uita că acest lucru îți va face serverul accesibil tuturor celor care folo
     <string name="vanity_url_hint_mobile">url-ul-tău-aici</string>
     <string name="verfication_expired">Link-ul de verificare a e-mail-ului a expirat.</string>
     <string name="verfication_expired_suggestion">Conectează-te pe Discord și retrimite link-ul</string>
-    <string name="verification_body">"Am detectat că se întâmplă ceva ciudat.
-Pentru a continua să folosești Discord, **trebuie să verificăm că ești o ființă umană.**"</string>
     <string name="verification_body_alt">Acum, să ne asigurăm că ești om…</string>
     <string name="verification_email_body">Am trimis un e-mail de verificare la **%1$s**; te rugăm să verifici atât mesajele primite cât și folder-ul de spam.</string>
     <string name="verification_email_error_body">A apărut o eroare la trimiterea e-mail-ului de verificare. Încearcă din nou mai târziu sau contactează asistența.</string>
@@ -3543,8 +3474,6 @@ Pentru a continua să folosești Discord, **trebuie să verificăm că ești o f
     <string name="verify_phone">Verifică telefon</string>
     <string name="verifying">Se verifică</string>
     <string name="video_call">Apel video</string>
-    <string name="video_poor_connection_body">Video-ul a fost dezactivat. Acesta va fi reluat când vei avea o conexiune mai bună.</string>
-    <string name="video_poor_connection_title">Conexiune slabă</string>
     <string name="video_preview">Previzualizare video</string>
     <string name="video_settings">Setări video</string>
     <string name="video_unavailable">Video indisponibil</string>
diff --git a/com.discord/res/values-ru/plurals.xml b/com.discord/res/values-ru/plurals.xml
index 63d3faf6f3..298e858bc0 100644
--- a/com.discord/res/values-ru/plurals.xml
+++ b/com.discord/res/values-ru/plurals.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <plurals name="activity_feed_now_playing_header_one_known_extra">
+        <item quantity="other">%d</item>
+        <item quantity="one">%d</item>
+    </plurals>
+    <plurals name="activity_feed_now_playing_header_two_known_extras" />
+    <plurals name="activity_feed_recently_played_header_multiple_extra" />
+    <plurals name="activity_feed_single_member_list_header_memberCount">
+        <item quantity="other">%d чел.</item>
+        <item quantity="one">%d человек</item>
+    </plurals>
+    <plurals name="activity_feed_user_played_days_ago_time">
+        <item quantity="other">дней</item>
+        <item quantity="one">день</item>
+        <item quantity="few">дня</item>
+    </plurals>
     <plurals name="application_progress_indicator_installing_hours_timeRemaining">
         <item quantity="other">%d ч.</item>
         <item quantity="one">%d час</item>
@@ -24,6 +39,26 @@
         <item quantity="other">%d сек. осталось</item>
         <item quantity="one">заканчиваем</item>
     </plurals>
+    <plurals name="application_store_gift_purchase_confirm_monthly_mobile_intervalCount">
+        <item quantity="other">%d месяцев</item>
+        <item quantity="one">%d месяц</item>
+        <item quantity="few">%d месяца</item>
+    </plurals>
+    <plurals name="application_store_gift_purchase_confirm_subscription_monthly_intervalCount">
+        <item quantity="other">%d месяцев</item>
+        <item quantity="one">%d месяц</item>
+        <item quantity="few">%d месяца</item>
+    </plurals>
+    <plurals name="application_store_gift_purchase_confirm_subscription_yearly_intervalCount">
+        <item quantity="other">%d лет</item>
+        <item quantity="one">%d год</item>
+        <item quantity="few">%d года</item>
+    </plurals>
+    <plurals name="application_store_gift_purchase_confirm_yearly_mobile_intervalCount">
+        <item quantity="other">%d лет</item>
+        <item quantity="one">%d год</item>
+        <item quantity="few">%d года</item>
+    </plurals>
     <plurals name="application_store_hide_games_in_library_hidden_gamesHidden">
         <item quantity="other">%d игр из библиотеки</item>
         <item quantity="one">%d игра из библиотеки</item>
@@ -63,10 +98,41 @@
         <item quantity="other">%d сек</item>
         <item quantity="one">1 сек.</item>
     </plurals>
+    <plurals name="channel_slowmode_desc_hours_hours">
+        <item quantity="other">%d ч.</item>
+        <item quantity="one">1 ч.</item>
+    </plurals>
+    <plurals name="channel_slowmode_desc_hours_minutes">
+        <item quantity="other">%d мин.</item>
+        <item quantity="zero"></item>
+        <item quantity="one">1 мин.</item>
+    </plurals>
+    <plurals name="channel_slowmode_desc_hours_seconds">
+        <item quantity="other">%d сек.</item>
+        <item quantity="zero"></item>
+        <item quantity="one">1 сек.</item>
+    </plurals>
+    <plurals name="channel_slowmode_desc_minutes_minutes">
+        <item quantity="other">%d мин.</item>
+        <item quantity="one">1 мин.</item>
+    </plurals>
+    <plurals name="channel_slowmode_desc_minutes_seconds">
+        <item quantity="other">%d сек.</item>
+        <item quantity="zero"></item>
+        <item quantity="one">1 сек.</item>
+    </plurals>
     <plurals name="channel_slowmode_desc_seconds">
         <item quantity="other">%d сек</item>
         <item quantity="one">1 сек.</item>
     </plurals>
+    <plurals name="custom_status_hours_hours">
+        <item quantity="other">%d ч.</item>
+        <item quantity="one">%d ч.</item>
+    </plurals>
+    <plurals name="custom_status_minutes_minutes">
+        <item quantity="other">%d мин.</item>
+        <item quantity="one">%d мин.</item>
+    </plurals>
     <plurals name="duration_days_days">
         <item quantity="other">%d дней</item>
         <item quantity="one">1 день</item>
@@ -77,16 +143,28 @@
         <item quantity="one">%d час</item>
         <item quantity="few">%d часа</item>
     </plurals>
+    <plurals name="duration_hours_short_hours">
+        <item quantity="other">%d ч.</item>
+        <item quantity="one">1 ч.</item>
+    </plurals>
     <plurals name="duration_minutes_minutes">
         <item quantity="other">%d минут</item>
         <item quantity="one">1 минута</item>
         <item quantity="few">%d минуты</item>
     </plurals>
+    <plurals name="duration_minutes_short_minutes">
+        <item quantity="other">%d мин.</item>
+        <item quantity="one">1 мин.</item>
+    </plurals>
     <plurals name="duration_seconds_seconds">
         <item quantity="other">%d секунд</item>
         <item quantity="one">1 секунда</item>
         <item quantity="few">%d секунды</item>
     </plurals>
+    <plurals name="duration_seconds_short_seconds">
+        <item quantity="other">%d сек.</item>
+        <item quantity="one">1 сек.</item>
+    </plurals>
     <plurals name="emoji_slots_available_count">
         <item quantity="other">%d слотов свободны</item>
         <item quantity="zero">нет свободных слотов</item>
@@ -98,7 +176,8 @@
         <item quantity="one">1 день</item>
     </plurals>
     <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d человек, которые не появлялись</item>
+        <item quantity="other">%d чел., которые не появлялись</item>
+        <item quantity="zero">0 человек</item>
         <item quantity="one">1 человека, который не появлялся</item>
     </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
@@ -203,6 +282,99 @@
         <item quantity="other">%d сек. осталось</item>
         <item quantity="one">заканчиваем</item>
     </plurals>
+    <plurals name="gift_code_auth_gifted_subscription_monthly_intervalCount">
+        <item quantity="other">%d месяцев</item>
+        <item quantity="one">%d месяц</item>
+        <item quantity="few">%d месяца</item>
+    </plurals>
+    <plurals name="gift_code_auth_gifted_subscription_yearly_intervalCount">
+        <item quantity="other">%d лет</item>
+        <item quantity="one">%d год</item>
+        <item quantity="few">%d года</item>
+    </plurals>
+    <plurals name="gift_confirmation_body_subscription_monthly_confirm_intervalCount">
+        <item quantity="other">%d месяцев</item>
+        <item quantity="one">%d месяц</item>
+        <item quantity="few">%d месяца</item>
+    </plurals>
+    <plurals name="gift_confirmation_body_subscription_yearly_confirm_intervalCount">
+        <item quantity="other">%d лет</item>
+        <item quantity="one">%d год</item>
+        <item quantity="few">%d года</item>
+    </plurals>
+    <plurals name="gift_confirmation_body_success_generic_subscription_monthly_intervalCount">
+        <item quantity="other">%d месяцев</item>
+        <item quantity="one">%d месяц</item>
+        <item quantity="few">%d месяца</item>
+    </plurals>
+    <plurals name="gift_confirmation_body_success_generic_subscription_yearly_intervalCount">
+        <item quantity="other">%d лет</item>
+        <item quantity="one">%d год</item>
+        <item quantity="few">%d года</item>
+    </plurals>
+    <plurals name="gift_confirmation_body_success_premium_tier_1_monthly_intervalCount">
+        <item quantity="other">%d месяцев</item>
+        <item quantity="one">%d месяц</item>
+        <item quantity="few">%d месяца</item>
+    </plurals>
+    <plurals name="gift_confirmation_body_success_premium_tier_1_yearly_intervalCount">
+        <item quantity="other">%d лет</item>
+        <item quantity="one">%d год</item>
+        <item quantity="few">%d года</item>
+    </plurals>
+    <plurals name="gift_confirmation_nitro_time_frame_months_time">
+        <item quantity="other">%d месяцев</item>
+        <item quantity="one">%d месяц</item>
+        <item quantity="few">%d месяца</item>
+    </plurals>
+    <plurals name="gift_confirmation_nitro_time_frame_years_time">
+        <item quantity="other">%d лет</item>
+        <item quantity="one">%d год</item>
+        <item quantity="few">%d года</item>
+    </plurals>
+    <plurals name="gift_embed_body_subscription_default_months_intervalCount">
+        <item quantity="other">%d месяцев</item>
+        <item quantity="one">%d месяц</item>
+        <item quantity="few">%d месяца</item>
+    </plurals>
+    <plurals name="gift_embed_body_subscription_default_years_intervalCount">
+        <item quantity="other">%d лет</item>
+        <item quantity="one">%d год</item>
+        <item quantity="few">%d года</item>
+    </plurals>
+    <plurals name="gift_embed_body_subscription_no_user_default_months_intervalCount">
+        <item quantity="other">%d месяцев</item>
+        <item quantity="one">%d месяц</item>
+        <item quantity="few">%d месяца</item>
+    </plurals>
+    <plurals name="gift_embed_body_subscription_no_user_default_years_intervalCount">
+        <item quantity="other">%d лет</item>
+        <item quantity="one">%d год</item>
+        <item quantity="few">%d года</item>
+    </plurals>
+    <plurals name="gift_embed_expiration_hours">
+        <item quantity="other">%d ч.</item>
+        <item quantity="one">%d ч.</item>
+    </plurals>
+    <plurals name="gift_inventory_copies_copies">
+        <item quantity="other">%d копий</item>
+        <item quantity="one">%d копия</item>
+        <item quantity="few">%d копии</item>
+    </plurals>
+    <plurals name="gift_inventory_expires_in_mobile_hours">
+        <item quantity="other">%d ч.</item>
+        <item quantity="one">%d ч.</item>
+    </plurals>
+    <plurals name="gift_inventory_subscription_months_intervalCount">
+        <item quantity="other">%d месяцев</item>
+        <item quantity="one">%d месяц</item>
+        <item quantity="few">%d месяца</item>
+    </plurals>
+    <plurals name="gift_inventory_subscription_years_intervalCount">
+        <item quantity="other">%d лет</item>
+        <item quantity="one">%d год</item>
+        <item quantity="few">%d года</item>
+    </plurals>
     <plurals name="group_dm_add_members_number">
         <item quantity="other">%d участников</item>
         <item quantity="one">1 участника</item>
@@ -215,6 +387,11 @@
         <item quantity="other">%d участников</item>
         <item quantity="one">1 участника</item>
     </plurals>
+    <plurals name="guild_discovery_header_search_results_count">
+        <item quantity="other">найдено %d результатов</item>
+        <item quantity="one">найден 1 результат</item>
+        <item quantity="few">найдено %d результата</item>
+    </plurals>
     <plurals name="guild_settings_audit_log_channel_permission_overrides_denied_count">
         <item quantity="other">права</item>
         <item quantity="one">право</item>
@@ -226,12 +403,10 @@
     <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
         <item quantity="other">Устанавливает интервал между сообщениями в **!!%d!! сек.**</item>
         <item quantity="zero">Медленный режим отключён</item>
-        <item quantity="one">Устанавливает интервал между сообщениями в **1 сек.**</item>
     </plurals>
     <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
         <item quantity="other">Устанавливает интервал между сообщениями в **!!%d!! сек.**</item>
         <item quantity="zero">Отключить медленный режим</item>
-        <item quantity="one">Устанавливает интервал между сообщениями в **1 сек.**</item>
     </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! неактивных участников**</item>
@@ -263,6 +438,26 @@
         <item quantity="other">права</item>
         <item quantity="one">право</item>
     </plurals>
+    <plurals name="guild_settings_overview_boost_unlock_boosts">
+        <item quantity="other">%d усилений</item>
+        <item quantity="one">%d усиление</item>
+        <item quantity="few">%d усиления</item>
+    </plurals>
+    <plurals name="guild_settings_premium_guild_close_hint_numLeft">
+        <item quantity="other">%d усилений</item>
+        <item quantity="one">%d усиление</item>
+        <item quantity="few">%d усиления</item>
+    </plurals>
+    <plurals name="guild_settings_premium_guild_count_subscribers_count">
+        <item quantity="other">%d очень крутых пользователей усилили</item>
+        <item quantity="one">%d очень крутой пользователь усилил</item>
+        <item quantity="few">%d очень крутых пользователя усилили</item>
+    </plurals>
+    <plurals name="guild_settings_premium_guild_tier_requirement_required">
+        <item quantity="other">%d усилений</item>
+        <item quantity="one">%d усиление</item>
+        <item quantity="few">%d усиления</item>
+    </plurals>
     <plurals name="instant_invite_guild_members_total_count">
         <item quantity="other">%d участн.</item>
         <item quantity="one">1 участник</item>
@@ -301,6 +496,18 @@
         <item quantity="other">%d использований</item>
         <item quantity="one">%d использования</item>
     </plurals>
+    <plurals name="ios_profile_mutual_friends_count">
+        <item quantity="other">%d общих друзей</item>
+        <item quantity="zero">0 общих друзей</item>
+        <item quantity="one">1 общий друг</item>
+        <item quantity="few">%d общих друга</item>
+    </plurals>
+    <plurals name="ios_profile_mutual_guilds_count">
+        <item quantity="other">%d общих серверов</item>
+        <item quantity="zero">0 общих серверов</item>
+        <item quantity="one">1 общий сервер</item>
+        <item quantity="few">%d общих сервера</item>
+    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d дней</item>
         <item quantity="one">1 день</item>
@@ -343,15 +550,17 @@
         <item quantity="one">1 новое сообщение</item>
         <item quantity="few">%d новых сообщения</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d дн.</item>
-        <item quantity="one">один день</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d каналов</item>
         <item quantity="one">%d канал</item>
         <item quantity="few">%d канала</item>
     </plurals>
+    <plurals name="num_members_subscribers">
+        <item quantity="other">**%d** участников</item>
+        <item quantity="zero">**0** участников</item>
+        <item quantity="one">**1** участник</item>
+        <item quantity="few">**%d** участника</item>
+    </plurals>
     <plurals name="num_subscribers_subscribers">
         <item quantity="other">**%d** подписчиков</item>
         <item quantity="zero">нет подписчиков</item>
@@ -367,15 +576,107 @@
         <item quantity="other">их</item>
         <item quantity="one">его</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** серверов недоступно из-за временного отключения</item>
-        <item quantity="one">**1** сервер недоступен из-за временного отключения</item>
-        <item quantity="few">**%d** сервера недоступны из-за временного отключения</item>
+    <plurals name="partial_outage_a11y_count">
+        <item quantity="other">%d серверов недоступно из-за временного отключения</item>
+        <item quantity="one">1 сервер недоступен из-за временного отключения</item>
+        <item quantity="few">%d сервера недоступны из-за временного отключения</item>
     </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d мес.</item>
         <item quantity="one">1 месяц</item>
     </plurals>
+    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
+        <item quantity="other">%d усилений</item>
+        <item quantity="one">%d усиление</item>
+        <item quantity="few">%d усиления</item>
+    </plurals>
+    <plurals name="premium_guild_settings_members_subscribed_needed_number">
+        <item quantity="other">%d усилений</item>
+        <item quantity="one">%d усиление</item>
+        <item quantity="few">%d усиления</item>
+    </plurals>
+    <plurals name="premium_guild_settings_members_subscribed_number">
+        <item quantity="other">%d участников</item>
+        <item quantity="one">%d участник</item>
+        <item quantity="few">%d участника</item>
+    </plurals>
+    <plurals name="premium_guild_settings_x_of_y_subscriptions_numRequired">
+        <item quantity="other">%d усилений</item>
+        <item quantity="one">%d усиление</item>
+        <item quantity="few">%d усиления</item>
+    </plurals>
+    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
+        <item quantity="other">%d дней</item>
+        <item quantity="one">%d день</item>
+        <item quantity="few">%d дня</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_available_count_num">
+        <item quantity="other">%d усилений сервера</item>
+        <item quantity="one">%d усиление сервера</item>
+        <item quantity="few">%d усиления сервера</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_duration_months">
+        <item quantity="other">%d месяцев</item>
+        <item quantity="one">%d месяц</item>
+        <item quantity="few">%d месяца</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_error_rate_limit_days_days">
+        <item quantity="other">%d дней</item>
+        <item quantity="one">%d день</item>
+        <item quantity="few">%d дня</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_error_rate_limit_days_hours">
+        <item quantity="other">%d ч.</item>
+        <item quantity="one">%d ч.</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_error_rate_limit_hours_hours">
+        <item quantity="other">%d ч.</item>
+        <item quantity="one">%d ч.</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_error_rate_limit_hours_minutes">
+        <item quantity="other">%d мин.</item>
+        <item quantity="one">%d мин.</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_error_rate_limit_minutes_minutes">
+        <item quantity="other">%d мин.</item>
+        <item quantity="one">%d мин.</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
+        <item quantity="other">**%d** усилений</item>
+        <item quantity="one">**%d** усиление</item>
+        <item quantity="few">**%d** усиления</item>
+    </plurals>
+    <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
+        <item quantity="other">%d дней</item>
+        <item quantity="one">%d день</item>
+        <item quantity="few">%d дня</item>
+    </plurals>
+    <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_hours">
+        <item quantity="other">%d ч.</item>
+        <item quantity="one">%d ч.</item>
+    </plurals>
+    <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_hours">
+        <item quantity="other">%d ч.</item>
+        <item quantity="one">%d ч.</item>
+    </plurals>
+    <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_minutes">
+        <item quantity="other">%d мин.</item>
+        <item quantity="one">%d мин.</item>
+    </plurals>
+    <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes_minutes">
+        <item quantity="other">%d мин.</item>
+        <item quantity="one">%d мин.</item>
+    </plurals>
+    <plurals name="premium_payment_plan_label_monthly_intervalCount">
+        <item quantity="other">%d месяцев</item>
+        <item quantity="one">%d месяц</item>
+        <item quantity="few">%d месяца</item>
+    </plurals>
+    <plurals name="premium_payment_plan_label_yearly_intervalCount">
+        <item quantity="other">%d лет</item>
+        <item quantity="one">%d год</item>
+        <item quantity="few">%d года</item>
+    </plurals>
     <plurals name="reaction_tooltip_1_n_n">
         <item quantity="other">%d человек поставили</item>
         <item quantity="one">1 человек поставили</item>
@@ -399,7 +700,8 @@
     <plurals name="roles_list_numRoles">
         <item quantity="other">Роли</item>
         <item quantity="zero">Нет ролей</item>
-        <item quantity="one">Роль</item>
+        <item quantity="one">Роли</item>
+        <item quantity="few">Роли</item>
     </plurals>
     <plurals name="search_hide_blocked_messages_count">
         <item quantity="other">%d сообщений</item>
@@ -428,6 +730,9 @@
         <item quantity="one">%d результат</item>
         <item quantity="few">%d результата</item>
     </plurals>
+    <plurals name="uploading_files_count">
+        <item quantity="other">Выгрузка %d файлов</item>
+    </plurals>
     <plurals name="user_activity_timestamp_end_hours">
         <item quantity="other">%d:</item>
     </plurals>
diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml
index 1e5fd68a19..9d56a683b7 100644
--- a/com.discord/res/values-ru/strings.xml
+++ b/com.discord/res/values-ru/strings.xml
@@ -32,9 +32,12 @@
     <string name="abc_shareactionprovider_share_with_application">Открыть доступ приложению \"%s\"</string>
     <string name="abc_toolbar_collapse_description">Свернуть</string>
     <string name="about_this_app">Об этом приложении</string>
+    <string name="accept_invite_modal_button">Принять приглашение</string>
     <string name="accept_request_button">Принять запрос дружбы</string>
     <string name="accept_request_button_after">Запрос принят</string>
     <string name="accessibility_font_scaling_label">Масштабирование текста в чате</string>
+    <string name="accessibility_font_scaling_use_app">Сейчас используются настройки шрифта Discord.</string>
+    <string name="accessibility_font_scaling_use_os">Сейчас используются настройки шрифта устройства.</string>
     <string name="accessibility_zoom_level_label">Уровень масштабирования</string>
     <string name="account">Учётная запись</string>
     <string name="account_disabled_description">Вы не можете использовать её, если она отключена.</string>
@@ -50,23 +53,67 @@
     <string name="acknowledgements">Благодарности</string>
     <string name="action_may_take_a_moment">Это может занять некоторое время.</string>
     <string name="actions">Действия</string>
+    <string name="active_on_mobile">Использует мобильное устройство</string>
     <string name="activity">Активность</string>
+    <string name="activity_feed_card_first_time_user_header">Следите за любимыми играми</string>
+    <string name="activity_feed_card_gdpr_body">Discord может адаптировать её под вас, изучая, в какие игры вы играете и с кем общаетесь. Вы можете отключить эту функцию в любое время в [настройках конфиденциальности](onClickPrivacy).</string>
+    <string name="activity_feed_card_gdpr_button_no">Нет, спасибо.</string>
+    <string name="activity_feed_card_gdpr_button_yes">Я в деле!</string>
+    <string name="activity_feed_card_gdpr_header">Ваша лента событий может стать лучше</string>
+    <string name="activity_feed_card_gdpr_none_playing_body">Discord не сможет показывать вам, во что играют другие пользователи, пока вы не разрешите нам персонализировать вашу ленту.</string>
+    <string name="activity_feed_card_no_games_header">Следите за любимыми играми</string>
+    <string name="activity_feed_card_no_news_body">Загляните сюда попозже.</string>
+    <string name="activity_feed_card_no_news_header">Пока новостей об играх нет.</string>
+    <string name="activity_feed_none_playing_body">Если кто-то начнёт играть, вы увидите это здесь.</string>
+    <string name="activity_feed_none_playing_header">Сейчас никто не играет…</string>
+    <string name="activity_feed_now_playing_action_go_to_server">Перейти на сервер</string>
+    <string name="activity_feed_now_playing_action_join_channel">Присоединиться к каналу</string>
+    <string name="activity_feed_now_playing_action_listen_along">Слушать вместе</string>
+    <string name="activity_feed_now_playing_action_play_on_spotify">Воспроизвести в Spotify</string>
+    <string name="activity_feed_now_playing_header_one_known">**%1$s** и ещё %2$s</string>
+    <string name="activity_feed_now_playing_header_two_known">**%1$s**, **%2$s** и ещё %3$s other %4$s}}</string>
+    <string name="activity_feed_now_playing_header_two_known_only">**%1$s** и **%2$s**</string>
+    <string name="activity_feed_now_playing_in_a_voice_channel">В голосовом канале</string>
+    <string name="activity_feed_now_playing_multiple_games">Играют в разные игры</string>
+    <string name="activity_feed_now_playing_spotify">Слушает Spotify</string>
+    <string name="activity_feed_now_playing_watching">Смотрит трансляцию</string>
+    <string name="activity_feed_now_playing_xbox">Играет на Xbox</string>
+    <string name="activity_feed_now_streaming_twitch">Стримит на Twitch</string>
+    <string name="activity_feed_other_member_list_header">Другие участники</string>
+    <string name="activity_feed_popout_application_launching">%1$s запускается.</string>
+    <string name="activity_feed_popout_application_running">%1$s уже работает.</string>
+    <string name="activity_feed_popout_desktop_app_required">У вас должно быть установлено приложение Discord для компьютера.</string>
+    <string name="activity_feed_popout_not_friends_tooltip">Вы должны дружить с %1$s.</string>
+    <string name="activity_feed_recently_played_header_multiple">%1$s и ещё %2$s other %3$s}}</string>
+    <string name="activity_feed_share_modal_footer_title">Или поделитесь ссылкой напрямую</string>
+    <string name="activity_feed_share_modal_header">Поделиться записью</string>
+    <string name="activity_feed_share_modal_search_placeholder">Поиск пользователей и каналов</string>
+    <string name="activity_feed_share_modal_sent">Отправлено</string>
+    <string name="activity_feed_share_modal_share">Поделиться</string>
+    <string name="activity_feed_single_member_list_header">%1$s</string>
+    <string name="activity_feed_user_played_days_ago">%1$s %2$s назад</string>
+    <string name="activity_feed_user_playing">Идёт игра</string>
+    <string name="activity_feed_user_playing_for_days">%1$s — %2$s д.</string>
+    <string name="activity_feed_user_playing_for_hours">%1$s — %2$s ч.</string>
+    <string name="activity_feed_user_playing_for_minutes">%1$s — %2$s мин.</string>
+    <string name="activity_feed_user_playing_just_started">%1$s — только что</string>
     <string name="activity_invite_modal_header">Пригласить сыграть в %1$s</string>
     <string name="activity_invite_modal_invite">Пригласить</string>
     <string name="activity_invite_modal_return_to_game">Вернуться к игре</string>
     <string name="activity_invite_modal_search_placeholder">Поиск пользователей и каналов</string>
     <string name="activity_invite_modal_sent">Отправлено</string>
-    <string name="activity_invite_private">"Вы не можете отправить приглашение, потому что у вас включён режим невидимости либо вы скрываете свой статус. Если вы не хотите изменять
+    <string name="activity_invite_private">"Вы не можете отправить приглашение, потому что у вас включён режим невидимости либо вы скрываете свой cтатус «Играет в». Если вы не хотите изменять
 параметры, лучше попросите кого-нибудь пригласить вас в игру."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Ясно!</string>
-    <string name="activity_panel_go_live_hotspot_header">Включите прямой эфир, чтобы начать стримить игровой процесс напрямую своим друзьям!</string>
+    <string name="activity_panel_go_live_hotspot_header">Включите Go Live, чтобы начать стримить игровой процесс своим друзьям!</string>
     <string name="activity_panel_go_live_tooltip">Прямой эфир</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">На сервере нет голосовых каналов для стримов.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Вы не можете стримить на этом голосовом канале.</string>
+    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Вы не можете вести стрим на этом сервере.</string>
+    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Вы не можете вести стрим на этом канале.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Перейдите к серверу, чтобы начать стрим.</string>
     <string name="add">Добавить</string>
     <string name="add_a_comment_optional">Добавить комментарий (необязательно)</string>
     <string name="add_a_member">Добавить участника</string>
+    <string name="add_a_popular_server_mobile">Присоединитесь к другому популярному серверу!</string>
     <string name="add_a_role">Добавить роль</string>
     <string name="add_a_server">Добавить сервер</string>
     <string name="add_a_server_mobile">Коснитесь, чтобы добавить сервер!</string>
@@ -83,6 +130,7 @@
     <string name="add_friend_error_invalid_discord_tag">**%1$s** нанял самурая, чтобы сразить все запросы дружбы. Вы должны попросить его добавить вас.</string>
     <string name="add_friend_error_numbers_only">Мы больше чем цифры… мы люди! Введите имя пользователя и тег, например WumpusKing#1202</string>
     <string name="add_friend_error_other">Хм, не сработало. Ещё раз проверьте правильность регистра, правописания, пробелов и цифр.</string>
+    <string name="add_friend_error_too_many_friends">В вашем списке друзей закончилось место! Добро пожаловать в элитный клуб для тех, у кого 1000 друзей!</string>
     <string name="add_friend_error_username_only">Нам нужен четырёхзначный цифровой тег %1$s, чтобы найти его среди прочих.</string>
     <string name="add_friend_find">Найти</string>
     <string name="add_friend_friend">Друг</string>
@@ -93,7 +141,7 @@
     <string name="add_friend_nearby_connection_error_ios">Пожалуйста, включите Bluetooth и WiFi, чтобы активировать функцию «Поблизости».</string>
     <string name="add_friend_nearby_disable_scanning">Отключить поиск поблизости</string>
     <string name="add_friend_nearby_enable">Начать поиск поблизости</string>
-    <string name="add_friend_nearby_enable_settings_android">Включите функцию «Поблизости»: «Настройки системы» → «Google» → «Поблизости», чтобы найти друзей поблизости!</string>
+    <string name="add_friend_nearby_enable_settings_android">Включите функцию Nearby: «Настройки системы» → «Google» → «Мое окружение», чтобы найти друзей поблизости!</string>
     <string name="add_friend_nearby_generic_error">При работе функции «Поблизости» возникла проблема. Попробуйте ещё раз.</string>
     <string name="add_friend_nearby_info">Найдите друзей вокруг себя при помощи функции «Поблизости»! У них тоже должна быть включена эта функция.</string>
     <string name="add_friend_nearby_learn_more">[Узнать больше](%1$s)</string>
@@ -123,6 +171,7 @@
 Давать это право опасно."</string>
     <string name="advanced_settings">Дополнительные настройки</string>
     <string name="afk_settings">Настройки AFK</string>
+    <string name="all_photos">Все фото</string>
     <string name="all_servers">Все серверы</string>
     <string name="allow_game_detection_mobile">Разрешить Discord обнаруживать мобильные игры, в которые вы играете.</string>
     <string name="allow_server_dms">Разрешить личные сообщения от участников сервера.</string>
@@ -140,17 +189,27 @@
     <string name="app_opened_title">Приложение Discord активировано</string>
     <string name="app_opening">Приложение Discord открывается.</string>
     <string name="app_opening_mobile_body">Если вам не удаётся открыть приложение, скопируйте код приглашения, чтобы присоединиться после загрузки приложения.</string>
+    <string name="app_permission_connect_desc">Разрешите приложению подключиться к Discord и присоединиться к голосовым каналам.</string>
+    <string name="app_permission_connect_label">Подключиться к приложению Discord</string>
     <string name="app_settings">Настройки приложения</string>
     <string name="appearance">Внешний вид</string>
     <string name="application_addon_purchase_confirmation_blurb">%1$s: покупка совершена и доступна в %2$s.</string>
+    <string name="application_branch_name_master">Мастер</string>
+    <string name="application_branch_name_unknown">Неизвестно</string>
+    <string name="application_context_menu_application_id">Код приложения</string>
+    <string name="application_context_menu_branch_id">Код ветви</string>
+    <string name="application_context_menu_copy_store_link">Копировать ссылку</string>
     <string name="application_context_menu_create_desktop_shortcut">Создать ярлык на рабочем столе</string>
     <string name="application_context_menu_hide">Скрыть игру из библиотеки</string>
     <string name="application_context_menu_install">Установить</string>
     <string name="application_context_menu_launch">Играть</string>
     <string name="application_context_menu_launch_application_name">Играть в %1$s</string>
+    <string name="application_context_menu_launch_options">Показать параметры запуска</string>
+    <string name="application_context_menu_private_status">Скрыть cтатус «Играет в»</string>
     <string name="application_context_menu_repair">Восстановить</string>
     <string name="application_context_menu_show">Показывать игру в библиотеке</string>
     <string name="application_context_menu_show_in_folder">Показать в папке</string>
+    <string name="application_context_menu_sku_id">Код SKU</string>
     <string name="application_context_menu_store_link">Посмотреть в магазине</string>
     <string name="application_context_menu_toggle_overlay_disable">Отключить оверлей</string>
     <string name="application_context_menu_uninstall">Удалить</string>
@@ -158,7 +217,8 @@
     <string name="application_entitlement_code_redemption_confirmation_title">Готово!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Перейти в библиотеку</string>
     <string name="application_entitlement_code_redemption_invalid">Введён неверный код</string>
-    <string name="application_entitlement_code_redemption_prompt">Получили код для игры? Введите его здесь:</string>
+    <string name="application_entitlement_code_redemption_prompt">Получили код для Nitro или игры? Вот это круто! Введите его здесь:</string>
+    <string name="application_entitlement_code_redemption_prompt_ios">Получили подарочный код для Nitro или чего-то ещё? Вот это круто! Введите его здесь:</string>
     <string name="application_entitlement_code_redemption_redeem">Применить</string>
     <string name="application_filter_name_linux">Все файлы</string>
     <string name="application_filter_name_macos">Приложения</string>
@@ -181,10 +241,15 @@
     <string name="application_library_filter_placeholder">Фильтр</string>
     <string name="application_library_import_accept">Импортировать игры</string>
     <string name="application_library_import_deny">Не-а</string>
-    <string name="application_library_remove_confirm_body">Игра %1$s будет скрыта из вашей библиотеки. Вы сможете снова её отобразить, изменив настройки библиотеки игр.</string>
+    <string name="application_library_inventory">Склад подарков</string>
+    <string name="application_library_my_games">Мои игры</string>
+    <string name="application_library_remove_confirm_body">Игра %1$s будет скрыта из вашей библиотеки игр. Вы сможете снова её отобразить, изменив настройки библиотеки игр.</string>
     <string name="application_library_remove_confirm_confirm">Да!</string>
     <string name="application_library_remove_confirm_header">Скрыть из библиотеки</string>
     <string name="application_library_wumpus_alt">Вампусу не во что играть!</string>
+    <string name="application_news_error_body">Секунду, завяжем шнурки…</string>
+    <string name="application_news_error_title">Ой! Что-то споткнулось при загрузке ссылки!</string>
+    <string name="application_preorder_purchase_confirmation_button">Перейти в библиотеку</string>
     <string name="application_progress_indicator_installing">Загрузка %1$s</string>
     <string name="application_progress_indicator_installing_hours">Загрузка %1$s — ещё %2$s</string>
     <string name="application_progress_indicator_installing_minutes">Загрузка %1$s — ещё %2$s</string>
@@ -194,6 +259,7 @@
     <string name="application_progress_indicator_updating_hours">Обновление %1$s — ещё %2$s</string>
     <string name="application_progress_indicator_updating_minutes">Обновление %1$s — ещё %2$s</string>
     <string name="application_progress_indicator_updating_seconds">Обновление %1$s — %2$s</string>
+    <string name="application_store_about_header">%1$s</string>
     <string name="application_store_activity_feed_promotion_subtitle">Мы &lt;3 вас! Ваша команда Discord</string>
     <string name="application_store_all_news">Все самые последние новости… которые можно проматывать!</string>
     <string name="application_store_browse">Просмотр</string>
@@ -205,10 +271,20 @@
     <string name="application_store_browse_sort_title_reverse_alphabetical">По названию (Z-A)</string>
     <string name="application_store_bundle_purchase_confirmation_blurb">Комплект %1$s куплен, игры из него доступны в вашей библиотеке.</string>
     <string name="application_store_buy">Купить</string>
+    <string name="application_store_buy_as_gift">Купить в качестве подарка</string>
+    <string name="application_store_buy_for_price">Купить за %1$s</string>
+    <string name="application_store_buy_gift">Купить подарок</string>
     <string name="application_store_cloud_saves">Облачные сохранения</string>
+    <string name="application_store_cloud_saves_tooltip">Мы храним ваши файлы сохранений, чтобы вы всегда могли получить к ним доступ через Discord!</string>
     <string name="application_store_coming_soon">Скоро</string>
     <string name="application_store_controller_support">Поддержка контроллера</string>
+    <string name="application_store_controller_support_tooltip">Вообще тут должно быть написано «Играйте с контроллером».</string>
+    <string name="application_store_countdown_days">д.</string>
+    <string name="application_store_countdown_hours">ч.</string>
+    <string name="application_store_countdown_minutes">мин.</string>
+    <string name="application_store_countdown_seconds">сек.</string>
     <string name="application_store_cross_platform">Несколько платформ</string>
+    <string name="application_store_cross_platform_tooltip">Врата открыты!</string>
     <string name="application_store_description_read_less">Свернуть</string>
     <string name="application_store_description_read_more">Подробнее</string>
     <string name="application_store_details_developer">Разработчик</string>
@@ -216,12 +292,15 @@
     <string name="application_store_details_publisher">Издатель</string>
     <string name="application_store_details_release_date">Дата выхода</string>
     <string name="application_store_discord_game_invites">Приглашение через Discord</string>
+    <string name="application_store_discord_game_invites_tooltip">Отправляйте приглашения в игру прямо через Discord.</string>
     <string name="application_store_downloadable_content">Загружаемый контент</string>
     <string name="application_store_early_access">Ранний доступ</string>
     <string name="application_store_early_access_body">Вы можете немедленно получить доступ к игре и попробовать её уже сейчас. Этим вы поможете студии в разработке, но учтите, что игра пока не готова и ещё может измениться.</string>
     <string name="application_store_expand_downloadable_content">Показать все дополнения</string>
     <string name="application_store_filter_all_genres">Все жанры</string>
     <string name="application_store_first_on_discord">Впервые — в Discord!</string>
+    <string name="application_store_free">Бесплатно</string>
+    <string name="application_store_free_premium_content">Бесплатные материалы подписки Nitro</string>
     <string name="application_store_free_with_premium">Бесплатно с подпиской Nitro</string>
     <string name="application_store_genre_action">Боевик</string>
     <string name="application_store_genre_action_adventure">Приключенческий боевик</string>
@@ -246,7 +325,7 @@
     <string name="application_store_genre_football">Американский футбол</string>
     <string name="application_store_genre_four_x">4X-стратегия</string>
     <string name="application_store_genre_fps">Шутер от первого лица</string>
-    <string name="application_store_genre_gambling">Азартная игра</string>
+    <string name="application_store_genre_gambling">Азартные игры</string>
     <string name="application_store_genre_golf">Гольф</string>
     <string name="application_store_genre_hack_and_slash">Рубилово</string>
     <string name="application_store_genre_hockey">Хоккей</string>
@@ -277,6 +356,7 @@
     <string name="application_store_genre_surfing_wakeboarding">Серфинг / вейкборд</string>
     <string name="application_store_genre_survival">Выживание</string>
     <string name="application_store_genre_survival_horror">Хоррор с элементами выживания</string>
+    <string name="application_store_genre_title">Просмотр: %1$s</string>
     <string name="application_store_genre_tower_defense">Башенная защита</string>
     <string name="application_store_genre_track_field">Лёгкая атлетика</string>
     <string name="application_store_genre_train_simulator">Железнодорожный симулятор</string>
@@ -287,9 +367,16 @@
     <string name="application_store_genre_wargame">Варгейм</string>
     <string name="application_store_genre_wrestling">Борьба</string>
     <string name="application_store_get_premium">Подписаться</string>
+    <string name="application_store_gift_purchase_confirm_error">Возникла ошибка при получении информации о подарке. Загляните на склад!</string>
+    <string name="application_store_gift_purchase_confirm_monthly_mobile">Какая щедрость! Отправьте этот подарок другу, чтобы подарить ему %1$s на %2$s.</string>
+    <string name="application_store_gift_purchase_confirm_subscription_monthly">Какая щедрость! Отправьте этот подарок другу, чтобы подарить ему %1$s на %2$s. Надеемся, ему понравится!</string>
+    <string name="application_store_gift_purchase_confirm_subscription_yearly">Какая щедрость! Отправьте этот подарок другу, чтобы подарить ему %1$s на %2$s. Надеемся, ему понравится!</string>
+    <string name="application_store_gift_purchase_confirm_yearly_mobile">Какая щедрость! Отправьте этот подарок другу, чтобы подарить ему %1$s на %2$s.</string>
+    <string name="application_store_gift_purchase_confirmation_blurb">Отправьте эту ссылку другу, чтобы подарить ему игру. Надеемся, ему понравится!</string>
+    <string name="application_store_gift_purchase_confirmation_subtext">Ссылку на подарок можно найти в письме с подтверждением и на [складе подарков](onInventoryClick). Ссылка на подарок действует 48 часов.</string>
     <string name="application_store_hero_carousel_featured_game">Похожая игра</string>
     <string name="application_store_hero_carousel_featured_premium_game">Похожая игра Nitro</string>
-    <string name="application_store_hero_carousel_learn_more">Подробнее</string>
+    <string name="application_store_hero_carousel_learn_more">Узнать больше</string>
     <string name="application_store_hide_games_in_library">Скрыть игры в библиотеке</string>
     <string name="application_store_hide_games_in_library_hidden">скрыто: %1$s</string>
     <string name="application_store_home_footer_main">Спасибо, что посмотрели!</string>
@@ -301,13 +388,25 @@
     <string name="application_store_listing_purchase_generic_error_short">Что-то пошло не так.</string>
     <string name="application_store_listing_purchase_rate_limit_error">Ого! Вот это вы метеор. Добавляете игры так быстро, что за вами не угонишься! Дайте мы переведём дух, а потом сможете продолжить.</string>
     <string name="application_store_listing_purchase_rate_limit_error_short">Слишком быстро! Подождите немного и попробуйте ещё раз.</string>
+    <string name="application_store_listing_select_edition">Выберите издание</string>
     <string name="application_store_local_coop">Совместная игра на одном устройстве</string>
+    <string name="application_store_local_coop_tooltip">Потому что дружба — это круто.</string>
     <string name="application_store_local_multiplayer">Несколько игроков на одном ПК</string>
+    <string name="application_store_local_multiplayer_tooltip">Да, мы хотим, чтобы вы посидели рядом с другими людьми.</string>
     <string name="application_store_navigation_browse">Просмотр</string>
     <string name="application_store_new_release">Новинка</string>
     <string name="application_store_online_coop">Совместная игра по сети</string>
+    <string name="application_store_online_coop_tooltip">Для тех случаев, когда вам надоело грайндить PVP.</string>
     <string name="application_store_online_multiplayer">Сетевая игра</string>
+    <string name="application_store_online_multiplayer_tooltip">Для тех случаев, когда вы не прочь поиграть с незнакомцами!</string>
+    <string name="application_store_premium_perks">Бонусы Nitro</string>
+    <string name="application_store_premium_perks_header">Бонусы игры Nitro</string>
+    <string name="application_store_preorder">Оформить предзаказ</string>
+    <string name="application_store_preorder_as_gift">Оформить предзаказ в подарок</string>
+    <string name="application_store_preorder_for_price">Оформить предзаказ за %1$s</string>
+    <string name="application_store_preorder_purchase_confirmation_blurb">%1$s можно будет установить %2$s. А пока вы можете поизучать свою библиотеку.</string>
     <string name="application_store_purchase_application">Купить игру</string>
+    <string name="application_store_purchase_available_date">Доступ откроется %1$s</string>
     <string name="application_store_purchase_bundle">Купить набор</string>
     <string name="application_store_purchase_confirmation_blurb">Вы можете установить %1$s, нажав на кнопку ниже, и после этого запускать игру из библиотеки. Надеемся, она вам понравится!</string>
     <string name="application_store_purchase_confirmation_title_1">Самое время поддаться ажиотажу!</string>
@@ -318,6 +417,9 @@
     <string name="application_store_purchase_consumable">Купить внутриигровой предмет</string>
     <string name="application_store_purchase_dlc">Купить дополнение</string>
     <string name="application_store_purchase_game_unsupported_os">Эта игра работает только под %1$s.</string>
+    <string name="application_store_purchase_gift_confirmation_title">Можно дарить!</string>
+    <string name="application_store_purchase_gift_only">У вас уже есть это приложение — вы можете купить его только в подарок.</string>
+    <string name="application_store_purchase_gift_only_ungiftable">Вы можете купить только подарок, но, к сожалению, данный способ оплаты не поддерживает отправку подарков.</string>
     <string name="application_store_purchase_header_bundles_different">Наборы</string>
     <string name="application_store_purchase_header_bundles_same">Ещё наборы</string>
     <string name="application_store_purchase_header_consumables_different">Внутриигровой предмет</string>
@@ -335,13 +437,22 @@
     <string name="application_store_purchase_header_free_dlc">Получить дополнение</string>
     <string name="application_store_purchase_header_games_different">Игры</string>
     <string name="application_store_purchase_header_games_same">Больше игр</string>
+    <string name="application_store_purchase_header_preorder_application">Оформить предзаказ на игру</string>
+    <string name="application_store_purchase_header_preorder_bundle">Оформить предзаказ на комплект</string>
+    <string name="application_store_purchase_header_preorder_consumable">Оформить предзаказ на внутриигровой предмет</string>
+    <string name="application_store_purchase_header_preorder_dlc">Оформить предзаказ на дополнение</string>
+    <string name="application_store_purchase_header_preorder_entitled">Скоро</string>
+    <string name="application_store_purchase_header_time_left_until_release">Осталось до выхода</string>
     <string name="application_store_purchase_iap">Внутриигровая покупка</string>
     <string name="application_store_purchase_in_library">В библиотеке</string>
     <string name="application_store_purchase_in_library_hidden">В библиотеке (скрыта)</string>
     <string name="application_store_purchase_install_game">Установить игру</string>
     <string name="application_store_purchase_test_mode">Вы находитесь в режиме тестирования приложения. С вас не будут списываться деньги.</string>
+    <string name="application_store_purchase_warning_preorder">Вы оформили предзаказ на эту игру. Доступ откроется %1$s!</string>
+    <string name="application_store_pvp_tooltip">Умеете ли вы управлять своим гневом?</string>
     <string name="application_store_rating_descriptors_esrb_alcohol_reference">Упоминаются алкогольные напитки</string>
     <string name="application_store_rating_descriptors_esrb_animated_blood">Бесцветная или нереалистичная кровь</string>
+    <string name="application_store_rating_descriptors_esrb_animated_violence">Нереалистичное насилие</string>
     <string name="application_store_rating_descriptors_esrb_blood">Присутствует кровь</string>
     <string name="application_store_rating_descriptors_esrb_blood_and_gore">Кровь и расчленение</string>
     <string name="application_store_rating_descriptors_esrb_cartoon_violence">Присутствует нереалистичное насилие</string>
@@ -351,9 +462,17 @@
     <string name="application_store_rating_descriptors_esrb_fantasy_violence">Причинение вреда фантастическим существам, которые не ассоциируются с людьми</string>
     <string name="application_store_rating_descriptors_esrb_in_game_purchases">Внутриигровые покупки</string>
     <string name="application_store_rating_descriptors_esrb_intense_violence">Реалистичное насилие</string>
-    <string name="application_store_rating_descriptors_esrb_language">Сквернословие</string>
+    <string name="application_store_rating_descriptors_esrb_language">Язык</string>
     <string name="application_store_rating_descriptors_esrb_lyrics">Умеренное сквернословие в текстах песен</string>
     <string name="application_store_rating_descriptors_esrb_mature_humor">«Взрослый» юмор</string>
+    <string name="application_store_rating_descriptors_esrb_mild_blood">Присутствует незначительное или умеренное количество крови</string>
+    <string name="application_store_rating_descriptors_esrb_mild_cartoon_violence">Присутствует умеренное нереалистичное насилие</string>
+    <string name="application_store_rating_descriptors_esrb_mild_fantasy_violence">Причинение умеренного вреда фантастическим существам, которые не ассоциируются с людьми</string>
+    <string name="application_store_rating_descriptors_esrb_mild_language">Незначительное или умеренное сквернословие</string>
+    <string name="application_store_rating_descriptors_esrb_mild_lyrics">Незначительное или умеренное сквернословие в текстах песен</string>
+    <string name="application_store_rating_descriptors_esrb_mild_sexual_themes">Незначительное или умеренное количество тем, связанных с сексом</string>
+    <string name="application_store_rating_descriptors_esrb_mild_suggestive_themes">Незначительное или умеренное количество раздражающих или непристойных тем</string>
+    <string name="application_store_rating_descriptors_esrb_mild_violence">Незначительное или умеренное насилие</string>
     <string name="application_store_rating_descriptors_esrb_nudity">Наличие полного обнажения</string>
     <string name="application_store_rating_descriptors_esrb_partual_nudity">Короткие или неоткровенные сцены обнажения</string>
     <string name="application_store_rating_descriptors_esrb_real_gambling">Азартные игры, ставки или пари на реальные деньги</string>
@@ -390,8 +509,11 @@
     <string name="application_store_recommendation_recently_played_double">В эту игру недавно играли %1$s и %2$s</string>
     <string name="application_store_recommendation_recently_played_other">**%1$s из ваших знакомых** играли недавно</string>
     <string name="application_store_recommendation_recently_played_single">В эту игру недавно играл/а %1$s</string>
+    <string name="application_store_recommended_header">Рекомендуемое</string>
     <string name="application_store_restricted">Недоступно в вашем регионе</string>
+    <string name="application_store_rich_presence_tooltip">Покажите подробности о вашем игровом опыте в своём профиле.</string>
     <string name="application_store_search_by_title">Фильтр по названиям</string>
+    <string name="application_store_search_empty">Не удаётся найти нужную игру? Воспользуйтесь другими фильтрами или поищите её в [Путешествии по серверам](goToGuildDiscovery).</string>
     <string name="application_store_section_title_copyright">Авторское право</string>
     <string name="application_store_section_title_details">Подробности</string>
     <string name="application_store_section_title_features">Особенности</string>
@@ -401,7 +523,9 @@
     <string name="application_store_section_title_system_requirements">Системные требования</string>
     <string name="application_store_section_title_verified_guild">Верифицированный сервер Discord</string>
     <string name="application_store_secure_networking">Безопасная работа с соцсетями</string>
+    <string name="application_store_secure_networking_tooltip">Эта игра использует нашу, а не стороннюю сеть.</string>
     <string name="application_store_single_player">Один игрок</string>
+    <string name="application_store_single_player_tooltip">Для тех случаев, когда вы устали от людей!</string>
     <string name="application_store_sort_by">Сортировать по:</string>
     <string name="application_store_specs_cpu">ЦП</string>
     <string name="application_store_specs_memory">ОЗУ</string>
@@ -415,11 +539,13 @@
     <string name="application_store_specs_storage">Место на диске</string>
     <string name="application_store_specs_video">Видео</string>
     <string name="application_store_spectator_mode">Режим наблюдения</string>
+    <string name="application_store_spectator_mode_tooltip">Для тех случаев, когда ваши друзья обедают, а вы заканчиваете матч.</string>
     <string name="application_store_staff_pick">Выбор команды Discord</string>
+    <string name="application_store_the_game_awards_winner">Победитель Game Awards 2018</string>
     <string name="application_store_view_all_news">Посмотреть все новости</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Для этого дополнения вам нужна игра %1$s в Discord. [Подробнее о дополнениях.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Загружаемый контент</string>
-    <string name="application_store_warning_early_access_description">Эта игра очень крутая (во всяком случае, мы так считаем!), но в ней может быть не очень много контента, встречаются баги — короче, она ещё не доделана. [Подробнее о раннем доступе.](%1$s)</string>
+    <string name="application_store_warning_early_access_description">Оставьте свой отзыв и помогите разработчикам сделать игру ещё лучше! Всё ещё в разработке. [Подробнее о раннем доступе.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Ранний доступ</string>
     <string name="application_store_warning_requires_desktop_app_description">Для этой игры вам необходимо установить приложение Discord $[на компьютер](downloadHook).</string>
     <string name="application_store_warning_requires_desktop_app_title">Необходимо приложение для компьютера</string>
@@ -427,6 +553,7 @@
     <string name="application_store_warning_restricted_in_region_title">Недоступно в вашей стране</string>
     <string name="application_store_warning_unavailable_in_language_description">В этой игре нет озвучения, интерфейса или субтитров на выбранном вами языке.</string>
     <string name="application_store_warning_unavailable_in_language_title">Ваш язык не поддерживается</string>
+    <string name="application_store_warning_unavailable_linux_description">Discord пока не поддерживает игры для Linux. Но вы всё равно можете купить эту игру, чтобы запускать её на подходящих операционных системах.</string>
     <string name="application_store_warning_unavailable_linux_title">Недоступно для Linux</string>
     <string name="application_store_warning_unavailable_mac_os_title">Недоступно для macOS</string>
     <string name="application_store_warning_unavailable_os_description">Эта игра не поддерживается вашей текущей операционной системой, но вы всё равно можете её купить, чтобы запускать на подходящих операционных системах.</string>
@@ -439,6 +566,7 @@
     <string name="applications_and_connections">Приложения и привязки</string>
     <string name="applications_and_connections_body">Здесь находятся все суперкрутые приложения, чтобы с ними вами в Discord было суперкруто. А если крутизна, на ваш вкус, вдруг зашкалит, их всегда можно убрать по своему усмотрению.</string>
     <string name="attach_files">Прикреплять файлы</string>
+    <string name="attach_payment_source_prompt_option">Для продолжения добавьте способ оплаты</string>
     <string name="attachment_filename_unknown">безымянный</string>
     <string name="attachment_load_failed">Не удаётся загрузить вложение</string>
     <string name="attachment_processing">Обрабатывается…</string>
@@ -446,6 +574,7 @@
     <string name="attenuate_while_speaking_self">Когда я говорю</string>
     <string name="audio_hint_body">Если ваш браузер не показывает всплывающее уведомление с запросом доступа к микрофону, то перезагрузите страницу и попробуйте снова.</string>
     <string name="audio_hint_title">Разрешите Discord использовать ваш микрофон.</string>
+    <string name="auth_banned_invite_body">Ой-ой. Похоже, вас забанили. Теперь вы не сможете присоединиться к этому серверу и взаимодействовать с ним.</string>
     <string name="auth_browser_handoff_detecting_description">Пытаемся обнаружить учётную запись Discord в вашем браузере по умолчанию. Дайте нам немного времени…</string>
     <string name="auth_disable_email_notifications_failure_body">Извините! Попробуйте ещё раз.</string>
     <string name="auth_disable_email_notifications_failure_header">Упс. Не сработало.</string>
@@ -508,6 +637,8 @@
     <string name="bg">Болгарский</string>
     <string name="billing">Выставление счетов</string>
     <string name="billing_accept_terms_tooltip">Чтобы продолжить, примите Условия Использования</string>
+    <string name="billing_account_credit">Кошелёк учётной записи</string>
+    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s мес. бесплатно</string>
     <string name="billing_add_payment_method">Добавить способ оплаты</string>
     <string name="billing_address">Адрес для выставления счетов</string>
     <string name="billing_address_address">Адрес</string>
@@ -534,43 +665,72 @@
     <string name="billing_address_zip_code_error_required">Нужно указать почтовый индекс</string>
     <string name="billing_address_zip_code_invalid">Неверный почтовый индекс</string>
     <string name="billing_address_zip_code_placeholder">000000</string>
+    <string name="billing_apple_description">Операции Apple не отображаются ниже. Посмотреть историю операций Apple или изменить способ оплаты Apple [можно в настройках способа оплаты Apple](%1$s).</string>
+    <string name="billing_apple_header">Вы подписались на Nitro через Apple.</string>
     <string name="billing_application_consumable_refund_text_unable">Вы не можете вернуть деньги за внутриигровые покупки. Если с ними возникли какие-то проблемы, [обратитесь в нашу службу поддержки.](%1$s)</string>
     <string name="billing_application_refund_text">Возврат средств можно запросить, если вы совершили покупку в последние %1$s дн. и играли в игру меньше %2$s ч. [Наша чуткая служба поддержки поможет вам вернуть свои кровные!](%3$s)</string>
     <string name="billing_application_refund_text_unable">Простите, за эту операцию возврат не предусмотрен. Возврат средств можно запросить, если вы совершили покупку в последние %1$s дн. и играли в игру меньше %2$s ч.</string>
     <string name="billing_change_payment_source">Изменить способ оплаты</string>
-    <string name="billing_error_add_payment_source_streamer_mode">В режиме «Стример» нельзя добавлять новые методы оплаты.</string>
+    <string name="billing_code_redemption_redirect">Эй! Хотите применить ключ Discord? Мы положили его на [ваш склад](onClick).</string>
+    <string name="billing_error_add_payment_source_streamer_mode">В режиме стримера нельзя добавлять новые методы оплаты.</string>
     <string name="billing_error_gateway">Во время обработки платежа что-то пошло не так. Попробуйте ещё раз!</string>
     <string name="billing_error_rate_limit">Вы попытались купить слишком много и слишком быстро. Подождите немного и попробуйте ещё раз!</string>
     <string name="billing_error_section_address">Ой… С этим адресом что-то не так. Пожалуйста, проверьте заполненные поля и попробуйте ещё раз.</string>
     <string name="billing_error_section_card">Ой… С этой картой что-то не так. Пожалуйста, проверьте заполненные поля и попробуйте ещё раз.</string>
+    <string name="billing_gift_copied">Скопировано!</string>
+    <string name="billing_gift_link">Ссылка на подарок</string>
+    <string name="billing_gift_purchase_tooltip">Это был подарок.</string>
+    <string name="billing_gift_refund_text">Возврат средств можно запросить, если вы совершили покупку в последние %1$s дн. и если подарок ещё не был использован. [Наша чуткая служба поддержки поможет вам вернуть свои кровные!](%2$s)</string>
+    <string name="billing_gift_refund_text_unable">Простите, за эту операцию возврат не предусмотрен. Возврат средств можно запросить, если вы совершили покупку в последние %1$s дн. и подарок ещё не был использован.</string>
     <string name="billing_history">История платежей</string>
+    <string name="billing_is_gift_purchase">Это подарок?</string>
     <string name="billing_legal_mumbo_jumbo">Простыня юридического трёпа</string>
-    <string name="billing_legal_mumbo_jumbo_label">Я соглашаюсь с [Условиями Использования Discord Store](%1$s)</string>
+    <string name="billing_legal_mumbo_jumbo_label">Я соглашаюсь с [Условиями Использования Discord](%1$s)</string>
+    <string name="billing_manage_billing">Изменить способ оплаты</string>
+    <string name="billing_manage_subscription">Управление подпиской</string>
+    <string name="billing_managed_by_apple">Ваша подписка обрабатывается Apple.</string>
     <string name="billing_no_payment_method">Нет сохранённых способов оплаты</string>
     <string name="billing_no_payment_method_description">Чтобы быстрее оформлять покупки, сохраните удобный способ оплаты</string>
     <string name="billing_pay_for_it_with">Оплатить при помощи</string>
     <string name="billing_payment_breakdown_taxes">Налоги</string>
     <string name="billing_payment_breakdown_total">Итого</string>
+    <string name="billing_payment_choose_gift">Выберите подарок</string>
+    <string name="billing_payment_choose_plan">Выберите подписку</string>
     <string name="billing_payment_history">История операций</string>
     <string name="billing_payment_premium">Ваша подписка</string>
-    <string name="billing_payment_premium_legalese_monthly">Покупая подписку %1$s, вы соглашаетесь с соответствующими [Условиями Использования Магазина](%2$s). %1$s — подписка с автоматическим продлением, а это значит, что вы разрешаете Discord немедленно взять с вас плату выбранным способом в размере %3$s и делать это каждый месяц, пока вы не отмените подписку. Отказаться от подписки можно в любое время.</string>
-    <string name="billing_payment_premium_legalese_yearly">Покупая подписку %1$s, вы соглашаетесь с соответствующими [Условиями Использования магазина](%2$s). %1$s — подписка с автоматическим продлением, а это значит, что вы разрешаете Discord немедленно взять с вас плату выбранным способом в размере %3$s и делать это каждый год, пока вы не отмените подписку. Отказаться от подписки можно в любое время.</string>
+    <string name="billing_payment_premium_legalese_monthly">Покупая подписку %1$s, вы соглашаетесь с соответствующими [Условиями Использования](%2$s). %1$s — подписка с автоматическим продлением. Вы разрешаете Discord немедленно взять с вас плату выбранным способом в размере %3$s и делать это каждый месяц, пока вы не отмените подписку. Отказаться от подписки можно в любое время.</string>
+    <string name="billing_payment_premium_legalese_yearly">Покупая подписку %1$s, вы соглашаетесь с соответствующими [Условиями Использования](%2$s). %1$s — подписка с автоматическим продлением. Вы разрешаете Discord немедленно взять с вас плату выбранным способом в размере %3$s и делать это каждый год, пока вы не отмените подписку. Отказаться от подписки можно в любое время.</string>
+    <string name="billing_payment_source_invalid">Выбранный источник оплаты недействителен.</string>
     <string name="billing_payment_sources">Способы Оплаты</string>
-    <string name="billing_payment_table_header_amount">СУММА</string>
-    <string name="billing_payment_table_header_date">ДАТА</string>
-    <string name="billing_payment_table_header_description">НАИМЕНОВАНИЕ</string>
+    <string name="billing_payment_table_header_amount">Сумма</string>
+    <string name="billing_payment_table_header_date">Дата</string>
+    <string name="billing_payment_table_header_description">Описание</string>
+    <string name="billing_premium_gift_friend">или подарить другу</string>
+    <string name="billing_premium_gift_month">или подарить месяц</string>
+    <string name="billing_premium_gift_month_mobile">%1$s за 1 месяц</string>
+    <string name="billing_premium_gift_year">или подарить год</string>
+    <string name="billing_premium_gift_year_mobile">%1$s за 1 год</string>
     <string name="billing_premium_refund_text">Возврат средств можно запросить, если вы совершили покупку в последние %1$s дн. [Наша чуткая служба поддержки поможет вам вернуть свои кровные!](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Простите, за эту операцию возврат не предусмотрен. Возврат средств можно запросить, если вы совершили покупку в последние %1$s дн.</string>
+    <string name="billing_preorder_refund_text">Возврат средств за предзаказ можно запросить в любой момент до выхода игры. [Наша чуткая служба поддержки поможет вам вернуть свои кровные!](%1$s)</string>
     <string name="billing_price_per_month">%1$s / месяц</string>
+    <string name="billing_price_per_month_current_plan">(ТЕКУЩИЙ ТАРИФ) %1$s/месяц</string>
+    <string name="billing_price_per_month_current_plan_ios">(Текущий тариф) %1$s/месяц</string>
+    <string name="billing_price_per_month_mobile">%1$s / мес.</string>
     <string name="billing_price_per_month_upgrade">Подписаться за %1$s / месяц</string>
     <string name="billing_price_per_year">%1$s / год</string>
+    <string name="billing_price_per_year_current_plan">(ТЕКУЩИЙ ТАРИФ) %1$s/год</string>
+    <string name="billing_price_per_year_current_plan_ios">(Текущий тариф) %1$s/год</string>
+    <string name="billing_price_per_year_mobile">%1$s / год</string>
+    <string name="billing_price_per_year_months_free">%1$s/год (2 месяца бесплатно)</string>
     <string name="billing_price_per_year_upgrade">Подписаться за %1$s / год</string>
     <string name="billing_purchase_details_header">Реквизиты покупки</string>
     <string name="billing_refund_header">Проблемы с покупкой?</string>
     <string name="billing_refund_play_time_never_played">Ни разу не запускалась</string>
-    <string name="billing_refund_play_time_subheader">ВРЕМЕНИ В ИГРЕ</string>
+    <string name="billing_refund_play_time_subheader">Времени в игре</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">ДАТА ПОКУПКИ</string>
+    <string name="billing_refund_purchase_date_subheader">Дата покупки</string>
+    <string name="billing_refund_release_date_subheader">Дата выхода</string>
     <string name="billing_refund_report_a_problem">Сообщить о проблеме</string>
     <string name="billing_refund_request_button">Запросить возврат</string>
     <string name="billing_sales_tax_added">На основании вашего адреса выставления счетов к счету добавлен налог на продажи %1$s.</string>
@@ -578,14 +738,17 @@
     <string name="billing_secure_tooltip">Информация обо всех ваших способах оплаты зашифрована и хранится в безопасной системе обработки платежей.</string>
     <string name="billing_step_address">Адрес</string>
     <string name="billing_step_credit_card_information">Платёжная информация</string>
+    <string name="billing_step_payment_info">Платёжная информация</string>
     <string name="billing_step_payment_type">Тип оплаты</string>
     <string name="billing_step_paypal">Реквизиты PayPal</string>
     <string name="billing_step_review">Просмотреть</string>
+    <string name="billing_step_select_plan">Выберите подписку</string>
     <string name="billing_subscribe">Подписаться</string>
     <string name="billing_tag_failed">Сбой</string>
     <string name="billing_tag_pending">Ожидание</string>
     <string name="billing_tag_refunded">Возврат</string>
     <string name="billing_tag_reversed">Отменено</string>
+    <string name="billing_third_party_eula_label">Я соглашаюсь с [Лицензионным соглашением конечного пользователя %1$s]((onClick))</string>
     <string name="block">Заблокировать</string>
     <string name="blocked">Заблокированные</string>
     <string name="blocked_messages">%1$s</string>
@@ -597,7 +760,14 @@
     <string name="bot_gdm_explicit_content">Полегче! Приятель из %1$s попросил, чтобы Discord блокировал любые сообщения, которые наши дотошные робохомячки сочтут нежелательными. Детектор сработал, и ваше сообщение не было отправлено. Пожалуйста, будьте вежливыми.</string>
     <string name="bot_guild_explicit_content">Полегче! Владелец %1$s попросил, чтобы Discord блокировал любые сообщения, которые наши дотошные робохомячки сочтут нежелательными. Детектор сработал, и ваше сообщение не было отправлено. Пожалуйста, будьте вежливыми.</string>
     <string name="bot_requires_email_verification">Вам нужно подтвердить ваш адрес электронной почты, прежде чем вы сможете отправлять здесь сообщения.</string>
+    <string name="bot_tag_bot">БОТ</string>
+    <string name="bot_tag_server">СЕРВЕР</string>
     <string name="bot_video_disabled">Кажется, у вас недостаточно пропускной способности канала, чтобы получать видео, поэтому мы отключили эту функцию.</string>
+    <string name="bots">Боты</string>
+    <string name="bots_settings_add">Добавить бота</string>
+    <string name="bots_settings_description">Добавьте бота, чтобы вывести сервер на новый уровень — у вас будет музыка, инструменты сообщества, текстовые игры и многое другое.</string>
+    <string name="bots_settings_learn_more">Узнать больше</string>
+    <string name="bots_settings_remove">Удалить бота</string>
     <string name="browser_app">Приложения Discord</string>
     <string name="browser_handoff_authenticating_description">Пытаемся аутентифицировать приложение Discord для компьютера. Не закрывайте это окно.</string>
     <string name="browser_handoff_authenticating_title">Аутентификация</string>
@@ -618,6 +788,18 @@
     <string name="browser_output_device_warning">"Устройства вывода не могут быть изменены через браузер. [Загрузите](onDownloadClick) приложение для компьютера,
 чтобы получить полный контроль над устройствами вывода."</string>
     <string name="bug_hunter_badge_tooltip">Discord Bug Hunter</string>
+    <string name="build_override">Переопределение сборки</string>
+    <string name="build_override_apply">Подать заявку</string>
+    <string name="build_override_clear">Очистить</string>
+    <string name="build_override_expired">Сборка устарела</string>
+    <string name="build_override_for">Переопределение сборки для %1$s</string>
+    <string name="build_override_id">ID сборки</string>
+    <string name="build_override_incompatible_client">Только клиент %1$s</string>
+    <string name="build_override_invalid">Некорректное переопределение сборки</string>
+    <string name="build_override_invalid_user">Некорректный пользователь</string>
+    <string name="build_override_isnt_available">Сборка недоступна</string>
+    <string name="build_override_link_copied">Ссылка скопирована!</string>
+    <string name="build_override_link_copy">Копировать ссылку</string>
     <string name="bundle_ready_body">Перезапустите Discord, чтобы получить некоторые улучшения!</string>
     <string name="bundle_ready_later">Не сейчас</string>
     <string name="bundle_ready_restart">Перезапустить</string>
@@ -648,10 +830,10 @@
     <string name="captcha_failed">Не удалось пройти капчу. Пожалуйста, попробуйте снова.</string>
     <string name="captcha_failed_play_services">Не удалось выполнить проверку через капчу. Необходимы сервисы Google Play. После установки или обновления, пожалуйста, перезапустите приложение и попробуйте снова.</string>
     <string name="captcha_failed_unsupported">Не удалось выполнить проверку через капчу. Ваше устройство не поддерживается.</string>
-    <string name="captcha_issues">Сложности с CAPTCHA?</string>
+    <string name="captcha_issues">Сложности с капчей?</string>
     <string name="captcha_open_browser">Открыть браузер</string>
-    <string name="captcha_problems">Проблемы с CAPTCHA?</string>
-    <string name="captcha_problems_info">Если вы не можете пройти CAPTCHA, попробуйте сделать это в браузере.</string>
+    <string name="captcha_problems">Проблемы с капчей?</string>
+    <string name="captcha_problems_info">Если вы не можете пройти капчу, попробуйте сделать это в браузере.</string>
     <string name="categories">Категории</string>
     <string name="category">Категория</string>
     <string name="category_has_been_deleted">Категория удалена.</string>
@@ -659,8 +841,9 @@
     <string name="category_settings">Настройки категории</string>
     <string name="category_settings_have_been_updated">Настройки категории обновлены.</string>
     <string name="certified">Сертифицированное</string>
-    <string name="certified_device_recommendation_audio_input_body">Discord обнаружил сертифицированное устройство ввода аудио **%1$s %2$s**. Мы рекомендуем переключиться на него для оптимального использования.</string>
-    <string name="certified_device_recommendation_audio_output_body">Discord обнаружил сертифицированное устройство вывода аудио **%1$s %2$s**. Мы рекомендуем переключиться на него для оптимального использования.</string>
+    <string name="certified_device_recommendation_audio_input_and_output_body">Discord обнаружил сертифицированное аудиоустройство **%1$s %2$s**. Мы рекомендуем переключиться на него для оптимального использования.</string>
+    <string name="certified_device_recommendation_audio_input_body">Discord обнаружил сертифицированное устройство ввода звука **%1$s %2$s**. Мы рекомендуем переключиться на него для оптимального использования.</string>
+    <string name="certified_device_recommendation_audio_output_body">Discord обнаружил сертифицированное устройство вывода звука **%1$s %2$s**. Мы рекомендуем переключиться на него для оптимального использования.</string>
     <string name="certified_device_recommendation_cancel">Нет, спасибо.</string>
     <string name="certified_device_recommendation_confirm">Переключиться</string>
     <string name="certified_device_recommendation_title">Обнаружено сертифицированное устройство</string>
@@ -668,9 +851,10 @@
     <string name="change">Изменить</string>
     <string name="change_avatar">"Изменить
 аватар"</string>
+    <string name="change_banner">Сменить баннер</string>
     <string name="change_category">Изменить категорию</string>
     <string name="change_email">Нажмите тут, чтобы поменять электронную почту</string>
-    <string name="change_email_short">Сменить адрес почты</string>
+    <string name="change_email_short">Сменить адрес эл. почты</string>
     <string name="change_icon">"Сменить
 значок"</string>
     <string name="change_log">Список изменений</string>
@@ -691,6 +875,7 @@
     <string name="change_password_link">Изменить пароль?</string>
     <string name="change_phone_number">Изменить номер телефона?</string>
     <string name="change_plan">Изменить подписку</string>
+    <string name="change_splash">Сменить фон</string>
     <string name="change_url">Изменить адрес</string>
     <string name="change_vanity_url">Изменить персональный URL</string>
     <string name="change_vanity_url_error">"Персональный URL не может быть изменён, поскольку содержит недопустимые символы, слишком короткий или уже занят.
@@ -701,6 +886,7 @@
     <string name="channel_locked_short">Канал заблокирован</string>
     <string name="channel_locked_to_category">Синхронизация прав с категорией «**%1$s**»</string>
     <string name="channel_members">Участники канала</string>
+    <string name="channel_mute_role_description">Включает и отключает уведомления канала</string>
     <string name="channel_mute_tooltip">Отключение уведомлений канала убирает индикатор непрочитанных сообщений и всплывающие уведомления, пока вы не упомянуты.</string>
     <string name="channel_name_required">Требуется название канала.</string>
     <string name="channel_or_category">Канал или категория</string>
@@ -709,12 +895,15 @@
     <string name="channel_select">Выберите канал</string>
     <string name="channel_settings">Параметры канала</string>
     <string name="channel_settings_have_been_updated">Настройки канала обновлены.</string>
-    <string name="channel_slowmode_cooldown">Включён медленный режим. Следующее сообщение вы сможете отправить через %1$s.</string>
+    <string name="channel_slowmode_cooldown">Включён медленный режим. Следующее сообщение в этом канале вы сможете отправить через %1$s.</string>
     <string name="channel_slowmode_desc">Включён медленный режим. Участники беседы могут отправлять сообщение раз в %1$s.</string>
+    <string name="channel_slowmode_desc_hours">Включён медленный режим. Участники беседы могут отправлять сообщение раз в %1$s %2$s %3$s</string>
     <string name="channel_slowmode_desc_immune">Включён медленный режим, а у вас иммунитет. Круто!</string>
+    <string name="channel_slowmode_desc_minutes">Включён медленный режим. Участники беседы могут отправлять сообщение раз в %1$s %2$s</string>
     <string name="channel_slowmode_desc_short">Медленный режим включён</string>
     <string name="channel_topic_empty">Тема не задана.</string>
     <string name="channel_type">Тип канала</string>
+    <string name="channel_unmute_tooltip">Включив уведомления канала, вы увидите индикатор непрочитанных сообщений и всплывающие уведомления сообщений.</string>
     <string name="channels">Каналы</string>
     <string name="channels_unavailable_body">Вы оказались в странном месте. У вас нет доступа к текстовым каналам, или на этом сервере их нет.</string>
     <string name="channels_unavailable_title">Нет текстовых каналов</string>
@@ -723,6 +912,7 @@
     <string name="chat_attach_invite_to_spectate_game">Пригласить %1$s понаблюдать за %2$s</string>
     <string name="chat_attach_invite_to_watch">Пригласить %1$s посмотреть %2$s</string>
     <string name="chat_attach_upload_a_file">Отправить файл</string>
+    <string name="chat_attach_upload_or_invite">Отправить файл или приглашения</string>
     <string name="chat_behavior">Поведение чата</string>
     <string name="checking_for_updates">Проверка обновлений</string>
     <string name="choose">Выбрать</string>
@@ -767,6 +957,7 @@
     <string name="command_nick_reset">Ваш никнейм на сервере был сброшен.</string>
     <string name="command_nick_success">Ваш никнейм на сервере был изменён на **%1$s**.</string>
     <string name="command_shrug_description">Добавляет к вашему сообщению ¯\\_(ツ)_/¯</string>
+    <string name="command_spoiler_description">Отмечает сообщение как спойлер.</string>
     <string name="command_tableflip_description">Добавляет к вашему сообщению (╯°□°）╯︵ ┻━┻</string>
     <string name="command_tableunflip_description">Добавляет к вашему сообщению ┬─┬ ノ( ゜-゜ノ)</string>
     <string name="command_tts_description">Используйте text-to-speech, чтобы сообщение было зачитано всем участникам, которые находятся в канале.</string>
@@ -814,12 +1005,21 @@
     <string name="connected_accounts">Подключённые учётные записи</string>
     <string name="connected_accounts_none">Привяжите свои учётные записи, чтобы открыть специальные интеграции с Discord</string>
     <string name="connected_accounts_none_title">Нет интеграций</string>
+    <string name="connected_device_detected_cancel_button">Не переключаться</string>
+    <string name="connected_device_detected_confirm_button">Сменить устройство</string>
+    <string name="connected_device_detected_input_and_output_body">Меняете периферию? Приложение Discord обнаружило новое аудиоустройство **%1$s**! Переключиться на него?</string>
+    <string name="connected_device_detected_input_body">Меняете периферию? Приложение Discord обнаружило новое устройство ввода звука **%1$s**! Переключиться на него?</string>
+    <string name="connected_device_detected_option_input">Сменить только устройство ввода</string>
+    <string name="connected_device_detected_option_input_and_output">Сменить устройства ввода и вывода</string>
+    <string name="connected_device_detected_option_output">Сменить только устройство вывода</string>
+    <string name="connected_device_detected_output_body">Меняете периферию? Приложение Discord обнаружило новое устройство вывода звука **%1$s**! Переключиться на него?</string>
+    <string name="connected_device_detected_title">Обнаружено новое аудиоустройство</string>
     <string name="connecting">Подключение</string>
     <string name="connecting_problems_cta">Проблемы с подключением? Сообщите нам!</string>
     <string name="connection_enter_code">Введите код, когда он отобразится на экране</string>
     <string name="connection_invalid_pin">Введён неверный PIN-код</string>
     <string name="connection_login_with">или войдите через</string>
-    <string name="connection_problems_body">Проверьте [состояние сервера] (%1$s) или задайте нам вопрос в Twitter [@discordapp](%2$s).</string>
+    <string name="connection_problems_body">Проверьте [состояние сервера](%1$s) или твитните нам [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Аутентификация</string>
     <string name="connection_status_awaiting_endpoint">Ожидание ответа сервера</string>
     <string name="connection_status_connected">Подключено</string>
@@ -837,13 +1037,18 @@
     <string name="content_matching">Результаты %1$s по запросу **%2$s**</string>
     <string name="context_menu_hint">Для других действий щёлкните правой кнопкой по пользователю</string>
     <string name="continue_to_webapp">Перейти в Discord</string>
+    <string name="control_volume">Изменить громкость</string>
     <string name="convert_emoticons">Автоматически преобразовывать смайлы в ваших сообщениях в эмодзи.</string>
+    <string name="convert_emoticons_help">Например, если вы введёте \\:\\-\\), Discord превратит это в :slight_smile:</string>
+    <string name="copied">Скопировано</string>
     <string name="copied_text">Скопировано в буфер обмена.</string>
     <string name="copy">Копировать</string>
     <string name="copy_channel_topic">Скопировать заголовок</string>
+    <string name="copy_code">Скопировать %1$s в буфер обмена</string>
     <string name="copy_id">Копировать ID</string>
     <string name="copy_image_url">Копировать URL изображения</string>
     <string name="copy_link">Копировать ссылку</string>
+    <string name="copy_message_link">Скопировать ссылку на сообщение</string>
     <string name="copy_owner_id">Копировать ID владельца</string>
     <string name="copy_text">Скопировать текст</string>
     <string name="copy_username">Копировать имя пользователя</string>
@@ -863,17 +1068,30 @@
     <string name="create">Создать</string>
     <string name="create_category">Создать категорию</string>
     <string name="create_channel">Создать канал</string>
-    <string name="create_group_dm">Создать группу ЛС</string>
-    <string name="create_instant_invite">Создать экспресс-приглашение</string>
+    <string name="create_group_dm">Создать групповой чат</string>
+    <string name="create_instant_invite">Создание приглашения</string>
     <string name="create_link">Создать ссылку</string>
+    <string name="create_news_channel">Создать канал с объявлениями</string>
     <string name="create_or_join_modal_header">Ага, ещё один сервер, да?</string>
     <string name="create_server_button_body">Создайте новый сервер и пригласите друзей. Это бесплатно!</string>
     <string name="create_server_button_cta">Создать сервер</string>
     <string name="create_server_button_cta_mobile">Создать новый сервер</string>
     <string name="create_server_button_cta_mobile_desc">Создайте сервер, пригласите друзей, устройте вечеринку!</string>
     <string name="create_server_description">Создав сервер, вы получите доступ к **бесплатным** голосовым и текстовым чатам для общения с друзьями.</string>
+    <string name="create_server_description_mobile">Ваш сервер — это место, где тусуются ваши товарищи по играм. Запустите сервер и бесплатно болтайте со своими друзьями.</string>
     <string name="create_server_guidelines">Создавая сервер, вы соглашаетесь c **[Правилами Сообщества](%1$s)** Discord.</string>
     <string name="create_server_title">Создать свой сервер</string>
+    <string name="create_store_channel">Создать канал магазина</string>
+    <string name="create_store_channel_application">Приложение</string>
+    <string name="create_store_channel_beta_note">Бета-каналы позволяют пользователям бесплатно получить тестовые ветви вашей игры. [Подробнее о бета-каналах.](%1$s)</string>
+    <string name="create_store_channel_beta_title">Бета-канал</string>
+    <string name="create_store_channel_branch">Ветвь</string>
+    <string name="create_store_channel_no_branches">Нет доступных ветвей</string>
+    <string name="create_store_channel_no_skus">Нет доступных SKU</string>
+    <string name="create_store_channel_no_skus_error">Нам не удалось найти SKU для вашей игры! Создайте их на нашем [Портале для разработчиков](%1$s).</string>
+    <string name="create_store_channel_select_application">Выбрать приложение</string>
+    <string name="create_store_channel_select_branch">Выбрать ветвь</string>
+    <string name="create_store_channel_select_sku">Выбрать SKU</string>
     <string name="create_text_channel">Создать текстовый канал</string>
     <string name="create_voice_channel">Создать голосовой канал</string>
     <string name="credit_card_cvc">Код CVC</string>
@@ -891,6 +1109,17 @@
     <string name="cs">Чешский</string>
     <string name="currently_controlling">Управление вашим Discord</string>
     <string name="custom_color">Пользовательский цвет</string>
+    <string name="custom_status_clear_after">Удалить через</string>
+    <string name="custom_status_clear_custom_status">Удалить статус</string>
+    <string name="custom_status_dont_clear">Не удалять</string>
+    <string name="custom_status_edit_custom_status">Изменить статус</string>
+    <string name="custom_status_hotspot">Попробуйте задать пользовательский статус!</string>
+    <string name="custom_status_hours">%1$s</string>
+    <string name="custom_status_minutes">%1$s</string>
+    <string name="custom_status_modal_body">Как жизнь, %1$s?</string>
+    <string name="custom_status_modal_placeholder">Поддержка прибыла</string>
+    <string name="custom_status_set_custom_status">Задать пользовательский статус</string>
+    <string name="custom_status_today">Сегодня</string>
     <string name="custom_tabs_mobile_body">Использовать Chrome Custom Tabs для ссылок вместо стороннего браузера.</string>
     <string name="custom_tabs_mobile_header">Использовать Chrome Custom Tabs</string>
     <string name="cut">Вырезать</string>
@@ -911,7 +1140,7 @@
     <string name="data_privacy_controls_request_data_modal_success">Наши хомячки конфиденциальности начали собирать ваши данные. Это может занять до тридцати дней — мы отправим письмо на ваш e-mail, как только всё будет готово.</string>
     <string name="data_privacy_controls_request_data_modal_success_title">Данные запрошены</string>
     <string name="data_privacy_controls_request_data_modal_title">Отправка запроса предоставления данных</string>
-    <string name="data_privacy_controls_request_data_note">[Узнать подробнее](%1$s) о процессе получения копии персональных данных.</string>
+    <string name="data_privacy_controls_request_data_note">[Узнать подробнее](%1$s) о процессе получения копии личных данных.</string>
     <string name="data_privacy_controls_request_data_success_body">Как только всё будет готово, мы отправим вам по e-mail ссылку для скачивания.</string>
     <string name="data_privacy_controls_request_data_success_title">Запрос получен</string>
     <string name="data_privacy_controls_request_data_tooltip">Чтобы запросить персональные данные, учётная запись должна быть подтверждена по e-mail. Вы можете подтвердить свою учётную запись в разделе «Моя учётная запись»</string>
@@ -927,9 +1156,11 @@
     <string name="debug">Отладка</string>
     <string name="decline">Отклонить</string>
     <string name="default_app_description">- Не предоставлено -</string>
+    <string name="default_input_placeholder">Загрузка…</string>
     <string name="delete">Удалить</string>
     <string name="delete_account">Удалить уч. запись</string>
     <string name="delete_account_body">Вы уверены, что хотите удалить свою учётную запись? Вы немедленно выйдете из неё и больше не сможете войти.</string>
+    <string name="delete_account_error">Ошибка при удалении учётной записи</string>
     <string name="delete_account_transfer_ownership">Вы владеете серверами!</string>
     <string name="delete_account_transfer_ownership_body">Чтобы удалить свою учётную запись, необходимо сначала передать права на все сервера, которыми вы владеете.</string>
     <string name="delete_app">Удалить приложение</string>
@@ -937,6 +1168,7 @@
     <string name="delete_category">Удалить категорию</string>
     <string name="delete_channel">Удалить канал</string>
     <string name="delete_channel_body">Вы уверены, что хотите удалить **%1$s**? Это действие не может быть отменено.</string>
+    <string name="delete_followed_news_body">Это сообщение будет удалено на всех серверах, подписанных на этот канал. Правда, этот процесс может занять некоторое время.</string>
     <string name="delete_message">Удалить сообщение</string>
     <string name="delete_message_body">Вы действительно хотите удалить это сообщение?</string>
     <string name="delete_message_context_menu_hint">Чтобы полностью обойти это подтверждение, удерживайте Shift при нажатии на **«Удалить сообщение»**.</string>
@@ -945,6 +1177,7 @@
     <string name="delete_message_history_option_none">Ничего не удалять</string>
     <string name="delete_message_report">Сообщить команде доверия и безопасности Discord.</string>
     <string name="delete_message_title">Удалить сообщение</string>
+    <string name="delete_role">Удалить %1$s</string>
     <string name="delete_role_mobile">Удалить роль</string>
     <string name="delete_server">Удалить сервер</string>
     <string name="delete_server_body">Вы уверены, что хотите удалить **%1$s**? Это действие нельзя отменить.</string>
@@ -952,9 +1185,10 @@
     <string name="delete_server_incorrect_name">Вы неправильно ввели название сервера</string>
     <string name="delete_server_title">"Удалить '%1$s'"</string>
     <string name="description">Описание</string>
+    <string name="desktop_app">Приложение для компьютера</string>
     <string name="desktop_icon_badge">Включить индикатор непрочитанного</string>
     <string name="desktop_notifications_enable">Включить уведомления на рабочем столе</string>
-    <string name="desktop_notifications_enable_body">Ищете настройки уведомлений канала или сервера? Нажмите ПКМ на иконке нужного сервера и выберите «Параметры уведомлений».</string>
+    <string name="desktop_notifications_enable_body">Ищете настройки уведомлений канала или сервера? Нажмите ПКМ на значке нужного сервера и выберите «Параметры уведомлений».</string>
     <string name="detect_platform_accounts">Автоматически обнаруживать учётные записи с других платформ на этом компьютере.</string>
     <string name="developer_application_test_mode">Режим тестирования приложения</string>
     <string name="developer_application_test_mode_activate">Активировать</string>
@@ -980,7 +1214,7 @@
     <string name="disable_email_notifications_failed_suggestion">Уведомления по электронной почте были отключены, или адрес электронной почты не связан с учётной записью Discord.</string>
     <string name="disable_integration_title">Отключить синхронизацию</string>
     <string name="disable_integration_twitch_body">После отключения синхронизации ко всем, у кого закончилась подписка, будет применена выбранная мера.</string>
-    <string name="disable_integration_youtube_body">После отключения синхронизации ко всем спонсорам, у которых закончилась подписка, будет применена выбранная мера.</string>
+    <string name="disable_integration_youtube_body">После отключения синхронизации ко всем, у кого закончилось членство, будет применена выбранная мера.</string>
     <string name="disable_notifications_description">Все уведомления на рабочем столе будут отключены.</string>
     <string name="disable_notifications_label">Отключить уведомления</string>
     <string name="disable_sounds_description">Все звуковые эффекты будут отключены.</string>
@@ -989,17 +1223,24 @@
     <string name="discard_changes">Отменить не сохранённые изменения?</string>
     <string name="discard_changes_description">У вас имеются не сохранённые изменения. Вы уверены, что хотите отменить их?</string>
     <string name="disconnect">Отключиться</string>
-    <string name="disconnect_account">Отсоединить</string>
-    <string name="disconnect_account_body">Отсоединение вашей учётной записи может отключить вас от серверов, к которым вы подключались через эту учётную запись.</string>
-    <string name="disconnect_account_title">Отсоединить %1$s</string>
+    <string name="disconnect_account">Отключить</string>
+    <string name="disconnect_account_body">Отключение вашей учётной записи может отключить вас от серверов, к которым вы подключались через эту учётную запись.</string>
+    <string name="disconnect_account_title">Отключить %1$s</string>
     <string name="disconnect_from_voice">Отключиться от голосового чата</string>
     <string name="discord_desc_long">Бесплатный и безопасный чат для геймеров, работает на компьютере и смартфоне.</string>
     <string name="discord_desc_short">Командный голосовой и текстовый чат</string>
+    <string name="discover">Путешествие</string>
+    <string name="discover_communities">Путешествие — найдите новые сообщества в Discord</string>
+    <string name="discover_friend_servers">Серверы с вашими друзьями</string>
+    <string name="discover_recommended">Рекомендуемое</string>
+    <string name="discovery">Путешествие</string>
     <string name="dismiss">Отклонить</string>
-    <string name="dispatch_error_modal_body">Что-то пошло не так. Если проблема не исчезнет, отправьте обращение в службу поддержки, скопировав в него следующий текст.</string>
+    <string name="dispatch_error_modal_body">Если проблема не исчезнет, отправьте обращение в службу поддержки, скопировав в него следующий текст.</string>
+    <string name="dispatch_error_modal_description">Что-то пошло не так. [Обратитесь за помощью.](%1$s)</string>
     <string name="dispatch_error_modal_error_label">Сообщение об ошибке (скопируйте и вставьте)</string>
     <string name="dispatch_error_modal_header">Ошибка Discord Dispatch</string>
     <string name="dispatch_error_modal_open_ticket">Отправить обращение</string>
+    <string name="dispatch_game_launch_failed_launch_target_not_found">Не удалось запустить игру. Не найден исполняемый файл. Восстановите игру и попробуйте ещё раз.</string>
     <string name="display">Показать</string>
     <string name="display_activity">Отображать %1$s как свой статус</string>
     <string name="display_on_profile">Отображать в профиле</string>
@@ -1007,6 +1248,7 @@
     <string name="display_option_never">Никогда</string>
     <string name="display_option_only_while_speaking">Только во время разговора</string>
     <string name="display_silence_warning">Показывать предупреждение, если Discord не обнаруживает звук из вашего микрофона.</string>
+    <string name="dm">Личное сообщение</string>
     <string name="dm_search_instruction">Поиск пользователя на всех ваших серверах.</string>
     <string name="dm_search_placeholder">Найти или начать беседу</string>
     <string name="dm_settings">Настройки сообщений</string>
@@ -1021,18 +1263,25 @@
     <string name="download_desktop_title">Пользуйтесь Discord дома</string>
     <string name="download_failed">Ошибка загрузки</string>
     <string name="download_file_complete">%1$s загружен</string>
+    <string name="download_mobile_apps_description">Не пропускайте сообщения!</string>
+    <string name="download_mobile_apps_description_with_username">Не пропускайте сообщения от **%1$s**!</string>
+    <string name="download_mobile_apps_title">Получить Discord для мобильных устройств</string>
     <string name="download_mobile_modal_apps_header">Скачать мобильное приложение Discord</string>
     <string name="download_mobile_title">Или в дороге</string>
     <string name="duration_days">%1$s</string>
     <string name="duration_hours">%1$s</string>
+    <string name="duration_hours_short">%1$s</string>
     <string name="duration_mins">%1$s мин.</string>
     <string name="duration_minutes">%1$s</string>
+    <string name="duration_minutes_short">%1$s</string>
     <string name="duration_seconds">%1$s</string>
+    <string name="duration_seconds_short">%1$s</string>
     <string name="early_supporter_tooltip">Ранее поддержавшие</string>
     <string name="echo_cancellation">Эхоподавление</string>
     <string name="edit">Изменить</string>
     <string name="edit_category">Редактировать категорию</string>
     <string name="edit_channel">Настроить канал</string>
+    <string name="edit_followed_news_body">Это сообщение будет обновлено на всех серверах, подписанных на этот канал. Правда, этот процесс может занять некоторое время.</string>
     <string name="edit_message">Редактировать</string>
     <string name="edit_note">Изменить заметку</string>
     <string name="edit_overview">Редактировать обзор</string>
@@ -1046,7 +1295,7 @@
     <string name="elevated_permissions_sound_no_sound_button">Стримить без звука</string>
     <string name="elevated_permissions_sound_request_access_button">Предоставить доступ</string>
     <string name="elevated_permissions_sound_title">Доступ к звуку</string>
-    <string name="email">Электронный адрес</string>
+    <string name="email">Электронная почта</string>
     <string name="email_invalid">Вы указали недействительный адрес эл. почты, исправьте его и повторите попытку.</string>
     <string name="email_required">Требуется действительный адрес электронной почты.</string>
     <string name="email_verification_instructions_body">Мы отправили инструкции по смене пароля на **%1$s**, пожалуйста, проверьте папки «Входящие» и «Спам».</string>
@@ -1063,6 +1312,7 @@
     <string name="emoji_category_recent">Часто используемые</string>
     <string name="emoji_category_symbols">Символы</string>
     <string name="emoji_category_travel">Путешествия</string>
+    <string name="emoji_disabled_premium_tier_lost">Пока недостаточный уровень усиления сервера</string>
     <string name="emoji_matching">Эмодзи, названия которых содержат **%1$s**</string>
     <string name="emoji_name">Имя</string>
     <string name="emoji_slots_available">%1$s</string>
@@ -1074,14 +1324,16 @@
     <string name="enable_privacy_access">Вы можете разрешить доступ в настройках конфиденциальности.</string>
     <string name="enable_streamer_mode_description">Вы можете назначить горячие клавиши переключения режима стримера в [настройках горячих клавиш](onClick).</string>
     <string name="enable_streamer_mode_label">Включить режим стримера</string>
-    <string name="enable_twitch_emoji_sync">Разрешить синхронизированным подписчикам использовать пользовательские смайлики Twitch.</string>
+    <string name="enable_twitch_emoji_sync">Разрешить синхронизированным подписчикам использовать пользовательские смайлики Twitch в Discord.</string>
     <string name="enter_email_body">Для того, чтобы подтвердить свой адрес электронной почты, вам необходимо сначала ввести его.</string>
     <string name="enter_phone_description">Пожалуйста, введите свой номер телефона. Вы получите SMS с кодом подтверждения.</string>
     <string name="enter_phone_title">Введите номер телефона</string>
     <string name="enter_vanity_url">Введите персональный URL</string>
     <string name="errors_action_to_take">Мы отследили ошибку и вскоре ей займёмся.</string>
+    <string name="errors_activity_feed_crash">В ленте событий возник неожиданный сбой….</string>
     <string name="errors_reload">Перезагрузить</string>
     <string name="errors_restart_app">Перезапустить Discord</string>
+    <string name="errors_store_crash">В магазине возник неожиданный сбой….</string>
     <string name="errors_unexpected_crash">В приложении Discord возник неожиданный сбой….</string>
     <string name="es_es">Испанский</string>
     <string name="everyone_popout_body">Используя **%1$s**, вы собираетесь упомянуть %2$s+ человек. Вы уверены?</string>
@@ -1111,12 +1363,24 @@
     <string name="file_rate_mb">%1$s МБ/с</string>
     <string name="file_size_gb">%1$s ГБ</string>
     <string name="file_size_mb">%1$s МБ</string>
-    <string name="file_upload_limit_premium">50МБ</string>
+    <string name="file_upload_limit_premium_tier_1">50МБ</string>
     <string name="file_upload_limit_standard">8МБ</string>
     <string name="filter">Фильтр</string>
     <string name="filter_mentions">Фильтр упоминаний</string>
     <string name="filter_options">Параметры фильтра</string>
     <string name="focus_participant">Фокус на этом человеке</string>
+    <string name="follow">Подписаться</string>
+    <string name="follow_modal_body">Выберите сервер и канал, на которые будут отправляться все новости. Выбор можно отменить в любое время в настройках сервера, в разделе «Вебхуки».</string>
+    <string name="follow_modal_fail">Не удалось подписаться на канал. Попробуйте ещё раз.</string>
+    <string name="follow_modal_header">Я хочу получать новости канала #%1$s сервера %2$s!</string>
+    <string name="follow_modal_hint">Отображаются только серверы и каналы, на которых у вас есть права на добавление вебхуков.</string>
+    <string name="follow_modal_hint_no_perms">Ой! Вы не можете добавлять вебхуки ни на один из серверов, на которых вы общаетесь. Попросите администратора сервера предоставить вам права или подписаться на этот канал!</string>
+    <string name="follow_modal_too_many_webhooks">У выбранного канала слишком много вебхуков. Удалите вебхук или выберите другой канал.</string>
+    <string name="follow_news_chat_input_message">Подпишитесь на канал, чтобы его обновления поступали прямо на ваш сервер.</string>
+    <string name="follow_success_modal_body">Избранные новости этого канала теперь будут автоматически публиковаться у вас на сервере. Хорошего дня!</string>
+    <string name="follow_success_modal_header">Ура! Вы подписались на канал #%1$s сервера %2$s!</string>
+    <string name="follower_analytics">Объявления</string>
+    <string name="follower_analytics_header">Аналитика</string>
     <string name="force_sync">Принудительная синхронизация</string>
     <string name="forgot_password">Забыли пароль?</string>
     <string name="forgot_password_body">Не волнуйтесь! Введите e-mail, привязанный к вашей учётной записи, чтобы мы могли убедиться, что это вы.</string>
@@ -1124,7 +1388,7 @@
     <string name="form_checkbox_qos">Включить обслуживание пакетов с высоким приоритетом</string>
     <string name="form_description_audio_mode_android_call">Если у вас возникают проблемы с микрофоном или наушниками, попробуйте этот аудиорежим. А если нет, оставьте всё как есть.</string>
     <string name="form_description_audio_mode_android_communication">Это стандартный аудиорежим в приложениях для голосового общения вроде Discord. Мы рекомендуем вам ничего не менять.</string>
-    <string name="form_description_push_afk_timeout">"Discord не присылает уведомления на мобильный, пока вы за компьютером.
+    <string name="form_description_push_afk_timeout">"Discord не присылает Push-уведомления на мобильный, пока вы за компьютером.
 Эта настройка задаёт интервал времени AFK, через который вам снова начнут поступать уведомления."</string>
     <string name="form_description_tts">Включите это, если хотите, чтобы уведомления для вас озвучивал высокотехнологичный робот.</string>
     <string name="form_error_generic">Ого! Возникла какая-то очень редкая ошибка. Похоже, это мы недоглядели, так что попробуйте ещё раз чуть позже или загляните на [нашу страницу о состоянии платформы](%1$s).</string>
@@ -1133,8 +1397,7 @@
     <string name="form_help_attenuation">"Снижает громкость звука в других приложениях на указанный процент, когда кто-то говорит.
 Значение 0%% полностью отключает этот эффект."</string>
     <string name="form_help_automatic_vad">Если индикатор полностью зелёный, значит Discord транслирует ваш чарующий голос.</string>
-    <string name="form_help_bitrate">"**ВНИМАНИЕ!** Не поднимайте битрейт выше %1$sкбит/с, если вы, конечно, не аудиофил. Никакого заметного эффекта это всё равно не даст,
-но может создать проблемы людям, использующим мобильное приложение, и тем, у кого низкая скорость соединения."</string>
+    <string name="form_help_bitrate">ВНИМАНИЕ! Не поднимайте битрейт выше %1$s кбит/с, чтобы не создать проблемы людям с низкой скоростью соединения.</string>
     <string name="form_help_certified_voice_processing">"При использовании микрофона, сертифицированного Discord, некоторые функции обработки голоса обеспечиваются не самим Discord,
 а микрофоном."</string>
     <string name="form_help_channel_permissions">Выбор ролей будет автоматически устанавливать основные права для данного канала.</string>
@@ -1145,21 +1408,31 @@
 мы рекомендуем настроить этот параметр только на @упоминания.**"</string>
     <string name="form_help_default_notification_settings_mobile">"Определяет, будут ли участники, не настроившие получение уведомлений, получать уведомления
 обо всех сообщениях на сервере. Настоятельно рекомендуем устанавливать только для @упоминаний на публичных серверах Discord"</string>
+    <string name="form_help_enable_discoverable">Помещает сервер в каталог одобренных открытых серверов. Рекомендуем включить данную функцию, чтобы дать заинтересованным пользователям шанс найти вас!</string>
+    <string name="form_help_enable_featurable">Это позволит Discord показывать этот сервер на главной странице. Включив данную функцию, вы можете столкнуться с внезапным наплывом участников. Так что отключите её, если желающих присоединиться станет слишком много.</string>
     <string name="form_help_explicit_content_filter">"Автоматически сканировать и удалять на этом сервере сообщения с нежелательным содержимым. Пожалуйста, выберите уровень применения
 этого фильтра к участникам вашего сервера. **Мы рекомендуем включать этот фильтр на публичных серверах Discord.**"</string>
-    <string name="form_help_instant_invite_channel">"Если выбран канал, то через виджет будет генерироваться экспресс-приглашение,
+    <string name="form_help_instant_invite_channel">"Если канал выбран, то через виджет будет генерироваться ссылка-приглашение,r
 в противном случае будут доступны только участники в сети и голосовые каналы."</string>
-    <string name="form_help_last_seen">Чистка выгонит **%1$s** на сервере **%2$s**. Чистка коснётся только участников, не имеющих ролей. Выгнанные участники смогут вновь зайти на сервер с помощью нового приглашения.</string>
+    <string name="form_help_last_seen">"Чистка выгонит **%1$s** на сервереr
+**%2$s**. Чистка коснётся только участников, не имеющих ролей.r
+Выгнанные участники смогут вновь зайти на сервер с помощью нового приглашения."</string>
     <string name="form_help_legacy_subsystem">"Некоторые драйверы звукового оборудования могут испытывать проблемы при использовании современной звуковой подсистемы вашей операционной системы.
 Поставьте галочку, чтобы использовать старую звуковую подсистему."</string>
     <string name="form_help_nsfw">"Для просмотра содержимого этого канала пользователям необходимо подтвердить, что они достигли совершеннолетия.
 В NSFW-каналах отсутствует фильтр нежелательного содержимого."</string>
+    <string name="form_help_open_h264">Отключив OpenH264, вы также отключите аппаратно-ускоренное кодирование видео (при наличии).</string>
     <string name="form_help_premade_widget">"Вставьте этот HTML-код на ваш сайт, чтобы использовать замечательный виджет Discord. Если у вас есть доступ
 к пользователям сайта, то вы также можете добавить &amp;username= к запросу."</string>
     <string name="form_help_qos">"Сообщает маршрутизатору, что пакеты, передаваемые через Discord, имеют высокий приоритет.
 Это может вызывать проблемы с некоторыми маршрутизаторами и интернет-провайдерами."</string>
+    <string name="form_help_server_banner">Это изображение будет помещено над списком ваших каналов.</string>
+    <string name="form_help_server_description">Опишите своё сообщество. Это описание будет отображаться на сторонних сервисах вместе со ссылкой-приглашением на этот сервер.</string>
+    <string name="form_help_server_language">Discord приоритизирует этот сервер в поиске и рекомендациях для пользователей, которые говорят на выбранном языке.</string>
     <string name="form_help_slowmode">Пользователи не смогут отправлять больше одного сообщения в течение этого периода времени, кроме случаев, когда у них есть права управления каналом или сообщениями.</string>
-    <string name="form_help_system_channel">Отправлять сообщение в этот канал, когда кто-то присоединяется к серверу. Сообщения отображаются случайным образом. Это может быть отключено в любой момент.</string>
+    <string name="form_help_system_channel">Это канал, на котором мы публикуем системные сообщения о событиях. Их можно отключить в любой момент.</string>
+    <string name="form_help_system_channel_join_messages">Отправлять случайное приветственное сообщение, когда пользователь подключается к этому серверу.</string>
+    <string name="form_help_system_channel_premium_subscription_messages">Отправлять сообщение, когда кто-то усиливает этот сервер.</string>
     <string name="form_help_temporary">Участники без назначенной роли автоматически выгоняются при отключении.</string>
     <string name="form_help_user_limit">"Ограничивает количество пользователей, которые могут подключаться к этому голосовому каналу. Пользователи с правом на **перемещение участников**
 могут игнорировать это ограничение и перемещать других пользователей в канал."</string>
@@ -1170,6 +1443,14 @@
     <string name="form_label_afk_timeout">Установленное время AFK</string>
     <string name="form_label_all">Все</string>
     <string name="form_label_all_messages">Все сообщения</string>
+    <string name="form_label_android_opensl">Аппаратное ускорение с минимальной задержкой</string>
+    <string name="form_label_android_opensl_default">Пусть решает моя операционная система</string>
+    <string name="form_label_android_opensl_default_desc">Android сделает всё возможное, чтобы выбрать лучший вариант для вашего устройства.</string>
+    <string name="form_label_android_opensl_desc">OpenSL ES — это крутой API для аудио, который может улучшить качество звонков. **Для изменения этого параметра требуется перезагрузка Discord!**</string>
+    <string name="form_label_android_opensl_force_disabled">Никогда не использовать OpenSL ES для звонков.</string>
+    <string name="form_label_android_opensl_force_disabled_desc">Может помочь исправить проблемы со звонками на старых устройствах.</string>
+    <string name="form_label_android_opensl_force_enabled">Принудительно использовать OpenSL ES для звонков.</string>
+    <string name="form_label_android_opensl_force_enabled_desc">Позволяет улучшить качество звонков, но может работать некорректно на старых устройствах.</string>
     <string name="form_label_attenuation">Приглушение приложений</string>
     <string name="form_label_audio_mode_android">Режим аудио</string>
     <string name="form_label_audio_mode_android_call">Режим звонка</string>
@@ -1192,29 +1473,32 @@
     <string name="form_label_desktop_notifications">Уведомления рабочего стола</string>
     <string name="form_label_desktop_only">Компьютер</string>
     <string name="form_label_disabled_for_everyone">Отключено для роли @everyone</string>
+    <string name="form_label_discovery_settings">Настройки путешествия</string>
     <string name="form_label_display_names">Показывать имена</string>
     <string name="form_label_display_users">Показать пользователей</string>
-    <string name="form_label_email">Электронный адрес</string>
+    <string name="form_label_email">E-mail</string>
     <string name="form_label_enable_widget">Включить виджет</string>
     <string name="form_label_expire_grace_period">Льготный период</string>
     <string name="form_label_explicit_content_filter">Фильтр нежелательного содержимого</string>
-    <string name="form_label_hoist_description">Показывать участников с ролью отдельно от остальных участников онлайн</string>
+    <string name="form_label_hoist_description">Показывать участников с ролью отдельно от остальных участников в сети</string>
     <string name="form_label_input">Ввод</string>
     <string name="form_label_input_device">Устройство ввода</string>
     <string name="form_label_input_mode">Режим ввода</string>
     <string name="form_label_input_sensitivty">Чувствительность ввода</string>
     <string name="form_label_input_volume">Громкость микрофона</string>
     <string name="form_label_instant_invite">Введите приглашение</string>
-    <string name="form_label_instant_invite_channel">Канал для экспресс-приглашений</string>
+    <string name="form_label_instant_invite_channel">Канал для приглашений</string>
     <string name="form_label_last_seen">Последний раз был</string>
     <string name="form_label_local_mute">Отключение оповещений</string>
-    <string name="form_label_max_age">Истекает после</string>
+    <string name="form_label_max_age">Устареет через</string>
     <string name="form_label_max_uses">Макс. кол-во использований</string>
     <string name="form_label_member_add">Добавить участника</string>
+    <string name="form_label_membership_expire_behavior">Действие при истечении членства</string>
     <string name="form_label_mentionable">Позволить всем **@упоминать** эту роль</string>
     <string name="form_label_mentions">Упоминания</string>
     <string name="form_label_mobile_notifications_behavior">Действия</string>
     <string name="form_label_mobile_notifications_blink">Отключить индикатор уведомлений.</string>
+    <string name="form_label_mobile_notifications_call_desc">Интегрируйте звонки с приложением «Телефон».</string>
     <string name="form_label_mobile_notifications_inapp_desc">Получайте уведомления в Discord.</string>
     <string name="form_label_mobile_notifications_inapp_label">Уведомления в приложении</string>
     <string name="form_label_mobile_notifications_label">Включить все уведомления</string>
@@ -1223,15 +1507,19 @@
     <string name="form_label_mobile_notifications_sound_disable">Выключить звуки</string>
     <string name="form_label_mobile_notifications_sound_message">Звук нового сообщения</string>
     <string name="form_label_mobile_notifications_system_desc">Получайте уведомления за пределами Discord.</string>
+    <string name="form_label_mobile_notifications_system_hint">Ищете настройки уведомлений канала или сервера? Нажмите на название нужного сервера и выберите «Параметры уведомлений».</string>
     <string name="form_label_mobile_notifications_system_label">Системные уведомления</string>
     <string name="form_label_mobile_notifications_vibrations">Отключить вибрацию при уведомлениях.</string>
     <string name="form_label_mobile_notifications_wake_device">Уведомления пробуждают устройство.</string>
     <string name="form_label_mobile_push_notifications">Мобильные Push-уведомления</string>
+    <string name="form_label_mobile_user_notifications_hint">Управляйте уведомлениями в приложении.</string>
+    <string name="form_label_mobile_user_notifications_label">Параметры уведомлений пользователя</string>
     <string name="form_label_mute_server">Заглушить **%1$s**</string>
     <string name="form_label_mute_server_description">Отключение уведомлений сервера отключает всплывающие уведомления и оповещения о непрочитанных сообщениях, если вы не упомянуты.</string>
     <string name="form_label_muted">Отключён микрофон</string>
     <string name="form_label_new_password">Новый пароль</string>
     <string name="form_label_new_user">Новый пользователь?</string>
+    <string name="form_label_news_channel">Канал с объявлениями</string>
     <string name="form_label_nothing">Ничего</string>
     <string name="form_label_notification_frequency">Частота</string>
     <string name="form_label_notification_position">Расположение уведомления</string>
@@ -1258,8 +1546,13 @@
     <string name="form_label_role_settings">Настройки роли</string>
     <string name="form_label_roles_pro_tip">Подсказка</string>
     <string name="form_label_roles_pro_tip_description">Участники используют цвет высшей роли, которую они имеют в списке. Перетащите роли, чтобы упорядочить их!</string>
+    <string name="form_label_select_channel">Выбрать канал</string>
+    <string name="form_label_send_to">Отправить</string>
     <string name="form_label_sensitivty">Чувствительность</string>
+    <string name="form_label_server_banner">Фоновый баннер сервера</string>
+    <string name="form_label_server_description">Описание сервера</string>
     <string name="form_label_server_id">ID сервера</string>
+    <string name="form_label_server_language">Основной язык сервера</string>
     <string name="form_label_server_name">Название сервера</string>
     <string name="form_label_server_notification_settings">Параметры уведомлений сервера</string>
     <string name="form_label_server_region">Регион сервера</string>
@@ -1271,21 +1564,24 @@
     <string name="form_label_sub_expire_behavior">Действие при истечении подписки</string>
     <string name="form_label_subsystem">Звуковая подсистема</string>
     <string name="form_label_suppress_everyone">Игнорировать **@everyone** и **@here**</string>
+    <string name="form_label_synced_members">Синхронизированные участники</string>
     <string name="form_label_synced_role">Привязана роль</string>
     <string name="form_label_synced_subs">Синхронизированные подписки</string>
-    <string name="form_label_system_channel">Канал для сообщений о новых участниках</string>
+    <string name="form_label_system_channel">Канал системных сообщений</string>
     <string name="form_label_temporary">Временное членство</string>
+    <string name="form_label_test_microphone">Проверить микрофон</string>
     <string name="form_label_tts">Преобразование текста в речь (Text-to-Speech)</string>
     <string name="form_label_tts_notifications">Уведомления Text-to-Speech</string>
     <string name="form_label_user_limit">Лимит пользователей</string>
     <string name="form_label_username">Имя пользователя</string>
-    <string name="form_label_username_mobile">Выберите имя</string>
+    <string name="form_label_username_mobile">Выберите имя пользователя</string>
     <string name="form_label_verification_level">Уровень проверки</string>
     <string name="form_label_video_device">Камера</string>
     <string name="form_label_video_preview">Предпросмотр</string>
     <string name="form_label_voice_diagnostics">Проверка голоса</string>
     <string name="form_label_voice_processing">Обработка голоса</string>
     <string name="form_label_volume">Громкость</string>
+    <string name="form_missing_required_fields">Некоторые поля ещё не заполнены!</string>
     <string name="form_placeholder_reason">Причина</string>
     <string name="form_placeholder_server_name">Введите название сервера</string>
     <string name="form_placeholder_username">Как к вам обращаться?</string>
@@ -1312,7 +1608,7 @@
     <string name="friend_request_rate_limited_body">Вы отправляете запросы дружбы слишком быстро!</string>
     <string name="friend_request_rate_limited_button">Вход в зону отдыха</string>
     <string name="friend_request_rate_limited_header">ВОУ, ВОУ, ПАЛЕХЧЕ!</string>
-    <string name="friend_request_requires_email_validation_body">Вам нужно присвоить учётную запись и проверить вашу электронную почту, прежде чем отправить запрос дружбы.</string>
+    <string name="friend_request_requires_email_validation_body">Вам нужно присвоить учётную запись и подтвердить вашу электронную почту, прежде чем отправить запрос дружбы.</string>
     <string name="friend_request_requires_email_validation_button">Войти в зону проверки.</string>
     <string name="friend_request_requires_email_validation_header">ПОДОЖДИТЕ СЕКУНДОЧКУ.</string>
     <string name="friend_request_sent">Запрос дружбы отправлен.</string>
@@ -1320,11 +1616,15 @@
     <string name="friends_column_name">Имя</string>
     <string name="friends_column_status">Состояние</string>
     <string name="friends_empty_state_all">У Вампуса нет друзей. А у вас могут быть!</string>
+    <string name="friends_empty_state_all_body">Дайте им знать, что вы теперь тоже тут!</string>
+    <string name="friends_empty_state_all_cta">Поделиться моим именем пользователя</string>
+    <string name="friends_empty_state_all_header">Знаете тех, кто уже в Discord?</string>
     <string name="friends_empty_state_blocked">Вы не можете разблокировать Вампуса.</string>
+    <string name="friends_empty_state_copy">Я новичок в Discord, моё имя пользователя — %1$s. Поболтаем?</string>
     <string name="friends_empty_state_online">Никто не хочет играть с Вампусом.</string>
     <string name="friends_empty_state_pending">Пока здесь нет запросов дружбы, ожидающих подтверждения. Зато здесь сидит Вампус.</string>
     <string name="friends_online">%1$s в сети</string>
-    <string name="friends_section_add_friend">Добавить друга</string>
+    <string name="friends_section_add_friend">Добавить в друзья</string>
     <string name="friends_section_all">Все</string>
     <string name="friends_section_online">В сети</string>
     <string name="friends_section_pending">Ожидание</string>
@@ -1336,11 +1636,13 @@
     <string name="game_action_button_game_not_detected">Игра не обнаружена</string>
     <string name="game_action_button_install">Установить</string>
     <string name="game_action_button_locate">Найти</string>
-    <string name="game_action_button_login_to_buy">Войдите, чтобы купить</string>
+    <string name="game_action_button_login_to_buy">Войдите для покупки</string>
     <string name="game_action_button_now_playing">Идёт игра</string>
     <string name="game_action_button_paused">Пауза</string>
     <string name="game_action_button_play">Играть</string>
     <string name="game_action_button_play_disabled_desktop_app">Запустить через приложение на компьютере</string>
+    <string name="game_action_button_preorder_wait">Скоро</string>
+    <string name="game_action_button_preorder_wait_tooltip">Доступ откроется %1$s</string>
     <string name="game_action_button_queue">Обновление очереди</string>
     <string name="game_action_button_queued">В очереди</string>
     <string name="game_action_button_restricted_in_region">Недоступно в вашей стране</string>
@@ -1375,7 +1677,7 @@
     <string name="game_feed_activity_recently_played">Недавно играли</string>
     <string name="game_feed_activity_streaming_twitch">Стримит на Twitch</string>
     <string name="game_feed_current_header_title">Идёт игра</string>
-    <string name="game_feed_settings_visibility">Показывать на вкладке с играми</string>
+    <string name="game_feed_settings_visibility">Отображать в ленте событий</string>
     <string name="game_feed_unknown_player">Неизвестный игрок</string>
     <string name="game_feed_user_played_days_ago">Играл %1$s %2$s назад</string>
     <string name="game_feed_user_played_hours_ago">Играл %1$s %2$s назад</string>
@@ -1388,6 +1690,7 @@
     <string name="game_feed_user_playing_for_minutes">В игре уже %1$s %2$s</string>
     <string name="game_feed_user_playing_just_ended">Только что закончил(а) играть</string>
     <string name="game_feed_user_playing_just_started">Начал(а) играть только что</string>
+    <string name="game_launch_failed_launch_target_not_found">Не удалось запустить игру. Не найден исполняемый файл.</string>
     <string name="game_library">Библиотека игр</string>
     <string name="game_library_last_played_days">%1$s</string>
     <string name="game_library_last_played_hours">%1$s назад</string>
@@ -1406,7 +1709,7 @@
     <string name="game_library_notification_game_installed_body">Установка %1$s завершена. Пора развлекаться!</string>
     <string name="game_library_notification_game_installed_title">Можно играть</string>
     <string name="game_library_overlay_disabled_tooltip">Оверлей: выключен</string>
-    <string name="game_library_private_tooltip">Статус «Играет в» скрыт</string>
+    <string name="game_library_private_tooltip">Cтатус «Играет в» скрыт</string>
     <string name="game_library_time_played_hours">%1$s %1$s</string>
     <string name="game_library_time_played_minutes">%1$s %1$s</string>
     <string name="game_library_time_played_none">ни разу не запускалась</string>
@@ -1427,6 +1730,7 @@
     <string name="game_library_updates_progress_finalizing">Завершение — %1$s%%</string>
     <string name="game_library_updates_progress_finished">Завершено — [Очистить](remove)</string>
     <string name="game_library_updates_progress_paused">Пауза — %1$s из %2$s (%3$s%%)</string>
+    <string name="game_library_updates_progress_paused_no_transition">Пауза</string>
     <string name="game_library_updates_progress_pausing">Пауза — %1$s из %2$s (%3$s%%)</string>
     <string name="game_library_updates_progress_planning">Подготовка — %1$s%%</string>
     <string name="game_library_updates_progress_post_install_scripts">Запуск скриптов — %1$s из %2$s (%3$s%%)</string>
@@ -1440,12 +1744,137 @@
     <string name="game_library_updates_updating_updating_hours">Установка патча — %1$s из %2$s (%3$s%%) — ещё %4$s</string>
     <string name="game_library_updates_updating_updating_minutes">Установка патча — %1$s из %2$s (%3$s%%) — ещё %4$s</string>
     <string name="game_library_updates_updating_updating_seconds">Установка патча — %1$s из %2$s (%3$s%%) — %4$s</string>
+    <string name="game_popout_follow">Подписаться</string>
+    <string name="game_popout_go_to_server">Перейти на сервер</string>
+    <string name="game_popout_no_recent_players">Никто из ваших друзей пока не играл в эту игру.</string>
+    <string name="game_popout_online_in_server">%1$s в сети на сервере</string>
+    <string name="game_popout_unfollow">Есть подписка</string>
+    <string name="game_popout_view_server">Просмотр сервера</string>
     <string name="games">Игры</string>
     <string name="general_permissions">Основные права</string>
     <string name="generate_a_new_link">Сгенерировать новую ссылку</string>
     <string name="get_started">Начать</string>
     <string name="gif_auto_play_label">Автоматически воспроизводить GIF, когда Discord активен.</string>
-    <string name="go_live_changelog_guilds">Прямой эфир теперь доступен в/на: %1$s</string>
+    <string name="gif_auto_play_label_mobile">Автоматически воспроизводить GIF, когда возможно.</string>
+    <string name="gif_button_label">Открыть меню GIF</string>
+    <string name="gif_picker_back_to_top">Щёлкните здесь, чтобы вернуться наверх.</string>
+    <string name="gif_picker_favorites">Избранное</string>
+    <string name="gif_picker_related_search">Ваш идеальный GIF в другом замке. Поищите его!</string>
+    <string name="gif_picker_result_type_recent">Недавние</string>
+    <string name="gif_picker_result_type_trending_gifs">Популярные GIF</string>
+    <string name="gif_tooltip_add_to_favorites">Добавить в избранное</string>
+    <string name="gif_tooltip_favorited_picker_button">Добавлено в избранное</string>
+    <string name="gif_tooltip_remove_from_favorites">Удалить из избранного</string>
+    <string name="gift_code_auth_accept">Ого! Принять подарок</string>
+    <string name="gift_code_auth_accepting">Принимаем подарок</string>
+    <string name="gift_code_auth_check_verification_again">Говорите, вы уже подтвердили свой адрес? Щёлкните здесь, чтобы проверить…</string>
+    <string name="gift_code_auth_continue_in_browser">Продолжить в браузере</string>
+    <string name="gift_code_auth_fetching_user">Проверяем ваш ID</string>
+    <string name="gift_code_auth_gifted">Вам подарили</string>
+    <string name="gift_code_auth_gifted_by">%1$s дарит вам</string>
+    <string name="gift_code_auth_gifted_subscription_monthly">%1$s на %2$s</string>
+    <string name="gift_code_auth_gifted_subscription_yearly">%1$s на %2$s</string>
+    <string name="gift_code_auth_help_text_claimed">Этот подарок уже получен.</string>
+    <string name="gift_code_auth_help_text_owned">У вас уже есть эта игра. Поищите её в [библиотеке](%1$s).</string>
+    <string name="gift_code_auth_help_text_verification_required">Чтобы принять этот подарок, у вас должен быть подтверждён адрес электронной почты. Для этого проверьте почту.</string>
+    <string name="gift_code_auth_invalid_body">Время действия подарочного кода закончилось, или вы ввели неверный код.</string>
+    <string name="gift_code_auth_invalid_tip">Почему мой подарочный код не работает?</string>
+    <string name="gift_code_auth_invalid_title">Некорректный подарочный код</string>
+    <string name="gift_code_auth_logged_in_as">Вы принимаете этот подарок от лица **%1$s**. [Не та учётная запись?](onLogoutClick)</string>
+    <string name="gift_code_auth_resolving">Достаём ваш подарок из киберпространства</string>
+    <string name="gift_code_auth_verification_sent">Отправлено!</string>
+    <string name="gift_code_auth_verification_title">Привет, %1$s!</string>
+    <string name="gift_confirmation_body_claimed">Не удалось получить подарок, потому что вас уже кто-то обогнал. Вот печалька!</string>
+    <string name="gift_confirmation_body_confirm">Как только примете подарок, вы получите %1$s НАВСЕГДА-А-А-А!</string>
+    <string name="gift_confirmation_body_confirm_nitro">Как только примете подарок, вы получите **%1$s** на **%2$s**.</string>
+    <string name="gift_confirmation_body_error_invoice_open">К сожалению, вы не можете принять этот подарок, потому что к вашей подписке привязан открытый инвойс.</string>
+    <string name="gift_confirmation_body_error_nitro_upgrade_downgrade">Ой! Вы не можете принять этот подарок, потому что у вас уже есть подписка.</string>
+    <string name="gift_confirmation_body_error_subscription_managed">К сожалению, поскольку вы оформили подписку через сторонний сервис, вы не можете принять подарочную подписку Nitro.</string>
+    <string name="gift_confirmation_body_invalid">Вот жалость! Вы не можете принять этот подарок, потому что он был отозван.</string>
+    <string name="gift_confirmation_body_owned">Не удалось получить подарок, потому что это у вас уже есть. Поищите в [библиотеке](onGoToLibrary).</string>
+    <string name="gift_confirmation_body_self_gift_no_payment">Вы не можете принять этот подарок. Вы должны подарить его кому-нибудь другому.</string>
+    <string name="gift_confirmation_body_subscription_monthly_confirm">Как только примете подарок, вы получите %1$s на **%2$s**.</string>
+    <string name="gift_confirmation_body_subscription_yearly_confirm">Как только примете подарок, вы получите %1$s на **%2$s**.</string>
+    <string name="gift_confirmation_body_success">%1$s теперь находится в вашей библиотеке. Вперёд, в игру!</string>
+    <string name="gift_confirmation_body_success_generic_subscription_monthly">Благодаря чьей-то щедрости вы получили %1$s на %2$s.</string>
+    <string name="gift_confirmation_body_success_generic_subscription_yearly">Благодаря чьей-то щедрости вы получили доступ к %1$s на %2$s.</string>
+    <string name="gift_confirmation_body_success_mobile">**%1$s** теперь в вашей библиотеке.</string>
+    <string name="gift_confirmation_body_success_premium_tier_1_monthly">Благодаря чьей-то щедрости вы получили доступ к прикольным бонусам для чата на %1$s.</string>
+    <string name="gift_confirmation_body_success_premium_tier_1_yearly">Благодаря чьей-то щедрости вы получили доступ к прикольным бонусам для чата на %1$s.</string>
+    <string name="gift_confirmation_body_unknown_error">Случилось что-то странное, и нам не удалось вовремя сцапать мешок… может, попробуете ещё раз?</string>
+    <string name="gift_confirmation_button_confirm">О да! Добавить в библиотеку</string>
+    <string name="gift_confirmation_button_confirm_mobile">Беру</string>
+    <string name="gift_confirmation_button_confirm_subscription">Я принимаю</string>
+    <string name="gift_confirmation_button_fail">О, хорошо.</string>
+    <string name="gift_confirmation_button_go_to_library">В библиотеку!</string>
+    <string name="gift_confirmation_button_noice">Круто!</string>
+    <string name="gift_confirmation_button_subscription_success">О, круто!</string>
+    <string name="gift_confirmation_button_success_mobile">Круто!</string>
+    <string name="gift_confirmation_header_confirm">Принять этот подарок?</string>
+    <string name="gift_confirmation_header_confirm_nitro">Вам подарили %1$s.</string>
+    <string name="gift_confirmation_header_fail">*Грустный тромбон*</string>
+    <string name="gift_confirmation_header_success">Круто!</string>
+    <string name="gift_confirmation_header_success_nitro">Вы подписаны на %1$s</string>
+    <string name="gift_confirmation_nitro_time_frame_months">%1$s %2$s</string>
+    <string name="gift_confirmation_nitro_time_frame_years">%1$s %2$s</string>
+    <string name="gift_embed_body_claimed_other">Гм, похоже, кто-то уже использовал этот подарок.</string>
+    <string name="gift_embed_body_claimed_self">Похоже, вы уже использовали этот подарок. %1$s в вашей [библиотеке](onViewInLibrary).</string>
+    <string name="gift_embed_body_claimed_self_mobile">Похоже, вы уже использовали этот подарок.</string>
+    <string name="gift_embed_body_claimed_self_subscription">Похоже, вы уже использовали этот подарок.</string>
+    <string name="gift_embed_body_default">**%1$s** дарит вам игру. Примите подарок, чтобы добавить игру в библиотеку.</string>
+    <string name="gift_embed_body_giveaway">**%1$s** раздаёт копии %2$s — целых %3$s шт. Успейте забрать свой подарок!</string>
+    <string name="gift_embed_body_no_user_default">Вам подарили игру. Примите подарок, чтобы добавить игру в библиотеку.</string>
+    <string name="gift_embed_body_no_user_giveaway">Тут раздают копии %1$s — целых %2$s шт. Успейте забрать свой подарок!</string>
+    <string name="gift_embed_body_owned">Ой! Вы не можете получить %1$s Нельзя получить то, что уже у вас [в библиотеке](onViewInLibrary)!</string>
+    <string name="gift_embed_body_owned_mobile">Вы не можете принять подарок, потому что у вас уже это есть.</string>
+    <string name="gift_embed_body_requires_verification">Чтобы принять этот подарок, [подтвердите свою учётную запись](onClick).</string>
+    <string name="gift_embed_body_requires_verification_mobile">Чтобы принять этот подарок, подтвердите свою учётную запись.</string>
+    <string name="gift_embed_body_self">Если хотите оставить подарок себе, то милости просим. Мы вас не осудим :)</string>
+    <string name="gift_embed_body_subscription_default_months">**%1$s** дарит вам %2$s на **%3$s**!</string>
+    <string name="gift_embed_body_subscription_default_years">**%1$s** дарит вам %2$s на **%3$s**!</string>
+    <string name="gift_embed_body_subscription_giveaway">**%1$s** раздаёт подписки %2$s — целых %3$s шт. Успейте забрать свой подарок! Уи-и-и!</string>
+    <string name="gift_embed_body_subscription_mismatch">Ой! Вы не можете принять этот подарок, потому что у вас уже есть подписка %1$s.</string>
+    <string name="gift_embed_body_subscription_no_user_default_months">Вам подарили %1$s на **%2$s**!</string>
+    <string name="gift_embed_body_subscription_no_user_default_years">Вам подарили %1$s на **%2$s**!</string>
+    <string name="gift_embed_body_subscription_no_user_giveaway">Тут раздают копии %1$s — целых %2$s шт. Успейте забрать свой подарок! Уи-и-и!</string>
+    <string name="gift_embed_button_accept">Принять</string>
+    <string name="gift_embed_button_cant_accept">Нельзя принять</string>
+    <string name="gift_embed_button_claimed">Получено</string>
+    <string name="gift_embed_button_claiming">Получаем</string>
+    <string name="gift_embed_button_owned">Уже есть</string>
+    <string name="gift_embed_copies_left">Осталось копий: %1$s из %2$s</string>
+    <string name="gift_embed_expiration">Срок действия закончится через %1$s</string>
+    <string name="gift_embed_header_owner_invalid">Вы отправили подарок, но…</string>
+    <string name="gift_embed_header_receiver_invalid">Вы получили подарок, но…</string>
+    <string name="gift_embed_info_owner_invalid">Попробуйте отправить другую ссылку на подарок!</string>
+    <string name="gift_embed_info_receiver_invalid">Если вы не успели забрать его, попросите другую ссылку!</string>
+    <string name="gift_embed_invalid">Некорректная ссылка на подарок</string>
+    <string name="gift_embed_invalid_tagline_other">Срок действия ссылки на подарок истёк, либо подарок был отозван. Отправитель может создать новую ссылку и снова отправить вам подарок.</string>
+    <string name="gift_embed_invalid_tagline_self">Срок действия ссылки на подарок истёк, либо подарок был отозван. Вы можете создать новую ссылку и снова отправить подарок.</string>
+    <string name="gift_embed_invalid_title_other">Вы получили подарок, но…</string>
+    <string name="gift_embed_invalid_title_self">Вы отправили подарок, но…</string>
+    <string name="gift_embed_resolving">Подарок обрабатывается</string>
+    <string name="gift_embed_subscriptions_left">Осталось подписок: %1$s из %2$s</string>
+    <string name="gift_embed_title">Появился дикий подарок!</string>
+    <string name="gift_embed_title_self">Вы отправили подарок!</string>
+    <string name="gift_embed_title_subscription">Вам подарили подписку!</string>
+    <string name="gift_embed_title_subscription_self">Вы подарили подписку!</string>
+    <string name="gift_embed_unknown_user">Неизвестный пользователь</string>
+    <string name="gift_inventory">Склад подарков</string>
+    <string name="gift_inventory_copies">%1$s</string>
+    <string name="gift_inventory_expires_in_mobile">Ссылка устареет через %1$s — $[Отозвать](revokeHook)</string>
+    <string name="gift_inventory_generate_help">У вас ещё есть подарки! Сгенерировать ещё одну ссылку?</string>
+    <string name="gift_inventory_generate_link">Сгенерировать ссылку</string>
+    <string name="gift_inventory_generate_link_ios">Сгенерировать</string>
+    <string name="gift_inventory_hidden">Подарочный код спрятан. Нажмите кнопку «Копировать».</string>
+    <string name="gift_inventory_no_gifts">Нет подарков.</string>
+    <string name="gift_inventory_no_gifts_subtext">Хотите сделать что-то хорошее? Подарите кому-нибудь [Nitro](onClick)!</string>
+    <string name="gift_inventory_no_gifts_subtext_mobile">Хотите сделать что-то хорошее? Подарите кому-нибудь Nitro!</string>
+    <string name="gift_inventory_redeem_codes">Активировать коды</string>
+    <string name="gift_inventory_select_nitro_gift">Выберите подарок Nitro</string>
+    <string name="gift_inventory_subscription_months">%1$s (%2$s)</string>
+    <string name="gift_inventory_subscription_years">%1$s (%2$s)</string>
+    <string name="go_live_hardware_acceleration_unavailable">Внимание, внимание! Аппаратное ускорение не обнаружено. Go Live может работать некорректно.</string>
     <string name="go_live_hey">Эй!</string>
     <string name="go_live_listen">Слушай!</string>
     <string name="go_live_look">Смотри!</string>
@@ -1459,14 +1888,20 @@
     <string name="go_live_modal_select_channel_form_title">Выберите голосовой канал</string>
     <string name="go_live_modal_select_channel_placeholder">Поиск голосовых каналов</string>
     <string name="go_live_modal_title">Прямой эфир</string>
-    <string name="go_live_premium_early_access">Благодаря тому, что вы являетесь Nitro-подписчиком, вы получаете ранний доступ к стримингу игр с прямой эфир!</string>
+    <string name="go_live_video_drivers_outdated">Ваши драйверы видеокарты устарели. Обновите их, чтобы повысить производительность Go Live.</string>
+    <string name="go_live_viewers_action_sheet_streaming">Стримит</string>
     <string name="grant_temporary_membership">Предоставить временное членство</string>
     <string name="group">Группа</string>
+    <string name="group_dm">Групповой чат</string>
     <string name="group_dm_add_friends">Добавить друзей в беседу</string>
     <string name="group_dm_add_members">Добавить %1$s</string>
     <string name="group_dm_header">Выберите друзей</string>
     <string name="group_dm_invite_empty">Не найдено друзей, которых нет в этом ЛС.</string>
+    <string name="group_dm_invite_full_main">Мест в группе не осталось!</string>
     <string name="group_dm_invite_full_sub">Группы имеют ограничение до 10 участников.</string>
+    <string name="group_dm_invite_full_sub2">Участников в этой группе может быть не более %1$s.</string>
+    <string name="group_dm_invite_link_create">Создать</string>
+    <string name="group_dm_invite_link_example">пример</string>
     <string name="group_dm_invite_link_title">Или отправьте ссылку-приглашение другу.</string>
     <string name="group_dm_invite_no_friends">У вас нет друзей, чтобы добавить!</string>
     <string name="group_dm_invite_not_friends">Вы должны быть в друзьях у **%1$s**, чтобы начать групповой чат.</string>
@@ -1476,16 +1911,40 @@
     <string name="group_dm_invite_unselect_users">Вы должны снять выделение с %1$s.</string>
     <string name="group_dm_invite_will_fill_mobile">Выбранные пользователи заполнят группу.</string>
     <string name="group_dm_invite_with_name">Пригласить друзей в %1$s</string>
-    <string name="group_dm_search_placeholder">Введите имя друга</string>
+    <string name="group_dm_search_placeholder">Введите имя пользователя вашего друга</string>
     <string name="group_dm_settings">Настройки группы</string>
     <string name="group_name">Название группы</string>
     <string name="group_owner">Владелец группы</string>
     <string name="groups">Группы</string>
+    <string name="guest_lurker_mode_chat_input_body">Зарегистрируйтесь, чтобы общаться в текстовых и голосовых чатах сообществ и держать связь с друзьями.</string>
+    <string name="guest_lurker_mode_chat_input_header">Зарегистрируйтесь в Discord</string>
+    <string name="guild_discovery_header_e3_games">Похожие сервера E3</string>
+    <string name="guild_discovery_header_games_you_play">Сервера для ваших любимых игр</string>
+    <string name="guild_discovery_header_popular_servers">Популярные сервера и сообщества</string>
+    <string name="guild_discovery_header_search_results">По запросу «%1$s» %2$s</string>
+    <string name="guild_discovery_header_trending_games">Популярные игры в Discord</string>
+    <string name="guild_discovery_search_empty_description">Попробуйте поискать по другому ключевому слову или взгляните на наши популярные сообщества.</string>
+    <string name="guild_discovery_search_empty_title">Совпадения не найдены</string>
+    <string name="guild_discovery_search_header">Найдите новые сообщества в Discord</string>
+    <string name="guild_discovery_search_label">Поиск по популярным серверам</string>
+    <string name="guild_discovery_search_placeholder">Попробуйте поискать игру, киберспортивную команду или музыканта</string>
+    <string name="guild_discovery_search_press_enter">Для поиска нажмите **ENTER**</string>
+    <string name="guild_discovery_tooltip">Путешествие по серверам</string>
+    <string name="guild_discovery_trending_game_description">Сервер %1$s.</string>
+    <string name="guild_discovery_view_button">Просмотр</string>
+    <string name="guild_folder_color">Цвет папки</string>
+    <string name="guild_folder_name">Название папки</string>
+    <string name="guild_header_hotspot_tooltip">Выведите сервер на новый уровень с помощью бота!</string>
     <string name="guild_members_header">Участники: %1$s</string>
     <string name="guild_members_search_no_result">Участники не найдены.</string>
     <string name="guild_message_notifications_only_mentions">Только @упоминания</string>
     <string name="guild_muted_help_text">Неактивно, потому что оповещения сервера сейчас отключены</string>
     <string name="guild_owner">Владелец сервера</string>
+    <string name="guild_partnered">Партнёр Discord</string>
+    <string name="guild_popout_unavailable_flavor">*и только ветер свищет…*</string>
+    <string name="guild_popout_unavailable_header">Этот сервер недоступен.</string>
+    <string name="guild_popout_view_server_button">Просмотр сервера</string>
+    <string name="guild_premium">Состояние усиления сервера</string>
     <string name="guild_security_req_mfa_body">"Предотвратить потенциально опасные административные действия для пользователей с выключенной двухфакторной аутентификацией (2FA).
 **Этот параметр может быть изменён только владельцем сервера, если он включил 2FA в своей учётной записи**."</string>
     <string name="guild_security_req_mfa_enable">[Включить на вашей учётной записи.](onClick)</string>
@@ -1509,7 +1968,7 @@
     <string name="guild_settings_action_filter_invite_update">Изменение приглашения</string>
     <string name="guild_settings_action_filter_member_ban_add">Бан участника</string>
     <string name="guild_settings_action_filter_member_ban_remove">Возврат участника из бана</string>
-    <string name="guild_settings_action_filter_member_kick">Выгнать участника</string>
+    <string name="guild_settings_action_filter_member_kick">Удаление участника</string>
     <string name="guild_settings_action_filter_member_prune">Чистка участников</string>
     <string name="guild_settings_action_filter_member_role_update">Изменение ролей участника</string>
     <string name="guild_settings_action_filter_member_update">Обновление участника</string>
@@ -1541,6 +2000,8 @@
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) создаёт текстовый канал $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Меняет заголовок на **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Устанавливает заголовок канала **%1$s**</string>
+    <string name="guild_settings_audit_log_channel_type_change">Меняет тип с **%1$s** на **%2$s**</string>
+    <string name="guild_settings_audit_log_channel_type_create">Устанавливает тип на **%1$s**</string>
     <string name="guild_settings_audit_log_channel_update">$[**%1$s**](userHook) вносит изменения в $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_voice_create">$[**%1$s**](userHook) создаёт голосовой канал $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_common_reason">По причине **%1$s**</string>
@@ -1552,8 +2013,11 @@
     <string name="guild_settings_audit_log_guild_afk_channel_id_change">Назначает **%1$s** каналом AFK</string>
     <string name="guild_settings_audit_log_guild_afk_channel_id_clear">Канал AFK **очищен**</string>
     <string name="guild_settings_audit_log_guild_afk_timeout_change">Задаёт установленное время AFK в **%1$s** минут</string>
+    <string name="guild_settings_audit_log_guild_banner_hash_change">Устанавливает баннер сервера</string>
     <string name="guild_settings_audit_log_guild_default_message_notifications_change_all_messages">Устанавливает значение по умолчанию для уведомлений о сообщениях на **Все сообщения**</string>
     <string name="guild_settings_audit_log_guild_default_message_notifications_change_only_mentions">Устанавливает значение по умолчанию для уведомлений о сообщениях на **Только упоминания**</string>
+    <string name="guild_settings_audit_log_guild_description_change">Устанавливает описание сервера на **%1$s**</string>
+    <string name="guild_settings_audit_log_guild_description_clear">Описание сервера **удалено**</string>
     <string name="guild_settings_audit_log_guild_explicit_content_filter_all_members">Устанавливает фильтр нежелательного содержимого для проверки сообщений от **всех участников**</string>
     <string name="guild_settings_audit_log_guild_explicit_content_filter_disable">**Отключает** фильтр нежелательного содержимого</string>
     <string name="guild_settings_audit_log_guild_explicit_content_filter_members_without_roles">Устанавливает фильтр нежелательного содержимого на проверку сообщений от **участников без роли**</string>
@@ -1563,11 +2027,17 @@
     <string name="guild_settings_audit_log_guild_name_change">Переименовывает сервер в **%1$s**</string>
     <string name="guild_settings_audit_log_guild_owner_id_change">Передаёт права владельца **%1$s**</string>
     <string name="guild_settings_audit_log_guild_region_change">Устанавливает голосовой регион **%1$s**</string>
+    <string name="guild_settings_audit_log_guild_splash_hash_change">Устанавливает фон приглашения на сервер</string>
     <string name="guild_settings_audit_log_guild_system_channel_id_change">Назначает **%1$s** каналом для сообщений о новых пользователях</string>
     <string name="guild_settings_audit_log_guild_system_channel_id_disable">**Отключает** сообщения о новых пользователях</string>
     <string name="guild_settings_audit_log_guild_update">$[**%1$s**](userHook) вносит изменения в $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_guild_vanity_url_code_change">Устанавливает персональный URL-адрес на **%1$s**</string>
     <string name="guild_settings_audit_log_guild_vanity_url_code_delete">**Удаляет** персональный URL-адрес</string>
+    <string name="guild_settings_audit_log_guild_verification_level_change_high">Устанавливает уровень проверки сервера на **Высокий**</string>
+    <string name="guild_settings_audit_log_guild_verification_level_change_low">Устанавливает уровень проверки сервера на **Низкий**</string>
+    <string name="guild_settings_audit_log_guild_verification_level_change_medium">Устанавливает уровень проверки сервера на **Средний**</string>
+    <string name="guild_settings_audit_log_guild_verification_level_change_none">Устанавливает уровень проверки сервера на **Отсутствует**</string>
+    <string name="guild_settings_audit_log_guild_verification_level_change_very_high">Устанавливает уровень проверки сервера на **Очень высокий**</string>
     <string name="guild_settings_audit_log_guild_widget_channel_id_change">Назначает **%1$s** каналом виджета</string>
     <string name="guild_settings_audit_log_guild_widget_channel_id_delete">**Удаляет** канал виджета</string>
     <string name="guild_settings_audit_log_guild_widget_disabled">**Отключает** виджет</string>
@@ -1602,6 +2072,7 @@
     <string name="guild_settings_audit_log_member_update">$[**%1$s**](userHook) обновляет $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_message_delete">$[**%1$s**](userHook) удаляет %2$s от $[**%3$s**](targetHook) в $[**%4$s**](channelHook)</string>
     <string name="guild_settings_audit_log_role_color">Устанавливает цвет **%1$s** $[](newColorHook)</string>
+    <string name="guild_settings_audit_log_role_color_ios">Устанавливает цвет **%1$s**</string>
     <string name="guild_settings_audit_log_role_color_none">Без цвета</string>
     <string name="guild_settings_audit_log_role_create">$[**%1$s**](userHook) создаёт роль $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_role_delete">$[**%1$s**](userHook) удаляет роль $[**%2$s**](targetHook)</string>
@@ -1623,16 +2094,68 @@
     <string name="guild_settings_audit_log_webhook_name_change">Меняет имя с **%1$s** на **%2$s**</string>
     <string name="guild_settings_audit_log_webhook_name_create">Имя: **%1$s**</string>
     <string name="guild_settings_audit_log_webhook_update">$[**%1$s**](userHook) обновляет вебхук $[**%2$s**](targetHook)</string>
+    <string name="guild_settings_banner_recommend">Рекомендуемый минимальный размер составляет 960x540, рекомендуемое соотношение сторон — 16:9. [Подробнее](%1$s)</string>
     <string name="guild_settings_default_notification_settings_intro">Эта опция определит, будут ли участники, не настроившие параметры уведомлений для сервера, получать их при каждом отправленном сообщении.</string>
     <string name="guild_settings_default_notification_settings_protip">Для публичных серверов Discord мы настоятельно рекомендуем установить эту опцию на только @упоминания, чтобы избежать [вот такого ужаса](%1$s).</string>
     <string name="guild_settings_emoji_alias">Название</string>
     <string name="guild_settings_emoji_alias_placeholder">Введите название</string>
     <string name="guild_settings_emoji_upload_to_server_message">Вдохните жизнь в свои мемы. Добавьте до %1$s пользовательских эмодзи, которые сможет использовать каждый на этом сервере. Эмодзи с GIF-анимацией могут использовать только подписчики Discord Nitro. Названия эмодзи должны быть не короче двух символов и могут содержать только латинские буквы, цифры и подчеркивания. Размер эмодзи не должен превышать %2$s КБ.</string>
+    <string name="guild_settings_enable_discoverable">Показывать в путешествии по серверам</string>
+    <string name="guild_settings_enable_featurable">Разрешить отображать сервер в «Похожих».</string>
+    <string name="guild_settings_featurable_disabled_tooltip">Требуется адрес сервера</string>
     <string name="guild_settings_filter_action">Фильтр по действиям</string>
     <string name="guild_settings_filter_all">Все</string>
     <string name="guild_settings_filter_all_actions">Все действия</string>
     <string name="guild_settings_filter_all_users">Все пользователи</string>
     <string name="guild_settings_filter_user">Фильтр по пользователям</string>
+    <string name="guild_settings_filtered_action">Фильтр по действиям:</string>
+    <string name="guild_settings_filtered_user">Фильтр по пользователям:</string>
+    <string name="guild_settings_follower_analytics">Аналитика канала с объявлениями</string>
+    <string name="guild_settings_follower_analytics_description">Здесь представлена статистика ваших каналов с объявлениями. Отслеживайте рост своей популярности и динамику притока и оттока подписчиков с каждой публикацией, чтобы добиться идеальной подачи информации. [Подробнее о подписках на каналы.](%1$s)</string>
+    <string name="guild_settings_follower_analytics_empty_body">Похоже, тут пока ничего нет. Возвращайтесь, когда опубликуете новое сообщение. На сбор данных может потребоваться до 24 часов.</string>
+    <string name="guild_settings_follower_analytics_empty_header">Нет данных для этого канала.</string>
+    <string name="guild_settings_follower_analytics_last_updated">Последнее обновление: %1$s</string>
+    <string name="guild_settings_follower_analytics_message_deleted">Сообщение удалено</string>
+    <string name="guild_settings_follower_analytics_net_gain">Динамика</string>
+    <string name="guild_settings_follower_analytics_net_gain_tooltip">Разница в количестве подписанных серверов с момента последней публикации.</string>
+    <string name="guild_settings_follower_analytics_net_servers">Серверов за последние 10 публикаций</string>
+    <string name="guild_settings_follower_analytics_post">Публикация</string>
+    <string name="guild_settings_follower_analytics_reach">Аудитория</string>
+    <string name="guild_settings_follower_analytics_reach_tooltip">Количество подписанных серверов на момент публикации.</string>
+    <string name="guild_settings_follower_analytics_servers_following">\# подписанных серверов</string>
+    <string name="guild_settings_follower_analytics_tooltip">"Получено: %1$s 
+Потеряно: %2$s"</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_1_animated_guild_icon">Покажите свой сервер… в движении!**(Только на сервере)**</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_1_audio_quality">Слушайте друзей в высоком качестве!</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_1_emoji">Больше эмодзи — больше способов самовыражения!</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_1_splash">Загрузите пользовательский фон для всех приглашений на сервер!</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_1_streaming">Стримьте свою игру в высоком качестве.</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_2_audio_quality">Слушайте друзей в ещё более высоком качестве!</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_2_banner">Загрузите декоративный баннер для своего сообщества! Он будет отображаться под названием сервера.</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_2_emoji">Ещё больше эмодзи — ещё больше способов самовыражения!</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_2_streaming">Стримьте свою игру в высоком качестве.</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_2_upload_limit">Загружайте файлы ещё большего размера и делитесь мемами в высоком качестве. **(Только на сервере)**</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_3_audio_quality">Слушайте друзей в высочайшем качестве. Так, будто они сидят рядом…</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_3_emoji">Получите доступ к куче слотов эмодзи — и бездне возможностей для самовыражения!</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_3_upload_limit">Загружайте файлы самого большого размера и делитесь мемами в наивысшем качестве. **(Только на сервере)**</string>
+    <string name="guild_settings_guild_premium_perk_description_tier_3_vanity_url">Персонализируйте URL приглашений на сервер с помощью **discord.gg/____. ([Постарайтесь не нарушать наши правила](%1$s).)**</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_animated_guild_icon">Анимированный значок сервера</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_splash">Пользовательский фон приглашений на сервер</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">Стримы Go Live в 720p 60fps</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_banner">Баннер сервера</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">Стримы Go Live в 1080p 60fps</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_3_vanity_url">Персональный URL для сервера</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_any_audio_quality">Качество звука: %1$s кбит/с</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s слота(-ов) для эмодзи сервера (всего слотов: %2$s)</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">Лимит загрузки для всех пользователей: %1$s</string>
+    <string name="guild_settings_guild_premium_perks_base_perks">В числе бонусов для усиленного сервера:</string>
+    <string name="guild_settings_guild_premium_perks_description_none">Никто пока не усилил этот сервер с помощью Nitro. Попросите участников сервера усилить его и подарить бонусы Nitro всем пользователям сервера!</string>
+    <string name="guild_settings_guild_premium_perks_previous_perks">Усиленные сервера получают все названные прежде бонусы, а также:</string>
+    <string name="guild_settings_guild_premium_perks_title_none">Нет Nitro-усиления</string>
+    <string name="guild_settings_guild_premium_perks_title_tier_1">Бонусы 1-го уровня</string>
+    <string name="guild_settings_guild_premium_perks_title_tier_2">Бонусы 2-го уровня</string>
+    <string name="guild_settings_guild_premium_perks_title_tier_3">Бонусы 3-го уровня</string>
+    <string name="guild_settings_icon_recommend">Мы рекомендуем для вашего сервера изображение размером не менее 512х512 пикселей.</string>
     <string name="guild_settings_label_audit_log">Журнал аудита</string>
     <string name="guild_settings_label_audit_log_empty_body">Когда модераторы начнут модерировать, вы сможете промодерировать их модерацию здесь.</string>
     <string name="guild_settings_label_audit_log_empty_title">Записей пока нет</string>
@@ -1641,8 +2164,24 @@
     <string name="guild_settings_members_all_members">Все участники — %1$s</string>
     <string name="guild_settings_members_display_role">Отображать роль:</string>
     <string name="guild_settings_members_server_members">Участники сервера</string>
+    <string name="guild_settings_overview_boost_unlock">Чтобы открыть, требуется %1$s.</string>
+    <string name="guild_settings_overview_boost_unlocked">Открыт бонус уровня %1$s</string>
     <string name="guild_settings_overview_notice">Аккуратнее! Вы не сохранили изменения!</string>
+    <string name="guild_settings_overview_tier_info">Это функция Nitro уровня %1$s. [Проверить состояние уровня](%2$s)</string>
+    <string name="guild_settings_premium_guild_blurb">"Участники сервера с активной подпиской Nitro могут помочь получить новые уровни сервера, усилив его с помощью Nitro.
+Каждый новый уровень помогает открыть новые бонусы для всех пользователей сервера.
+
+Участники могут в любой момент прекратить усиление сервера.
+**В случае потери уровня его бонусы продолжают действовать в течение трёх дней. **[Подробнее о усиление сервера с помощью Nitro.](%1$s)"</string>
+    <string name="guild_settings_premium_guild_close_hint">До следующего уровня осталось всего %1$s.</string>
+    <string name="guild_settings_premium_guild_count_subscribers">**%1$s** этот сервер</string>
+    <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
+    <string name="guild_settings_premium_guild_title">Состояние Nitro-усиления сервера</string>
+    <string name="guild_settings_premium_guild_unlocked">Открыто</string>
+    <string name="guild_settings_server_banner">Баннер сервера</string>
     <string name="guild_settings_server_invite_background">Фон приглашения на сервер</string>
+    <string name="guild_settings_splash_info">Это изображение пользователи видят, когда получают приглашение на сервер.</string>
+    <string name="guild_settings_splash_recommend">Рекомендуемый минимальный размер составляет 1920х1080, рекомендуемое соотношение сторон — 16:9. [Подробнее](%1$s)</string>
     <string name="guild_settings_title_server_widget">Виджет сервера</string>
     <string name="guild_settings_widget_embed_help">"Вставьте этот HTML-код на ваш сайт, чтобы использовать замечательный виджет Discord.
 
@@ -1654,17 +2193,19 @@
     <string name="guild_verification_text_not_phone_verified">Вы должны подтвердить свою личность через телефон, прежде чем отправлять сообщения на этом сервере.</string>
     <string name="guild_verification_text_not_verified">Вы должны подтвердить вашу учётную запись, чтобы отправлять сообщения на этом сервере.</string>
     <string name="guild_verified">Подтверждено</string>
+    <string name="guild_voice_channel_empty_body_mobile">В этом голосовом канале никого нет. Подключитесь к нему и позовите друзей!</string>
+    <string name="guild_voice_channel_empty_header_mobile">Вы — первый пользователь канала!</string>
     <string name="hardware_acceleration">Аппаратное ускорение</string>
     <string name="hardware_acceleration_help_text">Включение аппаратного ускорения, которое использует ваш GPU, чтобы сделать работу Discord более плавной. Отключите этот параметр, если происходит падение FPS.</string>
     <string name="help">Помощь</string>
-    <string name="help_desk">Техподдержка</string>
+    <string name="help_desk">Служба поддержки</string>
     <string name="help_missing_manage_roles_permission">Роль заблокирована, потому что у вас нет права управления ролями.</string>
     <string name="help_missing_permission">Это право нельзя изменить, потому что ни в одной из ваших ролей его нет.</string>
     <string name="help_role_locked">Роль заблокирована, потому что она имеет более высокий ранг, чем ваша самая высокая роль.</string>
     <string name="help_role_locked_mine">Роль заблокирована, потому что это ваша самая высокая роль. Пожалуйста, обратитесь за помощью к владельцу более высокого ранга или сервера.</string>
     <string name="help_singular_permission">Вы не можете изменить это право, потому что его удаление также отберёт его у вас.</string>
     <string name="hide_instant_invites_description">Рекомендуется, если вы не хотите, чтобы случайные люди получали доступ к вашим серверам Discord.</string>
-    <string name="hide_instant_invites_label">Скрывать ссылки экспресс-приглашений</string>
+    <string name="hide_instant_invites_label">Скрыть ссылки-приглашения</string>
     <string name="hide_muted">Скрыть %1$s заглушенных</string>
     <string name="hide_muted_channels">Скрыть заглуш. каналы</string>
     <string name="hide_personal_information_description">Скрывает электронную почту, подключённые учётные записи, заметки; анонимизирует DiscordTag.</string>
@@ -1688,8 +2229,9 @@
     <string name="hypesquad_leave_error">Возникла ошибка при попытке удалить вас из HypeSquad Online. Пожалуйста, попробуйте ещё раз.</string>
     <string name="hypesquad_leave_prompt">Устали от хайпа?</string>
     <string name="hypesquad_newsletter_warning">Юристы Вампуса просили вас предупредить, что все вступившие в HypeSquad автоматически подписываются на нашу рассылку.</string>
+    <string name="hypesquad_perk_description_newsletter">Мы регулярно рассылаем письма с информацией о конкурсах, подарках и многом другом.</string>
     <string name="hypesquad_perk_description_profile_badge">У вас будет уникальный значок в профиле, который продемонстрирует всем, в какой дом HypeSquad House вы попали.</string>
-    <string name="hypesquad_perk_description_squad_challenges">Защищайте честь своего дома и участвуйте в состязаниях с другими домами.</string>
+    <string name="hypesquad_perk_description_squad_challenges">Защищайте честь своего дома и участвуйте в состязаниях с другими домами HypeSquad.</string>
     <string name="hypesquad_perk_title_newsletter">Страшно секретная рассылка</string>
     <string name="hypesquad_perk_title_profile_badge">Хайповый значок в профиле</string>
     <string name="hypesquad_perk_title_squad_challenges">Хайповые испытания</string>
@@ -1711,7 +2253,7 @@
     <string name="hypesquad_question_11_response_d">Предложите Вампусу взять вместо гитары тамбурин.</string>
     <string name="hypesquad_question_12_prompt">Вы поднялись на вершину самой высокой горы. Теперь от сокровищ вас отделяет лишь трёхглавый дракон. Ваши действия:</string>
     <string name="hypesquad_question_12_response_a">Вступаете в бой.</string>
-    <string name="hypesquad_question_12_response_b">Вспоминаете старые сказки из детства, в которых герои побеждали Змея Горыныча, и пытаетесь повторить.</string>
+    <string name="hypesquad_question_12_response_b">Мучительно вспоминаете порядок действий из сказки про Змея Горыныча и меч-кладенец.</string>
     <string name="hypesquad_question_12_response_c">Пытаетесь убедить дракона поделиться сокровищами.</string>
     <string name="hypesquad_question_12_response_d">Предлагаете дракону плюшевого Вампуса. Ведь всем нужен плюшевый Вампус!</string>
     <string name="hypesquad_question_13_prompt">Что это за звук?</string>
@@ -1726,7 +2268,7 @@
     <string name="hypesquad_question_14_response_d">Зубную пасту съесть, пить чай в темных очках</string>
     <string name="hypesquad_question_1_prompt">Нелли хочет сыграть с вами во что-нибудь через Discord, но вы больше хотите потусоваться с Вампусом. Ваши действия:</string>
     <string name="hypesquad_question_1_response_a">Забьете на обоих и отправитесь в гордом одиночестве поглощать торт-мороженое по случаю дня рождения.</string>
-    <string name="hypesquad_question_1_response_b">Переключите статус в положение «Невидимый» и будете играть с Вампусом.</string>
+    <string name="hypesquad_question_1_response_b">Переключите сетевой статус в положение «Невидимый» и будете играть с Вампусом.</string>
     <string name="hypesquad_question_1_response_c">Попросите Нелли поиграть с Клайдом.</string>
     <string name="hypesquad_question_1_response_d">Нелли не будет возражать. Нелли — робот.</string>
     <string name="hypesquad_question_2_prompt">Вампус хочет заказать пиццу с ананасами. Ваши действия:</string>
@@ -1796,14 +2338,19 @@
     <string name="img_alt_icon">Значок %1$s</string>
     <string name="img_alt_logo">Логотип %1$s</string>
     <string name="img_alt_navigate_to">Перейти к %1$s</string>
+    <string name="in_a_voice_channel">В голосовом канале: **%1$s**</string>
     <string name="in_category">в %1$s</string>
+    <string name="in_game_voice_settings">Настройки голоса в игре</string>
     <string name="in_the_call">На связи</string>
     <string name="in_the_voice_channel">В голосовом канале</string>
     <string name="incoming_call">Входящий звонок</string>
+    <string name="incoming_call_dm">%1$s звонит</string>
     <string name="incoming_call_ellipsis">Входящий звонок…</string>
+    <string name="incoming_call_gdm">Входящий групповой звонок от %1$s</string>
     <string name="incoming_friend_request">Входящий запрос дружбы</string>
     <string name="incoming_video_call">Входящий видеозвонок</string>
     <string name="incoming_video_call_ellipsis">Входящий видеозвонок…</string>
+    <string name="incompatible_browser">Или откройте эту страницу в [поддерживаемом браузере](%1$s).</string>
     <string name="inivte_modal_no_thanks">Нет, спасибо</string>
     <string name="inline_attachment_media">При загрузке через Discord.</string>
     <string name="inline_attachment_media_help">Для изображений больше %1$s МБ предпросмотр будет недоступен.</string>
@@ -1814,16 +2361,20 @@
     <string name="input_mode_ptt_release_delay">Задержка отключения в режиме рации</string>
     <string name="input_mode_vad">Активация по голосу</string>
     <string name="install_location_main">Основное</string>
-    <string name="instant_invite">Экспресс-приглашение</string>
+    <string name="instant_invite">Пригласить</string>
     <string name="instant_invite_accept">Принять приглашение</string>
     <string name="instant_invite_accepted">Приглашение принято</string>
-    <string name="instant_invite_accepting">Принимаем экспресс-приглашение</string>
+    <string name="instant_invite_accepting">Приглашение принимается</string>
     <string name="instant_invite_ask_for_new_invite">Попросите новое!</string>
     <string name="instant_invite_ask_user_for_new_invite">Попросите новое приглашение у %1$s?</string>
+    <string name="instant_invite_banned">Ой-ой. Похоже, вас забанили.</string>
+    <string name="instant_invite_banned_info">Ой-ой. Похоже, вас забанили.</string>
     <string name="instant_invite_code">Код</string>
     <string name="instant_invite_expired">Приглашение содержит ошибку, или истёк срок его действия.</string>
     <string name="instant_invite_expires">Истекает</string>
     <string name="instant_invite_failed_to_generate">Не удалось создать ссылку-приглашение.</string>
+    <string name="instant_invite_friends">Пригласите друзей на свой сервер!</string>
+    <string name="instant_invite_friends_description">Отправьте эту ссылку друзьям, и они автоматически присоединятся к вашему серверу!</string>
     <string name="instant_invite_generate">Сгенерировать</string>
     <string name="instant_invite_generated_by_widget">Создано виджетом</string>
     <string name="instant_invite_guild_by_user">$[**%1$s**](guildNameHook) пользователем **%2$s**</string>
@@ -1845,21 +2396,23 @@
     <string name="instant_invite_you_have_been_invited_to_join">Вы были приглашены в</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** приглашает вас присоединиться к</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Вас приглашает в групповой чат пользователь</string>
-    <string name="instant_invites">Экспресс-приглашения</string>
+    <string name="instant_invites">Приглашения</string>
     <string name="integration_settings">Настройки интеграции</string>
     <string name="integrations">Интеграция</string>
-    <string name="integrations_header">Подключённые учётные записи Twitch/YouTube Gaming</string>
-    <string name="integrations_pro_tip">Для большей интеграции попробуйте [Набор стримера Discord](%1$s).</string>
+    <string name="integrations_header">Подключённые учётные записи Twitch/YouTube</string>
+    <string name="integrations_pro_tip">Для большей интеграции попробуйте [набор стримера Discord StreamKit](%1$s).</string>
+    <string name="interaction_required_body">Требуется ваше действие для начала воспроизведения звука в браузере. Просто щёлкните «ОК» для продолжения.</string>
+    <string name="interaction_required_title">Необходимо действие</string>
     <string name="internal_server_error">Произошла ошибка сервера, пожалуйста, попробуйте ещё раз.</string>
-    <string name="invalid_animated_emoji_body">Этот эмодзи не работает, потому что он анимирован. Подпишитесь на Discord Nitro и исполните все свои эмодзи-мечты</string>
+    <string name="invalid_animated_emoji_body">Этот эмодзи не работает, потому что он анимирован. Подпишитесь на Discord Nitro и исполните все свои мечты об анимированных эмодзи</string>
     <string name="invalid_animated_emoji_body_upgrade">Этот эмодзи не работает, потому что он анимирован. Discord Nitro может решить эту проблему, загляните за подробностями в Настройки пользователя → Discord Nitro</string>
     <string name="invalid_external_emoji_body">Этот эмодзи не работает здесь, потому что он с другого сервера. Приобретите Discord Nitro, чтобы использовать эмодзи с других серверов</string>
     <string name="invalid_external_emoji_body_upgrade">Этот эмодзи не работает, потому что он с другого сервера. Discord Nitro может решить эту проблему, за подробностями загляните в Настройки пользователя → Discord Nitro</string>
-    <string name="invalid_invite_link_error">Пожалуйста, введите действительную ссылку или код приглашения.</string>
+    <string name="invalid_invite_link_error">Пожалуйста, введите действительный код или ссылку-приглашение.</string>
     <string name="invalid_request_format">**%1$s** имеет недопустимый формат. Пожалуйста, введите DiscordTag#0000 или адрес электронной почты.</string>
     <string name="invalid_text_channel">недействительный канал</string>
     <string name="invalid_voice_channel">Недействительный канал</string>
-    <string name="invite_banner_does_not_expire">Эта ссылка бессрочная. Вы можете управлять приглашениями в настройках сервера.</string>
+    <string name="invite_banner_does_not_expire">Эта ссылка-приглашение бессрочная. Вы можете управлять приглашениями в настройках сервера.</string>
     <string name="invite_banner_invite_to_server">Отправить эту ссылку, чтобы добавить друзей на ваш сервер</string>
     <string name="invite_banner_share_invite_link_for_access">Сервера предназначены для совместного использования.</string>
     <string name="invite_button_accepted">присоединился к **%1$s**</string>
@@ -1886,6 +2439,7 @@
     <string name="invite_button_title_inviter_stream">Вы отправили приглашение посмотреть стрим</string>
     <string name="invite_button_title_streaming">Пригласить посмотреть стрим</string>
     <string name="invite_copied">Скопировано</string>
+    <string name="invite_copy_share_link_header_mobile">Поделиться ссылкой</string>
     <string name="invite_edit_link">Изменить ссылку-приглашение.</string>
     <string name="invite_embed_full_group">Полная группа</string>
     <string name="invite_embed_full_group_spectate">Группа заполнена; можно наблюдать</string>
@@ -1908,14 +2462,15 @@
     <string name="invite_embed_spectate">Наблюдать за игрой</string>
     <string name="invite_embed_spectate_via_desktop_app">Наблюдать через приложение для компьютера</string>
     <string name="invite_embed_watch_has_ended">Вечеринка с просмотром закончилась!</string>
+    <string name="invite_expired_subtext_mobile">• Действует в течение %1$s</string>
     <string name="invite_expires_days">Ваша ссылка-приглашение устареет через 1 день.</string>
-    <string name="invite_expires_days_or_uses">Ваше приглашение действительно 1 день или для %1$s.</string>
-    <string name="invite_expires_hours">Ваше приглашение действительно %1$s</string>
-    <string name="invite_expires_hours_or_uses">Ваше приглашение действительно %1$s, или для %2$s.</string>
+    <string name="invite_expires_days_or_uses">Ваша ссылка-приглашение истекает через 1 день или после %1$s.</string>
+    <string name="invite_expires_hours">Ваша ссылка-приглашение действительна %1$s</string>
+    <string name="invite_expires_hours_or_uses">Ваша ссылка-приглашение истекает через %1$s, или после %2$s.</string>
     <string name="invite_expires_minutes">Ваша ссылка-приглашение устареет через 30 минут.</string>
-    <string name="invite_expires_minutes_or_uses">Ваше приглашение действительно 30 минут или для %1$s.</string>
+    <string name="invite_expires_minutes_or_uses">Ваша ссылка-приглашение приглашение истекает через 30 минут или после %1$s.</string>
     <string name="invite_expires_never">Ваша ссылка-приглашение никогда не устареет.</string>
-    <string name="invite_expires_uses">Ваше приглашение действительно для %1$s.</string>
+    <string name="invite_expires_uses">Ваша ссылка-приглашение действительна для %1$s.</string>
     <string name="invite_footer_link_header">Или отправьте другу ссылку-приглашение на сервер</string>
     <string name="invite_friend_modal_invite">Пригласить</string>
     <string name="invite_friend_modal_loading">Обновляем список друзей…</string>
@@ -1936,13 +2491,17 @@
     <string name="invite_modal_error_default">Не удаётся принять приглашение</string>
     <string name="invite_modal_error_title">Ууупс…</string>
     <string name="invite_modal_open_button">Открыть **%1$s**</string>
+    <string name="invite_never_expires_subtext_mobile">• Не имеет срока действия</string>
     <string name="invite_no_channels">Для приглашений необходим канал, но на этом сервере нет каналов.</string>
+    <string name="invite_no_thanks">Нет, спасибо</string>
     <string name="invite_notice_message">Приключение начинается.</string>
     <string name="invite_notice_message_part_2">Давайте добавим участников!</string>
     <string name="invite_people">Пригласить людей</string>
     <string name="invite_search_for_friends">Найти друзей</string>
     <string name="invite_sent">Приглашение отправлено</string>
+    <string name="invite_settings_expired_description">Срок действия: %1$s, %2$s</string>
     <string name="invite_settings_title">Параметры ссылки-приглашения</string>
+    <string name="invite_share_default">Поболтаем в Discord? %1$s</string>
     <string name="invite_share_link_own_server">Поделитесь ссылкой-приглашением, чтобы предоставить доступ к своему серверу!</string>
     <string name="invite_share_link_to_stream">Отправьте другу ссылку-приглашение на стрим</string>
     <string name="invite_stream_footer_link_header">Или отправьте другу ссылку-приглашение на стрим</string>
@@ -1951,7 +2510,34 @@
     <string name="invite_to_server_name">Пригласить людей в %1$s</string>
     <string name="invite_to_server_name_experiment">Мои поздравления! %1$s готов</string>
     <string name="invite_url">Ссылка-приглашение</string>
+    <string name="invite_voice_empty_mobile">Отправьте эту ссылку друзьям, чтобы пригласить их в этот голосовой чат!</string>
+    <string name="invite_your_friends_header_mobile">Ваши друзья</string>
+    <string name="invite_your_friends_voice_call_mobile">Пригласить друга</string>
     <string name="invites">Приглашения</string>
+    <string name="ios_camera">Камера</string>
+    <string name="ios_iap_generic_billing_error">Во время обработки платежа что-то пошло не так. Попробуйте ещё раз!</string>
+    <string name="ios_iap_itunes_error">Ошибка Apple</string>
+    <string name="ios_iap_manage_subscription_button">Управление моей подпиской</string>
+    <string name="ios_iap_manage_subscription_desktop">Вы не можете управлять подпиской отсюда. Откройте приложение для компьютера и загляните в настройки пользователя.</string>
+    <string name="ios_iap_restore_subscription_error">Возникла ошибка при восстановлении подписки. Попробуйте ещё раз!</string>
+    <string name="ios_iap_restore_subscription_none_description">Нет покупок для восстановления.</string>
+    <string name="ios_iap_restore_subscription_none_title">Нечего восстанавливать.</string>
+    <string name="ios_iap_restore_subscription_success">Готово.</string>
+    <string name="ios_iap_testflight_error">Ой! Вы не можете совершать покупки через сборку для Testflight. Воспользуйтесь актуальной сборкой из App Store.</string>
+    <string name="ios_notification_see_full">Коснитесь для просмотра полного сообщения.</string>
+    <string name="ios_nuf_chat_with_friends">Пообщаться с друзьями</string>
+    <string name="ios_nuf_club_or_interest_group">Создать клуб или сообщество</string>
+    <string name="ios_nuf_gaming_community">Присоединиться к существующему игровому сообществу</string>
+    <string name="ios_nuf_get_started">Давайте приступим</string>
+    <string name="ios_nuf_join_a_friend">Присоединиться к другу в Discord</string>
+    <string name="ios_nuf_voice_chat_while_gaming">Пообщаться в голосовом канале во время игры</string>
+    <string name="ios_nuf_what_do_you_want">Чем хотите заняться в первую очередь?</string>
+    <string name="ios_profile_in_voice_call">Отвечает на голосовой звонок</string>
+    <string name="ios_profile_mutual_friends">%1$s</string>
+    <string name="ios_profile_mutual_friends_placeholder">Общие друзья</string>
+    <string name="ios_profile_mutual_guilds">%1$s</string>
+    <string name="ios_profile_mutual_guilds_placeholder">Общие сервера</string>
+    <string name="ios_profile_open_voice_channel">Открыть голосовой канал</string>
     <string name="ip_address_secured">IP-адрес защищён</string>
     <string name="ip_authorization_succeeded">IP-адрес авторизован</string>
     <string name="ip_authorization_succeeded_suggestion">Если вы перешли по этой ссылке после попытки входа на в мобильном приложении или на компьютере, то вернитесь и повторите попытку.</string>
@@ -1966,18 +2552,21 @@
     <string name="join_server_button_cta_mobile">Присоединиться к серверу по ссылке-приглашению</string>
     <string name="join_server_button_cta_mobile_desc">У вас есть код или ссылка-приглашение? Используйте их!</string>
     <string name="join_server_button_cta_named">Присоединиться к %1$s</string>
-    <string name="join_server_description">Введите приглашение присоединиться к существующему серверу. Приглашение будет выглядеть примерно так:</string>
-    <string name="join_server_description_mobile">Введите экспресс-приглашение, чтобы присоединиться к существующему серверу.</string>
+    <string name="join_server_description">Введите приглашение, чтобы присоединиться к существующему серверу. Приглашение выглядит примерно так:</string>
+    <string name="join_server_description_mobile">Введите приглашение, чтобы присоединиться к существующему серверу.</string>
     <string name="join_server_title">Присоединиться к серверу</string>
     <string name="join_stream">Присоединиться к стриму</string>
     <string name="join_video_call">Присоединиться к видеозвонку</string>
+    <string name="join_voice">Присоединиться к голосовому каналу</string>
     <string name="join_voice_call">Присоединиться к голосовому звонку</string>
     <string name="join_voice_channel">Подключиться к этому голосовому каналу?</string>
+    <string name="join_voice_channel_cta">Присоединиться к голосовому каналу</string>
     <string name="joined_server">ОК</string>
     <string name="joining_server">Присоединение</string>
     <string name="jump">Перейти</string>
     <string name="jump_to_channel">Перейти к каналу</string>
     <string name="jump_to_chat">Перейти к чату</string>
+    <string name="jump_to_last_unread_message">Перейти к последнему непрочитанному сообщению</string>
     <string name="jump_to_present">Перейти к последним сообщениям</string>
     <string name="keep_permissions">Оставить текущие права</string>
     <string name="keybind_activate_overlay_chat">Активировать оверлей чата</string>
@@ -2000,6 +2589,7 @@
     <string name="keybind_description_modal_scroll_chat">Прокрутить чат вверх или вниз</string>
     <string name="keybind_description_modal_search">Поиск</string>
     <string name="keybind_description_modal_search_emojis">Скрыть/показать меню эмодзи</string>
+    <string name="keybind_description_modal_search_gifs">Скрыть/показать меню GIF</string>
     <string name="keybind_description_modal_subtitle">Овладейте этим мастерством — и будете величайшим игроком в Discord Discord Revolution</string>
     <string name="keybind_description_modal_title">Комбинации клавиш</string>
     <string name="keybind_description_modal_toggle_deafen">Вкл./выкл. звук в динамиках</string>
@@ -2033,7 +2623,7 @@
     <string name="keybind_toggle_overlay">Вкл./выкл. оверлей</string>
     <string name="keybind_toggle_overlay_input_lock">Вкл./выкл. блокировку оверлея</string>
     <string name="keybind_toggle_stream_mode">Вкл./выкл. режим стримера</string>
-    <string name="keybind_toggle_voice_mode">Вкл./выкл. обнаружение активации голосом</string>
+    <string name="keybind_toggle_voice_mode">Вкл./выкл. обнаружение активации по голосу</string>
     <string name="keybind_unassigned">Не назначено</string>
     <string name="keybinds">Горячие клавиши</string>
     <string name="keyboard_behavior_mobile_header">Раскладка клавиатуры</string>
@@ -2041,7 +2631,7 @@
     <string name="keyboard_behavior_mobile_shift_enter_to_send_hint">По умолчанию, внешние клавиатуры будут отправлять сообщение при нажатии Enter.</string>
     <string name="kick">Выгнать</string>
     <string name="kick_from_server">Выгнать</string>
-    <string name="kick_members">Кикать участников</string>
+    <string name="kick_members">Выгонять участников</string>
     <string name="kick_members_description">Участники с этим правом могут выгонять участников без такого права.</string>
     <string name="kick_user_body">Вы уверены, что хотите выгнать %1$s? Он(а) сможет снова присоединиться к серверу, используя новое приглашение.</string>
     <string name="kick_user_confirmed">"Вы выгнали участника '%1$s' с сервера."</string>
@@ -2054,7 +2644,12 @@
     <string name="language_updated">Язык обновлён.</string>
     <string name="languages">Языки</string>
     <string name="last_seen">больше, чем %1$s назад</string>
+    <string name="last_selected_voice_channel_body">Хотите переподключиться к последнему голосовому каналу? Посидите в голосовом канале, чтобы показать другим пользователям, что вы хотите общаться.</string>
+    <string name="last_selected_voice_channel_no">Нет, спасибо.</string>
+    <string name="last_selected_voice_channel_title">С возвращением!</string>
+    <string name="last_selected_voice_channel_yes">Переподключиться к **%1$s**</string>
     <string name="last_sync">Последняя синхронизация: %1$s</string>
+    <string name="launch_app">Запустить %1$s</string>
     <string name="learn_more">Узнать больше</string>
     <string name="leave_call">Завершить звонок</string>
     <string name="leave_group_dm">Покинуть группу</string>
@@ -2067,15 +2662,21 @@
     <string name="leave_server_body">Вы уверены, что хотите покинуть **%1$s**? Вы не сможете вернуться на этот сервер, пока вас снова не пригласят.</string>
     <string name="leave_server_body_mobile">Вы уверены, что хотите покинуть %1$s?</string>
     <string name="leave_server_title">"Покинуть '%1$s'"</string>
+    <string name="lfg_edit_modal_cta">Обновить</string>
+    <string name="lfg_group_full">Заполнена</string>
+    <string name="lfg_join_button">Вступить</string>
+    <string name="lfg_sidebar_status">Состояние</string>
+    <string name="lfg_view_button">Просмотр</string>
     <string name="library">Библиотека</string>
     <string name="link_account">Привязать учётную запись</string>
+    <string name="link_copied">Ссылка скопирована!</string>
     <string name="link_settings">Параметры ссылки</string>
     <string name="link_your_discord_account">Привяжите свою учётную запись Discord</string>
     <string name="link_your_xbox_account_1">Свяжите свою учётную запись Xbox с Discord, чтобы показать, во что вы играете.</string>
     <string name="link_your_xbox_account_2">Discord — это бесплатный и безопасный голосовой, текстовый и видеочат для геймеров, который работает как на компьютерах, так и на мобильных устройствах.</string>
     <string name="listening_to">Слушает **%1$s**</string>
     <string name="live">В эфире</string>
-    <string name="live_beta_description">Вас приветствует наш стриминговый сервис! Прямой эфир пока в бета-версии. Если будут какие-то неполадки, вы уж извините!</string>
+    <string name="live_beta_description">Вас приветствует наш стриминговый сервис! Go Live пока в бета-версии. Если будут какие-то неполадки, вы уж извините!</string>
     <string name="live_on_twitch">В прямом эфире на Twitch</string>
     <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Не удалось загрузить изображение.
@@ -2085,13 +2686,19 @@
     <string name="loading">Загрузка</string>
     <string name="loading_divider">Загрузка</string>
     <string name="loading_your_pin">Загружаем ваш PIN-код</string>
+    <string name="lobby">Лобби</string>
+    <string name="local_push_notification_guild_verification_body">Теперь вы можете общаться на этом сервере. Благодарим за ожидание!</string>
     <string name="locale">Язык</string>
     <string name="login">Вход</string>
     <string name="login_body">Войдите с помощью e-mail, чтобы начать чат</string>
     <string name="login_title">С возвращением!</string>
     <string name="logout">Выйти</string>
     <string name="lt">Литовский</string>
-    <string name="manage_channel">Управление каналом</string>
+    <string name="lurker_mode_chat_input_back_button">Вернуться к путешествию</string>
+    <string name="lurker_mode_chat_input_button">Присоединиться к серверу</string>
+    <string name="lurker_mode_chat_input_message">Присоединитесь к серверу, чтобы добавить его в список и начать общаться!</string>
+    <string name="lurker_mode_view_guild">Посетите сервер</string>
+    <string name="manage_channel">Управлять каналом</string>
     <string name="manage_channel_description">Это право позволяет переименовывать канал или удалять его.</string>
     <string name="manage_channels">Управлять каналами</string>
     <string name="manage_channels_description">Участники с этим правом могут создавать, редактировать или удалять каналы.</string>
@@ -2099,8 +2706,8 @@
     <string name="manage_messages">Управлять сообщениями</string>
     <string name="manage_messages_description">Участники с этим правом смогут удалять сообщения других участников и закреплять любые сообщения.</string>
     <string name="manage_nicknames">Управлять никнеймами</string>
-    <string name="manage_nicknames_description">Участники с этим правом могут менять никнеймы других участников.</string>
-    <string name="manage_permissions">Управление правами</string>
+    <string name="manage_nicknames_description">Участники с этим правом могут изменять никнеймы других участников.</string>
+    <string name="manage_permissions">Управлять правами</string>
     <string name="manage_permissions_description">Участники с этим правом могут изменять права этого канала.</string>
     <string name="manage_roles">Управлять ролями</string>
     <string name="manage_roles_description">Участники с этим правом могут создавать, изменять и удалять роли ниже этой.</string>
@@ -2139,7 +2746,7 @@
     <string name="mention_everyone">Упоминать всех</string>
     <string name="mention_everyone_autocomplete_description">Оповестить всех, у кого есть право на просмотр этого канала.</string>
     <string name="mention_everyone_autocomplete_description_mobile">Оповестить всех в этом канале.</string>
-    <string name="mention_everyone_description">"Участники с этим правом могут вызывать push-уведомления у всех участников этого канала, начав
+    <string name="mention_everyone_description">"Участники с этим правом могут вызывать Push-уведомления у всех участников этого канала, начав
 сообщение с @everyone или @here."</string>
     <string name="mention_here_autocomplete_description">Оповестить всех, кто находится в сети и имеет право на просмотр этого канала.</string>
     <string name="mention_here_autocomplete_description_mobile">Оповещать всех участников канала, кто находится в сети.</string>
@@ -2149,6 +2756,7 @@
     <string name="mentions_count">%1$s упоминаний</string>
     <string name="message_display_mode_label">Отображение сообщений</string>
     <string name="message_edited">изменено</string>
+    <string name="message_options">Другие настройки</string>
     <string name="message_pinned">Сообщение закреплено.</string>
     <string name="message_preview">Предпросмотр сообщения</string>
     <string name="message_rate_limited_body">Вы отправляете сообщения слишком быстро!</string>
@@ -2173,7 +2781,7 @@
     <string name="mfa_sms_already_enabled">Уже включено!</string>
     <string name="mfa_sms_auth">Дополнительная аутентификация по SMS</string>
     <string name="mfa_sms_auth_current_phone">Ваш текущий номер телефона: %1$s.</string>
-    <string name="mfa_sms_auth_sales_pitch">Добавьте свой телефон в качестве резервного метода двухфакторной аутентификации на случай, если вдруг останетесь без приложения аутентификации или резервных кодов.</string>
+    <string name="mfa_sms_auth_sales_pitch">Добавьте свой телефон в качестве резервного метода двухфакторной аутентификации на случай, если вдруг останетесь без приложения для аутентификации или резервных кодов.</string>
     <string name="mfa_sms_confirm_remove_action">Отключить вход по SMS</string>
     <string name="mfa_sms_confirm_remove_body">Это отключит возможность входа с помощью кодов аутентификации по SMS. Вы уверены, что хотите отключить это?</string>
     <string name="mfa_sms_disabled_partner">Недоступно для партнёров</string>
@@ -2194,6 +2802,7 @@
     <string name="mobile_enable_hardware_scaling">Включить аппаратное масштабирование</string>
     <string name="mobile_enable_hardware_scaling_desc">Экспериментальная функция, которая может повысить производительность в видеозвонках. Будьте осторожны, может вызывать некоторые проблемы.</string>
     <string name="moderation">Модерация</string>
+    <string name="modify_followed_news_header">Вы уверены?</string>
     <string name="more">Ещё</string>
     <string name="move_from_category_to">Переместить из %1$s в</string>
     <string name="move_members">Перемещать участников</string>
@@ -2204,8 +2813,10 @@
     <string name="mute">Откл. микрофон</string>
     <string name="mute_category">Откл. оповещения категории</string>
     <string name="mute_channel">Заглушить **%1$s**</string>
+    <string name="mute_during_work">Заглушить на время работы</string>
+    <string name="mute_for_an_hour">Заглушить на час</string>
     <string name="mute_group_dm">Отключить звук **%1$s**</string>
-    <string name="mute_members">Отключать участникам голос</string>
+    <string name="mute_members">Отключать участникам микрофон</string>
     <string name="mutual_friends">Общие друзья</string>
     <string name="mutual_guilds">Общие сервера</string>
     <string name="n_days">%1$s</string>
@@ -2224,7 +2835,7 @@
     <string name="network_offline">Сетевое подключение ограничено или недоступно.</string>
     <string name="nevermind">Не, проехали</string>
     <string name="new_dm">Новое личное сообщение</string>
-    <string name="new_group_dm">Новая группа ЛС</string>
+    <string name="new_group_dm">Новый групповой чат</string>
     <string name="new_guilds_dm_allowed">Разрешить личные сообщения от участников сервера.</string>
     <string name="new_mentions">Новые упоминания</string>
     <string name="new_messages">%1$s с %2$s</string>
@@ -2238,9 +2849,14 @@
     <string name="new_terms_ack">Я понимаю и соглашаюсь с этими условиями.</string>
     <string name="new_terms_continue">Перейти в Discord</string>
     <string name="new_terms_description">"Чтобы продолжить пользоваться Discord, прочитайте и примите
-наши обновлённые условия использования и политику конфиденциальности."</string>
-    <string name="new_terms_title">Обновление условий использования и политики конфиденциальности</string>
-    <string name="new_unreads">Новые сообщения</string>
+наши обновлённые Условия Использования и Политику Конфиденциальности."</string>
+    <string name="new_terms_title">Обновление Условий Использования и Политики Конфиденциальности</string>
+    <string name="new_unreads">Новые непрочитанные</string>
+    <string name="news_channel">Канал с объявлениями</string>
+    <string name="news_channel_edit_news">Редактировать объявление</string>
+    <string name="news_channel_publish">Опубликовать</string>
+    <string name="news_channel_publish_news">Опубликовать объявление</string>
+    <string name="news_channel_published">Опубликовано</string>
     <string name="next">Далее</string>
     <string name="nickname">Никнейм</string>
     <string name="nickname_changed">Никнейм изменён на %1$s.</string>
@@ -2251,7 +2867,7 @@
     <string name="no_authorized_apps">Нет авторизованных приложений</string>
     <string name="no_authorized_apps_note">Улучшите свой Discord, подключив к нему сторонние сервисы</string>
     <string name="no_ban_reason">Причина не указана</string>
-    <string name="no_bans">Нет блокировок</string>
+    <string name="no_bans">Нет банов</string>
     <string name="no_camera_access">У Discord нет доступа к вашей камере</string>
     <string name="no_category">Без категории</string>
     <string name="no_channel_description">Ваши **личные сообщения** и **серверы** находятся здесь.</string>
@@ -2259,13 +2875,19 @@
     <string name="no_emoji_body">Пусто</string>
     <string name="no_emoji_search_results">Эмодзи по вашему запросу не найдены</string>
     <string name="no_emoji_title">Эмодзи нет</string>
+    <string name="no_gif_favorites_flavor_favorite_please">Эм, добавьте что-нибудь в избранное… пожалуйста.</string>
+    <string name="no_gif_favorites_flavor_still_here">Слушайте, а почему вы ещё здесь?</string>
+    <string name="no_gif_favorites_go_favorite">И это… как насчёт добавить сюда пару гифонек?</string>
+    <string name="no_gif_favorites_how_to_favorite">Щёлкните по звезде в углу GIF, чтобы добавить его в избранное.</string>
+    <string name="no_gif_favorites_where_to_favorite">Здесь можно найти избранные GIF!</string>
+    <string name="no_gif_search_results">GIF по вашему запросу не найдены.</string>
     <string name="no_input_devices">Нет устройств ввода</string>
     <string name="no_input_devices_detected">Устройства ввода не обнаружены. Пожалуйста, проверьте подключение и повторите попытку.</string>
-    <string name="no_instant_invite">Нет экспресс-приглашения</string>
-    <string name="no_integrations">[Подключите](onConnect) вашу партнерскую учётную запись Twitch или YouTube Gaming, чтобы синхронизировать ваших подписчиков/спонсоров с ролями</string>
+    <string name="no_instant_invite">Нет приглашения</string>
+    <string name="no_integrations">[Подключите](onConnect) вашу партнёрскую учётную запись Twitch или YouTube Gaming, чтобы синхронизировать ваших подписчиков/спонсоров с ролями.</string>
     <string name="no_integrations_body">Протокол DPУ}|{64 может быть выполнен только в клиенте Discord</string>
     <string name="no_integrations_label">Нет интеграций</string>
-    <string name="no_invites_body">"Не видите перед собой цели? Вас несёт, словно бумажный самолётик, дрейфующий по небу?
+    <string name="no_invites_body">"Не видите перед собой цели? Вас несёт, словно бумажный самолётик, дрейфующий по небу?r
 Пригласите сюда своих друзей, создав ссылку-приглашение!"</string>
     <string name="no_invites_caption">Пока приглашений нет!</string>
     <string name="no_invites_label">Пока нет приглашений</string>
@@ -2282,17 +2904,20 @@
 закреплённых сообщений… пока что."</string>
     <string name="no_pins_in_dm">"В этом диалоге нет
 закреплённых сообщений… пока что."</string>
+    <string name="no_private_channels_description">Добавьте друга, чтобы начать общаться в Discord!</string>
+    <string name="no_private_channels_title">У вас нет личных сообщений.</string>
     <string name="no_reactions_body">Какой холодный, бесчувственный мир.</string>
     <string name="no_reactions_header">Нет реакций</string>
     <string name="no_recent_mentions">И в начале… была тишина.</string>
     <string name="no_send_messages_permission_placeholder">У вас недостаточно прав, чтобы отправлять сообщения в этом канале.</string>
-    <string name="no_system_channel">Без сообщений о новых участниках</string>
+    <string name="no_system_channel">Нет системных сообщений</string>
     <string name="no_text">Нет</string>
     <string name="no_thanks">Нет, спасибо</string>
     <string name="no_user_limit">Без ограничений</string>
     <string name="no_video_devices">Нет видеоустройств</string>
     <string name="noise_suppression">Шумоподавление</string>
     <string name="none">Пусто</string>
+    <string name="not_available">Н/д</string>
     <string name="not_in_the_call">Не на связи</string>
     <string name="not_in_the_voice_channel">Не в голосовом канале</string>
     <string name="note">Заметка</string>
@@ -2304,12 +2929,17 @@
     <string name="notice_connection_conflict">Голосовой чат был отключён, так как вы подключились из другого места.</string>
     <string name="notice_corrupt_installation">Кажется, установленный у вас Discord повреждён. Давайте исправим это… вместе.</string>
     <string name="notice_corrupt_installation_help_link_text">Помогите!</string>
+    <string name="notice_detected_off_platform_no_premium_perk_message">Играете в **%1$s**? Получите *%2$s* бесплатно!</string>
+    <string name="notice_detected_off_platform_premium_perk_button">Активировать</string>
+    <string name="notice_detected_off_platform_premium_perk_message">Играете в **%1$s**? Активируйте бонус Nitro и получите *%2$s* бесплатно!</string>
+    <string name="notice_dispatch_api_error">Ну вот… Кажется, сервера Discord немного штормит. Попробуйте ещё раз попозже.</string>
     <string name="notice_dispatch_application_lock_failed">Discord уже делает что-то с этой игрой. Проверьте, чтобы на вашем компьютере не было запущено других клиентов Discord.</string>
     <string name="notice_dispatch_error">О нет. Что-то пошло не так.</string>
+    <string name="notice_dispatch_error_disk_full">Ну вот… Кажется, у вас закончилось место на диске. Освободите немного места и попробуйте ещё раз.</string>
     <string name="notice_dispatch_error_disk_low">Недостаточно места на диске. Для установки требуется %1$s, а доступно только %2$s.</string>
     <string name="notice_dispatch_error_file_name_too_long">Вот беда! У некоторых файлов этой игры слишком длинное название для Windows. Выберите папку для установки игры с более коротким названием.</string>
     <string name="notice_dispatch_error_invalid_drive">Вот беда! Некорректный адрес для установки. Вы выбрали %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Нам не удалось обновить игру. Может быть, она сейчас запущена?</string>
+    <string name="notice_dispatch_error_io_permission_denied">Ну вот… Нам не удалось обновить игру. Убедитесь, что она закрыта, и попробуйте ещё раз.</string>
     <string name="notice_dispatch_error_no_manifests">Вот беда! Похоже, что для этой игры нет контента. Обратитесь в службу поддержки!</string>
     <string name="notice_dispatch_error_not_entitled">Вот беда! Похоже, что этой игры у вас нет. Если вы считаете, что произошла ошибка, обратитесь в службу поддержки.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Кажется, вы отказали программе установки игры. Чтобы установить эту игру, нужно сказать ей «Да»!</string>
@@ -2324,14 +2954,14 @@
     <string name="notice_native_apps">Нужен режим рации, который работал бы по всей системе? Скачайте приложение для компьютера!</string>
     <string name="notice_no_input_detected">Кажется, Discord не может обнаружить сигнал вашего микрофона. Давайте исправим это… вместе.</string>
     <string name="notice_no_input_detected_help_link_text">Помогите!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Истёк срок действия вашей подписки Nitro. Смените подписку с Nitro Classic на Nitro, чтобы получить неограниченный доступ к крутейшим играм.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Ваша подписка на игры Nitro истекает через %1$s Доступ закончится **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Спасибо, что в числе первых присоединились к программе Nitro! Мы вас обожаем и поэтому дарим доступ к играм Nitro до %1$s.</string>
+    <string name="notice_no_input_detected_settings">Кажется, Discord не может обнаружить сигнал вашего микрофона. Давайте это исправим!</string>
+    <string name="notice_no_input_detected_settings_link_text">Откройте настройки</string>
     <string name="notice_premium_promo_action">Попробовать</string>
     <string name="notice_premium_promo_message">Поддержите разработку Discord и получите клёвые бонусы!</string>
     <string name="notice_scheduled_maintenance">В Discord будут проводиться запланированные технические работы **%1$s** в **%2$s**.</string>
     <string name="notice_spotify_auto_paused">Ваш микрофон передаёт звук в течение 30 секунд. Воспроизведение Spotify приостановлено.</string>
     <string name="notice_streamer_mode_text">Режим стримера включён. Ты в безопасности, друг.</string>
+    <string name="notice_survey_body">Мы будем рады услышать ваше мнение о работе Discord и рассмотреть ваши предложения по улучшению.</string>
     <string name="notice_survey_button">Принять участие в опросе</string>
     <string name="notice_survey_prompt">Не могли бы вы ответить на несколько вопросов о Discord? Ну пожжжалуйста!</string>
     <string name="notice_unclaimed_account">Эта учётная запись ещё не присвоена. Присвойте её, пока не поздно.</string>
@@ -2341,6 +2971,7 @@
     <string name="notification_accepted_friend_request">Принял ваш запрос дружбы.</string>
     <string name="notification_body_attachment">Отправлен %1$s</string>
     <string name="notification_body_start_game">%1$s начинает играть в %2$s!</string>
+    <string name="notification_dismiss">Убрать уведомление</string>
     <string name="notification_message_create_dm_activity_join">%1$s приглашает вас поиграть в %2$s</string>
     <string name="notification_message_create_dm_activity_listen">%1$s приглашает вас послушать треки в Spotify</string>
     <string name="notification_message_create_dm_activity_spectate">%1$s приглашает вас понаблюдать за игрой в %2$s</string>
@@ -2357,7 +2988,13 @@
     <string name="notification_reply_success">Ответил(а) %1$s</string>
     <string name="notification_settings">Параметры уведомлений</string>
     <string name="notification_title_start_game">Кто-то играет</string>
+    <string name="notification_voice_status_body">Присоединитесь к этому пользователю: «%1$s»</string>
+    <string name="notification_voice_status_body_no_status">Присоединитесь к вечеринке!</string>
+    <string name="notification_voice_status_title">%1$s в голосовом чате (%2$s)</string>
     <string name="notifications">Уведомления</string>
+    <string name="notifications_nuf_body">Настройте уведомления, чтобы не пропустить ни одно сообщение друзей.</string>
+    <string name="notifications_nuf_cta">Включить уведомления</string>
+    <string name="notifications_nuf_title">Будьте в курсе всех событий!</string>
     <string name="nsfw_accept">Продолжить</string>
     <string name="nsfw_decline">Нет</string>
     <string name="nsfw_description">Этот канал разрешено просматривать только совершеннолетним. Вам больше 18 лет и вы готовы увидеть материалы для взрослых?</string>
@@ -2372,46 +3009,64 @@
     <string name="nuf_claim_account_title">Зарегистрируйте свою учётную запись</string>
     <string name="nuf_create_server_body">"Нет кода приглашения? Не беда!
 
-Создайте собственный сервер Discord для себя и друзей. Мы предоставим голосовые и текстовые каналы — это абсолютно бесплатно."</string>
+Создайте собственный сервер Discord для себя и друзей. Мы предоставим голосовые и текстовые чаты — это абсолютно бесплатно."</string>
     <string name="nuf_create_server_button">Создать сервер</string>
     <string name="nuf_create_server_error">Недопустимое имя сервера</string>
-    <string name="nuf_create_server_note">Создавая сервер, вы соглашаетесь с нашими [Правилами Сообщества](https://discordapp.com/guidelines).</string>
+    <string name="nuf_create_server_note">Создавая сервер, вы соглашаетесь с нашими [Правилами сообщества](https://discordapp.com/guidelines).</string>
     <string name="nuf_create_server_title">Создайте сервер</string>
     <string name="nuf_download_app_body">Загрузите наше приложение для компьютера для более простого доступа к вашим серверам и функциям, имеющимся только в приложении (включая режим рации)!</string>
     <string name="nuf_download_app_button_platform">Загрузить для %1$s</string>
     <string name="nuf_download_app_button_type">Загрузить %1$s</string>
     <string name="nuf_download_app_intro">Фух, почти готово! Прежде чем отправиться в путь…</string>
     <string name="nuf_download_app_title">Загрузить приложение для компьютера</string>
-    <string name="nuf_join_server_body_1">В таком случае введите вашу ссылку или код приглашения, чтобы присоединиться к серверу!</string>
+    <string name="nuf_join_server_body_1">В таком случае введите ваш код или ссылку-приглашение, чтобы присоединиться к серверу!</string>
     <string name="nuf_join_server_body_2">"Мы так рады, что вы здесь!
 
 Вы получили ссылку-приглашение от друга? Введите ссылку или код, чтобы присоединиться к серверу."</string>
     <string name="nuf_join_server_button">Присоединиться к серверу</string>
-    <string name="nuf_join_server_input_label">Ссылка или код приглашения</string>
+    <string name="nuf_join_server_input_label">Код или ссылка-приглашение</string>
     <string name="nuf_join_server_input_note">Например: https://discord.gg/qJq5C, https://discord.gg/discord-devs, qJq5C</string>
     <string name="nuf_join_server_title_1">У Вас есть ссылка-приглашение?</string>
     <string name="nuf_join_server_title_2">Добро пожаловать в Discord!</string>
     <string name="nuf_title">Добро пожаловать в Discord, %1$s</string>
     <string name="nuf_title_mobile">Добро пожаловать в Discord</string>
+    <string name="nuf_welcome_carousel_1_body_mobile">Более 200 миллионов игроков уже используют Discord для бесплатного общения с друзьями. Присоединяйтесь!</string>
+    <string name="nuf_welcome_carousel_1_title_mobile">Добро пожаловать в Discord</string>
+    <string name="nuf_welcome_carousel_2_body_mobile">Ваш сервер — это место, где тусуются друзья. Добавьте пользовательские эмодзи или начните голосовой чат!</string>
+    <string name="nuf_welcome_carousel_2_title_mobile">Создайте сервер</string>
+    <string name="nuf_welcome_carousel_3_body_mobile">В Discord много настраиваемых параметров, так что управлять игровыми группами теперь легко.</string>
+    <string name="nuf_welcome_carousel_3_title_mobile">Определить роли и права</string>
+    <string name="nuf_welcome_carousel_4_body_mobile">Добавить друзей на сервер — проще простого!</string>
+    <string name="nuf_welcome_carousel_4_title_mobile">Ссылки-приглашения одним щелчком мыши</string>
+    <string name="nuf_welcome_carousel_5_body_mobile">Посмотрите, кто из ваших друзей в сети и во что они играют.</string>
+    <string name="nuf_welcome_carousel_5_title_mobile">Посмотреть, кто играет</string>
     <string name="num_channels">%1$s</string>
+    <string name="num_members">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
+    <string name="nux_overlay_description">Больше не нужно то и дело переключаться на Discord — узнавайте информацию о говорящих и используйте ярлыки, когда находитесь в других приложениях.</string>
+    <string name="nux_overlay_enable">Включить оверлей</string>
+    <string name="nux_overlay_title">Встречайте НОВЫЙ мобильный голосовой оверлей!</string>
     <string name="nux_post_reg_join_server_description">Используйте Discord на полную, присоединившись к серверу.</string>
     <string name="nux_post_reg_join_server_skip">У меня нет</string>
     <string name="nux_post_reg_join_server_title">У вас есть приглашение?</string>
+    <string name="nux_samsung_game_presence_link_title">Во что вы играете?!</string>
     <string name="oauth2_connect_to_discord">Подключиться к Discord</string>
     <string name="oauth2_insecure_notice">Это приложение **может** во время своей работы читать и отправлять сообщения от вашего имени.</string>
     <string name="oauth2_insecure_read_notice">Это приложение во время своей работы **может** читать, но **не может** отправлять сообщения от вашего имени.</string>
     <string name="oauth2_label">Это позволит %1$s</string>
     <string name="oauth2_message_cta">Теперь вы можете закрыть это окно или вкладку.</string>
     <string name="oauth2_message_unknown_error">Неизвестная ошибка</string>
+    <string name="oauth2_request_invalid_scope">Некорректная область действия **%1$s**</string>
+    <string name="oauth2_request_missing_param">Некорректный запрос. Отсутствует параметр **%1$s**</string>
     <string name="oauth2_security_notice">Это приложение **не может** читать и отправлять сообщения от вашего имени.</string>
     <string name="oauth2_title">Авторизовать доступ к вашей учётной записи</string>
     <string name="okay">OK</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="only_you_can_see_and_delete_these">Только вы видите %1$s. [Нажмите здесь, чтобы убрать %1$s](handleDelete).</string>
+    <string name="only_you_can_see_and_delete_these">Только вы видите %1$s. [Нажмите здесь, чтобы удалить %1$s](handleDelete).</string>
+    <string name="open">Открыть</string>
     <string name="open_app">У меня уже есть это приложение. Ну-ка, откройся!</string>
     <string name="open_in_browser">Открыть в браузере</string>
     <string name="open_in_theater">Открыть в театре</string>
@@ -2427,6 +3082,8 @@
     <string name="outgoing_friend_request_delete_msg">Вы действительно хотите удалить запрос дружбы к пользователю **%1$s**?</string>
     <string name="overlay">Оверлей</string>
     <string name="overlay_channel_chat_hotkey">Нажмите %1$s, чтобы общаться в %2$s</string>
+    <string name="overlay_click_to_jump_to_channel">Щёлкните, чтобы перейти к каналу</string>
+    <string name="overlay_click_to_unlock">Щёлкните, чтобы открыть оверлей</string>
     <string name="overlay_crashed_title">Ошибка оверлея Discord!</string>
     <string name="overlay_explanation">"Включение оверлея может вызвать ложное срабатывание вашего антивируса.
 Кроме того, оверлей может работать не у всех. Если у вас возникли проблемы или вопросы,
@@ -2434,22 +3091,23 @@
     <string name="overlay_friend_calling">%1$s звонит вам!</string>
     <string name="overlay_in_game_preview_header">Предпросмотр в игре</string>
     <string name="overlay_launch_open_tip">Нажмите %1$s, чтобы показать</string>
-    <string name="overlay_launch_title">Включить оверлей Discord в игре?</string>
+    <string name="overlay_launch_title">Включить оверлей Discord в игре</string>
     <string name="overlay_link_alert_body">Вы собираетесь открыть ссылку в стороннем браузере. Точно продолжить?</string>
     <string name="overlay_link_alert_secondary">Открыть и больше не спрашивать.</string>
     <string name="overlay_link_alert_title">Стоп-стоп-стоп!</string>
     <string name="overlay_menu_get_invite">Получить ссылку-приглашение</string>
     <string name="overlay_menu_open_discord">Открыть Discord</string>
     <string name="overlay_menu_switch_channels">Сменить канал</string>
-    <string name="overlay_mobile_required">Включите функцию Мобильного Оверлея в голосовых настройках Discord.</string>
-    <string name="overlay_mobile_toggle_desc">Подключитесь к голосовому чату, чтобы иметь доступ к информации о говорящих и ярлыкам даже в других приложениях.</string>
+    <string name="overlay_mobile_required">Включите мобильный оверлей в настройках голоса Discord.</string>
+    <string name="overlay_mobile_toggle_desc">Подключитесь к голосовому чату, чтобы иметь доступ к ярлыкам и информации о говорящих даже в других приложениях.</string>
     <string name="overlay_mobile_toggle_label">Включить мобильный голосовой оверлей</string>
+    <string name="overlay_mobile_unauthed">Чтобы включить эту функцию, войдите в приложение Discord.</string>
     <string name="overlay_news_go_live_body">Хотите начать стрим %1$s для друзей на сервере %2$s?</string>
     <string name="overlay_news_go_live_cta">Прямой эфир</string>
     <string name="overlay_news_text_pinning_body">Теперь вы можете прикрепить к игре текстовый чат!</string>
     <string name="overlay_news_text_pinning_tip">Совет: чтобы прикрепить чат, нажмите на $[кнопку](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Оверлей Discord доработан</string>
-    <string name="overlay_no_results">Мы искали вдоль и поперёк. Но, увы, нам не удалось найти голосовые каналы.</string>
+    <string name="overlay_no_results">Мы искали вдоль и поперёк, но так и не нашли голосовые каналы.</string>
     <string name="overlay_notification_incoming_call">Входящий звонок…</string>
     <string name="overlay_notification_settings_disabled">Уведомления отключены</string>
     <string name="overlay_notification_settings_position">Отображение: %1$s</string>
@@ -2459,14 +3117,16 @@
     <string name="overlay_notifications_settings">Уведомления в оверлее</string>
     <string name="overlay_notifications_top_left">Вверху слева</string>
     <string name="overlay_notifications_top_right">Вверху справа</string>
-    <string name="overlay_private_channels_empty_state">Не-а, личных сообщений нет.</string>
+    <string name="overlay_pin_label_tutorial">**Совет**: щёлкните, чтобы открыть чат в игре.</string>
     <string name="overlay_reload">Перезагрузить оверлей</string>
+    <string name="overlay_reset_default_layout">Установить макет по умолчанию</string>
     <string name="overlay_settings">Настройки оверлея</string>
     <string name="overlay_settings_general_tab">Основной</string>
     <string name="overlay_settings_title">Настройки оверлея</string>
     <string name="overlay_settings_voice_tab">Голос</string>
     <string name="overlay_text_notification_tip">Нажмите %1$s, чтобы открыть</string>
     <string name="overlay_text_notification_tip_unlocked">Совет: вы можете настроить уведомления в $[меню настроек](settingsHook)</string>
+    <string name="overlay_too_small">Ой! Игра слишком маленькая для нашего оверлея. Чтобы исправить эту ошибку, измените разрешение на %1$sx%2$s.</string>
     <string name="overlay_unlock_to_answer">Разблокируйте, чтобы ответить %1$s</string>
     <string name="overlay_unlock_to_join">Разблокируйте, чтобы присоединиться %1$s</string>
     <string name="overlay_user_chat_hotkey">Нажмите %1$s, чтобы начать чат</string>
@@ -2478,15 +3138,18 @@
     <string name="overwrite_autocomplete_placeholder">Роль/Участник</string>
     <string name="overwrite_no_role_to_add">В этом канале переопределены права каждой роли.</string>
     <string name="pagination_next">Далее</string>
+    <string name="pagination_page_label">Страница %1$s</string>
     <string name="pagination_page_of">Страница %1$s из %2$s</string>
     <string name="pagination_previous">Назад</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="participators_compared_to_communicators">chatters compared to lurkers</string>
     <string name="partner_badge_tooltip">Партнёр Discord</string>
     <string name="party_full">Группа заполнена</string>
     <string name="party_join">Вступить в группу</string>
     <string name="party_joined">В группе</string>
     <string name="party_locked">Закрытая</string>
+    <string name="password_length_error">Пароль должен быть длиной от 6 до 128 символов</string>
     <string name="password_manager">Менеджер паролей</string>
     <string name="password_manager_info_android">Если вы пользуетесь менеджером паролей, вам нужно разрешить доступ к нему в меню «Специальные возможности» → «Загруженные сервисы». Не беспокойтесь, мы покажем вам, как туда попасть.</string>
     <string name="password_manager_open_settings">Открыть настройки</string>
@@ -2495,14 +3158,23 @@
     <string name="password_required">Требуется пароль.</string>
     <string name="paste">Вставить</string>
     <string name="paste_and_send">Вставить и отправить</string>
+    <string name="pause">Пауза</string>
+    <string name="payment_authentication_modal_button">Продолжить</string>
     <string name="payment_modal_button_change_card">Обновить данные карты</string>
     <string name="payment_modal_button_change_paypal">Обновить счёт PayPal</string>
     <string name="payment_modal_button_premium">Подписаться на %1$s</string>
+    <string name="payment_modal_button_premium_gift">Оформить подписку на %1$s</string>
+    <string name="payment_modal_one_month">1 месяц</string>
+    <string name="payment_modal_one_year">1 год</string>
+    <string name="payment_modal_per_month">В месяц</string>
+    <string name="payment_modal_per_year">В год</string>
     <string name="payment_modal_subtitle">Подписка Discord Nitro</string>
     <string name="payment_modal_title_change_card">Сменить банковскую карту</string>
     <string name="payment_modal_title_change_paypal">Подключить другой счёт PayPal</string>
     <string name="payment_modal_title_new_monthly">%1$s%2$s %3$s в месяц</string>
     <string name="payment_modal_title_new_yearly">%1$s%2$s %3$s в год</string>
+    <string name="payment_price_change_body">С момента начала покупки цена успела измениться. Пожалуйста, перезагрузите приложение после того, как проверите цену.</string>
+    <string name="payment_price_change_title">Цена изменилась!</string>
     <string name="payment_source_billing_address">Адрес для выставления счетов</string>
     <string name="payment_source_card_ending">%1$s **%2$s**</string>
     <string name="payment_source_card_ending_in">Карта %1$s</string>
@@ -2512,21 +3184,35 @@
     <string name="payment_source_credit_card">Банковская карта</string>
     <string name="payment_source_delete">Удалить способ оплаты</string>
     <string name="payment_source_delete_disabled_tooltip">Удалить этот способ оплаты при действующей подписке Nitro нельзя.</string>
+    <string name="payment_source_deleted">Способ оплаты удалён</string>
+    <string name="payment_source_edit_help_card">Чтобы изменить другие сведения о карте, нажмите кнопку «Добавить способ оплаты».</string>
     <string name="payment_source_edit_help_paypal">Отредактировать платёжные реквизиты в системе PayPal можно на [сайте платёжного сервиса](%1$s).</string>
+    <string name="payment_source_edit_saved">Платёжная информация сохранена</string>
+    <string name="payment_source_edit_select_state">Выбрать штат/область</string>
+    <string name="payment_source_edit_title">Изменить способ оплаты</string>
     <string name="payment_source_expiration_date">Действительна до</string>
     <string name="payment_source_expiration_date_placeholder">мм/гг</string>
     <string name="payment_source_information">Платёжная информация</string>
+    <string name="payment_source_invalid">Некорректно</string>
+    <string name="payment_source_invalid_help">Нам не удалось снять средства с указанного источника оплаты. Пожалуйста, проверьте правильность информации.</string>
     <string name="payment_source_make_default">Сделать этот способ оплаты основным.</string>
     <string name="payment_source_name">Имя на карте</string>
     <string name="payment_source_name_error_required">Нужно указать имя.</string>
     <string name="payment_source_name_placeholder">Как тебя зовут, путник?</string>
+    <string name="payment_source_payment_request_button_generic">Автозаполнение из браузера</string>
+    <string name="payment_source_payment_request_info_creating">Карта будет создана через %1$s…</string>
+    <string name="payment_source_payment_request_info_loading">Подтверждение платежа в браузере!</string>
+    <string name="payment_source_payment_request_info_title">Оплатить при помощи</string>
+    <string name="payment_source_payment_request_label">Добавить способ оплаты</string>
+    <string name="payment_source_payment_request_unsupported">Автозаполнение из браузера (нет)</string>
     <string name="payment_source_paypal_account">Счёт PayPal</string>
     <string name="payment_source_paypal_details">Реквизиты PayPal</string>
+    <string name="payment_source_paypal_loading">Подключение к PayPal…</string>
     <string name="payment_source_paypal_reopen">Открыть повторно</string>
     <string name="payment_source_security_code">Код CVC</string>
     <string name="payment_source_title">Способ оплаты</string>
     <string name="payment_source_type">Тип оплаты</string>
-    <string name="payment_source_type_select">Выберите способ оплаты</string>
+    <string name="payment_source_type_select">Выберите тип оплаты</string>
     <string name="payment_sources_add">Добавить новый способ оплаты</string>
     <string name="payment_steps_go_back">Вернуться</string>
     <string name="paypal_account_verifying">Подключение счёта PayPal</string>
@@ -2559,7 +3245,7 @@
     <string name="pin_message_body_private_channel">Просто уточняю, вы хотите закрепить это сообщение в текущем канале для потомков и величия?</string>
     <string name="pin_message_title">Закрепите это. Хорошо закрепите.</string>
     <string name="pin_message_too_many_body">Discord не может закрепить это сообщение. На канале #%1$s допустимо не более %2$s закреплённых сообщений. Возможно, вы достигли лимита.</string>
-    <string name="pin_message_too_many_body_private_channel">Discord не может закрепить это сообщение. В этой переписке допустимо не более %1$s закреплённых сообщений. Возможно, вы достигли лимита.</string>
+    <string name="pin_message_too_many_body_private_channel">Discord не может закрепить это сообщение. В этой переписке допустимо не более %1$s закреплённых сообщений. Возможно, вы достигли лимита на этом канале.</string>
     <string name="pin_message_too_many_title">Невозможно закрепить</string>
     <string name="pinned_messages">Закреплённые сообщения</string>
     <string name="pinned_messages_pro_tip">ПОДСКАЗКА:</string>
@@ -2570,68 +3256,184 @@
     <string name="pl">Польский</string>
     <string name="platform_android_version">Android 4.1+</string>
     <string name="platform_windows">Windows</string>
+    <string name="play">Играть</string>
+    <string name="play_full_video">Воспроизвести видео целиком</string>
     <string name="playing_game">Играет в **%1$s**</string>
     <string name="popout_player">В отдельном окне</string>
     <string name="popout_remove_from_top">Открепить</string>
     <string name="popout_return">Вернуться в приложение</string>
     <string name="popout_stay_on_top">Закрепить наверху</string>
     <string name="post_code">Индекс</string>
+    <string name="premium_activated">Подписка Nitro активирована</string>
     <string name="premium_alert_error_title">Ой, что-то пошло не так…</string>
-    <string name="premium_applications_grandfathered_monthly">В знак благодарности за поддержку Discord мы предоставляем вам доступ к играм по подписке Nitro на целый год. Предложение заканчивается **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">В знак благодарности за поддержку Discord мы предоставляем вам доступ к играм по подписке Nitro на два года. Предложение заканчивается **%1$s**.</string>
-    <string name="premium_applications_subtitle">Получите неограниченный доступ к постоянно растущей библиотеке крутецких игр с высочайшими оценками — вам точно стоит сыграть в них с друзьями!</string>
-    <string name="premium_applications_title">Десятки игр от кураторов. Одна цена за весь месяц (низкая!).</string>
     <string name="premium_badge_tooltip">Подписчик с %1$s</string>
     <string name="premium_cancel_cancel">Нет</string>
-    <string name="premium_cancel_confirm_body_tier_1">"Отмена подписки произойдёт в конце текущего расчётного периода — **%1$s**. Если вы меняли свой Discord-тег, то после отмены подписки он будет вновь изменён на случайный.
+    <string name="premium_cancel_cancel_mobile">Не отменять Nitro</string>
+    <string name="premium_cancel_confirm_body_tier_1">"Отмена подписки произойдёт в конце текущего расчётного периода — **%1$s**. Если вы меняли свой Discord Tag, то после отмены подписки он будет вновь изменён на случайный.
 
 Вы можете возобновить подписку в любое время."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Отмена подписки произойдёт в конце текущего расчётного периода. **%1$s** вы потеряете доступ к всем играм Nitro в своей библиотеке; если у вас был собственный Discord-тег, он будет изменён на случайный.
-
-Ваши файлы сохранений мы сбережём в целости — вдруг вы передумаете и решите возобновить подписку. Это можно сделать в любое время."</string>
+    <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">Отмена подписки произойдёт в конце текущего расчётного периода — **%1$s**. Если вы меняли свой Discord Tag, то после отмены подписки он будет вновь изменён на случайный.</string>
+    <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">Вы можете возобновить подписку в любое время.</string>
+    <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Вы можете возобновить подписку в любое время.</string>
+    <string name="premium_cancel_confirm_mobile">Отменить Nitro</string>
     <string name="premium_cancel_confirm_new">Да, отменить %1$s</string>
     <string name="premium_cancel_confirm_title">Отменить %1$s?</string>
     <string name="premium_cancel_failed_body">Мы не смогли отменить вашу подписку Nitro. Пожалуйста, попробуйте ещё раз или обратитесь к нашей службе поддержки, если эта проблема сохранится.</string>
     <string name="premium_canceled">Ваша подписка заканчивается %1$s.</string>
     <string name="premium_cant_upgrade_confirm">Ясно</string>
     <string name="premium_change_discriminator_length_error">Этот тег недопустим. Тег должен содержать 4 цифры.</string>
-    <string name="premium_change_discriminator_modal_body">Как только закончится подписка Nitro, ваш Discord-тег будет заменён на случайный. Вы уверены, что хотите изменить свой Discord-тег?</string>
-    <string name="premium_change_discriminator_modal_confirm">Изменить Discord-тег</string>
-    <string name="premium_change_discriminator_modal_header">Изменить собственный Discord-тег</string>
+    <string name="premium_change_discriminator_modal_body">Как только закончится подписка Nitro, ваш Discord Tag будет заменён на случайный. Вы уверены, что хотите изменить свой Discord Tag?</string>
+    <string name="premium_change_discriminator_modal_confirm">Изменить Discord Tag</string>
+    <string name="premium_change_discriminator_modal_header">Изменить собственный Discord Tag</string>
     <string name="premium_change_discriminator_tooltip">Хотите персонализировать свой тег? Перейдите на Nitro!</string>
     <string name="premium_change_discriminator_zero_error">Этот тег недопустим. Тег должен быть больше нуля.</string>
     <string name="premium_chat_perks_description_animated_avatar_and_emoji">Загружайте GIF-файлы и используйте их как анимированные аватарки и эмодзи.</string>
-    <string name="premium_chat_perks_description_badge">Специальный значок продемонстрирует всем, как долго вы поддерживаете Discord.</string>
+    <string name="premium_chat_perks_description_badge">Специальный значок в профиле продемонстрирует всем, как долго вы поддерживаете Discord.</string>
     <string name="premium_chat_perks_description_custom_emoji">Получите возможность применять пользовательские эмодзи где угодно.</string>
     <string name="premium_chat_perks_description_discriminator">Выберите свой тег при действующей подписке Nitro.</string>
-    <string name="premium_chat_perks_description_screenshare">Улучшите качество демонстрации экрана до 720p 60FPS или 1080p 30FPS.</string>
-    <string name="premium_chat_perks_description_upload_limit">Можно выкладывать файлы объёмом до %1$s вместо %2$s. Делитесь мемами в высоком разрешении!</string>
+    <string name="premium_chat_perks_description_screenshare">Улучшите качество демонстрации экрана до 720p 60 FPS или 1080p 30 FPS.</string>
+    <string name="premium_chat_perks_description_streaming">Nitro Classic даёт возможность стримить в формате до 1080p на 60 кадрах в секунду.</string>
+    <string name="premium_chat_perks_premium_guild_subscription">Усильте любимый сервер!</string>
+    <string name="premium_chat_perks_streaming_mobile">Крутые стримы Go Live: Nitro Classic даёт возможность стримить в формате до 1080p на 60 кадрах в секунду.</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Анимированное веселье</string>
     <string name="premium_chat_perks_title_badge">Продемонстрируйте свою поддержку</string>
     <string name="premium_chat_perks_title_custom_emoji">Пользовательские эмодзи со всего мира</string>
-    <string name="premium_chat_perks_title_discriminator">Свой Discord-тег</string>
+    <string name="premium_chat_perks_title_discriminator">Свой Discord Tag</string>
     <string name="premium_chat_perks_title_screenshare">Более высокое качество видео</string>
-    <string name="premium_code_redemption_confirmation_blurb">Случайный набор символов подарил вам прикольные фишечки для чата на %1$s!</string>
+    <string name="premium_chat_perks_title_streaming">Повышенное качество стримов Go Live</string>
+    <string name="premium_chat_perks_title_upload_limit">Повышенный размер отправляемых файлов</string>
+    <string name="premium_classic_payment_gift_blurb_mobile">Подарите кому-нибудь подписку Nitro Classic — а с ней и крутые бонусы для чата, чтобы удовольствия от общения стало ещё больше! [Подробнее о Nitro Classic.](onClick)</string>
+    <string name="premium_code_active_until">Подписка Discord Nitro для этой учётной записи будет активна до %1$s.</string>
+    <string name="premium_code_redemption_confirmation_blurb">Случайный набор символов подарил вам прикольные бонусы для чата на %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">О, круто!</string>
-    <string name="premium_feature_new_chat_perks_header">А ещё вы получите прикольные штуки для чата:</string>
-    <string name="premium_feature_new_premium_applications_header">Игры общей стоимостью больше %1$s долларов. Вот они:</string>
-    <string name="premium_feature_view_applications">Посмотреть все игры по подписке Nitro</string>
-    <string name="premium_features_chat_perks">Фишки для чата</string>
-    <string name="premium_features_premium_applications">Бесплатные игры</string>
+    <string name="premium_expiring_body_boosting">Ваша подписка Discord Nitro закончится **%1$s**. Продлите её сегодня, чтобы продолжить усиливать **%2$s** и сохранить значок усилителя.</string>
+    <string name="premium_expiring_body_custom_tag">Ваша подписка Discord Nitro закончится **%1$s**. Продлите её сегодня, чтобы сохранить собственный Discord Tag и другие бонусы.</string>
+    <string name="premium_expiring_body_emoji">Ваша подписка Discord Nitro закончится **%1$s**. Продлите её сегодня, чтобы сохранить свои анимированные эмодзи, эмодзи со всего мира и другие бонусы.</string>
+    <string name="premium_expiring_body_generic">Ваша подписка Discord Nitro закончится **%1$s**. Продлите её сегодня, чтобы не потерять доступ ко всем бонусам Nitro.</string>
+    <string name="premium_expiring_callout">Чтобы продлить подписку, откройте настройки Nitro и обновите платёжную информацию.</string>
+    <string name="premium_expiring_go_to_settings">Открыть настройки Nitro</string>
+    <string name="premium_expiring_title">Ваша подписка Discord Nitro скоро закончится!</string>
+    <string name="premium_features_chat_perks">Бонусы для чата</string>
+    <string name="premium_features_chat_perks_header">Получите классные бонусы для чата!</string>
+    <string name="premium_features_enhanced_chat_perks">Продвинутые бонусы для чата</string>
+    <string name="premium_features_premium_guild_subscriptions">усиление сервера</string>
+    <string name="premium_gift_button_label">Отправить подарок</string>
+    <string name="premium_gift_send">или отправить подарок!</string>
+    <string name="premium_gift_share_link_ios">Поделиться</string>
+    <string name="premium_gifting_title">Подарок Nitro</string>
+    <string name="premium_gifting_title_mobile">Выберите подарок Nitro</string>
     <string name="premium_grandfathered_warning">В знак благодарности за вашу поддержку мы делаем вам скидку на подписку Nitro. **Отменив или изменив свою подписку, вы потеряете эту скидку.** И не говорите, что вас не предупреждали!</string>
     <string name="premium_grandfathered_warning_confirm">Все равно продолжить</string>
+    <string name="premium_grandfathered_warning_mobile">Если отмените подписку, то потеряете доступ к прежнему тарифу.</string>
     <string name="premium_grandfathered_warning_title">Осторожнее, дружище!</string>
+    <string name="premium_guild_cooldown_available_countdown">До следующего усиления: **%1$s дн. %2$s ч. %3$s мин.**</string>
+    <string name="premium_guild_features_blurb">Усиливайте сервер с помощью подписки Nitro и переводите его на новые уровни. Каждый очередной уровень даёт бонусы для чата **всем участникам сервера!** Зацените, какие бонусы мы вам приготовили:</string>
+    <string name="premium_guild_features_customize_guild_description">Персонализируйте свой сервер с помощью фона приглашений, баннера сервера, персонального URL и прочих возможностей для наведения красоты.</string>
+    <string name="premium_guild_features_customize_guild_mobile">Персонализация сервера</string>
+    <string name="premium_guild_features_customize_guild_title">Персонализация сервера</string>
+    <string name="premium_guild_features_learn_more_button">Узнать больше про подписку Discord Nitro</string>
+    <string name="premium_guild_features_learn_more_text">Улучшите свои возможности в Discord, внеся небольшую месячную плату.</string>
+    <string name="premium_guild_features_more">И многое другое! Текущий уровень, прогресс до следующего уровня и доступные бонусы можно посмотреть на сервере.</string>
+    <string name="premium_guild_features_new_role_mobile">Эксклюзивные новые роли для Nitro-усилителей сервера</string>
+    <string name="premium_guild_features_new_role_title">Эксклюзивная новая роль</string>
+    <string name="premium_guild_features_show_support_mobile">Новый значок в профиле, который меняется со временем.</string>
+    <string name="premium_guild_features_show_support_title">Демонстрируйте поддержку</string>
+    <string name="premium_guild_features_title">Nitro позволяет усилить сервер!</string>
+    <string name="premium_guild_features_upload_sizes_mobile">Увеличение размера загружаемых файлов для сообщества</string>
+    <string name="premium_guild_features_upload_sizes_title">Увеличение размера загружаемых файлов для всех</string>
+    <string name="premium_guild_features_upsell_banner_subscribe">Оформите подписку Nitro, чтобы усилить сервер! [Подробнее о Nitro-усилении сервера](%1$s)</string>
+    <string name="premium_guild_features_upsell_banner_upgrade">Улучшите свою подписку, чтобы усилить сервер! [Подробнее о Nitro-усилении сервера.](%1$s)</string>
+    <string name="premium_guild_header_badge_no_subscribers">Нет Nitro-усилений</string>
+    <string name="premium_guild_header_badge_no_tier">Нет уровня</string>
+    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Nitro-усиление сервера</string>
+    <string name="premium_guild_perks_modal_base_perks">В числе бонусов для усиленного сервера:</string>
+    <string name="premium_guild_perks_modal_blurb">"Каждый новый уровень даёт участникам этого сервера особые бонусы. Данные бонусы доступны только на этом сервере.
+
+ **Усилители получают: значок для списка участников, новый эволюционирующий значок и особую роль.**
+
+ [Подробнее о Nitro-усилении сервера.](%1$s)"</string>
+    <string name="premium_guild_perks_modal_blurb_mobile_1">Каждый новый уровень даёт участникам этого сервера особые бонусы. Данные бонусы доступны только на этом сервере.</string>
+    <string name="premium_guild_perks_modal_blurb_mobile_2">**Усилители получают: значок для списка участников, новый эволюционирующий значок и особую роль.** [Подробнее о Nitro-усилении сервера.](%1$s)</string>
+    <string name="premium_guild_perks_modal_button_get_premium">Для усиления подпишитесь на Nitro!</string>
+    <string name="premium_guild_perks_modal_button_subscribe_this_server">Усильте этот сервер</string>
+    <string name="premium_guild_perks_modal_button_upgrade_to_premium">Чтобы усилить, улучшите подписку до Nitro!</string>
+    <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">В настоящий момент пользователи Apple не могут улучшить свою подписку до Nitro. Вы можете отменить подписку на странице [управления подписками Apple](%1$s), однако она продолжит действовать до истечения своего срока.</string>
+    <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic не даёт возможности усиливать сервер.</string>
+    <string name="premium_guild_perks_modal_header">Состояние усиления сервера</string>
+    <string name="premium_guild_perks_modal_header_boost_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_subscription">Управляйте усилением</string>
+    <string name="premium_guild_perks_modal_no_tiers">Нет полученных уровней</string>
+    <string name="premium_guild_perks_modal_previous_perks">Усиленные сервера получают все названные прежде бонусы, а также:</string>
+    <string name="premium_guild_perks_modal_tier_zero_surpassed">Этот сервер начал с малого. Но стал великим.</string>
+    <string name="premium_guild_perks_modal_tooltip_already_subscribed_this_server">Вы уже усилили этот сервер!</string>
+    <string name="premium_guild_perks_modal_tooltip_already_used_subscription">Вы уже усилили другой сервер.</string>
+    <string name="premium_guild_perks_modal_tooltip_cooldown">Ваше усиление восстанавливается.</string>
+    <string name="premium_guild_perks_modal_tooltip_gift">Подарите Nitro другу, чтобы помочь усилить этот сервер!</string>
+    <string name="premium_guild_settings_members_subscribed">%1$s усилили этот сервер.</string>
+    <string name="premium_guild_settings_members_subscribed_needed">Чтобы открыть %1$s, требуется ещё **%2$s**.</string>
+    <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
+    <string name="premium_guild_subscribe_confirm_blurb">Проверьте, хотите ли вы дать Nitro-усиление именно этому серверу:</string>
+    <string name="premium_guild_subscribe_confirm_confirmation">Выбрать этот сервер</string>
+    <string name="premium_guild_subscribe_confirm_confirmation_label">Выбрать этот сервер. Усиление вступит в силу через короткое время.</string>
+    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Усилив этот сервер, вы сможете усилить другой сервер только через %1$s. Отмена усиления не влияет на время восстановления данной функции.**</string>
+    <string name="premium_guild_subscribe_confirm_header">Выбирайте с умом!</string>
+    <string name="premium_guild_subscribe_search_guild_placeholder">Поиск по серверам</string>
+    <string name="premium_guild_subscribe_select_guild_header">Выберите сервер</string>
+    <string name="premium_guild_subscribe_success_thanks">Спасибо за усиление!</string>
+    <string name="premium_guild_subscription_available_count">Вам доступно **%1$s**!</string>
+    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_error_mobile">Возникла ошибка при попытке усиления. Попробуйте ещё раз.</string>
+    <string name="premium_guild_subscription_error_rate_limit_days">Ваша способность усиления серверов пока не восстановилась. Подождите **%1$s и %2$s** и попробуйте ещё раз.</string>
+    <string name="premium_guild_subscription_error_rate_limit_hours">Ваша способность усиления серверов пока не восстановилась. Подождите **%1$s и %2$s** и попробуйте ещё раз.</string>
+    <string name="premium_guild_subscription_error_rate_limit_minutes">Ваша способность усиления серверов пока не восстановилась. Подождите **%1$s** и попробуйте ещё раз.</string>
+    <string name="premium_guild_subscription_no_next_tier">Сервер на пике своих возможностей! Не прекращайте усиление!</string>
+    <string name="premium_guild_subscription_notice">Nitro-усиления сервера уже доступны! Соберитесь всем сообществом и усильте свой сервер.</string>
+    <string name="premium_guild_subscription_notice_button">Уровни и бонусы</string>
+    <string name="premium_guild_subscription_notice_small_guild">Nitro-усиления сервера уже доступны! Соберите друзей и усильте свой сервер.</string>
+    <string name="premium_guild_subscription_remove_button">Отменить усиление</string>
+    <string name="premium_guild_subscription_remove_error_mobile">Возникла ошибка при попытке отмены усиления. Попробуйте ещё раз.</string>
+    <string name="premium_guild_subscription_select_server_button">Выбрать сервер</string>
+    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
+    <string name="premium_guild_subscription_subtitle">"Используйте мощь Nitro, чтобы усилить любимый сервер! Чем больше усилений получит сервер, тем выше будет его уровень. А каждый новый уровень даёт бонусы заодно и всем тем, кто на сервере!
+ Усиление сервера можно проводить не чаще одного раза в 7 дней. Вы не сможете усилить другой сервер, пока эта возможность не восстановится, даже если прекратите усиливать текущий сервер. [Подробнее об усилении сервера с помощью Nitro.](%1$s)"</string>
+    <string name="premium_guild_subscription_subtitle_mobile_1">Используйте мощь Nitro, чтобы усилить любимый сервер! Чем больше усилений получит сервер, тем выше будет его уровень. А каждый новый уровень даёт бонусы заодно и всем тем, кто на сервере!</string>
+    <string name="premium_guild_subscription_subtitle_mobile_2">Усиление сервера можно проводить не чаще одного раза в 7 дней. Вы не сможете усилить другой сервер, пока эта возможность не восстановится, даже если прекратите усиливать текущий сервер. [Подробнее о Nitro-усилении сервера.](%1$s)</string>
+    <string name="premium_guild_subscription_title">Nitro-усиление сервера</string>
+    <string name="premium_guild_subscription_tooltip">Nitro-усиление с %1$s</string>
+    <string name="premium_guild_tier_1">1-й уровень</string>
+    <string name="premium_guild_tier_2">2-й уровень</string>
+    <string name="premium_guild_tier_3">3-й уровень</string>
+    <string name="premium_guild_unsubscribe_confirm_blurb">Проверьте, хотите ли вы отменить Nitro-усиление этого сервера:</string>
+    <string name="premium_guild_unsubscribe_confirm_confirmation">Да, отменить усиление</string>
+    <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Если вы отмените усиление, сервер потеряет прогресс.</string>
+    <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Если вы отмените усиление, сервер потеряет прогресс. **Ваша способность усиления серверов ещё восстанавливается. Усиление будет доступно через %1$s и %2$s.**</string>
+    <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Если вы отмените усиление, сервер потеряет прогресс. **Ваша способность усиления серверов ещё восстанавливается. Усиление будет доступно через %1$s и %2$s.**</string>
+    <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Если вы отмените усиление, сервер потеряет прогресс. **Ваша способность усиления серверов ещё восстанавливается. Усиление будет доступно через %1$s.**</string>
+    <string name="premium_guild_unsubscribe_confirm_header">Отменить Nitro-усиление?</string>
+    <string name="premium_included">Nitro включает:</string>
     <string name="premium_info_monthly">Сумма %1$s (ежемесячный платёж) будет списана %2$s</string>
     <string name="premium_info_yearly">Сумма %1$s (годовой платеж) будет списана %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / месяц</string>
     <string name="premium_not_claimed">Сначала присвойте учётную запись</string>
     <string name="premium_not_claimed_body">Привет, дружище! Перед покупкой подписки Nitro вам нужно присвоить учётную запись, чтобы всё ваше добро оставалось с вами.</string>
     <string name="premium_not_verified">Сначала подтвердите свой e-mail</string>
-    <string name="premium_not_verified_body">Привет, дружище! Перед покупкой подписки Nitro нам нужно подтвердить ваш адрес электронной почты. Найдите наше письмо в почтовом ящике или попросите выслать новое.</string>
-    <string name="premium_payment_applications_os_warning">Игры по подписке Nitro поддерживаются только на Windows.</string>
-    <string name="premium_payment_confirmation_blurb_regular">Теперь вам доступна целая куча ништячков для чата. Хватит это читать, идите поболтайте с кем-нибудь!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Теперь у вас есть подписка на целую кучу крутецких игр. Хватит это читать, идите поиграйте!</string>
+    <string name="premium_not_verified_body">Привет, дружище! Для приобретения подписки Nitro нужно подтвердить адрес электронной почты.</string>
+    <string name="premium_past_due">Ваша подписка просрочена. Пожалуйста, введите корректные данные кредитной карты, или ваша подписка закончится **%1$s**.</string>
+    <string name="premium_payment_confirmation_blurb_iap">Теперь вы можете получить %1$s по подписке Nitro. Ну что, погнали!</string>
+    <string name="premium_payment_confirmation_blurb_regular">Теперь вам доступна целая куча бонусов для чата. Хватит это читать, идите поболтайте с кем-нибудь!</string>
+    <string name="premium_payment_confirmation_button_iap">Подписаться на %1$s</string>
     <string name="premium_payment_confirmation_button_regular">Ага, звучит неплохо</string>
+    <string name="premium_payment_gift_blurb_mobile">Подарите кому-нибудь подписку Nitro с крутыми бонусами для чата и возможностью усиления серверов. [Подробнее о Nitro.](onClick)</string>
+    <string name="premium_payment_gift_subtext">Средства за выбранный период будут списаны один раз. Вы не будете получать счёт ежемесячно.</string>
+    <string name="premium_payment_is_gift">Вы покупаете подарок.</string>
+    <string name="premium_payment_plan_label_monthly">**%1$s** — %2$s</string>
+    <string name="premium_payment_plan_label_yearly">**%1$s** — %2$s</string>
+    <string name="premium_payment_select">Выбрать</string>
+    <string name="premium_payment_start_trial">Начать пробный период</string>
+    <string name="premium_payment_trial_blurb">Пользуйтесь всеми бонусами Nitro бесплатно до %1$s. Никаких обязательств, вы можете отменить подписку в любое время.</string>
+    <string name="premium_payment_trial_note">Счёт будет выставлен %1$s.</string>
+    <string name="premium_payment_trial_two_weeks_free">Получите 2 недели бесплатно</string>
     <string name="premium_plan_month">Nitro на месяц</string>
     <string name="premium_plan_month_tier_1">Nitro Classic на месяц</string>
     <string name="premium_plan_month_tier_2">Nitro на месяц</string>
@@ -2641,31 +3443,86 @@
     <string name="premium_promo_autocomplete">Используйте пользовательские эмодзи везде</string>
     <string name="premium_promo_description">Выделитесь с Discord Nitro: используйте анимированные и пользовательские эмодзи на любых серверах.</string>
     <string name="premium_promo_title">Хотите прокачать силу эмодзи?</string>
+    <string name="premium_required">Требуется Nitro</string>
+    <string name="premium_required_get_nitro">Подписаться на Nitro!</string>
+    <string name="premium_restore_subscription_ios">Восстановить подписку Discord Nitro</string>
+    <string name="premium_retention_emoji_picker_description">Осторожнее! Ваши бонусы %1$s, среди которых анимированные эмодзи, пропадут уже совсем скоро, **%2$s**.</string>
+    <string name="premium_retention_emoji_picker_update_payment_information">Обновите свою платёжную информацию.</string>
+    <string name="premium_settings">Настройки Nitro</string>
+    <string name="premium_settings_get">Подписаться на Nitro</string>
+    <string name="premium_subscription_policy_ios">Приобретая подписку Nitro, вы соглашаетесь с нашими [Условиями Использования](%1$s) и [Политикой конфиденциальности](%2$s). Средства будут списаны с вашей учётной записи Apple ID после подтверждения покупки. Подписка будет автоматически обновлена, если вы не отмените её не позднее чем за 24 часа до окончания оплаченного периода. Средства за обновление подписки будут списаны с вашей учётной записи за 24 часа до окончания оплаченного периода. Управлять подписками и отменять их можно в настройках учётной записи в App Store после покупки.</string>
+    <string name="premium_subscription_required_body">Минуточку! Для этого ништячка вам потребуется Nitro.</string>
     <string name="premium_subtitle">Поддержите разработку Discord и получите бонусные возможности для вашей учётной записи</string>
+    <string name="premium_tier_2_subtitle">Персонализируйте свой профиль с помощью уникального тега, получите доступ к анимированным эмодзи, загружайте большие файлы, усильте любимый сервер и получите другие бонусы.</string>
+    <string name="premium_tier_2_title">Улучшите свои возможности в Discord за небольшую ежемесячную плату.</string>
+    <string name="premium_trial_button">Начните бесплатный пробный период</string>
     <string name="premium_upgrade_cancel">Нет</string>
     <string name="premium_upgrade_confirm_body_detailed_month_year">"Ускорьтесь на год и получите два месяца бесплатно. Сплошная выгода!
 
 Мы также пересчитаем текущий месяц и сделаем вычет из годовой цены. Вам будет выставлен счёт на сумму **%1$s**."</string>
+    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Прокачайте подписку до годовой и получите два месяца бесплатно. Сплошная выгода!
+
+Мы также пересчитаем текущий тариф и сделаем вычет из годовой цены. Вам будет выставлен счёт на сумму **%1$s**, а стоимость года подписки после окончания текущего расчётного периода составит **%2$s.**"</string>
+    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Улучшите свою помесячную подписку %1$s и получите возможность усиливать сервера. Ваша новая подписка вступит в силу немедленно.
+
+ Мы также пересчитаем текущий тариф и сделаем вычет из месячной цены. Вам будет выставлен счёт на сумму **%2$s**."</string>
+    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Улучшите свою помесячную подписку %1$s и получите возможность усиливать сервера. Ваша новая подписка вступит в силу немедленно.
+
+ Мы также пересчитаем текущий тариф и сделаем вычет из месячной цены. Вам будет выставлен счёт на сумму **%2$s**, а стоимость месяца подписки после окончания текущего расчётного периода составит **%3$s.**"</string>
+    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Улучшите свою помесячную подписку %1$s и получите возможность усиливать сервера. Ваша новая подписка вступит в силу немедленно.
+
+Мы также пересчитаем текущий тариф и сделаем вычет из годовой цены. Вам будет выставлен счёт на сумму **%2$s**."</string>
+    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Улучшите свою помесячную подписку %1$s и получите возможность усиливать сервера. Ваша новая подписка вступит в силу немедленно.
+
+Мы также пересчитаем текущий тариф и сделаем вычет из годовой цены. Вам будет выставлен счёт на сумму **%2$s**, а стоимость года подписки после окончания текущего расчётного периода составит **%3$s.**"</string>
+    <string name="premium_upgrade_confirm_body_detailed_tier_1_year_tier_2_year">"Улучшите свою годовую подписку %1$s и получите возможность усиливать сервера. Ваша новая подписка вступит в силу немедленно.
+
+Мы также пересчитаем текущий тариф и сделаем вычет из годовой цены. Вам будет выставлен счёт на сумму **%2$s**."</string>
+    <string name="premium_upgrade_confirm_body_detailed_tier_1_year_tier_2_year_verbose">"Улучшите свою годовую подписку %1$s и получите возможность усиливать сервера. Ваша новая подписка вступит в силу немедленно.
+
+Мы также пересчитаем текущий тариф и сделаем вычет из годовой цены. Вам будет выставлен счёт на сумму **%2$s**, а стоимость года подписки после окончания текущего расчётного периода составит **%3$s.**"</string>
     <string name="premium_upgrade_confirm_button">Оформить</string>
+    <string name="premium_upgrade_confirm_button_with_price">Улучшить сейчас — %1$s</string>
     <string name="premium_upgrade_confirm_title">Подписаться на %1$s</string>
+    <string name="premium_upgrade_disabled_already_premium">Подписка недоступна, потому что у вас уже есть Nitro.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Ваш текущий план.</string>
+    <string name="premium_upgrade_disabled_in_trial">Улучшение недоступно во время пробного периода.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Перед выбором подписки более низкого уровня сначала нужно отменить текущую подписку и дождаться, пока истечёт оплаченный срок.</string>
-    <string name="premium_upgrade_done_body_tier_1">Теперь у вас есть прикольные фишечки для чата!</string>
-    <string name="premium_upgrade_done_body_tier_2">Теперь у вас есть прикольные фишечки для чата и доступ к десяткам игр!</string>
+    <string name="premium_upgrade_disabled_title_mobile">Меняем планы?</string>
+    <string name="premium_upgrade_done_body_tier_1">Теперь у вас есть прикольные бонусы для чата!</string>
+    <string name="premium_upgrade_done_body_tier_2_guild_subscribe">Теперь у вас есть прикольные бонусы для чата и возможность усиливать сервера.</string>
     <string name="premium_upgrade_done_button_tier_1">О, круто!</string>
-    <string name="premium_upgrade_done_button_tier_2">Посмотреть все игры по подписке Nitro</string>
     <string name="premium_upgrade_failed_body">Ой… Не удалось оформить подписку. Убедитесь, что ваша платёжная информация актуальна и повторите попытку.</string>
+    <string name="premium_upgrade_required_body">Минуточку! Для этого ништячка вам потребуется Nitro. У вас есть Nitro Classic.</string>
     <string name="premium_upload_promo">Купите Discord Nitro для отправки файлов до %1$s</string>
+    <string name="premium_upsell_animated_avatar_active_mobile">Вы (пока) не можете поставить танцующий аватар!</string>
+    <string name="premium_upsell_animated_avatar_description_mobile">Чтобы загрузить весёлый анимированный аватар, оформите подписку **Discord Nitro**.</string>
+    <string name="premium_upsell_animated_avatar_passive_mobile">Хотите анимированный аватар?</string>
+    <string name="premium_upsell_animated_emojis_active_mobile">Пытаетесь шевелиться и веселиться?</string>
+    <string name="premium_upsell_animated_emojis_description_mobile">Эй, друг! Чтобы использовать анимированные эмодзи, нужна подписка **Discord Nitro**.</string>
+    <string name="premium_upsell_animated_emojis_passive_mobile">Хотите шевелиться и веселиться?</string>
+    <string name="premium_upsell_badge_active_mobile">Хотите получить новый значок?</string>
+    <string name="premium_upsell_badge_description_mobile">Украсьте свой профиль! Оформите подписку **Discord Nitro** и получите эксклюзивный значок Nitro.</string>
+    <string name="premium_upsell_badge_passive_mobile">Значки — это круто!</string>
+    <string name="premium_upsell_emoji_active_mobile">Вы не можете использовать этот эмодзи</string>
+    <string name="premium_upsell_emoji_description_mobile">Будьте в центре внимания с **Discord Nitro**: используйте анимированные и пользовательские эмодзи на любых серверах.</string>
+    <string name="premium_upsell_emoji_passive_mobile">Прокачайте силу эмодзи!</string>
+    <string name="premium_upsell_tag_active_mobile">Пытаетесь поменять тег?</string>
+    <string name="premium_upsell_tag_description_mobile">Оформите подписку **Discord Nitro** и создайте собственный Discord Tag.</string>
+    <string name="premium_upsell_tag_passive_mobile">Хотите создать собственный тег?</string>
+    <string name="premium_upsell_upload_active_mobile">Ваши файлы слишком большие!</string>
+    <string name="premium_upsell_upload_description_mobile">Максимальный размер файла — %1$s. Оформите **подписку Discord Nitro** для отправки файлов до %2$s</string>
+    <string name="premium_upsell_upload_passive_mobile">Загружайте мемы в высоком качестве</string>
     <string name="premium_year_free_months">2 месяца бесплатно!</string>
-    <string name="premium_year_free_months_short">2 месяца бесплатно</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / год</string>
+    <string name="preorder_sku_name">%1$s (оформить предзаказ)</string>
     <string name="preview_chat">Предпросмотр чата</string>
     <string name="priority_speaker">Приоритетный режим</string>
     <string name="priority_speaker_description">"У пользователей с этим правом больше шансов быть услышанными. При активации этой функции
 громкость речи других участников без этого права будет автоматически понижена."</string>
     <string name="priority_speaker_description_app">"У пользователей с этим правом больше шансов быть услышанными. При активации этой функции
 громкость речи других участников без этого права будет автоматически понижена.
-Чтобы включить Приоритетный режим, нужно нажать **%1$s**."</string>
+Чтобы включить приоритетный режим, нужно нажать **%1$s**."</string>
     <string name="privacy_and_safety">Конфиденциальность</string>
     <string name="privacy_policy">[Политика конфиденциальности](%1$s)</string>
     <string name="privacy_settings">Настройки конфиденциальности</string>
@@ -2685,16 +3542,23 @@
     <string name="ptt_permission_body">"Вы запустили %1$s от имени администратора. Пожалуйста, перезапустите Discord от имени администратора для того,
 чтобы использовать режим рации, когда игра активна."</string>
     <string name="ptt_permission_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_body_stats">Кроме того, с момента публикации последнего сообщения вы получили и потеряли несколько серверов — %1$s и %2$s соответственно.</string>
+    <string name="publish_followed_news_fail_title">Не удалось опубликовать сообщение</string>
+    <string name="publish_followed_news_generic_body">Ой, что-то пошло не так.</string>
     <string name="quick_dm_blocked">Вы не можете отправлять сообщения заблокированным пользователям</string>
     <string name="quick_dm_user">Сообщение для @%1$s</string>
     <string name="quick_launcher_empty_text">Discord может быстро запускать большинство игр, в которые вы недавно играли на этом компьютере. Попробуйте запустить какую-нибудь игру, и она появится тут!</string>
+    <string name="quick_launcher_empty_text_v2">Discord может быстро запускать почти все игры, в которые вы играете. Запустите какую-нибудь игру, и она появится здесь!</string>
     <string name="quick_launcher_header">Быстрый запуск</string>
     <string name="quickswitcher_drafts">Черновики</string>
-    <string name="quickswitcher_empty_cta">Узнать больше про быстрый переключатель</string>
+    <string name="quickswitcher_empty_cta">Узнать больше про Quick Switcher</string>
     <string name="quickswitcher_empty_text">Не можете найти то, что ищете?</string>
     <string name="quickswitcher_last_channel">Последний канал</string>
     <string name="quickswitcher_mentions">Упоминания</string>
-    <string name="quickswitcher_notice">Используйте быстрый переключатель, чтобы перемещаться в Discord быстро. Просто нажмите:</string>
+    <string name="quickswitcher_notice">Используйте Quick Switcher, чтобы перемещаться в Discord быстро. Просто нажмите:</string>
     <string name="quickswitcher_placeholder">Куда отправимся?</string>
     <string name="quickswitcher_querymode_applications">Поиск игр</string>
     <string name="quickswitcher_querymode_guilds">Поиск по серверам</string>
@@ -2710,6 +3574,7 @@
     <string name="quote_attribution_facebook">опубликовано через [facebook](%1$s)</string>
     <string name="quote_attribution_instagram">опубликовано через [instagram](%1$s)</string>
     <string name="rate_limited">Вы превысили допустимый лимит.</string>
+    <string name="rate_limited_retry_after">Вы превысили допустимый лимит. Попробуйте ещё раз через %1$s сек.</string>
     <string name="rating_request_body_android">Загляните в Play Store и поставьте нам оценку. С голубого ручейка начинается река, ну а рейтинг Discord начинается с вашей оценки!</string>
     <string name="rating_request_title">Нравится Discord?</string>
     <string name="reaction_tooltip_1">%1$s ставит %2$s</string>
@@ -2736,6 +3601,7 @@
     <string name="recent_mentions_pro_tip">Всякое упоминание вас будет сохранено здесь на 7 дней.</string>
     <string name="recent_mentions_roles_and_direct">личные и @role</string>
     <string name="reconnect">Переподключиться</string>
+    <string name="reconnecting">Переподключение</string>
     <string name="refund">Возврат средств</string>
     <string name="region">регион</string>
     <string name="region_select_footer">Регион сервера может быть изменён в любое время с менее чем секундным обрывом связи в голосовом канале.</string>
@@ -2754,6 +3620,7 @@
     <string name="remove_from_group">Удалить из группы</string>
     <string name="remove_icon">Удалить значок</string>
     <string name="remove_keybind">Удалить горячие клавиши</string>
+    <string name="remove_reaction">Удалить реакцию</string>
     <string name="remove_role_or_user">Удалить %1$s</string>
     <string name="remove_synced_role">Удалить роль</string>
     <string name="remove_vanity_url">Удалить персональный URL</string>
@@ -2804,10 +3671,10 @@
 Если процесс соединения застрял на этом шаге, ознакомьтесь с [этой многомудрой статьёй](%1$s), которая поможет вам решить проблему."</string>
     <string name="rtc_connection_state_no_route">"Упс. Discord не удалось установить UDP-соединение с вашим RTC-сервером. Сейчас мы попробуем ещё раз.
 Если проблема не разрешится, ознакомьтесь с [этой умной статьей](%1$s), которая поможет вам разобраться с вопросом."</string>
-    <string name="rtc_connection_state_rtc_connected">"Discord подключён к RTC-серверу **%1$s** со средним пингом **%2$s мс**. В последний раз
+    <string name="rtc_connection_state_rtc_connected">"Discord подключён к RTC-серверу **%1$s** со средней задержкой **%2$s мс**. В последний раз
 пинг был **%3$s мс**.
 
-Если пинг нестабилен или превышает %4$s мс, попросите владельца сервера сменить регион."</string>
+Если задержка нестабильна или превышает %4$s мс, попросите владельца сервера сменить регион."</string>
     <string name="rtc_connection_state_rtc_connected_loss_rate">"Discord прикреплен к RTC-серверу **%1$s** со средней задержкой **%2$s мс**. Последняя
 задержка была **%3$s мс**. Потеря исходящих пакетов — **%4$s%%**.
 
@@ -2817,33 +3684,49 @@
     <string name="rtc_debug_context">Отладка RTC: %1$s</string>
     <string name="rtc_debug_rtp_inbound">Входящие</string>
     <string name="rtc_debug_rtp_outbound">Исходящие</string>
+    <string name="rtc_debug_screenshare">Демонстрация экрана</string>
     <string name="rtc_debug_transport">Передача данных</string>
     <string name="rtc_debug_users">Пользователи</string>
     <string name="ru">Русский</string>
     <string name="samsung_welcome_screen">Бесплатное и безопасное приложение для голосового и текстового чата, которым пользуются более 250 миллионов геймеров, — теперь с эксклюзивными функциями Samsung, такими как мобильный голосовой оверлей.</string>
     <string name="save">Сохранить</string>
     <string name="save_changes">Сохранить изменения</string>
+    <string name="save_media">Сохранить в галерею</string>
+    <string name="save_media_failure_help_mobile">Пожалуйста, проверьте настройки сети и конфиденциальности для приложения «Фотографии».</string>
+    <string name="save_media_failure_mobile">Не удалось сохранить</string>
+    <string name="save_media_success_mobile">Сохранено</string>
     <string name="save_new_url">Сохранить новый URL</string>
+    <string name="saved_settings">Настройки успешно обновлены.</string>
     <string name="scope_activities_read">Доступ к вашей ленте событий</string>
     <string name="scope_activities_read_description">Это позволит приложению получить доступ к информации из разделов «Идёт игра» и «Недавно играли» вашей ленты событий.</string>
     <string name="scope_activities_write">Обновить текущую активность</string>
     <string name="scope_activities_write_description">Это позволит приложению сообщать Discord о том, что вы играете или стримите игру.</string>
+    <string name="scope_applications_builds_read">Чтение информации о сборке</string>
+    <string name="scope_applications_builds_read_description">Это позволяет приложению читать информацию о сборке приложений для магазина Discord.</string>
+    <string name="scope_applications_builds_upload">Загрузка сборок и управление ими</string>
+    <string name="scope_applications_builds_upload_description">Это позволяет приложению загружать сборки приложений для магазина Discord и управлять ими.</string>
+    <string name="scope_applications_entitlements">Управление правами</string>
+    <string name="scope_applications_entitlements_description">Это позволяет приложению читать и использовать права приложений для магазина Discord.</string>
+    <string name="scope_applications_store_update">Управление SKU, страницами и ассетами магазина</string>
+    <string name="scope_applications_store_update_description">Это позволяет приложению создавать, читать, обновлять и удалять SKU, страницы и ассеты приложений для магазина Discord.</string>
     <string name="scope_bot">Добавлять бота на сервер</string>
     <string name="scope_bot_description">Это требует наличия у вас прав на **управление сервером**.</string>
     <string name="scope_bot_permissions">Предоставить указанные права</string>
     <string name="scope_bot_permissions_description">Это создаст роль с именем **%1$s**, которую вы сможете редактировать.</string>
     <string name="scope_bot_server_placeholder">Выберите сервер</string>
+    <string name="scope_bot_server_placeholder_no_guilds">Нет серверов с доступными правами</string>
+    <string name="scope_bot_server_selected_label">сервер</string>
     <string name="scope_connections">Доступ к сторонним подключениям</string>
     <string name="scope_connections_empty">У вас ещё нет никаких сторонних подключений!</string>
-    <string name="scope_email">Доступ к адресу вашей электронной почты</string>
+    <string name="scope_email">Доступ к вашему адресу электронной почты</string>
     <string name="scope_email_empty">Вы ещё не указали адрес вашей электронной почты!</string>
-    <string name="scope_gdm_join">Вступать в беседы за вас</string>
-    <string name="scope_gdm_join_description">Это позволит приложению присоединяться к группам ЛС, которые оно создало от вашего имени.</string>
+    <string name="scope_gdm_join">Вступать в групповые чаты за вас</string>
+    <string name="scope_gdm_join_description">Это позволит приложению присоединяться к групповым чатам, которые оно создало от вашего имени.</string>
     <string name="scope_guilds">Узнавать, на каких серверах вы находитесь</string>
     <string name="scope_guilds_empty">Вы не подключены ни к одному серверу.</string>
     <string name="scope_guilds_join">Подключаться к серверам автоматически</string>
-    <string name="scope_guilds_join_description">Использовать экспресс-приглашения от вашего имени.</string>
-    <string name="scope_identify">Доступ к вашему имени и аватару</string>
+    <string name="scope_guilds_join_description">Использовать приглашения от вашего имени.</string>
+    <string name="scope_identify">Доступ к вашему имени пользователя и аватару</string>
     <string name="scope_messages_read">Прочитать все сообщения</string>
     <string name="scope_messages_read_description">Это предоставит приложению доступ к сообщениям вашей учётной записи Discord</string>
     <string name="scope_rpc">Взаимодействовать с вашим Discord-клиентом</string>
@@ -2852,18 +3735,23 @@
     <string name="scope_rpc_description">Это позволит приложению подключаться к вашему локальному клиенту Discord.</string>
     <string name="scope_rpc_notifications_read">Получать звуковые уведомления через Discord-клиент</string>
     <string name="scope_rpc_notifications_read_description">Это позволяет приложению видеть уведомления, которые мы вам отправляем.</string>
+    <string name="scope_unsupported_on_android">Не поддерживается в приложении Android</string>
+    <string name="scope_unsupported_on_android_description">"Эта область доступа OAuth2 пока не поддерживается в приложении.
+Но есть и хорошие новости: она доступна в мобильном браузере! Можете открыть её там."</string>
     <string name="scope_webhook_incoming">Добавляет webhook к каналу</string>
     <string name="scope_webhook_incoming_channel_placeholder">Выбрать канал</string>
     <string name="scope_webhook_incoming_description">Это позволяет приложению отправлять сообщения на канал в Discord</string>
     <string name="screen_share_on">Включить демонстрацию экрана</string>
     <string name="screen_share_options">Дополнительные параметры демонстрации экрана</string>
-    <string name="screenshare_change_windows">Изменить окно</string>
+    <string name="screenshare_change_windows">Изменить окна</string>
     <string name="screenshare_description">"Discord хочет поделиться содержимым вашего экрана с %1$s.
 
 Выберите экран, которым вы хотели бы поделиться."</string>
     <string name="screenshare_extension_body">Вы хотите установить расширение для демонстрации экрана?</string>
     <string name="screenshare_extension_title">Требуется расширение</string>
     <string name="screenshare_frame_rate">Частота кадров</string>
+    <string name="screenshare_relaunch">Проблемы с демонстрацией экрана</string>
+    <string name="screenshare_relaunch_body">Наши хомячки, ответственные за демонстрацию экрана, совсем одичали! Теперь вам придётся перезапустить Discord, чтобы эта функция вновь заработала. Вы готовы на это пойти?</string>
     <string name="screenshare_screen">Весь экран</string>
     <string name="screenshare_share_screen_or_window">Демонстрация экрана или окна</string>
     <string name="screenshare_sound_toggle_label">Звук</string>
@@ -2872,7 +3760,7 @@
     <string name="screenshare_stream_game">Транслировать %1$s</string>
     <string name="screenshare_stream_quality">Качество передачи</string>
     <string name="screenshare_unavailable">Демонстрация экрана недоступна</string>
-    <string name="screenshare_unavailable_download_app">Загрузите Discord на свой компьютер, чтобы использовать демонстрацию экрана!</string>
+    <string name="screenshare_unavailable_download_app">Загрузите Discord для компьютера, чтобы использовать демонстрацию экрана!</string>
     <string name="screenshare_window">Окно приложения</string>
     <string name="search">Поиск</string>
     <string name="search_actions">Поиск по действиям</string>
@@ -2912,6 +3800,8 @@
     <string name="search_for_emoji">Найдите идеальный эмодзи</string>
     <string name="search_for_empty">Поиск</string>
     <string name="search_for_value">Ищем: **%1$s**</string>
+    <string name="search_from_suggestions">Ищем: \"%1$s\"</string>
+    <string name="search_giphy">Поиск в GIPHY</string>
     <string name="search_group_header_channels">В канале</string>
     <string name="search_group_header_dates">Даты</string>
     <string name="search_group_header_file_name">Название файла содержит</string>
@@ -2934,7 +3824,7 @@
     <string name="search_pick_date">Выберите дату</string>
     <string name="search_recent">Недавние</string>
     <string name="search_relevant">Соответствующие</string>
-    <string name="search_roles">Поиск ролей</string>
+    <string name="search_roles">Поиск роли</string>
     <string name="search_roles_no_result">Роли не были найдены.</string>
     <string name="search_shortcut_month">месяц</string>
     <string name="search_shortcut_today">сегодня</string>
@@ -2942,11 +3832,13 @@
     <string name="search_shortcut_year">год</string>
     <string name="search_shortcut_yesterday">вчера</string>
     <string name="search_still_indexing_hint">%1$s. Мы всё ещё индексируем старые сообщения.</string>
+    <string name="search_tenor">Поиск в Tenor</string>
     <string name="search_with_google">Искать в Google</string>
     <string name="searching">Поиск…</string>
     <string name="security">Безопасность</string>
     <string name="select">Выбрать</string>
     <string name="select_channel_or_category">Выберите канал или категорию…</string>
+    <string name="select_emoji">Выбрать эмодзи</string>
     <string name="select_sort_mode">Выберите режим сортировки</string>
     <string name="self_deafened">Звук отключён пользователем</string>
     <string name="self_deny_permission_body">"Вы не можете отобрать это право у **%1$s**, потому что это отберёт его и у вас. Назначьте себе другую роль,
@@ -2966,11 +3858,18 @@
     <string name="send_tts_messages">Отправлять TTS сообщения</string>
     <string name="send_tts_messages_description">"Это право позволяет отправлять сообщения text-to-speech, просто начав сообщение с /tts. Это сообщение
 услышат все, кто находится в данном канале."</string>
-    <string name="server_deafen">Сервер: выкл. звук</string>
+    <string name="server_acronym">Аббревиатура сервера</string>
+    <string name="server_deafen">Сервер: откл. звук</string>
     <string name="server_deafened">Звук отключён сервером</string>
+    <string name="server_desciption_empty">Расскажите миру об этом сервере.</string>
     <string name="server_emoji">Эмодзи сервера</string>
+    <string name="server_folder_mark_as_read">Отметить папку как прочитанную</string>
+    <string name="server_folder_mute">Заглушить папку сервера</string>
+    <string name="server_folder_placeholder">Адрес сервера</string>
+    <string name="server_folder_settings">Настройки папки</string>
+    <string name="server_icon">Значок сервера</string>
     <string name="server_mute">Заглушить сервер</string>
-    <string name="server_mute_dms">Отключить звук ЛС</string>
+    <string name="server_mute_dms">Отключить оповещения ЛС</string>
     <string name="server_muted">Заглушён сервером</string>
     <string name="server_name_required">Требуется название сервера.</string>
     <string name="server_notification">Уведомление сервера</string>
@@ -2982,13 +3881,13 @@
     <string name="server_sort">Переместить %1$s</string>
     <string name="server_status">Состояние сервера</string>
     <string name="server_undeafen">Сервер: вкл. звук</string>
-    <string name="server_unmute">Включить микрофон</string>
-    <string name="server_voice_mute">Отключить микрофон</string>
-    <string name="server_voice_unmute">Включить микрофон</string>
+    <string name="server_unmute">Вернуть сервер из заглушенных</string>
+    <string name="server_voice_mute">Откл. микрофон на сервере</string>
+    <string name="server_voice_unmute">Вкл. микрофон на сервере</string>
     <string name="servers">Серверы</string>
     <string name="servers_management_title">Сортировка и управление серверами</string>
     <string name="service_connections_disconnect">Отключиться</string>
-    <string name="set_debug_logging">Изменить ведение логов отладки</string>
+    <string name="set_debug_logging">Изменить ведение журнала отладки</string>
     <string name="set_debug_logging_body">"Изменение ведения логов отладки вызовет перезапуск Discord.
 Вы уверены, что хотите это сделать?"</string>
     <string name="set_invite_link_never_expire">Сделать эту ссылку бессрочной</string>
@@ -3032,6 +3931,7 @@
     <string name="settings_sync">Синхронизировать между клиентами.</string>
     <string name="settings_webhooks_empty_body">Добавьте вебхук для начала магии</string>
     <string name="settings_webhooks_empty_title">Нет вебхуков</string>
+    <string name="settings_webhooks_intro">Вебхуки — это лёгкий способ отправки автоматических сообщений и обновлений данных в текстовый канал сервера с помощью магии интернета. [Узнайте больше](%1$s).</string>
     <string name="setup">Установить</string>
     <string name="setup_vanity_url">Настроить персональный URL</string>
     <string name="several_users_typing">Несколько людей печатают…</string>
@@ -3049,12 +3949,18 @@
     <string name="show_current_game">Отображать в статусе игру, в которую вы сейчас играете</string>
     <string name="show_current_game_desc">Эта функция доступна только во время игры на ПК и некоторых других партнёрских платформах.</string>
     <string name="show_muted">Показать %1$s заглушенных</string>
-    <string name="show_muted_channels">Показать каналы без звука</string>
+    <string name="show_muted_channels">Показать заглуш. каналы</string>
+    <string name="show_spoiler_always">Всегда</string>
+    <string name="show_spoiler_content">Показывать содержимое под спойлером</string>
+    <string name="show_spoiler_content_help">Определите, как будет отображаться содержимое под спойлером.</string>
+    <string name="show_spoiler_on_click">По щелчку</string>
+    <string name="show_spoiler_on_servers_i_mod">На серверах, которые я модерирую</string>
     <string name="skip">Пропустить</string>
+    <string name="skip_all_tips">Пропустить все подсказки</string>
     <string name="sort">Сортировать</string>
     <string name="sorting">Сортировка</string>
     <string name="sorting_channels">Сортировка каналов</string>
-    <string name="sound_deafen">Отключить звук в динамиках</string>
+    <string name="sound_deafen">Откл. звук</string>
     <string name="sound_incoming_ring">Входящий звонок</string>
     <string name="sound_message">Сообщение</string>
     <string name="sound_mute">Отключить микрофон</string>
@@ -3076,9 +3982,14 @@
     <string name="spectators">Наблюдатели — %1$s</string>
     <string name="spectators_header">Наблюдатели</string>
     <string name="spellcheck">Проверка правописания</string>
+    <string name="spoiler">Спойлер</string>
+    <string name="spoiler_hide">Щёлкните, чтобы скрыть спойлер</string>
+    <string name="spoiler_mark_selected">Пометить как спойлер</string>
+    <string name="spoiler_reveal">Щёлкните, чтобы открыть спойлер</string>
     <string name="spotify_app_download">Загрузить Spotify</string>
     <string name="spotify_app_not_found">Невозможно найти приложение Spotify.</string>
     <string name="spotify_app_not_opened">Невозможно открыть приложение Spotify.</string>
+    <string name="spotify_connection_info_android">Чтобы включить статус Spotify на Android, обязательно включите трансляцию статуса в пункте **Device Broadcast Status** в настройках приложения Spotify. Ваш статус не будет обновляться, пока приложение Discord работает в фоновом режиме.</string>
     <string name="spotify_listen_along_host">Ведущий</string>
     <string name="spotify_listen_along_info">Что это?</string>
     <string name="spotify_listen_along_listener">Слушатель</string>
@@ -3109,6 +4020,7 @@
     <string name="status_invisible_helper">Вы не будете отображаться в сети, но будете иметь полный доступ к функциям Discord.</string>
     <string name="status_offline">Не в сети</string>
     <string name="status_online">В сети</string>
+    <string name="status_online_mobile">В сети (моб. устройство)</string>
     <string name="status_streaming">Стримит</string>
     <string name="status_unknown">Неизвестно</string>
     <string name="step_number">Шаг %1$s</string>
@@ -3116,8 +4028,9 @@
     <string name="stop_ringing">Прекратить звонок</string>
     <string name="stop_streaming">Прекратить стрим</string>
     <string name="stop_watching">Прекратить просмотр</string>
-    <string name="store_payment_legalese_monthly">Минутку внимания! Покупая %1$s, вы соглашаетесь с соответствующими [Условиями Использования Магазина](%2$s). %1$s — подписка с автоматическим продлением, а это значит, что сегодня мы выставим вам счёт, а затем будем взимать плату каждый месяц, пока вы не отмените подписку. Отменить можно в любое время, зайдя в «Настройки пользователя».</string>
-    <string name="store_payment_legalese_yearly">Минутку внимания! Покупая %1$s, вы соглашаетесь с соответствующими [Условиями Использования Магазина](%2$s). %1$s — подписка с автоматическим продлением, а это значит, что сегодня мы выставим вам счёт, а затем будем взимать плату каждый год, если вы не отмените подписку. Сделать это можно в любое время, зайдя в «Настройки пользователя».</string>
+    <string name="store_channel">Канал магазина</string>
+    <string name="store_payment_legalese_monthly">Минутку внимания! Покупая %1$s, вы соглашаетесь с соответствующими [Условиями Использования](%2$s). %1$s — подписка с автоматическим продлением, а это значит, что сегодня мы выставим вам счёт, а затем будем взимать плату каждый месяц, пока вы не отмените подписку. Отменить можно в любое время, зайдя в «Настройки пользователя».</string>
+    <string name="store_payment_legalese_yearly">Минутку внимания! Покупая %1$s, вы соглашаетесь с соответствующими [Условиями Использования](%2$s). %1$s — подписка с автоматическим продлением, а это значит, что сегодня мы выставим вам счёт, а затем будем взимать плату каждый год, если вы не отмените подписку. Сделать это можно в любое время, зайдя в «Настройки пользователя».</string>
     <string name="stream">Прямой эфир</string>
     <string name="stream_bad_spectator">Качество звука или видео просматриваемого стрима понижено. Это может быть связано с вашим подключением к сети.</string>
     <string name="stream_bad_streamer">Качество звука или видео вашего стрима понижено. Это может быть связано с вашим подключением к сети.</string>
@@ -3125,7 +4038,7 @@
     <string name="stream_capture_paused_details">Для продолжения вернитесь в игру.</string>
     <string name="stream_capture_paused_details_viewer">%1$s свернул(а) окно игры… не отключайтесь!</string>
     <string name="stream_channel_description">Участники с этим правом могут вести стрим на этом канале.</string>
-    <string name="stream_description">Участники с этим правом могут вести стрим на этом канале.</string>
+    <string name="stream_description">Участники с этим правом могут вести стрим на этом сервере.</string>
     <string name="stream_ended">Стрим закончился. *треск сверчков*</string>
     <string name="stream_ended_button">Стрим закончен</string>
     <string name="stream_ended_no_spectators">Нет наблюдателей, потому что стрим закончился.</string>
@@ -3165,7 +4078,6 @@
     <string name="stream_report_rating_body_streamer">Как прошёл ваш стрим?</string>
     <string name="stream_report_submit">Отправить</string>
     <string name="stream_reported">Отзыв отправлен</string>
-    <string name="stream_reported_body">Спасибо, что сообщили нам об этой проблеме! Ваши отзывы помогают нам улучшить качество стримов.</string>
     <string name="stream_soundshare_failed">Ой, что-то пошло не так… Нам не удаётся стримить звук из вашей игры.</string>
     <string name="streamer_mode">Режим стримера</string>
     <string name="streamer_mode_enabled">Режим стримера включён</string>
@@ -3178,6 +4090,7 @@
     <string name="subscriber_information">Информация о подписчике</string>
     <string name="suggestions">Предложения</string>
     <string name="support">Поддержка</string>
+    <string name="suppress_all_embeds">Удалить все вложения</string>
     <string name="suppressed">Разговор запрещён</string>
     <string name="suppressed_afk_body">Вы куда-то пропали… Для удобства мы поместили вас в канал AFK.</string>
     <string name="suppressed_afk_title">Эй, есть кто живой?</string>
@@ -3208,8 +4121,10 @@
     <string name="sync_with">[Синхронизировать с %1$s](onClick)</string>
     <string name="system_message_call_missed">Вы пропустили звонок от %1$s.</string>
     <string name="system_message_call_started">%1$s начинает звонок.</string>
+    <string name="system_message_channel_follow_add">%1$s добавляет **%2$s** на этот канал.</string>
     <string name="system_message_channel_icon_change">%1$s меняет значок канала.</string>
     <string name="system_message_channel_name_change">%1$s меняет название канала на: **%2$s**</string>
+    <string name="system_message_guild_bot_join">[Узнайте, как использовать этого бота.](learnOnClick)</string>
     <string name="system_message_guild_member_join">%1$s присоединяется к серверу — вжух!</string>
     <string name="system_message_guild_member_join_01">%1$s присоединяется. Все сделайте вид, что заняты!</string>
     <string name="system_message_guild_member_join_02">%1$s присоединяется. Меня могут похилить?</string>
@@ -3223,7 +4138,7 @@
     <string name="system_message_guild_member_join_10">Дикий %1$s появился.</string>
     <string name="system_message_guild_member_join_11">Вжух. Приземляется %1$s.</string>
     <string name="system_message_guild_member_join_12">Держитесь. %1$s уже на сервере.</string>
-    <string name="system_message_guild_member_join_13">%1$s уже с вами. Прячьте свои бананы.</string>
+    <string name="system_message_guild_member_join_13">%1$s присоединяется… но это не точно.</string>
     <string name="system_message_guild_member_join_14">%1$s прибывает. Вот это силища. Пожалуйста, понерфите.</string>
     <string name="system_message_guild_member_join_15">%1$s проскальзывает на сервер.</string>
     <string name="system_message_guild_member_join_16">%1$s спавнится на сервере.</string>
@@ -3235,20 +4150,21 @@
     <string name="system_message_guild_member_join_22">Это птица! Это самолёт! Да нет, это просто %1$s.</string>
     <string name="system_message_guild_member_join_23">Это %1$s! Восславьте солнце! \\\\[T]/</string>
     <string name="system_message_guild_member_join_24">%1$s в сердце со мной, за %1$s мы все стеной!</string>
-    <string name="system_message_guild_member_join_25">Ха! %1$s присоединяется и тут же активирует мою карту-ловушку!</string>
+    <string name="system_message_guild_member_join_25">%1$s садится в боевой автобус.</string>
     <string name="system_message_guild_member_join_26">Эй, друзья! %1$s уже здесь!</string>
     <string name="system_message_guild_member_join_27">Эй! Слушайте! %1$s уже с нами!</string>
     <string name="system_message_guild_member_join_28">Мы ждали вас, %1$s…</string>
-    <string name="system_message_guild_member_join_29">В одиночку идти опасно, берём %1$s с собой!</string>
+    <string name="system_message_guild_member_join_29">В одиночку идти опасно, %1$s идёт с нами!</string>
     <string name="system_message_guild_member_join_30">%1$s присоединяется к серверу! Это суперэффективно!</string>
     <string name="system_message_guild_member_join_31">Эй, друзья! %1$s уже здесь!</string>
     <string name="system_message_guild_member_join_32">%1$s здесь, как и было предсказано.</string>
     <string name="system_message_guild_member_join_33">А вот и %1$s… Вечеринка окончена.</string>
     <string name="system_message_guild_member_join_34">Игроку %1$s приготовиться</string>
-    <string name="system_message_guild_member_join_35">%1$s здесь, чтобы жевать жвачку и выдавать в табло. Жвачка дожёвана, %1$s готовится ко второму пункту программы.</string>
+    <string name="system_message_guild_member_join_35">%1$s здесь, чтобы жевать жвачку и выдавать в табло. Жвачка дожёвана, %1$s готовится ко второму пункту программы…</string>
     <string name="system_message_guild_member_join_36">Привет, а не %1$s ли вы ищете?</string>
     <string name="system_message_guild_member_join_37">%1$s подключается. Постойте немного и послушайте!</string>
     <string name="system_message_guild_member_join_38">Розовые розы, фиалки голубые, «%1$s идёт на сервер», — сказали часовые.</string>
+    <string name="system_message_guild_member_subscribed">%1$s усиливает сервер!</string>
     <string name="system_message_join_call">Присоединиться к звонку</string>
     <string name="system_message_pinned_message">%1$s закрепляет сообщение в этом канале. [Показать все закреплённые сообщения.](pinsActionOnClick)</string>
     <string name="system_message_pinned_message_mobile">%1$s закрепляет сообщение в этом канале.</string>
@@ -3276,6 +4192,7 @@
     <string name="text_channels_matching">Текстовые каналы, названия которых содержат **%1$s**</string>
     <string name="text_permissions">Права текстовых каналов</string>
     <string name="textarea_placeholder">Написать %1$s</string>
+    <string name="th">Тайский</string>
     <string name="theme">Тема</string>
     <string name="theme_dark">Тёмная</string>
     <string name="theme_light">Светлая</string>
@@ -3284,8 +4201,25 @@
     <string name="this_server_named">Только %1$s</string>
     <string name="three_users_typing">**%1$s**, **%2$s** и **%3$s** печатают…</string>
     <string name="timeout_error">Время на выполнение операции истекло, пожалуйста, попробуйте ещё раз.</string>
+    <string name="tip_create_first_server_title3">Создайте свой собственный сервер</string>
+    <string name="tip_create_more_servers_title3">Создайте свой собственный сервер</string>
+    <string name="tip_direct_messages_title3">Начать приватную беседу</string>
+    <string name="tip_friends_list_title3">Список друзей</string>
+    <string name="tip_instant_invite_body3">Чтобы пригласить кого-нибудь на сервер, щёлкните по значку «Поделиться» %1$s рядом с любым каналом.</string>
     <string name="tip_instant_invite_title3">Пригласите друзей</string>
+    <string name="tip_organize_by_topic_body3">"Сервер состоит из **текстового** и **голосового каналов**.
+
+Почитайте текстовые каналы и примите участие в беседе. Или позовите друзей и начните разговаривать в голосовом чате!"</string>
+    <string name="tip_organize_by_topic_title3">Исследуйте свой сервер</string>
+    <string name="tip_server_settings_title3">Откройте настройки сервера</string>
+    <string name="tip_voice_conversations_body3">Это ваша **панель голосового управления**. Отсюда вы можете заглушить микрофон, отключить наушники или получить доступ к настройкам звука.</string>
+    <string name="tip_voice_conversations_title3">Пусть вас услышат</string>
+    <string name="tip_whos_online_title3">Чем все заняты?</string>
+    <string name="tip_writing_messages_body3" />
+    <string name="tip_writing_messages_title3">Начните беседу</string>
     <string name="title">Заголовок</string>
+    <string name="toggle_deafen">Вкл./откл. звук в динамиках</string>
+    <string name="toggle_mute">Вкл./выкл. микрофон</string>
     <string name="too_many_animated_emoji">Все слоты для анимированных эмодзи заполнены.</string>
     <string name="too_many_emoji">Все слоты эмодзи заполнены.</string>
     <string name="too_many_reactions_alert_body">Реакция не была добавлена, так как сообщение уже содержит слишком много реакций.</string>
@@ -3300,7 +4234,7 @@
     <string name="tts_alls">Для всех каналов</string>
     <string name="tts_current">Для текущего канала</string>
     <string name="tts_never">Не использовать</string>
-    <string name="tutorial_close">Понял!</string>
+    <string name="tutorial_close">Ясно!</string>
     <string name="tweet_us">Напишите нам в Твиттере</string>
     <string name="two_fa">Двухфакторная аутентификация</string>
     <string name="two_fa_activate">Активировать</string>
@@ -3314,6 +4248,7 @@
     <string name="two_fa_backup_codes_label">Резервные коды</string>
     <string name="two_fa_backup_codes_sales_pitch">Если вы лишитесь доступа к приложению для аутентификации, то по-прежнему сможете получить доступ к учётной записи с помощью предварительно сгенерированных резервных кодов. Сохраните их в безопасном месте, чтобы снизить риск потери доступа к своей учётной записи!</string>
     <string name="two_fa_change_account">Изменить данные учётной записи</string>
+    <string name="two_fa_code">код</string>
     <string name="two_fa_disable">Отключить двухфакторную аутентификацию</string>
     <string name="two_fa_discord_backup_codes">Это ваши резервные коды Discord для учётной записи %1$s. Держите их в безопасности!</string>
     <string name="two_fa_download_app_body">Скачайте и установите [Authy](%1$s) или [Google Authenticator](%2$s) на смартфон или планшет.</string>
@@ -3331,18 +4266,21 @@
     <string name="two_fa_generate_codes_confirm_text">Создание новых резервных кодов сделает недействительными все старые резервные коды, сохранённые у вас.</string>
     <string name="two_fa_guild_mfa_warning">Этот сервер требует двухфакторную аутентификацию. Ваши привилегии администратора отключены. [Исправить](onClick)</string>
     <string name="two_fa_guild_mfa_warning_ios">Этот сервер требует двухфакторную аутентификацию. Ваши привилегии администратора отключены.</string>
+    <string name="two_fa_guild_mfa_warning_message">Этот сервер требует двухфакторную аутентификацию. Ваши привилегии администратора отключены.</string>
     <string name="two_fa_ios_delete">Сейчас вы не можете удалять сервера с включённой 2FA на iOS.</string>
     <string name="two_fa_key">Код 2FA (ручной ввод)</string>
     <string name="two_fa_login_body">Введите сгенерированный 6-значный код подтверждения.</string>
     <string name="two_fa_login_footer">Вернуться ко входу</string>
     <string name="two_fa_login_label">Войти с вашим кодом</string>
+    <string name="two_fa_modal_setup_header_mobile">Шаг %1$s из %2$s</string>
     <string name="two_fa_not_verified">Подтвердите свою учётную запись, чтобы включить двухфакторную аутентификацию.</string>
-    <string name="two_fa_qr_body">Откройте приложение аутентификации и просканируйте изображение слева с помощью камеры своего смартфона.</string>
+    <string name="two_fa_qr_body">Откройте приложение для аутентификации и просканируйте изображение слева с помощью камеры своего смартфона.</string>
     <string name="two_fa_qr_label">Сканировать QR-код</string>
     <string name="two_fa_remove">Отключить 2FA</string>
     <string name="two_fa_sales_pitch">"Защитите свою учётную запись Discord дополнительным уровнем безопасности. После настройки
 для входа вам будет необходимо ввести пароль и код подтверждения со своего телефона."</string>
     <string name="two_fa_success_body">Почти готово:</string>
+    <string name="two_fa_success_body_mobile">Теперь ваша учётная запись Discord защищена ещё одним механизмом.</string>
     <string name="two_fa_success_header">Двухфакторная аутентификация активирована! :tada:</string>
     <string name="two_fa_token_required">Требуется действительный код аутентификации Discord.</string>
     <string name="two_fa_use_desktop_app">Включение 2FA не поддерживается вашим браузером. Пожалуйста, используйте приложение для компьютера, чтобы включить 2FA.</string>
@@ -3359,7 +4297,7 @@
     <string name="unblock_to_jump_body">"Сначала разблокируйте '%1$s' и тогда вы сможете перейти к его сообщениям."</string>
     <string name="unblock_to_jump_title">Итак… вы заблокировали этого человека</string>
     <string name="uncategorized">Без категории</string>
-    <string name="unclaimed_account_body">"Пожалуйста, введите **email** и **пароль** для своей учётной записи, чтобы занять имя, прежде чем это сделает кто-нибудь другой.
+    <string name="unclaimed_account_body">"Пожалуйста, введите **e-mail** и **пароль** для своей учётной записи, чтобы занять имя, прежде чем это сделает кто-нибудь другой.
 
 Учётная запись требуется для **загрузки приложений**."</string>
     <string name="unclaimed_account_title">Учётная запись не присвоена</string>
@@ -3371,6 +4309,7 @@
     <string name="unknown_game">Неизвестная игра</string>
     <string name="unknown_region">Неизвестный регион</string>
     <string name="unknown_server">Неизвестный сервер</string>
+    <string name="unknown_user">Неизвестный пользователь</string>
     <string name="unmute">Вкл. микрофон</string>
     <string name="unmute_category">Вкл. оповещения категории</string>
     <string name="unnamed">Без имени</string>
@@ -3386,8 +4325,8 @@
     <string name="unsupported_browser">Браузер не поддерживается</string>
     <string name="unsupported_browser_body">"Похоже, что вы используете неподдерживаемый браузер. Чтобы использовать все возможности Discord,
 обновите браузер или загрузите одно из наших приложений."</string>
-    <string name="unsupported_browser_details">"Хотите начать разговор с друзьями? Установите последнюю версию Chrome, Opera, Firefox 38+ или
-скачайте клиент и говорите прямо сейчас!"</string>
+    <string name="unsupported_browser_details">"Хотите начать разговор с друзьями? Установите последнюю версию Chrome, Opera, Firefox, Edge
+или скачайте клиент Discord и говорите прямо сейчас!"</string>
     <string name="unsupported_browser_title">Как-то неловко получается</string>
     <string name="unverified_account_body">"Проверьте свою электронную почту и следуйте инструкциям для подтверждения электронной почты.
 
@@ -3418,7 +4357,9 @@
     <string name="upload_load_file_failed">Ошибка загрузки файла.</string>
     <string name="upload_open_file_failed">Не удалось открыть файл: %1$s.</string>
     <string name="upload_process_file_failed">Невозможно обработать файл.</string>
+    <string name="upload_queued">Выгрузка в очереди</string>
     <string name="uploaded_by">Загружено</string>
+    <string name="uploading_files">%1$s</string>
     <string name="usage_access">Доступ к истории использования</string>
     <string name="usage_statistics_disable_modal_body">Отключив эту опцию, вы потеряете доступ к экспериментальным функциям и различным улучшениям, например, для голосового чата. Ваши старые данные станут анонимными, и это сделает Discord глупее.</string>
     <string name="usage_statistics_disable_modal_cancel">Нет, верните меня обратно!</string>
@@ -3426,14 +4367,17 @@
     <string name="usage_statistics_disable_modal_title">Отключить некоторую статистику использования?</string>
     <string name="use_external_emojis">Использовать внешние эмодзи</string>
     <string name="use_external_emojis_description">Участники с этим правом могут использовать эмодзи с других серверов на этом сервере.</string>
+    <string name="use_speaker">Используйте динамик</string>
     <string name="use_vad">Использовать режим активации по голосу</string>
     <string name="use_vad_description">Если у участников нет данного права, они должны использовать в этом канале режим рации.</string>
     <string name="user_activity_accept_invite">Запустить игру и присоединиться</string>
     <string name="user_activity_action_ask_to_join">Запрос на вступление в игру</string>
+    <string name="user_activity_action_ask_to_join_user">Поиграть вместе %1$s</string>
     <string name="user_activity_action_download_app">Загрузить</string>
     <string name="user_activity_action_failed_to_launch">Не удалось запустить игру</string>
     <string name="user_activity_action_notify_me">Уведомлять меня</string>
     <string name="user_activity_action_spectate">Наблюдать</string>
+    <string name="user_activity_action_spectate_user">Наблюдать за %1$s</string>
     <string name="user_activity_already_playing">Вы уже слушаете этот трек.</string>
     <string name="user_activity_already_syncing">Вы уже на одной волне.</string>
     <string name="user_activity_cannot_join_self">Зачем присоединяться к себе?</string>
@@ -3451,6 +4395,7 @@
     <string name="user_activity_header_listening">Слушает %1$s</string>
     <string name="user_activity_header_live_on_platform">Стримит на %1$s</string>
     <string name="user_activity_header_playing">Играет в игру</string>
+    <string name="user_activity_header_playing_on_platform">Играет в/на %1$s</string>
     <string name="user_activity_header_streaming_to_server">Стримит на сервер %1$s</string>
     <string name="user_activity_header_watching">Смотрит %1$s</string>
     <string name="user_activity_invite_request_expired">**%1$s** отклоняет ваш запрос. Может, в другой раз!</string>
@@ -3458,6 +4403,7 @@
     <string name="user_activity_invite_request_requested">**%1$s** хочет присоединиться к вам в **%2$s**.</string>
     <string name="user_activity_invite_request_sent">Приглашение в **%1$s** отправлено **%2$s**.</string>
     <string name="user_activity_invite_request_waiting">Запрашиваем присоединение к игре **%1$s**…</string>
+    <string name="user_activity_invite_to_join">Пригласить присоединиться к %1$s</string>
     <string name="user_activity_listen_along">Слушать вместе</string>
     <string name="user_activity_listen_along_description">Слушать вместе с %1$s</string>
     <string name="user_activity_listening_album">%1$s</string>
@@ -3475,6 +4421,7 @@
     <string name="user_activity_user_playing_for_days">%1$s %2$s</string>
     <string name="user_activity_user_playing_for_hours">уже %1$s %2$s</string>
     <string name="user_activity_user_playing_for_minutes">уже %1$s %2$s</string>
+    <string name="user_activity_voice_channel">В голосовом канале %1$s</string>
     <string name="user_activity_watch_along">Смотреть вместе</string>
     <string name="user_dm_settings">Настройки конфиденциальности сервера по умолчанию</string>
     <string name="user_dm_settings_help">Эта настройка применяется тогда, когда вы подключаетесь к новому серверу. Это не влияет на уже существующие ваши сервера.</string>
@@ -3494,7 +4441,15 @@
     <string name="user_popout_message">Написать сообщение</string>
     <string name="user_popout_settings">Настройки пользователя</string>
     <string name="user_popout_wumpus_tooltip">Я новичок, встречайте!</string>
+    <string name="user_profile_guild_name_content_description">Название сервера</string>
     <string name="user_settings">Настройки пользователя</string>
+    <string name="user_settings_account_management">УПРАВЛЕНИЕ УЧЁТНОЙ ЗАПИСЬЮ</string>
+    <string name="user_settings_activity_feed">лента событий</string>
+    <string name="user_settings_af_blocked_users">Скрытые пользователи</string>
+    <string name="user_settings_af_blocked_users_description">Эти пользователи не будут отображаться в ленте событий.</string>
+    <string name="user_settings_af_hidden_empty">То чувство, когда вокруг одни друзья!</string>
+    <string name="user_settings_af_unblock">Показать пользователя</string>
+    <string name="user_settings_af_unfollow">Отменить подписку</string>
     <string name="user_settings_appearance_colorblind_mode_description">Заменяет визуальные элементы Discord на более подходящие для дальтоников.</string>
     <string name="user_settings_appearance_colorblind_mode_title">Режим для дальтоников</string>
     <string name="user_settings_appearance_colors">Цвета</string>
@@ -3505,10 +4460,15 @@
     <string name="user_settings_appearance_preview_message_4">Компактный режим будет включён…</string>
     <string name="user_settings_appearance_preview_message_5">О, вот и он!</string>
     <string name="user_settings_appearance_zoom_tip">Вы можете изменять масштаб, удерживая клавишу %1$s и нажимая «+» и «-». Используйте %1$s+0, чтобы сбросить масштаб на значение по умолчанию.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Показать вкладку с играми</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Отключите этот параметр, если вы хотите скрыть вкладку с играми и сосредоточиться на общении.</string>
+    <string name="user_settings_apperannce_disable_games_tab">Показать ленту событий</string>
+    <string name="user_settings_apperannce_disable_games_tab_note">Отключите этот параметр, если вы хотите скрыть ленту событий и сосредоточиться на общении.</string>
+    <string name="user_settings_available_codes">Доступные резервные коды</string>
     <string name="user_settings_close_button">Кнопка закрытия</string>
     <string name="user_settings_confirm_logout">Вы уверены, что хотите выйти?</string>
+    <string name="user_settings_edit_account">Редактировать учётную запись</string>
+    <string name="user_settings_edit_account_password_label">Введите пароль, чтобы подтвердить изменения.</string>
+    <string name="user_settings_edit_account_tag">ТЕГ</string>
+    <string name="user_settings_enter_password_view_codes">Введите пароль, чтобы посмотреть резервные коды.</string>
     <string name="user_settings_game_activity">Игровая активность</string>
     <string name="user_settings_game_library">Библиотека игр</string>
     <string name="user_settings_games_install_location">Место</string>
@@ -3527,6 +4487,10 @@
     <string name="user_settings_keybinds_action">Действие</string>
     <string name="user_settings_keybinds_keybind">Горячие клавиши</string>
     <string name="user_settings_linux_settings">Настройки Linux</string>
+    <string name="user_settings_mfa_enable_code_body">Откройте приложение для аутентификации и укажите код в нижеследующем поле.</string>
+    <string name="user_settings_mfa_enable_code_label">Укажите код для 2FA</string>
+    <string name="user_settings_mfa_enabled">Включено</string>
+    <string name="user_settings_mfa_removed">2FA успешно снята</string>
     <string name="user_settings_minimize_to_tray_body">Discord будет смирно прятаться в панель задач, когда вы закрываете приложение.</string>
     <string name="user_settings_minimize_to_tray_label">Сворачивать в панель задач</string>
     <string name="user_settings_my_account">Моя учётная запись</string>
@@ -3536,18 +4500,31 @@
     <string name="user_settings_notifications_show_flash_label">Включить мигание на панели задач</string>
     <string name="user_settings_open_on_startup_body">Сэкономьте пару кликов — пусть Discord встречает вас при запуске, как верный пёс!</string>
     <string name="user_settings_open_on_startup_label">Открыть Discord</string>
+    <string name="user_settings_privacy_terms">Ознакомьтесь с [Условиями Использования](%1$s) и [Политикой конфиденциальности](%2$s).</string>
+    <string name="user_settings_restart_app_mobile">Перезапустите приложение, чтобы новые параметры вступили в силу.</string>
     <string name="user_settings_save">Сохранить</string>
     <string name="user_settings_start_minimized_body">Discord скромненько запускается в фоновом режиме и не отвлекает вас.</string>
     <string name="user_settings_start_minimized_label">Запускать свёрнутым</string>
     <string name="user_settings_startup_behavior">Действия при запуске системы</string>
     <string name="user_settings_streamer_notice_body">"Освежите сервер вашего Discord-сообщества при помощи инструментов, которые вы используете для улучшения своего стрима.
 
-Изучите [набор стримера Discord](%1$s)."</string>
+Изучите [набор стримера Discord StreamKit](%1$s)."</string>
     <string name="user_settings_streamer_notice_title">Ищете интеграции?</string>
     <string name="user_settings_unverified_account_body">Пожалуйста, проверьте свою электронную почту и следуйте инструкциям, чтобы подтвердить свою учётную запись. Если вы не получили письмо или у него истёк срок действия, вы можете отправить новое.</string>
+    <string name="user_settings_used_backup_codes">Использованы резервные коды</string>
     <string name="user_settings_voice_add_multiple">Вы можете добавить несколько комбинаций для режима рации в [настройках горячих клавиш](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord использует только отборный, органический, выращенный на домашней грядке голосовой кодек Opus.</string>
     <string name="user_settings_voice_codec_title">Аудио кодек</string>
+    <string name="user_settings_voice_mic_test_button_active">Прекратить проверку</string>
+    <string name="user_settings_voice_mic_test_button_inactive">Давайте проверим</string>
+    <string name="user_settings_voice_mic_test_description">Проблемы с микрофоном? Начните проверку и скажите какую-нибудь ерунду — а мы её тут же воспроизведём.</string>
+    <string name="user_settings_voice_mic_test_title">Проверка микрофона</string>
+    <string name="user_settings_voice_mic_test_voice_caption">Воспроизводим ваш прекрасный голос</string>
+    <string name="user_settings_voice_mic_test_voice_channel_warning">В целях проведения проверки мы заглушим ваш микрофон и отключим звук в голосовом сеансе.</string>
+    <string name="user_settings_voice_mic_test_voice_no_input_notice">Discord не может обнаружить сигнал вашего микрофона. Убедитесь, что вы выбрали правильное устройство ввода.</string>
+    <string name="user_settings_voice_open_h264">Видеокодек OpenH264 предоставлен Cisco Systems, Inc.</string>
+    <string name="user_settings_voice_video_codec_title">Видеокодек</string>
+    <string name="user_settings_voice_video_hook_label">Используйте нашу новейшую технологию для записи экрана.</string>
     <string name="user_settings_windows_settings">Настройки Windows</string>
     <string name="user_volume">Громкость пользователя</string>
     <string name="username">Имя пользователя</string>
@@ -3562,13 +4539,15 @@
     <string name="vanity_url_help">"Сделайте свой сервер легкодоступным с персональным URL на свой выбор.
 Имейте в виду, что это делает ваш сервер публично доступным для всех, кто использует эту ссылку."</string>
     <string name="vanity_url_help_conflict">Имейте в виду, что мы можем отобрать персональный URL, если обнаружим оскорбления или нарушения интеллектуальной собственности.</string>
+    <string name="vanity_url_help_extended">Теперь этот сервер доступен всем по ссылке **%1$s**</string>
+    <string name="vanity_url_help_extended_link">Теперь этот сервер доступен всем по ссылке %1$s</string>
     <string name="vanity_url_hint_mobile">ваша-ссылка-здесь</string>
     <string name="verfication_expired">Истёк срок действия ссылки для подтверждения электронной почты.</string>
     <string name="verfication_expired_suggestion">Пожалуйста, авторизуйтесь в Discord и отправьте ссылку повторно</string>
-    <string name="verification_body">"Мы обнаружили, что происходит нечто необычное.
-Чтобы продолжить пользоваться Discord, **подтвердите, что вы человек.**"</string>
+    <string name="verification_body">"Мы обнаружили что-то странное…
+Чтобы продолжить пользоваться Discord, **подтвердите свою учётную запись.**"</string>
     <string name="verification_body_alt">А теперь удостоверимся, что вы человек…</string>
-    <string name="verification_email_body">Мы отправили вам новое сообщение для подтверждения почты на **%1$s**, пожалуйста, проверьте папки «входящие» и «спам».</string>
+    <string name="verification_email_body">Мы отправили вам новое письмо для подтверждения почты на **%1$s**, пожалуйста, проверьте папки «входящие» и «спам».</string>
     <string name="verification_email_error_body">При отправке письма с подтверждением электронной почты возникла ошибка. Попробуйте позже или свяжитесь со службой поддержки.</string>
     <string name="verification_email_error_title">Ошибка отправки письма с подтверждением</string>
     <string name="verification_email_title">Подтверждение электронной почты</string>
@@ -3601,14 +4580,16 @@
     <string name="verify_by_recaptcha">Подтвердить с помощью reCAPTCHA</string>
     <string name="verify_by_recaptcha_description">Мы хотим убедиться, что вы не робот.</string>
     <string name="verify_email_body">Пожалуйста, проверьте свою электронную почту и следуйте инструкциям, чтобы подтвердить свою учётную запись. Если вы не получили письмо или у него истёк срок действия, вы можете отправить новое.</string>
-    <string name="verify_email_body_resent">Мы отправили вам новое сообщение для подтверждения почты на **%1$s**, пожалуйста, проверьте папки «входящие» и «спам».</string>
+    <string name="verify_email_body_resent">Мы отправили вам новое письмо для подтверждения почты на **%1$s**, пожалуйста, проверьте папки «входящие» и «спам».</string>
     <string name="verify_phone">Подтвердить телефон</string>
     <string name="verifying">Подтверждение</string>
+    <string name="very_out_of_date_description">Нам уже давно не удаётся обновить ваше приложение Discord, и оно безнадёжно устарело. Давайте исправим это… вместе.</string>
+    <string name="vi">Вьетнамский</string>
     <string name="video">Видео</string>
     <string name="video_call">Видеозвонок</string>
     <string name="video_connect">Видео</string>
-    <string name="video_poor_connection_body">Видео было отключено. Оно возобновится, когда качество вашего соединения улучшится.</string>
-    <string name="video_poor_connection_title">Плохое соединение</string>
+    <string name="video_poor_connection_body">Скорости вашего соединения недостаточно для получения видео. Повысьте скорость соединения и попробуйте снова.</string>
+    <string name="video_poor_connection_title">Обнаружено слабое соединение</string>
     <string name="video_preview">Предпросмотр видео</string>
     <string name="video_settings">Настройки видео</string>
     <string name="video_unavailable">Видео недоступно</string>
@@ -3694,7 +4675,7 @@
     <string name="xbox_pin_step2">Перейдите в Настройки → Интеграции → Добавить</string>
     <string name="xbox_pin_step3">Нажмите на Xbox и введите PIN-код выше</string>
     <string name="yes_text">Да</string>
-    <string name="your_discord_tag">Ваш Discord-тег</string>
+    <string name="your_discord_tag">Ваш Discord Tag</string>
     <string name="your_pin_expires">Срок действия PIN-кода истекает через %1$s</string>
     <string name="your_pin_is_expired">Срок действия PIN-кода истёк</string>
     <string name="youre_viewing_older_messages">Вы просматриваете старые сообщения</string>
diff --git a/com.discord/res/values-sv-rSE/plurals.xml b/com.discord/res/values-sv-rSE/plurals.xml
index 7e7c05c89c..90b0a79bde 100644
--- a/com.discord/res/values-sv-rSE/plurals.xml
+++ b/com.discord/res/values-sv-rSE/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">inga platser tillgängliga</item>
         <item quantity="one">%d plats tillgänglig</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d dagar</item>
-        <item quantity="one">1 dag</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d medlemmar</item>
-        <item quantity="zero">0 medlemmar</item>
-        <item quantity="one">1 medlem</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">dagar</item>
         <item quantity="one">dag</item>
@@ -212,16 +203,6 @@
         <item quantity="other">behörigheter</item>
         <item quantity="one">en behörighet</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Ändrade slowmode till **!!%d!! sekunder**</item>
-        <item quantity="zero">Inaktiverade slowmode</item>
-        <item quantity="one">Ändrade slowmode till **1 sekund**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Ändrade slowmode till **!!%d!! sekunder**</item>
-        <item quantity="zero">Inaktiverade slowmode</item>
-        <item quantity="one">Ändrade slowmode till **1 sekund**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! medlemmar**</item>
         <item quantity="one">**en medlem**</item>
@@ -290,10 +271,6 @@
         <item quantity="other">%d dagar</item>
         <item quantity="one">1 dag</item>
     </plurals>
-    <plurals name="live_viewers_viewers">
-        <item quantity="other">åskådare</item>
-        <item quantity="one">åskådare</item>
-    </plurals>
     <plurals name="max_uses_description_mobile_maxUses">
         <item quantity="other">%d användningar</item>
         <item quantity="zero">obegränsad användning</item>
@@ -321,10 +298,6 @@
         <item quantity="other">%d nya meddelanden</item>
         <item quantity="one">1 nytt meddelande</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d dagar</item>
-        <item quantity="one">en dag</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d kanaler</item>
         <item quantity="one">%d kanal</item>
@@ -342,10 +315,6 @@
         <item quantity="other">dessa meddelanden</item>
         <item quantity="one">detta meddelande</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** servrar är otillgängliga på grund av ett tillfälligt avbrott.</item>
-        <item quantity="one">**1** server är otillgänglig på grund av ett tillfälligt avbrott.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d månader</item>
         <item quantity="one">1 månad</item>
diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml
index 5c43faf79b..db11009ae4 100644
--- a/com.discord/res/values-sv-rSE/strings.xml
+++ b/com.discord/res/values-sv-rSE/strings.xml
@@ -32,10 +32,8 @@
     <string name="activity_invite_private">"Du kan inte skicka en inbjudan eftersom du antingen är osynlig eller döljer din spelarstatus. Om du inte vill ändra
 dina inställningar kan du be någon bjuda in dig i stället."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Jag fattar!</string>
-    <string name="activity_panel_go_live_hotspot_header">Kör live för att streama ditt spel direkt till dina vänner!</string>
+    <string name="activity_panel_go_live_hotspot_header">Använd Go Live för att streama ditt spel direkt till dina vänner!</string>
     <string name="activity_panel_go_live_tooltip">Kör live</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Denna server har inga röstkanaler som du kan streama i.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Du kan inte streama i denna röstkanal.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Navigera till en server för att börja streama.</string>
     <string name="add">Lägg till</string>
     <string name="add_a_comment_optional">Lägg till en kommentar (valfritt)</string>
@@ -131,7 +129,6 @@ behörighet att ge."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Det är ditt!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Gå till biblioteket</string>
     <string name="application_entitlement_code_redemption_invalid">Ogiltig kod</string>
-    <string name="application_entitlement_code_redemption_prompt">Har du fått en kod till ett spel? Fyll i den här nedan:</string>
     <string name="application_entitlement_code_redemption_redeem">Lös in</string>
     <string name="application_filter_name_linux">Alla filer</string>
     <string name="application_filter_name_macos">Applikationer</string>
@@ -364,7 +361,6 @@ behörighet att ge."</string>
     <string name="application_store_view_all_news">Visa alla nyheter</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Det här nedladdningsbara innehållet kräver att du har ditt eget %1$s på Discord för att kunna spela. [Läs om nedladdningsbart innehåll.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Nedladdningsbart innehåll</string>
-    <string name="application_store_warning_early_access_description">Det här spelet är kul (vi tycker det!) men kan ha begränsat innehåll, ett flertal buggar eller kännas inkomplett. [Läs mer om tidig tillgång.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Tidig tillgång</string>
     <string name="application_store_warning_requires_desktop_app_description">För att kunna spela det här spelet måste du ha Discords $[skrivbordsapp](downloadHook) installerad.</string>
     <string name="application_store_warning_requires_desktop_app_title">Kräver skrivbordsappen</string>
@@ -486,7 +482,6 @@ men om och när du måste, så tveka inte!"</string>
     <string name="billing_error_section_card">Oj! Det är något som inte funkar med det här kortet. Fyll i alla fält och försök igen!</string>
     <string name="billing_history">Faktureringshistorik</string>
     <string name="billing_legal_mumbo_jumbo">Juridiskt tjafs</string>
-    <string name="billing_legal_mumbo_jumbo_label">Jag godkänner [Användarvillkoren för Discord-butiken](%1$s)</string>
     <string name="billing_no_payment_method">Ingen betalningsmetod finns sparad</string>
     <string name="billing_no_payment_method_description">Betala snabbare genom att spara en betalningsmetod</string>
     <string name="billing_pay_for_it_with">Betala med</string>
@@ -494,12 +489,7 @@ men om och när du måste, så tveka inte!"</string>
     <string name="billing_payment_breakdown_total">Totalt</string>
     <string name="billing_payment_history">Transaktionshistorik</string>
     <string name="billing_payment_premium">Din prenumeration</string>
-    <string name="billing_payment_premium_legalese_monthly">Genom att köpa en %1$s-prenumeration godkänner du [Butikens Användarvillkor](%2$s). %1$s är en löpande prenumeration. Du godkänner att Discord debiterar dig %3$s direkt via din valda betalningsmetod och därefter varje månad tills du säger upp prenumerationen. Du kan när som helst avbryta prenumerationen.</string>
-    <string name="billing_payment_premium_legalese_yearly">Genom att köpa en %1$s-prenumeration godkänner du [Butikens Användarvillkor](%2$s). %1$s är en löpande prenumeration. Du godkänner att Discord debiterar dig %3$s direkt via din valda betalningsmetod och därefter årligen tills du säger upp prenumerationen. Du kan när som helst avbryta prenumerationen.</string>
     <string name="billing_payment_sources">Betalningsmetoder</string>
-    <string name="billing_payment_table_header_amount">SUMMA</string>
-    <string name="billing_payment_table_header_date">DATUM</string>
-    <string name="billing_payment_table_header_description">BESKRIVNING</string>
     <string name="billing_premium_refund_text">Du kan begära återbetalning om köpet gjorts inom de senaste %1$s dagarna. [Vår vänliga supportavdelning kommer hjälpa dig så att du får dina mynt tillbaka.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Tyvärr, det här köpet kan inte återbetalas. Du kan begära återbetalning om köpet gjorts inom de senaste %1$s dagarna.</string>
     <string name="billing_price_per_month">%1$s/månad</string>
@@ -509,9 +499,7 @@ men om och när du måste, så tveka inte!"</string>
     <string name="billing_purchase_details_header">Inköpsinformation</string>
     <string name="billing_refund_header">Problem med köpet?</string>
     <string name="billing_refund_play_time_never_played">Aldrig spelat</string>
-    <string name="billing_refund_play_time_subheader">SPELTID</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">INKÖPSDATUM</string>
     <string name="billing_refund_report_a_problem">Rapportera ett problem</string>
     <string name="billing_refund_request_button">Begär återbetalning</string>
     <string name="billing_sales_tax_added">%1$s i försäljningsskatt har lagts till baserat på din faktureringsadress.</string>
@@ -741,7 +729,6 @@ den pyttelilla texten nederst."</string>
     <string name="connection_enter_code">Ange koden som visas på skärmen</string>
     <string name="connection_invalid_pin">Ogiltig PIN-kod angiven</string>
     <string name="connection_login_with">eller logga in med</string>
-    <string name="connection_problems_body">Kolla [serverstatus](%1$s) eller twittra [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Autentiserar</string>
     <string name="connection_status_awaiting_endpoint">Väntar på slutpunkt</string>
     <string name="connection_status_connected">Ansluten</string>
@@ -786,7 +773,7 @@ den pyttelilla texten nederst."</string>
     <string name="create_category">Skapa kategori</string>
     <string name="create_channel">Skapa kanal</string>
     <string name="create_group_dm">Skapa direktmeddelandegrupp</string>
-    <string name="create_instant_invite">Skapa direktinbjudan</string>
+    <string name="create_instant_invite">Skapa inbjudan</string>
     <string name="create_link">Skapa länk</string>
     <string name="create_or_join_modal_header">Åh, en till server va?</string>
     <string name="create_server_button_body">Skapa en ny server och bjud in dina vänner. Det är gratis!</string>
@@ -901,7 +888,6 @@ den pyttelilla texten nederst."</string>
     <string name="disable_email_notifications_failed_suggestion">E-postaviseringar kan redan ha inaktiverats, eller så är e-postadressen ej längre knuten till ett Discord-konto.</string>
     <string name="disable_integration_title">Inaktivera synkning</string>
     <string name="disable_integration_twitch_body">Inaktivering av synkning utför det valda alternativet för behandling av utgången prenumeration som om alla prenumerationer var utgångna.</string>
-    <string name="disable_integration_youtube_body">Inaktivering av synkning utför det valda alternativet för behandling av utgångna sponsorer som om alla sponsorer var utgångna.</string>
     <string name="disable_notifications_description">Alla skrivbordsaviseringar kommer inaktiveras.</string>
     <string name="disable_notifications_label">Inaktivera aviseringar</string>
     <string name="disable_sounds_description">Alla ljudeffekter kommer att inaktiveras.</string>
@@ -918,7 +904,6 @@ den pyttelilla texten nederst."</string>
     <string name="discord_desc_short">Röst- och textchatt för lag</string>
     <string name="discord_rich_presence">Rich Presence i Discord</string>
     <string name="dismiss">Avvisa</string>
-    <string name="dispatch_error_modal_body">Något gick fel. Om problemet kvarstår skickar du in en supportbegäran och kopierar meddelandeinnehållet nedan.</string>
     <string name="dispatch_error_modal_error_label">Felmeddelande (kopiera och klistra in mig)</string>
     <string name="dispatch_error_modal_header">Discord Dispatch-fel</string>
     <string name="dispatch_error_modal_open_ticket">Öppna en supportbegäran</string>
@@ -1027,7 +1012,7 @@ den pyttelilla texten nederst."</string>
     <string name="explicit_content_filter_medium_description">Rekommenderas för servrar som använder roller för betrodda medlemskap.</string>
     <string name="failed">Misslyckades</string>
     <string name="fi">Finska</string>
-    <string name="file_upload_limit_premium">50 MB</string>
+    <string name="file_upload_limit_premium_tier_1">50 MB</string>
     <string name="file_upload_limit_standard">8 MB</string>
     <string name="filter">Filtrera</string>
     <string name="filter_mentions">Filtrera omnämningar</string>
@@ -1049,8 +1034,6 @@ tidsgränsen för inaktivitet. Detta påverkar inte webbläsare."</string>
     <string name="form_help_attenuation">"Sänker volymen i andra program med denna procent när någon talar.
 Sätt till 0 %% för att helt inaktivera dämpning."</string>
     <string name="form_help_automatic_vad">Om indikatorn lyser stadigt grönt sänder Discord din vackra stämma.</string>
-    <string name="form_help_bitrate">"**ALLA BITS!** Att gå över %1$skbps är inte rekommenderat såvida du inte är en audiofil eftersom det kommer att
-påverka mobilklienter eller klienter med dålig uppkoppling negativt utan någon märkbar fördel."</string>
     <string name="form_help_certified_voice_processing">"När du använder en Discord-certifierad mikrofon hanteras vissa av Discords röstbearbetningsfunktioner
 i mikrofonen istället för i Discord."</string>
     <string name="form_help_channel_permissions">Att välja roller kommer automatiskt ordna grundläggande behörigheter för denna kanal.</string>
@@ -1063,11 +1046,6 @@ för att undvika [denna galenskap](%1$s).**"</string>
 vid varje meddelande som skickas på servern eller inte. Vi rekommenderar starkt att använda detta enbart för @omnämningar för offentliga Discord-servrar"</string>
     <string name="form_help_explicit_content_filter">"Skanna och ta automatisk bort servermeddelanden med stötande innehåll. Välj hur omfattande filtret ska tillämpas
 mot den här serverns medlemmar. **Vi rekommenderar att använda ett filter för offentliga Discord-servrar.**"</string>
-    <string name="form_help_instant_invite_channel">"Om en kanal är vald så kommer en inbjudningslänk att genereras med widgeten,
-annars kommer endast aktiva medlemmar och röstkanaler att tillhandahållas."</string>
-    <string name="form_help_last_seen">"Rensningen sparkar **%1$s** som inte
-setts på **%2$s** och inte har tilldelats någon roll.
-De kan ansluta igen med en ny inbjudan."</string>
     <string name="form_help_legacy_subsystem">"Vissa ljudhårdvarudrivrutiner uppvisar problem när ditt operativsystems moderna ljudsubsystem används.
 Kryssa i den här rutan för att använda ett Legacy-ljudsubsystem som reserv."</string>
     <string name="form_help_nsfw">"Användare måste bekräfta att de är myndiga för att få se innehållet i denna kanal.
@@ -1077,7 +1055,6 @@ webbplats användare kan du dynamiskt lägga till &amp;username= i query-sträng
     <string name="form_help_qos">"Meddelar din router att paketen Discord skickar har hög prioritet.
 Vissa routrar eller internetleverantörer kan agera märkligt när detta används."</string>
     <string name="form_help_slowmode">Medlemmar kommer att begränsas till att skicka ett meddelande per intervall, såvida de inte har behörigheterna Hantera kanaler eller Hantera meddelanden.</string>
-    <string name="form_help_system_channel">Visa ett meddelande i denna kanal när någon ansluter till denna server. Meddelanden är slumpmässiga. Detta kan stängas av när som helst.</string>
     <string name="form_help_temporary">Medlemmar sparkas automatiskt när de kopplar från såvida inte en roll är tilldelad.</string>
     <string name="form_help_user_limit">"Begränsar antalet användare som kan koppla upp sig till den här röstkanalen. Användare med behörighet att **Flytta medlemmar**
 ignorerar denna gräns, och kan flytta andra medlemmar till kanalen."</string>
@@ -1122,7 +1099,7 @@ konversation. Detta gäller inte om en medlem har en tilldelad roll.
     <string name="form_label_input_mode">Inmatningsläge</string>
     <string name="form_label_input_sensitivty">Ingångskänslighet</string>
     <string name="form_label_input_volume">Ingångsvolym</string>
-    <string name="form_label_instant_invite">Ange en direktinbjudan</string>
+    <string name="form_label_instant_invite">Ange en inbjudan</string>
     <string name="form_label_instant_invite_channel">Inbjudningskanal</string>
     <string name="form_label_last_seen">Sågs senast</string>
     <string name="form_label_local_mute">Lokal dämpning</string>
@@ -1191,7 +1168,6 @@ konversation. Detta gäller inte om en medlem har en tilldelad roll.
     <string name="form_label_suppress_everyone">Tysta **@everyone** och **@here**</string>
     <string name="form_label_synced_role">Synkad roll</string>
     <string name="form_label_synced_subs">Synkade prenumeranter</string>
-    <string name="form_label_system_channel">Kanal för välkomstmeddelanden</string>
     <string name="form_label_temporary">Tillfälligt medlemskap</string>
     <string name="form_label_tts">Text-till-tal</string>
     <string name="form_label_tts_notifications">Text-till-tal-aviseringar</string>
@@ -1291,7 +1267,6 @@ för att kunna se ingångskänsligheten."</string>
     <string name="game_feed_activity_recently_played">Har nyligen spelat</string>
     <string name="game_feed_activity_streaming_twitch">Streamar på Twitch</string>
     <string name="game_feed_current_header_title">Spelar nu</string>
-    <string name="game_feed_settings_visibility">Visa på spelfliken</string>
     <string name="game_feed_unknown_player">Okänd spelare</string>
     <string name="game_feed_user_played_days_ago">Spelade för %1$s %2$s sedan</string>
     <string name="game_feed_user_played_hours_ago">Spelade för %1$s %2$s sedan</string>
@@ -1359,6 +1334,7 @@ för att kunna se ingångskänsligheten."</string>
     <string name="generate_a_new_link">Skapa en ny länk</string>
     <string name="get_started">Kom igång</string>
     <string name="gif_auto_play_label">Spela GIF:ar automatiskt när Discord är aktivt.</string>
+    <string name="go_live_hardware_acceleration_unavailable">Vi kan tyvärr inte hitta någon maskinvaruacceleration. Din dator kan ha problem med att stödja Go Live.</string>
     <string name="go_live_hey">Hallå!</string>
     <string name="go_live_listen">Lyssna!</string>
     <string name="go_live_look">Kolla!</string>
@@ -1372,6 +1348,7 @@ för att kunna se ingångskänsligheten."</string>
     <string name="go_live_modal_select_channel_form_title">Välj en röstkanal</string>
     <string name="go_live_modal_select_channel_placeholder">Sök efter röstkanaler</string>
     <string name="go_live_modal_title">Kör live</string>
+    <string name="go_live_video_drivers_outdated">Dina videodrivrutiner är föråldrade. Uppdatera dem för bättre Go Live-prestanda.</string>
     <string name="grant_temporary_membership">Ge tillfälligt medlemskap</string>
     <string name="group">Grupp</string>
     <string name="group_dm_add_friends">Lägg till vänner för DM</string>
@@ -1448,8 +1425,6 @@ för att kunna se ingångskänsligheten."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Beviljade** %1$s för **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Flyttade från **%1$s** till **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">I position **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) skapade en textkanal $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Ändrade ämnet till **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Ändrade ämnet till **%1$s**</string>
@@ -1545,6 +1520,8 @@ för att kunna se ingångskänsligheten."</string>
     <string name="guild_settings_filter_all_actions">Alla åtgärder</string>
     <string name="guild_settings_filter_all_users">Alla användare</string>
     <string name="guild_settings_filter_user">Filtrera efter användare</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">720p 60fps Go Live-streamar</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">1080p 60fps Go Live-streamar</string>
     <string name="guild_settings_label_audit_log">Granskningslogg</string>
     <string name="guild_settings_label_audit_log_empty_body">När moderatorer börjar moderera, kan du moderera modererandet här.</string>
     <string name="guild_settings_label_audit_log_empty_title">Inga loggar ännu</string>
@@ -1623,7 +1600,6 @@ Om du har tillgång till din webbplats användare kan du dynamiskt lägga till &
     <string name="hypesquad_question_11_response_d">Föreslår att Wumpus kanske borde satsa på tamburin istället</string>
     <string name="hypesquad_question_12_prompt">Du klättrar upp för ett högt berg och det enda som står i vägen för rikedomarna är en trehövdad drake på toppen. Du:</string>
     <string name="hypesquad_question_12_response_a">Rusar ut i strid</string>
-    <string name="hypesquad_question_12_response_b">Studerar gamla Godzilla-filmer för att lära dig hur man slåss mot King Ghidorah</string>
     <string name="hypesquad_question_12_response_c">Försöker övertala draken att dela på skatterna</string>
     <string name="hypesquad_question_12_response_d">Erbjuder draken en mjukis-Wumpus, det är klart att han vill ha en.</string>
     <string name="hypesquad_question_13_prompt">Vad är det som låter?</string>
@@ -1726,9 +1702,9 @@ Om du har tillgång till din webbplats användare kan du dynamiskt lägga till &
     <string name="input_mode_ptt_release_delay">Tryck-för-tal fördröjning vid tangentsläpp</string>
     <string name="input_mode_vad">Röstaktivering</string>
     <string name="install_location_main">Huvudplats</string>
-    <string name="instant_invite">Direktinbjudan</string>
+    <string name="instant_invite">Inbjudan</string>
     <string name="instant_invite_accept">Acceptera inbjudan</string>
-    <string name="instant_invite_accepted">Accepterade inbjudan</string>
+    <string name="instant_invite_accepted">Accepterad inbjudan</string>
     <string name="instant_invite_accepting">Accepterar inbjudan</string>
     <string name="instant_invite_ask_for_new_invite">Be om en ny!</string>
     <string name="instant_invite_ask_user_for_new_invite">Be %1$s om en ny inbjudan!</string>
@@ -1751,16 +1727,15 @@ Om du har tillgång till din webbplats användare kan du dynamiskt lägga till &
     <string name="instant_invite_regenerate">Regenerera</string>
     <string name="instant_invite_resolved_body">Du har blivit inbjuden till **%1$s** på **%2$s**.</string>
     <string name="instant_invite_resolved_title">Men hallå där.</string>
-    <string name="instant_invite_resolving">Analyserar direktinbjudan</string>
+    <string name="instant_invite_resolving">Analyserar inbjudan</string>
     <string name="instant_invite_uses">Användningar</string>
     <string name="instant_invite_you_are_already_a_member_of">Du är redan medlem i</string>
     <string name="instant_invite_you_have_been_invited_to_join">Du har blivit inbjuden att gå med</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** har bjudit in dig att gå med</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Du har blivit inbjuden till en direktmeddelandegrupp av</string>
-    <string name="instant_invites">Direktinbjudningar</string>
+    <string name="instant_invites">Inbjudningar</string>
     <string name="integration_settings">Integrationsinställningar</string>
     <string name="integrations">Integrationer</string>
-    <string name="integrations_header">Anslutna Twitch/Youtube Gaming-konton</string>
     <string name="integrations_pro_tip">För fler integrationer, kolla in [Discords StreamKit](%1$s).</string>
     <string name="internal_server_error">Ett internt serverfel har inträffat, försök igen.</string>
     <string name="invalid_animated_emoji_body">Denna emoji funkar inte eftersom den är animerad. Uppgradera till Discord Nitro för att tillfredsställa alla dina animerade emojidrömmar</string>
@@ -1873,13 +1848,13 @@ Vill du veta mer om Discord?"</string>
     <string name="join_afk_channel_body">Det verkar som du gått med i inaktivitetskanalen. Du kan inte prata i denna kanal.</string>
     <string name="join_call">Gå med i samtal</string>
     <string name="join_server">Gå med</string>
-    <string name="join_server_button_body">Ange en direktinbjudan och gå med i din väns server.</string>
+    <string name="join_server_button_body">Ange en inbjudan och gå med i din väns server.</string>
     <string name="join_server_button_cta">Anslut till en server</string>
     <string name="join_server_button_cta_mobile">Gå med i en server med en inbjudningslänk</string>
     <string name="join_server_button_cta_mobile_desc">Har du en inbjudningslänk eller -kod? Använd den här!</string>
     <string name="join_server_button_cta_named">Gå med i %1$s</string>
-    <string name="join_server_description">Ange en direktinbjudan nedan för att gå med i en befintlig server. Inbjudan kommer att se ut ungefär så här:</string>
-    <string name="join_server_description_mobile">Ange en direktinbjudan ovan för att gå med i en befintlig server.</string>
+    <string name="join_server_description">Ange en inbjudan nedan för att gå med i en befintlig server. Inbjudan kommer att se ut ungefär så här:</string>
+    <string name="join_server_description_mobile">Ange en inbjudan ovan för att gå med i en befintlig server.</string>
     <string name="join_server_title">Anslut till en server</string>
     <string name="join_stream">Anslut dig till streamen</string>
     <string name="join_video_call">Gå med i videosamtal</string>
@@ -1986,9 +1961,8 @@ under tiden du pratar."</string>
     <string name="link_your_xbox_account_1">Länka ditt Xbox-konto till Discord för att visa vilka spel du spelar.</string>
     <string name="link_your_xbox_account_2">Discord är en röst-, text- och videochattapp för spelare som är gratis, säker och fungerar till dator och mobil.</string>
     <string name="listening_to">Lyssnar på **%1$s**</string>
-    <string name="live_beta_description">Välkommen till streamen! Kör live är i betaskedet. Vi beklagar eventuella upphakningar</string>
+    <string name="live_beta_description">Välkommen till streamen! Go Live är i betaskedet. Vi beklagar eventuella upphakningar</string>
     <string name="live_on_twitch">Live på Twitch</string>
-    <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Det gick inte att läsa in bilden.
 Försök igen."</string>
     <string name="load_more_messages">Läs in fler meddelanden</string>
@@ -2172,12 +2146,9 @@ våra uppdaterade användarvillkor och sekretesspolicy."</string>
     <string name="no_emoji_title">Ingen emoji</string>
     <string name="no_input_devices">Inga inmatningsenheter</string>
     <string name="no_input_devices_detected">Inga inmatningsenheter kunde hittas, var god och anslut en och försök igen.</string>
-    <string name="no_instant_invite">Ingen direktinbjudan</string>
-    <string name="no_integrations">[Länka](onConnect) ditt Twitch- eller YouTube Gaming-partnerkonto för att synkronisera dina prenumeranter/sponsorer till en roll</string>
+    <string name="no_instant_invite">Ingen inbjudan</string>
     <string name="no_integrations_body">Protokollet FR13NDSH1P kan endast utföras från Discord-klienten</string>
     <string name="no_integrations_label">Inga integrationer</string>
-    <string name="no_invites_body">"Känner du att du saknar mål? Som ett pappersflygplan som seglar genom himlen?
-Få hit några vänner genom att skapa en inbjudningslänk!"</string>
     <string name="no_invites_caption">Inga inbjudningar ännu!</string>
     <string name="no_invites_label">Inga inbjudningar ännu</string>
     <string name="no_mail_account_description">Skicka gärna dina synpunkter till support@discordapp.com. Din användarinformation har kopierats till urklipp.</string>
@@ -2197,7 +2168,6 @@ fästa meddelanden … ännu."</string>
     <string name="no_reactions_header">Inga reaktioner</string>
     <string name="no_recent_mentions">I begynnelsen … var tystnaden.</string>
     <string name="no_send_messages_permission_placeholder">Du har inte behörighet att skicka meddelanden i denna kanal.</string>
-    <string name="no_system_channel">Inga välkomstmeddelanden</string>
     <string name="no_text">Nej</string>
     <string name="no_thanks">Nej tack</string>
     <string name="no_user_limit">Ingen gräns</string>
@@ -2209,7 +2179,6 @@ fästa meddelanden … ännu."</string>
     <string name="note">Anteckning</string>
     <string name="note_placeholder">Klicka för att lägga till en anteckning</string>
     <string name="note_placeholder_mobile">Tryck för att lägga till en anteckning</string>
-    <string name="notice_application_test_mode">Testläget är för närvarande aktivt för **%1$s**. Opublicerade SKU kommer att visas och du kommer inte att debiteras för tillhörande betalningar.</string>
     <string name="notice_application_test_mode_go_to_listing">Gå till SKU</string>
     <string name="notice_connect_spotify">Anslut ditt Spotify-konto för att visa din musik i din status!</string>
     <string name="notice_connection_conflict">Din röst har kopplats från eftersom du anslöt på en annan plats.</string>
@@ -2220,7 +2189,6 @@ fästa meddelanden … ännu."</string>
     <string name="notice_dispatch_error_disk_low">Du har inte tillräckligt med diskutrymme. Det krävs %1$s men endast %2$s finns tillgängligt.</string>
     <string name="notice_dispatch_error_file_name_too_long">Åh nej, det här spelet har filnamn som är för långa för Windows. Välj en kortare installationskatalog.</string>
     <string name="notice_dispatch_error_invalid_drive">Åh nej, installationsplatsen du valde är inte giltig. Du valde %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Vi kunde inte uppdatera spelet. Körs det just nu?</string>
     <string name="notice_dispatch_error_no_manifests">Åh nej, det verkar inte finnas något innehåll för det här spelet. Kontakta supporten.</string>
     <string name="notice_dispatch_error_not_entitled">Åh nej, det verkar som du inte äger det här spelet. Kontakta supporten om du tror att det är fel.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Det verkar som du sagt nej till ett installationsskript. Du måste säga ja för att spelet ska installeras.</string>
@@ -2235,9 +2203,6 @@ fästa meddelanden … ännu."</string>
     <string name="notice_native_apps">Behöver du tryck-för-tal i hela systemet? Hämta appen!</string>
     <string name="notice_no_input_detected">Det verkar som att Discord inte tar emot något ljud från din mikrofon. Låt oss lösa det … tillsammans.</string>
     <string name="notice_no_input_detected_help_link_text">Hjälp!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Din åtkomst till Nitro har gått ut. Uppgradera från Nitro Classic till Nitro för obegränsad tillgång till fantastiska spel.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Du har bara %1$s kvar med Nitros spel! Din åtkomst slutar gälla **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Tack för att du är en tidig Nitro-supporter! Som en gåva för att du är så helgrym får du nu åtkomst till Nitro-spel fram till %1$s.</string>
     <string name="notice_premium_promo_action">Läs mer</string>
     <string name="notice_premium_promo_message">Bidra till Discords utveckling och få roliga förmåner!</string>
     <string name="notice_scheduled_maintenance">Discord kommer genomgå planerat underhåll den **%1$s** kl. **%2$s**.</string>
@@ -2307,7 +2272,6 @@ Fick du inbjudningslänken av en vän? Ange inbjudningslänken eller koden nedan
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Overlay aktiverad</string>
     <string name="nux_post_reg_join_server_description">Få ut så mycket som möjligt av Discord genom att ansluta till en server.</string>
     <string name="nux_post_reg_join_server_skip">Jag har ingen</string>
     <string name="nux_post_reg_join_server_title">Har du en inbjudan?</string>
@@ -2352,7 +2316,6 @@ Dessutom fungerar kanske inte overlayen för alla. Om du har problem eller fråg
     <string name="overlay_menu_get_invite">Skaffa inbjudningslänk</string>
     <string name="overlay_menu_open_discord">Öppna Discord</string>
     <string name="overlay_menu_switch_channels">Byt kanaler</string>
-    <string name="overlay_mobile_toggle_desc">Se vem som pratar och få åtkomst till genvägar medan du använder andra appar när du använder röstfunktionen</string>
     <string name="overlay_mobile_toggle_label">Aktivera mobil röst-overlay</string>
     <string name="overlay_mobile_unauthed">Logga in på Discord-appen för att aktivera denna funktion.</string>
     <string name="overlay_news_go_live_body">Vill du streama %1$s till dina vänner på %2$s?</string>
@@ -2360,7 +2323,6 @@ Dessutom fungerar kanske inte overlayen för alla. Om du har problem eller fråg
     <string name="overlay_news_text_pinning_body">Du kan nu fästa en textchatt i ditt spel!</string>
     <string name="overlay_news_text_pinning_tip">Tips: Du kan fästa en chatt genom att trycka $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Discords overlay uppgraderad</string>
-    <string name="overlay_no_results">Vi sökte vitt och brett, men tyvärr hittade vi inga röstkanaler.</string>
     <string name="overlay_notification_incoming_call">Inkommande samtal …</string>
     <string name="overlay_notification_settings_disabled">Aviseringar har inaktiverats</string>
     <string name="overlay_notification_settings_position">Visar: %1$s</string>
@@ -2370,7 +2332,6 @@ Dessutom fungerar kanske inte overlayen för alla. Om du har problem eller fråg
     <string name="overlay_notifications_settings">Overlay-aviseringar</string>
     <string name="overlay_notifications_top_left">Överst till vänster</string>
     <string name="overlay_notifications_top_right">Överst till höger</string>
-    <string name="overlay_private_channels_empty_state">Näpp, inga direktmeddelanden här.</string>
     <string name="overlay_reload">Ladda om overlay</string>
     <string name="overlay_settings">Overlay-inställningar</string>
     <string name="overlay_settings_general_tab">Allmänt</string>
@@ -2392,7 +2353,6 @@ Dessutom fungerar kanske inte overlayen för alla. Om du har problem eller fråg
     <string name="pagination_page_of">Sida %1$s av %2$s</string>
     <string name="pagination_previous">Föregående</string>
     <string name="paginator_of_pages">Sida %1$s av %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Discord-partner</string>
     <string name="party_full">Fullsatt grupp</string>
     <string name="party_join">Gå med i grupp</string>
@@ -2486,18 +2446,11 @@ Dessutom fungerar kanske inte overlayen för alla. Om du har problem eller fråg
     <string name="popout_stay_on_top">Fäst överst</string>
     <string name="post_code">Postnummer</string>
     <string name="premium_alert_error_title">Oj då, något gick snett …</string>
-    <string name="premium_applications_grandfathered_monthly">Som tack för ditt stöd till Discord får du tillgång till Nitro-spel i ett år. Din åtkomst slutar gälla **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">Som tack för ditt stöd till Discord får du tillgång till Nitro-spel i två år. Din åtkomst slutar gälla **%1$s**.</string>
-    <string name="premium_applications_subtitle">Obegränsad tillgång till ett växande bibliotek med kritikerrosade spel som vi tycker att du och dina kompisar borde spela.</string>
-    <string name="premium_applications_title">Massor av spel. Till en låg månadskostnad.</string>
     <string name="premium_badge_tooltip">Prenumerant sedan %1$s</string>
     <string name="premium_cancel_cancel">Näpp</string>
     <string name="premium_cancel_confirm_body_tier_1">"Uppsägningen kommer att träda i kraft i samband med att din aktuella faktureringsperiod tar slut den **%1$s**. Din Discord-tagg kommer att återställas om du har ändrat den.
 
 Du kan börja prenumerera igen när du vill."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Uppsägningen träder i kraft i samband med att din aktuella faktureringsperiod tar slut. Den **%1$s** har du inte längre tillgång till alla Nitros spel i ditt bibliotek och din Discord-tagg kommer att återställas om du har ändrat den.
-
-Vi behåller dina sparfiler i säkert förvar utifall du skulle ändra dig. Du kan börja prenumerera igen när du vill!"</string>
     <string name="premium_cancel_confirm_new">Japp, säg upp %1$s</string>
     <string name="premium_cancel_confirm_title">Avbryt %1$s?</string>
     <string name="premium_cancel_failed_body">Vi kunde inte avsluta din Nitro-prenumeration. Försök igen eller kontakta vår support om problemet kvarstår.</string>
@@ -2514,19 +2467,15 @@ Vi behåller dina sparfiler i säkert förvar utifall du skulle ändra dig. Du k
     <string name="premium_chat_perks_description_custom_emoji">Få ett globalt pass för att använda dina anpassade emojier var som helst.</string>
     <string name="premium_chat_perks_description_discriminator">Välj din egen tagg när du prenumererar.</string>
     <string name="premium_chat_perks_description_screenshare">Öka kvaliteten på din skärmdelning med 720p 60 FPS eller 1080p 30 FPS.</string>
-    <string name="premium_chat_perks_description_upload_limit">Uppgradera från %1$s för att få större uppladdningsstorlek med %2$s för att dela memes av ännu högre kvalitet.</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Animerade grejer</string>
     <string name="premium_chat_perks_title_badge">Visa ditt stöd</string>
     <string name="premium_chat_perks_title_custom_emoji">Globala specialemojier</string>
     <string name="premium_chat_perks_title_discriminator">Unik Discord-tagg</string>
     <string name="premium_chat_perks_title_screenshare">Videor av högre kvalitet</string>
+    <string name="premium_chat_perks_title_streaming">Bättre Go Live-streamar</string>
     <string name="premium_code_redemption_confirmation_blurb">Tack vare en rad med slumpmässiga siffror har du nu fått fler chattförmåner i %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">Vad bra!</string>
-    <string name="premium_feature_new_chat_perks_header">Du får också några extra chattförmåner:</string>
-    <string name="premium_feature_new_premium_applications_header">Spel till ett värde av över %1$s. Spana in dem:</string>
-    <string name="premium_feature_view_applications">Visa alla Nitro-spel</string>
     <string name="premium_features_chat_perks">Chattförmåner</string>
-    <string name="premium_features_premium_applications">Gratis spel</string>
     <string name="premium_grandfathered_warning">Som tack för att du stödjer oss har du rabatt på din Nitro-prenumeration. **Om du avbryter eller ändrar din prenumeration kommer du att bli av med rabatten.** Kom inte och säg att du inte blivit varnad!!!</string>
     <string name="premium_grandfathered_warning_confirm">Gör det ändå</string>
     <string name="premium_grandfathered_warning_title">Försiktigt, kompis</string>
@@ -2536,10 +2485,7 @@ Vi behåller dina sparfiler i säkert förvar utifall du skulle ändra dig. Du k
     <string name="premium_not_claimed">Du måste först registrera ditt konto</string>
     <string name="premium_not_claimed_body">Hej kompis! Om du vill köpa Nitro måste du först registrera ditt konto så att du inte förlorar några av dina grejer.</string>
     <string name="premium_not_verified">Verifiera din e-post först</string>
-    <string name="premium_not_verified_body">Hallå kompis! Om du vill köpa Nitro måste du verifiera ditt e-postkonto först. Kolla din e-post eller be om en ny verifiering.</string>
-    <string name="premium_payment_applications_os_warning">Nitro-spel stöds endast på Windows.</string>
     <string name="premium_payment_confirmation_blurb_regular">Du har nu fått kraften med förbättrade chattförmåner. Sluta läsa det här och sätt igång att chatta!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Du har nu tillgång till så många grymma spel. Sluta läsa det här och sätt igång att spela dem!!!</string>
     <string name="premium_payment_confirmation_button_regular">Okej, det låter bra</string>
     <string name="premium_plan_month">Nitro per månad</string>
     <string name="premium_plan_month_tier_1">Nitro Classic per månad</string>
@@ -2560,13 +2506,10 @@ Vi kommer att beakta din nuvarande prenumeration och dra av den proportionerligt
     <string name="premium_upgrade_disabled_current_tooltip">Din nuvarande prenumeration.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Du måste säga upp prenumerationen först och låta den gå ut innan du väljer en kortare prenumeration.</string>
     <string name="premium_upgrade_done_body_tier_1">Du har nu förbättrade chattförmåner!</string>
-    <string name="premium_upgrade_done_body_tier_2">Du har nu förbättrade chattförmåner och tillgång till dussintals spel!</string>
     <string name="premium_upgrade_done_button_tier_1">Snyggt!</string>
-    <string name="premium_upgrade_done_button_tier_2">Kolla in alla Nitro-spel</string>
     <string name="premium_upgrade_failed_body">Oj då … det gick inte att uppgradera. Kontrollera att din betalningsinformation stämmer och försök igen.</string>
     <string name="premium_upload_promo">Uppgradera till Discord Nitro för en filgräns på %1$s</string>
     <string name="premium_year_free_months">Få 2 månader på köpet!</string>
-    <string name="premium_year_free_months_short">2 månader gratis</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / år</string>
     <string name="preview_chat">Förhandsgranska chatt</string>
     <string name="priority_speaker">Prioriterad talare</string>
@@ -2816,7 +2759,6 @@ Välj vilken skärm du vill dela."</string>
     <string name="search_filter_on">den</string>
     <string name="search_for_emoji">Hitta den perfekta emojin</string>
     <string name="search_for_empty">Sök</string>
-    <string name="search_for_value">Sök efter: **%1$s**</string>
     <string name="search_group_header_channels">I kanal</string>
     <string name="search_group_header_dates">Datum</string>
     <string name="search_group_header_file_name">Filnamn innehåller</string>
@@ -3016,8 +2958,6 @@ Dessa meddelanden kan höras av alla som har fokus på kanalen."</string>
     <string name="stop_ringing">Sluta ringa</string>
     <string name="stop_streaming">Sluta streama</string>
     <string name="stop_watching">Sluta titta</string>
-    <string name="store_payment_legalese_monthly">Hej! Genom att köpa %1$s godkänner du [Butikens Användarvillkor](%2$s). %1$s är en löpande prenumeration, vilket innebär att vi debiterar dig i dag och fortsätter att debitera dig månatligen tills du säger upp prenumerationen. Du kan avbryta den när som helst via dina Användarinställningar.</string>
-    <string name="store_payment_legalese_yearly">Hej! Genom att köpa %1$s godkänner du [Butikens Användarvillkor](%2$s). %1$s är en löpande prenumeration, vilket innebär att vi debiterar dig i dag och fortsätter att debitera dig årligen tills du säger upp prenumerationen. Du kan avbryta den när som helst via dina Användarinställningar.</string>
     <string name="stream">Kör live</string>
     <string name="stream_bad_spectator">Streamen du tittar på har för närvarande nedsatt video- eller ljudkvalitet. Detta kan bero på nätverksförhållanden.</string>
     <string name="stream_bad_streamer">Din stream har för närvarande nedsatt video- eller ljudkvalitet. Detta kan bero på nätverksförhållanden.</string>
@@ -3025,7 +2965,6 @@ Dessa meddelanden kan höras av alla som har fokus på kanalen."</string>
     <string name="stream_capture_paused_details">Byt tillbaka till ditt spel för att återuppta det.</string>
     <string name="stream_capture_paused_details_viewer">%1$s har minimerat spelet… häng kvar!</string>
     <string name="stream_channel_description">Medlemmar med denna behörighet kan streama i den här kanalen.</string>
-    <string name="stream_description">Medlemmar med denna behörighet kan i den här kanalen.</string>
     <string name="stream_ended">Den här streamen har avslutats. *ljud från en syrsa*</string>
     <string name="stream_ended_button">Stream avslutad</string>
     <string name="stream_ended_no_spectators">Det finns inga åskådare eftersom streamen är avslutad.</string>
@@ -3065,7 +3004,6 @@ Dessa meddelanden kan höras av alla som har fokus på kanalen."</string>
     <string name="stream_report_rating_body_streamer">Berätta om din streamingupplevelse.</string>
     <string name="stream_report_submit">Skicka</string>
     <string name="stream_reported">Feedback skickad</string>
-    <string name="stream_reported_body">Tack för att du rapporterar ditt problem! Din feedback hjälper oss att förbättra streamkvaliteten.</string>
     <string name="stream_soundshare_failed">Hej, något gick fel och vi kunde inte streama ljudet från ditt spel.</string>
     <string name="streamer_mode">Streamerläge</string>
     <string name="streamer_mode_enabled">Streamerläge aktiverat</string>
@@ -3123,7 +3061,6 @@ Dessa meddelanden kan höras av alla som har fokus på kanalen."</string>
     <string name="system_message_guild_member_join_10">En vild %1$s dök just upp.</string>
     <string name="system_message_guild_member_join_11">Swoooosh. %1$s landade precis.</string>
     <string name="system_message_guild_member_join_12">Håll i er. %1$s anslöt just till servern.</string>
-    <string name="system_message_guild_member_join_13">%1$s anslöt just. Göm alla bananer.</string>
     <string name="system_message_guild_member_join_14">%1$s anslöt precis. Verkar OP, behöver nerfas.</string>
     <string name="system_message_guild_member_join_15">%1$s gled nyss in på servern.</string>
     <string name="system_message_guild_member_join_16">En %1$s har dykt upp på servern.</string>
@@ -3134,7 +3071,6 @@ Dessa meddelanden kan höras av alla som har fokus på kanalen."</string>
     <string name="system_message_guild_member_join_21">En utmanare närmar sig, %1$s har dykt upp!</string>
     <string name="system_message_guild_member_join_22">Det är en fågel! Det är ett flygplan! Äsch, det är bara %1$s.</string>
     <string name="system_message_guild_member_join_23">Det är %1$s! Helgad vare solen! \\\\[T]/</string>
-    <string name="system_message_guild_member_join_25">Ha! %1$s har gått med! Du aktiverade mitt fäll-kort!</string>
     <string name="system_message_guild_member_join_26">Skål, älskling! %1$s är här!</string>
     <string name="system_message_guild_member_join_27">Hallå! Hörrni! %1$s har gått med!</string>
     <string name="system_message_guild_member_join_28">Vi har väntat på dig %1$s</string>
@@ -3284,8 +3220,6 @@ Ett registrerat konto krävs för att **hämta appar**."</string>
     <string name="unsupported_browser">Webbläsaren stöds ej</string>
     <string name="unsupported_browser_body">"Det ser ut som du använder en webbläsare som inte stöds. För att uppleva vad Discord har att erbjuda, uppgradera din
 webbläsare eller hämta en av våra appar."</string>
-    <string name="unsupported_browser_details">"Du vill prata med ditt lag, eller hur? Byt till senaste Chrome, Opera, Firefox 38+ eller hämta
-Discord-klienten och börja prata nu!"</string>
     <string name="unsupported_browser_title">Jaha, det här var ju pinsamt</string>
     <string name="unverified_account_body">"Kolla din e-post och följ instruktionerna för att verifiera din e-postadress.
 
@@ -3403,8 +3337,6 @@ Håll inne skift för att ladda upp direkt."</string>
     <string name="user_settings_appearance_preview_message_4">Kompakt läge vore påslaget</string>
     <string name="user_settings_appearance_preview_message_5">Här är den ju!</string>
     <string name="user_settings_appearance_zoom_tip">Du kan ändra zoomnivå med %1$s +/- och återställa till standardnivån med %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Visa spelfliken</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Stäng av detta för att dölja spelfliken så att du kan fokusera på dina samtal.</string>
     <string name="user_settings_close_button">Stängknappen</string>
     <string name="user_settings_confirm_logout">Är du säker på att du vill logga ut?</string>
     <string name="user_settings_game_activity">Spelaktivitet</string>
@@ -3463,8 +3395,6 @@ Var medveten om att det gör din server offentligt tillgänglig för alla som an
     <string name="vanity_url_hint_mobile">din-url-här</string>
     <string name="verfication_expired">E-postverifieringslänken har löpt ut.</string>
     <string name="verfication_expired_suggestion">Logga in på Discord och skicka länken igen</string>
-    <string name="verification_body">"Vi har upptäckt att det pågår något mystiskt.
-För att fortsätta använda Discord, **behöver vi verifiera att du är en människa.**"</string>
     <string name="verification_body_alt">Dags att visa att du verkligen är en människa …</string>
     <string name="verification_email_body">Vi har skickat ett nytt verifieringsmejl till **%1$s**, kolla både din inkorg och skräppostmapp.</string>
     <string name="verification_email_error_body">Det gick inte skicka ett verifieringsmejl till dig. Prova igen senare eller kontakta support.</string>
@@ -3502,8 +3432,6 @@ För att fortsätta använda Discord, **behöver vi verifiera att du är en män
     <string name="verify_phone">Verifiera telefonen</string>
     <string name="verifying">Verifierar</string>
     <string name="video_call">Videosamtal</string>
-    <string name="video_poor_connection_body">Videon har inaktiverats och återupptas när anslutningen har förbättrats.</string>
-    <string name="video_poor_connection_title">Dålig anslutning</string>
     <string name="video_preview">Videoförhandsgranskning</string>
     <string name="video_settings">Videoinställningar</string>
     <string name="video_unavailable">Video otillgänglig</string>
diff --git a/com.discord/res/values-th/plurals.xml b/com.discord/res/values-th/plurals.xml
index 9f85afa20d..de4ed27c73 100644
--- a/com.discord/res/values-th/plurals.xml
+++ b/com.discord/res/values-th/plurals.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <plurals name="application_progress_indicator_installing_hours_timeRemaining">
-        <item quantity="other">%d ชั่วโมง</item>
-        <item quantity="one">%d ชั่วโมง</item>
-    </plurals>
     <plurals name="application_progress_indicator_installing_minutes_timeRemaining">
         <item quantity="other">%d นาที</item>
         <item quantity="one">%d นาที</item>
@@ -195,24 +191,10 @@
         <item quantity="other">คุณต้องเลือกสมาชิกออก %d คน</item>
         <item quantity="one">คุณต้องเลือกสมาชิกออก 1 คน</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_permission_overrides_denied_count">
-        <item quantity="other">สิทธิ์</item>
-        <item quantity="one">สิทธิ์</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_channel_permission_overrides_granted_count">
         <item quantity="other">สิทธิ์</item>
         <item quantity="one">สิทธิ์</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">ตั้งโหมดช้าเป็น **!!%d!! วินาที**</item>
-        <item quantity="zero">ปิดการใช้งานโหมดช้า</item>
-        <item quantity="one">ตั้งโหมดช้าเป็น **1 วินาที**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">ตั้งโหมดช้าเป็น **!!%d!! วินาที**</item>
-        <item quantity="zero">ปิดการใช้งานโหมดช้า</item>
-        <item quantity="one">ตั้งโหมดช้าเป็น **1 วินาที**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! สมาชิก**</item>
         <item quantity="one">**สมาชิก**</item>
@@ -233,10 +215,6 @@
         <item quantity="other">**!!%d!! ข้อความ**</item>
         <item quantity="one">**ข้อความ**</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_role_permissions_denied_count">
-        <item quantity="other">สิทธิต่าง ๆ</item>
-        <item quantity="one">สิทธิ</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_role_permissions_granted_count">
         <item quantity="other">สิทธิต่าง ๆ</item>
         <item quantity="one">สิทธิ</item>
@@ -312,10 +290,6 @@
         <item quantity="other">%d ข้อความใหม่</item>
         <item quantity="one">1 ข้อความใหม่</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d วัน</item>
-        <item quantity="one">หนึ่งวัน</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d ช่อง</item>
         <item quantity="one">%d ช่อง</item>
@@ -333,10 +307,6 @@
         <item quantity="other">ข้อความเหล่านี้</item>
         <item quantity="one">ข้อความนี้</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** ไม่พร้อมใช้งานเพราะเซิร์ฟเวอร์ดับไปชั่วคราว</item>
-        <item quantity="one">**1** ไม่พร้อมใช้งานเนื่องจากเซิร์ฟเวอร์ดับไปชั่วคราว</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d เดือน</item>
         <item quantity="one">1 เดือน</item>
diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml
index 04d69b6f16..23bc7e6034 100644
--- a/com.discord/res/values-th/strings.xml
+++ b/com.discord/res/values-th/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"คุณไม่สามารถส่งคำเชิญได้เนื่องจากคุณกำลังล่องหนอยู่หรือคุณซ่อนสถานะว่ากำลังเล่นอยู่ ถ้าคุณไม่อยากจะเปลี่ยน
 การตั้งค่า คุณสามารถให้คนอื่นเป็นคนชวนคุณแทนก็ได้"</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">เข้าใจแล้ว!</string>
-    <string name="activity_panel_go_live_hotspot_header">ถ่ายทอดสดการเล่นเกมให้กับเพื่อนโดยตรง!</string>
+    <string name="activity_panel_go_live_hotspot_header">ใช้ Go Live เพื่อสตรีมการเล่นเกมให้กับเพื่อนโดยตรง!</string>
     <string name="activity_panel_go_live_tooltip">เริ่มถ่ายทอดสด</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">เซิร์ฟเวอร์นี้ไม่มีช่องสำหรับพูดให้ถ่ายทอดสด</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">คุณไม่สามารถถ่ายทอดสดไปยังช่องสำหรับพูดนี้ได้</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">นำทางไปที่เซิร์ฟเวอร์เพื่อเริ่มกาาถ่ายทอดสด</string>
     <string name="add">เพิ่ม</string>
     <string name="add_a_comment_optional">เพิ่มความเห็น (ถ้าต้องการ)</string>
@@ -99,7 +97,6 @@
     <string name="add_friend_nearby_looking">กำลังสแกนสัญญาณหาเพื่อน ตรวจว่าเพื่อนของคุณอยู่ที่หน้าจอนี้และกำลังใช้ nearby เช่นกัน</string>
     <string name="add_friend_nearby_stopped">การเชื่อมต่อ Nearby ถูกปิด</string>
     <string name="add_friend_no_capitalization">ชื่อผู้ใช้นั้นต้องพิมพ์อักษรเล็กใหญ่ให้ถูกและต้องมีเลขแท็ก</string>
-    <string name="add_friend_not_found">เราค้นหาคนที่ใช้ DiscordTag นี้ไม่ได้.</string>
     <string name="add_friend_placeholder">ใส่ DiscordTag#0000</string>
     <string name="add_friend_search">ค้นหา</string>
     <string name="add_friend_self">คุณเล่นกับตัวเองไม่ได้นะ</string>
@@ -158,7 +155,6 @@
     <string name="application_entitlement_code_redemption_confirmation_title">สำเร็จแล้ว!</string>
     <string name="application_entitlement_code_redemption_go_to_library">ไปที่ไลบรารี</string>
     <string name="application_entitlement_code_redemption_invalid">โค้ดที่กรอกไม่ถูกต้อง</string>
-    <string name="application_entitlement_code_redemption_prompt">ได้รับโค้ดเกมเหรอ? กรอกที่ด้านล่างนี้เลย:</string>
     <string name="application_entitlement_code_redemption_redeem">แลกใช้</string>
     <string name="application_filter_name_linux">ไฟล์ทั้งหมด</string>
     <string name="application_filter_name_macos">ใบสมัคร</string>
@@ -171,7 +167,6 @@
     <string name="application_installation_modal_premium_title">ติดตั้งเกม Nitro</string>
     <string name="application_installation_modal_select_directory">เลือกไดเรกทอรี</string>
     <string name="application_installation_modal_title">ติดตั้งเกม</string>
-    <string name="application_installation_space_used">ใช้เนื้อที่ดิสก์ไป %1$s</string>
     <string name="application_library_empty_search_description">เราค้นหาแบบทั้งกว้างและขวางแล้ว แต่เราไม่พบเกมที่ตรงกับคำค้นหา **%1$s**</string>
     <string name="application_library_empty_state_description_import">อืม…ดูเหมือนว่าเราไม่พบเกมอะไรเลย ซื้อหรือเล่นเกม แล้วเกมจะมาแสดงที่นี่!</string>
     <string name="application_library_empty_state_description_import_ask">Discord สามารถแสดงและเปิดเกมส่วนใหญ่ที่คุณเป็นเจ้าของได้ โดยไม่คำนึงว่าเกมได้มาจากไหน</string>
@@ -186,7 +181,6 @@
     <string name="application_library_remove_confirm_header">ซ่อนจากไลบรารี</string>
     <string name="application_library_wumpus_alt">วูมปัสไม่มีเกมให้เล่นเลย!</string>
     <string name="application_progress_indicator_installing">กำลังดาวน์โหลด %1$s</string>
-    <string name="application_progress_indicator_installing_hours">กำลังดาวน์โหลด — จาก %1$s (%%) — เหลืออีก %2$s</string>
     <string name="application_progress_indicator_installing_minutes">กำลังดาวน์โหลด — จาก %1$s (%%) — เหลืออีก %2$s</string>
     <string name="application_progress_indicator_installing_seconds">กำลังดาวน์โหลด — จาก %1$s (%%) — %2$s</string>
     <string name="application_progress_indicator_paused">พักแล้ว</string>
@@ -412,7 +406,6 @@
     <string name="application_store_view_all_news">ดูข่าวสารทั้งหมด</string>
     <string name="application_store_warning_dlc_requires_base_application_description">การจะเล่น DLC นี้ คุณจะต้องมี %1$s บน Discord ก่อนจึงจะเล่นได้ [เรียนรู้เพิ่มเติมเกี่ยวกับ DLC] (%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">เนื้อหาดาวน์โหลดได้</string>
-    <string name="application_store_warning_early_access_description">ให้ข้อเสนอแนะและช่วยเหล่าผู้พัฒนาสร้างเกมที่คุณอยากจะเล่น!! อยู่ในระหว่างพัฒนา [เรียนรู้เพิ่มเติมเกี่ยวกับเกมระหว่างการพัฒนา](%1$s)</string>
     <string name="application_store_warning_early_access_title">สิทธิเล่นก่อน</string>
     <string name="application_store_warning_requires_desktop_app_description">ในการจะเล่นเกมนี้คุณจะต้องติดตั้ง Discord $[แอปเดสก์ท็อป](downloadHook)</string>
     <string name="application_store_warning_requires_desktop_app_title">ต้องใช้แอปเดสก์ท็อป</string>
@@ -432,7 +425,6 @@
     <string name="applications_and_connections">แอป และการเชื่อมต่อ</string>
     <string name="applications_and_connections_body">นี่คือแอปทั้งหมดที่กำลังทำสิ่งแจ๋ว ๆทำให้ Discord ยิ่งแจ๋วเข้าไปใหญ่ แต่ถ้าแจ๋วเกินจ๊าบ คุณสามารถเอาออกเมื่อไหร่ก็ได้</string>
     <string name="attach_files">แนบไฟล์</string>
-    <string name="attachment_filename_unknown">ไม่รู้จัก</string>
     <string name="attachment_load_failed">ไฟล์ที่แนบโหลดไม่สำเร็จ</string>
     <string name="attachment_processing">กำลังประมวลผล…</string>
     <string name="attenuate_while_speaking_others">เมื่อคนอื่นพูด</string>
@@ -536,7 +528,6 @@
     <string name="billing_error_section_card">โอะโอ! ดูเหมือนบัตรนี้จะมีปัญหา โปรดแก้ไขข้อมูลในช่อง แล้วลองอีกครั้ง!</string>
     <string name="billing_history">ประวัติการจ่ายเงิน</string>
     <string name="billing_legal_mumbo_jumbo">เรื่องกฎหมายแสนยุ่งยาก</string>
-    <string name="billing_legal_mumbo_jumbo_label">ฉันยอมรับ [ข้อตกลงการใช้ร้านค้า Discord](%1$s)</string>
     <string name="billing_no_payment_method">ไม่ได้บันทึกวิธีการชำระเงิน</string>
     <string name="billing_no_payment_method_description">เช็คเอาท์รวดเร็วขึ้นเมื่อบันทึกวิธีการชำระเงิน</string>
     <string name="billing_pay_for_it_with">จ่ายด้วย</string>
@@ -544,8 +535,6 @@
     <string name="billing_payment_breakdown_total">ยอดรวม</string>
     <string name="billing_payment_history">ประวัติธุรกรรม</string>
     <string name="billing_payment_premium">การเป็นสมาชิกของฉัน</string>
-    <string name="billing_payment_premium_legalese_monthly">เมื่อซื้อการเป็นสมาชิก %1$s หมายความว่าคุณยอมรับ [ข้อตกลงการใช้งานร้านค้า] ของเรา(%2$s) %1$s เป็นการสมัครเป็นสมาชิกแบบต่อเนื่องโดยอัตโนมัติ คุณมอบอำนาจให้ Discord หักค่าใช้จ่ายทันทีตามวิธีการชำระเงินที่ให้ไว้เป็นจำนวน %3$s อย่างต่อเนื่องเป็นรายเดือนโดยอัตโนมัติจนกว่าจะมีการยกเลิก คุณสามารถยกเลิกได้ตลอดเวลา</string>
-    <string name="billing_payment_premium_legalese_yearly">เมื่อซื้อการเป็นสมาชิก %1$s หมายความว่าคุณยอมรับ [ข้อตกลงการใช้งานร้านค้า] ของเรา(%2$s) %1$s เป็นการสมัครเป็นสมาชิกแบบต่อเนื่องโดยอัตโนมัติ คุณมอบอำนาจให้ Discord หักค่าใช้จ่ายทันทีตามวิธีการชำระเงินที่ให้ไว้เป็นจำนวน %3$s อย่างต่อเนื่องเป็นรายปีโดยอัตโนมัติจนกว่าจะมีการยกเลิก คุณสามารถยกเลิกได้ตลอดเวลา</string>
     <string name="billing_payment_sources">วิธีการชำระเงิน</string>
     <string name="billing_premium_refund_text">สามารถขอค่าทดแทนได้ถ้าซื้อภายในระยะเวลา %1$s วัน [ฝ่ายช่วยเหลือผู้น่ารักของเราจะช่วยให้คุณได้เหรียญทองของคุณกลับคืนมาเอง] (%2$s)</string>
     <string name="billing_premium_refund_text_unable">ขออภัย การซื้อนี้ไม่มีสิทธิขอคืนเงิน สามารถขอค่าทดแทนได้ถ้าซื้อภายในระยะเวลา %1$s วัน</string>
@@ -841,7 +830,7 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="create_category">สร้างหมวดหมู่</string>
     <string name="create_channel">สร้างช่องใหม่</string>
     <string name="create_group_dm">สร้างกลุ่ม DM ใหม่</string>
-    <string name="create_instant_invite">สร้างคำเชิญด่วน</string>
+    <string name="create_instant_invite">สร้างคำเชิญ</string>
     <string name="create_link">สร้างลิงก์</string>
     <string name="create_or_join_modal_header">ห๊ะ อีกเซิร์ฟเรอะ?</string>
     <string name="create_server_button_body">สร้างเซิร์ฟเวอร์ใหม่และชวนเพื่อนๆ เข้ามาสิ ฟรี!</string>
@@ -971,7 +960,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="discord_desc_long">แชทฟรีและปลอดภัยสำหรับการเล่นเกม ทำงานบนเดสก์ท็อปและโทรศัพท์ของคุณ</string>
     <string name="discord_desc_short">พูดคุยกันในทีม &amp; แชทข้อความ</string>
     <string name="dismiss">ปลดออก</string>
-    <string name="dispatch_error_modal_body">มีบางอย่างผิดปกติ หากปัญหายังคงอยู่ ให้สร้างตั๋วสนับสนุนและคัดลอกเนื้อหาข้อความด้านล่าง</string>
     <string name="dispatch_error_modal_error_label">ข้อความข้อผิดพลาด (คัดลอกและวางสิ)</string>
     <string name="dispatch_error_modal_header">ข้อผิดพลาด Discord Dispatch</string>
     <string name="dispatch_error_modal_open_ticket">เปิดตั๋ว</string>
@@ -997,7 +985,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="download_failed">ดาวน์โหลดไม่สำเร็จ</string>
     <string name="download_file_complete">%1$s ดาวน์โหลดเรียบร้อย</string>
     <string name="download_mobile_modal_apps_header">ดาวน์โหลดแอป Discord สำหรับมือถือ</string>
-    <string name="download_mobile_title">หรือสำหรับใช้งานนอกบ้าน</string>
     <string name="duration_days">%1$s</string>
     <string name="duration_hours">%1$s</string>
     <string name="duration_mins">%1$s</string>
@@ -1108,30 +1095,18 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="form_help_channel_permissions">การเลือกบทบาทจะเป็นการตั้งค่าสิทธิพื้นฐานแบบอัตโนมัติสำหรับช่องนี้</string>
     <string name="form_help_custom_code">ใช้ตัวอักษรและตัวเลขใดก็ได้เป็นรหัส</string>
     <string name="form_help_debug_logging">บันทึกการดีบักไว้ในแฟ้มโมดูลเสียง คุณจะได้สามารถส่งมาให้เราเพื่อซ่อมแซมได้</string>
-    <string name="form_help_default_notification_settings">"นี่จะเป็นการกำหนดว่า สมาชิกคนใดที่ยังไม่ได้ตั้งค่ารับแจ้งเตือนของตนเอง จะได้รับการแจ้งเตือน
-สำหรับทุกข้อความที่ส่งในเซิร์ฟเวอร์นี้หรือไม่ **เราแนะนำเป็นอย่างยิ่งให้การตั้งค่านี้เป็นเฉพาะ @กล่าวถึง สำหรับ Discord
-สาธารณะ เพื่อหลีกเลี่ยง [เหตุการณ์แบบนี้](%1$s)**"</string>
-    <string name="form_help_default_notification_settings_mobile">"นี่จะเป็นการกำหนดว่า สมาชิกคนใดที่ยังไม่ได้ตั้งค่ารับแจ้งเตือนของตนเอง จะได้รับการแจ้งเตือน
-สำหรับทุกข้อความที่ส่งในเซิร์ฟเวอร์นี้หรือไม่ เราแนะนำเป็นอย่างยิ่งให้การตั้งค่านี้เป็นเฉพาะ @กล่าวถึง สำหรับ Discordสาธารณะ"</string>
     <string name="form_help_explicit_content_filter">"สแกนและลบข้อความที่ไม่เหมาะสมโดยอัตโนมัติ โปรดเลือกขอบเขตของ
 การคัดกรองที่จะใช้กับสมาชิกในเซิร์ฟเวอร์ของคุณ **เราขอแนะนำให้ตั้งค่าการคัดกรองสำหรับเซิร์ฟเวอร์ Discord สาธารณะ**"</string>
-    <string name="form_help_instant_invite_channel">"widget นี้จะสร้างการเชิญทันทีให้โดยอัตโนมัติถ้าได้มีการเลือกช่องไว้
- แต่หากไม่ได้เลือกไว้จะแสดงแค่สมาชิกที่ออนไลน์อยู่ และช่องสำหรับพูดคุยเท่านั้น"</string>
     <string name="form_help_legacy_subsystem">"โปรแกรมควบคุมฮาร์ดแวร์เสียงบางอย่างแสดงปัญหาเมื่อใช้ระบบเสียงย่อยที่ทันสมัยของระบบปฏิบัติการของคุณ 
 เลือกช่องนี้เพื่อย้อนกลับไปเป็นระบบย่อยเสียงดั้งเดิม"</string>
     <string name="form_help_nsfw">"ผู้ใช้ต้องยืนยันว่าพวกเขาอายุเกินที่กฎหมายกำหนดดูเนื้อหาในช่องนี้
 ช่อง NSFW สามารถแสดงเนื้อหาที่ปกติจะถูกฟิลเตอร์เนื้อหาอนาจารปิด"</string>
-    <string name="form_help_premade_widget">"ฝัง HTML นี้ไปยังเว็บไซต์ของคุณเพื่อใช้ widget ที่สวยงามของ Discord หากคุณมีสิทธิ์เข้าถึง\\nผู้ใช้เว็ปไซต์ของคุณได้ คุณสามารถ
-เพิ่ม &amp;username= ใน querystring ได้โดยตรง"</string>
     <string name="form_help_qos">"คำแนะนำ Discord ต้องการความเร็วในการรับส่งข้อมูลสูง 
 เราเตอร์หรือผู้ให้บริการอินเตอร์เน็ทบางรายอาจไม่เสถียรพอสำหรับการตั้งต่า"</string>
     <string name="form_help_slowmode">สมาชิกจะถูกจำกัดให้ส่งข้อความได้แค่หนึ่งข้อความต่อช่วง ยกเว้นว่าจะมีสิทธิจัดการช่องหรือจัดการข้อความ</string>
     <string name="form_help_temporary">สมาชิกจะถูกเตะโดยอัตโนมัติเมื่อพวกเขาตัดการเชื่อมต่อ ยกเว้นแต่ว่าพวกเขาจะมีตำแหน่งในช่อง</string>
     <string name="form_help_user_limit">"การจำกัดจำนวนของผู้ใช้งานที่สามารถเชื่อมต่อกับช่องพูดคุยนี้ ผู้ใช้ที่มีสิทธิในการ **ย้ายสมาชิก**
 จะละเว้นข้อจำกัดนี้และสามารถย้ายผู้ใช้อื่นไปยังช่องได้"</string>
-    <string name="form_help_verification_level">"สมาชิกของเซิฟเวอร์ต้องทำตามเกณฑ์ที่ให้ไว้ก่อนจะสามารถส่งข้อความใน
-ช่องข้อความหรือก่อนจะเริ่มการสนทนาโดยตรงได้ ถ้าสมาชิกมีตำแหน่งที่กำหนดจะไม่เป็นผล
-**ขอแนะนำให้ตั้งระดับการยืนยันเป็นสำหรับช่อง Discord สาธารณะ**"</string>
     <string name="form_label_afk_channel">ช่อง AFK (ไม่อยู่)</string>
     <string name="form_label_afk_timeout">เวลา AFK (ไม่อยู่)</string>
     <string name="form_label_all">ทั้งหมด</string>
@@ -1170,8 +1145,8 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="form_label_input_mode">โหมดรับข้อมูล</string>
     <string name="form_label_input_sensitivty">ความไวของไมค์</string>
     <string name="form_label_input_volume">ระดับเสียงขาเข้า</string>
-    <string name="form_label_instant_invite">ใส่คำเชิญทันที</string>
-    <string name="form_label_instant_invite_channel">ช่องเชิญทันที</string>
+    <string name="form_label_instant_invite">ใส่คำเชิญ</string>
+    <string name="form_label_instant_invite_channel">ช่องคำเชิญ</string>
     <string name="form_label_last_seen">เห็นล่าสุด</string>
     <string name="form_label_local_mute">ดับไมค์ในเครื่อง</string>
     <string name="form_label_max_age">หมดอายุหลังจาก</string>
@@ -1245,7 +1220,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="form_label_user_limit">จำกัดผู้ใช้</string>
     <string name="form_label_username">ชื่อผู้ใช้</string>
     <string name="form_label_username_mobile">เลือกชื่อผู้ใช้</string>
-    <string name="form_label_verification_level">ระดับการยืนยัน</string>
     <string name="form_label_video_device">กล้อง</string>
     <string name="form_label_video_preview">แสดงตัวอย่าง</string>
     <string name="form_label_voice_diagnostics">ประเมินระบบเสียง</string>
@@ -1301,7 +1275,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="game_action_button_game_not_detected">ไม่พบเกม</string>
     <string name="game_action_button_install">ติดตั้ง</string>
     <string name="game_action_button_locate">หาตำแหน่ง</string>
-    <string name="game_action_button_login_to_buy">เข้าสู่ระบบเพื่อซื้อ</string>
     <string name="game_action_button_now_playing">กำลังเล่น</string>
     <string name="game_action_button_paused">พักแล้ว</string>
     <string name="game_action_button_play">เล่น</string>
@@ -1409,6 +1382,7 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="generate_a_new_link">สร้างลิงก์ใหม่</string>
     <string name="get_started">เริ่มต้นใช้งาน</string>
     <string name="gif_auto_play_label">เล่น GIFs โดยอัตโนมัติเมื่อผู้ใช้สนใจ Discord</string>
+    <string name="go_live_hardware_acceleration_unavailable">ขอแจ้งข้อมูล เราตรวจหาการเร่งความเร็วของฮาร์ดแวร์ไม่พบ คอมพิวเตอร์ของคุณอาจมีปัญหาในการรองรับ Go Live</string>
     <string name="go_live_hey">เฮ่!</string>
     <string name="go_live_listen">ฟังสิ!</string>
     <string name="go_live_look">ดูสิ!</string>
@@ -1422,6 +1396,7 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="go_live_modal_select_channel_form_title">เลือกช่องสำหรับพูดคุย</string>
     <string name="go_live_modal_select_channel_placeholder">ค้นหาช่องสำหรับพูด</string>
     <string name="go_live_modal_title">เริ่มถ่ายทอดสด</string>
+    <string name="go_live_video_drivers_outdated">ไดรเวอร์วิดีโอของคุณล้าสมัย โปรดอัปเดตเพื่อให้ Go Live ประสิทธิภาพที่ดีขึ้น</string>
     <string name="grant_temporary_membership">ให้สิทธิสมาชิกชั่วคราว</string>
     <string name="group">กลุ่ม</string>
     <string name="group_dm_add_friends">เพิ่มเพื่อนไปยังข้อความโดยตรง</string>
@@ -1494,12 +1469,9 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="guild_settings_audit_log_channel_overwrite_delete">$[**%1$s**](userHook) ลบการแทนที่ช่องสำหรับ $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_overwrite_update">$[**%1$s**](userHook) ได้อัพเดทการแทนที่ช่องสำหรับ $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_create">แทนที่โดยมีสิทธิ</string>
-    <string name="guild_settings_audit_log_channel_permission_overrides_denied">**ปฏิเสธ** %1$s สำหรับ **%2$s**แล้ว</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**ให้** %1$s สำหรับ **%2$s**แล้ว</string>
     <string name="guild_settings_audit_log_channel_position_change">ย้ายจาก **%1$s** เป็น **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">ในตำแหน่ง **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) สร้างช่องข้อความ $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">เปลี่ยนหัวข้อเป็น **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">ตั้งหัวข้อเป็น **%1$s**</string>
@@ -1573,7 +1545,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="guild_settings_audit_log_role_mentionable_on">สามารถกล่าวถึงได้</string>
     <string name="guild_settings_audit_log_role_name_change">เปลี่ยนชื่อจาก **%1$s** เป็น **%2$s**</string>
     <string name="guild_settings_audit_log_role_name_create">ในนามว่า **%1$s**</string>
-    <string name="guild_settings_audit_log_role_permissions_denied">**ปฏิเสธ**%1$s</string>
     <string name="guild_settings_audit_log_role_permissions_granted">**เพิ่ม**%1$s</string>
     <string name="guild_settings_audit_log_role_update">$[**%1$s**](userHook) อัปเดตบทบาท $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_time_at_android">%1$s ที่ %2$s</string>
@@ -1594,6 +1565,8 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="guild_settings_filter_all_actions">การกระทำทั้งหมด</string>
     <string name="guild_settings_filter_all_users">ผู้ใช้ทั้งหมด</string>
     <string name="guild_settings_filter_user">กรองโดยผู้ใช้</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">สตรีม Go Live 720p 60fps</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">สตรีม Go Live 1080p 60fps</string>
     <string name="guild_settings_label_audit_log">ตรวจสอบบันทึก</string>
     <string name="guild_settings_label_audit_log_empty_body">เมื่อมีผู้ดูแลเริ่มต้นทำงานแล้ว คุณสามารถควบคุมการดูแลได้จากที่นี่</string>
     <string name="guild_settings_label_audit_log_empty_title">ยังไม่มีการบันทึก</string>
@@ -1625,7 +1598,7 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="help_role_locked_mine">ตำแหน่งถูกล็อกเพราะว่าตำแหน่งนี้คือตำแหน่งที่สูงที่สุดของคุณ กรุณาขอความช่วยเหลือจากคนที่มียศสูงกว่าหรือเจ้าของเซิฟเวอร์</string>
     <string name="help_singular_permission">คุณไม่สามารถแก้ไขสิทธิ์นี้ได้เนื่องจากการเอามันออกจะเอามันออกจากคุณด้วย</string>
     <string name="hide_instant_invites_description">แนะนำถ้าหากคุณไม่ต้องการให้คนแแปลกหน้าเข้าถึงเซิร์ฟเวอร์ Discord ของคุณ</string>
-    <string name="hide_instant_invites_label">ซ่อนลิงก์คำเชิญทันที</string>
+    <string name="hide_instant_invites_label">ซ่อนลิงก์คำเชิญ</string>
     <string name="hide_muted">ซ่อน %1$s ผู้ถูกปิดเสียง</string>
     <string name="hide_muted_channels">ซ่อนช่องที่ปิดแจ้งเตือน</string>
     <string name="hide_personal_information_description">ซ่อนอีเมล์ การเชื่อมต่อบัญชี บันทึกย่อ และไม่เปิดเผย DiscordTags</string>
@@ -1672,7 +1645,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="hypesquad_question_11_response_d">แนะนำให้ Wumpus เล่นแทมโบรินแทน</string>
     <string name="hypesquad_question_12_prompt">คุณปีนไต่มาจนถึงยอดของเขาที่สูงสุดในโลกแล้ว สิ่งเดียวที่กั้นระหว่างคุณกับสมบัติคือมังกรสามหัวแห่งหอคอย คุณ</string>
     <string name="hypesquad_question_12_response_a">บุกตะลุยเข้าไป พร้อมสู้ยิบตา</string>
-    <string name="hypesquad_question_12_response_b">ศึกษาท่วงท่าของก็อดซิลล่าในการต่อสู้กับคิงกิโดราในหนังก็อดซิลล่าเก่า ๆ</string>
     <string name="hypesquad_question_12_response_c">พยายามโน้มน้าวให้มังกรแบ่งสมบัติกับคุณ</string>
     <string name="hypesquad_question_12_response_d">เสนอจะยกตุ๊กตา Wumpus ให้มังกร ทุก ๆ คนอยากได้ตุ๊กตากันทั้งนั้น</string>
     <string name="hypesquad_question_13_prompt">นั่นเสียงอะไรน่ะ</string>
@@ -1775,14 +1747,14 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="input_mode_ptt_release_delay">ดีเลย์ปล่อย กดเพื่อพูดคุย</string>
     <string name="input_mode_vad">ตรวจจับเสียง</string>
     <string name="install_location_main">หลัก</string>
-    <string name="instant_invite">คำเชิญทันที</string>
+    <string name="instant_invite">เชิญ</string>
     <string name="instant_invite_accept">ตอบรับการเชิญชวน</string>
-    <string name="instant_invite_accepted">รับคำเชิญทันทีแล้ว</string>
-    <string name="instant_invite_accepting">กำลังรับคำเชิญทันที</string>
+    <string name="instant_invite_accepted">ตอบรับคำเชิญแล้ว</string>
+    <string name="instant_invite_accepting">กำลังตอบรับคำเชิญ</string>
     <string name="instant_invite_ask_for_new_invite">ขอคำเชิญใหม่</string>
     <string name="instant_invite_ask_user_for_new_invite">ติดต่อ %1$s เพื่อขอคำเชิญใหม่</string>
     <string name="instant_invite_code">รหัส</string>
-    <string name="instant_invite_expired">คำเชิญทันทีใช้งานไม่ได้แล้ว หรือหมดอายุ</string>
+    <string name="instant_invite_expired">คำเชิญใช้งานไม่ได้แล้ว หรือหมดอายุ</string>
     <string name="instant_invite_expires">หมดอายุ</string>
     <string name="instant_invite_failed_to_generate">สร้างลิงก์คำเชิญไม่สำเร็จ</string>
     <string name="instant_invite_generate">สร้าง</string>
@@ -1801,13 +1773,13 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="instant_invite_regenerate">สร้างใหม่</string>
     <string name="instant_invite_resolved_body">คุณได้รับเชิญเข้ามาในช่อง **%1$s** ใน **%2$s**</string>
     <string name="instant_invite_resolved_title">เฮ้ สวัสดี!</string>
-    <string name="instant_invite_resolving">กำลังดำเนินการรับคำเชิญทันที</string>
+    <string name="instant_invite_resolving">จัดการคำเชิญ</string>
     <string name="instant_invite_uses">จำนวนครั้งที่ใช้ได้</string>
     <string name="instant_invite_you_are_already_a_member_of">คุณเป็นสมาชิกของ อยู่แล้ว</string>
     <string name="instant_invite_you_have_been_invited_to_join">คุณถูกเชิญให้เข้าร่วม</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** ได้เชิญคุณให้เข้าร่วม</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">คุณได้รับเชิญให้เข้าร่วมกลุ่มส่งข้อความส่วนตัวโดย</string>
-    <string name="instant_invites">คำเชิญทันที</string>
+    <string name="instant_invites">คำเชิญ</string>
     <string name="integration_settings">ตั้งค่าการรวบรวม</string>
     <string name="integrations">การรวม</string>
     <string name="integrations_pro_tip">สำหรับการเชื่อมต่ออื่นๆ ลองดู [StreamKit ของ Discord](%1$s)</string>
@@ -1922,13 +1894,13 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="join_afk_channel_body">ดูเหมือนคุณได้เข้าร่วมช่อง AFK คุณไม่สามารถพูดในช่องนี้</string>
     <string name="join_call">เข้าร่วมสาย</string>
     <string name="join_server">เข้าร่วม</string>
-    <string name="join_server_button_body">ใส่คำเชิญทันทีเพื่อเข้าร่วมเซิร์ฟเวอร์ของเพื่อน</string>
+    <string name="join_server_button_body">ใส่คำเชิญเพื่อเข้าร่วมเซิร์ฟเวอร์ของเพื่อน</string>
     <string name="join_server_button_cta">เข้าร่วมเซิร์ฟเวอร์</string>
     <string name="join_server_button_cta_mobile">เข้าร่วมเซิร์ฟเวอร์ด้วยลิงก์เชิญ</string>
     <string name="join_server_button_cta_mobile_desc">มีรหัสเชิญหรือลิงก์คำเชิญหรือไม่? ใช้ที่นี่!</string>
     <string name="join_server_button_cta_named">เข้าร่วม %1$s</string>
-    <string name="join_server_description">ใส่คำเชิญทันทีด้านล่างเพื่อเข้าเซิร์ฟเวอร์ที่มีอยู่แล้ว คำเชิญ จะมีหน้าตาประมาณนี้:</string>
-    <string name="join_server_description_mobile">ใส่คำเชิญทันทีข้างบนเพื่อเข้าร่วมเซิร์ฟเวอร์ที่มีอยู่แล้ว</string>
+    <string name="join_server_description">ใส่คำเชิญด้านล่างเพื่อเข้าร่วมเซิร์ฟเวอร์ที่มีอยู่แล้ว คำเชิญจะมีลักษณะเช่นนี้</string>
+    <string name="join_server_description_mobile">ใส่คำเชิญข้างบนเพื่อเข้าร่วมเซิร์ฟเวอร์ที่มีอยู่แล้ว</string>
     <string name="join_server_title">เข้าร่วมเซิร์ฟเวอร์</string>
     <string name="join_stream">เข้าร่วมการถ่ายทอดสด</string>
     <string name="join_video_call">เข้าร่วมวิดีโอคอล</string>
@@ -1986,7 +1958,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="keybind_description_toggle_streamer_mode">กดเพื่อปิด/เปิดโหมดสตรีมเมอร์</string>
     <string name="keybind_description_toggle_voice_mode">กดเพื่อเปลี่ยนระหว่างโหมดกดเพื่อพูดคุยและตรวจจับเสียง</string>
     <string name="keybind_description_unassigned">การกระทำนี้ไม่ได้ทำอะไร! โปรดเลือกจากแบบเลื่อนลง</string>
-    <string name="keybind_push_to_mute">กดเพื่อปิดไมค์</string>
     <string name="keybind_push_to_talk">กดเพื่อพูดคุย (ปกติ)</string>
     <string name="keybind_push_to_talk_priority">กดเพื่อพูดคุย (ลำดับสูง)</string>
     <string name="keybind_toggle_deafen">เปิด/ปิด การได้ยิน</string>
@@ -2036,7 +2007,7 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="link_your_xbox_account_2">Discord เป็นแอปแชทด้วยเสียง ข้อความ และวิดีโอสำหรับนักเล่นเกมที่ฟรี ปลอดภัย และครอบคลุมทั้งในเดสก์ท็อปและโทรศัพท์</string>
     <string name="listening_to">กำลังฟัง **%1$s**</string>
     <string name="live">ถ่ายทอดสด</string>
-    <string name="live_beta_description">ยินดีต้อนรับสู่การถ่ายทอดสด! Go Live อยู่ในสถานะเบต้า ขออภัยหากมีสิ่งใดที่ยังติดขัด</string>
+    <string name="live_beta_description">ยินดีต้อนรับสู่การสตรีม! Go Live เป็นเวอร์ชันเบต้า ขออภัยหากมีสิ่งใดที่ยังติดขัด</string>
     <string name="live_on_twitch">สดบน Twitch</string>
     <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"ไม่สามารถโหลดภาพได้
@@ -2054,7 +2025,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="lt">ลิธัวเนีย</string>
     <string name="manage_channel">จัดการช่อง</string>
     <string name="manage_channel_description">สมาชิกที่มีสิทธิ์นี้สามารถเปลี่ยนชื่อ หรือ ลบ ช่องได้</string>
-    <string name="manage_channels">จัดการช่อง</string>
     <string name="manage_channels_description">สมาชิกที่มีสิทธิ์นี้สามารถสร้างช่องใหม่และแก้ไขหรือลบช่องที่มีอยู่แล้ว</string>
     <string name="manage_emojis">จัดการอีโมจิ</string>
     <string name="manage_messages">จัดการข้อความ</string>
@@ -2222,13 +2192,11 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="no_emoji_title">ไม่มีอีโมจิ</string>
     <string name="no_input_devices">ไม่มีไมค์</string>
     <string name="no_input_devices_detected">ไม่พบอุปกรณ์นำเข้า กรุณาเชื่อมต่ออุปกรณ์อย่างน้อยหนึ่งอย่างแล้วลองอีกครั้ง</string>
-    <string name="no_instant_invite">ไม่มีคำเชิญทันที</string>
+    <string name="no_instant_invite">ไม่มีคำเชิญ</string>
     <string name="no_integrations_body">โพรโทคอล FR13NDSH1P สามารถดำเนินการจากไคลเอนต์เท่านั้น</string>
     <string name="no_integrations_label">ไม่รวบรวม</string>
-    <string name="no_invites_body">"รู้สึกโดดเดี่ยว? เหมือนเครื่องบินกระดาษที่บินอยู่บนฟ้า?
-ชวนเพื่อนมาที่นี่โดยการสร้างลิงก์คำเชิญทันทีสิ!"</string>
-    <string name="no_invites_caption">ยังไม่มีคำเชิญทันที!</string>
-    <string name="no_invites_label">ยังไม่มีคำเชิญทันที</string>
+    <string name="no_invites_caption">ยังไม่มีคำเชิญ!</string>
+    <string name="no_invites_label">ยังไม่มีคำเชิญ</string>
     <string name="no_mail_account_description">โปรดส่งคำติชมของคุณมาที่ support@discordapp.com เราจะจัดเก็บข้อมูลบัญชีผู้ใช้ของคุณเข้าคลิปบอร์ด</string>
     <string name="no_mail_account_title">ไม่มีบัญชี E-mail</string>
     <string name="no_mic_body">อ่านวิธีการเปิดสิทธิ์การใช้ไมค์ได้ที่ศูนย์การให้ความช่วยเหลือ Discord</string>
@@ -2267,7 +2235,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="notice_dispatch_error_disk_low">คุณมีพื้นที่ในฮาร์ดไดรฟ์ไม่พอ ต้องใช้ %1$s แต่มีให้ใช้ได้แค่ %2$s</string>
     <string name="notice_dispatch_error_file_name_too_long">แย่ละ ชื่อของไฟล์ของเกมนี้ยาวเกินไปสำหรับ Windows กรุณาเลือกที่อยู่สถานที่ติดตั้งไฟล์ใหม่ที่สั้นกว่านี้</string>
     <string name="notice_dispatch_error_invalid_drive">แย่ละ สถานที่ติดตั้งที่คุณเลือกไม่ถูกต้อง คุณเลือก %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">เราอัปเดตเกมนี้ไม่สำเร็จ โปรแกรมกำลังทำงานอยู่หรือไม่</string>
     <string name="notice_dispatch_error_no_manifests">แย่ละ ดูเหมือนเกมนี้จะไม่มีไฟล์ กรุณาติดต่อฝ่ายช่วยเหลือ</string>
     <string name="notice_dispatch_error_not_entitled">แย่ละ ดูเหมือนคุณจะไม่มีเกมนี้ กรุณาติดต่อฝ่ายช่วยเหลือถ้าคุณคิดว่านี่เป็นเพราะเกิดข้อผิดพลาด</string>
     <string name="notice_dispatch_error_post_install_cancelled">คุณตอบปฏิเสธการติดตั้งสคริปต์นี้ คุณต้องตอบตกลงเพื่อทำการติดตั้งเกม</string>
@@ -2282,9 +2249,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="notice_native_apps">ต้องการระบบเสียงแบบกดเพื่อพูดคุย? ดาวน์โหลดโปรแกรมเลยสิ!</string>
     <string name="notice_no_input_detected">อืม ดูเหมือนว่า Discord จะไม่ได้ยินเสียงจากไมค์ของคุณ เรามาซ่อมมันด้วยกันเถอะ</string>
     <string name="notice_no_input_detected_help_link_text">ช่วยเหลือ!</string>
-    <string name="notice_premium_applications_grandfathered_ended">สิทธิการใช้งาน Nitro ของคุณหมดอายุแล้ว อัปเกรดจาก Nitro Classic เป็น Nitro เพื่อเล่นเกมต่าง ๆ ได้ไม่จำกัด</string>
-    <string name="notice_premium_applications_grandfathered_ending">คุณเหลือเวลา %1$s ในการเล่นเกม Nitro! สิทธิการใช้งานของคุณจะหมดอายุวันที่ **%2$s**</string>
-    <string name="notice_premium_applications_grandfathered_started">ขอบคุณที่เป็นผู้สนับสนุน Nitro ก่อนคนอื่น เพื่อเป็นของขวัญให้ความสุดยอดของคุณ คุณสามารถเล่นเกมของ Nitro ได้จนกระทั่ง %1$s</string>
     <string name="notice_premium_promo_action">ลองดูสิ</string>
     <string name="notice_premium_promo_message">สนับสนุนการพัฒนาของ Discord และรับความสามารถพิเศษสนุกๆ!</string>
     <string name="notice_scheduled_maintenance">Discord จะทำการปรับปรุงระบบภายใน **%1$s** เวลา **%2$s**</string>
@@ -2358,7 +2322,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="nux_post_reg_join_server_skip">ฉันไม่มี</string>
     <string name="nux_post_reg_join_server_title">คุณได้รับคำเชิญหรือไม่</string>
     <string name="oauth2_connect_to_discord">เชื่อมต่อกับ Discord</string>
-    <string name="oauth2_insecure_notice">โปรแกรมนี้ **สามารถ**อ่าน และส่งข้อความในนามของคุณในขณะดำเนินการ</string>
     <string name="oauth2_insecure_read_notice">แอปพลิเคชันนี้ **สามารถ** อ่านได้แต่ **ไม่มีสิทธิ** ที่ส่งข้อความในนามของคุณขณะกำลังดำเนินการ</string>
     <string name="oauth2_label">โดยจะอนุญาตให้ %1$s ทำการ</string>
     <string name="oauth2_message_cta">คุณสามารถปิดแท็บหรือหน้าต่างนี้ได้</string>
@@ -2399,14 +2362,12 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="overlay_menu_get_invite">รับลิงก์คำเชิญ</string>
     <string name="overlay_menu_open_discord">เปิด Discord</string>
     <string name="overlay_menu_switch_channels">สลับช่อง</string>
-    <string name="overlay_mobile_toggle_desc">ดูว่าใครกำลังพูดและเข้าถึงทางลัดขณะกำลังใช้งานแอปอื่นเมื่อเชื่อมต่อไปยังช่องเสียง</string>
     <string name="overlay_mobile_toggle_label">เปิดใช้งาน Mobile Voice Overlay</string>
     <string name="overlay_news_go_live_body">ต้องการถ่ายทอดสด %1$s ให้เพื่อนของคุณใน %2$s หรือไม่?</string>
     <string name="overlay_news_go_live_cta">เริ่มถ่ายทอดสด</string>
     <string name="overlay_news_text_pinning_body">คุณสามารถปักหมุดแชทข้อความกับเกมของคุณได้แล้ว</string>
     <string name="overlay_news_text_pinning_tip">เคล็ดลับ คุณสามารถปักหมุดแชทได้โดยกด $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">อัปเกรดหน้าจอวางซ้อนใน Discord</string>
-    <string name="overlay_no_results">เราค้นหามาแล้วทุกหนทุกแห่ง โชคร้ายที่ไม่พบช่องสำหรับพูด</string>
     <string name="overlay_notification_incoming_call">มีสายโทรเข้า…</string>
     <string name="overlay_notification_settings_disabled">การแจ้งเตือนถูกระงับ</string>
     <string name="overlay_notification_settings_position">กำลังแสดง %1$s</string>
@@ -2416,7 +2377,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="overlay_notifications_settings">การแจ้งเตือนหน้าจอซ้อน</string>
     <string name="overlay_notifications_top_left">ซ้ายบน</string>
     <string name="overlay_notifications_top_right">ขวาบน</string>
-    <string name="overlay_private_channels_empty_state">ไม่มีข้อความส่วนตัว</string>
     <string name="overlay_reload">เปิดหน้าจอซ้อนใหม่</string>
     <string name="overlay_settings">ตั้งค่า Overlay</string>
     <string name="overlay_settings_general_tab">ทั่วไป</string>
@@ -2438,7 +2398,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="pagination_page_of">หน้า %1$s จาก %2$s</string>
     <string name="pagination_previous">ก่อน</string>
     <string name="paginator_of_pages">หน้า %1$s จาก %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Discord พาร์ทเนอร์</string>
     <string name="party_full">กลุ่มเต็ม</string>
     <string name="party_join">เข้าร่วมกลุ่ม</string>
@@ -2531,18 +2490,11 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="popout_stay_on_top">อยู่บนสุด</string>
     <string name="post_code">รหัสไปรษณีย์</string>
     <string name="premium_alert_error_title">อ่อย เกิดข้อผิดพลาด…</string>
-    <string name="premium_applications_grandfathered_monthly">เพื่อแทนคำขอบคุณที่ให้การสนับสนุน Discord เราขอมอบสิทธิ์การเข้าถึงเกม Nitro ให้คุณเป็นเวลาหนึ่งปี การเข้าถึงของคุณจบวันที่ **%1$s**</string>
-    <string name="premium_applications_grandfathered_yearly">เพื่อแทนคำขอบคุณที่ให้การสนับสนุน Discord เราขอมอบสิทธิ์การเข้าถึงเกม Nitro ให้คุณเป็นเวลาสองปี การเข้าถึงของคุณจบวันที่ **%1$s**</string>
-    <string name="premium_applications_subtitle">สิทธิเข้าถึงห้องสมุดเกมที่ได้รับคำวิจารณ์ว่าสุดยอดจำนวนมากมายซึ่งเราไม่อยากให้คุณหรือเพื่อนของคุณพลาด</string>
-    <string name="premium_applications_title">เกมที่รับคำแนะนำมากมาย ค่าใช้จ่ายรายเดือนสุดคุ้ม</string>
     <string name="premium_badge_tooltip">เป็นสมาชิกมาตั้งแต่ %1$s</string>
     <string name="premium_cancel_cancel">อย่าดีกว่า</string>
     <string name="premium_cancel_confirm_body_tier_1">"การยกเลิกมีผลเมื่อสิ้นสุดระยะเวลาการเรียกเก็บเงินปัจจุบันในวันที่ **%1$s** แท็ก Discord ของคุณจะถูกสุ่มถ้าคุณเปลี่ยนอัน
 
 คุณสามารถกลับมาสมัครเป็นสมาชิกใหม่ได้ทุกเมื่อ"</string>
-    <string name="premium_cancel_confirm_body_tier_2">"การยกเลิกมีผลเมื่อสิ้นสุดระยะเวลาการเรียกเก็บเงินปัจจุบันในวันที่ ในวันที่ **%1$s** คุณจะสูญเสียการเข้าถึงเกม Nitro ในห้องสมุดเกมของคุณทั้งหมด และคุณจะได้แท็ก Discord สุ่มถ้าคุณเปลี่ยนเป็นแท็กพิเศษไว้
-
-เราเก็บรักษาไฟล์เซฟของคุณไว้เป็นอย่างดีในกรณีที่คุณเปลี่ยนใจ คุณสามารถกลับมาสมัครเป็นสมาชิกใหม่ได้ทุกเมื่อ"</string>
     <string name="premium_cancel_confirm_new">ช่าย ยกเลิกเลย %1$s</string>
     <string name="premium_cancel_confirm_title">ยกเลิก %1$s หรือไม่?</string>
     <string name="premium_cancel_failed_body">เราไม่สามารถยกเลิกการสมัครสมาชิก Nitro ได้ โปรดลองใหม่อีกครั้งหรือติดต่อทีมผู้ช่วยเหลือหากยังเจอปัญหานี้</string>
@@ -2559,19 +2511,16 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="premium_chat_perks_description_custom_emoji">รับพาสปอร์ตสากลเพื่อใช้อีโมจิแบบกำหนดเองของคุณได้ทุกที่</string>
     <string name="premium_chat_perks_description_discriminator">เลือกแท็กของคุณระหว่างที่เป็นสมาชิก</string>
     <string name="premium_chat_perks_description_screenshare">แชร์เกมจากหน้าจอของคุณด้วยความละเอียด 720p 60fps หรือ 1080p 30fps</string>
-    <string name="premium_chat_perks_description_upload_limit">อัปโหลดไฟล์ขนาดใหญ่สำหรับ %1$s จาก %2$s เพื่อประสบการณ์แชร์มีมคุณภาพสูง</string>
+    <string name="premium_chat_perks_streaming_mobile">สตรีม Go Live ดีกว่า: สตรีมที่แหล่งที่มาโดยใช้ Nitro หรือความละเอียดถึง 1080p 60fps ด้วย Nitro Classic</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">ความสนุกที่ไม่หยุดอยู่กับที่</string>
     <string name="premium_chat_perks_title_badge">บอกให้โลกรู้ว่าคุณสนับสนุนเรา</string>
     <string name="premium_chat_perks_title_custom_emoji">อีโมจิสากลแบบกำหนดเอง</string>
     <string name="premium_chat_perks_title_discriminator">แท็ก Discord แบบกำหนดเอง</string>
     <string name="premium_chat_perks_title_screenshare">วิดีโอคุณภาพสูงกว่าเดิม</string>
+    <string name="premium_chat_perks_title_streaming">สตรีม Go Live ดีกว่า</string>
     <string name="premium_code_redemption_confirmation_blurb">โค้ดประหลาดในโปรแกรมของเราทำให้คุณได้รับสิทธิประโยชน์ในการแชทเพิ่มขึ้นเป็นเวลา %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">โอ้ ยอดไปเลย!</string>
-    <string name="premium_feature_new_chat_perks_header">คุณยังจะได้รับสิทธิประโยชน์เพิ่มเติมในการแชท:</string>
-    <string name="premium_feature_new_premium_applications_header">มีเกมรวมมูลค่ามากกว่า %1$s ไปดูกันเลย</string>
-    <string name="premium_feature_view_applications">ดูเกม Nitro ทั้งหมด</string>
     <string name="premium_features_chat_perks">สิทธิประโยชน์ในการแชท</string>
-    <string name="premium_features_premium_applications">เกมฟรี</string>
     <string name="premium_grandfathered_warning">เพื่อเป็นการขอบคุณการสนับสนุนเรามา เราจะลดราคาแผนจ่ายค่า Nitro ของคุณ **ถ้าคุณยกเลิกหรือเปลี่ยนแผนนี้คุณจะสูญเสียการลดราคานี้** เราเตือนคุณแล้วนะ</string>
     <string name="premium_grandfathered_warning_confirm">เออน่า ทำอยู่ดี</string>
     <string name="premium_grandfathered_warning_title">ระวังนะเพื่อนยาก</string>
@@ -2581,9 +2530,7 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="premium_not_claimed">เคลมบัญชีคุณก่อน</string>
     <string name="premium_not_claimed_body">เฮ้ เพื่อนยาก! ถ้าอยากซื้อ Nitro คุณต้องเป็นเจ้าของบัญชีก่อนนะ ของ ๆ คุณจะได้ไม่หาย</string>
     <string name="premium_not_verified">ยืนยันอีเมลของคุณก่อน</string>
-    <string name="premium_payment_applications_os_warning">เกม Nitro สนับสนุนเฉพาะใน Windows เท่านั้น</string>
     <string name="premium_payment_confirmation_blurb_regular">คุณได้อำนาจและประโยชน์พิเศษการแชทเพิ่ม หยุดเลย เลิกอ่านนี่ได้แล้ว ไปแชทกัน</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">คุณมีสิทธิเล่นเกมสุดเจ๋งเยอะแยะไปหมด หยุดเลย เลิกอ่านนี่ได้แล้ว ไปเล่นเกมกันดีกว่า</string>
     <string name="premium_payment_confirmation_button_regular">เค ดีมาก ๆ</string>
     <string name="premium_plan_month">Nitro รายเดือน</string>
     <string name="premium_plan_month_tier_1">Nitro Classic รายเดือน</string>
@@ -2604,13 +2551,10 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="premium_upgrade_disabled_current_tooltip">แผนการใช้งานปัจจุบันของคุณ</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">คุณต้องยกเลิกแผนการใช้งานและรอให้แผนดังกล่าวหมดอายุก่อน จึงจะสามารถเลือกแผนที่ต่ำกว่าได้</string>
     <string name="premium_upgrade_done_body_tier_1">คุณได้ผลประโยชน์พิเศษเพิ่มเติมสำหรับการแชท</string>
-    <string name="premium_upgrade_done_body_tier_2">คุณได้ผลประโยชน์พิเศษเพิ่มเติมสำหรับการแชทและจะเล่นเกมอะไรก็ได้ตามที่คุณต้องการ</string>
     <string name="premium_upgrade_done_button_tier_1">ยอดไปเลย</string>
-    <string name="premium_upgrade_done_button_tier_2">ลองดูเกม Nitro ทั้งหมดนี้สิ</string>
     <string name="premium_upgrade_failed_body">อ่าาา อัปเกรดไม่สำเร็จ ตรวจดูว่าข้อมูลการชำระเงินของคุณถูกต้องแล้วรออีกครั้ง</string>
     <string name="premium_upload_promo">อัปเกรดเป็น Discord Nitro เพื่อ %1$s ข้อจำกัดไฟล์</string>
     <string name="premium_year_free_months">รับฟรี 2 เดือน!</string>
-    <string name="premium_year_free_months_short">ฟรี 2 เดือน</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / ปี</string>
     <string name="preview_chat">ดูตัวอย่างแชท</string>
     <string name="priority_speaker">ผู้พูดลำดับสูง</string>
@@ -2795,7 +2739,7 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="scope_guilds">รู้ว่าคุณเข้าใช้งานเซิร์ฟเวอร์ใด</string>
     <string name="scope_guilds_empty">คุณไม่ได้อยู่ในเซิฟเวอร์ใดๆเลย</string>
     <string name="scope_guilds_join">เข้าร่วมเซิร์ฟเวอร์ให้คุณ</string>
-    <string name="scope_guilds_join_description">ใช้คำเชิญทันทีในนามของคุณ</string>
+    <string name="scope_guilds_join_description">ใช้คำเชิญในนามของคุณ</string>
     <string name="scope_identify">เข้าถึงชื่อผู้ใช้และสัญลักษณ์ประจำตัวของคุณ</string>
     <string name="scope_messages_read">อ่านข้อความทั้งหมด</string>
     <string name="scope_messages_read_description">นี่จะอนุญาตให้แอปอ่านข้อความทั้งหมดบน บัญชี Discord ได้</string>
@@ -3066,8 +3010,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="stop_ringing">ปฏิเสธสายเข้า</string>
     <string name="stop_streaming">หยุดถ่ายทอดสด</string>
     <string name="stop_watching">หยุดดู</string>
-    <string name="store_payment_legalese_monthly">เฮ่! เมื่อคุณซื้อ %1$s เป็นการที่คุณตกลงกับ [ข้อตกลงในการให้บริการร้านค้า](%2$s) %1$s เป็นการสมัครสมาชิกแบบติดต่อ หมายความว่าเราจะเรียกเก็บเงินครั้งนี้ และจะเรียกเก็บเงินอีกทุก ๆ เดือนจนกว่าคุณจะยกเลิกการเป็นสมาชิก คุณสามารถยกเลิกการเป็นสมาชิกเมื่อใดก็ได้ที่หน้าจอตั้งค่าผู้ใช้</string>
-    <string name="store_payment_legalese_yearly">เฮ่! เมื่อคุณซื้อ %1$s เป็นการที่คุณตกลงกับ [ข้อตกลงในการให้บริการร้านค้า](%2$s) %1$s เป็นการสมัครสมาชิกแบบติดต่อ หมายความว่าเราจะเรียกเก็บเงินครั้งนี้ และจะเรียกเก็บเงินอีกทุก ๆ ปีจนกว่าคุณจะยกเลิกการเป็นสมาชิก คุณสามารถยกเลิกการเป็นสมาชิกเมื่อใดก็ได้ที่หน้าจอตั้งค่าผู้ใช้</string>
     <string name="stream">เริ่มถ่ายทอดสด</string>
     <string name="stream_bad_spectator">การถ่ายทอดสดที่คุณกำลังดูอยู่มีคุณภาพเสียงหรือวิดีโอที่ลดลง ซึ่งอาจเกิดจากสภาพของการเชื่อมต่อเครือข่าย</string>
     <string name="stream_bad_streamer">การถ่ายทอดสดของคุณมีคุณภาพเสียงหรือวิดีโอที่ลดลง ซึ่งอาจเกิดจากสภาพของการเชื่อมต่อเครือข่าย</string>
@@ -3075,7 +3017,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="stream_capture_paused_details">สลับไปยังเกมของคุณเพื่อเล่นต่อ</string>
     <string name="stream_capture_paused_details_viewer">%1$s ได้ย่อเกมของคุณลง… อย่าเพิ่งไปไหน!</string>
     <string name="stream_channel_description">สมาชิกที่มีการอนุญาตนี้สามารถถ่ายทอดสดไปยังช่องนี้ได้</string>
-    <string name="stream_description">สมาชิกที่มีสิทธิ์นี้ สามารถเปลี่ยนสิทธิ์การเข้าใช้ช่องนี้ได้</string>
     <string name="stream_ended">การถ่ายทอดสดนี้สิ้นสุดแล้ว *เสียงจิ้งหรีด*</string>
     <string name="stream_ended_button">การถ่ายทอดสดจบลงแล้ว</string>
     <string name="stream_ended_no_spectators">ไม่มีผู้ชม เนื่องจากการถ่ายทอดสดจบลงแล้ว</string>
@@ -3115,7 +3056,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="stream_report_rating_body_streamer">บอกเราเกี่ยวกับประสบการณ์การถ่ายทอดสดของคุณ</string>
     <string name="stream_report_submit">ส่ง</string>
     <string name="stream_reported">ส่งคำติชมแล้ว</string>
-    <string name="stream_reported_body">ขอขอบคุณสำหรับการรายงานปัญหา! คำติชมของคุณช่วยให้เราปรับปรุงคุณภาพการถ่ายทอดสดได้</string>
     <string name="stream_soundshare_failed">นี่ เกิดข้อผิดพลาดขึ้นและเราไม่สามารถถ่ายทอดเสียงจากเกมของคุณได้</string>
     <string name="streamer_mode">โหมดสตรีม</string>
     <string name="streamer_mode_enabled">เปิดใช้งานโหมดสตรีมแล้ว</string>
@@ -3157,7 +3097,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="sync_this_account">ซิงค์บัญชีนี้</string>
     <string name="sync_with">[ซิงค์กับ %1$s](onClick)</string>
     <string name="system_message_call_missed">คุณมีสายที่ไม่ได้รับจาก %1$s</string>
-    <string name="system_message_call_started">%1$s ได้เริ่มการโทรแล้ว.</string>
     <string name="system_message_channel_icon_change">%1$s เปลี่ยนรูปของช่อง</string>
     <string name="system_message_channel_name_change">%1$s เปลี่ยนชื่อช่องเป็น **%2$s**</string>
     <string name="system_message_guild_member_join">%1$s ได้เข้าร่วมเซิร์ฟเวอร์แล้ว - ขอให้สนุกนะ!</string>
@@ -3173,7 +3112,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="system_message_guild_member_join_10">%1$s ป่าปรากฏตัว</string>
     <string name="system_message_guild_member_join_11">ซวูชชชชชชชชช %1$s ลงจอดแล้ว</string>
     <string name="system_message_guild_member_join_12">เตรียมพร้อม %1$s เข้าร่วมเซิร์ฟเวอร์แล้ว</string>
-    <string name="system_message_guild_member_join_13">%1$s เข้าร่วมแล้ว ซ่อนกล้วยเร็วเข้า</string>
     <string name="system_message_guild_member_join_14">%1$s ได้มาถึงแล้ว,Nerf เถอะ นี่มัน OP เกินไปแล้ว!</string>
     <string name="system_message_guild_member_join_15">%1$s ได้สดุดล้มมาที่เซิร์ฟเวอร์!</string>
     <string name="system_message_guild_member_join_16">%1$s ปรากฏตัวในเซิร์ฟเวอร์</string>
@@ -3185,7 +3123,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="system_message_guild_member_join_22">นั่นนก นั่นเครื่องบิน อ่าว ไม่ นั่นมัน %1$s นี่</string>
     <string name="system_message_guild_member_join_23">นั่น %1$s Praise the sun \\\\[T]/</string>
     <string name="system_message_guild_member_join_24">สวัสดี %1$s อยู่ต่อเลยได้ไหม อย่าปล่อยให้ %1$s ไป~</string>
-    <string name="system_message_guild_member_join_25">ฮ่าๆ %1$s ได้เข้ามาแล้ว! นายเปิดใช้งานการ์ดกับดักของข้า!</string>
     <string name="system_message_guild_member_join_26">ดีจ้า %1$s มาแล้ว</string>
     <string name="system_message_guild_member_join_27">เฮ่! ฟัง! %1$s เข้ามาแล้ว</string>
     <string name="system_message_guild_member_join_28">เรารอคุณอยู่ %1$s</string>
@@ -3202,8 +3139,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="system_message_pinned_message_mobile">%1$s ได้ปักหมุดข้อความในช่องนี้</string>
     <string name="system_message_pinned_message_no_cta">%1$s ได้ปักหมุดข้อความในช่องนี้</string>
     <string name="system_message_pinned_message_no_cta_formatted">%1$s ได้ปักหมุดข้อความในช่องนี้</string>
-    <string name="system_message_recipient_add">%1$s ได้เพิ่ม %2$s เข้าสู่กลุ่มนี้.</string>
-    <string name="system_message_recipient_remove">%1$s ได้ลบ %2$s ออกจากกลุ่มนี้.</string>
     <string name="system_message_recipient_remove_self">%1$s ออกจากกลุ่มแล้ว</string>
     <string name="system_permission_grant">ให้อนุญาต</string>
     <string name="system_permission_request_camera">เพื่อเข้าถึง **กล้องของคุณ คุณต้องให้อนุญาตกับเรา**</string>
@@ -3242,7 +3177,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="tr">ตุรกี</string>
     <string name="transfer">โอน</string>
     <string name="transfer_ownership">โอนความเป็นเจ้าของ</string>
-    <string name="transfer_ownership_acknowledge">ข้าพเจ้าทราบว่า โดยการโอนความเป็นเจ้าของให้แก่ **%1$s** เขาจะกลายเป็นเจ้าของอย่างเป็นทางการ.</string>
     <string name="transfer_ownership_to_user">โอนความเป็นเจ้าของให้ %1$s</string>
     <string name="try_again">ลองอีกครั้ง</string>
     <string name="tts_alls">สำหรับทุกช่อง</string>
@@ -3263,7 +3197,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="two_fa_backup_codes_sales_pitch">ถ้าคุณไม่สามารถใช้แอปยืนยันตัวตนได้อีกต่อไป คุณก็ยังสามารถเข้าใช้บัญชีผู้ใช้ของคุณได้ด้วยรหัสสำรองที่สร้างไว้ก่อน บันทึกรหัสเหล่านี้ไว้ในที่ ๆ ปลอดภัยเพื่อลดความเสี่ยงที่คุณจะเสียสิทธิเข้าใช้บัญชีผู้ใช้ของคุณ</string>
     <string name="two_fa_change_account">เปลี่ยนรายละเอียดบัญชี</string>
     <string name="two_fa_disable">ปิดการใช้งานการยืนยันแบบสองขั้นตอน</string>
-    <string name="two_fa_discord_backup_codes">นี่คือรหัสการสำรองข้อมูลใน Discord สำหรับบัญชีของคุณ %1$s. ขอให้เก็บไว้เป็นความปลอดภัย</string>
     <string name="two_fa_download_app_body">ดาวน์โหลดและติดตั้ง [Authy](%1$s) หรือ [Google Authenticator](%2$s) กับโทรศัพท์หรือแท็บเล็ตของคุณ</string>
     <string name="two_fa_download_app_label">ดาวน์โหลดแอพยืนยันตน</string>
     <string name="two_fa_download_codes">ดาวน์โหลดรหัสสำรอง</string>
@@ -3509,8 +3442,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="vanity_url_help_conflict">กรุณาคำนึงไว้ว่าเราอาจจะนำ URL พิเศษคืนถ้าเราพบว่ามีการล่วงละเมิดสิทธิหรือเกิดข้อพิพาททางลิขสิทธิ์</string>
     <string name="verfication_expired">ลิงก์การยืนยันอีเมลหมดอายุแล้ว</string>
     <string name="verfication_expired_suggestion">กรุณาเข้าสู่ระบบ Discord และส่งลิงก์อีกครั้ง</string>
-    <string name="verification_body">"เราตรวจพบว่ามีอะไรผิดธรรมชาติเกิดขึ้น
-ถ้าคุณต้องการใช้ Discord ต่อ **เราต้องขอให้คุณยืนยันว่าตัวคุณเป็นมนุษย์**"</string>
     <string name="verification_body_alt">โอเค มาลองทดสอบดูสิว่าคุณเป็นมนุษย์</string>
     <string name="verification_email_body">เราได้ส่งอีเมลยืนยันใหม่ไปยัง **%1$s** แล้ว โปรดตรวจสอบกล่องจดหมายหรืออีเมลขยะของคุณ.</string>
     <string name="verification_email_error_body">เกิดความผิดพลาดในการส่งอีเมลยืนยัน ลองอีกครั้งหรือติดต่อฝ่ายเหลือ</string>
@@ -3611,7 +3542,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="webhook_save">บันทึก</string>
     <string name="welcome_message_desktop_apps">**ดาวน์โหลด** [แอพ](onDownloadClick) เดสก์ท็อป เพื่อที่จะใช้ Push to Talk การใช้ CPU กับแบนด์วิดท์ที่ต่ำกว่า และอื่น ๆ</string>
     <string name="welcome_message_instant_invite">**เชิญเพื่อนๆ ของคุณ**มาที่เซิร์ฟเวอร์นี้โดยการกด [ปุ่มแชร์](onShareClick) เมื่อคุณพร้อมแล้ว</string>
-    <string name="welcome_message_mobile_apps">**รักษาการเชื่อมต่อ** กับเซิร์ฟเวอร์ของคุณจาก [สมาร์ทโฟนของคุณ](onDownloadClick) เอาไว้ และแม้แต่ในขณะที่ขณะเล่นเกมคอนโซล</string>
     <string name="welcome_message_mobile_instant_invite">ชวนเพื่อนๆ ของคุณ</string>
     <string name="welcome_message_mobile_instant_invite_desc">เซิร์ฟเวอร์ดีขึ้นได้ด้วยเพื่อนๆ ของคุณ พาเพื่อนซี้ของคุณเข้ามาในนี้ได้เลย!</string>
     <string name="welcome_message_mobile_owner_subtitle">ถึงเวลาช่วยให้คุณเริ่มปาร์ตี้กันแล้ว</string>
diff --git a/com.discord/res/values-tr/plurals.xml b/com.discord/res/values-tr/plurals.xml
index 7145e7f64a..dbde39187d 100644
--- a/com.discord/res/values-tr/plurals.xml
+++ b/com.discord/res/values-tr/plurals.xml
@@ -58,10 +58,6 @@
         <item quantity="other">%d saniye</item>
         <item quantity="one">1 saniye</item>
     </plurals>
-    <plurals name="channel_slowmode_desc_seconds">
-        <item quantity="other">%d saniyede</item>
-        <item quantity="one">1 saniyede</item>
-    </plurals>
     <plurals name="duration_days_days">
         <item quantity="other">%d gün</item>
         <item quantity="one">1 gün</item>
@@ -87,15 +83,6 @@
         <item quantity="zero">0 yer</item>
         <item quantity="one">%d yer</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d gündür</item>
-        <item quantity="one">1 gündür</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d üyeyi</item>
-        <item quantity="zero">0 üyeyi</item>
-        <item quantity="one">1 üyeyi</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">gün</item>
         <item quantity="one">gün</item>
@@ -212,16 +199,6 @@
         <item quantity="other">izinler</item>
         <item quantity="one">bir izin</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Yavaş modu **!!%d!! saniye** yap</item>
-        <item quantity="zero">Yavaş modu kapalı</item>
-        <item quantity="one">Yavaş modu **1 saniye** yap</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Yavaş modu **!!%d!! saniye** yap</item>
-        <item quantity="zero">Yavaş modu kapat</item>
-        <item quantity="one">Yavaş modu **1 saniye** yap</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! üye**</item>
         <item quantity="one">**bir üye**</item>
@@ -290,10 +267,6 @@
         <item quantity="other">%d gün</item>
         <item quantity="one">1 gün</item>
     </plurals>
-    <plurals name="live_viewers_viewers">
-        <item quantity="other">izleyici</item>
-        <item quantity="one">viewer</item>
-    </plurals>
     <plurals name="max_uses_description_mobile_maxUses">
         <item quantity="other">%d kullanım</item>
         <item quantity="zero">sınırsız kullanım</item>
@@ -321,10 +294,6 @@
         <item quantity="other">%d yeni mesaj</item>
         <item quantity="one">1 yeni mesaj</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d günlük</item>
-        <item quantity="one">bir günlük</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d kanal</item>
         <item quantity="one">%d kanal</item>
@@ -342,10 +311,6 @@
         <item quantity="other">bu mesajları</item>
         <item quantity="one">bu mesajı</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** sunucu geçici bir kesilmeden dolayı kullanım dışı.</item>
-        <item quantity="one">**1** sunucu geçici bir kesilmeden dolayı kullanım dışı.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d aylık</item>
         <item quantity="one">1 aylık</item>
diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml
index cb8e34adf3..9544211d04 100644
--- a/com.discord/res/values-tr/strings.xml
+++ b/com.discord/res/values-tr/strings.xml
@@ -60,8 +60,6 @@
 birinden seni davet etmesini de isteyebilirsin."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Anladım!</string>
     <string name="activity_panel_go_live_hotspot_header">"Oyunu doğrudan arkadaşlarına izletmek için Go Live'a geç!"</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Bu sunucuda yayın yapılacak ses kanalı yok.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Bu ses kanalında yayın yapamazsın.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Yayına başlamak için bir sunucuya git.</string>
     <string name="add">Ekle</string>
     <string name="add_a_comment_optional">Bir Yorum ekle (İsteğe bağlı)</string>
@@ -158,7 +156,6 @@ tehlikeli bir izindir."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Oyunu kaptın!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Kitaplığa git</string>
     <string name="application_entitlement_code_redemption_invalid">Girilen kod geçersiz</string>
-    <string name="application_entitlement_code_redemption_prompt">Bir oyun kodu mu aldın? Kodu aşağı gir:</string>
     <string name="application_entitlement_code_redemption_redeem">Al</string>
     <string name="application_filter_name_linux">Tüm dosyalar</string>
     <string name="application_filter_name_macos">Uygulamalar</string>
@@ -297,7 +294,6 @@ tehlikeli bir izindir."</string>
     <string name="application_store_navigation_browse">Göz At</string>
     <string name="application_store_new_release">Yeni çıkan</string>
     <string name="application_store_online_coop">Online Ekip Çalışması</string>
-    <string name="application_store_online_multiplayer">Online Çok Oyunculu</string>
     <string name="application_store_purchase_application">Oyun Satın Al</string>
     <string name="application_store_purchase_bundle">Paket satın al</string>
     <string name="application_store_purchase_confirmation_blurb">Aşağıdan %1$s oyununu kurabilir ve kurulum bitince kitaplık sekmesinden başlatabilirsin. İyi eğlenceler!</string>
@@ -406,7 +402,6 @@ tehlikeli bir izindir."</string>
     <string name="application_store_view_all_news">Tüm Haberlere Bak</string>
     <string name="application_store_warning_dlc_requires_base_application_description">"Bu DLC paketini oynayabilmen içlin Discord'da %1$s sahibi olman gerekiyor. [DLC hakkında bilgi edin.](%2$s)"</string>
     <string name="application_store_warning_dlc_requires_base_application_title">İndirilebilir İçerik</string>
-    <string name="application_store_warning_early_access_description">Bu oyun eğlenceli (bizce öyle!) ama sınırlı bir içeriğe, çeşitli hatalara sahip ya da bazı eksikleri var gibi. [Erken erişim hakkında bilgi edin.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Erken Erişim</string>
     <string name="application_store_warning_requires_desktop_app_description">Bu oyunu oynayabilmen için Discord $[masaüstü uygulamasını](downloadHook) kurmuş olman gerekir.</string>
     <string name="application_store_warning_requires_desktop_app_title">Masaüstü Uygulaması Gerekir</string>
@@ -441,7 +436,6 @@ tehlikeli bir izindir."</string>
     <string name="auth_expired_suggestion">Bağlantıyı tekrar göndermek için lütfen giriş yap.</string>
     <string name="auth_invalid_invite_body">Bu davetin süresi geçmiş olabilir veya katılma iznin yok.</string>
     <string name="auth_invalid_invite_tip">Davetim neden geçersiz?</string>
-    <string name="auth_invalid_invite_title">Geçersiz Davet</string>
     <string name="auth_ip_auth_succeeded_suggestion">Masaüstü veya mobil uygulamadan giriş yapmaya çalışıp bu bağlantıyı takip ettiysen lütfen geri dön ve tekrar dene.</string>
     <string name="auth_login_body">Seni tekrar gördüğümüze çok sevindik!</string>
     <string name="auth_message_invited_by">%1$s seni katılmaya davet etti</string>
@@ -451,7 +445,6 @@ tehlikeli bir izindir."</string>
     <string name="authorization">Yetkilendirme</string>
     <string name="authorization_expired">IP doğrulama bağlantısının süresi doldu.</string>
     <string name="authorization_expired_suggestion">"Lütfen Discord'a giriş yap ve bağlantıyı tekrar gönder"</string>
-    <string name="authorize">Doğrula</string>
     <string name="authorized">Yetkilendirildi</string>
     <string name="authorized_apps">Yetkili Uygulamalar</string>
     <string name="authorizing">Doğrulanıyor</string>
@@ -528,7 +521,6 @@ ama eğer yaparsan ve yapmak zorundaysan, tereddüt etme."</string>
     <string name="billing_error_section_card">Olamaz! Görünüşe göre bu kartta bir sorun var. Lütfen alanları düzelt ve tekrar dene!</string>
     <string name="billing_history">Fatura Geçmişi</string>
     <string name="billing_legal_mumbo_jumbo">Hukuki Ivır Zıvır</string>
-    <string name="billing_legal_mumbo_jumbo_label">[Discord Mağaza Hizmet Koşullarını](%1$s) kabul ediyorum</string>
     <string name="billing_no_payment_method">Kayıtlı bir ödeme yöntemi yok</string>
     <string name="billing_no_payment_method_description">Bir ödeme yöntemi kaydederek daha hızlı ödeme yap</string>
     <string name="billing_pay_for_it_with">Şununla öde:</string>
@@ -536,12 +528,7 @@ ama eğer yaparsan ve yapmak zorundaysan, tereddüt etme."</string>
     <string name="billing_payment_breakdown_total">Toplam</string>
     <string name="billing_payment_history">İşlem Geçmişi</string>
     <string name="billing_payment_premium">Aboneliğin</string>
-    <string name="billing_payment_premium_legalese_monthly">"Bir %1$s aboneliği satın alarak [Mağaza Hizmet Koşullarımızı](%2$s) kabul etmiş olursun. %1$s otomatik olarak yenilenen bir aboneliktir. Aboneliğini iptal edene kadar Discord'a %3$s ücreti anında tahsil etme ve bunu aylık olarak otomatik bir şekilde yapma izni vermiş olursun. Bunu istediğin zaman iptal edebilirsin."</string>
-    <string name="billing_payment_premium_legalese_yearly">"Bir %1$s aboneliği satın alarak [Mağaza Hizmet Koşullarımızı](%2$s) kabul etmiş olursun. %1$s otomatik olarak yenilenen bir aboneliktir. Aboneliğini iptal edene kadar Discord'a %3$s ücreti anında tahsil etme ve bunu yıllık olarak otomatik bir şekilde yapma izni vermiş olursun. Bunu istediğin zaman iptal edebilirsin."</string>
     <string name="billing_payment_sources">Ödeme Yöntemleri</string>
-    <string name="billing_payment_table_header_amount">TUTAR</string>
-    <string name="billing_payment_table_header_date">TARİH</string>
-    <string name="billing_payment_table_header_description">AÇIKLAMA</string>
     <string name="billing_premium_refund_text">Bir satın alma işlemi son %1$s gün içinde yapıldıysa bir iade talebi gönderilebilir. [Arkadaş canlısı yardım masamız, jetonlarını geri almana yardımcı olacak.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Üzgünüz, bu satın alma işlemi iade koşullarına uygun değil. Bu satın alma işlemi son %1$s gün içinde yapıldıysa bir iade talebi gönderilebilir.</string>
     <string name="billing_price_per_month">%1$s / Ay</string>
@@ -551,9 +538,7 @@ ama eğer yaparsan ve yapmak zorundaysan, tereddüt etme."</string>
     <string name="billing_purchase_details_header">Satın Alma Detayları</string>
     <string name="billing_refund_header">Satın alma işleminde sorunlar mı var?</string>
     <string name="billing_refund_play_time_never_played">Hiç oynamadı</string>
-    <string name="billing_refund_play_time_subheader">OYNAMA SÜRESİ</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">SATIN ALMA TARİHİ</string>
     <string name="billing_refund_report_a_problem">Bir sorun bildir</string>
     <string name="billing_refund_request_button">İade Talep Et</string>
     <string name="billing_sales_tax_added">Fatura adresinden dolayı ücrete %1$s satış vergisi eklendi.</string>
@@ -640,12 +625,9 @@ masaüstü uygulamasını [İndir](onDownloadClick)."</string>
     <string name="category_settings">Kategori Ayarları</string>
     <string name="category_settings_have_been_updated">Kategori ayarları güncellendi.</string>
     <string name="certified">Onaylı</string>
-    <string name="certified_device_recommendation_audio_input_body">Discord, **%1$s %2$s** adında onaylı bir ses giriş cihazı tespit etti. En iyi ses deneyimi için buna geçiş yapmanı öneriyoruz.</string>
-    <string name="certified_device_recommendation_audio_output_body">Discord, **%1$s %2$s** adında onaylı bir ses çıkış cihazı tespit etti. En iyi ses deneyimi için buna geçiş yapmanı öneriyoruz.</string>
     <string name="certified_device_recommendation_cancel">Yok, kalsın!</string>
     <string name="certified_device_recommendation_confirm">Değiştir</string>
     <string name="certified_device_recommendation_title">Onaylı Cihaz Tespit Edildi</string>
-    <string name="certified_device_recommendation_video_input_body">Discord, **%1$s %2$s** adında onaylı bir video giriş cihazı tespit etti. En iyi görüntü deneyimi için buna geçiş yapmanı öneriyoruz.</string>
     <string name="change">Değiştir</string>
     <string name="change_avatar">"
 Avatarını Değiştir"</string>
@@ -654,7 +636,6 @@ Avatarını Değiştir"</string>
     <string name="change_email_short">E-postayı Değiştir</string>
     <string name="change_icon">"
 Simge Değiştir"</string>
-    <string name="change_log">Değişim Kaydı</string>
     <string name="change_nickname">Kullanıcı Adı Değiştir</string>
     <string name="change_nickname_description">Kendi kullanıcı adını değiştirme iznine sahip olan üyeler.</string>
     <string name="change_nickname_warning">"Kullanıcı adları bu sunucudaki herkese görünür. Eğer adlandırma sistemi uygulamıyorsan
@@ -682,7 +663,6 @@ veya kötü bir kullanıcı adı temizlemiyorsan onları değiştirme."</string>
     <string name="channel_settings">Kanal Ayarları</string>
     <string name="channel_settings_have_been_updated">Kanal ayarları güncellendi.</string>
     <string name="channel_slowmode_cooldown">Yavaş mod açıldı. %1$s sonra bu kanalda bir mesaj daha gönderebilirsin.</string>
-    <string name="channel_slowmode_desc">Yavaş mod açıldı. Üyeler her %1$s bir mesaj gönderebilirler.</string>
     <string name="channel_slowmode_desc_immune">Yavaş mod açıldı, ama bu seni etkilemiyor. Harikasın!</string>
     <string name="channel_slowmode_desc_short">Yavaş mod açıldı.</string>
     <string name="channel_topic_empty">Konu ayarlanmadı.</string>
@@ -729,7 +709,6 @@ veya kötü bir kullanıcı adı temizlemiyorsan onları değiştirme."</string>
     <string name="cloud_sync_modal_or">VEYA</string>
     <string name="collapse_category">Kategoriyi Daralt</string>
     <string name="coming_soon">Çok Yakında</string>
-    <string name="coming_soon_notifications">Kısmi bildirim kontrolleri şu anda sadece bilgisayar uygulamasında kullanılabilir. Şimdilik iOS bildirim ayarlarını kullan.</string>
     <string name="coming_soon_title">ÇOK YAKINDA!</string>
     <string name="command_giphy_description">"Canlandırılmış GIF'leri Ağda ara"</string>
     <string name="command_me_description">Metni vurgu ile gösterir.</string>
@@ -791,7 +770,6 @@ tıklayarak kırmızı alarmı kapatabilirsin."</string>
     <string name="connection_enter_code">Ekranında görünen kodu gir</string>
     <string name="connection_invalid_pin">Geçersiz PIN kodu girildi</string>
     <string name="connection_login_with">ya da şununla giriş yap</string>
-    <string name="connection_problems_body">[Sunucu durumuna](%1$s) göz at veya [@discordapp](%2$s) hesabına tweet at.</string>
     <string name="connection_status_authenticating">Kimlik Doğrulanıyor</string>
     <string name="connection_status_awaiting_endpoint">Bitiş Noktası Bekleniyor</string>
     <string name="connection_status_connected">Bağlandı</string>
@@ -836,11 +814,10 @@ tıklayarak kırmızı alarmı kapatabilirsin."</string>
     <string name="create_category">Kategori Oluştur</string>
     <string name="create_channel">Kanal Oluştur</string>
     <string name="create_group_dm">"Grup DM'si Oluştur"</string>
-    <string name="create_instant_invite">Anlık Davet Oluştur</string>
+    <string name="create_instant_invite">Davet Oluştur</string>
     <string name="create_link">Bağlantı Oluştur</string>
     <string name="create_or_join_modal_header">Oh, başka bir sunucu daha mı?</string>
     <string name="create_server_button_body">Yeni bir sunucu oluştur ve arkadaşlarını davet et. Hem de bedava!</string>
-    <string name="create_server_button_cta">Bir Sunucu Oluştur</string>
     <string name="create_server_button_cta_mobile">Yeni bir Sunucu oluştur</string>
     <string name="create_server_button_cta_mobile_desc">Bir sunucu kur, arkadaşlarını davet et ve bir parti ver!</string>
     <string name="create_server_description">Bir sunucu oluşturarak arkadaşların arasında **ücretsiz** sesli ve yazılı sohbet olanağına erişimin olacak.</string>
@@ -868,7 +845,6 @@ tıklayarak kırmızı alarmı kapatabilirsin."</string>
     <string name="da">Danca</string>
     <string name="data_download_requested_status_note">Yakın zaman içinde verilerinin bir kopyasını istemiştin. Tekrar istek göndermek için %1$s tarihini beklemen gerekiyor</string>
     <string name="data_privacy_controls">Verilerini kullanma pratiklerimiz</string>
-    <string name="data_privacy_controls_basic_service_note">"Sana temel Discord hizmetini sunabilmemiz için mesajlar, hangi sunucularda bulunduğun ve Doğrudan Mesajların gibi bazı verileri depolamamız ve işlememiz gerekiyor. Discord'u kullanarak sana bu temel hizmeti sunmamıza izin vermiş olursun. Bunu durdurmak için [Hesabını devre dışı bırak ve sil](onClick)."</string>
     <string name="data_privacy_controls_basic_service_title">"Discord'un çalışması için verileri kullan"</string>
     <string name="data_privacy_controls_personal_data_title">Tüm Verilerimi iste</string>
     <string name="data_privacy_controls_personalization_note_learn_more">"Bu ayar sayesinde Discord'u sana özel hale getirmek için bilgileri (örneğin oynadığın oyunlar) kullanıyoruz. [Buradan daha fazla bilgi edin.](%1$s)"</string>
@@ -951,7 +927,6 @@ tıklayarak kırmızı alarmı kapatabilirsin."</string>
     <string name="disable_email_notifications_failed_suggestion">E-posta bildirimleri zaten devre dışı olabilir veya bu e-posta artık bir Discord hesabıyla ilişkili olmayabilir.</string>
     <string name="disable_integration_title">Senkronizasyonu Devre Dışı Bırak</string>
     <string name="disable_integration_twitch_body">Seçilen takipçi yetkilerinin senkronizasyonunu kaldırmak bütün takipçileri zaman aşımına uğratacak.</string>
-    <string name="disable_integration_youtube_body">Seçilen sponsor yetkilerinin senkronizasyonunu kaldırmak bütün sponsorları zaman aşımına uğratacak.</string>
     <string name="disable_notifications_description">Tüm masaüstü bildirimleri devre dışı bırakılacak.</string>
     <string name="disable_notifications_label">Bildirimi Devre Dışı Bırak</string>
     <string name="disable_sounds_description">Tüm ses efektleri devre dışı bırakılacak.</string>
@@ -967,7 +942,6 @@ tıklayarak kırmızı alarmı kapatabilirsin."</string>
     <string name="discord_desc_long">Oyuncular için ücretsiz ve güvenli sohbet, hem bilgisayarında hem de telefonunda çalışır.</string>
     <string name="discord_desc_short">Takım sesli ve yazılı sohbet</string>
     <string name="dismiss">Kapat</string>
-    <string name="dispatch_error_modal_body">Bir sorun oluştu. Eğer bu sorun devam ederse bir destek bileti oluştur ve mesaj içeriğini aşağıya kopyala.</string>
     <string name="dispatch_error_modal_error_label">Hata Mesajı (Beni kopyala ve yapıştır)</string>
     <string name="dispatch_error_modal_header">Discord Dispatch Hatası</string>
     <string name="dispatch_error_modal_open_ticket">Bir bilet oluştur</string>
@@ -1085,7 +1059,6 @@ tıklayarak kırmızı alarmı kapatabilirsin."</string>
     <string name="focus_participant">Bu Kişiye Odaklan</string>
     <string name="force_sync">Senkronizasyona Zorla</string>
     <string name="forgot_password">Şifreni mi unuttun?</string>
-    <string name="forgot_password_body">Endişelenme! Gerçekten sen olduğunu onaylamamız için lütfen hesabın ile ilişkili olan e-postayı gir.</string>
     <string name="form_checkbox_debug_logging">Hata Ayıklama Günlüğü</string>
     <string name="form_checkbox_qos">Hizmet Kalitesi Yüksek Paket Önceliğini Etkinleştir</string>
     <string name="form_description_audio_mode_android_call">Mikrofon veya kulaklık sorunları yaşıyorsan bu ses modunu kullanmayı deneyebilirsin. Sorun yaşamıyorsan varsayılan olarak bırak.</string>
@@ -1099,8 +1072,6 @@ AFK zaman aşımından daha uzun süre etkin olmayan üyeleri otomatik olarak bu
     <string name="form_help_attenuation">"Konuşurken diğer uygulamaların sesini bu kadar kıs.
 Kısmayı engellemek için ayarı %%0 da kullan."</string>
     <string name="form_help_automatic_vad">Gösterge sürekli yeşili gösteriyorsa Discord güzel sesini iletiyor demektir.</string>
-    <string name="form_help_bitrate">"**BÜTÜN BİTLER!** %1$skbps'den yukarı çıkmak ses cihazlarına meraklı biri değilseniz önerilmez çünkü telefon üzerinden bağlanan veya kötü bağlantısı
-olan insanlara herhangi bir görünür fayda sağlamaz."</string>
     <string name="form_help_certified_voice_processing">"Discord Onaylı bir mikrofon kullanırken belirli ses işleme özellikleri artık Discord tarafından değil,
 mikrofon tarafından çalıştırılır."</string>
     <string name="form_help_channel_permissions">Rol seçimi yapmak, bu kanal için otomatik olarak varsayılan izinleri kuracaktır.</string>
@@ -1113,27 +1084,16 @@ için [bu çılgınlıktan](%1$s) kaçınmak amacıyla bunu sadece @bahsetmeler
 her mesajda bildirim alıp almayacağını belirleyecek. Bunu herkese açık bir Discord için sadece @bahsetme olarak ayarlamanı şiddetle öneririz"</string>
     <string name="form_help_explicit_content_filter">"Bu sunucuda gönderilen sakıncalı içeriğe sahip mesajları otomatik olarak tara ve sil. Lütfen bu filtrenin
 sunucundaki üyelere ne kadar kapsamlı uygulanacağını seç. **Herkese açık bir Discord için bir filtre ayarlanmasını öneririz.**"</string>
-    <string name="form_help_instant_invite_channel">"Eğer bir kanal seçildiyse, widget tarafından bir Anlık Davet bağlantısı oluşturulacaktır,
-aksi takdirde sadece çevrimiçi üyeler ve sesli kanallar sağlanacaktır."</string>
-    <string name="form_help_last_seen">"Temizleme **%1$s** görülmeyen ve
-herhangi bir role atanmamış **%2$s** atacak.
-Bu üyeler yeni bir Anlık Davet ile sunucuya tekrar katılabilirler."</string>
     <string name="form_help_legacy_subsystem">"Bazı ses donanım sürücüleri, İşletim Sisteminin modern ses altsistemini kullanırken sorun çıkarır.
 Eski bir ses altsistemine geri dönmek için bu kutucuğu işaretle."</string>
     <string name="form_help_nsfw">"Kullanıcıların bu kanaldaki içeriği görüntülemesi için yasal yaşın üstünde olduklarını onaylamaları gerekecektir.
 NSFW kanallar sakıncalı içerik filtesinden muaftır."</string>
-    <string name="form_help_premade_widget">"Discord'un mis gibi hazır widget'ını kullanmak için bu HTML kodunu sitenize gömün. Eğer sitenizin
-kullanıcılarına erişiminiz varsa, o zaman sorgu dizesine(query string) anlık olarak &amp;username= ekleyebilirsiniz."</string>
     <string name="form_help_qos">"Yönlendiricine Discord'un aktardığı paketlerin yüksek öncelikli olduğunu işaret eder.
 Bu ayarlandığında bazı yönlendiriciler veya internet hizmet sağlayıcıları uygunsuz davranabilir."</string>
     <string name="form_help_slowmode">Kanal Yönetimi ve Mesaj Yönetimi yetkileri olmayan üyelerin mesaj gönderme sıklığı bu sürede bir tane ile kısıtlanır.</string>
-    <string name="form_help_system_channel">Bu sunucuya biri katıldığında bu kanala bir mesaj gönder. Mesajlar rastgele oluşturulur. Bu özelliği istediğin zaman kapatabilirsin.</string>
     <string name="form_help_temporary">Üyeler bir rol atanmadığı sürece otomatik olarak atılırlar.</string>
     <string name="form_help_user_limit">"Bu sesli kanala bağlanabilecek kullanıcıların sayısını kısıtlar. **Üyeleri Taşı** yetkisine
 sahip olan kullanıcılar bu kısıtlamaya dahil olmaz ve başka kullanıcıları bu kanala taşıyabilirler."</string>
-    <string name="form_help_verification_level">"Sunucu üyeleri yazı kanallarında mesaj göndermeden ya da
-direkt mesaj sohbeti başlatmadan önce sözü edilen kriterleri karşılamak zorundadır. Eğer kullanıcıya bir rol atanmışsa bu geçerli değildir.
-**Herkese açık bir Discord için bir doğrulama düzeyi ayarlamanızı öneririz.**"</string>
     <string name="form_label_afk_channel">AFK kanalı</string>
     <string name="form_label_afk_timeout">AFK Zaman Aşımı</string>
     <string name="form_label_all">Tümü</string>
@@ -1151,7 +1111,6 @@ direkt mesaj sohbeti başlatmadan önce sözü edilen kriterleri karşılamak zo
     <string name="form_label_channel_notifcation_settings">Kanal bildirim ayarları</string>
     <string name="form_label_channel_permissions">Bu kanala kimler erişebilir?</string>
     <string name="form_label_channel_topic">Kanal Başlığı</string>
-    <string name="form_label_channel_voice_permissions">Bu kanala kimler erişebilir?</string>
     <string name="form_label_current_password">Mevcut Şifren</string>
     <string name="form_label_custom_code">Özel Kod</string>
     <string name="form_label_custom_twitch_emoticon">Özelleştirilmiş Twitch İfadeleri</string>
@@ -1172,8 +1131,8 @@ direkt mesaj sohbeti başlatmadan önce sözü edilen kriterleri karşılamak zo
     <string name="form_label_input_mode">Giriş Modu</string>
     <string name="form_label_input_sensitivty">Giriş duyarlılığı</string>
     <string name="form_label_input_volume">Giriş Sesi</string>
-    <string name="form_label_instant_invite">Bir Anlık Davet Gir</string>
-    <string name="form_label_instant_invite_channel">Anlık Çağrı Kanalı</string>
+    <string name="form_label_instant_invite">Bir Davet Gir</string>
+    <string name="form_label_instant_invite_channel">Kanalı davet et</string>
     <string name="form_label_last_seen">Son Görülme</string>
     <string name="form_label_local_mute">Yerel Susturma</string>
     <string name="form_label_max_age">Daha Sonra Sona Er</string>
@@ -1194,7 +1153,6 @@ direkt mesaj sohbeti başlatmadan önce sözü edilen kriterleri karşılamak zo
     <string name="form_label_mobile_notifications_system_label">Sistem bildirimleri</string>
     <string name="form_label_mobile_notifications_vibrations">Bildirim titreşimini devre dışı bırak.</string>
     <string name="form_label_mobile_notifications_wake_device">Bildirimler, aygıtı uyandırsın.</string>
-    <string name="form_label_mobile_push_notifications">Mobil Anında İleti Bildirimleri</string>
     <string name="form_label_mute_server">**%1$s** sunucusunu sustur</string>
     <string name="form_label_mute_server_description">Sunucuyu susturmak eğer sizden bahsedilmemişse, okunmamış bildirimlerden ve göstergelerden gelen bildirimleri engeller.</string>
     <string name="form_label_muted">Susturuldu</string>
@@ -1242,7 +1200,6 @@ direkt mesaj sohbeti başlatmadan önce sözü edilen kriterleri karşılamak zo
     <string name="form_label_suppress_everyone">"**@everyone** ve **@here**'ı bastır"</string>
     <string name="form_label_synced_role">Senkronize Edilmiş Rol</string>
     <string name="form_label_synced_subs">Senkronize Edilmiş Aboneler</string>
-    <string name="form_label_system_channel">Yeni Üye Mesaj Kanalı</string>
     <string name="form_label_temporary">Geçici Üyelik</string>
     <string name="form_label_tts">Metin Okuma</string>
     <string name="form_label_tts_notifications">Metin Okuma Bildirimleri</string>
@@ -1344,7 +1301,6 @@ Discord'a, [mikrofonuna erişim izni](onEnableClick) vermelisin."</string>
     <string name="game_feed_activity_recently_played">Son Zamanlarda Oynanan</string>
     <string name="game_feed_activity_streaming_twitch">"Twitch'te yayın yapıyor"</string>
     <string name="game_feed_current_header_title">Şimdi Oynuyor</string>
-    <string name="game_feed_settings_visibility">Oyunlar Sekmesinde Göster</string>
     <string name="game_feed_unknown_player">Bilinmeyen Oyuncu</string>
     <string name="game_feed_user_played_days_ago">%1$s %2$s önce oynadı</string>
     <string name="game_feed_user_played_hours_ago">%1$s %2$s önce oynadı</string>
@@ -1412,7 +1368,7 @@ Discord'a, [mikrofonuna erişim izni](onEnableClick) vermelisin."</string>
     <string name="generate_a_new_link">Yeni Bir Bağlantı Oluştur</string>
     <string name="get_started">Haydi Başla</string>
     <string name="gif_auto_play_label">"Discord'a odaklanıldığında GIF'ler otomatik olarak oynasın."</string>
-    <string name="go_live_changelog_guilds">Go Live şimdi mevcut: %1$s</string>
+    <string name="go_live_hardware_acceleration_unavailable">"Çabuk ol, donanım ivmesini tespit edemiyoruz. Bilgisayarın Go Live'ı desteklemiyor olabilir."</string>
     <string name="go_live_listen">Dinle!</string>
     <string name="go_live_look">Bak!</string>
     <string name="go_live_modal_application_form_title">Ne yayını yapıyorsun</string>
@@ -1423,7 +1379,7 @@ Discord'a, [mikrofonuna erişim izni](onEnableClick) vermelisin."</string>
     <string name="go_live_modal_overflow_two_users">%1$s ve %2$s</string>
     <string name="go_live_modal_select_channel_form_title">Bir ses kanalı seç</string>
     <string name="go_live_modal_select_channel_placeholder">Ses kanallarını ara</string>
-    <string name="go_live_premium_early_access">Nitro abonesi olanlara teşekkür mahiyetinde, oyunları yayınlamak için Go Live senin için erken erişimde!</string>
+    <string name="go_live_video_drivers_outdated">Video sürücülerin güncel değil. Daha iyi Go Live performansı için onları güncelle.</string>
     <string name="grant_temporary_membership">Geçici üyelik ver</string>
     <string name="group">Grup</string>
     <string name="group_dm_add_friends">"DM'ye Arkadaş Ekle"</string>
@@ -1500,8 +1456,6 @@ Discord'a, [mikrofonuna erişim izni](onEnableClick) vermelisin."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**%1$s** için %2$s **verildi**</string>
     <string name="guild_settings_audit_log_channel_position_change">**%1$s** pozisyonundan **%2$s** pozisyonuna taşındı</string>
     <string name="guild_settings_audit_log_channel_position_create">**%1$s** konumunda</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) $[**%2$s**](targetHook) metin kanalını oluşturdu</string>
     <string name="guild_settings_audit_log_channel_topic_change">Başlık **%1$s** olarak değiştirildi</string>
     <string name="guild_settings_audit_log_channel_topic_create">Konu **%1$s** olarak belirlendi</string>
@@ -1528,7 +1482,6 @@ Discord'a, [mikrofonuna erişim izni](onEnableClick) vermelisin."</string>
     <string name="guild_settings_audit_log_guild_owner_id_change">Mülkiyet **%1$s** hedefine aktarıldı</string>
     <string name="guild_settings_audit_log_guild_region_change">Ses bölgesini **%1$s** olarak belirledi</string>
     <string name="guild_settings_audit_log_guild_system_channel_id_change">Hoş geldin bildirimi kanalını **%1$s** olarak ayarla</string>
-    <string name="guild_settings_audit_log_guild_system_channel_id_disable">Karşılama bildirimi mesajları **devre dışı bırakıldı**</string>
     <string name="guild_settings_audit_log_guild_update">$[**%1$s**](userHook), $[**%2$s**](targetHook) üzerinde değişiklikler yaptı</string>
     <string name="guild_settings_audit_log_guild_vanity_url_code_change">Özel url **%1$s** olarak ayarlandı</string>
     <string name="guild_settings_audit_log_guild_vanity_url_code_delete">Özel url **kaldırıldı**</string>
@@ -1553,7 +1506,6 @@ Discord'a, [mikrofonuna erişim izni](onEnableClick) vermelisin."</string>
     <string name="guild_settings_audit_log_member_deaf_off">**Sağırlaştırma kaldırıldı**</string>
     <string name="guild_settings_audit_log_member_deaf_on">**Sağırlaştırdı**</string>
     <string name="guild_settings_audit_log_member_kick">$[**%1$s**](targetHook), $[**%2$s**](userHook) tarafından atıldı</string>
-    <string name="guild_settings_audit_log_member_mute_off">**Susturulmasını kaldırdı**</string>
     <string name="guild_settings_audit_log_member_mute_on">**Susturdu**</string>
     <string name="guild_settings_audit_log_member_nick_change">**%1$s** olan kullanıcı adı **%2$s** olarak değiştirildi</string>
     <string name="guild_settings_audit_log_member_nick_create">Kullanıcı adı **%1$s** olarak ayarlandı</string>
@@ -1579,7 +1531,6 @@ Discord'a, [mikrofonuna erişim izni](onEnableClick) vermelisin."</string>
     <string name="guild_settings_audit_log_role_permissions_granted">%1$s **verildi**</string>
     <string name="guild_settings_audit_log_role_update">$[**%1$s**](userHook) $[**%2$s**](targetHook) rolünü güncelledi</string>
     <string name="guild_settings_audit_log_time_at_android">%1$s saat %2$s</string>
-    <string name="guild_settings_audit_log_webhook_avatar">Profil resmi değiştirildi</string>
     <string name="guild_settings_audit_log_webhook_channel_change">Kanal **%1$s** olarak değiştirildi</string>
     <string name="guild_settings_audit_log_webhook_channel_create">**%1$s** kanalı ile</string>
     <string name="guild_settings_audit_log_webhook_create">"$[**%1$s**](userHook) $[**%2$s**](targetHook) webhook'unu oluşturdu"</string>
@@ -1597,6 +1548,8 @@ Discord'a, [mikrofonuna erişim izni](onEnableClick) vermelisin."</string>
     <string name="guild_settings_filter_all_actions">Tüm Eylemler</string>
     <string name="guild_settings_filter_all_users">Tüm Kullanıcılar</string>
     <string name="guild_settings_filter_user">Kullanıcıya Göre Filtrele</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">720p 60fps Go Live yayınları</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">1080p 60fps Go Live yayınları</string>
     <string name="guild_settings_label_audit_log">Denetim Kaydı</string>
     <string name="guild_settings_label_audit_log_empty_body">Moderatörler moderasyona başladıkları zaman moderasyonu buradan modere edebilirsin.</string>
     <string name="guild_settings_label_audit_log_empty_title">Henüz Kayıt Yok</string>
@@ -1608,13 +1561,9 @@ Discord'a, [mikrofonuna erişim izni](onEnableClick) vermelisin."</string>
     <string name="guild_settings_overview_notice">Dikkat et! Kaydetmediğin değişiklikler var!</string>
     <string name="guild_settings_server_invite_background">Sunucu Daveti Arka Planı</string>
     <string name="guild_settings_title_server_widget">"Sunucu Widget'ı"</string>
-    <string name="guild_settings_widget_embed_help">"Discord'un harika hazır widget'ını kullanmak için bu HTML'i web sitene yerleştir.
-
-Sitenin kullanıcılarına erişimin varsa sorgu dizesine etkin bir şekilde &amp;username= ekleyebilirsin."</string>
     <string name="guild_settings_widget_enable_widget">"Sunucu Widget'ını Etkinleştir"</string>
     <string name="guild_verification_text_account_age">Bu sunucuda mesaj gönderebilmek için hesabının en az %1$s dakikalık olması gerekmektedir.</string>
     <string name="guild_verification_text_member_age">Bu sunucuda mesaj gönderebilmek için en az %1$s dakikalık üye olmalısın.</string>
-    <string name="guild_verification_text_not_claimed">Bu sunucuya mesaj atmadan önce hesabını oluşturmalı ve aktif etmelisin.</string>
     <string name="guild_verification_text_not_phone_verified">Bu sunucuda mesaj gönderebilmek için önce telefonun ile kimliğini doğrulamalısın.</string>
     <string name="guild_verification_text_not_verified">Bu sunucuda mesaj göndermeden önce hesabını doğrulaman gerekiyor.</string>
     <string name="guild_verified">Doğrulandı</string>
@@ -1628,14 +1577,13 @@ Sitenin kullanıcılarına erişimin varsa sorgu dizesine etkin bir şekilde &am
     <string name="help_role_locked_mine">Rol kilitli çünkü bu senin en yüksek dereceli rolün. Lütfen daha yüksek rütbeli birinden veya sunucu sahibinden yardım iste.</string>
     <string name="help_singular_permission">Bu izni değiştiremezsin çünkü bu izni silmek bunu senden de siler.</string>
     <string name="hide_instant_invites_description">Rastgele insanların Discord sunucularına erişmesini istemiyorsan önerilir.</string>
-    <string name="hide_instant_invites_label">Anlık Davet Bağlantılarını Gizle</string>
+    <string name="hide_instant_invites_label">Davet Bağlantılarını Gizle</string>
     <string name="hide_muted">%1$s Susturulanı Gizle</string>
     <string name="hide_muted_channels">Sust. Kanalları Gizle</string>
     <string name="hide_personal_information_description">E-postayı, bağlı hesapları, notları gizler ve Discord Etiketlerini anonimleştirir.</string>
     <string name="hide_personal_information_label">Kişisel Bilgileri Gizle</string>
     <string name="hold_up">Bekle</string>
     <string name="home">Ana Sayfa</string>
-    <string name="how_to_invite_others">Merhaba. Beep. Boop. Arkadaşlarını bu sunucuya çağırmak istiyorsan sol üstteki sunucu adına tıkla ve \"%1$s\" özelliğini seç. Beep!</string>
     <string name="hr">Hırvatça</string>
     <string name="hu">Macarca</string>
     <string name="hypesquad_attendee_cta">"HypeSquad'ı yerel oyun etkinliğinde temsil etmek istersen veya kendin bir oyun etkinliği düzenliyorsan [Buraya başvur!](%1$s)"</string>
@@ -1760,7 +1708,6 @@ Sitenin kullanıcılarına erişimin varsa sorgu dizesine etkin bir şekilde &am
     <string name="img_alt_attachment_file_type">Ek dosya türü: %1$s</string>
     <string name="img_alt_emoji">%1$s Emojisi</string>
     <string name="img_alt_icon">%1$s Simgesi</string>
-    <string name="img_alt_logo">%1$s Simgesi</string>
     <string name="img_alt_navigate_to">%1$s hedefine git</string>
     <string name="in_category">%1$s kategorisinde</string>
     <string name="in_the_call">Aramada</string>
@@ -1780,14 +1727,14 @@ Sitenin kullanıcılarına erişimin varsa sorgu dizesine etkin bir şekilde &am
     <string name="input_mode_ptt_release_delay">Bas-Konuş Gecikmesi</string>
     <string name="input_mode_vad">Ses Etkinliği</string>
     <string name="install_location_main">Varsayılan</string>
-    <string name="instant_invite">Anlık Davet</string>
+    <string name="instant_invite">Davet et</string>
     <string name="instant_invite_accept">Daveti Kabul Et</string>
-    <string name="instant_invite_accepted">Anlık Davet Kabul Edildi</string>
-    <string name="instant_invite_accepting">Anlık Davet Kabul Ediliyor</string>
+    <string name="instant_invite_accepted">Davet Kabul Edildi</string>
+    <string name="instant_invite_accepting">Davet Kabul Ediliyor</string>
     <string name="instant_invite_ask_for_new_invite">Yeni bir tane iste!</string>
     <string name="instant_invite_ask_user_for_new_invite">%1$s kullanıcısından yeni bir davet iste!</string>
     <string name="instant_invite_code">Kod</string>
-    <string name="instant_invite_expired">Anlık davet geçersiz ya da geçerliliğini yitirmiş.</string>
+    <string name="instant_invite_expired">Davet geçersiz ya da geçerliliğini yitirmiş.</string>
     <string name="instant_invite_expires">Geçerlilik Süresi</string>
     <string name="instant_invite_failed_to_generate">Davet bağlantısı oluşturulamadı.</string>
     <string name="instant_invite_generate">Oluştur</string>
@@ -1805,16 +1752,15 @@ Sitenin kullanıcılarına erişimin varsa sorgu dizesine etkin bir şekilde &am
     <string name="instant_invite_regenerate">Yeniden Oluştur</string>
     <string name="instant_invite_resolved_body">**%1$s** sunucusundaki **%2$s** kanalına davet edildin.</string>
     <string name="instant_invite_resolved_title">Merhaba.</string>
-    <string name="instant_invite_resolving">Anlık Davet Çözümleniyor</string>
+    <string name="instant_invite_resolving">Davet Çözümleniyor</string>
     <string name="instant_invite_uses">Kullanımlar</string>
     <string name="instant_invite_you_are_already_a_member_of">Şu sunucuya zaten üyesin</string>
     <string name="instant_invite_you_have_been_invited_to_join">Şuraya katılmak için davet edildin</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** seni şuraya katılmaya davet etti</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">"Şu kişi tarafından bir grup DM'sine katılmaya davet edildin:"</string>
-    <string name="instant_invites">Anlık Davetler</string>
+    <string name="instant_invites">Davetler</string>
     <string name="integration_settings">Entegrasyon Ayarları</string>
     <string name="integrations">Entegrasyonlar</string>
-    <string name="integrations_header">Twitch/Youtube Gamings Hesaplarına Bağlanıldı</string>
     <string name="integrations_pro_tip">"Daha fazla entegrasyon için [Discord'un Yayın Kiti](%1$s)'ne göz atın."</string>
     <string name="internal_server_error">Bir iç sunucu hatası oluştu, lütfen yeniden dene.</string>
     <string name="invalid_animated_emoji_body">"Bu emoji hareketli olduğu için çalışmıyor. Hareketli emoji hayallerini hayata geçirmek için Discord Nitro'ya geç"</string>
@@ -1890,14 +1836,12 @@ Sitenin kullanıcılarına erişimin varsa sorgu dizesine etkin bir şekilde &am
     <string name="invite_friend_modal_sent">Gönderildi</string>
     <string name="invite_friend_modal_subtitle">%1$s sunucusu kuruldu. Arkadaşlarını yeni sunucuna davet et.</string>
     <string name="invite_friend_modal_title">Arkadaşlarını Davet Et</string>
-    <string name="invite_friends">Arkadaşlarını Çağır</string>
     <string name="invite_invalid_cta">Daha fazlasını öğrenmek için tıkla</string>
     <string name="invite_invalid_error">"Bu davet bağlantısı geçersiz ya da sona ermiş.
 Discord hakkında daha fazlasını öğrenmek ister misin?"</string>
     <string name="invite_link_copied">Davet kopyalandı!</string>
     <string name="invite_links_expire_after_1_day">Davet bağlantıları varsayılan olarak her 1 günde sona erer</string>
     <string name="invite_links_never_expires">Bu bağlantı hiçbir zaman sona ermez — ayarlardan erişimi iptal et.</string>
-    <string name="invite_members">Üyeleri Çağır</string>
     <string name="invite_modal_button">**%1$s** sunucusuna katıl</string>
     <string name="invite_modal_error_default">Davet kabul edilemiyor</string>
     <string name="invite_modal_error_title">Tüh…</string>
@@ -1927,13 +1871,13 @@ Discord hakkında daha fazlasını öğrenmek ister misin?"</string>
     <string name="join_afk_channel_body">Görünüşe göre AFK kanalına katıldın. Bu kanalda konuşamazsın.</string>
     <string name="join_call">Aramaya Katıl</string>
     <string name="join_server">Katıl</string>
-    <string name="join_server_button_body">Bir Anlık Davet gir ve arkadaşının sunucusuna katıl.</string>
+    <string name="join_server_button_body">Bir Davet gir ve arkadaşının sunucusuna katıl.</string>
     <string name="join_server_button_cta">Bir sunucuya katıl</string>
     <string name="join_server_button_cta_mobile">Davet Bağlantısıyla bir Sunucuya katıl</string>
     <string name="join_server_button_cta_mobile_desc">Bir davet kodun veya bağlantın mı var? Burada kullan!</string>
     <string name="join_server_button_cta_named">%1$s sunucusuna katılın</string>
-    <string name="join_server_description">Var olan bir sunucuya katılmak için aşağıya bir Anlık Davet gir. Davet bunlar gibi görünecektir:</string>
-    <string name="join_server_description_mobile">Var olan bir sunucuya katılmak için yukarıya bir Anlık Davet gir.</string>
+    <string name="join_server_description">Var olan bir sunucuya katılmak için aşağıya bir Davet gir. Davet bunlar gibi görünecektir:</string>
+    <string name="join_server_description_mobile">Var olan bir sunucuya katılmak için yukarıya bir Davet gir.</string>
     <string name="join_server_title">Bir Sunucuya Katıl</string>
     <string name="join_stream">Yayına katıl</string>
     <string name="join_video_call">Görüntülü Aramaya Katıl</string>
@@ -1996,7 +1940,6 @@ geçici olarak kısılacak."</string>
     <string name="keybind_push_to_talk_priority">Bas-Konuş (Öncelikli)</string>
     <string name="keybind_toggle_deafen">Sağırlığı Aç/Kapa</string>
     <string name="keybind_toggle_mute">Susturmayı Aç/Kapat</string>
-    <string name="keybind_toggle_overlay">Arayüz Geçişi</string>
     <string name="keybind_toggle_overlay_input_lock">Arayüz Kilidini Ayarla</string>
     <string name="keybind_toggle_stream_mode">Yayıncı Moduna geç</string>
     <string name="keybind_toggle_voice_mode">VAD \\\"Ses Aktivitesi Algılama\\\" Aç/Kapa</string>
@@ -2041,9 +1984,8 @@ gruba tekrar katılamayacaksın."</string>
     <string name="link_your_xbox_account_2">Discord, oyuncular için ücretsiz, güvenli ve hem masaüstü hem de mobil cihazlarda çalışan bir sesli, yazılı ve görüntülü sohbet uygulamasıdır.</string>
     <string name="listening_to">**%1$s** dinliyor</string>
     <string name="live">Yayında</string>
-    <string name="live_beta_description">Yayıa hoş geldin! Go Live beta sürümünde. Kısa kesintiler için özür dileriz.</string>
+    <string name="live_beta_description">Yayına hoş geldin! Go Live beta sürümünde. Kısa kesintiler için özür dileriz</string>
     <string name="live_on_twitch">"Twitch'te canlı"</string>
-    <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Görüntü yüklenemedi.
 Lütfen tekrar dene."</string>
     <string name="load_more_messages">Daha fazla mesaj yükle</string>
@@ -2066,7 +2008,6 @@ Lütfen tekrar dene."</string>
     <string name="manage_messages_description">Bu izne sahip olan üyeler diğer üyeler tarafından gönderilmiş mesajları silebilir veya herhangi bir mesajı sabitleyebilirler.</string>
     <string name="manage_nicknames">Kullanıcı Adlarını Yönet</string>
     <string name="manage_nicknames_description">Diğer üyelerin kullanıcı adını değiştirebilecek üyeler.</string>
-    <string name="manage_permissions">Yetkileri Yönet</string>
     <string name="manage_permissions_description">Bu izne sahip üyeler bu kanalın izinlerini değiştirebilir.</string>
     <string name="manage_roles">Rolleri Yönet</string>
     <string name="manage_roles_description">Bu izne sahip üyeler yeni roller oluşturabilir ve bundan daha alt rolleri düzenleyebilir/kaldırabilir.</string>
@@ -2105,8 +2046,6 @@ Lütfen tekrar dene."</string>
     <string name="mention_everyone">Herkesten Bahset</string>
     <string name="mention_everyone_autocomplete_description">Bu kanalı görme yetkisine sahip olan herkese haber ver.</string>
     <string name="mention_everyone_autocomplete_description_mobile">Bu kanaldaki herkesi haberdar et.</string>
-    <string name="mention_everyone_description">"Bu yetkiye sahip üyeler, bu kanalın tüm üyelerine gönderilmek istenen bir iletinin başına @everyone veya @here
-yazarak herkese bildirim gönderebilir."</string>
     <string name="mention_here_autocomplete_description">Bu kanalı görüntüleme iznine sahip olan çevrimiçi herkesi haberdar et.</string>
     <string name="mention_here_autocomplete_description_mobile">Bu kanaldaki çevrimiçi üyeleri haberdar et.</string>
     <string name="mention_role_autocomplete_description_mobile">Kanaldaki bu roldeki kullanıcıları haberdar et.</string>
@@ -2170,7 +2109,6 @@ kanallara taşınabilir."</string>
     <string name="mute">Sustur</string>
     <string name="mute_category">Kategoriyi Sustur</string>
     <string name="mute_channel">**%1$s** kanalını sustur</string>
-    <string name="mute_group_dm">**%1$s** sunucusunu sustur</string>
     <string name="mute_members">Üyeleri Sustur</string>
     <string name="mutual_friends">Ortak Arkadaşlar</string>
     <string name="mutual_guilds">Ortak Sunucular</string>
@@ -2203,9 +2141,6 @@ kanallara taşınabilir."</string>
     <string name="new_permission">Yeni İzin</string>
     <string name="new_terms_ack">Bu şartları anlıyorum ve kabul ediyorum.</string>
     <string name="new_terms_continue">"Discord'a devam et"</string>
-    <string name="new_terms_description">"Discord'u kullanmaya devam etmek için, lütfen
-güncellenen Hizmet Şartlarımızı ve Gizlilik Politikamızı oku ve kabul et."</string>
-    <string name="new_terms_title">Hizmet Şartları ve Gizlilik Güncellemesi</string>
     <string name="new_unreads">Yeni Okunmamışlar</string>
     <string name="next">İleri</string>
     <string name="nickname">Kullanıcı adı</string>
@@ -2227,14 +2162,11 @@ güncellenen Hizmet Şartlarımızı ve Gizlilik Politikamızı oku ve kabul et.
     <string name="no_emoji_title">Emoji Yok</string>
     <string name="no_input_devices">Giriş Aygıtı Yok</string>
     <string name="no_input_devices_detected">Giriş cihazı bulunamadı, lütfen bir tane tak ve yeniden dene.</string>
-    <string name="no_instant_invite">Anlık Çağrı Yok</string>
-    <string name="no_integrations">Twitch veya YouTube Gaming hesabınızı [bağlayın](onConnect) ve abonelerinize/sponsorlarınıza rol atayın</string>
+    <string name="no_instant_invite">Davet etme</string>
     <string name="no_integrations_body">FR13NDSH1P protokolü, yalnızca Discord istemcisi üzerinden kullanılabilir</string>
     <string name="no_integrations_label">Entegrasyon Yok</string>
-    <string name="no_invites_body">"Başıboş mu hissediyorsun? Havada süzülen bir kağıt uçak gibi mi?
-Anlık davet bağlantısı oluşturarak buraya birkaç arkadaş getir!"</string>
-    <string name="no_invites_caption">Henüz anlık davet yok!</string>
-    <string name="no_invites_label">Henüz anlık davet yok</string>
+    <string name="no_invites_caption">Henüz davet yok!</string>
+    <string name="no_invites_label">Henüz davet yok</string>
     <string name="no_mail_account_description">Lütfen geri bildirimini support@discordapp.com e-posta adresine gönder ve kullanıcı bilgilerini panoya kopyaladık.</string>
     <string name="no_mail_account_title">E-Posta Hesabı Yok</string>
     <string name="no_mic_body">Mikrofon erişimini etkinleştirmek için gerekli olan açıklamalar Discord Yardım Merkezinde bulunabilir.</string>
@@ -2252,7 +2184,6 @@ hiçbir sabitlenmiş mesajı yok… henüz."</string>
     <string name="no_reactions_header">Tepki Yok</string>
     <string name="no_recent_mentions">Ve başlangıçta… sessizlik vardı.</string>
     <string name="no_send_messages_permission_placeholder">Bu kanalda mesaj gönderme iznine sahip değilsin.</string>
-    <string name="no_system_channel">Yeni Üye Mesajı Yok</string>
     <string name="no_text">Hayır</string>
     <string name="no_thanks">Hayır, teşekkürler</string>
     <string name="no_user_limit">Limit yok</string>
@@ -2264,7 +2195,6 @@ hiçbir sabitlenmiş mesajı yok… henüz."</string>
     <string name="note">Not</string>
     <string name="note_placeholder">Not eklemek için tıkla</string>
     <string name="note_placeholder_mobile">Not eklemek için tıkla</string>
-    <string name="notice_application_test_mode">"Test modu şu anda **%1$s** için aktif durumda. Yayınlamayan SKU'lar görünecek ve senden hiçbir ilgili ödeme alınmayacak."</string>
     <string name="notice_application_test_mode_go_to_listing">"SKU'ya git"</string>
     <string name="notice_connect_spotify">Durumunda dinlediğin müziği göstermek için Spotify hesabını bağla!</string>
     <string name="notice_connection_conflict">Ses bağlantın koptu, çünkü bağlantın başka bir kanalda.</string>
@@ -2275,7 +2205,6 @@ hiçbir sabitlenmiş mesajı yok… henüz."</string>
     <string name="notice_dispatch_error_disk_low">Yeterli disk alanına sahip değilsin. %1$s gerekiyor, ancak sadece %2$s kullanılabilir.</string>
     <string name="notice_dispatch_error_file_name_too_long">Olamaz! Bu oyunda Windows için çok uzun dosya adları bulunuyor. Lütfen daha kısa bir kurulum dizini seç.</string>
     <string name="notice_dispatch_error_invalid_drive">Olamaz! Seçtiğin kurulum konumu geçerli değil. %1$s hedefini seçtin.</string>
-    <string name="notice_dispatch_error_io_permission_denied">Oyunu güncelleyemedik. Oyun şu anda çalışıyor mu?</string>
     <string name="notice_dispatch_error_no_manifests">Olamaz! Görünüşe göre bu oyun için hiçbir içerik bulunmuyor. Lütfen destek ekibiyle görüş.</string>
     <string name="notice_dispatch_error_not_entitled">Olamaz! Görünüşe göre bu oyuna sahip değilsin. Bir hata olduğunu düşünüyorsan lütfen destek ekibiyle görüş.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Görünüşe göre bir kurulum komut dizisini reddettin. Oyunun kurulabilmesi için kabul etmen gerekiyor.</string>
@@ -2290,9 +2219,6 @@ hiçbir sabitlenmiş mesajı yok… henüz."</string>
     <string name="notice_native_apps">Bas-Konuş özelliğini bu sekmeye hapsolmadan kullanabilmek mi istiyorsun? Masaüstü uygulamasını indir!</string>
     <string name="notice_no_input_detected">Görünen o ki, Discord mikrofonundan ses alamıyor. Hadi düzeltelim… birlikte.</string>
     <string name="notice_no_input_detected_help_link_text">Yardım!</string>
-    <string name="notice_premium_applications_grandfathered_ended">"Nitro erişiminin süresi doldu. Muhteşem oyunlara ulaşmak için Nitro Classic üyeliğini Nitro'ya yükselt."</string>
-    <string name="notice_premium_applications_grandfathered_ending">Sadece haftada %1$s Nitro oyunun kaldı! Erişimin **%2$s** tarihinde sona erecek.</string>
-    <string name="notice_premium_applications_grandfathered_started">Bir erken dönem Nitro destekçisi olduğun için teşekkürler! Bu muhteşemliğinin bir ödülü olarak artık %1$s tarihine kadar Nitro oyunlarına erişimin olacak.</string>
     <string name="notice_premium_promo_action">Bir göz at</string>
     <string name="notice_premium_promo_message">"Discord'un gelişimini destekle ve avantajları kap!"</string>
     <string name="notice_scheduled_maintenance">Discord şu tarihlerde bakıma girecek **%1$s**de **%2$s**.</string>
@@ -2405,17 +2331,12 @@ Ayrıca, arayüz herkes için çalışmayabilir. Eğer herhangi bir sorunun var
     <string name="overlay_link_alert_body">Bu bağlantıyı harici bir tarayıcıda açmak üzeresin. Devam etmek istiyor musun?</string>
     <string name="overlay_link_alert_secondary">Aç ve bir daha bana böyle sorularla gelme.</string>
     <string name="overlay_link_alert_title">Bekle!</string>
-    <string name="overlay_menu_get_invite">Davet bağlantısı al</string>
     <string name="overlay_menu_open_discord">"Discord'u Aç"</string>
-    <string name="overlay_menu_switch_channels">Kanal değiştir</string>
-    <string name="overlay_mobile_required">"Discord’un Ses Ayarları’ndan Mobil Arayüz'ü etkinleştir."</string>
-    <string name="overlay_mobile_toggle_desc">Sesli iletişime bağlıyken başka uygulamaları kullandığın sırada kimin konuştuğunu gör ve kısayollara ulaş</string>
     <string name="overlay_mobile_toggle_label">Mobil Ses Arayüzünü Etkinleştir</string>
     <string name="overlay_news_go_live_body">%1$s sunucusundaki arkadaşlarına %2$s yayınlamak mı istiyorsun?</string>
     <string name="overlay_news_text_pinning_body">Artık bir yazılı sohbeti oyununa sabitleyebilirsin!</string>
     <string name="overlay_news_text_pinning_tip">İpucu: Bir sohbeti sabitlemek için $[pinIcon](pinHook) tuşuna bas</string>
     <string name="overlay_news_text_pinning_title">Discord Arayüzü Yükseltildi</string>
-    <string name="overlay_no_results">Uzun uzadıya aradık. Ne yazık ki, hiçbir ses kanalı bulamadık</string>
     <string name="overlay_notification_incoming_call">Gelen arama…</string>
     <string name="overlay_notification_settings_disabled">Bildirimler Devre Dışı</string>
     <string name="overlay_notification_settings_position">Görüntüleniyor: %1$s</string>
@@ -2425,7 +2346,6 @@ Ayrıca, arayüz herkes için çalışmayabilir. Eğer herhangi bir sorunun var
     <string name="overlay_notifications_settings">Arayüz Bildirimleri</string>
     <string name="overlay_notifications_top_left">Sol Üst</string>
     <string name="overlay_notifications_top_right">Sağ Üst</string>
-    <string name="overlay_private_channels_empty_state">Hayır, burada hiç doğrudan mesaj yok.</string>
     <string name="overlay_reload">Arayüzü Tekrar Yükle</string>
     <string name="overlay_settings">Arayüz Ayarları</string>
     <string name="overlay_settings_general_tab">Genel</string>
@@ -2443,11 +2363,8 @@ Ayrıca, arayüz herkes için çalışmayabilir. Eğer herhangi bir sorunun var
     <string name="overwrite_autocomplete_label">Ekle:</string>
     <string name="overwrite_autocomplete_placeholder">Rol/Üye</string>
     <string name="overwrite_no_role_to_add">Bu kanalda bütün roller izinleri iptal etmiş.</string>
-    <string name="pagination_next">İleri</string>
     <string name="pagination_page_of">Sayfa %1$s / %2$s</string>
-    <string name="pagination_previous">Geri</string>
     <string name="paginator_of_pages">Sayfa %1$s / %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Discord Ortağı</string>
     <string name="party_full">Grup Dolu</string>
     <string name="party_join">Gruba Katıl</string>
@@ -2540,18 +2457,11 @@ Ayrıca, arayüz herkes için çalışmayabilir. Eğer herhangi bir sorunun var
     <string name="popout_stay_on_top">Üstte Kalsın</string>
     <string name="post_code">Posta Kodu</string>
     <string name="premium_alert_error_title">Tüh, bir şey yanlış gitti…</string>
-    <string name="premium_applications_grandfathered_monthly">"Discord'a verdiğin destek için teşekkür etmek amacıyla sana bir yıl boyunca Nitro oyunlarına erişim verdik. Erişim süren **%1$s** tarihinde bitecek."</string>
-    <string name="premium_applications_grandfathered_yearly">"Discord'a verdiğin destek için teşekkür etmek amacıyla sana iki yıl boyunca Nitro oyunlarına erişim verdik. Erişim süren **%1$s** tarihinde bitecek."</string>
-    <string name="premium_applications_subtitle">Eleştirmenlerden olumlu notlar alan ve arkadaşlarınla oynaman gerektiğini düşündüğümüz oyunlardan oluşan büyük bir kitaplığa sınırsız erişim.</string>
-    <string name="premium_applications_title">Onlarca küratör oyunu. Tek bir düşük aylık fiyat.</string>
     <string name="premium_badge_tooltip">%1$s tarihinden beri abone</string>
     <string name="premium_cancel_cancel">Hayır</string>
     <string name="premium_cancel_confirm_body_tier_1">"Abonelik iptali güncel fatura döneminin sonunda, yani **%1$s** tarihinde devreye girecek. Bunu değiştirirsen Discord Etiketi rastgele hale getirilecek.
 
 Üyeliğini istediğin zaman tekrar başlatabilirsin."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Abonelik iptali güncel fatura döneminin sonunda devreye girecek. **%1$s** tarihinde, kitaplığındaki tüm Nitro oyunlarına erişimi kaybedeceksin ve eğer değiştirdiysen, Discord Etiketin rastgele belirlenecek.
-
-Belki fikrini değiştirirsin diye kayıt dosyalarını güvenli bir şekilde saklayacağız. İstediğin zaman tekrar abone olabilirsin!"</string>
     <string name="premium_cancel_confirm_new">Evet, %1$s iptal edilsin</string>
     <string name="premium_cancel_confirm_title">%1$s iptal edilsin mi?</string>
     <string name="premium_cancel_failed_body">Nitro aboneliğini iptal edemedik. Lütfen tekrar dene ya da bu sorun devam ederse destek ekibimize ulaş.</string>
@@ -2567,20 +2477,16 @@ Belki fikrini değiştirirsin diye kayıt dosyalarını güvenli bir şekilde sa
     <string name="premium_chat_perks_description_badge">"Özel bir profil rozeti ile Discord'u ne kadar süredir desteklediğini göster."</string>
     <string name="premium_chat_perks_description_custom_emoji">Özel emojilerini her yerde kullanmak için evrensel bir pasaport edin.</string>
     <string name="premium_chat_perks_description_discriminator">Aboneliğin varken etiketini seç.</string>
-    <string name="premium_chat_perks_description_screenshare">Ekran paylaşım oyununu 720p 60fps veya 1080p 30fps ile geliştir.</string>
-    <string name="premium_chat_perks_description_upload_limit">Yüksek kaliteli meme paylaşımı amacıyla %1$s için %2$s üstü büyük dosya yükleme boyutu.</string>
+    <string name="premium_chat_perks_streaming_mobile">"Daha İyi Go Live Yayınları: Nitro ile kaynak hızında veya Nitro Classic ile 1080p 60fps'ye ulaşan net hızlarda yayın yap"</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Hareketli Eğlence</string>
     <string name="premium_chat_perks_title_badge">Desteğini Göster</string>
     <string name="premium_chat_perks_title_custom_emoji">Küresel Özel Emojiler</string>
     <string name="premium_chat_perks_title_discriminator">Özel Discord Etiketi</string>
     <string name="premium_chat_perks_title_screenshare">Daha Yüksek Kaliteli Video</string>
+    <string name="premium_chat_perks_title_streaming">Daha İyi Go Live Yayınları</string>
     <string name="premium_code_redemption_confirmation_blurb">Rastgele bir sayı dizisi sayesinde %1$s geliştirilmiş sohbet avantajları kazandın!</string>
     <string name="premium_code_redemption_confirmation_button">Ooh, Süper!</string>
-    <string name="premium_feature_new_chat_perks_header">Bazı geliştirilmiş sohbet avantajları da elde edeceksin:</string>
-    <string name="premium_feature_new_premium_applications_header">%1$s üzerinde değere sahip oyunlar. Göz at:</string>
-    <string name="premium_feature_view_applications">Tüm Nitro Oyunlarına Bak</string>
     <string name="premium_features_chat_perks">Sohbet Avantajları</string>
-    <string name="premium_features_premium_applications">Ücretsiz Oyunlar</string>
     <string name="premium_grandfathered_warning">Bize verdiğin destek için teşekkür etmek amacıyla sana indirimli bir Nitro planı sunmuştuk. **Planını iptal edersen veya değiştirirsen bu indirimi kaybedeceksin.** Biz uyarımızı yaptık!!!!!</string>
     <string name="premium_grandfathered_warning_confirm">Yine De Yap</string>
     <string name="premium_grandfathered_warning_title">Dikkatli Ol Dostum</string>
@@ -2590,10 +2496,7 @@ Belki fikrini değiştirirsin diye kayıt dosyalarını güvenli bir şekilde sa
     <string name="premium_not_claimed">Önce hesabını sahiplen</string>
     <string name="premium_not_claimed_body">Hey dostum! Nitro satın almak istiyorsan, sahip olduğun şeyleri kaybetmemek için önce hesabını sahiplenmen gerekiyor.</string>
     <string name="premium_not_verified">Önce e-postanı doğrula</string>
-    <string name="premium_not_verified_body">Selam dostum! Nitro satın almak istiyorsan önce e-posta adresini doğrulaman gerek. E-postanı kontrol et veya yeni bir talep gönder.</string>
-    <string name="premium_payment_applications_os_warning">"Nitro oyunları sadece Windows'ta desteklenmektedir."</string>
     <string name="premium_payment_confirmation_blurb_regular">Artık büyük sohbet avantajları gücüne sahipsin. Bunu okumayı bırak ve sohbet etmeye başla!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Artık çok sayıda müthiş oyuna sınırsız erişimin var. Bunu okumayı bırak ve oyunlarını oyna!!!</string>
     <string name="premium_payment_confirmation_button_regular">Tamam, iyi fikir</string>
     <string name="premium_plan_month">Aylık Nitro</string>
     <string name="premium_plan_month_tier_1">Aylık Nitro Classic</string>
@@ -2614,13 +2517,10 @@ Mevcut planını tekrar paylaştıracak ve yıllık fiyattan düşeceğiz. **%1$
     <string name="premium_upgrade_disabled_current_tooltip">Mevcut planın.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Daha düşük seviyeli bir plan seçmek için önce iptal işlemi yapıp aboneliğinin sona ermesini beklemen gerekiyor.</string>
     <string name="premium_upgrade_done_body_tier_1">Artık büyük sohbet avantajlarına sahipsin!</string>
-    <string name="premium_upgrade_done_body_tier_2">Artık büyük sohbet avantajlarına ve onlarca oyuna erişim imkanına sahipsin.</string>
     <string name="premium_upgrade_done_button_tier_1">Süper!</string>
-    <string name="premium_upgrade_done_button_tier_2">Tüm Nitro Oyunlarına Göz At</string>
     <string name="premium_upgrade_failed_body">Iıı… Yükseltme işe yaramadı. Ödeme bilgilerinin güncel olduğundan emin ol ve tekrar dene.</string>
     <string name="premium_upload_promo">"%1$s dosya sınırı için Discord Nitro'ya yükselt"</string>
     <string name="premium_year_free_months">2 Ay Ücretsiz Edin!</string>
-    <string name="premium_year_free_months_short">2 ay ücretsiz</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / Yıl</string>
     <string name="preview_chat">Sohbeti Önizle</string>
     <string name="priority_speaker">Öncelikli Konuşmacı</string>
@@ -2661,7 +2561,6 @@ algılamasını etkinleştirmek için lütfen oyun odakta iken Discord'u yöneti
     <string name="quickswitcher_placeholder">Nereye gitmek istersin?</string>
     <string name="quickswitcher_querymode_applications">Oyunlar Aranıyor</string>
     <string name="quickswitcher_querymode_guilds">Sunucular Aranıyor</string>
-    <string name="quickswitcher_querymode_text_channels">Yazı Kanalları Aranıyor</string>
     <string name="quickswitcher_querymode_users">Tüm Kullanıcılar Aranıyor</string>
     <string name="quickswitcher_querymode_voice_channels">Ses Kanalları Aranıyor</string>
     <string name="quickswitcher_tip_nav">Gezinmek için $[tab](shortcutHook) veya $[down](shortcutHook) $[up](shortcutHook)</string>
@@ -2695,7 +2594,6 @@ algılamasını etkinleştirmek için lütfen oyun odakta iken Discord'u yöneti
     <string name="recent_mentions_filter_everyone">\@everyone bahsetmelerini dahil et</string>
     <string name="recent_mentions_filter_explain_everything">Her şey</string>
     <string name="recent_mentions_filter_label">Şunu Görüntüle:</string>
-    <string name="recent_mentions_filter_roles">\@role bahsetmelerini dahil et</string>
     <string name="recent_mentions_pro_tip">Ne zaman biri sizden bahsederse 7 gün boyunca burada kaydedilecek.</string>
     <string name="recent_mentions_roles_and_direct">direkt ve @rol</string>
     <string name="reconnect">Yeniden Bağlan</string>
@@ -2767,14 +2665,6 @@ sonra yeniden kurmayı deneyeceğiz."</string>
 Eğer tarayıcın bu adımda takıldıysa, sorunu çözmede yardımcı olması için [bu havalı makaleye](%1$s) göz at."</string>
     <string name="rtc_connection_state_no_route">"Tüh. Discord gerçek zamanlı iletişim sunucunla bir UDP bağlantısı kuramıyor. Az sonra tekrar deneyeceğiz.
 Discord bu adımda takılmaya devam ediyorsa, sorunu çözmede yardımcı olması için [bu süslü makaleye](%1$s) göz at."</string>
-    <string name="rtc_connection_state_rtc_connected">"Discord, ortalama **%1$s ms** ping ile senin **%2$s** sunucusunda yaptığın gerçek zamanlı iletişime bağlıdır. Son
-ping **%3$s ms** düzeyindeydi.
-
-Ping sabit değilse veya %4$s ms üstüne çıkıyorsa sunucu sahibinden başka bir bölgeye geçmesini isteyebilirsin."</string>
-    <string name="rtc_connection_state_rtc_connected_loss_rate">"Discord, ortalama **%1$s ms** ping ile senin **%2$s** sunucusunda yaptığın gerçek zamanlı iletişime bağlıdır. Son
-ping **%3$s ms** düzeyindeydi. Giden paket kayıp oranı **%%%4$s**.
-
-Ping sabit değilse veya %5$s ms üstüne çıkıyorsa sunucu sahibinden başka bir bölgeye geçmesini isteyebilirsin. Eğer giden paket kayıp oranı %%%6$s üzerindeyse sesin robot gibi çıkabilir."</string>
     <string name="rtc_connection_state_rtc_connecting">"Ateşe hazır! Discord gerçek zamanlı iletişim sunucunla güvenli bir bağlantı kurdu ve
 veri göndermeyi deniyor."</string>
     <string name="rtc_debug_context">RTC Hata Ayıklama: %1$s</string>
@@ -2787,7 +2677,6 @@ veri göndermeyi deniyor."</string>
     <string name="save">Kaydet</string>
     <string name="save_changes">Değişiklikleri Kaydet</string>
     <string name="save_new_url">Yeni URL Kaydet</string>
-    <string name="scope_activities_read">Etkinlik Akışına Erişim</string>
     <string name="scope_activities_read_description">Bu, uygulamanın etkinlik akışındaki Şimdi Oynuyor ve Son Zamanlarda Oynanan bölümlerinden bilgi almasını sağlar.</string>
     <string name="scope_activities_write">Mevcut etkinliğini güncelle</string>
     <string name="scope_activities_write_description">"Bu sayede uygulama, bir oyun oynadığında veya yayınladığında Discord'a haber verir."</string>
@@ -2805,7 +2694,7 @@ veri göndermeyi deniyor."</string>
     <string name="scope_guilds">Hangi sunucularda bulunduğunu bil</string>
     <string name="scope_guilds_empty">Herhangi bir sunucuda bulunmuyorsun.</string>
     <string name="scope_guilds_join">Senin için olan sunuculara katıl</string>
-    <string name="scope_guilds_join_description">Anlık davetleri kendi adına kullan.</string>
+    <string name="scope_guilds_join_description">Davetleri kendi adına kullan.</string>
     <string name="scope_identify">Kullanıcı adına ve avatarına eriş</string>
     <string name="scope_messages_read">Tüm mesajları oku</string>
     <string name="scope_messages_read_description">Bu, uygulamanın Discord hesabın üzerinden erişilebilen tüm mesajları okumasına izin verir</string>
@@ -2873,7 +2762,6 @@ Hangi ekranı paylaşmak istediğini seç."</string>
     <string name="search_filter_on">şu zamanda</string>
     <string name="search_for_emoji">Mükemmel emojiyi bul</string>
     <string name="search_for_empty">Ara</string>
-    <string name="search_for_value">**%1$s** İçereni Ara</string>
     <string name="search_group_header_channels">Kanalda</string>
     <string name="search_group_header_dates">Tarihler</string>
     <string name="search_group_header_file_name">Dosya Adının İçerdiği</string>
@@ -2909,7 +2797,6 @@ Hangi ekranı paylaşmak istediğini seç."</string>
     <string name="security">Güvenlik</string>
     <string name="select">Seç</string>
     <string name="select_channel_or_category">Bir kanal veya kategori seç…</string>
-    <string name="select_sort_mode">Sınıflandırma Türünü Seç</string>
     <string name="self_deafened">Kendini Sağırlaştırdın</string>
     <string name="self_deny_permission_body">"Bu yetkiyi **%1$s** rolü için engelleyemezsin çünkü bu, yetkiyi senin için de engeller. Tekrar denemeden
 önce başka bir role ya da kendine izin ver."</string>
@@ -3021,8 +2908,6 @@ Bunu yapmak istediğinden emin misin?"</string>
     <string name="sound_message">Mesaj Gönder</string>
     <string name="sound_mute">Sustur</string>
     <string name="sound_outgoing_ring">Giden Çaldırma</string>
-    <string name="sound_ptt_activate">Bas Konuş Etkin</string>
-    <string name="sound_ptt_deactivate">Bas Konuş Etkin Değil</string>
     <string name="sound_stream_started">Yayın Başladı</string>
     <string name="sound_stream_stopped">Yayın Durduruldu</string>
     <string name="sound_undeafen">Sağırlığı Kaldır</string>
@@ -3078,15 +2963,12 @@ Bunu yapmak istediğinden emin misin?"</string>
     <string name="stop_ringing">Çaldırmayı Durdur</string>
     <string name="stop_streaming">Yayını Durdur</string>
     <string name="stop_watching">İzlemeyi Bırak</string>
-    <string name="store_payment_legalese_monthly">Hey! %1$s satın alarak [Mağaza Hizmet Koşullarımızı](%2$s) kabul etmiş olursun. %1$s yenilenen bir aboneliktir, bu da senden bugün ücret alacağımız ve sen aboneliğini iptal edene kadar da aylık ücret almaya devam edeceğimiz anlamına gelir. Kullanıcı Ayarları sekmesinden istediğin zaman iptal edebilirsin.</string>
-    <string name="store_payment_legalese_yearly">Hey! %1$s satın alarak [Mağaza Hizmet Koşullarımızı](%2$s) kabul etmiş olursun. %1$s yenilenen bir aboneliktir, bu da senden bugün ücret alacağımız ve sen aboneliğini iptal edene kadar da yıllık ücret almaya devam edeceğimiz anlamına gelir. Kullanıcı Ayarları sekmesinden istediğin zaman iptal edebilirsin.</string>
     <string name="stream_bad_spectator">Şu anda düşük video veya ses kalitesinde yayın izliyorsun. Bu, ağ koşullarından kaynaklanıyor olabilir.</string>
     <string name="stream_bad_streamer">Şu anda düşük video veya ses kalitesinde yayın yapıyorsun. Bu, ağ koşullarından kaynaklanıyor olabilir.</string>
     <string name="stream_capture_paused">Yayın Duraklatıldı</string>
     <string name="stream_capture_paused_details">Devam etmek için oyuna geç.</string>
     <string name="stream_capture_paused_details_viewer">%1$s oyunu küçülttü… biraz bekle!</string>
     <string name="stream_channel_description">Bu izne sahip üyeler bu kanalda yayın yapabilirler.</string>
-    <string name="stream_description">Bu izne sahip üyeler bu kanala girebilirler.</string>
     <string name="stream_ended">Bu yayın sona erdi. *kriket sesi*</string>
     <string name="stream_ended_button">Yayın bitti</string>
     <string name="stream_ended_no_spectators">Yayın bittiği için hiç izleyici yok.</string>
@@ -3097,7 +2979,6 @@ Bunu yapmak istediğinden emin misin?"</string>
     <string name="stream_no_preview">Yayın henüz başladı. Buraya gel!</string>
     <string name="stream_playing">%1$s Oynuyor</string>
     <string name="stream_preview_loading">Önizleme oluşturuluyor…</string>
-    <string name="stream_preview_paused">Yayının halen devam ediyor mu?</string>
     <string name="stream_preview_paused_subtext">Kaynaklarını kaydetmek için bu önizlemeyi henüz duraklattık.</string>
     <string name="stream_quality_unlock">Nitro ile Aç</string>
     <string name="stream_reconnecting_error">Yayından düştün…</string>
@@ -3126,7 +3007,6 @@ Bunu yapmak istediğinden emin misin?"</string>
     <string name="stream_report_rating_body_streamer">Bize yayın yapma deneyiminden bahset.</string>
     <string name="stream_report_submit">Gönder</string>
     <string name="stream_reported">Geri Bildirim Gönderildi</string>
-    <string name="stream_reported_body">Yaşadığın sorunu bildirdiğin için teşekkürler! Geri bildirimin sayesinde yayın kalitesini geliştirebileceğiz.</string>
     <string name="stream_soundshare_failed">Hey, bir hata oluştu ve oyunun sesini yayınlayamadık.</string>
     <string name="streamer_mode">Yayıncı Modu</string>
     <string name="streamer_mode_enabled">Yayıncı Modu Etkinleştirildi</string>
@@ -3162,7 +3042,6 @@ Bunu yapmak istediğine emin misin?"</string>
     <string name="sync_across_clients_text_help">Bu seçeneği aktif hale getirmek; masaüstü ve tarayıcı oturumları dahil tüm resim ve metin ayarlarının üzerine yazacaktır.</string>
     <string name="sync_friends">"Arkadaşlarını Discord'a senkronize et"</string>
     <string name="sync_now">Şimdi Senkronize Et</string>
-    <string name="sync_permissions">Yetkileri Senkronize Et</string>
     <string name="sync_permissions_explanation">**%1$s** izinlerini **%2$s** ile senkronize etmek ister misin?</string>
     <string name="sync_revoked">Senkronizasyon bağlantısı iptal edildi! %1$s, kullanıcı ayarlarından %2$s platformuna tekrar bağlanmalı.</string>
     <string name="sync_this_account">Bu hesabı senkronize et</string>
@@ -3184,7 +3063,6 @@ Bunu yapmak istediğine emin misin?"</string>
     <string name="system_message_guild_member_join_10">Vahşi bir %1$s belirdi.</string>
     <string name="system_message_guild_member_join_11">Vınnnnn. %1$s az önce iniş yaptı.</string>
     <string name="system_message_guild_member_join_12">Sıkı durun. %1$s az önce sunucuya katıldı.</string>
-    <string name="system_message_guild_member_join_13">%1$s az önce katıldı. Muzlarınızı saklayın.</string>
     <string name="system_message_guild_member_join_14">%1$s az önce geldi. OP görünüyor - lütfen nerfleyin.</string>
     <string name="system_message_guild_member_join_15">%1$s az önce kayarak sunucuya girdi.</string>
     <string name="system_message_guild_member_join_16">Sunucuda bir %1$s spawn oldu.</string>
@@ -3195,7 +3073,6 @@ Bunu yapmak istediğine emin misin?"</string>
     <string name="system_message_guild_member_join_21">Meydan okuyucu yaklaşıyor - %1$s ortaya çıktı!</string>
     <string name="system_message_guild_member_join_22">Bu bir kuş! Bu bir uçak! Boşver, o sadece %1$s.</string>
     <string name="system_message_guild_member_join_23">%1$s geldi! Tüm dertler bitti! \\\\[T]/</string>
-    <string name="system_message_guild_member_join_25">Ha! %1$s katıldı! Tuzak kartımı etkinleştirdin!</string>
     <string name="system_message_guild_member_join_26">Tezahüratlar, aşk! %1$s burada!</string>
     <string name="system_message_guild_member_join_27">Hey! Dinle! %1$s bizlerle!</string>
     <string name="system_message_guild_member_join_28">Seni bekliyorduk %1$s</string>
@@ -3224,7 +3101,6 @@ Bunu yapmak istediğine emin misin?"</string>
     <string name="tap_add_nickname">Bir kullanıcı adı eklemek için dokunun</string>
     <string name="temporary_membership_explanation">"Geçici üyelere bir rol atanmadığı takdirde, bağlantıları kesildiğinde
 otomatik olarak atılırlar"</string>
-    <string name="terms_of_service">[Hizmet Şartları](%1$s)</string>
     <string name="terms_privacy">"Kaydolarak Discord'un [Hizmet Koşulları](%1$s)'nı ve [Gizlilik Politikası](%2$s)'nı kabul etmiş olursun."</string>
     <string name="terms_privacy_opt_in">"Discord'un [Hizmet Koşulları](%1$s)'nı ve [Gizlilik Politikası](%2$s)'nı okudum ve kabul ediyorum."</string>
     <string name="terms_privacy_opt_in_tooltip">Devam etmek için hizmet koşullarımızı kabul etmen gerekiyor</string>
@@ -3234,7 +3110,6 @@ otomatik olarak atılırlar"</string>
     <string name="text_channel">Metin Kanalı</string>
     <string name="text_channels">Metin Kanalları</string>
     <string name="text_channels_matching">**%1$s** ile eşleşen yazı kanalları</string>
-    <string name="text_permissions">Yazı Yetkileri</string>
     <string name="textarea_placeholder">%1$s kanalına mesaj gönder</string>
     <string name="theme">Tema</string>
     <string name="theme_dark">Koyu</string>
@@ -3261,7 +3136,6 @@ otomatik olarak atılırlar"</string>
     <string name="tts_current">Seçili olan kanal için</string>
     <string name="tts_never">Asla</string>
     <string name="tutorial_close">Anladım!</string>
-    <string name="tweet_us">Tweetle</string>
     <string name="two_fa">İki aşamalı doğrulama</string>
     <string name="two_fa_activate">Etkinleştir</string>
     <string name="two_fa_auth_code">6 haneli doğrulama kodu</string>
@@ -3271,7 +3145,6 @@ otomatik olarak atılırlar"</string>
     <string name="two_fa_backup_code_used">kullanılmış</string>
     <string name="two_fa_backup_codes_body">"Bu kodlar eğer doğrulama uygulamasını kaybedersen
 hesabına girmene imkan verecek. **Her bir kod sadece bir kere kullanılabilir! Önceden oluşturulmuş hiçbir kod çalışmayacaktır!**"</string>
-    <string name="two_fa_backup_codes_label">Kodları Yedekle</string>
     <string name="two_fa_backup_codes_sales_pitch">Doğrulama uygulamana erişimini kaybettiğin takdirde daha önce oluşturulmuş yedek kodlarla hesabına yeniden erişebilirsin. Hesabının erişimini kaybetme tehlikesini azaltmak için bunları güvenli bir yerde sakla!</string>
     <string name="two_fa_change_account">Hesap detaylarını değiştir</string>
     <string name="two_fa_disable">İki Aşamalı Kimlik Doğrulamayı devre dışı bırak</string>
@@ -3340,14 +3213,11 @@ hem şifreni hem de cep telefonundan doğrulama kodunu girmen gerekecektir."</st
     <string name="unpin_message_body">Bu kadarı yetti, sanırım. Bu sabitlenmiş mesajı silmek istediğine emin misin?</string>
     <string name="unpin_message_context_menu_hint">"Bu onaylamayı tamamen atlamak için **mesaj sabitlemesini kaldır**a tıklarken shift'e basılı tutabilirsin."</string>
     <string name="unpin_message_failed_body">Discord bir sebepten dolayı o mesajın sabitlenmesini kaldırmada başarısız oldu. Bunun için üzgünüz.</string>
-    <string name="unpin_message_failed_title">Raptiye Sıkıştı!</string>
     <string name="unpin_message_title">Mesaj Sabitlemesini Kaldır</string>
     <string name="unread_channels">Okunmamış Kanallar</string>
     <string name="unsupported_browser">Desteklenmeyen Tarayıcı</string>
     <string name="unsupported_browser_body">"Görünüşe göre desteklenmeyen bir tarayıcı kullanıyorsun. Discord'un sunabileceklerini deneyimlemek için
 tarayıcını güncelle ya da uygulamalarımızdan birini indir."</string>
-    <string name="unsupported_browser_details">"Takımın ile konuşabilmeyi istiyorsun, değil mi? Hemen konuşmaya başlamak için en yeni Chrome, Opera, Firefox 38+ sürümlerine geç ya da Discord İstemcisini indir
-!"</string>
     <string name="unsupported_browser_title">Hmm, bu biraz garip</string>
     <string name="unverified_account_body">"Lütfen e-postanı kontrol et ve hesabını doğrulamak için gerekli yönergeleri takip et.
 
@@ -3465,16 +3335,12 @@ Doğrudan yüklemek için shift basılı tutun."</string>
     <string name="user_settings_appearance_preview_message_4">Günü bekliyorum</string>
     <string name="user_settings_appearance_preview_message_5">Oh işte burada!</string>
     <string name="user_settings_appearance_zoom_tip">%1$s +/- ile yakınlaştırma düzeyini değiştirebilirsin ve %1$s+0 ile yakınlaştırma düzeyini varsayılan değere sıfırlayabilirsin.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Oyunlar Sekmesini Göster</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Oyun sekmesini gizleyip konuşmalara odaklanabilmek için bunu kapat.</string>
     <string name="user_settings_close_button">Kapatma Düğmesi</string>
     <string name="user_settings_confirm_logout">Çıkış yapmak istediğine emin misin?</string>
     <string name="user_settings_game_activity">Oyun Etkinliği</string>
     <string name="user_settings_game_library">Oyun Kitaplığı</string>
     <string name="user_settings_games_install_location">Konum</string>
-    <string name="user_settings_games_install_location_add">Kurulum konumu ekle</string>
     <string name="user_settings_games_install_location_make_default">Bunu varsayılan konum yap</string>
-    <string name="user_settings_games_install_location_name">Kurulum Konumu Adı</string>
     <string name="user_settings_games_install_location_remove">Konumu kaldır</string>
     <string name="user_settings_games_install_location_space">%1$s / %2$s kullanılabilir</string>
     <string name="user_settings_games_install_locations">Kurulum konumları</string>
@@ -3525,8 +3391,6 @@ Bunun, sunucunu bu linki kullanan herhangi birine alenen mevcut hale getirdiğin
     <string name="vanity_url_hint_mobile">"senin-url'n-buraya"</string>
     <string name="verfication_expired">E-posta doğrulama bağlantının süresi doldu.</string>
     <string name="verfication_expired_suggestion">"Lütfen Discord'a giriş yap ve bağlantıyı tekrar gönder"</string>
-    <string name="verification_body">"Olağan dışı bir şeyler olduğunu tespit ettik.
-Discord'u kullanmaya devam etmek için, **insan olduğunu doğrulamamız gerek.**"</string>
     <string name="verification_body_alt">Şimdi, insan olduğundan bir emin olalım…</string>
     <string name="verification_email_body">**%1$s** adresine yeni bir doğrulama e-postası gönderdik, lütfen hem gelen kutunu hem istenmeyen posta klasörünü kontrol et.</string>
     <string name="verification_email_error_body">Sana bir doğrulama e-postası gönderirken bir hata oluştu. Daha sonra tekrar dene veya destek ile iletişime geç.</string>
@@ -3553,8 +3417,6 @@ Discord'u kullanmaya devam etmek için, **insan olduğunu doğrulamamız gerek.*
     <string name="verify_account">Hesabını Doğrula</string>
     <string name="verify_by">Şununla doğrula</string>
     <string name="verify_by_email">E-posta ile doğrula</string>
-    <string name="verify_by_email_formatted">"Şununla onayla
-**E-posta**"</string>
     <string name="verify_by_phone">Telefonla doğrula</string>
     <string name="verify_by_phone_formatted">"
 **Telefonla** doğrula"</string>
@@ -3565,8 +3427,6 @@ Discord'u kullanmaya devam etmek için, **insan olduğunu doğrulamamız gerek.*
     <string name="verify_phone">Telefonu Doğrula</string>
     <string name="verifying">Doğrulama</string>
     <string name="video_call">Görüntülü Arama</string>
-    <string name="video_poor_connection_body">Görüntülü arama devre dışı bırakıldı. Bağlantın düzeldiğinde devam edecek.</string>
-    <string name="video_poor_connection_title">Zayıf Bağlantı</string>
     <string name="video_preview">Video Önizleme</string>
     <string name="video_settings">Görüntü Ayarları</string>
     <string name="video_unavailable">Görüntülü Sohbet Mevcut Değil</string>
diff --git a/com.discord/res/values-uk/plurals.xml b/com.discord/res/values-uk/plurals.xml
index 1f14ec1cc8..1f0c601aaf 100644
--- a/com.discord/res/values-uk/plurals.xml
+++ b/com.discord/res/values-uk/plurals.xml
@@ -99,16 +99,6 @@
         <item quantity="one">%d слот</item>
         <item quantity="few">%d слота</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d днів</item>
-        <item quantity="one">1 день</item>
-        <item quantity="few">%d дні</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d учасників</item>
-        <item quantity="zero">0 учасників</item>
-        <item quantity="one">1 учасника</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">днів</item>
         <item quantity="one">день</item>
@@ -235,16 +225,6 @@
         <item quantity="one">дозвіл</item>
         <item quantity="few">дозволи</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Встановив тривалість повільного режиму **!!%d!! секунд**</item>
-        <item quantity="zero">Вимкнув повільний режим</item>
-        <item quantity="one">Встановив тривалість повільного режиму **1 секунда**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Встановив тривалість повільного режиму **!!%d!! секунд**</item>
-        <item quantity="zero">Вимкнув повільний режим</item>
-        <item quantity="one">Встановив тривалість повільного режиму **1 секунда**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! членів**</item>
         <item quantity="one">**члена**</item>
@@ -319,10 +299,6 @@
         <item quantity="one">1 день</item>
         <item quantity="few">%d дні</item>
     </plurals>
-    <plurals name="live_viewers_viewers">
-        <item quantity="other">глядачів</item>
-        <item quantity="one">глядач</item>
-    </plurals>
     <plurals name="max_uses_description_mobile_maxUses">
         <item quantity="other">%d використань</item>
         <item quantity="zero">Без обмежень</item>
@@ -354,10 +330,6 @@
         <item quantity="one">1 нове повідомлення</item>
         <item quantity="few">%d нових повідомлення</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d дн.</item>
-        <item quantity="one">один день</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d каналів</item>
         <item quantity="one">%d канал</item>
@@ -378,11 +350,6 @@
         <item quantity="other">ці повідомлення</item>
         <item quantity="one">це повідомлення</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** серверів недоступні через тимчасове відключення.</item>
-        <item quantity="one">**1** сервер недоступний через тимчасове відключення.</item>
-        <item quantity="few">**%d** сервери недоступні через тимчасове відключення.</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d місяців</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 ed92c56af3..82b93b609b 100644
--- a/com.discord/res/values-uk/strings.xml
+++ b/com.discord/res/values-uk/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"Ти не можеш надіслати запрошення, тому що ти або невидимий, або приховуєш свій ігровий статус. Якщо ти не бажаєш змінювати
 свої налаштування, ти можеш попросити когось надіслати запрошення замість тебе."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Зрозуміло!</string>
-    <string name="activity_panel_go_live_hotspot_header">Почни трансляцію, щоб транслювати свій геймплей безпосередньо своїм друзям!</string>
+    <string name="activity_panel_go_live_hotspot_header">Використовуй Go Live, щоб транслювати свій геймплей безпосередньо своїм друзям!</string>
     <string name="activity_panel_go_live_tooltip">Трансляція</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">На цьому сервері немає голосових каналів, у які можна транслювати.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Ти не можеш транслювати в цей голосовий канал.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Перейди до сервера, щоб почати транслювати.</string>
     <string name="add">Додати</string>
     <string name="add_a_comment_optional">Додати коментар (додатково)</string>
@@ -159,7 +157,6 @@
     <string name="application_entitlement_code_redemption_confirmation_title">Є таке!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Перейти до бібліотеки</string>
     <string name="application_entitlement_code_redemption_invalid">Введено невірний код</string>
-    <string name="application_entitlement_code_redemption_prompt">Маєш код до гри? Введи його далі:</string>
     <string name="application_entitlement_code_redemption_redeem">Використати</string>
     <string name="application_filter_name_linux">Усі файли</string>
     <string name="application_filter_name_macos">Програми</string>
@@ -419,7 +416,6 @@
     <string name="application_store_view_all_news">Читати всі новини</string>
     <string name="application_store_warning_dlc_requires_base_application_description">Щоб грати в цей контент, у тебе на Discord має бути %1$s. [Дізнатися про контент для завантаження.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Контент для завантаження</string>
-    <string name="application_store_warning_early_access_description">Ця гра дуже цікава (ми так вважаємо!), але може містити обмежений контент, різноманітні помилки або створювати відчуття, що вона не закінчена. [Дізнатися про ранній доступ.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Ранній доступ</string>
     <string name="application_store_warning_requires_desktop_app_description">Щоби грати в цю гру, необхідно встановити $[настільну версію](downloadHook) Discord.</string>
     <string name="application_store_warning_requires_desktop_app_title">Необхідна програма для ПК</string>
@@ -542,7 +538,6 @@
     <string name="billing_error_section_card">Отакої! Схоже, з цією банківською карткою щось не так. Заповни поля правильно та спробуй ще раз!</string>
     <string name="billing_history">Історія виставлення рахунків</string>
     <string name="billing_legal_mumbo_jumbo">Юридичні штуки</string>
-    <string name="billing_legal_mumbo_jumbo_label">Я приймаю [Умови Надання Послуг Магазину Discord](%1$s)</string>
     <string name="billing_no_payment_method">Немає збережених способів оплати</string>
     <string name="billing_no_payment_method_description">Здійснюй покупки швидше — збережи спосіб оплати</string>
     <string name="billing_pay_for_it_with">Заплатити за допомогою</string>
@@ -550,12 +545,7 @@
     <string name="billing_payment_breakdown_total">Усього</string>
     <string name="billing_payment_history">Історія транзакцій</string>
     <string name="billing_payment_premium">Твоя підписка</string>
-    <string name="billing_payment_premium_legalese_monthly">Купуючи підписку %1$s, ти приймаєш наші [Умови Надання Послуг Магазину](%2$s). %1$s — це є підписка з автоматичною періодичною оплатою. Ти дозволяєш Discord негайно списати з тебе суму %3$s за допомогою вказаного способу оплати та продовжувати автоматично списувати оплату раз на місяць, доки ти не скасуєш підписку. Скасувати її можна в будь-який момент.</string>
-    <string name="billing_payment_premium_legalese_yearly">Купуючи підписку %1$s, ти приймаєш наші [Умови Надання Послуг Магазину](%2$s). %1$s — це підписка з періодичною автоматичною оплатою. Ти дозволяєш Discord негайно списати з тебе суму %3$s за допомогою вказаного способу оплати та продовжувати автоматично списувати оплату щорічно, доки ти не скасуєш підписку. Скасувати її можна в будь-який момент.</string>
     <string name="billing_payment_sources">Способи оплати</string>
-    <string name="billing_payment_table_header_amount">СУМА</string>
-    <string name="billing_payment_table_header_date">ДАТА</string>
-    <string name="billing_payment_table_header_description">ОПИС</string>
     <string name="billing_premium_refund_text">Повернення грошей можна запросити, якщо цю покупку було зроблено за останні %1$s днів. [Наш дружній відділ підтримки допоможе тобі повернути свої монети.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Нажаль, неможливо повернути гроші за цю покупку. Повернення грошей можна запросити, якщо цю покупку було зроблено за останні %1$s днів.</string>
     <string name="billing_price_per_month">%1$s на місяць</string>
@@ -565,9 +555,7 @@
     <string name="billing_purchase_details_header">Опис покупки</string>
     <string name="billing_refund_header">Виникли проблеми з покупкою?</string>
     <string name="billing_refund_play_time_never_played">Ще не грав</string>
-    <string name="billing_refund_play_time_subheader">ЧАС У ГРІ</string>
     <string name="billing_refund_purchase_date">%1$s</string>
-    <string name="billing_refund_purchase_date_subheader">ДАТА ПОКУПКИ</string>
     <string name="billing_refund_report_a_problem">Повідомити про проблему</string>
     <string name="billing_refund_request_button">Запросити повернення коштів</string>
     <string name="billing_sales_tax_added">"Для твоєї адреси виставлення рахунку при покупці обов'язково додається податок з продажів у розмірі %1$s."</string>
@@ -807,7 +795,6 @@
     <string name="connection_enter_code">"Введи код, що з'явився на твоєму екрані"</string>
     <string name="connection_invalid_pin">Введено недійсний PIN-код</string>
     <string name="connection_login_with">або увійди за допомогою</string>
-    <string name="connection_problems_body">Перевір [статус сервера](%1$s) або напиши в Twitter [@discordapp](%2$s).</string>
     <string name="connection_status_authenticating">Аутентифікація</string>
     <string name="connection_status_awaiting_endpoint">Чекаємо відповіді від серверу</string>
     <string name="connection_status_connected">"З'єднано"</string>
@@ -852,7 +839,7 @@
     <string name="create_category">Створити категорію</string>
     <string name="create_channel">Створити канал</string>
     <string name="create_group_dm">Створити групу ПП</string>
-    <string name="create_instant_invite">Створювати миттєві запрошення</string>
+    <string name="create_instant_invite">Створити запрошення</string>
     <string name="create_link">Створити посилання</string>
     <string name="create_or_join_modal_header">О, то ще один сервер, га?</string>
     <string name="create_server_button_body">Створи новий сервер та запроси своїх друзів! Це безкоштовно!</string>
@@ -968,7 +955,6 @@
     <string name="disable_email_notifications_failed_suggestion">"Сповіщення електронною поштою могли вже бути вимкнені, або ця адреса електронної пошти більше не пов'язана з акаунтом Discord."</string>
     <string name="disable_integration_title">Вимкнути синхронізацію</string>
     <string name="disable_integration_twitch_body">Вимкнення синхронізації призведе до виконання обраної поведінки передплати, термін дії якої закінчився, так, ніби термін дії всіх передплат закінчився.</string>
-    <string name="disable_integration_youtube_body">Вимкнення синхронізації призведе до виконання обраної спонсорської поведінки, термін дії якої закінчився, так, ніби термін дії всіх спонсорів закінчився.</string>
     <string name="disable_notifications_description">Усі сповіщення на ПК будуть вимкнені.</string>
     <string name="disable_notifications_label">Вимкнути сповіщення</string>
     <string name="disable_sounds_description">Всі звукові ефекти буде вимкнено.</string>
@@ -984,7 +970,6 @@
     <string name="discord_desc_long">"Безкоштовний і безпечний чат для гравців, працює на твоєму комп'ютері та телефоні."</string>
     <string name="discord_desc_short">Груповий голосовий та текстовий чат</string>
     <string name="dismiss">Скасувати</string>
-    <string name="dispatch_error_modal_body">Щось пішло не так. Якщо проблема залишиться, створи звернення до служби підтримки та скопіюй до нього текст, наведений нижче.</string>
     <string name="dispatch_error_modal_error_label">Повідомлення про помилку (скопіюй та встав мене)</string>
     <string name="dispatch_error_modal_header">Помилка Discord Dispatch</string>
     <string name="dispatch_error_modal_open_ticket">Створити звернення</string>
@@ -1099,7 +1084,7 @@
     <string name="file_rate_mb">%1$s Мбіт/с</string>
     <string name="file_size_gb">%1$s ГБ</string>
     <string name="file_size_mb">%1$s МБ</string>
-    <string name="file_upload_limit_premium">50 МБ</string>
+    <string name="file_upload_limit_premium_tier_1">50 МБ</string>
     <string name="file_upload_limit_standard">8 МБ</string>
     <string name="filter">Фільтр</string>
     <string name="filter_mentions">Фільтрувати згадування</string>
@@ -1121,8 +1106,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="form_help_attenuation">"Зменш гучність інших додатків на певний відсоток, коли хтось говорить.
 Встанови 0%% для остаточного вимкнення приглушення."</string>
     <string name="form_help_automatic_vad">Якщо індикатор повністю зелений, значить, Discord транслює свій чарівний голос.</string>
-    <string name="form_help_bitrate">"**АГОВ, БІТИ!** Не варто підіймати бітрейт вище %1$sкбіт/с, якщо ти, звичайно, не аудіофіл, бо це негативно 
-вплине на людей, які використовують мобільні пристрої або мають повільне інтернет-з'єднання, і не дасть жодних переваг."</string>
     <string name="form_help_certified_voice_processing">"Якщо використовується сертифікований мікрофон Discord, деякі функції обробки голосу надаються не самим сервісом Discord,
 а мікрофоном."</string>
     <string name="form_help_channel_permissions">Вибір ролей автоматично налаштує основні дозволи для цього каналу.</string>
@@ -1135,11 +1118,6 @@ AFK. Це не впливає на браузери."</string>
 кожному надісланому повідомленні на цьому сервері. Ми рекомендуємо налаштувати цей параметр тільки на @згадування на публічному сервері Discord"</string>
     <string name="form_help_explicit_content_filter">"Автоматично сканувати і видаляти повідомлення на цьому сервері, що містять відвертий контент. Будь ласка, вибери, наскільки широко буде застосовуватися 
 фільтр до учасників твого сервера. **Ми рекомендуємо встановлювати фільтр для публічних серверів Discord.**"</string>
-    <string name="form_help_instant_invite_channel">"Якщо канал було обрано, то посилання із миттєвим запрошенням генеруватиметься разом з віджетом. 
-В іншому випадку будуть доступні лише учасники в мережі та голосові чати."</string>
-    <string name="form_help_last_seen">"Очищення видалить зі списку учасників **%1$s**,
-які не з'явились на сервері **%2$s**, і яким не призначено жодної ролі.
-Вони зможуть знову зайти на сервер за допомогою нового миттєвого запрошення."</string>
     <string name="form_help_legacy_subsystem">"Певні аудіо драйвери можуть мати проблеми при використанні сучасної аудіо-підсистеми твоєї операційної системи. 
 Встанови цей прапорець для повернення до попередніх версій аудіо-підсистеми."</string>
     <string name="form_help_nsfw">"Користувачі мають підтвердити, що вони досягли встановленого законом віку для перегляду контенту на цьому каналі.
@@ -1149,7 +1127,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="form_help_qos">"Натякає твоєму роутеру, що передача пакетів Discord має високий пріоритет.
 Деякі роутери або інтернет-провайдери можуть неправильно працювати, якщо обрано цей параметр."</string>
     <string name="form_help_slowmode">Протягом цього інтервалу учасники можуть відправляти лише одне повідомлення, окрім випадків, коли вони мають дозволи «Керування каналом» або «Керування повідомленнями».</string>
-    <string name="form_help_system_channel">Відправляй повідомлення на цей канал, коли хтось приєднується до його сервера. Повідомлення відображаються випадковим чином. Цю функцію можна відключити в будь-який момент.</string>
     <string name="form_help_temporary">"Учасники автоматично виганяються, якщо вони від'єднуються до призначення ролі."</string>
     <string name="form_help_user_limit">"Обмежує кількість користувачів, які можуть під'єднатися до цього голосового каналу. Користувачі з 
 дозволом **Перемістити учасників** ігнорують це обмеження та можуть переміщати інших користувачів на канал."</string>
@@ -1194,8 +1171,8 @@ AFK. Це не впливає на браузери."</string>
     <string name="form_label_input_mode">Режим введення</string>
     <string name="form_label_input_sensitivty">Чутливість введення</string>
     <string name="form_label_input_volume">Гучність пристрою введення</string>
-    <string name="form_label_instant_invite">Введіть миттєве запрошення</string>
-    <string name="form_label_instant_invite_channel">Миттєве запрошення до каналу</string>
+    <string name="form_label_instant_invite">Введи запрошення</string>
+    <string name="form_label_instant_invite_channel">Запросити на канал</string>
     <string name="form_label_last_seen">Востаннє бачили</string>
     <string name="form_label_local_mute">Заглушити локально</string>
     <string name="form_label_max_age">Завершується через</string>
@@ -1227,7 +1204,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="form_label_notification_position">Положення сповіщення</string>
     <string name="form_label_nsfw_channel">Канал NSFW</string>
     <string name="form_label_off">Вимк.</string>
-    <string name="form_label_only_mentions">Лише **@mentions**</string>
     <string name="form_label_output">Виведення</string>
     <string name="form_label_output_device">Пристрій виведення</string>
     <string name="form_label_output_volume">Гучність пристрою виведення</string>
@@ -1263,7 +1239,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="form_label_suppress_everyone">Ігнорувати **@everyone** та **@here**</string>
     <string name="form_label_synced_role">Синхронізована роль</string>
     <string name="form_label_synced_subs">Синхронізовані передплати</string>
-    <string name="form_label_system_channel">Канал для повідомлень про нових користувачів</string>
     <string name="form_label_temporary">Тимчасова участь</string>
     <string name="form_label_tts">Синтез мовлення</string>
     <string name="form_label_tts_notifications">Сповіщення із синтезом мовлення</string>
@@ -1365,7 +1340,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="game_feed_activity_recently_played">Нещодавно грали</string>
     <string name="game_feed_activity_streaming_twitch">Стрімить на Twitch</string>
     <string name="game_feed_current_header_title">Зараз грають</string>
-    <string name="game_feed_settings_visibility">Показувати на вкладці ігор</string>
     <string name="game_feed_unknown_player">Невідомий гравець</string>
     <string name="game_feed_user_played_days_ago">Грав %1$s %2$s тому</string>
     <string name="game_feed_user_played_hours_ago">Грав %1$s %2$s тому</string>
@@ -1436,6 +1410,7 @@ AFK. Це не впливає на браузери."</string>
     <string name="get_started">Розпочати</string>
     <string name="gif">GIF</string>
     <string name="gif_auto_play_label">Автоматично відтворювати GIF, коли Discord активний.</string>
+    <string name="go_live_hardware_acceleration_unavailable">"Швидке попередження: ми не змогли виявити апаратне прискорення. З підтримкою Go Live твоїм комп'ютером можуть виникнути проблеми."</string>
     <string name="go_live_hey">Привіт!</string>
     <string name="go_live_listen">Слухай!</string>
     <string name="go_live_look">Дивись!</string>
@@ -1449,6 +1424,7 @@ AFK. Це не впливає на браузери."</string>
     <string name="go_live_modal_select_channel_form_title">Вибери голосовий канал</string>
     <string name="go_live_modal_select_channel_placeholder">Пошук голосових каналів</string>
     <string name="go_live_modal_title">Трансляція</string>
+    <string name="go_live_video_drivers_outdated">Твої драйвери відео застарілі. Онови їх, щоб покращити якість Go Live.</string>
     <string name="grant_temporary_membership">Надати тимчасове членство</string>
     <string name="group">Група</string>
     <string name="group_dm_add_friends">Додати друзів до ПП</string>
@@ -1525,8 +1501,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Надав** %1$s для **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Перемістив з позиції **%1$s** на **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">На позиції **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) створив текстовий канал $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Змінив тему на **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Встановив наступну тему: **%1$s**</string>
@@ -1652,7 +1626,7 @@ AFK. Це не впливає на браузери."</string>
     <string name="help_role_locked_mine">Роль заблоковано, тому що вона має найвищий клас з усіх твоїх ролей. Запитай вищий клас або звернися до власника сервера по допомогу.</string>
     <string name="help_singular_permission">Ти не можеш змінювати цей дозвіл, тому що його видалення також забере його в тебе.</string>
     <string name="hide_instant_invites_description">Рекомендується, якщо ти не хочеш, щоб випадкові люди отримували доступ до твоїх серверів Discord.</string>
-    <string name="hide_instant_invites_label">Приховати посилання миттєвих запрошень</string>
+    <string name="hide_instant_invites_label">Приховати посилання із запрошеннями</string>
     <string name="hide_muted">Приховати %1$s заглушених</string>
     <string name="hide_muted_channels">Сховати приглушені канали</string>
     <string name="hide_personal_information_description">Приховує електронну пошту, підключені акаунти, нотатки й анонімізує теги DiscordTag.</string>
@@ -1700,7 +1674,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="hypesquad_question_11_response_d">Пропонуєш Вампусу натомість грати на тамбурині</string>
     <string name="hypesquad_question_12_prompt">Ти піднявся на вершину дуже високої гори, і єдина річ, що відділяє тебе від скарбів, — це триголовий дракон, який став на твоєму шляху. Ти:</string>
     <string name="hypesquad_question_12_response_a">Вступаєш у бій</string>
-    <string name="hypesquad_question_12_response_b">Дивишся старі фільми про Годзілу, щоб навчитися на його боях проти Кінг Гідори</string>
     <string name="hypesquad_question_12_response_c">Намагаєшся умовити дракона розділити скарби на двох</string>
     <string name="hypesquad_question_12_response_d">Пропонуєш дракону плюшевого Вампуса, як йому може це не сподобатися?</string>
     <string name="hypesquad_question_13_prompt">Що це за звук?</string>
@@ -1804,14 +1777,14 @@ AFK. Це не впливає на браузери."</string>
     <string name="input_mode_ptt_release_delay">Затримка натиснення під час активації кнопкою</string>
     <string name="input_mode_vad">Голосова активність</string>
     <string name="install_location_main">Головне</string>
-    <string name="instant_invite">Миттєве запрошення</string>
+    <string name="instant_invite">Запросити</string>
     <string name="instant_invite_accept">Прийняти запрошення</string>
-    <string name="instant_invite_accepted">Миттєве запрошення прийнято</string>
-    <string name="instant_invite_accepting">Приймання миттєвого запрошення</string>
+    <string name="instant_invite_accepted">Запрошення прийнято</string>
+    <string name="instant_invite_accepting">Запрошення приймається</string>
     <string name="instant_invite_ask_for_new_invite">Попроси нове!</string>
     <string name="instant_invite_ask_user_for_new_invite">Звернись до %1$s за новим запрошенням!</string>
     <string name="instant_invite_code">Код</string>
-    <string name="instant_invite_expired">Миттєве запрошення є недійсним, або час його дії вичерпано.</string>
+    <string name="instant_invite_expired">Запрошення є недійсним, або час його дії вичерпано.</string>
     <string name="instant_invite_expires">Завершується</string>
     <string name="instant_invite_failed_to_generate">Не вдалося створити посилання запрошення.</string>
     <string name="instant_invite_generate">Згенерувати</string>
@@ -1829,16 +1802,15 @@ AFK. Це не впливає на браузери."</string>
     <string name="instant_invite_regenerate">Повторно згенерувати</string>
     <string name="instant_invite_resolved_body">Тебе було запрошено до каналу **%1$s** на сервері **%2$s**.</string>
     <string name="instant_invite_resolved_title">О, привіт!</string>
-    <string name="instant_invite_resolving">Миттєве запрошення обробляється</string>
+    <string name="instant_invite_resolving">Запрошення обробляється</string>
     <string name="instant_invite_uses">Використання</string>
     <string name="instant_invite_you_are_already_a_member_of">Ти вже є учасником</string>
     <string name="instant_invite_you_have_been_invited_to_join">Тебе запросили приєднатися до</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** запросив тебе приєднатися до</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Тебе запросив до групового чату користувач</string>
-    <string name="instant_invites">Миттєві запрошення</string>
+    <string name="instant_invites">Запрошення</string>
     <string name="integration_settings">Налаштування інтеграції</string>
     <string name="integrations">Інтеграції</string>
-    <string name="integrations_header">"Під'єднані акаунти Twitch/YouTube Gaming"</string>
     <string name="integrations_pro_tip">Для більшої інтеграції спробуй [набір стрімера Discord](%1$s).</string>
     <string name="internal_server_error">Сталася внутрішня помилка сервера. Спробуй ще раз</string>
     <string name="invalid_animated_emoji_body">Цей емодзі не працює, тому що є анімованим. Перейди на передплату Discord Nitro, щоб здійснити всі свої мрії про анімовані емодзі</string>
@@ -1951,13 +1923,13 @@ AFK. Це не впливає на браузери."</string>
     <string name="join_afk_channel_body">Здається, ти приєднався до каналу AFK. Ти не можеш розмовляти на цьому каналі.</string>
     <string name="join_call">Приєднатися до виклику</string>
     <string name="join_server">Приєднатися</string>
-    <string name="join_server_button_body">Введи миттєве запрошення, щоб приєднатися до сервера друга.</string>
+    <string name="join_server_button_body">Введи запрошення і приєднайся до сервера друга.</string>
     <string name="join_server_button_cta">Приєднатися до сервера</string>
     <string name="join_server_button_cta_mobile">Приєднатися до сервера за посиланням-запрошенням</string>
     <string name="join_server_button_cta_mobile_desc">Маєш код або посилання на запрошення? Використай його тут!</string>
     <string name="join_server_button_cta_named">Приєднатися до %1$s</string>
-    <string name="join_server_description">Введіть миттєве запрошення, вказане нижче, щоб приєднатись до існуючого сервера. Запрошення буде виглядати приблизно так:</string>
-    <string name="join_server_description_mobile">Введіть миттєве запрошення, вказане вище, щоб приєднатися до існуючого сервера.</string>
+    <string name="join_server_description">Введи запрошення, вказане нижче, щоб приєднатись до існуючого сервера. Запрошення буде виглядати приблизно так:</string>
+    <string name="join_server_description_mobile">Введи запрошення, вказане вище, щоб приєднатись до існуючого сервера.</string>
     <string name="join_server_title">Приєднатися до сервера</string>
     <string name="join_stream">Приєднатися до трансляції</string>
     <string name="join_video_call">Приєднатися до відеовиклику</string>
@@ -2065,9 +2037,8 @@ AFK. Це не впливає на браузери."</string>
     <string name="link_your_xbox_account_2">"Discord — це голосовий, текстовий та відеочат для геймерів, який є безкоштовним, надійним та працює на комп'ютері та мобільному пристрої."</string>
     <string name="listening_to">Слухає **%1$s**</string>
     <string name="live">Трансляція</string>
-    <string name="live_beta_description">Вітаємо в трансляції! Ця функція знаходиться на стадії бета-тестування. Вибач за будь-які глюки!</string>
+    <string name="live_beta_description">Вітаємо в трансляції! Функція Go Live знаходиться на стадії бета-тестування. Вибач за будь-які глюки!</string>
     <string name="live_on_twitch">Наживо на Twitch</string>
-    <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Не вдалося завантажити зображення.
 Спробуй ще раз"</string>
     <string name="load_more_messages">Завантажити більше повідомлень</string>
@@ -2251,14 +2222,11 @@ AFK. Це не впливає на браузери."</string>
     <string name="no_emoji_title">Немає емодзі</string>
     <string name="no_input_devices">Немає пристроїв введення</string>
     <string name="no_input_devices_detected">"Пристроїв для введення не знайдено, будь ласка, під'єднай такий пристрій і спробуй ще раз."</string>
-    <string name="no_instant_invite">Немає миттєвого запрошення</string>
-    <string name="no_integrations">"[Під'єднати](onConnect) твій партнерcький акаунт Twitch або YouTube Gaming для синхронізації твоїх передплатників/спонсорів з роллю"</string>
+    <string name="no_instant_invite">Запрошення відсутнє</string>
     <string name="no_integrations_body">Протокол FR13NDSH1P можна виконати тільки з клієнту Discord</string>
     <string name="no_integrations_label">Немає інтеграцій</string>
-    <string name="no_invites_body">"Почуваєшся дещо неприкаяним? Як паперовий літак, який вітер носить у небі?
-Знайди друзів тут, створивши миттєве посилання із запрошенням!"</string>
-    <string name="no_invites_caption">Ще немає миттєвих запрошень!</string>
-    <string name="no_invites_label">Поки що ніяких експрес-запрошень немає</string>
+    <string name="no_invites_caption">Запрошень ще немає!</string>
+    <string name="no_invites_label">Запрошень ще немає</string>
     <string name="no_mail_account_description">Будь ласка, надішліть свій відгук на пошту support@discordapp.com, а інформацію користувача ми скопіювали до буфера обміну.</string>
     <string name="no_mail_account_title">Немає акаунту електронної пошти</string>
     <string name="no_mic_body">Інструкції щодо надання доступу до твого мікрофона можна знайти в центрі допомоги Discord.</string>
@@ -2276,7 +2244,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="no_reactions_header">Реакції відсутні</string>
     <string name="no_recent_mentions">А спочатку… була тиша.</string>
     <string name="no_send_messages_permission_placeholder">Ти не маєш дозволу на написання повідомлень у цьому каналі.</string>
-    <string name="no_system_channel">Немає повідомлень про нових користувачів</string>
     <string name="no_text">Ні</string>
     <string name="no_thanks">Ні, дякую</string>
     <string name="no_user_limit">Ліміт не встановлено</string>
@@ -2288,7 +2255,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="note">Нотатка</string>
     <string name="note_placeholder">Натисни, щоб додати нотатку</string>
     <string name="note_placeholder_mobile">Натисни, щоб додати нотатку</string>
-    <string name="notice_application_test_mode">"Режим перевірки наразі активний для **%1$s**. З'являться неопубліковані SKU, але з тебе не знімуть гроші за пов'язані платежі."</string>
     <string name="notice_application_test_mode_go_to_listing">Перейти до SKU</string>
     <string name="notice_connect_spotify">Підключи свій акаунт Spotify, щоб відображати музику у статусі!</string>
     <string name="notice_connection_conflict">Твій голос було вимкнено, оскільки ти приєднався з іншого місця.</string>
@@ -2299,7 +2265,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="notice_dispatch_error_disk_low">У тебе недостатньо місця на диску. Потрібно %1$s, але доступно лише %2$s.</string>
     <string name="notice_dispatch_error_file_name_too_long">О, ні! Назви файлів у цій грі занадто довгі для Windows. Обери каталог для встановлення з коротшою назвою.</string>
     <string name="notice_dispatch_error_invalid_drive">О, ні! Обраний тобою каталог для встановлення недійсний. Ти обрав %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Нам не вдалося оновити гру. Вона зараз запущена?</string>
     <string name="notice_dispatch_error_no_manifests">О, ні! Здається, відсутній контент для цієї гри. Звернись у службу підтримки.</string>
     <string name="notice_dispatch_error_not_entitled">О, ні! Здається, ти не є власником цієї гри. Звернись у службу підтримки, якщо вважаєш, що виникла помилка.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Здається, ти відмовився запустити інсталяційний скрипт. Тобі потрібно погодитися, щоб встановити гру.</string>
@@ -2314,9 +2279,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="notice_native_apps">Тобі необхідна можливість вільного використання активації кнопкою? Використовуй версію програми для ПК!</string>
     <string name="notice_no_input_detected">Так, здається, Discord не розпізнає вхідні сигнали з твого мікрофона. Давай виправимо це… разом.</string>
     <string name="notice_no_input_detected_help_link_text">Допоможіть!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Термін дії твого доступу до передплати Nitro сплив. Перейди з класичної передплати на передплату Nitro, щоб отримати необмежений доступ до неймовірних ігор.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Ти маєш лише %1$s, щоб грати в ігри Nitro! Твій доступ закінчується **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Дякуємо за те, що став одним з перших користувачів Nitro! За те, що ти такий класний, даруємо тобі доступ до ігор Nitro до %1$s.</string>
     <string name="notice_premium_promo_action">Дізнайся про це</string>
     <string name="notice_premium_promo_message">Підтримай розробку Discord та отримай круті бонуси!</string>
     <string name="notice_scheduled_maintenance">Роботи з технічного обслуговування програми Discord проводитимуться з **%1$s** по **%2$s**.</string>
@@ -2386,7 +2348,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">Накладання увімкнено</string>
     <string name="nux_post_reg_join_server_description">Використовуй Discord на повну, приєднавшись до сервера.</string>
     <string name="nux_post_reg_join_server_skip">У мене немає</string>
     <string name="nux_post_reg_join_server_title">Чи є в тебе запрошення?</string>
@@ -2432,7 +2393,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="overlay_menu_get_invite">Отримати посилання на запрошення</string>
     <string name="overlay_menu_open_discord">Відкрити Discord</string>
     <string name="overlay_menu_switch_channels">Перемкнути канали</string>
-    <string name="overlay_mobile_toggle_desc">Дивись, хто говорить, і отримуй доступ до ярликів під час використання інших програм при підключенні до голосового спілкування</string>
     <string name="overlay_mobile_toggle_label">Увімкнути накладання голосу з мобільного</string>
     <string name="overlay_mobile_unauthed">Щоб активувати цю функцію, треба увійти до програми Discord.</string>
     <string name="overlay_news_go_live_body">Бажаєш транслювати гру %1$s своїм друзям на сервері %2$s?</string>
@@ -2440,7 +2400,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="overlay_news_text_pinning_body">Тепер ти можеш прикріпити текстовий чат до твоєї гри!</string>
     <string name="overlay_news_text_pinning_tip">Підказка: ти можеш прикріпити чат, натиснувши $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Оверлей Discord покращено</string>
-    <string name="overlay_no_results">Ми шукали вздовж і поперек. На жаль, ми не знайшли голосових каналів.</string>
     <string name="overlay_notification_incoming_call">Вхідний виклик…</string>
     <string name="overlay_notification_settings_disabled">Сповіщення вимкнено</string>
     <string name="overlay_notification_settings_position">Відображається: %1$s</string>
@@ -2450,7 +2409,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="overlay_notifications_settings">Сповіщення, що накладаються</string>
     <string name="overlay_notifications_top_left">Зверху ліворуч</string>
     <string name="overlay_notifications_top_right">Зверху праворуч</string>
-    <string name="overlay_private_channels_empty_state">Ні, тут немає приватних повідомлень.</string>
     <string name="overlay_reload">Перезавантажити оверлей</string>
     <string name="overlay_settings">Налаштування оверлею</string>
     <string name="overlay_settings_general_tab">Загальний</string>
@@ -2472,7 +2430,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="pagination_page_of">Сторінка %1$s з %2$s</string>
     <string name="pagination_previous">Назад</string>
     <string name="paginator_of_pages">Сторінка %1$s з %2$s</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Партнер Discord</string>
     <string name="party_full">Група заповнена</string>
     <string name="party_join">Приєднатися до групи</string>
@@ -2569,18 +2526,11 @@ AFK. Це не впливає на браузери."</string>
     <string name="popout_stay_on_top">Закріпити</string>
     <string name="post_code">Індекс</string>
     <string name="premium_alert_error_title">Ой, щось пішло не так…</string>
-    <string name="premium_applications_grandfathered_monthly">В якості подяки за підтримку Discord надаємо тобі доступ до ігор Nitro на один рік. Твій доступ закінчується **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">В якості подяки за підтримку Discord надаємо тобі доступ до ігор Nitro на два роки. Твій доступ закінчується **%1$s**.</string>
-    <string name="premium_applications_subtitle">Необмежений доступ до постійно зростаючої бібліотеки чудових ігор, в які ми радимо зіграти тобі та твоїм друзям.</string>
-    <string name="premium_applications_title">Десятки відбірних ігор. Одна низька щомісячна ціна.</string>
     <string name="premium_badge_tooltip">Передплатник з %1$s</string>
     <string name="premium_cancel_cancel">Ой, ні</string>
     <string name="premium_cancel_confirm_body_tier_1">"Скасування вступить в дію наприкінці поточного періоду оплати **%1$s**. Якщо ти змінив тег Discord, тобі буде надано випадковий тег.
 
 Ти можеш заново розпочати свою передплату в будь-який час."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Скасування вступить в дію наприкінці поточного періоду сплати. **%1$s**ти втратиш доступ до всіх ігор Nitro у твоїй бібліотеці, та, якщо ти змінив тег Discord, тобі буде надано випадковий тег.
-
-Ми збережемо твої файли на випадок, якщо ти передумаєш. Ти можеш заново розпочати свою передплату в будь-який час!"</string>
     <string name="premium_cancel_confirm_new">Так, скасувати %1$s</string>
     <string name="premium_cancel_confirm_title">Скасувати %1$s?</string>
     <string name="premium_cancel_failed_body">Ми не змогли скасувати твою передплату Nitro. Спробуй ще раз або звернись до нашої команди підтримки, якщо проблема не буде вирішена.</string>
@@ -2597,19 +2547,15 @@ AFK. Це не впливає на браузери."</string>
     <string name="premium_chat_perks_description_custom_emoji">Отримай «глобальний паспорт» для використання персоналізованих емодзі будь-де.</string>
     <string name="premium_chat_perks_description_discriminator">Оформивши підписку, ти зможеш обрати власний тег.</string>
     <string name="premium_chat_perks_description_screenshare">Покращ якість своєї демонстрації екрану до 720p 60fps або 1080p 30fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Передавай меми у високій якості завдяки можливості надсилати файли розміром до %1$s (наразі %2$s).</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Анімовані розваги</string>
     <string name="premium_chat_perks_title_badge">Продемонструй усім свою підтримку</string>
     <string name="premium_chat_perks_title_custom_emoji">Глобальні користувацькі емодзі</string>
     <string name="premium_chat_perks_title_discriminator">Користувацький тег Discord</string>
     <string name="premium_chat_perks_title_screenshare">Відео високої якості</string>
+    <string name="premium_chat_perks_title_streaming">Кращі трансляції Go Live</string>
     <string name="premium_code_redemption_confirmation_blurb">Завдяки випадковій комбінації чисел тепер ти маєш додаткові можливості чату, дійсні протягом %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">Чудово!</string>
-    <string name="premium_feature_new_chat_perks_header">Також ти отримаєш деякі чудові переваги чату:</string>
-    <string name="premium_feature_new_premium_applications_header">Ігри сукупною вартістю понад %1$s. Переглянь їх:</string>
-    <string name="premium_feature_view_applications">Дивитися всі ігри Nitro</string>
     <string name="premium_features_chat_perks">Переваги чату</string>
-    <string name="premium_features_premium_applications">Безкоштовні ігри</string>
     <string name="premium_grandfathered_warning">В якості подяки за підтримку надаємо тобі знижку на план Nitro. **Після скасування або зміни плану ти втрачаєш цю знижку. **Ми тебе попередили!!!</string>
     <string name="premium_grandfathered_warning_confirm">Зробити це в будь-якому разі</string>
     <string name="premium_grandfathered_warning_title">Обережніше, друже</string>
@@ -2619,10 +2565,7 @@ AFK. Це не впливає на браузери."</string>
     <string name="premium_not_claimed">Спершу підтвердь свій акаунт</string>
     <string name="premium_not_claimed_body">Слухай, друже! Якщо хочеш купити Nitro, тобі спочатку потрібно підтвердити свій акаунт, щоб не втратити свій мотлох.</string>
     <string name="premium_not_verified">Спочатку треба підтвердити свою адресу ел. пошти</string>
-    <string name="premium_not_verified_body">Вітаємо, друже! Якщо ти бажаєш купити Nitro, тобі потрібно спочатку підтвердити свою електронну пошту. Перевір свою електронну скриньку або запроси новий лист.</string>
-    <string name="premium_payment_applications_os_warning">Ігри Nitro підтримуються лише ОС Windows.</string>
     <string name="premium_payment_confirmation_blurb_regular">Тепер у твоїх руках сила розширених функцій чату. Досить читати це, час спілкуватися!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Тепер ти маєш необмежений доступ до багатьох чудових ігор. Досить читати це, час грати!</string>
     <string name="premium_payment_confirmation_button_regular">Добре звучить</string>
     <string name="premium_plan_month">Щомісячна підписка Nitro</string>
     <string name="premium_plan_month_tier_1">Щомісячна передплата Nitro Classic</string>
@@ -2644,13 +2587,10 @@ AFK. Це не впливає на браузери."</string>
     <string name="premium_upgrade_disabled_current_tooltip">Твоя поточна підписка.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Перш ніж переходити на більш дешеву підписку, ти маєш скасувати поточну підписку та дочекатися, доки мине термін її дії.</string>
     <string name="premium_upgrade_done_body_tier_1">Тепер у тебе є розширені функції чата!</string>
-    <string name="premium_upgrade_done_body_tier_2">Тепер у тебе є розширені функції чата та доступ до безлічі ігор!</string>
     <string name="premium_upgrade_done_button_tier_1">Чудово!</string>
-    <string name="premium_upgrade_done_button_tier_2">Дивитися всі ігри Nitro</string>
     <string name="premium_upgrade_failed_body">Ох… Це покращення не спрацювало. Переконайся в тому, що платіжна інформація актуальна, та спробуй ще раз.</string>
     <string name="premium_upload_promo">Перейди на передплату Discord Nitro, щоб отримати обмеження файлів %1$s</string>
     <string name="premium_year_free_months">Отримай 2 місяці безкоштовно!</string>
-    <string name="premium_year_free_months_short">2 місяці безкоштовно</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / рік</string>
     <string name="preview_chat">Попередній перегляд чату</string>
     <string name="priority_speaker">Пріоритетний голос</string>
@@ -2835,7 +2775,7 @@ AFK. Це не впливає на браузери."</string>
     <string name="scope_guilds">Дізнатися, на які сервери виконано вхід</string>
     <string name="scope_guilds_empty">Тебе немає на жодному сервері.</string>
     <string name="scope_guilds_join">Приєднатися до своїх серверів</string>
-    <string name="scope_guilds_join_description">Використовувати миттєві запрошення від твого імені.</string>
+    <string name="scope_guilds_join_description">Використовувати запрошення від твого імені.</string>
     <string name="scope_identify">Доступ до твого імені користувача та аватару</string>
     <string name="scope_messages_read">Прочитати всі повідомлення</string>
     <string name="scope_messages_read_description">Це дозволить програмі читати всі повідомлення, доступні у твоєму акаунті Discord</string>
@@ -2904,7 +2844,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="search_filter_on">у</string>
     <string name="search_for_emoji">Знайди ідеальний емодзі</string>
     <string name="search_for_empty">Пошук</string>
-    <string name="search_for_value">Шукаємо: **%1$s**</string>
     <string name="search_group_header_channels">У каналі</string>
     <string name="search_group_header_dates">Дати</string>
     <string name="search_group_header_file_name">Назва файлу містить</string>
@@ -3109,8 +3048,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="stop_ringing">Зупинити виклик</string>
     <string name="stop_streaming">Припинити трансляцію</string>
     <string name="stop_watching">Припинити перегляд</string>
-    <string name="store_payment_legalese_monthly">Вітаємо! Купляючи %1$s, ти погоджуєшся з нашими [Умовами використання магазину](%2$s). %1$s є періодичною передплатою, це означає, що ми знімемо з тебе кошти сьогодні та продовжуватимемо знімати щомісяця, доки ти не скасуєш передплату. Ти можеш скасувати передплату у будь-який момент на екрані налаштувань користувача.</string>
-    <string name="store_payment_legalese_yearly">Вітаємо! Купляючи %1$s, ти погоджуєшся з нашими [Умовами використання магазину](%2$s). %1$s є періодичною передплатою, це означає, що ми знімемо з тебе кошти сьогодні та продовжуватимемо знімати щороку, доки ти не скасуєш передплату. Ти можеш скасувати передплату у будь-який момент на екрані налаштувань користувача.</string>
     <string name="stream">Трансляція</string>
     <string name="stream_bad_spectator">"Трансляція, яку ти наразі дивишся, має знижену якість зображення або звуку. Це може бути пов'язане зі станом мережи."</string>
     <string name="stream_bad_streamer">"Твоя трансляція наразі ведеться зі зниженою якістю зображення або звуку. Це може бути пов'язане зі станом мережи."</string>
@@ -3118,7 +3055,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="stream_capture_paused_details">Повернися до гри, щоб продовжити.</string>
     <string name="stream_capture_paused_details_viewer">Користувач %1$s мінімізував гру… зачекай!</string>
     <string name="stream_channel_description">Учасники з цим дозволом можуть транслювати в цьому каналі.</string>
-    <string name="stream_description">Учасники з цим дозволом можуть бути в цьому каналі.</string>
     <string name="stream_ended">Цю трансляцію завершено. *чути цвіркотіння цвіркунів*</string>
     <string name="stream_ended_button">Трансляцію завершено</string>
     <string name="stream_ended_no_spectators">Глядачі відсутні, тому що трансляцію завершено.</string>
@@ -3158,7 +3094,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="stream_report_rating_body_streamer">Розкажи нам, як пройшла трансляція.</string>
     <string name="stream_report_submit">Надіслати</string>
     <string name="stream_reported">Відгук відправлено</string>
-    <string name="stream_reported_body">Дякуємо за те, що повідомив про проблему! Твій відгук допомагає нам покращувати якість трансляцій.</string>
     <string name="stream_soundshare_failed">Агов, щось пішло не так, і ми не змогли почати трансляцію звуку твоєї гри.</string>
     <string name="streamer_mode">Режим стрімера</string>
     <string name="streamer_mode_enabled">Режим стрімера активовано</string>
@@ -3216,7 +3151,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="system_message_guild_member_join_10">"Дикий %1$s з'явився."</string>
     <string name="system_message_guild_member_join_11">Вжух. %1$s щойно приземлився.</string>
     <string name="system_message_guild_member_join_12">Тримайся. %1$s щойно приєднався до сервера.</string>
-    <string name="system_message_guild_member_join_13">%1$s щойно приєднався. Ховайте свої банани.</string>
     <string name="system_message_guild_member_join_14">%1$s щойно прибув. Здається занадто сильним — понерфіть, будь ласка.</string>
     <string name="system_message_guild_member_join_15">%1$s просочився на сервер.</string>
     <string name="system_message_guild_member_join_16">"%1$s з'явився на сервері."</string>
@@ -3227,7 +3161,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="system_message_guild_member_join_21">"Суперник наближається — з'явився %1$s!"</string>
     <string name="system_message_guild_member_join_22">Це птах! Це літак! Не звертай уваги, це просто %1$s.</string>
     <string name="system_message_guild_member_join_23">Це %1$s! Хвала сонцю! \\\\[T]/</string>
-    <string name="system_message_guild_member_join_25">Ха! %1$s приєднався! Ти активував мою карту-пастку!</string>
     <string name="system_message_guild_member_join_26">"Твоє здоров'я, крихітко! %1$s тут!"</string>
     <string name="system_message_guild_member_join_27">Агов! Слухайте! %1$s приєднався!</string>
     <string name="system_message_guild_member_join_28">Ми чекали на тебе, %1$s</string>
@@ -3377,8 +3310,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="unsupported_browser">Непідтримуваний браузер</string>
     <string name="unsupported_browser_body">"Схоже, ти використовуєш браузер, який не підтримується. Для того, аби використовувати всі можливості Discord, онови 
 браузер або завантаж один з наших додатків."</string>
-    <string name="unsupported_browser_details">"Хочеш мати можливість розмовляти зі своєю командою, хіба ні? Перейди на останню версію Chrome, Opera, Firefox 38+ або завантаж 
-клієнта Discord та почни розмовляти прямо зараз!"</string>
     <string name="unsupported_browser_title">Отакої!</string>
     <string name="unverified_account_body">"Будь ласка, перевір свою електронну пошту і дотримуйся інструкцій для підтвердження адреси своєї електронної пошти.
 
@@ -3496,8 +3427,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="user_settings_appearance_preview_message_4">Буде увімкнено компактний режим</string>
     <string name="user_settings_appearance_preview_message_5">О, а ось і він!</string>
     <string name="user_settings_appearance_zoom_tip">Ти можеш змінити масштаб за допомогою %1$s +/- та повернутися до стандартного масштабу за допомогою %1$s+0.</string>
-    <string name="user_settings_apperannce_disable_games_tab">Показати вкладку з іграми</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">Вимкни це, щоб сховати вкладку з іграми та зосередитися на спілкуванні.</string>
     <string name="user_settings_close_button">Кнопка закриття</string>
     <string name="user_settings_confirm_logout">Ти впевнений, що хочеш вийти?</string>
     <string name="user_settings_game_activity">Ігрова активність</string>
@@ -3556,8 +3485,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="vanity_url_hint_mobile">твій-url-тут</string>
     <string name="verfication_expired">Термін дії посилання для підтвердження електронної адреси сплив.</string>
     <string name="verfication_expired_suggestion">Будь ласка, авторизуйся в Discord і відправ посилання ще раз</string>
-    <string name="verification_body">"Ми виявили, що відбувається щось незвичне.
-Для того щоб ти міг продовжити використовувати Discord, **нам потрібно переконатися в тому, що ти людина.**"</string>
     <string name="verification_body_alt">Отже, давай переконаємося в тому, що ти людина…</string>
     <string name="verification_email_body">Ми відправили тобі нове повідомлення для підтвердження твоєї електронної пошти **%1$s**, будь ласка, перевір свої папки Вхідні і Спам.</string>
     <string name="verification_email_error_body">Виникла помилка під час відправки тобі електронного листа із підтвердженням. Спробуй ще раз пізніше або звернись до служби підтримки.</string>
@@ -3592,14 +3519,11 @@ AFK. Це не впливає на браузери."</string>
     <string name="verify_by_recaptcha">Перевірити за допомогою reCAPTCHA</string>
     <string name="verify_by_recaptcha_description">Нам потрібно знати, що ти не робот.</string>
     <string name="verify_email_body">Перевір свою електронну скриньку та виконай інструкції з підтвердження акаунта. Якщо ти не отримав електронного листа, або термін його дії закінчився, ти можеш відправити нового листа.</string>
-    <string name="verify_email_body_resent">Ми відправили тобі нове повідомлення для підтвердження твоєї електронної пошти **%1$s**, будь ласка, перевір свої папки «Вхідні» і «Спам».</string>
     <string name="verify_phone">Підтвердити телефон</string>
     <string name="verifying">Перевірка</string>
     <string name="video">Відеокарта</string>
     <string name="video_call">Відеовиклик</string>
     <string name="video_connect">Відеокарта</string>
-    <string name="video_poor_connection_body">"Відео вимкнено. Воно відновиться, коли твоє з'єднання покращиться."</string>
-    <string name="video_poor_connection_title">"Погане з'єднання"</string>
     <string name="video_preview">Попередній перегляд відео</string>
     <string name="video_settings">Налаштування відео</string>
     <string name="video_unavailable">Відео недоступне</string>
diff --git a/com.discord/res/values-v20/styles.xml b/com.discord/res/values-v20/styles.xml
index 99e091338b..7958d71023 100644
--- a/com.discord/res/values-v20/styles.xml
+++ b/com.discord/res/values-v20/styles.xml
@@ -9,6 +9,9 @@
         <item name="android:backgroundDimEnabled">false</item>
         <item name="android:windowSoftInputMode">stateUnchanged</item>
         <item name="android:windowCloseOnTouchOutside">false</item>
+        <item name="android:windowSwipeToDismiss">false</item>
+    </style>
+    <style name="AppTheme.Dialog.Popup.Swipeable" parent="@style/AppTheme.Dialog.Popup">
         <item name="android:windowSwipeToDismiss">true</item>
     </style>
 </resources>
diff --git a/com.discord/res/values-v21/styles.xml b/com.discord/res/values-v21/styles.xml
index 541148320d..2f2cec828a 100644
--- a/com.discord/res/values-v21/styles.xml
+++ b/com.discord/res/values-v21/styles.xml
@@ -72,9 +72,18 @@
         <item name="android:backgroundDimEnabled">false</item>
         <item name="android:windowSoftInputMode">stateUnchanged</item>
         <item name="android:windowCloseOnTouchOutside">false</item>
-        <item name="android:windowSwipeToDismiss">true</item>
+        <item name="android:windowSwipeToDismiss">false</item>
         <item name="android:windowElevation">12.0dip</item>
     </style>
+    <style name="AppTheme.Loading" parent="@style/AppTheme.Dark">
+        <item name="android:windowBackground">@drawable/drawable_bg_loading</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:windowEnterAnimation">@null</item>
+        <item name="android:windowExitAnimation">@null</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowEnterTransition">@null</item>
+        <item name="android:windowExitTransition">@null</item>
+    </style>
     <style name="Base.TextAppearance.AppCompat" parent="@android:style/TextAppearance.Material" />
     <style name="Base.TextAppearance.AppCompat.Body1" parent="@android:style/TextAppearance.Material.Body1" />
     <style name="Base.TextAppearance.AppCompat.Body2" parent="@android:style/TextAppearance.Material.Body2" />
diff --git a/com.discord/res/values-vi/plurals.xml b/com.discord/res/values-vi/plurals.xml
index 0d669f8fe9..26263e3112 100644
--- a/com.discord/res/values-vi/plurals.xml
+++ b/com.discord/res/values-vi/plurals.xml
@@ -198,16 +198,6 @@
         <item quantity="other">các quyền</item>
         <item quantity="one">quyền</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">Đặt chế độ chậm thành **!!%d!! giây**</item>
-        <item quantity="zero">Tắt chế độ chậm</item>
-        <item quantity="one">Đặt chế độ chậm thành **1 giây**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">Đặt chế độ chậm thành **!!%d!! giây**</item>
-        <item quantity="zero">Tắt chế độ chậm</item>
-        <item quantity="one">Đặt chế độ chậm thành **1 giây**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! các thành viên**</item>
         <item quantity="one">**một thành viên**</item>
@@ -307,10 +297,6 @@
         <item quantity="other">%d tin nhắn mới</item>
         <item quantity="one">1 tin nhắn mới</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d ngày</item>
-        <item quantity="one">một ngày</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d kênh</item>
         <item quantity="one">%d kênh</item>
@@ -393,16 +379,4 @@
     <plurals name="user_activity_timestamp_start_seconds">
         <item quantity="other">%d</item>
     </plurals>
-    <plurals name="user_activity_user_playing_for_days_time">
-        <item quantity="other">ngày</item>
-        <item quantity="one">ngày</item>
-    </plurals>
-    <plurals name="user_activity_user_playing_for_hours_time">
-        <item quantity="other">giờ</item>
-        <item quantity="one">giờ</item>
-    </plurals>
-    <plurals name="user_activity_user_playing_for_minutes_time">
-        <item quantity="other">phút</item>
-        <item quantity="one">phút</item>
-    </plurals>
 </resources>
diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml
index aa1558628c..6f3824a07d 100644
--- a/com.discord/res/values-vi/strings.xml
+++ b/com.discord/res/values-vi/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"Bạn không thể gửi lời mời vì bạn đang ẩn hoặc đang tắt trạng thái chơi của mình. Nếu bạn không muốn thay đổi
 cài đặt của mình, hãy nhờ ai đó mời bạn."</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">Hiểu rồi!</string>
-    <string name="activity_panel_go_live_hotspot_header">Chơi Trực Tiếp để stream trò chơi đến bạn bè!</string>
+    <string name="activity_panel_go_live_hotspot_header">Dùng Go Live để stream chơi game trực tiếp đến bạn bè!</string>
     <string name="activity_panel_go_live_tooltip">Chơi Trực Tiếp</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">Máy chủ này không có kênh thoại để stream.</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">Bạn không thể stream vào kênh thoại này.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Đi đến máy chủ để bắt đầu stream.</string>
     <string name="add">Thêm</string>
     <string name="add_a_comment_optional">Thêm Nhận Xét (Tùy chọn)</string>
@@ -159,7 +157,6 @@ nguy hiểm."</string>
     <string name="application_entitlement_code_redemption_confirmation_title">Bạn làm được rồi!</string>
     <string name="application_entitlement_code_redemption_go_to_library">Đến thư viện</string>
     <string name="application_entitlement_code_redemption_invalid">Mã được nhập không hợp lệ</string>
-    <string name="application_entitlement_code_redemption_prompt">Bạn đã nhận một mã cho trò chơi? Hãy nhập nó vào dưới đây:</string>
     <string name="application_entitlement_code_redemption_redeem">Lấy lại</string>
     <string name="application_filter_name_linux">Tất cả tập tin</string>
     <string name="application_filter_name_macos">Ứng dụng</string>
@@ -409,7 +406,6 @@ nguy hiểm."</string>
     <string name="application_store_view_all_news">Xem tất cả tin tức</string>
     <string name="application_store_warning_dlc_requires_base_application_description">DLC này yêu cầu bạn sở hữu %1$s trên Discord để chơi. [Tìm hiểu về DLC.](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">Nội dung có thể tải về được</string>
-    <string name="application_store_warning_early_access_description">Trò chơi này rất thú vị (chúng tôi nghĩ vậy!) Nhưng có thể có nội dung bị giới hạn, quá nhiều lỗi hoặc cảm nhận không trọn vẹn. [Tìm hiểu về quyền truy cập sớm.](%1$s)</string>
     <string name="application_store_warning_early_access_title">Truy cập sớm</string>
     <string name="application_store_warning_requires_desktop_app_description">Để chơi trò này, bạn phải cài đặt Discord $[cho máy tính bàn](downloadHook).</string>
     <string name="application_store_warning_requires_desktop_app_title">Yêu Cầu Ứng Dụng Máy Bàn</string>
@@ -527,7 +523,6 @@ nhưng nếu và khi bắt buộc phải làm như vậy, đừng do dự!"</str
     <string name="billing_error_section_card">Ái chà! Có vẻ như thông tin thẻ không đúng. Vui lòng sửa các trường và thử lại!</string>
     <string name="billing_history">Lịch sử thanh toán</string>
     <string name="billing_legal_mumbo_jumbo">Nội dung pháp lý</string>
-    <string name="billing_legal_mumbo_jumbo_label">Tôi đồng ý với [Điều Khoản Dịch Vụ Cửa Hàng Discord](%1$s)</string>
     <string name="billing_no_payment_method">Không lưu phương thức thanh toán nào</string>
     <string name="billing_no_payment_method_description">Thanh toán nhanh hơn bằng cách lưu một phương thức thanh toán</string>
     <string name="billing_pay_for_it_with">Trả bằng</string>
@@ -535,8 +530,6 @@ nhưng nếu và khi bắt buộc phải làm như vậy, đừng do dự!"</str
     <string name="billing_payment_breakdown_total">Tổng</string>
     <string name="billing_payment_history">Lịch sử giao dịch</string>
     <string name="billing_payment_premium">Đăng ký của bạn</string>
-    <string name="billing_payment_premium_legalese_monthly">Bằng cách mua gói đăng ký %1$s, bạn đồng ý với [Điều Khoản Dịch Vụ Cửa Hàng](%2$s) của chúng tôi. %1$s là đăng ký định kỳ tự động. Bạn cho phép Discord tính phí ngay lập tức theo phương thức thanh toán được cung cấp tại %3$s và tiếp tục tính phí tự động hàng tháng đến khi bạn hủy. Bạn có thể hủy bất cứ lúc nào.</string>
-    <string name="billing_payment_premium_legalese_yearly">Bằng cách mua gói đăng ký %1$s, bạn đồng ý với [Điều Khoản Dịch Vụ Cửa Hàng](%2$s) của chúng tôi. %1$s là đăng ký định kỳ tự động. Bạn cho phép Discord tính phí ngay lập tức theo phương thức thanh toán được cung cấp tại %3$s và tiếp tục tính phí tự động hàng năm đến khi bạn hủy. Bạn có thể hủy bất cứ lúc nào.</string>
     <string name="billing_payment_sources">Phương thức thanh toán</string>
     <string name="billing_premium_refund_text">Bạn có thể yêu cầu hoàn phí nếu giao dịch mua này được thực hiện trong %1$s ngày. [Đội ngũ hỗ trợ thân thiện của chúng tôi sẽ giúp bạn lấy lại tiền.](%2$s)</string>
     <string name="billing_premium_refund_text_unable">Chúng tôi rất tiếc, giao dịch này không đủ điều kiện để được hoàn tiền. Bạn có thể yêu cầu hoàn phí nếu giao dịch mua này được thực hiện trong %1$s ngày.</string>
@@ -567,12 +560,9 @@ nhưng nếu và khi bắt buộc phải làm như vậy, đừng do dự!"</str
     <string name="blocked">Đã Chặn</string>
     <string name="blocked_messages">%1$s</string>
     <string name="bot_call_idle_disconnect">Có vẻ như bạn đã gọi điện thoại một mình trong hơn năm phút. Các viên thanh tra băng thông đã yêu cầu tôi ngắt kết nối của bạn để tiết kiệm băng thông. Băng thông không có sẵn đâu bạn tôi ơi!</string>
-    <string name="bot_dm_explicit_content">Thấy chưa! %1$s đã yêu cầu Discord chặn các tin nhắn tường minh từ các chú chuột lang người máy chính xác nhất của chúng tôi. Hình như bạn đã tìm thấy một cái, cho nên thư chưa được gửi đi. Hãy lịch sự.</string>
     <string name="bot_dm_rate_limited">Bạn đang gửi quá nhiều tin nhắn trực tiếp. Vui lòng chờ vài phút trước khi tiếp tục nhắn tin cho người này.</string>
     <string name="bot_dm_send_failed">Không thể gửi tin nhắn vì bạn không chia sẻ máy chủ với người nhận hoặc bạn đã tắt tin nhắn trực tiếp trên máy chủ chia sẻ của mình, người nhận chỉ nhận tin nhắn trực tiếp từ bạn bè hoặc bạn đã bị họ chặn.</string>
     <string name="bot_dm_send_message_temporarily_disabled">Việc gửi tin nhắn tới kênh này đã tạm thời bị tắt. Hãy thử lại sau một lát.</string>
-    <string name="bot_gdm_explicit_content">Thấy chưa! Một trong các lỗ kiểm tra trong %1$s đã yêu cầu Discord chặn các tin nhắn tường minh từ các chú chuột lang người máy chính xác nhất của chúng tôi. Hình như bạn đã tìm thấy một cái, cho nên thư chưa được gửi đi. Hãy lịch sự.</string>
-    <string name="bot_guild_explicit_content">Thấy chưa! Chủ sở hữu của %1$s đã yêu cầu Discord chặn các tin nhắn tường minh từ các chú chuột lang người máy chính xác nhất của chúng tôi. Hình như bạn đã tìm thấy một cái, cho nên thư chưa được gửi đi. Hãy lịch sự.</string>
     <string name="bot_requires_email_verification">Bạn cần xác minh email trước khi gửi tin nhắn tại đây.</string>
     <string name="bot_video_disabled">Có vẻ như bạn không đủ băng thông để nhận video, vì vậy chúng tôi đã vô hiệu hóa nó.</string>
     <string name="browser_app">Ứng dụng Discord</string>
@@ -831,7 +821,7 @@ dòng chữ bé ở dưới."</string>
     <string name="create_category">Tạo Danh Mục</string>
     <string name="create_channel">Tạo kênh</string>
     <string name="create_group_dm">Tạo Nhóm DM</string>
-    <string name="create_instant_invite">Tạo thư mời ngay</string>
+    <string name="create_instant_invite">Tạo Lời Mời</string>
     <string name="create_link">Tạo Link</string>
     <string name="create_or_join_modal_header">Bạn chắc chứ?</string>
     <string name="create_server_button_body">Tạo một phòng mới và mới bạn bè cũng tham gia hoàn toàn miễn phí!</string>
@@ -960,7 +950,6 @@ dòng chữ bé ở dưới."</string>
     <string name="discord_desc_long">Ứng dụng trò chuyện miễn phí và bảo mật cho game thủ, hoạt động trên cả máy tính bàn lẫn điện thoại di động.</string>
     <string name="discord_desc_short">Gọi và nhắn tin nhóm</string>
     <string name="dismiss">Hủy bỏ</string>
-    <string name="dispatch_error_modal_body">Đã xảy ra sự cố. Nếu sự cố vẫn tiếp diễn, hãy tạo một yêu cầu hỗ trợ và sao chép nội dung tin nhắn bên dưới.</string>
     <string name="dispatch_error_modal_error_label">Tin nhắn báo lỗi (Sao chép và dán tôi)</string>
     <string name="dispatch_error_modal_header">Lỗi Dispatch Discord</string>
     <string name="dispatch_error_modal_open_ticket">Mở một yêu cầu</string>
@@ -1101,8 +1090,6 @@ gửi vào máy chủ này hay không. **Chúng tôi khuyên bạn nên thiết
 tin nhắn được gửi trong máy chủ này hay chưa. Chúng tôi khuyến cáo bạn nên cài đặt thành chỉ @mentions cho Discord cộng đồng"</string>
     <string name="form_help_explicit_content_filter">"Tự động quét và xóa các tin nhắn đã gửi trong máy chủ có chứa nội dung độc hại. Vui lòng chọn phạm vi
 của bộ lọc được áp dụng cho các thành viên của máy chủ. **Chúng tôi khuyến nghị bạn nên cài đặt bộ lọc cho Discord cộng đồng.**"</string>
-    <string name="form_help_instant_invite_channel">"Nếu chọn một kênh, thì link Mời sẽ được tạo với công cụ,
-nếu không sẽ chỉ thành viên trực tuyến và kênh giọng nói được cung cấp."</string>
     <string name="form_help_legacy_subsystem">"Một vài driver phần cứng âm thanh cho thấy các lỗi khi sử dụng hệ thống âm thanh phụ hiện có của hệ điều hành.
 Đánh dấu vào mục này để trở về hệ thống âm thanh phụ còn lại."</string>
     <string name="form_help_nsfw">"Người dùng sẽ cần xác nhận đủ tuổi để xem các nội dung trong kênh này.
@@ -1155,15 +1142,14 @@ cuộc trò chuyện bằng tin nhắn trực tiếp. Nếu thành viên đã đ
     <string name="form_label_input_mode">Chế Độ Đầu Vào</string>
     <string name="form_label_input_sensitivty">Độ Nhạy Đầu Vào</string>
     <string name="form_label_input_volume">Âm Lượng Đầu Vào</string>
-    <string name="form_label_instant_invite">Nhập lời mời</string>
-    <string name="form_label_instant_invite_channel">Kênh Link Mời</string>
+    <string name="form_label_instant_invite">Nhập Lời Mời</string>
+    <string name="form_label_instant_invite_channel">Lời Mời Kênh</string>
     <string name="form_label_last_seen">Lần cuối nhìn thấy</string>
     <string name="form_label_local_mute">Tắt Âm Cục Bộ</string>
     <string name="form_label_max_age">Hết hạn sau</string>
     <string name="form_label_max_uses">Số lần dùng tối đa</string>
     <string name="form_label_member_add">Thêm thành viên</string>
     <string name="form_label_mentionable">Cho phép mọi người **@mention** vai trò này</string>
-    <string name="form_label_mentions">Nhắc đến</string>
     <string name="form_label_mobile_notifications_behavior">Hành vi</string>
     <string name="form_label_mobile_notifications_blink">Tắt đèn thông báo.</string>
     <string name="form_label_mobile_notifications_inapp_desc">Nhận thông báo trong Discord.</string>
@@ -1179,7 +1165,6 @@ cuộc trò chuyện bằng tin nhắn trực tiếp. Nếu thành viên đã đ
     <string name="form_label_mobile_notifications_wake_device">Thông báo mở thiết bị.</string>
     <string name="form_label_mobile_push_notifications">Thông báo nhắc nhở trên di động</string>
     <string name="form_label_mute_server">Tắt tiếng **%1$s**</string>
-    <string name="form_label_mute_server_description">Bạn sẽ không nhận được thông báo khi tắt tiếng phòng trừ khi được nhắc đến.</string>
     <string name="form_label_muted">Đã tắt âm</string>
     <string name="form_label_new_password">Mật Khẩu Mới</string>
     <string name="form_label_new_user">Người Dùng Mới?</string>
@@ -1285,7 +1270,6 @@ Cảm ơn bạn đã giữ mọi thứ an toàn và yên bình."</string>
     <string name="game_action_button_game_not_detected">Không tìm thấy trò chơi</string>
     <string name="game_action_button_install">Cài đặt</string>
     <string name="game_action_button_locate">Định vị</string>
-    <string name="game_action_button_login_to_buy">Đăng nhập để Mua</string>
     <string name="game_action_button_now_playing">Đang chơi</string>
     <string name="game_action_button_paused">Đã dừng</string>
     <string name="game_action_button_play">Chơi</string>
@@ -1392,6 +1376,7 @@ Cảm ơn bạn đã giữ mọi thứ an toàn và yên bình."</string>
     <string name="generate_a_new_link">Tạo Link Mới</string>
     <string name="get_started">Bắt Đầu</string>
     <string name="gif_auto_play_label">Tự động phát hình động GIF khi Discord phóng to.</string>
+    <string name="go_live_hardware_acceleration_unavailable">Thông báo nhanh, chúng tôi không xác định được trình tăng tốc phần cứng. Máy tính của bạn có thể sẽ gặp vấn đề khi chạy Go Live.</string>
     <string name="go_live_hey">Này!</string>
     <string name="go_live_listen">Nghe này!</string>
     <string name="go_live_look">Nhìn kìa!</string>
@@ -1405,6 +1390,7 @@ Cảm ơn bạn đã giữ mọi thứ an toàn và yên bình."</string>
     <string name="go_live_modal_select_channel_form_title">Chọn một kênh thoại</string>
     <string name="go_live_modal_select_channel_placeholder">Tìm kênh thoại</string>
     <string name="go_live_modal_title">Chơi Trực Tiếp</string>
+    <string name="go_live_video_drivers_outdated">Trình điều khiển video của bạn đã lỗi thời. Hãy cập nhật chúng để Go Live có hiệu năng tốt hơn.</string>
     <string name="grant_temporary_membership">Cấp tư cách thành viên tạm thời</string>
     <string name="group">Nhóm</string>
     <string name="group_dm_add_friends">Thêm bạn bè vào DM</string>
@@ -1481,8 +1467,6 @@ Cảm ơn bạn đã giữ mọi thứ an toàn và yên bình."</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**Đã nhận được** %1$s để **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_change">Chuyển từ **%1$s** đến **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">Vào vị trí **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) đã tạo kênh văn bản $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Đổi chủ đề thành **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Cài đặt chủ đề thành **%1$s**</string>
@@ -1654,7 +1638,6 @@ Nếu bạn có quyền truy cập vào người dùng của trang thì bạn c
     <string name="hypesquad_question_11_response_d">Đề nghị Wumpus chơi tambourine thay cho guitar</string>
     <string name="hypesquad_question_12_prompt">Bạn đang lên đỉnh núi cao nhất và thứ duy nhất ngăn cản bạn với sự giàu có chính là con rồng ba đầu trên chiếc tháp trước mặt. Bạn sẽ:</string>
     <string name="hypesquad_question_12_response_a">Chiến đấu</string>
-    <string name="hypesquad_question_12_response_b">Xem bộ phim Godzilla để học cách mà nó chiến đấu với Vua Ghidorah</string>
     <string name="hypesquad_question_12_response_c">Cố gắng thuyết phục con rồng phân chia gia sản</string>
     <string name="hypesquad_question_12_response_d">Đề nghị tặng anh ta một chú Wumpus lộng lẫy, ai mà chả muốn một con cơ chứ?</string>
     <string name="hypesquad_question_13_prompt">Đó là âm thanh gì vậy?:</string>
@@ -1723,7 +1706,6 @@ Nếu bạn có quyền truy cập vào người dùng của trang thì bạn c
     <string name="hypesquad_quiz_ongoing_modal_title">Câu hỏi %1$s trên %2$s</string>
     <string name="hypesquad_quiz_retry">Thử lại</string>
     <string name="hypesquad_quiz_select_answer">Chọn câu trả lời của bạn:</string>
-    <string name="hypesquad_quiz_show_my_house">Cho tôi xem ngôi nhà của tôi!</string>
     <string name="hypesquad_ready_to_rep">Bạn đã sẵn sàng đại diện cho Discord chưa?</string>
     <string name="hypesquad_subheading">Khi thấy bạn khá hào hứng với Discord, chúng tôi rất vui. Sẵn tiện hãy rủ cả những người khác để họ cũng được thưởng thức Discord nhé.</string>
     <string name="hypesquad_switch_houses_action">Làm bài kiểm tra lại</string>
@@ -1755,10 +1737,10 @@ Nếu bạn có quyền truy cập vào người dùng của trang thì bạn c
     <string name="input_mode_ptt_release_delay">Độ trễ Nhấn để Nói</string>
     <string name="input_mode_vad">Hoạt Động Âm Thanh Voice</string>
     <string name="install_location_main">Chính</string>
-    <string name="instant_invite">Lời mời nhanh</string>
+    <string name="instant_invite">Lời mời</string>
     <string name="instant_invite_accept">Chấp nhận lời mời</string>
-    <string name="instant_invite_accepted">Chấp Nhận Link Mời</string>
-    <string name="instant_invite_accepting">Đang chấp nhận thư mời</string>
+    <string name="instant_invite_accepted">Lời Mời Đã Nhận</string>
+    <string name="instant_invite_accepting">Lời Mời Đang Nhận</string>
     <string name="instant_invite_ask_for_new_invite">Đề nghị lời mời khác!</string>
     <string name="instant_invite_ask_user_for_new_invite">Đề nghị %1$s lời mời khác!</string>
     <string name="instant_invite_code">Mã</string>
@@ -1780,13 +1762,13 @@ Nếu bạn có quyền truy cập vào người dùng của trang thì bạn c
     <string name="instant_invite_regenerate">Tạo lại</string>
     <string name="instant_invite_resolved_body">Bạn đã được mời vào **%1$s** trong **%2$s**.</string>
     <string name="instant_invite_resolved_title">Ồ nhìn ai kìa, xin chào.</string>
-    <string name="instant_invite_resolving">Đang xử lí thư mời</string>
+    <string name="instant_invite_resolving">Lời Mời Đang Xử Lý</string>
     <string name="instant_invite_uses">Lần dùng</string>
     <string name="instant_invite_you_are_already_a_member_of">Bạn đã là thành viên của</string>
     <string name="instant_invite_you_have_been_invited_to_join">Bạn đã được mời tham gia</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** đã mời bạn tham gia</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">Bạn đã được mời tham gia nhóm DM bởi</string>
-    <string name="instant_invites">Mời ngay lập tức</string>
+    <string name="instant_invites">Lời mời</string>
     <string name="integration_settings">Cài đặt tích hợp</string>
     <string name="integrations">Tích hợp</string>
     <string name="integrations_pro_tip">Để biết thêm về việc tích hợp, vui lòng tham khảo [Bộ Stream của Discord](%1$s).</string>
@@ -1901,13 +1883,13 @@ Bạn có muốn biết thêm về Discord không?"</string>
     <string name="join_afk_channel_body">Có vẻ như bạn đã tham gia kênh AFK. Bạn không thể phát biểu trong kênh này.</string>
     <string name="join_call">Tham Gia Cuộc Gọi</string>
     <string name="join_server">Tham gia</string>
-    <string name="join_server_button_body">Nhập Link Mời và tham gia máy chủ của bạn bè.</string>
+    <string name="join_server_button_body">Nhập Lời Mời và tham gia máy chủ của bạn bè.</string>
     <string name="join_server_button_cta">Tham gia máy chủ</string>
     <string name="join_server_button_cta_mobile">Tham gia máy chủ bằng Link Mời</string>
     <string name="join_server_button_cta_mobile_desc">Bạn có mã hoặc liên kết mời hay không? Hãy sử dụng ở đây!</string>
     <string name="join_server_button_cta_named">Tham gia %1$s</string>
-    <string name="join_server_description">Nhập link mời dưới đây để tham gia phòng. Link mời sẽ giống như thế này:</string>
-    <string name="join_server_description_mobile">Nhập link mời bên trên để tham gia máy chủ hiện có.</string>
+    <string name="join_server_description">Nhập Lời Mời ở dưới để tham gia máy chủ có sẵn. Lời mời sẽ giống kiểu như thế này:</string>
+    <string name="join_server_description_mobile">Nhập Lời Mời ở trên để tham gia máy chủ có sẵn.</string>
     <string name="join_server_title">Tham gia máy chủ</string>
     <string name="join_stream">Tham gia Stream</string>
     <string name="join_video_call">Tham Gia Cuộc Gọi Video</string>
@@ -2015,7 +1997,7 @@ khi bạn đang phát biểu."</string>
     <string name="link_your_xbox_account_2">Discord là ứng dụng trò chuyện thoại, văn bản và video cho game thủ miễn phí, an toàn và hoạt động trên cả máy tính để bàn cũng như thiết bị di động.</string>
     <string name="listening_to">Cùng lắng nghe **%1$s**</string>
     <string name="live">Trực Tiếp</string>
-    <string name="live_beta_description">Chào mừng đến stream! Chơi Trực Tiếp đang ở phiên bản beta. Xin lỗi vì các lỗi vặt vãnh</string>
+    <string name="live_beta_description">Chào mừng đến stream! Go Live đang ở phiên bản beta. Xin lỗi vì các lỗi nhỏ vặt có thể xảy ra</string>
     <string name="live_on_twitch">Trực tiếp trên Twitch</string>
     <string name="live_viewers">%1$s %2$s</string>
     <string name="load_image_error">"Không thể tải hình ảnh.
@@ -2075,8 +2057,6 @@ Nó không thể được phân công bằng tay cho các thành viên hoặc b
     <string name="members_header">%1$s</string>
     <string name="members_matching">Thành viên khớp với **%1$s**</string>
     <string name="members_search_placeholder">Tìm kiếm thành viên</string>
-    <string name="mention">Gọi tên</string>
-    <string name="mention_everyone">Nhắc đến mọi người</string>
     <string name="mention_everyone_autocomplete_description">Thông báo đến tất cả mọi người có quyền xem kênh này.</string>
     <string name="mention_everyone_autocomplete_description_mobile">Thông báo cho tất cả mọi người ở kênh này.</string>
     <string name="mention_everyone_description">"Thành viên với quyền này có thể gửi thông báo cho tất cả những thành viên trong kênh bằng cách bắt đầu tin nhắn
@@ -2085,7 +2065,6 @@ với @everyone hay @here."</string>
     <string name="mention_here_autocomplete_description_mobile">Thông báo cho các thành viên trực tuyến ở kênh này.</string>
     <string name="mention_role_autocomplete_description_mobile">Thông báo cho người sử dụng với vai trò này trong kênh này.</string>
     <string name="mention_users_with_role">Nhắc nhở người dùng có vai trò được quyền xem kênh này.</string>
-    <string name="mentions">Nhắc đến</string>
     <string name="mentions_count">%1$s đề cập</string>
     <string name="message_display_mode_label">Hiển Thị Tin Nhắn</string>
     <string name="message_edited">đã chỉnh sửa</string>
@@ -2177,8 +2156,6 @@ qua lại giữa các kênh mà cả hai có quyền truy cập."</string>
     <string name="new_permission">Các Quyền Mới</string>
     <string name="new_terms_ack">Tôi hiểu và đồng ý với các điều khoản trên.</string>
     <string name="new_terms_continue">Tiếp tục vào Discord</string>
-    <string name="new_terms_description">"Để tiếp tục sử dụng Discord, vui lòng đọc và xác nhận
-Điều Khoản Dịch vụ và Chính Sách Bảo Mật cập nhật của chúng tôi."</string>
     <string name="new_terms_title">Cập nhật Điều Khoản Dịch Vụ và Quyền Riêng Tư</string>
     <string name="new_unreads">Thư Chưa Đọc Mới</string>
     <string name="next">Tiếp theo</string>
@@ -2201,13 +2178,11 @@ qua lại giữa các kênh mà cả hai có quyền truy cập."</string>
     <string name="no_emoji_title">Không có Emoji</string>
     <string name="no_input_devices">Không Có Thiết Bị Đầu Vào</string>
     <string name="no_input_devices_detected">Không tìm được thiết bị đầu vào, xin vui lòng kiểm tra và thử lại.</string>
-    <string name="no_instant_invite">Không có Lời mời nhanh</string>
+    <string name="no_instant_invite">Không có Lời Mời</string>
     <string name="no_integrations_body">Giao thức FR13NDSH1P chỉ được thực hiện từ Discord của khách hàng</string>
     <string name="no_integrations_label">Không có tích hợp nào</string>
-    <string name="no_invites_body">"Cảm thấy mất phương hướng? Cảm thấy giống như một chiếc máy bay giấy đang chao lượn?
-Hãy kết bạn bằng cách tạo link mời!"</string>
-    <string name="no_invites_caption">Chưa có link mời!</string>
-    <string name="no_invites_label">Chưa có link mời</string>
+    <string name="no_invites_caption">Vẫn chưa có lời mời nào!</string>
+    <string name="no_invites_label">Vẫn chưa có lời mời nào</string>
     <string name="no_mail_account_title">Không Có Tài Khoản Email</string>
     <string name="no_mic_body">Hướng dẫn cho phép truy cập vào Micro của bạn có thể được tìm thấy trong Trung tâm trợ giúp Discord.</string>
     <string name="no_mic_title">Truy cập Micro bị từ chối</string>
@@ -2245,7 +2220,6 @@ tin nhắn nào được ghim."</string>
     <string name="notice_dispatch_error_disk_low">Bạn không có đủ dung lượng ổ đĩa. Chúng tôi yêu cầu %1$s nhưng mới chỉ có %2$s được đáp ứng.</string>
     <string name="notice_dispatch_error_file_name_too_long">Không được rồi, tên trò chơi này quá dài đối với Windows. Vui lòng chọn một đường dẫn cài đặt ngắn hơn.</string>
     <string name="notice_dispatch_error_invalid_drive">Không được rồi, vị trí cài đặt bạn chọn không hợp lệ. Bạn đã chọn %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">Chúng tôi đã không thể cập nhật trò chơi. Nó có đang chạy không?</string>
     <string name="notice_dispatch_error_no_manifests">Không được rồi, hình như không có nội dung nào cho trò chơi này cả. Vui lòng liên hệ với bên hỗ trợ.</string>
     <string name="notice_dispatch_error_not_entitled">Không được rồi, hình như bạn không sở hữu trò chơi này. Vui lòng liên hệ với bên hỗ trợ nếu bạn cho rằng đây chỉ là lỗi mà thôi.</string>
     <string name="notice_dispatch_error_post_install_cancelled">Hình như bạn đã từ chối cài đặt tập lệnh. Bạn cần phải trả lời có để bắt đầu cài đặt.</string>
@@ -2260,9 +2234,6 @@ tin nhắn nào được ghim."</string>
     <string name="notice_native_apps">Bạn có cần chức năng Nhấn để Nói cho toàn hệ thống không? Hãy tải về ứng dụng cho máy bàn!</string>
     <string name="notice_no_input_detected">Chà, có vẻ như Discord không tìm thấy tín hiệu đầu vào từ mic của bạn. Hãy cùng bắt tay khắc phục thôi nào.</string>
     <string name="notice_no_input_detected_help_link_text">Cứu với!</string>
-    <string name="notice_premium_applications_grandfathered_ended">Quyền truy cập của bạn vào Nitro đã hết hạn. Nâng cấp từ Nitro Classic lên Nitro để truy cập không giới hạn những trò chơi tuyệt đỉnh.</string>
-    <string name="notice_premium_applications_grandfathered_ending">Bạn chỉ còn %1$s để chơi trò chơi Nitro! Quyền truy cập của bạn sẽ kết thúc vào **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Cảm ơn vì đã hỗ trợ Nitro trong giai đoạn đầu! Như một phần quà cho sự tuyệt vời của mình, bạn sẽ có quyền truy cập Nitro cho đến khi %1$s.</string>
     <string name="notice_premium_promo_action">Cùng khám phá thôi</string>
     <string name="notice_premium_promo_message">Hỗ trợ Discord phát triển để nhận được các quyền lợi vui nhộn!</string>
     <string name="notice_scheduled_maintenance">Discord sẽ tiến hành bảo trì theo lịch trình vào **%1$s** lúc **%2$s**.</string>
@@ -2373,17 +2344,13 @@ Và overlay chưa chắc sẽ hiệu quả đối với tất cả mọi ngườ
     <string name="overlay_link_alert_body">Bạn sắp mở link này trong trình duyệt ngoài. Bạn có muốn tiếp tục không?</string>
     <string name="overlay_link_alert_secondary">Mở lên đi và đừng làm phiền tôi nữa.</string>
     <string name="overlay_link_alert_title">Chờ Đã!</string>
-    <string name="overlay_menu_get_invite">Lấy liên kết mời</string>
     <string name="overlay_menu_open_discord">Mở Discord</string>
-    <string name="overlay_menu_switch_channels">Đổi kênh</string>
-    <string name="overlay_mobile_toggle_desc">Xem ai đang nói và truy cập lối tắt trong lúc sử dụng các ứng dụng khác khi kết nối giọng nói</string>
     <string name="overlay_mobile_toggle_label">Bật Ghi Âm Giọng Nói Trên Di Động</string>
     <string name="overlay_news_go_live_body">Bạn có muốn stream %1$s cho bạn bè trong %2$s không?</string>
     <string name="overlay_news_go_live_cta">Chơi Trực Tiếp</string>
     <string name="overlay_news_text_pinning_body">Bây giờ bạn có thể ghim văn bản trò chuyện vào game!</string>
     <string name="overlay_news_text_pinning_tip">Tip: Bạn có thể ghim ô trò chuyện bằng cách nhấn $[pinIcon](pinHook)</string>
     <string name="overlay_news_text_pinning_title">Overlay Của Discord Đã Được Nâng Cấp</string>
-    <string name="overlay_no_results">Chúng tôi đã tìm kiếm khắp nơi. Nhưng không tìm thấy kênh thoại nào cả</string>
     <string name="overlay_notification_incoming_call">Cuộc gọi đến…</string>
     <string name="overlay_notification_settings_disabled">Tắt Thông Báo</string>
     <string name="overlay_notification_settings_position">Hiển thị: %1$s</string>
@@ -2393,7 +2360,6 @@ Và overlay chưa chắc sẽ hiệu quả đối với tất cả mọi ngườ
     <string name="overlay_notifications_settings">Thông Báo Overlay</string>
     <string name="overlay_notifications_top_left">Trên Cùng Bên Trái</string>
     <string name="overlay_notifications_top_right">Trên Cùng Bên Phải</string>
-    <string name="overlay_private_channels_empty_state">Không không, không có tin nhắn trực tiếp nào cả.</string>
     <string name="overlay_reload">Tải Lại Overlay</string>
     <string name="overlay_settings">Cài Đặt Overlay</string>
     <string name="overlay_settings_general_tab">Chung</string>
@@ -2485,9 +2451,7 @@ Và overlay chưa chắc sẽ hiệu quả đối với tất cả mọi ngườ
     <string name="pin">Ghim</string>
     <string name="pin_confirm">Oh yeah. Ghim vào</string>
     <string name="pin_message">Ghim tin nhắn</string>
-    <string name="pin_message_body">Này, chúng tôi chỉ muốn kiểm tra nếu bạn muốn ghim tin nhắn này đến #%1$s cho hậu thế luôn hay sao?</string>
     <string name="pin_message_body_mobile">Bạn có chắc muốn ghim tin nhắn này không?</string>
-    <string name="pin_message_body_private_channel">Này, chúng tôi chỉ muốn kiểm tra nếu bạn muốn ghim tin nhắn này cho hậu thế luôn hay sao?</string>
     <string name="pin_message_title">Ghim. Hãy Ghim Thật Chặt.</string>
     <string name="pin_message_too_many_body">Discord sẽ không thể ghim tin nhắn đó. Có thể bạn đã đạt giới hạn ghim %1$s của kênh #%2$s.</string>
     <string name="pin_message_too_many_body_private_channel">Discord không thể ghim tin nhắn đó. Có thể bạn đã đạt giới hạn ghim %1$s của kênh.</string>
@@ -2507,18 +2471,11 @@ Và overlay chưa chắc sẽ hiệu quả đối với tất cả mọi ngườ
     <string name="popout_stay_on_top">Luôn Hiện</string>
     <string name="post_code">Mã bưu chính</string>
     <string name="premium_alert_error_title">Chà, Có gì đó không ổn…</string>
-    <string name="premium_applications_grandfathered_monthly">Để cảm ơn bạn đã ủng hộ Discord, chúng tôi sẽ cấp cho bạn quyền truy cập các trò chơi Nitro trong vòng 1 năm. Quyền truy cập của bạn sẽ kết thúc vào **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">Để cảm ơn bạn đã ủng hộ Discord, chúng tôi sẽ cấp cho bạn quyền truy cập các trò chơi Nitro trong 2 năm. Quyền truy cập của bạn sẽ kết thúc vào **%1$s**.</string>
-    <string name="premium_applications_subtitle">Truy cập không giới hạn vào thư viện ngày càng nhiều các trò chơi tuyệt đỉnh mà chúng tôi nghĩ bạn và bạn bè nên chơi.</string>
-    <string name="premium_applications_title">Hàng tá trò chơi được chọn. Một giá rẻ hàng tháng.</string>
     <string name="premium_badge_tooltip">Đã đăng ký kể từ %1$s</string>
     <string name="premium_cancel_cancel">Không</string>
     <string name="premium_cancel_confirm_body_tier_1">"Việc hủy bỏ sẽ có hiệu lực vào cuối thời hạn thanh toán là **%1$s**. Thẻ Discord sẽ được ngẫu nhiên nếu bạn đã thay đổi nó. 
 
 Bạn có thể đăng ký lại thuê bao vào bất kỳ lúc nào."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Việc hủy bỏ sẽ có hiệu lực vào cuối thời hạn thanh toán hiện tại. Vào **%1$s**, bạn sẽ mất quyền truy cập các trò chơi Nitro trong thư viện và Thẻ Discord sẽ được ngẫu nhiên hóa nếu bạn đã thay đổi nó.
-
-Chúng tôi sẽ giữ lại chúng trong trường hợp bạn đổi ý. Bạn có thể đăng ký lại bất cứ lúc nào!"</string>
     <string name="premium_cancel_confirm_new">Phải, hủy %1$s</string>
     <string name="premium_cancel_confirm_title">Hủy bỏ %1$s?</string>
     <string name="premium_cancel_failed_body">Chúng tôi không thể hủy thuê bao Nitro của bạn. Vui lòng thử lại hoặc liên hệ với nhóm hỗ trợ nếu sự cố vẫn tiếp diễn.</string>
@@ -2535,19 +2492,16 @@ Chúng tôi sẽ giữ lại chúng trong trường hợp bạn đổi ý. Bạn
     <string name="premium_chat_perks_description_custom_emoji">Nhận hộ chiếu toàn cầu để sử dụng emoji tùy chỉnh của bạn mọi nơi.</string>
     <string name="premium_chat_perks_description_discriminator">Chọn thẻ riêng cho bạn khi đăng ký gói Nitro.</string>
     <string name="premium_chat_perks_description_screenshare">Tăng cường màn hình chia sẻ trò chơi với 720p 60fps hoặc 1080p 30fps.</string>
-    <string name="premium_chat_perks_description_upload_limit">Tải tập tin lớn hơn từ %1$s đến %2$s để chia sẻ meme chất lượng cao.</string>
+    <string name="premium_chat_perks_streaming_mobile">Stream Go Live Tốt Hơn: Stream chất lượng gốc với Nitro hoặc chất lượng sắc nét tối đa 1080p 60fps với Nitro Classic</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Ảnh động vui nhộn</string>
     <string name="premium_chat_perks_title_badge">Đại diện hỗ trợ của bạn</string>
     <string name="premium_chat_perks_title_custom_emoji">Emoji tùy chỉnh toàn cầu</string>
     <string name="premium_chat_perks_title_discriminator">Thẻ Discord tùy chỉnh</string>
     <string name="premium_chat_perks_title_screenshare">Video chất lượng cao nhất</string>
+    <string name="premium_chat_perks_title_streaming">Stream Go Live Tốt Hơn</string>
     <string name="premium_code_redemption_confirmation_blurb">Nhờ một dãy số ngẫu nhiên, giờ bạn đã nâng cao quyền lợi trò chuyện trong %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">Tuyệt quá!</string>
-    <string name="premium_feature_new_chat_perks_header">Bạn cũng nhận được vài quyền lợi trò chuyện được nâng cao:</string>
-    <string name="premium_feature_new_premium_applications_header">Các trò chơi trị giá hơn %1$s. Hãy xem qua nào:</string>
-    <string name="premium_feature_view_applications">Xem tất cả các trò chơi Nitro</string>
     <string name="premium_features_chat_perks">Quyền lợi trò chuyện</string>
-    <string name="premium_features_premium_applications">Trò chơi miễn phí</string>
     <string name="premium_grandfathered_warning">Thay cho lời cảm ơn vì đã ủng hộ, bạn sẽ được nhận giảm giá cho gói Nitro. **Khi hủy hoặc thay đổi gói thuê bao, bạn sẽ mất phần chiết khấu này.** Bạn đã được cảnh báo rồi đấy!</string>
     <string name="premium_grandfathered_warning_confirm">Mặc Kệ Nó, Cứ Làm Đi</string>
     <string name="premium_grandfathered_warning_title">Hãy Cẩn Thận Nhé Bạn Tôi</string>
@@ -2557,9 +2511,7 @@ Chúng tôi sẽ giữ lại chúng trong trường hợp bạn đổi ý. Bạn
     <string name="premium_not_claimed">Hãy xác nhận tài khoản trước</string>
     <string name="premium_not_claimed_body">Này bạn ơi! Nếu bạn muốn mua Nitro, bạn phải lấy tài khoản trước để bạn không bị mất dữ liệu.</string>
     <string name="premium_not_verified">Xác nhận email trước</string>
-    <string name="premium_payment_applications_os_warning">Các trò chơi của Nitro chỉ hỗ trợ Windows.</string>
     <string name="premium_payment_confirmation_blurb_regular">Bây giờ bạn đã nhận được tính năng trò chuyện nâng cao. Hãy ngừng đọc và bắt đầu trò chuyện ngay đi!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">Bây giờ bạn có thể truy cập không giới hạn vào hàng tá trò chơi tuyệt vời. Hãy ngừng đọc và bắt đầu chơi ngay đi!!!</string>
     <string name="premium_payment_confirmation_button_regular">K, Nghe hay phết</string>
     <string name="premium_plan_month">Nitro hàng tháng</string>
     <string name="premium_plan_month_tier_1">Nitro Classic Hàng Tháng</string>
@@ -2580,13 +2532,10 @@ Chúng tôi sẽ phân bổ kế hoạch hiện tại của bạn và khấu tr
     <string name="premium_upgrade_disabled_current_tooltip">Kế hoạch hiện tại của bạn.</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">Bạn phải hủy bỏ trước và chờ đến khi hết hạn đăng ký trước khi chọn kế hoạch bậc thấp hơn.</string>
     <string name="premium_upgrade_done_body_tier_1">Bây giờ bạn có thêm các đặc quyền trò chuyện nâng cao!</string>
-    <string name="premium_upgrade_done_body_tier_2">Giờ đây, bạn đã có đặc quyền trò chuyện nâng cao và quyền truy cập vào hàng tá các trò chơi.</string>
     <string name="premium_upgrade_done_button_tier_1">Tuyệt!</string>
-    <string name="premium_upgrade_done_button_tier_2">Thử Tất Cả Trò Chơi Nitro</string>
     <string name="premium_upgrade_failed_body">Uhh… Cập nhật này không hoạt động. Hãy đảm bảo thông tin thanh toán được cập nhật sau đó thử lại.</string>
     <string name="premium_upload_promo">Nâng cấp lên Discord Nitro để %1$s giới hạn tệp</string>
     <string name="premium_year_free_months">Nhận 2 Tháng Miễn Phí!</string>
-    <string name="premium_year_free_months_short">2 tháng miễn phí</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / Năm</string>
     <string name="preview_chat">Xem Trước Cuộc Trò Chuyện</string>
     <string name="priority_speaker">Người Nói Ưu Tiên</string>
@@ -2622,7 +2571,6 @@ phát hiện Nhấn để Nói trong khi chơi game."</string>
     <string name="quickswitcher_empty_cta">Tìm hiểu thêm về Công Tắc Nhanh</string>
     <string name="quickswitcher_empty_text">Không thể tìm thấy những thứ bạn quan tâm?</string>
     <string name="quickswitcher_last_channel">Kênh Cuối Cùng</string>
-    <string name="quickswitcher_mentions">Nhắc đến</string>
     <string name="quickswitcher_notice">Sử dụng Công Tắc Nhanh để điều hướng Discord nhanh hơn. Chỉ cần nhấn:</string>
     <string name="quickswitcher_placeholder">Bạn muốn đi đâu?</string>
     <string name="quickswitcher_querymode_applications">Tìm Kiếm Các Trò Chơi</string>
@@ -2655,13 +2603,10 @@ phát hiện Nhấn để Nói trong khi chơi game."</string>
     <string name="read_messages_view_channels">Đọc Kênh Văn Bản Và Xem Kênh Giọng Nói</string>
     <string name="read_only_channel">Đây Là Kênh Chỉ Dùng Để Đọc.</string>
     <string name="ready">Sẵn sàng</string>
-    <string name="recent_mentions">Các lời nhắc gần đây</string>
     <string name="recent_mentions_direct_only">chỉ trực tiếp</string>
     <string name="recent_mentions_everyone_and_direct">trực tiếp &amp; @everyone</string>
-    <string name="recent_mentions_filter_everyone">Bao gồm các lời nhắc đến @everyone</string>
     <string name="recent_mentions_filter_explain_everything">Tất cả</string>
     <string name="recent_mentions_filter_label">Hiển thị:</string>
-    <string name="recent_mentions_filter_roles">Bao gồm các lời nhắc đến @roles</string>
     <string name="recent_mentions_pro_tip">Khi có ai đó đề cập đến bạn, nó sẽ được lưu ở đây trong 7 ngày.</string>
     <string name="recent_mentions_roles_and_direct">trực tiếp &amp; @role</string>
     <string name="reconnect">Kết nối lại</string>
@@ -2771,7 +2716,7 @@ Nếu mức ping không cố định hoặc hơn %5$s ms, hãy hỏi người s
     <string name="scope_guilds">Biết bạn đang ở máy chủ nào</string>
     <string name="scope_guilds_empty">Bạn chưa nằm trong bất kỳ máy chủ nào.</string>
     <string name="scope_guilds_join">Tham gia máy chủ cho bạn</string>
-    <string name="scope_guilds_join_description">Sử dụng lời mời ngay lập tức thay bạn.</string>
+    <string name="scope_guilds_join_description">Dùng lời mời thay mặt.</string>
     <string name="scope_identify">Truy cập ảnh đại diện và tên người dùng của bạn</string>
     <string name="scope_messages_read">Đọc tất cả tin nhắn</string>
     <string name="scope_messages_read_description">Điều này cho phép ứng dụng đọc tất cả các tin nhắn có thể được truy cập thông qua tài khoản Discord</string>
@@ -2829,7 +2774,6 @@ Chọn màn hình mà bạn muốn chia sẻ."</string>
     <string name="search_filter_from">từ</string>
     <string name="search_filter_has">có</string>
     <string name="search_filter_in">trong</string>
-    <string name="search_filter_mentions">nhắc đến</string>
     <string name="search_filter_on">vào</string>
     <string name="search_for_emoji">Tìm emoji hợp lý nhất</string>
     <string name="search_for_empty">Tìm kiếm</string>
@@ -2948,7 +2892,7 @@ Bạn có chắc muốn thực hiện không?"</string>
     <string name="settings_roles_delete_body">Bạn có chắc muốn xóa vài trò **%1$s** không? Hành động này không thể hoàn tác được.</string>
     <string name="settings_roles_delete_title">Xóa Vai Trò</string>
     <string name="settings_roles_helpdesk_link">Bạn cần trợ giúp với các vai trò? [Nhận sự giúp đỡ](%1$s)</string>
-    <string name="settings_sync">Đồng bộ chéo khách hàng.</string>
+    <string name="settings_sync">Đồng bộ trên mọi thiết bị.</string>
     <string name="settings_webhooks_empty_body">Tạo webhook để bắt đầu màn ảo thuật</string>
     <string name="settings_webhooks_empty_title">Không có Webhooks</string>
     <string name="setup">Cài đặt</string>
@@ -3041,7 +2985,6 @@ Bạn có chắc muốn thực hiện không?"</string>
     <string name="stream_capture_paused_details">Đổi sang trò chơi để tiếp tục.</string>
     <string name="stream_capture_paused_details_viewer">%1$s đã thu nhỏ trò chơi… cứ ngồi yên đấy đi!</string>
     <string name="stream_channel_description">Thành viên có quyền này có thể stream trong kênh này.</string>
-    <string name="stream_description">Thành viên với quyền này có thể tham gia kênh này.</string>
     <string name="stream_ended">Stream này đã kết thúc. *tiếng dế kêu*</string>
     <string name="stream_ended_button">Stream đã kết thúc</string>
     <string name="stream_ended_no_spectators">Không có người xem vì stream đã kết thúc.</string>
@@ -3081,7 +3024,6 @@ Bạn có chắc muốn thực hiện không?"</string>
     <string name="stream_report_rating_body_streamer">Hãy cho chúng tôi biết về trải nghiệm của bạn khi stream.</string>
     <string name="stream_report_submit">Gửi</string>
     <string name="stream_reported">Đã Gửi Phản Hồi</string>
-    <string name="stream_reported_body">Cảm ơn vì đã báo cáo lại sự cố! Phản hồi của bạn giúp chúng tôi cải thiện chất lượng stream.</string>
     <string name="stream_soundshare_failed">Này, đã xảy ra lỗi và chúng tôi không thể stream âm thanh từ trò chơi của bạn.</string>
     <string name="streamer_mode">Chế độ streamer</string>
     <string name="streamer_mode_enabled">Chế Độ Streamer Đã Được Bật</string>
@@ -3096,7 +3038,6 @@ Bạn có chắc muốn thực hiện không?"</string>
     <string name="support">Hỗ trợ</string>
     <string name="suppressed">Bị chặn</string>
     <string name="suppressed_afk_body">Có vẻ như bạn đã AFK. Chúng tôi đã chuyển bạn vào kênh AFK.</string>
-    <string name="suppressed_afk_title">Xin chào, có ai không?</string>
     <string name="suppressed_permission_body">Bạn không có quyền để nói chuyện tại kênh này.</string>
     <string name="sv_se">Tiếng Thụy Điển</string>
     <string name="switch_hardware_acceleration">Thay Đổi Tăng Tốc Phần Cứng</string>
@@ -3139,7 +3080,6 @@ Bạn có chắc muốn thực hiện không?"</string>
     <string name="system_message_guild_member_join_10">Một %1$s hoang dã đã xuất hiện.</string>
     <string name="system_message_guild_member_join_11">Hú yeah. %1$s vừa hạ cánh.</string>
     <string name="system_message_guild_member_join_12">Hãy tự khích lệ. %1$s vừa tham gia máy chủ.</string>
-    <string name="system_message_guild_member_join_13">%1$s vừa tham gia. Giấu chuối của bạn đi nhé.</string>
     <string name="system_message_guild_member_join_14">%1$s vừa tới đó. Nhìn có vẻ OP – thôi mà nerf.</string>
     <string name="system_message_guild_member_join_15">%1$s vừa trượt vào máy chủ.</string>
     <string name="system_message_guild_member_join_16">Một %1$s đã xuất hiện tại máy chủ.</string>
@@ -3150,7 +3090,6 @@ Bạn có chắc muốn thực hiện không?"</string>
     <string name="system_message_guild_member_join_21">Kẻ thách thức đang đến – %1$s đã xuất hiện!</string>
     <string name="system_message_guild_member_join_22">Đó là một con chim! Đó là một chiếc máy bay! Không có gỉ, chỉ là %1$s.</string>
     <string name="system_message_guild_member_join_23">Nó là %1$s! Hãy ca ngợi mặt trời! \\\\[T]/</string>
-    <string name="system_message_guild_member_join_25">Ha! %1$s đã tham gia! Bạn đã kích hoạt thẻ bẫy của tôi rồi!</string>
     <string name="system_message_guild_member_join_26">Chúc mừng cưng! %1$s đang ở đây!</string>
     <string name="system_message_guild_member_join_27">Này! Nghe nè! %1$s đã tham gia!</string>
     <string name="system_message_guild_member_join_28">Chúng tôi đang trông mong bạn đây %1$s</string>
@@ -3383,9 +3322,6 @@ Nhấn giữ shift để tải lên trực tiếp."</string>
     <string name="user_activity_timestamp_end_simple">%1$s đã rời</string>
     <string name="user_activity_timestamp_start">%1$s%2$s%3$s đã trôi qua</string>
     <string name="user_activity_timestamp_start_simple">%1$s đã trôi qua</string>
-    <string name="user_activity_user_playing_for_days">đã được %1$s %2$s</string>
-    <string name="user_activity_user_playing_for_hours">đã được %1$s %2$s</string>
-    <string name="user_activity_user_playing_for_minutes">đã được %1$s %2$s</string>
     <string name="user_activity_watch_along">Xem Cùng</string>
     <string name="user_dm_settings">Mặc Định Bảo Mật Máy Chủ</string>
     <string name="user_dm_settings_help">Cài đặt này được áp dụng khi bạn tham gia máy chủ mới. Nó sẽ không được áp dụng cho các máy chủ hiện tại của bạn.</string>
@@ -3474,8 +3410,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="vanity_url_hint_mobile">url-của-bạn-tại-đây</string>
     <string name="verfication_expired">Link xác nhận Email hết hạn.</string>
     <string name="verfication_expired_suggestion">Vui lòng đăng nhập vào Discord và gửi lại link</string>
-    <string name="verification_body">"Chúng tôi đã phát hiện vài điều bất thường đang xảy ra.
-Để tiếp tục sử dụng Discord, **chúng tôi cần xác minh rằng bạn là con người.**"</string>
     <string name="verification_body_alt">Bây giờ, hãy xác nhận rằng bạn là con người…</string>
     <string name="verification_email_body">Chúng tôi đã gửi email xác nhận mới tới **%1$s**, vui lòng kiểm tra cả hộp thư cũng như thư rác của bạn.</string>
     <string name="verification_email_error_body">Đã có lỗi khi đang gửi email xác nhận. Vui lòng thử lại sau hoặc liên hệ đội ngũ hỗ trợ.</string>
diff --git a/com.discord/res/values-zh-rCN/plurals.xml b/com.discord/res/values-zh-rCN/plurals.xml
index 3aa49e3ca2..3423bec804 100644
--- a/com.discord/res/values-zh-rCN/plurals.xml
+++ b/com.discord/res/values-zh-rCN/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">没有格数</item>
         <item quantity="one">%d 格</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d 天</item>
-        <item quantity="one">1 天</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d 位成员</item>
-        <item quantity="zero">0 位成员</item>
-        <item quantity="one">1 位成员</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">天</item>
         <item quantity="one">天</item>
@@ -212,16 +203,6 @@
         <item quantity="other">个权限</item>
         <item quantity="one">个权限</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">将慢速模式设置为 **!!%d!! 秒**</item>
-        <item quantity="zero">关闭慢速模式</item>
-        <item quantity="one">将慢速模式设置为 **1 秒**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">将慢速模式设置为 **!!%d!! 秒**</item>
-        <item quantity="zero">关闭慢速模式</item>
-        <item quantity="one">将慢速模式设置为 **1 秒**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! 位成员**</item>
         <item quantity="one">**位成员**</item>
@@ -290,10 +271,6 @@
         <item quantity="other">%d 天</item>
         <item quantity="one">1天</item>
     </plurals>
-    <plurals name="live_viewers_viewers">
-        <item quantity="other">观众</item>
-        <item quantity="one">观众</item>
-    </plurals>
     <plurals name="max_uses_description_mobile_maxUses">
         <item quantity="other">%d 次</item>
         <item quantity="zero">无限使用</item>
@@ -321,10 +298,6 @@
         <item quantity="other">%d 条新消息</item>
         <item quantity="one">1 条新消息</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d 天</item>
-        <item quantity="one">一天</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d 个频道</item>
         <item quantity="one">%d 个频道</item>
@@ -342,14 +315,6 @@
         <item quantity="other">这些消息</item>
         <item quantity="one">这则消息</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** 台服务器不可用。</item>
-        <item quantity="one">由于临时故障，**1** 台服务器不可用。</item>
-    </plurals>
-    <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
-        <item quantity="other">%d个月</item>
-        <item quantity="one">1个月</item>
-    </plurals>
     <plurals name="reaction_tooltip_1_n_n">
         <item quantity="other">%d 人</item>
         <item quantity="one">1 人</item>
diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml
index 86dddb86f8..40a2f4c3d9 100644
--- a/com.discord/res/values-zh-rCN/strings.xml
+++ b/com.discord/res/values-zh-rCN/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"您无法要发送邀请，因为您处于隐身状态或隐藏了游戏状态。如果您不想改变
 您的设置，您可以让其他人来邀请您。"</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">收到！</string>
-    <string name="activity_panel_go_live_hotspot_header">选择私人直播，直接向您的好友直播游戏实况！</string>
+    <string name="activity_panel_go_live_hotspot_header">选择 Go Live，直接向您的好友直播游戏实况！</string>
     <string name="activity_panel_go_live_tooltip">私人直播</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">该服务器没有可供直播的语音频道。</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">您无法向这个语音频道直播。</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">浏览至服务器，开始直播。</string>
     <string name="add">添加</string>
     <string name="add_a_comment_optional">添加评论(可选)</string>
@@ -76,9 +74,7 @@
     <string name="add_friend_add_manually">发送好友请求</string>
     <string name="add_friend_already_friends">您们已经是好友了。</string>
     <string name="add_friend_button">发送好友请求</string>
-    <string name="add_friend_button_after">已发送好友申请</string>
     <string name="add_friend_confirmation">已向 **%1$s** 发送申请</string>
-    <string name="add_friend_description">您可以用 Discord 编号来添加好友。</string>
     <string name="add_friend_error_discord_tag_username">该 Discord 编号是个不存在的的用户名。输入您好友的真实用户名和编号，比如 WumpusWizard#9349。</string>
     <string name="add_friend_error_invalid_discord_tag">**%1$s** 已经雇用了一个武士干掉了所有的好友请求，您需要联系他们加您好友。</string>
     <string name="add_friend_error_numbers_only">我们不止是数字。。。我们是人！请像 WumpusKing#1202 这样输入用户名与特殊数字。</string>
@@ -86,9 +82,7 @@
     <string name="add_friend_error_username_only">我们需要 %1$s 的四位数编号来筛选您要找的人。</string>
     <string name="add_friend_find">搜索</string>
     <string name="add_friend_friend">好友</string>
-    <string name="add_friend_hint">通过 Discord 编号新增好友。您的 Discord 编号是**%1$s**。</string>
     <string name="add_friend_hint2">请继续输入！请不要忘记名字后面的4位数字。</string>
-    <string name="add_friend_input_hint">Discord编号#0000</string>
     <string name="add_friend_nearby_connection_error">请打开位置服务、蓝牙和 WiFi（能开的都开了！）然后重新连接到网络以激活 Nearby 功能。</string>
     <string name="add_friend_nearby_connection_error_ios">请打开蓝牙和 WiFi 以激活 Nearby 功能。</string>
     <string name="add_friend_nearby_disable_scanning">关闭 Nearby 扫描</string>
@@ -99,9 +93,7 @@
     <string name="add_friend_nearby_learn_more">[了解更多](%1$s)</string>
     <string name="add_friend_nearby_looking">扫描好友的广播。确保他们也在该界面并且在附近使用该功能！</string>
     <string name="add_friend_nearby_stopped">Nearby 连接已停止。</string>
-    <string name="add_friend_no_capitalization">用户名区分大小写并且需要编号。</string>
     <string name="add_friend_not_found">我们没找到带有此 Discord 编号的人。</string>
-    <string name="add_friend_placeholder">输入Discord编号#0000</string>
     <string name="add_friend_search">搜索</string>
     <string name="add_friend_self">您不能自娱自乐。</string>
     <string name="add_friend_success">成功！您的好友请求正在由Discord最精英的武士护送到 **%1$s**。</string>
@@ -119,10 +111,7 @@
     <string name="add_to_dictionary">添加到词典</string>
     <string name="administrative">管理</string>
     <string name="administrator">管理员</string>
-    <string name="administrator_description">"成员拥有此权限有充分的权限，也绕开渠道的特定权限。这是授予一个危险的
-权限。"</string>
     <string name="advanced_settings">高级设置</string>
-    <string name="afk_settings">暂离设置</string>
     <string name="aka">也就是</string>
     <string name="all_servers">所有服务器</string>
     <string name="allow_game_detection_mobile">允许 Discord 检测您当前正在运行的游戏。</string>
@@ -130,8 +119,6 @@
     <string name="allow_tts_command">允许使用并播放 /tts 命令（文字转语音）</string>
     <string name="already_have_account">已经拥有帐号？</string>
     <string name="amount">金额</string>
-    <string name="animate_emoji">播放动态表情。</string>
-    <string name="animate_emoji_note">表情包给我动起来！</string>
     <string name="animated_emoji">动画表情符号</string>
     <string name="answer">回答</string>
     <string name="app_download_now">还没有下载 APP 吗？**立刻下载**</string>
@@ -145,21 +132,16 @@
     <string name="appearance">外观</string>
     <string name="application_addon_purchase_confirmation_blurb">%1$s 已购买，将可在 %2$s中使用。</string>
     <string name="application_context_menu_create_desktop_shortcut">创建桌面快捷方式</string>
-    <string name="application_context_menu_hide">在库中隐藏游戏</string>
     <string name="application_context_menu_install">安装</string>
     <string name="application_context_menu_launch">运行游戏</string>
     <string name="application_context_menu_launch_application_name">运行 %1$s</string>
     <string name="application_context_menu_repair">修复</string>
-    <string name="application_context_menu_show">在库中显示游戏</string>
     <string name="application_context_menu_show_in_folder">在文件夹中显示</string>
     <string name="application_context_menu_store_link">在商店中查看</string>
-    <string name="application_context_menu_toggle_overlay_disable">关闭叠加</string>
     <string name="application_context_menu_uninstall">卸载</string>
-    <string name="application_entitlement_code_redemption_confirmation_blurb">您获得了**%1$s**！请前往您的库中查看。</string>
     <string name="application_entitlement_code_redemption_confirmation_title">收到！</string>
     <string name="application_entitlement_code_redemption_go_to_library">前往游戏库</string>
     <string name="application_entitlement_code_redemption_invalid">输入的兑换码无效</string>
-    <string name="application_entitlement_code_redemption_prompt">收到了游戏兑换码？请在下方输入：</string>
     <string name="application_entitlement_code_redemption_redeem">兑换</string>
     <string name="application_filter_name_linux">所有文件</string>
     <string name="application_filter_name_macos">APP</string>
@@ -184,13 +166,11 @@
     <string name="application_library_import_deny">放弃</string>
     <string name="application_library_remove_confirm_body">将在您的库中隐藏%1$s。您可在游戏库设置页面将其恢复显示。</string>
     <string name="application_library_remove_confirm_confirm">我确认</string>
-    <string name="application_library_remove_confirm_header">从库中隐藏</string>
     <string name="application_library_wumpus_alt">Wumpus没有游戏可以玩了 (☯﹏☯)</string>
     <string name="application_progress_indicator_installing">下载 %1$s</string>
     <string name="application_progress_indicator_installing_hours">下载 %1$s - %2$s剩余</string>
     <string name="application_progress_indicator_installing_minutes">下载 %1$s - %2$s剩余</string>
     <string name="application_progress_indicator_installing_seconds">下载 %1$s - %2$s</string>
-    <string name="application_progress_indicator_paused">暂停</string>
     <string name="application_progress_indicator_updating">更新 %1$s</string>
     <string name="application_progress_indicator_updating_hours">更新 %1$s - %2$s剩余</string>
     <string name="application_progress_indicator_updating_minutes">更新 %1$s - %2$s剩余</string>
@@ -204,7 +184,6 @@
     <string name="application_store_browse_sort_new_releases">最新</string>
     <string name="application_store_browse_sort_title_alphabetical">游戏名 (A-Z)</string>
     <string name="application_store_browse_sort_title_reverse_alphabetical">游戏名 (Z-A)</string>
-    <string name="application_store_bundle_purchase_confirmation_blurb">%1$s 已购买，可以在库中找到它。</string>
     <string name="application_store_buy">购买</string>
     <string name="application_store_coming_soon">即将推出</string>
     <string name="application_store_controller_support">控制器支持</string>
@@ -221,7 +200,6 @@
     <string name="application_store_early_access_body">您可即刻开始游戏，并为此游戏的开发出一分力。请注意，目前游戏内容并不完整，未来也可能将不会被优化。</string>
     <string name="application_store_expand_downloadable_content">显示所有 DLC</string>
     <string name="application_store_filter_all_genres">所有门类</string>
-    <string name="application_store_first_on_discord">Discord 首次推出</string>
     <string name="application_store_free_with_premium">在 Nitro 中免费</string>
     <string name="application_store_genre_action">动作</string>
     <string name="application_store_genre_action_adventure">动作冒险</string>
@@ -251,14 +229,12 @@
     <string name="application_store_genre_hockey">冰球</string>
     <string name="application_store_genre_life_simulator">生活模拟</string>
     <string name="application_store_genre_light_gun">光线枪</string>
-    <string name="application_store_genre_massively_multiplayer">大型多人在线</string>
     <string name="application_store_genre_metroidvania">恶魔城类</string>
     <string name="application_store_genre_miscellaneous">其它</string>
     <string name="application_store_genre_mmorpg">大型多人在线角色扮演游戏</string>
     <string name="application_store_genre_moba">多人在线战术竞技游戏</string>
     <string name="application_store_genre_music_rhythm">音乐/韵律</string>
     <string name="application_store_genre_open_world">开放世界</string>
-    <string name="application_store_genre_party_mini_game">派对/小游戏</string>
     <string name="application_store_genre_pinball">弹球</string>
     <string name="application_store_genre_platformer">精选</string>
     <string name="application_store_genre_psychological_horror">心理恐怖</string>
@@ -282,7 +258,6 @@
     <string name="application_store_genre_tower_defense">塔防</string>
     <string name="application_store_genre_track_field">田径</string>
     <string name="application_store_genre_train_simulator">火车模拟</string>
-    <string name="application_store_genre_trivia_board_game">冷知识/棋盘游戏</string>
     <string name="application_store_genre_turn_based_strategy">回合制策略</string>
     <string name="application_store_genre_vehicular_combat">装甲作战</string>
     <string name="application_store_genre_visual_novel">视觉小说</string>
@@ -292,7 +267,6 @@
     <string name="application_store_hero_carousel_featured_game">特色游戏</string>
     <string name="application_store_hero_carousel_featured_premium_game">特色 Nitro 游戏</string>
     <string name="application_store_hero_carousel_learn_more">了解更多</string>
-    <string name="application_store_hide_games_in_library">在库中隐藏游戏</string>
     <string name="application_store_hide_games_in_library_hidden">%1$s 隐藏</string>
     <string name="application_store_home_footer_main">感谢浏览！</string>
     <string name="application_store_home_footer_sub">爱你们的 Discord 团队</string>
@@ -421,7 +395,6 @@
     <string name="application_store_view_all_news">查看所有动态</string>
     <string name="application_store_warning_dlc_requires_base_application_description">运行前，DLC 需要您在 Discord 上拥有 %1$s。[了解 DLC。](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">可下载内容</string>
-    <string name="application_store_warning_early_access_description">这款游戏很有趣（我们认为是这样！），但是可能包含限制级内容、错误以及不完整。[了解抢先体验。](%1$s)</string>
     <string name="application_store_warning_early_access_title">抢先体验</string>
     <string name="application_store_warning_requires_desktop_app_description">要运行本游戏，您必须安装 Discord $[桌面APP](downloadHook)。</string>
     <string name="application_store_warning_requires_desktop_app_title">需要下载桌面APP</string>
@@ -492,9 +465,6 @@
     <string name="ban_user_title">"封锁 '%1$s'"</string>
     <string name="bans">封锁用户</string>
     <string name="bans_header">%1$s</string>
-    <string name="bans_hint">"预设情況下是基于帐号和IP来封锁。
-使用者可以通过使用Proxy代理来避开IP封锁。
-通过[Moderation](onModerationClick) 来开启手机验证，这样会很难避开封锁。"</string>
     <string name="bans_no_results">我们已经尽力了 (╥﹏╥) 但没有发现匹配的已封锁用户。</string>
     <string name="bans_no_users_banned">"您还没封锁任何用户……
 但如果您需要这样做，就不要犹豫。"</string>
@@ -537,14 +507,12 @@
     <string name="billing_application_refund_text">如果购买时间为 %1$s 日内且游戏的使用时间小于 %2$s 小时，则可以申请退款。[我们会安排友善的工作人员为您退回付款。](%3$s)</string>
     <string name="billing_application_refund_text_unable">很抱歉，此次购买无法申请退款。如果购买时间为 %1$s 日内，且游戏的使用时间小于 %2$s 小时，则可以申请退款。</string>
     <string name="billing_change_payment_source">更改付款方式</string>
-    <string name="billing_error_add_payment_source_streamer_mode">在匿名模式下无法添加新的付款方式。</string>
     <string name="billing_error_gateway">处理付款时出错，请重试！</string>
     <string name="billing_error_rate_limit">您的购买尝试过于频繁。请稍等片刻后再来购买！</string>
     <string name="billing_error_section_address">哦！这个地址看起来有些问题。请修改后重试！</string>
     <string name="billing_error_section_card">哦！这张卡看起来有些问题。请修改后重试！</string>
     <string name="billing_history">消费记录</string>
     <string name="billing_legal_mumbo_jumbo">法律条文</string>
-    <string name="billing_legal_mumbo_jumbo_label">我同意 [Discord 商店服务条款](%1$s)</string>
     <string name="billing_no_payment_method">无保存的付款方式</string>
     <string name="billing_no_payment_method_description">保存您的付款方式以获得更便捷的支付体验</string>
     <string name="billing_pay_for_it_with">付款方式为</string>
@@ -552,8 +520,6 @@
     <string name="billing_payment_breakdown_total">总计</string>
     <string name="billing_payment_history">交易记录</string>
     <string name="billing_payment_premium">您的订阅</string>
-    <string name="billing_payment_premium_legalese_monthly">购买%1$s订阅既表示您同意我们的 [商店服务条款](%2$s)。%1$s是一项自动续费订阅。您授权 Discord 立即按所提供的付款方式收取%3$s。并每月都持续自动续费直至您取消订阅。您随时可以取消订阅。</string>
-    <string name="billing_payment_premium_legalese_yearly">购买%1$s订阅既表示您同意我们的 [商店服务条款](%2$s)。%1$s是一项自动续费订阅。您授权 Discord 立即按所提供的付款方式收取%3$s。并每年都持续自动收费直至您取消订阅。您随时可以取消订阅。</string>
     <string name="billing_payment_sources">付款方式</string>
     <string name="billing_payment_table_header_amount">金额</string>
     <string name="billing_payment_table_header_date">日期</string>
@@ -617,7 +583,6 @@
     <string name="browser_not_supported">浏览器不被支持</string>
     <string name="browser_notifications_enabled_body">呼～通知走您！</string>
     <string name="browser_opera">Opera 浏览器</string>
-    <string name="browser_output_device_warning">在使用浏览器时无法更改输出设备。 [Download](点击下载) (onDownloadClick) 来获取桌面客户端享受输出设备的完全控制。</string>
     <string name="bug_hunter_badge_tooltip">Discord 问题猎人</string>
     <string name="bundle_ready_body">重启Discord以更新</string>
     <string name="bundle_ready_later">待会儿再说</string>
@@ -645,13 +610,9 @@
     <string name="cannot_manage_higher_rank">此人是比您更高的角色，所以您不能对他们进行管理。</string>
     <string name="cannot_manage_is_owner">此人是该服务器的拥有者，所以您不能对他进行管理。</string>
     <string name="cannot_manage_same_rank">此人与您是相同等级的角色，所以您不能对他们进行管理。</string>
-    <string name="captcha_failed">验证码失败。请再试一次。</string>
     <string name="captcha_failed_play_services">验证失败，需要 Google Play 服务。请安装或升级 Google Play 服务后重启APP再重试。</string>
     <string name="captcha_failed_unsupported">验证失败，您的设备不被支持。</string>
-    <string name="captcha_issues">CAPTCHA 出现问题？</string>
     <string name="captcha_open_browser">打开浏览器</string>
-    <string name="captcha_problems">有 CAPTCHA 方面的问题？</string>
-    <string name="captcha_problems_info">如果无法完成 CAPTCHA，请在浏览器中尝试</string>
     <string name="categories">类别</string>
     <string name="category">类别</string>
     <string name="category_has_been_deleted">已删除类别。</string>
@@ -664,12 +625,10 @@
     <string name="certified_device_recommendation_cancel">不了，谢谢！</string>
     <string name="certified_device_recommendation_confirm">切换</string>
     <string name="certified_device_recommendation_title">检测到已认证设备</string>
-    <string name="certified_device_recommendation_video_input_body">Discord 检测到已认证的视讯输入设备 **%1$s %2$s**。我们建议切换到该设备来享受最佳体验。</string>
     <string name="change">变更</string>
     <string name="change_avatar">"更改
 头像"</string>
     <string name="change_category">更改类别</string>
-    <string name="change_email">点击这里更改您的电子邮箱地址</string>
     <string name="change_email_short">更改电子邮件地址</string>
     <string name="change_icon">"更改
 图标"</string>
@@ -722,26 +681,16 @@
     <string name="claim_account_body">验证您的帐户来保存关闭浏览器后您所有的服务器和聊天记录。</string>
     <string name="claim_account_email_to">谢谢！我们已经往**%1$s**发送了注册确认链接。</string>
     <string name="claim_account_get_app">下载桌面APP</string>
-    <string name="claim_account_promote_app">下载我们的桌面APP来充分体验Discord的优势：游戏中界面、桌面级通知和全局热键。</string>
     <string name="claim_account_required_body">使用桌面APP前请验证您的账号。</string>
     <string name="claim_account_required_email_to">谢谢！我们已经在 **%1$s** 发送了一个确认链接。请点击链接来验证您的帐户。</string>
     <string name="clear_cache">清理缓存</string>
     <string name="clone_channel">克隆频道</string>
-    <string name="clone_channel_help">新创建的频道将拥有与 **%1$s**相同的权限、人数上限和比特率。</string>
     <string name="close">关闭</string>
     <string name="close_dm">关闭私信</string>
     <string name="close_stream">关闭直播</string>
     <string name="close_window">关闭窗口</string>
-    <string name="cloud_sync_icon_tooltip_done">Cloud Saves 同步完成</string>
-    <string name="cloud_sync_icon_tooltip_planning">Cloud Saves 查看中</string>
-    <string name="cloud_sync_icon_tooltip_preparing">Cloud Saves 准备中</string>
-    <string name="cloud_sync_icon_tooltip_pulling">Cloud Saves 下载中</string>
-    <string name="cloud_sync_icon_tooltip_pushing">Cloud Saves 上传中</string>
-    <string name="cloud_sync_icon_tooltip_supported">支持Cloud Saves</string>
-    <string name="cloud_sync_modal_conflict_choice_download">下载 Cloud Saves</string>
     <string name="cloud_sync_modal_conflict_choice_upload">上传 Local Saves</string>
     <string name="cloud_sync_modal_conflict_description">**%1$s** 的本地保存文件与 Cloud Saves 文件冲突。在运行游戏前，请选择想要使用的存储文件。</string>
-    <string name="cloud_sync_modal_conflict_header">Cloud Saves 冲突</string>
     <string name="cloud_sync_modal_conflict_last_modified">最后修改日期：</string>
     <string name="cloud_sync_modal_error_description">有一个问题正在阻止 Discord 同步 **%1$s.** Cloud Saves。仍然想要运行？</string>
     <string name="cloud_sync_modal_error_header">无法同步 Cloud Saves</string>
@@ -752,9 +701,7 @@
     <string name="coming_soon_title">即将推出！</string>
     <string name="command_giphy_description">网络搜索 GIF 图片</string>
     <string name="command_me_description">突出显示该文字</string>
-    <string name="command_nick_description">更改在此服务器中的昵称。</string>
     <string name="command_nick_failure">您不能在此服务器上更改昵称。</string>
-    <string name="command_nick_failure_permission">您在此服务器上没有**更改昵称**的权限。</string>
     <string name="command_nick_reset">您在此服务器上的昵称已被重置。</string>
     <string name="command_nick_success">您在此服务器上的昵称被更改为**%1$s**。</string>
     <string name="command_shrug_description">将 ¯\\_(ツ)_/¯ 添加到您的信息中。</string>
@@ -808,9 +755,7 @@
     <string name="connecting">连接中</string>
     <string name="connecting_problems_cta">连接时遇到问题？请告诉我们！</string>
     <string name="connection_enter_code">输入屏幕上出现的代码</string>
-    <string name="connection_invalid_pin">输入的pin码无效</string>
     <string name="connection_login_with">或登录</string>
-    <string name="connection_problems_body">查看 [服务器状态](%1$s) 或发送推文 [@discordapp](%2$s)。</string>
     <string name="connection_status_authenticating">认证中</string>
     <string name="connection_status_awaiting_endpoint">等待终端</string>
     <string name="connection_status_connected">已连接</string>
@@ -818,8 +763,6 @@
     <string name="connection_status_disconnected">连接已断开</string>
     <string name="connection_status_ice_checking">ICE 检查中</string>
     <string name="connection_status_no_route">没有路径</string>
-    <string name="connection_status_rtc_connecting">实时通信连接中</string>
-    <string name="connection_status_rtc_disconnected">语音连接已断开</string>
     <string name="connection_status_stream_connected">正在观看 %1$s 的直播</string>
     <string name="connection_status_video_connected">视讯已连接</string>
     <string name="connection_status_voice_connected">语音已连接</string>
@@ -828,7 +771,6 @@
     <string name="content_matching">%1$s 内容匹配 **%2$s**</string>
     <string name="context_menu_hint">右击用户头像执行更多选项</string>
     <string name="continue_to_webapp">继续使用 Discord</string>
-    <string name="convert_emoticons">自动把文字表情转换为Emoji表情。</string>
     <string name="copied_text">已复制到剪贴板</string>
     <string name="copy">复制</string>
     <string name="copy_channel_topic">复制主题</string>
@@ -854,15 +796,13 @@
     <string name="create">创建</string>
     <string name="create_category">创建类别</string>
     <string name="create_channel">创建频道</string>
-    <string name="create_group_dm">创建群组</string>
-    <string name="create_instant_invite">创建即时邀请</string>
+    <string name="create_instant_invite">创建邀请</string>
     <string name="create_link">创建链接</string>
     <string name="create_or_join_modal_header">噢，另一个服务器?</string>
     <string name="create_server_button_body">创建新的服务器并邀请小伙伴加入。免费的噢！</string>
     <string name="create_server_button_cta">创建服务器</string>
     <string name="create_server_button_cta_mobile">创建一个新的服务器</string>
     <string name="create_server_button_cta_mobile_desc">建立服务器，邀请好友，来场聚会吧！</string>
-    <string name="create_server_description">通过创建服务器，您将可以**免费**与您的朋友进行语音/文字聊天</string>
     <string name="create_server_guidelines">您创建服务器即代表您同意了 Discord 的 **[社区守则](%1$s)**。</string>
     <string name="create_server_title">创建您的服务器</string>
     <string name="create_text_channel">创建文字频道</string>
@@ -897,11 +837,9 @@
     <string name="data_privacy_controls_request_data_modal_cancel">我改变主意了</string>
     <string name="data_privacy_controls_request_data_modal_confirm">请求我的数据</string>
     <string name="data_privacy_controls_request_data_modal_note">我们需要最多 30 天来收集您的数据。当数据包准备好之后，我们会向您注册的电子邮件地址发送一封邮件。</string>
-    <string name="data_privacy_controls_request_data_modal_success">我们的隐私小仓鼠已经开始收集您的数据。这大概会持续最多 30 天，完成后，我们会发送邮件通知您。</string>
     <string name="data_privacy_controls_request_data_modal_success_title">数据请求已提交</string>
     <string name="data_privacy_controls_request_data_modal_title">提交数据请求</string>
     <string name="data_privacy_controls_request_data_note">[了解更多](%1$s)关于获取个人数据的过程。</string>
-    <string name="data_privacy_controls_request_data_success_body">准备好时，我们会通过电子邮箱发送下载链接。</string>
     <string name="data_privacy_controls_request_data_success_title">请求接收</string>
     <string name="data_privacy_controls_request_data_tooltip">您的账号必须经过电子邮件验证才能请求数据。您可以在“我的账号”部分验证账号</string>
     <string name="data_privacy_controls_usage_statistics_title">使用数据改善 Discord</string>
@@ -910,7 +848,6 @@
     <string name="date">日期</string>
     <string name="de">德语</string>
     <string name="deafen">耳机静音</string>
-    <string name="deafen_members">隔音成员</string>
     <string name="deauthorize">取消授权</string>
     <string name="deauthorize_app">取消对APP的授权</string>
     <string name="debug">调试</string>
@@ -955,7 +892,6 @@
     <string name="developer_application_test_mode_note">输入您的 Discord APP 来开启该APP的测试模式。</string>
     <string name="developer_application_test_mode_placeholder">APP ID</string>
     <string name="developer_mode">开发者模式</string>
-    <string name="developer_mode_help_text">开发者模式可显示进阶菜单，这对于使用 [Discord API](%1$s) 编写机器人的人来说是有帮助的。</string>
     <string name="device_no_permission">设备 %1$s</string>
     <string name="device_settings">设备设置</string>
     <string name="direct_message">私信</string>
@@ -969,7 +905,6 @@
     <string name="disable_email_notifications_failed_suggestion">电子邮件通知可能已被关闭或与 Discord 账号取消绑定。</string>
     <string name="disable_integration_title">关闭同步</string>
     <string name="disable_integration_twitch_body">关闭同步功能将执行所选过期订阅行为，系统将认为所有的订阅都已过期。</string>
-    <string name="disable_integration_youtube_body">关闭同步功能将执行所选过期赞助商行为，系统将认为所有的赞助商都已过期。</string>
     <string name="disable_notifications_description">将会关闭所有桌面通知。</string>
     <string name="disable_notifications_label">关闭通知</string>
     <string name="disable_sounds_description">所有的声音效果都将被关闭。</string>
@@ -985,7 +920,6 @@
     <string name="discord_desc_long">一款同时支持PC和手机，为游戏玩家设计的免费而又安全的聊天软件。</string>
     <string name="discord_desc_short">团队语音和文字聊天</string>
     <string name="dismiss">解除</string>
-    <string name="dispatch_error_modal_body">出错了。如果问题仍然存在，则创建一个支持请求，并复制下面的信息。</string>
     <string name="dispatch_error_modal_error_label">错误消息（复制并粘贴本信息）</string>
     <string name="dispatch_error_modal_header">Discord Dispatch 错误</string>
     <string name="dispatch_error_modal_open_ticket">创建技术支持请求</string>
@@ -1037,7 +971,6 @@
     <string name="elevated_permissions_sound_title">音频权限</string>
     <string name="email">电子邮件</string>
     <string name="email_invalid">输入的电子邮件地址无效，请重新输入。</string>
-    <string name="email_required">需要有效的电子邮箱。</string>
     <string name="email_verification_instructions_body">我们已经向 **%1$s** 发送了更改密码的操作步骤，请查收您的收件箱和垃圾邮件。</string>
     <string name="email_verification_instructions_header">操作步骤已发送</string>
     <string name="embed_links">嵌入链接</string>
@@ -1055,16 +988,12 @@
     <string name="emoji_matching">符合**%1$s**的表情符号</string>
     <string name="emoji_name">名称</string>
     <string name="emoji_slots_available">%1$s 可用</string>
-    <string name="emoji_too_big">这个表情体积太大了。表情的大小必须小于 %1$skb。</string>
     <string name="en_gb">英语（英国）</string>
     <string name="en_us">英语（美国）</string>
     <string name="enable">开启</string>
-    <string name="enable_ingame_overlay">开启游戏内叠加。</string>
     <string name="enable_privacy_access">您可以在隐私设置中允许访问。</string>
-    <string name="enable_streamer_mode_description">您可以在 [热键设置](onClick) 中设置一个用于开启直播模式的按键。</string>
     <string name="enable_streamer_mode_label">开启主播模式</string>
     <string name="enable_twitch_emoji_sync">允许已同步的订阅用户在Discord中使用您的 Twitch 自定义表情。</string>
-    <string name="enter_email_body">验证电子邮箱，您必须先输入电子邮箱地址。</string>
     <string name="enter_phone_description">请输入您的手机号码，您将会收到一条带有验证码的短信。</string>
     <string name="enter_phone_title">输入手机号码</string>
     <string name="enter_vanity_url">输入个性化网址</string>
@@ -1081,7 +1010,6 @@
     <string name="exit_full_screen">退出全屏</string>
     <string name="experiment_mobile_only_user_button_cancel">放弃</string>
     <string name="experiment_mobile_only_user_button_go">获取APP</string>
-    <string name="experiment_mobile_only_user_email_confirmation">呜哈，邮件已发送！去收件箱中查看下载链接吧。</string>
     <string name="experiment_mobile_only_user_header">您好呀亲～</string>
     <string name="experiment_mobile_only_user_text1">您电脑怎么还未安装 Discord呀？ლ(´•д• ̀ლ 来，这是桌面APP下载链接：%1$s</string>
     <string name="experiment_mobile_only_user_text2">您电脑怎么还未安装 Discord呀？ლ(´•д• ̀ლ 我们可以马上用电子邮件给您发送下载链接。</string>
@@ -1092,7 +1020,6 @@
     <string name="explicit_content_filter_high">扫描所有成员发送信息。</string>
     <string name="explicit_content_filter_high_description">致力打造和谐社会的话，请选我 ヽ(*´ω`)人(´ω`*) ﾉ</string>
     <string name="explicit_content_filter_medium">扫描无角色成员所发的信息</string>
-    <string name="explicit_content_filter_medium_description">如果您受不了一点儿污，推荐您选择此项。</string>
     <string name="failed">失败</string>
     <string name="fcm_fallback_notification_channel_label">其他</string>
     <string name="fi">芬兰语</string>
@@ -1102,49 +1029,26 @@
     <string name="focus_participant">关注此人</string>
     <string name="force_sync">强制同步</string>
     <string name="forgot_password">忘记密码？</string>
-    <string name="forgot_password_body">不用担心！请输入与您帐户关联的电子邮箱地址，以便我们验证您的身份。</string>
-    <string name="form_checkbox_debug_logging">调试登录</string>
     <string name="form_checkbox_qos">开启服务品质(QoS) 数据包最高优先权</string>
     <string name="form_description_audio_mode_android_call">如果您的麦克风或耳机有问题，您可以尝试使用该语音模式。否则，就保留默认设置。</string>
     <string name="form_description_audio_mode_android_communication">这是像 Discord 这类的 VoIP APP默认的语音模式。我们建议您保留这项设置。</string>
-    <string name="form_description_push_afk_timeout">"当您在电脑上使用 Discord 时，Discord 将不会向您的移动设备推送通知。
-此选项可设置当您保持暂离状态多长时间后将推送通知到您的移动设备。"</string>
     <string name="form_description_tts">打开这会有一个高科技的机器人说话通知您。</string>
     <string name="form_error_generic">哎呀！您遇到了一个超级稀有的错误。这应该是我们的问题，请您再试一次或是查看 [我们的状态页面](%1$s)。</string>
-    <string name="form_help_afk_channel">"自动把
-闲置逾时的成员挪到此频道并屏蔽他们。此功能并不影响浏览器。"</string>
-    <string name="form_help_attenuation">"聊天时，“语音优先”功能将其它程序的音量自动调低某个百分比。
-将百分比设置为 0%% 以关闭“语音优先”功能。"</string>
     <string name="form_help_automatic_vad">指示器显示为绿色表示 Discord 正在传输您动听的声音。</string>
-    <string name="form_help_bitrate">"**ALL THE BITS!** 除非您是位高清音乐发烧友，我们不推荐您使用高过%1$skbps，因为这样对移动设备或连接不稳定的设备
-没有明显的效果提升。"</string>
     <string name="form_help_certified_voice_processing">"使用 Discord 验证过的麦克风时，
 由麦克风进行语音处理，而非 Discord。"</string>
     <string name="form_help_channel_permissions">选择角色的同时系统将会自动设置此频道的基本权限。</string>
     <string name="form_help_custom_code">使用任何字母和数字作为代码。</string>
     <string name="form_help_debug_logging">可以将调试日志保持在语音模块的文件夹下，发送给我们进行故障排除。</string>
-    <string name="form_help_default_notification_settings">"这将决定那些没有明确设置通知设定的成员是否会收到此服务器上
-每一条发出信息的通知。** 我们强烈建议公开的Discord服务器都设置为 “仅@提及”以
-避免成员被[信息轰炸](%1$s)。**"</string>
-    <string name="form_help_default_notification_settings_mobile">"这将决定没有明确进行通知设置的用户是否会收到此服务器上
-所有发送的信息的通知。我们强烈建议公开的Discord服务器都设置为 “仅@提及”。"</string>
     <string name="form_help_explicit_content_filter">"自动扫描并删除此服务器内带有不雅内容的信息。请选择过滤器的
 过滤范围（哪些成员在过滤范围内）。 **我们建议公开的Discord服务器都设置过滤器。**"</string>
-    <string name="form_help_instant_invite_channel">"如果已选定一个频道，小工具即会生成一个即时邀请链接，
-否则只会显示在线成员和语音频道列表。"</string>
-    <string name="form_help_last_seen">"精简成员后将踢除**%1$s** 位至少在 **%2$s** 之内
-没有登录并没有被分配任何角色的成员。
-他们仍然可以使用新的邀请来重新加入。"</string>
     <string name="form_help_legacy_subsystem">"有些音频驱动器在您的操作系统现代音频子系统操作时会出现问题。
 选择此以所用旧式音频子系统。"</string>
-    <string name="form_help_nsfw">"用户将需要确认他们已经达到法定年龄以查看此频道中的内容。
-“上班别偷看”频道将豁免于不雅内容过滤器的筛选。"</string>
     <string name="form_help_premade_widget">"请把此HTML代码嵌入至您的网站以使用Discord的精美预制小工具。如果您
 拥有网站的用户权限的话，您还可以添加&amp;username=至查询字符串中。"</string>
     <string name="form_help_qos">"提醒您的路由器Discord发出的数据包是高优先的。
 部分路由器或者网络供应商可能会无视此设定。"</string>
     <string name="form_help_slowmode">除非成员拥有管理频道或管理消息的权限，否则他们每次仅限发送一条消息。</string>
-    <string name="form_help_system_channel">每当有新成员加入服务器时，系统都会发送一则随机消息到该频道。此功能可随时关闭。</string>
     <string name="form_help_temporary">成员将会在断开连接后自动被踢除，除非分配了角色。</string>
     <string name="form_help_user_limit">"限制可以连接到此语音频道的用户数。拥有 **移动成员** 权限
 的用户忽略此限制，并且可以将其他用户移动到该频道。"</string>
@@ -1189,8 +1093,8 @@
     <string name="form_label_input_mode">语音输入模式</string>
     <string name="form_label_input_sensitivty">输入灵敏度</string>
     <string name="form_label_input_volume">输入音量</string>
-    <string name="form_label_instant_invite">输入即时邀请</string>
-    <string name="form_label_instant_invite_channel">即时邀请频道</string>
+    <string name="form_label_instant_invite">输入邀请</string>
+    <string name="form_label_instant_invite_channel">邀请频道</string>
     <string name="form_label_last_seen">上次在线</string>
     <string name="form_label_local_mute">本地静音</string>
     <string name="form_label_max_age">在此时间后过期</string>
@@ -1211,17 +1115,14 @@
     <string name="form_label_mobile_notifications_system_label">系统通知</string>
     <string name="form_label_mobile_notifications_vibrations">关闭通知震动</string>
     <string name="form_label_mobile_notifications_wake_device">通知可唤醒设备。</string>
-    <string name="form_label_mobile_push_notifications">移动设备通知推送</string>
     <string name="form_label_mute_server">将 **%1$s**静音</string>
-    <string name="form_label_mute_server_description">将服务器静音会防止任何未读提示和通知，除非您被艾特。</string>
     <string name="form_label_muted">已静音</string>
     <string name="form_label_new_password">新密码</string>
     <string name="form_label_new_user">新用户？</string>
     <string name="form_label_nothing">无通知</string>
     <string name="form_label_notification_frequency">频率</string>
     <string name="form_label_notification_position">通知位置</string>
-    <string name="form_label_nsfw">上班别偷看</string>
-    <string name="form_label_nsfw_channel">“上班别偷看”频道</string>
+    <string name="form_label_nsfw_channel">少儿不宜频道</string>
     <string name="form_label_off">关</string>
     <string name="form_label_only_mentions">仅 **@被提及**</string>
     <string name="form_label_output">输出</string>
@@ -1232,7 +1133,6 @@
     <string name="form_label_password">密码</string>
     <string name="form_label_phone_number">电话号码</string>
     <string name="form_label_premade_widget">预先制作的小工具</string>
-    <string name="form_label_push_afk_timeout">推送暂离状态超时通知</string>
     <string name="form_label_qos">服务质量</string>
     <string name="form_label_reason_ban">封锁理由</string>
     <string name="form_label_reason_kick">踢除理由</string>
@@ -1259,7 +1159,6 @@
     <string name="form_label_suppress_everyone">关闭 **@everyone** 和 **@here**</string>
     <string name="form_label_synced_role">已同步角色</string>
     <string name="form_label_synced_subs">已同步订阅用户</string>
-    <string name="form_label_system_channel">新成员讯息频道</string>
     <string name="form_label_temporary">临时成员</string>
     <string name="form_label_tts">文字转语音</string>
     <string name="form_label_tts_notifications">文字转语音通知</string>
@@ -1275,12 +1174,6 @@
     <string name="form_placeholder_reason">原因</string>
     <string name="form_placeholder_server_name">输入服务器名称</string>
     <string name="form_placeholder_username">希望大家怎么称呼您？</string>
-    <string name="form_report_help_text">"举报将发送给 Discord 的 信任 &amp; 安全 团队 - **不是服务器管理员**。
-
-发送虚假举报 或 发送垃圾邮件 可能导致禁止您使用举报功能。
-
-从[Discord 社区准则](%1$s) 了解更多。
-感谢您对安全的注重和反馈。"</string>
     <string name="form_warning_input_sensitivty">"您未开启任何输入设备。您必须允许 Discord [访问您的麦克风](onEnableClick)
 才能查看输入灵敏度。"</string>
     <string name="form_warning_video_preview">您必须授权Discord[访问摄像头](onEnableClick) 才能预览。</string>
@@ -1322,9 +1215,7 @@
     <string name="game_action_button_game_not_detected">未检测到游戏</string>
     <string name="game_action_button_install">安装</string>
     <string name="game_action_button_locate">定位</string>
-    <string name="game_action_button_login_to_buy">登入购买</string>
     <string name="game_action_button_now_playing">正在玩</string>
-    <string name="game_action_button_paused">暂停</string>
     <string name="game_action_button_play">开始游戏</string>
     <string name="game_action_button_play_disabled_desktop_app">通过桌面APP运行</string>
     <string name="game_action_button_queue">队列更新</string>
@@ -1350,18 +1241,11 @@
     <string name="game_detected">正在运行：%1$s</string>
     <string name="game_detection_foreground_android">开启前台服务进行游戏检测</string>
     <string name="game_detection_foreground_info_android">这会改善游戏检测，并在侧栏菜单中持续显示通知</string>
-    <string name="game_detection_modal_info_android">"为开启游戏检测，Discord 需要您进行以下操作：
-1) 打开使用访问权限设置
-2) 选择 Discord
-3) 开启“运行使用访问权限”"</string>
     <string name="game_detection_open_settings">打开设置</string>
     <string name="game_detection_service">游戏检测服务</string>
     <string name="game_feed_activity_action_play">开始游戏</string>
-    <string name="game_feed_activity_playing_xbox">在 Xbox 上运行</string>
     <string name="game_feed_activity_recently_played">最近玩过的</string>
-    <string name="game_feed_activity_streaming_twitch">在 Twitch 上直播</string>
     <string name="game_feed_current_header_title">正在玩</string>
-    <string name="game_feed_settings_visibility">显示游戏选项卡</string>
     <string name="game_feed_unknown_player">未知玩家</string>
     <string name="game_feed_user_played_days_ago">%1$s %2$s前玩过</string>
     <string name="game_feed_user_played_hours_ago">已经玩了 %1$s %2$s</string>
@@ -1390,7 +1274,6 @@
     <string name="game_library_new">全新！</string>
     <string name="game_library_notification_game_installed_body">%1$s安装完成。祝玩得开心！</string>
     <string name="game_library_notification_game_installed_title">准备运行</string>
-    <string name="game_library_overlay_disabled_tooltip">叠加已关闭</string>
     <string name="game_library_private_tooltip">游戏状态已隐藏</string>
     <string name="game_library_time_played_hours">%1$s %1$s</string>
     <string name="game_library_time_played_minutes">%1$s %1$s</string>
@@ -1430,6 +1313,7 @@
     <string name="generate_a_new_link">生成新的链接</string>
     <string name="get_started">开始</string>
     <string name="gif_auto_play_label">当集中在 Discord 时，自动播放 GIF。</string>
+    <string name="go_live_hardware_acceleration_unavailable">请注意，我们无法检测硬件升级情况。您的电脑有可能无法支持 Go Live。</string>
     <string name="go_live_hey">嗨！</string>
     <string name="go_live_listen">听！</string>
     <string name="go_live_look">快看！</string>
@@ -1443,6 +1327,7 @@
     <string name="go_live_modal_select_channel_form_title">选择一个语音频道</string>
     <string name="go_live_modal_select_channel_placeholder">搜索语音频道</string>
     <string name="go_live_modal_title">私人直播</string>
+    <string name="go_live_video_drivers_outdated">您的显卡驱动已过期，进行更新后 Go Live 效果会更好。</string>
     <string name="grant_temporary_membership">授予临时成员资格</string>
     <string name="group">群组</string>
     <string name="group_dm_add_friends">添加朋友到私信</string>
@@ -1452,7 +1337,6 @@
     <string name="group_dm_invite_full_sub">群组最多只可以有 10 名成员。</string>
     <string name="group_dm_invite_link_title">或者，向好友发送邀请链接！</string>
     <string name="group_dm_invite_no_friends">您还沒有添加任何好友!</string>
-    <string name="group_dm_invite_not_friends">您需要和 **%1$s** 成为好友才能开始群组通话。</string>
     <string name="group_dm_invite_remaining">%1$s</string>
     <string name="group_dm_invite_successful_mobile">%1$s 已被添加到群组中。</string>
     <string name="group_dm_invite_to">收件人:</string>
@@ -1469,12 +1353,9 @@
     <string name="guild_message_notifications_only_mentions">仅 @被提及</string>
     <string name="guild_muted_help_text">服务器目前处于静音状态，因此这些已被关闭</string>
     <string name="guild_owner">服务器所有者</string>
-    <string name="guild_security_req_mfa_body">"避免尚未通过双重认证的用户进行有潜在风险的管理操作。
-**此选项只供账号已开启双重认证的服务器所有人选用**。"</string>
     <string name="guild_security_req_mfa_enable">[已开启](onClick)</string>
     <string name="guild_security_req_mfa_guild_disable">关闭双重认证要求</string>
     <string name="guild_security_req_mfa_guild_enable">开启双重认证要求</string>
-    <string name="guild_security_req_mfa_label">双重认证</string>
     <string name="guild_security_req_mfa_turn_off">关闭服务器端双重认证</string>
     <string name="guild_security_req_mfa_turn_on">开启服务器端双重认证</string>
     <string name="guild_settings_action_filter_channel_create">创建频道</string>
@@ -1483,9 +1364,6 @@
     <string name="guild_settings_action_filter_channel_overwrite_delete">删除频道权限</string>
     <string name="guild_settings_action_filter_channel_overwrite_update">更新频道权限</string>
     <string name="guild_settings_action_filter_channel_update">更新频道</string>
-    <string name="guild_settings_action_filter_emoji_create">创建 Emoji</string>
-    <string name="guild_settings_action_filter_emoji_delete">删除 Emoji</string>
-    <string name="guild_settings_action_filter_emoji_update">更新 Emoji</string>
     <string name="guild_settings_action_filter_guild_update">更新服务器</string>
     <string name="guild_settings_action_filter_invite_create">创建邀请</string>
     <string name="guild_settings_action_filter_invite_delete">删除邀请</string>
@@ -1509,18 +1387,11 @@
     <string name="guild_settings_audit_log_channel_delete">$[**%1$s**](userHook) 移除了 $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_name_change">名称从 **%1$s** 更改为 **%2$s**</string>
     <string name="guild_settings_audit_log_channel_name_create">设定名称为 **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_nsfw_disabled">已移除频道“上班别偷看”的标示</string>
-    <string name="guild_settings_audit_log_channel_nsfw_enabled">标示为“上班别偷看”频道</string>
-    <string name="guild_settings_audit_log_channel_overwrite_create">$[**%1$s**](userHook) 已创建 $[**%2$s**](targetHook)的覆盖权限设定</string>
-    <string name="guild_settings_audit_log_channel_overwrite_delete">$[**%1$s**](userHook) 删除了 $[**%2$s**](targetHook) 的覆盖权限设定</string>
-    <string name="guild_settings_audit_log_channel_overwrite_update">$[**%1$s**](userHook) 已更新 $[**%2$s**](targetHook)的覆盖权限设定</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_create">包含权限覆盖</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_denied">**已拒绝** **%1$s** %2$s</string>
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**已授予** **%1$s** %2$s</string>
     <string name="guild_settings_audit_log_channel_position_change">从 **%1$s** 转移到 **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">位于 **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) 已创建文字频道 $[**%2$s**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">主题改为 **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">设定主题为 **%1$s**</string>
@@ -1547,7 +1418,6 @@
     <string name="guild_settings_audit_log_guild_owner_id_change">将所有权转移至 **%1$s**</string>
     <string name="guild_settings_audit_log_guild_region_change">设定语音区域为 **%1$s**</string>
     <string name="guild_settings_audit_log_guild_system_channel_id_change">设定欢迎通知频道为 **%1$s**</string>
-    <string name="guild_settings_audit_log_guild_system_channel_id_disable">**关闭了** 欢迎通知讯息</string>
     <string name="guild_settings_audit_log_guild_update">$[**%1$s**](userHook) 对 $[**%2$s**](targetHook) 进行变更</string>
     <string name="guild_settings_audit_log_guild_vanity_url_code_change">设定个性化网址为 **%1$s**</string>
     <string name="guild_settings_audit_log_guild_vanity_url_code_delete">**已删除** 自定义网址</string>
@@ -1590,8 +1460,6 @@
     <string name="guild_settings_audit_log_role_delete">$[**%1$s**](userHook) 已删除 $[**%2$s**](targetHook) 的角色</string>
     <string name="guild_settings_audit_log_role_hoist_off">未被单独显示</string>
     <string name="guild_settings_audit_log_role_hoist_on">被单独显示</string>
-    <string name="guild_settings_audit_log_role_mentionable_off">不可被@</string>
-    <string name="guild_settings_audit_log_role_mentionable_on">可被@</string>
     <string name="guild_settings_audit_log_role_name_change">名称从 **%1$s** 更改为 **%2$s**</string>
     <string name="guild_settings_audit_log_role_name_create">名称为 **%1$s**</string>
     <string name="guild_settings_audit_log_role_permissions_denied">**已拒绝** %1$s</string>
@@ -1610,12 +1478,13 @@
     <string name="guild_settings_default_notification_settings_protip">我们强烈建议将公共Discord频道的此选项设定为仅@被提及 以避免成员被[信息轰炸](%1$s).</string>
     <string name="guild_settings_emoji_alias">昵称</string>
     <string name="guild_settings_emoji_alias_placeholder">输入昵称</string>
-    <string name="guild_settings_emoji_upload_to_server_message">不要荒废您的表情包。将最多 %1$s 个大家都可以使用的表情。添加到这台服务器。Discord Nitro 的成员可以使用动态 GIF 表情。表情名称的长度至少为两个字符，仅可为字母、数字以及下划线。表情的大小必须在 %2$skb 以内。</string>
     <string name="guild_settings_filter_action">按操作筛选</string>
     <string name="guild_settings_filter_all">全部</string>
     <string name="guild_settings_filter_all_actions">所有操作</string>
     <string name="guild_settings_filter_all_users">所有用户</string>
     <string name="guild_settings_filter_user">按用户筛选</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">720p 60fps 的 Go Live 直播</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">1080p 60fps 的 Go Live 直播</string>
     <string name="guild_settings_label_audit_log">审核日志</string>
     <string name="guild_settings_label_audit_log_empty_body">当服务器管理员开始管控后，您可以在这里监督他们的管控工作。</string>
     <string name="guild_settings_label_audit_log_empty_title">暂时没有日志</string>
@@ -1644,13 +1513,11 @@
     <string name="help_missing_manage_roles_permission">因为您没有管理角色的权限，您的角色已被锁定。</string>
     <string name="help_missing_permission">您所有的角色都没有此权限，所以不能修改。</string>
     <string name="help_role_locked">此角色因比您最高的角色高所以被锁定。</string>
-    <string name="help_role_locked_mine">此角色因是您目前最高的角色而被锁定。请向比此角色高或频道所有人请求帮忙。</string>
     <string name="help_singular_permission">您不能修改此权限，因为删除它的同时也会把您移除掉。</string>
     <string name="hide_instant_invites_description">如果您不想让陌生人随便访问您的Discord服务器的话，建议您这样做。</string>
-    <string name="hide_instant_invites_label">隐藏即时邀请链接</string>
+    <string name="hide_instant_invites_label">隐藏邀请链接</string>
     <string name="hide_muted">隐藏%1$s 已静音</string>
     <string name="hide_muted_channels">隐藏已静音的频道</string>
-    <string name="hide_personal_information_description">隐藏邮箱、关联账号和备注并隐去Discord编号。</string>
     <string name="hide_personal_information_label">隐藏个人信息</string>
     <string name="hold_up">等一下！</string>
     <string name="home">主页</string>
@@ -1672,10 +1539,8 @@
     <string name="hypesquad_leave_prompt">噢不！～您要离开HypeSquad吗？</string>
     <string name="hypesquad_membership_heading">%1$s学院</string>
     <string name="hypesquad_newsletter_warning">Wumpus 的律师们想让我们告诉您，加入 HypeSquad 意味着您同意接收我们的简报。</string>
-    <string name="hypesquad_perk_description_profile_badge">获得一枚独特的勋章来代表您的 HypeSquad 房间。</string>
     <string name="hypesquad_perk_description_squad_challenges">代表您的 House 并参与挑战其他 HypeSquad 房间。</string>
     <string name="hypesquad_perk_title_newsletter">超级秘密简报</string>
-    <string name="hypesquad_perk_title_profile_badge">促销勋章</string>
     <string name="hypesquad_perk_title_squad_challenges">Squad 挑战</string>
     <string name="hypesquad_perks_heading">促销福利</string>
     <string name="hypesquad_question_0_prompt">Wumpus 就在大门外面，您会：</string>
@@ -1702,7 +1567,6 @@
     <string name="hypesquad_question_13_response_a">一个潜伏着的刀剑骷髅</string>
     <string name="hypesquad_question_13_response_b">是我那一堆牛顿摆的收藏</string>
     <string name="hypesquad_question_13_response_c">每日冥想时哼的小曲儿</string>
-    <string name="hypesquad_question_13_response_d">Wumpus 一次一次的在服务器上@所有人，给所有人发信息</string>
     <string name="hypesquad_question_14_prompt">吃早餐麦片的正确顺序是：</string>
     <string name="hypesquad_question_14_response_a">碗、汤匙、牛奶、麦片</string>
     <string name="hypesquad_question_14_response_b">碗、麦片、牛奶、汤匙</string>
@@ -1753,7 +1617,6 @@
     <string name="hypesquad_question_9_response_b">什么也不说，然后重新复活团队</string>
     <string name="hypesquad_question_9_response_c">一笑了之，并建议再试一遍</string>
     <string name="hypesquad_question_9_response_d">将 Wumpus 从派对中踢除，让 Clyde 作为新的肉盾</string>
-    <string name="hypesquad_quiz_body_house_1">Bravery 学院感谢您加入我们。让我们共同保护这片神圣的土地，一起延续兰威尔的遗志。您的果敢刚毅绝非千百勇士可比。如果没有您的领导和力量，我们可能早已陷入混沌之中。</string>
     <string name="hypesquad_quiz_body_house_2">House of Brilliance 感谢您未保护这片土地，守住乌尔蒂姆的遗产做出的贡献。您的战术无懈可击，仿佛任何困难都能迎刃而解，没有您的帮助，我们现在可能会进一步陷入混沌了。</string>
     <string name="hypesquad_quiz_body_house_3">House of Balance 感谢您未保护这片土地，守住阿拉米的遗产做出的贡献。您堪称静若处子动若脱兔的典范，没有您对自身和环境的理解，我们现在可能会进一步陷入混沌了。</string>
     <string name="hypesquad_quiz_cancel">取消</string>
@@ -1777,7 +1640,6 @@
     <string name="image">图片</string>
     <string name="images">图像</string>
     <string name="img_alt_attachment_file_type">附件文件类型：%1$s</string>
-    <string name="img_alt_emoji">%1$s 表情</string>
     <string name="img_alt_icon">%1$s 图标</string>
     <string name="img_alt_logo">%1$s 标志</string>
     <string name="img_alt_navigate_to">浏览至 %1$s</string>
@@ -1799,14 +1661,14 @@
     <string name="input_mode_ptt_release_delay">“按键说话”放开按键延迟</string>
     <string name="input_mode_vad">语音感应</string>
     <string name="install_location_main">主要</string>
-    <string name="instant_invite">即时邀请</string>
+    <string name="instant_invite">邀请</string>
     <string name="instant_invite_accept">接受邀请</string>
-    <string name="instant_invite_accepted">已接受邀请</string>
-    <string name="instant_invite_accepting">接受即时邀请</string>
+    <string name="instant_invite_accepted">接受邀请</string>
+    <string name="instant_invite_accepting">接受邀请中</string>
     <string name="instant_invite_ask_for_new_invite">请求一个新邀请！</string>
     <string name="instant_invite_ask_user_for_new_invite">向 %1$s 请求新的邀请！</string>
     <string name="instant_invite_code">邀请代码</string>
-    <string name="instant_invite_expired">即时邀请无效或已过期。</string>
+    <string name="instant_invite_expired">邀请无效或已过期。</string>
     <string name="instant_invite_expires">到期时间</string>
     <string name="instant_invite_failed_to_generate">创建邀请链接失败。</string>
     <string name="instant_invite_generate">生成</string>
@@ -1829,19 +1691,12 @@
     <string name="instant_invite_you_are_already_a_member_of">您已经加入了</string>
     <string name="instant_invite_you_have_been_invited_to_join">您已被邀请加入</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** 邀请您加入</string>
-    <string name="instant_invite_you_have_been_invited_to_join_group_dm">您已被邀请加入一个群组，邀请人</string>
-    <string name="instant_invites">即时邀请</string>
+    <string name="instant_invites">邀请</string>
     <string name="integration_settings">集成设置</string>
     <string name="integrations">整合</string>
-    <string name="integrations_header">已连接的Twitch/YouTube游戏账号</string>
     <string name="integrations_pro_tip">更多集成选项请查看[Discord的StreamKit](%1$s)</string>
     <string name="internal_server_error">服务器内部错误，请重试。</string>
-    <string name="invalid_animated_emoji_body">无法使用，该表情为动态表情。升级 Discord Nitro 后可以放飞您的动态表情梦。</string>
-    <string name="invalid_animated_emoji_body_upgrade">无法使用，该表情为动态表情。Discord Nitro 可以解决此问题，打开 用户设置 > Nitro 获取更多信息。</string>
-    <string name="invalid_external_emoji_body">无法使用，该表情来自其他服务器。升级到 Discord Nitro 即可使用来自其他服务器的表情。</string>
-    <string name="invalid_external_emoji_body_upgrade">无法使用，该表情来自其他服务器。Discord Nitro 可以解决此问题，打开 用户设置 > Nitro 获取更多信息。</string>
     <string name="invalid_invite_link_error">请输入有效的邀请链接或邀请代码。</string>
-    <string name="invalid_request_format">**%1$s** 的格式不正确. 请输入 DiscordTag#0000或电子邮箱。</string>
     <string name="invalid_text_channel">无效频道</string>
     <string name="invalid_voice_channel">无效频道</string>
     <string name="invite_banner_does_not_expire">此链接不会过期。您可以管理服务器设置中的所有邀请链接。</string>
@@ -1862,15 +1717,12 @@
     <string name="invite_button_streaming">%1$s 已开始直播！</string>
     <string name="invite_button_streaming_subtext">于 %1$s</string>
     <string name="invite_button_title_invited">您已被邀请加入一个服务器</string>
-    <string name="invite_button_title_invited_group_dm">您已被邀请加入一个群组</string>
     <string name="invite_button_title_invited_invalid">您收到一个邀请，但是……</string>
     <string name="invite_button_title_invited_stream">您已被邀请观看直播</string>
     <string name="invite_button_title_inviter">您发出了加入一个服务器的邀请</string>
-    <string name="invite_button_title_inviter_group_dm">您发出了加入一个群组的邀请</string>
     <string name="invite_button_title_inviter_invalid">您发送了一个邀请，但是……</string>
     <string name="invite_button_title_inviter_stream">您发出了一个直播观看邀请</string>
     <string name="invite_button_title_streaming">邀请观看直播</string>
-    <string name="invite_copied">复制</string>
     <string name="invite_edit_link">编辑邀请链接。</string>
     <string name="invite_embed_full_group">群组已满</string>
     <string name="invite_embed_full_group_spectate">频道已满：观战</string>
@@ -1946,13 +1798,13 @@
     <string name="join_afk_channel_body">您已进入闲置频道。在此频道中将无法讲话。</string>
     <string name="join_call">加入通话</string>
     <string name="join_server">加入</string>
-    <string name="join_server_button_body">输入即时邀请并加入您小伙伴的服务器。</string>
+    <string name="join_server_button_body">输入邀请并加入您小伙伴的服务器。</string>
     <string name="join_server_button_cta">加入服务器</string>
     <string name="join_server_button_cta_mobile">通过邀请链接加入服务器</string>
     <string name="join_server_button_cta_mobile_desc">有邀请码或邀请链接？快在这里使用！</string>
     <string name="join_server_button_cta_named">加入 %1$s</string>
-    <string name="join_server_description">在下面输入即时邀请以加入现有服务器。邀请看起来大概长这样：</string>
-    <string name="join_server_description_mobile">在上面输入即时邀请以加入现有的服务器。</string>
+    <string name="join_server_description">在下面输入邀请以加入现有服务器。邀请看起来大概长这样：</string>
+    <string name="join_server_description_mobile">在上面输入邀请以加入现有的服务器。</string>
     <string name="join_server_title">加入服务器</string>
     <string name="join_stream">加入直播</string>
     <string name="join_video_call">加入视讯通话</string>
@@ -1984,7 +1836,6 @@
     <string name="keybind_description_modal_return_to_audio_channel">返回到之前的通讯频道</string>
     <string name="keybind_description_modal_scroll_chat">向上或向下滚动聊天区域</string>
     <string name="keybind_description_modal_search">搜索</string>
-    <string name="keybind_description_modal_search_emojis">切换emoji表情选取器</string>
     <string name="keybind_description_modal_subtitle">掌握了这些，您就会成为最棒的 Discord 玩家</string>
     <string name="keybind_description_modal_title">键盘组合</string>
     <string name="keybind_description_modal_toggle_deafen">切换静音</string>
@@ -1992,8 +1843,6 @@
     <string name="keybind_description_modal_toggle_hotkeys">开关快捷键</string>
     <string name="keybind_description_modal_toggle_mentions">开关提及通知</string>
     <string name="keybind_description_modal_toggle_mute">切换静音</string>
-    <string name="keybind_description_modal_toggle_pins">打开或关闭固定通知弹窗</string>
-    <string name="keybind_description_modal_toggle_previous_guild">在最后浏览的服务器和私聊间切换</string>
     <string name="keybind_description_modal_toggle_users">开关频道成员列表</string>
     <string name="keybind_description_modal_unread_channels">在未读频道间切换</string>
     <string name="keybind_description_modal_unread_mention_channels">在提及自己的未读频道之间切换</string>
@@ -2005,8 +1854,6 @@
 会降低音量。"</string>
     <string name="keybind_description_toggle_deafen">打开或关闭扬声器。在静音时也将关闭您的麦克风。</string>
     <string name="keybind_description_toggle_mute">打开或关闭麦克风传输</string>
-    <string name="keybind_description_toggle_overlay">开启或关闭叠加.</string>
-    <string name="keybind_description_toggle_overlay_input_lock">切换叠加交互锁</string>
     <string name="keybind_description_toggle_streamer_mode">开启/关闭主播模式。</string>
     <string name="keybind_description_toggle_voice_mode">在按键说话模式与语音感应之间切换。</string>
     <string name="keybind_description_unassigned">此操作没用哒! 请从选择栏里设定一个。</string>
@@ -2015,8 +1862,6 @@
     <string name="keybind_push_to_talk_priority">按键说话（优先）</string>
     <string name="keybind_toggle_deafen">切换静音</string>
     <string name="keybind_toggle_mute">切换静音</string>
-    <string name="keybind_toggle_overlay">切换叠加模式</string>
-    <string name="keybind_toggle_overlay_input_lock">切换游戏内叠加锁定</string>
     <string name="keybind_toggle_stream_mode">切换主播模式</string>
     <string name="keybind_toggle_voice_mode">切换VAD</string>
     <string name="keybind_unassigned">未分配</string>
@@ -2060,9 +1905,8 @@
     <string name="link_your_xbox_account_2">Discord 是一款为玩家准备的集语音、文字、视讯于一体的聊天APP，安全、免费，同时适配桌面端与移动端。</string>
     <string name="listening_to">正在听**%1$s**</string>
     <string name="live">直播</string>
-    <string name="live_beta_description">欢迎来到直播！私人直播目前在测试阶段，如遇问题，还请见谅。</string>
+    <string name="live_beta_description">欢迎来到直播！Go Live 目前为测试阶段，如遇问题，还请见谅。</string>
     <string name="live_on_twitch">Twitch 直播中</string>
-    <string name="live_viewers">%1$s位%2$s</string>
     <string name="load_image_error">"加载图片失败。
 请重试一遍。"</string>
     <string name="load_more_messages">加载更多信息</string>
@@ -2084,7 +1928,6 @@
     <string name="manage_messages">管理消息</string>
     <string name="manage_messages_description">拥有此权限的成员可以删除其他成员发出的消息或标注消息。</string>
     <string name="manage_nicknames">管理昵称</string>
-    <string name="manage_nicknames_description">拥有此权限的用户可以更改其他用户的昵称。</string>
     <string name="manage_permissions">管理权限</string>
     <string name="manage_permissions_description">拥有此权限的成员可以更改此频道的权限。</string>
     <string name="manage_roles">管理角色</string>
@@ -2092,7 +1935,6 @@
     <string name="manage_server">管理服务器</string>
     <string name="manage_server_description">拥有此权限的成员可以修改服务器的名称或更换区域。</string>
     <string name="manage_user">管理用户</string>
-    <string name="manage_webhooks">管理 ｗebhook</string>
     <string name="manage_webhooks_description">拥有此权限的成员可以创建、 编辑和删除 ｗebhook。</string>
     <string name="managed_role_explaination">"这是一个系统自动管理的角色。
 它不能被手动分配给成员或者删除。"</string>
@@ -2115,7 +1957,6 @@
     <string name="media_hint_title">允许 Discord 使用您的摄像头。</string>
     <string name="member">成员</string>
     <string name="member_list">成员名单</string>
-    <string name="member_list_server_owner_help">此用户是服务器拥有者，并不受任何角色权限的限制。</string>
     <string name="members">成员</string>
     <string name="members_header">%1$s</string>
     <string name="members_matching">符合 **%1$s**的成员。</string>
@@ -2124,7 +1965,6 @@
     <string name="mention_everyone">提及所有人</string>
     <string name="mention_everyone_autocomplete_description">通知所有有权限查看此频道的成员。</string>
     <string name="mention_everyone_autocomplete_description_mobile">通知此频道的所有成员。</string>
-    <string name="mention_everyone_description">拥有此权限的成员可以在信息前加上 @everyone 或 @here 方式来推送消息至频道的全部成员。</string>
     <string name="mention_here_autocomplete_description">通知所有拥有查看此频道权限的在线成员。</string>
     <string name="mention_here_autocomplete_description_mobile">通知此频道的在线成员。</string>
     <string name="mention_role_autocomplete_description_mobile">通知此频道拥有此角色的用户。</string>
@@ -2142,7 +1982,6 @@
     <string name="message_too_long_header">您的信息过长。</string>
     <string name="message_tts">%1$s 说%2$s</string>
     <string name="message_tts_deleted_role">已删除角色</string>
-    <string name="message_unpinned">消息已取消标注。</string>
     <string name="message_warning_mention_everyone_body">您确定要提及 %1$s 个人吗？</string>
     <string name="message_warning_mention_everyone_title">哎呀呀！</string>
     <string name="messages">消息</string>
@@ -2157,7 +1996,6 @@
     <string name="mfa_sms_already_enabled">已开启！</string>
     <string name="mfa_sms_auth">SMS 备份验证</string>
     <string name="mfa_sms_auth_current_phone">您当前的号码是：%1$s。</string>
-    <string name="mfa_sms_auth_sales_pitch">添加您的电话作为备份的双重认证方法，以防您丢失验证APP或备用安全码。</string>
     <string name="mfa_sms_confirm_remove_action">移除 SMS 备份验证</string>
     <string name="mfa_sms_confirm_remove_body">移除使用 SMS 验证码进行登录的方式。确定要移除吗？</string>
     <string name="mfa_sms_disabled_partner">关闭搭档</string>
@@ -2177,7 +2015,6 @@
     <string name="missing_entitlement_modal_header_unknown_application">无法运行游戏</string>
     <string name="mobile_enable_hardware_scaling">开启硬件缩放</string>
     <string name="mobile_enable_hardware_scaling_desc">这项实验性功能可能提升视讯通话的性能。但请注意，这也可能导致应用卡顿甚至无响应。</string>
-    <string name="moderation">审核</string>
     <string name="more">更多</string>
     <string name="move_from_category_to">从 %1$s 移动到</string>
     <string name="move_members">移动成员</string>
@@ -2208,7 +2045,6 @@
     <string name="network_offline">网络连接受限或不可用。</string>
     <string name="nevermind">呃，没事了～</string>
     <string name="new_dm">创建私信</string>
-    <string name="new_group_dm">创建群组</string>
     <string name="new_guilds_dm_allowed">允许服务器成员直接向您发起私聊。</string>
     <string name="new_mentions">新提及我的</string>
     <string name="new_messages">自 %1$s 以來有 %2$s</string>
@@ -2221,10 +2057,7 @@
     <string name="new_permission">新权限</string>
     <string name="new_terms_ack">我了解并同意这些条例。</string>
     <string name="new_terms_continue">继续使用 Discord</string>
-    <string name="new_terms_description">"要继续使用 Discord，请阅读并同意
-我们更新的《服务与隐私条款》。"</string>
     <string name="new_terms_title">服务与隐私条款更新</string>
-    <string name="new_unreads">新的未读消息</string>
     <string name="next">下一步</string>
     <string name="nickname">昵称</string>
     <string name="nickname_changed">昵称改为 %1$s。</string>
@@ -2239,20 +2072,15 @@
     <string name="no_camera_access">Discord 没有访问您相机的权限</string>
     <string name="no_category">无类别</string>
     <string name="no_channel_description">您的**私信**和**服务器**可以在这里找到。</string>
-    <string name="no_emoji">从上传表情开始吧</string>
     <string name="no_emoji_body">暂无</string>
-    <string name="no_emoji_search_results">搜索不到符合的表情</string>
     <string name="no_emoji_title">无表情符号</string>
     <string name="no_input_devices">无输入设备</string>
     <string name="no_input_devices_detected">没有检测到任何输入设备, 请把设备重新连接后再试一次。</string>
-    <string name="no_instant_invite">无即时邀请</string>
-    <string name="no_integrations">[连接](onConnect)您的 Twitch 或 YouTube Gaming 账号来同步您的订阅账号/赞助商到指定的角色中。</string>
+    <string name="no_instant_invite">无邀请</string>
     <string name="no_integrations_body">协议 FR13NDSH1P 只能由 Discord 客户端执行</string>
     <string name="no_integrations_label">没有发现集成</string>
-    <string name="no_invites_body">"觉得有点迷茫？有如在天空中飘荡的纸飞机？
-创建即时邀请链接来叫一些朋友来吧！"</string>
-    <string name="no_invites_caption">目前还没有即时邀请！</string>
-    <string name="no_invites_label">目前还没有即时邀请链接</string>
+    <string name="no_invites_caption">目前还没有邀请！</string>
+    <string name="no_invites_label">目前还没有邀请</string>
     <string name="no_mail_account_description">请将您的反馈发送到 support@discordapp.com，我们已经将您的用户信息复制到剪贴板。</string>
     <string name="no_mail_account_title">没有邮箱账号</string>
     <string name="no_mic_body">在帮助中心中可以找到允许Discord使用您的麦克风的操作步骤。</string>
@@ -2270,7 +2098,6 @@
     <string name="no_reactions_header">没有反应</string>
     <string name="no_recent_mentions">最开始的时候……大家都很安静。</string>
     <string name="no_send_messages_permission_placeholder">您没有权限在此频道中发送消息。</string>
-    <string name="no_system_channel">没有新成员讯息</string>
     <string name="no_text">否</string>
     <string name="no_thanks">不，谢谢</string>
     <string name="no_user_limit">没有限制</string>
@@ -2282,7 +2109,6 @@
     <string name="note">备注</string>
     <string name="note_placeholder">点击添加备注</string>
     <string name="note_placeholder_mobile">点击添加备注</string>
-    <string name="notice_application_test_mode">**%1$s** 的测试模式已已激活。将会出现未发布的 SKU，不会收取任何相关费用。</string>
     <string name="notice_application_test_mode_go_to_listing">前往 SKU</string>
     <string name="notice_connect_spotify">连接您的 Spotify 帐户来在您的状态中显示您的音乐！</string>
     <string name="notice_connection_conflict">您的语音连接已经被断开，因为您已经在另外一个位置连接.</string>
@@ -2293,7 +2119,6 @@
     <string name="notice_dispatch_error_disk_low">硬盘空间不足。需要 %1$s 空间，但目前仅有 %2$s 可用。</string>
     <string name="notice_dispatch_error_file_name_too_long">文件名过长。需要选择一个短一些的安装目录。</string>
     <string name="notice_dispatch_error_invalid_drive">糟了，您所选择的安装位置无效。您选择了 %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">游戏更新失败。当前游戏在运行中吗？</string>
     <string name="notice_dispatch_error_no_manifests">糟了，该游戏中没有内容。请联系客服人员。</string>
     <string name="notice_dispatch_error_not_entitled">糟了，看起来您不是此游戏的所有者。如有误会，请联系客服人员。</string>
     <string name="notice_dispatch_error_post_install_cancelled">看起来您拒绝了安装脚本。您需要选择同意才能安装游戏。</string>
@@ -2305,12 +2130,8 @@
     <string name="notice_hardware_mute">咦，看起来 **%1$s %2$s** 麦克风的实体静音开关已打开。</string>
     <string name="notice_mfa_sms_backup">我们建议在双重认证设置中添加电话作为备用。</string>
     <string name="notice_mfa_sms_backup_button">添加电话</string>
-    <string name="notice_native_apps">需要全局按键通话功能？获取 Discord 桌面版APP！</string>
     <string name="notice_no_input_detected">嗯，看起来Discord无法检测到您的麦克风，让我们一起解决这个问题吧！</string>
     <string name="notice_no_input_detected_help_link_text">求帮助！</string>
-    <string name="notice_premium_applications_grandfathered_ended">您的 Nitro 访问权限已过期。升级 Nitro Classic 为 Nitro，可以无限制访问精彩游戏。</string>
-    <string name="notice_premium_applications_grandfathered_ending">您的 Nitro 游戏时间仅剩 %1$s 了！您的登录权限有限期至**%2$s**。</string>
-    <string name="notice_premium_applications_grandfathered_started">感谢您成为 Nitro 的早期支持者！作为奖励，您可以在 %1$s 访问 Nitro 游戏。</string>
     <string name="notice_premium_promo_action">查看</string>
     <string name="notice_premium_promo_message">支持 Discord 的发展并从中得到快乐！</string>
     <string name="notice_scheduled_maintenance">Discord将会在**%1$s**至**%2$s**时进行例行维护。</string>
@@ -2345,8 +2166,6 @@
     <string name="nsfw_accept">继续</string>
     <string name="nsfw_decline">否</string>
     <string name="nsfw_description">您必须年满十八岁以上才能观看此频道。您是否年满十八岁并且愿意看到成人内容？</string>
-    <string name="nsfw_note">“上班别偷看”频道的内容仅限18岁及以上的人查看。</string>
-    <string name="nsfw_title">“上班别偷看”频道</string>
     <string name="nuf_body">从此以后，便可以与朋友共同享受美好时光。那么现在先花费一点时间来设置**您的服务器**吧？</string>
     <string name="nuf_body_mobile">登录或注册来开始使用</string>
     <string name="nuf_claim_account_body_1">欢迎来到 Discord！首先注册您的账号，这样可以保存所有的服务器与设置。</string>
@@ -2354,12 +2173,8 @@
     <string name="nuf_claim_account_button">注册帐户</string>
     <string name="nuf_claim_account_generic_error">出大事儿了！～</string>
     <string name="nuf_claim_account_title">注册您的帐户</string>
-    <string name="nuf_create_server_body">"没有邀请码？莫要着急！
-
-给自己和小伙伴们打造一个 Discord 服务器吧！我们提供完全免费的语音和文字聊天服务哟～"</string>
     <string name="nuf_create_server_button">创建服务器</string>
     <string name="nuf_create_server_error">服务器名称无效</string>
-    <string name="nuf_create_server_note">您创建服务器即代表您同意了我们的的 [社区指南](https://discordapp.com/guidelines)。</string>
     <string name="nuf_create_server_title">创建服务器</string>
     <string name="nuf_download_app_body">下载我们的桌面APP，您除了可以更轻松地访问您的服务器，还享有“按键说话”等APP专有功能哦！</string>
     <string name="nuf_download_app_button_platform">下载 %1$s 版</string>
@@ -2380,8 +2195,6 @@
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">启用叠加面板</string>
-    <string name="nux_post_reg_join_server_description">想感受discord的魅力吗？先加入一个服务器吧！</string>
     <string name="nux_post_reg_join_server_skip">我没有呢</string>
     <string name="nux_post_reg_join_server_title">您有邀请链接吗？</string>
     <string name="oauth2_connect_to_discord">连接至 Discord</string>
@@ -2410,31 +2223,19 @@
     <string name="out_of_date_title">您的客户端过期了</string>
     <string name="outgoing_friend_request">送出的好友请求</string>
     <string name="outgoing_friend_request_delete_msg">您确定要删除这条好友请求**%1$s**？</string>
-    <string name="overlay">叠加</string>
     <string name="overlay_channel_chat_hotkey">按 %1$s 键在 %2$s 中聊天</string>
-    <string name="overlay_crashed_title">Discord 叠加界面崩溃了！</string>
-    <string name="overlay_explanation">"开启叠加可能会导致杀毒软件报错。
-另外，游戏内界面不是对所有程序都可用的。如果您遇到困难需要帮助的话请查看
-[这篇非常棒的文章!](%1$s)"</string>
     <string name="overlay_friend_calling">%1$s 正在呼叫您！</string>
     <string name="overlay_in_game_preview_header">游戏内预览</string>
     <string name="overlay_launch_open_tip">按 %1$s 键显示</string>
-    <string name="overlay_launch_title">使用 Discord 游戏内叠加</string>
     <string name="overlay_link_alert_body">您将使用外部浏览器打开此链接。继续吗？</string>
     <string name="overlay_link_alert_secondary">打开，并且下次不再询问我。</string>
     <string name="overlay_link_alert_title">等一下！</string>
     <string name="overlay_menu_get_invite">获取邀请链接</string>
     <string name="overlay_menu_open_discord">打开 Discord</string>
     <string name="overlay_menu_switch_channels">切换频道</string>
-    <string name="overlay_mobile_toggle_desc">看到谁在发言，在连接至语音时也能同时使用其他 APP，访问快捷方式</string>
     <string name="overlay_mobile_toggle_label">启用移动语音叠加面板</string>
-    <string name="overlay_mobile_unauthed">登录 Discord APP，即可启用该功能。</string>
     <string name="overlay_news_go_live_body">想在 %1$s 中向您的好友直播 %2$s 吗？</string>
     <string name="overlay_news_go_live_cta">私人直播</string>
-    <string name="overlay_news_text_pinning_body">现在您可以游戏中固定显示文字聊天了！</string>
-    <string name="overlay_news_text_pinning_tip">提示：您可以在按 $[pinIcon](pinHook) 键来固定聊天</string>
-    <string name="overlay_news_text_pinning_title">Discord 游戏内覆盖界面升级</string>
-    <string name="overlay_no_results">我们已掘地三尺，但还是两手空空，没找到语音频道</string>
     <string name="overlay_notification_incoming_call">来电…</string>
     <string name="overlay_notification_settings_disabled">通知已关闭</string>
     <string name="overlay_notification_settings_position">显示：%1$s</string>
@@ -2444,11 +2245,7 @@
     <string name="overlay_notifications_settings">叠加通知</string>
     <string name="overlay_notifications_top_left">左上方</string>
     <string name="overlay_notifications_top_right">右上方</string>
-    <string name="overlay_private_channels_empty_state">不，没有私信。</string>
-    <string name="overlay_reload">重新载入叠加界面</string>
-    <string name="overlay_settings">叠加设置</string>
     <string name="overlay_settings_general_tab">常规</string>
-    <string name="overlay_settings_title">叠加设置</string>
     <string name="overlay_settings_voice_tab">语音</string>
     <string name="overlay_text_notification_tip">按 %1$s 键打开</string>
     <string name="overlay_text_notification_tip_unlocked">提示：您可以在 $[settings](settingsHook) 中配置通知</string>
@@ -2466,14 +2263,12 @@
     <string name="pagination_page_of">第 %1$s 页，共 %2$s 页</string>
     <string name="pagination_previous">上一页</string>
     <string name="paginator_of_pages">第 %1$s 页，共 %2$s 页</string>
-    <string name="partial_outage">%1$s 由于临时故障</string>
     <string name="partner_badge_tooltip">Discord 合作伙伴</string>
     <string name="party_full">群组已满</string>
     <string name="party_join">加入群组</string>
     <string name="party_joined">群组中</string>
     <string name="party_locked">已被封锁</string>
     <string name="password_manager">密码管理器</string>
-    <string name="password_manager_info_android">使用密码管理器前，您需要在辅助功能设置 -> 已下载的服务中选择允许。不用担心，我们将指导您进行操作。</string>
     <string name="password_manager_open_settings">打开设置</string>
     <string name="password_manager_open_settings_error">无法打开辅助功能设置</string>
     <string name="password_manager_use">使用密码管理器？</string>
@@ -2534,22 +2329,10 @@
     <string name="personalization_disable_modal_title">关闭自定义？</string>
     <string name="phone">电话号码</string>
     <string name="pick_a_color">选取一种颜色</string>
-    <string name="pin">钉上</string>
-    <string name="pin_confirm">噢耶。钉上它</string>
-    <string name="pin_message">标记信息</string>
-    <string name="pin_message_body">嘿, 您要仔细检查这要钉选在 #%1$s 是为了要光前裕后吗?</string>
     <string name="pin_message_body_mobile">您确定要标注这条消息么？</string>
-    <string name="pin_message_body_private_channel">嘿, 您要仔细检查这讯息要钉选到目前的频道是为了要光前裕后吗?</string>
-    <string name="pin_message_title">钉上它。钉好它。</string>
-    <string name="pin_message_too_many_body">Discord 无法钉选这则讯息。您可能已经达到频道 #%1$s 所能钉选 %2$s 则讯息的上限。</string>
-    <string name="pin_message_too_many_body_private_channel">Discord无法把那消息固定化。您也许已在此频道超越了 %1$s 个固定信息。</string>
-    <string name="pin_message_too_many_title">图钉坏了</string>
-    <string name="pinned_messages">已标记的消息</string>
     <string name="pinned_messages_pro_tip">提醒：</string>
     <string name="pinned_messages_pro_tip_body_channel">使用者必须有“管理信息”权限才能从三点菜单中标注信息。</string>
-    <string name="pinned_messages_pro_tip_body_dm">您和 %1$s 可以从三点菜单标注信息。</string>
     <string name="pinned_messages_pro_tip_body_group_dm">任何群组成员都可以从三点菜单标注信息。</string>
-    <string name="pins_disabled_nsfw">此频道为“上班别偷看”内容。由于它的内容，已标注消息不能被任何人查看。</string>
     <string name="pl">波兰语</string>
     <string name="platform_android_version">Android v16以上</string>
     <string name="platform_ios">苹果 iOS 系统</string>
@@ -2561,47 +2344,21 @@
     <string name="popout_stay_on_top">保持置顶</string>
     <string name="post_code">邮政编码</string>
     <string name="premium_alert_error_title">哎呀，哪里出错了…</string>
-    <string name="premium_applications_grandfathered_monthly">作为对您一直支持 Discord 的感谢，您可以在 1 年的时间里访问 Nitro 游戏。您的访问截止日期为 **%1$s**。</string>
-    <string name="premium_applications_grandfathered_yearly">作为对您一直支持 Discord 的感谢，您可以在 2 年的时间里访问 Nitro 游戏。您的访问截止日期为 **%1$s**。</string>
-    <string name="premium_applications_subtitle">无限制访问不断增加的精品游戏库，和好友一道尽享游戏乐趣。</string>
-    <string name="premium_applications_title">每月仅需极低价格，仅可畅玩多款策划精选游戏。</string>
     <string name="premium_badge_tooltip">从 %1$s 起的订阅用户</string>
     <string name="premium_cancel_cancel">否</string>
-    <string name="premium_cancel_confirm_body_tier_1">"取消将会在当前付费周期结束时即 **%1$s** 时生效。如果已经更改，Discord 编号将会被打乱。
-
-您可以随时重新订阅。"</string>
-    <string name="premium_cancel_confirm_body_tier_2">"取消将会在当前付费周期结束时生效。在 **%1$s** 时，将会无法访问所有的 Nitro 游戏。如果已经更改，Discord 编号将会被打乱。
-
-我们会保管好您的文件，以防您改变主意。您可以随时重新订阅！"</string>
     <string name="premium_cancel_confirm_new">是的，取消%1$s</string>
     <string name="premium_cancel_confirm_title">确认取消%1$s？</string>
     <string name="premium_cancel_failed_body">我们不能够取消您的 Nitro 会员订阅，请重试。如果问题没有解决，请联系我们的客服团队。</string>
     <string name="premium_canceled">您的会员订阅将于 %1$s 到期。</string>
     <string name="premium_cant_upgrade_confirm">收到</string>
-    <string name="premium_change_discriminator_length_error">此编号无效。编号必须包含四位数字。</string>
-    <string name="premium_change_discriminator_modal_body">当 Nitro 订阅结束时，Discord 编号将会被打乱。确定要更改 Discord 编号吗？</string>
-    <string name="premium_change_discriminator_modal_confirm">更 Discord 编号</string>
-    <string name="premium_change_discriminator_modal_header">更改您的 Discord 编号</string>
-    <string name="premium_change_discriminator_tooltip">想要自定义编号？用 Nitro！</string>
-    <string name="premium_change_discriminator_zero_error">此编号无效。编号必须大于零。</string>
-    <string name="premium_chat_perks_description_animated_avatar_and_emoji">上传 GIFs 动图以获取动画头像和表情。</string>
-    <string name="premium_chat_perks_description_badge">此勋章可证明您对 Discord 的长久支持。</string>
-    <string name="premium_chat_perks_description_custom_emoji">随时随地尽情使用您的自定义表情。</string>
-    <string name="premium_chat_perks_description_discriminator">订阅 Nitro 后可选择您的编号。</string>
     <string name="premium_chat_perks_description_screenshare">游戏分享屏幕为 720p 60fps 或 1080p 30fps。</string>
-    <string name="premium_chat_perks_description_upload_limit">%1$s可上传大尺寸文件，（标准尺寸为%2$s）使您可以进行高清的 meme 分享。</string>
+    <string name="premium_chat_perks_streaming_mobile">更好的 Go Live 直播: 使用 Nitro 进行源直播，或用 Nitro Classic 进行最高 1080p 60fps 的超悦目直播</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">动画乐趣</string>
     <string name="premium_chat_perks_title_badge">展现您的支持</string>
-    <string name="premium_chat_perks_title_custom_emoji">全局自定义表情</string>
-    <string name="premium_chat_perks_title_discriminator">自定义 Discord 编号</string>
     <string name="premium_chat_perks_title_screenshare">更高画质视讯</string>
-    <string name="premium_code_redemption_confirmation_blurb">感谢这组神奇的随机数字，接下来的 %1$s您获得了升级的聊天功能！</string>
+    <string name="premium_chat_perks_title_streaming">更好的 Go Live 直播</string>
     <string name="premium_code_redemption_confirmation_button">哦，太好了！</string>
-    <string name="premium_feature_new_chat_perks_header">您同时将获得部分增强聊天包：</string>
-    <string name="premium_feature_new_premium_applications_header">价值超过 %1$s 的游戏。快来瞧一瞧：</string>
-    <string name="premium_feature_view_applications">查看全部 Nitro 游戏</string>
     <string name="premium_features_chat_perks">聊天包</string>
-    <string name="premium_features_premium_applications">免费游戏</string>
     <string name="premium_grandfathered_warning">作为对您一直支持我们的感谢，送您一个 Nitro 折扣方案。**取消或变更方案，您将失去这个折扣。**注意了哈！！！</string>
     <string name="premium_grandfathered_warning_confirm">不管了，就这样</string>
     <string name="premium_grandfathered_warning_title">注意了我的朋友</string>
@@ -2611,10 +2368,7 @@
     <string name="premium_not_claimed">请先认证您的账号</string>
     <string name="premium_not_claimed_body">嗨，伙计！若您有意购买 Nitro，您首先需要确认您的账号以免您无法收到您购买的商品或服务。</string>
     <string name="premium_not_verified">首先验证您的电子邮件</string>
-    <string name="premium_not_verified_body">嗨，伙计！若您有意购买 Nitro，首先需要验证您的电子邮箱。检查邮箱或重新申请一个。</string>
-    <string name="premium_payment_applications_os_warning">Nitro 游戏仅支持 Windows 平台。</string>
     <string name="premium_payment_confirmation_blurb_regular">现在您已获得增强聊天包。别看了，去玩儿吧！</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">现在可以无限制访问海量精彩游戏。别看了，去玩儿吧！</string>
     <string name="premium_payment_confirmation_button_regular">好滴</string>
     <string name="premium_plan_month">Nitro 包月</string>
     <string name="premium_plan_month_tier_1">Nitro Classic 包月</string>
@@ -2622,10 +2376,6 @@
     <string name="premium_plan_year">Nitro 包年</string>
     <string name="premium_plan_year_tier_1">Nitro Classic 包年</string>
     <string name="premium_plan_year_tier_2">Nitro 包年</string>
-    <string name="premium_promo_autocomplete">可以在任何地方使用 emoji 表情</string>
-    <string name="premium_promo_description">与 Discord Nitro 一起起飞，可以在任何服务器上使用动态表情或自定义表情。</string>
-    <string name="premium_promo_title">想试试看升级后的表情的魔力？</string>
-    <string name="premium_subtitle">支持并帮助改善Dicord，您会获得一些奖励</string>
     <string name="premium_upgrade_cancel">否</string>
     <string name="premium_upgrade_confirm_body_detailed_month_year">"升级至年费将同时获得两个月的免费使用。超值优惠不容错误！
 
@@ -2635,13 +2385,10 @@
     <string name="premium_upgrade_disabled_current_tooltip">您的当前方案。</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">您需要等到当前订阅过期，才能选择更低档的方案。</string>
     <string name="premium_upgrade_done_body_tier_1">您已获得增强聊天包！</string>
-    <string name="premium_upgrade_done_body_tier_2">您已获得增强聊天包可以访问几十种游戏。</string>
     <string name="premium_upgrade_done_button_tier_1">太棒了！</string>
-    <string name="premium_upgrade_done_button_tier_2">试一试所有的 Nitro 游戏</string>
     <string name="premium_upgrade_failed_body">呃… 升级失败了。请确认您的支付信息是最新的，然后再尝试一次。</string>
     <string name="premium_upload_promo">升级到 Discord Nitro 可上传最大 %1$s 的文件。</string>
     <string name="premium_year_free_months">两个月免费！</string>
-    <string name="premium_year_free_months_short">2 个月免费</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** /年</string>
     <string name="preview_chat">聊天预览</string>
     <string name="priority_speaker">优先扬声器</string>
@@ -2651,7 +2398,6 @@
 其他没有该权限的用户的音量会自动降低。使用 
 **%1$s** 热键可以激活优先扬声器。"</string>
     <string name="privacy_and_safety">隐私与安全</string>
-    <string name="privacy_policy">[隐私策略](%1$s)</string>
     <string name="privacy_settings">隐私设置</string>
     <string name="private_category">私密类别</string>
     <string name="private_category_note">设置私密类别可以让所有该类别下加密频道继承权限</string>
@@ -2661,10 +2407,7 @@
     <string name="prune">精简</string>
     <string name="prune_members">精简成员</string>
     <string name="pt_br">葡萄牙语（巴西）</string>
-    <string name="ptt_limited_body">"按键说话（有限制的）只会在该浏览器标签使用时才会生效。下载桌面客户端来
-享受完整的按键说话功能。"</string>
     <string name="ptt_limited_title">嘿，提醒一下</string>
-    <string name="ptt_limited_warning">按键说话(有限制的) 只会在该浏览器标签使用时才会生效。 [Download](点击下载) 来获取桌面客户端享受按键说话的完整功能。</string>
     <string name="ptt_permission_body">"您以管理员身份启动了 %1$s 。请以管理员身份重启Discord，以便在游戏窗口得到焦点时开启按键说话
 检测。"</string>
     <string name="ptt_permission_title">需要权限执行按键说话</string>
@@ -2673,11 +2416,9 @@
     <string name="quick_launcher_empty_text">Discord可在此计算机上快速开启大部分您近期游玩的游戏。开启游戏后，该游戏将显示于此处！</string>
     <string name="quick_launcher_header">快速开启程序</string>
     <string name="quickswitcher_drafts">草稿</string>
-    <string name="quickswitcher_empty_cta">了解关于快速切换器的更多资讯</string>
     <string name="quickswitcher_empty_text">似乎找不到您要寻找的东西？</string>
     <string name="quickswitcher_last_channel">最后一个频道</string>
     <string name="quickswitcher_mentions">提及</string>
-    <string name="quickswitcher_notice">使用快速切换器访问Discord的不同功能。只需按︰</string>
     <string name="quickswitcher_placeholder">想要去哪里？</string>
     <string name="quickswitcher_querymode_applications">正在搜索游戏</string>
     <string name="quickswitcher_querymode_guilds">正在搜索服务器</string>
@@ -2717,7 +2458,6 @@
     <string name="recent_mentions_filter_label">显示：</string>
     <string name="recent_mentions_filter_roles">包括 @role 角色的提及</string>
     <string name="recent_mentions_pro_tip">任何提及您的信息将会在此保存 7 天。</string>
-    <string name="recent_mentions_roles_and_direct">直接留言 &amp; @角色</string>
     <string name="reconnect">重新连接</string>
     <string name="refund">退款</string>
     <string name="region">地区</string>
@@ -2751,9 +2491,7 @@
     <string name="reported">已举报</string>
     <string name="resend">重新发送</string>
     <string name="resend_code">重新发送验证码</string>
-    <string name="resend_email">重新发送验证邮件！</string>
     <string name="resend_message">重新发送信息</string>
-    <string name="resend_verification_email">重新发送验证邮件</string>
     <string name="reset">重置</string>
     <string name="reset_nickname">重置昵称</string>
     <string name="reset_notification_override">重置通知设定覆盖</string>
@@ -2774,29 +2512,7 @@
     <string name="role_order_updated">已更新角色顺序。</string>
     <string name="roles">角色</string>
     <string name="roles_list">%1$s</string>
-    <string name="rtc_connection">实时通信连接</string>
     <string name="rtc_connection_info">连接信息</string>
-    <string name="rtc_connection_state_authenticating">Discord已连接到您的实时通信服务器并且正在保护连接安全。</string>
-    <string name="rtc_connection_state_awaiting_endpoint">"Discord正在为您建立一个实时通信服务器。如果您卡在这里了，可能是遇到了
-区域机房停电等问题，我的天！查看我们的[服务状态页面](%1$s) ，了解更多信息或考虑询问您的服务器所有者
-临时切换地区。"</string>
-    <string name="rtc_connection_state_connecting">Discord 已经成功为您分配一个语音服务器并在尝试连接。请做好准备。</string>
-    <string name="rtc_connection_state_disconnected">"嗨呀，好气啊！Discord 与您的实时通信服务器的连接中断了。我们会立即尝试
-重新建立连接。"</string>
-    <string name="rtc_connection_state_ice_checking">"防护系统开启！ Discord已与您的语音服务器建立安全连接，并正在尝试发送数据。
-如果您的浏览器连接卡在这里，请查看[这篇文章](%1$s) 来帮助您解决问题。"</string>
-    <string name="rtc_connection_state_no_route">"Discord无法与您的语音服务器建立UDP连接，我们将会在稍后重试。
-假如Discord一直卡在本页面，建议查看[这篇文章](%1$s) 来帮您解决问题。"</string>
-    <string name="rtc_connection_state_rtc_connected">"Discord 已连接至您在 **%1$s** 上的实时通信服务器，平均 ping 率为 **%2$s ms**。最后一次
-ping 为**%3$s ms**。
-
-如果 ping 不连续或超过 %4$s ms，则可考虑让服务器所有者切换至其他区域。"</string>
-    <string name="rtc_connection_state_rtc_connected_loss_rate">"Discord 已连接至您在 **%1$s** 上的实时通信服务器，平均 ping 率为 **%2$s ms**。最后一次
-ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
-
-。如果 ping 不连续或超过 %5$s ms，则可考虑让服务器所有者切换至其他区域。如果出站丢包率超过 %6$s%%，您的声音会听起来像个机器人。"</string>
-    <string name="rtc_connection_state_rtc_connecting">"准备好了！ Discord已经成功与您的实时通信服务器连接并
-尝试发送数据。"</string>
     <string name="rtc_debug_context">即时通讯服务器调试：%1$s</string>
     <string name="rtc_debug_rtp_inbound">下载</string>
     <string name="rtc_debug_rtp_outbound">上传</string>
@@ -2818,14 +2534,10 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="scope_bot_server_placeholder">选择服务器</string>
     <string name="scope_connections">访问您的第三方连接</string>
     <string name="scope_connections_empty">您还没有任何的第三方连接</string>
-    <string name="scope_email">访问您的电子邮箱地址</string>
-    <string name="scope_email_empty">您还没有设置电子邮箱！</string>
-    <string name="scope_gdm_join">为您加入组内信息</string>
-    <string name="scope_gdm_join_description">这将允许该APP加入由您的名义创建的群组</string>
     <string name="scope_guilds">查看您所在的服务器位置</string>
     <string name="scope_guilds_empty">您不在任何服务器中。</string>
     <string name="scope_guilds_join">为您加入服务器</string>
-    <string name="scope_guilds_join_description">以您的名义使用即时邀请。</string>
+    <string name="scope_guilds_join_description">以您的名义使用邀请。</string>
     <string name="scope_identify">访问您的用户名和头像</string>
     <string name="scope_messages_read">阅读所有消息</string>
     <string name="scope_messages_read_description">允许Discord读取此APP中所有可访问的信息</string>
@@ -2838,8 +2550,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="scope_webhook_incoming">添加 Webhook 到频道</string>
     <string name="scope_webhook_incoming_channel_placeholder">选择一个频道</string>
     <string name="scope_webhook_incoming_description">这将允许APP发送讯息到 Discord 频道上</string>
-    <string name="screen_share_on">打开屏幕共享</string>
-    <string name="screen_share_options">更多屏幕共享选项</string>
     <string name="screenshare_change_windows">更换窗口</string>
     <string name="screenshare_description">"Discord想要共享您的屏幕的内容到 %1$s 。
 
@@ -2892,9 +2602,7 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="search_filter_link_from">链接来自</string>
     <string name="search_filter_mentions">提及</string>
     <string name="search_filter_on">关于</string>
-    <string name="search_for_emoji">探索最适用的表情</string>
     <string name="search_for_empty">搜索</string>
-    <string name="search_for_value">搜索：**%1$s**</string>
     <string name="search_group_header_channels">在频道内</string>
     <string name="search_group_header_dates">日期</string>
     <string name="search_group_header_file_name">文件名包括</string>
@@ -2930,8 +2638,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="security">安全中心</string>
     <string name="select">选择</string>
     <string name="select_channel_or_category">选择一个频道或类别…</string>
-    <string name="select_sort_mode">选择排序方式</string>
-    <string name="self_deafened">个人拒听</string>
     <string name="self_deny_permission_body">"您不能拒绝 **%1$s** 的此权限，因为这样您自己的权限也将被拒绝。请先允许您自己或其他角色
 ，然后重试。"</string>
     <string name="self_deny_permission_title">您大概不会想进行此操作</string>
@@ -2949,9 +2655,7 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="send_tts_messages">发送文字转语音消息</string>
     <string name="send_tts_messages_description">"拥有此权限的成员可以通过/tts来发送文字转语音消息。这些信息
 会被正在频道上的所有其他成员听见。"</string>
-    <string name="server_deafen">服务器端拒听</string>
     <string name="server_deafened">服务器已静音</string>
-    <string name="server_emoji">服务器表情</string>
     <string name="server_mute">服务器静音</string>
     <string name="server_mute_dms">静音私信</string>
     <string name="server_muted">服务器已静音</string>
@@ -2964,14 +2668,12 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="server_settings_updated">已更新服务器设置。</string>
     <string name="server_sort">排序 %1$s</string>
     <string name="server_status">服务器状态</string>
-    <string name="server_undeafen">服务器端解除拒听</string>
     <string name="server_unmute">取消服务器静音</string>
     <string name="server_voice_mute">服务器静音</string>
     <string name="server_voice_unmute">取消服务器静音</string>
     <string name="servers">服务器</string>
     <string name="servers_management_title">排序和管理服务器</string>
     <string name="service_connections_disconnect">断开连接</string>
-    <string name="set_debug_logging">更改调试登录</string>
     <string name="set_debug_logging_body">"更改调试登录将会退出并重启 Discord。
 您确定要这样做？"</string>
     <string name="set_invite_link_never_expire">设置此链接为永不过期</string>
@@ -2983,7 +2685,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="settings_games_add_game">添加一个！</string>
     <string name="settings_games_add_new_game">添加游戏</string>
     <string name="settings_games_added_games_label">已添加的游戏</string>
-    <string name="settings_games_enable_overlay_label">开启叠加</string>
     <string name="settings_games_game_to_add">选择要添加的游戏</string>
     <string name="settings_games_hidden_library_applications_label">隐藏游戏</string>
     <string name="settings_games_import_explanation">无论您从哪里获得的游戏，Discord 都可以展示并运行您拥有的大多数游戏。</string>
@@ -2995,13 +2696,7 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="settings_games_not_seeing_game">没有看到您的游戏?</string>
     <string name="settings_games_now_playing_label">正在玩</string>
     <string name="settings_games_now_playing_state">正在游戏中！</string>
-    <string name="settings_games_overlay">叠加</string>
-    <string name="settings_games_overlay_off">叠加︰ 关</string>
-    <string name="settings_games_overlay_on">叠加︰ 开</string>
-    <string name="settings_games_overlay_warning">游戏内界面与此游戏存在已知叠加问题。</string>
     <string name="settings_games_remove_icon">移除</string>
-    <string name="settings_games_restore_to_library">恢复到库</string>
-    <string name="settings_games_toggle_overlay">切换叠加模式</string>
     <string name="settings_games_verified_icon">已验证</string>
     <string name="settings_invite_tip">这里是所有可用的邀请链接，您可以撤销任意一个或者 [创建一个](onCreateInvite)。</string>
     <string name="settings_invite_tip_without_create">这里是所有可用的邀请链接，您可以撤销任意一个。</string>
@@ -3014,7 +2709,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="settings_roles_helpdesk_link">需要有关角色的帮助？[获取帮助](%1$s)</string>
     <string name="settings_sync">在不同客户端间同步。</string>
     <string name="settings_webhooks_empty_body">创建一个webhook来开始魔法</string>
-    <string name="settings_webhooks_empty_title">无 ｗebhook</string>
     <string name="setup">设置</string>
     <string name="setup_vanity_url">设置个性化网址</string>
     <string name="several_users_typing">多人正在输入…</string>
@@ -3099,8 +2793,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="stop_ringing">关闭铃声提示</string>
     <string name="stop_streaming">停止直播</string>
     <string name="stop_watching">停止观看</string>
-    <string name="store_payment_legalese_monthly">嗨！购买 %1$s 即表示您同意我们的[商店服务条款](%2$s)。%1$s 采用循环订阅机制，即今天收费后每月都将收费，除非您取消订阅。在“用户设置”窗口，您可以随时取消。</string>
-    <string name="store_payment_legalese_yearly">嗨！购买 %1$s 即表示您同意我们的[商店服务条款](%2$s)。%1$s 采用循环订阅机制，即今天收费后每年都将收费，除非您取消订阅。在“用户设置”窗口，您可以随时取消。</string>
     <string name="stream">私人直播</string>
     <string name="stream_bad_spectator">您当前所观看直播的视频或音频质量有所下降。这有可能是网络问题导致的。</string>
     <string name="stream_bad_streamer">您当前直播的视频或音频质量有所下降。这有可能是网络问题导致的。</string>
@@ -3108,7 +2800,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="stream_capture_paused_details">切换至您的游戏以继续。</string>
     <string name="stream_capture_paused_details_viewer">%1$s已最小化游戏……请稍候片刻！</string>
     <string name="stream_channel_description">拥有此权限的成员可向频道直播。</string>
-    <string name="stream_description">拥有此权限的成员可在此频道中。</string>
     <string name="stream_ended">该直播已结束。*蛐蛐声*</string>
     <string name="stream_ended_button">直播已结束</string>
     <string name="stream_ended_no_spectators">直播已结束，当前无观战者。</string>
@@ -3148,7 +2839,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="stream_report_rating_body_streamer">和我们分享您的直播体验。</string>
     <string name="stream_report_submit">提交</string>
     <string name="stream_reported">用户反馈已提交</string>
-    <string name="stream_reported_body">感谢您报告所遇到的问题！您的用户反馈将帮助我们改善直播质量。</string>
     <string name="stream_soundshare_failed">抱歉，出了点问题，我们无法直播您游戏的音频。</string>
     <string name="streamer_mode">主播模式</string>
     <string name="streamer_mode_enabled">已开启主播模式</string>
@@ -3206,7 +2896,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="system_message_guild_member_join_10">一只野生的 %1$s 出现了。</string>
     <string name="system_message_guild_member_join_11">嗖～。%1$s 刚刚降落。</string>
     <string name="system_message_guild_member_join_12">振作起来。%1$s 刚刚加入了服务器。</string>
-    <string name="system_message_guild_member_join_13">%1$s 刚刚加入。藏起您的香蕉。</string>
     <string name="system_message_guild_member_join_14">%1$s 刚到。似乎太强了请削弱一下。</string>
     <string name="system_message_guild_member_join_15">%1$s 刚刚滑入服务器中。</string>
     <string name="system_message_guild_member_join_16">诶， %1$s 在服务器里出生了。</string>
@@ -3218,7 +2907,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="system_message_guild_member_join_22">它是鸟？！亦或是飞机？！别在意，它只是 %1$s。</string>
     <string name="system_message_guild_member_join_23">是%1$s！ 赞美太阳 \\\\[T]/</string>
     <string name="system_message_guild_member_join_24">永远不会放弃 %1$s 了。永远不会辜负 %1$s 。</string>
-    <string name="system_message_guild_member_join_25">哈 ！%1$s 已加入 ！您激活了我的陷阱卡 ！</string>
     <string name="system_message_guild_member_join_26">快过来嗨！ %1$s 来啦!</string>
     <string name="system_message_guild_member_join_27">各位听好了！%1$s 加入我们啦！</string>
     <string name="system_message_guild_member_join_28">我们一直在等您 %1$s</string>
@@ -3236,7 +2924,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="system_message_pinned_message">%1$s 在此频道置顶了一条消息 [查看所有标注。](pinsActionOnClick)</string>
     <string name="system_message_pinned_message_mobile">%1$s 在此频道标注了一条消息</string>
     <string name="system_message_pinned_message_no_cta">%1$s 在此频道标注了一条消息</string>
-    <string name="system_message_pinned_message_no_cta_formatted">%1$s 将一条信息固定显示在该频道。</string>
     <string name="system_message_recipient_add">%1$s 邀请 %2$s 加入群组。</string>
     <string name="system_message_recipient_remove">%1$s 将 %2$s 踢除出了群组。</string>
     <string name="system_message_recipient_remove_self">%1$s 离开了群组。</string>
@@ -3269,8 +2956,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="timeout_error">操作超时，请重试</string>
     <string name="tip_instant_invite_title3">邀请您的好友</string>
     <string name="title">标题</string>
-    <string name="too_many_animated_emoji">您的动态表情栏已满。</string>
-    <string name="too_many_emoji">您的表情栏已满。</string>
     <string name="too_many_reactions_alert_body">您的反应因此讯息反应过多而没有被添加。</string>
     <string name="too_many_reactions_alert_header">警告</string>
     <string name="total_results">%1$s</string>
@@ -3288,7 +2973,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="two_fa">双重认证</string>
     <string name="two_fa_activate">激活</string>
     <string name="two_fa_auth_code">6位数字身份验证码</string>
-    <string name="two_fa_backup_code_enter">输入8个字符的备份安全码。</string>
     <string name="two_fa_backup_code_enter_wrong">备用安全码长度必须为8个字符且只能包含字母和数字。</string>
     <string name="two_fa_backup_code_hint">8字符的备用安全码</string>
     <string name="two_fa_backup_code_used">已使用过</string>
@@ -3299,7 +2983,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="two_fa_change_account">更改账号信息</string>
     <string name="two_fa_disable">关闭双重认证</string>
     <string name="two_fa_discord_backup_codes">这些是您的Discord账号 %1$s 的备用码。请妥善保管！</string>
-    <string name="two_fa_download_app_body">为您的手机或平板电脑下载并安装 [Authy](%1$s) 或 [Google Authenticator](%2$s) 。</string>
     <string name="two_fa_download_app_label">下载双重认证APP</string>
     <string name="two_fa_download_codes">下载备用安全码</string>
     <string name="two_fa_enable">开启双重认证</string>
@@ -3320,7 +3003,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="two_fa_login_footer">返回登入</string>
     <string name="two_fa_login_label">用安全码登录</string>
     <string name="two_fa_not_verified">在您开启双重认证之前，您必须先验证您的帐号。</string>
-    <string name="two_fa_qr_body">请打开验证APP并用手机摄像头扫描左侧的图片。</string>
     <string name="two_fa_qr_label">扫描二维码</string>
     <string name="two_fa_remove">关闭双重认证</string>
     <string name="two_fa_sales_pitch">"使用额外的安全手段保护您的 Discord 帐户。一旦配置完毕，每次登陆时您都需要
@@ -3342,9 +3024,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="unblock_to_jump_body">"先取消对 '%1$s' 的屏蔽，您才能跳转到他们的信息。"</string>
     <string name="unblock_to_jump_title">所以… 这个人被您加入黑名单了</string>
     <string name="uncategorized">未分类</string>
-    <string name="unclaimed_account_body">"请输入**email** 和**password**认证账号以防止账号丢失。
-
-认证账号需要**下载APP**。"</string>
     <string name="unclaimed_account_title">未认证账号</string>
     <string name="undeafen">取消耳机静音</string>
     <string name="unfocus_participant">解除关注此人</string>
@@ -3357,24 +3036,12 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="unmute">取消麦克风静音</string>
     <string name="unmute_category">取消静音类别</string>
     <string name="unnamed">未命名</string>
-    <string name="unpin">拔掉</string>
     <string name="unpin_confirm">是的，请删除它吧~</string>
-    <string name="unpin_message">取消标记消息</string>
-    <string name="unpin_message_body">看闷了吧。您确实要删除此固定消息吗？</string>
-    <string name="unpin_message_context_menu_hint">您可以按住Shift键再点击 **删除消息** 以跳过确认提示。</string>
-    <string name="unpin_message_failed_body">Discord无法将固定信息删掉，抱歉。</string>
-    <string name="unpin_message_failed_title">图钉被卡住了！</string>
-    <string name="unpin_message_title">取消标记消息</string>
     <string name="unread_channels">未读的频道</string>
     <string name="unsupported_browser">浏览器不被支持</string>
     <string name="unsupported_browser_body">"您好像在使用一款不被支持的浏览器。请升级您的
 浏览器或者下载我们的 APP 来体验 Discord 吧。"</string>
-    <string name="unsupported_browser_details">"想要跟团队的小伙伴们聊天吗？马上切换到最新的Chrome、Opera或Firefox 38+浏览器，或者下载
-Discord客户端和他们一起畅所欲言吧！"</string>
     <string name="unsupported_browser_title">诶～这太尴尬了</string>
-    <string name="unverified_account_body">"请查看您的邮件并按照说明验证邮件地址。
-
-如果未收到邮件，或者邮件过期，请[点击这里](onResendClick) 重新发送。"</string>
     <string name="unverified_account_title">未经验证的帐户</string>
     <string name="update_available">下载更新中</string>
     <string name="update_downloaded">更新就绪！</string>
@@ -3402,7 +3069,6 @@ Discord客户端和他们一起畅所欲言吧！"</string>
     <string name="upload_open_file_failed">无法打开文件︰%1$s。</string>
     <string name="upload_process_file_failed">无法预处理文件。</string>
     <string name="uploaded_by">上传者</string>
-    <string name="usage_access">使用访问权限</string>
     <string name="usage_statistics_disable_modal_body">关闭此功能后，您将无法继续体验一些实验性的功能。语音聊天等功能也会停止根据您的数据作出改善。您过往的数据将会被匿名处理，这也会导致Discord的智能化水平降低。</string>
     <string name="usage_statistics_disable_modal_cancel">不，保持原样！</string>
     <string name="usage_statistics_disable_modal_confirm">是的，我确定</string>
@@ -3431,11 +3097,9 @@ Discord客户端和他们一起畅所欲言吧！"</string>
     <string name="user_activity_error_friends_action">发送好友请求</string>
     <string name="user_activity_error_friends_body">必须先成为好友才能使用！ 向 %1$s 发送好友请求。 当他们确认，再一次点击按钮！</string>
     <string name="user_activity_error_friends_title">好友来啦！</string>
-    <string name="user_activity_header_listening">正在听 %1$s</string>
     <string name="user_activity_header_live_on_platform">在 %1$s 直播</string>
     <string name="user_activity_header_playing">正在玩游戏</string>
     <string name="user_activity_header_streaming_to_server">正向 %1$s 直播</string>
-    <string name="user_activity_header_watching">正在观看 %1$s</string>
     <string name="user_activity_invite_request_expired">**%1$s** 没有接受您的请求。也许下次吧 ！</string>
     <string name="user_activity_invite_request_received">**%1$s** 想要您加入他们的游戏 ！</string>
     <string name="user_activity_invite_request_requested">**%1$s** 想要加入您的 **%2$s** 中。</string>
@@ -3488,8 +3152,6 @@ Discord客户端和他们一起畅所欲言吧！"</string>
     <string name="user_settings_appearance_preview_message_4">紧凑模式将开启</string>
     <string name="user_settings_appearance_preview_message_5">哦它在这儿 ！</string>
     <string name="user_settings_appearance_zoom_tip">您可以使用%1$s + /-来更改缩放大小，并用%1$s + 0重置默认缩放大小。</string>
-    <string name="user_settings_apperannce_disable_games_tab">显示游戏选项卡</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">关闭此功能可隐藏游戏选项卡，这样您可以集中精力在对话上。</string>
     <string name="user_settings_close_button">关闭按钮</string>
     <string name="user_settings_confirm_logout">您确定您要退出登录吗？</string>
     <string name="user_settings_game_activity">游戏动态</string>
@@ -3523,9 +3185,6 @@ Discord客户端和他们一起畅所欲言吧！"</string>
     <string name="user_settings_start_minimized_body">Discord 在后台像一个乖孩子般地开启并时刻给您让路</string>
     <string name="user_settings_start_minimized_label">开始最小化</string>
     <string name="user_settings_startup_behavior">系统开启行为</string>
-    <string name="user_settings_streamer_notice_body">"使用您常用的推流工具来提升您的Discord社区服务器的吸引力。
-
-查看 [Discord 串流工具](%1$s)。"</string>
     <string name="user_settings_streamer_notice_title">寻找整合方案吗？</string>
     <string name="user_settings_unverified_account_body">请检查您的电子邮件并按照说明进行操作来验证您的账号。 如果您没有收到邮件，或它已经过期，您可以重新发送一次。</string>
     <string name="user_settings_voice_add_multiple">您可以到 [热键设置](onClick) 加入多个热键发言设置。</string>
@@ -3537,8 +3196,6 @@ Discord客户端和他们一起畅所欲言吧！"</string>
     <string name="username_live">%1$s - 直播</string>
     <string name="username_required">需要用户名。</string>
     <string name="users">用户</string>
-    <string name="vad_permission_body">"此频道语音聊天要求使用按键说话。您只有把模式从
-按键说话切换到语音活动检测才能收听。"</string>
     <string name="vad_permission_small">您必须开启按键说话才能在此频道发言。</string>
     <string name="vad_permission_title">需要按键说话</string>
     <string name="vanity_url">个性化网址</string>
@@ -3546,21 +3203,14 @@ Discord客户端和他们一起畅所欲言吧！"</string>
 请注意这会使您的服务器对所有使用此网址的用户可见。"</string>
     <string name="vanity_url_help_conflict">请注意，如果个性化网址被发现有不正当使用或知识产权纠纷，我们可能会将其收回。</string>
     <string name="vanity_url_hint_mobile">您的网址</string>
-    <string name="verfication_expired">邮件验证链接已过期。</string>
     <string name="verfication_expired_suggestion">请登录 Discord 并重新发送链接</string>
-    <string name="verification_body">"我们检测到一些非常规的操作。
-如果想继续使用Discord的话，**我们需要验证您是人类。**"</string>
     <string name="verification_body_alt">现在，要来确认一下您是人类…</string>
     <string name="verification_email_body">我们已经将一封新的验证电子邮件发送到 **%1$s**，请检查您的收件箱和垃圾邮件文件夹。</string>
-    <string name="verification_email_error_body">发送验证邮件时发生错误。请重新尝试或者联系客服。</string>
-    <string name="verification_email_error_title">验证邮件发送错误</string>
-    <string name="verification_email_title">邮件验证</string>
     <string name="verification_footer">觉得这条信息发错了？</string>
     <string name="verification_footer_logout">[退出登录](logoutOnClick)</string>
     <string name="verification_footer_support">[支持](%1$s)</string>
     <string name="verification_level_high_criteria">此外成为此服务器成员的时间需要超过 %1$s 分钟。</string>
     <string name="verification_level_low">低</string>
-    <string name="verification_level_low_criteria">他们的Discord账号上必须绑定一个已验证的电子邮箱。</string>
     <string name="verification_level_medium">中</string>
     <string name="verification_level_medium_criteria">此外注册Discord的时间必须超过 %1$s 分钟。</string>
     <string name="verification_level_none">无限制</string>
@@ -3570,14 +3220,9 @@ Discord客户端和他们一起畅所欲言吧！"</string>
     <string name="verification_phone_description">输入我们发送给您的六位验证码</string>
     <string name="verification_phone_title">验证您的手机号码</string>
     <string name="verification_title">发生了一些事情</string>
-    <string name="verification_verified">电子邮箱已验证通过！</string>
-    <string name="verification_verifying">电子邮箱验证中</string>
     <string name="verify">验证</string>
     <string name="verify_account">验证账号</string>
     <string name="verify_by">验证</string>
-    <string name="verify_by_email">使用电子邮箱验证</string>
-    <string name="verify_by_email_formatted">"使用
-**电子邮箱**验证"</string>
     <string name="verify_by_phone">使用手机验证</string>
     <string name="verify_by_phone_formatted">"使用
 **手机** 验证"</string>
@@ -3590,12 +3235,9 @@ Discord客户端和他们一起畅所欲言吧！"</string>
     <string name="video">视讯</string>
     <string name="video_call">视讯通话</string>
     <string name="video_connect">视讯</string>
-    <string name="video_poor_connection_body">视讯功能已关闭。当连接状况改善时将会重新启用。</string>
-    <string name="video_poor_connection_title">网络状况不佳</string>
     <string name="video_preview">视讯预览</string>
     <string name="video_settings">视讯设置</string>
     <string name="video_unavailable">视讯不可用</string>
-    <string name="video_unsupported_browser_body">此浏览器不支持屏幕共享。请下载我们的桌面客户端来分享您的摄像头与屏幕。</string>
     <string name="video_unsupported_browser_title">浏览器不被支持</string>
     <string name="view_audit_log">查看审计日志</string>
     <string name="view_audit_log_description">拥有此权限的成员可以访问并查看服务器的审核日志</string>
@@ -3606,7 +3248,6 @@ Discord客户端和他们一起畅所欲言吧！"</string>
     <string name="voice_and_video">语音和视讯</string>
     <string name="voice_call">语音通话</string>
     <string name="voice_channel">语音频道</string>
-    <string name="voice_channel_empty">是不是觉得有点孤单？来创建邀请链接，添加几个朋友吧。</string>
     <string name="voice_channel_hide_names">隐藏名称</string>
     <string name="voice_channel_locked">此频道已被封锁</string>
     <string name="voice_channel_show_names">显示昵称</string>
@@ -3677,8 +3318,6 @@ Discord客户端和他们一起畅所欲言吧！"</string>
     <string name="xbox_pin_step2">前往设置 > 连接 > 添加</string>
     <string name="xbox_pin_step3">点击打开 Xbox 并输入以上 PIN 码</string>
     <string name="yes_text">是</string>
-    <string name="your_discord_tag">您的Discord编号</string>
-    <string name="your_pin_expires">您的pin码将在 %1$s 內過期</string>
     <string name="your_pin_is_expired">您的 pin 码已过期</string>
     <string name="youre_viewing_older_messages">您正在查看以前的信息</string>
     <string name="zh_cn">简体中文（中国）</string>
diff --git a/com.discord/res/values-zh-rTW/plurals.xml b/com.discord/res/values-zh-rTW/plurals.xml
index 63d0889c01..23cd674790 100644
--- a/com.discord/res/values-zh-rTW/plurals.xml
+++ b/com.discord/res/values-zh-rTW/plurals.xml
@@ -87,15 +87,6 @@
         <item quantity="zero">沒有格數</item>
         <item quantity="one">%d 格</item>
     </plurals>
-    <plurals name="form_help_last_seen_days">
-        <item quantity="other">%d 天</item>
-        <item quantity="one">1 天</item>
-    </plurals>
-    <plurals name="form_help_last_seen_members">
-        <item quantity="other">%d 位成員</item>
-        <item quantity="zero">0 位成員</item>
-        <item quantity="one">1 位成員</item>
-    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">天</item>
         <item quantity="one">天</item>
@@ -212,16 +203,6 @@
         <item quantity="other">個權限</item>
         <item quantity="one">個權限</item>
     </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue">
-        <item quantity="other">將慢速模式間隔設為 **!!%d!! 秒鐘**</item>
-        <item quantity="zero">停用慢速模式</item>
-        <item quantity="one">將慢速模式間隔設為 **1 秒鐘**</item>
-    </plurals>
-    <plurals name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue">
-        <item quantity="other">將慢速模式間隔設為 **!!%d!! 秒鐘**</item>
-        <item quantity="zero">將慢速模式設為停用</item>
-        <item quantity="one">將慢速模式間隔設為 **1 秒鐘**</item>
-    </plurals>
     <plurals name="guild_settings_audit_log_member_prune_count">
         <item quantity="other">**!!%d!! 位成員**</item>
         <item quantity="one">**位成員**</item>
@@ -317,10 +298,6 @@
         <item quantity="other">%d 則新訊息</item>
         <item quantity="one">1 則新訊息</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
-        <item quantity="other">%d 天</item>
-        <item quantity="one">一天</item>
-    </plurals>
     <plurals name="num_channels_num">
         <item quantity="other">%d 個頻道</item>
         <item quantity="one">%d 個頻道</item>
@@ -338,10 +315,6 @@
         <item quantity="other">這些訊息</item>
         <item quantity="one">這則訊息</item>
     </plurals>
-    <plurals name="partial_outage_count">
-        <item quantity="other">**%d** 台伺服器無法使用因為暫時停機。</item>
-        <item quantity="one">**1** 台伺服器無法使用因為暫時停機。</item>
-    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d 個月</item>
         <item quantity="one">1 個月</item>
diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml
index 0264e2a8a2..e1e97bd4c7 100644
--- a/com.discord/res/values-zh-rTW/strings.xml
+++ b/com.discord/res/values-zh-rTW/strings.xml
@@ -59,10 +59,8 @@
     <string name="activity_invite_private">"您無法發送邀請，因為您目前為隱形、或正在隱藏遊玩遊戲狀態。如果你不想變更
 你的設定，可以改由他人邀請你。"</string>
     <string name="activity_panel_go_live_hotspot_dismiss_button">知道了！</string>
-    <string name="activity_panel_go_live_hotspot_header">透過好友直播向朋友直播遊戲！</string>
+    <string name="activity_panel_go_live_hotspot_header">透過 Go Live 向朋友直播遊戲！</string>
     <string name="activity_panel_go_live_tooltip">好友直播</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">此伺服器沒有可直播的語音頻道。</string>
-    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">您不可在此語音頻道直播。</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">前往伺服器即可開始直播。</string>
     <string name="add">加入</string>
     <string name="add_a_comment_optional">新增評論 (可略過)</string>
@@ -158,7 +156,6 @@
     <string name="application_entitlement_code_redemption_confirmation_title">到手了！</string>
     <string name="application_entitlement_code_redemption_go_to_library">前往遊戲庫</string>
     <string name="application_entitlement_code_redemption_invalid">輸入的代碼無效</string>
-    <string name="application_entitlement_code_redemption_prompt">收到遊戲的優惠代碼？在下面輸入：</string>
     <string name="application_entitlement_code_redemption_redeem">換取</string>
     <string name="application_filter_name_linux">所有檔案</string>
     <string name="application_filter_name_macos">應用程式</string>
@@ -350,7 +347,6 @@
     <string name="application_store_rating_descriptors_esrb_fantasy_violence">奇幻暴力</string>
     <string name="application_store_rating_descriptors_esrb_in_game_purchases">遊戲內購買</string>
     <string name="application_store_rating_descriptors_esrb_intense_violence">激烈暴力</string>
-    <string name="application_store_rating_descriptors_esrb_language">不雅言詞</string>
     <string name="application_store_rating_descriptors_esrb_lyrics">不雅歌詞</string>
     <string name="application_store_rating_descriptors_esrb_mature_humor">成人幽默</string>
     <string name="application_store_rating_descriptors_esrb_nudity">裸露</string>
@@ -418,7 +414,6 @@
     <string name="application_store_view_all_news">查看所有最新消息</string>
     <string name="application_store_warning_dlc_requires_base_application_description">這款可下載內容需要您先擁有 Discord 上的 %1$s 才可遊玩。[了解更多關於可下載內容的資訊。](%2$s)</string>
     <string name="application_store_warning_dlc_requires_base_application_title">可下載內容</string>
-    <string name="application_store_warning_early_access_description">這款遊戲很好玩 (我們這樣認為！) 但可能內容有限、有各種臭蟲、或給人一種不完整的感受。[了解先睹為快遊戲的資訊。](%1$s)</string>
     <string name="application_store_warning_early_access_title">先睹為快</string>
     <string name="application_store_warning_requires_desktop_app_description">若要遊玩這款遊戲，您需要先安裝 Discord $[桌面應用程式](downloadHook)。</string>
     <string name="application_store_warning_requires_desktop_app_title">需要桌面應用程式</string>
@@ -489,7 +484,6 @@
     <string name="ban_user_title">驅逐「%1$s」</string>
     <string name="bans">封鎖</string>
     <string name="bans_header">%1$s</string>
-    <string name="bans_hint">驅逐是預設按照帳號與 IP 的。使用者會用代理伺服器來規避單純驅逐 IP。在 [管理界面](onModerationClick) 中啟用電話認證可讓驅逐難以規避。</string>
     <string name="bans_no_results">我們非常認真地做了，但是沒有搜尋到被封鎖的使用者。</string>
     <string name="bans_no_users_banned">"您還沒有封鎖任何人…
 但如果您必須如此，無需猶豫。"</string>
@@ -541,7 +535,6 @@
     <string name="billing_error_section_card">糟糕！這張卡片好像有點問題。請修正欄位，然後重試一次！</string>
     <string name="billing_history">帳單記錄</string>
     <string name="billing_legal_mumbo_jumbo">囉嗦法律條文</string>
-    <string name="billing_legal_mumbo_jumbo_label">我同意 [Discord 商店服務條款](%1$s)</string>
     <string name="billing_no_payment_method">沒有儲存的付款方式</string>
     <string name="billing_no_payment_method_description">儲存付款方式，加速付款流程</string>
     <string name="billing_pay_for_it_with">用以付款：</string>
@@ -549,12 +542,8 @@
     <string name="billing_payment_breakdown_total">總計</string>
     <string name="billing_payment_history">交易記錄</string>
     <string name="billing_payment_premium">你的訂閱</string>
-    <string name="billing_payment_premium_legalese_monthly">購買 %1$s 訂閱，即代表你同意我們的 [商店服務條款](%2$s)。%1$s 是自動定期訂閱。你授權 Discord 即刻以 %3$s 的價格向你收費，並且往後每年自動收費直到你取消。你可以隨時取消。</string>
-    <string name="billing_payment_premium_legalese_yearly">購買 %1$s 訂閱，即代表你同意我們的 [商店服務條款](%2$s)。%1$s 是自動定期訂閱。你授權 Discord 即刻以 %3$s 的價格向你收費，並且往後每年自動收費直到你取消。你可以隨時取消。</string>
     <string name="billing_payment_sources">付款方式</string>
-    <string name="billing_payment_table_header_amount">價格</string>
     <string name="billing_payment_table_header_date">日期</string>
-    <string name="billing_payment_table_header_description">詳細資訊</string>
     <string name="billing_premium_refund_text">假如交易是在 %1$s 天內執行的話，可以請求退款。 [我們友善的協助櫃台會幫您要回您的錢錢。](%2$s)</string>
     <string name="billing_premium_refund_text_unable">很抱歉，這筆購買項目無法退款。假如交易是在 %1$s 天內執行的話，可以請求退款。</string>
     <string name="billing_price_per_month">%1$s / 月</string>
@@ -806,7 +795,6 @@
     <string name="connection_enter_code">輸入螢幕上顯示的代碼</string>
     <string name="connection_invalid_pin">輸入的 PIN 無效</string>
     <string name="connection_login_with">或登入帳號</string>
-    <string name="connection_problems_body">您可檢查 [伺服器狀態](%1$s) 或使用推特的 [@discordapp](%2$s)。</string>
     <string name="connection_status_authenticating">驗證中</string>
     <string name="connection_status_awaiting_endpoint">正在等待節點</string>
     <string name="connection_status_connected">已連線</string>
@@ -851,7 +839,7 @@
     <string name="create_category">建立類別</string>
     <string name="create_channel">建立頻道</string>
     <string name="create_group_dm">建立群體訊息</string>
-    <string name="create_instant_invite">建立即時邀請</string>
+    <string name="create_instant_invite">建立邀請</string>
     <string name="create_link">建立連結</string>
     <string name="create_or_join_modal_header">哦，要其它伺服器吧？</string>
     <string name="create_server_button_body">建立新的伺服器，並邀請您的朋友。它是免費的！</string>
@@ -966,7 +954,6 @@
     <string name="disable_email_notifications_failed_suggestion">電子信箱通知可能已被停用，或是此電子信箱可能不再是與 Discord 帳號相關聯。</string>
     <string name="disable_integration_title">停用同步</string>
     <string name="disable_integration_twitch_body">停用同步功能將會導致已選取的訂閱行為過期有如同所有訂閱都過期。</string>
-    <string name="disable_integration_youtube_body">停用同步功能將會導致已選取的贊助商行為過期有如同所有贊助商都過期。</string>
     <string name="disable_notifications_description">將停用所有的桌面通知。</string>
     <string name="disable_notifications_label">停用通知</string>
     <string name="disable_sounds_description">將停用所有的音效效果。</string>
@@ -982,7 +969,6 @@
     <string name="discord_desc_long">適合遊戲玩家且免費、安全的聊天軟體，支援在桌上型電腦與手機上使用。</string>
     <string name="discord_desc_short">團隊語音 &amp; 文字聊天</string>
     <string name="dismiss">取消</string>
-    <string name="dispatch_error_modal_body">發生了一點問題。如果這個錯誤持續發生，請填寫支援表格，並將以下的訊息內容複製貼上。</string>
     <string name="dispatch_error_modal_error_label">錯誤訊息 (請把我複製貼上到支援表格裡)</string>
     <string name="dispatch_error_modal_header">Discord Dispatch 錯誤</string>
     <string name="dispatch_error_modal_open_ticket">填寫表格</string>
@@ -1095,7 +1081,7 @@
     <string name="fi">芬蘭文</string>
     <string name="file_rate_kb">%1$s KB/秒</string>
     <string name="file_rate_mb">%1$s MB/秒</string>
-    <string name="file_upload_limit_premium">50 MB</string>
+    <string name="file_upload_limit_premium_tier_1">50 MB</string>
     <string name="file_upload_limit_standard">8 MB</string>
     <string name="filter">篩選</string>
     <string name="filter_mentions">過濾 Mentions</string>
@@ -1117,8 +1103,6 @@
     <string name="form_help_attenuation">"當有人在語音說話時，將會依照百分比來限制其他應用程式的音量。
 當您設定為0%%時，會解除音量抑制。"</string>
     <string name="form_help_automatic_vad">如果指示燈呈現綠色，Discord 正在發送您美妙的聲音。</string>
-    <string name="form_help_bitrate">"**所有位元率！** 不建議超過 %1$skbps 除非您是音響愛好者，因為它會影響其他人的行動裝置
-或是糟糕的連線狀態並沒有明顯的好處。"</string>
     <string name="form_help_certified_voice_processing">"使用 Discord 認證麥克風時，有些語音處理功能並非由 Discord 進行，
 而是在麥克風當中進行。"</string>
     <string name="form_help_channel_permissions">選擇身分組將自動設定成為此頻道的基本權限。</string>
@@ -1131,11 +1115,6 @@
 我們強烈建議在公開的 Discord 設定只有 @mentions。"</string>
     <string name="form_help_explicit_content_filter">"自動掃描並刪除在此伺服器中發送包含嫌惡內容的訊息。 請選擇過濾器將如何廣泛
 的套用於伺服器中的成員。**我們建議為公開的 Discord 伺服器設定過濾器。**"</string>
-    <string name="form_help_instant_invite_channel">"如果已有選擇一個頻道，小工具將會產生一個即時邀請連結，
-否則只會顯示線上成員以及語音頻道列表。"</string>
-    <string name="form_help_last_seen">"執行精簡將會踢出在 **%1$s** 後沒有上線
-的 **%2$s**，
-以及沒有被分配到任何身分組的成員。他們仍可以透過新的即時邀請重新加入伺服器。"</string>
     <string name="form_help_legacy_subsystem">"某些音訊硬體驅動程式出現問題時，是因為使用您的作業系統中的現代化音訊子系統。
 勾選此方塊即可退回到傳統音訊子系統。"</string>
     <string name="form_help_nsfw">"使用者將需要確認年齡以查看此頻道中的內容。
@@ -1145,7 +1124,6 @@
     <string name="form_help_qos">"提示您的路由器傳輸 Discord 的封包為最高優先權。
 某些路由器或網際網路服務供應商可能會對此設定胡作非為。"</string>
     <string name="form_help_slowmode">成員在此間隔的時間內只能發送一封訊息，除非有權限來管理頻道或訊息。</string>
-    <string name="form_help_system_channel">每當有人加入此伺服器時發送一則訊息到此頻道。訊息為隨機挑選。此功能可隨時關閉。</string>
     <string name="form_help_temporary">當沒有被指定身分組的使用者與伺服器解除連接，使用者會被自動踢出伺服器。</string>
     <string name="form_help_user_limit">"可以限制連接到此話音頻道的使用者人數。使用者要是擁有 **移動成員** 的權限可以忽略此限制，
 並可將其他使用者移動到頻道中。"</string>
@@ -1190,8 +1168,8 @@
     <string name="form_label_input_mode">輸入模式</string>
     <string name="form_label_input_sensitivty">輸入靈敏度</string>
     <string name="form_label_input_volume">輸入音量</string>
-    <string name="form_label_instant_invite">輸入即時邀請</string>
-    <string name="form_label_instant_invite_channel">即時邀請頻道</string>
+    <string name="form_label_instant_invite">輸入邀請</string>
+    <string name="form_label_instant_invite_channel">邀請頻道</string>
     <string name="form_label_last_seen">最後看到</string>
     <string name="form_label_local_mute">本機靜音</string>
     <string name="form_label_max_age">有效時間</string>
@@ -1260,7 +1238,6 @@
     <string name="form_label_suppress_everyone">禁用 **@everyone** 和 **@here**</string>
     <string name="form_label_synced_role">已同步身分組</string>
     <string name="form_label_synced_subs">已同步訂閱者</string>
-    <string name="form_label_system_channel">新成員訊息頻道</string>
     <string name="form_label_temporary">臨時成員身分</string>
     <string name="form_label_tts">文字朗讀</string>
     <string name="form_label_tts_notifications">文字朗讀通知</string>
@@ -1362,7 +1339,6 @@
     <string name="game_feed_activity_recently_played">最近玩過</string>
     <string name="game_feed_activity_streaming_twitch">在 Twitch 上直播</string>
     <string name="game_feed_current_header_title">正在玩</string>
-    <string name="game_feed_settings_visibility">在遊戲分頁上顯示</string>
     <string name="game_feed_unknown_player">未知玩家</string>
     <string name="game_feed_user_played_days_ago">%1$s %2$s之前玩過</string>
     <string name="game_feed_user_played_hours_ago">%1$s %2$s之前玩過</string>
@@ -1431,6 +1407,7 @@
     <string name="generate_a_new_link">產生新的連結</string>
     <string name="get_started">啟用步驟</string>
     <string name="gif_auto_play_label">當 Discord 是主要畫面時自動播放 GIF。</string>
+    <string name="go_live_hardware_acceleration_unavailable">提醒您，我們無法偵測到硬體加速。您的電腦在支援 Go Live 時可能會遇到問題。</string>
     <string name="go_live_hey">嘿！</string>
     <string name="go_live_listen">您聽！</string>
     <string name="go_live_look">您看！</string>
@@ -1444,6 +1421,7 @@
     <string name="go_live_modal_select_channel_form_title">選擇語音頻道</string>
     <string name="go_live_modal_select_channel_placeholder">搜尋語音頻道</string>
     <string name="go_live_modal_title">好友直播</string>
+    <string name="go_live_video_drivers_outdated">您的語音驅動程式該更新了。立刻更新驅動程式，即可獲得效能更佳的 Go Live。</string>
     <string name="google_play">Google Play 商店</string>
     <string name="grant_temporary_membership">授予臨時成員身分</string>
     <string name="group">群組</string>
@@ -1521,8 +1499,6 @@
     <string name="guild_settings_audit_log_channel_permission_overrides_granted">**已授予** **%1$s** %2$s</string>
     <string name="guild_settings_audit_log_channel_position_change">從 **%1$s** 移動到 **%2$s**</string>
     <string name="guild_settings_audit_log_channel_position_create">位於 **%1$s**</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_change">%1$s</string>
-    <string name="guild_settings_audit_log_channel_rate_limit_per_user_create">%1$s</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**%1$s**](userHook) 建立 $[**%2$s**](targetHook) 文字頻道</string>
     <string name="guild_settings_audit_log_channel_topic_change">已更改主題為 **%1$s**</string>
     <string name="guild_settings_audit_log_channel_topic_create">設定主題為 **%1$s**</string>
@@ -1618,6 +1594,8 @@
     <string name="guild_settings_filter_all_actions">所有操作</string>
     <string name="guild_settings_filter_all_users">所有使用者</string>
     <string name="guild_settings_filter_user">以使用者篩選</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_1_streaming">720p 60fps Go Live 直播</string>
+    <string name="guild_settings_guild_premium_perk_title_tier_2_streaming">1080p 60fps Go Live 直播</string>
     <string name="guild_settings_label_audit_log">審核日誌</string>
     <string name="guild_settings_label_audit_log_empty_body">當您伺服器的管理員開始他們的工作後，您可以在此監控他們的管理工作。</string>
     <string name="guild_settings_label_audit_log_empty_title">目前沒有日誌</string>
@@ -1649,7 +1627,7 @@
     <string name="help_role_locked_mine">身分組已被鎖定，因為它您是最高階身分組。 請求助於較高階級人士或是伺服器擁有者。</string>
     <string name="help_singular_permission">您不能修改此權限，因為移除它的同時也會把您給移除掉。</string>
     <string name="hide_instant_invites_description">建議如果您有不想要讓任何人隨意存取您的 Discord 伺服器。</string>
-    <string name="hide_instant_invites_label">隱藏即時邀請連結</string>
+    <string name="hide_instant_invites_label">隱藏邀請連結</string>
     <string name="hide_muted">隱藏已靜音的 %1$s 位</string>
     <string name="hide_muted_channels">隱藏已靜音的頻道</string>
     <string name="hide_personal_information_description">隱藏電子郵件，已連接帳號，備註和匿名化 Discord標籤。</string>
@@ -1799,14 +1777,14 @@
     <string name="input_mode_ptt_release_delay">按鍵發話傳輸延遲</string>
     <string name="input_mode_vad">語音感應</string>
     <string name="install_location_main">主要</string>
-    <string name="instant_invite">即時邀請</string>
+    <string name="instant_invite">邀請</string>
     <string name="instant_invite_accept">接受邀請</string>
-    <string name="instant_invite_accepted">已接受即時邀請</string>
-    <string name="instant_invite_accepting">接受即時邀請</string>
+    <string name="instant_invite_accepted">接受邀請</string>
+    <string name="instant_invite_accepting">接受邀請</string>
     <string name="instant_invite_ask_for_new_invite">請求一個新的邀請！</string>
     <string name="instant_invite_ask_user_for_new_invite">詢問 %1$s 來獲得新的邀請！</string>
     <string name="instant_invite_code">代碼</string>
-    <string name="instant_invite_expired">即時邀請失效或已過期。</string>
+    <string name="instant_invite_expired">邀請失效或已過期。</string>
     <string name="instant_invite_expires">到期日</string>
     <string name="instant_invite_failed_to_generate">邀請連結建立失敗。</string>
     <string name="instant_invite_generate">產生</string>
@@ -1824,16 +1802,15 @@
     <string name="instant_invite_regenerate">重新產生</string>
     <string name="instant_invite_resolved_body">您已被邀請到 **%1$s** 中的 **%2$s**。</string>
     <string name="instant_invite_resolved_title">喔！您好啊。</string>
-    <string name="instant_invite_resolving">處理即時邀請</string>
+    <string name="instant_invite_resolving">處理邀請</string>
     <string name="instant_invite_uses">使用數</string>
     <string name="instant_invite_you_are_already_a_member_of">您已經是成員</string>
     <string name="instant_invite_you_have_been_invited_to_join">您已被邀請加入到</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** 已邀請您加入</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">您已被邀請加入群體訊息，邀請人：</string>
-    <string name="instant_invites">即時邀請</string>
+    <string name="instant_invites">邀請</string>
     <string name="integration_settings">整合設定</string>
     <string name="integrations">整合</string>
-    <string name="integrations_header">已連接 Twitch/YouTube Gaming 帳號</string>
     <string name="integrations_pro_tip">更多整合方案請看 [Discord 串流工具組](%1$s)。</string>
     <string name="internal_server_error">發生內部伺服器錯誤，請再試一次。</string>
     <string name="invalid_animated_emoji_body">因為這個表情符號是動畫，所以無法使用。趕快升級成 Discord Nitro，滿足您暢快使用表情符號動畫的夢想</string>
@@ -1946,13 +1923,13 @@
     <string name="join_afk_channel_body">看來您進入了閒置頻道。您不能在這個頻道中說話。</string>
     <string name="join_call">加入通話</string>
     <string name="join_server">加入</string>
-    <string name="join_server_button_body">輸入即時邀請並加入您朋友的伺服器。</string>
+    <string name="join_server_button_body">輸入邀請並加入您朋友的伺服器。</string>
     <string name="join_server_button_cta">加入伺服器</string>
     <string name="join_server_button_cta_mobile">使用邀請連結加入伺服器</string>
     <string name="join_server_button_cta_mobile_desc">擁有邀請代碼或連結嗎？立刻在此使用吧！</string>
     <string name="join_server_button_cta_named">加入 %1$s</string>
-    <string name="join_server_description">在下方輸入即時邀請來加入現有的伺服器。邀請看起來會像這樣：</string>
-    <string name="join_server_description_mobile">輸入即時邀請以加入上述現有的伺服器。</string>
+    <string name="join_server_description">在下方輸入邀請來加入現有的伺服器。邀請看起來會像這樣：</string>
+    <string name="join_server_description_mobile">輸入邀請以加入上述現有的伺服器。</string>
     <string name="join_server_title">加入伺服器</string>
     <string name="join_stream">加入直播</string>
     <string name="join_video_call">加入視訊通話</string>
@@ -2022,7 +1999,7 @@
     <string name="keybind_unassigned">未指定</string>
     <string name="keybinds">快速鍵</string>
     <string name="keyboard_behavior_mobile_header">鍵盤行為</string>
-    <string name="keyboard_behavior_mobile_shift_enter_to_send">Entre 鍵直接傳送訊息。</string>
+    <string name="keyboard_behavior_mobile_shift_enter_to_send">Shift+Enter鍵直接傳送訊息。</string>
     <string name="keyboard_behavior_mobile_shift_enter_to_send_hint">在預設情況下，外接鍵盤 Enter 鍵為傳送訊息。</string>
     <string name="kick">踢出</string>
     <string name="kick_from_server">踢出</string>
@@ -2060,7 +2037,7 @@
     <string name="link_your_xbox_account_2">Discord 是一款語音、文字及視訊聊天應用程式，專供玩家使用，免費、安全、可在桌上型電腦與行動裝置上使用。</string>
     <string name="listening_to">**%1$s** 收聽中</string>
     <string name="live">直播</string>
-    <string name="live_beta_description">歡迎加入直播！好友直播目前為測試版，如有問題還請見諒</string>
+    <string name="live_beta_description">歡迎加入直播！Go Live 目前為測試版，如有問題還請見諒</string>
     <string name="live_on_twitch">Twitch 直播中</string>
     <string name="load_image_error">"載入圖片失敗。
 請再試一次。"</string>
@@ -2104,7 +2081,6 @@
     <string name="mature_listing_decline">不了</string>
     <string name="mature_listing_description">你至少要十八歲以上才能檢視這款遊戲。你是否已滿十八歲，且願意看到成人內容？</string>
     <string name="mature_listing_title">%1$s 限定成年玩家</string>
-    <string name="max_age_never">永久</string>
     <string name="max_age_never_description_mobile">永不過期</string>
     <string name="max_number_of_uses">最大使用次數</string>
     <string name="max_uses">%1$s</string>
@@ -2244,14 +2220,11 @@
     <string name="no_emoji_title">沒有表情符號</string>
     <string name="no_input_devices">沒有輸入裝置</string>
     <string name="no_input_devices_detected">未偵測到輸入裝置，請重新插入並再試一次。</string>
-    <string name="no_instant_invite">沒有即時邀請</string>
-    <string name="no_integrations">[連接](onConnect) 您的 Twitch 或是 YouTube Gaming 合作夥伴帳號來同步您的 訂閱者/贊助商 到指定身分組中。</string>
+    <string name="no_instant_invite">沒有邀請</string>
     <string name="no_integrations_body">FR13NDSH1P 協定只能從 Discord 客戶端上執行</string>
     <string name="no_integrations_label">沒有相關整合</string>
-    <string name="no_invites_body">"感覺漫無目的嗎？像是在天空中漂流的紙飛機嗎？
-透過建立即時邀請連結，在這裡邀請一些好友進來！"</string>
-    <string name="no_invites_caption">目前沒有即時邀請！</string>
-    <string name="no_invites_label">還沒有即時邀請</string>
+    <string name="no_invites_caption">目前沒有邀請！</string>
+    <string name="no_invites_label">還沒有邀請</string>
     <string name="no_mail_account_description">請將您的意見回饋傳送到 support@discordapp.com，我們已經將您的使用者資訊複製到剪貼簿上。</string>
     <string name="no_mail_account_title">沒有信箱的帳號</string>
     <string name="no_mic_body">關於麥克風啟用的說明可以在 Discord 說明中心裡找到。</string>
@@ -2269,7 +2242,6 @@
     <string name="no_reactions_header">沒有反應</string>
     <string name="no_recent_mentions">在開始時… 他們都是安靜的。</string>
     <string name="no_send_messages_permission_placeholder">您沒有權限在此頻道發送訊息。</string>
-    <string name="no_system_channel">沒有新成員訊息</string>
     <string name="no_text">否</string>
     <string name="no_thanks">不用了，謝謝</string>
     <string name="no_user_limit">沒有限制</string>
@@ -2281,7 +2253,6 @@
     <string name="note">備註</string>
     <string name="note_placeholder">點選加入備註</string>
     <string name="note_placeholder_mobile">按一下加入備註</string>
-    <string name="notice_application_test_mode">**%1$s** 現在有測試模式可用。將出現未上市的 SKU，您也不會因為相關款項被收費。</string>
     <string name="notice_application_test_mode_go_to_listing">前往 SKU</string>
     <string name="notice_connect_spotify">連接您的 Spotify 帳號在您的狀態中顯示您的音樂！</string>
     <string name="notice_connection_conflict">因為您從其他的地方連線了，語音已被斷線</string>
@@ -2292,7 +2263,6 @@
     <string name="notice_dispatch_error_disk_low">您的磁碟空間不足，需要 %1$s，但只有 %2$s。</string>
     <string name="notice_dispatch_error_file_name_too_long">噢不，此遊戲的檔案名稱對 Windows 來說太長了。請選擇較短的安裝目錄。</string>
     <string name="notice_dispatch_error_invalid_drive">噢不，您選擇的安裝位置無效。您選的是 %1$s</string>
-    <string name="notice_dispatch_error_io_permission_denied">我們無法更新遊戲。遊戲正在運行嗎？</string>
     <string name="notice_dispatch_error_no_manifests">噢不，這遊戲看起來毫無內容。請連絡支援部門。</string>
     <string name="notice_dispatch_error_not_entitled">噢不，看起來您並未擁有這遊戲。如果您覺得這是個錯誤的話，請連絡支援部門。</string>
     <string name="notice_dispatch_error_post_install_cancelled">看起來您拒絕了一個安裝提示。您需要回答接受才可安裝遊戲。</string>
@@ -2307,9 +2277,6 @@
     <string name="notice_native_apps">需要全系統的按鍵發話功能嗎？取得 DISCORD 桌面版！</string>
     <string name="notice_no_input_detected">好的，Discord 未從您的麥克風偵測到訊號輸入。我們…一起來修復這問題。</string>
     <string name="notice_no_input_detected_help_link_text">說明！</string>
-    <string name="notice_premium_applications_grandfathered_ended">您的 Nitro 存取權限已到期。從 Nitro Classic 升級成 Nitro 來無限制存取超棒的遊戲。</string>
-    <string name="notice_premium_applications_grandfathered_ending">你只剩下 %1$s 可以使用 Nitro 遊戲！你的權限將在 **%2$s** 到期。</string>
-    <string name="notice_premium_applications_grandfathered_started">感謝您搶先支持 Nitro！為了獎勵這傑出表現，您可遊玩所有 Nitro 遊戲到 %1$s 為止。</string>
     <string name="notice_premium_promo_action">快去看看</string>
     <string name="notice_premium_promo_message">支援 Discord 的發展，可獲有趣福利！</string>
     <string name="notice_scheduled_maintenance">Discord 將在 **%1$s** 的 **%2$s** 進行定期維護 。</string>
@@ -2379,7 +2346,6 @@
     <string name="num_channels">%1$s</string>
     <string name="num_subscribers">%1$s</string>
     <string name="num_users">%1$s</string>
-    <string name="nux_overlay_enable">已啟用嵌入介面</string>
     <string name="nux_post_reg_join_server_description">加入伺服器，善用 Discord 功能。</string>
     <string name="nux_post_reg_join_server_skip">我一個都沒有</string>
     <string name="nux_post_reg_join_server_title">您有邀請嗎？</string>
@@ -2425,7 +2391,6 @@
     <string name="overlay_menu_get_invite">取得邀請連結</string>
     <string name="overlay_menu_open_discord">開啟 Discord</string>
     <string name="overlay_menu_switch_channels">切換頻道</string>
-    <string name="overlay_mobile_toggle_desc">連線語音時，除了可查看誰正在聊天並存取捷徑，也可同時使用其他應用程式</string>
     <string name="overlay_mobile_toggle_label">啟用行動語音嵌入介面</string>
     <string name="overlay_mobile_unauthed">登入 Discord 應用程式啟用功能。</string>
     <string name="overlay_news_go_live_body">確定要在 %1$s 向朋友直播 %2$s 嗎？</string>
@@ -2433,7 +2398,6 @@
     <string name="overlay_news_text_pinning_body">您現在可以釘選文字聊天到遊戲了！</string>
     <string name="overlay_news_text_pinning_tip">提示：您可以按下 $[釘選圖示](pinHook) 來釘選聊天</string>
     <string name="overlay_news_text_pinning_title">已升級 Discord 疊層</string>
-    <string name="overlay_no_results">我們找遍了東南西北，可惜仍找不到語音頻道</string>
     <string name="overlay_notification_incoming_call">有來電…</string>
     <string name="overlay_notification_settings_disabled">已停用通知</string>
     <string name="overlay_notification_settings_position">正在顯示：%1$s</string>
@@ -2443,7 +2407,6 @@
     <string name="overlay_notifications_settings">疊層通知</string>
     <string name="overlay_notifications_top_left">左上</string>
     <string name="overlay_notifications_top_right">右上</string>
-    <string name="overlay_private_channels_empty_state">沒，這裡沒有直接訊息。</string>
     <string name="overlay_reload">重新整理疊層</string>
     <string name="overlay_settings">嵌入介面設定</string>
     <string name="overlay_settings_general_tab">一般</string>
@@ -2465,7 +2428,6 @@
     <string name="pagination_page_of">第 %1$s 頁，共 %2$s 頁</string>
     <string name="pagination_previous">上一步</string>
     <string name="paginator_of_pages">第 %1$s 頁，共 %2$s 頁</string>
-    <string name="partial_outage">%1$s</string>
     <string name="partner_badge_tooltip">Discord 合作夥伴</string>
     <string name="party_full">群組已滿</string>
     <string name="party_join">加入群組</string>
@@ -2558,18 +2520,11 @@
     <string name="popout_stay_on_top">維持在最上層</string>
     <string name="post_code">郵遞區號</string>
     <string name="premium_alert_error_title">喔歐，有東西出錯了…</string>
-    <string name="premium_applications_grandfathered_monthly">為了感謝您對 Discord 的支持，您可在一年的期間內遊玩 Nitro 遊戲。您的存取權限將於 **%1$s** 結束。</string>
-    <string name="premium_applications_grandfathered_yearly">為了感謝您對 Discord 的支持，您可在兩年的期間內遊玩 Nitro 遊戲。您的存取權限將於 **%1$s** 結束。</string>
-    <string name="premium_applications_subtitle">可無限遊玩遊戲庫的精彩遊戲，數量會不斷增加，全是由我們精挑細選的佳作，推薦你和朋友同樂。</string>
-    <string name="premium_applications_title">數十個精選遊戲。每月只需一筆小錢。</string>
     <string name="premium_badge_tooltip">自 %1$s 開始訂閱</string>
     <string name="premium_cancel_cancel">不了</string>
     <string name="premium_cancel_confirm_body_tier_1">"取消將於 **%1$s**，您當前的付款期間結束時生效。更改過的 Discord Tag 將會被亂數取代。
 
 您可於任何時候重啟您的訂閱。"</string>
-    <string name="premium_cancel_confirm_body_tier_2">"取消將於您當前的付款期間結束時生效。自 **%1$s** 起，您將失去您的遊戲庫內所有 Nitro 遊戲的存取權；更改過的 Discord Tag 將會被亂數取代。
-
-我們會好好保存您的遊戲存檔，以免您更改心意。您可以於任何時候重新訂閱！"</string>
     <string name="premium_cancel_confirm_new">是的，取消 %1$s</string>
     <string name="premium_cancel_confirm_title">取消 %1$s？</string>
     <string name="premium_cancel_failed_body">我們無法取消您的 Nitro 訂閱。 如果問題仍然存在，請再重試一次或是與我們的支援小組聯繫。</string>
@@ -2586,19 +2541,16 @@
     <string name="premium_chat_perks_description_custom_emoji">取得全球護照可在任何地方使用自訂表情符號。</string>
     <string name="premium_chat_perks_description_discriminator">在訂閱期間選擇你自己的 tag。</string>
     <string name="premium_chat_perks_description_screenshare">將螢幕分享畫質提高到 720p 60fps 或 1080p 30fps。</string>
-    <string name="premium_chat_perks_description_upload_limit">上傳更大的檔案大小，從 %1$s 升級成 %2$s，分享更高畫質的有趣影像。</string>
+    <string name="premium_chat_perks_streaming_mobile">品質更好的 Go Live 直播：使用 Nitro 以原畫質進行直播，或透過 Nitro Classic 傳輸高達 1080p 60fps 的畫質</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">動態的樂趣</string>
     <string name="premium_chat_perks_title_badge">代表你的支持</string>
     <string name="premium_chat_perks_title_custom_emoji">通用自訂表情符號</string>
     <string name="premium_chat_perks_title_discriminator">自訂 Discord Tag</string>
     <string name="premium_chat_perks_title_screenshare">更高畫質的影片</string>
+    <string name="premium_chat_perks_title_streaming">品質更好的 Go Live 直播</string>
     <string name="premium_code_redemption_confirmation_blurb">多虧了這串隨機的數字，你現在獲得 %1$s的改良聊天功能！</string>
     <string name="premium_code_redemption_confirmation_button">喔，太棒了！</string>
-    <string name="premium_feature_new_chat_perks_header">你還會獲得一些改良的聊天福利：</string>
-    <string name="premium_feature_new_premium_applications_header">總價值超過 %1$s 美金的遊戲。快來看看：</string>
-    <string name="premium_feature_view_applications">查看所有 Nitro 遊戲</string>
     <string name="premium_features_chat_perks">聊天福利</string>
-    <string name="premium_features_premium_applications">免費遊戲</string>
     <string name="premium_grandfathered_warning">為了感謝您的支持，您的 Nitro 方案獲得折價。**當您取消或變更方案，就會失去折價資格。**別說我沒跟您講過！</string>
     <string name="premium_grandfathered_warning_confirm">做下去就對了</string>
     <string name="premium_grandfathered_warning_title">小心啊，好友</string>
@@ -2608,10 +2560,7 @@
     <string name="premium_not_claimed">請先認領您的帳號</string>
     <string name="premium_not_claimed_body">朋友你好！想購買 Nitro 的話，你得先認領帳號，才不會遺失資料。</string>
     <string name="premium_not_verified">先認證你的電子信箱</string>
-    <string name="premium_not_verified_body">嘿，朋友！想購買 Nitro 的話您得先認證您的電子郵件。查看您的電子郵件或是要求再寄一次。</string>
-    <string name="premium_payment_applications_os_warning">Nitro 遊戲只可在 Windows 遊玩。</string>
     <string name="premium_payment_confirmation_blurb_regular">您已獲得了強化後的聊天福利。別看了，快點聊！</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">您現在可無限暢玩超多超棒的遊戲。別看了，快去玩！</string>
     <string name="premium_payment_confirmation_button_regular">好啊，聽起來不錯</string>
     <string name="premium_plan_month">每月訂閱 Nitro</string>
     <string name="premium_plan_month_tier_1">每月訂閱 Nitro Classic</string>
@@ -2632,13 +2581,10 @@
     <string name="premium_upgrade_disabled_current_tooltip">你目前的方案。</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">你必須先取消，再讓你的訂閱到期才能選擇較低階的方案。</string>
     <string name="premium_upgrade_done_body_tier_1">您現在獲得了聊天福利！</string>
-    <string name="premium_upgrade_done_body_tier_2">您現在獲得了聊天福利，還可以遊玩一大堆遊戲！</string>
     <string name="premium_upgrade_done_button_tier_1">太棒了！</string>
-    <string name="premium_upgrade_done_button_tier_2">來看看所有 Nitro 遊戲</string>
     <string name="premium_upgrade_failed_body">呃…升級無效。請確保您的付款資訊是最新的，然後重試一次。</string>
     <string name="premium_upload_promo">升級至 Discord Nitro 來提升檔案大小限制為 %1$s</string>
     <string name="premium_year_free_months">獲得免費 2 個月！</string>
-    <string name="premium_year_free_months_short">2 個月免費</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / 年</string>
     <string name="preview_chat">預覽聊天</string>
     <string name="priority_speaker">優先發言者</string>
@@ -2823,7 +2769,7 @@
     <string name="scope_guilds">查看你所在伺服器</string>
     <string name="scope_guilds_empty">您不在任何的伺服器中。</string>
     <string name="scope_guilds_join">幫你加入伺服器</string>
-    <string name="scope_guilds_join_description">以您的名義使用即時邀請。</string>
+    <string name="scope_guilds_join_description">以您的名義使用邀請。</string>
     <string name="scope_identify">存取你的使用者名稱和頭像</string>
     <string name="scope_messages_read">已讀所有訊息</string>
     <string name="scope_messages_read_description">這將允許應用程式可以透過您的 Discord 帳號可讀取所有訊息</string>
@@ -2892,7 +2838,6 @@
     <string name="search_filter_on">於</string>
     <string name="search_for_emoji">尋找完美的表情符號</string>
     <string name="search_for_empty">搜尋</string>
-    <string name="search_for_value">搜尋：**%1$s**</string>
     <string name="search_group_header_channels">在頻道內</string>
     <string name="search_group_header_dates">日期</string>
     <string name="search_group_header_file_name">檔案名稱包含</string>
@@ -3097,8 +3042,6 @@
     <string name="stop_ringing">停止響鈴</string>
     <string name="stop_streaming">停止直播</string>
     <string name="stop_watching">停止觀看</string>
-    <string name="store_payment_legalese_monthly">嘿！買了 %1$s 就代表您同意我們的 [商店服務條款](%2$s)。%1$s 會自動訂閱，代表說我們將從今天開始每月定期向您收取款項，直到您取消訂閱。您可以在任何時候到你的使用者設定頁面取消。</string>
-    <string name="store_payment_legalese_yearly">嘿！買了 %1$s 就代表您同意我們的 [商店服務條款](%2$s)。%1$s 會自動訂閱，代表說我們將從今天開始每年定期向您收取款項，直到你取消訂閱。您可以在任何時候到您的使用者設定頁面取消。</string>
     <string name="stream">好友直播</string>
     <string name="stream_bad_spectator">您觀看的直播目前視訊或音訊品質降低，原因可能是網路狀況。</string>
     <string name="stream_bad_streamer">您的直播目前視訊或音訊品質降低，原因可能是網路狀況。</string>
@@ -3106,7 +3049,6 @@
     <string name="stream_capture_paused_details">切換至遊戲即可繼續。</string>
     <string name="stream_capture_paused_details_viewer">%1$s 已將遊戲視窗縮到最小…不要走開！</string>
     <string name="stream_channel_description">擁有這個權限的成員可以在此頻道直播。</string>
-    <string name="stream_description">擁有這個權限的成員可以進入此頻道。</string>
     <string name="stream_ended">直播已結束。*蟋蟀鳴聲*</string>
     <string name="stream_ended_button">直播已結束</string>
     <string name="stream_ended_no_spectators">沒有觀眾，因直播已結束。</string>
@@ -3146,7 +3088,6 @@
     <string name="stream_report_rating_body_streamer">請談談您的直播經驗。</string>
     <string name="stream_report_submit">提交</string>
     <string name="stream_reported">已提交意見回饋</string>
-    <string name="stream_reported_body">感謝您回報問題！您的意見將協助我們改善直播品質。</string>
     <string name="stream_soundshare_failed">嘿，出問題了，我們無法串流遊戲的音訊。</string>
     <string name="streamer_mode">直播模式</string>
     <string name="streamer_mode_enabled">直播模式已啟用</string>
@@ -3204,7 +3145,6 @@
     <string name="system_message_guild_member_join_10">野生的 %1$s 出現。</string>
     <string name="system_message_guild_member_join_11">嗖。 %1$s 剛剛著陸下來。</string>
     <string name="system_message_guild_member_join_12">振作起來。 %1$s 剛剛加入伺服器。</string>
-    <string name="system_message_guild_member_join_13">%1$s 剛剛加入。 隱藏您的香蕉。</string>
     <string name="system_message_guild_member_join_14">%1$s 剛抵達。 似乎太 OP - 請 nerf 一下。</string>
     <string name="system_message_guild_member_join_15">%1$s 剛剛滑入了伺服器中。</string>
     <string name="system_message_guild_member_join_16">欸 %1$s 在伺服器裡出生。</string>
@@ -3216,7 +3156,6 @@
     <string name="system_message_guild_member_join_22">那是鳥！那是飛機！沒事，那只是 %1$s。</string>
     <string name="system_message_guild_member_join_23">%1$s 來了！讚美太陽！\\\\[T]/</string>
     <string name="system_message_guild_member_join_24">永遠不放棄 %1$s 。永遠不辜負 %1$s 。</string>
-    <string name="system_message_guild_member_join_25">哈哈！%1$s 加入了！您啟動了我的陷阱卡！</string>
     <string name="system_message_guild_member_join_26">小可愛，別擔心，%1$s] 來了！</string>
     <string name="system_message_guild_member_join_27">嘿！快聽！%1$s 來了！</string>
     <string name="system_message_guild_member_join_28">我們正在等您，%1$s</string>
@@ -3491,8 +3430,6 @@
     <string name="user_settings_appearance_preview_message_4">密集模式將被開啟</string>
     <string name="user_settings_appearance_preview_message_5">哦它在這兒！</string>
     <string name="user_settings_appearance_zoom_tip">您可以用 %1$s +/- 來更改縮放等級和用 %1$s+0 來重置為預設縮放等級。</string>
-    <string name="user_settings_apperannce_disable_games_tab">顯示遊戲分頁</string>
-    <string name="user_settings_apperannce_disable_games_tab_note">將此選項關閉，就能隱藏遊戲分頁，讓您專心對話。</string>
     <string name="user_settings_close_button">關閉按鈕</string>
     <string name="user_settings_confirm_logout">您確定您要登出嗎？</string>
     <string name="user_settings_game_activity">遊戲偵測</string>
@@ -3551,8 +3488,6 @@
     <string name="vanity_url_hint_mobile">您的-網址-在這</string>
     <string name="verfication_expired">電子郵件驗證連結已經過期。</string>
     <string name="verfication_expired_suggestion">請登入 Discord 並重新發送連結</string>
-    <string name="verification_body">"我們偵測到了不正常的情況。
-要繼續使用 Discord 的話，**我們需要驗證您是人類使用者。**"</string>
     <string name="verification_body_alt">現在來確認您是人類吧…</string>
     <string name="verification_email_body">我們寄了一封新的電子郵件驗證到 **%1$s**，請檢查您的收件夾或垃圾信件。</string>
     <string name="verification_email_error_body">向您發送認證電子郵件時出現錯誤。請稍後再試或者聯絡技術支援。</string>
@@ -3593,8 +3528,6 @@
     <string name="video">顯示卡</string>
     <string name="video_call">視訊通話</string>
     <string name="video_connect">顯示卡</string>
-    <string name="video_poor_connection_body">已停用視訊。當您的連線品質提升之後就會恢復。</string>
-    <string name="video_poor_connection_title">連線不良</string>
     <string name="video_preview">視訊預覽</string>
     <string name="video_settings">視訊設定</string>
     <string name="video_unavailable">視訊無法使用</string>
diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml
index fe52b74045..c7ad41ecee 100644
--- a/com.discord/res/values/attrs.xml
+++ b/com.discord/res/values/attrs.xml
@@ -150,6 +150,7 @@
     <attr name="bg_mentions" format="reference" />
     <attr name="bg_payment_method_spinner_closed" format="reference" />
     <attr name="bg_payment_method_spinner_dropdown" format="reference" />
+    <attr name="bg_pressed_highlight" format="reference" />
     <attr name="boost_confirmation_card_bg" format="reference|color" />
     <attr name="boosted_guild_tier_0" format="reference" />
     <attr name="borderWidth" format="dimension" />
@@ -366,6 +367,7 @@
     <attr name="dividerVertical" format="reference" />
     <attr name="drawableSize" format="dimension" />
     <attr name="drawerArrowStyle" format="reference" />
+    <attr name="drawerLayoutStyle" format="reference" />
     <attr name="dropDownListViewStyle" format="reference" />
     <attr name="dropdownListPreferredItemHeight" format="dimension" />
     <attr name="editTextBackground" format="reference" />
@@ -870,6 +872,7 @@
     </attr>
     <attr name="layout_scrollInterpolator" format="reference" />
     <attr name="layout_wrapBefore" format="boolean" />
+    <attr name="lb_disabled_alpha" format="reference|float" />
     <attr name="lb_progress_color" format="reference|color" />
     <attr name="lb_text" format="string" />
     <attr name="lb_text_color" format="string" />
@@ -1401,7 +1404,9 @@
     <attr name="ucrop_show_grid" format="boolean" />
     <attr name="ucrop_show_oval_crop_frame" format="boolean" />
     <attr name="useCompatPadding" format="boolean" />
+    <attr name="user_avatar_background_color" format="reference|color" />
     <attr name="user_avatar_size" format="reference|dimension" />
+    <attr name="user_profile_header_background_color" format="reference|color" />
     <attr name="vcpv_is_overlay" format="boolean" />
     <attr name="vcpv_match_video_orientation" format="boolean" />
     <attr name="viewAspectRatio" format="float" />
diff --git a/com.discord/res/values/colors.xml b/com.discord/res/values/colors.xml
index 4659f8bcd4..d464e86927 100644
--- a/com.discord/res/values/colors.xml
+++ b/com.discord/res/values/colors.xml
@@ -19,6 +19,7 @@
     <color name="black_alpha_20">#33000000</color>
     <color name="black_alpha_30">#48000000</color>
     <color name="black_alpha_60">#99000000</color>
+    <color name="black_alpha_70">#b3000000</color>
     <color name="black_alpha_80">#cc000000</color>
     <color name="brand_100">#fff8f9fd</color>
     <color name="brand_200">#ffe3e7f8</color>
@@ -51,6 +52,8 @@
     <color name="code">#ff657b83</color>
     <color name="colorPrimary">#ff333333</color>
     <color name="colorPrimaryDark">#ff1d1d1d</color>
+    <color name="color_clicked_darker">#40000000</color>
+    <color name="color_clicked_lighter">#40ffffff</color>
     <color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
     <color name="common_google_signin_btn_text_dark_disabled">#1f000000</color>
     <color name="common_google_signin_btn_text_dark_focused">@android:color/black</color>
diff --git a/com.discord/res/values/dimens.xml b/com.discord/res/values/dimens.xml
index 9501dc886a..4f27e96b81 100644
--- a/com.discord/res/values/dimens.xml
+++ b/com.discord/res/values/dimens.xml
@@ -83,7 +83,6 @@
     <dimen name="attachment_preview_dimen">48.0dip</dimen>
     <dimen name="avatar_overlap">14.0dip</dimen>
     <dimen name="avatar_size_chat">38.0dip</dimen>
-    <dimen name="avatar_size_extra_extra_large">90.0dip</dimen>
     <dimen name="avatar_size_extra_large">60.0dip</dimen>
     <dimen name="avatar_size_extra_large_account">72.0dip</dimen>
     <dimen name="avatar_size_hero">128.0dip</dimen>
@@ -93,10 +92,11 @@
     <dimen name="avatar_size_small">18.0dip</dimen>
     <dimen name="avatar_size_standard">32.0dip</dimen>
     <dimen name="avatar_size_unrestricted">0.0dip</dimen>
+    <dimen name="avatar_size_xxlarge">80.0dip</dimen>
     <dimen name="avatar_status_size_extra">16.0dip</dimen>
     <dimen name="avatar_status_size_extra_margin">2.0dip</dimen>
-    <dimen name="avatar_status_size_hero">30.0dip</dimen>
-    <dimen name="avatar_status_size_hero_margin">4.0dip</dimen>
+    <dimen name="avatar_status_size_extra_margin_xxlarge">3.0dip</dimen>
+    <dimen name="avatar_status_size_extra_xxlarge">24.0dip</dimen>
     <dimen name="avatar_status_size_standard">14.0dip</dimen>
     <dimen name="avatar_status_size_standard_margin">2.0dip</dimen>
     <dimen name="avatar_status_size_standard_margin_halved">-2.0dip</dimen>
@@ -127,6 +127,7 @@
     <dimen name="compat_notification_large_icon_max_height">320.0dip</dimen>
     <dimen name="compat_notification_large_icon_max_width">320.0dip</dimen>
     <dimen name="connected_account_img_size">30.0dip</dimen>
+    <dimen name="def_drawer_elevation">10.0dip</dimen>
     <dimen name="default_keyboard_height">280.0dip</dimen>
     <dimen name="design_appbar_elevation">4.0dip</dimen>
     <dimen name="design_bottom_navigation_active_item_max_width">168.0dip</dimen>
@@ -183,6 +184,7 @@
     <dimen name="embed_thumbnail_max_size">48.0dip</dimen>
     <dimen name="embed_tiny_icon_size">16.0dip</dimen>
     <dimen name="emoji_grid_item_size">48.0dip</dimen>
+    <dimen name="emoji_size">32.0dip</dimen>
     <dimen name="emoji_text_size">32.0dip</dimen>
     <dimen name="fastscroll_default_thickness">8.0dip</dimen>
     <dimen name="fastscroll_margin">0.0dip</dimen>
diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml
index 1205d7173d..145abcc372 100644
--- a/com.discord/res/values/ids.xml
+++ b/com.discord/res/values/ids.xml
@@ -117,6 +117,7 @@
     <item type="id" name="application_news_loading" />
     <item type="id" name="application_news_splash" />
     <item type="id" name="application_news_title" />
+    <item type="id" name="application_stream_view" />
     <item type="id" name="attachment_clear_btn" />
     <item type="id" name="attachment_preview_container" />
     <item type="id" name="attachment_preview_list" />
@@ -549,6 +550,14 @@
     <item type="id" name="create_channel_type_container" />
     <item type="id" name="create_channel_voice_container" />
     <item type="id" name="create_channel_voice_radio" />
+    <item type="id" name="credit_header" />
+    <item type="id" name="credit_icon" />
+    <item type="id" name="credit_info" />
+    <item type="id" name="credit_info_container" />
+    <item type="id" name="credit_nitro" />
+    <item type="id" name="credit_nitro_classic" />
+    <item type="id" name="credit_nitro_divider" />
+    <item type="id" name="credit_time" />
     <item type="id" name="current_bitrate_display" />
     <item type="id" name="current_user_limit_display" />
     <item type="id" name="custom" />
@@ -691,10 +700,6 @@
     <item type="id" name="file_subtitle_tv" />
     <item type="id" name="folder_view_folder_image" />
     <item type="id" name="friend_container" />
-    <item type="id" name="friend_request_delete_confirmation_body" />
-    <item type="id" name="friend_request_delete_confirmation_cancel" />
-    <item type="id" name="friend_request_delete_confirmation_delete" />
-    <item type="id" name="friend_request_delete_confirmation_title" />
     <item type="id" name="friends_add_container" />
     <item type="id" name="friends_add_header" />
     <item type="id" name="friends_add_nearby" />
@@ -746,6 +751,10 @@
     <item type="id" name="global_search_join_guild_btn" />
     <item type="id" name="global_search_recycler" />
     <item type="id" name="global_search_view_flipper" />
+    <item type="id" name="golive_stream_ended" />
+    <item type="id" name="golive_stream_loading_indicator" />
+    <item type="id" name="golive_stream_paused" />
+    <item type="id" name="golive_stream_video_renderer" />
     <item type="id" name="group_divider" />
     <item type="id" name="group_dm_settings_scroll_view" />
     <item type="id" name="group_invite_friends_chips" />
@@ -788,7 +797,14 @@
     <item type="id" name="guild_invite_cancel" />
     <item type="id" name="guild_invite_channel_spinner" />
     <item type="id" name="guild_invite_empty_results" />
+    <item type="id" name="guild_invite_empty_suggestions_container" />
+    <item type="id" name="guild_invite_empty_suggestions_invite_link" />
+    <item type="id" name="guild_invite_empty_suggestions_invite_share_btn" />
+    <item type="id" name="guild_invite_empty_suggestions_settings_edit" />
+    <item type="id" name="guild_invite_empty_suggestions_settings_invite_link_subtext" />
     <item type="id" name="guild_invite_expires_after_radiogroup" />
+    <item type="id" name="guild_invite_friends_subtitle" />
+    <item type="id" name="guild_invite_friends_title" />
     <item type="id" name="guild_invite_generate_link" />
     <item type="id" name="guild_invite_info" />
     <item type="id" name="guild_invite_link" />
@@ -1051,6 +1067,7 @@
     <item type="id" name="menu_private_call_group_settings" />
     <item type="id" name="menu_private_call_participants" />
     <item type="id" name="menu_private_call_select_camera" />
+    <item type="id" name="menu_private_call_toggle_speaker_mode" />
     <item type="id" name="menu_private_call_user_settings" />
     <item type="id" name="menu_private_call_voice_settings" />
     <item type="id" name="menu_send" />
@@ -1061,6 +1078,8 @@
     <item type="id" name="menu_settings_log_out" />
     <item type="id" name="menu_sort_channel" />
     <item type="id" name="menu_sort_done" />
+    <item type="id" name="menu_spectate_report_problem" />
+    <item type="id" name="menu_spectate_spectators" />
     <item type="id" name="menu_user_mentions_filter" />
     <item type="id" name="menu_user_profile_block" />
     <item type="id" name="menu_user_profile_cancel" />
@@ -1096,9 +1115,12 @@
     <item type="id" name="notice_body_container" />
     <item type="id" name="notice_body_text" />
     <item type="id" name="notice_cancel" />
+    <item type="id" name="notice_crop" />
     <item type="id" name="notice_header" />
     <item type="id" name="notice_header_container" />
+    <item type="id" name="notice_image" />
     <item type="id" name="notice_ok" />
+    <item type="id" name="notice_upload" />
     <item type="id" name="notification_background" />
     <item type="id" name="notification_main_column" />
     <item type="id" name="notification_main_column_container" />
@@ -1145,6 +1167,7 @@
     <item type="id" name="participant_bg_letterbox" />
     <item type="id" name="participant_content_container" />
     <item type="id" name="participant_video_loading_indicator" />
+    <item type="id" name="participant_video_stream_renderer" />
     <item type="id" name="participant_voice_status_indicator" />
     <item type="id" name="participant_voice_user_view" />
     <item type="id" name="payment_info_address_1_textinputlayout" />
@@ -1209,6 +1232,7 @@
     <item type="id" name="popup_title" />
     <item type="id" name="premium_perks_upload_text" />
     <item type="id" name="premium_settings_active_subscription" />
+    <item type="id" name="premium_settings_credit_container" />
     <item type="id" name="premium_settings_grandfathered" />
     <item type="id" name="premium_settings_legalese" />
     <item type="id" name="premium_settings_nitro" />
@@ -1246,14 +1270,6 @@
     <item type="id" name="private_call_top_guideline" />
     <item type="id" name="private_call_video_streams" />
     <item type="id" name="private_call_voice_status_group" />
-    <item type="id" name="profile_header_activity_status" />
-    <item type="id" name="profile_header_avatar" />
-    <item type="id" name="profile_header_avatar_wrap" />
-    <item type="id" name="profile_header_badge_text" />
-    <item type="id" name="profile_header_badge_wrap" />
-    <item type="id" name="profile_header_badge_wrap_outer" />
-    <item type="id" name="profile_header_presence_indicator" />
-    <item type="id" name="profile_header_username" />
     <item type="id" name="profile_strip_avatar" />
     <item type="id" name="profile_strip_avatar_image" />
     <item type="id" name="profile_strip_discriminator" />
@@ -1283,6 +1299,16 @@
     <item type="id" name="reaction_counter_text_switcher" />
     <item type="id" name="reaction_emoji_text" />
     <item type="id" name="reaction_quick_add" />
+    <item type="id" name="report_error_audio_absent" />
+    <item type="id" name="report_error_audio_poor" />
+    <item type="id" name="report_error_blurry" />
+    <item type="id" name="report_error_lagging" />
+    <item type="id" name="report_error_out_of_sync" />
+    <item type="id" name="report_error_radio_group" />
+    <item type="id" name="report_error_stream_black" />
+    <item type="id" name="report_problem_cancel" />
+    <item type="id" name="report_problem_header" />
+    <item type="id" name="report_problem_submit" />
     <item type="id" name="result_count" />
     <item type="id" name="results_rv" />
     <item type="id" name="rich_presence_container" />
@@ -1695,6 +1721,12 @@
     <item type="id" name="snackbar_action" />
     <item type="id" name="snackbar_text" />
     <item type="id" name="spacer" />
+    <item type="id" name="spectate_controls" />
+    <item type="id" name="spectate_controls_disconnect_stream" />
+    <item type="id" name="spectate_controls_disconnect_voice" />
+    <item type="id" name="spectate_controls_mute" />
+    <item type="id" name="spectate_push_to_talk" />
+    <item type="id" name="spectators_list" />
     <item type="id" name="split_action_bar" />
     <item type="id" name="src_toggle" />
     <item type="id" name="state_aspect_ratio" />
@@ -1716,6 +1748,15 @@
     <item type="id" name="steps_done" />
     <item type="id" name="steps_next" />
     <item type="id" name="steps_viewpager" />
+    <item type="id" name="stream_feedback_cancel" />
+    <item type="id" name="stream_feedback_happy" />
+    <item type="id" name="stream_feedback_neutral" />
+    <item type="id" name="stream_feedback_reason_header" />
+    <item type="id" name="stream_feedback_reason_spinner" />
+    <item type="id" name="stream_feedback_sad" />
+    <item type="id" name="stream_feedback_spinner_text" />
+    <item type="id" name="stream_feedback_submit" />
+    <item type="id" name="stream_full_confirm" />
     <item type="id" name="stream_preview_image" />
     <item type="id" name="stream_preview_placeholder" />
     <item type="id" name="stream_preview_placeholder_caption" />
@@ -1797,6 +1838,7 @@
     <item type="id" name="user_avatar_presence_avatar" />
     <item type="id" name="user_avatar_presence_container" />
     <item type="id" name="user_avatar_presence_indicator" />
+    <item type="id" name="user_avatar_presence_padding_image" />
     <item type="id" name="user_captcha_help" />
     <item type="id" name="user_captcha_verify_button" />
     <item type="id" name="user_captcha_verify_button_anchor" />
@@ -1839,40 +1881,59 @@
     <item type="id" name="user_profile_adapter_item_server_nick" />
     <item type="id" name="user_profile_adapter_item_server_text" />
     <item type="id" name="user_profile_adapter_item_server_wrap" />
+    <item type="id" name="user_profile_avatar_presence" />
     <item type="id" name="user_profile_friend_request" />
     <item type="id" name="user_profile_friend_request_accept_btn" />
     <item type="id" name="user_profile_friend_request_ignore_btn" />
     <item type="id" name="user_profile_friend_request_incoming_container" />
     <item type="id" name="user_profile_friend_request_sent_btn" />
-    <item type="id" name="user_profile_header_badges" />
+    <item type="id" name="user_profile_header_badges_recycler" />
+    <item type="id" name="user_profile_header_name_wrap" />
+    <item type="id" name="user_profile_header_primary_name" />
+    <item type="id" name="user_profile_header_secondary_name" />
+    <item type="id" name="user_profile_header_view" />
     <item type="id" name="user_profile_send_message_fab" />
     <item type="id" name="user_profile_view_pager" />
     <item type="id" name="user_selected_checkbox" />
     <item type="id" name="user_settings_mfa_enable_input_digits" />
+    <item type="id" name="user_settings_profile_header_view" />
     <item type="id" name="user_sheet_actions_divider" />
+    <item type="id" name="user_sheet_actions_header" />
     <item type="id" name="user_sheet_activity_divider" />
+    <item type="id" name="user_sheet_add_friend_action_button" />
     <item type="id" name="user_sheet_administrative_divider" />
     <item type="id" name="user_sheet_administrative_header" />
     <item type="id" name="user_sheet_audio_settings_container" />
     <item type="id" name="user_sheet_audio_settings_divider" />
-    <item type="id" name="user_sheet_avatar_presence" />
+    <item type="id" name="user_sheet_badge_image" />
     <item type="id" name="user_sheet_ban" />
+    <item type="id" name="user_sheet_call_action_button" />
     <item type="id" name="user_sheet_copy_id" />
     <item type="id" name="user_sheet_developer_divider" />
     <item type="id" name="user_sheet_developer_header" />
+    <item type="id" name="user_sheet_friend_request_accept_button" />
+    <item type="id" name="user_sheet_friend_request_ignore_button" />
+    <item type="id" name="user_sheet_friend_request_incoming_container" />
+    <item type="id" name="user_sheet_guild_container" />
+    <item type="id" name="user_sheet_guild_divider" />
+    <item type="id" name="user_sheet_guild_header" />
     <item type="id" name="user_sheet_header" />
+    <item type="id" name="user_sheet_incoming_friend_request_divider" />
+    <item type="id" name="user_sheet_incoming_friend_request_header" />
     <item type="id" name="user_sheet_kick" />
-    <item type="id" name="user_sheet_message" />
+    <item type="id" name="user_sheet_message_action_button" />
     <item type="id" name="user_sheet_muted" />
-    <item type="id" name="user_sheet_name_wrap" />
-    <item type="id" name="user_sheet_primary_name" />
+    <item type="id" name="user_sheet_pending_friend_request_action_button" />
     <item type="id" name="user_sheet_profile" />
+    <item type="id" name="user_sheet_profile_actions_container" />
+    <item type="id" name="user_sheet_profile_actions_divider" />
+    <item type="id" name="user_sheet_profile_header_view" />
     <item type="id" name="user_sheet_roles_recycler" />
-    <item type="id" name="user_sheet_secondary_name" />
     <item type="id" name="user_sheet_server_deafen" />
     <item type="id" name="user_sheet_server_edit_member" />
     <item type="id" name="user_sheet_server_move" />
     <item type="id" name="user_sheet_server_mute" />
+    <item type="id" name="user_sheet_video_action_button" />
     <item type="id" name="user_sheet_volume" />
     <item type="id" name="user_sheet_volume_icon" />
     <item type="id" name="user_status_presence_dot" />
@@ -1934,6 +1995,7 @@
     <item type="id" name="voice_user_avatar" />
     <item type="id" name="voice_user_list_item_deafen_indicator" />
     <item type="id" name="voice_user_list_item_header_label" />
+    <item type="id" name="voice_user_list_item_live_indicator" />
     <item type="id" name="voice_user_list_item_mute_indicator" />
     <item type="id" name="voice_user_list_item_user_avatar" />
     <item type="id" name="voice_user_list_item_user_name" />
@@ -1973,7 +2035,6 @@
     <item type="id" name="widget_server_settings_emojis_upload_description" />
     <item type="id" name="widget_server_settings_emojis_view_flipper" />
     <item type="id" name="widget_status" />
-    <item type="id" name="widget_user_profile_header" />
     <item type="id" name="wrapper_controls" />
     <item type="id" name="wrapper_reset_rotate" />
     <item type="id" name="wrapper_rotate_by_angle" />
diff --git a/com.discord/res/values/integers.xml b/com.discord/res/values/integers.xml
index 8988d16b41..74c5f0ed4b 100644
--- a/com.discord/res/values/integers.xml
+++ b/com.discord/res/values/integers.xml
@@ -18,4 +18,6 @@
     <integer name="show_password_duration">200</integer>
     <integer name="status_bar_notification_info_maxnum">999</integer>
     <integer name="ucrop_progress_loading_anim_time">1500</integer>
+    <integer name="uikit_textsize_large_sp">16</integer>
+    <integer name="uikit_textsize_xxlarge_sp">24</integer>
 </resources>
diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml
index 87f174c624..091b844fb9 100644
--- a/com.discord/res/values/plurals.xml
+++ b/com.discord/res/values/plurals.xml
@@ -543,7 +543,7 @@
         <item quantity="other">%d new messages</item>
         <item quantity="one">1 new message</item>
     </plurals>
-    <plurals name="notice_premium_applications_grandfathered_ending_numDays">
+    <plurals name="notice_premium_grandfathered_ending_numDays">
         <item quantity="other">%d days</item>
         <item quantity="one">one day</item>
     </plurals>
@@ -574,8 +574,8 @@
         <item quantity="one">1 server is unavailable due to a temporary outage.</item>
     </plurals>
     <plurals name="partial_outage_count">
-        <item quantity="other">**%d** servers are unavailable due to a temporary outage.</item>
-        <item quantity="one">**1** server is unavailable due to a temporary outage.</item>
+        <item quantity="other">**%d** other servers are unavailable due to a temporary outage.</item>
+        <item quantity="one">**1** other server is unavailable due to a temporary outage.</item>
     </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d months</item>
@@ -661,6 +661,10 @@
         <item quantity="other">%d years</item>
         <item quantity="one">%d year</item>
     </plurals>
+    <plurals name="premium_subscription_credit_count_months_count">
+        <item quantity="other">%d Months</item>
+        <item quantity="one">%d Month</item>
+    </plurals>
     <plurals name="publish_followed_news_fail_body_retryAfter">
         <item quantity="other">%d minutes</item>
         <item quantity="one">1 minute</item>
@@ -742,7 +746,6 @@
         <item quantity="one">minute</item>
     </plurals>
     <item type="plurals" name="APKTOOL_DUMMY_6e">false</item>
-    <item type="plurals" name="APKTOOL_DUMMY_83">false</item>
     <item type="plurals" name="APKTOOL_DUMMY_ad">false</item>
     <item type="plurals" name="APKTOOL_DUMMY_ae">false</item>
 </resources>
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index 5dd0f2ad8a..cce4efcad8 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -172,909 +172,914 @@
     <public type="attr" name="bg_mentions" id="0x7f04005f" />
     <public type="attr" name="bg_payment_method_spinner_closed" id="0x7f040060" />
     <public type="attr" name="bg_payment_method_spinner_dropdown" id="0x7f040061" />
-    <public type="attr" name="boost_confirmation_card_bg" id="0x7f040062" />
-    <public type="attr" name="boosted_guild_tier_0" id="0x7f040063" />
-    <public type="attr" name="borderWidth" id="0x7f040064" />
-    <public type="attr" name="borderlessButtonStyle" id="0x7f040065" />
-    <public type="attr" name="bottomAppBarStyle" id="0x7f040066" />
-    <public type="attr" name="bottomNavigationStyle" id="0x7f040067" />
-    <public type="attr" name="bottomSheetDialogTheme" id="0x7f040068" />
-    <public type="attr" name="bottomSheetStyle" id="0x7f040069" />
-    <public type="attr" name="boxBackgroundColor" id="0x7f04006a" />
-    <public type="attr" name="boxBackgroundMode" id="0x7f04006b" />
-    <public type="attr" name="boxCollapsedPaddingTop" id="0x7f04006c" />
-    <public type="attr" name="boxCornerRadiusBottomEnd" id="0x7f04006d" />
-    <public type="attr" name="boxCornerRadiusBottomStart" id="0x7f04006e" />
-    <public type="attr" name="boxCornerRadiusTopEnd" id="0x7f04006f" />
-    <public type="attr" name="boxCornerRadiusTopStart" id="0x7f040070" />
-    <public type="attr" name="boxStrokeColor" id="0x7f040071" />
-    <public type="attr" name="boxStrokeWidth" id="0x7f040072" />
-    <public type="attr" name="boxed_text" id="0x7f040073" />
-    <public type="attr" name="buttonBarButtonStyle" id="0x7f040074" />
-    <public type="attr" name="buttonBarNegativeButtonStyle" id="0x7f040075" />
-    <public type="attr" name="buttonBarNeutralButtonStyle" id="0x7f040076" />
-    <public type="attr" name="buttonBarPositiveButtonStyle" id="0x7f040077" />
-    <public type="attr" name="buttonBarStyle" id="0x7f040078" />
-    <public type="attr" name="buttonGravity" id="0x7f040079" />
-    <public type="attr" name="buttonIconDimen" id="0x7f04007a" />
-    <public type="attr" name="buttonPanelSideLayout" id="0x7f04007b" />
-    <public type="attr" name="buttonSize" id="0x7f04007c" />
-    <public type="attr" name="buttonStyle" id="0x7f04007d" />
-    <public type="attr" name="buttonStyleSmall" id="0x7f04007e" />
-    <public type="attr" name="buttonTint" id="0x7f04007f" />
-    <public type="attr" name="buttonTintMode" id="0x7f040080" />
-    <public type="attr" name="cardBackgroundColor" id="0x7f040081" />
-    <public type="attr" name="cardCornerRadius" id="0x7f040082" />
-    <public type="attr" name="cardElevation" id="0x7f040083" />
-    <public type="attr" name="cardMaxElevation" id="0x7f040084" />
-    <public type="attr" name="cardPreventCornerOverlap" id="0x7f040085" />
-    <public type="attr" name="cardUseCompatPadding" id="0x7f040086" />
-    <public type="attr" name="cardViewStyle" id="0x7f040087" />
-    <public type="attr" name="card_bg" id="0x7f040088" />
-    <public type="attr" name="chainUseRtl" id="0x7f040089" />
-    <public type="attr" name="chat_embed_bg" id="0x7f04008a" />
-    <public type="attr" name="chat_typing_bg" id="0x7f04008b" />
-    <public type="attr" name="checkboxStyle" id="0x7f04008c" />
-    <public type="attr" name="checkedChip" id="0x7f04008d" />
-    <public type="attr" name="checkedIcon" id="0x7f04008e" />
-    <public type="attr" name="checkedIconEnabled" id="0x7f04008f" />
-    <public type="attr" name="checkedIconVisible" id="0x7f040090" />
-    <public type="attr" name="checkedTextViewStyle" id="0x7f040091" />
-    <public type="attr" name="chipBackgroundColor" id="0x7f040092" />
-    <public type="attr" name="chipCornerRadius" id="0x7f040093" />
-    <public type="attr" name="chipEndPadding" id="0x7f040094" />
-    <public type="attr" name="chipGroupStyle" id="0x7f040095" />
-    <public type="attr" name="chipIcon" id="0x7f040096" />
-    <public type="attr" name="chipIconEnabled" id="0x7f040097" />
-    <public type="attr" name="chipIconSize" id="0x7f040098" />
-    <public type="attr" name="chipIconTint" id="0x7f040099" />
-    <public type="attr" name="chipIconVisible" id="0x7f04009a" />
-    <public type="attr" name="chipMinHeight" id="0x7f04009b" />
-    <public type="attr" name="chipSpacing" id="0x7f04009c" />
-    <public type="attr" name="chipSpacingHorizontal" id="0x7f04009d" />
-    <public type="attr" name="chipSpacingVertical" id="0x7f04009e" />
-    <public type="attr" name="chipStandaloneStyle" id="0x7f04009f" />
-    <public type="attr" name="chipStartPadding" id="0x7f0400a0" />
-    <public type="attr" name="chipStrokeColor" id="0x7f0400a1" />
-    <public type="attr" name="chipStrokeWidth" id="0x7f0400a2" />
-    <public type="attr" name="chipStyle" id="0x7f0400a3" />
-    <public type="attr" name="circleCrop" id="0x7f0400a4" />
-    <public type="attr" name="closeIcon" id="0x7f0400a5" />
-    <public type="attr" name="closeIconEnabled" id="0x7f0400a6" />
-    <public type="attr" name="closeIconEndPadding" id="0x7f0400a7" />
-    <public type="attr" name="closeIconSize" id="0x7f0400a8" />
-    <public type="attr" name="closeIconStartPadding" id="0x7f0400a9" />
-    <public type="attr" name="closeIconTint" id="0x7f0400aa" />
-    <public type="attr" name="closeIconVisible" id="0x7f0400ab" />
-    <public type="attr" name="closeItemLayout" id="0x7f0400ac" />
-    <public type="attr" name="collapseContentDescription" id="0x7f0400ad" />
-    <public type="attr" name="collapseIcon" id="0x7f0400ae" />
-    <public type="attr" name="collapsedTitleGravity" id="0x7f0400af" />
-    <public type="attr" name="collapsedTitleTextAppearance" id="0x7f0400b0" />
-    <public type="attr" name="color" id="0x7f0400b1" />
-    <public type="attr" name="colorAccent" id="0x7f0400b2" />
-    <public type="attr" name="colorBackgroundFloating" id="0x7f0400b3" />
-    <public type="attr" name="colorButtonNormal" id="0x7f0400b4" />
-    <public type="attr" name="colorControlActivated" id="0x7f0400b5" />
-    <public type="attr" name="colorControlHighlight" id="0x7f0400b6" />
-    <public type="attr" name="colorControlNormal" id="0x7f0400b7" />
-    <public type="attr" name="colorError" id="0x7f0400b8" />
-    <public type="attr" name="colorPrimary" id="0x7f0400b9" />
-    <public type="attr" name="colorPrimaryBg" id="0x7f0400ba" />
-    <public type="attr" name="colorPrimaryCircle" id="0x7f0400bb" />
-    <public type="attr" name="colorPrimaryDark" id="0x7f0400bc" />
-    <public type="attr" name="colorPrimaryDivider" id="0x7f0400bd" />
-    <public type="attr" name="colorPrimaryTabs" id="0x7f0400be" />
-    <public type="attr" name="colorScheme" id="0x7f0400bf" />
-    <public type="attr" name="colorSecondary" id="0x7f0400c0" />
-    <public type="attr" name="colorSwitchThumbNormal" id="0x7f0400c1" />
-    <public type="attr" name="commitIcon" id="0x7f0400c2" />
-    <public type="attr" name="constraintSet" id="0x7f0400c3" />
-    <public type="attr" name="constraint_referenced_ids" id="0x7f0400c4" />
-    <public type="attr" name="container_bg_dark_a60" id="0x7f0400c5" />
-    <public type="attr" name="content" id="0x7f0400c6" />
-    <public type="attr" name="contentDescription" id="0x7f0400c7" />
-    <public type="attr" name="contentInsetEnd" id="0x7f0400c8" />
-    <public type="attr" name="contentInsetEndWithActions" id="0x7f0400c9" />
-    <public type="attr" name="contentInsetLeft" id="0x7f0400ca" />
-    <public type="attr" name="contentInsetRight" id="0x7f0400cb" />
-    <public type="attr" name="contentInsetStart" id="0x7f0400cc" />
-    <public type="attr" name="contentInsetStartWithNavigation" id="0x7f0400cd" />
-    <public type="attr" name="contentPadding" id="0x7f0400ce" />
-    <public type="attr" name="contentPaddingBottom" id="0x7f0400cf" />
-    <public type="attr" name="contentPaddingLeft" id="0x7f0400d0" />
-    <public type="attr" name="contentPaddingRight" id="0x7f0400d1" />
-    <public type="attr" name="contentPaddingTop" id="0x7f0400d2" />
-    <public type="attr" name="contentScrim" id="0x7f0400d3" />
-    <public type="attr" name="controlBackground" id="0x7f0400d4" />
-    <public type="attr" name="coordinatorLayoutStyle" id="0x7f0400d5" />
-    <public type="attr" name="cornerRadius" id="0x7f0400d6" />
-    <public type="attr" name="counterEnabled" id="0x7f0400d7" />
-    <public type="attr" name="counterMaxLength" id="0x7f0400d8" />
-    <public type="attr" name="counterOverflowTextAppearance" id="0x7f0400d9" />
-    <public type="attr" name="counterTextAppearance" id="0x7f0400da" />
-    <public type="attr" name="cs_background" id="0x7f0400db" />
-    <public type="attr" name="cs_drawable_bottom" id="0x7f0400dc" />
-    <public type="attr" name="cs_drawable_left" id="0x7f0400dd" />
-    <public type="attr" name="cs_drawable_padding" id="0x7f0400de" />
-    <public type="attr" name="cs_drawable_right" id="0x7f0400df" />
-    <public type="attr" name="cs_drawable_top" id="0x7f0400e0" />
-    <public type="attr" name="cs_subtext" id="0x7f0400e1" />
-    <public type="attr" name="cs_subtext_color" id="0x7f0400e2" />
-    <public type="attr" name="cs_subtext_size" id="0x7f0400e3" />
-    <public type="attr" name="cs_text" id="0x7f0400e4" />
-    <public type="attr" name="cs_text_color" id="0x7f0400e5" />
-    <public type="attr" name="cs_text_fontpath" id="0x7f0400e6" />
-    <public type="attr" name="cs_text_size" id="0x7f0400e7" />
-    <public type="attr" name="cs_view_type" id="0x7f0400e8" />
-    <public type="attr" name="customNavigationLayout" id="0x7f0400e9" />
-    <public type="attr" name="cv_bg_color" id="0x7f0400ea" />
-    <public type="attr" name="cv_bg_color_clicked" id="0x7f0400eb" />
-    <public type="attr" name="cv_bg_color_error_clicked" id="0x7f0400ec" />
-    <public type="attr" name="cv_chip_layout" id="0x7f0400ed" />
-    <public type="attr" name="cv_color" id="0x7f0400ee" />
-    <public type="attr" name="cv_color_clicked" id="0x7f0400ef" />
-    <public type="attr" name="cv_color_error_clicked" id="0x7f0400f0" />
-    <public type="attr" name="cv_dialog_cancel" id="0x7f0400f1" />
-    <public type="attr" name="cv_dialog_confirm" id="0x7f0400f2" />
-    <public type="attr" name="cv_dialog_error_msg" id="0x7f0400f3" />
-    <public type="attr" name="cv_dialog_et_placeholder" id="0x7f0400f4" />
-    <public type="attr" name="cv_dialog_title" id="0x7f0400f5" />
-    <public type="attr" name="cv_icon_delete" id="0x7f0400f6" />
-    <public type="attr" name="cv_icon_placeholder" id="0x7f0400f7" />
-    <public type="attr" name="cv_max_height" id="0x7f0400f8" />
-    <public type="attr" name="cv_search_text_color" id="0x7f0400f9" />
-    <public type="attr" name="cv_search_text_size" id="0x7f0400fa" />
-    <public type="attr" name="cv_text_color" id="0x7f0400fb" />
-    <public type="attr" name="cv_text_color_clicked" id="0x7f0400fc" />
-    <public type="attr" name="cv_text_color_error_clicked" id="0x7f0400fd" />
-    <public type="attr" name="cv_vertical_spacing" id="0x7f0400fe" />
-    <public type="attr" name="defaultQueryHint" id="0x7f0400ff" />
-    <public type="attr" name="dialogCornerRadius" id="0x7f040100" />
-    <public type="attr" name="dialogPreferredPadding" id="0x7f040101" />
-    <public type="attr" name="dialogTheme" id="0x7f040102" />
-    <public type="attr" name="displayOptions" id="0x7f040103" />
-    <public type="attr" name="divider" id="0x7f040104" />
-    <public type="attr" name="dividerDrawable" id="0x7f040105" />
-    <public type="attr" name="dividerDrawableHorizontal" id="0x7f040106" />
-    <public type="attr" name="dividerDrawableVertical" id="0x7f040107" />
-    <public type="attr" name="dividerHorizontal" id="0x7f040108" />
-    <public type="attr" name="dividerPadding" id="0x7f040109" />
-    <public type="attr" name="dividerVertical" id="0x7f04010a" />
-    <public type="attr" name="drawableSize" id="0x7f04010b" />
-    <public type="attr" name="drawerArrowStyle" id="0x7f04010c" />
-    <public type="attr" name="dropDownListViewStyle" id="0x7f04010d" />
-    <public type="attr" name="dropdownListPreferredItemHeight" id="0x7f04010e" />
-    <public type="attr" name="editTextBackground" id="0x7f04010f" />
-    <public type="attr" name="editTextColor" id="0x7f040110" />
-    <public type="attr" name="editTextStyle" id="0x7f040111" />
-    <public type="attr" name="elevation" id="0x7f040112" />
-    <public type="attr" name="emptyVisibility" id="0x7f040113" />
-    <public type="attr" name="enforceMaterialTheme" id="0x7f040114" />
-    <public type="attr" name="enforceTextAppearance" id="0x7f040115" />
-    <public type="attr" name="errorEnabled" id="0x7f040116" />
-    <public type="attr" name="errorTextAppearance" id="0x7f040117" />
-    <public type="attr" name="expandActivityOverflowButtonDrawable" id="0x7f040118" />
-    <public type="attr" name="expanded" id="0x7f040119" />
-    <public type="attr" name="expandedTitleGravity" id="0x7f04011a" />
-    <public type="attr" name="expandedTitleMargin" id="0x7f04011b" />
-    <public type="attr" name="expandedTitleMarginBottom" id="0x7f04011c" />
-    <public type="attr" name="expandedTitleMarginEnd" id="0x7f04011d" />
-    <public type="attr" name="expandedTitleMarginStart" id="0x7f04011e" />
-    <public type="attr" name="expandedTitleMarginTop" id="0x7f04011f" />
-    <public type="attr" name="expandedTitleTextAppearance" id="0x7f040120" />
-    <public type="attr" name="fabAlignmentMode" id="0x7f040121" />
-    <public type="attr" name="fabCradleMargin" id="0x7f040122" />
-    <public type="attr" name="fabCradleRoundedCornerRadius" id="0x7f040123" />
-    <public type="attr" name="fabCradleVerticalOffset" id="0x7f040124" />
-    <public type="attr" name="fabCustomSize" id="0x7f040125" />
-    <public type="attr" name="fabSize" id="0x7f040126" />
-    <public type="attr" name="facing" id="0x7f040127" />
-    <public type="attr" name="fadeDuration" id="0x7f040128" />
-    <public type="attr" name="failureImage" id="0x7f040129" />
-    <public type="attr" name="failureImageScaleType" id="0x7f04012a" />
-    <public type="attr" name="fastScrollEnabled" id="0x7f04012b" />
-    <public type="attr" name="fastScrollHorizontalThumbDrawable" id="0x7f04012c" />
-    <public type="attr" name="fastScrollHorizontalTrackDrawable" id="0x7f04012d" />
-    <public type="attr" name="fastScrollVerticalThumbDrawable" id="0x7f04012e" />
-    <public type="attr" name="fastScrollVerticalTrackDrawable" id="0x7f04012f" />
-    <public type="attr" name="fgl_max_linear_views" id="0x7f040130" />
-    <public type="attr" name="firstBaselineToTopHeight" id="0x7f040131" />
-    <public type="attr" name="fl_horizontal_spacing" id="0x7f040132" />
-    <public type="attr" name="fl_vertical_spacing" id="0x7f040133" />
-    <public type="attr" name="flash" id="0x7f040134" />
-    <public type="attr" name="flexDirection" id="0x7f040135" />
-    <public type="attr" name="flexInputAddContentLauncherTitle" id="0x7f040136" />
-    <public type="attr" name="flexInputColorHighlight" id="0x7f040137" />
-    <public type="attr" name="flexInputDialogBackground" id="0x7f040138" />
-    <public type="attr" name="flexInputIconColor" id="0x7f040139" />
-    <public type="attr" name="flexInputIconColorActivated" id="0x7f04013a" />
-    <public type="attr" name="flexInputIconColorDisabled" id="0x7f04013b" />
-    <public type="attr" name="flexWrap" id="0x7f04013c" />
-    <public type="attr" name="floatingActionButtonStyle" id="0x7f04013d" />
-    <public type="attr" name="font" id="0x7f04013e" />
-    <public type="attr" name="fontFamily" id="0x7f04013f" />
-    <public type="attr" name="fontProviderAuthority" id="0x7f040140" />
-    <public type="attr" name="fontProviderCerts" id="0x7f040141" />
-    <public type="attr" name="fontProviderFetchStrategy" id="0x7f040142" />
-    <public type="attr" name="fontProviderFetchTimeout" id="0x7f040143" />
-    <public type="attr" name="fontProviderPackage" id="0x7f040144" />
-    <public type="attr" name="fontProviderQuery" id="0x7f040145" />
-    <public type="attr" name="fontStyle" id="0x7f040146" />
-    <public type="attr" name="fontVariationSettings" id="0x7f040147" />
-    <public type="attr" name="fontWeight" id="0x7f040148" />
-    <public type="attr" name="foregroundInsidePadding" id="0x7f040149" />
-    <public type="attr" name="gapBetweenBars" id="0x7f04014a" />
-    <public type="attr" name="gift_code_copied_outline" id="0x7f04014b" />
-    <public type="attr" name="gift_embed_disabled_button_text_color" id="0x7f04014c" />
-    <public type="attr" name="gift_embed_gradient_overlay" id="0x7f04014d" />
-    <public type="attr" name="gift_nitro_splash" id="0x7f04014e" />
-    <public type="attr" name="goIcon" id="0x7f04014f" />
-    <public type="attr" name="gradient_invite_splash" id="0x7f040150" />
-    <public type="attr" name="guild_boost_badge_tier_1" id="0x7f040151" />
-    <public type="attr" name="guild_boost_badge_tier_2" id="0x7f040152" />
-    <public type="attr" name="guild_boost_badge_tier_3" id="0x7f040153" />
-    <public type="attr" name="gv_image_request_size" id="0x7f040154" />
-    <public type="attr" name="headerLayout" id="0x7f040155" />
-    <public type="attr" name="height" id="0x7f040156" />
-    <public type="attr" name="helperText" id="0x7f040157" />
-    <public type="attr" name="helperTextEnabled" id="0x7f040158" />
-    <public type="attr" name="helperTextTextAppearance" id="0x7f040159" />
-    <public type="attr" name="hideMotionSpec" id="0x7f04015a" />
-    <public type="attr" name="hideOnContentScroll" id="0x7f04015b" />
-    <public type="attr" name="hideOnScroll" id="0x7f04015c" />
-    <public type="attr" name="hint" id="0x7f04015d" />
-    <public type="attr" name="hintAnimationEnabled" id="0x7f04015e" />
-    <public type="attr" name="hintColor" id="0x7f04015f" />
-    <public type="attr" name="hintEnabled" id="0x7f040160" />
-    <public type="attr" name="hintTextAppearance" id="0x7f040161" />
-    <public type="attr" name="homeAsUpIndicator" id="0x7f040162" />
-    <public type="attr" name="homeLayout" id="0x7f040163" />
-    <public type="attr" name="hoveredFocusedTranslationZ" id="0x7f040164" />
-    <public type="attr" name="ic_account" id="0x7f040165" />
-    <public type="attr" name="ic_action_bar_back" id="0x7f040166" />
-    <public type="attr" name="ic_action_bar_close" id="0x7f040167" />
-    <public type="attr" name="ic_add_circle_outline" id="0x7f040168" />
-    <public type="attr" name="ic_add_reaction" id="0x7f040169" />
-    <public type="attr" name="ic_audit_all" id="0x7f04016a" />
-    <public type="attr" name="ic_audit_channel" id="0x7f04016b" />
-    <public type="attr" name="ic_audit_emoji" id="0x7f04016c" />
-    <public type="attr" name="ic_audit_invite" id="0x7f04016d" />
-    <public type="attr" name="ic_audit_logs" id="0x7f04016e" />
-    <public type="attr" name="ic_audit_member" id="0x7f04016f" />
-    <public type="attr" name="ic_audit_message" id="0x7f040170" />
-    <public type="attr" name="ic_audit_role" id="0x7f040171" />
-    <public type="attr" name="ic_audit_server" id="0x7f040172" />
-    <public type="attr" name="ic_audit_webhook" id="0x7f040173" />
-    <public type="attr" name="ic_authed_apps_a60" id="0x7f040174" />
-    <public type="attr" name="ic_bans_a60" id="0x7f040175" />
-    <public type="attr" name="ic_behavior_a60" id="0x7f040176" />
-    <public type="attr" name="ic_billing_a60" id="0x7f040177" />
-    <public type="attr" name="ic_call_participants" id="0x7f040178" />
-    <public type="attr" name="ic_camera_disabled" id="0x7f040179" />
-    <public type="attr" name="ic_camera_enabled" id="0x7f04017a" />
-    <public type="attr" name="ic_category" id="0x7f04017b" />
-    <public type="attr" name="ic_channel_mute" id="0x7f04017c" />
-    <public type="attr" name="ic_channel_muted" id="0x7f04017d" />
-    <public type="attr" name="ic_channel_text" id="0x7f04017e" />
-    <public type="attr" name="ic_channels_a60" id="0x7f04017f" />
-    <public type="attr" name="ic_chat_bubble" id="0x7f040180" />
-    <public type="attr" name="ic_close_24dp" id="0x7f040181" />
-    <public type="attr" name="ic_copy" id="0x7f040182" />
-    <public type="attr" name="ic_defean_state" id="0x7f040183" />
-    <public type="attr" name="ic_delete" id="0x7f040184" />
-    <public type="attr" name="ic_delete_sweep" id="0x7f040185" />
-    <public type="attr" name="ic_drag_handle" id="0x7f040186" />
-    <public type="attr" name="ic_edit" id="0x7f040187" />
-    <public type="attr" name="ic_end_audio_call" id="0x7f040188" />
-    <public type="attr" name="ic_exit_to_app" id="0x7f040189" />
-    <public type="attr" name="ic_expand_up" id="0x7f04018a" />
-    <public type="attr" name="ic_file_download_opaque" id="0x7f04018b" />
-    <public type="attr" name="ic_filter_list" id="0x7f04018c" />
-    <public type="attr" name="ic_game_icon_placeholder" id="0x7f04018d" />
-    <public type="attr" name="ic_games_a60" id="0x7f04018e" />
-    <public type="attr" name="ic_headset" id="0x7f04018f" />
-    <public type="attr" name="ic_headset_deafened" id="0x7f040190" />
-    <public type="attr" name="ic_help_a60" id="0x7f040191" />
-    <public type="attr" name="ic_info_a60" id="0x7f040192" />
-    <public type="attr" name="ic_insert_drive_file" id="0x7f040193" />
-    <public type="attr" name="ic_integrations_a60" id="0x7f040194" />
-    <public type="attr" name="ic_invites_a60" id="0x7f040195" />
-    <public type="attr" name="ic_link_a60" id="0x7f040196" />
-    <public type="attr" name="ic_locale_a60" id="0x7f040197" />
-    <public type="attr" name="ic_lock" id="0x7f040198" />
-    <public type="attr" name="ic_members_a60" id="0x7f040199" />
-    <public type="attr" name="ic_menu_private" id="0x7f04019a" />
-    <public type="attr" name="ic_mic" id="0x7f04019b" />
-    <public type="attr" name="ic_mic_muted" id="0x7f04019c" />
-    <public type="attr" name="ic_mic_state" id="0x7f04019d" />
-    <public type="attr" name="ic_my_account_a60" id="0x7f04019e" />
-    <public type="attr" name="ic_notifications_a60" id="0x7f04019f" />
-    <public type="attr" name="ic_open_in_browser_opaque" id="0x7f0401a0" />
-    <public type="attr" name="ic_open_in_new" id="0x7f0401a1" />
-    <public type="attr" name="ic_open_in_new_24dp" id="0x7f0401a2" />
-    <public type="attr" name="ic_overlay" id="0x7f0401a3" />
-    <public type="attr" name="ic_overview_a60" id="0x7f0401a4" />
-    <public type="attr" name="ic_person" id="0x7f0401a5" />
-    <public type="attr" name="ic_person_add" id="0x7f0401a6" />
-    <public type="attr" name="ic_person_add_new" id="0x7f0401a7" />
-    <public type="attr" name="ic_phonelink_a60" id="0x7f0401a8" />
-    <public type="attr" name="ic_pins_a60" id="0x7f0401a9" />
-    <public type="attr" name="ic_plus_a60" id="0x7f0401aa" />
-    <public type="attr" name="ic_popup_settings" id="0x7f0401ab" />
-    <public type="attr" name="ic_privacy_a60" id="0x7f0401ac" />
-    <public type="attr" name="ic_reactions" id="0x7f0401ad" />
-    <public type="attr" name="ic_refresh" id="0x7f0401ae" />
-    <public type="attr" name="ic_roles_a60" id="0x7f0401af" />
-    <public type="attr" name="ic_security_a60" id="0x7f0401b0" />
-    <public type="attr" name="ic_send" id="0x7f0401b1" />
-    <public type="attr" name="ic_settings" id="0x7f0401b2" />
-    <public type="attr" name="ic_settings_boost_a60" id="0x7f0401b3" />
-    <public type="attr" name="ic_settings_gifting_a60" id="0x7f0401b4" />
-    <public type="attr" name="ic_share" id="0x7f0401b5" />
-    <public type="attr" name="ic_share_opaque" id="0x7f0401b6" />
-    <public type="attr" name="ic_slowmode_timer" id="0x7f0401b7" />
-    <public type="attr" name="ic_sort" id="0x7f0401b8" />
-    <public type="attr" name="ic_speaker_state" id="0x7f0401b9" />
-    <public type="attr" name="ic_swap_vertical_circle" id="0x7f0401ba" />
-    <public type="attr" name="ic_switch_camera" id="0x7f0401bb" />
-    <public type="attr" name="ic_text_image_a60" id="0x7f0401bc" />
-    <public type="attr" name="ic_theme_a60" id="0x7f0401bd" />
-    <public type="attr" name="ic_timer" id="0x7f0401be" />
-    <public type="attr" name="ic_uploads_file" id="0x7f0401bf" />
-    <public type="attr" name="ic_uploads_generic" id="0x7f0401c0" />
-    <public type="attr" name="ic_uploads_image" id="0x7f0401c1" />
-    <public type="attr" name="ic_uploads_video" id="0x7f0401c2" />
-    <public type="attr" name="ic_visibility" id="0x7f0401c3" />
-    <public type="attr" name="ic_visibility_off" id="0x7f0401c4" />
-    <public type="attr" name="ic_voice_settings_a60" id="0x7f0401c5" />
-    <public type="attr" name="ic_volume" id="0x7f0401c6" />
-    <public type="attr" name="icon" id="0x7f0401c7" />
-    <public type="attr" name="iconEndPadding" id="0x7f0401c8" />
-    <public type="attr" name="iconGravity" id="0x7f0401c9" />
-    <public type="attr" name="iconPadding" id="0x7f0401ca" />
-    <public type="attr" name="iconSize" id="0x7f0401cb" />
-    <public type="attr" name="iconStartPadding" id="0x7f0401cc" />
-    <public type="attr" name="iconTint" id="0x7f0401cd" />
-    <public type="attr" name="iconTintMode" id="0x7f0401ce" />
-    <public type="attr" name="iconifiedByDefault" id="0x7f0401cf" />
-    <public type="attr" name="imageAspectRatio" id="0x7f0401d0" />
-    <public type="attr" name="imageAspectRatioAdjust" id="0x7f0401d1" />
-    <public type="attr" name="imageButtonStyle" id="0x7f0401d2" />
-    <public type="attr" name="img_addfriends_empty" id="0x7f0401d3" />
-    <public type="attr" name="img_addfriends_notconnected" id="0x7f0401d4" />
-    <public type="attr" name="img_baddies" id="0x7f0401d5" />
-    <public type="attr" name="img_chat_channel_less" id="0x7f0401d6" />
-    <public type="attr" name="img_chat_nsfw" id="0x7f0401d7" />
-    <public type="attr" name="img_empty_search" id="0x7f0401d8" />
-    <public type="attr" name="img_empty_search_global" id="0x7f0401d9" />
-    <public type="attr" name="img_empty_server_invites" id="0x7f0401da" />
-    <public type="attr" name="img_forced_update" id="0x7f0401db" />
-    <public type="attr" name="img_gifting_pattern_bg" id="0x7f0401dc" />
-    <public type="attr" name="img_logo_discord_nitro" id="0x7f0401dd" />
-    <public type="attr" name="img_logo_discord_nitro_classic" id="0x7f0401de" />
-    <public type="attr" name="img_mfa" id="0x7f0401df" />
-    <public type="attr" name="img_new_tos" id="0x7f0401e0" />
-    <public type="attr" name="img_no_mutual_friends" id="0x7f0401e1" />
-    <public type="attr" name="img_no_mutual_servers" id="0x7f0401e2" />
-    <public type="attr" name="img_poop" id="0x7f0401e3" />
-    <public type="attr" name="img_thumb" id="0x7f0401e4" />
-    <public type="attr" name="img_verify_email" id="0x7f0401e5" />
-    <public type="attr" name="img_verify_phone" id="0x7f0401e6" />
-    <public type="attr" name="img_voice_no_connections" id="0x7f0401e7" />
-    <public type="attr" name="img_wumpus_ball" id="0x7f0401e8" />
-    <public type="attr" name="img_wumpus_tophat" id="0x7f0401e9" />
-    <public type="attr" name="indeterminateProgressStyle" id="0x7f0401ea" />
-    <public type="attr" name="initialActivityCount" id="0x7f0401eb" />
-    <public type="attr" name="insetForeground" id="0x7f0401ec" />
-    <public type="attr" name="isLightTheme" id="0x7f0401ed" />
-    <public type="attr" name="itemBackground" id="0x7f0401ee" />
-    <public type="attr" name="itemHorizontalPadding" id="0x7f0401ef" />
-    <public type="attr" name="itemHorizontalTranslationEnabled" id="0x7f0401f0" />
-    <public type="attr" name="itemIconPadding" id="0x7f0401f1" />
-    <public type="attr" name="itemIconSize" id="0x7f0401f2" />
-    <public type="attr" name="itemIconTint" id="0x7f0401f3" />
-    <public type="attr" name="itemPadding" id="0x7f0401f4" />
-    <public type="attr" name="itemSpacing" id="0x7f0401f5" />
-    <public type="attr" name="itemTextAppearance" id="0x7f0401f6" />
-    <public type="attr" name="itemTextAppearanceActive" id="0x7f0401f7" />
-    <public type="attr" name="itemTextAppearanceInactive" id="0x7f0401f8" />
-    <public type="attr" name="itemTextColor" id="0x7f0401f9" />
-    <public type="attr" name="justifyContent" id="0x7f0401fa" />
-    <public type="attr" name="keylines" id="0x7f0401fb" />
-    <public type="attr" name="labelVisibilityMode" id="0x7f0401fc" />
-    <public type="attr" name="lastBaselineToBottomHeight" id="0x7f0401fd" />
-    <public type="attr" name="layout" id="0x7f0401fe" />
-    <public type="attr" name="layoutManager" id="0x7f0401ff" />
-    <public type="attr" name="layout_alignSelf" id="0x7f040200" />
-    <public type="attr" name="layout_anchor" id="0x7f040201" />
-    <public type="attr" name="layout_anchorGravity" id="0x7f040202" />
-    <public type="attr" name="layout_behavior" id="0x7f040203" />
-    <public type="attr" name="layout_collapseMode" id="0x7f040204" />
-    <public type="attr" name="layout_collapseParallaxMultiplier" id="0x7f040205" />
-    <public type="attr" name="layout_constrainedHeight" id="0x7f040206" />
-    <public type="attr" name="layout_constrainedWidth" id="0x7f040207" />
-    <public type="attr" name="layout_constraintBaseline_creator" id="0x7f040208" />
-    <public type="attr" name="layout_constraintBaseline_toBaselineOf" id="0x7f040209" />
-    <public type="attr" name="layout_constraintBottom_creator" id="0x7f04020a" />
-    <public type="attr" name="layout_constraintBottom_toBottomOf" id="0x7f04020b" />
-    <public type="attr" name="layout_constraintBottom_toTopOf" id="0x7f04020c" />
-    <public type="attr" name="layout_constraintCircle" id="0x7f04020d" />
-    <public type="attr" name="layout_constraintCircleAngle" id="0x7f04020e" />
-    <public type="attr" name="layout_constraintCircleRadius" id="0x7f04020f" />
-    <public type="attr" name="layout_constraintDimensionRatio" id="0x7f040210" />
-    <public type="attr" name="layout_constraintEnd_toEndOf" id="0x7f040211" />
-    <public type="attr" name="layout_constraintEnd_toStartOf" id="0x7f040212" />
-    <public type="attr" name="layout_constraintGuide_begin" id="0x7f040213" />
-    <public type="attr" name="layout_constraintGuide_end" id="0x7f040214" />
-    <public type="attr" name="layout_constraintGuide_percent" id="0x7f040215" />
-    <public type="attr" name="layout_constraintHeight_default" id="0x7f040216" />
-    <public type="attr" name="layout_constraintHeight_max" id="0x7f040217" />
-    <public type="attr" name="layout_constraintHeight_min" id="0x7f040218" />
-    <public type="attr" name="layout_constraintHeight_percent" id="0x7f040219" />
-    <public type="attr" name="layout_constraintHorizontal_bias" id="0x7f04021a" />
-    <public type="attr" name="layout_constraintHorizontal_chainStyle" id="0x7f04021b" />
-    <public type="attr" name="layout_constraintHorizontal_weight" id="0x7f04021c" />
-    <public type="attr" name="layout_constraintLeft_creator" id="0x7f04021d" />
-    <public type="attr" name="layout_constraintLeft_toLeftOf" id="0x7f04021e" />
-    <public type="attr" name="layout_constraintLeft_toRightOf" id="0x7f04021f" />
-    <public type="attr" name="layout_constraintRight_creator" id="0x7f040220" />
-    <public type="attr" name="layout_constraintRight_toLeftOf" id="0x7f040221" />
-    <public type="attr" name="layout_constraintRight_toRightOf" id="0x7f040222" />
-    <public type="attr" name="layout_constraintStart_toEndOf" id="0x7f040223" />
-    <public type="attr" name="layout_constraintStart_toStartOf" id="0x7f040224" />
-    <public type="attr" name="layout_constraintTop_creator" id="0x7f040225" />
-    <public type="attr" name="layout_constraintTop_toBottomOf" id="0x7f040226" />
-    <public type="attr" name="layout_constraintTop_toTopOf" id="0x7f040227" />
-    <public type="attr" name="layout_constraintVertical_bias" id="0x7f040228" />
-    <public type="attr" name="layout_constraintVertical_chainStyle" id="0x7f040229" />
-    <public type="attr" name="layout_constraintVertical_weight" id="0x7f04022a" />
-    <public type="attr" name="layout_constraintWidth_default" id="0x7f04022b" />
-    <public type="attr" name="layout_constraintWidth_max" id="0x7f04022c" />
-    <public type="attr" name="layout_constraintWidth_min" id="0x7f04022d" />
-    <public type="attr" name="layout_constraintWidth_percent" id="0x7f04022e" />
-    <public type="attr" name="layout_dodgeInsetEdges" id="0x7f04022f" />
-    <public type="attr" name="layout_editor_absoluteX" id="0x7f040230" />
-    <public type="attr" name="layout_editor_absoluteY" id="0x7f040231" />
-    <public type="attr" name="layout_flexBasisPercent" id="0x7f040232" />
-    <public type="attr" name="layout_flexGrow" id="0x7f040233" />
-    <public type="attr" name="layout_flexShrink" id="0x7f040234" />
-    <public type="attr" name="layout_goneMarginBottom" id="0x7f040235" />
-    <public type="attr" name="layout_goneMarginEnd" id="0x7f040236" />
-    <public type="attr" name="layout_goneMarginLeft" id="0x7f040237" />
-    <public type="attr" name="layout_goneMarginRight" id="0x7f040238" />
-    <public type="attr" name="layout_goneMarginStart" id="0x7f040239" />
-    <public type="attr" name="layout_goneMarginTop" id="0x7f04023a" />
-    <public type="attr" name="layout_insetEdge" id="0x7f04023b" />
-    <public type="attr" name="layout_keyline" id="0x7f04023c" />
-    <public type="attr" name="layout_maxHeight" id="0x7f04023d" />
-    <public type="attr" name="layout_maxWidth" id="0x7f04023e" />
-    <public type="attr" name="layout_minHeight" id="0x7f04023f" />
-    <public type="attr" name="layout_minWidth" id="0x7f040240" />
-    <public type="attr" name="layout_optimizationLevel" id="0x7f040241" />
-    <public type="attr" name="layout_order" id="0x7f040242" />
-    <public type="attr" name="layout_scrollFlags" id="0x7f040243" />
-    <public type="attr" name="layout_scrollInterpolator" id="0x7f040244" />
-    <public type="attr" name="layout_wrapBefore" id="0x7f040245" />
-    <public type="attr" name="lb_progress_color" id="0x7f040246" />
-    <public type="attr" name="lb_text" id="0x7f040247" />
-    <public type="attr" name="lb_text_color" id="0x7f040248" />
-    <public type="attr" name="liftOnScroll" id="0x7f040249" />
-    <public type="attr" name="lineHeight" id="0x7f04024a" />
-    <public type="attr" name="lineSpacing" id="0x7f04024b" />
-    <public type="attr" name="listChoiceBackgroundIndicator" id="0x7f04024c" />
-    <public type="attr" name="listDividerAlertDialog" id="0x7f04024d" />
-    <public type="attr" name="listItemLayout" id="0x7f04024e" />
-    <public type="attr" name="listLayout" id="0x7f04024f" />
-    <public type="attr" name="listMenuViewStyle" id="0x7f040250" />
-    <public type="attr" name="listPopupWindowStyle" id="0x7f040251" />
-    <public type="attr" name="listPreferredItemHeight" id="0x7f040252" />
-    <public type="attr" name="listPreferredItemHeightLarge" id="0x7f040253" />
-    <public type="attr" name="listPreferredItemHeightSmall" id="0x7f040254" />
-    <public type="attr" name="listPreferredItemPaddingLeft" id="0x7f040255" />
-    <public type="attr" name="listPreferredItemPaddingRight" id="0x7f040256" />
-    <public type="attr" name="logo" id="0x7f040257" />
-    <public type="attr" name="logoDescription" id="0x7f040258" />
-    <public type="attr" name="lottie_autoPlay" id="0x7f040259" />
-    <public type="attr" name="lottie_colorFilter" id="0x7f04025a" />
-    <public type="attr" name="lottie_enableMergePathsForKitKatAndAbove" id="0x7f04025b" />
-    <public type="attr" name="lottie_fileName" id="0x7f04025c" />
-    <public type="attr" name="lottie_imageAssetsFolder" id="0x7f04025d" />
-    <public type="attr" name="lottie_loop" id="0x7f04025e" />
-    <public type="attr" name="lottie_progress" id="0x7f04025f" />
-    <public type="attr" name="lottie_rawRes" id="0x7f040260" />
-    <public type="attr" name="lottie_renderMode" id="0x7f040261" />
-    <public type="attr" name="lottie_repeatCount" id="0x7f040262" />
-    <public type="attr" name="lottie_repeatMode" id="0x7f040263" />
-    <public type="attr" name="lottie_scale" id="0x7f040264" />
-    <public type="attr" name="lottie_speed" id="0x7f040265" />
-    <public type="attr" name="lottie_url" id="0x7f040266" />
-    <public type="attr" name="manage_reactions_emoji_selection_indicator" id="0x7f040267" />
-    <public type="attr" name="materialButtonStyle" id="0x7f040268" />
-    <public type="attr" name="materialCardViewStyle" id="0x7f040269" />
-    <public type="attr" name="maxActionInlineWidth" id="0x7f04026a" />
-    <public type="attr" name="maxButtonHeight" id="0x7f04026b" />
-    <public type="attr" name="maxImageSize" id="0x7f04026c" />
-    <public type="attr" name="max_height" id="0x7f04026d" />
-    <public type="attr" name="measureWithLargestChild" id="0x7f04026e" />
-    <public type="attr" name="menu" id="0x7f04026f" />
-    <public type="attr" name="multiChoiceItemLayout" id="0x7f040270" />
-    <public type="attr" name="navigationContentDescription" id="0x7f040271" />
-    <public type="attr" name="navigationIcon" id="0x7f040272" />
-    <public type="attr" name="navigationMode" id="0x7f040273" />
-    <public type="attr" name="navigationViewStyle" id="0x7f040274" />
-    <public type="attr" name="notice_popup_bg" id="0x7f040275" />
-    <public type="attr" name="notice_theme_positive_red" id="0x7f040276" />
-    <public type="attr" name="numericModifiers" id="0x7f040277" />
-    <public type="attr" name="overlapAnchor" id="0x7f040278" />
-    <public type="attr" name="overlayImage" id="0x7f040279" />
-    <public type="attr" name="overlay_guild_mentions" id="0x7f04027a" />
-    <public type="attr" name="overlay_guild_mentions_primary_630" id="0x7f04027b" />
-    <public type="attr" name="paddingBottomNoButtons" id="0x7f04027c" />
-    <public type="attr" name="paddingEnd" id="0x7f04027d" />
-    <public type="attr" name="paddingStart" id="0x7f04027e" />
-    <public type="attr" name="paddingTopNoTitle" id="0x7f04027f" />
-    <public type="attr" name="panelBackground" id="0x7f040280" />
-    <public type="attr" name="panelMenuListTheme" id="0x7f040281" />
-    <public type="attr" name="panelMenuListWidth" id="0x7f040282" />
-    <public type="attr" name="passwordToggleContentDescription" id="0x7f040283" />
-    <public type="attr" name="passwordToggleDrawable" id="0x7f040284" />
-    <public type="attr" name="passwordToggleEnabled" id="0x7f040285" />
-    <public type="attr" name="passwordToggleTint" id="0x7f040286" />
-    <public type="attr" name="passwordToggleTintMode" id="0x7f040287" />
-    <public type="attr" name="placeholderImage" id="0x7f040288" />
-    <public type="attr" name="placeholderImageScaleType" id="0x7f040289" />
-    <public type="attr" name="popupMenuStyle" id="0x7f04028a" />
-    <public type="attr" name="popupTheme" id="0x7f04028b" />
-    <public type="attr" name="popupWindowStyle" id="0x7f04028c" />
-    <public type="attr" name="preserveIconSpacing" id="0x7f04028d" />
-    <public type="attr" name="pressedStateOverlayImage" id="0x7f04028e" />
-    <public type="attr" name="pressedTranslationZ" id="0x7f04028f" />
-    <public type="attr" name="previewBackground" id="0x7f040290" />
-    <public type="attr" name="primary_000" id="0x7f040291" />
-    <public type="attr" name="primary_100" id="0x7f040292" />
-    <public type="attr" name="primary_100_alpha_30" id="0x7f040293" />
-    <public type="attr" name="primary_100_alpha_60" id="0x7f040294" />
-    <public type="attr" name="primary_100_bg" id="0x7f040295" />
-    <public type="attr" name="primary_200" id="0x7f040296" />
-    <public type="attr" name="primary_200_bg" id="0x7f040297" />
-    <public type="attr" name="primary_300" id="0x7f040298" />
-    <public type="attr" name="primary_300_alpha_30" id="0x7f040299" />
-    <public type="attr" name="primary_300_bg" id="0x7f04029a" />
-    <public type="attr" name="primary_400" id="0x7f04029b" />
-    <public type="attr" name="primary_400_alpha_30" id="0x7f04029c" />
-    <public type="attr" name="primary_400_bg" id="0x7f04029d" />
-    <public type="attr" name="primary_500" id="0x7f04029e" />
-    <public type="attr" name="primary_500_alpha_60" id="0x7f04029f" />
-    <public type="attr" name="primary_500_bg" id="0x7f0402a0" />
-    <public type="attr" name="primary_500_button_outline" id="0x7f0402a1" />
-    <public type="attr" name="primary_500_circle" id="0x7f0402a2" />
-    <public type="attr" name="primary_560" id="0x7f0402a3" />
-    <public type="attr" name="primary_600" id="0x7f0402a4" />
-    <public type="attr" name="primary_600_bg" id="0x7f0402a5" />
-    <public type="attr" name="primary_630" id="0x7f0402a6" />
-    <public type="attr" name="primary_630_bg" id="0x7f0402a7" />
-    <public type="attr" name="primary_630_bg_bottom_corners" id="0x7f0402a8" />
-    <public type="attr" name="primary_630_circle" id="0x7f0402a9" />
-    <public type="attr" name="primary_660" id="0x7f0402aa" />
-    <public type="attr" name="primary_660_bg_outline" id="0x7f0402ab" />
-    <public type="attr" name="primary_700" id="0x7f0402ac" />
-    <public type="attr" name="primary_700_alpha_60" id="0x7f0402ad" />
-    <public type="attr" name="primary_700_bg" id="0x7f0402ae" />
-    <public type="attr" name="primary_700_circle" id="0x7f0402af" />
-    <public type="attr" name="primary_700_top_corners" id="0x7f0402b0" />
-    <public type="attr" name="primary_800" id="0x7f0402b1" />
-    <public type="attr" name="primary_800_bg" id="0x7f0402b2" />
-    <public type="attr" name="primary_800_circle" id="0x7f0402b3" />
-    <public type="attr" name="primary_900" id="0x7f0402b4" />
-    <public type="attr" name="primary_900_bg" id="0x7f0402b5" />
-    <public type="attr" name="progressBarAutoRotateInterval" id="0x7f0402b6" />
-    <public type="attr" name="progressBarImage" id="0x7f0402b7" />
-    <public type="attr" name="progressBarImageScaleType" id="0x7f0402b8" />
-    <public type="attr" name="progressBarPadding" id="0x7f0402b9" />
-    <public type="attr" name="progressBarStyle" id="0x7f0402ba" />
-    <public type="attr" name="progress_gradient" id="0x7f0402bb" />
-    <public type="attr" name="ptrn_shapes" id="0x7f0402bc" />
-    <public type="attr" name="queryBackground" id="0x7f0402bd" />
-    <public type="attr" name="queryHint" id="0x7f0402be" />
-    <public type="attr" name="radioButtonStyle" id="0x7f0402bf" />
-    <public type="attr" name="radio_btn_bg" id="0x7f0402c0" />
-    <public type="attr" name="radio_btn_text_color" id="0x7f0402c1" />
-    <public type="attr" name="ratingBarStyle" id="0x7f0402c2" />
-    <public type="attr" name="ratingBarStyleIndicator" id="0x7f0402c3" />
-    <public type="attr" name="ratingBarStyleSmall" id="0x7f0402c4" />
-    <public type="attr" name="retryImage" id="0x7f0402c5" />
-    <public type="attr" name="retryImageScaleType" id="0x7f0402c6" />
-    <public type="attr" name="reverseLayout" id="0x7f0402c7" />
-    <public type="attr" name="rippleColor" id="0x7f0402c8" />
-    <public type="attr" name="roundAsCircle" id="0x7f0402c9" />
-    <public type="attr" name="roundBottomEnd" id="0x7f0402ca" />
-    <public type="attr" name="roundBottomLeft" id="0x7f0402cb" />
-    <public type="attr" name="roundBottomRight" id="0x7f0402cc" />
-    <public type="attr" name="roundBottomStart" id="0x7f0402cd" />
-    <public type="attr" name="roundTopEnd" id="0x7f0402ce" />
-    <public type="attr" name="roundTopLeft" id="0x7f0402cf" />
-    <public type="attr" name="roundTopRight" id="0x7f0402d0" />
-    <public type="attr" name="roundTopStart" id="0x7f0402d1" />
-    <public type="attr" name="roundWithOverlayColor" id="0x7f0402d2" />
-    <public type="attr" name="roundedCornerRadius" id="0x7f0402d3" />
-    <public type="attr" name="roundingBorderColor" id="0x7f0402d4" />
-    <public type="attr" name="roundingBorderPadding" id="0x7f0402d5" />
-    <public type="attr" name="roundingBorderWidth" id="0x7f0402d6" />
-    <public type="attr" name="sb_barBackgroundColor" id="0x7f0402d7" />
-    <public type="attr" name="sb_barColor" id="0x7f0402d8" />
-    <public type="attr" name="sb_barControlColor" id="0x7f0402d9" />
-    <public type="attr" name="sb_barControlRadius" id="0x7f0402da" />
-    <public type="attr" name="sb_barControlShadowColor" id="0x7f0402db" />
-    <public type="attr" name="sb_barControlShadowRadius" id="0x7f0402dc" />
-    <public type="attr" name="sb_barHeight" id="0x7f0402dd" />
-    <public type="attr" name="sb_barInterval" id="0x7f0402de" />
-    <public type="attr" name="sb_barOverlayColor" id="0x7f0402df" />
-    <public type="attr" name="sb_barOverlayValue" id="0x7f0402e0" />
-    <public type="attr" name="sb_barTouchEnabled" id="0x7f0402e1" />
-    <public type="attr" name="sb_barValue" id="0x7f0402e2" />
-    <public type="attr" name="sb_barValueMax" id="0x7f0402e3" />
-    <public type="attr" name="sb_barValueMin" id="0x7f0402e4" />
-    <public type="attr" name="scopeUris" id="0x7f0402e5" />
-    <public type="attr" name="scrimAnimationDuration" id="0x7f0402e6" />
-    <public type="attr" name="scrimBackground" id="0x7f0402e7" />
-    <public type="attr" name="scrimVisibleHeightTrigger" id="0x7f0402e8" />
-    <public type="attr" name="searchHintIcon" id="0x7f0402e9" />
-    <public type="attr" name="searchIcon" id="0x7f0402ea" />
-    <public type="attr" name="searchViewStyle" id="0x7f0402eb" />
-    <public type="attr" name="search_action_bar_bg" id="0x7f0402ec" />
-    <public type="attr" name="seekBarStyle" id="0x7f0402ed" />
-    <public type="attr" name="selectableItemBackground" id="0x7f0402ee" />
-    <public type="attr" name="selectableItemBackgroundBorderless" id="0x7f0402ef" />
-    <public type="attr" name="settings_text_color" id="0x7f0402f0" />
-    <public type="attr" name="showAsAction" id="0x7f0402f1" />
-    <public type="attr" name="showDivider" id="0x7f0402f2" />
-    <public type="attr" name="showDividerHorizontal" id="0x7f0402f3" />
-    <public type="attr" name="showDividerVertical" id="0x7f0402f4" />
-    <public type="attr" name="showDividers" id="0x7f0402f5" />
-    <public type="attr" name="showMotionSpec" id="0x7f0402f6" />
-    <public type="attr" name="showText" id="0x7f0402f7" />
-    <public type="attr" name="showTitle" id="0x7f0402f8" />
-    <public type="attr" name="singleChoiceItemLayout" id="0x7f0402f9" />
-    <public type="attr" name="singleLine" id="0x7f0402fa" />
-    <public type="attr" name="singleSelection" id="0x7f0402fb" />
-    <public type="attr" name="snackbarButtonStyle" id="0x7f0402fc" />
-    <public type="attr" name="snackbarStyle" id="0x7f0402fd" />
-    <public type="attr" name="spanCount" id="0x7f0402fe" />
-    <public type="attr" name="spinBars" id="0x7f0402ff" />
-    <public type="attr" name="spinnerDropDownItemStyle" id="0x7f040300" />
-    <public type="attr" name="spinnerStyle" id="0x7f040301" />
-    <public type="attr" name="splitTrack" id="0x7f040302" />
-    <public type="attr" name="srcCompat" id="0x7f040303" />
-    <public type="attr" name="stackFromEnd" id="0x7f040304" />
-    <public type="attr" name="state_above_anchor" id="0x7f040305" />
-    <public type="attr" name="state_collapsed" id="0x7f040306" />
-    <public type="attr" name="state_collapsible" id="0x7f040307" />
-    <public type="attr" name="state_liftable" id="0x7f040308" />
-    <public type="attr" name="state_lifted" id="0x7f040309" />
-    <public type="attr" name="statusBarBackground" id="0x7f04030a" />
-    <public type="attr" name="statusBarScrim" id="0x7f04030b" />
-    <public type="attr" name="status_white_outline" id="0x7f04030c" />
-    <public type="attr" name="stream_preview_bg" id="0x7f04030d" />
-    <public type="attr" name="stream_preview_placeholder_color" id="0x7f04030e" />
-    <public type="attr" name="strokeColor" id="0x7f04030f" />
-    <public type="attr" name="strokeWidth" id="0x7f040310" />
-    <public type="attr" name="subMenuArrow" id="0x7f040311" />
-    <public type="attr" name="submitBackground" id="0x7f040312" />
-    <public type="attr" name="subtitle" id="0x7f040313" />
-    <public type="attr" name="subtitleTextAppearance" id="0x7f040314" />
-    <public type="attr" name="subtitleTextColor" id="0x7f040315" />
-    <public type="attr" name="subtitleTextStyle" id="0x7f040316" />
-    <public type="attr" name="suggestionRowLayout" id="0x7f040317" />
-    <public type="attr" name="switchMinWidth" id="0x7f040318" />
-    <public type="attr" name="switchPadding" id="0x7f040319" />
-    <public type="attr" name="switchStyle" id="0x7f04031a" />
-    <public type="attr" name="switchTextAppearance" id="0x7f04031b" />
-    <public type="attr" name="tabBackground" id="0x7f04031c" />
-    <public type="attr" name="tabContentStart" id="0x7f04031d" />
-    <public type="attr" name="tabGravity" id="0x7f04031e" />
-    <public type="attr" name="tabIconTint" id="0x7f04031f" />
-    <public type="attr" name="tabIconTintMode" id="0x7f040320" />
-    <public type="attr" name="tabIndicator" id="0x7f040321" />
-    <public type="attr" name="tabIndicatorAnimationDuration" id="0x7f040322" />
-    <public type="attr" name="tabIndicatorColor" id="0x7f040323" />
-    <public type="attr" name="tabIndicatorFullWidth" id="0x7f040324" />
-    <public type="attr" name="tabIndicatorGravity" id="0x7f040325" />
-    <public type="attr" name="tabIndicatorHeight" id="0x7f040326" />
-    <public type="attr" name="tabInlineLabel" id="0x7f040327" />
-    <public type="attr" name="tabMaxWidth" id="0x7f040328" />
-    <public type="attr" name="tabMinWidth" id="0x7f040329" />
-    <public type="attr" name="tabMode" id="0x7f04032a" />
-    <public type="attr" name="tabPadding" id="0x7f04032b" />
-    <public type="attr" name="tabPaddingBottom" id="0x7f04032c" />
-    <public type="attr" name="tabPaddingEnd" id="0x7f04032d" />
-    <public type="attr" name="tabPaddingStart" id="0x7f04032e" />
-    <public type="attr" name="tabPaddingTop" id="0x7f04032f" />
-    <public type="attr" name="tabRippleColor" id="0x7f040330" />
-    <public type="attr" name="tabSelectedTextColor" id="0x7f040331" />
-    <public type="attr" name="tabStyle" id="0x7f040332" />
-    <public type="attr" name="tabTextAppearance" id="0x7f040333" />
-    <public type="attr" name="tabTextColor" id="0x7f040334" />
-    <public type="attr" name="tabUnboundedRipple" id="0x7f040335" />
-    <public type="attr" name="tcs_subtext" id="0x7f040336" />
-    <public type="attr" name="ternaryCheckboxDisabledColor" id="0x7f040337" />
-    <public type="attr" name="text" id="0x7f040338" />
-    <public type="attr" name="textAllCaps" id="0x7f040339" />
-    <public type="attr" name="textAppearanceBody1" id="0x7f04033a" />
-    <public type="attr" name="textAppearanceBody2" id="0x7f04033b" />
-    <public type="attr" name="textAppearanceButton" id="0x7f04033c" />
-    <public type="attr" name="textAppearanceCaption" id="0x7f04033d" />
-    <public type="attr" name="textAppearanceHeadline1" id="0x7f04033e" />
-    <public type="attr" name="textAppearanceHeadline2" id="0x7f04033f" />
-    <public type="attr" name="textAppearanceHeadline3" id="0x7f040340" />
-    <public type="attr" name="textAppearanceHeadline4" id="0x7f040341" />
-    <public type="attr" name="textAppearanceHeadline5" id="0x7f040342" />
-    <public type="attr" name="textAppearanceHeadline6" id="0x7f040343" />
-    <public type="attr" name="textAppearanceLargePopupMenu" id="0x7f040344" />
-    <public type="attr" name="textAppearanceListItem" id="0x7f040345" />
-    <public type="attr" name="textAppearanceListItemSecondary" id="0x7f040346" />
-    <public type="attr" name="textAppearanceListItemSmall" id="0x7f040347" />
-    <public type="attr" name="textAppearanceOverline" id="0x7f040348" />
-    <public type="attr" name="textAppearancePopupMenuHeader" id="0x7f040349" />
-    <public type="attr" name="textAppearanceSearchResultSubtitle" id="0x7f04034a" />
-    <public type="attr" name="textAppearanceSearchResultTitle" id="0x7f04034b" />
-    <public type="attr" name="textAppearanceSmallPopupMenu" id="0x7f04034c" />
-    <public type="attr" name="textAppearanceSubtitle1" id="0x7f04034d" />
-    <public type="attr" name="textAppearanceSubtitle2" id="0x7f04034e" />
-    <public type="attr" name="textColorAlertDialogListItem" id="0x7f04034f" />
-    <public type="attr" name="textColorSearchUrl" id="0x7f040350" />
-    <public type="attr" name="textEndPadding" id="0x7f040351" />
-    <public type="attr" name="textInputStyle" id="0x7f040352" />
-    <public type="attr" name="textStartPadding" id="0x7f040353" />
-    <public type="attr" name="text_color" id="0x7f040354" />
-    <public type="attr" name="theme" id="0x7f040355" />
-    <public type="attr" name="theme_backspace_icon" id="0x7f040356" />
-    <public type="attr" name="theme_chat_block_quote_divider" id="0x7f040357" />
-    <public type="attr" name="theme_chat_blocked_bg" id="0x7f040358" />
-    <public type="attr" name="theme_chat_blocked_text" id="0x7f040359" />
-    <public type="attr" name="theme_chat_code" id="0x7f04035a" />
-    <public type="attr" name="theme_chat_codeblock_border" id="0x7f04035b" />
-    <public type="attr" name="theme_chat_divider" id="0x7f04035c" />
-    <public type="attr" name="theme_chat_divider_embed" id="0x7f04035d" />
-    <public type="attr" name="theme_chat_empty_mentions_arm" id="0x7f04035e" />
-    <public type="attr" name="theme_chat_empty_mentions_hand" id="0x7f04035f" />
-    <public type="attr" name="theme_chat_empty_pins" id="0x7f040360" />
-    <public type="attr" name="theme_chat_header_members" id="0x7f040361" />
-    <public type="attr" name="theme_chat_input" id="0x7f040362" />
-    <public type="attr" name="theme_chat_input_button_tint_colors" id="0x7f040363" />
-    <public type="attr" name="theme_chat_input_content_tab_bg" id="0x7f040364" />
-    <public type="attr" name="theme_chat_input_divider" id="0x7f040365" />
-    <public type="attr" name="theme_chat_input_edit" id="0x7f040366" />
-    <public type="attr" name="theme_chat_input_photo_selection_icon" id="0x7f040367" />
-    <public type="attr" name="theme_chat_input_text" id="0x7f040368" />
-    <public type="attr" name="theme_chat_input_text_placeholder" id="0x7f040369" />
-    <public type="attr" name="theme_chat_loading_spinner_color" id="0x7f04036a" />
-    <public type="attr" name="theme_chat_mentioned_me" id="0x7f04036b" />
-    <public type="attr" name="theme_chat_name" id="0x7f04036c" />
-    <public type="attr" name="theme_chat_reaction_background" id="0x7f04036d" />
-    <public type="attr" name="theme_chat_reaction_text_color" id="0x7f04036e" />
-    <public type="attr" name="theme_chat_spoiler_bg" id="0x7f04036f" />
-    <public type="attr" name="theme_chat_spoiler_bg_visible" id="0x7f040370" />
-    <public type="attr" name="theme_chat_spoiler_inapp_bg" id="0x7f040371" />
-    <public type="attr" name="theme_chat_text" id="0x7f040372" />
-    <public type="attr" name="theme_chat_timestamp" id="0x7f040373" />
-    <public type="attr" name="theme_emoji_icon_activity" id="0x7f040374" />
-    <public type="attr" name="theme_emoji_icon_custom" id="0x7f040375" />
-    <public type="attr" name="theme_emoji_icon_flags" id="0x7f040376" />
-    <public type="attr" name="theme_emoji_icon_food" id="0x7f040377" />
-    <public type="attr" name="theme_emoji_icon_nature" id="0x7f040378" />
-    <public type="attr" name="theme_emoji_icon_objects" id="0x7f040379" />
-    <public type="attr" name="theme_emoji_icon_people" id="0x7f04037a" />
-    <public type="attr" name="theme_emoji_icon_recent" id="0x7f04037b" />
-    <public type="attr" name="theme_emoji_icon_symbols" id="0x7f04037c" />
-    <public type="attr" name="theme_emoji_icon_travel" id="0x7f04037d" />
-    <public type="attr" name="theme_emoji_placeholder" id="0x7f04037e" />
-    <public type="attr" name="theme_emoji_settings_empty" id="0x7f04037f" />
-    <public type="attr" name="theme_friends_add_icon" id="0x7f040380" />
-    <public type="attr" name="theme_friends_divider" id="0x7f040381" />
-    <public type="attr" name="theme_friends_new_group_icon" id="0x7f040382" />
-    <public type="attr" name="theme_friends_no_block" id="0x7f040383" />
-    <public type="attr" name="theme_friends_no_friends" id="0x7f040384" />
-    <public type="attr" name="theme_friends_no_online" id="0x7f040385" />
-    <public type="attr" name="theme_friends_no_request" id="0x7f040386" />
-    <public type="attr" name="theme_friends_no_suggestions" id="0x7f040387" />
-    <public type="attr" name="theme_friends_pending_tab_text_color" id="0x7f040388" />
-    <public type="attr" name="theme_friends_profile_icon" id="0x7f040389" />
-    <public type="attr" name="theme_friends_tab_mentions" id="0x7f04038a" />
-    <public type="attr" name="theme_group_members_icon" id="0x7f04038b" />
-    <public type="attr" name="theme_group_start_call_icon" id="0x7f04038c" />
-    <public type="attr" name="theme_group_start_video_icon" id="0x7f04038d" />
-    <public type="attr" name="theme_name" id="0x7f04038e" />
-    <public type="attr" name="theme_overlay_mentions_oval" id="0x7f04038f" />
-    <public type="attr" name="theme_search_back_arrow" id="0x7f040390" />
-    <public type="attr" name="theme_search_broken_results" id="0x7f040391" />
-    <public type="attr" name="theme_search_clear_icon" id="0x7f040392" />
-    <public type="attr" name="theme_search_empty_asset" id="0x7f040393" />
-    <public type="attr" name="theme_search_empty_asset_alternate" id="0x7f040394" />
-    <public type="attr" name="theme_search_indexing_animation" id="0x7f040395" />
-    <public type="attr" name="theme_search_menu_icon" id="0x7f040396" />
-    <public type="attr" name="theme_search_suggestion_header_text_color" id="0x7f040397" />
-    <public type="attr" name="theme_search_suggestion_icon_attachment" id="0x7f040398" />
-    <public type="attr" name="theme_search_suggestion_icon_channel" id="0x7f040399" />
-    <public type="attr" name="theme_search_suggestion_icon_clear_history" id="0x7f04039a" />
-    <public type="attr" name="theme_search_suggestion_icon_embed" id="0x7f04039b" />
-    <public type="attr" name="theme_search_suggestion_icon_history" id="0x7f04039c" />
-    <public type="attr" name="theme_search_suggestion_icon_image" id="0x7f04039d" />
-    <public type="attr" name="theme_search_suggestion_icon_link" id="0x7f04039e" />
-    <public type="attr" name="theme_search_suggestion_icon_mentions" id="0x7f04039f" />
-    <public type="attr" name="theme_search_suggestion_icon_people" id="0x7f0403a0" />
-    <public type="attr" name="theme_search_suggestion_icon_sound" id="0x7f0403a1" />
-    <public type="attr" name="theme_search_suggestion_icon_video" id="0x7f0403a2" />
-    <public type="attr" name="theme_search_suggestion_text_color_primary" id="0x7f0403a3" />
-    <public type="attr" name="theme_search_suggestion_text_color_secondary" id="0x7f0403a4" />
-    <public type="attr" name="theme_status_indicator_color" id="0x7f0403a5" />
-    <public type="attr" name="thickness" id="0x7f0403a6" />
-    <public type="attr" name="thumbTextPadding" id="0x7f0403a7" />
-    <public type="attr" name="thumbTint" id="0x7f0403a8" />
-    <public type="attr" name="thumbTintMode" id="0x7f0403a9" />
-    <public type="attr" name="tickMark" id="0x7f0403aa" />
-    <public type="attr" name="tickMarkTint" id="0x7f0403ab" />
-    <public type="attr" name="tickMarkTintMode" id="0x7f0403ac" />
-    <public type="attr" name="tint" id="0x7f0403ad" />
-    <public type="attr" name="tintMode" id="0x7f0403ae" />
-    <public type="attr" name="title" id="0x7f0403af" />
-    <public type="attr" name="titleEnabled" id="0x7f0403b0" />
-    <public type="attr" name="titleMargin" id="0x7f0403b1" />
-    <public type="attr" name="titleMarginBottom" id="0x7f0403b2" />
-    <public type="attr" name="titleMarginEnd" id="0x7f0403b3" />
-    <public type="attr" name="titleMarginStart" id="0x7f0403b4" />
-    <public type="attr" name="titleMarginTop" id="0x7f0403b5" />
-    <public type="attr" name="titleMargins" id="0x7f0403b6" />
-    <public type="attr" name="titleTextAppearance" id="0x7f0403b7" />
-    <public type="attr" name="titleTextColor" id="0x7f0403b8" />
-    <public type="attr" name="titleTextStyle" id="0x7f0403b9" />
-    <public type="attr" name="toolbarId" id="0x7f0403ba" />
-    <public type="attr" name="toolbarNavigationButtonStyle" id="0x7f0403bb" />
-    <public type="attr" name="toolbarStyle" id="0x7f0403bc" />
-    <public type="attr" name="tooltipForegroundColor" id="0x7f0403bd" />
-    <public type="attr" name="tooltipFrameBackground" id="0x7f0403be" />
-    <public type="attr" name="tooltipText" id="0x7f0403bf" />
-    <public type="attr" name="track" id="0x7f0403c0" />
-    <public type="attr" name="trackTint" id="0x7f0403c1" />
-    <public type="attr" name="trackTintMode" id="0x7f0403c2" />
-    <public type="attr" name="ttcIndex" id="0x7f0403c3" />
-    <public type="attr" name="tv_markdown_enabled" id="0x7f0403c4" />
-    <public type="attr" name="tv_plural" id="0x7f0403c5" />
-    <public type="attr" name="tv_plural_quantity" id="0x7f0403c6" />
-    <public type="attr" name="ucrop_artv_ratio_title" id="0x7f0403c7" />
-    <public type="attr" name="ucrop_artv_ratio_x" id="0x7f0403c8" />
-    <public type="attr" name="ucrop_artv_ratio_y" id="0x7f0403c9" />
-    <public type="attr" name="ucrop_aspect_ratio_x" id="0x7f0403ca" />
-    <public type="attr" name="ucrop_aspect_ratio_y" id="0x7f0403cb" />
-    <public type="attr" name="ucrop_circle_dimmed_layer" id="0x7f0403cc" />
-    <public type="attr" name="ucrop_dimmed_color" id="0x7f0403cd" />
-    <public type="attr" name="ucrop_frame_color" id="0x7f0403ce" />
-    <public type="attr" name="ucrop_frame_stroke_size" id="0x7f0403cf" />
-    <public type="attr" name="ucrop_grid_color" id="0x7f0403d0" />
-    <public type="attr" name="ucrop_grid_column_count" id="0x7f0403d1" />
-    <public type="attr" name="ucrop_grid_row_count" id="0x7f0403d2" />
-    <public type="attr" name="ucrop_grid_stroke_size" id="0x7f0403d3" />
-    <public type="attr" name="ucrop_show_frame" id="0x7f0403d4" />
-    <public type="attr" name="ucrop_show_grid" id="0x7f0403d5" />
-    <public type="attr" name="ucrop_show_oval_crop_frame" id="0x7f0403d6" />
-    <public type="attr" name="useCompatPadding" id="0x7f0403d7" />
-    <public type="attr" name="user_avatar_size" id="0x7f0403d8" />
-    <public type="attr" name="vcpv_is_overlay" id="0x7f0403d9" />
-    <public type="attr" name="vcpv_match_video_orientation" id="0x7f0403da" />
-    <public type="attr" name="viewAspectRatio" id="0x7f0403db" />
-    <public type="attr" name="viewInflaterClass" id="0x7f0403dc" />
-    <public type="attr" name="voiceIcon" id="0x7f0403dd" />
-    <public type="attr" name="vuv_avatar_size" id="0x7f0403de" />
-    <public type="attr" name="windowActionBar" id="0x7f0403df" />
-    <public type="attr" name="windowActionBarOverlay" id="0x7f0403e0" />
-    <public type="attr" name="windowActionModeOverlay" id="0x7f0403e1" />
-    <public type="attr" name="windowFixedHeightMajor" id="0x7f0403e2" />
-    <public type="attr" name="windowFixedHeightMinor" id="0x7f0403e3" />
-    <public type="attr" name="windowFixedWidthMajor" id="0x7f0403e4" />
-    <public type="attr" name="windowFixedWidthMinor" id="0x7f0403e5" />
-    <public type="attr" name="windowMinWidthMajor" id="0x7f0403e6" />
-    <public type="attr" name="windowMinWidthMinor" id="0x7f0403e7" />
-    <public type="attr" name="windowNoTitle" id="0x7f0403e8" />
+    <public type="attr" name="bg_pressed_highlight" id="0x7f040062" />
+    <public type="attr" name="boost_confirmation_card_bg" id="0x7f040063" />
+    <public type="attr" name="boosted_guild_tier_0" id="0x7f040064" />
+    <public type="attr" name="borderWidth" id="0x7f040065" />
+    <public type="attr" name="borderlessButtonStyle" id="0x7f040066" />
+    <public type="attr" name="bottomAppBarStyle" id="0x7f040067" />
+    <public type="attr" name="bottomNavigationStyle" id="0x7f040068" />
+    <public type="attr" name="bottomSheetDialogTheme" id="0x7f040069" />
+    <public type="attr" name="bottomSheetStyle" id="0x7f04006a" />
+    <public type="attr" name="boxBackgroundColor" id="0x7f04006b" />
+    <public type="attr" name="boxBackgroundMode" id="0x7f04006c" />
+    <public type="attr" name="boxCollapsedPaddingTop" id="0x7f04006d" />
+    <public type="attr" name="boxCornerRadiusBottomEnd" id="0x7f04006e" />
+    <public type="attr" name="boxCornerRadiusBottomStart" id="0x7f04006f" />
+    <public type="attr" name="boxCornerRadiusTopEnd" id="0x7f040070" />
+    <public type="attr" name="boxCornerRadiusTopStart" id="0x7f040071" />
+    <public type="attr" name="boxStrokeColor" id="0x7f040072" />
+    <public type="attr" name="boxStrokeWidth" id="0x7f040073" />
+    <public type="attr" name="boxed_text" id="0x7f040074" />
+    <public type="attr" name="buttonBarButtonStyle" id="0x7f040075" />
+    <public type="attr" name="buttonBarNegativeButtonStyle" id="0x7f040076" />
+    <public type="attr" name="buttonBarNeutralButtonStyle" id="0x7f040077" />
+    <public type="attr" name="buttonBarPositiveButtonStyle" id="0x7f040078" />
+    <public type="attr" name="buttonBarStyle" id="0x7f040079" />
+    <public type="attr" name="buttonGravity" id="0x7f04007a" />
+    <public type="attr" name="buttonIconDimen" id="0x7f04007b" />
+    <public type="attr" name="buttonPanelSideLayout" id="0x7f04007c" />
+    <public type="attr" name="buttonSize" id="0x7f04007d" />
+    <public type="attr" name="buttonStyle" id="0x7f04007e" />
+    <public type="attr" name="buttonStyleSmall" id="0x7f04007f" />
+    <public type="attr" name="buttonTint" id="0x7f040080" />
+    <public type="attr" name="buttonTintMode" id="0x7f040081" />
+    <public type="attr" name="cardBackgroundColor" id="0x7f040082" />
+    <public type="attr" name="cardCornerRadius" id="0x7f040083" />
+    <public type="attr" name="cardElevation" id="0x7f040084" />
+    <public type="attr" name="cardMaxElevation" id="0x7f040085" />
+    <public type="attr" name="cardPreventCornerOverlap" id="0x7f040086" />
+    <public type="attr" name="cardUseCompatPadding" id="0x7f040087" />
+    <public type="attr" name="cardViewStyle" id="0x7f040088" />
+    <public type="attr" name="card_bg" id="0x7f040089" />
+    <public type="attr" name="chainUseRtl" id="0x7f04008a" />
+    <public type="attr" name="chat_embed_bg" id="0x7f04008b" />
+    <public type="attr" name="chat_typing_bg" id="0x7f04008c" />
+    <public type="attr" name="checkboxStyle" id="0x7f04008d" />
+    <public type="attr" name="checkedChip" id="0x7f04008e" />
+    <public type="attr" name="checkedIcon" id="0x7f04008f" />
+    <public type="attr" name="checkedIconEnabled" id="0x7f040090" />
+    <public type="attr" name="checkedIconVisible" id="0x7f040091" />
+    <public type="attr" name="checkedTextViewStyle" id="0x7f040092" />
+    <public type="attr" name="chipBackgroundColor" id="0x7f040093" />
+    <public type="attr" name="chipCornerRadius" id="0x7f040094" />
+    <public type="attr" name="chipEndPadding" id="0x7f040095" />
+    <public type="attr" name="chipGroupStyle" id="0x7f040096" />
+    <public type="attr" name="chipIcon" id="0x7f040097" />
+    <public type="attr" name="chipIconEnabled" id="0x7f040098" />
+    <public type="attr" name="chipIconSize" id="0x7f040099" />
+    <public type="attr" name="chipIconTint" id="0x7f04009a" />
+    <public type="attr" name="chipIconVisible" id="0x7f04009b" />
+    <public type="attr" name="chipMinHeight" id="0x7f04009c" />
+    <public type="attr" name="chipSpacing" id="0x7f04009d" />
+    <public type="attr" name="chipSpacingHorizontal" id="0x7f04009e" />
+    <public type="attr" name="chipSpacingVertical" id="0x7f04009f" />
+    <public type="attr" name="chipStandaloneStyle" id="0x7f0400a0" />
+    <public type="attr" name="chipStartPadding" id="0x7f0400a1" />
+    <public type="attr" name="chipStrokeColor" id="0x7f0400a2" />
+    <public type="attr" name="chipStrokeWidth" id="0x7f0400a3" />
+    <public type="attr" name="chipStyle" id="0x7f0400a4" />
+    <public type="attr" name="circleCrop" id="0x7f0400a5" />
+    <public type="attr" name="closeIcon" id="0x7f0400a6" />
+    <public type="attr" name="closeIconEnabled" id="0x7f0400a7" />
+    <public type="attr" name="closeIconEndPadding" id="0x7f0400a8" />
+    <public type="attr" name="closeIconSize" id="0x7f0400a9" />
+    <public type="attr" name="closeIconStartPadding" id="0x7f0400aa" />
+    <public type="attr" name="closeIconTint" id="0x7f0400ab" />
+    <public type="attr" name="closeIconVisible" id="0x7f0400ac" />
+    <public type="attr" name="closeItemLayout" id="0x7f0400ad" />
+    <public type="attr" name="collapseContentDescription" id="0x7f0400ae" />
+    <public type="attr" name="collapseIcon" id="0x7f0400af" />
+    <public type="attr" name="collapsedTitleGravity" id="0x7f0400b0" />
+    <public type="attr" name="collapsedTitleTextAppearance" id="0x7f0400b1" />
+    <public type="attr" name="color" id="0x7f0400b2" />
+    <public type="attr" name="colorAccent" id="0x7f0400b3" />
+    <public type="attr" name="colorBackgroundFloating" id="0x7f0400b4" />
+    <public type="attr" name="colorButtonNormal" id="0x7f0400b5" />
+    <public type="attr" name="colorControlActivated" id="0x7f0400b6" />
+    <public type="attr" name="colorControlHighlight" id="0x7f0400b7" />
+    <public type="attr" name="colorControlNormal" id="0x7f0400b8" />
+    <public type="attr" name="colorError" id="0x7f0400b9" />
+    <public type="attr" name="colorPrimary" id="0x7f0400ba" />
+    <public type="attr" name="colorPrimaryBg" id="0x7f0400bb" />
+    <public type="attr" name="colorPrimaryCircle" id="0x7f0400bc" />
+    <public type="attr" name="colorPrimaryDark" id="0x7f0400bd" />
+    <public type="attr" name="colorPrimaryDivider" id="0x7f0400be" />
+    <public type="attr" name="colorPrimaryTabs" id="0x7f0400bf" />
+    <public type="attr" name="colorScheme" id="0x7f0400c0" />
+    <public type="attr" name="colorSecondary" id="0x7f0400c1" />
+    <public type="attr" name="colorSwitchThumbNormal" id="0x7f0400c2" />
+    <public type="attr" name="commitIcon" id="0x7f0400c3" />
+    <public type="attr" name="constraintSet" id="0x7f0400c4" />
+    <public type="attr" name="constraint_referenced_ids" id="0x7f0400c5" />
+    <public type="attr" name="container_bg_dark_a60" id="0x7f0400c6" />
+    <public type="attr" name="content" id="0x7f0400c7" />
+    <public type="attr" name="contentDescription" id="0x7f0400c8" />
+    <public type="attr" name="contentInsetEnd" id="0x7f0400c9" />
+    <public type="attr" name="contentInsetEndWithActions" id="0x7f0400ca" />
+    <public type="attr" name="contentInsetLeft" id="0x7f0400cb" />
+    <public type="attr" name="contentInsetRight" id="0x7f0400cc" />
+    <public type="attr" name="contentInsetStart" id="0x7f0400cd" />
+    <public type="attr" name="contentInsetStartWithNavigation" id="0x7f0400ce" />
+    <public type="attr" name="contentPadding" id="0x7f0400cf" />
+    <public type="attr" name="contentPaddingBottom" id="0x7f0400d0" />
+    <public type="attr" name="contentPaddingLeft" id="0x7f0400d1" />
+    <public type="attr" name="contentPaddingRight" id="0x7f0400d2" />
+    <public type="attr" name="contentPaddingTop" id="0x7f0400d3" />
+    <public type="attr" name="contentScrim" id="0x7f0400d4" />
+    <public type="attr" name="controlBackground" id="0x7f0400d5" />
+    <public type="attr" name="coordinatorLayoutStyle" id="0x7f0400d6" />
+    <public type="attr" name="cornerRadius" id="0x7f0400d7" />
+    <public type="attr" name="counterEnabled" id="0x7f0400d8" />
+    <public type="attr" name="counterMaxLength" id="0x7f0400d9" />
+    <public type="attr" name="counterOverflowTextAppearance" id="0x7f0400da" />
+    <public type="attr" name="counterTextAppearance" id="0x7f0400db" />
+    <public type="attr" name="cs_background" id="0x7f0400dc" />
+    <public type="attr" name="cs_drawable_bottom" id="0x7f0400dd" />
+    <public type="attr" name="cs_drawable_left" id="0x7f0400de" />
+    <public type="attr" name="cs_drawable_padding" id="0x7f0400df" />
+    <public type="attr" name="cs_drawable_right" id="0x7f0400e0" />
+    <public type="attr" name="cs_drawable_top" id="0x7f0400e1" />
+    <public type="attr" name="cs_subtext" id="0x7f0400e2" />
+    <public type="attr" name="cs_subtext_color" id="0x7f0400e3" />
+    <public type="attr" name="cs_subtext_size" id="0x7f0400e4" />
+    <public type="attr" name="cs_text" id="0x7f0400e5" />
+    <public type="attr" name="cs_text_color" id="0x7f0400e6" />
+    <public type="attr" name="cs_text_fontpath" id="0x7f0400e7" />
+    <public type="attr" name="cs_text_size" id="0x7f0400e8" />
+    <public type="attr" name="cs_view_type" id="0x7f0400e9" />
+    <public type="attr" name="customNavigationLayout" id="0x7f0400ea" />
+    <public type="attr" name="cv_bg_color" id="0x7f0400eb" />
+    <public type="attr" name="cv_bg_color_clicked" id="0x7f0400ec" />
+    <public type="attr" name="cv_bg_color_error_clicked" id="0x7f0400ed" />
+    <public type="attr" name="cv_chip_layout" id="0x7f0400ee" />
+    <public type="attr" name="cv_color" id="0x7f0400ef" />
+    <public type="attr" name="cv_color_clicked" id="0x7f0400f0" />
+    <public type="attr" name="cv_color_error_clicked" id="0x7f0400f1" />
+    <public type="attr" name="cv_dialog_cancel" id="0x7f0400f2" />
+    <public type="attr" name="cv_dialog_confirm" id="0x7f0400f3" />
+    <public type="attr" name="cv_dialog_error_msg" id="0x7f0400f4" />
+    <public type="attr" name="cv_dialog_et_placeholder" id="0x7f0400f5" />
+    <public type="attr" name="cv_dialog_title" id="0x7f0400f6" />
+    <public type="attr" name="cv_icon_delete" id="0x7f0400f7" />
+    <public type="attr" name="cv_icon_placeholder" id="0x7f0400f8" />
+    <public type="attr" name="cv_max_height" id="0x7f0400f9" />
+    <public type="attr" name="cv_search_text_color" id="0x7f0400fa" />
+    <public type="attr" name="cv_search_text_size" id="0x7f0400fb" />
+    <public type="attr" name="cv_text_color" id="0x7f0400fc" />
+    <public type="attr" name="cv_text_color_clicked" id="0x7f0400fd" />
+    <public type="attr" name="cv_text_color_error_clicked" id="0x7f0400fe" />
+    <public type="attr" name="cv_vertical_spacing" id="0x7f0400ff" />
+    <public type="attr" name="defaultQueryHint" id="0x7f040100" />
+    <public type="attr" name="dialogCornerRadius" id="0x7f040101" />
+    <public type="attr" name="dialogPreferredPadding" id="0x7f040102" />
+    <public type="attr" name="dialogTheme" id="0x7f040103" />
+    <public type="attr" name="displayOptions" id="0x7f040104" />
+    <public type="attr" name="divider" id="0x7f040105" />
+    <public type="attr" name="dividerDrawable" id="0x7f040106" />
+    <public type="attr" name="dividerDrawableHorizontal" id="0x7f040107" />
+    <public type="attr" name="dividerDrawableVertical" id="0x7f040108" />
+    <public type="attr" name="dividerHorizontal" id="0x7f040109" />
+    <public type="attr" name="dividerPadding" id="0x7f04010a" />
+    <public type="attr" name="dividerVertical" id="0x7f04010b" />
+    <public type="attr" name="drawableSize" id="0x7f04010c" />
+    <public type="attr" name="drawerArrowStyle" id="0x7f04010d" />
+    <public type="attr" name="drawerLayoutStyle" id="0x7f04010e" />
+    <public type="attr" name="dropDownListViewStyle" id="0x7f04010f" />
+    <public type="attr" name="dropdownListPreferredItemHeight" id="0x7f040110" />
+    <public type="attr" name="editTextBackground" id="0x7f040111" />
+    <public type="attr" name="editTextColor" id="0x7f040112" />
+    <public type="attr" name="editTextStyle" id="0x7f040113" />
+    <public type="attr" name="elevation" id="0x7f040114" />
+    <public type="attr" name="emptyVisibility" id="0x7f040115" />
+    <public type="attr" name="enforceMaterialTheme" id="0x7f040116" />
+    <public type="attr" name="enforceTextAppearance" id="0x7f040117" />
+    <public type="attr" name="errorEnabled" id="0x7f040118" />
+    <public type="attr" name="errorTextAppearance" id="0x7f040119" />
+    <public type="attr" name="expandActivityOverflowButtonDrawable" id="0x7f04011a" />
+    <public type="attr" name="expanded" id="0x7f04011b" />
+    <public type="attr" name="expandedTitleGravity" id="0x7f04011c" />
+    <public type="attr" name="expandedTitleMargin" id="0x7f04011d" />
+    <public type="attr" name="expandedTitleMarginBottom" id="0x7f04011e" />
+    <public type="attr" name="expandedTitleMarginEnd" id="0x7f04011f" />
+    <public type="attr" name="expandedTitleMarginStart" id="0x7f040120" />
+    <public type="attr" name="expandedTitleMarginTop" id="0x7f040121" />
+    <public type="attr" name="expandedTitleTextAppearance" id="0x7f040122" />
+    <public type="attr" name="fabAlignmentMode" id="0x7f040123" />
+    <public type="attr" name="fabCradleMargin" id="0x7f040124" />
+    <public type="attr" name="fabCradleRoundedCornerRadius" id="0x7f040125" />
+    <public type="attr" name="fabCradleVerticalOffset" id="0x7f040126" />
+    <public type="attr" name="fabCustomSize" id="0x7f040127" />
+    <public type="attr" name="fabSize" id="0x7f040128" />
+    <public type="attr" name="facing" id="0x7f040129" />
+    <public type="attr" name="fadeDuration" id="0x7f04012a" />
+    <public type="attr" name="failureImage" id="0x7f04012b" />
+    <public type="attr" name="failureImageScaleType" id="0x7f04012c" />
+    <public type="attr" name="fastScrollEnabled" id="0x7f04012d" />
+    <public type="attr" name="fastScrollHorizontalThumbDrawable" id="0x7f04012e" />
+    <public type="attr" name="fastScrollHorizontalTrackDrawable" id="0x7f04012f" />
+    <public type="attr" name="fastScrollVerticalThumbDrawable" id="0x7f040130" />
+    <public type="attr" name="fastScrollVerticalTrackDrawable" id="0x7f040131" />
+    <public type="attr" name="fgl_max_linear_views" id="0x7f040132" />
+    <public type="attr" name="firstBaselineToTopHeight" id="0x7f040133" />
+    <public type="attr" name="fl_horizontal_spacing" id="0x7f040134" />
+    <public type="attr" name="fl_vertical_spacing" id="0x7f040135" />
+    <public type="attr" name="flash" id="0x7f040136" />
+    <public type="attr" name="flexDirection" id="0x7f040137" />
+    <public type="attr" name="flexInputAddContentLauncherTitle" id="0x7f040138" />
+    <public type="attr" name="flexInputColorHighlight" id="0x7f040139" />
+    <public type="attr" name="flexInputDialogBackground" id="0x7f04013a" />
+    <public type="attr" name="flexInputIconColor" id="0x7f04013b" />
+    <public type="attr" name="flexInputIconColorActivated" id="0x7f04013c" />
+    <public type="attr" name="flexInputIconColorDisabled" id="0x7f04013d" />
+    <public type="attr" name="flexWrap" id="0x7f04013e" />
+    <public type="attr" name="floatingActionButtonStyle" id="0x7f04013f" />
+    <public type="attr" name="font" id="0x7f040140" />
+    <public type="attr" name="fontFamily" id="0x7f040141" />
+    <public type="attr" name="fontProviderAuthority" id="0x7f040142" />
+    <public type="attr" name="fontProviderCerts" id="0x7f040143" />
+    <public type="attr" name="fontProviderFetchStrategy" id="0x7f040144" />
+    <public type="attr" name="fontProviderFetchTimeout" id="0x7f040145" />
+    <public type="attr" name="fontProviderPackage" id="0x7f040146" />
+    <public type="attr" name="fontProviderQuery" id="0x7f040147" />
+    <public type="attr" name="fontStyle" id="0x7f040148" />
+    <public type="attr" name="fontVariationSettings" id="0x7f040149" />
+    <public type="attr" name="fontWeight" id="0x7f04014a" />
+    <public type="attr" name="foregroundInsidePadding" id="0x7f04014b" />
+    <public type="attr" name="gapBetweenBars" id="0x7f04014c" />
+    <public type="attr" name="gift_code_copied_outline" id="0x7f04014d" />
+    <public type="attr" name="gift_embed_disabled_button_text_color" id="0x7f04014e" />
+    <public type="attr" name="gift_embed_gradient_overlay" id="0x7f04014f" />
+    <public type="attr" name="gift_nitro_splash" id="0x7f040150" />
+    <public type="attr" name="goIcon" id="0x7f040151" />
+    <public type="attr" name="gradient_invite_splash" id="0x7f040152" />
+    <public type="attr" name="guild_boost_badge_tier_1" id="0x7f040153" />
+    <public type="attr" name="guild_boost_badge_tier_2" id="0x7f040154" />
+    <public type="attr" name="guild_boost_badge_tier_3" id="0x7f040155" />
+    <public type="attr" name="gv_image_request_size" id="0x7f040156" />
+    <public type="attr" name="headerLayout" id="0x7f040157" />
+    <public type="attr" name="height" id="0x7f040158" />
+    <public type="attr" name="helperText" id="0x7f040159" />
+    <public type="attr" name="helperTextEnabled" id="0x7f04015a" />
+    <public type="attr" name="helperTextTextAppearance" id="0x7f04015b" />
+    <public type="attr" name="hideMotionSpec" id="0x7f04015c" />
+    <public type="attr" name="hideOnContentScroll" id="0x7f04015d" />
+    <public type="attr" name="hideOnScroll" id="0x7f04015e" />
+    <public type="attr" name="hint" id="0x7f04015f" />
+    <public type="attr" name="hintAnimationEnabled" id="0x7f040160" />
+    <public type="attr" name="hintColor" id="0x7f040161" />
+    <public type="attr" name="hintEnabled" id="0x7f040162" />
+    <public type="attr" name="hintTextAppearance" id="0x7f040163" />
+    <public type="attr" name="homeAsUpIndicator" id="0x7f040164" />
+    <public type="attr" name="homeLayout" id="0x7f040165" />
+    <public type="attr" name="hoveredFocusedTranslationZ" id="0x7f040166" />
+    <public type="attr" name="ic_account" id="0x7f040167" />
+    <public type="attr" name="ic_action_bar_back" id="0x7f040168" />
+    <public type="attr" name="ic_action_bar_close" id="0x7f040169" />
+    <public type="attr" name="ic_add_circle_outline" id="0x7f04016a" />
+    <public type="attr" name="ic_add_reaction" id="0x7f04016b" />
+    <public type="attr" name="ic_audit_all" id="0x7f04016c" />
+    <public type="attr" name="ic_audit_channel" id="0x7f04016d" />
+    <public type="attr" name="ic_audit_emoji" id="0x7f04016e" />
+    <public type="attr" name="ic_audit_invite" id="0x7f04016f" />
+    <public type="attr" name="ic_audit_logs" id="0x7f040170" />
+    <public type="attr" name="ic_audit_member" id="0x7f040171" />
+    <public type="attr" name="ic_audit_message" id="0x7f040172" />
+    <public type="attr" name="ic_audit_role" id="0x7f040173" />
+    <public type="attr" name="ic_audit_server" id="0x7f040174" />
+    <public type="attr" name="ic_audit_webhook" id="0x7f040175" />
+    <public type="attr" name="ic_authed_apps_a60" id="0x7f040176" />
+    <public type="attr" name="ic_bans_a60" id="0x7f040177" />
+    <public type="attr" name="ic_behavior_a60" id="0x7f040178" />
+    <public type="attr" name="ic_billing_a60" id="0x7f040179" />
+    <public type="attr" name="ic_call_participants" id="0x7f04017a" />
+    <public type="attr" name="ic_camera_disabled" id="0x7f04017b" />
+    <public type="attr" name="ic_camera_enabled" id="0x7f04017c" />
+    <public type="attr" name="ic_category" id="0x7f04017d" />
+    <public type="attr" name="ic_channel_mute" id="0x7f04017e" />
+    <public type="attr" name="ic_channel_muted" id="0x7f04017f" />
+    <public type="attr" name="ic_channel_text" id="0x7f040180" />
+    <public type="attr" name="ic_channels_a60" id="0x7f040181" />
+    <public type="attr" name="ic_chat_bubble" id="0x7f040182" />
+    <public type="attr" name="ic_close_24dp" id="0x7f040183" />
+    <public type="attr" name="ic_copy" id="0x7f040184" />
+    <public type="attr" name="ic_defean_state" id="0x7f040185" />
+    <public type="attr" name="ic_delete" id="0x7f040186" />
+    <public type="attr" name="ic_delete_sweep" id="0x7f040187" />
+    <public type="attr" name="ic_drag_handle" id="0x7f040188" />
+    <public type="attr" name="ic_edit" id="0x7f040189" />
+    <public type="attr" name="ic_end_audio_call" id="0x7f04018a" />
+    <public type="attr" name="ic_exit_to_app" id="0x7f04018b" />
+    <public type="attr" name="ic_expand_up" id="0x7f04018c" />
+    <public type="attr" name="ic_file_download_opaque" id="0x7f04018d" />
+    <public type="attr" name="ic_filter_list" id="0x7f04018e" />
+    <public type="attr" name="ic_game_icon_placeholder" id="0x7f04018f" />
+    <public type="attr" name="ic_games_a60" id="0x7f040190" />
+    <public type="attr" name="ic_headset" id="0x7f040191" />
+    <public type="attr" name="ic_headset_deafened" id="0x7f040192" />
+    <public type="attr" name="ic_help_a60" id="0x7f040193" />
+    <public type="attr" name="ic_info_a60" id="0x7f040194" />
+    <public type="attr" name="ic_insert_drive_file" id="0x7f040195" />
+    <public type="attr" name="ic_integrations_a60" id="0x7f040196" />
+    <public type="attr" name="ic_invites_a60" id="0x7f040197" />
+    <public type="attr" name="ic_link_a60" id="0x7f040198" />
+    <public type="attr" name="ic_locale_a60" id="0x7f040199" />
+    <public type="attr" name="ic_lock" id="0x7f04019a" />
+    <public type="attr" name="ic_members_a60" id="0x7f04019b" />
+    <public type="attr" name="ic_menu_private" id="0x7f04019c" />
+    <public type="attr" name="ic_mic" id="0x7f04019d" />
+    <public type="attr" name="ic_mic_muted" id="0x7f04019e" />
+    <public type="attr" name="ic_mic_state" id="0x7f04019f" />
+    <public type="attr" name="ic_my_account_a60" id="0x7f0401a0" />
+    <public type="attr" name="ic_notifications_a60" id="0x7f0401a1" />
+    <public type="attr" name="ic_open_in_browser_opaque" id="0x7f0401a2" />
+    <public type="attr" name="ic_open_in_new" id="0x7f0401a3" />
+    <public type="attr" name="ic_open_in_new_24dp" id="0x7f0401a4" />
+    <public type="attr" name="ic_overlay" id="0x7f0401a5" />
+    <public type="attr" name="ic_overview_a60" id="0x7f0401a6" />
+    <public type="attr" name="ic_person" id="0x7f0401a7" />
+    <public type="attr" name="ic_person_add" id="0x7f0401a8" />
+    <public type="attr" name="ic_person_add_new" id="0x7f0401a9" />
+    <public type="attr" name="ic_phonelink_a60" id="0x7f0401aa" />
+    <public type="attr" name="ic_pins_a60" id="0x7f0401ab" />
+    <public type="attr" name="ic_plus_a60" id="0x7f0401ac" />
+    <public type="attr" name="ic_popup_settings" id="0x7f0401ad" />
+    <public type="attr" name="ic_privacy_a60" id="0x7f0401ae" />
+    <public type="attr" name="ic_reactions" id="0x7f0401af" />
+    <public type="attr" name="ic_refresh" id="0x7f0401b0" />
+    <public type="attr" name="ic_roles_a60" id="0x7f0401b1" />
+    <public type="attr" name="ic_security_a60" id="0x7f0401b2" />
+    <public type="attr" name="ic_send" id="0x7f0401b3" />
+    <public type="attr" name="ic_settings" id="0x7f0401b4" />
+    <public type="attr" name="ic_settings_boost_a60" id="0x7f0401b5" />
+    <public type="attr" name="ic_settings_gifting_a60" id="0x7f0401b6" />
+    <public type="attr" name="ic_share" id="0x7f0401b7" />
+    <public type="attr" name="ic_share_opaque" id="0x7f0401b8" />
+    <public type="attr" name="ic_slowmode_timer" id="0x7f0401b9" />
+    <public type="attr" name="ic_sort" id="0x7f0401ba" />
+    <public type="attr" name="ic_speaker_state" id="0x7f0401bb" />
+    <public type="attr" name="ic_swap_vertical_circle" id="0x7f0401bc" />
+    <public type="attr" name="ic_switch_camera" id="0x7f0401bd" />
+    <public type="attr" name="ic_text_image_a60" id="0x7f0401be" />
+    <public type="attr" name="ic_theme_a60" id="0x7f0401bf" />
+    <public type="attr" name="ic_timer" id="0x7f0401c0" />
+    <public type="attr" name="ic_uploads_file" id="0x7f0401c1" />
+    <public type="attr" name="ic_uploads_generic" id="0x7f0401c2" />
+    <public type="attr" name="ic_uploads_image" id="0x7f0401c3" />
+    <public type="attr" name="ic_uploads_video" id="0x7f0401c4" />
+    <public type="attr" name="ic_visibility" id="0x7f0401c5" />
+    <public type="attr" name="ic_visibility_off" id="0x7f0401c6" />
+    <public type="attr" name="ic_voice_settings_a60" id="0x7f0401c7" />
+    <public type="attr" name="ic_volume" id="0x7f0401c8" />
+    <public type="attr" name="icon" id="0x7f0401c9" />
+    <public type="attr" name="iconEndPadding" id="0x7f0401ca" />
+    <public type="attr" name="iconGravity" id="0x7f0401cb" />
+    <public type="attr" name="iconPadding" id="0x7f0401cc" />
+    <public type="attr" name="iconSize" id="0x7f0401cd" />
+    <public type="attr" name="iconStartPadding" id="0x7f0401ce" />
+    <public type="attr" name="iconTint" id="0x7f0401cf" />
+    <public type="attr" name="iconTintMode" id="0x7f0401d0" />
+    <public type="attr" name="iconifiedByDefault" id="0x7f0401d1" />
+    <public type="attr" name="imageAspectRatio" id="0x7f0401d2" />
+    <public type="attr" name="imageAspectRatioAdjust" id="0x7f0401d3" />
+    <public type="attr" name="imageButtonStyle" id="0x7f0401d4" />
+    <public type="attr" name="img_addfriends_empty" id="0x7f0401d5" />
+    <public type="attr" name="img_addfriends_notconnected" id="0x7f0401d6" />
+    <public type="attr" name="img_baddies" id="0x7f0401d7" />
+    <public type="attr" name="img_chat_channel_less" id="0x7f0401d8" />
+    <public type="attr" name="img_chat_nsfw" id="0x7f0401d9" />
+    <public type="attr" name="img_empty_search" id="0x7f0401da" />
+    <public type="attr" name="img_empty_search_global" id="0x7f0401db" />
+    <public type="attr" name="img_empty_server_invites" id="0x7f0401dc" />
+    <public type="attr" name="img_forced_update" id="0x7f0401dd" />
+    <public type="attr" name="img_gifting_pattern_bg" id="0x7f0401de" />
+    <public type="attr" name="img_logo_discord_nitro" id="0x7f0401df" />
+    <public type="attr" name="img_logo_discord_nitro_classic" id="0x7f0401e0" />
+    <public type="attr" name="img_mfa" id="0x7f0401e1" />
+    <public type="attr" name="img_new_tos" id="0x7f0401e2" />
+    <public type="attr" name="img_no_mutual_friends" id="0x7f0401e3" />
+    <public type="attr" name="img_no_mutual_servers" id="0x7f0401e4" />
+    <public type="attr" name="img_poop" id="0x7f0401e5" />
+    <public type="attr" name="img_thumb" id="0x7f0401e6" />
+    <public type="attr" name="img_verify_email" id="0x7f0401e7" />
+    <public type="attr" name="img_verify_phone" id="0x7f0401e8" />
+    <public type="attr" name="img_voice_no_connections" id="0x7f0401e9" />
+    <public type="attr" name="img_wumpus_ball" id="0x7f0401ea" />
+    <public type="attr" name="img_wumpus_tophat" id="0x7f0401eb" />
+    <public type="attr" name="indeterminateProgressStyle" id="0x7f0401ec" />
+    <public type="attr" name="initialActivityCount" id="0x7f0401ed" />
+    <public type="attr" name="insetForeground" id="0x7f0401ee" />
+    <public type="attr" name="isLightTheme" id="0x7f0401ef" />
+    <public type="attr" name="itemBackground" id="0x7f0401f0" />
+    <public type="attr" name="itemHorizontalPadding" id="0x7f0401f1" />
+    <public type="attr" name="itemHorizontalTranslationEnabled" id="0x7f0401f2" />
+    <public type="attr" name="itemIconPadding" id="0x7f0401f3" />
+    <public type="attr" name="itemIconSize" id="0x7f0401f4" />
+    <public type="attr" name="itemIconTint" id="0x7f0401f5" />
+    <public type="attr" name="itemPadding" id="0x7f0401f6" />
+    <public type="attr" name="itemSpacing" id="0x7f0401f7" />
+    <public type="attr" name="itemTextAppearance" id="0x7f0401f8" />
+    <public type="attr" name="itemTextAppearanceActive" id="0x7f0401f9" />
+    <public type="attr" name="itemTextAppearanceInactive" id="0x7f0401fa" />
+    <public type="attr" name="itemTextColor" id="0x7f0401fb" />
+    <public type="attr" name="justifyContent" id="0x7f0401fc" />
+    <public type="attr" name="keylines" id="0x7f0401fd" />
+    <public type="attr" name="labelVisibilityMode" id="0x7f0401fe" />
+    <public type="attr" name="lastBaselineToBottomHeight" id="0x7f0401ff" />
+    <public type="attr" name="layout" id="0x7f040200" />
+    <public type="attr" name="layoutManager" id="0x7f040201" />
+    <public type="attr" name="layout_alignSelf" id="0x7f040202" />
+    <public type="attr" name="layout_anchor" id="0x7f040203" />
+    <public type="attr" name="layout_anchorGravity" id="0x7f040204" />
+    <public type="attr" name="layout_behavior" id="0x7f040205" />
+    <public type="attr" name="layout_collapseMode" id="0x7f040206" />
+    <public type="attr" name="layout_collapseParallaxMultiplier" id="0x7f040207" />
+    <public type="attr" name="layout_constrainedHeight" id="0x7f040208" />
+    <public type="attr" name="layout_constrainedWidth" id="0x7f040209" />
+    <public type="attr" name="layout_constraintBaseline_creator" id="0x7f04020a" />
+    <public type="attr" name="layout_constraintBaseline_toBaselineOf" id="0x7f04020b" />
+    <public type="attr" name="layout_constraintBottom_creator" id="0x7f04020c" />
+    <public type="attr" name="layout_constraintBottom_toBottomOf" id="0x7f04020d" />
+    <public type="attr" name="layout_constraintBottom_toTopOf" id="0x7f04020e" />
+    <public type="attr" name="layout_constraintCircle" id="0x7f04020f" />
+    <public type="attr" name="layout_constraintCircleAngle" id="0x7f040210" />
+    <public type="attr" name="layout_constraintCircleRadius" id="0x7f040211" />
+    <public type="attr" name="layout_constraintDimensionRatio" id="0x7f040212" />
+    <public type="attr" name="layout_constraintEnd_toEndOf" id="0x7f040213" />
+    <public type="attr" name="layout_constraintEnd_toStartOf" id="0x7f040214" />
+    <public type="attr" name="layout_constraintGuide_begin" id="0x7f040215" />
+    <public type="attr" name="layout_constraintGuide_end" id="0x7f040216" />
+    <public type="attr" name="layout_constraintGuide_percent" id="0x7f040217" />
+    <public type="attr" name="layout_constraintHeight_default" id="0x7f040218" />
+    <public type="attr" name="layout_constraintHeight_max" id="0x7f040219" />
+    <public type="attr" name="layout_constraintHeight_min" id="0x7f04021a" />
+    <public type="attr" name="layout_constraintHeight_percent" id="0x7f04021b" />
+    <public type="attr" name="layout_constraintHorizontal_bias" id="0x7f04021c" />
+    <public type="attr" name="layout_constraintHorizontal_chainStyle" id="0x7f04021d" />
+    <public type="attr" name="layout_constraintHorizontal_weight" id="0x7f04021e" />
+    <public type="attr" name="layout_constraintLeft_creator" id="0x7f04021f" />
+    <public type="attr" name="layout_constraintLeft_toLeftOf" id="0x7f040220" />
+    <public type="attr" name="layout_constraintLeft_toRightOf" id="0x7f040221" />
+    <public type="attr" name="layout_constraintRight_creator" id="0x7f040222" />
+    <public type="attr" name="layout_constraintRight_toLeftOf" id="0x7f040223" />
+    <public type="attr" name="layout_constraintRight_toRightOf" id="0x7f040224" />
+    <public type="attr" name="layout_constraintStart_toEndOf" id="0x7f040225" />
+    <public type="attr" name="layout_constraintStart_toStartOf" id="0x7f040226" />
+    <public type="attr" name="layout_constraintTop_creator" id="0x7f040227" />
+    <public type="attr" name="layout_constraintTop_toBottomOf" id="0x7f040228" />
+    <public type="attr" name="layout_constraintTop_toTopOf" id="0x7f040229" />
+    <public type="attr" name="layout_constraintVertical_bias" id="0x7f04022a" />
+    <public type="attr" name="layout_constraintVertical_chainStyle" id="0x7f04022b" />
+    <public type="attr" name="layout_constraintVertical_weight" id="0x7f04022c" />
+    <public type="attr" name="layout_constraintWidth_default" id="0x7f04022d" />
+    <public type="attr" name="layout_constraintWidth_max" id="0x7f04022e" />
+    <public type="attr" name="layout_constraintWidth_min" id="0x7f04022f" />
+    <public type="attr" name="layout_constraintWidth_percent" id="0x7f040230" />
+    <public type="attr" name="layout_dodgeInsetEdges" id="0x7f040231" />
+    <public type="attr" name="layout_editor_absoluteX" id="0x7f040232" />
+    <public type="attr" name="layout_editor_absoluteY" id="0x7f040233" />
+    <public type="attr" name="layout_flexBasisPercent" id="0x7f040234" />
+    <public type="attr" name="layout_flexGrow" id="0x7f040235" />
+    <public type="attr" name="layout_flexShrink" id="0x7f040236" />
+    <public type="attr" name="layout_goneMarginBottom" id="0x7f040237" />
+    <public type="attr" name="layout_goneMarginEnd" id="0x7f040238" />
+    <public type="attr" name="layout_goneMarginLeft" id="0x7f040239" />
+    <public type="attr" name="layout_goneMarginRight" id="0x7f04023a" />
+    <public type="attr" name="layout_goneMarginStart" id="0x7f04023b" />
+    <public type="attr" name="layout_goneMarginTop" id="0x7f04023c" />
+    <public type="attr" name="layout_insetEdge" id="0x7f04023d" />
+    <public type="attr" name="layout_keyline" id="0x7f04023e" />
+    <public type="attr" name="layout_maxHeight" id="0x7f04023f" />
+    <public type="attr" name="layout_maxWidth" id="0x7f040240" />
+    <public type="attr" name="layout_minHeight" id="0x7f040241" />
+    <public type="attr" name="layout_minWidth" id="0x7f040242" />
+    <public type="attr" name="layout_optimizationLevel" id="0x7f040243" />
+    <public type="attr" name="layout_order" id="0x7f040244" />
+    <public type="attr" name="layout_scrollFlags" id="0x7f040245" />
+    <public type="attr" name="layout_scrollInterpolator" id="0x7f040246" />
+    <public type="attr" name="layout_wrapBefore" id="0x7f040247" />
+    <public type="attr" name="lb_disabled_alpha" id="0x7f040248" />
+    <public type="attr" name="lb_progress_color" id="0x7f040249" />
+    <public type="attr" name="lb_text" id="0x7f04024a" />
+    <public type="attr" name="lb_text_color" id="0x7f04024b" />
+    <public type="attr" name="liftOnScroll" id="0x7f04024c" />
+    <public type="attr" name="lineHeight" id="0x7f04024d" />
+    <public type="attr" name="lineSpacing" id="0x7f04024e" />
+    <public type="attr" name="listChoiceBackgroundIndicator" id="0x7f04024f" />
+    <public type="attr" name="listDividerAlertDialog" id="0x7f040250" />
+    <public type="attr" name="listItemLayout" id="0x7f040251" />
+    <public type="attr" name="listLayout" id="0x7f040252" />
+    <public type="attr" name="listMenuViewStyle" id="0x7f040253" />
+    <public type="attr" name="listPopupWindowStyle" id="0x7f040254" />
+    <public type="attr" name="listPreferredItemHeight" id="0x7f040255" />
+    <public type="attr" name="listPreferredItemHeightLarge" id="0x7f040256" />
+    <public type="attr" name="listPreferredItemHeightSmall" id="0x7f040257" />
+    <public type="attr" name="listPreferredItemPaddingLeft" id="0x7f040258" />
+    <public type="attr" name="listPreferredItemPaddingRight" id="0x7f040259" />
+    <public type="attr" name="logo" id="0x7f04025a" />
+    <public type="attr" name="logoDescription" id="0x7f04025b" />
+    <public type="attr" name="lottie_autoPlay" id="0x7f04025c" />
+    <public type="attr" name="lottie_colorFilter" id="0x7f04025d" />
+    <public type="attr" name="lottie_enableMergePathsForKitKatAndAbove" id="0x7f04025e" />
+    <public type="attr" name="lottie_fileName" id="0x7f04025f" />
+    <public type="attr" name="lottie_imageAssetsFolder" id="0x7f040260" />
+    <public type="attr" name="lottie_loop" id="0x7f040261" />
+    <public type="attr" name="lottie_progress" id="0x7f040262" />
+    <public type="attr" name="lottie_rawRes" id="0x7f040263" />
+    <public type="attr" name="lottie_renderMode" id="0x7f040264" />
+    <public type="attr" name="lottie_repeatCount" id="0x7f040265" />
+    <public type="attr" name="lottie_repeatMode" id="0x7f040266" />
+    <public type="attr" name="lottie_scale" id="0x7f040267" />
+    <public type="attr" name="lottie_speed" id="0x7f040268" />
+    <public type="attr" name="lottie_url" id="0x7f040269" />
+    <public type="attr" name="manage_reactions_emoji_selection_indicator" id="0x7f04026a" />
+    <public type="attr" name="materialButtonStyle" id="0x7f04026b" />
+    <public type="attr" name="materialCardViewStyle" id="0x7f04026c" />
+    <public type="attr" name="maxActionInlineWidth" id="0x7f04026d" />
+    <public type="attr" name="maxButtonHeight" id="0x7f04026e" />
+    <public type="attr" name="maxImageSize" id="0x7f04026f" />
+    <public type="attr" name="max_height" id="0x7f040270" />
+    <public type="attr" name="measureWithLargestChild" id="0x7f040271" />
+    <public type="attr" name="menu" id="0x7f040272" />
+    <public type="attr" name="multiChoiceItemLayout" id="0x7f040273" />
+    <public type="attr" name="navigationContentDescription" id="0x7f040274" />
+    <public type="attr" name="navigationIcon" id="0x7f040275" />
+    <public type="attr" name="navigationMode" id="0x7f040276" />
+    <public type="attr" name="navigationViewStyle" id="0x7f040277" />
+    <public type="attr" name="notice_popup_bg" id="0x7f040278" />
+    <public type="attr" name="notice_theme_positive_red" id="0x7f040279" />
+    <public type="attr" name="numericModifiers" id="0x7f04027a" />
+    <public type="attr" name="overlapAnchor" id="0x7f04027b" />
+    <public type="attr" name="overlayImage" id="0x7f04027c" />
+    <public type="attr" name="overlay_guild_mentions" id="0x7f04027d" />
+    <public type="attr" name="overlay_guild_mentions_primary_630" id="0x7f04027e" />
+    <public type="attr" name="paddingBottomNoButtons" id="0x7f04027f" />
+    <public type="attr" name="paddingEnd" id="0x7f040280" />
+    <public type="attr" name="paddingStart" id="0x7f040281" />
+    <public type="attr" name="paddingTopNoTitle" id="0x7f040282" />
+    <public type="attr" name="panelBackground" id="0x7f040283" />
+    <public type="attr" name="panelMenuListTheme" id="0x7f040284" />
+    <public type="attr" name="panelMenuListWidth" id="0x7f040285" />
+    <public type="attr" name="passwordToggleContentDescription" id="0x7f040286" />
+    <public type="attr" name="passwordToggleDrawable" id="0x7f040287" />
+    <public type="attr" name="passwordToggleEnabled" id="0x7f040288" />
+    <public type="attr" name="passwordToggleTint" id="0x7f040289" />
+    <public type="attr" name="passwordToggleTintMode" id="0x7f04028a" />
+    <public type="attr" name="placeholderImage" id="0x7f04028b" />
+    <public type="attr" name="placeholderImageScaleType" id="0x7f04028c" />
+    <public type="attr" name="popupMenuStyle" id="0x7f04028d" />
+    <public type="attr" name="popupTheme" id="0x7f04028e" />
+    <public type="attr" name="popupWindowStyle" id="0x7f04028f" />
+    <public type="attr" name="preserveIconSpacing" id="0x7f040290" />
+    <public type="attr" name="pressedStateOverlayImage" id="0x7f040291" />
+    <public type="attr" name="pressedTranslationZ" id="0x7f040292" />
+    <public type="attr" name="previewBackground" id="0x7f040293" />
+    <public type="attr" name="primary_000" id="0x7f040294" />
+    <public type="attr" name="primary_100" id="0x7f040295" />
+    <public type="attr" name="primary_100_alpha_30" id="0x7f040296" />
+    <public type="attr" name="primary_100_alpha_60" id="0x7f040297" />
+    <public type="attr" name="primary_100_bg" id="0x7f040298" />
+    <public type="attr" name="primary_200" id="0x7f040299" />
+    <public type="attr" name="primary_200_bg" id="0x7f04029a" />
+    <public type="attr" name="primary_300" id="0x7f04029b" />
+    <public type="attr" name="primary_300_alpha_30" id="0x7f04029c" />
+    <public type="attr" name="primary_300_bg" id="0x7f04029d" />
+    <public type="attr" name="primary_400" id="0x7f04029e" />
+    <public type="attr" name="primary_400_alpha_30" id="0x7f04029f" />
+    <public type="attr" name="primary_400_bg" id="0x7f0402a0" />
+    <public type="attr" name="primary_500" id="0x7f0402a1" />
+    <public type="attr" name="primary_500_alpha_60" id="0x7f0402a2" />
+    <public type="attr" name="primary_500_bg" id="0x7f0402a3" />
+    <public type="attr" name="primary_500_button_outline" id="0x7f0402a4" />
+    <public type="attr" name="primary_500_circle" id="0x7f0402a5" />
+    <public type="attr" name="primary_560" id="0x7f0402a6" />
+    <public type="attr" name="primary_600" id="0x7f0402a7" />
+    <public type="attr" name="primary_600_bg" id="0x7f0402a8" />
+    <public type="attr" name="primary_630" id="0x7f0402a9" />
+    <public type="attr" name="primary_630_bg" id="0x7f0402aa" />
+    <public type="attr" name="primary_630_bg_bottom_corners" id="0x7f0402ab" />
+    <public type="attr" name="primary_630_circle" id="0x7f0402ac" />
+    <public type="attr" name="primary_660" id="0x7f0402ad" />
+    <public type="attr" name="primary_660_bg_outline" id="0x7f0402ae" />
+    <public type="attr" name="primary_700" id="0x7f0402af" />
+    <public type="attr" name="primary_700_alpha_60" id="0x7f0402b0" />
+    <public type="attr" name="primary_700_bg" id="0x7f0402b1" />
+    <public type="attr" name="primary_700_circle" id="0x7f0402b2" />
+    <public type="attr" name="primary_700_top_corners" id="0x7f0402b3" />
+    <public type="attr" name="primary_800" id="0x7f0402b4" />
+    <public type="attr" name="primary_800_bg" id="0x7f0402b5" />
+    <public type="attr" name="primary_800_circle" id="0x7f0402b6" />
+    <public type="attr" name="primary_900" id="0x7f0402b7" />
+    <public type="attr" name="primary_900_bg" id="0x7f0402b8" />
+    <public type="attr" name="progressBarAutoRotateInterval" id="0x7f0402b9" />
+    <public type="attr" name="progressBarImage" id="0x7f0402ba" />
+    <public type="attr" name="progressBarImageScaleType" id="0x7f0402bb" />
+    <public type="attr" name="progressBarPadding" id="0x7f0402bc" />
+    <public type="attr" name="progressBarStyle" id="0x7f0402bd" />
+    <public type="attr" name="progress_gradient" id="0x7f0402be" />
+    <public type="attr" name="ptrn_shapes" id="0x7f0402bf" />
+    <public type="attr" name="queryBackground" id="0x7f0402c0" />
+    <public type="attr" name="queryHint" id="0x7f0402c1" />
+    <public type="attr" name="radioButtonStyle" id="0x7f0402c2" />
+    <public type="attr" name="radio_btn_bg" id="0x7f0402c3" />
+    <public type="attr" name="radio_btn_text_color" id="0x7f0402c4" />
+    <public type="attr" name="ratingBarStyle" id="0x7f0402c5" />
+    <public type="attr" name="ratingBarStyleIndicator" id="0x7f0402c6" />
+    <public type="attr" name="ratingBarStyleSmall" id="0x7f0402c7" />
+    <public type="attr" name="retryImage" id="0x7f0402c8" />
+    <public type="attr" name="retryImageScaleType" id="0x7f0402c9" />
+    <public type="attr" name="reverseLayout" id="0x7f0402ca" />
+    <public type="attr" name="rippleColor" id="0x7f0402cb" />
+    <public type="attr" name="roundAsCircle" id="0x7f0402cc" />
+    <public type="attr" name="roundBottomEnd" id="0x7f0402cd" />
+    <public type="attr" name="roundBottomLeft" id="0x7f0402ce" />
+    <public type="attr" name="roundBottomRight" id="0x7f0402cf" />
+    <public type="attr" name="roundBottomStart" id="0x7f0402d0" />
+    <public type="attr" name="roundTopEnd" id="0x7f0402d1" />
+    <public type="attr" name="roundTopLeft" id="0x7f0402d2" />
+    <public type="attr" name="roundTopRight" id="0x7f0402d3" />
+    <public type="attr" name="roundTopStart" id="0x7f0402d4" />
+    <public type="attr" name="roundWithOverlayColor" id="0x7f0402d5" />
+    <public type="attr" name="roundedCornerRadius" id="0x7f0402d6" />
+    <public type="attr" name="roundingBorderColor" id="0x7f0402d7" />
+    <public type="attr" name="roundingBorderPadding" id="0x7f0402d8" />
+    <public type="attr" name="roundingBorderWidth" id="0x7f0402d9" />
+    <public type="attr" name="sb_barBackgroundColor" id="0x7f0402da" />
+    <public type="attr" name="sb_barColor" id="0x7f0402db" />
+    <public type="attr" name="sb_barControlColor" id="0x7f0402dc" />
+    <public type="attr" name="sb_barControlRadius" id="0x7f0402dd" />
+    <public type="attr" name="sb_barControlShadowColor" id="0x7f0402de" />
+    <public type="attr" name="sb_barControlShadowRadius" id="0x7f0402df" />
+    <public type="attr" name="sb_barHeight" id="0x7f0402e0" />
+    <public type="attr" name="sb_barInterval" id="0x7f0402e1" />
+    <public type="attr" name="sb_barOverlayColor" id="0x7f0402e2" />
+    <public type="attr" name="sb_barOverlayValue" id="0x7f0402e3" />
+    <public type="attr" name="sb_barTouchEnabled" id="0x7f0402e4" />
+    <public type="attr" name="sb_barValue" id="0x7f0402e5" />
+    <public type="attr" name="sb_barValueMax" id="0x7f0402e6" />
+    <public type="attr" name="sb_barValueMin" id="0x7f0402e7" />
+    <public type="attr" name="scopeUris" id="0x7f0402e8" />
+    <public type="attr" name="scrimAnimationDuration" id="0x7f0402e9" />
+    <public type="attr" name="scrimBackground" id="0x7f0402ea" />
+    <public type="attr" name="scrimVisibleHeightTrigger" id="0x7f0402eb" />
+    <public type="attr" name="searchHintIcon" id="0x7f0402ec" />
+    <public type="attr" name="searchIcon" id="0x7f0402ed" />
+    <public type="attr" name="searchViewStyle" id="0x7f0402ee" />
+    <public type="attr" name="search_action_bar_bg" id="0x7f0402ef" />
+    <public type="attr" name="seekBarStyle" id="0x7f0402f0" />
+    <public type="attr" name="selectableItemBackground" id="0x7f0402f1" />
+    <public type="attr" name="selectableItemBackgroundBorderless" id="0x7f0402f2" />
+    <public type="attr" name="settings_text_color" id="0x7f0402f3" />
+    <public type="attr" name="showAsAction" id="0x7f0402f4" />
+    <public type="attr" name="showDivider" id="0x7f0402f5" />
+    <public type="attr" name="showDividerHorizontal" id="0x7f0402f6" />
+    <public type="attr" name="showDividerVertical" id="0x7f0402f7" />
+    <public type="attr" name="showDividers" id="0x7f0402f8" />
+    <public type="attr" name="showMotionSpec" id="0x7f0402f9" />
+    <public type="attr" name="showText" id="0x7f0402fa" />
+    <public type="attr" name="showTitle" id="0x7f0402fb" />
+    <public type="attr" name="singleChoiceItemLayout" id="0x7f0402fc" />
+    <public type="attr" name="singleLine" id="0x7f0402fd" />
+    <public type="attr" name="singleSelection" id="0x7f0402fe" />
+    <public type="attr" name="snackbarButtonStyle" id="0x7f0402ff" />
+    <public type="attr" name="snackbarStyle" id="0x7f040300" />
+    <public type="attr" name="spanCount" id="0x7f040301" />
+    <public type="attr" name="spinBars" id="0x7f040302" />
+    <public type="attr" name="spinnerDropDownItemStyle" id="0x7f040303" />
+    <public type="attr" name="spinnerStyle" id="0x7f040304" />
+    <public type="attr" name="splitTrack" id="0x7f040305" />
+    <public type="attr" name="srcCompat" id="0x7f040306" />
+    <public type="attr" name="stackFromEnd" id="0x7f040307" />
+    <public type="attr" name="state_above_anchor" id="0x7f040308" />
+    <public type="attr" name="state_collapsed" id="0x7f040309" />
+    <public type="attr" name="state_collapsible" id="0x7f04030a" />
+    <public type="attr" name="state_liftable" id="0x7f04030b" />
+    <public type="attr" name="state_lifted" id="0x7f04030c" />
+    <public type="attr" name="statusBarBackground" id="0x7f04030d" />
+    <public type="attr" name="statusBarScrim" id="0x7f04030e" />
+    <public type="attr" name="status_white_outline" id="0x7f04030f" />
+    <public type="attr" name="stream_preview_bg" id="0x7f040310" />
+    <public type="attr" name="stream_preview_placeholder_color" id="0x7f040311" />
+    <public type="attr" name="strokeColor" id="0x7f040312" />
+    <public type="attr" name="strokeWidth" id="0x7f040313" />
+    <public type="attr" name="subMenuArrow" id="0x7f040314" />
+    <public type="attr" name="submitBackground" id="0x7f040315" />
+    <public type="attr" name="subtitle" id="0x7f040316" />
+    <public type="attr" name="subtitleTextAppearance" id="0x7f040317" />
+    <public type="attr" name="subtitleTextColor" id="0x7f040318" />
+    <public type="attr" name="subtitleTextStyle" id="0x7f040319" />
+    <public type="attr" name="suggestionRowLayout" id="0x7f04031a" />
+    <public type="attr" name="switchMinWidth" id="0x7f04031b" />
+    <public type="attr" name="switchPadding" id="0x7f04031c" />
+    <public type="attr" name="switchStyle" id="0x7f04031d" />
+    <public type="attr" name="switchTextAppearance" id="0x7f04031e" />
+    <public type="attr" name="tabBackground" id="0x7f04031f" />
+    <public type="attr" name="tabContentStart" id="0x7f040320" />
+    <public type="attr" name="tabGravity" id="0x7f040321" />
+    <public type="attr" name="tabIconTint" id="0x7f040322" />
+    <public type="attr" name="tabIconTintMode" id="0x7f040323" />
+    <public type="attr" name="tabIndicator" id="0x7f040324" />
+    <public type="attr" name="tabIndicatorAnimationDuration" id="0x7f040325" />
+    <public type="attr" name="tabIndicatorColor" id="0x7f040326" />
+    <public type="attr" name="tabIndicatorFullWidth" id="0x7f040327" />
+    <public type="attr" name="tabIndicatorGravity" id="0x7f040328" />
+    <public type="attr" name="tabIndicatorHeight" id="0x7f040329" />
+    <public type="attr" name="tabInlineLabel" id="0x7f04032a" />
+    <public type="attr" name="tabMaxWidth" id="0x7f04032b" />
+    <public type="attr" name="tabMinWidth" id="0x7f04032c" />
+    <public type="attr" name="tabMode" id="0x7f04032d" />
+    <public type="attr" name="tabPadding" id="0x7f04032e" />
+    <public type="attr" name="tabPaddingBottom" id="0x7f04032f" />
+    <public type="attr" name="tabPaddingEnd" id="0x7f040330" />
+    <public type="attr" name="tabPaddingStart" id="0x7f040331" />
+    <public type="attr" name="tabPaddingTop" id="0x7f040332" />
+    <public type="attr" name="tabRippleColor" id="0x7f040333" />
+    <public type="attr" name="tabSelectedTextColor" id="0x7f040334" />
+    <public type="attr" name="tabStyle" id="0x7f040335" />
+    <public type="attr" name="tabTextAppearance" id="0x7f040336" />
+    <public type="attr" name="tabTextColor" id="0x7f040337" />
+    <public type="attr" name="tabUnboundedRipple" id="0x7f040338" />
+    <public type="attr" name="tcs_subtext" id="0x7f040339" />
+    <public type="attr" name="ternaryCheckboxDisabledColor" id="0x7f04033a" />
+    <public type="attr" name="text" id="0x7f04033b" />
+    <public type="attr" name="textAllCaps" id="0x7f04033c" />
+    <public type="attr" name="textAppearanceBody1" id="0x7f04033d" />
+    <public type="attr" name="textAppearanceBody2" id="0x7f04033e" />
+    <public type="attr" name="textAppearanceButton" id="0x7f04033f" />
+    <public type="attr" name="textAppearanceCaption" id="0x7f040340" />
+    <public type="attr" name="textAppearanceHeadline1" id="0x7f040341" />
+    <public type="attr" name="textAppearanceHeadline2" id="0x7f040342" />
+    <public type="attr" name="textAppearanceHeadline3" id="0x7f040343" />
+    <public type="attr" name="textAppearanceHeadline4" id="0x7f040344" />
+    <public type="attr" name="textAppearanceHeadline5" id="0x7f040345" />
+    <public type="attr" name="textAppearanceHeadline6" id="0x7f040346" />
+    <public type="attr" name="textAppearanceLargePopupMenu" id="0x7f040347" />
+    <public type="attr" name="textAppearanceListItem" id="0x7f040348" />
+    <public type="attr" name="textAppearanceListItemSecondary" id="0x7f040349" />
+    <public type="attr" name="textAppearanceListItemSmall" id="0x7f04034a" />
+    <public type="attr" name="textAppearanceOverline" id="0x7f04034b" />
+    <public type="attr" name="textAppearancePopupMenuHeader" id="0x7f04034c" />
+    <public type="attr" name="textAppearanceSearchResultSubtitle" id="0x7f04034d" />
+    <public type="attr" name="textAppearanceSearchResultTitle" id="0x7f04034e" />
+    <public type="attr" name="textAppearanceSmallPopupMenu" id="0x7f04034f" />
+    <public type="attr" name="textAppearanceSubtitle1" id="0x7f040350" />
+    <public type="attr" name="textAppearanceSubtitle2" id="0x7f040351" />
+    <public type="attr" name="textColorAlertDialogListItem" id="0x7f040352" />
+    <public type="attr" name="textColorSearchUrl" id="0x7f040353" />
+    <public type="attr" name="textEndPadding" id="0x7f040354" />
+    <public type="attr" name="textInputStyle" id="0x7f040355" />
+    <public type="attr" name="textStartPadding" id="0x7f040356" />
+    <public type="attr" name="text_color" id="0x7f040357" />
+    <public type="attr" name="theme" id="0x7f040358" />
+    <public type="attr" name="theme_backspace_icon" id="0x7f040359" />
+    <public type="attr" name="theme_chat_block_quote_divider" id="0x7f04035a" />
+    <public type="attr" name="theme_chat_blocked_bg" id="0x7f04035b" />
+    <public type="attr" name="theme_chat_blocked_text" id="0x7f04035c" />
+    <public type="attr" name="theme_chat_code" id="0x7f04035d" />
+    <public type="attr" name="theme_chat_codeblock_border" id="0x7f04035e" />
+    <public type="attr" name="theme_chat_divider" id="0x7f04035f" />
+    <public type="attr" name="theme_chat_divider_embed" id="0x7f040360" />
+    <public type="attr" name="theme_chat_empty_mentions_arm" id="0x7f040361" />
+    <public type="attr" name="theme_chat_empty_mentions_hand" id="0x7f040362" />
+    <public type="attr" name="theme_chat_empty_pins" id="0x7f040363" />
+    <public type="attr" name="theme_chat_header_members" id="0x7f040364" />
+    <public type="attr" name="theme_chat_input" id="0x7f040365" />
+    <public type="attr" name="theme_chat_input_button_tint_colors" id="0x7f040366" />
+    <public type="attr" name="theme_chat_input_content_tab_bg" id="0x7f040367" />
+    <public type="attr" name="theme_chat_input_divider" id="0x7f040368" />
+    <public type="attr" name="theme_chat_input_edit" id="0x7f040369" />
+    <public type="attr" name="theme_chat_input_photo_selection_icon" id="0x7f04036a" />
+    <public type="attr" name="theme_chat_input_text" id="0x7f04036b" />
+    <public type="attr" name="theme_chat_input_text_placeholder" id="0x7f04036c" />
+    <public type="attr" name="theme_chat_loading_spinner_color" id="0x7f04036d" />
+    <public type="attr" name="theme_chat_mentioned_me" id="0x7f04036e" />
+    <public type="attr" name="theme_chat_name" id="0x7f04036f" />
+    <public type="attr" name="theme_chat_reaction_background" id="0x7f040370" />
+    <public type="attr" name="theme_chat_reaction_text_color" id="0x7f040371" />
+    <public type="attr" name="theme_chat_spoiler_bg" id="0x7f040372" />
+    <public type="attr" name="theme_chat_spoiler_bg_visible" id="0x7f040373" />
+    <public type="attr" name="theme_chat_spoiler_inapp_bg" id="0x7f040374" />
+    <public type="attr" name="theme_chat_text" id="0x7f040375" />
+    <public type="attr" name="theme_chat_timestamp" id="0x7f040376" />
+    <public type="attr" name="theme_emoji_icon_activity" id="0x7f040377" />
+    <public type="attr" name="theme_emoji_icon_custom" id="0x7f040378" />
+    <public type="attr" name="theme_emoji_icon_flags" id="0x7f040379" />
+    <public type="attr" name="theme_emoji_icon_food" id="0x7f04037a" />
+    <public type="attr" name="theme_emoji_icon_nature" id="0x7f04037b" />
+    <public type="attr" name="theme_emoji_icon_objects" id="0x7f04037c" />
+    <public type="attr" name="theme_emoji_icon_people" id="0x7f04037d" />
+    <public type="attr" name="theme_emoji_icon_recent" id="0x7f04037e" />
+    <public type="attr" name="theme_emoji_icon_symbols" id="0x7f04037f" />
+    <public type="attr" name="theme_emoji_icon_travel" id="0x7f040380" />
+    <public type="attr" name="theme_emoji_placeholder" id="0x7f040381" />
+    <public type="attr" name="theme_emoji_settings_empty" id="0x7f040382" />
+    <public type="attr" name="theme_friends_add_icon" id="0x7f040383" />
+    <public type="attr" name="theme_friends_divider" id="0x7f040384" />
+    <public type="attr" name="theme_friends_new_group_icon" id="0x7f040385" />
+    <public type="attr" name="theme_friends_no_block" id="0x7f040386" />
+    <public type="attr" name="theme_friends_no_friends" id="0x7f040387" />
+    <public type="attr" name="theme_friends_no_online" id="0x7f040388" />
+    <public type="attr" name="theme_friends_no_request" id="0x7f040389" />
+    <public type="attr" name="theme_friends_no_suggestions" id="0x7f04038a" />
+    <public type="attr" name="theme_friends_pending_tab_text_color" id="0x7f04038b" />
+    <public type="attr" name="theme_friends_profile_icon" id="0x7f04038c" />
+    <public type="attr" name="theme_friends_tab_mentions" id="0x7f04038d" />
+    <public type="attr" name="theme_group_members_icon" id="0x7f04038e" />
+    <public type="attr" name="theme_group_start_call_icon" id="0x7f04038f" />
+    <public type="attr" name="theme_group_start_video_icon" id="0x7f040390" />
+    <public type="attr" name="theme_name" id="0x7f040391" />
+    <public type="attr" name="theme_overlay_mentions_oval" id="0x7f040392" />
+    <public type="attr" name="theme_search_back_arrow" id="0x7f040393" />
+    <public type="attr" name="theme_search_broken_results" id="0x7f040394" />
+    <public type="attr" name="theme_search_clear_icon" id="0x7f040395" />
+    <public type="attr" name="theme_search_empty_asset" id="0x7f040396" />
+    <public type="attr" name="theme_search_empty_asset_alternate" id="0x7f040397" />
+    <public type="attr" name="theme_search_indexing_animation" id="0x7f040398" />
+    <public type="attr" name="theme_search_menu_icon" id="0x7f040399" />
+    <public type="attr" name="theme_search_suggestion_header_text_color" id="0x7f04039a" />
+    <public type="attr" name="theme_search_suggestion_icon_attachment" id="0x7f04039b" />
+    <public type="attr" name="theme_search_suggestion_icon_channel" id="0x7f04039c" />
+    <public type="attr" name="theme_search_suggestion_icon_clear_history" id="0x7f04039d" />
+    <public type="attr" name="theme_search_suggestion_icon_embed" id="0x7f04039e" />
+    <public type="attr" name="theme_search_suggestion_icon_history" id="0x7f04039f" />
+    <public type="attr" name="theme_search_suggestion_icon_image" id="0x7f0403a0" />
+    <public type="attr" name="theme_search_suggestion_icon_link" id="0x7f0403a1" />
+    <public type="attr" name="theme_search_suggestion_icon_mentions" id="0x7f0403a2" />
+    <public type="attr" name="theme_search_suggestion_icon_people" id="0x7f0403a3" />
+    <public type="attr" name="theme_search_suggestion_icon_sound" id="0x7f0403a4" />
+    <public type="attr" name="theme_search_suggestion_icon_video" id="0x7f0403a5" />
+    <public type="attr" name="theme_search_suggestion_text_color_primary" id="0x7f0403a6" />
+    <public type="attr" name="theme_search_suggestion_text_color_secondary" id="0x7f0403a7" />
+    <public type="attr" name="theme_status_indicator_color" id="0x7f0403a8" />
+    <public type="attr" name="thickness" id="0x7f0403a9" />
+    <public type="attr" name="thumbTextPadding" id="0x7f0403aa" />
+    <public type="attr" name="thumbTint" id="0x7f0403ab" />
+    <public type="attr" name="thumbTintMode" id="0x7f0403ac" />
+    <public type="attr" name="tickMark" id="0x7f0403ad" />
+    <public type="attr" name="tickMarkTint" id="0x7f0403ae" />
+    <public type="attr" name="tickMarkTintMode" id="0x7f0403af" />
+    <public type="attr" name="tint" id="0x7f0403b0" />
+    <public type="attr" name="tintMode" id="0x7f0403b1" />
+    <public type="attr" name="title" id="0x7f0403b2" />
+    <public type="attr" name="titleEnabled" id="0x7f0403b3" />
+    <public type="attr" name="titleMargin" id="0x7f0403b4" />
+    <public type="attr" name="titleMarginBottom" id="0x7f0403b5" />
+    <public type="attr" name="titleMarginEnd" id="0x7f0403b6" />
+    <public type="attr" name="titleMarginStart" id="0x7f0403b7" />
+    <public type="attr" name="titleMarginTop" id="0x7f0403b8" />
+    <public type="attr" name="titleMargins" id="0x7f0403b9" />
+    <public type="attr" name="titleTextAppearance" id="0x7f0403ba" />
+    <public type="attr" name="titleTextColor" id="0x7f0403bb" />
+    <public type="attr" name="titleTextStyle" id="0x7f0403bc" />
+    <public type="attr" name="toolbarId" id="0x7f0403bd" />
+    <public type="attr" name="toolbarNavigationButtonStyle" id="0x7f0403be" />
+    <public type="attr" name="toolbarStyle" id="0x7f0403bf" />
+    <public type="attr" name="tooltipForegroundColor" id="0x7f0403c0" />
+    <public type="attr" name="tooltipFrameBackground" id="0x7f0403c1" />
+    <public type="attr" name="tooltipText" id="0x7f0403c2" />
+    <public type="attr" name="track" id="0x7f0403c3" />
+    <public type="attr" name="trackTint" id="0x7f0403c4" />
+    <public type="attr" name="trackTintMode" id="0x7f0403c5" />
+    <public type="attr" name="ttcIndex" id="0x7f0403c6" />
+    <public type="attr" name="tv_markdown_enabled" id="0x7f0403c7" />
+    <public type="attr" name="tv_plural" id="0x7f0403c8" />
+    <public type="attr" name="tv_plural_quantity" id="0x7f0403c9" />
+    <public type="attr" name="ucrop_artv_ratio_title" id="0x7f0403ca" />
+    <public type="attr" name="ucrop_artv_ratio_x" id="0x7f0403cb" />
+    <public type="attr" name="ucrop_artv_ratio_y" id="0x7f0403cc" />
+    <public type="attr" name="ucrop_aspect_ratio_x" id="0x7f0403cd" />
+    <public type="attr" name="ucrop_aspect_ratio_y" id="0x7f0403ce" />
+    <public type="attr" name="ucrop_circle_dimmed_layer" id="0x7f0403cf" />
+    <public type="attr" name="ucrop_dimmed_color" id="0x7f0403d0" />
+    <public type="attr" name="ucrop_frame_color" id="0x7f0403d1" />
+    <public type="attr" name="ucrop_frame_stroke_size" id="0x7f0403d2" />
+    <public type="attr" name="ucrop_grid_color" id="0x7f0403d3" />
+    <public type="attr" name="ucrop_grid_column_count" id="0x7f0403d4" />
+    <public type="attr" name="ucrop_grid_row_count" id="0x7f0403d5" />
+    <public type="attr" name="ucrop_grid_stroke_size" id="0x7f0403d6" />
+    <public type="attr" name="ucrop_show_frame" id="0x7f0403d7" />
+    <public type="attr" name="ucrop_show_grid" id="0x7f0403d8" />
+    <public type="attr" name="ucrop_show_oval_crop_frame" id="0x7f0403d9" />
+    <public type="attr" name="useCompatPadding" id="0x7f0403da" />
+    <public type="attr" name="user_avatar_background_color" id="0x7f0403db" />
+    <public type="attr" name="user_avatar_size" id="0x7f0403dc" />
+    <public type="attr" name="user_profile_header_background_color" id="0x7f0403dd" />
+    <public type="attr" name="vcpv_is_overlay" id="0x7f0403de" />
+    <public type="attr" name="vcpv_match_video_orientation" id="0x7f0403df" />
+    <public type="attr" name="viewAspectRatio" id="0x7f0403e0" />
+    <public type="attr" name="viewInflaterClass" id="0x7f0403e1" />
+    <public type="attr" name="voiceIcon" id="0x7f0403e2" />
+    <public type="attr" name="vuv_avatar_size" id="0x7f0403e3" />
+    <public type="attr" name="windowActionBar" id="0x7f0403e4" />
+    <public type="attr" name="windowActionBarOverlay" id="0x7f0403e5" />
+    <public type="attr" name="windowActionModeOverlay" id="0x7f0403e6" />
+    <public type="attr" name="windowFixedHeightMajor" id="0x7f0403e7" />
+    <public type="attr" name="windowFixedHeightMinor" id="0x7f0403e8" />
+    <public type="attr" name="windowFixedWidthMajor" id="0x7f0403e9" />
+    <public type="attr" name="windowFixedWidthMinor" id="0x7f0403ea" />
+    <public type="attr" name="windowMinWidthMajor" id="0x7f0403eb" />
+    <public type="attr" name="windowMinWidthMinor" id="0x7f0403ec" />
+    <public type="attr" name="windowNoTitle" id="0x7f0403ed" />
     <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" />
@@ -1121,312 +1126,314 @@
     <public type="color" name="black_alpha_20" id="0x7f060024" />
     <public type="color" name="black_alpha_30" id="0x7f060025" />
     <public type="color" name="black_alpha_60" id="0x7f060026" />
-    <public type="color" name="black_alpha_80" id="0x7f060027" />
-    <public type="color" name="brand_100" id="0x7f060028" />
-    <public type="color" name="brand_200" id="0x7f060029" />
-    <public type="color" name="brand_300" id="0x7f06002a" />
-    <public type="color" name="brand_400" id="0x7f06002b" />
-    <public type="color" name="brand_500" id="0x7f06002c" />
-    <public type="color" name="brand_500_alpha_30" id="0x7f06002d" />
-    <public type="color" name="brand_500_alpha_60" id="0x7f06002e" />
-    <public type="color" name="brand_600" id="0x7f06002f" />
-    <public type="color" name="brand_630" id="0x7f060030" />
-    <public type="color" name="brand_700" id="0x7f060031" />
-    <public type="color" name="brand_800" id="0x7f060032" />
-    <public type="color" name="brand_900" id="0x7f060033" />
-    <public type="color" name="bright_foreground_disabled_material_dark" id="0x7f060034" />
-    <public type="color" name="bright_foreground_disabled_material_light" id="0x7f060035" />
-    <public type="color" name="bright_foreground_inverse_material_dark" id="0x7f060036" />
-    <public type="color" name="bright_foreground_inverse_material_light" id="0x7f060037" />
-    <public type="color" name="bright_foreground_material_dark" id="0x7f060038" />
-    <public type="color" name="bright_foreground_material_light" id="0x7f060039" />
-    <public type="color" name="browser_actions_bg_grey" id="0x7f06003a" />
-    <public type="color" name="browser_actions_divider_color" id="0x7f06003b" />
-    <public type="color" name="browser_actions_text_color" id="0x7f06003c" />
-    <public type="color" name="browser_actions_title_color" id="0x7f06003d" />
-    <public type="color" name="button_color_selector" id="0x7f06003e" />
-    <public type="color" name="button_material_dark" id="0x7f06003f" />
-    <public type="color" name="button_material_light" id="0x7f060040" />
-    <public type="color" name="cardview_dark_background" id="0x7f060041" />
-    <public type="color" name="cardview_light_background" id="0x7f060042" />
-    <public type="color" name="cardview_shadow_end_color" id="0x7f060043" />
-    <public type="color" name="cardview_shadow_start_color" id="0x7f060044" />
-    <public type="color" name="channel_list_item_text_color" id="0x7f060045" />
-    <public type="color" name="channel_list_item_voice_text_color_dark" id="0x7f060046" />
-    <public type="color" name="chat_input_button_tint_colors_dark" id="0x7f060047" />
-    <public type="color" name="chat_input_button_tint_colors_light" id="0x7f060048" />
-    <public type="color" name="code" id="0x7f060049" />
-    <public type="color" name="colorPrimary" id="0x7f06004a" />
-    <public type="color" name="colorPrimaryDark" id="0x7f06004b" />
-    <public type="color" name="common_google_signin_btn_text_dark" id="0x7f06004c" />
-    <public type="color" name="common_google_signin_btn_text_dark_default" id="0x7f06004d" />
-    <public type="color" name="common_google_signin_btn_text_dark_disabled" id="0x7f06004e" />
-    <public type="color" name="common_google_signin_btn_text_dark_focused" id="0x7f06004f" />
-    <public type="color" name="common_google_signin_btn_text_dark_pressed" id="0x7f060050" />
-    <public type="color" name="common_google_signin_btn_text_light" id="0x7f060051" />
-    <public type="color" name="common_google_signin_btn_text_light_default" id="0x7f060052" />
-    <public type="color" name="common_google_signin_btn_text_light_disabled" id="0x7f060053" />
-    <public type="color" name="common_google_signin_btn_text_light_focused" id="0x7f060054" />
-    <public type="color" name="common_google_signin_btn_text_light_pressed" id="0x7f060055" />
-    <public type="color" name="common_google_signin_btn_tint" id="0x7f060056" />
-    <public type="color" name="dark_grey_2" id="0x7f060057" />
-    <public type="color" name="dark_grey_2_alpha_10" id="0x7f060058" />
-    <public type="color" name="design_bottom_navigation_shadow_color" id="0x7f060059" />
-    <public type="color" name="design_default_color_primary" id="0x7f06005a" />
-    <public type="color" name="design_default_color_primary_dark" id="0x7f06005b" />
-    <public type="color" name="design_error" id="0x7f06005c" />
-    <public type="color" name="design_fab_shadow_end_color" id="0x7f06005d" />
-    <public type="color" name="design_fab_shadow_mid_color" id="0x7f06005e" />
-    <public type="color" name="design_fab_shadow_start_color" id="0x7f06005f" />
-    <public type="color" name="design_fab_stroke_end_inner_color" id="0x7f060060" />
-    <public type="color" name="design_fab_stroke_end_outer_color" id="0x7f060061" />
-    <public type="color" name="design_fab_stroke_top_inner_color" id="0x7f060062" />
-    <public type="color" name="design_fab_stroke_top_outer_color" id="0x7f060063" />
-    <public type="color" name="design_snackbar_background_color" id="0x7f060064" />
-    <public type="color" name="design_tint_password_toggle" id="0x7f060065" />
-    <public type="color" name="dim_foreground_disabled_material_dark" id="0x7f060066" />
-    <public type="color" name="dim_foreground_disabled_material_light" id="0x7f060067" />
-    <public type="color" name="dim_foreground_material_dark" id="0x7f060068" />
-    <public type="color" name="dim_foreground_material_light" id="0x7f060069" />
-    <public type="color" name="error_color_material_dark" id="0x7f06006a" />
-    <public type="color" name="error_color_material_light" id="0x7f06006b" />
-    <public type="color" name="facebook" id="0x7f06006c" />
-    <public type="color" name="flexInputIconColor" id="0x7f06006d" />
-    <public type="color" name="flexInputIconColorActivated" id="0x7f06006e" />
-    <public type="color" name="flexInputIconColorDisabled" id="0x7f06006f" />
-    <public type="color" name="foreground_material_dark" id="0x7f060070" />
-    <public type="color" name="foreground_material_light" id="0x7f060071" />
-    <public type="color" name="google" id="0x7f060072" />
-    <public type="color" name="grey_1" id="0x7f060073" />
-    <public type="color" name="grey_1_alpha_60" id="0x7f060074" />
-    <public type="color" name="grey_2" id="0x7f060075" />
-    <public type="color" name="grey_3" id="0x7f060076" />
-    <public type="color" name="grey_3_alpha_30" id="0x7f060077" />
-    <public type="color" name="grey_4" id="0x7f060078" />
-    <public type="color" name="grey_6" id="0x7f060079" />
-    <public type="color" name="grey_6_alpha_05" id="0x7f06007a" />
-    <public type="color" name="grey_6_alpha_30" id="0x7f06007b" />
-    <public type="color" name="grey_account" id="0x7f06007c" />
-    <public type="color" name="grey_channels" id="0x7f06007d" />
-    <public type="color" name="grey_guilds" id="0x7f06007e" />
-    <public type="color" name="grey_unread" id="0x7f06007f" />
-    <public type="color" name="highlighted_text_material_dark" id="0x7f060080" />
-    <public type="color" name="highlighted_text_material_light" id="0x7f060081" />
-    <public type="color" name="hypesquad_house1" id="0x7f060082" />
-    <public type="color" name="hypesquad_house2" id="0x7f060083" />
-    <public type="color" name="hypesquad_house3" id="0x7f060084" />
-    <public type="color" name="league_of_legends" id="0x7f060085" />
-    <public type="color" name="link_100" id="0x7f060086" />
-    <public type="color" name="link_200" id="0x7f060087" />
-    <public type="color" name="link_300" id="0x7f060088" />
-    <public type="color" name="link_400" id="0x7f060089" />
-    <public type="color" name="link_500" id="0x7f06008a" />
-    <public type="color" name="link_600" id="0x7f06008b" />
-    <public type="color" name="link_700" id="0x7f06008c" />
-    <public type="color" name="link_800" id="0x7f06008d" />
-    <public type="color" name="link_900" id="0x7f06008e" />
-    <public type="color" name="material_blue_grey_800" id="0x7f06008f" />
-    <public type="color" name="material_blue_grey_900" id="0x7f060090" />
-    <public type="color" name="material_blue_grey_950" id="0x7f060091" />
-    <public type="color" name="material_deep_teal_200" id="0x7f060092" />
-    <public type="color" name="material_deep_teal_500" id="0x7f060093" />
-    <public type="color" name="material_grey_100" id="0x7f060094" />
-    <public type="color" name="material_grey_300" id="0x7f060095" />
-    <public type="color" name="material_grey_50" id="0x7f060096" />
-    <public type="color" name="material_grey_600" id="0x7f060097" />
-    <public type="color" name="material_grey_800" id="0x7f060098" />
-    <public type="color" name="material_grey_850" id="0x7f060099" />
-    <public type="color" name="material_grey_900" id="0x7f06009a" />
-    <public type="color" name="mtrl_bottom_nav_colored_item_tint" id="0x7f06009b" />
-    <public type="color" name="mtrl_bottom_nav_item_tint" id="0x7f06009c" />
-    <public type="color" name="mtrl_btn_bg_color_disabled" id="0x7f06009d" />
-    <public type="color" name="mtrl_btn_bg_color_selector" id="0x7f06009e" />
-    <public type="color" name="mtrl_btn_ripple_color" id="0x7f06009f" />
-    <public type="color" name="mtrl_btn_stroke_color_selector" id="0x7f0600a0" />
-    <public type="color" name="mtrl_btn_text_btn_ripple_color" id="0x7f0600a1" />
-    <public type="color" name="mtrl_btn_text_color_disabled" id="0x7f0600a2" />
-    <public type="color" name="mtrl_btn_text_color_selector" id="0x7f0600a3" />
-    <public type="color" name="mtrl_btn_transparent_bg_color" id="0x7f0600a4" />
-    <public type="color" name="mtrl_chip_background_color" id="0x7f0600a5" />
-    <public type="color" name="mtrl_chip_close_icon_tint" id="0x7f0600a6" />
-    <public type="color" name="mtrl_chip_ripple_color" id="0x7f0600a7" />
-    <public type="color" name="mtrl_chip_text_color" id="0x7f0600a8" />
-    <public type="color" name="mtrl_fab_ripple_color" id="0x7f0600a9" />
-    <public type="color" name="mtrl_scrim_color" id="0x7f0600aa" />
-    <public type="color" name="mtrl_tabs_colored_ripple_color" id="0x7f0600ab" />
-    <public type="color" name="mtrl_tabs_icon_color_selector" id="0x7f0600ac" />
-    <public type="color" name="mtrl_tabs_icon_color_selector_colored" id="0x7f0600ad" />
-    <public type="color" name="mtrl_tabs_legacy_text_color_selector" id="0x7f0600ae" />
-    <public type="color" name="mtrl_tabs_ripple_color" id="0x7f0600af" />
-    <public type="color" name="mtrl_text_btn_text_color_selector" id="0x7f0600b0" />
-    <public type="color" name="mtrl_textinput_default_box_stroke_color" id="0x7f0600b1" />
-    <public type="color" name="mtrl_textinput_disabled_color" id="0x7f0600b2" />
-    <public type="color" name="mtrl_textinput_filled_box_default_background_color" id="0x7f0600b3" />
-    <public type="color" name="mtrl_textinput_hovered_box_stroke_color" id="0x7f0600b4" />
-    <public type="color" name="notification_action_color_filter" id="0x7f0600b5" />
-    <public type="color" name="notification_icon_bg_color" id="0x7f0600b6" />
-    <public type="color" name="notification_material_background_media_default_color" id="0x7f0600b7" />
-    <public type="color" name="placeholder" id="0x7f0600b8" />
-    <public type="color" name="primary_100" id="0x7f0600b9" />
-    <public type="color" name="primary_100_alpha_30" id="0x7f0600ba" />
-    <public type="color" name="primary_100_alpha_60" id="0x7f0600bb" />
-    <public type="color" name="primary_100_alpha_80" id="0x7f0600bc" />
-    <public type="color" name="primary_100_alpha_90" id="0x7f0600bd" />
-    <public type="color" name="primary_200" id="0x7f0600be" />
-    <public type="color" name="primary_200_alpha_30" id="0x7f0600bf" />
-    <public type="color" name="primary_200_alpha_60" id="0x7f0600c0" />
-    <public type="color" name="primary_300" id="0x7f0600c1" />
-    <public type="color" name="primary_300_alpha_30" id="0x7f0600c2" />
-    <public type="color" name="primary_300_alpha_60" id="0x7f0600c3" />
-    <public type="color" name="primary_400" id="0x7f0600c4" />
-    <public type="color" name="primary_400_alpha_30" id="0x7f0600c5" />
-    <public type="color" name="primary_400_alpha_60" id="0x7f0600c6" />
-    <public type="color" name="primary_500" id="0x7f0600c7" />
-    <public type="color" name="primary_500_alpha_30" id="0x7f0600c8" />
-    <public type="color" name="primary_500_alpha_60" id="0x7f0600c9" />
-    <public type="color" name="primary_560" id="0x7f0600ca" />
-    <public type="color" name="primary_600" id="0x7f0600cb" />
-    <public type="color" name="primary_600_alpha_60" id="0x7f0600cc" />
-    <public type="color" name="primary_630" id="0x7f0600cd" />
-    <public type="color" name="primary_630_alpha_60" id="0x7f0600ce" />
-    <public type="color" name="primary_630_alpha_90" id="0x7f0600cf" />
-    <public type="color" name="primary_660" id="0x7f0600d0" />
-    <public type="color" name="primary_700" id="0x7f0600d1" />
-    <public type="color" name="primary_700_alpha_60" id="0x7f0600d2" />
-    <public type="color" name="primary_800" id="0x7f0600d3" />
-    <public type="color" name="primary_800_alpha_60" id="0x7f0600d4" />
-    <public type="color" name="primary_800_alpha_90" id="0x7f0600d5" />
-    <public type="color" name="primary_900" id="0x7f0600d6" />
-    <public type="color" name="primary_900_alpha_30" id="0x7f0600d7" />
-    <public type="color" name="primary_900_alpha_60" id="0x7f0600d8" />
-    <public type="color" name="primary_dark_material_dark" id="0x7f0600d9" />
-    <public type="color" name="primary_dark_material_light" id="0x7f0600da" />
-    <public type="color" name="primary_light_100" id="0x7f0600db" />
-    <public type="color" name="primary_light_130" id="0x7f0600dc" />
-    <public type="color" name="primary_light_160" id="0x7f0600dd" />
-    <public type="color" name="primary_light_200" id="0x7f0600de" />
-    <public type="color" name="primary_light_230" id="0x7f0600df" />
-    <public type="color" name="primary_light_260" id="0x7f0600e0" />
-    <public type="color" name="primary_light_300" id="0x7f0600e1" />
-    <public type="color" name="primary_light_330" id="0x7f0600e2" />
-    <public type="color" name="primary_light_360" id="0x7f0600e3" />
-    <public type="color" name="primary_light_400" id="0x7f0600e4" />
-    <public type="color" name="primary_light_500" id="0x7f0600e5" />
-    <public type="color" name="primary_light_600" id="0x7f0600e6" />
-    <public type="color" name="primary_light_700" id="0x7f0600e7" />
-    <public type="color" name="primary_light_800" id="0x7f0600e8" />
-    <public type="color" name="primary_light_900" id="0x7f0600e9" />
-    <public type="color" name="primary_material_dark" id="0x7f0600ea" />
-    <public type="color" name="primary_material_light" id="0x7f0600eb" />
-    <public type="color" name="primary_text_default_material_dark" id="0x7f0600ec" />
-    <public type="color" name="primary_text_default_material_light" id="0x7f0600ed" />
-    <public type="color" name="primary_text_disabled_material_dark" id="0x7f0600ee" />
-    <public type="color" name="primary_text_disabled_material_light" id="0x7f0600ef" />
-    <public type="color" name="purple_brand" id="0x7f0600f0" />
-    <public type="color" name="purple_brand_alpha_10" id="0x7f0600f1" />
-    <public type="color" name="purple_brand_dark" id="0x7f0600f2" />
-    <public type="color" name="purple_brand_hint" id="0x7f0600f3" />
-    <public type="color" name="purple_brand_notification" id="0x7f0600f4" />
-    <public type="color" name="reaction_background_me_dark" id="0x7f0600f5" />
-    <public type="color" name="reaction_background_me_light" id="0x7f0600f6" />
-    <public type="color" name="reddit" id="0x7f0600f7" />
-    <public type="color" name="rich_presence_spotify_play_button" id="0x7f0600f8" />
-    <public type="color" name="ripple_material_dark" id="0x7f0600f9" />
-    <public type="color" name="ripple_material_light" id="0x7f0600fa" />
-    <public type="color" name="secondary_text_default_material_dark" id="0x7f0600fb" />
-    <public type="color" name="secondary_text_default_material_light" id="0x7f0600fc" />
-    <public type="color" name="secondary_text_disabled_material_dark" id="0x7f0600fd" />
-    <public type="color" name="secondary_text_disabled_material_light" id="0x7f0600fe" />
-    <public type="color" name="skype" id="0x7f0600ff" />
-    <public type="color" name="spotify" id="0x7f060100" />
-    <public type="color" name="status_green_100" id="0x7f060101" />
-    <public type="color" name="status_green_200" id="0x7f060102" />
-    <public type="color" name="status_green_300" id="0x7f060103" />
-    <public type="color" name="status_green_400" id="0x7f060104" />
-    <public type="color" name="status_green_500" id="0x7f060105" />
-    <public type="color" name="status_green_500_alpha_60" id="0x7f060106" />
-    <public type="color" name="status_green_500_dark" id="0x7f060107" />
-    <public type="color" name="status_green_600" id="0x7f060108" />
-    <public type="color" name="status_green_700" id="0x7f060109" />
-    <public type="color" name="status_green_800" id="0x7f06010a" />
-    <public type="color" name="status_green_900" id="0x7f06010b" />
-    <public type="color" name="status_grey_100" id="0x7f06010c" />
-    <public type="color" name="status_grey_200" id="0x7f06010d" />
-    <public type="color" name="status_grey_300" id="0x7f06010e" />
-    <public type="color" name="status_grey_400" id="0x7f06010f" />
-    <public type="color" name="status_grey_500" id="0x7f060110" />
-    <public type="color" name="status_grey_600" id="0x7f060111" />
-    <public type="color" name="status_grey_700" id="0x7f060112" />
-    <public type="color" name="status_grey_800" id="0x7f060113" />
-    <public type="color" name="status_grey_900" id="0x7f060114" />
-    <public type="color" name="status_grey_alpha_50" id="0x7f060115" />
-    <public type="color" name="status_orange_500" id="0x7f060116" />
-    <public type="color" name="status_red_100" id="0x7f060117" />
-    <public type="color" name="status_red_200" id="0x7f060118" />
-    <public type="color" name="status_red_300" id="0x7f060119" />
-    <public type="color" name="status_red_400" id="0x7f06011a" />
-    <public type="color" name="status_red_500" id="0x7f06011b" />
-    <public type="color" name="status_red_500_alpha_60" id="0x7f06011c" />
-    <public type="color" name="status_red_500_dark" id="0x7f06011d" />
-    <public type="color" name="status_red_600" id="0x7f06011e" />
-    <public type="color" name="status_red_700" id="0x7f06011f" />
-    <public type="color" name="status_red_800" id="0x7f060120" />
-    <public type="color" name="status_red_900" id="0x7f060121" />
-    <public type="color" name="status_yellow_100" id="0x7f060122" />
-    <public type="color" name="status_yellow_200" id="0x7f060123" />
-    <public type="color" name="status_yellow_300" id="0x7f060124" />
-    <public type="color" name="status_yellow_400" id="0x7f060125" />
-    <public type="color" name="status_yellow_500" id="0x7f060126" />
-    <public type="color" name="status_yellow_500_alpha_60" id="0x7f060127" />
-    <public type="color" name="status_yellow_600" id="0x7f060128" />
-    <public type="color" name="status_yellow_700" id="0x7f060129" />
-    <public type="color" name="status_yellow_800" id="0x7f06012a" />
-    <public type="color" name="status_yellow_900" id="0x7f06012b" />
-    <public type="color" name="steam" id="0x7f06012c" />
-    <public type="color" name="switch_thumb_disabled_material_dark" id="0x7f06012d" />
-    <public type="color" name="switch_thumb_disabled_material_light" id="0x7f06012e" />
-    <public type="color" name="switch_thumb_material_dark" id="0x7f06012f" />
-    <public type="color" name="switch_thumb_material_light" id="0x7f060130" />
-    <public type="color" name="switch_thumb_normal_material_dark" id="0x7f060131" />
-    <public type="color" name="switch_thumb_normal_material_light" id="0x7f060132" />
-    <public type="color" name="tab_color_selector" id="0x7f060133" />
-    <public type="color" name="tooltip_background_dark" id="0x7f060134" />
-    <public type="color" name="tooltip_background_light" id="0x7f060135" />
-    <public type="color" name="transparent" id="0x7f060136" />
-    <public type="color" name="twitch" id="0x7f060137" />
-    <public type="color" name="twitter" id="0x7f060138" />
-    <public type="color" name="ucrop_color_crop_background" id="0x7f060139" />
-    <public type="color" name="ucrop_color_default_crop_frame" id="0x7f06013a" />
-    <public type="color" name="ucrop_color_default_crop_grid" id="0x7f06013b" />
-    <public type="color" name="ucrop_color_default_dimmed" id="0x7f06013c" />
-    <public type="color" name="ucrop_color_default_logo" id="0x7f06013d" />
-    <public type="color" name="ucrop_color_progress_wheel_line" id="0x7f06013e" />
-    <public type="color" name="ucrop_color_statusbar" id="0x7f06013f" />
-    <public type="color" name="ucrop_color_toolbar" id="0x7f060140" />
-    <public type="color" name="ucrop_color_toolbar_widget" id="0x7f060141" />
-    <public type="color" name="ucrop_color_widget" id="0x7f060142" />
-    <public type="color" name="ucrop_color_widget_active" id="0x7f060143" />
-    <public type="color" name="ucrop_color_widget_background" id="0x7f060144" />
-    <public type="color" name="ucrop_color_widget_text" id="0x7f060145" />
-    <public type="color" name="ucrop_scale_text_view_selector" id="0x7f060146" />
-    <public type="color" name="uikit_settings_item_text_color_dark" id="0x7f060147" />
-    <public type="color" name="uikit_settings_item_text_color_light" id="0x7f060148" />
-    <public type="color" name="white" id="0x7f060149" />
-    <public type="color" name="white_1" id="0x7f06014a" />
-    <public type="color" name="white_2" id="0x7f06014b" />
-    <public type="color" name="white_3" id="0x7f06014c" />
-    <public type="color" name="white_3_alpha_25" id="0x7f06014d" />
-    <public type="color" name="white_5" id="0x7f06014e" />
-    <public type="color" name="white_6" id="0x7f06014f" />
-    <public type="color" name="white_alpha_05" id="0x7f060150" />
-    <public type="color" name="white_alpha_10" id="0x7f060151" />
-    <public type="color" name="white_alpha_20" id="0x7f060152" />
-    <public type="color" name="white_alpha_30" id="0x7f060153" />
-    <public type="color" name="white_alpha_40" id="0x7f060154" />
-    <public type="color" name="white_alpha_70" id="0x7f060155" />
-    <public type="color" name="white_alpha_80" id="0x7f060156" />
-    <public type="color" name="xbox" id="0x7f060157" />
-    <public type="color" name="youtube" id="0x7f060158" />
+    <public type="color" name="black_alpha_70" id="0x7f060027" />
+    <public type="color" name="black_alpha_80" id="0x7f060028" />
+    <public type="color" name="brand_100" id="0x7f060029" />
+    <public type="color" name="brand_200" id="0x7f06002a" />
+    <public type="color" name="brand_300" id="0x7f06002b" />
+    <public type="color" name="brand_400" id="0x7f06002c" />
+    <public type="color" name="brand_500" id="0x7f06002d" />
+    <public type="color" name="brand_500_alpha_30" id="0x7f06002e" />
+    <public type="color" name="brand_500_alpha_60" id="0x7f06002f" />
+    <public type="color" name="brand_600" id="0x7f060030" />
+    <public type="color" name="brand_630" id="0x7f060031" />
+    <public type="color" name="brand_700" id="0x7f060032" />
+    <public type="color" name="brand_800" id="0x7f060033" />
+    <public type="color" name="brand_900" id="0x7f060034" />
+    <public type="color" name="bright_foreground_disabled_material_dark" id="0x7f060035" />
+    <public type="color" name="bright_foreground_disabled_material_light" id="0x7f060036" />
+    <public type="color" name="bright_foreground_inverse_material_dark" id="0x7f060037" />
+    <public type="color" name="bright_foreground_inverse_material_light" id="0x7f060038" />
+    <public type="color" name="bright_foreground_material_dark" id="0x7f060039" />
+    <public type="color" name="bright_foreground_material_light" id="0x7f06003a" />
+    <public type="color" name="browser_actions_bg_grey" id="0x7f06003b" />
+    <public type="color" name="browser_actions_divider_color" id="0x7f06003c" />
+    <public type="color" name="browser_actions_text_color" id="0x7f06003d" />
+    <public type="color" name="browser_actions_title_color" id="0x7f06003e" />
+    <public type="color" name="button_color_selector" id="0x7f06003f" />
+    <public type="color" name="button_material_dark" id="0x7f060040" />
+    <public type="color" name="button_material_light" id="0x7f060041" />
+    <public type="color" name="cardview_dark_background" id="0x7f060042" />
+    <public type="color" name="cardview_light_background" id="0x7f060043" />
+    <public type="color" name="cardview_shadow_end_color" id="0x7f060044" />
+    <public type="color" name="cardview_shadow_start_color" id="0x7f060045" />
+    <public type="color" name="channel_list_item_text_color" id="0x7f060046" />
+    <public type="color" name="channel_list_item_voice_text_color_dark" id="0x7f060047" />
+    <public type="color" name="chat_input_button_tint_colors_dark" id="0x7f060048" />
+    <public type="color" name="chat_input_button_tint_colors_light" id="0x7f060049" />
+    <public type="color" name="code" id="0x7f06004a" />
+    <public type="color" name="colorPrimary" id="0x7f06004b" />
+    <public type="color" name="colorPrimaryDark" id="0x7f06004c" />
+    <public type="color" name="color_clicked_darker" id="0x7f06004d" />
+    <public type="color" name="color_clicked_lighter" id="0x7f06004e" />
+    <public type="color" name="common_google_signin_btn_text_dark" id="0x7f06004f" />
+    <public type="color" name="common_google_signin_btn_text_dark_default" id="0x7f060050" />
+    <public type="color" name="common_google_signin_btn_text_dark_disabled" id="0x7f060051" />
+    <public type="color" name="common_google_signin_btn_text_dark_focused" id="0x7f060052" />
+    <public type="color" name="common_google_signin_btn_text_dark_pressed" id="0x7f060053" />
+    <public type="color" name="common_google_signin_btn_text_light" id="0x7f060054" />
+    <public type="color" name="common_google_signin_btn_text_light_default" id="0x7f060055" />
+    <public type="color" name="common_google_signin_btn_text_light_disabled" id="0x7f060056" />
+    <public type="color" name="common_google_signin_btn_text_light_focused" id="0x7f060057" />
+    <public type="color" name="common_google_signin_btn_text_light_pressed" id="0x7f060058" />
+    <public type="color" name="common_google_signin_btn_tint" id="0x7f060059" />
+    <public type="color" name="dark_grey_2" id="0x7f06005a" />
+    <public type="color" name="dark_grey_2_alpha_10" id="0x7f06005b" />
+    <public type="color" name="design_bottom_navigation_shadow_color" id="0x7f06005c" />
+    <public type="color" name="design_default_color_primary" id="0x7f06005d" />
+    <public type="color" name="design_default_color_primary_dark" id="0x7f06005e" />
+    <public type="color" name="design_error" id="0x7f06005f" />
+    <public type="color" name="design_fab_shadow_end_color" id="0x7f060060" />
+    <public type="color" name="design_fab_shadow_mid_color" id="0x7f060061" />
+    <public type="color" name="design_fab_shadow_start_color" id="0x7f060062" />
+    <public type="color" name="design_fab_stroke_end_inner_color" id="0x7f060063" />
+    <public type="color" name="design_fab_stroke_end_outer_color" id="0x7f060064" />
+    <public type="color" name="design_fab_stroke_top_inner_color" id="0x7f060065" />
+    <public type="color" name="design_fab_stroke_top_outer_color" id="0x7f060066" />
+    <public type="color" name="design_snackbar_background_color" id="0x7f060067" />
+    <public type="color" name="design_tint_password_toggle" id="0x7f060068" />
+    <public type="color" name="dim_foreground_disabled_material_dark" id="0x7f060069" />
+    <public type="color" name="dim_foreground_disabled_material_light" id="0x7f06006a" />
+    <public type="color" name="dim_foreground_material_dark" id="0x7f06006b" />
+    <public type="color" name="dim_foreground_material_light" id="0x7f06006c" />
+    <public type="color" name="error_color_material_dark" id="0x7f06006d" />
+    <public type="color" name="error_color_material_light" id="0x7f06006e" />
+    <public type="color" name="facebook" id="0x7f06006f" />
+    <public type="color" name="flexInputIconColor" id="0x7f060070" />
+    <public type="color" name="flexInputIconColorActivated" id="0x7f060071" />
+    <public type="color" name="flexInputIconColorDisabled" id="0x7f060072" />
+    <public type="color" name="foreground_material_dark" id="0x7f060073" />
+    <public type="color" name="foreground_material_light" id="0x7f060074" />
+    <public type="color" name="google" id="0x7f060075" />
+    <public type="color" name="grey_1" id="0x7f060076" />
+    <public type="color" name="grey_1_alpha_60" id="0x7f060077" />
+    <public type="color" name="grey_2" id="0x7f060078" />
+    <public type="color" name="grey_3" id="0x7f060079" />
+    <public type="color" name="grey_3_alpha_30" id="0x7f06007a" />
+    <public type="color" name="grey_4" id="0x7f06007b" />
+    <public type="color" name="grey_6" id="0x7f06007c" />
+    <public type="color" name="grey_6_alpha_05" id="0x7f06007d" />
+    <public type="color" name="grey_6_alpha_30" id="0x7f06007e" />
+    <public type="color" name="grey_account" id="0x7f06007f" />
+    <public type="color" name="grey_channels" id="0x7f060080" />
+    <public type="color" name="grey_guilds" id="0x7f060081" />
+    <public type="color" name="grey_unread" id="0x7f060082" />
+    <public type="color" name="highlighted_text_material_dark" id="0x7f060083" />
+    <public type="color" name="highlighted_text_material_light" id="0x7f060084" />
+    <public type="color" name="hypesquad_house1" id="0x7f060085" />
+    <public type="color" name="hypesquad_house2" id="0x7f060086" />
+    <public type="color" name="hypesquad_house3" id="0x7f060087" />
+    <public type="color" name="league_of_legends" id="0x7f060088" />
+    <public type="color" name="link_100" id="0x7f060089" />
+    <public type="color" name="link_200" id="0x7f06008a" />
+    <public type="color" name="link_300" id="0x7f06008b" />
+    <public type="color" name="link_400" id="0x7f06008c" />
+    <public type="color" name="link_500" id="0x7f06008d" />
+    <public type="color" name="link_600" id="0x7f06008e" />
+    <public type="color" name="link_700" id="0x7f06008f" />
+    <public type="color" name="link_800" id="0x7f060090" />
+    <public type="color" name="link_900" id="0x7f060091" />
+    <public type="color" name="material_blue_grey_800" id="0x7f060092" />
+    <public type="color" name="material_blue_grey_900" id="0x7f060093" />
+    <public type="color" name="material_blue_grey_950" id="0x7f060094" />
+    <public type="color" name="material_deep_teal_200" id="0x7f060095" />
+    <public type="color" name="material_deep_teal_500" id="0x7f060096" />
+    <public type="color" name="material_grey_100" id="0x7f060097" />
+    <public type="color" name="material_grey_300" id="0x7f060098" />
+    <public type="color" name="material_grey_50" id="0x7f060099" />
+    <public type="color" name="material_grey_600" id="0x7f06009a" />
+    <public type="color" name="material_grey_800" id="0x7f06009b" />
+    <public type="color" name="material_grey_850" id="0x7f06009c" />
+    <public type="color" name="material_grey_900" id="0x7f06009d" />
+    <public type="color" name="mtrl_bottom_nav_colored_item_tint" id="0x7f06009e" />
+    <public type="color" name="mtrl_bottom_nav_item_tint" id="0x7f06009f" />
+    <public type="color" name="mtrl_btn_bg_color_disabled" id="0x7f0600a0" />
+    <public type="color" name="mtrl_btn_bg_color_selector" id="0x7f0600a1" />
+    <public type="color" name="mtrl_btn_ripple_color" id="0x7f0600a2" />
+    <public type="color" name="mtrl_btn_stroke_color_selector" id="0x7f0600a3" />
+    <public type="color" name="mtrl_btn_text_btn_ripple_color" id="0x7f0600a4" />
+    <public type="color" name="mtrl_btn_text_color_disabled" id="0x7f0600a5" />
+    <public type="color" name="mtrl_btn_text_color_selector" id="0x7f0600a6" />
+    <public type="color" name="mtrl_btn_transparent_bg_color" id="0x7f0600a7" />
+    <public type="color" name="mtrl_chip_background_color" id="0x7f0600a8" />
+    <public type="color" name="mtrl_chip_close_icon_tint" id="0x7f0600a9" />
+    <public type="color" name="mtrl_chip_ripple_color" id="0x7f0600aa" />
+    <public type="color" name="mtrl_chip_text_color" id="0x7f0600ab" />
+    <public type="color" name="mtrl_fab_ripple_color" id="0x7f0600ac" />
+    <public type="color" name="mtrl_scrim_color" id="0x7f0600ad" />
+    <public type="color" name="mtrl_tabs_colored_ripple_color" id="0x7f0600ae" />
+    <public type="color" name="mtrl_tabs_icon_color_selector" id="0x7f0600af" />
+    <public type="color" name="mtrl_tabs_icon_color_selector_colored" id="0x7f0600b0" />
+    <public type="color" name="mtrl_tabs_legacy_text_color_selector" id="0x7f0600b1" />
+    <public type="color" name="mtrl_tabs_ripple_color" id="0x7f0600b2" />
+    <public type="color" name="mtrl_text_btn_text_color_selector" id="0x7f0600b3" />
+    <public type="color" name="mtrl_textinput_default_box_stroke_color" id="0x7f0600b4" />
+    <public type="color" name="mtrl_textinput_disabled_color" id="0x7f0600b5" />
+    <public type="color" name="mtrl_textinput_filled_box_default_background_color" id="0x7f0600b6" />
+    <public type="color" name="mtrl_textinput_hovered_box_stroke_color" id="0x7f0600b7" />
+    <public type="color" name="notification_action_color_filter" id="0x7f0600b8" />
+    <public type="color" name="notification_icon_bg_color" id="0x7f0600b9" />
+    <public type="color" name="notification_material_background_media_default_color" id="0x7f0600ba" />
+    <public type="color" name="placeholder" id="0x7f0600bb" />
+    <public type="color" name="primary_100" id="0x7f0600bc" />
+    <public type="color" name="primary_100_alpha_30" id="0x7f0600bd" />
+    <public type="color" name="primary_100_alpha_60" id="0x7f0600be" />
+    <public type="color" name="primary_100_alpha_80" id="0x7f0600bf" />
+    <public type="color" name="primary_100_alpha_90" id="0x7f0600c0" />
+    <public type="color" name="primary_200" id="0x7f0600c1" />
+    <public type="color" name="primary_200_alpha_30" id="0x7f0600c2" />
+    <public type="color" name="primary_200_alpha_60" id="0x7f0600c3" />
+    <public type="color" name="primary_300" id="0x7f0600c4" />
+    <public type="color" name="primary_300_alpha_30" id="0x7f0600c5" />
+    <public type="color" name="primary_300_alpha_60" id="0x7f0600c6" />
+    <public type="color" name="primary_400" id="0x7f0600c7" />
+    <public type="color" name="primary_400_alpha_30" id="0x7f0600c8" />
+    <public type="color" name="primary_400_alpha_60" id="0x7f0600c9" />
+    <public type="color" name="primary_500" id="0x7f0600ca" />
+    <public type="color" name="primary_500_alpha_30" id="0x7f0600cb" />
+    <public type="color" name="primary_500_alpha_60" id="0x7f0600cc" />
+    <public type="color" name="primary_560" id="0x7f0600cd" />
+    <public type="color" name="primary_600" id="0x7f0600ce" />
+    <public type="color" name="primary_600_alpha_60" id="0x7f0600cf" />
+    <public type="color" name="primary_630" id="0x7f0600d0" />
+    <public type="color" name="primary_630_alpha_60" id="0x7f0600d1" />
+    <public type="color" name="primary_630_alpha_90" id="0x7f0600d2" />
+    <public type="color" name="primary_660" id="0x7f0600d3" />
+    <public type="color" name="primary_700" id="0x7f0600d4" />
+    <public type="color" name="primary_700_alpha_60" id="0x7f0600d5" />
+    <public type="color" name="primary_800" id="0x7f0600d6" />
+    <public type="color" name="primary_800_alpha_60" id="0x7f0600d7" />
+    <public type="color" name="primary_800_alpha_90" id="0x7f0600d8" />
+    <public type="color" name="primary_900" id="0x7f0600d9" />
+    <public type="color" name="primary_900_alpha_30" id="0x7f0600da" />
+    <public type="color" name="primary_900_alpha_60" id="0x7f0600db" />
+    <public type="color" name="primary_dark_material_dark" id="0x7f0600dc" />
+    <public type="color" name="primary_dark_material_light" id="0x7f0600dd" />
+    <public type="color" name="primary_light_100" id="0x7f0600de" />
+    <public type="color" name="primary_light_130" id="0x7f0600df" />
+    <public type="color" name="primary_light_160" id="0x7f0600e0" />
+    <public type="color" name="primary_light_200" id="0x7f0600e1" />
+    <public type="color" name="primary_light_230" id="0x7f0600e2" />
+    <public type="color" name="primary_light_260" id="0x7f0600e3" />
+    <public type="color" name="primary_light_300" id="0x7f0600e4" />
+    <public type="color" name="primary_light_330" id="0x7f0600e5" />
+    <public type="color" name="primary_light_360" id="0x7f0600e6" />
+    <public type="color" name="primary_light_400" id="0x7f0600e7" />
+    <public type="color" name="primary_light_500" id="0x7f0600e8" />
+    <public type="color" name="primary_light_600" id="0x7f0600e9" />
+    <public type="color" name="primary_light_700" id="0x7f0600ea" />
+    <public type="color" name="primary_light_800" id="0x7f0600eb" />
+    <public type="color" name="primary_light_900" id="0x7f0600ec" />
+    <public type="color" name="primary_material_dark" id="0x7f0600ed" />
+    <public type="color" name="primary_material_light" id="0x7f0600ee" />
+    <public type="color" name="primary_text_default_material_dark" id="0x7f0600ef" />
+    <public type="color" name="primary_text_default_material_light" id="0x7f0600f0" />
+    <public type="color" name="primary_text_disabled_material_dark" id="0x7f0600f1" />
+    <public type="color" name="primary_text_disabled_material_light" id="0x7f0600f2" />
+    <public type="color" name="purple_brand" id="0x7f0600f3" />
+    <public type="color" name="purple_brand_alpha_10" id="0x7f0600f4" />
+    <public type="color" name="purple_brand_dark" id="0x7f0600f5" />
+    <public type="color" name="purple_brand_hint" id="0x7f0600f6" />
+    <public type="color" name="purple_brand_notification" id="0x7f0600f7" />
+    <public type="color" name="reaction_background_me_dark" id="0x7f0600f8" />
+    <public type="color" name="reaction_background_me_light" id="0x7f0600f9" />
+    <public type="color" name="reddit" id="0x7f0600fa" />
+    <public type="color" name="ripple_material_dark" id="0x7f0600fb" />
+    <public type="color" name="ripple_material_light" id="0x7f0600fc" />
+    <public type="color" name="secondary_text_default_material_dark" id="0x7f0600fd" />
+    <public type="color" name="secondary_text_default_material_light" id="0x7f0600fe" />
+    <public type="color" name="secondary_text_disabled_material_dark" id="0x7f0600ff" />
+    <public type="color" name="secondary_text_disabled_material_light" id="0x7f060100" />
+    <public type="color" name="skype" id="0x7f060101" />
+    <public type="color" name="spotify" id="0x7f060102" />
+    <public type="color" name="status_green_100" id="0x7f060103" />
+    <public type="color" name="status_green_200" id="0x7f060104" />
+    <public type="color" name="status_green_300" id="0x7f060105" />
+    <public type="color" name="status_green_400" id="0x7f060106" />
+    <public type="color" name="status_green_500" id="0x7f060107" />
+    <public type="color" name="status_green_500_alpha_60" id="0x7f060108" />
+    <public type="color" name="status_green_500_dark" id="0x7f060109" />
+    <public type="color" name="status_green_600" id="0x7f06010a" />
+    <public type="color" name="status_green_700" id="0x7f06010b" />
+    <public type="color" name="status_green_800" id="0x7f06010c" />
+    <public type="color" name="status_green_900" id="0x7f06010d" />
+    <public type="color" name="status_grey_100" id="0x7f06010e" />
+    <public type="color" name="status_grey_200" id="0x7f06010f" />
+    <public type="color" name="status_grey_300" id="0x7f060110" />
+    <public type="color" name="status_grey_400" id="0x7f060111" />
+    <public type="color" name="status_grey_500" id="0x7f060112" />
+    <public type="color" name="status_grey_600" id="0x7f060113" />
+    <public type="color" name="status_grey_700" id="0x7f060114" />
+    <public type="color" name="status_grey_800" id="0x7f060115" />
+    <public type="color" name="status_grey_900" id="0x7f060116" />
+    <public type="color" name="status_grey_alpha_50" id="0x7f060117" />
+    <public type="color" name="status_orange_500" id="0x7f060118" />
+    <public type="color" name="status_red_100" id="0x7f060119" />
+    <public type="color" name="status_red_200" id="0x7f06011a" />
+    <public type="color" name="status_red_300" id="0x7f06011b" />
+    <public type="color" name="status_red_400" id="0x7f06011c" />
+    <public type="color" name="status_red_500" id="0x7f06011d" />
+    <public type="color" name="status_red_500_alpha_60" id="0x7f06011e" />
+    <public type="color" name="status_red_500_dark" id="0x7f06011f" />
+    <public type="color" name="status_red_600" id="0x7f060120" />
+    <public type="color" name="status_red_700" id="0x7f060121" />
+    <public type="color" name="status_red_800" id="0x7f060122" />
+    <public type="color" name="status_red_900" id="0x7f060123" />
+    <public type="color" name="status_yellow_100" id="0x7f060124" />
+    <public type="color" name="status_yellow_200" id="0x7f060125" />
+    <public type="color" name="status_yellow_300" id="0x7f060126" />
+    <public type="color" name="status_yellow_400" id="0x7f060127" />
+    <public type="color" name="status_yellow_500" id="0x7f060128" />
+    <public type="color" name="status_yellow_500_alpha_60" id="0x7f060129" />
+    <public type="color" name="status_yellow_600" id="0x7f06012a" />
+    <public type="color" name="status_yellow_700" id="0x7f06012b" />
+    <public type="color" name="status_yellow_800" id="0x7f06012c" />
+    <public type="color" name="status_yellow_900" id="0x7f06012d" />
+    <public type="color" name="steam" id="0x7f06012e" />
+    <public type="color" name="switch_thumb_disabled_material_dark" id="0x7f06012f" />
+    <public type="color" name="switch_thumb_disabled_material_light" id="0x7f060130" />
+    <public type="color" name="switch_thumb_material_dark" id="0x7f060131" />
+    <public type="color" name="switch_thumb_material_light" id="0x7f060132" />
+    <public type="color" name="switch_thumb_normal_material_dark" id="0x7f060133" />
+    <public type="color" name="switch_thumb_normal_material_light" id="0x7f060134" />
+    <public type="color" name="tab_color_selector" id="0x7f060135" />
+    <public type="color" name="tooltip_background_dark" id="0x7f060136" />
+    <public type="color" name="tooltip_background_light" id="0x7f060137" />
+    <public type="color" name="transparent" id="0x7f060138" />
+    <public type="color" name="twitch" id="0x7f060139" />
+    <public type="color" name="twitter" id="0x7f06013a" />
+    <public type="color" name="ucrop_color_crop_background" id="0x7f06013b" />
+    <public type="color" name="ucrop_color_default_crop_frame" id="0x7f06013c" />
+    <public type="color" name="ucrop_color_default_crop_grid" id="0x7f06013d" />
+    <public type="color" name="ucrop_color_default_dimmed" id="0x7f06013e" />
+    <public type="color" name="ucrop_color_default_logo" id="0x7f06013f" />
+    <public type="color" name="ucrop_color_progress_wheel_line" id="0x7f060140" />
+    <public type="color" name="ucrop_color_statusbar" id="0x7f060141" />
+    <public type="color" name="ucrop_color_toolbar" id="0x7f060142" />
+    <public type="color" name="ucrop_color_toolbar_widget" id="0x7f060143" />
+    <public type="color" name="ucrop_color_widget" id="0x7f060144" />
+    <public type="color" name="ucrop_color_widget_active" id="0x7f060145" />
+    <public type="color" name="ucrop_color_widget_background" id="0x7f060146" />
+    <public type="color" name="ucrop_color_widget_text" id="0x7f060147" />
+    <public type="color" name="ucrop_scale_text_view_selector" id="0x7f060148" />
+    <public type="color" name="uikit_settings_item_text_color_dark" id="0x7f060149" />
+    <public type="color" name="uikit_settings_item_text_color_light" id="0x7f06014a" />
+    <public type="color" name="white" id="0x7f06014b" />
+    <public type="color" name="white_1" id="0x7f06014c" />
+    <public type="color" name="white_2" id="0x7f06014d" />
+    <public type="color" name="white_3" id="0x7f06014e" />
+    <public type="color" name="white_3_alpha_25" id="0x7f06014f" />
+    <public type="color" name="white_5" id="0x7f060150" />
+    <public type="color" name="white_6" id="0x7f060151" />
+    <public type="color" name="white_alpha_05" id="0x7f060152" />
+    <public type="color" name="white_alpha_10" id="0x7f060153" />
+    <public type="color" name="white_alpha_20" id="0x7f060154" />
+    <public type="color" name="white_alpha_30" id="0x7f060155" />
+    <public type="color" name="white_alpha_40" id="0x7f060156" />
+    <public type="color" name="white_alpha_70" id="0x7f060157" />
+    <public type="color" name="white_alpha_80" id="0x7f060158" />
+    <public type="color" name="xbox" id="0x7f060159" />
+    <public type="color" name="youtube" id="0x7f06015a" />
     <public type="color" name="abc_color_highlight_material" id="0x7f060004" />
     <public type="dimen" name="abc_action_bar_content_inset_material" id="0x7f070000" />
     <public type="dimen" name="abc_action_bar_content_inset_with_nav" id="0x7f070001" />
@@ -1511,20 +1518,20 @@
     <public type="dimen" name="attachment_preview_dimen" id="0x7f070050" />
     <public type="dimen" name="avatar_overlap" id="0x7f070051" />
     <public type="dimen" name="avatar_size_chat" id="0x7f070052" />
-    <public type="dimen" name="avatar_size_extra_extra_large" id="0x7f070053" />
-    <public type="dimen" name="avatar_size_extra_large" id="0x7f070054" />
-    <public type="dimen" name="avatar_size_extra_large_account" id="0x7f070055" />
-    <public type="dimen" name="avatar_size_hero" id="0x7f070056" />
-    <public type="dimen" name="avatar_size_large" id="0x7f070057" />
-    <public type="dimen" name="avatar_size_medium" id="0x7f070058" />
-    <public type="dimen" name="avatar_size_notification" id="0x7f070059" />
-    <public type="dimen" name="avatar_size_small" id="0x7f07005a" />
-    <public type="dimen" name="avatar_size_standard" id="0x7f07005b" />
-    <public type="dimen" name="avatar_size_unrestricted" id="0x7f07005c" />
+    <public type="dimen" name="avatar_size_extra_large" id="0x7f070053" />
+    <public type="dimen" name="avatar_size_extra_large_account" id="0x7f070054" />
+    <public type="dimen" name="avatar_size_hero" id="0x7f070055" />
+    <public type="dimen" name="avatar_size_large" id="0x7f070056" />
+    <public type="dimen" name="avatar_size_medium" id="0x7f070057" />
+    <public type="dimen" name="avatar_size_notification" id="0x7f070058" />
+    <public type="dimen" name="avatar_size_small" id="0x7f070059" />
+    <public type="dimen" name="avatar_size_standard" id="0x7f07005a" />
+    <public type="dimen" name="avatar_size_unrestricted" id="0x7f07005b" />
+    <public type="dimen" name="avatar_size_xxlarge" id="0x7f07005c" />
     <public type="dimen" name="avatar_status_size_extra" id="0x7f07005d" />
     <public type="dimen" name="avatar_status_size_extra_margin" id="0x7f07005e" />
-    <public type="dimen" name="avatar_status_size_hero" id="0x7f07005f" />
-    <public type="dimen" name="avatar_status_size_hero_margin" id="0x7f070060" />
+    <public type="dimen" name="avatar_status_size_extra_margin_xxlarge" id="0x7f07005f" />
+    <public type="dimen" name="avatar_status_size_extra_xxlarge" id="0x7f070060" />
     <public type="dimen" name="avatar_status_size_standard" id="0x7f070061" />
     <public type="dimen" name="avatar_status_size_standard_margin" id="0x7f070062" />
     <public type="dimen" name="avatar_status_size_standard_margin_halved" id="0x7f070063" />
@@ -1555,1350 +1562,1382 @@
     <public type="dimen" name="compat_notification_large_icon_max_height" id="0x7f07007c" />
     <public type="dimen" name="compat_notification_large_icon_max_width" id="0x7f07007d" />
     <public type="dimen" name="connected_account_img_size" id="0x7f07007e" />
-    <public type="dimen" name="default_keyboard_height" id="0x7f07007f" />
-    <public type="dimen" name="design_appbar_elevation" id="0x7f070080" />
-    <public type="dimen" name="design_bottom_navigation_active_item_max_width" id="0x7f070081" />
-    <public type="dimen" name="design_bottom_navigation_active_item_min_width" id="0x7f070082" />
-    <public type="dimen" name="design_bottom_navigation_active_text_size" id="0x7f070083" />
-    <public type="dimen" name="design_bottom_navigation_elevation" id="0x7f070084" />
-    <public type="dimen" name="design_bottom_navigation_height" id="0x7f070085" />
-    <public type="dimen" name="design_bottom_navigation_icon_size" id="0x7f070086" />
-    <public type="dimen" name="design_bottom_navigation_item_max_width" id="0x7f070087" />
-    <public type="dimen" name="design_bottom_navigation_item_min_width" id="0x7f070088" />
-    <public type="dimen" name="design_bottom_navigation_margin" id="0x7f070089" />
-    <public type="dimen" name="design_bottom_navigation_shadow_height" id="0x7f07008a" />
-    <public type="dimen" name="design_bottom_navigation_text_size" id="0x7f07008b" />
-    <public type="dimen" name="design_bottom_sheet_modal_elevation" id="0x7f07008c" />
-    <public type="dimen" name="design_bottom_sheet_peek_height_min" id="0x7f07008d" />
-    <public type="dimen" name="design_fab_border_width" id="0x7f07008e" />
-    <public type="dimen" name="design_fab_elevation" id="0x7f07008f" />
-    <public type="dimen" name="design_fab_image_size" id="0x7f070090" />
-    <public type="dimen" name="design_fab_size_mini" id="0x7f070091" />
-    <public type="dimen" name="design_fab_size_normal" id="0x7f070092" />
-    <public type="dimen" name="design_fab_translation_z_hovered_focused" id="0x7f070093" />
-    <public type="dimen" name="design_fab_translation_z_pressed" id="0x7f070094" />
-    <public type="dimen" name="design_navigation_elevation" id="0x7f070095" />
-    <public type="dimen" name="design_navigation_icon_padding" id="0x7f070096" />
-    <public type="dimen" name="design_navigation_icon_size" id="0x7f070097" />
-    <public type="dimen" name="design_navigation_item_horizontal_padding" id="0x7f070098" />
-    <public type="dimen" name="design_navigation_item_icon_padding" id="0x7f070099" />
-    <public type="dimen" name="design_navigation_max_width" id="0x7f07009a" />
-    <public type="dimen" name="design_navigation_padding_bottom" id="0x7f07009b" />
-    <public type="dimen" name="design_navigation_separator_vertical_padding" id="0x7f07009c" />
-    <public type="dimen" name="design_snackbar_action_inline_max_width" id="0x7f07009d" />
-    <public type="dimen" name="design_snackbar_background_corner_radius" id="0x7f07009e" />
-    <public type="dimen" name="design_snackbar_elevation" id="0x7f07009f" />
-    <public type="dimen" name="design_snackbar_extra_spacing_horizontal" id="0x7f0700a0" />
-    <public type="dimen" name="design_snackbar_max_width" id="0x7f0700a1" />
-    <public type="dimen" name="design_snackbar_min_width" id="0x7f0700a2" />
-    <public type="dimen" name="design_snackbar_padding_horizontal" id="0x7f0700a3" />
-    <public type="dimen" name="design_snackbar_padding_vertical" id="0x7f0700a4" />
-    <public type="dimen" name="design_snackbar_padding_vertical_2lines" id="0x7f0700a5" />
-    <public type="dimen" name="design_snackbar_text_size" id="0x7f0700a6" />
-    <public type="dimen" name="design_tab_max_width" id="0x7f0700a7" />
-    <public type="dimen" name="design_tab_scrollable_min_width" id="0x7f0700a8" />
-    <public type="dimen" name="design_tab_text_size" id="0x7f0700a9" />
-    <public type="dimen" name="design_tab_text_size_2line" id="0x7f0700aa" />
-    <public type="dimen" name="design_textinput_caption_translate_y" id="0x7f0700ab" />
-    <public type="dimen" name="dialog_padding_horiz" id="0x7f0700ac" />
-    <public type="dimen" name="dialog_popup_margin" id="0x7f0700ad" />
-    <public type="dimen" name="dialog_popup_margin_top" id="0x7f0700ae" />
-    <public type="dimen" name="dialog_subtitle_padding_top" id="0x7f0700af" />
-    <public type="dimen" name="dialog_title_padding_top" id="0x7f0700b0" />
-    <public type="dimen" name="disabled_alpha_material_dark" id="0x7f0700b1" />
-    <public type="dimen" name="disabled_alpha_material_light" id="0x7f0700b2" />
-    <public type="dimen" name="embed_item_margin" id="0x7f0700b3" />
-    <public type="dimen" name="embed_thumbnail_max_size" id="0x7f0700b4" />
-    <public type="dimen" name="embed_tiny_icon_size" id="0x7f0700b5" />
-    <public type="dimen" name="emoji_grid_item_size" id="0x7f0700b6" />
-    <public type="dimen" name="emoji_text_size" id="0x7f0700b7" />
-    <public type="dimen" name="fastscroll_default_thickness" id="0x7f0700b8" />
-    <public type="dimen" name="fastscroll_margin" id="0x7f0700b9" />
-    <public type="dimen" name="fastscroll_minimum_range" id="0x7f0700ba" />
-    <public type="dimen" name="file_icon_dimen" id="0x7f0700bb" />
-    <public type="dimen" name="file_item_padding" id="0x7f0700bc" />
-    <public type="dimen" name="file_type_icon_dimen" id="0x7f0700bd" />
-    <public type="dimen" name="folder_guild_outer_margin" id="0x7f0700be" />
-    <public type="dimen" name="folder_guild_size" id="0x7f0700bf" />
-    <public type="dimen" name="grid_item_padding" id="0x7f0700c0" />
-    <public type="dimen" name="guild_item_size" id="0x7f0700c1" />
-    <public type="dimen" name="guild_item_spacing" id="0x7f0700c2" />
-    <public type="dimen" name="guild_list_size" id="0x7f0700c3" />
-    <public type="dimen" name="highlight_alpha_material_colored" id="0x7f0700c4" />
-    <public type="dimen" name="highlight_alpha_material_dark" id="0x7f0700c5" />
-    <public type="dimen" name="highlight_alpha_material_light" id="0x7f0700c6" />
-    <public type="dimen" name="hint_alpha_material_dark" id="0x7f0700c7" />
-    <public type="dimen" name="hint_alpha_material_light" id="0x7f0700c8" />
-    <public type="dimen" name="hint_pressed_alpha_material_dark" id="0x7f0700c9" />
-    <public type="dimen" name="hint_pressed_alpha_material_light" id="0x7f0700ca" />
-    <public type="dimen" name="input_container_margin" id="0x7f0700cb" />
-    <public type="dimen" name="item_touch_helper_max_drag_scroll_per_frame" id="0x7f0700cc" />
-    <public type="dimen" name="item_touch_helper_swipe_escape_max_velocity" id="0x7f0700cd" />
-    <public type="dimen" name="item_touch_helper_swipe_escape_velocity" id="0x7f0700ce" />
-    <public type="dimen" name="list_bottom_padding" id="0x7f0700cf" />
-    <public type="dimen" name="margin" id="0x7f0700d0" />
-    <public type="dimen" name="markdown_bullet_gap" id="0x7f0700d1" />
-    <public type="dimen" name="markdown_bullet_vertical_padding" id="0x7f0700d2" />
-    <public type="dimen" name="markdown_header_1_bottom_padding" id="0x7f0700d3" />
-    <public type="dimen" name="markdown_header_1_textsize" id="0x7f0700d4" />
-    <public type="dimen" name="markdown_header_1_top_padding" id="0x7f0700d5" />
-    <public type="dimen" name="markdown_header_class_marginTop" id="0x7f0700d6" />
-    <public type="dimen" name="movement_threshold_dp" id="0x7f0700d7" />
-    <public type="dimen" name="mtrl_bottomappbar_fabOffsetEndMode" id="0x7f0700d8" />
-    <public type="dimen" name="mtrl_bottomappbar_fab_cradle_margin" id="0x7f0700d9" />
-    <public type="dimen" name="mtrl_bottomappbar_fab_cradle_rounded_corner_radius" id="0x7f0700da" />
-    <public type="dimen" name="mtrl_bottomappbar_fab_cradle_vertical_offset" id="0x7f0700db" />
-    <public type="dimen" name="mtrl_bottomappbar_height" id="0x7f0700dc" />
-    <public type="dimen" name="mtrl_btn_corner_radius" id="0x7f0700dd" />
-    <public type="dimen" name="mtrl_btn_dialog_btn_min_width" id="0x7f0700de" />
-    <public type="dimen" name="mtrl_btn_disabled_elevation" id="0x7f0700df" />
-    <public type="dimen" name="mtrl_btn_disabled_z" id="0x7f0700e0" />
-    <public type="dimen" name="mtrl_btn_elevation" id="0x7f0700e1" />
-    <public type="dimen" name="mtrl_btn_focused_z" id="0x7f0700e2" />
-    <public type="dimen" name="mtrl_btn_hovered_z" id="0x7f0700e3" />
-    <public type="dimen" name="mtrl_btn_icon_btn_padding_left" id="0x7f0700e4" />
-    <public type="dimen" name="mtrl_btn_icon_padding" id="0x7f0700e5" />
-    <public type="dimen" name="mtrl_btn_inset" id="0x7f0700e6" />
-    <public type="dimen" name="mtrl_btn_letter_spacing" id="0x7f0700e7" />
-    <public type="dimen" name="mtrl_btn_padding_bottom" id="0x7f0700e8" />
-    <public type="dimen" name="mtrl_btn_padding_left" id="0x7f0700e9" />
-    <public type="dimen" name="mtrl_btn_padding_right" id="0x7f0700ea" />
-    <public type="dimen" name="mtrl_btn_padding_top" id="0x7f0700eb" />
-    <public type="dimen" name="mtrl_btn_pressed_z" id="0x7f0700ec" />
-    <public type="dimen" name="mtrl_btn_stroke_size" id="0x7f0700ed" />
-    <public type="dimen" name="mtrl_btn_text_btn_icon_padding" id="0x7f0700ee" />
-    <public type="dimen" name="mtrl_btn_text_btn_padding_left" id="0x7f0700ef" />
-    <public type="dimen" name="mtrl_btn_text_btn_padding_right" id="0x7f0700f0" />
-    <public type="dimen" name="mtrl_btn_text_size" id="0x7f0700f1" />
-    <public type="dimen" name="mtrl_btn_z" id="0x7f0700f2" />
-    <public type="dimen" name="mtrl_card_elevation" id="0x7f0700f3" />
-    <public type="dimen" name="mtrl_card_spacing" id="0x7f0700f4" />
-    <public type="dimen" name="mtrl_chip_pressed_translation_z" id="0x7f0700f5" />
-    <public type="dimen" name="mtrl_chip_text_size" id="0x7f0700f6" />
-    <public type="dimen" name="mtrl_fab_elevation" id="0x7f0700f7" />
-    <public type="dimen" name="mtrl_fab_translation_z_hovered_focused" id="0x7f0700f8" />
-    <public type="dimen" name="mtrl_fab_translation_z_pressed" id="0x7f0700f9" />
-    <public type="dimen" name="mtrl_navigation_elevation" id="0x7f0700fa" />
-    <public type="dimen" name="mtrl_navigation_item_horizontal_padding" id="0x7f0700fb" />
-    <public type="dimen" name="mtrl_navigation_item_icon_padding" id="0x7f0700fc" />
-    <public type="dimen" name="mtrl_snackbar_background_corner_radius" id="0x7f0700fd" />
-    <public type="dimen" name="mtrl_snackbar_margin" id="0x7f0700fe" />
-    <public type="dimen" name="mtrl_textinput_box_bottom_offset" id="0x7f0700ff" />
-    <public type="dimen" name="mtrl_textinput_box_corner_radius_medium" id="0x7f070100" />
-    <public type="dimen" name="mtrl_textinput_box_corner_radius_small" id="0x7f070101" />
-    <public type="dimen" name="mtrl_textinput_box_label_cutout_padding" id="0x7f070102" />
-    <public type="dimen" name="mtrl_textinput_box_padding_end" id="0x7f070103" />
-    <public type="dimen" name="mtrl_textinput_box_stroke_width_default" id="0x7f070104" />
-    <public type="dimen" name="mtrl_textinput_box_stroke_width_focused" id="0x7f070105" />
-    <public type="dimen" name="mtrl_textinput_outline_box_expanded_padding" id="0x7f070106" />
-    <public type="dimen" name="mtrl_toolbar_default_height" id="0x7f070107" />
-    <public type="dimen" name="nav_panel_width" id="0x7f070108" />
-    <public type="dimen" name="notification_action_icon_size" id="0x7f070109" />
-    <public type="dimen" name="notification_action_text_size" id="0x7f07010a" />
-    <public type="dimen" name="notification_big_circle_margin" id="0x7f07010b" />
-    <public type="dimen" name="notification_content_margin_start" id="0x7f07010c" />
-    <public type="dimen" name="notification_large_icon_height" id="0x7f07010d" />
-    <public type="dimen" name="notification_large_icon_width" id="0x7f07010e" />
-    <public type="dimen" name="notification_main_column_padding_top" id="0x7f07010f" />
-    <public type="dimen" name="notification_media_narrow_margin" id="0x7f070110" />
-    <public type="dimen" name="notification_right_icon_size" id="0x7f070111" />
-    <public type="dimen" name="notification_right_side_padding_top" id="0x7f070112" />
-    <public type="dimen" name="notification_small_icon_background_padding" id="0x7f070113" />
-    <public type="dimen" name="notification_small_icon_size_as_large" id="0x7f070114" />
-    <public type="dimen" name="notification_subtext_size" id="0x7f070115" />
-    <public type="dimen" name="notification_top_pad" id="0x7f070116" />
-    <public type="dimen" name="notification_top_pad_large_text" id="0x7f070117" />
-    <public type="dimen" name="overlay_bubble_size" id="0x7f070118" />
-    <public type="dimen" name="overlay_safe_margin" id="0x7f070119" />
-    <public type="dimen" name="padding_bottom_fab_screen" id="0x7f07011a" />
-    <public type="dimen" name="photo_grid_item_size" id="0x7f07011b" />
-    <public type="dimen" name="popup_notif_max_width" id="0x7f07011c" />
-    <public type="dimen" name="right_panel_width" id="0x7f07011d" />
-    <public type="dimen" name="search_container_height" id="0x7f07011e" />
-    <public type="dimen" name="selection_indicator_icon_size" id="0x7f07011f" />
-    <public type="dimen" name="server_icon_radius" id="0x7f070120" />
-    <public type="dimen" name="settings_border_insets" id="0x7f070121" />
-    <public type="dimen" name="settings_option_padding" id="0x7f070122" />
-    <public type="dimen" name="settings_option_padding_header_top" id="0x7f070123" />
-    <public type="dimen" name="subtitle_corner_radius" id="0x7f070124" />
-    <public type="dimen" name="subtitle_outline_width" id="0x7f070125" />
-    <public type="dimen" name="subtitle_shadow_offset" id="0x7f070126" />
-    <public type="dimen" name="subtitle_shadow_radius" id="0x7f070127" />
-    <public type="dimen" name="tab_container_margin" id="0x7f070128" />
-    <public type="dimen" name="tab_height" id="0x7f070129" />
-    <public type="dimen" name="text_margin" id="0x7f07012a" />
-    <public type="dimen" name="tooltip_corner_radius" id="0x7f07012b" />
-    <public type="dimen" name="tooltip_horizontal_padding" id="0x7f07012c" />
-    <public type="dimen" name="tooltip_margin" id="0x7f07012d" />
-    <public type="dimen" name="tooltip_precise_anchor_extra_offset" id="0x7f07012e" />
-    <public type="dimen" name="tooltip_precise_anchor_threshold" id="0x7f07012f" />
-    <public type="dimen" name="tooltip_vertical_padding" id="0x7f070130" />
-    <public type="dimen" name="tooltip_y_offset_non_touch" id="0x7f070131" />
-    <public type="dimen" name="tooltip_y_offset_touch" id="0x7f070132" />
-    <public type="dimen" name="trash_wrap_min_dimen" id="0x7f070133" />
-    <public type="dimen" name="ucrop_default_crop_frame_stoke_width" id="0x7f070134" />
-    <public type="dimen" name="ucrop_default_crop_grid_stoke_width" id="0x7f070135" />
-    <public type="dimen" name="ucrop_default_crop_logo_size" id="0x7f070136" />
-    <public type="dimen" name="ucrop_default_crop_rect_corner_touch_area_line_length" id="0x7f070137" />
-    <public type="dimen" name="ucrop_default_crop_rect_corner_touch_threshold" id="0x7f070138" />
-    <public type="dimen" name="ucrop_default_crop_rect_min_size" id="0x7f070139" />
-    <public type="dimen" name="ucrop_height_crop_aspect_ratio_text" id="0x7f07013a" />
-    <public type="dimen" name="ucrop_height_divider_shadow" id="0x7f07013b" />
-    <public type="dimen" name="ucrop_height_horizontal_wheel_progress_line" id="0x7f07013c" />
-    <public type="dimen" name="ucrop_height_wrapper_controls" id="0x7f07013d" />
-    <public type="dimen" name="ucrop_height_wrapper_states" id="0x7f07013e" />
-    <public type="dimen" name="ucrop_margin_horizontal_wheel_progress_line" id="0x7f07013f" />
-    <public type="dimen" name="ucrop_margit_top_widget_text" id="0x7f070140" />
-    <public type="dimen" name="ucrop_padding_crop_frame" id="0x7f070141" />
-    <public type="dimen" name="ucrop_progress_size" id="0x7f070142" />
-    <public type="dimen" name="ucrop_size_dot_scale_text_view" id="0x7f070143" />
-    <public type="dimen" name="ucrop_size_wrapper_rotate_button" id="0x7f070144" />
-    <public type="dimen" name="ucrop_text_size_widget_text" id="0x7f070145" />
-    <public type="dimen" name="ucrop_width_horizontal_wheel_progress_line" id="0x7f070146" />
-    <public type="dimen" name="uikit_btn_corner_radius" id="0x7f070147" />
-    <public type="dimen" name="uikit_btn_inset_horizontal_material" id="0x7f070148" />
-    <public type="dimen" name="uikit_btn_inset_vertical_material" id="0x7f070149" />
-    <public type="dimen" name="uikit_btn_padding_horizontal" id="0x7f07014a" />
-    <public type="dimen" name="uikit_btn_padding_vertical" id="0x7f07014b" />
-    <public type="dimen" name="uikit_btn_stroke_width" id="0x7f07014c" />
-    <public type="dimen" name="uikit_btn_wrapped_min_width" id="0x7f07014d" />
-    <public type="dimen" name="uikit_guideline_chat" id="0x7f07014e" />
-    <public type="dimen" name="uikit_guideline_item_row" id="0x7f07014f" />
-    <public type="dimen" name="uikit_guideline_sheet" id="0x7f070150" />
-    <public type="dimen" name="uikit_image_border_size" id="0x7f070151" />
-    <public type="dimen" name="uikit_image_border_size_small" id="0x7f070152" />
-    <public type="dimen" name="uikit_settings_item_header_size" id="0x7f070153" />
-    <public type="dimen" name="uikit_settings_item_text_size" id="0x7f070154" />
-    <public type="dimen" name="uikit_settings_voice_user_border_padding" id="0x7f070155" />
-    <public type="dimen" name="uikit_spacing_large" id="0x7f070156" />
-    <public type="dimen" name="uikit_spacing_medium" id="0x7f070157" />
-    <public type="dimen" name="uikit_spacing_small" id="0x7f070158" />
-    <public type="dimen" name="uikit_spacing_xlarge" id="0x7f070159" />
-    <public type="dimen" name="uikit_spacing_xsmall" id="0x7f07015a" />
-    <public type="dimen" name="uikit_spacing_xxlarge" id="0x7f07015b" />
-    <public type="dimen" name="uikit_spacing_xxxlarge" id="0x7f07015c" />
-    <public type="dimen" name="uikit_textsize_large" id="0x7f07015d" />
-    <public type="dimen" name="uikit_textsize_medium" id="0x7f07015e" />
-    <public type="dimen" name="uikit_textsize_small" id="0x7f07015f" />
-    <public type="dimen" name="uikit_textsize_xlarge" id="0x7f070160" />
-    <public type="dimen" name="uikit_textsize_xxlarge" id="0x7f070161" />
-    <public type="dimen" name="uikit_typing_indicator_height" id="0x7f070162" />
-    <public type="dimen" name="vertical_safe_margin" id="0x7f070163" />
-    <public type="drawable" name="abc_btn_borderless_material" id="0x7f080018" />
-    <public type="drawable" name="abc_btn_check_material" id="0x7f080019" />
-    <public type="drawable" name="abc_btn_colored_material" id="0x7f08001c" />
-    <public type="drawable" name="abc_btn_default_mtrl_shape" id="0x7f08001d" />
-    <public type="drawable" name="abc_btn_radio_material" id="0x7f08001e" />
-    <public type="drawable" name="abc_cab_background_internal_bg" id="0x7f080023" />
-    <public type="drawable" name="abc_cab_background_top_material" id="0x7f080024" />
-    <public type="drawable" name="abc_dialog_material_background" id="0x7f080027" />
-    <public type="drawable" name="abc_edit_text_material" id="0x7f080028" />
-    <public type="drawable" name="abc_ic_ab_back_material" id="0x7f080029" />
-    <public type="drawable" name="abc_ic_arrow_drop_right_black_24dp" id="0x7f08002a" />
-    <public type="drawable" name="abc_ic_clear_material" id="0x7f08002b" />
-    <public type="drawable" name="abc_ic_go_search_api_material" id="0x7f08002d" />
-    <public type="drawable" name="abc_ic_menu_overflow_material" id="0x7f080030" />
-    <public type="drawable" name="abc_ic_search_api_material" id="0x7f080034" />
-    <public type="drawable" name="abc_ic_voice_search_api_material" id="0x7f08003b" />
-    <public type="drawable" name="abc_item_background_holo_dark" id="0x7f08003c" />
-    <public type="drawable" name="abc_item_background_holo_light" id="0x7f08003d" />
-    <public type="drawable" name="abc_list_divider_material" id="0x7f08003e" />
-    <public type="drawable" name="abc_list_selector_background_transition_holo_dark" id="0x7f080044" />
-    <public type="drawable" name="abc_list_selector_background_transition_holo_light" id="0x7f080045" />
-    <public type="drawable" name="abc_list_selector_holo_dark" id="0x7f080048" />
-    <public type="drawable" name="abc_list_selector_holo_light" id="0x7f080049" />
-    <public type="drawable" name="abc_ratingbar_indicator_material" id="0x7f08004c" />
-    <public type="drawable" name="abc_ratingbar_material" id="0x7f08004d" />
-    <public type="drawable" name="abc_ratingbar_small_material" id="0x7f08004e" />
-    <public type="drawable" name="abc_seekbar_thumb_material" id="0x7f080054" />
-    <public type="drawable" name="abc_seekbar_tick_mark_material" id="0x7f080055" />
-    <public type="drawable" name="abc_seekbar_track_material" id="0x7f080056" />
-    <public type="drawable" name="abc_spinner_textfield_background_material" id="0x7f080058" />
-    <public type="drawable" name="abc_switch_thumb_material" id="0x7f080059" />
-    <public type="drawable" name="abc_tab_indicator_material" id="0x7f08005b" />
-    <public type="drawable" name="abc_text_cursor_material" id="0x7f08005d" />
-    <public type="drawable" name="abc_textfield_search_material" id="0x7f080068" />
-    <public type="drawable" name="abc_vector_test" id="0x7f080069" />
-    <public type="drawable" name="app_toast_frame" id="0x7f08006a" />
-    <public type="drawable" name="asset_generic_connected_bg_top" id="0x7f080077" />
-    <public type="drawable" name="bg_boxed_button_outline" id="0x7f08008b" />
-    <public type="drawable" name="bg_nitro_grandfathered" id="0x7f080092" />
-    <public type="drawable" name="bg_payment_method_spinner_closed" id="0x7f080093" />
-    <public type="drawable" name="bg_payment_method_spinner_closed_light" id="0x7f080094" />
-    <public type="drawable" name="bg_payment_method_spinner_dropdown" id="0x7f080095" />
-    <public type="drawable" name="bg_payment_method_spinner_dropdown_light" id="0x7f080096" />
-    <public type="drawable" name="bubble_state_selector" id="0x7f080097" />
-    <public type="drawable" name="button_brand_500" id="0x7f080098" />
-    <public type="drawable" name="button_green" id="0x7f080099" />
-    <public type="drawable" name="button_red" id="0x7f08009a" />
-    <public type="drawable" name="button_status_green_500" id="0x7f08009b" />
-    <public type="drawable" name="button_text_color_primary_100" id="0x7f08009c" />
-    <public type="drawable" name="chat_typing_background_dark" id="0x7f08009d" />
-    <public type="drawable" name="chat_typing_background_light" id="0x7f08009e" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark" id="0x7f0800a0" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark_focused" id="0x7f0800a1" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark_normal" id="0x7f0800a2" />
-    <public type="drawable" name="common_google_signin_btn_icon_disabled" id="0x7f0800a4" />
-    <public type="drawable" name="common_google_signin_btn_icon_light" id="0x7f0800a5" />
-    <public type="drawable" name="common_google_signin_btn_icon_light_focused" id="0x7f0800a6" />
-    <public type="drawable" name="common_google_signin_btn_icon_light_normal" id="0x7f0800a7" />
-    <public type="drawable" name="common_google_signin_btn_text_dark" id="0x7f0800a9" />
-    <public type="drawable" name="common_google_signin_btn_text_dark_focused" id="0x7f0800aa" />
-    <public type="drawable" name="common_google_signin_btn_text_dark_normal" id="0x7f0800ab" />
-    <public type="drawable" name="common_google_signin_btn_text_disabled" id="0x7f0800ad" />
-    <public type="drawable" name="common_google_signin_btn_text_light" id="0x7f0800ae" />
-    <public type="drawable" name="common_google_signin_btn_text_light_focused" id="0x7f0800af" />
-    <public type="drawable" name="common_google_signin_btn_text_light_normal" id="0x7f0800b0" />
-    <public type="drawable" name="design_bottom_navigation_item_background" id="0x7f0800b2" />
-    <public type="drawable" name="design_fab_background" id="0x7f0800b3" />
-    <public type="drawable" name="design_password_eye" id="0x7f0800b6" />
-    <public type="drawable" name="design_snackbar_background" id="0x7f0800b7" />
-    <public type="drawable" name="drawable_asset_pattern_shapes_dark" id="0x7f0800ba" />
-    <public type="drawable" name="drawable_asset_pattern_shapes_light" id="0x7f0800bb" />
-    <public type="drawable" name="drawable_auth_splash" id="0x7f0800bc" />
-    <public type="drawable" name="drawable_bg_boost_gradient" id="0x7f0800bd" />
-    <public type="drawable" name="drawable_bg_boost_gradient_top_corners" id="0x7f0800be" />
-    <public type="drawable" name="drawable_bg_card_grey" id="0x7f0800bf" />
-    <public type="drawable" name="drawable_bg_card_primary_700" id="0x7f0800c0" />
-    <public type="drawable" name="drawable_bg_card_white" id="0x7f0800c1" />
-    <public type="drawable" name="drawable_bg_chat_embed_gift_image_dark" id="0x7f0800c2" />
-    <public type="drawable" name="drawable_bg_chat_embed_gift_image_light" id="0x7f0800c3" />
-    <public type="drawable" name="drawable_bg_dashed" id="0x7f0800c4" />
-    <public type="drawable" name="drawable_bg_dialog_popup" id="0x7f0800c5" />
-    <public type="drawable" name="drawable_bg_highlight" id="0x7f0800c6" />
-    <public type="drawable" name="drawable_bg_item_filter" id="0x7f0800c7" />
-    <public type="drawable" name="drawable_bg_mentions_arm_dark" id="0x7f0800c8" />
-    <public type="drawable" name="drawable_bg_mentions_arm_light" id="0x7f0800c9" />
-    <public type="drawable" name="drawable_bg_nitro_classic_gradient_top_corners" id="0x7f0800ca" />
-    <public type="drawable" name="drawable_bg_outline_dark" id="0x7f0800cb" />
-    <public type="drawable" name="drawable_bg_payment_invalid_indicator" id="0x7f0800cc" />
-    <public type="drawable" name="drawable_bg_payment_premium_indicator" id="0x7f0800cd" />
-    <public type="drawable" name="drawable_bg_pill_outline" id="0x7f0800ce" />
-    <public type="drawable" name="drawable_bg_primary_700_top_corners" id="0x7f0800cf" />
-    <public type="drawable" name="drawable_bg_primary_light_200_top_corners" id="0x7f0800d0" />
-    <public type="drawable" name="drawable_bg_radio_button_dark" id="0x7f0800d1" />
-    <public type="drawable" name="drawable_bg_radio_button_light" id="0x7f0800d2" />
-    <public type="drawable" name="drawable_bg_reaction_dark" id="0x7f0800d3" />
-    <public type="drawable" name="drawable_bg_reaction_light" id="0x7f0800d4" />
-    <public type="drawable" name="drawable_bg_searchbar_light" id="0x7f0800d5" />
-    <public type="drawable" name="drawable_bg_settings_header" id="0x7f0800d6" />
-    <public type="drawable" name="drawable_bg_settings_item" id="0x7f0800d7" />
-    <public type="drawable" name="drawable_bg_settings_item_white" id="0x7f0800d8" />
-    <public type="drawable" name="drawable_bg_stream_preview" id="0x7f0800d9" />
-    <public type="drawable" name="drawable_bg_ternary_neutral" id="0x7f0800da" />
-    <public type="drawable" name="drawable_bg_ternary_off" id="0x7f0800db" />
-    <public type="drawable" name="drawable_bg_ternary_on" id="0x7f0800dc" />
-    <public type="drawable" name="drawable_bg_video_action_bar" id="0x7f0800dd" />
-    <public type="drawable" name="drawable_bg_voice_status_indicator" id="0x7f0800de" />
-    <public type="drawable" name="drawable_bg_voice_user_overlay" id="0x7f0800df" />
-    <public type="drawable" name="drawable_boost_progress_bar_dark" id="0x7f0800e0" />
-    <public type="drawable" name="drawable_boost_progress_bar_light" id="0x7f0800e1" />
-    <public type="drawable" name="drawable_boost_progress_ring" id="0x7f0800e2" />
-    <public type="drawable" name="drawable_bottom_up_primary_600_gradient" id="0x7f0800e6" />
-    <public type="drawable" name="drawable_bottom_up_primary_630_gradient" id="0x7f0800e7" />
-    <public type="drawable" name="drawable_bottom_up_white_gradient" id="0x7f0800e8" />
-    <public type="drawable" name="drawable_button_green" id="0x7f0800e9" />
-    <public type="drawable" name="drawable_button_green_disabled" id="0x7f0800ea" />
-    <public type="drawable" name="drawable_button_green_neutral" id="0x7f0800eb" />
-    <public type="drawable" name="drawable_button_green_pressed" id="0x7f0800ec" />
-    <public type="drawable" name="drawable_button_grey" id="0x7f0800ed" />
-    <public type="drawable" name="drawable_button_grey_disabled" id="0x7f0800ee" />
-    <public type="drawable" name="drawable_button_purple" id="0x7f0800ef" />
-    <public type="drawable" name="drawable_button_purple_neutral" id="0x7f0800f0" />
-    <public type="drawable" name="drawable_button_purple_pressed" id="0x7f0800f1" />
-    <public type="drawable" name="drawable_button_red" id="0x7f0800f2" />
-    <public type="drawable" name="drawable_button_red_neutral" id="0x7f0800f3" />
-    <public type="drawable" name="drawable_button_red_pressed" id="0x7f0800f4" />
-    <public type="drawable" name="drawable_button_theme_grey_channels" id="0x7f0800f5" />
-    <public type="drawable" name="drawable_button_transparent_dark" id="0x7f0800f6" />
-    <public type="drawable" name="drawable_button_transparent_dark_neutral" id="0x7f0800f7" />
-    <public type="drawable" name="drawable_button_transparent_dark_pressed" id="0x7f0800f8" />
-    <public type="drawable" name="drawable_button_white" id="0x7f0800f9" />
-    <public type="drawable" name="drawable_button_white_neutral" id="0x7f0800fa" />
-    <public type="drawable" name="drawable_button_white_pressed" id="0x7f0800fb" />
-    <public type="drawable" name="drawable_chat_embed_dark_background" id="0x7f0800fc" />
-    <public type="drawable" name="drawable_chat_embed_light_background" id="0x7f0800fd" />
-    <public type="drawable" name="drawable_chip_background" id="0x7f0800fe" />
-    <public type="drawable" name="drawable_chip_circle" id="0x7f0800ff" />
-    <public type="drawable" name="drawable_circle_boost_gradient" id="0x7f080101" />
-    <public type="drawable" name="drawable_circle_green" id="0x7f080102" />
-    <public type="drawable" name="drawable_circle_grey_channels" id="0x7f080103" />
-    <public type="drawable" name="drawable_circle_primary_700" id="0x7f080104" />
-    <public type="drawable" name="drawable_circle_primary_900_alpha_60" id="0x7f080105" />
-    <public type="drawable" name="drawable_circle_purple_brand" id="0x7f080106" />
-    <public type="drawable" name="drawable_circle_purple_brand_guild" id="0x7f080107" />
-    <public type="drawable" name="drawable_circle_red" id="0x7f080108" />
-    <public type="drawable" name="drawable_circle_speaking" id="0x7f080109" />
-    <public type="drawable" name="drawable_circle_transparent" id="0x7f08010a" />
-    <public type="drawable" name="drawable_circle_white_1" id="0x7f08010b" />
-    <public type="drawable" name="drawable_circle_white_12dp" id="0x7f08010c" />
-    <public type="drawable" name="drawable_circle_white_5" id="0x7f08010d" />
-    <public type="drawable" name="drawable_empty_text_placeholder_dark" id="0x7f08010f" />
-    <public type="drawable" name="drawable_file_selection_indicator_btn" id="0x7f080110" />
-    <public type="drawable" name="drawable_fill_black_alpha_20" id="0x7f080111" />
-    <public type="drawable" name="drawable_fill_purple" id="0x7f080112" />
-    <public type="drawable" name="drawable_friends_pending_dark" id="0x7f080113" />
-    <public type="drawable" name="drawable_friends_pending_dark_selected" id="0x7f080114" />
-    <public type="drawable" name="drawable_friends_pending_dark_unselected" id="0x7f080115" />
-    <public type="drawable" name="drawable_friends_pending_invites_selector_dark" id="0x7f080116" />
-    <public type="drawable" name="drawable_friends_pending_invites_selector_light" id="0x7f080117" />
-    <public type="drawable" name="drawable_friends_pending_light" id="0x7f080118" />
-    <public type="drawable" name="drawable_friends_pending_light_selected" id="0x7f080119" />
-    <public type="drawable" name="drawable_friends_pending_light_unselected" id="0x7f08011a" />
-    <public type="drawable" name="drawable_game_invite_cover_image_background" id="0x7f08011b" />
-    <public type="drawable" name="drawable_game_invite_gradient_overlay" id="0x7f08011c" />
-    <public type="drawable" name="drawable_gem_boost_background_dark" id="0x7f08011d" />
-    <public type="drawable" name="drawable_gem_boost_background_light" id="0x7f08011e" />
-    <public type="drawable" name="drawable_gem_tier_3" id="0x7f08011f" />
-    <public type="drawable" name="drawable_gift_embed_gradient_overlay_dark" id="0x7f080120" />
-    <public type="drawable" name="drawable_gift_embed_gradient_overlay_light" id="0x7f080121" />
-    <public type="drawable" name="drawable_grey_user_icon" id="0x7f080122" />
-    <public type="drawable" name="drawable_ic_ternary_neutral" id="0x7f080127" />
-    <public type="drawable" name="drawable_ic_ternary_off" id="0x7f080128" />
-    <public type="drawable" name="drawable_ic_ternary_on" id="0x7f080129" />
-    <public type="drawable" name="drawable_loading" id="0x7f08012b" />
-    <public type="drawable" name="drawable_open_folder" id="0x7f08012d" />
-    <public type="drawable" name="drawable_overlay_category" id="0x7f08012e" />
-    <public type="drawable" name="drawable_overlay_category_pressed" id="0x7f08012f" />
-    <public type="drawable" name="drawable_overlay_channel_pressed" id="0x7f080130" />
-    <public type="drawable" name="drawable_overlay_channels" id="0x7f080131" />
-    <public type="drawable" name="drawable_overlay_channels_active" id="0x7f080132" />
-    <public type="drawable" name="drawable_overlay_channels_selected" id="0x7f080133" />
-    <public type="drawable" name="drawable_overlay_guild_mentions" id="0x7f080134" />
-    <public type="drawable" name="drawable_overlay_image_rect" id="0x7f080135" />
-    <public type="drawable" name="drawable_overlay_image_square" id="0x7f080136" />
-    <public type="drawable" name="drawable_overlay_mentions_oval_dark" id="0x7f080137" />
-    <public type="drawable" name="drawable_overlay_mentions_oval_light" id="0x7f080138" />
-    <public type="drawable" name="drawable_overlay_mentions_primary_100" id="0x7f080139" />
-    <public type="drawable" name="drawable_overlay_mentions_primary_600" id="0x7f08013a" />
-    <public type="drawable" name="drawable_overlay_mentions_primary_630" id="0x7f08013b" />
-    <public type="drawable" name="drawable_overlay_red_upload" id="0x7f08013c" />
-    <public type="drawable" name="drawable_overlay_search" id="0x7f08013d" />
-    <public type="drawable" name="drawable_overlay_status_bar" id="0x7f08013e" />
-    <public type="drawable" name="drawable_progress_gradient_dark" id="0x7f08013f" />
-    <public type="drawable" name="drawable_progress_gradient_light" id="0x7f080140" />
-    <public type="drawable" name="drawable_progress_green" id="0x7f080141" />
-    <public type="drawable" name="drawable_ptrn_auth_bg_dark" id="0x7f080142" />
-    <public type="drawable" name="drawable_ptrn_auth_bg_light" id="0x7f080143" />
-    <public type="drawable" name="drawable_ptrn_auth_gradient_dark" id="0x7f080144" />
-    <public type="drawable" name="drawable_ptrn_auth_gradient_light" id="0x7f080145" />
-    <public type="drawable" name="drawable_reaction_text_color_dark" id="0x7f080146" />
-    <public type="drawable" name="drawable_reaction_text_color_light" id="0x7f080147" />
-    <public type="drawable" name="drawable_rect_guild_selected" id="0x7f080148" />
-    <public type="drawable" name="drawable_rect_guild_selected_horiz" id="0x7f080149" />
-    <public type="drawable" name="drawable_rect_rounded_dark" id="0x7f08014a" />
-    <public type="drawable" name="drawable_rect_rounded_dark_a60" id="0x7f08014b" />
-    <public type="drawable" name="drawable_rect_rounded_primary_100_a60" id="0x7f08014c" />
-    <public type="drawable" name="drawable_rect_rounded_red_500" id="0x7f08014d" />
-    <public type="drawable" name="drawable_rect_rounded_white" id="0x7f08014e" />
-    <public type="drawable" name="drawable_settings_progress" id="0x7f08014f" />
-    <public type="drawable" name="drawable_squircle_brand_500" id="0x7f080150" />
-    <public type="drawable" name="drawable_squircle_primary_600" id="0x7f080151" />
-    <public type="drawable" name="drawable_squircle_transparent" id="0x7f080152" />
-    <public type="drawable" name="drawable_squircle_white_alpha_20" id="0x7f080153" />
-    <public type="drawable" name="drawable_text_color_radio_button_dark" id="0x7f080154" />
-    <public type="drawable" name="drawable_text_color_radio_button_light" id="0x7f080155" />
-    <public type="drawable" name="drawable_thumb_grey" id="0x7f080156" />
-    <public type="drawable" name="drawable_thumb_white" id="0x7f080157" />
-    <public type="drawable" name="drawable_uikit_brand_500_button" id="0x7f080158" />
-    <public type="drawable" name="drawable_uikit_brand_500_button_pressed" id="0x7f080159" />
-    <public type="drawable" name="drawable_uikit_brand_500_disabled" id="0x7f08015a" />
-    <public type="drawable" name="drawable_uikit_circle_grey_200" id="0x7f08015b" />
-    <public type="drawable" name="drawable_uikit_green_button" id="0x7f08015c" />
-    <public type="drawable" name="drawable_uikit_green_button_disabled" id="0x7f08015d" />
-    <public type="drawable" name="drawable_uikit_green_button_pressed" id="0x7f08015e" />
-    <public type="drawable" name="drawable_uikit_primary_100_bg_dark" id="0x7f08015f" />
-    <public type="drawable" name="drawable_uikit_primary_100_button_outline" id="0x7f080160" />
-    <public type="drawable" name="drawable_uikit_primary_100_circle" id="0x7f080161" />
-    <public type="drawable" name="drawable_uikit_primary_200_bg_dark" id="0x7f080162" />
-    <public type="drawable" name="drawable_uikit_primary_300_bg_dark" id="0x7f080163" />
-    <public type="drawable" name="drawable_uikit_primary_400_bg_dark" id="0x7f080164" />
-    <public type="drawable" name="drawable_uikit_primary_500_bg_dark" id="0x7f080165" />
-    <public type="drawable" name="drawable_uikit_primary_500_button_outline" id="0x7f080166" />
-    <public type="drawable" name="drawable_uikit_primary_500_circle" id="0x7f080167" />
-    <public type="drawable" name="drawable_uikit_primary_600_bg_dark" id="0x7f080168" />
-    <public type="drawable" name="drawable_uikit_primary_600_circle" id="0x7f080169" />
-    <public type="drawable" name="drawable_uikit_primary_630_bg_dark" id="0x7f08016a" />
-    <public type="drawable" name="drawable_uikit_primary_630_bg_dark_bottom_corners" id="0x7f08016b" />
-    <public type="drawable" name="drawable_uikit_primary_630_circle" id="0x7f08016c" />
-    <public type="drawable" name="drawable_uikit_primary_660_bg_green_outline" id="0x7f08016d" />
-    <public type="drawable" name="drawable_uikit_primary_660_bg_outline" id="0x7f08016e" />
-    <public type="drawable" name="drawable_uikit_primary_700_bg_dark" id="0x7f08016f" />
-    <public type="drawable" name="drawable_uikit_primary_700_circle" id="0x7f080170" />
-    <public type="drawable" name="drawable_uikit_primary_800_bg_dark" id="0x7f080171" />
-    <public type="drawable" name="drawable_uikit_primary_800_circle" id="0x7f080172" />
-    <public type="drawable" name="drawable_uikit_primary_900_bg_dark" id="0x7f080173" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_bg_bottom_corners" id="0x7f080174" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_bg_green_outline" id="0x7f080175" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_bg_outline" id="0x7f080176" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_circle" id="0x7f080177" />
-    <public type="drawable" name="drawable_uikit_primary_light_200_circle" id="0x7f080178" />
-    <public type="drawable" name="drawable_uikit_primary_white_bg" id="0x7f080179" />
-    <public type="drawable" name="drawable_uikit_red_button" id="0x7f08017a" />
-    <public type="drawable" name="drawable_uikit_red_button_disabled" id="0x7f08017b" />
-    <public type="drawable" name="drawable_uikit_red_button_pressed" id="0x7f08017c" />
-    <public type="drawable" name="drawable_uikit_status_brand_button_outline" id="0x7f08017d" />
-    <public type="drawable" name="drawable_uikit_status_green_500_a60" id="0x7f08017e" />
-    <public type="drawable" name="drawable_uikit_status_green_500_button" id="0x7f08017f" />
-    <public type="drawable" name="drawable_uikit_status_green_600_button" id="0x7f080180" />
-    <public type="drawable" name="drawable_uikit_status_green_button_outline" id="0x7f080181" />
-    <public type="drawable" name="drawable_uikit_status_primary_300_button_outline" id="0x7f080182" />
-    <public type="drawable" name="drawable_uikit_status_red_button_outline" id="0x7f080183" />
-    <public type="drawable" name="drawable_uikit_white_circle" id="0x7f080184" />
-    <public type="drawable" name="drawable_voice_indicator_not_speaking" id="0x7f080185" />
-    <public type="drawable" name="drawable_voice_indicator_speaking" id="0x7f080186" />
-    <public type="drawable" name="drawable_voice_user_background_muted" id="0x7f080187" />
-    <public type="drawable" name="drawable_voice_user_background_speaking" id="0x7f080188" />
-    <public type="drawable" name="drawable_welcome_card_background" id="0x7f080189" />
-    <public type="drawable" name="drawable_welcome_card_image_background" id="0x7f08018a" />
-    <public type="drawable" name="file_item_selection_indicator_btn" id="0x7f0801ab" />
-    <public type="drawable" name="ic_check_white_24dp" id="0x7f080226" />
-    <public type="drawable" name="ic_emoji_activity_dark" id="0x7f080250" />
-    <public type="drawable" name="ic_emoji_activity_light" id="0x7f080251" />
-    <public type="drawable" name="ic_emoji_custom_dark" id="0x7f080252" />
-    <public type="drawable" name="ic_emoji_custom_light" id="0x7f080253" />
-    <public type="drawable" name="ic_emoji_flags_dark" id="0x7f080254" />
-    <public type="drawable" name="ic_emoji_flags_light" id="0x7f080255" />
-    <public type="drawable" name="ic_emoji_food_dark" id="0x7f080256" />
-    <public type="drawable" name="ic_emoji_food_light" id="0x7f080257" />
-    <public type="drawable" name="ic_emoji_nature_dark" id="0x7f080258" />
-    <public type="drawable" name="ic_emoji_nature_light" id="0x7f080259" />
-    <public type="drawable" name="ic_emoji_objects_dark" id="0x7f08025a" />
-    <public type="drawable" name="ic_emoji_objects_light" id="0x7f08025b" />
-    <public type="drawable" name="ic_emoji_people_dark" id="0x7f08025c" />
-    <public type="drawable" name="ic_emoji_people_light" id="0x7f08025d" />
-    <public type="drawable" name="ic_emoji_recent_dark" id="0x7f080260" />
-    <public type="drawable" name="ic_emoji_recent_light" id="0x7f080261" />
-    <public type="drawable" name="ic_emoji_symbols_dark" id="0x7f080262" />
-    <public type="drawable" name="ic_emoji_symbols_light" id="0x7f080263" />
-    <public type="drawable" name="ic_emoji_travel_dark" id="0x7f080264" />
-    <public type="drawable" name="ic_emoji_travel_light" id="0x7f080265" />
-    <public type="drawable" name="ic_headset_grey" id="0x7f0802a7" />
-    <public type="drawable" name="ic_headset_white" id="0x7f0802ab" />
-    <public type="drawable" name="ic_mtrl_chip_checked_black" id="0x7f0802f0" />
-    <public type="drawable" name="ic_mtrl_chip_checked_circle" id="0x7f0802f1" />
-    <public type="drawable" name="ic_mtrl_chip_close_circle" id="0x7f0802f2" />
-    <public type="drawable" name="ic_mute_state_grey" id="0x7f0802f3" />
-    <public type="drawable" name="ic_mute_state_white" id="0x7f0802f4" />
-    <public type="drawable" name="ic_speaker_grey" id="0x7f080365" />
-    <public type="drawable" name="ic_speaker_white" id="0x7f080366" />
-    <public type="drawable" name="ic_status_invisible_16dp" id="0x7f08036b" />
-    <public type="drawable" name="ic_status_online_16dp" id="0x7f08036c" />
-    <public type="drawable" name="ic_take_photo" id="0x7f080374" />
-    <public type="drawable" name="ic_trash_outline" id="0x7f080387" />
-    <public type="drawable" name="img_gifting_pattern_bg_dark" id="0x7f080402" />
-    <public type="drawable" name="img_gifting_pattern_bg_light" id="0x7f080403" />
-    <public type="drawable" name="img_nitro_classic_pattern" id="0x7f080415" />
-    <public type="drawable" name="mtrl_snackbar_background" id="0x7f080439" />
-    <public type="drawable" name="mtrl_tabs_default_indicator" id="0x7f08043a" />
-    <public type="drawable" name="navigation_empty_icon" id="0x7f08043b" />
-    <public type="drawable" name="notification_bg" id="0x7f08043d" />
-    <public type="drawable" name="notification_bg_low" id="0x7f08043e" />
-    <public type="drawable" name="notification_icon_background" id="0x7f080443" />
-    <public type="drawable" name="notification_template_icon_bg" id="0x7f080444" />
-    <public type="drawable" name="notification_template_icon_low_bg" id="0x7f080445" />
-    <public type="drawable" name="notification_tile_bg" id="0x7f080446" />
-    <public type="drawable" name="reactions_divider" id="0x7f080448" />
-    <public type="drawable" name="tab_dot_selector" id="0x7f080449" />
-    <public type="drawable" name="tab_indicator_default" id="0x7f08044a" />
-    <public type="drawable" name="tab_indicator_selected" id="0x7f08044b" />
-    <public type="drawable" name="tooltip_frame_dark" id="0x7f08044c" />
-    <public type="drawable" name="tooltip_frame_light" id="0x7f08044d" />
-    <public type="drawable" name="trash_bg" id="0x7f08044e" />
-    <public type="drawable" name="ucrop_shadow_upside" id="0x7f080457" />
-    <public type="drawable" name="ucrop_vector_ic_crop" id="0x7f080458" />
-    <public type="drawable" name="ucrop_vector_loader" id="0x7f080459" />
-    <public type="drawable" name="ucrop_vector_loader_animated" id="0x7f08045a" />
+    <public type="dimen" name="def_drawer_elevation" id="0x7f07007f" />
+    <public type="dimen" name="default_keyboard_height" id="0x7f070080" />
+    <public type="dimen" name="design_appbar_elevation" id="0x7f070081" />
+    <public type="dimen" name="design_bottom_navigation_active_item_max_width" id="0x7f070082" />
+    <public type="dimen" name="design_bottom_navigation_active_item_min_width" id="0x7f070083" />
+    <public type="dimen" name="design_bottom_navigation_active_text_size" id="0x7f070084" />
+    <public type="dimen" name="design_bottom_navigation_elevation" id="0x7f070085" />
+    <public type="dimen" name="design_bottom_navigation_height" id="0x7f070086" />
+    <public type="dimen" name="design_bottom_navigation_icon_size" id="0x7f070087" />
+    <public type="dimen" name="design_bottom_navigation_item_max_width" id="0x7f070088" />
+    <public type="dimen" name="design_bottom_navigation_item_min_width" id="0x7f070089" />
+    <public type="dimen" name="design_bottom_navigation_margin" id="0x7f07008a" />
+    <public type="dimen" name="design_bottom_navigation_shadow_height" id="0x7f07008b" />
+    <public type="dimen" name="design_bottom_navigation_text_size" id="0x7f07008c" />
+    <public type="dimen" name="design_bottom_sheet_modal_elevation" id="0x7f07008d" />
+    <public type="dimen" name="design_bottom_sheet_peek_height_min" id="0x7f07008e" />
+    <public type="dimen" name="design_fab_border_width" id="0x7f07008f" />
+    <public type="dimen" name="design_fab_elevation" id="0x7f070090" />
+    <public type="dimen" name="design_fab_image_size" id="0x7f070091" />
+    <public type="dimen" name="design_fab_size_mini" id="0x7f070092" />
+    <public type="dimen" name="design_fab_size_normal" id="0x7f070093" />
+    <public type="dimen" name="design_fab_translation_z_hovered_focused" id="0x7f070094" />
+    <public type="dimen" name="design_fab_translation_z_pressed" id="0x7f070095" />
+    <public type="dimen" name="design_navigation_elevation" id="0x7f070096" />
+    <public type="dimen" name="design_navigation_icon_padding" id="0x7f070097" />
+    <public type="dimen" name="design_navigation_icon_size" id="0x7f070098" />
+    <public type="dimen" name="design_navigation_item_horizontal_padding" id="0x7f070099" />
+    <public type="dimen" name="design_navigation_item_icon_padding" id="0x7f07009a" />
+    <public type="dimen" name="design_navigation_max_width" id="0x7f07009b" />
+    <public type="dimen" name="design_navigation_padding_bottom" id="0x7f07009c" />
+    <public type="dimen" name="design_navigation_separator_vertical_padding" id="0x7f07009d" />
+    <public type="dimen" name="design_snackbar_action_inline_max_width" id="0x7f07009e" />
+    <public type="dimen" name="design_snackbar_background_corner_radius" id="0x7f07009f" />
+    <public type="dimen" name="design_snackbar_elevation" id="0x7f0700a0" />
+    <public type="dimen" name="design_snackbar_extra_spacing_horizontal" id="0x7f0700a1" />
+    <public type="dimen" name="design_snackbar_max_width" id="0x7f0700a2" />
+    <public type="dimen" name="design_snackbar_min_width" id="0x7f0700a3" />
+    <public type="dimen" name="design_snackbar_padding_horizontal" id="0x7f0700a4" />
+    <public type="dimen" name="design_snackbar_padding_vertical" id="0x7f0700a5" />
+    <public type="dimen" name="design_snackbar_padding_vertical_2lines" id="0x7f0700a6" />
+    <public type="dimen" name="design_snackbar_text_size" id="0x7f0700a7" />
+    <public type="dimen" name="design_tab_max_width" id="0x7f0700a8" />
+    <public type="dimen" name="design_tab_scrollable_min_width" id="0x7f0700a9" />
+    <public type="dimen" name="design_tab_text_size" id="0x7f0700aa" />
+    <public type="dimen" name="design_tab_text_size_2line" id="0x7f0700ab" />
+    <public type="dimen" name="design_textinput_caption_translate_y" id="0x7f0700ac" />
+    <public type="dimen" name="dialog_padding_horiz" id="0x7f0700ad" />
+    <public type="dimen" name="dialog_popup_margin" id="0x7f0700ae" />
+    <public type="dimen" name="dialog_popup_margin_top" id="0x7f0700af" />
+    <public type="dimen" name="dialog_subtitle_padding_top" id="0x7f0700b0" />
+    <public type="dimen" name="dialog_title_padding_top" id="0x7f0700b1" />
+    <public type="dimen" name="disabled_alpha_material_dark" id="0x7f0700b2" />
+    <public type="dimen" name="disabled_alpha_material_light" id="0x7f0700b3" />
+    <public type="dimen" name="embed_item_margin" id="0x7f0700b4" />
+    <public type="dimen" name="embed_thumbnail_max_size" id="0x7f0700b5" />
+    <public type="dimen" name="embed_tiny_icon_size" id="0x7f0700b6" />
+    <public type="dimen" name="emoji_grid_item_size" id="0x7f0700b7" />
+    <public type="dimen" name="emoji_size" id="0x7f0700b8" />
+    <public type="dimen" name="emoji_text_size" id="0x7f0700b9" />
+    <public type="dimen" name="fastscroll_default_thickness" id="0x7f0700ba" />
+    <public type="dimen" name="fastscroll_margin" id="0x7f0700bb" />
+    <public type="dimen" name="fastscroll_minimum_range" id="0x7f0700bc" />
+    <public type="dimen" name="file_icon_dimen" id="0x7f0700bd" />
+    <public type="dimen" name="file_item_padding" id="0x7f0700be" />
+    <public type="dimen" name="file_type_icon_dimen" id="0x7f0700bf" />
+    <public type="dimen" name="folder_guild_outer_margin" id="0x7f0700c0" />
+    <public type="dimen" name="folder_guild_size" id="0x7f0700c1" />
+    <public type="dimen" name="grid_item_padding" id="0x7f0700c2" />
+    <public type="dimen" name="guild_item_size" id="0x7f0700c3" />
+    <public type="dimen" name="guild_item_spacing" id="0x7f0700c4" />
+    <public type="dimen" name="guild_list_size" id="0x7f0700c5" />
+    <public type="dimen" name="highlight_alpha_material_colored" id="0x7f0700c6" />
+    <public type="dimen" name="highlight_alpha_material_dark" id="0x7f0700c7" />
+    <public type="dimen" name="highlight_alpha_material_light" id="0x7f0700c8" />
+    <public type="dimen" name="hint_alpha_material_dark" id="0x7f0700c9" />
+    <public type="dimen" name="hint_alpha_material_light" id="0x7f0700ca" />
+    <public type="dimen" name="hint_pressed_alpha_material_dark" id="0x7f0700cb" />
+    <public type="dimen" name="hint_pressed_alpha_material_light" id="0x7f0700cc" />
+    <public type="dimen" name="input_container_margin" id="0x7f0700cd" />
+    <public type="dimen" name="item_touch_helper_max_drag_scroll_per_frame" id="0x7f0700ce" />
+    <public type="dimen" name="item_touch_helper_swipe_escape_max_velocity" id="0x7f0700cf" />
+    <public type="dimen" name="item_touch_helper_swipe_escape_velocity" id="0x7f0700d0" />
+    <public type="dimen" name="list_bottom_padding" id="0x7f0700d1" />
+    <public type="dimen" name="margin" id="0x7f0700d2" />
+    <public type="dimen" name="markdown_bullet_gap" id="0x7f0700d3" />
+    <public type="dimen" name="markdown_bullet_vertical_padding" id="0x7f0700d4" />
+    <public type="dimen" name="markdown_header_1_bottom_padding" id="0x7f0700d5" />
+    <public type="dimen" name="markdown_header_1_textsize" id="0x7f0700d6" />
+    <public type="dimen" name="markdown_header_1_top_padding" id="0x7f0700d7" />
+    <public type="dimen" name="markdown_header_class_marginTop" id="0x7f0700d8" />
+    <public type="dimen" name="movement_threshold_dp" id="0x7f0700d9" />
+    <public type="dimen" name="mtrl_bottomappbar_fabOffsetEndMode" id="0x7f0700da" />
+    <public type="dimen" name="mtrl_bottomappbar_fab_cradle_margin" id="0x7f0700db" />
+    <public type="dimen" name="mtrl_bottomappbar_fab_cradle_rounded_corner_radius" id="0x7f0700dc" />
+    <public type="dimen" name="mtrl_bottomappbar_fab_cradle_vertical_offset" id="0x7f0700dd" />
+    <public type="dimen" name="mtrl_bottomappbar_height" id="0x7f0700de" />
+    <public type="dimen" name="mtrl_btn_corner_radius" id="0x7f0700df" />
+    <public type="dimen" name="mtrl_btn_dialog_btn_min_width" id="0x7f0700e0" />
+    <public type="dimen" name="mtrl_btn_disabled_elevation" id="0x7f0700e1" />
+    <public type="dimen" name="mtrl_btn_disabled_z" id="0x7f0700e2" />
+    <public type="dimen" name="mtrl_btn_elevation" id="0x7f0700e3" />
+    <public type="dimen" name="mtrl_btn_focused_z" id="0x7f0700e4" />
+    <public type="dimen" name="mtrl_btn_hovered_z" id="0x7f0700e5" />
+    <public type="dimen" name="mtrl_btn_icon_btn_padding_left" id="0x7f0700e6" />
+    <public type="dimen" name="mtrl_btn_icon_padding" id="0x7f0700e7" />
+    <public type="dimen" name="mtrl_btn_inset" id="0x7f0700e8" />
+    <public type="dimen" name="mtrl_btn_letter_spacing" id="0x7f0700e9" />
+    <public type="dimen" name="mtrl_btn_padding_bottom" id="0x7f0700ea" />
+    <public type="dimen" name="mtrl_btn_padding_left" id="0x7f0700eb" />
+    <public type="dimen" name="mtrl_btn_padding_right" id="0x7f0700ec" />
+    <public type="dimen" name="mtrl_btn_padding_top" id="0x7f0700ed" />
+    <public type="dimen" name="mtrl_btn_pressed_z" id="0x7f0700ee" />
+    <public type="dimen" name="mtrl_btn_stroke_size" id="0x7f0700ef" />
+    <public type="dimen" name="mtrl_btn_text_btn_icon_padding" id="0x7f0700f0" />
+    <public type="dimen" name="mtrl_btn_text_btn_padding_left" id="0x7f0700f1" />
+    <public type="dimen" name="mtrl_btn_text_btn_padding_right" id="0x7f0700f2" />
+    <public type="dimen" name="mtrl_btn_text_size" id="0x7f0700f3" />
+    <public type="dimen" name="mtrl_btn_z" id="0x7f0700f4" />
+    <public type="dimen" name="mtrl_card_elevation" id="0x7f0700f5" />
+    <public type="dimen" name="mtrl_card_spacing" id="0x7f0700f6" />
+    <public type="dimen" name="mtrl_chip_pressed_translation_z" id="0x7f0700f7" />
+    <public type="dimen" name="mtrl_chip_text_size" id="0x7f0700f8" />
+    <public type="dimen" name="mtrl_fab_elevation" id="0x7f0700f9" />
+    <public type="dimen" name="mtrl_fab_translation_z_hovered_focused" id="0x7f0700fa" />
+    <public type="dimen" name="mtrl_fab_translation_z_pressed" id="0x7f0700fb" />
+    <public type="dimen" name="mtrl_navigation_elevation" id="0x7f0700fc" />
+    <public type="dimen" name="mtrl_navigation_item_horizontal_padding" id="0x7f0700fd" />
+    <public type="dimen" name="mtrl_navigation_item_icon_padding" id="0x7f0700fe" />
+    <public type="dimen" name="mtrl_snackbar_background_corner_radius" id="0x7f0700ff" />
+    <public type="dimen" name="mtrl_snackbar_margin" id="0x7f070100" />
+    <public type="dimen" name="mtrl_textinput_box_bottom_offset" id="0x7f070101" />
+    <public type="dimen" name="mtrl_textinput_box_corner_radius_medium" id="0x7f070102" />
+    <public type="dimen" name="mtrl_textinput_box_corner_radius_small" id="0x7f070103" />
+    <public type="dimen" name="mtrl_textinput_box_label_cutout_padding" id="0x7f070104" />
+    <public type="dimen" name="mtrl_textinput_box_padding_end" id="0x7f070105" />
+    <public type="dimen" name="mtrl_textinput_box_stroke_width_default" id="0x7f070106" />
+    <public type="dimen" name="mtrl_textinput_box_stroke_width_focused" id="0x7f070107" />
+    <public type="dimen" name="mtrl_textinput_outline_box_expanded_padding" id="0x7f070108" />
+    <public type="dimen" name="mtrl_toolbar_default_height" id="0x7f070109" />
+    <public type="dimen" name="nav_panel_width" id="0x7f07010a" />
+    <public type="dimen" name="notification_action_icon_size" id="0x7f07010b" />
+    <public type="dimen" name="notification_action_text_size" id="0x7f07010c" />
+    <public type="dimen" name="notification_big_circle_margin" id="0x7f07010d" />
+    <public type="dimen" name="notification_content_margin_start" id="0x7f07010e" />
+    <public type="dimen" name="notification_large_icon_height" id="0x7f07010f" />
+    <public type="dimen" name="notification_large_icon_width" id="0x7f070110" />
+    <public type="dimen" name="notification_main_column_padding_top" id="0x7f070111" />
+    <public type="dimen" name="notification_media_narrow_margin" id="0x7f070112" />
+    <public type="dimen" name="notification_right_icon_size" id="0x7f070113" />
+    <public type="dimen" name="notification_right_side_padding_top" id="0x7f070114" />
+    <public type="dimen" name="notification_small_icon_background_padding" id="0x7f070115" />
+    <public type="dimen" name="notification_small_icon_size_as_large" id="0x7f070116" />
+    <public type="dimen" name="notification_subtext_size" id="0x7f070117" />
+    <public type="dimen" name="notification_top_pad" id="0x7f070118" />
+    <public type="dimen" name="notification_top_pad_large_text" id="0x7f070119" />
+    <public type="dimen" name="overlay_bubble_size" id="0x7f07011a" />
+    <public type="dimen" name="overlay_safe_margin" id="0x7f07011b" />
+    <public type="dimen" name="padding_bottom_fab_screen" id="0x7f07011c" />
+    <public type="dimen" name="photo_grid_item_size" id="0x7f07011d" />
+    <public type="dimen" name="popup_notif_max_width" id="0x7f07011e" />
+    <public type="dimen" name="right_panel_width" id="0x7f07011f" />
+    <public type="dimen" name="search_container_height" id="0x7f070120" />
+    <public type="dimen" name="selection_indicator_icon_size" id="0x7f070121" />
+    <public type="dimen" name="server_icon_radius" id="0x7f070122" />
+    <public type="dimen" name="settings_border_insets" id="0x7f070123" />
+    <public type="dimen" name="settings_option_padding" id="0x7f070124" />
+    <public type="dimen" name="settings_option_padding_header_top" id="0x7f070125" />
+    <public type="dimen" name="subtitle_corner_radius" id="0x7f070126" />
+    <public type="dimen" name="subtitle_outline_width" id="0x7f070127" />
+    <public type="dimen" name="subtitle_shadow_offset" id="0x7f070128" />
+    <public type="dimen" name="subtitle_shadow_radius" id="0x7f070129" />
+    <public type="dimen" name="tab_container_margin" id="0x7f07012a" />
+    <public type="dimen" name="tab_height" id="0x7f07012b" />
+    <public type="dimen" name="text_margin" id="0x7f07012c" />
+    <public type="dimen" name="tooltip_corner_radius" id="0x7f07012d" />
+    <public type="dimen" name="tooltip_horizontal_padding" id="0x7f07012e" />
+    <public type="dimen" name="tooltip_margin" id="0x7f07012f" />
+    <public type="dimen" name="tooltip_precise_anchor_extra_offset" id="0x7f070130" />
+    <public type="dimen" name="tooltip_precise_anchor_threshold" id="0x7f070131" />
+    <public type="dimen" name="tooltip_vertical_padding" id="0x7f070132" />
+    <public type="dimen" name="tooltip_y_offset_non_touch" id="0x7f070133" />
+    <public type="dimen" name="tooltip_y_offset_touch" id="0x7f070134" />
+    <public type="dimen" name="trash_wrap_min_dimen" id="0x7f070135" />
+    <public type="dimen" name="ucrop_default_crop_frame_stoke_width" id="0x7f070136" />
+    <public type="dimen" name="ucrop_default_crop_grid_stoke_width" id="0x7f070137" />
+    <public type="dimen" name="ucrop_default_crop_logo_size" id="0x7f070138" />
+    <public type="dimen" name="ucrop_default_crop_rect_corner_touch_area_line_length" id="0x7f070139" />
+    <public type="dimen" name="ucrop_default_crop_rect_corner_touch_threshold" id="0x7f07013a" />
+    <public type="dimen" name="ucrop_default_crop_rect_min_size" id="0x7f07013b" />
+    <public type="dimen" name="ucrop_height_crop_aspect_ratio_text" id="0x7f07013c" />
+    <public type="dimen" name="ucrop_height_divider_shadow" id="0x7f07013d" />
+    <public type="dimen" name="ucrop_height_horizontal_wheel_progress_line" id="0x7f07013e" />
+    <public type="dimen" name="ucrop_height_wrapper_controls" id="0x7f07013f" />
+    <public type="dimen" name="ucrop_height_wrapper_states" id="0x7f070140" />
+    <public type="dimen" name="ucrop_margin_horizontal_wheel_progress_line" id="0x7f070141" />
+    <public type="dimen" name="ucrop_margit_top_widget_text" id="0x7f070142" />
+    <public type="dimen" name="ucrop_padding_crop_frame" id="0x7f070143" />
+    <public type="dimen" name="ucrop_progress_size" id="0x7f070144" />
+    <public type="dimen" name="ucrop_size_dot_scale_text_view" id="0x7f070145" />
+    <public type="dimen" name="ucrop_size_wrapper_rotate_button" id="0x7f070146" />
+    <public type="dimen" name="ucrop_text_size_widget_text" id="0x7f070147" />
+    <public type="dimen" name="ucrop_width_horizontal_wheel_progress_line" id="0x7f070148" />
+    <public type="dimen" name="uikit_btn_corner_radius" id="0x7f070149" />
+    <public type="dimen" name="uikit_btn_inset_horizontal_material" id="0x7f07014a" />
+    <public type="dimen" name="uikit_btn_inset_vertical_material" id="0x7f07014b" />
+    <public type="dimen" name="uikit_btn_padding_horizontal" id="0x7f07014c" />
+    <public type="dimen" name="uikit_btn_padding_vertical" id="0x7f07014d" />
+    <public type="dimen" name="uikit_btn_stroke_width" id="0x7f07014e" />
+    <public type="dimen" name="uikit_btn_wrapped_min_width" id="0x7f07014f" />
+    <public type="dimen" name="uikit_guideline_chat" id="0x7f070150" />
+    <public type="dimen" name="uikit_guideline_item_row" id="0x7f070151" />
+    <public type="dimen" name="uikit_guideline_sheet" id="0x7f070152" />
+    <public type="dimen" name="uikit_image_border_size" id="0x7f070153" />
+    <public type="dimen" name="uikit_image_border_size_small" id="0x7f070154" />
+    <public type="dimen" name="uikit_settings_item_header_size" id="0x7f070155" />
+    <public type="dimen" name="uikit_settings_item_text_size" id="0x7f070156" />
+    <public type="dimen" name="uikit_settings_voice_user_border_padding" id="0x7f070157" />
+    <public type="dimen" name="uikit_spacing_large" id="0x7f070158" />
+    <public type="dimen" name="uikit_spacing_medium" id="0x7f070159" />
+    <public type="dimen" name="uikit_spacing_small" id="0x7f07015a" />
+    <public type="dimen" name="uikit_spacing_xlarge" id="0x7f07015b" />
+    <public type="dimen" name="uikit_spacing_xsmall" id="0x7f07015c" />
+    <public type="dimen" name="uikit_spacing_xxlarge" id="0x7f07015d" />
+    <public type="dimen" name="uikit_spacing_xxxlarge" id="0x7f07015e" />
+    <public type="dimen" name="uikit_textsize_large" id="0x7f07015f" />
+    <public type="dimen" name="uikit_textsize_medium" id="0x7f070160" />
+    <public type="dimen" name="uikit_textsize_small" id="0x7f070161" />
+    <public type="dimen" name="uikit_textsize_xlarge" id="0x7f070162" />
+    <public type="dimen" name="uikit_textsize_xxlarge" id="0x7f070163" />
+    <public type="dimen" name="uikit_typing_indicator_height" id="0x7f070164" />
+    <public type="dimen" name="vertical_safe_margin" id="0x7f070165" />
+    <public type="drawable" name="abc_btn_borderless_material" id="0x7f080019" />
+    <public type="drawable" name="abc_btn_check_material" id="0x7f08001a" />
+    <public type="drawable" name="abc_btn_colored_material" id="0x7f08001d" />
+    <public type="drawable" name="abc_btn_default_mtrl_shape" id="0x7f08001e" />
+    <public type="drawable" name="abc_btn_radio_material" id="0x7f08001f" />
+    <public type="drawable" name="abc_cab_background_internal_bg" id="0x7f080024" />
+    <public type="drawable" name="abc_cab_background_top_material" id="0x7f080025" />
+    <public type="drawable" name="abc_dialog_material_background" id="0x7f080028" />
+    <public type="drawable" name="abc_edit_text_material" id="0x7f080029" />
+    <public type="drawable" name="abc_ic_ab_back_material" id="0x7f08002a" />
+    <public type="drawable" name="abc_ic_arrow_drop_right_black_24dp" id="0x7f08002b" />
+    <public type="drawable" name="abc_ic_clear_material" id="0x7f08002c" />
+    <public type="drawable" name="abc_ic_go_search_api_material" id="0x7f08002e" />
+    <public type="drawable" name="abc_ic_menu_overflow_material" id="0x7f080031" />
+    <public type="drawable" name="abc_ic_search_api_material" id="0x7f080035" />
+    <public type="drawable" name="abc_ic_voice_search_api_material" id="0x7f08003c" />
+    <public type="drawable" name="abc_item_background_holo_dark" id="0x7f08003d" />
+    <public type="drawable" name="abc_item_background_holo_light" id="0x7f08003e" />
+    <public type="drawable" name="abc_list_divider_material" id="0x7f08003f" />
+    <public type="drawable" name="abc_list_selector_background_transition_holo_dark" id="0x7f080045" />
+    <public type="drawable" name="abc_list_selector_background_transition_holo_light" id="0x7f080046" />
+    <public type="drawable" name="abc_list_selector_holo_dark" id="0x7f080049" />
+    <public type="drawable" name="abc_list_selector_holo_light" id="0x7f08004a" />
+    <public type="drawable" name="abc_ratingbar_indicator_material" id="0x7f08004d" />
+    <public type="drawable" name="abc_ratingbar_material" id="0x7f08004e" />
+    <public type="drawable" name="abc_ratingbar_small_material" id="0x7f08004f" />
+    <public type="drawable" name="abc_seekbar_thumb_material" id="0x7f080055" />
+    <public type="drawable" name="abc_seekbar_tick_mark_material" id="0x7f080056" />
+    <public type="drawable" name="abc_seekbar_track_material" id="0x7f080057" />
+    <public type="drawable" name="abc_spinner_textfield_background_material" id="0x7f080059" />
+    <public type="drawable" name="abc_switch_thumb_material" id="0x7f08005a" />
+    <public type="drawable" name="abc_tab_indicator_material" id="0x7f08005c" />
+    <public type="drawable" name="abc_text_cursor_material" id="0x7f08005e" />
+    <public type="drawable" name="abc_textfield_search_material" id="0x7f080069" />
+    <public type="drawable" name="abc_vector_test" id="0x7f08006a" />
+    <public type="drawable" name="app_toast_frame" id="0x7f08006b" />
+    <public type="drawable" name="asset_generic_connected_bg_top" id="0x7f080079" />
+    <public type="drawable" name="bg_boxed_button_outline" id="0x7f08008c" />
+    <public type="drawable" name="bg_nitro_grandfathered" id="0x7f080093" />
+    <public type="drawable" name="bg_payment_method_spinner_closed" id="0x7f080094" />
+    <public type="drawable" name="bg_payment_method_spinner_closed_light" id="0x7f080095" />
+    <public type="drawable" name="bg_payment_method_spinner_dropdown" id="0x7f080096" />
+    <public type="drawable" name="bg_payment_method_spinner_dropdown_light" id="0x7f080097" />
+    <public type="drawable" name="bg_pressed_highlight_brighten" id="0x7f080098" />
+    <public type="drawable" name="bg_pressed_highlight_darken" id="0x7f080099" />
+    <public type="drawable" name="bubble_state_selector" id="0x7f08009a" />
+    <public type="drawable" name="button_brand_500" id="0x7f08009b" />
+    <public type="drawable" name="button_green" id="0x7f08009c" />
+    <public type="drawable" name="button_red" id="0x7f08009d" />
+    <public type="drawable" name="button_status_green_500" id="0x7f08009e" />
+    <public type="drawable" name="button_text_color_primary_100" id="0x7f08009f" />
+    <public type="drawable" name="chat_typing_background_dark" id="0x7f0800a0" />
+    <public type="drawable" name="chat_typing_background_light" id="0x7f0800a1" />
+    <public type="drawable" name="common_google_signin_btn_icon_dark" id="0x7f0800a3" />
+    <public type="drawable" name="common_google_signin_btn_icon_dark_focused" id="0x7f0800a4" />
+    <public type="drawable" name="common_google_signin_btn_icon_dark_normal" id="0x7f0800a5" />
+    <public type="drawable" name="common_google_signin_btn_icon_disabled" id="0x7f0800a7" />
+    <public type="drawable" name="common_google_signin_btn_icon_light" id="0x7f0800a8" />
+    <public type="drawable" name="common_google_signin_btn_icon_light_focused" id="0x7f0800a9" />
+    <public type="drawable" name="common_google_signin_btn_icon_light_normal" id="0x7f0800aa" />
+    <public type="drawable" name="common_google_signin_btn_text_dark" id="0x7f0800ac" />
+    <public type="drawable" name="common_google_signin_btn_text_dark_focused" id="0x7f0800ad" />
+    <public type="drawable" name="common_google_signin_btn_text_dark_normal" id="0x7f0800ae" />
+    <public type="drawable" name="common_google_signin_btn_text_disabled" id="0x7f0800b0" />
+    <public type="drawable" name="common_google_signin_btn_text_light" id="0x7f0800b1" />
+    <public type="drawable" name="common_google_signin_btn_text_light_focused" id="0x7f0800b2" />
+    <public type="drawable" name="common_google_signin_btn_text_light_normal" id="0x7f0800b3" />
+    <public type="drawable" name="design_bottom_navigation_item_background" id="0x7f0800b5" />
+    <public type="drawable" name="design_fab_background" id="0x7f0800b6" />
+    <public type="drawable" name="design_password_eye" id="0x7f0800b9" />
+    <public type="drawable" name="design_snackbar_background" id="0x7f0800ba" />
+    <public type="drawable" name="drawable_asset_pattern_shapes_dark" id="0x7f0800bd" />
+    <public type="drawable" name="drawable_asset_pattern_shapes_light" id="0x7f0800be" />
+    <public type="drawable" name="drawable_auth_splash" id="0x7f0800bf" />
+    <public type="drawable" name="drawable_bg_boost_gradient" id="0x7f0800c0" />
+    <public type="drawable" name="drawable_bg_boost_gradient_top_corners" id="0x7f0800c1" />
+    <public type="drawable" name="drawable_bg_card_grey" id="0x7f0800c2" />
+    <public type="drawable" name="drawable_bg_card_primary_700" id="0x7f0800c3" />
+    <public type="drawable" name="drawable_bg_card_white" id="0x7f0800c4" />
+    <public type="drawable" name="drawable_bg_chat_embed_gift_image_dark" id="0x7f0800c5" />
+    <public type="drawable" name="drawable_bg_chat_embed_gift_image_light" id="0x7f0800c6" />
+    <public type="drawable" name="drawable_bg_dashed" id="0x7f0800c7" />
+    <public type="drawable" name="drawable_bg_dialog_popup" id="0x7f0800c8" />
+    <public type="drawable" name="drawable_bg_highlight" id="0x7f0800c9" />
+    <public type="drawable" name="drawable_bg_item_filter" id="0x7f0800ca" />
+    <public type="drawable" name="drawable_bg_loading" id="0x7f0800cb" />
+    <public type="drawable" name="drawable_bg_mentions_arm_dark" id="0x7f0800cc" />
+    <public type="drawable" name="drawable_bg_mentions_arm_light" id="0x7f0800cd" />
+    <public type="drawable" name="drawable_bg_nitro_classic_gradient_top_corners" id="0x7f0800ce" />
+    <public type="drawable" name="drawable_bg_outline_dark" id="0x7f0800cf" />
+    <public type="drawable" name="drawable_bg_payment_invalid_indicator" id="0x7f0800d0" />
+    <public type="drawable" name="drawable_bg_payment_premium_indicator" id="0x7f0800d1" />
+    <public type="drawable" name="drawable_bg_pill_outline" id="0x7f0800d2" />
+    <public type="drawable" name="drawable_bg_primary_700_top_corners" id="0x7f0800d3" />
+    <public type="drawable" name="drawable_bg_primary_light_200_top_corners" id="0x7f0800d4" />
+    <public type="drawable" name="drawable_bg_radio_button_dark" id="0x7f0800d5" />
+    <public type="drawable" name="drawable_bg_radio_button_light" id="0x7f0800d6" />
+    <public type="drawable" name="drawable_bg_reaction_dark" id="0x7f0800d7" />
+    <public type="drawable" name="drawable_bg_reaction_light" id="0x7f0800d8" />
+    <public type="drawable" name="drawable_bg_searchbar_light" id="0x7f0800d9" />
+    <public type="drawable" name="drawable_bg_settings_header" id="0x7f0800da" />
+    <public type="drawable" name="drawable_bg_settings_item" id="0x7f0800db" />
+    <public type="drawable" name="drawable_bg_settings_item_white" id="0x7f0800dc" />
+    <public type="drawable" name="drawable_bg_stream_preview" id="0x7f0800dd" />
+    <public type="drawable" name="drawable_bg_ternary_neutral" id="0x7f0800de" />
+    <public type="drawable" name="drawable_bg_ternary_off" id="0x7f0800df" />
+    <public type="drawable" name="drawable_bg_ternary_on" id="0x7f0800e0" />
+    <public type="drawable" name="drawable_bg_video_action_bar" id="0x7f0800e1" />
+    <public type="drawable" name="drawable_bg_voice_status_indicator" id="0x7f0800e2" />
+    <public type="drawable" name="drawable_bg_voice_user_overlay" id="0x7f0800e3" />
+    <public type="drawable" name="drawable_boost_progress_bar_dark" id="0x7f0800e4" />
+    <public type="drawable" name="drawable_boost_progress_bar_light" id="0x7f0800e5" />
+    <public type="drawable" name="drawable_boost_progress_ring" id="0x7f0800e6" />
+    <public type="drawable" name="drawable_bottom_up_primary_600_gradient" id="0x7f0800ea" />
+    <public type="drawable" name="drawable_bottom_up_primary_630_gradient" id="0x7f0800eb" />
+    <public type="drawable" name="drawable_bottom_up_white_gradient" id="0x7f0800ec" />
+    <public type="drawable" name="drawable_button_green" id="0x7f0800ed" />
+    <public type="drawable" name="drawable_button_green_disabled" id="0x7f0800ee" />
+    <public type="drawable" name="drawable_button_green_neutral" id="0x7f0800ef" />
+    <public type="drawable" name="drawable_button_green_pressed" id="0x7f0800f0" />
+    <public type="drawable" name="drawable_button_grey" id="0x7f0800f1" />
+    <public type="drawable" name="drawable_button_grey_disabled" id="0x7f0800f2" />
+    <public type="drawable" name="drawable_button_primary_700" id="0x7f0800f3" />
+    <public type="drawable" name="drawable_button_primary_700_neutral" id="0x7f0800f4" />
+    <public type="drawable" name="drawable_button_primary_700_pressed" id="0x7f0800f5" />
+    <public type="drawable" name="drawable_button_purple" id="0x7f0800f6" />
+    <public type="drawable" name="drawable_button_purple_neutral" id="0x7f0800f7" />
+    <public type="drawable" name="drawable_button_purple_pressed" id="0x7f0800f8" />
+    <public type="drawable" name="drawable_button_red" id="0x7f0800f9" />
+    <public type="drawable" name="drawable_button_red_neutral" id="0x7f0800fa" />
+    <public type="drawable" name="drawable_button_red_pressed" id="0x7f0800fb" />
+    <public type="drawable" name="drawable_button_theme_grey_channels" id="0x7f0800fc" />
+    <public type="drawable" name="drawable_button_transparent_dark" id="0x7f0800fd" />
+    <public type="drawable" name="drawable_button_transparent_dark_neutral" id="0x7f0800fe" />
+    <public type="drawable" name="drawable_button_transparent_dark_pressed" id="0x7f0800ff" />
+    <public type="drawable" name="drawable_button_white" id="0x7f080100" />
+    <public type="drawable" name="drawable_button_white_neutral" id="0x7f080101" />
+    <public type="drawable" name="drawable_button_white_pressed" id="0x7f080102" />
+    <public type="drawable" name="drawable_chat_embed_dark_background" id="0x7f080103" />
+    <public type="drawable" name="drawable_chat_embed_light_background" id="0x7f080104" />
+    <public type="drawable" name="drawable_chip_background" id="0x7f080105" />
+    <public type="drawable" name="drawable_chip_circle" id="0x7f080106" />
+    <public type="drawable" name="drawable_circle_boost_gradient" id="0x7f080108" />
+    <public type="drawable" name="drawable_circle_green" id="0x7f080109" />
+    <public type="drawable" name="drawable_circle_grey_channels" id="0x7f08010a" />
+    <public type="drawable" name="drawable_circle_primary_700" id="0x7f08010b" />
+    <public type="drawable" name="drawable_circle_primary_900_alpha_60" id="0x7f08010c" />
+    <public type="drawable" name="drawable_circle_purple_brand" id="0x7f08010d" />
+    <public type="drawable" name="drawable_circle_purple_brand_guild" id="0x7f08010e" />
+    <public type="drawable" name="drawable_circle_red" id="0x7f08010f" />
+    <public type="drawable" name="drawable_circle_speaking" id="0x7f080110" />
+    <public type="drawable" name="drawable_circle_transparent" id="0x7f080111" />
+    <public type="drawable" name="drawable_circle_white_1" id="0x7f080112" />
+    <public type="drawable" name="drawable_circle_white_12dp" id="0x7f080113" />
+    <public type="drawable" name="drawable_circle_white_5" id="0x7f080114" />
+    <public type="drawable" name="drawable_empty_text_placeholder_dark" id="0x7f080116" />
+    <public type="drawable" name="drawable_file_selection_indicator_btn" id="0x7f080117" />
+    <public type="drawable" name="drawable_fill_black_alpha_20" id="0x7f080118" />
+    <public type="drawable" name="drawable_fill_purple" id="0x7f080119" />
+    <public type="drawable" name="drawable_friends_pending_dark" id="0x7f08011a" />
+    <public type="drawable" name="drawable_friends_pending_dark_selected" id="0x7f08011b" />
+    <public type="drawable" name="drawable_friends_pending_dark_unselected" id="0x7f08011c" />
+    <public type="drawable" name="drawable_friends_pending_invites_selector_dark" id="0x7f08011d" />
+    <public type="drawable" name="drawable_friends_pending_invites_selector_light" id="0x7f08011e" />
+    <public type="drawable" name="drawable_friends_pending_light" id="0x7f08011f" />
+    <public type="drawable" name="drawable_friends_pending_light_selected" id="0x7f080120" />
+    <public type="drawable" name="drawable_friends_pending_light_unselected" id="0x7f080121" />
+    <public type="drawable" name="drawable_game_invite_cover_image_background" id="0x7f080122" />
+    <public type="drawable" name="drawable_game_invite_gradient_overlay" id="0x7f080123" />
+    <public type="drawable" name="drawable_gem_boost_background_dark" id="0x7f080124" />
+    <public type="drawable" name="drawable_gem_boost_background_light" id="0x7f080125" />
+    <public type="drawable" name="drawable_gem_tier_3" id="0x7f080126" />
+    <public type="drawable" name="drawable_gift_embed_gradient_overlay_dark" id="0x7f080127" />
+    <public type="drawable" name="drawable_gift_embed_gradient_overlay_light" id="0x7f080128" />
+    <public type="drawable" name="drawable_grey_user_icon" id="0x7f080129" />
+    <public type="drawable" name="drawable_ic_ternary_neutral" id="0x7f08012e" />
+    <public type="drawable" name="drawable_ic_ternary_off" id="0x7f08012f" />
+    <public type="drawable" name="drawable_ic_ternary_on" id="0x7f080130" />
+    <public type="drawable" name="drawable_open_folder" id="0x7f080133" />
+    <public type="drawable" name="drawable_overlay_category" id="0x7f080134" />
+    <public type="drawable" name="drawable_overlay_category_pressed" id="0x7f080135" />
+    <public type="drawable" name="drawable_overlay_channel_pressed" id="0x7f080136" />
+    <public type="drawable" name="drawable_overlay_channels" id="0x7f080137" />
+    <public type="drawable" name="drawable_overlay_channels_active" id="0x7f080138" />
+    <public type="drawable" name="drawable_overlay_channels_selected" id="0x7f080139" />
+    <public type="drawable" name="drawable_overlay_guild_mentions" id="0x7f08013a" />
+    <public type="drawable" name="drawable_overlay_image_rect" id="0x7f08013b" />
+    <public type="drawable" name="drawable_overlay_image_square" id="0x7f08013c" />
+    <public type="drawable" name="drawable_overlay_mentions_oval_dark" id="0x7f08013d" />
+    <public type="drawable" name="drawable_overlay_mentions_oval_light" id="0x7f08013e" />
+    <public type="drawable" name="drawable_overlay_mentions_primary_100" id="0x7f08013f" />
+    <public type="drawable" name="drawable_overlay_mentions_primary_600" id="0x7f080140" />
+    <public type="drawable" name="drawable_overlay_mentions_primary_630" id="0x7f080141" />
+    <public type="drawable" name="drawable_overlay_red_upload" id="0x7f080142" />
+    <public type="drawable" name="drawable_overlay_search" id="0x7f080143" />
+    <public type="drawable" name="drawable_overlay_status_bar" id="0x7f080144" />
+    <public type="drawable" name="drawable_progress_gradient_dark" id="0x7f080145" />
+    <public type="drawable" name="drawable_progress_gradient_light" id="0x7f080146" />
+    <public type="drawable" name="drawable_progress_green" id="0x7f080147" />
+    <public type="drawable" name="drawable_ptrn_auth_bg_dark" id="0x7f080148" />
+    <public type="drawable" name="drawable_ptrn_auth_bg_light" id="0x7f080149" />
+    <public type="drawable" name="drawable_ptrn_auth_gradient_dark" id="0x7f08014a" />
+    <public type="drawable" name="drawable_ptrn_auth_gradient_light" id="0x7f08014b" />
+    <public type="drawable" name="drawable_reaction_text_color_dark" id="0x7f08014c" />
+    <public type="drawable" name="drawable_reaction_text_color_light" id="0x7f08014d" />
+    <public type="drawable" name="drawable_rect_guild_selected" id="0x7f08014e" />
+    <public type="drawable" name="drawable_rect_guild_selected_horiz" id="0x7f08014f" />
+    <public type="drawable" name="drawable_rect_rounded_dark" id="0x7f080150" />
+    <public type="drawable" name="drawable_rect_rounded_dark_a60" id="0x7f080151" />
+    <public type="drawable" name="drawable_rect_rounded_primary_100_a60" id="0x7f080152" />
+    <public type="drawable" name="drawable_rect_rounded_red_500" id="0x7f080153" />
+    <public type="drawable" name="drawable_rect_rounded_white" id="0x7f080154" />
+    <public type="drawable" name="drawable_settings_progress" id="0x7f080155" />
+    <public type="drawable" name="drawable_spotify_button_disabled" id="0x7f080156" />
+    <public type="drawable" name="drawable_spotify_button_enabled" id="0x7f080157" />
+    <public type="drawable" name="drawable_squircle_brand_500" id="0x7f080158" />
+    <public type="drawable" name="drawable_squircle_primary_600" id="0x7f080159" />
+    <public type="drawable" name="drawable_squircle_transparent" id="0x7f08015a" />
+    <public type="drawable" name="drawable_squircle_white_alpha_20" id="0x7f08015b" />
+    <public type="drawable" name="drawable_text_color_radio_button_dark" id="0x7f080163" />
+    <public type="drawable" name="drawable_text_color_radio_button_light" id="0x7f080164" />
+    <public type="drawable" name="drawable_thumb_grey" id="0x7f080165" />
+    <public type="drawable" name="drawable_thumb_white" id="0x7f080166" />
+    <public type="drawable" name="drawable_uikit_brand_500_button" id="0x7f080167" />
+    <public type="drawable" name="drawable_uikit_brand_500_button_pressed" id="0x7f080168" />
+    <public type="drawable" name="drawable_uikit_brand_500_disabled" id="0x7f080169" />
+    <public type="drawable" name="drawable_uikit_circle_grey_200" id="0x7f08016a" />
+    <public type="drawable" name="drawable_uikit_green_button" id="0x7f08016b" />
+    <public type="drawable" name="drawable_uikit_green_button_disabled" id="0x7f08016c" />
+    <public type="drawable" name="drawable_uikit_green_button_pressed" id="0x7f08016d" />
+    <public type="drawable" name="drawable_uikit_primary_100_bg_dark" id="0x7f08016e" />
+    <public type="drawable" name="drawable_uikit_primary_100_button_outline" id="0x7f08016f" />
+    <public type="drawable" name="drawable_uikit_primary_100_circle" id="0x7f080170" />
+    <public type="drawable" name="drawable_uikit_primary_200_bg_dark" id="0x7f080171" />
+    <public type="drawable" name="drawable_uikit_primary_300_bg_dark" id="0x7f080172" />
+    <public type="drawable" name="drawable_uikit_primary_400_bg_dark" id="0x7f080173" />
+    <public type="drawable" name="drawable_uikit_primary_500_bg_dark" id="0x7f080174" />
+    <public type="drawable" name="drawable_uikit_primary_500_button_outline" id="0x7f080175" />
+    <public type="drawable" name="drawable_uikit_primary_500_circle" id="0x7f080176" />
+    <public type="drawable" name="drawable_uikit_primary_600_bg_dark" id="0x7f080177" />
+    <public type="drawable" name="drawable_uikit_primary_600_circle" id="0x7f080178" />
+    <public type="drawable" name="drawable_uikit_primary_630_bg_dark" id="0x7f080179" />
+    <public type="drawable" name="drawable_uikit_primary_630_bg_dark_bottom_corners" id="0x7f08017a" />
+    <public type="drawable" name="drawable_uikit_primary_630_circle" id="0x7f08017b" />
+    <public type="drawable" name="drawable_uikit_primary_660_bg_green_outline" id="0x7f08017c" />
+    <public type="drawable" name="drawable_uikit_primary_660_bg_outline" id="0x7f08017d" />
+    <public type="drawable" name="drawable_uikit_primary_700_bg_dark" id="0x7f08017e" />
+    <public type="drawable" name="drawable_uikit_primary_700_circle" id="0x7f08017f" />
+    <public type="drawable" name="drawable_uikit_primary_800_bg_dark" id="0x7f080180" />
+    <public type="drawable" name="drawable_uikit_primary_800_circle" id="0x7f080181" />
+    <public type="drawable" name="drawable_uikit_primary_900_bg_dark" id="0x7f080182" />
+    <public type="drawable" name="drawable_uikit_primary_light_100_bg_bottom_corners" id="0x7f080183" />
+    <public type="drawable" name="drawable_uikit_primary_light_100_bg_green_outline" id="0x7f080184" />
+    <public type="drawable" name="drawable_uikit_primary_light_100_bg_outline" id="0x7f080185" />
+    <public type="drawable" name="drawable_uikit_primary_light_100_circle" id="0x7f080186" />
+    <public type="drawable" name="drawable_uikit_primary_light_200_circle" id="0x7f080187" />
+    <public type="drawable" name="drawable_uikit_primary_white_bg" id="0x7f080188" />
+    <public type="drawable" name="drawable_uikit_red_button" id="0x7f080189" />
+    <public type="drawable" name="drawable_uikit_red_button_disabled" id="0x7f08018a" />
+    <public type="drawable" name="drawable_uikit_red_button_pressed" id="0x7f08018b" />
+    <public type="drawable" name="drawable_uikit_status_brand_button_outline" id="0x7f08018c" />
+    <public type="drawable" name="drawable_uikit_status_green_500_a60" id="0x7f08018d" />
+    <public type="drawable" name="drawable_uikit_status_green_500_button" id="0x7f08018e" />
+    <public type="drawable" name="drawable_uikit_status_green_600_button" id="0x7f08018f" />
+    <public type="drawable" name="drawable_uikit_status_green_button_outline" id="0x7f080190" />
+    <public type="drawable" name="drawable_uikit_status_primary_300_button_outline" id="0x7f080191" />
+    <public type="drawable" name="drawable_uikit_status_red_button_outline" id="0x7f080192" />
+    <public type="drawable" name="drawable_uikit_white_circle" id="0x7f080193" />
+    <public type="drawable" name="drawable_voice_indicator_not_speaking" id="0x7f080194" />
+    <public type="drawable" name="drawable_voice_indicator_speaking" id="0x7f080195" />
+    <public type="drawable" name="drawable_voice_user_background_muted" id="0x7f080196" />
+    <public type="drawable" name="drawable_voice_user_background_speaking" id="0x7f080197" />
+    <public type="drawable" name="drawable_welcome_card_background" id="0x7f080198" />
+    <public type="drawable" name="drawable_welcome_card_image_background" id="0x7f080199" />
+    <public type="drawable" name="file_item_selection_indicator_btn" id="0x7f0801ba" />
+    <public type="drawable" name="ic_check_white_24dp" id="0x7f080235" />
+    <public type="drawable" name="ic_emoji_activity_dark" id="0x7f080260" />
+    <public type="drawable" name="ic_emoji_activity_light" id="0x7f080261" />
+    <public type="drawable" name="ic_emoji_custom_dark" id="0x7f080262" />
+    <public type="drawable" name="ic_emoji_custom_light" id="0x7f080263" />
+    <public type="drawable" name="ic_emoji_flags_dark" id="0x7f080264" />
+    <public type="drawable" name="ic_emoji_flags_light" id="0x7f080265" />
+    <public type="drawable" name="ic_emoji_food_dark" id="0x7f080266" />
+    <public type="drawable" name="ic_emoji_food_light" id="0x7f080267" />
+    <public type="drawable" name="ic_emoji_nature_dark" id="0x7f080268" />
+    <public type="drawable" name="ic_emoji_nature_light" id="0x7f080269" />
+    <public type="drawable" name="ic_emoji_objects_dark" id="0x7f08026a" />
+    <public type="drawable" name="ic_emoji_objects_light" id="0x7f08026b" />
+    <public type="drawable" name="ic_emoji_people_dark" id="0x7f08026c" />
+    <public type="drawable" name="ic_emoji_people_light" id="0x7f08026d" />
+    <public type="drawable" name="ic_emoji_recent_dark" id="0x7f080270" />
+    <public type="drawable" name="ic_emoji_recent_light" id="0x7f080271" />
+    <public type="drawable" name="ic_emoji_symbols_dark" id="0x7f080272" />
+    <public type="drawable" name="ic_emoji_symbols_light" id="0x7f080273" />
+    <public type="drawable" name="ic_emoji_travel_dark" id="0x7f080274" />
+    <public type="drawable" name="ic_emoji_travel_light" id="0x7f080275" />
+    <public type="drawable" name="ic_headset_grey" id="0x7f0802b7" />
+    <public type="drawable" name="ic_headset_white" id="0x7f0802bb" />
+    <public type="drawable" name="ic_mtrl_chip_checked_black" id="0x7f080300" />
+    <public type="drawable" name="ic_mtrl_chip_checked_circle" id="0x7f080301" />
+    <public type="drawable" name="ic_mtrl_chip_close_circle" id="0x7f080302" />
+    <public type="drawable" name="ic_mute_state_grey" id="0x7f080303" />
+    <public type="drawable" name="ic_mute_state_white" id="0x7f080304" />
+    <public type="drawable" name="ic_speaker_grey" id="0x7f080376" />
+    <public type="drawable" name="ic_speaker_white" id="0x7f080377" />
+    <public type="drawable" name="ic_status_invisible_16dp" id="0x7f08037c" />
+    <public type="drawable" name="ic_status_online_16dp" id="0x7f08037d" />
+    <public type="drawable" name="ic_take_photo" id="0x7f080386" />
+    <public type="drawable" name="ic_trash_outline" id="0x7f080399" />
+    <public type="drawable" name="img_gifting_pattern_bg_dark" id="0x7f08041b" />
+    <public type="drawable" name="img_gifting_pattern_bg_light" id="0x7f08041c" />
+    <public type="drawable" name="img_nitro_classic_pattern" id="0x7f08042f" />
+    <public type="drawable" name="mtrl_snackbar_background" id="0x7f080454" />
+    <public type="drawable" name="mtrl_tabs_default_indicator" id="0x7f080455" />
+    <public type="drawable" name="navigation_empty_icon" id="0x7f080456" />
+    <public type="drawable" name="notification_bg" id="0x7f080458" />
+    <public type="drawable" name="notification_bg_low" id="0x7f080459" />
+    <public type="drawable" name="notification_icon_background" id="0x7f08045e" />
+    <public type="drawable" name="notification_template_icon_bg" id="0x7f08045f" />
+    <public type="drawable" name="notification_template_icon_low_bg" id="0x7f080460" />
+    <public type="drawable" name="notification_tile_bg" id="0x7f080461" />
+    <public type="drawable" name="reactions_divider" id="0x7f080463" />
+    <public type="drawable" name="rich_presence_spotify_play_button" id="0x7f080464" />
+    <public type="drawable" name="tab_dot_selector" id="0x7f080467" />
+    <public type="drawable" name="tab_indicator_default" id="0x7f080468" />
+    <public type="drawable" name="tab_indicator_selected" id="0x7f080469" />
+    <public type="drawable" name="tooltip_frame_dark" id="0x7f08046a" />
+    <public type="drawable" name="tooltip_frame_light" id="0x7f08046b" />
+    <public type="drawable" name="trash_bg" id="0x7f08046c" />
+    <public type="drawable" name="ucrop_shadow_upside" id="0x7f080475" />
+    <public type="drawable" name="ucrop_vector_ic_crop" id="0x7f080476" />
+    <public type="drawable" name="ucrop_vector_loader" id="0x7f080477" />
+    <public type="drawable" name="ucrop_vector_loader_animated" id="0x7f080478" />
     <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" />
     <public type="drawable" name="$avd_show_password__0" id="0x7f080003" />
     <public type="drawable" name="$avd_show_password__1" id="0x7f080004" />
     <public type="drawable" name="$avd_show_password__2" id="0x7f080005" />
-    <public type="drawable" name="abc_action_bar_item_background_material" id="0x7f080017" />
-    <public type="drawable" name="avd_hide_password" id="0x7f080089" />
-    <public type="drawable" name="avd_show_password" id="0x7f08008a" />
-    <public type="drawable" name="notification_action_background" id="0x7f08043c" />
-    <public type="drawable" name="abc_control_background_material" id="0x7f080026" />
-    <public type="drawable" name="bg_cloud_pattern_dark" id="0x7f08008c" />
-    <public type="drawable" name="bg_cloud_pattern_light" id="0x7f08008d" />
-    <public type="drawable" name="bg_nitro" id="0x7f08008e" />
-    <public type="drawable" name="bg_nitro_caution" id="0x7f08008f" />
-    <public type="drawable" name="bg_nitro_classic" id="0x7f080090" />
-    <public type="drawable" name="bg_nitro_error" id="0x7f080091" />
-    <public type="drawable" name="drawable_application_news_loading_dark" id="0x7f0800b8" />
-    <public type="drawable" name="drawable_application_news_loading_light" id="0x7f0800b9" />
-    <public type="drawable" name="drawable_boost_remove" id="0x7f0800e3" />
-    <public type="drawable" name="drawable_boosted_guild_tier_0_dark" id="0x7f0800e4" />
-    <public type="drawable" name="drawable_boosted_guild_tier_0_light" id="0x7f0800e5" />
-    <public type="drawable" name="drawable_chip_delete" id="0x7f080100" />
-    <public type="drawable" name="drawable_ic_game_icon_placeholder_dark" id="0x7f080123" />
-    <public type="drawable" name="drawable_ic_game_icon_placeholder_light" id="0x7f080124" />
-    <public type="drawable" name="drawable_ic_nitro" id="0x7f080125" />
-    <public type="drawable" name="drawable_ic_nitro_classic" id="0x7f080126" />
-    <public type="drawable" name="drawable_icon_sync_integration" id="0x7f08012a" />
-    <public type="drawable" name="drawable_nitro_server_boost" id="0x7f08012c" />
-    <public type="drawable" name="ic_account_bnet" id="0x7f0801ae" />
-    <public type="drawable" name="ic_account_circle_grey_24dp" id="0x7f0801af" />
-    <public type="drawable" name="ic_account_circle_light_grey_24dp" id="0x7f0801b0" />
-    <public type="drawable" name="ic_account_circle_white_24dp" id="0x7f0801b1" />
-    <public type="drawable" name="ic_account_circle_white_a60_24dp" id="0x7f0801b2" />
-    <public type="drawable" name="ic_account_facebook" id="0x7f0801b3" />
-    <public type="drawable" name="ic_account_google" id="0x7f0801b4" />
-    <public type="drawable" name="ic_account_lol" id="0x7f0801b5" />
-    <public type="drawable" name="ic_account_microsoft" id="0x7f0801b6" />
-    <public type="drawable" name="ic_account_obs" id="0x7f0801b7" />
-    <public type="drawable" name="ic_account_patreon" id="0x7f0801b8" />
-    <public type="drawable" name="ic_account_reddit" id="0x7f0801b9" />
-    <public type="drawable" name="ic_account_skype" id="0x7f0801ba" />
-    <public type="drawable" name="ic_account_spotify" id="0x7f0801bb" />
-    <public type="drawable" name="ic_account_steam" id="0x7f0801bc" />
-    <public type="drawable" name="ic_account_twitch" id="0x7f0801bd" />
-    <public type="drawable" name="ic_account_twitter" id="0x7f0801be" />
-    <public type="drawable" name="ic_account_xbox" id="0x7f0801bf" />
-    <public type="drawable" name="ic_account_xsplit" id="0x7f0801c0" />
-    <public type="drawable" name="ic_account_youtube" id="0x7f0801c1" />
-    <public type="drawable" name="ic_add_24dp" id="0x7f0801c2" />
-    <public type="drawable" name="ic_add_a_photo_24dp" id="0x7f0801c3" />
-    <public type="drawable" name="ic_add_circle_outline_grey_a60_24dp" id="0x7f0801c4" />
-    <public type="drawable" name="ic_add_circle_outline_white_24dp" id="0x7f0801c5" />
-    <public type="drawable" name="ic_add_circle_outline_white_a60_24dp" id="0x7f0801c6" />
-    <public type="drawable" name="ic_add_grey_24dp" id="0x7f0801c7" />
-    <public type="drawable" name="ic_add_reaction_grey_16dp" id="0x7f0801c8" />
-    <public type="drawable" name="ic_add_reaction_grey_a60_24dp" id="0x7f0801c9" />
-    <public type="drawable" name="ic_add_reaction_white_a60_24dp" id="0x7f0801ca" />
-    <public type="drawable" name="ic_alert_circle_grey_14dp" id="0x7f0801cd" />
-    <public type="drawable" name="ic_alert_circle_yellow_14dp" id="0x7f0801ce" />
-    <public type="drawable" name="ic_arrow_back_24dp" id="0x7f0801cf" />
-    <public type="drawable" name="ic_arrow_back_dark_grey_24dp" id="0x7f0801d0" />
-    <public type="drawable" name="ic_arrow_back_grey_24dp" id="0x7f0801d1" />
-    <public type="drawable" name="ic_arrow_back_white_24dp" id="0x7f0801d2" />
-    <public type="drawable" name="ic_arrow_downward_white_16dp" id="0x7f0801d3" />
-    <public type="drawable" name="ic_arrow_drop_down_white_18dp" id="0x7f0801d4" />
-    <public type="drawable" name="ic_arrow_upward_white_16dp" id="0x7f0801d5" />
-    <public type="drawable" name="ic_attach_file_24dp" id="0x7f0801d6" />
-    <public type="drawable" name="ic_attachment_grey_24dp" id="0x7f0801d7" />
-    <public type="drawable" name="ic_attachment_white_24dp" id="0x7f0801d8" />
-    <public type="drawable" name="ic_audit_all_grey_24dp" id="0x7f0801d9" />
-    <public type="drawable" name="ic_audit_all_white_24dp" id="0x7f0801da" />
-    <public type="drawable" name="ic_audit_audit_create_24dp" id="0x7f0801db" />
-    <public type="drawable" name="ic_audit_audit_delete_24dp" id="0x7f0801dc" />
-    <public type="drawable" name="ic_audit_audit_update_24dp" id="0x7f0801dd" />
-    <public type="drawable" name="ic_audit_channels_grey_24dp" id="0x7f0801de" />
-    <public type="drawable" name="ic_audit_channels_white_24dp" id="0x7f0801df" />
-    <public type="drawable" name="ic_audit_chat_grey_24dp" id="0x7f0801e0" />
-    <public type="drawable" name="ic_audit_chat_white_24dp" id="0x7f0801e1" />
-    <public type="drawable" name="ic_audit_emoji_grey_24dp" id="0x7f0801e2" />
-    <public type="drawable" name="ic_audit_emoji_white_24dp" id="0x7f0801e3" />
-    <public type="drawable" name="ic_audit_guild_grey_24dp" id="0x7f0801e4" />
-    <public type="drawable" name="ic_audit_guild_white_24dp" id="0x7f0801e5" />
-    <public type="drawable" name="ic_audit_invites_grey_24dp" id="0x7f0801e6" />
-    <public type="drawable" name="ic_audit_invites_white_24dp" id="0x7f0801e7" />
-    <public type="drawable" name="ic_audit_logs_dark_a60_24dp" id="0x7f0801e8" />
-    <public type="drawable" name="ic_audit_logs_light_a60_24dp" id="0x7f0801e9" />
-    <public type="drawable" name="ic_audit_members_grey_24dp" id="0x7f0801ea" />
-    <public type="drawable" name="ic_audit_members_white_24dp" id="0x7f0801eb" />
-    <public type="drawable" name="ic_audit_roles_grey_24dp" id="0x7f0801ec" />
-    <public type="drawable" name="ic_audit_roles_white_24dp" id="0x7f0801ed" />
-    <public type="drawable" name="ic_audit_webhook_grey_24dp" id="0x7f0801ee" />
-    <public type="drawable" name="ic_audit_webhook_white_24dp" id="0x7f0801ef" />
-    <public type="drawable" name="ic_authed_apps_grey_a60_24dp" id="0x7f0801f0" />
-    <public type="drawable" name="ic_authed_apps_white_a60_24dp" id="0x7f0801f1" />
-    <public type="drawable" name="ic_backspace_grey_24dp" id="0x7f0801f2" />
-    <public type="drawable" name="ic_backspace_white_24dp" id="0x7f0801f3" />
-    <public type="drawable" name="ic_ban_red_24dp" id="0x7f0801f4" />
-    <public type="drawable" name="ic_bans_dark_a60_24dp" id="0x7f0801f5" />
-    <public type="drawable" name="ic_bans_light_a60_24dp" id="0x7f0801f6" />
-    <public type="drawable" name="ic_behavior_dark_a60_24dp" id="0x7f0801f7" />
-    <public type="drawable" name="ic_behavior_light_a60_24dp" id="0x7f0801f8" />
-    <public type="drawable" name="ic_billing_dark_a60_20dp" id="0x7f0801f9" />
-    <public type="drawable" name="ic_billing_light_a60_20dp" id="0x7f0801fa" />
-    <public type="drawable" name="ic_bnet_white_24dp" id="0x7f0801fb" />
-    <public type="drawable" name="ic_boosted_badge_12dp" id="0x7f0801fc" />
-    <public type="drawable" name="ic_boosted_badge_24dp" id="0x7f0801fd" />
-    <public type="drawable" name="ic_boosted_guild_tier_1" id="0x7f0801fe" />
-    <public type="drawable" name="ic_boosted_guild_tier_2" id="0x7f0801ff" />
-    <public type="drawable" name="ic_boosted_guild_tier_3" id="0x7f080200" />
-    <public type="drawable" name="ic_call_audio_stop_grey_24dp" id="0x7f080201" />
-    <public type="drawable" name="ic_call_audio_stop_white_24dp" id="0x7f080202" />
-    <public type="drawable" name="ic_call_end_red_24dp" id="0x7f080203" />
-    <public type="drawable" name="ic_call_green_24dp" id="0x7f080205" />
-    <public type="drawable" name="ic_call_grey_24dp" id="0x7f080206" />
-    <public type="drawable" name="ic_call_missed_grey_24dp" id="0x7f080207" />
-    <public type="drawable" name="ic_call_white_24dp" id="0x7f080208" />
-    <public type="drawable" name="ic_camera_front_white_24dp" id="0x7f080209" />
-    <public type="drawable" name="ic_camera_rear_white_24dp" id="0x7f08020a" />
-    <public type="drawable" name="ic_category_16dp" id="0x7f08020b" />
-    <public type="drawable" name="ic_category_grey_a60_24dp" id="0x7f08020c" />
-    <public type="drawable" name="ic_category_white_a60_24dp" id="0x7f08020d" />
-    <public type="drawable" name="ic_channel_lock_16dp" id="0x7f08020e" />
-    <public type="drawable" name="ic_channel_text" id="0x7f080210" />
-    <public type="drawable" name="ic_channel_text_16dp" id="0x7f080211" />
-    <public type="drawable" name="ic_channel_text_grey_18dp" id="0x7f080212" />
-    <public type="drawable" name="ic_channel_text_grey_a60_24dp" id="0x7f080213" />
-    <public type="drawable" name="ic_channel_text_locked" id="0x7f080214" />
-    <public type="drawable" name="ic_channel_text_muted" id="0x7f080215" />
-    <public type="drawable" name="ic_channel_text_nsfw" id="0x7f080216" />
-    <public type="drawable" name="ic_channel_text_white_a60_24dp" id="0x7f080217" />
-    <public type="drawable" name="ic_channel_voice" id="0x7f080218" />
-    <public type="drawable" name="ic_channel_voice_16dp" id="0x7f080219" />
-    <public type="drawable" name="ic_channel_voice_grey_18dp" id="0x7f08021a" />
-    <public type="drawable" name="ic_channel_voice_locked" id="0x7f08021b" />
-    <public type="drawable" name="ic_channels_dark_a60_24dp" id="0x7f08021c" />
-    <public type="drawable" name="ic_channels_light_a60_24dp" id="0x7f08021d" />
-    <public type="drawable" name="ic_chat_bubble_light_grey_24dp" id="0x7f08021e" />
-    <public type="drawable" name="ic_chat_bubble_white_24dp" id="0x7f08021f" />
-    <public type="drawable" name="ic_chat_bubble_white_a60_24dp" id="0x7f080220" />
-    <public type="drawable" name="ic_check_brand_24dp" id="0x7f080221" />
-    <public type="drawable" name="ic_check_circle_24dp" id="0x7f080222" />
-    <public type="drawable" name="ic_check_circle_green_24dp" id="0x7f080223" />
-    <public type="drawable" name="ic_check_green_24dp" id="0x7f080224" />
-    <public type="drawable" name="ic_check_grey_24dp" id="0x7f080225" />
-    <public type="drawable" name="ic_chevron_down_dark_grey_12dp" id="0x7f080227" />
-    <public type="drawable" name="ic_chevron_down_grey_12dp" id="0x7f080228" />
-    <public type="drawable" name="ic_chevron_down_primary_300_12dp" id="0x7f080229" />
-    <public type="drawable" name="ic_chevron_right_dark_grey_12dp" id="0x7f08022a" />
-    <public type="drawable" name="ic_chevron_right_grey_12dp" id="0x7f08022b" />
-    <public type="drawable" name="ic_chevron_right_grey_24dp" id="0x7f08022c" />
-    <public type="drawable" name="ic_chevron_right_primary_300_12dp" id="0x7f08022d" />
-    <public type="drawable" name="ic_clear_24dp" id="0x7f08022e" />
-    <public type="drawable" name="ic_clear_all_grey_24dp" id="0x7f08022f" />
-    <public type="drawable" name="ic_clear_all_white_24dp" id="0x7f080230" />
-    <public type="drawable" name="ic_clear_grey_24dp" id="0x7f080231" />
-    <public type="drawable" name="ic_clear_primary_300_24dp" id="0x7f080232" />
-    <public type="drawable" name="ic_clear_white_24dp" id="0x7f080233" />
-    <public type="drawable" name="ic_close_24dp" id="0x7f080234" />
-    <public type="drawable" name="ic_close_grey_24dp" id="0x7f080235" />
-    <public type="drawable" name="ic_close_primary_200_24dp" id="0x7f080236" />
-    <public type="drawable" name="ic_close_white_24dp" id="0x7f080238" />
-    <public type="drawable" name="ic_content_copy_grey_a60_24dp" id="0x7f080239" />
-    <public type="drawable" name="ic_content_copy_white_a60_24dp" id="0x7f08023a" />
-    <public type="drawable" name="ic_creditcard_amex" id="0x7f08023b" />
-    <public type="drawable" name="ic_creditcard_discover" id="0x7f08023c" />
-    <public type="drawable" name="ic_creditcard_generic" id="0x7f08023d" />
-    <public type="drawable" name="ic_creditcard_mastercard" id="0x7f08023e" />
-    <public type="drawable" name="ic_creditcard_paypal" id="0x7f08023f" />
-    <public type="drawable" name="ic_creditcard_visa" id="0x7f080240" />
-    <public type="drawable" name="ic_crown_24dp" id="0x7f080241" />
-    <public type="drawable" name="ic_delete_grey_a60_24dp" id="0x7f080242" />
-    <public type="drawable" name="ic_delete_sweep_primary_100_a60_24dp" id="0x7f080243" />
-    <public type="drawable" name="ic_delete_sweep_primary_500_a60_24dp" id="0x7f080244" />
-    <public type="drawable" name="ic_delete_white_24dp" id="0x7f080245" />
-    <public type="drawable" name="ic_delete_white_a60_24dp" id="0x7f080246" />
-    <public type="drawable" name="ic_done_activated_24dp" id="0x7f080247" />
-    <public type="drawable" name="ic_done_green_24dp" id="0x7f080248" />
-    <public type="drawable" name="ic_drag_handle_grey_a60_24dp" id="0x7f080249" />
-    <public type="drawable" name="ic_drag_handle_white_a60_24dp" id="0x7f08024a" />
-    <public type="drawable" name="ic_edit_grey_a60_24dp" id="0x7f08024c" />
-    <public type="drawable" name="ic_edit_white_a60_24dp" id="0x7f08024d" />
-    <public type="drawable" name="ic_embed_grey_24dp" id="0x7f08024e" />
-    <public type="drawable" name="ic_embed_white_24dp" id="0x7f08024f" />
-    <public type="drawable" name="ic_emoji_placeholder_primary_100" id="0x7f08025e" />
-    <public type="drawable" name="ic_emoji_placeholder_primary_500" id="0x7f08025f" />
-    <public type="drawable" name="ic_exit_to_app_dark_24dp" id="0x7f080266" />
-    <public type="drawable" name="ic_exit_to_app_light_24dp" id="0x7f080267" />
-    <public type="drawable" name="ic_exit_to_app_red_24dp" id="0x7f080268" />
-    <public type="drawable" name="ic_expand_less_grey_24dp" id="0x7f080269" />
-    <public type="drawable" name="ic_expand_less_white_24dp" id="0x7f08026a" />
-    <public type="drawable" name="ic_facebook_white_18dp" id="0x7f08026b" />
-    <public type="drawable" name="ic_facebook_white_24dp" id="0x7f08026c" />
-    <public type="drawable" name="ic_file_24dp" id="0x7f08026d" />
-    <public type="drawable" name="ic_file_download_grey_24dp" id="0x7f080274" />
-    <public type="drawable" name="ic_file_download_white_24dp" id="0x7f080275" />
-    <public type="drawable" name="ic_file_large_code" id="0x7f080276" />
-    <public type="drawable" name="ic_file_large_document" id="0x7f080277" />
-    <public type="drawable" name="ic_file_large_video" id="0x7f080278" />
-    <public type="drawable" name="ic_file_upload_24dp" id="0x7f08027c" />
-    <public type="drawable" name="ic_filter_list_grey_24dp" id="0x7f08027f" />
-    <public type="drawable" name="ic_filter_list_white_24dp" id="0x7f080280" />
-    <public type="drawable" name="ic_flash_auto_24dp" id="0x7f080281" />
-    <public type="drawable" name="ic_flash_off_24dp" id="0x7f080282" />
-    <public type="drawable" name="ic_flash_on_24dp" id="0x7f080283" />
-    <public type="drawable" name="ic_games_dark_a60_24dp" id="0x7f080284" />
-    <public type="drawable" name="ic_games_light_a60_24dp" id="0x7f080285" />
-    <public type="drawable" name="ic_gem_tier_1" id="0x7f080286" />
-    <public type="drawable" name="ic_gem_tier_2" id="0x7f080287" />
-    <public type="drawable" name="ic_gem_tier_3" id="0x7f080288" />
-    <public type="drawable" name="ic_gem_tier_3_boosted" id="0x7f080289" />
-    <public type="drawable" name="ic_gif_24dp" id="0x7f08028a" />
-    <public type="drawable" name="ic_gift_dark_a60_24dp" id="0x7f08028b" />
-    <public type="drawable" name="ic_gift_light_a60_24dp" id="0x7f08028c" />
-    <public type="drawable" name="ic_google_auth_logo" id="0x7f08028d" />
-    <public type="drawable" name="ic_google_white_24dp" id="0x7f08028e" />
-    <public type="drawable" name="ic_group_add_grey_24dp" id="0x7f08028f" />
-    <public type="drawable" name="ic_group_add_white_24dp" id="0x7f080290" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_1" id="0x7f080294" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_1_banner" id="0x7f080295" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_2" id="0x7f080296" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_2_banner" id="0x7f080297" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_3" id="0x7f080298" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_3_banner" id="0x7f080299" />
-    <public type="drawable" name="ic_guild_folder" id="0x7f08029a" />
-    <public type="drawable" name="ic_guild_nitro_24dp" id="0x7f08029b" />
-    <public type="drawable" name="ic_guild_nitro_perk_stream_24dp" id="0x7f08029c" />
-    <public type="drawable" name="ic_guild_nitro_progress" id="0x7f08029d" />
-    <public type="drawable" name="ic_guild_nitro_progress_banner" id="0x7f08029e" />
-    <public type="drawable" name="ic_header_members_add_grey_24dp" id="0x7f08029f" />
-    <public type="drawable" name="ic_header_members_add_white_24dp" id="0x7f0802a0" />
-    <public type="drawable" name="ic_headset_24dp" id="0x7f0802a1" />
-    <public type="drawable" name="ic_headset_deafened_grey_24dp" id="0x7f0802a2" />
-    <public type="drawable" name="ic_headset_deafened_grey_red_24dp" id="0x7f0802a3" />
-    <public type="drawable" name="ic_headset_deafened_red_24dp" id="0x7f0802a4" />
-    <public type="drawable" name="ic_headset_deafened_white_24dp" id="0x7f0802a5" />
-    <public type="drawable" name="ic_headset_deafened_white_red_24dp" id="0x7f0802a6" />
-    <public type="drawable" name="ic_headset_grey_24dp" id="0x7f0802a8" />
-    <public type="drawable" name="ic_headset_grey_a30_24dp" id="0x7f0802a9" />
-    <public type="drawable" name="ic_headset_red_24dp" id="0x7f0802aa" />
-    <public type="drawable" name="ic_headset_white_18dp" id="0x7f0802ac" />
-    <public type="drawable" name="ic_headset_white_18dp_deafened" id="0x7f0802ad" />
-    <public type="drawable" name="ic_headset_white_24dp" id="0x7f0802ae" />
-    <public type="drawable" name="ic_headset_white_a30_24dp" id="0x7f0802af" />
-    <public type="drawable" name="ic_help_dark_a60_24dp" id="0x7f0802b0" />
-    <public type="drawable" name="ic_help_light_a60_24dp" id="0x7f0802b1" />
-    <public type="drawable" name="ic_help_outline_white_24dp" id="0x7f0802b2" />
-    <public type="drawable" name="ic_history_grey_24dp" id="0x7f0802b3" />
-    <public type="drawable" name="ic_history_white_24dp" id="0x7f0802b4" />
-    <public type="drawable" name="ic_human_greeting_24dp" id="0x7f0802b5" />
-    <public type="drawable" name="ic_hypesquad_house1_32dp" id="0x7f0802b6" />
-    <public type="drawable" name="ic_hypesquad_house2_32dp" id="0x7f0802b8" />
-    <public type="drawable" name="ic_hypesquad_house3_32dp" id="0x7f0802ba" />
-    <public type="drawable" name="ic_image_24dp" id="0x7f0802bc" />
-    <public type="drawable" name="ic_image_library_24dp" id="0x7f0802bd" />
-    <public type="drawable" name="ic_info_dark_a60_24dp" id="0x7f0802c0" />
-    <public type="drawable" name="ic_info_light_a60_24dp" id="0x7f0802c1" />
-    <public type="drawable" name="ic_info_outline_white_24dp" id="0x7f0802c2" />
-    <public type="drawable" name="ic_insert_drive_file_grey_a60_24dp" id="0x7f0802c3" />
-    <public type="drawable" name="ic_insert_drive_file_white_a60_24dp" id="0x7f0802c4" />
-    <public type="drawable" name="ic_insert_emoticon_24dp" id="0x7f0802c5" />
-    <public type="drawable" name="ic_instagram_white_18dp" id="0x7f0802c6" />
-    <public type="drawable" name="ic_integrations_dark_a60_24dp" id="0x7f0802c7" />
-    <public type="drawable" name="ic_integrations_light_a60_24dp" id="0x7f0802c8" />
-    <public type="drawable" name="ic_invites_dark_a60_24dp" id="0x7f0802c9" />
-    <public type="drawable" name="ic_invites_light_a60_24dp" id="0x7f0802ca" />
-    <public type="drawable" name="ic_keyboard_24dp" id="0x7f0802cb" />
-    <public type="drawable" name="ic_launch_24dp" id="0x7f0802cc" />
-    <public type="drawable" name="ic_link_dark_a60_24dp" id="0x7f0802cd" />
-    <public type="drawable" name="ic_link_light_a60_24dp" id="0x7f0802ce" />
-    <public type="drawable" name="ic_link_white_24dp" id="0x7f0802cf" />
-    <public type="drawable" name="ic_live_stream_white_24dp" id="0x7f0802d0" />
-    <public type="drawable" name="ic_locale_dark_a60_24dp" id="0x7f0802d1" />
-    <public type="drawable" name="ic_locale_light_a60_24dp" id="0x7f0802d2" />
-    <public type="drawable" name="ic_lock_dark_a60_24dp" id="0x7f0802d3" />
-    <public type="drawable" name="ic_lock_light_a60_24dp" id="0x7f0802d4" />
-    <public type="drawable" name="ic_lock_white_a60_16dp" id="0x7f0802d5" />
-    <public type="drawable" name="ic_lol_white_24dp" id="0x7f0802d6" />
-    <public type="drawable" name="ic_member_list_boosted_badge_24dp" id="0x7f0802d7" />
-    <public type="drawable" name="ic_members_dark_a60_24dp" id="0x7f0802d8" />
-    <public type="drawable" name="ic_members_dark_grey_24dp" id="0x7f0802d9" />
-    <public type="drawable" name="ic_members_grey_24dp" id="0x7f0802da" />
-    <public type="drawable" name="ic_members_light_a60_24dp" id="0x7f0802db" />
-    <public type="drawable" name="ic_members_white_24dp" id="0x7f0802dc" />
-    <public type="drawable" name="ic_mentions_grey_24dp" id="0x7f0802dd" />
-    <public type="drawable" name="ic_mentions_white_24dp" id="0x7f0802de" />
-    <public type="drawable" name="ic_mentions_white_a60_24dp" id="0x7f0802df" />
-    <public type="drawable" name="ic_menu_private_grey_a60_24dp" id="0x7f0802e0" />
-    <public type="drawable" name="ic_menu_private_white_a60_24dp" id="0x7f0802e1" />
-    <public type="drawable" name="ic_message_white_18dp" id="0x7f0802e2" />
-    <public type="drawable" name="ic_mic_grey_24dp" id="0x7f0802e3" />
-    <public type="drawable" name="ic_mic_grey_a30_24dp" id="0x7f0802e4" />
-    <public type="drawable" name="ic_mic_muted_grey_24dp" id="0x7f0802e5" />
-    <public type="drawable" name="ic_mic_muted_grey_red_24dp" id="0x7f0802e6" />
-    <public type="drawable" name="ic_mic_muted_red_24dp" id="0x7f0802e7" />
-    <public type="drawable" name="ic_mic_muted_white_24dp" id="0x7f0802e8" />
-    <public type="drawable" name="ic_mic_muted_white_red_24dp" id="0x7f0802e9" />
-    <public type="drawable" name="ic_mic_red_24dp" id="0x7f0802ea" />
-    <public type="drawable" name="ic_mic_white_18dp" id="0x7f0802eb" />
-    <public type="drawable" name="ic_mic_white_18dp_muted" id="0x7f0802ec" />
-    <public type="drawable" name="ic_mic_white_24dp" id="0x7f0802ed" />
-    <public type="drawable" name="ic_mic_white_a30_24dp" id="0x7f0802ee" />
-    <public type="drawable" name="ic_movie_24dp" id="0x7f0802ef" />
-    <public type="drawable" name="ic_my_account_dark_a60_24dp" id="0x7f0802f5" />
-    <public type="drawable" name="ic_my_account_light_a60_24dp" id="0x7f0802f6" />
-    <public type="drawable" name="ic_nitro_badge_nitro_gradient_16dp" id="0x7f0802f7" />
-    <public type="drawable" name="ic_nitro_badge_white" id="0x7f0802f8" />
-    <public type="drawable" name="ic_nitro_gifs_24dp" id="0x7f0802f9" />
-    <public type="drawable" name="ic_nitro_globalemojis_24dp" id="0x7f0802fa" />
-    <public type="drawable" name="ic_nitro_highquality_24dp" id="0x7f0802fb" />
-    <public type="drawable" name="ic_nitro_perk_stream_24dp" id="0x7f0802fc" />
-    <public type="drawable" name="ic_nitro_rep" id="0x7f0802fd" />
-    <public type="drawable" name="ic_nitro_rep_24dp" id="0x7f0802fe" />
-    <public type="drawable" name="ic_nitro_tag_24dp" id="0x7f0802ff" />
-    <public type="drawable" name="ic_notifications_grey_a60_24dp" id="0x7f080304" />
-    <public type="drawable" name="ic_notifications_off_grey_a60_24dp" id="0x7f080305" />
-    <public type="drawable" name="ic_notifications_off_white_a60_24dp" id="0x7f080306" />
-    <public type="drawable" name="ic_notifications_settings_grey_a60_24dp" id="0x7f080307" />
-    <public type="drawable" name="ic_notifications_settings_white_a60_24dp" id="0x7f080308" />
-    <public type="drawable" name="ic_notifications_white_a60_24dp" id="0x7f080309" />
-    <public type="drawable" name="ic_open_in_browser_grey_24dp" id="0x7f08030a" />
-    <public type="drawable" name="ic_open_in_browser_white_24dp" id="0x7f08030b" />
-    <public type="drawable" name="ic_open_in_new_grey_24dp" id="0x7f08030c" />
-    <public type="drawable" name="ic_open_in_new_grey_a60_24dp" id="0x7f08030d" />
-    <public type="drawable" name="ic_open_in_new_white_24dp" id="0x7f08030e" />
-    <public type="drawable" name="ic_open_in_new_white_a60_24dp" id="0x7f08030f" />
-    <public type="drawable" name="ic_overlay_grey_24dp" id="0x7f080311" />
-    <public type="drawable" name="ic_overlay_white_24dp" id="0x7f080312" />
-    <public type="drawable" name="ic_overview_dark_a60_24dp" id="0x7f080313" />
-    <public type="drawable" name="ic_overview_light_a60_24dp" id="0x7f080314" />
-    <public type="drawable" name="ic_partnered_badge" id="0x7f080315" />
-    <public type="drawable" name="ic_partnered_badge_banner" id="0x7f080316" />
-    <public type="drawable" name="ic_people_grey_24dp" id="0x7f080317" />
-    <public type="drawable" name="ic_people_white_24dp" id="0x7f080318" />
-    <public type="drawable" name="ic_perk_lock" id="0x7f080319" />
-    <public type="drawable" name="ic_perk_tier_1_boosted" id="0x7f08031a" />
-    <public type="drawable" name="ic_perk_tier_1_unboosted" id="0x7f08031b" />
-    <public type="drawable" name="ic_perk_tier_2_boosted" id="0x7f08031c" />
-    <public type="drawable" name="ic_perk_tier_2_unboosted" id="0x7f08031d" />
-    <public type="drawable" name="ic_perk_tier_3_boosted" id="0x7f08031e" />
-    <public type="drawable" name="ic_perk_tier_3_unboosted" id="0x7f08031f" />
-    <public type="drawable" name="ic_person_add_grey_a60_24dp" id="0x7f080320" />
-    <public type="drawable" name="ic_person_add_new_primary_500_24dp" id="0x7f080321" />
-    <public type="drawable" name="ic_person_add_new_white_24dp" id="0x7f080322" />
-    <public type="drawable" name="ic_person_add_white_24dp" id="0x7f080323" />
-    <public type="drawable" name="ic_person_add_white_a60_24dp" id="0x7f080324" />
-    <public type="drawable" name="ic_person_grey_a60_24dp" id="0x7f080325" />
-    <public type="drawable" name="ic_person_white_a60_24dp" id="0x7f080326" />
-    <public type="drawable" name="ic_phonelink_grey_a60_24dp" id="0x7f080327" />
-    <public type="drawable" name="ic_phonelink_white_a60_24dp" id="0x7f080328" />
-    <public type="drawable" name="ic_photo_grey_24dp" id="0x7f080329" />
-    <public type="drawable" name="ic_photo_white_24dp" id="0x7f08032a" />
-    <public type="drawable" name="ic_pins_dark_a60_24dp" id="0x7f08032b" />
-    <public type="drawable" name="ic_pins_light_a60_24dp" id="0x7f08032c" />
-    <public type="drawable" name="ic_play_arrow_grey_24dp" id="0x7f08032d" />
-    <public type="drawable" name="ic_play_arrow_white_24dp" id="0x7f08032e" />
-    <public type="drawable" name="ic_play_circle_outline_grey_24dp" id="0x7f08032f" />
-    <public type="drawable" name="ic_play_circle_outline_white_24dp" id="0x7f080330" />
-    <public type="drawable" name="ic_plus_dark_a60_24dp" id="0x7f080331" />
-    <public type="drawable" name="ic_plus_light_a60_24dp" id="0x7f080332" />
-    <public type="drawable" name="ic_popup_settings_grey_a60_24dp" id="0x7f080333" />
-    <public type="drawable" name="ic_popup_settings_white_a60_24dp" id="0x7f080334" />
-    <public type="drawable" name="ic_privacy_dark_a60_24dp" id="0x7f080335" />
-    <public type="drawable" name="ic_privacy_light_a60_24dp" id="0x7f080336" />
-    <public type="drawable" name="ic_profile_badge_bughunter_32dp" id="0x7f080337" />
-    <public type="drawable" name="ic_profile_badge_hypesquad_32dp" id="0x7f080338" />
-    <public type="drawable" name="ic_profile_badge_nitro_32dp" id="0x7f080339" />
-    <public type="drawable" name="ic_profile_badge_partner_32dp" id="0x7f08033a" />
-    <public type="drawable" name="ic_profile_badge_premium_early_supporter_32dp" id="0x7f08033b" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl1_32dp" id="0x7f08033c" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl2_32dp" id="0x7f08033d" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl3_32dp" id="0x7f08033e" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl4_32dp" id="0x7f08033f" />
-    <public type="drawable" name="ic_profile_badge_staff_32dp" id="0x7f080340" />
-    <public type="drawable" name="ic_reactions_grey_a60_24dp" id="0x7f080341" />
-    <public type="drawable" name="ic_reactions_white_a60_24dp" id="0x7f080342" />
-    <public type="drawable" name="ic_reddit_white_24dp" id="0x7f080343" />
-    <public type="drawable" name="ic_refresh_grey_a60_24dp" id="0x7f080344" />
-    <public type="drawable" name="ic_refresh_white_a60_24dp" id="0x7f080345" />
-    <public type="drawable" name="ic_remove_circle_outline_red_24dp" id="0x7f080346" />
-    <public type="drawable" name="ic_remove_friend_red_24dp" id="0x7f080347" />
-    <public type="drawable" name="ic_rich_presence_grey_16dp" id="0x7f080348" />
-    <public type="drawable" name="ic_role_24dp" id="0x7f080349" />
-    <public type="drawable" name="ic_roles_dark_a60_24dp" id="0x7f08034b" />
-    <public type="drawable" name="ic_roles_light_a60_24dp" id="0x7f08034c" />
-    <public type="drawable" name="ic_search_grey_24dp" id="0x7f08034e" />
-    <public type="drawable" name="ic_search_items_white_a60_24dp" id="0x7f08034f" />
-    <public type="drawable" name="ic_search_white_24dp" id="0x7f080350" />
-    <public type="drawable" name="ic_security_dark_a60_24dp" id="0x7f080351" />
-    <public type="drawable" name="ic_security_light_a60_24dp" id="0x7f080352" />
-    <public type="drawable" name="ic_send_24dp" id="0x7f080353" />
-    <public type="drawable" name="ic_send_grey_a60_24dp" id="0x7f080354" />
-    <public type="drawable" name="ic_send_white_a60_24dp" id="0x7f080356" />
-    <public type="drawable" name="ic_settings_boost_dark_a60_24dp" id="0x7f080357" />
-    <public type="drawable" name="ic_settings_boost_light_a60_24dp" id="0x7f080358" />
-    <public type="drawable" name="ic_settings_grey_a60_24dp" id="0x7f080359" />
-    <public type="drawable" name="ic_settings_white_a60_24dp" id="0x7f08035a" />
-    <public type="drawable" name="ic_share_grey_24dp" id="0x7f08035b" />
-    <public type="drawable" name="ic_share_grey_a60_24dp" id="0x7f08035c" />
-    <public type="drawable" name="ic_share_white_24dp" id="0x7f08035d" />
-    <public type="drawable" name="ic_share_white_a60_24dp" id="0x7f08035e" />
-    <public type="drawable" name="ic_skype_white_24dp" id="0x7f080360" />
-    <public type="drawable" name="ic_small_lock_green_24dp" id="0x7f080361" />
-    <public type="drawable" name="ic_smile_24dp" id="0x7f080362" />
-    <public type="drawable" name="ic_sort_grey_24dp" id="0x7f080363" />
-    <public type="drawable" name="ic_sort_white_24dp" id="0x7f080364" />
-    <public type="drawable" name="ic_spotify_white_24dp" id="0x7f080367" />
-    <public type="drawable" name="ic_star_24dp" id="0x7f080368" />
-    <public type="drawable" name="ic_status_dnd_16dp" id="0x7f080369" />
-    <public type="drawable" name="ic_status_idle_16dp" id="0x7f08036a" />
-    <public type="drawable" name="ic_status_streaming_16dp" id="0x7f08036d" />
-    <public type="drawable" name="ic_steam" id="0x7f08036e" />
-    <public type="drawable" name="ic_steam_white_24dp" id="0x7f08036f" />
-    <public type="drawable" name="ic_swap_vertical_circle_grey_a60_24dp" id="0x7f080370" />
-    <public type="drawable" name="ic_swap_vertical_circle_white_a60_24dp" id="0x7f080371" />
-    <public type="drawable" name="ic_switch_camera_grey_24dp" id="0x7f080372" />
-    <public type="drawable" name="ic_switch_camera_white_24dp" id="0x7f080373" />
-    <public type="drawable" name="ic_text_channel_grey_24dp" id="0x7f08037c" />
-    <public type="drawable" name="ic_text_channel_white_24dp" id="0x7f08037d" />
-    <public type="drawable" name="ic_text_image_dark_a60_24dp" id="0x7f08037e" />
-    <public type="drawable" name="ic_text_image_light_a60_24dp" id="0x7f08037f" />
-    <public type="drawable" name="ic_theme_dark_a60_24dp" id="0x7f080380" />
-    <public type="drawable" name="ic_theme_light_a60_24dp" id="0x7f080381" />
-    <public type="drawable" name="ic_timer_dark" id="0x7f080382" />
-    <public type="drawable" name="ic_timer_grey_a60_24dp" id="0x7f080383" />
-    <public type="drawable" name="ic_timer_light" id="0x7f080384" />
-    <public type="drawable" name="ic_timer_white_a60_24dp" id="0x7f080385" />
-    <public type="drawable" name="ic_transfer_red_24dp" id="0x7f080386" />
-    <public type="drawable" name="ic_twitch_white_24dp" id="0x7f080388" />
-    <public type="drawable" name="ic_twitter_white_18dp" id="0x7f080389" />
-    <public type="drawable" name="ic_twitter_white_24dp" id="0x7f08038a" />
-    <public type="drawable" name="ic_unban_grey" id="0x7f08038c" />
-    <public type="drawable" name="ic_unread_white_9dp" id="0x7f08038d" />
-    <public type="drawable" name="ic_unread_white_9dp_horiz" id="0x7f08038e" />
-    <public type="drawable" name="ic_upload_24dp" id="0x7f08038f" />
-    <public type="drawable" name="ic_upload_image_34dp" id="0x7f080390" />
-    <public type="drawable" name="ic_upload_image_40dp" id="0x7f080391" />
-    <public type="drawable" name="ic_uploads_file_dark" id="0x7f080392" />
-    <public type="drawable" name="ic_uploads_file_light" id="0x7f080393" />
-    <public type="drawable" name="ic_uploads_generic_dark" id="0x7f080394" />
-    <public type="drawable" name="ic_uploads_generic_light" id="0x7f080395" />
-    <public type="drawable" name="ic_uploads_image_dark" id="0x7f080396" />
-    <public type="drawable" name="ic_uploads_image_light" id="0x7f080397" />
-    <public type="drawable" name="ic_uploads_video_dark" id="0x7f080398" />
-    <public type="drawable" name="ic_uploads_video_light" id="0x7f080399" />
-    <public type="drawable" name="ic_user_premium_guild_subscription" id="0x7f08039a" />
-    <public type="drawable" name="ic_verified_badge" id="0x7f08039b" />
-    <public type="drawable" name="ic_verified_badge_banner" id="0x7f08039c" />
-    <public type="drawable" name="ic_videocam_dark_grey_24dp" id="0x7f08039d" />
-    <public type="drawable" name="ic_videocam_grey_24dp" id="0x7f08039e" />
-    <public type="drawable" name="ic_videocam_off_grey_24dp" id="0x7f08039f" />
-    <public type="drawable" name="ic_videocam_off_white_24dp" id="0x7f0803a0" />
-    <public type="drawable" name="ic_videocam_white_24dp" id="0x7f0803a1" />
-    <public type="drawable" name="ic_visibility_grey_24dp" id="0x7f0803a2" />
-    <public type="drawable" name="ic_visibility_off_grey_a60_24dp" id="0x7f0803a3" />
-    <public type="drawable" name="ic_visibility_off_white_a60_24dp" id="0x7f0803a4" />
-    <public type="drawable" name="ic_visibility_white_24dp" id="0x7f0803a5" />
-    <public type="drawable" name="ic_voice_channel_streaming" id="0x7f0803a6" />
-    <public type="drawable" name="ic_voice_quality_average" id="0x7f0803a7" />
-    <public type="drawable" name="ic_voice_quality_bad" id="0x7f0803a8" />
-    <public type="drawable" name="ic_voice_quality_fine" id="0x7f0803a9" />
-    <public type="drawable" name="ic_voice_quality_unknown" id="0x7f0803aa" />
-    <public type="drawable" name="ic_voice_settings_dark_a60_24dp" id="0x7f0803ab" />
-    <public type="drawable" name="ic_voice_settings_light_a60_24dp" id="0x7f0803ac" />
-    <public type="drawable" name="ic_volume_up_dark_grey_24dp" id="0x7f0803ad" />
-    <public type="drawable" name="ic_volume_up_dark_grey_a30_24dp" id="0x7f0803ae" />
-    <public type="drawable" name="ic_volume_up_grey_24dp" id="0x7f0803af" />
-    <public type="drawable" name="ic_volume_up_light_grey_24dp" id="0x7f0803b0" />
-    <public type="drawable" name="ic_volume_up_white_24dp" id="0x7f0803b1" />
-    <public type="drawable" name="ic_volume_up_white_a30_24dp" id="0x7f0803b2" />
-    <public type="drawable" name="ic_xbox_white_24dp" id="0x7f0803b3" />
-    <public type="drawable" name="ic_youtube_gaming_white_24dp" id="0x7f0803b4" />
-    <public type="drawable" name="img_addfriends_empty_dark" id="0x7f0803df" />
-    <public type="drawable" name="img_addfriends_empty_light" id="0x7f0803e0" />
-    <public type="drawable" name="img_addfriends_notconnected_dark" id="0x7f0803e1" />
-    <public type="drawable" name="img_addfriends_notconnected_light" id="0x7f0803e2" />
-    <public type="drawable" name="img_animated_emoji_upsell" id="0x7f0803e3" />
-    <public type="drawable" name="img_auth_logo_x_samsung" id="0x7f0803eb" />
-    <public type="drawable" name="img_avatar_upsell" id="0x7f0803ec" />
-    <public type="drawable" name="img_baddies_dark_theme" id="0x7f0803ed" />
-    <public type="drawable" name="img_baddies_light_theme" id="0x7f0803ee" />
-    <public type="drawable" name="img_badge_upsell" id="0x7f0803ef" />
-    <public type="drawable" name="img_discord_nitro_logo_left" id="0x7f0803f0" />
-    <public type="drawable" name="img_empty_friends_no_suggestions_dark" id="0x7f0803f1" />
-    <public type="drawable" name="img_empty_friends_no_suggestions_light" id="0x7f0803f2" />
-    <public type="drawable" name="img_empty_friends_none_blocked_dark" id="0x7f0803f3" />
-    <public type="drawable" name="img_empty_friends_none_blocked_light" id="0x7f0803f4" />
-    <public type="drawable" name="img_empty_friends_none_dark" id="0x7f0803f5" />
-    <public type="drawable" name="img_empty_friends_none_light" id="0x7f0803f6" />
-    <public type="drawable" name="img_empty_friends_none_online_dark" id="0x7f0803f7" />
-    <public type="drawable" name="img_empty_friends_none_online_light" id="0x7f0803f8" />
-    <public type="drawable" name="img_empty_friends_none_pending_dark" id="0x7f0803f9" />
-    <public type="drawable" name="img_empty_friends_none_pending_light" id="0x7f0803fa" />
-    <public type="drawable" name="img_empty_server_settings_emoji_dark" id="0x7f0803fc" />
-    <public type="drawable" name="img_empty_server_settings_emoji_light" id="0x7f0803fd" />
-    <public type="drawable" name="img_empty_server_settings_invites_dark" id="0x7f0803fe" />
-    <public type="drawable" name="img_empty_server_settings_invites_light" id="0x7f0803ff" />
-    <public type="drawable" name="img_forced_update_dark" id="0x7f080400" />
-    <public type="drawable" name="img_forced_update_light" id="0x7f080401" />
-    <public type="drawable" name="img_global_emoji_upsell" id="0x7f080406" />
-    <public type="drawable" name="img_item_shop_dark" id="0x7f080407" />
-    <public type="drawable" name="img_logo_discord_nitro" id="0x7f080408" />
-    <public type="drawable" name="img_logo_discord_nitro_brand" id="0x7f080409" />
-    <public type="drawable" name="img_logo_discord_nitro_classic" id="0x7f08040a" />
-    <public type="drawable" name="img_logo_nitro" id="0x7f08040b" />
-    <public type="drawable" name="img_logo_nitro_classic" id="0x7f08040c" />
-    <public type="drawable" name="img_logo_nitro_classic_brand" id="0x7f08040d" />
-    <public type="drawable" name="img_logo_nitro_classic_header" id="0x7f08040e" />
-    <public type="drawable" name="img_logo_square" id="0x7f08040f" />
-    <public type="drawable" name="img_mfa_dark" id="0x7f080410" />
-    <public type="drawable" name="img_mfa_light" id="0x7f080411" />
-    <public type="drawable" name="img_new_tos_dark_theme" id="0x7f080412" />
-    <public type="drawable" name="img_new_tos_light_theme" id="0x7f080413" />
-    <public type="drawable" name="img_nitro_broken_wheel" id="0x7f080414" />
-    <public type="drawable" name="img_nitro_pattern" id="0x7f080416" />
-    <public type="drawable" name="img_no_gifts" id="0x7f080419" />
-    <public type="drawable" name="img_no_mutual_friends_dark" id="0x7f08041a" />
-    <public type="drawable" name="img_no_mutual_friends_light" id="0x7f08041b" />
-    <public type="drawable" name="img_no_mutual_servers_dark" id="0x7f08041c" />
-    <public type="drawable" name="img_no_mutual_servers_light" id="0x7f08041d" />
-    <public type="drawable" name="img_no_stream_preview" id="0x7f08041e" />
-    <public type="drawable" name="img_no_text_channels_dark" id="0x7f08041f" />
-    <public type="drawable" name="img_no_text_channels_light" id="0x7f080420" />
-    <public type="drawable" name="img_nsfw_dark_theme" id="0x7f080421" />
-    <public type="drawable" name="img_nsfw_light_theme" id="0x7f080422" />
-    <public type="drawable" name="img_poop_dark" id="0x7f080425" />
-    <public type="drawable" name="img_poop_light" id="0x7f080426" />
-    <public type="drawable" name="img_quick_switcher_empty" id="0x7f080427" />
-    <public type="drawable" name="img_server_nitro_status" id="0x7f080428" />
-    <public type="drawable" name="img_tag_upsell" id="0x7f080429" />
-    <public type="drawable" name="img_upload_upsell" id="0x7f08042a" />
-    <public type="drawable" name="img_verify_email_dark_theme" id="0x7f08042b" />
-    <public type="drawable" name="img_verify_email_light_theme" id="0x7f08042c" />
-    <public type="drawable" name="img_verify_phone_dark_theme" id="0x7f08042d" />
-    <public type="drawable" name="img_verify_phone_light_theme" id="0x7f08042e" />
-    <public type="drawable" name="img_wumpus_ball_dark" id="0x7f080432" />
-    <public type="drawable" name="img_wumpus_ball_light" id="0x7f080433" />
-    <public type="drawable" name="img_wumpus_game_launcher" id="0x7f080434" />
-    <public type="drawable" name="img_wumpus_jetpack" id="0x7f080435" />
-    <public type="drawable" name="img_wumpus_riding_wheel" id="0x7f080436" />
-    <public type="drawable" name="img_wumpus_tophat_dark" id="0x7f080437" />
-    <public type="drawable" name="img_wumpus_tophat_light" id="0x7f080438" />
-    <public type="drawable" name="ucrop_ic_angle" id="0x7f08044f" />
-    <public type="drawable" name="ucrop_ic_crop" id="0x7f080450" />
-    <public type="drawable" name="ucrop_ic_cross" id="0x7f080451" />
-    <public type="drawable" name="ucrop_ic_done" id="0x7f080452" />
-    <public type="drawable" name="ucrop_ic_next" id="0x7f080453" />
-    <public type="drawable" name="ucrop_ic_reset" id="0x7f080454" />
-    <public type="drawable" name="ucrop_ic_rotate" id="0x7f080455" />
-    <public type="drawable" name="ucrop_ic_scale" id="0x7f080456" />
-    <public type="drawable" name="abc_ab_share_pack_mtrl_alpha" id="0x7f080016" />
-    <public type="drawable" name="abc_btn_check_to_on_mtrl_000" id="0x7f08001a" />
-    <public type="drawable" name="abc_btn_check_to_on_mtrl_015" id="0x7f08001b" />
-    <public type="drawable" name="abc_btn_radio_to_on_mtrl_000" id="0x7f08001f" />
-    <public type="drawable" name="abc_btn_radio_to_on_mtrl_015" id="0x7f080020" />
-    <public type="drawable" name="abc_btn_switch_to_on_mtrl_00001" id="0x7f080021" />
-    <public type="drawable" name="abc_btn_switch_to_on_mtrl_00012" id="0x7f080022" />
-    <public type="drawable" name="abc_cab_background_top_mtrl_alpha" id="0x7f080025" />
-    <public type="drawable" name="abc_ic_commit_search_api_mtrl_alpha" id="0x7f08002c" />
-    <public type="drawable" name="abc_ic_menu_copy_mtrl_am_alpha" id="0x7f08002e" />
-    <public type="drawable" name="abc_ic_menu_cut_mtrl_alpha" id="0x7f08002f" />
-    <public type="drawable" name="abc_ic_menu_paste_mtrl_am_alpha" id="0x7f080031" />
-    <public type="drawable" name="abc_ic_menu_selectall_mtrl_alpha" id="0x7f080032" />
-    <public type="drawable" name="abc_ic_menu_share_mtrl_alpha" id="0x7f080033" />
-    <public type="drawable" name="abc_ic_star_black_16dp" id="0x7f080035" />
-    <public type="drawable" name="abc_ic_star_black_36dp" id="0x7f080036" />
-    <public type="drawable" name="abc_ic_star_black_48dp" id="0x7f080037" />
-    <public type="drawable" name="abc_ic_star_half_black_16dp" id="0x7f080038" />
-    <public type="drawable" name="abc_ic_star_half_black_36dp" id="0x7f080039" />
-    <public type="drawable" name="abc_ic_star_half_black_48dp" id="0x7f08003a" />
-    <public type="drawable" name="abc_list_divider_mtrl_alpha" id="0x7f08003f" />
-    <public type="drawable" name="abc_list_focused_holo" id="0x7f080040" />
-    <public type="drawable" name="abc_list_longpressed_holo" id="0x7f080041" />
-    <public type="drawable" name="abc_list_pressed_holo_dark" id="0x7f080042" />
-    <public type="drawable" name="abc_list_pressed_holo_light" id="0x7f080043" />
-    <public type="drawable" name="abc_list_selector_disabled_holo_dark" id="0x7f080046" />
-    <public type="drawable" name="abc_list_selector_disabled_holo_light" id="0x7f080047" />
-    <public type="drawable" name="abc_menu_hardkey_panel_mtrl_mult" id="0x7f08004a" />
-    <public type="drawable" name="abc_popup_background_mtrl_mult" id="0x7f08004b" />
-    <public type="drawable" name="abc_scrubber_control_off_mtrl_alpha" id="0x7f08004f" />
-    <public type="drawable" name="abc_scrubber_control_to_pressed_mtrl_000" id="0x7f080050" />
-    <public type="drawable" name="abc_scrubber_control_to_pressed_mtrl_005" id="0x7f080051" />
-    <public type="drawable" name="abc_scrubber_primary_mtrl_alpha" id="0x7f080052" />
-    <public type="drawable" name="abc_scrubber_track_mtrl_alpha" id="0x7f080053" />
-    <public type="drawable" name="abc_spinner_mtrl_am_alpha" id="0x7f080057" />
-    <public type="drawable" name="abc_switch_track_mtrl_alpha" id="0x7f08005a" />
-    <public type="drawable" name="abc_tab_indicator_mtrl_alpha" id="0x7f08005c" />
-    <public type="drawable" name="abc_text_select_handle_left_mtrl_dark" id="0x7f08005e" />
-    <public type="drawable" name="abc_text_select_handle_left_mtrl_light" id="0x7f08005f" />
-    <public type="drawable" name="abc_text_select_handle_middle_mtrl_dark" id="0x7f080060" />
-    <public type="drawable" name="abc_text_select_handle_middle_mtrl_light" id="0x7f080061" />
-    <public type="drawable" name="abc_text_select_handle_right_mtrl_dark" id="0x7f080062" />
-    <public type="drawable" name="abc_text_select_handle_right_mtrl_light" id="0x7f080063" />
-    <public type="drawable" name="abc_textfield_activated_mtrl_alpha" id="0x7f080064" />
-    <public type="drawable" name="abc_textfield_default_mtrl_alpha" id="0x7f080065" />
-    <public type="drawable" name="abc_textfield_search_activated_mtrl_alpha" id="0x7f080066" />
-    <public type="drawable" name="abc_textfield_search_default_mtrl_alpha" id="0x7f080067" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark_normal_background" id="0x7f0800a3" />
-    <public type="drawable" name="common_google_signin_btn_icon_light_normal_background" id="0x7f0800a8" />
-    <public type="drawable" name="common_google_signin_btn_text_dark_normal_background" id="0x7f0800ac" />
-    <public type="drawable" name="common_google_signin_btn_text_light_normal_background" id="0x7f0800b1" />
-    <public type="drawable" name="design_ic_visibility" id="0x7f0800b4" />
-    <public type="drawable" name="design_ic_visibility_off" id="0x7f0800b5" />
-    <public type="drawable" name="googleg_disabled_color_18" id="0x7f0801ac" />
-    <public type="drawable" name="googleg_standard_color_18" id="0x7f0801ad" />
-    <public type="drawable" name="ic_add_white_24dp" id="0x7f0801cc" />
-    <public type="drawable" name="notification_bg_low_normal" id="0x7f08043f" />
-    <public type="drawable" name="notification_bg_low_pressed" id="0x7f080440" />
-    <public type="drawable" name="notification_bg_normal" id="0x7f080441" />
-    <public type="drawable" name="notification_bg_normal_pressed" id="0x7f080442" />
-    <public type="drawable" name="notify_panel_notification_icon_bg" id="0x7f080447" />
-    <public type="drawable" name="asset_security" id="0x7f080087" />
-    <public type="drawable" name="common_full_open_on_phone" id="0x7f08009f" />
-    <public type="drawable" name="ic_role_lock" id="0x7f08034a" />
-    <public type="drawable" name="img_wump_trash_dark" id="0x7f080431" />
-    <public type="drawable" name="asset_broken_results_dark" id="0x7f08006d" />
-    <public type="drawable" name="asset_broken_results_light" id="0x7f08006e" />
-    <public type="drawable" name="asset_empty_no_bans" id="0x7f080075" />
-    <public type="drawable" name="asset_empty_no_invites" id="0x7f080076" />
-    <public type="drawable" name="asset_no_results_alt_dark" id="0x7f08007e" />
-    <public type="drawable" name="asset_no_results_alt_light" id="0x7f08007f" />
-    <public type="drawable" name="asset_no_results_dark" id="0x7f080080" />
-    <public type="drawable" name="asset_no_results_light" id="0x7f080081" />
-    <public type="drawable" name="asset_sadbot" id="0x7f080084" />
-    <public type="drawable" name="emoji_activity_color" id="0x7f08018b" />
-    <public type="drawable" name="emoji_activity_dark" id="0x7f08018c" />
-    <public type="drawable" name="emoji_activity_light" id="0x7f08018d" />
-    <public type="drawable" name="emoji_custom_color" id="0x7f08018e" />
-    <public type="drawable" name="emoji_custom_dark" id="0x7f08018f" />
-    <public type="drawable" name="emoji_custom_light" id="0x7f080190" />
-    <public type="drawable" name="emoji_flags_color" id="0x7f080191" />
-    <public type="drawable" name="emoji_flags_dark" id="0x7f080192" />
-    <public type="drawable" name="emoji_flags_light" id="0x7f080193" />
-    <public type="drawable" name="emoji_food_color" id="0x7f080194" />
-    <public type="drawable" name="emoji_food_dark" id="0x7f080195" />
-    <public type="drawable" name="emoji_food_light" id="0x7f080196" />
-    <public type="drawable" name="emoji_nature_color" id="0x7f080197" />
-    <public type="drawable" name="emoji_nature_dark" id="0x7f080198" />
-    <public type="drawable" name="emoji_nature_light" id="0x7f080199" />
-    <public type="drawable" name="emoji_object_color" id="0x7f08019a" />
-    <public type="drawable" name="emoji_object_dark" id="0x7f08019b" />
-    <public type="drawable" name="emoji_object_light" id="0x7f08019c" />
-    <public type="drawable" name="emoji_people_color" id="0x7f08019d" />
-    <public type="drawable" name="emoji_people_dark" id="0x7f08019e" />
-    <public type="drawable" name="emoji_people_light" id="0x7f08019f" />
-    <public type="drawable" name="emoji_recent_color" id="0x7f0801a0" />
-    <public type="drawable" name="emoji_recent_dark" id="0x7f0801a1" />
-    <public type="drawable" name="emoji_recent_light" id="0x7f0801a2" />
-    <public type="drawable" name="emoji_symbol_color" id="0x7f0801a3" />
-    <public type="drawable" name="emoji_symbol_dark" id="0x7f0801a4" />
-    <public type="drawable" name="emoji_symbol_light" id="0x7f0801a5" />
-    <public type="drawable" name="emoji_travel_color" id="0x7f0801a6" />
-    <public type="drawable" name="emoji_travel_dark" id="0x7f0801a7" />
-    <public type="drawable" name="emoji_travel_light" id="0x7f0801a8" />
-    <public type="drawable" name="empty_pins_dark" id="0x7f0801a9" />
-    <public type="drawable" name="empty_pins_light" id="0x7f0801aa" />
-    <public type="drawable" name="ic_channel_pinned_message" id="0x7f08020f" />
-    <public type="drawable" name="ic_dropdown_white_18dp" id="0x7f08024b" />
-    <public type="drawable" name="ic_file_acrobat" id="0x7f08026e" />
-    <public type="drawable" name="ic_file_ae" id="0x7f08026f" />
-    <public type="drawable" name="ic_file_ai" id="0x7f080270" />
-    <public type="drawable" name="ic_file_archive" id="0x7f080271" />
-    <public type="drawable" name="ic_file_code" id="0x7f080272" />
-    <public type="drawable" name="ic_file_document" id="0x7f080273" />
-    <public type="drawable" name="ic_file_sketch" id="0x7f080279" />
-    <public type="drawable" name="ic_file_spreadsheet" id="0x7f08027a" />
-    <public type="drawable" name="ic_file_unknown" id="0x7f08027b" />
-    <public type="drawable" name="ic_file_video" id="0x7f08027d" />
-    <public type="drawable" name="ic_file_webcode" id="0x7f08027e" />
-    <public type="drawable" name="ic_group_edit" id="0x7f080291" />
-    <public type="drawable" name="ic_group_join" id="0x7f080292" />
-    <public type="drawable" name="ic_group_leave" id="0x7f080293" />
-    <public type="drawable" name="ic_img_selected_dark_theme" id="0x7f0802be" />
-    <public type="drawable" name="ic_img_selected_light_theme" id="0x7f0802bf" />
-    <public type="drawable" name="ic_ternary_neutral_checked" id="0x7f080375" />
-    <public type="drawable" name="ic_ternary_neutral_unchecked" id="0x7f080376" />
-    <public type="drawable" name="ic_ternary_off_checked" id="0x7f080377" />
-    <public type="drawable" name="ic_ternary_off_disabled" id="0x7f080378" />
-    <public type="drawable" name="ic_ternary_off_unchecked" id="0x7f080379" />
-    <public type="drawable" name="ic_ternary_on_checked" id="0x7f08037a" />
-    <public type="drawable" name="ic_ternary_on_unchecked" id="0x7f08037b" />
-    <public type="drawable" name="img_empty_no_connections" id="0x7f0803fb" />
-    <public type="drawable" name="img_nitro_splash_dark" id="0x7f080417" />
-    <public type="drawable" name="img_nitro_splash_light" id="0x7f080418" />
-    <public type="drawable" name="img_permission_prime" id="0x7f080424" />
-    <public type="drawable" name="img_voice_no_connections_dark" id="0x7f08042f" />
-    <public type="drawable" name="img_voice_no_connections_light" id="0x7f080430" />
-    <public type="drawable" name="asset_account_sync_twitch" id="0x7f08006b" />
-    <public type="drawable" name="asset_account_sync_youtube" id="0x7f08006c" />
-    <public type="drawable" name="asset_default_avatar_32dp" id="0x7f08006f" />
-    <public type="drawable" name="asset_default_avatar_64dp" id="0x7f080070" />
-    <public type="drawable" name="asset_group_full" id="0x7f080078" />
-    <public type="drawable" name="asset_loading" id="0x7f08007b" />
-    <public type="drawable" name="asset_mfa_server" id="0x7f08007d" />
-    <public type="drawable" name="asset_search_empty_dark" id="0x7f080085" />
-    <public type="drawable" name="asset_search_empty_light" id="0x7f080086" />
-    <public type="drawable" name="drawable_default_invite_splash" id="0x7f08010e" />
-    <public type="drawable" name="ic_add_server_46dp" id="0x7f0801cb" />
-    <public type="drawable" name="ic_call_end_white_24dp" id="0x7f080204" />
-    <public type="drawable" name="ic_close_white_18dp" id="0x7f080237" />
-    <public type="drawable" name="ic_notification_24dp" id="0x7f080300" />
-    <public type="drawable" name="ic_notification_call_24dp" id="0x7f080301" />
-    <public type="drawable" name="ic_notification_friends_24dp" id="0x7f080302" />
-    <public type="drawable" name="ic_notification_message_24dp" id="0x7f080303" />
-    <public type="drawable" name="ic_search" id="0x7f08034d" />
-    <public type="drawable" name="ic_send_white_24dp" id="0x7f080355" />
-    <public type="drawable" name="ic_signal_cellular_connected_no_internet_4_bar_white_18dp" id="0x7f08035f" />
-    <public type="drawable" name="ic_unavailable_server_46dp" id="0x7f08038b" />
-    <public type="drawable" name="icon_flag_au" id="0x7f0803b7" />
-    <public type="drawable" name="icon_flag_bg" id="0x7f0803b8" />
-    <public type="drawable" name="icon_flag_cs" id="0x7f0803b9" />
-    <public type="drawable" name="icon_flag_da" id="0x7f0803ba" />
-    <public type="drawable" name="icon_flag_de" id="0x7f0803bb" />
-    <public type="drawable" name="icon_flag_el" id="0x7f0803bc" />
-    <public type="drawable" name="icon_flag_en_gb" id="0x7f0803bd" />
-    <public type="drawable" name="icon_flag_en_us" id="0x7f0803be" />
-    <public type="drawable" name="icon_flag_es_es" id="0x7f0803bf" />
-    <public type="drawable" name="icon_flag_eu" id="0x7f0803c0" />
-    <public type="drawable" name="icon_flag_fi" id="0x7f0803c1" />
-    <public type="drawable" name="icon_flag_fr" id="0x7f0803c2" />
-    <public type="drawable" name="icon_flag_gb" id="0x7f0803c3" />
-    <public type="drawable" name="icon_flag_hk" id="0x7f0803c4" />
-    <public type="drawable" name="icon_flag_hr" id="0x7f0803c5" />
-    <public type="drawable" name="icon_flag_hu" id="0x7f0803c6" />
-    <public type="drawable" name="icon_flag_it" id="0x7f0803c7" />
-    <public type="drawable" name="icon_flag_ja" id="0x7f0803c8" />
-    <public type="drawable" name="icon_flag_ko" id="0x7f0803c9" />
-    <public type="drawable" name="icon_flag_lt" id="0x7f0803ca" />
-    <public type="drawable" name="icon_flag_nl" id="0x7f0803cb" />
-    <public type="drawable" name="icon_flag_no" id="0x7f0803cc" />
-    <public type="drawable" name="icon_flag_pl" id="0x7f0803cd" />
-    <public type="drawable" name="icon_flag_pt_br" id="0x7f0803ce" />
-    <public type="drawable" name="icon_flag_ro" id="0x7f0803cf" />
-    <public type="drawable" name="icon_flag_ru" id="0x7f0803d0" />
-    <public type="drawable" name="icon_flag_sg" id="0x7f0803d1" />
-    <public type="drawable" name="icon_flag_sv_se" id="0x7f0803d2" />
-    <public type="drawable" name="icon_flag_th" id="0x7f0803d3" />
-    <public type="drawable" name="icon_flag_tr" id="0x7f0803d4" />
-    <public type="drawable" name="icon_flag_uk" id="0x7f0803d5" />
-    <public type="drawable" name="icon_flag_unknown" id="0x7f0803d6" />
-    <public type="drawable" name="icon_flag_vi" id="0x7f0803d7" />
-    <public type="drawable" name="icon_flag_zh_cn" id="0x7f0803d8" />
-    <public type="drawable" name="icon_flag_zh_tw" id="0x7f0803d9" />
-    <public type="drawable" name="img_auth_bg_dark" id="0x7f0803e6" />
-    <public type="drawable" name="img_auth_bg_light" id="0x7f0803e7" />
-    <public type="drawable" name="img_gifting_pattern_dark" id="0x7f080404" />
-    <public type="drawable" name="img_gifting_pattern_light" id="0x7f080405" />
-    <public type="drawable" name="asset_empty_mentions_arm_dark" id="0x7f080071" />
-    <public type="drawable" name="asset_empty_mentions_arm_light" id="0x7f080072" />
-    <public type="drawable" name="asset_empty_mentions_hand_dark" id="0x7f080073" />
-    <public type="drawable" name="asset_empty_mentions_hand_light" id="0x7f080074" />
-    <public type="drawable" name="asset_image_loading" id="0x7f080079" />
-    <public type="drawable" name="asset_image_loading_spinner" id="0x7f08007a" />
-    <public type="drawable" name="asset_mascot_grey_left" id="0x7f08007c" />
-    <public type="drawable" name="asset_pattern_shapes_grey" id="0x7f080082" />
-    <public type="drawable" name="asset_pattern_shapes_white" id="0x7f080083" />
-    <public type="drawable" name="asset_tooltip_server_create" id="0x7f080088" />
-    <public type="drawable" name="ic_hypesquad_house1_winner_32dp" id="0x7f0802b7" />
-    <public type="drawable" name="ic_hypesquad_house2_winner_32dp" id="0x7f0802b9" />
-    <public type="drawable" name="ic_hypesquad_house3_winner_32dp" id="0x7f0802bb" />
-    <public type="drawable" name="ic_overflow_grey" id="0x7f080310" />
-    <public type="drawable" name="icon_carrot" id="0x7f0803b5" />
-    <public type="drawable" name="icon_deafened_small" id="0x7f0803b6" />
-    <public type="drawable" name="icon_friends_list" id="0x7f0803da" />
-    <public type="drawable" name="icon_menu_copy" id="0x7f0803db" />
-    <public type="drawable" name="icon_more" id="0x7f0803dc" />
-    <public type="drawable" name="icon_muted_small" id="0x7f0803dd" />
-    <public type="drawable" name="icon_save" id="0x7f0803de" />
-    <public type="drawable" name="img_auth_bg_bl" id="0x7f0803e4" />
-    <public type="drawable" name="img_auth_bg_br" id="0x7f0803e5" />
-    <public type="drawable" name="img_auth_bg_tr" id="0x7f0803e8" />
-    <public type="drawable" name="img_auth_logo" id="0x7f0803e9" />
-    <public type="drawable" name="img_auth_logo_small" id="0x7f0803ea" />
-    <public type="drawable" name="img_overlay_nux" id="0x7f080423" />
+    <public type="drawable" name="abc_action_bar_item_background_material" id="0x7f080018" />
+    <public type="drawable" name="avd_hide_password" id="0x7f08008a" />
+    <public type="drawable" name="avd_show_password" id="0x7f08008b" />
+    <public type="drawable" name="notification_action_background" id="0x7f080457" />
+    <public type="drawable" name="ripple_brighten" id="0x7f080465" />
+    <public type="drawable" name="ripple_darken" id="0x7f080466" />
+    <public type="drawable" name="abc_control_background_material" id="0x7f080027" />
+    <public type="drawable" name="bg_cloud_pattern_dark" id="0x7f08008d" />
+    <public type="drawable" name="bg_cloud_pattern_light" id="0x7f08008e" />
+    <public type="drawable" name="bg_nitro" id="0x7f08008f" />
+    <public type="drawable" name="bg_nitro_caution" id="0x7f080090" />
+    <public type="drawable" name="bg_nitro_classic" id="0x7f080091" />
+    <public type="drawable" name="bg_nitro_error" id="0x7f080092" />
+    <public type="drawable" name="drawable_application_news_loading_dark" id="0x7f0800bb" />
+    <public type="drawable" name="drawable_application_news_loading_light" id="0x7f0800bc" />
+    <public type="drawable" name="drawable_boost_remove" id="0x7f0800e7" />
+    <public type="drawable" name="drawable_boosted_guild_tier_0_dark" id="0x7f0800e8" />
+    <public type="drawable" name="drawable_boosted_guild_tier_0_light" id="0x7f0800e9" />
+    <public type="drawable" name="drawable_chip_delete" id="0x7f080107" />
+    <public type="drawable" name="drawable_ic_game_icon_placeholder_dark" id="0x7f08012a" />
+    <public type="drawable" name="drawable_ic_game_icon_placeholder_light" id="0x7f08012b" />
+    <public type="drawable" name="drawable_ic_nitro" id="0x7f08012c" />
+    <public type="drawable" name="drawable_ic_nitro_classic" id="0x7f08012d" />
+    <public type="drawable" name="drawable_icon_sync_integration" id="0x7f080131" />
+    <public type="drawable" name="drawable_nitro_server_boost" id="0x7f080132" />
+    <public type="drawable" name="drawable_stream_ended" id="0x7f08015c" />
+    <public type="drawable" name="drawable_stream_feedback_face_happy_color" id="0x7f08015d" />
+    <public type="drawable" name="drawable_stream_feedback_face_happy_grayscale" id="0x7f08015e" />
+    <public type="drawable" name="drawable_stream_feedback_face_neutral_color" id="0x7f08015f" />
+    <public type="drawable" name="drawable_stream_feedback_face_neutral_grayscale" id="0x7f080160" />
+    <public type="drawable" name="drawable_stream_feedback_face_sad_color" id="0x7f080161" />
+    <public type="drawable" name="drawable_stream_feedback_face_sad_grayscale" id="0x7f080162" />
+    <public type="drawable" name="ic_account_bnet" id="0x7f0801bd" />
+    <public type="drawable" name="ic_account_circle_grey_24dp" id="0x7f0801be" />
+    <public type="drawable" name="ic_account_circle_light_grey_24dp" id="0x7f0801bf" />
+    <public type="drawable" name="ic_account_circle_white_24dp" id="0x7f0801c0" />
+    <public type="drawable" name="ic_account_circle_white_a60_24dp" id="0x7f0801c1" />
+    <public type="drawable" name="ic_account_facebook" id="0x7f0801c2" />
+    <public type="drawable" name="ic_account_google" id="0x7f0801c3" />
+    <public type="drawable" name="ic_account_lol" id="0x7f0801c4" />
+    <public type="drawable" name="ic_account_microsoft" id="0x7f0801c5" />
+    <public type="drawable" name="ic_account_obs" id="0x7f0801c6" />
+    <public type="drawable" name="ic_account_patreon" id="0x7f0801c7" />
+    <public type="drawable" name="ic_account_reddit" id="0x7f0801c8" />
+    <public type="drawable" name="ic_account_skype" id="0x7f0801c9" />
+    <public type="drawable" name="ic_account_spotify" id="0x7f0801ca" />
+    <public type="drawable" name="ic_account_steam" id="0x7f0801cb" />
+    <public type="drawable" name="ic_account_twitch" id="0x7f0801cc" />
+    <public type="drawable" name="ic_account_twitter" id="0x7f0801cd" />
+    <public type="drawable" name="ic_account_xbox" id="0x7f0801ce" />
+    <public type="drawable" name="ic_account_xsplit" id="0x7f0801cf" />
+    <public type="drawable" name="ic_account_youtube" id="0x7f0801d0" />
+    <public type="drawable" name="ic_add_24dp" id="0x7f0801d1" />
+    <public type="drawable" name="ic_add_a_photo_24dp" id="0x7f0801d2" />
+    <public type="drawable" name="ic_add_circle_outline_grey_a60_24dp" id="0x7f0801d3" />
+    <public type="drawable" name="ic_add_circle_outline_white_24dp" id="0x7f0801d4" />
+    <public type="drawable" name="ic_add_circle_outline_white_a60_24dp" id="0x7f0801d5" />
+    <public type="drawable" name="ic_add_grey_24dp" id="0x7f0801d6" />
+    <public type="drawable" name="ic_add_reaction_grey_16dp" id="0x7f0801d7" />
+    <public type="drawable" name="ic_add_reaction_grey_a60_24dp" id="0x7f0801d8" />
+    <public type="drawable" name="ic_add_reaction_white_a60_24dp" id="0x7f0801d9" />
+    <public type="drawable" name="ic_alert_circle_grey_14dp" id="0x7f0801dc" />
+    <public type="drawable" name="ic_alert_circle_yellow_14dp" id="0x7f0801dd" />
+    <public type="drawable" name="ic_arrow_back_24dp" id="0x7f0801de" />
+    <public type="drawable" name="ic_arrow_back_dark_grey_24dp" id="0x7f0801df" />
+    <public type="drawable" name="ic_arrow_back_grey_24dp" id="0x7f0801e0" />
+    <public type="drawable" name="ic_arrow_back_white_24dp" id="0x7f0801e1" />
+    <public type="drawable" name="ic_arrow_downward_white_16dp" id="0x7f0801e2" />
+    <public type="drawable" name="ic_arrow_drop_down_white_18dp" id="0x7f0801e3" />
+    <public type="drawable" name="ic_arrow_upward_white_16dp" id="0x7f0801e4" />
+    <public type="drawable" name="ic_attach_file_24dp" id="0x7f0801e5" />
+    <public type="drawable" name="ic_attachment_grey_24dp" id="0x7f0801e6" />
+    <public type="drawable" name="ic_attachment_white_24dp" id="0x7f0801e7" />
+    <public type="drawable" name="ic_audit_all_grey_24dp" id="0x7f0801e8" />
+    <public type="drawable" name="ic_audit_all_white_24dp" id="0x7f0801e9" />
+    <public type="drawable" name="ic_audit_audit_create_24dp" id="0x7f0801ea" />
+    <public type="drawable" name="ic_audit_audit_delete_24dp" id="0x7f0801eb" />
+    <public type="drawable" name="ic_audit_audit_update_24dp" id="0x7f0801ec" />
+    <public type="drawable" name="ic_audit_channels_grey_24dp" id="0x7f0801ed" />
+    <public type="drawable" name="ic_audit_channels_white_24dp" id="0x7f0801ee" />
+    <public type="drawable" name="ic_audit_chat_grey_24dp" id="0x7f0801ef" />
+    <public type="drawable" name="ic_audit_chat_white_24dp" id="0x7f0801f0" />
+    <public type="drawable" name="ic_audit_emoji_grey_24dp" id="0x7f0801f1" />
+    <public type="drawable" name="ic_audit_emoji_white_24dp" id="0x7f0801f2" />
+    <public type="drawable" name="ic_audit_guild_grey_24dp" id="0x7f0801f3" />
+    <public type="drawable" name="ic_audit_guild_white_24dp" id="0x7f0801f4" />
+    <public type="drawable" name="ic_audit_invites_grey_24dp" id="0x7f0801f5" />
+    <public type="drawable" name="ic_audit_invites_white_24dp" id="0x7f0801f6" />
+    <public type="drawable" name="ic_audit_logs_dark_a60_24dp" id="0x7f0801f7" />
+    <public type="drawable" name="ic_audit_logs_light_a60_24dp" id="0x7f0801f8" />
+    <public type="drawable" name="ic_audit_members_grey_24dp" id="0x7f0801f9" />
+    <public type="drawable" name="ic_audit_members_white_24dp" id="0x7f0801fa" />
+    <public type="drawable" name="ic_audit_roles_grey_24dp" id="0x7f0801fb" />
+    <public type="drawable" name="ic_audit_roles_white_24dp" id="0x7f0801fc" />
+    <public type="drawable" name="ic_audit_webhook_grey_24dp" id="0x7f0801fd" />
+    <public type="drawable" name="ic_audit_webhook_white_24dp" id="0x7f0801fe" />
+    <public type="drawable" name="ic_authed_apps_grey_a60_24dp" id="0x7f0801ff" />
+    <public type="drawable" name="ic_authed_apps_white_a60_24dp" id="0x7f080200" />
+    <public type="drawable" name="ic_backspace_grey_24dp" id="0x7f080201" />
+    <public type="drawable" name="ic_backspace_white_24dp" id="0x7f080202" />
+    <public type="drawable" name="ic_ban_red_24dp" id="0x7f080203" />
+    <public type="drawable" name="ic_bans_dark_a60_24dp" id="0x7f080204" />
+    <public type="drawable" name="ic_bans_light_a60_24dp" id="0x7f080205" />
+    <public type="drawable" name="ic_behavior_dark_a60_24dp" id="0x7f080206" />
+    <public type="drawable" name="ic_behavior_light_a60_24dp" id="0x7f080207" />
+    <public type="drawable" name="ic_billing_dark_a60_20dp" id="0x7f080208" />
+    <public type="drawable" name="ic_billing_light_a60_20dp" id="0x7f080209" />
+    <public type="drawable" name="ic_bnet_white_24dp" id="0x7f08020a" />
+    <public type="drawable" name="ic_boosted_badge_12dp" id="0x7f08020b" />
+    <public type="drawable" name="ic_boosted_badge_24dp" id="0x7f08020c" />
+    <public type="drawable" name="ic_boosted_guild_tier_1" id="0x7f08020d" />
+    <public type="drawable" name="ic_boosted_guild_tier_2" id="0x7f08020e" />
+    <public type="drawable" name="ic_boosted_guild_tier_3" id="0x7f08020f" />
+    <public type="drawable" name="ic_call_audio_stop_grey_24dp" id="0x7f080210" />
+    <public type="drawable" name="ic_call_audio_stop_white_24dp" id="0x7f080211" />
+    <public type="drawable" name="ic_call_end_red_24dp" id="0x7f080212" />
+    <public type="drawable" name="ic_call_green_24dp" id="0x7f080214" />
+    <public type="drawable" name="ic_call_grey_24dp" id="0x7f080215" />
+    <public type="drawable" name="ic_call_missed_grey_24dp" id="0x7f080216" />
+    <public type="drawable" name="ic_call_white_24dp" id="0x7f080217" />
+    <public type="drawable" name="ic_camera_front_white_24dp" id="0x7f080218" />
+    <public type="drawable" name="ic_camera_rear_white_24dp" id="0x7f080219" />
+    <public type="drawable" name="ic_category_16dp" id="0x7f08021a" />
+    <public type="drawable" name="ic_category_grey_a60_24dp" id="0x7f08021b" />
+    <public type="drawable" name="ic_category_white_a60_24dp" id="0x7f08021c" />
+    <public type="drawable" name="ic_channel_lock_16dp" id="0x7f08021d" />
+    <public type="drawable" name="ic_channel_text" id="0x7f08021f" />
+    <public type="drawable" name="ic_channel_text_16dp" id="0x7f080220" />
+    <public type="drawable" name="ic_channel_text_grey_18dp" id="0x7f080221" />
+    <public type="drawable" name="ic_channel_text_grey_a60_24dp" id="0x7f080222" />
+    <public type="drawable" name="ic_channel_text_locked" id="0x7f080223" />
+    <public type="drawable" name="ic_channel_text_muted" id="0x7f080224" />
+    <public type="drawable" name="ic_channel_text_nsfw" id="0x7f080225" />
+    <public type="drawable" name="ic_channel_text_white_a60_24dp" id="0x7f080226" />
+    <public type="drawable" name="ic_channel_voice" id="0x7f080227" />
+    <public type="drawable" name="ic_channel_voice_16dp" id="0x7f080228" />
+    <public type="drawable" name="ic_channel_voice_grey_18dp" id="0x7f080229" />
+    <public type="drawable" name="ic_channel_voice_locked" id="0x7f08022a" />
+    <public type="drawable" name="ic_channels_dark_a60_24dp" id="0x7f08022b" />
+    <public type="drawable" name="ic_channels_light_a60_24dp" id="0x7f08022c" />
+    <public type="drawable" name="ic_chat_bubble_light_grey_24dp" id="0x7f08022d" />
+    <public type="drawable" name="ic_chat_bubble_white_24dp" id="0x7f08022e" />
+    <public type="drawable" name="ic_chat_bubble_white_a60_24dp" id="0x7f08022f" />
+    <public type="drawable" name="ic_check_brand_24dp" id="0x7f080230" />
+    <public type="drawable" name="ic_check_circle_24dp" id="0x7f080231" />
+    <public type="drawable" name="ic_check_circle_green_24dp" id="0x7f080232" />
+    <public type="drawable" name="ic_check_green_24dp" id="0x7f080233" />
+    <public type="drawable" name="ic_check_grey_24dp" id="0x7f080234" />
+    <public type="drawable" name="ic_chevron_down_dark_grey_12dp" id="0x7f080236" />
+    <public type="drawable" name="ic_chevron_down_grey_12dp" id="0x7f080237" />
+    <public type="drawable" name="ic_chevron_down_primary_300_12dp" id="0x7f080238" />
+    <public type="drawable" name="ic_chevron_down_white_12dp" id="0x7f080239" />
+    <public type="drawable" name="ic_chevron_right_dark_grey_12dp" id="0x7f08023a" />
+    <public type="drawable" name="ic_chevron_right_grey_12dp" id="0x7f08023b" />
+    <public type="drawable" name="ic_chevron_right_grey_24dp" id="0x7f08023c" />
+    <public type="drawable" name="ic_chevron_right_primary_300_12dp" id="0x7f08023d" />
+    <public type="drawable" name="ic_clear_24dp" id="0x7f08023e" />
+    <public type="drawable" name="ic_clear_all_grey_24dp" id="0x7f08023f" />
+    <public type="drawable" name="ic_clear_all_white_24dp" id="0x7f080240" />
+    <public type="drawable" name="ic_clear_grey_24dp" id="0x7f080241" />
+    <public type="drawable" name="ic_clear_primary_300_24dp" id="0x7f080242" />
+    <public type="drawable" name="ic_clear_white_24dp" id="0x7f080243" />
+    <public type="drawable" name="ic_close_24dp" id="0x7f080244" />
+    <public type="drawable" name="ic_close_grey_24dp" id="0x7f080245" />
+    <public type="drawable" name="ic_close_primary_200_24dp" id="0x7f080246" />
+    <public type="drawable" name="ic_close_white_24dp" id="0x7f080248" />
+    <public type="drawable" name="ic_content_copy_grey_a60_24dp" id="0x7f080249" />
+    <public type="drawable" name="ic_content_copy_white_a60_24dp" id="0x7f08024a" />
+    <public type="drawable" name="ic_creditcard_amex" id="0x7f08024b" />
+    <public type="drawable" name="ic_creditcard_discover" id="0x7f08024c" />
+    <public type="drawable" name="ic_creditcard_generic" id="0x7f08024d" />
+    <public type="drawable" name="ic_creditcard_mastercard" id="0x7f08024e" />
+    <public type="drawable" name="ic_creditcard_paypal" id="0x7f08024f" />
+    <public type="drawable" name="ic_creditcard_visa" id="0x7f080250" />
+    <public type="drawable" name="ic_crown_24dp" id="0x7f080251" />
+    <public type="drawable" name="ic_delete_grey_a60_24dp" id="0x7f080252" />
+    <public type="drawable" name="ic_delete_sweep_primary_100_a60_24dp" id="0x7f080253" />
+    <public type="drawable" name="ic_delete_sweep_primary_500_a60_24dp" id="0x7f080254" />
+    <public type="drawable" name="ic_delete_white_24dp" id="0x7f080255" />
+    <public type="drawable" name="ic_delete_white_a60_24dp" id="0x7f080256" />
+    <public type="drawable" name="ic_done_activated_24dp" id="0x7f080257" />
+    <public type="drawable" name="ic_done_green_24dp" id="0x7f080258" />
+    <public type="drawable" name="ic_drag_handle_grey_a60_24dp" id="0x7f080259" />
+    <public type="drawable" name="ic_drag_handle_white_a60_24dp" id="0x7f08025a" />
+    <public type="drawable" name="ic_edit_grey_a60_24dp" id="0x7f08025c" />
+    <public type="drawable" name="ic_edit_white_a60_24dp" id="0x7f08025d" />
+    <public type="drawable" name="ic_embed_grey_24dp" id="0x7f08025e" />
+    <public type="drawable" name="ic_embed_white_24dp" id="0x7f08025f" />
+    <public type="drawable" name="ic_emoji_placeholder_primary_100" id="0x7f08026e" />
+    <public type="drawable" name="ic_emoji_placeholder_primary_500" id="0x7f08026f" />
+    <public type="drawable" name="ic_exit_to_app_dark_24dp" id="0x7f080276" />
+    <public type="drawable" name="ic_exit_to_app_light_24dp" id="0x7f080277" />
+    <public type="drawable" name="ic_exit_to_app_red_24dp" id="0x7f080278" />
+    <public type="drawable" name="ic_expand_less_grey_24dp" id="0x7f080279" />
+    <public type="drawable" name="ic_expand_less_white_24dp" id="0x7f08027a" />
+    <public type="drawable" name="ic_facebook_white_18dp" id="0x7f08027b" />
+    <public type="drawable" name="ic_facebook_white_24dp" id="0x7f08027c" />
+    <public type="drawable" name="ic_file_24dp" id="0x7f08027d" />
+    <public type="drawable" name="ic_file_download_grey_24dp" id="0x7f080284" />
+    <public type="drawable" name="ic_file_download_white_24dp" id="0x7f080285" />
+    <public type="drawable" name="ic_file_large_code" id="0x7f080286" />
+    <public type="drawable" name="ic_file_large_document" id="0x7f080287" />
+    <public type="drawable" name="ic_file_large_video" id="0x7f080288" />
+    <public type="drawable" name="ic_file_upload_24dp" id="0x7f08028c" />
+    <public type="drawable" name="ic_filter_list_grey_24dp" id="0x7f08028f" />
+    <public type="drawable" name="ic_filter_list_white_24dp" id="0x7f080290" />
+    <public type="drawable" name="ic_flash_auto_24dp" id="0x7f080291" />
+    <public type="drawable" name="ic_flash_off_24dp" id="0x7f080292" />
+    <public type="drawable" name="ic_flash_on_24dp" id="0x7f080293" />
+    <public type="drawable" name="ic_games_dark_a60_24dp" id="0x7f080294" />
+    <public type="drawable" name="ic_games_light_a60_24dp" id="0x7f080295" />
+    <public type="drawable" name="ic_gem_tier_1" id="0x7f080296" />
+    <public type="drawable" name="ic_gem_tier_2" id="0x7f080297" />
+    <public type="drawable" name="ic_gem_tier_3" id="0x7f080298" />
+    <public type="drawable" name="ic_gem_tier_3_boosted" id="0x7f080299" />
+    <public type="drawable" name="ic_gif_24dp" id="0x7f08029a" />
+    <public type="drawable" name="ic_gift_dark_a60_24dp" id="0x7f08029b" />
+    <public type="drawable" name="ic_gift_light_a60_24dp" id="0x7f08029c" />
+    <public type="drawable" name="ic_google_auth_logo" id="0x7f08029d" />
+    <public type="drawable" name="ic_google_white_24dp" id="0x7f08029e" />
+    <public type="drawable" name="ic_group_add_grey_24dp" id="0x7f08029f" />
+    <public type="drawable" name="ic_group_add_white_24dp" id="0x7f0802a0" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_1" id="0x7f0802a4" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_1_banner" id="0x7f0802a5" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_2" id="0x7f0802a6" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_2_banner" id="0x7f0802a7" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_3" id="0x7f0802a8" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_3_banner" id="0x7f0802a9" />
+    <public type="drawable" name="ic_guild_folder" id="0x7f0802aa" />
+    <public type="drawable" name="ic_guild_nitro_24dp" id="0x7f0802ab" />
+    <public type="drawable" name="ic_guild_nitro_perk_stream_24dp" id="0x7f0802ac" />
+    <public type="drawable" name="ic_guild_nitro_progress" id="0x7f0802ad" />
+    <public type="drawable" name="ic_guild_nitro_progress_banner" id="0x7f0802ae" />
+    <public type="drawable" name="ic_header_members_add_grey_24dp" id="0x7f0802af" />
+    <public type="drawable" name="ic_header_members_add_white_24dp" id="0x7f0802b0" />
+    <public type="drawable" name="ic_headset_24dp" id="0x7f0802b1" />
+    <public type="drawable" name="ic_headset_deafened_grey_24dp" id="0x7f0802b2" />
+    <public type="drawable" name="ic_headset_deafened_grey_red_24dp" id="0x7f0802b3" />
+    <public type="drawable" name="ic_headset_deafened_red_24dp" id="0x7f0802b4" />
+    <public type="drawable" name="ic_headset_deafened_white_24dp" id="0x7f0802b5" />
+    <public type="drawable" name="ic_headset_deafened_white_red_24dp" id="0x7f0802b6" />
+    <public type="drawable" name="ic_headset_grey_24dp" id="0x7f0802b8" />
+    <public type="drawable" name="ic_headset_grey_a30_24dp" id="0x7f0802b9" />
+    <public type="drawable" name="ic_headset_red_24dp" id="0x7f0802ba" />
+    <public type="drawable" name="ic_headset_white_18dp" id="0x7f0802bc" />
+    <public type="drawable" name="ic_headset_white_18dp_deafened" id="0x7f0802bd" />
+    <public type="drawable" name="ic_headset_white_24dp" id="0x7f0802be" />
+    <public type="drawable" name="ic_headset_white_a30_24dp" id="0x7f0802bf" />
+    <public type="drawable" name="ic_help_dark_a60_24dp" id="0x7f0802c0" />
+    <public type="drawable" name="ic_help_light_a60_24dp" id="0x7f0802c1" />
+    <public type="drawable" name="ic_help_outline_white_24dp" id="0x7f0802c2" />
+    <public type="drawable" name="ic_history_grey_24dp" id="0x7f0802c3" />
+    <public type="drawable" name="ic_history_white_24dp" id="0x7f0802c4" />
+    <public type="drawable" name="ic_human_greeting_24dp" id="0x7f0802c5" />
+    <public type="drawable" name="ic_hypesquad_house1_32dp" id="0x7f0802c6" />
+    <public type="drawable" name="ic_hypesquad_house2_32dp" id="0x7f0802c8" />
+    <public type="drawable" name="ic_hypesquad_house3_32dp" id="0x7f0802ca" />
+    <public type="drawable" name="ic_image_24dp" id="0x7f0802cc" />
+    <public type="drawable" name="ic_image_library_24dp" id="0x7f0802cd" />
+    <public type="drawable" name="ic_info_dark_a60_24dp" id="0x7f0802d0" />
+    <public type="drawable" name="ic_info_light_a60_24dp" id="0x7f0802d1" />
+    <public type="drawable" name="ic_info_outline_white_24dp" id="0x7f0802d2" />
+    <public type="drawable" name="ic_insert_drive_file_grey_a60_24dp" id="0x7f0802d3" />
+    <public type="drawable" name="ic_insert_drive_file_white_a60_24dp" id="0x7f0802d4" />
+    <public type="drawable" name="ic_insert_emoticon_24dp" id="0x7f0802d5" />
+    <public type="drawable" name="ic_instagram_white_18dp" id="0x7f0802d6" />
+    <public type="drawable" name="ic_integrations_dark_a60_24dp" id="0x7f0802d7" />
+    <public type="drawable" name="ic_integrations_light_a60_24dp" id="0x7f0802d8" />
+    <public type="drawable" name="ic_invites_dark_a60_24dp" id="0x7f0802d9" />
+    <public type="drawable" name="ic_invites_light_a60_24dp" id="0x7f0802da" />
+    <public type="drawable" name="ic_keyboard_24dp" id="0x7f0802db" />
+    <public type="drawable" name="ic_launch_24dp" id="0x7f0802dc" />
+    <public type="drawable" name="ic_link_dark_a60_24dp" id="0x7f0802dd" />
+    <public type="drawable" name="ic_link_light_a60_24dp" id="0x7f0802de" />
+    <public type="drawable" name="ic_link_white_24dp" id="0x7f0802df" />
+    <public type="drawable" name="ic_live_stream_white_24dp" id="0x7f0802e0" />
+    <public type="drawable" name="ic_locale_dark_a60_24dp" id="0x7f0802e1" />
+    <public type="drawable" name="ic_locale_light_a60_24dp" id="0x7f0802e2" />
+    <public type="drawable" name="ic_lock_dark_a60_24dp" id="0x7f0802e3" />
+    <public type="drawable" name="ic_lock_light_a60_24dp" id="0x7f0802e4" />
+    <public type="drawable" name="ic_lock_white_a60_16dp" id="0x7f0802e5" />
+    <public type="drawable" name="ic_lol_white_24dp" id="0x7f0802e6" />
+    <public type="drawable" name="ic_member_list_boosted_badge_24dp" id="0x7f0802e7" />
+    <public type="drawable" name="ic_members_dark_a60_24dp" id="0x7f0802e8" />
+    <public type="drawable" name="ic_members_dark_grey_24dp" id="0x7f0802e9" />
+    <public type="drawable" name="ic_members_grey_24dp" id="0x7f0802ea" />
+    <public type="drawable" name="ic_members_light_a60_24dp" id="0x7f0802eb" />
+    <public type="drawable" name="ic_members_white_24dp" id="0x7f0802ec" />
+    <public type="drawable" name="ic_mentions_grey_24dp" id="0x7f0802ed" />
+    <public type="drawable" name="ic_mentions_white_24dp" id="0x7f0802ee" />
+    <public type="drawable" name="ic_mentions_white_a60_24dp" id="0x7f0802ef" />
+    <public type="drawable" name="ic_menu_private_grey_a60_24dp" id="0x7f0802f0" />
+    <public type="drawable" name="ic_menu_private_white_a60_24dp" id="0x7f0802f1" />
+    <public type="drawable" name="ic_message_white_18dp" id="0x7f0802f2" />
+    <public type="drawable" name="ic_mic_grey_24dp" id="0x7f0802f3" />
+    <public type="drawable" name="ic_mic_grey_a30_24dp" id="0x7f0802f4" />
+    <public type="drawable" name="ic_mic_muted_grey_24dp" id="0x7f0802f5" />
+    <public type="drawable" name="ic_mic_muted_grey_red_24dp" id="0x7f0802f6" />
+    <public type="drawable" name="ic_mic_muted_red_24dp" id="0x7f0802f7" />
+    <public type="drawable" name="ic_mic_muted_white_24dp" id="0x7f0802f8" />
+    <public type="drawable" name="ic_mic_muted_white_red_24dp" id="0x7f0802f9" />
+    <public type="drawable" name="ic_mic_red_24dp" id="0x7f0802fa" />
+    <public type="drawable" name="ic_mic_white_18dp" id="0x7f0802fb" />
+    <public type="drawable" name="ic_mic_white_18dp_muted" id="0x7f0802fc" />
+    <public type="drawable" name="ic_mic_white_24dp" id="0x7f0802fd" />
+    <public type="drawable" name="ic_mic_white_a30_24dp" id="0x7f0802fe" />
+    <public type="drawable" name="ic_movie_24dp" id="0x7f0802ff" />
+    <public type="drawable" name="ic_my_account_dark_a60_24dp" id="0x7f080305" />
+    <public type="drawable" name="ic_my_account_light_a60_24dp" id="0x7f080306" />
+    <public type="drawable" name="ic_nitro_badge_nitro_gradient_16dp" id="0x7f080307" />
+    <public type="drawable" name="ic_nitro_badge_white" id="0x7f080308" />
+    <public type="drawable" name="ic_nitro_gifs_24dp" id="0x7f080309" />
+    <public type="drawable" name="ic_nitro_globalemojis_24dp" id="0x7f08030a" />
+    <public type="drawable" name="ic_nitro_highquality_24dp" id="0x7f08030b" />
+    <public type="drawable" name="ic_nitro_perk_stream_24dp" id="0x7f08030c" />
+    <public type="drawable" name="ic_nitro_rep" id="0x7f08030d" />
+    <public type="drawable" name="ic_nitro_rep_24dp" id="0x7f08030e" />
+    <public type="drawable" name="ic_nitro_tag_24dp" id="0x7f08030f" />
+    <public type="drawable" name="ic_no_stream" id="0x7f080310" />
+    <public type="drawable" name="ic_notifications_grey_a60_24dp" id="0x7f080315" />
+    <public type="drawable" name="ic_notifications_off_grey_a60_24dp" id="0x7f080316" />
+    <public type="drawable" name="ic_notifications_off_white_a60_24dp" id="0x7f080317" />
+    <public type="drawable" name="ic_notifications_settings_grey_a60_24dp" id="0x7f080318" />
+    <public type="drawable" name="ic_notifications_settings_white_a60_24dp" id="0x7f080319" />
+    <public type="drawable" name="ic_notifications_white_a60_24dp" id="0x7f08031a" />
+    <public type="drawable" name="ic_open_in_browser_grey_24dp" id="0x7f08031b" />
+    <public type="drawable" name="ic_open_in_browser_white_24dp" id="0x7f08031c" />
+    <public type="drawable" name="ic_open_in_new_grey_24dp" id="0x7f08031d" />
+    <public type="drawable" name="ic_open_in_new_grey_a60_24dp" id="0x7f08031e" />
+    <public type="drawable" name="ic_open_in_new_white_24dp" id="0x7f08031f" />
+    <public type="drawable" name="ic_open_in_new_white_a60_24dp" id="0x7f080320" />
+    <public type="drawable" name="ic_overlay_grey_24dp" id="0x7f080322" />
+    <public type="drawable" name="ic_overlay_white_24dp" id="0x7f080323" />
+    <public type="drawable" name="ic_overview_dark_a60_24dp" id="0x7f080324" />
+    <public type="drawable" name="ic_overview_light_a60_24dp" id="0x7f080325" />
+    <public type="drawable" name="ic_partnered_badge" id="0x7f080326" />
+    <public type="drawable" name="ic_partnered_badge_banner" id="0x7f080327" />
+    <public type="drawable" name="ic_people_grey_24dp" id="0x7f080328" />
+    <public type="drawable" name="ic_people_white_24dp" id="0x7f080329" />
+    <public type="drawable" name="ic_perk_lock" id="0x7f08032a" />
+    <public type="drawable" name="ic_perk_tier_1_boosted" id="0x7f08032b" />
+    <public type="drawable" name="ic_perk_tier_1_unboosted" id="0x7f08032c" />
+    <public type="drawable" name="ic_perk_tier_2_boosted" id="0x7f08032d" />
+    <public type="drawable" name="ic_perk_tier_2_unboosted" id="0x7f08032e" />
+    <public type="drawable" name="ic_perk_tier_3_boosted" id="0x7f08032f" />
+    <public type="drawable" name="ic_perk_tier_3_unboosted" id="0x7f080330" />
+    <public type="drawable" name="ic_person_add_grey_a60_24dp" id="0x7f080331" />
+    <public type="drawable" name="ic_person_add_new_primary_500_24dp" id="0x7f080332" />
+    <public type="drawable" name="ic_person_add_new_white_24dp" id="0x7f080333" />
+    <public type="drawable" name="ic_person_add_white_24dp" id="0x7f080334" />
+    <public type="drawable" name="ic_person_add_white_a60_24dp" id="0x7f080335" />
+    <public type="drawable" name="ic_person_grey_a60_24dp" id="0x7f080336" />
+    <public type="drawable" name="ic_person_white_a60_24dp" id="0x7f080337" />
+    <public type="drawable" name="ic_phonelink_grey_a60_24dp" id="0x7f080338" />
+    <public type="drawable" name="ic_phonelink_white_a60_24dp" id="0x7f080339" />
+    <public type="drawable" name="ic_photo_grey_24dp" id="0x7f08033a" />
+    <public type="drawable" name="ic_photo_white_24dp" id="0x7f08033b" />
+    <public type="drawable" name="ic_pins_dark_a60_24dp" id="0x7f08033c" />
+    <public type="drawable" name="ic_pins_light_a60_24dp" id="0x7f08033d" />
+    <public type="drawable" name="ic_play_arrow_grey_24dp" id="0x7f08033e" />
+    <public type="drawable" name="ic_play_arrow_white_24dp" id="0x7f08033f" />
+    <public type="drawable" name="ic_play_circle_outline_grey_24dp" id="0x7f080340" />
+    <public type="drawable" name="ic_play_circle_outline_white_24dp" id="0x7f080341" />
+    <public type="drawable" name="ic_plus_dark_a60_24dp" id="0x7f080342" />
+    <public type="drawable" name="ic_plus_light_a60_24dp" id="0x7f080343" />
+    <public type="drawable" name="ic_popup_settings_grey_a60_24dp" id="0x7f080344" />
+    <public type="drawable" name="ic_popup_settings_white_a60_24dp" id="0x7f080345" />
+    <public type="drawable" name="ic_privacy_dark_a60_24dp" id="0x7f080346" />
+    <public type="drawable" name="ic_privacy_light_a60_24dp" id="0x7f080347" />
+    <public type="drawable" name="ic_profile_badge_bughunter_32dp" id="0x7f080348" />
+    <public type="drawable" name="ic_profile_badge_hypesquad_32dp" id="0x7f080349" />
+    <public type="drawable" name="ic_profile_badge_nitro_32dp" id="0x7f08034a" />
+    <public type="drawable" name="ic_profile_badge_partner_32dp" id="0x7f08034b" />
+    <public type="drawable" name="ic_profile_badge_premium_early_supporter_32dp" id="0x7f08034c" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl1_32dp" id="0x7f08034d" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl2_32dp" id="0x7f08034e" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl3_32dp" id="0x7f08034f" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl4_32dp" id="0x7f080350" />
+    <public type="drawable" name="ic_profile_badge_staff_32dp" id="0x7f080351" />
+    <public type="drawable" name="ic_reactions_grey_a60_24dp" id="0x7f080352" />
+    <public type="drawable" name="ic_reactions_white_a60_24dp" id="0x7f080353" />
+    <public type="drawable" name="ic_reddit_white_24dp" id="0x7f080354" />
+    <public type="drawable" name="ic_refresh_grey_a60_24dp" id="0x7f080355" />
+    <public type="drawable" name="ic_refresh_white_a60_24dp" id="0x7f080356" />
+    <public type="drawable" name="ic_remove_circle_outline_red_24dp" id="0x7f080357" />
+    <public type="drawable" name="ic_remove_friend_red_24dp" id="0x7f080358" />
+    <public type="drawable" name="ic_rich_presence_grey_16dp" id="0x7f080359" />
+    <public type="drawable" name="ic_role_24dp" id="0x7f08035a" />
+    <public type="drawable" name="ic_roles_dark_a60_24dp" id="0x7f08035c" />
+    <public type="drawable" name="ic_roles_light_a60_24dp" id="0x7f08035d" />
+    <public type="drawable" name="ic_search_grey_24dp" id="0x7f08035f" />
+    <public type="drawable" name="ic_search_items_white_a60_24dp" id="0x7f080360" />
+    <public type="drawable" name="ic_search_white_24dp" id="0x7f080361" />
+    <public type="drawable" name="ic_security_dark_a60_24dp" id="0x7f080362" />
+    <public type="drawable" name="ic_security_light_a60_24dp" id="0x7f080363" />
+    <public type="drawable" name="ic_send_24dp" id="0x7f080364" />
+    <public type="drawable" name="ic_send_grey_a60_24dp" id="0x7f080365" />
+    <public type="drawable" name="ic_send_white_a60_24dp" id="0x7f080367" />
+    <public type="drawable" name="ic_settings_boost_dark_a60_24dp" id="0x7f080368" />
+    <public type="drawable" name="ic_settings_boost_light_a60_24dp" id="0x7f080369" />
+    <public type="drawable" name="ic_settings_grey_a60_24dp" id="0x7f08036a" />
+    <public type="drawable" name="ic_settings_white_a60_24dp" id="0x7f08036b" />
+    <public type="drawable" name="ic_share_grey_24dp" id="0x7f08036c" />
+    <public type="drawable" name="ic_share_grey_a60_24dp" id="0x7f08036d" />
+    <public type="drawable" name="ic_share_white_24dp" id="0x7f08036e" />
+    <public type="drawable" name="ic_share_white_a60_24dp" id="0x7f08036f" />
+    <public type="drawable" name="ic_skype_white_24dp" id="0x7f080371" />
+    <public type="drawable" name="ic_small_lock_green_24dp" id="0x7f080372" />
+    <public type="drawable" name="ic_smile_24dp" id="0x7f080373" />
+    <public type="drawable" name="ic_sort_grey_24dp" id="0x7f080374" />
+    <public type="drawable" name="ic_sort_white_24dp" id="0x7f080375" />
+    <public type="drawable" name="ic_spotify_white_24dp" id="0x7f080378" />
+    <public type="drawable" name="ic_star_24dp" id="0x7f080379" />
+    <public type="drawable" name="ic_status_dnd_16dp" id="0x7f08037a" />
+    <public type="drawable" name="ic_status_idle_16dp" id="0x7f08037b" />
+    <public type="drawable" name="ic_status_streaming_16dp" id="0x7f08037e" />
+    <public type="drawable" name="ic_steam" id="0x7f08037f" />
+    <public type="drawable" name="ic_steam_white_24dp" id="0x7f080380" />
+    <public type="drawable" name="ic_stop_stream_v2" id="0x7f080381" />
+    <public type="drawable" name="ic_swap_vertical_circle_grey_a60_24dp" id="0x7f080382" />
+    <public type="drawable" name="ic_swap_vertical_circle_white_a60_24dp" id="0x7f080383" />
+    <public type="drawable" name="ic_switch_camera_grey_24dp" id="0x7f080384" />
+    <public type="drawable" name="ic_switch_camera_white_24dp" id="0x7f080385" />
+    <public type="drawable" name="ic_text_channel_grey_24dp" id="0x7f08038e" />
+    <public type="drawable" name="ic_text_channel_white_24dp" id="0x7f08038f" />
+    <public type="drawable" name="ic_text_image_dark_a60_24dp" id="0x7f080390" />
+    <public type="drawable" name="ic_text_image_light_a60_24dp" id="0x7f080391" />
+    <public type="drawable" name="ic_theme_dark_a60_24dp" id="0x7f080392" />
+    <public type="drawable" name="ic_theme_light_a60_24dp" id="0x7f080393" />
+    <public type="drawable" name="ic_timer_dark" id="0x7f080394" />
+    <public type="drawable" name="ic_timer_grey_a60_24dp" id="0x7f080395" />
+    <public type="drawable" name="ic_timer_light" id="0x7f080396" />
+    <public type="drawable" name="ic_timer_white_a60_24dp" id="0x7f080397" />
+    <public type="drawable" name="ic_transfer_red_24dp" id="0x7f080398" />
+    <public type="drawable" name="ic_twitch_white_24dp" id="0x7f08039a" />
+    <public type="drawable" name="ic_twitter_white_18dp" id="0x7f08039b" />
+    <public type="drawable" name="ic_twitter_white_24dp" id="0x7f08039c" />
+    <public type="drawable" name="ic_unban_grey" id="0x7f08039e" />
+    <public type="drawable" name="ic_unread_white_9dp" id="0x7f08039f" />
+    <public type="drawable" name="ic_unread_white_9dp_horiz" id="0x7f0803a0" />
+    <public type="drawable" name="ic_upload_24dp" id="0x7f0803a1" />
+    <public type="drawable" name="ic_upload_image_34dp" id="0x7f0803a2" />
+    <public type="drawable" name="ic_upload_image_40dp" id="0x7f0803a3" />
+    <public type="drawable" name="ic_uploads_file_dark" id="0x7f0803a4" />
+    <public type="drawable" name="ic_uploads_file_light" id="0x7f0803a5" />
+    <public type="drawable" name="ic_uploads_generic_dark" id="0x7f0803a6" />
+    <public type="drawable" name="ic_uploads_generic_light" id="0x7f0803a7" />
+    <public type="drawable" name="ic_uploads_image_dark" id="0x7f0803a8" />
+    <public type="drawable" name="ic_uploads_image_light" id="0x7f0803a9" />
+    <public type="drawable" name="ic_uploads_video_dark" id="0x7f0803aa" />
+    <public type="drawable" name="ic_uploads_video_light" id="0x7f0803ab" />
+    <public type="drawable" name="ic_user_premium_guild_subscription" id="0x7f0803ac" />
+    <public type="drawable" name="ic_user_profile_action_add_friend" id="0x7f0803ad" />
+    <public type="drawable" name="ic_user_profile_action_call" id="0x7f0803ae" />
+    <public type="drawable" name="ic_user_profile_action_message" id="0x7f0803af" />
+    <public type="drawable" name="ic_user_profile_action_pending" id="0x7f0803b0" />
+    <public type="drawable" name="ic_user_profile_action_video" id="0x7f0803b1" />
+    <public type="drawable" name="ic_verified_badge" id="0x7f0803b2" />
+    <public type="drawable" name="ic_verified_badge_banner" id="0x7f0803b3" />
+    <public type="drawable" name="ic_videocam_dark_grey_24dp" id="0x7f0803b4" />
+    <public type="drawable" name="ic_videocam_grey_24dp" id="0x7f0803b5" />
+    <public type="drawable" name="ic_videocam_off_grey_24dp" id="0x7f0803b6" />
+    <public type="drawable" name="ic_videocam_off_white_24dp" id="0x7f0803b7" />
+    <public type="drawable" name="ic_videocam_white_24dp" id="0x7f0803b8" />
+    <public type="drawable" name="ic_visibility_grey_24dp" id="0x7f0803b9" />
+    <public type="drawable" name="ic_visibility_off_grey_a60_24dp" id="0x7f0803ba" />
+    <public type="drawable" name="ic_visibility_off_white_a60_24dp" id="0x7f0803bb" />
+    <public type="drawable" name="ic_visibility_white_24dp" id="0x7f0803bc" />
+    <public type="drawable" name="ic_voice_channel_streaming" id="0x7f0803bd" />
+    <public type="drawable" name="ic_voice_quality_average" id="0x7f0803be" />
+    <public type="drawable" name="ic_voice_quality_bad" id="0x7f0803bf" />
+    <public type="drawable" name="ic_voice_quality_fine" id="0x7f0803c0" />
+    <public type="drawable" name="ic_voice_quality_unknown" id="0x7f0803c1" />
+    <public type="drawable" name="ic_voice_settings_dark_a60_24dp" id="0x7f0803c2" />
+    <public type="drawable" name="ic_voice_settings_light_a60_24dp" id="0x7f0803c3" />
+    <public type="drawable" name="ic_volume_up_dark_grey_24dp" id="0x7f0803c4" />
+    <public type="drawable" name="ic_volume_up_dark_grey_a30_24dp" id="0x7f0803c5" />
+    <public type="drawable" name="ic_volume_up_grey_24dp" id="0x7f0803c6" />
+    <public type="drawable" name="ic_volume_up_light_grey_24dp" id="0x7f0803c7" />
+    <public type="drawable" name="ic_volume_up_white_24dp" id="0x7f0803c8" />
+    <public type="drawable" name="ic_volume_up_white_a30_24dp" id="0x7f0803c9" />
+    <public type="drawable" name="ic_warning_icon_24dp" id="0x7f0803ca" />
+    <public type="drawable" name="ic_xbox_white_24dp" id="0x7f0803cb" />
+    <public type="drawable" name="ic_youtube_gaming_white_24dp" id="0x7f0803cc" />
+    <public type="drawable" name="img_addfriends_empty_dark" id="0x7f0803f7" />
+    <public type="drawable" name="img_addfriends_empty_light" id="0x7f0803f8" />
+    <public type="drawable" name="img_addfriends_notconnected_dark" id="0x7f0803f9" />
+    <public type="drawable" name="img_addfriends_notconnected_light" id="0x7f0803fa" />
+    <public type="drawable" name="img_animated_emoji_upsell" id="0x7f0803fb" />
+    <public type="drawable" name="img_auth_logo_x_samsung" id="0x7f080403" />
+    <public type="drawable" name="img_avatar_upsell" id="0x7f080404" />
+    <public type="drawable" name="img_baddies_dark_theme" id="0x7f080405" />
+    <public type="drawable" name="img_baddies_light_theme" id="0x7f080406" />
+    <public type="drawable" name="img_badge_upsell" id="0x7f080407" />
+    <public type="drawable" name="img_discord_nitro_logo_left" id="0x7f080408" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_dark" id="0x7f080409" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_light" id="0x7f08040a" />
+    <public type="drawable" name="img_empty_friends_none_blocked_dark" id="0x7f08040b" />
+    <public type="drawable" name="img_empty_friends_none_blocked_light" id="0x7f08040c" />
+    <public type="drawable" name="img_empty_friends_none_dark" id="0x7f08040d" />
+    <public type="drawable" name="img_empty_friends_none_light" id="0x7f08040e" />
+    <public type="drawable" name="img_empty_friends_none_online_dark" id="0x7f08040f" />
+    <public type="drawable" name="img_empty_friends_none_online_light" id="0x7f080410" />
+    <public type="drawable" name="img_empty_friends_none_pending_dark" id="0x7f080411" />
+    <public type="drawable" name="img_empty_friends_none_pending_light" id="0x7f080412" />
+    <public type="drawable" name="img_empty_server_settings_emoji_dark" id="0x7f080414" />
+    <public type="drawable" name="img_empty_server_settings_emoji_light" id="0x7f080415" />
+    <public type="drawable" name="img_empty_server_settings_invites_dark" id="0x7f080416" />
+    <public type="drawable" name="img_empty_server_settings_invites_light" id="0x7f080417" />
+    <public type="drawable" name="img_forced_update_dark" id="0x7f080418" />
+    <public type="drawable" name="img_forced_update_light" id="0x7f080419" />
+    <public type="drawable" name="img_global_emoji_upsell" id="0x7f08041f" />
+    <public type="drawable" name="img_item_shop_dark" id="0x7f080420" />
+    <public type="drawable" name="img_logo_discord_nitro" id="0x7f080422" />
+    <public type="drawable" name="img_logo_discord_nitro_brand" id="0x7f080423" />
+    <public type="drawable" name="img_logo_discord_nitro_classic" id="0x7f080424" />
+    <public type="drawable" name="img_logo_nitro" id="0x7f080425" />
+    <public type="drawable" name="img_logo_nitro_classic" id="0x7f080426" />
+    <public type="drawable" name="img_logo_nitro_classic_brand" id="0x7f080427" />
+    <public type="drawable" name="img_logo_nitro_classic_header" id="0x7f080428" />
+    <public type="drawable" name="img_logo_square" id="0x7f080429" />
+    <public type="drawable" name="img_mfa_dark" id="0x7f08042a" />
+    <public type="drawable" name="img_mfa_light" id="0x7f08042b" />
+    <public type="drawable" name="img_new_tos_dark_theme" id="0x7f08042c" />
+    <public type="drawable" name="img_new_tos_light_theme" id="0x7f08042d" />
+    <public type="drawable" name="img_nitro_broken_wheel" id="0x7f08042e" />
+    <public type="drawable" name="img_nitro_pattern" id="0x7f080430" />
+    <public type="drawable" name="img_no_gifts" id="0x7f080433" />
+    <public type="drawable" name="img_no_mutual_friends_dark" id="0x7f080434" />
+    <public type="drawable" name="img_no_mutual_friends_light" id="0x7f080435" />
+    <public type="drawable" name="img_no_mutual_servers_dark" id="0x7f080436" />
+    <public type="drawable" name="img_no_mutual_servers_light" id="0x7f080437" />
+    <public type="drawable" name="img_no_stream_preview" id="0x7f080438" />
+    <public type="drawable" name="img_no_text_channels_dark" id="0x7f080439" />
+    <public type="drawable" name="img_no_text_channels_light" id="0x7f08043a" />
+    <public type="drawable" name="img_nsfw_dark_theme" id="0x7f08043b" />
+    <public type="drawable" name="img_nsfw_light_theme" id="0x7f08043c" />
+    <public type="drawable" name="img_plus_illo" id="0x7f08043f" />
+    <public type="drawable" name="img_poop_dark" id="0x7f080440" />
+    <public type="drawable" name="img_poop_light" id="0x7f080441" />
+    <public type="drawable" name="img_quick_switcher_empty" id="0x7f080442" />
+    <public type="drawable" name="img_server_nitro_status" id="0x7f080443" />
+    <public type="drawable" name="img_tag_upsell" id="0x7f080444" />
+    <public type="drawable" name="img_upload_upsell" id="0x7f080445" />
+    <public type="drawable" name="img_verify_email_dark_theme" id="0x7f080446" />
+    <public type="drawable" name="img_verify_email_light_theme" id="0x7f080447" />
+    <public type="drawable" name="img_verify_phone_dark_theme" id="0x7f080448" />
+    <public type="drawable" name="img_verify_phone_light_theme" id="0x7f080449" />
+    <public type="drawable" name="img_wumpus_ball_dark" id="0x7f08044d" />
+    <public type="drawable" name="img_wumpus_ball_light" id="0x7f08044e" />
+    <public type="drawable" name="img_wumpus_game_launcher" id="0x7f08044f" />
+    <public type="drawable" name="img_wumpus_jetpack" id="0x7f080450" />
+    <public type="drawable" name="img_wumpus_riding_wheel" id="0x7f080451" />
+    <public type="drawable" name="img_wumpus_tophat_dark" id="0x7f080452" />
+    <public type="drawable" name="img_wumpus_tophat_light" id="0x7f080453" />
+    <public type="drawable" name="ucrop_ic_angle" id="0x7f08046d" />
+    <public type="drawable" name="ucrop_ic_crop" id="0x7f08046e" />
+    <public type="drawable" name="ucrop_ic_cross" id="0x7f08046f" />
+    <public type="drawable" name="ucrop_ic_done" id="0x7f080470" />
+    <public type="drawable" name="ucrop_ic_next" id="0x7f080471" />
+    <public type="drawable" name="ucrop_ic_reset" id="0x7f080472" />
+    <public type="drawable" name="ucrop_ic_rotate" id="0x7f080473" />
+    <public type="drawable" name="ucrop_ic_scale" id="0x7f080474" />
+    <public type="drawable" name="abc_ab_share_pack_mtrl_alpha" id="0x7f080017" />
+    <public type="drawable" name="abc_btn_check_to_on_mtrl_000" id="0x7f08001b" />
+    <public type="drawable" name="abc_btn_check_to_on_mtrl_015" id="0x7f08001c" />
+    <public type="drawable" name="abc_btn_radio_to_on_mtrl_000" id="0x7f080020" />
+    <public type="drawable" name="abc_btn_radio_to_on_mtrl_015" id="0x7f080021" />
+    <public type="drawable" name="abc_btn_switch_to_on_mtrl_00001" id="0x7f080022" />
+    <public type="drawable" name="abc_btn_switch_to_on_mtrl_00012" id="0x7f080023" />
+    <public type="drawable" name="abc_cab_background_top_mtrl_alpha" id="0x7f080026" />
+    <public type="drawable" name="abc_ic_commit_search_api_mtrl_alpha" id="0x7f08002d" />
+    <public type="drawable" name="abc_ic_menu_copy_mtrl_am_alpha" id="0x7f08002f" />
+    <public type="drawable" name="abc_ic_menu_cut_mtrl_alpha" id="0x7f080030" />
+    <public type="drawable" name="abc_ic_menu_paste_mtrl_am_alpha" id="0x7f080032" />
+    <public type="drawable" name="abc_ic_menu_selectall_mtrl_alpha" id="0x7f080033" />
+    <public type="drawable" name="abc_ic_menu_share_mtrl_alpha" id="0x7f080034" />
+    <public type="drawable" name="abc_ic_star_black_16dp" id="0x7f080036" />
+    <public type="drawable" name="abc_ic_star_black_36dp" id="0x7f080037" />
+    <public type="drawable" name="abc_ic_star_black_48dp" id="0x7f080038" />
+    <public type="drawable" name="abc_ic_star_half_black_16dp" id="0x7f080039" />
+    <public type="drawable" name="abc_ic_star_half_black_36dp" id="0x7f08003a" />
+    <public type="drawable" name="abc_ic_star_half_black_48dp" id="0x7f08003b" />
+    <public type="drawable" name="abc_list_divider_mtrl_alpha" id="0x7f080040" />
+    <public type="drawable" name="abc_list_focused_holo" id="0x7f080041" />
+    <public type="drawable" name="abc_list_longpressed_holo" id="0x7f080042" />
+    <public type="drawable" name="abc_list_pressed_holo_dark" id="0x7f080043" />
+    <public type="drawable" name="abc_list_pressed_holo_light" id="0x7f080044" />
+    <public type="drawable" name="abc_list_selector_disabled_holo_dark" id="0x7f080047" />
+    <public type="drawable" name="abc_list_selector_disabled_holo_light" id="0x7f080048" />
+    <public type="drawable" name="abc_menu_hardkey_panel_mtrl_mult" id="0x7f08004b" />
+    <public type="drawable" name="abc_popup_background_mtrl_mult" id="0x7f08004c" />
+    <public type="drawable" name="abc_scrubber_control_off_mtrl_alpha" id="0x7f080050" />
+    <public type="drawable" name="abc_scrubber_control_to_pressed_mtrl_000" id="0x7f080051" />
+    <public type="drawable" name="abc_scrubber_control_to_pressed_mtrl_005" id="0x7f080052" />
+    <public type="drawable" name="abc_scrubber_primary_mtrl_alpha" id="0x7f080053" />
+    <public type="drawable" name="abc_scrubber_track_mtrl_alpha" id="0x7f080054" />
+    <public type="drawable" name="abc_spinner_mtrl_am_alpha" id="0x7f080058" />
+    <public type="drawable" name="abc_switch_track_mtrl_alpha" id="0x7f08005b" />
+    <public type="drawable" name="abc_tab_indicator_mtrl_alpha" id="0x7f08005d" />
+    <public type="drawable" name="abc_text_select_handle_left_mtrl_dark" id="0x7f08005f" />
+    <public type="drawable" name="abc_text_select_handle_left_mtrl_light" id="0x7f080060" />
+    <public type="drawable" name="abc_text_select_handle_middle_mtrl_dark" id="0x7f080061" />
+    <public type="drawable" name="abc_text_select_handle_middle_mtrl_light" id="0x7f080062" />
+    <public type="drawable" name="abc_text_select_handle_right_mtrl_dark" id="0x7f080063" />
+    <public type="drawable" name="abc_text_select_handle_right_mtrl_light" id="0x7f080064" />
+    <public type="drawable" name="abc_textfield_activated_mtrl_alpha" id="0x7f080065" />
+    <public type="drawable" name="abc_textfield_default_mtrl_alpha" id="0x7f080066" />
+    <public type="drawable" name="abc_textfield_search_activated_mtrl_alpha" id="0x7f080067" />
+    <public type="drawable" name="abc_textfield_search_default_mtrl_alpha" id="0x7f080068" />
+    <public type="drawable" name="common_google_signin_btn_icon_dark_normal_background" id="0x7f0800a6" />
+    <public type="drawable" name="common_google_signin_btn_icon_light_normal_background" id="0x7f0800ab" />
+    <public type="drawable" name="common_google_signin_btn_text_dark_normal_background" id="0x7f0800af" />
+    <public type="drawable" name="common_google_signin_btn_text_light_normal_background" id="0x7f0800b4" />
+    <public type="drawable" name="design_ic_visibility" id="0x7f0800b7" />
+    <public type="drawable" name="design_ic_visibility_off" id="0x7f0800b8" />
+    <public type="drawable" name="googleg_disabled_color_18" id="0x7f0801bb" />
+    <public type="drawable" name="googleg_standard_color_18" id="0x7f0801bc" />
+    <public type="drawable" name="ic_add_white_24dp" id="0x7f0801db" />
+    <public type="drawable" name="notification_bg_low_normal" id="0x7f08045a" />
+    <public type="drawable" name="notification_bg_low_pressed" id="0x7f08045b" />
+    <public type="drawable" name="notification_bg_normal" id="0x7f08045c" />
+    <public type="drawable" name="notification_bg_normal_pressed" id="0x7f08045d" />
+    <public type="drawable" name="notify_panel_notification_icon_bg" id="0x7f080462" />
+    <public type="drawable" name="asset_security" id="0x7f080088" />
+    <public type="drawable" name="common_full_open_on_phone" id="0x7f0800a2" />
+    <public type="drawable" name="ic_role_lock" id="0x7f08035b" />
+    <public type="drawable" name="img_wump_trash_dark" id="0x7f08044c" />
+    <public type="drawable" name="asset_broken_results_dark" id="0x7f08006e" />
+    <public type="drawable" name="asset_broken_results_light" id="0x7f08006f" />
+    <public type="drawable" name="asset_default_avatar_80dp" id="0x7f080072" />
+    <public type="drawable" name="asset_empty_no_bans" id="0x7f080077" />
+    <public type="drawable" name="asset_empty_no_invites" id="0x7f080078" />
+    <public type="drawable" name="asset_no_results_alt_dark" id="0x7f08007f" />
+    <public type="drawable" name="asset_no_results_alt_light" id="0x7f080080" />
+    <public type="drawable" name="asset_no_results_dark" id="0x7f080081" />
+    <public type="drawable" name="asset_no_results_light" id="0x7f080082" />
+    <public type="drawable" name="asset_sadbot" id="0x7f080085" />
+    <public type="drawable" name="emoji_activity_color" id="0x7f08019a" />
+    <public type="drawable" name="emoji_activity_dark" id="0x7f08019b" />
+    <public type="drawable" name="emoji_activity_light" id="0x7f08019c" />
+    <public type="drawable" name="emoji_custom_color" id="0x7f08019d" />
+    <public type="drawable" name="emoji_custom_dark" id="0x7f08019e" />
+    <public type="drawable" name="emoji_custom_light" id="0x7f08019f" />
+    <public type="drawable" name="emoji_flags_color" id="0x7f0801a0" />
+    <public type="drawable" name="emoji_flags_dark" id="0x7f0801a1" />
+    <public type="drawable" name="emoji_flags_light" id="0x7f0801a2" />
+    <public type="drawable" name="emoji_food_color" id="0x7f0801a3" />
+    <public type="drawable" name="emoji_food_dark" id="0x7f0801a4" />
+    <public type="drawable" name="emoji_food_light" id="0x7f0801a5" />
+    <public type="drawable" name="emoji_nature_color" id="0x7f0801a6" />
+    <public type="drawable" name="emoji_nature_dark" id="0x7f0801a7" />
+    <public type="drawable" name="emoji_nature_light" id="0x7f0801a8" />
+    <public type="drawable" name="emoji_object_color" id="0x7f0801a9" />
+    <public type="drawable" name="emoji_object_dark" id="0x7f0801aa" />
+    <public type="drawable" name="emoji_object_light" id="0x7f0801ab" />
+    <public type="drawable" name="emoji_people_color" id="0x7f0801ac" />
+    <public type="drawable" name="emoji_people_dark" id="0x7f0801ad" />
+    <public type="drawable" name="emoji_people_light" id="0x7f0801ae" />
+    <public type="drawable" name="emoji_recent_color" id="0x7f0801af" />
+    <public type="drawable" name="emoji_recent_dark" id="0x7f0801b0" />
+    <public type="drawable" name="emoji_recent_light" id="0x7f0801b1" />
+    <public type="drawable" name="emoji_symbol_color" id="0x7f0801b2" />
+    <public type="drawable" name="emoji_symbol_dark" id="0x7f0801b3" />
+    <public type="drawable" name="emoji_symbol_light" id="0x7f0801b4" />
+    <public type="drawable" name="emoji_travel_color" id="0x7f0801b5" />
+    <public type="drawable" name="emoji_travel_dark" id="0x7f0801b6" />
+    <public type="drawable" name="emoji_travel_light" id="0x7f0801b7" />
+    <public type="drawable" name="empty_pins_dark" id="0x7f0801b8" />
+    <public type="drawable" name="empty_pins_light" id="0x7f0801b9" />
+    <public type="drawable" name="ic_channel_pinned_message" id="0x7f08021e" />
+    <public type="drawable" name="ic_dropdown_white_18dp" id="0x7f08025b" />
+    <public type="drawable" name="ic_file_acrobat" id="0x7f08027e" />
+    <public type="drawable" name="ic_file_ae" id="0x7f08027f" />
+    <public type="drawable" name="ic_file_ai" id="0x7f080280" />
+    <public type="drawable" name="ic_file_archive" id="0x7f080281" />
+    <public type="drawable" name="ic_file_code" id="0x7f080282" />
+    <public type="drawable" name="ic_file_document" id="0x7f080283" />
+    <public type="drawable" name="ic_file_sketch" id="0x7f080289" />
+    <public type="drawable" name="ic_file_spreadsheet" id="0x7f08028a" />
+    <public type="drawable" name="ic_file_unknown" id="0x7f08028b" />
+    <public type="drawable" name="ic_file_video" id="0x7f08028d" />
+    <public type="drawable" name="ic_file_webcode" id="0x7f08028e" />
+    <public type="drawable" name="ic_group_edit" id="0x7f0802a1" />
+    <public type="drawable" name="ic_group_join" id="0x7f0802a2" />
+    <public type="drawable" name="ic_group_leave" id="0x7f0802a3" />
+    <public type="drawable" name="ic_img_selected_dark_theme" id="0x7f0802ce" />
+    <public type="drawable" name="ic_img_selected_light_theme" id="0x7f0802cf" />
+    <public type="drawable" name="ic_ternary_neutral_checked" id="0x7f080387" />
+    <public type="drawable" name="ic_ternary_neutral_unchecked" id="0x7f080388" />
+    <public type="drawable" name="ic_ternary_off_checked" id="0x7f080389" />
+    <public type="drawable" name="ic_ternary_off_disabled" id="0x7f08038a" />
+    <public type="drawable" name="ic_ternary_off_unchecked" id="0x7f08038b" />
+    <public type="drawable" name="ic_ternary_on_checked" id="0x7f08038c" />
+    <public type="drawable" name="ic_ternary_on_unchecked" id="0x7f08038d" />
+    <public type="drawable" name="img_empty_no_connections" id="0x7f080413" />
+    <public type="drawable" name="img_nitro_splash_dark" id="0x7f080431" />
+    <public type="drawable" name="img_nitro_splash_light" id="0x7f080432" />
+    <public type="drawable" name="img_permission_prime" id="0x7f08043e" />
+    <public type="drawable" name="img_voice_no_connections_dark" id="0x7f08044a" />
+    <public type="drawable" name="img_voice_no_connections_light" id="0x7f08044b" />
+    <public type="drawable" name="asset_account_sync_twitch" id="0x7f08006c" />
+    <public type="drawable" name="asset_account_sync_youtube" id="0x7f08006d" />
+    <public type="drawable" name="asset_default_avatar_32dp" id="0x7f080070" />
+    <public type="drawable" name="asset_default_avatar_64dp" id="0x7f080071" />
+    <public type="drawable" name="asset_group_full" id="0x7f08007a" />
+    <public type="drawable" name="asset_mfa_server" id="0x7f08007e" />
+    <public type="drawable" name="asset_search_empty_dark" id="0x7f080086" />
+    <public type="drawable" name="asset_search_empty_light" id="0x7f080087" />
+    <public type="drawable" name="drawable_default_invite_splash" id="0x7f080115" />
+    <public type="drawable" name="ic_add_server_46dp" id="0x7f0801da" />
+    <public type="drawable" name="ic_call_end_white_24dp" id="0x7f080213" />
+    <public type="drawable" name="ic_close_white_18dp" id="0x7f080247" />
+    <public type="drawable" name="ic_notification_24dp" id="0x7f080311" />
+    <public type="drawable" name="ic_notification_call_24dp" id="0x7f080312" />
+    <public type="drawable" name="ic_notification_friends_24dp" id="0x7f080313" />
+    <public type="drawable" name="ic_notification_message_24dp" id="0x7f080314" />
+    <public type="drawable" name="ic_search" id="0x7f08035e" />
+    <public type="drawable" name="ic_send_white_24dp" id="0x7f080366" />
+    <public type="drawable" name="ic_signal_cellular_connected_no_internet_4_bar_white_18dp" id="0x7f080370" />
+    <public type="drawable" name="ic_unavailable_server_46dp" id="0x7f08039d" />
+    <public type="drawable" name="icon_flag_au" id="0x7f0803cf" />
+    <public type="drawable" name="icon_flag_bg" id="0x7f0803d0" />
+    <public type="drawable" name="icon_flag_cs" id="0x7f0803d1" />
+    <public type="drawable" name="icon_flag_da" id="0x7f0803d2" />
+    <public type="drawable" name="icon_flag_de" id="0x7f0803d3" />
+    <public type="drawable" name="icon_flag_el" id="0x7f0803d4" />
+    <public type="drawable" name="icon_flag_en_gb" id="0x7f0803d5" />
+    <public type="drawable" name="icon_flag_en_us" id="0x7f0803d6" />
+    <public type="drawable" name="icon_flag_es_es" id="0x7f0803d7" />
+    <public type="drawable" name="icon_flag_eu" id="0x7f0803d8" />
+    <public type="drawable" name="icon_flag_fi" id="0x7f0803d9" />
+    <public type="drawable" name="icon_flag_fr" id="0x7f0803da" />
+    <public type="drawable" name="icon_flag_gb" id="0x7f0803db" />
+    <public type="drawable" name="icon_flag_hk" id="0x7f0803dc" />
+    <public type="drawable" name="icon_flag_hr" id="0x7f0803dd" />
+    <public type="drawable" name="icon_flag_hu" id="0x7f0803de" />
+    <public type="drawable" name="icon_flag_it" id="0x7f0803df" />
+    <public type="drawable" name="icon_flag_ja" id="0x7f0803e0" />
+    <public type="drawable" name="icon_flag_ko" id="0x7f0803e1" />
+    <public type="drawable" name="icon_flag_lt" id="0x7f0803e2" />
+    <public type="drawable" name="icon_flag_nl" id="0x7f0803e3" />
+    <public type="drawable" name="icon_flag_no" id="0x7f0803e4" />
+    <public type="drawable" name="icon_flag_pl" id="0x7f0803e5" />
+    <public type="drawable" name="icon_flag_pt_br" id="0x7f0803e6" />
+    <public type="drawable" name="icon_flag_ro" id="0x7f0803e7" />
+    <public type="drawable" name="icon_flag_ru" id="0x7f0803e8" />
+    <public type="drawable" name="icon_flag_sg" id="0x7f0803e9" />
+    <public type="drawable" name="icon_flag_sv_se" id="0x7f0803ea" />
+    <public type="drawable" name="icon_flag_th" id="0x7f0803eb" />
+    <public type="drawable" name="icon_flag_tr" id="0x7f0803ec" />
+    <public type="drawable" name="icon_flag_uk" id="0x7f0803ed" />
+    <public type="drawable" name="icon_flag_unknown" id="0x7f0803ee" />
+    <public type="drawable" name="icon_flag_vi" id="0x7f0803ef" />
+    <public type="drawable" name="icon_flag_zh_cn" id="0x7f0803f0" />
+    <public type="drawable" name="icon_flag_zh_tw" id="0x7f0803f1" />
+    <public type="drawable" name="img_auth_bg_dark" id="0x7f0803fe" />
+    <public type="drawable" name="img_auth_bg_light" id="0x7f0803ff" />
+    <public type="drawable" name="img_gifting_pattern_dark" id="0x7f08041d" />
+    <public type="drawable" name="img_gifting_pattern_light" id="0x7f08041e" />
+    <public type="drawable" name="img_loading_clyde" id="0x7f080421" />
+    <public type="drawable" name="asset_empty_mentions_arm_dark" id="0x7f080073" />
+    <public type="drawable" name="asset_empty_mentions_arm_light" id="0x7f080074" />
+    <public type="drawable" name="asset_empty_mentions_hand_dark" id="0x7f080075" />
+    <public type="drawable" name="asset_empty_mentions_hand_light" id="0x7f080076" />
+    <public type="drawable" name="asset_image_loading" id="0x7f08007b" />
+    <public type="drawable" name="asset_image_loading_spinner" id="0x7f08007c" />
+    <public type="drawable" name="asset_mascot_grey_left" id="0x7f08007d" />
+    <public type="drawable" name="asset_pattern_shapes_grey" id="0x7f080083" />
+    <public type="drawable" name="asset_pattern_shapes_white" id="0x7f080084" />
+    <public type="drawable" name="asset_tooltip_server_create" id="0x7f080089" />
+    <public type="drawable" name="ic_hypesquad_house1_winner_32dp" id="0x7f0802c7" />
+    <public type="drawable" name="ic_hypesquad_house2_winner_32dp" id="0x7f0802c9" />
+    <public type="drawable" name="ic_hypesquad_house3_winner_32dp" id="0x7f0802cb" />
+    <public type="drawable" name="ic_overflow_grey" id="0x7f080321" />
+    <public type="drawable" name="icon_carrot" id="0x7f0803cd" />
+    <public type="drawable" name="icon_deafened_small" id="0x7f0803ce" />
+    <public type="drawable" name="icon_friends_list" id="0x7f0803f2" />
+    <public type="drawable" name="icon_menu_copy" id="0x7f0803f3" />
+    <public type="drawable" name="icon_more" id="0x7f0803f4" />
+    <public type="drawable" name="icon_muted_small" id="0x7f0803f5" />
+    <public type="drawable" name="icon_save" id="0x7f0803f6" />
+    <public type="drawable" name="img_auth_bg_bl" id="0x7f0803fc" />
+    <public type="drawable" name="img_auth_bg_br" id="0x7f0803fd" />
+    <public type="drawable" name="img_auth_bg_tr" id="0x7f080400" />
+    <public type="drawable" name="img_auth_logo" id="0x7f080401" />
+    <public type="drawable" name="img_auth_logo_small" id="0x7f080402" />
+    <public type="drawable" name="img_game_presence_nux" id="0x7f08041a" />
+    <public type="drawable" name="img_overlay_nux" id="0x7f08043d" />
     <public type="drawable" name="$bg_nitro__0" id="0x7f080006" />
     <public type="drawable" name="$bg_nitro_caution__0" id="0x7f080007" />
     <public type="drawable" name="$bg_nitro_classic__0" id="0x7f080008" />
     <public type="drawable" name="$bg_nitro_error__0" id="0x7f080009" />
     <public type="drawable" name="$drawable_ic_nitro__0" id="0x7f08000a" />
     <public type="drawable" name="$drawable_ic_nitro_classic__0" id="0x7f08000b" />
-    <public type="drawable" name="$ic_boosted_guild_tier_1__0" id="0x7f08000c" />
-    <public type="drawable" name="$ic_boosted_guild_tier_2__0" id="0x7f08000d" />
-    <public type="drawable" name="$ic_boosted_guild_tier_3__0" id="0x7f08000e" />
-    <public type="drawable" name="$ic_nitro_badge_nitro_gradient_16dp__0" id="0x7f08000f" />
-    <public type="drawable" name="$ic_nitro_badge_nitro_gradient_16dp__1" id="0x7f080010" />
-    <public type="drawable" name="$img_nitro_pattern__0" id="0x7f080011" />
-    <public type="drawable" name="$img_nitro_pattern__1" id="0x7f080012" />
-    <public type="drawable" name="$img_nitro_pattern__2" id="0x7f080013" />
-    <public type="drawable" name="$img_nitro_pattern__3" id="0x7f080014" />
-    <public type="drawable" name="$img_nitro_pattern__4" id="0x7f080015" />
+    <public type="drawable" name="$drawable_stream_ended__0" id="0x7f08000c" />
+    <public type="drawable" name="$ic_boosted_guild_tier_1__0" id="0x7f08000d" />
+    <public type="drawable" name="$ic_boosted_guild_tier_2__0" id="0x7f08000e" />
+    <public type="drawable" name="$ic_boosted_guild_tier_3__0" id="0x7f08000f" />
+    <public type="drawable" name="$ic_nitro_badge_nitro_gradient_16dp__0" id="0x7f080010" />
+    <public type="drawable" name="$ic_nitro_badge_nitro_gradient_16dp__1" id="0x7f080011" />
+    <public type="drawable" name="$img_nitro_pattern__0" id="0x7f080012" />
+    <public type="drawable" name="$img_nitro_pattern__1" id="0x7f080013" />
+    <public type="drawable" name="$img_nitro_pattern__2" id="0x7f080014" />
+    <public type="drawable" name="$img_nitro_pattern__3" id="0x7f080015" />
+    <public type="drawable" name="$img_nitro_pattern__4" id="0x7f080016" />
     <public type="font" name="sourcecodepro_semibold" id="0x7f090000" />
     <public type="font" name="whitney_bold" id="0x7f090001" />
     <public type="font" name="whitney_medium" id="0x7f090002" />
@@ -3031,1978 +3070,2039 @@
     <public type="id" name="application_news_loading" id="0x7f0a007d" />
     <public type="id" name="application_news_splash" id="0x7f0a007e" />
     <public type="id" name="application_news_title" id="0x7f0a007f" />
-    <public type="id" name="async" id="0x7f0a0080" />
-    <public type="id" name="attachment_clear_btn" id="0x7f0a0081" />
-    <public type="id" name="attachment_preview_container" id="0x7f0a0082" />
-    <public type="id" name="attachment_preview_list" id="0x7f0a0083" />
-    <public type="id" name="audit_log_filter_avatar" id="0x7f0a0084" />
-    <public type="id" name="audit_log_filter_cs" id="0x7f0a0085" />
-    <public type="id" name="audit_log_filter_image" id="0x7f0a0086" />
-    <public type="id" name="audit_log_filter_image_action" id="0x7f0a0087" />
-    <public type="id" name="audit_log_filter_image_container" id="0x7f0a0088" />
-    <public type="id" name="audit_log_filter_image_target" id="0x7f0a0089" />
-    <public type="id" name="audit_log_filter_input" id="0x7f0a008a" />
-    <public type="id" name="audit_log_filter_recycler" id="0x7f0a008b" />
-    <public type="id" name="audit_log_filter_search" id="0x7f0a008c" />
-    <public type="id" name="audit_log_listitem_action_container" id="0x7f0a008d" />
-    <public type="id" name="audit_log_listitem_actiontype_image" id="0x7f0a008e" />
-    <public type="id" name="audit_log_listitem_arrow" id="0x7f0a008f" />
-    <public type="id" name="audit_log_listitem_avatar" id="0x7f0a0090" />
-    <public type="id" name="audit_log_listitem_change_text" id="0x7f0a0091" />
-    <public type="id" name="audit_log_listitem_date_text" id="0x7f0a0092" />
-    <public type="id" name="audit_log_listitem_header_text" id="0x7f0a0093" />
-    <public type="id" name="audit_log_listitem_targettype_image" id="0x7f0a0094" />
-    <public type="id" name="audit_log_listitem_top_container" id="0x7f0a0095" />
-    <public type="id" name="auth_button_container" id="0x7f0a0096" />
-    <public type="id" name="auth_captcha_help" id="0x7f0a0097" />
-    <public type="id" name="auth_captcha_verify" id="0x7f0a0098" />
-    <public type="id" name="auth_invite_info_content" id="0x7f0a0099" />
-    <public type="id" name="auth_invite_info_guild_avatar" id="0x7f0a009a" />
-    <public type="id" name="auth_invite_info_guild_name" id="0x7f0a009b" />
-    <public type="id" name="auth_invite_info_invited_text" id="0x7f0a009c" />
-    <public type="id" name="auth_landing_content" id="0x7f0a009d" />
-    <public type="id" name="auth_landing_invite_info" id="0x7f0a009e" />
-    <public type="id" name="auth_landing_login" id="0x7f0a009f" />
-    <public type="id" name="auth_landing_register" id="0x7f0a00a0" />
-    <public type="id" name="auth_login" id="0x7f0a00a1" />
-    <public type="id" name="auth_login_email" id="0x7f0a00a2" />
-    <public type="id" name="auth_login_email_wrap" id="0x7f0a00a3" />
-    <public type="id" name="auth_login_forgot_password" id="0x7f0a00a4" />
-    <public type="id" name="auth_login_password" id="0x7f0a00a5" />
-    <public type="id" name="auth_login_password_manager_link" id="0x7f0a00a6" />
-    <public type="id" name="auth_login_password_wrap" id="0x7f0a00a7" />
-    <public type="id" name="auth_mfa_verification" id="0x7f0a00a8" />
-    <public type="id" name="auth_policy_links" id="0x7f0a00a9" />
-    <public type="id" name="auth_register_button" id="0x7f0a00aa" />
-    <public type="id" name="auth_register_button_container" id="0x7f0a00ab" />
-    <public type="id" name="auth_register_email" id="0x7f0a00ac" />
-    <public type="id" name="auth_register_email_wrap" id="0x7f0a00ad" />
-    <public type="id" name="auth_register_password" id="0x7f0a00ae" />
-    <public type="id" name="auth_register_password_wrap" id="0x7f0a00af" />
-    <public type="id" name="auth_register_username" id="0x7f0a00b0" />
-    <public type="id" name="auth_register_username_wrap" id="0x7f0a00b1" />
-    <public type="id" name="auth_tos_opt_in" id="0x7f0a00b2" />
-    <public type="id" name="auth_undelete_body" id="0x7f0a00b3" />
-    <public type="id" name="auth_undelete_cancel" id="0x7f0a00b4" />
-    <public type="id" name="auth_undelete_delete" id="0x7f0a00b5" />
-    <public type="id" name="auth_undelete_title" id="0x7f0a00b6" />
-    <public type="id" name="authorized_apps_list" id="0x7f0a00b7" />
-    <public type="id" name="auto" id="0x7f0a00b8" />
-    <public type="id" name="automatic" id="0x7f0a00b9" />
-    <public type="id" name="back" id="0x7f0a00ba" />
-    <public type="id" name="ban_container" id="0x7f0a00bb" />
-    <public type="id" name="ban_list_item_avatar" id="0x7f0a00bc" />
-    <public type="id" name="ban_list_item_name" id="0x7f0a00bd" />
-    <public type="id" name="ban_user_body" id="0x7f0a00be" />
-    <public type="id" name="ban_user_button_container" id="0x7f0a00bf" />
-    <public type="id" name="ban_user_cancel" id="0x7f0a00c0" />
-    <public type="id" name="ban_user_confirm" id="0x7f0a00c1" />
-    <public type="id" name="ban_user_delete_messages_1_day" id="0x7f0a00c2" />
-    <public type="id" name="ban_user_delete_messages_7_days" id="0x7f0a00c3" />
-    <public type="id" name="ban_user_delete_messages_none" id="0x7f0a00c4" />
-    <public type="id" name="ban_user_reason" id="0x7f0a00c5" />
-    <public type="id" name="ban_user_title" id="0x7f0a00c6" />
-    <public type="id" name="barrier" id="0x7f0a00c7" />
-    <public type="id" name="baseline" id="0x7f0a00c8" />
-    <public type="id" name="beginning" id="0x7f0a00c9" />
-    <public type="id" name="bitrate_seekbar" id="0x7f0a00ca" />
-    <public type="id" name="blank_item_avatar_placeholder" id="0x7f0a00cb" />
-    <public type="id" name="blank_item_username_placeholder" id="0x7f0a00cc" />
-    <public type="id" name="blocking" id="0x7f0a00cd" />
-    <public type="id" name="boost_available_placeholder_bottom_text1" id="0x7f0a00ce" />
-    <public type="id" name="boost_available_placeholder_icon" id="0x7f0a00cf" />
-    <public type="id" name="boost_available_select" id="0x7f0a00d0" />
-    <public type="id" name="boost_bar_progress_bar" id="0x7f0a00d1" />
-    <public type="id" name="boost_bar_tier_0_container" id="0x7f0a00d2" />
-    <public type="id" name="boost_bar_tier_0_iv" id="0x7f0a00d3" />
-    <public type="id" name="boost_bar_tier_1_container" id="0x7f0a00d4" />
-    <public type="id" name="boost_bar_tier_1_iv" id="0x7f0a00d5" />
-    <public type="id" name="boost_bar_tier_1_tv" id="0x7f0a00d6" />
-    <public type="id" name="boost_bar_tier_2_container" id="0x7f0a00d7" />
-    <public type="id" name="boost_bar_tier_2_iv" id="0x7f0a00d8" />
-    <public type="id" name="boost_bar_tier_2_tv" id="0x7f0a00d9" />
-    <public type="id" name="boost_bar_tier_3_container" id="0x7f0a00da" />
-    <public type="id" name="boost_bar_tier_3_iv" id="0x7f0a00db" />
-    <public type="id" name="boost_bar_tier_3_tv" id="0x7f0a00dc" />
-    <public type="id" name="boost_confirmation_avatar" id="0x7f0a00dd" />
-    <public type="id" name="boost_confirmation_button_container" id="0x7f0a00de" />
-    <public type="id" name="boost_confirmation_cancel" id="0x7f0a00df" />
-    <public type="id" name="boost_confirmation_close" id="0x7f0a00e0" />
-    <public type="id" name="boost_confirmation_error" id="0x7f0a00e1" />
-    <public type="id" name="boost_confirmation_flipper" id="0x7f0a00e2" />
-    <public type="id" name="boost_confirmation_guild_name" id="0x7f0a00e3" />
-    <public type="id" name="boost_confirmation_level_info" id="0x7f0a00e4" />
-    <public type="id" name="boost_confirmation_lottie" id="0x7f0a00e5" />
-    <public type="id" name="boost_confirmation_select" id="0x7f0a00e6" />
-    <public type="id" name="boost_confirmation_warning" id="0x7f0a00e7" />
-    <public type="id" name="boost_info_container" id="0x7f0a00e8" />
-    <public type="id" name="boost_info_text" id="0x7f0a00e9" />
-    <public type="id" name="boost_remove_confirmation_avatar" id="0x7f0a00ea" />
-    <public type="id" name="boost_remove_confirmation_button_container" id="0x7f0a00eb" />
-    <public type="id" name="boost_remove_confirmation_cancel" id="0x7f0a00ec" />
-    <public type="id" name="boost_remove_confirmation_error" id="0x7f0a00ed" />
-    <public type="id" name="boost_remove_confirmation_guild_name" id="0x7f0a00ee" />
-    <public type="id" name="boost_remove_confirmation_level_info" id="0x7f0a00ef" />
-    <public type="id" name="boost_remove_confirmation_select" id="0x7f0a00f0" />
-    <public type="id" name="boost_status_button_boost" id="0x7f0a00f1" />
-    <public type="id" name="boost_status_button_container" id="0x7f0a00f2" />
-    <public type="id" name="boost_status_button_flipper" id="0x7f0a00f3" />
-    <public type="id" name="boost_status_button_info" id="0x7f0a00f4" />
-    <public type="id" name="boost_status_button_manage" id="0x7f0a00f5" />
-    <public type="id" name="boost_status_button_upgrade" id="0x7f0a00f6" />
-    <public type="id" name="boost_status_flipper" id="0x7f0a00f7" />
-    <public type="id" name="boost_status_info" id="0x7f0a00f8" />
-    <public type="id" name="boost_status_num_boosts" id="0x7f0a00f9" />
-    <public type="id" name="boost_status_retry" id="0x7f0a00fa" />
-    <public type="id" name="boost_status_viewpager" id="0x7f0a00fb" />
-    <public type="id" name="boosted_guild_banner" id="0x7f0a00fc" />
-    <public type="id" name="boosted_guild_gem_icon" id="0x7f0a00fd" />
-    <public type="id" name="boosted_guild_gradient" id="0x7f0a00fe" />
-    <public type="id" name="boosted_guild_icon" id="0x7f0a00ff" />
-    <public type="id" name="boosted_guild_level_text" id="0x7f0a0100" />
-    <public type="id" name="boosted_guild_name" id="0x7f0a0101" />
-    <public type="id" name="boosted_guild_progress" id="0x7f0a0102" />
-    <public type="id" name="boosted_guild_remove" id="0x7f0a0103" />
-    <public type="id" name="boosted_guild_time" id="0x7f0a0104" />
-    <public type="id" name="bottom" id="0x7f0a0105" />
-    <public type="id" name="bottom_sheet_tint" id="0x7f0a0106" />
-    <public type="id" name="browser_actions_header_text" id="0x7f0a0107" />
-    <public type="id" name="browser_actions_menu_item_icon" id="0x7f0a0108" />
-    <public type="id" name="browser_actions_menu_item_text" id="0x7f0a0109" />
-    <public type="id" name="browser_actions_menu_items" id="0x7f0a010a" />
-    <public type="id" name="browser_actions_menu_view" id="0x7f0a010b" />
-    <public type="id" name="buttonPanel" id="0x7f0a010c" />
-    <public type="id" name="button_boxed_text" id="0x7f0a010d" />
-    <public type="id" name="button_text" id="0x7f0a010e" />
-    <public type="id" name="call_controls" id="0x7f0a010f" />
-    <public type="id" name="call_user_item_avatar" id="0x7f0a0110" />
-    <public type="id" name="call_users_recycler" id="0x7f0a0111" />
-    <public type="id" name="camera_container" id="0x7f0a0112" />
-    <public type="id" name="camera_facing_btn" id="0x7f0a0113" />
-    <public type="id" name="camera_flash_btn" id="0x7f0a0114" />
-    <public type="id" name="camera_view" id="0x7f0a0115" />
-    <public type="id" name="camera_view_cropper" id="0x7f0a0116" />
-    <public type="id" name="cancel_action" id="0x7f0a0117" />
-    <public type="id" name="cancel_button" id="0x7f0a0118" />
-    <public type="id" name="cancel_premium_body_part_1" id="0x7f0a0119" />
-    <public type="id" name="cancel_premium_body_part_2" id="0x7f0a011a" />
-    <public type="id" name="cancel_premium_cancel" id="0x7f0a011b" />
-    <public type="id" name="cancel_premium_confirm" id="0x7f0a011c" />
-    <public type="id" name="cancel_premium_error" id="0x7f0a011d" />
-    <public type="id" name="cancel_premium_grandfathered" id="0x7f0a011e" />
-    <public type="id" name="cancel_premium_header" id="0x7f0a011f" />
-    <public type="id" name="category_override_name" id="0x7f0a0120" />
-    <public type="id" name="category_override_status" id="0x7f0a0121" />
-    <public type="id" name="category_overview_name" id="0x7f0a0122" />
-    <public type="id" name="center" id="0x7f0a0123" />
-    <public type="id" name="centerCrop" id="0x7f0a0124" />
-    <public type="id" name="centerInside" id="0x7f0a0125" />
-    <public type="id" name="center_horizontal" id="0x7f0a0126" />
-    <public type="id" name="center_vertical" id="0x7f0a0127" />
-    <public type="id" name="chains" id="0x7f0a0128" />
-    <public type="id" name="change_log_body" id="0x7f0a0129" />
-    <public type="id" name="change_log_facebook" id="0x7f0a012a" />
-    <public type="id" name="change_log_instagram" id="0x7f0a012b" />
-    <public type="id" name="change_log_thumbnail" id="0x7f0a012c" />
-    <public type="id" name="change_log_twitter" id="0x7f0a012d" />
-    <public type="id" name="change_log_video" id="0x7f0a012e" />
-    <public type="id" name="change_log_video_overlay" id="0x7f0a012f" />
-    <public type="id" name="change_password_current_password_input" id="0x7f0a0130" />
-    <public type="id" name="change_password_new_password_input" id="0x7f0a0131" />
-    <public type="id" name="change_password_save" id="0x7f0a0132" />
-    <public type="id" name="change_password_two_factor" id="0x7f0a0133" />
-    <public type="id" name="channel_list_item_private_presence_bg" id="0x7f0a0134" />
-    <public type="id" name="channel_members_list_item_avatar" id="0x7f0a0135" />
-    <public type="id" name="channel_members_list_item_boosted_indicator" id="0x7f0a0136" />
-    <public type="id" name="channel_members_list_item_bot" id="0x7f0a0137" />
-    <public type="id" name="channel_members_list_item_game" id="0x7f0a0138" />
-    <public type="id" name="channel_members_list_item_group_owner_indicator" id="0x7f0a0139" />
-    <public type="id" name="channel_members_list_item_header_placeholder" id="0x7f0a013a" />
-    <public type="id" name="channel_members_list_item_header_text" id="0x7f0a013b" />
-    <public type="id" name="channel_members_list_item_name" id="0x7f0a013c" />
-    <public type="id" name="channel_members_list_item_presence" id="0x7f0a013d" />
-    <public type="id" name="channel_members_list_item_rich_presence_iv" id="0x7f0a013e" />
-    <public type="id" name="channel_notification_settings_system" id="0x7f0a013f" />
-    <public type="id" name="channel_override_category_name" id="0x7f0a0140" />
-    <public type="id" name="channel_override_name" id="0x7f0a0141" />
-    <public type="id" name="channel_override_status" id="0x7f0a0142" />
-    <public type="id" name="channel_permission_general_create_instant_invite" id="0x7f0a0143" />
-    <public type="id" name="channel_permission_general_manage_channel" id="0x7f0a0144" />
-    <public type="id" name="channel_permission_general_manage_permissions" id="0x7f0a0145" />
-    <public type="id" name="channel_permission_general_manage_webhooks" id="0x7f0a0146" />
-    <public type="id" name="channel_permission_text_add_reactions" id="0x7f0a0147" />
-    <public type="id" name="channel_permission_text_attach_files" id="0x7f0a0148" />
-    <public type="id" name="channel_permission_text_embed_links" id="0x7f0a0149" />
-    <public type="id" name="channel_permission_text_manage_messages" id="0x7f0a014a" />
-    <public type="id" name="channel_permission_text_mention_everyone" id="0x7f0a014b" />
-    <public type="id" name="channel_permission_text_read_message_history" id="0x7f0a014c" />
-    <public type="id" name="channel_permission_text_read_messages" id="0x7f0a014d" />
-    <public type="id" name="channel_permission_text_send_messages" id="0x7f0a014e" />
-    <public type="id" name="channel_permission_text_send_tts_messages" id="0x7f0a014f" />
-    <public type="id" name="channel_permission_text_use_external_emojis" id="0x7f0a0150" />
-    <public type="id" name="channel_permission_voice_connect" id="0x7f0a0151" />
-    <public type="id" name="channel_permission_voice_deafen_members" id="0x7f0a0152" />
-    <public type="id" name="channel_permission_voice_move_members" id="0x7f0a0153" />
-    <public type="id" name="channel_permission_voice_mute_members" id="0x7f0a0154" />
-    <public type="id" name="channel_permission_voice_speak" id="0x7f0a0155" />
-    <public type="id" name="channel_permission_voice_use_vad" id="0x7f0a0156" />
-    <public type="id" name="channel_permissions_avatar" id="0x7f0a0157" />
-    <public type="id" name="channel_permissions_channel_name" id="0x7f0a0158" />
-    <public type="id" name="channel_permissions_save" id="0x7f0a0159" />
-    <public type="id" name="channel_permissions_target_name" id="0x7f0a015a" />
-    <public type="id" name="channel_permissions_text_container" id="0x7f0a015b" />
-    <public type="id" name="channel_permissions_voice_container" id="0x7f0a015c" />
-    <public type="id" name="channel_pinned_messages_recycler" id="0x7f0a015d" />
-    <public type="id" name="channel_selector_item_name" id="0x7f0a015e" />
-    <public type="id" name="channel_selector_list" id="0x7f0a015f" />
-    <public type="id" name="channel_settings_channel_name" id="0x7f0a0160" />
-    <public type="id" name="channel_settings_delete_body" id="0x7f0a0161" />
-    <public type="id" name="channel_settings_delete_cancel" id="0x7f0a0162" />
-    <public type="id" name="channel_settings_delete_confirm" id="0x7f0a0163" />
-    <public type="id" name="channel_settings_delete_title" id="0x7f0a0164" />
-    <public type="id" name="channel_settings_edit_name" id="0x7f0a0165" />
-    <public type="id" name="channel_settings_edit_topic" id="0x7f0a0166" />
-    <public type="id" name="channel_settings_edit_wrap" id="0x7f0a0167" />
-    <public type="id" name="channel_settings_notifications_frequency_0" id="0x7f0a0168" />
-    <public type="id" name="channel_settings_notifications_frequency_1" id="0x7f0a0169" />
-    <public type="id" name="channel_settings_notifications_frequency_2" id="0x7f0a016a" />
-    <public type="id" name="channel_settings_notifications_frequency_wrap" id="0x7f0a016b" />
-    <public type="id" name="channel_settings_notifications_mute_toggle" id="0x7f0a016c" />
-    <public type="id" name="channel_settings_nsfw" id="0x7f0a016d" />
-    <public type="id" name="channel_settings_permissions" id="0x7f0a016e" />
-    <public type="id" name="channel_settings_permissions_add_member_name_search" id="0x7f0a016f" />
-    <public type="id" name="channel_settings_permissions_add_member_recycler" id="0x7f0a0170" />
-    <public type="id" name="channel_settings_permissions_add_member_view_flipper" id="0x7f0a0171" />
-    <public type="id" name="channel_settings_permissions_add_role_recycler" id="0x7f0a0172" />
-    <public type="id" name="channel_settings_permissions_overview_add_member" id="0x7f0a0173" />
-    <public type="id" name="channel_settings_permissions_overview_add_role" id="0x7f0a0174" />
-    <public type="id" name="channel_settings_permissions_overview_members_container" id="0x7f0a0175" />
-    <public type="id" name="channel_settings_permissions_overview_roles_container" id="0x7f0a0176" />
-    <public type="id" name="channel_settings_pinned_messages" id="0x7f0a0177" />
-    <public type="id" name="channel_settings_pinned_messages_container" id="0x7f0a0178" />
-    <public type="id" name="channel_settings_pinned_messages_disabled_overlay" id="0x7f0a0179" />
-    <public type="id" name="channel_settings_save" id="0x7f0a017a" />
-    <public type="id" name="channel_settings_section_privacy_safety" id="0x7f0a017b" />
-    <public type="id" name="channel_settings_section_slow_mode" id="0x7f0a017c" />
-    <public type="id" name="channel_settings_section_user_management" id="0x7f0a017d" />
-    <public type="id" name="channel_settings_slow_mode_cooldown_label" id="0x7f0a017e" />
-    <public type="id" name="channel_settings_slow_mode_cooldown_slider" id="0x7f0a017f" />
-    <public type="id" name="channel_settings_slowmode_label" id="0x7f0a0180" />
-    <public type="id" name="channel_settings_topic_container" id="0x7f0a0181" />
-    <public type="id" name="channel_spinner_dropdown_item_textview" id="0x7f0a0182" />
-    <public type="id" name="channel_spinner_item_textview" id="0x7f0a0183" />
-    <public type="id" name="channel_topic" id="0x7f0a0184" />
-    <public type="id" name="channel_topic_title" id="0x7f0a0185" />
-    <public type="id" name="channels_item_category_add" id="0x7f0a0186" />
-    <public type="id" name="channels_item_category_arrow" id="0x7f0a0187" />
-    <public type="id" name="channels_item_category_name" id="0x7f0a0188" />
-    <public type="id" name="channels_item_channel_hash" id="0x7f0a0189" />
-    <public type="id" name="channels_item_channel_mentions" id="0x7f0a018a" />
-    <public type="id" name="channels_item_channel_name" id="0x7f0a018b" />
-    <public type="id" name="channels_item_channel_unread" id="0x7f0a018c" />
-    <public type="id" name="channels_item_voice_channel_name" id="0x7f0a018d" />
-    <public type="id" name="channels_item_voice_channel_speaker" id="0x7f0a018e" />
-    <public type="id" name="channels_item_voice_channel_user_count" id="0x7f0a018f" />
-    <public type="id" name="channels_item_voice_user_avatar" id="0x7f0a0190" />
-    <public type="id" name="channels_item_voice_user_headphones" id="0x7f0a0191" />
-    <public type="id" name="channels_item_voice_user_live" id="0x7f0a0192" />
-    <public type="id" name="channels_item_voice_user_microphone" id="0x7f0a0193" />
-    <public type="id" name="channels_item_voice_user_name" id="0x7f0a0194" />
-    <public type="id" name="channels_list" id="0x7f0a0195" />
-    <public type="id" name="channels_list_actions_change_nickname_cancel" id="0x7f0a0196" />
-    <public type="id" name="channels_list_actions_change_nickname_edit_text" id="0x7f0a0197" />
-    <public type="id" name="channels_list_actions_change_nickname_reset" id="0x7f0a0198" />
-    <public type="id" name="channels_list_actions_change_nickname_save" id="0x7f0a0199" />
-    <public type="id" name="channels_list_actions_leave_server_cancel" id="0x7f0a019a" />
-    <public type="id" name="channels_list_actions_leave_server_confirm" id="0x7f0a019b" />
-    <public type="id" name="channels_list_actions_leave_server_header" id="0x7f0a019c" />
-    <public type="id" name="channels_list_actions_leave_server_text" id="0x7f0a019d" />
-    <public type="id" name="channels_list_banner" id="0x7f0a019e" />
-    <public type="id" name="channels_list_header" id="0x7f0a019f" />
-    <public type="id" name="channels_list_item_friends_icon" id="0x7f0a01a0" />
-    <public type="id" name="channels_list_item_friends_mentions" id="0x7f0a01a1" />
-    <public type="id" name="channels_list_item_header" id="0x7f0a01a2" />
-    <public type="id" name="channels_list_item_invite" id="0x7f0a01a3" />
-    <public type="id" name="channels_list_item_invite_icon" id="0x7f0a01a4" />
-    <public type="id" name="channels_list_item_mfa_text" id="0x7f0a01a5" />
-    <public type="id" name="channels_list_item_private_avatar" id="0x7f0a01a6" />
-    <public type="id" name="channels_list_item_private_desc" id="0x7f0a01a7" />
-    <public type="id" name="channels_list_item_private_mentions" id="0x7f0a01a8" />
-    <public type="id" name="channels_list_item_private_name" id="0x7f0a01a9" />
-    <public type="id" name="channels_list_item_private_presence" id="0x7f0a01aa" />
-    <public type="id" name="channels_list_item_text_actions_channel_notifications" id="0x7f0a01ab" />
-    <public type="id" name="channels_list_item_text_actions_channel_settings" id="0x7f0a01ac" />
-    <public type="id" name="channels_list_item_text_actions_copy_id" id="0x7f0a01ad" />
-    <public type="id" name="channels_list_item_text_actions_developer_divider" id="0x7f0a01ae" />
-    <public type="id" name="channels_list_item_text_actions_icon" id="0x7f0a01af" />
-    <public type="id" name="channels_list_item_text_actions_invite" id="0x7f0a01b0" />
-    <public type="id" name="channels_list_item_text_actions_mark_as_read" id="0x7f0a01b1" />
-    <public type="id" name="channels_list_item_text_actions_mute" id="0x7f0a01b2" />
-    <public type="id" name="channels_list_item_text_actions_profile" id="0x7f0a01b3" />
-    <public type="id" name="channels_list_item_text_actions_title" id="0x7f0a01b4" />
-    <public type="id" name="channels_list_new" id="0x7f0a01b5" />
-    <public type="id" name="channels_list_search" id="0x7f0a01b6" />
-    <public type="id" name="channels_list_search_toolbar" id="0x7f0a01b7" />
-    <public type="id" name="channels_list_unreads" id="0x7f0a01b8" />
-    <public type="id" name="channels_list_unreads_background" id="0x7f0a01b9" />
-    <public type="id" name="channels_list_unreads_stub" id="0x7f0a01ba" />
-    <public type="id" name="channels_toolbar" id="0x7f0a01bb" />
-    <public type="id" name="chat_action_item_image" id="0x7f0a01bc" />
-    <public type="id" name="chat_action_item_subtext" id="0x7f0a01bd" />
-    <public type="id" name="chat_action_item_text" id="0x7f0a01be" />
-    <public type="id" name="chat_input_edit" id="0x7f0a01bf" />
-    <public type="id" name="chat_input_edit_border" id="0x7f0a01c0" />
-    <public type="id" name="chat_input_edit_cancel" id="0x7f0a01c1" />
-    <public type="id" name="chat_input_emoji_picker_recycler" id="0x7f0a01c2" />
-    <public type="id" name="chat_input_item_avatar" id="0x7f0a01c3" />
-    <public type="id" name="chat_input_item_emoji" id="0x7f0a01c4" />
-    <public type="id" name="chat_input_item_icon_container" id="0x7f0a01c5" />
-    <public type="id" name="chat_input_item_name" id="0x7f0a01c6" />
-    <public type="id" name="chat_input_item_name_right" id="0x7f0a01c7" />
-    <public type="id" name="chat_input_item_presence" id="0x7f0a01c8" />
-    <public type="id" name="chat_input_item_presence_canvas" id="0x7f0a01c9" />
-    <public type="id" name="chat_input_mentions_recycler" id="0x7f0a01ca" />
-    <public type="id" name="chat_input_upload_too_large_center_file" id="0x7f0a01cb" />
-    <public type="id" name="chat_input_upload_too_large_help" id="0x7f0a01cc" />
-    <public type="id" name="chat_input_verification" id="0x7f0a01cd" />
-    <public type="id" name="chat_input_verification_action" id="0x7f0a01ce" />
-    <public type="id" name="chat_input_verification_text" id="0x7f0a01cf" />
-    <public type="id" name="chat_input_widget" id="0x7f0a01d0" />
-    <public type="id" name="chat_input_wrap" id="0x7f0a01d1" />
-    <public type="id" name="chat_list_adapter_item_blocked" id="0x7f0a01d2" />
-    <public type="id" name="chat_list_adapter_item_failed" id="0x7f0a01d3" />
-    <public type="id" name="chat_list_adapter_item_start" id="0x7f0a01d4" />
-    <public type="id" name="chat_list_adapter_item_start_image" id="0x7f0a01d5" />
-    <public type="id" name="chat_list_adapter_item_system_icon" id="0x7f0a01d6" />
-    <public type="id" name="chat_list_adapter_item_system_text" id="0x7f0a01d7" />
-    <public type="id" name="chat_list_adapter_item_system_timestamp" id="0x7f0a01d8" />
-    <public type="id" name="chat_list_adapter_item_text" id="0x7f0a01d9" />
-    <public type="id" name="chat_list_adapter_item_text_avatar" id="0x7f0a01da" />
-    <public type="id" name="chat_list_adapter_item_text_bot" id="0x7f0a01db" />
-    <public type="id" name="chat_list_adapter_item_text_header" id="0x7f0a01dc" />
-    <public type="id" name="chat_list_adapter_item_text_name" id="0x7f0a01dd" />
-    <public type="id" name="chat_list_adapter_item_text_timestamp" id="0x7f0a01de" />
-    <public type="id" name="chat_list_empty_image" id="0x7f0a01df" />
-    <public type="id" name="chat_list_empty_pins_text" id="0x7f0a01e0" />
-    <public type="id" name="chat_list_item_attachment_barrier" id="0x7f0a01e1" />
-    <public type="id" name="chat_list_item_attachment_card" id="0x7f0a01e2" />
-    <public type="id" name="chat_list_item_attachment_description" id="0x7f0a01e3" />
-    <public type="id" name="chat_list_item_attachment_download" id="0x7f0a01e4" />
-    <public type="id" name="chat_list_item_attachment_icon" id="0x7f0a01e5" />
-    <public type="id" name="chat_list_item_attachment_image" id="0x7f0a01e6" />
-    <public type="id" name="chat_list_item_attachment_image_overlay" id="0x7f0a01e7" />
-    <public type="id" name="chat_list_item_attachment_name" id="0x7f0a01e8" />
-    <public type="id" name="chat_list_item_attachment_spoiler" id="0x7f0a01e9" />
-    <public type="id" name="chat_list_item_divider_stroke_left" id="0x7f0a01ea" />
-    <public type="id" name="chat_list_item_divider_stroke_right" id="0x7f0a01eb" />
-    <public type="id" name="chat_list_item_divider_text" id="0x7f0a01ec" />
-    <public type="id" name="chat_list_item_embed_author_icon" id="0x7f0a01ed" />
-    <public type="id" name="chat_list_item_embed_author_text" id="0x7f0a01ee" />
-    <public type="id" name="chat_list_item_embed_barrier_data" id="0x7f0a01ef" />
-    <public type="id" name="chat_list_item_embed_barrier_header" id="0x7f0a01f0" />
-    <public type="id" name="chat_list_item_embed_content" id="0x7f0a01f1" />
-    <public type="id" name="chat_list_item_embed_description" id="0x7f0a01f2" />
-    <public type="id" name="chat_list_item_embed_divider" id="0x7f0a01f3" />
-    <public type="id" name="chat_list_item_embed_field_name" id="0x7f0a01f4" />
-    <public type="id" name="chat_list_item_embed_field_value" id="0x7f0a01f5" />
-    <public type="id" name="chat_list_item_embed_fields" id="0x7f0a01f6" />
-    <public type="id" name="chat_list_item_embed_footer_icon" id="0x7f0a01f7" />
-    <public type="id" name="chat_list_item_embed_footer_text" id="0x7f0a01f8" />
-    <public type="id" name="chat_list_item_embed_image" id="0x7f0a01f9" />
-    <public type="id" name="chat_list_item_embed_image_icons" id="0x7f0a01fa" />
-    <public type="id" name="chat_list_item_embed_image_thumbnail" id="0x7f0a01fb" />
-    <public type="id" name="chat_list_item_embed_provider" id="0x7f0a01fc" />
-    <public type="id" name="chat_list_item_embed_spoiler" id="0x7f0a01fd" />
-    <public type="id" name="chat_list_item_embed_title" id="0x7f0a01fe" />
-    <public type="id" name="chat_list_item_mention_footer_divider" id="0x7f0a01ff" />
-    <public type="id" name="chat_list_item_mention_footer_hand" id="0x7f0a0200" />
-    <public type="id" name="chat_list_item_message_header_channel" id="0x7f0a0201" />
-    <public type="id" name="chat_list_item_message_header_divider" id="0x7f0a0202" />
-    <public type="id" name="chat_list_item_message_header_guild" id="0x7f0a0203" />
-    <public type="id" name="chat_list_item_message_header_spacer" id="0x7f0a0204" />
-    <public type="id" name="chat_list_item_reactions" id="0x7f0a0205" />
-    <public type="id" name="chat_list_recycler" id="0x7f0a0206" />
-    <public type="id" name="chat_list_search_empty_image" id="0x7f0a0207" />
-    <public type="id" name="chat_list_search_error_text" id="0x7f0a0208" />
-    <public type="id" name="chat_list_search_indexing_animation" id="0x7f0a0209" />
-    <public type="id" name="chat_list_search_indexing_text" id="0x7f0a020a" />
-    <public type="id" name="chat_list_tab_badged_count" id="0x7f0a020b" />
-    <public type="id" name="chat_list_tab_badged_text" id="0x7f0a020c" />
-    <public type="id" name="chat_typing_users_slowmode" id="0x7f0a020d" />
-    <public type="id" name="chat_typing_users_slowmode_icon" id="0x7f0a020e" />
-    <public type="id" name="chat_typing_users_typing" id="0x7f0a020f" />
-    <public type="id" name="check" id="0x7f0a0210" />
-    <public type="id" name="checkable_off_container" id="0x7f0a0211" />
-    <public type="id" name="checkbox" id="0x7f0a0212" />
-    <public type="id" name="checkboxes_container" id="0x7f0a0213" />
-    <public type="id" name="chip_image" id="0x7f0a0214" />
-    <public type="id" name="chip_text" id="0x7f0a0215" />
-    <public type="id" name="chronometer" id="0x7f0a0216" />
-    <public type="id" name="client_outdated_anchor_wrap" id="0x7f0a0217" />
-    <public type="id" name="client_outdated_update" id="0x7f0a0218" />
-    <public type="id" name="clip_horizontal" id="0x7f0a0219" />
-    <public type="id" name="clip_vertical" id="0x7f0a021a" />
-    <public type="id" name="close" id="0x7f0a021b" />
-    <public type="id" name="collapseActionView" id="0x7f0a021c" />
-    <public type="id" name="collapsing_toolbar" id="0x7f0a021d" />
-    <public type="id" name="color_picker_done" id="0x7f0a021e" />
-    <public type="id" name="color_picker_gridview" id="0x7f0a021f" />
-    <public type="id" name="color_picker_reset" id="0x7f0a0220" />
-    <public type="id" name="column" id="0x7f0a0221" />
-    <public type="id" name="column_reverse" id="0x7f0a0222" />
-    <public type="id" name="connected_account_disconnect" id="0x7f0a0223" />
-    <public type="id" name="connected_account_display_activity_switch" id="0x7f0a0224" />
-    <public type="id" name="connected_account_display_switch" id="0x7f0a0225" />
-    <public type="id" name="connected_account_divider" id="0x7f0a0226" />
-    <public type="id" name="connected_account_extra_info" id="0x7f0a0227" />
-    <public type="id" name="connected_account_img" id="0x7f0a0228" />
-    <public type="id" name="connected_account_link_img" id="0x7f0a0229" />
-    <public type="id" name="connected_account_name" id="0x7f0a022a" />
-    <public type="id" name="connected_account_sync_friends_switch" id="0x7f0a022b" />
-    <public type="id" name="connected_list_header" id="0x7f0a022c" />
-    <public type="id" name="connections_empty" id="0x7f0a022d" />
-    <public type="id" name="connections_recycler" id="0x7f0a022e" />
-    <public type="id" name="connections_xbox_digits" id="0x7f0a022f" />
-    <public type="id" name="connections_xbox_login" id="0x7f0a0230" />
-    <public type="id" name="container" id="0x7f0a0231" />
-    <public type="id" name="content" id="0x7f0a0232" />
-    <public type="id" name="contentPanel" id="0x7f0a0233" />
-    <public type="id" name="content_iv" id="0x7f0a0234" />
-    <public type="id" name="content_pager" id="0x7f0a0235" />
-    <public type="id" name="content_tabs" id="0x7f0a0236" />
-    <public type="id" name="coordinator" id="0x7f0a0237" />
-    <public type="id" name="create_channel_name" id="0x7f0a0238" />
-    <public type="id" name="create_channel_name_layout" id="0x7f0a0239" />
-    <public type="id" name="create_channel_private_container" id="0x7f0a023a" />
-    <public type="id" name="create_channel_private_info" id="0x7f0a023b" />
-    <public type="id" name="create_channel_private_switch" id="0x7f0a023c" />
-    <public type="id" name="create_channel_private_title" id="0x7f0a023d" />
-    <public type="id" name="create_channel_role_access_recycler" id="0x7f0a023e" />
-    <public type="id" name="create_channel_role_header" id="0x7f0a023f" />
-    <public type="id" name="create_channel_text_container" id="0x7f0a0240" />
-    <public type="id" name="create_channel_text_radio" id="0x7f0a0241" />
-    <public type="id" name="create_channel_type_container" id="0x7f0a0242" />
-    <public type="id" name="create_channel_voice_container" id="0x7f0a0243" />
-    <public type="id" name="create_channel_voice_radio" id="0x7f0a0244" />
-    <public type="id" name="current_bitrate_display" id="0x7f0a0245" />
-    <public type="id" name="current_user_limit_display" id="0x7f0a0246" />
-    <public type="id" name="custom" id="0x7f0a0247" />
-    <public type="id" name="customPanel" id="0x7f0a0248" />
-    <public type="id" name="dark" id="0x7f0a0249" />
-    <public type="id" name="debugging_item_log_message" id="0x7f0a024a" />
-    <public type="id" name="debugging_logs" id="0x7f0a024b" />
-    <public type="id" name="decor_content_parent" id="0x7f0a024c" />
-    <public type="id" name="default_activity_button" id="0x7f0a024d" />
-    <public type="id" name="design_bottom_sheet" id="0x7f0a024e" />
-    <public type="id" name="design_menu_item_action_area" id="0x7f0a024f" />
-    <public type="id" name="design_menu_item_action_area_stub" id="0x7f0a0250" />
-    <public type="id" name="design_menu_item_text" id="0x7f0a0251" />
-    <public type="id" name="design_navigation_view" id="0x7f0a0252" />
-    <public type="id" name="dialog_button" id="0x7f0a0253" />
-    <public type="id" name="dialog_cancel" id="0x7f0a0254" />
-    <public type="id" name="dialog_card" id="0x7f0a0255" />
-    <public type="id" name="dialog_chat_action_header" id="0x7f0a0256" />
-    <public type="id" name="dialog_chat_actions_add_reaction" id="0x7f0a0257" />
-    <public type="id" name="dialog_chat_actions_add_reaction_emojis_list" id="0x7f0a0258" />
-    <public type="id" name="dialog_chat_actions_avatar" id="0x7f0a0259" />
-    <public type="id" name="dialog_chat_actions_copy" id="0x7f0a025a" />
-    <public type="id" name="dialog_chat_actions_copy_id" id="0x7f0a025b" />
-    <public type="id" name="dialog_chat_actions_delete" id="0x7f0a025c" />
-    <public type="id" name="dialog_chat_actions_edit" id="0x7f0a025d" />
-    <public type="id" name="dialog_chat_actions_manage_reactions" id="0x7f0a025e" />
-    <public type="id" name="dialog_chat_actions_pin" id="0x7f0a025f" />
-    <public type="id" name="dialog_chat_actions_profile" id="0x7f0a0260" />
-    <public type="id" name="dialog_chat_actions_remove_all_reactions" id="0x7f0a0261" />
-    <public type="id" name="dialog_chat_actions_resend" id="0x7f0a0262" />
-    <public type="id" name="dialog_chat_actions_share" id="0x7f0a0263" />
-    <public type="id" name="dialog_chat_actions_subtitle" id="0x7f0a0264" />
-    <public type="id" name="dialog_chat_actions_title" id="0x7f0a0265" />
-    <public type="id" name="dialog_delete" id="0x7f0a0266" />
-    <public type="id" name="dialog_save" id="0x7f0a0267" />
-    <public type="id" name="dialog_selections" id="0x7f0a0268" />
-    <public type="id" name="dialog_title" id="0x7f0a0269" />
-    <public type="id" name="dialog_url_actions_copy" id="0x7f0a026a" />
-    <public type="id" name="dialog_url_actions_open" id="0x7f0a026b" />
-    <public type="id" name="dialog_url_actions_share" id="0x7f0a026c" />
-    <public type="id" name="dialog_url_actions_url" id="0x7f0a026d" />
-    <public type="id" name="dimensions" id="0x7f0a026e" />
-    <public type="id" name="dimmer_view" id="0x7f0a026f" />
-    <public type="id" name="direct" id="0x7f0a0270" />
-    <public type="id" name="disableHome" id="0x7f0a0271" />
-    <public type="id" name="disable_delete_body" id="0x7f0a0272" />
-    <public type="id" name="disable_delete_cancel" id="0x7f0a0273" />
-    <public type="id" name="disable_delete_code" id="0x7f0a0274" />
-    <public type="id" name="disable_delete_code_wrap" id="0x7f0a0275" />
-    <public type="id" name="disable_delete_confirm" id="0x7f0a0276" />
-    <public type="id" name="disable_delete_header" id="0x7f0a0277" />
-    <public type="id" name="disable_delete_password" id="0x7f0a0278" />
-    <public type="id" name="disable_delete_password_wrap" id="0x7f0a0279" />
-    <public type="id" name="disconnect_btn" id="0x7f0a027a" />
-    <public type="id" name="edit_account_discriminator" id="0x7f0a027b" />
-    <public type="id" name="edit_account_discriminator_wrap" id="0x7f0a027c" />
-    <public type="id" name="edit_account_email" id="0x7f0a027d" />
-    <public type="id" name="edit_account_email_wrap" id="0x7f0a027e" />
-    <public type="id" name="edit_account_password" id="0x7f0a027f" />
-    <public type="id" name="edit_account_password_wrap" id="0x7f0a0280" />
-    <public type="id" name="edit_account_tag_layout_container" id="0x7f0a0281" />
-    <public type="id" name="edit_account_username" id="0x7f0a0282" />
-    <public type="id" name="edit_account_username_wrap" id="0x7f0a0283" />
-    <public type="id" name="edit_integration_custom_emotes_container" id="0x7f0a0284" />
-    <public type="id" name="edit_integration_custom_emotes_toggle" id="0x7f0a0285" />
-    <public type="id" name="edit_integration_expire_radio_kick_user" id="0x7f0a0286" />
-    <public type="id" name="edit_integration_expire_radio_remove_role" id="0x7f0a0287" />
-    <public type="id" name="edit_integration_expired_sub_container" id="0x7f0a0288" />
-    <public type="id" name="edit_integration_grace_period_container" id="0x7f0a0289" />
-    <public type="id" name="edit_integration_grace_period_radio_14_days" id="0x7f0a028a" />
-    <public type="id" name="edit_integration_grace_period_radio_1_day" id="0x7f0a028b" />
-    <public type="id" name="edit_integration_grace_period_radio_30_days" id="0x7f0a028c" />
-    <public type="id" name="edit_integration_grace_period_radio_3_days" id="0x7f0a028d" />
-    <public type="id" name="edit_integration_grace_period_radio_7_days" id="0x7f0a028e" />
-    <public type="id" name="edit_integration_icon" id="0x7f0a028f" />
-    <public type="id" name="edit_integration_last_sync_time" id="0x7f0a0290" />
-    <public type="id" name="edit_integration_name" id="0x7f0a0291" />
-    <public type="id" name="edit_integration_name_container" id="0x7f0a0292" />
-    <public type="id" name="edit_integration_owner_name" id="0x7f0a0293" />
-    <public type="id" name="edit_integration_save" id="0x7f0a0294" />
-    <public type="id" name="edit_integration_settings_scroll" id="0x7f0a0295" />
-    <public type="id" name="edit_integration_subscriber_count" id="0x7f0a0296" />
-    <public type="id" name="edit_integration_sync_container" id="0x7f0a0297" />
-    <public type="id" name="edit_integration_synced_role" id="0x7f0a0298" />
-    <public type="id" name="edit_integration_synced_role_container" id="0x7f0a0299" />
-    <public type="id" name="edit_member_administrative_container" id="0x7f0a029a" />
-    <public type="id" name="edit_member_ban_button" id="0x7f0a029b" />
-    <public type="id" name="edit_member_kick_button" id="0x7f0a029c" />
-    <public type="id" name="edit_member_nickname" id="0x7f0a029d" />
-    <public type="id" name="edit_member_nickname_lock" id="0x7f0a029e" />
-    <public type="id" name="edit_member_roles_container" id="0x7f0a029f" />
-    <public type="id" name="edit_member_roles_recycler" id="0x7f0a02a0" />
-    <public type="id" name="edit_member_save" id="0x7f0a02a1" />
-    <public type="id" name="edit_member_transfer_ownership_button" id="0x7f0a02a2" />
-    <public type="id" name="edit_query" id="0x7f0a02a3" />
-    <public type="id" name="edit_role_name" id="0x7f0a02a4" />
-    <public type="id" name="edit_role_save" id="0x7f0a02a5" />
-    <public type="id" name="embed_guideline" id="0x7f0a02a6" />
-    <public type="id" name="embed_guideline_right" id="0x7f0a02a7" />
-    <public type="id" name="embed_image_container" id="0x7f0a02a8" />
-    <public type="id" name="emoji_btn" id="0x7f0a02a9" />
-    <public type="id" name="emoji_container" id="0x7f0a02aa" />
-    <public type="id" name="emoji_item_draweeview" id="0x7f0a02ab" />
-    <public type="id" name="emoji_iv" id="0x7f0a02ac" />
-    <public type="id" name="emoji_picker_backspace_icon" id="0x7f0a02ad" />
-    <public type="id" name="emoji_picker_bottom_bar" id="0x7f0a02ae" />
-    <public type="id" name="emoji_picker_search_icon" id="0x7f0a02af" />
-    <public type="id" name="emoji_picker_tab_layout" id="0x7f0a02b0" />
-    <public type="id" name="emoji_search_bar" id="0x7f0a02b1" />
-    <public type="id" name="empty_results" id="0x7f0a02b2" />
-    <public type="id" name="enable_button" id="0x7f0a02b3" />
-    <public type="id" name="enable_mfa_key_code" id="0x7f0a02b4" />
-    <public type="id" name="enable_mfa_key_launch_authy" id="0x7f0a02b5" />
-    <public type="id" name="enable_mfa_key_launch_google_auth" id="0x7f0a02b6" />
-    <public type="id" name="enable_mfa_stepsview" id="0x7f0a02b7" />
-    <public type="id" name="enable_sms_backup_body" id="0x7f0a02b8" />
-    <public type="id" name="enable_sms_backup_cancel" id="0x7f0a02b9" />
-    <public type="id" name="enable_sms_backup_confirm" id="0x7f0a02ba" />
-    <public type="id" name="enable_sms_backup_header" id="0x7f0a02bb" />
-    <public type="id" name="enable_sms_backup_password" id="0x7f0a02bc" />
-    <public type="id" name="enable_sms_backup_password_wrap" id="0x7f0a02bd" />
-    <public type="id" name="end" id="0x7f0a02be" />
-    <public type="id" name="end_padder" id="0x7f0a02bf" />
-    <public type="id" name="enterAlways" id="0x7f0a02c0" />
-    <public type="id" name="enterAlwaysCollapsed" id="0x7f0a02c1" />
-    <public type="id" name="error_divider" id="0x7f0a02c2" />
-    <public type="id" name="exitUntilCollapsed" id="0x7f0a02c3" />
-    <public type="id" name="expand_activities_button" id="0x7f0a02c4" />
-    <public type="id" name="expanded_menu" id="0x7f0a02c5" />
-    <public type="id" name="external_share_comment" id="0x7f0a02c6" />
-    <public type="id" name="external_share_list" id="0x7f0a02c7" />
-    <public type="id" name="external_share_search" id="0x7f0a02c8" />
-    <public type="id" name="external_share_search_results" id="0x7f0a02c9" />
-    <public type="id" name="fab_menu_add_category" id="0x7f0a02ca" />
-    <public type="id" name="fab_menu_add_text" id="0x7f0a02cb" />
-    <public type="id" name="fab_menu_add_voice" id="0x7f0a02cc" />
-    <public type="id" name="fab_menu_main" id="0x7f0a02cd" />
-    <public type="id" name="fab_menu_main_fab" id="0x7f0a02ce" />
-    <public type="id" name="fab_menu_table" id="0x7f0a02cf" />
-    <public type="id" name="fatal_crash_app_version" id="0x7f0a02d0" />
-    <public type="id" name="fatal_crash_details" id="0x7f0a02d1" />
-    <public type="id" name="fatal_crash_device" id="0x7f0a02d2" />
-    <public type="id" name="fatal_crash_os_version" id="0x7f0a02d3" />
-    <public type="id" name="fatal_crash_source" id="0x7f0a02d4" />
-    <public type="id" name="fatal_crash_testers_invite" id="0x7f0a02d5" />
-    <public type="id" name="fatal_crash_time" id="0x7f0a02d6" />
-    <public type="id" name="file_name_tv" id="0x7f0a02d7" />
-    <public type="id" name="file_subtitle_tv" id="0x7f0a02d8" />
-    <public type="id" name="fill" id="0x7f0a02d9" />
-    <public type="id" name="fill_horizontal" id="0x7f0a02da" />
-    <public type="id" name="fill_vertical" id="0x7f0a02db" />
-    <public type="id" name="filled" id="0x7f0a02dc" />
-    <public type="id" name="fitBottomStart" id="0x7f0a02dd" />
-    <public type="id" name="fitCenter" id="0x7f0a02de" />
-    <public type="id" name="fitEnd" id="0x7f0a02df" />
-    <public type="id" name="fitStart" id="0x7f0a02e0" />
-    <public type="id" name="fitXY" id="0x7f0a02e1" />
-    <public type="id" name="fixed" id="0x7f0a02e2" />
-    <public type="id" name="flex_end" id="0x7f0a02e3" />
-    <public type="id" name="flex_start" id="0x7f0a02e4" />
-    <public type="id" name="focusCrop" id="0x7f0a02e5" />
-    <public type="id" name="folder_view_folder_image" id="0x7f0a02e6" />
-    <public type="id" name="forever" id="0x7f0a02e7" />
-    <public type="id" name="friend_container" id="0x7f0a02e8" />
-    <public type="id" name="friend_request_delete_confirmation_body" id="0x7f0a02e9" />
-    <public type="id" name="friend_request_delete_confirmation_cancel" id="0x7f0a02ea" />
-    <public type="id" name="friend_request_delete_confirmation_delete" id="0x7f0a02eb" />
-    <public type="id" name="friend_request_delete_confirmation_title" id="0x7f0a02ec" />
-    <public type="id" name="friends_add_container" id="0x7f0a02ed" />
-    <public type="id" name="friends_add_header" id="0x7f0a02ee" />
-    <public type="id" name="friends_add_nearby" id="0x7f0a02ef" />
-    <public type="id" name="friends_add_send" id="0x7f0a02f0" />
-    <public type="id" name="friends_add_text_edit" id="0x7f0a02f1" />
-    <public type="id" name="friends_add_text_edit_wrap" id="0x7f0a02f2" />
-    <public type="id" name="friends_list_item_avatar" id="0x7f0a02f3" />
-    <public type="id" name="friends_list_item_avatar_wrap" id="0x7f0a02f4" />
-    <public type="id" name="friends_list_item_empty" id="0x7f0a02f5" />
-    <public type="id" name="friends_list_item_empty_invite" id="0x7f0a02f6" />
-    <public type="id" name="friends_list_item_empty_no_blocked" id="0x7f0a02f7" />
-    <public type="id" name="friends_list_item_empty_no_friends" id="0x7f0a02f8" />
-    <public type="id" name="friends_list_item_empty_no_online" id="0x7f0a02f9" />
-    <public type="id" name="friends_list_item_empty_no_request" id="0x7f0a02fa" />
-    <public type="id" name="friends_list_item_empty_no_suggestions" id="0x7f0a02fb" />
-    <public type="id" name="friends_list_item_game" id="0x7f0a02fc" />
-    <public type="id" name="friends_list_item_mutual_1" id="0x7f0a02fd" />
-    <public type="id" name="friends_list_item_mutual_1_icon" id="0x7f0a02fe" />
-    <public type="id" name="friends_list_item_mutual_1_text" id="0x7f0a02ff" />
-    <public type="id" name="friends_list_item_mutual_2" id="0x7f0a0300" />
-    <public type="id" name="friends_list_item_mutual_2_icon" id="0x7f0a0301" />
-    <public type="id" name="friends_list_item_mutual_2_text" id="0x7f0a0302" />
-    <public type="id" name="friends_list_item_mutual_3" id="0x7f0a0303" />
-    <public type="id" name="friends_list_item_mutual_3_icon" id="0x7f0a0304" />
-    <public type="id" name="friends_list_item_mutual_3_text" id="0x7f0a0305" />
-    <public type="id" name="friends_list_item_mutual_4" id="0x7f0a0306" />
-    <public type="id" name="friends_list_item_mutual_4_icon" id="0x7f0a0307" />
-    <public type="id" name="friends_list_item_mutual_4_text" id="0x7f0a0308" />
-    <public type="id" name="friends_list_item_mutual_wrap" id="0x7f0a0309" />
-    <public type="id" name="friends_list_item_name" id="0x7f0a030a" />
-    <public type="id" name="friends_list_item_presence" id="0x7f0a030b" />
-    <public type="id" name="friends_list_item_text" id="0x7f0a030c" />
-    <public type="id" name="friends_list_recycler" id="0x7f0a030d" />
-    <public type="id" name="front" id="0x7f0a030e" />
-    <public type="id" name="ghost_view" id="0x7f0a030f" />
-    <public type="id" name="gift_entitlement_code" id="0x7f0a0310" />
-    <public type="id" name="gift_entitlement_code_container" id="0x7f0a0311" />
-    <public type="id" name="gift_entitlement_container" id="0x7f0a0312" />
-    <public type="id" name="gift_entitlement_copy" id="0x7f0a0313" />
-    <public type="id" name="gift_entitlement_divider" id="0x7f0a0314" />
-    <public type="id" name="gift_entitlement_flipper" id="0x7f0a0315" />
-    <public type="id" name="gift_entitlement_generate" id="0x7f0a0316" />
-    <public type="id" name="gift_entitlement_revoke" id="0x7f0a0317" />
-    <public type="id" name="gift_sku_arrow" id="0x7f0a0318" />
-    <public type="id" name="gift_sku_copies" id="0x7f0a0319" />
-    <public type="id" name="gift_sku_icon" id="0x7f0a031a" />
-    <public type="id" name="gift_sku_name" id="0x7f0a031b" />
-    <public type="id" name="global_search_add_a_friend_btn" id="0x7f0a031c" />
-    <public type="id" name="global_search_guild_list" id="0x7f0a031d" />
-    <public type="id" name="global_search_join_guild_btn" id="0x7f0a031e" />
-    <public type="id" name="global_search_recycler" id="0x7f0a031f" />
-    <public type="id" name="global_search_view_flipper" id="0x7f0a0320" />
-    <public type="id" name="gone" id="0x7f0a0321" />
-    <public type="id" name="group_divider" id="0x7f0a0322" />
-    <public type="id" name="group_dm_settings_scroll_view" id="0x7f0a0323" />
-    <public type="id" name="group_invite_friends_chips" id="0x7f0a0324" />
-    <public type="id" name="group_invite_friends_recipients_container" id="0x7f0a0325" />
-    <public type="id" name="group_invite_friends_recycler" id="0x7f0a0326" />
-    <public type="id" name="group_invite_friends_save_fab" id="0x7f0a0327" />
-    <public type="id" name="group_invite_friends_text_to" id="0x7f0a0328" />
-    <public type="id" name="group_invite_friends_view_flipper" id="0x7f0a0329" />
-    <public type="id" name="groups" id="0x7f0a032a" />
-    <public type="id" name="guideline" id="0x7f0a032b" />
-    <public type="id" name="guild_actions_add_create" id="0x7f0a032c" />
-    <public type="id" name="guild_actions_add_create_desc" id="0x7f0a032d" />
-    <public type="id" name="guild_actions_add_join" id="0x7f0a032e" />
-    <public type="id" name="guild_actions_add_join_desc" id="0x7f0a032f" />
-    <public type="id" name="guild_actions_manage_channels_divider" id="0x7f0a0330" />
-    <public type="id" name="guild_actions_overview_boost" id="0x7f0a0331" />
-    <public type="id" name="guild_actions_overview_change_nickname" id="0x7f0a0332" />
-    <public type="id" name="guild_actions_overview_copy_id" id="0x7f0a0333" />
-    <public type="id" name="guild_actions_overview_create_category" id="0x7f0a0334" />
-    <public type="id" name="guild_actions_overview_create_channel" id="0x7f0a0335" />
-    <public type="id" name="guild_actions_overview_header_icon_iv" id="0x7f0a0336" />
-    <public type="id" name="guild_actions_overview_header_icon_tv" id="0x7f0a0337" />
-    <public type="id" name="guild_actions_overview_header_tv" id="0x7f0a0338" />
-    <public type="id" name="guild_actions_overview_leave" id="0x7f0a0339" />
-    <public type="id" name="guild_actions_overview_mark_as_read" id="0x7f0a033a" />
-    <public type="id" name="guild_actions_overview_notifications" id="0x7f0a033b" />
-    <public type="id" name="guild_actions_overview_privacy_cs" id="0x7f0a033c" />
-    <public type="id" name="guild_actions_overview_settings" id="0x7f0a033d" />
-    <public type="id" name="guild_actions_overview_show_hide_muted_channels" id="0x7f0a033e" />
-    <public type="id" name="guild_call_controls" id="0x7f0a033f" />
-    <public type="id" name="guild_call_participant_list" id="0x7f0a0340" />
-    <public type="id" name="guild_call_view_flipper" id="0x7f0a0341" />
-    <public type="id" name="guild_create_guidelines" id="0x7f0a0342" />
-    <public type="id" name="guild_create_icon" id="0x7f0a0343" />
-    <public type="id" name="guild_create_icon_placeholder" id="0x7f0a0344" />
-    <public type="id" name="guild_create_icon_wrap" id="0x7f0a0345" />
-    <public type="id" name="guild_create_name" id="0x7f0a0346" />
-    <public type="id" name="guild_create_regions" id="0x7f0a0347" />
-    <public type="id" name="guild_invite_accept" id="0x7f0a0348" />
-    <public type="id" name="guild_invite_actions" id="0x7f0a0349" />
-    <public type="id" name="guild_invite_cancel" id="0x7f0a034a" />
-    <public type="id" name="guild_invite_channel_spinner" id="0x7f0a034b" />
-    <public type="id" name="guild_invite_empty_results" id="0x7f0a034c" />
-    <public type="id" name="guild_invite_expires_after_radiogroup" id="0x7f0a034d" />
-    <public type="id" name="guild_invite_generate_link" id="0x7f0a034e" />
-    <public type="id" name="guild_invite_info" id="0x7f0a034f" />
-    <public type="id" name="guild_invite_link" id="0x7f0a0350" />
-    <public type="id" name="guild_invite_max_uses_radiogroup" id="0x7f0a0351" />
-    <public type="id" name="guild_invite_never_expire" id="0x7f0a0352" />
-    <public type="id" name="guild_invite_settings_edit" id="0x7f0a0353" />
-    <public type="id" name="guild_invite_share_btn" id="0x7f0a0354" />
-    <public type="id" name="guild_invite_splash" id="0x7f0a0355" />
-    <public type="id" name="guild_invite_suggestion_list" id="0x7f0a0356" />
-    <public type="id" name="guild_invite_suggestions_flipper" id="0x7f0a0357" />
-    <public type="id" name="guild_invite_temporary_membership" id="0x7f0a0358" />
-    <public type="id" name="guild_join_action_btn" id="0x7f0a0359" />
-    <public type="id" name="guild_join_content" id="0x7f0a035a" />
-    <public type="id" name="guild_join_invite" id="0x7f0a035b" />
-    <public type="id" name="guild_list" id="0x7f0a035c" />
-    <public type="id" name="guild_list_add_hint" id="0x7f0a035d" />
-    <public type="id" name="guild_list_unreads_stub" id="0x7f0a035e" />
-    <public type="id" name="guild_notifications_add_override" id="0x7f0a035f" />
-    <public type="id" name="guild_notifications_channel_list" id="0x7f0a0360" />
-    <public type="id" name="guild_notifications_override_list" id="0x7f0a0361" />
-    <public type="id" name="guild_search_item_avatar" id="0x7f0a0362" />
-    <public type="id" name="guild_search_item_name" id="0x7f0a0363" />
-    <public type="id" name="guild_search_recycler" id="0x7f0a0364" />
-    <public type="id" name="guild_transfer_ownership_acknowledge_check" id="0x7f0a0365" />
-    <public type="id" name="guild_transfer_ownership_cancel" id="0x7f0a0366" />
-    <public type="id" name="guild_transfer_ownership_confirm" id="0x7f0a0367" />
-    <public type="id" name="guild_transfer_ownership_mfa_code" id="0x7f0a0368" />
-    <public type="id" name="guild_transfer_ownership_mfa_wrap" id="0x7f0a0369" />
-    <public type="id" name="guild_view_1" id="0x7f0a036a" />
-    <public type="id" name="guild_view_2" id="0x7f0a036b" />
-    <public type="id" name="guild_view_3" id="0x7f0a036c" />
-    <public type="id" name="guild_view_4" id="0x7f0a036d" />
-    <public type="id" name="guild_view_image" id="0x7f0a036e" />
-    <public type="id" name="guild_view_text" id="0x7f0a036f" />
-    <public type="id" name="guild_views" id="0x7f0a0370" />
-    <public type="id" name="guilds_item_avatar" id="0x7f0a0371" />
-    <public type="id" name="guilds_item_avatar_text" id="0x7f0a0372" />
-    <public type="id" name="guilds_item_avatar_wrap" id="0x7f0a0373" />
-    <public type="id" name="guilds_item_dm_avatar" id="0x7f0a0374" />
-    <public type="id" name="guilds_item_dm_count" id="0x7f0a0375" />
-    <public type="id" name="guilds_item_folder" id="0x7f0a0376" />
-    <public type="id" name="guilds_item_folder_container" id="0x7f0a0377" />
-    <public type="id" name="guilds_item_guild_new_avatar" id="0x7f0a0378" />
-    <public type="id" name="guilds_item_highlight" id="0x7f0a0379" />
-    <public type="id" name="guilds_item_mentions" id="0x7f0a037a" />
-    <public type="id" name="guilds_item_profile_avatar" id="0x7f0a037b" />
-    <public type="id" name="guilds_item_profile_selected" id="0x7f0a037c" />
-    <public type="id" name="guilds_item_selected" id="0x7f0a037d" />
-    <public type="id" name="guilds_item_unread" id="0x7f0a037e" />
-    <public type="id" name="guilds_item_voice" id="0x7f0a037f" />
-    <public type="id" name="hardware" id="0x7f0a0380" />
-    <public type="id" name="header_item_text" id="0x7f0a0381" />
-    <public type="id" name="home" id="0x7f0a0382" />
-    <public type="id" name="homeAsUp" id="0x7f0a0383" />
-    <public type="id" name="icon" id="0x7f0a0384" />
-    <public type="id" name="icon_group" id="0x7f0a0385" />
-    <public type="id" name="icon_only" id="0x7f0a0386" />
-    <public type="id" name="ifRoom" id="0x7f0a0387" />
-    <public type="id" name="image" id="0x7f0a0388" />
-    <public type="id" name="image_bottom_guideline" id="0x7f0a0389" />
-    <public type="id" name="image_view_crop" id="0x7f0a038a" />
-    <public type="id" name="image_view_logo" id="0x7f0a038b" />
-    <public type="id" name="image_view_state_aspect_ratio" id="0x7f0a038c" />
-    <public type="id" name="image_view_state_rotate" id="0x7f0a038d" />
-    <public type="id" name="image_view_state_scale" id="0x7f0a038e" />
-    <public type="id" name="incoming_call_accept_button" id="0x7f0a038f" />
-    <public type="id" name="incoming_call_accept_container" id="0x7f0a0390" />
-    <public type="id" name="incoming_call_accept_text" id="0x7f0a0391" />
-    <public type="id" name="incoming_call_connect_voice_only" id="0x7f0a0392" />
-    <public type="id" name="incoming_call_decline_button" id="0x7f0a0393" />
-    <public type="id" name="incoming_call_decline_container" id="0x7f0a0394" />
-    <public type="id" name="incoming_call_status_container" id="0x7f0a0395" />
-    <public type="id" name="incoming_call_status_primary" id="0x7f0a0396" />
-    <public type="id" name="incoming_call_status_secondary" id="0x7f0a0397" />
-    <public type="id" name="incoming_call_top_guideline" id="0x7f0a0398" />
-    <public type="id" name="incoming_call_users_recycler" id="0x7f0a0399" />
-    <public type="id" name="info" id="0x7f0a039a" />
-    <public type="id" name="integration_header_container" id="0x7f0a039b" />
-    <public type="id" name="integration_header_disabled_overlay" id="0x7f0a039c" />
-    <public type="id" name="integration_icon" id="0x7f0a039d" />
-    <public type="id" name="integration_name" id="0x7f0a039e" />
-    <public type="id" name="integration_name_container" id="0x7f0a039f" />
-    <public type="id" name="integration_owner_name" id="0x7f0a03a0" />
-    <public type="id" name="integration_settings_icon" id="0x7f0a03a1" />
-    <public type="id" name="integration_sync_switch" id="0x7f0a03a2" />
-    <public type="id" name="integration_syncing_progress_bar" id="0x7f0a03a3" />
-    <public type="id" name="integrations_empty_body" id="0x7f0a03a4" />
-    <public type="id" name="integrations_empty_header" id="0x7f0a03a5" />
-    <public type="id" name="integrations_recycler" id="0x7f0a03a6" />
-    <public type="id" name="integrations_view_flipper" id="0x7f0a03a7" />
-    <public type="id" name="invisible" id="0x7f0a03a8" />
-    <public type="id" name="invite_actions_copy" id="0x7f0a03a9" />
-    <public type="id" name="invite_actions_revoke" id="0x7f0a03aa" />
-    <public type="id" name="invite_actions_share" id="0x7f0a03ab" />
-    <public type="id" name="invite_actions_title" id="0x7f0a03ac" />
-    <public type="id" name="invite_avatar" id="0x7f0a03ad" />
-    <public type="id" name="invite_avatar_small" id="0x7f0a03ae" />
-    <public type="id" name="invite_avatar_small_wrap" id="0x7f0a03af" />
-    <public type="id" name="invite_avatar_wrap" id="0x7f0a03b0" />
-    <public type="id" name="invite_channel" id="0x7f0a03b1" />
-    <public type="id" name="invite_code" id="0x7f0a03b2" />
-    <public type="id" name="invite_container" id="0x7f0a03b3" />
-    <public type="id" name="invite_divider" id="0x7f0a03b4" />
-    <public type="id" name="invite_expiration_container" id="0x7f0a03b5" />
-    <public type="id" name="invite_expiration_time" id="0x7f0a03b6" />
-    <public type="id" name="invite_expired_image" id="0x7f0a03b7" />
-    <public type="id" name="invite_expires_label" id="0x7f0a03b8" />
-    <public type="id" name="invite_list_item_avatar" id="0x7f0a03b9" />
-    <public type="id" name="invite_members_online" id="0x7f0a03ba" />
-    <public type="id" name="invite_members_online_wrap" id="0x7f0a03bb" />
-    <public type="id" name="invite_members_total" id="0x7f0a03bc" />
-    <public type="id" name="invite_members_total_wrap" id="0x7f0a03bd" />
-    <public type="id" name="invite_members_wrap" id="0x7f0a03be" />
-    <public type="id" name="invite_message" id="0x7f0a03bf" />
-    <public type="id" name="invite_name_container" id="0x7f0a03c0" />
-    <public type="id" name="invite_settings_bottom_sheet" id="0x7f0a03c1" />
-    <public type="id" name="invite_settings_icon" id="0x7f0a03c2" />
-    <public type="id" name="invite_title" id="0x7f0a03c3" />
-    <public type="id" name="invite_user_name" id="0x7f0a03c4" />
-    <public type="id" name="invite_uses" id="0x7f0a03c5" />
-    <public type="id" name="invite_uses_label" id="0x7f0a03c6" />
-    <public type="id" name="italic" id="0x7f0a03c7" />
-    <public type="id" name="item_backup_code_tv" id="0x7f0a03c8" />
-    <public type="id" name="item_check_indicator" id="0x7f0a03c9" />
-    <public type="id" name="item_description_tv" id="0x7f0a03ca" />
-    <public type="id" name="item_game_invite_application_name" id="0x7f0a03cb" />
-    <public type="id" name="item_game_invite_cover_image" id="0x7f0a03cc" />
-    <public type="id" name="item_game_invite_header" id="0x7f0a03cd" />
-    <public type="id" name="item_game_invite_recycler" id="0x7f0a03ce" />
-    <public type="id" name="item_game_invite_status" id="0x7f0a03cf" />
-    <public type="id" name="item_gift_accept_button" id="0x7f0a03d0" />
-    <public type="id" name="item_gift_cannot_claim_button" id="0x7f0a03d1" />
-    <public type="id" name="item_gift_details" id="0x7f0a03d2" />
-    <public type="id" name="item_gift_expires" id="0x7f0a03d3" />
-    <public type="id" name="item_gift_header" id="0x7f0a03d4" />
-    <public type="id" name="item_gift_image" id="0x7f0a03d5" />
-    <public type="id" name="item_gift_image_background" id="0x7f0a03d6" />
-    <public type="id" name="item_gift_loading_button_placeholder" id="0x7f0a03d7" />
-    <public type="id" name="item_gift_name" id="0x7f0a03d8" />
-    <public type="id" name="item_gift_subtext" id="0x7f0a03d9" />
-    <public type="id" name="item_gift_verify_button" id="0x7f0a03da" />
-    <public type="id" name="item_group_tv" id="0x7f0a03db" />
-    <public type="id" name="item_guild_welcome_header" id="0x7f0a03dc" />
-    <public type="id" name="item_guild_welcome_subheader" id="0x7f0a03dd" />
-    <public type="id" name="item_header" id="0x7f0a03de" />
-    <public type="id" name="item_header_tv" id="0x7f0a03df" />
-    <public type="id" name="item_icon_iv" id="0x7f0a03e0" />
-    <public type="id" name="item_invite_btn" id="0x7f0a03e1" />
-    <public type="id" name="item_invite_header" id="0x7f0a03e2" />
-    <public type="id" name="item_invite_image" id="0x7f0a03e3" />
-    <public type="id" name="item_invite_image_text" id="0x7f0a03e4" />
-    <public type="id" name="item_invite_join_button" id="0x7f0a03e5" />
-    <public type="id" name="item_invite_joined_button" id="0x7f0a03e6" />
-    <public type="id" name="item_invite_loading_button" id="0x7f0a03e7" />
-    <public type="id" name="item_invite_member_container" id="0x7f0a03e8" />
-    <public type="id" name="item_invite_mention_button" id="0x7f0a03e9" />
-    <public type="id" name="item_invite_name" id="0x7f0a03ea" />
-    <public type="id" name="item_invite_online_dot" id="0x7f0a03eb" />
-    <public type="id" name="item_invite_online_text" id="0x7f0a03ec" />
-    <public type="id" name="item_invite_total_member_dot" id="0x7f0a03ed" />
-    <public type="id" name="item_invite_total_member_text" id="0x7f0a03ee" />
-    <public type="id" name="item_listen_together_album_image" id="0x7f0a03ef" />
-    <public type="id" name="item_listen_together_artist" id="0x7f0a03f0" />
-    <public type="id" name="item_listen_together_container" id="0x7f0a03f1" />
-    <public type="id" name="item_listen_together_header" id="0x7f0a03f2" />
-    <public type="id" name="item_listen_together_join" id="0x7f0a03f3" />
-    <public type="id" name="item_listen_together_recycler" id="0x7f0a03f4" />
-    <public type="id" name="item_listen_together_session_ended" id="0x7f0a03f5" />
-    <public type="id" name="item_listen_together_track" id="0x7f0a03f6" />
-    <public type="id" name="item_mentions_tv" id="0x7f0a03f7" />
-    <public type="id" name="item_name_tv" id="0x7f0a03f8" />
-    <public type="id" name="item_sent" id="0x7f0a03f9" />
-    <public type="id" name="item_touch_helper_previous_elevation" id="0x7f0a03fa" />
-    <public type="id" name="item_unread" id="0x7f0a03fb" />
-    <public type="id" name="kick_user_body" id="0x7f0a03fc" />
-    <public type="id" name="kick_user_cancel" id="0x7f0a03fd" />
-    <public type="id" name="kick_user_confirm" id="0x7f0a03fe" />
-    <public type="id" name="kick_user_reason" id="0x7f0a03ff" />
-    <public type="id" name="kick_user_title" id="0x7f0a0400" />
-    <public type="id" name="labeled" id="0x7f0a0401" />
-    <public type="id" name="largeLabel" id="0x7f0a0402" />
-    <public type="id" name="launch_btn" id="0x7f0a0403" />
-    <public type="id" name="launch_camera_btn" id="0x7f0a0404" />
-    <public type="id" name="layout_aspect_ratio" id="0x7f0a0405" />
-    <public type="id" name="layout_rotate_wheel" id="0x7f0a0406" />
-    <public type="id" name="layout_scale_wheel" id="0x7f0a0407" />
-    <public type="id" name="left" id="0x7f0a0408" />
-    <public type="id" name="light" id="0x7f0a0409" />
-    <public type="id" name="line1" id="0x7f0a040a" />
-    <public type="id" name="line3" id="0x7f0a040b" />
-    <public type="id" name="list" id="0x7f0a040c" />
-    <public type="id" name="listMode" id="0x7f0a040d" />
-    <public type="id" name="list_item" id="0x7f0a040e" />
-    <public type="id" name="loading_button_progress" id="0x7f0a040f" />
-    <public type="id" name="loading_button_text" id="0x7f0a0410" />
-    <public type="id" name="lottie_layer_name" id="0x7f0a0411" />
-    <public type="id" name="main_drawer" id="0x7f0a0412" />
-    <public type="id" name="main_input_container" id="0x7f0a0413" />
-    <public type="id" name="main_panel_center" id="0x7f0a0414" />
-    <public type="id" name="main_panel_center_channel_less" id="0x7f0a0415" />
-    <public type="id" name="main_panel_center_channel_less_body" id="0x7f0a0416" />
-    <public type="id" name="main_panel_center_channel_less_title" id="0x7f0a0417" />
-    <public type="id" name="main_panel_center_nsfw" id="0x7f0a0418" />
-    <public type="id" name="main_panel_center_nsfw_anchor_wrap" id="0x7f0a0419" />
-    <public type="id" name="main_panel_center_nsfw_confirm" id="0x7f0a041a" />
-    <public type="id" name="main_panel_center_nsfw_deny" id="0x7f0a041b" />
-    <public type="id" name="main_panel_left" id="0x7f0a041c" />
-    <public type="id" name="main_panel_loading" id="0x7f0a041d" />
-    <public type="id" name="main_panel_right" id="0x7f0a041e" />
-    <public type="id" name="main_toolbar_unread_count" id="0x7f0a041f" />
-    <public type="id" name="manage_reactions_emoji_container" id="0x7f0a0420" />
-    <public type="id" name="manage_reactions_emoji_counter" id="0x7f0a0421" />
-    <public type="id" name="manage_reactions_emoji_emoji_textview" id="0x7f0a0422" />
-    <public type="id" name="manage_reactions_emoji_selected_indicator" id="0x7f0a0423" />
-    <public type="id" name="manage_reactions_emojis_recycler" id="0x7f0a0424" />
-    <public type="id" name="manage_reactions_result_error_img" id="0x7f0a0425" />
-    <public type="id" name="manage_reactions_result_error_text" id="0x7f0a0426" />
-    <public type="id" name="manage_reactions_result_remove_reaction" id="0x7f0a0427" />
-    <public type="id" name="manage_reactions_result_user_avatar" id="0x7f0a0428" />
-    <public type="id" name="manage_reactions_result_user_name" id="0x7f0a0429" />
-    <public type="id" name="manage_reactions_results_recycler" id="0x7f0a042a" />
-    <public type="id" name="masked" id="0x7f0a042b" />
-    <public type="id" name="media_actions" id="0x7f0a042c" />
-    <public type="id" name="media_image" id="0x7f0a042d" />
-    <public type="id" name="media_video" id="0x7f0a042e" />
-    <public type="id" name="member_list_item_avatar" id="0x7f0a042f" />
-    <public type="id" name="member_list_item_container" id="0x7f0a0430" />
-    <public type="id" name="member_list_item_lock" id="0x7f0a0431" />
-    <public type="id" name="member_list_item_name" id="0x7f0a0432" />
-    <public type="id" name="member_list_item_overflow" id="0x7f0a0433" />
-    <public type="id" name="member_list_item_roles_recycler" id="0x7f0a0434" />
-    <public type="id" name="menu_add_connections" id="0x7f0a0435" />
-    <public type="id" name="menu_audit_log_sort_actions" id="0x7f0a0436" />
-    <public type="id" name="menu_audit_log_sort_users" id="0x7f0a0437" />
-    <public type="id" name="menu_auth_mfa_backup_codes" id="0x7f0a0438" />
-    <public type="id" name="menu_auth_mfa_info" id="0x7f0a0439" />
-    <public type="id" name="menu_channel_notification_settings" id="0x7f0a043a" />
-    <public type="id" name="menu_channel_settings" id="0x7f0a043b" />
-    <public type="id" name="menu_channel_settings_delete" id="0x7f0a043c" />
-    <public type="id" name="menu_channel_settings_reset" id="0x7f0a043d" />
-    <public type="id" name="menu_chat_add_friend" id="0x7f0a043e" />
-    <public type="id" name="menu_chat_dms_close" id="0x7f0a043f" />
-    <public type="id" name="menu_chat_dms_view_profile" id="0x7f0a0440" />
-    <public type="id" name="menu_chat_group_add" id="0x7f0a0441" />
-    <public type="id" name="menu_chat_group_settings" id="0x7f0a0442" />
-    <public type="id" name="menu_chat_pins" id="0x7f0a0443" />
-    <public type="id" name="menu_chat_search" id="0x7f0a0444" />
-    <public type="id" name="menu_chat_side_panel" id="0x7f0a0445" />
-    <public type="id" name="menu_chat_start_call" id="0x7f0a0446" />
-    <public type="id" name="menu_chat_start_group" id="0x7f0a0447" />
-    <public type="id" name="menu_chat_start_video_call" id="0x7f0a0448" />
-    <public type="id" name="menu_chat_stop_call" id="0x7f0a0449" />
-    <public type="id" name="menu_copy_id" id="0x7f0a044a" />
-    <public type="id" name="menu_crop" id="0x7f0a044b" />
-    <public type="id" name="menu_debugging_filter" id="0x7f0a044c" />
-    <public type="id" name="menu_debugging_share" id="0x7f0a044d" />
-    <public type="id" name="menu_edit_overwrite_delete" id="0x7f0a044e" />
-    <public type="id" name="menu_edit_role_delete" id="0x7f0a044f" />
-    <public type="id" name="menu_filter" id="0x7f0a0450" />
-    <public type="id" name="menu_guild_call_channel_settings" id="0x7f0a0451" />
-    <public type="id" name="menu_guild_call_overlay_launcher" id="0x7f0a0452" />
-    <public type="id" name="menu_guild_call_voice_settings" id="0x7f0a0453" />
-    <public type="id" name="menu_guild_create" id="0x7f0a0454" />
-    <public type="id" name="menu_guild_join" id="0x7f0a0455" />
-    <public type="id" name="menu_leave_group" id="0x7f0a0456" />
-    <public type="id" name="menu_loader" id="0x7f0a0457" />
-    <public type="id" name="menu_media_browser" id="0x7f0a0458" />
-    <public type="id" name="menu_media_download" id="0x7f0a0459" />
-    <public type="id" name="menu_media_share" id="0x7f0a045a" />
-    <public type="id" name="menu_private_call_group_settings" id="0x7f0a045b" />
-    <public type="id" name="menu_private_call_participants" id="0x7f0a045c" />
-    <public type="id" name="menu_private_call_select_camera" id="0x7f0a045d" />
-    <public type="id" name="menu_private_call_user_settings" id="0x7f0a045e" />
-    <public type="id" name="menu_private_call_voice_settings" id="0x7f0a045f" />
-    <public type="id" name="menu_send" id="0x7f0a0460" />
-    <public type="id" name="menu_server_settings_delete" id="0x7f0a0461" />
-    <public type="id" name="menu_server_settings_emoji_delete" id="0x7f0a0462" />
-    <public type="id" name="menu_server_settings_members_prune" id="0x7f0a0463" />
-    <public type="id" name="menu_settings_debugging" id="0x7f0a0464" />
-    <public type="id" name="menu_settings_log_out" id="0x7f0a0465" />
-    <public type="id" name="menu_sort_channel" id="0x7f0a0466" />
-    <public type="id" name="menu_sort_done" id="0x7f0a0467" />
-    <public type="id" name="menu_user_mentions_filter" id="0x7f0a0468" />
-    <public type="id" name="menu_user_profile_block" id="0x7f0a0469" />
-    <public type="id" name="menu_user_profile_cancel" id="0x7f0a046a" />
-    <public type="id" name="menu_user_profile_ignore" id="0x7f0a046b" />
-    <public type="id" name="menu_user_profile_message" id="0x7f0a046c" />
-    <public type="id" name="menu_user_profile_remove_friend" id="0x7f0a046d" />
-    <public type="id" name="menu_user_profile_unblock" id="0x7f0a046e" />
-    <public type="id" name="message" id="0x7f0a046f" />
-    <public type="id" name="mfa_description_text" id="0x7f0a0470" />
-    <public type="id" name="mfa_download_body" id="0x7f0a0471" />
-    <public type="id" name="mfa_success_enable_sms" id="0x7f0a0472" />
-    <public type="id" name="middle" id="0x7f0a0473" />
-    <public type="id" name="mini" id="0x7f0a0474" />
-    <public type="id" name="mtrl_child_content_container" id="0x7f0a0475" />
-    <public type="id" name="mtrl_internal_children_alpha_tag" id="0x7f0a0476" />
-    <public type="id" name="multiply" id="0x7f0a0477" />
-    <public type="id" name="mute_toggle" id="0x7f0a0478" />
-    <public type="id" name="navigation_header_container" id="0x7f0a0479" />
-    <public type="id" name="navigation_indicator" id="0x7f0a047a" />
-    <public type="id" name="nearby_friends_button_flipper" id="0x7f0a047b" />
-    <public type="id" name="nearby_friends_disable" id="0x7f0a047c" />
-    <public type="id" name="nearby_friends_enable" id="0x7f0a047d" />
-    <public type="id" name="nearby_friends_error" id="0x7f0a047e" />
-    <public type="id" name="nearby_friends_flipper" id="0x7f0a047f" />
-    <public type="id" name="nearby_friends_learn_more" id="0x7f0a0480" />
-    <public type="id" name="nearby_friends_recycler" id="0x7f0a0481" />
-    <public type="id" name="nearby_friends_searching" id="0x7f0a0482" />
-    <public type="id" name="nearby_friends_searching_lottie" id="0x7f0a0483" />
-    <public type="id" name="never" id="0x7f0a0484" />
-    <public type="id" name="news_item_view" id="0x7f0a0485" />
-    <public type="id" name="no_bans_body" id="0x7f0a0486" />
-    <public type="id" name="no_invites_body" id="0x7f0a0487" />
-    <public type="id" name="no_invites_header" id="0x7f0a0488" />
-    <public type="id" name="no_logs_body" id="0x7f0a0489" />
-    <public type="id" name="no_logs_title" id="0x7f0a048a" />
-    <public type="id" name="no_results_text" id="0x7f0a048b" />
-    <public type="id" name="none" id="0x7f0a048c" />
-    <public type="id" name="normal" id="0x7f0a048d" />
-    <public type="id" name="notice_body_container" id="0x7f0a048e" />
-    <public type="id" name="notice_body_text" id="0x7f0a048f" />
-    <public type="id" name="notice_cancel" id="0x7f0a0490" />
-    <public type="id" name="notice_header" id="0x7f0a0491" />
-    <public type="id" name="notice_header_container" id="0x7f0a0492" />
-    <public type="id" name="notice_ok" id="0x7f0a0493" />
-    <public type="id" name="notification_background" id="0x7f0a0494" />
-    <public type="id" name="notification_main_column" id="0x7f0a0495" />
-    <public type="id" name="notification_main_column_container" id="0x7f0a0496" />
-    <public type="id" name="nowrap" id="0x7f0a0497" />
-    <public type="id" name="oauth_application_deauthorize_btn" id="0x7f0a0498" />
-    <public type="id" name="oauth_application_description_label_tv" id="0x7f0a0499" />
-    <public type="id" name="oauth_application_description_tv" id="0x7f0a049a" />
-    <public type="id" name="oauth_application_icon_iv" id="0x7f0a049b" />
-    <public type="id" name="oauth_application_name_tv" id="0x7f0a049c" />
-    <public type="id" name="oauth_application_permissions_rv" id="0x7f0a049d" />
-    <public type="id" name="oauth_authorize_application_icon" id="0x7f0a049e" />
-    <public type="id" name="oauth_authorize_application_name" id="0x7f0a049f" />
-    <public type="id" name="oauth_authorize_connect_label" id="0x7f0a04a0" />
-    <public type="id" name="oauth_authorize_content" id="0x7f0a04a1" />
-    <public type="id" name="oauth_authorize_deny" id="0x7f0a04a2" />
-    <public type="id" name="oauth_authorize_grant" id="0x7f0a04a3" />
-    <public type="id" name="oauth_authorize_loading" id="0x7f0a04a4" />
-    <public type="id" name="oauth_authorize_loading_cancel" id="0x7f0a04a5" />
-    <public type="id" name="oauth_authorize_not_supported" id="0x7f0a04a6" />
-    <public type="id" name="oauth_authorize_permissions_label_tv" id="0x7f0a04a7" />
-    <public type="id" name="oauth_authorize_permissions_list" id="0x7f0a04a8" />
-    <public type="id" name="oauth_authorize_security_notice" id="0x7f0a04a9" />
-    <public type="id" name="oauth_authorize_unsupported_browser" id="0x7f0a04aa" />
-    <public type="id" name="oauth_authorize_unsupported_cancel" id="0x7f0a04ab" />
-    <public type="id" name="oauth_token_permission_detailed_desc" id="0x7f0a04ac" />
-    <public type="id" name="oauth_token_permission_detailed_icon" id="0x7f0a04ad" />
-    <public type="id" name="oauth_token_permission_detailed_name" id="0x7f0a04ae" />
-    <public type="id" name="off" id="0x7f0a04af" />
-    <public type="id" name="off_disabled_overlay" id="0x7f0a04b0" />
-    <public type="id" name="on" id="0x7f0a04b1" />
-    <public type="id" name="outline" id="0x7f0a04b2" />
-    <public type="id" name="overlay_bubble_iv" id="0x7f0a04b3" />
-    <public type="id" name="overlay_channel_name" id="0x7f0a04b4" />
-    <public type="id" name="overlay_guild_name" id="0x7f0a04b5" />
-    <public type="id" name="overlay_header" id="0x7f0a04b6" />
-    <public type="id" name="overlay_invite_link" id="0x7f0a04b7" />
-    <public type="id" name="overlay_linked_anchor_view" id="0x7f0a04b8" />
-    <public type="id" name="overlay_members_overflow_tv" id="0x7f0a04b9" />
-    <public type="id" name="overlay_members_rv" id="0x7f0a04ba" />
-    <public type="id" name="overlay_menu" id="0x7f0a04bb" />
-    <public type="id" name="overlay_network_icon" id="0x7f0a04bc" />
-    <public type="id" name="overlay_open_app" id="0x7f0a04bd" />
-    <public type="id" name="overlay_switch_channels" id="0x7f0a04be" />
-    <public type="id" name="packed" id="0x7f0a04bf" />
-    <public type="id" name="page_tabs" id="0x7f0a04c0" />
-    <public type="id" name="parallax" id="0x7f0a04c1" />
-    <public type="id" name="parent" id="0x7f0a04c2" />
-    <public type="id" name="parentPanel" id="0x7f0a04c3" />
-    <public type="id" name="parent_matrix" id="0x7f0a04c4" />
-    <public type="id" name="participant_bg_avatar" id="0x7f0a04c5" />
-    <public type="id" name="participant_bg_letterbox" id="0x7f0a04c6" />
-    <public type="id" name="participant_content_container" id="0x7f0a04c7" />
-    <public type="id" name="participant_video_loading_indicator" id="0x7f0a04c8" />
-    <public type="id" name="participant_voice_status_indicator" id="0x7f0a04c9" />
-    <public type="id" name="participant_voice_user_view" id="0x7f0a04ca" />
-    <public type="id" name="payment_info_address_1_textinputlayout" id="0x7f0a04cb" />
-    <public type="id" name="payment_info_address_2_textinputlayout" id="0x7f0a04cc" />
-    <public type="id" name="payment_info_cancel" id="0x7f0a04cd" />
-    <public type="id" name="payment_info_city_edittext" id="0x7f0a04ce" />
-    <public type="id" name="payment_info_city_textinputlayout" id="0x7f0a04cf" />
-    <public type="id" name="payment_info_delete" id="0x7f0a04d0" />
-    <public type="id" name="payment_info_make_default_checkbox" id="0x7f0a04d1" />
-    <public type="id" name="payment_info_name_address_1_edittext" id="0x7f0a04d2" />
-    <public type="id" name="payment_info_name_address_2_edittext" id="0x7f0a04d3" />
-    <public type="id" name="payment_info_name_edittext" id="0x7f0a04d4" />
-    <public type="id" name="payment_info_name_textinputlayout" id="0x7f0a04d5" />
-    <public type="id" name="payment_info_save" id="0x7f0a04d6" />
-    <public type="id" name="payment_info_zip_edittext" id="0x7f0a04d7" />
-    <public type="id" name="payment_info_zip_textinputlayout" id="0x7f0a04d8" />
-    <public type="id" name="payment_method_edit" id="0x7f0a04d9" />
-    <public type="id" name="payment_method_header" id="0x7f0a04da" />
-    <public type="id" name="payment_method_summary" id="0x7f0a04db" />
-    <public type="id" name="payment_methods_empty_add" id="0x7f0a04dc" />
-    <public type="id" name="payment_methods_empty_image" id="0x7f0a04dd" />
-    <public type="id" name="payment_methods_empty_subtext" id="0x7f0a04de" />
-    <public type="id" name="payment_methods_empty_title" id="0x7f0a04df" />
-    <public type="id" name="payment_methods_loading" id="0x7f0a04e0" />
-    <public type="id" name="payment_methods_recycler" id="0x7f0a04e1" />
-    <public type="id" name="payment_methods_retry" id="0x7f0a04e2" />
-    <public type="id" name="payment_methods_view_flipper" id="0x7f0a04e3" />
-    <public type="id" name="payment_source_edit_address1" id="0x7f0a04e4" />
-    <public type="id" name="payment_source_edit_address2" id="0x7f0a04e5" />
-    <public type="id" name="payment_source_edit_city" id="0x7f0a04e6" />
-    <public type="id" name="payment_source_edit_country" id="0x7f0a04e7" />
-    <public type="id" name="payment_source_edit_default" id="0x7f0a04e8" />
-    <public type="id" name="payment_source_edit_error" id="0x7f0a04e9" />
-    <public type="id" name="payment_source_edit_help" id="0x7f0a04ea" />
-    <public type="id" name="payment_source_edit_name" id="0x7f0a04eb" />
-    <public type="id" name="payment_source_edit_postal_code" id="0x7f0a04ec" />
-    <public type="id" name="payment_source_edit_state" id="0x7f0a04ed" />
-    <public type="id" name="payment_source_summary" id="0x7f0a04ee" />
-    <public type="id" name="payment_source_view_icon" id="0x7f0a04ef" />
-    <public type="id" name="payment_source_view_icon_wrapper" id="0x7f0a04f0" />
-    <public type="id" name="payment_source_view_invalid" id="0x7f0a04f1" />
-    <public type="id" name="payment_source_view_premium" id="0x7f0a04f2" />
-    <public type="id" name="payment_source_view_subtext" id="0x7f0a04f3" />
-    <public type="id" name="payment_source_view_title" id="0x7f0a04f4" />
-    <public type="id" name="percent" id="0x7f0a04f5" />
-    <public type="id" name="perk_view_content_list_item" id="0x7f0a04f6" />
-    <public type="id" name="perks_level_contents_header" id="0x7f0a04f7" />
-    <public type="id" name="perks_level_contents_recycler" id="0x7f0a04f8" />
-    <public type="id" name="perks_level_header" id="0x7f0a04f9" />
-    <public type="id" name="perks_level_header_boosts" id="0x7f0a04fa" />
-    <public type="id" name="perks_level_header_text" id="0x7f0a04fb" />
-    <public type="id" name="perks_level_header_unlocked" id="0x7f0a04fc" />
-    <public type="id" name="perm_req_text" id="0x7f0a04fd" />
-    <public type="id" name="permissions_container" id="0x7f0a04fe" />
-    <public type="id" name="permissions_req_btn" id="0x7f0a04ff" />
-    <public type="id" name="pin" id="0x7f0a0500" />
-    <public type="id" name="platform_identities_list" id="0x7f0a0501" />
-    <public type="id" name="popup_attachment" id="0x7f0a0502" />
-    <public type="id" name="popup_body" id="0x7f0a0503" />
-    <public type="id" name="popup_close_btn" id="0x7f0a0504" />
-    <public type="id" name="popup_countdown_progress" id="0x7f0a0505" />
-    <public type="id" name="popup_icon" id="0x7f0a0506" />
-    <public type="id" name="popup_subtitle" id="0x7f0a0507" />
-    <public type="id" name="popup_title" id="0x7f0a0508" />
-    <public type="id" name="premium_perks_upload_text" id="0x7f0a0509" />
-    <public type="id" name="premium_settings_active_subscription" id="0x7f0a050a" />
-    <public type="id" name="premium_settings_grandfathered" id="0x7f0a050b" />
-    <public type="id" name="premium_settings_legalese" id="0x7f0a050c" />
-    <public type="id" name="premium_settings_nitro" id="0x7f0a050d" />
-    <public type="id" name="premium_settings_nitro_classic" id="0x7f0a050e" />
-    <public type="id" name="premium_settings_nitro_classic_wumpus" id="0x7f0a050f" />
-    <public type="id" name="premium_settings_nitro_wumpus" id="0x7f0a0510" />
-    <public type="id" name="premium_settings_premium_classic_gift" id="0x7f0a0511" />
-    <public type="id" name="premium_settings_premium_classic_monthly" id="0x7f0a0512" />
-    <public type="id" name="premium_settings_premium_classic_yearly" id="0x7f0a0513" />
-    <public type="id" name="premium_settings_premium_gift" id="0x7f0a0514" />
-    <public type="id" name="premium_settings_premium_monthly" id="0x7f0a0515" />
-    <public type="id" name="premium_settings_premium_yearly" id="0x7f0a0516" />
-    <public type="id" name="premium_settings_retry" id="0x7f0a0517" />
-    <public type="id" name="premium_settings_scrollview" id="0x7f0a0518" />
-    <public type="id" name="premium_settings_tier_1_container" id="0x7f0a0519" />
-    <public type="id" name="premium_settings_tier_2_container" id="0x7f0a051a" />
-    <public type="id" name="premium_settings_view_flipper" id="0x7f0a051b" />
-    <public type="id" name="premium_upsell_body" id="0x7f0a051c" />
-    <public type="id" name="premium_upsell_close" id="0x7f0a051d" />
-    <public type="id" name="premium_upsell_dots" id="0x7f0a051e" />
-    <public type="id" name="premium_upsell_header" id="0x7f0a051f" />
-    <public type="id" name="premium_upsell_img" id="0x7f0a0520" />
-    <public type="id" name="premium_upsell_learn_more" id="0x7f0a0521" />
-    <public type="id" name="premium_upsell_viewpager" id="0x7f0a0522" />
-    <public type="id" name="private_call_connect" id="0x7f0a0523" />
-    <public type="id" name="private_call_controls_disconnect" id="0x7f0a0524" />
-    <public type="id" name="private_call_controls_mute" id="0x7f0a0525" />
-    <public type="id" name="private_call_controls_video" id="0x7f0a0526" />
-    <public type="id" name="private_call_participant_list" id="0x7f0a0527" />
-    <public type="id" name="private_call_pip_participant" id="0x7f0a0528" />
-    <public type="id" name="private_call_push_to_talk" id="0x7f0a0529" />
-    <public type="id" name="private_call_status_container" id="0x7f0a052a" />
-    <public type="id" name="private_call_status_primary" id="0x7f0a052b" />
-    <public type="id" name="private_call_status_secondary" id="0x7f0a052c" />
-    <public type="id" name="private_call_top_guideline" id="0x7f0a052d" />
-    <public type="id" name="private_call_video_streams" id="0x7f0a052e" />
-    <public type="id" name="private_call_voice_status_group" id="0x7f0a052f" />
-    <public type="id" name="profile_header_activity_status" id="0x7f0a0530" />
-    <public type="id" name="profile_header_avatar" id="0x7f0a0531" />
-    <public type="id" name="profile_header_avatar_wrap" id="0x7f0a0532" />
-    <public type="id" name="profile_header_badge_text" id="0x7f0a0533" />
-    <public type="id" name="profile_header_badge_wrap" id="0x7f0a0534" />
-    <public type="id" name="profile_header_badge_wrap_outer" id="0x7f0a0535" />
-    <public type="id" name="profile_header_presence_indicator" id="0x7f0a0536" />
-    <public type="id" name="profile_header_username" id="0x7f0a0537" />
-    <public type="id" name="profile_strip_avatar" id="0x7f0a0538" />
-    <public type="id" name="profile_strip_avatar_image" id="0x7f0a0539" />
-    <public type="id" name="profile_strip_discriminator" id="0x7f0a053a" />
-    <public type="id" name="profile_strip_mentions" id="0x7f0a053b" />
-    <public type="id" name="profile_strip_name" id="0x7f0a053c" />
-    <public type="id" name="profile_strip_search" id="0x7f0a053d" />
-    <public type="id" name="profile_strip_settings" id="0x7f0a053e" />
-    <public type="id" name="profile_strip_status" id="0x7f0a053f" />
-    <public type="id" name="progress_bar" id="0x7f0a0540" />
-    <public type="id" name="progress_cancel_centered" id="0x7f0a0541" />
-    <public type="id" name="progress_cancel_top" id="0x7f0a0542" />
-    <public type="id" name="progress_circular" id="0x7f0a0543" />
-    <public type="id" name="progress_file_image" id="0x7f0a0544" />
-    <public type="id" name="progress_horizontal" id="0x7f0a0545" />
-    <public type="id" name="progress_subtext" id="0x7f0a0546" />
-    <public type="id" name="progress_text" id="0x7f0a0547" />
-    <public type="id" name="prune_user_cancel" id="0x7f0a0548" />
-    <public type="id" name="prune_user_header" id="0x7f0a0549" />
-    <public type="id" name="prune_user_prune" id="0x7f0a054a" />
-    <public type="id" name="prune_users_estimate_text" id="0x7f0a054b" />
-    <public type="id" name="prune_users_history_1_radio" id="0x7f0a054c" />
-    <public type="id" name="prune_users_history_2_radio" id="0x7f0a054d" />
-    <public type="id" name="prune_users_history_3_radio" id="0x7f0a054e" />
-    <public type="id" name="prune_users_loading_progressbar" id="0x7f0a054f" />
-    <public type="id" name="radio" id="0x7f0a0550" />
-    <public type="id" name="reaction_counter_text_1" id="0x7f0a0551" />
-    <public type="id" name="reaction_counter_text_2" id="0x7f0a0552" />
-    <public type="id" name="reaction_counter_text_switcher" id="0x7f0a0553" />
-    <public type="id" name="reaction_emoji_text" id="0x7f0a0554" />
-    <public type="id" name="reaction_quick_add" id="0x7f0a0555" />
-    <public type="id" name="redEye" id="0x7f0a0556" />
-    <public type="id" name="restart" id="0x7f0a0557" />
-    <public type="id" name="result_count" id="0x7f0a0558" />
-    <public type="id" name="results_rv" id="0x7f0a0559" />
-    <public type="id" name="reverse" id="0x7f0a055a" />
-    <public type="id" name="rich_presence_container" id="0x7f0a055b" />
-    <public type="id" name="rich_presence_container_data" id="0x7f0a055c" />
-    <public type="id" name="rich_presence_details" id="0x7f0a055d" />
-    <public type="id" name="rich_presence_header" id="0x7f0a055e" />
-    <public type="id" name="rich_presence_image_large" id="0x7f0a055f" />
-    <public type="id" name="rich_presence_image_small" id="0x7f0a0560" />
-    <public type="id" name="rich_presence_music_duration" id="0x7f0a0561" />
-    <public type="id" name="rich_presence_music_elapsed" id="0x7f0a0562" />
-    <public type="id" name="rich_presence_play_button" id="0x7f0a0563" />
-    <public type="id" name="rich_presence_play_button_text" id="0x7f0a0564" />
-    <public type="id" name="rich_presence_state" id="0x7f0a0565" />
-    <public type="id" name="rich_presence_superbar" id="0x7f0a0566" />
-    <public type="id" name="rich_presence_time" id="0x7f0a0567" />
-    <public type="id" name="rich_presence_title" id="0x7f0a0568" />
-    <public type="id" name="rich_presence_watch_button" id="0x7f0a0569" />
-    <public type="id" name="right" id="0x7f0a056a" />
-    <public type="id" name="right_icon" id="0x7f0a056b" />
-    <public type="id" name="right_side" id="0x7f0a056c" />
-    <public type="id" name="role_item_checked_setting" id="0x7f0a056d" />
-    <public type="id" name="role_settings_add_reactions" id="0x7f0a056e" />
-    <public type="id" name="role_settings_administrator" id="0x7f0a056f" />
-    <public type="id" name="role_settings_attach_files" id="0x7f0a0570" />
-    <public type="id" name="role_settings_ban_members" id="0x7f0a0571" />
-    <public type="id" name="role_settings_change_nickname" id="0x7f0a0572" />
-    <public type="id" name="role_settings_color_disabled_overlay" id="0x7f0a0573" />
-    <public type="id" name="role_settings_color_selector_container" id="0x7f0a0574" />
-    <public type="id" name="role_settings_create_instant_invite" id="0x7f0a0575" />
-    <public type="id" name="role_settings_current_color_display" id="0x7f0a0576" />
-    <public type="id" name="role_settings_edit_name_disabled_overlay" id="0x7f0a0577" />
-    <public type="id" name="role_settings_embed_links" id="0x7f0a0578" />
-    <public type="id" name="role_settings_hoist_checkedsetting" id="0x7f0a0579" />
-    <public type="id" name="role_settings_kick_members" id="0x7f0a057a" />
-    <public type="id" name="role_settings_manage_channels" id="0x7f0a057b" />
-    <public type="id" name="role_settings_manage_emojis" id="0x7f0a057c" />
-    <public type="id" name="role_settings_manage_messages" id="0x7f0a057d" />
-    <public type="id" name="role_settings_manage_nicknames" id="0x7f0a057e" />
-    <public type="id" name="role_settings_manage_roles" id="0x7f0a057f" />
-    <public type="id" name="role_settings_manage_server" id="0x7f0a0580" />
-    <public type="id" name="role_settings_manage_webhooks" id="0x7f0a0581" />
-    <public type="id" name="role_settings_mention_everyone" id="0x7f0a0582" />
-    <public type="id" name="role_settings_mentionable_checkedsetting" id="0x7f0a0583" />
-    <public type="id" name="role_settings_overview_scroll" id="0x7f0a0584" />
-    <public type="id" name="role_settings_read_message_history" id="0x7f0a0585" />
-    <public type="id" name="role_settings_read_messages" id="0x7f0a0586" />
-    <public type="id" name="role_settings_send_messages" id="0x7f0a0587" />
-    <public type="id" name="role_settings_send_tts_messages" id="0x7f0a0588" />
-    <public type="id" name="role_settings_use_external_emojis" id="0x7f0a0589" />
-    <public type="id" name="role_settings_view_audit_log" id="0x7f0a058a" />
-    <public type="id" name="role_settings_voice_connect" id="0x7f0a058b" />
-    <public type="id" name="role_settings_voice_deafen_members" id="0x7f0a058c" />
-    <public type="id" name="role_settings_voice_move_members" id="0x7f0a058d" />
-    <public type="id" name="role_settings_voice_mute_members" id="0x7f0a058e" />
-    <public type="id" name="role_settings_voice_speak" id="0x7f0a058f" />
-    <public type="id" name="role_settings_voice_use_voice_activity" id="0x7f0a0590" />
-    <public type="id" name="role_spinner_item_textview" id="0x7f0a0591" />
-    <public type="id" name="roles_list_add_role_fab" id="0x7f0a0592" />
-    <public type="id" name="rotate_scroll_wheel" id="0x7f0a0593" />
-    <public type="id" name="row" id="0x7f0a0594" />
-    <public type="id" name="row_reverse" id="0x7f0a0595" />
-    <public type="id" name="save_image_matrix" id="0x7f0a0596" />
-    <public type="id" name="save_non_transition_alpha" id="0x7f0a0597" />
-    <public type="id" name="save_scale_type" id="0x7f0a0598" />
-    <public type="id" name="scale_scroll_wheel" id="0x7f0a0599" />
-    <public type="id" name="screen" id="0x7f0a059a" />
-    <public type="id" name="scroll" id="0x7f0a059b" />
-    <public type="id" name="scrollIndicatorDown" id="0x7f0a059c" />
-    <public type="id" name="scrollIndicatorUp" id="0x7f0a059d" />
-    <public type="id" name="scrollView" id="0x7f0a059e" />
-    <public type="id" name="scroll_view" id="0x7f0a059f" />
-    <public type="id" name="scrollable" id="0x7f0a05a0" />
-    <public type="id" name="search_back" id="0x7f0a05a1" />
-    <public type="id" name="search_badge" id="0x7f0a05a2" />
-    <public type="id" name="search_bar" id="0x7f0a05a3" />
-    <public type="id" name="search_button" id="0x7f0a05a4" />
-    <public type="id" name="search_clear" id="0x7f0a05a5" />
-    <public type="id" name="search_close_btn" id="0x7f0a05a6" />
-    <public type="id" name="search_edit_frame" id="0x7f0a05a7" />
-    <public type="id" name="search_filter" id="0x7f0a05a8" />
-    <public type="id" name="search_flipper" id="0x7f0a05a9" />
-    <public type="id" name="search_go_btn" id="0x7f0a05aa" />
-    <public type="id" name="search_input" id="0x7f0a05ab" />
-    <public type="id" name="search_mag_icon" id="0x7f0a05ac" />
-    <public type="id" name="search_plate" id="0x7f0a05ad" />
-    <public type="id" name="search_results_list" id="0x7f0a05ae" />
-    <public type="id" name="search_send_query_fab" id="0x7f0a05af" />
-    <public type="id" name="search_src_text" id="0x7f0a05b0" />
-    <public type="id" name="search_suggestion_item_channel_container" id="0x7f0a05b1" />
-    <public type="id" name="search_suggestion_item_has_container" id="0x7f0a05b2" />
-    <public type="id" name="search_suggestion_item_recent_query_container" id="0x7f0a05b3" />
-    <public type="id" name="search_suggestion_item_user_container" id="0x7f0a05b4" />
-    <public type="id" name="search_suggestions_item_channel_icon" id="0x7f0a05b5" />
-    <public type="id" name="search_suggestions_item_channel_text" id="0x7f0a05b6" />
-    <public type="id" name="search_suggestions_item_has_icon" id="0x7f0a05b7" />
-    <public type="id" name="search_suggestions_item_has_text" id="0x7f0a05b8" />
-    <public type="id" name="search_suggestions_item_recent_query_icon" id="0x7f0a05b9" />
-    <public type="id" name="search_suggestions_item_recent_query_text" id="0x7f0a05ba" />
-    <public type="id" name="search_suggestions_recycler" id="0x7f0a05bb" />
-    <public type="id" name="search_voice_btn" id="0x7f0a05bc" />
-    <public type="id" name="select_dialog_listview" id="0x7f0a05bd" />
-    <public type="id" name="selected" id="0x7f0a05be" />
-    <public type="id" name="selected_checkmark" id="0x7f0a05bf" />
-    <public type="id" name="selection_indicator" id="0x7f0a05c0" />
-    <public type="id" name="send_btn" id="0x7f0a05c1" />
-    <public type="id" name="server_boost_status_empty_text" id="0x7f0a05c2" />
-    <public type="id" name="server_notifications_everyone_switch" id="0x7f0a05c3" />
-    <public type="id" name="server_notifications_frequency_0_radio" id="0x7f0a05c4" />
-    <public type="id" name="server_notifications_frequency_1_radio" id="0x7f0a05c5" />
-    <public type="id" name="server_notifications_frequency_2_radio" id="0x7f0a05c6" />
-    <public type="id" name="server_notifications_frequency_wrap" id="0x7f0a05c7" />
-    <public type="id" name="server_notifications_mute_check" id="0x7f0a05c8" />
-    <public type="id" name="server_notifications_push_switch" id="0x7f0a05c9" />
-    <public type="id" name="server_settings_audit_logs_action_filter" id="0x7f0a05ca" />
-    <public type="id" name="server_settings_audit_logs_action_filter_container" id="0x7f0a05cb" />
-    <public type="id" name="server_settings_audit_logs_recycler" id="0x7f0a05cc" />
-    <public type="id" name="server_settings_audit_logs_user_filter" id="0x7f0a05cd" />
-    <public type="id" name="server_settings_audit_logs_user_filter_container" id="0x7f0a05ce" />
-    <public type="id" name="server_settings_audit_logs_view_flipper" id="0x7f0a05cf" />
-    <public type="id" name="server_settings_audit_logs_view_results_flipper" id="0x7f0a05d0" />
-    <public type="id" name="server_settings_bans_option" id="0x7f0a05d1" />
-    <public type="id" name="server_settings_bans_recycler" id="0x7f0a05d2" />
-    <public type="id" name="server_settings_bans_search" id="0x7f0a05d3" />
-    <public type="id" name="server_settings_bans_view_flipper" id="0x7f0a05d4" />
-    <public type="id" name="server_settings_channels_create_channel" id="0x7f0a05d5" />
-    <public type="id" name="server_settings_channels_sort_actions_category" id="0x7f0a05d6" />
-    <public type="id" name="server_settings_channels_sort_actions_text" id="0x7f0a05d7" />
-    <public type="id" name="server_settings_channels_sort_actions_voice" id="0x7f0a05d8" />
-    <public type="id" name="server_settings_channels_text_recycler" id="0x7f0a05d9" />
-    <public type="id" name="server_settings_confirm_disable_integration_body" id="0x7f0a05da" />
-    <public type="id" name="server_settings_confirm_disable_integration_cancel" id="0x7f0a05db" />
-    <public type="id" name="server_settings_confirm_disable_integration_confirm" id="0x7f0a05dc" />
-    <public type="id" name="server_settings_confirm_disable_integration_header" id="0x7f0a05dd" />
-    <public type="id" name="server_settings_delete_server_cancel" id="0x7f0a05de" />
-    <public type="id" name="server_settings_delete_server_confirm" id="0x7f0a05df" />
-    <public type="id" name="server_settings_delete_server_header" id="0x7f0a05e0" />
-    <public type="id" name="server_settings_delete_server_mfa_code" id="0x7f0a05e1" />
-    <public type="id" name="server_settings_delete_server_mfa_wrap" id="0x7f0a05e2" />
-    <public type="id" name="server_settings_delete_server_text" id="0x7f0a05e3" />
-    <public type="id" name="server_settings_emojis_avatar" id="0x7f0a05e4" />
-    <public type="id" name="server_settings_emojis_container" id="0x7f0a05e5" />
-    <public type="id" name="server_settings_emojis_edit_alias" id="0x7f0a05e6" />
-    <public type="id" name="server_settings_emojis_edit_alias_save" id="0x7f0a05e7" />
-    <public type="id" name="server_settings_emojis_name" id="0x7f0a05e8" />
-    <public type="id" name="server_settings_emojis_option" id="0x7f0a05e9" />
-    <public type="id" name="server_settings_emojis_overflow" id="0x7f0a05ea" />
-    <public type="id" name="server_settings_emojis_username" id="0x7f0a05eb" />
-    <public type="id" name="server_settings_emojis_username_avatar" id="0x7f0a05ec" />
-    <public type="id" name="server_settings_instant_invites_option" id="0x7f0a05ed" />
-    <public type="id" name="server_settings_instant_invites_recycler" id="0x7f0a05ee" />
-    <public type="id" name="server_settings_instant_invites_view_flipper" id="0x7f0a05ef" />
-    <public type="id" name="server_settings_members_header_container" id="0x7f0a05f0" />
-    <public type="id" name="server_settings_members_name_search" id="0x7f0a05f1" />
-    <public type="id" name="server_settings_members_option" id="0x7f0a05f2" />
-    <public type="id" name="server_settings_members_recycler" id="0x7f0a05f3" />
-    <public type="id" name="server_settings_members_roles_spinner" id="0x7f0a05f4" />
-    <public type="id" name="server_settings_members_view_flipper" id="0x7f0a05f5" />
-    <public type="id" name="server_settings_moderation_explicit_1" id="0x7f0a05f6" />
-    <public type="id" name="server_settings_moderation_explicit_2" id="0x7f0a05f7" />
-    <public type="id" name="server_settings_moderation_explicit_3" id="0x7f0a05f8" />
-    <public type="id" name="server_settings_moderation_verification_1" id="0x7f0a05f9" />
-    <public type="id" name="server_settings_moderation_verification_2" id="0x7f0a05fa" />
-    <public type="id" name="server_settings_moderation_verification_3" id="0x7f0a05fb" />
-    <public type="id" name="server_settings_moderation_verification_4" id="0x7f0a05fc" />
-    <public type="id" name="server_settings_moderation_verification_5" id="0x7f0a05fd" />
-    <public type="id" name="server_settings_option_audit_log" id="0x7f0a05fe" />
-    <public type="id" name="server_settings_option_channels" id="0x7f0a05ff" />
-    <public type="id" name="server_settings_option_integrations" id="0x7f0a0600" />
-    <public type="id" name="server_settings_option_moderation" id="0x7f0a0601" />
-    <public type="id" name="server_settings_option_overview" id="0x7f0a0602" />
-    <public type="id" name="server_settings_option_security" id="0x7f0a0603" />
-    <public type="id" name="server_settings_option_vanity_url" id="0x7f0a0604" />
-    <public type="id" name="server_settings_overview_afk_channel" id="0x7f0a0605" />
-    <public type="id" name="server_settings_overview_afk_channel_wrap" id="0x7f0a0606" />
-    <public type="id" name="server_settings_overview_afk_timeout" id="0x7f0a0607" />
-    <public type="id" name="server_settings_overview_afk_timeout_01" id="0x7f0a0608" />
-    <public type="id" name="server_settings_overview_afk_timeout_05" id="0x7f0a0609" />
-    <public type="id" name="server_settings_overview_afk_timeout_15" id="0x7f0a060a" />
-    <public type="id" name="server_settings_overview_afk_timeout_30" id="0x7f0a060b" />
-    <public type="id" name="server_settings_overview_afk_timeout_60" id="0x7f0a060c" />
-    <public type="id" name="server_settings_overview_afk_timeout_wrap" id="0x7f0a060d" />
-    <public type="id" name="server_settings_overview_icon" id="0x7f0a060e" />
-    <public type="id" name="server_settings_overview_icon_label" id="0x7f0a060f" />
-    <public type="id" name="server_settings_overview_icon_name_container" id="0x7f0a0610" />
-    <public type="id" name="server_settings_overview_icon_remove" id="0x7f0a0611" />
-    <public type="id" name="server_settings_overview_icon_text" id="0x7f0a0612" />
-    <public type="id" name="server_settings_overview_name" id="0x7f0a0613" />
-    <public type="id" name="server_settings_overview_notification_all" id="0x7f0a0614" />
-    <public type="id" name="server_settings_overview_notification_only_mentions" id="0x7f0a0615" />
-    <public type="id" name="server_settings_overview_region" id="0x7f0a0616" />
-    <public type="id" name="server_settings_overview_region_flag" id="0x7f0a0617" />
-    <public type="id" name="server_settings_overview_region_item_name" id="0x7f0a0618" />
-    <public type="id" name="server_settings_overview_region_list" id="0x7f0a0619" />
-    <public type="id" name="server_settings_overview_region_wrap" id="0x7f0a061a" />
-    <public type="id" name="server_settings_overview_save" id="0x7f0a061b" />
-    <public type="id" name="server_settings_overview_scroll" id="0x7f0a061c" />
-    <public type="id" name="server_settings_overview_system_channel" id="0x7f0a061d" />
-    <public type="id" name="server_settings_overview_system_channel_boost" id="0x7f0a061e" />
-    <public type="id" name="server_settings_overview_system_channel_join" id="0x7f0a061f" />
-    <public type="id" name="server_settings_overview_system_channel_wrap" id="0x7f0a0620" />
-    <public type="id" name="server_settings_overview_upload_banner" id="0x7f0a0621" />
-    <public type="id" name="server_settings_overview_upload_banner_container" id="0x7f0a0622" />
-    <public type="id" name="server_settings_overview_upload_banner_fab" id="0x7f0a0623" />
-    <public type="id" name="server_settings_overview_upload_banner_learn_more" id="0x7f0a0624" />
-    <public type="id" name="server_settings_overview_upload_banner_nitro_tier" id="0x7f0a0625" />
-    <public type="id" name="server_settings_overview_upload_banner_remove" id="0x7f0a0626" />
-    <public type="id" name="server_settings_overview_upload_banner_unlock" id="0x7f0a0627" />
-    <public type="id" name="server_settings_overview_upload_splash" id="0x7f0a0628" />
-    <public type="id" name="server_settings_overview_upload_splash_container" id="0x7f0a0629" />
-    <public type="id" name="server_settings_overview_upload_splash_fab" id="0x7f0a062a" />
-    <public type="id" name="server_settings_overview_upload_splash_learn_more" id="0x7f0a062b" />
-    <public type="id" name="server_settings_overview_upload_splash_nitro_tier" id="0x7f0a062c" />
-    <public type="id" name="server_settings_overview_upload_splash_remove" id="0x7f0a062d" />
-    <public type="id" name="server_settings_overview_upload_splash_unlock" id="0x7f0a062e" />
-    <public type="id" name="server_settings_role_item_bottom_divider" id="0x7f0a062f" />
-    <public type="id" name="server_settings_role_item_divider_targeted" id="0x7f0a0630" />
-    <public type="id" name="server_settings_role_item_drag_overlay" id="0x7f0a0631" />
-    <public type="id" name="server_settings_role_item_lock_indicator" id="0x7f0a0632" />
-    <public type="id" name="server_settings_role_item_name" id="0x7f0a0633" />
-    <public type="id" name="server_settings_roles_option" id="0x7f0a0634" />
-    <public type="id" name="server_settings_roles_recycler" id="0x7f0a0635" />
-    <public type="id" name="server_settings_section_general_settings" id="0x7f0a0636" />
-    <public type="id" name="server_settings_section_user_management" id="0x7f0a0637" />
-    <public type="id" name="server_settings_section_user_management_divider" id="0x7f0a0638" />
-    <public type="id" name="server_settings_security_dialog_cancel" id="0x7f0a0639" />
-    <public type="id" name="server_settings_security_dialog_confirm" id="0x7f0a063a" />
-    <public type="id" name="server_settings_security_label" id="0x7f0a063b" />
-    <public type="id" name="server_settings_security_server_mfa_code" id="0x7f0a063c" />
-    <public type="id" name="server_settings_security_toggle_mfa_button" id="0x7f0a063d" />
-    <public type="id" name="server_settings_server_icon" id="0x7f0a063e" />
-    <public type="id" name="server_settings_server_icon_text" id="0x7f0a063f" />
-    <public type="id" name="server_settings_server_name" id="0x7f0a0640" />
-    <public type="id" name="server_settings_vanity_input" id="0x7f0a0641" />
-    <public type="id" name="server_settings_vanity_url_current_url" id="0x7f0a0642" />
-    <public type="id" name="server_settings_vanity_url_error_text" id="0x7f0a0643" />
-    <public type="id" name="server_settings_vanity_url_input_container" id="0x7f0a0644" />
-    <public type="id" name="server_settings_vanity_url_loading_indicator" id="0x7f0a0645" />
-    <public type="id" name="server_settings_vanity_url_prefix" id="0x7f0a0646" />
-    <public type="id" name="server_settings_vanity_url_remove" id="0x7f0a0647" />
-    <public type="id" name="server_settings_vanity_url_save" id="0x7f0a0648" />
-    <public type="id" name="setting_button" id="0x7f0a0649" />
-    <public type="id" name="setting_container" id="0x7f0a064a" />
-    <public type="id" name="setting_disabled_overlay" id="0x7f0a064b" />
-    <public type="id" name="setting_label" id="0x7f0a064c" />
-    <public type="id" name="setting_subtext" id="0x7f0a064d" />
-    <public type="id" name="settings_account" id="0x7f0a064e" />
-    <public type="id" name="settings_account_avatar" id="0x7f0a064f" />
-    <public type="id" name="settings_account_avatar_container" id="0x7f0a0650" />
-    <public type="id" name="settings_account_avatar_edit" id="0x7f0a0651" />
-    <public type="id" name="settings_account_avatar_wrap" id="0x7f0a0652" />
-    <public type="id" name="settings_account_change_password" id="0x7f0a0653" />
-    <public type="id" name="settings_account_edit" id="0x7f0a0654" />
-    <public type="id" name="settings_account_email" id="0x7f0a0655" />
-    <public type="id" name="settings_account_mfa_container" id="0x7f0a0656" />
-    <public type="id" name="settings_account_mfa_disabled_container" id="0x7f0a0657" />
-    <public type="id" name="settings_account_mfa_enable" id="0x7f0a0658" />
-    <public type="id" name="settings_account_mfa_enabled_container" id="0x7f0a0659" />
-    <public type="id" name="settings_account_mfa_enabled_header" id="0x7f0a065a" />
-    <public type="id" name="settings_account_mfa_flipper" id="0x7f0a065b" />
-    <public type="id" name="settings_account_mfa_lottie" id="0x7f0a065c" />
-    <public type="id" name="settings_account_mfa_sales_pitch" id="0x7f0a065d" />
-    <public type="id" name="settings_account_private_data_delete" id="0x7f0a065e" />
-    <public type="id" name="settings_account_private_data_disable" id="0x7f0a065f" />
-    <public type="id" name="settings_account_private_data_wrap" id="0x7f0a0660" />
-    <public type="id" name="settings_account_remove_avatar" id="0x7f0a0661" />
-    <public type="id" name="settings_account_remove_two_fa" id="0x7f0a0662" />
-    <public type="id" name="settings_account_save" id="0x7f0a0663" />
-    <public type="id" name="settings_account_scroll" id="0x7f0a0664" />
-    <public type="id" name="settings_account_sms_backup" id="0x7f0a0665" />
-    <public type="id" name="settings_account_sms_phone" id="0x7f0a0666" />
-    <public type="id" name="settings_account_tag" id="0x7f0a0667" />
-    <public type="id" name="settings_account_verification" id="0x7f0a0668" />
-    <public type="id" name="settings_account_verification_resend" id="0x7f0a0669" />
-    <public type="id" name="settings_account_view_backup_codes" id="0x7f0a066a" />
-    <public type="id" name="settings_acknowledgements" id="0x7f0a066b" />
-    <public type="id" name="settings_app_info" id="0x7f0a066c" />
-    <public type="id" name="settings_appearance" id="0x7f0a066d" />
-    <public type="id" name="settings_appearance_font_scale_platform" id="0x7f0a066e" />
-    <public type="id" name="settings_appearance_font_scaling_container" id="0x7f0a066f" />
-    <public type="id" name="settings_appearance_font_scaling_reset" id="0x7f0a0670" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar" id="0x7f0a0671" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar_text_left" id="0x7f0a0672" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar_text_right" id="0x7f0a0673" />
-    <public type="id" name="settings_appearance_sync_switch" id="0x7f0a0674" />
-    <public type="id" name="settings_appearance_theme_dark_radio" id="0x7f0a0675" />
-    <public type="id" name="settings_appearance_theme_light_radio" id="0x7f0a0676" />
-    <public type="id" name="settings_appearance_theme_pure_evil_radio" id="0x7f0a0677" />
-    <public type="id" name="settings_authorized_apps" id="0x7f0a0678" />
-    <public type="id" name="settings_backup_codes_generate" id="0x7f0a0679" />
-    <public type="id" name="settings_backup_codes_info" id="0x7f0a067a" />
-    <public type="id" name="settings_backup_codes_rv" id="0x7f0a067b" />
-    <public type="id" name="settings_behavior" id="0x7f0a067c" />
-    <public type="id" name="settings_behavior_back_button_toggle" id="0x7f0a067d" />
-    <public type="id" name="settings_behavior_browser_switch" id="0x7f0a067e" />
-    <public type="id" name="settings_behavior_dev_mode_switch" id="0x7f0a067f" />
-    <public type="id" name="settings_behavior_shift_send_toggle" id="0x7f0a0680" />
-    <public type="id" name="settings_billing" id="0x7f0a0681" />
-    <public type="id" name="settings_billing_view_pager" id="0x7f0a0682" />
-    <public type="id" name="settings_bitrate_help" id="0x7f0a0683" />
-    <public type="id" name="settings_boost_flipper" id="0x7f0a0684" />
-    <public type="id" name="settings_boost_no_sub_banner" id="0x7f0a0685" />
-    <public type="id" name="settings_boost_no_sub_learn_more" id="0x7f0a0686" />
-    <public type="id" name="settings_boost_no_sub_learn_more_text" id="0x7f0a0687" />
-    <public type="id" name="settings_boost_no_sub_logo" id="0x7f0a0688" />
-    <public type="id" name="settings_boost_recycler" id="0x7f0a0689" />
-    <public type="id" name="settings_boost_retry" id="0x7f0a068a" />
-    <public type="id" name="settings_boost_subtext" id="0x7f0a068b" />
-    <public type="id" name="settings_changelog" id="0x7f0a068c" />
-    <public type="id" name="settings_channel_list_category_item_drag" id="0x7f0a068d" />
-    <public type="id" name="settings_channel_list_category_item_text" id="0x7f0a068e" />
-    <public type="id" name="settings_channel_list_item_drag" id="0x7f0a068f" />
-    <public type="id" name="settings_channel_list_item_hash" id="0x7f0a0690" />
-    <public type="id" name="settings_channel_list_item_name" id="0x7f0a0691" />
-    <public type="id" name="settings_channel_list_item_selected_overlay" id="0x7f0a0692" />
-    <public type="id" name="settings_connections" id="0x7f0a0693" />
-    <public type="id" name="settings_developer_options" id="0x7f0a0694" />
-    <public type="id" name="settings_developer_options_divider" id="0x7f0a0695" />
-    <public type="id" name="settings_developer_options_header" id="0x7f0a0696" />
-    <public type="id" name="settings_game_activity" id="0x7f0a0697" />
-    <public type="id" name="settings_games_detection_section" id="0x7f0a0698" />
-    <public type="id" name="settings_games_playing_container" id="0x7f0a0699" />
-    <public type="id" name="settings_games_playing_icon" id="0x7f0a069a" />
-    <public type="id" name="settings_games_playing_subtitle" id="0x7f0a069b" />
-    <public type="id" name="settings_games_playing_title" id="0x7f0a069c" />
-    <public type="id" name="settings_games_status_cs" id="0x7f0a069d" />
-    <public type="id" name="settings_games_track_cs" id="0x7f0a069e" />
-    <public type="id" name="settings_gifting_flipper" id="0x7f0a069f" />
-    <public type="id" name="settings_gifting_gift_code_input" id="0x7f0a06a0" />
-    <public type="id" name="settings_gifting_gift_code_input_progress" id="0x7f0a06a1" />
-    <public type="id" name="settings_gifting_gift_code_input_wrap" id="0x7f0a06a2" />
-    <public type="id" name="settings_gifting_nitro_classic_learn_more" id="0x7f0a06a3" />
-    <public type="id" name="settings_gifting_nitro_classic_monthly" id="0x7f0a06a4" />
-    <public type="id" name="settings_gifting_nitro_classic_yearly" id="0x7f0a06a5" />
-    <public type="id" name="settings_gifting_nitro_learn_more" id="0x7f0a06a6" />
-    <public type="id" name="settings_gifting_nitro_monthly" id="0x7f0a06a7" />
-    <public type="id" name="settings_gifting_nitro_yearly" id="0x7f0a06a8" />
-    <public type="id" name="settings_gifting_retry" id="0x7f0a06a9" />
-    <public type="id" name="settings_giftting_inventory_recycler" id="0x7f0a06aa" />
-    <public type="id" name="settings_group_icon" id="0x7f0a06ab" />
-    <public type="id" name="settings_group_icon_label" id="0x7f0a06ac" />
-    <public type="id" name="settings_group_icon_remove" id="0x7f0a06ad" />
-    <public type="id" name="settings_inapp_notifs_switch" id="0x7f0a06ae" />
-    <public type="id" name="settings_language" id="0x7f0a06af" />
-    <public type="id" name="settings_language_current" id="0x7f0a06b0" />
-    <public type="id" name="settings_language_current_flag" id="0x7f0a06b1" />
-    <public type="id" name="settings_language_current_text" id="0x7f0a06b2" />
-    <public type="id" name="settings_language_select_item_name" id="0x7f0a06b3" />
-    <public type="id" name="settings_language_select_item_name_localized" id="0x7f0a06b4" />
-    <public type="id" name="settings_language_select_list" id="0x7f0a06b5" />
-    <public type="id" name="settings_language_sync_check" id="0x7f0a06b6" />
-    <public type="id" name="settings_nitro" id="0x7f0a06b7" />
-    <public type="id" name="settings_nitro_boosting" id="0x7f0a06b8" />
-    <public type="id" name="settings_nitro_gifting" id="0x7f0a06b9" />
-    <public type="id" name="settings_nitro_settings" id="0x7f0a06ba" />
-    <public type="id" name="settings_notification_os" id="0x7f0a06bb" />
-    <public type="id" name="settings_notification_os_label" id="0x7f0a06bc" />
-    <public type="id" name="settings_notification_switch" id="0x7f0a06bd" />
-    <public type="id" name="settings_notifications" id="0x7f0a06be" />
-    <public type="id" name="settings_notifications_blink" id="0x7f0a06bf" />
-    <public type="id" name="settings_notifications_enabled" id="0x7f0a06c0" />
-    <public type="id" name="settings_notifications_mute_all" id="0x7f0a06c1" />
-    <public type="id" name="settings_notifications_vibrations" id="0x7f0a06c2" />
-    <public type="id" name="settings_notifications_wake_lock" id="0x7f0a06c3" />
-    <public type="id" name="settings_notifications_wrap" id="0x7f0a06c4" />
-    <public type="id" name="settings_privacy" id="0x7f0a06c5" />
-    <public type="id" name="settings_privacy_basic_service" id="0x7f0a06c6" />
-    <public type="id" name="settings_privacy_controls" id="0x7f0a06c7" />
-    <public type="id" name="settings_privacy_default_restricted_guilds" id="0x7f0a06c8" />
-    <public type="id" name="settings_privacy_defaults_existing_no" id="0x7f0a06c9" />
-    <public type="id" name="settings_privacy_defaults_existing_yes" id="0x7f0a06ca" />
-    <public type="id" name="settings_privacy_explicit_0" id="0x7f0a06cb" />
-    <public type="id" name="settings_privacy_explicit_1" id="0x7f0a06cc" />
-    <public type="id" name="settings_privacy_explicit_2" id="0x7f0a06cd" />
-    <public type="id" name="settings_privacy_friend_source_0" id="0x7f0a06ce" />
-    <public type="id" name="settings_privacy_friend_source_1" id="0x7f0a06cf" />
-    <public type="id" name="settings_privacy_friend_source_2" id="0x7f0a06d0" />
-    <public type="id" name="settings_privacy_personalization" id="0x7f0a06d1" />
-    <public type="id" name="settings_privacy_request_data" id="0x7f0a06d2" />
-    <public type="id" name="settings_privacy_request_data_link" id="0x7f0a06d3" />
-    <public type="id" name="settings_privacy_statistics" id="0x7f0a06d4" />
-    <public type="id" name="settings_support" id="0x7f0a06d5" />
-    <public type="id" name="settings_text_images" id="0x7f0a06d6" />
-    <public type="id" name="settings_text_images_allow_animate_emoji_switch" id="0x7f0a06d7" />
-    <public type="id" name="settings_text_images_attachments_toggle" id="0x7f0a06d8" />
-    <public type="id" name="settings_text_images_embeds_toggle" id="0x7f0a06d9" />
-    <public type="id" name="settings_text_images_links_toggle" id="0x7f0a06da" />
-    <public type="id" name="settings_text_images_sync_toggle" id="0x7f0a06db" />
-    <public type="id" name="settings_user_limit_help" id="0x7f0a06dc" />
-    <public type="id" name="settings_voice" id="0x7f0a06dd" />
-    <public type="id" name="settings_voice_audio_mode_call" id="0x7f0a06de" />
-    <public type="id" name="settings_voice_audio_mode_communication" id="0x7f0a06df" />
-    <public type="id" name="settings_voice_auto_vad_toggle" id="0x7f0a06e0" />
-    <public type="id" name="settings_voice_echo_cancellation_toggle" id="0x7f0a06e1" />
-    <public type="id" name="settings_voice_enable_hardware_scaling_toggle" id="0x7f0a06e2" />
-    <public type="id" name="settings_voice_gain_control_toggle" id="0x7f0a06e3" />
-    <public type="id" name="settings_voice_input_mode_radio_1" id="0x7f0a06e4" />
-    <public type="id" name="settings_voice_input_mode_radio_2" id="0x7f0a06e5" />
-    <public type="id" name="settings_voice_noise_suppression_toggle" id="0x7f0a06e6" />
-    <public type="id" name="settings_voice_opensles_default" id="0x7f0a06e7" />
-    <public type="id" name="settings_voice_opensles_force_disabled" id="0x7f0a06e8" />
-    <public type="id" name="settings_voice_opensles_force_enabled" id="0x7f0a06e9" />
-    <public type="id" name="settings_voice_output_volume" id="0x7f0a06ea" />
-    <public type="id" name="settings_voice_output_volume_wrap" id="0x7f0a06eb" />
-    <public type="id" name="settings_voice_overlay_toggle" id="0x7f0a06ec" />
-    <public type="id" name="settings_voice_overlay_wrap" id="0x7f0a06ed" />
-    <public type="id" name="settings_voice_sensitivity_automatic" id="0x7f0a06ee" />
-    <public type="id" name="settings_voice_sensitivity_header" id="0x7f0a06ef" />
-    <public type="id" name="settings_voice_sensitivity_label" id="0x7f0a06f0" />
-    <public type="id" name="settings_voice_sensitivity_manual" id="0x7f0a06f1" />
-    <public type="id" name="settings_voice_sensitivity_test_button" id="0x7f0a06f2" />
-    <public type="id" name="settings_voice_sensitivity_testing_container" id="0x7f0a06f3" />
-    <public type="id" name="settings_voice_sensitivity_wrap" id="0x7f0a06f4" />
-    <public type="id" name="settings_voice_use_speaker_toggle" id="0x7f0a06f5" />
-    <public type="id" name="settings_voice_video_container" id="0x7f0a06f6" />
-    <public type="id" name="shortcut" id="0x7f0a06f7" />
-    <public type="id" name="showCustom" id="0x7f0a06f8" />
-    <public type="id" name="showHome" id="0x7f0a06f9" />
-    <public type="id" name="showTitle" id="0x7f0a06fa" />
-    <public type="id" name="smallLabel" id="0x7f0a06fb" />
-    <public type="id" name="snackbar_action" id="0x7f0a06fc" />
-    <public type="id" name="snackbar_text" id="0x7f0a06fd" />
-    <public type="id" name="snap" id="0x7f0a06fe" />
-    <public type="id" name="snapMargins" id="0x7f0a06ff" />
-    <public type="id" name="software" id="0x7f0a0700" />
-    <public type="id" name="space_around" id="0x7f0a0701" />
-    <public type="id" name="space_between" id="0x7f0a0702" />
-    <public type="id" name="spacer" id="0x7f0a0703" />
-    <public type="id" name="split_action_bar" id="0x7f0a0704" />
-    <public type="id" name="spread" id="0x7f0a0705" />
-    <public type="id" name="spread_inside" id="0x7f0a0706" />
-    <public type="id" name="src_atop" id="0x7f0a0707" />
-    <public type="id" name="src_in" id="0x7f0a0708" />
-    <public type="id" name="src_over" id="0x7f0a0709" />
-    <public type="id" name="src_toggle" id="0x7f0a070a" />
-    <public type="id" name="standard" id="0x7f0a070b" />
-    <public type="id" name="start" id="0x7f0a070c" />
-    <public type="id" name="state_aspect_ratio" id="0x7f0a070d" />
-    <public type="id" name="state_rotate" id="0x7f0a070e" />
-    <public type="id" name="state_scale" id="0x7f0a070f" />
-    <public type="id" name="status_bar_latest_event_content" id="0x7f0a0710" />
-    <public type="id" name="status_connectivity" id="0x7f0a0711" />
-    <public type="id" name="status_connectivity_icon" id="0x7f0a0712" />
-    <public type="id" name="status_connectivity_limited" id="0x7f0a0713" />
-    <public type="id" name="status_connectivity_spinner" id="0x7f0a0714" />
-    <public type="id" name="status_connectivity_text" id="0x7f0a0715" />
-    <public type="id" name="status_unread_messages" id="0x7f0a0716" />
-    <public type="id" name="status_unread_messages_mark" id="0x7f0a0717" />
-    <public type="id" name="status_unread_messages_text" id="0x7f0a0718" />
-    <public type="id" name="status_wrap" id="0x7f0a0719" />
-    <public type="id" name="steps_button_container" id="0x7f0a071a" />
-    <public type="id" name="steps_cancel" id="0x7f0a071b" />
-    <public type="id" name="steps_close" id="0x7f0a071c" />
-    <public type="id" name="steps_done" id="0x7f0a071d" />
-    <public type="id" name="steps_next" id="0x7f0a071e" />
-    <public type="id" name="steps_viewpager" id="0x7f0a071f" />
-    <public type="id" name="stream_preview_image" id="0x7f0a0720" />
-    <public type="id" name="stream_preview_placeholder" id="0x7f0a0721" />
-    <public type="id" name="stream_preview_placeholder_caption" id="0x7f0a0722" />
-    <public type="id" name="stretch" id="0x7f0a0723" />
-    <public type="id" name="submenuarrow" id="0x7f0a0724" />
-    <public type="id" name="submit_area" id="0x7f0a0725" />
-    <public type="id" name="suggestion_example_answer" id="0x7f0a0726" />
-    <public type="id" name="suggestion_example_container" id="0x7f0a0727" />
-    <public type="id" name="suggestion_example_filter" id="0x7f0a0728" />
-    <public type="id" name="suggestion_example_icon" id="0x7f0a0729" />
-    <public type="id" name="suggestion_item_header" id="0x7f0a072a" />
-    <public type="id" name="suggestion_item_header_history_clear_icon" id="0x7f0a072b" />
-    <public type="id" name="suggestion_item_header_history_divider" id="0x7f0a072c" />
-    <public type="id" name="suggestion_item_header_history_text" id="0x7f0a072d" />
-    <public type="id" name="surface_view" id="0x7f0a072e" />
-    <public type="id" name="swipeRefreshLayout" id="0x7f0a072f" />
-    <public type="id" name="switchview" id="0x7f0a0730" />
-    <public type="id" name="tabMode" id="0x7f0a0731" />
-    <public type="id" name="tag_accessibility_actions" id="0x7f0a0732" />
-    <public type="id" name="tag_accessibility_clickable_spans" id="0x7f0a0733" />
-    <public type="id" name="tag_accessibility_heading" id="0x7f0a0734" />
-    <public type="id" name="tag_accessibility_pane_title" id="0x7f0a0735" />
-    <public type="id" name="tag_screen_reader_focusable" id="0x7f0a0736" />
-    <public type="id" name="tag_transition_group" id="0x7f0a0737" />
-    <public type="id" name="tag_unhandled_key_event_manager" id="0x7f0a0738" />
-    <public type="id" name="tag_unhandled_key_listeners" id="0x7f0a0739" />
-    <public type="id" name="take_photo_btn" id="0x7f0a073a" />
-    <public type="id" name="ternary_check_neutral" id="0x7f0a073b" />
-    <public type="id" name="ternary_check_off" id="0x7f0a073c" />
-    <public type="id" name="ternary_check_on" id="0x7f0a073d" />
-    <public type="id" name="test" id="0x7f0a073e" />
-    <public type="id" name="text" id="0x7f0a073f" />
-    <public type="id" name="text2" id="0x7f0a0740" />
-    <public type="id" name="textSpacerNoButtons" id="0x7f0a0741" />
-    <public type="id" name="textSpacerNoTitle" id="0x7f0a0742" />
-    <public type="id" name="textStart" id="0x7f0a0743" />
-    <public type="id" name="text_input" id="0x7f0a0744" />
-    <public type="id" name="text_input_password_toggle" id="0x7f0a0745" />
-    <public type="id" name="text_view_rotate" id="0x7f0a0746" />
-    <public type="id" name="text_view_scale" id="0x7f0a0747" />
-    <public type="id" name="textinput_counter" id="0x7f0a0748" />
-    <public type="id" name="textinput_error" id="0x7f0a0749" />
-    <public type="id" name="textinput_helper_text" id="0x7f0a074a" />
-    <public type="id" name="texture_view" id="0x7f0a074b" />
-    <public type="id" name="thumb_iv" id="0x7f0a074c" />
-    <public type="id" name="tile" id="0x7f0a074d" />
-    <public type="id" name="time" id="0x7f0a074e" />
-    <public type="id" name="title" id="0x7f0a074f" />
-    <public type="id" name="titleDividerNoCustom" id="0x7f0a0750" />
-    <public type="id" name="title_template" id="0x7f0a0751" />
-    <public type="id" name="toolbar" id="0x7f0a0752" />
-    <public type="id" name="toolbar_presence" id="0x7f0a0753" />
-    <public type="id" name="toolbar_title" id="0x7f0a0754" />
-    <public type="id" name="toolbar_title_subtext" id="0x7f0a0755" />
-    <public type="id" name="top" id="0x7f0a0756" />
-    <public type="id" name="topPanel" id="0x7f0a0757" />
-    <public type="id" name="torch" id="0x7f0a0758" />
-    <public type="id" name="touch_outside" id="0x7f0a0759" />
-    <public type="id" name="transition_current_scene" id="0x7f0a075a" />
-    <public type="id" name="transition_layout_save" id="0x7f0a075b" />
-    <public type="id" name="transition_position" id="0x7f0a075c" />
-    <public type="id" name="transition_scene_layoutid_cache" id="0x7f0a075d" />
-    <public type="id" name="transition_transform" id="0x7f0a075e" />
-    <public type="id" name="trash_wrap_icon" id="0x7f0a075f" />
-    <public type="id" name="trash_wrap_target_container" id="0x7f0a0760" />
-    <public type="id" name="trash_wrap_target_zone" id="0x7f0a0761" />
-    <public type="id" name="type_iv" id="0x7f0a0762" />
-    <public type="id" name="ucrop" id="0x7f0a0763" />
-    <public type="id" name="ucrop_frame" id="0x7f0a0764" />
-    <public type="id" name="ucrop_photobox" id="0x7f0a0765" />
-    <public type="id" name="uikit_chat_guideline" id="0x7f0a0766" />
-    <public type="id" name="uikit_sheet_header_guideline" id="0x7f0a0767" />
-    <public type="id" name="unhandled_uri_display" id="0x7f0a0768" />
-    <public type="id" name="unhandled_uri_okay" id="0x7f0a0769" />
-    <public type="id" name="uniform" id="0x7f0a076a" />
-    <public type="id" name="unlabeled" id="0x7f0a076b" />
-    <public type="id" name="unread_wrap" id="0x7f0a076c" />
-    <public type="id" name="up" id="0x7f0a076d" />
-    <public type="id" name="upgrade_premium_body" id="0x7f0a076e" />
-    <public type="id" name="upgrade_premium_cancel" id="0x7f0a076f" />
-    <public type="id" name="upgrade_premium_confirm" id="0x7f0a0770" />
-    <public type="id" name="upgrade_premium_error" id="0x7f0a0771" />
-    <public type="id" name="upgrade_premium_header" id="0x7f0a0772" />
-    <public type="id" name="upload_progress_1" id="0x7f0a0773" />
-    <public type="id" name="upload_progress_2" id="0x7f0a0774" />
-    <public type="id" name="upload_progress_3" id="0x7f0a0775" />
-    <public type="id" name="useLogo" id="0x7f0a0776" />
-    <public type="id" name="user_avatar_presence_avatar" id="0x7f0a0777" />
-    <public type="id" name="user_avatar_presence_container" id="0x7f0a0778" />
-    <public type="id" name="user_avatar_presence_indicator" id="0x7f0a0779" />
-    <public type="id" name="user_captcha_help" id="0x7f0a077a" />
-    <public type="id" name="user_captcha_verify_button" id="0x7f0a077b" />
-    <public type="id" name="user_captcha_verify_button_anchor" id="0x7f0a077c" />
-    <public type="id" name="user_captcha_verify_button_cancel" id="0x7f0a077d" />
-    <public type="id" name="user_info_activity_divider" id="0x7f0a077e" />
-    <public type="id" name="user_info_identities_divider" id="0x7f0a077f" />
-    <public type="id" name="user_info_identities_header" id="0x7f0a0780" />
-    <public type="id" name="user_info_notes" id="0x7f0a0781" />
-    <public type="id" name="user_info_rich_presence_container" id="0x7f0a0782" />
-    <public type="id" name="user_limit_seekbar" id="0x7f0a0783" />
-    <public type="id" name="user_list_item_avatar" id="0x7f0a0784" />
-    <public type="id" name="user_list_item_name" id="0x7f0a0785" />
-    <public type="id" name="user_list_item_name_secondary" id="0x7f0a0786" />
-    <public type="id" name="user_list_item_presence" id="0x7f0a0787" />
-    <public type="id" name="user_list_item_presence_wrapper" id="0x7f0a0788" />
-    <public type="id" name="user_mentions_filter_include_everyone" id="0x7f0a0789" />
-    <public type="id" name="user_mentions_filter_include_roles" id="0x7f0a078a" />
-    <public type="id" name="user_mentions_filter_this_server" id="0x7f0a078b" />
-    <public type="id" name="user_mentions_list" id="0x7f0a078c" />
-    <public type="id" name="user_mutual_friends_recycler_view" id="0x7f0a078d" />
-    <public type="id" name="user_mutual_guilds_recycler_view" id="0x7f0a078e" />
-    <public type="id" name="user_phone_add_anchor" id="0x7f0a078f" />
-    <public type="id" name="user_phone_add_country_code" id="0x7f0a0790" />
-    <public type="id" name="user_phone_add_next" id="0x7f0a0791" />
-    <public type="id" name="user_phone_add_number" id="0x7f0a0792" />
-    <public type="id" name="user_phone_add_wrap" id="0x7f0a0793" />
-    <public type="id" name="user_phone_digit_verification" id="0x7f0a0794" />
-    <public type="id" name="user_phone_verify_wrap" id="0x7f0a0795" />
-    <public type="id" name="user_profile_adapter_item_empty" id="0x7f0a0796" />
-    <public type="id" name="user_profile_adapter_item_empty_text" id="0x7f0a0797" />
-    <public type="id" name="user_profile_adapter_item_friend_avatar" id="0x7f0a0798" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual" id="0x7f0a0799" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual_image" id="0x7f0a079a" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual_text" id="0x7f0a079b" />
-    <public type="id" name="user_profile_adapter_item_friend_presence" id="0x7f0a079c" />
-    <public type="id" name="user_profile_adapter_item_friend_user_game" id="0x7f0a079d" />
-    <public type="id" name="user_profile_adapter_item_friend_user_name" id="0x7f0a079e" />
-    <public type="id" name="user_profile_adapter_item_server_image" id="0x7f0a079f" />
-    <public type="id" name="user_profile_adapter_item_server_name" id="0x7f0a07a0" />
-    <public type="id" name="user_profile_adapter_item_server_nick" id="0x7f0a07a1" />
-    <public type="id" name="user_profile_adapter_item_server_text" id="0x7f0a07a2" />
-    <public type="id" name="user_profile_adapter_item_server_wrap" id="0x7f0a07a3" />
-    <public type="id" name="user_profile_friend_request" id="0x7f0a07a4" />
-    <public type="id" name="user_profile_friend_request_accept_btn" id="0x7f0a07a5" />
-    <public type="id" name="user_profile_friend_request_ignore_btn" id="0x7f0a07a6" />
-    <public type="id" name="user_profile_friend_request_incoming_container" id="0x7f0a07a7" />
-    <public type="id" name="user_profile_friend_request_sent_btn" id="0x7f0a07a8" />
-    <public type="id" name="user_profile_header_badges" id="0x7f0a07a9" />
-    <public type="id" name="user_profile_send_message_fab" id="0x7f0a07aa" />
-    <public type="id" name="user_profile_view_pager" id="0x7f0a07ab" />
-    <public type="id" name="user_selected_checkbox" id="0x7f0a07ac" />
-    <public type="id" name="user_settings_mfa_enable_input_digits" id="0x7f0a07ad" />
-    <public type="id" name="user_sheet_actions_divider" id="0x7f0a07ae" />
-    <public type="id" name="user_sheet_activity_divider" id="0x7f0a07af" />
-    <public type="id" name="user_sheet_administrative_divider" id="0x7f0a07b0" />
-    <public type="id" name="user_sheet_administrative_header" id="0x7f0a07b1" />
-    <public type="id" name="user_sheet_audio_settings_container" id="0x7f0a07b2" />
-    <public type="id" name="user_sheet_audio_settings_divider" id="0x7f0a07b3" />
-    <public type="id" name="user_sheet_avatar_presence" id="0x7f0a07b4" />
-    <public type="id" name="user_sheet_ban" id="0x7f0a07b5" />
-    <public type="id" name="user_sheet_copy_id" id="0x7f0a07b6" />
-    <public type="id" name="user_sheet_developer_divider" id="0x7f0a07b7" />
-    <public type="id" name="user_sheet_developer_header" id="0x7f0a07b8" />
-    <public type="id" name="user_sheet_header" id="0x7f0a07b9" />
-    <public type="id" name="user_sheet_kick" id="0x7f0a07ba" />
-    <public type="id" name="user_sheet_message" id="0x7f0a07bb" />
-    <public type="id" name="user_sheet_muted" id="0x7f0a07bc" />
-    <public type="id" name="user_sheet_name_wrap" id="0x7f0a07bd" />
-    <public type="id" name="user_sheet_primary_name" id="0x7f0a07be" />
-    <public type="id" name="user_sheet_profile" id="0x7f0a07bf" />
-    <public type="id" name="user_sheet_roles_recycler" id="0x7f0a07c0" />
-    <public type="id" name="user_sheet_secondary_name" id="0x7f0a07c1" />
-    <public type="id" name="user_sheet_server_deafen" id="0x7f0a07c2" />
-    <public type="id" name="user_sheet_server_edit_member" id="0x7f0a07c3" />
-    <public type="id" name="user_sheet_server_move" id="0x7f0a07c4" />
-    <public type="id" name="user_sheet_server_mute" id="0x7f0a07c5" />
-    <public type="id" name="user_sheet_volume" id="0x7f0a07c6" />
-    <public type="id" name="user_sheet_volume_icon" id="0x7f0a07c7" />
-    <public type="id" name="user_status_presence_dot" id="0x7f0a07c8" />
-    <public type="id" name="user_status_presence_subtitle" id="0x7f0a07c9" />
-    <public type="id" name="user_status_presence_title" id="0x7f0a07ca" />
-    <public type="id" name="user_status_update_dnd" id="0x7f0a07cb" />
-    <public type="id" name="user_status_update_idle" id="0x7f0a07cc" />
-    <public type="id" name="user_status_update_invisible" id="0x7f0a07cd" />
-    <public type="id" name="user_status_update_online" id="0x7f0a07ce" />
-    <public type="id" name="username_placeholder_end_guideline" id="0x7f0a07cf" />
-    <public type="id" name="verify_digit_1" id="0x7f0a07d0" />
-    <public type="id" name="verify_digit_2" id="0x7f0a07d1" />
-    <public type="id" name="verify_digit_3" id="0x7f0a07d2" />
-    <public type="id" name="verify_digit_4" id="0x7f0a07d3" />
-    <public type="id" name="verify_digit_5" id="0x7f0a07d4" />
-    <public type="id" name="verify_digit_6" id="0x7f0a07d5" />
-    <public type="id" name="view_dialog_confirmation_cancel" id="0x7f0a07d6" />
-    <public type="id" name="view_dialog_confirmation_confirm" id="0x7f0a07d7" />
-    <public type="id" name="view_dialog_confirmation_header" id="0x7f0a07d8" />
-    <public type="id" name="view_dialog_confirmation_text" id="0x7f0a07d9" />
-    <public type="id" name="view_input" id="0x7f0a07da" />
-    <public type="id" name="view_offset_helper" id="0x7f0a07db" />
-    <public type="id" name="view_overlay" id="0x7f0a07dc" />
-    <public type="id" name="view_pager" id="0x7f0a07dd" />
-    <public type="id" name="visible" id="0x7f0a07de" />
-    <public type="id" name="voice" id="0x7f0a07df" />
-    <public type="id" name="voice_actions_connect" id="0x7f0a07e0" />
-    <public type="id" name="voice_actions_copy_id" id="0x7f0a07e1" />
-    <public type="id" name="voice_actions_disconnect" id="0x7f0a07e2" />
-    <public type="id" name="voice_actions_header" id="0x7f0a07e3" />
-    <public type="id" name="voice_actions_icon" id="0x7f0a07e4" />
-    <public type="id" name="voice_actions_settings" id="0x7f0a07e5" />
-    <public type="id" name="voice_actions_settings_divider" id="0x7f0a07e6" />
-    <public type="id" name="voice_actions_user_count" id="0x7f0a07e7" />
-    <public type="id" name="voice_actions_users_recyclerview" id="0x7f0a07e8" />
-    <public type="id" name="voice_connected_container" id="0x7f0a07e9" />
-    <public type="id" name="voice_connected_description" id="0x7f0a07ea" />
-    <public type="id" name="voice_connected_ptt" id="0x7f0a07eb" />
-    <public type="id" name="voice_connected_quality" id="0x7f0a07ec" />
-    <public type="id" name="voice_connected_status_container" id="0x7f0a07ed" />
-    <public type="id" name="voice_connected_text" id="0x7f0a07ee" />
-    <public type="id" name="voice_divider" id="0x7f0a07ef" />
-    <public type="id" name="voice_expand" id="0x7f0a07f0" />
-    <public type="id" name="voice_fullscreen_controls_connect" id="0x7f0a07f1" />
-    <public type="id" name="voice_fullscreen_controls_controls_wrap" id="0x7f0a07f2" />
-    <public type="id" name="voice_fullscreen_controls_deafen_state" id="0x7f0a07f3" />
-    <public type="id" name="voice_fullscreen_controls_disconnect" id="0x7f0a07f4" />
-    <public type="id" name="voice_fullscreen_controls_mute_state" id="0x7f0a07f5" />
-    <public type="id" name="voice_fullscreen_controls_num_users_connected" id="0x7f0a07f6" />
-    <public type="id" name="voice_fullscreen_controls_ptt" id="0x7f0a07f7" />
-    <public type="id" name="voice_fullscreen_controls_speaker" id="0x7f0a07f8" />
-    <public type="id" name="voice_info_connecting" id="0x7f0a07f9" />
-    <public type="id" name="voice_info_overlay" id="0x7f0a07fa" />
-    <public type="id" name="voice_info_talking_users" id="0x7f0a07fb" />
-    <public type="id" name="voice_info_wrap" id="0x7f0a07fc" />
-    <public type="id" name="voice_list_item_user" id="0x7f0a07fd" />
-    <public type="id" name="voice_ongoing_container" id="0x7f0a07fe" />
-    <public type="id" name="voice_ongoing_user_count_label" id="0x7f0a07ff" />
-    <public type="id" name="voice_user_avatar" id="0x7f0a0800" />
-    <public type="id" name="voice_user_list_item_deafen_indicator" id="0x7f0a0801" />
-    <public type="id" name="voice_user_list_item_header_label" id="0x7f0a0802" />
-    <public type="id" name="voice_user_list_item_mute_indicator" id="0x7f0a0803" />
-    <public type="id" name="voice_user_list_item_user_avatar" id="0x7f0a0804" />
-    <public type="id" name="voice_user_list_item_user_name" id="0x7f0a0805" />
-    <public type="id" name="voice_user_name_display" id="0x7f0a0806" />
-    <public type="id" name="web_view" id="0x7f0a0807" />
-    <public type="id" name="welcome_card_invite_friends" id="0x7f0a0808" />
-    <public type="id" name="welcome_card_upload_icon" id="0x7f0a0809" />
-    <public type="id" name="wide" id="0x7f0a080a" />
-    <public type="id" name="widget_add_friend_user_list_item" id="0x7f0a080b" />
-    <public type="id" name="widget_auth_mfa_backup_codes_cancel" id="0x7f0a080c" />
-    <public type="id" name="widget_auth_mfa_backup_codes_edittext" id="0x7f0a080d" />
-    <public type="id" name="widget_auth_mfa_backup_codes_send" id="0x7f0a080e" />
-    <public type="id" name="widget_auth_mfa_info_okay" id="0x7f0a080f" />
-    <public type="id" name="widget_auth_mfa_info_text" id="0x7f0a0810" />
-    <public type="id" name="widget_channel_search_item" id="0x7f0a0811" />
-    <public type="id" name="widget_channel_search_item_remove" id="0x7f0a0812" />
-    <public type="id" name="widget_channel_settings_permissions_overview_members_recycler" id="0x7f0a0813" />
-    <public type="id" name="widget_channel_settings_permissions_overview_roles_recycler" id="0x7f0a0814" />
-    <public type="id" name="widget_channel_topic" id="0x7f0a0815" />
-    <public type="id" name="widget_channels" id="0x7f0a0816" />
-    <public type="id" name="widget_chat_detached" id="0x7f0a0817" />
-    <public type="id" name="widget_chat_input" id="0x7f0a0818" />
-    <public type="id" name="widget_chat_list" id="0x7f0a0819" />
-    <public type="id" name="widget_chat_typing" id="0x7f0a081a" />
-    <public type="id" name="widget_chat_voice" id="0x7f0a081b" />
-    <public type="id" name="widget_collapsed_user_count" id="0x7f0a081c" />
-    <public type="id" name="widget_collapsed_user_imageview" id="0x7f0a081d" />
-    <public type="id" name="widget_connected_list" id="0x7f0a081e" />
-    <public type="id" name="widget_friends_list" id="0x7f0a081f" />
-    <public type="id" name="widget_guilds" id="0x7f0a0820" />
-    <public type="id" name="widget_profile_strip" id="0x7f0a0821" />
-    <public type="id" name="widget_search_results" id="0x7f0a0822" />
-    <public type="id" name="widget_search_suggestions" id="0x7f0a0823" />
-    <public type="id" name="widget_server_settings_channels_container" id="0x7f0a0824" />
-    <public type="id" name="widget_server_settings_emojis_recycler" id="0x7f0a0825" />
-    <public type="id" name="widget_server_settings_emojis_section" id="0x7f0a0826" />
-    <public type="id" name="widget_server_settings_emojis_upload" id="0x7f0a0827" />
-    <public type="id" name="widget_server_settings_emojis_upload_description" id="0x7f0a0828" />
-    <public type="id" name="widget_server_settings_emojis_view_flipper" id="0x7f0a0829" />
-    <public type="id" name="widget_status" id="0x7f0a082a" />
-    <public type="id" name="widget_user_profile_header" id="0x7f0a082b" />
-    <public type="id" name="withText" id="0x7f0a082c" />
-    <public type="id" name="wrap" id="0x7f0a082d" />
-    <public type="id" name="wrap_content" id="0x7f0a082e" />
-    <public type="id" name="wrap_reverse" id="0x7f0a082f" />
-    <public type="id" name="wrapper_controls" id="0x7f0a0830" />
-    <public type="id" name="wrapper_reset_rotate" id="0x7f0a0831" />
-    <public type="id" name="wrapper_rotate_by_angle" id="0x7f0a0832" />
-    <public type="id" name="wrapper_states" id="0x7f0a0833" />
+    <public type="id" name="application_stream_view" id="0x7f0a0080" />
+    <public type="id" name="async" id="0x7f0a0081" />
+    <public type="id" name="attachment_clear_btn" id="0x7f0a0082" />
+    <public type="id" name="attachment_preview_container" id="0x7f0a0083" />
+    <public type="id" name="attachment_preview_list" id="0x7f0a0084" />
+    <public type="id" name="audit_log_filter_avatar" id="0x7f0a0085" />
+    <public type="id" name="audit_log_filter_cs" id="0x7f0a0086" />
+    <public type="id" name="audit_log_filter_image" id="0x7f0a0087" />
+    <public type="id" name="audit_log_filter_image_action" id="0x7f0a0088" />
+    <public type="id" name="audit_log_filter_image_container" id="0x7f0a0089" />
+    <public type="id" name="audit_log_filter_image_target" id="0x7f0a008a" />
+    <public type="id" name="audit_log_filter_input" id="0x7f0a008b" />
+    <public type="id" name="audit_log_filter_recycler" id="0x7f0a008c" />
+    <public type="id" name="audit_log_filter_search" id="0x7f0a008d" />
+    <public type="id" name="audit_log_listitem_action_container" id="0x7f0a008e" />
+    <public type="id" name="audit_log_listitem_actiontype_image" id="0x7f0a008f" />
+    <public type="id" name="audit_log_listitem_arrow" id="0x7f0a0090" />
+    <public type="id" name="audit_log_listitem_avatar" id="0x7f0a0091" />
+    <public type="id" name="audit_log_listitem_change_text" id="0x7f0a0092" />
+    <public type="id" name="audit_log_listitem_date_text" id="0x7f0a0093" />
+    <public type="id" name="audit_log_listitem_header_text" id="0x7f0a0094" />
+    <public type="id" name="audit_log_listitem_targettype_image" id="0x7f0a0095" />
+    <public type="id" name="audit_log_listitem_top_container" id="0x7f0a0096" />
+    <public type="id" name="auth_button_container" id="0x7f0a0097" />
+    <public type="id" name="auth_captcha_help" id="0x7f0a0098" />
+    <public type="id" name="auth_captcha_verify" id="0x7f0a0099" />
+    <public type="id" name="auth_invite_info_content" id="0x7f0a009a" />
+    <public type="id" name="auth_invite_info_guild_avatar" id="0x7f0a009b" />
+    <public type="id" name="auth_invite_info_guild_name" id="0x7f0a009c" />
+    <public type="id" name="auth_invite_info_invited_text" id="0x7f0a009d" />
+    <public type="id" name="auth_landing_content" id="0x7f0a009e" />
+    <public type="id" name="auth_landing_invite_info" id="0x7f0a009f" />
+    <public type="id" name="auth_landing_login" id="0x7f0a00a0" />
+    <public type="id" name="auth_landing_register" id="0x7f0a00a1" />
+    <public type="id" name="auth_login" id="0x7f0a00a2" />
+    <public type="id" name="auth_login_email" id="0x7f0a00a3" />
+    <public type="id" name="auth_login_email_wrap" id="0x7f0a00a4" />
+    <public type="id" name="auth_login_forgot_password" id="0x7f0a00a5" />
+    <public type="id" name="auth_login_password" id="0x7f0a00a6" />
+    <public type="id" name="auth_login_password_manager_link" id="0x7f0a00a7" />
+    <public type="id" name="auth_login_password_wrap" id="0x7f0a00a8" />
+    <public type="id" name="auth_mfa_verification" id="0x7f0a00a9" />
+    <public type="id" name="auth_policy_links" id="0x7f0a00aa" />
+    <public type="id" name="auth_register_button" id="0x7f0a00ab" />
+    <public type="id" name="auth_register_button_container" id="0x7f0a00ac" />
+    <public type="id" name="auth_register_email" id="0x7f0a00ad" />
+    <public type="id" name="auth_register_email_wrap" id="0x7f0a00ae" />
+    <public type="id" name="auth_register_password" id="0x7f0a00af" />
+    <public type="id" name="auth_register_password_wrap" id="0x7f0a00b0" />
+    <public type="id" name="auth_register_username" id="0x7f0a00b1" />
+    <public type="id" name="auth_register_username_wrap" id="0x7f0a00b2" />
+    <public type="id" name="auth_tos_opt_in" id="0x7f0a00b3" />
+    <public type="id" name="auth_undelete_body" id="0x7f0a00b4" />
+    <public type="id" name="auth_undelete_cancel" id="0x7f0a00b5" />
+    <public type="id" name="auth_undelete_delete" id="0x7f0a00b6" />
+    <public type="id" name="auth_undelete_title" id="0x7f0a00b7" />
+    <public type="id" name="authorized_apps_list" id="0x7f0a00b8" />
+    <public type="id" name="auto" id="0x7f0a00b9" />
+    <public type="id" name="automatic" id="0x7f0a00ba" />
+    <public type="id" name="back" id="0x7f0a00bb" />
+    <public type="id" name="ban_container" id="0x7f0a00bc" />
+    <public type="id" name="ban_list_item_avatar" id="0x7f0a00bd" />
+    <public type="id" name="ban_list_item_name" id="0x7f0a00be" />
+    <public type="id" name="ban_user_body" id="0x7f0a00bf" />
+    <public type="id" name="ban_user_button_container" id="0x7f0a00c0" />
+    <public type="id" name="ban_user_cancel" id="0x7f0a00c1" />
+    <public type="id" name="ban_user_confirm" id="0x7f0a00c2" />
+    <public type="id" name="ban_user_delete_messages_1_day" id="0x7f0a00c3" />
+    <public type="id" name="ban_user_delete_messages_7_days" id="0x7f0a00c4" />
+    <public type="id" name="ban_user_delete_messages_none" id="0x7f0a00c5" />
+    <public type="id" name="ban_user_reason" id="0x7f0a00c6" />
+    <public type="id" name="ban_user_title" id="0x7f0a00c7" />
+    <public type="id" name="barrier" id="0x7f0a00c8" />
+    <public type="id" name="baseline" id="0x7f0a00c9" />
+    <public type="id" name="beginning" id="0x7f0a00ca" />
+    <public type="id" name="bitrate_seekbar" id="0x7f0a00cb" />
+    <public type="id" name="blank_item_avatar_placeholder" id="0x7f0a00cc" />
+    <public type="id" name="blank_item_username_placeholder" id="0x7f0a00cd" />
+    <public type="id" name="blocking" id="0x7f0a00ce" />
+    <public type="id" name="boost_available_placeholder_bottom_text1" id="0x7f0a00cf" />
+    <public type="id" name="boost_available_placeholder_icon" id="0x7f0a00d0" />
+    <public type="id" name="boost_available_select" id="0x7f0a00d1" />
+    <public type="id" name="boost_bar_progress_bar" id="0x7f0a00d2" />
+    <public type="id" name="boost_bar_tier_0_container" id="0x7f0a00d3" />
+    <public type="id" name="boost_bar_tier_0_iv" id="0x7f0a00d4" />
+    <public type="id" name="boost_bar_tier_1_container" id="0x7f0a00d5" />
+    <public type="id" name="boost_bar_tier_1_iv" id="0x7f0a00d6" />
+    <public type="id" name="boost_bar_tier_1_tv" id="0x7f0a00d7" />
+    <public type="id" name="boost_bar_tier_2_container" id="0x7f0a00d8" />
+    <public type="id" name="boost_bar_tier_2_iv" id="0x7f0a00d9" />
+    <public type="id" name="boost_bar_tier_2_tv" id="0x7f0a00da" />
+    <public type="id" name="boost_bar_tier_3_container" id="0x7f0a00db" />
+    <public type="id" name="boost_bar_tier_3_iv" id="0x7f0a00dc" />
+    <public type="id" name="boost_bar_tier_3_tv" id="0x7f0a00dd" />
+    <public type="id" name="boost_confirmation_avatar" id="0x7f0a00de" />
+    <public type="id" name="boost_confirmation_button_container" id="0x7f0a00df" />
+    <public type="id" name="boost_confirmation_cancel" id="0x7f0a00e0" />
+    <public type="id" name="boost_confirmation_close" id="0x7f0a00e1" />
+    <public type="id" name="boost_confirmation_error" id="0x7f0a00e2" />
+    <public type="id" name="boost_confirmation_flipper" id="0x7f0a00e3" />
+    <public type="id" name="boost_confirmation_guild_name" id="0x7f0a00e4" />
+    <public type="id" name="boost_confirmation_level_info" id="0x7f0a00e5" />
+    <public type="id" name="boost_confirmation_lottie" id="0x7f0a00e6" />
+    <public type="id" name="boost_confirmation_select" id="0x7f0a00e7" />
+    <public type="id" name="boost_confirmation_warning" id="0x7f0a00e8" />
+    <public type="id" name="boost_info_container" id="0x7f0a00e9" />
+    <public type="id" name="boost_info_text" id="0x7f0a00ea" />
+    <public type="id" name="boost_remove_confirmation_avatar" id="0x7f0a00eb" />
+    <public type="id" name="boost_remove_confirmation_button_container" id="0x7f0a00ec" />
+    <public type="id" name="boost_remove_confirmation_cancel" id="0x7f0a00ed" />
+    <public type="id" name="boost_remove_confirmation_error" id="0x7f0a00ee" />
+    <public type="id" name="boost_remove_confirmation_guild_name" id="0x7f0a00ef" />
+    <public type="id" name="boost_remove_confirmation_level_info" id="0x7f0a00f0" />
+    <public type="id" name="boost_remove_confirmation_select" id="0x7f0a00f1" />
+    <public type="id" name="boost_status_button_boost" id="0x7f0a00f2" />
+    <public type="id" name="boost_status_button_container" id="0x7f0a00f3" />
+    <public type="id" name="boost_status_button_flipper" id="0x7f0a00f4" />
+    <public type="id" name="boost_status_button_info" id="0x7f0a00f5" />
+    <public type="id" name="boost_status_button_manage" id="0x7f0a00f6" />
+    <public type="id" name="boost_status_button_upgrade" id="0x7f0a00f7" />
+    <public type="id" name="boost_status_flipper" id="0x7f0a00f8" />
+    <public type="id" name="boost_status_info" id="0x7f0a00f9" />
+    <public type="id" name="boost_status_num_boosts" id="0x7f0a00fa" />
+    <public type="id" name="boost_status_retry" id="0x7f0a00fb" />
+    <public type="id" name="boost_status_viewpager" id="0x7f0a00fc" />
+    <public type="id" name="boosted_guild_banner" id="0x7f0a00fd" />
+    <public type="id" name="boosted_guild_gem_icon" id="0x7f0a00fe" />
+    <public type="id" name="boosted_guild_gradient" id="0x7f0a00ff" />
+    <public type="id" name="boosted_guild_icon" id="0x7f0a0100" />
+    <public type="id" name="boosted_guild_level_text" id="0x7f0a0101" />
+    <public type="id" name="boosted_guild_name" id="0x7f0a0102" />
+    <public type="id" name="boosted_guild_progress" id="0x7f0a0103" />
+    <public type="id" name="boosted_guild_remove" id="0x7f0a0104" />
+    <public type="id" name="boosted_guild_time" id="0x7f0a0105" />
+    <public type="id" name="bottom" id="0x7f0a0106" />
+    <public type="id" name="bottom_sheet_tint" id="0x7f0a0107" />
+    <public type="id" name="browser_actions_header_text" id="0x7f0a0108" />
+    <public type="id" name="browser_actions_menu_item_icon" id="0x7f0a0109" />
+    <public type="id" name="browser_actions_menu_item_text" id="0x7f0a010a" />
+    <public type="id" name="browser_actions_menu_items" id="0x7f0a010b" />
+    <public type="id" name="browser_actions_menu_view" id="0x7f0a010c" />
+    <public type="id" name="buttonPanel" id="0x7f0a010d" />
+    <public type="id" name="button_boxed_text" id="0x7f0a010e" />
+    <public type="id" name="button_text" id="0x7f0a010f" />
+    <public type="id" name="call_controls" id="0x7f0a0110" />
+    <public type="id" name="call_user_item_avatar" id="0x7f0a0111" />
+    <public type="id" name="call_users_recycler" id="0x7f0a0112" />
+    <public type="id" name="camera_container" id="0x7f0a0113" />
+    <public type="id" name="camera_facing_btn" id="0x7f0a0114" />
+    <public type="id" name="camera_flash_btn" id="0x7f0a0115" />
+    <public type="id" name="camera_view" id="0x7f0a0116" />
+    <public type="id" name="camera_view_cropper" id="0x7f0a0117" />
+    <public type="id" name="cancel_action" id="0x7f0a0118" />
+    <public type="id" name="cancel_button" id="0x7f0a0119" />
+    <public type="id" name="cancel_premium_body_part_1" id="0x7f0a011a" />
+    <public type="id" name="cancel_premium_body_part_2" id="0x7f0a011b" />
+    <public type="id" name="cancel_premium_cancel" id="0x7f0a011c" />
+    <public type="id" name="cancel_premium_confirm" id="0x7f0a011d" />
+    <public type="id" name="cancel_premium_error" id="0x7f0a011e" />
+    <public type="id" name="cancel_premium_grandfathered" id="0x7f0a011f" />
+    <public type="id" name="cancel_premium_header" id="0x7f0a0120" />
+    <public type="id" name="category_override_name" id="0x7f0a0121" />
+    <public type="id" name="category_override_status" id="0x7f0a0122" />
+    <public type="id" name="category_overview_name" id="0x7f0a0123" />
+    <public type="id" name="center" id="0x7f0a0124" />
+    <public type="id" name="centerCrop" id="0x7f0a0125" />
+    <public type="id" name="centerInside" id="0x7f0a0126" />
+    <public type="id" name="center_horizontal" id="0x7f0a0127" />
+    <public type="id" name="center_vertical" id="0x7f0a0128" />
+    <public type="id" name="chains" id="0x7f0a0129" />
+    <public type="id" name="change_log_body" id="0x7f0a012a" />
+    <public type="id" name="change_log_facebook" id="0x7f0a012b" />
+    <public type="id" name="change_log_instagram" id="0x7f0a012c" />
+    <public type="id" name="change_log_thumbnail" id="0x7f0a012d" />
+    <public type="id" name="change_log_twitter" id="0x7f0a012e" />
+    <public type="id" name="change_log_video" id="0x7f0a012f" />
+    <public type="id" name="change_log_video_overlay" id="0x7f0a0130" />
+    <public type="id" name="change_password_current_password_input" id="0x7f0a0131" />
+    <public type="id" name="change_password_new_password_input" id="0x7f0a0132" />
+    <public type="id" name="change_password_save" id="0x7f0a0133" />
+    <public type="id" name="change_password_two_factor" id="0x7f0a0134" />
+    <public type="id" name="channel_list_item_private_presence_bg" id="0x7f0a0135" />
+    <public type="id" name="channel_members_list_item_avatar" id="0x7f0a0136" />
+    <public type="id" name="channel_members_list_item_boosted_indicator" id="0x7f0a0137" />
+    <public type="id" name="channel_members_list_item_bot" id="0x7f0a0138" />
+    <public type="id" name="channel_members_list_item_game" id="0x7f0a0139" />
+    <public type="id" name="channel_members_list_item_group_owner_indicator" id="0x7f0a013a" />
+    <public type="id" name="channel_members_list_item_header_placeholder" id="0x7f0a013b" />
+    <public type="id" name="channel_members_list_item_header_text" id="0x7f0a013c" />
+    <public type="id" name="channel_members_list_item_name" id="0x7f0a013d" />
+    <public type="id" name="channel_members_list_item_presence" id="0x7f0a013e" />
+    <public type="id" name="channel_members_list_item_rich_presence_iv" id="0x7f0a013f" />
+    <public type="id" name="channel_notification_settings_system" id="0x7f0a0140" />
+    <public type="id" name="channel_override_category_name" id="0x7f0a0141" />
+    <public type="id" name="channel_override_name" id="0x7f0a0142" />
+    <public type="id" name="channel_override_status" id="0x7f0a0143" />
+    <public type="id" name="channel_permission_general_create_instant_invite" id="0x7f0a0144" />
+    <public type="id" name="channel_permission_general_manage_channel" id="0x7f0a0145" />
+    <public type="id" name="channel_permission_general_manage_permissions" id="0x7f0a0146" />
+    <public type="id" name="channel_permission_general_manage_webhooks" id="0x7f0a0147" />
+    <public type="id" name="channel_permission_text_add_reactions" id="0x7f0a0148" />
+    <public type="id" name="channel_permission_text_attach_files" id="0x7f0a0149" />
+    <public type="id" name="channel_permission_text_embed_links" id="0x7f0a014a" />
+    <public type="id" name="channel_permission_text_manage_messages" id="0x7f0a014b" />
+    <public type="id" name="channel_permission_text_mention_everyone" id="0x7f0a014c" />
+    <public type="id" name="channel_permission_text_read_message_history" id="0x7f0a014d" />
+    <public type="id" name="channel_permission_text_read_messages" id="0x7f0a014e" />
+    <public type="id" name="channel_permission_text_send_messages" id="0x7f0a014f" />
+    <public type="id" name="channel_permission_text_send_tts_messages" id="0x7f0a0150" />
+    <public type="id" name="channel_permission_text_use_external_emojis" id="0x7f0a0151" />
+    <public type="id" name="channel_permission_voice_connect" id="0x7f0a0152" />
+    <public type="id" name="channel_permission_voice_deafen_members" id="0x7f0a0153" />
+    <public type="id" name="channel_permission_voice_move_members" id="0x7f0a0154" />
+    <public type="id" name="channel_permission_voice_mute_members" id="0x7f0a0155" />
+    <public type="id" name="channel_permission_voice_speak" id="0x7f0a0156" />
+    <public type="id" name="channel_permission_voice_use_vad" id="0x7f0a0157" />
+    <public type="id" name="channel_permissions_avatar" id="0x7f0a0158" />
+    <public type="id" name="channel_permissions_channel_name" id="0x7f0a0159" />
+    <public type="id" name="channel_permissions_save" id="0x7f0a015a" />
+    <public type="id" name="channel_permissions_target_name" id="0x7f0a015b" />
+    <public type="id" name="channel_permissions_text_container" id="0x7f0a015c" />
+    <public type="id" name="channel_permissions_voice_container" id="0x7f0a015d" />
+    <public type="id" name="channel_pinned_messages_recycler" id="0x7f0a015e" />
+    <public type="id" name="channel_selector_item_name" id="0x7f0a015f" />
+    <public type="id" name="channel_selector_list" id="0x7f0a0160" />
+    <public type="id" name="channel_settings_channel_name" id="0x7f0a0161" />
+    <public type="id" name="channel_settings_delete_body" id="0x7f0a0162" />
+    <public type="id" name="channel_settings_delete_cancel" id="0x7f0a0163" />
+    <public type="id" name="channel_settings_delete_confirm" id="0x7f0a0164" />
+    <public type="id" name="channel_settings_delete_title" id="0x7f0a0165" />
+    <public type="id" name="channel_settings_edit_name" id="0x7f0a0166" />
+    <public type="id" name="channel_settings_edit_topic" id="0x7f0a0167" />
+    <public type="id" name="channel_settings_edit_wrap" id="0x7f0a0168" />
+    <public type="id" name="channel_settings_notifications_frequency_0" id="0x7f0a0169" />
+    <public type="id" name="channel_settings_notifications_frequency_1" id="0x7f0a016a" />
+    <public type="id" name="channel_settings_notifications_frequency_2" id="0x7f0a016b" />
+    <public type="id" name="channel_settings_notifications_frequency_wrap" id="0x7f0a016c" />
+    <public type="id" name="channel_settings_notifications_mute_toggle" id="0x7f0a016d" />
+    <public type="id" name="channel_settings_nsfw" id="0x7f0a016e" />
+    <public type="id" name="channel_settings_permissions" id="0x7f0a016f" />
+    <public type="id" name="channel_settings_permissions_add_member_name_search" id="0x7f0a0170" />
+    <public type="id" name="channel_settings_permissions_add_member_recycler" id="0x7f0a0171" />
+    <public type="id" name="channel_settings_permissions_add_member_view_flipper" id="0x7f0a0172" />
+    <public type="id" name="channel_settings_permissions_add_role_recycler" id="0x7f0a0173" />
+    <public type="id" name="channel_settings_permissions_overview_add_member" id="0x7f0a0174" />
+    <public type="id" name="channel_settings_permissions_overview_add_role" id="0x7f0a0175" />
+    <public type="id" name="channel_settings_permissions_overview_members_container" id="0x7f0a0176" />
+    <public type="id" name="channel_settings_permissions_overview_roles_container" id="0x7f0a0177" />
+    <public type="id" name="channel_settings_pinned_messages" id="0x7f0a0178" />
+    <public type="id" name="channel_settings_pinned_messages_container" id="0x7f0a0179" />
+    <public type="id" name="channel_settings_pinned_messages_disabled_overlay" id="0x7f0a017a" />
+    <public type="id" name="channel_settings_save" id="0x7f0a017b" />
+    <public type="id" name="channel_settings_section_privacy_safety" id="0x7f0a017c" />
+    <public type="id" name="channel_settings_section_slow_mode" id="0x7f0a017d" />
+    <public type="id" name="channel_settings_section_user_management" id="0x7f0a017e" />
+    <public type="id" name="channel_settings_slow_mode_cooldown_label" id="0x7f0a017f" />
+    <public type="id" name="channel_settings_slow_mode_cooldown_slider" id="0x7f0a0180" />
+    <public type="id" name="channel_settings_slowmode_label" id="0x7f0a0181" />
+    <public type="id" name="channel_settings_topic_container" id="0x7f0a0182" />
+    <public type="id" name="channel_spinner_dropdown_item_textview" id="0x7f0a0183" />
+    <public type="id" name="channel_spinner_item_textview" id="0x7f0a0184" />
+    <public type="id" name="channel_topic" id="0x7f0a0185" />
+    <public type="id" name="channel_topic_title" id="0x7f0a0186" />
+    <public type="id" name="channels_item_category_add" id="0x7f0a0187" />
+    <public type="id" name="channels_item_category_arrow" id="0x7f0a0188" />
+    <public type="id" name="channels_item_category_name" id="0x7f0a0189" />
+    <public type="id" name="channels_item_channel_hash" id="0x7f0a018a" />
+    <public type="id" name="channels_item_channel_mentions" id="0x7f0a018b" />
+    <public type="id" name="channels_item_channel_name" id="0x7f0a018c" />
+    <public type="id" name="channels_item_channel_unread" id="0x7f0a018d" />
+    <public type="id" name="channels_item_voice_channel_name" id="0x7f0a018e" />
+    <public type="id" name="channels_item_voice_channel_speaker" id="0x7f0a018f" />
+    <public type="id" name="channels_item_voice_channel_user_count" id="0x7f0a0190" />
+    <public type="id" name="channels_item_voice_user_avatar" id="0x7f0a0191" />
+    <public type="id" name="channels_item_voice_user_headphones" id="0x7f0a0192" />
+    <public type="id" name="channels_item_voice_user_live" id="0x7f0a0193" />
+    <public type="id" name="channels_item_voice_user_microphone" id="0x7f0a0194" />
+    <public type="id" name="channels_item_voice_user_name" id="0x7f0a0195" />
+    <public type="id" name="channels_list" id="0x7f0a0196" />
+    <public type="id" name="channels_list_actions_change_nickname_cancel" id="0x7f0a0197" />
+    <public type="id" name="channels_list_actions_change_nickname_edit_text" id="0x7f0a0198" />
+    <public type="id" name="channels_list_actions_change_nickname_reset" id="0x7f0a0199" />
+    <public type="id" name="channels_list_actions_change_nickname_save" id="0x7f0a019a" />
+    <public type="id" name="channels_list_actions_leave_server_cancel" id="0x7f0a019b" />
+    <public type="id" name="channels_list_actions_leave_server_confirm" id="0x7f0a019c" />
+    <public type="id" name="channels_list_actions_leave_server_header" id="0x7f0a019d" />
+    <public type="id" name="channels_list_actions_leave_server_text" id="0x7f0a019e" />
+    <public type="id" name="channels_list_banner" id="0x7f0a019f" />
+    <public type="id" name="channels_list_header" id="0x7f0a01a0" />
+    <public type="id" name="channels_list_item_friends_icon" id="0x7f0a01a1" />
+    <public type="id" name="channels_list_item_friends_mentions" id="0x7f0a01a2" />
+    <public type="id" name="channels_list_item_header" id="0x7f0a01a3" />
+    <public type="id" name="channels_list_item_invite" id="0x7f0a01a4" />
+    <public type="id" name="channels_list_item_invite_icon" id="0x7f0a01a5" />
+    <public type="id" name="channels_list_item_mfa_text" id="0x7f0a01a6" />
+    <public type="id" name="channels_list_item_private_avatar" id="0x7f0a01a7" />
+    <public type="id" name="channels_list_item_private_desc" id="0x7f0a01a8" />
+    <public type="id" name="channels_list_item_private_mentions" id="0x7f0a01a9" />
+    <public type="id" name="channels_list_item_private_name" id="0x7f0a01aa" />
+    <public type="id" name="channels_list_item_private_presence" id="0x7f0a01ab" />
+    <public type="id" name="channels_list_item_text_actions_channel_notifications" id="0x7f0a01ac" />
+    <public type="id" name="channels_list_item_text_actions_channel_settings" id="0x7f0a01ad" />
+    <public type="id" name="channels_list_item_text_actions_copy_id" id="0x7f0a01ae" />
+    <public type="id" name="channels_list_item_text_actions_developer_divider" id="0x7f0a01af" />
+    <public type="id" name="channels_list_item_text_actions_icon" id="0x7f0a01b0" />
+    <public type="id" name="channels_list_item_text_actions_invite" id="0x7f0a01b1" />
+    <public type="id" name="channels_list_item_text_actions_mark_as_read" id="0x7f0a01b2" />
+    <public type="id" name="channels_list_item_text_actions_mute" id="0x7f0a01b3" />
+    <public type="id" name="channels_list_item_text_actions_profile" id="0x7f0a01b4" />
+    <public type="id" name="channels_list_item_text_actions_title" id="0x7f0a01b5" />
+    <public type="id" name="channels_list_new" id="0x7f0a01b6" />
+    <public type="id" name="channels_list_search" id="0x7f0a01b7" />
+    <public type="id" name="channels_list_search_toolbar" id="0x7f0a01b8" />
+    <public type="id" name="channels_list_unreads" id="0x7f0a01b9" />
+    <public type="id" name="channels_list_unreads_background" id="0x7f0a01ba" />
+    <public type="id" name="channels_list_unreads_stub" id="0x7f0a01bb" />
+    <public type="id" name="channels_toolbar" id="0x7f0a01bc" />
+    <public type="id" name="chat_action_item_image" id="0x7f0a01bd" />
+    <public type="id" name="chat_action_item_subtext" id="0x7f0a01be" />
+    <public type="id" name="chat_action_item_text" id="0x7f0a01bf" />
+    <public type="id" name="chat_input_edit" id="0x7f0a01c0" />
+    <public type="id" name="chat_input_edit_border" id="0x7f0a01c1" />
+    <public type="id" name="chat_input_edit_cancel" id="0x7f0a01c2" />
+    <public type="id" name="chat_input_emoji_picker_recycler" id="0x7f0a01c3" />
+    <public type="id" name="chat_input_item_avatar" id="0x7f0a01c4" />
+    <public type="id" name="chat_input_item_emoji" id="0x7f0a01c5" />
+    <public type="id" name="chat_input_item_icon_container" id="0x7f0a01c6" />
+    <public type="id" name="chat_input_item_name" id="0x7f0a01c7" />
+    <public type="id" name="chat_input_item_name_right" id="0x7f0a01c8" />
+    <public type="id" name="chat_input_item_presence" id="0x7f0a01c9" />
+    <public type="id" name="chat_input_item_presence_canvas" id="0x7f0a01ca" />
+    <public type="id" name="chat_input_mentions_recycler" id="0x7f0a01cb" />
+    <public type="id" name="chat_input_upload_too_large_center_file" id="0x7f0a01cc" />
+    <public type="id" name="chat_input_upload_too_large_help" id="0x7f0a01cd" />
+    <public type="id" name="chat_input_verification" id="0x7f0a01ce" />
+    <public type="id" name="chat_input_verification_action" id="0x7f0a01cf" />
+    <public type="id" name="chat_input_verification_text" id="0x7f0a01d0" />
+    <public type="id" name="chat_input_widget" id="0x7f0a01d1" />
+    <public type="id" name="chat_input_wrap" id="0x7f0a01d2" />
+    <public type="id" name="chat_list_adapter_item_blocked" id="0x7f0a01d3" />
+    <public type="id" name="chat_list_adapter_item_failed" id="0x7f0a01d4" />
+    <public type="id" name="chat_list_adapter_item_start" id="0x7f0a01d5" />
+    <public type="id" name="chat_list_adapter_item_start_image" id="0x7f0a01d6" />
+    <public type="id" name="chat_list_adapter_item_system_icon" id="0x7f0a01d7" />
+    <public type="id" name="chat_list_adapter_item_system_text" id="0x7f0a01d8" />
+    <public type="id" name="chat_list_adapter_item_system_timestamp" id="0x7f0a01d9" />
+    <public type="id" name="chat_list_adapter_item_text" id="0x7f0a01da" />
+    <public type="id" name="chat_list_adapter_item_text_avatar" id="0x7f0a01db" />
+    <public type="id" name="chat_list_adapter_item_text_bot" id="0x7f0a01dc" />
+    <public type="id" name="chat_list_adapter_item_text_header" id="0x7f0a01dd" />
+    <public type="id" name="chat_list_adapter_item_text_name" id="0x7f0a01de" />
+    <public type="id" name="chat_list_adapter_item_text_timestamp" id="0x7f0a01df" />
+    <public type="id" name="chat_list_empty_image" id="0x7f0a01e0" />
+    <public type="id" name="chat_list_empty_pins_text" id="0x7f0a01e1" />
+    <public type="id" name="chat_list_item_attachment_barrier" id="0x7f0a01e2" />
+    <public type="id" name="chat_list_item_attachment_card" id="0x7f0a01e3" />
+    <public type="id" name="chat_list_item_attachment_description" id="0x7f0a01e4" />
+    <public type="id" name="chat_list_item_attachment_download" id="0x7f0a01e5" />
+    <public type="id" name="chat_list_item_attachment_icon" id="0x7f0a01e6" />
+    <public type="id" name="chat_list_item_attachment_image" id="0x7f0a01e7" />
+    <public type="id" name="chat_list_item_attachment_image_overlay" id="0x7f0a01e8" />
+    <public type="id" name="chat_list_item_attachment_name" id="0x7f0a01e9" />
+    <public type="id" name="chat_list_item_attachment_spoiler" id="0x7f0a01ea" />
+    <public type="id" name="chat_list_item_divider_stroke_left" id="0x7f0a01eb" />
+    <public type="id" name="chat_list_item_divider_stroke_right" id="0x7f0a01ec" />
+    <public type="id" name="chat_list_item_divider_text" id="0x7f0a01ed" />
+    <public type="id" name="chat_list_item_embed_author_icon" id="0x7f0a01ee" />
+    <public type="id" name="chat_list_item_embed_author_text" id="0x7f0a01ef" />
+    <public type="id" name="chat_list_item_embed_barrier_data" id="0x7f0a01f0" />
+    <public type="id" name="chat_list_item_embed_barrier_header" id="0x7f0a01f1" />
+    <public type="id" name="chat_list_item_embed_content" id="0x7f0a01f2" />
+    <public type="id" name="chat_list_item_embed_description" id="0x7f0a01f3" />
+    <public type="id" name="chat_list_item_embed_divider" id="0x7f0a01f4" />
+    <public type="id" name="chat_list_item_embed_field_name" id="0x7f0a01f5" />
+    <public type="id" name="chat_list_item_embed_field_value" id="0x7f0a01f6" />
+    <public type="id" name="chat_list_item_embed_fields" id="0x7f0a01f7" />
+    <public type="id" name="chat_list_item_embed_footer_icon" id="0x7f0a01f8" />
+    <public type="id" name="chat_list_item_embed_footer_text" id="0x7f0a01f9" />
+    <public type="id" name="chat_list_item_embed_image" id="0x7f0a01fa" />
+    <public type="id" name="chat_list_item_embed_image_icons" id="0x7f0a01fb" />
+    <public type="id" name="chat_list_item_embed_image_thumbnail" id="0x7f0a01fc" />
+    <public type="id" name="chat_list_item_embed_provider" id="0x7f0a01fd" />
+    <public type="id" name="chat_list_item_embed_spoiler" id="0x7f0a01fe" />
+    <public type="id" name="chat_list_item_embed_title" id="0x7f0a01ff" />
+    <public type="id" name="chat_list_item_mention_footer_divider" id="0x7f0a0200" />
+    <public type="id" name="chat_list_item_mention_footer_hand" id="0x7f0a0201" />
+    <public type="id" name="chat_list_item_message_header_channel" id="0x7f0a0202" />
+    <public type="id" name="chat_list_item_message_header_divider" id="0x7f0a0203" />
+    <public type="id" name="chat_list_item_message_header_guild" id="0x7f0a0204" />
+    <public type="id" name="chat_list_item_message_header_spacer" id="0x7f0a0205" />
+    <public type="id" name="chat_list_item_reactions" id="0x7f0a0206" />
+    <public type="id" name="chat_list_recycler" id="0x7f0a0207" />
+    <public type="id" name="chat_list_search_empty_image" id="0x7f0a0208" />
+    <public type="id" name="chat_list_search_error_text" id="0x7f0a0209" />
+    <public type="id" name="chat_list_search_indexing_animation" id="0x7f0a020a" />
+    <public type="id" name="chat_list_search_indexing_text" id="0x7f0a020b" />
+    <public type="id" name="chat_list_tab_badged_count" id="0x7f0a020c" />
+    <public type="id" name="chat_list_tab_badged_text" id="0x7f0a020d" />
+    <public type="id" name="chat_typing_users_slowmode" id="0x7f0a020e" />
+    <public type="id" name="chat_typing_users_slowmode_icon" id="0x7f0a020f" />
+    <public type="id" name="chat_typing_users_typing" id="0x7f0a0210" />
+    <public type="id" name="check" id="0x7f0a0211" />
+    <public type="id" name="checkable_off_container" id="0x7f0a0212" />
+    <public type="id" name="checkbox" id="0x7f0a0213" />
+    <public type="id" name="checkboxes_container" id="0x7f0a0214" />
+    <public type="id" name="chip_image" id="0x7f0a0215" />
+    <public type="id" name="chip_text" id="0x7f0a0216" />
+    <public type="id" name="chronometer" id="0x7f0a0217" />
+    <public type="id" name="client_outdated_anchor_wrap" id="0x7f0a0218" />
+    <public type="id" name="client_outdated_update" id="0x7f0a0219" />
+    <public type="id" name="clip_horizontal" id="0x7f0a021a" />
+    <public type="id" name="clip_vertical" id="0x7f0a021b" />
+    <public type="id" name="close" id="0x7f0a021c" />
+    <public type="id" name="collapseActionView" id="0x7f0a021d" />
+    <public type="id" name="collapsing_toolbar" id="0x7f0a021e" />
+    <public type="id" name="color_picker_done" id="0x7f0a021f" />
+    <public type="id" name="color_picker_gridview" id="0x7f0a0220" />
+    <public type="id" name="color_picker_reset" id="0x7f0a0221" />
+    <public type="id" name="column" id="0x7f0a0222" />
+    <public type="id" name="column_reverse" id="0x7f0a0223" />
+    <public type="id" name="connected_account_disconnect" id="0x7f0a0224" />
+    <public type="id" name="connected_account_display_activity_switch" id="0x7f0a0225" />
+    <public type="id" name="connected_account_display_switch" id="0x7f0a0226" />
+    <public type="id" name="connected_account_divider" id="0x7f0a0227" />
+    <public type="id" name="connected_account_extra_info" id="0x7f0a0228" />
+    <public type="id" name="connected_account_img" id="0x7f0a0229" />
+    <public type="id" name="connected_account_link_img" id="0x7f0a022a" />
+    <public type="id" name="connected_account_name" id="0x7f0a022b" />
+    <public type="id" name="connected_account_sync_friends_switch" id="0x7f0a022c" />
+    <public type="id" name="connected_list_header" id="0x7f0a022d" />
+    <public type="id" name="connections_empty" id="0x7f0a022e" />
+    <public type="id" name="connections_recycler" id="0x7f0a022f" />
+    <public type="id" name="connections_xbox_digits" id="0x7f0a0230" />
+    <public type="id" name="connections_xbox_login" id="0x7f0a0231" />
+    <public type="id" name="container" id="0x7f0a0232" />
+    <public type="id" name="content" id="0x7f0a0233" />
+    <public type="id" name="contentPanel" id="0x7f0a0234" />
+    <public type="id" name="content_iv" id="0x7f0a0235" />
+    <public type="id" name="content_pager" id="0x7f0a0236" />
+    <public type="id" name="content_tabs" id="0x7f0a0237" />
+    <public type="id" name="coordinator" id="0x7f0a0238" />
+    <public type="id" name="create_channel_name" id="0x7f0a0239" />
+    <public type="id" name="create_channel_name_layout" id="0x7f0a023a" />
+    <public type="id" name="create_channel_private_container" id="0x7f0a023b" />
+    <public type="id" name="create_channel_private_info" id="0x7f0a023c" />
+    <public type="id" name="create_channel_private_switch" id="0x7f0a023d" />
+    <public type="id" name="create_channel_private_title" id="0x7f0a023e" />
+    <public type="id" name="create_channel_role_access_recycler" id="0x7f0a023f" />
+    <public type="id" name="create_channel_role_header" id="0x7f0a0240" />
+    <public type="id" name="create_channel_text_container" id="0x7f0a0241" />
+    <public type="id" name="create_channel_text_radio" id="0x7f0a0242" />
+    <public type="id" name="create_channel_type_container" id="0x7f0a0243" />
+    <public type="id" name="create_channel_voice_container" id="0x7f0a0244" />
+    <public type="id" name="create_channel_voice_radio" id="0x7f0a0245" />
+    <public type="id" name="credit_header" id="0x7f0a0246" />
+    <public type="id" name="credit_icon" id="0x7f0a0247" />
+    <public type="id" name="credit_info" id="0x7f0a0248" />
+    <public type="id" name="credit_info_container" id="0x7f0a0249" />
+    <public type="id" name="credit_nitro" id="0x7f0a024a" />
+    <public type="id" name="credit_nitro_classic" id="0x7f0a024b" />
+    <public type="id" name="credit_nitro_divider" id="0x7f0a024c" />
+    <public type="id" name="credit_time" id="0x7f0a024d" />
+    <public type="id" name="current_bitrate_display" id="0x7f0a024e" />
+    <public type="id" name="current_user_limit_display" id="0x7f0a024f" />
+    <public type="id" name="custom" id="0x7f0a0250" />
+    <public type="id" name="customPanel" id="0x7f0a0251" />
+    <public type="id" name="dark" id="0x7f0a0252" />
+    <public type="id" name="debugging_item_log_message" id="0x7f0a0253" />
+    <public type="id" name="debugging_logs" id="0x7f0a0254" />
+    <public type="id" name="decor_content_parent" id="0x7f0a0255" />
+    <public type="id" name="default_activity_button" id="0x7f0a0256" />
+    <public type="id" name="design_bottom_sheet" id="0x7f0a0257" />
+    <public type="id" name="design_menu_item_action_area" id="0x7f0a0258" />
+    <public type="id" name="design_menu_item_action_area_stub" id="0x7f0a0259" />
+    <public type="id" name="design_menu_item_text" id="0x7f0a025a" />
+    <public type="id" name="design_navigation_view" id="0x7f0a025b" />
+    <public type="id" name="dialog_button" id="0x7f0a025c" />
+    <public type="id" name="dialog_cancel" id="0x7f0a025d" />
+    <public type="id" name="dialog_card" id="0x7f0a025e" />
+    <public type="id" name="dialog_chat_action_header" id="0x7f0a025f" />
+    <public type="id" name="dialog_chat_actions_add_reaction" id="0x7f0a0260" />
+    <public type="id" name="dialog_chat_actions_add_reaction_emojis_list" id="0x7f0a0261" />
+    <public type="id" name="dialog_chat_actions_avatar" id="0x7f0a0262" />
+    <public type="id" name="dialog_chat_actions_copy" id="0x7f0a0263" />
+    <public type="id" name="dialog_chat_actions_copy_id" id="0x7f0a0264" />
+    <public type="id" name="dialog_chat_actions_delete" id="0x7f0a0265" />
+    <public type="id" name="dialog_chat_actions_edit" id="0x7f0a0266" />
+    <public type="id" name="dialog_chat_actions_manage_reactions" id="0x7f0a0267" />
+    <public type="id" name="dialog_chat_actions_pin" id="0x7f0a0268" />
+    <public type="id" name="dialog_chat_actions_profile" id="0x7f0a0269" />
+    <public type="id" name="dialog_chat_actions_remove_all_reactions" id="0x7f0a026a" />
+    <public type="id" name="dialog_chat_actions_resend" id="0x7f0a026b" />
+    <public type="id" name="dialog_chat_actions_share" id="0x7f0a026c" />
+    <public type="id" name="dialog_chat_actions_subtitle" id="0x7f0a026d" />
+    <public type="id" name="dialog_chat_actions_title" id="0x7f0a026e" />
+    <public type="id" name="dialog_delete" id="0x7f0a026f" />
+    <public type="id" name="dialog_save" id="0x7f0a0270" />
+    <public type="id" name="dialog_selections" id="0x7f0a0271" />
+    <public type="id" name="dialog_title" id="0x7f0a0272" />
+    <public type="id" name="dialog_url_actions_copy" id="0x7f0a0273" />
+    <public type="id" name="dialog_url_actions_open" id="0x7f0a0274" />
+    <public type="id" name="dialog_url_actions_share" id="0x7f0a0275" />
+    <public type="id" name="dialog_url_actions_url" id="0x7f0a0276" />
+    <public type="id" name="dimensions" id="0x7f0a0277" />
+    <public type="id" name="dimmer_view" id="0x7f0a0278" />
+    <public type="id" name="direct" id="0x7f0a0279" />
+    <public type="id" name="disableHome" id="0x7f0a027a" />
+    <public type="id" name="disable_delete_body" id="0x7f0a027b" />
+    <public type="id" name="disable_delete_cancel" id="0x7f0a027c" />
+    <public type="id" name="disable_delete_code" id="0x7f0a027d" />
+    <public type="id" name="disable_delete_code_wrap" id="0x7f0a027e" />
+    <public type="id" name="disable_delete_confirm" id="0x7f0a027f" />
+    <public type="id" name="disable_delete_header" id="0x7f0a0280" />
+    <public type="id" name="disable_delete_password" id="0x7f0a0281" />
+    <public type="id" name="disable_delete_password_wrap" id="0x7f0a0282" />
+    <public type="id" name="disconnect_btn" id="0x7f0a0283" />
+    <public type="id" name="edit_account_discriminator" id="0x7f0a0284" />
+    <public type="id" name="edit_account_discriminator_wrap" id="0x7f0a0285" />
+    <public type="id" name="edit_account_email" id="0x7f0a0286" />
+    <public type="id" name="edit_account_email_wrap" id="0x7f0a0287" />
+    <public type="id" name="edit_account_password" id="0x7f0a0288" />
+    <public type="id" name="edit_account_password_wrap" id="0x7f0a0289" />
+    <public type="id" name="edit_account_tag_layout_container" id="0x7f0a028a" />
+    <public type="id" name="edit_account_username" id="0x7f0a028b" />
+    <public type="id" name="edit_account_username_wrap" id="0x7f0a028c" />
+    <public type="id" name="edit_integration_custom_emotes_container" id="0x7f0a028d" />
+    <public type="id" name="edit_integration_custom_emotes_toggle" id="0x7f0a028e" />
+    <public type="id" name="edit_integration_expire_radio_kick_user" id="0x7f0a028f" />
+    <public type="id" name="edit_integration_expire_radio_remove_role" id="0x7f0a0290" />
+    <public type="id" name="edit_integration_expired_sub_container" id="0x7f0a0291" />
+    <public type="id" name="edit_integration_grace_period_container" id="0x7f0a0292" />
+    <public type="id" name="edit_integration_grace_period_radio_14_days" id="0x7f0a0293" />
+    <public type="id" name="edit_integration_grace_period_radio_1_day" id="0x7f0a0294" />
+    <public type="id" name="edit_integration_grace_period_radio_30_days" id="0x7f0a0295" />
+    <public type="id" name="edit_integration_grace_period_radio_3_days" id="0x7f0a0296" />
+    <public type="id" name="edit_integration_grace_period_radio_7_days" id="0x7f0a0297" />
+    <public type="id" name="edit_integration_icon" id="0x7f0a0298" />
+    <public type="id" name="edit_integration_last_sync_time" id="0x7f0a0299" />
+    <public type="id" name="edit_integration_name" id="0x7f0a029a" />
+    <public type="id" name="edit_integration_name_container" id="0x7f0a029b" />
+    <public type="id" name="edit_integration_owner_name" id="0x7f0a029c" />
+    <public type="id" name="edit_integration_save" id="0x7f0a029d" />
+    <public type="id" name="edit_integration_settings_scroll" id="0x7f0a029e" />
+    <public type="id" name="edit_integration_subscriber_count" id="0x7f0a029f" />
+    <public type="id" name="edit_integration_sync_container" id="0x7f0a02a0" />
+    <public type="id" name="edit_integration_synced_role" id="0x7f0a02a1" />
+    <public type="id" name="edit_integration_synced_role_container" id="0x7f0a02a2" />
+    <public type="id" name="edit_member_administrative_container" id="0x7f0a02a3" />
+    <public type="id" name="edit_member_ban_button" id="0x7f0a02a4" />
+    <public type="id" name="edit_member_kick_button" id="0x7f0a02a5" />
+    <public type="id" name="edit_member_nickname" id="0x7f0a02a6" />
+    <public type="id" name="edit_member_nickname_lock" id="0x7f0a02a7" />
+    <public type="id" name="edit_member_roles_container" id="0x7f0a02a8" />
+    <public type="id" name="edit_member_roles_recycler" id="0x7f0a02a9" />
+    <public type="id" name="edit_member_save" id="0x7f0a02aa" />
+    <public type="id" name="edit_member_transfer_ownership_button" id="0x7f0a02ab" />
+    <public type="id" name="edit_query" id="0x7f0a02ac" />
+    <public type="id" name="edit_role_name" id="0x7f0a02ad" />
+    <public type="id" name="edit_role_save" id="0x7f0a02ae" />
+    <public type="id" name="embed_guideline" id="0x7f0a02af" />
+    <public type="id" name="embed_guideline_right" id="0x7f0a02b0" />
+    <public type="id" name="embed_image_container" id="0x7f0a02b1" />
+    <public type="id" name="emoji_btn" id="0x7f0a02b2" />
+    <public type="id" name="emoji_container" id="0x7f0a02b3" />
+    <public type="id" name="emoji_item_draweeview" id="0x7f0a02b4" />
+    <public type="id" name="emoji_iv" id="0x7f0a02b5" />
+    <public type="id" name="emoji_picker_backspace_icon" id="0x7f0a02b6" />
+    <public type="id" name="emoji_picker_bottom_bar" id="0x7f0a02b7" />
+    <public type="id" name="emoji_picker_search_icon" id="0x7f0a02b8" />
+    <public type="id" name="emoji_picker_tab_layout" id="0x7f0a02b9" />
+    <public type="id" name="emoji_search_bar" id="0x7f0a02ba" />
+    <public type="id" name="empty_results" id="0x7f0a02bb" />
+    <public type="id" name="enable_button" id="0x7f0a02bc" />
+    <public type="id" name="enable_mfa_key_code" id="0x7f0a02bd" />
+    <public type="id" name="enable_mfa_key_launch_authy" id="0x7f0a02be" />
+    <public type="id" name="enable_mfa_key_launch_google_auth" id="0x7f0a02bf" />
+    <public type="id" name="enable_mfa_stepsview" id="0x7f0a02c0" />
+    <public type="id" name="enable_sms_backup_body" id="0x7f0a02c1" />
+    <public type="id" name="enable_sms_backup_cancel" id="0x7f0a02c2" />
+    <public type="id" name="enable_sms_backup_confirm" id="0x7f0a02c3" />
+    <public type="id" name="enable_sms_backup_header" id="0x7f0a02c4" />
+    <public type="id" name="enable_sms_backup_password" id="0x7f0a02c5" />
+    <public type="id" name="enable_sms_backup_password_wrap" id="0x7f0a02c6" />
+    <public type="id" name="end" id="0x7f0a02c7" />
+    <public type="id" name="end_padder" id="0x7f0a02c8" />
+    <public type="id" name="enterAlways" id="0x7f0a02c9" />
+    <public type="id" name="enterAlwaysCollapsed" id="0x7f0a02ca" />
+    <public type="id" name="error_divider" id="0x7f0a02cb" />
+    <public type="id" name="exitUntilCollapsed" id="0x7f0a02cc" />
+    <public type="id" name="expand_activities_button" id="0x7f0a02cd" />
+    <public type="id" name="expanded_menu" id="0x7f0a02ce" />
+    <public type="id" name="external_share_comment" id="0x7f0a02cf" />
+    <public type="id" name="external_share_list" id="0x7f0a02d0" />
+    <public type="id" name="external_share_search" id="0x7f0a02d1" />
+    <public type="id" name="external_share_search_results" id="0x7f0a02d2" />
+    <public type="id" name="fab_menu_add_category" id="0x7f0a02d3" />
+    <public type="id" name="fab_menu_add_text" id="0x7f0a02d4" />
+    <public type="id" name="fab_menu_add_voice" id="0x7f0a02d5" />
+    <public type="id" name="fab_menu_main" id="0x7f0a02d6" />
+    <public type="id" name="fab_menu_main_fab" id="0x7f0a02d7" />
+    <public type="id" name="fab_menu_table" id="0x7f0a02d8" />
+    <public type="id" name="fatal_crash_app_version" id="0x7f0a02d9" />
+    <public type="id" name="fatal_crash_details" id="0x7f0a02da" />
+    <public type="id" name="fatal_crash_device" id="0x7f0a02db" />
+    <public type="id" name="fatal_crash_os_version" id="0x7f0a02dc" />
+    <public type="id" name="fatal_crash_source" id="0x7f0a02dd" />
+    <public type="id" name="fatal_crash_testers_invite" id="0x7f0a02de" />
+    <public type="id" name="fatal_crash_time" id="0x7f0a02df" />
+    <public type="id" name="file_name_tv" id="0x7f0a02e0" />
+    <public type="id" name="file_subtitle_tv" id="0x7f0a02e1" />
+    <public type="id" name="fill" id="0x7f0a02e2" />
+    <public type="id" name="fill_horizontal" id="0x7f0a02e3" />
+    <public type="id" name="fill_vertical" id="0x7f0a02e4" />
+    <public type="id" name="filled" id="0x7f0a02e5" />
+    <public type="id" name="fitBottomStart" id="0x7f0a02e6" />
+    <public type="id" name="fitCenter" id="0x7f0a02e7" />
+    <public type="id" name="fitEnd" id="0x7f0a02e8" />
+    <public type="id" name="fitStart" id="0x7f0a02e9" />
+    <public type="id" name="fitXY" id="0x7f0a02ea" />
+    <public type="id" name="fixed" id="0x7f0a02eb" />
+    <public type="id" name="flex_end" id="0x7f0a02ec" />
+    <public type="id" name="flex_start" id="0x7f0a02ed" />
+    <public type="id" name="focusCrop" id="0x7f0a02ee" />
+    <public type="id" name="folder_view_folder_image" id="0x7f0a02ef" />
+    <public type="id" name="forever" id="0x7f0a02f0" />
+    <public type="id" name="friend_container" id="0x7f0a02f1" />
+    <public type="id" name="friends_add_container" id="0x7f0a02f2" />
+    <public type="id" name="friends_add_header" id="0x7f0a02f3" />
+    <public type="id" name="friends_add_nearby" id="0x7f0a02f4" />
+    <public type="id" name="friends_add_send" id="0x7f0a02f5" />
+    <public type="id" name="friends_add_text_edit" id="0x7f0a02f6" />
+    <public type="id" name="friends_add_text_edit_wrap" id="0x7f0a02f7" />
+    <public type="id" name="friends_list_item_avatar" id="0x7f0a02f8" />
+    <public type="id" name="friends_list_item_avatar_wrap" id="0x7f0a02f9" />
+    <public type="id" name="friends_list_item_empty" id="0x7f0a02fa" />
+    <public type="id" name="friends_list_item_empty_invite" id="0x7f0a02fb" />
+    <public type="id" name="friends_list_item_empty_no_blocked" id="0x7f0a02fc" />
+    <public type="id" name="friends_list_item_empty_no_friends" id="0x7f0a02fd" />
+    <public type="id" name="friends_list_item_empty_no_online" id="0x7f0a02fe" />
+    <public type="id" name="friends_list_item_empty_no_request" id="0x7f0a02ff" />
+    <public type="id" name="friends_list_item_empty_no_suggestions" id="0x7f0a0300" />
+    <public type="id" name="friends_list_item_game" id="0x7f0a0301" />
+    <public type="id" name="friends_list_item_mutual_1" id="0x7f0a0302" />
+    <public type="id" name="friends_list_item_mutual_1_icon" id="0x7f0a0303" />
+    <public type="id" name="friends_list_item_mutual_1_text" id="0x7f0a0304" />
+    <public type="id" name="friends_list_item_mutual_2" id="0x7f0a0305" />
+    <public type="id" name="friends_list_item_mutual_2_icon" id="0x7f0a0306" />
+    <public type="id" name="friends_list_item_mutual_2_text" id="0x7f0a0307" />
+    <public type="id" name="friends_list_item_mutual_3" id="0x7f0a0308" />
+    <public type="id" name="friends_list_item_mutual_3_icon" id="0x7f0a0309" />
+    <public type="id" name="friends_list_item_mutual_3_text" id="0x7f0a030a" />
+    <public type="id" name="friends_list_item_mutual_4" id="0x7f0a030b" />
+    <public type="id" name="friends_list_item_mutual_4_icon" id="0x7f0a030c" />
+    <public type="id" name="friends_list_item_mutual_4_text" id="0x7f0a030d" />
+    <public type="id" name="friends_list_item_mutual_wrap" id="0x7f0a030e" />
+    <public type="id" name="friends_list_item_name" id="0x7f0a030f" />
+    <public type="id" name="friends_list_item_presence" id="0x7f0a0310" />
+    <public type="id" name="friends_list_item_text" id="0x7f0a0311" />
+    <public type="id" name="friends_list_recycler" id="0x7f0a0312" />
+    <public type="id" name="front" id="0x7f0a0313" />
+    <public type="id" name="ghost_view" id="0x7f0a0314" />
+    <public type="id" name="gift_entitlement_code" id="0x7f0a0315" />
+    <public type="id" name="gift_entitlement_code_container" id="0x7f0a0316" />
+    <public type="id" name="gift_entitlement_container" id="0x7f0a0317" />
+    <public type="id" name="gift_entitlement_copy" id="0x7f0a0318" />
+    <public type="id" name="gift_entitlement_divider" id="0x7f0a0319" />
+    <public type="id" name="gift_entitlement_flipper" id="0x7f0a031a" />
+    <public type="id" name="gift_entitlement_generate" id="0x7f0a031b" />
+    <public type="id" name="gift_entitlement_revoke" id="0x7f0a031c" />
+    <public type="id" name="gift_sku_arrow" id="0x7f0a031d" />
+    <public type="id" name="gift_sku_copies" id="0x7f0a031e" />
+    <public type="id" name="gift_sku_icon" id="0x7f0a031f" />
+    <public type="id" name="gift_sku_name" id="0x7f0a0320" />
+    <public type="id" name="global_search_add_a_friend_btn" id="0x7f0a0321" />
+    <public type="id" name="global_search_guild_list" id="0x7f0a0322" />
+    <public type="id" name="global_search_join_guild_btn" id="0x7f0a0323" />
+    <public type="id" name="global_search_recycler" id="0x7f0a0324" />
+    <public type="id" name="global_search_view_flipper" id="0x7f0a0325" />
+    <public type="id" name="golive_stream_ended" id="0x7f0a0326" />
+    <public type="id" name="golive_stream_loading_indicator" id="0x7f0a0327" />
+    <public type="id" name="golive_stream_paused" id="0x7f0a0328" />
+    <public type="id" name="golive_stream_video_renderer" id="0x7f0a0329" />
+    <public type="id" name="gone" id="0x7f0a032a" />
+    <public type="id" name="group_divider" id="0x7f0a032b" />
+    <public type="id" name="group_dm_settings_scroll_view" id="0x7f0a032c" />
+    <public type="id" name="group_invite_friends_chips" id="0x7f0a032d" />
+    <public type="id" name="group_invite_friends_recipients_container" id="0x7f0a032e" />
+    <public type="id" name="group_invite_friends_recycler" id="0x7f0a032f" />
+    <public type="id" name="group_invite_friends_save_fab" id="0x7f0a0330" />
+    <public type="id" name="group_invite_friends_text_to" id="0x7f0a0331" />
+    <public type="id" name="group_invite_friends_view_flipper" id="0x7f0a0332" />
+    <public type="id" name="groups" id="0x7f0a0333" />
+    <public type="id" name="guideline" id="0x7f0a0334" />
+    <public type="id" name="guild_actions_add_create" id="0x7f0a0335" />
+    <public type="id" name="guild_actions_add_create_desc" id="0x7f0a0336" />
+    <public type="id" name="guild_actions_add_join" id="0x7f0a0337" />
+    <public type="id" name="guild_actions_add_join_desc" id="0x7f0a0338" />
+    <public type="id" name="guild_actions_manage_channels_divider" id="0x7f0a0339" />
+    <public type="id" name="guild_actions_overview_boost" id="0x7f0a033a" />
+    <public type="id" name="guild_actions_overview_change_nickname" id="0x7f0a033b" />
+    <public type="id" name="guild_actions_overview_copy_id" id="0x7f0a033c" />
+    <public type="id" name="guild_actions_overview_create_category" id="0x7f0a033d" />
+    <public type="id" name="guild_actions_overview_create_channel" id="0x7f0a033e" />
+    <public type="id" name="guild_actions_overview_header_icon_iv" id="0x7f0a033f" />
+    <public type="id" name="guild_actions_overview_header_icon_tv" id="0x7f0a0340" />
+    <public type="id" name="guild_actions_overview_header_tv" id="0x7f0a0341" />
+    <public type="id" name="guild_actions_overview_leave" id="0x7f0a0342" />
+    <public type="id" name="guild_actions_overview_mark_as_read" id="0x7f0a0343" />
+    <public type="id" name="guild_actions_overview_notifications" id="0x7f0a0344" />
+    <public type="id" name="guild_actions_overview_privacy_cs" id="0x7f0a0345" />
+    <public type="id" name="guild_actions_overview_settings" id="0x7f0a0346" />
+    <public type="id" name="guild_actions_overview_show_hide_muted_channels" id="0x7f0a0347" />
+    <public type="id" name="guild_call_controls" id="0x7f0a0348" />
+    <public type="id" name="guild_call_participant_list" id="0x7f0a0349" />
+    <public type="id" name="guild_call_view_flipper" id="0x7f0a034a" />
+    <public type="id" name="guild_create_guidelines" id="0x7f0a034b" />
+    <public type="id" name="guild_create_icon" id="0x7f0a034c" />
+    <public type="id" name="guild_create_icon_placeholder" id="0x7f0a034d" />
+    <public type="id" name="guild_create_icon_wrap" id="0x7f0a034e" />
+    <public type="id" name="guild_create_name" id="0x7f0a034f" />
+    <public type="id" name="guild_create_regions" id="0x7f0a0350" />
+    <public type="id" name="guild_invite_accept" id="0x7f0a0351" />
+    <public type="id" name="guild_invite_actions" id="0x7f0a0352" />
+    <public type="id" name="guild_invite_cancel" id="0x7f0a0353" />
+    <public type="id" name="guild_invite_channel_spinner" id="0x7f0a0354" />
+    <public type="id" name="guild_invite_empty_results" id="0x7f0a0355" />
+    <public type="id" name="guild_invite_empty_suggestions_container" id="0x7f0a0356" />
+    <public type="id" name="guild_invite_empty_suggestions_invite_link" id="0x7f0a0357" />
+    <public type="id" name="guild_invite_empty_suggestions_invite_share_btn" id="0x7f0a0358" />
+    <public type="id" name="guild_invite_empty_suggestions_settings_edit" id="0x7f0a0359" />
+    <public type="id" name="guild_invite_empty_suggestions_settings_invite_link_subtext" id="0x7f0a035a" />
+    <public type="id" name="guild_invite_expires_after_radiogroup" id="0x7f0a035b" />
+    <public type="id" name="guild_invite_friends_subtitle" id="0x7f0a035c" />
+    <public type="id" name="guild_invite_friends_title" id="0x7f0a035d" />
+    <public type="id" name="guild_invite_generate_link" id="0x7f0a035e" />
+    <public type="id" name="guild_invite_info" id="0x7f0a035f" />
+    <public type="id" name="guild_invite_link" id="0x7f0a0360" />
+    <public type="id" name="guild_invite_max_uses_radiogroup" id="0x7f0a0361" />
+    <public type="id" name="guild_invite_never_expire" id="0x7f0a0362" />
+    <public type="id" name="guild_invite_settings_edit" id="0x7f0a0363" />
+    <public type="id" name="guild_invite_share_btn" id="0x7f0a0364" />
+    <public type="id" name="guild_invite_splash" id="0x7f0a0365" />
+    <public type="id" name="guild_invite_suggestion_list" id="0x7f0a0366" />
+    <public type="id" name="guild_invite_suggestions_flipper" id="0x7f0a0367" />
+    <public type="id" name="guild_invite_temporary_membership" id="0x7f0a0368" />
+    <public type="id" name="guild_join_action_btn" id="0x7f0a0369" />
+    <public type="id" name="guild_join_content" id="0x7f0a036a" />
+    <public type="id" name="guild_join_invite" id="0x7f0a036b" />
+    <public type="id" name="guild_list" id="0x7f0a036c" />
+    <public type="id" name="guild_list_add_hint" id="0x7f0a036d" />
+    <public type="id" name="guild_list_unreads_stub" id="0x7f0a036e" />
+    <public type="id" name="guild_notifications_add_override" id="0x7f0a036f" />
+    <public type="id" name="guild_notifications_channel_list" id="0x7f0a0370" />
+    <public type="id" name="guild_notifications_override_list" id="0x7f0a0371" />
+    <public type="id" name="guild_search_item_avatar" id="0x7f0a0372" />
+    <public type="id" name="guild_search_item_name" id="0x7f0a0373" />
+    <public type="id" name="guild_search_recycler" id="0x7f0a0374" />
+    <public type="id" name="guild_transfer_ownership_acknowledge_check" id="0x7f0a0375" />
+    <public type="id" name="guild_transfer_ownership_cancel" id="0x7f0a0376" />
+    <public type="id" name="guild_transfer_ownership_confirm" id="0x7f0a0377" />
+    <public type="id" name="guild_transfer_ownership_mfa_code" id="0x7f0a0378" />
+    <public type="id" name="guild_transfer_ownership_mfa_wrap" id="0x7f0a0379" />
+    <public type="id" name="guild_view_1" id="0x7f0a037a" />
+    <public type="id" name="guild_view_2" id="0x7f0a037b" />
+    <public type="id" name="guild_view_3" id="0x7f0a037c" />
+    <public type="id" name="guild_view_4" id="0x7f0a037d" />
+    <public type="id" name="guild_view_image" id="0x7f0a037e" />
+    <public type="id" name="guild_view_text" id="0x7f0a037f" />
+    <public type="id" name="guild_views" id="0x7f0a0380" />
+    <public type="id" name="guilds_item_avatar" id="0x7f0a0381" />
+    <public type="id" name="guilds_item_avatar_text" id="0x7f0a0382" />
+    <public type="id" name="guilds_item_avatar_wrap" id="0x7f0a0383" />
+    <public type="id" name="guilds_item_dm_avatar" id="0x7f0a0384" />
+    <public type="id" name="guilds_item_dm_count" id="0x7f0a0385" />
+    <public type="id" name="guilds_item_folder" id="0x7f0a0386" />
+    <public type="id" name="guilds_item_folder_container" id="0x7f0a0387" />
+    <public type="id" name="guilds_item_guild_new_avatar" id="0x7f0a0388" />
+    <public type="id" name="guilds_item_highlight" id="0x7f0a0389" />
+    <public type="id" name="guilds_item_mentions" id="0x7f0a038a" />
+    <public type="id" name="guilds_item_profile_avatar" id="0x7f0a038b" />
+    <public type="id" name="guilds_item_profile_selected" id="0x7f0a038c" />
+    <public type="id" name="guilds_item_selected" id="0x7f0a038d" />
+    <public type="id" name="guilds_item_unread" id="0x7f0a038e" />
+    <public type="id" name="guilds_item_voice" id="0x7f0a038f" />
+    <public type="id" name="hardware" id="0x7f0a0390" />
+    <public type="id" name="header_item_text" id="0x7f0a0391" />
+    <public type="id" name="home" id="0x7f0a0392" />
+    <public type="id" name="homeAsUp" id="0x7f0a0393" />
+    <public type="id" name="icon" id="0x7f0a0394" />
+    <public type="id" name="icon_group" id="0x7f0a0395" />
+    <public type="id" name="icon_only" id="0x7f0a0396" />
+    <public type="id" name="ifRoom" id="0x7f0a0397" />
+    <public type="id" name="image" id="0x7f0a0398" />
+    <public type="id" name="image_bottom_guideline" id="0x7f0a0399" />
+    <public type="id" name="image_view_crop" id="0x7f0a039a" />
+    <public type="id" name="image_view_logo" id="0x7f0a039b" />
+    <public type="id" name="image_view_state_aspect_ratio" id="0x7f0a039c" />
+    <public type="id" name="image_view_state_rotate" id="0x7f0a039d" />
+    <public type="id" name="image_view_state_scale" id="0x7f0a039e" />
+    <public type="id" name="incoming_call_accept_button" id="0x7f0a039f" />
+    <public type="id" name="incoming_call_accept_container" id="0x7f0a03a0" />
+    <public type="id" name="incoming_call_accept_text" id="0x7f0a03a1" />
+    <public type="id" name="incoming_call_connect_voice_only" id="0x7f0a03a2" />
+    <public type="id" name="incoming_call_decline_button" id="0x7f0a03a3" />
+    <public type="id" name="incoming_call_decline_container" id="0x7f0a03a4" />
+    <public type="id" name="incoming_call_status_container" id="0x7f0a03a5" />
+    <public type="id" name="incoming_call_status_primary" id="0x7f0a03a6" />
+    <public type="id" name="incoming_call_status_secondary" id="0x7f0a03a7" />
+    <public type="id" name="incoming_call_top_guideline" id="0x7f0a03a8" />
+    <public type="id" name="incoming_call_users_recycler" id="0x7f0a03a9" />
+    <public type="id" name="info" id="0x7f0a03aa" />
+    <public type="id" name="integration_header_container" id="0x7f0a03ab" />
+    <public type="id" name="integration_header_disabled_overlay" id="0x7f0a03ac" />
+    <public type="id" name="integration_icon" id="0x7f0a03ad" />
+    <public type="id" name="integration_name" id="0x7f0a03ae" />
+    <public type="id" name="integration_name_container" id="0x7f0a03af" />
+    <public type="id" name="integration_owner_name" id="0x7f0a03b0" />
+    <public type="id" name="integration_settings_icon" id="0x7f0a03b1" />
+    <public type="id" name="integration_sync_switch" id="0x7f0a03b2" />
+    <public type="id" name="integration_syncing_progress_bar" id="0x7f0a03b3" />
+    <public type="id" name="integrations_empty_body" id="0x7f0a03b4" />
+    <public type="id" name="integrations_empty_header" id="0x7f0a03b5" />
+    <public type="id" name="integrations_recycler" id="0x7f0a03b6" />
+    <public type="id" name="integrations_view_flipper" id="0x7f0a03b7" />
+    <public type="id" name="invisible" id="0x7f0a03b8" />
+    <public type="id" name="invite_actions_copy" id="0x7f0a03b9" />
+    <public type="id" name="invite_actions_revoke" id="0x7f0a03ba" />
+    <public type="id" name="invite_actions_share" id="0x7f0a03bb" />
+    <public type="id" name="invite_actions_title" id="0x7f0a03bc" />
+    <public type="id" name="invite_avatar" id="0x7f0a03bd" />
+    <public type="id" name="invite_avatar_small" id="0x7f0a03be" />
+    <public type="id" name="invite_avatar_small_wrap" id="0x7f0a03bf" />
+    <public type="id" name="invite_avatar_wrap" id="0x7f0a03c0" />
+    <public type="id" name="invite_channel" id="0x7f0a03c1" />
+    <public type="id" name="invite_code" id="0x7f0a03c2" />
+    <public type="id" name="invite_container" id="0x7f0a03c3" />
+    <public type="id" name="invite_divider" id="0x7f0a03c4" />
+    <public type="id" name="invite_expiration_container" id="0x7f0a03c5" />
+    <public type="id" name="invite_expiration_time" id="0x7f0a03c6" />
+    <public type="id" name="invite_expired_image" id="0x7f0a03c7" />
+    <public type="id" name="invite_expires_label" id="0x7f0a03c8" />
+    <public type="id" name="invite_list_item_avatar" id="0x7f0a03c9" />
+    <public type="id" name="invite_members_online" id="0x7f0a03ca" />
+    <public type="id" name="invite_members_online_wrap" id="0x7f0a03cb" />
+    <public type="id" name="invite_members_total" id="0x7f0a03cc" />
+    <public type="id" name="invite_members_total_wrap" id="0x7f0a03cd" />
+    <public type="id" name="invite_members_wrap" id="0x7f0a03ce" />
+    <public type="id" name="invite_message" id="0x7f0a03cf" />
+    <public type="id" name="invite_name_container" id="0x7f0a03d0" />
+    <public type="id" name="invite_settings_bottom_sheet" id="0x7f0a03d1" />
+    <public type="id" name="invite_settings_icon" id="0x7f0a03d2" />
+    <public type="id" name="invite_title" id="0x7f0a03d3" />
+    <public type="id" name="invite_user_name" id="0x7f0a03d4" />
+    <public type="id" name="invite_uses" id="0x7f0a03d5" />
+    <public type="id" name="invite_uses_label" id="0x7f0a03d6" />
+    <public type="id" name="italic" id="0x7f0a03d7" />
+    <public type="id" name="item_backup_code_tv" id="0x7f0a03d8" />
+    <public type="id" name="item_check_indicator" id="0x7f0a03d9" />
+    <public type="id" name="item_description_tv" id="0x7f0a03da" />
+    <public type="id" name="item_game_invite_application_name" id="0x7f0a03db" />
+    <public type="id" name="item_game_invite_cover_image" id="0x7f0a03dc" />
+    <public type="id" name="item_game_invite_header" id="0x7f0a03dd" />
+    <public type="id" name="item_game_invite_recycler" id="0x7f0a03de" />
+    <public type="id" name="item_game_invite_status" id="0x7f0a03df" />
+    <public type="id" name="item_gift_accept_button" id="0x7f0a03e0" />
+    <public type="id" name="item_gift_cannot_claim_button" id="0x7f0a03e1" />
+    <public type="id" name="item_gift_details" id="0x7f0a03e2" />
+    <public type="id" name="item_gift_expires" id="0x7f0a03e3" />
+    <public type="id" name="item_gift_header" id="0x7f0a03e4" />
+    <public type="id" name="item_gift_image" id="0x7f0a03e5" />
+    <public type="id" name="item_gift_image_background" id="0x7f0a03e6" />
+    <public type="id" name="item_gift_loading_button_placeholder" id="0x7f0a03e7" />
+    <public type="id" name="item_gift_name" id="0x7f0a03e8" />
+    <public type="id" name="item_gift_subtext" id="0x7f0a03e9" />
+    <public type="id" name="item_gift_verify_button" id="0x7f0a03ea" />
+    <public type="id" name="item_group_tv" id="0x7f0a03eb" />
+    <public type="id" name="item_guild_welcome_header" id="0x7f0a03ec" />
+    <public type="id" name="item_guild_welcome_subheader" id="0x7f0a03ed" />
+    <public type="id" name="item_header" id="0x7f0a03ee" />
+    <public type="id" name="item_header_tv" id="0x7f0a03ef" />
+    <public type="id" name="item_icon_iv" id="0x7f0a03f0" />
+    <public type="id" name="item_invite_btn" id="0x7f0a03f1" />
+    <public type="id" name="item_invite_header" id="0x7f0a03f2" />
+    <public type="id" name="item_invite_image" id="0x7f0a03f3" />
+    <public type="id" name="item_invite_image_text" id="0x7f0a03f4" />
+    <public type="id" name="item_invite_join_button" id="0x7f0a03f5" />
+    <public type="id" name="item_invite_joined_button" id="0x7f0a03f6" />
+    <public type="id" name="item_invite_loading_button" id="0x7f0a03f7" />
+    <public type="id" name="item_invite_member_container" id="0x7f0a03f8" />
+    <public type="id" name="item_invite_mention_button" id="0x7f0a03f9" />
+    <public type="id" name="item_invite_name" id="0x7f0a03fa" />
+    <public type="id" name="item_invite_online_dot" id="0x7f0a03fb" />
+    <public type="id" name="item_invite_online_text" id="0x7f0a03fc" />
+    <public type="id" name="item_invite_total_member_dot" id="0x7f0a03fd" />
+    <public type="id" name="item_invite_total_member_text" id="0x7f0a03fe" />
+    <public type="id" name="item_listen_together_album_image" id="0x7f0a03ff" />
+    <public type="id" name="item_listen_together_artist" id="0x7f0a0400" />
+    <public type="id" name="item_listen_together_container" id="0x7f0a0401" />
+    <public type="id" name="item_listen_together_header" id="0x7f0a0402" />
+    <public type="id" name="item_listen_together_join" id="0x7f0a0403" />
+    <public type="id" name="item_listen_together_recycler" id="0x7f0a0404" />
+    <public type="id" name="item_listen_together_session_ended" id="0x7f0a0405" />
+    <public type="id" name="item_listen_together_track" id="0x7f0a0406" />
+    <public type="id" name="item_mentions_tv" id="0x7f0a0407" />
+    <public type="id" name="item_name_tv" id="0x7f0a0408" />
+    <public type="id" name="item_sent" id="0x7f0a0409" />
+    <public type="id" name="item_touch_helper_previous_elevation" id="0x7f0a040a" />
+    <public type="id" name="item_unread" id="0x7f0a040b" />
+    <public type="id" name="kick_user_body" id="0x7f0a040c" />
+    <public type="id" name="kick_user_cancel" id="0x7f0a040d" />
+    <public type="id" name="kick_user_confirm" id="0x7f0a040e" />
+    <public type="id" name="kick_user_reason" id="0x7f0a040f" />
+    <public type="id" name="kick_user_title" id="0x7f0a0410" />
+    <public type="id" name="labeled" id="0x7f0a0411" />
+    <public type="id" name="largeLabel" id="0x7f0a0412" />
+    <public type="id" name="launch_btn" id="0x7f0a0413" />
+    <public type="id" name="launch_camera_btn" id="0x7f0a0414" />
+    <public type="id" name="layout_aspect_ratio" id="0x7f0a0415" />
+    <public type="id" name="layout_rotate_wheel" id="0x7f0a0416" />
+    <public type="id" name="layout_scale_wheel" id="0x7f0a0417" />
+    <public type="id" name="left" id="0x7f0a0418" />
+    <public type="id" name="light" id="0x7f0a0419" />
+    <public type="id" name="line1" id="0x7f0a041a" />
+    <public type="id" name="line3" id="0x7f0a041b" />
+    <public type="id" name="list" id="0x7f0a041c" />
+    <public type="id" name="listMode" id="0x7f0a041d" />
+    <public type="id" name="list_item" id="0x7f0a041e" />
+    <public type="id" name="loading_button_progress" id="0x7f0a041f" />
+    <public type="id" name="loading_button_text" id="0x7f0a0420" />
+    <public type="id" name="lottie_layer_name" id="0x7f0a0421" />
+    <public type="id" name="main_drawer" id="0x7f0a0422" />
+    <public type="id" name="main_input_container" id="0x7f0a0423" />
+    <public type="id" name="main_panel_center" id="0x7f0a0424" />
+    <public type="id" name="main_panel_center_channel_less" id="0x7f0a0425" />
+    <public type="id" name="main_panel_center_channel_less_body" id="0x7f0a0426" />
+    <public type="id" name="main_panel_center_channel_less_title" id="0x7f0a0427" />
+    <public type="id" name="main_panel_center_nsfw" id="0x7f0a0428" />
+    <public type="id" name="main_panel_center_nsfw_anchor_wrap" id="0x7f0a0429" />
+    <public type="id" name="main_panel_center_nsfw_confirm" id="0x7f0a042a" />
+    <public type="id" name="main_panel_center_nsfw_deny" id="0x7f0a042b" />
+    <public type="id" name="main_panel_left" id="0x7f0a042c" />
+    <public type="id" name="main_panel_loading" id="0x7f0a042d" />
+    <public type="id" name="main_panel_right" id="0x7f0a042e" />
+    <public type="id" name="main_toolbar_unread_count" id="0x7f0a042f" />
+    <public type="id" name="manage_reactions_emoji_container" id="0x7f0a0430" />
+    <public type="id" name="manage_reactions_emoji_counter" id="0x7f0a0431" />
+    <public type="id" name="manage_reactions_emoji_emoji_textview" id="0x7f0a0432" />
+    <public type="id" name="manage_reactions_emoji_selected_indicator" id="0x7f0a0433" />
+    <public type="id" name="manage_reactions_emojis_recycler" id="0x7f0a0434" />
+    <public type="id" name="manage_reactions_result_error_img" id="0x7f0a0435" />
+    <public type="id" name="manage_reactions_result_error_text" id="0x7f0a0436" />
+    <public type="id" name="manage_reactions_result_remove_reaction" id="0x7f0a0437" />
+    <public type="id" name="manage_reactions_result_user_avatar" id="0x7f0a0438" />
+    <public type="id" name="manage_reactions_result_user_name" id="0x7f0a0439" />
+    <public type="id" name="manage_reactions_results_recycler" id="0x7f0a043a" />
+    <public type="id" name="masked" id="0x7f0a043b" />
+    <public type="id" name="media_actions" id="0x7f0a043c" />
+    <public type="id" name="media_image" id="0x7f0a043d" />
+    <public type="id" name="media_video" id="0x7f0a043e" />
+    <public type="id" name="member_list_item_avatar" id="0x7f0a043f" />
+    <public type="id" name="member_list_item_container" id="0x7f0a0440" />
+    <public type="id" name="member_list_item_lock" id="0x7f0a0441" />
+    <public type="id" name="member_list_item_name" id="0x7f0a0442" />
+    <public type="id" name="member_list_item_overflow" id="0x7f0a0443" />
+    <public type="id" name="member_list_item_roles_recycler" id="0x7f0a0444" />
+    <public type="id" name="menu_add_connections" id="0x7f0a0445" />
+    <public type="id" name="menu_audit_log_sort_actions" id="0x7f0a0446" />
+    <public type="id" name="menu_audit_log_sort_users" id="0x7f0a0447" />
+    <public type="id" name="menu_auth_mfa_backup_codes" id="0x7f0a0448" />
+    <public type="id" name="menu_auth_mfa_info" id="0x7f0a0449" />
+    <public type="id" name="menu_channel_notification_settings" id="0x7f0a044a" />
+    <public type="id" name="menu_channel_settings" id="0x7f0a044b" />
+    <public type="id" name="menu_channel_settings_delete" id="0x7f0a044c" />
+    <public type="id" name="menu_channel_settings_reset" id="0x7f0a044d" />
+    <public type="id" name="menu_chat_add_friend" id="0x7f0a044e" />
+    <public type="id" name="menu_chat_dms_close" id="0x7f0a044f" />
+    <public type="id" name="menu_chat_dms_view_profile" id="0x7f0a0450" />
+    <public type="id" name="menu_chat_group_add" id="0x7f0a0451" />
+    <public type="id" name="menu_chat_group_settings" id="0x7f0a0452" />
+    <public type="id" name="menu_chat_pins" id="0x7f0a0453" />
+    <public type="id" name="menu_chat_search" id="0x7f0a0454" />
+    <public type="id" name="menu_chat_side_panel" id="0x7f0a0455" />
+    <public type="id" name="menu_chat_start_call" id="0x7f0a0456" />
+    <public type="id" name="menu_chat_start_group" id="0x7f0a0457" />
+    <public type="id" name="menu_chat_start_video_call" id="0x7f0a0458" />
+    <public type="id" name="menu_chat_stop_call" id="0x7f0a0459" />
+    <public type="id" name="menu_copy_id" id="0x7f0a045a" />
+    <public type="id" name="menu_crop" id="0x7f0a045b" />
+    <public type="id" name="menu_debugging_filter" id="0x7f0a045c" />
+    <public type="id" name="menu_debugging_share" id="0x7f0a045d" />
+    <public type="id" name="menu_edit_overwrite_delete" id="0x7f0a045e" />
+    <public type="id" name="menu_edit_role_delete" id="0x7f0a045f" />
+    <public type="id" name="menu_filter" id="0x7f0a0460" />
+    <public type="id" name="menu_guild_call_channel_settings" id="0x7f0a0461" />
+    <public type="id" name="menu_guild_call_overlay_launcher" id="0x7f0a0462" />
+    <public type="id" name="menu_guild_call_voice_settings" id="0x7f0a0463" />
+    <public type="id" name="menu_guild_create" id="0x7f0a0464" />
+    <public type="id" name="menu_guild_join" id="0x7f0a0465" />
+    <public type="id" name="menu_leave_group" id="0x7f0a0466" />
+    <public type="id" name="menu_loader" id="0x7f0a0467" />
+    <public type="id" name="menu_media_browser" id="0x7f0a0468" />
+    <public type="id" name="menu_media_download" id="0x7f0a0469" />
+    <public type="id" name="menu_media_share" id="0x7f0a046a" />
+    <public type="id" name="menu_private_call_group_settings" id="0x7f0a046b" />
+    <public type="id" name="menu_private_call_participants" id="0x7f0a046c" />
+    <public type="id" name="menu_private_call_select_camera" id="0x7f0a046d" />
+    <public type="id" name="menu_private_call_toggle_speaker_mode" id="0x7f0a046e" />
+    <public type="id" name="menu_private_call_user_settings" id="0x7f0a046f" />
+    <public type="id" name="menu_private_call_voice_settings" id="0x7f0a0470" />
+    <public type="id" name="menu_send" id="0x7f0a0471" />
+    <public type="id" name="menu_server_settings_delete" id="0x7f0a0472" />
+    <public type="id" name="menu_server_settings_emoji_delete" id="0x7f0a0473" />
+    <public type="id" name="menu_server_settings_members_prune" id="0x7f0a0474" />
+    <public type="id" name="menu_settings_debugging" id="0x7f0a0475" />
+    <public type="id" name="menu_settings_log_out" id="0x7f0a0476" />
+    <public type="id" name="menu_sort_channel" id="0x7f0a0477" />
+    <public type="id" name="menu_sort_done" id="0x7f0a0478" />
+    <public type="id" name="menu_spectate_report_problem" id="0x7f0a0479" />
+    <public type="id" name="menu_spectate_spectators" id="0x7f0a047a" />
+    <public type="id" name="menu_user_mentions_filter" id="0x7f0a047b" />
+    <public type="id" name="menu_user_profile_block" id="0x7f0a047c" />
+    <public type="id" name="menu_user_profile_cancel" id="0x7f0a047d" />
+    <public type="id" name="menu_user_profile_ignore" id="0x7f0a047e" />
+    <public type="id" name="menu_user_profile_message" id="0x7f0a047f" />
+    <public type="id" name="menu_user_profile_remove_friend" id="0x7f0a0480" />
+    <public type="id" name="menu_user_profile_unblock" id="0x7f0a0481" />
+    <public type="id" name="message" id="0x7f0a0482" />
+    <public type="id" name="mfa_description_text" id="0x7f0a0483" />
+    <public type="id" name="mfa_download_body" id="0x7f0a0484" />
+    <public type="id" name="mfa_success_enable_sms" id="0x7f0a0485" />
+    <public type="id" name="middle" id="0x7f0a0486" />
+    <public type="id" name="mini" id="0x7f0a0487" />
+    <public type="id" name="mtrl_child_content_container" id="0x7f0a0488" />
+    <public type="id" name="mtrl_internal_children_alpha_tag" id="0x7f0a0489" />
+    <public type="id" name="multiply" id="0x7f0a048a" />
+    <public type="id" name="mute_toggle" id="0x7f0a048b" />
+    <public type="id" name="navigation_header_container" id="0x7f0a048c" />
+    <public type="id" name="navigation_indicator" id="0x7f0a048d" />
+    <public type="id" name="nearby_friends_button_flipper" id="0x7f0a048e" />
+    <public type="id" name="nearby_friends_disable" id="0x7f0a048f" />
+    <public type="id" name="nearby_friends_enable" id="0x7f0a0490" />
+    <public type="id" name="nearby_friends_error" id="0x7f0a0491" />
+    <public type="id" name="nearby_friends_flipper" id="0x7f0a0492" />
+    <public type="id" name="nearby_friends_learn_more" id="0x7f0a0493" />
+    <public type="id" name="nearby_friends_recycler" id="0x7f0a0494" />
+    <public type="id" name="nearby_friends_searching" id="0x7f0a0495" />
+    <public type="id" name="nearby_friends_searching_lottie" id="0x7f0a0496" />
+    <public type="id" name="never" id="0x7f0a0497" />
+    <public type="id" name="news_item_view" id="0x7f0a0498" />
+    <public type="id" name="no_bans_body" id="0x7f0a0499" />
+    <public type="id" name="no_invites_body" id="0x7f0a049a" />
+    <public type="id" name="no_invites_header" id="0x7f0a049b" />
+    <public type="id" name="no_logs_body" id="0x7f0a049c" />
+    <public type="id" name="no_logs_title" id="0x7f0a049d" />
+    <public type="id" name="no_results_text" id="0x7f0a049e" />
+    <public type="id" name="none" id="0x7f0a049f" />
+    <public type="id" name="normal" id="0x7f0a04a0" />
+    <public type="id" name="notice_body_container" id="0x7f0a04a1" />
+    <public type="id" name="notice_body_text" id="0x7f0a04a2" />
+    <public type="id" name="notice_cancel" id="0x7f0a04a3" />
+    <public type="id" name="notice_crop" id="0x7f0a04a4" />
+    <public type="id" name="notice_header" id="0x7f0a04a5" />
+    <public type="id" name="notice_header_container" id="0x7f0a04a6" />
+    <public type="id" name="notice_image" id="0x7f0a04a7" />
+    <public type="id" name="notice_ok" id="0x7f0a04a8" />
+    <public type="id" name="notice_upload" id="0x7f0a04a9" />
+    <public type="id" name="notification_background" id="0x7f0a04aa" />
+    <public type="id" name="notification_main_column" id="0x7f0a04ab" />
+    <public type="id" name="notification_main_column_container" id="0x7f0a04ac" />
+    <public type="id" name="nowrap" id="0x7f0a04ad" />
+    <public type="id" name="oauth_application_deauthorize_btn" id="0x7f0a04ae" />
+    <public type="id" name="oauth_application_description_label_tv" id="0x7f0a04af" />
+    <public type="id" name="oauth_application_description_tv" id="0x7f0a04b0" />
+    <public type="id" name="oauth_application_icon_iv" id="0x7f0a04b1" />
+    <public type="id" name="oauth_application_name_tv" id="0x7f0a04b2" />
+    <public type="id" name="oauth_application_permissions_rv" id="0x7f0a04b3" />
+    <public type="id" name="oauth_authorize_application_icon" id="0x7f0a04b4" />
+    <public type="id" name="oauth_authorize_application_name" id="0x7f0a04b5" />
+    <public type="id" name="oauth_authorize_connect_label" id="0x7f0a04b6" />
+    <public type="id" name="oauth_authorize_content" id="0x7f0a04b7" />
+    <public type="id" name="oauth_authorize_deny" id="0x7f0a04b8" />
+    <public type="id" name="oauth_authorize_grant" id="0x7f0a04b9" />
+    <public type="id" name="oauth_authorize_loading" id="0x7f0a04ba" />
+    <public type="id" name="oauth_authorize_loading_cancel" id="0x7f0a04bb" />
+    <public type="id" name="oauth_authorize_not_supported" id="0x7f0a04bc" />
+    <public type="id" name="oauth_authorize_permissions_label_tv" id="0x7f0a04bd" />
+    <public type="id" name="oauth_authorize_permissions_list" id="0x7f0a04be" />
+    <public type="id" name="oauth_authorize_security_notice" id="0x7f0a04bf" />
+    <public type="id" name="oauth_authorize_unsupported_browser" id="0x7f0a04c0" />
+    <public type="id" name="oauth_authorize_unsupported_cancel" id="0x7f0a04c1" />
+    <public type="id" name="oauth_token_permission_detailed_desc" id="0x7f0a04c2" />
+    <public type="id" name="oauth_token_permission_detailed_icon" id="0x7f0a04c3" />
+    <public type="id" name="oauth_token_permission_detailed_name" id="0x7f0a04c4" />
+    <public type="id" name="off" id="0x7f0a04c5" />
+    <public type="id" name="off_disabled_overlay" id="0x7f0a04c6" />
+    <public type="id" name="on" id="0x7f0a04c7" />
+    <public type="id" name="outline" id="0x7f0a04c8" />
+    <public type="id" name="overlay_bubble_iv" id="0x7f0a04c9" />
+    <public type="id" name="overlay_channel_name" id="0x7f0a04ca" />
+    <public type="id" name="overlay_guild_name" id="0x7f0a04cb" />
+    <public type="id" name="overlay_header" id="0x7f0a04cc" />
+    <public type="id" name="overlay_invite_link" id="0x7f0a04cd" />
+    <public type="id" name="overlay_linked_anchor_view" id="0x7f0a04ce" />
+    <public type="id" name="overlay_members_overflow_tv" id="0x7f0a04cf" />
+    <public type="id" name="overlay_members_rv" id="0x7f0a04d0" />
+    <public type="id" name="overlay_menu" id="0x7f0a04d1" />
+    <public type="id" name="overlay_network_icon" id="0x7f0a04d2" />
+    <public type="id" name="overlay_open_app" id="0x7f0a04d3" />
+    <public type="id" name="overlay_switch_channels" id="0x7f0a04d4" />
+    <public type="id" name="packed" id="0x7f0a04d5" />
+    <public type="id" name="page_tabs" id="0x7f0a04d6" />
+    <public type="id" name="parallax" id="0x7f0a04d7" />
+    <public type="id" name="parent" id="0x7f0a04d8" />
+    <public type="id" name="parentPanel" id="0x7f0a04d9" />
+    <public type="id" name="parent_matrix" id="0x7f0a04da" />
+    <public type="id" name="participant_bg_avatar" id="0x7f0a04db" />
+    <public type="id" name="participant_bg_letterbox" id="0x7f0a04dc" />
+    <public type="id" name="participant_content_container" id="0x7f0a04dd" />
+    <public type="id" name="participant_video_loading_indicator" id="0x7f0a04de" />
+    <public type="id" name="participant_video_stream_renderer" id="0x7f0a04df" />
+    <public type="id" name="participant_voice_status_indicator" id="0x7f0a04e0" />
+    <public type="id" name="participant_voice_user_view" id="0x7f0a04e1" />
+    <public type="id" name="payment_info_address_1_textinputlayout" id="0x7f0a04e2" />
+    <public type="id" name="payment_info_address_2_textinputlayout" id="0x7f0a04e3" />
+    <public type="id" name="payment_info_cancel" id="0x7f0a04e4" />
+    <public type="id" name="payment_info_city_edittext" id="0x7f0a04e5" />
+    <public type="id" name="payment_info_city_textinputlayout" id="0x7f0a04e6" />
+    <public type="id" name="payment_info_delete" id="0x7f0a04e7" />
+    <public type="id" name="payment_info_make_default_checkbox" id="0x7f0a04e8" />
+    <public type="id" name="payment_info_name_address_1_edittext" id="0x7f0a04e9" />
+    <public type="id" name="payment_info_name_address_2_edittext" id="0x7f0a04ea" />
+    <public type="id" name="payment_info_name_edittext" id="0x7f0a04eb" />
+    <public type="id" name="payment_info_name_textinputlayout" id="0x7f0a04ec" />
+    <public type="id" name="payment_info_save" id="0x7f0a04ed" />
+    <public type="id" name="payment_info_zip_edittext" id="0x7f0a04ee" />
+    <public type="id" name="payment_info_zip_textinputlayout" id="0x7f0a04ef" />
+    <public type="id" name="payment_method_edit" id="0x7f0a04f0" />
+    <public type="id" name="payment_method_header" id="0x7f0a04f1" />
+    <public type="id" name="payment_method_summary" id="0x7f0a04f2" />
+    <public type="id" name="payment_methods_empty_add" id="0x7f0a04f3" />
+    <public type="id" name="payment_methods_empty_image" id="0x7f0a04f4" />
+    <public type="id" name="payment_methods_empty_subtext" id="0x7f0a04f5" />
+    <public type="id" name="payment_methods_empty_title" id="0x7f0a04f6" />
+    <public type="id" name="payment_methods_loading" id="0x7f0a04f7" />
+    <public type="id" name="payment_methods_recycler" id="0x7f0a04f8" />
+    <public type="id" name="payment_methods_retry" id="0x7f0a04f9" />
+    <public type="id" name="payment_methods_view_flipper" id="0x7f0a04fa" />
+    <public type="id" name="payment_source_edit_address1" id="0x7f0a04fb" />
+    <public type="id" name="payment_source_edit_address2" id="0x7f0a04fc" />
+    <public type="id" name="payment_source_edit_city" id="0x7f0a04fd" />
+    <public type="id" name="payment_source_edit_country" id="0x7f0a04fe" />
+    <public type="id" name="payment_source_edit_default" id="0x7f0a04ff" />
+    <public type="id" name="payment_source_edit_error" id="0x7f0a0500" />
+    <public type="id" name="payment_source_edit_help" id="0x7f0a0501" />
+    <public type="id" name="payment_source_edit_name" id="0x7f0a0502" />
+    <public type="id" name="payment_source_edit_postal_code" id="0x7f0a0503" />
+    <public type="id" name="payment_source_edit_state" id="0x7f0a0504" />
+    <public type="id" name="payment_source_summary" id="0x7f0a0505" />
+    <public type="id" name="payment_source_view_icon" id="0x7f0a0506" />
+    <public type="id" name="payment_source_view_icon_wrapper" id="0x7f0a0507" />
+    <public type="id" name="payment_source_view_invalid" id="0x7f0a0508" />
+    <public type="id" name="payment_source_view_premium" id="0x7f0a0509" />
+    <public type="id" name="payment_source_view_subtext" id="0x7f0a050a" />
+    <public type="id" name="payment_source_view_title" id="0x7f0a050b" />
+    <public type="id" name="percent" id="0x7f0a050c" />
+    <public type="id" name="perk_view_content_list_item" id="0x7f0a050d" />
+    <public type="id" name="perks_level_contents_header" id="0x7f0a050e" />
+    <public type="id" name="perks_level_contents_recycler" id="0x7f0a050f" />
+    <public type="id" name="perks_level_header" id="0x7f0a0510" />
+    <public type="id" name="perks_level_header_boosts" id="0x7f0a0511" />
+    <public type="id" name="perks_level_header_text" id="0x7f0a0512" />
+    <public type="id" name="perks_level_header_unlocked" id="0x7f0a0513" />
+    <public type="id" name="perm_req_text" id="0x7f0a0514" />
+    <public type="id" name="permissions_container" id="0x7f0a0515" />
+    <public type="id" name="permissions_req_btn" id="0x7f0a0516" />
+    <public type="id" name="pin" id="0x7f0a0517" />
+    <public type="id" name="platform_identities_list" id="0x7f0a0518" />
+    <public type="id" name="popup_attachment" id="0x7f0a0519" />
+    <public type="id" name="popup_body" id="0x7f0a051a" />
+    <public type="id" name="popup_close_btn" id="0x7f0a051b" />
+    <public type="id" name="popup_countdown_progress" id="0x7f0a051c" />
+    <public type="id" name="popup_icon" id="0x7f0a051d" />
+    <public type="id" name="popup_subtitle" id="0x7f0a051e" />
+    <public type="id" name="popup_title" id="0x7f0a051f" />
+    <public type="id" name="premium_perks_upload_text" id="0x7f0a0520" />
+    <public type="id" name="premium_settings_active_subscription" id="0x7f0a0521" />
+    <public type="id" name="premium_settings_credit_container" id="0x7f0a0522" />
+    <public type="id" name="premium_settings_grandfathered" id="0x7f0a0523" />
+    <public type="id" name="premium_settings_legalese" id="0x7f0a0524" />
+    <public type="id" name="premium_settings_nitro" id="0x7f0a0525" />
+    <public type="id" name="premium_settings_nitro_classic" id="0x7f0a0526" />
+    <public type="id" name="premium_settings_nitro_classic_wumpus" id="0x7f0a0527" />
+    <public type="id" name="premium_settings_nitro_wumpus" id="0x7f0a0528" />
+    <public type="id" name="premium_settings_premium_classic_gift" id="0x7f0a0529" />
+    <public type="id" name="premium_settings_premium_classic_monthly" id="0x7f0a052a" />
+    <public type="id" name="premium_settings_premium_classic_yearly" id="0x7f0a052b" />
+    <public type="id" name="premium_settings_premium_gift" id="0x7f0a052c" />
+    <public type="id" name="premium_settings_premium_monthly" id="0x7f0a052d" />
+    <public type="id" name="premium_settings_premium_yearly" id="0x7f0a052e" />
+    <public type="id" name="premium_settings_retry" id="0x7f0a052f" />
+    <public type="id" name="premium_settings_scrollview" id="0x7f0a0530" />
+    <public type="id" name="premium_settings_tier_1_container" id="0x7f0a0531" />
+    <public type="id" name="premium_settings_tier_2_container" id="0x7f0a0532" />
+    <public type="id" name="premium_settings_view_flipper" id="0x7f0a0533" />
+    <public type="id" name="premium_upsell_body" id="0x7f0a0534" />
+    <public type="id" name="premium_upsell_close" id="0x7f0a0535" />
+    <public type="id" name="premium_upsell_dots" id="0x7f0a0536" />
+    <public type="id" name="premium_upsell_header" id="0x7f0a0537" />
+    <public type="id" name="premium_upsell_img" id="0x7f0a0538" />
+    <public type="id" name="premium_upsell_learn_more" id="0x7f0a0539" />
+    <public type="id" name="premium_upsell_viewpager" id="0x7f0a053a" />
+    <public type="id" name="private_call_connect" id="0x7f0a053b" />
+    <public type="id" name="private_call_controls_disconnect" id="0x7f0a053c" />
+    <public type="id" name="private_call_controls_mute" id="0x7f0a053d" />
+    <public type="id" name="private_call_controls_video" id="0x7f0a053e" />
+    <public type="id" name="private_call_participant_list" id="0x7f0a053f" />
+    <public type="id" name="private_call_pip_participant" id="0x7f0a0540" />
+    <public type="id" name="private_call_push_to_talk" id="0x7f0a0541" />
+    <public type="id" name="private_call_status_container" id="0x7f0a0542" />
+    <public type="id" name="private_call_status_primary" id="0x7f0a0543" />
+    <public type="id" name="private_call_status_secondary" id="0x7f0a0544" />
+    <public type="id" name="private_call_top_guideline" id="0x7f0a0545" />
+    <public type="id" name="private_call_video_streams" id="0x7f0a0546" />
+    <public type="id" name="private_call_voice_status_group" id="0x7f0a0547" />
+    <public type="id" name="profile_strip_avatar" id="0x7f0a0548" />
+    <public type="id" name="profile_strip_avatar_image" id="0x7f0a0549" />
+    <public type="id" name="profile_strip_discriminator" id="0x7f0a054a" />
+    <public type="id" name="profile_strip_mentions" id="0x7f0a054b" />
+    <public type="id" name="profile_strip_name" id="0x7f0a054c" />
+    <public type="id" name="profile_strip_search" id="0x7f0a054d" />
+    <public type="id" name="profile_strip_settings" id="0x7f0a054e" />
+    <public type="id" name="profile_strip_status" id="0x7f0a054f" />
+    <public type="id" name="progress_bar" id="0x7f0a0550" />
+    <public type="id" name="progress_cancel_centered" id="0x7f0a0551" />
+    <public type="id" name="progress_cancel_top" id="0x7f0a0552" />
+    <public type="id" name="progress_circular" id="0x7f0a0553" />
+    <public type="id" name="progress_file_image" id="0x7f0a0554" />
+    <public type="id" name="progress_horizontal" id="0x7f0a0555" />
+    <public type="id" name="progress_subtext" id="0x7f0a0556" />
+    <public type="id" name="progress_text" id="0x7f0a0557" />
+    <public type="id" name="prune_user_cancel" id="0x7f0a0558" />
+    <public type="id" name="prune_user_header" id="0x7f0a0559" />
+    <public type="id" name="prune_user_prune" id="0x7f0a055a" />
+    <public type="id" name="prune_users_estimate_text" id="0x7f0a055b" />
+    <public type="id" name="prune_users_history_1_radio" id="0x7f0a055c" />
+    <public type="id" name="prune_users_history_2_radio" id="0x7f0a055d" />
+    <public type="id" name="prune_users_history_3_radio" id="0x7f0a055e" />
+    <public type="id" name="prune_users_loading_progressbar" id="0x7f0a055f" />
+    <public type="id" name="radio" id="0x7f0a0560" />
+    <public type="id" name="reaction_counter_text_1" id="0x7f0a0561" />
+    <public type="id" name="reaction_counter_text_2" id="0x7f0a0562" />
+    <public type="id" name="reaction_counter_text_switcher" id="0x7f0a0563" />
+    <public type="id" name="reaction_emoji_text" id="0x7f0a0564" />
+    <public type="id" name="reaction_quick_add" id="0x7f0a0565" />
+    <public type="id" name="redEye" id="0x7f0a0566" />
+    <public type="id" name="report_error_audio_absent" id="0x7f0a0567" />
+    <public type="id" name="report_error_audio_poor" id="0x7f0a0568" />
+    <public type="id" name="report_error_blurry" id="0x7f0a0569" />
+    <public type="id" name="report_error_lagging" id="0x7f0a056a" />
+    <public type="id" name="report_error_out_of_sync" id="0x7f0a056b" />
+    <public type="id" name="report_error_radio_group" id="0x7f0a056c" />
+    <public type="id" name="report_error_stream_black" id="0x7f0a056d" />
+    <public type="id" name="report_problem_cancel" id="0x7f0a056e" />
+    <public type="id" name="report_problem_header" id="0x7f0a056f" />
+    <public type="id" name="report_problem_submit" id="0x7f0a0570" />
+    <public type="id" name="restart" id="0x7f0a0571" />
+    <public type="id" name="result_count" id="0x7f0a0572" />
+    <public type="id" name="results_rv" id="0x7f0a0573" />
+    <public type="id" name="reverse" id="0x7f0a0574" />
+    <public type="id" name="rich_presence_container" id="0x7f0a0575" />
+    <public type="id" name="rich_presence_container_data" id="0x7f0a0576" />
+    <public type="id" name="rich_presence_details" id="0x7f0a0577" />
+    <public type="id" name="rich_presence_header" id="0x7f0a0578" />
+    <public type="id" name="rich_presence_image_large" id="0x7f0a0579" />
+    <public type="id" name="rich_presence_image_small" id="0x7f0a057a" />
+    <public type="id" name="rich_presence_music_duration" id="0x7f0a057b" />
+    <public type="id" name="rich_presence_music_elapsed" id="0x7f0a057c" />
+    <public type="id" name="rich_presence_play_button" id="0x7f0a057d" />
+    <public type="id" name="rich_presence_play_button_text" id="0x7f0a057e" />
+    <public type="id" name="rich_presence_state" id="0x7f0a057f" />
+    <public type="id" name="rich_presence_superbar" id="0x7f0a0580" />
+    <public type="id" name="rich_presence_time" id="0x7f0a0581" />
+    <public type="id" name="rich_presence_title" id="0x7f0a0582" />
+    <public type="id" name="rich_presence_watch_button" id="0x7f0a0583" />
+    <public type="id" name="right" id="0x7f0a0584" />
+    <public type="id" name="right_icon" id="0x7f0a0585" />
+    <public type="id" name="right_side" id="0x7f0a0586" />
+    <public type="id" name="role_item_checked_setting" id="0x7f0a0587" />
+    <public type="id" name="role_settings_add_reactions" id="0x7f0a0588" />
+    <public type="id" name="role_settings_administrator" id="0x7f0a0589" />
+    <public type="id" name="role_settings_attach_files" id="0x7f0a058a" />
+    <public type="id" name="role_settings_ban_members" id="0x7f0a058b" />
+    <public type="id" name="role_settings_change_nickname" id="0x7f0a058c" />
+    <public type="id" name="role_settings_color_disabled_overlay" id="0x7f0a058d" />
+    <public type="id" name="role_settings_color_selector_container" id="0x7f0a058e" />
+    <public type="id" name="role_settings_create_instant_invite" id="0x7f0a058f" />
+    <public type="id" name="role_settings_current_color_display" id="0x7f0a0590" />
+    <public type="id" name="role_settings_edit_name_disabled_overlay" id="0x7f0a0591" />
+    <public type="id" name="role_settings_embed_links" id="0x7f0a0592" />
+    <public type="id" name="role_settings_hoist_checkedsetting" id="0x7f0a0593" />
+    <public type="id" name="role_settings_kick_members" id="0x7f0a0594" />
+    <public type="id" name="role_settings_manage_channels" id="0x7f0a0595" />
+    <public type="id" name="role_settings_manage_emojis" id="0x7f0a0596" />
+    <public type="id" name="role_settings_manage_messages" id="0x7f0a0597" />
+    <public type="id" name="role_settings_manage_nicknames" id="0x7f0a0598" />
+    <public type="id" name="role_settings_manage_roles" id="0x7f0a0599" />
+    <public type="id" name="role_settings_manage_server" id="0x7f0a059a" />
+    <public type="id" name="role_settings_manage_webhooks" id="0x7f0a059b" />
+    <public type="id" name="role_settings_mention_everyone" id="0x7f0a059c" />
+    <public type="id" name="role_settings_mentionable_checkedsetting" id="0x7f0a059d" />
+    <public type="id" name="role_settings_overview_scroll" id="0x7f0a059e" />
+    <public type="id" name="role_settings_read_message_history" id="0x7f0a059f" />
+    <public type="id" name="role_settings_read_messages" id="0x7f0a05a0" />
+    <public type="id" name="role_settings_send_messages" id="0x7f0a05a1" />
+    <public type="id" name="role_settings_send_tts_messages" id="0x7f0a05a2" />
+    <public type="id" name="role_settings_use_external_emojis" id="0x7f0a05a3" />
+    <public type="id" name="role_settings_view_audit_log" id="0x7f0a05a4" />
+    <public type="id" name="role_settings_voice_connect" id="0x7f0a05a5" />
+    <public type="id" name="role_settings_voice_deafen_members" id="0x7f0a05a6" />
+    <public type="id" name="role_settings_voice_move_members" id="0x7f0a05a7" />
+    <public type="id" name="role_settings_voice_mute_members" id="0x7f0a05a8" />
+    <public type="id" name="role_settings_voice_speak" id="0x7f0a05a9" />
+    <public type="id" name="role_settings_voice_use_voice_activity" id="0x7f0a05aa" />
+    <public type="id" name="role_spinner_item_textview" id="0x7f0a05ab" />
+    <public type="id" name="roles_list_add_role_fab" id="0x7f0a05ac" />
+    <public type="id" name="rotate_scroll_wheel" id="0x7f0a05ad" />
+    <public type="id" name="row" id="0x7f0a05ae" />
+    <public type="id" name="row_reverse" id="0x7f0a05af" />
+    <public type="id" name="save_image_matrix" id="0x7f0a05b0" />
+    <public type="id" name="save_non_transition_alpha" id="0x7f0a05b1" />
+    <public type="id" name="save_scale_type" id="0x7f0a05b2" />
+    <public type="id" name="scale_scroll_wheel" id="0x7f0a05b3" />
+    <public type="id" name="screen" id="0x7f0a05b4" />
+    <public type="id" name="scroll" id="0x7f0a05b5" />
+    <public type="id" name="scrollIndicatorDown" id="0x7f0a05b6" />
+    <public type="id" name="scrollIndicatorUp" id="0x7f0a05b7" />
+    <public type="id" name="scrollView" id="0x7f0a05b8" />
+    <public type="id" name="scroll_view" id="0x7f0a05b9" />
+    <public type="id" name="scrollable" id="0x7f0a05ba" />
+    <public type="id" name="search_back" id="0x7f0a05bb" />
+    <public type="id" name="search_badge" id="0x7f0a05bc" />
+    <public type="id" name="search_bar" id="0x7f0a05bd" />
+    <public type="id" name="search_button" id="0x7f0a05be" />
+    <public type="id" name="search_clear" id="0x7f0a05bf" />
+    <public type="id" name="search_close_btn" id="0x7f0a05c0" />
+    <public type="id" name="search_edit_frame" id="0x7f0a05c1" />
+    <public type="id" name="search_filter" id="0x7f0a05c2" />
+    <public type="id" name="search_flipper" id="0x7f0a05c3" />
+    <public type="id" name="search_go_btn" id="0x7f0a05c4" />
+    <public type="id" name="search_input" id="0x7f0a05c5" />
+    <public type="id" name="search_mag_icon" id="0x7f0a05c6" />
+    <public type="id" name="search_plate" id="0x7f0a05c7" />
+    <public type="id" name="search_results_list" id="0x7f0a05c8" />
+    <public type="id" name="search_send_query_fab" id="0x7f0a05c9" />
+    <public type="id" name="search_src_text" id="0x7f0a05ca" />
+    <public type="id" name="search_suggestion_item_channel_container" id="0x7f0a05cb" />
+    <public type="id" name="search_suggestion_item_has_container" id="0x7f0a05cc" />
+    <public type="id" name="search_suggestion_item_recent_query_container" id="0x7f0a05cd" />
+    <public type="id" name="search_suggestion_item_user_container" id="0x7f0a05ce" />
+    <public type="id" name="search_suggestions_item_channel_icon" id="0x7f0a05cf" />
+    <public type="id" name="search_suggestions_item_channel_text" id="0x7f0a05d0" />
+    <public type="id" name="search_suggestions_item_has_icon" id="0x7f0a05d1" />
+    <public type="id" name="search_suggestions_item_has_text" id="0x7f0a05d2" />
+    <public type="id" name="search_suggestions_item_recent_query_icon" id="0x7f0a05d3" />
+    <public type="id" name="search_suggestions_item_recent_query_text" id="0x7f0a05d4" />
+    <public type="id" name="search_suggestions_recycler" id="0x7f0a05d5" />
+    <public type="id" name="search_voice_btn" id="0x7f0a05d6" />
+    <public type="id" name="select_dialog_listview" id="0x7f0a05d7" />
+    <public type="id" name="selected" id="0x7f0a05d8" />
+    <public type="id" name="selected_checkmark" id="0x7f0a05d9" />
+    <public type="id" name="selection_indicator" id="0x7f0a05da" />
+    <public type="id" name="send_btn" id="0x7f0a05db" />
+    <public type="id" name="server_boost_status_empty_text" id="0x7f0a05dc" />
+    <public type="id" name="server_notifications_everyone_switch" id="0x7f0a05dd" />
+    <public type="id" name="server_notifications_frequency_0_radio" id="0x7f0a05de" />
+    <public type="id" name="server_notifications_frequency_1_radio" id="0x7f0a05df" />
+    <public type="id" name="server_notifications_frequency_2_radio" id="0x7f0a05e0" />
+    <public type="id" name="server_notifications_frequency_wrap" id="0x7f0a05e1" />
+    <public type="id" name="server_notifications_mute_check" id="0x7f0a05e2" />
+    <public type="id" name="server_notifications_push_switch" id="0x7f0a05e3" />
+    <public type="id" name="server_settings_audit_logs_action_filter" id="0x7f0a05e4" />
+    <public type="id" name="server_settings_audit_logs_action_filter_container" id="0x7f0a05e5" />
+    <public type="id" name="server_settings_audit_logs_recycler" id="0x7f0a05e6" />
+    <public type="id" name="server_settings_audit_logs_user_filter" id="0x7f0a05e7" />
+    <public type="id" name="server_settings_audit_logs_user_filter_container" id="0x7f0a05e8" />
+    <public type="id" name="server_settings_audit_logs_view_flipper" id="0x7f0a05e9" />
+    <public type="id" name="server_settings_audit_logs_view_results_flipper" id="0x7f0a05ea" />
+    <public type="id" name="server_settings_bans_option" id="0x7f0a05eb" />
+    <public type="id" name="server_settings_bans_recycler" id="0x7f0a05ec" />
+    <public type="id" name="server_settings_bans_search" id="0x7f0a05ed" />
+    <public type="id" name="server_settings_bans_view_flipper" id="0x7f0a05ee" />
+    <public type="id" name="server_settings_channels_create_channel" id="0x7f0a05ef" />
+    <public type="id" name="server_settings_channels_sort_actions_category" id="0x7f0a05f0" />
+    <public type="id" name="server_settings_channels_sort_actions_text" id="0x7f0a05f1" />
+    <public type="id" name="server_settings_channels_sort_actions_voice" id="0x7f0a05f2" />
+    <public type="id" name="server_settings_channels_text_recycler" id="0x7f0a05f3" />
+    <public type="id" name="server_settings_confirm_disable_integration_body" id="0x7f0a05f4" />
+    <public type="id" name="server_settings_confirm_disable_integration_cancel" id="0x7f0a05f5" />
+    <public type="id" name="server_settings_confirm_disable_integration_confirm" id="0x7f0a05f6" />
+    <public type="id" name="server_settings_confirm_disable_integration_header" id="0x7f0a05f7" />
+    <public type="id" name="server_settings_delete_server_cancel" id="0x7f0a05f8" />
+    <public type="id" name="server_settings_delete_server_confirm" id="0x7f0a05f9" />
+    <public type="id" name="server_settings_delete_server_header" id="0x7f0a05fa" />
+    <public type="id" name="server_settings_delete_server_mfa_code" id="0x7f0a05fb" />
+    <public type="id" name="server_settings_delete_server_mfa_wrap" id="0x7f0a05fc" />
+    <public type="id" name="server_settings_delete_server_text" id="0x7f0a05fd" />
+    <public type="id" name="server_settings_emojis_avatar" id="0x7f0a05fe" />
+    <public type="id" name="server_settings_emojis_container" id="0x7f0a05ff" />
+    <public type="id" name="server_settings_emojis_edit_alias" id="0x7f0a0600" />
+    <public type="id" name="server_settings_emojis_edit_alias_save" id="0x7f0a0601" />
+    <public type="id" name="server_settings_emojis_name" id="0x7f0a0602" />
+    <public type="id" name="server_settings_emojis_option" id="0x7f0a0603" />
+    <public type="id" name="server_settings_emojis_overflow" id="0x7f0a0604" />
+    <public type="id" name="server_settings_emojis_username" id="0x7f0a0605" />
+    <public type="id" name="server_settings_emojis_username_avatar" id="0x7f0a0606" />
+    <public type="id" name="server_settings_instant_invites_option" id="0x7f0a0607" />
+    <public type="id" name="server_settings_instant_invites_recycler" id="0x7f0a0608" />
+    <public type="id" name="server_settings_instant_invites_view_flipper" id="0x7f0a0609" />
+    <public type="id" name="server_settings_members_header_container" id="0x7f0a060a" />
+    <public type="id" name="server_settings_members_name_search" id="0x7f0a060b" />
+    <public type="id" name="server_settings_members_option" id="0x7f0a060c" />
+    <public type="id" name="server_settings_members_recycler" id="0x7f0a060d" />
+    <public type="id" name="server_settings_members_roles_spinner" id="0x7f0a060e" />
+    <public type="id" name="server_settings_members_view_flipper" id="0x7f0a060f" />
+    <public type="id" name="server_settings_moderation_explicit_1" id="0x7f0a0610" />
+    <public type="id" name="server_settings_moderation_explicit_2" id="0x7f0a0611" />
+    <public type="id" name="server_settings_moderation_explicit_3" id="0x7f0a0612" />
+    <public type="id" name="server_settings_moderation_verification_1" id="0x7f0a0613" />
+    <public type="id" name="server_settings_moderation_verification_2" id="0x7f0a0614" />
+    <public type="id" name="server_settings_moderation_verification_3" id="0x7f0a0615" />
+    <public type="id" name="server_settings_moderation_verification_4" id="0x7f0a0616" />
+    <public type="id" name="server_settings_moderation_verification_5" id="0x7f0a0617" />
+    <public type="id" name="server_settings_option_audit_log" id="0x7f0a0618" />
+    <public type="id" name="server_settings_option_channels" id="0x7f0a0619" />
+    <public type="id" name="server_settings_option_integrations" id="0x7f0a061a" />
+    <public type="id" name="server_settings_option_moderation" id="0x7f0a061b" />
+    <public type="id" name="server_settings_option_overview" id="0x7f0a061c" />
+    <public type="id" name="server_settings_option_security" id="0x7f0a061d" />
+    <public type="id" name="server_settings_option_vanity_url" id="0x7f0a061e" />
+    <public type="id" name="server_settings_overview_afk_channel" id="0x7f0a061f" />
+    <public type="id" name="server_settings_overview_afk_channel_wrap" id="0x7f0a0620" />
+    <public type="id" name="server_settings_overview_afk_timeout" id="0x7f0a0621" />
+    <public type="id" name="server_settings_overview_afk_timeout_01" id="0x7f0a0622" />
+    <public type="id" name="server_settings_overview_afk_timeout_05" id="0x7f0a0623" />
+    <public type="id" name="server_settings_overview_afk_timeout_15" id="0x7f0a0624" />
+    <public type="id" name="server_settings_overview_afk_timeout_30" id="0x7f0a0625" />
+    <public type="id" name="server_settings_overview_afk_timeout_60" id="0x7f0a0626" />
+    <public type="id" name="server_settings_overview_afk_timeout_wrap" id="0x7f0a0627" />
+    <public type="id" name="server_settings_overview_icon" id="0x7f0a0628" />
+    <public type="id" name="server_settings_overview_icon_label" id="0x7f0a0629" />
+    <public type="id" name="server_settings_overview_icon_name_container" id="0x7f0a062a" />
+    <public type="id" name="server_settings_overview_icon_remove" id="0x7f0a062b" />
+    <public type="id" name="server_settings_overview_icon_text" id="0x7f0a062c" />
+    <public type="id" name="server_settings_overview_name" id="0x7f0a062d" />
+    <public type="id" name="server_settings_overview_notification_all" id="0x7f0a062e" />
+    <public type="id" name="server_settings_overview_notification_only_mentions" id="0x7f0a062f" />
+    <public type="id" name="server_settings_overview_region" id="0x7f0a0630" />
+    <public type="id" name="server_settings_overview_region_flag" id="0x7f0a0631" />
+    <public type="id" name="server_settings_overview_region_item_name" id="0x7f0a0632" />
+    <public type="id" name="server_settings_overview_region_list" id="0x7f0a0633" />
+    <public type="id" name="server_settings_overview_region_wrap" id="0x7f0a0634" />
+    <public type="id" name="server_settings_overview_save" id="0x7f0a0635" />
+    <public type="id" name="server_settings_overview_scroll" id="0x7f0a0636" />
+    <public type="id" name="server_settings_overview_system_channel" id="0x7f0a0637" />
+    <public type="id" name="server_settings_overview_system_channel_boost" id="0x7f0a0638" />
+    <public type="id" name="server_settings_overview_system_channel_join" id="0x7f0a0639" />
+    <public type="id" name="server_settings_overview_system_channel_wrap" id="0x7f0a063a" />
+    <public type="id" name="server_settings_overview_upload_banner" id="0x7f0a063b" />
+    <public type="id" name="server_settings_overview_upload_banner_container" id="0x7f0a063c" />
+    <public type="id" name="server_settings_overview_upload_banner_fab" id="0x7f0a063d" />
+    <public type="id" name="server_settings_overview_upload_banner_learn_more" id="0x7f0a063e" />
+    <public type="id" name="server_settings_overview_upload_banner_nitro_tier" id="0x7f0a063f" />
+    <public type="id" name="server_settings_overview_upload_banner_remove" id="0x7f0a0640" />
+    <public type="id" name="server_settings_overview_upload_banner_unlock" id="0x7f0a0641" />
+    <public type="id" name="server_settings_overview_upload_splash" id="0x7f0a0642" />
+    <public type="id" name="server_settings_overview_upload_splash_container" id="0x7f0a0643" />
+    <public type="id" name="server_settings_overview_upload_splash_fab" id="0x7f0a0644" />
+    <public type="id" name="server_settings_overview_upload_splash_learn_more" id="0x7f0a0645" />
+    <public type="id" name="server_settings_overview_upload_splash_nitro_tier" id="0x7f0a0646" />
+    <public type="id" name="server_settings_overview_upload_splash_remove" id="0x7f0a0647" />
+    <public type="id" name="server_settings_overview_upload_splash_unlock" id="0x7f0a0648" />
+    <public type="id" name="server_settings_role_item_bottom_divider" id="0x7f0a0649" />
+    <public type="id" name="server_settings_role_item_divider_targeted" id="0x7f0a064a" />
+    <public type="id" name="server_settings_role_item_drag_overlay" id="0x7f0a064b" />
+    <public type="id" name="server_settings_role_item_lock_indicator" id="0x7f0a064c" />
+    <public type="id" name="server_settings_role_item_name" id="0x7f0a064d" />
+    <public type="id" name="server_settings_roles_option" id="0x7f0a064e" />
+    <public type="id" name="server_settings_roles_recycler" id="0x7f0a064f" />
+    <public type="id" name="server_settings_section_general_settings" id="0x7f0a0650" />
+    <public type="id" name="server_settings_section_user_management" id="0x7f0a0651" />
+    <public type="id" name="server_settings_section_user_management_divider" id="0x7f0a0652" />
+    <public type="id" name="server_settings_security_dialog_cancel" id="0x7f0a0653" />
+    <public type="id" name="server_settings_security_dialog_confirm" id="0x7f0a0654" />
+    <public type="id" name="server_settings_security_label" id="0x7f0a0655" />
+    <public type="id" name="server_settings_security_server_mfa_code" id="0x7f0a0656" />
+    <public type="id" name="server_settings_security_toggle_mfa_button" id="0x7f0a0657" />
+    <public type="id" name="server_settings_server_icon" id="0x7f0a0658" />
+    <public type="id" name="server_settings_server_icon_text" id="0x7f0a0659" />
+    <public type="id" name="server_settings_server_name" id="0x7f0a065a" />
+    <public type="id" name="server_settings_vanity_input" id="0x7f0a065b" />
+    <public type="id" name="server_settings_vanity_url_current_url" id="0x7f0a065c" />
+    <public type="id" name="server_settings_vanity_url_error_text" id="0x7f0a065d" />
+    <public type="id" name="server_settings_vanity_url_input_container" id="0x7f0a065e" />
+    <public type="id" name="server_settings_vanity_url_loading_indicator" id="0x7f0a065f" />
+    <public type="id" name="server_settings_vanity_url_prefix" id="0x7f0a0660" />
+    <public type="id" name="server_settings_vanity_url_remove" id="0x7f0a0661" />
+    <public type="id" name="server_settings_vanity_url_save" id="0x7f0a0662" />
+    <public type="id" name="setting_button" id="0x7f0a0663" />
+    <public type="id" name="setting_container" id="0x7f0a0664" />
+    <public type="id" name="setting_disabled_overlay" id="0x7f0a0665" />
+    <public type="id" name="setting_label" id="0x7f0a0666" />
+    <public type="id" name="setting_subtext" id="0x7f0a0667" />
+    <public type="id" name="settings_account" id="0x7f0a0668" />
+    <public type="id" name="settings_account_avatar" id="0x7f0a0669" />
+    <public type="id" name="settings_account_avatar_container" id="0x7f0a066a" />
+    <public type="id" name="settings_account_avatar_edit" id="0x7f0a066b" />
+    <public type="id" name="settings_account_avatar_wrap" id="0x7f0a066c" />
+    <public type="id" name="settings_account_change_password" id="0x7f0a066d" />
+    <public type="id" name="settings_account_edit" id="0x7f0a066e" />
+    <public type="id" name="settings_account_email" id="0x7f0a066f" />
+    <public type="id" name="settings_account_mfa_container" id="0x7f0a0670" />
+    <public type="id" name="settings_account_mfa_disabled_container" id="0x7f0a0671" />
+    <public type="id" name="settings_account_mfa_enable" id="0x7f0a0672" />
+    <public type="id" name="settings_account_mfa_enabled_container" id="0x7f0a0673" />
+    <public type="id" name="settings_account_mfa_enabled_header" id="0x7f0a0674" />
+    <public type="id" name="settings_account_mfa_flipper" id="0x7f0a0675" />
+    <public type="id" name="settings_account_mfa_lottie" id="0x7f0a0676" />
+    <public type="id" name="settings_account_mfa_sales_pitch" id="0x7f0a0677" />
+    <public type="id" name="settings_account_private_data_delete" id="0x7f0a0678" />
+    <public type="id" name="settings_account_private_data_disable" id="0x7f0a0679" />
+    <public type="id" name="settings_account_private_data_wrap" id="0x7f0a067a" />
+    <public type="id" name="settings_account_remove_avatar" id="0x7f0a067b" />
+    <public type="id" name="settings_account_remove_two_fa" id="0x7f0a067c" />
+    <public type="id" name="settings_account_save" id="0x7f0a067d" />
+    <public type="id" name="settings_account_scroll" id="0x7f0a067e" />
+    <public type="id" name="settings_account_sms_backup" id="0x7f0a067f" />
+    <public type="id" name="settings_account_sms_phone" id="0x7f0a0680" />
+    <public type="id" name="settings_account_tag" id="0x7f0a0681" />
+    <public type="id" name="settings_account_verification" id="0x7f0a0682" />
+    <public type="id" name="settings_account_verification_resend" id="0x7f0a0683" />
+    <public type="id" name="settings_account_view_backup_codes" id="0x7f0a0684" />
+    <public type="id" name="settings_acknowledgements" id="0x7f0a0685" />
+    <public type="id" name="settings_app_info" id="0x7f0a0686" />
+    <public type="id" name="settings_appearance" id="0x7f0a0687" />
+    <public type="id" name="settings_appearance_font_scale_platform" id="0x7f0a0688" />
+    <public type="id" name="settings_appearance_font_scaling_container" id="0x7f0a0689" />
+    <public type="id" name="settings_appearance_font_scaling_reset" id="0x7f0a068a" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar" id="0x7f0a068b" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar_text_left" id="0x7f0a068c" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar_text_right" id="0x7f0a068d" />
+    <public type="id" name="settings_appearance_sync_switch" id="0x7f0a068e" />
+    <public type="id" name="settings_appearance_theme_dark_radio" id="0x7f0a068f" />
+    <public type="id" name="settings_appearance_theme_light_radio" id="0x7f0a0690" />
+    <public type="id" name="settings_appearance_theme_pure_evil_radio" id="0x7f0a0691" />
+    <public type="id" name="settings_authorized_apps" id="0x7f0a0692" />
+    <public type="id" name="settings_backup_codes_generate" id="0x7f0a0693" />
+    <public type="id" name="settings_backup_codes_info" id="0x7f0a0694" />
+    <public type="id" name="settings_backup_codes_rv" id="0x7f0a0695" />
+    <public type="id" name="settings_behavior" id="0x7f0a0696" />
+    <public type="id" name="settings_behavior_back_button_toggle" id="0x7f0a0697" />
+    <public type="id" name="settings_behavior_browser_switch" id="0x7f0a0698" />
+    <public type="id" name="settings_behavior_dev_mode_switch" id="0x7f0a0699" />
+    <public type="id" name="settings_behavior_shift_send_toggle" id="0x7f0a069a" />
+    <public type="id" name="settings_billing" id="0x7f0a069b" />
+    <public type="id" name="settings_billing_view_pager" id="0x7f0a069c" />
+    <public type="id" name="settings_bitrate_help" id="0x7f0a069d" />
+    <public type="id" name="settings_boost_flipper" id="0x7f0a069e" />
+    <public type="id" name="settings_boost_no_sub_banner" id="0x7f0a069f" />
+    <public type="id" name="settings_boost_no_sub_learn_more" id="0x7f0a06a0" />
+    <public type="id" name="settings_boost_no_sub_learn_more_text" id="0x7f0a06a1" />
+    <public type="id" name="settings_boost_no_sub_logo" id="0x7f0a06a2" />
+    <public type="id" name="settings_boost_recycler" id="0x7f0a06a3" />
+    <public type="id" name="settings_boost_retry" id="0x7f0a06a4" />
+    <public type="id" name="settings_boost_subtext" id="0x7f0a06a5" />
+    <public type="id" name="settings_changelog" id="0x7f0a06a6" />
+    <public type="id" name="settings_channel_list_category_item_drag" id="0x7f0a06a7" />
+    <public type="id" name="settings_channel_list_category_item_text" id="0x7f0a06a8" />
+    <public type="id" name="settings_channel_list_item_drag" id="0x7f0a06a9" />
+    <public type="id" name="settings_channel_list_item_hash" id="0x7f0a06aa" />
+    <public type="id" name="settings_channel_list_item_name" id="0x7f0a06ab" />
+    <public type="id" name="settings_channel_list_item_selected_overlay" id="0x7f0a06ac" />
+    <public type="id" name="settings_connections" id="0x7f0a06ad" />
+    <public type="id" name="settings_developer_options" id="0x7f0a06ae" />
+    <public type="id" name="settings_developer_options_divider" id="0x7f0a06af" />
+    <public type="id" name="settings_developer_options_header" id="0x7f0a06b0" />
+    <public type="id" name="settings_game_activity" id="0x7f0a06b1" />
+    <public type="id" name="settings_games_detection_section" id="0x7f0a06b2" />
+    <public type="id" name="settings_games_playing_container" id="0x7f0a06b3" />
+    <public type="id" name="settings_games_playing_icon" id="0x7f0a06b4" />
+    <public type="id" name="settings_games_playing_subtitle" id="0x7f0a06b5" />
+    <public type="id" name="settings_games_playing_title" id="0x7f0a06b6" />
+    <public type="id" name="settings_games_status_cs" id="0x7f0a06b7" />
+    <public type="id" name="settings_games_track_cs" id="0x7f0a06b8" />
+    <public type="id" name="settings_gifting_flipper" id="0x7f0a06b9" />
+    <public type="id" name="settings_gifting_gift_code_input" id="0x7f0a06ba" />
+    <public type="id" name="settings_gifting_gift_code_input_progress" id="0x7f0a06bb" />
+    <public type="id" name="settings_gifting_gift_code_input_wrap" id="0x7f0a06bc" />
+    <public type="id" name="settings_gifting_nitro_classic_learn_more" id="0x7f0a06bd" />
+    <public type="id" name="settings_gifting_nitro_classic_monthly" id="0x7f0a06be" />
+    <public type="id" name="settings_gifting_nitro_classic_yearly" id="0x7f0a06bf" />
+    <public type="id" name="settings_gifting_nitro_learn_more" id="0x7f0a06c0" />
+    <public type="id" name="settings_gifting_nitro_monthly" id="0x7f0a06c1" />
+    <public type="id" name="settings_gifting_nitro_yearly" id="0x7f0a06c2" />
+    <public type="id" name="settings_gifting_retry" id="0x7f0a06c3" />
+    <public type="id" name="settings_giftting_inventory_recycler" id="0x7f0a06c4" />
+    <public type="id" name="settings_group_icon" id="0x7f0a06c5" />
+    <public type="id" name="settings_group_icon_label" id="0x7f0a06c6" />
+    <public type="id" name="settings_group_icon_remove" id="0x7f0a06c7" />
+    <public type="id" name="settings_inapp_notifs_switch" id="0x7f0a06c8" />
+    <public type="id" name="settings_language" id="0x7f0a06c9" />
+    <public type="id" name="settings_language_current" id="0x7f0a06ca" />
+    <public type="id" name="settings_language_current_flag" id="0x7f0a06cb" />
+    <public type="id" name="settings_language_current_text" id="0x7f0a06cc" />
+    <public type="id" name="settings_language_select_item_name" id="0x7f0a06cd" />
+    <public type="id" name="settings_language_select_item_name_localized" id="0x7f0a06ce" />
+    <public type="id" name="settings_language_select_list" id="0x7f0a06cf" />
+    <public type="id" name="settings_language_sync_check" id="0x7f0a06d0" />
+    <public type="id" name="settings_nitro" id="0x7f0a06d1" />
+    <public type="id" name="settings_nitro_boosting" id="0x7f0a06d2" />
+    <public type="id" name="settings_nitro_gifting" id="0x7f0a06d3" />
+    <public type="id" name="settings_nitro_settings" id="0x7f0a06d4" />
+    <public type="id" name="settings_notification_os" id="0x7f0a06d5" />
+    <public type="id" name="settings_notification_os_label" id="0x7f0a06d6" />
+    <public type="id" name="settings_notification_switch" id="0x7f0a06d7" />
+    <public type="id" name="settings_notifications" id="0x7f0a06d8" />
+    <public type="id" name="settings_notifications_blink" id="0x7f0a06d9" />
+    <public type="id" name="settings_notifications_enabled" id="0x7f0a06da" />
+    <public type="id" name="settings_notifications_mute_all" id="0x7f0a06db" />
+    <public type="id" name="settings_notifications_vibrations" id="0x7f0a06dc" />
+    <public type="id" name="settings_notifications_wake_lock" id="0x7f0a06dd" />
+    <public type="id" name="settings_notifications_wrap" id="0x7f0a06de" />
+    <public type="id" name="settings_privacy" id="0x7f0a06df" />
+    <public type="id" name="settings_privacy_basic_service" id="0x7f0a06e0" />
+    <public type="id" name="settings_privacy_controls" id="0x7f0a06e1" />
+    <public type="id" name="settings_privacy_default_restricted_guilds" id="0x7f0a06e2" />
+    <public type="id" name="settings_privacy_defaults_existing_no" id="0x7f0a06e3" />
+    <public type="id" name="settings_privacy_defaults_existing_yes" id="0x7f0a06e4" />
+    <public type="id" name="settings_privacy_explicit_0" id="0x7f0a06e5" />
+    <public type="id" name="settings_privacy_explicit_1" id="0x7f0a06e6" />
+    <public type="id" name="settings_privacy_explicit_2" id="0x7f0a06e7" />
+    <public type="id" name="settings_privacy_friend_source_0" id="0x7f0a06e8" />
+    <public type="id" name="settings_privacy_friend_source_1" id="0x7f0a06e9" />
+    <public type="id" name="settings_privacy_friend_source_2" id="0x7f0a06ea" />
+    <public type="id" name="settings_privacy_personalization" id="0x7f0a06eb" />
+    <public type="id" name="settings_privacy_request_data" id="0x7f0a06ec" />
+    <public type="id" name="settings_privacy_request_data_link" id="0x7f0a06ed" />
+    <public type="id" name="settings_privacy_statistics" id="0x7f0a06ee" />
+    <public type="id" name="settings_support" id="0x7f0a06ef" />
+    <public type="id" name="settings_text_images" id="0x7f0a06f0" />
+    <public type="id" name="settings_text_images_allow_animate_emoji_switch" id="0x7f0a06f1" />
+    <public type="id" name="settings_text_images_attachments_toggle" id="0x7f0a06f2" />
+    <public type="id" name="settings_text_images_embeds_toggle" id="0x7f0a06f3" />
+    <public type="id" name="settings_text_images_links_toggle" id="0x7f0a06f4" />
+    <public type="id" name="settings_text_images_sync_toggle" id="0x7f0a06f5" />
+    <public type="id" name="settings_user_limit_help" id="0x7f0a06f6" />
+    <public type="id" name="settings_voice" id="0x7f0a06f7" />
+    <public type="id" name="settings_voice_audio_mode_call" id="0x7f0a06f8" />
+    <public type="id" name="settings_voice_audio_mode_communication" id="0x7f0a06f9" />
+    <public type="id" name="settings_voice_auto_vad_toggle" id="0x7f0a06fa" />
+    <public type="id" name="settings_voice_echo_cancellation_toggle" id="0x7f0a06fb" />
+    <public type="id" name="settings_voice_enable_hardware_scaling_toggle" id="0x7f0a06fc" />
+    <public type="id" name="settings_voice_gain_control_toggle" id="0x7f0a06fd" />
+    <public type="id" name="settings_voice_input_mode_radio_1" id="0x7f0a06fe" />
+    <public type="id" name="settings_voice_input_mode_radio_2" id="0x7f0a06ff" />
+    <public type="id" name="settings_voice_noise_suppression_toggle" id="0x7f0a0700" />
+    <public type="id" name="settings_voice_opensles_default" id="0x7f0a0701" />
+    <public type="id" name="settings_voice_opensles_force_disabled" id="0x7f0a0702" />
+    <public type="id" name="settings_voice_opensles_force_enabled" id="0x7f0a0703" />
+    <public type="id" name="settings_voice_output_volume" id="0x7f0a0704" />
+    <public type="id" name="settings_voice_output_volume_wrap" id="0x7f0a0705" />
+    <public type="id" name="settings_voice_overlay_toggle" id="0x7f0a0706" />
+    <public type="id" name="settings_voice_overlay_wrap" id="0x7f0a0707" />
+    <public type="id" name="settings_voice_sensitivity_automatic" id="0x7f0a0708" />
+    <public type="id" name="settings_voice_sensitivity_header" id="0x7f0a0709" />
+    <public type="id" name="settings_voice_sensitivity_label" id="0x7f0a070a" />
+    <public type="id" name="settings_voice_sensitivity_manual" id="0x7f0a070b" />
+    <public type="id" name="settings_voice_sensitivity_test_button" id="0x7f0a070c" />
+    <public type="id" name="settings_voice_sensitivity_testing_container" id="0x7f0a070d" />
+    <public type="id" name="settings_voice_sensitivity_wrap" id="0x7f0a070e" />
+    <public type="id" name="settings_voice_use_speaker_toggle" id="0x7f0a070f" />
+    <public type="id" name="settings_voice_video_container" id="0x7f0a0710" />
+    <public type="id" name="shortcut" id="0x7f0a0711" />
+    <public type="id" name="showCustom" id="0x7f0a0712" />
+    <public type="id" name="showHome" id="0x7f0a0713" />
+    <public type="id" name="showTitle" id="0x7f0a0714" />
+    <public type="id" name="smallLabel" id="0x7f0a0715" />
+    <public type="id" name="snackbar_action" id="0x7f0a0716" />
+    <public type="id" name="snackbar_text" id="0x7f0a0717" />
+    <public type="id" name="snap" id="0x7f0a0718" />
+    <public type="id" name="snapMargins" id="0x7f0a0719" />
+    <public type="id" name="software" id="0x7f0a071a" />
+    <public type="id" name="space_around" id="0x7f0a071b" />
+    <public type="id" name="space_between" id="0x7f0a071c" />
+    <public type="id" name="spacer" id="0x7f0a071d" />
+    <public type="id" name="spectate_controls" id="0x7f0a071e" />
+    <public type="id" name="spectate_controls_disconnect_stream" id="0x7f0a071f" />
+    <public type="id" name="spectate_controls_disconnect_voice" id="0x7f0a0720" />
+    <public type="id" name="spectate_controls_mute" id="0x7f0a0721" />
+    <public type="id" name="spectate_push_to_talk" id="0x7f0a0722" />
+    <public type="id" name="spectators_list" id="0x7f0a0723" />
+    <public type="id" name="split_action_bar" id="0x7f0a0724" />
+    <public type="id" name="spread" id="0x7f0a0725" />
+    <public type="id" name="spread_inside" id="0x7f0a0726" />
+    <public type="id" name="src_atop" id="0x7f0a0727" />
+    <public type="id" name="src_in" id="0x7f0a0728" />
+    <public type="id" name="src_over" id="0x7f0a0729" />
+    <public type="id" name="src_toggle" id="0x7f0a072a" />
+    <public type="id" name="standard" id="0x7f0a072b" />
+    <public type="id" name="start" id="0x7f0a072c" />
+    <public type="id" name="state_aspect_ratio" id="0x7f0a072d" />
+    <public type="id" name="state_rotate" id="0x7f0a072e" />
+    <public type="id" name="state_scale" id="0x7f0a072f" />
+    <public type="id" name="status_bar_latest_event_content" id="0x7f0a0730" />
+    <public type="id" name="status_connectivity" id="0x7f0a0731" />
+    <public type="id" name="status_connectivity_icon" id="0x7f0a0732" />
+    <public type="id" name="status_connectivity_limited" id="0x7f0a0733" />
+    <public type="id" name="status_connectivity_spinner" id="0x7f0a0734" />
+    <public type="id" name="status_connectivity_text" id="0x7f0a0735" />
+    <public type="id" name="status_unread_messages" id="0x7f0a0736" />
+    <public type="id" name="status_unread_messages_mark" id="0x7f0a0737" />
+    <public type="id" name="status_unread_messages_text" id="0x7f0a0738" />
+    <public type="id" name="status_wrap" id="0x7f0a0739" />
+    <public type="id" name="steps_button_container" id="0x7f0a073a" />
+    <public type="id" name="steps_cancel" id="0x7f0a073b" />
+    <public type="id" name="steps_close" id="0x7f0a073c" />
+    <public type="id" name="steps_done" id="0x7f0a073d" />
+    <public type="id" name="steps_next" id="0x7f0a073e" />
+    <public type="id" name="steps_viewpager" id="0x7f0a073f" />
+    <public type="id" name="stream_feedback_cancel" id="0x7f0a0740" />
+    <public type="id" name="stream_feedback_happy" id="0x7f0a0741" />
+    <public type="id" name="stream_feedback_neutral" id="0x7f0a0742" />
+    <public type="id" name="stream_feedback_reason_header" id="0x7f0a0743" />
+    <public type="id" name="stream_feedback_reason_spinner" id="0x7f0a0744" />
+    <public type="id" name="stream_feedback_sad" id="0x7f0a0745" />
+    <public type="id" name="stream_feedback_spinner_text" id="0x7f0a0746" />
+    <public type="id" name="stream_feedback_submit" id="0x7f0a0747" />
+    <public type="id" name="stream_full_confirm" id="0x7f0a0748" />
+    <public type="id" name="stream_preview_image" id="0x7f0a0749" />
+    <public type="id" name="stream_preview_placeholder" id="0x7f0a074a" />
+    <public type="id" name="stream_preview_placeholder_caption" id="0x7f0a074b" />
+    <public type="id" name="stretch" id="0x7f0a074c" />
+    <public type="id" name="submenuarrow" id="0x7f0a074d" />
+    <public type="id" name="submit_area" id="0x7f0a074e" />
+    <public type="id" name="suggestion_example_answer" id="0x7f0a074f" />
+    <public type="id" name="suggestion_example_container" id="0x7f0a0750" />
+    <public type="id" name="suggestion_example_filter" id="0x7f0a0751" />
+    <public type="id" name="suggestion_example_icon" id="0x7f0a0752" />
+    <public type="id" name="suggestion_item_header" id="0x7f0a0753" />
+    <public type="id" name="suggestion_item_header_history_clear_icon" id="0x7f0a0754" />
+    <public type="id" name="suggestion_item_header_history_divider" id="0x7f0a0755" />
+    <public type="id" name="suggestion_item_header_history_text" id="0x7f0a0756" />
+    <public type="id" name="surface_view" id="0x7f0a0757" />
+    <public type="id" name="swipeRefreshLayout" id="0x7f0a0758" />
+    <public type="id" name="switchview" id="0x7f0a0759" />
+    <public type="id" name="tabMode" id="0x7f0a075a" />
+    <public type="id" name="tag_accessibility_actions" id="0x7f0a075b" />
+    <public type="id" name="tag_accessibility_clickable_spans" id="0x7f0a075c" />
+    <public type="id" name="tag_accessibility_heading" id="0x7f0a075d" />
+    <public type="id" name="tag_accessibility_pane_title" id="0x7f0a075e" />
+    <public type="id" name="tag_screen_reader_focusable" id="0x7f0a075f" />
+    <public type="id" name="tag_transition_group" id="0x7f0a0760" />
+    <public type="id" name="tag_unhandled_key_event_manager" id="0x7f0a0761" />
+    <public type="id" name="tag_unhandled_key_listeners" id="0x7f0a0762" />
+    <public type="id" name="take_photo_btn" id="0x7f0a0763" />
+    <public type="id" name="ternary_check_neutral" id="0x7f0a0764" />
+    <public type="id" name="ternary_check_off" id="0x7f0a0765" />
+    <public type="id" name="ternary_check_on" id="0x7f0a0766" />
+    <public type="id" name="test" id="0x7f0a0767" />
+    <public type="id" name="text" id="0x7f0a0768" />
+    <public type="id" name="text2" id="0x7f0a0769" />
+    <public type="id" name="textSpacerNoButtons" id="0x7f0a076a" />
+    <public type="id" name="textSpacerNoTitle" id="0x7f0a076b" />
+    <public type="id" name="textStart" id="0x7f0a076c" />
+    <public type="id" name="text_input" id="0x7f0a076d" />
+    <public type="id" name="text_input_password_toggle" id="0x7f0a076e" />
+    <public type="id" name="text_view_rotate" id="0x7f0a076f" />
+    <public type="id" name="text_view_scale" id="0x7f0a0770" />
+    <public type="id" name="textinput_counter" id="0x7f0a0771" />
+    <public type="id" name="textinput_error" id="0x7f0a0772" />
+    <public type="id" name="textinput_helper_text" id="0x7f0a0773" />
+    <public type="id" name="texture_view" id="0x7f0a0774" />
+    <public type="id" name="thumb_iv" id="0x7f0a0775" />
+    <public type="id" name="tile" id="0x7f0a0776" />
+    <public type="id" name="time" id="0x7f0a0777" />
+    <public type="id" name="title" id="0x7f0a0778" />
+    <public type="id" name="titleDividerNoCustom" id="0x7f0a0779" />
+    <public type="id" name="title_template" id="0x7f0a077a" />
+    <public type="id" name="toolbar" id="0x7f0a077b" />
+    <public type="id" name="toolbar_presence" id="0x7f0a077c" />
+    <public type="id" name="toolbar_title" id="0x7f0a077d" />
+    <public type="id" name="toolbar_title_subtext" id="0x7f0a077e" />
+    <public type="id" name="top" id="0x7f0a077f" />
+    <public type="id" name="topPanel" id="0x7f0a0780" />
+    <public type="id" name="torch" id="0x7f0a0781" />
+    <public type="id" name="touch_outside" id="0x7f0a0782" />
+    <public type="id" name="transition_current_scene" id="0x7f0a0783" />
+    <public type="id" name="transition_layout_save" id="0x7f0a0784" />
+    <public type="id" name="transition_position" id="0x7f0a0785" />
+    <public type="id" name="transition_scene_layoutid_cache" id="0x7f0a0786" />
+    <public type="id" name="transition_transform" id="0x7f0a0787" />
+    <public type="id" name="trash_wrap_icon" id="0x7f0a0788" />
+    <public type="id" name="trash_wrap_target_container" id="0x7f0a0789" />
+    <public type="id" name="trash_wrap_target_zone" id="0x7f0a078a" />
+    <public type="id" name="type_iv" id="0x7f0a078b" />
+    <public type="id" name="ucrop" id="0x7f0a078c" />
+    <public type="id" name="ucrop_frame" id="0x7f0a078d" />
+    <public type="id" name="ucrop_photobox" id="0x7f0a078e" />
+    <public type="id" name="uikit_chat_guideline" id="0x7f0a078f" />
+    <public type="id" name="uikit_sheet_header_guideline" id="0x7f0a0790" />
+    <public type="id" name="unhandled_uri_display" id="0x7f0a0791" />
+    <public type="id" name="unhandled_uri_okay" id="0x7f0a0792" />
+    <public type="id" name="uniform" id="0x7f0a0793" />
+    <public type="id" name="unlabeled" id="0x7f0a0794" />
+    <public type="id" name="unread_wrap" id="0x7f0a0795" />
+    <public type="id" name="up" id="0x7f0a0796" />
+    <public type="id" name="upgrade_premium_body" id="0x7f0a0797" />
+    <public type="id" name="upgrade_premium_cancel" id="0x7f0a0798" />
+    <public type="id" name="upgrade_premium_confirm" id="0x7f0a0799" />
+    <public type="id" name="upgrade_premium_error" id="0x7f0a079a" />
+    <public type="id" name="upgrade_premium_header" id="0x7f0a079b" />
+    <public type="id" name="upload_progress_1" id="0x7f0a079c" />
+    <public type="id" name="upload_progress_2" id="0x7f0a079d" />
+    <public type="id" name="upload_progress_3" id="0x7f0a079e" />
+    <public type="id" name="useLogo" id="0x7f0a079f" />
+    <public type="id" name="user_avatar_presence_avatar" id="0x7f0a07a0" />
+    <public type="id" name="user_avatar_presence_container" id="0x7f0a07a1" />
+    <public type="id" name="user_avatar_presence_indicator" id="0x7f0a07a2" />
+    <public type="id" name="user_avatar_presence_padding_image" id="0x7f0a07a3" />
+    <public type="id" name="user_captcha_help" id="0x7f0a07a4" />
+    <public type="id" name="user_captcha_verify_button" id="0x7f0a07a5" />
+    <public type="id" name="user_captcha_verify_button_anchor" id="0x7f0a07a6" />
+    <public type="id" name="user_captcha_verify_button_cancel" id="0x7f0a07a7" />
+    <public type="id" name="user_info_activity_divider" id="0x7f0a07a8" />
+    <public type="id" name="user_info_identities_divider" id="0x7f0a07a9" />
+    <public type="id" name="user_info_identities_header" id="0x7f0a07aa" />
+    <public type="id" name="user_info_notes" id="0x7f0a07ab" />
+    <public type="id" name="user_info_rich_presence_container" id="0x7f0a07ac" />
+    <public type="id" name="user_limit_seekbar" id="0x7f0a07ad" />
+    <public type="id" name="user_list_item_avatar" id="0x7f0a07ae" />
+    <public type="id" name="user_list_item_name" id="0x7f0a07af" />
+    <public type="id" name="user_list_item_name_secondary" id="0x7f0a07b0" />
+    <public type="id" name="user_list_item_presence" id="0x7f0a07b1" />
+    <public type="id" name="user_list_item_presence_wrapper" id="0x7f0a07b2" />
+    <public type="id" name="user_mentions_filter_include_everyone" id="0x7f0a07b3" />
+    <public type="id" name="user_mentions_filter_include_roles" id="0x7f0a07b4" />
+    <public type="id" name="user_mentions_filter_this_server" id="0x7f0a07b5" />
+    <public type="id" name="user_mentions_list" id="0x7f0a07b6" />
+    <public type="id" name="user_mutual_friends_recycler_view" id="0x7f0a07b7" />
+    <public type="id" name="user_mutual_guilds_recycler_view" id="0x7f0a07b8" />
+    <public type="id" name="user_phone_add_anchor" id="0x7f0a07b9" />
+    <public type="id" name="user_phone_add_country_code" id="0x7f0a07ba" />
+    <public type="id" name="user_phone_add_next" id="0x7f0a07bb" />
+    <public type="id" name="user_phone_add_number" id="0x7f0a07bc" />
+    <public type="id" name="user_phone_add_wrap" id="0x7f0a07bd" />
+    <public type="id" name="user_phone_digit_verification" id="0x7f0a07be" />
+    <public type="id" name="user_phone_verify_wrap" id="0x7f0a07bf" />
+    <public type="id" name="user_profile_adapter_item_empty" id="0x7f0a07c0" />
+    <public type="id" name="user_profile_adapter_item_empty_text" id="0x7f0a07c1" />
+    <public type="id" name="user_profile_adapter_item_friend_avatar" id="0x7f0a07c2" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual" id="0x7f0a07c3" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual_image" id="0x7f0a07c4" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual_text" id="0x7f0a07c5" />
+    <public type="id" name="user_profile_adapter_item_friend_presence" id="0x7f0a07c6" />
+    <public type="id" name="user_profile_adapter_item_friend_user_game" id="0x7f0a07c7" />
+    <public type="id" name="user_profile_adapter_item_friend_user_name" id="0x7f0a07c8" />
+    <public type="id" name="user_profile_adapter_item_server_image" id="0x7f0a07c9" />
+    <public type="id" name="user_profile_adapter_item_server_name" id="0x7f0a07ca" />
+    <public type="id" name="user_profile_adapter_item_server_nick" id="0x7f0a07cb" />
+    <public type="id" name="user_profile_adapter_item_server_text" id="0x7f0a07cc" />
+    <public type="id" name="user_profile_adapter_item_server_wrap" id="0x7f0a07cd" />
+    <public type="id" name="user_profile_avatar_presence" id="0x7f0a07ce" />
+    <public type="id" name="user_profile_friend_request" id="0x7f0a07cf" />
+    <public type="id" name="user_profile_friend_request_accept_btn" id="0x7f0a07d0" />
+    <public type="id" name="user_profile_friend_request_ignore_btn" id="0x7f0a07d1" />
+    <public type="id" name="user_profile_friend_request_incoming_container" id="0x7f0a07d2" />
+    <public type="id" name="user_profile_friend_request_sent_btn" id="0x7f0a07d3" />
+    <public type="id" name="user_profile_header_badges_recycler" id="0x7f0a07d4" />
+    <public type="id" name="user_profile_header_name_wrap" id="0x7f0a07d5" />
+    <public type="id" name="user_profile_header_primary_name" id="0x7f0a07d6" />
+    <public type="id" name="user_profile_header_secondary_name" id="0x7f0a07d7" />
+    <public type="id" name="user_profile_header_view" id="0x7f0a07d8" />
+    <public type="id" name="user_profile_send_message_fab" id="0x7f0a07d9" />
+    <public type="id" name="user_profile_view_pager" id="0x7f0a07da" />
+    <public type="id" name="user_selected_checkbox" id="0x7f0a07db" />
+    <public type="id" name="user_settings_mfa_enable_input_digits" id="0x7f0a07dc" />
+    <public type="id" name="user_settings_profile_header_view" id="0x7f0a07dd" />
+    <public type="id" name="user_sheet_actions_divider" id="0x7f0a07de" />
+    <public type="id" name="user_sheet_actions_header" id="0x7f0a07df" />
+    <public type="id" name="user_sheet_activity_divider" id="0x7f0a07e0" />
+    <public type="id" name="user_sheet_add_friend_action_button" id="0x7f0a07e1" />
+    <public type="id" name="user_sheet_administrative_divider" id="0x7f0a07e2" />
+    <public type="id" name="user_sheet_administrative_header" id="0x7f0a07e3" />
+    <public type="id" name="user_sheet_audio_settings_container" id="0x7f0a07e4" />
+    <public type="id" name="user_sheet_audio_settings_divider" id="0x7f0a07e5" />
+    <public type="id" name="user_sheet_badge_image" id="0x7f0a07e6" />
+    <public type="id" name="user_sheet_ban" id="0x7f0a07e7" />
+    <public type="id" name="user_sheet_call_action_button" id="0x7f0a07e8" />
+    <public type="id" name="user_sheet_copy_id" id="0x7f0a07e9" />
+    <public type="id" name="user_sheet_developer_divider" id="0x7f0a07ea" />
+    <public type="id" name="user_sheet_developer_header" id="0x7f0a07eb" />
+    <public type="id" name="user_sheet_friend_request_accept_button" id="0x7f0a07ec" />
+    <public type="id" name="user_sheet_friend_request_ignore_button" id="0x7f0a07ed" />
+    <public type="id" name="user_sheet_friend_request_incoming_container" id="0x7f0a07ee" />
+    <public type="id" name="user_sheet_guild_container" id="0x7f0a07ef" />
+    <public type="id" name="user_sheet_guild_divider" id="0x7f0a07f0" />
+    <public type="id" name="user_sheet_guild_header" id="0x7f0a07f1" />
+    <public type="id" name="user_sheet_header" id="0x7f0a07f2" />
+    <public type="id" name="user_sheet_incoming_friend_request_divider" id="0x7f0a07f3" />
+    <public type="id" name="user_sheet_incoming_friend_request_header" id="0x7f0a07f4" />
+    <public type="id" name="user_sheet_kick" id="0x7f0a07f5" />
+    <public type="id" name="user_sheet_message_action_button" id="0x7f0a07f6" />
+    <public type="id" name="user_sheet_muted" id="0x7f0a07f7" />
+    <public type="id" name="user_sheet_pending_friend_request_action_button" id="0x7f0a07f8" />
+    <public type="id" name="user_sheet_profile" id="0x7f0a07f9" />
+    <public type="id" name="user_sheet_profile_actions_container" id="0x7f0a07fa" />
+    <public type="id" name="user_sheet_profile_actions_divider" id="0x7f0a07fb" />
+    <public type="id" name="user_sheet_profile_header_view" id="0x7f0a07fc" />
+    <public type="id" name="user_sheet_roles_recycler" id="0x7f0a07fd" />
+    <public type="id" name="user_sheet_server_deafen" id="0x7f0a07fe" />
+    <public type="id" name="user_sheet_server_edit_member" id="0x7f0a07ff" />
+    <public type="id" name="user_sheet_server_move" id="0x7f0a0800" />
+    <public type="id" name="user_sheet_server_mute" id="0x7f0a0801" />
+    <public type="id" name="user_sheet_video_action_button" id="0x7f0a0802" />
+    <public type="id" name="user_sheet_volume" id="0x7f0a0803" />
+    <public type="id" name="user_sheet_volume_icon" id="0x7f0a0804" />
+    <public type="id" name="user_status_presence_dot" id="0x7f0a0805" />
+    <public type="id" name="user_status_presence_subtitle" id="0x7f0a0806" />
+    <public type="id" name="user_status_presence_title" id="0x7f0a0807" />
+    <public type="id" name="user_status_update_dnd" id="0x7f0a0808" />
+    <public type="id" name="user_status_update_idle" id="0x7f0a0809" />
+    <public type="id" name="user_status_update_invisible" id="0x7f0a080a" />
+    <public type="id" name="user_status_update_online" id="0x7f0a080b" />
+    <public type="id" name="username_placeholder_end_guideline" id="0x7f0a080c" />
+    <public type="id" name="verify_digit_1" id="0x7f0a080d" />
+    <public type="id" name="verify_digit_2" id="0x7f0a080e" />
+    <public type="id" name="verify_digit_3" id="0x7f0a080f" />
+    <public type="id" name="verify_digit_4" id="0x7f0a0810" />
+    <public type="id" name="verify_digit_5" id="0x7f0a0811" />
+    <public type="id" name="verify_digit_6" id="0x7f0a0812" />
+    <public type="id" name="view_dialog_confirmation_cancel" id="0x7f0a0813" />
+    <public type="id" name="view_dialog_confirmation_confirm" id="0x7f0a0814" />
+    <public type="id" name="view_dialog_confirmation_header" id="0x7f0a0815" />
+    <public type="id" name="view_dialog_confirmation_text" id="0x7f0a0816" />
+    <public type="id" name="view_input" id="0x7f0a0817" />
+    <public type="id" name="view_offset_helper" id="0x7f0a0818" />
+    <public type="id" name="view_overlay" id="0x7f0a0819" />
+    <public type="id" name="view_pager" id="0x7f0a081a" />
+    <public type="id" name="visible" id="0x7f0a081b" />
+    <public type="id" name="voice" id="0x7f0a081c" />
+    <public type="id" name="voice_actions_connect" id="0x7f0a081d" />
+    <public type="id" name="voice_actions_copy_id" id="0x7f0a081e" />
+    <public type="id" name="voice_actions_disconnect" id="0x7f0a081f" />
+    <public type="id" name="voice_actions_header" id="0x7f0a0820" />
+    <public type="id" name="voice_actions_icon" id="0x7f0a0821" />
+    <public type="id" name="voice_actions_settings" id="0x7f0a0822" />
+    <public type="id" name="voice_actions_settings_divider" id="0x7f0a0823" />
+    <public type="id" name="voice_actions_user_count" id="0x7f0a0824" />
+    <public type="id" name="voice_actions_users_recyclerview" id="0x7f0a0825" />
+    <public type="id" name="voice_connected_container" id="0x7f0a0826" />
+    <public type="id" name="voice_connected_description" id="0x7f0a0827" />
+    <public type="id" name="voice_connected_ptt" id="0x7f0a0828" />
+    <public type="id" name="voice_connected_quality" id="0x7f0a0829" />
+    <public type="id" name="voice_connected_status_container" id="0x7f0a082a" />
+    <public type="id" name="voice_connected_text" id="0x7f0a082b" />
+    <public type="id" name="voice_divider" id="0x7f0a082c" />
+    <public type="id" name="voice_expand" id="0x7f0a082d" />
+    <public type="id" name="voice_fullscreen_controls_connect" id="0x7f0a082e" />
+    <public type="id" name="voice_fullscreen_controls_controls_wrap" id="0x7f0a082f" />
+    <public type="id" name="voice_fullscreen_controls_deafen_state" id="0x7f0a0830" />
+    <public type="id" name="voice_fullscreen_controls_disconnect" id="0x7f0a0831" />
+    <public type="id" name="voice_fullscreen_controls_mute_state" id="0x7f0a0832" />
+    <public type="id" name="voice_fullscreen_controls_num_users_connected" id="0x7f0a0833" />
+    <public type="id" name="voice_fullscreen_controls_ptt" id="0x7f0a0834" />
+    <public type="id" name="voice_fullscreen_controls_speaker" id="0x7f0a0835" />
+    <public type="id" name="voice_info_connecting" id="0x7f0a0836" />
+    <public type="id" name="voice_info_overlay" id="0x7f0a0837" />
+    <public type="id" name="voice_info_talking_users" id="0x7f0a0838" />
+    <public type="id" name="voice_info_wrap" id="0x7f0a0839" />
+    <public type="id" name="voice_list_item_user" id="0x7f0a083a" />
+    <public type="id" name="voice_ongoing_container" id="0x7f0a083b" />
+    <public type="id" name="voice_ongoing_user_count_label" id="0x7f0a083c" />
+    <public type="id" name="voice_user_avatar" id="0x7f0a083d" />
+    <public type="id" name="voice_user_list_item_deafen_indicator" id="0x7f0a083e" />
+    <public type="id" name="voice_user_list_item_header_label" id="0x7f0a083f" />
+    <public type="id" name="voice_user_list_item_live_indicator" id="0x7f0a0840" />
+    <public type="id" name="voice_user_list_item_mute_indicator" id="0x7f0a0841" />
+    <public type="id" name="voice_user_list_item_user_avatar" id="0x7f0a0842" />
+    <public type="id" name="voice_user_list_item_user_name" id="0x7f0a0843" />
+    <public type="id" name="voice_user_name_display" id="0x7f0a0844" />
+    <public type="id" name="web_view" id="0x7f0a0845" />
+    <public type="id" name="welcome_card_invite_friends" id="0x7f0a0846" />
+    <public type="id" name="welcome_card_upload_icon" id="0x7f0a0847" />
+    <public type="id" name="wide" id="0x7f0a0848" />
+    <public type="id" name="widget_add_friend_user_list_item" id="0x7f0a0849" />
+    <public type="id" name="widget_auth_mfa_backup_codes_cancel" id="0x7f0a084a" />
+    <public type="id" name="widget_auth_mfa_backup_codes_edittext" id="0x7f0a084b" />
+    <public type="id" name="widget_auth_mfa_backup_codes_send" id="0x7f0a084c" />
+    <public type="id" name="widget_auth_mfa_info_okay" id="0x7f0a084d" />
+    <public type="id" name="widget_auth_mfa_info_text" id="0x7f0a084e" />
+    <public type="id" name="widget_channel_search_item" id="0x7f0a084f" />
+    <public type="id" name="widget_channel_search_item_remove" id="0x7f0a0850" />
+    <public type="id" name="widget_channel_settings_permissions_overview_members_recycler" id="0x7f0a0851" />
+    <public type="id" name="widget_channel_settings_permissions_overview_roles_recycler" id="0x7f0a0852" />
+    <public type="id" name="widget_channel_topic" id="0x7f0a0853" />
+    <public type="id" name="widget_channels" id="0x7f0a0854" />
+    <public type="id" name="widget_chat_detached" id="0x7f0a0855" />
+    <public type="id" name="widget_chat_input" id="0x7f0a0856" />
+    <public type="id" name="widget_chat_list" id="0x7f0a0857" />
+    <public type="id" name="widget_chat_typing" id="0x7f0a0858" />
+    <public type="id" name="widget_chat_voice" id="0x7f0a0859" />
+    <public type="id" name="widget_collapsed_user_count" id="0x7f0a085a" />
+    <public type="id" name="widget_collapsed_user_imageview" id="0x7f0a085b" />
+    <public type="id" name="widget_connected_list" id="0x7f0a085c" />
+    <public type="id" name="widget_friends_list" id="0x7f0a085d" />
+    <public type="id" name="widget_guilds" id="0x7f0a085e" />
+    <public type="id" name="widget_profile_strip" id="0x7f0a085f" />
+    <public type="id" name="widget_search_results" id="0x7f0a0860" />
+    <public type="id" name="widget_search_suggestions" id="0x7f0a0861" />
+    <public type="id" name="widget_server_settings_channels_container" id="0x7f0a0862" />
+    <public type="id" name="widget_server_settings_emojis_recycler" id="0x7f0a0863" />
+    <public type="id" name="widget_server_settings_emojis_section" id="0x7f0a0864" />
+    <public type="id" name="widget_server_settings_emojis_upload" id="0x7f0a0865" />
+    <public type="id" name="widget_server_settings_emojis_upload_description" id="0x7f0a0866" />
+    <public type="id" name="widget_server_settings_emojis_view_flipper" id="0x7f0a0867" />
+    <public type="id" name="widget_status" id="0x7f0a0868" />
+    <public type="id" name="withText" id="0x7f0a0869" />
+    <public type="id" name="wrap" id="0x7f0a086a" />
+    <public type="id" name="wrap_content" id="0x7f0a086b" />
+    <public type="id" name="wrap_reverse" id="0x7f0a086c" />
+    <public type="id" name="wrapper_controls" id="0x7f0a086d" />
+    <public type="id" name="wrapper_reset_rotate" id="0x7f0a086e" />
+    <public type="id" name="wrapper_rotate_by_angle" id="0x7f0a086f" />
+    <public type="id" name="wrapper_states" id="0x7f0a0870" />
     <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" />
@@ -5021,6 +5121,8 @@
     <public type="integer" name="show_password_duration" id="0x7f0b000f" />
     <public type="integer" name="status_bar_notification_info_maxnum" id="0x7f0b0010" />
     <public type="integer" name="ucrop_progress_loading_anim_time" id="0x7f0b0011" />
+    <public type="integer" name="uikit_textsize_large_sp" id="0x7f0b0012" />
+    <public type="integer" name="uikit_textsize_xxlarge_sp" id="0x7f0b0013" />
     <public type="interpolator" name="mtrl_fast_out_linear_in" id="0x7f0c0000" />
     <public type="interpolator" name="mtrl_fast_out_slow_in" id="0x7f0c0001" />
     <public type="interpolator" name="mtrl_linear" id="0x7f0c0002" />
@@ -5083,424 +5185,438 @@
     <public type="layout" name="fragment_camera" id="0x7f0d0037" />
     <public type="layout" name="fragment_paged_grid" id="0x7f0d0038" />
     <public type="layout" name="fragment_recycler_view" id="0x7f0d0039" />
-    <public type="layout" name="integration_sync_settings" id="0x7f0d003a" />
-    <public type="layout" name="item_permission_storage" id="0x7f0d003b" />
-    <public type="layout" name="layout_search" id="0x7f0d003c" />
-    <public type="layout" name="layout_search_actionbar" id="0x7f0d003d" />
-    <public type="layout" name="layout_unhandled_uri" id="0x7f0d003e" />
-    <public type="layout" name="mtrl_layout_snackbar" id="0x7f0d003f" />
-    <public type="layout" name="mtrl_layout_snackbar_include" id="0x7f0d0040" />
-    <public type="layout" name="notification_action" id="0x7f0d0041" />
-    <public type="layout" name="notification_action_tombstone" id="0x7f0d0042" />
-    <public type="layout" name="notification_media_action" id="0x7f0d0043" />
-    <public type="layout" name="notification_media_cancel_action" id="0x7f0d0044" />
-    <public type="layout" name="notification_template_big_media" id="0x7f0d0045" />
-    <public type="layout" name="notification_template_big_media_custom" id="0x7f0d0046" />
-    <public type="layout" name="notification_template_big_media_narrow" id="0x7f0d0047" />
-    <public type="layout" name="notification_template_big_media_narrow_custom" id="0x7f0d0048" />
-    <public type="layout" name="notification_template_custom_big" id="0x7f0d0049" />
-    <public type="layout" name="notification_template_icon_group" id="0x7f0d004a" />
-    <public type="layout" name="notification_template_lines_media" id="0x7f0d004b" />
-    <public type="layout" name="notification_template_media" id="0x7f0d004c" />
-    <public type="layout" name="notification_template_media_custom" id="0x7f0d004d" />
-    <public type="layout" name="notification_template_part_chronometer" id="0x7f0d004e" />
-    <public type="layout" name="notification_template_part_time" id="0x7f0d004f" />
-    <public type="layout" name="oauth_token_permission_detailed_list_item" id="0x7f0d0050" />
-    <public type="layout" name="oauth_token_permission_list_item" id="0x7f0d0051" />
-    <public type="layout" name="overlay_bubble_menu" id="0x7f0d0052" />
-    <public type="layout" name="overlay_menu_voice_members_item" id="0x7f0d0053" />
-    <public type="layout" name="overlay_voice_bubble" id="0x7f0d0054" />
-    <public type="layout" name="overlay_voice_channel_selector" id="0x7f0d0055" />
-    <public type="layout" name="payment_method_list_add_item" id="0x7f0d0056" />
-    <public type="layout" name="payment_method_list_header" id="0x7f0d0057" />
-    <public type="layout" name="payment_method_list_item" id="0x7f0d0058" />
-    <public type="layout" name="payment_source_view" id="0x7f0d0059" />
-    <public type="layout" name="premium_upsell_dialog" id="0x7f0d005a" />
-    <public type="layout" name="reaction_quick_add" id="0x7f0d005b" />
-    <public type="layout" name="reaction_view" id="0x7f0d005c" />
-    <public type="layout" name="select_dialog_item_material" id="0x7f0d005d" />
-    <public type="layout" name="select_dialog_multichoice_material" id="0x7f0d005e" />
-    <public type="layout" name="select_dialog_singlechoice_material" id="0x7f0d005f" />
-    <public type="layout" name="server_settings_members_role_spinner_item" id="0x7f0d0060" />
-    <public type="layout" name="server_settings_members_role_spinner_item_open" id="0x7f0d0061" />
-    <public type="layout" name="settings_channel_list_category_item" id="0x7f0d0062" />
-    <public type="layout" name="settings_channel_list_item" id="0x7f0d0063" />
-    <public type="layout" name="simple_member_list_item" id="0x7f0d0064" />
-    <public type="layout" name="simple_role_list_item" id="0x7f0d0065" />
-    <public type="layout" name="support_simple_spinner_dropdown_item" id="0x7f0d0066" />
-    <public type="layout" name="surface_view" id="0x7f0d0067" />
-    <public type="layout" name="texture_view" id="0x7f0d0068" />
-    <public type="layout" name="trash_wrap" id="0x7f0d0069" />
-    <public type="layout" name="ucrop_activity_photobox" id="0x7f0d006a" />
-    <public type="layout" name="ucrop_aspect_ratio" id="0x7f0d006b" />
-    <public type="layout" name="ucrop_controls" id="0x7f0d006c" />
-    <public type="layout" name="ucrop_fragment_photobox" id="0x7f0d006d" />
-    <public type="layout" name="ucrop_layout_rotate_wheel" id="0x7f0d006e" />
-    <public type="layout" name="ucrop_layout_scale_wheel" id="0x7f0d006f" />
-    <public type="layout" name="ucrop_view" id="0x7f0d0070" />
-    <public type="layout" name="view_active_subscription" id="0x7f0d0071" />
-    <public type="layout" name="view_add_override_item" id="0x7f0d0072" />
-    <public type="layout" name="view_application_news" id="0x7f0d0073" />
-    <public type="layout" name="view_attachment_preview_item" id="0x7f0d0074" />
-    <public type="layout" name="view_boost_progress_bar" id="0x7f0d0075" />
-    <public type="layout" name="view_boost_status_no_boosts" id="0x7f0d0076" />
-    <public type="layout" name="view_boost_user_settings_perks" id="0x7f0d0077" />
-    <public type="layout" name="view_boxed_button" id="0x7f0d0078" />
-    <public type="layout" name="view_camera_permissions" id="0x7f0d0079" />
-    <public type="layout" name="view_category_override_item" id="0x7f0d007a" />
-    <public type="layout" name="view_channel_override_item" id="0x7f0d007b" />
-    <public type="layout" name="view_chat_action_item" id="0x7f0d007c" />
-    <public type="layout" name="view_chat_list_actions_emoji_item" id="0x7f0d007d" />
-    <public type="layout" name="view_checkable_role_list_item" id="0x7f0d007e" />
-    <public type="layout" name="view_checkable_role_list_item_themed" id="0x7f0d007f" />
-    <public type="layout" name="view_chip" id="0x7f0d0080" />
-    <public type="layout" name="view_chip_default" id="0x7f0d0081" />
-    <public type="layout" name="view_dialog_confirmation" id="0x7f0d0082" />
-    <public type="layout" name="view_digit_verification" id="0x7f0d0083" />
-    <public type="layout" name="view_edit_payment_info" id="0x7f0d0084" />
-    <public type="layout" name="view_emoji_item" id="0x7f0d0085" />
-    <public type="layout" name="view_file_item" id="0x7f0d0086" />
-    <public type="layout" name="view_gift_entitlement_list_item" id="0x7f0d0087" />
-    <public type="layout" name="view_gift_sku_list_item" id="0x7f0d0088" />
-    <public type="layout" name="view_global_search_item" id="0x7f0d0089" />
-    <public type="layout" name="view_grid_image" id="0x7f0d008a" />
-    <public type="layout" name="view_guild" id="0x7f0d008b" />
-    <public type="layout" name="view_guild_invite_bottom_sheet" id="0x7f0d008c" />
-    <public type="layout" name="view_image" id="0x7f0d008d" />
-    <public type="layout" name="view_input_modal" id="0x7f0d008e" />
-    <public type="layout" name="view_invite_settings_channel_spinner_item" id="0x7f0d008f" />
-    <public type="layout" name="view_invite_settngs_channel_spinner_item_open" id="0x7f0d0090" />
-    <public type="layout" name="view_loading_button" id="0x7f0d0091" />
-    <public type="layout" name="view_nitro_boost_perks" id="0x7f0d0092" />
-    <public type="layout" name="view_nitro_boost_perks_list_item" id="0x7f0d0093" />
-    <public type="layout" name="view_no_gifts_list_item" id="0x7f0d0094" />
-    <public type="layout" name="view_overlay_menu" id="0x7f0d0095" />
-    <public type="layout" name="view_overlay_menu_content" id="0x7f0d0096" />
-    <public type="layout" name="view_premium_settings_perks" id="0x7f0d0097" />
-    <public type="layout" name="view_premium_settings_tier_1" id="0x7f0d0098" />
-    <public type="layout" name="view_premium_settings_tier_2" id="0x7f0d0099" />
-    <public type="layout" name="view_radio_button" id="0x7f0d009a" />
-    <public type="layout" name="view_review_request_modal_image" id="0x7f0d009b" />
-    <public type="layout" name="view_role_item_text" id="0x7f0d009c" />
-    <public type="layout" name="view_server_folder" id="0x7f0d009d" />
-    <public type="layout" name="view_server_settings_icon_name" id="0x7f0d009e" />
-    <public type="layout" name="view_server_settings_notifications" id="0x7f0d009f" />
-    <public type="layout" name="view_server_settings_region" id="0x7f0d00a0" />
-    <public type="layout" name="view_server_settings_system_channel_wrap" id="0x7f0d00a1" />
-    <public type="layout" name="view_server_settings_upload_banner" id="0x7f0d00a2" />
-    <public type="layout" name="view_server_settings_upload_splash" id="0x7f0d00a3" />
-    <public type="layout" name="view_setting_check" id="0x7f0d00a4" />
-    <public type="layout" name="view_setting_radio" id="0x7f0d00a5" />
-    <public type="layout" name="view_setting_switch" id="0x7f0d00a6" />
-    <public type="layout" name="view_settings_boost_available_listitem" id="0x7f0d00a7" />
-    <public type="layout" name="view_settings_boost_info_listitem" id="0x7f0d00a8" />
-    <public type="layout" name="view_settings_boosted_guild_listitem" id="0x7f0d00a9" />
-    <public type="layout" name="view_settings_gifting_nitro" id="0x7f0d00aa" />
-    <public type="layout" name="view_settings_gifting_nitro_classic" id="0x7f0d00ab" />
-    <public type="layout" name="view_steps" id="0x7f0d00ac" />
-    <public type="layout" name="view_ternary_checkbox" id="0x7f0d00ad" />
-    <public type="layout" name="view_toolbar_title" id="0x7f0d00ae" />
-    <public type="layout" name="view_upload_progress" id="0x7f0d00af" />
-    <public type="layout" name="view_user_avatar_presence" id="0x7f0d00b0" />
-    <public type="layout" name="view_user_list_item" id="0x7f0d00b1" />
-    <public type="layout" name="view_user_status_presence" id="0x7f0d00b2" />
-    <public type="layout" name="view_video_call_participant" id="0x7f0d00b3" />
-    <public type="layout" name="view_voice_user" id="0x7f0d00b4" />
-    <public type="layout" name="voice_controls_view" id="0x7f0d00b5" />
-    <public type="layout" name="voice_user_list_item_divider" id="0x7f0d00b6" />
-    <public type="layout" name="voice_user_list_item_header" id="0x7f0d00b7" />
-    <public type="layout" name="voice_user_list_item_user" id="0x7f0d00b8" />
-    <public type="layout" name="widget_accept_gift_dialog" id="0x7f0d00b9" />
-    <public type="layout" name="widget_add_friend_user_list_item" id="0x7f0d00ba" />
-    <public type="layout" name="widget_audit_log_filter_sheet" id="0x7f0d00bb" />
-    <public type="layout" name="widget_auth_captcha" id="0x7f0d00bc" />
-    <public type="layout" name="widget_auth_header" id="0x7f0d00bd" />
-    <public type="layout" name="widget_auth_invite_info" id="0x7f0d00be" />
-    <public type="layout" name="widget_auth_landing" id="0x7f0d00bf" />
-    <public type="layout" name="widget_auth_landing_samsung" id="0x7f0d00c0" />
-    <public type="layout" name="widget_auth_login" id="0x7f0d00c1" />
-    <public type="layout" name="widget_auth_mfa" id="0x7f0d00c2" />
-    <public type="layout" name="widget_auth_mfa_backup_codes" id="0x7f0d00c3" />
-    <public type="layout" name="widget_auth_mfa_info" id="0x7f0d00c4" />
-    <public type="layout" name="widget_auth_register" id="0x7f0d00c5" />
-    <public type="layout" name="widget_auth_undelete_account" id="0x7f0d00c6" />
-    <public type="layout" name="widget_ban_user" id="0x7f0d00c7" />
-    <public type="layout" name="widget_cancel_premium_dialog" id="0x7f0d00c8" />
-    <public type="layout" name="widget_change_log" id="0x7f0d00c9" />
-    <public type="layout" name="widget_channel_group_dm_settings" id="0x7f0d00ca" />
-    <public type="layout" name="widget_channel_members_list" id="0x7f0d00cb" />
-    <public type="layout" name="widget_channel_members_list_item_header" id="0x7f0d00cc" />
-    <public type="layout" name="widget_channel_members_list_item_loading" id="0x7f0d00cd" />
-    <public type="layout" name="widget_channel_members_list_item_user" id="0x7f0d00ce" />
-    <public type="layout" name="widget_channel_notification_settings" id="0x7f0d00cf" />
-    <public type="layout" name="widget_channel_pinned_messages" id="0x7f0d00d0" />
-    <public type="layout" name="widget_channel_search_item" id="0x7f0d00d1" />
-    <public type="layout" name="widget_channel_search_item_header" id="0x7f0d00d2" />
-    <public type="layout" name="widget_channel_selector" id="0x7f0d00d3" />
-    <public type="layout" name="widget_channel_selector_item" id="0x7f0d00d4" />
-    <public type="layout" name="widget_channel_settings_delete" id="0x7f0d00d5" />
-    <public type="layout" name="widget_channel_settings_edit_permissions" id="0x7f0d00d6" />
-    <public type="layout" name="widget_channel_settings_permissions_add_member" id="0x7f0d00d7" />
-    <public type="layout" name="widget_channel_settings_permissions_add_role" id="0x7f0d00d8" />
-    <public type="layout" name="widget_channel_settings_permissions_overview" id="0x7f0d00d9" />
-    <public type="layout" name="widget_channel_topic" id="0x7f0d00da" />
-    <public type="layout" name="widget_channels_list" id="0x7f0d00db" />
-    <public type="layout" name="widget_channels_list_actions_change_nickname" id="0x7f0d00dc" />
-    <public type="layout" name="widget_channels_list_actions_leave_server" id="0x7f0d00dd" />
-    <public type="layout" name="widget_channels_list_item_category" id="0x7f0d00de" />
-    <public type="layout" name="widget_channels_list_item_channel" id="0x7f0d00df" />
-    <public type="layout" name="widget_channels_list_item_channel_private" id="0x7f0d00e0" />
-    <public type="layout" name="widget_channels_list_item_channel_voice" id="0x7f0d00e1" />
-    <public type="layout" name="widget_channels_list_item_friends" id="0x7f0d00e2" />
-    <public type="layout" name="widget_channels_list_item_header" id="0x7f0d00e3" />
-    <public type="layout" name="widget_channels_list_item_invite" id="0x7f0d00e4" />
-    <public type="layout" name="widget_channels_list_item_mfa" id="0x7f0d00e5" />
-    <public type="layout" name="widget_channels_list_item_text_actions" id="0x7f0d00e6" />
-    <public type="layout" name="widget_channels_list_item_voice_user" id="0x7f0d00e7" />
-    <public type="layout" name="widget_channels_list_unreads" id="0x7f0d00e8" />
-    <public type="layout" name="widget_chat_detached" id="0x7f0d00e9" />
-    <public type="layout" name="widget_chat_input" id="0x7f0d00ea" />
-    <public type="layout" name="widget_chat_input_edit_text" id="0x7f0d00eb" />
-    <public type="layout" name="widget_chat_input_emoji_picker" id="0x7f0d00ec" />
-    <public type="layout" name="widget_chat_input_item" id="0x7f0d00ed" />
-    <public type="layout" name="widget_chat_input_perm_req_files" id="0x7f0d00ee" />
-    <public type="layout" name="widget_chat_input_upload_too_large" id="0x7f0d00ef" />
-    <public type="layout" name="widget_chat_input_verification" id="0x7f0d00f0" />
-    <public type="layout" name="widget_chat_list" id="0x7f0d00f1" />
-    <public type="layout" name="widget_chat_list_actions" id="0x7f0d00f2" />
-    <public type="layout" name="widget_chat_list_adapter_item_application_news" id="0x7f0d00f3" />
-    <public type="layout" name="widget_chat_list_adapter_item_attachment" id="0x7f0d00f4" />
-    <public type="layout" name="widget_chat_list_adapter_item_blocked" id="0x7f0d00f5" />
-    <public type="layout" name="widget_chat_list_adapter_item_divider" id="0x7f0d00f6" />
-    <public type="layout" name="widget_chat_list_adapter_item_embed" id="0x7f0d00f7" />
-    <public type="layout" name="widget_chat_list_adapter_item_embed_field" id="0x7f0d00f8" />
-    <public type="layout" name="widget_chat_list_adapter_item_empty_pins" id="0x7f0d00f9" />
-    <public type="layout" name="widget_chat_list_adapter_item_failed" id="0x7f0d00fa" />
-    <public type="layout" name="widget_chat_list_adapter_item_game_invite" id="0x7f0d00fb" />
-    <public type="layout" name="widget_chat_list_adapter_item_gift" id="0x7f0d00fc" />
-    <public type="layout" name="widget_chat_list_adapter_item_guild_welcome" id="0x7f0d00fd" />
-    <public type="layout" name="widget_chat_list_adapter_item_invite" id="0x7f0d00fe" />
-    <public type="layout" name="widget_chat_list_adapter_item_listen_together" id="0x7f0d00ff" />
-    <public type="layout" name="widget_chat_list_adapter_item_loading" id="0x7f0d0100" />
-    <public type="layout" name="widget_chat_list_adapter_item_mention_footer" id="0x7f0d0101" />
-    <public type="layout" name="widget_chat_list_adapter_item_message_header" id="0x7f0d0102" />
-    <public type="layout" name="widget_chat_list_adapter_item_minimal" id="0x7f0d0103" />
-    <public type="layout" name="widget_chat_list_adapter_item_reactions" id="0x7f0d0104" />
-    <public type="layout" name="widget_chat_list_adapter_item_result_count" id="0x7f0d0105" />
-    <public type="layout" name="widget_chat_list_adapter_item_search_empty" id="0x7f0d0106" />
-    <public type="layout" name="widget_chat_list_adapter_item_search_error" id="0x7f0d0107" />
-    <public type="layout" name="widget_chat_list_adapter_item_search_indexing" id="0x7f0d0108" />
-    <public type="layout" name="widget_chat_list_adapter_item_spacer" id="0x7f0d0109" />
-    <public type="layout" name="widget_chat_list_adapter_item_start" id="0x7f0d010a" />
-    <public type="layout" name="widget_chat_list_adapter_item_system" id="0x7f0d010b" />
-    <public type="layout" name="widget_chat_list_adapter_item_text" id="0x7f0d010c" />
-    <public type="layout" name="widget_chat_list_adapter_item_text_divider" id="0x7f0d010d" />
-    <public type="layout" name="widget_chat_list_adapter_item_upload_progress" id="0x7f0d010e" />
-    <public type="layout" name="widget_chat_list_tab_badged" id="0x7f0d010f" />
-    <public type="layout" name="widget_chat_typing_users" id="0x7f0d0110" />
-    <public type="layout" name="widget_chat_voice_list_item_user" id="0x7f0d0111" />
-    <public type="layout" name="widget_client_outdated" id="0x7f0d0112" />
-    <public type="layout" name="widget_collapsed_voice_user_list_item" id="0x7f0d0113" />
-    <public type="layout" name="widget_connections_add_xbox" id="0x7f0d0114" />
-    <public type="layout" name="widget_create_channel" id="0x7f0d0115" />
-    <public type="layout" name="widget_debugging" id="0x7f0d0116" />
-    <public type="layout" name="widget_debugging_adapter_item" id="0x7f0d0117" />
-    <public type="layout" name="widget_disable_delete_account_dialog" id="0x7f0d0118" />
-    <public type="layout" name="widget_edit_role" id="0x7f0d0119" />
-    <public type="layout" name="widget_enable_mfa_steps" id="0x7f0d011a" />
-    <public type="layout" name="widget_enable_sms_backup_dialog" id="0x7f0d011b" />
-    <public type="layout" name="widget_fatal_crash" id="0x7f0d011c" />
-    <public type="layout" name="widget_friend_request_delete_confirmation" id="0x7f0d011d" />
-    <public type="layout" name="widget_friends_add" id="0x7f0d011e" />
-    <public type="layout" name="widget_friends_list" id="0x7f0d011f" />
-    <public type="layout" name="widget_friends_list_adapter_item" id="0x7f0d0120" />
-    <public type="layout" name="widget_friends_list_adapter_item_empty" id="0x7f0d0121" />
-    <public type="layout" name="widget_friends_nearby" id="0x7f0d0122" />
-    <public type="layout" name="widget_global_search" id="0x7f0d0123" />
-    <public type="layout" name="widget_global_search_item_divider" id="0x7f0d0124" />
-    <public type="layout" name="widget_global_search_item_dm" id="0x7f0d0125" />
-    <public type="layout" name="widget_global_search_item_guild" id="0x7f0d0126" />
-    <public type="layout" name="widget_group_invite_friends" id="0x7f0d0127" />
-    <public type="layout" name="widget_group_invite_friends_item" id="0x7f0d0128" />
-    <public type="layout" name="widget_guild_actions_add" id="0x7f0d0129" />
-    <public type="layout" name="widget_guild_actions_sheet" id="0x7f0d012a" />
-    <public type="layout" name="widget_guild_call" id="0x7f0d012b" />
-    <public type="layout" name="widget_guild_create" id="0x7f0d012c" />
-    <public type="layout" name="widget_guild_create_region" id="0x7f0d012d" />
-    <public type="layout" name="widget_guild_invite" id="0x7f0d012e" />
-    <public type="layout" name="widget_guild_invite_info" id="0x7f0d012f" />
-    <public type="layout" name="widget_guild_invite_share" id="0x7f0d0130" />
-    <public type="layout" name="widget_guild_invite_share_item" id="0x7f0d0131" />
-    <public type="layout" name="widget_guild_join" id="0x7f0d0132" />
-    <public type="layout" name="widget_guild_join_invite_examples" id="0x7f0d0133" />
-    <public type="layout" name="widget_guild_search" id="0x7f0d0134" />
-    <public type="layout" name="widget_guild_search_list_item" id="0x7f0d0135" />
-    <public type="layout" name="widget_guild_transfer_ownership" id="0x7f0d0136" />
-    <public type="layout" name="widget_guilds_list" id="0x7f0d0137" />
-    <public type="layout" name="widget_guilds_list_item_divider" id="0x7f0d0138" />
-    <public type="layout" name="widget_guilds_list_item_dm" id="0x7f0d0139" />
-    <public type="layout" name="widget_guilds_list_item_dm_vertical" id="0x7f0d013a" />
-    <public type="layout" name="widget_guilds_list_item_folder" id="0x7f0d013b" />
-    <public type="layout" name="widget_guilds_list_item_guild" id="0x7f0d013c" />
-    <public type="layout" name="widget_guilds_list_item_guild_new" id="0x7f0d013d" />
-    <public type="layout" name="widget_guilds_list_item_guild_unavailable" id="0x7f0d013e" />
-    <public type="layout" name="widget_guilds_list_item_guild_vertical" id="0x7f0d013f" />
-    <public type="layout" name="widget_guilds_list_item_profile" id="0x7f0d0140" />
-    <public type="layout" name="widget_incoming_share" id="0x7f0d0141" />
-    <public type="layout" name="widget_kick_user" id="0x7f0d0142" />
-    <public type="layout" name="widget_main" id="0x7f0d0143" />
-    <public type="layout" name="widget_main_panel_center" id="0x7f0d0144" />
-    <public type="layout" name="widget_main_panel_center_channel_less" id="0x7f0d0145" />
-    <public type="layout" name="widget_main_panel_center_content" id="0x7f0d0146" />
-    <public type="layout" name="widget_main_panel_center_content_unread" id="0x7f0d0147" />
-    <public type="layout" name="widget_main_panel_center_nsfw" id="0x7f0d0148" />
-    <public type="layout" name="widget_main_panel_left" id="0x7f0d0149" />
-    <public type="layout" name="widget_main_panel_loading" id="0x7f0d014a" />
-    <public type="layout" name="widget_main_panel_right" id="0x7f0d014b" />
-    <public type="layout" name="widget_manage_reactions" id="0x7f0d014c" />
-    <public type="layout" name="widget_manage_reactions_emoji" id="0x7f0d014d" />
-    <public type="layout" name="widget_manage_reactions_result_error" id="0x7f0d014e" />
-    <public type="layout" name="widget_manage_reactions_result_loading" id="0x7f0d014f" />
-    <public type="layout" name="widget_manage_reactions_result_user" id="0x7f0d0150" />
-    <public type="layout" name="widget_media" id="0x7f0d0151" />
-    <public type="layout" name="widget_music_rich_presence" id="0x7f0d0152" />
-    <public type="layout" name="widget_notice_dialog" id="0x7f0d0153" />
-    <public type="layout" name="widget_notice_nux_overlay" id="0x7f0d0154" />
-    <public type="layout" name="widget_notice_popup" id="0x7f0d0155" />
-    <public type="layout" name="widget_notice_popup_channel" id="0x7f0d0156" />
-    <public type="layout" name="widget_nux_post_registration" id="0x7f0d0157" />
-    <public type="layout" name="widget_oauth_authorize" id="0x7f0d0158" />
-    <public type="layout" name="widget_payment_source_edit_dialog" id="0x7f0d0159" />
-    <public type="layout" name="widget_platform_rich_prescence" id="0x7f0d015a" />
-    <public type="layout" name="widget_premium_upsell" id="0x7f0d015b" />
-    <public type="layout" name="widget_private_call" id="0x7f0d015c" />
-    <public type="layout" name="widget_private_call_controls_view" id="0x7f0d015d" />
-    <public type="layout" name="widget_prune_users" id="0x7f0d015e" />
-    <public type="layout" name="widget_search" id="0x7f0d015f" />
-    <public type="layout" name="widget_search_results" id="0x7f0d0160" />
-    <public type="layout" name="widget_search_suggestion_item_header" id="0x7f0d0161" />
-    <public type="layout" name="widget_search_suggestion_item_header_history" id="0x7f0d0162" />
-    <public type="layout" name="widget_search_suggestions" id="0x7f0d0163" />
-    <public type="layout" name="widget_search_suggestions_item_channel" id="0x7f0d0164" />
-    <public type="layout" name="widget_search_suggestions_item_has" id="0x7f0d0165" />
-    <public type="layout" name="widget_search_suggestions_item_recent_query" id="0x7f0d0166" />
-    <public type="layout" name="widget_search_suggestions_item_suggestion" id="0x7f0d0167" />
-    <public type="layout" name="widget_search_suggestions_item_user" id="0x7f0d0168" />
-    <public type="layout" name="widget_server_boost_confirmation" id="0x7f0d0169" />
-    <public type="layout" name="widget_server_boost_status" id="0x7f0d016a" />
-    <public type="layout" name="widget_server_delete_dialog" id="0x7f0d016b" />
-    <public type="layout" name="widget_server_notification_override_selector" id="0x7f0d016c" />
-    <public type="layout" name="widget_server_notifications" id="0x7f0d016d" />
-    <public type="layout" name="widget_server_remove_boost_confirmation" id="0x7f0d016e" />
-    <public type="layout" name="widget_server_settings" id="0x7f0d016f" />
-    <public type="layout" name="widget_server_settings_audit_log" id="0x7f0d0170" />
-    <public type="layout" name="widget_server_settings_audit_log_filter_action_listitem" id="0x7f0d0171" />
-    <public type="layout" name="widget_server_settings_audit_log_filter_user_listitem" id="0x7f0d0172" />
-    <public type="layout" name="widget_server_settings_audit_log_listitem" id="0x7f0d0173" />
-    <public type="layout" name="widget_server_settings_audit_log_loading_listitem" id="0x7f0d0174" />
-    <public type="layout" name="widget_server_settings_ban_list_item" id="0x7f0d0175" />
-    <public type="layout" name="widget_server_settings_bans" id="0x7f0d0176" />
-    <public type="layout" name="widget_server_settings_channels" id="0x7f0d0177" />
-    <public type="layout" name="widget_server_settings_channels_sort_actions" id="0x7f0d0178" />
-    <public type="layout" name="widget_server_settings_channels_sort_fab_menu" id="0x7f0d0179" />
-    <public type="layout" name="widget_server_settings_confirm_disable_integration" id="0x7f0d017a" />
-    <public type="layout" name="widget_server_settings_edit_integration" id="0x7f0d017b" />
-    <public type="layout" name="widget_server_settings_edit_member" id="0x7f0d017c" />
-    <public type="layout" name="widget_server_settings_edit_role_color_picker" id="0x7f0d017d" />
-    <public type="layout" name="widget_server_settings_emojis" id="0x7f0d017e" />
-    <public type="layout" name="widget_server_settings_emojis_edit" id="0x7f0d017f" />
-    <public type="layout" name="widget_server_settings_emojis_empty" id="0x7f0d0180" />
-    <public type="layout" name="widget_server_settings_emojis_header" id="0x7f0d0181" />
-    <public type="layout" name="widget_server_settings_emojis_item" id="0x7f0d0182" />
-    <public type="layout" name="widget_server_settings_emojis_section" id="0x7f0d0183" />
-    <public type="layout" name="widget_server_settings_instant_invite_actions" id="0x7f0d0184" />
-    <public type="layout" name="widget_server_settings_instant_invite_list_item" id="0x7f0d0185" />
-    <public type="layout" name="widget_server_settings_instant_invites" id="0x7f0d0186" />
-    <public type="layout" name="widget_server_settings_integration_list_item" id="0x7f0d0187" />
-    <public type="layout" name="widget_server_settings_integrations" id="0x7f0d0188" />
-    <public type="layout" name="widget_server_settings_member_list_item" id="0x7f0d0189" />
-    <public type="layout" name="widget_server_settings_members" id="0x7f0d018a" />
-    <public type="layout" name="widget_server_settings_moderation" id="0x7f0d018b" />
-    <public type="layout" name="widget_server_settings_overview" id="0x7f0d018c" />
-    <public type="layout" name="widget_server_settings_overview_afk_timeout" id="0x7f0d018d" />
-    <public type="layout" name="widget_server_settings_overview_region" id="0x7f0d018e" />
-    <public type="layout" name="widget_server_settings_overview_region_item" id="0x7f0d018f" />
-    <public type="layout" name="widget_server_settings_overview_section_afk_channel" id="0x7f0d0190" />
-    <public type="layout" name="widget_server_settings_role_item" id="0x7f0d0191" />
-    <public type="layout" name="widget_server_settings_roles_list" id="0x7f0d0192" />
-    <public type="layout" name="widget_server_settings_security" id="0x7f0d0193" />
-    <public type="layout" name="widget_server_settings_security_dialog" id="0x7f0d0194" />
-    <public type="layout" name="widget_server_settings_vanity_url" id="0x7f0d0195" />
-    <public type="layout" name="widget_settings" id="0x7f0d0196" />
-    <public type="layout" name="widget_settings_account" id="0x7f0d0197" />
-    <public type="layout" name="widget_settings_account_backup_codes" id="0x7f0d0198" />
-    <public type="layout" name="widget_settings_account_change_password" id="0x7f0d0199" />
-    <public type="layout" name="widget_settings_account_edit" id="0x7f0d019a" />
-    <public type="layout" name="widget_settings_appearance" id="0x7f0d019b" />
-    <public type="layout" name="widget_settings_authorized_apps" id="0x7f0d019c" />
-    <public type="layout" name="widget_settings_authorized_apps_list_item" id="0x7f0d019d" />
-    <public type="layout" name="widget_settings_behavior" id="0x7f0d019e" />
-    <public type="layout" name="widget_settings_billing" id="0x7f0d019f" />
-    <public type="layout" name="widget_settings_boost" id="0x7f0d01a0" />
-    <public type="layout" name="widget_settings_connections" id="0x7f0d01a1" />
-    <public type="layout" name="widget_settings_connections_add" id="0x7f0d01a2" />
-    <public type="layout" name="widget_settings_developer" id="0x7f0d01a3" />
-    <public type="layout" name="widget_settings_enable_mfa_download" id="0x7f0d01a4" />
-    <public type="layout" name="widget_settings_enable_mfa_input" id="0x7f0d01a5" />
-    <public type="layout" name="widget_settings_enable_mfa_key" id="0x7f0d01a6" />
-    <public type="layout" name="widget_settings_enable_mfa_success" id="0x7f0d01a7" />
-    <public type="layout" name="widget_settings_games" id="0x7f0d01a8" />
-    <public type="layout" name="widget_settings_gifting" id="0x7f0d01a9" />
-    <public type="layout" name="widget_settings_item_add_connected_account" id="0x7f0d01aa" />
-    <public type="layout" name="widget_settings_item_backup_code" id="0x7f0d01ab" />
-    <public type="layout" name="widget_settings_item_backup_code_header" id="0x7f0d01ac" />
-    <public type="layout" name="widget_settings_item_connected_account" id="0x7f0d01ad" />
-    <public type="layout" name="widget_settings_language" id="0x7f0d01ae" />
-    <public type="layout" name="widget_settings_language_select" id="0x7f0d01af" />
-    <public type="layout" name="widget_settings_language_select_item" id="0x7f0d01b0" />
-    <public type="layout" name="widget_settings_media" id="0x7f0d01b1" />
-    <public type="layout" name="widget_settings_notification_os" id="0x7f0d01b2" />
-    <public type="layout" name="widget_settings_notifications" id="0x7f0d01b3" />
-    <public type="layout" name="widget_settings_payment_methods" id="0x7f0d01b4" />
-    <public type="layout" name="widget_settings_premium" id="0x7f0d01b5" />
-    <public type="layout" name="widget_settings_privacy" id="0x7f0d01b6" />
-    <public type="layout" name="widget_settings_privacy_defaults" id="0x7f0d01b7" />
-    <public type="layout" name="widget_settings_voice" id="0x7f0d01b8" />
-    <public type="layout" name="widget_status" id="0x7f0d01b9" />
-    <public type="layout" name="widget_stream_rich_presence" id="0x7f0d01ba" />
-    <public type="layout" name="widget_text_channel_settings" id="0x7f0d01bb" />
-    <public type="layout" name="widget_tos_accept" id="0x7f0d01bc" />
-    <public type="layout" name="widget_upgrade_premium_dialog" id="0x7f0d01bd" />
-    <public type="layout" name="widget_url_actions" id="0x7f0d01be" />
-    <public type="layout" name="widget_usage_settings_dialog" id="0x7f0d01bf" />
-    <public type="layout" name="widget_user_account_verify" id="0x7f0d01c0" />
-    <public type="layout" name="widget_user_captcha_verify" id="0x7f0d01c1" />
-    <public type="layout" name="widget_user_email_update" id="0x7f0d01c2" />
-    <public type="layout" name="widget_user_email_verify" id="0x7f0d01c3" />
-    <public type="layout" name="widget_user_info" id="0x7f0d01c4" />
-    <public type="layout" name="widget_user_info_adapter_item_connected_account" id="0x7f0d01c5" />
-    <public type="layout" name="widget_user_mentions" id="0x7f0d01c6" />
-    <public type="layout" name="widget_user_mentions_filter" id="0x7f0d01c7" />
-    <public type="layout" name="widget_user_mutual_friends" id="0x7f0d01c8" />
-    <public type="layout" name="widget_user_mutual_guilds" id="0x7f0d01c9" />
-    <public type="layout" name="widget_user_phone_add" id="0x7f0d01ca" />
-    <public type="layout" name="widget_user_phone_verify" id="0x7f0d01cb" />
-    <public type="layout" name="widget_user_profile" id="0x7f0d01cc" />
-    <public type="layout" name="widget_user_profile_adapter_item_empty" id="0x7f0d01cd" />
-    <public type="layout" name="widget_user_profile_adapter_item_friend" id="0x7f0d01ce" />
-    <public type="layout" name="widget_user_profile_adapter_item_friend_mutual_server" id="0x7f0d01cf" />
-    <public type="layout" name="widget_user_profile_adapter_item_server" id="0x7f0d01d0" />
-    <public type="layout" name="widget_user_profile_header" id="0x7f0d01d1" />
-    <public type="layout" name="widget_user_profile_header_badge" id="0x7f0d01d2" />
-    <public type="layout" name="widget_user_profile_strip" id="0x7f0d01d3" />
-    <public type="layout" name="widget_user_rich_presence" id="0x7f0d01d4" />
-    <public type="layout" name="widget_user_sheet" id="0x7f0d01d5" />
-    <public type="layout" name="widget_user_status_update" id="0x7f0d01d6" />
-    <public type="layout" name="widget_voice_actions" id="0x7f0d01d7" />
-    <public type="layout" name="widget_voice_call_incoming" id="0x7f0d01d8" />
-    <public type="layout" name="widget_voice_call_inline" id="0x7f0d01d9" />
-    <public type="layout" name="widget_voice_channel_settings" id="0x7f0d01da" />
-    <public type="layout" name="widget_web_view" id="0x7f0d01db" />
+    <public type="layout" name="image_upload_dialog" id="0x7f0d003a" />
+    <public type="layout" name="integration_sync_settings" id="0x7f0d003b" />
+    <public type="layout" name="item_permission_storage" id="0x7f0d003c" />
+    <public type="layout" name="layout_account_credits_list" id="0x7f0d003d" />
+    <public type="layout" name="layout_search" id="0x7f0d003e" />
+    <public type="layout" name="layout_search_actionbar" id="0x7f0d003f" />
+    <public type="layout" name="layout_unhandled_uri" id="0x7f0d0040" />
+    <public type="layout" name="mtrl_layout_snackbar" id="0x7f0d0041" />
+    <public type="layout" name="mtrl_layout_snackbar_include" id="0x7f0d0042" />
+    <public type="layout" name="notification_action" id="0x7f0d0043" />
+    <public type="layout" name="notification_action_tombstone" id="0x7f0d0044" />
+    <public type="layout" name="notification_media_action" id="0x7f0d0045" />
+    <public type="layout" name="notification_media_cancel_action" id="0x7f0d0046" />
+    <public type="layout" name="notification_template_big_media" id="0x7f0d0047" />
+    <public type="layout" name="notification_template_big_media_custom" id="0x7f0d0048" />
+    <public type="layout" name="notification_template_big_media_narrow" id="0x7f0d0049" />
+    <public type="layout" name="notification_template_big_media_narrow_custom" id="0x7f0d004a" />
+    <public type="layout" name="notification_template_custom_big" id="0x7f0d004b" />
+    <public type="layout" name="notification_template_icon_group" id="0x7f0d004c" />
+    <public type="layout" name="notification_template_lines_media" id="0x7f0d004d" />
+    <public type="layout" name="notification_template_media" id="0x7f0d004e" />
+    <public type="layout" name="notification_template_media_custom" id="0x7f0d004f" />
+    <public type="layout" name="notification_template_part_chronometer" id="0x7f0d0050" />
+    <public type="layout" name="notification_template_part_time" id="0x7f0d0051" />
+    <public type="layout" name="oauth_token_permission_detailed_list_item" id="0x7f0d0052" />
+    <public type="layout" name="oauth_token_permission_list_item" id="0x7f0d0053" />
+    <public type="layout" name="overlay_bubble_menu" id="0x7f0d0054" />
+    <public type="layout" name="overlay_menu_voice_members_item" id="0x7f0d0055" />
+    <public type="layout" name="overlay_voice_bubble" id="0x7f0d0056" />
+    <public type="layout" name="overlay_voice_channel_selector" id="0x7f0d0057" />
+    <public type="layout" name="payment_method_list_add_item" id="0x7f0d0058" />
+    <public type="layout" name="payment_method_list_header" id="0x7f0d0059" />
+    <public type="layout" name="payment_method_list_item" id="0x7f0d005a" />
+    <public type="layout" name="payment_source_view" id="0x7f0d005b" />
+    <public type="layout" name="premium_upsell_dialog" id="0x7f0d005c" />
+    <public type="layout" name="reaction_quick_add" id="0x7f0d005d" />
+    <public type="layout" name="reaction_view" id="0x7f0d005e" />
+    <public type="layout" name="select_dialog_item_material" id="0x7f0d005f" />
+    <public type="layout" name="select_dialog_multichoice_material" id="0x7f0d0060" />
+    <public type="layout" name="select_dialog_singlechoice_material" id="0x7f0d0061" />
+    <public type="layout" name="server_settings_members_role_spinner_item" id="0x7f0d0062" />
+    <public type="layout" name="server_settings_members_role_spinner_item_open" id="0x7f0d0063" />
+    <public type="layout" name="settings_channel_list_category_item" id="0x7f0d0064" />
+    <public type="layout" name="settings_channel_list_item" id="0x7f0d0065" />
+    <public type="layout" name="simple_member_list_item" id="0x7f0d0066" />
+    <public type="layout" name="simple_role_list_item" id="0x7f0d0067" />
+    <public type="layout" name="stream_feedback_spinner_item" id="0x7f0d0068" />
+    <public type="layout" name="support_simple_spinner_dropdown_item" id="0x7f0d0069" />
+    <public type="layout" name="surface_view" id="0x7f0d006a" />
+    <public type="layout" name="texture_view" id="0x7f0d006b" />
+    <public type="layout" name="trash_wrap" id="0x7f0d006c" />
+    <public type="layout" name="ucrop_activity_photobox" id="0x7f0d006d" />
+    <public type="layout" name="ucrop_aspect_ratio" id="0x7f0d006e" />
+    <public type="layout" name="ucrop_controls" id="0x7f0d006f" />
+    <public type="layout" name="ucrop_fragment_photobox" id="0x7f0d0070" />
+    <public type="layout" name="ucrop_layout_rotate_wheel" id="0x7f0d0071" />
+    <public type="layout" name="ucrop_layout_scale_wheel" id="0x7f0d0072" />
+    <public type="layout" name="ucrop_view" id="0x7f0d0073" />
+    <public type="layout" name="user_profile_header_badge" id="0x7f0d0074" />
+    <public type="layout" name="user_profile_header_view" id="0x7f0d0075" />
+    <public type="layout" name="view_account_credit" id="0x7f0d0076" />
+    <public type="layout" name="view_active_subscription" id="0x7f0d0077" />
+    <public type="layout" name="view_add_override_item" id="0x7f0d0078" />
+    <public type="layout" name="view_application_news" id="0x7f0d0079" />
+    <public type="layout" name="view_application_stream" id="0x7f0d007a" />
+    <public type="layout" name="view_attachment_preview_item" id="0x7f0d007b" />
+    <public type="layout" name="view_boost_progress_bar" id="0x7f0d007c" />
+    <public type="layout" name="view_boost_status_no_boosts" id="0x7f0d007d" />
+    <public type="layout" name="view_boost_user_settings_perks" id="0x7f0d007e" />
+    <public type="layout" name="view_boxed_button" id="0x7f0d007f" />
+    <public type="layout" name="view_camera_permissions" id="0x7f0d0080" />
+    <public type="layout" name="view_category_override_item" id="0x7f0d0081" />
+    <public type="layout" name="view_channel_override_item" id="0x7f0d0082" />
+    <public type="layout" name="view_chat_action_item" id="0x7f0d0083" />
+    <public type="layout" name="view_chat_list_actions_emoji_item" id="0x7f0d0084" />
+    <public type="layout" name="view_checkable_role_list_item" id="0x7f0d0085" />
+    <public type="layout" name="view_checkable_role_list_item_themed" id="0x7f0d0086" />
+    <public type="layout" name="view_chip" id="0x7f0d0087" />
+    <public type="layout" name="view_chip_default" id="0x7f0d0088" />
+    <public type="layout" name="view_dialog_confirmation" id="0x7f0d0089" />
+    <public type="layout" name="view_digit_verification" id="0x7f0d008a" />
+    <public type="layout" name="view_edit_payment_info" id="0x7f0d008b" />
+    <public type="layout" name="view_emoji_item" id="0x7f0d008c" />
+    <public type="layout" name="view_file_item" id="0x7f0d008d" />
+    <public type="layout" name="view_gift_entitlement_list_item" id="0x7f0d008e" />
+    <public type="layout" name="view_gift_sku_list_item" id="0x7f0d008f" />
+    <public type="layout" name="view_global_search_item" id="0x7f0d0090" />
+    <public type="layout" name="view_golive_stream" id="0x7f0d0091" />
+    <public type="layout" name="view_grid_image" id="0x7f0d0092" />
+    <public type="layout" name="view_guild" id="0x7f0d0093" />
+    <public type="layout" name="view_guild_invite_bottom_sheet" id="0x7f0d0094" />
+    <public type="layout" name="view_image" id="0x7f0d0095" />
+    <public type="layout" name="view_input_modal" id="0x7f0d0096" />
+    <public type="layout" name="view_invite_settings_channel_spinner_item" id="0x7f0d0097" />
+    <public type="layout" name="view_invite_settngs_channel_spinner_item_open" id="0x7f0d0098" />
+    <public type="layout" name="view_loading_button" id="0x7f0d0099" />
+    <public type="layout" name="view_nitro_boost_perks" id="0x7f0d009a" />
+    <public type="layout" name="view_nitro_boost_perks_list_item" id="0x7f0d009b" />
+    <public type="layout" name="view_no_gifts_list_item" id="0x7f0d009c" />
+    <public type="layout" name="view_overlay_menu" id="0x7f0d009d" />
+    <public type="layout" name="view_overlay_menu_content" id="0x7f0d009e" />
+    <public type="layout" name="view_premium_settings_perks" id="0x7f0d009f" />
+    <public type="layout" name="view_premium_settings_tier_1" id="0x7f0d00a0" />
+    <public type="layout" name="view_premium_settings_tier_2" id="0x7f0d00a1" />
+    <public type="layout" name="view_radio_button" id="0x7f0d00a2" />
+    <public type="layout" name="view_review_request_modal_image" id="0x7f0d00a3" />
+    <public type="layout" name="view_role_item_text" id="0x7f0d00a4" />
+    <public type="layout" name="view_server_folder" id="0x7f0d00a5" />
+    <public type="layout" name="view_server_settings_icon_name" id="0x7f0d00a6" />
+    <public type="layout" name="view_server_settings_notifications" id="0x7f0d00a7" />
+    <public type="layout" name="view_server_settings_region" id="0x7f0d00a8" />
+    <public type="layout" name="view_server_settings_system_channel_wrap" id="0x7f0d00a9" />
+    <public type="layout" name="view_server_settings_upload_banner" id="0x7f0d00aa" />
+    <public type="layout" name="view_server_settings_upload_splash" id="0x7f0d00ab" />
+    <public type="layout" name="view_setting_check" id="0x7f0d00ac" />
+    <public type="layout" name="view_setting_radio" id="0x7f0d00ad" />
+    <public type="layout" name="view_setting_switch" id="0x7f0d00ae" />
+    <public type="layout" name="view_settings_boost_available_listitem" id="0x7f0d00af" />
+    <public type="layout" name="view_settings_boost_info_listitem" id="0x7f0d00b0" />
+    <public type="layout" name="view_settings_boosted_guild_listitem" id="0x7f0d00b1" />
+    <public type="layout" name="view_settings_gifting_nitro" id="0x7f0d00b2" />
+    <public type="layout" name="view_settings_gifting_nitro_classic" id="0x7f0d00b3" />
+    <public type="layout" name="view_steps" id="0x7f0d00b4" />
+    <public type="layout" name="view_ternary_checkbox" id="0x7f0d00b5" />
+    <public type="layout" name="view_toolbar_title" id="0x7f0d00b6" />
+    <public type="layout" name="view_upload_progress" id="0x7f0d00b7" />
+    <public type="layout" name="view_user_avatar_presence" id="0x7f0d00b8" />
+    <public type="layout" name="view_user_list_item" id="0x7f0d00b9" />
+    <public type="layout" name="view_user_status_presence" id="0x7f0d00ba" />
+    <public type="layout" name="view_video_call_participant" id="0x7f0d00bb" />
+    <public type="layout" name="view_voice_user" id="0x7f0d00bc" />
+    <public type="layout" name="voice_controls_view" id="0x7f0d00bd" />
+    <public type="layout" name="voice_user_list_item_divider" id="0x7f0d00be" />
+    <public type="layout" name="voice_user_list_item_header" id="0x7f0d00bf" />
+    <public type="layout" name="voice_user_list_item_user" id="0x7f0d00c0" />
+    <public type="layout" name="voice_user_list_item_user_stream_preview" id="0x7f0d00c1" />
+    <public type="layout" name="widget_accept_gift_dialog" id="0x7f0d00c2" />
+    <public type="layout" name="widget_add_friend_user_list_item" id="0x7f0d00c3" />
+    <public type="layout" name="widget_audit_log_filter_sheet" id="0x7f0d00c4" />
+    <public type="layout" name="widget_auth_captcha" id="0x7f0d00c5" />
+    <public type="layout" name="widget_auth_header" id="0x7f0d00c6" />
+    <public type="layout" name="widget_auth_invite_info" id="0x7f0d00c7" />
+    <public type="layout" name="widget_auth_landing" id="0x7f0d00c8" />
+    <public type="layout" name="widget_auth_landing_samsung" id="0x7f0d00c9" />
+    <public type="layout" name="widget_auth_login" id="0x7f0d00ca" />
+    <public type="layout" name="widget_auth_mfa" id="0x7f0d00cb" />
+    <public type="layout" name="widget_auth_mfa_backup_codes" id="0x7f0d00cc" />
+    <public type="layout" name="widget_auth_mfa_info" id="0x7f0d00cd" />
+    <public type="layout" name="widget_auth_register" id="0x7f0d00ce" />
+    <public type="layout" name="widget_auth_undelete_account" id="0x7f0d00cf" />
+    <public type="layout" name="widget_ban_user" id="0x7f0d00d0" />
+    <public type="layout" name="widget_cancel_premium_dialog" id="0x7f0d00d1" />
+    <public type="layout" name="widget_change_log" id="0x7f0d00d2" />
+    <public type="layout" name="widget_channel_group_dm_settings" id="0x7f0d00d3" />
+    <public type="layout" name="widget_channel_members_list" id="0x7f0d00d4" />
+    <public type="layout" name="widget_channel_members_list_item_header" id="0x7f0d00d5" />
+    <public type="layout" name="widget_channel_members_list_item_loading" id="0x7f0d00d6" />
+    <public type="layout" name="widget_channel_members_list_item_user" id="0x7f0d00d7" />
+    <public type="layout" name="widget_channel_notification_settings" id="0x7f0d00d8" />
+    <public type="layout" name="widget_channel_pinned_messages" id="0x7f0d00d9" />
+    <public type="layout" name="widget_channel_search_item" id="0x7f0d00da" />
+    <public type="layout" name="widget_channel_search_item_header" id="0x7f0d00db" />
+    <public type="layout" name="widget_channel_selector" id="0x7f0d00dc" />
+    <public type="layout" name="widget_channel_selector_item" id="0x7f0d00dd" />
+    <public type="layout" name="widget_channel_settings_delete" id="0x7f0d00de" />
+    <public type="layout" name="widget_channel_settings_edit_permissions" id="0x7f0d00df" />
+    <public type="layout" name="widget_channel_settings_permissions_add_member" id="0x7f0d00e0" />
+    <public type="layout" name="widget_channel_settings_permissions_add_role" id="0x7f0d00e1" />
+    <public type="layout" name="widget_channel_settings_permissions_overview" id="0x7f0d00e2" />
+    <public type="layout" name="widget_channel_topic" id="0x7f0d00e3" />
+    <public type="layout" name="widget_channels_list" id="0x7f0d00e4" />
+    <public type="layout" name="widget_channels_list_actions_change_nickname" id="0x7f0d00e5" />
+    <public type="layout" name="widget_channels_list_actions_leave_server" id="0x7f0d00e6" />
+    <public type="layout" name="widget_channels_list_item_category" id="0x7f0d00e7" />
+    <public type="layout" name="widget_channels_list_item_channel" id="0x7f0d00e8" />
+    <public type="layout" name="widget_channels_list_item_channel_private" id="0x7f0d00e9" />
+    <public type="layout" name="widget_channels_list_item_channel_voice" id="0x7f0d00ea" />
+    <public type="layout" name="widget_channels_list_item_friends" id="0x7f0d00eb" />
+    <public type="layout" name="widget_channels_list_item_header" id="0x7f0d00ec" />
+    <public type="layout" name="widget_channels_list_item_invite" id="0x7f0d00ed" />
+    <public type="layout" name="widget_channels_list_item_mfa" id="0x7f0d00ee" />
+    <public type="layout" name="widget_channels_list_item_text_actions" id="0x7f0d00ef" />
+    <public type="layout" name="widget_channels_list_item_voice_user" id="0x7f0d00f0" />
+    <public type="layout" name="widget_channels_list_unreads" id="0x7f0d00f1" />
+    <public type="layout" name="widget_chat_detached" id="0x7f0d00f2" />
+    <public type="layout" name="widget_chat_input" id="0x7f0d00f3" />
+    <public type="layout" name="widget_chat_input_edit_text" id="0x7f0d00f4" />
+    <public type="layout" name="widget_chat_input_emoji_picker" id="0x7f0d00f5" />
+    <public type="layout" name="widget_chat_input_item" id="0x7f0d00f6" />
+    <public type="layout" name="widget_chat_input_perm_req_files" id="0x7f0d00f7" />
+    <public type="layout" name="widget_chat_input_upload_too_large" id="0x7f0d00f8" />
+    <public type="layout" name="widget_chat_input_verification" id="0x7f0d00f9" />
+    <public type="layout" name="widget_chat_list" id="0x7f0d00fa" />
+    <public type="layout" name="widget_chat_list_actions" id="0x7f0d00fb" />
+    <public type="layout" name="widget_chat_list_adapter_item_application_news" id="0x7f0d00fc" />
+    <public type="layout" name="widget_chat_list_adapter_item_attachment" id="0x7f0d00fd" />
+    <public type="layout" name="widget_chat_list_adapter_item_blocked" id="0x7f0d00fe" />
+    <public type="layout" name="widget_chat_list_adapter_item_divider" id="0x7f0d00ff" />
+    <public type="layout" name="widget_chat_list_adapter_item_embed" id="0x7f0d0100" />
+    <public type="layout" name="widget_chat_list_adapter_item_embed_field" id="0x7f0d0101" />
+    <public type="layout" name="widget_chat_list_adapter_item_empty_pins" id="0x7f0d0102" />
+    <public type="layout" name="widget_chat_list_adapter_item_failed" id="0x7f0d0103" />
+    <public type="layout" name="widget_chat_list_adapter_item_game_invite" id="0x7f0d0104" />
+    <public type="layout" name="widget_chat_list_adapter_item_gift" id="0x7f0d0105" />
+    <public type="layout" name="widget_chat_list_adapter_item_guild_welcome" id="0x7f0d0106" />
+    <public type="layout" name="widget_chat_list_adapter_item_invite" id="0x7f0d0107" />
+    <public type="layout" name="widget_chat_list_adapter_item_listen_together" id="0x7f0d0108" />
+    <public type="layout" name="widget_chat_list_adapter_item_loading" id="0x7f0d0109" />
+    <public type="layout" name="widget_chat_list_adapter_item_mention_footer" id="0x7f0d010a" />
+    <public type="layout" name="widget_chat_list_adapter_item_message_header" id="0x7f0d010b" />
+    <public type="layout" name="widget_chat_list_adapter_item_minimal" id="0x7f0d010c" />
+    <public type="layout" name="widget_chat_list_adapter_item_reactions" id="0x7f0d010d" />
+    <public type="layout" name="widget_chat_list_adapter_item_result_count" id="0x7f0d010e" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_empty" id="0x7f0d010f" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_error" id="0x7f0d0110" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_indexing" id="0x7f0d0111" />
+    <public type="layout" name="widget_chat_list_adapter_item_spacer" id="0x7f0d0112" />
+    <public type="layout" name="widget_chat_list_adapter_item_start" id="0x7f0d0113" />
+    <public type="layout" name="widget_chat_list_adapter_item_system" id="0x7f0d0114" />
+    <public type="layout" name="widget_chat_list_adapter_item_text" id="0x7f0d0115" />
+    <public type="layout" name="widget_chat_list_adapter_item_text_divider" id="0x7f0d0116" />
+    <public type="layout" name="widget_chat_list_adapter_item_upload_progress" id="0x7f0d0117" />
+    <public type="layout" name="widget_chat_list_tab_badged" id="0x7f0d0118" />
+    <public type="layout" name="widget_chat_typing_users" id="0x7f0d0119" />
+    <public type="layout" name="widget_chat_voice_list_item_user" id="0x7f0d011a" />
+    <public type="layout" name="widget_client_outdated" id="0x7f0d011b" />
+    <public type="layout" name="widget_collapsed_voice_user_list_item" id="0x7f0d011c" />
+    <public type="layout" name="widget_connections_add_xbox" id="0x7f0d011d" />
+    <public type="layout" name="widget_create_channel" id="0x7f0d011e" />
+    <public type="layout" name="widget_debugging" id="0x7f0d011f" />
+    <public type="layout" name="widget_debugging_adapter_item" id="0x7f0d0120" />
+    <public type="layout" name="widget_disable_delete_account_dialog" id="0x7f0d0121" />
+    <public type="layout" name="widget_edit_role" id="0x7f0d0122" />
+    <public type="layout" name="widget_enable_mfa_steps" id="0x7f0d0123" />
+    <public type="layout" name="widget_enable_sms_backup_dialog" id="0x7f0d0124" />
+    <public type="layout" name="widget_fatal_crash" id="0x7f0d0125" />
+    <public type="layout" name="widget_friends_add" id="0x7f0d0126" />
+    <public type="layout" name="widget_friends_list" id="0x7f0d0127" />
+    <public type="layout" name="widget_friends_list_adapter_item" id="0x7f0d0128" />
+    <public type="layout" name="widget_friends_list_adapter_item_empty" id="0x7f0d0129" />
+    <public type="layout" name="widget_friends_nearby" id="0x7f0d012a" />
+    <public type="layout" name="widget_global_search" id="0x7f0d012b" />
+    <public type="layout" name="widget_global_search_item_divider" id="0x7f0d012c" />
+    <public type="layout" name="widget_global_search_item_dm" id="0x7f0d012d" />
+    <public type="layout" name="widget_global_search_item_guild" id="0x7f0d012e" />
+    <public type="layout" name="widget_group_invite_friends" id="0x7f0d012f" />
+    <public type="layout" name="widget_group_invite_friends_item" id="0x7f0d0130" />
+    <public type="layout" name="widget_guild_actions_add" id="0x7f0d0131" />
+    <public type="layout" name="widget_guild_actions_sheet" id="0x7f0d0132" />
+    <public type="layout" name="widget_guild_call" id="0x7f0d0133" />
+    <public type="layout" name="widget_guild_create" id="0x7f0d0134" />
+    <public type="layout" name="widget_guild_create_region" id="0x7f0d0135" />
+    <public type="layout" name="widget_guild_invite" id="0x7f0d0136" />
+    <public type="layout" name="widget_guild_invite_info" id="0x7f0d0137" />
+    <public type="layout" name="widget_guild_invite_share" id="0x7f0d0138" />
+    <public type="layout" name="widget_guild_invite_share_empty_suggestions" id="0x7f0d0139" />
+    <public type="layout" name="widget_guild_invite_share_item" id="0x7f0d013a" />
+    <public type="layout" name="widget_guild_join" id="0x7f0d013b" />
+    <public type="layout" name="widget_guild_join_invite_examples" id="0x7f0d013c" />
+    <public type="layout" name="widget_guild_search" id="0x7f0d013d" />
+    <public type="layout" name="widget_guild_search_list_item" id="0x7f0d013e" />
+    <public type="layout" name="widget_guild_transfer_ownership" id="0x7f0d013f" />
+    <public type="layout" name="widget_guilds_list" id="0x7f0d0140" />
+    <public type="layout" name="widget_guilds_list_item_divider" id="0x7f0d0141" />
+    <public type="layout" name="widget_guilds_list_item_dm" id="0x7f0d0142" />
+    <public type="layout" name="widget_guilds_list_item_dm_vertical" id="0x7f0d0143" />
+    <public type="layout" name="widget_guilds_list_item_folder" id="0x7f0d0144" />
+    <public type="layout" name="widget_guilds_list_item_guild" id="0x7f0d0145" />
+    <public type="layout" name="widget_guilds_list_item_guild_new" id="0x7f0d0146" />
+    <public type="layout" name="widget_guilds_list_item_guild_unavailable" id="0x7f0d0147" />
+    <public type="layout" name="widget_guilds_list_item_guild_vertical" id="0x7f0d0148" />
+    <public type="layout" name="widget_guilds_list_item_profile" id="0x7f0d0149" />
+    <public type="layout" name="widget_incoming_share" id="0x7f0d014a" />
+    <public type="layout" name="widget_kick_user" id="0x7f0d014b" />
+    <public type="layout" name="widget_main" id="0x7f0d014c" />
+    <public type="layout" name="widget_main_panel_center" id="0x7f0d014d" />
+    <public type="layout" name="widget_main_panel_center_channel_less" id="0x7f0d014e" />
+    <public type="layout" name="widget_main_panel_center_content" id="0x7f0d014f" />
+    <public type="layout" name="widget_main_panel_center_content_unread" id="0x7f0d0150" />
+    <public type="layout" name="widget_main_panel_center_nsfw" id="0x7f0d0151" />
+    <public type="layout" name="widget_main_panel_left" id="0x7f0d0152" />
+    <public type="layout" name="widget_main_panel_loading" id="0x7f0d0153" />
+    <public type="layout" name="widget_main_panel_right" id="0x7f0d0154" />
+    <public type="layout" name="widget_manage_reactions" id="0x7f0d0155" />
+    <public type="layout" name="widget_manage_reactions_emoji" id="0x7f0d0156" />
+    <public type="layout" name="widget_manage_reactions_result_error" id="0x7f0d0157" />
+    <public type="layout" name="widget_manage_reactions_result_loading" id="0x7f0d0158" />
+    <public type="layout" name="widget_manage_reactions_result_user" id="0x7f0d0159" />
+    <public type="layout" name="widget_media" id="0x7f0d015a" />
+    <public type="layout" name="widget_music_rich_presence" id="0x7f0d015b" />
+    <public type="layout" name="widget_notice_dialog" id="0x7f0d015c" />
+    <public type="layout" name="widget_notice_nux_overlay" id="0x7f0d015d" />
+    <public type="layout" name="widget_notice_nux_samsung_link" id="0x7f0d015e" />
+    <public type="layout" name="widget_notice_popup" id="0x7f0d015f" />
+    <public type="layout" name="widget_notice_popup_channel" id="0x7f0d0160" />
+    <public type="layout" name="widget_nux_post_registration" id="0x7f0d0161" />
+    <public type="layout" name="widget_oauth_authorize" id="0x7f0d0162" />
+    <public type="layout" name="widget_payment_source_edit_dialog" id="0x7f0d0163" />
+    <public type="layout" name="widget_platform_rich_prescence" id="0x7f0d0164" />
+    <public type="layout" name="widget_premium_upsell" id="0x7f0d0165" />
+    <public type="layout" name="widget_private_call" id="0x7f0d0166" />
+    <public type="layout" name="widget_private_call_controls_view" id="0x7f0d0167" />
+    <public type="layout" name="widget_prune_users" id="0x7f0d0168" />
+    <public type="layout" name="widget_search" id="0x7f0d0169" />
+    <public type="layout" name="widget_search_results" id="0x7f0d016a" />
+    <public type="layout" name="widget_search_suggestion_item_header" id="0x7f0d016b" />
+    <public type="layout" name="widget_search_suggestion_item_header_history" id="0x7f0d016c" />
+    <public type="layout" name="widget_search_suggestions" id="0x7f0d016d" />
+    <public type="layout" name="widget_search_suggestions_item_channel" id="0x7f0d016e" />
+    <public type="layout" name="widget_search_suggestions_item_has" id="0x7f0d016f" />
+    <public type="layout" name="widget_search_suggestions_item_recent_query" id="0x7f0d0170" />
+    <public type="layout" name="widget_search_suggestions_item_suggestion" id="0x7f0d0171" />
+    <public type="layout" name="widget_search_suggestions_item_user" id="0x7f0d0172" />
+    <public type="layout" name="widget_server_boost_confirmation" id="0x7f0d0173" />
+    <public type="layout" name="widget_server_boost_status" id="0x7f0d0174" />
+    <public type="layout" name="widget_server_delete_dialog" id="0x7f0d0175" />
+    <public type="layout" name="widget_server_notification_override_selector" id="0x7f0d0176" />
+    <public type="layout" name="widget_server_notifications" id="0x7f0d0177" />
+    <public type="layout" name="widget_server_remove_boost_confirmation" id="0x7f0d0178" />
+    <public type="layout" name="widget_server_settings" id="0x7f0d0179" />
+    <public type="layout" name="widget_server_settings_audit_log" id="0x7f0d017a" />
+    <public type="layout" name="widget_server_settings_audit_log_filter_action_listitem" id="0x7f0d017b" />
+    <public type="layout" name="widget_server_settings_audit_log_filter_user_listitem" id="0x7f0d017c" />
+    <public type="layout" name="widget_server_settings_audit_log_listitem" id="0x7f0d017d" />
+    <public type="layout" name="widget_server_settings_audit_log_loading_listitem" id="0x7f0d017e" />
+    <public type="layout" name="widget_server_settings_ban_list_item" id="0x7f0d017f" />
+    <public type="layout" name="widget_server_settings_bans" id="0x7f0d0180" />
+    <public type="layout" name="widget_server_settings_channels" id="0x7f0d0181" />
+    <public type="layout" name="widget_server_settings_channels_sort_actions" id="0x7f0d0182" />
+    <public type="layout" name="widget_server_settings_channels_sort_fab_menu" id="0x7f0d0183" />
+    <public type="layout" name="widget_server_settings_confirm_disable_integration" id="0x7f0d0184" />
+    <public type="layout" name="widget_server_settings_edit_integration" id="0x7f0d0185" />
+    <public type="layout" name="widget_server_settings_edit_member" id="0x7f0d0186" />
+    <public type="layout" name="widget_server_settings_edit_role_color_picker" id="0x7f0d0187" />
+    <public type="layout" name="widget_server_settings_emojis" id="0x7f0d0188" />
+    <public type="layout" name="widget_server_settings_emojis_edit" id="0x7f0d0189" />
+    <public type="layout" name="widget_server_settings_emojis_empty" id="0x7f0d018a" />
+    <public type="layout" name="widget_server_settings_emojis_header" id="0x7f0d018b" />
+    <public type="layout" name="widget_server_settings_emojis_item" id="0x7f0d018c" />
+    <public type="layout" name="widget_server_settings_emojis_section" id="0x7f0d018d" />
+    <public type="layout" name="widget_server_settings_instant_invite_actions" id="0x7f0d018e" />
+    <public type="layout" name="widget_server_settings_instant_invite_list_item" id="0x7f0d018f" />
+    <public type="layout" name="widget_server_settings_instant_invites" id="0x7f0d0190" />
+    <public type="layout" name="widget_server_settings_integration_list_item" id="0x7f0d0191" />
+    <public type="layout" name="widget_server_settings_integrations" id="0x7f0d0192" />
+    <public type="layout" name="widget_server_settings_member_list_item" id="0x7f0d0193" />
+    <public type="layout" name="widget_server_settings_members" id="0x7f0d0194" />
+    <public type="layout" name="widget_server_settings_moderation" id="0x7f0d0195" />
+    <public type="layout" name="widget_server_settings_overview" id="0x7f0d0196" />
+    <public type="layout" name="widget_server_settings_overview_afk_timeout" id="0x7f0d0197" />
+    <public type="layout" name="widget_server_settings_overview_region" id="0x7f0d0198" />
+    <public type="layout" name="widget_server_settings_overview_region_item" id="0x7f0d0199" />
+    <public type="layout" name="widget_server_settings_overview_section_afk_channel" id="0x7f0d019a" />
+    <public type="layout" name="widget_server_settings_role_item" id="0x7f0d019b" />
+    <public type="layout" name="widget_server_settings_roles_list" id="0x7f0d019c" />
+    <public type="layout" name="widget_server_settings_security" id="0x7f0d019d" />
+    <public type="layout" name="widget_server_settings_security_dialog" id="0x7f0d019e" />
+    <public type="layout" name="widget_server_settings_vanity_url" id="0x7f0d019f" />
+    <public type="layout" name="widget_settings" id="0x7f0d01a0" />
+    <public type="layout" name="widget_settings_account" id="0x7f0d01a1" />
+    <public type="layout" name="widget_settings_account_backup_codes" id="0x7f0d01a2" />
+    <public type="layout" name="widget_settings_account_change_password" id="0x7f0d01a3" />
+    <public type="layout" name="widget_settings_account_edit" id="0x7f0d01a4" />
+    <public type="layout" name="widget_settings_appearance" id="0x7f0d01a5" />
+    <public type="layout" name="widget_settings_authorized_apps" id="0x7f0d01a6" />
+    <public type="layout" name="widget_settings_authorized_apps_list_item" id="0x7f0d01a7" />
+    <public type="layout" name="widget_settings_behavior" id="0x7f0d01a8" />
+    <public type="layout" name="widget_settings_billing" id="0x7f0d01a9" />
+    <public type="layout" name="widget_settings_boost" id="0x7f0d01aa" />
+    <public type="layout" name="widget_settings_connections" id="0x7f0d01ab" />
+    <public type="layout" name="widget_settings_connections_add" id="0x7f0d01ac" />
+    <public type="layout" name="widget_settings_developer" id="0x7f0d01ad" />
+    <public type="layout" name="widget_settings_enable_mfa_download" id="0x7f0d01ae" />
+    <public type="layout" name="widget_settings_enable_mfa_input" id="0x7f0d01af" />
+    <public type="layout" name="widget_settings_enable_mfa_key" id="0x7f0d01b0" />
+    <public type="layout" name="widget_settings_enable_mfa_success" id="0x7f0d01b1" />
+    <public type="layout" name="widget_settings_games" id="0x7f0d01b2" />
+    <public type="layout" name="widget_settings_gifting" id="0x7f0d01b3" />
+    <public type="layout" name="widget_settings_item_add_connected_account" id="0x7f0d01b4" />
+    <public type="layout" name="widget_settings_item_backup_code" id="0x7f0d01b5" />
+    <public type="layout" name="widget_settings_item_backup_code_header" id="0x7f0d01b6" />
+    <public type="layout" name="widget_settings_item_connected_account" id="0x7f0d01b7" />
+    <public type="layout" name="widget_settings_language" id="0x7f0d01b8" />
+    <public type="layout" name="widget_settings_language_select" id="0x7f0d01b9" />
+    <public type="layout" name="widget_settings_language_select_item" id="0x7f0d01ba" />
+    <public type="layout" name="widget_settings_media" id="0x7f0d01bb" />
+    <public type="layout" name="widget_settings_notification_os" id="0x7f0d01bc" />
+    <public type="layout" name="widget_settings_notifications" id="0x7f0d01bd" />
+    <public type="layout" name="widget_settings_payment_methods" id="0x7f0d01be" />
+    <public type="layout" name="widget_settings_premium" id="0x7f0d01bf" />
+    <public type="layout" name="widget_settings_privacy" id="0x7f0d01c0" />
+    <public type="layout" name="widget_settings_privacy_defaults" id="0x7f0d01c1" />
+    <public type="layout" name="widget_settings_voice" id="0x7f0d01c2" />
+    <public type="layout" name="widget_spectate" id="0x7f0d01c3" />
+    <public type="layout" name="widget_spectate_controls" id="0x7f0d01c4" />
+    <public type="layout" name="widget_spectate_report_problem" id="0x7f0d01c5" />
+    <public type="layout" name="widget_spectate_stream_full" id="0x7f0d01c6" />
+    <public type="layout" name="widget_spectators" id="0x7f0d01c7" />
+    <public type="layout" name="widget_status" id="0x7f0d01c8" />
+    <public type="layout" name="widget_stream_feedback_dialog" id="0x7f0d01c9" />
+    <public type="layout" name="widget_stream_rich_presence" id="0x7f0d01ca" />
+    <public type="layout" name="widget_text_channel_settings" id="0x7f0d01cb" />
+    <public type="layout" name="widget_tos_accept" id="0x7f0d01cc" />
+    <public type="layout" name="widget_upgrade_premium_dialog" id="0x7f0d01cd" />
+    <public type="layout" name="widget_url_actions" id="0x7f0d01ce" />
+    <public type="layout" name="widget_usage_settings_dialog" id="0x7f0d01cf" />
+    <public type="layout" name="widget_user_account_verify" id="0x7f0d01d0" />
+    <public type="layout" name="widget_user_captcha_verify" id="0x7f0d01d1" />
+    <public type="layout" name="widget_user_email_update" id="0x7f0d01d2" />
+    <public type="layout" name="widget_user_email_verify" id="0x7f0d01d3" />
+    <public type="layout" name="widget_user_info" id="0x7f0d01d4" />
+    <public type="layout" name="widget_user_info_adapter_item_connected_account" id="0x7f0d01d5" />
+    <public type="layout" name="widget_user_mentions" id="0x7f0d01d6" />
+    <public type="layout" name="widget_user_mentions_filter" id="0x7f0d01d7" />
+    <public type="layout" name="widget_user_mutual_friends" id="0x7f0d01d8" />
+    <public type="layout" name="widget_user_mutual_guilds" id="0x7f0d01d9" />
+    <public type="layout" name="widget_user_phone_add" id="0x7f0d01da" />
+    <public type="layout" name="widget_user_phone_verify" id="0x7f0d01db" />
+    <public type="layout" name="widget_user_profile" id="0x7f0d01dc" />
+    <public type="layout" name="widget_user_profile_adapter_item_empty" id="0x7f0d01dd" />
+    <public type="layout" name="widget_user_profile_adapter_item_friend" id="0x7f0d01de" />
+    <public type="layout" name="widget_user_profile_adapter_item_friend_mutual_server" id="0x7f0d01df" />
+    <public type="layout" name="widget_user_profile_adapter_item_server" id="0x7f0d01e0" />
+    <public type="layout" name="widget_user_profile_strip" id="0x7f0d01e1" />
+    <public type="layout" name="widget_user_rich_presence" id="0x7f0d01e2" />
+    <public type="layout" name="widget_user_sheet" id="0x7f0d01e3" />
+    <public type="layout" name="widget_user_status_update" id="0x7f0d01e4" />
+    <public type="layout" name="widget_voice_actions" id="0x7f0d01e5" />
+    <public type="layout" name="widget_voice_call_incoming" id="0x7f0d01e6" />
+    <public type="layout" name="widget_voice_call_inline" id="0x7f0d01e7" />
+    <public type="layout" name="widget_voice_channel_settings" id="0x7f0d01e8" />
+    <public type="layout" name="widget_web_view" id="0x7f0d01e9" />
     <public type="menu" name="menu_audit_log_sort" id="0x7f0e0000" />
     <public type="menu" name="menu_auth_mfa" id="0x7f0e0001" />
     <public type="menu" name="menu_category_settings" id="0x7f0e0002" />
@@ -5525,15 +5641,16 @@
     <public type="menu" name="menu_server_settings_members" id="0x7f0e0015" />
     <public type="menu" name="menu_settings" id="0x7f0e0016" />
     <public type="menu" name="menu_settings_logout" id="0x7f0e0017" />
-    <public type="menu" name="menu_text_channel_settings" id="0x7f0e0018" />
-    <public type="menu" name="menu_user_mentions" id="0x7f0e0019" />
-    <public type="menu" name="menu_user_profile" id="0x7f0e001a" />
-    <public type="menu" name="menu_user_profile_blocked" id="0x7f0e001b" />
-    <public type="menu" name="menu_user_profile_friended" id="0x7f0e001c" />
-    <public type="menu" name="menu_user_profile_incoming" id="0x7f0e001d" />
-    <public type="menu" name="menu_user_profile_outgoing" id="0x7f0e001e" />
-    <public type="menu" name="menu_voice_channel_settings" id="0x7f0e001f" />
-    <public type="menu" name="ucrop_menu_activity" id="0x7f0e0020" />
+    <public type="menu" name="menu_spectate" id="0x7f0e0018" />
+    <public type="menu" name="menu_text_channel_settings" id="0x7f0e0019" />
+    <public type="menu" name="menu_user_mentions" id="0x7f0e001a" />
+    <public type="menu" name="menu_user_profile" id="0x7f0e001b" />
+    <public type="menu" name="menu_user_profile_blocked" id="0x7f0e001c" />
+    <public type="menu" name="menu_user_profile_friended" id="0x7f0e001d" />
+    <public type="menu" name="menu_user_profile_incoming" id="0x7f0e001e" />
+    <public type="menu" name="menu_user_profile_outgoing" id="0x7f0e001f" />
+    <public type="menu" name="menu_voice_channel_settings" id="0x7f0e0020" />
+    <public type="menu" name="ucrop_menu_activity" id="0x7f0e0021" />
     <public type="mipmap" name="ic_launcher_background" id="0x7f0f0000" />
     <public type="mipmap" name="ic_launcher_foreground" id="0x7f0f0001" />
     <public type="mipmap" name="ic_logo_background" id="0x7f0f0002" />
@@ -5674,38 +5791,39 @@
     <public type="plurals" name="max_uses_description_mobile_maxUses" id="0x7f100080" />
     <public type="plurals" name="max_uses_maxUses" id="0x7f100081" />
     <public type="plurals" name="members_header_members" id="0x7f100082" />
-    <public type="plurals" name="n_days_days" id="0x7f100084" />
-    <public type="plurals" name="new_messages_count" id="0x7f100085" />
-    <public type="plurals" name="new_messages_with_date_count" id="0x7f100086" />
-    <public type="plurals" name="notice_premium_applications_grandfathered_ending_numDays" id="0x7f100087" />
-    <public type="plurals" name="num_channels_num" id="0x7f100088" />
-    <public type="plurals" name="num_members_subscribers" id="0x7f100089" />
-    <public type="plurals" name="num_subscribers_subscribers" id="0x7f10008a" />
-    <public type="plurals" name="num_users_num" id="0x7f10008b" />
-    <public type="plurals" name="only_you_can_see_and_delete_these_count" id="0x7f10008c" />
-    <public type="plurals" name="partial_outage_a11y_count" id="0x7f10008d" />
-    <public type="plurals" name="partial_outage_count" id="0x7f10008e" />
-    <public type="plurals" name="premium_code_redemption_confirmation_blurb_numMonths" id="0x7f10008f" />
-    <public type="plurals" name="premium_guild_perks_modal_header_boost_count_subscriptions" id="0x7f100090" />
-    <public type="plurals" name="premium_guild_settings_members_subscribed_needed_number" id="0x7f100091" />
-    <public type="plurals" name="premium_guild_settings_members_subscribed_number" id="0x7f100092" />
-    <public type="plurals" name="premium_guild_settings_x_of_y_subscriptions_numRequired" id="0x7f100093" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_cooldown_warning_days" id="0x7f100094" />
-    <public type="plurals" name="premium_guild_subscription_available_count_num" id="0x7f100095" />
-    <public type="plurals" name="premium_guild_subscription_duration_months" id="0x7f100096" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_days" id="0x7f100097" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_hours" id="0x7f100098" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_hours" id="0x7f100099" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_minutes" id="0x7f10009a" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_minutes_minutes" id="0x7f10009b" />
-    <public type="plurals" name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount" id="0x7f10009c" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days" id="0x7f10009d" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_hours" id="0x7f10009e" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_hours" id="0x7f10009f" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_minutes" id="0x7f1000a0" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes_minutes" id="0x7f1000a1" />
-    <public type="plurals" name="premium_payment_plan_label_monthly_intervalCount" id="0x7f1000a2" />
-    <public type="plurals" name="premium_payment_plan_label_yearly_intervalCount" id="0x7f1000a3" />
+    <public type="plurals" name="n_days_days" id="0x7f100083" />
+    <public type="plurals" name="new_messages_count" id="0x7f100084" />
+    <public type="plurals" name="new_messages_with_date_count" id="0x7f100085" />
+    <public type="plurals" name="notice_premium_grandfathered_ending_numDays" id="0x7f100086" />
+    <public type="plurals" name="num_channels_num" id="0x7f100087" />
+    <public type="plurals" name="num_members_subscribers" id="0x7f100088" />
+    <public type="plurals" name="num_subscribers_subscribers" id="0x7f100089" />
+    <public type="plurals" name="num_users_num" id="0x7f10008a" />
+    <public type="plurals" name="only_you_can_see_and_delete_these_count" id="0x7f10008b" />
+    <public type="plurals" name="partial_outage_a11y_count" id="0x7f10008c" />
+    <public type="plurals" name="partial_outage_count" id="0x7f10008d" />
+    <public type="plurals" name="premium_code_redemption_confirmation_blurb_numMonths" id="0x7f10008e" />
+    <public type="plurals" name="premium_guild_perks_modal_header_boost_count_subscriptions" id="0x7f10008f" />
+    <public type="plurals" name="premium_guild_settings_members_subscribed_needed_number" id="0x7f100090" />
+    <public type="plurals" name="premium_guild_settings_members_subscribed_number" id="0x7f100091" />
+    <public type="plurals" name="premium_guild_settings_x_of_y_subscriptions_numRequired" id="0x7f100092" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_cooldown_warning_days" id="0x7f100093" />
+    <public type="plurals" name="premium_guild_subscription_available_count_num" id="0x7f100094" />
+    <public type="plurals" name="premium_guild_subscription_duration_months" id="0x7f100095" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_days" id="0x7f100096" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_hours" id="0x7f100097" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_hours" id="0x7f100098" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_minutes" id="0x7f100099" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_minutes_minutes" id="0x7f10009a" />
+    <public type="plurals" name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount" id="0x7f10009b" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days" id="0x7f10009c" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_hours" id="0x7f10009d" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_hours" id="0x7f10009e" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_minutes" id="0x7f10009f" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes_minutes" id="0x7f1000a0" />
+    <public type="plurals" name="premium_payment_plan_label_monthly_intervalCount" id="0x7f1000a1" />
+    <public type="plurals" name="premium_payment_plan_label_yearly_intervalCount" id="0x7f1000a2" />
+    <public type="plurals" name="premium_subscription_credit_count_months_count" id="0x7f1000a3" />
     <public type="plurals" name="publish_followed_news_fail_body_retryAfter" id="0x7f1000a4" />
     <public type="plurals" name="reaction_tooltip_1_n_n" id="0x7f1000a5" />
     <public type="plurals" name="reaction_tooltip_2_n_n" id="0x7f1000a6" />
@@ -5728,7 +5846,6 @@
     <public type="plurals" name="user_activity_user_playing_for_hours_time" id="0x7f1000b9" />
     <public type="plurals" name="user_activity_user_playing_for_minutes_time" id="0x7f1000ba" />
     <public type="plurals" name="APKTOOL_DUMMY_6e" id="0x7f10006e" />
-    <public type="plurals" name="APKTOOL_DUMMY_83" id="0x7f100083" />
     <public type="plurals" name="APKTOOL_DUMMY_ad" id="0x7f1000ad" />
     <public type="plurals" name="APKTOOL_DUMMY_ae" id="0x7f1000ae" />
     <public type="raw" name="call_ringing" id="0x7f110000" />
@@ -7692,4782 +7809,4865 @@
     <public type="string" name="activity_panel_go_live_hotspot_dismiss_button" id="0x7f12007f" />
     <public type="string" name="activity_panel_go_live_hotspot_header" id="0x7f120080" />
     <public type="string" name="activity_panel_go_live_tooltip" id="0x7f120081" />
-    <public type="string" name="activity_panel_go_live_tooltip_no_permission_in_guild" id="0x7f120082" />
-    <public type="string" name="activity_panel_go_live_tooltip_no_permission_in_voice" id="0x7f120083" />
-    <public type="string" name="activity_panel_go_live_tooltip_not_in_guild" id="0x7f120084" />
-    <public type="string" name="activtiy_feed_emoji_guild_discovery_subheader" id="0x7f120085" />
-    <public type="string" name="add" id="0x7f120086" />
-    <public type="string" name="add_a_comment_optional" id="0x7f120087" />
-    <public type="string" name="add_a_member" id="0x7f120088" />
-    <public type="string" name="add_a_popular_server_mobile" id="0x7f120089" />
-    <public type="string" name="add_a_role" id="0x7f12008a" />
-    <public type="string" name="add_a_server" id="0x7f12008b" />
-    <public type="string" name="add_a_server_mobile" id="0x7f12008c" />
-    <public type="string" name="add_channel_or_category" id="0x7f12008d" />
-    <public type="string" name="add_channel_to_override" id="0x7f12008e" />
-    <public type="string" name="add_content" id="0x7f12008f" />
-    <public type="string" name="add_friend" id="0x7f120090" />
-    <public type="string" name="add_friend_add_manually" id="0x7f120091" />
-    <public type="string" name="add_friend_already_friends" id="0x7f120092" />
-    <public type="string" name="add_friend_button" id="0x7f120093" />
-    <public type="string" name="add_friend_button_after" id="0x7f120094" />
-    <public type="string" name="add_friend_confirmation" id="0x7f120095" />
-    <public type="string" name="add_friend_description" id="0x7f120096" />
-    <public type="string" name="add_friend_error_discord_tag_username" id="0x7f120097" />
-    <public type="string" name="add_friend_error_invalid_discord_tag" id="0x7f120098" />
-    <public type="string" name="add_friend_error_numbers_only" id="0x7f120099" />
-    <public type="string" name="add_friend_error_other" id="0x7f12009a" />
-    <public type="string" name="add_friend_error_too_many_friends" id="0x7f12009b" />
-    <public type="string" name="add_friend_error_username_only" id="0x7f12009c" />
-    <public type="string" name="add_friend_find" id="0x7f12009d" />
-    <public type="string" name="add_friend_friend" id="0x7f12009e" />
-    <public type="string" name="add_friend_hint" id="0x7f12009f" />
-    <public type="string" name="add_friend_hint2" id="0x7f1200a0" />
-    <public type="string" name="add_friend_input_hint" id="0x7f1200a1" />
-    <public type="string" name="add_friend_nearby" id="0x7f1200a2" />
-    <public type="string" name="add_friend_nearby_connection_error" id="0x7f1200a3" />
-    <public type="string" name="add_friend_nearby_connection_error_ios" id="0x7f1200a4" />
-    <public type="string" name="add_friend_nearby_disable_scanning" id="0x7f1200a5" />
-    <public type="string" name="add_friend_nearby_enable" id="0x7f1200a6" />
-    <public type="string" name="add_friend_nearby_enable_settings_android" id="0x7f1200a7" />
-    <public type="string" name="add_friend_nearby_generic_error" id="0x7f1200a8" />
-    <public type="string" name="add_friend_nearby_info" id="0x7f1200a9" />
-    <public type="string" name="add_friend_nearby_learn_more" id="0x7f1200aa" />
-    <public type="string" name="add_friend_nearby_looking" id="0x7f1200ab" />
-    <public type="string" name="add_friend_nearby_stopped" id="0x7f1200ac" />
-    <public type="string" name="add_friend_no_capitalization" id="0x7f1200ad" />
-    <public type="string" name="add_friend_not_found" id="0x7f1200ae" />
-    <public type="string" name="add_friend_placeholder" id="0x7f1200af" />
-    <public type="string" name="add_friend_search" id="0x7f1200b0" />
-    <public type="string" name="add_friend_self" id="0x7f1200b1" />
-    <public type="string" name="add_friend_success" id="0x7f1200b2" />
-    <public type="string" name="add_keybind" id="0x7f1200b3" />
-    <public type="string" name="add_keybind_warning" id="0x7f1200b4" />
-    <public type="string" name="add_new_connection" id="0x7f1200b5" />
-    <public type="string" name="add_note" id="0x7f1200b6" />
-    <public type="string" name="add_override" id="0x7f1200b7" />
-    <public type="string" name="add_reaction" id="0x7f1200b8" />
-    <public type="string" name="add_reactions" id="0x7f1200b9" />
-    <public type="string" name="add_reactions_description" id="0x7f1200ba" />
-    <public type="string" name="add_role_label" id="0x7f1200bb" />
-    <public type="string" name="add_role_placeholder" id="0x7f1200bc" />
-    <public type="string" name="add_to_dictionary" id="0x7f1200bd" />
-    <public type="string" name="administrative" id="0x7f1200be" />
-    <public type="string" name="administrator" id="0x7f1200bf" />
-    <public type="string" name="administrator_description" id="0x7f1200c0" />
-    <public type="string" name="advanced_settings" id="0x7f1200c1" />
-    <public type="string" name="afk_settings" id="0x7f1200c2" />
-    <public type="string" name="aka" id="0x7f1200c3" />
-    <public type="string" name="all_photos" id="0x7f1200c4" />
-    <public type="string" name="all_servers" id="0x7f1200c5" />
-    <public type="string" name="allow_game_detection_mobile" id="0x7f1200c6" />
-    <public type="string" name="allow_server_dms" id="0x7f1200c7" />
-    <public type="string" name="allow_tts_command" id="0x7f1200c8" />
-    <public type="string" name="already_have_account" id="0x7f1200c9" />
-    <public type="string" name="amount" id="0x7f1200ca" />
-    <public type="string" name="android_unknown_view_holder" id="0x7f1200cb" />
-    <public type="string" name="animate_emoji" id="0x7f1200cc" />
-    <public type="string" name="animate_emoji_note" id="0x7f1200cd" />
-    <public type="string" name="animated_emoji" id="0x7f1200ce" />
-    <public type="string" name="answer" id="0x7f1200cf" />
-    <public type="string" name="app_download_now" id="0x7f1200d0" />
-    <public type="string" name="app_information" id="0x7f1200d1" />
-    <public type="string" name="app_name" id="0x7f1200d2" />
-    <public type="string" name="app_not_opened" id="0x7f1200d3" />
-    <public type="string" name="app_opened_body" id="0x7f1200d4" />
-    <public type="string" name="app_opened_title" id="0x7f1200d5" />
-    <public type="string" name="app_opening" id="0x7f1200d6" />
-    <public type="string" name="app_opening_mobile_body" id="0x7f1200d7" />
-    <public type="string" name="app_permission_connect_desc" id="0x7f1200d8" />
-    <public type="string" name="app_permission_connect_label" id="0x7f1200d9" />
-    <public type="string" name="app_settings" id="0x7f1200da" />
-    <public type="string" name="app_store" id="0x7f1200db" />
-    <public type="string" name="appbar_scrolling_view_behavior" id="0x7f1200dc" />
-    <public type="string" name="appearance" id="0x7f1200dd" />
-    <public type="string" name="apple_billing_url" id="0x7f1200de" />
-    <public type="string" name="application_addon_purchase_confirmation_blurb" id="0x7f1200df" />
-    <public type="string" name="application_branch_name_master" id="0x7f1200e0" />
-    <public type="string" name="application_branch_name_unknown" id="0x7f1200e1" />
-    <public type="string" name="application_context_menu_application_id" id="0x7f1200e2" />
-    <public type="string" name="application_context_menu_branch_id" id="0x7f1200e3" />
-    <public type="string" name="application_context_menu_copy_store_link" id="0x7f1200e4" />
-    <public type="string" name="application_context_menu_create_desktop_shortcut" id="0x7f1200e5" />
-    <public type="string" name="application_context_menu_hide" id="0x7f1200e6" />
-    <public type="string" name="application_context_menu_install" id="0x7f1200e7" />
-    <public type="string" name="application_context_menu_launch" id="0x7f1200e8" />
-    <public type="string" name="application_context_menu_launch_application_name" id="0x7f1200e9" />
-    <public type="string" name="application_context_menu_launch_options" id="0x7f1200ea" />
-    <public type="string" name="application_context_menu_private_status" id="0x7f1200eb" />
-    <public type="string" name="application_context_menu_repair" id="0x7f1200ec" />
-    <public type="string" name="application_context_menu_show" id="0x7f1200ed" />
-    <public type="string" name="application_context_menu_show_in_folder" id="0x7f1200ee" />
-    <public type="string" name="application_context_menu_sku_id" id="0x7f1200ef" />
-    <public type="string" name="application_context_menu_store_link" id="0x7f1200f0" />
-    <public type="string" name="application_context_menu_toggle_overlay_disable" id="0x7f1200f1" />
-    <public type="string" name="application_context_menu_uninstall" id="0x7f1200f2" />
-    <public type="string" name="application_entitlement_code_redemption_confirmation_blurb" id="0x7f1200f3" />
-    <public type="string" name="application_entitlement_code_redemption_confirmation_title" id="0x7f1200f4" />
-    <public type="string" name="application_entitlement_code_redemption_go_to_library" id="0x7f1200f5" />
-    <public type="string" name="application_entitlement_code_redemption_invalid" id="0x7f1200f6" />
-    <public type="string" name="application_entitlement_code_redemption_prompt" id="0x7f1200f7" />
-    <public type="string" name="application_entitlement_code_redemption_prompt_ios" id="0x7f1200f8" />
-    <public type="string" name="application_entitlement_code_redemption_redeem" id="0x7f1200f9" />
-    <public type="string" name="application_filter_name_linux" id="0x7f1200fa" />
-    <public type="string" name="application_filter_name_macos" id="0x7f1200fb" />
-    <public type="string" name="application_filter_name_windows" id="0x7f1200fc" />
-    <public type="string" name="application_iap_purchase_return_to_game" id="0x7f1200fd" />
-    <public type="string" name="application_installation_modal_directory_with_space" id="0x7f1200fe" />
-    <public type="string" name="application_installation_modal_location" id="0x7f1200ff" />
-    <public type="string" name="application_installation_modal_no_permission" id="0x7f120100" />
-    <public type="string" name="application_installation_modal_not_enough_space" id="0x7f120101" />
-    <public type="string" name="application_installation_modal_premium_title" id="0x7f120102" />
-    <public type="string" name="application_installation_modal_select_directory" id="0x7f120103" />
-    <public type="string" name="application_installation_modal_title" id="0x7f120104" />
-    <public type="string" name="application_installation_space_used" id="0x7f120105" />
-    <public type="string" name="application_library_empty_search_description" id="0x7f120106" />
-    <public type="string" name="application_library_empty_state_description_import" id="0x7f120107" />
-    <public type="string" name="application_library_empty_state_description_import_ask" id="0x7f120108" />
-    <public type="string" name="application_library_empty_state_description_no_import" id="0x7f120109" />
-    <public type="string" name="application_library_empty_state_header" id="0x7f12010a" />
-    <public type="string" name="application_library_empty_state_header_import" id="0x7f12010b" />
-    <public type="string" name="application_library_filter_placeholder" id="0x7f12010c" />
-    <public type="string" name="application_library_import_accept" id="0x7f12010d" />
-    <public type="string" name="application_library_import_deny" id="0x7f12010e" />
-    <public type="string" name="application_library_inventory" id="0x7f12010f" />
-    <public type="string" name="application_library_my_games" id="0x7f120110" />
-    <public type="string" name="application_library_remove_confirm_body" id="0x7f120111" />
-    <public type="string" name="application_library_remove_confirm_confirm" id="0x7f120112" />
-    <public type="string" name="application_library_remove_confirm_header" id="0x7f120113" />
-    <public type="string" name="application_library_wumpus_alt" id="0x7f120114" />
-    <public type="string" name="application_news_error_body" id="0x7f120115" />
-    <public type="string" name="application_news_error_title" id="0x7f120116" />
-    <public type="string" name="application_preorder_purchase_confirmation_button" id="0x7f120117" />
-    <public type="string" name="application_progress_indicator_installing" id="0x7f120118" />
-    <public type="string" name="application_progress_indicator_installing_hours" id="0x7f120119" />
-    <public type="string" name="application_progress_indicator_installing_minutes" id="0x7f12011a" />
-    <public type="string" name="application_progress_indicator_installing_seconds" id="0x7f12011b" />
-    <public type="string" name="application_progress_indicator_paused" id="0x7f12011c" />
-    <public type="string" name="application_progress_indicator_updating" id="0x7f12011d" />
-    <public type="string" name="application_progress_indicator_updating_hours" id="0x7f12011e" />
-    <public type="string" name="application_progress_indicator_updating_minutes" id="0x7f12011f" />
-    <public type="string" name="application_progress_indicator_updating_seconds" id="0x7f120120" />
-    <public type="string" name="application_store_about_header" id="0x7f120121" />
-    <public type="string" name="application_store_activity_feed_promotion_subtitle" id="0x7f120122" />
-    <public type="string" name="application_store_all_news" id="0x7f120123" />
-    <public type="string" name="application_store_browse" id="0x7f120124" />
-    <public type="string" name="application_store_browse_by_genre_label" id="0x7f120125" />
-    <public type="string" name="application_store_browse_empty_header" id="0x7f120126" />
-    <public type="string" name="application_store_browse_search_placeholder" id="0x7f120127" />
-    <public type="string" name="application_store_browse_sort_new_releases" id="0x7f120128" />
-    <public type="string" name="application_store_browse_sort_title_alphabetical" id="0x7f120129" />
-    <public type="string" name="application_store_browse_sort_title_reverse_alphabetical" id="0x7f12012a" />
-    <public type="string" name="application_store_bundle_purchase_confirmation_blurb" id="0x7f12012b" />
-    <public type="string" name="application_store_buy" id="0x7f12012c" />
-    <public type="string" name="application_store_buy_as_gift" id="0x7f12012d" />
-    <public type="string" name="application_store_buy_for_price" id="0x7f12012e" />
-    <public type="string" name="application_store_buy_gift" id="0x7f12012f" />
-    <public type="string" name="application_store_cloud_saves" id="0x7f120130" />
-    <public type="string" name="application_store_cloud_saves_tooltip" id="0x7f120131" />
-    <public type="string" name="application_store_coming_soon" id="0x7f120132" />
-    <public type="string" name="application_store_controller_support" id="0x7f120133" />
-    <public type="string" name="application_store_controller_support_tooltip" id="0x7f120134" />
-    <public type="string" name="application_store_countdown_days" id="0x7f120135" />
-    <public type="string" name="application_store_countdown_hours" id="0x7f120136" />
-    <public type="string" name="application_store_countdown_minutes" id="0x7f120137" />
-    <public type="string" name="application_store_countdown_seconds" id="0x7f120138" />
-    <public type="string" name="application_store_cross_platform" id="0x7f120139" />
-    <public type="string" name="application_store_cross_platform_tooltip" id="0x7f12013a" />
-    <public type="string" name="application_store_description_read_less" id="0x7f12013b" />
-    <public type="string" name="application_store_description_read_more" id="0x7f12013c" />
-    <public type="string" name="application_store_details_developer" id="0x7f12013d" />
-    <public type="string" name="application_store_details_genres" id="0x7f12013e" />
-    <public type="string" name="application_store_details_publisher" id="0x7f12013f" />
-    <public type="string" name="application_store_details_release_date" id="0x7f120140" />
-    <public type="string" name="application_store_discord_game_invites" id="0x7f120141" />
-    <public type="string" name="application_store_discord_game_invites_tooltip" id="0x7f120142" />
-    <public type="string" name="application_store_downloadable_content" id="0x7f120143" />
-    <public type="string" name="application_store_early_access" id="0x7f120144" />
-    <public type="string" name="application_store_early_access_body" id="0x7f120145" />
-    <public type="string" name="application_store_expand_downloadable_content" id="0x7f120146" />
-    <public type="string" name="application_store_filter_all_genres" id="0x7f120147" />
-    <public type="string" name="application_store_first_on_discord" id="0x7f120148" />
-    <public type="string" name="application_store_free" id="0x7f120149" />
-    <public type="string" name="application_store_free_premium_content" id="0x7f12014a" />
-    <public type="string" name="application_store_free_with_premium" id="0x7f12014b" />
-    <public type="string" name="application_store_genre_action" id="0x7f12014c" />
-    <public type="string" name="application_store_genre_action_adventure" id="0x7f12014d" />
-    <public type="string" name="application_store_genre_action_rpg" id="0x7f12014e" />
-    <public type="string" name="application_store_genre_adventure" id="0x7f12014f" />
-    <public type="string" name="application_store_genre_artillery" id="0x7f120150" />
-    <public type="string" name="application_store_genre_baseball" id="0x7f120151" />
-    <public type="string" name="application_store_genre_basketball" id="0x7f120152" />
-    <public type="string" name="application_store_genre_billiards" id="0x7f120153" />
-    <public type="string" name="application_store_genre_bowling" id="0x7f120154" />
-    <public type="string" name="application_store_genre_boxing" id="0x7f120155" />
-    <public type="string" name="application_store_genre_brawler" id="0x7f120156" />
-    <public type="string" name="application_store_genre_card_game" id="0x7f120157" />
-    <public type="string" name="application_store_genre_driving_racing" id="0x7f120158" />
-    <public type="string" name="application_store_genre_dual_joystick_shooter" id="0x7f120159" />
-    <public type="string" name="application_store_genre_dungeon_crawler" id="0x7f12015a" />
-    <public type="string" name="application_store_genre_education" id="0x7f12015b" />
-    <public type="string" name="application_store_genre_fighting" id="0x7f12015c" />
-    <public type="string" name="application_store_genre_fishing" id="0x7f12015d" />
-    <public type="string" name="application_store_genre_fitness" id="0x7f12015e" />
-    <public type="string" name="application_store_genre_flight_simulator" id="0x7f12015f" />
-    <public type="string" name="application_store_genre_football" id="0x7f120160" />
-    <public type="string" name="application_store_genre_four_x" id="0x7f120161" />
-    <public type="string" name="application_store_genre_fps" id="0x7f120162" />
-    <public type="string" name="application_store_genre_gambling" id="0x7f120163" />
-    <public type="string" name="application_store_genre_golf" id="0x7f120164" />
-    <public type="string" name="application_store_genre_hack_and_slash" id="0x7f120165" />
-    <public type="string" name="application_store_genre_hockey" id="0x7f120166" />
-    <public type="string" name="application_store_genre_life_simulator" id="0x7f120167" />
-    <public type="string" name="application_store_genre_light_gun" id="0x7f120168" />
-    <public type="string" name="application_store_genre_massively_multiplayer" id="0x7f120169" />
-    <public type="string" name="application_store_genre_metroidvania" id="0x7f12016a" />
-    <public type="string" name="application_store_genre_miscellaneous" id="0x7f12016b" />
-    <public type="string" name="application_store_genre_mmorpg" id="0x7f12016c" />
-    <public type="string" name="application_store_genre_moba" id="0x7f12016d" />
-    <public type="string" name="application_store_genre_music_rhythm" id="0x7f12016e" />
-    <public type="string" name="application_store_genre_open_world" id="0x7f12016f" />
-    <public type="string" name="application_store_genre_party_mini_game" id="0x7f120170" />
-    <public type="string" name="application_store_genre_pinball" id="0x7f120171" />
-    <public type="string" name="application_store_genre_platformer" id="0x7f120172" />
-    <public type="string" name="application_store_genre_psychological_horror" id="0x7f120173" />
-    <public type="string" name="application_store_genre_puzzle" id="0x7f120174" />
-    <public type="string" name="application_store_genre_roguelike" id="0x7f120175" />
-    <public type="string" name="application_store_genre_role_playing" id="0x7f120176" />
-    <public type="string" name="application_store_genre_rts" id="0x7f120177" />
-    <public type="string" name="application_store_genre_sandbox" id="0x7f120178" />
-    <public type="string" name="application_store_genre_shoot_em_up" id="0x7f120179" />
-    <public type="string" name="application_store_genre_shooter" id="0x7f12017a" />
-    <public type="string" name="application_store_genre_simulation" id="0x7f12017b" />
-    <public type="string" name="application_store_genre_skateboarding_skating" id="0x7f12017c" />
-    <public type="string" name="application_store_genre_snowboarding_skiing" id="0x7f12017d" />
-    <public type="string" name="application_store_genre_soccer" id="0x7f12017e" />
-    <public type="string" name="application_store_genre_sports" id="0x7f12017f" />
-    <public type="string" name="application_store_genre_stealth" id="0x7f120180" />
-    <public type="string" name="application_store_genre_strategy" id="0x7f120181" />
-    <public type="string" name="application_store_genre_surfing_wakeboarding" id="0x7f120182" />
-    <public type="string" name="application_store_genre_survival" id="0x7f120183" />
-    <public type="string" name="application_store_genre_survival_horror" id="0x7f120184" />
-    <public type="string" name="application_store_genre_title" id="0x7f120185" />
-    <public type="string" name="application_store_genre_tower_defense" id="0x7f120186" />
-    <public type="string" name="application_store_genre_track_field" id="0x7f120187" />
-    <public type="string" name="application_store_genre_train_simulator" id="0x7f120188" />
-    <public type="string" name="application_store_genre_trivia_board_game" id="0x7f120189" />
-    <public type="string" name="application_store_genre_turn_based_strategy" id="0x7f12018a" />
-    <public type="string" name="application_store_genre_vehicular_combat" id="0x7f12018b" />
-    <public type="string" name="application_store_genre_visual_novel" id="0x7f12018c" />
-    <public type="string" name="application_store_genre_wargame" id="0x7f12018d" />
-    <public type="string" name="application_store_genre_wrestling" id="0x7f12018e" />
-    <public type="string" name="application_store_get_premium" id="0x7f12018f" />
-    <public type="string" name="application_store_gift_purchase_confirm_error" id="0x7f120190" />
-    <public type="string" name="application_store_gift_purchase_confirm_monthly_mobile" id="0x7f120191" />
-    <public type="string" name="application_store_gift_purchase_confirm_subscription_monthly" id="0x7f120192" />
-    <public type="string" name="application_store_gift_purchase_confirm_subscription_yearly" id="0x7f120193" />
-    <public type="string" name="application_store_gift_purchase_confirm_yearly_mobile" id="0x7f120194" />
-    <public type="string" name="application_store_gift_purchase_confirmation_blurb" id="0x7f120195" />
-    <public type="string" name="application_store_gift_purchase_confirmation_subtext" id="0x7f120196" />
-    <public type="string" name="application_store_hero_carousel_featured_game" id="0x7f120197" />
-    <public type="string" name="application_store_hero_carousel_featured_premium_game" id="0x7f120198" />
-    <public type="string" name="application_store_hero_carousel_learn_more" id="0x7f120199" />
-    <public type="string" name="application_store_hero_carousel_new_release" id="0x7f12019a" />
-    <public type="string" name="application_store_hide_games_in_library" id="0x7f12019b" />
-    <public type="string" name="application_store_hide_games_in_library_hidden" id="0x7f12019c" />
-    <public type="string" name="application_store_home_footer_main" id="0x7f12019d" />
-    <public type="string" name="application_store_home_footer_sub" id="0x7f12019e" />
-    <public type="string" name="application_store_home_recently_added" id="0x7f12019f" />
-    <public type="string" name="application_store_home_view_all_applications" id="0x7f1201a0" />
-    <public type="string" name="application_store_in_library" id="0x7f1201a1" />
-    <public type="string" name="application_store_link_copied" id="0x7f1201a2" />
-    <public type="string" name="application_store_listing_purchase_generic_error" id="0x7f1201a3" />
-    <public type="string" name="application_store_listing_purchase_generic_error_short" id="0x7f1201a4" />
-    <public type="string" name="application_store_listing_purchase_rate_limit_error" id="0x7f1201a5" />
-    <public type="string" name="application_store_listing_purchase_rate_limit_error_short" id="0x7f1201a6" />
-    <public type="string" name="application_store_listing_select_edition" id="0x7f1201a7" />
-    <public type="string" name="application_store_local_coop" id="0x7f1201a8" />
-    <public type="string" name="application_store_local_coop_tooltip" id="0x7f1201a9" />
-    <public type="string" name="application_store_local_multiplayer" id="0x7f1201aa" />
-    <public type="string" name="application_store_local_multiplayer_tooltip" id="0x7f1201ab" />
-    <public type="string" name="application_store_navigation_browse" id="0x7f1201ac" />
-    <public type="string" name="application_store_navigation_browse_premium" id="0x7f1201ad" />
-    <public type="string" name="application_store_new_release" id="0x7f1201ae" />
-    <public type="string" name="application_store_online_coop" id="0x7f1201af" />
-    <public type="string" name="application_store_online_coop_tooltip" id="0x7f1201b0" />
-    <public type="string" name="application_store_online_multiplayer" id="0x7f1201b1" />
-    <public type="string" name="application_store_online_multiplayer_tooltip" id="0x7f1201b2" />
-    <public type="string" name="application_store_premium_perks" id="0x7f1201b3" />
-    <public type="string" name="application_store_premium_perks_header" id="0x7f1201b4" />
-    <public type="string" name="application_store_preorder" id="0x7f1201b5" />
-    <public type="string" name="application_store_preorder_as_gift" id="0x7f1201b6" />
-    <public type="string" name="application_store_preorder_for_price" id="0x7f1201b7" />
-    <public type="string" name="application_store_preorder_purchase_confirmation_blurb" id="0x7f1201b8" />
-    <public type="string" name="application_store_purchase_application" id="0x7f1201b9" />
-    <public type="string" name="application_store_purchase_available_date" id="0x7f1201ba" />
-    <public type="string" name="application_store_purchase_bundle" id="0x7f1201bb" />
-    <public type="string" name="application_store_purchase_confirmation_blurb" id="0x7f1201bc" />
-    <public type="string" name="application_store_purchase_confirmation_title_1" id="0x7f1201bd" />
-    <public type="string" name="application_store_purchase_confirmation_title_2" id="0x7f1201be" />
-    <public type="string" name="application_store_purchase_confirmation_title_3" id="0x7f1201bf" />
-    <public type="string" name="application_store_purchase_confirmation_title_4" id="0x7f1201c0" />
-    <public type="string" name="application_store_purchase_confirmation_unsupported_os" id="0x7f1201c1" />
-    <public type="string" name="application_store_purchase_consumable" id="0x7f1201c2" />
-    <public type="string" name="application_store_purchase_dlc" id="0x7f1201c3" />
-    <public type="string" name="application_store_purchase_game_unsupported_os" id="0x7f1201c4" />
-    <public type="string" name="application_store_purchase_gift_confirmation_title" id="0x7f1201c5" />
-    <public type="string" name="application_store_purchase_gift_only" id="0x7f1201c6" />
-    <public type="string" name="application_store_purchase_gift_only_ungiftable" id="0x7f1201c7" />
-    <public type="string" name="application_store_purchase_header_bundles_different" id="0x7f1201c8" />
-    <public type="string" name="application_store_purchase_header_bundles_same" id="0x7f1201c9" />
-    <public type="string" name="application_store_purchase_header_consumables_different" id="0x7f1201ca" />
-    <public type="string" name="application_store_purchase_header_consumables_same" id="0x7f1201cb" />
-    <public type="string" name="application_store_purchase_header_distribution_application" id="0x7f1201cc" />
-    <public type="string" name="application_store_purchase_header_distribution_bundle" id="0x7f1201cd" />
-    <public type="string" name="application_store_purchase_header_distribution_consumable" id="0x7f1201ce" />
-    <public type="string" name="application_store_purchase_header_distribution_dlc" id="0x7f1201cf" />
-    <public type="string" name="application_store_purchase_header_dlc_different" id="0x7f1201d0" />
-    <public type="string" name="application_store_purchase_header_dlc_same" id="0x7f1201d1" />
-    <public type="string" name="application_store_purchase_header_first_on" id="0x7f1201d2" />
-    <public type="string" name="application_store_purchase_header_free_application" id="0x7f1201d3" />
-    <public type="string" name="application_store_purchase_header_free_bundle" id="0x7f1201d4" />
-    <public type="string" name="application_store_purchase_header_free_consumable" id="0x7f1201d5" />
-    <public type="string" name="application_store_purchase_header_free_dlc" id="0x7f1201d6" />
-    <public type="string" name="application_store_purchase_header_games_different" id="0x7f1201d7" />
-    <public type="string" name="application_store_purchase_header_games_same" id="0x7f1201d8" />
-    <public type="string" name="application_store_purchase_header_preorder_application" id="0x7f1201d9" />
-    <public type="string" name="application_store_purchase_header_preorder_bundle" id="0x7f1201da" />
-    <public type="string" name="application_store_purchase_header_preorder_consumable" id="0x7f1201db" />
-    <public type="string" name="application_store_purchase_header_preorder_dlc" id="0x7f1201dc" />
-    <public type="string" name="application_store_purchase_header_preorder_entitled" id="0x7f1201dd" />
-    <public type="string" name="application_store_purchase_header_time_left_until_release" id="0x7f1201de" />
-    <public type="string" name="application_store_purchase_iap" id="0x7f1201df" />
-    <public type="string" name="application_store_purchase_in_library" id="0x7f1201e0" />
-    <public type="string" name="application_store_purchase_in_library_hidden" id="0x7f1201e1" />
-    <public type="string" name="application_store_purchase_install_game" id="0x7f1201e2" />
-    <public type="string" name="application_store_purchase_test_mode" id="0x7f1201e3" />
-    <public type="string" name="application_store_purchase_warning_preorder" id="0x7f1201e4" />
-    <public type="string" name="application_store_pvp" id="0x7f1201e5" />
-    <public type="string" name="application_store_pvp_tooltip" id="0x7f1201e6" />
-    <public type="string" name="application_store_rating_descriptors_esrb_alcohol_reference" id="0x7f1201e7" />
-    <public type="string" name="application_store_rating_descriptors_esrb_animated_blood" id="0x7f1201e8" />
-    <public type="string" name="application_store_rating_descriptors_esrb_animated_violence" id="0x7f1201e9" />
-    <public type="string" name="application_store_rating_descriptors_esrb_blood" id="0x7f1201ea" />
-    <public type="string" name="application_store_rating_descriptors_esrb_blood_and_gore" id="0x7f1201eb" />
-    <public type="string" name="application_store_rating_descriptors_esrb_cartoon_violence" id="0x7f1201ec" />
-    <public type="string" name="application_store_rating_descriptors_esrb_comic_mischief" id="0x7f1201ed" />
-    <public type="string" name="application_store_rating_descriptors_esrb_crude_humor" id="0x7f1201ee" />
-    <public type="string" name="application_store_rating_descriptors_esrb_drug_reference" id="0x7f1201ef" />
-    <public type="string" name="application_store_rating_descriptors_esrb_fantasy_violence" id="0x7f1201f0" />
-    <public type="string" name="application_store_rating_descriptors_esrb_in_game_purchases" id="0x7f1201f1" />
-    <public type="string" name="application_store_rating_descriptors_esrb_intense_violence" id="0x7f1201f2" />
-    <public type="string" name="application_store_rating_descriptors_esrb_language" id="0x7f1201f3" />
-    <public type="string" name="application_store_rating_descriptors_esrb_lyrics" id="0x7f1201f4" />
-    <public type="string" name="application_store_rating_descriptors_esrb_mature_humor" id="0x7f1201f5" />
-    <public type="string" name="application_store_rating_descriptors_esrb_mild_blood" id="0x7f1201f6" />
-    <public type="string" name="application_store_rating_descriptors_esrb_mild_cartoon_violence" id="0x7f1201f7" />
-    <public type="string" name="application_store_rating_descriptors_esrb_mild_fantasy_violence" id="0x7f1201f8" />
-    <public type="string" name="application_store_rating_descriptors_esrb_mild_language" id="0x7f1201f9" />
-    <public type="string" name="application_store_rating_descriptors_esrb_mild_lyrics" id="0x7f1201fa" />
-    <public type="string" name="application_store_rating_descriptors_esrb_mild_sexual_themes" id="0x7f1201fb" />
-    <public type="string" name="application_store_rating_descriptors_esrb_mild_suggestive_themes" id="0x7f1201fc" />
-    <public type="string" name="application_store_rating_descriptors_esrb_mild_violence" id="0x7f1201fd" />
-    <public type="string" name="application_store_rating_descriptors_esrb_nudity" id="0x7f1201fe" />
-    <public type="string" name="application_store_rating_descriptors_esrb_partual_nudity" id="0x7f1201ff" />
-    <public type="string" name="application_store_rating_descriptors_esrb_real_gambling" id="0x7f120200" />
-    <public type="string" name="application_store_rating_descriptors_esrb_sexual_content" id="0x7f120201" />
-    <public type="string" name="application_store_rating_descriptors_esrb_sexual_themes" id="0x7f120202" />
-    <public type="string" name="application_store_rating_descriptors_esrb_sexual_violence" id="0x7f120203" />
-    <public type="string" name="application_store_rating_descriptors_esrb_shares_location" id="0x7f120204" />
-    <public type="string" name="application_store_rating_descriptors_esrb_simulated_gambling" id="0x7f120205" />
-    <public type="string" name="application_store_rating_descriptors_esrb_strong_language" id="0x7f120206" />
-    <public type="string" name="application_store_rating_descriptors_esrb_strong_lyrics" id="0x7f120207" />
-    <public type="string" name="application_store_rating_descriptors_esrb_strong_sexual_content" id="0x7f120208" />
-    <public type="string" name="application_store_rating_descriptors_esrb_suggestive_themes" id="0x7f120209" />
-    <public type="string" name="application_store_rating_descriptors_esrb_tobacco_reference" id="0x7f12020a" />
-    <public type="string" name="application_store_rating_descriptors_esrb_unrestricted_internet" id="0x7f12020b" />
-    <public type="string" name="application_store_rating_descriptors_esrb_use_of_alcohol" id="0x7f12020c" />
-    <public type="string" name="application_store_rating_descriptors_esrb_use_of_drugs" id="0x7f12020d" />
-    <public type="string" name="application_store_rating_descriptors_esrb_use_of_tobacco" id="0x7f12020e" />
-    <public type="string" name="application_store_rating_descriptors_esrb_users_interact" id="0x7f12020f" />
-    <public type="string" name="application_store_rating_descriptors_esrb_violence" id="0x7f120210" />
-    <public type="string" name="application_store_rating_descriptors_esrb_violent_references" id="0x7f120211" />
-    <public type="string" name="application_store_rating_descriptors_pegi_bad_language" id="0x7f120212" />
-    <public type="string" name="application_store_rating_descriptors_pegi_discrimination" id="0x7f120213" />
-    <public type="string" name="application_store_rating_descriptors_pegi_drugs" id="0x7f120214" />
-    <public type="string" name="application_store_rating_descriptors_pegi_fear" id="0x7f120215" />
-    <public type="string" name="application_store_rating_descriptors_pegi_gambling" id="0x7f120216" />
-    <public type="string" name="application_store_rating_descriptors_pegi_sex" id="0x7f120217" />
-    <public type="string" name="application_store_rating_descriptors_pegi_violence" id="0x7f120218" />
-    <public type="string" name="application_store_recommendation_ever_played_double" id="0x7f120219" />
-    <public type="string" name="application_store_recommendation_ever_played_other" id="0x7f12021a" />
-    <public type="string" name="application_store_recommendation_ever_played_single" id="0x7f12021b" />
-    <public type="string" name="application_store_recommendation_now_playing_double" id="0x7f12021c" />
-    <public type="string" name="application_store_recommendation_now_playing_other" id="0x7f12021d" />
-    <public type="string" name="application_store_recommendation_now_playing_single" id="0x7f12021e" />
-    <public type="string" name="application_store_recommendation_recently_played_double" id="0x7f12021f" />
-    <public type="string" name="application_store_recommendation_recently_played_other" id="0x7f120220" />
-    <public type="string" name="application_store_recommendation_recently_played_single" id="0x7f120221" />
-    <public type="string" name="application_store_recommended_header" id="0x7f120222" />
-    <public type="string" name="application_store_restricted" id="0x7f120223" />
-    <public type="string" name="application_store_rich_presence" id="0x7f120224" />
-    <public type="string" name="application_store_rich_presence_tooltip" id="0x7f120225" />
-    <public type="string" name="application_store_search_by_title" id="0x7f120226" />
-    <public type="string" name="application_store_search_empty" id="0x7f120227" />
-    <public type="string" name="application_store_section_title_copyright" id="0x7f120228" />
-    <public type="string" name="application_store_section_title_details" id="0x7f120229" />
-    <public type="string" name="application_store_section_title_features" id="0x7f12022a" />
-    <public type="string" name="application_store_section_title_metacritic" id="0x7f12022b" />
-    <public type="string" name="application_store_section_title_news" id="0x7f12022c" />
-    <public type="string" name="application_store_section_title_ratings" id="0x7f12022d" />
-    <public type="string" name="application_store_section_title_recommendation" id="0x7f12022e" />
-    <public type="string" name="application_store_section_title_system_requirements" id="0x7f12022f" />
-    <public type="string" name="application_store_section_title_verified_guild" id="0x7f120230" />
-    <public type="string" name="application_store_secure_networking" id="0x7f120231" />
-    <public type="string" name="application_store_secure_networking_tooltip" id="0x7f120232" />
-    <public type="string" name="application_store_single_player" id="0x7f120233" />
-    <public type="string" name="application_store_single_player_tooltip" id="0x7f120234" />
-    <public type="string" name="application_store_sort_by" id="0x7f120235" />
-    <public type="string" name="application_store_specs_cpu" id="0x7f120236" />
-    <public type="string" name="application_store_specs_memory" id="0x7f120237" />
-    <public type="string" name="application_store_specs_memory_value" id="0x7f120238" />
-    <public type="string" name="application_store_specs_minimum" id="0x7f120239" />
-    <public type="string" name="application_store_specs_network" id="0x7f12023a" />
-    <public type="string" name="application_store_specs_notes" id="0x7f12023b" />
-    <public type="string" name="application_store_specs_os" id="0x7f12023c" />
-    <public type="string" name="application_store_specs_recommended" id="0x7f12023d" />
-    <public type="string" name="application_store_specs_sound" id="0x7f12023e" />
-    <public type="string" name="application_store_specs_storage" id="0x7f12023f" />
-    <public type="string" name="application_store_specs_video" id="0x7f120240" />
-    <public type="string" name="application_store_spectator_mode" id="0x7f120241" />
-    <public type="string" name="application_store_spectator_mode_tooltip" id="0x7f120242" />
-    <public type="string" name="application_store_staff_pick" id="0x7f120243" />
-    <public type="string" name="application_store_the_game_awards_winner" id="0x7f120244" />
-    <public type="string" name="application_store_view_all_news" id="0x7f120245" />
-    <public type="string" name="application_store_warning_dlc_requires_base_application_description" id="0x7f120246" />
-    <public type="string" name="application_store_warning_dlc_requires_base_application_title" id="0x7f120247" />
-    <public type="string" name="application_store_warning_early_access_description" id="0x7f120248" />
-    <public type="string" name="application_store_warning_early_access_title" id="0x7f120249" />
-    <public type="string" name="application_store_warning_requires_desktop_app_description" id="0x7f12024a" />
-    <public type="string" name="application_store_warning_requires_desktop_app_title" id="0x7f12024b" />
-    <public type="string" name="application_store_warning_restricted_in_region_description" id="0x7f12024c" />
-    <public type="string" name="application_store_warning_restricted_in_region_title" id="0x7f12024d" />
-    <public type="string" name="application_store_warning_unavailable_in_language_description" id="0x7f12024e" />
-    <public type="string" name="application_store_warning_unavailable_in_language_title" id="0x7f12024f" />
-    <public type="string" name="application_store_warning_unavailable_linux_description" id="0x7f120250" />
-    <public type="string" name="application_store_warning_unavailable_linux_title" id="0x7f120251" />
-    <public type="string" name="application_store_warning_unavailable_mac_os_title" id="0x7f120252" />
-    <public type="string" name="application_store_warning_unavailable_os_description" id="0x7f120253" />
-    <public type="string" name="application_store_warning_unavailable_windows_title" id="0x7f120254" />
-    <public type="string" name="application_test_mode_view_other_listings" id="0x7f120255" />
-    <public type="string" name="application_uninstall_prompt_body" id="0x7f120256" />
-    <public type="string" name="application_uninstall_prompt_cancel" id="0x7f120257" />
-    <public type="string" name="application_uninstall_prompt_confirm" id="0x7f120258" />
-    <public type="string" name="application_uninstall_prompt_title" id="0x7f120259" />
-    <public type="string" name="applications_and_connections" id="0x7f12025a" />
-    <public type="string" name="applications_and_connections_body" id="0x7f12025b" />
-    <public type="string" name="attach_files" id="0x7f12025c" />
-    <public type="string" name="attach_payment_source_prompt_option" id="0x7f12025d" />
-    <public type="string" name="attachment_camera" id="0x7f12025e" />
-    <public type="string" name="attachment_filename_unknown" id="0x7f12025f" />
-    <public type="string" name="attachment_files" id="0x7f120260" />
-    <public type="string" name="attachment_load_failed" id="0x7f120261" />
-    <public type="string" name="attachment_photos" id="0x7f120262" />
-    <public type="string" name="attachment_processing" id="0x7f120263" />
-    <public type="string" name="attachments_keyboard" id="0x7f120264" />
-    <public type="string" name="attenuate_while_speaking_others" id="0x7f120265" />
-    <public type="string" name="attenuate_while_speaking_self" id="0x7f120266" />
-    <public type="string" name="audio_hint_body" id="0x7f120267" />
-    <public type="string" name="audio_hint_title" id="0x7f120268" />
-    <public type="string" name="auth_banned_invite_body" id="0x7f120269" />
-    <public type="string" name="auth_browser_handoff_detecting_description" id="0x7f12026a" />
-    <public type="string" name="auth_disable_email_notifications_failure_body" id="0x7f12026b" />
-    <public type="string" name="auth_disable_email_notifications_failure_header" id="0x7f12026c" />
-    <public type="string" name="auth_disable_email_notifications_success_body" id="0x7f12026d" />
-    <public type="string" name="auth_disable_email_notifications_success_header" id="0x7f12026e" />
-    <public type="string" name="auth_expired_suggestion" id="0x7f12026f" />
-    <public type="string" name="auth_invalid_invite_body" id="0x7f120270" />
-    <public type="string" name="auth_invalid_invite_tip" id="0x7f120271" />
-    <public type="string" name="auth_invalid_invite_title" id="0x7f120272" />
-    <public type="string" name="auth_ip_auth_succeeded_suggestion" id="0x7f120273" />
-    <public type="string" name="auth_login_body" id="0x7f120274" />
-    <public type="string" name="auth_message_invited_by" id="0x7f120275" />
-    <public type="string" name="auth_message_invited_to_stream" id="0x7f120276" />
-    <public type="string" name="auth_username_tooltip" id="0x7f120277" />
-    <public type="string" name="auth_verfication_expired_suggestion" id="0x7f120278" />
-    <public type="string" name="authorization" id="0x7f120279" />
-    <public type="string" name="authorization_expired" id="0x7f12027a" />
-    <public type="string" name="authorization_expired_suggestion" id="0x7f12027b" />
-    <public type="string" name="authorize" id="0x7f12027c" />
-    <public type="string" name="authorized" id="0x7f12027d" />
-    <public type="string" name="authorized_apps" id="0x7f12027e" />
-    <public type="string" name="authorizing" id="0x7f12027f" />
-    <public type="string" name="auto_toggle_streamer_mode_description" id="0x7f120280" />
-    <public type="string" name="auto_toggle_streamer_mode_label" id="0x7f120281" />
-    <public type="string" name="autocomplete_no_results_body" id="0x7f120282" />
-    <public type="string" name="autocomplete_no_results_header" id="0x7f120283" />
-    <public type="string" name="automatic_gain_control" id="0x7f120284" />
-    <public type="string" name="avatar_convert_failure_mobile" id="0x7f120285" />
-    <public type="string" name="avatar_size_option_large" id="0x7f120286" />
-    <public type="string" name="avatar_size_option_small" id="0x7f120287" />
-    <public type="string" name="back" id="0x7f120288" />
-    <public type="string" name="back_button_behavior_label_mobile" id="0x7f120289" />
-    <public type="string" name="back_button_behavior_mobile" id="0x7f12028a" />
-    <public type="string" name="backspace" id="0x7f12028b" />
-    <public type="string" name="backup_codes_dash" id="0x7f12028c" />
-    <public type="string" name="ban" id="0x7f12028d" />
-    <public type="string" name="ban_confirm_title" id="0x7f12028e" />
-    <public type="string" name="ban_members" id="0x7f12028f" />
-    <public type="string" name="ban_members_description" id="0x7f120290" />
-    <public type="string" name="ban_reason" id="0x7f120291" />
-    <public type="string" name="ban_user_body" id="0x7f120292" />
-    <public type="string" name="ban_user_confirmed" id="0x7f120293" />
-    <public type="string" name="ban_user_error_generic" id="0x7f120294" />
-    <public type="string" name="ban_user_title" id="0x7f120295" />
-    <public type="string" name="bans" id="0x7f120296" />
-    <public type="string" name="bans_header" id="0x7f120297" />
-    <public type="string" name="bans_hint" id="0x7f120298" />
-    <public type="string" name="bans_no_results" id="0x7f120299" />
-    <public type="string" name="bans_no_users_banned" id="0x7f12029a" />
-    <public type="string" name="bans_search_placeholder" id="0x7f12029b" />
-    <public type="string" name="beep_boop" id="0x7f12029c" />
-    <public type="string" name="beginning_channel" id="0x7f12029d" />
-    <public type="string" name="beginning_channel_no_history" id="0x7f12029e" />
-    <public type="string" name="beginning_chat" id="0x7f12029f" />
-    <public type="string" name="beginning_dm" id="0x7f1202a0" />
-    <public type="string" name="beginning_group_dm" id="0x7f1202a1" />
-    <public type="string" name="beginning_group_dm_managed" id="0x7f1202a2" />
-    <public type="string" name="beta" id="0x7f1202a3" />
-    <public type="string" name="bg" id="0x7f1202a4" />
-    <public type="string" name="billing" id="0x7f1202a5" />
-    <public type="string" name="billing_accept_terms_tooltip" id="0x7f1202a6" />
-    <public type="string" name="billing_account_credit" id="0x7f1202a7" />
-    <public type="string" name="billing_account_credit_plan_months_free" id="0x7f1202a8" />
-    <public type="string" name="billing_add_payment_method" id="0x7f1202a9" />
-    <public type="string" name="billing_address" id="0x7f1202aa" />
-    <public type="string" name="billing_address_address" id="0x7f1202ab" />
-    <public type="string" name="billing_address_address2" id="0x7f1202ac" />
-    <public type="string" name="billing_address_address2_placeholder" id="0x7f1202ad" />
-    <public type="string" name="billing_address_address_error_required" id="0x7f1202ae" />
-    <public type="string" name="billing_address_address_placeholder" id="0x7f1202af" />
-    <public type="string" name="billing_address_city" id="0x7f1202b0" />
-    <public type="string" name="billing_address_city_error_required" id="0x7f1202b1" />
-    <public type="string" name="billing_address_city_placeholder" id="0x7f1202b2" />
-    <public type="string" name="billing_address_country" id="0x7f1202b3" />
-    <public type="string" name="billing_address_country_error_required" id="0x7f1202b4" />
-    <public type="string" name="billing_address_name" id="0x7f1202b5" />
-    <public type="string" name="billing_address_name_error_required" id="0x7f1202b6" />
-    <public type="string" name="billing_address_postal_code" id="0x7f1202b7" />
-    <public type="string" name="billing_address_postal_code_canada_placeholder" id="0x7f1202b8" />
-    <public type="string" name="billing_address_postal_code_error_required" id="0x7f1202b9" />
-    <public type="string" name="billing_address_province" id="0x7f1202ba" />
-    <public type="string" name="billing_address_province_error_required" id="0x7f1202bb" />
-    <public type="string" name="billing_address_region" id="0x7f1202bc" />
-    <public type="string" name="billing_address_state" id="0x7f1202bd" />
-    <public type="string" name="billing_address_state_error_required" id="0x7f1202be" />
-    <public type="string" name="billing_address_zip_code" id="0x7f1202bf" />
-    <public type="string" name="billing_address_zip_code_error_length" id="0x7f1202c0" />
-    <public type="string" name="billing_address_zip_code_error_required" id="0x7f1202c1" />
-    <public type="string" name="billing_address_zip_code_invalid" id="0x7f1202c2" />
-    <public type="string" name="billing_address_zip_code_placeholder" id="0x7f1202c3" />
-    <public type="string" name="billing_apple_description" id="0x7f1202c4" />
-    <public type="string" name="billing_apple_header" id="0x7f1202c5" />
-    <public type="string" name="billing_application_consumable_refund_text_unable" id="0x7f1202c6" />
-    <public type="string" name="billing_application_refund_text" id="0x7f1202c7" />
-    <public type="string" name="billing_application_refund_text_unable" id="0x7f1202c8" />
-    <public type="string" name="billing_change_payment_source" id="0x7f1202c9" />
-    <public type="string" name="billing_code_redemption_redirect" id="0x7f1202ca" />
-    <public type="string" name="billing_error_add_payment_source_streamer_mode" id="0x7f1202cb" />
-    <public type="string" name="billing_error_gateway" id="0x7f1202cc" />
-    <public type="string" name="billing_error_rate_limit" id="0x7f1202cd" />
-    <public type="string" name="billing_error_section_address" id="0x7f1202ce" />
-    <public type="string" name="billing_error_section_card" id="0x7f1202cf" />
-    <public type="string" name="billing_gift_copied" id="0x7f1202d0" />
-    <public type="string" name="billing_gift_link" id="0x7f1202d1" />
-    <public type="string" name="billing_gift_purchase_tooltip" id="0x7f1202d2" />
-    <public type="string" name="billing_gift_refund_text" id="0x7f1202d3" />
-    <public type="string" name="billing_gift_refund_text_unable" id="0x7f1202d4" />
-    <public type="string" name="billing_history" id="0x7f1202d5" />
-    <public type="string" name="billing_is_gift_purchase" id="0x7f1202d6" />
-    <public type="string" name="billing_legal_mumbo_jumbo" id="0x7f1202d7" />
-    <public type="string" name="billing_legal_mumbo_jumbo_label" id="0x7f1202d8" />
-    <public type="string" name="billing_manage_billing" id="0x7f1202d9" />
-    <public type="string" name="billing_manage_subscription" id="0x7f1202da" />
-    <public type="string" name="billing_managed_by_apple" id="0x7f1202db" />
-    <public type="string" name="billing_no_payment_method" id="0x7f1202dc" />
-    <public type="string" name="billing_no_payment_method_description" id="0x7f1202dd" />
-    <public type="string" name="billing_pay_for_it_with" id="0x7f1202de" />
-    <public type="string" name="billing_payment_breakdown_taxes" id="0x7f1202df" />
-    <public type="string" name="billing_payment_breakdown_total" id="0x7f1202e0" />
-    <public type="string" name="billing_payment_choose_gift" id="0x7f1202e1" />
-    <public type="string" name="billing_payment_choose_plan" id="0x7f1202e2" />
-    <public type="string" name="billing_payment_history" id="0x7f1202e3" />
-    <public type="string" name="billing_payment_premium" id="0x7f1202e4" />
-    <public type="string" name="billing_payment_premium_legalese_monthly" id="0x7f1202e5" />
-    <public type="string" name="billing_payment_premium_legalese_yearly" id="0x7f1202e6" />
-    <public type="string" name="billing_payment_source_invalid" id="0x7f1202e7" />
-    <public type="string" name="billing_payment_sources" id="0x7f1202e8" />
-    <public type="string" name="billing_payment_table_header_amount" id="0x7f1202e9" />
-    <public type="string" name="billing_payment_table_header_date" id="0x7f1202ea" />
-    <public type="string" name="billing_payment_table_header_description" id="0x7f1202eb" />
-    <public type="string" name="billing_premium_gift_friend" id="0x7f1202ec" />
-    <public type="string" name="billing_premium_gift_month" id="0x7f1202ed" />
-    <public type="string" name="billing_premium_gift_month_mobile" id="0x7f1202ee" />
-    <public type="string" name="billing_premium_gift_year" id="0x7f1202ef" />
-    <public type="string" name="billing_premium_gift_year_mobile" id="0x7f1202f0" />
-    <public type="string" name="billing_premium_refund_text" id="0x7f1202f1" />
-    <public type="string" name="billing_premium_refund_text_unable" id="0x7f1202f2" />
-    <public type="string" name="billing_preorder_refund_text" id="0x7f1202f3" />
-    <public type="string" name="billing_price_per_month" id="0x7f1202f4" />
-    <public type="string" name="billing_price_per_month_current_plan" id="0x7f1202f5" />
-    <public type="string" name="billing_price_per_month_current_plan_ios" id="0x7f1202f6" />
-    <public type="string" name="billing_price_per_month_mobile" id="0x7f1202f7" />
-    <public type="string" name="billing_price_per_month_upgrade" id="0x7f1202f8" />
-    <public type="string" name="billing_price_per_year" id="0x7f1202f9" />
-    <public type="string" name="billing_price_per_year_current_plan" id="0x7f1202fa" />
-    <public type="string" name="billing_price_per_year_current_plan_ios" id="0x7f1202fb" />
-    <public type="string" name="billing_price_per_year_mobile" id="0x7f1202fc" />
-    <public type="string" name="billing_price_per_year_months_free" id="0x7f1202fd" />
-    <public type="string" name="billing_price_per_year_upgrade" id="0x7f1202fe" />
-    <public type="string" name="billing_purchase_details_header" id="0x7f1202ff" />
-    <public type="string" name="billing_refund_header" id="0x7f120300" />
-    <public type="string" name="billing_refund_play_time_never_played" id="0x7f120301" />
-    <public type="string" name="billing_refund_play_time_subheader" id="0x7f120302" />
-    <public type="string" name="billing_refund_purchase_date" id="0x7f120303" />
-    <public type="string" name="billing_refund_purchase_date_subheader" id="0x7f120304" />
-    <public type="string" name="billing_refund_release_date_subheader" id="0x7f120305" />
-    <public type="string" name="billing_refund_report_a_problem" id="0x7f120306" />
-    <public type="string" name="billing_refund_request_button" id="0x7f120307" />
-    <public type="string" name="billing_sales_tax_added" id="0x7f120308" />
-    <public type="string" name="billing_sales_tax_included" id="0x7f120309" />
-    <public type="string" name="billing_secure_tooltip" id="0x7f12030a" />
-    <public type="string" name="billing_step_address" id="0x7f12030b" />
-    <public type="string" name="billing_step_credit_card_information" id="0x7f12030c" />
-    <public type="string" name="billing_step_payment_info" id="0x7f12030d" />
-    <public type="string" name="billing_step_payment_type" id="0x7f12030e" />
-    <public type="string" name="billing_step_paypal" id="0x7f12030f" />
-    <public type="string" name="billing_step_review" id="0x7f120310" />
-    <public type="string" name="billing_step_select_plan" id="0x7f120311" />
-    <public type="string" name="billing_subscribe" id="0x7f120312" />
-    <public type="string" name="billing_tag_failed" id="0x7f120313" />
-    <public type="string" name="billing_tag_pending" id="0x7f120314" />
-    <public type="string" name="billing_tag_refunded" id="0x7f120315" />
-    <public type="string" name="billing_tag_reversed" id="0x7f120316" />
-    <public type="string" name="billing_third_party_eula_label" id="0x7f120317" />
-    <public type="string" name="block" id="0x7f120318" />
-    <public type="string" name="blocked" id="0x7f120319" />
-    <public type="string" name="blocked_messages" id="0x7f12031a" />
-    <public type="string" name="blue" id="0x7f12031b" />
-    <public type="string" name="bot_call_idle_disconnect" id="0x7f12031c" />
-    <public type="string" name="bot_dm_explicit_content" id="0x7f12031d" />
-    <public type="string" name="bot_dm_rate_limited" id="0x7f12031e" />
-    <public type="string" name="bot_dm_send_failed" id="0x7f12031f" />
-    <public type="string" name="bot_dm_send_message_temporarily_disabled" id="0x7f120320" />
-    <public type="string" name="bot_gdm_explicit_content" id="0x7f120321" />
-    <public type="string" name="bot_guild_explicit_content" id="0x7f120322" />
-    <public type="string" name="bot_requires_email_verification" id="0x7f120323" />
-    <public type="string" name="bot_tag" id="0x7f120324" />
-    <public type="string" name="bot_tag_bot" id="0x7f120325" />
-    <public type="string" name="bot_tag_server" id="0x7f120326" />
-    <public type="string" name="bot_video_disabled" id="0x7f120327" />
-    <public type="string" name="bots" id="0x7f120328" />
-    <public type="string" name="bots_settings_add" id="0x7f120329" />
-    <public type="string" name="bots_settings_description" id="0x7f12032a" />
-    <public type="string" name="bots_settings_learn_more" id="0x7f12032b" />
-    <public type="string" name="bots_settings_remove" id="0x7f12032c" />
-    <public type="string" name="bottom_sheet_behavior" id="0x7f12032d" />
-    <public type="string" name="brown" id="0x7f12032e" />
-    <public type="string" name="browser_app" id="0x7f12032f" />
-    <public type="string" name="browser_chrome" id="0x7f120330" />
-    <public type="string" name="browser_firefox" id="0x7f120331" />
-    <public type="string" name="browser_handoff_authenticating_description" id="0x7f120332" />
-    <public type="string" name="browser_handoff_authenticating_title" id="0x7f120333" />
-    <public type="string" name="browser_handoff_detecting_description" id="0x7f120334" />
-    <public type="string" name="browser_handoff_detecting_title" id="0x7f120335" />
-    <public type="string" name="browser_handoff_done_description" id="0x7f120336" />
-    <public type="string" name="browser_handoff_done_safe_to_close" id="0x7f120337" />
-    <public type="string" name="browser_handoff_done_title" id="0x7f120338" />
-    <public type="string" name="browser_handoff_failed_title" id="0x7f120339" />
-    <public type="string" name="browser_handoff_success_action" id="0x7f12033a" />
-    <public type="string" name="browser_handoff_success_body" id="0x7f12033b" />
-    <public type="string" name="browser_handoff_success_cancel" id="0x7f12033c" />
-    <public type="string" name="browser_handoff_success_title" id="0x7f12033d" />
-    <public type="string" name="browser_input_device_warning" id="0x7f12033e" />
-    <public type="string" name="browser_not_supported" id="0x7f12033f" />
-    <public type="string" name="browser_notifications_enabled_body" id="0x7f120340" />
-    <public type="string" name="browser_opera" id="0x7f120341" />
-    <public type="string" name="browser_output_device_warning" id="0x7f120342" />
-    <public type="string" name="bug_hunter_badge_tooltip" id="0x7f120343" />
-    <public type="string" name="build_override" id="0x7f120344" />
-    <public type="string" name="build_override_apply" id="0x7f120345" />
-    <public type="string" name="build_override_clear" id="0x7f120346" />
-    <public type="string" name="build_override_expired" id="0x7f120347" />
-    <public type="string" name="build_override_for" id="0x7f120348" />
-    <public type="string" name="build_override_id" id="0x7f120349" />
-    <public type="string" name="build_override_incompatible_client" id="0x7f12034a" />
-    <public type="string" name="build_override_invalid" id="0x7f12034b" />
-    <public type="string" name="build_override_invalid_user" id="0x7f12034c" />
-    <public type="string" name="build_override_isnt_available" id="0x7f12034d" />
-    <public type="string" name="build_override_link_copied" id="0x7f12034e" />
-    <public type="string" name="build_override_link_copy" id="0x7f12034f" />
-    <public type="string" name="bundle_ready_body" id="0x7f120350" />
-    <public type="string" name="bundle_ready_later" id="0x7f120351" />
-    <public type="string" name="bundle_ready_restart" id="0x7f120352" />
-    <public type="string" name="bundle_ready_title" id="0x7f120353" />
-    <public type="string" name="burgundy" id="0x7f120354" />
-    <public type="string" name="cache_cleared" id="0x7f120355" />
-    <public type="string" name="call" id="0x7f120356" />
-    <public type="string" name="call_invite_not_friends" id="0x7f120357" />
-    <public type="string" name="call_options" id="0x7f120358" />
-    <public type="string" name="call_unavailable" id="0x7f120359" />
-    <public type="string" name="call_user" id="0x7f12035a" />
-    <public type="string" name="camera_enable_access" id="0x7f12035b" />
-    <public type="string" name="camera_intent_result_error" id="0x7f12035c" />
-    <public type="string" name="camera_no_access" id="0x7f12035d" />
-    <public type="string" name="camera_no_device" id="0x7f12035e" />
-    <public type="string" name="camera_not_enabled" id="0x7f12035f" />
-    <public type="string" name="camera_off" id="0x7f120360" />
-    <public type="string" name="camera_on" id="0x7f120361" />
-    <public type="string" name="camera_permission_denied_msg" id="0x7f120362" />
-    <public type="string" name="camera_roll" id="0x7f120363" />
-    <public type="string" name="camera_switch" id="0x7f120364" />
-    <public type="string" name="camera_switched" id="0x7f120365" />
-    <public type="string" name="camera_unavailable" id="0x7f120366" />
-    <public type="string" name="camera_unknown_error" id="0x7f120367" />
-    <public type="string" name="cancel" id="0x7f120368" />
-    <public type="string" name="cannot_deny_missing_permission" id="0x7f120369" />
-    <public type="string" name="cannot_deny_self_simple" id="0x7f12036a" />
-    <public type="string" name="cannot_deny_singular_permission" id="0x7f12036b" />
-    <public type="string" name="cannot_manage_higher_rank" id="0x7f12036c" />
-    <public type="string" name="cannot_manage_is_owner" id="0x7f12036d" />
-    <public type="string" name="cannot_manage_same_rank" id="0x7f12036e" />
-    <public type="string" name="captcha" id="0x7f12036f" />
-    <public type="string" name="captcha_failed" id="0x7f120370" />
-    <public type="string" name="captcha_failed_play_services" id="0x7f120371" />
-    <public type="string" name="captcha_failed_unsupported" id="0x7f120372" />
-    <public type="string" name="captcha_issues" id="0x7f120373" />
-    <public type="string" name="captcha_open_browser" id="0x7f120374" />
-    <public type="string" name="captcha_problems" id="0x7f120375" />
-    <public type="string" name="captcha_problems_info" id="0x7f120376" />
-    <public type="string" name="categories" id="0x7f120377" />
-    <public type="string" name="category" id="0x7f120378" />
-    <public type="string" name="category_has_been_deleted" id="0x7f120379" />
-    <public type="string" name="category_name" id="0x7f12037a" />
-    <public type="string" name="category_settings" id="0x7f12037b" />
-    <public type="string" name="category_settings_have_been_updated" id="0x7f12037c" />
-    <public type="string" name="certified" id="0x7f12037d" />
-    <public type="string" name="certified_device_recommendation_audio_input_and_output_body" id="0x7f12037e" />
-    <public type="string" name="certified_device_recommendation_audio_input_body" id="0x7f12037f" />
-    <public type="string" name="certified_device_recommendation_audio_output_body" id="0x7f120380" />
-    <public type="string" name="certified_device_recommendation_cancel" id="0x7f120381" />
-    <public type="string" name="certified_device_recommendation_confirm" id="0x7f120382" />
-    <public type="string" name="certified_device_recommendation_title" id="0x7f120383" />
-    <public type="string" name="certified_device_recommendation_video_input_body" id="0x7f120384" />
-    <public type="string" name="change" id="0x7f120385" />
-    <public type="string" name="change_avatar" id="0x7f120386" />
-    <public type="string" name="change_banner" id="0x7f120387" />
-    <public type="string" name="change_category" id="0x7f120388" />
-    <public type="string" name="change_email" id="0x7f120389" />
-    <public type="string" name="change_email_short" id="0x7f12038a" />
-    <public type="string" name="change_icon" id="0x7f12038b" />
-    <public type="string" name="change_log" id="0x7f12038c" />
-    <public type="string" name="change_log_md_body" id="0x7f12038d" />
-    <public type="string" name="change_log_md_date" id="0x7f12038e" />
-    <public type="string" name="change_log_md_revision" id="0x7f120390" />
-    <public type="string" name="change_log_md_video" id="0x7f120391" />
-    <public type="string" name="change_nickname" id="0x7f120392" />
-    <public type="string" name="change_nickname_description" id="0x7f120393" />
-    <public type="string" name="change_nickname_warning" id="0x7f120394" />
-    <public type="string" name="change_password" id="0x7f120395" />
-    <public type="string" name="change_password_link" id="0x7f120396" />
-    <public type="string" name="change_phone_number" id="0x7f120397" />
-    <public type="string" name="change_plan" id="0x7f120398" />
-    <public type="string" name="change_splash" id="0x7f120399" />
-    <public type="string" name="change_url" id="0x7f12039a" />
-    <public type="string" name="change_vanity_url" id="0x7f12039b" />
-    <public type="string" name="change_vanity_url_error" id="0x7f12039c" />
-    <public type="string" name="channel" id="0x7f12039d" />
-    <public type="string" name="channel_has_been_deleted" id="0x7f12039e" />
-    <public type="string" name="channel_locked" id="0x7f12039f" />
-    <public type="string" name="channel_locked_short" id="0x7f1203a0" />
-    <public type="string" name="channel_locked_to_category" id="0x7f1203a1" />
-    <public type="string" name="channel_members" id="0x7f1203a2" />
-    <public type="string" name="channel_mute_role_description" id="0x7f1203a3" />
-    <public type="string" name="channel_mute_tooltip" id="0x7f1203a4" />
-    <public type="string" name="channel_name_required" id="0x7f1203a5" />
-    <public type="string" name="channel_or_category" id="0x7f1203a6" />
-    <public type="string" name="channel_order_updated" id="0x7f1203a7" />
-    <public type="string" name="channel_permissions" id="0x7f1203a8" />
-    <public type="string" name="channel_select" id="0x7f1203a9" />
-    <public type="string" name="channel_settings" id="0x7f1203aa" />
-    <public type="string" name="channel_settings_have_been_updated" id="0x7f1203ab" />
-    <public type="string" name="channel_slowmode_cooldown" id="0x7f1203ac" />
-    <public type="string" name="channel_slowmode_desc" id="0x7f1203ad" />
-    <public type="string" name="channel_slowmode_desc_hours" id="0x7f1203ae" />
-    <public type="string" name="channel_slowmode_desc_immune" id="0x7f1203af" />
-    <public type="string" name="channel_slowmode_desc_minutes" id="0x7f1203b0" />
-    <public type="string" name="channel_slowmode_desc_short" id="0x7f1203b1" />
-    <public type="string" name="channel_topic_empty" id="0x7f1203b2" />
-    <public type="string" name="channel_type" id="0x7f1203b3" />
-    <public type="string" name="channel_unmute_tooltip" id="0x7f1203b4" />
-    <public type="string" name="channels" id="0x7f1203b5" />
-    <public type="string" name="channels_unavailable_body" id="0x7f1203b6" />
-    <public type="string" name="channels_unavailable_title" id="0x7f1203b7" />
-    <public type="string" name="character_counter_content_description" id="0x7f1203b8" />
-    <public type="string" name="character_counter_pattern" id="0x7f1203b9" />
-    <public type="string" name="chat" id="0x7f1203ba" />
-    <public type="string" name="chat_attach_invite_to_listen" id="0x7f1203bb" />
-    <public type="string" name="chat_attach_invite_to_play_game" id="0x7f1203bc" />
-    <public type="string" name="chat_attach_invite_to_spectate_game" id="0x7f1203bd" />
-    <public type="string" name="chat_attach_invite_to_watch" id="0x7f1203be" />
-    <public type="string" name="chat_attach_upload_a_file" id="0x7f1203bf" />
-    <public type="string" name="chat_attach_upload_or_invite" id="0x7f1203c0" />
-    <public type="string" name="chat_behavior" id="0x7f1203c1" />
-    <public type="string" name="checking_for_updates" id="0x7f1203c2" />
-    <public type="string" name="choose" id="0x7f1203c3" />
-    <public type="string" name="choose_an_application" id="0x7f1203c4" />
-    <public type="string" name="claim_account" id="0x7f1203c5" />
-    <public type="string" name="claim_account_body" id="0x7f1203c6" />
-    <public type="string" name="claim_account_email_to" id="0x7f1203c7" />
-    <public type="string" name="claim_account_get_app" id="0x7f1203c8" />
-    <public type="string" name="claim_account_promote_app" id="0x7f1203c9" />
-    <public type="string" name="claim_account_required_body" id="0x7f1203ca" />
-    <public type="string" name="claim_account_required_email_to" id="0x7f1203cb" />
-    <public type="string" name="clear_attachments" id="0x7f1203cc" />
-    <public type="string" name="clear_cache" id="0x7f1203cd" />
-    <public type="string" name="clone_channel" id="0x7f1203ce" />
-    <public type="string" name="clone_channel_help" id="0x7f1203cf" />
-    <public type="string" name="close" id="0x7f1203d0" />
-    <public type="string" name="close_action_sheet" id="0x7f1203d1" />
-    <public type="string" name="close_dm" id="0x7f1203d2" />
-    <public type="string" name="close_stream" id="0x7f1203d3" />
-    <public type="string" name="close_window" id="0x7f1203d4" />
-    <public type="string" name="cloud_sync_icon_tooltip_done" id="0x7f1203d5" />
-    <public type="string" name="cloud_sync_icon_tooltip_planning" id="0x7f1203d6" />
-    <public type="string" name="cloud_sync_icon_tooltip_preparing" id="0x7f1203d7" />
-    <public type="string" name="cloud_sync_icon_tooltip_pulling" id="0x7f1203d8" />
-    <public type="string" name="cloud_sync_icon_tooltip_pushing" id="0x7f1203d9" />
-    <public type="string" name="cloud_sync_icon_tooltip_supported" id="0x7f1203da" />
-    <public type="string" name="cloud_sync_modal_conflict_choice_download" id="0x7f1203db" />
-    <public type="string" name="cloud_sync_modal_conflict_choice_upload" id="0x7f1203dc" />
-    <public type="string" name="cloud_sync_modal_conflict_description" id="0x7f1203dd" />
-    <public type="string" name="cloud_sync_modal_conflict_header" id="0x7f1203de" />
-    <public type="string" name="cloud_sync_modal_conflict_last_modified" id="0x7f1203df" />
-    <public type="string" name="cloud_sync_modal_error_description" id="0x7f1203e0" />
-    <public type="string" name="cloud_sync_modal_error_header" id="0x7f1203e1" />
-    <public type="string" name="cloud_sync_modal_or" id="0x7f1203e2" />
-    <public type="string" name="collapse_category" id="0x7f1203e3" />
-    <public type="string" name="com.crashlytics.android.build_id" id="0x7f1203e4" />
-    <public type="string" name="coming_soon" id="0x7f1203e5" />
-    <public type="string" name="coming_soon_notifications" id="0x7f1203e6" />
-    <public type="string" name="coming_soon_title" id="0x7f1203e7" />
-    <public type="string" name="command_giphy_description" id="0x7f1203e8" />
-    <public type="string" name="command_me_description" id="0x7f1203e9" />
-    <public type="string" name="command_nick_description" id="0x7f1203ea" />
-    <public type="string" name="command_nick_failure" id="0x7f1203eb" />
-    <public type="string" name="command_nick_failure_permission" id="0x7f1203ec" />
-    <public type="string" name="command_nick_reset" id="0x7f1203ed" />
-    <public type="string" name="command_nick_success" id="0x7f1203ee" />
-    <public type="string" name="command_shrug_description" id="0x7f1203ef" />
-    <public type="string" name="command_spoiler_description" id="0x7f1203f0" />
-    <public type="string" name="command_tableflip_description" id="0x7f1203f1" />
-    <public type="string" name="command_tableunflip_description" id="0x7f1203f2" />
-    <public type="string" name="command_tts_description" id="0x7f1203f3" />
-    <public type="string" name="commands" id="0x7f1203f4" />
-    <public type="string" name="commands_matching" id="0x7f1203f5" />
-    <public type="string" name="common_google_play_services_enable_button" id="0x7f1203f6" />
-    <public type="string" name="common_google_play_services_enable_text" id="0x7f1203f7" />
-    <public type="string" name="common_google_play_services_enable_title" id="0x7f1203f8" />
-    <public type="string" name="common_google_play_services_install_button" id="0x7f1203f9" />
-    <public type="string" name="common_google_play_services_install_text" id="0x7f1203fa" />
-    <public type="string" name="common_google_play_services_install_title" id="0x7f1203fb" />
-    <public type="string" name="common_google_play_services_notification_channel_name" id="0x7f1203fc" />
-    <public type="string" name="common_google_play_services_notification_ticker" id="0x7f1203fd" />
-    <public type="string" name="common_google_play_services_unknown_issue" id="0x7f1203fe" />
-    <public type="string" name="common_google_play_services_unsupported_text" id="0x7f1203ff" />
-    <public type="string" name="common_google_play_services_update_button" id="0x7f120400" />
-    <public type="string" name="common_google_play_services_update_text" id="0x7f120401" />
-    <public type="string" name="common_google_play_services_update_title" id="0x7f120402" />
-    <public type="string" name="common_google_play_services_updating_text" id="0x7f120403" />
-    <public type="string" name="common_google_play_services_wear_update_text" id="0x7f120404" />
-    <public type="string" name="common_open_on_phone" id="0x7f120405" />
-    <public type="string" name="common_signin_button_text" id="0x7f120406" />
-    <public type="string" name="common_signin_button_text_long" id="0x7f120407" />
-    <public type="string" name="communicators" id="0x7f120408" />
-    <public type="string" name="compact_mode" id="0x7f120409" />
-    <public type="string" name="completed" id="0x7f12040a" />
-    <public type="string" name="configure" id="0x7f12040b" />
-    <public type="string" name="confirm" id="0x7f12040c" />
-    <public type="string" name="confirm_channel_drag_title" id="0x7f12040d" />
-    <public type="string" name="confirm_disable_silence_body" id="0x7f12040e" />
-    <public type="string" name="confirm_disable_silence_dont_show" id="0x7f12040f" />
-    <public type="string" name="confirm_disable_silence_title" id="0x7f120410" />
-    <public type="string" name="confirm_user_block_body" id="0x7f120411" />
-    <public type="string" name="confirm_user_block_title" id="0x7f120412" />
-    <public type="string" name="connect" id="0x7f120413" />
-    <public type="string" name="connect_account_description" id="0x7f120414" />
-    <public type="string" name="connect_account_title" id="0x7f120415" />
-    <public type="string" name="connect_to_video" id="0x7f120416" />
-    <public type="string" name="connect_to_voice" id="0x7f120417" />
-    <public type="string" name="connect_voice_only" id="0x7f120418" />
-    <public type="string" name="connected_account_revoked" id="0x7f120419" />
-    <public type="string" name="connected_account_verify_failure" id="0x7f12041a" />
-    <public type="string" name="connected_account_verify_success" id="0x7f12041b" />
-    <public type="string" name="connected_account_verifying" id="0x7f12041c" />
-    <public type="string" name="connected_accounts" id="0x7f12041d" />
-    <public type="string" name="connected_accounts_none" id="0x7f12041e" />
-    <public type="string" name="connected_accounts_none_title" id="0x7f12041f" />
-    <public type="string" name="connected_device_detected_cancel_button" id="0x7f120420" />
-    <public type="string" name="connected_device_detected_confirm_button" id="0x7f120421" />
-    <public type="string" name="connected_device_detected_input_and_output_body" id="0x7f120422" />
-    <public type="string" name="connected_device_detected_input_body" id="0x7f120423" />
-    <public type="string" name="connected_device_detected_option_input" id="0x7f120424" />
-    <public type="string" name="connected_device_detected_option_input_and_output" id="0x7f120425" />
-    <public type="string" name="connected_device_detected_option_output" id="0x7f120426" />
-    <public type="string" name="connected_device_detected_output_body" id="0x7f120427" />
-    <public type="string" name="connected_device_detected_title" id="0x7f120428" />
-    <public type="string" name="connecting" id="0x7f120429" />
-    <public type="string" name="connecting_problems_cta" id="0x7f12042a" />
-    <public type="string" name="connection_enter_code" id="0x7f12042b" />
-    <public type="string" name="connection_invalid_pin" id="0x7f12042c" />
-    <public type="string" name="connection_login_with" id="0x7f12042d" />
-    <public type="string" name="connection_problems_body" id="0x7f12042e" />
-    <public type="string" name="connection_status_authenticating" id="0x7f12042f" />
-    <public type="string" name="connection_status_awaiting_endpoint" id="0x7f120430" />
-    <public type="string" name="connection_status_connected" id="0x7f120431" />
-    <public type="string" name="connection_status_connecting" id="0x7f120432" />
-    <public type="string" name="connection_status_disconnected" id="0x7f120433" />
-    <public type="string" name="connection_status_ice_checking" id="0x7f120434" />
-    <public type="string" name="connection_status_no_route" id="0x7f120435" />
-    <public type="string" name="connection_status_rtc_connecting" id="0x7f120436" />
-    <public type="string" name="connection_status_rtc_disconnected" id="0x7f120437" />
-    <public type="string" name="connection_status_stream_connected" id="0x7f120438" />
-    <public type="string" name="connection_status_video_connected" id="0x7f120439" />
-    <public type="string" name="connection_status_voice_connected" id="0x7f12043a" />
-    <public type="string" name="connection_verified" id="0x7f12043b" />
-    <public type="string" name="connections" id="0x7f12043c" />
-    <public type="string" name="content_matching" id="0x7f12043d" />
-    <public type="string" name="context_menu_hint" id="0x7f12043e" />
-    <public type="string" name="continue_to_webapp" id="0x7f12043f" />
-    <public type="string" name="control_volume" id="0x7f120440" />
-    <public type="string" name="convert_emoticons" id="0x7f120441" />
-    <public type="string" name="convert_emoticons_help" id="0x7f120442" />
-    <public type="string" name="copied" id="0x7f120443" />
-    <public type="string" name="copied_text" id="0x7f120444" />
-    <public type="string" name="copy" id="0x7f120445" />
-    <public type="string" name="copy_channel_topic" id="0x7f120446" />
-    <public type="string" name="copy_code" id="0x7f120447" />
-    <public type="string" name="copy_id" id="0x7f120448" />
-    <public type="string" name="copy_image_url" id="0x7f120449" />
-    <public type="string" name="copy_link" id="0x7f12044a" />
-    <public type="string" name="copy_message_link" id="0x7f12044b" />
-    <public type="string" name="copy_owner_id" id="0x7f12044c" />
-    <public type="string" name="copy_text" id="0x7f12044d" />
-    <public type="string" name="copy_username" id="0x7f12044e" />
-    <public type="string" name="country_codes" id="0x7f12044f" />
-    <public type="string" name="country_no_results" id="0x7f120450" />
-    <public type="string" name="cozy_mode" id="0x7f120451" />
-    <public type="string" name="crash_app_version" id="0x7f120452" />
-    <public type="string" name="crash_bummer_man" id="0x7f120453" />
-    <public type="string" name="crash_details" id="0x7f120454" />
-    <public type="string" name="crash_device" id="0x7f120455" />
-    <public type="string" name="crash_device_version" id="0x7f120456" />
-    <public type="string" name="crash_disclaimer" id="0x7f120457" />
-    <public type="string" name="crash_source" id="0x7f120458" />
-    <public type="string" name="crash_testers_invite" id="0x7f120459" />
-    <public type="string" name="crash_timestamp" id="0x7f12045a" />
-    <public type="string" name="crash_unexpected" id="0x7f12045b" />
-    <public type="string" name="create" id="0x7f12045c" />
-    <public type="string" name="create_category" id="0x7f12045d" />
-    <public type="string" name="create_channel" id="0x7f12045e" />
-    <public type="string" name="create_group_dm" id="0x7f12045f" />
-    <public type="string" name="create_instant_invite" id="0x7f120460" />
-    <public type="string" name="create_lfg_listings_channel" id="0x7f120461" />
-    <public type="string" name="create_link" id="0x7f120462" />
-    <public type="string" name="create_listings" id="0x7f120463" />
-    <public type="string" name="create_news_channel" id="0x7f120464" />
-    <public type="string" name="create_or_join_modal_header" id="0x7f120465" />
-    <public type="string" name="create_server_button_body" id="0x7f120466" />
-    <public type="string" name="create_server_button_cta" id="0x7f120467" />
-    <public type="string" name="create_server_button_cta_mobile" id="0x7f120468" />
-    <public type="string" name="create_server_button_cta_mobile_desc" id="0x7f120469" />
-    <public type="string" name="create_server_description" id="0x7f12046a" />
-    <public type="string" name="create_server_description_mobile" id="0x7f12046b" />
-    <public type="string" name="create_server_guidelines" id="0x7f12046c" />
-    <public type="string" name="create_server_title" id="0x7f12046d" />
-    <public type="string" name="create_store_channel" id="0x7f12046e" />
-    <public type="string" name="create_store_channel_application" id="0x7f12046f" />
-    <public type="string" name="create_store_channel_beta_note" id="0x7f120470" />
-    <public type="string" name="create_store_channel_beta_title" id="0x7f120471" />
-    <public type="string" name="create_store_channel_branch" id="0x7f120472" />
-    <public type="string" name="create_store_channel_no_branches" id="0x7f120473" />
-    <public type="string" name="create_store_channel_no_skus" id="0x7f120474" />
-    <public type="string" name="create_store_channel_no_skus_error" id="0x7f120475" />
-    <public type="string" name="create_store_channel_select_application" id="0x7f120476" />
-    <public type="string" name="create_store_channel_select_branch" id="0x7f120477" />
-    <public type="string" name="create_store_channel_select_sku" id="0x7f120478" />
-    <public type="string" name="create_store_channel_sku" id="0x7f120479" />
-    <public type="string" name="create_text_channel" id="0x7f12047a" />
-    <public type="string" name="create_voice_channel" id="0x7f12047b" />
-    <public type="string" name="credit_card_cvc" id="0x7f12047c" />
-    <public type="string" name="credit_card_error_expiration" id="0x7f12047d" />
-    <public type="string" name="credit_card_error_number" id="0x7f12047e" />
-    <public type="string" name="credit_card_error_required" id="0x7f12047f" />
-    <public type="string" name="credit_card_error_security_code" id="0x7f120480" />
-    <public type="string" name="credit_card_error_zip_code" id="0x7f120481" />
-    <public type="string" name="credit_card_expiration_date" id="0x7f120482" />
-    <public type="string" name="credit_card_expiration_date_placeholder" id="0x7f120483" />
-    <public type="string" name="credit_card_name" id="0x7f120484" />
-    <public type="string" name="credit_card_name_on_card" id="0x7f120485" />
-    <public type="string" name="credit_card_number" id="0x7f120486" />
-    <public type="string" name="credit_card_security_code" id="0x7f120487" />
-    <public type="string" name="cs" id="0x7f120488" />
-    <public type="string" name="current_vs_prior_week" id="0x7f120489" />
-    <public type="string" name="currently_controlling" id="0x7f12048a" />
-    <public type="string" name="custom_color" id="0x7f12048b" />
-    <public type="string" name="custom_status_clear_after" id="0x7f12048c" />
-    <public type="string" name="custom_status_clear_custom_status" id="0x7f12048d" />
-    <public type="string" name="custom_status_dont_clear" id="0x7f12048e" />
-    <public type="string" name="custom_status_edit_custom_status" id="0x7f12048f" />
-    <public type="string" name="custom_status_hotspot" id="0x7f120490" />
-    <public type="string" name="custom_status_hours" id="0x7f120491" />
-    <public type="string" name="custom_status_minutes" id="0x7f120492" />
-    <public type="string" name="custom_status_modal_body" id="0x7f120493" />
-    <public type="string" name="custom_status_modal_placeholder" id="0x7f120494" />
-    <public type="string" name="custom_status_set_custom_status" id="0x7f120495" />
-    <public type="string" name="custom_status_set_voice_status" id="0x7f120496" />
-    <public type="string" name="custom_status_today" id="0x7f120497" />
-    <public type="string" name="custom_tabs_mobile_body" id="0x7f120498" />
-    <public type="string" name="custom_tabs_mobile_header" id="0x7f120499" />
-    <public type="string" name="cut" id="0x7f12049a" />
-    <public type="string" name="da" id="0x7f12049b" />
-    <public type="string" name="dark_blue" id="0x7f12049c" />
-    <public type="string" name="dark_grey" id="0x7f12049d" />
-    <public type="string" name="dark_purple" id="0x7f12049e" />
-    <public type="string" name="dark_teal" id="0x7f12049f" />
-    <public type="string" name="data_download_requested_status_note" id="0x7f1204a0" />
-    <public type="string" name="data_privacy_controls" id="0x7f1204a1" />
-    <public type="string" name="data_privacy_controls_basic_service_note" id="0x7f1204a2" />
-    <public type="string" name="data_privacy_controls_basic_service_title" id="0x7f1204a3" />
-    <public type="string" name="data_privacy_controls_personal_data_title" id="0x7f1204a4" />
-    <public type="string" name="data_privacy_controls_personalization_note_learn_more" id="0x7f1204a5" />
-    <public type="string" name="data_privacy_controls_personalization_title" id="0x7f1204a6" />
-    <public type="string" name="data_privacy_controls_request_data_download" id="0x7f1204a7" />
-    <public type="string" name="data_privacy_controls_request_data_failure_body" id="0x7f1204a8" />
-    <public type="string" name="data_privacy_controls_request_data_failure_title" id="0x7f1204a9" />
-    <public type="string" name="data_privacy_controls_request_data_modal_cancel" id="0x7f1204aa" />
-    <public type="string" name="data_privacy_controls_request_data_modal_confirm" id="0x7f1204ab" />
-    <public type="string" name="data_privacy_controls_request_data_modal_note" id="0x7f1204ac" />
-    <public type="string" name="data_privacy_controls_request_data_modal_success" id="0x7f1204ad" />
-    <public type="string" name="data_privacy_controls_request_data_modal_success_title" id="0x7f1204ae" />
-    <public type="string" name="data_privacy_controls_request_data_modal_title" id="0x7f1204af" />
-    <public type="string" name="data_privacy_controls_request_data_note" id="0x7f1204b0" />
-    <public type="string" name="data_privacy_controls_request_data_success_body" id="0x7f1204b1" />
-    <public type="string" name="data_privacy_controls_request_data_success_title" id="0x7f1204b2" />
-    <public type="string" name="data_privacy_controls_request_data_tooltip" id="0x7f1204b3" />
-    <public type="string" name="data_privacy_controls_usage_statistics_note" id="0x7f1204b4" />
-    <public type="string" name="data_privacy_controls_usage_statistics_title" id="0x7f1204b5" />
-    <public type="string" name="data_privacy_rate_limit_title" id="0x7f1204b6" />
-    <public type="string" name="data_privacy_update_consents_failed" id="0x7f1204b7" />
-    <public type="string" name="date" id="0x7f1204b8" />
-    <public type="string" name="de" id="0x7f1204b9" />
-    <public type="string" name="deafen" id="0x7f1204ba" />
-    <public type="string" name="deafen_members" id="0x7f1204bb" />
-    <public type="string" name="deauthorize" id="0x7f1204bc" />
-    <public type="string" name="deauthorize_app" id="0x7f1204bd" />
-    <public type="string" name="deb" id="0x7f1204be" />
-    <public type="string" name="debug" id="0x7f1204bf" />
-    <public type="string" name="decline" id="0x7f1204c0" />
-    <public type="string" name="default_app_description" id="0x7f1204c1" />
-    <public type="string" name="default_input_placeholder" id="0x7f1204c2" />
-    <public type="string" name="default_web_client_id" id="0x7f1204c3" />
-    <public type="string" name="delete" id="0x7f1204c4" />
-    <public type="string" name="delete_account" id="0x7f1204c5" />
-    <public type="string" name="delete_account_body" id="0x7f1204c6" />
-    <public type="string" name="delete_account_error" id="0x7f1204c7" />
-    <public type="string" name="delete_account_transfer_ownership" id="0x7f1204c8" />
-    <public type="string" name="delete_account_transfer_ownership_body" id="0x7f1204c9" />
-    <public type="string" name="delete_app" id="0x7f1204ca" />
-    <public type="string" name="delete_app_confirm_msg" id="0x7f1204cb" />
-    <public type="string" name="delete_category" id="0x7f1204cc" />
-    <public type="string" name="delete_channel" id="0x7f1204cd" />
-    <public type="string" name="delete_channel_body" id="0x7f1204ce" />
-    <public type="string" name="delete_followed_news_body" id="0x7f1204cf" />
-    <public type="string" name="delete_message" id="0x7f1204d0" />
-    <public type="string" name="delete_message_body" id="0x7f1204d1" />
-    <public type="string" name="delete_message_context_menu_hint" id="0x7f1204d2" />
-    <public type="string" name="delete_message_history_option_24hr" id="0x7f1204d3" />
-    <public type="string" name="delete_message_history_option_7d" id="0x7f1204d4" />
-    <public type="string" name="delete_message_history_option_none" id="0x7f1204d5" />
-    <public type="string" name="delete_message_report" id="0x7f1204d6" />
-    <public type="string" name="delete_message_title" id="0x7f1204d7" />
-    <public type="string" name="delete_role" id="0x7f1204d8" />
-    <public type="string" name="delete_role_mobile" id="0x7f1204d9" />
-    <public type="string" name="delete_server" id="0x7f1204da" />
-    <public type="string" name="delete_server_body" id="0x7f1204db" />
-    <public type="string" name="delete_server_enter_name" id="0x7f1204dc" />
-    <public type="string" name="delete_server_incorrect_name" id="0x7f1204dd" />
-    <public type="string" name="delete_server_title" id="0x7f1204de" />
-    <public type="string" name="description" id="0x7f1204df" />
-    <public type="string" name="desktop_app" id="0x7f1204e0" />
-    <public type="string" name="desktop_icon_badge" id="0x7f1204e1" />
-    <public type="string" name="desktop_notifications_enable" id="0x7f1204e2" />
-    <public type="string" name="desktop_notifications_enable_body" id="0x7f1204e3" />
-    <public type="string" name="detect_platform_accounts" id="0x7f1204e4" />
-    <public type="string" name="developer_application_test_mode" id="0x7f1204e5" />
-    <public type="string" name="developer_application_test_mode_activate" id="0x7f1204e6" />
-    <public type="string" name="developer_application_test_mode_authorization_error" id="0x7f1204e7" />
-    <public type="string" name="developer_application_test_mode_clear" id="0x7f1204e8" />
-    <public type="string" name="developer_application_test_mode_invalid" id="0x7f1204e9" />
-    <public type="string" name="developer_application_test_mode_modal_body" id="0x7f1204ea" />
-    <public type="string" name="developer_application_test_mode_modal_header" id="0x7f1204eb" />
-    <public type="string" name="developer_application_test_mode_note" id="0x7f1204ec" />
-    <public type="string" name="developer_application_test_mode_placeholder" id="0x7f1204ed" />
-    <public type="string" name="developer_mode" id="0x7f1204ee" />
-    <public type="string" name="developer_mode_help_text" id="0x7f1204ef" />
-    <public type="string" name="developer_options" id="0x7f1204f0" />
-    <public type="string" name="developer_portal_cta" id="0x7f1204f1" />
-    <public type="string" name="device_no_permission" id="0x7f1204f2" />
-    <public type="string" name="device_settings" id="0x7f1204f3" />
-    <public type="string" name="direct_message" id="0x7f1204f4" />
-    <public type="string" name="direct_messages" id="0x7f1204f5" />
-    <public type="string" name="disable" id="0x7f1204f6" />
-    <public type="string" name="disable_account" id="0x7f1204f7" />
-    <public type="string" name="disable_account_body" id="0x7f1204f8" />
-    <public type="string" name="disable_email_notifications" id="0x7f1204f9" />
-    <public type="string" name="disable_email_notifications_body" id="0x7f1204fa" />
-    <public type="string" name="disable_email_notifications_failed" id="0x7f1204fb" />
-    <public type="string" name="disable_email_notifications_failed_suggestion" id="0x7f1204fc" />
-    <public type="string" name="disable_integration_title" id="0x7f1204fd" />
-    <public type="string" name="disable_integration_twitch_body" id="0x7f1204fe" />
-    <public type="string" name="disable_integration_youtube_body" id="0x7f1204ff" />
-    <public type="string" name="disable_notifications_description" id="0x7f120500" />
-    <public type="string" name="disable_notifications_label" id="0x7f120501" />
-    <public type="string" name="disable_sounds_description" id="0x7f120502" />
-    <public type="string" name="disable_sounds_label" id="0x7f120503" />
-    <public type="string" name="disabling_email_notifications" id="0x7f120504" />
-    <public type="string" name="discard_changes" id="0x7f120505" />
-    <public type="string" name="discard_changes_description" id="0x7f120506" />
-    <public type="string" name="disconnect" id="0x7f120507" />
-    <public type="string" name="disconnect_account" id="0x7f120508" />
-    <public type="string" name="disconnect_account_body" id="0x7f120509" />
-    <public type="string" name="disconnect_account_title" id="0x7f12050a" />
-    <public type="string" name="disconnect_from_voice" id="0x7f12050b" />
-    <public type="string" name="discord" id="0x7f12050c" />
-    <public type="string" name="discord_desc_long" id="0x7f12050d" />
-    <public type="string" name="discord_desc_short" id="0x7f12050e" />
-    <public type="string" name="discord_gg" id="0x7f12050f" />
-    <public type="string" name="discord_rich_presence" id="0x7f120510" />
-    <public type="string" name="discover" id="0x7f120511" />
-    <public type="string" name="discover_communities" id="0x7f120512" />
-    <public type="string" name="discover_friend_servers" id="0x7f120513" />
-    <public type="string" name="discover_recommended" id="0x7f120514" />
-    <public type="string" name="discovery" id="0x7f120515" />
-    <public type="string" name="dismiss" id="0x7f120516" />
-    <public type="string" name="dispatch_error_modal_body" id="0x7f120517" />
-    <public type="string" name="dispatch_error_modal_description" id="0x7f120518" />
-    <public type="string" name="dispatch_error_modal_error_label" id="0x7f120519" />
-    <public type="string" name="dispatch_error_modal_header" id="0x7f12051a" />
-    <public type="string" name="dispatch_error_modal_open_ticket" id="0x7f12051b" />
-    <public type="string" name="dispatch_game_launch_failed_launch_target_not_found" id="0x7f12051c" />
-    <public type="string" name="display" id="0x7f12051d" />
-    <public type="string" name="display_activity" id="0x7f12051e" />
-    <public type="string" name="display_on_profile" id="0x7f12051f" />
-    <public type="string" name="display_option_always" id="0x7f120520" />
-    <public type="string" name="display_option_never" id="0x7f120521" />
-    <public type="string" name="display_option_only_while_speaking" id="0x7f120522" />
-    <public type="string" name="display_silence_warning" id="0x7f120523" />
-    <public type="string" name="dm" id="0x7f120524" />
-    <public type="string" name="dm_search_instruction" id="0x7f120525" />
-    <public type="string" name="dm_search_placeholder" id="0x7f120526" />
-    <public type="string" name="dm_settings" id="0x7f120527" />
-    <public type="string" name="dm_verification_text_blocked" id="0x7f120528" />
-    <public type="string" name="done" id="0x7f120529" />
-    <public type="string" name="dont_show_again" id="0x7f12052a" />
-    <public type="string" name="download" id="0x7f12052b" />
-    <public type="string" name="download_app" id="0x7f12052c" />
-    <public type="string" name="download_apps" id="0x7f12052d" />
-    <public type="string" name="download_desktop_ptb_footer" id="0x7f12052e" />
-    <public type="string" name="download_desktop_stable_footer" id="0x7f12052f" />
-    <public type="string" name="download_desktop_title" id="0x7f120530" />
-    <public type="string" name="download_failed" id="0x7f120531" />
-    <public type="string" name="download_file_complete" id="0x7f120532" />
-    <public type="string" name="download_mobile_apps_description" id="0x7f120533" />
-    <public type="string" name="download_mobile_apps_description_with_username" id="0x7f120534" />
-    <public type="string" name="download_mobile_apps_title" id="0x7f120535" />
-    <public type="string" name="download_mobile_modal_apps_header" id="0x7f120536" />
-    <public type="string" name="download_mobile_title" id="0x7f120537" />
-    <public type="string" name="duration_days" id="0x7f120538" />
-    <public type="string" name="duration_hours" id="0x7f120539" />
-    <public type="string" name="duration_hours_short" id="0x7f12053a" />
-    <public type="string" name="duration_mins" id="0x7f12053b" />
-    <public type="string" name="duration_minutes" id="0x7f12053c" />
-    <public type="string" name="duration_minutes_short" id="0x7f12053d" />
-    <public type="string" name="duration_seconds" id="0x7f12053e" />
-    <public type="string" name="duration_seconds_short" id="0x7f12053f" />
-    <public type="string" name="early_supporter_tooltip" id="0x7f120540" />
-    <public type="string" name="echo_cancellation" id="0x7f120541" />
-    <public type="string" name="edit" id="0x7f120542" />
-    <public type="string" name="edit_category" id="0x7f120543" />
-    <public type="string" name="edit_channel" id="0x7f120544" />
-    <public type="string" name="edit_followed_news_body" id="0x7f120545" />
-    <public type="string" name="edit_message" id="0x7f120546" />
-    <public type="string" name="edit_note" id="0x7f120547" />
-    <public type="string" name="edit_overview" id="0x7f120548" />
-    <public type="string" name="edit_roles" id="0x7f120549" />
-    <public type="string" name="edit_textarea_help" id="0x7f12054a" />
-    <public type="string" name="edit_user" id="0x7f12054b" />
-    <public type="string" name="edit_voice_channel_no_permission" id="0x7f12054c" />
-    <public type="string" name="editing_message" id="0x7f12054d" />
-    <public type="string" name="editing_with_attachment_error" id="0x7f12054e" />
-    <public type="string" name="el" id="0x7f12054f" />
-    <public type="string" name="elevated_permissions_sound_body" id="0x7f120550" />
-    <public type="string" name="elevated_permissions_sound_no_sound_button" id="0x7f120551" />
-    <public type="string" name="elevated_permissions_sound_request_access_button" id="0x7f120552" />
-    <public type="string" name="elevated_permissions_sound_title" id="0x7f120553" />
-    <public type="string" name="email" id="0x7f120554" />
-    <public type="string" name="email_invalid" id="0x7f120555" />
-    <public type="string" name="email_required" id="0x7f120556" />
-    <public type="string" name="email_verification_instructions_body" id="0x7f120557" />
-    <public type="string" name="email_verification_instructions_header" id="0x7f120558" />
-    <public type="string" name="embed_links" id="0x7f120559" />
-    <public type="string" name="emoji" id="0x7f12055a" />
-    <public type="string" name="emoji_category_activity" id="0x7f12055b" />
-    <public type="string" name="emoji_category_custom" id="0x7f12055c" />
-    <public type="string" name="emoji_category_flags" id="0x7f12055d" />
-    <public type="string" name="emoji_category_food" id="0x7f12055e" />
-    <public type="string" name="emoji_category_nature" id="0x7f12055f" />
-    <public type="string" name="emoji_category_objects" id="0x7f120560" />
-    <public type="string" name="emoji_category_people" id="0x7f120561" />
-    <public type="string" name="emoji_category_recent" id="0x7f120562" />
-    <public type="string" name="emoji_category_symbols" id="0x7f120563" />
-    <public type="string" name="emoji_category_travel" id="0x7f120564" />
-    <public type="string" name="emoji_disabled_premium_tier_lost" id="0x7f120565" />
-    <public type="string" name="emoji_keyboard_toggle" id="0x7f120566" />
-    <public type="string" name="emoji_matching" id="0x7f120567" />
-    <public type="string" name="emoji_name" id="0x7f120568" />
-    <public type="string" name="emoji_section" id="0x7f120569" />
-    <public type="string" name="emoji_slots_available" id="0x7f12056a" />
-    <public type="string" name="emoji_too_big" id="0x7f12056b" />
-    <public type="string" name="en_gb" id="0x7f12056c" />
-    <public type="string" name="en_us" id="0x7f12056d" />
-    <public type="string" name="enable" id="0x7f12056e" />
-    <public type="string" name="enable_ingame_overlay" id="0x7f12056f" />
-    <public type="string" name="enable_privacy_access" id="0x7f120570" />
-    <public type="string" name="enable_streamer_mode_description" id="0x7f120571" />
-    <public type="string" name="enable_streamer_mode_label" id="0x7f120572" />
-    <public type="string" name="enable_twitch_emoji_sync" id="0x7f120573" />
-    <public type="string" name="engagement_ratio" id="0x7f120574" />
-    <public type="string" name="enter_email_body" id="0x7f120575" />
-    <public type="string" name="enter_phone_description" id="0x7f120576" />
-    <public type="string" name="enter_phone_title" id="0x7f120577" />
-    <public type="string" name="enter_vanity_url" id="0x7f120578" />
-    <public type="string" name="errors_action_to_take" id="0x7f120579" />
-    <public type="string" name="errors_activity_feed_crash" id="0x7f12057a" />
-    <public type="string" name="errors_reload" id="0x7f12057b" />
-    <public type="string" name="errors_restart_app" id="0x7f12057c" />
-    <public type="string" name="errors_store_crash" id="0x7f12057d" />
-    <public type="string" name="errors_unexpected_crash" id="0x7f12057e" />
-    <public type="string" name="es_es" id="0x7f12057f" />
-    <public type="string" name="everyone_popout_body" id="0x7f120580" />
-    <public type="string" name="everyone_popout_enter" id="0x7f120581" />
-    <public type="string" name="everyone_popout_esc" id="0x7f120582" />
-    <public type="string" name="everyone_popout_footer" id="0x7f120583" />
-    <public type="string" name="everyone_popout_send_now" id="0x7f120584" />
-    <public type="string" name="exit_full_screen" id="0x7f120585" />
-    <public type="string" name="experiment_mobile_only_user_button_cancel" id="0x7f120586" />
-    <public type="string" name="experiment_mobile_only_user_button_go" id="0x7f120587" />
-    <public type="string" name="experiment_mobile_only_user_email_confirmation" id="0x7f120588" />
-    <public type="string" name="experiment_mobile_only_user_header" id="0x7f120589" />
-    <public type="string" name="experiment_mobile_only_user_text1" id="0x7f12058a" />
-    <public type="string" name="experiment_mobile_only_user_text2" id="0x7f12058b" />
-    <public type="string" name="expire_after" id="0x7f12058c" />
-    <public type="string" name="expires_in" id="0x7f12058d" />
-    <public type="string" name="explicit_content_filter_disabled" id="0x7f12058e" />
-    <public type="string" name="explicit_content_filter_disabled_description" id="0x7f12058f" />
-    <public type="string" name="explicit_content_filter_high" id="0x7f120590" />
-    <public type="string" name="explicit_content_filter_high_description" id="0x7f120591" />
-    <public type="string" name="explicit_content_filter_medium" id="0x7f120592" />
-    <public type="string" name="explicit_content_filter_medium_description" id="0x7f120593" />
-    <public type="string" name="fab_transformation_scrim_behavior" id="0x7f120594" />
-    <public type="string" name="fab_transformation_sheet_behavior" id="0x7f120595" />
-    <public type="string" name="facebook" id="0x7f120596" />
-    <public type="string" name="failed" id="0x7f120597" />
-    <public type="string" name="fcm_fallback_notification_channel_label" id="0x7f120598" />
-    <public type="string" name="fi" id="0x7f120599" />
-    <public type="string" name="file_rate_kb" id="0x7f12059a" />
-    <public type="string" name="file_rate_mb" id="0x7f12059b" />
-    <public type="string" name="file_size_gb" id="0x7f12059c" />
-    <public type="string" name="file_size_mb" id="0x7f12059d" />
-    <public type="string" name="file_upload_limit_premium" id="0x7f12059e" />
-    <public type="string" name="file_upload_limit_premium2" id="0x7f12059f" />
-    <public type="string" name="file_upload_limit_standard" id="0x7f1205a0" />
-    <public type="string" name="files_permission_reason_msg" id="0x7f1205a1" />
-    <public type="string" name="filter" id="0x7f1205a2" />
-    <public type="string" name="filter_mentions" id="0x7f1205a3" />
-    <public type="string" name="filter_options" id="0x7f1205a4" />
-    <public type="string" name="firebase_database_url" id="0x7f1205a5" />
-    <public type="string" name="flash_auto" id="0x7f1205a6" />
-    <public type="string" name="flash_off" id="0x7f1205a7" />
-    <public type="string" name="flash_on" id="0x7f1205a8" />
-    <public type="string" name="focus_participant" id="0x7f1205a9" />
-    <public type="string" name="follow" id="0x7f1205aa" />
-    <public type="string" name="follow_modal_body" id="0x7f1205ab" />
-    <public type="string" name="follow_modal_fail" id="0x7f1205ac" />
-    <public type="string" name="follow_modal_header" id="0x7f1205ad" />
-    <public type="string" name="follow_modal_hint" id="0x7f1205ae" />
-    <public type="string" name="follow_modal_hint_no_perms" id="0x7f1205af" />
-    <public type="string" name="follow_modal_too_many_webhooks" id="0x7f1205b0" />
-    <public type="string" name="follow_news_chat_input_message" id="0x7f1205b1" />
-    <public type="string" name="follow_success_modal_body" id="0x7f1205b2" />
-    <public type="string" name="follow_success_modal_header" id="0x7f1205b3" />
-    <public type="string" name="follower_analytics" id="0x7f1205b4" />
-    <public type="string" name="follower_analytics_header" id="0x7f1205b5" />
-    <public type="string" name="force_sync" id="0x7f1205b6" />
-    <public type="string" name="forgot_password" id="0x7f1205b7" />
-    <public type="string" name="forgot_password_body" id="0x7f1205b8" />
-    <public type="string" name="form_checkbox_debug_logging" id="0x7f1205b9" />
-    <public type="string" name="form_checkbox_qos" id="0x7f1205ba" />
-    <public type="string" name="form_description_audio_mode_android_call" id="0x7f1205bb" />
-    <public type="string" name="form_description_audio_mode_android_communication" id="0x7f1205bc" />
-    <public type="string" name="form_description_push_afk_timeout" id="0x7f1205bd" />
-    <public type="string" name="form_description_tts" id="0x7f1205be" />
-    <public type="string" name="form_error_generic" id="0x7f1205bf" />
-    <public type="string" name="form_help_afk_channel" id="0x7f1205c0" />
-    <public type="string" name="form_help_attenuation" id="0x7f1205c1" />
-    <public type="string" name="form_help_automatic_vad" id="0x7f1205c2" />
-    <public type="string" name="form_help_bitrate" id="0x7f1205c3" />
-    <public type="string" name="form_help_certified_voice_processing" id="0x7f1205c4" />
-    <public type="string" name="form_help_channel_permissions" id="0x7f1205c5" />
-    <public type="string" name="form_help_custom_code" id="0x7f1205c6" />
-    <public type="string" name="form_help_debug_logging" id="0x7f1205c7" />
-    <public type="string" name="form_help_default_notification_settings" id="0x7f1205c8" />
-    <public type="string" name="form_help_default_notification_settings_mobile" id="0x7f1205c9" />
-    <public type="string" name="form_help_enable_discoverable" id="0x7f1205ca" />
-    <public type="string" name="form_help_enable_featurable" id="0x7f1205cb" />
-    <public type="string" name="form_help_explicit_content_filter" id="0x7f1205cc" />
-    <public type="string" name="form_help_instant_invite_channel" id="0x7f1205cd" />
-    <public type="string" name="form_help_last_seen" id="0x7f1205ce" />
-    <public type="string" name="form_help_legacy_subsystem" id="0x7f1205cf" />
-    <public type="string" name="form_help_news" id="0x7f1205d0" />
-    <public type="string" name="form_help_nsfw" id="0x7f1205d1" />
-    <public type="string" name="form_help_open_h264" id="0x7f1205d2" />
-    <public type="string" name="form_help_premade_widget" id="0x7f1205d3" />
-    <public type="string" name="form_help_qos" id="0x7f1205d4" />
-    <public type="string" name="form_help_server_banner" id="0x7f1205d5" />
-    <public type="string" name="form_help_server_description" id="0x7f1205d6" />
-    <public type="string" name="form_help_server_language" id="0x7f1205d7" />
-    <public type="string" name="form_help_slowmode" id="0x7f1205d8" />
-    <public type="string" name="form_help_system_channel" id="0x7f1205d9" />
-    <public type="string" name="form_help_system_channel_join_messages" id="0x7f1205da" />
-    <public type="string" name="form_help_system_channel_premium_subscription_messages" id="0x7f1205db" />
-    <public type="string" name="form_help_temporary" id="0x7f1205dc" />
-    <public type="string" name="form_help_user_limit" id="0x7f1205dd" />
-    <public type="string" name="form_help_verification_level" id="0x7f1205de" />
-    <public type="string" name="form_label_afk_channel" id="0x7f1205df" />
-    <public type="string" name="form_label_afk_timeout" id="0x7f1205e0" />
-    <public type="string" name="form_label_all" id="0x7f1205e1" />
-    <public type="string" name="form_label_all_messages" id="0x7f1205e2" />
-    <public type="string" name="form_label_android_opensl" id="0x7f1205e3" />
-    <public type="string" name="form_label_android_opensl_default" id="0x7f1205e4" />
-    <public type="string" name="form_label_android_opensl_default_desc" id="0x7f1205e5" />
-    <public type="string" name="form_label_android_opensl_desc" id="0x7f1205e6" />
-    <public type="string" name="form_label_android_opensl_force_disabled" id="0x7f1205e7" />
-    <public type="string" name="form_label_android_opensl_force_disabled_desc" id="0x7f1205e8" />
-    <public type="string" name="form_label_android_opensl_force_enabled" id="0x7f1205e9" />
-    <public type="string" name="form_label_android_opensl_force_enabled_desc" id="0x7f1205ea" />
-    <public type="string" name="form_label_attenuation" id="0x7f1205eb" />
-    <public type="string" name="form_label_audio_mode_android" id="0x7f1205ec" />
-    <public type="string" name="form_label_audio_mode_android_call" id="0x7f1205ed" />
-    <public type="string" name="form_label_audio_mode_android_communication" id="0x7f1205ee" />
-    <public type="string" name="form_label_automatic_vad" id="0x7f1205ef" />
-    <public type="string" name="form_label_automatic_vad_mobile" id="0x7f1205f0" />
-    <public type="string" name="form_label_avatar_size" id="0x7f1205f1" />
-    <public type="string" name="form_label_bitrate" id="0x7f1205f2" />
-    <public type="string" name="form_label_category_permissions" id="0x7f1205f3" />
-    <public type="string" name="form_label_channel_name" id="0x7f1205f4" />
-    <public type="string" name="form_label_channel_notifcation_settings" id="0x7f1205f5" />
-    <public type="string" name="form_label_channel_permissions" id="0x7f1205f6" />
-    <public type="string" name="form_label_channel_topic" id="0x7f1205f7" />
-    <public type="string" name="form_label_channel_voice_permissions" id="0x7f1205f8" />
-    <public type="string" name="form_label_current_password" id="0x7f1205f9" />
-    <public type="string" name="form_label_custom_code" id="0x7f1205fa" />
-    <public type="string" name="form_label_custom_twitch_emoticon" id="0x7f1205fb" />
-    <public type="string" name="form_label_default_notification_settings" id="0x7f1205fc" />
-    <public type="string" name="form_label_delete_message_history" id="0x7f1205fd" />
-    <public type="string" name="form_label_desktop_notifications" id="0x7f1205fe" />
-    <public type="string" name="form_label_desktop_only" id="0x7f1205ff" />
-    <public type="string" name="form_label_disabled_for_everyone" id="0x7f120600" />
-    <public type="string" name="form_label_discovery_settings" id="0x7f120601" />
-    <public type="string" name="form_label_display_names" id="0x7f120602" />
-    <public type="string" name="form_label_display_users" id="0x7f120603" />
-    <public type="string" name="form_label_email" id="0x7f120604" />
-    <public type="string" name="form_label_enable_widget" id="0x7f120605" />
-    <public type="string" name="form_label_expire_grace_period" id="0x7f120606" />
-    <public type="string" name="form_label_explicit_content_filter" id="0x7f120607" />
-    <public type="string" name="form_label_hoist_description" id="0x7f120608" />
-    <public type="string" name="form_label_input" id="0x7f120609" />
-    <public type="string" name="form_label_input_device" id="0x7f12060a" />
-    <public type="string" name="form_label_input_mode" id="0x7f12060b" />
-    <public type="string" name="form_label_input_sensitivty" id="0x7f12060c" />
-    <public type="string" name="form_label_input_volume" id="0x7f12060d" />
-    <public type="string" name="form_label_instant_invite" id="0x7f12060e" />
-    <public type="string" name="form_label_instant_invite_channel" id="0x7f12060f" />
-    <public type="string" name="form_label_json_api" id="0x7f120610" />
-    <public type="string" name="form_label_last_seen" id="0x7f120611" />
-    <public type="string" name="form_label_local_mute" id="0x7f120612" />
-    <public type="string" name="form_label_max_age" id="0x7f120613" />
-    <public type="string" name="form_label_max_uses" id="0x7f120614" />
-    <public type="string" name="form_label_member_add" id="0x7f120615" />
-    <public type="string" name="form_label_membership_expire_behavior" id="0x7f120616" />
-    <public type="string" name="form_label_mentionable" id="0x7f120617" />
-    <public type="string" name="form_label_mentions" id="0x7f120618" />
-    <public type="string" name="form_label_mobile_notifications_behavior" id="0x7f120619" />
-    <public type="string" name="form_label_mobile_notifications_blink" id="0x7f12061a" />
-    <public type="string" name="form_label_mobile_notifications_call_desc" id="0x7f12061b" />
-    <public type="string" name="form_label_mobile_notifications_inapp_desc" id="0x7f12061c" />
-    <public type="string" name="form_label_mobile_notifications_inapp_label" id="0x7f12061d" />
-    <public type="string" name="form_label_mobile_notifications_label" id="0x7f12061e" />
-    <public type="string" name="form_label_mobile_notifications_os_control_jump" id="0x7f12061f" />
-    <public type="string" name="form_label_mobile_notifications_os_control_jump_help" id="0x7f120620" />
-    <public type="string" name="form_label_mobile_notifications_sound_disable" id="0x7f120621" />
-    <public type="string" name="form_label_mobile_notifications_sound_message" id="0x7f120622" />
-    <public type="string" name="form_label_mobile_notifications_system_desc" id="0x7f120623" />
-    <public type="string" name="form_label_mobile_notifications_system_hint" id="0x7f120624" />
-    <public type="string" name="form_label_mobile_notifications_system_label" id="0x7f120625" />
-    <public type="string" name="form_label_mobile_notifications_vibrations" id="0x7f120626" />
-    <public type="string" name="form_label_mobile_notifications_wake_device" id="0x7f120627" />
-    <public type="string" name="form_label_mobile_push_notifications" id="0x7f120628" />
-    <public type="string" name="form_label_mobile_user_notifications_hint" id="0x7f120629" />
-    <public type="string" name="form_label_mobile_user_notifications_label" id="0x7f12062a" />
-    <public type="string" name="form_label_mute_server" id="0x7f12062b" />
-    <public type="string" name="form_label_mute_server_description" id="0x7f12062c" />
-    <public type="string" name="form_label_muted" id="0x7f12062d" />
-    <public type="string" name="form_label_new_password" id="0x7f12062e" />
-    <public type="string" name="form_label_new_user" id="0x7f12062f" />
-    <public type="string" name="form_label_news_channel" id="0x7f120630" />
-    <public type="string" name="form_label_nothing" id="0x7f120631" />
-    <public type="string" name="form_label_notification_frequency" id="0x7f120632" />
-    <public type="string" name="form_label_notification_position" id="0x7f120633" />
-    <public type="string" name="form_label_nsfw" id="0x7f120634" />
-    <public type="string" name="form_label_nsfw_channel" id="0x7f120635" />
-    <public type="string" name="form_label_off" id="0x7f120636" />
-    <public type="string" name="form_label_only_mentions" id="0x7f120637" />
-    <public type="string" name="form_label_output" id="0x7f120638" />
-    <public type="string" name="form_label_output_device" id="0x7f120639" />
-    <public type="string" name="form_label_output_volume" id="0x7f12063a" />
-    <public type="string" name="form_label_overlay_chat_opacity" id="0x7f12063b" />
-    <public type="string" name="form_label_overlay_text_chat_notifications" id="0x7f12063c" />
-    <public type="string" name="form_label_password" id="0x7f12063d" />
-    <public type="string" name="form_label_phone_number" id="0x7f12063e" />
-    <public type="string" name="form_label_premade_widget" id="0x7f12063f" />
-    <public type="string" name="form_label_push_afk_timeout" id="0x7f120640" />
-    <public type="string" name="form_label_qos" id="0x7f120641" />
-    <public type="string" name="form_label_reason_ban" id="0x7f120642" />
-    <public type="string" name="form_label_reason_kick" id="0x7f120643" />
-    <public type="string" name="form_label_report_reason" id="0x7f120644" />
-    <public type="string" name="form_label_role_add" id="0x7f120645" />
-    <public type="string" name="form_label_role_color" id="0x7f120646" />
-    <public type="string" name="form_label_role_enter_name" id="0x7f120647" />
-    <public type="string" name="form_label_role_name" id="0x7f120648" />
-    <public type="string" name="form_label_role_settings" id="0x7f120649" />
-    <public type="string" name="form_label_roles_pro_tip" id="0x7f12064a" />
-    <public type="string" name="form_label_roles_pro_tip_description" id="0x7f12064b" />
-    <public type="string" name="form_label_select_channel" id="0x7f12064c" />
-    <public type="string" name="form_label_send_to" id="0x7f12064d" />
-    <public type="string" name="form_label_sensitivty" id="0x7f12064e" />
-    <public type="string" name="form_label_server_banner" id="0x7f12064f" />
-    <public type="string" name="form_label_server_description" id="0x7f120650" />
-    <public type="string" name="form_label_server_id" id="0x7f120651" />
-    <public type="string" name="form_label_server_language" id="0x7f120652" />
-    <public type="string" name="form_label_server_name" id="0x7f120653" />
-    <public type="string" name="form_label_server_notification_settings" id="0x7f120654" />
-    <public type="string" name="form_label_server_region" id="0x7f120655" />
-    <public type="string" name="form_label_server_settings" id="0x7f120656" />
-    <public type="string" name="form_label_shortcut" id="0x7f120657" />
-    <public type="string" name="form_label_slowmode" id="0x7f120658" />
-    <public type="string" name="form_label_slowmode_cooldown" id="0x7f120659" />
-    <public type="string" name="form_label_slowmode_off" id="0x7f12065a" />
-    <public type="string" name="form_label_stream_volume" id="0x7f12065b" />
-    <public type="string" name="form_label_sub_expire_behavior" id="0x7f12065c" />
-    <public type="string" name="form_label_subsystem" id="0x7f12065d" />
-    <public type="string" name="form_label_suppress_everyone" id="0x7f12065e" />
-    <public type="string" name="form_label_synced_members" id="0x7f12065f" />
-    <public type="string" name="form_label_synced_role" id="0x7f120660" />
-    <public type="string" name="form_label_synced_subs" id="0x7f120661" />
-    <public type="string" name="form_label_system_channel" id="0x7f120662" />
-    <public type="string" name="form_label_system_channel_settings" id="0x7f120663" />
-    <public type="string" name="form_label_temporary" id="0x7f120664" />
-    <public type="string" name="form_label_test_microphone" id="0x7f120665" />
-    <public type="string" name="form_label_tts" id="0x7f120666" />
-    <public type="string" name="form_label_tts_notifications" id="0x7f120667" />
-    <public type="string" name="form_label_user_limit" id="0x7f120668" />
-    <public type="string" name="form_label_username" id="0x7f120669" />
-    <public type="string" name="form_label_username_mobile" id="0x7f12066a" />
-    <public type="string" name="form_label_verification_level" id="0x7f12066b" />
-    <public type="string" name="form_label_video_device" id="0x7f12066c" />
-    <public type="string" name="form_label_video_preview" id="0x7f12066d" />
-    <public type="string" name="form_label_voice_diagnostics" id="0x7f12066e" />
-    <public type="string" name="form_label_voice_processing" id="0x7f12066f" />
-    <public type="string" name="form_label_volume" id="0x7f120670" />
-    <public type="string" name="form_missing_required_fields" id="0x7f120671" />
-    <public type="string" name="form_placeholder_reason" id="0x7f120672" />
-    <public type="string" name="form_placeholder_server_name" id="0x7f120673" />
-    <public type="string" name="form_placeholder_username" id="0x7f120674" />
-    <public type="string" name="form_report_help_text" id="0x7f120675" />
-    <public type="string" name="form_warning_input_sensitivty" id="0x7f120676" />
-    <public type="string" name="form_warning_video_preview" id="0x7f120677" />
-    <public type="string" name="fr" id="0x7f120678" />
-    <public type="string" name="friend_has_been_deleted" id="0x7f120679" />
-    <public type="string" name="friend_permitted_source" id="0x7f12067a" />
-    <public type="string" name="friend_permitted_source_all" id="0x7f12067b" />
-    <public type="string" name="friend_permitted_source_mutual_friends" id="0x7f12067c" />
-    <public type="string" name="friend_permitted_source_mutual_guilds" id="0x7f12067d" />
-    <public type="string" name="friend_request_accept" id="0x7f12067e" />
-    <public type="string" name="friend_request_cancel" id="0x7f12067f" />
-    <public type="string" name="friend_request_cancelled" id="0x7f120680" />
-    <public type="string" name="friend_request_ignore" id="0x7f120681" />
-    <public type="string" name="friend_request_ignored" id="0x7f120682" />
-    <public type="string" name="friend_request_rate_limited_body" id="0x7f120683" />
-    <public type="string" name="friend_request_rate_limited_button" id="0x7f120684" />
-    <public type="string" name="friend_request_rate_limited_header" id="0x7f120685" />
-    <public type="string" name="friend_request_requires_email_validation_body" id="0x7f120686" />
-    <public type="string" name="friend_request_requires_email_validation_button" id="0x7f120687" />
-    <public type="string" name="friend_request_requires_email_validation_header" id="0x7f120688" />
-    <public type="string" name="friend_request_sent" id="0x7f120689" />
-    <public type="string" name="friends" id="0x7f12068a" />
-    <public type="string" name="friends_column_name" id="0x7f12068b" />
-    <public type="string" name="friends_column_status" id="0x7f12068c" />
-    <public type="string" name="friends_empty_state_all" id="0x7f12068d" />
-    <public type="string" name="friends_empty_state_all_body" id="0x7f12068e" />
-    <public type="string" name="friends_empty_state_all_cta" id="0x7f12068f" />
-    <public type="string" name="friends_empty_state_all_header" id="0x7f120690" />
-    <public type="string" name="friends_empty_state_blocked" id="0x7f120691" />
-    <public type="string" name="friends_empty_state_copy" id="0x7f120692" />
-    <public type="string" name="friends_empty_state_online" id="0x7f120693" />
-    <public type="string" name="friends_empty_state_pending" id="0x7f120694" />
-    <public type="string" name="friends_online" id="0x7f120695" />
-    <public type="string" name="friends_section_add_friend" id="0x7f120696" />
-    <public type="string" name="friends_section_all" id="0x7f120697" />
-    <public type="string" name="friends_section_online" id="0x7f120698" />
-    <public type="string" name="friends_section_pending" id="0x7f120699" />
-    <public type="string" name="full" id="0x7f12069a" />
-    <public type="string" name="full_screen" id="0x7f12069b" />
-    <public type="string" name="game_action_button_add_to_library" id="0x7f12069c" />
-    <public type="string" name="game_action_button_cannot_install" id="0x7f12069d" />
-    <public type="string" name="game_action_button_downloading" id="0x7f12069e" />
-    <public type="string" name="game_action_button_game_not_detected" id="0x7f12069f" />
-    <public type="string" name="game_action_button_install" id="0x7f1206a0" />
-    <public type="string" name="game_action_button_locate" id="0x7f1206a1" />
-    <public type="string" name="game_action_button_login_to_buy" id="0x7f1206a2" />
-    <public type="string" name="game_action_button_now_playing" id="0x7f1206a3" />
-    <public type="string" name="game_action_button_paused" id="0x7f1206a4" />
-    <public type="string" name="game_action_button_play" id="0x7f1206a5" />
-    <public type="string" name="game_action_button_play_disabled_desktop_app" id="0x7f1206a6" />
-    <public type="string" name="game_action_button_preorder_wait" id="0x7f1206a7" />
-    <public type="string" name="game_action_button_preorder_wait_tooltip" id="0x7f1206a8" />
-    <public type="string" name="game_action_button_queue" id="0x7f1206a9" />
-    <public type="string" name="game_action_button_queued" id="0x7f1206aa" />
-    <public type="string" name="game_action_button_restricted_in_region" id="0x7f1206ab" />
-    <public type="string" name="game_action_button_unavailable" id="0x7f1206ac" />
-    <public type="string" name="game_action_button_unavailable_tooltip" id="0x7f1206ad" />
-    <public type="string" name="game_action_button_unavailable_tooltip_plural" id="0x7f1206ae" />
-    <public type="string" name="game_action_button_uninstalling_1" id="0x7f1206af" />
-    <public type="string" name="game_action_button_uninstalling_10" id="0x7f1206b0" />
-    <public type="string" name="game_action_button_uninstalling_2" id="0x7f1206b1" />
-    <public type="string" name="game_action_button_uninstalling_3" id="0x7f1206b2" />
-    <public type="string" name="game_action_button_uninstalling_4" id="0x7f1206b3" />
-    <public type="string" name="game_action_button_uninstalling_5" id="0x7f1206b4" />
-    <public type="string" name="game_action_button_uninstalling_6" id="0x7f1206b5" />
-    <public type="string" name="game_action_button_uninstalling_7" id="0x7f1206b6" />
-    <public type="string" name="game_action_button_uninstalling_8" id="0x7f1206b7" />
-    <public type="string" name="game_action_button_uninstalling_9" id="0x7f1206b8" />
-    <public type="string" name="game_action_button_update" id="0x7f1206b9" />
-    <public type="string" name="game_action_button_view_in_store" id="0x7f1206ba" />
-    <public type="string" name="game_activity" id="0x7f1206bb" />
-    <public type="string" name="game_activity_notifications" id="0x7f1206bc" />
-    <public type="string" name="game_detected" id="0x7f1206bd" />
-    <public type="string" name="game_detection_foreground_android" id="0x7f1206be" />
-    <public type="string" name="game_detection_foreground_info_android" id="0x7f1206bf" />
-    <public type="string" name="game_detection_modal_info_android" id="0x7f1206c0" />
-    <public type="string" name="game_detection_open_settings" id="0x7f1206c1" />
-    <public type="string" name="game_detection_service" id="0x7f1206c2" />
-    <public type="string" name="game_feed_activity_action_play" id="0x7f1206c3" />
-    <public type="string" name="game_feed_activity_playing_xbox" id="0x7f1206c4" />
-    <public type="string" name="game_feed_activity_recently_played" id="0x7f1206c5" />
-    <public type="string" name="game_feed_activity_streaming_twitch" id="0x7f1206c6" />
-    <public type="string" name="game_feed_current_header_title" id="0x7f1206c7" />
-    <public type="string" name="game_feed_settings_visibility" id="0x7f1206c8" />
-    <public type="string" name="game_feed_unknown_player" id="0x7f1206c9" />
-    <public type="string" name="game_feed_user_played_days_ago" id="0x7f1206ca" />
-    <public type="string" name="game_feed_user_played_hours_ago" id="0x7f1206cb" />
-    <public type="string" name="game_feed_user_played_minutes_ago" id="0x7f1206cc" />
-    <public type="string" name="game_feed_user_played_months_ago" id="0x7f1206cd" />
-    <public type="string" name="game_feed_user_played_weeks_ago" id="0x7f1206ce" />
-    <public type="string" name="game_feed_user_played_years_ago" id="0x7f1206cf" />
-    <public type="string" name="game_feed_user_playing_for_days" id="0x7f1206d0" />
-    <public type="string" name="game_feed_user_playing_for_hours" id="0x7f1206d1" />
-    <public type="string" name="game_feed_user_playing_for_minutes" id="0x7f1206d2" />
-    <public type="string" name="game_feed_user_playing_just_ended" id="0x7f1206d3" />
-    <public type="string" name="game_feed_user_playing_just_started" id="0x7f1206d4" />
-    <public type="string" name="game_launch_failed_launch_target_not_found" id="0x7f1206d5" />
-    <public type="string" name="game_library" id="0x7f1206d6" />
-    <public type="string" name="game_library_last_played_days" id="0x7f1206d7" />
-    <public type="string" name="game_library_last_played_hours" id="0x7f1206d8" />
-    <public type="string" name="game_library_last_played_just_now" id="0x7f1206d9" />
-    <public type="string" name="game_library_last_played_minutes" id="0x7f1206da" />
-    <public type="string" name="game_library_last_played_months" id="0x7f1206db" />
-    <public type="string" name="game_library_last_played_none" id="0x7f1206dc" />
-    <public type="string" name="game_library_last_played_playing_now" id="0x7f1206dd" />
-    <public type="string" name="game_library_last_played_weeks" id="0x7f1206de" />
-    <public type="string" name="game_library_last_played_years" id="0x7f1206df" />
-    <public type="string" name="game_library_list_header_last_played" id="0x7f1206e0" />
-    <public type="string" name="game_library_list_header_name" id="0x7f1206e1" />
-    <public type="string" name="game_library_list_header_platform" id="0x7f1206e2" />
-    <public type="string" name="game_library_new" id="0x7f1206e3" />
-    <public type="string" name="game_library_not_applicable" id="0x7f1206e4" />
-    <public type="string" name="game_library_notification_game_installed_body" id="0x7f1206e5" />
-    <public type="string" name="game_library_notification_game_installed_title" id="0x7f1206e6" />
-    <public type="string" name="game_library_overlay_disabled_tooltip" id="0x7f1206e7" />
-    <public type="string" name="game_library_private_tooltip" id="0x7f1206e8" />
-    <public type="string" name="game_library_time_played_hours" id="0x7f1206e9" />
-    <public type="string" name="game_library_time_played_minutes" id="0x7f1206ea" />
-    <public type="string" name="game_library_time_played_none" id="0x7f1206eb" />
-    <public type="string" name="game_library_time_played_seconds" id="0x7f1206ec" />
-    <public type="string" name="game_library_updates_action_move_up" id="0x7f1206ed" />
-    <public type="string" name="game_library_updates_action_pause" id="0x7f1206ee" />
-    <public type="string" name="game_library_updates_action_remove" id="0x7f1206ef" />
-    <public type="string" name="game_library_updates_action_resume" id="0x7f1206f0" />
-    <public type="string" name="game_library_updates_header_disk" id="0x7f1206f1" />
-    <public type="string" name="game_library_updates_header_network" id="0x7f1206f2" />
-    <public type="string" name="game_library_updates_installing" id="0x7f1206f3" />
-    <public type="string" name="game_library_updates_installing_hours" id="0x7f1206f4" />
-    <public type="string" name="game_library_updates_installing_minutes" id="0x7f1206f5" />
-    <public type="string" name="game_library_updates_installing_seconds" id="0x7f1206f6" />
-    <public type="string" name="game_library_updates_progress_allocating_disk" id="0x7f1206f7" />
-    <public type="string" name="game_library_updates_progress_downloading_text_installing" id="0x7f1206f8" />
-    <public type="string" name="game_library_updates_progress_downloading_text_patching" id="0x7f1206f9" />
-    <public type="string" name="game_library_updates_progress_finalizing" id="0x7f1206fa" />
-    <public type="string" name="game_library_updates_progress_finished" id="0x7f1206fb" />
-    <public type="string" name="game_library_updates_progress_paused" id="0x7f1206fc" />
-    <public type="string" name="game_library_updates_progress_paused_no_transition" id="0x7f1206fd" />
-    <public type="string" name="game_library_updates_progress_pausing" id="0x7f1206fe" />
-    <public type="string" name="game_library_updates_progress_planning" id="0x7f1206ff" />
-    <public type="string" name="game_library_updates_progress_post_install_scripts" id="0x7f120700" />
-    <public type="string" name="game_library_updates_progress_queued" id="0x7f120701" />
-    <public type="string" name="game_library_updates_progress_queued_no_transition" id="0x7f120702" />
-    <public type="string" name="game_library_updates_progress_repairing" id="0x7f120703" />
-    <public type="string" name="game_library_updates_progress_verifying" id="0x7f120704" />
-    <public type="string" name="game_library_updates_progress_waiting_for_another" id="0x7f120705" />
-    <public type="string" name="game_library_updates_progress_waiting_for_another_no_transition" id="0x7f120706" />
-    <public type="string" name="game_library_updates_updating" id="0x7f120707" />
-    <public type="string" name="game_library_updates_updating_updating_hours" id="0x7f120708" />
-    <public type="string" name="game_library_updates_updating_updating_minutes" id="0x7f120709" />
-    <public type="string" name="game_library_updates_updating_updating_seconds" id="0x7f12070a" />
-    <public type="string" name="game_popout_follow" id="0x7f12070b" />
-    <public type="string" name="game_popout_go_to_server" id="0x7f12070c" />
-    <public type="string" name="game_popout_no_recent_players" id="0x7f12070d" />
-    <public type="string" name="game_popout_online_in_server" id="0x7f12070e" />
-    <public type="string" name="game_popout_unfollow" id="0x7f12070f" />
-    <public type="string" name="game_popout_view_server" id="0x7f120710" />
-    <public type="string" name="games" id="0x7f120711" />
-    <public type="string" name="gcm_defaultSenderId" id="0x7f120712" />
-    <public type="string" name="general_permissions" id="0x7f120713" />
-    <public type="string" name="generate_a_new_link" id="0x7f120714" />
-    <public type="string" name="get_started" id="0x7f120715" />
-    <public type="string" name="gif" id="0x7f120716" />
-    <public type="string" name="gif_auto_play_label" id="0x7f120717" />
-    <public type="string" name="gif_auto_play_label_mobile" id="0x7f120718" />
-    <public type="string" name="gif_button_label" id="0x7f120719" />
-    <public type="string" name="gif_picker_back_to_top" id="0x7f12071a" />
-    <public type="string" name="gif_picker_favorites" id="0x7f12071b" />
-    <public type="string" name="gif_picker_related_search" id="0x7f12071c" />
-    <public type="string" name="gif_picker_result_type_recent" id="0x7f12071d" />
-    <public type="string" name="gif_picker_result_type_trending_gifs" id="0x7f12071e" />
-    <public type="string" name="gif_tooltip_add_to_favorites" id="0x7f12071f" />
-    <public type="string" name="gif_tooltip_favorited_picker_button" id="0x7f120720" />
-    <public type="string" name="gif_tooltip_remove_from_favorites" id="0x7f120721" />
-    <public type="string" name="gift_code_auth_accept" id="0x7f120722" />
-    <public type="string" name="gift_code_auth_accepting" id="0x7f120723" />
-    <public type="string" name="gift_code_auth_check_verification_again" id="0x7f120724" />
-    <public type="string" name="gift_code_auth_continue_in_browser" id="0x7f120725" />
-    <public type="string" name="gift_code_auth_fetching_user" id="0x7f120726" />
-    <public type="string" name="gift_code_auth_gifted" id="0x7f120727" />
-    <public type="string" name="gift_code_auth_gifted_by" id="0x7f120728" />
-    <public type="string" name="gift_code_auth_gifted_subscription_monthly" id="0x7f120729" />
-    <public type="string" name="gift_code_auth_gifted_subscription_yearly" id="0x7f12072a" />
-    <public type="string" name="gift_code_auth_help_text_claimed" id="0x7f12072b" />
-    <public type="string" name="gift_code_auth_help_text_owned" id="0x7f12072c" />
-    <public type="string" name="gift_code_auth_help_text_verification_required" id="0x7f12072d" />
-    <public type="string" name="gift_code_auth_invalid_body" id="0x7f12072e" />
-    <public type="string" name="gift_code_auth_invalid_tip" id="0x7f12072f" />
-    <public type="string" name="gift_code_auth_invalid_title" id="0x7f120730" />
-    <public type="string" name="gift_code_auth_logged_in_as" id="0x7f120731" />
-    <public type="string" name="gift_code_auth_resolving" id="0x7f120732" />
-    <public type="string" name="gift_code_auth_verification_sent" id="0x7f120733" />
-    <public type="string" name="gift_code_auth_verification_title" id="0x7f120734" />
-    <public type="string" name="gift_code_hint" id="0x7f120735" />
-    <public type="string" name="gift_confirmation_body_claimed" id="0x7f120736" />
-    <public type="string" name="gift_confirmation_body_confirm" id="0x7f120737" />
-    <public type="string" name="gift_confirmation_body_confirm_nitro" id="0x7f120738" />
-    <public type="string" name="gift_confirmation_body_error_invoice_open" id="0x7f120739" />
-    <public type="string" name="gift_confirmation_body_error_nitro_upgrade_downgrade" id="0x7f12073a" />
-    <public type="string" name="gift_confirmation_body_error_subscription_managed" id="0x7f12073b" />
-    <public type="string" name="gift_confirmation_body_invalid" id="0x7f12073c" />
-    <public type="string" name="gift_confirmation_body_owned" id="0x7f12073d" />
-    <public type="string" name="gift_confirmation_body_self_gift_no_payment" id="0x7f12073e" />
-    <public type="string" name="gift_confirmation_body_subscription_monthly_confirm" id="0x7f12073f" />
-    <public type="string" name="gift_confirmation_body_subscription_yearly_confirm" id="0x7f120740" />
-    <public type="string" name="gift_confirmation_body_success" id="0x7f120741" />
-    <public type="string" name="gift_confirmation_body_success_generic_subscription_monthly" id="0x7f120742" />
-    <public type="string" name="gift_confirmation_body_success_generic_subscription_yearly" id="0x7f120743" />
-    <public type="string" name="gift_confirmation_body_success_mobile" id="0x7f120744" />
-    <public type="string" name="gift_confirmation_body_success_nitro" id="0x7f120745" />
-    <public type="string" name="gift_confirmation_body_success_nitro_classic" id="0x7f120746" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_1_monthly" id="0x7f120747" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_1_yearly" id="0x7f120748" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_2_monthly" id="0x7f120749" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_2_yearly" id="0x7f12074a" />
-    <public type="string" name="gift_confirmation_body_unknown_error" id="0x7f12074b" />
-    <public type="string" name="gift_confirmation_button_confirm" id="0x7f12074c" />
-    <public type="string" name="gift_confirmation_button_confirm_mobile" id="0x7f12074d" />
-    <public type="string" name="gift_confirmation_button_confirm_subscription" id="0x7f12074e" />
-    <public type="string" name="gift_confirmation_button_fail" id="0x7f12074f" />
-    <public type="string" name="gift_confirmation_button_go_to_library" id="0x7f120750" />
-    <public type="string" name="gift_confirmation_button_noice" id="0x7f120751" />
-    <public type="string" name="gift_confirmation_button_subscription_success" id="0x7f120752" />
-    <public type="string" name="gift_confirmation_button_success_mobile" id="0x7f120753" />
-    <public type="string" name="gift_confirmation_button_success_premium_games" id="0x7f120754" />
-    <public type="string" name="gift_confirmation_header_confirm" id="0x7f120755" />
-    <public type="string" name="gift_confirmation_header_confirm_nitro" id="0x7f120756" />
-    <public type="string" name="gift_confirmation_header_fail" id="0x7f120757" />
-    <public type="string" name="gift_confirmation_header_success" id="0x7f120758" />
-    <public type="string" name="gift_confirmation_header_success_nitro" id="0x7f120759" />
-    <public type="string" name="gift_confirmation_nitro_time_frame_months" id="0x7f12075a" />
-    <public type="string" name="gift_confirmation_nitro_time_frame_years" id="0x7f12075b" />
-    <public type="string" name="gift_embed_body_claimed_other" id="0x7f12075c" />
-    <public type="string" name="gift_embed_body_claimed_self" id="0x7f12075d" />
-    <public type="string" name="gift_embed_body_claimed_self_mobile" id="0x7f12075e" />
-    <public type="string" name="gift_embed_body_claimed_self_subscription" id="0x7f12075f" />
-    <public type="string" name="gift_embed_body_default" id="0x7f120760" />
-    <public type="string" name="gift_embed_body_giveaway" id="0x7f120761" />
-    <public type="string" name="gift_embed_body_no_user_default" id="0x7f120762" />
-    <public type="string" name="gift_embed_body_no_user_giveaway" id="0x7f120763" />
-    <public type="string" name="gift_embed_body_owned" id="0x7f120764" />
-    <public type="string" name="gift_embed_body_owned_mobile" id="0x7f120765" />
-    <public type="string" name="gift_embed_body_requires_verification" id="0x7f120766" />
-    <public type="string" name="gift_embed_body_requires_verification_mobile" id="0x7f120767" />
-    <public type="string" name="gift_embed_body_self" id="0x7f120768" />
-    <public type="string" name="gift_embed_body_subscription_default_months" id="0x7f120769" />
-    <public type="string" name="gift_embed_body_subscription_default_years" id="0x7f12076a" />
-    <public type="string" name="gift_embed_body_subscription_giveaway" id="0x7f12076b" />
-    <public type="string" name="gift_embed_body_subscription_mismatch" id="0x7f12076c" />
-    <public type="string" name="gift_embed_body_subscription_no_user_default_months" id="0x7f12076d" />
-    <public type="string" name="gift_embed_body_subscription_no_user_default_years" id="0x7f12076e" />
-    <public type="string" name="gift_embed_body_subscription_no_user_giveaway" id="0x7f12076f" />
-    <public type="string" name="gift_embed_button_accept" id="0x7f120770" />
-    <public type="string" name="gift_embed_button_cant_accept" id="0x7f120771" />
-    <public type="string" name="gift_embed_button_claimed" id="0x7f120772" />
-    <public type="string" name="gift_embed_button_claiming" id="0x7f120773" />
-    <public type="string" name="gift_embed_button_owned" id="0x7f120774" />
-    <public type="string" name="gift_embed_copies_left" id="0x7f120775" />
-    <public type="string" name="gift_embed_expiration" id="0x7f120776" />
-    <public type="string" name="gift_embed_header_owner_invalid" id="0x7f120777" />
-    <public type="string" name="gift_embed_header_receiver_invalid" id="0x7f120778" />
-    <public type="string" name="gift_embed_info_owner_invalid" id="0x7f120779" />
-    <public type="string" name="gift_embed_info_receiver_invalid" id="0x7f12077a" />
-    <public type="string" name="gift_embed_invalid" id="0x7f12077b" />
-    <public type="string" name="gift_embed_invalid_tagline_other" id="0x7f12077c" />
-    <public type="string" name="gift_embed_invalid_tagline_self" id="0x7f12077d" />
-    <public type="string" name="gift_embed_invalid_title_other" id="0x7f12077e" />
-    <public type="string" name="gift_embed_invalid_title_self" id="0x7f12077f" />
-    <public type="string" name="gift_embed_resolving" id="0x7f120780" />
-    <public type="string" name="gift_embed_subscriptions_left" id="0x7f120781" />
-    <public type="string" name="gift_embed_title" id="0x7f120782" />
-    <public type="string" name="gift_embed_title_self" id="0x7f120783" />
-    <public type="string" name="gift_embed_title_subscription" id="0x7f120784" />
-    <public type="string" name="gift_embed_title_subscription_self" id="0x7f120785" />
-    <public type="string" name="gift_embed_unknown_user" id="0x7f120786" />
-    <public type="string" name="gift_inventory" id="0x7f120787" />
-    <public type="string" name="gift_inventory_copies" id="0x7f120788" />
-    <public type="string" name="gift_inventory_expires_in" id="0x7f120789" />
-    <public type="string" name="gift_inventory_expires_in_mobile" id="0x7f12078a" />
-    <public type="string" name="gift_inventory_generate_help" id="0x7f12078b" />
-    <public type="string" name="gift_inventory_generate_link" id="0x7f12078c" />
-    <public type="string" name="gift_inventory_generate_link_ios" id="0x7f12078d" />
-    <public type="string" name="gift_inventory_hidden" id="0x7f12078e" />
-    <public type="string" name="gift_inventory_no_gifts" id="0x7f12078f" />
-    <public type="string" name="gift_inventory_no_gifts_subtext" id="0x7f120790" />
-    <public type="string" name="gift_inventory_no_gifts_subtext_mobile" id="0x7f120791" />
-    <public type="string" name="gift_inventory_redeem_codes" id="0x7f120792" />
-    <public type="string" name="gift_inventory_select_nitro_gift" id="0x7f120793" />
-    <public type="string" name="gift_inventory_subscription_months" id="0x7f120794" />
-    <public type="string" name="gift_inventory_subscription_years" id="0x7f120795" />
-    <public type="string" name="go_live_changelog_guilds" id="0x7f120796" />
-    <public type="string" name="go_live_hardware_acceleration_unavailable" id="0x7f120797" />
-    <public type="string" name="go_live_hey" id="0x7f120798" />
-    <public type="string" name="go_live_listen" id="0x7f120799" />
-    <public type="string" name="go_live_look" id="0x7f12079a" />
-    <public type="string" name="go_live_modal_application_form_title" id="0x7f12079b" />
-    <public type="string" name="go_live_modal_cta" id="0x7f12079c" />
-    <public type="string" name="go_live_modal_current_channel_form_title" id="0x7f12079d" />
-    <public type="string" name="go_live_modal_description" id="0x7f12079e" />
-    <public type="string" name="go_live_modal_overflow_four_or_more_users" id="0x7f12079f" />
-    <public type="string" name="go_live_modal_overflow_three_users" id="0x7f1207a0" />
-    <public type="string" name="go_live_modal_overflow_two_users" id="0x7f1207a1" />
-    <public type="string" name="go_live_modal_select_channel_form_title" id="0x7f1207a2" />
-    <public type="string" name="go_live_modal_select_channel_placeholder" id="0x7f1207a3" />
-    <public type="string" name="go_live_modal_title" id="0x7f1207a4" />
-    <public type="string" name="go_live_premium_early_access" id="0x7f1207a5" />
-    <public type="string" name="go_live_video_drivers_outdated" id="0x7f1207a6" />
-    <public type="string" name="go_to_developer_portal" id="0x7f1207a7" />
-    <public type="string" name="google_api_key" id="0x7f1207a8" />
-    <public type="string" name="google_app_id" id="0x7f1207a9" />
-    <public type="string" name="google_crash_reporting_api_key" id="0x7f1207aa" />
-    <public type="string" name="google_play" id="0x7f1207ab" />
-    <public type="string" name="google_storage_bucket" id="0x7f1207ac" />
-    <public type="string" name="grant_temporary_membership" id="0x7f1207ad" />
-    <public type="string" name="green" id="0x7f1207ae" />
-    <public type="string" name="grey" id="0x7f1207af" />
-    <public type="string" name="group" id="0x7f1207b0" />
-    <public type="string" name="group_dm" id="0x7f1207b1" />
-    <public type="string" name="group_dm_add_friends" id="0x7f1207b2" />
-    <public type="string" name="group_dm_add_members" id="0x7f1207b3" />
-    <public type="string" name="group_dm_header" id="0x7f1207b4" />
-    <public type="string" name="group_dm_invite_empty" id="0x7f1207b5" />
-    <public type="string" name="group_dm_invite_full_main" id="0x7f1207b6" />
-    <public type="string" name="group_dm_invite_full_sub" id="0x7f1207b7" />
-    <public type="string" name="group_dm_invite_full_sub2" id="0x7f1207b8" />
-    <public type="string" name="group_dm_invite_link_create" id="0x7f1207b9" />
-    <public type="string" name="group_dm_invite_link_example" id="0x7f1207ba" />
-    <public type="string" name="group_dm_invite_link_title" id="0x7f1207bb" />
-    <public type="string" name="group_dm_invite_no_friends" id="0x7f1207bc" />
-    <public type="string" name="group_dm_invite_not_friends" id="0x7f1207bd" />
-    <public type="string" name="group_dm_invite_remaining" id="0x7f1207be" />
-    <public type="string" name="group_dm_invite_successful_mobile" id="0x7f1207bf" />
-    <public type="string" name="group_dm_invite_to" id="0x7f1207c0" />
-    <public type="string" name="group_dm_invite_unselect_users" id="0x7f1207c1" />
-    <public type="string" name="group_dm_invite_will_fill_mobile" id="0x7f1207c2" />
-    <public type="string" name="group_dm_invite_with_name" id="0x7f1207c3" />
-    <public type="string" name="group_dm_search_placeholder" id="0x7f1207c4" />
-    <public type="string" name="group_dm_settings" id="0x7f1207c5" />
-    <public type="string" name="group_name" id="0x7f1207c6" />
-    <public type="string" name="group_owner" id="0x7f1207c7" />
-    <public type="string" name="groups" id="0x7f1207c8" />
-    <public type="string" name="guest_lurker_mode_chat_input_body" id="0x7f1207c9" />
-    <public type="string" name="guest_lurker_mode_chat_input_header" id="0x7f1207ca" />
-    <public type="string" name="guild_discovery_header_e3_games" id="0x7f1207cb" />
-    <public type="string" name="guild_discovery_header_games_you_play" id="0x7f1207cc" />
-    <public type="string" name="guild_discovery_header_popular_servers" id="0x7f1207cd" />
-    <public type="string" name="guild_discovery_header_search_results" id="0x7f1207ce" />
-    <public type="string" name="guild_discovery_header_trending_games" id="0x7f1207cf" />
-    <public type="string" name="guild_discovery_search_empty_description" id="0x7f1207d0" />
-    <public type="string" name="guild_discovery_search_empty_title" id="0x7f1207d1" />
-    <public type="string" name="guild_discovery_search_header" id="0x7f1207d2" />
-    <public type="string" name="guild_discovery_search_label" id="0x7f1207d3" />
-    <public type="string" name="guild_discovery_search_placeholder" id="0x7f1207d4" />
-    <public type="string" name="guild_discovery_search_press_enter" id="0x7f1207d5" />
-    <public type="string" name="guild_discovery_tooltip" id="0x7f1207d6" />
-    <public type="string" name="guild_discovery_trending_game_description" id="0x7f1207d7" />
-    <public type="string" name="guild_discovery_view_button" id="0x7f1207d8" />
-    <public type="string" name="guild_folder_color" id="0x7f1207d9" />
-    <public type="string" name="guild_folder_name" id="0x7f1207da" />
-    <public type="string" name="guild_header_hotspot_tooltip" id="0x7f1207db" />
-    <public type="string" name="guild_members_header" id="0x7f1207dc" />
-    <public type="string" name="guild_members_search_no_result" id="0x7f1207dd" />
-    <public type="string" name="guild_message_notifications_only_mentions" id="0x7f1207de" />
-    <public type="string" name="guild_muted_help_text" id="0x7f1207df" />
-    <public type="string" name="guild_owner" id="0x7f1207e0" />
-    <public type="string" name="guild_partnered" id="0x7f1207e1" />
-    <public type="string" name="guild_popout_unavailable_flavor" id="0x7f1207e2" />
-    <public type="string" name="guild_popout_unavailable_header" id="0x7f1207e3" />
-    <public type="string" name="guild_popout_view_server_button" id="0x7f1207e4" />
-    <public type="string" name="guild_premium" id="0x7f1207e5" />
-    <public type="string" name="guild_security_req_mfa_body" id="0x7f1207e6" />
-    <public type="string" name="guild_security_req_mfa_enable" id="0x7f1207e7" />
-    <public type="string" name="guild_security_req_mfa_guild_disable" id="0x7f1207e8" />
-    <public type="string" name="guild_security_req_mfa_guild_enable" id="0x7f1207e9" />
-    <public type="string" name="guild_security_req_mfa_label" id="0x7f1207ea" />
-    <public type="string" name="guild_security_req_mfa_turn_off" id="0x7f1207eb" />
-    <public type="string" name="guild_security_req_mfa_turn_on" id="0x7f1207ec" />
-    <public type="string" name="guild_settings_action_filter_channel_create" id="0x7f1207ed" />
-    <public type="string" name="guild_settings_action_filter_channel_delete" id="0x7f1207ee" />
-    <public type="string" name="guild_settings_action_filter_channel_overwrite_create" id="0x7f1207ef" />
-    <public type="string" name="guild_settings_action_filter_channel_overwrite_delete" id="0x7f1207f0" />
-    <public type="string" name="guild_settings_action_filter_channel_overwrite_update" id="0x7f1207f1" />
-    <public type="string" name="guild_settings_action_filter_channel_update" id="0x7f1207f2" />
-    <public type="string" name="guild_settings_action_filter_emoji_create" id="0x7f1207f3" />
-    <public type="string" name="guild_settings_action_filter_emoji_delete" id="0x7f1207f4" />
-    <public type="string" name="guild_settings_action_filter_emoji_update" id="0x7f1207f5" />
-    <public type="string" name="guild_settings_action_filter_guild_update" id="0x7f1207f6" />
-    <public type="string" name="guild_settings_action_filter_invite_create" id="0x7f1207f7" />
-    <public type="string" name="guild_settings_action_filter_invite_delete" id="0x7f1207f8" />
-    <public type="string" name="guild_settings_action_filter_invite_update" id="0x7f1207f9" />
-    <public type="string" name="guild_settings_action_filter_member_ban_add" id="0x7f1207fa" />
-    <public type="string" name="guild_settings_action_filter_member_ban_remove" id="0x7f1207fb" />
-    <public type="string" name="guild_settings_action_filter_member_kick" id="0x7f1207fc" />
-    <public type="string" name="guild_settings_action_filter_member_prune" id="0x7f1207fd" />
-    <public type="string" name="guild_settings_action_filter_member_role_update" id="0x7f1207fe" />
-    <public type="string" name="guild_settings_action_filter_member_update" id="0x7f1207ff" />
-    <public type="string" name="guild_settings_action_filter_message_delete" id="0x7f120800" />
-    <public type="string" name="guild_settings_action_filter_role_create" id="0x7f120801" />
-    <public type="string" name="guild_settings_action_filter_role_delete" id="0x7f120802" />
-    <public type="string" name="guild_settings_action_filter_role_update" id="0x7f120803" />
-    <public type="string" name="guild_settings_action_filter_webhook_create" id="0x7f120804" />
-    <public type="string" name="guild_settings_action_filter_webhook_delete" id="0x7f120805" />
-    <public type="string" name="guild_settings_action_filter_webhook_update" id="0x7f120806" />
-    <public type="string" name="guild_settings_audit_log_channel_bitrate_change" id="0x7f120807" />
-    <public type="string" name="guild_settings_audit_log_channel_bitrate_create" id="0x7f120808" />
-    <public type="string" name="guild_settings_audit_log_channel_category_create" id="0x7f120809" />
-    <public type="string" name="guild_settings_audit_log_channel_delete" id="0x7f12080a" />
-    <public type="string" name="guild_settings_audit_log_channel_name_change" id="0x7f12080b" />
-    <public type="string" name="guild_settings_audit_log_channel_name_create" id="0x7f12080c" />
-    <public type="string" name="guild_settings_audit_log_channel_nsfw_disabled" id="0x7f12080d" />
-    <public type="string" name="guild_settings_audit_log_channel_nsfw_enabled" id="0x7f12080e" />
-    <public type="string" name="guild_settings_audit_log_channel_overwrite_create" id="0x7f12080f" />
-    <public type="string" name="guild_settings_audit_log_channel_overwrite_delete" id="0x7f120810" />
-    <public type="string" name="guild_settings_audit_log_channel_overwrite_update" id="0x7f120811" />
-    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_create" id="0x7f120812" />
-    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_denied" id="0x7f120813" />
-    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_granted" id="0x7f120814" />
-    <public type="string" name="guild_settings_audit_log_channel_position_change" id="0x7f120815" />
-    <public type="string" name="guild_settings_audit_log_channel_position_create" id="0x7f120816" />
-    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_change" id="0x7f120817" />
-    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_create" id="0x7f120818" />
-    <public type="string" name="guild_settings_audit_log_channel_text_create" id="0x7f120819" />
-    <public type="string" name="guild_settings_audit_log_channel_topic_change" id="0x7f12081a" />
-    <public type="string" name="guild_settings_audit_log_channel_topic_create" id="0x7f12081b" />
-    <public type="string" name="guild_settings_audit_log_channel_type_change" id="0x7f12081c" />
-    <public type="string" name="guild_settings_audit_log_channel_type_create" id="0x7f12081d" />
-    <public type="string" name="guild_settings_audit_log_channel_update" id="0x7f12081e" />
-    <public type="string" name="guild_settings_audit_log_channel_voice_create" id="0x7f12081f" />
-    <public type="string" name="guild_settings_audit_log_common_reason" id="0x7f120820" />
-    <public type="string" name="guild_settings_audit_log_emoji_create" id="0x7f120821" />
-    <public type="string" name="guild_settings_audit_log_emoji_delete" id="0x7f120822" />
-    <public type="string" name="guild_settings_audit_log_emoji_name_change" id="0x7f120823" />
-    <public type="string" name="guild_settings_audit_log_emoji_name_create" id="0x7f120824" />
-    <public type="string" name="guild_settings_audit_log_emoji_update" id="0x7f120825" />
-    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_change" id="0x7f120826" />
-    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_clear" id="0x7f120827" />
-    <public type="string" name="guild_settings_audit_log_guild_afk_timeout_change" id="0x7f120828" />
-    <public type="string" name="guild_settings_audit_log_guild_banner_hash_change" id="0x7f120829" />
-    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_all_messages" id="0x7f12082a" />
-    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_only_mentions" id="0x7f12082b" />
-    <public type="string" name="guild_settings_audit_log_guild_description_change" id="0x7f12082c" />
-    <public type="string" name="guild_settings_audit_log_guild_description_clear" id="0x7f12082d" />
-    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_all_members" id="0x7f12082e" />
-    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_disable" id="0x7f12082f" />
-    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_members_without_roles" id="0x7f120830" />
-    <public type="string" name="guild_settings_audit_log_guild_icon_hash_change" id="0x7f120831" />
-    <public type="string" name="guild_settings_audit_log_guild_mfa_level_disabled" id="0x7f120832" />
-    <public type="string" name="guild_settings_audit_log_guild_mfa_level_enabled" id="0x7f120833" />
-    <public type="string" name="guild_settings_audit_log_guild_name_change" id="0x7f120834" />
-    <public type="string" name="guild_settings_audit_log_guild_owner_id_change" id="0x7f120835" />
-    <public type="string" name="guild_settings_audit_log_guild_region_change" id="0x7f120836" />
-    <public type="string" name="guild_settings_audit_log_guild_splash_hash_change" id="0x7f120837" />
-    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_change" id="0x7f120838" />
-    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_disable" id="0x7f120839" />
-    <public type="string" name="guild_settings_audit_log_guild_update" id="0x7f12083a" />
-    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_change" id="0x7f12083b" />
-    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_delete" id="0x7f12083c" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_high" id="0x7f12083d" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_low" id="0x7f12083e" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_medium" id="0x7f12083f" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_none" id="0x7f120840" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_very_high" id="0x7f120841" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_change" id="0x7f120842" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_delete" id="0x7f120843" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_disabled" id="0x7f120844" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_enabled" id="0x7f120845" />
-    <public type="string" name="guild_settings_audit_log_invite_channel_create" id="0x7f120846" />
-    <public type="string" name="guild_settings_audit_log_invite_code_create" id="0x7f120847" />
-    <public type="string" name="guild_settings_audit_log_invite_create" id="0x7f120848" />
-    <public type="string" name="guild_settings_audit_log_invite_delete" id="0x7f120849" />
-    <public type="string" name="guild_settings_audit_log_invite_max_age_create" id="0x7f12084a" />
-    <public type="string" name="guild_settings_audit_log_invite_max_age_create_infinite" id="0x7f12084b" />
-    <public type="string" name="guild_settings_audit_log_invite_max_uses_create" id="0x7f12084c" />
-    <public type="string" name="guild_settings_audit_log_invite_max_uses_create_infinite" id="0x7f12084d" />
-    <public type="string" name="guild_settings_audit_log_invite_temporary_off" id="0x7f12084e" />
-    <public type="string" name="guild_settings_audit_log_invite_temporary_on" id="0x7f12084f" />
-    <public type="string" name="guild_settings_audit_log_invite_update" id="0x7f120850" />
-    <public type="string" name="guild_settings_audit_log_load_more" id="0x7f120851" />
-    <public type="string" name="guild_settings_audit_log_member_ban_add" id="0x7f120852" />
-    <public type="string" name="guild_settings_audit_log_member_ban_remove" id="0x7f120853" />
-    <public type="string" name="guild_settings_audit_log_member_deaf_off" id="0x7f120854" />
-    <public type="string" name="guild_settings_audit_log_member_deaf_on" id="0x7f120855" />
-    <public type="string" name="guild_settings_audit_log_member_kick" id="0x7f120856" />
-    <public type="string" name="guild_settings_audit_log_member_mute_off" id="0x7f120857" />
-    <public type="string" name="guild_settings_audit_log_member_mute_on" id="0x7f120858" />
-    <public type="string" name="guild_settings_audit_log_member_nick_change" id="0x7f120859" />
-    <public type="string" name="guild_settings_audit_log_member_nick_create" id="0x7f12085a" />
-    <public type="string" name="guild_settings_audit_log_member_nick_delete" id="0x7f12085b" />
-    <public type="string" name="guild_settings_audit_log_member_prune" id="0x7f12085c" />
-    <public type="string" name="guild_settings_audit_log_member_prune_delete_days" id="0x7f12085d" />
-    <public type="string" name="guild_settings_audit_log_member_role_update" id="0x7f12085e" />
-    <public type="string" name="guild_settings_audit_log_member_roles_add" id="0x7f12085f" />
-    <public type="string" name="guild_settings_audit_log_member_roles_remove" id="0x7f120860" />
-    <public type="string" name="guild_settings_audit_log_member_update" id="0x7f120861" />
-    <public type="string" name="guild_settings_audit_log_message_delete" id="0x7f120862" />
-    <public type="string" name="guild_settings_audit_log_role_color" id="0x7f120863" />
-    <public type="string" name="guild_settings_audit_log_role_color_ios" id="0x7f120864" />
-    <public type="string" name="guild_settings_audit_log_role_color_none" id="0x7f120865" />
-    <public type="string" name="guild_settings_audit_log_role_create" id="0x7f120866" />
-    <public type="string" name="guild_settings_audit_log_role_delete" id="0x7f120867" />
-    <public type="string" name="guild_settings_audit_log_role_hoist_off" id="0x7f120868" />
-    <public type="string" name="guild_settings_audit_log_role_hoist_on" id="0x7f120869" />
-    <public type="string" name="guild_settings_audit_log_role_mentionable_off" id="0x7f12086a" />
-    <public type="string" name="guild_settings_audit_log_role_mentionable_on" id="0x7f12086b" />
-    <public type="string" name="guild_settings_audit_log_role_name_change" id="0x7f12086c" />
-    <public type="string" name="guild_settings_audit_log_role_name_create" id="0x7f12086d" />
-    <public type="string" name="guild_settings_audit_log_role_permissions_denied" id="0x7f12086e" />
-    <public type="string" name="guild_settings_audit_log_role_permissions_granted" id="0x7f12086f" />
-    <public type="string" name="guild_settings_audit_log_role_update" id="0x7f120870" />
-    <public type="string" name="guild_settings_audit_log_time_at_android" id="0x7f120871" />
-    <public type="string" name="guild_settings_audit_log_webhook_avatar" id="0x7f120872" />
-    <public type="string" name="guild_settings_audit_log_webhook_channel_change" id="0x7f120873" />
-    <public type="string" name="guild_settings_audit_log_webhook_channel_create" id="0x7f120874" />
-    <public type="string" name="guild_settings_audit_log_webhook_create" id="0x7f120875" />
-    <public type="string" name="guild_settings_audit_log_webhook_delete" id="0x7f120876" />
-    <public type="string" name="guild_settings_audit_log_webhook_name_change" id="0x7f120877" />
-    <public type="string" name="guild_settings_audit_log_webhook_name_create" id="0x7f120878" />
-    <public type="string" name="guild_settings_audit_log_webhook_update" id="0x7f120879" />
-    <public type="string" name="guild_settings_banner_recommend" id="0x7f12087a" />
-    <public type="string" name="guild_settings_default_notification_settings_intro" id="0x7f12087b" />
-    <public type="string" name="guild_settings_default_notification_settings_protip" id="0x7f12087c" />
-    <public type="string" name="guild_settings_emoji_alias" id="0x7f12087d" />
-    <public type="string" name="guild_settings_emoji_alias_placeholder" id="0x7f12087e" />
-    <public type="string" name="guild_settings_emoji_upload_to_server_message" id="0x7f12087f" />
-    <public type="string" name="guild_settings_enable_discoverable" id="0x7f120880" />
-    <public type="string" name="guild_settings_enable_featurable" id="0x7f120881" />
-    <public type="string" name="guild_settings_featurable_disabled_tooltip" id="0x7f120882" />
-    <public type="string" name="guild_settings_filter_action" id="0x7f120883" />
-    <public type="string" name="guild_settings_filter_all" id="0x7f120884" />
-    <public type="string" name="guild_settings_filter_all_actions" id="0x7f120885" />
-    <public type="string" name="guild_settings_filter_all_users" id="0x7f120886" />
-    <public type="string" name="guild_settings_filter_user" id="0x7f120887" />
-    <public type="string" name="guild_settings_filtered_action" id="0x7f120888" />
-    <public type="string" name="guild_settings_filtered_user" id="0x7f120889" />
-    <public type="string" name="guild_settings_follower_analytics" id="0x7f12088a" />
-    <public type="string" name="guild_settings_follower_analytics_description" id="0x7f12088b" />
-    <public type="string" name="guild_settings_follower_analytics_empty_body" id="0x7f12088c" />
-    <public type="string" name="guild_settings_follower_analytics_empty_header" id="0x7f12088d" />
-    <public type="string" name="guild_settings_follower_analytics_last_updated" id="0x7f12088e" />
-    <public type="string" name="guild_settings_follower_analytics_message_deleted" id="0x7f12088f" />
-    <public type="string" name="guild_settings_follower_analytics_net_gain" id="0x7f120890" />
-    <public type="string" name="guild_settings_follower_analytics_net_gain_tooltip" id="0x7f120891" />
-    <public type="string" name="guild_settings_follower_analytics_net_servers" id="0x7f120892" />
-    <public type="string" name="guild_settings_follower_analytics_post" id="0x7f120893" />
-    <public type="string" name="guild_settings_follower_analytics_reach" id="0x7f120894" />
-    <public type="string" name="guild_settings_follower_analytics_reach_tooltip" id="0x7f120895" />
-    <public type="string" name="guild_settings_follower_analytics_servers_following" id="0x7f120896" />
-    <public type="string" name="guild_settings_follower_analytics_tooltip" id="0x7f120897" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_animated_guild_icon" id="0x7f120898" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_audio_quality" id="0x7f120899" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_emoji" id="0x7f12089a" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_splash" id="0x7f12089b" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_streaming" id="0x7f12089c" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_audio_quality" id="0x7f12089d" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_banner" id="0x7f12089e" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_emoji" id="0x7f12089f" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_streaming" id="0x7f1208a0" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_upload_limit" id="0x7f1208a1" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_audio_quality" id="0x7f1208a2" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_emoji" id="0x7f1208a3" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_upload_limit" id="0x7f1208a4" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_vanity_url" id="0x7f1208a5" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_animated_guild_icon" id="0x7f1208a6" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_splash" id="0x7f1208a7" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_streaming" id="0x7f1208a8" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_banner" id="0x7f1208a9" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_streaming" id="0x7f1208aa" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_3_vanity_url" id="0x7f1208ab" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_audio_quality" id="0x7f1208ac" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_emoji" id="0x7f1208ad" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_upload_limit" id="0x7f1208ae" />
-    <public type="string" name="guild_settings_guild_premium_perks_base_perks" id="0x7f1208af" />
-    <public type="string" name="guild_settings_guild_premium_perks_description_none" id="0x7f1208b0" />
-    <public type="string" name="guild_settings_guild_premium_perks_previous_perks" id="0x7f1208b1" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_none" id="0x7f1208b2" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_tier_1" id="0x7f1208b3" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_tier_2" id="0x7f1208b4" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_tier_3" id="0x7f1208b5" />
-    <public type="string" name="guild_settings_icon_recommend" id="0x7f1208b6" />
-    <public type="string" name="guild_settings_label_audit_log" id="0x7f1208b7" />
-    <public type="string" name="guild_settings_label_audit_log_empty_body" id="0x7f1208b8" />
-    <public type="string" name="guild_settings_label_audit_log_empty_title" id="0x7f1208b9" />
-    <public type="string" name="guild_settings_label_audit_log_error_body" id="0x7f1208ba" />
-    <public type="string" name="guild_settings_label_audit_log_error_title" id="0x7f1208bb" />
-    <public type="string" name="guild_settings_members_all_members" id="0x7f1208bc" />
-    <public type="string" name="guild_settings_members_display_role" id="0x7f1208bd" />
-    <public type="string" name="guild_settings_members_server_members" id="0x7f1208be" />
-    <public type="string" name="guild_settings_overview_boost_unlock" id="0x7f1208bf" />
-    <public type="string" name="guild_settings_overview_boost_unlocked" id="0x7f1208c0" />
-    <public type="string" name="guild_settings_overview_notice" id="0x7f1208c1" />
-    <public type="string" name="guild_settings_overview_tier_info" id="0x7f1208c2" />
-    <public type="string" name="guild_settings_premium_guild_blurb" id="0x7f1208c3" />
-    <public type="string" name="guild_settings_premium_guild_close_hint" id="0x7f1208c4" />
-    <public type="string" name="guild_settings_premium_guild_count_subscribers" id="0x7f1208c5" />
-    <public type="string" name="guild_settings_premium_guild_tier_requirement" id="0x7f1208c6" />
-    <public type="string" name="guild_settings_premium_guild_title" id="0x7f1208c7" />
-    <public type="string" name="guild_settings_premium_guild_unlocked" id="0x7f1208c8" />
-    <public type="string" name="guild_settings_server_banner" id="0x7f1208c9" />
-    <public type="string" name="guild_settings_server_invite_background" id="0x7f1208ca" />
-    <public type="string" name="guild_settings_splash_info" id="0x7f1208cb" />
-    <public type="string" name="guild_settings_splash_recommend" id="0x7f1208cc" />
-    <public type="string" name="guild_settings_title_server_widget" id="0x7f1208cd" />
-    <public type="string" name="guild_settings_widget_embed_help" id="0x7f1208ce" />
-    <public type="string" name="guild_settings_widget_enable_widget" id="0x7f1208cf" />
-    <public type="string" name="guild_verification_text_account_age" id="0x7f1208d0" />
-    <public type="string" name="guild_verification_text_member_age" id="0x7f1208d1" />
-    <public type="string" name="guild_verification_text_not_claimed" id="0x7f1208d2" />
-    <public type="string" name="guild_verification_text_not_phone_verified" id="0x7f1208d3" />
-    <public type="string" name="guild_verification_text_not_verified" id="0x7f1208d4" />
-    <public type="string" name="guild_verified" id="0x7f1208d5" />
-    <public type="string" name="guild_voice_channel_empty_body_mobile" id="0x7f1208d6" />
-    <public type="string" name="guild_voice_channel_empty_header_mobile" id="0x7f1208d7" />
-    <public type="string" name="hardware_acceleration" id="0x7f1208d8" />
-    <public type="string" name="hardware_acceleration_help_text" id="0x7f1208d9" />
-    <public type="string" name="help" id="0x7f1208da" />
-    <public type="string" name="help_desk" id="0x7f1208db" />
-    <public type="string" name="help_missing_manage_roles_permission" id="0x7f1208dc" />
-    <public type="string" name="help_missing_permission" id="0x7f1208dd" />
-    <public type="string" name="help_role_locked" id="0x7f1208de" />
-    <public type="string" name="help_role_locked_mine" id="0x7f1208df" />
-    <public type="string" name="help_singular_permission" id="0x7f1208e0" />
-    <public type="string" name="hide_bottom_view_on_scroll_behavior" id="0x7f1208e1" />
-    <public type="string" name="hide_instant_invites_description" id="0x7f1208e2" />
-    <public type="string" name="hide_instant_invites_label" id="0x7f1208e3" />
-    <public type="string" name="hide_muted" id="0x7f1208e4" />
-    <public type="string" name="hide_muted_channels" id="0x7f1208e5" />
-    <public type="string" name="hide_personal_information_description" id="0x7f1208e6" />
-    <public type="string" name="hide_personal_information_label" id="0x7f1208e7" />
-    <public type="string" name="hold_up" id="0x7f1208e8" />
-    <public type="string" name="home" id="0x7f1208e9" />
-    <public type="string" name="how_to_invite_others" id="0x7f1208ea" />
-    <public type="string" name="hr" id="0x7f1208eb" />
-    <public type="string" name="hu" id="0x7f1208ec" />
-    <public type="string" name="hypesquad_attendee_cta" id="0x7f1208ed" />
-    <public type="string" name="hypesquad_badge_tooltip" id="0x7f1208ee" />
-    <public type="string" name="hypesquad_description_house_1" id="0x7f1208ef" />
-    <public type="string" name="hypesquad_description_house_2" id="0x7f1208f0" />
-    <public type="string" name="hypesquad_description_house_3" id="0x7f1208f1" />
-    <public type="string" name="hypesquad_error_body" id="0x7f1208f2" />
-    <public type="string" name="hypesquad_error_heading" id="0x7f1208f3" />
-    <public type="string" name="hypesquad_heading" id="0x7f1208f4" />
-    <public type="string" name="hypesquad_heading_existing_member" id="0x7f1208f5" />
-    <public type="string" name="hypesquad_house_1" id="0x7f1208f6" />
-    <public type="string" name="hypesquad_house_2" id="0x7f1208f7" />
-    <public type="string" name="hypesquad_house_3" id="0x7f1208f8" />
-    <public type="string" name="hypesquad_join" id="0x7f1208f9" />
-    <public type="string" name="hypesquad_leave_action" id="0x7f1208fa" />
-    <public type="string" name="hypesquad_leave_error" id="0x7f1208fb" />
-    <public type="string" name="hypesquad_leave_prompt" id="0x7f1208fc" />
-    <public type="string" name="hypesquad_membership_heading" id="0x7f1208fd" />
-    <public type="string" name="hypesquad_newsletter_warning" id="0x7f1208fe" />
-    <public type="string" name="hypesquad_online_badge_tooltip" id="0x7f1208ff" />
-    <public type="string" name="hypesquad_perk_description_newsletter" id="0x7f120900" />
-    <public type="string" name="hypesquad_perk_description_profile_badge" id="0x7f120901" />
-    <public type="string" name="hypesquad_perk_description_squad_challenges" id="0x7f120902" />
-    <public type="string" name="hypesquad_perk_title_newsletter" id="0x7f120903" />
-    <public type="string" name="hypesquad_perk_title_profile_badge" id="0x7f120904" />
-    <public type="string" name="hypesquad_perk_title_squad_challenges" id="0x7f120905" />
-    <public type="string" name="hypesquad_perks_heading" id="0x7f120906" />
-    <public type="string" name="hypesquad_question_0_prompt" id="0x7f120907" />
-    <public type="string" name="hypesquad_question_0_response_a" id="0x7f120908" />
-    <public type="string" name="hypesquad_question_0_response_b" id="0x7f120909" />
-    <public type="string" name="hypesquad_question_0_response_c" id="0x7f12090a" />
-    <public type="string" name="hypesquad_question_0_response_d" id="0x7f12090b" />
-    <public type="string" name="hypesquad_question_10_prompt" id="0x7f12090c" />
-    <public type="string" name="hypesquad_question_10_response_a" id="0x7f12090d" />
-    <public type="string" name="hypesquad_question_10_response_b" id="0x7f12090e" />
-    <public type="string" name="hypesquad_question_10_response_c" id="0x7f12090f" />
-    <public type="string" name="hypesquad_question_10_response_d" id="0x7f120910" />
-    <public type="string" name="hypesquad_question_11_prompt" id="0x7f120911" />
-    <public type="string" name="hypesquad_question_11_response_a" id="0x7f120912" />
-    <public type="string" name="hypesquad_question_11_response_b" id="0x7f120913" />
-    <public type="string" name="hypesquad_question_11_response_c" id="0x7f120914" />
-    <public type="string" name="hypesquad_question_11_response_d" id="0x7f120915" />
-    <public type="string" name="hypesquad_question_12_prompt" id="0x7f120916" />
-    <public type="string" name="hypesquad_question_12_response_a" id="0x7f120917" />
-    <public type="string" name="hypesquad_question_12_response_b" id="0x7f120918" />
-    <public type="string" name="hypesquad_question_12_response_c" id="0x7f120919" />
-    <public type="string" name="hypesquad_question_12_response_d" id="0x7f12091a" />
-    <public type="string" name="hypesquad_question_13_prompt" id="0x7f12091b" />
-    <public type="string" name="hypesquad_question_13_response_a" id="0x7f12091c" />
-    <public type="string" name="hypesquad_question_13_response_b" id="0x7f12091d" />
-    <public type="string" name="hypesquad_question_13_response_c" id="0x7f12091e" />
-    <public type="string" name="hypesquad_question_13_response_d" id="0x7f12091f" />
-    <public type="string" name="hypesquad_question_14_prompt" id="0x7f120920" />
-    <public type="string" name="hypesquad_question_14_response_a" id="0x7f120921" />
-    <public type="string" name="hypesquad_question_14_response_b" id="0x7f120922" />
-    <public type="string" name="hypesquad_question_14_response_c" id="0x7f120923" />
-    <public type="string" name="hypesquad_question_14_response_d" id="0x7f120924" />
-    <public type="string" name="hypesquad_question_1_prompt" id="0x7f120925" />
-    <public type="string" name="hypesquad_question_1_response_a" id="0x7f120926" />
-    <public type="string" name="hypesquad_question_1_response_b" id="0x7f120927" />
-    <public type="string" name="hypesquad_question_1_response_c" id="0x7f120928" />
-    <public type="string" name="hypesquad_question_1_response_d" id="0x7f120929" />
-    <public type="string" name="hypesquad_question_2_prompt" id="0x7f12092a" />
-    <public type="string" name="hypesquad_question_2_response_a" id="0x7f12092b" />
-    <public type="string" name="hypesquad_question_2_response_b" id="0x7f12092c" />
-    <public type="string" name="hypesquad_question_2_response_c" id="0x7f12092d" />
-    <public type="string" name="hypesquad_question_2_response_d" id="0x7f12092e" />
-    <public type="string" name="hypesquad_question_3_prompt" id="0x7f12092f" />
-    <public type="string" name="hypesquad_question_3_response_a" id="0x7f120930" />
-    <public type="string" name="hypesquad_question_3_response_b" id="0x7f120931" />
-    <public type="string" name="hypesquad_question_3_response_c" id="0x7f120932" />
-    <public type="string" name="hypesquad_question_3_response_d" id="0x7f120933" />
-    <public type="string" name="hypesquad_question_4_prompt" id="0x7f120934" />
-    <public type="string" name="hypesquad_question_4_response_a" id="0x7f120935" />
-    <public type="string" name="hypesquad_question_4_response_b" id="0x7f120936" />
-    <public type="string" name="hypesquad_question_4_response_c" id="0x7f120937" />
-    <public type="string" name="hypesquad_question_4_response_d" id="0x7f120938" />
-    <public type="string" name="hypesquad_question_5_prompt" id="0x7f120939" />
-    <public type="string" name="hypesquad_question_5_response_a" id="0x7f12093a" />
-    <public type="string" name="hypesquad_question_5_response_b" id="0x7f12093b" />
-    <public type="string" name="hypesquad_question_5_response_c" id="0x7f12093c" />
-    <public type="string" name="hypesquad_question_5_response_d" id="0x7f12093d" />
-    <public type="string" name="hypesquad_question_6_prompt" id="0x7f12093e" />
-    <public type="string" name="hypesquad_question_6_response_a" id="0x7f12093f" />
-    <public type="string" name="hypesquad_question_6_response_b" id="0x7f120940" />
-    <public type="string" name="hypesquad_question_6_response_c" id="0x7f120941" />
-    <public type="string" name="hypesquad_question_6_response_d" id="0x7f120942" />
-    <public type="string" name="hypesquad_question_7_prompt" id="0x7f120943" />
-    <public type="string" name="hypesquad_question_7_response_a" id="0x7f120944" />
-    <public type="string" name="hypesquad_question_7_response_b" id="0x7f120945" />
-    <public type="string" name="hypesquad_question_7_response_c" id="0x7f120946" />
-    <public type="string" name="hypesquad_question_7_response_d" id="0x7f120947" />
-    <public type="string" name="hypesquad_question_8_prompt" id="0x7f120948" />
-    <public type="string" name="hypesquad_question_8_response_a" id="0x7f120949" />
-    <public type="string" name="hypesquad_question_8_response_b" id="0x7f12094a" />
-    <public type="string" name="hypesquad_question_8_response_c" id="0x7f12094b" />
-    <public type="string" name="hypesquad_question_8_response_d" id="0x7f12094c" />
-    <public type="string" name="hypesquad_question_9_prompt" id="0x7f12094d" />
-    <public type="string" name="hypesquad_question_9_response_a" id="0x7f12094e" />
-    <public type="string" name="hypesquad_question_9_response_b" id="0x7f12094f" />
-    <public type="string" name="hypesquad_question_9_response_c" id="0x7f120950" />
-    <public type="string" name="hypesquad_question_9_response_d" id="0x7f120951" />
-    <public type="string" name="hypesquad_quiz_body_house_1" id="0x7f120952" />
-    <public type="string" name="hypesquad_quiz_body_house_2" id="0x7f120953" />
-    <public type="string" name="hypesquad_quiz_body_house_3" id="0x7f120954" />
-    <public type="string" name="hypesquad_quiz_cancel" id="0x7f120955" />
-    <public type="string" name="hypesquad_quiz_close" id="0x7f120956" />
-    <public type="string" name="hypesquad_quiz_completed_modal_title" id="0x7f120957" />
-    <public type="string" name="hypesquad_quiz_error_modal_title" id="0x7f120958" />
-    <public type="string" name="hypesquad_quiz_next_question" id="0x7f120959" />
-    <public type="string" name="hypesquad_quiz_ongoing_modal_title" id="0x7f12095a" />
-    <public type="string" name="hypesquad_quiz_retry" id="0x7f12095b" />
-    <public type="string" name="hypesquad_quiz_select_answer" id="0x7f12095c" />
-    <public type="string" name="hypesquad_quiz_show_my_house" id="0x7f12095d" />
-    <public type="string" name="hypesquad_quiz_title" id="0x7f12095e" />
-    <public type="string" name="hypesquad_ready_to_rep" id="0x7f12095f" />
-    <public type="string" name="hypesquad_subheading" id="0x7f120960" />
-    <public type="string" name="hypesquad_switch_houses_action" id="0x7f120961" />
-    <public type="string" name="hypesquad_switch_houses_prompt" id="0x7f120962" />
-    <public type="string" name="hypesquad_unclaimed_account_notice" id="0x7f120963" />
-    <public type="string" name="hypesquad_unverified_email_notice" id="0x7f120964" />
-    <public type="string" name="hypesquad_your_house" id="0x7f120965" />
-    <public type="string" name="i18n_locale_loading_error" id="0x7f120966" />
-    <public type="string" name="image" id="0x7f120967" />
-    <public type="string" name="images" id="0x7f120968" />
-    <public type="string" name="img_alt_attachment_file_type" id="0x7f120969" />
-    <public type="string" name="img_alt_emoji" id="0x7f12096a" />
-    <public type="string" name="img_alt_icon" id="0x7f12096b" />
-    <public type="string" name="img_alt_logo" id="0x7f12096c" />
-    <public type="string" name="img_alt_navigate_to" id="0x7f12096d" />
-    <public type="string" name="in_a_voice_channel" id="0x7f12096e" />
-    <public type="string" name="in_category" id="0x7f12096f" />
-    <public type="string" name="in_game_voice_settings" id="0x7f120970" />
-    <public type="string" name="in_the_call" id="0x7f120971" />
-    <public type="string" name="in_the_voice_channel" id="0x7f120972" />
-    <public type="string" name="incoming_call" id="0x7f120973" />
-    <public type="string" name="incoming_call_dm" id="0x7f120974" />
-    <public type="string" name="incoming_call_ellipsis" id="0x7f120975" />
-    <public type="string" name="incoming_call_gdm" id="0x7f120976" />
-    <public type="string" name="incoming_friend_request" id="0x7f120977" />
-    <public type="string" name="incoming_video_call" id="0x7f120978" />
-    <public type="string" name="incoming_video_call_ellipsis" id="0x7f120979" />
-    <public type="string" name="incompatible_browser" id="0x7f12097a" />
-    <public type="string" name="inivte_modal_no_thanks" id="0x7f12097b" />
-    <public type="string" name="inline_attachment_media" id="0x7f12097c" />
-    <public type="string" name="inline_attachment_media_help" id="0x7f12097d" />
-    <public type="string" name="inline_embed_media" id="0x7f12097e" />
-    <public type="string" name="inline_media_label" id="0x7f12097f" />
-    <public type="string" name="input_mode_ptt" id="0x7f120980" />
-    <public type="string" name="input_mode_ptt_limited" id="0x7f120981" />
-    <public type="string" name="input_mode_ptt_release_delay" id="0x7f120982" />
-    <public type="string" name="input_mode_vad" id="0x7f120983" />
-    <public type="string" name="instagram" id="0x7f120984" />
-    <public type="string" name="install_location_main" id="0x7f120985" />
-    <public type="string" name="instant_invite" id="0x7f120986" />
-    <public type="string" name="instant_invite_accept" id="0x7f120987" />
-    <public type="string" name="instant_invite_accepted" id="0x7f120988" />
-    <public type="string" name="instant_invite_accepting" id="0x7f120989" />
-    <public type="string" name="instant_invite_ask_for_new_invite" id="0x7f12098a" />
-    <public type="string" name="instant_invite_ask_user_for_new_invite" id="0x7f12098b" />
-    <public type="string" name="instant_invite_banned" id="0x7f12098c" />
-    <public type="string" name="instant_invite_banned_info" id="0x7f12098d" />
-    <public type="string" name="instant_invite_code" id="0x7f12098e" />
-    <public type="string" name="instant_invite_expired" id="0x7f12098f" />
-    <public type="string" name="instant_invite_expires" id="0x7f120990" />
-    <public type="string" name="instant_invite_failed_to_generate" id="0x7f120991" />
-    <public type="string" name="instant_invite_friends" id="0x7f120992" />
-    <public type="string" name="instant_invite_friends_description" id="0x7f120993" />
-    <public type="string" name="instant_invite_generate" id="0x7f120994" />
-    <public type="string" name="instant_invite_generated_by_widget" id="0x7f120995" />
-    <public type="string" name="instant_invite_guild_by_user" id="0x7f120996" />
-    <public type="string" name="instant_invite_guild_members_online" id="0x7f120997" />
-    <public type="string" name="instant_invite_guild_members_total" id="0x7f120998" />
-    <public type="string" name="instant_invite_hidden" id="0x7f120999" />
-    <public type="string" name="instant_invite_invalid_channel" id="0x7f12099a" />
-    <public type="string" name="instant_invite_invite_code" id="0x7f12099b" />
-    <public type="string" name="instant_invite_inviter" id="0x7f12099c" />
-    <public type="string" name="instant_invite_join" id="0x7f12099d" />
-    <public type="string" name="instant_invite_looks_like" id="0x7f12099e" />
-    <public type="string" name="instant_invite_not_allowed" id="0x7f12099f" />
-    <public type="string" name="instant_invite_popout" id="0x7f1209a0" />
-    <public type="string" name="instant_invite_regenerate" id="0x7f1209a1" />
-    <public type="string" name="instant_invite_resolved_body" id="0x7f1209a2" />
-    <public type="string" name="instant_invite_resolved_title" id="0x7f1209a3" />
-    <public type="string" name="instant_invite_resolving" id="0x7f1209a4" />
-    <public type="string" name="instant_invite_uses" id="0x7f1209a5" />
-    <public type="string" name="instant_invite_you_are_already_a_member_of" id="0x7f1209a6" />
-    <public type="string" name="instant_invite_you_have_been_invited_to_join" id="0x7f1209a7" />
-    <public type="string" name="instant_invite_you_have_been_invited_to_join_by_user" id="0x7f1209a8" />
-    <public type="string" name="instant_invite_you_have_been_invited_to_join_group_dm" id="0x7f1209a9" />
-    <public type="string" name="instant_invites" id="0x7f1209aa" />
-    <public type="string" name="integration_settings" id="0x7f1209ab" />
-    <public type="string" name="integrations" id="0x7f1209ac" />
-    <public type="string" name="integrations_header" id="0x7f1209ad" />
-    <public type="string" name="integrations_pro_tip" id="0x7f1209ae" />
-    <public type="string" name="interaction_required_body" id="0x7f1209af" />
-    <public type="string" name="interaction_required_title" id="0x7f1209b0" />
-    <public type="string" name="internal_server_error" id="0x7f1209b1" />
-    <public type="string" name="invalid_animated_emoji_body" id="0x7f1209b2" />
-    <public type="string" name="invalid_animated_emoji_body_upgrade" id="0x7f1209b3" />
-    <public type="string" name="invalid_external_emoji_body" id="0x7f1209b4" />
-    <public type="string" name="invalid_external_emoji_body_upgrade" id="0x7f1209b5" />
-    <public type="string" name="invalid_invite_link_error" id="0x7f1209b6" />
-    <public type="string" name="invalid_request_format" id="0x7f1209b7" />
-    <public type="string" name="invalid_text_channel" id="0x7f1209b8" />
-    <public type="string" name="invalid_voice_channel" id="0x7f1209b9" />
-    <public type="string" name="invite_banner_does_not_expire" id="0x7f1209ba" />
-    <public type="string" name="invite_banner_invite_to_server" id="0x7f1209bb" />
-    <public type="string" name="invite_banner_share_invite_link_for_access" id="0x7f1209bc" />
-    <public type="string" name="invite_button_accepted" id="0x7f1209bd" />
-    <public type="string" name="invite_button_accepting" id="0x7f1209be" />
-    <public type="string" name="invite_button_expired" id="0x7f1209bf" />
-    <public type="string" name="invite_button_expired_owner" id="0x7f1209c0" />
-    <public type="string" name="invite_button_invalid" id="0x7f1209c1" />
-    <public type="string" name="invite_button_invalid_owner" id="0x7f1209c2" />
-    <public type="string" name="invite_button_join" id="0x7f1209c3" />
-    <public type="string" name="invite_button_resolving" id="0x7f1209c4" />
-    <public type="string" name="invite_button_stream_ended" id="0x7f1209c5" />
-    <public type="string" name="invite_button_stream_ended_streamer" id="0x7f1209c6" />
-    <public type="string" name="invite_button_stream_watching" id="0x7f1209c7" />
-    <public type="string" name="invite_button_streamer" id="0x7f1209c8" />
-    <public type="string" name="invite_button_streaming" id="0x7f1209c9" />
-    <public type="string" name="invite_button_streaming_subtext" id="0x7f1209ca" />
-    <public type="string" name="invite_button_title_invited" id="0x7f1209cb" />
-    <public type="string" name="invite_button_title_invited_group_dm" id="0x7f1209cc" />
-    <public type="string" name="invite_button_title_invited_invalid" id="0x7f1209cd" />
-    <public type="string" name="invite_button_title_invited_stream" id="0x7f1209ce" />
-    <public type="string" name="invite_button_title_inviter" id="0x7f1209cf" />
-    <public type="string" name="invite_button_title_inviter_group_dm" id="0x7f1209d0" />
-    <public type="string" name="invite_button_title_inviter_invalid" id="0x7f1209d1" />
-    <public type="string" name="invite_button_title_inviter_stream" id="0x7f1209d2" />
-    <public type="string" name="invite_button_title_streaming" id="0x7f1209d3" />
-    <public type="string" name="invite_copied" id="0x7f1209d4" />
-    <public type="string" name="invite_copy_share_link_header_mobile" id="0x7f1209d5" />
-    <public type="string" name="invite_edit_link" id="0x7f1209d6" />
-    <public type="string" name="invite_embed_full_group" id="0x7f1209d7" />
-    <public type="string" name="invite_embed_full_group_spectate" id="0x7f1209d8" />
-    <public type="string" name="invite_embed_game_has_ended" id="0x7f1209d9" />
-    <public type="string" name="invite_embed_game_invite" id="0x7f1209da" />
-    <public type="string" name="invite_embed_game_not_detected" id="0x7f1209db" />
-    <public type="string" name="invite_embed_in_group" id="0x7f1209dc" />
-    <public type="string" name="invite_embed_invite_to_join" id="0x7f1209dd" />
-    <public type="string" name="invite_embed_invite_to_join_group" id="0x7f1209de" />
-    <public type="string" name="invite_embed_invite_to_listen" id="0x7f1209df" />
-    <public type="string" name="invite_embed_invite_to_spectate" id="0x7f1209e0" />
-    <public type="string" name="invite_embed_invite_to_watch" id="0x7f1209e1" />
-    <public type="string" name="invite_embed_join_via_desktop_app" id="0x7f1209e2" />
-    <public type="string" name="invite_embed_joined" id="0x7f1209e3" />
-    <public type="string" name="invite_embed_listen_has_ended" id="0x7f1209e4" />
-    <public type="string" name="invite_embed_listening_invite" id="0x7f1209e5" />
-    <public type="string" name="invite_embed_num_open_slots" id="0x7f1209e6" />
-    <public type="string" name="invite_embed_num_open_slots_android" id="0x7f1209e7" />
-    <public type="string" name="invite_embed_send_invite" id="0x7f1209e8" />
-    <public type="string" name="invite_embed_spectate" id="0x7f1209e9" />
-    <public type="string" name="invite_embed_spectate_via_desktop_app" id="0x7f1209ea" />
-    <public type="string" name="invite_embed_watch_has_ended" id="0x7f1209eb" />
-    <public type="string" name="invite_expired_subtext_mobile" id="0x7f1209ec" />
-    <public type="string" name="invite_expires_days" id="0x7f1209ed" />
-    <public type="string" name="invite_expires_days_or_uses" id="0x7f1209ee" />
-    <public type="string" name="invite_expires_hours" id="0x7f1209ef" />
-    <public type="string" name="invite_expires_hours_or_uses" id="0x7f1209f0" />
-    <public type="string" name="invite_expires_minutes" id="0x7f1209f1" />
-    <public type="string" name="invite_expires_minutes_or_uses" id="0x7f1209f2" />
-    <public type="string" name="invite_expires_never" id="0x7f1209f3" />
-    <public type="string" name="invite_expires_uses" id="0x7f1209f4" />
-    <public type="string" name="invite_footer_link_header" id="0x7f1209f5" />
-    <public type="string" name="invite_friend_modal_invite" id="0x7f1209f6" />
-    <public type="string" name="invite_friend_modal_loading" id="0x7f1209f7" />
-    <public type="string" name="invite_friend_modal_no_results" id="0x7f1209f8" />
-    <public type="string" name="invite_friend_modal_retry" id="0x7f1209f9" />
-    <public type="string" name="invite_friend_modal_sent" id="0x7f1209fa" />
-    <public type="string" name="invite_friend_modal_subtitle" id="0x7f1209fb" />
-    <public type="string" name="invite_friend_modal_title" id="0x7f1209fc" />
-    <public type="string" name="invite_friends" id="0x7f1209fd" />
-    <public type="string" name="invite_invalid_cta" id="0x7f1209fe" />
-    <public type="string" name="invite_invalid_error" id="0x7f1209ff" />
-    <public type="string" name="invite_link_copied" id="0x7f120a00" />
-    <public type="string" name="invite_link_example_full" id="0x7f120a01" />
-    <public type="string" name="invite_link_example_simple" id="0x7f120a02" />
-    <public type="string" name="invite_link_example_verified" id="0x7f120a03" />
-    <public type="string" name="invite_links_expire_after_1_day" id="0x7f120a04" />
-    <public type="string" name="invite_links_never_expires" id="0x7f120a05" />
-    <public type="string" name="invite_members" id="0x7f120a06" />
-    <public type="string" name="invite_modal_button" id="0x7f120a07" />
-    <public type="string" name="invite_modal_error_default" id="0x7f120a08" />
-    <public type="string" name="invite_modal_error_title" id="0x7f120a09" />
-    <public type="string" name="invite_modal_open_button" id="0x7f120a0a" />
-    <public type="string" name="invite_never_expires_subtext_mobile" id="0x7f120a0b" />
-    <public type="string" name="invite_no_channels" id="0x7f120a0c" />
-    <public type="string" name="invite_no_thanks" id="0x7f120a0d" />
-    <public type="string" name="invite_notice_message" id="0x7f120a0e" />
-    <public type="string" name="invite_notice_message_part_2" id="0x7f120a0f" />
-    <public type="string" name="invite_people" id="0x7f120a10" />
-    <public type="string" name="invite_search_for_friends" id="0x7f120a11" />
-    <public type="string" name="invite_sent" id="0x7f120a12" />
-    <public type="string" name="invite_settings_expired_description" id="0x7f120a13" />
-    <public type="string" name="invite_settings_title" id="0x7f120a14" />
-    <public type="string" name="invite_share_default" id="0x7f120a15" />
-    <public type="string" name="invite_share_link_own_server" id="0x7f120a16" />
-    <public type="string" name="invite_share_link_to_stream" id="0x7f120a17" />
-    <public type="string" name="invite_stream_footer_link_header" id="0x7f120a18" />
-    <public type="string" name="invite_stream_header" id="0x7f120a19" />
-    <public type="string" name="invite_to_server" id="0x7f120a1a" />
-    <public type="string" name="invite_to_server_name" id="0x7f120a1b" />
-    <public type="string" name="invite_to_server_name_experiment" id="0x7f120a1c" />
-    <public type="string" name="invite_url" id="0x7f120a1d" />
-    <public type="string" name="invite_voice_empty_mobile" id="0x7f120a1e" />
-    <public type="string" name="invite_your_friends_header_mobile" id="0x7f120a1f" />
-    <public type="string" name="invite_your_friends_voice_call_mobile" id="0x7f120a20" />
-    <public type="string" name="invites" id="0x7f120a21" />
-    <public type="string" name="ios_camera" id="0x7f120a22" />
-    <public type="string" name="ios_iap_generic_billing_error" id="0x7f120a23" />
-    <public type="string" name="ios_iap_itunes_error" id="0x7f120a24" />
-    <public type="string" name="ios_iap_manage_subscription_button" id="0x7f120a25" />
-    <public type="string" name="ios_iap_manage_subscription_desktop" id="0x7f120a26" />
-    <public type="string" name="ios_iap_restore_subscription_error" id="0x7f120a27" />
-    <public type="string" name="ios_iap_restore_subscription_none_description" id="0x7f120a28" />
-    <public type="string" name="ios_iap_restore_subscription_none_title" id="0x7f120a29" />
-    <public type="string" name="ios_iap_restore_subscription_success" id="0x7f120a2a" />
-    <public type="string" name="ios_iap_testflight_error" id="0x7f120a2b" />
-    <public type="string" name="ios_media_keyboard_browse_photo" id="0x7f120a2c" />
-    <public type="string" name="ios_media_keyboard_enable_in_settings" id="0x7f120a2d" />
-    <public type="string" name="ios_media_keyboard_more_photos" id="0x7f120a2e" />
-    <public type="string" name="ios_media_keyboard_no_permission" id="0x7f120a2f" />
-    <public type="string" name="ios_media_keyboard_no_photos" id="0x7f120a30" />
-    <public type="string" name="ios_media_keyboard_take_a_photo" id="0x7f120a31" />
-    <public type="string" name="ios_notification_see_full" id="0x7f120a32" />
-    <public type="string" name="ios_nuf_chat_with_friends" id="0x7f120a33" />
-    <public type="string" name="ios_nuf_club_or_interest_group" id="0x7f120a34" />
-    <public type="string" name="ios_nuf_gaming_community" id="0x7f120a35" />
-    <public type="string" name="ios_nuf_get_started" id="0x7f120a36" />
-    <public type="string" name="ios_nuf_join_a_friend" id="0x7f120a37" />
-    <public type="string" name="ios_nuf_voice_chat_while_gaming" id="0x7f120a38" />
-    <public type="string" name="ios_nuf_what_do_you_want" id="0x7f120a39" />
-    <public type="string" name="ios_profile_add_friend" id="0x7f120a3a" />
-    <public type="string" name="ios_profile_audio" id="0x7f120a3b" />
-    <public type="string" name="ios_profile_in_voice_call" id="0x7f120a3c" />
-    <public type="string" name="ios_profile_message" id="0x7f120a3d" />
-    <public type="string" name="ios_profile_mutual_friends" id="0x7f120a3e" />
-    <public type="string" name="ios_profile_mutual_friends_placeholder" id="0x7f120a3f" />
-    <public type="string" name="ios_profile_mutual_guilds" id="0x7f120a40" />
-    <public type="string" name="ios_profile_mutual_guilds_placeholder" id="0x7f120a41" />
-    <public type="string" name="ios_profile_open_voice_channel" id="0x7f120a42" />
-    <public type="string" name="ios_profile_pending" id="0x7f120a43" />
-    <public type="string" name="ios_profile_video" id="0x7f120a44" />
-    <public type="string" name="ios_view_all" id="0x7f120a45" />
-    <public type="string" name="ip_address_secured" id="0x7f120a46" />
-    <public type="string" name="ip_authorization_succeeded" id="0x7f120a47" />
-    <public type="string" name="ip_authorization_succeeded_suggestion" id="0x7f120a48" />
-    <public type="string" name="it" id="0x7f120a49" />
-    <public type="string" name="ja" id="0x7f120a4a" />
-    <public type="string" name="join" id="0x7f120a4b" />
-    <public type="string" name="join_afk_channel_body" id="0x7f120a4c" />
-    <public type="string" name="join_call" id="0x7f120a4d" />
-    <public type="string" name="join_server" id="0x7f120a4e" />
-    <public type="string" name="join_server_button_body" id="0x7f120a4f" />
-    <public type="string" name="join_server_button_cta" id="0x7f120a50" />
-    <public type="string" name="join_server_button_cta_mobile" id="0x7f120a51" />
-    <public type="string" name="join_server_button_cta_mobile_desc" id="0x7f120a52" />
-    <public type="string" name="join_server_button_cta_named" id="0x7f120a53" />
-    <public type="string" name="join_server_description" id="0x7f120a54" />
-    <public type="string" name="join_server_description_mobile" id="0x7f120a55" />
-    <public type="string" name="join_server_title" id="0x7f120a56" />
-    <public type="string" name="join_stream" id="0x7f120a57" />
-    <public type="string" name="join_video_call" id="0x7f120a58" />
-    <public type="string" name="join_voice" id="0x7f120a59" />
-    <public type="string" name="join_voice_call" id="0x7f120a5a" />
-    <public type="string" name="join_voice_channel" id="0x7f120a5b" />
-    <public type="string" name="join_voice_channel_cta" id="0x7f120a5c" />
-    <public type="string" name="joined_server" id="0x7f120a5d" />
-    <public type="string" name="joining_server" id="0x7f120a5e" />
-    <public type="string" name="jump" id="0x7f120a5f" />
-    <public type="string" name="jump_to_channel" id="0x7f120a60" />
-    <public type="string" name="jump_to_chat" id="0x7f120a61" />
-    <public type="string" name="jump_to_last_unread_message" id="0x7f120a62" />
-    <public type="string" name="jump_to_present" id="0x7f120a63" />
-    <public type="string" name="keep_permissions" id="0x7f120a64" />
-    <public type="string" name="keybind_activate_overlay_chat" id="0x7f120a65" />
-    <public type="string" name="keybind_conflict" id="0x7f120a66" />
-    <public type="string" name="keybind_description_modal_call_accept" id="0x7f120a67" />
-    <public type="string" name="keybind_description_modal_call_decline" id="0x7f120a68" />
-    <public type="string" name="keybind_description_modal_call_start" id="0x7f120a69" />
-    <public type="string" name="keybind_description_modal_create_dm_group" id="0x7f120a6a" />
-    <public type="string" name="keybind_description_modal_create_guild" id="0x7f120a6b" />
-    <public type="string" name="keybind_description_modal_easter_egg" id="0x7f120a6c" />
-    <public type="string" name="keybind_description_modal_find_conversation" id="0x7f120a6d" />
-    <public type="string" name="keybind_description_modal_focus_text_area" id="0x7f120a6e" />
-    <public type="string" name="keybind_description_modal_jump_to_first_unread" id="0x7f120a6f" />
-    <public type="string" name="keybind_description_modal_mark_channel_read" id="0x7f120a70" />
-    <public type="string" name="keybind_description_modal_mark_server_read" id="0x7f120a71" />
-    <public type="string" name="keybind_description_modal_navigate_channels" id="0x7f120a72" />
-    <public type="string" name="keybind_description_modal_navigate_servers" id="0x7f120a73" />
-    <public type="string" name="keybind_description_modal_quickswitcher" id="0x7f120a74" />
-    <public type="string" name="keybind_description_modal_return_to_audio_channel" id="0x7f120a75" />
-    <public type="string" name="keybind_description_modal_scroll_chat" id="0x7f120a76" />
-    <public type="string" name="keybind_description_modal_search" id="0x7f120a77" />
-    <public type="string" name="keybind_description_modal_search_emojis" id="0x7f120a78" />
-    <public type="string" name="keybind_description_modal_search_gifs" id="0x7f120a79" />
-    <public type="string" name="keybind_description_modal_subtitle" id="0x7f120a7a" />
-    <public type="string" name="keybind_description_modal_title" id="0x7f120a7b" />
-    <public type="string" name="keybind_description_modal_toggle_deafen" id="0x7f120a7c" />
-    <public type="string" name="keybind_description_modal_toggle_help" id="0x7f120a7d" />
-    <public type="string" name="keybind_description_modal_toggle_hotkeys" id="0x7f120a7e" />
-    <public type="string" name="keybind_description_modal_toggle_mentions" id="0x7f120a7f" />
-    <public type="string" name="keybind_description_modal_toggle_mute" id="0x7f120a80" />
-    <public type="string" name="keybind_description_modal_toggle_pins" id="0x7f120a81" />
-    <public type="string" name="keybind_description_modal_toggle_previous_guild" id="0x7f120a82" />
-    <public type="string" name="keybind_description_modal_toggle_users" id="0x7f120a83" />
-    <public type="string" name="keybind_description_modal_unread_channels" id="0x7f120a84" />
-    <public type="string" name="keybind_description_modal_unread_mention_channels" id="0x7f120a85" />
-    <public type="string" name="keybind_description_modal_upload_file" id="0x7f120a86" />
-    <public type="string" name="keybind_description_push_to_mute" id="0x7f120a87" />
-    <public type="string" name="keybind_description_push_to_talk" id="0x7f120a88" />
-    <public type="string" name="keybind_description_push_to_talk_priority" id="0x7f120a89" />
-    <public type="string" name="keybind_description_toggle_deafen" id="0x7f120a8a" />
-    <public type="string" name="keybind_description_toggle_mute" id="0x7f120a8b" />
-    <public type="string" name="keybind_description_toggle_overlay" id="0x7f120a8c" />
-    <public type="string" name="keybind_description_toggle_overlay_input_lock" id="0x7f120a8d" />
-    <public type="string" name="keybind_description_toggle_streamer_mode" id="0x7f120a8e" />
-    <public type="string" name="keybind_description_toggle_voice_mode" id="0x7f120a8f" />
-    <public type="string" name="keybind_description_unassigned" id="0x7f120a90" />
-    <public type="string" name="keybind_push_to_mute" id="0x7f120a91" />
-    <public type="string" name="keybind_push_to_talk" id="0x7f120a92" />
-    <public type="string" name="keybind_push_to_talk_priority" id="0x7f120a93" />
-    <public type="string" name="keybind_toggle_deafen" id="0x7f120a94" />
-    <public type="string" name="keybind_toggle_mute" id="0x7f120a95" />
-    <public type="string" name="keybind_toggle_overlay" id="0x7f120a96" />
-    <public type="string" name="keybind_toggle_overlay_input_lock" id="0x7f120a97" />
-    <public type="string" name="keybind_toggle_stream_mode" id="0x7f120a98" />
-    <public type="string" name="keybind_toggle_voice_mode" id="0x7f120a99" />
-    <public type="string" name="keybind_unassigned" id="0x7f120a9a" />
-    <public type="string" name="keybinds" id="0x7f120a9b" />
-    <public type="string" name="keyboard_behavior_mobile_header" id="0x7f120a9c" />
-    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send" id="0x7f120a9d" />
-    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send_hint" id="0x7f120a9e" />
-    <public type="string" name="kick" id="0x7f120a9f" />
-    <public type="string" name="kick_from_server" id="0x7f120aa0" />
-    <public type="string" name="kick_members" id="0x7f120aa1" />
-    <public type="string" name="kick_members_description" id="0x7f120aa2" />
-    <public type="string" name="kick_user_body" id="0x7f120aa3" />
-    <public type="string" name="kick_user_confirmed" id="0x7f120aa4" />
-    <public type="string" name="kick_user_error_generic" id="0x7f120aa5" />
-    <public type="string" name="kick_user_title" id="0x7f120aa6" />
-    <public type="string" name="ko" id="0x7f120aa7" />
-    <public type="string" name="label_with_online_status" id="0x7f120aa8" />
-    <public type="string" name="language" id="0x7f120aa9" />
-    <public type="string" name="language_not_found" id="0x7f120aaa" />
-    <public type="string" name="language_select" id="0x7f120aab" />
-    <public type="string" name="language_updated" id="0x7f120aac" />
-    <public type="string" name="languages" id="0x7f120aad" />
-    <public type="string" name="last_seen" id="0x7f120aae" />
-    <public type="string" name="last_selected_voice_channel_body" id="0x7f120aaf" />
-    <public type="string" name="last_selected_voice_channel_no" id="0x7f120ab0" />
-    <public type="string" name="last_selected_voice_channel_title" id="0x7f120ab1" />
-    <public type="string" name="last_selected_voice_channel_yes" id="0x7f120ab2" />
-    <public type="string" name="last_sync" id="0x7f120ab3" />
-    <public type="string" name="launch_app" id="0x7f120ab4" />
-    <public type="string" name="learn_more" id="0x7f120ab5" />
-    <public type="string" name="leave_call" id="0x7f120ab6" />
-    <public type="string" name="leave_group_dm" id="0x7f120ab7" />
-    <public type="string" name="leave_group_dm_body" id="0x7f120ab8" />
-    <public type="string" name="leave_group_dm_managed_body" id="0x7f120ab9" />
-    <public type="string" name="leave_group_dm_managed_title" id="0x7f120aba" />
-    <public type="string" name="leave_group_dm_title" id="0x7f120abb" />
-    <public type="string" name="leave_server" id="0x7f120abc" />
-    <public type="string" name="leave_server_body" id="0x7f120abd" />
-    <public type="string" name="leave_server_body_mobile" id="0x7f120abe" />
-    <public type="string" name="leave_server_title" id="0x7f120abf" />
-    <public type="string" name="lfg_active_groups" id="0x7f120ac0" />
-    <public type="string" name="lfg_bump_button" id="0x7f120ac1" />
-    <public type="string" name="lfg_channel_unavailable" id="0x7f120ac2" />
-    <public type="string" name="lfg_create_a_group" id="0x7f120ac3" />
-    <public type="string" name="lfg_create_button" id="0x7f120ac4" />
-    <public type="string" name="lfg_create_placeholder" id="0x7f120ac5" />
-    <public type="string" name="lfg_delete_modal_content" id="0x7f120ac6" />
-    <public type="string" name="lfg_delete_modal_title" id="0x7f120ac7" />
-    <public type="string" name="lfg_edit_modal_cta" id="0x7f120ac8" />
-    <public type="string" name="lfg_edit_modal_description_label" id="0x7f120ac9" />
-    <public type="string" name="lfg_edit_modal_group_size_label" id="0x7f120aca" />
-    <public type="string" name="lfg_edit_modal_title" id="0x7f120acb" />
-    <public type="string" name="lfg_empty_state_note" id="0x7f120acc" />
-    <public type="string" name="lfg_empty_state_note_2" id="0x7f120acd" />
-    <public type="string" name="lfg_empty_state_title" id="0x7f120ace" />
-    <public type="string" name="lfg_expired_banner" id="0x7f120acf" />
-    <public type="string" name="lfg_group_description_required" id="0x7f120ad0" />
-    <public type="string" name="lfg_group_full" id="0x7f120ad1" />
-    <public type="string" name="lfg_groups_looking" id="0x7f120ad2" />
-    <public type="string" name="lfg_join_button" id="0x7f120ad3" />
-    <public type="string" name="lfg_leave_button" id="0x7f120ad4" />
-    <public type="string" name="lfg_listing_age_hours" id="0x7f120ad5" />
-    <public type="string" name="lfg_listing_age_minutes" id="0x7f120ad6" />
-    <public type="string" name="lfg_listing_age_seconds" id="0x7f120ad7" />
-    <public type="string" name="lfg_listing_expiration_explain" id="0x7f120ad8" />
-    <public type="string" name="lfg_listings_channel" id="0x7f120ad9" />
-    <public type="string" name="lfg_manage_group" id="0x7f120ada" />
-    <public type="string" name="lfg_num_players" id="0x7f120adb" />
-    <public type="string" name="lfg_save_button" id="0x7f120adc" />
-    <public type="string" name="lfg_sidebar_description" id="0x7f120add" />
-    <public type="string" name="lfg_sidebar_size" id="0x7f120ade" />
-    <public type="string" name="lfg_sidebar_size_number" id="0x7f120adf" />
-    <public type="string" name="lfg_sidebar_status" id="0x7f120ae0" />
-    <public type="string" name="lfg_sidebar_status_active" id="0x7f120ae1" />
-    <public type="string" name="lfg_sidebar_status_expired" id="0x7f120ae2" />
-    <public type="string" name="lfg_something_went_wrong" id="0x7f120ae3" />
-    <public type="string" name="lfg_spots_available" id="0x7f120ae4" />
-    <public type="string" name="lfg_unknown_member_tooltip" id="0x7f120ae5" />
-    <public type="string" name="lfg_view_button" id="0x7f120ae6" />
-    <public type="string" name="lfg_your_group" id="0x7f120ae7" />
-    <public type="string" name="library" id="0x7f120ae8" />
-    <public type="string" name="light_blue" id="0x7f120ae9" />
-    <public type="string" name="light_green" id="0x7f120aea" />
-    <public type="string" name="light_grey" id="0x7f120aeb" />
-    <public type="string" name="link_account" id="0x7f120aec" />
-    <public type="string" name="link_copied" id="0x7f120aed" />
-    <public type="string" name="link_settings" id="0x7f120aee" />
-    <public type="string" name="link_your_discord_account" id="0x7f120aef" />
-    <public type="string" name="link_your_xbox_account_1" id="0x7f120af0" />
-    <public type="string" name="link_your_xbox_account_2" id="0x7f120af1" />
-    <public type="string" name="linux" id="0x7f120af2" />
-    <public type="string" name="listen_on_spotify" id="0x7f120af3" />
-    <public type="string" name="listening_to" id="0x7f120af4" />
-    <public type="string" name="listings_permissions" id="0x7f120af5" />
-    <public type="string" name="live" id="0x7f120af6" />
-    <public type="string" name="live_beta_description" id="0x7f120af7" />
-    <public type="string" name="live_on_twitch" id="0x7f120af8" />
-    <public type="string" name="live_viewers" id="0x7f120af9" />
-    <public type="string" name="load_image_error" id="0x7f120afa" />
-    <public type="string" name="load_more_messages" id="0x7f120afb" />
-    <public type="string" name="load_reactions_error" id="0x7f120afc" />
-    <public type="string" name="loading" id="0x7f120afd" />
-    <public type="string" name="loading_divider" id="0x7f120afe" />
-    <public type="string" name="loading_your_pin" id="0x7f120aff" />
-    <public type="string" name="lobby" id="0x7f120b00" />
-    <public type="string" name="local_push_notification_guild_verification_body" id="0x7f120b01" />
-    <public type="string" name="locale" id="0x7f120b02" />
-    <public type="string" name="login" id="0x7f120b03" />
-    <public type="string" name="login_body" id="0x7f120b04" />
-    <public type="string" name="login_title" id="0x7f120b05" />
-    <public type="string" name="logout" id="0x7f120b06" />
-    <public type="string" name="lt" id="0x7f120b07" />
-    <public type="string" name="lurker_mode_chat_input_back_button" id="0x7f120b08" />
-    <public type="string" name="lurker_mode_chat_input_button" id="0x7f120b09" />
-    <public type="string" name="lurker_mode_chat_input_message" id="0x7f120b0a" />
-    <public type="string" name="lurker_mode_chat_input_message_ios" id="0x7f120b0b" />
-    <public type="string" name="lurker_mode_view_guild" id="0x7f120b0c" />
-    <public type="string" name="macos" id="0x7f120b0d" />
-    <public type="string" name="magenta" id="0x7f120b0e" />
-    <public type="string" name="manage_channel" id="0x7f120b0f" />
-    <public type="string" name="manage_channel_description" id="0x7f120b10" />
-    <public type="string" name="manage_channels" id="0x7f120b11" />
-    <public type="string" name="manage_channels_description" id="0x7f120b12" />
-    <public type="string" name="manage_emojis" id="0x7f120b13" />
-    <public type="string" name="manage_listings" id="0x7f120b14" />
-    <public type="string" name="manage_listings_description" id="0x7f120b15" />
-    <public type="string" name="manage_messages" id="0x7f120b16" />
-    <public type="string" name="manage_messages_description" id="0x7f120b17" />
-    <public type="string" name="manage_nicknames" id="0x7f120b18" />
-    <public type="string" name="manage_nicknames_description" id="0x7f120b19" />
-    <public type="string" name="manage_permissions" id="0x7f120b1a" />
-    <public type="string" name="manage_permissions_description" id="0x7f120b1b" />
-    <public type="string" name="manage_roles" id="0x7f120b1c" />
-    <public type="string" name="manage_roles_description" id="0x7f120b1d" />
-    <public type="string" name="manage_server" id="0x7f120b1e" />
-    <public type="string" name="manage_server_description" id="0x7f120b1f" />
-    <public type="string" name="manage_user" id="0x7f120b20" />
-    <public type="string" name="manage_user_shorthand" id="0x7f120b21" />
-    <public type="string" name="manage_webhooks" id="0x7f120b22" />
-    <public type="string" name="manage_webhooks_description" id="0x7f120b23" />
-    <public type="string" name="managed_role_explaination" id="0x7f120b24" />
-    <public type="string" name="mark_as_read" id="0x7f120b25" />
-    <public type="string" name="masked_link_body" id="0x7f120b26" />
-    <public type="string" name="masked_link_cancel" id="0x7f120b27" />
-    <public type="string" name="masked_link_confirm" id="0x7f120b28" />
-    <public type="string" name="masked_link_trust_this_domain" id="0x7f120b29" />
-    <public type="string" name="mature_listing_accept" id="0x7f120b2a" />
-    <public type="string" name="mature_listing_decline" id="0x7f120b2b" />
-    <public type="string" name="mature_listing_description" id="0x7f120b2c" />
-    <public type="string" name="mature_listing_title" id="0x7f120b2d" />
-    <public type="string" name="max_age_never" id="0x7f120b2e" />
-    <public type="string" name="max_age_never_description_mobile" id="0x7f120b2f" />
-    <public type="string" name="max_number_of_uses" id="0x7f120b30" />
-    <public type="string" name="max_uses" id="0x7f120b31" />
-    <public type="string" name="max_uses_description_mobile" id="0x7f120b32" />
-    <public type="string" name="me" id="0x7f120b33" />
-    <public type="string" name="media_hint_body" id="0x7f120b34" />
-    <public type="string" name="media_hint_title" id="0x7f120b35" />
-    <public type="string" name="member" id="0x7f120b36" />
-    <public type="string" name="member_list" id="0x7f120b37" />
-    <public type="string" name="member_list_server_owner_help" id="0x7f120b38" />
-    <public type="string" name="members" id="0x7f120b39" />
-    <public type="string" name="members_header" id="0x7f120b3a" />
-    <public type="string" name="members_matching" id="0x7f120b3b" />
-    <public type="string" name="members_search_placeholder" id="0x7f120b3c" />
-    <public type="string" name="mention" id="0x7f120b3d" />
-    <public type="string" name="mention_everyone" id="0x7f120b3e" />
-    <public type="string" name="mention_everyone_autocomplete_description" id="0x7f120b3f" />
-    <public type="string" name="mention_everyone_autocomplete_description_mobile" id="0x7f120b40" />
-    <public type="string" name="mention_everyone_description" id="0x7f120b41" />
-    <public type="string" name="mention_here_autocomplete_description" id="0x7f120b42" />
-    <public type="string" name="mention_here_autocomplete_description_mobile" id="0x7f120b43" />
-    <public type="string" name="mention_role_autocomplete_description_mobile" id="0x7f120b44" />
-    <public type="string" name="mention_users_with_role" id="0x7f120b45" />
-    <public type="string" name="mentions" id="0x7f120b46" />
-    <public type="string" name="mentions_count" id="0x7f120b47" />
-    <public type="string" name="message_display_mode_label" id="0x7f120b48" />
-    <public type="string" name="message_edited" id="0x7f120b49" />
-    <public type="string" name="message_options" id="0x7f120b4a" />
-    <public type="string" name="message_pinned" id="0x7f120b4b" />
-    <public type="string" name="message_preview" id="0x7f120b4c" />
-    <public type="string" name="message_rate_limited_body" id="0x7f120b4d" />
-    <public type="string" name="message_rate_limited_button" id="0x7f120b4e" />
-    <public type="string" name="message_rate_limited_header" id="0x7f120b4f" />
-    <public type="string" name="message_too_long_body" id="0x7f120b50" />
-    <public type="string" name="message_too_long_header" id="0x7f120b51" />
-    <public type="string" name="message_tts" id="0x7f120b52" />
-    <public type="string" name="message_tts_deleted_role" id="0x7f120b53" />
-    <public type="string" name="message_unpinned" id="0x7f120b54" />
-    <public type="string" name="message_warning_mention_everyone_body" id="0x7f120b55" />
-    <public type="string" name="message_warning_mention_everyone_title" id="0x7f120b56" />
-    <public type="string" name="messages" id="0x7f120b57" />
-    <public type="string" name="metacritic_num_critic_ratings" id="0x7f120b58" />
-    <public type="string" name="metacritic_user_score" id="0x7f120b59" />
-    <public type="string" name="metacritic_verdict_generally_favorable" id="0x7f120b5a" />
-    <public type="string" name="metacritic_verdict_generally_unfavorable" id="0x7f120b5b" />
-    <public type="string" name="metacritic_verdict_mixed_or_average" id="0x7f120b5c" />
-    <public type="string" name="metacritic_verdict_overwhelming_dislike" id="0x7f120b5d" />
-    <public type="string" name="metacritic_verdict_universal_acclaim" id="0x7f120b5e" />
-    <public type="string" name="mfa_sms_add_phone" id="0x7f120b5f" />
-    <public type="string" name="mfa_sms_already_enabled" id="0x7f120b60" />
-    <public type="string" name="mfa_sms_auth" id="0x7f120b61" />
-    <public type="string" name="mfa_sms_auth_current_phone" id="0x7f120b62" />
-    <public type="string" name="mfa_sms_auth_sales_pitch" id="0x7f120b63" />
-    <public type="string" name="mfa_sms_confirm_remove_action" id="0x7f120b64" />
-    <public type="string" name="mfa_sms_confirm_remove_body" id="0x7f120b65" />
-    <public type="string" name="mfa_sms_disabled_partner" id="0x7f120b66" />
-    <public type="string" name="mfa_sms_enable" id="0x7f120b67" />
-    <public type="string" name="mfa_sms_enable_subheader" id="0x7f120b68" />
-    <public type="string" name="mfa_sms_phone_number_hide" id="0x7f120b69" />
-    <public type="string" name="mfa_sms_phone_number_reveal" id="0x7f120b6a" />
-    <public type="string" name="mfa_sms_receive_code" id="0x7f120b6b" />
-    <public type="string" name="mfa_sms_remove" id="0x7f120b6c" />
-    <public type="string" name="mfa_sms_resend" id="0x7f120b6d" />
-    <public type="string" name="microphone_permission_error" id="0x7f120b6e" />
-    <public type="string" name="minimum_size" id="0x7f120b6f" />
-    <public type="string" name="missed_an_update" id="0x7f120b70" />
-    <public type="string" name="missing_entitlement_modal_body" id="0x7f120b71" />
-    <public type="string" name="missing_entitlement_modal_body_unknown_application" id="0x7f120b72" />
-    <public type="string" name="missing_entitlement_modal_header" id="0x7f120b73" />
-    <public type="string" name="missing_entitlement_modal_header_unknown_application" id="0x7f120b74" />
-    <public type="string" name="mobile_enable_hardware_scaling" id="0x7f120b75" />
-    <public type="string" name="mobile_enable_hardware_scaling_desc" id="0x7f120b76" />
-    <public type="string" name="moderation" id="0x7f120b77" />
-    <public type="string" name="modify_followed_news_header" id="0x7f120b78" />
-    <public type="string" name="more" id="0x7f120b79" />
-    <public type="string" name="move_from_category_to" id="0x7f120b7a" />
-    <public type="string" name="move_members" id="0x7f120b7b" />
-    <public type="string" name="move_members_description" id="0x7f120b7c" />
-    <public type="string" name="move_to" id="0x7f120b7d" />
-    <public type="string" name="move_to_success" id="0x7f120b7e" />
-    <public type="string" name="mtrl_chip_close_icon_content_description" id="0x7f120b7f" />
-    <public type="string" name="mute" id="0x7f120b80" />
-    <public type="string" name="mute_category" id="0x7f120b81" />
-    <public type="string" name="mute_channel" id="0x7f120b82" />
-    <public type="string" name="mute_channel_old" id="0x7f120b83" />
-    <public type="string" name="mute_during_work" id="0x7f120b84" />
-    <public type="string" name="mute_for_an_hour" id="0x7f120b85" />
-    <public type="string" name="mute_group_dm" id="0x7f120b86" />
-    <public type="string" name="mute_members" id="0x7f120b87" />
-    <public type="string" name="mutual_friends" id="0x7f120b88" />
-    <public type="string" name="mutual_guilds" id="0x7f120b89" />
-    <public type="string" name="n_days" id="0x7f120b8a" />
-    <public type="string" name="need_account" id="0x7f120b8b" />
-    <public type="string" name="network_error_bad_request" id="0x7f120b8c" />
-    <public type="string" name="network_error_cloudflare_intermittent" id="0x7f120b8d" />
-    <public type="string" name="network_error_cloudflare_unauthorized" id="0x7f120b8e" />
-    <public type="string" name="network_error_connection" id="0x7f120b8f" />
-    <public type="string" name="network_error_forbidden" id="0x7f120b90" />
-    <public type="string" name="network_error_request_too_large" id="0x7f120b91" />
-    <public type="string" name="network_error_rest_request" id="0x7f120b92" />
-    <public type="string" name="network_error_ssl" id="0x7f120b93" />
-    <public type="string" name="network_error_unauthorized" id="0x7f120b94" />
-    <public type="string" name="network_error_unknown" id="0x7f120b95" />
-    <public type="string" name="network_error_unknown_host" id="0x7f120b96" />
-    <public type="string" name="network_offline" id="0x7f120b97" />
-    <public type="string" name="nevermind" id="0x7f120b98" />
-    <public type="string" name="new_dm" id="0x7f120b99" />
-    <public type="string" name="new_group_dm" id="0x7f120b9a" />
-    <public type="string" name="new_guilds_dm_allowed" id="0x7f120b9b" />
-    <public type="string" name="new_mentions" id="0x7f120b9c" />
-    <public type="string" name="new_messages" id="0x7f120b9d" />
-    <public type="string" name="new_messages_divider" id="0x7f120b9e" />
-    <public type="string" name="new_messages_estimated" id="0x7f120b9f" />
-    <public type="string" name="new_messages_estimated_with_date" id="0x7f120ba0" />
-    <public type="string" name="new_messages_with_date" id="0x7f120ba1" />
-    <public type="string" name="new_override" id="0x7f120ba2" />
-    <public type="string" name="new_permission" id="0x7f120ba3" />
-    <public type="string" name="new_terms_ack" id="0x7f120ba4" />
-    <public type="string" name="new_terms_continue" id="0x7f120ba5" />
-    <public type="string" name="new_terms_description" id="0x7f120ba6" />
-    <public type="string" name="new_terms_title" id="0x7f120ba7" />
-    <public type="string" name="new_unreads" id="0x7f120ba8" />
-    <public type="string" name="news_channel" id="0x7f120ba9" />
-    <public type="string" name="news_channel_edit_news" id="0x7f120baa" />
-    <public type="string" name="news_channel_publish" id="0x7f120bab" />
-    <public type="string" name="news_channel_publish_news" id="0x7f120bac" />
-    <public type="string" name="news_channel_published" id="0x7f120bad" />
-    <public type="string" name="next" id="0x7f120bae" />
-    <public type="string" name="nickname" id="0x7f120baf" />
-    <public type="string" name="nickname_changed" id="0x7f120bb0" />
-    <public type="string" name="nickname_cleared" id="0x7f120bb1" />
-    <public type="string" name="nl" id="0x7f120bb2" />
-    <public type="string" name="no" id="0x7f120bb3" />
-    <public type="string" name="no_afk_channel" id="0x7f120bb4" />
-    <public type="string" name="no_authorized_apps" id="0x7f120bb5" />
-    <public type="string" name="no_authorized_apps_note" id="0x7f120bb6" />
-    <public type="string" name="no_ban_reason" id="0x7f120bb7" />
-    <public type="string" name="no_bans" id="0x7f120bb8" />
-    <public type="string" name="no_camera_access" id="0x7f120bb9" />
-    <public type="string" name="no_category" id="0x7f120bba" />
-    <public type="string" name="no_channel_description" id="0x7f120bbb" />
-    <public type="string" name="no_emoji" id="0x7f120bbc" />
-    <public type="string" name="no_emoji_body" id="0x7f120bbd" />
-    <public type="string" name="no_emoji_search_results" id="0x7f120bbe" />
-    <public type="string" name="no_emoji_title" id="0x7f120bbf" />
-    <public type="string" name="no_gif_favorites_flavor_favorite_please" id="0x7f120bc0" />
-    <public type="string" name="no_gif_favorites_flavor_still_here" id="0x7f120bc1" />
-    <public type="string" name="no_gif_favorites_go_favorite" id="0x7f120bc2" />
-    <public type="string" name="no_gif_favorites_how_to_favorite" id="0x7f120bc3" />
-    <public type="string" name="no_gif_favorites_where_to_favorite" id="0x7f120bc4" />
-    <public type="string" name="no_gif_search_results" id="0x7f120bc5" />
-    <public type="string" name="no_input_devices" id="0x7f120bc6" />
-    <public type="string" name="no_input_devices_detected" id="0x7f120bc7" />
-    <public type="string" name="no_instant_invite" id="0x7f120bc8" />
-    <public type="string" name="no_integrations" id="0x7f120bc9" />
-    <public type="string" name="no_integrations_body" id="0x7f120bca" />
-    <public type="string" name="no_integrations_label" id="0x7f120bcb" />
-    <public type="string" name="no_invites_body" id="0x7f120bcc" />
-    <public type="string" name="no_invites_caption" id="0x7f120bcd" />
-    <public type="string" name="no_invites_label" id="0x7f120bce" />
-    <public type="string" name="no_mail_account_description" id="0x7f120bcf" />
-    <public type="string" name="no_mail_account_title" id="0x7f120bd0" />
-    <public type="string" name="no_mic_body" id="0x7f120bd1" />
-    <public type="string" name="no_mic_title" id="0x7f120bd2" />
-    <public type="string" name="no_mutual_friends" id="0x7f120bd3" />
-    <public type="string" name="no_mutual_guilds" id="0x7f120bd4" />
-    <public type="string" name="no_output_devices" id="0x7f120bd5" />
-    <public type="string" name="no_photo_in_camera_roll" id="0x7f120bd6" />
-    <public type="string" name="no_photos_access" id="0x7f120bd7" />
-    <public type="string" name="no_pins_in_channel" id="0x7f120bd8" />
-    <public type="string" name="no_pins_in_dm" id="0x7f120bd9" />
-    <public type="string" name="no_private_channels_description" id="0x7f120bda" />
-    <public type="string" name="no_private_channels_title" id="0x7f120bdb" />
-    <public type="string" name="no_reactions_body" id="0x7f120bdc" />
-    <public type="string" name="no_reactions_header" id="0x7f120bdd" />
-    <public type="string" name="no_recent_mentions" id="0x7f120bde" />
-    <public type="string" name="no_send_messages_permission_placeholder" id="0x7f120bdf" />
-    <public type="string" name="no_system_channel" id="0x7f120be0" />
-    <public type="string" name="no_text" id="0x7f120be1" />
-    <public type="string" name="no_thanks" id="0x7f120be2" />
-    <public type="string" name="no_user_limit" id="0x7f120be3" />
-    <public type="string" name="no_video_devices" id="0x7f120be4" />
-    <public type="string" name="noise_cancellation" id="0x7f120be5" />
-    <public type="string" name="noise_suppression" id="0x7f120be6" />
-    <public type="string" name="none" id="0x7f120be7" />
-    <public type="string" name="not_available" id="0x7f120be8" />
-    <public type="string" name="not_in_the_call" id="0x7f120be9" />
-    <public type="string" name="not_in_the_voice_channel" id="0x7f120bea" />
-    <public type="string" name="note" id="0x7f120beb" />
-    <public type="string" name="note_placeholder" id="0x7f120bec" />
-    <public type="string" name="note_placeholder_mobile" id="0x7f120bed" />
-    <public type="string" name="notice_application_test_mode" id="0x7f120bee" />
-    <public type="string" name="notice_application_test_mode_go_to_listing" id="0x7f120bef" />
-    <public type="string" name="notice_connect_spotify" id="0x7f120bf0" />
-    <public type="string" name="notice_connection_conflict" id="0x7f120bf1" />
-    <public type="string" name="notice_corrupt_installation" id="0x7f120bf2" />
-    <public type="string" name="notice_corrupt_installation_help_link_text" id="0x7f120bf3" />
-    <public type="string" name="notice_detected_off_platform_no_premium_perk_message" id="0x7f120bf4" />
-    <public type="string" name="notice_detected_off_platform_premium_perk_button" id="0x7f120bf5" />
-    <public type="string" name="notice_detected_off_platform_premium_perk_message" id="0x7f120bf6" />
-    <public type="string" name="notice_dispatch_api_error" id="0x7f120bf7" />
-    <public type="string" name="notice_dispatch_application_lock_failed" id="0x7f120bf8" />
-    <public type="string" name="notice_dispatch_error" id="0x7f120bf9" />
-    <public type="string" name="notice_dispatch_error_disk_full" id="0x7f120bfa" />
-    <public type="string" name="notice_dispatch_error_disk_low" id="0x7f120bfb" />
-    <public type="string" name="notice_dispatch_error_file_name_too_long" id="0x7f120bfc" />
-    <public type="string" name="notice_dispatch_error_invalid_drive" id="0x7f120bfd" />
-    <public type="string" name="notice_dispatch_error_io_permission_denied" id="0x7f120bfe" />
-    <public type="string" name="notice_dispatch_error_no_manifests" id="0x7f120bff" />
-    <public type="string" name="notice_dispatch_error_not_entitled" id="0x7f120c00" />
-    <public type="string" name="notice_dispatch_error_post_install_cancelled" id="0x7f120c01" />
-    <public type="string" name="notice_dispatch_error_post_install_failed" id="0x7f120c02" />
-    <public type="string" name="notice_dispatch_error_unwritable" id="0x7f120c03" />
-    <public type="string" name="notice_dispatch_error_with_code" id="0x7f120c04" />
-    <public type="string" name="notice_dispatch_install_script_progress" id="0x7f120c05" />
-    <public type="string" name="notice_dispatch_install_script_progress_with_name" id="0x7f120c06" />
-    <public type="string" name="notice_hardware_mute" id="0x7f120c07" />
-    <public type="string" name="notice_mfa_sms_backup" id="0x7f120c08" />
-    <public type="string" name="notice_mfa_sms_backup_button" id="0x7f120c09" />
-    <public type="string" name="notice_native_apps" id="0x7f120c0a" />
-    <public type="string" name="notice_no_input_detected" id="0x7f120c0b" />
-    <public type="string" name="notice_no_input_detected_help_link_text" id="0x7f120c0c" />
-    <public type="string" name="notice_no_input_detected_settings" id="0x7f120c0d" />
-    <public type="string" name="notice_no_input_detected_settings_link_text" id="0x7f120c0e" />
-    <public type="string" name="notice_premium_applications_grandfathered_ended" id="0x7f120c0f" />
-    <public type="string" name="notice_premium_applications_grandfathered_ending" id="0x7f120c10" />
-    <public type="string" name="notice_premium_applications_grandfathered_started" id="0x7f120c11" />
-    <public type="string" name="notice_premium_promo_action" id="0x7f120c12" />
-    <public type="string" name="notice_premium_promo_message" id="0x7f120c13" />
-    <public type="string" name="notice_scheduled_maintenance" id="0x7f120c14" />
-    <public type="string" name="notice_spotify_auto_paused" id="0x7f120c15" />
-    <public type="string" name="notice_streamer_mode_text" id="0x7f120c16" />
-    <public type="string" name="notice_survey_body" id="0x7f120c17" />
-    <public type="string" name="notice_survey_button" id="0x7f120c18" />
-    <public type="string" name="notice_survey_prompt" id="0x7f120c19" />
-    <public type="string" name="notice_unclaimed_account" id="0x7f120c1a" />
-    <public type="string" name="notice_unverified_account" id="0x7f120c1b" />
-    <public type="string" name="notice_video_unsupported_browser" id="0x7f120c1c" />
-    <public type="string" name="notice_whats_this" id="0x7f120c1d" />
-    <public type="string" name="notification_accepted_friend_request" id="0x7f120c1e" />
-    <public type="string" name="notification_body_attachment" id="0x7f120c1f" />
-    <public type="string" name="notification_body_start_game" id="0x7f120c20" />
-    <public type="string" name="notification_dismiss" id="0x7f120c21" />
-    <public type="string" name="notification_message_create_dm_activity_join" id="0x7f120c22" />
-    <public type="string" name="notification_message_create_dm_activity_listen" id="0x7f120c23" />
-    <public type="string" name="notification_message_create_dm_activity_spectate" id="0x7f120c24" />
-    <public type="string" name="notification_message_create_group_dm_activity_join" id="0x7f120c25" />
-    <public type="string" name="notification_message_create_group_dm_activity_listen" id="0x7f120c26" />
-    <public type="string" name="notification_message_create_group_dm_activity_spectate" id="0x7f120c27" />
-    <public type="string" name="notification_message_create_guild_activity_join" id="0x7f120c28" />
-    <public type="string" name="notification_message_create_guild_activity_listen" id="0x7f120c29" />
-    <public type="string" name="notification_message_create_guild_activity_spectate" id="0x7f120c2a" />
-    <public type="string" name="notification_overrides" id="0x7f120c2b" />
-    <public type="string" name="notification_pending_friend_request" id="0x7f120c2c" />
-    <public type="string" name="notification_reply" id="0x7f120c2d" />
-    <public type="string" name="notification_reply_failed" id="0x7f120c2e" />
-    <public type="string" name="notification_reply_success" id="0x7f120c2f" />
-    <public type="string" name="notification_settings" id="0x7f120c30" />
-    <public type="string" name="notification_title_discord" id="0x7f120c31" />
-    <public type="string" name="notification_title_start_game" id="0x7f120c32" />
-    <public type="string" name="notification_voice_status_body" id="0x7f120c33" />
-    <public type="string" name="notification_voice_status_body_no_status" id="0x7f120c34" />
-    <public type="string" name="notification_voice_status_title" id="0x7f120c35" />
-    <public type="string" name="notifications" id="0x7f120c36" />
-    <public type="string" name="notifications_nuf_body" id="0x7f120c37" />
-    <public type="string" name="notifications_nuf_cta" id="0x7f120c38" />
-    <public type="string" name="notifications_nuf_title" id="0x7f120c39" />
-    <public type="string" name="nsfw_accept" id="0x7f120c3a" />
-    <public type="string" name="nsfw_decline" id="0x7f120c3b" />
-    <public type="string" name="nsfw_description" id="0x7f120c3c" />
-    <public type="string" name="nsfw_note" id="0x7f120c3d" />
-    <public type="string" name="nsfw_title" id="0x7f120c3e" />
-    <public type="string" name="nuf_body" id="0x7f120c3f" />
-    <public type="string" name="nuf_body_mobile" id="0x7f120c40" />
-    <public type="string" name="nuf_claim_account_body_1" id="0x7f120c41" />
-    <public type="string" name="nuf_claim_account_body_2" id="0x7f120c42" />
-    <public type="string" name="nuf_claim_account_button" id="0x7f120c43" />
-    <public type="string" name="nuf_claim_account_generic_error" id="0x7f120c44" />
-    <public type="string" name="nuf_claim_account_title" id="0x7f120c45" />
-    <public type="string" name="nuf_create_server_body" id="0x7f120c46" />
-    <public type="string" name="nuf_create_server_button" id="0x7f120c47" />
-    <public type="string" name="nuf_create_server_error" id="0x7f120c48" />
-    <public type="string" name="nuf_create_server_note" id="0x7f120c49" />
-    <public type="string" name="nuf_create_server_title" id="0x7f120c4a" />
-    <public type="string" name="nuf_download_app_body" id="0x7f120c4b" />
-    <public type="string" name="nuf_download_app_button_platform" id="0x7f120c4c" />
-    <public type="string" name="nuf_download_app_button_type" id="0x7f120c4d" />
-    <public type="string" name="nuf_download_app_intro" id="0x7f120c4e" />
-    <public type="string" name="nuf_download_app_title" id="0x7f120c4f" />
-    <public type="string" name="nuf_join_server_body_1" id="0x7f120c50" />
-    <public type="string" name="nuf_join_server_body_2" id="0x7f120c51" />
-    <public type="string" name="nuf_join_server_button" id="0x7f120c52" />
-    <public type="string" name="nuf_join_server_input_label" id="0x7f120c53" />
-    <public type="string" name="nuf_join_server_input_note" id="0x7f120c54" />
-    <public type="string" name="nuf_join_server_title_1" id="0x7f120c55" />
-    <public type="string" name="nuf_join_server_title_2" id="0x7f120c56" />
-    <public type="string" name="nuf_title" id="0x7f120c57" />
-    <public type="string" name="nuf_title_mobile" id="0x7f120c58" />
-    <public type="string" name="nuf_welcome_carousel_1_body_mobile" id="0x7f120c59" />
-    <public type="string" name="nuf_welcome_carousel_1_title_mobile" id="0x7f120c5a" />
-    <public type="string" name="nuf_welcome_carousel_2_body_mobile" id="0x7f120c5b" />
-    <public type="string" name="nuf_welcome_carousel_2_title_mobile" id="0x7f120c5c" />
-    <public type="string" name="nuf_welcome_carousel_3_body_mobile" id="0x7f120c5d" />
-    <public type="string" name="nuf_welcome_carousel_3_title_mobile" id="0x7f120c5e" />
-    <public type="string" name="nuf_welcome_carousel_4_body_mobile" id="0x7f120c5f" />
-    <public type="string" name="nuf_welcome_carousel_4_title_mobile" id="0x7f120c60" />
-    <public type="string" name="nuf_welcome_carousel_5_body_mobile" id="0x7f120c61" />
-    <public type="string" name="nuf_welcome_carousel_5_title_mobile" id="0x7f120c62" />
-    <public type="string" name="num_channels" id="0x7f120c63" />
-    <public type="string" name="num_members" id="0x7f120c64" />
-    <public type="string" name="num_subscribers" id="0x7f120c65" />
-    <public type="string" name="num_users" id="0x7f120c66" />
-    <public type="string" name="nux_overlay_description" id="0x7f120c67" />
-    <public type="string" name="nux_overlay_enable" id="0x7f120c68" />
-    <public type="string" name="nux_overlay_title" id="0x7f120c69" />
-    <public type="string" name="nux_post_reg_join_server_description" id="0x7f120c6a" />
-    <public type="string" name="nux_post_reg_join_server_skip" id="0x7f120c6b" />
-    <public type="string" name="nux_post_reg_join_server_title" id="0x7f120c6c" />
-    <public type="string" name="oauth2_connect_to_discord" id="0x7f120c6d" />
-    <public type="string" name="oauth2_insecure_notice" id="0x7f120c6e" />
-    <public type="string" name="oauth2_insecure_read_notice" id="0x7f120c6f" />
-    <public type="string" name="oauth2_label" id="0x7f120c70" />
-    <public type="string" name="oauth2_message_cta" id="0x7f120c71" />
-    <public type="string" name="oauth2_message_unknown_error" id="0x7f120c72" />
-    <public type="string" name="oauth2_request_invalid_scope" id="0x7f120c73" />
-    <public type="string" name="oauth2_request_missing_param" id="0x7f120c74" />
-    <public type="string" name="oauth2_security_notice" id="0x7f120c75" />
-    <public type="string" name="oauth2_title" id="0x7f120c76" />
-    <public type="string" name="okay" id="0x7f120c77" />
-    <public type="string" name="one_user_typing" id="0x7f120c78" />
-    <public type="string" name="ongoing_call" id="0x7f120c79" />
-    <public type="string" name="ongoing_call_connected_users" id="0x7f120c7a" />
-    <public type="string" name="only_you_can_see_and_delete_these" id="0x7f120c7b" />
-    <public type="string" name="open" id="0x7f120c7c" />
-    <public type="string" name="open_app" id="0x7f120c7d" />
-    <public type="string" name="open_in_browser" id="0x7f120c7e" />
-    <public type="string" name="open_in_theater" id="0x7f120c7f" />
-    <public type="string" name="open_link" id="0x7f120c80" />
-    <public type="string" name="open_original_image" id="0x7f120c81" />
-    <public type="string" name="options" id="0x7f120c82" />
-    <public type="string" name="orange" id="0x7f120c83" />
-    <public type="string" name="other_options" id="0x7f120c84" />
-    <public type="string" name="other_reactions" id="0x7f120c85" />
-    <public type="string" name="others_online" id="0x7f120c86" />
-    <public type="string" name="out_of_date_action" id="0x7f120c87" />
-    <public type="string" name="out_of_date_description" id="0x7f120c88" />
-    <public type="string" name="out_of_date_title" id="0x7f120c89" />
-    <public type="string" name="outgoing_friend_request" id="0x7f120c8a" />
-    <public type="string" name="outgoing_friend_request_delete_msg" id="0x7f120c8b" />
-    <public type="string" name="overlay" id="0x7f120c8c" />
-    <public type="string" name="overlay_channel_chat_hotkey" id="0x7f120c8d" />
-    <public type="string" name="overlay_click_to_jump_to_channel" id="0x7f120c8e" />
-    <public type="string" name="overlay_click_to_unlock" id="0x7f120c8f" />
-    <public type="string" name="overlay_crashed_title" id="0x7f120c90" />
-    <public type="string" name="overlay_explanation" id="0x7f120c91" />
-    <public type="string" name="overlay_friend_calling" id="0x7f120c92" />
-    <public type="string" name="overlay_in_game_preview_header" id="0x7f120c93" />
-    <public type="string" name="overlay_launch_open_tip" id="0x7f120c94" />
-    <public type="string" name="overlay_launch_title" id="0x7f120c95" />
-    <public type="string" name="overlay_link_alert_body" id="0x7f120c96" />
-    <public type="string" name="overlay_link_alert_secondary" id="0x7f120c97" />
-    <public type="string" name="overlay_link_alert_title" id="0x7f120c98" />
-    <public type="string" name="overlay_menu_get_invite" id="0x7f120c99" />
-    <public type="string" name="overlay_menu_open_discord" id="0x7f120c9a" />
-    <public type="string" name="overlay_menu_switch_channels" id="0x7f120c9b" />
-    <public type="string" name="overlay_mobile_required" id="0x7f120c9c" />
-    <public type="string" name="overlay_mobile_toggle_desc" id="0x7f120c9d" />
-    <public type="string" name="overlay_mobile_toggle_label" id="0x7f120c9e" />
-    <public type="string" name="overlay_mobile_unauthed" id="0x7f120c9f" />
-    <public type="string" name="overlay_news_go_live_body" id="0x7f120ca0" />
-    <public type="string" name="overlay_news_go_live_cta" id="0x7f120ca1" />
-    <public type="string" name="overlay_news_text_pinning_body" id="0x7f120ca2" />
-    <public type="string" name="overlay_news_text_pinning_tip" id="0x7f120ca3" />
-    <public type="string" name="overlay_news_text_pinning_title" id="0x7f120ca4" />
-    <public type="string" name="overlay_no_results" id="0x7f120ca5" />
-    <public type="string" name="overlay_notification_incoming_call" id="0x7f120ca6" />
-    <public type="string" name="overlay_notification_settings_disabled" id="0x7f120ca7" />
-    <public type="string" name="overlay_notification_settings_position" id="0x7f120ca8" />
-    <public type="string" name="overlay_notifications_bottom_left" id="0x7f120ca9" />
-    <public type="string" name="overlay_notifications_bottom_right" id="0x7f120caa" />
-    <public type="string" name="overlay_notifications_disabled" id="0x7f120cab" />
-    <public type="string" name="overlay_notifications_settings" id="0x7f120cac" />
-    <public type="string" name="overlay_notifications_top_left" id="0x7f120cad" />
-    <public type="string" name="overlay_notifications_top_right" id="0x7f120cae" />
-    <public type="string" name="overlay_pin_label_tutorial" id="0x7f120caf" />
-    <public type="string" name="overlay_private_channels_empty_state" id="0x7f120cb0" />
-    <public type="string" name="overlay_reload" id="0x7f120cb1" />
-    <public type="string" name="overlay_reset_default_layout" id="0x7f120cb2" />
-    <public type="string" name="overlay_settings" id="0x7f120cb3" />
-    <public type="string" name="overlay_settings_general_tab" id="0x7f120cb4" />
-    <public type="string" name="overlay_settings_title" id="0x7f120cb5" />
-    <public type="string" name="overlay_settings_voice_tab" id="0x7f120cb6" />
-    <public type="string" name="overlay_text_notification_tip" id="0x7f120cb7" />
-    <public type="string" name="overlay_text_notification_tip_unlocked" id="0x7f120cb8" />
-    <public type="string" name="overlay_too_small" id="0x7f120cb9" />
-    <public type="string" name="overlay_unlock_to_answer" id="0x7f120cba" />
-    <public type="string" name="overlay_unlock_to_join" id="0x7f120cbb" />
-    <public type="string" name="overlay_user_chat_hotkey" id="0x7f120cbc" />
-    <public type="string" name="overlay_voice_channels_empty_state" id="0x7f120cbd" />
-    <public type="string" name="overlay_widget_hide_in_game" id="0x7f120cbe" />
-    <public type="string" name="overlay_widget_show_in_game" id="0x7f120cbf" />
-    <public type="string" name="overview" id="0x7f120cc0" />
-    <public type="string" name="overwrite_autocomplete_label" id="0x7f120cc1" />
-    <public type="string" name="overwrite_autocomplete_placeholder" id="0x7f120cc2" />
-    <public type="string" name="overwrite_no_role_to_add" id="0x7f120cc3" />
-    <public type="string" name="pagination_next" id="0x7f120cc4" />
-    <public type="string" name="pagination_page_label" id="0x7f120cc5" />
-    <public type="string" name="pagination_page_of" id="0x7f120cc6" />
-    <public type="string" name="pagination_previous" id="0x7f120cc7" />
-    <public type="string" name="paginator_of_pages" id="0x7f120cc8" />
-    <public type="string" name="partial_outage" id="0x7f120cc9" />
-    <public type="string" name="partial_outage_a11y" id="0x7f120cca" />
-    <public type="string" name="participators" id="0x7f120ccb" />
-    <public type="string" name="participators_compared_to_communicators" id="0x7f120ccc" />
-    <public type="string" name="partner_badge_tooltip" id="0x7f120ccd" />
-    <public type="string" name="party_full" id="0x7f120cce" />
-    <public type="string" name="party_join" id="0x7f120ccf" />
-    <public type="string" name="party_joined" id="0x7f120cd0" />
-    <public type="string" name="party_locked" id="0x7f120cd1" />
-    <public type="string" name="password_length_error" id="0x7f120cd2" />
-    <public type="string" name="password_manager" id="0x7f120cd3" />
-    <public type="string" name="password_manager_info_android" id="0x7f120cd4" />
-    <public type="string" name="password_manager_open_settings" id="0x7f120cd5" />
-    <public type="string" name="password_manager_open_settings_error" id="0x7f120cd6" />
-    <public type="string" name="password_manager_use" id="0x7f120cd7" />
-    <public type="string" name="password_required" id="0x7f120cd8" />
-    <public type="string" name="password_toggle_content_description" id="0x7f120cd9" />
-    <public type="string" name="paste" id="0x7f120cda" />
-    <public type="string" name="paste_and_send" id="0x7f120cdb" />
-    <public type="string" name="path_password_eye" id="0x7f120cdc" />
-    <public type="string" name="path_password_eye_mask_strike_through" id="0x7f120cdd" />
-    <public type="string" name="path_password_eye_mask_visible" id="0x7f120cde" />
-    <public type="string" name="path_password_strike_through" id="0x7f120cdf" />
-    <public type="string" name="pause" id="0x7f120ce0" />
-    <public type="string" name="payment_modal_button_change_card" id="0x7f120ce1" />
-    <public type="string" name="payment_modal_button_change_paypal" id="0x7f120ce2" />
-    <public type="string" name="payment_modal_button_premium" id="0x7f120ce3" />
-    <public type="string" name="payment_modal_button_premium_gift" id="0x7f120ce4" />
-    <public type="string" name="payment_modal_one_month" id="0x7f120ce5" />
-    <public type="string" name="payment_modal_one_year" id="0x7f120ce6" />
-    <public type="string" name="payment_modal_per_month" id="0x7f120ce7" />
-    <public type="string" name="payment_modal_per_year" id="0x7f120ce8" />
-    <public type="string" name="payment_modal_subtitle" id="0x7f120ce9" />
-    <public type="string" name="payment_modal_title_change_card" id="0x7f120cea" />
-    <public type="string" name="payment_modal_title_change_paypal" id="0x7f120ceb" />
-    <public type="string" name="payment_modal_title_new_monthly" id="0x7f120cec" />
-    <public type="string" name="payment_modal_title_new_yearly" id="0x7f120ced" />
-    <public type="string" name="payment_price_change_body" id="0x7f120cee" />
-    <public type="string" name="payment_price_change_title" id="0x7f120cef" />
-    <public type="string" name="payment_source_billing_address" id="0x7f120cf0" />
-    <public type="string" name="payment_source_card_ending" id="0x7f120cf1" />
-    <public type="string" name="payment_source_card_ending_in" id="0x7f120cf2" />
-    <public type="string" name="payment_source_card_expires" id="0x7f120cf3" />
-    <public type="string" name="payment_source_card_number" id="0x7f120cf4" />
-    <public type="string" name="payment_source_confirm_paypal_details" id="0x7f120cf5" />
-    <public type="string" name="payment_source_credit_card" id="0x7f120cf6" />
-    <public type="string" name="payment_source_delete" id="0x7f120cf7" />
-    <public type="string" name="payment_source_delete_disabled_tooltip" id="0x7f120cf8" />
-    <public type="string" name="payment_source_deleted" id="0x7f120cf9" />
-    <public type="string" name="payment_source_edit_help_card" id="0x7f120cfa" />
-    <public type="string" name="payment_source_edit_help_paypal" id="0x7f120cfb" />
-    <public type="string" name="payment_source_edit_saved" id="0x7f120cfc" />
-    <public type="string" name="payment_source_edit_select_state" id="0x7f120cfd" />
-    <public type="string" name="payment_source_edit_title" id="0x7f120cfe" />
-    <public type="string" name="payment_source_expiration_date" id="0x7f120cff" />
-    <public type="string" name="payment_source_expiration_date_placeholder" id="0x7f120d00" />
-    <public type="string" name="payment_source_information" id="0x7f120d01" />
-    <public type="string" name="payment_source_invalid" id="0x7f120d02" />
-    <public type="string" name="payment_source_invalid_help" id="0x7f120d03" />
-    <public type="string" name="payment_source_make_default" id="0x7f120d04" />
-    <public type="string" name="payment_source_name" id="0x7f120d05" />
-    <public type="string" name="payment_source_name_error_required" id="0x7f120d06" />
-    <public type="string" name="payment_source_name_placeholder" id="0x7f120d07" />
-    <public type="string" name="payment_source_payment_request_button_generic" id="0x7f120d08" />
-    <public type="string" name="payment_source_payment_request_button_gpay" id="0x7f120d09" />
-    <public type="string" name="payment_source_payment_request_info_creating" id="0x7f120d0a" />
-    <public type="string" name="payment_source_payment_request_info_loading" id="0x7f120d0b" />
-    <public type="string" name="payment_source_payment_request_info_title" id="0x7f120d0c" />
-    <public type="string" name="payment_source_payment_request_label" id="0x7f120d0d" />
-    <public type="string" name="payment_source_payment_request_unsupported" id="0x7f120d0e" />
-    <public type="string" name="payment_source_paypal" id="0x7f120d0f" />
-    <public type="string" name="payment_source_paypal_account" id="0x7f120d10" />
-    <public type="string" name="payment_source_paypal_details" id="0x7f120d11" />
-    <public type="string" name="payment_source_paypal_loading" id="0x7f120d12" />
-    <public type="string" name="payment_source_paypal_reopen" id="0x7f120d13" />
-    <public type="string" name="payment_source_security_code" id="0x7f120d14" />
-    <public type="string" name="payment_source_title" id="0x7f120d15" />
-    <public type="string" name="payment_source_type" id="0x7f120d16" />
-    <public type="string" name="payment_source_type_select" id="0x7f120d17" />
-    <public type="string" name="payment_sources_add" id="0x7f120d18" />
-    <public type="string" name="payment_steps_go_back" id="0x7f120d19" />
-    <public type="string" name="paypal_account_verifying" id="0x7f120d1a" />
-    <public type="string" name="paypal_callback_error" id="0x7f120d1b" />
-    <public type="string" name="paypal_callback_success" id="0x7f120d1c" />
-    <public type="string" name="pending" id="0x7f120d1d" />
-    <public type="string" name="permission_camera_access_denied" id="0x7f120d1e" />
-    <public type="string" name="permission_helpdesk" id="0x7f120d1f" />
-    <public type="string" name="permission_media_denied" id="0x7f120d20" />
-    <public type="string" name="permission_media_download_denied" id="0x7f120d21" />
-    <public type="string" name="permission_microphone_denied" id="0x7f120d22" />
-    <public type="string" name="permission_override_allow" id="0x7f120d23" />
-    <public type="string" name="permission_override_deny" id="0x7f120d24" />
-    <public type="string" name="permission_override_passthrough" id="0x7f120d25" />
-    <public type="string" name="permission_overrides" id="0x7f120d26" />
-    <public type="string" name="permissions" id="0x7f120d27" />
-    <public type="string" name="permissions_unsynced" id="0x7f120d28" />
-    <public type="string" name="permit_usage_android" id="0x7f120d29" />
-    <public type="string" name="personalization_disable_modal_body" id="0x7f120d2a" />
-    <public type="string" name="personalization_disable_modal_cancel" id="0x7f120d2b" />
-    <public type="string" name="personalization_disable_modal_confirm" id="0x7f120d2c" />
-    <public type="string" name="personalization_disable_modal_title" id="0x7f120d2d" />
-    <public type="string" name="phone" id="0x7f120d2e" />
-    <public type="string" name="pick_a_color" id="0x7f120d2f" />
-    <public type="string" name="pin" id="0x7f120d30" />
-    <public type="string" name="pin_confirm" id="0x7f120d31" />
-    <public type="string" name="pin_message" id="0x7f120d32" />
-    <public type="string" name="pin_message_body" id="0x7f120d33" />
-    <public type="string" name="pin_message_body_mobile" id="0x7f120d34" />
-    <public type="string" name="pin_message_body_private_channel" id="0x7f120d35" />
-    <public type="string" name="pin_message_title" id="0x7f120d36" />
-    <public type="string" name="pin_message_too_many_body" id="0x7f120d37" />
-    <public type="string" name="pin_message_too_many_body_private_channel" id="0x7f120d38" />
-    <public type="string" name="pin_message_too_many_title" id="0x7f120d39" />
-    <public type="string" name="pinned_messages" id="0x7f120d3a" />
-    <public type="string" name="pinned_messages_pro_tip" id="0x7f120d3b" />
-    <public type="string" name="pinned_messages_pro_tip_body_channel" id="0x7f120d3c" />
-    <public type="string" name="pinned_messages_pro_tip_body_dm" id="0x7f120d3d" />
-    <public type="string" name="pinned_messages_pro_tip_body_group_dm" id="0x7f120d3e" />
-    <public type="string" name="pins_disabled_nsfw" id="0x7f120d3f" />
-    <public type="string" name="pl" id="0x7f120d40" />
-    <public type="string" name="platform_android" id="0x7f120d41" />
-    <public type="string" name="platform_android_version" id="0x7f120d42" />
-    <public type="string" name="platform_ios" id="0x7f120d43" />
-    <public type="string" name="platform_ios_version" id="0x7f120d44" />
-    <public type="string" name="platform_linux" id="0x7f120d45" />
-    <public type="string" name="platform_macos" id="0x7f120d46" />
-    <public type="string" name="platform_windows" id="0x7f120d47" />
-    <public type="string" name="play" id="0x7f120d48" />
-    <public type="string" name="play_full_video" id="0x7f120d49" />
-    <public type="string" name="play_stream" id="0x7f120d4a" />
-    <public type="string" name="playing_game" id="0x7f120d4b" />
-    <public type="string" name="popout_player" id="0x7f120d4c" />
-    <public type="string" name="popout_player_opened" id="0x7f120d4d" />
-    <public type="string" name="popout_remove_from_top" id="0x7f120d4e" />
-    <public type="string" name="popout_return" id="0x7f120d4f" />
-    <public type="string" name="popout_stay_on_top" id="0x7f120d50" />
-    <public type="string" name="post_code" id="0x7f120d51" />
-    <public type="string" name="premium" id="0x7f120d52" />
-    <public type="string" name="premium_activated" id="0x7f120d53" />
-    <public type="string" name="premium_alert_error_title" id="0x7f120d54" />
-    <public type="string" name="premium_applications_grandfathered_monthly" id="0x7f120d55" />
-    <public type="string" name="premium_applications_grandfathered_yearly" id="0x7f120d56" />
-    <public type="string" name="premium_applications_subtitle" id="0x7f120d57" />
-    <public type="string" name="premium_applications_title" id="0x7f120d58" />
-    <public type="string" name="premium_badge_tooltip" id="0x7f120d59" />
-    <public type="string" name="premium_cancel_cancel" id="0x7f120d5a" />
-    <public type="string" name="premium_cancel_cancel_mobile" id="0x7f120d5b" />
-    <public type="string" name="premium_cancel_confirm_body_tier_1" id="0x7f120d5c" />
-    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_1" id="0x7f120d5d" />
-    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_2" id="0x7f120d5e" />
-    <public type="string" name="premium_cancel_confirm_body_tier_2" id="0x7f120d5f" />
-    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_1" id="0x7f120d60" />
-    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_2" id="0x7f120d61" />
-    <public type="string" name="premium_cancel_confirm_mobile" id="0x7f120d62" />
-    <public type="string" name="premium_cancel_confirm_new" id="0x7f120d63" />
-    <public type="string" name="premium_cancel_confirm_title" id="0x7f120d64" />
-    <public type="string" name="premium_cancel_failed_body" id="0x7f120d65" />
-    <public type="string" name="premium_canceled" id="0x7f120d66" />
-    <public type="string" name="premium_cant_upgrade_confirm" id="0x7f120d67" />
-    <public type="string" name="premium_change_discriminator_length_error" id="0x7f120d68" />
-    <public type="string" name="premium_change_discriminator_modal_body" id="0x7f120d69" />
-    <public type="string" name="premium_change_discriminator_modal_confirm" id="0x7f120d6a" />
-    <public type="string" name="premium_change_discriminator_modal_header" id="0x7f120d6b" />
-    <public type="string" name="premium_change_discriminator_tooltip" id="0x7f120d6c" />
-    <public type="string" name="premium_change_discriminator_zero_error" id="0x7f120d6d" />
-    <public type="string" name="premium_chat_perks_animated_avatar_and_emoji_mobile" id="0x7f120d6e" />
-    <public type="string" name="premium_chat_perks_custom_emoji_mobile" id="0x7f120d6f" />
-    <public type="string" name="premium_chat_perks_description_animated_avatar_and_emoji" id="0x7f120d70" />
-    <public type="string" name="premium_chat_perks_description_badge" id="0x7f120d71" />
-    <public type="string" name="premium_chat_perks_description_custom_emoji" id="0x7f120d72" />
-    <public type="string" name="premium_chat_perks_description_discriminator" id="0x7f120d73" />
-    <public type="string" name="premium_chat_perks_description_screenshare" id="0x7f120d74" />
-    <public type="string" name="premium_chat_perks_description_streaming" id="0x7f120d75" />
-    <public type="string" name="premium_chat_perks_description_upload_limit" id="0x7f120d76" />
-    <public type="string" name="premium_chat_perks_discriminator_mobile" id="0x7f120d77" />
-    <public type="string" name="premium_chat_perks_premium_guild_subscription" id="0x7f120d78" />
-    <public type="string" name="premium_chat_perks_rep_mobile" id="0x7f120d79" />
-    <public type="string" name="premium_chat_perks_screenshare_mobile" id="0x7f120d7a" />
-    <public type="string" name="premium_chat_perks_simple_title" id="0x7f120d7b" />
-    <public type="string" name="premium_chat_perks_simple_title_mobile" id="0x7f120d7c" />
-    <public type="string" name="premium_chat_perks_streaming_mobile" id="0x7f120d7d" />
-    <public type="string" name="premium_chat_perks_title_animated_avatar_and_emoji" id="0x7f120d7e" />
-    <public type="string" name="premium_chat_perks_title_badge" id="0x7f120d7f" />
-    <public type="string" name="premium_chat_perks_title_custom_emoji" id="0x7f120d80" />
-    <public type="string" name="premium_chat_perks_title_discriminator" id="0x7f120d81" />
-    <public type="string" name="premium_chat_perks_title_screenshare" id="0x7f120d82" />
-    <public type="string" name="premium_chat_perks_title_streaming" id="0x7f120d83" />
-    <public type="string" name="premium_chat_perks_title_upload_limit" id="0x7f120d84" />
-    <public type="string" name="premium_chat_perks_upload_mobile" id="0x7f120d85" />
-    <public type="string" name="premium_classic_payment_gift_blurb_mobile" id="0x7f120d86" />
-    <public type="string" name="premium_code_active_until" id="0x7f120d87" />
-    <public type="string" name="premium_code_redemption_confirmation_blurb" id="0x7f120d88" />
-    <public type="string" name="premium_code_redemption_confirmation_button" id="0x7f120d89" />
-    <public type="string" name="premium_expiring_body_boosting" id="0x7f120d8a" />
-    <public type="string" name="premium_expiring_body_control" id="0x7f120d8b" />
-    <public type="string" name="premium_expiring_body_control_without_games" id="0x7f120d8c" />
-    <public type="string" name="premium_expiring_body_custom_tag" id="0x7f120d8d" />
-    <public type="string" name="premium_expiring_body_emoji" id="0x7f120d8e" />
-    <public type="string" name="premium_expiring_body_generic" id="0x7f120d8f" />
-    <public type="string" name="premium_expiring_callout" id="0x7f120d90" />
-    <public type="string" name="premium_expiring_go_to_settings" id="0x7f120d91" />
-    <public type="string" name="premium_expiring_title" id="0x7f120d92" />
-    <public type="string" name="premium_feature_chat_perks_repositioning_header" id="0x7f120d93" />
-    <public type="string" name="premium_feature_new_chat_perks_header" id="0x7f120d94" />
-    <public type="string" name="premium_feature_new_premium_applications_header" id="0x7f120d95" />
-    <public type="string" name="premium_feature_view_applications" id="0x7f120d96" />
-    <public type="string" name="premium_features_boost_perks_mobile" id="0x7f120d97" />
-    <public type="string" name="premium_features_chat_perks" id="0x7f120d98" />
-    <public type="string" name="premium_features_chat_perks_mobile" id="0x7f120d99" />
-    <public type="string" name="premium_features_enhanced_chat_perks" id="0x7f120d9a" />
-    <public type="string" name="premium_features_game_perks_mobile" id="0x7f120d9b" />
-    <public type="string" name="premium_features_premium_applications" id="0x7f120d9c" />
-    <public type="string" name="premium_features_premium_applications_mobile" id="0x7f120d9d" />
-    <public type="string" name="premium_features_premium_guild_subscriptions" id="0x7f120d9e" />
-    <public type="string" name="premium_game_perks_title_mobile" id="0x7f120d9f" />
-    <public type="string" name="premium_gift_button_label" id="0x7f120da0" />
-    <public type="string" name="premium_gift_button_tooltip" id="0x7f120da1" />
-    <public type="string" name="premium_gift_send" id="0x7f120da2" />
-    <public type="string" name="premium_gift_share_link_ios" id="0x7f120da3" />
-    <public type="string" name="premium_gifting_title" id="0x7f120da4" />
-    <public type="string" name="premium_gifting_title_mobile" id="0x7f120da5" />
-    <public type="string" name="premium_grandfathered_warning" id="0x7f120da6" />
-    <public type="string" name="premium_grandfathered_warning_confirm" id="0x7f120da7" />
-    <public type="string" name="premium_grandfathered_warning_mobile" id="0x7f120da8" />
-    <public type="string" name="premium_grandfathered_warning_title" id="0x7f120da9" />
-    <public type="string" name="premium_guild_cooldown_available_countdown" id="0x7f120daa" />
-    <public type="string" name="premium_guild_features_blurb" id="0x7f120dab" />
-    <public type="string" name="premium_guild_features_customize_guild_description" id="0x7f120dac" />
-    <public type="string" name="premium_guild_features_customize_guild_mobile" id="0x7f120dad" />
-    <public type="string" name="premium_guild_features_customize_guild_title" id="0x7f120dae" />
-    <public type="string" name="premium_guild_features_learn_more_button" id="0x7f120daf" />
-    <public type="string" name="premium_guild_features_learn_more_text" id="0x7f120db0" />
-    <public type="string" name="premium_guild_features_more" id="0x7f120db1" />
-    <public type="string" name="premium_guild_features_new_role_description" id="0x7f120db2" />
-    <public type="string" name="premium_guild_features_new_role_mobile" id="0x7f120db3" />
-    <public type="string" name="premium_guild_features_new_role_title" id="0x7f120db4" />
-    <public type="string" name="premium_guild_features_show_support_description" id="0x7f120db5" />
-    <public type="string" name="premium_guild_features_show_support_mobile" id="0x7f120db6" />
-    <public type="string" name="premium_guild_features_show_support_title" id="0x7f120db7" />
-    <public type="string" name="premium_guild_features_title" id="0x7f120db8" />
-    <public type="string" name="premium_guild_features_upload_sizes_description" id="0x7f120db9" />
-    <public type="string" name="premium_guild_features_upload_sizes_mobile" id="0x7f120dba" />
-    <public type="string" name="premium_guild_features_upload_sizes_title" id="0x7f120dbb" />
-    <public type="string" name="premium_guild_features_upsell_banner_subscribe" id="0x7f120dbc" />
-    <public type="string" name="premium_guild_features_upsell_banner_upgrade" id="0x7f120dbd" />
-    <public type="string" name="premium_guild_header_badge_no_subscribers" id="0x7f120dbe" />
-    <public type="string" name="premium_guild_header_badge_no_tier" id="0x7f120dbf" />
-    <public type="string" name="premium_guild_header_dropdown_nitro_server_subscribe" id="0x7f120dc0" />
-    <public type="string" name="premium_guild_perks_modal_base_perks" id="0x7f120dc1" />
-    <public type="string" name="premium_guild_perks_modal_blurb" id="0x7f120dc2" />
-    <public type="string" name="premium_guild_perks_modal_blurb_mobile_1" id="0x7f120dc3" />
-    <public type="string" name="premium_guild_perks_modal_blurb_mobile_2" id="0x7f120dc4" />
-    <public type="string" name="premium_guild_perks_modal_button_get_premium" id="0x7f120dc5" />
-    <public type="string" name="premium_guild_perks_modal_button_subscribe_this_server" id="0x7f120dc6" />
-    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium" id="0x7f120dc7" />
-    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error" id="0x7f120dc8" />
-    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip" id="0x7f120dc9" />
-    <public type="string" name="premium_guild_perks_modal_header" id="0x7f120dca" />
-    <public type="string" name="premium_guild_perks_modal_header_boost_count" id="0x7f120dcb" />
-    <public type="string" name="premium_guild_perks_modal_level_subscriber_count_tooltip" id="0x7f120dcc" />
-    <public type="string" name="premium_guild_perks_modal_manage_your_subscription" id="0x7f120dcd" />
-    <public type="string" name="premium_guild_perks_modal_no_tiers" id="0x7f120dce" />
-    <public type="string" name="premium_guild_perks_modal_previous_perks" id="0x7f120dcf" />
-    <public type="string" name="premium_guild_perks_modal_tier_zero_surpassed" id="0x7f120dd0" />
-    <public type="string" name="premium_guild_perks_modal_tooltip_already_subscribed_this_server" id="0x7f120dd1" />
-    <public type="string" name="premium_guild_perks_modal_tooltip_already_used_subscription" id="0x7f120dd2" />
-    <public type="string" name="premium_guild_perks_modal_tooltip_cooldown" id="0x7f120dd3" />
-    <public type="string" name="premium_guild_perks_modal_tooltip_gift" id="0x7f120dd4" />
-    <public type="string" name="premium_guild_settings_members_subscribed" id="0x7f120dd5" />
-    <public type="string" name="premium_guild_settings_members_subscribed_needed" id="0x7f120dd6" />
-    <public type="string" name="premium_guild_settings_x_of_y_subscriptions" id="0x7f120dd7" />
-    <public type="string" name="premium_guild_subscribe_confirm_blurb" id="0x7f120dd8" />
-    <public type="string" name="premium_guild_subscribe_confirm_confirmation" id="0x7f120dd9" />
-    <public type="string" name="premium_guild_subscribe_confirm_confirmation_label" id="0x7f120dda" />
-    <public type="string" name="premium_guild_subscribe_confirm_cooldown_warning" id="0x7f120ddb" />
-    <public type="string" name="premium_guild_subscribe_confirm_header" id="0x7f120ddc" />
-    <public type="string" name="premium_guild_subscribe_search_guild_placeholder" id="0x7f120ddd" />
-    <public type="string" name="premium_guild_subscribe_select_guild_header" id="0x7f120dde" />
-    <public type="string" name="premium_guild_subscribe_success_thanks" id="0x7f120ddf" />
-    <public type="string" name="premium_guild_subscription_available_count" id="0x7f120de0" />
-    <public type="string" name="premium_guild_subscription_duration" id="0x7f120de1" />
-    <public type="string" name="premium_guild_subscription_error_mobile" id="0x7f120de2" />
-    <public type="string" name="premium_guild_subscription_error_rate_limit_days" id="0x7f120de3" />
-    <public type="string" name="premium_guild_subscription_error_rate_limit_hours" id="0x7f120de4" />
-    <public type="string" name="premium_guild_subscription_error_rate_limit_minutes" id="0x7f120de5" />
-    <public type="string" name="premium_guild_subscription_no_next_tier" id="0x7f120de6" />
-    <public type="string" name="premium_guild_subscription_notice" id="0x7f120de7" />
-    <public type="string" name="premium_guild_subscription_notice_button" id="0x7f120de8" />
-    <public type="string" name="premium_guild_subscription_notice_small_guild" id="0x7f120de9" />
-    <public type="string" name="premium_guild_subscription_remove_button" id="0x7f120dea" />
-    <public type="string" name="premium_guild_subscription_remove_error_mobile" id="0x7f120deb" />
-    <public type="string" name="premium_guild_subscription_select_server_button" id="0x7f120dec" />
-    <public type="string" name="premium_guild_subscription_subscriber_count_tooltip" id="0x7f120ded" />
-    <public type="string" name="premium_guild_subscription_subtitle" id="0x7f120dee" />
-    <public type="string" name="premium_guild_subscription_subtitle_mobile_1" id="0x7f120def" />
-    <public type="string" name="premium_guild_subscription_subtitle_mobile_2" id="0x7f120df0" />
-    <public type="string" name="premium_guild_subscription_title" id="0x7f120df1" />
-    <public type="string" name="premium_guild_subscription_tooltip" id="0x7f120df2" />
-    <public type="string" name="premium_guild_tier_1" id="0x7f120df3" />
-    <public type="string" name="premium_guild_tier_2" id="0x7f120df4" />
-    <public type="string" name="premium_guild_tier_3" id="0x7f120df5" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_blurb" id="0x7f120df6" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_confirmation" id="0x7f120df7" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning" id="0x7f120df8" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_days" id="0x7f120df9" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours" id="0x7f120dfa" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes" id="0x7f120dfb" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_header" id="0x7f120dfc" />
-    <public type="string" name="premium_included" id="0x7f120dfd" />
-    <public type="string" name="premium_info_monthly" id="0x7f120dfe" />
-    <public type="string" name="premium_info_yearly" id="0x7f120dff" />
-    <public type="string" name="premium_month_subscription" id="0x7f120e00" />
-    <public type="string" name="premium_not_claimed" id="0x7f120e01" />
-    <public type="string" name="premium_not_claimed_body" id="0x7f120e02" />
-    <public type="string" name="premium_not_verified" id="0x7f120e03" />
-    <public type="string" name="premium_not_verified_body" id="0x7f120e04" />
-    <public type="string" name="premium_past_due" id="0x7f120e05" />
-    <public type="string" name="premium_payment_applications_os_warning" id="0x7f120e06" />
-    <public type="string" name="premium_payment_confirmation_blurb_iap" id="0x7f120e07" />
-    <public type="string" name="premium_payment_confirmation_blurb_regular" id="0x7f120e08" />
-    <public type="string" name="premium_payment_confirmation_blurb_with_applications" id="0x7f120e09" />
-    <public type="string" name="premium_payment_confirmation_button_iap" id="0x7f120e0a" />
-    <public type="string" name="premium_payment_confirmation_button_regular" id="0x7f120e0b" />
-    <public type="string" name="premium_payment_gift_blurb" id="0x7f120e0c" />
-    <public type="string" name="premium_payment_gift_blurb_mobile" id="0x7f120e0d" />
-    <public type="string" name="premium_payment_gift_subtext" id="0x7f120e0e" />
-    <public type="string" name="premium_payment_is_gift" id="0x7f120e0f" />
-    <public type="string" name="premium_payment_plan_label_monthly" id="0x7f120e10" />
-    <public type="string" name="premium_payment_plan_label_yearly" id="0x7f120e11" />
-    <public type="string" name="premium_payment_select" id="0x7f120e12" />
-    <public type="string" name="premium_payment_start_trial" id="0x7f120e13" />
-    <public type="string" name="premium_payment_trial_blurb" id="0x7f120e14" />
-    <public type="string" name="premium_payment_trial_note" id="0x7f120e15" />
-    <public type="string" name="premium_payment_trial_two_weeks_free" id="0x7f120e16" />
-    <public type="string" name="premium_plan_month" id="0x7f120e17" />
-    <public type="string" name="premium_plan_month_tier_1" id="0x7f120e18" />
-    <public type="string" name="premium_plan_month_tier_2" id="0x7f120e19" />
-    <public type="string" name="premium_plan_year" id="0x7f120e1a" />
-    <public type="string" name="premium_plan_year_tier_1" id="0x7f120e1b" />
-    <public type="string" name="premium_plan_year_tier_2" id="0x7f120e1c" />
-    <public type="string" name="premium_promo_autocomplete" id="0x7f120e1d" />
-    <public type="string" name="premium_promo_description" id="0x7f120e1e" />
-    <public type="string" name="premium_promo_title" id="0x7f120e1f" />
-    <public type="string" name="premium_required" id="0x7f120e20" />
-    <public type="string" name="premium_required_get_nitro" id="0x7f120e21" />
-    <public type="string" name="premium_restore_subscription_ios" id="0x7f120e22" />
-    <public type="string" name="premium_retention_emoji_picker_description" id="0x7f120e23" />
-    <public type="string" name="premium_retention_emoji_picker_update_payment_information" id="0x7f120e24" />
-    <public type="string" name="premium_settings" id="0x7f120e25" />
-    <public type="string" name="premium_settings_get" id="0x7f120e26" />
-    <public type="string" name="premium_settings_manage" id="0x7f120e27" />
-    <public type="string" name="premium_subscription_policy_hint_ios" id="0x7f120e28" />
-    <public type="string" name="premium_subscription_policy_ios" id="0x7f120e29" />
-    <public type="string" name="premium_subscription_required_body" id="0x7f120e2a" />
-    <public type="string" name="premium_subtitle" id="0x7f120e2b" />
-    <public type="string" name="premium_subtitle_mobile" id="0x7f120e2c" />
-    <public type="string" name="premium_tier_1" id="0x7f120e2d" />
-    <public type="string" name="premium_tier_2" id="0x7f120e2e" />
-    <public type="string" name="premium_tier_2_repositioned_subtitle" id="0x7f120e2f" />
-    <public type="string" name="premium_tier_2_repositioned_title" id="0x7f120e30" />
-    <public type="string" name="premium_title" id="0x7f120e31" />
-    <public type="string" name="premium_title_mobile" id="0x7f120e32" />
-    <public type="string" name="premium_trial_button" id="0x7f120e33" />
-    <public type="string" name="premium_upgrade_cancel" id="0x7f120e34" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_month_year" id="0x7f120e35" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_month_year_verbose" id="0x7f120e36" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month" id="0x7f120e37" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose" id="0x7f120e38" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year" id="0x7f120e39" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose" id="0x7f120e3a" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_year_tier_2_year" id="0x7f120e3b" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_year_tier_2_year_verbose" id="0x7f120e3c" />
-    <public type="string" name="premium_upgrade_confirm_button" id="0x7f120e3d" />
-    <public type="string" name="premium_upgrade_confirm_button_with_price" id="0x7f120e3e" />
-    <public type="string" name="premium_upgrade_confirm_title" id="0x7f120e3f" />
-    <public type="string" name="premium_upgrade_disabled_already_premium" id="0x7f120e40" />
-    <public type="string" name="premium_upgrade_disabled_current_tooltip" id="0x7f120e41" />
-    <public type="string" name="premium_upgrade_disabled_in_trial" id="0x7f120e42" />
-    <public type="string" name="premium_upgrade_disabled_lower_tier_tooltip" id="0x7f120e43" />
-    <public type="string" name="premium_upgrade_disabled_title_mobile" id="0x7f120e44" />
-    <public type="string" name="premium_upgrade_done_body_tier_1" id="0x7f120e45" />
-    <public type="string" name="premium_upgrade_done_body_tier_2" id="0x7f120e46" />
-    <public type="string" name="premium_upgrade_done_body_tier_2_guild_subscribe" id="0x7f120e47" />
-    <public type="string" name="premium_upgrade_done_button_tier_1" id="0x7f120e48" />
-    <public type="string" name="premium_upgrade_done_button_tier_2" id="0x7f120e49" />
-    <public type="string" name="premium_upgrade_failed_body" id="0x7f120e4a" />
-    <public type="string" name="premium_upgrade_required_body" id="0x7f120e4b" />
-    <public type="string" name="premium_upload_promo" id="0x7f120e4c" />
-    <public type="string" name="premium_upsell_animated_avatar_active_mobile" id="0x7f120e4d" />
-    <public type="string" name="premium_upsell_animated_avatar_description_mobile" id="0x7f120e4e" />
-    <public type="string" name="premium_upsell_animated_avatar_passive_mobile" id="0x7f120e4f" />
-    <public type="string" name="premium_upsell_animated_emojis_active_mobile" id="0x7f120e50" />
-    <public type="string" name="premium_upsell_animated_emojis_description_mobile" id="0x7f120e51" />
-    <public type="string" name="premium_upsell_animated_emojis_passive_mobile" id="0x7f120e52" />
-    <public type="string" name="premium_upsell_badge_active_mobile" id="0x7f120e53" />
-    <public type="string" name="premium_upsell_badge_description_mobile" id="0x7f120e54" />
-    <public type="string" name="premium_upsell_badge_passive_mobile" id="0x7f120e55" />
-    <public type="string" name="premium_upsell_emoji_active_mobile" id="0x7f120e56" />
-    <public type="string" name="premium_upsell_emoji_description_mobile" id="0x7f120e57" />
-    <public type="string" name="premium_upsell_emoji_passive_mobile" id="0x7f120e58" />
-    <public type="string" name="premium_upsell_tag_active_mobile" id="0x7f120e59" />
-    <public type="string" name="premium_upsell_tag_description_mobile" id="0x7f120e5a" />
-    <public type="string" name="premium_upsell_tag_passive_mobile" id="0x7f120e5b" />
-    <public type="string" name="premium_upsell_upload_active_mobile" id="0x7f120e5c" />
-    <public type="string" name="premium_upsell_upload_description_mobile" id="0x7f120e5d" />
-    <public type="string" name="premium_upsell_upload_passive_mobile" id="0x7f120e5e" />
-    <public type="string" name="premium_year_free_months" id="0x7f120e5f" />
-    <public type="string" name="premium_year_free_months_short" id="0x7f120e60" />
-    <public type="string" name="premium_year_subscription" id="0x7f120e61" />
-    <public type="string" name="preorder_sku_name" id="0x7f120e62" />
-    <public type="string" name="preview_chat" id="0x7f120e63" />
-    <public type="string" name="priority_speaker" id="0x7f120e64" />
-    <public type="string" name="priority_speaker_description" id="0x7f120e65" />
-    <public type="string" name="priority_speaker_description_app" id="0x7f120e66" />
-    <public type="string" name="privacy_and_safety" id="0x7f120e67" />
-    <public type="string" name="privacy_policy" id="0x7f120e68" />
-    <public type="string" name="privacy_policy_url" id="0x7f120e69" />
-    <public type="string" name="privacy_settings" id="0x7f120e6a" />
-    <public type="string" name="private_category" id="0x7f120e6b" />
-    <public type="string" name="private_category_note" id="0x7f120e6c" />
-    <public type="string" name="private_channel" id="0x7f120e6d" />
-    <public type="string" name="private_channel_note" id="0x7f120e6e" />
-    <public type="string" name="profile" id="0x7f120e6f" />
-    <public type="string" name="project_id" id="0x7f120e70" />
-    <public type="string" name="prune" id="0x7f120e71" />
-    <public type="string" name="prune_members" id="0x7f120e72" />
-    <public type="string" name="pt_br" id="0x7f120e73" />
-    <public type="string" name="ptt_limited_body" id="0x7f120e74" />
-    <public type="string" name="ptt_limited_title" id="0x7f120e75" />
-    <public type="string" name="ptt_limited_warning" id="0x7f120e76" />
-    <public type="string" name="ptt_permission_body" id="0x7f120e77" />
-    <public type="string" name="ptt_permission_title" id="0x7f120e78" />
-    <public type="string" name="publish_followed_news_body" id="0x7f120e79" />
-    <public type="string" name="publish_followed_news_body_reach" id="0x7f120e7a" />
-    <public type="string" name="publish_followed_news_body_settings" id="0x7f120e7b" />
-    <public type="string" name="publish_followed_news_body_stats" id="0x7f120e7c" />
-    <public type="string" name="publish_followed_news_fail_body" id="0x7f120e7d" />
-    <public type="string" name="publish_followed_news_fail_title" id="0x7f120e7e" />
-    <public type="string" name="publish_followed_news_generic_body" id="0x7f120e7f" />
-    <public type="string" name="purple" id="0x7f120e80" />
-    <public type="string" name="quality_indicator" id="0x7f120e81" />
-    <public type="string" name="quick_dm_blocked" id="0x7f120e82" />
-    <public type="string" name="quick_dm_user" id="0x7f120e83" />
-    <public type="string" name="quick_launcher_empty_text" id="0x7f120e84" />
-    <public type="string" name="quick_launcher_empty_text_v2" id="0x7f120e85" />
-    <public type="string" name="quick_launcher_header" id="0x7f120e86" />
-    <public type="string" name="quick_switcher" id="0x7f120e87" />
-    <public type="string" name="quickswitcher_drafts" id="0x7f120e88" />
-    <public type="string" name="quickswitcher_empty_cta" id="0x7f120e89" />
-    <public type="string" name="quickswitcher_empty_text" id="0x7f120e8a" />
-    <public type="string" name="quickswitcher_last_channel" id="0x7f120e8b" />
-    <public type="string" name="quickswitcher_mentions" id="0x7f120e8c" />
-    <public type="string" name="quickswitcher_notice" id="0x7f120e8d" />
-    <public type="string" name="quickswitcher_placeholder" id="0x7f120e8e" />
-    <public type="string" name="quickswitcher_querymode_applications" id="0x7f120e8f" />
-    <public type="string" name="quickswitcher_querymode_guilds" id="0x7f120e90" />
-    <public type="string" name="quickswitcher_querymode_text_channels" id="0x7f120e91" />
-    <public type="string" name="quickswitcher_querymode_users" id="0x7f120e92" />
-    <public type="string" name="quickswitcher_querymode_voice_channels" id="0x7f120e93" />
-    <public type="string" name="quickswitcher_tip_nav" id="0x7f120e94" />
-    <public type="string" name="quickswitcher_tip_select" id="0x7f120e95" />
-    <public type="string" name="quickswitcher_tutorial_message_search" id="0x7f120e96" />
-    <public type="string" name="quickswitcher_tutorial_message_select" id="0x7f120e97" />
-    <public type="string" name="quickswitcher_unread_channels" id="0x7f120e98" />
-    <public type="string" name="quote_attribution" id="0x7f120e99" />
-    <public type="string" name="quote_attribution_facebook" id="0x7f120e9a" />
-    <public type="string" name="quote_attribution_instagram" id="0x7f120e9b" />
-    <public type="string" name="rate_limited" id="0x7f120e9c" />
-    <public type="string" name="rate_limited_retry_after" id="0x7f120e9d" />
-    <public type="string" name="rating_request_body_android" id="0x7f120e9e" />
-    <public type="string" name="rating_request_title" id="0x7f120e9f" />
-    <public type="string" name="reaction_tooltip_1" id="0x7f120ea0" />
-    <public type="string" name="reaction_tooltip_1_n" id="0x7f120ea1" />
-    <public type="string" name="reaction_tooltip_2" id="0x7f120ea2" />
-    <public type="string" name="reaction_tooltip_2_n" id="0x7f120ea3" />
-    <public type="string" name="reaction_tooltip_3" id="0x7f120ea4" />
-    <public type="string" name="reaction_tooltip_3_n" id="0x7f120ea5" />
-    <public type="string" name="reaction_tooltip_n" id="0x7f120ea6" />
-    <public type="string" name="reactions" id="0x7f120ea7" />
-    <public type="string" name="reactions_matching" id="0x7f120ea8" />
-    <public type="string" name="read_message_history" id="0x7f120ea9" />
-    <public type="string" name="read_messages" id="0x7f120eaa" />
-    <public type="string" name="read_messages_view_channels" id="0x7f120eab" />
-    <public type="string" name="read_only_channel" id="0x7f120eac" />
-    <public type="string" name="ready" id="0x7f120ead" />
-    <public type="string" name="recent_mentions" id="0x7f120eae" />
-    <public type="string" name="recent_mentions_direct_only" id="0x7f120eaf" />
-    <public type="string" name="recent_mentions_everyone_and_direct" id="0x7f120eb0" />
-    <public type="string" name="recent_mentions_filter_everyone" id="0x7f120eb1" />
-    <public type="string" name="recent_mentions_filter_explain_everything" id="0x7f120eb2" />
-    <public type="string" name="recent_mentions_filter_label" id="0x7f120eb3" />
-    <public type="string" name="recent_mentions_filter_roles" id="0x7f120eb4" />
-    <public type="string" name="recent_mentions_pro_tip" id="0x7f120eb5" />
-    <public type="string" name="recent_mentions_roles_and_direct" id="0x7f120eb6" />
-    <public type="string" name="reconnect" id="0x7f120eb7" />
-    <public type="string" name="reconnecting" id="0x7f120eb8" />
-    <public type="string" name="refund" id="0x7f120eb9" />
-    <public type="string" name="region" id="0x7f120eba" />
-    <public type="string" name="region_select_footer" id="0x7f120ebb" />
-    <public type="string" name="region_select_header" id="0x7f120ebc" />
-    <public type="string" name="register" id="0x7f120ebd" />
-    <public type="string" name="register_account" id="0x7f120ebe" />
-    <public type="string" name="register_body" id="0x7f120ebf" />
-    <public type="string" name="register_title" id="0x7f120ec0" />
-    <public type="string" name="remove" id="0x7f120ec1" />
-    <public type="string" name="remove_all_reactions" id="0x7f120ec2" />
-    <public type="string" name="remove_all_reactions_confirm_body" id="0x7f120ec3" />
-    <public type="string" name="remove_all_reactions_confirm_title" id="0x7f120ec4" />
-    <public type="string" name="remove_friend" id="0x7f120ec5" />
-    <public type="string" name="remove_friend_body" id="0x7f120ec6" />
-    <public type="string" name="remove_friend_title" id="0x7f120ec7" />
-    <public type="string" name="remove_from_group" id="0x7f120ec8" />
-    <public type="string" name="remove_icon" id="0x7f120ec9" />
-    <public type="string" name="remove_keybind" id="0x7f120eca" />
-    <public type="string" name="remove_reaction" id="0x7f120ecb" />
-    <public type="string" name="remove_role_or_user" id="0x7f120ecc" />
-    <public type="string" name="remove_synced_role" id="0x7f120ecd" />
-    <public type="string" name="remove_vanity_url" id="0x7f120ece" />
-    <public type="string" name="render_embeds" id="0x7f120ecf" />
-    <public type="string" name="render_embeds_label" id="0x7f120ed0" />
-    <public type="string" name="render_reactions" id="0x7f120ed1" />
-    <public type="string" name="report" id="0x7f120ed2" />
-    <public type="string" name="report_message" id="0x7f120ed3" />
-    <public type="string" name="report_server" id="0x7f120ed4" />
-    <public type="string" name="report_title" id="0x7f120ed5" />
-    <public type="string" name="report_user" id="0x7f120ed6" />
-    <public type="string" name="reported" id="0x7f120ed7" />
-    <public type="string" name="request_permission_msg" id="0x7f120ed8" />
-    <public type="string" name="resend" id="0x7f120ed9" />
-    <public type="string" name="resend_code" id="0x7f120eda" />
-    <public type="string" name="resend_email" id="0x7f120edb" />
-    <public type="string" name="resend_message" id="0x7f120edc" />
-    <public type="string" name="resend_verification_email" id="0x7f120edd" />
-    <public type="string" name="reset" id="0x7f120ede" />
-    <public type="string" name="reset_nickname" id="0x7f120edf" />
-    <public type="string" name="reset_notification_override" id="0x7f120ee0" />
-    <public type="string" name="reset_notification_settings" id="0x7f120ee1" />
-    <public type="string" name="reset_password_title" id="0x7f120ee2" />
-    <public type="string" name="reset_to_default" id="0x7f120ee3" />
-    <public type="string" name="reset_voice_settings" id="0x7f120ee4" />
-    <public type="string" name="reset_voice_settings_body" id="0x7f120ee5" />
-    <public type="string" name="resubscribe" id="0x7f120ee6" />
-    <public type="string" name="retry" id="0x7f120ee7" />
-    <public type="string" name="return_to_login" id="0x7f120ee8" />
-    <public type="string" name="reversed" id="0x7f120ee9" />
-    <public type="string" name="revoke" id="0x7f120eea" />
-    <public type="string" name="revoke_ban" id="0x7f120eeb" />
-    <public type="string" name="ring" id="0x7f120eec" />
-    <public type="string" name="ro" id="0x7f120eed" />
-    <public type="string" name="role_order_updated" id="0x7f120eee" />
-    <public type="string" name="roles" id="0x7f120eef" />
-    <public type="string" name="roles_list" id="0x7f120ef0" />
-    <public type="string" name="rtc_connection" id="0x7f120ef1" />
-    <public type="string" name="rtc_connection_info" id="0x7f120ef2" />
-    <public type="string" name="rtc_connection_state_authenticating" id="0x7f120ef3" />
-    <public type="string" name="rtc_connection_state_awaiting_endpoint" id="0x7f120ef4" />
-    <public type="string" name="rtc_connection_state_connecting" id="0x7f120ef5" />
-    <public type="string" name="rtc_connection_state_disconnected" id="0x7f120ef6" />
-    <public type="string" name="rtc_connection_state_ice_checking" id="0x7f120ef7" />
-    <public type="string" name="rtc_connection_state_no_route" id="0x7f120ef8" />
-    <public type="string" name="rtc_connection_state_rtc_connected" id="0x7f120ef9" />
-    <public type="string" name="rtc_connection_state_rtc_connected_loss_rate" id="0x7f120efa" />
-    <public type="string" name="rtc_connection_state_rtc_connecting" id="0x7f120efb" />
-    <public type="string" name="rtc_debug_context" id="0x7f120efc" />
-    <public type="string" name="rtc_debug_open" id="0x7f120efd" />
-    <public type="string" name="rtc_debug_rtp_inbound" id="0x7f120efe" />
-    <public type="string" name="rtc_debug_rtp_outbound" id="0x7f120eff" />
-    <public type="string" name="rtc_debug_screenshare" id="0x7f120f00" />
-    <public type="string" name="rtc_debug_transport" id="0x7f120f01" />
-    <public type="string" name="rtc_debug_users" id="0x7f120f02" />
-    <public type="string" name="ru" id="0x7f120f03" />
-    <public type="string" name="salmon" id="0x7f120f04" />
-    <public type="string" name="sample_channel_message" id="0x7f120f05" />
-    <public type="string" name="sample_channel_name" id="0x7f120f06" />
-    <public type="string" name="sample_channel_name_short" id="0x7f120f07" />
-    <public type="string" name="sample_channel_search_filter" id="0x7f120f08" />
-    <public type="string" name="sample_confirmation" id="0x7f120f09" />
-    <public type="string" name="sample_connected_account" id="0x7f120f0a" />
-    <public type="string" name="sample_discrim" id="0x7f120f0b" />
-    <public type="string" name="sample_email" id="0x7f120f0c" />
-    <public type="string" name="sample_empty_string" id="0x7f120f0d" />
-    <public type="string" name="sample_language" id="0x7f120f0e" />
-    <public type="string" name="sample_number_9" id="0x7f120f0f" />
-    <public type="string" name="sample_number_99" id="0x7f120f10" />
-    <public type="string" name="sample_number_999" id="0x7f120f11" />
-    <public type="string" name="sample_number_9999" id="0x7f120f12" />
-    <public type="string" name="sample_number_bandwidth" id="0x7f120f13" />
-    <public type="string" name="sample_number_ratio" id="0x7f120f14" />
-    <public type="string" name="sample_online_members" id="0x7f120f15" />
-    <public type="string" name="sample_server_name" id="0x7f120f16" />
-    <public type="string" name="sample_server_name_short" id="0x7f120f17" />
-    <public type="string" name="sample_server_role_name" id="0x7f120f18" />
-    <public type="string" name="sample_time_duration_minutes" id="0x7f120f19" />
-    <public type="string" name="sample_time_duration_seconds" id="0x7f120f1a" />
-    <public type="string" name="sample_time_pm" id="0x7f120f1b" />
-    <public type="string" name="sample_time_stamp" id="0x7f120f1c" />
-    <public type="string" name="sample_total_members" id="0x7f120f1d" />
-    <public type="string" name="sample_user_generated_link" id="0x7f120f1e" />
-    <public type="string" name="sample_user_name" id="0x7f120f1f" />
-    <public type="string" name="sample_user_name_discrim" id="0x7f120f20" />
-    <public type="string" name="sample_user_nick" id="0x7f120f21" />
-    <public type="string" name="sample_user_presence" id="0x7f120f22" />
-    <public type="string" name="sample_user_presence_details" id="0x7f120f23" />
-    <public type="string" name="samsung_welcome_screen" id="0x7f120f24" />
-    <public type="string" name="save" id="0x7f120f25" />
-    <public type="string" name="save_changes" id="0x7f120f26" />
-    <public type="string" name="save_media" id="0x7f120f27" />
-    <public type="string" name="save_media_failure_help_mobile" id="0x7f120f28" />
-    <public type="string" name="save_media_failure_mobile" id="0x7f120f29" />
-    <public type="string" name="save_media_success_mobile" id="0x7f120f2a" />
-    <public type="string" name="save_new_url" id="0x7f120f2b" />
-    <public type="string" name="saved_settings" id="0x7f120f2c" />
-    <public type="string" name="scope_activities_read" id="0x7f120f2d" />
-    <public type="string" name="scope_activities_read_description" id="0x7f120f2e" />
-    <public type="string" name="scope_activities_write" id="0x7f120f2f" />
-    <public type="string" name="scope_activities_write_description" id="0x7f120f30" />
-    <public type="string" name="scope_applications_builds_read" id="0x7f120f31" />
-    <public type="string" name="scope_applications_builds_read_description" id="0x7f120f32" />
-    <public type="string" name="scope_applications_builds_upload" id="0x7f120f33" />
-    <public type="string" name="scope_applications_builds_upload_description" id="0x7f120f34" />
-    <public type="string" name="scope_applications_entitlements" id="0x7f120f35" />
-    <public type="string" name="scope_applications_entitlements_description" id="0x7f120f36" />
-    <public type="string" name="scope_applications_store_update" id="0x7f120f37" />
-    <public type="string" name="scope_applications_store_update_description" id="0x7f120f38" />
-    <public type="string" name="scope_bot" id="0x7f120f39" />
-    <public type="string" name="scope_bot_description" id="0x7f120f3a" />
-    <public type="string" name="scope_bot_permissions" id="0x7f120f3b" />
-    <public type="string" name="scope_bot_permissions_description" id="0x7f120f3c" />
-    <public type="string" name="scope_bot_server_placeholder" id="0x7f120f3d" />
-    <public type="string" name="scope_bot_server_placeholder_no_guilds" id="0x7f120f3e" />
-    <public type="string" name="scope_bot_server_selected_label" id="0x7f120f3f" />
-    <public type="string" name="scope_connections" id="0x7f120f40" />
-    <public type="string" name="scope_connections_empty" id="0x7f120f41" />
-    <public type="string" name="scope_email" id="0x7f120f42" />
-    <public type="string" name="scope_email_empty" id="0x7f120f43" />
-    <public type="string" name="scope_gdm_join" id="0x7f120f44" />
-    <public type="string" name="scope_gdm_join_description" id="0x7f120f45" />
-    <public type="string" name="scope_guilds" id="0x7f120f46" />
-    <public type="string" name="scope_guilds_empty" id="0x7f120f47" />
-    <public type="string" name="scope_guilds_join" id="0x7f120f48" />
-    <public type="string" name="scope_guilds_join_description" id="0x7f120f49" />
-    <public type="string" name="scope_identify" id="0x7f120f4a" />
-    <public type="string" name="scope_messages_read" id="0x7f120f4b" />
-    <public type="string" name="scope_messages_read_description" id="0x7f120f4c" />
-    <public type="string" name="scope_rpc" id="0x7f120f4d" />
-    <public type="string" name="scope_rpc_api" id="0x7f120f4e" />
-    <public type="string" name="scope_rpc_api_description" id="0x7f120f4f" />
-    <public type="string" name="scope_rpc_description" id="0x7f120f50" />
-    <public type="string" name="scope_rpc_notifications_read" id="0x7f120f51" />
-    <public type="string" name="scope_rpc_notifications_read_description" id="0x7f120f52" />
-    <public type="string" name="scope_unsupported_on_android" id="0x7f120f53" />
-    <public type="string" name="scope_unsupported_on_android_description" id="0x7f120f54" />
-    <public type="string" name="scope_webhook_incoming" id="0x7f120f55" />
-    <public type="string" name="scope_webhook_incoming_channel_placeholder" id="0x7f120f56" />
-    <public type="string" name="scope_webhook_incoming_description" id="0x7f120f57" />
-    <public type="string" name="screen_share_on" id="0x7f120f58" />
-    <public type="string" name="screen_share_options" id="0x7f120f59" />
-    <public type="string" name="screenshare_change_windows" id="0x7f120f5a" />
-    <public type="string" name="screenshare_description" id="0x7f120f5b" />
-    <public type="string" name="screenshare_extension_body" id="0x7f120f5c" />
-    <public type="string" name="screenshare_extension_title" id="0x7f120f5d" />
-    <public type="string" name="screenshare_frame_rate" id="0x7f120f5e" />
-    <public type="string" name="screenshare_relaunch" id="0x7f120f5f" />
-    <public type="string" name="screenshare_relaunch_body" id="0x7f120f60" />
-    <public type="string" name="screenshare_screen" id="0x7f120f61" />
-    <public type="string" name="screenshare_share_screen_or_window" id="0x7f120f62" />
-    <public type="string" name="screenshare_sound_toggle_label" id="0x7f120f63" />
-    <public type="string" name="screenshare_source" id="0x7f120f64" />
-    <public type="string" name="screenshare_stop" id="0x7f120f65" />
-    <public type="string" name="screenshare_stream_game" id="0x7f120f66" />
-    <public type="string" name="screenshare_stream_quality" id="0x7f120f67" />
-    <public type="string" name="screenshare_unavailable" id="0x7f120f68" />
-    <public type="string" name="screenshare_unavailable_download_app" id="0x7f120f69" />
-    <public type="string" name="screenshare_window" id="0x7f120f6a" />
-    <public type="string" name="search" id="0x7f120f6b" />
-    <public type="string" name="search_actions" id="0x7f120f6c" />
-    <public type="string" name="search_answer_date" id="0x7f120f6d" />
-    <public type="string" name="search_answer_file_name" id="0x7f120f6e" />
-    <public type="string" name="search_answer_file_type" id="0x7f120f6f" />
-    <public type="string" name="search_answer_from" id="0x7f120f70" />
-    <public type="string" name="search_answer_has" id="0x7f120f71" />
-    <public type="string" name="search_answer_has_attachment" id="0x7f120f72" />
-    <public type="string" name="search_answer_has_embed" id="0x7f120f73" />
-    <public type="string" name="search_answer_has_image" id="0x7f120f74" />
-    <public type="string" name="search_answer_has_link" id="0x7f120f75" />
-    <public type="string" name="search_answer_has_sound" id="0x7f120f76" />
-    <public type="string" name="search_answer_has_video" id="0x7f120f77" />
-    <public type="string" name="search_answer_in" id="0x7f120f78" />
-    <public type="string" name="search_answer_link_from" id="0x7f120f79" />
-    <public type="string" name="search_answer_mentions" id="0x7f120f7a" />
-    <public type="string" name="search_channels" id="0x7f120f7b" />
-    <public type="string" name="search_channels_no_result" id="0x7f120f7c" />
-    <public type="string" name="search_clear" id="0x7f120f7d" />
-    <public type="string" name="search_clear_history" id="0x7f120f7e" />
-    <public type="string" name="search_country" id="0x7f120f7f" />
-    <public type="string" name="search_date_picker_hint" id="0x7f120f80" />
-    <public type="string" name="search_dm_still_indexing" id="0x7f120f81" />
-    <public type="string" name="search_dm_with" id="0x7f120f82" />
-    <public type="string" name="search_error" id="0x7f120f83" />
-    <public type="string" name="search_filter_after" id="0x7f120f84" />
-    <public type="string" name="search_filter_before" id="0x7f120f85" />
-    <public type="string" name="search_filter_during" id="0x7f120f86" />
-    <public type="string" name="search_filter_file_name" id="0x7f120f87" />
-    <public type="string" name="search_filter_file_type" id="0x7f120f88" />
-    <public type="string" name="search_filter_from" id="0x7f120f89" />
-    <public type="string" name="search_filter_has" id="0x7f120f8a" />
-    <public type="string" name="search_filter_in" id="0x7f120f8b" />
-    <public type="string" name="search_filter_link_from" id="0x7f120f8c" />
-    <public type="string" name="search_filter_mentions" id="0x7f120f8d" />
-    <public type="string" name="search_filter_on" id="0x7f120f8e" />
-    <public type="string" name="search_for_emoji" id="0x7f120f8f" />
-    <public type="string" name="search_for_empty" id="0x7f120f90" />
-    <public type="string" name="search_for_value" id="0x7f120f91" />
-    <public type="string" name="search_from_suggestions" id="0x7f120f92" />
-    <public type="string" name="search_giphy" id="0x7f120f93" />
-    <public type="string" name="search_group_header_channels" id="0x7f120f94" />
-    <public type="string" name="search_group_header_dates" id="0x7f120f95" />
-    <public type="string" name="search_group_header_file_name" id="0x7f120f96" />
-    <public type="string" name="search_group_header_file_type" id="0x7f120f97" />
-    <public type="string" name="search_group_header_from" id="0x7f120f98" />
-    <public type="string" name="search_group_header_has" id="0x7f120f99" />
-    <public type="string" name="search_group_header_history" id="0x7f120f9a" />
-    <public type="string" name="search_group_header_link_from" id="0x7f120f9b" />
-    <public type="string" name="search_group_header_mentions" id="0x7f120f9c" />
-    <public type="string" name="search_group_header_search_options" id="0x7f120f9d" />
-    <public type="string" name="search_guild_still_indexing" id="0x7f120f9e" />
-    <public type="string" name="search_hide_blocked_messages" id="0x7f120f9f" />
-    <public type="string" name="search_in" id="0x7f120fa0" />
-    <public type="string" name="search_members" id="0x7f120fa1" />
-    <public type="string" name="search_members_no_result" id="0x7f120fa2" />
-    <public type="string" name="search_menu_title" id="0x7f120fa3" />
-    <public type="string" name="search_no_results" id="0x7f120fa4" />
-    <public type="string" name="search_no_results_alt" id="0x7f120fa5" />
-    <public type="string" name="search_num_results_blocked_not_shown" id="0x7f120fa6" />
-    <public type="string" name="search_pick_date" id="0x7f120fa7" />
-    <public type="string" name="search_recent" id="0x7f120fa8" />
-    <public type="string" name="search_relevant" id="0x7f120fa9" />
-    <public type="string" name="search_roles" id="0x7f120faa" />
-    <public type="string" name="search_roles_no_result" id="0x7f120fab" />
-    <public type="string" name="search_shortcut_month" id="0x7f120fac" />
-    <public type="string" name="search_shortcut_today" id="0x7f120fad" />
-    <public type="string" name="search_shortcut_week" id="0x7f120fae" />
-    <public type="string" name="search_shortcut_year" id="0x7f120faf" />
-    <public type="string" name="search_shortcut_yesterday" id="0x7f120fb0" />
-    <public type="string" name="search_still_indexing_hint" id="0x7f120fb1" />
-    <public type="string" name="search_tenor" id="0x7f120fb2" />
-    <public type="string" name="search_with_google" id="0x7f120fb3" />
-    <public type="string" name="searching" id="0x7f120fb4" />
-    <public type="string" name="security" id="0x7f120fb5" />
-    <public type="string" name="select" id="0x7f120fb6" />
-    <public type="string" name="select_channel_or_category" id="0x7f120fb7" />
-    <public type="string" name="select_color" id="0x7f120fb8" />
-    <public type="string" name="select_emoji" id="0x7f120fb9" />
-    <public type="string" name="select_picture" id="0x7f120fba" />
-    <public type="string" name="select_picture_upload" id="0x7f120fbb" />
-    <public type="string" name="select_sort_mode" id="0x7f120fbc" />
-    <public type="string" name="selection_shrink_scale" id="0x7f120fbd" />
-    <public type="string" name="self_deafened" id="0x7f120fbe" />
-    <public type="string" name="self_deny_permission_body" id="0x7f120fbf" />
-    <public type="string" name="self_deny_permission_title" id="0x7f120fc0" />
-    <public type="string" name="self_muted" id="0x7f120fc1" />
-    <public type="string" name="self_xss_header" id="0x7f120fc2" />
-    <public type="string" name="self_xss_line_1" id="0x7f120fc3" />
-    <public type="string" name="self_xss_line_2" id="0x7f120fc4" />
-    <public type="string" name="self_xss_line_3" id="0x7f120fc5" />
-    <public type="string" name="self_xss_line_4" id="0x7f120fc6" />
-    <public type="string" name="send" id="0x7f120fc7" />
-    <public type="string" name="send_contents" id="0x7f120fc8" />
-    <public type="string" name="send_dm" id="0x7f120fc9" />
-    <public type="string" name="send_message" id="0x7f120fca" />
-    <public type="string" name="send_message_failure" id="0x7f120fcb" />
-    <public type="string" name="send_messages" id="0x7f120fcc" />
-    <public type="string" name="send_messages_description" id="0x7f120fcd" />
-    <public type="string" name="send_tts_messages" id="0x7f120fce" />
-    <public type="string" name="send_tts_messages_description" id="0x7f120fcf" />
-    <public type="string" name="server_acronym" id="0x7f120fd0" />
-    <public type="string" name="server_analytics_description" id="0x7f120fd1" />
-    <public type="string" name="server_deafen" id="0x7f120fd2" />
-    <public type="string" name="server_deafened" id="0x7f120fd3" />
-    <public type="string" name="server_desciption_empty" id="0x7f120fd4" />
-    <public type="string" name="server_emoji" id="0x7f120fd5" />
-    <public type="string" name="server_folder_mark_as_read" id="0x7f120fd6" />
-    <public type="string" name="server_folder_mute" id="0x7f120fd7" />
-    <public type="string" name="server_folder_placeholder" id="0x7f120fd8" />
-    <public type="string" name="server_folder_settings" id="0x7f120fd9" />
-    <public type="string" name="server_icon" id="0x7f120fda" />
-    <public type="string" name="server_insights" id="0x7f120fdb" />
-    <public type="string" name="server_mute" id="0x7f120fdc" />
-    <public type="string" name="server_mute_dms" id="0x7f120fdd" />
-    <public type="string" name="server_muted" id="0x7f120fde" />
-    <public type="string" name="server_name_required" id="0x7f120fdf" />
-    <public type="string" name="server_notification" id="0x7f120fe0" />
-    <public type="string" name="server_options" id="0x7f120fe1" />
-    <public type="string" name="server_overview" id="0x7f120fe2" />
-    <public type="string" name="server_region_unavailable" id="0x7f120fe3" />
-    <public type="string" name="server_settings" id="0x7f120fe4" />
-    <public type="string" name="server_settings_updated" id="0x7f120fe5" />
-    <public type="string" name="server_sort" id="0x7f120fe6" />
-    <public type="string" name="server_status" id="0x7f120fe7" />
-    <public type="string" name="server_undeafen" id="0x7f120fe8" />
-    <public type="string" name="server_unmute" id="0x7f120fe9" />
-    <public type="string" name="server_voice_mute" id="0x7f120fea" />
-    <public type="string" name="server_voice_unmute" id="0x7f120feb" />
-    <public type="string" name="servers" id="0x7f120fec" />
-    <public type="string" name="servers_management_title" id="0x7f120fed" />
-    <public type="string" name="service_connections_disconnect" id="0x7f120fee" />
-    <public type="string" name="set_debug_logging" id="0x7f120fef" />
-    <public type="string" name="set_debug_logging_body" id="0x7f120ff0" />
-    <public type="string" name="set_invite_link_never_expire" id="0x7f120ff1" />
-    <public type="string" name="set_status" id="0x7f120ff2" />
-    <public type="string" name="settings" id="0x7f120ff3" />
-    <public type="string" name="settings_advanced" id="0x7f120ff4" />
-    <public type="string" name="settings_basic" id="0x7f120ff5" />
-    <public type="string" name="settings_games_add" id="0x7f120ff6" />
-    <public type="string" name="settings_games_add_game" id="0x7f120ff7" />
-    <public type="string" name="settings_games_add_new_game" id="0x7f120ff8" />
-    <public type="string" name="settings_games_added_games_label" id="0x7f120ff9" />
-    <public type="string" name="settings_games_enable_overlay_label" id="0x7f120ffa" />
-    <public type="string" name="settings_games_game_to_add" id="0x7f120ffb" />
-    <public type="string" name="settings_games_hidden_library_applications_label" id="0x7f120ffc" />
-    <public type="string" name="settings_games_import_explanation" id="0x7f120ffd" />
-    <public type="string" name="settings_games_import_label" id="0x7f120ffe" />
-    <public type="string" name="settings_games_last_played" id="0x7f120fff" />
-    <public type="string" name="settings_games_no_game_detected" id="0x7f121000" />
-    <public type="string" name="settings_games_no_games_header" id="0x7f121001" />
-    <public type="string" name="settings_games_not_playing" id="0x7f121002" />
-    <public type="string" name="settings_games_not_seeing_game" id="0x7f121003" />
-    <public type="string" name="settings_games_now_playing_label" id="0x7f121004" />
-    <public type="string" name="settings_games_now_playing_state" id="0x7f121005" />
-    <public type="string" name="settings_games_overlay" id="0x7f121006" />
-    <public type="string" name="settings_games_overlay_off" id="0x7f121007" />
-    <public type="string" name="settings_games_overlay_on" id="0x7f121008" />
-    <public type="string" name="settings_games_overlay_warning" id="0x7f121009" />
-    <public type="string" name="settings_games_remove_icon" id="0x7f12100a" />
-    <public type="string" name="settings_games_restore_to_library" id="0x7f12100b" />
-    <public type="string" name="settings_games_toggle_overlay" id="0x7f12100c" />
-    <public type="string" name="settings_games_verified_icon" id="0x7f12100d" />
-    <public type="string" name="settings_invite_tip" id="0x7f12100e" />
-    <public type="string" name="settings_invite_tip_without_create" id="0x7f12100f" />
-    <public type="string" name="settings_notice_message" id="0x7f121010" />
-    <public type="string" name="settings_permissions_delete_body" id="0x7f121011" />
-    <public type="string" name="settings_permissions_delete_title" id="0x7f121012" />
-    <public type="string" name="settings_permissions_title" id="0x7f121013" />
-    <public type="string" name="settings_roles_delete_body" id="0x7f121014" />
-    <public type="string" name="settings_roles_delete_title" id="0x7f121015" />
-    <public type="string" name="settings_roles_helpdesk_link" id="0x7f121016" />
-    <public type="string" name="settings_sync" id="0x7f121017" />
-    <public type="string" name="settings_webhooks_empty_body" id="0x7f121018" />
-    <public type="string" name="settings_webhooks_empty_title" id="0x7f121019" />
-    <public type="string" name="settings_webhooks_intro" id="0x7f12101a" />
-    <public type="string" name="setup" id="0x7f12101b" />
-    <public type="string" name="setup_vanity_url" id="0x7f12101c" />
-    <public type="string" name="several_users_typing" id="0x7f12101d" />
-    <public type="string" name="share" id="0x7f12101e" />
-    <public type="string" name="share_invite_link_for_access" id="0x7f12101f" />
-    <public type="string" name="share_invite_link_for_access_experiment" id="0x7f121020" />
-    <public type="string" name="share_invite_mobile" id="0x7f121021" />
-    <public type="string" name="share_link" id="0x7f121022" />
-    <public type="string" name="share_to" id="0x7f121023" />
-    <public type="string" name="shortcut_recorder_button" id="0x7f121024" />
-    <public type="string" name="shortcut_recorder_button_edit" id="0x7f121025" />
-    <public type="string" name="shortcut_recorder_button_recording" id="0x7f121026" />
-    <public type="string" name="shortcut_recorder_help" id="0x7f121027" />
-    <public type="string" name="shortcut_recorder_no_bind" id="0x7f121028" />
-    <public type="string" name="show_current_game" id="0x7f121029" />
-    <public type="string" name="show_current_game_desc" id="0x7f12102a" />
-    <public type="string" name="show_muted" id="0x7f12102b" />
-    <public type="string" name="show_muted_channels" id="0x7f12102c" />
-    <public type="string" name="show_spoiler_always" id="0x7f12102d" />
-    <public type="string" name="show_spoiler_content" id="0x7f12102e" />
-    <public type="string" name="show_spoiler_content_help" id="0x7f12102f" />
-    <public type="string" name="show_spoiler_on_click" id="0x7f121030" />
-    <public type="string" name="show_spoiler_on_servers_i_mod" id="0x7f121031" />
-    <public type="string" name="skip" id="0x7f121032" />
-    <public type="string" name="skip_all_tips" id="0x7f121033" />
-    <public type="string" name="sky_blue" id="0x7f121034" />
-    <public type="string" name="sort" id="0x7f121035" />
-    <public type="string" name="sorting" id="0x7f121036" />
-    <public type="string" name="sorting_channels" id="0x7f121037" />
-    <public type="string" name="sound_deafen" id="0x7f121038" />
-    <public type="string" name="sound_incoming_ring" id="0x7f121039" />
-    <public type="string" name="sound_message" id="0x7f12103a" />
-    <public type="string" name="sound_mute" id="0x7f12103b" />
-    <public type="string" name="sound_outgoing_ring" id="0x7f12103c" />
-    <public type="string" name="sound_ptt_activate" id="0x7f12103d" />
-    <public type="string" name="sound_ptt_deactivate" id="0x7f12103e" />
-    <public type="string" name="sound_stream_started" id="0x7f12103f" />
-    <public type="string" name="sound_stream_stopped" id="0x7f121040" />
-    <public type="string" name="sound_undeafen" id="0x7f121041" />
-    <public type="string" name="sound_unmute" id="0x7f121042" />
-    <public type="string" name="sound_user_join" id="0x7f121043" />
-    <public type="string" name="sound_user_leave" id="0x7f121044" />
-    <public type="string" name="sound_user_moved" id="0x7f121045" />
-    <public type="string" name="sound_viewer_join" id="0x7f121046" />
-    <public type="string" name="sound_viewer_leave" id="0x7f121047" />
-    <public type="string" name="sound_voice_disconnected" id="0x7f121048" />
-    <public type="string" name="sounds" id="0x7f121049" />
-    <public type="string" name="speak" id="0x7f12104a" />
-    <public type="string" name="spectators" id="0x7f12104b" />
-    <public type="string" name="spectators_header" id="0x7f12104c" />
-    <public type="string" name="spellcheck" id="0x7f12104d" />
-    <public type="string" name="spoiler" id="0x7f12104e" />
-    <public type="string" name="spoiler_hide" id="0x7f12104f" />
-    <public type="string" name="spoiler_mark_selected" id="0x7f121050" />
-    <public type="string" name="spoiler_reveal" id="0x7f121051" />
-    <public type="string" name="spotify_app_download" id="0x7f121052" />
-    <public type="string" name="spotify_app_not_found" id="0x7f121053" />
-    <public type="string" name="spotify_app_not_opened" id="0x7f121054" />
-    <public type="string" name="spotify_connection_info_android" id="0x7f121055" />
-    <public type="string" name="spotify_listen_along_host" id="0x7f121056" />
-    <public type="string" name="spotify_listen_along_info" id="0x7f121057" />
-    <public type="string" name="spotify_listen_along_listener" id="0x7f121058" />
-    <public type="string" name="spotify_listen_along_listeners" id="0x7f121059" />
-    <public type="string" name="spotify_listen_along_listening_along_count" id="0x7f12105a" />
-    <public type="string" name="spotify_listen_along_modal_title" id="0x7f12105b" />
-    <public type="string" name="spotify_listen_along_song_by_artist" id="0x7f12105c" />
-    <public type="string" name="spotify_listen_along_stop" id="0x7f12105d" />
-    <public type="string" name="spotify_listen_along_subtitle_listener" id="0x7f12105e" />
-    <public type="string" name="spotify_listen_along_title_host" id="0x7f12105f" />
-    <public type="string" name="spotify_listen_along_title_listener" id="0x7f121060" />
-    <public type="string" name="spotify_premium_upgrade_body" id="0x7f121061" />
-    <public type="string" name="spotify_premium_upgrade_button" id="0x7f121062" />
-    <public type="string" name="spotify_premium_upgrade_header" id="0x7f121063" />
-    <public type="string" name="staff_badge_tooltip" id="0x7f121064" />
-    <public type="string" name="start" id="0x7f121065" />
-    <public type="string" name="start_audio_call" id="0x7f121066" />
-    <public type="string" name="start_call" id="0x7f121067" />
-    <public type="string" name="start_dm_label" id="0x7f121068" />
-    <public type="string" name="start_dm_placeholder" id="0x7f121069" />
-    <public type="string" name="start_video_call" id="0x7f12106a" />
-    <public type="string" name="start_voice_call" id="0x7f12106b" />
-    <public type="string" name="status_bar_notification_info_overflow" id="0x7f12106c" />
-    <public type="string" name="status_dnd" id="0x7f12106d" />
-    <public type="string" name="status_dnd_help" id="0x7f12106e" />
-    <public type="string" name="status_idle" id="0x7f12106f" />
-    <public type="string" name="status_invisible" id="0x7f121070" />
-    <public type="string" name="status_invisible_helper" id="0x7f121071" />
-    <public type="string" name="status_offline" id="0x7f121072" />
-    <public type="string" name="status_online" id="0x7f121073" />
-    <public type="string" name="status_online_mobile" id="0x7f121074" />
-    <public type="string" name="status_page_url" id="0x7f121075" />
-    <public type="string" name="status_streaming" id="0x7f121076" />
-    <public type="string" name="status_unknown" id="0x7f121077" />
-    <public type="string" name="step_number" id="0x7f121078" />
-    <public type="string" name="still_indexing" id="0x7f121079" />
-    <public type="string" name="stop_ringing" id="0x7f12107a" />
-    <public type="string" name="stop_streaming" id="0x7f12107b" />
-    <public type="string" name="stop_watching" id="0x7f12107c" />
-    <public type="string" name="storage_permission_denied_msg" id="0x7f12107d" />
-    <public type="string" name="store_channel" id="0x7f12107e" />
-    <public type="string" name="store_payment_legalese_monthly" id="0x7f12107f" />
-    <public type="string" name="store_payment_legalese_yearly" id="0x7f121080" />
-    <public type="string" name="stream" id="0x7f121081" />
-    <public type="string" name="stream_bad_spectator" id="0x7f121082" />
-    <public type="string" name="stream_bad_streamer" id="0x7f121083" />
-    <public type="string" name="stream_capture_paused" id="0x7f121084" />
-    <public type="string" name="stream_capture_paused_details" id="0x7f121085" />
-    <public type="string" name="stream_capture_paused_details_viewer" id="0x7f121086" />
-    <public type="string" name="stream_channel_description" id="0x7f121087" />
-    <public type="string" name="stream_description" id="0x7f121088" />
-    <public type="string" name="stream_ended" id="0x7f121089" />
-    <public type="string" name="stream_ended_button" id="0x7f12108a" />
-    <public type="string" name="stream_ended_no_spectators" id="0x7f12108b" />
-    <public type="string" name="stream_full_modal_body" id="0x7f12108c" />
-    <public type="string" name="stream_full_modal_header" id="0x7f12108d" />
-    <public type="string" name="stream_issue_modal_header" id="0x7f12108e" />
-    <public type="string" name="stream_network_quality_error" id="0x7f12108f" />
-    <public type="string" name="stream_no_preview" id="0x7f121090" />
-    <public type="string" name="stream_playing" id="0x7f121091" />
-    <public type="string" name="stream_preview_loading" id="0x7f121092" />
-    <public type="string" name="stream_preview_paused" id="0x7f121093" />
-    <public type="string" name="stream_preview_paused_subtext" id="0x7f121094" />
-    <public type="string" name="stream_quality_unlock" id="0x7f121095" />
-    <public type="string" name="stream_reconnecting_error" id="0x7f121096" />
-    <public type="string" name="stream_reconnecting_error_subtext" id="0x7f121097" />
-    <public type="string" name="stream_report_a_problem" id="0x7f121098" />
-    <public type="string" name="stream_report_a_problem_post_stream" id="0x7f121099" />
-    <public type="string" name="stream_report_audio_missing" id="0x7f12109a" />
-    <public type="string" name="stream_report_audio_poor" id="0x7f12109b" />
-    <public type="string" name="stream_report_black" id="0x7f12109c" />
-    <public type="string" name="stream_report_blurry" id="0x7f12109d" />
-    <public type="string" name="stream_report_ended_audio_missing" id="0x7f12109e" />
-    <public type="string" name="stream_report_ended_audio_poor" id="0x7f12109f" />
-    <public type="string" name="stream_report_ended_black" id="0x7f1210a0" />
-    <public type="string" name="stream_report_ended_blurry" id="0x7f1210a1" />
-    <public type="string" name="stream_report_ended_lagging" id="0x7f1210a2" />
-    <public type="string" name="stream_report_ended_out_of_sync" id="0x7f1210a3" />
-    <public type="string" name="stream_report_game_issue" id="0x7f1210a4" />
-    <public type="string" name="stream_report_label" id="0x7f1210a5" />
-    <public type="string" name="stream_report_lagging" id="0x7f1210a6" />
-    <public type="string" name="stream_report_out_of_sync" id="0x7f1210a7" />
-    <public type="string" name="stream_report_placeholder" id="0x7f1210a8" />
-    <public type="string" name="stream_report_problem" id="0x7f1210a9" />
-    <public type="string" name="stream_report_problem_body" id="0x7f1210aa" />
-    <public type="string" name="stream_report_problem_mobile" id="0x7f1210ab" />
-    <public type="string" name="stream_report_rating_body" id="0x7f1210ac" />
-    <public type="string" name="stream_report_rating_body_streamer" id="0x7f1210ad" />
-    <public type="string" name="stream_report_submit" id="0x7f1210ae" />
-    <public type="string" name="stream_reported" id="0x7f1210af" />
-    <public type="string" name="stream_reported_body" id="0x7f1210b0" />
-    <public type="string" name="stream_soundshare_failed" id="0x7f1210b1" />
-    <public type="string" name="streamer_mode" id="0x7f1210b2" />
-    <public type="string" name="streamer_mode_enabled" id="0x7f1210b3" />
-    <public type="string" name="streamer_playing" id="0x7f1210b4" />
-    <public type="string" name="streamer_settings_title" id="0x7f1210b5" />
-    <public type="string" name="streaming" id="0x7f1210b6" />
-    <public type="string" name="streaming_a_game" id="0x7f1210b7" />
-    <public type="string" name="stripe_unable_to_load" id="0x7f1210b8" />
-    <public type="string" name="sub_enabled_servers" id="0x7f1210b9" />
-    <public type="string" name="subscriber_information" id="0x7f1210ba" />
-    <public type="string" name="suggestions" id="0x7f1210bb" />
-    <public type="string" name="support" id="0x7f1210bc" />
-    <public type="string" name="suppress_all_embeds" id="0x7f1210bd" />
-    <public type="string" name="suppressed" id="0x7f1210be" />
-    <public type="string" name="suppressed_afk_body" id="0x7f1210bf" />
-    <public type="string" name="suppressed_afk_title" id="0x7f1210c0" />
-    <public type="string" name="suppressed_permission_body" id="0x7f1210c1" />
-    <public type="string" name="sv_se" id="0x7f1210c2" />
-    <public type="string" name="switch_hardware_acceleration" id="0x7f1210c3" />
-    <public type="string" name="switch_hardware_acceleration_body" id="0x7f1210c4" />
-    <public type="string" name="switch_subsystem" id="0x7f1210c5" />
-    <public type="string" name="switch_subsystem_body" id="0x7f1210c6" />
-    <public type="string" name="switch_to_compact_mode" id="0x7f1210c7" />
-    <public type="string" name="switch_to_cozy_mode" id="0x7f1210c8" />
-    <public type="string" name="switch_to_dark_theme" id="0x7f1210c9" />
-    <public type="string" name="switch_to_light_theme" id="0x7f1210ca" />
-    <public type="string" name="switch_to_push_to_talk" id="0x7f1210cb" />
-    <public type="string" name="switch_to_voice_activity" id="0x7f1210cc" />
-    <public type="string" name="sync" id="0x7f1210cd" />
-    <public type="string" name="sync_across_clients_appearance_help" id="0x7f1210ce" />
-    <public type="string" name="sync_across_clients_text" id="0x7f1210cf" />
-    <public type="string" name="sync_across_clients_text_help" id="0x7f1210d0" />
-    <public type="string" name="sync_friends" id="0x7f1210d1" />
-    <public type="string" name="sync_now" id="0x7f1210d2" />
-    <public type="string" name="sync_permissions" id="0x7f1210d3" />
-    <public type="string" name="sync_permissions_explanation" id="0x7f1210d4" />
-    <public type="string" name="sync_revoked" id="0x7f1210d5" />
-    <public type="string" name="sync_this_account" id="0x7f1210d6" />
-    <public type="string" name="sync_with" id="0x7f1210d7" />
-    <public type="string" name="system_keyboard" id="0x7f1210d8" />
-    <public type="string" name="system_message_call_missed" id="0x7f1210d9" />
-    <public type="string" name="system_message_call_started" id="0x7f1210da" />
-    <public type="string" name="system_message_channel_follow_add" id="0x7f1210db" />
-    <public type="string" name="system_message_channel_icon_change" id="0x7f1210dc" />
-    <public type="string" name="system_message_channel_name_change" id="0x7f1210dd" />
-    <public type="string" name="system_message_guild_bot_join" id="0x7f1210de" />
-    <public type="string" name="system_message_guild_member_join" id="0x7f1210df" />
-    <public type="string" name="system_message_guild_member_join_01" id="0x7f1210e0" />
-    <public type="string" name="system_message_guild_member_join_02" id="0x7f1210e1" />
-    <public type="string" name="system_message_guild_member_join_03" id="0x7f1210e2" />
-    <public type="string" name="system_message_guild_member_join_04" id="0x7f1210e3" />
-    <public type="string" name="system_message_guild_member_join_05" id="0x7f1210e4" />
-    <public type="string" name="system_message_guild_member_join_06" id="0x7f1210e5" />
-    <public type="string" name="system_message_guild_member_join_07" id="0x7f1210e6" />
-    <public type="string" name="system_message_guild_member_join_08" id="0x7f1210e7" />
-    <public type="string" name="system_message_guild_member_join_09" id="0x7f1210e8" />
-    <public type="string" name="system_message_guild_member_join_10" id="0x7f1210e9" />
-    <public type="string" name="system_message_guild_member_join_11" id="0x7f1210ea" />
-    <public type="string" name="system_message_guild_member_join_12" id="0x7f1210eb" />
-    <public type="string" name="system_message_guild_member_join_13" id="0x7f1210ec" />
-    <public type="string" name="system_message_guild_member_join_14" id="0x7f1210ed" />
-    <public type="string" name="system_message_guild_member_join_15" id="0x7f1210ee" />
-    <public type="string" name="system_message_guild_member_join_16" id="0x7f1210ef" />
-    <public type="string" name="system_message_guild_member_join_17" id="0x7f1210f0" />
-    <public type="string" name="system_message_guild_member_join_18" id="0x7f1210f1" />
-    <public type="string" name="system_message_guild_member_join_19" id="0x7f1210f2" />
-    <public type="string" name="system_message_guild_member_join_20" id="0x7f1210f3" />
-    <public type="string" name="system_message_guild_member_join_21" id="0x7f1210f4" />
-    <public type="string" name="system_message_guild_member_join_22" id="0x7f1210f5" />
-    <public type="string" name="system_message_guild_member_join_23" id="0x7f1210f6" />
-    <public type="string" name="system_message_guild_member_join_24" id="0x7f1210f7" />
-    <public type="string" name="system_message_guild_member_join_25" id="0x7f1210f8" />
-    <public type="string" name="system_message_guild_member_join_26" id="0x7f1210f9" />
-    <public type="string" name="system_message_guild_member_join_27" id="0x7f1210fa" />
-    <public type="string" name="system_message_guild_member_join_28" id="0x7f1210fb" />
-    <public type="string" name="system_message_guild_member_join_29" id="0x7f1210fc" />
-    <public type="string" name="system_message_guild_member_join_30" id="0x7f1210fd" />
-    <public type="string" name="system_message_guild_member_join_31" id="0x7f1210fe" />
-    <public type="string" name="system_message_guild_member_join_32" id="0x7f1210ff" />
-    <public type="string" name="system_message_guild_member_join_33" id="0x7f121100" />
-    <public type="string" name="system_message_guild_member_join_34" id="0x7f121101" />
-    <public type="string" name="system_message_guild_member_join_35" id="0x7f121102" />
-    <public type="string" name="system_message_guild_member_join_36" id="0x7f121103" />
-    <public type="string" name="system_message_guild_member_join_37" id="0x7f121104" />
-    <public type="string" name="system_message_guild_member_join_38" id="0x7f121105" />
-    <public type="string" name="system_message_guild_member_subscribed" id="0x7f121106" />
-    <public type="string" name="system_message_guild_member_subscribed_achieved_tier" id="0x7f121107" />
-    <public type="string" name="system_message_join_call" id="0x7f121108" />
-    <public type="string" name="system_message_pinned_message" id="0x7f121109" />
-    <public type="string" name="system_message_pinned_message_mobile" id="0x7f12110a" />
-    <public type="string" name="system_message_pinned_message_no_cta" id="0x7f12110b" />
-    <public type="string" name="system_message_pinned_message_no_cta_formatted" id="0x7f12110c" />
-    <public type="string" name="system_message_recipient_add" id="0x7f12110d" />
-    <public type="string" name="system_message_recipient_remove" id="0x7f12110e" />
-    <public type="string" name="system_message_recipient_remove_self" id="0x7f12110f" />
-    <public type="string" name="system_permission_grant" id="0x7f121110" />
-    <public type="string" name="system_permission_request_camera" id="0x7f121111" />
-    <public type="string" name="system_permission_request_files" id="0x7f121112" />
-    <public type="string" name="tab_bar" id="0x7f121113" />
-    <public type="string" name="take_photo_or_video" id="0x7f121114" />
-    <public type="string" name="tan" id="0x7f121115" />
-    <public type="string" name="tap_add_nickname" id="0x7f121116" />
-    <public type="string" name="tar_gz" id="0x7f121117" />
-    <public type="string" name="teal" id="0x7f121118" />
-    <public type="string" name="temporary_membership_explanation" id="0x7f121119" />
-    <public type="string" name="terms_of_service" id="0x7f12111a" />
-    <public type="string" name="terms_of_service_url" id="0x7f12111b" />
-    <public type="string" name="terms_privacy" id="0x7f12111c" />
-    <public type="string" name="terms_privacy_opt_in" id="0x7f12111d" />
-    <public type="string" name="terms_privacy_opt_in_tooltip" id="0x7f12111e" />
-    <public type="string" name="terracotta" id="0x7f12111f" />
-    <public type="string" name="test_video" id="0x7f121120" />
-    <public type="string" name="text" id="0x7f121121" />
-    <public type="string" name="text_and_images" id="0x7f121122" />
-    <public type="string" name="text_channel" id="0x7f121123" />
-    <public type="string" name="text_channels" id="0x7f121124" />
-    <public type="string" name="text_channels_matching" id="0x7f121125" />
-    <public type="string" name="text_permissions" id="0x7f121126" />
-    <public type="string" name="textarea_placeholder" id="0x7f121127" />
-    <public type="string" name="th" id="0x7f121128" />
-    <public type="string" name="theme" id="0x7f121129" />
-    <public type="string" name="theme_dark" id="0x7f12112a" />
-    <public type="string" name="theme_light" id="0x7f12112b" />
-    <public type="string" name="theme_pure_evil_title" id="0x7f12112c" />
-    <public type="string" name="theme_pure_evil_updated" id="0x7f12112d" />
-    <public type="string" name="theme_updated" id="0x7f12112e" />
-    <public type="string" name="this_server" id="0x7f12112f" />
-    <public type="string" name="this_server_named" id="0x7f121130" />
-    <public type="string" name="three_users_typing" id="0x7f121131" />
-    <public type="string" name="timeout_error" id="0x7f121132" />
-    <public type="string" name="tip_create_first_server_body3" id="0x7f121133" />
-    <public type="string" name="tip_create_first_server_title3" id="0x7f121134" />
-    <public type="string" name="tip_create_more_servers_body3" id="0x7f121135" />
-    <public type="string" name="tip_create_more_servers_title3" id="0x7f121136" />
-    <public type="string" name="tip_direct_messages_body3" id="0x7f121137" />
-    <public type="string" name="tip_direct_messages_title3" id="0x7f121138" />
-    <public type="string" name="tip_friends_list_body3" id="0x7f121139" />
-    <public type="string" name="tip_friends_list_title3" id="0x7f12113a" />
-    <public type="string" name="tip_instant_invite_body3" id="0x7f12113b" />
-    <public type="string" name="tip_instant_invite_title3" id="0x7f12113c" />
-    <public type="string" name="tip_organize_by_topic_body3" id="0x7f12113d" />
-    <public type="string" name="tip_organize_by_topic_title3" id="0x7f12113e" />
-    <public type="string" name="tip_server_settings_body3" id="0x7f12113f" />
-    <public type="string" name="tip_server_settings_title3" id="0x7f121140" />
-    <public type="string" name="tip_voice_conversations_body3" id="0x7f121141" />
-    <public type="string" name="tip_voice_conversations_title3" id="0x7f121142" />
-    <public type="string" name="tip_whos_online_body3" id="0x7f121143" />
-    <public type="string" name="tip_whos_online_title3" id="0x7f121144" />
-    <public type="string" name="tip_writing_messages_body3" id="0x7f121145" />
-    <public type="string" name="tip_writing_messages_title3" id="0x7f121146" />
-    <public type="string" name="title" id="0x7f121147" />
-    <public type="string" name="toggle_camera" id="0x7f121148" />
-    <public type="string" name="toggle_deafen" id="0x7f121149" />
-    <public type="string" name="toggle_drawer" id="0x7f12114a" />
-    <public type="string" name="toggle_emoji_keyboard" id="0x7f12114b" />
-    <public type="string" name="toggle_microphone" id="0x7f12114c" />
-    <public type="string" name="toggle_mute" id="0x7f12114d" />
-    <public type="string" name="too_many_animated_emoji" id="0x7f12114e" />
-    <public type="string" name="too_many_emoji" id="0x7f12114f" />
-    <public type="string" name="too_many_reactions_alert_body" id="0x7f121150" />
-    <public type="string" name="too_many_reactions_alert_header" id="0x7f121151" />
-    <public type="string" name="total_members" id="0x7f121152" />
-    <public type="string" name="total_results" id="0x7f121153" />
-    <public type="string" name="tr" id="0x7f121154" />
-    <public type="string" name="transfer" id="0x7f121155" />
-    <public type="string" name="transfer_ownership" id="0x7f121156" />
-    <public type="string" name="transfer_ownership_acknowledge" id="0x7f121157" />
-    <public type="string" name="transfer_ownership_to_user" id="0x7f121158" />
-    <public type="string" name="trending_arrow_down" id="0x7f121159" />
-    <public type="string" name="trending_arrow_up" id="0x7f12115a" />
-    <public type="string" name="try_again" id="0x7f12115b" />
-    <public type="string" name="tts_alls" id="0x7f12115c" />
-    <public type="string" name="tts_current" id="0x7f12115d" />
-    <public type="string" name="tts_never" id="0x7f12115e" />
-    <public type="string" name="tutorial_close" id="0x7f12115f" />
-    <public type="string" name="tweet_us" id="0x7f121160" />
-    <public type="string" name="twitter" id="0x7f121161" />
-    <public type="string" name="twitter_page_url" id="0x7f121162" />
-    <public type="string" name="two_fa" id="0x7f121163" />
-    <public type="string" name="two_fa_activate" id="0x7f121164" />
-    <public type="string" name="two_fa_app_name_authy" id="0x7f121165" />
-    <public type="string" name="two_fa_app_name_google_authenticator" id="0x7f121166" />
-    <public type="string" name="two_fa_auth_code" id="0x7f121167" />
-    <public type="string" name="two_fa_backup_code_enter" id="0x7f121168" />
-    <public type="string" name="two_fa_backup_code_enter_wrong" id="0x7f121169" />
-    <public type="string" name="two_fa_backup_code_hint" id="0x7f12116a" />
-    <public type="string" name="two_fa_backup_code_used" id="0x7f12116b" />
-    <public type="string" name="two_fa_backup_codes_body" id="0x7f12116c" />
-    <public type="string" name="two_fa_backup_codes_label" id="0x7f12116d" />
-    <public type="string" name="two_fa_backup_codes_sales_pitch" id="0x7f12116e" />
-    <public type="string" name="two_fa_change_account" id="0x7f12116f" />
-    <public type="string" name="two_fa_code" id="0x7f121170" />
-    <public type="string" name="two_fa_disable" id="0x7f121171" />
-    <public type="string" name="two_fa_discord_backup_codes" id="0x7f121172" />
-    <public type="string" name="two_fa_download_app_body" id="0x7f121173" />
-    <public type="string" name="two_fa_download_app_label" id="0x7f121174" />
-    <public type="string" name="two_fa_download_codes" id="0x7f121175" />
-    <public type="string" name="two_fa_enable" id="0x7f121176" />
-    <public type="string" name="two_fa_enable_subheader" id="0x7f121177" />
-    <public type="string" name="two_fa_enabled" id="0x7f121178" />
-    <public type="string" name="two_fa_enter_sms_token_label" id="0x7f121179" />
-    <public type="string" name="two_fa_enter_sms_token_sending" id="0x7f12117a" />
-    <public type="string" name="two_fa_enter_sms_token_sent" id="0x7f12117b" />
-    <public type="string" name="two_fa_enter_token_body" id="0x7f12117c" />
-    <public type="string" name="two_fa_enter_token_label" id="0x7f12117d" />
-    <public type="string" name="two_fa_generate_codes" id="0x7f12117e" />
-    <public type="string" name="two_fa_generate_codes_confirm_text" id="0x7f12117f" />
-    <public type="string" name="two_fa_guild_mfa_warning" id="0x7f121180" />
-    <public type="string" name="two_fa_guild_mfa_warning_ios" id="0x7f121181" />
-    <public type="string" name="two_fa_ios_delete" id="0x7f121182" />
-    <public type="string" name="two_fa_key" id="0x7f121183" />
-    <public type="string" name="two_fa_login_body" id="0x7f121184" />
-    <public type="string" name="two_fa_login_footer" id="0x7f121185" />
-    <public type="string" name="two_fa_login_label" id="0x7f121186" />
-    <public type="string" name="two_fa_modal_setup_header_mobile" id="0x7f121187" />
-    <public type="string" name="two_fa_not_verified" id="0x7f121188" />
-    <public type="string" name="two_fa_qr_body" id="0x7f121189" />
-    <public type="string" name="two_fa_qr_label" id="0x7f12118a" />
-    <public type="string" name="two_fa_remove" id="0x7f12118b" />
-    <public type="string" name="two_fa_sales_pitch" id="0x7f12118c" />
-    <public type="string" name="two_fa_success_body" id="0x7f12118d" />
-    <public type="string" name="two_fa_success_body_mobile" id="0x7f12118e" />
-    <public type="string" name="two_fa_success_header" id="0x7f12118f" />
-    <public type="string" name="two_fa_token_required" id="0x7f121190" />
-    <public type="string" name="two_fa_use_desktop_app" id="0x7f121191" />
-    <public type="string" name="two_fa_view_backup_codes" id="0x7f121192" />
-    <public type="string" name="two_fa_view_codes" id="0x7f121193" />
-    <public type="string" name="two_users_typing" id="0x7f121194" />
-    <public type="string" name="ucrop_error_input_data_is_absent" id="0x7f121195" />
-    <public type="string" name="ucrop_label_edit_photo" id="0x7f121196" />
-    <public type="string" name="ucrop_label_original" id="0x7f121197" />
-    <public type="string" name="ucrop_menu_crop" id="0x7f121198" />
-    <public type="string" name="ucrop_mutate_exception_hint" id="0x7f121199" />
-    <public type="string" name="uk" id="0x7f12119a" />
-    <public type="string" name="unable_to_join_channel_full" id="0x7f12119b" />
-    <public type="string" name="unable_to_join_voice_unsupported_mobile" id="0x7f12119c" />
-    <public type="string" name="unable_to_open_media_chooser" id="0x7f12119d" />
-    <public type="string" name="unban" id="0x7f12119e" />
-    <public type="string" name="unban_user_body" id="0x7f12119f" />
-    <public type="string" name="unban_user_title" id="0x7f1211a0" />
-    <public type="string" name="unblock" id="0x7f1211a1" />
-    <public type="string" name="unblock_to_jump_body" id="0x7f1211a2" />
-    <public type="string" name="unblock_to_jump_title" id="0x7f1211a3" />
-    <public type="string" name="uncategorized" id="0x7f1211a4" />
-    <public type="string" name="unclaimed_account_body" id="0x7f1211a5" />
-    <public type="string" name="unclaimed_account_title" id="0x7f1211a6" />
-    <public type="string" name="undeafen" id="0x7f1211a7" />
-    <public type="string" name="unfocus_participant" id="0x7f1211a8" />
-    <public type="string" name="unhandled_link_body" id="0x7f1211a9" />
-    <public type="string" name="unhandled_link_title" id="0x7f1211aa" />
-    <public type="string" name="unified_open_install" id="0x7f1211ab" />
-    <public type="string" name="unknown_game" id="0x7f1211ac" />
-    <public type="string" name="unknown_region" id="0x7f1211ad" />
-    <public type="string" name="unknown_server" id="0x7f1211ae" />
-    <public type="string" name="unknown_user" id="0x7f1211af" />
-    <public type="string" name="unmute" id="0x7f1211b0" />
-    <public type="string" name="unmute_category" id="0x7f1211b1" />
-    <public type="string" name="unnamed" id="0x7f1211b2" />
-    <public type="string" name="unpin" id="0x7f1211b3" />
-    <public type="string" name="unpin_confirm" id="0x7f1211b4" />
-    <public type="string" name="unpin_message" id="0x7f1211b5" />
-    <public type="string" name="unpin_message_body" id="0x7f1211b6" />
-    <public type="string" name="unpin_message_context_menu_hint" id="0x7f1211b7" />
-    <public type="string" name="unpin_message_failed_body" id="0x7f1211b8" />
-    <public type="string" name="unpin_message_failed_title" id="0x7f1211b9" />
-    <public type="string" name="unpin_message_title" id="0x7f1211ba" />
-    <public type="string" name="unread_channels" id="0x7f1211bb" />
-    <public type="string" name="unreads_count" id="0x7f1211bc" />
-    <public type="string" name="unsupported_browser" id="0x7f1211bd" />
-    <public type="string" name="unsupported_browser_body" id="0x7f1211be" />
-    <public type="string" name="unsupported_browser_details" id="0x7f1211bf" />
-    <public type="string" name="unsupported_browser_title" id="0x7f1211c0" />
-    <public type="string" name="unverified_account_body" id="0x7f1211c1" />
-    <public type="string" name="unverified_account_title" id="0x7f1211c2" />
-    <public type="string" name="update_available" id="0x7f1211c3" />
-    <public type="string" name="update_downloaded" id="0x7f1211c4" />
-    <public type="string" name="update_manually" id="0x7f1211c5" />
-    <public type="string" name="upgrade_plan" id="0x7f1211c6" />
-    <public type="string" name="upgrade_yearly" id="0x7f1211c7" />
-    <public type="string" name="upload" id="0x7f1211c8" />
-    <public type="string" name="upload_a_media_file" id="0x7f1211c9" />
-    <public type="string" name="upload_area_cancel_all" id="0x7f1211ca" />
-    <public type="string" name="upload_area_help" id="0x7f1211cb" />
-    <public type="string" name="upload_area_invalid_file_type_help" id="0x7f1211cc" />
-    <public type="string" name="upload_area_invalid_file_type_title" id="0x7f1211cd" />
-    <public type="string" name="upload_area_leave_a_comment" id="0x7f1211ce" />
-    <public type="string" name="upload_area_optional" id="0x7f1211cf" />
-    <public type="string" name="upload_area_title" id="0x7f1211d0" />
-    <public type="string" name="upload_area_title_no_confirmation" id="0x7f1211d1" />
-    <public type="string" name="upload_area_too_large_help" id="0x7f1211d2" />
-    <public type="string" name="upload_area_too_large_title" id="0x7f1211d3" />
-    <public type="string" name="upload_area_upload_failed_help" id="0x7f1211d4" />
-    <public type="string" name="upload_area_upload_failed_title" id="0x7f1211d5" />
-    <public type="string" name="upload_background" id="0x7f1211d6" />
-    <public type="string" name="upload_emoji" id="0x7f1211d7" />
-    <public type="string" name="upload_image" id="0x7f1211d8" />
-    <public type="string" name="upload_load_file_failed" id="0x7f1211d9" />
-    <public type="string" name="upload_open_file_failed" id="0x7f1211da" />
-    <public type="string" name="upload_process_file_failed" id="0x7f1211db" />
-    <public type="string" name="upload_queued" id="0x7f1211dc" />
-    <public type="string" name="uploaded_by" id="0x7f1211dd" />
-    <public type="string" name="uploading_files" id="0x7f1211de" />
-    <public type="string" name="usage_access" id="0x7f1211df" />
-    <public type="string" name="usage_statistics_disable_modal_body" id="0x7f1211e0" />
-    <public type="string" name="usage_statistics_disable_modal_cancel" id="0x7f1211e1" />
-    <public type="string" name="usage_statistics_disable_modal_confirm" id="0x7f1211e2" />
-    <public type="string" name="usage_statistics_disable_modal_title" id="0x7f1211e3" />
-    <public type="string" name="use_external_emojis" id="0x7f1211e4" />
-    <public type="string" name="use_external_emojis_description" id="0x7f1211e5" />
-    <public type="string" name="use_speaker" id="0x7f1211e6" />
-    <public type="string" name="use_vad" id="0x7f1211e7" />
-    <public type="string" name="use_vad_description" id="0x7f1211e8" />
-    <public type="string" name="user_activity_accept_invite" id="0x7f1211e9" />
-    <public type="string" name="user_activity_action_ask_to_join" id="0x7f1211ea" />
-    <public type="string" name="user_activity_action_ask_to_join_user" id="0x7f1211eb" />
-    <public type="string" name="user_activity_action_download_app" id="0x7f1211ec" />
-    <public type="string" name="user_activity_action_failed_to_launch" id="0x7f1211ed" />
-    <public type="string" name="user_activity_action_notify_me" id="0x7f1211ee" />
-    <public type="string" name="user_activity_action_spectate" id="0x7f1211ef" />
-    <public type="string" name="user_activity_action_spectate_user" id="0x7f1211f0" />
-    <public type="string" name="user_activity_already_playing" id="0x7f1211f1" />
-    <public type="string" name="user_activity_already_syncing" id="0x7f1211f2" />
-    <public type="string" name="user_activity_cannot_join_self" id="0x7f1211f3" />
-    <public type="string" name="user_activity_cannot_play_self" id="0x7f1211f4" />
-    <public type="string" name="user_activity_cannot_spectate_self" id="0x7f1211f5" />
-    <public type="string" name="user_activity_cannot_sync_self" id="0x7f1211f6" />
-    <public type="string" name="user_activity_chat_invite_education" id="0x7f1211f7" />
-    <public type="string" name="user_activity_connect_platform" id="0x7f1211f8" />
-    <public type="string" name="user_activity_error_desktop_action" id="0x7f1211f9" />
-    <public type="string" name="user_activity_error_desktop_body" id="0x7f1211fa" />
-    <public type="string" name="user_activity_error_desktop_title" id="0x7f1211fb" />
-    <public type="string" name="user_activity_error_friends_action" id="0x7f1211fc" />
-    <public type="string" name="user_activity_error_friends_body" id="0x7f1211fd" />
-    <public type="string" name="user_activity_error_friends_title" id="0x7f1211fe" />
-    <public type="string" name="user_activity_header_listening" id="0x7f1211ff" />
-    <public type="string" name="user_activity_header_live_on_platform" id="0x7f121200" />
-    <public type="string" name="user_activity_header_playing" id="0x7f121201" />
-    <public type="string" name="user_activity_header_playing_on_platform" id="0x7f121202" />
-    <public type="string" name="user_activity_header_streaming_to_server" id="0x7f121203" />
-    <public type="string" name="user_activity_header_watching" id="0x7f121204" />
-    <public type="string" name="user_activity_in_voice" id="0x7f121205" />
-    <public type="string" name="user_activity_invite_request_expired" id="0x7f121206" />
-    <public type="string" name="user_activity_invite_request_received" id="0x7f121207" />
-    <public type="string" name="user_activity_invite_request_requested" id="0x7f121208" />
-    <public type="string" name="user_activity_invite_request_sent" id="0x7f121209" />
-    <public type="string" name="user_activity_invite_request_waiting" id="0x7f12120a" />
-    <public type="string" name="user_activity_invite_to_join" id="0x7f12120b" />
-    <public type="string" name="user_activity_listen_along" id="0x7f12120c" />
-    <public type="string" name="user_activity_listen_along_description" id="0x7f12120d" />
-    <public type="string" name="user_activity_listening_album" id="0x7f12120e" />
-    <public type="string" name="user_activity_listening_artists" id="0x7f12120f" />
-    <public type="string" name="user_activity_never_mind" id="0x7f121210" />
-    <public type="string" name="user_activity_not_detected" id="0x7f121211" />
-    <public type="string" name="user_activity_play_on_platform" id="0x7f121212" />
-    <public type="string" name="user_activity_respond_nope" id="0x7f121213" />
-    <public type="string" name="user_activity_respond_yeah" id="0x7f121214" />
-    <public type="string" name="user_activity_state_size" id="0x7f121215" />
-    <public type="string" name="user_activity_timestamp_end" id="0x7f121216" />
-    <public type="string" name="user_activity_timestamp_end_simple" id="0x7f121217" />
-    <public type="string" name="user_activity_timestamp_start" id="0x7f121218" />
-    <public type="string" name="user_activity_timestamp_start_simple" id="0x7f121219" />
-    <public type="string" name="user_activity_user_playing_for_days" id="0x7f12121a" />
-    <public type="string" name="user_activity_user_playing_for_hours" id="0x7f12121b" />
-    <public type="string" name="user_activity_user_playing_for_minutes" id="0x7f12121c" />
-    <public type="string" name="user_activity_voice_channel" id="0x7f12121d" />
-    <public type="string" name="user_activity_watch_along" id="0x7f12121e" />
-    <public type="string" name="user_dm_settings" id="0x7f12121f" />
-    <public type="string" name="user_dm_settings_help" id="0x7f121220" />
-    <public type="string" name="user_dm_settings_question" id="0x7f121221" />
-    <public type="string" name="user_explicit_content_filter" id="0x7f121222" />
-    <public type="string" name="user_explicit_content_filter_disabled" id="0x7f121223" />
-    <public type="string" name="user_explicit_content_filter_disabled_help" id="0x7f121224" />
-    <public type="string" name="user_explicit_content_filter_friends_and_non_friends" id="0x7f121225" />
-    <public type="string" name="user_explicit_content_filter_friends_and_non_friends_help" id="0x7f121226" />
-    <public type="string" name="user_explicit_content_filter_help" id="0x7f121227" />
-    <public type="string" name="user_explicit_content_filter_non_friends" id="0x7f121228" />
-    <public type="string" name="user_explicit_content_filter_non_friends_help" id="0x7f121229" />
-    <public type="string" name="user_has_been_blocked" id="0x7f12122a" />
-    <public type="string" name="user_has_been_unblocked" id="0x7f12122b" />
-    <public type="string" name="user_info" id="0x7f12122c" />
-    <public type="string" name="user_management" id="0x7f12122d" />
-    <public type="string" name="user_popout_message" id="0x7f12122e" />
-    <public type="string" name="user_popout_settings" id="0x7f12122f" />
-    <public type="string" name="user_popout_wumpus_tooltip" id="0x7f121230" />
-    <public type="string" name="user_settings" id="0x7f121231" />
-    <public type="string" name="user_settings_account_management" id="0x7f121232" />
-    <public type="string" name="user_settings_activity_feed" id="0x7f121233" />
-    <public type="string" name="user_settings_af_applications_empty_body" id="0x7f121234" />
-    <public type="string" name="user_settings_af_applications_empty_title" id="0x7f121235" />
-    <public type="string" name="user_settings_af_blocked_users" id="0x7f121236" />
-    <public type="string" name="user_settings_af_blocked_users_description" id="0x7f121237" />
-    <public type="string" name="user_settings_af_following_applications" id="0x7f121238" />
-    <public type="string" name="user_settings_af_following_applications_description" id="0x7f121239" />
-    <public type="string" name="user_settings_af_hidden_empty" id="0x7f12123a" />
-    <public type="string" name="user_settings_af_search_cta" id="0x7f12123b" />
-    <public type="string" name="user_settings_af_search_placeholder" id="0x7f12123c" />
-    <public type="string" name="user_settings_af_unblock" id="0x7f12123d" />
-    <public type="string" name="user_settings_af_unfollow" id="0x7f12123e" />
-    <public type="string" name="user_settings_appearance_colorblind_mode_description" id="0x7f12123f" />
-    <public type="string" name="user_settings_appearance_colorblind_mode_title" id="0x7f121240" />
-    <public type="string" name="user_settings_appearance_colors" id="0x7f121241" />
-    <public type="string" name="user_settings_appearance_preview_message_1" id="0x7f121242" />
-    <public type="string" name="user_settings_appearance_preview_message_2_dark" id="0x7f121243" />
-    <public type="string" name="user_settings_appearance_preview_message_2_light" id="0x7f121244" />
-    <public type="string" name="user_settings_appearance_preview_message_3" id="0x7f121245" />
-    <public type="string" name="user_settings_appearance_preview_message_4" id="0x7f121246" />
-    <public type="string" name="user_settings_appearance_preview_message_5" id="0x7f121247" />
-    <public type="string" name="user_settings_appearance_zoom_tip" id="0x7f121248" />
-    <public type="string" name="user_settings_apperannce_disable_games_tab" id="0x7f121249" />
-    <public type="string" name="user_settings_apperannce_disable_games_tab_note" id="0x7f12124a" />
-    <public type="string" name="user_settings_available_codes" id="0x7f12124b" />
-    <public type="string" name="user_settings_close_button" id="0x7f12124c" />
-    <public type="string" name="user_settings_confirm_logout" id="0x7f12124d" />
-    <public type="string" name="user_settings_edit_account" id="0x7f12124e" />
-    <public type="string" name="user_settings_edit_account_password_label" id="0x7f12124f" />
-    <public type="string" name="user_settings_edit_account_tag" id="0x7f121250" />
-    <public type="string" name="user_settings_enter_password_view_codes" id="0x7f121251" />
-    <public type="string" name="user_settings_game_activity" id="0x7f121252" />
-    <public type="string" name="user_settings_game_library" id="0x7f121253" />
-    <public type="string" name="user_settings_games_install_location" id="0x7f121254" />
-    <public type="string" name="user_settings_games_install_location_add" id="0x7f121255" />
-    <public type="string" name="user_settings_games_install_location_make_default" id="0x7f121256" />
-    <public type="string" name="user_settings_games_install_location_name" id="0x7f121257" />
-    <public type="string" name="user_settings_games_install_location_remove" id="0x7f121258" />
-    <public type="string" name="user_settings_games_install_location_space" id="0x7f121259" />
-    <public type="string" name="user_settings_games_install_locations" id="0x7f12125a" />
-    <public type="string" name="user_settings_games_remove_location_body" id="0x7f12125b" />
-    <public type="string" name="user_settings_games_shortcuts" id="0x7f12125c" />
-    <public type="string" name="user_settings_games_shortcuts_desktop" id="0x7f12125d" />
-    <public type="string" name="user_settings_games_shortcuts_desktop_note" id="0x7f12125e" />
-    <public type="string" name="user_settings_games_shortcuts_start_menu" id="0x7f12125f" />
-    <public type="string" name="user_settings_games_shortcuts_start_menu_note" id="0x7f121260" />
-    <public type="string" name="user_settings_hypesquad" id="0x7f121261" />
-    <public type="string" name="user_settings_keybinds_action" id="0x7f121262" />
-    <public type="string" name="user_settings_keybinds_keybind" id="0x7f121263" />
-    <public type="string" name="user_settings_linux_settings" id="0x7f121264" />
-    <public type="string" name="user_settings_mfa_enable_code_body" id="0x7f121265" />
-    <public type="string" name="user_settings_mfa_enable_code_label" id="0x7f121266" />
-    <public type="string" name="user_settings_mfa_enabled" id="0x7f121267" />
-    <public type="string" name="user_settings_mfa_removed" id="0x7f121268" />
-    <public type="string" name="user_settings_minimize_to_tray_body" id="0x7f121269" />
-    <public type="string" name="user_settings_minimize_to_tray_label" id="0x7f12126a" />
-    <public type="string" name="user_settings_my_account" id="0x7f12126b" />
-    <public type="string" name="user_settings_notifications_show_badge_body" id="0x7f12126c" />
-    <public type="string" name="user_settings_notifications_show_badge_label" id="0x7f12126d" />
-    <public type="string" name="user_settings_notifications_show_flash_body" id="0x7f12126e" />
-    <public type="string" name="user_settings_notifications_show_flash_label" id="0x7f12126f" />
-    <public type="string" name="user_settings_open_on_startup_body" id="0x7f121270" />
-    <public type="string" name="user_settings_open_on_startup_label" id="0x7f121271" />
-    <public type="string" name="user_settings_privacy_terms" id="0x7f121272" />
-    <public type="string" name="user_settings_restart_app_mobile" id="0x7f121273" />
-    <public type="string" name="user_settings_save" id="0x7f121274" />
-    <public type="string" name="user_settings_start_minimized_body" id="0x7f121275" />
-    <public type="string" name="user_settings_start_minimized_label" id="0x7f121276" />
-    <public type="string" name="user_settings_startup_behavior" id="0x7f121277" />
-    <public type="string" name="user_settings_streamer_notice_body" id="0x7f121278" />
-    <public type="string" name="user_settings_streamer_notice_title" id="0x7f121279" />
-    <public type="string" name="user_settings_unverified_account_body" id="0x7f12127a" />
-    <public type="string" name="user_settings_used_backup_codes" id="0x7f12127b" />
-    <public type="string" name="user_settings_voice_add_multiple" id="0x7f12127c" />
-    <public type="string" name="user_settings_voice_codec_description" id="0x7f12127d" />
-    <public type="string" name="user_settings_voice_codec_title" id="0x7f12127e" />
-    <public type="string" name="user_settings_voice_mic_test_button_active" id="0x7f12127f" />
-    <public type="string" name="user_settings_voice_mic_test_button_inactive" id="0x7f121280" />
-    <public type="string" name="user_settings_voice_mic_test_description" id="0x7f121281" />
-    <public type="string" name="user_settings_voice_mic_test_title" id="0x7f121282" />
-    <public type="string" name="user_settings_voice_mic_test_voice_caption" id="0x7f121283" />
-    <public type="string" name="user_settings_voice_mic_test_voice_channel_warning" id="0x7f121284" />
-    <public type="string" name="user_settings_voice_mic_test_voice_no_input_notice" id="0x7f121285" />
-    <public type="string" name="user_settings_voice_open_h264" id="0x7f121286" />
-    <public type="string" name="user_settings_voice_video_codec_title" id="0x7f121287" />
-    <public type="string" name="user_settings_voice_video_hook_label" id="0x7f121288" />
-    <public type="string" name="user_settings_windows_settings" id="0x7f121289" />
-    <public type="string" name="user_settings_with_build_override" id="0x7f12128a" />
-    <public type="string" name="user_volume" id="0x7f12128b" />
-    <public type="string" name="username" id="0x7f12128c" />
-    <public type="string" name="username_live" id="0x7f12128d" />
-    <public type="string" name="username_required" id="0x7f12128e" />
-    <public type="string" name="users" id="0x7f12128f" />
-    <public type="string" name="vad_permission_body" id="0x7f121290" />
-    <public type="string" name="vad_permission_small" id="0x7f121291" />
-    <public type="string" name="vad_permission_title" id="0x7f121292" />
-    <public type="string" name="vanity_url" id="0x7f121293" />
-    <public type="string" name="vanity_url_help" id="0x7f121294" />
-    <public type="string" name="vanity_url_help_conflict" id="0x7f121295" />
-    <public type="string" name="vanity_url_help_extended" id="0x7f121296" />
-    <public type="string" name="vanity_url_help_extended_link" id="0x7f121297" />
-    <public type="string" name="vanity_url_hint_mobile" id="0x7f121298" />
-    <public type="string" name="verfication_expired" id="0x7f121299" />
-    <public type="string" name="verfication_expired_suggestion" id="0x7f12129a" />
-    <public type="string" name="verification_body" id="0x7f12129b" />
-    <public type="string" name="verification_body_alt" id="0x7f12129c" />
-    <public type="string" name="verification_email_body" id="0x7f12129d" />
-    <public type="string" name="verification_email_error_body" id="0x7f12129e" />
-    <public type="string" name="verification_email_error_title" id="0x7f12129f" />
-    <public type="string" name="verification_email_title" id="0x7f1212a0" />
-    <public type="string" name="verification_footer" id="0x7f1212a1" />
-    <public type="string" name="verification_footer_logout" id="0x7f1212a2" />
-    <public type="string" name="verification_footer_support" id="0x7f1212a3" />
-    <public type="string" name="verification_level_high_criteria" id="0x7f1212a4" />
-    <public type="string" name="verification_level_low" id="0x7f1212a5" />
-    <public type="string" name="verification_level_low_criteria" id="0x7f1212a6" />
-    <public type="string" name="verification_level_medium" id="0x7f1212a7" />
-    <public type="string" name="verification_level_medium_criteria" id="0x7f1212a8" />
-    <public type="string" name="verification_level_none" id="0x7f1212a9" />
-    <public type="string" name="verification_level_none_criteria" id="0x7f1212aa" />
-    <public type="string" name="verification_level_very_high_criteria" id="0x7f1212ab" />
-    <public type="string" name="verification_open_discord" id="0x7f1212ac" />
-    <public type="string" name="verification_phone_description" id="0x7f1212ad" />
-    <public type="string" name="verification_phone_title" id="0x7f1212ae" />
-    <public type="string" name="verification_title" id="0x7f1212af" />
-    <public type="string" name="verification_verified" id="0x7f1212b0" />
-    <public type="string" name="verification_verifying" id="0x7f1212b1" />
-    <public type="string" name="verify" id="0x7f1212b2" />
-    <public type="string" name="verify_account" id="0x7f1212b3" />
-    <public type="string" name="verify_by" id="0x7f1212b4" />
-    <public type="string" name="verify_by_email" id="0x7f1212b5" />
-    <public type="string" name="verify_by_email_formatted" id="0x7f1212b6" />
-    <public type="string" name="verify_by_phone" id="0x7f1212b7" />
-    <public type="string" name="verify_by_phone_formatted" id="0x7f1212b8" />
-    <public type="string" name="verify_by_recaptcha" id="0x7f1212b9" />
-    <public type="string" name="verify_by_recaptcha_description" id="0x7f1212ba" />
-    <public type="string" name="verify_email_body" id="0x7f1212bb" />
-    <public type="string" name="verify_email_body_resent" id="0x7f1212bc" />
-    <public type="string" name="verify_phone" id="0x7f1212bd" />
-    <public type="string" name="verifying" id="0x7f1212be" />
-    <public type="string" name="very_out_of_date_description" id="0x7f1212bf" />
-    <public type="string" name="vi" id="0x7f1212c0" />
-    <public type="string" name="video" id="0x7f1212c1" />
-    <public type="string" name="video_call" id="0x7f1212c2" />
-    <public type="string" name="video_connect" id="0x7f1212c3" />
-    <public type="string" name="video_poor_connection_body" id="0x7f1212c4" />
-    <public type="string" name="video_poor_connection_title" id="0x7f1212c5" />
-    <public type="string" name="video_preview" id="0x7f1212c6" />
-    <public type="string" name="video_settings" id="0x7f1212c7" />
-    <public type="string" name="video_unavailable" id="0x7f1212c8" />
-    <public type="string" name="video_unsupported_browser_body" id="0x7f1212c9" />
-    <public type="string" name="video_unsupported_browser_title" id="0x7f1212ca" />
-    <public type="string" name="view_and_join_listings" id="0x7f1212cb" />
-    <public type="string" name="view_audit_log" id="0x7f1212cc" />
-    <public type="string" name="view_audit_log_description" id="0x7f1212cd" />
-    <public type="string" name="view_channel" id="0x7f1212ce" />
-    <public type="string" name="view_embed" id="0x7f1212cf" />
-    <public type="string" name="view_guild_analytics" id="0x7f1212d0" />
-    <public type="string" name="view_guild_analytics_description" id="0x7f1212d1" />
-    <public type="string" name="view_profile" id="0x7f1212d2" />
-    <public type="string" name="view_spectators" id="0x7f1212d3" />
-    <public type="string" name="view_surrounding_messages" id="0x7f1212d4" />
-    <public type="string" name="voice" id="0x7f1212d5" />
-    <public type="string" name="voice_and_video" id="0x7f1212d6" />
-    <public type="string" name="voice_call" id="0x7f1212d7" />
-    <public type="string" name="voice_channel" id="0x7f1212d8" />
-    <public type="string" name="voice_channel_empty" id="0x7f1212d9" />
-    <public type="string" name="voice_channel_hide_names" id="0x7f1212da" />
-    <public type="string" name="voice_channel_locked" id="0x7f1212db" />
-    <public type="string" name="voice_channel_show_names" id="0x7f1212dc" />
-    <public type="string" name="voice_channels" id="0x7f1212dd" />
-    <public type="string" name="voice_connect" id="0x7f1212de" />
-    <public type="string" name="voice_disconnect_body" id="0x7f1212df" />
-    <public type="string" name="voice_disconnect_title" id="0x7f1212e0" />
-    <public type="string" name="voice_only" id="0x7f1212e1" />
-    <public type="string" name="voice_permissions" id="0x7f1212e2" />
-    <public type="string" name="voice_settings" id="0x7f1212e3" />
-    <public type="string" name="voice_status_not_connected" id="0x7f1212e4" />
-    <public type="string" name="voice_status_ringing" id="0x7f1212e5" />
-    <public type="string" name="voice_unavailable" id="0x7f1212e6" />
-    <public type="string" name="watch" id="0x7f1212e7" />
-    <public type="string" name="watch_stream" id="0x7f1212e8" />
-    <public type="string" name="watch_stream_in_app" id="0x7f1212e9" />
-    <public type="string" name="watch_stream_streaming" id="0x7f1212ea" />
-    <public type="string" name="watch_stream_tip" id="0x7f1212eb" />
-    <public type="string" name="watch_stream_watching" id="0x7f1212ec" />
-    <public type="string" name="watch_user_stream" id="0x7f1212ed" />
-    <public type="string" name="watching" id="0x7f1212ee" />
-    <public type="string" name="web_browser" id="0x7f1212ef" />
-    <public type="string" name="web_browser_chrome" id="0x7f1212f0" />
-    <public type="string" name="web_browser_in_app" id="0x7f1212f1" />
-    <public type="string" name="web_browser_safari" id="0x7f1212f2" />
-    <public type="string" name="webhook_cancel" id="0x7f1212f3" />
-    <public type="string" name="webhook_create" id="0x7f1212f4" />
-    <public type="string" name="webhook_created_on" id="0x7f1212f5" />
-    <public type="string" name="webhook_delete" id="0x7f1212f6" />
-    <public type="string" name="webhook_delete_body" id="0x7f1212f7" />
-    <public type="string" name="webhook_delete_title" id="0x7f1212f8" />
-    <public type="string" name="webhook_edit" id="0x7f1212f9" />
-    <public type="string" name="webhook_error_creating_webhook" id="0x7f1212fa" />
-    <public type="string" name="webhook_error_deleting_webhook" id="0x7f1212fb" />
-    <public type="string" name="webhook_error_internal_server_error" id="0x7f1212fc" />
-    <public type="string" name="webhook_error_max_webhooks_reached" id="0x7f1212fd" />
-    <public type="string" name="webhook_error_saving_webhook" id="0x7f1212fe" />
-    <public type="string" name="webhook_form_channel" id="0x7f1212ff" />
-    <public type="string" name="webhook_form_name" id="0x7f121300" />
-    <public type="string" name="webhook_form_url" id="0x7f121301" />
-    <public type="string" name="webhook_form_webhook_url_help" id="0x7f121302" />
-    <public type="string" name="webhook_modal_icon_description" id="0x7f121303" />
-    <public type="string" name="webhook_modal_icon_title" id="0x7f121304" />
-    <public type="string" name="webhook_modal_title" id="0x7f121305" />
-    <public type="string" name="webhook_save" id="0x7f121306" />
-    <public type="string" name="webhooks" id="0x7f121307" />
-    <public type="string" name="welcome_message_desktop_apps" id="0x7f121308" />
-    <public type="string" name="welcome_message_instant_invite" id="0x7f121309" />
-    <public type="string" name="welcome_message_mobile_apps" id="0x7f12130a" />
-    <public type="string" name="welcome_message_mobile_instant_invite" id="0x7f12130b" />
-    <public type="string" name="welcome_message_mobile_instant_invite_desc" id="0x7f12130c" />
-    <public type="string" name="welcome_message_mobile_owner_subtitle" id="0x7f12130d" />
-    <public type="string" name="welcome_message_mobile_owner_title" id="0x7f12130e" />
-    <public type="string" name="welcome_message_mobile_upload_icon" id="0x7f12130f" />
-    <public type="string" name="welcome_message_mobile_upload_icon_desc" id="0x7f121310" />
-    <public type="string" name="welcome_message_owner_title" id="0x7f121311" />
-    <public type="string" name="welcome_message_support" id="0x7f121312" />
-    <public type="string" name="welcome_message_title" id="0x7f121313" />
-    <public type="string" name="welcome_message_tutorial" id="0x7f121314" />
-    <public type="string" name="whats_new" id="0x7f121315" />
-    <public type="string" name="whats_new_date" id="0x7f121316" />
-    <public type="string" name="whitelist_failed" id="0x7f121317" />
-    <public type="string" name="whitelisted" id="0x7f121318" />
-    <public type="string" name="whitelisting" id="0x7f121319" />
-    <public type="string" name="widget" id="0x7f12131a" />
-    <public type="string" name="windows" id="0x7f12131b" />
-    <public type="string" name="wumpus" id="0x7f12131c" />
-    <public type="string" name="xbox_authorization_title" id="0x7f12131d" />
-    <public type="string" name="xbox_link" id="0x7f12131e" />
-    <public type="string" name="xbox_pin_step1" id="0x7f12131f" />
-    <public type="string" name="xbox_pin_step2" id="0x7f121320" />
-    <public type="string" name="xbox_pin_step3" id="0x7f121321" />
-    <public type="string" name="yellow" id="0x7f121322" />
-    <public type="string" name="yes_text" id="0x7f121323" />
-    <public type="string" name="your_discord_tag" id="0x7f121324" />
-    <public type="string" name="your_pin_expires" id="0x7f121325" />
-    <public type="string" name="your_pin_is_expired" id="0x7f121326" />
-    <public type="string" name="youre_viewing_older_messages" id="0x7f121327" />
-    <public type="string" name="zh_cn" id="0x7f121328" />
-    <public type="string" name="zh_tw" id="0x7f121329" />
-    <public type="string" name="APKTOOL_DUMMY_38f" id="0x7f12038f" />
+    <public type="string" name="activity_panel_go_live_tooltip_cant_stream_during_dm_call" id="0x7f120082" />
+    <public type="string" name="activity_panel_go_live_tooltip_no_permission_in_guild" id="0x7f120083" />
+    <public type="string" name="activity_panel_go_live_tooltip_no_permission_in_voice" id="0x7f120084" />
+    <public type="string" name="activity_panel_go_live_tooltip_not_in_guild" id="0x7f120085" />
+    <public type="string" name="activtiy_feed_emoji_guild_discovery_subheader" id="0x7f120086" />
+    <public type="string" name="add" id="0x7f120087" />
+    <public type="string" name="add_a_comment_optional" id="0x7f120088" />
+    <public type="string" name="add_a_member" id="0x7f120089" />
+    <public type="string" name="add_a_popular_server_mobile" id="0x7f12008a" />
+    <public type="string" name="add_a_role" id="0x7f12008b" />
+    <public type="string" name="add_a_server" id="0x7f12008c" />
+    <public type="string" name="add_a_server_mobile" id="0x7f12008d" />
+    <public type="string" name="add_by_id" id="0x7f12008e" />
+    <public type="string" name="add_channel_or_category" id="0x7f12008f" />
+    <public type="string" name="add_channel_to_override" id="0x7f120090" />
+    <public type="string" name="add_content" id="0x7f120091" />
+    <public type="string" name="add_friend" id="0x7f120092" />
+    <public type="string" name="add_friend_add_manually" id="0x7f120093" />
+    <public type="string" name="add_friend_already_friends" id="0x7f120094" />
+    <public type="string" name="add_friend_button" id="0x7f120095" />
+    <public type="string" name="add_friend_button_after" id="0x7f120096" />
+    <public type="string" name="add_friend_confirmation" id="0x7f120097" />
+    <public type="string" name="add_friend_description" id="0x7f120098" />
+    <public type="string" name="add_friend_error_discord_tag_username" id="0x7f120099" />
+    <public type="string" name="add_friend_error_invalid_discord_tag" id="0x7f12009a" />
+    <public type="string" name="add_friend_error_numbers_only" id="0x7f12009b" />
+    <public type="string" name="add_friend_error_other" id="0x7f12009c" />
+    <public type="string" name="add_friend_error_too_many_friends" id="0x7f12009d" />
+    <public type="string" name="add_friend_error_username_only" id="0x7f12009e" />
+    <public type="string" name="add_friend_find" id="0x7f12009f" />
+    <public type="string" name="add_friend_friend" id="0x7f1200a0" />
+    <public type="string" name="add_friend_hint" id="0x7f1200a1" />
+    <public type="string" name="add_friend_hint2" id="0x7f1200a2" />
+    <public type="string" name="add_friend_input_hint" id="0x7f1200a3" />
+    <public type="string" name="add_friend_nearby" id="0x7f1200a4" />
+    <public type="string" name="add_friend_nearby_connection_error" id="0x7f1200a5" />
+    <public type="string" name="add_friend_nearby_connection_error_ios" id="0x7f1200a6" />
+    <public type="string" name="add_friend_nearby_disable_scanning" id="0x7f1200a7" />
+    <public type="string" name="add_friend_nearby_enable" id="0x7f1200a8" />
+    <public type="string" name="add_friend_nearby_enable_settings_android" id="0x7f1200a9" />
+    <public type="string" name="add_friend_nearby_generic_error" id="0x7f1200aa" />
+    <public type="string" name="add_friend_nearby_info" id="0x7f1200ab" />
+    <public type="string" name="add_friend_nearby_learn_more" id="0x7f1200ac" />
+    <public type="string" name="add_friend_nearby_looking" id="0x7f1200ad" />
+    <public type="string" name="add_friend_nearby_stopped" id="0x7f1200ae" />
+    <public type="string" name="add_friend_no_capitalization" id="0x7f1200af" />
+    <public type="string" name="add_friend_not_found" id="0x7f1200b0" />
+    <public type="string" name="add_friend_placeholder" id="0x7f1200b1" />
+    <public type="string" name="add_friend_search" id="0x7f1200b2" />
+    <public type="string" name="add_friend_self" id="0x7f1200b3" />
+    <public type="string" name="add_friend_success" id="0x7f1200b4" />
+    <public type="string" name="add_keybind" id="0x7f1200b5" />
+    <public type="string" name="add_keybind_warning" id="0x7f1200b6" />
+    <public type="string" name="add_new_connection" id="0x7f1200b7" />
+    <public type="string" name="add_note" id="0x7f1200b8" />
+    <public type="string" name="add_override" id="0x7f1200b9" />
+    <public type="string" name="add_reaction" id="0x7f1200ba" />
+    <public type="string" name="add_reactions" id="0x7f1200bb" />
+    <public type="string" name="add_reactions_description" id="0x7f1200bc" />
+    <public type="string" name="add_role_label" id="0x7f1200bd" />
+    <public type="string" name="add_role_placeholder" id="0x7f1200be" />
+    <public type="string" name="add_to_dictionary" id="0x7f1200bf" />
+    <public type="string" name="added" id="0x7f1200c0" />
+    <public type="string" name="administrative" id="0x7f1200c1" />
+    <public type="string" name="administrator" id="0x7f1200c2" />
+    <public type="string" name="administrator_description" id="0x7f1200c3" />
+    <public type="string" name="advanced_settings" id="0x7f1200c4" />
+    <public type="string" name="afk_settings" id="0x7f1200c5" />
+    <public type="string" name="aka" id="0x7f1200c6" />
+    <public type="string" name="all_photos" id="0x7f1200c7" />
+    <public type="string" name="all_servers" id="0x7f1200c8" />
+    <public type="string" name="allow_game_detection_mobile" id="0x7f1200c9" />
+    <public type="string" name="allow_server_dms" id="0x7f1200ca" />
+    <public type="string" name="allow_tts_command" id="0x7f1200cb" />
+    <public type="string" name="already_have_account" id="0x7f1200cc" />
+    <public type="string" name="amount" id="0x7f1200cd" />
+    <public type="string" name="android_unknown_view_holder" id="0x7f1200ce" />
+    <public type="string" name="animate_emoji" id="0x7f1200cf" />
+    <public type="string" name="animate_emoji_note" id="0x7f1200d0" />
+    <public type="string" name="animated_emoji" id="0x7f1200d1" />
+    <public type="string" name="answer" id="0x7f1200d2" />
+    <public type="string" name="app_download_now" id="0x7f1200d3" />
+    <public type="string" name="app_information" id="0x7f1200d4" />
+    <public type="string" name="app_name" id="0x7f1200d5" />
+    <public type="string" name="app_not_opened" id="0x7f1200d6" />
+    <public type="string" name="app_opened_body" id="0x7f1200d7" />
+    <public type="string" name="app_opened_title" id="0x7f1200d8" />
+    <public type="string" name="app_opening" id="0x7f1200d9" />
+    <public type="string" name="app_opening_mobile_body" id="0x7f1200da" />
+    <public type="string" name="app_permission_connect_desc" id="0x7f1200db" />
+    <public type="string" name="app_permission_connect_label" id="0x7f1200dc" />
+    <public type="string" name="app_settings" id="0x7f1200dd" />
+    <public type="string" name="app_store" id="0x7f1200de" />
+    <public type="string" name="appbar_scrolling_view_behavior" id="0x7f1200df" />
+    <public type="string" name="appearance" id="0x7f1200e0" />
+    <public type="string" name="apple_billing_url" id="0x7f1200e1" />
+    <public type="string" name="application_addon_purchase_confirmation_blurb" id="0x7f1200e2" />
+    <public type="string" name="application_branch_name_master" id="0x7f1200e3" />
+    <public type="string" name="application_branch_name_unknown" id="0x7f1200e4" />
+    <public type="string" name="application_context_menu_application_id" id="0x7f1200e5" />
+    <public type="string" name="application_context_menu_branch_id" id="0x7f1200e6" />
+    <public type="string" name="application_context_menu_copy_store_link" id="0x7f1200e7" />
+    <public type="string" name="application_context_menu_create_desktop_shortcut" id="0x7f1200e8" />
+    <public type="string" name="application_context_menu_hide" id="0x7f1200e9" />
+    <public type="string" name="application_context_menu_install" id="0x7f1200ea" />
+    <public type="string" name="application_context_menu_launch" id="0x7f1200eb" />
+    <public type="string" name="application_context_menu_launch_application_name" id="0x7f1200ec" />
+    <public type="string" name="application_context_menu_launch_options" id="0x7f1200ed" />
+    <public type="string" name="application_context_menu_private_status" id="0x7f1200ee" />
+    <public type="string" name="application_context_menu_repair" id="0x7f1200ef" />
+    <public type="string" name="application_context_menu_show" id="0x7f1200f0" />
+    <public type="string" name="application_context_menu_show_in_folder" id="0x7f1200f1" />
+    <public type="string" name="application_context_menu_sku_id" id="0x7f1200f2" />
+    <public type="string" name="application_context_menu_store_link" id="0x7f1200f3" />
+    <public type="string" name="application_context_menu_toggle_overlay_disable" id="0x7f1200f4" />
+    <public type="string" name="application_context_menu_uninstall" id="0x7f1200f5" />
+    <public type="string" name="application_entitlement_code_redemption_confirmation_blurb" id="0x7f1200f6" />
+    <public type="string" name="application_entitlement_code_redemption_confirmation_title" id="0x7f1200f7" />
+    <public type="string" name="application_entitlement_code_redemption_go_to_library" id="0x7f1200f8" />
+    <public type="string" name="application_entitlement_code_redemption_invalid" id="0x7f1200f9" />
+    <public type="string" name="application_entitlement_code_redemption_prompt" id="0x7f1200fa" />
+    <public type="string" name="application_entitlement_code_redemption_prompt_ios" id="0x7f1200fb" />
+    <public type="string" name="application_entitlement_code_redemption_redeem" id="0x7f1200fc" />
+    <public type="string" name="application_filter_name_linux" id="0x7f1200fd" />
+    <public type="string" name="application_filter_name_macos" id="0x7f1200fe" />
+    <public type="string" name="application_filter_name_windows" id="0x7f1200ff" />
+    <public type="string" name="application_iap_purchase_return_to_game" id="0x7f120100" />
+    <public type="string" name="application_installation_modal_directory_with_space" id="0x7f120101" />
+    <public type="string" name="application_installation_modal_location" id="0x7f120102" />
+    <public type="string" name="application_installation_modal_no_permission" id="0x7f120103" />
+    <public type="string" name="application_installation_modal_not_enough_space" id="0x7f120104" />
+    <public type="string" name="application_installation_modal_premium_title" id="0x7f120105" />
+    <public type="string" name="application_installation_modal_select_directory" id="0x7f120106" />
+    <public type="string" name="application_installation_modal_title" id="0x7f120107" />
+    <public type="string" name="application_installation_space_used" id="0x7f120108" />
+    <public type="string" name="application_library_empty_search_description" id="0x7f120109" />
+    <public type="string" name="application_library_empty_state_description_import" id="0x7f12010a" />
+    <public type="string" name="application_library_empty_state_description_import_ask" id="0x7f12010b" />
+    <public type="string" name="application_library_empty_state_description_no_import" id="0x7f12010c" />
+    <public type="string" name="application_library_empty_state_header" id="0x7f12010d" />
+    <public type="string" name="application_library_empty_state_header_import" id="0x7f12010e" />
+    <public type="string" name="application_library_filter_placeholder" id="0x7f12010f" />
+    <public type="string" name="application_library_import_accept" id="0x7f120110" />
+    <public type="string" name="application_library_import_deny" id="0x7f120111" />
+    <public type="string" name="application_library_inventory" id="0x7f120112" />
+    <public type="string" name="application_library_my_games" id="0x7f120113" />
+    <public type="string" name="application_library_remove_confirm_body" id="0x7f120114" />
+    <public type="string" name="application_library_remove_confirm_confirm" id="0x7f120115" />
+    <public type="string" name="application_library_remove_confirm_header" id="0x7f120116" />
+    <public type="string" name="application_library_wumpus_alt" id="0x7f120117" />
+    <public type="string" name="application_news_error_body" id="0x7f120118" />
+    <public type="string" name="application_news_error_title" id="0x7f120119" />
+    <public type="string" name="application_preorder_purchase_confirmation_button" id="0x7f12011a" />
+    <public type="string" name="application_progress_indicator_installing" id="0x7f12011b" />
+    <public type="string" name="application_progress_indicator_installing_hours" id="0x7f12011c" />
+    <public type="string" name="application_progress_indicator_installing_minutes" id="0x7f12011d" />
+    <public type="string" name="application_progress_indicator_installing_seconds" id="0x7f12011e" />
+    <public type="string" name="application_progress_indicator_paused" id="0x7f12011f" />
+    <public type="string" name="application_progress_indicator_updating" id="0x7f120120" />
+    <public type="string" name="application_progress_indicator_updating_hours" id="0x7f120121" />
+    <public type="string" name="application_progress_indicator_updating_minutes" id="0x7f120122" />
+    <public type="string" name="application_progress_indicator_updating_seconds" id="0x7f120123" />
+    <public type="string" name="application_store_about_header" id="0x7f120124" />
+    <public type="string" name="application_store_activity_feed_promotion_subtitle" id="0x7f120125" />
+    <public type="string" name="application_store_all_news" id="0x7f120126" />
+    <public type="string" name="application_store_browse" id="0x7f120127" />
+    <public type="string" name="application_store_browse_by_genre_label" id="0x7f120128" />
+    <public type="string" name="application_store_browse_empty_header" id="0x7f120129" />
+    <public type="string" name="application_store_browse_search_placeholder" id="0x7f12012a" />
+    <public type="string" name="application_store_browse_sort_new_releases" id="0x7f12012b" />
+    <public type="string" name="application_store_browse_sort_title_alphabetical" id="0x7f12012c" />
+    <public type="string" name="application_store_browse_sort_title_reverse_alphabetical" id="0x7f12012d" />
+    <public type="string" name="application_store_bundle_purchase_confirmation_blurb" id="0x7f12012e" />
+    <public type="string" name="application_store_buy" id="0x7f12012f" />
+    <public type="string" name="application_store_buy_as_gift" id="0x7f120130" />
+    <public type="string" name="application_store_buy_for_price" id="0x7f120131" />
+    <public type="string" name="application_store_buy_gift" id="0x7f120132" />
+    <public type="string" name="application_store_cloud_saves" id="0x7f120133" />
+    <public type="string" name="application_store_cloud_saves_tooltip" id="0x7f120134" />
+    <public type="string" name="application_store_coming_soon" id="0x7f120135" />
+    <public type="string" name="application_store_controller_support" id="0x7f120136" />
+    <public type="string" name="application_store_controller_support_tooltip" id="0x7f120137" />
+    <public type="string" name="application_store_countdown_days" id="0x7f120138" />
+    <public type="string" name="application_store_countdown_hours" id="0x7f120139" />
+    <public type="string" name="application_store_countdown_minutes" id="0x7f12013a" />
+    <public type="string" name="application_store_countdown_seconds" id="0x7f12013b" />
+    <public type="string" name="application_store_cross_platform" id="0x7f12013c" />
+    <public type="string" name="application_store_cross_platform_tooltip" id="0x7f12013d" />
+    <public type="string" name="application_store_description_read_less" id="0x7f12013e" />
+    <public type="string" name="application_store_description_read_more" id="0x7f12013f" />
+    <public type="string" name="application_store_details_developer" id="0x7f120140" />
+    <public type="string" name="application_store_details_genres" id="0x7f120141" />
+    <public type="string" name="application_store_details_publisher" id="0x7f120142" />
+    <public type="string" name="application_store_details_release_date" id="0x7f120143" />
+    <public type="string" name="application_store_discord_game_invites" id="0x7f120144" />
+    <public type="string" name="application_store_discord_game_invites_tooltip" id="0x7f120145" />
+    <public type="string" name="application_store_downloadable_content" id="0x7f120146" />
+    <public type="string" name="application_store_early_access" id="0x7f120147" />
+    <public type="string" name="application_store_early_access_body" id="0x7f120148" />
+    <public type="string" name="application_store_expand_downloadable_content" id="0x7f120149" />
+    <public type="string" name="application_store_filter_all_genres" id="0x7f12014a" />
+    <public type="string" name="application_store_first_on_discord" id="0x7f12014b" />
+    <public type="string" name="application_store_free" id="0x7f12014c" />
+    <public type="string" name="application_store_free_premium_content" id="0x7f12014d" />
+    <public type="string" name="application_store_free_with_premium" id="0x7f12014e" />
+    <public type="string" name="application_store_genre_action" id="0x7f12014f" />
+    <public type="string" name="application_store_genre_action_adventure" id="0x7f120150" />
+    <public type="string" name="application_store_genre_action_rpg" id="0x7f120151" />
+    <public type="string" name="application_store_genre_adventure" id="0x7f120152" />
+    <public type="string" name="application_store_genre_artillery" id="0x7f120153" />
+    <public type="string" name="application_store_genre_baseball" id="0x7f120154" />
+    <public type="string" name="application_store_genre_basketball" id="0x7f120155" />
+    <public type="string" name="application_store_genre_billiards" id="0x7f120156" />
+    <public type="string" name="application_store_genre_bowling" id="0x7f120157" />
+    <public type="string" name="application_store_genre_boxing" id="0x7f120158" />
+    <public type="string" name="application_store_genre_brawler" id="0x7f120159" />
+    <public type="string" name="application_store_genre_card_game" id="0x7f12015a" />
+    <public type="string" name="application_store_genre_driving_racing" id="0x7f12015b" />
+    <public type="string" name="application_store_genre_dual_joystick_shooter" id="0x7f12015c" />
+    <public type="string" name="application_store_genre_dungeon_crawler" id="0x7f12015d" />
+    <public type="string" name="application_store_genre_education" id="0x7f12015e" />
+    <public type="string" name="application_store_genre_fighting" id="0x7f12015f" />
+    <public type="string" name="application_store_genre_fishing" id="0x7f120160" />
+    <public type="string" name="application_store_genre_fitness" id="0x7f120161" />
+    <public type="string" name="application_store_genre_flight_simulator" id="0x7f120162" />
+    <public type="string" name="application_store_genre_football" id="0x7f120163" />
+    <public type="string" name="application_store_genre_four_x" id="0x7f120164" />
+    <public type="string" name="application_store_genre_fps" id="0x7f120165" />
+    <public type="string" name="application_store_genre_gambling" id="0x7f120166" />
+    <public type="string" name="application_store_genre_golf" id="0x7f120167" />
+    <public type="string" name="application_store_genre_hack_and_slash" id="0x7f120168" />
+    <public type="string" name="application_store_genre_hockey" id="0x7f120169" />
+    <public type="string" name="application_store_genre_life_simulator" id="0x7f12016a" />
+    <public type="string" name="application_store_genre_light_gun" id="0x7f12016b" />
+    <public type="string" name="application_store_genre_massively_multiplayer" id="0x7f12016c" />
+    <public type="string" name="application_store_genre_metroidvania" id="0x7f12016d" />
+    <public type="string" name="application_store_genre_miscellaneous" id="0x7f12016e" />
+    <public type="string" name="application_store_genre_mmorpg" id="0x7f12016f" />
+    <public type="string" name="application_store_genre_moba" id="0x7f120170" />
+    <public type="string" name="application_store_genre_music_rhythm" id="0x7f120171" />
+    <public type="string" name="application_store_genre_open_world" id="0x7f120172" />
+    <public type="string" name="application_store_genre_party_mini_game" id="0x7f120173" />
+    <public type="string" name="application_store_genre_pinball" id="0x7f120174" />
+    <public type="string" name="application_store_genre_platformer" id="0x7f120175" />
+    <public type="string" name="application_store_genre_psychological_horror" id="0x7f120176" />
+    <public type="string" name="application_store_genre_puzzle" id="0x7f120177" />
+    <public type="string" name="application_store_genre_roguelike" id="0x7f120178" />
+    <public type="string" name="application_store_genre_role_playing" id="0x7f120179" />
+    <public type="string" name="application_store_genre_rts" id="0x7f12017a" />
+    <public type="string" name="application_store_genre_sandbox" id="0x7f12017b" />
+    <public type="string" name="application_store_genre_shoot_em_up" id="0x7f12017c" />
+    <public type="string" name="application_store_genre_shooter" id="0x7f12017d" />
+    <public type="string" name="application_store_genre_simulation" id="0x7f12017e" />
+    <public type="string" name="application_store_genre_skateboarding_skating" id="0x7f12017f" />
+    <public type="string" name="application_store_genre_snowboarding_skiing" id="0x7f120180" />
+    <public type="string" name="application_store_genre_soccer" id="0x7f120181" />
+    <public type="string" name="application_store_genre_sports" id="0x7f120182" />
+    <public type="string" name="application_store_genre_stealth" id="0x7f120183" />
+    <public type="string" name="application_store_genre_strategy" id="0x7f120184" />
+    <public type="string" name="application_store_genre_surfing_wakeboarding" id="0x7f120185" />
+    <public type="string" name="application_store_genre_survival" id="0x7f120186" />
+    <public type="string" name="application_store_genre_survival_horror" id="0x7f120187" />
+    <public type="string" name="application_store_genre_title" id="0x7f120188" />
+    <public type="string" name="application_store_genre_tower_defense" id="0x7f120189" />
+    <public type="string" name="application_store_genre_track_field" id="0x7f12018a" />
+    <public type="string" name="application_store_genre_train_simulator" id="0x7f12018b" />
+    <public type="string" name="application_store_genre_trivia_board_game" id="0x7f12018c" />
+    <public type="string" name="application_store_genre_turn_based_strategy" id="0x7f12018d" />
+    <public type="string" name="application_store_genre_vehicular_combat" id="0x7f12018e" />
+    <public type="string" name="application_store_genre_visual_novel" id="0x7f12018f" />
+    <public type="string" name="application_store_genre_wargame" id="0x7f120190" />
+    <public type="string" name="application_store_genre_wrestling" id="0x7f120191" />
+    <public type="string" name="application_store_get_premium" id="0x7f120192" />
+    <public type="string" name="application_store_gift_purchase_confirm_error" id="0x7f120193" />
+    <public type="string" name="application_store_gift_purchase_confirm_monthly_mobile" id="0x7f120194" />
+    <public type="string" name="application_store_gift_purchase_confirm_subscription_monthly" id="0x7f120195" />
+    <public type="string" name="application_store_gift_purchase_confirm_subscription_yearly" id="0x7f120196" />
+    <public type="string" name="application_store_gift_purchase_confirm_yearly_mobile" id="0x7f120197" />
+    <public type="string" name="application_store_gift_purchase_confirmation_blurb" id="0x7f120198" />
+    <public type="string" name="application_store_gift_purchase_confirmation_subtext" id="0x7f120199" />
+    <public type="string" name="application_store_hero_carousel_featured_game" id="0x7f12019a" />
+    <public type="string" name="application_store_hero_carousel_featured_premium_game" id="0x7f12019b" />
+    <public type="string" name="application_store_hero_carousel_learn_more" id="0x7f12019c" />
+    <public type="string" name="application_store_hero_carousel_new_release" id="0x7f12019d" />
+    <public type="string" name="application_store_hide_games_in_library" id="0x7f12019e" />
+    <public type="string" name="application_store_hide_games_in_library_hidden" id="0x7f12019f" />
+    <public type="string" name="application_store_home_footer_main" id="0x7f1201a0" />
+    <public type="string" name="application_store_home_footer_sub" id="0x7f1201a1" />
+    <public type="string" name="application_store_home_recently_added" id="0x7f1201a2" />
+    <public type="string" name="application_store_home_view_all_applications" id="0x7f1201a3" />
+    <public type="string" name="application_store_in_library" id="0x7f1201a4" />
+    <public type="string" name="application_store_link_copied" id="0x7f1201a5" />
+    <public type="string" name="application_store_listing_purchase_generic_error" id="0x7f1201a6" />
+    <public type="string" name="application_store_listing_purchase_generic_error_short" id="0x7f1201a7" />
+    <public type="string" name="application_store_listing_purchase_rate_limit_error" id="0x7f1201a8" />
+    <public type="string" name="application_store_listing_purchase_rate_limit_error_short" id="0x7f1201a9" />
+    <public type="string" name="application_store_listing_select_edition" id="0x7f1201aa" />
+    <public type="string" name="application_store_local_coop" id="0x7f1201ab" />
+    <public type="string" name="application_store_local_coop_tooltip" id="0x7f1201ac" />
+    <public type="string" name="application_store_local_multiplayer" id="0x7f1201ad" />
+    <public type="string" name="application_store_local_multiplayer_tooltip" id="0x7f1201ae" />
+    <public type="string" name="application_store_navigation_browse" id="0x7f1201af" />
+    <public type="string" name="application_store_navigation_browse_premium" id="0x7f1201b0" />
+    <public type="string" name="application_store_new_release" id="0x7f1201b1" />
+    <public type="string" name="application_store_online_coop" id="0x7f1201b2" />
+    <public type="string" name="application_store_online_coop_tooltip" id="0x7f1201b3" />
+    <public type="string" name="application_store_online_multiplayer" id="0x7f1201b4" />
+    <public type="string" name="application_store_online_multiplayer_tooltip" id="0x7f1201b5" />
+    <public type="string" name="application_store_premium_perks" id="0x7f1201b6" />
+    <public type="string" name="application_store_premium_perks_header" id="0x7f1201b7" />
+    <public type="string" name="application_store_preorder" id="0x7f1201b8" />
+    <public type="string" name="application_store_preorder_as_gift" id="0x7f1201b9" />
+    <public type="string" name="application_store_preorder_for_price" id="0x7f1201ba" />
+    <public type="string" name="application_store_preorder_purchase_confirmation_blurb" id="0x7f1201bb" />
+    <public type="string" name="application_store_purchase_application" id="0x7f1201bc" />
+    <public type="string" name="application_store_purchase_available_date" id="0x7f1201bd" />
+    <public type="string" name="application_store_purchase_bundle" id="0x7f1201be" />
+    <public type="string" name="application_store_purchase_confirmation_blurb" id="0x7f1201bf" />
+    <public type="string" name="application_store_purchase_confirmation_title_1" id="0x7f1201c0" />
+    <public type="string" name="application_store_purchase_confirmation_title_2" id="0x7f1201c1" />
+    <public type="string" name="application_store_purchase_confirmation_title_3" id="0x7f1201c2" />
+    <public type="string" name="application_store_purchase_confirmation_title_4" id="0x7f1201c3" />
+    <public type="string" name="application_store_purchase_confirmation_unsupported_os" id="0x7f1201c4" />
+    <public type="string" name="application_store_purchase_consumable" id="0x7f1201c5" />
+    <public type="string" name="application_store_purchase_dlc" id="0x7f1201c6" />
+    <public type="string" name="application_store_purchase_game_unsupported_os" id="0x7f1201c7" />
+    <public type="string" name="application_store_purchase_gift_confirmation_title" id="0x7f1201c8" />
+    <public type="string" name="application_store_purchase_gift_only" id="0x7f1201c9" />
+    <public type="string" name="application_store_purchase_gift_only_ungiftable" id="0x7f1201ca" />
+    <public type="string" name="application_store_purchase_header_bundles_different" id="0x7f1201cb" />
+    <public type="string" name="application_store_purchase_header_bundles_same" id="0x7f1201cc" />
+    <public type="string" name="application_store_purchase_header_consumables_different" id="0x7f1201cd" />
+    <public type="string" name="application_store_purchase_header_consumables_same" id="0x7f1201ce" />
+    <public type="string" name="application_store_purchase_header_distribution_application" id="0x7f1201cf" />
+    <public type="string" name="application_store_purchase_header_distribution_bundle" id="0x7f1201d0" />
+    <public type="string" name="application_store_purchase_header_distribution_consumable" id="0x7f1201d1" />
+    <public type="string" name="application_store_purchase_header_distribution_dlc" id="0x7f1201d2" />
+    <public type="string" name="application_store_purchase_header_dlc_different" id="0x7f1201d3" />
+    <public type="string" name="application_store_purchase_header_dlc_same" id="0x7f1201d4" />
+    <public type="string" name="application_store_purchase_header_first_on" id="0x7f1201d5" />
+    <public type="string" name="application_store_purchase_header_free_application" id="0x7f1201d6" />
+    <public type="string" name="application_store_purchase_header_free_bundle" id="0x7f1201d7" />
+    <public type="string" name="application_store_purchase_header_free_consumable" id="0x7f1201d8" />
+    <public type="string" name="application_store_purchase_header_free_dlc" id="0x7f1201d9" />
+    <public type="string" name="application_store_purchase_header_games_different" id="0x7f1201da" />
+    <public type="string" name="application_store_purchase_header_games_same" id="0x7f1201db" />
+    <public type="string" name="application_store_purchase_header_preorder_application" id="0x7f1201dc" />
+    <public type="string" name="application_store_purchase_header_preorder_bundle" id="0x7f1201dd" />
+    <public type="string" name="application_store_purchase_header_preorder_consumable" id="0x7f1201de" />
+    <public type="string" name="application_store_purchase_header_preorder_dlc" id="0x7f1201df" />
+    <public type="string" name="application_store_purchase_header_preorder_entitled" id="0x7f1201e0" />
+    <public type="string" name="application_store_purchase_header_time_left_until_release" id="0x7f1201e1" />
+    <public type="string" name="application_store_purchase_iap" id="0x7f1201e2" />
+    <public type="string" name="application_store_purchase_in_library" id="0x7f1201e3" />
+    <public type="string" name="application_store_purchase_in_library_hidden" id="0x7f1201e4" />
+    <public type="string" name="application_store_purchase_install_game" id="0x7f1201e5" />
+    <public type="string" name="application_store_purchase_test_mode" id="0x7f1201e6" />
+    <public type="string" name="application_store_purchase_warning_preorder" id="0x7f1201e7" />
+    <public type="string" name="application_store_pvp" id="0x7f1201e8" />
+    <public type="string" name="application_store_pvp_tooltip" id="0x7f1201e9" />
+    <public type="string" name="application_store_rating_descriptors_esrb_alcohol_reference" id="0x7f1201ea" />
+    <public type="string" name="application_store_rating_descriptors_esrb_animated_blood" id="0x7f1201eb" />
+    <public type="string" name="application_store_rating_descriptors_esrb_animated_violence" id="0x7f1201ec" />
+    <public type="string" name="application_store_rating_descriptors_esrb_blood" id="0x7f1201ed" />
+    <public type="string" name="application_store_rating_descriptors_esrb_blood_and_gore" id="0x7f1201ee" />
+    <public type="string" name="application_store_rating_descriptors_esrb_cartoon_violence" id="0x7f1201ef" />
+    <public type="string" name="application_store_rating_descriptors_esrb_comic_mischief" id="0x7f1201f0" />
+    <public type="string" name="application_store_rating_descriptors_esrb_crude_humor" id="0x7f1201f1" />
+    <public type="string" name="application_store_rating_descriptors_esrb_drug_reference" id="0x7f1201f2" />
+    <public type="string" name="application_store_rating_descriptors_esrb_fantasy_violence" id="0x7f1201f3" />
+    <public type="string" name="application_store_rating_descriptors_esrb_in_game_purchases" id="0x7f1201f4" />
+    <public type="string" name="application_store_rating_descriptors_esrb_intense_violence" id="0x7f1201f5" />
+    <public type="string" name="application_store_rating_descriptors_esrb_language" id="0x7f1201f6" />
+    <public type="string" name="application_store_rating_descriptors_esrb_lyrics" id="0x7f1201f7" />
+    <public type="string" name="application_store_rating_descriptors_esrb_mature_humor" id="0x7f1201f8" />
+    <public type="string" name="application_store_rating_descriptors_esrb_mild_blood" id="0x7f1201f9" />
+    <public type="string" name="application_store_rating_descriptors_esrb_mild_cartoon_violence" id="0x7f1201fa" />
+    <public type="string" name="application_store_rating_descriptors_esrb_mild_fantasy_violence" id="0x7f1201fb" />
+    <public type="string" name="application_store_rating_descriptors_esrb_mild_language" id="0x7f1201fc" />
+    <public type="string" name="application_store_rating_descriptors_esrb_mild_lyrics" id="0x7f1201fd" />
+    <public type="string" name="application_store_rating_descriptors_esrb_mild_sexual_themes" id="0x7f1201fe" />
+    <public type="string" name="application_store_rating_descriptors_esrb_mild_suggestive_themes" id="0x7f1201ff" />
+    <public type="string" name="application_store_rating_descriptors_esrb_mild_violence" id="0x7f120200" />
+    <public type="string" name="application_store_rating_descriptors_esrb_nudity" id="0x7f120201" />
+    <public type="string" name="application_store_rating_descriptors_esrb_partual_nudity" id="0x7f120202" />
+    <public type="string" name="application_store_rating_descriptors_esrb_real_gambling" id="0x7f120203" />
+    <public type="string" name="application_store_rating_descriptors_esrb_sexual_content" id="0x7f120204" />
+    <public type="string" name="application_store_rating_descriptors_esrb_sexual_themes" id="0x7f120205" />
+    <public type="string" name="application_store_rating_descriptors_esrb_sexual_violence" id="0x7f120206" />
+    <public type="string" name="application_store_rating_descriptors_esrb_shares_location" id="0x7f120207" />
+    <public type="string" name="application_store_rating_descriptors_esrb_simulated_gambling" id="0x7f120208" />
+    <public type="string" name="application_store_rating_descriptors_esrb_strong_language" id="0x7f120209" />
+    <public type="string" name="application_store_rating_descriptors_esrb_strong_lyrics" id="0x7f12020a" />
+    <public type="string" name="application_store_rating_descriptors_esrb_strong_sexual_content" id="0x7f12020b" />
+    <public type="string" name="application_store_rating_descriptors_esrb_suggestive_themes" id="0x7f12020c" />
+    <public type="string" name="application_store_rating_descriptors_esrb_tobacco_reference" id="0x7f12020d" />
+    <public type="string" name="application_store_rating_descriptors_esrb_unrestricted_internet" id="0x7f12020e" />
+    <public type="string" name="application_store_rating_descriptors_esrb_use_of_alcohol" id="0x7f12020f" />
+    <public type="string" name="application_store_rating_descriptors_esrb_use_of_drugs" id="0x7f120210" />
+    <public type="string" name="application_store_rating_descriptors_esrb_use_of_tobacco" id="0x7f120211" />
+    <public type="string" name="application_store_rating_descriptors_esrb_users_interact" id="0x7f120212" />
+    <public type="string" name="application_store_rating_descriptors_esrb_violence" id="0x7f120213" />
+    <public type="string" name="application_store_rating_descriptors_esrb_violent_references" id="0x7f120214" />
+    <public type="string" name="application_store_rating_descriptors_pegi_bad_language" id="0x7f120215" />
+    <public type="string" name="application_store_rating_descriptors_pegi_discrimination" id="0x7f120216" />
+    <public type="string" name="application_store_rating_descriptors_pegi_drugs" id="0x7f120217" />
+    <public type="string" name="application_store_rating_descriptors_pegi_fear" id="0x7f120218" />
+    <public type="string" name="application_store_rating_descriptors_pegi_gambling" id="0x7f120219" />
+    <public type="string" name="application_store_rating_descriptors_pegi_sex" id="0x7f12021a" />
+    <public type="string" name="application_store_rating_descriptors_pegi_violence" id="0x7f12021b" />
+    <public type="string" name="application_store_recommendation_ever_played_double" id="0x7f12021c" />
+    <public type="string" name="application_store_recommendation_ever_played_other" id="0x7f12021d" />
+    <public type="string" name="application_store_recommendation_ever_played_single" id="0x7f12021e" />
+    <public type="string" name="application_store_recommendation_now_playing_double" id="0x7f12021f" />
+    <public type="string" name="application_store_recommendation_now_playing_other" id="0x7f120220" />
+    <public type="string" name="application_store_recommendation_now_playing_single" id="0x7f120221" />
+    <public type="string" name="application_store_recommendation_recently_played_double" id="0x7f120222" />
+    <public type="string" name="application_store_recommendation_recently_played_other" id="0x7f120223" />
+    <public type="string" name="application_store_recommendation_recently_played_single" id="0x7f120224" />
+    <public type="string" name="application_store_recommended_header" id="0x7f120225" />
+    <public type="string" name="application_store_restricted" id="0x7f120226" />
+    <public type="string" name="application_store_rich_presence" id="0x7f120227" />
+    <public type="string" name="application_store_rich_presence_tooltip" id="0x7f120228" />
+    <public type="string" name="application_store_search_by_title" id="0x7f120229" />
+    <public type="string" name="application_store_search_empty" id="0x7f12022a" />
+    <public type="string" name="application_store_section_title_copyright" id="0x7f12022b" />
+    <public type="string" name="application_store_section_title_details" id="0x7f12022c" />
+    <public type="string" name="application_store_section_title_features" id="0x7f12022d" />
+    <public type="string" name="application_store_section_title_metacritic" id="0x7f12022e" />
+    <public type="string" name="application_store_section_title_news" id="0x7f12022f" />
+    <public type="string" name="application_store_section_title_ratings" id="0x7f120230" />
+    <public type="string" name="application_store_section_title_recommendation" id="0x7f120231" />
+    <public type="string" name="application_store_section_title_system_requirements" id="0x7f120232" />
+    <public type="string" name="application_store_section_title_verified_guild" id="0x7f120233" />
+    <public type="string" name="application_store_secure_networking" id="0x7f120234" />
+    <public type="string" name="application_store_secure_networking_tooltip" id="0x7f120235" />
+    <public type="string" name="application_store_single_player" id="0x7f120236" />
+    <public type="string" name="application_store_single_player_tooltip" id="0x7f120237" />
+    <public type="string" name="application_store_sort_by" id="0x7f120238" />
+    <public type="string" name="application_store_specs_cpu" id="0x7f120239" />
+    <public type="string" name="application_store_specs_memory" id="0x7f12023a" />
+    <public type="string" name="application_store_specs_memory_value" id="0x7f12023b" />
+    <public type="string" name="application_store_specs_minimum" id="0x7f12023c" />
+    <public type="string" name="application_store_specs_network" id="0x7f12023d" />
+    <public type="string" name="application_store_specs_notes" id="0x7f12023e" />
+    <public type="string" name="application_store_specs_os" id="0x7f12023f" />
+    <public type="string" name="application_store_specs_recommended" id="0x7f120240" />
+    <public type="string" name="application_store_specs_sound" id="0x7f120241" />
+    <public type="string" name="application_store_specs_storage" id="0x7f120242" />
+    <public type="string" name="application_store_specs_video" id="0x7f120243" />
+    <public type="string" name="application_store_spectator_mode" id="0x7f120244" />
+    <public type="string" name="application_store_spectator_mode_tooltip" id="0x7f120245" />
+    <public type="string" name="application_store_staff_pick" id="0x7f120246" />
+    <public type="string" name="application_store_the_game_awards_winner" id="0x7f120247" />
+    <public type="string" name="application_store_view_all_news" id="0x7f120248" />
+    <public type="string" name="application_store_warning_dlc_requires_base_application_description" id="0x7f120249" />
+    <public type="string" name="application_store_warning_dlc_requires_base_application_title" id="0x7f12024a" />
+    <public type="string" name="application_store_warning_early_access_description" id="0x7f12024b" />
+    <public type="string" name="application_store_warning_early_access_title" id="0x7f12024c" />
+    <public type="string" name="application_store_warning_requires_desktop_app_description" id="0x7f12024d" />
+    <public type="string" name="application_store_warning_requires_desktop_app_title" id="0x7f12024e" />
+    <public type="string" name="application_store_warning_restricted_in_region_description" id="0x7f12024f" />
+    <public type="string" name="application_store_warning_restricted_in_region_title" id="0x7f120250" />
+    <public type="string" name="application_store_warning_unavailable_in_language_description" id="0x7f120251" />
+    <public type="string" name="application_store_warning_unavailable_in_language_title" id="0x7f120252" />
+    <public type="string" name="application_store_warning_unavailable_linux_description" id="0x7f120253" />
+    <public type="string" name="application_store_warning_unavailable_linux_title" id="0x7f120254" />
+    <public type="string" name="application_store_warning_unavailable_mac_os_title" id="0x7f120255" />
+    <public type="string" name="application_store_warning_unavailable_os_description" id="0x7f120256" />
+    <public type="string" name="application_store_warning_unavailable_windows_title" id="0x7f120257" />
+    <public type="string" name="application_test_mode_view_other_listings" id="0x7f120258" />
+    <public type="string" name="application_uninstall_prompt_body" id="0x7f120259" />
+    <public type="string" name="application_uninstall_prompt_cancel" id="0x7f12025a" />
+    <public type="string" name="application_uninstall_prompt_confirm" id="0x7f12025b" />
+    <public type="string" name="application_uninstall_prompt_title" id="0x7f12025c" />
+    <public type="string" name="applications_and_connections" id="0x7f12025d" />
+    <public type="string" name="applications_and_connections_body" id="0x7f12025e" />
+    <public type="string" name="attach_files" id="0x7f12025f" />
+    <public type="string" name="attach_payment_source_prompt_option" id="0x7f120260" />
+    <public type="string" name="attachment_camera" id="0x7f120261" />
+    <public type="string" name="attachment_compressing" id="0x7f120262" />
+    <public type="string" name="attachment_filename_unknown" id="0x7f120263" />
+    <public type="string" name="attachment_files" id="0x7f120264" />
+    <public type="string" name="attachment_load_failed" id="0x7f120265" />
+    <public type="string" name="attachment_photos" id="0x7f120266" />
+    <public type="string" name="attachment_processing" id="0x7f120267" />
+    <public type="string" name="attachments_keyboard" id="0x7f120268" />
+    <public type="string" name="attenuate_while_speaking_others" id="0x7f120269" />
+    <public type="string" name="attenuate_while_speaking_self" id="0x7f12026a" />
+    <public type="string" name="audio_hint_body" id="0x7f12026b" />
+    <public type="string" name="audio_hint_title" id="0x7f12026c" />
+    <public type="string" name="auth_banned_invite_body" id="0x7f12026d" />
+    <public type="string" name="auth_browser_handoff_detecting_description" id="0x7f12026e" />
+    <public type="string" name="auth_disable_email_notifications_failure_body" id="0x7f12026f" />
+    <public type="string" name="auth_disable_email_notifications_failure_header" id="0x7f120270" />
+    <public type="string" name="auth_disable_email_notifications_success_body" id="0x7f120271" />
+    <public type="string" name="auth_disable_email_notifications_success_header" id="0x7f120272" />
+    <public type="string" name="auth_expired_suggestion" id="0x7f120273" />
+    <public type="string" name="auth_invalid_invite_body" id="0x7f120274" />
+    <public type="string" name="auth_invalid_invite_tip" id="0x7f120275" />
+    <public type="string" name="auth_invalid_invite_title" id="0x7f120276" />
+    <public type="string" name="auth_ip_auth_succeeded_suggestion" id="0x7f120277" />
+    <public type="string" name="auth_login_body" id="0x7f120278" />
+    <public type="string" name="auth_message_invited_by" id="0x7f120279" />
+    <public type="string" name="auth_message_invited_to_stream" id="0x7f12027a" />
+    <public type="string" name="auth_username_tooltip" id="0x7f12027b" />
+    <public type="string" name="auth_verfication_expired_suggestion" id="0x7f12027c" />
+    <public type="string" name="authorization" id="0x7f12027d" />
+    <public type="string" name="authorization_expired" id="0x7f12027e" />
+    <public type="string" name="authorization_expired_suggestion" id="0x7f12027f" />
+    <public type="string" name="authorize" id="0x7f120280" />
+    <public type="string" name="authorized" id="0x7f120281" />
+    <public type="string" name="authorized_apps" id="0x7f120282" />
+    <public type="string" name="authorizing" id="0x7f120283" />
+    <public type="string" name="auto_toggle_streamer_mode_description" id="0x7f120284" />
+    <public type="string" name="auto_toggle_streamer_mode_label" id="0x7f120285" />
+    <public type="string" name="autocomplete_no_results_body" id="0x7f120286" />
+    <public type="string" name="autocomplete_no_results_header" id="0x7f120287" />
+    <public type="string" name="automatic_gain_control" id="0x7f120288" />
+    <public type="string" name="avatar_convert_failure_mobile" id="0x7f120289" />
+    <public type="string" name="avatar_size_option_large" id="0x7f12028a" />
+    <public type="string" name="avatar_size_option_small" id="0x7f12028b" />
+    <public type="string" name="back" id="0x7f12028c" />
+    <public type="string" name="back_button_behavior_label_mobile" id="0x7f12028d" />
+    <public type="string" name="back_button_behavior_mobile" id="0x7f12028e" />
+    <public type="string" name="backspace" id="0x7f12028f" />
+    <public type="string" name="backup_codes_dash" id="0x7f120290" />
+    <public type="string" name="ban" id="0x7f120291" />
+    <public type="string" name="ban_confirm_title" id="0x7f120292" />
+    <public type="string" name="ban_members" id="0x7f120293" />
+    <public type="string" name="ban_members_description" id="0x7f120294" />
+    <public type="string" name="ban_reason" id="0x7f120295" />
+    <public type="string" name="ban_user_body" id="0x7f120296" />
+    <public type="string" name="ban_user_confirmed" id="0x7f120297" />
+    <public type="string" name="ban_user_error_generic" id="0x7f120298" />
+    <public type="string" name="ban_user_title" id="0x7f120299" />
+    <public type="string" name="bans" id="0x7f12029a" />
+    <public type="string" name="bans_header" id="0x7f12029b" />
+    <public type="string" name="bans_hint" id="0x7f12029c" />
+    <public type="string" name="bans_no_results" id="0x7f12029d" />
+    <public type="string" name="bans_no_users_banned" id="0x7f12029e" />
+    <public type="string" name="bans_search_placeholder" id="0x7f12029f" />
+    <public type="string" name="beep_boop" id="0x7f1202a0" />
+    <public type="string" name="beginning_channel" id="0x7f1202a1" />
+    <public type="string" name="beginning_channel_no_history" id="0x7f1202a2" />
+    <public type="string" name="beginning_chat" id="0x7f1202a3" />
+    <public type="string" name="beginning_dm" id="0x7f1202a4" />
+    <public type="string" name="beginning_group_dm" id="0x7f1202a5" />
+    <public type="string" name="beginning_group_dm_managed" id="0x7f1202a6" />
+    <public type="string" name="beta" id="0x7f1202a7" />
+    <public type="string" name="bg" id="0x7f1202a8" />
+    <public type="string" name="billing" id="0x7f1202a9" />
+    <public type="string" name="billing_accept_terms_tooltip" id="0x7f1202aa" />
+    <public type="string" name="billing_account_credit" id="0x7f1202ab" />
+    <public type="string" name="billing_account_credit_plan_months_free" id="0x7f1202ac" />
+    <public type="string" name="billing_add_payment_method" id="0x7f1202ad" />
+    <public type="string" name="billing_address" id="0x7f1202ae" />
+    <public type="string" name="billing_address_address" id="0x7f1202af" />
+    <public type="string" name="billing_address_address2" id="0x7f1202b0" />
+    <public type="string" name="billing_address_address2_placeholder" id="0x7f1202b1" />
+    <public type="string" name="billing_address_address_error_required" id="0x7f1202b2" />
+    <public type="string" name="billing_address_address_placeholder" id="0x7f1202b3" />
+    <public type="string" name="billing_address_city" id="0x7f1202b4" />
+    <public type="string" name="billing_address_city_error_required" id="0x7f1202b5" />
+    <public type="string" name="billing_address_city_placeholder" id="0x7f1202b6" />
+    <public type="string" name="billing_address_country" id="0x7f1202b7" />
+    <public type="string" name="billing_address_country_error_required" id="0x7f1202b8" />
+    <public type="string" name="billing_address_name" id="0x7f1202b9" />
+    <public type="string" name="billing_address_name_error_required" id="0x7f1202ba" />
+    <public type="string" name="billing_address_postal_code" id="0x7f1202bb" />
+    <public type="string" name="billing_address_postal_code_canada_placeholder" id="0x7f1202bc" />
+    <public type="string" name="billing_address_postal_code_error_required" id="0x7f1202bd" />
+    <public type="string" name="billing_address_province" id="0x7f1202be" />
+    <public type="string" name="billing_address_province_error_required" id="0x7f1202bf" />
+    <public type="string" name="billing_address_region" id="0x7f1202c0" />
+    <public type="string" name="billing_address_state" id="0x7f1202c1" />
+    <public type="string" name="billing_address_state_error_required" id="0x7f1202c2" />
+    <public type="string" name="billing_address_zip_code" id="0x7f1202c3" />
+    <public type="string" name="billing_address_zip_code_error_length" id="0x7f1202c4" />
+    <public type="string" name="billing_address_zip_code_error_required" id="0x7f1202c5" />
+    <public type="string" name="billing_address_zip_code_invalid" id="0x7f1202c6" />
+    <public type="string" name="billing_address_zip_code_placeholder" id="0x7f1202c7" />
+    <public type="string" name="billing_apple_description" id="0x7f1202c8" />
+    <public type="string" name="billing_apple_header" id="0x7f1202c9" />
+    <public type="string" name="billing_application_consumable_refund_text_unable" id="0x7f1202ca" />
+    <public type="string" name="billing_application_refund_text" id="0x7f1202cb" />
+    <public type="string" name="billing_application_refund_text_unable" id="0x7f1202cc" />
+    <public type="string" name="billing_change_payment_source" id="0x7f1202cd" />
+    <public type="string" name="billing_code_redemption_redirect" id="0x7f1202ce" />
+    <public type="string" name="billing_error_add_payment_source_streamer_mode" id="0x7f1202cf" />
+    <public type="string" name="billing_error_gateway" id="0x7f1202d0" />
+    <public type="string" name="billing_error_rate_limit" id="0x7f1202d1" />
+    <public type="string" name="billing_error_section_address" id="0x7f1202d2" />
+    <public type="string" name="billing_error_section_card" id="0x7f1202d3" />
+    <public type="string" name="billing_gift_copied" id="0x7f1202d4" />
+    <public type="string" name="billing_gift_link" id="0x7f1202d5" />
+    <public type="string" name="billing_gift_purchase_tooltip" id="0x7f1202d6" />
+    <public type="string" name="billing_gift_refund_text" id="0x7f1202d7" />
+    <public type="string" name="billing_gift_refund_text_unable" id="0x7f1202d8" />
+    <public type="string" name="billing_history" id="0x7f1202d9" />
+    <public type="string" name="billing_is_gift_purchase" id="0x7f1202da" />
+    <public type="string" name="billing_legal_mumbo_jumbo" id="0x7f1202db" />
+    <public type="string" name="billing_legal_mumbo_jumbo_label" id="0x7f1202dc" />
+    <public type="string" name="billing_manage_billing" id="0x7f1202dd" />
+    <public type="string" name="billing_manage_subscription" id="0x7f1202de" />
+    <public type="string" name="billing_managed_by_apple" id="0x7f1202df" />
+    <public type="string" name="billing_no_payment_method" id="0x7f1202e0" />
+    <public type="string" name="billing_no_payment_method_description" id="0x7f1202e1" />
+    <public type="string" name="billing_pay_for_it_with" id="0x7f1202e2" />
+    <public type="string" name="billing_payment_breakdown_taxes" id="0x7f1202e3" />
+    <public type="string" name="billing_payment_breakdown_total" id="0x7f1202e4" />
+    <public type="string" name="billing_payment_choose_gift" id="0x7f1202e5" />
+    <public type="string" name="billing_payment_choose_plan" id="0x7f1202e6" />
+    <public type="string" name="billing_payment_history" id="0x7f1202e7" />
+    <public type="string" name="billing_payment_premium" id="0x7f1202e8" />
+    <public type="string" name="billing_payment_premium_legalese_monthly" id="0x7f1202e9" />
+    <public type="string" name="billing_payment_premium_legalese_yearly" id="0x7f1202ea" />
+    <public type="string" name="billing_payment_source_invalid" id="0x7f1202eb" />
+    <public type="string" name="billing_payment_sources" id="0x7f1202ec" />
+    <public type="string" name="billing_payment_table_header_amount" id="0x7f1202ed" />
+    <public type="string" name="billing_payment_table_header_date" id="0x7f1202ee" />
+    <public type="string" name="billing_payment_table_header_description" id="0x7f1202ef" />
+    <public type="string" name="billing_premium_gift_friend" id="0x7f1202f0" />
+    <public type="string" name="billing_premium_gift_month" id="0x7f1202f1" />
+    <public type="string" name="billing_premium_gift_month_mobile" id="0x7f1202f2" />
+    <public type="string" name="billing_premium_gift_year" id="0x7f1202f3" />
+    <public type="string" name="billing_premium_gift_year_mobile" id="0x7f1202f4" />
+    <public type="string" name="billing_premium_refund_text" id="0x7f1202f5" />
+    <public type="string" name="billing_premium_refund_text_unable" id="0x7f1202f6" />
+    <public type="string" name="billing_preorder_refund_text" id="0x7f1202f7" />
+    <public type="string" name="billing_price_per_month" id="0x7f1202f8" />
+    <public type="string" name="billing_price_per_month_current_plan" id="0x7f1202f9" />
+    <public type="string" name="billing_price_per_month_current_plan_ios" id="0x7f1202fa" />
+    <public type="string" name="billing_price_per_month_mobile" id="0x7f1202fb" />
+    <public type="string" name="billing_price_per_month_upgrade" id="0x7f1202fc" />
+    <public type="string" name="billing_price_per_year" id="0x7f1202fd" />
+    <public type="string" name="billing_price_per_year_current_plan" id="0x7f1202fe" />
+    <public type="string" name="billing_price_per_year_current_plan_ios" id="0x7f1202ff" />
+    <public type="string" name="billing_price_per_year_mobile" id="0x7f120300" />
+    <public type="string" name="billing_price_per_year_months_free" id="0x7f120301" />
+    <public type="string" name="billing_price_per_year_upgrade" id="0x7f120302" />
+    <public type="string" name="billing_purchase_details_header" id="0x7f120303" />
+    <public type="string" name="billing_refund_header" id="0x7f120304" />
+    <public type="string" name="billing_refund_play_time_never_played" id="0x7f120305" />
+    <public type="string" name="billing_refund_play_time_subheader" id="0x7f120306" />
+    <public type="string" name="billing_refund_purchase_date" id="0x7f120307" />
+    <public type="string" name="billing_refund_purchase_date_subheader" id="0x7f120308" />
+    <public type="string" name="billing_refund_release_date_subheader" id="0x7f120309" />
+    <public type="string" name="billing_refund_report_a_problem" id="0x7f12030a" />
+    <public type="string" name="billing_refund_request_button" id="0x7f12030b" />
+    <public type="string" name="billing_sales_tax_added" id="0x7f12030c" />
+    <public type="string" name="billing_sales_tax_included" id="0x7f12030d" />
+    <public type="string" name="billing_secure_tooltip" id="0x7f12030e" />
+    <public type="string" name="billing_step_address" id="0x7f12030f" />
+    <public type="string" name="billing_step_awaiting_authentication" id="0x7f120310" />
+    <public type="string" name="billing_step_credit_card_information" id="0x7f120311" />
+    <public type="string" name="billing_step_payment_info" id="0x7f120312" />
+    <public type="string" name="billing_step_payment_type" id="0x7f120313" />
+    <public type="string" name="billing_step_paypal" id="0x7f120314" />
+    <public type="string" name="billing_step_review" id="0x7f120315" />
+    <public type="string" name="billing_step_select_plan" id="0x7f120316" />
+    <public type="string" name="billing_subscribe" id="0x7f120317" />
+    <public type="string" name="billing_tag_failed" id="0x7f120318" />
+    <public type="string" name="billing_tag_pending" id="0x7f120319" />
+    <public type="string" name="billing_tag_refunded" id="0x7f12031a" />
+    <public type="string" name="billing_tag_reversed" id="0x7f12031b" />
+    <public type="string" name="billing_third_party_eula_label" id="0x7f12031c" />
+    <public type="string" name="block" id="0x7f12031d" />
+    <public type="string" name="blocked" id="0x7f12031e" />
+    <public type="string" name="blocked_messages" id="0x7f12031f" />
+    <public type="string" name="blue" id="0x7f120320" />
+    <public type="string" name="bot_call_idle_disconnect" id="0x7f120321" />
+    <public type="string" name="bot_dm_explicit_content" id="0x7f120322" />
+    <public type="string" name="bot_dm_rate_limited" id="0x7f120323" />
+    <public type="string" name="bot_dm_send_failed" id="0x7f120324" />
+    <public type="string" name="bot_dm_send_message_temporarily_disabled" id="0x7f120325" />
+    <public type="string" name="bot_gdm_explicit_content" id="0x7f120326" />
+    <public type="string" name="bot_guild_explicit_content" id="0x7f120327" />
+    <public type="string" name="bot_requires_email_verification" id="0x7f120328" />
+    <public type="string" name="bot_tag" id="0x7f120329" />
+    <public type="string" name="bot_tag_bot" id="0x7f12032a" />
+    <public type="string" name="bot_tag_server" id="0x7f12032b" />
+    <public type="string" name="bot_video_disabled" id="0x7f12032c" />
+    <public type="string" name="bots" id="0x7f12032d" />
+    <public type="string" name="bots_settings_add" id="0x7f12032e" />
+    <public type="string" name="bots_settings_description" id="0x7f12032f" />
+    <public type="string" name="bots_settings_learn_more" id="0x7f120330" />
+    <public type="string" name="bots_settings_remove" id="0x7f120331" />
+    <public type="string" name="bottom_sheet_behavior" id="0x7f120332" />
+    <public type="string" name="brown" id="0x7f120333" />
+    <public type="string" name="browser_app" id="0x7f120334" />
+    <public type="string" name="browser_chrome" id="0x7f120335" />
+    <public type="string" name="browser_firefox" id="0x7f120336" />
+    <public type="string" name="browser_handoff_authenticating_description" id="0x7f120337" />
+    <public type="string" name="browser_handoff_authenticating_title" id="0x7f120338" />
+    <public type="string" name="browser_handoff_detecting_description" id="0x7f120339" />
+    <public type="string" name="browser_handoff_detecting_title" id="0x7f12033a" />
+    <public type="string" name="browser_handoff_done_description" id="0x7f12033b" />
+    <public type="string" name="browser_handoff_done_safe_to_close" id="0x7f12033c" />
+    <public type="string" name="browser_handoff_done_title" id="0x7f12033d" />
+    <public type="string" name="browser_handoff_failed_title" id="0x7f12033e" />
+    <public type="string" name="browser_handoff_success_action" id="0x7f12033f" />
+    <public type="string" name="browser_handoff_success_body" id="0x7f120340" />
+    <public type="string" name="browser_handoff_success_cancel" id="0x7f120341" />
+    <public type="string" name="browser_handoff_success_title" id="0x7f120342" />
+    <public type="string" name="browser_input_device_warning" id="0x7f120343" />
+    <public type="string" name="browser_not_supported" id="0x7f120344" />
+    <public type="string" name="browser_notifications_enabled_body" id="0x7f120345" />
+    <public type="string" name="browser_opera" id="0x7f120346" />
+    <public type="string" name="browser_output_device_warning" id="0x7f120347" />
+    <public type="string" name="bug_hunter_badge_tooltip" id="0x7f120348" />
+    <public type="string" name="build_override" id="0x7f120349" />
+    <public type="string" name="build_override_apply" id="0x7f12034a" />
+    <public type="string" name="build_override_clear" id="0x7f12034b" />
+    <public type="string" name="build_override_expired" id="0x7f12034c" />
+    <public type="string" name="build_override_for" id="0x7f12034d" />
+    <public type="string" name="build_override_id" id="0x7f12034e" />
+    <public type="string" name="build_override_incompatible_client" id="0x7f12034f" />
+    <public type="string" name="build_override_invalid" id="0x7f120350" />
+    <public type="string" name="build_override_invalid_user" id="0x7f120351" />
+    <public type="string" name="build_override_isnt_available" id="0x7f120352" />
+    <public type="string" name="build_override_link_copied" id="0x7f120353" />
+    <public type="string" name="build_override_link_copy" id="0x7f120354" />
+    <public type="string" name="bundle_ready_body" id="0x7f120355" />
+    <public type="string" name="bundle_ready_later" id="0x7f120356" />
+    <public type="string" name="bundle_ready_restart" id="0x7f120357" />
+    <public type="string" name="bundle_ready_title" id="0x7f120358" />
+    <public type="string" name="burgundy" id="0x7f120359" />
+    <public type="string" name="cache_cleared" id="0x7f12035a" />
+    <public type="string" name="call" id="0x7f12035b" />
+    <public type="string" name="call_invite_not_friends" id="0x7f12035c" />
+    <public type="string" name="call_options" id="0x7f12035d" />
+    <public type="string" name="call_unavailable" id="0x7f12035e" />
+    <public type="string" name="call_user" id="0x7f12035f" />
+    <public type="string" name="camera_enable_access" id="0x7f120360" />
+    <public type="string" name="camera_intent_result_error" id="0x7f120361" />
+    <public type="string" name="camera_no_access" id="0x7f120362" />
+    <public type="string" name="camera_no_device" id="0x7f120363" />
+    <public type="string" name="camera_not_enabled" id="0x7f120364" />
+    <public type="string" name="camera_off" id="0x7f120365" />
+    <public type="string" name="camera_on" id="0x7f120366" />
+    <public type="string" name="camera_permission_denied_msg" id="0x7f120367" />
+    <public type="string" name="camera_roll" id="0x7f120368" />
+    <public type="string" name="camera_switch" id="0x7f120369" />
+    <public type="string" name="camera_switched" id="0x7f12036a" />
+    <public type="string" name="camera_unavailable" id="0x7f12036b" />
+    <public type="string" name="camera_unknown_error" id="0x7f12036c" />
+    <public type="string" name="cancel" id="0x7f12036d" />
+    <public type="string" name="cannot_deny_missing_permission" id="0x7f12036e" />
+    <public type="string" name="cannot_deny_self_simple" id="0x7f12036f" />
+    <public type="string" name="cannot_deny_singular_permission" id="0x7f120370" />
+    <public type="string" name="cannot_manage_higher_rank" id="0x7f120371" />
+    <public type="string" name="cannot_manage_is_owner" id="0x7f120372" />
+    <public type="string" name="cannot_manage_same_rank" id="0x7f120373" />
+    <public type="string" name="captcha" id="0x7f120374" />
+    <public type="string" name="captcha_failed" id="0x7f120375" />
+    <public type="string" name="captcha_failed_play_services" id="0x7f120376" />
+    <public type="string" name="captcha_failed_unsupported" id="0x7f120377" />
+    <public type="string" name="captcha_issues" id="0x7f120378" />
+    <public type="string" name="captcha_open_browser" id="0x7f120379" />
+    <public type="string" name="captcha_problems" id="0x7f12037a" />
+    <public type="string" name="captcha_problems_info" id="0x7f12037b" />
+    <public type="string" name="categories" id="0x7f12037c" />
+    <public type="string" name="category" id="0x7f12037d" />
+    <public type="string" name="category_has_been_deleted" id="0x7f12037e" />
+    <public type="string" name="category_name" id="0x7f12037f" />
+    <public type="string" name="category_settings" id="0x7f120380" />
+    <public type="string" name="category_settings_have_been_updated" id="0x7f120381" />
+    <public type="string" name="certified" id="0x7f120382" />
+    <public type="string" name="certified_device_recommendation_audio_input_and_output_body" id="0x7f120383" />
+    <public type="string" name="certified_device_recommendation_audio_input_body" id="0x7f120384" />
+    <public type="string" name="certified_device_recommendation_audio_output_body" id="0x7f120385" />
+    <public type="string" name="certified_device_recommendation_cancel" id="0x7f120386" />
+    <public type="string" name="certified_device_recommendation_confirm" id="0x7f120387" />
+    <public type="string" name="certified_device_recommendation_title" id="0x7f120388" />
+    <public type="string" name="certified_device_recommendation_video_input_body" id="0x7f120389" />
+    <public type="string" name="change" id="0x7f12038a" />
+    <public type="string" name="change_avatar" id="0x7f12038b" />
+    <public type="string" name="change_banner" id="0x7f12038c" />
+    <public type="string" name="change_category" id="0x7f12038d" />
+    <public type="string" name="change_email" id="0x7f12038e" />
+    <public type="string" name="change_email_short" id="0x7f12038f" />
+    <public type="string" name="change_icon" id="0x7f120390" />
+    <public type="string" name="change_log" id="0x7f120391" />
+    <public type="string" name="change_log_md_body" id="0x7f120392" />
+    <public type="string" name="change_log_md_date" id="0x7f120393" />
+    <public type="string" name="change_log_md_revision" id="0x7f120395" />
+    <public type="string" name="change_log_md_video" id="0x7f120396" />
+    <public type="string" name="change_nickname" id="0x7f120397" />
+    <public type="string" name="change_nickname_description" id="0x7f120398" />
+    <public type="string" name="change_nickname_warning" id="0x7f120399" />
+    <public type="string" name="change_password" id="0x7f12039a" />
+    <public type="string" name="change_password_link" id="0x7f12039b" />
+    <public type="string" name="change_phone_number" id="0x7f12039c" />
+    <public type="string" name="change_plan" id="0x7f12039d" />
+    <public type="string" name="change_splash" id="0x7f12039e" />
+    <public type="string" name="change_url" id="0x7f12039f" />
+    <public type="string" name="change_vanity_url" id="0x7f1203a0" />
+    <public type="string" name="change_vanity_url_error" id="0x7f1203a1" />
+    <public type="string" name="channel" id="0x7f1203a2" />
+    <public type="string" name="channel_has_been_deleted" id="0x7f1203a3" />
+    <public type="string" name="channel_locked" id="0x7f1203a4" />
+    <public type="string" name="channel_locked_short" id="0x7f1203a5" />
+    <public type="string" name="channel_locked_to_category" id="0x7f1203a6" />
+    <public type="string" name="channel_members" id="0x7f1203a7" />
+    <public type="string" name="channel_mute_role_description" id="0x7f1203a8" />
+    <public type="string" name="channel_mute_tooltip" id="0x7f1203a9" />
+    <public type="string" name="channel_name_required" id="0x7f1203aa" />
+    <public type="string" name="channel_or_category" id="0x7f1203ab" />
+    <public type="string" name="channel_order_updated" id="0x7f1203ac" />
+    <public type="string" name="channel_permissions" id="0x7f1203ad" />
+    <public type="string" name="channel_select" id="0x7f1203ae" />
+    <public type="string" name="channel_settings" id="0x7f1203af" />
+    <public type="string" name="channel_settings_have_been_updated" id="0x7f1203b0" />
+    <public type="string" name="channel_slowmode_cooldown" id="0x7f1203b1" />
+    <public type="string" name="channel_slowmode_desc" id="0x7f1203b2" />
+    <public type="string" name="channel_slowmode_desc_hours" id="0x7f1203b3" />
+    <public type="string" name="channel_slowmode_desc_immune" id="0x7f1203b4" />
+    <public type="string" name="channel_slowmode_desc_minutes" id="0x7f1203b5" />
+    <public type="string" name="channel_slowmode_desc_short" id="0x7f1203b6" />
+    <public type="string" name="channel_topic_empty" id="0x7f1203b7" />
+    <public type="string" name="channel_type" id="0x7f1203b8" />
+    <public type="string" name="channel_unmute_tooltip" id="0x7f1203b9" />
+    <public type="string" name="channels" id="0x7f1203ba" />
+    <public type="string" name="channels_unavailable_body" id="0x7f1203bb" />
+    <public type="string" name="channels_unavailable_title" id="0x7f1203bc" />
+    <public type="string" name="character_counter_content_description" id="0x7f1203bd" />
+    <public type="string" name="character_counter_pattern" id="0x7f1203be" />
+    <public type="string" name="chat" id="0x7f1203bf" />
+    <public type="string" name="chat_attach_invite_to_listen" id="0x7f1203c0" />
+    <public type="string" name="chat_attach_invite_to_play_game" id="0x7f1203c1" />
+    <public type="string" name="chat_attach_invite_to_spectate_game" id="0x7f1203c2" />
+    <public type="string" name="chat_attach_invite_to_watch" id="0x7f1203c3" />
+    <public type="string" name="chat_attach_upload_a_file" id="0x7f1203c4" />
+    <public type="string" name="chat_attach_upload_or_invite" id="0x7f1203c5" />
+    <public type="string" name="chat_behavior" id="0x7f1203c6" />
+    <public type="string" name="chatters_description" id="0x7f1203c7" />
+    <public type="string" name="checking_for_updates" id="0x7f1203c8" />
+    <public type="string" name="choose" id="0x7f1203c9" />
+    <public type="string" name="choose_an_application" id="0x7f1203ca" />
+    <public type="string" name="claim_account" id="0x7f1203cb" />
+    <public type="string" name="claim_account_body" id="0x7f1203cc" />
+    <public type="string" name="claim_account_email_to" id="0x7f1203cd" />
+    <public type="string" name="claim_account_get_app" id="0x7f1203ce" />
+    <public type="string" name="claim_account_promote_app" id="0x7f1203cf" />
+    <public type="string" name="claim_account_required_body" id="0x7f1203d0" />
+    <public type="string" name="claim_account_required_email_to" id="0x7f1203d1" />
+    <public type="string" name="clear_attachments" id="0x7f1203d2" />
+    <public type="string" name="clear_cache" id="0x7f1203d3" />
+    <public type="string" name="clone_channel" id="0x7f1203d4" />
+    <public type="string" name="clone_channel_help" id="0x7f1203d5" />
+    <public type="string" name="close" id="0x7f1203d6" />
+    <public type="string" name="close_action_sheet" id="0x7f1203d7" />
+    <public type="string" name="close_dm" id="0x7f1203d8" />
+    <public type="string" name="close_drawer" id="0x7f1203d9" />
+    <public type="string" name="close_stream" id="0x7f1203da" />
+    <public type="string" name="close_window" id="0x7f1203db" />
+    <public type="string" name="cloud_sync_icon_tooltip_done" id="0x7f1203dc" />
+    <public type="string" name="cloud_sync_icon_tooltip_planning" id="0x7f1203dd" />
+    <public type="string" name="cloud_sync_icon_tooltip_preparing" id="0x7f1203de" />
+    <public type="string" name="cloud_sync_icon_tooltip_pulling" id="0x7f1203df" />
+    <public type="string" name="cloud_sync_icon_tooltip_pushing" id="0x7f1203e0" />
+    <public type="string" name="cloud_sync_icon_tooltip_supported" id="0x7f1203e1" />
+    <public type="string" name="cloud_sync_modal_conflict_choice_download" id="0x7f1203e2" />
+    <public type="string" name="cloud_sync_modal_conflict_choice_upload" id="0x7f1203e3" />
+    <public type="string" name="cloud_sync_modal_conflict_description" id="0x7f1203e4" />
+    <public type="string" name="cloud_sync_modal_conflict_header" id="0x7f1203e5" />
+    <public type="string" name="cloud_sync_modal_conflict_last_modified" id="0x7f1203e6" />
+    <public type="string" name="cloud_sync_modal_error_description" id="0x7f1203e7" />
+    <public type="string" name="cloud_sync_modal_error_header" id="0x7f1203e8" />
+    <public type="string" name="cloud_sync_modal_or" id="0x7f1203e9" />
+    <public type="string" name="collapse_category" id="0x7f1203ea" />
+    <public type="string" name="com.crashlytics.android.build_id" id="0x7f1203eb" />
+    <public type="string" name="coming_soon" id="0x7f1203ec" />
+    <public type="string" name="coming_soon_notifications" id="0x7f1203ed" />
+    <public type="string" name="coming_soon_title" id="0x7f1203ee" />
+    <public type="string" name="command_giphy_description" id="0x7f1203ef" />
+    <public type="string" name="command_me_description" id="0x7f1203f0" />
+    <public type="string" name="command_nick_description" id="0x7f1203f1" />
+    <public type="string" name="command_nick_failure" id="0x7f1203f2" />
+    <public type="string" name="command_nick_failure_permission" id="0x7f1203f3" />
+    <public type="string" name="command_nick_reset" id="0x7f1203f4" />
+    <public type="string" name="command_nick_success" id="0x7f1203f5" />
+    <public type="string" name="command_shrug_description" id="0x7f1203f6" />
+    <public type="string" name="command_spoiler_description" id="0x7f1203f7" />
+    <public type="string" name="command_tableflip_description" id="0x7f1203f8" />
+    <public type="string" name="command_tableunflip_description" id="0x7f1203f9" />
+    <public type="string" name="command_tts_description" id="0x7f1203fa" />
+    <public type="string" name="commands" id="0x7f1203fb" />
+    <public type="string" name="commands_matching" id="0x7f1203fc" />
+    <public type="string" name="common_google_play_services_enable_button" id="0x7f1203fd" />
+    <public type="string" name="common_google_play_services_enable_text" id="0x7f1203fe" />
+    <public type="string" name="common_google_play_services_enable_title" id="0x7f1203ff" />
+    <public type="string" name="common_google_play_services_install_button" id="0x7f120400" />
+    <public type="string" name="common_google_play_services_install_text" id="0x7f120401" />
+    <public type="string" name="common_google_play_services_install_title" id="0x7f120402" />
+    <public type="string" name="common_google_play_services_notification_channel_name" id="0x7f120403" />
+    <public type="string" name="common_google_play_services_notification_ticker" id="0x7f120404" />
+    <public type="string" name="common_google_play_services_unknown_issue" id="0x7f120405" />
+    <public type="string" name="common_google_play_services_unsupported_text" id="0x7f120406" />
+    <public type="string" name="common_google_play_services_update_button" id="0x7f120407" />
+    <public type="string" name="common_google_play_services_update_text" id="0x7f120408" />
+    <public type="string" name="common_google_play_services_update_title" id="0x7f120409" />
+    <public type="string" name="common_google_play_services_updating_text" id="0x7f12040a" />
+    <public type="string" name="common_google_play_services_wear_update_text" id="0x7f12040b" />
+    <public type="string" name="common_open_on_phone" id="0x7f12040c" />
+    <public type="string" name="common_signin_button_text" id="0x7f12040d" />
+    <public type="string" name="common_signin_button_text_long" id="0x7f12040e" />
+    <public type="string" name="communicators" id="0x7f12040f" />
+    <public type="string" name="compact_mode" id="0x7f120410" />
+    <public type="string" name="completed" id="0x7f120411" />
+    <public type="string" name="configure" id="0x7f120412" />
+    <public type="string" name="confirm" id="0x7f120413" />
+    <public type="string" name="confirm_channel_drag_title" id="0x7f120414" />
+    <public type="string" name="confirm_disable_silence_body" id="0x7f120415" />
+    <public type="string" name="confirm_disable_silence_dont_show" id="0x7f120416" />
+    <public type="string" name="confirm_disable_silence_title" id="0x7f120417" />
+    <public type="string" name="confirm_user_block_body" id="0x7f120418" />
+    <public type="string" name="confirm_user_block_title" id="0x7f120419" />
+    <public type="string" name="connect" id="0x7f12041a" />
+    <public type="string" name="connect_account_description" id="0x7f12041b" />
+    <public type="string" name="connect_account_title" id="0x7f12041c" />
+    <public type="string" name="connect_to_video" id="0x7f12041d" />
+    <public type="string" name="connect_to_voice" id="0x7f12041e" />
+    <public type="string" name="connect_voice_only" id="0x7f12041f" />
+    <public type="string" name="connect_with_discord" id="0x7f120420" />
+    <public type="string" name="connected_account_revoked" id="0x7f120421" />
+    <public type="string" name="connected_account_verify_failure" id="0x7f120422" />
+    <public type="string" name="connected_account_verify_success" id="0x7f120423" />
+    <public type="string" name="connected_account_verifying" id="0x7f120424" />
+    <public type="string" name="connected_accounts" id="0x7f120425" />
+    <public type="string" name="connected_accounts_none" id="0x7f120426" />
+    <public type="string" name="connected_accounts_none_title" id="0x7f120427" />
+    <public type="string" name="connected_device_detected_cancel_button" id="0x7f120428" />
+    <public type="string" name="connected_device_detected_confirm_button" id="0x7f120429" />
+    <public type="string" name="connected_device_detected_input_and_output_body" id="0x7f12042a" />
+    <public type="string" name="connected_device_detected_input_body" id="0x7f12042b" />
+    <public type="string" name="connected_device_detected_option_input" id="0x7f12042c" />
+    <public type="string" name="connected_device_detected_option_input_and_output" id="0x7f12042d" />
+    <public type="string" name="connected_device_detected_option_output" id="0x7f12042e" />
+    <public type="string" name="connected_device_detected_output_body" id="0x7f12042f" />
+    <public type="string" name="connected_device_detected_title" id="0x7f120430" />
+    <public type="string" name="connected_on_another_client" id="0x7f120431" />
+    <public type="string" name="connecting" id="0x7f120432" />
+    <public type="string" name="connecting_problems_cta" id="0x7f120433" />
+    <public type="string" name="connection_enter_code" id="0x7f120434" />
+    <public type="string" name="connection_invalid_pin" id="0x7f120435" />
+    <public type="string" name="connection_login_with" id="0x7f120436" />
+    <public type="string" name="connection_problems_body" id="0x7f120437" />
+    <public type="string" name="connection_status_authenticating" id="0x7f120438" />
+    <public type="string" name="connection_status_awaiting_endpoint" id="0x7f120439" />
+    <public type="string" name="connection_status_connected" id="0x7f12043a" />
+    <public type="string" name="connection_status_connecting" id="0x7f12043b" />
+    <public type="string" name="connection_status_disconnected" id="0x7f12043c" />
+    <public type="string" name="connection_status_ice_checking" id="0x7f12043d" />
+    <public type="string" name="connection_status_no_route" id="0x7f12043e" />
+    <public type="string" name="connection_status_rtc_connecting" id="0x7f12043f" />
+    <public type="string" name="connection_status_rtc_disconnected" id="0x7f120440" />
+    <public type="string" name="connection_status_stream_connected" id="0x7f120441" />
+    <public type="string" name="connection_status_video_connected" id="0x7f120442" />
+    <public type="string" name="connection_status_voice_connected" id="0x7f120443" />
+    <public type="string" name="connection_verified" id="0x7f120444" />
+    <public type="string" name="connections" id="0x7f120445" />
+    <public type="string" name="content_matching" id="0x7f120446" />
+    <public type="string" name="context_menu_hint" id="0x7f120447" />
+    <public type="string" name="continue_to_webapp" id="0x7f120448" />
+    <public type="string" name="control_volume" id="0x7f120449" />
+    <public type="string" name="convert_emoticons" id="0x7f12044a" />
+    <public type="string" name="convert_emoticons_help" id="0x7f12044b" />
+    <public type="string" name="copied" id="0x7f12044c" />
+    <public type="string" name="copied_text" id="0x7f12044d" />
+    <public type="string" name="copy" id="0x7f12044e" />
+    <public type="string" name="copy_channel_topic" id="0x7f12044f" />
+    <public type="string" name="copy_code" id="0x7f120450" />
+    <public type="string" name="copy_id" id="0x7f120451" />
+    <public type="string" name="copy_image_url" id="0x7f120452" />
+    <public type="string" name="copy_link" id="0x7f120453" />
+    <public type="string" name="copy_message_link" id="0x7f120454" />
+    <public type="string" name="copy_owner_id" id="0x7f120455" />
+    <public type="string" name="copy_text" id="0x7f120456" />
+    <public type="string" name="copy_username" id="0x7f120457" />
+    <public type="string" name="country_codes" id="0x7f120458" />
+    <public type="string" name="country_no_results" id="0x7f120459" />
+    <public type="string" name="cozy_mode" id="0x7f12045a" />
+    <public type="string" name="crash_app_version" id="0x7f12045b" />
+    <public type="string" name="crash_bummer_man" id="0x7f12045c" />
+    <public type="string" name="crash_details" id="0x7f12045d" />
+    <public type="string" name="crash_device" id="0x7f12045e" />
+    <public type="string" name="crash_device_version" id="0x7f12045f" />
+    <public type="string" name="crash_disclaimer" id="0x7f120460" />
+    <public type="string" name="crash_source" id="0x7f120461" />
+    <public type="string" name="crash_testers_invite" id="0x7f120462" />
+    <public type="string" name="crash_timestamp" id="0x7f120463" />
+    <public type="string" name="crash_unexpected" id="0x7f120464" />
+    <public type="string" name="create" id="0x7f120465" />
+    <public type="string" name="create_category" id="0x7f120466" />
+    <public type="string" name="create_channel" id="0x7f120467" />
+    <public type="string" name="create_friend_dm" id="0x7f120468" />
+    <public type="string" name="create_group_dm" id="0x7f120469" />
+    <public type="string" name="create_instant_invite" id="0x7f12046a" />
+    <public type="string" name="create_lfg_listings_channel" id="0x7f12046b" />
+    <public type="string" name="create_link" id="0x7f12046c" />
+    <public type="string" name="create_listings" id="0x7f12046d" />
+    <public type="string" name="create_news_channel" id="0x7f12046e" />
+    <public type="string" name="create_or_join_modal_header" id="0x7f12046f" />
+    <public type="string" name="create_server_button_body" id="0x7f120470" />
+    <public type="string" name="create_server_button_cta" id="0x7f120471" />
+    <public type="string" name="create_server_button_cta_mobile" id="0x7f120472" />
+    <public type="string" name="create_server_button_cta_mobile_desc" id="0x7f120473" />
+    <public type="string" name="create_server_description" id="0x7f120474" />
+    <public type="string" name="create_server_description_mobile" id="0x7f120475" />
+    <public type="string" name="create_server_guidelines" id="0x7f120476" />
+    <public type="string" name="create_server_title" id="0x7f120477" />
+    <public type="string" name="create_store_channel" id="0x7f120478" />
+    <public type="string" name="create_store_channel_application" id="0x7f120479" />
+    <public type="string" name="create_store_channel_beta_note" id="0x7f12047a" />
+    <public type="string" name="create_store_channel_beta_title" id="0x7f12047b" />
+    <public type="string" name="create_store_channel_branch" id="0x7f12047c" />
+    <public type="string" name="create_store_channel_no_branches" id="0x7f12047d" />
+    <public type="string" name="create_store_channel_no_skus" id="0x7f12047e" />
+    <public type="string" name="create_store_channel_no_skus_error" id="0x7f12047f" />
+    <public type="string" name="create_store_channel_select_application" id="0x7f120480" />
+    <public type="string" name="create_store_channel_select_branch" id="0x7f120481" />
+    <public type="string" name="create_store_channel_select_sku" id="0x7f120482" />
+    <public type="string" name="create_store_channel_sku" id="0x7f120483" />
+    <public type="string" name="create_text_channel" id="0x7f120484" />
+    <public type="string" name="create_voice_channel" id="0x7f120485" />
+    <public type="string" name="credit_card_cvc" id="0x7f120486" />
+    <public type="string" name="credit_card_error_expiration" id="0x7f120487" />
+    <public type="string" name="credit_card_error_number" id="0x7f120488" />
+    <public type="string" name="credit_card_error_required" id="0x7f120489" />
+    <public type="string" name="credit_card_error_security_code" id="0x7f12048a" />
+    <public type="string" name="credit_card_error_zip_code" id="0x7f12048b" />
+    <public type="string" name="credit_card_expiration_date" id="0x7f12048c" />
+    <public type="string" name="credit_card_expiration_date_placeholder" id="0x7f12048d" />
+    <public type="string" name="credit_card_name" id="0x7f12048e" />
+    <public type="string" name="credit_card_name_on_card" id="0x7f12048f" />
+    <public type="string" name="credit_card_number" id="0x7f120490" />
+    <public type="string" name="credit_card_security_code" id="0x7f120491" />
+    <public type="string" name="crop" id="0x7f120492" />
+    <public type="string" name="cs" id="0x7f120493" />
+    <public type="string" name="current_vs_prior_week" id="0x7f120494" />
+    <public type="string" name="currently_controlling" id="0x7f120495" />
+    <public type="string" name="custom_color" id="0x7f120496" />
+    <public type="string" name="custom_status_clear_after" id="0x7f120497" />
+    <public type="string" name="custom_status_clear_custom_status" id="0x7f120498" />
+    <public type="string" name="custom_status_dont_clear" id="0x7f120499" />
+    <public type="string" name="custom_status_edit_custom_status" id="0x7f12049a" />
+    <public type="string" name="custom_status_hotspot" id="0x7f12049b" />
+    <public type="string" name="custom_status_hours" id="0x7f12049c" />
+    <public type="string" name="custom_status_minutes" id="0x7f12049d" />
+    <public type="string" name="custom_status_modal_body" id="0x7f12049e" />
+    <public type="string" name="custom_status_modal_placeholder" id="0x7f12049f" />
+    <public type="string" name="custom_status_set_custom_status" id="0x7f1204a0" />
+    <public type="string" name="custom_status_today" id="0x7f1204a1" />
+    <public type="string" name="custom_tabs_mobile_body" id="0x7f1204a2" />
+    <public type="string" name="custom_tabs_mobile_header" id="0x7f1204a3" />
+    <public type="string" name="cut" id="0x7f1204a4" />
+    <public type="string" name="da" id="0x7f1204a5" />
+    <public type="string" name="dark_blue" id="0x7f1204a6" />
+    <public type="string" name="dark_grey" id="0x7f1204a7" />
+    <public type="string" name="dark_purple" id="0x7f1204a8" />
+    <public type="string" name="dark_teal" id="0x7f1204a9" />
+    <public type="string" name="data_download_requested_status_note" id="0x7f1204aa" />
+    <public type="string" name="data_privacy_controls" id="0x7f1204ab" />
+    <public type="string" name="data_privacy_controls_basic_service_note" id="0x7f1204ac" />
+    <public type="string" name="data_privacy_controls_basic_service_title" id="0x7f1204ad" />
+    <public type="string" name="data_privacy_controls_personal_data_title" id="0x7f1204ae" />
+    <public type="string" name="data_privacy_controls_personalization_note_learn_more" id="0x7f1204af" />
+    <public type="string" name="data_privacy_controls_personalization_title" id="0x7f1204b0" />
+    <public type="string" name="data_privacy_controls_request_data_download" id="0x7f1204b1" />
+    <public type="string" name="data_privacy_controls_request_data_failure_body" id="0x7f1204b2" />
+    <public type="string" name="data_privacy_controls_request_data_failure_title" id="0x7f1204b3" />
+    <public type="string" name="data_privacy_controls_request_data_modal_cancel" id="0x7f1204b4" />
+    <public type="string" name="data_privacy_controls_request_data_modal_confirm" id="0x7f1204b5" />
+    <public type="string" name="data_privacy_controls_request_data_modal_note" id="0x7f1204b6" />
+    <public type="string" name="data_privacy_controls_request_data_modal_success" id="0x7f1204b7" />
+    <public type="string" name="data_privacy_controls_request_data_modal_success_title" id="0x7f1204b8" />
+    <public type="string" name="data_privacy_controls_request_data_modal_title" id="0x7f1204b9" />
+    <public type="string" name="data_privacy_controls_request_data_note" id="0x7f1204ba" />
+    <public type="string" name="data_privacy_controls_request_data_success_body" id="0x7f1204bb" />
+    <public type="string" name="data_privacy_controls_request_data_success_title" id="0x7f1204bc" />
+    <public type="string" name="data_privacy_controls_request_data_tooltip" id="0x7f1204bd" />
+    <public type="string" name="data_privacy_controls_usage_statistics_note" id="0x7f1204be" />
+    <public type="string" name="data_privacy_controls_usage_statistics_title" id="0x7f1204bf" />
+    <public type="string" name="data_privacy_rate_limit_title" id="0x7f1204c0" />
+    <public type="string" name="data_privacy_update_consents_failed" id="0x7f1204c1" />
+    <public type="string" name="date" id="0x7f1204c2" />
+    <public type="string" name="de" id="0x7f1204c3" />
+    <public type="string" name="deafen" id="0x7f1204c4" />
+    <public type="string" name="deafen_members" id="0x7f1204c5" />
+    <public type="string" name="deauthorize" id="0x7f1204c6" />
+    <public type="string" name="deauthorize_app" id="0x7f1204c7" />
+    <public type="string" name="deb" id="0x7f1204c8" />
+    <public type="string" name="debug" id="0x7f1204c9" />
+    <public type="string" name="decline" id="0x7f1204ca" />
+    <public type="string" name="default_app_description" id="0x7f1204cb" />
+    <public type="string" name="default_failure_to_perform_action_message" id="0x7f1204cc" />
+    <public type="string" name="default_input_placeholder" id="0x7f1204cd" />
+    <public type="string" name="default_web_client_id" id="0x7f1204ce" />
+    <public type="string" name="delete" id="0x7f1204cf" />
+    <public type="string" name="delete_account" id="0x7f1204d0" />
+    <public type="string" name="delete_account_body" id="0x7f1204d1" />
+    <public type="string" name="delete_account_error" id="0x7f1204d2" />
+    <public type="string" name="delete_account_transfer_ownership" id="0x7f1204d3" />
+    <public type="string" name="delete_account_transfer_ownership_body" id="0x7f1204d4" />
+    <public type="string" name="delete_app" id="0x7f1204d5" />
+    <public type="string" name="delete_app_confirm_msg" id="0x7f1204d6" />
+    <public type="string" name="delete_category" id="0x7f1204d7" />
+    <public type="string" name="delete_channel" id="0x7f1204d8" />
+    <public type="string" name="delete_channel_body" id="0x7f1204d9" />
+    <public type="string" name="delete_followed_news_body" id="0x7f1204da" />
+    <public type="string" name="delete_message" id="0x7f1204db" />
+    <public type="string" name="delete_message_body" id="0x7f1204dc" />
+    <public type="string" name="delete_message_context_menu_hint" id="0x7f1204dd" />
+    <public type="string" name="delete_message_history_option_24hr" id="0x7f1204de" />
+    <public type="string" name="delete_message_history_option_7d" id="0x7f1204df" />
+    <public type="string" name="delete_message_history_option_none" id="0x7f1204e0" />
+    <public type="string" name="delete_message_report" id="0x7f1204e1" />
+    <public type="string" name="delete_message_title" id="0x7f1204e2" />
+    <public type="string" name="delete_role" id="0x7f1204e3" />
+    <public type="string" name="delete_role_mobile" id="0x7f1204e4" />
+    <public type="string" name="delete_server" id="0x7f1204e5" />
+    <public type="string" name="delete_server_body" id="0x7f1204e6" />
+    <public type="string" name="delete_server_enter_name" id="0x7f1204e7" />
+    <public type="string" name="delete_server_incorrect_name" id="0x7f1204e8" />
+    <public type="string" name="delete_server_title" id="0x7f1204e9" />
+    <public type="string" name="description" id="0x7f1204ea" />
+    <public type="string" name="desktop_app" id="0x7f1204eb" />
+    <public type="string" name="desktop_icon_badge" id="0x7f1204ec" />
+    <public type="string" name="desktop_notifications_enable" id="0x7f1204ed" />
+    <public type="string" name="desktop_notifications_enable_body" id="0x7f1204ee" />
+    <public type="string" name="detect_platform_accounts" id="0x7f1204ef" />
+    <public type="string" name="developer_application_test_mode" id="0x7f1204f0" />
+    <public type="string" name="developer_application_test_mode_activate" id="0x7f1204f1" />
+    <public type="string" name="developer_application_test_mode_authorization_error" id="0x7f1204f2" />
+    <public type="string" name="developer_application_test_mode_clear" id="0x7f1204f3" />
+    <public type="string" name="developer_application_test_mode_invalid" id="0x7f1204f4" />
+    <public type="string" name="developer_application_test_mode_modal_body" id="0x7f1204f5" />
+    <public type="string" name="developer_application_test_mode_modal_header" id="0x7f1204f6" />
+    <public type="string" name="developer_application_test_mode_note" id="0x7f1204f7" />
+    <public type="string" name="developer_application_test_mode_placeholder" id="0x7f1204f8" />
+    <public type="string" name="developer_mode" id="0x7f1204f9" />
+    <public type="string" name="developer_mode_help_text" id="0x7f1204fa" />
+    <public type="string" name="developer_options" id="0x7f1204fb" />
+    <public type="string" name="developer_portal_cta" id="0x7f1204fc" />
+    <public type="string" name="device_no_permission" id="0x7f1204fd" />
+    <public type="string" name="device_settings" id="0x7f1204fe" />
+    <public type="string" name="direct_message" id="0x7f1204ff" />
+    <public type="string" name="direct_messages" id="0x7f120500" />
+    <public type="string" name="disable" id="0x7f120501" />
+    <public type="string" name="disable_account" id="0x7f120502" />
+    <public type="string" name="disable_account_body" id="0x7f120503" />
+    <public type="string" name="disable_email_notifications" id="0x7f120504" />
+    <public type="string" name="disable_email_notifications_body" id="0x7f120505" />
+    <public type="string" name="disable_email_notifications_failed" id="0x7f120506" />
+    <public type="string" name="disable_email_notifications_failed_suggestion" id="0x7f120507" />
+    <public type="string" name="disable_integration_title" id="0x7f120508" />
+    <public type="string" name="disable_integration_twitch_body" id="0x7f120509" />
+    <public type="string" name="disable_integration_youtube_body" id="0x7f12050a" />
+    <public type="string" name="disable_notifications_description" id="0x7f12050b" />
+    <public type="string" name="disable_notifications_label" id="0x7f12050c" />
+    <public type="string" name="disable_sounds_description" id="0x7f12050d" />
+    <public type="string" name="disable_sounds_label" id="0x7f12050e" />
+    <public type="string" name="disabling_email_notifications" id="0x7f12050f" />
+    <public type="string" name="discard_changes" id="0x7f120510" />
+    <public type="string" name="discard_changes_description" id="0x7f120511" />
+    <public type="string" name="disconnect" id="0x7f120512" />
+    <public type="string" name="disconnect_account" id="0x7f120513" />
+    <public type="string" name="disconnect_account_body" id="0x7f120514" />
+    <public type="string" name="disconnect_account_title" id="0x7f120515" />
+    <public type="string" name="disconnect_from_voice" id="0x7f120516" />
+    <public type="string" name="discord" id="0x7f120517" />
+    <public type="string" name="discord_desc_long" id="0x7f120518" />
+    <public type="string" name="discord_desc_short" id="0x7f120519" />
+    <public type="string" name="discord_gg" id="0x7f12051a" />
+    <public type="string" name="discord_rich_presence" id="0x7f12051b" />
+    <public type="string" name="discover" id="0x7f12051c" />
+    <public type="string" name="discover_communities" id="0x7f12051d" />
+    <public type="string" name="discover_friend_servers" id="0x7f12051e" />
+    <public type="string" name="discover_recommended" id="0x7f12051f" />
+    <public type="string" name="discovery" id="0x7f120520" />
+    <public type="string" name="dismiss" id="0x7f120521" />
+    <public type="string" name="dispatch_error_modal_body" id="0x7f120522" />
+    <public type="string" name="dispatch_error_modal_description" id="0x7f120523" />
+    <public type="string" name="dispatch_error_modal_error_label" id="0x7f120524" />
+    <public type="string" name="dispatch_error_modal_header" id="0x7f120525" />
+    <public type="string" name="dispatch_error_modal_open_ticket" id="0x7f120526" />
+    <public type="string" name="dispatch_game_launch_failed_launch_target_not_found" id="0x7f120527" />
+    <public type="string" name="display" id="0x7f120528" />
+    <public type="string" name="display_activity" id="0x7f120529" />
+    <public type="string" name="display_on_profile" id="0x7f12052a" />
+    <public type="string" name="display_option_always" id="0x7f12052b" />
+    <public type="string" name="display_option_never" id="0x7f12052c" />
+    <public type="string" name="display_option_only_while_speaking" id="0x7f12052d" />
+    <public type="string" name="display_silence_warning" id="0x7f12052e" />
+    <public type="string" name="dm" id="0x7f12052f" />
+    <public type="string" name="dm_search_instruction" id="0x7f120530" />
+    <public type="string" name="dm_search_placeholder" id="0x7f120531" />
+    <public type="string" name="dm_settings" id="0x7f120532" />
+    <public type="string" name="dm_verification_text_blocked" id="0x7f120533" />
+    <public type="string" name="done" id="0x7f120534" />
+    <public type="string" name="dont_show_again" id="0x7f120535" />
+    <public type="string" name="download" id="0x7f120536" />
+    <public type="string" name="download_app" id="0x7f120537" />
+    <public type="string" name="download_apps" id="0x7f120538" />
+    <public type="string" name="download_desktop_ptb_footer" id="0x7f120539" />
+    <public type="string" name="download_desktop_stable_footer" id="0x7f12053a" />
+    <public type="string" name="download_desktop_title" id="0x7f12053b" />
+    <public type="string" name="download_failed" id="0x7f12053c" />
+    <public type="string" name="download_file_complete" id="0x7f12053d" />
+    <public type="string" name="download_mobile_apps_description" id="0x7f12053e" />
+    <public type="string" name="download_mobile_apps_description_with_username" id="0x7f12053f" />
+    <public type="string" name="download_mobile_apps_title" id="0x7f120540" />
+    <public type="string" name="download_mobile_modal_apps_header" id="0x7f120541" />
+    <public type="string" name="download_mobile_title" id="0x7f120542" />
+    <public type="string" name="duration_days" id="0x7f120543" />
+    <public type="string" name="duration_hours" id="0x7f120544" />
+    <public type="string" name="duration_hours_short" id="0x7f120545" />
+    <public type="string" name="duration_mins" id="0x7f120546" />
+    <public type="string" name="duration_minutes" id="0x7f120547" />
+    <public type="string" name="duration_minutes_short" id="0x7f120548" />
+    <public type="string" name="duration_seconds" id="0x7f120549" />
+    <public type="string" name="duration_seconds_short" id="0x7f12054a" />
+    <public type="string" name="early_supporter_tooltip" id="0x7f12054b" />
+    <public type="string" name="echo_cancellation" id="0x7f12054c" />
+    <public type="string" name="edit" id="0x7f12054d" />
+    <public type="string" name="edit_category" id="0x7f12054e" />
+    <public type="string" name="edit_channel" id="0x7f12054f" />
+    <public type="string" name="edit_followed_news_body" id="0x7f120550" />
+    <public type="string" name="edit_message" id="0x7f120551" />
+    <public type="string" name="edit_note" id="0x7f120552" />
+    <public type="string" name="edit_overview" id="0x7f120553" />
+    <public type="string" name="edit_roles" id="0x7f120554" />
+    <public type="string" name="edit_textarea_help" id="0x7f120555" />
+    <public type="string" name="edit_user" id="0x7f120556" />
+    <public type="string" name="edit_voice_channel_no_permission" id="0x7f120557" />
+    <public type="string" name="editing_message" id="0x7f120558" />
+    <public type="string" name="editing_with_attachment_error" id="0x7f120559" />
+    <public type="string" name="el" id="0x7f12055a" />
+    <public type="string" name="elevated_permissions_sound_body" id="0x7f12055b" />
+    <public type="string" name="elevated_permissions_sound_no_sound_button" id="0x7f12055c" />
+    <public type="string" name="elevated_permissions_sound_request_access_button" id="0x7f12055d" />
+    <public type="string" name="elevated_permissions_sound_title" id="0x7f12055e" />
+    <public type="string" name="email" id="0x7f12055f" />
+    <public type="string" name="email_invalid" id="0x7f120560" />
+    <public type="string" name="email_required" id="0x7f120561" />
+    <public type="string" name="email_verification_instructions_body" id="0x7f120562" />
+    <public type="string" name="email_verification_instructions_header" id="0x7f120563" />
+    <public type="string" name="embed_links" id="0x7f120564" />
+    <public type="string" name="emoji" id="0x7f120565" />
+    <public type="string" name="emoji_category_activity" id="0x7f120566" />
+    <public type="string" name="emoji_category_custom" id="0x7f120567" />
+    <public type="string" name="emoji_category_flags" id="0x7f120568" />
+    <public type="string" name="emoji_category_food" id="0x7f120569" />
+    <public type="string" name="emoji_category_nature" id="0x7f12056a" />
+    <public type="string" name="emoji_category_objects" id="0x7f12056b" />
+    <public type="string" name="emoji_category_people" id="0x7f12056c" />
+    <public type="string" name="emoji_category_recent" id="0x7f12056d" />
+    <public type="string" name="emoji_category_symbols" id="0x7f12056e" />
+    <public type="string" name="emoji_category_travel" id="0x7f12056f" />
+    <public type="string" name="emoji_disabled_premium_tier_lost" id="0x7f120570" />
+    <public type="string" name="emoji_keyboard_toggle" id="0x7f120571" />
+    <public type="string" name="emoji_matching" id="0x7f120572" />
+    <public type="string" name="emoji_name" id="0x7f120573" />
+    <public type="string" name="emoji_section" id="0x7f120574" />
+    <public type="string" name="emoji_slots_available" id="0x7f120575" />
+    <public type="string" name="emoji_too_big" id="0x7f120576" />
+    <public type="string" name="en_gb" id="0x7f120577" />
+    <public type="string" name="en_us" id="0x7f120578" />
+    <public type="string" name="enable" id="0x7f120579" />
+    <public type="string" name="enable_ingame_overlay" id="0x7f12057a" />
+    <public type="string" name="enable_privacy_access" id="0x7f12057b" />
+    <public type="string" name="enable_streamer_mode_description" id="0x7f12057c" />
+    <public type="string" name="enable_streamer_mode_label" id="0x7f12057d" />
+    <public type="string" name="enable_twitch_emoji_sync" id="0x7f12057e" />
+    <public type="string" name="engagement_ratio" id="0x7f12057f" />
+    <public type="string" name="enter_email_body" id="0x7f120580" />
+    <public type="string" name="enter_phone_description" id="0x7f120581" />
+    <public type="string" name="enter_phone_title" id="0x7f120582" />
+    <public type="string" name="enter_vanity_url" id="0x7f120583" />
+    <public type="string" name="errors_action_to_take" id="0x7f120584" />
+    <public type="string" name="errors_activity_feed_crash" id="0x7f120585" />
+    <public type="string" name="errors_reload" id="0x7f120586" />
+    <public type="string" name="errors_restart_app" id="0x7f120587" />
+    <public type="string" name="errors_store_crash" id="0x7f120588" />
+    <public type="string" name="errors_unexpected_crash" id="0x7f120589" />
+    <public type="string" name="es_es" id="0x7f12058a" />
+    <public type="string" name="everyone_popout_body" id="0x7f12058b" />
+    <public type="string" name="everyone_popout_enter" id="0x7f12058c" />
+    <public type="string" name="everyone_popout_esc" id="0x7f12058d" />
+    <public type="string" name="everyone_popout_footer" id="0x7f12058e" />
+    <public type="string" name="everyone_popout_send_now" id="0x7f12058f" />
+    <public type="string" name="exit_full_screen" id="0x7f120590" />
+    <public type="string" name="experiment_mobile_only_user_button_cancel" id="0x7f120591" />
+    <public type="string" name="experiment_mobile_only_user_button_go" id="0x7f120592" />
+    <public type="string" name="experiment_mobile_only_user_email_confirmation" id="0x7f120593" />
+    <public type="string" name="experiment_mobile_only_user_header" id="0x7f120594" />
+    <public type="string" name="experiment_mobile_only_user_text1" id="0x7f120595" />
+    <public type="string" name="experiment_mobile_only_user_text2" id="0x7f120596" />
+    <public type="string" name="experimental_encoders" id="0x7f120597" />
+    <public type="string" name="expire_after" id="0x7f120598" />
+    <public type="string" name="expires_in" id="0x7f120599" />
+    <public type="string" name="explicit_content_filter_disabled" id="0x7f12059a" />
+    <public type="string" name="explicit_content_filter_disabled_description" id="0x7f12059b" />
+    <public type="string" name="explicit_content_filter_high" id="0x7f12059c" />
+    <public type="string" name="explicit_content_filter_high_description" id="0x7f12059d" />
+    <public type="string" name="explicit_content_filter_medium" id="0x7f12059e" />
+    <public type="string" name="explicit_content_filter_medium_description" id="0x7f12059f" />
+    <public type="string" name="fab_transformation_scrim_behavior" id="0x7f1205a0" />
+    <public type="string" name="fab_transformation_sheet_behavior" id="0x7f1205a1" />
+    <public type="string" name="facebook" id="0x7f1205a2" />
+    <public type="string" name="failed" id="0x7f1205a3" />
+    <public type="string" name="fcm_fallback_notification_channel_label" id="0x7f1205a4" />
+    <public type="string" name="fi" id="0x7f1205a5" />
+    <public type="string" name="file_rate_kb" id="0x7f1205a6" />
+    <public type="string" name="file_rate_mb" id="0x7f1205a7" />
+    <public type="string" name="file_size_gb" id="0x7f1205a8" />
+    <public type="string" name="file_size_mb" id="0x7f1205a9" />
+    <public type="string" name="file_upload_limit_premium_tier_1" id="0x7f1205aa" />
+    <public type="string" name="file_upload_limit_premium_tier_2" id="0x7f1205ab" />
+    <public type="string" name="file_upload_limit_standard" id="0x7f1205ac" />
+    <public type="string" name="files_permission_reason_msg" id="0x7f1205ad" />
+    <public type="string" name="filter" id="0x7f1205ae" />
+    <public type="string" name="filter_mentions" id="0x7f1205af" />
+    <public type="string" name="filter_options" id="0x7f1205b0" />
+    <public type="string" name="firebase_database_url" id="0x7f1205b1" />
+    <public type="string" name="flash_auto" id="0x7f1205b2" />
+    <public type="string" name="flash_off" id="0x7f1205b3" />
+    <public type="string" name="flash_on" id="0x7f1205b4" />
+    <public type="string" name="focus_participant" id="0x7f1205b5" />
+    <public type="string" name="follow" id="0x7f1205b6" />
+    <public type="string" name="follow_modal_body" id="0x7f1205b7" />
+    <public type="string" name="follow_modal_fail" id="0x7f1205b8" />
+    <public type="string" name="follow_modal_header" id="0x7f1205b9" />
+    <public type="string" name="follow_modal_hint" id="0x7f1205ba" />
+    <public type="string" name="follow_modal_hint_no_perms" id="0x7f1205bb" />
+    <public type="string" name="follow_modal_too_many_webhooks" id="0x7f1205bc" />
+    <public type="string" name="follow_news_chat_input_message" id="0x7f1205bd" />
+    <public type="string" name="follow_success_modal_body" id="0x7f1205be" />
+    <public type="string" name="follow_success_modal_header" id="0x7f1205bf" />
+    <public type="string" name="follower_analytics" id="0x7f1205c0" />
+    <public type="string" name="follower_analytics_header" id="0x7f1205c1" />
+    <public type="string" name="force_sync" id="0x7f1205c2" />
+    <public type="string" name="forgot_password" id="0x7f1205c3" />
+    <public type="string" name="forgot_password_body" id="0x7f1205c4" />
+    <public type="string" name="form_checkbox_debug_logging" id="0x7f1205c5" />
+    <public type="string" name="form_checkbox_qos" id="0x7f1205c6" />
+    <public type="string" name="form_description_audio_mode_android_call" id="0x7f1205c7" />
+    <public type="string" name="form_description_audio_mode_android_communication" id="0x7f1205c8" />
+    <public type="string" name="form_description_push_afk_timeout" id="0x7f1205c9" />
+    <public type="string" name="form_description_tts" id="0x7f1205ca" />
+    <public type="string" name="form_error_generic" id="0x7f1205cb" />
+    <public type="string" name="form_help_afk_channel" id="0x7f1205cc" />
+    <public type="string" name="form_help_attenuation" id="0x7f1205cd" />
+    <public type="string" name="form_help_automatic_vad" id="0x7f1205ce" />
+    <public type="string" name="form_help_bitrate" id="0x7f1205cf" />
+    <public type="string" name="form_help_certified_voice_processing" id="0x7f1205d0" />
+    <public type="string" name="form_help_channel_permissions" id="0x7f1205d1" />
+    <public type="string" name="form_help_custom_code" id="0x7f1205d2" />
+    <public type="string" name="form_help_debug_logging" id="0x7f1205d3" />
+    <public type="string" name="form_help_default_notification_settings" id="0x7f1205d4" />
+    <public type="string" name="form_help_default_notification_settings_mobile" id="0x7f1205d5" />
+    <public type="string" name="form_help_enable_discoverable" id="0x7f1205d6" />
+    <public type="string" name="form_help_enable_featurable" id="0x7f1205d7" />
+    <public type="string" name="form_help_explicit_content_filter" id="0x7f1205d8" />
+    <public type="string" name="form_help_instant_invite_channel" id="0x7f1205d9" />
+    <public type="string" name="form_help_last_seen" id="0x7f1205da" />
+    <public type="string" name="form_help_legacy_subsystem" id="0x7f1205db" />
+    <public type="string" name="form_help_news" id="0x7f1205dc" />
+    <public type="string" name="form_help_nsfw" id="0x7f1205dd" />
+    <public type="string" name="form_help_open_h264" id="0x7f1205de" />
+    <public type="string" name="form_help_premade_widget" id="0x7f1205df" />
+    <public type="string" name="form_help_qos" id="0x7f1205e0" />
+    <public type="string" name="form_help_server_banner" id="0x7f1205e1" />
+    <public type="string" name="form_help_server_description" id="0x7f1205e2" />
+    <public type="string" name="form_help_server_language" id="0x7f1205e3" />
+    <public type="string" name="form_help_slowmode" id="0x7f1205e4" />
+    <public type="string" name="form_help_system_channel" id="0x7f1205e5" />
+    <public type="string" name="form_help_system_channel_join_messages" id="0x7f1205e6" />
+    <public type="string" name="form_help_system_channel_premium_subscription_messages" id="0x7f1205e7" />
+    <public type="string" name="form_help_temporary" id="0x7f1205e8" />
+    <public type="string" name="form_help_user_limit" id="0x7f1205e9" />
+    <public type="string" name="form_help_verification_level" id="0x7f1205ea" />
+    <public type="string" name="form_label_afk_channel" id="0x7f1205eb" />
+    <public type="string" name="form_label_afk_timeout" id="0x7f1205ec" />
+    <public type="string" name="form_label_all" id="0x7f1205ed" />
+    <public type="string" name="form_label_all_messages" id="0x7f1205ee" />
+    <public type="string" name="form_label_android_opensl" id="0x7f1205ef" />
+    <public type="string" name="form_label_android_opensl_default" id="0x7f1205f0" />
+    <public type="string" name="form_label_android_opensl_default_desc" id="0x7f1205f1" />
+    <public type="string" name="form_label_android_opensl_desc" id="0x7f1205f2" />
+    <public type="string" name="form_label_android_opensl_force_disabled" id="0x7f1205f3" />
+    <public type="string" name="form_label_android_opensl_force_disabled_desc" id="0x7f1205f4" />
+    <public type="string" name="form_label_android_opensl_force_enabled" id="0x7f1205f5" />
+    <public type="string" name="form_label_android_opensl_force_enabled_desc" id="0x7f1205f6" />
+    <public type="string" name="form_label_attenuation" id="0x7f1205f7" />
+    <public type="string" name="form_label_audio_mode_android" id="0x7f1205f8" />
+    <public type="string" name="form_label_audio_mode_android_call" id="0x7f1205f9" />
+    <public type="string" name="form_label_audio_mode_android_communication" id="0x7f1205fa" />
+    <public type="string" name="form_label_automatic_vad" id="0x7f1205fb" />
+    <public type="string" name="form_label_automatic_vad_mobile" id="0x7f1205fc" />
+    <public type="string" name="form_label_avatar_size" id="0x7f1205fd" />
+    <public type="string" name="form_label_bitrate" id="0x7f1205fe" />
+    <public type="string" name="form_label_category_permissions" id="0x7f1205ff" />
+    <public type="string" name="form_label_channel_name" id="0x7f120600" />
+    <public type="string" name="form_label_channel_notifcation_settings" id="0x7f120601" />
+    <public type="string" name="form_label_channel_permissions" id="0x7f120602" />
+    <public type="string" name="form_label_channel_topic" id="0x7f120603" />
+    <public type="string" name="form_label_channel_voice_permissions" id="0x7f120604" />
+    <public type="string" name="form_label_current_password" id="0x7f120605" />
+    <public type="string" name="form_label_custom_code" id="0x7f120606" />
+    <public type="string" name="form_label_custom_twitch_emoticon" id="0x7f120607" />
+    <public type="string" name="form_label_default_notification_settings" id="0x7f120608" />
+    <public type="string" name="form_label_delete_message_history" id="0x7f120609" />
+    <public type="string" name="form_label_desktop_notifications" id="0x7f12060a" />
+    <public type="string" name="form_label_desktop_only" id="0x7f12060b" />
+    <public type="string" name="form_label_disabled_for_everyone" id="0x7f12060c" />
+    <public type="string" name="form_label_discovery_settings" id="0x7f12060d" />
+    <public type="string" name="form_label_display_names" id="0x7f12060e" />
+    <public type="string" name="form_label_display_users" id="0x7f12060f" />
+    <public type="string" name="form_label_email" id="0x7f120610" />
+    <public type="string" name="form_label_enable_widget" id="0x7f120611" />
+    <public type="string" name="form_label_expire_grace_period" id="0x7f120612" />
+    <public type="string" name="form_label_explicit_content_filter" id="0x7f120613" />
+    <public type="string" name="form_label_hoist_description" id="0x7f120614" />
+    <public type="string" name="form_label_input" id="0x7f120615" />
+    <public type="string" name="form_label_input_device" id="0x7f120616" />
+    <public type="string" name="form_label_input_mode" id="0x7f120617" />
+    <public type="string" name="form_label_input_sensitivty" id="0x7f120618" />
+    <public type="string" name="form_label_input_volume" id="0x7f120619" />
+    <public type="string" name="form_label_instant_invite" id="0x7f12061a" />
+    <public type="string" name="form_label_instant_invite_channel" id="0x7f12061b" />
+    <public type="string" name="form_label_json_api" id="0x7f12061c" />
+    <public type="string" name="form_label_last_seen" id="0x7f12061d" />
+    <public type="string" name="form_label_local_mute" id="0x7f12061e" />
+    <public type="string" name="form_label_max_age" id="0x7f12061f" />
+    <public type="string" name="form_label_max_uses" id="0x7f120620" />
+    <public type="string" name="form_label_member_add" id="0x7f120621" />
+    <public type="string" name="form_label_membership_expire_behavior" id="0x7f120622" />
+    <public type="string" name="form_label_mentionable" id="0x7f120623" />
+    <public type="string" name="form_label_mentions" id="0x7f120624" />
+    <public type="string" name="form_label_mobile_notifications_behavior" id="0x7f120625" />
+    <public type="string" name="form_label_mobile_notifications_blink" id="0x7f120626" />
+    <public type="string" name="form_label_mobile_notifications_call_desc" id="0x7f120627" />
+    <public type="string" name="form_label_mobile_notifications_inapp_desc" id="0x7f120628" />
+    <public type="string" name="form_label_mobile_notifications_inapp_label" id="0x7f120629" />
+    <public type="string" name="form_label_mobile_notifications_label" id="0x7f12062a" />
+    <public type="string" name="form_label_mobile_notifications_os_control_jump" id="0x7f12062b" />
+    <public type="string" name="form_label_mobile_notifications_os_control_jump_help" id="0x7f12062c" />
+    <public type="string" name="form_label_mobile_notifications_sound_disable" id="0x7f12062d" />
+    <public type="string" name="form_label_mobile_notifications_sound_message" id="0x7f12062e" />
+    <public type="string" name="form_label_mobile_notifications_stream_desc" id="0x7f12062f" />
+    <public type="string" name="form_label_mobile_notifications_system_desc" id="0x7f120630" />
+    <public type="string" name="form_label_mobile_notifications_system_hint" id="0x7f120631" />
+    <public type="string" name="form_label_mobile_notifications_system_label" id="0x7f120632" />
+    <public type="string" name="form_label_mobile_notifications_user_label" id="0x7f120633" />
+    <public type="string" name="form_label_mobile_notifications_vibrations" id="0x7f120634" />
+    <public type="string" name="form_label_mobile_notifications_wake_device" id="0x7f120635" />
+    <public type="string" name="form_label_mobile_push_notifications" id="0x7f120636" />
+    <public type="string" name="form_label_mobile_user_notifications_hint" id="0x7f120637" />
+    <public type="string" name="form_label_mobile_user_notifications_label" id="0x7f120638" />
+    <public type="string" name="form_label_mute_server" id="0x7f120639" />
+    <public type="string" name="form_label_mute_server_description" id="0x7f12063a" />
+    <public type="string" name="form_label_muted" id="0x7f12063b" />
+    <public type="string" name="form_label_new_password" id="0x7f12063c" />
+    <public type="string" name="form_label_new_user" id="0x7f12063d" />
+    <public type="string" name="form_label_news_channel" id="0x7f12063e" />
+    <public type="string" name="form_label_nothing" id="0x7f12063f" />
+    <public type="string" name="form_label_notification_frequency" id="0x7f120640" />
+    <public type="string" name="form_label_notification_position" id="0x7f120641" />
+    <public type="string" name="form_label_nsfw" id="0x7f120642" />
+    <public type="string" name="form_label_nsfw_channel" id="0x7f120643" />
+    <public type="string" name="form_label_off" id="0x7f120644" />
+    <public type="string" name="form_label_only_mentions" id="0x7f120645" />
+    <public type="string" name="form_label_output" id="0x7f120646" />
+    <public type="string" name="form_label_output_device" id="0x7f120647" />
+    <public type="string" name="form_label_output_volume" id="0x7f120648" />
+    <public type="string" name="form_label_overlay_chat_opacity" id="0x7f120649" />
+    <public type="string" name="form_label_overlay_text_chat_notifications" id="0x7f12064a" />
+    <public type="string" name="form_label_password" id="0x7f12064b" />
+    <public type="string" name="form_label_phone_number" id="0x7f12064c" />
+    <public type="string" name="form_label_premade_widget" id="0x7f12064d" />
+    <public type="string" name="form_label_push_afk_timeout" id="0x7f12064e" />
+    <public type="string" name="form_label_qos" id="0x7f12064f" />
+    <public type="string" name="form_label_reason_ban" id="0x7f120650" />
+    <public type="string" name="form_label_reason_kick" id="0x7f120651" />
+    <public type="string" name="form_label_report_reason" id="0x7f120652" />
+    <public type="string" name="form_label_role_add" id="0x7f120653" />
+    <public type="string" name="form_label_role_color" id="0x7f120654" />
+    <public type="string" name="form_label_role_enter_name" id="0x7f120655" />
+    <public type="string" name="form_label_role_name" id="0x7f120656" />
+    <public type="string" name="form_label_role_settings" id="0x7f120657" />
+    <public type="string" name="form_label_roles_pro_tip" id="0x7f120658" />
+    <public type="string" name="form_label_roles_pro_tip_description" id="0x7f120659" />
+    <public type="string" name="form_label_select_channel" id="0x7f12065a" />
+    <public type="string" name="form_label_send_to" id="0x7f12065b" />
+    <public type="string" name="form_label_sensitivty" id="0x7f12065c" />
+    <public type="string" name="form_label_server_banner" id="0x7f12065d" />
+    <public type="string" name="form_label_server_description" id="0x7f12065e" />
+    <public type="string" name="form_label_server_id" id="0x7f12065f" />
+    <public type="string" name="form_label_server_language" id="0x7f120660" />
+    <public type="string" name="form_label_server_name" id="0x7f120661" />
+    <public type="string" name="form_label_server_notification_settings" id="0x7f120662" />
+    <public type="string" name="form_label_server_region" id="0x7f120663" />
+    <public type="string" name="form_label_server_settings" id="0x7f120664" />
+    <public type="string" name="form_label_shortcut" id="0x7f120665" />
+    <public type="string" name="form_label_slowmode" id="0x7f120666" />
+    <public type="string" name="form_label_slowmode_cooldown" id="0x7f120667" />
+    <public type="string" name="form_label_slowmode_off" id="0x7f120668" />
+    <public type="string" name="form_label_stream_volume" id="0x7f120669" />
+    <public type="string" name="form_label_sub_expire_behavior" id="0x7f12066a" />
+    <public type="string" name="form_label_subsystem" id="0x7f12066b" />
+    <public type="string" name="form_label_suppress_everyone" id="0x7f12066c" />
+    <public type="string" name="form_label_synced_members" id="0x7f12066d" />
+    <public type="string" name="form_label_synced_role" id="0x7f12066e" />
+    <public type="string" name="form_label_synced_subs" id="0x7f12066f" />
+    <public type="string" name="form_label_system_channel" id="0x7f120670" />
+    <public type="string" name="form_label_system_channel_settings" id="0x7f120671" />
+    <public type="string" name="form_label_temporary" id="0x7f120672" />
+    <public type="string" name="form_label_test_microphone" id="0x7f120673" />
+    <public type="string" name="form_label_tts" id="0x7f120674" />
+    <public type="string" name="form_label_tts_notifications" id="0x7f120675" />
+    <public type="string" name="form_label_user_limit" id="0x7f120676" />
+    <public type="string" name="form_label_username" id="0x7f120677" />
+    <public type="string" name="form_label_username_mobile" id="0x7f120678" />
+    <public type="string" name="form_label_verification_level" id="0x7f120679" />
+    <public type="string" name="form_label_video_device" id="0x7f12067a" />
+    <public type="string" name="form_label_video_preview" id="0x7f12067b" />
+    <public type="string" name="form_label_voice_diagnostics" id="0x7f12067c" />
+    <public type="string" name="form_label_voice_processing" id="0x7f12067d" />
+    <public type="string" name="form_label_volume" id="0x7f12067e" />
+    <public type="string" name="form_missing_required_fields" id="0x7f12067f" />
+    <public type="string" name="form_placeholder_reason" id="0x7f120680" />
+    <public type="string" name="form_placeholder_server_name" id="0x7f120681" />
+    <public type="string" name="form_placeholder_username" id="0x7f120682" />
+    <public type="string" name="form_report_help_text" id="0x7f120683" />
+    <public type="string" name="form_warning_input_sensitivty" id="0x7f120684" />
+    <public type="string" name="form_warning_video_preview" id="0x7f120685" />
+    <public type="string" name="fr" id="0x7f120686" />
+    <public type="string" name="friend_has_been_deleted" id="0x7f120687" />
+    <public type="string" name="friend_permitted_source" id="0x7f120688" />
+    <public type="string" name="friend_permitted_source_all" id="0x7f120689" />
+    <public type="string" name="friend_permitted_source_mutual_friends" id="0x7f12068a" />
+    <public type="string" name="friend_permitted_source_mutual_guilds" id="0x7f12068b" />
+    <public type="string" name="friend_request_accept" id="0x7f12068c" />
+    <public type="string" name="friend_request_cancel" id="0x7f12068d" />
+    <public type="string" name="friend_request_cancelled" id="0x7f12068e" />
+    <public type="string" name="friend_request_ignore" id="0x7f12068f" />
+    <public type="string" name="friend_request_ignored" id="0x7f120690" />
+    <public type="string" name="friend_request_rate_limited_body" id="0x7f120691" />
+    <public type="string" name="friend_request_rate_limited_button" id="0x7f120692" />
+    <public type="string" name="friend_request_rate_limited_header" id="0x7f120693" />
+    <public type="string" name="friend_request_requires_email_validation_body" id="0x7f120694" />
+    <public type="string" name="friend_request_requires_email_validation_button" id="0x7f120695" />
+    <public type="string" name="friend_request_requires_email_validation_header" id="0x7f120696" />
+    <public type="string" name="friend_request_sent" id="0x7f120697" />
+    <public type="string" name="friends" id="0x7f120698" />
+    <public type="string" name="friends_column_name" id="0x7f120699" />
+    <public type="string" name="friends_column_status" id="0x7f12069a" />
+    <public type="string" name="friends_empty_state_all" id="0x7f12069b" />
+    <public type="string" name="friends_empty_state_all_body" id="0x7f12069c" />
+    <public type="string" name="friends_empty_state_all_cta" id="0x7f12069d" />
+    <public type="string" name="friends_empty_state_all_header" id="0x7f12069e" />
+    <public type="string" name="friends_empty_state_blocked" id="0x7f12069f" />
+    <public type="string" name="friends_empty_state_copy" id="0x7f1206a0" />
+    <public type="string" name="friends_empty_state_online" id="0x7f1206a1" />
+    <public type="string" name="friends_empty_state_pending" id="0x7f1206a2" />
+    <public type="string" name="friends_offline_header" id="0x7f1206a3" />
+    <public type="string" name="friends_online" id="0x7f1206a4" />
+    <public type="string" name="friends_online_header" id="0x7f1206a5" />
+    <public type="string" name="friends_pending_request_expand" id="0x7f1206a6" />
+    <public type="string" name="friends_pending_request_expand_collapse" id="0x7f1206a7" />
+    <public type="string" name="friends_pending_request_header" id="0x7f1206a8" />
+    <public type="string" name="friends_row_action_button_accessibility_label_accept" id="0x7f1206a9" />
+    <public type="string" name="friends_row_action_button_accessibility_label_call" id="0x7f1206aa" />
+    <public type="string" name="friends_row_action_button_accessibility_label_decline" id="0x7f1206ab" />
+    <public type="string" name="friends_row_action_button_accessibility_label_message" id="0x7f1206ac" />
+    <public type="string" name="friends_section_add_friend" id="0x7f1206ad" />
+    <public type="string" name="friends_section_all" id="0x7f1206ae" />
+    <public type="string" name="friends_section_online" id="0x7f1206af" />
+    <public type="string" name="friends_section_pending" id="0x7f1206b0" />
+    <public type="string" name="friends_share" id="0x7f1206b1" />
+    <public type="string" name="friends_share_sheet_scanning_text_bottom" id="0x7f1206b2" />
+    <public type="string" name="friends_share_sheet_scanning_text_top" id="0x7f1206b3" />
+    <public type="string" name="friends_share_tabbar_title" id="0x7f1206b4" />
+    <public type="string" name="full" id="0x7f1206b5" />
+    <public type="string" name="full_screen" id="0x7f1206b6" />
+    <public type="string" name="game_action_button_add_to_library" id="0x7f1206b7" />
+    <public type="string" name="game_action_button_cannot_install" id="0x7f1206b8" />
+    <public type="string" name="game_action_button_downloading" id="0x7f1206b9" />
+    <public type="string" name="game_action_button_game_not_detected" id="0x7f1206ba" />
+    <public type="string" name="game_action_button_install" id="0x7f1206bb" />
+    <public type="string" name="game_action_button_locate" id="0x7f1206bc" />
+    <public type="string" name="game_action_button_login_to_buy" id="0x7f1206bd" />
+    <public type="string" name="game_action_button_now_playing" id="0x7f1206be" />
+    <public type="string" name="game_action_button_paused" id="0x7f1206bf" />
+    <public type="string" name="game_action_button_play" id="0x7f1206c0" />
+    <public type="string" name="game_action_button_play_disabled_desktop_app" id="0x7f1206c1" />
+    <public type="string" name="game_action_button_preorder_wait" id="0x7f1206c2" />
+    <public type="string" name="game_action_button_preorder_wait_tooltip" id="0x7f1206c3" />
+    <public type="string" name="game_action_button_queue" id="0x7f1206c4" />
+    <public type="string" name="game_action_button_queued" id="0x7f1206c5" />
+    <public type="string" name="game_action_button_restricted_in_region" id="0x7f1206c6" />
+    <public type="string" name="game_action_button_unavailable" id="0x7f1206c7" />
+    <public type="string" name="game_action_button_unavailable_tooltip" id="0x7f1206c8" />
+    <public type="string" name="game_action_button_unavailable_tooltip_plural" id="0x7f1206c9" />
+    <public type="string" name="game_action_button_uninstalling_1" id="0x7f1206ca" />
+    <public type="string" name="game_action_button_uninstalling_10" id="0x7f1206cb" />
+    <public type="string" name="game_action_button_uninstalling_2" id="0x7f1206cc" />
+    <public type="string" name="game_action_button_uninstalling_3" id="0x7f1206cd" />
+    <public type="string" name="game_action_button_uninstalling_4" id="0x7f1206ce" />
+    <public type="string" name="game_action_button_uninstalling_5" id="0x7f1206cf" />
+    <public type="string" name="game_action_button_uninstalling_6" id="0x7f1206d0" />
+    <public type="string" name="game_action_button_uninstalling_7" id="0x7f1206d1" />
+    <public type="string" name="game_action_button_uninstalling_8" id="0x7f1206d2" />
+    <public type="string" name="game_action_button_uninstalling_9" id="0x7f1206d3" />
+    <public type="string" name="game_action_button_update" id="0x7f1206d4" />
+    <public type="string" name="game_action_button_view_in_store" id="0x7f1206d5" />
+    <public type="string" name="game_activity" id="0x7f1206d6" />
+    <public type="string" name="game_activity_notifications" id="0x7f1206d7" />
+    <public type="string" name="game_detected" id="0x7f1206d8" />
+    <public type="string" name="game_detection_foreground_android" id="0x7f1206d9" />
+    <public type="string" name="game_detection_foreground_info_android" id="0x7f1206da" />
+    <public type="string" name="game_detection_modal_info_android" id="0x7f1206db" />
+    <public type="string" name="game_detection_open_settings" id="0x7f1206dc" />
+    <public type="string" name="game_detection_service" id="0x7f1206dd" />
+    <public type="string" name="game_feed_activity_action_play" id="0x7f1206de" />
+    <public type="string" name="game_feed_activity_playing_xbox" id="0x7f1206df" />
+    <public type="string" name="game_feed_activity_recently_played" id="0x7f1206e0" />
+    <public type="string" name="game_feed_activity_streaming_twitch" id="0x7f1206e1" />
+    <public type="string" name="game_feed_current_header_title" id="0x7f1206e2" />
+    <public type="string" name="game_feed_settings_visibility" id="0x7f1206e3" />
+    <public type="string" name="game_feed_unknown_player" id="0x7f1206e4" />
+    <public type="string" name="game_feed_user_played_days_ago" id="0x7f1206e5" />
+    <public type="string" name="game_feed_user_played_hours_ago" id="0x7f1206e6" />
+    <public type="string" name="game_feed_user_played_minutes_ago" id="0x7f1206e7" />
+    <public type="string" name="game_feed_user_played_months_ago" id="0x7f1206e8" />
+    <public type="string" name="game_feed_user_played_weeks_ago" id="0x7f1206e9" />
+    <public type="string" name="game_feed_user_played_years_ago" id="0x7f1206ea" />
+    <public type="string" name="game_feed_user_playing_for_days" id="0x7f1206eb" />
+    <public type="string" name="game_feed_user_playing_for_hours" id="0x7f1206ec" />
+    <public type="string" name="game_feed_user_playing_for_minutes" id="0x7f1206ed" />
+    <public type="string" name="game_feed_user_playing_just_ended" id="0x7f1206ee" />
+    <public type="string" name="game_feed_user_playing_just_started" id="0x7f1206ef" />
+    <public type="string" name="game_launch_failed_launch_target_not_found" id="0x7f1206f0" />
+    <public type="string" name="game_library" id="0x7f1206f1" />
+    <public type="string" name="game_library_last_played_days" id="0x7f1206f2" />
+    <public type="string" name="game_library_last_played_hours" id="0x7f1206f3" />
+    <public type="string" name="game_library_last_played_just_now" id="0x7f1206f4" />
+    <public type="string" name="game_library_last_played_minutes" id="0x7f1206f5" />
+    <public type="string" name="game_library_last_played_months" id="0x7f1206f6" />
+    <public type="string" name="game_library_last_played_none" id="0x7f1206f7" />
+    <public type="string" name="game_library_last_played_playing_now" id="0x7f1206f8" />
+    <public type="string" name="game_library_last_played_weeks" id="0x7f1206f9" />
+    <public type="string" name="game_library_last_played_years" id="0x7f1206fa" />
+    <public type="string" name="game_library_list_header_last_played" id="0x7f1206fb" />
+    <public type="string" name="game_library_list_header_name" id="0x7f1206fc" />
+    <public type="string" name="game_library_list_header_platform" id="0x7f1206fd" />
+    <public type="string" name="game_library_new" id="0x7f1206fe" />
+    <public type="string" name="game_library_not_applicable" id="0x7f1206ff" />
+    <public type="string" name="game_library_notification_game_installed_body" id="0x7f120700" />
+    <public type="string" name="game_library_notification_game_installed_title" id="0x7f120701" />
+    <public type="string" name="game_library_overlay_disabled_tooltip" id="0x7f120702" />
+    <public type="string" name="game_library_private_tooltip" id="0x7f120703" />
+    <public type="string" name="game_library_time_played_hours" id="0x7f120704" />
+    <public type="string" name="game_library_time_played_minutes" id="0x7f120705" />
+    <public type="string" name="game_library_time_played_none" id="0x7f120706" />
+    <public type="string" name="game_library_time_played_seconds" id="0x7f120707" />
+    <public type="string" name="game_library_updates_action_move_up" id="0x7f120708" />
+    <public type="string" name="game_library_updates_action_pause" id="0x7f120709" />
+    <public type="string" name="game_library_updates_action_remove" id="0x7f12070a" />
+    <public type="string" name="game_library_updates_action_resume" id="0x7f12070b" />
+    <public type="string" name="game_library_updates_header_disk" id="0x7f12070c" />
+    <public type="string" name="game_library_updates_header_network" id="0x7f12070d" />
+    <public type="string" name="game_library_updates_installing" id="0x7f12070e" />
+    <public type="string" name="game_library_updates_installing_hours" id="0x7f12070f" />
+    <public type="string" name="game_library_updates_installing_minutes" id="0x7f120710" />
+    <public type="string" name="game_library_updates_installing_seconds" id="0x7f120711" />
+    <public type="string" name="game_library_updates_progress_allocating_disk" id="0x7f120712" />
+    <public type="string" name="game_library_updates_progress_downloading_text_installing" id="0x7f120713" />
+    <public type="string" name="game_library_updates_progress_downloading_text_patching" id="0x7f120714" />
+    <public type="string" name="game_library_updates_progress_finalizing" id="0x7f120715" />
+    <public type="string" name="game_library_updates_progress_finished" id="0x7f120716" />
+    <public type="string" name="game_library_updates_progress_paused" id="0x7f120717" />
+    <public type="string" name="game_library_updates_progress_paused_no_transition" id="0x7f120718" />
+    <public type="string" name="game_library_updates_progress_pausing" id="0x7f120719" />
+    <public type="string" name="game_library_updates_progress_planning" id="0x7f12071a" />
+    <public type="string" name="game_library_updates_progress_post_install_scripts" id="0x7f12071b" />
+    <public type="string" name="game_library_updates_progress_queued" id="0x7f12071c" />
+    <public type="string" name="game_library_updates_progress_queued_no_transition" id="0x7f12071d" />
+    <public type="string" name="game_library_updates_progress_repairing" id="0x7f12071e" />
+    <public type="string" name="game_library_updates_progress_verifying" id="0x7f12071f" />
+    <public type="string" name="game_library_updates_progress_waiting_for_another" id="0x7f120720" />
+    <public type="string" name="game_library_updates_progress_waiting_for_another_no_transition" id="0x7f120721" />
+    <public type="string" name="game_library_updates_updating" id="0x7f120722" />
+    <public type="string" name="game_library_updates_updating_updating_hours" id="0x7f120723" />
+    <public type="string" name="game_library_updates_updating_updating_minutes" id="0x7f120724" />
+    <public type="string" name="game_library_updates_updating_updating_seconds" id="0x7f120725" />
+    <public type="string" name="game_popout_follow" id="0x7f120726" />
+    <public type="string" name="game_popout_go_to_server" id="0x7f120727" />
+    <public type="string" name="game_popout_no_recent_players" id="0x7f120728" />
+    <public type="string" name="game_popout_online_in_server" id="0x7f120729" />
+    <public type="string" name="game_popout_unfollow" id="0x7f12072a" />
+    <public type="string" name="game_popout_view_server" id="0x7f12072b" />
+    <public type="string" name="games" id="0x7f12072c" />
+    <public type="string" name="gcm_defaultSenderId" id="0x7f12072d" />
+    <public type="string" name="general_permissions" id="0x7f12072e" />
+    <public type="string" name="generate_a_new_link" id="0x7f12072f" />
+    <public type="string" name="get_started" id="0x7f120730" />
+    <public type="string" name="gif" id="0x7f120731" />
+    <public type="string" name="gif_auto_play_label" id="0x7f120732" />
+    <public type="string" name="gif_auto_play_label_mobile" id="0x7f120733" />
+    <public type="string" name="gif_button_label" id="0x7f120734" />
+    <public type="string" name="gif_picker_back_to_top" id="0x7f120735" />
+    <public type="string" name="gif_picker_favorites" id="0x7f120736" />
+    <public type="string" name="gif_picker_related_search" id="0x7f120737" />
+    <public type="string" name="gif_picker_result_type_recent" id="0x7f120738" />
+    <public type="string" name="gif_picker_result_type_trending_gifs" id="0x7f120739" />
+    <public type="string" name="gif_tooltip_add_to_favorites" id="0x7f12073a" />
+    <public type="string" name="gif_tooltip_favorited_picker_button" id="0x7f12073b" />
+    <public type="string" name="gif_tooltip_remove_from_favorites" id="0x7f12073c" />
+    <public type="string" name="gift_code_auth_accept" id="0x7f12073d" />
+    <public type="string" name="gift_code_auth_accepting" id="0x7f12073e" />
+    <public type="string" name="gift_code_auth_check_verification_again" id="0x7f12073f" />
+    <public type="string" name="gift_code_auth_continue_in_browser" id="0x7f120740" />
+    <public type="string" name="gift_code_auth_fetching_user" id="0x7f120741" />
+    <public type="string" name="gift_code_auth_gifted" id="0x7f120742" />
+    <public type="string" name="gift_code_auth_gifted_by" id="0x7f120743" />
+    <public type="string" name="gift_code_auth_gifted_subscription_monthly" id="0x7f120744" />
+    <public type="string" name="gift_code_auth_gifted_subscription_yearly" id="0x7f120745" />
+    <public type="string" name="gift_code_auth_help_text_claimed" id="0x7f120746" />
+    <public type="string" name="gift_code_auth_help_text_owned" id="0x7f120747" />
+    <public type="string" name="gift_code_auth_help_text_verification_required" id="0x7f120748" />
+    <public type="string" name="gift_code_auth_invalid_body" id="0x7f120749" />
+    <public type="string" name="gift_code_auth_invalid_tip" id="0x7f12074a" />
+    <public type="string" name="gift_code_auth_invalid_title" id="0x7f12074b" />
+    <public type="string" name="gift_code_auth_logged_in_as" id="0x7f12074c" />
+    <public type="string" name="gift_code_auth_resolving" id="0x7f12074d" />
+    <public type="string" name="gift_code_auth_verification_sent" id="0x7f12074e" />
+    <public type="string" name="gift_code_auth_verification_title" id="0x7f12074f" />
+    <public type="string" name="gift_code_cannot_accept_body_ios" id="0x7f120750" />
+    <public type="string" name="gift_code_hint" id="0x7f120751" />
+    <public type="string" name="gift_confirmation_body_claimed" id="0x7f120752" />
+    <public type="string" name="gift_confirmation_body_confirm" id="0x7f120753" />
+    <public type="string" name="gift_confirmation_body_confirm_nitro" id="0x7f120754" />
+    <public type="string" name="gift_confirmation_body_error_invoice_open" id="0x7f120755" />
+    <public type="string" name="gift_confirmation_body_error_nitro_upgrade_downgrade" id="0x7f120756" />
+    <public type="string" name="gift_confirmation_body_error_subscription_managed" id="0x7f120757" />
+    <public type="string" name="gift_confirmation_body_invalid" id="0x7f120758" />
+    <public type="string" name="gift_confirmation_body_owned" id="0x7f120759" />
+    <public type="string" name="gift_confirmation_body_self_gift_no_payment" id="0x7f12075a" />
+    <public type="string" name="gift_confirmation_body_subscription_monthly_confirm" id="0x7f12075b" />
+    <public type="string" name="gift_confirmation_body_subscription_yearly_confirm" id="0x7f12075c" />
+    <public type="string" name="gift_confirmation_body_success" id="0x7f12075d" />
+    <public type="string" name="gift_confirmation_body_success_generic_subscription_monthly" id="0x7f12075e" />
+    <public type="string" name="gift_confirmation_body_success_generic_subscription_yearly" id="0x7f12075f" />
+    <public type="string" name="gift_confirmation_body_success_mobile" id="0x7f120760" />
+    <public type="string" name="gift_confirmation_body_success_nitro_classic_mobile" id="0x7f120761" />
+    <public type="string" name="gift_confirmation_body_success_nitro_mobile" id="0x7f120762" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_1_monthly" id="0x7f120763" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_1_yearly" id="0x7f120764" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_2_monthly" id="0x7f120765" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_2_yearly" id="0x7f120766" />
+    <public type="string" name="gift_confirmation_body_unknown_error" id="0x7f120767" />
+    <public type="string" name="gift_confirmation_button_confirm" id="0x7f120768" />
+    <public type="string" name="gift_confirmation_button_confirm_mobile" id="0x7f120769" />
+    <public type="string" name="gift_confirmation_button_confirm_subscription" id="0x7f12076a" />
+    <public type="string" name="gift_confirmation_button_fail" id="0x7f12076b" />
+    <public type="string" name="gift_confirmation_button_go_to_library" id="0x7f12076c" />
+    <public type="string" name="gift_confirmation_button_noice" id="0x7f12076d" />
+    <public type="string" name="gift_confirmation_button_subscription_success" id="0x7f12076e" />
+    <public type="string" name="gift_confirmation_button_success_mobile" id="0x7f12076f" />
+    <public type="string" name="gift_confirmation_header_confirm" id="0x7f120770" />
+    <public type="string" name="gift_confirmation_header_confirm_nitro" id="0x7f120771" />
+    <public type="string" name="gift_confirmation_header_fail" id="0x7f120772" />
+    <public type="string" name="gift_confirmation_header_success" id="0x7f120773" />
+    <public type="string" name="gift_confirmation_header_success_nitro" id="0x7f120774" />
+    <public type="string" name="gift_confirmation_nitro_time_frame_months" id="0x7f120775" />
+    <public type="string" name="gift_confirmation_nitro_time_frame_years" id="0x7f120776" />
+    <public type="string" name="gift_embed_body_claimed_other" id="0x7f120777" />
+    <public type="string" name="gift_embed_body_claimed_self" id="0x7f120778" />
+    <public type="string" name="gift_embed_body_claimed_self_mobile" id="0x7f120779" />
+    <public type="string" name="gift_embed_body_claimed_self_subscription" id="0x7f12077a" />
+    <public type="string" name="gift_embed_body_default" id="0x7f12077b" />
+    <public type="string" name="gift_embed_body_giveaway" id="0x7f12077c" />
+    <public type="string" name="gift_embed_body_no_user_default" id="0x7f12077d" />
+    <public type="string" name="gift_embed_body_no_user_giveaway" id="0x7f12077e" />
+    <public type="string" name="gift_embed_body_owned" id="0x7f12077f" />
+    <public type="string" name="gift_embed_body_owned_mobile" id="0x7f120780" />
+    <public type="string" name="gift_embed_body_requires_verification" id="0x7f120781" />
+    <public type="string" name="gift_embed_body_requires_verification_mobile" id="0x7f120782" />
+    <public type="string" name="gift_embed_body_self" id="0x7f120783" />
+    <public type="string" name="gift_embed_body_subscription_default_months" id="0x7f120784" />
+    <public type="string" name="gift_embed_body_subscription_default_years" id="0x7f120785" />
+    <public type="string" name="gift_embed_body_subscription_giveaway" id="0x7f120786" />
+    <public type="string" name="gift_embed_body_subscription_mismatch" id="0x7f120787" />
+    <public type="string" name="gift_embed_body_subscription_no_user_default_months" id="0x7f120788" />
+    <public type="string" name="gift_embed_body_subscription_no_user_default_years" id="0x7f120789" />
+    <public type="string" name="gift_embed_body_subscription_no_user_giveaway" id="0x7f12078a" />
+    <public type="string" name="gift_embed_button_accept" id="0x7f12078b" />
+    <public type="string" name="gift_embed_button_cant_accept" id="0x7f12078c" />
+    <public type="string" name="gift_embed_button_claimed" id="0x7f12078d" />
+    <public type="string" name="gift_embed_button_claiming" id="0x7f12078e" />
+    <public type="string" name="gift_embed_button_owned" id="0x7f12078f" />
+    <public type="string" name="gift_embed_copies_left" id="0x7f120790" />
+    <public type="string" name="gift_embed_expiration" id="0x7f120791" />
+    <public type="string" name="gift_embed_header_owner_invalid" id="0x7f120792" />
+    <public type="string" name="gift_embed_header_receiver_invalid" id="0x7f120793" />
+    <public type="string" name="gift_embed_info_owner_invalid" id="0x7f120794" />
+    <public type="string" name="gift_embed_info_receiver_invalid" id="0x7f120795" />
+    <public type="string" name="gift_embed_invalid" id="0x7f120796" />
+    <public type="string" name="gift_embed_invalid_tagline_other" id="0x7f120797" />
+    <public type="string" name="gift_embed_invalid_tagline_self" id="0x7f120798" />
+    <public type="string" name="gift_embed_invalid_title_other" id="0x7f120799" />
+    <public type="string" name="gift_embed_invalid_title_self" id="0x7f12079a" />
+    <public type="string" name="gift_embed_resolving" id="0x7f12079b" />
+    <public type="string" name="gift_embed_subscriptions_left" id="0x7f12079c" />
+    <public type="string" name="gift_embed_title" id="0x7f12079d" />
+    <public type="string" name="gift_embed_title_self" id="0x7f12079e" />
+    <public type="string" name="gift_embed_title_subscription" id="0x7f12079f" />
+    <public type="string" name="gift_embed_title_subscription_self" id="0x7f1207a0" />
+    <public type="string" name="gift_embed_unknown_user" id="0x7f1207a1" />
+    <public type="string" name="gift_inventory" id="0x7f1207a2" />
+    <public type="string" name="gift_inventory_copies" id="0x7f1207a3" />
+    <public type="string" name="gift_inventory_expires_in" id="0x7f1207a4" />
+    <public type="string" name="gift_inventory_expires_in_mobile" id="0x7f1207a5" />
+    <public type="string" name="gift_inventory_generate_help" id="0x7f1207a6" />
+    <public type="string" name="gift_inventory_generate_link" id="0x7f1207a7" />
+    <public type="string" name="gift_inventory_generate_link_ios" id="0x7f1207a8" />
+    <public type="string" name="gift_inventory_hidden" id="0x7f1207a9" />
+    <public type="string" name="gift_inventory_no_gifts" id="0x7f1207aa" />
+    <public type="string" name="gift_inventory_no_gifts_subtext" id="0x7f1207ab" />
+    <public type="string" name="gift_inventory_no_gifts_subtext_mobile" id="0x7f1207ac" />
+    <public type="string" name="gift_inventory_redeem_codes" id="0x7f1207ad" />
+    <public type="string" name="gift_inventory_select_nitro_gift" id="0x7f1207ae" />
+    <public type="string" name="gift_inventory_subscription_months" id="0x7f1207af" />
+    <public type="string" name="gift_inventory_subscription_years" id="0x7f1207b0" />
+    <public type="string" name="go_live_hardware_acceleration_unavailable" id="0x7f1207b1" />
+    <public type="string" name="go_live_hey" id="0x7f1207b2" />
+    <public type="string" name="go_live_listen" id="0x7f1207b3" />
+    <public type="string" name="go_live_look" id="0x7f1207b4" />
+    <public type="string" name="go_live_modal_application_form_title" id="0x7f1207b5" />
+    <public type="string" name="go_live_modal_cta" id="0x7f1207b6" />
+    <public type="string" name="go_live_modal_current_channel_form_title" id="0x7f1207b7" />
+    <public type="string" name="go_live_modal_description" id="0x7f1207b8" />
+    <public type="string" name="go_live_modal_overflow_four_or_more_users" id="0x7f1207b9" />
+    <public type="string" name="go_live_modal_overflow_three_users" id="0x7f1207ba" />
+    <public type="string" name="go_live_modal_overflow_two_users" id="0x7f1207bb" />
+    <public type="string" name="go_live_modal_select_channel_form_title" id="0x7f1207bc" />
+    <public type="string" name="go_live_modal_select_channel_placeholder" id="0x7f1207bd" />
+    <public type="string" name="go_live_modal_title" id="0x7f1207be" />
+    <public type="string" name="go_live_video_drivers_outdated" id="0x7f1207bf" />
+    <public type="string" name="go_live_viewers_action_sheet_not_spectating" id="0x7f1207c0" />
+    <public type="string" name="go_live_viewers_action_sheet_spectating" id="0x7f1207c1" />
+    <public type="string" name="go_live_viewers_action_sheet_streaming" id="0x7f1207c2" />
+    <public type="string" name="go_to_developer_portal" id="0x7f1207c3" />
+    <public type="string" name="google_api_key" id="0x7f1207c4" />
+    <public type="string" name="google_app_id" id="0x7f1207c5" />
+    <public type="string" name="google_crash_reporting_api_key" id="0x7f1207c6" />
+    <public type="string" name="google_play" id="0x7f1207c7" />
+    <public type="string" name="google_storage_bucket" id="0x7f1207c8" />
+    <public type="string" name="grant_temporary_membership" id="0x7f1207c9" />
+    <public type="string" name="green" id="0x7f1207ca" />
+    <public type="string" name="grey" id="0x7f1207cb" />
+    <public type="string" name="group" id="0x7f1207cc" />
+    <public type="string" name="group_dm" id="0x7f1207cd" />
+    <public type="string" name="group_dm_add_friends" id="0x7f1207ce" />
+    <public type="string" name="group_dm_add_members" id="0x7f1207cf" />
+    <public type="string" name="group_dm_header" id="0x7f1207d0" />
+    <public type="string" name="group_dm_invite_empty" id="0x7f1207d1" />
+    <public type="string" name="group_dm_invite_full_main" id="0x7f1207d2" />
+    <public type="string" name="group_dm_invite_full_sub" id="0x7f1207d3" />
+    <public type="string" name="group_dm_invite_full_sub2" id="0x7f1207d4" />
+    <public type="string" name="group_dm_invite_link_create" id="0x7f1207d5" />
+    <public type="string" name="group_dm_invite_link_example" id="0x7f1207d6" />
+    <public type="string" name="group_dm_invite_link_title" id="0x7f1207d7" />
+    <public type="string" name="group_dm_invite_no_friends" id="0x7f1207d8" />
+    <public type="string" name="group_dm_invite_not_friends" id="0x7f1207d9" />
+    <public type="string" name="group_dm_invite_remaining" id="0x7f1207da" />
+    <public type="string" name="group_dm_invite_successful_mobile" id="0x7f1207db" />
+    <public type="string" name="group_dm_invite_to" id="0x7f1207dc" />
+    <public type="string" name="group_dm_invite_unselect_users" id="0x7f1207dd" />
+    <public type="string" name="group_dm_invite_will_fill_mobile" id="0x7f1207de" />
+    <public type="string" name="group_dm_invite_with_name" id="0x7f1207df" />
+    <public type="string" name="group_dm_search_placeholder" id="0x7f1207e0" />
+    <public type="string" name="group_dm_settings" id="0x7f1207e1" />
+    <public type="string" name="group_name" id="0x7f1207e2" />
+    <public type="string" name="group_owner" id="0x7f1207e3" />
+    <public type="string" name="groups" id="0x7f1207e4" />
+    <public type="string" name="guest_lurker_mode_chat_input_body" id="0x7f1207e5" />
+    <public type="string" name="guest_lurker_mode_chat_input_header" id="0x7f1207e6" />
+    <public type="string" name="guild_discovery_header_e3_games" id="0x7f1207e7" />
+    <public type="string" name="guild_discovery_header_games_you_play" id="0x7f1207e8" />
+    <public type="string" name="guild_discovery_header_popular_servers" id="0x7f1207e9" />
+    <public type="string" name="guild_discovery_header_search_results" id="0x7f1207ea" />
+    <public type="string" name="guild_discovery_header_trending_games" id="0x7f1207eb" />
+    <public type="string" name="guild_discovery_search_empty_description" id="0x7f1207ec" />
+    <public type="string" name="guild_discovery_search_empty_title" id="0x7f1207ed" />
+    <public type="string" name="guild_discovery_search_header" id="0x7f1207ee" />
+    <public type="string" name="guild_discovery_search_label" id="0x7f1207ef" />
+    <public type="string" name="guild_discovery_search_placeholder" id="0x7f1207f0" />
+    <public type="string" name="guild_discovery_search_press_enter" id="0x7f1207f1" />
+    <public type="string" name="guild_discovery_tooltip" id="0x7f1207f2" />
+    <public type="string" name="guild_discovery_trending_game_description" id="0x7f1207f3" />
+    <public type="string" name="guild_discovery_view_button" id="0x7f1207f4" />
+    <public type="string" name="guild_folder_color" id="0x7f1207f5" />
+    <public type="string" name="guild_folder_name" id="0x7f1207f6" />
+    <public type="string" name="guild_header_hotspot_tooltip" id="0x7f1207f7" />
+    <public type="string" name="guild_members_header" id="0x7f1207f8" />
+    <public type="string" name="guild_members_search_no_result" id="0x7f1207f9" />
+    <public type="string" name="guild_message_notifications_only_mentions" id="0x7f1207fa" />
+    <public type="string" name="guild_muted_help_text" id="0x7f1207fb" />
+    <public type="string" name="guild_owner" id="0x7f1207fc" />
+    <public type="string" name="guild_partnered" id="0x7f1207fd" />
+    <public type="string" name="guild_popout_unavailable_flavor" id="0x7f1207fe" />
+    <public type="string" name="guild_popout_unavailable_header" id="0x7f1207ff" />
+    <public type="string" name="guild_popout_view_server_button" id="0x7f120800" />
+    <public type="string" name="guild_premium" id="0x7f120801" />
+    <public type="string" name="guild_security_req_mfa_body" id="0x7f120802" />
+    <public type="string" name="guild_security_req_mfa_enable" id="0x7f120803" />
+    <public type="string" name="guild_security_req_mfa_guild_disable" id="0x7f120804" />
+    <public type="string" name="guild_security_req_mfa_guild_enable" id="0x7f120805" />
+    <public type="string" name="guild_security_req_mfa_label" id="0x7f120806" />
+    <public type="string" name="guild_security_req_mfa_turn_off" id="0x7f120807" />
+    <public type="string" name="guild_security_req_mfa_turn_on" id="0x7f120808" />
+    <public type="string" name="guild_settings_action_filter_channel_create" id="0x7f120809" />
+    <public type="string" name="guild_settings_action_filter_channel_delete" id="0x7f12080a" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_create" id="0x7f12080b" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_delete" id="0x7f12080c" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_update" id="0x7f12080d" />
+    <public type="string" name="guild_settings_action_filter_channel_update" id="0x7f12080e" />
+    <public type="string" name="guild_settings_action_filter_emoji_create" id="0x7f12080f" />
+    <public type="string" name="guild_settings_action_filter_emoji_delete" id="0x7f120810" />
+    <public type="string" name="guild_settings_action_filter_emoji_update" id="0x7f120811" />
+    <public type="string" name="guild_settings_action_filter_guild_update" id="0x7f120812" />
+    <public type="string" name="guild_settings_action_filter_invite_create" id="0x7f120813" />
+    <public type="string" name="guild_settings_action_filter_invite_delete" id="0x7f120814" />
+    <public type="string" name="guild_settings_action_filter_invite_update" id="0x7f120815" />
+    <public type="string" name="guild_settings_action_filter_member_ban_add" id="0x7f120816" />
+    <public type="string" name="guild_settings_action_filter_member_ban_remove" id="0x7f120817" />
+    <public type="string" name="guild_settings_action_filter_member_kick" id="0x7f120818" />
+    <public type="string" name="guild_settings_action_filter_member_prune" id="0x7f120819" />
+    <public type="string" name="guild_settings_action_filter_member_role_update" id="0x7f12081a" />
+    <public type="string" name="guild_settings_action_filter_member_update" id="0x7f12081b" />
+    <public type="string" name="guild_settings_action_filter_message_delete" id="0x7f12081c" />
+    <public type="string" name="guild_settings_action_filter_role_create" id="0x7f12081d" />
+    <public type="string" name="guild_settings_action_filter_role_delete" id="0x7f12081e" />
+    <public type="string" name="guild_settings_action_filter_role_update" id="0x7f12081f" />
+    <public type="string" name="guild_settings_action_filter_webhook_create" id="0x7f120820" />
+    <public type="string" name="guild_settings_action_filter_webhook_delete" id="0x7f120821" />
+    <public type="string" name="guild_settings_action_filter_webhook_update" id="0x7f120822" />
+    <public type="string" name="guild_settings_audit_log_channel_bitrate_change" id="0x7f120823" />
+    <public type="string" name="guild_settings_audit_log_channel_bitrate_create" id="0x7f120824" />
+    <public type="string" name="guild_settings_audit_log_channel_category_create" id="0x7f120825" />
+    <public type="string" name="guild_settings_audit_log_channel_delete" id="0x7f120826" />
+    <public type="string" name="guild_settings_audit_log_channel_name_change" id="0x7f120827" />
+    <public type="string" name="guild_settings_audit_log_channel_name_create" id="0x7f120828" />
+    <public type="string" name="guild_settings_audit_log_channel_nsfw_disabled" id="0x7f120829" />
+    <public type="string" name="guild_settings_audit_log_channel_nsfw_enabled" id="0x7f12082a" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_create" id="0x7f12082b" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_delete" id="0x7f12082c" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_update" id="0x7f12082d" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_create" id="0x7f12082e" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_denied" id="0x7f12082f" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_granted" id="0x7f120830" />
+    <public type="string" name="guild_settings_audit_log_channel_position_change" id="0x7f120831" />
+    <public type="string" name="guild_settings_audit_log_channel_position_create" id="0x7f120832" />
+    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_change" id="0x7f120833" />
+    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_create" id="0x7f120834" />
+    <public type="string" name="guild_settings_audit_log_channel_text_create" id="0x7f120835" />
+    <public type="string" name="guild_settings_audit_log_channel_topic_change" id="0x7f120836" />
+    <public type="string" name="guild_settings_audit_log_channel_topic_create" id="0x7f120837" />
+    <public type="string" name="guild_settings_audit_log_channel_type_change" id="0x7f120838" />
+    <public type="string" name="guild_settings_audit_log_channel_type_create" id="0x7f120839" />
+    <public type="string" name="guild_settings_audit_log_channel_update" id="0x7f12083a" />
+    <public type="string" name="guild_settings_audit_log_channel_voice_create" id="0x7f12083b" />
+    <public type="string" name="guild_settings_audit_log_common_reason" id="0x7f12083c" />
+    <public type="string" name="guild_settings_audit_log_emoji_create" id="0x7f12083d" />
+    <public type="string" name="guild_settings_audit_log_emoji_delete" id="0x7f12083e" />
+    <public type="string" name="guild_settings_audit_log_emoji_name_change" id="0x7f12083f" />
+    <public type="string" name="guild_settings_audit_log_emoji_name_create" id="0x7f120840" />
+    <public type="string" name="guild_settings_audit_log_emoji_update" id="0x7f120841" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_change" id="0x7f120842" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_clear" id="0x7f120843" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_timeout_change" id="0x7f120844" />
+    <public type="string" name="guild_settings_audit_log_guild_banner_hash_change" id="0x7f120845" />
+    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_all_messages" id="0x7f120846" />
+    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_only_mentions" id="0x7f120847" />
+    <public type="string" name="guild_settings_audit_log_guild_description_change" id="0x7f120848" />
+    <public type="string" name="guild_settings_audit_log_guild_description_clear" id="0x7f120849" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_all_members" id="0x7f12084a" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_disable" id="0x7f12084b" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_members_without_roles" id="0x7f12084c" />
+    <public type="string" name="guild_settings_audit_log_guild_icon_hash_change" id="0x7f12084d" />
+    <public type="string" name="guild_settings_audit_log_guild_mfa_level_disabled" id="0x7f12084e" />
+    <public type="string" name="guild_settings_audit_log_guild_mfa_level_enabled" id="0x7f12084f" />
+    <public type="string" name="guild_settings_audit_log_guild_name_change" id="0x7f120850" />
+    <public type="string" name="guild_settings_audit_log_guild_owner_id_change" id="0x7f120851" />
+    <public type="string" name="guild_settings_audit_log_guild_preferred_locale_change" id="0x7f120852" />
+    <public type="string" name="guild_settings_audit_log_guild_region_change" id="0x7f120853" />
+    <public type="string" name="guild_settings_audit_log_guild_splash_hash_change" id="0x7f120854" />
+    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_change" id="0x7f120855" />
+    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_disable" id="0x7f120856" />
+    <public type="string" name="guild_settings_audit_log_guild_update" id="0x7f120857" />
+    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_change" id="0x7f120858" />
+    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_delete" id="0x7f120859" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_high" id="0x7f12085a" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_low" id="0x7f12085b" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_medium" id="0x7f12085c" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_none" id="0x7f12085d" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_very_high" id="0x7f12085e" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_change" id="0x7f12085f" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_delete" id="0x7f120860" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_disabled" id="0x7f120861" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_enabled" id="0x7f120862" />
+    <public type="string" name="guild_settings_audit_log_invite_channel_create" id="0x7f120863" />
+    <public type="string" name="guild_settings_audit_log_invite_code_create" id="0x7f120864" />
+    <public type="string" name="guild_settings_audit_log_invite_create" id="0x7f120865" />
+    <public type="string" name="guild_settings_audit_log_invite_delete" id="0x7f120866" />
+    <public type="string" name="guild_settings_audit_log_invite_max_age_create" id="0x7f120867" />
+    <public type="string" name="guild_settings_audit_log_invite_max_age_create_infinite" id="0x7f120868" />
+    <public type="string" name="guild_settings_audit_log_invite_max_uses_create" id="0x7f120869" />
+    <public type="string" name="guild_settings_audit_log_invite_max_uses_create_infinite" id="0x7f12086a" />
+    <public type="string" name="guild_settings_audit_log_invite_temporary_off" id="0x7f12086b" />
+    <public type="string" name="guild_settings_audit_log_invite_temporary_on" id="0x7f12086c" />
+    <public type="string" name="guild_settings_audit_log_invite_update" id="0x7f12086d" />
+    <public type="string" name="guild_settings_audit_log_load_more" id="0x7f12086e" />
+    <public type="string" name="guild_settings_audit_log_member_ban_add" id="0x7f12086f" />
+    <public type="string" name="guild_settings_audit_log_member_ban_remove" id="0x7f120870" />
+    <public type="string" name="guild_settings_audit_log_member_deaf_off" id="0x7f120871" />
+    <public type="string" name="guild_settings_audit_log_member_deaf_on" id="0x7f120872" />
+    <public type="string" name="guild_settings_audit_log_member_kick" id="0x7f120873" />
+    <public type="string" name="guild_settings_audit_log_member_mute_off" id="0x7f120874" />
+    <public type="string" name="guild_settings_audit_log_member_mute_on" id="0x7f120875" />
+    <public type="string" name="guild_settings_audit_log_member_nick_change" id="0x7f120876" />
+    <public type="string" name="guild_settings_audit_log_member_nick_create" id="0x7f120877" />
+    <public type="string" name="guild_settings_audit_log_member_nick_delete" id="0x7f120878" />
+    <public type="string" name="guild_settings_audit_log_member_prune" id="0x7f120879" />
+    <public type="string" name="guild_settings_audit_log_member_prune_delete_days" id="0x7f12087a" />
+    <public type="string" name="guild_settings_audit_log_member_role_update" id="0x7f12087b" />
+    <public type="string" name="guild_settings_audit_log_member_roles_add" id="0x7f12087c" />
+    <public type="string" name="guild_settings_audit_log_member_roles_remove" id="0x7f12087d" />
+    <public type="string" name="guild_settings_audit_log_member_update" id="0x7f12087e" />
+    <public type="string" name="guild_settings_audit_log_message_delete" id="0x7f12087f" />
+    <public type="string" name="guild_settings_audit_log_role_color" id="0x7f120880" />
+    <public type="string" name="guild_settings_audit_log_role_color_ios" id="0x7f120881" />
+    <public type="string" name="guild_settings_audit_log_role_color_none" id="0x7f120882" />
+    <public type="string" name="guild_settings_audit_log_role_create" id="0x7f120883" />
+    <public type="string" name="guild_settings_audit_log_role_delete" id="0x7f120884" />
+    <public type="string" name="guild_settings_audit_log_role_hoist_off" id="0x7f120885" />
+    <public type="string" name="guild_settings_audit_log_role_hoist_on" id="0x7f120886" />
+    <public type="string" name="guild_settings_audit_log_role_mentionable_off" id="0x7f120887" />
+    <public type="string" name="guild_settings_audit_log_role_mentionable_on" id="0x7f120888" />
+    <public type="string" name="guild_settings_audit_log_role_name_change" id="0x7f120889" />
+    <public type="string" name="guild_settings_audit_log_role_name_create" id="0x7f12088a" />
+    <public type="string" name="guild_settings_audit_log_role_permissions_denied" id="0x7f12088b" />
+    <public type="string" name="guild_settings_audit_log_role_permissions_granted" id="0x7f12088c" />
+    <public type="string" name="guild_settings_audit_log_role_update" id="0x7f12088d" />
+    <public type="string" name="guild_settings_audit_log_time_at_android" id="0x7f12088e" />
+    <public type="string" name="guild_settings_audit_log_webhook_avatar" id="0x7f12088f" />
+    <public type="string" name="guild_settings_audit_log_webhook_channel_change" id="0x7f120890" />
+    <public type="string" name="guild_settings_audit_log_webhook_channel_create" id="0x7f120891" />
+    <public type="string" name="guild_settings_audit_log_webhook_create" id="0x7f120892" />
+    <public type="string" name="guild_settings_audit_log_webhook_delete" id="0x7f120893" />
+    <public type="string" name="guild_settings_audit_log_webhook_name_change" id="0x7f120894" />
+    <public type="string" name="guild_settings_audit_log_webhook_name_create" id="0x7f120895" />
+    <public type="string" name="guild_settings_audit_log_webhook_update" id="0x7f120896" />
+    <public type="string" name="guild_settings_banner_recommend" id="0x7f120897" />
+    <public type="string" name="guild_settings_default_notification_settings_intro" id="0x7f120898" />
+    <public type="string" name="guild_settings_default_notification_settings_protip" id="0x7f120899" />
+    <public type="string" name="guild_settings_emoji_alias" id="0x7f12089a" />
+    <public type="string" name="guild_settings_emoji_alias_placeholder" id="0x7f12089b" />
+    <public type="string" name="guild_settings_emoji_upload_to_server_message" id="0x7f12089c" />
+    <public type="string" name="guild_settings_enable_discoverable" id="0x7f12089d" />
+    <public type="string" name="guild_settings_enable_featurable" id="0x7f12089e" />
+    <public type="string" name="guild_settings_featurable_disabled_tooltip" id="0x7f12089f" />
+    <public type="string" name="guild_settings_filter_action" id="0x7f1208a0" />
+    <public type="string" name="guild_settings_filter_all" id="0x7f1208a1" />
+    <public type="string" name="guild_settings_filter_all_actions" id="0x7f1208a2" />
+    <public type="string" name="guild_settings_filter_all_users" id="0x7f1208a3" />
+    <public type="string" name="guild_settings_filter_user" id="0x7f1208a4" />
+    <public type="string" name="guild_settings_filtered_action" id="0x7f1208a5" />
+    <public type="string" name="guild_settings_filtered_user" id="0x7f1208a6" />
+    <public type="string" name="guild_settings_follower_analytics" id="0x7f1208a7" />
+    <public type="string" name="guild_settings_follower_analytics_description" id="0x7f1208a8" />
+    <public type="string" name="guild_settings_follower_analytics_empty_body" id="0x7f1208a9" />
+    <public type="string" name="guild_settings_follower_analytics_empty_header" id="0x7f1208aa" />
+    <public type="string" name="guild_settings_follower_analytics_last_updated" id="0x7f1208ab" />
+    <public type="string" name="guild_settings_follower_analytics_message_deleted" id="0x7f1208ac" />
+    <public type="string" name="guild_settings_follower_analytics_net_gain" id="0x7f1208ad" />
+    <public type="string" name="guild_settings_follower_analytics_net_gain_tooltip" id="0x7f1208ae" />
+    <public type="string" name="guild_settings_follower_analytics_net_servers" id="0x7f1208af" />
+    <public type="string" name="guild_settings_follower_analytics_post" id="0x7f1208b0" />
+    <public type="string" name="guild_settings_follower_analytics_reach" id="0x7f1208b1" />
+    <public type="string" name="guild_settings_follower_analytics_reach_tooltip" id="0x7f1208b2" />
+    <public type="string" name="guild_settings_follower_analytics_servers_following" id="0x7f1208b3" />
+    <public type="string" name="guild_settings_follower_analytics_tooltip" id="0x7f1208b4" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_animated_guild_icon" id="0x7f1208b5" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_audio_quality" id="0x7f1208b6" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_emoji" id="0x7f1208b7" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_splash" id="0x7f1208b8" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_streaming" id="0x7f1208b9" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_audio_quality" id="0x7f1208ba" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_banner" id="0x7f1208bb" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_emoji" id="0x7f1208bc" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_streaming" id="0x7f1208bd" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_upload_limit" id="0x7f1208be" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_audio_quality" id="0x7f1208bf" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_emoji" id="0x7f1208c0" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_upload_limit" id="0x7f1208c1" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_vanity_url" id="0x7f1208c2" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_animated_guild_icon" id="0x7f1208c3" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_splash" id="0x7f1208c4" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_streaming" id="0x7f1208c5" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_banner" id="0x7f1208c6" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_streaming" id="0x7f1208c7" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_3_vanity_url" id="0x7f1208c8" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_audio_quality" id="0x7f1208c9" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_emoji" id="0x7f1208ca" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_upload_limit" id="0x7f1208cb" />
+    <public type="string" name="guild_settings_guild_premium_perks_base_perks" id="0x7f1208cc" />
+    <public type="string" name="guild_settings_guild_premium_perks_description_none" id="0x7f1208cd" />
+    <public type="string" name="guild_settings_guild_premium_perks_previous_perks" id="0x7f1208ce" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_none" id="0x7f1208cf" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_1" id="0x7f1208d0" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_2" id="0x7f1208d1" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_3" id="0x7f1208d2" />
+    <public type="string" name="guild_settings_icon_recommend" id="0x7f1208d3" />
+    <public type="string" name="guild_settings_label_audit_log" id="0x7f1208d4" />
+    <public type="string" name="guild_settings_label_audit_log_empty_body" id="0x7f1208d5" />
+    <public type="string" name="guild_settings_label_audit_log_empty_title" id="0x7f1208d6" />
+    <public type="string" name="guild_settings_label_audit_log_error_body" id="0x7f1208d7" />
+    <public type="string" name="guild_settings_label_audit_log_error_title" id="0x7f1208d8" />
+    <public type="string" name="guild_settings_members_all_members" id="0x7f1208d9" />
+    <public type="string" name="guild_settings_members_display_role" id="0x7f1208da" />
+    <public type="string" name="guild_settings_members_server_members" id="0x7f1208db" />
+    <public type="string" name="guild_settings_overview_boost_unlock" id="0x7f1208dc" />
+    <public type="string" name="guild_settings_overview_boost_unlocked" id="0x7f1208dd" />
+    <public type="string" name="guild_settings_overview_notice" id="0x7f1208de" />
+    <public type="string" name="guild_settings_overview_tier_info" id="0x7f1208df" />
+    <public type="string" name="guild_settings_premium_guild_blurb" id="0x7f1208e0" />
+    <public type="string" name="guild_settings_premium_guild_close_hint" id="0x7f1208e1" />
+    <public type="string" name="guild_settings_premium_guild_count_subscribers" id="0x7f1208e2" />
+    <public type="string" name="guild_settings_premium_guild_tier_requirement" id="0x7f1208e3" />
+    <public type="string" name="guild_settings_premium_guild_title" id="0x7f1208e4" />
+    <public type="string" name="guild_settings_premium_guild_unlocked" id="0x7f1208e5" />
+    <public type="string" name="guild_settings_server_banner" id="0x7f1208e6" />
+    <public type="string" name="guild_settings_server_invite_background" id="0x7f1208e7" />
+    <public type="string" name="guild_settings_splash_info" id="0x7f1208e8" />
+    <public type="string" name="guild_settings_splash_recommend" id="0x7f1208e9" />
+    <public type="string" name="guild_settings_title_server_widget" id="0x7f1208ea" />
+    <public type="string" name="guild_settings_widget_embed_help" id="0x7f1208eb" />
+    <public type="string" name="guild_settings_widget_enable_widget" id="0x7f1208ec" />
+    <public type="string" name="guild_unavailable_body" id="0x7f1208ed" />
+    <public type="string" name="guild_unavailable_header" id="0x7f1208ee" />
+    <public type="string" name="guild_unavailable_title" id="0x7f1208ef" />
+    <public type="string" name="guild_verification_text_account_age" id="0x7f1208f0" />
+    <public type="string" name="guild_verification_text_member_age" id="0x7f1208f1" />
+    <public type="string" name="guild_verification_text_not_claimed" id="0x7f1208f2" />
+    <public type="string" name="guild_verification_text_not_phone_verified" id="0x7f1208f3" />
+    <public type="string" name="guild_verification_text_not_verified" id="0x7f1208f4" />
+    <public type="string" name="guild_verified" id="0x7f1208f5" />
+    <public type="string" name="guild_voice_channel_empty_body_mobile" id="0x7f1208f6" />
+    <public type="string" name="guild_voice_channel_empty_header_mobile" id="0x7f1208f7" />
+    <public type="string" name="hardware_acceleration" id="0x7f1208f8" />
+    <public type="string" name="hardware_acceleration_help_text" id="0x7f1208f9" />
+    <public type="string" name="help" id="0x7f1208fa" />
+    <public type="string" name="help_desk" id="0x7f1208fb" />
+    <public type="string" name="help_missing_manage_roles_permission" id="0x7f1208fc" />
+    <public type="string" name="help_missing_permission" id="0x7f1208fd" />
+    <public type="string" name="help_role_locked" id="0x7f1208fe" />
+    <public type="string" name="help_role_locked_mine" id="0x7f1208ff" />
+    <public type="string" name="help_singular_permission" id="0x7f120900" />
+    <public type="string" name="hide_bottom_view_on_scroll_behavior" id="0x7f120901" />
+    <public type="string" name="hide_instant_invites_description" id="0x7f120902" />
+    <public type="string" name="hide_instant_invites_label" id="0x7f120903" />
+    <public type="string" name="hide_muted" id="0x7f120904" />
+    <public type="string" name="hide_muted_channels" id="0x7f120905" />
+    <public type="string" name="hide_personal_information_description" id="0x7f120906" />
+    <public type="string" name="hide_personal_information_label" id="0x7f120907" />
+    <public type="string" name="hold_up" id="0x7f120908" />
+    <public type="string" name="home" id="0x7f120909" />
+    <public type="string" name="how_to_invite_others" id="0x7f12090a" />
+    <public type="string" name="hr" id="0x7f12090b" />
+    <public type="string" name="hu" id="0x7f12090c" />
+    <public type="string" name="hypesquad_attendee_cta" id="0x7f12090d" />
+    <public type="string" name="hypesquad_badge_tooltip" id="0x7f12090e" />
+    <public type="string" name="hypesquad_description_house_1" id="0x7f12090f" />
+    <public type="string" name="hypesquad_description_house_2" id="0x7f120910" />
+    <public type="string" name="hypesquad_description_house_3" id="0x7f120911" />
+    <public type="string" name="hypesquad_error_body" id="0x7f120912" />
+    <public type="string" name="hypesquad_error_heading" id="0x7f120913" />
+    <public type="string" name="hypesquad_heading" id="0x7f120914" />
+    <public type="string" name="hypesquad_heading_existing_member" id="0x7f120915" />
+    <public type="string" name="hypesquad_house_1" id="0x7f120916" />
+    <public type="string" name="hypesquad_house_2" id="0x7f120917" />
+    <public type="string" name="hypesquad_house_3" id="0x7f120918" />
+    <public type="string" name="hypesquad_join" id="0x7f120919" />
+    <public type="string" name="hypesquad_leave_action" id="0x7f12091a" />
+    <public type="string" name="hypesquad_leave_error" id="0x7f12091b" />
+    <public type="string" name="hypesquad_leave_prompt" id="0x7f12091c" />
+    <public type="string" name="hypesquad_membership_heading" id="0x7f12091d" />
+    <public type="string" name="hypesquad_newsletter_warning" id="0x7f12091e" />
+    <public type="string" name="hypesquad_online_badge_tooltip" id="0x7f12091f" />
+    <public type="string" name="hypesquad_perk_description_newsletter" id="0x7f120920" />
+    <public type="string" name="hypesquad_perk_description_profile_badge" id="0x7f120921" />
+    <public type="string" name="hypesquad_perk_description_squad_challenges" id="0x7f120922" />
+    <public type="string" name="hypesquad_perk_title_newsletter" id="0x7f120923" />
+    <public type="string" name="hypesquad_perk_title_profile_badge" id="0x7f120924" />
+    <public type="string" name="hypesquad_perk_title_squad_challenges" id="0x7f120925" />
+    <public type="string" name="hypesquad_perks_heading" id="0x7f120926" />
+    <public type="string" name="hypesquad_question_0_prompt" id="0x7f120927" />
+    <public type="string" name="hypesquad_question_0_response_a" id="0x7f120928" />
+    <public type="string" name="hypesquad_question_0_response_b" id="0x7f120929" />
+    <public type="string" name="hypesquad_question_0_response_c" id="0x7f12092a" />
+    <public type="string" name="hypesquad_question_0_response_d" id="0x7f12092b" />
+    <public type="string" name="hypesquad_question_10_prompt" id="0x7f12092c" />
+    <public type="string" name="hypesquad_question_10_response_a" id="0x7f12092d" />
+    <public type="string" name="hypesquad_question_10_response_b" id="0x7f12092e" />
+    <public type="string" name="hypesquad_question_10_response_c" id="0x7f12092f" />
+    <public type="string" name="hypesquad_question_10_response_d" id="0x7f120930" />
+    <public type="string" name="hypesquad_question_11_prompt" id="0x7f120931" />
+    <public type="string" name="hypesquad_question_11_response_a" id="0x7f120932" />
+    <public type="string" name="hypesquad_question_11_response_b" id="0x7f120933" />
+    <public type="string" name="hypesquad_question_11_response_c" id="0x7f120934" />
+    <public type="string" name="hypesquad_question_11_response_d" id="0x7f120935" />
+    <public type="string" name="hypesquad_question_12_prompt" id="0x7f120936" />
+    <public type="string" name="hypesquad_question_12_response_a" id="0x7f120937" />
+    <public type="string" name="hypesquad_question_12_response_b" id="0x7f120938" />
+    <public type="string" name="hypesquad_question_12_response_c" id="0x7f120939" />
+    <public type="string" name="hypesquad_question_12_response_d" id="0x7f12093a" />
+    <public type="string" name="hypesquad_question_13_prompt" id="0x7f12093b" />
+    <public type="string" name="hypesquad_question_13_response_a" id="0x7f12093c" />
+    <public type="string" name="hypesquad_question_13_response_b" id="0x7f12093d" />
+    <public type="string" name="hypesquad_question_13_response_c" id="0x7f12093e" />
+    <public type="string" name="hypesquad_question_13_response_d" id="0x7f12093f" />
+    <public type="string" name="hypesquad_question_14_prompt" id="0x7f120940" />
+    <public type="string" name="hypesquad_question_14_response_a" id="0x7f120941" />
+    <public type="string" name="hypesquad_question_14_response_b" id="0x7f120942" />
+    <public type="string" name="hypesquad_question_14_response_c" id="0x7f120943" />
+    <public type="string" name="hypesquad_question_14_response_d" id="0x7f120944" />
+    <public type="string" name="hypesquad_question_1_prompt" id="0x7f120945" />
+    <public type="string" name="hypesquad_question_1_response_a" id="0x7f120946" />
+    <public type="string" name="hypesquad_question_1_response_b" id="0x7f120947" />
+    <public type="string" name="hypesquad_question_1_response_c" id="0x7f120948" />
+    <public type="string" name="hypesquad_question_1_response_d" id="0x7f120949" />
+    <public type="string" name="hypesquad_question_2_prompt" id="0x7f12094a" />
+    <public type="string" name="hypesquad_question_2_response_a" id="0x7f12094b" />
+    <public type="string" name="hypesquad_question_2_response_b" id="0x7f12094c" />
+    <public type="string" name="hypesquad_question_2_response_c" id="0x7f12094d" />
+    <public type="string" name="hypesquad_question_2_response_d" id="0x7f12094e" />
+    <public type="string" name="hypesquad_question_3_prompt" id="0x7f12094f" />
+    <public type="string" name="hypesquad_question_3_response_a" id="0x7f120950" />
+    <public type="string" name="hypesquad_question_3_response_b" id="0x7f120951" />
+    <public type="string" name="hypesquad_question_3_response_c" id="0x7f120952" />
+    <public type="string" name="hypesquad_question_3_response_d" id="0x7f120953" />
+    <public type="string" name="hypesquad_question_4_prompt" id="0x7f120954" />
+    <public type="string" name="hypesquad_question_4_response_a" id="0x7f120955" />
+    <public type="string" name="hypesquad_question_4_response_b" id="0x7f120956" />
+    <public type="string" name="hypesquad_question_4_response_c" id="0x7f120957" />
+    <public type="string" name="hypesquad_question_4_response_d" id="0x7f120958" />
+    <public type="string" name="hypesquad_question_5_prompt" id="0x7f120959" />
+    <public type="string" name="hypesquad_question_5_response_a" id="0x7f12095a" />
+    <public type="string" name="hypesquad_question_5_response_b" id="0x7f12095b" />
+    <public type="string" name="hypesquad_question_5_response_c" id="0x7f12095c" />
+    <public type="string" name="hypesquad_question_5_response_d" id="0x7f12095d" />
+    <public type="string" name="hypesquad_question_6_prompt" id="0x7f12095e" />
+    <public type="string" name="hypesquad_question_6_response_a" id="0x7f12095f" />
+    <public type="string" name="hypesquad_question_6_response_b" id="0x7f120960" />
+    <public type="string" name="hypesquad_question_6_response_c" id="0x7f120961" />
+    <public type="string" name="hypesquad_question_6_response_d" id="0x7f120962" />
+    <public type="string" name="hypesquad_question_7_prompt" id="0x7f120963" />
+    <public type="string" name="hypesquad_question_7_response_a" id="0x7f120964" />
+    <public type="string" name="hypesquad_question_7_response_b" id="0x7f120965" />
+    <public type="string" name="hypesquad_question_7_response_c" id="0x7f120966" />
+    <public type="string" name="hypesquad_question_7_response_d" id="0x7f120967" />
+    <public type="string" name="hypesquad_question_8_prompt" id="0x7f120968" />
+    <public type="string" name="hypesquad_question_8_response_a" id="0x7f120969" />
+    <public type="string" name="hypesquad_question_8_response_b" id="0x7f12096a" />
+    <public type="string" name="hypesquad_question_8_response_c" id="0x7f12096b" />
+    <public type="string" name="hypesquad_question_8_response_d" id="0x7f12096c" />
+    <public type="string" name="hypesquad_question_9_prompt" id="0x7f12096d" />
+    <public type="string" name="hypesquad_question_9_response_a" id="0x7f12096e" />
+    <public type="string" name="hypesquad_question_9_response_b" id="0x7f12096f" />
+    <public type="string" name="hypesquad_question_9_response_c" id="0x7f120970" />
+    <public type="string" name="hypesquad_question_9_response_d" id="0x7f120971" />
+    <public type="string" name="hypesquad_quiz_body_house_1" id="0x7f120972" />
+    <public type="string" name="hypesquad_quiz_body_house_2" id="0x7f120973" />
+    <public type="string" name="hypesquad_quiz_body_house_3" id="0x7f120974" />
+    <public type="string" name="hypesquad_quiz_cancel" id="0x7f120975" />
+    <public type="string" name="hypesquad_quiz_close" id="0x7f120976" />
+    <public type="string" name="hypesquad_quiz_completed_modal_title" id="0x7f120977" />
+    <public type="string" name="hypesquad_quiz_error_modal_title" id="0x7f120978" />
+    <public type="string" name="hypesquad_quiz_next_question" id="0x7f120979" />
+    <public type="string" name="hypesquad_quiz_ongoing_modal_title" id="0x7f12097a" />
+    <public type="string" name="hypesquad_quiz_retry" id="0x7f12097b" />
+    <public type="string" name="hypesquad_quiz_select_answer" id="0x7f12097c" />
+    <public type="string" name="hypesquad_quiz_show_my_house" id="0x7f12097d" />
+    <public type="string" name="hypesquad_quiz_title" id="0x7f12097e" />
+    <public type="string" name="hypesquad_ready_to_rep" id="0x7f12097f" />
+    <public type="string" name="hypesquad_subheading" id="0x7f120980" />
+    <public type="string" name="hypesquad_switch_houses_action" id="0x7f120981" />
+    <public type="string" name="hypesquad_switch_houses_prompt" id="0x7f120982" />
+    <public type="string" name="hypesquad_unclaimed_account_notice" id="0x7f120983" />
+    <public type="string" name="hypesquad_unverified_email_notice" id="0x7f120984" />
+    <public type="string" name="hypesquad_your_house" id="0x7f120985" />
+    <public type="string" name="i18n_locale_loading_error" id="0x7f120986" />
+    <public type="string" name="image" id="0x7f120987" />
+    <public type="string" name="images" id="0x7f120988" />
+    <public type="string" name="img_alt_attachment_file_type" id="0x7f120989" />
+    <public type="string" name="img_alt_emoji" id="0x7f12098a" />
+    <public type="string" name="img_alt_icon" id="0x7f12098b" />
+    <public type="string" name="img_alt_logo" id="0x7f12098c" />
+    <public type="string" name="img_alt_navigate_to" id="0x7f12098d" />
+    <public type="string" name="in_a_voice_channel" id="0x7f12098e" />
+    <public type="string" name="in_category" id="0x7f12098f" />
+    <public type="string" name="in_game_voice_settings" id="0x7f120990" />
+    <public type="string" name="in_the_call" id="0x7f120991" />
+    <public type="string" name="in_the_voice_channel" id="0x7f120992" />
+    <public type="string" name="incoming_call" id="0x7f120993" />
+    <public type="string" name="incoming_call_dm" id="0x7f120994" />
+    <public type="string" name="incoming_call_ellipsis" id="0x7f120995" />
+    <public type="string" name="incoming_call_gdm" id="0x7f120996" />
+    <public type="string" name="incoming_friend_request" id="0x7f120997" />
+    <public type="string" name="incoming_video_call" id="0x7f120998" />
+    <public type="string" name="incoming_video_call_ellipsis" id="0x7f120999" />
+    <public type="string" name="incompatible_browser" id="0x7f12099a" />
+    <public type="string" name="inivte_modal_no_thanks" id="0x7f12099b" />
+    <public type="string" name="inline_attachment_media" id="0x7f12099c" />
+    <public type="string" name="inline_attachment_media_help" id="0x7f12099d" />
+    <public type="string" name="inline_embed_media" id="0x7f12099e" />
+    <public type="string" name="inline_media_label" id="0x7f12099f" />
+    <public type="string" name="input_mode_ptt" id="0x7f1209a0" />
+    <public type="string" name="input_mode_ptt_limited" id="0x7f1209a1" />
+    <public type="string" name="input_mode_ptt_release_delay" id="0x7f1209a2" />
+    <public type="string" name="input_mode_vad" id="0x7f1209a3" />
+    <public type="string" name="instagram" id="0x7f1209a4" />
+    <public type="string" name="install_location_main" id="0x7f1209a5" />
+    <public type="string" name="instant_invite" id="0x7f1209a6" />
+    <public type="string" name="instant_invite_accept" id="0x7f1209a7" />
+    <public type="string" name="instant_invite_accepted" id="0x7f1209a8" />
+    <public type="string" name="instant_invite_accepting" id="0x7f1209a9" />
+    <public type="string" name="instant_invite_ask_for_new_invite" id="0x7f1209aa" />
+    <public type="string" name="instant_invite_ask_user_for_new_invite" id="0x7f1209ab" />
+    <public type="string" name="instant_invite_banned" id="0x7f1209ac" />
+    <public type="string" name="instant_invite_banned_info" id="0x7f1209ad" />
+    <public type="string" name="instant_invite_code" id="0x7f1209ae" />
+    <public type="string" name="instant_invite_expired" id="0x7f1209af" />
+    <public type="string" name="instant_invite_expires" id="0x7f1209b0" />
+    <public type="string" name="instant_invite_failed_to_generate" id="0x7f1209b1" />
+    <public type="string" name="instant_invite_friends" id="0x7f1209b2" />
+    <public type="string" name="instant_invite_friends_description" id="0x7f1209b3" />
+    <public type="string" name="instant_invite_generate" id="0x7f1209b4" />
+    <public type="string" name="instant_invite_generated_by_widget" id="0x7f1209b5" />
+    <public type="string" name="instant_invite_guild_by_user" id="0x7f1209b6" />
+    <public type="string" name="instant_invite_guild_members_online" id="0x7f1209b7" />
+    <public type="string" name="instant_invite_guild_members_total" id="0x7f1209b8" />
+    <public type="string" name="instant_invite_hidden" id="0x7f1209b9" />
+    <public type="string" name="instant_invite_invalid_channel" id="0x7f1209ba" />
+    <public type="string" name="instant_invite_invite_code" id="0x7f1209bb" />
+    <public type="string" name="instant_invite_inviter" id="0x7f1209bc" />
+    <public type="string" name="instant_invite_join" id="0x7f1209bd" />
+    <public type="string" name="instant_invite_link_share_text" id="0x7f1209be" />
+    <public type="string" name="instant_invite_looks_like" id="0x7f1209bf" />
+    <public type="string" name="instant_invite_not_allowed" id="0x7f1209c0" />
+    <public type="string" name="instant_invite_popout" id="0x7f1209c1" />
+    <public type="string" name="instant_invite_regenerate" id="0x7f1209c2" />
+    <public type="string" name="instant_invite_resolved_body" id="0x7f1209c3" />
+    <public type="string" name="instant_invite_resolved_title" id="0x7f1209c4" />
+    <public type="string" name="instant_invite_resolving" id="0x7f1209c5" />
+    <public type="string" name="instant_invite_uses" id="0x7f1209c6" />
+    <public type="string" name="instant_invite_you_are_already_a_member_of" id="0x7f1209c7" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join" id="0x7f1209c8" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join_by_user" id="0x7f1209c9" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join_group_dm" id="0x7f1209ca" />
+    <public type="string" name="instant_invites" id="0x7f1209cb" />
+    <public type="string" name="integration_settings" id="0x7f1209cc" />
+    <public type="string" name="integrations" id="0x7f1209cd" />
+    <public type="string" name="integrations_header" id="0x7f1209ce" />
+    <public type="string" name="integrations_pro_tip" id="0x7f1209cf" />
+    <public type="string" name="interaction_required_body" id="0x7f1209d0" />
+    <public type="string" name="interaction_required_title" id="0x7f1209d1" />
+    <public type="string" name="internal_server_error" id="0x7f1209d2" />
+    <public type="string" name="invalid_animated_emoji_body" id="0x7f1209d3" />
+    <public type="string" name="invalid_animated_emoji_body_upgrade" id="0x7f1209d4" />
+    <public type="string" name="invalid_external_emoji_body" id="0x7f1209d5" />
+    <public type="string" name="invalid_external_emoji_body_upgrade" id="0x7f1209d6" />
+    <public type="string" name="invalid_invite_link_error" id="0x7f1209d7" />
+    <public type="string" name="invalid_request_format" id="0x7f1209d8" />
+    <public type="string" name="invalid_text_channel" id="0x7f1209d9" />
+    <public type="string" name="invalid_voice_channel" id="0x7f1209da" />
+    <public type="string" name="invite_banner_does_not_expire" id="0x7f1209db" />
+    <public type="string" name="invite_banner_invite_to_server" id="0x7f1209dc" />
+    <public type="string" name="invite_banner_share_invite_link_for_access" id="0x7f1209dd" />
+    <public type="string" name="invite_button_accepted" id="0x7f1209de" />
+    <public type="string" name="invite_button_accepting" id="0x7f1209df" />
+    <public type="string" name="invite_button_expired" id="0x7f1209e0" />
+    <public type="string" name="invite_button_expired_owner" id="0x7f1209e1" />
+    <public type="string" name="invite_button_invalid" id="0x7f1209e2" />
+    <public type="string" name="invite_button_invalid_owner" id="0x7f1209e3" />
+    <public type="string" name="invite_button_join" id="0x7f1209e4" />
+    <public type="string" name="invite_button_resolving" id="0x7f1209e5" />
+    <public type="string" name="invite_button_stream_ended" id="0x7f1209e6" />
+    <public type="string" name="invite_button_stream_ended_streamer" id="0x7f1209e7" />
+    <public type="string" name="invite_button_stream_watching" id="0x7f1209e8" />
+    <public type="string" name="invite_button_streamer" id="0x7f1209e9" />
+    <public type="string" name="invite_button_streaming" id="0x7f1209ea" />
+    <public type="string" name="invite_button_streaming_subtext" id="0x7f1209eb" />
+    <public type="string" name="invite_button_title_invited" id="0x7f1209ec" />
+    <public type="string" name="invite_button_title_invited_group_dm" id="0x7f1209ed" />
+    <public type="string" name="invite_button_title_invited_invalid" id="0x7f1209ee" />
+    <public type="string" name="invite_button_title_invited_lfg_gdm" id="0x7f1209ef" />
+    <public type="string" name="invite_button_title_invited_stream" id="0x7f1209f0" />
+    <public type="string" name="invite_button_title_inviter" id="0x7f1209f1" />
+    <public type="string" name="invite_button_title_inviter_group_dm" id="0x7f1209f2" />
+    <public type="string" name="invite_button_title_inviter_invalid" id="0x7f1209f3" />
+    <public type="string" name="invite_button_title_inviter_lfg_gdm" id="0x7f1209f4" />
+    <public type="string" name="invite_button_title_inviter_stream" id="0x7f1209f5" />
+    <public type="string" name="invite_button_title_streaming" id="0x7f1209f6" />
+    <public type="string" name="invite_copied" id="0x7f1209f7" />
+    <public type="string" name="invite_copy_share_link_header_mobile" id="0x7f1209f8" />
+    <public type="string" name="invite_edit_link" id="0x7f1209f9" />
+    <public type="string" name="invite_embed_full_group" id="0x7f1209fa" />
+    <public type="string" name="invite_embed_full_group_spectate" id="0x7f1209fb" />
+    <public type="string" name="invite_embed_game_has_ended" id="0x7f1209fc" />
+    <public type="string" name="invite_embed_game_invite" id="0x7f1209fd" />
+    <public type="string" name="invite_embed_game_not_detected" id="0x7f1209fe" />
+    <public type="string" name="invite_embed_in_group" id="0x7f1209ff" />
+    <public type="string" name="invite_embed_invite_to_join" id="0x7f120a00" />
+    <public type="string" name="invite_embed_invite_to_join_group" id="0x7f120a01" />
+    <public type="string" name="invite_embed_invite_to_listen" id="0x7f120a02" />
+    <public type="string" name="invite_embed_invite_to_spectate" id="0x7f120a03" />
+    <public type="string" name="invite_embed_invite_to_watch" id="0x7f120a04" />
+    <public type="string" name="invite_embed_join_via_desktop_app" id="0x7f120a05" />
+    <public type="string" name="invite_embed_joined" id="0x7f120a06" />
+    <public type="string" name="invite_embed_listen_has_ended" id="0x7f120a07" />
+    <public type="string" name="invite_embed_listening_invite" id="0x7f120a08" />
+    <public type="string" name="invite_embed_num_open_slots" id="0x7f120a09" />
+    <public type="string" name="invite_embed_num_open_slots_android" id="0x7f120a0a" />
+    <public type="string" name="invite_embed_send_invite" id="0x7f120a0b" />
+    <public type="string" name="invite_embed_spectate" id="0x7f120a0c" />
+    <public type="string" name="invite_embed_spectate_via_desktop_app" id="0x7f120a0d" />
+    <public type="string" name="invite_embed_watch_has_ended" id="0x7f120a0e" />
+    <public type="string" name="invite_expired_subtext_mobile" id="0x7f120a0f" />
+    <public type="string" name="invite_expires_days" id="0x7f120a10" />
+    <public type="string" name="invite_expires_days_or_uses" id="0x7f120a11" />
+    <public type="string" name="invite_expires_hours" id="0x7f120a12" />
+    <public type="string" name="invite_expires_hours_or_uses" id="0x7f120a13" />
+    <public type="string" name="invite_expires_minutes" id="0x7f120a14" />
+    <public type="string" name="invite_expires_minutes_or_uses" id="0x7f120a15" />
+    <public type="string" name="invite_expires_never" id="0x7f120a16" />
+    <public type="string" name="invite_expires_uses" id="0x7f120a17" />
+    <public type="string" name="invite_footer_link_header" id="0x7f120a18" />
+    <public type="string" name="invite_friend_modal_invite" id="0x7f120a19" />
+    <public type="string" name="invite_friend_modal_loading" id="0x7f120a1a" />
+    <public type="string" name="invite_friend_modal_no_results" id="0x7f120a1b" />
+    <public type="string" name="invite_friend_modal_retry" id="0x7f120a1c" />
+    <public type="string" name="invite_friend_modal_sent" id="0x7f120a1d" />
+    <public type="string" name="invite_friend_modal_subtitle" id="0x7f120a1e" />
+    <public type="string" name="invite_friend_modal_title" id="0x7f120a1f" />
+    <public type="string" name="invite_friends" id="0x7f120a20" />
+    <public type="string" name="invite_invalid_cta" id="0x7f120a21" />
+    <public type="string" name="invite_invalid_error" id="0x7f120a22" />
+    <public type="string" name="invite_link_copied" id="0x7f120a23" />
+    <public type="string" name="invite_link_example_full" id="0x7f120a24" />
+    <public type="string" name="invite_link_example_simple" id="0x7f120a25" />
+    <public type="string" name="invite_link_example_verified" id="0x7f120a26" />
+    <public type="string" name="invite_links_expire_after_1_day" id="0x7f120a27" />
+    <public type="string" name="invite_links_never_expires" id="0x7f120a28" />
+    <public type="string" name="invite_members" id="0x7f120a29" />
+    <public type="string" name="invite_modal_button" id="0x7f120a2a" />
+    <public type="string" name="invite_modal_error_default" id="0x7f120a2b" />
+    <public type="string" name="invite_modal_error_title" id="0x7f120a2c" />
+    <public type="string" name="invite_modal_open_button" id="0x7f120a2d" />
+    <public type="string" name="invite_never_expires_subtext_mobile" id="0x7f120a2e" />
+    <public type="string" name="invite_no_channels" id="0x7f120a2f" />
+    <public type="string" name="invite_no_thanks" id="0x7f120a30" />
+    <public type="string" name="invite_notice_message" id="0x7f120a31" />
+    <public type="string" name="invite_notice_message_part_2" id="0x7f120a32" />
+    <public type="string" name="invite_people" id="0x7f120a33" />
+    <public type="string" name="invite_private_call_heads_up" id="0x7f120a34" />
+    <public type="string" name="invite_search_for_friends" id="0x7f120a35" />
+    <public type="string" name="invite_sent" id="0x7f120a36" />
+    <public type="string" name="invite_settings_expired_description" id="0x7f120a37" />
+    <public type="string" name="invite_settings_title" id="0x7f120a38" />
+    <public type="string" name="invite_share_default" id="0x7f120a39" />
+    <public type="string" name="invite_share_link_own_server" id="0x7f120a3a" />
+    <public type="string" name="invite_share_link_to_stream" id="0x7f120a3b" />
+    <public type="string" name="invite_stream_footer_link_header" id="0x7f120a3c" />
+    <public type="string" name="invite_stream_header" id="0x7f120a3d" />
+    <public type="string" name="invite_to_server" id="0x7f120a3e" />
+    <public type="string" name="invite_to_server_name" id="0x7f120a3f" />
+    <public type="string" name="invite_to_server_name_experiment" id="0x7f120a40" />
+    <public type="string" name="invite_url" id="0x7f120a41" />
+    <public type="string" name="invite_voice_empty_mobile" id="0x7f120a42" />
+    <public type="string" name="invite_your_friends_header_mobile" id="0x7f120a43" />
+    <public type="string" name="invite_your_friends_voice_call_mobile" id="0x7f120a44" />
+    <public type="string" name="invites" id="0x7f120a45" />
+    <public type="string" name="ios_camera" id="0x7f120a46" />
+    <public type="string" name="ios_iap_generic_billing_error" id="0x7f120a47" />
+    <public type="string" name="ios_iap_itunes_error" id="0x7f120a48" />
+    <public type="string" name="ios_iap_manage_subscription_button" id="0x7f120a49" />
+    <public type="string" name="ios_iap_manage_subscription_desktop" id="0x7f120a4a" />
+    <public type="string" name="ios_iap_restore_subscription_error" id="0x7f120a4b" />
+    <public type="string" name="ios_iap_restore_subscription_none_description" id="0x7f120a4c" />
+    <public type="string" name="ios_iap_restore_subscription_none_title" id="0x7f120a4d" />
+    <public type="string" name="ios_iap_restore_subscription_success" id="0x7f120a4e" />
+    <public type="string" name="ios_iap_testflight_error" id="0x7f120a4f" />
+    <public type="string" name="ios_media_keyboard_browse_photo" id="0x7f120a50" />
+    <public type="string" name="ios_media_keyboard_enable_in_settings" id="0x7f120a51" />
+    <public type="string" name="ios_media_keyboard_more_photos" id="0x7f120a52" />
+    <public type="string" name="ios_media_keyboard_no_permission" id="0x7f120a53" />
+    <public type="string" name="ios_media_keyboard_no_photos" id="0x7f120a54" />
+    <public type="string" name="ios_media_keyboard_take_a_photo" id="0x7f120a55" />
+    <public type="string" name="ios_notification_see_full" id="0x7f120a56" />
+    <public type="string" name="ios_nuf_chat_with_friends" id="0x7f120a57" />
+    <public type="string" name="ios_nuf_club_or_interest_group" id="0x7f120a58" />
+    <public type="string" name="ios_nuf_gaming_community" id="0x7f120a59" />
+    <public type="string" name="ios_nuf_get_started" id="0x7f120a5a" />
+    <public type="string" name="ios_nuf_join_a_friend" id="0x7f120a5b" />
+    <public type="string" name="ios_nuf_voice_chat_while_gaming" id="0x7f120a5c" />
+    <public type="string" name="ios_nuf_what_do_you_want" id="0x7f120a5d" />
+    <public type="string" name="ios_profile_in_voice_call" id="0x7f120a5e" />
+    <public type="string" name="ios_profile_mutual_friends" id="0x7f120a5f" />
+    <public type="string" name="ios_profile_mutual_friends_placeholder" id="0x7f120a60" />
+    <public type="string" name="ios_profile_mutual_guilds" id="0x7f120a61" />
+    <public type="string" name="ios_profile_mutual_guilds_placeholder" id="0x7f120a62" />
+    <public type="string" name="ios_profile_open_voice_channel" id="0x7f120a63" />
+    <public type="string" name="ios_view_all" id="0x7f120a64" />
+    <public type="string" name="ip_address_secured" id="0x7f120a65" />
+    <public type="string" name="ip_authorization_succeeded" id="0x7f120a66" />
+    <public type="string" name="ip_authorization_succeeded_suggestion" id="0x7f120a67" />
+    <public type="string" name="it" id="0x7f120a68" />
+    <public type="string" name="ja" id="0x7f120a69" />
+    <public type="string" name="join" id="0x7f120a6a" />
+    <public type="string" name="join_afk_channel_body" id="0x7f120a6b" />
+    <public type="string" name="join_call" id="0x7f120a6c" />
+    <public type="string" name="join_server" id="0x7f120a6d" />
+    <public type="string" name="join_server_button_body" id="0x7f120a6e" />
+    <public type="string" name="join_server_button_cta" id="0x7f120a6f" />
+    <public type="string" name="join_server_button_cta_mobile" id="0x7f120a70" />
+    <public type="string" name="join_server_button_cta_mobile_desc" id="0x7f120a71" />
+    <public type="string" name="join_server_button_cta_named" id="0x7f120a72" />
+    <public type="string" name="join_server_description" id="0x7f120a73" />
+    <public type="string" name="join_server_description_mobile" id="0x7f120a74" />
+    <public type="string" name="join_server_title" id="0x7f120a75" />
+    <public type="string" name="join_stream" id="0x7f120a76" />
+    <public type="string" name="join_video_call" id="0x7f120a77" />
+    <public type="string" name="join_voice" id="0x7f120a78" />
+    <public type="string" name="join_voice_call" id="0x7f120a79" />
+    <public type="string" name="join_voice_channel" id="0x7f120a7a" />
+    <public type="string" name="join_voice_channel_cta" id="0x7f120a7b" />
+    <public type="string" name="joined_server" id="0x7f120a7c" />
+    <public type="string" name="joining_server" id="0x7f120a7d" />
+    <public type="string" name="jump" id="0x7f120a7e" />
+    <public type="string" name="jump_to_channel" id="0x7f120a7f" />
+    <public type="string" name="jump_to_chat" id="0x7f120a80" />
+    <public type="string" name="jump_to_last_unread_message" id="0x7f120a81" />
+    <public type="string" name="jump_to_present" id="0x7f120a82" />
+    <public type="string" name="keep_permissions" id="0x7f120a83" />
+    <public type="string" name="keybind_activate_overlay_chat" id="0x7f120a84" />
+    <public type="string" name="keybind_conflict" id="0x7f120a85" />
+    <public type="string" name="keybind_description_modal_call_accept" id="0x7f120a86" />
+    <public type="string" name="keybind_description_modal_call_decline" id="0x7f120a87" />
+    <public type="string" name="keybind_description_modal_call_start" id="0x7f120a88" />
+    <public type="string" name="keybind_description_modal_create_dm_group" id="0x7f120a89" />
+    <public type="string" name="keybind_description_modal_create_guild" id="0x7f120a8a" />
+    <public type="string" name="keybind_description_modal_easter_egg" id="0x7f120a8b" />
+    <public type="string" name="keybind_description_modal_find_conversation" id="0x7f120a8c" />
+    <public type="string" name="keybind_description_modal_focus_text_area" id="0x7f120a8d" />
+    <public type="string" name="keybind_description_modal_jump_to_first_unread" id="0x7f120a8e" />
+    <public type="string" name="keybind_description_modal_mark_channel_read" id="0x7f120a8f" />
+    <public type="string" name="keybind_description_modal_mark_server_read" id="0x7f120a90" />
+    <public type="string" name="keybind_description_modal_navigate_channels" id="0x7f120a91" />
+    <public type="string" name="keybind_description_modal_navigate_servers" id="0x7f120a92" />
+    <public type="string" name="keybind_description_modal_quickswitcher" id="0x7f120a93" />
+    <public type="string" name="keybind_description_modal_return_to_audio_channel" id="0x7f120a94" />
+    <public type="string" name="keybind_description_modal_scroll_chat" id="0x7f120a95" />
+    <public type="string" name="keybind_description_modal_search" id="0x7f120a96" />
+    <public type="string" name="keybind_description_modal_search_emojis" id="0x7f120a97" />
+    <public type="string" name="keybind_description_modal_search_gifs" id="0x7f120a98" />
+    <public type="string" name="keybind_description_modal_subtitle" id="0x7f120a99" />
+    <public type="string" name="keybind_description_modal_title" id="0x7f120a9a" />
+    <public type="string" name="keybind_description_modal_toggle_deafen" id="0x7f120a9b" />
+    <public type="string" name="keybind_description_modal_toggle_help" id="0x7f120a9c" />
+    <public type="string" name="keybind_description_modal_toggle_hotkeys" id="0x7f120a9d" />
+    <public type="string" name="keybind_description_modal_toggle_mentions" id="0x7f120a9e" />
+    <public type="string" name="keybind_description_modal_toggle_mute" id="0x7f120a9f" />
+    <public type="string" name="keybind_description_modal_toggle_pins" id="0x7f120aa0" />
+    <public type="string" name="keybind_description_modal_toggle_previous_guild" id="0x7f120aa1" />
+    <public type="string" name="keybind_description_modal_toggle_users" id="0x7f120aa2" />
+    <public type="string" name="keybind_description_modal_unread_channels" id="0x7f120aa3" />
+    <public type="string" name="keybind_description_modal_unread_mention_channels" id="0x7f120aa4" />
+    <public type="string" name="keybind_description_modal_upload_file" id="0x7f120aa5" />
+    <public type="string" name="keybind_description_push_to_mute" id="0x7f120aa6" />
+    <public type="string" name="keybind_description_push_to_talk" id="0x7f120aa7" />
+    <public type="string" name="keybind_description_push_to_talk_priority" id="0x7f120aa8" />
+    <public type="string" name="keybind_description_toggle_deafen" id="0x7f120aa9" />
+    <public type="string" name="keybind_description_toggle_go_live_streaming" id="0x7f120aaa" />
+    <public type="string" name="keybind_description_toggle_mute" id="0x7f120aab" />
+    <public type="string" name="keybind_description_toggle_overlay" id="0x7f120aac" />
+    <public type="string" name="keybind_description_toggle_overlay_input_lock" id="0x7f120aad" />
+    <public type="string" name="keybind_description_toggle_streamer_mode" id="0x7f120aae" />
+    <public type="string" name="keybind_description_toggle_voice_mode" id="0x7f120aaf" />
+    <public type="string" name="keybind_description_unassigned" id="0x7f120ab0" />
+    <public type="string" name="keybind_push_to_mute" id="0x7f120ab1" />
+    <public type="string" name="keybind_push_to_talk" id="0x7f120ab2" />
+    <public type="string" name="keybind_push_to_talk_priority" id="0x7f120ab3" />
+    <public type="string" name="keybind_toggle_deafen" id="0x7f120ab4" />
+    <public type="string" name="keybind_toggle_go_live_streaming" id="0x7f120ab5" />
+    <public type="string" name="keybind_toggle_mute" id="0x7f120ab6" />
+    <public type="string" name="keybind_toggle_overlay" id="0x7f120ab7" />
+    <public type="string" name="keybind_toggle_overlay_input_lock" id="0x7f120ab8" />
+    <public type="string" name="keybind_toggle_stream_mode" id="0x7f120ab9" />
+    <public type="string" name="keybind_toggle_voice_mode" id="0x7f120aba" />
+    <public type="string" name="keybind_unassigned" id="0x7f120abb" />
+    <public type="string" name="keybinds" id="0x7f120abc" />
+    <public type="string" name="keyboard_behavior_mobile_header" id="0x7f120abd" />
+    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send" id="0x7f120abe" />
+    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send_hint" id="0x7f120abf" />
+    <public type="string" name="kick" id="0x7f120ac0" />
+    <public type="string" name="kick_from_server" id="0x7f120ac1" />
+    <public type="string" name="kick_members" id="0x7f120ac2" />
+    <public type="string" name="kick_members_description" id="0x7f120ac3" />
+    <public type="string" name="kick_user_body" id="0x7f120ac4" />
+    <public type="string" name="kick_user_confirmed" id="0x7f120ac5" />
+    <public type="string" name="kick_user_error_generic" id="0x7f120ac6" />
+    <public type="string" name="kick_user_title" id="0x7f120ac7" />
+    <public type="string" name="ko" id="0x7f120ac8" />
+    <public type="string" name="label_with_online_status" id="0x7f120ac9" />
+    <public type="string" name="language" id="0x7f120aca" />
+    <public type="string" name="language_not_found" id="0x7f120acb" />
+    <public type="string" name="language_select" id="0x7f120acc" />
+    <public type="string" name="language_updated" id="0x7f120acd" />
+    <public type="string" name="languages" id="0x7f120ace" />
+    <public type="string" name="last_seen" id="0x7f120acf" />
+    <public type="string" name="last_selected_voice_channel_body" id="0x7f120ad0" />
+    <public type="string" name="last_selected_voice_channel_no" id="0x7f120ad1" />
+    <public type="string" name="last_selected_voice_channel_title" id="0x7f120ad2" />
+    <public type="string" name="last_selected_voice_channel_yes" id="0x7f120ad3" />
+    <public type="string" name="last_sync" id="0x7f120ad4" />
+    <public type="string" name="launch_app" id="0x7f120ad5" />
+    <public type="string" name="learn_more" id="0x7f120ad6" />
+    <public type="string" name="leave_call" id="0x7f120ad7" />
+    <public type="string" name="leave_group_dm" id="0x7f120ad8" />
+    <public type="string" name="leave_group_dm_body" id="0x7f120ad9" />
+    <public type="string" name="leave_group_dm_managed_body" id="0x7f120ada" />
+    <public type="string" name="leave_group_dm_managed_title" id="0x7f120adb" />
+    <public type="string" name="leave_group_dm_title" id="0x7f120adc" />
+    <public type="string" name="leave_server" id="0x7f120add" />
+    <public type="string" name="leave_server_body" id="0x7f120ade" />
+    <public type="string" name="leave_server_body_mobile" id="0x7f120adf" />
+    <public type="string" name="leave_server_title" id="0x7f120ae0" />
+    <public type="string" name="lfg_active_groups" id="0x7f120ae1" />
+    <public type="string" name="lfg_bump_button" id="0x7f120ae2" />
+    <public type="string" name="lfg_bump_cooldown" id="0x7f120ae3" />
+    <public type="string" name="lfg_channel_unavailable" id="0x7f120ae4" />
+    <public type="string" name="lfg_create_a_group" id="0x7f120ae5" />
+    <public type="string" name="lfg_create_button" id="0x7f120ae6" />
+    <public type="string" name="lfg_create_placeholder" id="0x7f120ae7" />
+    <public type="string" name="lfg_delete_modal_content" id="0x7f120ae8" />
+    <public type="string" name="lfg_delete_modal_title" id="0x7f120ae9" />
+    <public type="string" name="lfg_delisted_explanation_completed" id="0x7f120aea" />
+    <public type="string" name="lfg_delisted_explanation_expired" id="0x7f120aeb" />
+    <public type="string" name="lfg_delisted_explanation_inactive" id="0x7f120aec" />
+    <public type="string" name="lfg_delisted_explanation_unknown" id="0x7f120aed" />
+    <public type="string" name="lfg_edit_modal_cta" id="0x7f120aee" />
+    <public type="string" name="lfg_edit_modal_description_label" id="0x7f120aef" />
+    <public type="string" name="lfg_edit_modal_group_size_label" id="0x7f120af0" />
+    <public type="string" name="lfg_edit_modal_title" id="0x7f120af1" />
+    <public type="string" name="lfg_empty_state_note" id="0x7f120af2" />
+    <public type="string" name="lfg_empty_state_note_2" id="0x7f120af3" />
+    <public type="string" name="lfg_empty_state_title" id="0x7f120af4" />
+    <public type="string" name="lfg_expired_banner" id="0x7f120af5" />
+    <public type="string" name="lfg_group_description_required" id="0x7f120af6" />
+    <public type="string" name="lfg_group_full" id="0x7f120af7" />
+    <public type="string" name="lfg_groups_looking" id="0x7f120af8" />
+    <public type="string" name="lfg_groups_looking_with_total" id="0x7f120af9" />
+    <public type="string" name="lfg_join_button" id="0x7f120afa" />
+    <public type="string" name="lfg_leave_button" id="0x7f120afb" />
+    <public type="string" name="lfg_listing_age_hours" id="0x7f120afc" />
+    <public type="string" name="lfg_listing_age_minutes" id="0x7f120afd" />
+    <public type="string" name="lfg_listing_age_seconds" id="0x7f120afe" />
+    <public type="string" name="lfg_listings_channel" id="0x7f120aff" />
+    <public type="string" name="lfg_manage_group" id="0x7f120b00" />
+    <public type="string" name="lfg_num_players" id="0x7f120b01" />
+    <public type="string" name="lfg_relist_button" id="0x7f120b02" />
+    <public type="string" name="lfg_relist_your_group" id="0x7f120b03" />
+    <public type="string" name="lfg_relisted" id="0x7f120b04" />
+    <public type="string" name="lfg_relisted_in_channel" id="0x7f120b05" />
+    <public type="string" name="lfg_save_button" id="0x7f120b06" />
+    <public type="string" name="lfg_save_modal_empty_text" id="0x7f120b07" />
+    <public type="string" name="lfg_save_modal_subtitle" id="0x7f120b08" />
+    <public type="string" name="lfg_save_modal_title" id="0x7f120b09" />
+    <public type="string" name="lfg_sidebar_description" id="0x7f120b0a" />
+    <public type="string" name="lfg_sidebar_size" id="0x7f120b0b" />
+    <public type="string" name="lfg_sidebar_size_number" id="0x7f120b0c" />
+    <public type="string" name="lfg_sidebar_status" id="0x7f120b0d" />
+    <public type="string" name="lfg_sidebar_status_expired" id="0x7f120b0e" />
+    <public type="string" name="lfg_sidebar_status_expired_tooltip" id="0x7f120b0f" />
+    <public type="string" name="lfg_something_went_wrong" id="0x7f120b10" />
+    <public type="string" name="lfg_spots_available" id="0x7f120b11" />
+    <public type="string" name="lfg_unknown_member_tooltip" id="0x7f120b12" />
+    <public type="string" name="lfg_view_button" id="0x7f120b13" />
+    <public type="string" name="lfg_your_active_group" id="0x7f120b14" />
+    <public type="string" name="lfg_your_group" id="0x7f120b15" />
+    <public type="string" name="library" id="0x7f120b16" />
+    <public type="string" name="light_blue" id="0x7f120b17" />
+    <public type="string" name="light_green" id="0x7f120b18" />
+    <public type="string" name="light_grey" id="0x7f120b19" />
+    <public type="string" name="link_account" id="0x7f120b1a" />
+    <public type="string" name="link_copied" id="0x7f120b1b" />
+    <public type="string" name="link_settings" id="0x7f120b1c" />
+    <public type="string" name="link_your_discord_account" id="0x7f120b1d" />
+    <public type="string" name="link_your_xbox_account_1" id="0x7f120b1e" />
+    <public type="string" name="link_your_xbox_account_2" id="0x7f120b1f" />
+    <public type="string" name="linux" id="0x7f120b20" />
+    <public type="string" name="listen_on_spotify" id="0x7f120b21" />
+    <public type="string" name="listening_to" id="0x7f120b22" />
+    <public type="string" name="listings_permissions" id="0x7f120b23" />
+    <public type="string" name="live" id="0x7f120b24" />
+    <public type="string" name="live_beta_description" id="0x7f120b25" />
+    <public type="string" name="live_on_twitch" id="0x7f120b26" />
+    <public type="string" name="live_viewers" id="0x7f120b27" />
+    <public type="string" name="load_image_error" id="0x7f120b28" />
+    <public type="string" name="load_more_messages" id="0x7f120b29" />
+    <public type="string" name="load_reactions_error" id="0x7f120b2a" />
+    <public type="string" name="loading" id="0x7f120b2b" />
+    <public type="string" name="loading_divider" id="0x7f120b2c" />
+    <public type="string" name="loading_your_pin" id="0x7f120b2d" />
+    <public type="string" name="lobby" id="0x7f120b2e" />
+    <public type="string" name="local_push_notification_guild_verification_body" id="0x7f120b2f" />
+    <public type="string" name="locale" id="0x7f120b30" />
+    <public type="string" name="login" id="0x7f120b31" />
+    <public type="string" name="login_body" id="0x7f120b32" />
+    <public type="string" name="login_title" id="0x7f120b33" />
+    <public type="string" name="logout" id="0x7f120b34" />
+    <public type="string" name="lt" id="0x7f120b35" />
+    <public type="string" name="lurker_mode_chat_input_back_button" id="0x7f120b36" />
+    <public type="string" name="lurker_mode_chat_input_button" id="0x7f120b37" />
+    <public type="string" name="lurker_mode_chat_input_message" id="0x7f120b38" />
+    <public type="string" name="lurker_mode_chat_input_message_ios" id="0x7f120b39" />
+    <public type="string" name="lurker_mode_view_guild" id="0x7f120b3a" />
+    <public type="string" name="lurkers_description" id="0x7f120b3b" />
+    <public type="string" name="macos" id="0x7f120b3c" />
+    <public type="string" name="magenta" id="0x7f120b3d" />
+    <public type="string" name="manage_channel" id="0x7f120b3e" />
+    <public type="string" name="manage_channel_description" id="0x7f120b3f" />
+    <public type="string" name="manage_channels" id="0x7f120b40" />
+    <public type="string" name="manage_channels_description" id="0x7f120b41" />
+    <public type="string" name="manage_emojis" id="0x7f120b42" />
+    <public type="string" name="manage_listings" id="0x7f120b43" />
+    <public type="string" name="manage_listings_description" id="0x7f120b44" />
+    <public type="string" name="manage_messages" id="0x7f120b45" />
+    <public type="string" name="manage_messages_description" id="0x7f120b46" />
+    <public type="string" name="manage_messages_description_in_announcement_channel" id="0x7f120b47" />
+    <public type="string" name="manage_nicknames" id="0x7f120b48" />
+    <public type="string" name="manage_nicknames_description" id="0x7f120b49" />
+    <public type="string" name="manage_permissions" id="0x7f120b4a" />
+    <public type="string" name="manage_permissions_description" id="0x7f120b4b" />
+    <public type="string" name="manage_roles" id="0x7f120b4c" />
+    <public type="string" name="manage_roles_description" id="0x7f120b4d" />
+    <public type="string" name="manage_server" id="0x7f120b4e" />
+    <public type="string" name="manage_server_description" id="0x7f120b4f" />
+    <public type="string" name="manage_user" id="0x7f120b50" />
+    <public type="string" name="manage_user_shorthand" id="0x7f120b51" />
+    <public type="string" name="manage_webhooks" id="0x7f120b52" />
+    <public type="string" name="manage_webhooks_description" id="0x7f120b53" />
+    <public type="string" name="managed_role_explaination" id="0x7f120b54" />
+    <public type="string" name="mark_as_read" id="0x7f120b55" />
+    <public type="string" name="masked_link_body" id="0x7f120b56" />
+    <public type="string" name="masked_link_cancel" id="0x7f120b57" />
+    <public type="string" name="masked_link_confirm" id="0x7f120b58" />
+    <public type="string" name="masked_link_trust_this_domain" id="0x7f120b59" />
+    <public type="string" name="mature_listing_accept" id="0x7f120b5a" />
+    <public type="string" name="mature_listing_decline" id="0x7f120b5b" />
+    <public type="string" name="mature_listing_description" id="0x7f120b5c" />
+    <public type="string" name="mature_listing_title" id="0x7f120b5d" />
+    <public type="string" name="max_age_never" id="0x7f120b5e" />
+    <public type="string" name="max_age_never_description_mobile" id="0x7f120b5f" />
+    <public type="string" name="max_number_of_uses" id="0x7f120b60" />
+    <public type="string" name="max_uses" id="0x7f120b61" />
+    <public type="string" name="max_uses_description_mobile" id="0x7f120b62" />
+    <public type="string" name="max_uses_description_unlimited_uses" id="0x7f120b63" />
+    <public type="string" name="me" id="0x7f120b64" />
+    <public type="string" name="media_hint_body" id="0x7f120b65" />
+    <public type="string" name="media_hint_title" id="0x7f120b66" />
+    <public type="string" name="member" id="0x7f120b67" />
+    <public type="string" name="member_list" id="0x7f120b68" />
+    <public type="string" name="member_list_server_owner_help" id="0x7f120b69" />
+    <public type="string" name="members" id="0x7f120b6a" />
+    <public type="string" name="members_header" id="0x7f120b6b" />
+    <public type="string" name="members_matching" id="0x7f120b6c" />
+    <public type="string" name="members_search_placeholder" id="0x7f120b6d" />
+    <public type="string" name="mention" id="0x7f120b6e" />
+    <public type="string" name="mention_everyone" id="0x7f120b6f" />
+    <public type="string" name="mention_everyone_autocomplete_description" id="0x7f120b70" />
+    <public type="string" name="mention_everyone_autocomplete_description_mobile" id="0x7f120b71" />
+    <public type="string" name="mention_everyone_description" id="0x7f120b72" />
+    <public type="string" name="mention_here_autocomplete_description" id="0x7f120b73" />
+    <public type="string" name="mention_here_autocomplete_description_mobile" id="0x7f120b74" />
+    <public type="string" name="mention_role_autocomplete_description_mobile" id="0x7f120b75" />
+    <public type="string" name="mention_users_with_role" id="0x7f120b76" />
+    <public type="string" name="mentions" id="0x7f120b77" />
+    <public type="string" name="mentions_count" id="0x7f120b78" />
+    <public type="string" name="message_display_mode_label" id="0x7f120b79" />
+    <public type="string" name="message_edited" id="0x7f120b7a" />
+    <public type="string" name="message_options" id="0x7f120b7b" />
+    <public type="string" name="message_pinned" id="0x7f120b7c" />
+    <public type="string" name="message_preview" id="0x7f120b7d" />
+    <public type="string" name="message_rate_limited_body" id="0x7f120b7e" />
+    <public type="string" name="message_rate_limited_button" id="0x7f120b7f" />
+    <public type="string" name="message_rate_limited_header" id="0x7f120b80" />
+    <public type="string" name="message_too_long_body" id="0x7f120b81" />
+    <public type="string" name="message_too_long_header" id="0x7f120b82" />
+    <public type="string" name="message_tts" id="0x7f120b83" />
+    <public type="string" name="message_tts_deleted_role" id="0x7f120b84" />
+    <public type="string" name="message_unpinned" id="0x7f120b85" />
+    <public type="string" name="message_warning_mention_everyone_body" id="0x7f120b86" />
+    <public type="string" name="message_warning_mention_everyone_title" id="0x7f120b87" />
+    <public type="string" name="messages" id="0x7f120b88" />
+    <public type="string" name="metacritic_num_critic_ratings" id="0x7f120b89" />
+    <public type="string" name="metacritic_user_score" id="0x7f120b8a" />
+    <public type="string" name="metacritic_verdict_generally_favorable" id="0x7f120b8b" />
+    <public type="string" name="metacritic_verdict_generally_unfavorable" id="0x7f120b8c" />
+    <public type="string" name="metacritic_verdict_mixed_or_average" id="0x7f120b8d" />
+    <public type="string" name="metacritic_verdict_overwhelming_dislike" id="0x7f120b8e" />
+    <public type="string" name="metacritic_verdict_universal_acclaim" id="0x7f120b8f" />
+    <public type="string" name="mfa_sms_add_phone" id="0x7f120b90" />
+    <public type="string" name="mfa_sms_already_enabled" id="0x7f120b91" />
+    <public type="string" name="mfa_sms_auth" id="0x7f120b92" />
+    <public type="string" name="mfa_sms_auth_current_phone" id="0x7f120b93" />
+    <public type="string" name="mfa_sms_auth_sales_pitch" id="0x7f120b94" />
+    <public type="string" name="mfa_sms_confirm_remove_action" id="0x7f120b95" />
+    <public type="string" name="mfa_sms_confirm_remove_body" id="0x7f120b96" />
+    <public type="string" name="mfa_sms_disabled_partner" id="0x7f120b97" />
+    <public type="string" name="mfa_sms_enable" id="0x7f120b98" />
+    <public type="string" name="mfa_sms_enable_subheader" id="0x7f120b99" />
+    <public type="string" name="mfa_sms_phone_number_hide" id="0x7f120b9a" />
+    <public type="string" name="mfa_sms_phone_number_reveal" id="0x7f120b9b" />
+    <public type="string" name="mfa_sms_receive_code" id="0x7f120b9c" />
+    <public type="string" name="mfa_sms_remove" id="0x7f120b9d" />
+    <public type="string" name="mfa_sms_resend" id="0x7f120b9e" />
+    <public type="string" name="microphone_permission_error" id="0x7f120b9f" />
+    <public type="string" name="minimum_size" id="0x7f120ba0" />
+    <public type="string" name="missed_an_update" id="0x7f120ba1" />
+    <public type="string" name="missing_entitlement_modal_body" id="0x7f120ba2" />
+    <public type="string" name="missing_entitlement_modal_body_unknown_application" id="0x7f120ba3" />
+    <public type="string" name="missing_entitlement_modal_header" id="0x7f120ba4" />
+    <public type="string" name="missing_entitlement_modal_header_unknown_application" id="0x7f120ba5" />
+    <public type="string" name="mobile_enable_hardware_scaling" id="0x7f120ba6" />
+    <public type="string" name="mobile_enable_hardware_scaling_desc" id="0x7f120ba7" />
+    <public type="string" name="moderation" id="0x7f120ba8" />
+    <public type="string" name="modify_followed_news_header" id="0x7f120ba9" />
+    <public type="string" name="more" id="0x7f120baa" />
+    <public type="string" name="move_from_category_to" id="0x7f120bab" />
+    <public type="string" name="move_members" id="0x7f120bac" />
+    <public type="string" name="move_members_description" id="0x7f120bad" />
+    <public type="string" name="move_to" id="0x7f120bae" />
+    <public type="string" name="move_to_success" id="0x7f120baf" />
+    <public type="string" name="mtrl_chip_close_icon_content_description" id="0x7f120bb0" />
+    <public type="string" name="mute" id="0x7f120bb1" />
+    <public type="string" name="mute_category" id="0x7f120bb2" />
+    <public type="string" name="mute_channel" id="0x7f120bb3" />
+    <public type="string" name="mute_channel_old" id="0x7f120bb4" />
+    <public type="string" name="mute_during_work" id="0x7f120bb5" />
+    <public type="string" name="mute_for_an_hour" id="0x7f120bb6" />
+    <public type="string" name="mute_group_dm" id="0x7f120bb7" />
+    <public type="string" name="mute_members" id="0x7f120bb8" />
+    <public type="string" name="mutual_friends" id="0x7f120bb9" />
+    <public type="string" name="mutual_guilds" id="0x7f120bba" />
+    <public type="string" name="n_days" id="0x7f120bbb" />
+    <public type="string" name="nearby_scan" id="0x7f120bbc" />
+    <public type="string" name="need_account" id="0x7f120bbd" />
+    <public type="string" name="network_error_bad_request" id="0x7f120bbe" />
+    <public type="string" name="network_error_cloudflare_intermittent" id="0x7f120bbf" />
+    <public type="string" name="network_error_cloudflare_unauthorized" id="0x7f120bc0" />
+    <public type="string" name="network_error_connection" id="0x7f120bc1" />
+    <public type="string" name="network_error_forbidden" id="0x7f120bc2" />
+    <public type="string" name="network_error_request_too_large" id="0x7f120bc3" />
+    <public type="string" name="network_error_rest_request" id="0x7f120bc4" />
+    <public type="string" name="network_error_ssl" id="0x7f120bc5" />
+    <public type="string" name="network_error_unauthorized" id="0x7f120bc6" />
+    <public type="string" name="network_error_unknown" id="0x7f120bc7" />
+    <public type="string" name="network_error_unknown_host" id="0x7f120bc8" />
+    <public type="string" name="network_offline" id="0x7f120bc9" />
+    <public type="string" name="nevermind" id="0x7f120bca" />
+    <public type="string" name="new_dm" id="0x7f120bcb" />
+    <public type="string" name="new_group_dm" id="0x7f120bcc" />
+    <public type="string" name="new_guilds_dm_allowed" id="0x7f120bcd" />
+    <public type="string" name="new_mentions" id="0x7f120bce" />
+    <public type="string" name="new_messages" id="0x7f120bcf" />
+    <public type="string" name="new_messages_divider" id="0x7f120bd0" />
+    <public type="string" name="new_messages_estimated" id="0x7f120bd1" />
+    <public type="string" name="new_messages_estimated_with_date" id="0x7f120bd2" />
+    <public type="string" name="new_messages_with_date" id="0x7f120bd3" />
+    <public type="string" name="new_override" id="0x7f120bd4" />
+    <public type="string" name="new_permission" id="0x7f120bd5" />
+    <public type="string" name="new_terms_ack" id="0x7f120bd6" />
+    <public type="string" name="new_terms_continue" id="0x7f120bd7" />
+    <public type="string" name="new_terms_description" id="0x7f120bd8" />
+    <public type="string" name="new_terms_title" id="0x7f120bd9" />
+    <public type="string" name="new_unreads" id="0x7f120bda" />
+    <public type="string" name="news_channel" id="0x7f120bdb" />
+    <public type="string" name="news_channel_edit_news" id="0x7f120bdc" />
+    <public type="string" name="news_channel_publish" id="0x7f120bdd" />
+    <public type="string" name="news_channel_publish_news" id="0x7f120bde" />
+    <public type="string" name="news_channel_published" id="0x7f120bdf" />
+    <public type="string" name="next" id="0x7f120be0" />
+    <public type="string" name="nickname" id="0x7f120be1" />
+    <public type="string" name="nickname_changed" id="0x7f120be2" />
+    <public type="string" name="nickname_cleared" id="0x7f120be3" />
+    <public type="string" name="nl" id="0x7f120be4" />
+    <public type="string" name="no" id="0x7f120be5" />
+    <public type="string" name="no_afk_channel" id="0x7f120be6" />
+    <public type="string" name="no_authorized_apps" id="0x7f120be7" />
+    <public type="string" name="no_authorized_apps_note" id="0x7f120be8" />
+    <public type="string" name="no_ban_reason" id="0x7f120be9" />
+    <public type="string" name="no_bans" id="0x7f120bea" />
+    <public type="string" name="no_camera_access" id="0x7f120beb" />
+    <public type="string" name="no_category" id="0x7f120bec" />
+    <public type="string" name="no_channel_description" id="0x7f120bed" />
+    <public type="string" name="no_emoji" id="0x7f120bee" />
+    <public type="string" name="no_emoji_body" id="0x7f120bef" />
+    <public type="string" name="no_emoji_search_results" id="0x7f120bf0" />
+    <public type="string" name="no_emoji_title" id="0x7f120bf1" />
+    <public type="string" name="no_gif_favorites_flavor_favorite_please" id="0x7f120bf2" />
+    <public type="string" name="no_gif_favorites_flavor_still_here" id="0x7f120bf3" />
+    <public type="string" name="no_gif_favorites_go_favorite" id="0x7f120bf4" />
+    <public type="string" name="no_gif_favorites_how_to_favorite" id="0x7f120bf5" />
+    <public type="string" name="no_gif_favorites_where_to_favorite" id="0x7f120bf6" />
+    <public type="string" name="no_gif_search_results" id="0x7f120bf7" />
+    <public type="string" name="no_input_devices" id="0x7f120bf8" />
+    <public type="string" name="no_input_devices_detected" id="0x7f120bf9" />
+    <public type="string" name="no_instant_invite" id="0x7f120bfa" />
+    <public type="string" name="no_integrations" id="0x7f120bfb" />
+    <public type="string" name="no_integrations_body" id="0x7f120bfc" />
+    <public type="string" name="no_integrations_label" id="0x7f120bfd" />
+    <public type="string" name="no_invites_body" id="0x7f120bfe" />
+    <public type="string" name="no_invites_caption" id="0x7f120bff" />
+    <public type="string" name="no_invites_label" id="0x7f120c00" />
+    <public type="string" name="no_mail_account_description" id="0x7f120c01" />
+    <public type="string" name="no_mail_account_title" id="0x7f120c02" />
+    <public type="string" name="no_mic_body" id="0x7f120c03" />
+    <public type="string" name="no_mic_title" id="0x7f120c04" />
+    <public type="string" name="no_mutual_friends" id="0x7f120c05" />
+    <public type="string" name="no_mutual_guilds" id="0x7f120c06" />
+    <public type="string" name="no_output_devices" id="0x7f120c07" />
+    <public type="string" name="no_photo_in_camera_roll" id="0x7f120c08" />
+    <public type="string" name="no_photos_access" id="0x7f120c09" />
+    <public type="string" name="no_pins_in_channel" id="0x7f120c0a" />
+    <public type="string" name="no_pins_in_dm" id="0x7f120c0b" />
+    <public type="string" name="no_private_channels_description" id="0x7f120c0c" />
+    <public type="string" name="no_private_channels_title" id="0x7f120c0d" />
+    <public type="string" name="no_reactions_body" id="0x7f120c0e" />
+    <public type="string" name="no_reactions_header" id="0x7f120c0f" />
+    <public type="string" name="no_recent_mentions" id="0x7f120c10" />
+    <public type="string" name="no_send_messages_permission_placeholder" id="0x7f120c11" />
+    <public type="string" name="no_system_channel" id="0x7f120c12" />
+    <public type="string" name="no_text" id="0x7f120c13" />
+    <public type="string" name="no_thanks" id="0x7f120c14" />
+    <public type="string" name="no_user_limit" id="0x7f120c15" />
+    <public type="string" name="no_video_devices" id="0x7f120c16" />
+    <public type="string" name="noise_cancellation" id="0x7f120c17" />
+    <public type="string" name="noise_reduction_none" id="0x7f120c18" />
+    <public type="string" name="noise_suppression" id="0x7f120c19" />
+    <public type="string" name="none" id="0x7f120c1a" />
+    <public type="string" name="not_available" id="0x7f120c1b" />
+    <public type="string" name="not_enough_guild_members" id="0x7f120c1c" />
+    <public type="string" name="not_in_the_call" id="0x7f120c1d" />
+    <public type="string" name="not_in_the_voice_channel" id="0x7f120c1e" />
+    <public type="string" name="note" id="0x7f120c1f" />
+    <public type="string" name="note_placeholder" id="0x7f120c20" />
+    <public type="string" name="note_placeholder_mobile" id="0x7f120c21" />
+    <public type="string" name="notice_application_test_mode" id="0x7f120c22" />
+    <public type="string" name="notice_application_test_mode_go_to_listing" id="0x7f120c23" />
+    <public type="string" name="notice_connect_spotify" id="0x7f120c24" />
+    <public type="string" name="notice_connection_conflict" id="0x7f120c25" />
+    <public type="string" name="notice_corrupt_installation" id="0x7f120c26" />
+    <public type="string" name="notice_corrupt_installation_help_link_text" id="0x7f120c27" />
+    <public type="string" name="notice_detected_off_platform_no_premium_perk_message" id="0x7f120c28" />
+    <public type="string" name="notice_detected_off_platform_premium_perk_button" id="0x7f120c29" />
+    <public type="string" name="notice_detected_off_platform_premium_perk_message" id="0x7f120c2a" />
+    <public type="string" name="notice_dispatch_api_error" id="0x7f120c2b" />
+    <public type="string" name="notice_dispatch_application_lock_failed" id="0x7f120c2c" />
+    <public type="string" name="notice_dispatch_error" id="0x7f120c2d" />
+    <public type="string" name="notice_dispatch_error_disk_full" id="0x7f120c2e" />
+    <public type="string" name="notice_dispatch_error_disk_low" id="0x7f120c2f" />
+    <public type="string" name="notice_dispatch_error_file_name_too_long" id="0x7f120c30" />
+    <public type="string" name="notice_dispatch_error_invalid_drive" id="0x7f120c31" />
+    <public type="string" name="notice_dispatch_error_io_permission_denied" id="0x7f120c32" />
+    <public type="string" name="notice_dispatch_error_no_manifests" id="0x7f120c33" />
+    <public type="string" name="notice_dispatch_error_not_entitled" id="0x7f120c34" />
+    <public type="string" name="notice_dispatch_error_post_install_cancelled" id="0x7f120c35" />
+    <public type="string" name="notice_dispatch_error_post_install_failed" id="0x7f120c36" />
+    <public type="string" name="notice_dispatch_error_unwritable" id="0x7f120c37" />
+    <public type="string" name="notice_dispatch_error_with_code" id="0x7f120c38" />
+    <public type="string" name="notice_dispatch_install_script_progress" id="0x7f120c39" />
+    <public type="string" name="notice_dispatch_install_script_progress_with_name" id="0x7f120c3a" />
+    <public type="string" name="notice_hardware_mute" id="0x7f120c3b" />
+    <public type="string" name="notice_mfa_sms_backup" id="0x7f120c3c" />
+    <public type="string" name="notice_mfa_sms_backup_button" id="0x7f120c3d" />
+    <public type="string" name="notice_native_apps" id="0x7f120c3e" />
+    <public type="string" name="notice_no_input_detected" id="0x7f120c3f" />
+    <public type="string" name="notice_no_input_detected_help_link_text" id="0x7f120c40" />
+    <public type="string" name="notice_no_input_detected_settings" id="0x7f120c41" />
+    <public type="string" name="notice_no_input_detected_settings_link_text" id="0x7f120c42" />
+    <public type="string" name="notice_premium_applications_ending" id="0x7f120c43" />
+    <public type="string" name="notice_premium_grandfathered_ended" id="0x7f120c44" />
+    <public type="string" name="notice_premium_grandfathered_ending" id="0x7f120c45" />
+    <public type="string" name="notice_premium_promo_action" id="0x7f120c46" />
+    <public type="string" name="notice_premium_promo_message" id="0x7f120c47" />
+    <public type="string" name="notice_scheduled_maintenance" id="0x7f120c48" />
+    <public type="string" name="notice_spotify_auto_paused" id="0x7f120c49" />
+    <public type="string" name="notice_streamer_mode_text" id="0x7f120c4a" />
+    <public type="string" name="notice_survey_body" id="0x7f120c4b" />
+    <public type="string" name="notice_survey_button" id="0x7f120c4c" />
+    <public type="string" name="notice_survey_prompt" id="0x7f120c4d" />
+    <public type="string" name="notice_unclaimed_account" id="0x7f120c4e" />
+    <public type="string" name="notice_unverified_account" id="0x7f120c4f" />
+    <public type="string" name="notice_video_unsupported_browser" id="0x7f120c50" />
+    <public type="string" name="notice_whats_this" id="0x7f120c51" />
+    <public type="string" name="notification_accepted_friend_request" id="0x7f120c52" />
+    <public type="string" name="notification_body_attachment" id="0x7f120c53" />
+    <public type="string" name="notification_body_start_game" id="0x7f120c54" />
+    <public type="string" name="notification_dismiss" id="0x7f120c55" />
+    <public type="string" name="notification_message_create_dm_activity_join" id="0x7f120c56" />
+    <public type="string" name="notification_message_create_dm_activity_listen" id="0x7f120c57" />
+    <public type="string" name="notification_message_create_dm_activity_spectate" id="0x7f120c58" />
+    <public type="string" name="notification_message_create_group_dm_activity_join" id="0x7f120c59" />
+    <public type="string" name="notification_message_create_group_dm_activity_listen" id="0x7f120c5a" />
+    <public type="string" name="notification_message_create_group_dm_activity_spectate" id="0x7f120c5b" />
+    <public type="string" name="notification_message_create_guild_activity_join" id="0x7f120c5c" />
+    <public type="string" name="notification_message_create_guild_activity_listen" id="0x7f120c5d" />
+    <public type="string" name="notification_message_create_guild_activity_spectate" id="0x7f120c5e" />
+    <public type="string" name="notification_overrides" id="0x7f120c5f" />
+    <public type="string" name="notification_pending_friend_request" id="0x7f120c60" />
+    <public type="string" name="notification_reply" id="0x7f120c61" />
+    <public type="string" name="notification_reply_failed" id="0x7f120c62" />
+    <public type="string" name="notification_reply_success" id="0x7f120c63" />
+    <public type="string" name="notification_settings" id="0x7f120c64" />
+    <public type="string" name="notification_title_discord" id="0x7f120c65" />
+    <public type="string" name="notification_title_start_game" id="0x7f120c66" />
+    <public type="string" name="notification_voice_status_body" id="0x7f120c67" />
+    <public type="string" name="notification_voice_status_body_no_status" id="0x7f120c68" />
+    <public type="string" name="notification_voice_status_title" id="0x7f120c69" />
+    <public type="string" name="notifications" id="0x7f120c6a" />
+    <public type="string" name="notifications_nuf_body" id="0x7f120c6b" />
+    <public type="string" name="notifications_nuf_cta" id="0x7f120c6c" />
+    <public type="string" name="notifications_nuf_title" id="0x7f120c6d" />
+    <public type="string" name="nsfw_accept" id="0x7f120c6e" />
+    <public type="string" name="nsfw_decline" id="0x7f120c6f" />
+    <public type="string" name="nsfw_description" id="0x7f120c70" />
+    <public type="string" name="nsfw_note" id="0x7f120c71" />
+    <public type="string" name="nsfw_title" id="0x7f120c72" />
+    <public type="string" name="nuf_body" id="0x7f120c73" />
+    <public type="string" name="nuf_body_mobile" id="0x7f120c74" />
+    <public type="string" name="nuf_claim_account_body_1" id="0x7f120c75" />
+    <public type="string" name="nuf_claim_account_body_2" id="0x7f120c76" />
+    <public type="string" name="nuf_claim_account_button" id="0x7f120c77" />
+    <public type="string" name="nuf_claim_account_generic_error" id="0x7f120c78" />
+    <public type="string" name="nuf_claim_account_title" id="0x7f120c79" />
+    <public type="string" name="nuf_create_server_body" id="0x7f120c7a" />
+    <public type="string" name="nuf_create_server_button" id="0x7f120c7b" />
+    <public type="string" name="nuf_create_server_error" id="0x7f120c7c" />
+    <public type="string" name="nuf_create_server_note" id="0x7f120c7d" />
+    <public type="string" name="nuf_create_server_title" id="0x7f120c7e" />
+    <public type="string" name="nuf_download_app_body" id="0x7f120c7f" />
+    <public type="string" name="nuf_download_app_button_platform" id="0x7f120c80" />
+    <public type="string" name="nuf_download_app_button_type" id="0x7f120c81" />
+    <public type="string" name="nuf_download_app_intro" id="0x7f120c82" />
+    <public type="string" name="nuf_download_app_title" id="0x7f120c83" />
+    <public type="string" name="nuf_join_server_body_1" id="0x7f120c84" />
+    <public type="string" name="nuf_join_server_body_2" id="0x7f120c85" />
+    <public type="string" name="nuf_join_server_button" id="0x7f120c86" />
+    <public type="string" name="nuf_join_server_input_label" id="0x7f120c87" />
+    <public type="string" name="nuf_join_server_input_note" id="0x7f120c88" />
+    <public type="string" name="nuf_join_server_title_1" id="0x7f120c89" />
+    <public type="string" name="nuf_join_server_title_2" id="0x7f120c8a" />
+    <public type="string" name="nuf_title" id="0x7f120c8b" />
+    <public type="string" name="nuf_title_mobile" id="0x7f120c8c" />
+    <public type="string" name="nuf_welcome_carousel_1_body_mobile" id="0x7f120c8d" />
+    <public type="string" name="nuf_welcome_carousel_1_title_mobile" id="0x7f120c8e" />
+    <public type="string" name="nuf_welcome_carousel_2_body_mobile" id="0x7f120c8f" />
+    <public type="string" name="nuf_welcome_carousel_2_title_mobile" id="0x7f120c90" />
+    <public type="string" name="nuf_welcome_carousel_3_body_mobile" id="0x7f120c91" />
+    <public type="string" name="nuf_welcome_carousel_3_title_mobile" id="0x7f120c92" />
+    <public type="string" name="nuf_welcome_carousel_4_body_mobile" id="0x7f120c93" />
+    <public type="string" name="nuf_welcome_carousel_4_title_mobile" id="0x7f120c94" />
+    <public type="string" name="nuf_welcome_carousel_5_body_mobile" id="0x7f120c95" />
+    <public type="string" name="nuf_welcome_carousel_5_title_mobile" id="0x7f120c96" />
+    <public type="string" name="num_channels" id="0x7f120c97" />
+    <public type="string" name="num_members" id="0x7f120c98" />
+    <public type="string" name="num_subscribers" id="0x7f120c99" />
+    <public type="string" name="num_users" id="0x7f120c9a" />
+    <public type="string" name="nux_overlay_description" id="0x7f120c9b" />
+    <public type="string" name="nux_overlay_enable" id="0x7f120c9c" />
+    <public type="string" name="nux_overlay_title" id="0x7f120c9d" />
+    <public type="string" name="nux_post_reg_join_server_description" id="0x7f120c9e" />
+    <public type="string" name="nux_post_reg_join_server_skip" id="0x7f120c9f" />
+    <public type="string" name="nux_post_reg_join_server_title" id="0x7f120ca0" />
+    <public type="string" name="nux_samsung_game_presence_link_description" id="0x7f120ca1" />
+    <public type="string" name="nux_samsung_game_presence_link_enable" id="0x7f120ca2" />
+    <public type="string" name="nux_samsung_game_presence_link_title" id="0x7f120ca3" />
+    <public type="string" name="oauth2_authorize_error" id="0x7f120ca4" />
+    <public type="string" name="oauth2_connect_to_discord" id="0x7f120ca5" />
+    <public type="string" name="oauth2_insecure_notice" id="0x7f120ca6" />
+    <public type="string" name="oauth2_insecure_read_notice" id="0x7f120ca7" />
+    <public type="string" name="oauth2_label" id="0x7f120ca8" />
+    <public type="string" name="oauth2_message_cta" id="0x7f120ca9" />
+    <public type="string" name="oauth2_message_unknown_error" id="0x7f120caa" />
+    <public type="string" name="oauth2_request_invalid_scope" id="0x7f120cab" />
+    <public type="string" name="oauth2_request_missing_param" id="0x7f120cac" />
+    <public type="string" name="oauth2_secure_notice" id="0x7f120cad" />
+    <public type="string" name="oauth2_security_notice" id="0x7f120cae" />
+    <public type="string" name="oauth2_title" id="0x7f120caf" />
+    <public type="string" name="okay" id="0x7f120cb0" />
+    <public type="string" name="one_user_typing" id="0x7f120cb1" />
+    <public type="string" name="ongoing_call" id="0x7f120cb2" />
+    <public type="string" name="ongoing_call_connected_users" id="0x7f120cb3" />
+    <public type="string" name="ongoing_call_voice_quality_low" id="0x7f120cb4" />
+    <public type="string" name="ongoing_call_you_are_all_alone" id="0x7f120cb5" />
+    <public type="string" name="only_you_can_see_and_delete_these" id="0x7f120cb6" />
+    <public type="string" name="open" id="0x7f120cb7" />
+    <public type="string" name="open_app" id="0x7f120cb8" />
+    <public type="string" name="open_in_browser" id="0x7f120cb9" />
+    <public type="string" name="open_in_theater" id="0x7f120cba" />
+    <public type="string" name="open_link" id="0x7f120cbb" />
+    <public type="string" name="open_original_image" id="0x7f120cbc" />
+    <public type="string" name="options" id="0x7f120cbd" />
+    <public type="string" name="orange" id="0x7f120cbe" />
+    <public type="string" name="other_options" id="0x7f120cbf" />
+    <public type="string" name="other_reactions" id="0x7f120cc0" />
+    <public type="string" name="others_online" id="0x7f120cc1" />
+    <public type="string" name="out_of_date_action" id="0x7f120cc2" />
+    <public type="string" name="out_of_date_description" id="0x7f120cc3" />
+    <public type="string" name="out_of_date_title" id="0x7f120cc4" />
+    <public type="string" name="outgoing_friend_request" id="0x7f120cc5" />
+    <public type="string" name="outgoing_friend_request_delete_msg" id="0x7f120cc6" />
+    <public type="string" name="overlay" id="0x7f120cc7" />
+    <public type="string" name="overlay_channel_chat_hotkey" id="0x7f120cc8" />
+    <public type="string" name="overlay_click_to_jump_to_channel" id="0x7f120cc9" />
+    <public type="string" name="overlay_click_to_unlock" id="0x7f120cca" />
+    <public type="string" name="overlay_crashed_title" id="0x7f120ccb" />
+    <public type="string" name="overlay_explanation" id="0x7f120ccc" />
+    <public type="string" name="overlay_friend_calling" id="0x7f120ccd" />
+    <public type="string" name="overlay_in_game_preview_header" id="0x7f120cce" />
+    <public type="string" name="overlay_launch_open_tip" id="0x7f120ccf" />
+    <public type="string" name="overlay_launch_title" id="0x7f120cd0" />
+    <public type="string" name="overlay_link_alert_body" id="0x7f120cd1" />
+    <public type="string" name="overlay_link_alert_secondary" id="0x7f120cd2" />
+    <public type="string" name="overlay_link_alert_title" id="0x7f120cd3" />
+    <public type="string" name="overlay_menu_get_invite" id="0x7f120cd4" />
+    <public type="string" name="overlay_menu_open_discord" id="0x7f120cd5" />
+    <public type="string" name="overlay_menu_switch_channels" id="0x7f120cd6" />
+    <public type="string" name="overlay_mobile_required" id="0x7f120cd7" />
+    <public type="string" name="overlay_mobile_toggle_desc" id="0x7f120cd8" />
+    <public type="string" name="overlay_mobile_toggle_label" id="0x7f120cd9" />
+    <public type="string" name="overlay_mobile_unauthed" id="0x7f120cda" />
+    <public type="string" name="overlay_news_go_live_body" id="0x7f120cdb" />
+    <public type="string" name="overlay_news_go_live_cta" id="0x7f120cdc" />
+    <public type="string" name="overlay_news_text_pinning_body" id="0x7f120cdd" />
+    <public type="string" name="overlay_news_text_pinning_tip" id="0x7f120cde" />
+    <public type="string" name="overlay_news_text_pinning_title" id="0x7f120cdf" />
+    <public type="string" name="overlay_no_results" id="0x7f120ce0" />
+    <public type="string" name="overlay_notification_incoming_call" id="0x7f120ce1" />
+    <public type="string" name="overlay_notification_settings_disabled" id="0x7f120ce2" />
+    <public type="string" name="overlay_notification_settings_position" id="0x7f120ce3" />
+    <public type="string" name="overlay_notifications_bottom_left" id="0x7f120ce4" />
+    <public type="string" name="overlay_notifications_bottom_right" id="0x7f120ce5" />
+    <public type="string" name="overlay_notifications_disabled" id="0x7f120ce6" />
+    <public type="string" name="overlay_notifications_settings" id="0x7f120ce7" />
+    <public type="string" name="overlay_notifications_top_left" id="0x7f120ce8" />
+    <public type="string" name="overlay_notifications_top_right" id="0x7f120ce9" />
+    <public type="string" name="overlay_pin_label_tutorial" id="0x7f120cea" />
+    <public type="string" name="overlay_reload" id="0x7f120ceb" />
+    <public type="string" name="overlay_reset_default_layout" id="0x7f120cec" />
+    <public type="string" name="overlay_settings" id="0x7f120ced" />
+    <public type="string" name="overlay_settings_general_tab" id="0x7f120cee" />
+    <public type="string" name="overlay_settings_title" id="0x7f120cef" />
+    <public type="string" name="overlay_settings_voice_tab" id="0x7f120cf0" />
+    <public type="string" name="overlay_text_notification_tip" id="0x7f120cf1" />
+    <public type="string" name="overlay_text_notification_tip_unlocked" id="0x7f120cf2" />
+    <public type="string" name="overlay_too_small" id="0x7f120cf3" />
+    <public type="string" name="overlay_unlock_to_answer" id="0x7f120cf4" />
+    <public type="string" name="overlay_unlock_to_join" id="0x7f120cf5" />
+    <public type="string" name="overlay_user_chat_hotkey" id="0x7f120cf6" />
+    <public type="string" name="overlay_voice_channels_empty_state" id="0x7f120cf7" />
+    <public type="string" name="overlay_widget_hide_in_game" id="0x7f120cf8" />
+    <public type="string" name="overlay_widget_show_in_game" id="0x7f120cf9" />
+    <public type="string" name="overview" id="0x7f120cfa" />
+    <public type="string" name="overwrite_autocomplete_label" id="0x7f120cfb" />
+    <public type="string" name="overwrite_autocomplete_placeholder" id="0x7f120cfc" />
+    <public type="string" name="overwrite_no_role_to_add" id="0x7f120cfd" />
+    <public type="string" name="pagination_next" id="0x7f120cfe" />
+    <public type="string" name="pagination_page_label" id="0x7f120cff" />
+    <public type="string" name="pagination_page_of" id="0x7f120d00" />
+    <public type="string" name="pagination_previous" id="0x7f120d01" />
+    <public type="string" name="paginator_of_pages" id="0x7f120d02" />
+    <public type="string" name="partial_outage" id="0x7f120d03" />
+    <public type="string" name="partial_outage_a11y" id="0x7f120d04" />
+    <public type="string" name="participators" id="0x7f120d05" />
+    <public type="string" name="participators_compared_to_communicators" id="0x7f120d06" />
+    <public type="string" name="partner_badge_tooltip" id="0x7f120d07" />
+    <public type="string" name="party_full" id="0x7f120d08" />
+    <public type="string" name="party_join" id="0x7f120d09" />
+    <public type="string" name="party_joined" id="0x7f120d0a" />
+    <public type="string" name="party_locked" id="0x7f120d0b" />
+    <public type="string" name="password_length_error" id="0x7f120d0c" />
+    <public type="string" name="password_manager" id="0x7f120d0d" />
+    <public type="string" name="password_manager_info_android" id="0x7f120d0e" />
+    <public type="string" name="password_manager_open_settings" id="0x7f120d0f" />
+    <public type="string" name="password_manager_open_settings_error" id="0x7f120d10" />
+    <public type="string" name="password_manager_use" id="0x7f120d11" />
+    <public type="string" name="password_required" id="0x7f120d12" />
+    <public type="string" name="password_toggle_content_description" id="0x7f120d13" />
+    <public type="string" name="paste" id="0x7f120d14" />
+    <public type="string" name="paste_and_send" id="0x7f120d15" />
+    <public type="string" name="path_password_eye" id="0x7f120d16" />
+    <public type="string" name="path_password_eye_mask_strike_through" id="0x7f120d17" />
+    <public type="string" name="path_password_eye_mask_visible" id="0x7f120d18" />
+    <public type="string" name="path_password_strike_through" id="0x7f120d19" />
+    <public type="string" name="pause" id="0x7f120d1a" />
+    <public type="string" name="payment_authentication_modal_button" id="0x7f120d1b" />
+    <public type="string" name="payment_authentication_modal_button_cancel_payment" id="0x7f120d1c" />
+    <public type="string" name="payment_authentication_modal_canceled" id="0x7f120d1d" />
+    <public type="string" name="payment_authentication_modal_fail" id="0x7f120d1e" />
+    <public type="string" name="payment_authentication_modal_start" id="0x7f120d1f" />
+    <public type="string" name="payment_authentication_modal_success" id="0x7f120d20" />
+    <public type="string" name="payment_authentication_modal_title" id="0x7f120d21" />
+    <public type="string" name="payment_authentication_modal_title_canceled" id="0x7f120d22" />
+    <public type="string" name="payment_authentication_modal_title_fail" id="0x7f120d23" />
+    <public type="string" name="payment_authentication_modal_title_success" id="0x7f120d24" />
+    <public type="string" name="payment_modal_button_change_card" id="0x7f120d25" />
+    <public type="string" name="payment_modal_button_change_paypal" id="0x7f120d26" />
+    <public type="string" name="payment_modal_button_premium" id="0x7f120d27" />
+    <public type="string" name="payment_modal_button_premium_gift" id="0x7f120d28" />
+    <public type="string" name="payment_modal_one_month" id="0x7f120d29" />
+    <public type="string" name="payment_modal_one_year" id="0x7f120d2a" />
+    <public type="string" name="payment_modal_per_month" id="0x7f120d2b" />
+    <public type="string" name="payment_modal_per_year" id="0x7f120d2c" />
+    <public type="string" name="payment_modal_subtitle" id="0x7f120d2d" />
+    <public type="string" name="payment_modal_title_change_card" id="0x7f120d2e" />
+    <public type="string" name="payment_modal_title_change_paypal" id="0x7f120d2f" />
+    <public type="string" name="payment_modal_title_new_monthly" id="0x7f120d30" />
+    <public type="string" name="payment_modal_title_new_yearly" id="0x7f120d31" />
+    <public type="string" name="payment_price_change_body" id="0x7f120d32" />
+    <public type="string" name="payment_price_change_title" id="0x7f120d33" />
+    <public type="string" name="payment_source_billing_address" id="0x7f120d34" />
+    <public type="string" name="payment_source_card_ending" id="0x7f120d35" />
+    <public type="string" name="payment_source_card_ending_in" id="0x7f120d36" />
+    <public type="string" name="payment_source_card_expires" id="0x7f120d37" />
+    <public type="string" name="payment_source_card_number" id="0x7f120d38" />
+    <public type="string" name="payment_source_confirm_paypal_details" id="0x7f120d39" />
+    <public type="string" name="payment_source_credit_card" id="0x7f120d3a" />
+    <public type="string" name="payment_source_delete" id="0x7f120d3b" />
+    <public type="string" name="payment_source_delete_disabled_tooltip" id="0x7f120d3c" />
+    <public type="string" name="payment_source_deleted" id="0x7f120d3d" />
+    <public type="string" name="payment_source_edit_help_card" id="0x7f120d3e" />
+    <public type="string" name="payment_source_edit_help_paypal" id="0x7f120d3f" />
+    <public type="string" name="payment_source_edit_saved" id="0x7f120d40" />
+    <public type="string" name="payment_source_edit_select_state" id="0x7f120d41" />
+    <public type="string" name="payment_source_edit_title" id="0x7f120d42" />
+    <public type="string" name="payment_source_expiration_date" id="0x7f120d43" />
+    <public type="string" name="payment_source_expiration_date_placeholder" id="0x7f120d44" />
+    <public type="string" name="payment_source_information" id="0x7f120d45" />
+    <public type="string" name="payment_source_invalid" id="0x7f120d46" />
+    <public type="string" name="payment_source_invalid_help" id="0x7f120d47" />
+    <public type="string" name="payment_source_make_default" id="0x7f120d48" />
+    <public type="string" name="payment_source_name" id="0x7f120d49" />
+    <public type="string" name="payment_source_name_error_required" id="0x7f120d4a" />
+    <public type="string" name="payment_source_name_placeholder" id="0x7f120d4b" />
+    <public type="string" name="payment_source_payment_request_button_generic" id="0x7f120d4c" />
+    <public type="string" name="payment_source_payment_request_button_gpay" id="0x7f120d4d" />
+    <public type="string" name="payment_source_payment_request_info_creating" id="0x7f120d4e" />
+    <public type="string" name="payment_source_payment_request_info_loading" id="0x7f120d4f" />
+    <public type="string" name="payment_source_payment_request_info_title" id="0x7f120d50" />
+    <public type="string" name="payment_source_payment_request_label" id="0x7f120d51" />
+    <public type="string" name="payment_source_payment_request_unsupported" id="0x7f120d52" />
+    <public type="string" name="payment_source_paypal" id="0x7f120d53" />
+    <public type="string" name="payment_source_paypal_account" id="0x7f120d54" />
+    <public type="string" name="payment_source_paypal_details" id="0x7f120d55" />
+    <public type="string" name="payment_source_paypal_loading" id="0x7f120d56" />
+    <public type="string" name="payment_source_paypal_reopen" id="0x7f120d57" />
+    <public type="string" name="payment_source_security_code" id="0x7f120d58" />
+    <public type="string" name="payment_source_title" id="0x7f120d59" />
+    <public type="string" name="payment_source_type" id="0x7f120d5a" />
+    <public type="string" name="payment_source_type_select" id="0x7f120d5b" />
+    <public type="string" name="payment_sources_add" id="0x7f120d5c" />
+    <public type="string" name="payment_steps_go_back" id="0x7f120d5d" />
+    <public type="string" name="payment_waiting_for_authentication" id="0x7f120d5e" />
+    <public type="string" name="paypal_account_verifying" id="0x7f120d5f" />
+    <public type="string" name="paypal_callback_error" id="0x7f120d60" />
+    <public type="string" name="paypal_callback_success" id="0x7f120d61" />
+    <public type="string" name="pending" id="0x7f120d62" />
+    <public type="string" name="percentage_since_last_week" id="0x7f120d63" />
+    <public type="string" name="permission_camera_access_denied" id="0x7f120d64" />
+    <public type="string" name="permission_helpdesk" id="0x7f120d65" />
+    <public type="string" name="permission_media_denied" id="0x7f120d66" />
+    <public type="string" name="permission_media_download_denied" id="0x7f120d67" />
+    <public type="string" name="permission_microphone_denied" id="0x7f120d68" />
+    <public type="string" name="permission_override_allow" id="0x7f120d69" />
+    <public type="string" name="permission_override_deny" id="0x7f120d6a" />
+    <public type="string" name="permission_override_passthrough" id="0x7f120d6b" />
+    <public type="string" name="permission_overrides" id="0x7f120d6c" />
+    <public type="string" name="permissions" id="0x7f120d6d" />
+    <public type="string" name="permissions_unsynced" id="0x7f120d6e" />
+    <public type="string" name="permit_usage_android" id="0x7f120d6f" />
+    <public type="string" name="personalization_disable_modal_body" id="0x7f120d70" />
+    <public type="string" name="personalization_disable_modal_cancel" id="0x7f120d71" />
+    <public type="string" name="personalization_disable_modal_confirm" id="0x7f120d72" />
+    <public type="string" name="personalization_disable_modal_title" id="0x7f120d73" />
+    <public type="string" name="phone" id="0x7f120d74" />
+    <public type="string" name="pick_a_color" id="0x7f120d75" />
+    <public type="string" name="pin" id="0x7f120d76" />
+    <public type="string" name="pin_confirm" id="0x7f120d77" />
+    <public type="string" name="pin_message" id="0x7f120d78" />
+    <public type="string" name="pin_message_body" id="0x7f120d79" />
+    <public type="string" name="pin_message_body_mobile" id="0x7f120d7a" />
+    <public type="string" name="pin_message_body_private_channel" id="0x7f120d7b" />
+    <public type="string" name="pin_message_title" id="0x7f120d7c" />
+    <public type="string" name="pin_message_too_many_body" id="0x7f120d7d" />
+    <public type="string" name="pin_message_too_many_body_private_channel" id="0x7f120d7e" />
+    <public type="string" name="pin_message_too_many_title" id="0x7f120d7f" />
+    <public type="string" name="pinned_messages" id="0x7f120d80" />
+    <public type="string" name="pinned_messages_pro_tip" id="0x7f120d81" />
+    <public type="string" name="pinned_messages_pro_tip_body_channel" id="0x7f120d82" />
+    <public type="string" name="pinned_messages_pro_tip_body_dm" id="0x7f120d83" />
+    <public type="string" name="pinned_messages_pro_tip_body_group_dm" id="0x7f120d84" />
+    <public type="string" name="pins_disabled_nsfw" id="0x7f120d85" />
+    <public type="string" name="pl" id="0x7f120d86" />
+    <public type="string" name="platform_android" id="0x7f120d87" />
+    <public type="string" name="platform_android_version" id="0x7f120d88" />
+    <public type="string" name="platform_ios" id="0x7f120d89" />
+    <public type="string" name="platform_ios_version" id="0x7f120d8a" />
+    <public type="string" name="platform_linux" id="0x7f120d8b" />
+    <public type="string" name="platform_macos" id="0x7f120d8c" />
+    <public type="string" name="platform_windows" id="0x7f120d8d" />
+    <public type="string" name="play" id="0x7f120d8e" />
+    <public type="string" name="play_full_video" id="0x7f120d8f" />
+    <public type="string" name="play_stream" id="0x7f120d90" />
+    <public type="string" name="playing_game" id="0x7f120d91" />
+    <public type="string" name="popout_player" id="0x7f120d92" />
+    <public type="string" name="popout_player_opened" id="0x7f120d93" />
+    <public type="string" name="popout_remove_from_top" id="0x7f120d94" />
+    <public type="string" name="popout_return" id="0x7f120d95" />
+    <public type="string" name="popout_stay_on_top" id="0x7f120d96" />
+    <public type="string" name="post_code" id="0x7f120d97" />
+    <public type="string" name="premium" id="0x7f120d98" />
+    <public type="string" name="premium_activated" id="0x7f120d99" />
+    <public type="string" name="premium_alert_error_title" id="0x7f120d9a" />
+    <public type="string" name="premium_badge_tooltip" id="0x7f120d9b" />
+    <public type="string" name="premium_cancel_cancel" id="0x7f120d9c" />
+    <public type="string" name="premium_cancel_cancel_mobile" id="0x7f120d9d" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1" id="0x7f120d9e" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_1" id="0x7f120d9f" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_2" id="0x7f120da0" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2" id="0x7f120da1" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_1" id="0x7f120da2" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_2" id="0x7f120da3" />
+    <public type="string" name="premium_cancel_confirm_mobile" id="0x7f120da4" />
+    <public type="string" name="premium_cancel_confirm_new" id="0x7f120da5" />
+    <public type="string" name="premium_cancel_confirm_title" id="0x7f120da6" />
+    <public type="string" name="premium_cancel_failed_body" id="0x7f120da7" />
+    <public type="string" name="premium_canceled" id="0x7f120da8" />
+    <public type="string" name="premium_cant_upgrade_confirm" id="0x7f120da9" />
+    <public type="string" name="premium_change_discriminator_length_error" id="0x7f120daa" />
+    <public type="string" name="premium_change_discriminator_modal_body" id="0x7f120dab" />
+    <public type="string" name="premium_change_discriminator_modal_confirm" id="0x7f120dac" />
+    <public type="string" name="premium_change_discriminator_modal_header" id="0x7f120dad" />
+    <public type="string" name="premium_change_discriminator_tooltip" id="0x7f120dae" />
+    <public type="string" name="premium_change_discriminator_zero_error" id="0x7f120daf" />
+    <public type="string" name="premium_chat_perks_animated_avatar_and_emoji_mobile" id="0x7f120db0" />
+    <public type="string" name="premium_chat_perks_custom_emoji_mobile" id="0x7f120db1" />
+    <public type="string" name="premium_chat_perks_description_animated_avatar_and_emoji" id="0x7f120db2" />
+    <public type="string" name="premium_chat_perks_description_badge" id="0x7f120db3" />
+    <public type="string" name="premium_chat_perks_description_custom_emoji" id="0x7f120db4" />
+    <public type="string" name="premium_chat_perks_description_discriminator" id="0x7f120db5" />
+    <public type="string" name="premium_chat_perks_description_screenshare" id="0x7f120db6" />
+    <public type="string" name="premium_chat_perks_description_streaming" id="0x7f120db7" />
+    <public type="string" name="premium_chat_perks_description_upload_limit" id="0x7f120db8" />
+    <public type="string" name="premium_chat_perks_discriminator_mobile" id="0x7f120db9" />
+    <public type="string" name="premium_chat_perks_premium_guild_subscription" id="0x7f120dba" />
+    <public type="string" name="premium_chat_perks_rep_mobile" id="0x7f120dbb" />
+    <public type="string" name="premium_chat_perks_screenshare_mobile" id="0x7f120dbc" />
+    <public type="string" name="premium_chat_perks_simple_title" id="0x7f120dbd" />
+    <public type="string" name="premium_chat_perks_streaming_mobile" id="0x7f120dbe" />
+    <public type="string" name="premium_chat_perks_title_animated_avatar_and_emoji" id="0x7f120dbf" />
+    <public type="string" name="premium_chat_perks_title_badge" id="0x7f120dc0" />
+    <public type="string" name="premium_chat_perks_title_custom_emoji" id="0x7f120dc1" />
+    <public type="string" name="premium_chat_perks_title_discriminator" id="0x7f120dc2" />
+    <public type="string" name="premium_chat_perks_title_screenshare" id="0x7f120dc3" />
+    <public type="string" name="premium_chat_perks_title_streaming" id="0x7f120dc4" />
+    <public type="string" name="premium_chat_perks_title_upload_limit" id="0x7f120dc5" />
+    <public type="string" name="premium_classic_payment_gift_blurb_mobile" id="0x7f120dc6" />
+    <public type="string" name="premium_code_active_until" id="0x7f120dc7" />
+    <public type="string" name="premium_code_redemption_confirmation_blurb" id="0x7f120dc8" />
+    <public type="string" name="premium_code_redemption_confirmation_button" id="0x7f120dc9" />
+    <public type="string" name="premium_expiring_body_boosting" id="0x7f120dca" />
+    <public type="string" name="premium_expiring_body_control" id="0x7f120dcb" />
+    <public type="string" name="premium_expiring_body_custom_tag" id="0x7f120dcc" />
+    <public type="string" name="premium_expiring_body_emoji" id="0x7f120dcd" />
+    <public type="string" name="premium_expiring_body_generic" id="0x7f120dce" />
+    <public type="string" name="premium_expiring_callout" id="0x7f120dcf" />
+    <public type="string" name="premium_expiring_go_to_settings" id="0x7f120dd0" />
+    <public type="string" name="premium_expiring_title" id="0x7f120dd1" />
+    <public type="string" name="premium_features_chat_perks" id="0x7f120dd2" />
+    <public type="string" name="premium_features_chat_perks_header" id="0x7f120dd3" />
+    <public type="string" name="premium_features_enhanced_chat_perks" id="0x7f120dd4" />
+    <public type="string" name="premium_features_premium_guild_subscriptions" id="0x7f120dd5" />
+    <public type="string" name="premium_game" id="0x7f120dd6" />
+    <public type="string" name="premium_gift_button_label" id="0x7f120dd7" />
+    <public type="string" name="premium_gift_button_tooltip" id="0x7f120dd8" />
+    <public type="string" name="premium_gift_send" id="0x7f120dd9" />
+    <public type="string" name="premium_gift_share_link_ios" id="0x7f120dda" />
+    <public type="string" name="premium_gifting_title" id="0x7f120ddb" />
+    <public type="string" name="premium_gifting_title_mobile" id="0x7f120ddc" />
+    <public type="string" name="premium_grandfathered_monthly" id="0x7f120ddd" />
+    <public type="string" name="premium_grandfathered_warning" id="0x7f120dde" />
+    <public type="string" name="premium_grandfathered_warning_confirm" id="0x7f120ddf" />
+    <public type="string" name="premium_grandfathered_warning_mobile" id="0x7f120de0" />
+    <public type="string" name="premium_grandfathered_warning_title" id="0x7f120de1" />
+    <public type="string" name="premium_grandfathered_yearly" id="0x7f120de2" />
+    <public type="string" name="premium_guild_cooldown_available_countdown" id="0x7f120de3" />
+    <public type="string" name="premium_guild_features_blurb" id="0x7f120de4" />
+    <public type="string" name="premium_guild_features_customize_guild_description" id="0x7f120de5" />
+    <public type="string" name="premium_guild_features_customize_guild_mobile" id="0x7f120de6" />
+    <public type="string" name="premium_guild_features_customize_guild_title" id="0x7f120de7" />
+    <public type="string" name="premium_guild_features_learn_more_button" id="0x7f120de8" />
+    <public type="string" name="premium_guild_features_learn_more_text" id="0x7f120de9" />
+    <public type="string" name="premium_guild_features_more" id="0x7f120dea" />
+    <public type="string" name="premium_guild_features_new_role_description" id="0x7f120deb" />
+    <public type="string" name="premium_guild_features_new_role_mobile" id="0x7f120dec" />
+    <public type="string" name="premium_guild_features_new_role_title" id="0x7f120ded" />
+    <public type="string" name="premium_guild_features_show_support_description" id="0x7f120dee" />
+    <public type="string" name="premium_guild_features_show_support_mobile" id="0x7f120def" />
+    <public type="string" name="premium_guild_features_show_support_title" id="0x7f120df0" />
+    <public type="string" name="premium_guild_features_title" id="0x7f120df1" />
+    <public type="string" name="premium_guild_features_upload_sizes_description" id="0x7f120df2" />
+    <public type="string" name="premium_guild_features_upload_sizes_mobile" id="0x7f120df3" />
+    <public type="string" name="premium_guild_features_upload_sizes_title" id="0x7f120df4" />
+    <public type="string" name="premium_guild_features_upsell_banner_subscribe" id="0x7f120df5" />
+    <public type="string" name="premium_guild_features_upsell_banner_upgrade" id="0x7f120df6" />
+    <public type="string" name="premium_guild_header_badge_no_subscribers" id="0x7f120df7" />
+    <public type="string" name="premium_guild_header_badge_no_tier" id="0x7f120df8" />
+    <public type="string" name="premium_guild_header_dropdown_nitro_server_subscribe" id="0x7f120df9" />
+    <public type="string" name="premium_guild_perks_modal_base_perks" id="0x7f120dfa" />
+    <public type="string" name="premium_guild_perks_modal_blurb" id="0x7f120dfb" />
+    <public type="string" name="premium_guild_perks_modal_blurb_mobile_1" id="0x7f120dfc" />
+    <public type="string" name="premium_guild_perks_modal_blurb_mobile_2" id="0x7f120dfd" />
+    <public type="string" name="premium_guild_perks_modal_button_get_premium" id="0x7f120dfe" />
+    <public type="string" name="premium_guild_perks_modal_button_subscribe_this_server" id="0x7f120dff" />
+    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium" id="0x7f120e00" />
+    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error" id="0x7f120e01" />
+    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip" id="0x7f120e02" />
+    <public type="string" name="premium_guild_perks_modal_header" id="0x7f120e03" />
+    <public type="string" name="premium_guild_perks_modal_header_boost_count" id="0x7f120e04" />
+    <public type="string" name="premium_guild_perks_modal_level_subscriber_count_tooltip" id="0x7f120e05" />
+    <public type="string" name="premium_guild_perks_modal_manage_your_subscription" id="0x7f120e06" />
+    <public type="string" name="premium_guild_perks_modal_no_tiers" id="0x7f120e07" />
+    <public type="string" name="premium_guild_perks_modal_previous_perks" id="0x7f120e08" />
+    <public type="string" name="premium_guild_perks_modal_tier_zero_surpassed" id="0x7f120e09" />
+    <public type="string" name="premium_guild_perks_modal_tooltip_already_subscribed_this_server" id="0x7f120e0a" />
+    <public type="string" name="premium_guild_perks_modal_tooltip_already_used_subscription" id="0x7f120e0b" />
+    <public type="string" name="premium_guild_perks_modal_tooltip_cooldown" id="0x7f120e0c" />
+    <public type="string" name="premium_guild_perks_modal_tooltip_gift" id="0x7f120e0d" />
+    <public type="string" name="premium_guild_settings_members_subscribed" id="0x7f120e0e" />
+    <public type="string" name="premium_guild_settings_members_subscribed_needed" id="0x7f120e0f" />
+    <public type="string" name="premium_guild_settings_x_of_y_subscriptions" id="0x7f120e10" />
+    <public type="string" name="premium_guild_subscribe_confirm_blurb" id="0x7f120e11" />
+    <public type="string" name="premium_guild_subscribe_confirm_confirmation" id="0x7f120e12" />
+    <public type="string" name="premium_guild_subscribe_confirm_confirmation_label" id="0x7f120e13" />
+    <public type="string" name="premium_guild_subscribe_confirm_cooldown_warning" id="0x7f120e14" />
+    <public type="string" name="premium_guild_subscribe_confirm_header" id="0x7f120e15" />
+    <public type="string" name="premium_guild_subscribe_search_guild_placeholder" id="0x7f120e16" />
+    <public type="string" name="premium_guild_subscribe_select_guild_header" id="0x7f120e17" />
+    <public type="string" name="premium_guild_subscribe_success_thanks" id="0x7f120e18" />
+    <public type="string" name="premium_guild_subscription_available_count" id="0x7f120e19" />
+    <public type="string" name="premium_guild_subscription_duration" id="0x7f120e1a" />
+    <public type="string" name="premium_guild_subscription_error_mobile" id="0x7f120e1b" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_days" id="0x7f120e1c" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_hours" id="0x7f120e1d" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_minutes" id="0x7f120e1e" />
+    <public type="string" name="premium_guild_subscription_no_next_tier" id="0x7f120e1f" />
+    <public type="string" name="premium_guild_subscription_notice" id="0x7f120e20" />
+    <public type="string" name="premium_guild_subscription_notice_button" id="0x7f120e21" />
+    <public type="string" name="premium_guild_subscription_notice_small_guild" id="0x7f120e22" />
+    <public type="string" name="premium_guild_subscription_remove_button" id="0x7f120e23" />
+    <public type="string" name="premium_guild_subscription_remove_error_mobile" id="0x7f120e24" />
+    <public type="string" name="premium_guild_subscription_select_server_button" id="0x7f120e25" />
+    <public type="string" name="premium_guild_subscription_subscriber_count_tooltip" id="0x7f120e26" />
+    <public type="string" name="premium_guild_subscription_subtitle" id="0x7f120e27" />
+    <public type="string" name="premium_guild_subscription_subtitle_mobile_1" id="0x7f120e28" />
+    <public type="string" name="premium_guild_subscription_subtitle_mobile_2" id="0x7f120e29" />
+    <public type="string" name="premium_guild_subscription_title" id="0x7f120e2a" />
+    <public type="string" name="premium_guild_subscription_tooltip" id="0x7f120e2b" />
+    <public type="string" name="premium_guild_tier_1" id="0x7f120e2c" />
+    <public type="string" name="premium_guild_tier_2" id="0x7f120e2d" />
+    <public type="string" name="premium_guild_tier_3" id="0x7f120e2e" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_blurb" id="0x7f120e2f" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_confirmation" id="0x7f120e30" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning" id="0x7f120e31" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_days" id="0x7f120e32" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours" id="0x7f120e33" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes" id="0x7f120e34" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_header" id="0x7f120e35" />
+    <public type="string" name="premium_included" id="0x7f120e36" />
+    <public type="string" name="premium_info_monthly" id="0x7f120e37" />
+    <public type="string" name="premium_info_yearly" id="0x7f120e38" />
+    <public type="string" name="premium_month_subscription" id="0x7f120e39" />
+    <public type="string" name="premium_not_claimed" id="0x7f120e3a" />
+    <public type="string" name="premium_not_claimed_body" id="0x7f120e3b" />
+    <public type="string" name="premium_not_verified" id="0x7f120e3c" />
+    <public type="string" name="premium_not_verified_body" id="0x7f120e3d" />
+    <public type="string" name="premium_past_due" id="0x7f120e3e" />
+    <public type="string" name="premium_payment_confirmation_blurb_iap" id="0x7f120e3f" />
+    <public type="string" name="premium_payment_confirmation_blurb_regular" id="0x7f120e40" />
+    <public type="string" name="premium_payment_confirmation_button_iap" id="0x7f120e41" />
+    <public type="string" name="premium_payment_confirmation_button_regular" id="0x7f120e42" />
+    <public type="string" name="premium_payment_gift_blurb" id="0x7f120e43" />
+    <public type="string" name="premium_payment_gift_blurb_mobile" id="0x7f120e44" />
+    <public type="string" name="premium_payment_gift_subtext" id="0x7f120e45" />
+    <public type="string" name="premium_payment_is_gift" id="0x7f120e46" />
+    <public type="string" name="premium_payment_plan_label_monthly" id="0x7f120e47" />
+    <public type="string" name="premium_payment_plan_label_yearly" id="0x7f120e48" />
+    <public type="string" name="premium_payment_select" id="0x7f120e49" />
+    <public type="string" name="premium_payment_start_trial" id="0x7f120e4a" />
+    <public type="string" name="premium_payment_trial_blurb" id="0x7f120e4b" />
+    <public type="string" name="premium_payment_trial_note" id="0x7f120e4c" />
+    <public type="string" name="premium_payment_trial_two_weeks_free" id="0x7f120e4d" />
+    <public type="string" name="premium_plan_month" id="0x7f120e4e" />
+    <public type="string" name="premium_plan_month_tier_1" id="0x7f120e4f" />
+    <public type="string" name="premium_plan_month_tier_2" id="0x7f120e50" />
+    <public type="string" name="premium_plan_year" id="0x7f120e51" />
+    <public type="string" name="premium_plan_year_tier_1" id="0x7f120e52" />
+    <public type="string" name="premium_plan_year_tier_2" id="0x7f120e53" />
+    <public type="string" name="premium_promo_autocomplete" id="0x7f120e54" />
+    <public type="string" name="premium_promo_description" id="0x7f120e55" />
+    <public type="string" name="premium_promo_title" id="0x7f120e56" />
+    <public type="string" name="premium_required" id="0x7f120e57" />
+    <public type="string" name="premium_required_get_nitro" id="0x7f120e58" />
+    <public type="string" name="premium_restore_subscription_ios" id="0x7f120e59" />
+    <public type="string" name="premium_retention_emoji_picker_description" id="0x7f120e5a" />
+    <public type="string" name="premium_retention_emoji_picker_update_payment_information" id="0x7f120e5b" />
+    <public type="string" name="premium_settings" id="0x7f120e5c" />
+    <public type="string" name="premium_settings_get" id="0x7f120e5d" />
+    <public type="string" name="premium_settings_manage" id="0x7f120e5e" />
+    <public type="string" name="premium_subscription_credit" id="0x7f120e5f" />
+    <public type="string" name="premium_subscription_credit_applied_mismatched_plan" id="0x7f120e60" />
+    <public type="string" name="premium_subscription_credit_applied_on" id="0x7f120e61" />
+    <public type="string" name="premium_subscription_credit_count_months" id="0x7f120e62" />
+    <public type="string" name="premium_subscription_policy_hint_ios" id="0x7f120e63" />
+    <public type="string" name="premium_subscription_policy_ios" id="0x7f120e64" />
+    <public type="string" name="premium_subscription_required_body" id="0x7f120e65" />
+    <public type="string" name="premium_subtitle" id="0x7f120e66" />
+    <public type="string" name="premium_tier_1" id="0x7f120e67" />
+    <public type="string" name="premium_tier_2" id="0x7f120e68" />
+    <public type="string" name="premium_tier_2_subtitle" id="0x7f120e69" />
+    <public type="string" name="premium_tier_2_title" id="0x7f120e6a" />
+    <public type="string" name="premium_title" id="0x7f120e6b" />
+    <public type="string" name="premium_trial_button" id="0x7f120e6c" />
+    <public type="string" name="premium_upgrade_cancel" id="0x7f120e6d" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_month_year" id="0x7f120e6e" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_month_year_verbose" id="0x7f120e6f" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month" id="0x7f120e70" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose" id="0x7f120e71" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year" id="0x7f120e72" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose" id="0x7f120e73" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_year_tier_2_year" id="0x7f120e74" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_year_tier_2_year_verbose" id="0x7f120e75" />
+    <public type="string" name="premium_upgrade_confirm_button" id="0x7f120e76" />
+    <public type="string" name="premium_upgrade_confirm_button_with_price" id="0x7f120e77" />
+    <public type="string" name="premium_upgrade_confirm_title" id="0x7f120e78" />
+    <public type="string" name="premium_upgrade_disabled_already_premium" id="0x7f120e79" />
+    <public type="string" name="premium_upgrade_disabled_current_tooltip" id="0x7f120e7a" />
+    <public type="string" name="premium_upgrade_disabled_in_trial" id="0x7f120e7b" />
+    <public type="string" name="premium_upgrade_disabled_lower_tier_tooltip" id="0x7f120e7c" />
+    <public type="string" name="premium_upgrade_disabled_title_mobile" id="0x7f120e7d" />
+    <public type="string" name="premium_upgrade_done_body_tier_1" id="0x7f120e7e" />
+    <public type="string" name="premium_upgrade_done_body_tier_2_guild_subscribe" id="0x7f120e7f" />
+    <public type="string" name="premium_upgrade_done_button_tier_1" id="0x7f120e80" />
+    <public type="string" name="premium_upgrade_failed_body" id="0x7f120e81" />
+    <public type="string" name="premium_upgrade_required_body" id="0x7f120e82" />
+    <public type="string" name="premium_upload_promo" id="0x7f120e83" />
+    <public type="string" name="premium_upsell_animated_avatar_active_mobile" id="0x7f120e84" />
+    <public type="string" name="premium_upsell_animated_avatar_description_mobile" id="0x7f120e85" />
+    <public type="string" name="premium_upsell_animated_avatar_passive_mobile" id="0x7f120e86" />
+    <public type="string" name="premium_upsell_animated_emojis_active_mobile" id="0x7f120e87" />
+    <public type="string" name="premium_upsell_animated_emojis_description_mobile" id="0x7f120e88" />
+    <public type="string" name="premium_upsell_animated_emojis_passive_mobile" id="0x7f120e89" />
+    <public type="string" name="premium_upsell_badge_active_mobile" id="0x7f120e8a" />
+    <public type="string" name="premium_upsell_badge_description_mobile" id="0x7f120e8b" />
+    <public type="string" name="premium_upsell_badge_passive_mobile" id="0x7f120e8c" />
+    <public type="string" name="premium_upsell_emoji_active_mobile" id="0x7f120e8d" />
+    <public type="string" name="premium_upsell_emoji_description_mobile" id="0x7f120e8e" />
+    <public type="string" name="premium_upsell_emoji_passive_mobile" id="0x7f120e8f" />
+    <public type="string" name="premium_upsell_tag_active_mobile" id="0x7f120e90" />
+    <public type="string" name="premium_upsell_tag_description_mobile" id="0x7f120e91" />
+    <public type="string" name="premium_upsell_tag_passive_mobile" id="0x7f120e92" />
+    <public type="string" name="premium_upsell_upload_active_mobile" id="0x7f120e93" />
+    <public type="string" name="premium_upsell_upload_description_mobile" id="0x7f120e94" />
+    <public type="string" name="premium_upsell_upload_passive_mobile" id="0x7f120e95" />
+    <public type="string" name="premium_year_free_months" id="0x7f120e96" />
+    <public type="string" name="premium_year_subscription" id="0x7f120e97" />
+    <public type="string" name="preorder_sku_name" id="0x7f120e98" />
+    <public type="string" name="preview_chat" id="0x7f120e99" />
+    <public type="string" name="priority_speaker" id="0x7f120e9a" />
+    <public type="string" name="priority_speaker_description" id="0x7f120e9b" />
+    <public type="string" name="priority_speaker_description_app" id="0x7f120e9c" />
+    <public type="string" name="privacy_and_safety" id="0x7f120e9d" />
+    <public type="string" name="privacy_policy" id="0x7f120e9e" />
+    <public type="string" name="privacy_policy_url" id="0x7f120e9f" />
+    <public type="string" name="privacy_settings" id="0x7f120ea0" />
+    <public type="string" name="private_category" id="0x7f120ea1" />
+    <public type="string" name="private_category_note" id="0x7f120ea2" />
+    <public type="string" name="private_channel" id="0x7f120ea3" />
+    <public type="string" name="private_channel_note" id="0x7f120ea4" />
+    <public type="string" name="profile" id="0x7f120ea5" />
+    <public type="string" name="project_id" id="0x7f120ea6" />
+    <public type="string" name="prune" id="0x7f120ea7" />
+    <public type="string" name="prune_members" id="0x7f120ea8" />
+    <public type="string" name="pt_br" id="0x7f120ea9" />
+    <public type="string" name="ptt_limited_body" id="0x7f120eaa" />
+    <public type="string" name="ptt_limited_title" id="0x7f120eab" />
+    <public type="string" name="ptt_limited_warning" id="0x7f120eac" />
+    <public type="string" name="ptt_permission_body" id="0x7f120ead" />
+    <public type="string" name="ptt_permission_title" id="0x7f120eae" />
+    <public type="string" name="publish_followed_news_body" id="0x7f120eaf" />
+    <public type="string" name="publish_followed_news_body_reach" id="0x7f120eb0" />
+    <public type="string" name="publish_followed_news_body_settings" id="0x7f120eb1" />
+    <public type="string" name="publish_followed_news_body_stats" id="0x7f120eb2" />
+    <public type="string" name="publish_followed_news_fail_body" id="0x7f120eb3" />
+    <public type="string" name="publish_followed_news_fail_title" id="0x7f120eb4" />
+    <public type="string" name="publish_followed_news_generic_body" id="0x7f120eb5" />
+    <public type="string" name="purple" id="0x7f120eb6" />
+    <public type="string" name="quality_indicator" id="0x7f120eb7" />
+    <public type="string" name="quick_dm_blocked" id="0x7f120eb8" />
+    <public type="string" name="quick_dm_user" id="0x7f120eb9" />
+    <public type="string" name="quick_launcher_empty_text" id="0x7f120eba" />
+    <public type="string" name="quick_launcher_empty_text_v2" id="0x7f120ebb" />
+    <public type="string" name="quick_launcher_header" id="0x7f120ebc" />
+    <public type="string" name="quick_switcher" id="0x7f120ebd" />
+    <public type="string" name="quickswitcher_drafts" id="0x7f120ebe" />
+    <public type="string" name="quickswitcher_empty_cta" id="0x7f120ebf" />
+    <public type="string" name="quickswitcher_empty_text" id="0x7f120ec0" />
+    <public type="string" name="quickswitcher_last_channel" id="0x7f120ec1" />
+    <public type="string" name="quickswitcher_mentions" id="0x7f120ec2" />
+    <public type="string" name="quickswitcher_notice" id="0x7f120ec3" />
+    <public type="string" name="quickswitcher_placeholder" id="0x7f120ec4" />
+    <public type="string" name="quickswitcher_querymode_applications" id="0x7f120ec5" />
+    <public type="string" name="quickswitcher_querymode_guilds" id="0x7f120ec6" />
+    <public type="string" name="quickswitcher_querymode_text_channels" id="0x7f120ec7" />
+    <public type="string" name="quickswitcher_querymode_users" id="0x7f120ec8" />
+    <public type="string" name="quickswitcher_querymode_voice_channels" id="0x7f120ec9" />
+    <public type="string" name="quickswitcher_tip_nav" id="0x7f120eca" />
+    <public type="string" name="quickswitcher_tip_select" id="0x7f120ecb" />
+    <public type="string" name="quickswitcher_tutorial_message_search" id="0x7f120ecc" />
+    <public type="string" name="quickswitcher_tutorial_message_select" id="0x7f120ecd" />
+    <public type="string" name="quickswitcher_unread_channels" id="0x7f120ece" />
+    <public type="string" name="quote_attribution" id="0x7f120ecf" />
+    <public type="string" name="quote_attribution_facebook" id="0x7f120ed0" />
+    <public type="string" name="quote_attribution_instagram" id="0x7f120ed1" />
+    <public type="string" name="rate_limited" id="0x7f120ed2" />
+    <public type="string" name="rate_limited_retry_after" id="0x7f120ed3" />
+    <public type="string" name="rating_request_body_android" id="0x7f120ed4" />
+    <public type="string" name="rating_request_title" id="0x7f120ed5" />
+    <public type="string" name="reaction_tooltip_1" id="0x7f120ed6" />
+    <public type="string" name="reaction_tooltip_1_n" id="0x7f120ed7" />
+    <public type="string" name="reaction_tooltip_2" id="0x7f120ed8" />
+    <public type="string" name="reaction_tooltip_2_n" id="0x7f120ed9" />
+    <public type="string" name="reaction_tooltip_3" id="0x7f120eda" />
+    <public type="string" name="reaction_tooltip_3_n" id="0x7f120edb" />
+    <public type="string" name="reaction_tooltip_n" id="0x7f120edc" />
+    <public type="string" name="reactions" id="0x7f120edd" />
+    <public type="string" name="reactions_matching" id="0x7f120ede" />
+    <public type="string" name="read_message_history" id="0x7f120edf" />
+    <public type="string" name="read_messages" id="0x7f120ee0" />
+    <public type="string" name="read_messages_view_channels" id="0x7f120ee1" />
+    <public type="string" name="read_only_channel" id="0x7f120ee2" />
+    <public type="string" name="ready" id="0x7f120ee3" />
+    <public type="string" name="recent_mentions" id="0x7f120ee4" />
+    <public type="string" name="recent_mentions_direct_only" id="0x7f120ee5" />
+    <public type="string" name="recent_mentions_everyone_and_direct" id="0x7f120ee6" />
+    <public type="string" name="recent_mentions_filter_everyone" id="0x7f120ee7" />
+    <public type="string" name="recent_mentions_filter_explain_everything" id="0x7f120ee8" />
+    <public type="string" name="recent_mentions_filter_label" id="0x7f120ee9" />
+    <public type="string" name="recent_mentions_filter_roles" id="0x7f120eea" />
+    <public type="string" name="recent_mentions_pro_tip" id="0x7f120eeb" />
+    <public type="string" name="recent_mentions_roles_and_direct" id="0x7f120eec" />
+    <public type="string" name="reconnect" id="0x7f120eed" />
+    <public type="string" name="reconnecting" id="0x7f120eee" />
+    <public type="string" name="refund" id="0x7f120eef" />
+    <public type="string" name="region" id="0x7f120ef0" />
+    <public type="string" name="region_select_footer" id="0x7f120ef1" />
+    <public type="string" name="region_select_header" id="0x7f120ef2" />
+    <public type="string" name="register" id="0x7f120ef3" />
+    <public type="string" name="register_account" id="0x7f120ef4" />
+    <public type="string" name="register_body" id="0x7f120ef5" />
+    <public type="string" name="register_title" id="0x7f120ef6" />
+    <public type="string" name="remaining_participants" id="0x7f120ef7" />
+    <public type="string" name="remove" id="0x7f120ef8" />
+    <public type="string" name="remove_all_reactions" id="0x7f120ef9" />
+    <public type="string" name="remove_all_reactions_confirm_body" id="0x7f120efa" />
+    <public type="string" name="remove_all_reactions_confirm_title" id="0x7f120efb" />
+    <public type="string" name="remove_friend" id="0x7f120efc" />
+    <public type="string" name="remove_friend_body" id="0x7f120efd" />
+    <public type="string" name="remove_friend_title" id="0x7f120efe" />
+    <public type="string" name="remove_from_group" id="0x7f120eff" />
+    <public type="string" name="remove_icon" id="0x7f120f00" />
+    <public type="string" name="remove_keybind" id="0x7f120f01" />
+    <public type="string" name="remove_reaction" id="0x7f120f02" />
+    <public type="string" name="remove_role_or_user" id="0x7f120f03" />
+    <public type="string" name="remove_synced_role" id="0x7f120f04" />
+    <public type="string" name="remove_vanity_url" id="0x7f120f05" />
+    <public type="string" name="render_embeds" id="0x7f120f06" />
+    <public type="string" name="render_embeds_label" id="0x7f120f07" />
+    <public type="string" name="render_reactions" id="0x7f120f08" />
+    <public type="string" name="report" id="0x7f120f09" />
+    <public type="string" name="report_message" id="0x7f120f0a" />
+    <public type="string" name="report_server" id="0x7f120f0b" />
+    <public type="string" name="report_title" id="0x7f120f0c" />
+    <public type="string" name="report_user" id="0x7f120f0d" />
+    <public type="string" name="reported" id="0x7f120f0e" />
+    <public type="string" name="request_permission_msg" id="0x7f120f0f" />
+    <public type="string" name="resend" id="0x7f120f10" />
+    <public type="string" name="resend_code" id="0x7f120f11" />
+    <public type="string" name="resend_email" id="0x7f120f12" />
+    <public type="string" name="resend_message" id="0x7f120f13" />
+    <public type="string" name="resend_verification_email" id="0x7f120f14" />
+    <public type="string" name="reset" id="0x7f120f15" />
+    <public type="string" name="reset_nickname" id="0x7f120f16" />
+    <public type="string" name="reset_notification_override" id="0x7f120f17" />
+    <public type="string" name="reset_notification_settings" id="0x7f120f18" />
+    <public type="string" name="reset_password_title" id="0x7f120f19" />
+    <public type="string" name="reset_to_default" id="0x7f120f1a" />
+    <public type="string" name="reset_voice_settings" id="0x7f120f1b" />
+    <public type="string" name="reset_voice_settings_body" id="0x7f120f1c" />
+    <public type="string" name="resubscribe" id="0x7f120f1d" />
+    <public type="string" name="retry" id="0x7f120f1e" />
+    <public type="string" name="return_to_login" id="0x7f120f1f" />
+    <public type="string" name="reversed" id="0x7f120f20" />
+    <public type="string" name="revoke" id="0x7f120f21" />
+    <public type="string" name="revoke_ban" id="0x7f120f22" />
+    <public type="string" name="ring" id="0x7f120f23" />
+    <public type="string" name="ro" id="0x7f120f24" />
+    <public type="string" name="role_order_updated" id="0x7f120f25" />
+    <public type="string" name="roles" id="0x7f120f26" />
+    <public type="string" name="roles_list" id="0x7f120f27" />
+    <public type="string" name="rtc_connection" id="0x7f120f28" />
+    <public type="string" name="rtc_connection_info" id="0x7f120f29" />
+    <public type="string" name="rtc_connection_state_authenticating" id="0x7f120f2a" />
+    <public type="string" name="rtc_connection_state_awaiting_endpoint" id="0x7f120f2b" />
+    <public type="string" name="rtc_connection_state_connecting" id="0x7f120f2c" />
+    <public type="string" name="rtc_connection_state_disconnected" id="0x7f120f2d" />
+    <public type="string" name="rtc_connection_state_ice_checking" id="0x7f120f2e" />
+    <public type="string" name="rtc_connection_state_no_route" id="0x7f120f2f" />
+    <public type="string" name="rtc_connection_state_rtc_connected" id="0x7f120f30" />
+    <public type="string" name="rtc_connection_state_rtc_connected_loss_rate" id="0x7f120f31" />
+    <public type="string" name="rtc_connection_state_rtc_connecting" id="0x7f120f32" />
+    <public type="string" name="rtc_debug_context" id="0x7f120f33" />
+    <public type="string" name="rtc_debug_open" id="0x7f120f34" />
+    <public type="string" name="rtc_debug_rtp_inbound" id="0x7f120f35" />
+    <public type="string" name="rtc_debug_rtp_outbound" id="0x7f120f36" />
+    <public type="string" name="rtc_debug_screenshare" id="0x7f120f37" />
+    <public type="string" name="rtc_debug_transport" id="0x7f120f38" />
+    <public type="string" name="rtc_debug_users" id="0x7f120f39" />
+    <public type="string" name="ru" id="0x7f120f3a" />
+    <public type="string" name="salmon" id="0x7f120f3b" />
+    <public type="string" name="sample_channel_message" id="0x7f120f3c" />
+    <public type="string" name="sample_channel_name" id="0x7f120f3d" />
+    <public type="string" name="sample_channel_name_short" id="0x7f120f3e" />
+    <public type="string" name="sample_channel_search_filter" id="0x7f120f3f" />
+    <public type="string" name="sample_confirmation" id="0x7f120f40" />
+    <public type="string" name="sample_connected_account" id="0x7f120f41" />
+    <public type="string" name="sample_discrim" id="0x7f120f42" />
+    <public type="string" name="sample_email" id="0x7f120f43" />
+    <public type="string" name="sample_empty_string" id="0x7f120f44" />
+    <public type="string" name="sample_language" id="0x7f120f45" />
+    <public type="string" name="sample_number_9" id="0x7f120f46" />
+    <public type="string" name="sample_number_99" id="0x7f120f47" />
+    <public type="string" name="sample_number_999" id="0x7f120f48" />
+    <public type="string" name="sample_number_9999" id="0x7f120f49" />
+    <public type="string" name="sample_number_bandwidth" id="0x7f120f4a" />
+    <public type="string" name="sample_number_ratio" id="0x7f120f4b" />
+    <public type="string" name="sample_online_members" id="0x7f120f4c" />
+    <public type="string" name="sample_server_name" id="0x7f120f4d" />
+    <public type="string" name="sample_server_name_short" id="0x7f120f4e" />
+    <public type="string" name="sample_server_role_name" id="0x7f120f4f" />
+    <public type="string" name="sample_time_duration_minutes" id="0x7f120f50" />
+    <public type="string" name="sample_time_duration_seconds" id="0x7f120f51" />
+    <public type="string" name="sample_time_pm" id="0x7f120f52" />
+    <public type="string" name="sample_time_stamp" id="0x7f120f53" />
+    <public type="string" name="sample_total_members" id="0x7f120f54" />
+    <public type="string" name="sample_user_generated_link" id="0x7f120f55" />
+    <public type="string" name="sample_user_name" id="0x7f120f56" />
+    <public type="string" name="sample_user_name_discrim" id="0x7f120f57" />
+    <public type="string" name="sample_user_nick" id="0x7f120f58" />
+    <public type="string" name="sample_user_presence" id="0x7f120f59" />
+    <public type="string" name="sample_user_presence_details" id="0x7f120f5a" />
+    <public type="string" name="samsung_welcome_screen" id="0x7f120f5b" />
+    <public type="string" name="save" id="0x7f120f5c" />
+    <public type="string" name="save_changes" id="0x7f120f5d" />
+    <public type="string" name="save_media" id="0x7f120f5e" />
+    <public type="string" name="save_media_failure_help_mobile" id="0x7f120f5f" />
+    <public type="string" name="save_media_failure_mobile" id="0x7f120f60" />
+    <public type="string" name="save_media_success_mobile" id="0x7f120f61" />
+    <public type="string" name="save_new_url" id="0x7f120f62" />
+    <public type="string" name="saved_settings" id="0x7f120f63" />
+    <public type="string" name="scope_activities_read" id="0x7f120f64" />
+    <public type="string" name="scope_activities_read_description" id="0x7f120f65" />
+    <public type="string" name="scope_activities_write" id="0x7f120f66" />
+    <public type="string" name="scope_activities_write_description" id="0x7f120f67" />
+    <public type="string" name="scope_applications_builds_read" id="0x7f120f68" />
+    <public type="string" name="scope_applications_builds_read_description" id="0x7f120f69" />
+    <public type="string" name="scope_applications_builds_upload" id="0x7f120f6a" />
+    <public type="string" name="scope_applications_builds_upload_description" id="0x7f120f6b" />
+    <public type="string" name="scope_applications_entitlements" id="0x7f120f6c" />
+    <public type="string" name="scope_applications_entitlements_description" id="0x7f120f6d" />
+    <public type="string" name="scope_applications_store_update" id="0x7f120f6e" />
+    <public type="string" name="scope_applications_store_update_description" id="0x7f120f6f" />
+    <public type="string" name="scope_bot" id="0x7f120f70" />
+    <public type="string" name="scope_bot_description" id="0x7f120f71" />
+    <public type="string" name="scope_bot_permissions" id="0x7f120f72" />
+    <public type="string" name="scope_bot_permissions_description" id="0x7f120f73" />
+    <public type="string" name="scope_bot_server_placeholder" id="0x7f120f74" />
+    <public type="string" name="scope_bot_server_placeholder_no_guilds" id="0x7f120f75" />
+    <public type="string" name="scope_bot_server_selected_label" id="0x7f120f76" />
+    <public type="string" name="scope_connections" id="0x7f120f77" />
+    <public type="string" name="scope_connections_empty" id="0x7f120f78" />
+    <public type="string" name="scope_email" id="0x7f120f79" />
+    <public type="string" name="scope_email_empty" id="0x7f120f7a" />
+    <public type="string" name="scope_gdm_join" id="0x7f120f7b" />
+    <public type="string" name="scope_gdm_join_description" id="0x7f120f7c" />
+    <public type="string" name="scope_guilds" id="0x7f120f7d" />
+    <public type="string" name="scope_guilds_empty" id="0x7f120f7e" />
+    <public type="string" name="scope_guilds_join" id="0x7f120f7f" />
+    <public type="string" name="scope_guilds_join_description" id="0x7f120f80" />
+    <public type="string" name="scope_guilds_list_overflow" id="0x7f120f81" />
+    <public type="string" name="scope_identify" id="0x7f120f82" />
+    <public type="string" name="scope_messages_read" id="0x7f120f83" />
+    <public type="string" name="scope_messages_read_description" id="0x7f120f84" />
+    <public type="string" name="scope_relationships_read" id="0x7f120f85" />
+    <public type="string" name="scope_relationships_read_description" id="0x7f120f86" />
+    <public type="string" name="scope_rpc" id="0x7f120f87" />
+    <public type="string" name="scope_rpc_api" id="0x7f120f88" />
+    <public type="string" name="scope_rpc_api_description" id="0x7f120f89" />
+    <public type="string" name="scope_rpc_description" id="0x7f120f8a" />
+    <public type="string" name="scope_rpc_notifications_read" id="0x7f120f8b" />
+    <public type="string" name="scope_rpc_notifications_read_description" id="0x7f120f8c" />
+    <public type="string" name="scope_unsupported_on_android" id="0x7f120f8d" />
+    <public type="string" name="scope_unsupported_on_android_description" id="0x7f120f8e" />
+    <public type="string" name="scope_webhook_incoming" id="0x7f120f8f" />
+    <public type="string" name="scope_webhook_incoming_channel_placeholder" id="0x7f120f90" />
+    <public type="string" name="scope_webhook_incoming_description" id="0x7f120f91" />
+    <public type="string" name="screen_share_on" id="0x7f120f92" />
+    <public type="string" name="screen_share_options" id="0x7f120f93" />
+    <public type="string" name="screenshare_change_windows" id="0x7f120f94" />
+    <public type="string" name="screenshare_description" id="0x7f120f95" />
+    <public type="string" name="screenshare_extension_body" id="0x7f120f96" />
+    <public type="string" name="screenshare_extension_title" id="0x7f120f97" />
+    <public type="string" name="screenshare_frame_rate" id="0x7f120f98" />
+    <public type="string" name="screenshare_relaunch" id="0x7f120f99" />
+    <public type="string" name="screenshare_relaunch_body" id="0x7f120f9a" />
+    <public type="string" name="screenshare_screen" id="0x7f120f9b" />
+    <public type="string" name="screenshare_share_screen_or_window" id="0x7f120f9c" />
+    <public type="string" name="screenshare_sound_toggle_label" id="0x7f120f9d" />
+    <public type="string" name="screenshare_source" id="0x7f120f9e" />
+    <public type="string" name="screenshare_stop" id="0x7f120f9f" />
+    <public type="string" name="screenshare_stream_game" id="0x7f120fa0" />
+    <public type="string" name="screenshare_stream_quality" id="0x7f120fa1" />
+    <public type="string" name="screenshare_unavailable" id="0x7f120fa2" />
+    <public type="string" name="screenshare_unavailable_download_app" id="0x7f120fa3" />
+    <public type="string" name="screenshare_window" id="0x7f120fa4" />
+    <public type="string" name="search" id="0x7f120fa5" />
+    <public type="string" name="search_actions" id="0x7f120fa6" />
+    <public type="string" name="search_answer_date" id="0x7f120fa7" />
+    <public type="string" name="search_answer_file_name" id="0x7f120fa8" />
+    <public type="string" name="search_answer_file_type" id="0x7f120fa9" />
+    <public type="string" name="search_answer_from" id="0x7f120faa" />
+    <public type="string" name="search_answer_has" id="0x7f120fab" />
+    <public type="string" name="search_answer_has_attachment" id="0x7f120fac" />
+    <public type="string" name="search_answer_has_embed" id="0x7f120fad" />
+    <public type="string" name="search_answer_has_image" id="0x7f120fae" />
+    <public type="string" name="search_answer_has_link" id="0x7f120faf" />
+    <public type="string" name="search_answer_has_sound" id="0x7f120fb0" />
+    <public type="string" name="search_answer_has_video" id="0x7f120fb1" />
+    <public type="string" name="search_answer_in" id="0x7f120fb2" />
+    <public type="string" name="search_answer_link_from" id="0x7f120fb3" />
+    <public type="string" name="search_answer_mentions" id="0x7f120fb4" />
+    <public type="string" name="search_channels" id="0x7f120fb5" />
+    <public type="string" name="search_channels_no_result" id="0x7f120fb6" />
+    <public type="string" name="search_clear" id="0x7f120fb7" />
+    <public type="string" name="search_clear_history" id="0x7f120fb8" />
+    <public type="string" name="search_country" id="0x7f120fb9" />
+    <public type="string" name="search_date_picker_hint" id="0x7f120fba" />
+    <public type="string" name="search_dm_still_indexing" id="0x7f120fbb" />
+    <public type="string" name="search_dm_with" id="0x7f120fbc" />
+    <public type="string" name="search_error" id="0x7f120fbd" />
+    <public type="string" name="search_filter_after" id="0x7f120fbe" />
+    <public type="string" name="search_filter_before" id="0x7f120fbf" />
+    <public type="string" name="search_filter_during" id="0x7f120fc0" />
+    <public type="string" name="search_filter_file_name" id="0x7f120fc1" />
+    <public type="string" name="search_filter_file_type" id="0x7f120fc2" />
+    <public type="string" name="search_filter_from" id="0x7f120fc3" />
+    <public type="string" name="search_filter_has" id="0x7f120fc4" />
+    <public type="string" name="search_filter_in" id="0x7f120fc5" />
+    <public type="string" name="search_filter_link_from" id="0x7f120fc6" />
+    <public type="string" name="search_filter_mentions" id="0x7f120fc7" />
+    <public type="string" name="search_filter_on" id="0x7f120fc8" />
+    <public type="string" name="search_for_emoji" id="0x7f120fc9" />
+    <public type="string" name="search_for_empty" id="0x7f120fca" />
+    <public type="string" name="search_for_value" id="0x7f120fcb" />
+    <public type="string" name="search_from_suggestions" id="0x7f120fcc" />
+    <public type="string" name="search_giphy" id="0x7f120fcd" />
+    <public type="string" name="search_group_header_channels" id="0x7f120fce" />
+    <public type="string" name="search_group_header_dates" id="0x7f120fcf" />
+    <public type="string" name="search_group_header_file_name" id="0x7f120fd0" />
+    <public type="string" name="search_group_header_file_type" id="0x7f120fd1" />
+    <public type="string" name="search_group_header_from" id="0x7f120fd2" />
+    <public type="string" name="search_group_header_has" id="0x7f120fd3" />
+    <public type="string" name="search_group_header_history" id="0x7f120fd4" />
+    <public type="string" name="search_group_header_link_from" id="0x7f120fd5" />
+    <public type="string" name="search_group_header_mentions" id="0x7f120fd6" />
+    <public type="string" name="search_group_header_search_options" id="0x7f120fd7" />
+    <public type="string" name="search_guild_still_indexing" id="0x7f120fd8" />
+    <public type="string" name="search_hide_blocked_messages" id="0x7f120fd9" />
+    <public type="string" name="search_in" id="0x7f120fda" />
+    <public type="string" name="search_members" id="0x7f120fdb" />
+    <public type="string" name="search_members_no_result" id="0x7f120fdc" />
+    <public type="string" name="search_menu_title" id="0x7f120fdd" />
+    <public type="string" name="search_no_results" id="0x7f120fde" />
+    <public type="string" name="search_no_results_alt" id="0x7f120fdf" />
+    <public type="string" name="search_num_results_blocked_not_shown" id="0x7f120fe0" />
+    <public type="string" name="search_pick_date" id="0x7f120fe1" />
+    <public type="string" name="search_recent" id="0x7f120fe2" />
+    <public type="string" name="search_relevant" id="0x7f120fe3" />
+    <public type="string" name="search_roles" id="0x7f120fe4" />
+    <public type="string" name="search_roles_no_result" id="0x7f120fe5" />
+    <public type="string" name="search_shortcut_month" id="0x7f120fe6" />
+    <public type="string" name="search_shortcut_today" id="0x7f120fe7" />
+    <public type="string" name="search_shortcut_week" id="0x7f120fe8" />
+    <public type="string" name="search_shortcut_year" id="0x7f120fe9" />
+    <public type="string" name="search_shortcut_yesterday" id="0x7f120fea" />
+    <public type="string" name="search_still_indexing_hint" id="0x7f120feb" />
+    <public type="string" name="search_tenor" id="0x7f120fec" />
+    <public type="string" name="search_with_google" id="0x7f120fed" />
+    <public type="string" name="searching" id="0x7f120fee" />
+    <public type="string" name="security" id="0x7f120fef" />
+    <public type="string" name="select" id="0x7f120ff0" />
+    <public type="string" name="select_channel_or_category" id="0x7f120ff1" />
+    <public type="string" name="select_color" id="0x7f120ff2" />
+    <public type="string" name="select_emoji" id="0x7f120ff3" />
+    <public type="string" name="select_picture" id="0x7f120ff4" />
+    <public type="string" name="select_picture_upload" id="0x7f120ff5" />
+    <public type="string" name="select_sort_mode" id="0x7f120ff6" />
+    <public type="string" name="selection_shrink_scale" id="0x7f120ff7" />
+    <public type="string" name="self_deafened" id="0x7f120ff8" />
+    <public type="string" name="self_deny_permission_body" id="0x7f120ff9" />
+    <public type="string" name="self_deny_permission_title" id="0x7f120ffa" />
+    <public type="string" name="self_muted" id="0x7f120ffb" />
+    <public type="string" name="self_xss_header" id="0x7f120ffc" />
+    <public type="string" name="self_xss_line_1" id="0x7f120ffd" />
+    <public type="string" name="self_xss_line_2" id="0x7f120ffe" />
+    <public type="string" name="self_xss_line_3" id="0x7f120fff" />
+    <public type="string" name="self_xss_line_4" id="0x7f121000" />
+    <public type="string" name="send" id="0x7f121001" />
+    <public type="string" name="send_contents" id="0x7f121002" />
+    <public type="string" name="send_dm" id="0x7f121003" />
+    <public type="string" name="send_message" id="0x7f121004" />
+    <public type="string" name="send_message_failure" id="0x7f121005" />
+    <public type="string" name="send_messages" id="0x7f121006" />
+    <public type="string" name="send_messages_description" id="0x7f121007" />
+    <public type="string" name="send_tts_messages" id="0x7f121008" />
+    <public type="string" name="send_tts_messages_description" id="0x7f121009" />
+    <public type="string" name="server_acronym" id="0x7f12100a" />
+    <public type="string" name="server_analytics_description" id="0x7f12100b" />
+    <public type="string" name="server_deafen" id="0x7f12100c" />
+    <public type="string" name="server_deafened" id="0x7f12100d" />
+    <public type="string" name="server_desciption_empty" id="0x7f12100e" />
+    <public type="string" name="server_emoji" id="0x7f12100f" />
+    <public type="string" name="server_folder_mark_as_read" id="0x7f121010" />
+    <public type="string" name="server_folder_mute" id="0x7f121011" />
+    <public type="string" name="server_folder_placeholder" id="0x7f121012" />
+    <public type="string" name="server_folder_settings" id="0x7f121013" />
+    <public type="string" name="server_icon" id="0x7f121014" />
+    <public type="string" name="server_insights" id="0x7f121015" />
+    <public type="string" name="server_insights_error_message" id="0x7f121016" />
+    <public type="string" name="server_mute" id="0x7f121017" />
+    <public type="string" name="server_mute_dms" id="0x7f121018" />
+    <public type="string" name="server_muted" id="0x7f121019" />
+    <public type="string" name="server_name_required" id="0x7f12101a" />
+    <public type="string" name="server_notification" id="0x7f12101b" />
+    <public type="string" name="server_options" id="0x7f12101c" />
+    <public type="string" name="server_overview" id="0x7f12101d" />
+    <public type="string" name="server_ratio_healthy_hook" id="0x7f12101e" />
+    <public type="string" name="server_region_unavailable" id="0x7f12101f" />
+    <public type="string" name="server_settings" id="0x7f121020" />
+    <public type="string" name="server_settings_updated" id="0x7f121021" />
+    <public type="string" name="server_sort" id="0x7f121022" />
+    <public type="string" name="server_status" id="0x7f121023" />
+    <public type="string" name="server_undeafen" id="0x7f121024" />
+    <public type="string" name="server_unmute" id="0x7f121025" />
+    <public type="string" name="server_voice_mute" id="0x7f121026" />
+    <public type="string" name="server_voice_unmute" id="0x7f121027" />
+    <public type="string" name="servers" id="0x7f121028" />
+    <public type="string" name="servers_management_title" id="0x7f121029" />
+    <public type="string" name="service_connections_disconnect" id="0x7f12102a" />
+    <public type="string" name="set_debug_logging" id="0x7f12102b" />
+    <public type="string" name="set_debug_logging_body" id="0x7f12102c" />
+    <public type="string" name="set_invite_link_never_expire" id="0x7f12102d" />
+    <public type="string" name="set_status" id="0x7f12102e" />
+    <public type="string" name="settings" id="0x7f12102f" />
+    <public type="string" name="settings_advanced" id="0x7f121030" />
+    <public type="string" name="settings_basic" id="0x7f121031" />
+    <public type="string" name="settings_games_add" id="0x7f121032" />
+    <public type="string" name="settings_games_add_game" id="0x7f121033" />
+    <public type="string" name="settings_games_add_new_game" id="0x7f121034" />
+    <public type="string" name="settings_games_added_games_label" id="0x7f121035" />
+    <public type="string" name="settings_games_enable_overlay_label" id="0x7f121036" />
+    <public type="string" name="settings_games_game_to_add" id="0x7f121037" />
+    <public type="string" name="settings_games_hidden_library_applications_label" id="0x7f121038" />
+    <public type="string" name="settings_games_import_explanation" id="0x7f121039" />
+    <public type="string" name="settings_games_import_label" id="0x7f12103a" />
+    <public type="string" name="settings_games_last_played" id="0x7f12103b" />
+    <public type="string" name="settings_games_no_game_detected" id="0x7f12103c" />
+    <public type="string" name="settings_games_no_games_header" id="0x7f12103d" />
+    <public type="string" name="settings_games_not_playing" id="0x7f12103e" />
+    <public type="string" name="settings_games_not_seeing_game" id="0x7f12103f" />
+    <public type="string" name="settings_games_now_playing_label" id="0x7f121040" />
+    <public type="string" name="settings_games_now_playing_state" id="0x7f121041" />
+    <public type="string" name="settings_games_overlay" id="0x7f121042" />
+    <public type="string" name="settings_games_overlay_off" id="0x7f121043" />
+    <public type="string" name="settings_games_overlay_on" id="0x7f121044" />
+    <public type="string" name="settings_games_overlay_warning" id="0x7f121045" />
+    <public type="string" name="settings_games_remove_icon" id="0x7f121046" />
+    <public type="string" name="settings_games_restore_to_library" id="0x7f121047" />
+    <public type="string" name="settings_games_toggle_overlay" id="0x7f121048" />
+    <public type="string" name="settings_games_verified_icon" id="0x7f121049" />
+    <public type="string" name="settings_invite_tip" id="0x7f12104a" />
+    <public type="string" name="settings_invite_tip_without_create" id="0x7f12104b" />
+    <public type="string" name="settings_notice_message" id="0x7f12104c" />
+    <public type="string" name="settings_permissions_delete_body" id="0x7f12104d" />
+    <public type="string" name="settings_permissions_delete_title" id="0x7f12104e" />
+    <public type="string" name="settings_permissions_title" id="0x7f12104f" />
+    <public type="string" name="settings_roles_delete_body" id="0x7f121050" />
+    <public type="string" name="settings_roles_delete_title" id="0x7f121051" />
+    <public type="string" name="settings_roles_helpdesk_link" id="0x7f121052" />
+    <public type="string" name="settings_sync" id="0x7f121053" />
+    <public type="string" name="settings_webhooks_empty_body" id="0x7f121054" />
+    <public type="string" name="settings_webhooks_empty_body_ios" id="0x7f121055" />
+    <public type="string" name="settings_webhooks_empty_title" id="0x7f121056" />
+    <public type="string" name="settings_webhooks_intro" id="0x7f121057" />
+    <public type="string" name="setup" id="0x7f121058" />
+    <public type="string" name="setup_vanity_url" id="0x7f121059" />
+    <public type="string" name="several_users_typing" id="0x7f12105a" />
+    <public type="string" name="share" id="0x7f12105b" />
+    <public type="string" name="share_invite_link_for_access" id="0x7f12105c" />
+    <public type="string" name="share_invite_link_for_access_experiment" id="0x7f12105d" />
+    <public type="string" name="share_invite_mobile" id="0x7f12105e" />
+    <public type="string" name="share_link" id="0x7f12105f" />
+    <public type="string" name="share_to" id="0x7f121060" />
+    <public type="string" name="shortcut_recorder_button" id="0x7f121061" />
+    <public type="string" name="shortcut_recorder_button_edit" id="0x7f121062" />
+    <public type="string" name="shortcut_recorder_button_recording" id="0x7f121063" />
+    <public type="string" name="shortcut_recorder_help" id="0x7f121064" />
+    <public type="string" name="shortcut_recorder_no_bind" id="0x7f121065" />
+    <public type="string" name="show_current_game" id="0x7f121066" />
+    <public type="string" name="show_current_game_desc" id="0x7f121067" />
+    <public type="string" name="show_muted" id="0x7f121068" />
+    <public type="string" name="show_muted_channels" id="0x7f121069" />
+    <public type="string" name="show_spoiler_always" id="0x7f12106a" />
+    <public type="string" name="show_spoiler_content" id="0x7f12106b" />
+    <public type="string" name="show_spoiler_content_help" id="0x7f12106c" />
+    <public type="string" name="show_spoiler_on_click" id="0x7f12106d" />
+    <public type="string" name="show_spoiler_on_servers_i_mod" id="0x7f12106e" />
+    <public type="string" name="skip" id="0x7f12106f" />
+    <public type="string" name="skip_all_tips" id="0x7f121070" />
+    <public type="string" name="sky_blue" id="0x7f121071" />
+    <public type="string" name="sort" id="0x7f121072" />
+    <public type="string" name="sorting" id="0x7f121073" />
+    <public type="string" name="sorting_channels" id="0x7f121074" />
+    <public type="string" name="sound_deafen" id="0x7f121075" />
+    <public type="string" name="sound_incoming_ring" id="0x7f121076" />
+    <public type="string" name="sound_message" id="0x7f121077" />
+    <public type="string" name="sound_mute" id="0x7f121078" />
+    <public type="string" name="sound_outgoing_ring" id="0x7f121079" />
+    <public type="string" name="sound_ptt_activate" id="0x7f12107a" />
+    <public type="string" name="sound_ptt_deactivate" id="0x7f12107b" />
+    <public type="string" name="sound_stream_started" id="0x7f12107c" />
+    <public type="string" name="sound_stream_stopped" id="0x7f12107d" />
+    <public type="string" name="sound_undeafen" id="0x7f12107e" />
+    <public type="string" name="sound_unmute" id="0x7f12107f" />
+    <public type="string" name="sound_user_join" id="0x7f121080" />
+    <public type="string" name="sound_user_leave" id="0x7f121081" />
+    <public type="string" name="sound_user_moved" id="0x7f121082" />
+    <public type="string" name="sound_viewer_join" id="0x7f121083" />
+    <public type="string" name="sound_viewer_leave" id="0x7f121084" />
+    <public type="string" name="sound_voice_disconnected" id="0x7f121085" />
+    <public type="string" name="sounds" id="0x7f121086" />
+    <public type="string" name="speak" id="0x7f121087" />
+    <public type="string" name="spectators" id="0x7f121088" />
+    <public type="string" name="spectators_header" id="0x7f121089" />
+    <public type="string" name="spellcheck" id="0x7f12108a" />
+    <public type="string" name="spoiler" id="0x7f12108b" />
+    <public type="string" name="spoiler_hide" id="0x7f12108c" />
+    <public type="string" name="spoiler_mark_selected" id="0x7f12108d" />
+    <public type="string" name="spoiler_reveal" id="0x7f12108e" />
+    <public type="string" name="spotify_app_download" id="0x7f12108f" />
+    <public type="string" name="spotify_app_not_found" id="0x7f121090" />
+    <public type="string" name="spotify_app_not_opened" id="0x7f121091" />
+    <public type="string" name="spotify_connection_info_android" id="0x7f121092" />
+    <public type="string" name="spotify_listen_along_host" id="0x7f121093" />
+    <public type="string" name="spotify_listen_along_info" id="0x7f121094" />
+    <public type="string" name="spotify_listen_along_listener" id="0x7f121095" />
+    <public type="string" name="spotify_listen_along_listeners" id="0x7f121096" />
+    <public type="string" name="spotify_listen_along_listening_along_count" id="0x7f121097" />
+    <public type="string" name="spotify_listen_along_modal_title" id="0x7f121098" />
+    <public type="string" name="spotify_listen_along_song_by_artist" id="0x7f121099" />
+    <public type="string" name="spotify_listen_along_stop" id="0x7f12109a" />
+    <public type="string" name="spotify_listen_along_subtitle_listener" id="0x7f12109b" />
+    <public type="string" name="spotify_listen_along_title_host" id="0x7f12109c" />
+    <public type="string" name="spotify_listen_along_title_listener" id="0x7f12109d" />
+    <public type="string" name="spotify_premium_upgrade_body" id="0x7f12109e" />
+    <public type="string" name="spotify_premium_upgrade_button" id="0x7f12109f" />
+    <public type="string" name="spotify_premium_upgrade_header" id="0x7f1210a0" />
+    <public type="string" name="staff_badge_tooltip" id="0x7f1210a1" />
+    <public type="string" name="start" id="0x7f1210a2" />
+    <public type="string" name="start_audio_call" id="0x7f1210a3" />
+    <public type="string" name="start_call" id="0x7f1210a4" />
+    <public type="string" name="start_dm_label" id="0x7f1210a5" />
+    <public type="string" name="start_dm_placeholder" id="0x7f1210a6" />
+    <public type="string" name="start_video_call" id="0x7f1210a7" />
+    <public type="string" name="start_voice_call" id="0x7f1210a8" />
+    <public type="string" name="status_bar_notification_info_overflow" id="0x7f1210a9" />
+    <public type="string" name="status_dnd" id="0x7f1210aa" />
+    <public type="string" name="status_dnd_help" id="0x7f1210ab" />
+    <public type="string" name="status_idle" id="0x7f1210ac" />
+    <public type="string" name="status_invisible" id="0x7f1210ad" />
+    <public type="string" name="status_invisible_helper" id="0x7f1210ae" />
+    <public type="string" name="status_offline" id="0x7f1210af" />
+    <public type="string" name="status_online" id="0x7f1210b0" />
+    <public type="string" name="status_online_mobile" id="0x7f1210b1" />
+    <public type="string" name="status_page_url" id="0x7f1210b2" />
+    <public type="string" name="status_streaming" id="0x7f1210b3" />
+    <public type="string" name="status_unknown" id="0x7f1210b4" />
+    <public type="string" name="step_number" id="0x7f1210b5" />
+    <public type="string" name="still_indexing" id="0x7f1210b6" />
+    <public type="string" name="stop_ringing" id="0x7f1210b7" />
+    <public type="string" name="stop_streaming" id="0x7f1210b8" />
+    <public type="string" name="stop_watching" id="0x7f1210b9" />
+    <public type="string" name="storage_permission_denied_msg" id="0x7f1210ba" />
+    <public type="string" name="store_channel" id="0x7f1210bb" />
+    <public type="string" name="store_payment_legalese_monthly" id="0x7f1210bc" />
+    <public type="string" name="store_payment_legalese_yearly" id="0x7f1210bd" />
+    <public type="string" name="stream" id="0x7f1210be" />
+    <public type="string" name="stream_bad_spectator" id="0x7f1210bf" />
+    <public type="string" name="stream_bad_streamer" id="0x7f1210c0" />
+    <public type="string" name="stream_capture_paused" id="0x7f1210c1" />
+    <public type="string" name="stream_capture_paused_details" id="0x7f1210c2" />
+    <public type="string" name="stream_capture_paused_details_viewer" id="0x7f1210c3" />
+    <public type="string" name="stream_channel_description" id="0x7f1210c4" />
+    <public type="string" name="stream_description" id="0x7f1210c5" />
+    <public type="string" name="stream_ended" id="0x7f1210c6" />
+    <public type="string" name="stream_ended_button" id="0x7f1210c7" />
+    <public type="string" name="stream_ended_no_spectators" id="0x7f1210c8" />
+    <public type="string" name="stream_failed_description" id="0x7f1210c9" />
+    <public type="string" name="stream_failed_title" id="0x7f1210ca" />
+    <public type="string" name="stream_full_modal_body" id="0x7f1210cb" />
+    <public type="string" name="stream_full_modal_header" id="0x7f1210cc" />
+    <public type="string" name="stream_issue_modal_header" id="0x7f1210cd" />
+    <public type="string" name="stream_network_quality_error" id="0x7f1210ce" />
+    <public type="string" name="stream_no_preview" id="0x7f1210cf" />
+    <public type="string" name="stream_playing" id="0x7f1210d0" />
+    <public type="string" name="stream_preview_loading" id="0x7f1210d1" />
+    <public type="string" name="stream_preview_paused" id="0x7f1210d2" />
+    <public type="string" name="stream_preview_paused_subtext" id="0x7f1210d3" />
+    <public type="string" name="stream_quality_unlock" id="0x7f1210d4" />
+    <public type="string" name="stream_reconnecting_error" id="0x7f1210d5" />
+    <public type="string" name="stream_reconnecting_error_subtext" id="0x7f1210d6" />
+    <public type="string" name="stream_report_a_problem" id="0x7f1210d7" />
+    <public type="string" name="stream_report_a_problem_post_stream" id="0x7f1210d8" />
+    <public type="string" name="stream_report_audio_missing" id="0x7f1210d9" />
+    <public type="string" name="stream_report_audio_poor" id="0x7f1210da" />
+    <public type="string" name="stream_report_black" id="0x7f1210db" />
+    <public type="string" name="stream_report_blurry" id="0x7f1210dc" />
+    <public type="string" name="stream_report_ended_audio_missing" id="0x7f1210dd" />
+    <public type="string" name="stream_report_ended_audio_poor" id="0x7f1210de" />
+    <public type="string" name="stream_report_ended_black" id="0x7f1210df" />
+    <public type="string" name="stream_report_ended_blurry" id="0x7f1210e0" />
+    <public type="string" name="stream_report_ended_lagging" id="0x7f1210e1" />
+    <public type="string" name="stream_report_ended_out_of_sync" id="0x7f1210e2" />
+    <public type="string" name="stream_report_game_issue" id="0x7f1210e3" />
+    <public type="string" name="stream_report_label" id="0x7f1210e4" />
+    <public type="string" name="stream_report_lagging" id="0x7f1210e5" />
+    <public type="string" name="stream_report_no_issue" id="0x7f1210e6" />
+    <public type="string" name="stream_report_out_of_sync" id="0x7f1210e7" />
+    <public type="string" name="stream_report_placeholder" id="0x7f1210e8" />
+    <public type="string" name="stream_report_problem" id="0x7f1210e9" />
+    <public type="string" name="stream_report_problem_body" id="0x7f1210ea" />
+    <public type="string" name="stream_report_problem_header_mobile" id="0x7f1210eb" />
+    <public type="string" name="stream_report_problem_mobile" id="0x7f1210ec" />
+    <public type="string" name="stream_report_rating_body" id="0x7f1210ed" />
+    <public type="string" name="stream_report_rating_body_streamer" id="0x7f1210ee" />
+    <public type="string" name="stream_report_submit" id="0x7f1210ef" />
+    <public type="string" name="stream_reported" id="0x7f1210f0" />
+    <public type="string" name="stream_reported_body" id="0x7f1210f1" />
+    <public type="string" name="stream_soundshare_failed" id="0x7f1210f2" />
+    <public type="string" name="streamer_mode" id="0x7f1210f3" />
+    <public type="string" name="streamer_mode_enabled" id="0x7f1210f4" />
+    <public type="string" name="streamer_playing" id="0x7f1210f5" />
+    <public type="string" name="streamer_settings_title" id="0x7f1210f6" />
+    <public type="string" name="streaming" id="0x7f1210f7" />
+    <public type="string" name="streaming_a_game" id="0x7f1210f8" />
+    <public type="string" name="stripe_unable_to_load" id="0x7f1210f9" />
+    <public type="string" name="sub_enabled_servers" id="0x7f1210fa" />
+    <public type="string" name="subscriber_information" id="0x7f1210fb" />
+    <public type="string" name="suggestions" id="0x7f1210fc" />
+    <public type="string" name="support" id="0x7f1210fd" />
+    <public type="string" name="suppress_all_embeds" id="0x7f1210fe" />
+    <public type="string" name="suppressed" id="0x7f1210ff" />
+    <public type="string" name="suppressed_afk_body" id="0x7f121100" />
+    <public type="string" name="suppressed_afk_title" id="0x7f121101" />
+    <public type="string" name="suppressed_permission_body" id="0x7f121102" />
+    <public type="string" name="sv_se" id="0x7f121103" />
+    <public type="string" name="switch_audio_output" id="0x7f121104" />
+    <public type="string" name="switch_hardware_acceleration" id="0x7f121105" />
+    <public type="string" name="switch_hardware_acceleration_body" id="0x7f121106" />
+    <public type="string" name="switch_subsystem" id="0x7f121107" />
+    <public type="string" name="switch_subsystem_body" id="0x7f121108" />
+    <public type="string" name="switch_to_compact_mode" id="0x7f121109" />
+    <public type="string" name="switch_to_cozy_mode" id="0x7f12110a" />
+    <public type="string" name="switch_to_dark_theme" id="0x7f12110b" />
+    <public type="string" name="switch_to_light_theme" id="0x7f12110c" />
+    <public type="string" name="switch_to_push_to_talk" id="0x7f12110d" />
+    <public type="string" name="switch_to_voice_activity" id="0x7f12110e" />
+    <public type="string" name="sync" id="0x7f12110f" />
+    <public type="string" name="sync_across_clients_appearance_help" id="0x7f121110" />
+    <public type="string" name="sync_across_clients_text" id="0x7f121111" />
+    <public type="string" name="sync_across_clients_text_help" id="0x7f121112" />
+    <public type="string" name="sync_friends" id="0x7f121113" />
+    <public type="string" name="sync_now" id="0x7f121114" />
+    <public type="string" name="sync_permissions" id="0x7f121115" />
+    <public type="string" name="sync_permissions_explanation" id="0x7f121116" />
+    <public type="string" name="sync_revoked" id="0x7f121117" />
+    <public type="string" name="sync_this_account" id="0x7f121118" />
+    <public type="string" name="sync_with" id="0x7f121119" />
+    <public type="string" name="system_keyboard" id="0x7f12111a" />
+    <public type="string" name="system_message_call_missed" id="0x7f12111b" />
+    <public type="string" name="system_message_call_started" id="0x7f12111c" />
+    <public type="string" name="system_message_channel_follow_add" id="0x7f12111d" />
+    <public type="string" name="system_message_channel_icon_change" id="0x7f12111e" />
+    <public type="string" name="system_message_channel_name_change" id="0x7f12111f" />
+    <public type="string" name="system_message_guild_bot_join" id="0x7f121120" />
+    <public type="string" name="system_message_guild_member_join" id="0x7f121121" />
+    <public type="string" name="system_message_guild_member_join_01" id="0x7f121122" />
+    <public type="string" name="system_message_guild_member_join_02" id="0x7f121123" />
+    <public type="string" name="system_message_guild_member_join_03" id="0x7f121124" />
+    <public type="string" name="system_message_guild_member_join_04" id="0x7f121125" />
+    <public type="string" name="system_message_guild_member_join_05" id="0x7f121126" />
+    <public type="string" name="system_message_guild_member_join_06" id="0x7f121127" />
+    <public type="string" name="system_message_guild_member_join_07" id="0x7f121128" />
+    <public type="string" name="system_message_guild_member_join_08" id="0x7f121129" />
+    <public type="string" name="system_message_guild_member_join_09" id="0x7f12112a" />
+    <public type="string" name="system_message_guild_member_join_10" id="0x7f12112b" />
+    <public type="string" name="system_message_guild_member_join_11" id="0x7f12112c" />
+    <public type="string" name="system_message_guild_member_join_12" id="0x7f12112d" />
+    <public type="string" name="system_message_guild_member_join_13" id="0x7f12112e" />
+    <public type="string" name="system_message_guild_member_join_14" id="0x7f12112f" />
+    <public type="string" name="system_message_guild_member_join_15" id="0x7f121130" />
+    <public type="string" name="system_message_guild_member_join_16" id="0x7f121131" />
+    <public type="string" name="system_message_guild_member_join_17" id="0x7f121132" />
+    <public type="string" name="system_message_guild_member_join_18" id="0x7f121133" />
+    <public type="string" name="system_message_guild_member_join_19" id="0x7f121134" />
+    <public type="string" name="system_message_guild_member_join_20" id="0x7f121135" />
+    <public type="string" name="system_message_guild_member_join_21" id="0x7f121136" />
+    <public type="string" name="system_message_guild_member_join_22" id="0x7f121137" />
+    <public type="string" name="system_message_guild_member_join_23" id="0x7f121138" />
+    <public type="string" name="system_message_guild_member_join_24" id="0x7f121139" />
+    <public type="string" name="system_message_guild_member_join_25" id="0x7f12113a" />
+    <public type="string" name="system_message_guild_member_join_26" id="0x7f12113b" />
+    <public type="string" name="system_message_guild_member_join_27" id="0x7f12113c" />
+    <public type="string" name="system_message_guild_member_join_28" id="0x7f12113d" />
+    <public type="string" name="system_message_guild_member_join_29" id="0x7f12113e" />
+    <public type="string" name="system_message_guild_member_join_30" id="0x7f12113f" />
+    <public type="string" name="system_message_guild_member_join_31" id="0x7f121140" />
+    <public type="string" name="system_message_guild_member_join_32" id="0x7f121141" />
+    <public type="string" name="system_message_guild_member_join_33" id="0x7f121142" />
+    <public type="string" name="system_message_guild_member_join_34" id="0x7f121143" />
+    <public type="string" name="system_message_guild_member_join_35" id="0x7f121144" />
+    <public type="string" name="system_message_guild_member_join_36" id="0x7f121145" />
+    <public type="string" name="system_message_guild_member_join_37" id="0x7f121146" />
+    <public type="string" name="system_message_guild_member_join_38" id="0x7f121147" />
+    <public type="string" name="system_message_guild_member_subscribed" id="0x7f121148" />
+    <public type="string" name="system_message_guild_member_subscribed_achieved_tier" id="0x7f121149" />
+    <public type="string" name="system_message_join_call" id="0x7f12114a" />
+    <public type="string" name="system_message_pinned_message" id="0x7f12114b" />
+    <public type="string" name="system_message_pinned_message_mobile" id="0x7f12114c" />
+    <public type="string" name="system_message_pinned_message_no_cta" id="0x7f12114d" />
+    <public type="string" name="system_message_pinned_message_no_cta_formatted" id="0x7f12114e" />
+    <public type="string" name="system_message_recipient_add" id="0x7f12114f" />
+    <public type="string" name="system_message_recipient_remove" id="0x7f121150" />
+    <public type="string" name="system_message_recipient_remove_self" id="0x7f121151" />
+    <public type="string" name="system_permission_grant" id="0x7f121152" />
+    <public type="string" name="system_permission_request_camera" id="0x7f121153" />
+    <public type="string" name="system_permission_request_files" id="0x7f121154" />
+    <public type="string" name="tab_bar" id="0x7f121155" />
+    <public type="string" name="take_photo_or_video" id="0x7f121156" />
+    <public type="string" name="tan" id="0x7f121157" />
+    <public type="string" name="tap_add_nickname" id="0x7f121158" />
+    <public type="string" name="tar_gz" id="0x7f121159" />
+    <public type="string" name="teal" id="0x7f12115a" />
+    <public type="string" name="temporary_membership_explanation" id="0x7f12115b" />
+    <public type="string" name="terms_of_service" id="0x7f12115c" />
+    <public type="string" name="terms_of_service_url" id="0x7f12115d" />
+    <public type="string" name="terms_privacy" id="0x7f12115e" />
+    <public type="string" name="terms_privacy_opt_in" id="0x7f12115f" />
+    <public type="string" name="terms_privacy_opt_in_tooltip" id="0x7f121160" />
+    <public type="string" name="terracotta" id="0x7f121161" />
+    <public type="string" name="test_video" id="0x7f121162" />
+    <public type="string" name="text" id="0x7f121163" />
+    <public type="string" name="text_and_images" id="0x7f121164" />
+    <public type="string" name="text_channel" id="0x7f121165" />
+    <public type="string" name="text_channels" id="0x7f121166" />
+    <public type="string" name="text_channels_matching" id="0x7f121167" />
+    <public type="string" name="text_permissions" id="0x7f121168" />
+    <public type="string" name="textarea_placeholder" id="0x7f121169" />
+    <public type="string" name="th" id="0x7f12116a" />
+    <public type="string" name="theme" id="0x7f12116b" />
+    <public type="string" name="theme_dark" id="0x7f12116c" />
+    <public type="string" name="theme_light" id="0x7f12116d" />
+    <public type="string" name="theme_pure_evil_title" id="0x7f12116e" />
+    <public type="string" name="theme_pure_evil_updated" id="0x7f12116f" />
+    <public type="string" name="theme_updated" id="0x7f121170" />
+    <public type="string" name="this_server" id="0x7f121171" />
+    <public type="string" name="this_server_named" id="0x7f121172" />
+    <public type="string" name="three_users_typing" id="0x7f121173" />
+    <public type="string" name="timeout_error" id="0x7f121174" />
+    <public type="string" name="tip_create_first_server_body3" id="0x7f121175" />
+    <public type="string" name="tip_create_first_server_title3" id="0x7f121176" />
+    <public type="string" name="tip_create_more_servers_body3" id="0x7f121177" />
+    <public type="string" name="tip_create_more_servers_title3" id="0x7f121178" />
+    <public type="string" name="tip_direct_messages_body3" id="0x7f121179" />
+    <public type="string" name="tip_direct_messages_title3" id="0x7f12117a" />
+    <public type="string" name="tip_friends_list_body3" id="0x7f12117b" />
+    <public type="string" name="tip_friends_list_title3" id="0x7f12117c" />
+    <public type="string" name="tip_instant_invite_body3" id="0x7f12117d" />
+    <public type="string" name="tip_instant_invite_title3" id="0x7f12117e" />
+    <public type="string" name="tip_organize_by_topic_body3" id="0x7f12117f" />
+    <public type="string" name="tip_organize_by_topic_title3" id="0x7f121180" />
+    <public type="string" name="tip_server_settings_body3" id="0x7f121181" />
+    <public type="string" name="tip_server_settings_title3" id="0x7f121182" />
+    <public type="string" name="tip_voice_conversations_body3" id="0x7f121183" />
+    <public type="string" name="tip_voice_conversations_title3" id="0x7f121184" />
+    <public type="string" name="tip_whos_online_body3" id="0x7f121185" />
+    <public type="string" name="tip_whos_online_title3" id="0x7f121186" />
+    <public type="string" name="tip_writing_messages_body3" id="0x7f121187" />
+    <public type="string" name="tip_writing_messages_title3" id="0x7f121188" />
+    <public type="string" name="title" id="0x7f121189" />
+    <public type="string" name="toggle_camera" id="0x7f12118a" />
+    <public type="string" name="toggle_deafen" id="0x7f12118b" />
+    <public type="string" name="toggle_drawer" id="0x7f12118c" />
+    <public type="string" name="toggle_emoji_keyboard" id="0x7f12118d" />
+    <public type="string" name="toggle_microphone" id="0x7f12118e" />
+    <public type="string" name="toggle_mute" id="0x7f12118f" />
+    <public type="string" name="too_many_animated_emoji" id="0x7f121190" />
+    <public type="string" name="too_many_emoji" id="0x7f121191" />
+    <public type="string" name="too_many_reactions_alert_body" id="0x7f121192" />
+    <public type="string" name="too_many_reactions_alert_header" id="0x7f121193" />
+    <public type="string" name="total_members" id="0x7f121194" />
+    <public type="string" name="total_results" id="0x7f121195" />
+    <public type="string" name="tr" id="0x7f121196" />
+    <public type="string" name="transfer" id="0x7f121197" />
+    <public type="string" name="transfer_ownership" id="0x7f121198" />
+    <public type="string" name="transfer_ownership_acknowledge" id="0x7f121199" />
+    <public type="string" name="transfer_ownership_to_user" id="0x7f12119a" />
+    <public type="string" name="trending_arrow_down" id="0x7f12119b" />
+    <public type="string" name="trending_arrow_up" id="0x7f12119c" />
+    <public type="string" name="try_again" id="0x7f12119d" />
+    <public type="string" name="tts_alls" id="0x7f12119e" />
+    <public type="string" name="tts_current" id="0x7f12119f" />
+    <public type="string" name="tts_never" id="0x7f1211a0" />
+    <public type="string" name="tutorial_close" id="0x7f1211a1" />
+    <public type="string" name="tweet_us" id="0x7f1211a2" />
+    <public type="string" name="twitter" id="0x7f1211a3" />
+    <public type="string" name="twitter_page_url" id="0x7f1211a4" />
+    <public type="string" name="two_fa" id="0x7f1211a5" />
+    <public type="string" name="two_fa_activate" id="0x7f1211a6" />
+    <public type="string" name="two_fa_app_name_authy" id="0x7f1211a7" />
+    <public type="string" name="two_fa_app_name_google_authenticator" id="0x7f1211a8" />
+    <public type="string" name="two_fa_auth_code" id="0x7f1211a9" />
+    <public type="string" name="two_fa_backup_code_enter" id="0x7f1211aa" />
+    <public type="string" name="two_fa_backup_code_enter_wrong" id="0x7f1211ab" />
+    <public type="string" name="two_fa_backup_code_hint" id="0x7f1211ac" />
+    <public type="string" name="two_fa_backup_code_used" id="0x7f1211ad" />
+    <public type="string" name="two_fa_backup_codes_body" id="0x7f1211ae" />
+    <public type="string" name="two_fa_backup_codes_label" id="0x7f1211af" />
+    <public type="string" name="two_fa_backup_codes_sales_pitch" id="0x7f1211b0" />
+    <public type="string" name="two_fa_change_account" id="0x7f1211b1" />
+    <public type="string" name="two_fa_code" id="0x7f1211b2" />
+    <public type="string" name="two_fa_disable" id="0x7f1211b3" />
+    <public type="string" name="two_fa_discord_backup_codes" id="0x7f1211b4" />
+    <public type="string" name="two_fa_download_app_body" id="0x7f1211b5" />
+    <public type="string" name="two_fa_download_app_label" id="0x7f1211b6" />
+    <public type="string" name="two_fa_download_codes" id="0x7f1211b7" />
+    <public type="string" name="two_fa_enable" id="0x7f1211b8" />
+    <public type="string" name="two_fa_enable_subheader" id="0x7f1211b9" />
+    <public type="string" name="two_fa_enabled" id="0x7f1211ba" />
+    <public type="string" name="two_fa_enter_sms_token_label" id="0x7f1211bb" />
+    <public type="string" name="two_fa_enter_sms_token_sending" id="0x7f1211bc" />
+    <public type="string" name="two_fa_enter_sms_token_sent" id="0x7f1211bd" />
+    <public type="string" name="two_fa_enter_token_body" id="0x7f1211be" />
+    <public type="string" name="two_fa_enter_token_label" id="0x7f1211bf" />
+    <public type="string" name="two_fa_generate_codes" id="0x7f1211c0" />
+    <public type="string" name="two_fa_generate_codes_confirm_text" id="0x7f1211c1" />
+    <public type="string" name="two_fa_guild_mfa_warning" id="0x7f1211c2" />
+    <public type="string" name="two_fa_guild_mfa_warning_ios" id="0x7f1211c3" />
+    <public type="string" name="two_fa_guild_mfa_warning_message" id="0x7f1211c4" />
+    <public type="string" name="two_fa_guild_mfa_warning_resolve_button" id="0x7f1211c5" />
+    <public type="string" name="two_fa_ios_delete" id="0x7f1211c6" />
+    <public type="string" name="two_fa_key" id="0x7f1211c7" />
+    <public type="string" name="two_fa_login_body" id="0x7f1211c8" />
+    <public type="string" name="two_fa_login_footer" id="0x7f1211c9" />
+    <public type="string" name="two_fa_login_label" id="0x7f1211ca" />
+    <public type="string" name="two_fa_modal_setup_header_mobile" id="0x7f1211cb" />
+    <public type="string" name="two_fa_not_verified" id="0x7f1211cc" />
+    <public type="string" name="two_fa_qr_body" id="0x7f1211cd" />
+    <public type="string" name="two_fa_qr_label" id="0x7f1211ce" />
+    <public type="string" name="two_fa_remove" id="0x7f1211cf" />
+    <public type="string" name="two_fa_sales_pitch" id="0x7f1211d0" />
+    <public type="string" name="two_fa_success_body" id="0x7f1211d1" />
+    <public type="string" name="two_fa_success_body_mobile" id="0x7f1211d2" />
+    <public type="string" name="two_fa_success_header" id="0x7f1211d3" />
+    <public type="string" name="two_fa_token_required" id="0x7f1211d4" />
+    <public type="string" name="two_fa_use_desktop_app" id="0x7f1211d5" />
+    <public type="string" name="two_fa_view_backup_codes" id="0x7f1211d6" />
+    <public type="string" name="two_fa_view_codes" id="0x7f1211d7" />
+    <public type="string" name="two_users_typing" id="0x7f1211d8" />
+    <public type="string" name="ucrop_error_input_data_is_absent" id="0x7f1211d9" />
+    <public type="string" name="ucrop_label_edit_photo" id="0x7f1211da" />
+    <public type="string" name="ucrop_label_original" id="0x7f1211db" />
+    <public type="string" name="ucrop_menu_crop" id="0x7f1211dc" />
+    <public type="string" name="ucrop_mutate_exception_hint" id="0x7f1211dd" />
+    <public type="string" name="uk" id="0x7f1211de" />
+    <public type="string" name="unable_to_join_channel_full" id="0x7f1211df" />
+    <public type="string" name="unable_to_join_voice_unsupported_mobile" id="0x7f1211e0" />
+    <public type="string" name="unable_to_open_media_chooser" id="0x7f1211e1" />
+    <public type="string" name="unban" id="0x7f1211e2" />
+    <public type="string" name="unban_user_body" id="0x7f1211e3" />
+    <public type="string" name="unban_user_title" id="0x7f1211e4" />
+    <public type="string" name="unblock" id="0x7f1211e5" />
+    <public type="string" name="unblock_to_jump_body" id="0x7f1211e6" />
+    <public type="string" name="unblock_to_jump_title" id="0x7f1211e7" />
+    <public type="string" name="uncategorized" id="0x7f1211e8" />
+    <public type="string" name="unclaimed_account_body" id="0x7f1211e9" />
+    <public type="string" name="unclaimed_account_title" id="0x7f1211ea" />
+    <public type="string" name="undeafen" id="0x7f1211eb" />
+    <public type="string" name="unfocus_participant" id="0x7f1211ec" />
+    <public type="string" name="unhandled_link_body" id="0x7f1211ed" />
+    <public type="string" name="unhandled_link_title" id="0x7f1211ee" />
+    <public type="string" name="unified_open_install" id="0x7f1211ef" />
+    <public type="string" name="unknown_game" id="0x7f1211f0" />
+    <public type="string" name="unknown_region" id="0x7f1211f1" />
+    <public type="string" name="unknown_server" id="0x7f1211f2" />
+    <public type="string" name="unknown_user" id="0x7f1211f3" />
+    <public type="string" name="unmute" id="0x7f1211f4" />
+    <public type="string" name="unmute_category" id="0x7f1211f5" />
+    <public type="string" name="unnamed" id="0x7f1211f6" />
+    <public type="string" name="unpin" id="0x7f1211f7" />
+    <public type="string" name="unpin_confirm" id="0x7f1211f8" />
+    <public type="string" name="unpin_message" id="0x7f1211f9" />
+    <public type="string" name="unpin_message_body" id="0x7f1211fa" />
+    <public type="string" name="unpin_message_context_menu_hint" id="0x7f1211fb" />
+    <public type="string" name="unpin_message_failed_body" id="0x7f1211fc" />
+    <public type="string" name="unpin_message_failed_title" id="0x7f1211fd" />
+    <public type="string" name="unpin_message_title" id="0x7f1211fe" />
+    <public type="string" name="unread_channels" id="0x7f1211ff" />
+    <public type="string" name="unreads_count" id="0x7f121200" />
+    <public type="string" name="unsupported_browser" id="0x7f121201" />
+    <public type="string" name="unsupported_browser_body" id="0x7f121202" />
+    <public type="string" name="unsupported_browser_details" id="0x7f121203" />
+    <public type="string" name="unsupported_browser_title" id="0x7f121204" />
+    <public type="string" name="unverified_account_body" id="0x7f121205" />
+    <public type="string" name="unverified_account_title" id="0x7f121206" />
+    <public type="string" name="update_available" id="0x7f121207" />
+    <public type="string" name="update_downloaded" id="0x7f121208" />
+    <public type="string" name="update_manually" id="0x7f121209" />
+    <public type="string" name="upgrade_plan" id="0x7f12120a" />
+    <public type="string" name="upgrade_yearly" id="0x7f12120b" />
+    <public type="string" name="upload" id="0x7f12120c" />
+    <public type="string" name="upload_a_media_file" id="0x7f12120d" />
+    <public type="string" name="upload_area_cancel_all" id="0x7f12120e" />
+    <public type="string" name="upload_area_help" id="0x7f12120f" />
+    <public type="string" name="upload_area_invalid_file_type_help" id="0x7f121210" />
+    <public type="string" name="upload_area_invalid_file_type_title" id="0x7f121211" />
+    <public type="string" name="upload_area_leave_a_comment" id="0x7f121212" />
+    <public type="string" name="upload_area_optional" id="0x7f121213" />
+    <public type="string" name="upload_area_title" id="0x7f121214" />
+    <public type="string" name="upload_area_title_no_confirmation" id="0x7f121215" />
+    <public type="string" name="upload_area_too_large_help" id="0x7f121216" />
+    <public type="string" name="upload_area_too_large_title" id="0x7f121217" />
+    <public type="string" name="upload_area_upload_failed_help" id="0x7f121218" />
+    <public type="string" name="upload_area_upload_failed_title" id="0x7f121219" />
+    <public type="string" name="upload_background" id="0x7f12121a" />
+    <public type="string" name="upload_emoji" id="0x7f12121b" />
+    <public type="string" name="upload_image" id="0x7f12121c" />
+    <public type="string" name="upload_image_body" id="0x7f12121d" />
+    <public type="string" name="upload_load_file_failed" id="0x7f12121e" />
+    <public type="string" name="upload_open_file_failed" id="0x7f12121f" />
+    <public type="string" name="upload_process_file_failed" id="0x7f121220" />
+    <public type="string" name="upload_queued" id="0x7f121221" />
+    <public type="string" name="upload_uploads_too_large_help" id="0x7f121222" />
+    <public type="string" name="upload_uploads_too_large_title" id="0x7f121223" />
+    <public type="string" name="uploaded_by" id="0x7f121224" />
+    <public type="string" name="uploading_files" id="0x7f121225" />
+    <public type="string" name="usage_access" id="0x7f121226" />
+    <public type="string" name="usage_statistics_disable_modal_body" id="0x7f121227" />
+    <public type="string" name="usage_statistics_disable_modal_cancel" id="0x7f121228" />
+    <public type="string" name="usage_statistics_disable_modal_confirm" id="0x7f121229" />
+    <public type="string" name="usage_statistics_disable_modal_title" id="0x7f12122a" />
+    <public type="string" name="use_external_emojis" id="0x7f12122b" />
+    <public type="string" name="use_external_emojis_description" id="0x7f12122c" />
+    <public type="string" name="use_speaker" id="0x7f12122d" />
+    <public type="string" name="use_vad" id="0x7f12122e" />
+    <public type="string" name="use_vad_description" id="0x7f12122f" />
+    <public type="string" name="user_activity_accept_invite" id="0x7f121230" />
+    <public type="string" name="user_activity_action_ask_to_join" id="0x7f121231" />
+    <public type="string" name="user_activity_action_ask_to_join_user" id="0x7f121232" />
+    <public type="string" name="user_activity_action_download_app" id="0x7f121233" />
+    <public type="string" name="user_activity_action_failed_to_launch" id="0x7f121234" />
+    <public type="string" name="user_activity_action_notify_me" id="0x7f121235" />
+    <public type="string" name="user_activity_action_spectate" id="0x7f121236" />
+    <public type="string" name="user_activity_action_spectate_user" id="0x7f121237" />
+    <public type="string" name="user_activity_already_playing" id="0x7f121238" />
+    <public type="string" name="user_activity_already_syncing" id="0x7f121239" />
+    <public type="string" name="user_activity_cannot_join_self" id="0x7f12123a" />
+    <public type="string" name="user_activity_cannot_play_self" id="0x7f12123b" />
+    <public type="string" name="user_activity_cannot_spectate_self" id="0x7f12123c" />
+    <public type="string" name="user_activity_cannot_sync_self" id="0x7f12123d" />
+    <public type="string" name="user_activity_chat_invite_education" id="0x7f12123e" />
+    <public type="string" name="user_activity_connect_platform" id="0x7f12123f" />
+    <public type="string" name="user_activity_error_desktop_action" id="0x7f121240" />
+    <public type="string" name="user_activity_error_desktop_body" id="0x7f121241" />
+    <public type="string" name="user_activity_error_desktop_title" id="0x7f121242" />
+    <public type="string" name="user_activity_error_friends_action" id="0x7f121243" />
+    <public type="string" name="user_activity_error_friends_body" id="0x7f121244" />
+    <public type="string" name="user_activity_error_friends_title" id="0x7f121245" />
+    <public type="string" name="user_activity_header_listening" id="0x7f121246" />
+    <public type="string" name="user_activity_header_live_on_platform" id="0x7f121247" />
+    <public type="string" name="user_activity_header_playing" id="0x7f121248" />
+    <public type="string" name="user_activity_header_playing_on_platform" id="0x7f121249" />
+    <public type="string" name="user_activity_header_streaming_to_server" id="0x7f12124a" />
+    <public type="string" name="user_activity_header_watching" id="0x7f12124b" />
+    <public type="string" name="user_activity_invite_request_expired" id="0x7f12124c" />
+    <public type="string" name="user_activity_invite_request_received" id="0x7f12124d" />
+    <public type="string" name="user_activity_invite_request_requested" id="0x7f12124e" />
+    <public type="string" name="user_activity_invite_request_sent" id="0x7f12124f" />
+    <public type="string" name="user_activity_invite_request_waiting" id="0x7f121250" />
+    <public type="string" name="user_activity_invite_to_join" id="0x7f121251" />
+    <public type="string" name="user_activity_listen_along" id="0x7f121252" />
+    <public type="string" name="user_activity_listen_along_description" id="0x7f121253" />
+    <public type="string" name="user_activity_listening_album" id="0x7f121254" />
+    <public type="string" name="user_activity_listening_artists" id="0x7f121255" />
+    <public type="string" name="user_activity_never_mind" id="0x7f121256" />
+    <public type="string" name="user_activity_not_detected" id="0x7f121257" />
+    <public type="string" name="user_activity_play_on_platform" id="0x7f121258" />
+    <public type="string" name="user_activity_respond_nope" id="0x7f121259" />
+    <public type="string" name="user_activity_respond_yeah" id="0x7f12125a" />
+    <public type="string" name="user_activity_state_size" id="0x7f12125b" />
+    <public type="string" name="user_activity_timestamp_end" id="0x7f12125c" />
+    <public type="string" name="user_activity_timestamp_end_simple" id="0x7f12125d" />
+    <public type="string" name="user_activity_timestamp_start" id="0x7f12125e" />
+    <public type="string" name="user_activity_timestamp_start_simple" id="0x7f12125f" />
+    <public type="string" name="user_activity_user_playing_for_days" id="0x7f121260" />
+    <public type="string" name="user_activity_user_playing_for_hours" id="0x7f121261" />
+    <public type="string" name="user_activity_user_playing_for_minutes" id="0x7f121262" />
+    <public type="string" name="user_activity_voice_channel" id="0x7f121263" />
+    <public type="string" name="user_activity_watch_along" id="0x7f121264" />
+    <public type="string" name="user_dm_settings" id="0x7f121265" />
+    <public type="string" name="user_dm_settings_help" id="0x7f121266" />
+    <public type="string" name="user_dm_settings_question" id="0x7f121267" />
+    <public type="string" name="user_explicit_content_filter" id="0x7f121268" />
+    <public type="string" name="user_explicit_content_filter_disabled" id="0x7f121269" />
+    <public type="string" name="user_explicit_content_filter_disabled_help" id="0x7f12126a" />
+    <public type="string" name="user_explicit_content_filter_friends_and_non_friends" id="0x7f12126b" />
+    <public type="string" name="user_explicit_content_filter_friends_and_non_friends_help" id="0x7f12126c" />
+    <public type="string" name="user_explicit_content_filter_help" id="0x7f12126d" />
+    <public type="string" name="user_explicit_content_filter_non_friends" id="0x7f12126e" />
+    <public type="string" name="user_explicit_content_filter_non_friends_help" id="0x7f12126f" />
+    <public type="string" name="user_has_been_blocked" id="0x7f121270" />
+    <public type="string" name="user_has_been_unblocked" id="0x7f121271" />
+    <public type="string" name="user_info" id="0x7f121272" />
+    <public type="string" name="user_management" id="0x7f121273" />
+    <public type="string" name="user_popout_message" id="0x7f121274" />
+    <public type="string" name="user_popout_settings" id="0x7f121275" />
+    <public type="string" name="user_popout_wumpus_tooltip" id="0x7f121276" />
+    <public type="string" name="user_profile_add_friend" id="0x7f121277" />
+    <public type="string" name="user_profile_audio" id="0x7f121278" />
+    <public type="string" name="user_profile_guild_name_content_description" id="0x7f121279" />
+    <public type="string" name="user_profile_incoming_friend_request_dialog_body" id="0x7f12127a" />
+    <public type="string" name="user_profile_message" id="0x7f12127b" />
+    <public type="string" name="user_profile_pending" id="0x7f12127c" />
+    <public type="string" name="user_profile_video" id="0x7f12127d" />
+    <public type="string" name="user_settings" id="0x7f12127e" />
+    <public type="string" name="user_settings_account_management" id="0x7f12127f" />
+    <public type="string" name="user_settings_activity_feed" id="0x7f121280" />
+    <public type="string" name="user_settings_af_applications_empty_body" id="0x7f121281" />
+    <public type="string" name="user_settings_af_applications_empty_title" id="0x7f121282" />
+    <public type="string" name="user_settings_af_blocked_users" id="0x7f121283" />
+    <public type="string" name="user_settings_af_blocked_users_description" id="0x7f121284" />
+    <public type="string" name="user_settings_af_following_applications" id="0x7f121285" />
+    <public type="string" name="user_settings_af_following_applications_description" id="0x7f121286" />
+    <public type="string" name="user_settings_af_hidden_empty" id="0x7f121287" />
+    <public type="string" name="user_settings_af_search_cta" id="0x7f121288" />
+    <public type="string" name="user_settings_af_search_placeholder" id="0x7f121289" />
+    <public type="string" name="user_settings_af_unblock" id="0x7f12128a" />
+    <public type="string" name="user_settings_af_unfollow" id="0x7f12128b" />
+    <public type="string" name="user_settings_appearance_colorblind_mode_description" id="0x7f12128c" />
+    <public type="string" name="user_settings_appearance_colorblind_mode_title" id="0x7f12128d" />
+    <public type="string" name="user_settings_appearance_colors" id="0x7f12128e" />
+    <public type="string" name="user_settings_appearance_preview_message_1" id="0x7f12128f" />
+    <public type="string" name="user_settings_appearance_preview_message_2_dark" id="0x7f121290" />
+    <public type="string" name="user_settings_appearance_preview_message_2_light" id="0x7f121291" />
+    <public type="string" name="user_settings_appearance_preview_message_3" id="0x7f121292" />
+    <public type="string" name="user_settings_appearance_preview_message_4" id="0x7f121293" />
+    <public type="string" name="user_settings_appearance_preview_message_5" id="0x7f121294" />
+    <public type="string" name="user_settings_appearance_zoom_tip" id="0x7f121295" />
+    <public type="string" name="user_settings_apperannce_disable_games_tab" id="0x7f121296" />
+    <public type="string" name="user_settings_apperannce_disable_games_tab_note" id="0x7f121297" />
+    <public type="string" name="user_settings_available_codes" id="0x7f121298" />
+    <public type="string" name="user_settings_blocked_users" id="0x7f121299" />
+    <public type="string" name="user_settings_blocked_users_empty" id="0x7f12129a" />
+    <public type="string" name="user_settings_blocked_users_header" id="0x7f12129b" />
+    <public type="string" name="user_settings_blocked_users_unblockbutton" id="0x7f12129c" />
+    <public type="string" name="user_settings_close_button" id="0x7f12129d" />
+    <public type="string" name="user_settings_confirm_logout" id="0x7f12129e" />
+    <public type="string" name="user_settings_edit_account" id="0x7f12129f" />
+    <public type="string" name="user_settings_edit_account_password_label" id="0x7f1212a0" />
+    <public type="string" name="user_settings_edit_account_tag" id="0x7f1212a1" />
+    <public type="string" name="user_settings_enter_password_view_codes" id="0x7f1212a2" />
+    <public type="string" name="user_settings_game_activity" id="0x7f1212a3" />
+    <public type="string" name="user_settings_game_library" id="0x7f1212a4" />
+    <public type="string" name="user_settings_games_install_location" id="0x7f1212a5" />
+    <public type="string" name="user_settings_games_install_location_add" id="0x7f1212a6" />
+    <public type="string" name="user_settings_games_install_location_make_default" id="0x7f1212a7" />
+    <public type="string" name="user_settings_games_install_location_name" id="0x7f1212a8" />
+    <public type="string" name="user_settings_games_install_location_remove" id="0x7f1212a9" />
+    <public type="string" name="user_settings_games_install_location_space" id="0x7f1212aa" />
+    <public type="string" name="user_settings_games_install_locations" id="0x7f1212ab" />
+    <public type="string" name="user_settings_games_remove_location_body" id="0x7f1212ac" />
+    <public type="string" name="user_settings_games_shortcuts" id="0x7f1212ad" />
+    <public type="string" name="user_settings_games_shortcuts_desktop" id="0x7f1212ae" />
+    <public type="string" name="user_settings_games_shortcuts_desktop_note" id="0x7f1212af" />
+    <public type="string" name="user_settings_games_shortcuts_start_menu" id="0x7f1212b0" />
+    <public type="string" name="user_settings_games_shortcuts_start_menu_note" id="0x7f1212b1" />
+    <public type="string" name="user_settings_hypesquad" id="0x7f1212b2" />
+    <public type="string" name="user_settings_keybinds_action" id="0x7f1212b3" />
+    <public type="string" name="user_settings_keybinds_keybind" id="0x7f1212b4" />
+    <public type="string" name="user_settings_linux_settings" id="0x7f1212b5" />
+    <public type="string" name="user_settings_mfa_enable_code_body" id="0x7f1212b6" />
+    <public type="string" name="user_settings_mfa_enable_code_label" id="0x7f1212b7" />
+    <public type="string" name="user_settings_mfa_enabled" id="0x7f1212b8" />
+    <public type="string" name="user_settings_mfa_removed" id="0x7f1212b9" />
+    <public type="string" name="user_settings_minimize_to_tray_body" id="0x7f1212ba" />
+    <public type="string" name="user_settings_minimize_to_tray_label" id="0x7f1212bb" />
+    <public type="string" name="user_settings_my_account" id="0x7f1212bc" />
+    <public type="string" name="user_settings_notifications_show_badge_body" id="0x7f1212bd" />
+    <public type="string" name="user_settings_notifications_show_badge_label" id="0x7f1212be" />
+    <public type="string" name="user_settings_notifications_show_flash_body" id="0x7f1212bf" />
+    <public type="string" name="user_settings_notifications_show_flash_label" id="0x7f1212c0" />
+    <public type="string" name="user_settings_open_on_startup_body" id="0x7f1212c1" />
+    <public type="string" name="user_settings_open_on_startup_label" id="0x7f1212c2" />
+    <public type="string" name="user_settings_privacy_terms" id="0x7f1212c3" />
+    <public type="string" name="user_settings_restart_app_mobile" id="0x7f1212c4" />
+    <public type="string" name="user_settings_save" id="0x7f1212c5" />
+    <public type="string" name="user_settings_start_minimized_body" id="0x7f1212c6" />
+    <public type="string" name="user_settings_start_minimized_label" id="0x7f1212c7" />
+    <public type="string" name="user_settings_startup_behavior" id="0x7f1212c8" />
+    <public type="string" name="user_settings_streamer_notice_body" id="0x7f1212c9" />
+    <public type="string" name="user_settings_streamer_notice_title" id="0x7f1212ca" />
+    <public type="string" name="user_settings_unverified_account_body" id="0x7f1212cb" />
+    <public type="string" name="user_settings_used_backup_codes" id="0x7f1212cc" />
+    <public type="string" name="user_settings_voice_add_multiple" id="0x7f1212cd" />
+    <public type="string" name="user_settings_voice_codec_description" id="0x7f1212ce" />
+    <public type="string" name="user_settings_voice_codec_title" id="0x7f1212cf" />
+    <public type="string" name="user_settings_voice_mic_test_button_active" id="0x7f1212d0" />
+    <public type="string" name="user_settings_voice_mic_test_button_inactive" id="0x7f1212d1" />
+    <public type="string" name="user_settings_voice_mic_test_description" id="0x7f1212d2" />
+    <public type="string" name="user_settings_voice_mic_test_title" id="0x7f1212d3" />
+    <public type="string" name="user_settings_voice_mic_test_voice_caption" id="0x7f1212d4" />
+    <public type="string" name="user_settings_voice_mic_test_voice_channel_warning" id="0x7f1212d5" />
+    <public type="string" name="user_settings_voice_mic_test_voice_no_input_notice" id="0x7f1212d6" />
+    <public type="string" name="user_settings_voice_open_h264" id="0x7f1212d7" />
+    <public type="string" name="user_settings_voice_video_codec_title" id="0x7f1212d8" />
+    <public type="string" name="user_settings_voice_video_hook_label" id="0x7f1212d9" />
+    <public type="string" name="user_settings_windows_settings" id="0x7f1212da" />
+    <public type="string" name="user_settings_with_build_override" id="0x7f1212db" />
+    <public type="string" name="user_volume" id="0x7f1212dc" />
+    <public type="string" name="username" id="0x7f1212dd" />
+    <public type="string" name="username_live" id="0x7f1212de" />
+    <public type="string" name="username_required" id="0x7f1212df" />
+    <public type="string" name="users" id="0x7f1212e0" />
+    <public type="string" name="vad_permission_body" id="0x7f1212e1" />
+    <public type="string" name="vad_permission_small" id="0x7f1212e2" />
+    <public type="string" name="vad_permission_title" id="0x7f1212e3" />
+    <public type="string" name="vanity_url" id="0x7f1212e4" />
+    <public type="string" name="vanity_url_help" id="0x7f1212e5" />
+    <public type="string" name="vanity_url_help_conflict" id="0x7f1212e6" />
+    <public type="string" name="vanity_url_help_extended" id="0x7f1212e7" />
+    <public type="string" name="vanity_url_help_extended_link" id="0x7f1212e8" />
+    <public type="string" name="vanity_url_hint_mobile" id="0x7f1212e9" />
+    <public type="string" name="verfication_expired" id="0x7f1212ea" />
+    <public type="string" name="verfication_expired_suggestion" id="0x7f1212eb" />
+    <public type="string" name="verification_body" id="0x7f1212ec" />
+    <public type="string" name="verification_body_alt" id="0x7f1212ed" />
+    <public type="string" name="verification_email_body" id="0x7f1212ee" />
+    <public type="string" name="verification_email_error_body" id="0x7f1212ef" />
+    <public type="string" name="verification_email_error_title" id="0x7f1212f0" />
+    <public type="string" name="verification_email_title" id="0x7f1212f1" />
+    <public type="string" name="verification_footer" id="0x7f1212f2" />
+    <public type="string" name="verification_footer_logout" id="0x7f1212f3" />
+    <public type="string" name="verification_footer_support" id="0x7f1212f4" />
+    <public type="string" name="verification_level_high_criteria" id="0x7f1212f5" />
+    <public type="string" name="verification_level_low" id="0x7f1212f6" />
+    <public type="string" name="verification_level_low_criteria" id="0x7f1212f7" />
+    <public type="string" name="verification_level_medium" id="0x7f1212f8" />
+    <public type="string" name="verification_level_medium_criteria" id="0x7f1212f9" />
+    <public type="string" name="verification_level_none" id="0x7f1212fa" />
+    <public type="string" name="verification_level_none_criteria" id="0x7f1212fb" />
+    <public type="string" name="verification_level_very_high_criteria" id="0x7f1212fc" />
+    <public type="string" name="verification_open_discord" id="0x7f1212fd" />
+    <public type="string" name="verification_phone_description" id="0x7f1212fe" />
+    <public type="string" name="verification_phone_title" id="0x7f1212ff" />
+    <public type="string" name="verification_title" id="0x7f121300" />
+    <public type="string" name="verification_verified" id="0x7f121301" />
+    <public type="string" name="verification_verifying" id="0x7f121302" />
+    <public type="string" name="verify" id="0x7f121303" />
+    <public type="string" name="verify_account" id="0x7f121304" />
+    <public type="string" name="verify_by" id="0x7f121305" />
+    <public type="string" name="verify_by_email" id="0x7f121306" />
+    <public type="string" name="verify_by_email_formatted" id="0x7f121307" />
+    <public type="string" name="verify_by_phone" id="0x7f121308" />
+    <public type="string" name="verify_by_phone_formatted" id="0x7f121309" />
+    <public type="string" name="verify_by_recaptcha" id="0x7f12130a" />
+    <public type="string" name="verify_by_recaptcha_description" id="0x7f12130b" />
+    <public type="string" name="verify_email_body" id="0x7f12130c" />
+    <public type="string" name="verify_email_body_resent" id="0x7f12130d" />
+    <public type="string" name="verify_phone" id="0x7f12130e" />
+    <public type="string" name="verifying" id="0x7f12130f" />
+    <public type="string" name="very_out_of_date_description" id="0x7f121310" />
+    <public type="string" name="vi" id="0x7f121311" />
+    <public type="string" name="video" id="0x7f121312" />
+    <public type="string" name="video_call" id="0x7f121313" />
+    <public type="string" name="video_connect" id="0x7f121314" />
+    <public type="string" name="video_poor_connection_body" id="0x7f121315" />
+    <public type="string" name="video_poor_connection_title" id="0x7f121316" />
+    <public type="string" name="video_preview" id="0x7f121317" />
+    <public type="string" name="video_settings" id="0x7f121318" />
+    <public type="string" name="video_unavailable" id="0x7f121319" />
+    <public type="string" name="video_unsupported_browser_body" id="0x7f12131a" />
+    <public type="string" name="video_unsupported_browser_title" id="0x7f12131b" />
+    <public type="string" name="view_and_join_listings" id="0x7f12131c" />
+    <public type="string" name="view_audit_log" id="0x7f12131d" />
+    <public type="string" name="view_audit_log_description" id="0x7f12131e" />
+    <public type="string" name="view_channel" id="0x7f12131f" />
+    <public type="string" name="view_embed" id="0x7f121320" />
+    <public type="string" name="view_guild_analytics" id="0x7f121321" />
+    <public type="string" name="view_guild_analytics_description" id="0x7f121322" />
+    <public type="string" name="view_profile" id="0x7f121323" />
+    <public type="string" name="view_spectators" id="0x7f121324" />
+    <public type="string" name="view_surrounding_messages" id="0x7f121325" />
+    <public type="string" name="voice" id="0x7f121326" />
+    <public type="string" name="voice_and_video" id="0x7f121327" />
+    <public type="string" name="voice_call" id="0x7f121328" />
+    <public type="string" name="voice_channel" id="0x7f121329" />
+    <public type="string" name="voice_channel_empty" id="0x7f12132a" />
+    <public type="string" name="voice_channel_hide_names" id="0x7f12132b" />
+    <public type="string" name="voice_channel_locked" id="0x7f12132c" />
+    <public type="string" name="voice_channel_show_names" id="0x7f12132d" />
+    <public type="string" name="voice_channels" id="0x7f12132e" />
+    <public type="string" name="voice_connect" id="0x7f12132f" />
+    <public type="string" name="voice_disconnect_body" id="0x7f121330" />
+    <public type="string" name="voice_disconnect_title" id="0x7f121331" />
+    <public type="string" name="voice_only" id="0x7f121332" />
+    <public type="string" name="voice_permissions" id="0x7f121333" />
+    <public type="string" name="voice_settings" id="0x7f121334" />
+    <public type="string" name="voice_status_connecting" id="0x7f121335" />
+    <public type="string" name="voice_status_not_connected" id="0x7f121336" />
+    <public type="string" name="voice_status_not_connected_mobile" id="0x7f121337" />
+    <public type="string" name="voice_status_ringing" id="0x7f121338" />
+    <public type="string" name="voice_unavailable" id="0x7f121339" />
+    <public type="string" name="watch" id="0x7f12133a" />
+    <public type="string" name="watch_stream" id="0x7f12133b" />
+    <public type="string" name="watch_stream_in_app" id="0x7f12133c" />
+    <public type="string" name="watch_stream_streaming" id="0x7f12133d" />
+    <public type="string" name="watch_stream_tip" id="0x7f12133e" />
+    <public type="string" name="watch_stream_watching" id="0x7f12133f" />
+    <public type="string" name="watch_user_stream" id="0x7f121340" />
+    <public type="string" name="watching" id="0x7f121341" />
+    <public type="string" name="web_browser" id="0x7f121342" />
+    <public type="string" name="web_browser_chrome" id="0x7f121343" />
+    <public type="string" name="web_browser_in_app" id="0x7f121344" />
+    <public type="string" name="web_browser_safari" id="0x7f121345" />
+    <public type="string" name="webhook_cancel" id="0x7f121346" />
+    <public type="string" name="webhook_create" id="0x7f121347" />
+    <public type="string" name="webhook_created_on" id="0x7f121348" />
+    <public type="string" name="webhook_delete" id="0x7f121349" />
+    <public type="string" name="webhook_delete_body" id="0x7f12134a" />
+    <public type="string" name="webhook_delete_title" id="0x7f12134b" />
+    <public type="string" name="webhook_edit" id="0x7f12134c" />
+    <public type="string" name="webhook_error_creating_webhook" id="0x7f12134d" />
+    <public type="string" name="webhook_error_deleting_webhook" id="0x7f12134e" />
+    <public type="string" name="webhook_error_internal_server_error" id="0x7f12134f" />
+    <public type="string" name="webhook_error_max_webhooks_reached" id="0x7f121350" />
+    <public type="string" name="webhook_error_saving_webhook" id="0x7f121351" />
+    <public type="string" name="webhook_form_channel" id="0x7f121352" />
+    <public type="string" name="webhook_form_name" id="0x7f121353" />
+    <public type="string" name="webhook_form_url" id="0x7f121354" />
+    <public type="string" name="webhook_form_webhook_url_help" id="0x7f121355" />
+    <public type="string" name="webhook_modal_icon_description" id="0x7f121356" />
+    <public type="string" name="webhook_modal_icon_title" id="0x7f121357" />
+    <public type="string" name="webhook_modal_title" id="0x7f121358" />
+    <public type="string" name="webhook_save" id="0x7f121359" />
+    <public type="string" name="webhooks" id="0x7f12135a" />
+    <public type="string" name="welcome_message_desktop_apps" id="0x7f12135b" />
+    <public type="string" name="welcome_message_instant_invite" id="0x7f12135c" />
+    <public type="string" name="welcome_message_mobile_apps" id="0x7f12135d" />
+    <public type="string" name="welcome_message_mobile_instant_invite" id="0x7f12135e" />
+    <public type="string" name="welcome_message_mobile_instant_invite_desc" id="0x7f12135f" />
+    <public type="string" name="welcome_message_mobile_owner_subtitle" id="0x7f121360" />
+    <public type="string" name="welcome_message_mobile_owner_title" id="0x7f121361" />
+    <public type="string" name="welcome_message_mobile_upload_icon" id="0x7f121362" />
+    <public type="string" name="welcome_message_mobile_upload_icon_desc" id="0x7f121363" />
+    <public type="string" name="welcome_message_owner_title" id="0x7f121364" />
+    <public type="string" name="welcome_message_support" id="0x7f121365" />
+    <public type="string" name="welcome_message_title" id="0x7f121366" />
+    <public type="string" name="welcome_message_tutorial" id="0x7f121367" />
+    <public type="string" name="whats_new" id="0x7f121368" />
+    <public type="string" name="whats_new_date" id="0x7f121369" />
+    <public type="string" name="whitelist_failed" id="0x7f12136a" />
+    <public type="string" name="whitelisted" id="0x7f12136b" />
+    <public type="string" name="whitelisting" id="0x7f12136c" />
+    <public type="string" name="widget" id="0x7f12136d" />
+    <public type="string" name="windows" id="0x7f12136e" />
+    <public type="string" name="wumpus" id="0x7f12136f" />
+    <public type="string" name="xbox_authorization_title" id="0x7f121370" />
+    <public type="string" name="xbox_link" id="0x7f121371" />
+    <public type="string" name="xbox_pin_step1" id="0x7f121372" />
+    <public type="string" name="xbox_pin_step2" id="0x7f121373" />
+    <public type="string" name="xbox_pin_step3" id="0x7f121374" />
+    <public type="string" name="yellow" id="0x7f121375" />
+    <public type="string" name="yes_text" id="0x7f121376" />
+    <public type="string" name="your_discord_tag" id="0x7f121377" />
+    <public type="string" name="your_pin_expires" id="0x7f121378" />
+    <public type="string" name="your_pin_is_expired" id="0x7f121379" />
+    <public type="string" name="youre_viewing_older_messages" id="0x7f12137a" />
+    <public type="string" name="zh_cn" id="0x7f12137b" />
+    <public type="string" name="zh_tw" id="0x7f12137c" />
+    <public type="string" name="APKTOOL_DUMMY_394" id="0x7f120394" />
     <public type="style" name="AlertDialog.AppCompat" id="0x7f130000" />
     <public type="style" name="AlertDialog.AppCompat.Light" id="0x7f130001" />
     <public type="style" name="Animation.AppCompat.Dialog" id="0x7f130002" />
@@ -12498,786 +12698,789 @@
     <public type="style" name="AppTheme.Dark.Notice.PositiveRed" id="0x7f13001b" />
     <public type="style" name="AppTheme.Dark.Switch.White" id="0x7f13001c" />
     <public type="style" name="AppTheme.Dialog.Popup" id="0x7f13001d" />
-    <public type="style" name="AppTheme.Light" id="0x7f13001e" />
-    <public type="style" name="AppTheme.Light.Base" id="0x7f13001f" />
-    <public type="style" name="AppTheme.Light.BottomSheet" id="0x7f130020" />
-    <public type="style" name="AppTheme.Light.Notice" id="0x7f130021" />
-    <public type="style" name="AppTheme.Light.Notice.PositiveRed" id="0x7f130022" />
-    <public type="style" name="AppTheme.Loading" id="0x7f130023" />
-    <public type="style" name="AppTheme.NoActionBar" id="0x7f130024" />
-    <public type="style" name="AppTheme.Nux" id="0x7f130025" />
-    <public type="style" name="AppTheme.PopupMenu" id="0x7f130026" />
-    <public type="style" name="AppTheme.Toolbar" id="0x7f130028" />
-    <public type="style" name="AppTheme.Toolbar.Popup" id="0x7f130029" />
-    <public type="style" name="AppTheme.Toolbar.Transparent" id="0x7f13002a" />
-    <public type="style" name="AppTheme.ToolbarTheme" id="0x7f13002b" />
-    <public type="style" name="AppTheme.Translucent" id="0x7f13002c" />
-    <public type="style" name="Avatar" id="0x7f13002d" />
-    <public type="style" name="Avatar.Chat" id="0x7f13002e" />
-    <public type="style" name="Avatar.Hero" id="0x7f13002f" />
-    <public type="style" name="Avatar.Large" id="0x7f130030" />
-    <public type="style" name="Avatar.Large.ExtraAccount" id="0x7f130031" />
-    <public type="style" name="Avatar.Large.ExtraExtra" id="0x7f130032" />
+    <public type="style" name="AppTheme.Dialog.Popup.Swipeable" id="0x7f13001e" />
+    <public type="style" name="AppTheme.Light" id="0x7f13001f" />
+    <public type="style" name="AppTheme.Light.Base" id="0x7f130020" />
+    <public type="style" name="AppTheme.Light.BottomSheet" id="0x7f130021" />
+    <public type="style" name="AppTheme.Light.Notice" id="0x7f130022" />
+    <public type="style" name="AppTheme.Light.Notice.PositiveRed" id="0x7f130023" />
+    <public type="style" name="AppTheme.Loading" id="0x7f130024" />
+    <public type="style" name="AppTheme.NoActionBar" id="0x7f130025" />
+    <public type="style" name="AppTheme.Nux" id="0x7f130026" />
+    <public type="style" name="AppTheme.PopupMenu" id="0x7f130027" />
+    <public type="style" name="AppTheme.Toolbar" id="0x7f130029" />
+    <public type="style" name="AppTheme.Toolbar.Popup" id="0x7f13002a" />
+    <public type="style" name="AppTheme.Toolbar.Transparent" id="0x7f13002b" />
+    <public type="style" name="AppTheme.ToolbarTheme" id="0x7f13002c" />
+    <public type="style" name="AppTheme.Translucent" id="0x7f13002d" />
+    <public type="style" name="Avatar" id="0x7f13002e" />
+    <public type="style" name="Avatar.Chat" id="0x7f13002f" />
+    <public type="style" name="Avatar.Hero" id="0x7f130030" />
+    <public type="style" name="Avatar.Large" id="0x7f130031" />
+    <public type="style" name="Avatar.Large.ExtraAccount" id="0x7f130032" />
     <public type="style" name="Avatar.Medium" id="0x7f130033" />
     <public type="style" name="Avatar.Notification" id="0x7f130034" />
     <public type="style" name="Avatar.Small" id="0x7f130035" />
     <public type="style" name="Avatar.Standard" id="0x7f130036" />
-    <public type="style" name="Base.AlertDialog.AppCompat" id="0x7f130037" />
-    <public type="style" name="Base.AlertDialog.AppCompat.Light" id="0x7f130038" />
-    <public type="style" name="Base.Animation.AppCompat.Dialog" id="0x7f130039" />
-    <public type="style" name="Base.Animation.AppCompat.DropDownUp" id="0x7f13003a" />
-    <public type="style" name="Base.Animation.AppCompat.Tooltip" id="0x7f13003b" />
-    <public type="style" name="Base.CardView" id="0x7f13003c" />
-    <public type="style" name="Base.DialogWindowTitle.AppCompat" id="0x7f13003d" />
-    <public type="style" name="Base.DialogWindowTitleBackground.AppCompat" id="0x7f13003e" />
-    <public type="style" name="Base.TextAppearance.AppCompat" id="0x7f13003f" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Body1" id="0x7f130040" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Body2" id="0x7f130041" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Button" id="0x7f130042" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Caption" id="0x7f130043" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Display1" id="0x7f130044" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Display2" id="0x7f130045" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Display3" id="0x7f130046" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Display4" id="0x7f130047" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Headline" id="0x7f130048" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Inverse" id="0x7f130049" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Large" id="0x7f13004a" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Large.Inverse" id="0x7f13004b" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Medium" id="0x7f13004e" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Medium.Inverse" id="0x7f13004f" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Menu" id="0x7f130050" />
-    <public type="style" name="Base.TextAppearance.AppCompat.SearchResult" id="0x7f130051" />
-    <public type="style" name="Base.TextAppearance.AppCompat.SearchResult.Subtitle" id="0x7f130052" />
-    <public type="style" name="Base.TextAppearance.AppCompat.SearchResult.Title" id="0x7f130053" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Small" id="0x7f130054" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Small.Inverse" id="0x7f130055" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Subhead" id="0x7f130056" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Subhead.Inverse" id="0x7f130057" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Title" id="0x7f130058" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Title.Inverse" id="0x7f130059" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Tooltip" id="0x7f13005a" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionBar.Menu" id="0x7f13005b" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle" id="0x7f13005c" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse" id="0x7f13005d" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionBar.Title" id="0x7f13005e" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse" id="0x7f13005f" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle" id="0x7f130060" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionMode.Title" id="0x7f130061" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.Button" id="0x7f130062" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.Button.Borderless.Colored" id="0x7f130063" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.Button.Colored" id="0x7f130064" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.Button.Inverse" id="0x7f130065" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.DropDownItem" id="0x7f130066" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.PopupMenu.Header" id="0x7f130067" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.PopupMenu.Large" id="0x7f130068" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.PopupMenu.Small" id="0x7f130069" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.Switch" id="0x7f13006a" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Widget.TextView.SpinnerItem" id="0x7f13006b" />
-    <public type="style" name="Base.TextAppearance.Widget.AppCompat.ExpandedMenu.Item" id="0x7f13006c" />
-    <public type="style" name="Base.TextAppearance.Widget.AppCompat.Toolbar.Subtitle" id="0x7f13006d" />
-    <public type="style" name="Base.TextAppearance.Widget.AppCompat.Toolbar.Title" id="0x7f13006e" />
-    <public type="style" name="Base.Theme.AppCompat" id="0x7f13006f" />
-    <public type="style" name="Base.Theme.AppCompat.CompactMenu" id="0x7f130070" />
-    <public type="style" name="Base.Theme.AppCompat.Dialog" id="0x7f130071" />
-    <public type="style" name="Base.Theme.AppCompat.Dialog.Alert" id="0x7f130072" />
-    <public type="style" name="Base.Theme.AppCompat.Dialog.FixedSize" id="0x7f130073" />
-    <public type="style" name="Base.Theme.AppCompat.Dialog.MinWidth" id="0x7f130074" />
-    <public type="style" name="Base.Theme.AppCompat.DialogWhenLarge" id="0x7f130075" />
-    <public type="style" name="Base.Theme.AppCompat.Light" id="0x7f130076" />
-    <public type="style" name="Base.Theme.AppCompat.Light.DarkActionBar" id="0x7f130077" />
-    <public type="style" name="Base.Theme.AppCompat.Light.Dialog" id="0x7f130078" />
-    <public type="style" name="Base.Theme.AppCompat.Light.Dialog.Alert" id="0x7f130079" />
-    <public type="style" name="Base.Theme.AppCompat.Light.Dialog.FixedSize" id="0x7f13007a" />
-    <public type="style" name="Base.Theme.AppCompat.Light.Dialog.MinWidth" id="0x7f13007b" />
-    <public type="style" name="Base.Theme.AppCompat.Light.DialogWhenLarge" id="0x7f13007c" />
-    <public type="style" name="Base.Theme.MaterialComponents" id="0x7f13007d" />
-    <public type="style" name="Base.Theme.MaterialComponents.Bridge" id="0x7f13007e" />
-    <public type="style" name="Base.Theme.MaterialComponents.CompactMenu" id="0x7f13007f" />
-    <public type="style" name="Base.Theme.MaterialComponents.Dialog" id="0x7f130080" />
-    <public type="style" name="Base.Theme.MaterialComponents.Dialog.Alert" id="0x7f130081" />
-    <public type="style" name="Base.Theme.MaterialComponents.Dialog.FixedSize" id="0x7f130082" />
-    <public type="style" name="Base.Theme.MaterialComponents.Dialog.MinWidth" id="0x7f130083" />
-    <public type="style" name="Base.Theme.MaterialComponents.DialogWhenLarge" id="0x7f130084" />
-    <public type="style" name="Base.Theme.MaterialComponents.Light" id="0x7f130085" />
-    <public type="style" name="Base.Theme.MaterialComponents.Light.Bridge" id="0x7f130086" />
-    <public type="style" name="Base.Theme.MaterialComponents.Light.DarkActionBar" id="0x7f130087" />
-    <public type="style" name="Base.Theme.MaterialComponents.Light.DarkActionBar.Bridge" id="0x7f130088" />
-    <public type="style" name="Base.Theme.MaterialComponents.Light.Dialog" id="0x7f130089" />
-    <public type="style" name="Base.Theme.MaterialComponents.Light.Dialog.Alert" id="0x7f13008a" />
-    <public type="style" name="Base.Theme.MaterialComponents.Light.Dialog.FixedSize" id="0x7f13008b" />
-    <public type="style" name="Base.Theme.MaterialComponents.Light.Dialog.MinWidth" id="0x7f13008c" />
-    <public type="style" name="Base.Theme.MaterialComponents.Light.DialogWhenLarge" id="0x7f13008d" />
-    <public type="style" name="Base.ThemeOverlay.AppCompat" id="0x7f13008e" />
-    <public type="style" name="Base.ThemeOverlay.AppCompat.ActionBar" id="0x7f13008f" />
-    <public type="style" name="Base.ThemeOverlay.AppCompat.Dark" id="0x7f130090" />
-    <public type="style" name="Base.ThemeOverlay.AppCompat.Dark.ActionBar" id="0x7f130091" />
-    <public type="style" name="Base.ThemeOverlay.AppCompat.Dialog" id="0x7f130092" />
-    <public type="style" name="Base.ThemeOverlay.AppCompat.Dialog.Alert" id="0x7f130093" />
-    <public type="style" name="Base.ThemeOverlay.AppCompat.Light" id="0x7f130094" />
-    <public type="style" name="Base.ThemeOverlay.MaterialComponents.Dialog" id="0x7f130095" />
-    <public type="style" name="Base.ThemeOverlay.MaterialComponents.Dialog.Alert" id="0x7f130096" />
-    <public type="style" name="Base.V14.Theme.MaterialComponents" id="0x7f130097" />
-    <public type="style" name="Base.V14.Theme.MaterialComponents.Bridge" id="0x7f130098" />
-    <public type="style" name="Base.V14.Theme.MaterialComponents.Dialog" id="0x7f130099" />
-    <public type="style" name="Base.V14.Theme.MaterialComponents.Light" id="0x7f13009a" />
-    <public type="style" name="Base.V14.Theme.MaterialComponents.Light.Bridge" id="0x7f13009b" />
-    <public type="style" name="Base.V14.Theme.MaterialComponents.Light.DarkActionBar.Bridge" id="0x7f13009c" />
-    <public type="style" name="Base.V14.Theme.MaterialComponents.Light.Dialog" id="0x7f13009d" />
-    <public type="style" name="Base.V14.ThemeOverlay.MaterialComponents.Dialog" id="0x7f13009e" />
-    <public type="style" name="Base.V14.ThemeOverlay.MaterialComponents.Dialog.Alert" id="0x7f13009f" />
-    <public type="style" name="Base.V7.Theme.AppCompat" id="0x7f1300ae" />
-    <public type="style" name="Base.V7.Theme.AppCompat.Dialog" id="0x7f1300af" />
-    <public type="style" name="Base.V7.Theme.AppCompat.Light" id="0x7f1300b0" />
-    <public type="style" name="Base.V7.Theme.AppCompat.Light.Dialog" id="0x7f1300b1" />
-    <public type="style" name="Base.V7.ThemeOverlay.AppCompat.Dialog" id="0x7f1300b2" />
-    <public type="style" name="Base.V7.Widget.AppCompat.AutoCompleteTextView" id="0x7f1300b3" />
-    <public type="style" name="Base.V7.Widget.AppCompat.EditText" id="0x7f1300b4" />
-    <public type="style" name="Base.V7.Widget.AppCompat.Toolbar" id="0x7f1300b5" />
-    <public type="style" name="Base.Widget.AppCompat.ActionBar" id="0x7f1300b6" />
-    <public type="style" name="Base.Widget.AppCompat.ActionBar.Solid" id="0x7f1300b7" />
-    <public type="style" name="Base.Widget.AppCompat.ActionBar.TabBar" id="0x7f1300b8" />
-    <public type="style" name="Base.Widget.AppCompat.ActionBar.TabText" id="0x7f1300b9" />
-    <public type="style" name="Base.Widget.AppCompat.ActionBar.TabView" id="0x7f1300ba" />
-    <public type="style" name="Base.Widget.AppCompat.ActionButton" id="0x7f1300bb" />
-    <public type="style" name="Base.Widget.AppCompat.ActionButton.CloseMode" id="0x7f1300bc" />
-    <public type="style" name="Base.Widget.AppCompat.ActionButton.Overflow" id="0x7f1300bd" />
-    <public type="style" name="Base.Widget.AppCompat.ActionMode" id="0x7f1300be" />
-    <public type="style" name="Base.Widget.AppCompat.ActivityChooserView" id="0x7f1300bf" />
-    <public type="style" name="Base.Widget.AppCompat.AutoCompleteTextView" id="0x7f1300c0" />
-    <public type="style" name="Base.Widget.AppCompat.Button" id="0x7f1300c1" />
-    <public type="style" name="Base.Widget.AppCompat.Button.Borderless" id="0x7f1300c2" />
-    <public type="style" name="Base.Widget.AppCompat.Button.Borderless.Colored" id="0x7f1300c3" />
-    <public type="style" name="Base.Widget.AppCompat.Button.ButtonBar.AlertDialog" id="0x7f1300c4" />
-    <public type="style" name="Base.Widget.AppCompat.Button.Colored" id="0x7f1300c5" />
-    <public type="style" name="Base.Widget.AppCompat.Button.Small" id="0x7f1300c6" />
-    <public type="style" name="Base.Widget.AppCompat.ButtonBar" id="0x7f1300c7" />
-    <public type="style" name="Base.Widget.AppCompat.ButtonBar.AlertDialog" id="0x7f1300c8" />
-    <public type="style" name="Base.Widget.AppCompat.CompoundButton.CheckBox" id="0x7f1300c9" />
-    <public type="style" name="Base.Widget.AppCompat.CompoundButton.RadioButton" id="0x7f1300ca" />
-    <public type="style" name="Base.Widget.AppCompat.CompoundButton.Switch" id="0x7f1300cb" />
-    <public type="style" name="Base.Widget.AppCompat.DrawerArrowToggle" id="0x7f1300cc" />
-    <public type="style" name="Base.Widget.AppCompat.DrawerArrowToggle.Common" id="0x7f1300cd" />
-    <public type="style" name="Base.Widget.AppCompat.DropDownItem.Spinner" id="0x7f1300ce" />
-    <public type="style" name="Base.Widget.AppCompat.EditText" id="0x7f1300cf" />
-    <public type="style" name="Base.Widget.AppCompat.ImageButton" id="0x7f1300d0" />
-    <public type="style" name="Base.Widget.AppCompat.Light.ActionBar" id="0x7f1300d1" />
-    <public type="style" name="Base.Widget.AppCompat.Light.ActionBar.Solid" id="0x7f1300d2" />
-    <public type="style" name="Base.Widget.AppCompat.Light.ActionBar.TabBar" id="0x7f1300d3" />
-    <public type="style" name="Base.Widget.AppCompat.Light.ActionBar.TabText" id="0x7f1300d4" />
-    <public type="style" name="Base.Widget.AppCompat.Light.ActionBar.TabText.Inverse" id="0x7f1300d5" />
-    <public type="style" name="Base.Widget.AppCompat.Light.ActionBar.TabView" id="0x7f1300d6" />
-    <public type="style" name="Base.Widget.AppCompat.Light.PopupMenu" id="0x7f1300d7" />
-    <public type="style" name="Base.Widget.AppCompat.Light.PopupMenu.Overflow" id="0x7f1300d8" />
-    <public type="style" name="Base.Widget.AppCompat.ListMenuView" id="0x7f1300d9" />
-    <public type="style" name="Base.Widget.AppCompat.ListPopupWindow" id="0x7f1300da" />
-    <public type="style" name="Base.Widget.AppCompat.ListView" id="0x7f1300db" />
-    <public type="style" name="Base.Widget.AppCompat.ListView.DropDown" id="0x7f1300dc" />
-    <public type="style" name="Base.Widget.AppCompat.ListView.Menu" id="0x7f1300dd" />
-    <public type="style" name="Base.Widget.AppCompat.PopupMenu" id="0x7f1300de" />
-    <public type="style" name="Base.Widget.AppCompat.PopupMenu.Overflow" id="0x7f1300df" />
-    <public type="style" name="Base.Widget.AppCompat.PopupWindow" id="0x7f1300e0" />
-    <public type="style" name="Base.Widget.AppCompat.ProgressBar" id="0x7f1300e1" />
-    <public type="style" name="Base.Widget.AppCompat.ProgressBar.Horizontal" id="0x7f1300e2" />
-    <public type="style" name="Base.Widget.AppCompat.RatingBar" id="0x7f1300e3" />
-    <public type="style" name="Base.Widget.AppCompat.RatingBar.Indicator" id="0x7f1300e4" />
-    <public type="style" name="Base.Widget.AppCompat.RatingBar.Small" id="0x7f1300e5" />
-    <public type="style" name="Base.Widget.AppCompat.SearchView" id="0x7f1300e6" />
-    <public type="style" name="Base.Widget.AppCompat.SearchView.ActionBar" id="0x7f1300e7" />
-    <public type="style" name="Base.Widget.AppCompat.SeekBar" id="0x7f1300e8" />
-    <public type="style" name="Base.Widget.AppCompat.SeekBar.Discrete" id="0x7f1300e9" />
-    <public type="style" name="Base.Widget.AppCompat.Spinner" id="0x7f1300ea" />
-    <public type="style" name="Base.Widget.AppCompat.Spinner.Underlined" id="0x7f1300eb" />
-    <public type="style" name="Base.Widget.AppCompat.TextView.SpinnerItem" id="0x7f1300ec" />
-    <public type="style" name="Base.Widget.AppCompat.Toolbar" id="0x7f1300ed" />
-    <public type="style" name="Base.Widget.AppCompat.Toolbar.Button.Navigation" id="0x7f1300ee" />
-    <public type="style" name="Base.Widget.Design.TabLayout" id="0x7f1300ef" />
-    <public type="style" name="Base.Widget.MaterialComponents.Chip" id="0x7f1300f0" />
-    <public type="style" name="Base.Widget.MaterialComponents.TextInputEditText" id="0x7f1300f1" />
-    <public type="style" name="Base.Widget.MaterialComponents.TextInputLayout" id="0x7f1300f2" />
-    <public type="style" name="CardView" id="0x7f1300f3" />
-    <public type="style" name="CardView.Dark" id="0x7f1300f4" />
-    <public type="style" name="CardView.Light" id="0x7f1300f5" />
-    <public type="style" name="Connections.Switch" id="0x7f1300f6" />
-    <public type="style" name="EmojiPickerButtonIcon" id="0x7f1300f7" />
-    <public type="style" name="FabMenuMiniIcon" id="0x7f1300f8" />
-    <public type="style" name="FlexInput" id="0x7f1300f9" />
-    <public type="style" name="FlexInput.AddContent" id="0x7f1300fa" />
-    <public type="style" name="FlexInput.AddContent.Base.Container.TabLayout" id="0x7f1300fb" />
-    <public type="style" name="FlexInput.AddContent.Base.Page" id="0x7f1300fc" />
-    <public type="style" name="FlexInput.AddContent.Base.TabLayout" id="0x7f1300fd" />
-    <public type="style" name="FlexInput.AddContent.Button" id="0x7f1300fe" />
-    <public type="style" name="FlexInput.AddContent.Button.Base.Send" id="0x7f1300ff" />
-    <public type="style" name="FlexInput.AddContent.Button.Launcher" id="0x7f130100" />
-    <public type="style" name="FlexInput.AddContent.Button.Send" id="0x7f130101" />
-    <public type="style" name="FlexInput.AddContent.Container.TabLayout" id="0x7f130102" />
-    <public type="style" name="FlexInput.AddContent.Page" id="0x7f130103" />
-    <public type="style" name="FlexInput.AddContent.Permissions" id="0x7f130104" />
-    <public type="style" name="FlexInput.AddContent.TabLayout" id="0x7f130105" />
-    <public type="style" name="FlexInput.DialogWhenLarge" id="0x7f130106" />
-    <public type="style" name="FlexInput.Emoji.Base.Page" id="0x7f130107" />
-    <public type="style" name="FlexInput.Emoji.Page" id="0x7f130108" />
-    <public type="style" name="FlexInput.Input" id="0x7f130109" />
-    <public type="style" name="FlexInput.Input.Base.Widget" id="0x7f13010a" />
-    <public type="style" name="FlexInput.Input.Button" id="0x7f13010b" />
-    <public type="style" name="FlexInput.Input.Button.AddContent" id="0x7f13010c" />
-    <public type="style" name="FlexInput.Input.Button.Camera.Capture" id="0x7f13010d" />
-    <public type="style" name="FlexInput.Input.Button.Camera.Facing" id="0x7f13010e" />
-    <public type="style" name="FlexInput.Input.Button.Camera.Flash" id="0x7f13010f" />
-    <public type="style" name="FlexInput.Input.Button.Camera.Launcher" id="0x7f130110" />
-    <public type="style" name="FlexInput.Input.Button.Emoji" id="0x7f130111" />
-    <public type="style" name="FlexInput.Input.Button.Send" id="0x7f130112" />
-    <public type="style" name="FlexInput.Input.Button.Tab" id="0x7f130113" />
-    <public type="style" name="FlexInput.Input.Widget" id="0x7f130114" />
-    <public type="style" name="FlexInput.Items" id="0x7f130115" />
-    <public type="style" name="FlexInput.Items.Base.File" id="0x7f130116" />
-    <public type="style" name="FlexInput.Items.Base.File.Image" id="0x7f130117" />
-    <public type="style" name="FlexInput.Items.Base.File.Selection" id="0x7f130118" />
-    <public type="style" name="FlexInput.Items.Base.Photo" id="0x7f130119" />
-    <public type="style" name="FlexInput.Items.Base.Photo.Image" id="0x7f13011a" />
-    <public type="style" name="FlexInput.Items.Base.Photo.Selection" id="0x7f13011b" />
-    <public type="style" name="FlexInput.Items.File" id="0x7f13011c" />
-    <public type="style" name="FlexInput.Items.File.Image" id="0x7f13011d" />
-    <public type="style" name="FlexInput.Items.File.Name" id="0x7f13011e" />
-    <public type="style" name="FlexInput.Items.File.Selection" id="0x7f13011f" />
-    <public type="style" name="FlexInput.Items.File.Subtitle" id="0x7f130120" />
-    <public type="style" name="FlexInput.Items.Photo" id="0x7f130121" />
-    <public type="style" name="FlexInput.Items.Photo.Image" id="0x7f130122" />
-    <public type="style" name="FlexInput.Items.Photo.Selection" id="0x7f130123" />
-    <public type="style" name="FlexInput.Main" id="0x7f130124" />
-    <public type="style" name="FlexInput.Main.Widget" id="0x7f130125" />
-    <public type="style" name="Icon.Game" id="0x7f130126" />
-    <public type="style" name="Icon.Game.Small" id="0x7f130127" />
-    <public type="style" name="Icon.Mentions" id="0x7f130128" />
-    <public type="style" name="Icon.Mentions.Large" id="0x7f130129" />
-    <public type="style" name="Markdown.Header1" id="0x7f13012a" />
-    <public type="style" name="Markdown.Header1.Added" id="0x7f13012b" />
-    <public type="style" name="Markdown.Header1.Fixed" id="0x7f13012c" />
-    <public type="style" name="Markdown.Header1.Improved" id="0x7f13012d" />
-    <public type="style" name="Markdown.Header1.Progress" id="0x7f13012e" />
-    <public type="style" name="Overlay.Dialog" id="0x7f13012f" />
-    <public type="style" name="Overlay.Dialog.Constrained" id="0x7f130130" />
-    <public type="style" name="Platform.AppCompat" id="0x7f130131" />
-    <public type="style" name="Platform.AppCompat.Light" id="0x7f130132" />
-    <public type="style" name="Platform.MaterialComponents" id="0x7f130133" />
-    <public type="style" name="Platform.MaterialComponents.Dialog" id="0x7f130134" />
-    <public type="style" name="Platform.MaterialComponents.Light" id="0x7f130135" />
-    <public type="style" name="Platform.MaterialComponents.Light.Dialog" id="0x7f130136" />
-    <public type="style" name="Platform.ThemeOverlay.AppCompat" id="0x7f130137" />
-    <public type="style" name="Platform.ThemeOverlay.AppCompat.Dark" id="0x7f130138" />
-    <public type="style" name="Platform.ThemeOverlay.AppCompat.Light" id="0x7f130139" />
-    <public type="style" name="Platform.Widget.AppCompat.Spinner" id="0x7f13013e" />
-    <public type="style" name="RtlOverlay.DialogWindowTitle.AppCompat" id="0x7f13013f" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.ActionBar.TitleItem" id="0x7f130140" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.DialogTitle.Icon" id="0x7f130141" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.PopupMenuItem" id="0x7f130142" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.PopupMenuItem.InternalGroup" id="0x7f130143" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.PopupMenuItem.Shortcut" id="0x7f130144" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.PopupMenuItem.SubmenuArrow" id="0x7f130145" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.PopupMenuItem.Text" id="0x7f130146" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.PopupMenuItem.Title" id="0x7f130147" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.Search.DropDown" id="0x7f130148" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.Search.DropDown.Icon1" id="0x7f130149" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.Search.DropDown.Icon2" id="0x7f13014a" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.Search.DropDown.Query" id="0x7f13014b" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.Search.DropDown.Text" id="0x7f13014c" />
-    <public type="style" name="RtlOverlay.Widget.AppCompat.SearchView.MagIcon" id="0x7f13014d" />
-    <public type="style" name="RtlUnderlay.Widget.AppCompat.ActionButton" id="0x7f13014e" />
-    <public type="style" name="RtlUnderlay.Widget.AppCompat.ActionButton.Overflow" id="0x7f13014f" />
-    <public type="style" name="Settings.FloatingActionButton" id="0x7f130150" />
-    <public type="style" name="Settings.FloatingActionButton.Save" id="0x7f130151" />
-    <public type="style" name="TextAppearance.AppCompat" id="0x7f130152" />
-    <public type="style" name="TextAppearance.AppCompat.Body1" id="0x7f130153" />
-    <public type="style" name="TextAppearance.AppCompat.Body2" id="0x7f130154" />
-    <public type="style" name="TextAppearance.AppCompat.Button" id="0x7f130155" />
-    <public type="style" name="TextAppearance.AppCompat.Caption" id="0x7f130156" />
-    <public type="style" name="TextAppearance.AppCompat.Display1" id="0x7f130157" />
-    <public type="style" name="TextAppearance.AppCompat.Display2" id="0x7f130158" />
-    <public type="style" name="TextAppearance.AppCompat.Display3" id="0x7f130159" />
-    <public type="style" name="TextAppearance.AppCompat.Display4" id="0x7f13015a" />
-    <public type="style" name="TextAppearance.AppCompat.Headline" id="0x7f13015b" />
-    <public type="style" name="TextAppearance.AppCompat.Inverse" id="0x7f13015c" />
-    <public type="style" name="TextAppearance.AppCompat.Large" id="0x7f13015d" />
-    <public type="style" name="TextAppearance.AppCompat.Large.Inverse" id="0x7f13015e" />
-    <public type="style" name="TextAppearance.AppCompat.Light.SearchResult.Subtitle" id="0x7f13015f" />
-    <public type="style" name="TextAppearance.AppCompat.Light.SearchResult.Title" id="0x7f130160" />
-    <public type="style" name="TextAppearance.AppCompat.Light.Widget.PopupMenu.Large" id="0x7f130161" />
-    <public type="style" name="TextAppearance.AppCompat.Light.Widget.PopupMenu.Small" id="0x7f130162" />
-    <public type="style" name="TextAppearance.AppCompat.Medium" id="0x7f130163" />
-    <public type="style" name="TextAppearance.AppCompat.Medium.Inverse" id="0x7f130164" />
-    <public type="style" name="TextAppearance.AppCompat.Menu" id="0x7f130165" />
-    <public type="style" name="TextAppearance.AppCompat.SearchResult.Subtitle" id="0x7f130166" />
-    <public type="style" name="TextAppearance.AppCompat.SearchResult.Title" id="0x7f130167" />
-    <public type="style" name="TextAppearance.AppCompat.Small" id="0x7f130168" />
-    <public type="style" name="TextAppearance.AppCompat.Small.Inverse" id="0x7f130169" />
-    <public type="style" name="TextAppearance.AppCompat.Subhead" id="0x7f13016a" />
-    <public type="style" name="TextAppearance.AppCompat.Subhead.Inverse" id="0x7f13016b" />
-    <public type="style" name="TextAppearance.AppCompat.Title" id="0x7f13016c" />
-    <public type="style" name="TextAppearance.AppCompat.Title.Inverse" id="0x7f13016d" />
-    <public type="style" name="TextAppearance.AppCompat.Tooltip" id="0x7f13016e" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.ActionBar.Menu" id="0x7f13016f" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.ActionBar.Subtitle" id="0x7f130170" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse" id="0x7f130171" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.ActionBar.Title" id="0x7f130172" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse" id="0x7f130173" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.ActionMode.Subtitle" id="0x7f130174" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse" id="0x7f130175" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.ActionMode.Title" id="0x7f130176" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse" id="0x7f130177" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.Button" id="0x7f130178" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.Button.Borderless.Colored" id="0x7f130179" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.Button.Colored" id="0x7f13017a" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.Button.Inverse" id="0x7f13017b" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.DropDownItem" id="0x7f13017c" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.PopupMenu.Header" id="0x7f13017d" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.PopupMenu.Large" id="0x7f13017e" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.PopupMenu.Small" id="0x7f13017f" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.Switch" id="0x7f130180" />
-    <public type="style" name="TextAppearance.AppCompat.Widget.TextView.SpinnerItem" id="0x7f130181" />
-    <public type="style" name="TextAppearance.Compat.Notification" id="0x7f130182" />
-    <public type="style" name="TextAppearance.Compat.Notification.Info" id="0x7f130183" />
-    <public type="style" name="TextAppearance.Compat.Notification.Info.Media" id="0x7f130184" />
-    <public type="style" name="TextAppearance.Compat.Notification.Line2" id="0x7f130185" />
-    <public type="style" name="TextAppearance.Compat.Notification.Line2.Media" id="0x7f130186" />
-    <public type="style" name="TextAppearance.Compat.Notification.Media" id="0x7f130187" />
-    <public type="style" name="TextAppearance.Compat.Notification.Time" id="0x7f130188" />
-    <public type="style" name="TextAppearance.Compat.Notification.Time.Media" id="0x7f130189" />
-    <public type="style" name="TextAppearance.Compat.Notification.Title" id="0x7f13018a" />
-    <public type="style" name="TextAppearance.Compat.Notification.Title.Media" id="0x7f13018b" />
-    <public type="style" name="TextAppearance.Design.CollapsingToolbar.Expanded" id="0x7f13018c" />
-    <public type="style" name="TextAppearance.Design.Counter" id="0x7f13018d" />
-    <public type="style" name="TextAppearance.Design.Counter.Overflow" id="0x7f13018e" />
-    <public type="style" name="TextAppearance.Design.Error" id="0x7f13018f" />
-    <public type="style" name="TextAppearance.Design.HelperText" id="0x7f130190" />
-    <public type="style" name="TextAppearance.Design.Hint" id="0x7f130191" />
-    <public type="style" name="TextAppearance.Design.Snackbar.Message" id="0x7f130192" />
-    <public type="style" name="TextAppearance.Design.Tab" id="0x7f130193" />
-    <public type="style" name="TextAppearance.Error" id="0x7f130194" />
-    <public type="style" name="TextAppearance.MaterialComponents.Body1" id="0x7f130195" />
-    <public type="style" name="TextAppearance.MaterialComponents.Body2" id="0x7f130196" />
-    <public type="style" name="TextAppearance.MaterialComponents.Button" id="0x7f130197" />
-    <public type="style" name="TextAppearance.MaterialComponents.Caption" id="0x7f130198" />
-    <public type="style" name="TextAppearance.MaterialComponents.Chip" id="0x7f130199" />
-    <public type="style" name="TextAppearance.MaterialComponents.Headline1" id="0x7f13019a" />
-    <public type="style" name="TextAppearance.MaterialComponents.Headline2" id="0x7f13019b" />
-    <public type="style" name="TextAppearance.MaterialComponents.Headline3" id="0x7f13019c" />
-    <public type="style" name="TextAppearance.MaterialComponents.Headline4" id="0x7f13019d" />
-    <public type="style" name="TextAppearance.MaterialComponents.Headline5" id="0x7f13019e" />
-    <public type="style" name="TextAppearance.MaterialComponents.Headline6" id="0x7f13019f" />
-    <public type="style" name="TextAppearance.MaterialComponents.Overline" id="0x7f1301a0" />
-    <public type="style" name="TextAppearance.MaterialComponents.Subtitle1" id="0x7f1301a1" />
-    <public type="style" name="TextAppearance.MaterialComponents.Subtitle2" id="0x7f1301a2" />
-    <public type="style" name="TextAppearance.MaterialComponents.Tab" id="0x7f1301a3" />
-    <public type="style" name="TextAppearance.Widget.AppCompat.ExpandedMenu.Item" id="0x7f1301a4" />
-    <public type="style" name="TextAppearance.Widget.AppCompat.Toolbar.Subtitle" id="0x7f1301a5" />
-    <public type="style" name="TextAppearance.Widget.AppCompat.Toolbar.Title" id="0x7f1301a6" />
-    <public type="style" name="Theme.AppCompat" id="0x7f1301a7" />
-    <public type="style" name="Theme.AppCompat.CompactMenu" id="0x7f1301a8" />
-    <public type="style" name="Theme.AppCompat.DayNight" id="0x7f1301a9" />
-    <public type="style" name="Theme.AppCompat.DayNight.DarkActionBar" id="0x7f1301aa" />
-    <public type="style" name="Theme.AppCompat.DayNight.Dialog" id="0x7f1301ab" />
-    <public type="style" name="Theme.AppCompat.DayNight.Dialog.Alert" id="0x7f1301ac" />
-    <public type="style" name="Theme.AppCompat.DayNight.Dialog.MinWidth" id="0x7f1301ad" />
-    <public type="style" name="Theme.AppCompat.DayNight.DialogWhenLarge" id="0x7f1301ae" />
-    <public type="style" name="Theme.AppCompat.DayNight.NoActionBar" id="0x7f1301af" />
-    <public type="style" name="Theme.AppCompat.Dialog" id="0x7f1301b0" />
-    <public type="style" name="Theme.AppCompat.Dialog.Alert" id="0x7f1301b1" />
-    <public type="style" name="Theme.AppCompat.Dialog.MinWidth" id="0x7f1301b2" />
-    <public type="style" name="Theme.AppCompat.DialogWhenLarge" id="0x7f1301b3" />
-    <public type="style" name="Theme.AppCompat.Light" id="0x7f1301b4" />
-    <public type="style" name="Theme.AppCompat.Light.DarkActionBar" id="0x7f1301b5" />
-    <public type="style" name="Theme.AppCompat.Light.Dialog" id="0x7f1301b6" />
-    <public type="style" name="Theme.AppCompat.Light.Dialog.Alert" id="0x7f1301b7" />
-    <public type="style" name="Theme.AppCompat.Light.Dialog.MinWidth" id="0x7f1301b8" />
-    <public type="style" name="Theme.AppCompat.Light.DialogWhenLarge" id="0x7f1301b9" />
-    <public type="style" name="Theme.AppCompat.Light.NoActionBar" id="0x7f1301ba" />
-    <public type="style" name="Theme.AppCompat.NoActionBar" id="0x7f1301bb" />
-    <public type="style" name="Theme.AppInvite.Preview" id="0x7f1301bc" />
-    <public type="style" name="Theme.AppInvite.Preview.Base" id="0x7f1301bd" />
-    <public type="style" name="Theme.Design" id="0x7f1301be" />
-    <public type="style" name="Theme.Design.BottomSheetDialog" id="0x7f1301bf" />
-    <public type="style" name="Theme.Design.Light" id="0x7f1301c0" />
-    <public type="style" name="Theme.Design.Light.BottomSheetDialog" id="0x7f1301c1" />
-    <public type="style" name="Theme.Design.Light.NoActionBar" id="0x7f1301c2" />
-    <public type="style" name="Theme.Design.NoActionBar" id="0x7f1301c3" />
-    <public type="style" name="Theme.MaterialComponents" id="0x7f1301c4" />
-    <public type="style" name="Theme.MaterialComponents.BottomSheetDialog" id="0x7f1301c5" />
-    <public type="style" name="Theme.MaterialComponents.Bridge" id="0x7f1301c6" />
-    <public type="style" name="Theme.MaterialComponents.CompactMenu" id="0x7f1301c7" />
-    <public type="style" name="Theme.MaterialComponents.Dialog" id="0x7f1301c8" />
-    <public type="style" name="Theme.MaterialComponents.Dialog.Alert" id="0x7f1301c9" />
-    <public type="style" name="Theme.MaterialComponents.Dialog.MinWidth" id="0x7f1301ca" />
-    <public type="style" name="Theme.MaterialComponents.DialogWhenLarge" id="0x7f1301cb" />
-    <public type="style" name="Theme.MaterialComponents.Light" id="0x7f1301cc" />
-    <public type="style" name="Theme.MaterialComponents.Light.BottomSheetDialog" id="0x7f1301cd" />
-    <public type="style" name="Theme.MaterialComponents.Light.Bridge" id="0x7f1301ce" />
-    <public type="style" name="Theme.MaterialComponents.Light.DarkActionBar" id="0x7f1301cf" />
-    <public type="style" name="Theme.MaterialComponents.Light.DarkActionBar.Bridge" id="0x7f1301d0" />
-    <public type="style" name="Theme.MaterialComponents.Light.Dialog" id="0x7f1301d1" />
-    <public type="style" name="Theme.MaterialComponents.Light.Dialog.Alert" id="0x7f1301d2" />
-    <public type="style" name="Theme.MaterialComponents.Light.Dialog.MinWidth" id="0x7f1301d3" />
-    <public type="style" name="Theme.MaterialComponents.Light.DialogWhenLarge" id="0x7f1301d4" />
-    <public type="style" name="Theme.MaterialComponents.Light.NoActionBar" id="0x7f1301d5" />
-    <public type="style" name="Theme.MaterialComponents.Light.NoActionBar.Bridge" id="0x7f1301d6" />
-    <public type="style" name="Theme.MaterialComponents.NoActionBar" id="0x7f1301d7" />
-    <public type="style" name="Theme.MaterialComponents.NoActionBar.Bridge" id="0x7f1301d8" />
-    <public type="style" name="ThemeOverlay.AppCompat" id="0x7f1301d9" />
-    <public type="style" name="ThemeOverlay.AppCompat.ActionBar" id="0x7f1301da" />
-    <public type="style" name="ThemeOverlay.AppCompat.Dark" id="0x7f1301db" />
-    <public type="style" name="ThemeOverlay.AppCompat.Dark.ActionBar" id="0x7f1301dc" />
-    <public type="style" name="ThemeOverlay.AppCompat.Dialog" id="0x7f1301dd" />
-    <public type="style" name="ThemeOverlay.AppCompat.Dialog.Alert" id="0x7f1301de" />
-    <public type="style" name="ThemeOverlay.AppCompat.Light" id="0x7f1301df" />
-    <public type="style" name="ThemeOverlay.MaterialComponents" id="0x7f1301e0" />
-    <public type="style" name="ThemeOverlay.MaterialComponents.ActionBar" id="0x7f1301e1" />
-    <public type="style" name="ThemeOverlay.MaterialComponents.Dark" id="0x7f1301e2" />
-    <public type="style" name="ThemeOverlay.MaterialComponents.Dark.ActionBar" id="0x7f1301e3" />
-    <public type="style" name="ThemeOverlay.MaterialComponents.Dialog" id="0x7f1301e4" />
-    <public type="style" name="ThemeOverlay.MaterialComponents.Dialog.Alert" id="0x7f1301e5" />
-    <public type="style" name="ThemeOverlay.MaterialComponents.Light" id="0x7f1301e6" />
-    <public type="style" name="ThemeOverlay.MaterialComponents.TextInputEditText" id="0x7f1301e7" />
-    <public type="style" name="ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox" id="0x7f1301e8" />
-    <public type="style" name="ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox.Dense" id="0x7f1301e9" />
-    <public type="style" name="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox" id="0x7f1301ea" />
-    <public type="style" name="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox.Dense" id="0x7f1301eb" />
-    <public type="style" name="UiKit" id="0x7f1301ec" />
-    <public type="style" name="UiKit.Alert.Verify.Account.Method" id="0x7f1301ed" />
-    <public type="style" name="UiKit.Alert.Verify.Account.Method.Container" id="0x7f1301ee" />
-    <public type="style" name="UiKit.Alert.Verify.Account.Method.Wrapper" id="0x7f1301ef" />
-    <public type="style" name="UiKit.Anim.Verify.By.Email" id="0x7f1301f0" />
-    <public type="style" name="UiKit.Anim.Verify.By.Email.Frozen" id="0x7f1301f1" />
-    <public type="style" name="UiKit.Anim.Verify.By.Phone" id="0x7f1301f2" />
-    <public type="style" name="UiKit.Anim.Verify.By.Phone.Frozen" id="0x7f1301f3" />
-    <public type="style" name="UiKit.Auth.Note.Rotatable" id="0x7f1301f4" />
-    <public type="style" name="UiKit.Auth.Spots" id="0x7f1301f5" />
-    <public type="style" name="UiKit.Auth.Spots.Bot" id="0x7f1301f6" />
-    <public type="style" name="UiKit.Auth.Spots.Bot.Left" id="0x7f1301f7" />
-    <public type="style" name="UiKit.Auth.Spots.Bot.Right" id="0x7f1301f8" />
-    <public type="style" name="UiKit.Auth.Spots.Top" id="0x7f1301f9" />
-    <public type="style" name="UiKit.AuthButton" id="0x7f1301fa" />
-    <public type="style" name="UiKit.AuthButton.Transparent" id="0x7f1301fb" />
-    <public type="style" name="UiKit.AuthButtonTheme.Transparent" id="0x7f1301fc" />
-    <public type="style" name="UiKit.AuthCopyContainer" id="0x7f1301fd" />
-    <public type="style" name="UiKit.AuthToolbar" id="0x7f1301fe" />
-    <public type="style" name="UiKit.AuthToolbarTheme" id="0x7f1301ff" />
-    <public type="style" name="UiKit.Button" id="0x7f130200" />
-    <public type="style" name="UiKit.Button.Calls.TransparentDark" id="0x7f130201" />
-    <public type="style" name="UiKit.Button.Compact" id="0x7f130202" />
-    <public type="style" name="UiKit.Button.Dark" id="0x7f130203" />
-    <public type="style" name="UiKit.Button.Fit" id="0x7f130204" />
-    <public type="style" name="UiKit.Button.Green" id="0x7f130205" />
-    <public type="style" name="UiKit.Button.Green.Fit" id="0x7f130206" />
-    <public type="style" name="UiKit.Button.Green.Fit.Outline" id="0x7f130207" />
-    <public type="style" name="UiKit.Button.Green.Outline" id="0x7f130208" />
-    <public type="style" name="UiKit.Button.Grey" id="0x7f130209" />
-    <public type="style" name="UiKit.Button.Grey.Fit" id="0x7f13020a" />
-    <public type="style" name="UiKit.Button.Grey.Fit.Outline" id="0x7f13020b" />
-    <public type="style" name="UiKit.Button.Grey.Outline" id="0x7f13020c" />
-    <public type="style" name="UiKit.Button.Outline" id="0x7f13020d" />
-    <public type="style" name="UiKit.Button.Red" id="0x7f13020e" />
-    <public type="style" name="UiKit.Button.Red.Fit" id="0x7f13020f" />
-    <public type="style" name="UiKit.Button.Red.Fit.Outline" id="0x7f130210" />
-    <public type="style" name="UiKit.Button.Red.Outline" id="0x7f130211" />
-    <public type="style" name="UiKit.Button.Theme" id="0x7f130212" />
-    <public type="style" name="UiKit.Button.Theme.Dark" id="0x7f130213" />
-    <public type="style" name="UiKit.Button.Theme.Green" id="0x7f130214" />
-    <public type="style" name="UiKit.Button.Theme.Grey" id="0x7f130215" />
-    <public type="style" name="UiKit.Button.Theme.Red" id="0x7f130216" />
-    <public type="style" name="UiKit.Button.Theme.White" id="0x7f130217" />
-    <public type="style" name="UiKit.Button.Transparent" id="0x7f130218" />
-    <public type="style" name="UiKit.Button.Transparent.Fit" id="0x7f130219" />
-    <public type="style" name="UiKit.Button.White" id="0x7f13021a" />
-    <public type="style" name="UiKit.Button.White.Outline" id="0x7f13021b" />
-    <public type="style" name="UiKit.Button.White.Outline.Themed" id="0x7f13021c" />
-    <public type="style" name="UiKit.Calls.ButtonCircle" id="0x7f13021d" />
-    <public type="style" name="UiKit.Calls.ButtonText" id="0x7f13021e" />
-    <public type="style" name="UiKit.Chat.Embed.CardView" id="0x7f13021f" />
-    <public type="style" name="UiKit.Chat.Embed.Container" id="0x7f130220" />
-    <public type="style" name="UiKit.Chat.Embed.Footer" id="0x7f130221" />
-    <public type="style" name="UiKit.Chat.Embed.Header" id="0x7f130222" />
-    <public type="style" name="UiKit.Chat.Embed.Subtext" id="0x7f130223" />
-    <public type="style" name="UiKit.Chat.Guideline" id="0x7f130224" />
-    <public type="style" name="UiKit.Chat.Text" id="0x7f130225" />
-    <public type="style" name="UiKit.CheckableImageView" id="0x7f130226" />
-    <public type="style" name="UiKit.Checkbox" id="0x7f130227" />
-    <public type="style" name="UiKit.CheckedSetting" id="0x7f130228" />
-    <public type="style" name="UiKit.CheckedSetting.Themed" id="0x7f130229" />
-    <public type="style" name="UiKit.Copy" id="0x7f13022a" />
-    <public type="style" name="UiKit.Copy.Anchor" id="0x7f13022b" />
-    <public type="style" name="UiKit.Copy.Anchor.Base" id="0x7f13022c" />
-    <public type="style" name="UiKit.Copy.Anchor.Item.Rotatable" id="0x7f13022d" />
-    <public type="style" name="UiKit.Copy.Container" id="0x7f13022e" />
-    <public type="style" name="UiKit.Copy.EditText.Wrap" id="0x7f13022f" />
-    <public type="style" name="UiKit.Dialog.Animation" id="0x7f130230" />
-    <public type="style" name="UiKit.Dialog.Body" id="0x7f130231" />
-    <public type="style" name="UiKit.Dialog.ButtonContainer" id="0x7f130232" />
-    <public type="style" name="UiKit.Dialog.Container" id="0x7f130233" />
-    <public type="style" name="UiKit.Dialog.Subtitle" id="0x7f130234" />
-    <public type="style" name="UiKit.Dialog.Title" id="0x7f130235" />
-    <public type="style" name="UiKit.DimmerView" id="0x7f130236" />
-    <public type="style" name="UiKit.Divider" id="0x7f130237" />
-    <public type="style" name="UiKit.Divider.Thick" id="0x7f130238" />
-    <public type="style" name="UiKit.Divider.Vertical" id="0x7f130239" />
-    <public type="style" name="UiKit.EditText" id="0x7f13023a" />
-    <public type="style" name="UiKit.EditText.Number" id="0x7f13023b" />
-    <public type="style" name="UiKit.EditText.Phone" id="0x7f13023c" />
-    <public type="style" name="UiKit.EditText.Themed" id="0x7f13023d" />
-    <public type="style" name="UiKit.Form.Field.EditText" id="0x7f13023e" />
-    <public type="style" name="UiKit.Form.Field.EditText.Password" id="0x7f13023f" />
-    <public type="style" name="UiKit.Form.Field.EditText.SingleLine" id="0x7f130240" />
-    <public type="style" name="UiKit.Form.Field.EditText.Wrap" id="0x7f130241" />
-    <public type="style" name="UiKit.Form.Field.EditText.Wrap.Password" id="0x7f130242" />
-    <public type="style" name="UiKit.Form.Label" id="0x7f130243" />
-    <public type="style" name="UiKit.GiftEmbedDisabledButton" id="0x7f130244" />
-    <public type="style" name="UiKit.Guideline" id="0x7f130245" />
-    <public type="style" name="UiKit.GuildsList" id="0x7f130246" />
-    <public type="style" name="UiKit.GuildsList.Horiz" id="0x7f130247" />
-    <public type="style" name="UiKit.GuildsListCreate" id="0x7f130248" />
-    <public type="style" name="UiKit.GuildsListDividerIcon" id="0x7f130249" />
-    <public type="style" name="UiKit.GuildsListDividerIconHoriz" id="0x7f13024a" />
-    <public type="style" name="UiKit.GuildsListIcon" id="0x7f13024b" />
-    <public type="style" name="UiKit.GuildsListItem" id="0x7f13024c" />
-    <public type="style" name="UiKit.GuildsListItem.Wrap" id="0x7f13024d" />
-    <public type="style" name="UiKit.GuildsListItemHoriz" id="0x7f13024e" />
-    <public type="style" name="UiKit.GuildsListItemHoriz.Wrap" id="0x7f13024f" />
-    <public type="style" name="UiKit.GuildsListMentions" id="0x7f130250" />
-    <public type="style" name="UiKit.GuildsListSelected" id="0x7f130251" />
-    <public type="style" name="UiKit.GuildsListSelectedHoriz" id="0x7f130252" />
-    <public type="style" name="UiKit.GuildsListUnavailable" id="0x7f130253" />
-    <public type="style" name="UiKit.GuildsListUnread" id="0x7f130254" />
-    <public type="style" name="UiKit.GuildsListUnreadHoriz" id="0x7f130255" />
-    <public type="style" name="UiKit.GuildsListVoiceIcon" id="0x7f130256" />
-    <public type="style" name="UiKit.ImageView" id="0x7f130257" />
-    <public type="style" name="UiKit.ImageView.Clickable" id="0x7f130258" />
-    <public type="style" name="UiKit.ImageView.Clickable.Corner.TopEnd" id="0x7f130259" />
-    <public type="style" name="UiKit.ImageView.HideInLandscape" id="0x7f13025a" />
-    <public type="style" name="UiKit.LottieAnimationView" id="0x7f13025b" />
-    <public type="style" name="UiKit.Notice.Popup.Animation" id="0x7f13025c" />
-    <public type="style" name="UiKit.Profile.Strip.Icon" id="0x7f13025d" />
-    <public type="style" name="UiKit.ProgressBar.Line.Horizontal.Determinate" id="0x7f13025e" />
-    <public type="style" name="UiKit.ProgressBar.White" id="0x7f13025f" />
-    <public type="style" name="UiKit.QuickSwitcher.Animation" id="0x7f130260" />
-    <public type="style" name="UiKit.RadioButton" id="0x7f130261" />
-    <public type="style" name="UiKit.Search.Chip" id="0x7f130262" />
-    <public type="style" name="UiKit.Search.EditText" id="0x7f130263" />
-    <public type="style" name="UiKit.Search.Header" id="0x7f130264" />
-    <public type="style" name="UiKit.SearchInput" id="0x7f130265" />
-    <public type="style" name="UiKit.SeekBar" id="0x7f130266" />
-    <public type="style" name="UiKit.Settings" id="0x7f130267" />
-    <public type="style" name="UiKit.Settings.Base.Item" id="0x7f130268" />
-    <public type="style" name="UiKit.Settings.Divider" id="0x7f130269" />
-    <public type="style" name="UiKit.Settings.Item" id="0x7f13026a" />
-    <public type="style" name="UiKit.Settings.Item.Addition" id="0x7f13026b" />
-    <public type="style" name="UiKit.Settings.Item.Header" id="0x7f13026c" />
-    <public type="style" name="UiKit.Settings.Item.Icon" id="0x7f13026d" />
-    <public type="style" name="UiKit.Settings.Item.Label" id="0x7f13026e" />
-    <public type="style" name="UiKit.Settings.Item.SubText" id="0x7f13026f" />
-    <public type="style" name="UiKit.Settings.Text" id="0x7f130270" />
-    <public type="style" name="UiKit.Sheet.Guideline" id="0x7f130271" />
-    <public type="style" name="UiKit.Sheet.Header" id="0x7f130272" />
-    <public type="style" name="UiKit.Sheet.Header.Contents" id="0x7f130273" />
-    <public type="style" name="UiKit.Sheet.Header.Icon" id="0x7f130274" />
-    <public type="style" name="UiKit.Sheet.Header.Title" id="0x7f130275" />
-    <public type="style" name="UiKit.SuperBar" id="0x7f130276" />
-    <public type="style" name="UiKit.Tabs" id="0x7f130277" />
-    <public type="style" name="UiKit.Tabs.TextAppearance" id="0x7f130278" />
-    <public type="style" name="UiKit.TextInputLayout" id="0x7f130279" />
-    <public type="style" name="UiKit.TextInputLayout.EditText" id="0x7f13027a" />
-    <public type="style" name="UiKit.TextInputLayout.EditText.Dense" id="0x7f13027b" />
-    <public type="style" name="UiKit.TextInputLayout.TextAppearance" id="0x7f13027c" />
-    <public type="style" name="UiKit.TextView" id="0x7f13027d" />
-    <public type="style" name="UiKit.TextView.Bold" id="0x7f13027e" />
-    <public type="style" name="UiKit.TextView.H1" id="0x7f13027f" />
-    <public type="style" name="UiKit.TextView.H1.Bold" id="0x7f130280" />
-    <public type="style" name="UiKit.TextView.H2" id="0x7f130281" />
-    <public type="style" name="UiKit.TextView.Large" id="0x7f130282" />
-    <public type="style" name="UiKit.TextView.Large.SingleLine" id="0x7f130283" />
-    <public type="style" name="UiKit.TextView.Link" id="0x7f130284" />
-    <public type="style" name="UiKit.TextView.Marquee" id="0x7f130285" />
-    <public type="style" name="UiKit.TextView.NoResults" id="0x7f130286" />
-    <public type="style" name="UiKit.TextView.Perk" id="0x7f130287" />
-    <public type="style" name="UiKit.TextView.Semibold" id="0x7f130288" />
-    <public type="style" name="UiKit.TextView.SingleLine" id="0x7f130289" />
-    <public type="style" name="UiKit.TextView.Subtext" id="0x7f13028a" />
-    <public type="style" name="UiKit.TextView.Subtext.Semibold" id="0x7f13028b" />
-    <public type="style" name="UiKit.TextView.Subtext.Semibold.SingleLine" id="0x7f13028c" />
-    <public type="style" name="UiKit.TextView.Subtext.SingleLine" id="0x7f13028d" />
-    <public type="style" name="UiKit.Toast" id="0x7f13028e" />
-    <public type="style" name="UiKit.Toolbar.TextAppearance" id="0x7f13028f" />
-    <public type="style" name="UiKit.Toolbar.TextAppearance.Subtitle" id="0x7f130290" />
-    <public type="style" name="UiKit.Toolbar.TextAppearance.Title" id="0x7f130291" />
-    <public type="style" name="UiKit.User.Phone.Add.Number" id="0x7f130292" />
-    <public type="style" name="UiKit.User.Phone.Add.Number.Verify" id="0x7f130293" />
-    <public type="style" name="UiKit.User.Phone.Verify.Digit" id="0x7f130294" />
-    <public type="style" name="UiKit.User.Phone.Verify.Digit.Left" id="0x7f130295" />
-    <public type="style" name="UiKit.User.Phone.Verify.Digits" id="0x7f130296" />
-    <public type="style" name="UiKit.ViewGroup" id="0x7f130297" />
-    <public type="style" name="UiKit.ViewGroup.ConstraintLayout" id="0x7f130298" />
-    <public type="style" name="UiKit.ViewGroup.LinearLayout" id="0x7f130299" />
-    <public type="style" name="UiKit.ViewGroup.LinearLayout.BottomSheet" id="0x7f13029a" />
-    <public type="style" name="UiKit.ViewGroup.LinearLayout.Horizontal" id="0x7f13029b" />
-    <public type="style" name="UiKit.ViewGroup.LinearLayout.Rotatable" id="0x7f13029c" />
-    <public type="style" name="UiKit.ViewGroup.LinearLayout.Rotatable.Horizontal" id="0x7f13029d" />
-    <public type="style" name="UiKit.ViewGroup.NestedScrollView" id="0x7f13029e" />
-    <public type="style" name="UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior" id="0x7f13029f" />
-    <public type="style" name="UiKit.ViewGroup.Page" id="0x7f1302a0" />
-    <public type="style" name="UiKit.ViewGroup.Page.LinearLayout" id="0x7f1302a1" />
-    <public type="style" name="UiKit.ViewGroup.Page.LinearLayout.Horizontal" id="0x7f1302a2" />
-    <public type="style" name="UiKit.ViewGroup.RecyclerView" id="0x7f1302a3" />
-    <public type="style" name="UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" id="0x7f1302a4" />
-    <public type="style" name="UiKit.ViewGroup.RecyclerView.Horizontal" id="0x7f1302a5" />
-    <public type="style" name="UiKit.ViewGroup.RelativeLayout" id="0x7f1302a6" />
-    <public type="style" name="UiKit.ViewGroup.RelativeLayout.AppBarScrollingViewBehavior" id="0x7f1302a7" />
-    <public type="style" name="UiKit.ViewGroup.ScrollView" id="0x7f1302a8" />
-    <public type="style" name="UiKit.ViewGroup.ScrollView.Horizontal" id="0x7f1302a9" />
-    <public type="style" name="UiKit.ViewGroup.ScrollView.Page" id="0x7f1302aa" />
-    <public type="style" name="UiKit.WelcomeMessageCard" id="0x7f1302ab" />
-    <public type="style" name="Widget.AppCompat.ActionBar" id="0x7f1302ac" />
-    <public type="style" name="Widget.AppCompat.ActionBar.Solid" id="0x7f1302ad" />
-    <public type="style" name="Widget.AppCompat.ActionBar.TabBar" id="0x7f1302ae" />
-    <public type="style" name="Widget.AppCompat.ActionBar.TabText" id="0x7f1302af" />
-    <public type="style" name="Widget.AppCompat.ActionBar.TabView" id="0x7f1302b0" />
-    <public type="style" name="Widget.AppCompat.ActionButton" id="0x7f1302b1" />
-    <public type="style" name="Widget.AppCompat.ActionButton.CloseMode" id="0x7f1302b2" />
-    <public type="style" name="Widget.AppCompat.ActionButton.Overflow" id="0x7f1302b3" />
-    <public type="style" name="Widget.AppCompat.ActionMode" id="0x7f1302b4" />
-    <public type="style" name="Widget.AppCompat.ActivityChooserView" id="0x7f1302b5" />
-    <public type="style" name="Widget.AppCompat.AutoCompleteTextView" id="0x7f1302b6" />
-    <public type="style" name="Widget.AppCompat.Button" id="0x7f1302b7" />
-    <public type="style" name="Widget.AppCompat.Button.Borderless" id="0x7f1302b8" />
-    <public type="style" name="Widget.AppCompat.Button.Borderless.Colored" id="0x7f1302b9" />
-    <public type="style" name="Widget.AppCompat.Button.ButtonBar.AlertDialog" id="0x7f1302ba" />
-    <public type="style" name="Widget.AppCompat.Button.Colored" id="0x7f1302bb" />
-    <public type="style" name="Widget.AppCompat.Button.Small" id="0x7f1302bc" />
-    <public type="style" name="Widget.AppCompat.ButtonBar" id="0x7f1302bd" />
-    <public type="style" name="Widget.AppCompat.ButtonBar.AlertDialog" id="0x7f1302be" />
-    <public type="style" name="Widget.AppCompat.CompoundButton.CheckBox" id="0x7f1302bf" />
-    <public type="style" name="Widget.AppCompat.CompoundButton.RadioButton" id="0x7f1302c0" />
-    <public type="style" name="Widget.AppCompat.CompoundButton.Switch" id="0x7f1302c1" />
-    <public type="style" name="Widget.AppCompat.DrawerArrowToggle" id="0x7f1302c2" />
-    <public type="style" name="Widget.AppCompat.DropDownItem.Spinner" id="0x7f1302c3" />
-    <public type="style" name="Widget.AppCompat.EditText" id="0x7f1302c4" />
-    <public type="style" name="Widget.AppCompat.ImageButton" id="0x7f1302c5" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar" id="0x7f1302c6" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.Solid" id="0x7f1302c7" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.Solid.Inverse" id="0x7f1302c8" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabBar" id="0x7f1302c9" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabBar.Inverse" id="0x7f1302ca" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabText" id="0x7f1302cb" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabText.Inverse" id="0x7f1302cc" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabView" id="0x7f1302cd" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabView.Inverse" id="0x7f1302ce" />
-    <public type="style" name="Widget.AppCompat.Light.ActionButton" id="0x7f1302cf" />
-    <public type="style" name="Widget.AppCompat.Light.ActionButton.CloseMode" id="0x7f1302d0" />
-    <public type="style" name="Widget.AppCompat.Light.ActionButton.Overflow" id="0x7f1302d1" />
-    <public type="style" name="Widget.AppCompat.Light.ActionMode.Inverse" id="0x7f1302d2" />
-    <public type="style" name="Widget.AppCompat.Light.ActivityChooserView" id="0x7f1302d3" />
-    <public type="style" name="Widget.AppCompat.Light.AutoCompleteTextView" id="0x7f1302d4" />
-    <public type="style" name="Widget.AppCompat.Light.DropDownItem.Spinner" id="0x7f1302d5" />
-    <public type="style" name="Widget.AppCompat.Light.ListPopupWindow" id="0x7f1302d6" />
-    <public type="style" name="Widget.AppCompat.Light.ListView.DropDown" id="0x7f1302d7" />
-    <public type="style" name="Widget.AppCompat.Light.PopupMenu" id="0x7f1302d8" />
-    <public type="style" name="Widget.AppCompat.Light.PopupMenu.Overflow" id="0x7f1302d9" />
-    <public type="style" name="Widget.AppCompat.Light.SearchView" id="0x7f1302da" />
-    <public type="style" name="Widget.AppCompat.Light.Spinner.DropDown.ActionBar" id="0x7f1302db" />
-    <public type="style" name="Widget.AppCompat.ListMenuView" id="0x7f1302dc" />
-    <public type="style" name="Widget.AppCompat.ListPopupWindow" id="0x7f1302dd" />
-    <public type="style" name="Widget.AppCompat.ListView" id="0x7f1302de" />
-    <public type="style" name="Widget.AppCompat.ListView.DropDown" id="0x7f1302df" />
-    <public type="style" name="Widget.AppCompat.ListView.Menu" id="0x7f1302e0" />
-    <public type="style" name="Widget.AppCompat.PopupMenu" id="0x7f1302e1" />
-    <public type="style" name="Widget.AppCompat.PopupMenu.Overflow" id="0x7f1302e2" />
-    <public type="style" name="Widget.AppCompat.PopupWindow" id="0x7f1302e3" />
-    <public type="style" name="Widget.AppCompat.ProgressBar" id="0x7f1302e4" />
-    <public type="style" name="Widget.AppCompat.ProgressBar.Horizontal" id="0x7f1302e5" />
-    <public type="style" name="Widget.AppCompat.RatingBar" id="0x7f1302e6" />
-    <public type="style" name="Widget.AppCompat.RatingBar.Indicator" id="0x7f1302e7" />
-    <public type="style" name="Widget.AppCompat.RatingBar.Small" id="0x7f1302e8" />
-    <public type="style" name="Widget.AppCompat.SearchView" id="0x7f1302e9" />
-    <public type="style" name="Widget.AppCompat.SearchView.ActionBar" id="0x7f1302ea" />
-    <public type="style" name="Widget.AppCompat.SeekBar" id="0x7f1302eb" />
-    <public type="style" name="Widget.AppCompat.SeekBar.Discrete" id="0x7f1302ec" />
-    <public type="style" name="Widget.AppCompat.Spinner" id="0x7f1302ed" />
-    <public type="style" name="Widget.AppCompat.Spinner.DropDown" id="0x7f1302ee" />
-    <public type="style" name="Widget.AppCompat.Spinner.DropDown.ActionBar" id="0x7f1302ef" />
-    <public type="style" name="Widget.AppCompat.Spinner.Underlined" id="0x7f1302f0" />
-    <public type="style" name="Widget.AppCompat.TextView.SpinnerItem" id="0x7f1302f1" />
-    <public type="style" name="Widget.AppCompat.Toolbar" id="0x7f1302f2" />
-    <public type="style" name="Widget.AppCompat.Toolbar.Button.Navigation" id="0x7f1302f3" />
-    <public type="style" name="Widget.CameraView" id="0x7f1302f4" />
-    <public type="style" name="Widget.Compat.NotificationActionContainer" id="0x7f1302f5" />
-    <public type="style" name="Widget.Compat.NotificationActionText" id="0x7f1302f6" />
-    <public type="style" name="Widget.Design.AppBarLayout" id="0x7f1302f7" />
-    <public type="style" name="Widget.Design.BottomNavigationView" id="0x7f1302f8" />
-    <public type="style" name="Widget.Design.BottomSheet.Modal" id="0x7f1302f9" />
-    <public type="style" name="Widget.Design.CollapsingToolbar" id="0x7f1302fa" />
-    <public type="style" name="Widget.Design.FloatingActionButton" id="0x7f1302fb" />
-    <public type="style" name="Widget.Design.NavigationView" id="0x7f1302fc" />
-    <public type="style" name="Widget.Design.ScrimInsetsFrameLayout" id="0x7f1302fd" />
-    <public type="style" name="Widget.Design.Snackbar" id="0x7f1302fe" />
-    <public type="style" name="Widget.Design.TabLayout" id="0x7f1302ff" />
-    <public type="style" name="Widget.Design.TextInputLayout" id="0x7f130300" />
-    <public type="style" name="Widget.MaterialComponents.BottomAppBar" id="0x7f130301" />
-    <public type="style" name="Widget.MaterialComponents.BottomAppBar.Colored" id="0x7f130302" />
-    <public type="style" name="Widget.MaterialComponents.BottomNavigationView" id="0x7f130303" />
-    <public type="style" name="Widget.MaterialComponents.BottomNavigationView.Colored" id="0x7f130304" />
-    <public type="style" name="Widget.MaterialComponents.BottomSheet.Modal" id="0x7f130305" />
-    <public type="style" name="Widget.MaterialComponents.Button" id="0x7f130306" />
-    <public type="style" name="Widget.MaterialComponents.Button.Icon" id="0x7f130307" />
-    <public type="style" name="Widget.MaterialComponents.Button.OutlinedButton" id="0x7f130308" />
-    <public type="style" name="Widget.MaterialComponents.Button.OutlinedButton.Icon" id="0x7f130309" />
-    <public type="style" name="Widget.MaterialComponents.Button.TextButton" id="0x7f13030a" />
-    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Dialog" id="0x7f13030b" />
-    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Dialog.Icon" id="0x7f13030c" />
-    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Icon" id="0x7f13030d" />
-    <public type="style" name="Widget.MaterialComponents.Button.UnelevatedButton" id="0x7f13030e" />
-    <public type="style" name="Widget.MaterialComponents.Button.UnelevatedButton.Icon" id="0x7f13030f" />
-    <public type="style" name="Widget.MaterialComponents.CardView" id="0x7f130310" />
-    <public type="style" name="Widget.MaterialComponents.Chip.Action" id="0x7f130311" />
-    <public type="style" name="Widget.MaterialComponents.Chip.Choice" id="0x7f130312" />
-    <public type="style" name="Widget.MaterialComponents.Chip.Entry" id="0x7f130313" />
-    <public type="style" name="Widget.MaterialComponents.Chip.Filter" id="0x7f130314" />
-    <public type="style" name="Widget.MaterialComponents.ChipGroup" id="0x7f130315" />
-    <public type="style" name="Widget.MaterialComponents.FloatingActionButton" id="0x7f130316" />
-    <public type="style" name="Widget.MaterialComponents.NavigationView" id="0x7f130317" />
-    <public type="style" name="Widget.MaterialComponents.Snackbar" id="0x7f130318" />
-    <public type="style" name="Widget.MaterialComponents.Snackbar.FullWidth" id="0x7f130319" />
-    <public type="style" name="Widget.MaterialComponents.TabLayout" id="0x7f13031a" />
-    <public type="style" name="Widget.MaterialComponents.TabLayout.Colored" id="0x7f13031b" />
-    <public type="style" name="Widget.MaterialComponents.TextInputEditText.FilledBox" id="0x7f13031c" />
-    <public type="style" name="Widget.MaterialComponents.TextInputEditText.FilledBox.Dense" id="0x7f13031d" />
-    <public type="style" name="Widget.MaterialComponents.TextInputEditText.OutlinedBox" id="0x7f13031e" />
-    <public type="style" name="Widget.MaterialComponents.TextInputEditText.OutlinedBox.Dense" id="0x7f13031f" />
-    <public type="style" name="Widget.MaterialComponents.TextInputLayout.FilledBox" id="0x7f130320" />
-    <public type="style" name="Widget.MaterialComponents.TextInputLayout.FilledBox.Dense" id="0x7f130321" />
-    <public type="style" name="Widget.MaterialComponents.TextInputLayout.OutlinedBox" id="0x7f130322" />
-    <public type="style" name="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" id="0x7f130323" />
-    <public type="style" name="Widget.MaterialComponents.Toolbar" id="0x7f130324" />
-    <public type="style" name="Widget.Support.CoordinatorLayout" id="0x7f130325" />
-    <public type="style" name="ucrop_ImageViewWidgetIcon" id="0x7f130326" />
-    <public type="style" name="ucrop_TextViewCropAspectRatio" id="0x7f130327" />
-    <public type="style" name="ucrop_TextViewWidgetText" id="0x7f130328" />
-    <public type="style" name="ucrop_WrapperIconState" id="0x7f130329" />
-    <public type="style" name="ucrop_WrapperRotateButton" id="0x7f13032a" />
-    <public type="style" name="AppTheme.SeekBar" id="0x7f130027" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Large" id="0x7f13004c" />
-    <public type="style" name="Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Small" id="0x7f13004d" />
-    <public type="style" name="Base.V21.Theme.AppCompat" id="0x7f1300a0" />
-    <public type="style" name="Base.V21.Theme.AppCompat.Dialog" id="0x7f1300a1" />
-    <public type="style" name="Base.V21.Theme.AppCompat.Light" id="0x7f1300a2" />
-    <public type="style" name="Base.V21.Theme.AppCompat.Light.Dialog" id="0x7f1300a3" />
-    <public type="style" name="Base.V21.ThemeOverlay.AppCompat.Dialog" id="0x7f1300a4" />
-    <public type="style" name="Platform.V21.AppCompat" id="0x7f13013a" />
-    <public type="style" name="Platform.V21.AppCompat.Light" id="0x7f13013b" />
-    <public type="style" name="Base.V22.Theme.AppCompat" id="0x7f1300a5" />
-    <public type="style" name="Base.V22.Theme.AppCompat.Light" id="0x7f1300a6" />
-    <public type="style" name="Base.V23.Theme.AppCompat" id="0x7f1300a7" />
-    <public type="style" name="Base.V23.Theme.AppCompat.Light" id="0x7f1300a8" />
-    <public type="style" name="Platform.V25.AppCompat" id="0x7f13013c" />
-    <public type="style" name="Platform.V25.AppCompat.Light" id="0x7f13013d" />
-    <public type="style" name="Base.V26.Theme.AppCompat" id="0x7f1300a9" />
-    <public type="style" name="Base.V26.Theme.AppCompat.Light" id="0x7f1300aa" />
-    <public type="style" name="Base.V26.Widget.AppCompat.Toolbar" id="0x7f1300ab" />
-    <public type="style" name="Base.V28.Theme.AppCompat" id="0x7f1300ac" />
-    <public type="style" name="Base.V28.Theme.AppCompat.Light" id="0x7f1300ad" />
+    <public type="style" name="Avatar.XXLarge" id="0x7f130037" />
+    <public type="style" name="Base.AlertDialog.AppCompat" id="0x7f130038" />
+    <public type="style" name="Base.AlertDialog.AppCompat.Light" id="0x7f130039" />
+    <public type="style" name="Base.Animation.AppCompat.Dialog" id="0x7f13003a" />
+    <public type="style" name="Base.Animation.AppCompat.DropDownUp" id="0x7f13003b" />
+    <public type="style" name="Base.Animation.AppCompat.Tooltip" id="0x7f13003c" />
+    <public type="style" name="Base.CardView" id="0x7f13003d" />
+    <public type="style" name="Base.DialogWindowTitle.AppCompat" id="0x7f13003e" />
+    <public type="style" name="Base.DialogWindowTitleBackground.AppCompat" id="0x7f13003f" />
+    <public type="style" name="Base.TextAppearance.AppCompat" id="0x7f130040" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Body1" id="0x7f130041" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Body2" id="0x7f130042" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Button" id="0x7f130043" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Caption" id="0x7f130044" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Display1" id="0x7f130045" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Display2" id="0x7f130046" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Display3" id="0x7f130047" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Display4" id="0x7f130048" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Headline" id="0x7f130049" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Inverse" id="0x7f13004a" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Large" id="0x7f13004b" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Large.Inverse" id="0x7f13004c" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Medium" id="0x7f13004f" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Medium.Inverse" id="0x7f130050" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Menu" id="0x7f130051" />
+    <public type="style" name="Base.TextAppearance.AppCompat.SearchResult" id="0x7f130052" />
+    <public type="style" name="Base.TextAppearance.AppCompat.SearchResult.Subtitle" id="0x7f130053" />
+    <public type="style" name="Base.TextAppearance.AppCompat.SearchResult.Title" id="0x7f130054" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Small" id="0x7f130055" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Small.Inverse" id="0x7f130056" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Subhead" id="0x7f130057" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Subhead.Inverse" id="0x7f130058" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Title" id="0x7f130059" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Title.Inverse" id="0x7f13005a" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Tooltip" id="0x7f13005b" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionBar.Menu" id="0x7f13005c" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle" id="0x7f13005d" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse" id="0x7f13005e" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionBar.Title" id="0x7f13005f" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse" id="0x7f130060" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle" id="0x7f130061" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.ActionMode.Title" id="0x7f130062" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.Button" id="0x7f130063" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.Button.Borderless.Colored" id="0x7f130064" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.Button.Colored" id="0x7f130065" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.Button.Inverse" id="0x7f130066" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.DropDownItem" id="0x7f130067" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.PopupMenu.Header" id="0x7f130068" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.PopupMenu.Large" id="0x7f130069" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.PopupMenu.Small" id="0x7f13006a" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.Switch" id="0x7f13006b" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Widget.TextView.SpinnerItem" id="0x7f13006c" />
+    <public type="style" name="Base.TextAppearance.Widget.AppCompat.ExpandedMenu.Item" id="0x7f13006d" />
+    <public type="style" name="Base.TextAppearance.Widget.AppCompat.Toolbar.Subtitle" id="0x7f13006e" />
+    <public type="style" name="Base.TextAppearance.Widget.AppCompat.Toolbar.Title" id="0x7f13006f" />
+    <public type="style" name="Base.Theme.AppCompat" id="0x7f130070" />
+    <public type="style" name="Base.Theme.AppCompat.CompactMenu" id="0x7f130071" />
+    <public type="style" name="Base.Theme.AppCompat.Dialog" id="0x7f130072" />
+    <public type="style" name="Base.Theme.AppCompat.Dialog.Alert" id="0x7f130073" />
+    <public type="style" name="Base.Theme.AppCompat.Dialog.FixedSize" id="0x7f130074" />
+    <public type="style" name="Base.Theme.AppCompat.Dialog.MinWidth" id="0x7f130075" />
+    <public type="style" name="Base.Theme.AppCompat.DialogWhenLarge" id="0x7f130076" />
+    <public type="style" name="Base.Theme.AppCompat.Light" id="0x7f130077" />
+    <public type="style" name="Base.Theme.AppCompat.Light.DarkActionBar" id="0x7f130078" />
+    <public type="style" name="Base.Theme.AppCompat.Light.Dialog" id="0x7f130079" />
+    <public type="style" name="Base.Theme.AppCompat.Light.Dialog.Alert" id="0x7f13007a" />
+    <public type="style" name="Base.Theme.AppCompat.Light.Dialog.FixedSize" id="0x7f13007b" />
+    <public type="style" name="Base.Theme.AppCompat.Light.Dialog.MinWidth" id="0x7f13007c" />
+    <public type="style" name="Base.Theme.AppCompat.Light.DialogWhenLarge" id="0x7f13007d" />
+    <public type="style" name="Base.Theme.MaterialComponents" id="0x7f13007e" />
+    <public type="style" name="Base.Theme.MaterialComponents.Bridge" id="0x7f13007f" />
+    <public type="style" name="Base.Theme.MaterialComponents.CompactMenu" id="0x7f130080" />
+    <public type="style" name="Base.Theme.MaterialComponents.Dialog" id="0x7f130081" />
+    <public type="style" name="Base.Theme.MaterialComponents.Dialog.Alert" id="0x7f130082" />
+    <public type="style" name="Base.Theme.MaterialComponents.Dialog.FixedSize" id="0x7f130083" />
+    <public type="style" name="Base.Theme.MaterialComponents.Dialog.MinWidth" id="0x7f130084" />
+    <public type="style" name="Base.Theme.MaterialComponents.DialogWhenLarge" id="0x7f130085" />
+    <public type="style" name="Base.Theme.MaterialComponents.Light" id="0x7f130086" />
+    <public type="style" name="Base.Theme.MaterialComponents.Light.Bridge" id="0x7f130087" />
+    <public type="style" name="Base.Theme.MaterialComponents.Light.DarkActionBar" id="0x7f130088" />
+    <public type="style" name="Base.Theme.MaterialComponents.Light.DarkActionBar.Bridge" id="0x7f130089" />
+    <public type="style" name="Base.Theme.MaterialComponents.Light.Dialog" id="0x7f13008a" />
+    <public type="style" name="Base.Theme.MaterialComponents.Light.Dialog.Alert" id="0x7f13008b" />
+    <public type="style" name="Base.Theme.MaterialComponents.Light.Dialog.FixedSize" id="0x7f13008c" />
+    <public type="style" name="Base.Theme.MaterialComponents.Light.Dialog.MinWidth" id="0x7f13008d" />
+    <public type="style" name="Base.Theme.MaterialComponents.Light.DialogWhenLarge" id="0x7f13008e" />
+    <public type="style" name="Base.ThemeOverlay.AppCompat" id="0x7f13008f" />
+    <public type="style" name="Base.ThemeOverlay.AppCompat.ActionBar" id="0x7f130090" />
+    <public type="style" name="Base.ThemeOverlay.AppCompat.Dark" id="0x7f130091" />
+    <public type="style" name="Base.ThemeOverlay.AppCompat.Dark.ActionBar" id="0x7f130092" />
+    <public type="style" name="Base.ThemeOverlay.AppCompat.Dialog" id="0x7f130093" />
+    <public type="style" name="Base.ThemeOverlay.AppCompat.Dialog.Alert" id="0x7f130094" />
+    <public type="style" name="Base.ThemeOverlay.AppCompat.Light" id="0x7f130095" />
+    <public type="style" name="Base.ThemeOverlay.MaterialComponents.Dialog" id="0x7f130096" />
+    <public type="style" name="Base.ThemeOverlay.MaterialComponents.Dialog.Alert" id="0x7f130097" />
+    <public type="style" name="Base.V14.Theme.MaterialComponents" id="0x7f130098" />
+    <public type="style" name="Base.V14.Theme.MaterialComponents.Bridge" id="0x7f130099" />
+    <public type="style" name="Base.V14.Theme.MaterialComponents.Dialog" id="0x7f13009a" />
+    <public type="style" name="Base.V14.Theme.MaterialComponents.Light" id="0x7f13009b" />
+    <public type="style" name="Base.V14.Theme.MaterialComponents.Light.Bridge" id="0x7f13009c" />
+    <public type="style" name="Base.V14.Theme.MaterialComponents.Light.DarkActionBar.Bridge" id="0x7f13009d" />
+    <public type="style" name="Base.V14.Theme.MaterialComponents.Light.Dialog" id="0x7f13009e" />
+    <public type="style" name="Base.V14.ThemeOverlay.MaterialComponents.Dialog" id="0x7f13009f" />
+    <public type="style" name="Base.V14.ThemeOverlay.MaterialComponents.Dialog.Alert" id="0x7f1300a0" />
+    <public type="style" name="Base.V7.Theme.AppCompat" id="0x7f1300af" />
+    <public type="style" name="Base.V7.Theme.AppCompat.Dialog" id="0x7f1300b0" />
+    <public type="style" name="Base.V7.Theme.AppCompat.Light" id="0x7f1300b1" />
+    <public type="style" name="Base.V7.Theme.AppCompat.Light.Dialog" id="0x7f1300b2" />
+    <public type="style" name="Base.V7.ThemeOverlay.AppCompat.Dialog" id="0x7f1300b3" />
+    <public type="style" name="Base.V7.Widget.AppCompat.AutoCompleteTextView" id="0x7f1300b4" />
+    <public type="style" name="Base.V7.Widget.AppCompat.EditText" id="0x7f1300b5" />
+    <public type="style" name="Base.V7.Widget.AppCompat.Toolbar" id="0x7f1300b6" />
+    <public type="style" name="Base.Widget.AppCompat.ActionBar" id="0x7f1300b7" />
+    <public type="style" name="Base.Widget.AppCompat.ActionBar.Solid" id="0x7f1300b8" />
+    <public type="style" name="Base.Widget.AppCompat.ActionBar.TabBar" id="0x7f1300b9" />
+    <public type="style" name="Base.Widget.AppCompat.ActionBar.TabText" id="0x7f1300ba" />
+    <public type="style" name="Base.Widget.AppCompat.ActionBar.TabView" id="0x7f1300bb" />
+    <public type="style" name="Base.Widget.AppCompat.ActionButton" id="0x7f1300bc" />
+    <public type="style" name="Base.Widget.AppCompat.ActionButton.CloseMode" id="0x7f1300bd" />
+    <public type="style" name="Base.Widget.AppCompat.ActionButton.Overflow" id="0x7f1300be" />
+    <public type="style" name="Base.Widget.AppCompat.ActionMode" id="0x7f1300bf" />
+    <public type="style" name="Base.Widget.AppCompat.ActivityChooserView" id="0x7f1300c0" />
+    <public type="style" name="Base.Widget.AppCompat.AutoCompleteTextView" id="0x7f1300c1" />
+    <public type="style" name="Base.Widget.AppCompat.Button" id="0x7f1300c2" />
+    <public type="style" name="Base.Widget.AppCompat.Button.Borderless" id="0x7f1300c3" />
+    <public type="style" name="Base.Widget.AppCompat.Button.Borderless.Colored" id="0x7f1300c4" />
+    <public type="style" name="Base.Widget.AppCompat.Button.ButtonBar.AlertDialog" id="0x7f1300c5" />
+    <public type="style" name="Base.Widget.AppCompat.Button.Colored" id="0x7f1300c6" />
+    <public type="style" name="Base.Widget.AppCompat.Button.Small" id="0x7f1300c7" />
+    <public type="style" name="Base.Widget.AppCompat.ButtonBar" id="0x7f1300c8" />
+    <public type="style" name="Base.Widget.AppCompat.ButtonBar.AlertDialog" id="0x7f1300c9" />
+    <public type="style" name="Base.Widget.AppCompat.CompoundButton.CheckBox" id="0x7f1300ca" />
+    <public type="style" name="Base.Widget.AppCompat.CompoundButton.RadioButton" id="0x7f1300cb" />
+    <public type="style" name="Base.Widget.AppCompat.CompoundButton.Switch" id="0x7f1300cc" />
+    <public type="style" name="Base.Widget.AppCompat.DrawerArrowToggle" id="0x7f1300cd" />
+    <public type="style" name="Base.Widget.AppCompat.DrawerArrowToggle.Common" id="0x7f1300ce" />
+    <public type="style" name="Base.Widget.AppCompat.DropDownItem.Spinner" id="0x7f1300cf" />
+    <public type="style" name="Base.Widget.AppCompat.EditText" id="0x7f1300d0" />
+    <public type="style" name="Base.Widget.AppCompat.ImageButton" id="0x7f1300d1" />
+    <public type="style" name="Base.Widget.AppCompat.Light.ActionBar" id="0x7f1300d2" />
+    <public type="style" name="Base.Widget.AppCompat.Light.ActionBar.Solid" id="0x7f1300d3" />
+    <public type="style" name="Base.Widget.AppCompat.Light.ActionBar.TabBar" id="0x7f1300d4" />
+    <public type="style" name="Base.Widget.AppCompat.Light.ActionBar.TabText" id="0x7f1300d5" />
+    <public type="style" name="Base.Widget.AppCompat.Light.ActionBar.TabText.Inverse" id="0x7f1300d6" />
+    <public type="style" name="Base.Widget.AppCompat.Light.ActionBar.TabView" id="0x7f1300d7" />
+    <public type="style" name="Base.Widget.AppCompat.Light.PopupMenu" id="0x7f1300d8" />
+    <public type="style" name="Base.Widget.AppCompat.Light.PopupMenu.Overflow" id="0x7f1300d9" />
+    <public type="style" name="Base.Widget.AppCompat.ListMenuView" id="0x7f1300da" />
+    <public type="style" name="Base.Widget.AppCompat.ListPopupWindow" id="0x7f1300db" />
+    <public type="style" name="Base.Widget.AppCompat.ListView" id="0x7f1300dc" />
+    <public type="style" name="Base.Widget.AppCompat.ListView.DropDown" id="0x7f1300dd" />
+    <public type="style" name="Base.Widget.AppCompat.ListView.Menu" id="0x7f1300de" />
+    <public type="style" name="Base.Widget.AppCompat.PopupMenu" id="0x7f1300df" />
+    <public type="style" name="Base.Widget.AppCompat.PopupMenu.Overflow" id="0x7f1300e0" />
+    <public type="style" name="Base.Widget.AppCompat.PopupWindow" id="0x7f1300e1" />
+    <public type="style" name="Base.Widget.AppCompat.ProgressBar" id="0x7f1300e2" />
+    <public type="style" name="Base.Widget.AppCompat.ProgressBar.Horizontal" id="0x7f1300e3" />
+    <public type="style" name="Base.Widget.AppCompat.RatingBar" id="0x7f1300e4" />
+    <public type="style" name="Base.Widget.AppCompat.RatingBar.Indicator" id="0x7f1300e5" />
+    <public type="style" name="Base.Widget.AppCompat.RatingBar.Small" id="0x7f1300e6" />
+    <public type="style" name="Base.Widget.AppCompat.SearchView" id="0x7f1300e7" />
+    <public type="style" name="Base.Widget.AppCompat.SearchView.ActionBar" id="0x7f1300e8" />
+    <public type="style" name="Base.Widget.AppCompat.SeekBar" id="0x7f1300e9" />
+    <public type="style" name="Base.Widget.AppCompat.SeekBar.Discrete" id="0x7f1300ea" />
+    <public type="style" name="Base.Widget.AppCompat.Spinner" id="0x7f1300eb" />
+    <public type="style" name="Base.Widget.AppCompat.Spinner.Underlined" id="0x7f1300ec" />
+    <public type="style" name="Base.Widget.AppCompat.TextView.SpinnerItem" id="0x7f1300ed" />
+    <public type="style" name="Base.Widget.AppCompat.Toolbar" id="0x7f1300ee" />
+    <public type="style" name="Base.Widget.AppCompat.Toolbar.Button.Navigation" id="0x7f1300ef" />
+    <public type="style" name="Base.Widget.Design.TabLayout" id="0x7f1300f0" />
+    <public type="style" name="Base.Widget.MaterialComponents.Chip" id="0x7f1300f1" />
+    <public type="style" name="Base.Widget.MaterialComponents.TextInputEditText" id="0x7f1300f2" />
+    <public type="style" name="Base.Widget.MaterialComponents.TextInputLayout" id="0x7f1300f3" />
+    <public type="style" name="CardView" id="0x7f1300f4" />
+    <public type="style" name="CardView.Dark" id="0x7f1300f5" />
+    <public type="style" name="CardView.Light" id="0x7f1300f6" />
+    <public type="style" name="Connections.Switch" id="0x7f1300f7" />
+    <public type="style" name="EmojiPickerButtonIcon" id="0x7f1300f8" />
+    <public type="style" name="FabMenuMiniIcon" id="0x7f1300f9" />
+    <public type="style" name="FlexInput" id="0x7f1300fa" />
+    <public type="style" name="FlexInput.AddContent" id="0x7f1300fb" />
+    <public type="style" name="FlexInput.AddContent.Base.Container.TabLayout" id="0x7f1300fc" />
+    <public type="style" name="FlexInput.AddContent.Base.Page" id="0x7f1300fd" />
+    <public type="style" name="FlexInput.AddContent.Base.TabLayout" id="0x7f1300fe" />
+    <public type="style" name="FlexInput.AddContent.Button" id="0x7f1300ff" />
+    <public type="style" name="FlexInput.AddContent.Button.Base.Send" id="0x7f130100" />
+    <public type="style" name="FlexInput.AddContent.Button.Launcher" id="0x7f130101" />
+    <public type="style" name="FlexInput.AddContent.Button.Send" id="0x7f130102" />
+    <public type="style" name="FlexInput.AddContent.Container.TabLayout" id="0x7f130103" />
+    <public type="style" name="FlexInput.AddContent.Page" id="0x7f130104" />
+    <public type="style" name="FlexInput.AddContent.Permissions" id="0x7f130105" />
+    <public type="style" name="FlexInput.AddContent.TabLayout" id="0x7f130106" />
+    <public type="style" name="FlexInput.DialogWhenLarge" id="0x7f130107" />
+    <public type="style" name="FlexInput.Emoji.Base.Page" id="0x7f130108" />
+    <public type="style" name="FlexInput.Emoji.Page" id="0x7f130109" />
+    <public type="style" name="FlexInput.Input" id="0x7f13010a" />
+    <public type="style" name="FlexInput.Input.Base.Widget" id="0x7f13010b" />
+    <public type="style" name="FlexInput.Input.Button" id="0x7f13010c" />
+    <public type="style" name="FlexInput.Input.Button.AddContent" id="0x7f13010d" />
+    <public type="style" name="FlexInput.Input.Button.Camera.Capture" id="0x7f13010e" />
+    <public type="style" name="FlexInput.Input.Button.Camera.Facing" id="0x7f13010f" />
+    <public type="style" name="FlexInput.Input.Button.Camera.Flash" id="0x7f130110" />
+    <public type="style" name="FlexInput.Input.Button.Camera.Launcher" id="0x7f130111" />
+    <public type="style" name="FlexInput.Input.Button.Emoji" id="0x7f130112" />
+    <public type="style" name="FlexInput.Input.Button.Send" id="0x7f130113" />
+    <public type="style" name="FlexInput.Input.Button.Tab" id="0x7f130114" />
+    <public type="style" name="FlexInput.Input.Widget" id="0x7f130115" />
+    <public type="style" name="FlexInput.Items" id="0x7f130116" />
+    <public type="style" name="FlexInput.Items.Base.File" id="0x7f130117" />
+    <public type="style" name="FlexInput.Items.Base.File.Image" id="0x7f130118" />
+    <public type="style" name="FlexInput.Items.Base.File.Selection" id="0x7f130119" />
+    <public type="style" name="FlexInput.Items.Base.Photo" id="0x7f13011a" />
+    <public type="style" name="FlexInput.Items.Base.Photo.Image" id="0x7f13011b" />
+    <public type="style" name="FlexInput.Items.Base.Photo.Selection" id="0x7f13011c" />
+    <public type="style" name="FlexInput.Items.File" id="0x7f13011d" />
+    <public type="style" name="FlexInput.Items.File.Image" id="0x7f13011e" />
+    <public type="style" name="FlexInput.Items.File.Name" id="0x7f13011f" />
+    <public type="style" name="FlexInput.Items.File.Selection" id="0x7f130120" />
+    <public type="style" name="FlexInput.Items.File.Subtitle" id="0x7f130121" />
+    <public type="style" name="FlexInput.Items.Photo" id="0x7f130122" />
+    <public type="style" name="FlexInput.Items.Photo.Image" id="0x7f130123" />
+    <public type="style" name="FlexInput.Items.Photo.Selection" id="0x7f130124" />
+    <public type="style" name="FlexInput.Main" id="0x7f130125" />
+    <public type="style" name="FlexInput.Main.Widget" id="0x7f130126" />
+    <public type="style" name="Icon.Game" id="0x7f130127" />
+    <public type="style" name="Icon.Game.Small" id="0x7f130128" />
+    <public type="style" name="Icon.Mentions" id="0x7f130129" />
+    <public type="style" name="Icon.Mentions.Large" id="0x7f13012a" />
+    <public type="style" name="Markdown.Header1" id="0x7f13012b" />
+    <public type="style" name="Markdown.Header1.Added" id="0x7f13012c" />
+    <public type="style" name="Markdown.Header1.Fixed" id="0x7f13012d" />
+    <public type="style" name="Markdown.Header1.Improved" id="0x7f13012e" />
+    <public type="style" name="Markdown.Header1.Progress" id="0x7f13012f" />
+    <public type="style" name="Overlay.Dialog" id="0x7f130130" />
+    <public type="style" name="Overlay.Dialog.Constrained" id="0x7f130131" />
+    <public type="style" name="Platform.AppCompat" id="0x7f130132" />
+    <public type="style" name="Platform.AppCompat.Light" id="0x7f130133" />
+    <public type="style" name="Platform.MaterialComponents" id="0x7f130134" />
+    <public type="style" name="Platform.MaterialComponents.Dialog" id="0x7f130135" />
+    <public type="style" name="Platform.MaterialComponents.Light" id="0x7f130136" />
+    <public type="style" name="Platform.MaterialComponents.Light.Dialog" id="0x7f130137" />
+    <public type="style" name="Platform.ThemeOverlay.AppCompat" id="0x7f130138" />
+    <public type="style" name="Platform.ThemeOverlay.AppCompat.Dark" id="0x7f130139" />
+    <public type="style" name="Platform.ThemeOverlay.AppCompat.Light" id="0x7f13013a" />
+    <public type="style" name="Platform.Widget.AppCompat.Spinner" id="0x7f13013f" />
+    <public type="style" name="RtlOverlay.DialogWindowTitle.AppCompat" id="0x7f130140" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.ActionBar.TitleItem" id="0x7f130141" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.DialogTitle.Icon" id="0x7f130142" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.PopupMenuItem" id="0x7f130143" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.PopupMenuItem.InternalGroup" id="0x7f130144" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.PopupMenuItem.Shortcut" id="0x7f130145" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.PopupMenuItem.SubmenuArrow" id="0x7f130146" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.PopupMenuItem.Text" id="0x7f130147" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.PopupMenuItem.Title" id="0x7f130148" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.Search.DropDown" id="0x7f130149" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.Search.DropDown.Icon1" id="0x7f13014a" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.Search.DropDown.Icon2" id="0x7f13014b" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.Search.DropDown.Query" id="0x7f13014c" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.Search.DropDown.Text" id="0x7f13014d" />
+    <public type="style" name="RtlOverlay.Widget.AppCompat.SearchView.MagIcon" id="0x7f13014e" />
+    <public type="style" name="RtlUnderlay.Widget.AppCompat.ActionButton" id="0x7f13014f" />
+    <public type="style" name="RtlUnderlay.Widget.AppCompat.ActionButton.Overflow" id="0x7f130150" />
+    <public type="style" name="Settings.FloatingActionButton" id="0x7f130151" />
+    <public type="style" name="Settings.FloatingActionButton.Save" id="0x7f130152" />
+    <public type="style" name="TextAppearance.AppCompat" id="0x7f130153" />
+    <public type="style" name="TextAppearance.AppCompat.Body1" id="0x7f130154" />
+    <public type="style" name="TextAppearance.AppCompat.Body2" id="0x7f130155" />
+    <public type="style" name="TextAppearance.AppCompat.Button" id="0x7f130156" />
+    <public type="style" name="TextAppearance.AppCompat.Caption" id="0x7f130157" />
+    <public type="style" name="TextAppearance.AppCompat.Display1" id="0x7f130158" />
+    <public type="style" name="TextAppearance.AppCompat.Display2" id="0x7f130159" />
+    <public type="style" name="TextAppearance.AppCompat.Display3" id="0x7f13015a" />
+    <public type="style" name="TextAppearance.AppCompat.Display4" id="0x7f13015b" />
+    <public type="style" name="TextAppearance.AppCompat.Headline" id="0x7f13015c" />
+    <public type="style" name="TextAppearance.AppCompat.Inverse" id="0x7f13015d" />
+    <public type="style" name="TextAppearance.AppCompat.Large" id="0x7f13015e" />
+    <public type="style" name="TextAppearance.AppCompat.Large.Inverse" id="0x7f13015f" />
+    <public type="style" name="TextAppearance.AppCompat.Light.SearchResult.Subtitle" id="0x7f130160" />
+    <public type="style" name="TextAppearance.AppCompat.Light.SearchResult.Title" id="0x7f130161" />
+    <public type="style" name="TextAppearance.AppCompat.Light.Widget.PopupMenu.Large" id="0x7f130162" />
+    <public type="style" name="TextAppearance.AppCompat.Light.Widget.PopupMenu.Small" id="0x7f130163" />
+    <public type="style" name="TextAppearance.AppCompat.Medium" id="0x7f130164" />
+    <public type="style" name="TextAppearance.AppCompat.Medium.Inverse" id="0x7f130165" />
+    <public type="style" name="TextAppearance.AppCompat.Menu" id="0x7f130166" />
+    <public type="style" name="TextAppearance.AppCompat.SearchResult.Subtitle" id="0x7f130167" />
+    <public type="style" name="TextAppearance.AppCompat.SearchResult.Title" id="0x7f130168" />
+    <public type="style" name="TextAppearance.AppCompat.Small" id="0x7f130169" />
+    <public type="style" name="TextAppearance.AppCompat.Small.Inverse" id="0x7f13016a" />
+    <public type="style" name="TextAppearance.AppCompat.Subhead" id="0x7f13016b" />
+    <public type="style" name="TextAppearance.AppCompat.Subhead.Inverse" id="0x7f13016c" />
+    <public type="style" name="TextAppearance.AppCompat.Title" id="0x7f13016d" />
+    <public type="style" name="TextAppearance.AppCompat.Title.Inverse" id="0x7f13016e" />
+    <public type="style" name="TextAppearance.AppCompat.Tooltip" id="0x7f13016f" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.ActionBar.Menu" id="0x7f130170" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.ActionBar.Subtitle" id="0x7f130171" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse" id="0x7f130172" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.ActionBar.Title" id="0x7f130173" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse" id="0x7f130174" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.ActionMode.Subtitle" id="0x7f130175" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse" id="0x7f130176" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.ActionMode.Title" id="0x7f130177" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse" id="0x7f130178" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.Button" id="0x7f130179" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.Button.Borderless.Colored" id="0x7f13017a" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.Button.Colored" id="0x7f13017b" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.Button.Inverse" id="0x7f13017c" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.DropDownItem" id="0x7f13017d" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.PopupMenu.Header" id="0x7f13017e" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.PopupMenu.Large" id="0x7f13017f" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.PopupMenu.Small" id="0x7f130180" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.Switch" id="0x7f130181" />
+    <public type="style" name="TextAppearance.AppCompat.Widget.TextView.SpinnerItem" id="0x7f130182" />
+    <public type="style" name="TextAppearance.Compat.Notification" id="0x7f130183" />
+    <public type="style" name="TextAppearance.Compat.Notification.Info" id="0x7f130184" />
+    <public type="style" name="TextAppearance.Compat.Notification.Info.Media" id="0x7f130185" />
+    <public type="style" name="TextAppearance.Compat.Notification.Line2" id="0x7f130186" />
+    <public type="style" name="TextAppearance.Compat.Notification.Line2.Media" id="0x7f130187" />
+    <public type="style" name="TextAppearance.Compat.Notification.Media" id="0x7f130188" />
+    <public type="style" name="TextAppearance.Compat.Notification.Time" id="0x7f130189" />
+    <public type="style" name="TextAppearance.Compat.Notification.Time.Media" id="0x7f13018a" />
+    <public type="style" name="TextAppearance.Compat.Notification.Title" id="0x7f13018b" />
+    <public type="style" name="TextAppearance.Compat.Notification.Title.Media" id="0x7f13018c" />
+    <public type="style" name="TextAppearance.Design.CollapsingToolbar.Expanded" id="0x7f13018d" />
+    <public type="style" name="TextAppearance.Design.Counter" id="0x7f13018e" />
+    <public type="style" name="TextAppearance.Design.Counter.Overflow" id="0x7f13018f" />
+    <public type="style" name="TextAppearance.Design.Error" id="0x7f130190" />
+    <public type="style" name="TextAppearance.Design.HelperText" id="0x7f130191" />
+    <public type="style" name="TextAppearance.Design.Hint" id="0x7f130192" />
+    <public type="style" name="TextAppearance.Design.Snackbar.Message" id="0x7f130193" />
+    <public type="style" name="TextAppearance.Design.Tab" id="0x7f130194" />
+    <public type="style" name="TextAppearance.Error" id="0x7f130195" />
+    <public type="style" name="TextAppearance.MaterialComponents.Body1" id="0x7f130196" />
+    <public type="style" name="TextAppearance.MaterialComponents.Body2" id="0x7f130197" />
+    <public type="style" name="TextAppearance.MaterialComponents.Button" id="0x7f130198" />
+    <public type="style" name="TextAppearance.MaterialComponents.Caption" id="0x7f130199" />
+    <public type="style" name="TextAppearance.MaterialComponents.Chip" id="0x7f13019a" />
+    <public type="style" name="TextAppearance.MaterialComponents.Headline1" id="0x7f13019b" />
+    <public type="style" name="TextAppearance.MaterialComponents.Headline2" id="0x7f13019c" />
+    <public type="style" name="TextAppearance.MaterialComponents.Headline3" id="0x7f13019d" />
+    <public type="style" name="TextAppearance.MaterialComponents.Headline4" id="0x7f13019e" />
+    <public type="style" name="TextAppearance.MaterialComponents.Headline5" id="0x7f13019f" />
+    <public type="style" name="TextAppearance.MaterialComponents.Headline6" id="0x7f1301a0" />
+    <public type="style" name="TextAppearance.MaterialComponents.Overline" id="0x7f1301a1" />
+    <public type="style" name="TextAppearance.MaterialComponents.Subtitle1" id="0x7f1301a2" />
+    <public type="style" name="TextAppearance.MaterialComponents.Subtitle2" id="0x7f1301a3" />
+    <public type="style" name="TextAppearance.MaterialComponents.Tab" id="0x7f1301a4" />
+    <public type="style" name="TextAppearance.Widget.AppCompat.ExpandedMenu.Item" id="0x7f1301a5" />
+    <public type="style" name="TextAppearance.Widget.AppCompat.Toolbar.Subtitle" id="0x7f1301a6" />
+    <public type="style" name="TextAppearance.Widget.AppCompat.Toolbar.Title" id="0x7f1301a7" />
+    <public type="style" name="Theme.AppCompat" id="0x7f1301a8" />
+    <public type="style" name="Theme.AppCompat.CompactMenu" id="0x7f1301a9" />
+    <public type="style" name="Theme.AppCompat.DayNight" id="0x7f1301aa" />
+    <public type="style" name="Theme.AppCompat.DayNight.DarkActionBar" id="0x7f1301ab" />
+    <public type="style" name="Theme.AppCompat.DayNight.Dialog" id="0x7f1301ac" />
+    <public type="style" name="Theme.AppCompat.DayNight.Dialog.Alert" id="0x7f1301ad" />
+    <public type="style" name="Theme.AppCompat.DayNight.Dialog.MinWidth" id="0x7f1301ae" />
+    <public type="style" name="Theme.AppCompat.DayNight.DialogWhenLarge" id="0x7f1301af" />
+    <public type="style" name="Theme.AppCompat.DayNight.NoActionBar" id="0x7f1301b0" />
+    <public type="style" name="Theme.AppCompat.Dialog" id="0x7f1301b1" />
+    <public type="style" name="Theme.AppCompat.Dialog.Alert" id="0x7f1301b2" />
+    <public type="style" name="Theme.AppCompat.Dialog.MinWidth" id="0x7f1301b3" />
+    <public type="style" name="Theme.AppCompat.DialogWhenLarge" id="0x7f1301b4" />
+    <public type="style" name="Theme.AppCompat.Light" id="0x7f1301b5" />
+    <public type="style" name="Theme.AppCompat.Light.DarkActionBar" id="0x7f1301b6" />
+    <public type="style" name="Theme.AppCompat.Light.Dialog" id="0x7f1301b7" />
+    <public type="style" name="Theme.AppCompat.Light.Dialog.Alert" id="0x7f1301b8" />
+    <public type="style" name="Theme.AppCompat.Light.Dialog.MinWidth" id="0x7f1301b9" />
+    <public type="style" name="Theme.AppCompat.Light.DialogWhenLarge" id="0x7f1301ba" />
+    <public type="style" name="Theme.AppCompat.Light.NoActionBar" id="0x7f1301bb" />
+    <public type="style" name="Theme.AppCompat.NoActionBar" id="0x7f1301bc" />
+    <public type="style" name="Theme.AppInvite.Preview" id="0x7f1301bd" />
+    <public type="style" name="Theme.AppInvite.Preview.Base" id="0x7f1301be" />
+    <public type="style" name="Theme.Design" id="0x7f1301bf" />
+    <public type="style" name="Theme.Design.BottomSheetDialog" id="0x7f1301c0" />
+    <public type="style" name="Theme.Design.Light" id="0x7f1301c1" />
+    <public type="style" name="Theme.Design.Light.BottomSheetDialog" id="0x7f1301c2" />
+    <public type="style" name="Theme.Design.Light.NoActionBar" id="0x7f1301c3" />
+    <public type="style" name="Theme.Design.NoActionBar" id="0x7f1301c4" />
+    <public type="style" name="Theme.MaterialComponents" id="0x7f1301c5" />
+    <public type="style" name="Theme.MaterialComponents.BottomSheetDialog" id="0x7f1301c6" />
+    <public type="style" name="Theme.MaterialComponents.Bridge" id="0x7f1301c7" />
+    <public type="style" name="Theme.MaterialComponents.CompactMenu" id="0x7f1301c8" />
+    <public type="style" name="Theme.MaterialComponents.Dialog" id="0x7f1301c9" />
+    <public type="style" name="Theme.MaterialComponents.Dialog.Alert" id="0x7f1301ca" />
+    <public type="style" name="Theme.MaterialComponents.Dialog.MinWidth" id="0x7f1301cb" />
+    <public type="style" name="Theme.MaterialComponents.DialogWhenLarge" id="0x7f1301cc" />
+    <public type="style" name="Theme.MaterialComponents.Light" id="0x7f1301cd" />
+    <public type="style" name="Theme.MaterialComponents.Light.BottomSheetDialog" id="0x7f1301ce" />
+    <public type="style" name="Theme.MaterialComponents.Light.Bridge" id="0x7f1301cf" />
+    <public type="style" name="Theme.MaterialComponents.Light.DarkActionBar" id="0x7f1301d0" />
+    <public type="style" name="Theme.MaterialComponents.Light.DarkActionBar.Bridge" id="0x7f1301d1" />
+    <public type="style" name="Theme.MaterialComponents.Light.Dialog" id="0x7f1301d2" />
+    <public type="style" name="Theme.MaterialComponents.Light.Dialog.Alert" id="0x7f1301d3" />
+    <public type="style" name="Theme.MaterialComponents.Light.Dialog.MinWidth" id="0x7f1301d4" />
+    <public type="style" name="Theme.MaterialComponents.Light.DialogWhenLarge" id="0x7f1301d5" />
+    <public type="style" name="Theme.MaterialComponents.Light.NoActionBar" id="0x7f1301d6" />
+    <public type="style" name="Theme.MaterialComponents.Light.NoActionBar.Bridge" id="0x7f1301d7" />
+    <public type="style" name="Theme.MaterialComponents.NoActionBar" id="0x7f1301d8" />
+    <public type="style" name="Theme.MaterialComponents.NoActionBar.Bridge" id="0x7f1301d9" />
+    <public type="style" name="ThemeOverlay.AppCompat" id="0x7f1301da" />
+    <public type="style" name="ThemeOverlay.AppCompat.ActionBar" id="0x7f1301db" />
+    <public type="style" name="ThemeOverlay.AppCompat.Dark" id="0x7f1301dc" />
+    <public type="style" name="ThemeOverlay.AppCompat.Dark.ActionBar" id="0x7f1301dd" />
+    <public type="style" name="ThemeOverlay.AppCompat.Dialog" id="0x7f1301de" />
+    <public type="style" name="ThemeOverlay.AppCompat.Dialog.Alert" id="0x7f1301df" />
+    <public type="style" name="ThemeOverlay.AppCompat.Light" id="0x7f1301e0" />
+    <public type="style" name="ThemeOverlay.MaterialComponents" id="0x7f1301e1" />
+    <public type="style" name="ThemeOverlay.MaterialComponents.ActionBar" id="0x7f1301e2" />
+    <public type="style" name="ThemeOverlay.MaterialComponents.Dark" id="0x7f1301e3" />
+    <public type="style" name="ThemeOverlay.MaterialComponents.Dark.ActionBar" id="0x7f1301e4" />
+    <public type="style" name="ThemeOverlay.MaterialComponents.Dialog" id="0x7f1301e5" />
+    <public type="style" name="ThemeOverlay.MaterialComponents.Dialog.Alert" id="0x7f1301e6" />
+    <public type="style" name="ThemeOverlay.MaterialComponents.Light" id="0x7f1301e7" />
+    <public type="style" name="ThemeOverlay.MaterialComponents.TextInputEditText" id="0x7f1301e8" />
+    <public type="style" name="ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox" id="0x7f1301e9" />
+    <public type="style" name="ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox.Dense" id="0x7f1301ea" />
+    <public type="style" name="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox" id="0x7f1301eb" />
+    <public type="style" name="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox.Dense" id="0x7f1301ec" />
+    <public type="style" name="UiKit" id="0x7f1301ed" />
+    <public type="style" name="UiKit.Alert.Verify.Account.Method" id="0x7f1301ee" />
+    <public type="style" name="UiKit.Alert.Verify.Account.Method.Container" id="0x7f1301ef" />
+    <public type="style" name="UiKit.Alert.Verify.Account.Method.Wrapper" id="0x7f1301f0" />
+    <public type="style" name="UiKit.Anim.Verify.By.Email" id="0x7f1301f1" />
+    <public type="style" name="UiKit.Anim.Verify.By.Email.Frozen" id="0x7f1301f2" />
+    <public type="style" name="UiKit.Anim.Verify.By.Phone" id="0x7f1301f3" />
+    <public type="style" name="UiKit.Anim.Verify.By.Phone.Frozen" id="0x7f1301f4" />
+    <public type="style" name="UiKit.Auth.Note.Rotatable" id="0x7f1301f5" />
+    <public type="style" name="UiKit.Auth.Spots" id="0x7f1301f6" />
+    <public type="style" name="UiKit.Auth.Spots.Bot" id="0x7f1301f7" />
+    <public type="style" name="UiKit.Auth.Spots.Bot.Left" id="0x7f1301f8" />
+    <public type="style" name="UiKit.Auth.Spots.Bot.Right" id="0x7f1301f9" />
+    <public type="style" name="UiKit.Auth.Spots.Top" id="0x7f1301fa" />
+    <public type="style" name="UiKit.AuthButton" id="0x7f1301fb" />
+    <public type="style" name="UiKit.AuthButton.Transparent" id="0x7f1301fc" />
+    <public type="style" name="UiKit.AuthButtonTheme.Transparent" id="0x7f1301fd" />
+    <public type="style" name="UiKit.AuthCopyContainer" id="0x7f1301fe" />
+    <public type="style" name="UiKit.AuthToolbar" id="0x7f1301ff" />
+    <public type="style" name="UiKit.AuthToolbarTheme" id="0x7f130200" />
+    <public type="style" name="UiKit.Button" id="0x7f130201" />
+    <public type="style" name="UiKit.Button.Calls.TransparentDark" id="0x7f130202" />
+    <public type="style" name="UiKit.Button.Compact" id="0x7f130203" />
+    <public type="style" name="UiKit.Button.Dark" id="0x7f130204" />
+    <public type="style" name="UiKit.Button.Fit" id="0x7f130205" />
+    <public type="style" name="UiKit.Button.Green" id="0x7f130206" />
+    <public type="style" name="UiKit.Button.Green.Fit" id="0x7f130207" />
+    <public type="style" name="UiKit.Button.Green.Fit.Outline" id="0x7f130208" />
+    <public type="style" name="UiKit.Button.Green.Outline" id="0x7f130209" />
+    <public type="style" name="UiKit.Button.Grey" id="0x7f13020a" />
+    <public type="style" name="UiKit.Button.Grey.Fit" id="0x7f13020b" />
+    <public type="style" name="UiKit.Button.Grey.Fit.Outline" id="0x7f13020c" />
+    <public type="style" name="UiKit.Button.Grey.Outline" id="0x7f13020d" />
+    <public type="style" name="UiKit.Button.Outline" id="0x7f13020e" />
+    <public type="style" name="UiKit.Button.Red" id="0x7f13020f" />
+    <public type="style" name="UiKit.Button.Red.Fit" id="0x7f130210" />
+    <public type="style" name="UiKit.Button.Red.Fit.Outline" id="0x7f130211" />
+    <public type="style" name="UiKit.Button.Red.Outline" id="0x7f130212" />
+    <public type="style" name="UiKit.Button.Theme" id="0x7f130213" />
+    <public type="style" name="UiKit.Button.Theme.Dark" id="0x7f130214" />
+    <public type="style" name="UiKit.Button.Theme.Green" id="0x7f130215" />
+    <public type="style" name="UiKit.Button.Theme.Grey" id="0x7f130216" />
+    <public type="style" name="UiKit.Button.Theme.Red" id="0x7f130217" />
+    <public type="style" name="UiKit.Button.Theme.White" id="0x7f130218" />
+    <public type="style" name="UiKit.Button.Transparent" id="0x7f130219" />
+    <public type="style" name="UiKit.Button.Transparent.Fit" id="0x7f13021a" />
+    <public type="style" name="UiKit.Button.White" id="0x7f13021b" />
+    <public type="style" name="UiKit.Button.White.Outline" id="0x7f13021c" />
+    <public type="style" name="UiKit.Button.White.Outline.Themed" id="0x7f13021d" />
+    <public type="style" name="UiKit.Calls.ButtonCircle" id="0x7f13021e" />
+    <public type="style" name="UiKit.Calls.ButtonText" id="0x7f13021f" />
+    <public type="style" name="UiKit.Chat.Embed.CardView" id="0x7f130220" />
+    <public type="style" name="UiKit.Chat.Embed.Container" id="0x7f130221" />
+    <public type="style" name="UiKit.Chat.Embed.Footer" id="0x7f130222" />
+    <public type="style" name="UiKit.Chat.Embed.Header" id="0x7f130223" />
+    <public type="style" name="UiKit.Chat.Embed.Subtext" id="0x7f130224" />
+    <public type="style" name="UiKit.Chat.Guideline" id="0x7f130225" />
+    <public type="style" name="UiKit.Chat.Text" id="0x7f130226" />
+    <public type="style" name="UiKit.CheckableImageView" id="0x7f130227" />
+    <public type="style" name="UiKit.Checkbox" id="0x7f130228" />
+    <public type="style" name="UiKit.CheckedSetting" id="0x7f130229" />
+    <public type="style" name="UiKit.CheckedSetting.Themed" id="0x7f13022a" />
+    <public type="style" name="UiKit.Copy" id="0x7f13022b" />
+    <public type="style" name="UiKit.Copy.Anchor" id="0x7f13022c" />
+    <public type="style" name="UiKit.Copy.Anchor.Base" id="0x7f13022d" />
+    <public type="style" name="UiKit.Copy.Anchor.Item.Rotatable" id="0x7f13022e" />
+    <public type="style" name="UiKit.Copy.Container" id="0x7f13022f" />
+    <public type="style" name="UiKit.Copy.EditText.Wrap" id="0x7f130230" />
+    <public type="style" name="UiKit.Dialog.Animation" id="0x7f130231" />
+    <public type="style" name="UiKit.Dialog.Body" id="0x7f130232" />
+    <public type="style" name="UiKit.Dialog.ButtonContainer" id="0x7f130233" />
+    <public type="style" name="UiKit.Dialog.Container" id="0x7f130234" />
+    <public type="style" name="UiKit.Dialog.Subtitle" id="0x7f130235" />
+    <public type="style" name="UiKit.Dialog.Title" id="0x7f130236" />
+    <public type="style" name="UiKit.DimmerView" id="0x7f130237" />
+    <public type="style" name="UiKit.Divider" id="0x7f130238" />
+    <public type="style" name="UiKit.Divider.Thick" id="0x7f130239" />
+    <public type="style" name="UiKit.Divider.Vertical" id="0x7f13023a" />
+    <public type="style" name="UiKit.EditText" id="0x7f13023b" />
+    <public type="style" name="UiKit.EditText.Number" id="0x7f13023c" />
+    <public type="style" name="UiKit.EditText.Phone" id="0x7f13023d" />
+    <public type="style" name="UiKit.EditText.Themed" id="0x7f13023e" />
+    <public type="style" name="UiKit.Form.Field.EditText" id="0x7f13023f" />
+    <public type="style" name="UiKit.Form.Field.EditText.Password" id="0x7f130240" />
+    <public type="style" name="UiKit.Form.Field.EditText.SingleLine" id="0x7f130241" />
+    <public type="style" name="UiKit.Form.Field.EditText.Wrap" id="0x7f130242" />
+    <public type="style" name="UiKit.Form.Field.EditText.Wrap.Password" id="0x7f130243" />
+    <public type="style" name="UiKit.Form.Label" id="0x7f130244" />
+    <public type="style" name="UiKit.GiftEmbedDisabledButton" id="0x7f130245" />
+    <public type="style" name="UiKit.Guideline" id="0x7f130246" />
+    <public type="style" name="UiKit.GuildsList" id="0x7f130247" />
+    <public type="style" name="UiKit.GuildsList.Horiz" id="0x7f130248" />
+    <public type="style" name="UiKit.GuildsListCreate" id="0x7f130249" />
+    <public type="style" name="UiKit.GuildsListDividerIcon" id="0x7f13024a" />
+    <public type="style" name="UiKit.GuildsListDividerIconHoriz" id="0x7f13024b" />
+    <public type="style" name="UiKit.GuildsListIcon" id="0x7f13024c" />
+    <public type="style" name="UiKit.GuildsListItem" id="0x7f13024d" />
+    <public type="style" name="UiKit.GuildsListItem.Wrap" id="0x7f13024e" />
+    <public type="style" name="UiKit.GuildsListItemHoriz" id="0x7f13024f" />
+    <public type="style" name="UiKit.GuildsListItemHoriz.Wrap" id="0x7f130250" />
+    <public type="style" name="UiKit.GuildsListMentions" id="0x7f130251" />
+    <public type="style" name="UiKit.GuildsListSelected" id="0x7f130252" />
+    <public type="style" name="UiKit.GuildsListSelectedHoriz" id="0x7f130253" />
+    <public type="style" name="UiKit.GuildsListUnavailable" id="0x7f130254" />
+    <public type="style" name="UiKit.GuildsListUnread" id="0x7f130255" />
+    <public type="style" name="UiKit.GuildsListUnreadHoriz" id="0x7f130256" />
+    <public type="style" name="UiKit.GuildsListVoiceIcon" id="0x7f130257" />
+    <public type="style" name="UiKit.ImageButton" id="0x7f130258" />
+    <public type="style" name="UiKit.ImageView" id="0x7f130259" />
+    <public type="style" name="UiKit.ImageView.Clickable" id="0x7f13025a" />
+    <public type="style" name="UiKit.ImageView.Clickable.Corner.TopEnd" id="0x7f13025b" />
+    <public type="style" name="UiKit.ImageView.HideInLandscape" id="0x7f13025c" />
+    <public type="style" name="UiKit.LottieAnimationView" id="0x7f13025d" />
+    <public type="style" name="UiKit.Notice.Popup.Animation" id="0x7f13025e" />
+    <public type="style" name="UiKit.Profile.Strip.Icon" id="0x7f13025f" />
+    <public type="style" name="UiKit.ProgressBar.Line.Horizontal.Determinate" id="0x7f130260" />
+    <public type="style" name="UiKit.ProgressBar.White" id="0x7f130261" />
+    <public type="style" name="UiKit.QuickSwitcher.Animation" id="0x7f130262" />
+    <public type="style" name="UiKit.RadioButton" id="0x7f130263" />
+    <public type="style" name="UiKit.Search.Chip" id="0x7f130264" />
+    <public type="style" name="UiKit.Search.EditText" id="0x7f130265" />
+    <public type="style" name="UiKit.Search.Header" id="0x7f130266" />
+    <public type="style" name="UiKit.SearchInput" id="0x7f130267" />
+    <public type="style" name="UiKit.SeekBar" id="0x7f130268" />
+    <public type="style" name="UiKit.Settings" id="0x7f130269" />
+    <public type="style" name="UiKit.Settings.Base.Item" id="0x7f13026a" />
+    <public type="style" name="UiKit.Settings.Divider" id="0x7f13026b" />
+    <public type="style" name="UiKit.Settings.Item" id="0x7f13026c" />
+    <public type="style" name="UiKit.Settings.Item.Addition" id="0x7f13026d" />
+    <public type="style" name="UiKit.Settings.Item.Header" id="0x7f13026e" />
+    <public type="style" name="UiKit.Settings.Item.Icon" id="0x7f13026f" />
+    <public type="style" name="UiKit.Settings.Item.Label" id="0x7f130270" />
+    <public type="style" name="UiKit.Settings.Item.SubText" id="0x7f130271" />
+    <public type="style" name="UiKit.Settings.Text" id="0x7f130272" />
+    <public type="style" name="UiKit.Sheet.Guideline" id="0x7f130273" />
+    <public type="style" name="UiKit.Sheet.Header" id="0x7f130274" />
+    <public type="style" name="UiKit.Sheet.Header.Contents" id="0x7f130275" />
+    <public type="style" name="UiKit.Sheet.Header.Icon" id="0x7f130276" />
+    <public type="style" name="UiKit.Sheet.Header.Title" id="0x7f130277" />
+    <public type="style" name="UiKit.SuperBar" id="0x7f130278" />
+    <public type="style" name="UiKit.Tabs" id="0x7f130279" />
+    <public type="style" name="UiKit.Tabs.TextAppearance" id="0x7f13027a" />
+    <public type="style" name="UiKit.TextInputLayout" id="0x7f13027b" />
+    <public type="style" name="UiKit.TextInputLayout.EditText" id="0x7f13027c" />
+    <public type="style" name="UiKit.TextInputLayout.EditText.Dense" id="0x7f13027d" />
+    <public type="style" name="UiKit.TextInputLayout.TextAppearance" id="0x7f13027e" />
+    <public type="style" name="UiKit.TextView" id="0x7f13027f" />
+    <public type="style" name="UiKit.TextView.Bold" id="0x7f130280" />
+    <public type="style" name="UiKit.TextView.H1" id="0x7f130281" />
+    <public type="style" name="UiKit.TextView.H1.Bold" id="0x7f130282" />
+    <public type="style" name="UiKit.TextView.H2" id="0x7f130283" />
+    <public type="style" name="UiKit.TextView.Large" id="0x7f130284" />
+    <public type="style" name="UiKit.TextView.Large.SingleLine" id="0x7f130285" />
+    <public type="style" name="UiKit.TextView.Link" id="0x7f130286" />
+    <public type="style" name="UiKit.TextView.Marquee" id="0x7f130287" />
+    <public type="style" name="UiKit.TextView.NoResults" id="0x7f130288" />
+    <public type="style" name="UiKit.TextView.Perk" id="0x7f130289" />
+    <public type="style" name="UiKit.TextView.Semibold" id="0x7f13028a" />
+    <public type="style" name="UiKit.TextView.SingleLine" id="0x7f13028b" />
+    <public type="style" name="UiKit.TextView.Subtext" id="0x7f13028c" />
+    <public type="style" name="UiKit.TextView.Subtext.Semibold" id="0x7f13028d" />
+    <public type="style" name="UiKit.TextView.Subtext.Semibold.SingleLine" id="0x7f13028e" />
+    <public type="style" name="UiKit.TextView.Subtext.SingleLine" id="0x7f13028f" />
+    <public type="style" name="UiKit.Toast" id="0x7f130290" />
+    <public type="style" name="UiKit.Toolbar.TextAppearance" id="0x7f130291" />
+    <public type="style" name="UiKit.Toolbar.TextAppearance.Subtitle" id="0x7f130292" />
+    <public type="style" name="UiKit.Toolbar.TextAppearance.Title" id="0x7f130293" />
+    <public type="style" name="UiKit.User.Phone.Add.Number" id="0x7f130294" />
+    <public type="style" name="UiKit.User.Phone.Add.Number.Verify" id="0x7f130295" />
+    <public type="style" name="UiKit.User.Phone.Verify.Digit" id="0x7f130296" />
+    <public type="style" name="UiKit.User.Phone.Verify.Digit.Left" id="0x7f130297" />
+    <public type="style" name="UiKit.User.Phone.Verify.Digits" id="0x7f130298" />
+    <public type="style" name="UiKit.UserSheetRichPresenceContainer" id="0x7f130299" />
+    <public type="style" name="UiKit.ViewGroup" id="0x7f13029a" />
+    <public type="style" name="UiKit.ViewGroup.ConstraintLayout" id="0x7f13029b" />
+    <public type="style" name="UiKit.ViewGroup.LinearLayout" id="0x7f13029c" />
+    <public type="style" name="UiKit.ViewGroup.LinearLayout.BottomSheet" id="0x7f13029d" />
+    <public type="style" name="UiKit.ViewGroup.LinearLayout.Horizontal" id="0x7f13029e" />
+    <public type="style" name="UiKit.ViewGroup.LinearLayout.Rotatable" id="0x7f13029f" />
+    <public type="style" name="UiKit.ViewGroup.LinearLayout.Rotatable.Horizontal" id="0x7f1302a0" />
+    <public type="style" name="UiKit.ViewGroup.NestedScrollView" id="0x7f1302a1" />
+    <public type="style" name="UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior" id="0x7f1302a2" />
+    <public type="style" name="UiKit.ViewGroup.Page" id="0x7f1302a3" />
+    <public type="style" name="UiKit.ViewGroup.Page.LinearLayout" id="0x7f1302a4" />
+    <public type="style" name="UiKit.ViewGroup.Page.LinearLayout.Horizontal" id="0x7f1302a5" />
+    <public type="style" name="UiKit.ViewGroup.RecyclerView" id="0x7f1302a6" />
+    <public type="style" name="UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" id="0x7f1302a7" />
+    <public type="style" name="UiKit.ViewGroup.RecyclerView.Horizontal" id="0x7f1302a8" />
+    <public type="style" name="UiKit.ViewGroup.RelativeLayout" id="0x7f1302a9" />
+    <public type="style" name="UiKit.ViewGroup.RelativeLayout.AppBarScrollingViewBehavior" id="0x7f1302aa" />
+    <public type="style" name="UiKit.ViewGroup.ScrollView" id="0x7f1302ab" />
+    <public type="style" name="UiKit.ViewGroup.ScrollView.Horizontal" id="0x7f1302ac" />
+    <public type="style" name="UiKit.ViewGroup.ScrollView.Page" id="0x7f1302ad" />
+    <public type="style" name="UiKit.WelcomeMessageCard" id="0x7f1302ae" />
+    <public type="style" name="Widget.AppCompat.ActionBar" id="0x7f1302af" />
+    <public type="style" name="Widget.AppCompat.ActionBar.Solid" id="0x7f1302b0" />
+    <public type="style" name="Widget.AppCompat.ActionBar.TabBar" id="0x7f1302b1" />
+    <public type="style" name="Widget.AppCompat.ActionBar.TabText" id="0x7f1302b2" />
+    <public type="style" name="Widget.AppCompat.ActionBar.TabView" id="0x7f1302b3" />
+    <public type="style" name="Widget.AppCompat.ActionButton" id="0x7f1302b4" />
+    <public type="style" name="Widget.AppCompat.ActionButton.CloseMode" id="0x7f1302b5" />
+    <public type="style" name="Widget.AppCompat.ActionButton.Overflow" id="0x7f1302b6" />
+    <public type="style" name="Widget.AppCompat.ActionMode" id="0x7f1302b7" />
+    <public type="style" name="Widget.AppCompat.ActivityChooserView" id="0x7f1302b8" />
+    <public type="style" name="Widget.AppCompat.AutoCompleteTextView" id="0x7f1302b9" />
+    <public type="style" name="Widget.AppCompat.Button" id="0x7f1302ba" />
+    <public type="style" name="Widget.AppCompat.Button.Borderless" id="0x7f1302bb" />
+    <public type="style" name="Widget.AppCompat.Button.Borderless.Colored" id="0x7f1302bc" />
+    <public type="style" name="Widget.AppCompat.Button.ButtonBar.AlertDialog" id="0x7f1302bd" />
+    <public type="style" name="Widget.AppCompat.Button.Colored" id="0x7f1302be" />
+    <public type="style" name="Widget.AppCompat.Button.Small" id="0x7f1302bf" />
+    <public type="style" name="Widget.AppCompat.ButtonBar" id="0x7f1302c0" />
+    <public type="style" name="Widget.AppCompat.ButtonBar.AlertDialog" id="0x7f1302c1" />
+    <public type="style" name="Widget.AppCompat.CompoundButton.CheckBox" id="0x7f1302c2" />
+    <public type="style" name="Widget.AppCompat.CompoundButton.RadioButton" id="0x7f1302c3" />
+    <public type="style" name="Widget.AppCompat.CompoundButton.Switch" id="0x7f1302c4" />
+    <public type="style" name="Widget.AppCompat.DrawerArrowToggle" id="0x7f1302c5" />
+    <public type="style" name="Widget.AppCompat.DropDownItem.Spinner" id="0x7f1302c6" />
+    <public type="style" name="Widget.AppCompat.EditText" id="0x7f1302c7" />
+    <public type="style" name="Widget.AppCompat.ImageButton" id="0x7f1302c8" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar" id="0x7f1302c9" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.Solid" id="0x7f1302ca" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.Solid.Inverse" id="0x7f1302cb" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabBar" id="0x7f1302cc" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabBar.Inverse" id="0x7f1302cd" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabText" id="0x7f1302ce" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabText.Inverse" id="0x7f1302cf" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabView" id="0x7f1302d0" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabView.Inverse" id="0x7f1302d1" />
+    <public type="style" name="Widget.AppCompat.Light.ActionButton" id="0x7f1302d2" />
+    <public type="style" name="Widget.AppCompat.Light.ActionButton.CloseMode" id="0x7f1302d3" />
+    <public type="style" name="Widget.AppCompat.Light.ActionButton.Overflow" id="0x7f1302d4" />
+    <public type="style" name="Widget.AppCompat.Light.ActionMode.Inverse" id="0x7f1302d5" />
+    <public type="style" name="Widget.AppCompat.Light.ActivityChooserView" id="0x7f1302d6" />
+    <public type="style" name="Widget.AppCompat.Light.AutoCompleteTextView" id="0x7f1302d7" />
+    <public type="style" name="Widget.AppCompat.Light.DropDownItem.Spinner" id="0x7f1302d8" />
+    <public type="style" name="Widget.AppCompat.Light.ListPopupWindow" id="0x7f1302d9" />
+    <public type="style" name="Widget.AppCompat.Light.ListView.DropDown" id="0x7f1302da" />
+    <public type="style" name="Widget.AppCompat.Light.PopupMenu" id="0x7f1302db" />
+    <public type="style" name="Widget.AppCompat.Light.PopupMenu.Overflow" id="0x7f1302dc" />
+    <public type="style" name="Widget.AppCompat.Light.SearchView" id="0x7f1302dd" />
+    <public type="style" name="Widget.AppCompat.Light.Spinner.DropDown.ActionBar" id="0x7f1302de" />
+    <public type="style" name="Widget.AppCompat.ListMenuView" id="0x7f1302df" />
+    <public type="style" name="Widget.AppCompat.ListPopupWindow" id="0x7f1302e0" />
+    <public type="style" name="Widget.AppCompat.ListView" id="0x7f1302e1" />
+    <public type="style" name="Widget.AppCompat.ListView.DropDown" id="0x7f1302e2" />
+    <public type="style" name="Widget.AppCompat.ListView.Menu" id="0x7f1302e3" />
+    <public type="style" name="Widget.AppCompat.PopupMenu" id="0x7f1302e4" />
+    <public type="style" name="Widget.AppCompat.PopupMenu.Overflow" id="0x7f1302e5" />
+    <public type="style" name="Widget.AppCompat.PopupWindow" id="0x7f1302e6" />
+    <public type="style" name="Widget.AppCompat.ProgressBar" id="0x7f1302e7" />
+    <public type="style" name="Widget.AppCompat.ProgressBar.Horizontal" id="0x7f1302e8" />
+    <public type="style" name="Widget.AppCompat.RatingBar" id="0x7f1302e9" />
+    <public type="style" name="Widget.AppCompat.RatingBar.Indicator" id="0x7f1302ea" />
+    <public type="style" name="Widget.AppCompat.RatingBar.Small" id="0x7f1302eb" />
+    <public type="style" name="Widget.AppCompat.SearchView" id="0x7f1302ec" />
+    <public type="style" name="Widget.AppCompat.SearchView.ActionBar" id="0x7f1302ed" />
+    <public type="style" name="Widget.AppCompat.SeekBar" id="0x7f1302ee" />
+    <public type="style" name="Widget.AppCompat.SeekBar.Discrete" id="0x7f1302ef" />
+    <public type="style" name="Widget.AppCompat.Spinner" id="0x7f1302f0" />
+    <public type="style" name="Widget.AppCompat.Spinner.DropDown" id="0x7f1302f1" />
+    <public type="style" name="Widget.AppCompat.Spinner.DropDown.ActionBar" id="0x7f1302f2" />
+    <public type="style" name="Widget.AppCompat.Spinner.Underlined" id="0x7f1302f3" />
+    <public type="style" name="Widget.AppCompat.TextView.SpinnerItem" id="0x7f1302f4" />
+    <public type="style" name="Widget.AppCompat.Toolbar" id="0x7f1302f5" />
+    <public type="style" name="Widget.AppCompat.Toolbar.Button.Navigation" id="0x7f1302f6" />
+    <public type="style" name="Widget.CameraView" id="0x7f1302f7" />
+    <public type="style" name="Widget.Compat.NotificationActionContainer" id="0x7f1302f8" />
+    <public type="style" name="Widget.Compat.NotificationActionText" id="0x7f1302f9" />
+    <public type="style" name="Widget.Design.AppBarLayout" id="0x7f1302fa" />
+    <public type="style" name="Widget.Design.BottomNavigationView" id="0x7f1302fb" />
+    <public type="style" name="Widget.Design.BottomSheet.Modal" id="0x7f1302fc" />
+    <public type="style" name="Widget.Design.CollapsingToolbar" id="0x7f1302fd" />
+    <public type="style" name="Widget.Design.FloatingActionButton" id="0x7f1302fe" />
+    <public type="style" name="Widget.Design.NavigationView" id="0x7f1302ff" />
+    <public type="style" name="Widget.Design.ScrimInsetsFrameLayout" id="0x7f130300" />
+    <public type="style" name="Widget.Design.Snackbar" id="0x7f130301" />
+    <public type="style" name="Widget.Design.TabLayout" id="0x7f130302" />
+    <public type="style" name="Widget.Design.TextInputLayout" id="0x7f130303" />
+    <public type="style" name="Widget.MaterialComponents.BottomAppBar" id="0x7f130304" />
+    <public type="style" name="Widget.MaterialComponents.BottomAppBar.Colored" id="0x7f130305" />
+    <public type="style" name="Widget.MaterialComponents.BottomNavigationView" id="0x7f130306" />
+    <public type="style" name="Widget.MaterialComponents.BottomNavigationView.Colored" id="0x7f130307" />
+    <public type="style" name="Widget.MaterialComponents.BottomSheet.Modal" id="0x7f130308" />
+    <public type="style" name="Widget.MaterialComponents.Button" id="0x7f130309" />
+    <public type="style" name="Widget.MaterialComponents.Button.Icon" id="0x7f13030a" />
+    <public type="style" name="Widget.MaterialComponents.Button.OutlinedButton" id="0x7f13030b" />
+    <public type="style" name="Widget.MaterialComponents.Button.OutlinedButton.Icon" id="0x7f13030c" />
+    <public type="style" name="Widget.MaterialComponents.Button.TextButton" id="0x7f13030d" />
+    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Dialog" id="0x7f13030e" />
+    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Dialog.Icon" id="0x7f13030f" />
+    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Icon" id="0x7f130310" />
+    <public type="style" name="Widget.MaterialComponents.Button.UnelevatedButton" id="0x7f130311" />
+    <public type="style" name="Widget.MaterialComponents.Button.UnelevatedButton.Icon" id="0x7f130312" />
+    <public type="style" name="Widget.MaterialComponents.CardView" id="0x7f130313" />
+    <public type="style" name="Widget.MaterialComponents.Chip.Action" id="0x7f130314" />
+    <public type="style" name="Widget.MaterialComponents.Chip.Choice" id="0x7f130315" />
+    <public type="style" name="Widget.MaterialComponents.Chip.Entry" id="0x7f130316" />
+    <public type="style" name="Widget.MaterialComponents.Chip.Filter" id="0x7f130317" />
+    <public type="style" name="Widget.MaterialComponents.ChipGroup" id="0x7f130318" />
+    <public type="style" name="Widget.MaterialComponents.FloatingActionButton" id="0x7f130319" />
+    <public type="style" name="Widget.MaterialComponents.NavigationView" id="0x7f13031a" />
+    <public type="style" name="Widget.MaterialComponents.Snackbar" id="0x7f13031b" />
+    <public type="style" name="Widget.MaterialComponents.Snackbar.FullWidth" id="0x7f13031c" />
+    <public type="style" name="Widget.MaterialComponents.TabLayout" id="0x7f13031d" />
+    <public type="style" name="Widget.MaterialComponents.TabLayout.Colored" id="0x7f13031e" />
+    <public type="style" name="Widget.MaterialComponents.TextInputEditText.FilledBox" id="0x7f13031f" />
+    <public type="style" name="Widget.MaterialComponents.TextInputEditText.FilledBox.Dense" id="0x7f130320" />
+    <public type="style" name="Widget.MaterialComponents.TextInputEditText.OutlinedBox" id="0x7f130321" />
+    <public type="style" name="Widget.MaterialComponents.TextInputEditText.OutlinedBox.Dense" id="0x7f130322" />
+    <public type="style" name="Widget.MaterialComponents.TextInputLayout.FilledBox" id="0x7f130323" />
+    <public type="style" name="Widget.MaterialComponents.TextInputLayout.FilledBox.Dense" id="0x7f130324" />
+    <public type="style" name="Widget.MaterialComponents.TextInputLayout.OutlinedBox" id="0x7f130325" />
+    <public type="style" name="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" id="0x7f130326" />
+    <public type="style" name="Widget.MaterialComponents.Toolbar" id="0x7f130327" />
+    <public type="style" name="Widget.Support.CoordinatorLayout" id="0x7f130328" />
+    <public type="style" name="ucrop_ImageViewWidgetIcon" id="0x7f130329" />
+    <public type="style" name="ucrop_TextViewCropAspectRatio" id="0x7f13032a" />
+    <public type="style" name="ucrop_TextViewWidgetText" id="0x7f13032b" />
+    <public type="style" name="ucrop_WrapperIconState" id="0x7f13032c" />
+    <public type="style" name="ucrop_WrapperRotateButton" id="0x7f13032d" />
+    <public type="style" name="AppTheme.SeekBar" id="0x7f130028" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Large" id="0x7f13004d" />
+    <public type="style" name="Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Small" id="0x7f13004e" />
+    <public type="style" name="Base.V21.Theme.AppCompat" id="0x7f1300a1" />
+    <public type="style" name="Base.V21.Theme.AppCompat.Dialog" id="0x7f1300a2" />
+    <public type="style" name="Base.V21.Theme.AppCompat.Light" id="0x7f1300a3" />
+    <public type="style" name="Base.V21.Theme.AppCompat.Light.Dialog" id="0x7f1300a4" />
+    <public type="style" name="Base.V21.ThemeOverlay.AppCompat.Dialog" id="0x7f1300a5" />
+    <public type="style" name="Platform.V21.AppCompat" id="0x7f13013b" />
+    <public type="style" name="Platform.V21.AppCompat.Light" id="0x7f13013c" />
+    <public type="style" name="Base.V22.Theme.AppCompat" id="0x7f1300a6" />
+    <public type="style" name="Base.V22.Theme.AppCompat.Light" id="0x7f1300a7" />
+    <public type="style" name="Base.V23.Theme.AppCompat" id="0x7f1300a8" />
+    <public type="style" name="Base.V23.Theme.AppCompat.Light" id="0x7f1300a9" />
+    <public type="style" name="Platform.V25.AppCompat" id="0x7f13013d" />
+    <public type="style" name="Platform.V25.AppCompat.Light" id="0x7f13013e" />
+    <public type="style" name="Base.V26.Theme.AppCompat" id="0x7f1300aa" />
+    <public type="style" name="Base.V26.Theme.AppCompat.Light" id="0x7f1300ab" />
+    <public type="style" name="Base.V26.Widget.AppCompat.Toolbar" id="0x7f1300ac" />
+    <public type="style" name="Base.V28.Theme.AppCompat" id="0x7f1300ad" />
+    <public type="style" name="Base.V28.Theme.AppCompat.Light" id="0x7f1300ae" />
     <public type="xml" name="file_paths" id="0x7f150000" />
 </resources>
\ No newline at end of file
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 4caa63cb74..96384348ef 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -130,6 +130,7 @@
     <string name="activity_panel_go_live_hotspot_dismiss_button">Got It!</string>
     <string name="activity_panel_go_live_hotspot_header">Use Go Live to stream gameplay directly to your friends!</string>
     <string name="activity_panel_go_live_tooltip">Go Live</string>
+    <string name="activity_panel_go_live_tooltip_cant_stream_during_dm_call">"You can't stream while participating in a DM call."</string>
     <string name="activity_panel_go_live_tooltip_no_permission_in_guild">You can’t stream into this server.</string>
     <string name="activity_panel_go_live_tooltip_no_permission_in_voice">You can’t stream into this channel.</string>
     <string name="activity_panel_go_live_tooltip_not_in_guild">Navigate to a server to start streaming.</string>
@@ -141,6 +142,7 @@
     <string name="add_a_role">Add a Role</string>
     <string name="add_a_server">Add a Server</string>
     <string name="add_a_server_mobile">Tap to add a server!</string>
+    <string name="add_by_id">Add by ID</string>
     <string name="add_channel_or_category">Add a Channel or Category</string>
     <string name="add_channel_to_override">Add a channel to override its default notification settings</string>
     <string name="add_content">Add Content</string>
@@ -190,6 +192,7 @@
     <string name="add_role_label">Add:</string>
     <string name="add_role_placeholder">Role</string>
     <string name="add_to_dictionary">Add to Dictionary</string>
+    <string name="added">Added</string>
     <string name="administrative">Administrative</string>
     <string name="administrator">Administrator</string>
     <string name="administrator_description">Members with this permission have every permission and also bypass channel specific permissions. This is a dangerous permission to grant.</string>
@@ -607,6 +610,7 @@
     <string name="attach_files">Attach Files</string>
     <string name="attach_payment_source_prompt_option">Attach a payment method to continue</string>
     <string name="attachment_camera">Camera</string>
+    <string name="attachment_compressing">Compressing files…</string>
     <string name="attachment_filename_unknown">unknown</string>
     <string name="attachment_files">File Selector</string>
     <string name="attachment_load_failed">Attachment could not be loaded</string>
@@ -780,6 +784,7 @@
     <string name="billing_sales_tax_included">Tax is included with the price.</string>
     <string name="billing_secure_tooltip">Your payment methods are encrypted and stored with a secure payment processing service.</string>
     <string name="billing_step_address">Address</string>
+    <string name="billing_step_awaiting_authentication">Awaiting Authentication</string>
     <string name="billing_step_credit_card_information">Payment Information</string>
     <string name="billing_step_payment_info">Payment Information</string>
     <string name="billing_step_payment_type">Payment Type</string>
@@ -967,6 +972,7 @@ Icon"</string>
     <string name="chat_attach_upload_a_file">Upload a File</string>
     <string name="chat_attach_upload_or_invite">Upload a file or send invites</string>
     <string name="chat_behavior">Chat Behavior</string>
+    <string name="chatters_description">Chatters are members in your server who either send messages or speak in voice channels.</string>
     <string name="checking_for_updates">Checking For Updates</string>
     <string name="choose">Choose</string>
     <string name="choose_an_application">Choose an application</string>
@@ -984,6 +990,7 @@ Icon"</string>
     <string name="close">Close</string>
     <string name="close_action_sheet">Close action sheet</string>
     <string name="close_dm">Close DM</string>
+    <string name="close_drawer">Close drawer</string>
     <string name="close_stream">Close Stream</string>
     <string name="close_window">Close Window</string>
     <string name="cloud_sync_icon_tooltip_done">Cloud Save Sync Completed</string>
@@ -1001,7 +1008,7 @@ Icon"</string>
     <string name="cloud_sync_modal_error_header">Unable to sync cloud saves</string>
     <string name="cloud_sync_modal_or">OR</string>
     <string name="collapse_category">Collapse Category</string>
-    <string name="com.crashlytics.android.build_id">2c940f48-a910-41c7-b7da-a69531b314cc</string>
+    <string name="com.crashlytics.android.build_id">840df02b-cf80-4d6b-a87d-a2661a9d07da</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="coming_soon_notifications">Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings.</string>
     <string name="coming_soon_title">COMING SOON!</string>
@@ -1054,6 +1061,7 @@ Icon"</string>
     <string name="connect_to_video">Connect to Video</string>
     <string name="connect_to_voice">Connect to Voice</string>
     <string name="connect_voice_only">Connect with Voice</string>
+    <string name="connect_with_discord">Connect with Discord</string>
     <string name="connected_account_revoked">This account has been revoked. Would you like to [reconnect](onReconnect) it?</string>
     <string name="connected_account_verify_failure">Failed to connect your **%1$s** account to **Discord**</string>
     <string name="connected_account_verify_success">Connected your **%1$s** account to **Discord**</string>
@@ -1070,6 +1078,7 @@ Icon"</string>
     <string name="connected_device_detected_option_output">Switch output only</string>
     <string name="connected_device_detected_output_body">Gearing up? Discord has detected a new audio output device named **%1$s**! Do you want to switch to it?</string>
     <string name="connected_device_detected_title">New Audio Device Detected</string>
+    <string name="connected_on_another_client">Connected on another client</string>
     <string name="connecting">Connecting</string>
     <string name="connecting_problems_cta">Connection problems? Let us know!</string>
     <string name="connection_enter_code">Enter the code as it appears on your screen</string>
@@ -1124,8 +1133,9 @@ Icon"</string>
     <string name="create">Create</string>
     <string name="create_category">Create Category</string>
     <string name="create_channel">Create Channel</string>
+    <string name="create_friend_dm">Create Friend DM</string>
     <string name="create_group_dm">Create Group DM</string>
-    <string name="create_instant_invite">Create Instant Invite</string>
+    <string name="create_instant_invite">Create Invite</string>
     <string name="create_lfg_listings_channel">Create LFG Channel</string>
     <string name="create_link">Create Link</string>
     <string name="create_listings">Create Groups</string>
@@ -1165,6 +1175,7 @@ Icon"</string>
     <string name="credit_card_name_on_card">Name On The Card</string>
     <string name="credit_card_number">Credit Card Number</string>
     <string name="credit_card_security_code">Security Code</string>
+    <string name="crop">Crop</string>
     <string name="cs">Czech</string>
     <string name="current_vs_prior_week">current vs. prior week</string>
     <string name="currently_controlling">Controlling your Discord</string>
@@ -1177,9 +1188,8 @@ Icon"</string>
     <string name="custom_status_hours">%1$s</string>
     <string name="custom_status_minutes">%1$s</string>
     <string name="custom_status_modal_body">"What's cookin', %1$s?"</string>
-    <string name="custom_status_modal_placeholder">Support has arrived</string>
-    <string name="custom_status_set_custom_status">Set Custom Status</string>
-    <string name="custom_status_set_voice_status">Set Voice Status</string>
+    <string name="custom_status_modal_placeholder">Support has arrived!</string>
+    <string name="custom_status_set_custom_status">Set a custom status</string>
     <string name="custom_status_today">Today</string>
     <string name="custom_tabs_mobile_body">Use Chrome Custom Tabs for links instead of an external browser.</string>
     <string name="custom_tabs_mobile_header">Use Chrome Custom Tabs</string>
@@ -1223,6 +1233,7 @@ Icon"</string>
     <string name="debug">Debug</string>
     <string name="decline">Decline</string>
     <string name="default_app_description">- None provided -</string>
+    <string name="default_failure_to_perform_action_message">"Oops! Looks like that didn't work"</string>
     <string name="default_input_placeholder">Loading…</string>
     <string name="default_web_client_id">162066849712-o63evu2i36kqp7qai3r8np9c5m6ce3ff.apps.googleusercontent.com</string>
     <string name="delete">Delete</string>
@@ -1270,7 +1281,7 @@ Icon"</string>
     <string name="developer_mode">Developer Mode</string>
     <string name="developer_mode_help_text">Developer Mode exposes context menu items helpful for people writing bots using the [Discord API](%1$s).</string>
     <string name="developer_options">Developer Options</string>
-    <string name="developer_portal_cta">"This isn't all! Learn more about your server in the Developer Portal."</string>
+    <string name="developer_portal_cta">"This isn't all! Learn more about your server in the **Developer Portal**."</string>
     <string name="device_no_permission">Device %1$s</string>
     <string name="device_settings">Device Settings</string>
     <string name="direct_message">Direct Message</string>
@@ -1425,6 +1436,7 @@ Icon"</string>
     <string name="experiment_mobile_only_user_header">Howdy Friend!</string>
     <string name="experiment_mobile_only_user_text1">Why don’t you saddle up with Discord for your desktop computer? Here’s the link to grab the desktop app: %1$s</string>
     <string name="experiment_mobile_only_user_text2">Why don’t you saddle up with Discord for your desktop computer? We can email you a download link right away.</string>
+    <string name="experimental_encoders">Experimental Encoders</string>
     <string name="expire_after">Expire After</string>
     <string name="expires_in">Expires in:</string>
     <string name="explicit_content_filter_disabled">"Don't scan any messages."</string>
@@ -1443,8 +1455,8 @@ Icon"</string>
     <string name="file_rate_mb">%1$s MB/S</string>
     <string name="file_size_gb">%1$s GB</string>
     <string name="file_size_mb">%1$s MB</string>
-    <string name="file_upload_limit_premium">50MB</string>
-    <string name="file_upload_limit_premium2">100MB</string>
+    <string name="file_upload_limit_premium_tier_1">50MB</string>
+    <string name="file_upload_limit_premium_tier_2">100MB</string>
     <string name="file_upload_limit_standard">8MB</string>
     <string name="files_permission_reason_msg">Storage permissions needed to show files</string>
     <string name="filter">Filter</string>
@@ -1490,10 +1502,10 @@ Icon"</string>
     <string name="form_help_enable_discoverable">This puts this server into a searchable directory of approved public servers. We recommend keeping this enabled so interested users can find you!</string>
     <string name="form_help_enable_featurable">This lets Discord feature this server on our homepage. If selected to be featured, you may see sudden increases in new members, so turn this off if too many people are joining.</string>
     <string name="form_help_explicit_content_filter">Automatically scan and delete messages sent in this server that contain explicit content. Please choose how broadly the filter will apply to members in your server. **We recommend setting a filter for a public Discord.**</string>
-    <string name="form_help_instant_invite_channel">If a channel is selected then an Instant Invite link will be generated with the widget, otherwise only online members and voice channels will be provided.</string>
-    <string name="form_help_last_seen">Pruning will kick **%1$s** who have not been seen in **%2$s** and are not assigned to any roles. They can re-join the server using a new Instant Invite.</string>
+    <string name="form_help_instant_invite_channel">If a channel is selected then an invite link will be generated with the widget, otherwise only online members and voice channels will be provided.</string>
+    <string name="form_help_last_seen">Pruning will kick **%1$s** who have not been seen in **%2$s** and are not assigned to any roles. They can re-join the server using a new invite.</string>
     <string name="form_help_legacy_subsystem">"Certain audio hardware drivers exhibit problems when using your Operating System's modern audio subsystem. Check this box to fallback to a legacy audio subsystem."</string>
-    <string name="form_help_news">This will add a Follow option to this channel, allowing users to hook this channel into their own servers. Messages posted in this channel can then be published, posting directly into the user servers that have followed the channel. [Learn more about Channel Following &amp; Announcement Channels here.](%1$s)</string>
+    <string name="form_help_news">Post messages that reach servers outside your own. Users can opt into Following this channel, so select posts you Publish from here will appear directly in their own servers. [Learn more.](%1$s)</string>
     <string name="form_help_nsfw">Users will need to confirm they are of over legal age to view in the content in this channel. NSFW channels are exempt from the explicit content filter.</string>
     <string name="form_help_open_h264">Disabling OpenH264 also disables hardware accelerated video encoding, if available.</string>
     <string name="form_help_premade_widget">"Embed this HTML on your website to use Discord's beautiful pre-made widget. If you have access to your site's users then you can dynamically add &amp;username= to the querystring."</string>
@@ -1555,8 +1567,8 @@ Icon"</string>
     <string name="form_label_input_mode">Input Mode</string>
     <string name="form_label_input_sensitivty">Input Sensitivity</string>
     <string name="form_label_input_volume">Input Volume</string>
-    <string name="form_label_instant_invite">Enter an Instant Invite</string>
-    <string name="form_label_instant_invite_channel">Instant Invite Channel</string>
+    <string name="form_label_instant_invite">Enter an invite</string>
+    <string name="form_label_instant_invite_channel">Invite Channel</string>
     <string name="form_label_json_api">JSON API</string>
     <string name="form_label_last_seen">Last Seen</string>
     <string name="form_label_local_mute">Local Mute</string>
@@ -1576,9 +1588,11 @@ Icon"</string>
     <string name="form_label_mobile_notifications_os_control_jump_help">Advanced notification settings are controlled by the system.</string>
     <string name="form_label_mobile_notifications_sound_disable">Disable Sounds</string>
     <string name="form_label_mobile_notifications_sound_message">New message sound</string>
+    <string name="form_label_mobile_notifications_stream_desc">Get notifications when your friends Go Live</string>
     <string name="form_label_mobile_notifications_system_desc">Get notifications outside of Discord.</string>
     <string name="form_label_mobile_notifications_system_hint">"If you're looking for per-channel or per-server notifications, tap the desired server title and select Notification Settings."</string>
     <string name="form_label_mobile_notifications_system_label">System notifications</string>
+    <string name="form_label_mobile_notifications_user_label">Other notifications</string>
     <string name="form_label_mobile_notifications_vibrations">Disable notifications vibration.</string>
     <string name="form_label_mobile_notifications_wake_device">Notifications wake up device.</string>
     <string name="form_label_mobile_push_notifications">Mobile Push Notifications</string>
@@ -1690,11 +1704,24 @@ Icon"</string>
     <string name="friends_empty_state_copy">"I just joined Discord, and my username is %1$s. Let's chat!"</string>
     <string name="friends_empty_state_online">"No one's around to play with Wumpus."</string>
     <string name="friends_empty_state_pending">"There are no pending friend requests. Here's a Wumpus for now."</string>
+    <string name="friends_offline_header">Offline - %1$s</string>
     <string name="friends_online">%1$s Online</string>
+    <string name="friends_online_header">Online - %1$s</string>
+    <string name="friends_pending_request_expand">See All</string>
+    <string name="friends_pending_request_expand_collapse">See Less</string>
+    <string name="friends_pending_request_header">Pending Request - %1$s</string>
+    <string name="friends_row_action_button_accessibility_label_accept">Accept Invitation</string>
+    <string name="friends_row_action_button_accessibility_label_call">Call User</string>
+    <string name="friends_row_action_button_accessibility_label_decline">Decline Invitation</string>
+    <string name="friends_row_action_button_accessibility_label_message">Send a DM to User</string>
     <string name="friends_section_add_friend">Add Friend</string>
     <string name="friends_section_all">All</string>
     <string name="friends_section_online">Online</string>
     <string name="friends_section_pending">Pending</string>
+    <string name="friends_share">Share</string>
+    <string name="friends_share_sheet_scanning_text_bottom">Scanning the airwaves for friends. Make sure your friends on this page and scanning too.</string>
+    <string name="friends_share_sheet_scanning_text_top">Make sure your friends are scanning too!</string>
+    <string name="friends_share_tabbar_title">Add me on %1$s so we can chat! My username is %2$s.</string>
     <string name="full">Full</string>
     <string name="full_screen">Full Screen</string>
     <string name="game_action_button_add_to_library">Add to library</string>
@@ -1853,6 +1880,7 @@ Icon"</string>
     <string name="gift_code_auth_resolving">Retrieving your gift from cyberspace</string>
     <string name="gift_code_auth_verification_sent">Sent!</string>
     <string name="gift_code_auth_verification_title">Welcome %1$s</string>
+    <string name="gift_code_cannot_accept_body_ios">Sorry, you cannot accept your own gift on iOS.</string>
     <string name="gift_code_hint">WUMP-AAAAA-BBBBB-CCCCC</string>
     <string name="gift_confirmation_body_claimed">"You couldn't claim this gift because someone else beat you to the punch. That's jazz baby!"</string>
     <string name="gift_confirmation_body_confirm">Once you accept, %1$s will be yours FOR-EV-ERRRRRR!</string>
@@ -1869,12 +1897,12 @@ Icon"</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Thanks to another generous human, you now have %1$s for %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Thanks to another generous human, you now have %1$s for %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** has been added to your library.</string>
-    <string name="gift_confirmation_body_success_nitro">Thanks to another generous human, you now have access to enhanced chat perks and dozens of games for %1$s.</string>
-    <string name="gift_confirmation_body_success_nitro_classic">Thanks to another generous human, you now have access to enhanced chat perks for %1$s.</string>
+    <string name="gift_confirmation_body_success_nitro_classic_mobile">Thanks to another generous human, you now have access to enhanced chat perks for %1$s.</string>
+    <string name="gift_confirmation_body_success_nitro_mobile">Thanks to another generous human, you now have access to enhanced chat perks and a Server Boost for %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Thanks to another generous human, you now have access to enhanced chat perks for %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Thanks to another generous human, you now have access to enhanced chat perks for %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Thanks to another generous human, you now have access to our entire Nitro game catalog and enhanced chat perks for %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Thanks to another generous human, you now have access to our entire Nitro game catalog and enhanced chat perks for %1$s.</string>
+    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Thanks to another generous human, you now have access to enhanced chat perks and a Server Boost for %1$s.</string>
+    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Thanks to another generous human, you now have access to enhanced chat perks and a Server Boost for %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Something funky happened and we failed to secure the bag…try again?</string>
     <string name="gift_confirmation_button_confirm">Heck Yeah! Add to Library</string>
     <string name="gift_confirmation_button_confirm_mobile">Gimme</string>
@@ -1884,7 +1912,6 @@ Icon"</string>
     <string name="gift_confirmation_button_noice">Noice!</string>
     <string name="gift_confirmation_button_subscription_success">Sweet!</string>
     <string name="gift_confirmation_button_success_mobile">Noice!</string>
-    <string name="gift_confirmation_button_success_premium_games">Check out all Nitro Games</string>
     <string name="gift_confirmation_header_confirm">Accept this gift?</string>
     <string name="gift_confirmation_header_confirm_nitro">"You've been gifted %1$s"</string>
     <string name="gift_confirmation_header_fail">*Sad Trombone*</string>
@@ -1950,7 +1977,6 @@ Icon"</string>
     <string name="gift_inventory_select_nitro_gift">Select a Nitro Gift</string>
     <string name="gift_inventory_subscription_months">%1$s (%2$s)</string>
     <string name="gift_inventory_subscription_years">%1$s (%2$s)</string>
-    <string name="go_live_changelog_guilds">Go Live is now available in: %1$s</string>
     <string name="go_live_hardware_acceleration_unavailable">"Quick heads up, we can't detect hardware acceleration. Your computer may have problems supporting Go Live."</string>
     <string name="go_live_hey">Hey!</string>
     <string name="go_live_listen">Listen!</string>
@@ -1965,8 +1991,10 @@ Icon"</string>
     <string name="go_live_modal_select_channel_form_title">Select a voice channel</string>
     <string name="go_live_modal_select_channel_placeholder">Search for voice channels</string>
     <string name="go_live_modal_title">Go Live</string>
-    <string name="go_live_premium_early_access">As thanks for being a Nitro subscriber, you get early access to stream games with Go Live!</string>
     <string name="go_live_video_drivers_outdated">Your video drivers are out of date. Update them for better Go Live performance.</string>
+    <string name="go_live_viewers_action_sheet_not_spectating">Not Spectating</string>
+    <string name="go_live_viewers_action_sheet_spectating">Spectating</string>
+    <string name="go_live_viewers_action_sheet_streaming">Streaming</string>
     <string name="go_to_developer_portal">Go to Dev Portal</string>
     <string name="google_api_key">AIzaSyCY8pVLbcOlWDz6NdLbaGckvwhOmfNu02U</string>
     <string name="google_app_id">1:162066849712:android:db38e83be74de1b6</string>
@@ -2110,6 +2138,7 @@ Icon"</string>
     <string name="guild_settings_audit_log_guild_mfa_level_enabled">**Enabled** two-factor authentication requirement</string>
     <string name="guild_settings_audit_log_guild_name_change">Set the server name to **%1$s**</string>
     <string name="guild_settings_audit_log_guild_owner_id_change">Passed ownership to **%1$s**</string>
+    <string name="guild_settings_audit_log_guild_preferred_locale_change">Set the preferred locale to **%1$s**</string>
     <string name="guild_settings_audit_log_guild_region_change">Set the voice region to **%1$s**</string>
     <string name="guild_settings_audit_log_guild_splash_hash_change">Set the server invite background</string>
     <string name="guild_settings_audit_log_guild_system_channel_id_change">Set the welcome notification channel to **%1$s**</string>
@@ -2267,13 +2296,16 @@ Members can revoke their boost at any time. **The server will keep perks for thr
     <string name="guild_settings_title_server_widget">Server Widget</string>
     <string name="guild_settings_widget_embed_help">"Embed this HTML on your website to use Discord's beautiful pre-made widget. If you have access to your site's users then you can dynamically add &amp;username= to the querystring."</string>
     <string name="guild_settings_widget_enable_widget">Enable Server Widget</string>
+    <string name="guild_unavailable_body">Please bear with us as we try to fix this issue!</string>
+    <string name="guild_unavailable_header">Unavailable</string>
+    <string name="guild_unavailable_title">"This server is popping off and we're all out of snacks."</string>
     <string name="guild_verification_text_account_age">Your account must be at least %1$s minutes old to send messages in this server.</string>
     <string name="guild_verification_text_member_age">You must be a member for at least %1$s minutes to send messages in this server.</string>
     <string name="guild_verification_text_not_claimed">You must claim and verify your account before you can send messages in this server.</string>
     <string name="guild_verification_text_not_phone_verified">You must verify your identity by phone before you can send messages in this server.</string>
     <string name="guild_verification_text_not_verified">You must verify your account before you can send messages in this server.</string>
     <string name="guild_verified">Verified</string>
-    <string name="guild_voice_channel_empty_body_mobile">This voice channel is empty. Join and bring your friends!</string>
+    <string name="guild_voice_channel_empty_body_mobile">"Hm, it's quiet. Looks like no one's here yet. Start the conversation?"</string>
     <string name="guild_voice_channel_empty_header_mobile">You are the first one here!</string>
     <string name="hardware_acceleration">Hardware Acceleration</string>
     <string name="hardware_acceleration_help_text">Turns on Hardware Acceleration which uses your GPU to make Discord smoother. Turn this off if you are experiencing FPS drops in games.</string>
@@ -2286,7 +2318,7 @@ Members can revoke their boost at any time. **The server will keep perks for thr
     <string name="help_singular_permission">You cannot modify this permission because removing it would remove it from you.</string>
     <string name="hide_bottom_view_on_scroll_behavior">com.google.android.material.behavior.HideBottomViewOnScrollBehavior</string>
     <string name="hide_instant_invites_description">"Recommended if you don't want random people accessing your Discord servers."</string>
-    <string name="hide_instant_invites_label">Hide Instant Invite Links</string>
+    <string name="hide_instant_invites_label">Hide Invite Links</string>
     <string name="hide_muted">Hide %1$s Muted</string>
     <string name="hide_muted_channels">Hide Muted Channels</string>
     <string name="hide_personal_information_description">Hides email, connected accounts, notes and anonymizes DiscordTags.</string>
@@ -2449,16 +2481,16 @@ Members can revoke their boost at any time. **The server will keep perks for thr
     <string name="input_mode_vad">Voice Activity</string>
     <string name="instagram">Instagram</string>
     <string name="install_location_main">Main</string>
-    <string name="instant_invite">Instant Invite</string>
+    <string name="instant_invite">Invite</string>
     <string name="instant_invite_accept">Accept Invite</string>
-    <string name="instant_invite_accepted">Accepted Instant Invite</string>
-    <string name="instant_invite_accepting">Accepting Instant Invite</string>
+    <string name="instant_invite_accepted">Accepted Invite</string>
+    <string name="instant_invite_accepting">Accepting Invite</string>
     <string name="instant_invite_ask_for_new_invite">Ask for a new one!</string>
     <string name="instant_invite_ask_user_for_new_invite">Ask %1$s for a new invite!</string>
     <string name="instant_invite_banned">"Uh-oh. Looks like you've been banned."</string>
     <string name="instant_invite_banned_info">"Uh-oh. Looks like you've been banned."</string>
     <string name="instant_invite_code">Code</string>
-    <string name="instant_invite_expired">The instant invite is invalid or has expired.</string>
+    <string name="instant_invite_expired">The invite is invalid or has expired.</string>
     <string name="instant_invite_expires">Expires</string>
     <string name="instant_invite_failed_to_generate">Failed to make an invite link.</string>
     <string name="instant_invite_friends">Invite friends to your server!</string>
@@ -2473,19 +2505,20 @@ Members can revoke their boost at any time. **The server will keep perks for thr
     <string name="instant_invite_invite_code">Invite Code</string>
     <string name="instant_invite_inviter">Inviter</string>
     <string name="instant_invite_join">Join Discord</string>
+    <string name="instant_invite_link_share_text">Hey, come talk with me in this Discord server:</string>
     <string name="instant_invite_looks_like">The invite will look something like these:</string>
     <string name="instant_invite_not_allowed">"Poop. It looks like you can't make an invite for this server."</string>
     <string name="instant_invite_popout">Share this link with anyone to grant them instant access to this channel.</string>
     <string name="instant_invite_regenerate">Regenerate</string>
     <string name="instant_invite_resolved_body">You have been invited to **%1$s** in **%2$s**.</string>
     <string name="instant_invite_resolved_title">Why, hello there.</string>
-    <string name="instant_invite_resolving">Resolving Instant Invite</string>
+    <string name="instant_invite_resolving">Resolving Invite</string>
     <string name="instant_invite_uses">Uses</string>
     <string name="instant_invite_you_are_already_a_member_of">"You're already a member of"</string>
     <string name="instant_invite_you_have_been_invited_to_join">"You've been invited to join"</string>
     <string name="instant_invite_you_have_been_invited_to_join_by_user">**%1$s** has invited you to join</string>
     <string name="instant_invite_you_have_been_invited_to_join_group_dm">"You've been invited to join a group DM by"</string>
-    <string name="instant_invites">Instant Invites</string>
+    <string name="instant_invites">Invites</string>
     <string name="integration_settings">Integration Settings</string>
     <string name="integrations">Integrations</string>
     <string name="integrations_header">Connected Twitch/YouTube Accounts</string>
@@ -2521,10 +2554,12 @@ Members can revoke their boost at any time. **The server will keep perks for thr
     <string name="invite_button_title_invited">"You've been invited to join a server"</string>
     <string name="invite_button_title_invited_group_dm">"You've been invited to join a group DM"</string>
     <string name="invite_button_title_invited_invalid">You received an invite, but…</string>
+    <string name="invite_button_title_invited_lfg_gdm">"You've been invited to join an LFG group"</string>
     <string name="invite_button_title_invited_stream">"You've been invited to watch a stream"</string>
     <string name="invite_button_title_inviter">You sent an invite to join a server</string>
     <string name="invite_button_title_inviter_group_dm">You sent an invite to join a group DM</string>
     <string name="invite_button_title_inviter_invalid">You sent an invite, but…</string>
+    <string name="invite_button_title_inviter_lfg_gdm">You sent an invite to join an LFG group</string>
     <string name="invite_button_title_inviter_stream">You sent an invite to watch a stream</string>
     <string name="invite_button_title_streaming">Invite to watch stream</string>
     <string name="invite_copied">Copied</string>
@@ -2589,6 +2624,7 @@ Want to know more about Discord?"</string>
     <string name="invite_notice_message">An adventure begins.</string>
     <string name="invite_notice_message_part_2">"Let's add some party members!"</string>
     <string name="invite_people">Invite People</string>
+    <string name="invite_private_call_heads_up">Heads up! Friends you invite can see your previous message history.</string>
     <string name="invite_search_for_friends">Search for friends</string>
     <string name="invite_sent">Invite Sent</string>
     <string name="invite_settings_expired_description">Expires in %1$s, %2$s</string>
@@ -2602,7 +2638,7 @@ Want to know more about Discord?"</string>
     <string name="invite_to_server_name">Invite People to %1$s</string>
     <string name="invite_to_server_name_experiment">Congrats! %1$s is now ready</string>
     <string name="invite_url">Invite URL</string>
-    <string name="invite_voice_empty_mobile">Share this link with your friends to get them in this voice chat!</string>
+    <string name="invite_voice_empty_mobile">There’s always room for more. Share this link and get them in here:</string>
     <string name="invite_your_friends_header_mobile">Your Friends</string>
     <string name="invite_your_friends_voice_call_mobile">Invite a friend to this call</string>
     <string name="invites">Invites</string>
@@ -2616,7 +2652,7 @@ Want to know more about Discord?"</string>
     <string name="ios_iap_restore_subscription_none_title">Nothing to restore.</string>
     <string name="ios_iap_restore_subscription_success">Done.</string>
     <string name="ios_iap_testflight_error">"Oops! We cannot accept purchases via the Testflight build. You'll have to use the production build that's available on the App Store."</string>
-    <string name="ios_media_keyboard_browse_photo">Browse Photo</string>
+    <string name="ios_media_keyboard_browse_photo">Browse Photos</string>
     <string name="ios_media_keyboard_enable_in_settings">Enable in Settings</string>
     <string name="ios_media_keyboard_more_photos">Your perfect picture is in another castle. Try digging into your full photo library.</string>
     <string name="ios_media_keyboard_no_permission">Enable permissions to access your photo library to upload photos from your phone.</string>
@@ -2630,17 +2666,12 @@ Want to know more about Discord?"</string>
     <string name="ios_nuf_join_a_friend">"Join a friend who's on Discord"</string>
     <string name="ios_nuf_voice_chat_while_gaming">Voice chat while gaming</string>
     <string name="ios_nuf_what_do_you_want">What do you want to do first?</string>
-    <string name="ios_profile_add_friend">Add Friend</string>
-    <string name="ios_profile_audio">Call</string>
     <string name="ios_profile_in_voice_call">In a voice call</string>
-    <string name="ios_profile_message">Message</string>
     <string name="ios_profile_mutual_friends">%1$s</string>
     <string name="ios_profile_mutual_friends_placeholder">Mutual Friends</string>
     <string name="ios_profile_mutual_guilds">%1$s</string>
     <string name="ios_profile_mutual_guilds_placeholder">Mutual Servers</string>
     <string name="ios_profile_open_voice_channel">Open Voice Channel</string>
-    <string name="ios_profile_pending">Pending</string>
-    <string name="ios_profile_video">Video</string>
     <string name="ios_view_all">View all</string>
     <string name="ip_address_secured">IP Address Secured</string>
     <string name="ip_authorization_succeeded">IP Address Authorized</string>
@@ -2651,13 +2682,13 @@ Want to know more about Discord?"</string>
     <string name="join_afk_channel_body">"It seems you've joined the AFK channel. You cannot speak in this channel."</string>
     <string name="join_call">Join Call</string>
     <string name="join_server">Join</string>
-    <string name="join_server_button_body">"Enter an Instant Invite and join your friend's server."</string>
+    <string name="join_server_button_body">"Enter an invite and join your friend's server."</string>
     <string name="join_server_button_cta">Join a server</string>
     <string name="join_server_button_cta_mobile">Join a Server with an Invite Link</string>
     <string name="join_server_button_cta_mobile_desc">Have an invite code or link? Use it here!</string>
     <string name="join_server_button_cta_named">Join %1$s</string>
-    <string name="join_server_description">Enter an Instant Invite below to join an existing server. The invite will look something like these:</string>
-    <string name="join_server_description_mobile">Enter an Instant Invite above to join an existing server.</string>
+    <string name="join_server_description">Enter an invite below to join an existing server. The invite will look something like these:</string>
+    <string name="join_server_description_mobile">Enter an invite above to join an existing server.</string>
     <string name="join_server_title">Join a Server</string>
     <string name="join_stream">Join Stream</string>
     <string name="join_video_call">Join Video Call</string>
@@ -2711,6 +2742,7 @@ Want to know more about Discord?"</string>
     <string name="keybind_description_push_to_talk">Hold to temporarily enable your microphone while in Push to Talk mode.</string>
     <string name="keybind_description_push_to_talk_priority">Hold to temporarily enable your microphone while in Push to Talk mode. Other speakers who are not also transmitting with priority will temporarily have their volume lowered while you are speaking.</string>
     <string name="keybind_description_toggle_deafen">"Toggle your speaker's playback on and off. Also disables your microphone while deafened."</string>
+    <string name="keybind_description_toggle_go_live_streaming">Toggle to start/stop streaming in your current voice channel.</string>
     <string name="keybind_description_toggle_mute">"Toggle your microphone's transmission on and off."</string>
     <string name="keybind_description_toggle_overlay">Toggle to turn your overlay on and off.</string>
     <string name="keybind_description_toggle_overlay_input_lock">Toggle overlay interactivity lock.</string>
@@ -2721,6 +2753,7 @@ Want to know more about Discord?"</string>
     <string name="keybind_push_to_talk">Push to Talk (Normal)</string>
     <string name="keybind_push_to_talk_priority">Push to Talk (Priority)</string>
     <string name="keybind_toggle_deafen">Toggle Deafen</string>
+    <string name="keybind_toggle_go_live_streaming">Toggle Go Live Streaming</string>
     <string name="keybind_toggle_mute">Toggle Mute</string>
     <string name="keybind_toggle_overlay">Toggle Overlay</string>
     <string name="keybind_toggle_overlay_input_lock">Toggle Overlay Lock</string>
@@ -2766,12 +2799,17 @@ Want to know more about Discord?"</string>
     <string name="leave_server_title">"Leave '%1$s'"</string>
     <string name="lfg_active_groups">Active groups</string>
     <string name="lfg_bump_button">Bump</string>
-    <string name="lfg_channel_unavailable">New listings in this channel may be delayed.</string>
+    <string name="lfg_bump_cooldown">Bump available in %1$s</string>
+    <string name="lfg_channel_unavailable">New groups in this channel may be delayed.</string>
     <string name="lfg_create_a_group">Create a group</string>
-    <string name="lfg_create_button">Create group</string>
+    <string name="lfg_create_button">Create Group</string>
     <string name="lfg_create_placeholder">Describe your group requirements…</string>
     <string name="lfg_delete_modal_content">Are you sure you want to delete this group?</string>
     <string name="lfg_delete_modal_title">Delete Group</string>
+    <string name="lfg_delisted_explanation_completed">**Your group is no longer listed** because it was full for awhile</string>
+    <string name="lfg_delisted_explanation_expired">**Your group is no longer listed** because it was too old</string>
+    <string name="lfg_delisted_explanation_inactive">**Your group is no longer listed** because it was inactive</string>
+    <string name="lfg_delisted_explanation_unknown">**Your group is no longer listed**</string>
     <string name="lfg_edit_modal_cta">Update</string>
     <string name="lfg_edit_modal_description_label">Body</string>
     <string name="lfg_edit_modal_group_size_label">Group size</string>
@@ -2781,29 +2819,37 @@ Want to know more about Discord?"</string>
     <string name="lfg_empty_state_title">There are no groups looking for players right now</string>
     <string name="lfg_expired_banner">This group is no longer listed, [create a new group](handleCreateClick)</string>
     <string name="lfg_group_description_required">Group description is required</string>
-    <string name="lfg_group_full">Group is Full</string>
+    <string name="lfg_group_full">Full</string>
     <string name="lfg_groups_looking">Groups looking for players - %1$s</string>
+    <string name="lfg_groups_looking_with_total">Groups looking for players - %1$s open out of %2$s</string>
     <string name="lfg_join_button">Join</string>
     <string name="lfg_leave_button">Leave</string>
     <string name="lfg_listing_age_hours">%1$s %2$s ago</string>
     <string name="lfg_listing_age_minutes">%1$s %2$s ago</string>
     <string name="lfg_listing_age_seconds">%1$s %2$s ago</string>
-    <string name="lfg_listing_expiration_explain">Groups automatically expire after 12 hours of inactivity</string>
     <string name="lfg_listings_channel">LFG Channel</string>
     <string name="lfg_manage_group">Manage your group</string>
     <string name="lfg_num_players">%1$s</string>
-    <string name="lfg_save_button">Save</string>
+    <string name="lfg_relist_button">Relist</string>
+    <string name="lfg_relist_your_group">[Relist your group](onClick).</string>
+    <string name="lfg_relisted">Success! Your group was relisted.</string>
+    <string name="lfg_relisted_in_channel">Success! Your group was relisted in %1$s.</string>
+    <string name="lfg_save_button">Save Group</string>
+    <string name="lfg_save_modal_empty_text">"There's no one for you to invite! :("</string>
+    <string name="lfg_save_modal_subtitle">Keep playing with your new LFG friends by inviting them to a group DM!</string>
+    <string name="lfg_save_modal_title">Save Group</string>
     <string name="lfg_sidebar_description">Group description</string>
     <string name="lfg_sidebar_size">Size</string>
     <string name="lfg_sidebar_size_number">%1$s People</string>
     <string name="lfg_sidebar_status">Status</string>
-    <string name="lfg_sidebar_status_active">Open</string>
     <string name="lfg_sidebar_status_expired">Expired</string>
+    <string name="lfg_sidebar_status_expired_tooltip">This group is no longer listed for others to join.</string>
     <string name="lfg_something_went_wrong">Oops, something went wrong! You may need to try again later</string>
     <string name="lfg_spots_available">%1$s out of %2$s spots available</string>
     <string name="lfg_unknown_member_tooltip">"This user isn't a member of this server"</string>
     <string name="lfg_view_button">View</string>
-    <string name="lfg_your_group">Your active group</string>
+    <string name="lfg_your_active_group">Your active group</string>
+    <string name="lfg_your_group">Your group</string>
     <string name="library">Library</string>
     <string name="light_blue">Light blue</string>
     <string name="light_green">Light green</string>
@@ -2841,6 +2887,7 @@ Want to know more about Discord?"</string>
     <string name="lurker_mode_chat_input_message">Join this server to add it to your list and start chatting!</string>
     <string name="lurker_mode_chat_input_message_ios">You are in browsing mode, join this server to chat.</string>
     <string name="lurker_mode_view_guild">Visit Server</string>
+    <string name="lurkers_description">Lurkers are members in your server who only read messages or listen in voice channels.</string>
     <string name="macos">macOS</string>
     <string name="magenta">Magenta</string>
     <string name="manage_channel">Manage Channel</string>
@@ -2852,6 +2899,7 @@ Want to know more about Discord?"</string>
     <string name="manage_listings_description">Members with this permission can delete groups created by other members</string>
     <string name="manage_messages">Manage Messages</string>
     <string name="manage_messages_description">Members with this permission can delete messages by other members or pin any message.</string>
+    <string name="manage_messages_description_in_announcement_channel">Members with this permission can delete messages by other members or pin any message. They can also publish messages by other members to all servers following this [Announcement Channel](%1$s).</string>
     <string name="manage_nicknames">Manage Nicknames</string>
     <string name="manage_nicknames_description">Members with this permission can change nicknames of other members.</string>
     <string name="manage_permissions">Manage Permissions</string>
@@ -2879,6 +2927,7 @@ Want to know more about Discord?"</string>
     <string name="max_number_of_uses">Max Number of Uses</string>
     <string name="max_uses">%1$s</string>
     <string name="max_uses_description_mobile">%1$s</string>
+    <string name="max_uses_description_unlimited_uses">unlimited uses</string>
     <string name="me">Me</string>
     <string name="media_hint_body">If your browser is not showing a popup asking you to allow or deny media access please refresh and try again.</string>
     <string name="media_hint_title">Allow Discord access to your camera.</string>
@@ -2967,6 +3016,7 @@ Want to know more about Discord?"</string>
     <string name="mutual_friends">Mutual Friends</string>
     <string name="mutual_guilds">Mutual Servers</string>
     <string name="n_days">%1$s</string>
+    <string name="nearby_scan">Nearby Scan</string>
     <string name="need_account">Need an account?</string>
     <string name="network_error_bad_request">A bad network request has occurred, please try again.</string>
     <string name="network_error_cloudflare_intermittent">There may have been a brief CloudFlare service interruption; please try again.</string>
@@ -3028,13 +3078,13 @@ Want to know more about Discord?"</string>
     <string name="no_gif_search_results">No GIFs match your search.</string>
     <string name="no_input_devices">No Input Devices</string>
     <string name="no_input_devices_detected">No input devices could be detected, please plug one in and try again.</string>
-    <string name="no_instant_invite">No Instant Invite</string>
+    <string name="no_instant_invite">No Invite</string>
     <string name="no_integrations">[Connect](onConnect) your partnered Twitch or YouTube account to sync your subscribers/memberships to a role</string>
     <string name="no_integrations_body">Protocol FR13NDSH1P can only be executed from the Discord client</string>
     <string name="no_integrations_label">No Integrations</string>
-    <string name="no_invites_body">Feeling aimless? Like a paper plane drifting through the skies? Get some friends in here by creating an instant invite link!</string>
-    <string name="no_invites_caption">No instant invites yet!</string>
-    <string name="no_invites_label">No instant invites yet</string>
+    <string name="no_invites_body">Feeling aimless? Like a paper plane drifting through the skies? Get some friends in here by creating an invite link!</string>
+    <string name="no_invites_caption">No invites yet!</string>
+    <string name="no_invites_label">No invites yet</string>
     <string name="no_mail_account_description">"Please send your feedback to support@discordapp.com and we've copied your user info to the clipboard."</string>
     <string name="no_mail_account_title">No Mail Account</string>
     <string name="no_mic_body">Instructions for enabling access to your microphone can be found in the Discord Help Center.</string>
@@ -3057,10 +3107,12 @@ Want to know more about Discord?"</string>
     <string name="no_thanks">No thanks</string>
     <string name="no_user_limit">No Limit</string>
     <string name="no_video_devices">No Video Devices</string>
-    <string name="noise_cancellation">Noise Cancellation</string>
+    <string name="noise_cancellation">Krisp Noise Cancellation</string>
+    <string name="noise_reduction_none">No Noise Reduction</string>
     <string name="noise_suppression">Noise Suppression</string>
     <string name="none">None</string>
     <string name="not_available">N/A</string>
+    <string name="not_enough_guild_members">Looks like your server isn’t quite ready. **You must have at least 100 members in your server to be shown analytics.**</string>
     <string name="not_in_the_call">Not in the call</string>
     <string name="not_in_the_voice_channel">Not in the voice channel</string>
     <string name="note">Note</string>
@@ -3099,9 +3151,9 @@ Want to know more about Discord?"</string>
     <string name="notice_no_input_detected_help_link_text">Help!</string>
     <string name="notice_no_input_detected_settings">"Well, it looks like Discord is not detecting any input from your mic. Let's fix that!"</string>
     <string name="notice_no_input_detected_settings_link_text">Visit Settings</string>
-    <string name="notice_premium_applications_grandfathered_ended">Your access to Nitro has expired. Upgrade from Nitro Classic to Nitro for unlimited access to amazing games.</string>
-    <string name="notice_premium_applications_grandfathered_ending">You only have %1$s left of Nitro games! Your access ends on **%2$s**.</string>
-    <string name="notice_premium_applications_grandfathered_started">Thanks for being an early Nitro supporter! As a gift for being awesome, you now have access to Nitro games until %1$s.</string>
+    <string name="notice_premium_applications_ending">Your Nitro subscription is changing—games are leaving on %1$s. More perks in the works.</string>
+    <string name="notice_premium_grandfathered_ended">Your access to Nitro has expired. Upgrade from Nitro Classic to Nitro for superpowered chat perks and a Server Boost.</string>
+    <string name="notice_premium_grandfathered_ending">You only have %1$s left of Nitro! Your subscription downgrades to Nitro Classic on **%2$s**.</string>
     <string name="notice_premium_promo_action">Check it out</string>
     <string name="notice_premium_promo_message">"Support Discord's development and get fun perks!"</string>
     <string name="notice_scheduled_maintenance">Discord will be undergoing scheduled maintenance on **%1$s** at **%2$s**.</string>
@@ -3193,6 +3245,10 @@ Want to know more about Discord?"</string>
     <string name="nux_post_reg_join_server_description">Get the most out of Discord by joining a server.</string>
     <string name="nux_post_reg_join_server_skip">"I don't have one"</string>
     <string name="nux_post_reg_join_server_title">Do you have an invite?</string>
+    <string name="nux_samsung_game_presence_link_description">Let friends see when you’re gaming by linking your account with Samsung and enabling Mobile Game Detection.</string>
+    <string name="nux_samsung_game_presence_link_enable">"Let's do it"</string>
+    <string name="nux_samsung_game_presence_link_title">What are you playing?!</string>
+    <string name="oauth2_authorize_error">There was an error authorizing</string>
     <string name="oauth2_connect_to_discord">Connect to Discord</string>
     <string name="oauth2_insecure_notice">This application **can** read and send messages on your behalf while it is running.</string>
     <string name="oauth2_insecure_read_notice">This application **can** read but **cannot** send messages on your behalf while it is running.</string>
@@ -3201,12 +3257,16 @@ Want to know more about Discord?"</string>
     <string name="oauth2_message_unknown_error">Unknown Error</string>
     <string name="oauth2_request_invalid_scope">Invalid scope **%1$s**</string>
     <string name="oauth2_request_missing_param">Invalid request. Missing param **%1$s**</string>
+    <string name="oauth2_secure_notice">This application **cannot read or send messages** on your behalf.</string>
     <string name="oauth2_security_notice">This application **cannot** read or send messages on your behalf.</string>
     <string name="oauth2_title">Authorize access to your account</string>
     <string name="okay">Okay</string>
     <string name="one_user_typing">**%1$s** is typing…</string>
     <string name="ongoing_call">Ongoing Call</string>
     <string name="ongoing_call_connected_users">Ongoing Call — %1$s Connected</string>
+    <string name="ongoing_call_voice_quality_low">Oh no, a big red bar. Your connection is struggling.</string>
+    <string name="ongoing_call_you_are_all_alone">"You're alone in this call. 
+ Others in this chat can join at any time."</string>
     <string name="only_you_can_see_and_delete_these">Only you can see %1$s — [delete %1$s](handleDelete).</string>
     <string name="open">Open</string>
     <string name="open_app">I already have the app. Open it!</string>
@@ -3260,7 +3320,6 @@ Want to know more about Discord?"</string>
     <string name="overlay_notifications_top_left">Top Left</string>
     <string name="overlay_notifications_top_right">Top Right</string>
     <string name="overlay_pin_label_tutorial">**Pro Tip**: Click to show chat in game</string>
-    <string name="overlay_private_channels_empty_state">Nope, no direct messages here.</string>
     <string name="overlay_reload">Reload Overlay</string>
     <string name="overlay_reset_default_layout">Reset Default Layout</string>
     <string name="overlay_settings">Overlay Settings</string>
@@ -3288,7 +3347,7 @@ Want to know more about Discord?"</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="participators">Lurkers</string>
-    <string name="participators_compared_to_communicators">chatters compared to lurkers</string>
+    <string name="participators_compared_to_communicators">Chatters : Lurkers</string>
     <string name="partner_badge_tooltip">Discord Partner</string>
     <string name="party_full">Group Full</string>
     <string name="party_join">Join Group</string>
@@ -3309,6 +3368,16 @@ Want to know more about Discord?"</string>
     <string name="path_password_eye_mask_visible">M2,4.27 L2,4.27 L4.54,1.73 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z</string>
     <string name="path_password_strike_through">M3.27,4.27 L19.74,20.74</string>
     <string name="pause">Pause</string>
+    <string name="payment_authentication_modal_button">Continue</string>
+    <string name="payment_authentication_modal_button_cancel_payment">Cancel Payment</string>
+    <string name="payment_authentication_modal_canceled">Your payment for **%1$s** has been canceled.</string>
+    <string name="payment_authentication_modal_fail">We were unable to authenticate your payment. Please try updating your payment method.</string>
+    <string name="payment_authentication_modal_start">We were unable to complete your payment of **%1$s** for **%2$s**. This is probably because it must be authenticated manually with your bank.</string>
+    <string name="payment_authentication_modal_success">Your payment was authenticated successfully. Thanks!</string>
+    <string name="payment_authentication_modal_title">There was a problem with your payment</string>
+    <string name="payment_authentication_modal_title_canceled">Payment Canceled</string>
+    <string name="payment_authentication_modal_title_fail">Payment Authentication Failed</string>
+    <string name="payment_authentication_modal_title_success">Payment Authenticated</string>
     <string name="payment_modal_button_change_card">Update Credit Card</string>
     <string name="payment_modal_button_change_paypal">Update PayPal Account</string>
     <string name="payment_modal_button_premium">Get %1$s</string>
@@ -3366,10 +3435,12 @@ Want to know more about Discord?"</string>
     <string name="payment_source_type_select">Select Payment Type</string>
     <string name="payment_sources_add">Add a new payment method</string>
     <string name="payment_steps_go_back">Go Back</string>
+    <string name="payment_waiting_for_authentication">Waiting for authentication…</string>
     <string name="paypal_account_verifying">Connecting to PayPal</string>
     <string name="paypal_callback_error">Something went wrong, try again.</string>
     <string name="paypal_callback_success">**PayPal** account authorized. Return to **Discord** to complete the transaction.</string>
     <string name="pending">Pending</string>
+    <string name="percentage_since_last_week">%1$s%% since last week</string>
     <string name="permission_camera_access_denied">Camera access denied - Discord requires camera access to broadcast video.</string>
     <string name="permission_helpdesk">Need help with permissions?</string>
     <string name="permission_media_denied">Media access denied - Discord requires access to storage to post attachments.</string>
@@ -3425,19 +3496,15 @@ Want to know more about Discord?"</string>
     <string name="premium">Nitro</string>
     <string name="premium_activated">Nitro Activated</string>
     <string name="premium_alert_error_title">Oops, something went wrong…</string>
-    <string name="premium_applications_grandfathered_monthly">As a thank you for supporting Discord, you have access to Nitro games for a year. Your access ends **%1$s**.</string>
-    <string name="premium_applications_grandfathered_yearly">As a thank you for supporting Discord, you have access to Nitro games for two years. Your access ends **%1$s**.</string>
-    <string name="premium_applications_subtitle">Unlimited access to a growing library of critically acclaimed games that we think you and your friends should play.</string>
-    <string name="premium_applications_title">Dozens of curated games. One low monthly price.</string>
     <string name="premium_badge_tooltip">Subscriber since %1$s</string>
     <string name="premium_cancel_cancel">Nope</string>
     <string name="premium_cancel_cancel_mobile">Keep Nitro</string>
     <string name="premium_cancel_confirm_body_tier_1">"Cancellation will take effect at the end of your current billing period on **%1$s**. Your Discord Tag will be randomized if you've changed it. You can restart your subscription anytime."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">"Cancellation will take effect at the end of your current billing period on **%1$s**. Your Discord Tag will be randomized if you've changed it."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">You can restart your subscription anytime.</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Cancellation will take effect at the end of your current billing period. On **%1$s**, you will lose access to all Nitro games in your library and your Discord Tag will be randomized if you've changed it. We'll keep your save files safe and sound in case you change your mind. You can resubscribe at any time!"</string>
-    <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">"Cancellation will take effect at the end of your current billing period. On **%1$s**, you will lose access to all Nitro games in your library and your Discord Tag will be randomized if you've changed it."</string>
-    <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">"We'll keep your save files safe and sound in case you change your mind. You can resubscribe at any time!"</string>
+    <string name="premium_cancel_confirm_body_tier_2">"Cancellation will take effect at the end of your current billing period. On **%1$s**, you will lose access to Nitro, your Discord Tag will be randomized if you've changed it, and your Server Boost will be removed. You can restart your subscription anytime."</string>
+    <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">"Cancellation will take effect at the end of your current billing period. On **%1$s**, you will lose access to Nitro, your Discord Tag will be randomized if you've changed it, and your Server Boost will be removed."</string>
+    <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">You can restart your subscription anytime.</string>
     <string name="premium_cancel_confirm_mobile">Cancel Nitro</string>
     <string name="premium_cancel_confirm_new">Yup, Cancel %1$s</string>
     <string name="premium_cancel_confirm_title">Cancel %1$s?</string>
@@ -3458,13 +3525,12 @@ Want to know more about Discord?"</string>
     <string name="premium_chat_perks_description_discriminator">Choose your tag while you’re subscribed.</string>
     <string name="premium_chat_perks_description_screenshare">Up your screen share game with 720p 60fps or 1080p 30fps.</string>
     <string name="premium_chat_perks_description_streaming">Stream at source with Nitro or up to a crisp 1080p 60fps with Nitro Classic.</string>
-    <string name="premium_chat_perks_description_upload_limit">Large upload file size for %1$s from %2$s for high quality meme sharing.</string>
+    <string name="premium_chat_perks_description_upload_limit">Larger upload file size from %1$s to %2$s with Nitro or %3$s with Nitro Classic.</string>
     <string name="premium_chat_perks_discriminator_mobile">Choose your own custom tag</string>
     <string name="premium_chat_perks_premium_guild_subscription">Boost your favorite server!</string>
     <string name="premium_chat_perks_rep_mobile">Exclusive Nitro badge on your profile</string>
     <string name="premium_chat_perks_screenshare_mobile">Screen share on PC in 720p 60fps or 1080p 30fps</string>
-    <string name="premium_chat_perks_simple_title">Want to keep it simple? Support Discord and get sweet chat perks:</string>
-    <string name="premium_chat_perks_simple_title_mobile">Just want super powered chat perks? Get Nitro Classic</string>
+    <string name="premium_chat_perks_simple_title">Keep it simple - get the base chat perks without a Server Boost.</string>
     <string name="premium_chat_perks_streaming_mobile">Better Go Live streams: Stream at source with Nitro or up to a crisp 1080p 60fps with Nitro Classic</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Animated Fun</string>
     <string name="premium_chat_perks_title_badge">Rep Your Support</string>
@@ -3473,16 +3539,12 @@ Want to know more about Discord?"</string>
     <string name="premium_chat_perks_title_screenshare">Higher Quality Video</string>
     <string name="premium_chat_perks_title_streaming">Better Go Live Streams</string>
     <string name="premium_chat_perks_title_upload_limit">Upgraded Upload Limit</string>
-    <string name="premium_chat_perks_upload_mobile">Upgraded upload size from %1$s to %2$s</string>
     <string name="premium_classic_payment_gift_blurb_mobile">Gift someone Nitro Classic to enhance their chat experience with super powered chat perks. [Learn more about Nitro Classic.](onClick)</string>
     <string name="premium_code_active_until">Discord Nitro is active on this account until %1$s.</string>
     <string name="premium_code_redemption_confirmation_blurb">Thanks to a random string of digits, you now have enhanced chat perks for %1$s!</string>
     <string name="premium_code_redemption_confirmation_button">Ooh, Sweet!</string>
     <string name="premium_expiring_body_boosting">Your Nitro subscription ends on **%1$s**. Renew today to continue boosting **%2$s** and keep your booster badge.</string>
-    <string name="premium_expiring_body_control">"You will lose access to Discord Nitro games and all of the Nitro chat perks. If you customized your Discord Tag, it will be randomized again.
-
-To keep your sub, go to Settings and update your payment."</string>
-    <string name="premium_expiring_body_control_without_games">"You will lose access to all of the Nitro chat perks. If you customized your Discord Tag, it will be randomized again.
+    <string name="premium_expiring_body_control">"You will lose access to all of the Nitro chat perks. If you customized your Discord Tag, it will be randomized again.
 
 To keep your sub, go to Settings and update your payment."</string>
     <string name="premium_expiring_body_custom_tag">Your Nitro subscription ends on **%1$s**. Renew today to keep your custom Discord Tag and all other perks.</string>
@@ -3491,29 +3553,23 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="premium_expiring_callout">To renew your sub, go to Nitro Settings and update your payment information.</string>
     <string name="premium_expiring_go_to_settings">Go to Nitro Settings</string>
     <string name="premium_expiring_title">Your Nitro Subscription is about to end!</string>
-    <string name="premium_feature_chat_perks_repositioning_header">Get super powered chat perks!</string>
-    <string name="premium_feature_new_chat_perks_header">You also get some enhanced chat perks:</string>
-    <string name="premium_feature_new_premium_applications_header">Over %1$s worth of games. Check them out:</string>
-    <string name="premium_feature_view_applications">View All Nitro Games</string>
-    <string name="premium_features_boost_perks_mobile">Support your favorite server with Server Boosting</string>
     <string name="premium_features_chat_perks">Chat Perks</string>
-    <string name="premium_features_chat_perks_mobile">All the sweet chat perks above</string>
+    <string name="premium_features_chat_perks_header">Get super powered chat perks!</string>
     <string name="premium_features_enhanced_chat_perks">Enhanced Chat Perks</string>
-    <string name="premium_features_game_perks_mobile">PLUS $1000 worth of PC games and perks</string>
-    <string name="premium_features_premium_applications">Free Games</string>
-    <string name="premium_features_premium_applications_mobile">Free Games and game perks.</string>
     <string name="premium_features_premium_guild_subscriptions">Server Boosting</string>
-    <string name="premium_game_perks_title_mobile">Want more? Get Nitro with PC games.</string>
+    <string name="premium_game">Discord Nitro Game</string>
     <string name="premium_gift_button_label">Send a gift</string>
-    <string name="premium_gift_button_tooltip">Upgrade your friends! Gift them Nitro games and chat perks.</string>
+    <string name="premium_gift_button_tooltip">Upgrade your friends! Gift them awesome chat perks with Nitro.</string>
     <string name="premium_gift_send">or send a gift!</string>
     <string name="premium_gift_share_link_ios">Share</string>
     <string name="premium_gifting_title">Nitro Gifting</string>
     <string name="premium_gifting_title_mobile">Select a Nitro Gift</string>
+    <string name="premium_grandfathered_monthly">As a thank you for supporting Discord, you have access to Nitro for a year. Your access ends **%1$s**.</string>
     <string name="premium_grandfathered_warning">"As a thank you for supporting us, you have a discounted Nitro plan. **By canceling or changing your plan, you will lose this discount.** You've been warned!!!!!"</string>
     <string name="premium_grandfathered_warning_confirm">Do It Anyway</string>
     <string name="premium_grandfathered_warning_mobile">If you cancel now, you will lose access to your grandfathered plan.</string>
     <string name="premium_grandfathered_warning_title">Careful There Friend</string>
+    <string name="premium_grandfathered_yearly">As a thank you for supporting Discord, you have access to Nitro for two years. Your access ends **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Boost Cooldown: **%1$sd %2$sh %3$sm**</string>
     <string name="premium_guild_features_blurb">"Boosting a server with your Nitro subscription will help progress it to a new level. For every level achieved, it'll unlock chat perks **for everyone in that server!** Check out a few of these sweet perks:"</string>
     <string name="premium_guild_features_customize_guild_description">Unlock customizations like invite background, server banner, vanity URL, etc.</string>
@@ -3522,14 +3578,14 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="premium_guild_features_learn_more_button">Learn more about Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">Get an enhanced Discord experience starting at one low monthly cost.</string>
     <string name="premium_guild_features_more">And more! You can check current level, level progression, and available perks within a server.</string>
-    <string name="premium_guild_features_new_role_description">Get a special server role available only to Nitro Server Boosters</string>
+    <string name="premium_guild_features_new_role_description">Get a special server role available only to Nitro Server Boosters in your server.</string>
     <string name="premium_guild_features_new_role_mobile">Exclusive Nitro Server Booster roles</string>
     <string name="premium_guild_features_new_role_title">Exclusive New Role</string>
-    <string name="premium_guild_features_show_support_description">Boosters get a shiny, new profile badge that changes with their streak</string>
+    <string name="premium_guild_features_show_support_description">Boosters get a shiny, new profile badge that changes with their streak.</string>
     <string name="premium_guild_features_show_support_mobile">A new profile badge that changes over time</string>
     <string name="premium_guild_features_show_support_title">Show Off Your Support</string>
     <string name="premium_guild_features_title">With Nitro, you can help Boost a server!</string>
-    <string name="premium_guild_features_upload_sizes_description">Increased upload sizes for community-wide, quality meme sharing</string>
+    <string name="premium_guild_features_upload_sizes_description">Increased upload sizes for community-wide, quality meme sharing.</string>
     <string name="premium_guild_features_upload_sizes_mobile">Increased community-wide upload sizes</string>
     <string name="premium_guild_features_upload_sizes_title">Bigger Upload Sizes for All</string>
     <string name="premium_guild_features_upsell_banner_subscribe">Subscribe to Nitro to send a Nitro Boost to a server! [Learn more about Nitro Server Boosting.](%1$s)</string>
@@ -3606,13 +3662,11 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="premium_not_verified">Verify your email first</string>
     <string name="premium_not_verified_body">Hey friend! If you want to buy Nitro, you’ll need to verify your email first.</string>
     <string name="premium_past_due">Your subscription is past due. Please add or update your payment info or your subscription will end on **%1$s**.</string>
-    <string name="premium_payment_applications_os_warning">Nitro games are only supported on Windows.</string>
     <string name="premium_payment_confirmation_blurb_iap">"You can now claim %1$s using your Nitro subscription. Let's get this bread!!!"</string>
     <string name="premium_payment_confirmation_blurb_regular">You now have gained the power of enhanced chat perks. Stop reading this and get to chattin!!!</string>
-    <string name="premium_payment_confirmation_blurb_with_applications">You now have unlimited access to so many awesome games. Stop reading this and go play them!!!</string>
     <string name="premium_payment_confirmation_button_iap">Get %1$s</string>
     <string name="premium_payment_confirmation_button_regular">K, Sounds good</string>
-    <string name="premium_payment_gift_blurb">Gift your friends [Nitro](onClick) so they can get superpower chat perks and unlimited access to over $1000 worth of games.</string>
+    <string name="premium_payment_gift_blurb">Gift your friends [Nitro](onClick) so they get superpower chat perks and a Server Boost.</string>
     <string name="premium_payment_gift_blurb_mobile">Gift someone Nitro to give access to super powered chat perks and Server Boosting. [Learn more about Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">This will be a one time charge for the amount of time chosen. You will not be billed monthly.</string>
     <string name="premium_payment_is_gift">You are purchasing a gift.</string>
@@ -3640,17 +3694,19 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="premium_settings">Nitro Settings</string>
     <string name="premium_settings_get">Get Nitro</string>
     <string name="premium_settings_manage">Manage Nitro</string>
+    <string name="premium_subscription_credit">%1$s Credit</string>
+    <string name="premium_subscription_credit_applied_mismatched_plan">This credit will apply once you sign up for a %1$s subscription.</string>
+    <string name="premium_subscription_credit_applied_on">Credit will be applied upon on %1$s.</string>
+    <string name="premium_subscription_credit_count_months">%1$s</string>
     <string name="premium_subscription_policy_hint_ios">See subscription and auto-renewal details below</string>
     <string name="premium_subscription_policy_ios">By purchasing a Nitro subscription, you agree to our [Terms of Service](%1$s) and [Privacy Policy](%2$s). Payment will be charged to your Apple ID account at the confirmation of purchase. Subscription automatically renews unless it is canceled at least 24 hours before the end of the current period. Your account will be charged for renewal within 24 hours prior to the end of the current period. You can manage and cancel your subscriptions by going to your account settings on the App Store after purchase.</string>
     <string name="premium_subscription_required_body">Hold up! You need Nitro to get this loot.</string>
     <string name="premium_subtitle">Support Discord’s development and get bonus features for your account</string>
-    <string name="premium_subtitle_mobile">Customize your profile with a unique tag, access animated emojis, enjoy bigger file uploads, and more.</string>
     <string name="premium_tier_1">Nitro Classic</string>
     <string name="premium_tier_2">Nitro</string>
-    <string name="premium_tier_2_repositioned_subtitle">Customize your profile with a unique tag, access animated emojis, enjoy bigger file uploads, boost your favorite server, and more.</string>
-    <string name="premium_tier_2_repositioned_title">Get an enhanced Discord experience for one low monthly cost.</string>
+    <string name="premium_tier_2_subtitle">Customize your profile with a unique tag, access animated emojis, enjoy bigger file uploads, boost your favorite server, and more.</string>
+    <string name="premium_tier_2_title">Get an enhanced Discord experience for one low monthly cost.</string>
     <string name="premium_title">Discord Nitro</string>
-    <string name="premium_title_mobile">Get superpowered chat perks at one low, monthly cost.</string>
     <string name="premium_trial_button">Start your free trial</string>
     <string name="premium_upgrade_cancel">Nope</string>
     <string name="premium_upgrade_confirm_body_detailed_month_year">"Upgrade to yearly and get two months free. Whatta deal!!! We'll prorate your current plan and deduct it from the yearly price. You will be charged **%1$s**."</string>
@@ -3670,10 +3726,8 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="premium_upgrade_disabled_lower_tier_tooltip">You have to cancel first and let your sub expire before choosing a lower-tier plan.</string>
     <string name="premium_upgrade_disabled_title_mobile">Changing Plans?</string>
     <string name="premium_upgrade_done_body_tier_1">You now have enhanced chat perks!</string>
-    <string name="premium_upgrade_done_body_tier_2">You now have enhanced chat perks and access to dozens of games.</string>
     <string name="premium_upgrade_done_body_tier_2_guild_subscribe">You now have enhanced chat perks and the ability to boost servers.</string>
     <string name="premium_upgrade_done_button_tier_1">Sweet!</string>
-    <string name="premium_upgrade_done_button_tier_2">Check out all Nitro Games</string>
     <string name="premium_upgrade_failed_body">"Uhh.. That upgrade didn't work. Ensure your payment information is up to date and try again."</string>
     <string name="premium_upgrade_required_body">Hold up! You need Nitro to get this loot. You have Nitro Classic.</string>
     <string name="premium_upload_promo">Upgrade to Discord Nitro for %1$s file limit</string>
@@ -3696,7 +3750,6 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="premium_upsell_upload_description_mobile">Max file size is %1$s. Upgrade to **Discord Nitro** for %2$s file limit!</string>
     <string name="premium_upsell_upload_passive_mobile">Upload higher quality memes</string>
     <string name="premium_year_free_months">Get 2 Months Free!</string>
-    <string name="premium_year_free_months_short">2 months free</string>
     <string name="premium_year_subscription">**%1$s%2$s %3$s** / Year</string>
     <string name="preorder_sku_name">%1$s (Preorder)</string>
     <string name="preview_chat">Preview Chat</string>
@@ -3793,6 +3846,7 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="register_account">Register an account</string>
     <string name="register_body">Enter login information</string>
     <string name="register_title">Create an account</string>
+    <string name="remaining_participants">Add Members (%1$s/%2$s)</string>
     <string name="remove">Remove</string>
     <string name="remove_all_reactions">Remove All Reactions</string>
     <string name="remove_all_reactions_confirm_body">Are you sure you want to remove all reactions from this message?</string>
@@ -3929,10 +3983,13 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="scope_guilds">"Know what servers you're in"</string>
     <string name="scope_guilds_empty">"You're not in any servers."</string>
     <string name="scope_guilds_join">Join servers for you</string>
-    <string name="scope_guilds_join_description">Use instant invites on your behalf.</string>
+    <string name="scope_guilds_join_description">Use invites on your behalf.</string>
+    <string name="scope_guilds_list_overflow">%1$s + %2$s more</string>
     <string name="scope_identify">Access your username and avatar</string>
     <string name="scope_messages_read">Read all messages</string>
     <string name="scope_messages_read_description">This allows the app to read all messages accessible through your Discord account</string>
+    <string name="scope_relationships_read">See who your friends are</string>
+    <string name="scope_relationships_read_description">This allows the app to access your friends list</string>
     <string name="scope_rpc">Interface with your Discord client</string>
     <string name="scope_rpc_api">Perform actions over your Discord client</string>
     <string name="scope_rpc_api_description">This allows the app to send messages, change settings, execute commands, etc.</string>
@@ -4063,7 +4120,7 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="send_message">Send Message</string>
     <string name="send_message_failure">Failed to send message. Hold to retry.</string>
     <string name="send_messages">Send Messages</string>
-    <string name="send_messages_description">Members with this permission can publish Announcements to followers of the channel. [Learn More](%1$s).</string>
+    <string name="send_messages_description">Members with this permission can publish their own messages to all servers following this [Announcement Channel](%1$s).</string>
     <string name="send_tts_messages">Send TTS Messages</string>
     <string name="send_tts_messages_description">Members with this permission can send text-to-speech messages by starting a message with /tts. These messages can be heard by everyone focused on the channel.</string>
     <string name="server_acronym">Server Acronym</string>
@@ -4078,6 +4135,7 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="server_folder_settings">Folder Settings</string>
     <string name="server_icon">Server Icon</string>
     <string name="server_insights">Server Insights</string>
+    <string name="server_insights_error_message">Uh oh! Looks like something broke. Please refresh the application and try again.</string>
     <string name="server_mute">Server Mute</string>
     <string name="server_mute_dms">Mute DMs</string>
     <string name="server_muted">Server Muted</string>
@@ -4085,6 +4143,7 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="server_notification">Server Notification</string>
     <string name="server_options">Server Options</string>
     <string name="server_overview">Server Overview</string>
+    <string name="server_ratio_healthy_hook">Servers with a ratio of 1:3 are considered $[healthy](healthyHook).</string>
     <string name="server_region_unavailable">Unavailable</string>
     <string name="server_settings">Server Settings</string>
     <string name="server_settings_updated">Server settings have been updated.</string>
@@ -4139,6 +4198,7 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="settings_roles_helpdesk_link">Need help with roles? [Get help](%1$s)</string>
     <string name="settings_sync">Sync across clients.</string>
     <string name="settings_webhooks_empty_body">Create a webhook to begin the magic</string>
+    <string name="settings_webhooks_empty_body_ios">For now, webhooks can only be created on web or desktop</string>
     <string name="settings_webhooks_empty_title">No Webhooks</string>
     <string name="settings_webhooks_intro">Webhooks are an easy way to get automated messages and data updates sent to a text channel in the server using internet magic. [Learn more](%1$s).</string>
     <string name="setup">Setup</string>
@@ -4254,6 +4314,8 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="stream_ended">This stream has ended. *cricket noise*</string>
     <string name="stream_ended_button">Stream ended</string>
     <string name="stream_ended_no_spectators">There are no spectators because the stream has ended.</string>
+    <string name="stream_failed_description">Having issues with your stream? [Let us try to help.](%1$s)</string>
+    <string name="stream_failed_title">Stream failed to start :(</string>
     <string name="stream_full_modal_body">Sorry, this stream has the max amount of viewers.</string>
     <string name="stream_full_modal_header">Stream is Full</string>
     <string name="stream_issue_modal_header">Stream Issue</string>
@@ -4281,16 +4343,18 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="stream_report_game_issue">Streaming is causing an issue with my game</string>
     <string name="stream_report_label">Streaming issue</string>
     <string name="stream_report_lagging">Stream is lagging or refreshing</string>
+    <string name="stream_report_no_issue">No issue</string>
     <string name="stream_report_out_of_sync">Stream is out of sync with voice</string>
     <string name="stream_report_placeholder">Select your issue</string>
     <string name="stream_report_problem">Report a problem with your stream</string>
     <string name="stream_report_problem_body">Sorry you had an issue! Let us know what happened.</string>
+    <string name="stream_report_problem_header_mobile">Had an issue?</string>
     <string name="stream_report_problem_mobile">Report Stream Issue</string>
     <string name="stream_report_rating_body">Tell us about your stream watching experience.</string>
     <string name="stream_report_rating_body_streamer">Tell us about your streaming experience.</string>
     <string name="stream_report_submit">Submit</string>
     <string name="stream_reported">Feedback Submitted</string>
-    <string name="stream_reported_body">Thank you for reporting your problem! Your feedback helps us to improve stream quality.</string>
+    <string name="stream_reported_body">Thanks for reporting your issue! Feedback like yours helps us improve Go Live.</string>
     <string name="stream_soundshare_failed">"Hey, something went wrong and we couldn't stream the sound from your game."</string>
     <string name="streamer_mode">Streamer Mode</string>
     <string name="streamer_mode_enabled">Streamer Mode Enabled</string>
@@ -4309,6 +4373,7 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="suppressed_afk_title">Hello, anyone there?</string>
     <string name="suppressed_permission_body">You do not have permission to speak in this channel.</string>
     <string name="sv_se">Swedish</string>
+    <string name="switch_audio_output">Change Audio Output</string>
     <string name="switch_hardware_acceleration">Change Hardware Acceleration</string>
     <string name="switch_hardware_acceleration_body">Changing the hardware acceleration setting will quit and re-launch Discord. Are you sure you want to do this?</string>
     <string name="switch_subsystem">Change Audio Subsystem</string>
@@ -4500,6 +4565,8 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="two_fa_generate_codes_confirm_text">Generating new backup codes will invalidate any old backup codes you have saved.</string>
     <string name="two_fa_guild_mfa_warning">This server requires Two-Factor Authentication. Your admin privileges are disabled. [Resolve](onClick)</string>
     <string name="two_fa_guild_mfa_warning_ios">This server requires Two-Factor Authentication. Your admin privileges are disabled.</string>
+    <string name="two_fa_guild_mfa_warning_message">This server requires Two-Factor Authentication. Your admin privileges are disabled.</string>
+    <string name="two_fa_guild_mfa_warning_resolve_button">Resolve</string>
     <string name="two_fa_ios_delete">You cannot delete servers with 2FA enabled on iOS at the moment.</string>
     <string name="two_fa_key">2FA Key (Manual entry)</string>
     <string name="two_fa_login_body">Enter the 6-digit verification code generated.</string>
@@ -4587,10 +4654,13 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="upload_background">Upload Background</string>
     <string name="upload_emoji">Upload Emoji</string>
     <string name="upload_image">Upload Image</string>
+    <string name="upload_image_body">Is this your card? Err, do you want to upload this image?</string>
     <string name="upload_load_file_failed">Unable to load file.</string>
     <string name="upload_open_file_failed">Unable to open file: %1$s.</string>
     <string name="upload_process_file_failed">Unable to pre-process file.</string>
     <string name="upload_queued">Upload Queued</string>
+    <string name="upload_uploads_too_large_help">Maximum number of uploads allowed in a message reached (%1$s)</string>
+    <string name="upload_uploads_too_large_title">Too Many Uploads</string>
     <string name="uploaded_by">Uploaded By</string>
     <string name="uploading_files">%1$s</string>
     <string name="usage_access">Usage Access</string>
@@ -4631,7 +4701,6 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="user_activity_header_playing_on_platform">Playing on %1$s</string>
     <string name="user_activity_header_streaming_to_server">Streaming to %1$s</string>
     <string name="user_activity_header_watching">Watching %1$s</string>
-    <string name="user_activity_in_voice">in voice</string>
     <string name="user_activity_invite_request_expired">"**%1$s** didn't accept your request. Maybe next time!"</string>
     <string name="user_activity_invite_request_received">**%1$s** wants you to join their game!</string>
     <string name="user_activity_invite_request_requested">**%1$s** wants to join you in **%2$s**.</string>
@@ -4675,6 +4744,13 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="user_popout_message">Message</string>
     <string name="user_popout_settings">User Settings</string>
     <string name="user_popout_wumpus_tooltip">"I'm new to Discord, say hi!"</string>
+    <string name="user_profile_add_friend">Add Friend</string>
+    <string name="user_profile_audio">Call</string>
+    <string name="user_profile_guild_name_content_description">Server Name</string>
+    <string name="user_profile_incoming_friend_request_dialog_body">Accept this friend request?</string>
+    <string name="user_profile_message">Message</string>
+    <string name="user_profile_pending">Pending</string>
+    <string name="user_profile_video">Video</string>
     <string name="user_settings">User Settings</string>
     <string name="user_settings_account_management">ACCOUNT MANAGEMENT</string>
     <string name="user_settings_activity_feed">Activity Feed</string>
@@ -4702,6 +4778,10 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="user_settings_apperannce_disable_games_tab">Show Activity Feed</string>
     <string name="user_settings_apperannce_disable_games_tab_note">Turn this off to hide the Activity Feed so you can focus on your conversations.</string>
     <string name="user_settings_available_codes">Available Backup Codes</string>
+    <string name="user_settings_blocked_users">Blocked Users</string>
+    <string name="user_settings_blocked_users_empty">"You can't unblock Wumpus"</string>
+    <string name="user_settings_blocked_users_header">%1$s Blocked Users</string>
+    <string name="user_settings_blocked_users_unblockbutton">Unblock</string>
     <string name="user_settings_close_button">Close Button</string>
     <string name="user_settings_confirm_logout">Are you sure you want to logout?</string>
     <string name="user_settings_edit_account">Edit Account</string>
@@ -4856,7 +4936,9 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="voice_only">Voice Only</string>
     <string name="voice_permissions">Voice Permissions</string>
     <string name="voice_settings">Voice Settings</string>
+    <string name="voice_status_connecting">Connecting…</string>
     <string name="voice_status_not_connected">Not Connected</string>
+    <string name="voice_status_not_connected_mobile">You are disconnected from this call.</string>
     <string name="voice_status_ringing">Ringing…</string>
     <string name="voice_unavailable">Voice Unavailable</string>
     <string name="watch">Watch</string>
@@ -4926,5 +5008,5 @@ Good news though, it does work on your mobile web browser! So please open it the
     <string name="youre_viewing_older_messages">"You're viewing older messages"</string>
     <string name="zh_cn">Chinese, China</string>
     <string name="zh_tw">Chinese, Taiwan</string>
-    <item type="string" name="APKTOOL_DUMMY_38f">false</item>
+    <item type="string" name="APKTOOL_DUMMY_394">false</item>
 </resources>
diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml
index a9b2a073f0..96f8912d19 100644
--- a/com.discord/res/values/styles.xml
+++ b/com.discord/res/values/styles.xml
@@ -91,7 +91,7 @@
         <item name="android:layout_height">fill_parent</item>
         <item name="layout_behavior">@string/appbar_scrolling_view_behavior</item>
     </style>
-    <style name="AppTheme.Base" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme.Base" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
         <item name="android:windowBackground">@null</item>
         <item name="colorAccent">@color/purple_brand_hint</item>
         <item name="colorPrimary">@color/purple_brand</item>
@@ -183,6 +183,7 @@
         <item name="bg_mentions">@drawable/drawable_overlay_mentions_primary_600</item>
         <item name="bg_payment_method_spinner_closed">@drawable/bg_payment_method_spinner_closed</item>
         <item name="bg_payment_method_spinner_dropdown">@drawable/bg_payment_method_spinner_dropdown</item>
+        <item name="bg_pressed_highlight">@drawable/bg_pressed_highlight_darken</item>
         <item name="boosted_guild_tier_0">@drawable/drawable_boosted_guild_tier_0_dark</item>
         <item name="card_bg">@drawable/drawable_bg_card_grey</item>
         <item name="chat_embed_bg">@drawable/drawable_chat_embed_dark_background</item>
@@ -465,6 +466,7 @@
         <item name="android:windowSoftInputMode">stateUnchanged</item>
         <item name="android:windowCloseOnTouchOutside">false</item>
     </style>
+    <style name="AppTheme.Dialog.Popup.Swipeable" parent="@style/AppTheme.Dialog.Popup" />
     <style name="AppTheme.Light" parent="@style/AppTheme.Light.Base">
         <item name="actionMenuTextColor">@color/primary_500</item>
         <item name="boost_confirmation_card_bg">@color/white</item>
@@ -544,6 +546,7 @@
         <item name="bg_mentions">@drawable/drawable_overlay_mentions_primary_100</item>
         <item name="bg_payment_method_spinner_closed">@drawable/bg_payment_method_spinner_closed_light</item>
         <item name="bg_payment_method_spinner_dropdown">@drawable/bg_payment_method_spinner_dropdown_light</item>
+        <item name="bg_pressed_highlight">@drawable/bg_pressed_highlight_brighten</item>
         <item name="boosted_guild_tier_0">@drawable/drawable_boosted_guild_tier_0_light</item>
         <item name="card_bg">@drawable/drawable_bg_card_white</item>
         <item name="chat_embed_bg">@drawable/drawable_chat_embed_light_background</item>
@@ -796,7 +799,10 @@
         <item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
     </style>
     <style name="AppTheme.Loading" parent="@style/AppTheme.Dark">
-        <item name="android:windowBackground">@drawable/drawable_loading</item>
+        <item name="android:windowBackground">@drawable/drawable_bg_loading</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:windowEnterAnimation">@null</item>
+        <item name="android:windowExitAnimation">@null</item>
         <item name="android:windowFullscreen">true</item>
     </style>
     <style name="AppTheme.NoActionBar" parent="@style/AppTheme">
@@ -868,11 +874,6 @@
         <item name="android:layout_height">@dimen/avatar_size_extra_large_account</item>
         <item name="placeholderImage">@drawable/asset_default_avatar_64dp</item>
     </style>
-    <style name="Avatar.Large.ExtraExtra" parent="@style/Avatar">
-        <item name="android:layout_width">@dimen/avatar_size_extra_extra_large</item>
-        <item name="android:layout_height">@dimen/avatar_size_extra_extra_large</item>
-        <item name="placeholderImage">@drawable/asset_default_avatar_64dp</item>
-    </style>
     <style name="Avatar.Medium" parent="@style/Avatar">
         <item name="android:layout_width">@dimen/avatar_size_medium</item>
         <item name="android:layout_height">@dimen/avatar_size_medium</item>
@@ -892,6 +893,11 @@
         <item name="android:layout_height">@dimen/avatar_size_standard</item>
         <item name="placeholderImage">@drawable/asset_default_avatar_32dp</item>
     </style>
+    <style name="Avatar.XXLarge" parent="@style/Avatar">
+        <item name="android:layout_width">@dimen/avatar_size_xxlarge</item>
+        <item name="android:layout_height">@dimen/avatar_size_xxlarge</item>
+        <item name="placeholderImage">@drawable/asset_default_avatar_80dp</item>
+    </style>
     <style name="Base.AlertDialog.AppCompat" parent="@android:style/Widget">
         <item name="android:layout">@layout/abc_alert_dialog_material</item>
         <item name="buttonIconDimen">@dimen/abc_alert_dialog_button_dimen</item>
@@ -3494,6 +3500,16 @@
         <item name="android:layout_height">16.0dip</item>
         <item name="android:src">@drawable/ic_volume_up_white_24dp</item>
     </style>
+    <style name="UiKit.ImageButton" parent="@style/UiKit">
+        <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: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:textAllCaps">false</item>
+    </style>
     <style name="UiKit.ImageView" parent="">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -3871,6 +3887,9 @@
         <item name="android:layout_marginRight">0.0dip</item>
     </style>
     <style name="UiKit.User.Phone.Verify.Digits" parent="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
+    <style name="UiKit.UserSheetRichPresenceContainer" parent="@style/UiKit.ViewGroup.ConstraintLayout">
+        <item name="android:paddingBottom">@dimen/uikit_spacing_large</item>
+    </style>
     <style name="UiKit.ViewGroup" parent="">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/com.discord/smali/$r8$java8methods$utility$Long$hashCode$IJ.smali b/com.discord/smali/$r8$java8methods$utility$Long$hashCode$IJ.smali
new file mode 100644
index 0000000000..76b4742308
--- /dev/null
+++ b/com.discord/smali/$r8$java8methods$utility$Long$hashCode$IJ.smali
@@ -0,0 +1,18 @@
+.class public synthetic L$r8$java8methods$utility$Long$hashCode$IJ;
+.super Ljava/lang/Object;
+
+
+# direct methods
+.method public static synthetic hashCode(J)I
+    .locals 0
+
+    invoke-static {p0, p1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/lang/Long;->hashCode()I
+
+    move-result p0
+
+    return p0
+.end method
diff --git a/com.discord/smali/androidx/appcompat/R$attr.smali b/com.discord/smali/androidx/appcompat/R$attr.smali
index 76e085ba67..7bd7422c38 100644
--- a/com.discord/smali/androidx/appcompat/R$attr.smali
+++ b/com.discord/smali/androidx/appcompat/R$attr.smali
@@ -125,439 +125,439 @@
 
 .field public static final barLength:I = 0x7f040052
 
-.field public static final borderlessButtonStyle:I = 0x7f040065
+.field public static final borderlessButtonStyle:I = 0x7f040066
 
-.field public static final buttonBarButtonStyle:I = 0x7f040074
+.field public static final buttonBarButtonStyle:I = 0x7f040075
 
-.field public static final buttonBarNegativeButtonStyle:I = 0x7f040075
+.field public static final buttonBarNegativeButtonStyle:I = 0x7f040076
 
-.field public static final buttonBarNeutralButtonStyle:I = 0x7f040076
+.field public static final buttonBarNeutralButtonStyle:I = 0x7f040077
 
-.field public static final buttonBarPositiveButtonStyle:I = 0x7f040077
+.field public static final buttonBarPositiveButtonStyle:I = 0x7f040078
 
-.field public static final buttonBarStyle:I = 0x7f040078
+.field public static final buttonBarStyle:I = 0x7f040079
 
-.field public static final buttonGravity:I = 0x7f040079
+.field public static final buttonGravity:I = 0x7f04007a
 
-.field public static final buttonIconDimen:I = 0x7f04007a
+.field public static final buttonIconDimen:I = 0x7f04007b
 
-.field public static final buttonPanelSideLayout:I = 0x7f04007b
+.field public static final buttonPanelSideLayout:I = 0x7f04007c
 
-.field public static final buttonStyle:I = 0x7f04007d
+.field public static final buttonStyle:I = 0x7f04007e
 
-.field public static final buttonStyleSmall:I = 0x7f04007e
+.field public static final buttonStyleSmall:I = 0x7f04007f
 
-.field public static final buttonTint:I = 0x7f04007f
+.field public static final buttonTint:I = 0x7f040080
 
-.field public static final buttonTintMode:I = 0x7f040080
+.field public static final buttonTintMode:I = 0x7f040081
 
-.field public static final checkboxStyle:I = 0x7f04008c
+.field public static final checkboxStyle:I = 0x7f04008d
 
-.field public static final checkedTextViewStyle:I = 0x7f040091
+.field public static final checkedTextViewStyle:I = 0x7f040092
 
-.field public static final closeIcon:I = 0x7f0400a5
+.field public static final closeIcon:I = 0x7f0400a6
 
-.field public static final closeItemLayout:I = 0x7f0400ac
+.field public static final closeItemLayout:I = 0x7f0400ad
 
-.field public static final collapseContentDescription:I = 0x7f0400ad
+.field public static final collapseContentDescription:I = 0x7f0400ae
 
-.field public static final collapseIcon:I = 0x7f0400ae
+.field public static final collapseIcon:I = 0x7f0400af
 
-.field public static final color:I = 0x7f0400b1
+.field public static final color:I = 0x7f0400b2
 
-.field public static final colorAccent:I = 0x7f0400b2
+.field public static final colorAccent:I = 0x7f0400b3
 
-.field public static final colorBackgroundFloating:I = 0x7f0400b3
+.field public static final colorBackgroundFloating:I = 0x7f0400b4
 
-.field public static final colorButtonNormal:I = 0x7f0400b4
+.field public static final colorButtonNormal:I = 0x7f0400b5
 
-.field public static final colorControlActivated:I = 0x7f0400b5
+.field public static final colorControlActivated:I = 0x7f0400b6
 
-.field public static final colorControlHighlight:I = 0x7f0400b6
+.field public static final colorControlHighlight:I = 0x7f0400b7
 
-.field public static final colorControlNormal:I = 0x7f0400b7
+.field public static final colorControlNormal:I = 0x7f0400b8
 
-.field public static final colorError:I = 0x7f0400b8
+.field public static final colorError:I = 0x7f0400b9
 
-.field public static final colorPrimary:I = 0x7f0400b9
+.field public static final colorPrimary:I = 0x7f0400ba
 
-.field public static final colorPrimaryDark:I = 0x7f0400bc
+.field public static final colorPrimaryDark:I = 0x7f0400bd
 
-.field public static final colorSwitchThumbNormal:I = 0x7f0400c1
+.field public static final colorSwitchThumbNormal:I = 0x7f0400c2
 
-.field public static final commitIcon:I = 0x7f0400c2
+.field public static final commitIcon:I = 0x7f0400c3
 
-.field public static final contentDescription:I = 0x7f0400c7
+.field public static final contentDescription:I = 0x7f0400c8
 
-.field public static final contentInsetEnd:I = 0x7f0400c8
+.field public static final contentInsetEnd:I = 0x7f0400c9
 
-.field public static final contentInsetEndWithActions:I = 0x7f0400c9
+.field public static final contentInsetEndWithActions:I = 0x7f0400ca
 
-.field public static final contentInsetLeft:I = 0x7f0400ca
+.field public static final contentInsetLeft:I = 0x7f0400cb
 
-.field public static final contentInsetRight:I = 0x7f0400cb
+.field public static final contentInsetRight:I = 0x7f0400cc
 
-.field public static final contentInsetStart:I = 0x7f0400cc
+.field public static final contentInsetStart:I = 0x7f0400cd
 
-.field public static final contentInsetStartWithNavigation:I = 0x7f0400cd
+.field public static final contentInsetStartWithNavigation:I = 0x7f0400ce
 
-.field public static final controlBackground:I = 0x7f0400d4
+.field public static final controlBackground:I = 0x7f0400d5
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final customNavigationLayout:I = 0x7f0400e9
+.field public static final customNavigationLayout:I = 0x7f0400ea
 
-.field public static final defaultQueryHint:I = 0x7f0400ff
+.field public static final defaultQueryHint:I = 0x7f040100
 
-.field public static final dialogCornerRadius:I = 0x7f040100
+.field public static final dialogCornerRadius:I = 0x7f040101
 
-.field public static final dialogPreferredPadding:I = 0x7f040101
+.field public static final dialogPreferredPadding:I = 0x7f040102
 
-.field public static final dialogTheme:I = 0x7f040102
+.field public static final dialogTheme:I = 0x7f040103
 
-.field public static final displayOptions:I = 0x7f040103
+.field public static final displayOptions:I = 0x7f040104
 
-.field public static final divider:I = 0x7f040104
+.field public static final divider:I = 0x7f040105
 
-.field public static final dividerHorizontal:I = 0x7f040108
+.field public static final dividerHorizontal:I = 0x7f040109
 
-.field public static final dividerPadding:I = 0x7f040109
+.field public static final dividerPadding:I = 0x7f04010a
 
-.field public static final dividerVertical:I = 0x7f04010a
+.field public static final dividerVertical:I = 0x7f04010b
 
-.field public static final drawableSize:I = 0x7f04010b
+.field public static final drawableSize:I = 0x7f04010c
 
-.field public static final drawerArrowStyle:I = 0x7f04010c
+.field public static final drawerArrowStyle:I = 0x7f04010d
 
-.field public static final dropDownListViewStyle:I = 0x7f04010d
+.field public static final dropDownListViewStyle:I = 0x7f04010f
 
-.field public static final dropdownListPreferredItemHeight:I = 0x7f04010e
+.field public static final dropdownListPreferredItemHeight:I = 0x7f040110
 
-.field public static final editTextBackground:I = 0x7f04010f
+.field public static final editTextBackground:I = 0x7f040111
 
-.field public static final editTextColor:I = 0x7f040110
+.field public static final editTextColor:I = 0x7f040112
 
-.field public static final editTextStyle:I = 0x7f040111
+.field public static final editTextStyle:I = 0x7f040113
 
-.field public static final elevation:I = 0x7f040112
+.field public static final elevation:I = 0x7f040114
 
-.field public static final expandActivityOverflowButtonDrawable:I = 0x7f040118
+.field public static final expandActivityOverflowButtonDrawable:I = 0x7f04011a
 
-.field public static final firstBaselineToTopHeight:I = 0x7f040131
+.field public static final firstBaselineToTopHeight:I = 0x7f040133
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontFamily:I = 0x7f04013f
+.field public static final fontFamily:I = 0x7f040141
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final gapBetweenBars:I = 0x7f04014a
+.field public static final gapBetweenBars:I = 0x7f04014c
 
-.field public static final goIcon:I = 0x7f04014f
+.field public static final goIcon:I = 0x7f040151
 
-.field public static final height:I = 0x7f040156
+.field public static final height:I = 0x7f040158
 
-.field public static final hideOnContentScroll:I = 0x7f04015b
+.field public static final hideOnContentScroll:I = 0x7f04015d
 
-.field public static final homeAsUpIndicator:I = 0x7f040162
+.field public static final homeAsUpIndicator:I = 0x7f040164
 
-.field public static final homeLayout:I = 0x7f040163
+.field public static final homeLayout:I = 0x7f040165
 
-.field public static final icon:I = 0x7f0401c7
+.field public static final icon:I = 0x7f0401c9
 
-.field public static final iconTint:I = 0x7f0401cd
+.field public static final iconTint:I = 0x7f0401cf
 
-.field public static final iconTintMode:I = 0x7f0401ce
+.field public static final iconTintMode:I = 0x7f0401d0
 
-.field public static final iconifiedByDefault:I = 0x7f0401cf
+.field public static final iconifiedByDefault:I = 0x7f0401d1
 
-.field public static final imageButtonStyle:I = 0x7f0401d2
+.field public static final imageButtonStyle:I = 0x7f0401d4
 
-.field public static final indeterminateProgressStyle:I = 0x7f0401ea
+.field public static final indeterminateProgressStyle:I = 0x7f0401ec
 
-.field public static final initialActivityCount:I = 0x7f0401eb
+.field public static final initialActivityCount:I = 0x7f0401ed
 
-.field public static final isLightTheme:I = 0x7f0401ed
+.field public static final isLightTheme:I = 0x7f0401ef
 
-.field public static final itemPadding:I = 0x7f0401f4
+.field public static final itemPadding:I = 0x7f0401f6
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final lastBaselineToBottomHeight:I = 0x7f0401fd
+.field public static final lastBaselineToBottomHeight:I = 0x7f0401ff
 
-.field public static final layout:I = 0x7f0401fe
+.field public static final layout:I = 0x7f040200
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final lineHeight:I = 0x7f04024a
+.field public static final lineHeight:I = 0x7f04024d
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04024c
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04024f
 
-.field public static final listDividerAlertDialog:I = 0x7f04024d
+.field public static final listDividerAlertDialog:I = 0x7f040250
 
-.field public static final listItemLayout:I = 0x7f04024e
+.field public static final listItemLayout:I = 0x7f040251
 
-.field public static final listLayout:I = 0x7f04024f
+.field public static final listLayout:I = 0x7f040252
 
-.field public static final listMenuViewStyle:I = 0x7f040250
+.field public static final listMenuViewStyle:I = 0x7f040253
 
-.field public static final listPopupWindowStyle:I = 0x7f040251
+.field public static final listPopupWindowStyle:I = 0x7f040254
 
-.field public static final listPreferredItemHeight:I = 0x7f040252
+.field public static final listPreferredItemHeight:I = 0x7f040255
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040253
+.field public static final listPreferredItemHeightLarge:I = 0x7f040256
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040254
+.field public static final listPreferredItemHeightSmall:I = 0x7f040257
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040255
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040258
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040256
+.field public static final listPreferredItemPaddingRight:I = 0x7f040259
 
-.field public static final logo:I = 0x7f040257
+.field public static final logo:I = 0x7f04025a
 
-.field public static final logoDescription:I = 0x7f040258
+.field public static final logoDescription:I = 0x7f04025b
 
-.field public static final maxButtonHeight:I = 0x7f04026b
+.field public static final maxButtonHeight:I = 0x7f04026e
 
-.field public static final measureWithLargestChild:I = 0x7f04026e
+.field public static final measureWithLargestChild:I = 0x7f040271
 
-.field public static final multiChoiceItemLayout:I = 0x7f040270
+.field public static final multiChoiceItemLayout:I = 0x7f040273
 
-.field public static final navigationContentDescription:I = 0x7f040271
+.field public static final navigationContentDescription:I = 0x7f040274
 
-.field public static final navigationIcon:I = 0x7f040272
+.field public static final navigationIcon:I = 0x7f040275
 
-.field public static final navigationMode:I = 0x7f040273
+.field public static final navigationMode:I = 0x7f040276
 
-.field public static final numericModifiers:I = 0x7f040277
+.field public static final numericModifiers:I = 0x7f04027a
 
-.field public static final overlapAnchor:I = 0x7f040278
+.field public static final overlapAnchor:I = 0x7f04027b
 
-.field public static final paddingBottomNoButtons:I = 0x7f04027c
+.field public static final paddingBottomNoButtons:I = 0x7f04027f
 
-.field public static final paddingEnd:I = 0x7f04027d
+.field public static final paddingEnd:I = 0x7f040280
 
-.field public static final paddingStart:I = 0x7f04027e
+.field public static final paddingStart:I = 0x7f040281
 
-.field public static final paddingTopNoTitle:I = 0x7f04027f
+.field public static final paddingTopNoTitle:I = 0x7f040282
 
-.field public static final panelBackground:I = 0x7f040280
+.field public static final panelBackground:I = 0x7f040283
 
-.field public static final panelMenuListTheme:I = 0x7f040281
+.field public static final panelMenuListTheme:I = 0x7f040284
 
-.field public static final panelMenuListWidth:I = 0x7f040282
+.field public static final panelMenuListWidth:I = 0x7f040285
 
-.field public static final popupMenuStyle:I = 0x7f04028a
+.field public static final popupMenuStyle:I = 0x7f04028d
 
-.field public static final popupTheme:I = 0x7f04028b
+.field public static final popupTheme:I = 0x7f04028e
 
-.field public static final popupWindowStyle:I = 0x7f04028c
+.field public static final popupWindowStyle:I = 0x7f04028f
 
-.field public static final preserveIconSpacing:I = 0x7f04028d
+.field public static final preserveIconSpacing:I = 0x7f040290
 
-.field public static final progressBarPadding:I = 0x7f0402b9
+.field public static final progressBarPadding:I = 0x7f0402bc
 
-.field public static final progressBarStyle:I = 0x7f0402ba
+.field public static final progressBarStyle:I = 0x7f0402bd
 
-.field public static final queryBackground:I = 0x7f0402bd
+.field public static final queryBackground:I = 0x7f0402c0
 
-.field public static final queryHint:I = 0x7f0402be
+.field public static final queryHint:I = 0x7f0402c1
 
-.field public static final radioButtonStyle:I = 0x7f0402bf
+.field public static final radioButtonStyle:I = 0x7f0402c2
 
-.field public static final ratingBarStyle:I = 0x7f0402c2
+.field public static final ratingBarStyle:I = 0x7f0402c5
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402c3
+.field public static final ratingBarStyleIndicator:I = 0x7f0402c6
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402c4
+.field public static final ratingBarStyleSmall:I = 0x7f0402c7
 
-.field public static final searchHintIcon:I = 0x7f0402e9
+.field public static final searchHintIcon:I = 0x7f0402ec
 
-.field public static final searchIcon:I = 0x7f0402ea
+.field public static final searchIcon:I = 0x7f0402ed
 
-.field public static final searchViewStyle:I = 0x7f0402eb
+.field public static final searchViewStyle:I = 0x7f0402ee
 
-.field public static final seekBarStyle:I = 0x7f0402ed
+.field public static final seekBarStyle:I = 0x7f0402f0
 
-.field public static final selectableItemBackground:I = 0x7f0402ee
+.field public static final selectableItemBackground:I = 0x7f0402f1
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ef
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402f2
 
-.field public static final showAsAction:I = 0x7f0402f1
+.field public static final showAsAction:I = 0x7f0402f4
 
-.field public static final showDividers:I = 0x7f0402f5
+.field public static final showDividers:I = 0x7f0402f8
 
-.field public static final showText:I = 0x7f0402f7
+.field public static final showText:I = 0x7f0402fa
 
-.field public static final showTitle:I = 0x7f0402f8
+.field public static final showTitle:I = 0x7f0402fb
 
-.field public static final singleChoiceItemLayout:I = 0x7f0402f9
+.field public static final singleChoiceItemLayout:I = 0x7f0402fc
 
-.field public static final spinBars:I = 0x7f0402ff
+.field public static final spinBars:I = 0x7f040302
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f040300
+.field public static final spinnerDropDownItemStyle:I = 0x7f040303
 
-.field public static final spinnerStyle:I = 0x7f040301
+.field public static final spinnerStyle:I = 0x7f040304
 
-.field public static final splitTrack:I = 0x7f040302
+.field public static final splitTrack:I = 0x7f040305
 
-.field public static final srcCompat:I = 0x7f040303
+.field public static final srcCompat:I = 0x7f040306
 
-.field public static final state_above_anchor:I = 0x7f040305
+.field public static final state_above_anchor:I = 0x7f040308
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final subMenuArrow:I = 0x7f040311
+.field public static final subMenuArrow:I = 0x7f040314
 
-.field public static final submitBackground:I = 0x7f040312
+.field public static final submitBackground:I = 0x7f040315
 
-.field public static final subtitle:I = 0x7f040313
+.field public static final subtitle:I = 0x7f040316
 
-.field public static final subtitleTextAppearance:I = 0x7f040314
+.field public static final subtitleTextAppearance:I = 0x7f040317
 
-.field public static final subtitleTextColor:I = 0x7f040315
+.field public static final subtitleTextColor:I = 0x7f040318
 
-.field public static final subtitleTextStyle:I = 0x7f040316
+.field public static final subtitleTextStyle:I = 0x7f040319
 
-.field public static final suggestionRowLayout:I = 0x7f040317
+.field public static final suggestionRowLayout:I = 0x7f04031a
 
-.field public static final switchMinWidth:I = 0x7f040318
+.field public static final switchMinWidth:I = 0x7f04031b
 
-.field public static final switchPadding:I = 0x7f040319
+.field public static final switchPadding:I = 0x7f04031c
 
-.field public static final switchStyle:I = 0x7f04031a
+.field public static final switchStyle:I = 0x7f04031d
 
-.field public static final switchTextAppearance:I = 0x7f04031b
+.field public static final switchTextAppearance:I = 0x7f04031e
 
-.field public static final textAllCaps:I = 0x7f040339
+.field public static final textAllCaps:I = 0x7f04033c
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040344
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040347
 
-.field public static final textAppearanceListItem:I = 0x7f040345
+.field public static final textAppearanceListItem:I = 0x7f040348
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040346
+.field public static final textAppearanceListItemSecondary:I = 0x7f040349
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040347
+.field public static final textAppearanceListItemSmall:I = 0x7f04034a
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040349
+.field public static final textAppearancePopupMenuHeader:I = 0x7f04034c
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04034a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04034d
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04034b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04034e
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04034c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04034f
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04034f
+.field public static final textColorAlertDialogListItem:I = 0x7f040352
 
-.field public static final textColorSearchUrl:I = 0x7f040350
+.field public static final textColorSearchUrl:I = 0x7f040353
 
-.field public static final theme:I = 0x7f040355
+.field public static final theme:I = 0x7f040358
 
-.field public static final thickness:I = 0x7f0403a6
+.field public static final thickness:I = 0x7f0403a9
 
-.field public static final thumbTextPadding:I = 0x7f0403a7
+.field public static final thumbTextPadding:I = 0x7f0403aa
 
-.field public static final thumbTint:I = 0x7f0403a8
+.field public static final thumbTint:I = 0x7f0403ab
 
-.field public static final thumbTintMode:I = 0x7f0403a9
+.field public static final thumbTintMode:I = 0x7f0403ac
 
-.field public static final tickMark:I = 0x7f0403aa
+.field public static final tickMark:I = 0x7f0403ad
 
-.field public static final tickMarkTint:I = 0x7f0403ab
+.field public static final tickMarkTint:I = 0x7f0403ae
 
-.field public static final tickMarkTintMode:I = 0x7f0403ac
+.field public static final tickMarkTintMode:I = 0x7f0403af
 
-.field public static final tint:I = 0x7f0403ad
+.field public static final tint:I = 0x7f0403b0
 
-.field public static final tintMode:I = 0x7f0403ae
+.field public static final tintMode:I = 0x7f0403b1
 
-.field public static final title:I = 0x7f0403af
+.field public static final title:I = 0x7f0403b2
 
-.field public static final titleMargin:I = 0x7f0403b1
+.field public static final titleMargin:I = 0x7f0403b4
 
-.field public static final titleMarginBottom:I = 0x7f0403b2
+.field public static final titleMarginBottom:I = 0x7f0403b5
 
-.field public static final titleMarginEnd:I = 0x7f0403b3
+.field public static final titleMarginEnd:I = 0x7f0403b6
 
-.field public static final titleMarginStart:I = 0x7f0403b4
+.field public static final titleMarginStart:I = 0x7f0403b7
 
-.field public static final titleMarginTop:I = 0x7f0403b5
+.field public static final titleMarginTop:I = 0x7f0403b8
 
-.field public static final titleMargins:I = 0x7f0403b6
+.field public static final titleMargins:I = 0x7f0403b9
 
-.field public static final titleTextAppearance:I = 0x7f0403b7
+.field public static final titleTextAppearance:I = 0x7f0403ba
 
-.field public static final titleTextColor:I = 0x7f0403b8
+.field public static final titleTextColor:I = 0x7f0403bb
 
-.field public static final titleTextStyle:I = 0x7f0403b9
+.field public static final titleTextStyle:I = 0x7f0403bc
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f0403bb
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0403be
 
-.field public static final toolbarStyle:I = 0x7f0403bc
+.field public static final toolbarStyle:I = 0x7f0403bf
 
-.field public static final tooltipForegroundColor:I = 0x7f0403bd
+.field public static final tooltipForegroundColor:I = 0x7f0403c0
 
-.field public static final tooltipFrameBackground:I = 0x7f0403be
+.field public static final tooltipFrameBackground:I = 0x7f0403c1
 
-.field public static final tooltipText:I = 0x7f0403bf
+.field public static final tooltipText:I = 0x7f0403c2
 
-.field public static final track:I = 0x7f0403c0
+.field public static final track:I = 0x7f0403c3
 
-.field public static final trackTint:I = 0x7f0403c1
+.field public static final trackTint:I = 0x7f0403c4
 
-.field public static final trackTintMode:I = 0x7f0403c2
+.field public static final trackTintMode:I = 0x7f0403c5
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
-.field public static final viewInflaterClass:I = 0x7f0403dc
+.field public static final viewInflaterClass:I = 0x7f0403e1
 
-.field public static final voiceIcon:I = 0x7f0403dd
+.field public static final voiceIcon:I = 0x7f0403e2
 
-.field public static final windowActionBar:I = 0x7f0403df
+.field public static final windowActionBar:I = 0x7f0403e4
 
-.field public static final windowActionBarOverlay:I = 0x7f0403e0
+.field public static final windowActionBarOverlay:I = 0x7f0403e5
 
-.field public static final windowActionModeOverlay:I = 0x7f0403e1
+.field public static final windowActionModeOverlay:I = 0x7f0403e6
 
-.field public static final windowFixedHeightMajor:I = 0x7f0403e2
+.field public static final windowFixedHeightMajor:I = 0x7f0403e7
 
-.field public static final windowFixedHeightMinor:I = 0x7f0403e3
+.field public static final windowFixedHeightMinor:I = 0x7f0403e8
 
-.field public static final windowFixedWidthMajor:I = 0x7f0403e4
+.field public static final windowFixedWidthMajor:I = 0x7f0403e9
 
-.field public static final windowFixedWidthMinor:I = 0x7f0403e5
+.field public static final windowFixedWidthMinor:I = 0x7f0403ea
 
-.field public static final windowMinWidthMajor:I = 0x7f0403e6
+.field public static final windowMinWidthMajor:I = 0x7f0403eb
 
-.field public static final windowMinWidthMinor:I = 0x7f0403e7
+.field public static final windowMinWidthMinor:I = 0x7f0403ec
 
-.field public static final windowNoTitle:I = 0x7f0403e8
+.field public static final windowNoTitle:I = 0x7f0403ed
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$color.smali b/com.discord/smali/androidx/appcompat/R$color.smali
index d5ff6ff224..e1a6363933 100644
--- a/com.discord/smali/androidx/appcompat/R$color.smali
+++ b/com.discord/smali/androidx/appcompat/R$color.smali
@@ -75,113 +75,113 @@
 
 .field public static final background_material_light:I = 0x7f06001f
 
-.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060035
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
 
-.field public static final bright_foreground_material_dark:I = 0x7f060038
+.field public static final bright_foreground_material_dark:I = 0x7f060039
 
-.field public static final bright_foreground_material_light:I = 0x7f060039
+.field public static final bright_foreground_material_light:I = 0x7f06003a
 
-.field public static final button_material_dark:I = 0x7f06003f
+.field public static final button_material_dark:I = 0x7f060040
 
-.field public static final button_material_light:I = 0x7f060040
+.field public static final button_material_light:I = 0x7f060041
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060066
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060067
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f060068
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f060069
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final error_color_material_dark:I = 0x7f06006a
+.field public static final error_color_material_dark:I = 0x7f06006d
 
-.field public static final error_color_material_light:I = 0x7f06006b
+.field public static final error_color_material_light:I = 0x7f06006e
 
-.field public static final foreground_material_dark:I = 0x7f060070
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060071
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060080
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060081
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f06008f
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060090
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060091
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060092
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060093
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060094
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060095
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060096
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060097
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f060098
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f060099
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009a
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final primary_dark_material_dark:I = 0x7f0600d9
+.field public static final primary_dark_material_dark:I = 0x7f0600dc
 
-.field public static final primary_dark_material_light:I = 0x7f0600da
+.field public static final primary_dark_material_light:I = 0x7f0600dd
 
-.field public static final primary_material_dark:I = 0x7f0600ea
+.field public static final primary_material_dark:I = 0x7f0600ed
 
-.field public static final primary_material_light:I = 0x7f0600eb
+.field public static final primary_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ec
+.field public static final primary_text_default_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ed
+.field public static final primary_text_default_material_light:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ee
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f1
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f2
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fb
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600ff
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f060100
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060133
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060134
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060136
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060137
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$dimen.smali b/com.discord/smali/androidx/appcompat/R$dimen.smali
index 926dd52b44..01c7ca67ab 100644
--- a/com.discord/smali/androidx/appcompat/R$dimen.smali
+++ b/com.discord/smali/androidx/appcompat/R$dimen.smali
@@ -179,69 +179,69 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final disabled_alpha_material_dark:I = 0x7f0700b1
+.field public static final disabled_alpha_material_dark:I = 0x7f0700b2
 
-.field public static final disabled_alpha_material_light:I = 0x7f0700b2
+.field public static final disabled_alpha_material_light:I = 0x7f0700b3
 
-.field public static final highlight_alpha_material_colored:I = 0x7f0700c4
+.field public static final highlight_alpha_material_colored:I = 0x7f0700c6
 
-.field public static final highlight_alpha_material_dark:I = 0x7f0700c5
+.field public static final highlight_alpha_material_dark:I = 0x7f0700c7
 
-.field public static final highlight_alpha_material_light:I = 0x7f0700c6
+.field public static final highlight_alpha_material_light:I = 0x7f0700c8
 
-.field public static final hint_alpha_material_dark:I = 0x7f0700c7
+.field public static final hint_alpha_material_dark:I = 0x7f0700c9
 
-.field public static final hint_alpha_material_light:I = 0x7f0700c8
+.field public static final hint_alpha_material_light:I = 0x7f0700ca
 
-.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700c9
+.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700cb
 
-.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ca
+.field public static final hint_pressed_alpha_material_light:I = 0x7f0700cc
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
-.field public static final tooltip_corner_radius:I = 0x7f07012b
+.field public static final tooltip_corner_radius:I = 0x7f07012d
 
-.field public static final tooltip_horizontal_padding:I = 0x7f07012c
+.field public static final tooltip_horizontal_padding:I = 0x7f07012e
 
-.field public static final tooltip_margin:I = 0x7f07012d
+.field public static final tooltip_margin:I = 0x7f07012f
 
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07012e
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f070130
 
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07012f
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f070131
 
-.field public static final tooltip_vertical_padding:I = 0x7f070130
+.field public static final tooltip_vertical_padding:I = 0x7f070132
 
-.field public static final tooltip_y_offset_non_touch:I = 0x7f070131
+.field public static final tooltip_y_offset_non_touch:I = 0x7f070133
 
-.field public static final tooltip_y_offset_touch:I = 0x7f070132
+.field public static final tooltip_y_offset_touch:I = 0x7f070134
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$drawable.smali b/com.discord/smali/androidx/appcompat/R$drawable.smali
index acc56c224c..0b829d51e4 100644
--- a/com.discord/smali/androidx/appcompat/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/R$drawable.smali
@@ -15,201 +15,201 @@
 
 
 # static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080017
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080017
+.field public static final abc_action_bar_item_background_material:I = 0x7f080018
 
-.field public static final abc_btn_borderless_material:I = 0x7f080018
+.field public static final abc_btn_borderless_material:I = 0x7f080019
 
-.field public static final abc_btn_check_material:I = 0x7f080019
+.field public static final abc_btn_check_material:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
 
-.field public static final abc_btn_colored_material:I = 0x7f08001c
+.field public static final abc_btn_colored_material:I = 0x7f08001d
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
 
-.field public static final abc_btn_radio_material:I = 0x7f08001e
+.field public static final abc_btn_radio_material:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080023
+.field public static final abc_cab_background_internal_bg:I = 0x7f080024
 
-.field public static final abc_cab_background_top_material:I = 0x7f080024
+.field public static final abc_cab_background_top_material:I = 0x7f080025
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
 
-.field public static final abc_control_background_material:I = 0x7f080026
+.field public static final abc_control_background_material:I = 0x7f080027
 
-.field public static final abc_dialog_material_background:I = 0x7f080027
+.field public static final abc_dialog_material_background:I = 0x7f080028
 
-.field public static final abc_edit_text_material:I = 0x7f080028
+.field public static final abc_edit_text_material:I = 0x7f080029
 
-.field public static final abc_ic_ab_back_material:I = 0x7f080029
+.field public static final abc_ic_ab_back_material:I = 0x7f08002a
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
 
-.field public static final abc_ic_clear_material:I = 0x7f08002b
+.field public static final abc_ic_clear_material:I = 0x7f08002c
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
 
-.field public static final abc_ic_search_api_material:I = 0x7f080034
+.field public static final abc_ic_search_api_material:I = 0x7f080035
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080035
+.field public static final abc_ic_star_black_16dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080036
+.field public static final abc_ic_star_black_36dp:I = 0x7f080037
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080037
+.field public static final abc_ic_star_black_48dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003c
+.field public static final abc_item_background_holo_dark:I = 0x7f08003d
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003d
+.field public static final abc_item_background_holo_light:I = 0x7f08003e
 
-.field public static final abc_list_divider_material:I = 0x7f08003e
+.field public static final abc_list_divider_material:I = 0x7f08003f
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
 
-.field public static final abc_list_focused_holo:I = 0x7f080040
+.field public static final abc_list_focused_holo:I = 0x7f080041
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080041
+.field public static final abc_list_longpressed_holo:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080043
+.field public static final abc_list_pressed_holo_light:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080048
+.field public static final abc_list_selector_holo_dark:I = 0x7f080049
 
-.field public static final abc_list_selector_holo_light:I = 0x7f080049
+.field public static final abc_list_selector_holo_light:I = 0x7f08004a
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_material:I = 0x7f08004d
+.field public static final abc_ratingbar_material:I = 0x7f08004e
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004e
+.field public static final abc_ratingbar_small_material:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080054
+.field public static final abc_seekbar_thumb_material:I = 0x7f080055
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
 
-.field public static final abc_seekbar_track_material:I = 0x7f080056
+.field public static final abc_seekbar_track_material:I = 0x7f080057
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
 
-.field public static final abc_switch_thumb_material:I = 0x7f080059
+.field public static final abc_switch_thumb_material:I = 0x7f08005a
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005b
+.field public static final abc_tab_indicator_material:I = 0x7f08005c
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
 
-.field public static final abc_text_cursor_material:I = 0x7f08005d
+.field public static final abc_text_cursor_material:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
 
-.field public static final abc_textfield_search_material:I = 0x7f080068
+.field public static final abc_textfield_search_material:I = 0x7f080069
 
-.field public static final abc_vector_test:I = 0x7f080069
+.field public static final abc_vector_test:I = 0x7f08006a
 
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
-.field public static final tooltip_frame_dark:I = 0x7f08044c
+.field public static final tooltip_frame_dark:I = 0x7f08046a
 
-.field public static final tooltip_frame_light:I = 0x7f08044d
+.field public static final tooltip_frame_light:I = 0x7f08046b
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$id.smali b/com.discord/smali/androidx/appcompat/R$id.smali
index 17c83e76fd..c6e06ea065 100644
--- a/com.discord/smali/androidx/appcompat/R$id.smali
+++ b/com.discord/smali/androidx/appcompat/R$id.smali
@@ -57,173 +57,173 @@
 
 .field public static final alertTitle:I = 0x7f0a0061
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final buttonPanel:I = 0x7f0a010c
+.field public static final buttonPanel:I = 0x7f0a010d
 
-.field public static final checkbox:I = 0x7f0a0212
+.field public static final checkbox:I = 0x7f0a0213
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final content:I = 0x7f0a0232
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0233
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final custom:I = 0x7f0a0247
+.field public static final custom:I = 0x7f0a0250
 
-.field public static final customPanel:I = 0x7f0a0248
+.field public static final customPanel:I = 0x7f0a0251
 
-.field public static final decor_content_parent:I = 0x7f0a024c
+.field public static final decor_content_parent:I = 0x7f0a0255
 
-.field public static final default_activity_button:I = 0x7f0a024d
+.field public static final default_activity_button:I = 0x7f0a0256
 
-.field public static final edit_query:I = 0x7f0a02a3
+.field public static final edit_query:I = 0x7f0a02ac
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final expand_activities_button:I = 0x7f0a02c4
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02c5
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final group_divider:I = 0x7f0a0322
+.field public static final group_divider:I = 0x7f0a032b
 
-.field public static final home:I = 0x7f0a0382
+.field public static final home:I = 0x7f0a0392
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final image:I = 0x7f0a0388
+.field public static final image:I = 0x7f0a0398
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final listMode:I = 0x7f0a040d
+.field public static final listMode:I = 0x7f0a041d
 
-.field public static final list_item:I = 0x7f0a040e
+.field public static final list_item:I = 0x7f0a041e
 
-.field public static final message:I = 0x7f0a046f
+.field public static final message:I = 0x7f0a0482
 
-.field public static final multiply:I = 0x7f0a0477
+.field public static final multiply:I = 0x7f0a048a
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final parentPanel:I = 0x7f0a04c3
+.field public static final parentPanel:I = 0x7f0a04d9
 
-.field public static final progress_circular:I = 0x7f0a0543
+.field public static final progress_circular:I = 0x7f0a0553
 
-.field public static final progress_horizontal:I = 0x7f0a0545
+.field public static final progress_horizontal:I = 0x7f0a0555
 
-.field public static final radio:I = 0x7f0a0550
+.field public static final radio:I = 0x7f0a0560
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final screen:I = 0x7f0a059a
+.field public static final screen:I = 0x7f0a05b4
 
-.field public static final scrollIndicatorDown:I = 0x7f0a059c
+.field public static final scrollIndicatorDown:I = 0x7f0a05b6
 
-.field public static final scrollIndicatorUp:I = 0x7f0a059d
+.field public static final scrollIndicatorUp:I = 0x7f0a05b7
 
-.field public static final scrollView:I = 0x7f0a059e
+.field public static final scrollView:I = 0x7f0a05b8
 
-.field public static final search_badge:I = 0x7f0a05a2
+.field public static final search_badge:I = 0x7f0a05bc
 
-.field public static final search_bar:I = 0x7f0a05a3
+.field public static final search_bar:I = 0x7f0a05bd
 
-.field public static final search_button:I = 0x7f0a05a4
+.field public static final search_button:I = 0x7f0a05be
 
-.field public static final search_close_btn:I = 0x7f0a05a6
+.field public static final search_close_btn:I = 0x7f0a05c0
 
-.field public static final search_edit_frame:I = 0x7f0a05a7
+.field public static final search_edit_frame:I = 0x7f0a05c1
 
-.field public static final search_go_btn:I = 0x7f0a05aa
+.field public static final search_go_btn:I = 0x7f0a05c4
 
-.field public static final search_mag_icon:I = 0x7f0a05ac
+.field public static final search_mag_icon:I = 0x7f0a05c6
 
-.field public static final search_plate:I = 0x7f0a05ad
+.field public static final search_plate:I = 0x7f0a05c7
 
-.field public static final search_src_text:I = 0x7f0a05b0
+.field public static final search_src_text:I = 0x7f0a05ca
 
-.field public static final search_voice_btn:I = 0x7f0a05bc
+.field public static final search_voice_btn:I = 0x7f0a05d6
 
-.field public static final select_dialog_listview:I = 0x7f0a05bd
+.field public static final select_dialog_listview:I = 0x7f0a05d7
 
-.field public static final shortcut:I = 0x7f0a06f7
+.field public static final shortcut:I = 0x7f0a0711
 
-.field public static final spacer:I = 0x7f0a0703
+.field public static final spacer:I = 0x7f0a071d
 
-.field public static final split_action_bar:I = 0x7f0a0704
+.field public static final split_action_bar:I = 0x7f0a0724
 
-.field public static final src_atop:I = 0x7f0a0707
+.field public static final src_atop:I = 0x7f0a0727
 
-.field public static final src_in:I = 0x7f0a0708
+.field public static final src_in:I = 0x7f0a0728
 
-.field public static final src_over:I = 0x7f0a0709
+.field public static final src_over:I = 0x7f0a0729
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final submenuarrow:I = 0x7f0a0724
+.field public static final submenuarrow:I = 0x7f0a074d
 
-.field public static final submit_area:I = 0x7f0a0725
+.field public static final submit_area:I = 0x7f0a074e
 
-.field public static final tabMode:I = 0x7f0a0731
+.field public static final tabMode:I = 0x7f0a075a
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0741
+.field public static final textSpacerNoButtons:I = 0x7f0a076a
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0742
+.field public static final textSpacerNoTitle:I = 0x7f0a076b
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0750
+.field public static final titleDividerNoCustom:I = 0x7f0a0779
 
-.field public static final title_template:I = 0x7f0a0751
+.field public static final title_template:I = 0x7f0a077a
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
-.field public static final topPanel:I = 0x7f0a0757
+.field public static final topPanel:I = 0x7f0a0780
 
-.field public static final uniform:I = 0x7f0a076a
+.field public static final uniform:I = 0x7f0a0793
 
-.field public static final up:I = 0x7f0a076d
+.field public static final up:I = 0x7f0a0796
 
-.field public static final wrap_content:I = 0x7f0a082e
+.field public static final wrap_content:I = 0x7f0a086b
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$layout.smali b/com.discord/smali/androidx/appcompat/R$layout.smali
index 0bfd867327..0c7d05023a 100644
--- a/com.discord/smali/androidx/appcompat/R$layout.smali
+++ b/com.discord/smali/androidx/appcompat/R$layout.smali
@@ -71,25 +71,25 @@
 
 .field public static final abc_tooltip:I = 0x7f0d001b
 
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
-.field public static final select_dialog_item_material:I = 0x7f0d005d
+.field public static final select_dialog_item_material:I = 0x7f0d005f
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d005e
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0060
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d005f
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d0061
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0066
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0069
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali
index d73db895db..8d07551941 100644
--- a/com.discord/smali/androidx/appcompat/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/R$string.smali
@@ -93,9 +93,9 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f12002a
 
-.field public static final search_menu_title:I = 0x7f120fa3
+.field public static final search_menu_title:I = 0x7f120fdd
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$style.smali b/com.discord/smali/androidx/appcompat/R$style.smali
index 14cde4d48e..c58114a4c5 100644
--- a/com.discord/smali/androidx/appcompat/R$style.smali
+++ b/com.discord/smali/androidx/appcompat/R$style.smali
@@ -25,687 +25,687 @@
 
 .field public static final Animation_AppCompat_Tooltip:I = 0x7f130004
 
-.field public static final Base_AlertDialog_AppCompat:I = 0x7f130037
+.field public static final Base_AlertDialog_AppCompat:I = 0x7f130038
 
-.field public static final Base_AlertDialog_AppCompat_Light:I = 0x7f130038
+.field public static final Base_AlertDialog_AppCompat_Light:I = 0x7f130039
 
-.field public static final Base_Animation_AppCompat_Dialog:I = 0x7f130039
+.field public static final Base_Animation_AppCompat_Dialog:I = 0x7f13003a
 
-.field public static final Base_Animation_AppCompat_DropDownUp:I = 0x7f13003a
+.field public static final Base_Animation_AppCompat_DropDownUp:I = 0x7f13003b
 
-.field public static final Base_Animation_AppCompat_Tooltip:I = 0x7f13003b
+.field public static final Base_Animation_AppCompat_Tooltip:I = 0x7f13003c
 
-.field public static final Base_DialogWindowTitleBackground_AppCompat:I = 0x7f13003e
+.field public static final Base_DialogWindowTitleBackground_AppCompat:I = 0x7f13003f
 
-.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003d
+.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003e
 
-.field public static final Base_TextAppearance_AppCompat:I = 0x7f13003f
+.field public static final Base_TextAppearance_AppCompat:I = 0x7f130040
 
-.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130040
+.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130041
 
-.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130041
+.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130042
 
-.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130042
+.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130043
 
-.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130043
+.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130044
 
-.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130044
+.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130045
 
-.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130045
+.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130046
 
-.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130046
+.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130047
 
-.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130047
+.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130048
 
-.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130048
+.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130049
 
-.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f130049
+.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f13004a
 
-.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004a
+.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004b
 
-.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004b
+.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004c
 
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004c
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004d
 
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004d
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004e
 
-.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004e
+.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004f
 
-.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f13004f
+.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130050
 
-.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130050
+.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130051
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130051
+.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130052
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130052
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130053
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130053
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130054
 
-.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130054
+.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130055
 
-.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130055
+.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130056
 
-.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130056
+.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130057
 
-.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130057
+.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130058
 
-.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130058
+.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130059
 
-.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f130059
+.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f13005a
 
-.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005a
+.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005b
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005b
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005c
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005c
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005d
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005d
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005e
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005e
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005f
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f13005f
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130060
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130060
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130061
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130061
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130062
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130062
+.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130063
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130063
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130064
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130064
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130065
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130065
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130066
 
-.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130066
+.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130067
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130067
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130068
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130068
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130069
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f130069
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13006a
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006a
+.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006b
 
-.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006b
+.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006c
 
-.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006c
+.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006d
 
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006d
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006e
 
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006e
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006f
 
-.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008e
+.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008f
 
-.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f13008f
+.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f130090
 
-.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130090
+.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130091
 
-.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130091
+.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130092
 
-.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130092
+.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130093
 
-.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130093
+.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130094
 
-.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130094
+.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130095
 
-.field public static final Base_Theme_AppCompat:I = 0x7f13006f
+.field public static final Base_Theme_AppCompat:I = 0x7f130070
 
-.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130070
+.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130071
 
-.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130071
+.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130072
 
-.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130075
+.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130076
 
-.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130072
+.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130073
 
-.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130073
+.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130074
 
-.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130074
+.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130075
 
-.field public static final Base_Theme_AppCompat_Light:I = 0x7f130076
+.field public static final Base_Theme_AppCompat_Light:I = 0x7f130077
 
-.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130077
+.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130078
 
-.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130078
+.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130079
 
-.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007c
+.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007d
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f130079
+.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f13007a
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007a
+.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007b
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007b
+.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007c
 
-.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a4
+.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a5
 
-.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a0
+.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a1
 
-.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a1
+.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a2
 
-.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a2
+.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a3
 
-.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a3
+.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a4
 
-.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a5
+.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a6
 
-.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a6
+.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a7
 
-.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a7
+.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a8
 
-.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a8
+.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a9
 
-.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300a9
+.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300aa
 
-.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300aa
+.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300ab
 
-.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ab
+.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ac
 
-.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ac
+.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ad
 
-.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ad
+.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ae
 
-.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b2
+.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b3
 
-.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300ae
+.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300af
 
-.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300af
+.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300b0
 
-.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b0
+.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b1
 
-.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b1
+.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b2
 
-.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b3
+.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b4
 
-.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b4
+.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b5
 
-.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b5
+.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b6
 
-.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b6
+.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b7
 
-.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b7
+.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b8
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b8
+.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b9
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300b9
+.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300ba
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300ba
+.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300bb
 
-.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bb
+.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bc
 
-.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bc
+.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bd
 
-.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300bd
+.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300be
 
-.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300be
+.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300bf
 
-.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300bf
+.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300c0
 
-.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c0
+.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c1
 
-.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c1
+.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c2
 
-.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c7
+.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c8
 
-.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c8
+.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c9
 
-.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c2
+.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c3
 
-.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c3
+.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c4
 
-.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c4
+.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c5
 
-.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c5
+.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c6
 
-.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c6
+.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c7
 
-.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300c9
+.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300ca
 
-.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300ca
+.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300cb
 
-.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cb
+.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cc
 
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cc
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cd
 
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300cd
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300ce
 
-.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300ce
+.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300cf
 
-.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300cf
+.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300d0
 
-.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d0
+.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d1
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d1
+.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d2
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d2
+.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d3
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d3
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d4
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d4
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d5
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d5
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d6
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d6
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d7
 
-.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d7
+.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d8
 
-.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d8
+.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d9
 
-.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300d9
+.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300da
 
-.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300da
+.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300db
 
-.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300db
+.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300dc
 
-.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dc
+.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dd
 
-.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300dd
+.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300de
 
-.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300de
+.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300df
 
-.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300df
+.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300e0
 
-.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e0
+.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e1
 
-.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e1
+.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e2
 
-.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e2
+.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e3
 
-.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e3
+.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e4
 
-.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e4
+.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e5
 
-.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e5
+.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e6
 
-.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e6
+.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e7
 
-.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e7
+.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e8
 
-.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e8
+.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e9
 
-.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300e9
+.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300ea
 
-.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300ea
+.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300eb
 
-.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300eb
+.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300ec
 
-.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ec
+.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ed
 
-.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ed
+.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ee
 
-.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300ee
+.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300ef
 
-.field public static final Platform_AppCompat:I = 0x7f130131
+.field public static final Platform_AppCompat:I = 0x7f130132
 
-.field public static final Platform_AppCompat_Light:I = 0x7f130132
+.field public static final Platform_AppCompat_Light:I = 0x7f130133
 
-.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130137
+.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130138
 
-.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130138
+.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130139
 
-.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f130139
+.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f13013a
 
-.field public static final Platform_V21_AppCompat:I = 0x7f13013a
+.field public static final Platform_V21_AppCompat:I = 0x7f13013b
 
-.field public static final Platform_V21_AppCompat_Light:I = 0x7f13013b
+.field public static final Platform_V21_AppCompat_Light:I = 0x7f13013c
 
-.field public static final Platform_V25_AppCompat:I = 0x7f13013c
+.field public static final Platform_V25_AppCompat:I = 0x7f13013d
 
-.field public static final Platform_V25_AppCompat_Light:I = 0x7f13013d
+.field public static final Platform_V25_AppCompat_Light:I = 0x7f13013e
 
-.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13013e
+.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13013f
 
-.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f13013f
+.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f130140
 
-.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f130140
+.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f130141
 
-.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f130141
+.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f130142
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f130142
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f130143
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130143
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130144
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130144
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130145
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130145
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130146
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130146
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130147
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130147
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130148
 
-.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13014d
+.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13014e
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130148
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130149
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f130149
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f13014a
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f13014a
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f13014b
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f13014b
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f13014c
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f13014c
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f13014d
 
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13014e
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13014f
 
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f13014f
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f130150
 
-.field public static final TextAppearance_AppCompat:I = 0x7f130152
+.field public static final TextAppearance_AppCompat:I = 0x7f130153
 
-.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130153
+.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130154
 
-.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130154
+.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130155
 
-.field public static final TextAppearance_AppCompat_Button:I = 0x7f130155
+.field public static final TextAppearance_AppCompat_Button:I = 0x7f130156
 
-.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130156
+.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130157
 
-.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130157
+.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130158
 
-.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130158
+.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130159
 
-.field public static final TextAppearance_AppCompat_Display3:I = 0x7f130159
+.field public static final TextAppearance_AppCompat_Display3:I = 0x7f13015a
 
-.field public static final TextAppearance_AppCompat_Display4:I = 0x7f13015a
+.field public static final TextAppearance_AppCompat_Display4:I = 0x7f13015b
 
-.field public static final TextAppearance_AppCompat_Headline:I = 0x7f13015b
+.field public static final TextAppearance_AppCompat_Headline:I = 0x7f13015c
 
-.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13015c
+.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13015d
 
-.field public static final TextAppearance_AppCompat_Large:I = 0x7f13015d
+.field public static final TextAppearance_AppCompat_Large:I = 0x7f13015e
 
-.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13015e
+.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13015f
 
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f13015f
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f130160
 
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f130160
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f130161
 
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130161
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130162
 
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130162
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130163
 
-.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130163
+.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130164
 
-.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130164
+.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130165
 
-.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130165
+.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130166
 
-.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130166
+.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130167
 
-.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130167
+.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130168
 
-.field public static final TextAppearance_AppCompat_Small:I = 0x7f130168
+.field public static final TextAppearance_AppCompat_Small:I = 0x7f130169
 
-.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f130169
+.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f13016a
 
-.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f13016a
+.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f13016b
 
-.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13016b
+.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13016c
 
-.field public static final TextAppearance_AppCompat_Title:I = 0x7f13016c
+.field public static final TextAppearance_AppCompat_Title:I = 0x7f13016d
 
-.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13016d
+.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13016e
 
-.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13016e
+.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13016f
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13016f
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f130170
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130170
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130171
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130171
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130172
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130172
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130173
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130173
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130174
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130174
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130175
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f130175
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f130176
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130176
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130177
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f130177
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f130178
 
-.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f130178
+.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f130179
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130179
+.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f13017a
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f13017a
+.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f13017b
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f13017b
+.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f13017c
 
-.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13017c
+.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13017d
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13017d
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13017e
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13017e
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13017f
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13017f
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f130180
 
-.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f130180
+.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f130181
 
-.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f130181
+.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f130182
 
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301a4
+.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301a5
 
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301a5
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301a6
 
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301a6
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301a7
 
-.field public static final ThemeOverlay_AppCompat:I = 0x7f1301d9
+.field public static final ThemeOverlay_AppCompat:I = 0x7f1301da
 
-.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f1301da
+.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f1301db
 
-.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f1301db
+.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f1301dc
 
-.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f1301dc
+.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f1301dd
 
-.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f1301dd
+.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f1301de
 
-.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f1301de
+.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f1301df
 
-.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f1301df
+.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f1301e0
 
-.field public static final Theme_AppCompat:I = 0x7f1301a7
+.field public static final Theme_AppCompat:I = 0x7f1301a8
 
-.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301a8
+.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301a9
 
-.field public static final Theme_AppCompat_DayNight:I = 0x7f1301a9
+.field public static final Theme_AppCompat_DayNight:I = 0x7f1301aa
 
-.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301aa
+.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301ab
 
-.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301ab
+.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301ac
 
-.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301ae
+.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301af
 
-.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301ac
+.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301ad
 
-.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301ad
+.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301ae
 
-.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301af
+.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301b0
 
-.field public static final Theme_AppCompat_Dialog:I = 0x7f1301b0
+.field public static final Theme_AppCompat_Dialog:I = 0x7f1301b1
 
-.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301b3
+.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301b4
 
-.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301b1
+.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301b2
 
-.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301b2
+.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301b3
 
-.field public static final Theme_AppCompat_Light:I = 0x7f1301b4
+.field public static final Theme_AppCompat_Light:I = 0x7f1301b5
 
-.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301b5
+.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301b6
 
-.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301b6
+.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301b7
 
-.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301b9
+.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301ba
 
-.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301b7
+.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301b8
 
-.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301b8
+.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301b9
 
-.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301ba
+.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301bb
 
-.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301bb
+.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301bc
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302ac
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302af
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302ad
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302b0
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302ae
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302b1
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302af
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302b2
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302b0
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302b3
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302b1
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302b4
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302b2
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302b5
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302b3
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302b6
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302b4
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302b7
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302b5
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302b8
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302b6
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302b9
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1302b7
+.field public static final Widget_AppCompat_Button:I = 0x7f1302ba
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302bd
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302c0
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302be
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302c1
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302b8
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302bb
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302b9
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302bc
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302ba
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302bd
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302bb
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302be
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302bc
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302bf
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302bf
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302c2
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302c0
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302c3
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302c1
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302c4
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1302c2
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1302c5
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1302c3
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1302c6
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1302c4
+.field public static final Widget_AppCompat_EditText:I = 0x7f1302c7
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1302c5
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1302c8
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1302c6
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1302c9
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1302c7
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1302ca
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1302c8
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1302cb
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1302c9
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1302cc
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1302ca
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1302cd
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1302cb
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1302ce
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1302cc
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1302cf
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1302cd
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1302d0
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1302ce
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1302d1
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1302cf
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1302d2
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1302d0
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1302d3
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1302d1
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1302d4
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1302d2
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1302d5
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1302d3
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1302d6
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1302d4
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1302d7
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1302d5
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1302d8
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1302d6
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1302d9
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1302d7
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1302da
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1302d8
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1302db
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1302d9
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1302dc
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1302da
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1302dd
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1302db
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1302de
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1302dc
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1302df
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1302dd
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1302e0
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1302de
+.field public static final Widget_AppCompat_ListView:I = 0x7f1302e1
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1302df
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1302e2
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1302e0
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1302e3
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1302e1
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1302e4
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1302e2
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1302e5
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1302e3
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1302e6
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1302e4
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1302e7
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1302e5
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1302e8
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1302e6
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1302e9
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1302e7
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1302ea
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1302e8
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1302eb
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1302e9
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1302ec
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1302ea
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1302ed
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1302eb
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1302ee
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1302ec
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1302ef
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1302ed
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1302f0
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1302ee
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1302f1
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1302ef
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1302f2
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1302f0
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1302f3
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1302f1
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1302f4
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1302f2
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1302f5
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1302f3
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1302f6
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$styleable.smali b/com.discord/smali/androidx/appcompat/R$styleable.smali
index 5f92d1ad1e..8890b0ca5b 100644
--- a/com.discord/smali/androidx/appcompat/R$styleable.smali
+++ b/com.discord/smali/androidx/appcompat/R$styleable.smali
@@ -1166,7 +1166,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040305
+    const v6, 0x7f040308
 
     aput v6, v5, v3
 
@@ -1255,60 +1255,60 @@
         0x7f04004c
         0x7f04004e
         0x7f04004f
-        0x7f0400c8
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f0400e9
-        0x7f040103
+        0x7f0400ce
+        0x7f0400ea
         0x7f040104
-        0x7f040112
-        0x7f040156
-        0x7f04015b
-        0x7f040162
-        0x7f040163
-        0x7f0401c7
-        0x7f0401ea
-        0x7f0401f4
-        0x7f040257
-        0x7f040273
-        0x7f04028b
-        0x7f0402b9
-        0x7f0402ba
-        0x7f040313
+        0x7f040105
+        0x7f040114
+        0x7f040158
+        0x7f04015d
+        0x7f040164
+        0x7f040165
+        0x7f0401c9
+        0x7f0401ec
+        0x7f0401f6
+        0x7f04025a
+        0x7f040276
+        0x7f04028e
+        0x7f0402bc
+        0x7f0402bd
         0x7f040316
-        0x7f0403af
-        0x7f0403b9
+        0x7f040319
+        0x7f0403b2
+        0x7f0403bc
     .end array-data
 
     :array_1
     .array-data 4
         0x7f04004c
         0x7f04004e
-        0x7f0400ac
-        0x7f040156
-        0x7f040316
-        0x7f0403b9
+        0x7f0400ad
+        0x7f040158
+        0x7f040319
+        0x7f0403bc
     .end array-data
 
     :array_2
     .array-data 4
-        0x7f040118
-        0x7f0401eb
+        0x7f04011a
+        0x7f0401ed
     .end array-data
 
     :array_3
     .array-data 4
         0x10100f2
-        0x7f04007a
         0x7f04007b
-        0x7f04024e
-        0x7f04024f
-        0x7f040270
-        0x7f0402f8
-        0x7f0402f9
+        0x7f04007c
+        0x7f040251
+        0x7f040252
+        0x7f040273
+        0x7f0402fb
+        0x7f0402fc
     .end array-data
 
     :array_4
@@ -1338,17 +1338,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f040303
-        0x7f0403ad
-        0x7f0403ae
+        0x7f040306
+        0x7f0403b0
+        0x7f0403b1
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f0403aa
-        0x7f0403ab
-        0x7f0403ac
+        0x7f0403ad
+        0x7f0403ae
+        0x7f0403af
     .end array-data
 
     :array_9
@@ -1370,11 +1370,11 @@
         0x7f040048
         0x7f040049
         0x7f04004a
-        0x7f040131
-        0x7f04013f
-        0x7f0401fd
-        0x7f04024a
-        0x7f040339
+        0x7f040133
+        0x7f040141
+        0x7f0401ff
+        0x7f04024d
+        0x7f04033c
     .end array-data
 
     :array_b
@@ -1417,17 +1417,16 @@
         0x7f04002b
         0x7f04002c
         0x7f040044
-        0x7f040065
-        0x7f040074
+        0x7f040066
         0x7f040075
         0x7f040076
         0x7f040077
         0x7f040078
-        0x7f04007d
+        0x7f040079
         0x7f04007e
-        0x7f04008c
-        0x7f040091
-        0x7f0400b2
+        0x7f04007f
+        0x7f04008d
+        0x7f040092
         0x7f0400b3
         0x7f0400b4
         0x7f0400b5
@@ -1435,71 +1434,72 @@
         0x7f0400b7
         0x7f0400b8
         0x7f0400b9
-        0x7f0400bc
-        0x7f0400c1
-        0x7f0400d4
-        0x7f040100
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c2
+        0x7f0400d5
         0x7f040101
         0x7f040102
-        0x7f040108
-        0x7f04010a
-        0x7f04010d
-        0x7f04010e
+        0x7f040103
+        0x7f040109
+        0x7f04010b
         0x7f04010f
         0x7f040110
         0x7f040111
-        0x7f040162
-        0x7f0401d2
-        0x7f04024c
-        0x7f04024d
+        0x7f040112
+        0x7f040113
+        0x7f040164
+        0x7f0401d4
+        0x7f04024f
         0x7f040250
-        0x7f040251
-        0x7f040252
         0x7f040253
         0x7f040254
         0x7f040255
         0x7f040256
-        0x7f040280
-        0x7f040281
-        0x7f040282
-        0x7f04028a
-        0x7f04028c
-        0x7f0402bf
+        0x7f040257
+        0x7f040258
+        0x7f040259
+        0x7f040283
+        0x7f040284
+        0x7f040285
+        0x7f04028d
+        0x7f04028f
         0x7f0402c2
-        0x7f0402c3
-        0x7f0402c4
-        0x7f0402eb
-        0x7f0402ed
+        0x7f0402c5
+        0x7f0402c6
+        0x7f0402c7
         0x7f0402ee
-        0x7f0402ef
-        0x7f040300
-        0x7f040301
-        0x7f04031a
-        0x7f040344
-        0x7f040345
-        0x7f040346
+        0x7f0402f0
+        0x7f0402f1
+        0x7f0402f2
+        0x7f040303
+        0x7f040304
+        0x7f04031d
         0x7f040347
+        0x7f040348
         0x7f040349
         0x7f04034a
-        0x7f04034b
         0x7f04034c
+        0x7f04034d
+        0x7f04034e
         0x7f04034f
-        0x7f040350
-        0x7f0403bb
-        0x7f0403bc
-        0x7f0403bd
+        0x7f040352
+        0x7f040353
         0x7f0403be
-        0x7f0403dc
-        0x7f0403df
-        0x7f0403e0
+        0x7f0403bf
+        0x7f0403c0
+        0x7f0403c1
         0x7f0403e1
-        0x7f0403e2
-        0x7f0403e3
         0x7f0403e4
         0x7f0403e5
         0x7f0403e6
         0x7f0403e7
         0x7f0403e8
+        0x7f0403e9
+        0x7f0403ea
+        0x7f0403eb
+        0x7f0403ec
+        0x7f0403ed
     .end array-data
 
     :array_c
@@ -1512,25 +1512,25 @@
     :array_d
     .array-data 4
         0x1010107
-        0x7f04007f
         0x7f040080
+        0x7f040081
     .end array-data
 
     :array_e
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_f
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_10
@@ -1538,21 +1538,21 @@
         0x7f04003b
         0x7f04003c
         0x7f040052
-        0x7f0400b1
-        0x7f04010b
-        0x7f04014a
-        0x7f0402ff
-        0x7f0403a6
+        0x7f0400b2
+        0x7f04010c
+        0x7f04014c
+        0x7f040302
+        0x7f0403a9
     .end array-data
 
     :array_11
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_12
@@ -1562,11 +1562,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_13
@@ -1598,10 +1598,10 @@
         0x1010126
         0x1010127
         0x1010128
-        0x7f040104
-        0x7f040109
-        0x7f04026e
-        0x7f0402f5
+        0x7f040105
+        0x7f04010a
+        0x7f040271
+        0x7f0402f8
     .end array-data
 
     :array_16
@@ -1647,12 +1647,12 @@
         0x7f04001f
         0x7f040020
         0x7f040031
-        0x7f0400c7
-        0x7f0401cd
-        0x7f0401ce
-        0x7f040277
-        0x7f0402f1
-        0x7f0403bf
+        0x7f0400c8
+        0x7f0401cf
+        0x7f0401d0
+        0x7f04027a
+        0x7f0402f4
+        0x7f0403c2
     .end array-data
 
     :array_1a
@@ -1664,21 +1664,21 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04028d
-        0x7f040311
+        0x7f040290
+        0x7f040314
     .end array-data
 
     :array_1b
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040278
+        0x7f04027b
     .end array-data
 
     :array_1c
     .array-data 4
-        0x7f04027c
         0x7f04027f
+        0x7f040282
     .end array-data
 
     :array_1d
@@ -1687,19 +1687,19 @@
         0x101011f
         0x1010220
         0x1010264
-        0x7f0400a5
-        0x7f0400c2
-        0x7f0400ff
-        0x7f04014f
-        0x7f0401cf
-        0x7f0401fe
-        0x7f0402bd
-        0x7f0402be
-        0x7f0402e9
-        0x7f0402ea
-        0x7f040312
-        0x7f040317
-        0x7f0403dd
+        0x7f0400a6
+        0x7f0400c3
+        0x7f040100
+        0x7f040151
+        0x7f0401d1
+        0x7f040200
+        0x7f0402c0
+        0x7f0402c1
+        0x7f0402ec
+        0x7f0402ed
+        0x7f040315
+        0x7f04031a
+        0x7f0403e2
     .end array-data
 
     :array_1e
@@ -1708,7 +1708,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_1f
@@ -1726,17 +1726,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f0402f7
-        0x7f040302
-        0x7f040318
-        0x7f040319
+        0x7f0402fa
+        0x7f040305
         0x7f04031b
-        0x7f0403a7
-        0x7f0403a8
-        0x7f0403a9
-        0x7f0403c0
-        0x7f0403c1
-        0x7f0403c2
+        0x7f04031c
+        0x7f04031e
+        0x7f0403aa
+        0x7f0403ab
+        0x7f0403ac
+        0x7f0403c3
+        0x7f0403c4
+        0x7f0403c5
     .end array-data
 
     :array_21
@@ -1752,50 +1752,50 @@
         0x1010163
         0x1010164
         0x10103ac
-        0x7f04013f
-        0x7f040339
+        0x7f040141
+        0x7f04033c
     .end array-data
 
     :array_22
     .array-data 4
         0x10100af
         0x1010140
-        0x7f040079
-        0x7f0400ad
+        0x7f04007a
         0x7f0400ae
-        0x7f0400c8
+        0x7f0400af
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f040257
-        0x7f040258
-        0x7f04026b
-        0x7f040271
-        0x7f040272
-        0x7f04028b
-        0x7f040313
-        0x7f040314
-        0x7f040315
-        0x7f0403af
-        0x7f0403b1
+        0x7f0400ce
+        0x7f04025a
+        0x7f04025b
+        0x7f04026e
+        0x7f040274
+        0x7f040275
+        0x7f04028e
+        0x7f040316
+        0x7f040317
+        0x7f040318
         0x7f0403b2
-        0x7f0403b3
         0x7f0403b4
         0x7f0403b5
         0x7f0403b6
         0x7f0403b7
         0x7f0403b8
+        0x7f0403b9
+        0x7f0403ba
+        0x7f0403bb
     .end array-data
 
     :array_23
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04027d
-        0x7f04027e
-        0x7f040355
+        0x7f040280
+        0x7f040281
+        0x7f040358
     .end array-data
 
     :array_24
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali b/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
index ec5c77f894..647cab59fe 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
@@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$color.smali b/com.discord/smali/androidx/asynclayoutinflater/R$color.smali
index 9f74048fc7..cf23032ff7 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$color.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali b/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali
index c8a7dd2e55..792fb43dad 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
index 05e5bf0889..603f33b729 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
index 8dc05e0ca2..29978e7ecc 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
@@ -25,51 +25,51 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali b/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali
index 7663572a0c..5e1ecc7b65 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
index da11175b24..452bdfe1cd 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$style.smali b/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
index feba78455c..1961b5a4c9 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
index b2d56c6f59..586989f2f0 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
@@ -149,12 +149,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +164,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .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 9ed24646c2..af69f35948 100644
--- a/com.discord/smali/androidx/browser/R$attr.smali
+++ b/com.discord/smali/androidx/browser/R$attr.smali
@@ -17,45 +17,45 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$color.smali b/com.discord/smali/androidx/browser/R$color.smali
index f068f62eec..04bbeabf62 100644
--- a/com.discord/smali/androidx/browser/R$color.smali
+++ b/com.discord/smali/androidx/browser/R$color.smali
@@ -15,21 +15,21 @@
 
 
 # static fields
-.field public static final browser_actions_bg_grey:I = 0x7f06003a
+.field public static final browser_actions_bg_grey:I = 0x7f06003b
 
-.field public static final browser_actions_divider_color:I = 0x7f06003b
+.field public static final browser_actions_divider_color:I = 0x7f06003c
 
-.field public static final browser_actions_text_color:I = 0x7f06003c
+.field public static final browser_actions_text_color:I = 0x7f06003d
 
-.field public static final browser_actions_title_color:I = 0x7f06003d
+.field public static final browser_actions_title_color:I = 0x7f06003e
 
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$dimen.smali b/com.discord/smali/androidx/browser/R$dimen.smali
index ca992d325c..53bfeff844 100644
--- a/com.discord/smali/androidx/browser/R$dimen.smali
+++ b/com.discord/smali/androidx/browser/R$dimen.smali
@@ -33,35 +33,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$drawable.smali b/com.discord/smali/androidx/browser/R$drawable.smali
index c5b2cfb9a5..ed32e63c16 100644
--- a/com.discord/smali/androidx/browser/R$drawable.smali
+++ b/com.discord/smali/androidx/browser/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$id.smali b/com.discord/smali/androidx/browser/R$id.smali
index 04edf87d6f..5452c06164 100644
--- a/com.discord/smali/androidx/browser/R$id.smali
+++ b/com.discord/smali/androidx/browser/R$id.smali
@@ -25,75 +25,75 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final browser_actions_header_text:I = 0x7f0a0107
+.field public static final browser_actions_header_text:I = 0x7f0a0108
 
-.field public static final browser_actions_menu_item_icon:I = 0x7f0a0108
+.field public static final browser_actions_menu_item_icon:I = 0x7f0a0109
 
-.field public static final browser_actions_menu_item_text:I = 0x7f0a0109
+.field public static final browser_actions_menu_item_text:I = 0x7f0a010a
 
-.field public static final browser_actions_menu_items:I = 0x7f0a010a
+.field public static final browser_actions_menu_items:I = 0x7f0a010b
 
-.field public static final browser_actions_menu_view:I = 0x7f0a010b
+.field public static final browser_actions_menu_view:I = 0x7f0a010c
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$layout.smali b/com.discord/smali/androidx/browser/R$layout.smali
index 7ae2b4ed04..1aa9357952 100644
--- a/com.discord/smali/androidx/browser/R$layout.smali
+++ b/com.discord/smali/androidx/browser/R$layout.smali
@@ -19,17 +19,17 @@
 
 .field public static final browser_actions_context_menu_row:I = 0x7f0d001e
 
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali
index c4e81a7077..a0333da3e2 100644
--- a/com.discord/smali/androidx/browser/R$string.smali
+++ b/com.discord/smali/androidx/browser/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$style.smali b/com.discord/smali/androidx/browser/R$style.smali
index 8583cdbf62..5e5176ecce 100644
--- a/com.discord/smali/androidx/browser/R$style.smali
+++ b/com.discord/smali/androidx/browser/R$style.smali
@@ -15,21 +15,21 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$styleable.smali b/com.discord/smali/androidx/browser/R$styleable.smali
index 36e7b17023..85eba1dbef 100644
--- a/com.discord/smali/androidx/browser/R$styleable.smali
+++ b/com.discord/smali/androidx/browser/R$styleable.smali
@@ -183,29 +183,29 @@
 
     :array_1
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_2
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_3
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_4
@@ -215,11 +215,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_5
diff --git a/com.discord/smali/androidx/cardview/R$attr.smali b/com.discord/smali/androidx/cardview/R$attr.smali
index 8fb8284681..b89af4b6d7 100644
--- a/com.discord/smali/androidx/cardview/R$attr.smali
+++ b/com.discord/smali/androidx/cardview/R$attr.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final cardBackgroundColor:I = 0x7f040081
+.field public static final cardBackgroundColor:I = 0x7f040082
 
-.field public static final cardCornerRadius:I = 0x7f040082
+.field public static final cardCornerRadius:I = 0x7f040083
 
-.field public static final cardElevation:I = 0x7f040083
+.field public static final cardElevation:I = 0x7f040084
 
-.field public static final cardMaxElevation:I = 0x7f040084
+.field public static final cardMaxElevation:I = 0x7f040085
 
-.field public static final cardPreventCornerOverlap:I = 0x7f040085
+.field public static final cardPreventCornerOverlap:I = 0x7f040086
 
-.field public static final cardUseCompatPadding:I = 0x7f040086
+.field public static final cardUseCompatPadding:I = 0x7f040087
 
-.field public static final cardViewStyle:I = 0x7f040087
+.field public static final cardViewStyle:I = 0x7f040088
 
-.field public static final contentPadding:I = 0x7f0400ce
+.field public static final contentPadding:I = 0x7f0400cf
 
-.field public static final contentPaddingBottom:I = 0x7f0400cf
+.field public static final contentPaddingBottom:I = 0x7f0400d0
 
-.field public static final contentPaddingLeft:I = 0x7f0400d0
+.field public static final contentPaddingLeft:I = 0x7f0400d1
 
-.field public static final contentPaddingRight:I = 0x7f0400d1
+.field public static final contentPaddingRight:I = 0x7f0400d2
 
-.field public static final contentPaddingTop:I = 0x7f0400d2
+.field public static final contentPaddingTop:I = 0x7f0400d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/cardview/R$color.smali b/com.discord/smali/androidx/cardview/R$color.smali
index 924f9bdf3a..5490483c92 100644
--- a/com.discord/smali/androidx/cardview/R$color.smali
+++ b/com.discord/smali/androidx/cardview/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final cardview_dark_background:I = 0x7f060041
+.field public static final cardview_dark_background:I = 0x7f060042
 
-.field public static final cardview_light_background:I = 0x7f060042
+.field public static final cardview_light_background:I = 0x7f060043
 
-.field public static final cardview_shadow_end_color:I = 0x7f060043
+.field public static final cardview_shadow_end_color:I = 0x7f060044
 
-.field public static final cardview_shadow_start_color:I = 0x7f060044
+.field public static final cardview_shadow_start_color:I = 0x7f060045
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/cardview/R$style.smali b/com.discord/smali/androidx/cardview/R$style.smali
index a5a942848e..00ae7ed59e 100644
--- a/com.discord/smali/androidx/cardview/R$style.smali
+++ b/com.discord/smali/androidx/cardview/R$style.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final Base_CardView:I = 0x7f13003c
+.field public static final Base_CardView:I = 0x7f13003d
 
-.field public static final CardView:I = 0x7f1300f3
+.field public static final CardView:I = 0x7f1300f4
 
-.field public static final CardView_Dark:I = 0x7f1300f4
+.field public static final CardView_Dark:I = 0x7f1300f5
 
-.field public static final CardView_Light:I = 0x7f1300f5
+.field public static final CardView_Light:I = 0x7f1300f6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/cardview/R$styleable.smali b/com.discord/smali/androidx/cardview/R$styleable.smali
index 20edee7b0b..9cf84c5d2f 100644
--- a/com.discord/smali/androidx/cardview/R$styleable.smali
+++ b/com.discord/smali/androidx/cardview/R$styleable.smali
@@ -62,17 +62,17 @@
     .array-data 4
         0x101013f
         0x1010140
-        0x7f040081
         0x7f040082
         0x7f040083
         0x7f040084
         0x7f040085
         0x7f040086
-        0x7f0400ce
+        0x7f040087
         0x7f0400cf
         0x7f0400d0
         0x7f0400d1
         0x7f0400d2
+        0x7f0400d3
     .end array-data
 .end method
 
diff --git a/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali b/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali
index 603efb78d0..7e91b55c48 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali
@@ -19,115 +19,115 @@
 
 .field public static final barrierDirection:I = 0x7f040054
 
-.field public static final chainUseRtl:I = 0x7f040089
+.field public static final chainUseRtl:I = 0x7f04008a
 
-.field public static final constraintSet:I = 0x7f0400c3
+.field public static final constraintSet:I = 0x7f0400c4
 
-.field public static final constraint_referenced_ids:I = 0x7f0400c4
+.field public static final constraint_referenced_ids:I = 0x7f0400c5
 
-.field public static final content:I = 0x7f0400c6
+.field public static final content:I = 0x7f0400c7
 
-.field public static final emptyVisibility:I = 0x7f040113
+.field public static final emptyVisibility:I = 0x7f040115
 
-.field public static final layout_constrainedHeight:I = 0x7f040206
+.field public static final layout_constrainedHeight:I = 0x7f040208
 
-.field public static final layout_constrainedWidth:I = 0x7f040207
+.field public static final layout_constrainedWidth:I = 0x7f040209
 
-.field public static final layout_constraintBaseline_creator:I = 0x7f040208
+.field public static final layout_constraintBaseline_creator:I = 0x7f04020a
 
-.field public static final layout_constraintBaseline_toBaselineOf:I = 0x7f040209
+.field public static final layout_constraintBaseline_toBaselineOf:I = 0x7f04020b
 
-.field public static final layout_constraintBottom_creator:I = 0x7f04020a
+.field public static final layout_constraintBottom_creator:I = 0x7f04020c
 
-.field public static final layout_constraintBottom_toBottomOf:I = 0x7f04020b
+.field public static final layout_constraintBottom_toBottomOf:I = 0x7f04020d
 
-.field public static final layout_constraintBottom_toTopOf:I = 0x7f04020c
+.field public static final layout_constraintBottom_toTopOf:I = 0x7f04020e
 
-.field public static final layout_constraintCircle:I = 0x7f04020d
+.field public static final layout_constraintCircle:I = 0x7f04020f
 
-.field public static final layout_constraintCircleAngle:I = 0x7f04020e
+.field public static final layout_constraintCircleAngle:I = 0x7f040210
 
-.field public static final layout_constraintCircleRadius:I = 0x7f04020f
+.field public static final layout_constraintCircleRadius:I = 0x7f040211
 
-.field public static final layout_constraintDimensionRatio:I = 0x7f040210
+.field public static final layout_constraintDimensionRatio:I = 0x7f040212
 
-.field public static final layout_constraintEnd_toEndOf:I = 0x7f040211
+.field public static final layout_constraintEnd_toEndOf:I = 0x7f040213
 
-.field public static final layout_constraintEnd_toStartOf:I = 0x7f040212
+.field public static final layout_constraintEnd_toStartOf:I = 0x7f040214
 
-.field public static final layout_constraintGuide_begin:I = 0x7f040213
+.field public static final layout_constraintGuide_begin:I = 0x7f040215
 
-.field public static final layout_constraintGuide_end:I = 0x7f040214
+.field public static final layout_constraintGuide_end:I = 0x7f040216
 
-.field public static final layout_constraintGuide_percent:I = 0x7f040215
+.field public static final layout_constraintGuide_percent:I = 0x7f040217
 
-.field public static final layout_constraintHeight_default:I = 0x7f040216
+.field public static final layout_constraintHeight_default:I = 0x7f040218
 
-.field public static final layout_constraintHeight_max:I = 0x7f040217
+.field public static final layout_constraintHeight_max:I = 0x7f040219
 
-.field public static final layout_constraintHeight_min:I = 0x7f040218
+.field public static final layout_constraintHeight_min:I = 0x7f04021a
 
-.field public static final layout_constraintHeight_percent:I = 0x7f040219
+.field public static final layout_constraintHeight_percent:I = 0x7f04021b
 
-.field public static final layout_constraintHorizontal_bias:I = 0x7f04021a
+.field public static final layout_constraintHorizontal_bias:I = 0x7f04021c
 
-.field public static final layout_constraintHorizontal_chainStyle:I = 0x7f04021b
+.field public static final layout_constraintHorizontal_chainStyle:I = 0x7f04021d
 
-.field public static final layout_constraintHorizontal_weight:I = 0x7f04021c
+.field public static final layout_constraintHorizontal_weight:I = 0x7f04021e
 
-.field public static final layout_constraintLeft_creator:I = 0x7f04021d
+.field public static final layout_constraintLeft_creator:I = 0x7f04021f
 
-.field public static final layout_constraintLeft_toLeftOf:I = 0x7f04021e
+.field public static final layout_constraintLeft_toLeftOf:I = 0x7f040220
 
-.field public static final layout_constraintLeft_toRightOf:I = 0x7f04021f
+.field public static final layout_constraintLeft_toRightOf:I = 0x7f040221
 
-.field public static final layout_constraintRight_creator:I = 0x7f040220
+.field public static final layout_constraintRight_creator:I = 0x7f040222
 
-.field public static final layout_constraintRight_toLeftOf:I = 0x7f040221
+.field public static final layout_constraintRight_toLeftOf:I = 0x7f040223
 
-.field public static final layout_constraintRight_toRightOf:I = 0x7f040222
+.field public static final layout_constraintRight_toRightOf:I = 0x7f040224
 
-.field public static final layout_constraintStart_toEndOf:I = 0x7f040223
+.field public static final layout_constraintStart_toEndOf:I = 0x7f040225
 
-.field public static final layout_constraintStart_toStartOf:I = 0x7f040224
+.field public static final layout_constraintStart_toStartOf:I = 0x7f040226
 
-.field public static final layout_constraintTop_creator:I = 0x7f040225
+.field public static final layout_constraintTop_creator:I = 0x7f040227
 
-.field public static final layout_constraintTop_toBottomOf:I = 0x7f040226
+.field public static final layout_constraintTop_toBottomOf:I = 0x7f040228
 
-.field public static final layout_constraintTop_toTopOf:I = 0x7f040227
+.field public static final layout_constraintTop_toTopOf:I = 0x7f040229
 
-.field public static final layout_constraintVertical_bias:I = 0x7f040228
+.field public static final layout_constraintVertical_bias:I = 0x7f04022a
 
-.field public static final layout_constraintVertical_chainStyle:I = 0x7f040229
+.field public static final layout_constraintVertical_chainStyle:I = 0x7f04022b
 
-.field public static final layout_constraintVertical_weight:I = 0x7f04022a
+.field public static final layout_constraintVertical_weight:I = 0x7f04022c
 
-.field public static final layout_constraintWidth_default:I = 0x7f04022b
+.field public static final layout_constraintWidth_default:I = 0x7f04022d
 
-.field public static final layout_constraintWidth_max:I = 0x7f04022c
+.field public static final layout_constraintWidth_max:I = 0x7f04022e
 
-.field public static final layout_constraintWidth_min:I = 0x7f04022d
+.field public static final layout_constraintWidth_min:I = 0x7f04022f
 
-.field public static final layout_constraintWidth_percent:I = 0x7f04022e
+.field public static final layout_constraintWidth_percent:I = 0x7f040230
 
-.field public static final layout_editor_absoluteX:I = 0x7f040230
+.field public static final layout_editor_absoluteX:I = 0x7f040232
 
-.field public static final layout_editor_absoluteY:I = 0x7f040231
+.field public static final layout_editor_absoluteY:I = 0x7f040233
 
-.field public static final layout_goneMarginBottom:I = 0x7f040235
+.field public static final layout_goneMarginBottom:I = 0x7f040237
 
-.field public static final layout_goneMarginEnd:I = 0x7f040236
+.field public static final layout_goneMarginEnd:I = 0x7f040238
 
-.field public static final layout_goneMarginLeft:I = 0x7f040237
+.field public static final layout_goneMarginLeft:I = 0x7f040239
 
-.field public static final layout_goneMarginRight:I = 0x7f040238
+.field public static final layout_goneMarginRight:I = 0x7f04023a
 
-.field public static final layout_goneMarginStart:I = 0x7f040239
+.field public static final layout_goneMarginStart:I = 0x7f04023b
 
-.field public static final layout_goneMarginTop:I = 0x7f04023a
+.field public static final layout_goneMarginTop:I = 0x7f04023c
 
-.field public static final layout_optimizationLevel:I = 0x7f040241
+.field public static final layout_optimizationLevel:I = 0x7f040243
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
index 4aab4e6079..6627b4f32f 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
@@ -15,33 +15,33 @@
 
 
 # static fields
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final gone:I = 0x7f0a0321
+.field public static final gone:I = 0x7f0a032a
 
-.field public static final invisible:I = 0x7f0a03a8
+.field public static final invisible:I = 0x7f0a03b8
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final packed:I = 0x7f0a04bf
+.field public static final packed:I = 0x7f0a04d5
 
-.field public static final parent:I = 0x7f0a04c2
+.field public static final parent:I = 0x7f0a04d8
 
-.field public static final percent:I = 0x7f0a04f5
+.field public static final percent:I = 0x7f0a050c
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final spread:I = 0x7f0a0705
+.field public static final spread:I = 0x7f0a0725
 
-.field public static final spread_inside:I = 0x7f0a0706
+.field public static final spread_inside:I = 0x7f0a0726
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
-.field public static final wrap:I = 0x7f0a082d
+.field public static final wrap:I = 0x7f0a086a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali b/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali
index 80c4a5a5cc..4e2a6e687f 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali
@@ -361,11 +361,9 @@
         0x1010140
         0x7f040053
         0x7f040054
-        0x7f040089
-        0x7f0400c3
+        0x7f04008a
         0x7f0400c4
-        0x7f040206
-        0x7f040207
+        0x7f0400c5
         0x7f040208
         0x7f040209
         0x7f04020a
@@ -405,21 +403,23 @@
         0x7f04022c
         0x7f04022d
         0x7f04022e
+        0x7f04022f
         0x7f040230
-        0x7f040231
-        0x7f040235
-        0x7f040236
+        0x7f040232
+        0x7f040233
         0x7f040237
         0x7f040238
         0x7f040239
         0x7f04023a
-        0x7f040241
+        0x7f04023b
+        0x7f04023c
+        0x7f040243
     .end array-data
 
     :array_1
     .array-data 4
-        0x7f0400c6
-        0x7f040113
+        0x7f0400c7
+        0x7f040115
     .end array-data
 
     :array_2
@@ -453,10 +453,8 @@
         0x1010440
         0x7f040053
         0x7f040054
-        0x7f040089
-        0x7f0400c4
-        0x7f040206
-        0x7f040207
+        0x7f04008a
+        0x7f0400c5
         0x7f040208
         0x7f040209
         0x7f04020a
@@ -496,14 +494,16 @@
         0x7f04022c
         0x7f04022d
         0x7f04022e
+        0x7f04022f
         0x7f040230
-        0x7f040231
-        0x7f040235
-        0x7f040236
+        0x7f040232
+        0x7f040233
         0x7f040237
         0x7f040238
         0x7f040239
         0x7f04023a
+        0x7f04023b
+        0x7f04023c
     .end array-data
 .end method
 
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
index 1199084afc..3c0c159062 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
@@ -17,45 +17,45 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$color.smali b/com.discord/smali/androidx/coordinatorlayout/R$color.smali
index 04cd34c27d..b5923b558a 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$color.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali b/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali
index a0127baa0a..97928766f0 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
index 249c2f0775..9913a0ab62 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$id.smali b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
index 59ad69a3b5..59d0cbf36f 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$id.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
@@ -25,65 +25,65 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$layout.smali b/com.discord/smali/androidx/coordinatorlayout/R$layout.smali
index 9f8de08378..3a656000a1 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$layout.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
index 6bb8d22bde..360ccce612 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$string.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$style.smali b/com.discord/smali/androidx/coordinatorlayout/R$style.smali
index ed3f04cff7..143bd398d2 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$style.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$style.smali
@@ -15,21 +15,21 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali b/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
index 939c0a920a..2556b096e3 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
@@ -183,29 +183,29 @@
 
     :array_1
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_2
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_3
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_4
@@ -215,11 +215,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .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 60b87bddbc..c0279e2d47 100644
--- a/com.discord/smali/androidx/core/R$attr.smali
+++ b/com.discord/smali/androidx/core/R$attr.smali
@@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$color.smali b/com.discord/smali/androidx/core/R$color.smali
index a6a4a29352..42183cfe37 100644
--- a/com.discord/smali/androidx/core/R$color.smali
+++ b/com.discord/smali/androidx/core/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$dimen.smali b/com.discord/smali/androidx/core/R$dimen.smali
index b5ae657c42..9d3eb3dedb 100644
--- a/com.discord/smali/androidx/core/R$dimen.smali
+++ b/com.discord/smali/androidx/core/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$drawable.smali b/com.discord/smali/androidx/core/R$drawable.smali
index 416941752b..0cdecdd6b4 100644
--- a/com.discord/smali/androidx/core/R$drawable.smali
+++ b/com.discord/smali/androidx/core/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$id.smali b/com.discord/smali/androidx/core/R$id.smali
index 2c23932f27..97450f2887 100644
--- a/com.discord/smali/androidx/core/R$id.smali
+++ b/com.discord/smali/androidx/core/R$id.smali
@@ -91,63 +91,63 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final dialog_button:I = 0x7f0a0253
+.field public static final dialog_button:I = 0x7f0a025c
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0732
+.field public static final tag_accessibility_actions:I = 0x7f0a075b
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0733
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a075c
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0734
+.field public static final tag_accessibility_heading:I = 0x7f0a075d
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0735
+.field public static final tag_accessibility_pane_title:I = 0x7f0a075e
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0736
+.field public static final tag_screen_reader_focusable:I = 0x7f0a075f
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$layout.smali b/com.discord/smali/androidx/core/R$layout.smali
index eb841ba2b9..5a6e258b9f 100644
--- a/com.discord/smali/androidx/core/R$layout.smali
+++ b/com.discord/smali/androidx/core/R$layout.smali
@@ -17,17 +17,17 @@
 # static fields
 .field public static final custom_dialog:I = 0x7f0d0022
 
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali
index f8cc3b09df..bb54b18aea 100644
--- a/com.discord/smali/androidx/core/R$string.smali
+++ b/com.discord/smali/androidx/core/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$style.smali b/com.discord/smali/androidx/core/R$style.smali
index 9610462045..0abe13f07f 100644
--- a/com.discord/smali/androidx/core/R$style.smali
+++ b/com.discord/smali/androidx/core/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$styleable.smali b/com.discord/smali/androidx/core/R$styleable.smali
index 47142cecff..4afc963175 100644
--- a/com.discord/smali/androidx/core/R$styleable.smali
+++ b/com.discord/smali/androidx/core/R$styleable.smali
@@ -149,12 +149,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +164,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .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 656bba127b..7c5f055a84 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$1.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Landroidx/core/animation/AnimatorKt$addListener$1;->invoke(Landroid/animation/Animator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 e6a8cc3209..be44b36c20 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$2.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Landroidx/core/animation/AnimatorKt$addListener$2;->invoke(Landroid/animation/Animator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 90f3c31a78..f538f8bb01 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$3.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$3.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Landroidx/core/animation/AnimatorKt$addListener$3;->invoke(Landroid/animation/Animator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 67bc7a5ab5..4fa533e73e 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$4.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$4.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Landroidx/core/animation/AnimatorKt$addListener$4;->invoke(Landroid/animation/Animator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 a5b82f7e55..3114752b91 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$1.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Landroidx/core/animation/AnimatorKt$addPauseListener$1;->invoke(Landroid/animation/Animator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 02fe039ae3..6018f57e29 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$2.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Landroidx/core/animation/AnimatorKt$addPauseListener$2;->invoke(Landroid/animation/Animator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt.smali b/com.discord/smali/androidx/core/animation/AnimatorKt.smali
index f44e72727b..e8db458d9b 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt.smali
@@ -34,7 +34,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$addListener"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -104,7 +104,7 @@
     check-cast p4, Lkotlin/jvm/functions/Function1;
 
     :cond_3
-    const-string p5, "$receiver"
+    const-string p5, "$this$addListener"
 
     invoke-static {p0, p5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -155,7 +155,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$addPauseListener"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -199,7 +199,7 @@
     check-cast p2, Lkotlin/jvm/functions/Function1;
 
     :cond_1
-    const-string p3, "$receiver"
+    const-string p3, "$this$addPauseListener"
 
     invoke-static {p0, p3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -237,7 +237,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnCancel"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -271,7 +271,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnEnd"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -305,7 +305,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnPause"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -339,7 +339,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnRepeat"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -373,7 +373,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnResume"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -407,7 +407,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnStart"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/app/ComponentActivity$ExtraData.smali b/com.discord/smali/androidx/core/app/ComponentActivity$ExtraData.smali
index 5ca021f2e9..27b61dc764 100644
--- a/com.discord/smali/androidx/core/app/ComponentActivity$ExtraData.smali
+++ b/com.discord/smali/androidx/core/app/ComponentActivity$ExtraData.smali
@@ -13,6 +13,9 @@
     name = "ExtraData"
 .end annotation
 
+.annotation runtime Ljava/lang/Deprecated;
+.end annotation
+
 
 # direct methods
 .method public constructor <init>()V
diff --git a/com.discord/smali/androidx/core/app/ComponentActivity.smali b/com.discord/smali/androidx/core/app/ComponentActivity.smali
index ef46612f14..60c918cff2 100644
--- a/com.discord/smali/androidx/core/app/ComponentActivity.smali
+++ b/com.discord/smali/androidx/core/app/ComponentActivity.smali
@@ -4,6 +4,7 @@
 
 # interfaces
 .implements Landroidx/core/view/KeyEventDispatcher$Component;
+.implements Landroidx/lifecycle/LifecycleOwner;
 
 
 # annotations
@@ -29,6 +30,8 @@
     .end annotation
 .end field
 
+.field private mLifecycleRegistry:Landroidx/lifecycle/LifecycleRegistry;
+
 
 # direct methods
 .method public constructor <init>()V
@@ -42,6 +45,12 @@
 
     iput-object v0, p0, Landroidx/core/app/ComponentActivity;->mExtraDataMap:Landroidx/collection/SimpleArrayMap;
 
+    new-instance v0, Landroidx/lifecycle/LifecycleRegistry;
+
+    invoke-direct {v0, p0}, Landroidx/lifecycle/LifecycleRegistry;-><init>(Landroidx/lifecycle/LifecycleOwner;)V
+
+    iput-object v0, p0, Landroidx/core/app/ComponentActivity;->mLifecycleRegistry:Landroidx/lifecycle/LifecycleRegistry;
+
     return-void
 .end method
 
@@ -121,6 +130,9 @@
         }
     .end annotation
 
+    .annotation runtime Ljava/lang/Deprecated;
+    .end annotation
+
     iget-object v0, p0, Landroidx/core/app/ComponentActivity;->mExtraDataMap:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v0, p1}, Landroidx/collection/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
@@ -132,8 +144,42 @@
     return-object p1
 .end method
 
+.method public getLifecycle()Landroidx/lifecycle/Lifecycle;
+    .locals 1
+
+    iget-object v0, p0, Landroidx/core/app/ComponentActivity;->mLifecycleRegistry:Landroidx/lifecycle/LifecycleRegistry;
+
+    return-object v0
+.end method
+
+.method protected onCreate(Landroid/os/Bundle;)V
+    .locals 0
+
+    invoke-super {p0, p1}, Landroid/app/Activity;->onCreate(Landroid/os/Bundle;)V
+
+    invoke-static {p0}, Landroidx/lifecycle/ReportFragment;->injectIfNeededIn(Landroid/app/Activity;)V
+
+    return-void
+.end method
+
+.method protected onSaveInstanceState(Landroid/os/Bundle;)V
+    .locals 2
+
+    iget-object v0, p0, Landroidx/core/app/ComponentActivity;->mLifecycleRegistry:Landroidx/lifecycle/LifecycleRegistry;
+
+    sget-object v1, Landroidx/lifecycle/Lifecycle$State;->CREATED:Landroidx/lifecycle/Lifecycle$State;
+
+    invoke-virtual {v0, v1}, Landroidx/lifecycle/LifecycleRegistry;->markState(Landroidx/lifecycle/Lifecycle$State;)V
+
+    invoke-super {p0, p1}, Landroid/app/Activity;->onSaveInstanceState(Landroid/os/Bundle;)V
+
+    return-void
+.end method
+
 .method public putExtraData(Landroidx/core/app/ComponentActivity$ExtraData;)V
     .locals 2
+    .annotation runtime Ljava/lang/Deprecated;
+    .end annotation
 
     iget-object v0, p0, Landroidx/core/app/ComponentActivity;->mExtraDataMap:Landroidx/collection/SimpleArrayMap;
 
diff --git a/com.discord/smali/androidx/core/app/JobIntentService.smali b/com.discord/smali/androidx/core/app/JobIntentService.smali
index 20a6c627c8..fa3aca69f9 100644
--- a/com.discord/smali/androidx/core/app/JobIntentService.smali
+++ b/com.discord/smali/androidx/core/app/JobIntentService.smali
@@ -160,6 +160,16 @@
 
 .method public static enqueueWork(Landroid/content/Context;Ljava/lang/Class;ILandroid/content/Intent;)V
     .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/content/Context;",
+            "Ljava/lang/Class<",
+            "*>;I",
+            "Landroid/content/Intent;",
+            ")V"
+        }
+    .end annotation
 
     new-instance v0, Landroid/content/ComponentName;
 
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$1.smali b/com.discord/smali/androidx/core/app/NotificationCompat$1.smali
new file mode 100644
index 0000000000..35a399ebb1
--- /dev/null
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$1.smali
@@ -0,0 +1,14 @@
+.class synthetic Landroidx/core/app/NotificationCompat$1;
+.super Ljava/lang/Object;
+.source "NotificationCompat.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Landroidx/core/app/NotificationCompat;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1008
+    name = null
+.end annotation
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$Action$Builder.smali b/com.discord/smali/androidx/core/app/NotificationCompat$Action$Builder.smali
index e82393bb0a..95bfb485e6 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$Action$Builder.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$Action$Builder.smali
@@ -23,6 +23,8 @@
 
 .field private final mIntent:Landroid/app/PendingIntent;
 
+.field private mIsContextual:Z
+
 .field private mRemoteInputs:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -42,7 +44,7 @@
 
 # direct methods
 .method public constructor <init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
-    .locals 9
+    .locals 10
 
     new-instance v4, Landroid/os/Bundle;
 
@@ -56,6 +58,8 @@
 
     const/4 v8, 0x1
 
+    const/4 v9, 0x0
+
     move-object v0, p0
 
     move v1, p1
@@ -64,12 +68,12 @@
 
     move-object v3, p3
 
-    invoke-direct/range {v0 .. v8}, Landroidx/core/app/NotificationCompat$Action$Builder;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;ZIZ)V
+    invoke-direct/range {v0 .. v9}, Landroidx/core/app/NotificationCompat$Action$Builder;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;ZIZZ)V
 
     return-void
 .end method
 
-.method private constructor <init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;ZIZ)V
+.method private constructor <init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;ZIZZ)V
     .locals 1
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
@@ -116,11 +120,13 @@
 
     iput-boolean p8, p0, Landroidx/core/app/NotificationCompat$Action$Builder;->mShowsUserInterface:Z
 
+    iput-boolean p9, p0, Landroidx/core/app/NotificationCompat$Action$Builder;->mIsContextual:Z
+
     return-void
 .end method
 
 .method public constructor <init>(Landroidx/core/app/NotificationCompat$Action;)V
-    .locals 9
+    .locals 10
 
     iget v1, p1, Landroidx/core/app/NotificationCompat$Action;->icon:I
 
@@ -148,13 +154,43 @@
 
     iget-boolean v8, p1, Landroidx/core/app/NotificationCompat$Action;->mShowsUserInterface:Z
 
+    invoke-virtual {p1}, Landroidx/core/app/NotificationCompat$Action;->isContextual()Z
+
+    move-result v9
+
     move-object v0, p0
 
-    invoke-direct/range {v0 .. v8}, Landroidx/core/app/NotificationCompat$Action$Builder;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;ZIZ)V
+    invoke-direct/range {v0 .. v9}, Landroidx/core/app/NotificationCompat$Action$Builder;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;ZIZZ)V
 
     return-void
 .end method
 
+.method private checkContextualActionNullFields()V
+    .locals 2
+
+    iget-boolean v0, p0, Landroidx/core/app/NotificationCompat$Action$Builder;->mIsContextual:Z
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Landroidx/core/app/NotificationCompat$Action$Builder;->mIntent:Landroid/app/PendingIntent;
+
+    if-eqz v0, :cond_1
+
+    return-void
+
+    :cond_1
+    new-instance v0, Ljava/lang/NullPointerException;
+
+    const-string v1, "Contextual Actions must contain a valid PendingIntent"
+
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
 
 # virtual methods
 .method public final addExtras(Landroid/os/Bundle;)Landroidx/core/app/NotificationCompat$Action$Builder;
@@ -192,7 +228,9 @@
 .end method
 
 .method public final build()Landroidx/core/app/NotificationCompat$Action;
-    .locals 14
+    .locals 15
+
+    invoke-direct {p0}, Landroidx/core/app/NotificationCompat$Action$Builder;->checkContextualActionNullFields()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -309,9 +347,11 @@
 
     iget-boolean v13, p0, Landroidx/core/app/NotificationCompat$Action$Builder;->mShowsUserInterface:Z
 
+    iget-boolean v14, p0, Landroidx/core/app/NotificationCompat$Action$Builder;->mIsContextual:Z
+
     move-object v4, v0
 
-    invoke-direct/range {v4 .. v13}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;[Landroidx/core/app/RemoteInput;ZIZ)V
+    invoke-direct/range {v4 .. v14}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;[Landroidx/core/app/RemoteInput;ZIZZ)V
 
     return-object v0
 .end method
@@ -340,6 +380,14 @@
     return-object p0
 .end method
 
+.method public final setContextual(Z)Landroidx/core/app/NotificationCompat$Action$Builder;
+    .locals 0
+
+    iput-boolean p1, p0, Landroidx/core/app/NotificationCompat$Action$Builder;->mIsContextual:Z
+
+    return-object p0
+.end method
+
 .method public final setSemanticAction(I)Landroidx/core/app/NotificationCompat$Action$Builder;
     .locals 0
 
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$Action.smali b/com.discord/smali/androidx/core/app/NotificationCompat$Action.smali
index 8f89638b8b..1e371dd16b 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$Action.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$Action.smali
@@ -62,6 +62,8 @@
 
 .field final mExtras:Landroid/os/Bundle;
 
+.field private final mIsContextual:Z
+
 .field private final mRemoteInputs:[Landroidx/core/app/RemoteInput;
 
 .field private final mSemanticAction:I
@@ -73,7 +75,7 @@
 
 # direct methods
 .method public constructor <init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
-    .locals 10
+    .locals 11
 
     new-instance v4, Landroid/os/Bundle;
 
@@ -89,6 +91,8 @@
 
     const/4 v9, 0x1
 
+    const/4 v10, 0x0
+
     move-object v0, p0
 
     move v1, p1
@@ -97,12 +101,12 @@
 
     move-object v3, p3
 
-    invoke-direct/range {v0 .. v9}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;[Landroidx/core/app/RemoteInput;ZIZ)V
+    invoke-direct/range {v0 .. v10}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;[Landroidx/core/app/RemoteInput;ZIZZ)V
 
     return-void
 .end method
 
-.method constructor <init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;[Landroidx/core/app/RemoteInput;ZIZ)V
+.method constructor <init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;[Landroidx/core/app/RemoteInput;ZIZZ)V
     .locals 1
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
@@ -143,6 +147,8 @@
 
     iput-boolean p9, p0, Landroidx/core/app/NotificationCompat$Action;->mShowsUserInterface:Z
 
+    iput-boolean p10, p0, Landroidx/core/app/NotificationCompat$Action;->mIsContextual:Z
+
     return-void
 .end method
 
@@ -219,3 +225,11 @@
 
     return-object v0
 .end method
+
+.method public isContextual()Z
+    .locals 1
+
+    iget-boolean v0, p0, Landroidx/core/app/NotificationCompat$Action;->mIsContextual:Z
+
+    return v0
+.end method
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$BubbleMetadata$Builder.smali b/com.discord/smali/androidx/core/app/NotificationCompat$BubbleMetadata$Builder.smali
new file mode 100644
index 0000000000..71a377277d
--- /dev/null
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$BubbleMetadata$Builder.smali
@@ -0,0 +1,225 @@
+.class public final Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+.super Ljava/lang/Object;
+.source "NotificationCompat.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Landroidx/core/app/NotificationCompat$BubbleMetadata;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Builder"
+.end annotation
+
+
+# instance fields
+.field private mDeleteIntent:Landroid/app/PendingIntent;
+
+.field private mDesiredHeight:I
+
+.field private mDesiredHeightResId:I
+
+.field private mFlags:I
+
+.field private mIcon:Landroidx/core/graphics/drawable/IconCompat;
+
+.field private mPendingIntent:Landroid/app/PendingIntent;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method private setFlag(IZ)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+    .locals 0
+
+    if-eqz p2, :cond_0
+
+    iget p2, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mFlags:I
+
+    or-int/2addr p1, p2
+
+    iput p1, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mFlags:I
+
+    goto :goto_0
+
+    :cond_0
+    iget p2, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mFlags:I
+
+    xor-int/lit8 p1, p1, -0x1
+
+    and-int/2addr p1, p2
+
+    iput p1, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mFlags:I
+
+    :goto_0
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final build()Landroidx/core/app/NotificationCompat$BubbleMetadata;
+    .locals 9
+
+    iget-object v1, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mPendingIntent:Landroid/app/PendingIntent;
+
+    if-eqz v1, :cond_1
+
+    iget-object v3, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mIcon:Landroidx/core/graphics/drawable/IconCompat;
+
+    if-eqz v3, :cond_0
+
+    new-instance v8, Landroidx/core/app/NotificationCompat$BubbleMetadata;
+
+    iget-object v2, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mDeleteIntent:Landroid/app/PendingIntent;
+
+    iget v4, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mDesiredHeight:I
+
+    iget v5, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mDesiredHeightResId:I
+
+    iget v6, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mFlags:I
+
+    const/4 v7, 0x0
+
+    move-object v0, v8
+
+    invoke-direct/range {v0 .. v7}, Landroidx/core/app/NotificationCompat$BubbleMetadata;-><init>(Landroid/app/PendingIntent;Landroid/app/PendingIntent;Landroidx/core/graphics/drawable/IconCompat;IIILandroidx/core/app/NotificationCompat$1;)V
+
+    return-object v8
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Must supply an icon for the bubble"
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Must supply pending intent to bubble"
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final setAutoExpandBubble(Z)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->setFlag(IZ)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+
+    return-object p0
+.end method
+
+.method public final setDeleteIntent(Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+    .locals 0
+
+    iput-object p1, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mDeleteIntent:Landroid/app/PendingIntent;
+
+    return-object p0
+.end method
+
+.method public final setDesiredHeight(I)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-static {p1, v0}, Ljava/lang/Math;->max(II)I
+
+    move-result p1
+
+    iput p1, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mDesiredHeight:I
+
+    iput v0, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mDesiredHeightResId:I
+
+    return-object p0
+.end method
+
+.method public final setDesiredHeightResId(I)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+    .locals 0
+
+    iput p1, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mDesiredHeightResId:I
+
+    const/4 p1, 0x0
+
+    iput p1, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mDesiredHeight:I
+
+    return-object p0
+.end method
+
+.method public final setIcon(Landroidx/core/graphics/drawable/IconCompat;)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+    .locals 2
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p1}, Landroidx/core/graphics/drawable/IconCompat;->getType()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-eq v0, v1, :cond_0
+
+    iput-object p1, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mIcon:Landroidx/core/graphics/drawable/IconCompat;
+
+    return-object p0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "When using bitmap based icons, Bubbles require TYPE_ADAPTIVE_BITMAP, please use IconCompat#createWithAdaptiveBitmap instead"
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Bubbles require non-null icon"
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final setIntent(Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+    .locals 1
+
+    if-eqz p1, :cond_0
+
+    iput-object p1, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->mPendingIntent:Landroid/app/PendingIntent;
+
+    return-object p0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Bubble requires non-null pending intent"
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final setSuppressNotification(Z)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+    .locals 1
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0, p1}, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->setFlag(IZ)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+
+    return-object p0
+.end method
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$BubbleMetadata.smali b/com.discord/smali/androidx/core/app/NotificationCompat$BubbleMetadata.smali
new file mode 100644
index 0000000000..bc7f214ce7
--- /dev/null
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$BubbleMetadata.smali
@@ -0,0 +1,340 @@
+.class public final Landroidx/core/app/NotificationCompat$BubbleMetadata;
+.super Ljava/lang/Object;
+.source "NotificationCompat.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Landroidx/core/app/NotificationCompat;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "BubbleMetadata"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+    }
+.end annotation
+
+
+# static fields
+.field private static final FLAG_AUTO_EXPAND_BUBBLE:I = 0x1
+
+.field private static final FLAG_SUPPRESS_NOTIFICATION:I = 0x2
+
+
+# instance fields
+.field private mDeleteIntent:Landroid/app/PendingIntent;
+
+.field private mDesiredHeight:I
+
+.field private mDesiredHeightResId:I
+
+.field private mFlags:I
+
+.field private mIcon:Landroidx/core/graphics/drawable/IconCompat;
+
+.field private mPendingIntent:Landroid/app/PendingIntent;
+
+
+# direct methods
+.method private constructor <init>(Landroid/app/PendingIntent;Landroid/app/PendingIntent;Landroidx/core/graphics/drawable/IconCompat;III)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mPendingIntent:Landroid/app/PendingIntent;
+
+    iput-object p3, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mIcon:Landroidx/core/graphics/drawable/IconCompat;
+
+    iput p4, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mDesiredHeight:I
+
+    iput p5, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mDesiredHeightResId:I
+
+    iput-object p2, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mDeleteIntent:Landroid/app/PendingIntent;
+
+    iput p6, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mFlags:I
+
+    return-void
+.end method
+
+.method synthetic constructor <init>(Landroid/app/PendingIntent;Landroid/app/PendingIntent;Landroidx/core/graphics/drawable/IconCompat;IIILandroidx/core/app/NotificationCompat$1;)V
+    .locals 0
+
+    invoke-direct/range {p0 .. p6}, Landroidx/core/app/NotificationCompat$BubbleMetadata;-><init>(Landroid/app/PendingIntent;Landroid/app/PendingIntent;Landroidx/core/graphics/drawable/IconCompat;III)V
+
+    return-void
+.end method
+
+.method public static fromPlatform(Landroid/app/Notification$BubbleMetadata;)Landroidx/core/app/NotificationCompat$BubbleMetadata;
+    .locals 2
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :cond_0
+    new-instance v0, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+
+    invoke-direct {v0}, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;-><init>()V
+
+    invoke-virtual {p0}, Landroid/app/Notification$BubbleMetadata;->getAutoExpandBubble()Z
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->setAutoExpandBubble(Z)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Landroid/app/Notification$BubbleMetadata;->getDeleteIntent()Landroid/app/PendingIntent;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->setDeleteIntent(Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Landroid/app/Notification$BubbleMetadata;->getIcon()Landroid/graphics/drawable/Icon;
+
+    move-result-object v1
+
+    invoke-static {v1}, Landroidx/core/graphics/drawable/IconCompat;->createFromIcon(Landroid/graphics/drawable/Icon;)Landroidx/core/graphics/drawable/IconCompat;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->setIcon(Landroidx/core/graphics/drawable/IconCompat;)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Landroid/app/Notification$BubbleMetadata;->getIntent()Landroid/app/PendingIntent;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->setIntent(Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Landroid/app/Notification$BubbleMetadata;->isNotificationSuppressed()Z
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->setSuppressNotification(Z)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Landroid/app/Notification$BubbleMetadata;->getDesiredHeight()I
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p0}, Landroid/app/Notification$BubbleMetadata;->getDesiredHeight()I
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->setDesiredHeight(I)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+
+    :cond_1
+    invoke-virtual {p0}, Landroid/app/Notification$BubbleMetadata;->getDesiredHeightResId()I
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    invoke-virtual {p0}, Landroid/app/Notification$BubbleMetadata;->getDesiredHeightResId()I
+
+    move-result p0
+
+    invoke-virtual {v0, p0}, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->setDesiredHeightResId(I)Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;
+
+    :cond_2
+    invoke-virtual {v0}, Landroidx/core/app/NotificationCompat$BubbleMetadata$Builder;->build()Landroidx/core/app/NotificationCompat$BubbleMetadata;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method private setFlags(I)V
+    .locals 0
+
+    iput p1, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mFlags:I
+
+    return-void
+.end method
+
+.method public static toPlatform(Landroidx/core/app/NotificationCompat$BubbleMetadata;)Landroid/app/Notification$BubbleMetadata;
+    .locals 2
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :cond_0
+    new-instance v0, Landroid/app/Notification$BubbleMetadata$Builder;
+
+    invoke-direct {v0}, Landroid/app/Notification$BubbleMetadata$Builder;-><init>()V
+
+    invoke-virtual {p0}, Landroidx/core/app/NotificationCompat$BubbleMetadata;->getAutoExpandBubble()Z
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Landroid/app/Notification$BubbleMetadata$Builder;->setAutoExpandBubble(Z)Landroid/app/Notification$BubbleMetadata$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Landroidx/core/app/NotificationCompat$BubbleMetadata;->getDeleteIntent()Landroid/app/PendingIntent;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroid/app/Notification$BubbleMetadata$Builder;->setDeleteIntent(Landroid/app/PendingIntent;)Landroid/app/Notification$BubbleMetadata$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Landroidx/core/app/NotificationCompat$BubbleMetadata;->getIcon()Landroidx/core/graphics/drawable/IconCompat;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroidx/core/graphics/drawable/IconCompat;->toIcon()Landroid/graphics/drawable/Icon;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroid/app/Notification$BubbleMetadata$Builder;->setIcon(Landroid/graphics/drawable/Icon;)Landroid/app/Notification$BubbleMetadata$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Landroidx/core/app/NotificationCompat$BubbleMetadata;->getIntent()Landroid/app/PendingIntent;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroid/app/Notification$BubbleMetadata$Builder;->setIntent(Landroid/app/PendingIntent;)Landroid/app/Notification$BubbleMetadata$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Landroidx/core/app/NotificationCompat$BubbleMetadata;->isNotificationSuppressed()Z
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Landroid/app/Notification$BubbleMetadata$Builder;->setSuppressNotification(Z)Landroid/app/Notification$BubbleMetadata$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Landroidx/core/app/NotificationCompat$BubbleMetadata;->getDesiredHeight()I
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p0}, Landroidx/core/app/NotificationCompat$BubbleMetadata;->getDesiredHeight()I
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Landroid/app/Notification$BubbleMetadata$Builder;->setDesiredHeight(I)Landroid/app/Notification$BubbleMetadata$Builder;
+
+    :cond_1
+    invoke-virtual {p0}, Landroidx/core/app/NotificationCompat$BubbleMetadata;->getDesiredHeightResId()I
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    invoke-virtual {p0}, Landroidx/core/app/NotificationCompat$BubbleMetadata;->getDesiredHeightResId()I
+
+    move-result p0
+
+    invoke-virtual {v0, p0}, Landroid/app/Notification$BubbleMetadata$Builder;->setDesiredHeightResId(I)Landroid/app/Notification$BubbleMetadata$Builder;
+
+    :cond_2
+    invoke-virtual {v0}, Landroid/app/Notification$BubbleMetadata$Builder;->build()Landroid/app/Notification$BubbleMetadata;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final getAutoExpandBubble()Z
+    .locals 2
+
+    iget v0, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mFlags:I
+
+    const/4 v1, 0x1
+
+    and-int/2addr v0, v1
+
+    if-eqz v0, :cond_0
+
+    return v1
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final getDeleteIntent()Landroid/app/PendingIntent;
+    .locals 1
+
+    iget-object v0, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mDeleteIntent:Landroid/app/PendingIntent;
+
+    return-object v0
+.end method
+
+.method public final getDesiredHeight()I
+    .locals 1
+
+    iget v0, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mDesiredHeight:I
+
+    return v0
+.end method
+
+.method public final getDesiredHeightResId()I
+    .locals 1
+
+    iget v0, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mDesiredHeightResId:I
+
+    return v0
+.end method
+
+.method public final getIcon()Landroidx/core/graphics/drawable/IconCompat;
+    .locals 1
+
+    iget-object v0, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mIcon:Landroidx/core/graphics/drawable/IconCompat;
+
+    return-object v0
+.end method
+
+.method public final getIntent()Landroid/app/PendingIntent;
+    .locals 1
+
+    iget-object v0, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mPendingIntent:Landroid/app/PendingIntent;
+
+    return-object v0
+.end method
+
+.method public final isNotificationSuppressed()Z
+    .locals 1
+
+    iget v0, p0, Landroidx/core/app/NotificationCompat$BubbleMetadata;->mFlags:I
+
+    and-int/lit8 v0, v0, 0x2
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$Builder.smali b/com.discord/smali/androidx/core/app/NotificationCompat$Builder.smali
index 987666f772..215372d71e 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$Builder.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$Builder.smali
@@ -29,10 +29,14 @@
     .end annotation
 .end field
 
+.field mAllowSystemGeneratedContextualActions:Z
+
 .field mBadgeIcon:I
 
 .field mBigContentView:Landroid/widget/RemoteViews;
 
+.field mBubbleMetadata:Landroidx/core/app/NotificationCompat$BubbleMetadata;
+
 .field mCategory:Ljava/lang/String;
 
 .field mChannelId:Ljava/lang/String;
@@ -143,7 +147,7 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Ljava/lang/String;)V
-    .locals 3
+    .locals 4
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -163,23 +167,23 @@
 
     iput-boolean v0, p0, Landroidx/core/app/NotificationCompat$Builder;->mShowWhen:Z
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    iput-boolean v0, p0, Landroidx/core/app/NotificationCompat$Builder;->mLocalOnly:Z
+    iput-boolean v1, p0, Landroidx/core/app/NotificationCompat$Builder;->mLocalOnly:Z
 
-    iput v0, p0, Landroidx/core/app/NotificationCompat$Builder;->mColor:I
+    iput v1, p0, Landroidx/core/app/NotificationCompat$Builder;->mColor:I
 
-    iput v0, p0, Landroidx/core/app/NotificationCompat$Builder;->mVisibility:I
+    iput v1, p0, Landroidx/core/app/NotificationCompat$Builder;->mVisibility:I
 
-    iput v0, p0, Landroidx/core/app/NotificationCompat$Builder;->mBadgeIcon:I
+    iput v1, p0, Landroidx/core/app/NotificationCompat$Builder;->mBadgeIcon:I
 
-    iput v0, p0, Landroidx/core/app/NotificationCompat$Builder;->mGroupAlertBehavior:I
+    iput v1, p0, Landroidx/core/app/NotificationCompat$Builder;->mGroupAlertBehavior:I
 
-    new-instance v1, Landroid/app/Notification;
+    new-instance v2, Landroid/app/Notification;
 
-    invoke-direct {v1}, Landroid/app/Notification;-><init>()V
+    invoke-direct {v2}, Landroid/app/Notification;-><init>()V
 
-    iput-object v1, p0, Landroidx/core/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification;
+    iput-object v2, p0, Landroidx/core/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification;
 
     iput-object p1, p0, Landroidx/core/app/NotificationCompat$Builder;->mContext:Landroid/content/Context;
 
@@ -189,9 +193,9 @@
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
-    move-result-wide v1
+    move-result-wide v2
 
-    iput-wide v1, p1, Landroid/app/Notification;->when:J
+    iput-wide v2, p1, Landroid/app/Notification;->when:J
 
     iget-object p1, p0, Landroidx/core/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification;
 
@@ -199,7 +203,7 @@
 
     iput p2, p1, Landroid/app/Notification;->audioStreamType:I
 
-    iput v0, p0, Landroidx/core/app/NotificationCompat$Builder;->mPriority:I
+    iput v1, p0, Landroidx/core/app/NotificationCompat$Builder;->mPriority:I
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -207,6 +211,8 @@
 
     iput-object p1, p0, Landroidx/core/app/NotificationCompat$Builder;->mPeople:Ljava/util/ArrayList;
 
+    iput-boolean v0, p0, Landroidx/core/app/NotificationCompat$Builder;->mAllowSystemGeneratedContextualActions:Z
+
     return-void
 .end method
 
@@ -510,6 +516,14 @@
     return-object v0
 .end method
 
+.method public getBubbleMetadata()Landroidx/core/app/NotificationCompat$BubbleMetadata;
+    .locals 1
+
+    iget-object v0, p0, Landroidx/core/app/NotificationCompat$Builder;->mBubbleMetadata:Landroidx/core/app/NotificationCompat$BubbleMetadata;
+
+    return-object v0
+.end method
+
 .method public getColor()I
     .locals 1
 
@@ -592,6 +606,14 @@
     return-wide v0
 .end method
 
+.method public setAllowSystemGeneratedContextualActions(Z)Landroidx/core/app/NotificationCompat$Builder;
+    .locals 0
+
+    iput-boolean p1, p0, Landroidx/core/app/NotificationCompat$Builder;->mAllowSystemGeneratedContextualActions:Z
+
+    return-object p0
+.end method
+
 .method public setAutoCancel(Z)Landroidx/core/app/NotificationCompat$Builder;
     .locals 1
 
@@ -610,6 +632,14 @@
     return-object p0
 .end method
 
+.method public setBubbleMetadata(Landroidx/core/app/NotificationCompat$BubbleMetadata;)Landroidx/core/app/NotificationCompat$Builder;
+    .locals 0
+
+    iput-object p1, p0, Landroidx/core/app/NotificationCompat$Builder;->mBubbleMetadata:Landroidx/core/app/NotificationCompat$BubbleMetadata;
+
+    return-object p0
+.end method
+
 .method public setCategory(Ljava/lang/String;)Landroidx/core/app/NotificationCompat$Builder;
     .locals 0
 
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender.smali b/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender.smali
index e607362c6b..b5e3253ba0 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$CarExtender.smali
@@ -318,7 +318,7 @@
 .end method
 
 .method private static getUnreadConversationFromBundle(Landroid/os/Bundle;)Landroidx/core/app/NotificationCompat$CarExtender$UnreadConversation;
-    .locals 19
+    .locals 20
 
     move-object/from16 v0, p0
 
@@ -337,18 +337,18 @@
 
     const/4 v3, 0x1
 
+    const/4 v4, 0x0
+
     if-eqz v2, :cond_5
 
-    array-length v4, v2
+    array-length v5, v2
 
-    new-array v4, v4, [Ljava/lang/String;
-
-    const/4 v5, 0x0
+    new-array v5, v5, [Ljava/lang/String;
 
     const/4 v6, 0x0
 
     :goto_0
-    array-length v7, v4
+    array-length v7, v5
 
     if-ge v6, v7, :cond_3
 
@@ -358,7 +358,10 @@
 
     if-nez v7, :cond_1
 
-    goto :goto_1
+    :goto_1
+    const/4 v2, 0x0
+
+    goto :goto_2
 
     :cond_1
     aget-object v7, v2, v6
@@ -371,9 +374,9 @@
 
     move-result-object v7
 
-    aput-object v7, v4, v6
+    aput-object v7, v5, v6
 
-    aget-object v7, v4, v6
+    aget-object v7, v5, v6
 
     if-nez v7, :cond_2
 
@@ -385,14 +388,14 @@
     goto :goto_0
 
     :cond_3
-    const/4 v5, 0x1
+    const/4 v2, 0x1
 
-    :goto_1
-    if-eqz v5, :cond_4
+    :goto_2
+    if-eqz v2, :cond_4
 
-    move-object v7, v4
+    move-object v7, v5
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_4
     return-object v1
@@ -400,7 +403,7 @@
     :cond_5
     move-object v7, v1
 
-    :goto_2
+    :goto_3
     const-string v2, "on_read"
 
     invoke-virtual {v0, v2}, Landroid/os/Bundle;->getParcelable(Ljava/lang/String;)Landroid/os/Parcelable;
@@ -429,22 +432,22 @@
 
     check-cast v2, Landroid/app/RemoteInput;
 
-    const-string v4, "participants"
+    const-string v5, "participants"
 
-    invoke-virtual {v0, v4}, Landroid/os/Bundle;->getStringArray(Ljava/lang/String;)[Ljava/lang/String;
+    invoke-virtual {v0, v5}, Landroid/os/Bundle;->getStringArray(Ljava/lang/String;)[Ljava/lang/String;
 
     move-result-object v11
 
-    if-eqz v11, :cond_8
+    if-eqz v11, :cond_9
 
-    array-length v4, v11
+    array-length v5, v11
 
-    if-eq v4, v3, :cond_6
+    if-eq v5, v3, :cond_6
 
-    goto :goto_3
+    goto :goto_5
 
     :cond_6
-    if-eqz v2, :cond_7
+    if-eqz v2, :cond_8
 
     new-instance v1, Landroidx/core/app/RemoteInput;
 
@@ -464,17 +467,35 @@
 
     move-result v16
 
+    sget v3, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v5, 0x1d
+
+    if-lt v3, v5, :cond_7
+
+    invoke-virtual {v2}, Landroid/app/RemoteInput;->getEditChoicesBeforeSending()I
+
+    move-result v4
+
+    move/from16 v17, v4
+
+    goto :goto_4
+
+    :cond_7
+    const/16 v17, 0x0
+
+    :goto_4
     invoke-virtual {v2}, Landroid/app/RemoteInput;->getExtras()Landroid/os/Bundle;
 
-    move-result-object v17
+    move-result-object v18
 
-    const/16 v18, 0x0
+    const/16 v19, 0x0
 
     move-object v12, v1
 
-    invoke-direct/range {v12 .. v18}, Landroidx/core/app/RemoteInput;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;ZLandroid/os/Bundle;Ljava/util/Set;)V
+    invoke-direct/range {v12 .. v19}, Landroidx/core/app/RemoteInput;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;ZILandroid/os/Bundle;Ljava/util/Set;)V
 
-    :cond_7
+    :cond_8
     move-object v8, v1
 
     new-instance v1, Landroidx/core/app/NotificationCompat$CarExtender$UnreadConversation;
@@ -489,8 +510,8 @@
 
     invoke-direct/range {v6 .. v13}, Landroidx/core/app/NotificationCompat$CarExtender$UnreadConversation;-><init>([Ljava/lang/String;Landroidx/core/app/RemoteInput;Landroid/app/PendingIntent;Landroid/app/PendingIntent;[Ljava/lang/String;J)V
 
-    :cond_8
-    :goto_3
+    :cond_9
+    :goto_5
     return-object v1
 .end method
 
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$DecoratedCustomViewStyle.smali b/com.discord/smali/androidx/core/app/NotificationCompat$DecoratedCustomViewStyle.smali
index 3ff33b6fbe..1a32dd062f 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$DecoratedCustomViewStyle.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$DecoratedCustomViewStyle.smali
@@ -28,7 +28,7 @@
 .end method
 
 .method private createRemoteViews(Landroid/widget/RemoteViews;Z)Landroid/widget/RemoteViews;
-    .locals 6
+    .locals 7
 
     sget v0, Landroidx/core/R$layout;->notification_template_custom_big:I
 
@@ -44,54 +44,50 @@
 
     invoke-virtual {v0, v3}, Landroid/widget/RemoteViews;->removeAllViews(I)V
 
-    if-eqz p2, :cond_0
+    iget-object v3, p0, Landroidx/core/app/NotificationCompat$DecoratedCustomViewStyle;->mBuilder:Landroidx/core/app/NotificationCompat$Builder;
 
-    iget-object p2, p0, Landroidx/core/app/NotificationCompat$DecoratedCustomViewStyle;->mBuilder:Landroidx/core/app/NotificationCompat$Builder;
+    iget-object v3, v3, Landroidx/core/app/NotificationCompat$Builder;->mActions:Ljava/util/ArrayList;
 
-    iget-object p2, p2, Landroidx/core/app/NotificationCompat$Builder;->mActions:Ljava/util/ArrayList;
+    invoke-static {v3}, Landroidx/core/app/NotificationCompat$DecoratedCustomViewStyle;->getNonContextualActions(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object v3
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Landroidx/core/app/NotificationCompat$DecoratedCustomViewStyle;->mBuilder:Landroidx/core/app/NotificationCompat$Builder;
+    if-eqz v3, :cond_0
 
-    iget-object p2, p2, Landroidx/core/app/NotificationCompat$Builder;->mActions:Ljava/util/ArrayList;
-
-    invoke-virtual {p2}, Ljava/util/ArrayList;->size()I
+    invoke-interface {v3}, Ljava/util/List;->size()I
 
     move-result p2
 
-    const/4 v3, 0x3
+    const/4 v4, 0x3
 
-    invoke-static {p2, v3}, Ljava/lang/Math;->min(II)I
+    invoke-static {p2, v4}, Ljava/lang/Math;->min(II)I
 
     move-result p2
 
     if-lez p2, :cond_0
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
     :goto_0
-    if-ge v3, p2, :cond_1
+    if-ge v4, p2, :cond_1
 
-    iget-object v4, p0, Landroidx/core/app/NotificationCompat$DecoratedCustomViewStyle;->mBuilder:Landroidx/core/app/NotificationCompat$Builder;
+    invoke-interface {v3, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
-    iget-object v4, v4, Landroidx/core/app/NotificationCompat$Builder;->mActions:Ljava/util/ArrayList;
+    move-result-object v5
 
-    invoke-virtual {v4, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+    check-cast v5, Landroidx/core/app/NotificationCompat$Action;
 
-    move-result-object v4
+    invoke-direct {p0, v5}, Landroidx/core/app/NotificationCompat$DecoratedCustomViewStyle;->generateActionButton(Landroidx/core/app/NotificationCompat$Action;)Landroid/widget/RemoteViews;
 
-    check-cast v4, Landroidx/core/app/NotificationCompat$Action;
+    move-result-object v5
 
-    invoke-direct {p0, v4}, Landroidx/core/app/NotificationCompat$DecoratedCustomViewStyle;->generateActionButton(Landroidx/core/app/NotificationCompat$Action;)Landroid/widget/RemoteViews;
+    sget v6, Landroidx/core/R$id;->actions:I
 
-    move-result-object v4
+    invoke-virtual {v0, v6, v5}, Landroid/widget/RemoteViews;->addView(ILandroid/widget/RemoteViews;)V
 
-    sget v5, Landroidx/core/R$id;->actions:I
-
-    invoke-virtual {v0, v5, v4}, Landroid/widget/RemoteViews;->addView(ILandroid/widget/RemoteViews;)V
-
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v4, v4, 0x1
 
     goto :goto_0
 
@@ -214,6 +210,63 @@
     return-object v1
 .end method
 
+.method private static getNonContextualActions(Ljava/util/List;)Ljava/util/List;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Landroidx/core/app/NotificationCompat$Action;",
+            ">;)",
+            "Ljava/util/List<",
+            "Landroidx/core/app/NotificationCompat$Action;",
+            ">;"
+        }
+    .end annotation
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :cond_0
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {p0}, Ljava/util/List;->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
+
+    check-cast v1, Landroidx/core/app/NotificationCompat$Action;
+
+    invoke-virtual {v1}, Landroidx/core/app/NotificationCompat$Action;->isContextual()Z
+
+    move-result v2
+
+    if-nez v2, :cond_1
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_2
+    return-object v0
+.end method
+
 
 # virtual methods
 .method public apply(Landroidx/core/app/NotificationBuilderWithBuilderAccessor;)V
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat.smali b/com.discord/smali/androidx/core/app/NotificationCompat.smali
index 5f8453d6fd..9e4f7ab8ae 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat.smali
@@ -6,6 +6,7 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
+        Landroidx/core/app/NotificationCompat$BubbleMetadata;,
         Landroidx/core/app/NotificationCompat$CarExtender;,
         Landroidx/core/app/NotificationCompat$WearableExtender;,
         Landroidx/core/app/NotificationCompat$Extender;,
@@ -136,6 +137,8 @@
 
 .field public static final FLAG_AUTO_CANCEL:I = 0x10
 
+.field public static final FLAG_BUBBLE:I = 0x1000
+
 .field public static final FLAG_FOREGROUND_SERVICE:I = 0x40
 
 .field public static final FLAG_GROUP_SUMMARY:I = 0x200
@@ -274,180 +277,216 @@
 .end method
 
 .method static getActionCompatFromAction(Landroid/app/Notification$Action;)Landroidx/core/app/NotificationCompat$Action;
-    .locals 14
+    .locals 17
 
-    invoke-virtual {p0}, Landroid/app/Notification$Action;->getRemoteInputs()[Landroid/app/RemoteInput;
+    move-object/from16 v0, p0
 
-    move-result-object v0
+    invoke-virtual/range {p0 .. p0}, Landroid/app/Notification$Action;->getRemoteInputs()[Landroid/app/RemoteInput;
 
-    const/4 v1, 0x0
+    move-result-object v1
 
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    move-object v9, v0
-
-    goto :goto_1
-
-    :cond_0
-    array-length v2, v0
-
-    new-array v2, v2, [Landroidx/core/app/RemoteInput;
+    const/16 v2, 0x1d
 
     const/4 v3, 0x0
 
-    :goto_0
-    array-length v4, v0
+    if-nez v1, :cond_0
 
-    if-ge v3, v4, :cond_1
+    const/4 v1, 0x0
 
-    aget-object v4, v0, v3
-
-    new-instance v12, Landroidx/core/app/RemoteInput;
-
-    invoke-virtual {v4}, Landroid/app/RemoteInput;->getResultKey()Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-virtual {v4}, Landroid/app/RemoteInput;->getLabel()Ljava/lang/CharSequence;
-
-    move-result-object v7
-
-    invoke-virtual {v4}, Landroid/app/RemoteInput;->getChoices()[Ljava/lang/CharSequence;
-
-    move-result-object v8
-
-    invoke-virtual {v4}, Landroid/app/RemoteInput;->getAllowFreeFormInput()Z
-
-    move-result v9
-
-    invoke-virtual {v4}, Landroid/app/RemoteInput;->getExtras()Landroid/os/Bundle;
-
-    move-result-object v10
-
-    const/4 v11, 0x0
-
-    move-object v5, v12
-
-    invoke-direct/range {v5 .. v11}, Landroidx/core/app/RemoteInput;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;ZLandroid/os/Bundle;Ljava/util/Set;)V
-
-    aput-object v12, v2, v3
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    move-object v9, v2
-
-    :goto_1
-    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
-
-    const/16 v2, 0x18
-
-    const-string v3, "android.support.allowGeneratedReplies"
-
-    const/4 v4, 0x1
-
-    if-lt v0, v2, :cond_4
-
-    invoke-virtual {p0}, Landroid/app/Notification$Action;->getExtras()Landroid/os/Bundle;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v3}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_3
-
-    invoke-virtual {p0}, Landroid/app/Notification$Action;->getAllowGeneratedReplies()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
+    move-object v11, v1
 
     goto :goto_2
 
+    :cond_0
+    array-length v4, v1
+
+    new-array v4, v4, [Landroidx/core/app/RemoteInput;
+
+    const/4 v5, 0x0
+
+    :goto_0
+    array-length v6, v1
+
+    if-ge v5, v6, :cond_2
+
+    aget-object v6, v1, v5
+
+    new-instance v15, Landroidx/core/app/RemoteInput;
+
+    invoke-virtual {v6}, Landroid/app/RemoteInput;->getResultKey()Ljava/lang/String;
+
+    move-result-object v8
+
+    invoke-virtual {v6}, Landroid/app/RemoteInput;->getLabel()Ljava/lang/CharSequence;
+
+    move-result-object v9
+
+    invoke-virtual {v6}, Landroid/app/RemoteInput;->getChoices()[Ljava/lang/CharSequence;
+
+    move-result-object v10
+
+    invoke-virtual {v6}, Landroid/app/RemoteInput;->getAllowFreeFormInput()Z
+
+    move-result v11
+
+    sget v7, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    if-lt v7, v2, :cond_1
+
+    invoke-virtual {v6}, Landroid/app/RemoteInput;->getEditChoicesBeforeSending()I
+
+    move-result v7
+
+    move v12, v7
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v12, 0x0
+
+    :goto_1
+    invoke-virtual {v6}, Landroid/app/RemoteInput;->getExtras()Landroid/os/Bundle;
+
+    move-result-object v13
+
+    const/4 v14, 0x0
+
+    move-object v7, v15
+
+    invoke-direct/range {v7 .. v14}, Landroidx/core/app/RemoteInput;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;ZILandroid/os/Bundle;Ljava/util/Set;)V
+
+    aput-object v15, v4, v5
+
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_0
+
     :cond_2
-    const/4 v0, 0x0
+    move-object v11, v4
+
+    :goto_2
+    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v4, 0x18
+
+    const-string v5, "android.support.allowGeneratedReplies"
+
+    const/4 v6, 0x1
+
+    if-lt v1, v4, :cond_5
+
+    invoke-virtual/range {p0 .. p0}, Landroid/app/Notification$Action;->getExtras()Landroid/os/Bundle;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v5}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_4
+
+    invoke-virtual/range {p0 .. p0}, Landroid/app/Notification$Action;->getAllowGeneratedReplies()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
 
     goto :goto_3
 
     :cond_3
-    :goto_2
-    const/4 v0, 0x1
+    const/4 v1, 0x0
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_4
-    invoke-virtual {p0}, Landroid/app/Notification$Action;->getExtras()Landroid/os/Bundle;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v3}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
-
-    move-result v0
-
     :goto_3
-    move v11, v0
-
-    invoke-virtual {p0}, Landroid/app/Notification$Action;->getExtras()Landroid/os/Bundle;
-
-    move-result-object v0
-
-    const-string v2, "android.support.action.showsUserInterface"
-
-    invoke-virtual {v0, v2, v4}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;Z)Z
-
-    move-result v13
-
-    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
-
-    const/16 v2, 0x1c
-
-    if-lt v0, v2, :cond_5
-
-    invoke-virtual {p0}, Landroid/app/Notification$Action;->getSemanticAction()I
-
-    move-result v0
+    const/4 v1, 0x1
 
     goto :goto_4
 
     :cond_5
-    invoke-virtual {p0}, Landroid/app/Notification$Action;->getExtras()Landroid/os/Bundle;
+    invoke-virtual/range {p0 .. p0}, Landroid/app/Notification$Action;->getExtras()Landroid/os/Bundle;
 
-    move-result-object v0
+    move-result-object v1
 
-    const-string v2, "android.support.action.semanticAction"
+    invoke-virtual {v1, v5}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
 
-    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->getInt(Ljava/lang/String;I)I
-
-    move-result v0
+    move-result v1
 
     :goto_4
-    move v12, v0
+    move v13, v1
 
-    new-instance v0, Landroidx/core/app/NotificationCompat$Action;
+    invoke-virtual/range {p0 .. p0}, Landroid/app/Notification$Action;->getExtras()Landroid/os/Bundle;
 
-    iget v5, p0, Landroid/app/Notification$Action;->icon:I
+    move-result-object v1
 
-    iget-object v6, p0, Landroid/app/Notification$Action;->title:Ljava/lang/CharSequence;
+    const-string v4, "android.support.action.showsUserInterface"
 
-    iget-object v7, p0, Landroid/app/Notification$Action;->actionIntent:Landroid/app/PendingIntent;
+    invoke-virtual {v1, v4, v6}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;Z)Z
 
-    invoke-virtual {p0}, Landroid/app/Notification$Action;->getExtras()Landroid/os/Bundle;
+    move-result v15
 
-    move-result-object v8
+    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/4 v10, 0x0
+    const/16 v4, 0x1c
 
-    move-object v4, v0
+    if-lt v1, v4, :cond_6
 
-    invoke-direct/range {v4 .. v13}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;[Landroidx/core/app/RemoteInput;ZIZ)V
+    invoke-virtual/range {p0 .. p0}, Landroid/app/Notification$Action;->getSemanticAction()I
 
-    return-object v0
+    move-result v1
+
+    goto :goto_5
+
+    :cond_6
+    invoke-virtual/range {p0 .. p0}, Landroid/app/Notification$Action;->getExtras()Landroid/os/Bundle;
+
+    move-result-object v1
+
+    const-string v4, "android.support.action.semanticAction"
+
+    invoke-virtual {v1, v4, v3}, Landroid/os/Bundle;->getInt(Ljava/lang/String;I)I
+
+    move-result v1
+
+    :goto_5
+    move v14, v1
+
+    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    if-lt v1, v2, :cond_7
+
+    invoke-virtual/range {p0 .. p0}, Landroid/app/Notification$Action;->isContextual()Z
+
+    move-result v3
+
+    move/from16 v16, v3
+
+    goto :goto_6
+
+    :cond_7
+    const/16 v16, 0x0
+
+    :goto_6
+    new-instance v1, Landroidx/core/app/NotificationCompat$Action;
+
+    iget v7, v0, Landroid/app/Notification$Action;->icon:I
+
+    iget-object v8, v0, Landroid/app/Notification$Action;->title:Ljava/lang/CharSequence;
+
+    iget-object v9, v0, Landroid/app/Notification$Action;->actionIntent:Landroid/app/PendingIntent;
+
+    invoke-virtual/range {p0 .. p0}, Landroid/app/Notification$Action;->getExtras()Landroid/os/Bundle;
+
+    move-result-object v10
+
+    const/4 v12, 0x0
+
+    move-object v6, v1
+
+    invoke-direct/range {v6 .. v16}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;[Landroidx/core/app/RemoteInput;ZIZZ)V
+
+    return-object v1
 .end method
 
 .method public static getActionCount(Landroid/app/Notification;)I
@@ -491,6 +530,27 @@
     return v1
 .end method
 
+.method public static getAllowSystemGeneratedContextualActions(Landroid/app/Notification;)Z
+    .locals 2
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    invoke-virtual {p0}, Landroid/app/Notification;->getAllowSystemGeneratedContextualActions()Z
+
+    move-result p0
+
+    return p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    return p0
+.end method
+
 .method public static getBadgeIconType(Landroid/app/Notification;)I
     .locals 2
 
@@ -512,6 +572,31 @@
     return p0
 .end method
 
+.method public static getBubbleMetadata(Landroid/app/Notification;)Landroidx/core/app/NotificationCompat$BubbleMetadata;
+    .locals 2
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    invoke-virtual {p0}, Landroid/app/Notification;->getBubbleMetadata()Landroid/app/Notification$BubbleMetadata;
+
+    move-result-object p0
+
+    invoke-static {p0}, Landroidx/core/app/NotificationCompat$BubbleMetadata;->fromPlatform(Landroid/app/Notification$BubbleMetadata;)Landroidx/core/app/NotificationCompat$BubbleMetadata;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    return-object p0
+.end method
+
 .method public static getCategory(Landroid/app/Notification;)Ljava/lang/String;
     .locals 2
 
diff --git a/com.discord/smali/androidx/core/app/NotificationCompatBuilder.smali b/com.discord/smali/androidx/core/app/NotificationCompatBuilder.smali
index b58e34e846..ca72a26720 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompatBuilder.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompatBuilder.smali
@@ -726,33 +726,56 @@
     invoke-virtual {v0, v1}, Landroid/app/Notification$Builder;->setColorized(Z)Landroid/app/Notification$Builder;
 
     :cond_16
-    iget-object p1, p1, Landroidx/core/app/NotificationCompat$Builder;->mChannelId:Ljava/lang/String;
+    iget-object v0, p1, Landroidx/core/app/NotificationCompat$Builder;->mChannelId:Ljava/lang/String;
 
-    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
-    move-result p1
+    move-result v0
 
-    if-nez p1, :cond_17
+    if-nez v0, :cond_17
 
-    iget-object p1, p0, Landroidx/core/app/NotificationCompatBuilder;->mBuilder:Landroid/app/Notification$Builder;
+    iget-object v0, p0, Landroidx/core/app/NotificationCompatBuilder;->mBuilder:Landroid/app/Notification$Builder;
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    invoke-virtual {p1, v0}, Landroid/app/Notification$Builder;->setSound(Landroid/net/Uri;)Landroid/app/Notification$Builder;
+    invoke-virtual {v0, v1}, Landroid/app/Notification$Builder;->setSound(Landroid/net/Uri;)Landroid/app/Notification$Builder;
 
-    move-result-object p1
+    move-result-object v0
 
-    invoke-virtual {p1, v5}, Landroid/app/Notification$Builder;->setDefaults(I)Landroid/app/Notification$Builder;
+    invoke-virtual {v0, v5}, Landroid/app/Notification$Builder;->setDefaults(I)Landroid/app/Notification$Builder;
 
-    move-result-object p1
+    move-result-object v0
 
-    invoke-virtual {p1, v5, v5, v5}, Landroid/app/Notification$Builder;->setLights(III)Landroid/app/Notification$Builder;
+    invoke-virtual {v0, v5, v5, v5}, Landroid/app/Notification$Builder;->setLights(III)Landroid/app/Notification$Builder;
 
-    move-result-object p1
+    move-result-object v0
 
-    invoke-virtual {p1, v0}, Landroid/app/Notification$Builder;->setVibrate([J)Landroid/app/Notification$Builder;
+    invoke-virtual {v0, v1}, Landroid/app/Notification$Builder;->setVibrate([J)Landroid/app/Notification$Builder;
 
     :cond_17
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_18
+
+    iget-object v0, p0, Landroidx/core/app/NotificationCompatBuilder;->mBuilder:Landroid/app/Notification$Builder;
+
+    iget-boolean v1, p1, Landroidx/core/app/NotificationCompat$Builder;->mAllowSystemGeneratedContextualActions:Z
+
+    invoke-virtual {v0, v1}, Landroid/app/Notification$Builder;->setAllowSystemGeneratedContextualActions(Z)Landroid/app/Notification$Builder;
+
+    iget-object v0, p0, Landroidx/core/app/NotificationCompatBuilder;->mBuilder:Landroid/app/Notification$Builder;
+
+    iget-object p1, p1, Landroidx/core/app/NotificationCompat$Builder;->mBubbleMetadata:Landroidx/core/app/NotificationCompat$BubbleMetadata;
+
+    invoke-static {p1}, Landroidx/core/app/NotificationCompat$BubbleMetadata;->toPlatform(Landroidx/core/app/NotificationCompat$BubbleMetadata;)Landroid/app/Notification$BubbleMetadata;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Landroid/app/Notification$Builder;->setBubbleMetadata(Landroid/app/Notification$BubbleMetadata;)Landroid/app/Notification$Builder;
+
+    :cond_18
     return-void
 .end method
 
@@ -763,7 +786,7 @@
 
     const/16 v1, 0x14
 
-    if-lt v0, v1, :cond_4
+    if-lt v0, v1, :cond_5
 
     new-instance v0, Landroid/app/Notification$Action$Builder;
 
@@ -875,6 +898,19 @@
     invoke-virtual {v0, v2}, Landroid/app/Notification$Action$Builder;->setSemanticAction(I)Landroid/app/Notification$Action$Builder;
 
     :cond_3
+    sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v3, 0x1d
+
+    if-lt v2, v3, :cond_4
+
+    invoke-virtual {p1}, Landroidx/core/app/NotificationCompat$Action;->isContextual()Z
+
+    move-result v2
+
+    invoke-virtual {v0, v2}, Landroid/app/Notification$Action$Builder;->setContextual(Z)Landroid/app/Notification$Action$Builder;
+
+    :cond_4
     invoke-virtual {p1}, Landroidx/core/app/NotificationCompat$Action;->getShowsUserInterface()Z
 
     move-result p1
@@ -895,12 +931,12 @@
 
     return-void
 
-    :cond_4
+    :cond_5
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v1, 0x10
 
-    if-lt v0, v1, :cond_5
+    if-lt v0, v1, :cond_6
 
     iget-object v0, p0, Landroidx/core/app/NotificationCompatBuilder;->mActionExtrasList:Ljava/util/List;
 
@@ -912,7 +948,7 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    :cond_5
+    :cond_6
     return-void
 .end method
 
diff --git a/com.discord/smali/androidx/core/app/NotificationCompatJellybean.smali b/com.discord/smali/androidx/core/app/NotificationCompatJellybean.smali
index dd6b4ca3c8..4112bdbca8 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompatJellybean.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompatJellybean.smali
@@ -232,7 +232,7 @@
 .end method
 
 .method private static fromBundle(Landroid/os/Bundle;)Landroidx/core/app/RemoteInput;
-    .locals 8
+    .locals 9
 
     const-string v0, "allowedDataTypes"
 
@@ -240,9 +240,9 @@
 
     move-result-object v0
 
-    new-instance v7, Ljava/util/HashSet;
+    new-instance v8, Ljava/util/HashSet;
 
-    invoke-direct {v7}, Ljava/util/HashSet;-><init>()V
+    invoke-direct {v8}, Ljava/util/HashSet;-><init>()V
 
     if-eqz v0, :cond_0
 
@@ -263,7 +263,7 @@
 
     check-cast v1, Ljava/lang/String;
 
-    invoke-interface {v7, v1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+    invoke-interface {v8, v1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
@@ -294,15 +294,17 @@
 
     move-result v5
 
+    const/4 v6, 0x0
+
     const-string v1, "extras"
 
     invoke-virtual {p0, v1}, Landroid/os/Bundle;->getBundle(Ljava/lang/String;)Landroid/os/Bundle;
 
-    move-result-object v6
+    move-result-object v7
 
     move-object v1, v0
 
-    invoke-direct/range {v1 .. v7}, Landroidx/core/app/RemoteInput;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;ZLandroid/os/Bundle;Ljava/util/Set;)V
+    invoke-direct/range {v1 .. v8}, Landroidx/core/app/RemoteInput;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;ZILandroid/os/Bundle;Ljava/util/Set;)V
 
     return-object v0
 .end method
@@ -490,7 +492,7 @@
 .end method
 
 .method static getActionFromBundle(Landroid/os/Bundle;)Landroidx/core/app/NotificationCompat$Action;
-    .locals 13
+    .locals 14
 
     const-string v0, "extras"
 
@@ -576,9 +578,11 @@
 
     move-result v12
 
+    const/4 v13, 0x0
+
     move-object v3, v1
 
-    invoke-direct/range {v3 .. v12}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;[Landroidx/core/app/RemoteInput;ZIZ)V
+    invoke-direct/range {v3 .. v13}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;[Landroidx/core/app/RemoteInput;ZIZZ)V
 
     return-object v1
 .end method
@@ -927,7 +931,7 @@
 .end method
 
 .method public static readAction(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;)Landroidx/core/app/NotificationCompat$Action;
-    .locals 11
+    .locals 12
 
     const/4 v0, 0x0
 
@@ -977,13 +981,15 @@
     const/4 v7, 0x0
 
     :goto_0
-    new-instance v10, Landroidx/core/app/NotificationCompat$Action;
+    new-instance v11, Landroidx/core/app/NotificationCompat$Action;
 
     const/4 v8, 0x0
 
     const/4 v9, 0x1
 
-    move-object v0, v10
+    const/4 v10, 0x0
+
+    move-object v0, v11
 
     move v1, p0
 
@@ -993,9 +999,9 @@
 
     move-object v4, p3
 
-    invoke-direct/range {v0 .. v9}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;[Landroidx/core/app/RemoteInput;ZIZ)V
+    invoke-direct/range {v0 .. v10}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;Landroid/os/Bundle;[Landroidx/core/app/RemoteInput;[Landroidx/core/app/RemoteInput;ZIZZ)V
 
-    return-object v10
+    return-object v11
 .end method
 
 .method private static toBundle(Landroidx/core/app/RemoteInput;)Landroid/os/Bundle;
diff --git a/com.discord/smali/androidx/core/app/RemoteInput$Builder.smali b/com.discord/smali/androidx/core/app/RemoteInput$Builder.smali
index 396213401b..5b299a452c 100644
--- a/com.discord/smali/androidx/core/app/RemoteInput$Builder.smali
+++ b/com.discord/smali/androidx/core/app/RemoteInput$Builder.smali
@@ -29,6 +29,8 @@
 
 .field private mChoices:[Ljava/lang/CharSequence;
 
+.field private mEditChoicesBeforeSending:I
+
 .field private final mExtras:Landroid/os/Bundle;
 
 .field private mLabel:Ljava/lang/CharSequence;
@@ -58,6 +60,10 @@
 
     iput-boolean v0, p0, Landroidx/core/app/RemoteInput$Builder;->mAllowFreeFormTextInput:Z
 
+    const/4 v0, 0x0
+
+    iput v0, p0, Landroidx/core/app/RemoteInput$Builder;->mEditChoicesBeforeSending:I
+
     if-eqz p1, :cond_0
 
     iput-object p1, p0, Landroidx/core/app/RemoteInput$Builder;->mResultKey:Ljava/lang/String;
@@ -90,9 +96,9 @@
 .end method
 
 .method public final build()Landroidx/core/app/RemoteInput;
-    .locals 8
+    .locals 9
 
-    new-instance v7, Landroidx/core/app/RemoteInput;
+    new-instance v8, Landroidx/core/app/RemoteInput;
 
     iget-object v1, p0, Landroidx/core/app/RemoteInput$Builder;->mResultKey:Ljava/lang/String;
 
@@ -102,15 +108,17 @@
 
     iget-boolean v4, p0, Landroidx/core/app/RemoteInput$Builder;->mAllowFreeFormTextInput:Z
 
-    iget-object v5, p0, Landroidx/core/app/RemoteInput$Builder;->mExtras:Landroid/os/Bundle;
+    iget v5, p0, Landroidx/core/app/RemoteInput$Builder;->mEditChoicesBeforeSending:I
 
-    iget-object v6, p0, Landroidx/core/app/RemoteInput$Builder;->mAllowedDataTypes:Ljava/util/Set;
+    iget-object v6, p0, Landroidx/core/app/RemoteInput$Builder;->mExtras:Landroid/os/Bundle;
 
-    move-object v0, v7
+    iget-object v7, p0, Landroidx/core/app/RemoteInput$Builder;->mAllowedDataTypes:Ljava/util/Set;
 
-    invoke-direct/range {v0 .. v6}, Landroidx/core/app/RemoteInput;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;ZLandroid/os/Bundle;Ljava/util/Set;)V
+    move-object v0, v8
 
-    return-object v7
+    invoke-direct/range {v0 .. v7}, Landroidx/core/app/RemoteInput;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;ZILandroid/os/Bundle;Ljava/util/Set;)V
+
+    return-object v8
 .end method
 
 .method public final getExtras()Landroid/os/Bundle;
@@ -157,6 +165,14 @@
     return-object p0
 .end method
 
+.method public final setEditChoicesBeforeSending(I)Landroidx/core/app/RemoteInput$Builder;
+    .locals 0
+
+    iput p1, p0, Landroidx/core/app/RemoteInput$Builder;->mEditChoicesBeforeSending:I
+
+    return-object p0
+.end method
+
 .method public final setLabel(Ljava/lang/CharSequence;)Landroidx/core/app/RemoteInput$Builder;
     .locals 0
 
diff --git a/com.discord/smali/androidx/core/app/RemoteInput$EditChoicesBeforeSending.smali b/com.discord/smali/androidx/core/app/RemoteInput$EditChoicesBeforeSending.smali
new file mode 100644
index 0000000000..220445306c
--- /dev/null
+++ b/com.discord/smali/androidx/core/app/RemoteInput$EditChoicesBeforeSending.smali
@@ -0,0 +1,21 @@
+.class public interface abstract annotation Landroidx/core/app/RemoteInput$EditChoicesBeforeSending;
+.super Ljava/lang/Object;
+.source "RemoteInput.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Landroidx/core/app/RemoteInput;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x2609
+    name = "EditChoicesBeforeSending"
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->SOURCE:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
diff --git a/com.discord/smali/androidx/core/app/RemoteInput.smali b/com.discord/smali/androidx/core/app/RemoteInput.smali
index 855f95e46f..e0216f6635 100644
--- a/com.discord/smali/androidx/core/app/RemoteInput.smali
+++ b/com.discord/smali/androidx/core/app/RemoteInput.smali
@@ -7,12 +7,19 @@
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
         Landroidx/core/app/RemoteInput$Builder;,
+        Landroidx/core/app/RemoteInput$EditChoicesBeforeSending;,
         Landroidx/core/app/RemoteInput$Source;
     }
 .end annotation
 
 
 # static fields
+.field public static final EDIT_CHOICES_BEFORE_SENDING_AUTO:I = 0x0
+
+.field public static final EDIT_CHOICES_BEFORE_SENDING_DISABLED:I = 0x1
+
+.field public static final EDIT_CHOICES_BEFORE_SENDING_ENABLED:I = 0x2
+
 .field private static final EXTRA_DATA_TYPE_RESULTS_DATA:Ljava/lang/String; = "android.remoteinput.dataTypeResultsData"
 
 .field public static final EXTRA_RESULTS_DATA:Ljava/lang/String; = "android.remoteinput.resultsData"
@@ -43,6 +50,8 @@
 
 .field private final mChoices:[Ljava/lang/CharSequence;
 
+.field private final mEditChoicesBeforeSending:I
+
 .field private final mExtras:Landroid/os/Bundle;
 
 .field private final mLabel:Ljava/lang/CharSequence;
@@ -51,7 +60,7 @@
 
 
 # direct methods
-.method constructor <init>(Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;ZLandroid/os/Bundle;Ljava/util/Set;)V
+.method constructor <init>(Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;ZILandroid/os/Bundle;Ljava/util/Set;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -60,7 +69,7 @@
             "Ljava/lang/CharSequence;",
             "[",
             "Ljava/lang/CharSequence;",
-            "Z",
+            "ZI",
             "Landroid/os/Bundle;",
             "Ljava/util/Set<",
             "Ljava/lang/String;",
@@ -78,10 +87,39 @@
 
     iput-boolean p4, p0, Landroidx/core/app/RemoteInput;->mAllowFreeFormTextInput:Z
 
-    iput-object p5, p0, Landroidx/core/app/RemoteInput;->mExtras:Landroid/os/Bundle;
+    iput p5, p0, Landroidx/core/app/RemoteInput;->mEditChoicesBeforeSending:I
 
-    iput-object p6, p0, Landroidx/core/app/RemoteInput;->mAllowedDataTypes:Ljava/util/Set;
+    iput-object p6, p0, Landroidx/core/app/RemoteInput;->mExtras:Landroid/os/Bundle;
 
+    iput-object p7, p0, Landroidx/core/app/RemoteInput;->mAllowedDataTypes:Ljava/util/Set;
+
+    invoke-virtual {p0}, Landroidx/core/app/RemoteInput;->getEditChoicesBeforeSending()I
+
+    move-result p1
+
+    const/4 p2, 0x2
+
+    if-ne p1, p2, :cond_1
+
+    invoke-virtual {p0}, Landroidx/core/app/RemoteInput;->getAllowFreeFormInput()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "setEditChoicesBeforeSending requires setAllowFreeFormInput"
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
     return-void
 .end method
 
@@ -379,7 +417,7 @@
 .end method
 
 .method static fromCompat(Landroidx/core/app/RemoteInput;)Landroid/app/RemoteInput;
-    .locals 2
+    .locals 3
 
     new-instance v0, Landroid/app/RemoteInput$Builder;
 
@@ -415,13 +453,26 @@
 
     invoke-virtual {p0}, Landroidx/core/app/RemoteInput;->getExtras()Landroid/os/Bundle;
 
-    move-result-object p0
+    move-result-object v1
 
-    invoke-virtual {v0, p0}, Landroid/app/RemoteInput$Builder;->addExtras(Landroid/os/Bundle;)Landroid/app/RemoteInput$Builder;
+    invoke-virtual {v0, v1}, Landroid/app/RemoteInput$Builder;->addExtras(Landroid/os/Bundle;)Landroid/app/RemoteInput$Builder;
 
-    move-result-object p0
+    move-result-object v0
 
-    invoke-virtual {p0}, Landroid/app/RemoteInput$Builder;->build()Landroid/app/RemoteInput;
+    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v2, 0x1d
+
+    if-lt v1, v2, :cond_0
+
+    invoke-virtual {p0}, Landroidx/core/app/RemoteInput;->getEditChoicesBeforeSending()I
+
+    move-result p0
+
+    invoke-virtual {v0, p0}, Landroid/app/RemoteInput$Builder;->setEditChoicesBeforeSending(I)Landroid/app/RemoteInput$Builder;
+
+    :cond_0
+    invoke-virtual {v0}, Landroid/app/RemoteInput$Builder;->build()Landroid/app/RemoteInput;
 
     move-result-object p0
 
@@ -854,6 +905,14 @@
     return-object v0
 .end method
 
+.method public final getEditChoicesBeforeSending()I
+    .locals 1
+
+    iget v0, p0, Landroidx/core/app/RemoteInput;->mEditChoicesBeforeSending:I
+
+    return v0
+.end method
+
 .method public final getExtras()Landroid/os/Bundle;
     .locals 1
 
diff --git a/com.discord/smali/androidx/core/app/ShareCompat$IntentBuilder.smali b/com.discord/smali/androidx/core/app/ShareCompat$IntentBuilder.smali
index 73c6f07557..c6dc612099 100644
--- a/com.discord/smali/androidx/core/app/ShareCompat$IntentBuilder.smali
+++ b/com.discord/smali/androidx/core/app/ShareCompat$IntentBuilder.smali
@@ -15,8 +15,6 @@
 
 
 # instance fields
-.field private mActivity:Landroid/app/Activity;
-
 .field private mBccAddresses:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -39,7 +37,9 @@
 
 .field private mChooserTitle:Ljava/lang/CharSequence;
 
-.field private mIntent:Landroid/content/Intent;
+.field private final mContext:Landroid/content/Context;
+
+.field private final mIntent:Landroid/content/Intent;
 
 .field private mStreams:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
@@ -63,12 +63,18 @@
 
 
 # direct methods
-.method private constructor <init>(Landroid/app/Activity;)V
+.method private constructor <init>(Landroid/content/Context;Landroid/content/ComponentName;)V
     .locals 3
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mActivity:Landroid/app/Activity;
+    invoke-static {p1}, Landroidx/core/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/content/Context;
+
+    iput-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mContext:Landroid/content/Context;
 
     new-instance v0, Landroid/content/Intent;
 
@@ -84,7 +90,7 @@
 
     iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mIntent:Landroid/content/Intent;
 
-    invoke-virtual {p1}, Landroid/app/Activity;->getPackageName()Ljava/lang/String;
+    invoke-virtual {p1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
     move-result-object v1
 
@@ -94,39 +100,31 @@
 
     iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mIntent:Landroid/content/Intent;
 
-    invoke-virtual {p1}, Landroid/app/Activity;->getPackageName()Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v2, "android.support.v4.app.EXTRA_CALLING_PACKAGE"
-
-    invoke-virtual {v0, v2, v1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
-
-    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mIntent:Landroid/content/Intent;
-
-    invoke-virtual {p1}, Landroid/app/Activity;->getComponentName()Landroid/content/ComponentName;
-
-    move-result-object v1
-
-    const-string v2, "androidx.core.app.EXTRA_CALLING_ACTIVITY"
-
-    invoke-virtual {v0, v2, v1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
-
-    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mIntent:Landroid/content/Intent;
-
-    invoke-virtual {p1}, Landroid/app/Activity;->getComponentName()Landroid/content/ComponentName;
+    invoke-virtual {p1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
     move-result-object p1
 
-    const-string v1, "android.support.v4.app.EXTRA_CALLING_ACTIVITY"
+    const-string v1, "android.support.v4.app.EXTRA_CALLING_PACKAGE"
 
-    invoke-virtual {v0, v1, p1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
+    invoke-virtual {v0, v1, p1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
 
     iget-object p1, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mIntent:Landroid/content/Intent;
 
-    const/high16 v0, 0x80000
+    const-string v0, "androidx.core.app.EXTRA_CALLING_ACTIVITY"
 
-    invoke-virtual {p1, v0}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
+    invoke-virtual {p1, v0, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
+
+    iget-object p1, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mIntent:Landroid/content/Intent;
+
+    const-string v0, "android.support.v4.app.EXTRA_CALLING_ACTIVITY"
+
+    invoke-virtual {p1, v0, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
+
+    iget-object p1, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mIntent:Landroid/content/Intent;
+
+    const/high16 p2, 0x80000
+
+    invoke-virtual {p1, p2}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
 
     return-void
 .end method
@@ -233,9 +231,29 @@
 .method public static from(Landroid/app/Activity;)Landroidx/core/app/ShareCompat$IntentBuilder;
     .locals 1
 
+    invoke-static {p0}, Landroidx/core/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/content/Context;
+
+    invoke-virtual {p0}, Landroid/app/Activity;->getComponentName()Landroid/content/ComponentName;
+
+    move-result-object p0
+
+    invoke-static {v0, p0}, Landroidx/core/app/ShareCompat$IntentBuilder;->from(Landroid/content/Context;Landroid/content/ComponentName;)Landroidx/core/app/ShareCompat$IntentBuilder;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method private static from(Landroid/content/Context;Landroid/content/ComponentName;)Landroidx/core/app/ShareCompat$IntentBuilder;
+    .locals 1
+
     new-instance v0, Landroidx/core/app/ShareCompat$IntentBuilder;
 
-    invoke-direct {v0, p0}, Landroidx/core/app/ShareCompat$IntentBuilder;-><init>(Landroid/app/Activity;)V
+    invoke-direct {v0, p0, p1}, Landroidx/core/app/ShareCompat$IntentBuilder;-><init>(Landroid/content/Context;Landroid/content/ComponentName;)V
 
     return-object v0
 .end method
@@ -406,10 +424,10 @@
     return-object v0
 .end method
 
-.method getActivity()Landroid/app/Activity;
+.method getContext()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mActivity:Landroid/app/Activity;
+    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mContext:Landroid/content/Context;
 
     return-object v0
 .end method
@@ -480,7 +498,7 @@
 
     const-string v4, "android.intent.action.SEND_MULTIPLE"
 
-    invoke-virtual {v0, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v4, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -570,9 +588,9 @@
 .method public setChooserTitle(I)Landroidx/core/app/ShareCompat$IntentBuilder;
     .locals 1
 
-    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mActivity:Landroid/app/Activity;
+    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mContext:Landroid/content/Context;
 
-    invoke-virtual {v0, p1}, Landroid/app/Activity;->getText(I)Ljava/lang/CharSequence;
+    invoke-virtual {v0, p1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
     move-result-object p1
 
@@ -676,7 +694,7 @@
 
     const-string v1, "android.intent.action.SEND"
 
-    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -737,13 +755,13 @@
 .method public startChooser()V
     .locals 2
 
-    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mActivity:Landroid/app/Activity;
+    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentBuilder;->mContext:Landroid/content/Context;
 
     invoke-virtual {p0}, Landroidx/core/app/ShareCompat$IntentBuilder;->createChooserIntent()Landroid/content/Intent;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Landroid/app/Activity;->startActivity(Landroid/content/Intent;)V
+    invoke-virtual {v0, v1}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/app/ShareCompat$IntentReader.smali b/com.discord/smali/androidx/core/app/ShareCompat$IntentReader.smali
index 830ccccc2c..4502238fe8 100644
--- a/com.discord/smali/androidx/core/app/ShareCompat$IntentReader.smali
+++ b/com.discord/smali/androidx/core/app/ShareCompat$IntentReader.smali
@@ -19,13 +19,13 @@
 
 
 # instance fields
-.field private mActivity:Landroid/app/Activity;
+.field private final mCallingActivity:Landroid/content/ComponentName;
 
-.field private mCallingActivity:Landroid/content/ComponentName;
+.field private final mCallingPackage:Ljava/lang/String;
 
-.field private mCallingPackage:Ljava/lang/String;
+.field private final mContext:Landroid/content/Context;
 
-.field private mIntent:Landroid/content/Intent;
+.field private final mIntent:Landroid/content/Intent;
 
 .field private mStreams:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
@@ -39,26 +39,34 @@
 
 
 # direct methods
-.method private constructor <init>(Landroid/app/Activity;)V
-    .locals 1
+.method private constructor <init>(Landroid/content/Context;Landroid/content/Intent;)V
+    .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Landroidx/core/app/ShareCompat$IntentReader;->mActivity:Landroid/app/Activity;
+    invoke-static {p1}, Landroidx/core/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p1}, Landroid/app/Activity;->getIntent()Landroid/content/Intent;
+    move-result-object p1
 
-    move-result-object v0
+    check-cast p1, Landroid/content/Context;
 
-    iput-object v0, p0, Landroidx/core/app/ShareCompat$IntentReader;->mIntent:Landroid/content/Intent;
+    iput-object p1, p0, Landroidx/core/app/ShareCompat$IntentReader;->mContext:Landroid/content/Context;
 
-    invoke-static {p1}, Landroidx/core/app/ShareCompat;->getCallingPackage(Landroid/app/Activity;)Ljava/lang/String;
+    invoke-static {p2}, Landroidx/core/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object p1
 
-    iput-object v0, p0, Landroidx/core/app/ShareCompat$IntentReader;->mCallingPackage:Ljava/lang/String;
+    check-cast p1, Landroid/content/Intent;
 
-    invoke-static {p1}, Landroidx/core/app/ShareCompat;->getCallingActivity(Landroid/app/Activity;)Landroid/content/ComponentName;
+    iput-object p1, p0, Landroidx/core/app/ShareCompat$IntentReader;->mIntent:Landroid/content/Intent;
+
+    invoke-static {p2}, Landroidx/core/app/ShareCompat;->getCallingPackage(Landroid/content/Intent;)Ljava/lang/String;
+
+    move-result-object p1
+
+    iput-object p1, p0, Landroidx/core/app/ShareCompat$IntentReader;->mCallingPackage:Ljava/lang/String;
+
+    invoke-static {p2}, Landroidx/core/app/ShareCompat;->getCallingActivity(Landroid/content/Intent;)Landroid/content/ComponentName;
 
     move-result-object p1
 
@@ -70,9 +78,29 @@
 .method public static from(Landroid/app/Activity;)Landroidx/core/app/ShareCompat$IntentReader;
     .locals 1
 
+    invoke-static {p0}, Landroidx/core/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/content/Context;
+
+    invoke-virtual {p0}, Landroid/app/Activity;->getIntent()Landroid/content/Intent;
+
+    move-result-object p0
+
+    invoke-static {v0, p0}, Landroidx/core/app/ShareCompat$IntentReader;->from(Landroid/content/Context;Landroid/content/Intent;)Landroidx/core/app/ShareCompat$IntentReader;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method private static from(Landroid/content/Context;Landroid/content/Intent;)Landroidx/core/app/ShareCompat$IntentReader;
+    .locals 1
+
     new-instance v0, Landroidx/core/app/ShareCompat$IntentReader;
 
-    invoke-direct {v0, p0}, Landroidx/core/app/ShareCompat$IntentReader;-><init>(Landroid/app/Activity;)V
+    invoke-direct {v0, p0, p1}, Landroidx/core/app/ShareCompat$IntentReader;-><init>(Landroid/content/Context;Landroid/content/Intent;)V
 
     return-object v0
 .end method
@@ -164,22 +192,14 @@
 
     :cond_6
     :goto_2
-    new-instance v1, Ljava/lang/StringBuilder;
+    const-string v1, "&#"
 
-    const-string v2, "&#"
+    invoke-virtual {p0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     const-string 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-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :goto_3
@@ -213,9 +233,9 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentReader;->mActivity:Landroid/app/Activity;
+    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentReader;->mContext:Landroid/content/Context;
 
-    invoke-virtual {v0}, Landroid/app/Activity;->getPackageManager()Landroid/content/pm/PackageManager;
+    invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
     move-result-object v0
 
@@ -254,9 +274,9 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentReader;->mActivity:Landroid/app/Activity;
+    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentReader;->mContext:Landroid/content/Context;
 
-    invoke-virtual {v0}, Landroid/app/Activity;->getPackageManager()Landroid/content/pm/PackageManager;
+    invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
     move-result-object v0
 
@@ -295,9 +315,9 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentReader;->mActivity:Landroid/app/Activity;
+    iget-object v0, p0, Landroidx/core/app/ShareCompat$IntentReader;->mContext:Landroid/content/Context;
 
-    invoke-virtual {v0}, Landroid/app/Activity;->getPackageManager()Landroid/content/pm/PackageManager;
+    invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
     move-result-object v0
 
diff --git a/com.discord/smali/androidx/core/app/ShareCompat.smali b/com.discord/smali/androidx/core/app/ShareCompat.smali
index f8748689b2..a09f2f669f 100644
--- a/com.discord/smali/androidx/core/app/ShareCompat.smali
+++ b/com.discord/smali/androidx/core/app/ShareCompat.smali
@@ -83,7 +83,7 @@
 
     new-instance v0, Landroid/widget/ShareActionProvider;
 
-    invoke-virtual {p1}, Landroidx/core/app/ShareCompat$IntentBuilder;->getActivity()Landroid/app/Activity;
+    invoke-virtual {p1}, Landroidx/core/app/ShareCompat$IntentBuilder;->getContext()Landroid/content/Context;
 
     move-result-object v1
 
@@ -101,7 +101,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Landroidx/core/app/ShareCompat$IntentBuilder;->getActivity()Landroid/app/Activity;
+    invoke-virtual {p1}, Landroidx/core/app/ShareCompat$IntentBuilder;->getContext()Landroid/content/Context;
 
     move-result-object v2
 
@@ -152,21 +152,32 @@
 .end method
 
 .method public static getCallingActivity(Landroid/app/Activity;)Landroid/content/ComponentName;
-    .locals 2
-
-    invoke-virtual {p0}, Landroid/app/Activity;->getCallingActivity()Landroid/content/ComponentName;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
+    .locals 1
 
     invoke-virtual {p0}, Landroid/app/Activity;->getIntent()Landroid/content/Intent;
 
     move-result-object v0
 
-    const-string v1, "androidx.core.app.EXTRA_CALLING_ACTIVITY"
+    invoke-virtual {p0}, Landroid/app/Activity;->getCallingActivity()Landroid/content/ComponentName;
 
-    invoke-virtual {v0, v1}, Landroid/content/Intent;->getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable;
+    move-result-object p0
+
+    if-nez p0, :cond_0
+
+    invoke-static {v0}, Landroidx/core/app/ShareCompat;->getCallingActivity(Landroid/content/Intent;)Landroid/content/ComponentName;
+
+    move-result-object p0
+
+    :cond_0
+    return-object p0
+.end method
+
+.method static getCallingActivity(Landroid/content/Intent;)Landroid/content/ComponentName;
+    .locals 1
+
+    const-string v0, "androidx.core.app.EXTRA_CALLING_ACTIVITY"
+
+    invoke-virtual {p0, v0}, Landroid/content/Intent;->getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable;
 
     move-result-object v0
 
@@ -174,10 +185,6 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Landroid/app/Activity;->getIntent()Landroid/content/Intent;
-
-    move-result-object p0
-
     const-string v0, "android.support.v4.app.EXTRA_CALLING_ACTIVITY"
 
     invoke-virtual {p0, v0}, Landroid/content/Intent;->getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable;
@@ -193,30 +200,39 @@
 .end method
 
 .method public static getCallingPackage(Landroid/app/Activity;)Ljava/lang/String;
-    .locals 2
+    .locals 1
+
+    invoke-virtual {p0}, Landroid/app/Activity;->getIntent()Landroid/content/Intent;
+
+    move-result-object v0
 
     invoke-virtual {p0}, Landroid/app/Activity;->getCallingPackage()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p0
 
-    if-nez v0, :cond_0
+    if-nez p0, :cond_0
 
-    invoke-virtual {p0}, Landroid/app/Activity;->getIntent()Landroid/content/Intent;
+    if-eqz v0, :cond_0
 
-    move-result-object v0
-
-    const-string v1, "androidx.core.app.EXTRA_CALLING_PACKAGE"
-
-    invoke-virtual {v0, v1}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    invoke-virtual {p0}, Landroid/app/Activity;->getIntent()Landroid/content/Intent;
+    invoke-static {v0}, Landroidx/core/app/ShareCompat;->getCallingPackage(Landroid/content/Intent;)Ljava/lang/String;
 
     move-result-object p0
 
+    :cond_0
+    return-object p0
+.end method
+
+.method static getCallingPackage(Landroid/content/Intent;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "androidx.core.app.EXTRA_CALLING_PACKAGE"
+
+    invoke-virtual {p0, v0}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
     const-string v0, "android.support.v4.app.EXTRA_CALLING_PACKAGE"
 
     invoke-virtual {p0, v0}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
diff --git a/com.discord/smali/androidx/core/content/ContextKt.smali b/com.discord/smali/androidx/core/content/ContextKt.smali
index 1b05db4315..09d5559c0f 100644
--- a/com.discord/smali/androidx/core/content/ContextKt.smali
+++ b/com.discord/smali/androidx/core/content/ContextKt.smali
@@ -16,7 +16,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Eo()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ed()V
 
     const-class v0, Ljava/lang/Object;
 
@@ -42,7 +42,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$withStyledAttributes"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -81,7 +81,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$withStyledAttributes"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -130,7 +130,7 @@
     const/4 p4, 0x0
 
     :cond_2
-    const-string p6, "$receiver"
+    const-string p6, "$this$withStyledAttributes"
 
     invoke-static {p0, p6}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/content/SharedPreferencesKt.smali b/com.discord/smali/androidx/core/content/SharedPreferencesKt.smali
index ef7e8734dc..66e4c0fa76 100644
--- a/com.discord/smali/androidx/core/content/SharedPreferencesKt.smali
+++ b/com.discord/smali/androidx/core/content/SharedPreferencesKt.smali
@@ -19,7 +19,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$edit"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -59,7 +59,7 @@
     const/4 p1, 0x0
 
     :cond_0
-    const-string p3, "$receiver"
+    const-string p3, "$this$edit"
 
     invoke-static {p0, p3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/content/pm/ShortcutInfoCompat.smali b/com.discord/smali/androidx/core/content/pm/ShortcutInfoCompat.smali
index a7571d2bbc..847d201613 100644
--- a/com.discord/smali/androidx/core/content/pm/ShortcutInfoCompat.smali
+++ b/com.discord/smali/androidx/core/content/pm/ShortcutInfoCompat.smali
@@ -62,7 +62,7 @@
     return-void
 .end method
 
-.method private buildExtrasBundle()Landroid/os/PersistableBundle;
+.method private buildLegacyExtrasBundle()Landroid/os/PersistableBundle;
     .locals 5
 
     new-instance v0, Landroid/os/PersistableBundle;
@@ -405,7 +405,7 @@
 .end method
 
 .method public toShortcutInfo()Landroid/content/pm/ShortcutInfo;
-    .locals 3
+    .locals 4
 
     new-instance v0, Landroid/content/pm/ShortcutInfo$Builder;
 
@@ -478,12 +478,63 @@
     invoke-virtual {v0, v1}, Landroid/content/pm/ShortcutInfo$Builder;->setCategories(Ljava/util/Set;)Landroid/content/pm/ShortcutInfo$Builder;
 
     :cond_4
-    invoke-direct {p0}, Landroidx/core/content/pm/ShortcutInfoCompat;->buildExtrasBundle()Landroid/os/PersistableBundle;
+    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v2, 0x1d
+
+    if-lt v1, v2, :cond_7
+
+    iget-object v1, p0, Landroidx/core/content/pm/ShortcutInfoCompat;->mPersons:[Landroidx/core/app/Person;
+
+    if-eqz v1, :cond_6
+
+    array-length v2, v1
+
+    if-lez v2, :cond_6
+
+    array-length v1, v1
+
+    new-array v1, v1, [Landroid/app/Person;
+
+    const/4 v2, 0x0
+
+    :goto_0
+    array-length v3, v1
+
+    if-ge v2, v3, :cond_5
+
+    iget-object v3, p0, Landroidx/core/content/pm/ShortcutInfoCompat;->mPersons:[Landroidx/core/app/Person;
+
+    aget-object v3, v3, v2
+
+    invoke-virtual {v3}, Landroidx/core/app/Person;->toAndroidPerson()Landroid/app/Person;
+
+    move-result-object v3
+
+    aput-object v3, v1, v2
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_5
+    invoke-virtual {v0, v1}, Landroid/content/pm/ShortcutInfo$Builder;->setPersons([Landroid/app/Person;)Landroid/content/pm/ShortcutInfo$Builder;
+
+    :cond_6
+    iget-boolean v1, p0, Landroidx/core/content/pm/ShortcutInfoCompat;->mIsLongLived:Z
+
+    invoke-virtual {v0, v1}, Landroid/content/pm/ShortcutInfo$Builder;->setLongLived(Z)Landroid/content/pm/ShortcutInfo$Builder;
+
+    goto :goto_1
+
+    :cond_7
+    invoke-direct {p0}, Landroidx/core/content/pm/ShortcutInfoCompat;->buildLegacyExtrasBundle()Landroid/os/PersistableBundle;
 
     move-result-object v1
 
     invoke-virtual {v0, v1}, Landroid/content/pm/ShortcutInfo$Builder;->setExtras(Landroid/os/PersistableBundle;)Landroid/content/pm/ShortcutInfo$Builder;
 
+    :goto_1
     invoke-virtual {v0}, Landroid/content/pm/ShortcutInfo$Builder;->build()Landroid/content/pm/ShortcutInfo;
 
     move-result-object v0
diff --git a/com.discord/smali/androidx/core/content/pm/ShortcutManagerCompat.smali b/com.discord/smali/androidx/core/content/pm/ShortcutManagerCompat.smali
index 5b228af8de..0f60613dd6 100644
--- a/com.discord/smali/androidx/core/content/pm/ShortcutManagerCompat.smali
+++ b/com.discord/smali/androidx/core/content/pm/ShortcutManagerCompat.smali
@@ -282,6 +282,15 @@
 
 .method private static getShortcutInfoSaverInstance(Landroid/content/Context;)Landroidx/core/content/pm/ShortcutInfoCompatSaver;
     .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/content/Context;",
+            ")",
+            "Landroidx/core/content/pm/ShortcutInfoCompatSaver<",
+            "*>;"
+        }
+    .end annotation
 
     sget-object v0, Landroidx/core/content/pm/ShortcutManagerCompat;->sShortcutInfoCompatSaver:Landroidx/core/content/pm/ShortcutInfoCompatSaver;
 
@@ -483,6 +492,44 @@
     return-void
 .end method
 
+.method public static removeDynamicShortcuts(Landroid/content/Context;Ljava/util/List;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/content/Context;",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;)V"
+        }
+    .end annotation
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x19
+
+    if-lt v0, v1, :cond_0
+
+    const-class v0, Landroid/content/pm/ShortcutManager;
+
+    invoke-virtual {p0, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/Class;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/content/pm/ShortcutManager;
+
+    invoke-virtual {v0, p1}, Landroid/content/pm/ShortcutManager;->removeDynamicShortcuts(Ljava/util/List;)V
+
+    :cond_0
+    invoke-static {p0}, Landroidx/core/content/pm/ShortcutManagerCompat;->getShortcutInfoSaverInstance(Landroid/content/Context;)Landroidx/core/content/pm/ShortcutInfoCompatSaver;
+
+    move-result-object p0
+
+    invoke-virtual {p0, p1}, Landroidx/core/content/pm/ShortcutInfoCompatSaver;->removeShortcuts(Ljava/util/List;)Ljava/lang/Object;
+
+    return-void
+.end method
+
 .method public static requestPinShortcut(Landroid/content/Context;Landroidx/core/content/pm/ShortcutInfoCompat;Landroid/content/IntentSender;)Z
     .locals 10
 
@@ -639,43 +686,3 @@
 
     return p0
 .end method
-
-
-# virtual methods
-.method public removeDynamicShortcuts(Landroid/content/Context;Ljava/util/List;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Landroid/content/Context;",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;)V"
-        }
-    .end annotation
-
-    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
-
-    const/16 v1, 0x19
-
-    if-lt v0, v1, :cond_0
-
-    const-class v0, Landroid/content/pm/ShortcutManager;
-
-    invoke-virtual {p1, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/Class;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/content/pm/ShortcutManager;
-
-    invoke-virtual {v0, p2}, Landroid/content/pm/ShortcutManager;->removeDynamicShortcuts(Ljava/util/List;)V
-
-    :cond_0
-    invoke-static {p1}, Landroidx/core/content/pm/ShortcutManagerCompat;->getShortcutInfoSaverInstance(Landroid/content/Context;)Landroidx/core/content/pm/ShortcutInfoCompatSaver;
-
-    move-result-object p1
-
-    invoke-virtual {p1, p2}, Landroidx/core/content/pm/ShortcutInfoCompatSaver;->removeShortcuts(Ljava/util/List;)Ljava/lang/Object;
-
-    return-void
-.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 a16cdc9817..dd17797146 100644
--- a/com.discord/smali/androidx/core/content/res/TypedArrayKt.smali
+++ b/com.discord/smali/androidx/core/content/res/TypedArrayKt.smali
@@ -30,7 +30,7 @@
 .method public static final getBooleanOrThrow(Landroid/content/res/TypedArray;I)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getBooleanOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -48,7 +48,7 @@
 .method public static final getColorOrThrow(Landroid/content/res/TypedArray;I)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getColorOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -66,7 +66,7 @@
 .method public static final getColorStateListOrThrow(Landroid/content/res/TypedArray;I)Landroid/content/res/ColorStateList;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getColorStateListOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -99,7 +99,7 @@
 .method public static final getDimensionOrThrow(Landroid/content/res/TypedArray;I)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getDimensionOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -117,7 +117,7 @@
 .method public static final getDimensionPixelOffsetOrThrow(Landroid/content/res/TypedArray;I)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getDimensionPixelOffsetOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -135,7 +135,7 @@
 .method public static final getDimensionPixelSizeOrThrow(Landroid/content/res/TypedArray;I)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getDimensionPixelSizeOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -153,7 +153,7 @@
 .method public static final getDrawableOrThrow(Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getDrawableOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -163,17 +163,18 @@
 
     move-result-object p0
 
-    const-string p1, "getDrawable(index)"
+    if-nez p0, :cond_0
 
-    invoke-static {p0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
+    :cond_0
     return-object p0
 .end method
 
 .method public static final getFloatOrThrow(Landroid/content/res/TypedArray;I)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getFloatOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -191,7 +192,7 @@
 .method public static final getFontOrThrow(Landroid/content/res/TypedArray;I)Landroid/graphics/Typeface;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getFontOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -201,17 +202,18 @@
 
     move-result-object p0
 
-    const-string p1, "getFont(index)"
+    if-nez p0, :cond_0
 
-    invoke-static {p0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
+    :cond_0
     return-object p0
 .end method
 
 .method public static final getIntOrThrow(Landroid/content/res/TypedArray;I)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getIntOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -229,7 +231,7 @@
 .method public static final getIntegerOrThrow(Landroid/content/res/TypedArray;I)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getIntegerOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -247,7 +249,7 @@
 .method public static final getResourceIdOrThrow(Landroid/content/res/TypedArray;I)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getResourceIdOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -265,7 +267,7 @@
 .method public static final getStringOrThrow(Landroid/content/res/TypedArray;I)Ljava/lang/String;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getStringOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -298,7 +300,7 @@
 .method public static final getTextArrayOrThrow(Landroid/content/res/TypedArray;I)[Ljava/lang/CharSequence;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getTextArrayOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -318,7 +320,7 @@
 .method public static final getTextOrThrow(Landroid/content/res/TypedArray;I)Ljava/lang/CharSequence;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getTextOrThrow"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -363,7 +365,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$use"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/database/CursorKt.smali b/com.discord/smali/androidx/core/database/CursorKt.smali
index ad3fcc7972..f0f884b346 100644
--- a/com.discord/smali/androidx/core/database/CursorKt.smali
+++ b/com.discord/smali/androidx/core/database/CursorKt.smali
@@ -7,7 +7,7 @@
 .method public static final getBlobOrNull(Landroid/database/Cursor;I)[B
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getBlobOrNull"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -32,7 +32,7 @@
 .method public static final getDoubleOrNull(Landroid/database/Cursor;I)Ljava/lang/Double;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getDoubleOrNull"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -61,7 +61,7 @@
 .method public static final getFloatOrNull(Landroid/database/Cursor;I)Ljava/lang/Float;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getFloatOrNull"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -90,7 +90,7 @@
 .method public static final getIntOrNull(Landroid/database/Cursor;I)Ljava/lang/Integer;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getIntOrNull"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -119,7 +119,7 @@
 .method public static final getLongOrNull(Landroid/database/Cursor;I)Ljava/lang/Long;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getLongOrNull"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -148,7 +148,7 @@
 .method public static final getShortOrNull(Landroid/database/Cursor;I)Ljava/lang/Short;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getShortOrNull"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -177,7 +177,7 @@
 .method public static final getStringOrNull(Landroid/database/Cursor;I)Ljava/lang/String;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getStringOrNull"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/database/sqlite/SQLiteDatabaseKt.smali b/com.discord/smali/androidx/core/database/sqlite/SQLiteDatabaseKt.smali
index e668ea7226..f939b45b71 100644
--- a/com.discord/smali/androidx/core/database/sqlite/SQLiteDatabaseKt.smali
+++ b/com.discord/smali/androidx/core/database/sqlite/SQLiteDatabaseKt.smali
@@ -20,7 +20,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$transaction"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -71,7 +71,7 @@
     const/4 p1, 0x1
 
     :cond_0
-    const-string p3, "$receiver"
+    const-string p3, "$this$transaction"
 
     invoke-static {p0, p3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/BitmapKt.smali b/com.discord/smali/androidx/core/graphics/BitmapKt.smali
index fe2dfffc64..2396617d14 100644
--- a/com.discord/smali/androidx/core/graphics/BitmapKt.smali
+++ b/com.discord/smali/androidx/core/graphics/BitmapKt.smali
@@ -19,7 +19,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$applyCanvas"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -36,6 +36,110 @@
     return-object p0
 .end method
 
+.method public static final contains(Landroid/graphics/Bitmap;Landroid/graphics/Point;)Z
+    .locals 2
+
+    const-string v0, "$this$contains"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget v0, p1, Landroid/graphics/Point;->x:I
+
+    if-ltz v0, :cond_0
+
+    iget v0, p1, Landroid/graphics/Point;->x:I
+
+    invoke-virtual {p0}, Landroid/graphics/Bitmap;->getWidth()I
+
+    move-result v1
+
+    if-ge v0, v1, :cond_0
+
+    iget v0, p1, Landroid/graphics/Point;->y:I
+
+    if-ltz v0, :cond_0
+
+    iget p1, p1, Landroid/graphics/Point;->y:I
+
+    invoke-virtual {p0}, Landroid/graphics/Bitmap;->getHeight()I
+
+    move-result p0
+
+    if-ge p1, p0, :cond_0
+
+    const/4 p0, 0x1
+
+    return p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    return p0
+.end method
+
+.method public static final contains(Landroid/graphics/Bitmap;Landroid/graphics/PointF;)Z
+    .locals 3
+
+    const-string v0, "$this$contains"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget v0, p1, Landroid/graphics/PointF;->x:F
+
+    const/4 v1, 0x0
+
+    cmpl-float v0, v0, v1
+
+    if-ltz v0, :cond_0
+
+    iget v0, p1, Landroid/graphics/PointF;->x:F
+
+    invoke-virtual {p0}, Landroid/graphics/Bitmap;->getWidth()I
+
+    move-result v2
+
+    int-to-float v2, v2
+
+    cmpg-float v0, v0, v2
+
+    if-gez v0, :cond_0
+
+    iget v0, p1, Landroid/graphics/PointF;->y:F
+
+    cmpl-float v0, v0, v1
+
+    if-ltz v0, :cond_0
+
+    iget p1, p1, Landroid/graphics/PointF;->y:F
+
+    invoke-virtual {p0}, Landroid/graphics/Bitmap;->getHeight()I
+
+    move-result p0
+
+    int-to-float p0, p0
+
+    cmpg-float p0, p1, p0
+
+    if-gez p0, :cond_0
+
+    const/4 p0, 0x1
+
+    return p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    return p0
+.end method
+
 .method public static final createBitmap(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
     .locals 1
 
@@ -155,7 +259,7 @@
 .method public static final get(Landroid/graphics/Bitmap;II)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$get"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -169,7 +273,7 @@
 .method public static final scale(Landroid/graphics/Bitmap;IIZ)Landroid/graphics/Bitmap;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$scale"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -194,7 +298,7 @@
     const/4 p3, 0x1
 
     :cond_0
-    const-string p4, "$receiver"
+    const-string p4, "$this$scale"
 
     invoke-static {p0, p4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -212,7 +316,7 @@
 .method public static final set(Landroid/graphics/Bitmap;III)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$set"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/BlendModeColorFilterCompat.smali b/com.discord/smali/androidx/core/graphics/BlendModeColorFilterCompat.smali
new file mode 100644
index 0000000000..33697cb029
--- /dev/null
+++ b/com.discord/smali/androidx/core/graphics/BlendModeColorFilterCompat.smali
@@ -0,0 +1,56 @@
+.class public Landroidx/core/graphics/BlendModeColorFilterCompat;
+.super Ljava/lang/Object;
+.source "BlendModeColorFilterCompat.java"
+
+
+# direct methods
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static createBlendModeColorFilterCompat(ILandroidx/core/graphics/BlendModeCompat;)Landroid/graphics/ColorFilter;
+    .locals 3
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/4 v1, 0x0
+
+    const/16 v2, 0x1d
+
+    if-lt v0, v2, :cond_1
+
+    invoke-static {p1}, Landroidx/core/graphics/BlendModeUtils;->obtainBlendModeFromCompat(Landroidx/core/graphics/BlendModeCompat;)Landroid/graphics/BlendMode;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    new-instance v0, Landroid/graphics/BlendModeColorFilter;
+
+    invoke-direct {v0, p0, p1}, Landroid/graphics/BlendModeColorFilter;-><init>(ILandroid/graphics/BlendMode;)V
+
+    return-object v0
+
+    :cond_0
+    return-object v1
+
+    :cond_1
+    invoke-static {p1}, Landroidx/core/graphics/BlendModeUtils;->obtainPorterDuffFromCompat(Landroidx/core/graphics/BlendModeCompat;)Landroid/graphics/PorterDuff$Mode;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_2
+
+    new-instance v0, Landroid/graphics/PorterDuffColorFilter;
+
+    invoke-direct {v0, p0, p1}, Landroid/graphics/PorterDuffColorFilter;-><init>(ILandroid/graphics/PorterDuff$Mode;)V
+
+    return-object v0
+
+    :cond_2
+    return-object v1
+.end method
diff --git a/com.discord/smali/androidx/core/graphics/BlendModeCompat.smali b/com.discord/smali/androidx/core/graphics/BlendModeCompat.smali
new file mode 100644
index 0000000000..ec5e84eb59
--- /dev/null
+++ b/com.discord/smali/androidx/core/graphics/BlendModeCompat.smali
@@ -0,0 +1,568 @@
+.class public final enum Landroidx/core/graphics/BlendModeCompat;
+.super Ljava/lang/Enum;
+.source "BlendModeCompat.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Landroidx/core/graphics/BlendModeCompat;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final synthetic $VALUES:[Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum CLEAR:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum COLOR:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum COLOR_BURN:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum COLOR_DODGE:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum DARKEN:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum DIFFERENCE:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum DST:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum DST_ATOP:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum DST_IN:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum DST_OUT:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum DST_OVER:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum EXCLUSION:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum HARD_LIGHT:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum HUE:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum LIGHTEN:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum LUMINOSITY:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum MODULATE:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum MULTIPLY:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum OVERLAY:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum PLUS:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum SATURATION:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum SCREEN:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum SOFT_LIGHT:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum SRC:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum SRC_ATOP:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum SRC_IN:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum SRC_OUT:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum SRC_OVER:Landroidx/core/graphics/BlendModeCompat;
+
+.field public static final enum XOR:Landroidx/core/graphics/BlendModeCompat;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 16
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/4 v1, 0x0
+
+    const-string v2, "CLEAR"
+
+    invoke-direct {v0, v2, v1}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->CLEAR:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/4 v2, 0x1
+
+    const-string v3, "SRC"
+
+    invoke-direct {v0, v3, v2}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->SRC:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/4 v3, 0x2
+
+    const-string v4, "DST"
+
+    invoke-direct {v0, v4, v3}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->DST:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/4 v4, 0x3
+
+    const-string v5, "SRC_OVER"
+
+    invoke-direct {v0, v5, v4}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->SRC_OVER:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/4 v5, 0x4
+
+    const-string v6, "DST_OVER"
+
+    invoke-direct {v0, v6, v5}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->DST_OVER:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/4 v6, 0x5
+
+    const-string v7, "SRC_IN"
+
+    invoke-direct {v0, v7, v6}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->SRC_IN:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/4 v7, 0x6
+
+    const-string v8, "DST_IN"
+
+    invoke-direct {v0, v8, v7}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->DST_IN:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/4 v8, 0x7
+
+    const-string v9, "SRC_OUT"
+
+    invoke-direct {v0, v9, v8}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->SRC_OUT:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v9, 0x8
+
+    const-string v10, "DST_OUT"
+
+    invoke-direct {v0, v10, v9}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->DST_OUT:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v10, 0x9
+
+    const-string v11, "SRC_ATOP"
+
+    invoke-direct {v0, v11, v10}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->SRC_ATOP:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v11, 0xa
+
+    const-string v12, "DST_ATOP"
+
+    invoke-direct {v0, v12, v11}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->DST_ATOP:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v12, 0xb
+
+    const-string v13, "XOR"
+
+    invoke-direct {v0, v13, v12}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->XOR:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v13, 0xc
+
+    const-string v14, "PLUS"
+
+    invoke-direct {v0, v14, v13}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->PLUS:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v14, 0xd
+
+    const-string v15, "MODULATE"
+
+    invoke-direct {v0, v15, v14}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->MODULATE:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v15, 0xe
+
+    const-string v14, "SCREEN"
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->SCREEN:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "OVERLAY"
+
+    const/16 v15, 0xf
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->OVERLAY:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "DARKEN"
+
+    const/16 v15, 0x10
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->DARKEN:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "LIGHTEN"
+
+    const/16 v15, 0x11
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->LIGHTEN:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "COLOR_DODGE"
+
+    const/16 v15, 0x12
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->COLOR_DODGE:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "COLOR_BURN"
+
+    const/16 v15, 0x13
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->COLOR_BURN:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "HARD_LIGHT"
+
+    const/16 v15, 0x14
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->HARD_LIGHT:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "SOFT_LIGHT"
+
+    const/16 v15, 0x15
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->SOFT_LIGHT:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "DIFFERENCE"
+
+    const/16 v15, 0x16
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->DIFFERENCE:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "EXCLUSION"
+
+    const/16 v15, 0x17
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->EXCLUSION:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "MULTIPLY"
+
+    const/16 v15, 0x18
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->MULTIPLY:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "HUE"
+
+    const/16 v15, 0x19
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->HUE:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "SATURATION"
+
+    const/16 v15, 0x1a
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->SATURATION:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "COLOR"
+
+    const/16 v15, 0x1b
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->COLOR:Landroidx/core/graphics/BlendModeCompat;
+
+    new-instance v0, Landroidx/core/graphics/BlendModeCompat;
+
+    const-string v14, "LUMINOSITY"
+
+    const/16 v15, 0x1c
+
+    invoke-direct {v0, v14, v15}, Landroidx/core/graphics/BlendModeCompat;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->LUMINOSITY:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v0, 0x1d
+
+    new-array v0, v0, [Landroidx/core/graphics/BlendModeCompat;
+
+    sget-object v14, Landroidx/core/graphics/BlendModeCompat;->CLEAR:Landroidx/core/graphics/BlendModeCompat;
+
+    aput-object v14, v0, v1
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SRC:Landroidx/core/graphics/BlendModeCompat;
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DST:Landroidx/core/graphics/BlendModeCompat;
+
+    aput-object v1, v0, v3
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SRC_OVER:Landroidx/core/graphics/BlendModeCompat;
+
+    aput-object v1, v0, v4
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DST_OVER:Landroidx/core/graphics/BlendModeCompat;
+
+    aput-object v1, v0, v5
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SRC_IN:Landroidx/core/graphics/BlendModeCompat;
+
+    aput-object v1, v0, v6
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DST_IN:Landroidx/core/graphics/BlendModeCompat;
+
+    aput-object v1, v0, v7
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SRC_OUT:Landroidx/core/graphics/BlendModeCompat;
+
+    aput-object v1, v0, v8
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DST_OUT:Landroidx/core/graphics/BlendModeCompat;
+
+    aput-object v1, v0, v9
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SRC_ATOP:Landroidx/core/graphics/BlendModeCompat;
+
+    aput-object v1, v0, v10
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DST_ATOP:Landroidx/core/graphics/BlendModeCompat;
+
+    aput-object v1, v0, v11
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->XOR:Landroidx/core/graphics/BlendModeCompat;
+
+    aput-object v1, v0, v12
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->PLUS:Landroidx/core/graphics/BlendModeCompat;
+
+    aput-object v1, v0, v13
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->MODULATE:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0xd
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SCREEN:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0xe
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->OVERLAY:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0xf
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DARKEN:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0x10
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->LIGHTEN:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0x11
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->COLOR_DODGE:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0x12
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->COLOR_BURN:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0x13
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->HARD_LIGHT:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0x14
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SOFT_LIGHT:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0x15
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DIFFERENCE:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0x16
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->EXCLUSION:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0x17
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->MULTIPLY:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0x18
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->HUE:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0x19
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SATURATION:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0x1a
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->COLOR:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0x1b
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->LUMINOSITY:Landroidx/core/graphics/BlendModeCompat;
+
+    const/16 v2, 0x1c
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Landroidx/core/graphics/BlendModeCompat;->$VALUES:[Landroidx/core/graphics/BlendModeCompat;
+
+    return-void
+.end method
+
+.method private 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;)Landroidx/core/graphics/BlendModeCompat;
+    .locals 1
+
+    const-class v0, Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Landroidx/core/graphics/BlendModeCompat;
+
+    return-object p0
+.end method
+
+.method public static values()[Landroidx/core/graphics/BlendModeCompat;
+    .locals 1
+
+    sget-object v0, Landroidx/core/graphics/BlendModeCompat;->$VALUES:[Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v0}, [Landroidx/core/graphics/BlendModeCompat;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Landroidx/core/graphics/BlendModeCompat;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/androidx/core/graphics/BlendModeUtils$1.smali b/com.discord/smali/androidx/core/graphics/BlendModeUtils$1.smali
new file mode 100644
index 0000000000..2a713f5217
--- /dev/null
+++ b/com.discord/smali/androidx/core/graphics/BlendModeUtils$1.smali
@@ -0,0 +1,500 @@
+.class synthetic Landroidx/core/graphics/BlendModeUtils$1;
+.super Ljava/lang/Object;
+.source "BlendModeUtils.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Landroidx/core/graphics/BlendModeUtils;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1008
+    name = null
+.end annotation
+
+
+# static fields
+.field static final synthetic $SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 3
+
+    invoke-static {}, Landroidx/core/graphics/BlendModeCompat;->values()[Landroidx/core/graphics/BlendModeCompat;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    :try_start_0
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->CLEAR:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    aput v2, v0, v1
+    :try_end_0
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    :try_start_1
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SRC:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x2
+
+    aput v2, v0, v1
+    :try_end_1
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_1 .. :try_end_1} :catch_1
+
+    :catch_1
+    :try_start_2
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DST:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x3
+
+    aput v2, v0, v1
+    :try_end_2
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_2 .. :try_end_2} :catch_2
+
+    :catch_2
+    :try_start_3
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SRC_OVER:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x4
+
+    aput v2, v0, v1
+    :try_end_3
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_3 .. :try_end_3} :catch_3
+
+    :catch_3
+    :try_start_4
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DST_OVER:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x5
+
+    aput v2, v0, v1
+    :try_end_4
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_4 .. :try_end_4} :catch_4
+
+    :catch_4
+    :try_start_5
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SRC_IN:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x6
+
+    aput v2, v0, v1
+    :try_end_5
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_5 .. :try_end_5} :catch_5
+
+    :catch_5
+    :try_start_6
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DST_IN:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x7
+
+    aput v2, v0, v1
+    :try_end_6
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_6 .. :try_end_6} :catch_6
+
+    :catch_6
+    :try_start_7
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SRC_OUT:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x8
+
+    aput v2, v0, v1
+    :try_end_7
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_7 .. :try_end_7} :catch_7
+
+    :catch_7
+    :try_start_8
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DST_OUT:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x9
+
+    aput v2, v0, v1
+    :try_end_8
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_8 .. :try_end_8} :catch_8
+
+    :catch_8
+    :try_start_9
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SRC_ATOP:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0xa
+
+    aput v2, v0, v1
+    :try_end_9
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_9 .. :try_end_9} :catch_9
+
+    :catch_9
+    :try_start_a
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DST_ATOP:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0xb
+
+    aput v2, v0, v1
+    :try_end_a
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_a .. :try_end_a} :catch_a
+
+    :catch_a
+    :try_start_b
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->XOR:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0xc
+
+    aput v2, v0, v1
+    :try_end_b
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_b .. :try_end_b} :catch_b
+
+    :catch_b
+    :try_start_c
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->PLUS:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0xd
+
+    aput v2, v0, v1
+    :try_end_c
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_c .. :try_end_c} :catch_c
+
+    :catch_c
+    :try_start_d
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->MODULATE:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0xe
+
+    aput v2, v0, v1
+    :try_end_d
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_d .. :try_end_d} :catch_d
+
+    :catch_d
+    :try_start_e
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SCREEN:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0xf
+
+    aput v2, v0, v1
+    :try_end_e
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_e .. :try_end_e} :catch_e
+
+    :catch_e
+    :try_start_f
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->OVERLAY:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x10
+
+    aput v2, v0, v1
+    :try_end_f
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_f .. :try_end_f} :catch_f
+
+    :catch_f
+    :try_start_10
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DARKEN:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x11
+
+    aput v2, v0, v1
+    :try_end_10
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_10 .. :try_end_10} :catch_10
+
+    :catch_10
+    :try_start_11
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->LIGHTEN:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x12
+
+    aput v2, v0, v1
+    :try_end_11
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_11 .. :try_end_11} :catch_11
+
+    :catch_11
+    :try_start_12
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->COLOR_DODGE:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x13
+
+    aput v2, v0, v1
+    :try_end_12
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_12 .. :try_end_12} :catch_12
+
+    :catch_12
+    :try_start_13
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->COLOR_BURN:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x14
+
+    aput v2, v0, v1
+    :try_end_13
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_13 .. :try_end_13} :catch_13
+
+    :catch_13
+    :try_start_14
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->HARD_LIGHT:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x15
+
+    aput v2, v0, v1
+    :try_end_14
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_14 .. :try_end_14} :catch_14
+
+    :catch_14
+    :try_start_15
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SOFT_LIGHT:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x16
+
+    aput v2, v0, v1
+    :try_end_15
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_15 .. :try_end_15} :catch_15
+
+    :catch_15
+    :try_start_16
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->DIFFERENCE:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x17
+
+    aput v2, v0, v1
+    :try_end_16
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_16 .. :try_end_16} :catch_16
+
+    :catch_16
+    :try_start_17
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->EXCLUSION:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x18
+
+    aput v2, v0, v1
+    :try_end_17
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_17 .. :try_end_17} :catch_17
+
+    :catch_17
+    :try_start_18
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->MULTIPLY:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x19
+
+    aput v2, v0, v1
+    :try_end_18
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_18 .. :try_end_18} :catch_18
+
+    :catch_18
+    :try_start_19
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->HUE:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x1a
+
+    aput v2, v0, v1
+    :try_end_19
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_19 .. :try_end_19} :catch_19
+
+    :catch_19
+    :try_start_1a
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->SATURATION:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x1b
+
+    aput v2, v0, v1
+    :try_end_1a
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_1a .. :try_end_1a} :catch_1a
+
+    :catch_1a
+    :try_start_1b
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->COLOR:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x1c
+
+    aput v2, v0, v1
+    :try_end_1b
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_1b .. :try_end_1b} :catch_1b
+
+    :catch_1b
+    :try_start_1c
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    sget-object v1, Landroidx/core/graphics/BlendModeCompat;->LUMINOSITY:Landroidx/core/graphics/BlendModeCompat;
+
+    invoke-virtual {v1}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result v1
+
+    const/16 v2, 0x1d
+
+    aput v2, v0, v1
+    :try_end_1c
+    .catch Ljava/lang/NoSuchFieldError; {:try_start_1c .. :try_end_1c} :catch_1c
+
+    :catch_1c
+    return-void
+.end method
diff --git a/com.discord/smali/androidx/core/graphics/BlendModeUtils.smali b/com.discord/smali/androidx/core/graphics/BlendModeUtils.smali
new file mode 100644
index 0000000000..1de8525dfd
--- /dev/null
+++ b/com.discord/smali/androidx/core/graphics/BlendModeUtils.smali
@@ -0,0 +1,344 @@
+.class Landroidx/core/graphics/BlendModeUtils;
+.super Ljava/lang/Object;
+.source "BlendModeUtils.java"
+
+
+# direct methods
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method static obtainBlendModeFromCompat(Landroidx/core/graphics/BlendModeCompat;)Landroid/graphics/BlendMode;
+    .locals 1
+
+    sget-object v0, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    invoke-virtual {p0}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result p0
+
+    aget p0, v0, p0
+
+    packed-switch p0, :pswitch_data_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :pswitch_0
+    sget-object p0, Landroid/graphics/BlendMode;->LUMINOSITY:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_1
+    sget-object p0, Landroid/graphics/BlendMode;->COLOR:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_2
+    sget-object p0, Landroid/graphics/BlendMode;->SATURATION:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_3
+    sget-object p0, Landroid/graphics/BlendMode;->HUE:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_4
+    sget-object p0, Landroid/graphics/BlendMode;->MULTIPLY:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_5
+    sget-object p0, Landroid/graphics/BlendMode;->EXCLUSION:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_6
+    sget-object p0, Landroid/graphics/BlendMode;->DIFFERENCE:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_7
+    sget-object p0, Landroid/graphics/BlendMode;->SOFT_LIGHT:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_8
+    sget-object p0, Landroid/graphics/BlendMode;->HARD_LIGHT:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_9
+    sget-object p0, Landroid/graphics/BlendMode;->COLOR_BURN:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_a
+    sget-object p0, Landroid/graphics/BlendMode;->COLOR_DODGE:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_b
+    sget-object p0, Landroid/graphics/BlendMode;->LIGHTEN:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_c
+    sget-object p0, Landroid/graphics/BlendMode;->DARKEN:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_d
+    sget-object p0, Landroid/graphics/BlendMode;->OVERLAY:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_e
+    sget-object p0, Landroid/graphics/BlendMode;->SCREEN:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_f
+    sget-object p0, Landroid/graphics/BlendMode;->MODULATE:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_10
+    sget-object p0, Landroid/graphics/BlendMode;->PLUS:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_11
+    sget-object p0, Landroid/graphics/BlendMode;->XOR:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_12
+    sget-object p0, Landroid/graphics/BlendMode;->DST_ATOP:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_13
+    sget-object p0, Landroid/graphics/BlendMode;->SRC_ATOP:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_14
+    sget-object p0, Landroid/graphics/BlendMode;->DST_OUT:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_15
+    sget-object p0, Landroid/graphics/BlendMode;->SRC_OUT:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_16
+    sget-object p0, Landroid/graphics/BlendMode;->DST_IN:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_17
+    sget-object p0, Landroid/graphics/BlendMode;->SRC_IN:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_18
+    sget-object p0, Landroid/graphics/BlendMode;->DST_OVER:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_19
+    sget-object p0, Landroid/graphics/BlendMode;->SRC_OVER:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_1a
+    sget-object p0, Landroid/graphics/BlendMode;->DST:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_1b
+    sget-object p0, Landroid/graphics/BlendMode;->SRC:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_1c
+    sget-object p0, Landroid/graphics/BlendMode;->CLEAR:Landroid/graphics/BlendMode;
+
+    return-object p0
+
+    :pswitch_data_0
+    .packed-switch 0x1
+        :pswitch_1c
+        :pswitch_1b
+        :pswitch_1a
+        :pswitch_19
+        :pswitch_18
+        :pswitch_17
+        :pswitch_16
+        :pswitch_15
+        :pswitch_14
+        :pswitch_13
+        :pswitch_12
+        :pswitch_11
+        :pswitch_10
+        :pswitch_f
+        :pswitch_e
+        :pswitch_d
+        :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
+
+.method static obtainPorterDuffFromCompat(Landroidx/core/graphics/BlendModeCompat;)Landroid/graphics/PorterDuff$Mode;
+    .locals 2
+
+    const/4 v0, 0x0
+
+    if-eqz p0, :cond_0
+
+    sget-object v1, Landroidx/core/graphics/BlendModeUtils$1;->$SwitchMap$androidx$core$graphics$BlendModeCompat:[I
+
+    invoke-virtual {p0}, Landroidx/core/graphics/BlendModeCompat;->ordinal()I
+
+    move-result p0
+
+    aget p0, v1, p0
+
+    packed-switch p0, :pswitch_data_0
+
+    return-object v0
+
+    :pswitch_0
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->LIGHTEN:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_1
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->DARKEN:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_2
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->OVERLAY:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_3
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->SCREEN:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_4
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->MULTIPLY:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_5
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->ADD:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_6
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->XOR:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_7
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->DST_ATOP:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_8
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->SRC_ATOP:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_9
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->DST_OUT:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_a
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->SRC_OUT:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_b
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->DST_IN:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_c
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->SRC_IN:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_d
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->DST_OVER:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_e
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->SRC_OVER:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_f
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->DST:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_10
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->SRC:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :pswitch_11
+    sget-object p0, Landroid/graphics/PorterDuff$Mode;->CLEAR:Landroid/graphics/PorterDuff$Mode;
+
+    return-object p0
+
+    :cond_0
+    return-object v0
+
+    :pswitch_data_0
+    .packed-switch 0x1
+        :pswitch_11
+        :pswitch_10
+        :pswitch_f
+        :pswitch_e
+        :pswitch_d
+        :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/androidx/core/graphics/CanvasKt.smali b/com.discord/smali/androidx/core/graphics/CanvasKt.smali
index c5374ed2f0..7dcb797f0e 100644
--- a/com.discord/smali/androidx/core/graphics/CanvasKt.smali
+++ b/com.discord/smali/androidx/core/graphics/CanvasKt.smali
@@ -4,6 +4,248 @@
 
 
 # direct methods
+.method public static final withClip(Landroid/graphics/Canvas;FFFFLkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/graphics/Canvas;",
+            "FFFF",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Landroid/graphics/Canvas;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "$this$withClip"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p5, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
+
+    move-result v0
+
+    invoke-virtual {p0, p1, p2, p3, p4}, Landroid/graphics/Canvas;->clipRect(FFFF)Z
+
+    :try_start_0
+    invoke-interface {p5, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
+
+    throw p1
+.end method
+
+.method public static final withClip(Landroid/graphics/Canvas;IIIILkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/graphics/Canvas;",
+            "IIII",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Landroid/graphics/Canvas;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "$this$withClip"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p5, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
+
+    move-result v0
+
+    invoke-virtual {p0, p1, p2, p3, p4}, Landroid/graphics/Canvas;->clipRect(IIII)Z
+
+    :try_start_0
+    invoke-interface {p5, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
+
+    throw p1
+.end method
+
+.method public static final withClip(Landroid/graphics/Canvas;Landroid/graphics/Path;Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/graphics/Canvas;",
+            "Landroid/graphics/Path;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Landroid/graphics/Canvas;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "$this$withClip"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clipPath"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
+
+    move-result v0
+
+    invoke-virtual {p0, p1}, Landroid/graphics/Canvas;->clipPath(Landroid/graphics/Path;)Z
+
+    :try_start_0
+    invoke-interface {p2, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
+
+    throw p1
+.end method
+
+.method public static final withClip(Landroid/graphics/Canvas;Landroid/graphics/Rect;Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/graphics/Canvas;",
+            "Landroid/graphics/Rect;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Landroid/graphics/Canvas;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "$this$withClip"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clipRect"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
+
+    move-result v0
+
+    invoke-virtual {p0, p1}, Landroid/graphics/Canvas;->clipRect(Landroid/graphics/Rect;)Z
+
+    :try_start_0
+    invoke-interface {p2, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
+
+    throw p1
+.end method
+
+.method public static final withClip(Landroid/graphics/Canvas;Landroid/graphics/RectF;Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/graphics/Canvas;",
+            "Landroid/graphics/RectF;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Landroid/graphics/Canvas;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "$this$withClip"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clipRect"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
+
+    move-result v0
+
+    invoke-virtual {p0, p1}, Landroid/graphics/Canvas;->clipRect(Landroid/graphics/RectF;)Z
+
+    :try_start_0
+    invoke-interface {p2, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
+
+    throw p1
+.end method
+
 .method public static final withMatrix(Landroid/graphics/Canvas;Landroid/graphics/Matrix;Lkotlin/jvm/functions/Function1;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -19,7 +261,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$withMatrix"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -66,7 +308,7 @@
     invoke-direct {p1}, Landroid/graphics/Matrix;-><init>()V
 
     :cond_0
-    const-string p3, "$receiver"
+    const-string p3, "$this$withMatrix"
 
     invoke-static {p0, p3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -116,7 +358,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$withRotation"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -173,7 +415,7 @@
     const/4 p3, 0x0
 
     :cond_2
-    const-string p5, "$receiver"
+    const-string p5, "$this$withRotation"
 
     invoke-static {p0, p5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -218,7 +460,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$withSave"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -262,7 +504,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$withScale"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -328,7 +570,7 @@
     const/4 p4, 0x0
 
     :cond_3
-    const-string p6, "$receiver"
+    const-string p6, "$this$withScale"
 
     invoke-static {p0, p6}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -374,7 +616,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$withSkew"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -424,7 +666,7 @@
     const/4 p2, 0x0
 
     :cond_1
-    const-string p4, "$receiver"
+    const-string p4, "$this$withSkew"
 
     invoke-static {p0, p4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -470,7 +712,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$withTranslation"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -520,7 +762,7 @@
     const/4 p2, 0x0
 
     :cond_1
-    const-string p4, "$receiver"
+    const-string p4, "$this$withTranslation"
 
     invoke-static {p0, p4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/ColorKt.smali b/com.discord/smali/androidx/core/graphics/ColorKt.smali
index 97643fa078..916bf4f447 100644
--- a/com.discord/smali/androidx/core/graphics/ColorKt.smali
+++ b/com.discord/smali/androidx/core/graphics/ColorKt.smali
@@ -17,7 +17,7 @@
 .method public static final component1(Landroid/graphics/Color;)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component1"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -53,7 +53,7 @@
 .method public static final component2(Landroid/graphics/Color;)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component2"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -89,7 +89,7 @@
 .method public static final component3(Landroid/graphics/Color;)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component3"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -125,7 +125,7 @@
 .method public static final component4(Landroid/graphics/Color;)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component4"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -146,6 +146,110 @@
     return p0
 .end method
 
+.method public static final convertTo(ILandroid/graphics/ColorSpace$Named;)J
+    .locals 1
+
+    const-string v0, "colorSpace"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Landroid/graphics/ColorSpace;->get(Landroid/graphics/ColorSpace$Named;)Landroid/graphics/ColorSpace;
+
+    move-result-object p1
+
+    invoke-static {p0, p1}, Landroid/graphics/Color;->convert(ILandroid/graphics/ColorSpace;)J
+
+    move-result-wide p0
+
+    return-wide p0
+.end method
+
+.method public static final convertTo(ILandroid/graphics/ColorSpace;)J
+    .locals 1
+
+    const-string v0, "colorSpace"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public static final convertTo(JLandroid/graphics/ColorSpace$Named;)J
+    .locals 1
+
+    const-string v0, "colorSpace"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2}, Landroid/graphics/ColorSpace;->get(Landroid/graphics/ColorSpace$Named;)Landroid/graphics/ColorSpace;
+
+    move-result-object p2
+
+    invoke-static {p0, p1, p2}, Landroid/graphics/Color;->convert(JLandroid/graphics/ColorSpace;)J
+
+    move-result-wide p0
+
+    return-wide p0
+.end method
+
+.method public static final convertTo(JLandroid/graphics/ColorSpace;)J
+    .locals 1
+
+    const-string v0, "colorSpace"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public static final convertTo(Landroid/graphics/Color;Landroid/graphics/ColorSpace$Named;)Landroid/graphics/Color;
+    .locals 1
+
+    const-string v0, "$this$convertTo"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "colorSpace"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Landroid/graphics/ColorSpace;->get(Landroid/graphics/ColorSpace$Named;)Landroid/graphics/ColorSpace;
+
+    move-result-object p1
+
+    invoke-virtual {p0, p1}, Landroid/graphics/Color;->convert(Landroid/graphics/ColorSpace;)Landroid/graphics/Color;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final convertTo(Landroid/graphics/Color;Landroid/graphics/ColorSpace;)Landroid/graphics/Color;
+    .locals 1
+
+    const-string v0, "$this$convertTo"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "colorSpace"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1}, Landroid/graphics/Color;->convert(Landroid/graphics/ColorSpace;)Landroid/graphics/Color;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
 .method public static final getAlpha(J)F
     .locals 0
 
@@ -281,7 +385,7 @@
 .method public static final plus(Landroid/graphics/Color;Landroid/graphics/Color;)Landroid/graphics/Color;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -341,7 +445,7 @@
 .method public static final toColorInt(Ljava/lang/String;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toColorInt"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/ImageDecoderKt.smali b/com.discord/smali/androidx/core/graphics/ImageDecoderKt.smali
index b3b2b44e66..4419088b70 100644
--- a/com.discord/smali/androidx/core/graphics/ImageDecoderKt.smali
+++ b/com.discord/smali/androidx/core/graphics/ImageDecoderKt.smali
@@ -23,7 +23,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$decodeBitmap"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -67,7 +67,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$decodeDrawable"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/Insets.smali b/com.discord/smali/androidx/core/graphics/Insets.smali
new file mode 100644
index 0000000000..2ec32564e0
--- /dev/null
+++ b/com.discord/smali/androidx/core/graphics/Insets.smali
@@ -0,0 +1,256 @@
+.class public final Landroidx/core/graphics/Insets;
+.super Ljava/lang/Object;
+.source "Insets.java"
+
+
+# static fields
+.field public static final NONE:Landroidx/core/graphics/Insets;
+
+
+# instance fields
+.field public final bottom:I
+
+.field public final left:I
+
+.field public final right:I
+
+.field public final top:I
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Landroidx/core/graphics/Insets;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1, v1, v1, v1}, Landroidx/core/graphics/Insets;-><init>(IIII)V
+
+    sput-object v0, Landroidx/core/graphics/Insets;->NONE:Landroidx/core/graphics/Insets;
+
+    return-void
+.end method
+
+.method private constructor <init>(IIII)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Landroidx/core/graphics/Insets;->left:I
+
+    iput p2, p0, Landroidx/core/graphics/Insets;->top:I
+
+    iput p3, p0, Landroidx/core/graphics/Insets;->right:I
+
+    iput p4, p0, Landroidx/core/graphics/Insets;->bottom:I
+
+    return-void
+.end method
+
+.method public static of(IIII)Landroidx/core/graphics/Insets;
+    .locals 1
+
+    if-nez p0, :cond_0
+
+    if-nez p1, :cond_0
+
+    if-nez p2, :cond_0
+
+    if-nez p3, :cond_0
+
+    sget-object p0, Landroidx/core/graphics/Insets;->NONE:Landroidx/core/graphics/Insets;
+
+    return-object p0
+
+    :cond_0
+    new-instance v0, Landroidx/core/graphics/Insets;
+
+    invoke-direct {v0, p0, p1, p2, p3}, Landroidx/core/graphics/Insets;-><init>(IIII)V
+
+    return-object v0
+.end method
+
+.method public static of(Landroid/graphics/Rect;)Landroidx/core/graphics/Insets;
+    .locals 3
+
+    iget v0, p0, Landroid/graphics/Rect;->left:I
+
+    iget v1, p0, Landroid/graphics/Rect;->top:I
+
+    iget v2, p0, Landroid/graphics/Rect;->right:I
+
+    iget p0, p0, Landroid/graphics/Rect;->bottom:I
+
+    invoke-static {v0, v1, v2, p0}, Landroidx/core/graphics/Insets;->of(IIII)Landroidx/core/graphics/Insets;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static wrap(Landroid/graphics/Insets;)Landroidx/core/graphics/Insets;
+    .locals 3
+
+    iget v0, p0, Landroid/graphics/Insets;->left:I
+
+    iget v1, p0, Landroid/graphics/Insets;->top:I
+
+    iget v2, p0, Landroid/graphics/Insets;->right:I
+
+    iget p0, p0, Landroid/graphics/Insets;->bottom:I
+
+    invoke-static {v0, v1, v2, p0}, Landroidx/core/graphics/Insets;->of(IIII)Landroidx/core/graphics/Insets;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-ne p0, p1, :cond_0
+
+    return v0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    if-eqz p1, :cond_6
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v3
+
+    if-eq v2, v3, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    check-cast p1, Landroidx/core/graphics/Insets;
+
+    iget v2, p0, Landroidx/core/graphics/Insets;->bottom:I
+
+    iget v3, p1, Landroidx/core/graphics/Insets;->bottom:I
+
+    if-eq v2, v3, :cond_2
+
+    return v1
+
+    :cond_2
+    iget v2, p0, Landroidx/core/graphics/Insets;->left:I
+
+    iget v3, p1, Landroidx/core/graphics/Insets;->left:I
+
+    if-eq v2, v3, :cond_3
+
+    return v1
+
+    :cond_3
+    iget v2, p0, Landroidx/core/graphics/Insets;->right:I
+
+    iget v3, p1, Landroidx/core/graphics/Insets;->right:I
+
+    if-eq v2, v3, :cond_4
+
+    return v1
+
+    :cond_4
+    iget v2, p0, Landroidx/core/graphics/Insets;->top:I
+
+    iget p1, p1, Landroidx/core/graphics/Insets;->top:I
+
+    if-eq v2, p1, :cond_5
+
+    return v1
+
+    :cond_5
+    return v0
+
+    :cond_6
+    :goto_0
+    return v1
+.end method
+
+.method public final hashCode()I
+    .locals 2
+
+    iget v0, p0, Landroidx/core/graphics/Insets;->left:I
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget v1, p0, Landroidx/core/graphics/Insets;->top:I
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget v1, p0, Landroidx/core/graphics/Insets;->right:I
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget v1, p0, Landroidx/core/graphics/Insets;->bottom:I
+
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "Insets{left="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget v1, p0, Landroidx/core/graphics/Insets;->left:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v1, ", top="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Landroidx/core/graphics/Insets;->top:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v1, ", right="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Landroidx/core/graphics/Insets;->right:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v1, ", bottom="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Landroidx/core/graphics/Insets;->bottom:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)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/androidx/core/graphics/MatrixKt.smali b/com.discord/smali/androidx/core/graphics/MatrixKt.smali
index 3fd210e60b..51dd3e1e43 100644
--- a/com.discord/smali/androidx/core/graphics/MatrixKt.smali
+++ b/com.discord/smali/androidx/core/graphics/MatrixKt.smali
@@ -83,7 +83,7 @@
 .method public static final times(Landroid/graphics/Matrix;Landroid/graphics/Matrix;)Landroid/graphics/Matrix;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$times"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -141,7 +141,7 @@
 .method public static final values(Landroid/graphics/Matrix;)[F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$values"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/PaintCompat.smali b/com.discord/smali/androidx/core/graphics/PaintCompat.smali
index 182cc140d4..480e07c7fa 100644
--- a/com.discord/smali/androidx/core/graphics/PaintCompat.smali
+++ b/com.discord/smali/androidx/core/graphics/PaintCompat.smali
@@ -259,3 +259,58 @@
     :goto_0
     return-object v0
 .end method
+
+.method public static setBlendMode(Landroid/graphics/Paint;Landroidx/core/graphics/BlendModeCompat;)Z
+    .locals 4
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    const/16 v3, 0x1d
+
+    if-lt v0, v3, :cond_1
+
+    if-eqz p1, :cond_0
+
+    invoke-static {p1}, Landroidx/core/graphics/BlendModeUtils;->obtainBlendModeFromCompat(Landroidx/core/graphics/BlendModeCompat;)Landroid/graphics/BlendMode;
+
+    move-result-object v2
+
+    :cond_0
+    invoke-virtual {p0, v2}, Landroid/graphics/Paint;->setBlendMode(Landroid/graphics/BlendMode;)V
+
+    return v1
+
+    :cond_1
+    if-eqz p1, :cond_4
+
+    invoke-static {p1}, Landroidx/core/graphics/BlendModeUtils;->obtainPorterDuffFromCompat(Landroidx/core/graphics/BlendModeCompat;)Landroid/graphics/PorterDuff$Mode;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_2
+
+    new-instance v2, Landroid/graphics/PorterDuffXfermode;
+
+    invoke-direct {v2, p1}, Landroid/graphics/PorterDuffXfermode;-><init>(Landroid/graphics/PorterDuff$Mode;)V
+
+    :cond_2
+    invoke-virtual {p0, v2}, Landroid/graphics/Paint;->setXfermode(Landroid/graphics/Xfermode;)Landroid/graphics/Xfermode;
+
+    if-eqz p1, :cond_3
+
+    return v1
+
+    :cond_3
+    const/4 p0, 0x0
+
+    return p0
+
+    :cond_4
+    invoke-virtual {p0, v2}, Landroid/graphics/Paint;->setXfermode(Landroid/graphics/Xfermode;)Landroid/graphics/Xfermode;
+
+    return v1
+.end method
diff --git a/com.discord/smali/androidx/core/graphics/PathKt.smali b/com.discord/smali/androidx/core/graphics/PathKt.smali
index 653628af83..987aeb79d1 100644
--- a/com.discord/smali/androidx/core/graphics/PathKt.smali
+++ b/com.discord/smali/androidx/core/graphics/PathKt.smali
@@ -7,7 +7,7 @@
 .method public static final and(Landroid/graphics/Path;Landroid/graphics/Path;)Landroid/graphics/Path;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$and"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -39,7 +39,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$flatten"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -76,7 +76,7 @@
 .method public static final minus(Landroid/graphics/Path;Landroid/graphics/Path;)Landroid/graphics/Path;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -98,7 +98,7 @@
 .method public static final or(Landroid/graphics/Path;Landroid/graphics/Path;)Landroid/graphics/Path;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$or"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -120,7 +120,7 @@
 .method public static final plus(Landroid/graphics/Path;Landroid/graphics/Path;)Landroid/graphics/Path;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -142,7 +142,7 @@
 .method public static final xor(Landroid/graphics/Path;Landroid/graphics/Path;)Landroid/graphics/Path;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$xor"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/PictureKt.smali b/com.discord/smali/androidx/core/graphics/PictureKt.smali
index e826ae258b..b062021e4f 100644
--- a/com.discord/smali/androidx/core/graphics/PictureKt.smali
+++ b/com.discord/smali/androidx/core/graphics/PictureKt.smali
@@ -20,7 +20,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$record"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/PointKt.smali b/com.discord/smali/androidx/core/graphics/PointKt.smali
index abe7adf8d8..5cdf1112d8 100644
--- a/com.discord/smali/androidx/core/graphics/PointKt.smali
+++ b/com.discord/smali/androidx/core/graphics/PointKt.smali
@@ -7,7 +7,7 @@
 .method public static final component1(Landroid/graphics/PointF;)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component1"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -19,7 +19,7 @@
 .method public static final component1(Landroid/graphics/Point;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component1"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -31,7 +31,7 @@
 .method public static final component2(Landroid/graphics/PointF;)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component2"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -43,7 +43,7 @@
 .method public static final component2(Landroid/graphics/Point;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component2"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -55,7 +55,7 @@
 .method public static final minus(Landroid/graphics/Point;I)Landroid/graphics/Point;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -77,7 +77,7 @@
 .method public static final minus(Landroid/graphics/Point;Landroid/graphics/Point;)Landroid/graphics/Point;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -109,7 +109,7 @@
 .method public static final minus(Landroid/graphics/PointF;F)Landroid/graphics/PointF;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -131,7 +131,7 @@
 .method public static final minus(Landroid/graphics/PointF;Landroid/graphics/PointF;)Landroid/graphics/PointF;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -163,7 +163,7 @@
 .method public static final plus(Landroid/graphics/Point;I)Landroid/graphics/Point;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -183,7 +183,7 @@
 .method public static final plus(Landroid/graphics/Point;Landroid/graphics/Point;)Landroid/graphics/Point;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -211,7 +211,7 @@
 .method public static final plus(Landroid/graphics/PointF;F)Landroid/graphics/PointF;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -231,7 +231,7 @@
 .method public static final plus(Landroid/graphics/PointF;Landroid/graphics/PointF;)Landroid/graphics/PointF;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -259,7 +259,7 @@
 .method public static final toPoint(Landroid/graphics/PointF;)Landroid/graphics/Point;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toPoint"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -281,7 +281,7 @@
 .method public static final toPointF(Landroid/graphics/Point;)Landroid/graphics/PointF;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toPointF"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -295,7 +295,7 @@
 .method public static final unaryMinus(Landroid/graphics/Point;)Landroid/graphics/Point;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$unaryMinus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -317,7 +317,7 @@
 .method public static final unaryMinus(Landroid/graphics/PointF;)Landroid/graphics/PointF;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$unaryMinus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/PorterDuffKt.smali b/com.discord/smali/androidx/core/graphics/PorterDuffKt.smali
index e0c5f4fc76..264f09f284 100644
--- a/com.discord/smali/androidx/core/graphics/PorterDuffKt.smali
+++ b/com.discord/smali/androidx/core/graphics/PorterDuffKt.smali
@@ -7,7 +7,7 @@
 .method public static final toColorFilter(Landroid/graphics/PorterDuff$Mode;I)Landroid/graphics/PorterDuffColorFilter;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toColorFilter"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -21,7 +21,7 @@
 .method public static final toXfermode(Landroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuffXfermode;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toXfermode"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/RectKt.smali b/com.discord/smali/androidx/core/graphics/RectKt.smali
index 7f2e152e75..ef924eadf1 100644
--- a/com.discord/smali/androidx/core/graphics/RectKt.smali
+++ b/com.discord/smali/androidx/core/graphics/RectKt.smali
@@ -7,7 +7,7 @@
 .method public static final and(Landroid/graphics/Rect;Landroid/graphics/Rect;)Landroid/graphics/Rect;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$and"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -27,7 +27,7 @@
 .method public static final and(Landroid/graphics/RectF;Landroid/graphics/RectF;)Landroid/graphics/RectF;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$and"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -47,7 +47,7 @@
 .method public static final component1(Landroid/graphics/RectF;)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component1"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -59,7 +59,7 @@
 .method public static final component1(Landroid/graphics/Rect;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component1"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -71,7 +71,7 @@
 .method public static final component2(Landroid/graphics/RectF;)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component2"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -83,7 +83,7 @@
 .method public static final component2(Landroid/graphics/Rect;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component2"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -95,7 +95,7 @@
 .method public static final component3(Landroid/graphics/RectF;)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component3"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -107,7 +107,7 @@
 .method public static final component3(Landroid/graphics/Rect;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component3"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -119,7 +119,7 @@
 .method public static final component4(Landroid/graphics/RectF;)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component4"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -131,7 +131,7 @@
 .method public static final component4(Landroid/graphics/Rect;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component4"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -143,7 +143,7 @@
 .method public static final contains(Landroid/graphics/Rect;Landroid/graphics/Point;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$contains"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -165,7 +165,7 @@
 .method public static final contains(Landroid/graphics/RectF;Landroid/graphics/PointF;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$contains"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -187,7 +187,7 @@
 .method public static final minus(Landroid/graphics/Rect;I)Landroid/graphics/Rect;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -205,7 +205,7 @@
 .method public static final minus(Landroid/graphics/Rect;Landroid/graphics/Point;)Landroid/graphics/Rect;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -233,7 +233,7 @@
 .method public static final minus(Landroid/graphics/RectF;F)Landroid/graphics/RectF;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -251,7 +251,7 @@
 .method public static final minus(Landroid/graphics/RectF;Landroid/graphics/PointF;)Landroid/graphics/RectF;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -279,7 +279,7 @@
 .method public static final minus(Landroid/graphics/Rect;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -299,9 +299,9 @@
 .end method
 
 .method public static final minus(Landroid/graphics/RectF;Landroid/graphics/RectF;)Landroid/graphics/Region;
-    .locals 2
+    .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -309,33 +309,33 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Landroid/graphics/Region;
+    new-instance v0, Landroid/graphics/Rect;
 
-    new-instance v1, Landroid/graphics/Rect;
+    invoke-direct {v0}, Landroid/graphics/Rect;-><init>()V
 
-    invoke-direct {v1}, Landroid/graphics/Rect;-><init>()V
+    invoke-virtual {p0, v0}, Landroid/graphics/RectF;->roundOut(Landroid/graphics/Rect;)V
 
-    invoke-virtual {p0, v1}, Landroid/graphics/RectF;->roundOut(Landroid/graphics/Rect;)V
+    new-instance p0, Landroid/graphics/Region;
 
-    invoke-direct {v0, v1}, Landroid/graphics/Region;-><init>(Landroid/graphics/Rect;)V
+    invoke-direct {p0, v0}, Landroid/graphics/Region;-><init>(Landroid/graphics/Rect;)V
 
-    new-instance p0, Landroid/graphics/Rect;
+    new-instance v0, Landroid/graphics/Rect;
 
-    invoke-direct {p0}, Landroid/graphics/Rect;-><init>()V
+    invoke-direct {v0}, Landroid/graphics/Rect;-><init>()V
 
-    invoke-virtual {p1, p0}, Landroid/graphics/RectF;->roundOut(Landroid/graphics/Rect;)V
+    invoke-virtual {p1, v0}, Landroid/graphics/RectF;->roundOut(Landroid/graphics/Rect;)V
 
     sget-object p1, Landroid/graphics/Region$Op;->DIFFERENCE:Landroid/graphics/Region$Op;
 
-    invoke-virtual {v0, p0, p1}, Landroid/graphics/Region;->op(Landroid/graphics/Rect;Landroid/graphics/Region$Op;)Z
+    invoke-virtual {p0, v0, p1}, Landroid/graphics/Region;->op(Landroid/graphics/Rect;Landroid/graphics/Region$Op;)Z
 
-    return-object v0
+    return-object p0
 .end method
 
 .method public static final or(Landroid/graphics/Rect;Landroid/graphics/Rect;)Landroid/graphics/Rect;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$or"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -355,7 +355,7 @@
 .method public static final or(Landroid/graphics/RectF;Landroid/graphics/RectF;)Landroid/graphics/RectF;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$or"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -375,7 +375,7 @@
 .method public static final plus(Landroid/graphics/Rect;I)Landroid/graphics/Rect;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -391,7 +391,7 @@
 .method public static final plus(Landroid/graphics/Rect;Landroid/graphics/Point;)Landroid/graphics/Rect;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -415,7 +415,7 @@
 .method public static final plus(Landroid/graphics/Rect;Landroid/graphics/Rect;)Landroid/graphics/Rect;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -435,7 +435,7 @@
 .method public static final plus(Landroid/graphics/RectF;F)Landroid/graphics/RectF;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -451,7 +451,7 @@
 .method public static final plus(Landroid/graphics/RectF;Landroid/graphics/PointF;)Landroid/graphics/RectF;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -475,7 +475,7 @@
 .method public static final plus(Landroid/graphics/RectF;Landroid/graphics/RectF;)Landroid/graphics/RectF;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -495,7 +495,7 @@
 .method public static final toRect(Landroid/graphics/RectF;)Landroid/graphics/Rect;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toRect"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -511,7 +511,7 @@
 .method public static final toRectF(Landroid/graphics/Rect;)Landroid/graphics/RectF;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toRectF"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -525,7 +525,7 @@
 .method public static final toRegion(Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toRegion"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -537,29 +537,29 @@
 .end method
 
 .method public static final toRegion(Landroid/graphics/RectF;)Landroid/graphics/Region;
-    .locals 2
+    .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toRegion"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Landroid/graphics/Region;
+    new-instance v0, Landroid/graphics/Rect;
 
-    new-instance v1, Landroid/graphics/Rect;
+    invoke-direct {v0}, Landroid/graphics/Rect;-><init>()V
 
-    invoke-direct {v1}, Landroid/graphics/Rect;-><init>()V
+    invoke-virtual {p0, v0}, Landroid/graphics/RectF;->roundOut(Landroid/graphics/Rect;)V
 
-    invoke-virtual {p0, v1}, Landroid/graphics/RectF;->roundOut(Landroid/graphics/Rect;)V
+    new-instance p0, Landroid/graphics/Region;
 
-    invoke-direct {v0, v1}, Landroid/graphics/Region;-><init>(Landroid/graphics/Rect;)V
+    invoke-direct {p0, v0}, Landroid/graphics/Region;-><init>(Landroid/graphics/Rect;)V
 
-    return-object v0
+    return-object p0
 .end method
 
 .method public static final transform(Landroid/graphics/RectF;Landroid/graphics/Matrix;)Landroid/graphics/RectF;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$transform"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -575,7 +575,7 @@
 .method public static final xor(Landroid/graphics/Rect;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$xor"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -595,9 +595,9 @@
 .end method
 
 .method public static final xor(Landroid/graphics/RectF;Landroid/graphics/RectF;)Landroid/graphics/Region;
-    .locals 2
+    .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$xor"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -605,25 +605,25 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Landroid/graphics/Region;
+    new-instance v0, Landroid/graphics/Rect;
 
-    new-instance v1, Landroid/graphics/Rect;
+    invoke-direct {v0}, Landroid/graphics/Rect;-><init>()V
 
-    invoke-direct {v1}, Landroid/graphics/Rect;-><init>()V
+    invoke-virtual {p0, v0}, Landroid/graphics/RectF;->roundOut(Landroid/graphics/Rect;)V
 
-    invoke-virtual {p0, v1}, Landroid/graphics/RectF;->roundOut(Landroid/graphics/Rect;)V
+    new-instance p0, Landroid/graphics/Region;
 
-    invoke-direct {v0, v1}, Landroid/graphics/Region;-><init>(Landroid/graphics/Rect;)V
+    invoke-direct {p0, v0}, Landroid/graphics/Region;-><init>(Landroid/graphics/Rect;)V
 
-    new-instance p0, Landroid/graphics/Rect;
+    new-instance v0, Landroid/graphics/Rect;
 
-    invoke-direct {p0}, Landroid/graphics/Rect;-><init>()V
+    invoke-direct {v0}, Landroid/graphics/Rect;-><init>()V
 
-    invoke-virtual {p1, p0}, Landroid/graphics/RectF;->roundOut(Landroid/graphics/Rect;)V
+    invoke-virtual {p1, v0}, Landroid/graphics/RectF;->roundOut(Landroid/graphics/Rect;)V
 
     sget-object p1, Landroid/graphics/Region$Op;->XOR:Landroid/graphics/Region$Op;
 
-    invoke-virtual {v0, p0, p1}, Landroid/graphics/Region;->op(Landroid/graphics/Rect;Landroid/graphics/Region$Op;)Z
+    invoke-virtual {p0, v0, p1}, Landroid/graphics/Region;->op(Landroid/graphics/Rect;Landroid/graphics/Region$Op;)Z
 
-    return-object v0
+    return-object p0
 .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 75f2f10219..e057dd7b5a 100644
--- a/com.discord/smali/androidx/core/graphics/RegionKt$iterator$1.smali
+++ b/com.discord/smali/androidx/core/graphics/RegionKt$iterator$1.smali
@@ -29,12 +29,12 @@
 
 
 # instance fields
+.field final synthetic $this_iterator:Landroid/graphics/Region;
+
 .field private hasMore:Z
 
 .field private final iterator:Landroid/graphics/RegionIterator;
 
-.field final synthetic receiver$0:Landroid/graphics/Region;
-
 .field private final rect:Landroid/graphics/Rect;
 
 
@@ -42,13 +42,13 @@
 .method constructor <init>(Landroid/graphics/Region;)V
     .locals 1
 
-    iput-object p1, p0, Landroidx/core/graphics/RegionKt$iterator$1;->receiver$0:Landroid/graphics/Region;
+    iput-object p1, p0, Landroidx/core/graphics/RegionKt$iterator$1;->$this_iterator:Landroid/graphics/Region;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     new-instance p1, Landroid/graphics/RegionIterator;
 
-    iget-object v0, p0, Landroidx/core/graphics/RegionKt$iterator$1;->receiver$0:Landroid/graphics/Region;
+    iget-object v0, p0, Landroidx/core/graphics/RegionKt$iterator$1;->$this_iterator:Landroid/graphics/Region;
 
     invoke-direct {p1, v0}, Landroid/graphics/RegionIterator;-><init>(Landroid/graphics/Region;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/RegionKt.smali b/com.discord/smali/androidx/core/graphics/RegionKt.smali
index 9cb74e930a..d2abdf2d96 100644
--- a/com.discord/smali/androidx/core/graphics/RegionKt.smali
+++ b/com.discord/smali/androidx/core/graphics/RegionKt.smali
@@ -7,7 +7,7 @@
 .method public static final and(Landroid/graphics/Region;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$and"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -29,7 +29,7 @@
 .method public static final and(Landroid/graphics/Region;Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$and"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -51,7 +51,7 @@
 .method public static final contains(Landroid/graphics/Region;Landroid/graphics/Point;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$contains"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -84,7 +84,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$forEach"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -128,7 +128,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$iterator"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -144,7 +144,7 @@
 .method public static final minus(Landroid/graphics/Region;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -166,7 +166,7 @@
 .method public static final minus(Landroid/graphics/Region;Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -188,7 +188,7 @@
 .method public static final not(Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$not"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -210,7 +210,7 @@
 .method public static final or(Landroid/graphics/Region;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$or"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -230,7 +230,7 @@
 .method public static final or(Landroid/graphics/Region;Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$or"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -252,7 +252,7 @@
 .method public static final plus(Landroid/graphics/Region;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -272,7 +272,7 @@
 .method public static final plus(Landroid/graphics/Region;Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -294,7 +294,7 @@
 .method public static final unaryMinus(Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$unaryMinus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -316,7 +316,7 @@
 .method public static final xor(Landroid/graphics/Region;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$xor"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -338,7 +338,7 @@
 .method public static final xor(Landroid/graphics/Region;Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$xor"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/ShaderKt.smali b/com.discord/smali/androidx/core/graphics/ShaderKt.smali
index 744459a1cd..a924fb4ccc 100644
--- a/com.discord/smali/androidx/core/graphics/ShaderKt.smali
+++ b/com.discord/smali/androidx/core/graphics/ShaderKt.smali
@@ -18,7 +18,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$transform"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompat.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompat.smali
index 54e9c798b2..9abb8a4db4 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompat.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompat.smali
@@ -24,10 +24,25 @@
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/16 v1, 0x1c
+    const/16 v1, 0x1d
 
     if-lt v0, v1, :cond_0
 
+    new-instance v0, Landroidx/core/graphics/TypefaceCompatApi29Impl;
+
+    invoke-direct {v0}, Landroidx/core/graphics/TypefaceCompatApi29Impl;-><init>()V
+
+    sput-object v0, Landroidx/core/graphics/TypefaceCompat;->sTypefaceCompatImpl:Landroidx/core/graphics/TypefaceCompatBaseImpl;
+
+    goto :goto_0
+
+    :cond_0
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1c
+
+    if-lt v0, v1, :cond_1
+
     new-instance v0, Landroidx/core/graphics/TypefaceCompatApi28Impl;
 
     invoke-direct {v0}, Landroidx/core/graphics/TypefaceCompatApi28Impl;-><init>()V
@@ -36,12 +51,12 @@
 
     goto :goto_0
 
-    :cond_0
+    :cond_1
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v1, 0x1a
 
-    if-lt v0, v1, :cond_1
+    if-lt v0, v1, :cond_2
 
     new-instance v0, Landroidx/core/graphics/TypefaceCompatApi26Impl;
 
@@ -51,18 +66,18 @@
 
     goto :goto_0
 
-    :cond_1
+    :cond_2
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v1, 0x18
 
-    if-lt v0, v1, :cond_2
+    if-lt v0, v1, :cond_3
 
     invoke-static {}, Landroidx/core/graphics/TypefaceCompatApi24Impl;->isUsable()Z
 
     move-result v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     new-instance v0, Landroidx/core/graphics/TypefaceCompatApi24Impl;
 
@@ -72,12 +87,12 @@
 
     goto :goto_0
 
-    :cond_2
+    :cond_3
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v1, 0x15
 
-    if-lt v0, v1, :cond_3
+    if-lt v0, v1, :cond_4
 
     new-instance v0, Landroidx/core/graphics/TypefaceCompatApi21Impl;
 
@@ -87,7 +102,7 @@
 
     goto :goto_0
 
-    :cond_3
+    :cond_4
     new-instance v0, Landroidx/core/graphics/TypefaceCompatBaseImpl;
 
     invoke-direct {v0}, Landroidx/core/graphics/TypefaceCompatBaseImpl;-><init>()V
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi21Impl.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi21Impl.smali
index 222d2425a7..cd8992b710 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi21Impl.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi21Impl.smali
@@ -17,8 +17,22 @@
 .field private static sCreateFromFamiliesWithDefault:Ljava/lang/reflect/Method; = null
 
 .field private static sFontFamily:Ljava/lang/Class; = null
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+.end field
 
 .field private static sFontFamilyCtor:Ljava/lang/reflect/Constructor; = null
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/reflect/Constructor<",
+            "*>;"
+        }
+    .end annotation
+.end field
 
 .field private static sHasInitBeenCalled:Z = false
 
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi24Impl.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi24Impl.smali
index 7de12d07b5..6dfbe3f494 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi24Impl.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi24Impl.smali
@@ -17,8 +17,22 @@
 .field private static final sCreateFromFamiliesWithDefault:Ljava/lang/reflect/Method;
 
 .field private static final sFontFamily:Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+.end field
 
 .field private static final sFontFamilyCtor:Ljava/lang/reflect/Constructor;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/reflect/Constructor<",
+            "*>;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi26Impl.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi26Impl.smali
index 23c01cc1cd..1a0ad1d35f 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi26Impl.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi26Impl.smali
@@ -31,8 +31,22 @@
 .field protected final mCreateFromFamiliesWithDefault:Ljava/lang/reflect/Method;
 
 .field protected final mFontFamily:Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+.end field
 
 .field protected final mFontFamilyCtor:Ljava/lang/reflect/Constructor;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/reflect/Constructor<",
+            "*>;"
+        }
+    .end annotation
+.end field
 
 .field protected final mFreeze:Ljava/lang/reflect/Method;
 
@@ -853,6 +867,15 @@
 
 .method protected obtainAbortCreationMethod(Ljava/lang/Class;)Ljava/lang/reflect/Method;
     .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;)",
+            "Ljava/lang/reflect/Method;"
+        }
+    .end annotation
+
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/NoSuchMethodException;
@@ -874,6 +897,15 @@
 
 .method protected obtainAddFontFromAssetManagerMethod(Ljava/lang/Class;)Ljava/lang/reflect/Method;
     .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;)",
+            "Ljava/lang/reflect/Method;"
+        }
+    .end annotation
+
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/NoSuchMethodException;
@@ -943,6 +975,15 @@
 
 .method protected obtainAddFontFromBufferMethod(Ljava/lang/Class;)Ljava/lang/reflect/Method;
     .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;)",
+            "Ljava/lang/reflect/Method;"
+        }
+    .end annotation
+
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/NoSuchMethodException;
@@ -994,6 +1035,15 @@
 
 .method protected obtainCreateFromFamiliesWithDefaultMethod(Ljava/lang/Class;)Ljava/lang/reflect/Method;
     .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;)",
+            "Ljava/lang/reflect/Method;"
+        }
+    .end annotation
+
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/NoSuchMethodException;
@@ -1043,6 +1093,14 @@
 
 .method protected obtainFontFamily()Ljava/lang/Class;
     .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/ClassNotFoundException;
@@ -1060,6 +1118,16 @@
 
 .method protected obtainFontFamilyCtor(Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
     .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;)",
+            "Ljava/lang/reflect/Constructor<",
+            "*>;"
+        }
+    .end annotation
+
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/NoSuchMethodException;
@@ -1079,6 +1147,15 @@
 
 .method protected obtainFreezeMethod(Ljava/lang/Class;)Ljava/lang/reflect/Method;
     .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;)",
+            "Ljava/lang/reflect/Method;"
+        }
+    .end annotation
+
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/NoSuchMethodException;
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi28Impl.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi28Impl.smali
index f1b5a9ef45..560f7c6ca8 100644
--- a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi28Impl.smali
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi28Impl.smali
@@ -99,6 +99,15 @@
 
 .method protected obtainCreateFromFamiliesWithDefaultMethod(Ljava/lang/Class;)Ljava/lang/reflect/Method;
     .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;)",
+            "Ljava/lang/reflect/Method;"
+        }
+    .end annotation
+
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/NoSuchMethodException;
diff --git a/com.discord/smali/androidx/core/graphics/TypefaceCompatApi29Impl.smali b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi29Impl.smali
new file mode 100644
index 0000000000..56e93e9da8
--- /dev/null
+++ b/com.discord/smali/androidx/core/graphics/TypefaceCompatApi29Impl.smali
@@ -0,0 +1,443 @@
+.class public Landroidx/core/graphics/TypefaceCompatApi29Impl;
+.super Landroidx/core/graphics/TypefaceCompatBaseImpl;
+.source "TypefaceCompatApi29Impl.java"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Landroidx/core/graphics/TypefaceCompatBaseImpl;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public createFromFontFamilyFilesResourceEntry(Landroid/content/Context;Landroidx/core/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry;Landroid/content/res/Resources;I)Landroid/graphics/Typeface;
+    .locals 8
+
+    invoke-virtual {p2}, Landroidx/core/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry;->getEntries()[Landroidx/core/content/res/FontResourcesParserCompat$FontFileResourceEntry;
+
+    move-result-object p1
+
+    array-length p2, p1
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    move-object v3, v0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    const/4 v4, 0x1
+
+    if-ge v2, p2, :cond_2
+
+    aget-object v5, p1, v2
+
+    :try_start_0
+    new-instance v6, Landroid/graphics/fonts/Font$Builder;
+
+    invoke-virtual {v5}, Landroidx/core/content/res/FontResourcesParserCompat$FontFileResourceEntry;->getResourceId()I
+
+    move-result v7
+
+    invoke-direct {v6, p3, v7}, Landroid/graphics/fonts/Font$Builder;-><init>(Landroid/content/res/Resources;I)V
+
+    invoke-virtual {v5}, Landroidx/core/content/res/FontResourcesParserCompat$FontFileResourceEntry;->getWeight()I
+
+    move-result v7
+
+    invoke-virtual {v6, v7}, Landroid/graphics/fonts/Font$Builder;->setWeight(I)Landroid/graphics/fonts/Font$Builder;
+
+    move-result-object v6
+
+    invoke-virtual {v5}, Landroidx/core/content/res/FontResourcesParserCompat$FontFileResourceEntry;->isItalic()Z
+
+    move-result v7
+
+    if-eqz v7, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    const/4 v4, 0x0
+
+    :goto_1
+    invoke-virtual {v6, v4}, Landroid/graphics/fonts/Font$Builder;->setSlant(I)Landroid/graphics/fonts/Font$Builder;
+
+    move-result-object v4
+
+    invoke-virtual {v5}, Landroidx/core/content/res/FontResourcesParserCompat$FontFileResourceEntry;->getTtcIndex()I
+
+    move-result v6
+
+    invoke-virtual {v4, v6}, Landroid/graphics/fonts/Font$Builder;->setTtcIndex(I)Landroid/graphics/fonts/Font$Builder;
+
+    move-result-object v4
+
+    invoke-virtual {v5}, Landroidx/core/content/res/FontResourcesParserCompat$FontFileResourceEntry;->getVariationSettings()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-virtual {v4, v5}, Landroid/graphics/fonts/Font$Builder;->setFontVariationSettings(Ljava/lang/String;)Landroid/graphics/fonts/Font$Builder;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Landroid/graphics/fonts/Font$Builder;->build()Landroid/graphics/fonts/Font;
+
+    move-result-object v4
+
+    if-nez v3, :cond_1
+
+    new-instance v5, Landroid/graphics/fonts/FontFamily$Builder;
+
+    invoke-direct {v5, v4}, Landroid/graphics/fonts/FontFamily$Builder;-><init>(Landroid/graphics/fonts/Font;)V
+
+    move-object v3, v5
+
+    goto :goto_2
+
+    :cond_1
+    invoke-virtual {v3, v4}, Landroid/graphics/fonts/FontFamily$Builder;->addFont(Landroid/graphics/fonts/Font;)Landroid/graphics/fonts/FontFamily$Builder;
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    :goto_2
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    if-nez v3, :cond_3
+
+    return-object v0
+
+    :cond_3
+    new-instance p1, Landroid/graphics/fonts/FontStyle;
+
+    and-int/lit8 p2, p4, 0x1
+
+    if-eqz p2, :cond_4
+
+    const/16 p2, 0x2bc
+
+    goto :goto_3
+
+    :cond_4
+    const/16 p2, 0x190
+
+    :goto_3
+    and-int/lit8 p3, p4, 0x2
+
+    if-eqz p3, :cond_5
+
+    const/4 v1, 0x1
+
+    :cond_5
+    invoke-direct {p1, p2, v1}, Landroid/graphics/fonts/FontStyle;-><init>(II)V
+
+    new-instance p2, Landroid/graphics/Typeface$CustomFallbackBuilder;
+
+    invoke-virtual {v3}, Landroid/graphics/fonts/FontFamily$Builder;->build()Landroid/graphics/fonts/FontFamily;
+
+    move-result-object p3
+
+    invoke-direct {p2, p3}, Landroid/graphics/Typeface$CustomFallbackBuilder;-><init>(Landroid/graphics/fonts/FontFamily;)V
+
+    invoke-virtual {p2, p1}, Landroid/graphics/Typeface$CustomFallbackBuilder;->setStyle(Landroid/graphics/fonts/FontStyle;)Landroid/graphics/Typeface$CustomFallbackBuilder;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroid/graphics/Typeface$CustomFallbackBuilder;->build()Landroid/graphics/Typeface;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public createFromFontInfo(Landroid/content/Context;Landroid/os/CancellationSignal;[Landroidx/core/provider/FontsContractCompat$FontInfo;I)Landroid/graphics/Typeface;
+    .locals 10
+
+    invoke-virtual {p1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
+
+    move-result-object p1
+
+    array-length v0, p3
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    move-object v4, v1
+
+    const/4 v3, 0x0
+
+    :goto_0
+    const/4 v5, 0x1
+
+    if-ge v3, v0, :cond_5
+
+    aget-object v6, p3, v3
+
+    :try_start_0
+    invoke-virtual {v6}, Landroidx/core/provider/FontsContractCompat$FontInfo;->getUri()Landroid/net/Uri;
+
+    move-result-object v7
+
+    const-string v8, "r"
+
+    invoke-virtual {p1, v7, v8, p2}, Landroid/content/ContentResolver;->openFileDescriptor(Landroid/net/Uri;Ljava/lang/String;Landroid/os/CancellationSignal;)Landroid/os/ParcelFileDescriptor;
+
+    move-result-object v7
+
+    if-nez v7, :cond_0
+
+    if-eqz v7, :cond_4
+
+    :goto_1
+    invoke-virtual {v7}, Landroid/os/ParcelFileDescriptor;->close()V
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_4
+
+    :cond_0
+    :try_start_1
+    new-instance v8, Landroid/graphics/fonts/Font$Builder;
+
+    invoke-direct {v8, v7}, Landroid/graphics/fonts/Font$Builder;-><init>(Landroid/os/ParcelFileDescriptor;)V
+
+    invoke-virtual {v6}, Landroidx/core/provider/FontsContractCompat$FontInfo;->getWeight()I
+
+    move-result v9
+
+    invoke-virtual {v8, v9}, Landroid/graphics/fonts/Font$Builder;->setWeight(I)Landroid/graphics/fonts/Font$Builder;
+
+    move-result-object v8
+
+    invoke-virtual {v6}, Landroidx/core/provider/FontsContractCompat$FontInfo;->isItalic()Z
+
+    move-result v9
+
+    if-eqz v9, :cond_1
+
+    goto :goto_2
+
+    :cond_1
+    const/4 v5, 0x0
+
+    :goto_2
+    invoke-virtual {v8, v5}, Landroid/graphics/fonts/Font$Builder;->setSlant(I)Landroid/graphics/fonts/Font$Builder;
+
+    move-result-object v5
+
+    invoke-virtual {v6}, Landroidx/core/provider/FontsContractCompat$FontInfo;->getTtcIndex()I
+
+    move-result v6
+
+    invoke-virtual {v5, v6}, Landroid/graphics/fonts/Font$Builder;->setTtcIndex(I)Landroid/graphics/fonts/Font$Builder;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Landroid/graphics/fonts/Font$Builder;->build()Landroid/graphics/fonts/Font;
+
+    move-result-object v5
+
+    if-nez v4, :cond_2
+
+    new-instance v6, Landroid/graphics/fonts/FontFamily$Builder;
+
+    invoke-direct {v6, v5}, Landroid/graphics/fonts/FontFamily$Builder;-><init>(Landroid/graphics/fonts/Font;)V
+
+    move-object v4, v6
+
+    goto :goto_3
+
+    :cond_2
+    invoke-virtual {v4, v5}, Landroid/graphics/fonts/FontFamily$Builder;->addFont(Landroid/graphics/fonts/Font;)Landroid/graphics/fonts/FontFamily$Builder;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :goto_3
+    if-eqz v7, :cond_4
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v5
+
+    :try_start_2
+    throw v5
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    :catchall_1
+    move-exception v5
+
+    if-eqz v7, :cond_3
+
+    :try_start_3
+    invoke-virtual {v7}, Landroid/os/ParcelFileDescriptor;->close()V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    :catchall_2
+    :cond_3
+    :try_start_4
+    throw v5
+    :try_end_4
+    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_0
+
+    :catch_0
+    :cond_4
+    :goto_4
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_5
+    if-nez v4, :cond_6
+
+    return-object v1
+
+    :cond_6
+    new-instance p1, Landroid/graphics/fonts/FontStyle;
+
+    and-int/lit8 p2, p4, 0x1
+
+    if-eqz p2, :cond_7
+
+    const/16 p2, 0x2bc
+
+    goto :goto_5
+
+    :cond_7
+    const/16 p2, 0x190
+
+    :goto_5
+    and-int/lit8 p3, p4, 0x2
+
+    if-eqz p3, :cond_8
+
+    const/4 v2, 0x1
+
+    :cond_8
+    invoke-direct {p1, p2, v2}, Landroid/graphics/fonts/FontStyle;-><init>(II)V
+
+    new-instance p2, Landroid/graphics/Typeface$CustomFallbackBuilder;
+
+    invoke-virtual {v4}, Landroid/graphics/fonts/FontFamily$Builder;->build()Landroid/graphics/fonts/FontFamily;
+
+    move-result-object p3
+
+    invoke-direct {p2, p3}, Landroid/graphics/Typeface$CustomFallbackBuilder;-><init>(Landroid/graphics/fonts/FontFamily;)V
+
+    invoke-virtual {p2, p1}, Landroid/graphics/Typeface$CustomFallbackBuilder;->setStyle(Landroid/graphics/fonts/FontStyle;)Landroid/graphics/Typeface$CustomFallbackBuilder;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroid/graphics/Typeface$CustomFallbackBuilder;->build()Landroid/graphics/Typeface;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method protected createFromInputStream(Landroid/content/Context;Ljava/io/InputStream;)Landroid/graphics/Typeface;
+    .locals 0
+
+    new-instance p1, Ljava/lang/RuntimeException;
+
+    const-string p2, "Do not use this function in API 29 or later."
+
+    invoke-direct {p1, p2}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public createFromResourcesFontFile(Landroid/content/Context;Landroid/content/res/Resources;ILjava/lang/String;I)Landroid/graphics/Typeface;
+    .locals 0
+
+    :try_start_0
+    new-instance p1, Landroid/graphics/fonts/FontFamily$Builder;
+
+    new-instance p4, Landroid/graphics/fonts/Font$Builder;
+
+    invoke-direct {p4, p2, p3}, Landroid/graphics/fonts/Font$Builder;-><init>(Landroid/content/res/Resources;I)V
+
+    invoke-virtual {p4}, Landroid/graphics/fonts/Font$Builder;->build()Landroid/graphics/fonts/Font;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Landroid/graphics/fonts/FontFamily$Builder;-><init>(Landroid/graphics/fonts/Font;)V
+
+    invoke-virtual {p1}, Landroid/graphics/fonts/FontFamily$Builder;->build()Landroid/graphics/fonts/FontFamily;
+
+    move-result-object p1
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    new-instance p2, Landroid/graphics/fonts/FontStyle;
+
+    and-int/lit8 p3, p5, 0x1
+
+    if-eqz p3, :cond_0
+
+    const/16 p3, 0x2bc
+
+    goto :goto_0
+
+    :cond_0
+    const/16 p3, 0x190
+
+    :goto_0
+    and-int/lit8 p4, p5, 0x2
+
+    if-eqz p4, :cond_1
+
+    const/4 p4, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p4, 0x0
+
+    :goto_1
+    invoke-direct {p2, p3, p4}, Landroid/graphics/fonts/FontStyle;-><init>(II)V
+
+    new-instance p3, Landroid/graphics/Typeface$CustomFallbackBuilder;
+
+    invoke-direct {p3, p1}, Landroid/graphics/Typeface$CustomFallbackBuilder;-><init>(Landroid/graphics/fonts/FontFamily;)V
+
+    invoke-virtual {p3, p2}, Landroid/graphics/Typeface$CustomFallbackBuilder;->setStyle(Landroid/graphics/fonts/FontStyle;)Landroid/graphics/Typeface$CustomFallbackBuilder;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroid/graphics/Typeface$CustomFallbackBuilder;->build()Landroid/graphics/Typeface;
+
+    move-result-object p1
+
+    return-object p1
+
+    :catch_0
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
+
+.method protected findBestInfo([Landroidx/core/provider/FontsContractCompat$FontInfo;I)Landroidx/core/provider/FontsContractCompat$FontInfo;
+    .locals 0
+
+    new-instance p1, Ljava/lang/RuntimeException;
+
+    const-string p2, "Do not use this function in API 29 or later."
+
+    invoke-direct {p1, p2}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.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 1b9e54e387..0de15816ed 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/BitmapDrawableKt.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/BitmapDrawableKt.smali
@@ -7,7 +7,7 @@
 .method public static final toDrawable(Landroid/graphics/Bitmap;Landroid/content/res/Resources;)Landroid/graphics/drawable/BitmapDrawable;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toDrawable"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/drawable/ColorDrawableKt.smali b/com.discord/smali/androidx/core/graphics/drawable/ColorDrawableKt.smali
index ac95d4c175..8a142ce23a 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/ColorDrawableKt.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/ColorDrawableKt.smali
@@ -17,7 +17,7 @@
 .method public static final toDrawable(Landroid/graphics/Color;)Landroid/graphics/drawable/ColorDrawable;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toDrawable"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/drawable/DrawableKt.smali b/com.discord/smali/androidx/core/graphics/drawable/DrawableKt.smali
index a34645d954..f02d8d2492 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/DrawableKt.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/DrawableKt.smali
@@ -7,7 +7,7 @@
 .method public static final toBitmap(Landroid/graphics/drawable/Drawable;IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
     .locals 6
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toBitmap"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -152,7 +152,7 @@
 .method public static final updateBounds(Landroid/graphics/drawable/Drawable;IIII)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$updateBounds"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/graphics/drawable/IconKt.smali b/com.discord/smali/androidx/core/graphics/drawable/IconKt.smali
index 880f8581ca..4214924be1 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/IconKt.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/IconKt.smali
@@ -7,7 +7,7 @@
 .method public static final toAdaptiveIcon(Landroid/graphics/Bitmap;)Landroid/graphics/drawable/Icon;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toAdaptiveIcon"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -25,7 +25,7 @@
 .method public static final toIcon(Landroid/graphics/Bitmap;)Landroid/graphics/drawable/Icon;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toIcon"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -43,7 +43,7 @@
 .method public static final toIcon(Landroid/net/Uri;)Landroid/graphics/drawable/Icon;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toIcon"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -61,7 +61,7 @@
 .method public static final toIcon([B)Landroid/graphics/drawable/Icon;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toIcon"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat.smali b/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat.smali
index 5f053f3cc7..ef5cb782b8 100644
--- a/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat.smali
+++ b/com.discord/smali/androidx/core/hardware/fingerprint/FingerprintManagerCompat.smali
@@ -44,17 +44,11 @@
 .method private static getFingerprintManagerOrNull(Landroid/content/Context;)Landroid/hardware/fingerprint/FingerprintManager;
     .locals 2
 
-    invoke-virtual {p0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    move-result-object v0
+    const/16 v1, 0x17
 
-    const-string v1, "android.hardware.fingerprint"
-
-    invoke-virtual {v0, v1}, Landroid/content/pm/PackageManager;->hasSystemFeature(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
+    if-ne v0, v1, :cond_0
 
     const-class v0, Landroid/hardware/fingerprint/FingerprintManager;
 
@@ -67,6 +61,33 @@
     return-object p0
 
     :cond_0
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    if-le v0, v1, :cond_1
+
+    invoke-virtual {p0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
+
+    move-result-object v0
+
+    const-string v1, "android.hardware.fingerprint"
+
+    invoke-virtual {v0, v1}, Landroid/content/pm/PackageManager;->hasSystemFeature(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    const-class v0, Landroid/hardware/fingerprint/FingerprintManager;
+
+    invoke-virtual {p0, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/Class;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Landroid/hardware/fingerprint/FingerprintManager;
+
+    return-object p0
+
+    :cond_1
     const/4 p0, 0x0
 
     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 5b2c7612a4..de1a818374 100644
--- a/com.discord/smali/androidx/core/ktx/R$attr.smali
+++ b/com.discord/smali/androidx/core/ktx/R$attr.smali
@@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$color.smali b/com.discord/smali/androidx/core/ktx/R$color.smali
index 72d43965fe..cf9ad61cce 100644
--- a/com.discord/smali/androidx/core/ktx/R$color.smali
+++ b/com.discord/smali/androidx/core/ktx/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$dimen.smali b/com.discord/smali/androidx/core/ktx/R$dimen.smali
index d618864dae..8bc64edf6b 100644
--- a/com.discord/smali/androidx/core/ktx/R$dimen.smali
+++ b/com.discord/smali/androidx/core/ktx/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # 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 8b92d0ec4c..0bccf3973b 100644
--- a/com.discord/smali/androidx/core/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/core/ktx/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # 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 10115c15f7..63eb678aa8 100644
--- a/com.discord/smali/androidx/core/ktx/R$id.smali
+++ b/com.discord/smali/androidx/core/ktx/R$id.smali
@@ -15,6 +15,72 @@
 
 
 # static fields
+.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+
+.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+
+.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+
+.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+
+.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+
+.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+
+.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+
+.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+
+.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+
+.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+
+.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+
+.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+
+.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+
+.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+
+.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+
+.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+
+.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+
+.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+
+.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+
+.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+
+.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+
+.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+
+.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+
+.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+
+.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+
+.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+
+.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+
+.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+
+.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+
+.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+
+.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+
+.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+
+.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+
 .field public static final action_container:I = 0x7f0a0039
 
 .field public static final action_divider:I = 0x7f0a003b
@@ -25,51 +91,63 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final dialog_button:I = 0x7f0a025c
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final info:I = 0x7f0a039a
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_accessibility_actions:I = 0x7f0a075b
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a075c
 
-.field public static final text:I = 0x7f0a073f
+.field public static final tag_accessibility_heading:I = 0x7f0a075d
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final tag_accessibility_pane_title:I = 0x7f0a075e
 
-.field public static final time:I = 0x7f0a074e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a075f
 
-.field public static final title:I = 0x7f0a074f
+.field public static final tag_transition_group:I = 0x7f0a0760
+
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
+
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
+
+.field public static final text:I = 0x7f0a0768
+
+.field public static final text2:I = 0x7f0a0769
+
+.field public static final time:I = 0x7f0a0777
+
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$layout.smali b/com.discord/smali/androidx/core/ktx/R$layout.smali
index 3c65cc3dd0..89465454e5 100644
--- a/com.discord/smali/androidx/core/ktx/R$layout.smali
+++ b/com.discord/smali/androidx/core/ktx/R$layout.smali
@@ -15,17 +15,19 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final custom_dialog:I = 0x7f0d0022
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
+
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # 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 e77b74e138..993df97e8a 100644
--- a/com.discord/smali/androidx/core/ktx/R$string.smali
+++ b/com.discord/smali/androidx/core/ktx/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # 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 c2fe882756..c2984507ce 100644
--- a/com.discord/smali/androidx/core/ktx/R$style.smali
+++ b/com.discord/smali/androidx/core/ktx/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # 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 7657b40992..589c8fead8 100644
--- a/com.discord/smali/androidx/core/ktx/R$styleable.smali
+++ b/com.discord/smali/androidx/core/ktx/R$styleable.smali
@@ -149,12 +149,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +164,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .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 c6c6092b89..e76fbc99e2 100644
--- a/com.discord/smali/androidx/core/location/LocationKt.smali
+++ b/com.discord/smali/androidx/core/location/LocationKt.smali
@@ -7,7 +7,7 @@
 .method public static final component1(Landroid/location/Location;)D
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component1"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -21,7 +21,7 @@
 .method public static final component2(Landroid/location/Location;)D
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component2"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/net/UriCompat.smali b/com.discord/smali/androidx/core/net/UriCompat.smali
new file mode 100644
index 0000000000..ebd2a29299
--- /dev/null
+++ b/com.discord/smali/androidx/core/net/UriCompat.smali
@@ -0,0 +1,262 @@
+.class public final Landroidx/core/net/UriCompat;
+.super Ljava/lang/Object;
+.source "UriCompat.java"
+
+
+# direct methods
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static toSafeString(Landroid/net/Uri;)Ljava/lang/String;
+    .locals 7
+
+    invoke-virtual {p0}, Landroid/net/Uri;->getScheme()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Landroid/net/Uri;->getSchemeSpecificPart()Ljava/lang/String;
+
+    move-result-object v1
+
+    const/16 v2, 0x3a
+
+    const/16 v3, 0x40
+
+    if-eqz v0, :cond_8
+
+    const-string v4, "tel"
+
+    invoke-virtual {v0, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_4
+
+    const-string v4, "sip"
+
+    invoke-virtual {v0, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_4
+
+    const-string v4, "sms"
+
+    invoke-virtual {v0, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_4
+
+    const-string v4, "smsto"
+
+    invoke-virtual {v0, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_4
+
+    const-string v4, "mailto"
+
+    invoke-virtual {v0, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_4
+
+    const-string v4, "nfc"
+
+    invoke-virtual {v0, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    const-string v4, "http"
+
+    invoke-virtual {v0, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_1
+
+    const-string v4, "https"
+
+    invoke-virtual {v0, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_1
+
+    const-string v4, "ftp"
+
+    invoke-virtual {v0, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_1
+
+    const-string v4, "rtsp"
+
+    invoke-virtual {v0, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_8
+
+    :cond_1
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    const-string v4, "//"
+
+    invoke-direct {v1, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Landroid/net/Uri;->getHost()Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, ""
+
+    if-eqz v4, :cond_2
+
+    invoke-virtual {p0}, Landroid/net/Uri;->getHost()Ljava/lang/String;
+
+    move-result-object v4
+
+    goto :goto_0
+
+    :cond_2
+    move-object v4, v5
+
+    :goto_0
+    invoke-virtual {v1, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Landroid/net/Uri;->getPort()I
+
+    move-result v4
+
+    const/4 v6, -0x1
+
+    if-eq v4, v6, :cond_3
+
+    new-instance v4, Ljava/lang/StringBuilder;
+
+    const-string v5, ":"
+
+    invoke-direct {v4, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Landroid/net/Uri;->getPort()I
+
+    move-result p0
+
+    invoke-virtual {v4, p0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    :cond_3
+    invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string 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 :goto_5
+
+    :cond_4
+    :goto_1
+    new-instance p0, Ljava/lang/StringBuilder;
+
+    invoke-direct {p0, v3}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    if-eqz v1, :cond_7
+
+    const/4 v0, 0x0
+
+    :goto_2
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    if-ge v0, v2, :cond_7
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    const/16 v4, 0x2d
+
+    if-eq v2, v4, :cond_6
+
+    if-eq v2, v3, :cond_6
+
+    const/16 v4, 0x2e
+
+    if-ne v2, v4, :cond_5
+
+    goto :goto_3
+
+    :cond_5
+    const/16 v2, 0x78
+
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_4
+
+    :cond_6
+    :goto_3
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    :goto_4
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_2
+
+    :cond_7
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_8
+    :goto_5
+    new-instance p0, Ljava/lang/StringBuilder;
+
+    invoke-direct {p0, v3}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    if-eqz v0, :cond_9
+
+    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    :cond_9
+    if-eqz v1, :cond_a
+
+    invoke-virtual {p0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_a
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
diff --git a/com.discord/smali/androidx/core/net/UriKt.smali b/com.discord/smali/androidx/core/net/UriKt.smali
index dbbad8199c..df338afb44 100644
--- a/com.discord/smali/androidx/core/net/UriKt.smali
+++ b/com.discord/smali/androidx/core/net/UriKt.smali
@@ -7,7 +7,7 @@
 .method public static final toFile(Landroid/net/Uri;)Ljava/io/File;
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toFile"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -60,7 +60,7 @@
 .method public static final toUri(Ljava/io/File;)Landroid/net/Uri;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toUri"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -78,7 +78,7 @@
 .method public static final toUri(Ljava/lang/String;)Landroid/net/Uri;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toUri"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/os/BuildCompat.smali b/com.discord/smali/androidx/core/os/BuildCompat.smali
index c244eac94a..c09e1ccdc7 100644
--- a/com.discord/smali/androidx/core/os/BuildCompat.smali
+++ b/com.discord/smali/androidx/core/os/BuildCompat.smali
@@ -118,42 +118,22 @@
 .end method
 
 .method public static isAtLeastQ()Z
-    .locals 4
+    .locals 2
+    .annotation runtime Ljava/lang/Deprecated;
+    .end annotation
 
-    sget-object v0, Landroid/os/Build$VERSION;->CODENAME:Ljava/lang/String;
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    invoke-virtual {v0}, Ljava/lang/String;->length()I
+    const/16 v1, 0x1d
 
-    move-result v0
+    if-lt v0, v1, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    const/4 v2, 0x0
-
-    if-ne v0, v1, :cond_0
-
-    sget-object v0, Landroid/os/Build$VERSION;->CODENAME:Ljava/lang/String;
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v0
-
-    const/16 v3, 0x51
-
-    if-lt v0, v3, :cond_0
-
-    sget-object v0, Landroid/os/Build$VERSION;->CODENAME:Ljava/lang/String;
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v0
-
-    const/16 v3, 0x5a
-
-    if-gt v0, v3, :cond_0
-
-    return v1
+    return v0
 
     :cond_0
-    return v2
+    const/4 v0, 0x0
+
+    return v0
 .end method
diff --git a/com.discord/smali/androidx/core/os/BundleKt.smali b/com.discord/smali/androidx/core/os/BundleKt.smali
index 16a111e365..621193297e 100644
--- a/com.discord/smali/androidx/core/os/BundleKt.smali
+++ b/com.discord/smali/androidx/core/os/BundleKt.smali
@@ -33,7 +33,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    if-ge v2, v1, :cond_20
+    if-ge v2, v1, :cond_21
 
     aget-object v3, p0, v2
 
@@ -299,7 +299,7 @@
 
     const-string v7, " for key \""
 
-    if-eqz v5, :cond_1b
+    if-eqz v5, :cond_1c
 
     invoke-virtual {v3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -309,15 +309,20 @@
 
     move-result-object v5
 
+    if-nez v5, :cond_14
+
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
+
+    :cond_14
     const-class v8, Landroid/os/Parcelable;
 
     invoke-virtual {v8, v5}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
     move-result v8
 
-    if-eqz v8, :cond_15
+    if-eqz v8, :cond_16
 
-    if-eqz v3, :cond_14
+    if-eqz v3, :cond_15
 
     check-cast v3, [Landroid/os/Parcelable;
 
@@ -325,7 +330,7 @@
 
     goto/16 :goto_1
 
-    :cond_14
+    :cond_15
     new-instance p0, Lkotlin/r;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Array<android.os.Parcelable>"
@@ -334,16 +339,16 @@
 
     throw p0
 
-    :cond_15
+    :cond_16
     const-class v8, Ljava/lang/String;
 
     invoke-virtual {v8, v5}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
     move-result v8
 
-    if-eqz v8, :cond_17
+    if-eqz v8, :cond_18
 
-    if-eqz v3, :cond_16
+    if-eqz v3, :cond_17
 
     check-cast v3, [Ljava/lang/String;
 
@@ -351,7 +356,7 @@
 
     goto/16 :goto_1
 
-    :cond_16
+    :cond_17
     new-instance p0, Lkotlin/r;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Array<kotlin.String>"
@@ -360,16 +365,16 @@
 
     throw p0
 
-    :cond_17
+    :cond_18
     const-class v8, Ljava/lang/CharSequence;
 
     invoke-virtual {v8, v5}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
     move-result v8
 
-    if-eqz v8, :cond_19
+    if-eqz v8, :cond_1a
 
-    if-eqz v3, :cond_18
+    if-eqz v3, :cond_19
 
     check-cast v3, [Ljava/lang/CharSequence;
 
@@ -377,7 +382,7 @@
 
     goto/16 :goto_1
 
-    :cond_18
+    :cond_19
     new-instance p0, Lkotlin/r;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Array<kotlin.CharSequence>"
@@ -386,14 +391,14 @@
 
     throw p0
 
-    :cond_19
+    :cond_1a
     const-class v8, Ljava/io/Serializable;
 
     invoke-virtual {v8, v5}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
     move-result v8
 
-    if-eqz v8, :cond_1a
+    if-eqz v8, :cond_1b
 
     check-cast v3, Ljava/io/Serializable;
 
@@ -401,11 +406,7 @@
 
     goto :goto_1
 
-    :cond_1a
-    const-string p0, "componentType"
-
-    invoke-static {v5, p0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
+    :cond_1b
     invoke-virtual {v5}, Ljava/lang/Class;->getCanonicalName()Ljava/lang/String;
 
     move-result-object p0
@@ -436,10 +437,10 @@
 
     throw v0
 
-    :cond_1b
+    :cond_1c
     instance-of v5, v3, Ljava/io/Serializable;
 
-    if-eqz v5, :cond_1c
+    if-eqz v5, :cond_1d
 
     check-cast v3, Ljava/io/Serializable;
 
@@ -447,16 +448,16 @@
 
     goto :goto_1
 
-    :cond_1c
+    :cond_1d
     sget v5, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v8, 0x12
 
-    if-lt v5, v8, :cond_1d
+    if-lt v5, v8, :cond_1e
 
     instance-of v5, v3, Landroid/os/Binder;
 
-    if-eqz v5, :cond_1d
+    if-eqz v5, :cond_1e
 
     check-cast v3, Landroid/os/IBinder;
 
@@ -464,16 +465,16 @@
 
     goto :goto_1
 
-    :cond_1d
+    :cond_1e
     sget v5, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v8, 0x15
 
-    if-lt v5, v8, :cond_1e
+    if-lt v5, v8, :cond_1f
 
     instance-of v5, v3, Landroid/util/Size;
 
-    if-eqz v5, :cond_1e
+    if-eqz v5, :cond_1f
 
     check-cast v3, Landroid/util/Size;
 
@@ -481,14 +482,14 @@
 
     goto :goto_1
 
-    :cond_1e
+    :cond_1f
     sget v5, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    if-lt v5, v8, :cond_1f
+    if-lt v5, v8, :cond_20
 
     instance-of v5, v3, Landroid/util/SizeF;
 
-    if-eqz v5, :cond_1f
+    if-eqz v5, :cond_20
 
     check-cast v3, Landroid/util/SizeF;
 
@@ -499,7 +500,7 @@
 
     goto/16 :goto_0
 
-    :cond_1f
+    :cond_20
     invoke-virtual {v3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object p0
@@ -534,6 +535,6 @@
 
     throw v0
 
-    :cond_20
+    :cond_21
     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 560072880b..5ab211cafe 100644
--- a/com.discord/smali/androidx/core/os/HandlerKt.smali
+++ b/com.discord/smali/androidx/core/os/HandlerKt.smali
@@ -19,7 +19,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$postAtTime"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -48,7 +48,7 @@
     const/4 p3, 0x0
 
     :cond_0
-    const-string p5, "$receiver"
+    const-string p5, "$this$postAtTime"
 
     invoke-static {p0, p5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -82,7 +82,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$postDelayed"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -119,7 +119,7 @@
     const/4 p3, 0x0
 
     :cond_0
-    const-string p5, "$receiver"
+    const-string p5, "$this$postDelayed"
 
     invoke-static {p0, p5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/os/PersistableBundleKt.smali b/com.discord/smali/androidx/core/os/PersistableBundleKt.smali
index 338a5a7b2c..0dfaa43404 100644
--- a/com.discord/smali/androidx/core/os/PersistableBundleKt.smali
+++ b/com.discord/smali/androidx/core/os/PersistableBundleKt.smali
@@ -33,7 +33,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    if-ge v2, v1, :cond_f
+    if-ge v2, v1, :cond_10
 
     aget-object v3, p0, v2
 
@@ -229,7 +229,7 @@
 
     const-string v6, " for key \""
 
-    if-eqz v5, :cond_e
+    if-eqz v5, :cond_f
 
     invoke-virtual {v3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -239,15 +239,20 @@
 
     move-result-object v5
 
+    if-nez v5, :cond_c
+
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
+
+    :cond_c
     const-class v8, Ljava/lang/String;
 
     invoke-virtual {v8, v5}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
     move-result v8
 
-    if-eqz v8, :cond_d
+    if-eqz v8, :cond_e
 
-    if-eqz v3, :cond_c
+    if-eqz v3, :cond_d
 
     check-cast v3, [Ljava/lang/String;
 
@@ -258,7 +263,7 @@
 
     goto/16 :goto_0
 
-    :cond_c
+    :cond_d
     new-instance p0, Lkotlin/r;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Array<kotlin.String>"
@@ -267,11 +272,7 @@
 
     throw p0
 
-    :cond_d
-    const-string p0, "componentType"
-
-    invoke-static {v5, p0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
+    :cond_e
     invoke-virtual {v5}, Ljava/lang/Class;->getCanonicalName()Ljava/lang/String;
 
     move-result-object p0
@@ -302,7 +303,7 @@
 
     throw v0
 
-    :cond_e
+    :cond_f
     invoke-virtual {v3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object p0
@@ -337,6 +338,6 @@
 
     throw v0
 
-    :cond_f
+    :cond_10
     return-object v0
 .end method
diff --git a/com.discord/smali/androidx/core/os/TraceCompat.smali b/com.discord/smali/androidx/core/os/TraceCompat.smali
index f38d70434a..771c4d1f6a 100644
--- a/com.discord/smali/androidx/core/os/TraceCompat.smali
+++ b/com.discord/smali/androidx/core/os/TraceCompat.smali
@@ -3,7 +3,166 @@
 .source "TraceCompat.java"
 
 
+# static fields
+.field private static final TAG:Ljava/lang/String; = "TraceCompat"
+
+.field private static sAsyncTraceBeginMethod:Ljava/lang/reflect/Method;
+
+.field private static sAsyncTraceEndMethod:Ljava/lang/reflect/Method;
+
+.field private static sIsTagEnabledMethod:Ljava/lang/reflect/Method;
+
+.field private static sTraceCounterMethod:Ljava/lang/reflect/Method;
+
+.field private static sTraceTagApp:J
+
+
 # direct methods
+.method static constructor <clinit>()V
+    .locals 8
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x12
+
+    if-lt v0, v1, :cond_0
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-ge v0, v1, :cond_0
+
+    :try_start_0
+    const-class v0, Landroid/os/Trace;
+
+    const-string v1, "TRACE_TAG_APP"
+
+    invoke-virtual {v0, v1}, Ljava/lang/Class;->getField(Ljava/lang/String;)Ljava/lang/reflect/Field;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->getLong(Ljava/lang/Object;)J
+
+    move-result-wide v0
+
+    sput-wide v0, Landroidx/core/os/TraceCompat;->sTraceTagApp:J
+
+    const-class v0, Landroid/os/Trace;
+
+    const-string v1, "isTagEnabled"
+
+    const/4 v2, 0x1
+
+    new-array v3, v2, [Ljava/lang/Class;
+
+    sget-object v4, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
+
+    const/4 v5, 0x0
+
+    aput-object v4, v3, v5
+
+    invoke-virtual {v0, v1, v3}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v0
+
+    sput-object v0, Landroidx/core/os/TraceCompat;->sIsTagEnabledMethod:Ljava/lang/reflect/Method;
+
+    const-class v0, Landroid/os/Trace;
+
+    const-string v1, "asyncTraceBegin"
+
+    const/4 v3, 0x3
+
+    new-array v4, v3, [Ljava/lang/Class;
+
+    sget-object v6, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
+
+    aput-object v6, v4, v5
+
+    const-class v6, Ljava/lang/String;
+
+    aput-object v6, v4, v2
+
+    sget-object v6, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+    const/4 v7, 0x2
+
+    aput-object v6, v4, v7
+
+    invoke-virtual {v0, v1, v4}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v0
+
+    sput-object v0, Landroidx/core/os/TraceCompat;->sAsyncTraceBeginMethod:Ljava/lang/reflect/Method;
+
+    const-class v0, Landroid/os/Trace;
+
+    const-string v1, "asyncTraceEnd"
+
+    new-array v4, v3, [Ljava/lang/Class;
+
+    sget-object v6, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
+
+    aput-object v6, v4, v5
+
+    const-class v6, Ljava/lang/String;
+
+    aput-object v6, v4, v2
+
+    sget-object v6, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+    aput-object v6, v4, v7
+
+    invoke-virtual {v0, v1, v4}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v0
+
+    sput-object v0, Landroidx/core/os/TraceCompat;->sAsyncTraceEndMethod:Ljava/lang/reflect/Method;
+
+    const-class v0, Landroid/os/Trace;
+
+    const-string v1, "traceCounter"
+
+    new-array v3, v3, [Ljava/lang/Class;
+
+    sget-object v4, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
+
+    aput-object v4, v3, v5
+
+    const-class v4, Ljava/lang/String;
+
+    aput-object v4, v3, v2
+
+    sget-object v2, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+    aput-object v2, v3, v7
+
+    invoke-virtual {v0, v1, v3}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v0
+
+    sput-object v0, Landroidx/core/os/TraceCompat;->sTraceCounterMethod:Ljava/lang/reflect/Method;
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception v0
+
+    const-string v1, "TraceCompat"
+
+    const-string v2, "Unable to initialize via reflection."
+
+    invoke-static {v1, v2, v0}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    :cond_0
+    return-void
+.end method
+
 .method private constructor <init>()V
     .locals 0
 
@@ -12,6 +171,74 @@
     return-void
 .end method
 
+.method public static beginAsyncSection(Ljava/lang/String;I)V
+    .locals 6
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    invoke-static {p0, p1}, Landroid/os/Trace;->beginAsyncSection(Ljava/lang/String;I)V
+
+    return-void
+
+    :cond_0
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x12
+
+    if-lt v0, v1, :cond_1
+
+    :try_start_0
+    sget-object v0, Landroidx/core/os/TraceCompat;->sAsyncTraceBeginMethod:Ljava/lang/reflect/Method;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x3
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    const/4 v3, 0x0
+
+    sget-wide v4, Landroidx/core/os/TraceCompat;->sTraceTagApp:J
+
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
+    aput-object v4, v2, v3
+
+    const/4 v3, 0x1
+
+    aput-object p0, v2, v3
+
+    const/4 p0, 0x2
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    aput-object p1, v2, p0
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    const-string p0, "TraceCompat"
+
+    const-string p1, "Unable to invoke asyncTraceBegin() via reflection."
+
+    invoke-static {p0, p1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
+
+    :cond_1
+    return-void
+.end method
+
 .method public static beginSection(Ljava/lang/String;)V
     .locals 2
 
@@ -27,6 +254,74 @@
     return-void
 .end method
 
+.method public static endAsyncSection(Ljava/lang/String;I)V
+    .locals 6
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    invoke-static {p0, p1}, Landroid/os/Trace;->endAsyncSection(Ljava/lang/String;I)V
+
+    return-void
+
+    :cond_0
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x12
+
+    if-lt v0, v1, :cond_1
+
+    :try_start_0
+    sget-object v0, Landroidx/core/os/TraceCompat;->sAsyncTraceEndMethod:Ljava/lang/reflect/Method;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x3
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    const/4 v3, 0x0
+
+    sget-wide v4, Landroidx/core/os/TraceCompat;->sTraceTagApp:J
+
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
+    aput-object v4, v2, v3
+
+    const/4 v3, 0x1
+
+    aput-object p0, v2, v3
+
+    const/4 p0, 0x2
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    aput-object p1, v2, p0
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    const-string p0, "TraceCompat"
+
+    const-string p1, "Unable to invoke endAsyncSection() via reflection."
+
+    invoke-static {p0, p1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
+
+    :cond_1
+    return-void
+.end method
+
 .method public static endSection()V
     .locals 2
 
@@ -41,3 +336,139 @@
     :cond_0
     return-void
 .end method
+
+.method public static isEnabled()Z
+    .locals 6
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    invoke-static {}, Landroid/os/Trace;->isEnabled()Z
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x12
+
+    const/4 v2, 0x0
+
+    if-lt v0, v1, :cond_1
+
+    :try_start_0
+    sget-object v0, Landroidx/core/os/TraceCompat;->sIsTagEnabledMethod:Ljava/lang/reflect/Method;
+
+    const/4 v1, 0x0
+
+    const/4 v3, 0x1
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    sget-wide v4, Landroidx/core/os/TraceCompat;->sTraceTagApp:J
+
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
+    aput-object v4, v3, v2
+
+    invoke-virtual {v0, v1, v3}, Ljava/lang/reflect/Method;->invoke(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
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return v0
+
+    :catch_0
+    const-string v0, "TraceCompat"
+
+    const-string v1, "Unable to invoke isTagEnabled() via reflection."
+
+    invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
+
+    :cond_1
+    return v2
+.end method
+
+.method public static setCounter(Ljava/lang/String;I)V
+    .locals 6
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    int-to-long v0, p1
+
+    invoke-static {p0, v0, v1}, Landroid/os/Trace;->setCounter(Ljava/lang/String;J)V
+
+    return-void
+
+    :cond_0
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x12
+
+    if-lt v0, v1, :cond_1
+
+    :try_start_0
+    sget-object v0, Landroidx/core/os/TraceCompat;->sTraceCounterMethod:Ljava/lang/reflect/Method;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x3
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    const/4 v3, 0x0
+
+    sget-wide v4, Landroidx/core/os/TraceCompat;->sTraceTagApp:J
+
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
+    aput-object v4, v2, v3
+
+    const/4 v3, 0x1
+
+    aput-object p0, v2, v3
+
+    const/4 p0, 0x2
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    aput-object p1, v2, p0
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    const-string p0, "TraceCompat"
+
+    const-string p1, "Unable to invoke traceCounter() via reflection."
+
+    invoke-static {p0, p1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
+
+    :cond_1
+    return-void
+.end method
diff --git a/com.discord/smali/androidx/core/text/CharSequenceKt.smali b/com.discord/smali/androidx/core/text/CharSequenceKt.smali
index 0fb97d34dd..18a9517872 100644
--- a/com.discord/smali/androidx/core/text/CharSequenceKt.smali
+++ b/com.discord/smali/androidx/core/text/CharSequenceKt.smali
@@ -7,7 +7,7 @@
 .method public static final isDigitsOnly(Ljava/lang/CharSequence;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isDigitsOnly"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -21,7 +21,7 @@
 .method public static final trimmedLength(Ljava/lang/CharSequence;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$trimmedLength"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/text/HtmlKt.smali b/com.discord/smali/androidx/core/text/HtmlKt.smali
index 8a0ed147d0..c04bcc7f0e 100644
--- a/com.discord/smali/androidx/core/text/HtmlKt.smali
+++ b/com.discord/smali/androidx/core/text/HtmlKt.smali
@@ -7,7 +7,7 @@
 .method public static final parseAsHtml(Ljava/lang/String;ILandroid/text/Html$ImageGetter;Landroid/text/Html$TagHandler;)Landroid/text/Spanned;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$parseAsHtml"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -48,7 +48,7 @@
     move-object p3, v0
 
     :cond_2
-    const-string p4, "$receiver"
+    const-string p4, "$this$parseAsHtml"
 
     invoke-static {p0, p4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -66,7 +66,7 @@
 .method public static final toHtml(Landroid/text/Spanned;I)Ljava/lang/String;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toHtml"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -91,7 +91,7 @@
     const/4 p1, 0x0
 
     :cond_0
-    const-string p2, "$receiver"
+    const-string p2, "$this$toHtml"
 
     invoke-static {p0, p2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/text/LocaleKt.smali b/com.discord/smali/androidx/core/text/LocaleKt.smali
index c98ebe0b0b..3d640f3538 100644
--- a/com.discord/smali/androidx/core/text/LocaleKt.smali
+++ b/com.discord/smali/androidx/core/text/LocaleKt.smali
@@ -7,7 +7,7 @@
 .method public static final getLayoutDirection(Ljava/util/Locale;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$layoutDirection"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/text/PrecomputedTextCompat$Params.smali b/com.discord/smali/androidx/core/text/PrecomputedTextCompat$Params.smali
index bc0989a040..bdf97c325d 100644
--- a/com.discord/smali/androidx/core/text/PrecomputedTextCompat$Params.smali
+++ b/com.discord/smali/androidx/core/text/PrecomputedTextCompat$Params.smali
@@ -34,7 +34,7 @@
 
 # direct methods
 .method public constructor <init>(Landroid/text/PrecomputedText$Params;)V
-    .locals 1
+    .locals 2
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,26 +58,68 @@
 
     invoke-virtual {p1}, Landroid/text/PrecomputedText$Params;->getHyphenationFrequency()I
 
-    move-result p1
+    move-result v0
 
-    iput p1, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mHyphenationFrequency:I
+    iput v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mHyphenationFrequency:I
 
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
     const/4 p1, 0x0
 
+    :goto_0
     iput-object p1, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mWrapped:Landroid/text/PrecomputedText$Params;
 
     return-void
 .end method
 
 .method constructor <init>(Landroid/text/TextPaint;Landroid/text/TextDirectionHeuristic;II)V
-    .locals 1
+    .locals 2
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    new-instance v0, Landroid/text/PrecomputedText$Params$Builder;
+
+    invoke-direct {v0, p1}, Landroid/text/PrecomputedText$Params$Builder;-><init>(Landroid/text/TextPaint;)V
+
+    invoke-virtual {v0, p3}, Landroid/text/PrecomputedText$Params$Builder;->setBreakStrategy(I)Landroid/text/PrecomputedText$Params$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p4}, Landroid/text/PrecomputedText$Params$Builder;->setHyphenationFrequency(I)Landroid/text/PrecomputedText$Params$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p2}, Landroid/text/PrecomputedText$Params$Builder;->setTextDirection(Landroid/text/TextDirectionHeuristic;)Landroid/text/PrecomputedText$Params$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Landroid/text/PrecomputedText$Params$Builder;->build()Landroid/text/PrecomputedText$Params;
+
+    move-result-object v0
+
+    iput-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mWrapped:Landroid/text/PrecomputedText$Params;
+
+    goto :goto_0
+
+    :cond_0
     const/4 v0, 0x0
 
     iput-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mWrapped:Landroid/text/PrecomputedText$Params;
 
+    :goto_0
     iput-object p1, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint;
 
     iput-object p2, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mTextDir:Landroid/text/TextDirectionHeuristic;
@@ -144,49 +186,36 @@
 .method public final equalsWithoutTextDirection(Landroidx/core/text/PrecomputedTextCompat$Params;)Z
     .locals 3
 
-    iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mWrapped:Landroid/text/PrecomputedText$Params;
-
-    if-eqz v0, :cond_0
-
-    iget-object p1, p1, Landroidx/core/text/PrecomputedTextCompat$Params;->mWrapped:Landroid/text/PrecomputedText$Params;
-
-    invoke-virtual {v0, p1}, Landroid/text/PrecomputedText$Params;->equals(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    return p1
-
-    :cond_0
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/16 v1, 0x17
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const/16 v2, 0x17
 
-    if-lt v0, v1, :cond_2
+    if-lt v0, v2, :cond_1
 
     iget v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mBreakStrategy:I
 
     invoke-virtual {p1}, Landroidx/core/text/PrecomputedTextCompat$Params;->getBreakStrategy()I
 
-    move-result v1
+    move-result v2
 
-    if-eq v0, v1, :cond_1
+    if-eq v0, v2, :cond_0
 
-    return v2
+    return v1
 
-    :cond_1
+    :cond_0
     iget v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mHyphenationFrequency:I
 
     invoke-virtual {p1}, Landroidx/core/text/PrecomputedTextCompat$Params;->getHyphenationFrequency()I
 
-    move-result v1
+    move-result v2
 
-    if-eq v0, v1, :cond_2
+    if-eq v0, v2, :cond_1
 
-    return v2
+    return v1
 
-    :cond_2
+    :cond_1
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint;
 
     invoke-virtual {v0}, Landroid/text/TextPaint;->getTextSize()F
@@ -195,19 +224,19 @@
 
     invoke-virtual {p1}, Landroidx/core/text/PrecomputedTextCompat$Params;->getTextPaint()Landroid/text/TextPaint;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1}, Landroid/text/TextPaint;->getTextSize()F
+    invoke-virtual {v2}, Landroid/text/TextPaint;->getTextSize()F
 
-    move-result v1
+    move-result v2
 
-    cmpl-float v0, v0, v1
+    cmpl-float v0, v0, v2
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_2
 
-    return v2
+    return v1
 
-    :cond_3
+    :cond_2
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint;
 
     invoke-virtual {v0}, Landroid/text/TextPaint;->getTextScaleX()F
@@ -216,19 +245,19 @@
 
     invoke-virtual {p1}, Landroidx/core/text/PrecomputedTextCompat$Params;->getTextPaint()Landroid/text/TextPaint;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1}, Landroid/text/TextPaint;->getTextScaleX()F
+    invoke-virtual {v2}, Landroid/text/TextPaint;->getTextScaleX()F
 
-    move-result v1
+    move-result v2
 
-    cmpl-float v0, v0, v1
+    cmpl-float v0, v0, v2
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_3
 
-    return v2
+    return v1
 
-    :cond_4
+    :cond_3
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint;
 
     invoke-virtual {v0}, Landroid/text/TextPaint;->getTextSkewX()F
@@ -237,24 +266,24 @@
 
     invoke-virtual {p1}, Landroidx/core/text/PrecomputedTextCompat$Params;->getTextPaint()Landroid/text/TextPaint;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1}, Landroid/text/TextPaint;->getTextSkewX()F
+    invoke-virtual {v2}, Landroid/text/TextPaint;->getTextSkewX()F
 
-    move-result v1
+    move-result v2
 
-    cmpl-float v0, v0, v1
+    cmpl-float v0, v0, v2
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_4
 
-    return v2
+    return v1
 
-    :cond_5
+    :cond_4
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/16 v1, 0x15
+    const/16 v2, 0x15
 
-    if-lt v0, v1, :cond_7
+    if-lt v0, v2, :cond_6
 
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint;
 
@@ -264,19 +293,19 @@
 
     invoke-virtual {p1}, Landroidx/core/text/PrecomputedTextCompat$Params;->getTextPaint()Landroid/text/TextPaint;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1}, Landroid/text/TextPaint;->getLetterSpacing()F
+    invoke-virtual {v2}, Landroid/text/TextPaint;->getLetterSpacing()F
 
-    move-result v1
+    move-result v2
 
-    cmpl-float v0, v0, v1
+    cmpl-float v0, v0, v2
 
-    if-eqz v0, :cond_6
+    if-eqz v0, :cond_5
 
-    return v2
+    return v1
 
-    :cond_6
+    :cond_5
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint;
 
     invoke-virtual {v0}, Landroid/text/TextPaint;->getFontFeatureSettings()Ljava/lang/String;
@@ -285,21 +314,21 @@
 
     invoke-virtual {p1}, Landroidx/core/text/PrecomputedTextCompat$Params;->getTextPaint()Landroid/text/TextPaint;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1}, Landroid/text/TextPaint;->getFontFeatureSettings()Ljava/lang/String;
+    invoke-virtual {v2}, Landroid/text/TextPaint;->getFontFeatureSettings()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-static {v0, v1}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
+    invoke-static {v0, v2}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
 
     move-result v0
 
-    if-nez v0, :cond_7
+    if-nez v0, :cond_6
 
-    return v2
+    return v1
 
-    :cond_7
+    :cond_6
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint;
 
     invoke-virtual {v0}, Landroid/text/TextPaint;->getFlags()I
@@ -308,22 +337,22 @@
 
     invoke-virtual {p1}, Landroidx/core/text/PrecomputedTextCompat$Params;->getTextPaint()Landroid/text/TextPaint;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1}, Landroid/text/TextPaint;->getFlags()I
+    invoke-virtual {v2}, Landroid/text/TextPaint;->getFlags()I
 
-    move-result v1
+    move-result v2
 
-    if-eq v0, v1, :cond_8
+    if-eq v0, v2, :cond_7
 
-    return v2
+    return v1
 
-    :cond_8
+    :cond_7
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/16 v1, 0x18
+    const/16 v2, 0x18
 
-    if-lt v0, v1, :cond_9
+    if-lt v0, v2, :cond_8
 
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint;
 
@@ -333,26 +362,26 @@
 
     invoke-virtual {p1}, Landroidx/core/text/PrecomputedTextCompat$Params;->getTextPaint()Landroid/text/TextPaint;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1}, Landroid/text/TextPaint;->getTextLocales()Landroid/os/LocaleList;
+    invoke-virtual {v2}, Landroid/text/TextPaint;->getTextLocales()Landroid/os/LocaleList;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v0, v1}, Landroid/os/LocaleList;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v2}, Landroid/os/LocaleList;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
-    if-nez v0, :cond_a
+    if-nez v0, :cond_9
 
-    return v2
+    return v1
 
-    :cond_9
+    :cond_8
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/16 v1, 0x11
+    const/16 v2, 0x11
 
-    if-lt v0, v1, :cond_a
+    if-lt v0, v2, :cond_9
 
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint;
 
@@ -362,28 +391,28 @@
 
     invoke-virtual {p1}, Landroidx/core/text/PrecomputedTextCompat$Params;->getTextPaint()Landroid/text/TextPaint;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1}, Landroid/text/TextPaint;->getTextLocale()Ljava/util/Locale;
+    invoke-virtual {v2}, Landroid/text/TextPaint;->getTextLocale()Ljava/util/Locale;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v0, v1}, Ljava/util/Locale;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v2}, Ljava/util/Locale;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
-    if-nez v0, :cond_a
+    if-nez v0, :cond_9
 
-    return v2
+    return v1
 
-    :cond_a
+    :cond_9
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint;
 
     invoke-virtual {v0}, Landroid/text/TextPaint;->getTypeface()Landroid/graphics/Typeface;
 
     move-result-object v0
 
-    if-nez v0, :cond_b
+    if-nez v0, :cond_a
 
     invoke-virtual {p1}, Landroidx/core/text/PrecomputedTextCompat$Params;->getTextPaint()Landroid/text/TextPaint;
 
@@ -393,11 +422,11 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_c
+    if-eqz p1, :cond_b
 
-    return v2
+    return v1
 
-    :cond_b
+    :cond_a
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint;
 
     invoke-virtual {v0}, Landroid/text/TextPaint;->getTypeface()Landroid/graphics/Typeface;
@@ -416,11 +445,11 @@
 
     move-result p1
 
-    if-nez p1, :cond_c
+    if-nez p1, :cond_b
 
-    return v2
+    return v1
 
-    :cond_c
+    :cond_b
     const/4 p1, 0x1
 
     return p1
diff --git a/com.discord/smali/androidx/core/text/PrecomputedTextCompat.smali b/com.discord/smali/androidx/core/text/PrecomputedTextCompat.smali
index e95e10df5b..f25638a35c 100644
--- a/com.discord/smali/androidx/core/text/PrecomputedTextCompat.smali
+++ b/com.discord/smali/androidx/core/text/PrecomputedTextCompat.smali
@@ -51,7 +51,7 @@
 .end method
 
 .method private constructor <init>(Landroid/text/PrecomputedText;Landroidx/core/text/PrecomputedTextCompat$Params;)V
-    .locals 0
+    .locals 2
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,10 +59,22 @@
 
     iput-object p2, p0, Landroidx/core/text/PrecomputedTextCompat;->mParams:Landroidx/core/text/PrecomputedTextCompat$Params;
 
-    const/4 p1, 0x0
+    const/4 p2, 0x0
 
-    iput-object p1, p0, Landroidx/core/text/PrecomputedTextCompat;->mParagraphEnds:[I
+    iput-object p2, p0, Landroidx/core/text/PrecomputedTextCompat;->mParagraphEnds:[I
 
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    move-object p1, p2
+
+    :goto_0
     iput-object p1, p0, Landroidx/core/text/PrecomputedTextCompat;->mWrapped:Landroid/text/PrecomputedText;
 
     return-void
@@ -102,6 +114,34 @@
 
     invoke-static {v0}, Landroidx/core/os/TraceCompat;->beginSection(Ljava/lang/String;)V
 
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p1, Landroidx/core/text/PrecomputedTextCompat$Params;->mWrapped:Landroid/text/PrecomputedText$Params;
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Landroidx/core/text/PrecomputedTextCompat;
+
+    iget-object v1, p1, Landroidx/core/text/PrecomputedTextCompat$Params;->mWrapped:Landroid/text/PrecomputedText$Params;
+
+    invoke-static {p0, v1}, Landroid/text/PrecomputedText;->create(Ljava/lang/CharSequence;Landroid/text/PrecomputedText$Params;)Landroid/text/PrecomputedText;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0, p1}, Landroidx/core/text/PrecomputedTextCompat;-><init>(Landroid/text/PrecomputedText;Landroidx/core/text/PrecomputedTextCompat$Params;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-static {}, Landroidx/core/os/TraceCompat;->endSection()V
+
+    return-object v0
+
+    :cond_0
+    :try_start_1
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
@@ -115,7 +155,7 @@
     const/4 v3, 0x0
 
     :goto_0
-    if-ge v3, v1, :cond_1
+    if-ge v3, v1, :cond_2
 
     const/16 v4, 0xa
 
@@ -123,13 +163,13 @@
 
     move-result v3
 
-    if-gez v3, :cond_0
+    if-gez v3, :cond_1
 
     move v3, v1
 
     goto :goto_1
 
-    :cond_0
+    :cond_1
     add-int/lit8 v3, v3, 0x1
 
     :goto_1
@@ -141,7 +181,7 @@
 
     goto :goto_0
 
-    :cond_1
+    :cond_2
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result v1
@@ -155,7 +195,7 @@
 
     move-result v4
 
-    if-ge v3, v4, :cond_2
+    if-ge v3, v4, :cond_3
 
     invoke-virtual {v0, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -173,12 +213,12 @@
 
     goto :goto_2
 
-    :cond_2
+    :cond_3
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v3, 0x17
 
-    if-lt v0, v3, :cond_3
+    if-lt v0, v3, :cond_4
 
     invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
 
@@ -222,12 +262,12 @@
 
     goto :goto_3
 
-    :cond_3
+    :cond_4
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v2, 0x15
 
-    if-lt v0, v2, :cond_4
+    if-lt v0, v2, :cond_5
 
     new-instance v3, Landroid/text/StaticLayout;
 
@@ -249,13 +289,13 @@
 
     invoke-direct/range {v3 .. v10}, Landroid/text/StaticLayout;-><init>(Ljava/lang/CharSequence;Landroid/text/TextPaint;ILandroid/text/Layout$Alignment;FFZ)V
 
-    :cond_4
+    :cond_5
     :goto_3
     new-instance v0, Landroidx/core/text/PrecomputedTextCompat;
 
     invoke-direct {v0, p0, p1, v1}, Landroidx/core/text/PrecomputedTextCompat;-><init>(Ljava/lang/CharSequence;Landroidx/core/text/PrecomputedTextCompat$Params;[I)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     invoke-static {}, Landroidx/core/os/TraceCompat;->endSection()V
 
@@ -351,8 +391,23 @@
 .end method
 
 .method public getParagraphCount()I
-    .locals 1
+    .locals 2
 
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mWrapped:Landroid/text/PrecomputedText;
+
+    invoke-virtual {v0}, Landroid/text/PrecomputedText;->getParagraphCount()I
+
+    move-result v0
+
+    return v0
+
+    :cond_0
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mParagraphEnds:[I
 
     array-length v0, v0
@@ -373,6 +428,21 @@
 
     invoke-static {p1, v1, v0, v2}, Landroidx/core/util/Preconditions;->checkArgumentInRange(IIILjava/lang/String;)I
 
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mWrapped:Landroid/text/PrecomputedText;
+
+    invoke-virtual {v0, p1}, Landroid/text/PrecomputedText;->getParagraphEnd(I)I
+
+    move-result p1
+
+    return p1
+
+    :cond_0
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mParagraphEnds:[I
 
     aget p1, v0, p1
@@ -393,11 +463,26 @@
 
     invoke-static {p1, v1, v0, v2}, Landroidx/core/util/Preconditions;->checkArgumentInRange(IIILjava/lang/String;)I
 
-    if-nez p1, :cond_0
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v2, 0x1d
+
+    if-lt v0, v2, :cond_0
+
+    iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mWrapped:Landroid/text/PrecomputedText;
+
+    invoke-virtual {v0, p1}, Landroid/text/PrecomputedText;->getParagraphStart(I)I
+
+    move-result p1
+
+    return p1
+
+    :cond_0
+    if-nez p1, :cond_1
 
     return v1
 
-    :cond_0
+    :cond_1
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mParagraphEnds:[I
 
     add-int/lit8 p1, p1, -0x1
@@ -471,7 +556,7 @@
 .end method
 
 .method public getSpans(IILjava/lang/Class;)[Ljava/lang/Object;
-    .locals 1
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -482,6 +567,21 @@
         }
     .end annotation
 
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mWrapped:Landroid/text/PrecomputedText;
+
+    invoke-virtual {v0, p1, p2, p3}, Landroid/text/PrecomputedText;->getSpans(IILjava/lang/Class;)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mText:Landroid/text/Spannable;
 
     invoke-interface {v0, p1, p2, p3}, Landroid/text/Spannable;->getSpans(IILjava/lang/Class;)[Ljava/lang/Object;
@@ -516,19 +616,32 @@
 .end method
 
 .method public removeSpan(Ljava/lang/Object;)V
-    .locals 1
+    .locals 2
 
     instance-of v0, p1, Landroid/text/style/MetricAffectingSpan;
 
-    if-nez v0, :cond_0
+    if-nez v0, :cond_1
 
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mWrapped:Landroid/text/PrecomputedText;
+
+    invoke-virtual {v0, p1}, Landroid/text/PrecomputedText;->removeSpan(Ljava/lang/Object;)V
+
+    return-void
+
+    :cond_0
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mText:Landroid/text/Spannable;
 
     invoke-interface {v0, p1}, Landroid/text/Spannable;->removeSpan(Ljava/lang/Object;)V
 
     return-void
 
-    :cond_0
+    :cond_1
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
     const-string v0, "MetricAffectingSpan can not be removed from PrecomputedText."
@@ -539,19 +652,32 @@
 .end method
 
 .method public setSpan(Ljava/lang/Object;III)V
-    .locals 1
+    .locals 2
 
     instance-of v0, p1, Landroid/text/style/MetricAffectingSpan;
 
-    if-nez v0, :cond_0
+    if-nez v0, :cond_1
 
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mWrapped:Landroid/text/PrecomputedText;
+
+    invoke-virtual {v0, p1, p2, p3, p4}, Landroid/text/PrecomputedText;->setSpan(Ljava/lang/Object;III)V
+
+    return-void
+
+    :cond_0
     iget-object v0, p0, Landroidx/core/text/PrecomputedTextCompat;->mText:Landroid/text/Spannable;
 
     invoke-interface {v0, p1, p2, p3, p4}, Landroid/text/Spannable;->setSpan(Ljava/lang/Object;III)V
 
     return-void
 
-    :cond_0
+    :cond_1
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
     const-string p2, "MetricAffectingSpan can not be set to PrecomputedText."
diff --git a/com.discord/smali/androidx/core/text/SpannableStringBuilderKt.smali b/com.discord/smali/androidx/core/text/SpannableStringBuilderKt.smali
index 320feacd0c..642d0ca7e7 100644
--- a/com.discord/smali/androidx/core/text/SpannableStringBuilderKt.smali
+++ b/com.discord/smali/androidx/core/text/SpannableStringBuilderKt.smali
@@ -20,7 +20,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$backgroundColor"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -64,7 +64,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$bold"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -144,7 +144,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$color"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -189,7 +189,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$inSpans"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -235,7 +235,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$inSpans"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -293,7 +293,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$italic"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -340,7 +340,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$scale"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -384,7 +384,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$strikeThrough"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -428,7 +428,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$subscript"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -472,7 +472,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$superscript"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -516,7 +516,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$underline"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/text/SpannableStringKt.smali b/com.discord/smali/androidx/core/text/SpannableStringKt.smali
index e8dff9720d..1ccc4d6a4e 100644
--- a/com.discord/smali/androidx/core/text/SpannableStringKt.smali
+++ b/com.discord/smali/androidx/core/text/SpannableStringKt.smali
@@ -7,7 +7,7 @@
 .method public static final clearSpans(Landroid/text/Spannable;)V
     .locals 4
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$clearSpans"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -51,7 +51,7 @@
 .method public static final set(Landroid/text/Spannable;IILjava/lang/Object;)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$set"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -69,7 +69,7 @@
 .method public static final set(Landroid/text/Spannable;Lkotlin/ranges/IntRange;Ljava/lang/Object;)V
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$set"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -81,9 +81,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget v0, p1, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v0, p1, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget p1, p1, Lkotlin/ranges/IntProgression;->bkR:I
+    iget p1, p1, Lkotlin/ranges/IntProgression;->bll:I
 
     const/16 v1, 0x11
 
@@ -95,7 +95,7 @@
 .method public static final toSpannable(Ljava/lang/CharSequence;)Landroid/text/Spannable;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toSpannable"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/text/SpannedStringKt.smali b/com.discord/smali/androidx/core/text/SpannedStringKt.smali
index e7235e5d35..e1794b89f9 100644
--- a/com.discord/smali/androidx/core/text/SpannedStringKt.smali
+++ b/com.discord/smali/androidx/core/text/SpannedStringKt.smali
@@ -16,7 +16,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Eo()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ed()V
 
     const-class v0, Ljava/lang/Object;
 
@@ -50,7 +50,7 @@
     move-result p2
 
     :cond_1
-    invoke-static {}, Lkotlin/jvm/internal/k;->Eo()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ed()V
 
     const-class p3, Ljava/lang/Object;
 
@@ -68,7 +68,7 @@
 .method public static final toSpanned(Ljava/lang/CharSequence;)Landroid/text/Spanned;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toSpanned"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/text/StringKt.smali b/com.discord/smali/androidx/core/text/StringKt.smali
index cebd83bf12..a4553daefc 100644
--- a/com.discord/smali/androidx/core/text/StringKt.smali
+++ b/com.discord/smali/androidx/core/text/StringKt.smali
@@ -7,7 +7,7 @@
 .method public static final htmlEncode(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$htmlEncode"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
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 24dd803027..4bc42ed8f7 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$1.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Landroidx/core/transition/TransitionKt$addListener$1;->invoke(Landroid/transition/Transition;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 dc1ed2fa2b..f99f7a1f89 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$2.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Landroidx/core/transition/TransitionKt$addListener$2;->invoke(Landroid/transition/Transition;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 ce20694f3e..0432c65834 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$3.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$3.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Landroidx/core/transition/TransitionKt$addListener$3;->invoke(Landroid/transition/Transition;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 7209f14ccd..f67e3a7157 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$4.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$4.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Landroidx/core/transition/TransitionKt$addListener$4;->invoke(Landroid/transition/Transition;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 f64d635b99..825456c9a8 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$5.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$5.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Landroidx/core/transition/TransitionKt$addListener$5;->invoke(Landroid/transition/Transition;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/core/transition/TransitionKt.smali b/com.discord/smali/androidx/core/transition/TransitionKt.smali
index 6b8f00a560..3fefd185eb 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt.smali
@@ -39,7 +39,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$addListener"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -144,7 +144,7 @@
     check-cast p5, Lkotlin/jvm/functions/Function1;
 
     :cond_4
-    const-string p2, "$receiver"
+    const-string p2, "$this$addListener"
 
     invoke-static {p0, p2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -200,7 +200,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnCancel"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -234,7 +234,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnEnd"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -268,7 +268,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnPause"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -302,7 +302,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnResume"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -336,7 +336,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnStart"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/util/AtomicFileKt.smali b/com.discord/smali/androidx/core/util/AtomicFileKt.smali
index c49b0f40f3..b1577091e4 100644
--- a/com.discord/smali/androidx/core/util/AtomicFileKt.smali
+++ b/com.discord/smali/androidx/core/util/AtomicFileKt.smali
@@ -7,7 +7,7 @@
 .method public static final readBytes(Landroid/util/AtomicFile;)[B
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$readBytes"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -25,7 +25,7 @@
 .method public static final readText(Landroid/util/AtomicFile;Ljava/nio/charset/Charset;)Ljava/lang/String;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$readText"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -79,7 +79,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$tryWrite"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -115,7 +115,7 @@
 .method public static final writeBytes(Landroid/util/AtomicFile;[B)V
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$writeBytes"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -151,7 +151,7 @@
 .method public static final writeText(Landroid/util/AtomicFile;Ljava/lang/String;Ljava/nio/charset/Charset;)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$writeText"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/util/HalfKt.smali b/com.discord/smali/androidx/core/util/HalfKt.smali
index 2dfd62cba1..6c6ed98aa6 100644
--- a/com.discord/smali/androidx/core/util/HalfKt.smali
+++ b/com.discord/smali/androidx/core/util/HalfKt.smali
@@ -37,7 +37,7 @@
 .method public static final toHalf(Ljava/lang/String;)Landroid/util/Half;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toHalf"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
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 bd3725814c..7a3a7d28b3 100644
--- a/com.discord/smali/androidx/core/util/LongSparseArrayKt$keyIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/LongSparseArrayKt$keyIterator$1.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private index:I
+.field final synthetic $this_keyIterator:Landroid/util/LongSparseArray;
 
-.field final synthetic receiver$0:Landroid/util/LongSparseArray;
+.field private index:I
 
 
 # direct methods
@@ -31,7 +31,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Landroidx/core/util/LongSparseArrayKt$keyIterator$1;->receiver$0:Landroid/util/LongSparseArray;
+    iput-object p1, p0, Landroidx/core/util/LongSparseArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/LongSparseArray;
 
     invoke-direct {p0}, Lkotlin/a/ac;-><init>()V
 
@@ -53,7 +53,7 @@
 
     iget v0, p0, Landroidx/core/util/LongSparseArrayKt$keyIterator$1;->index:I
 
-    iget-object v1, p0, Landroidx/core/util/LongSparseArrayKt$keyIterator$1;->receiver$0:Landroid/util/LongSparseArray;
+    iget-object v1, p0, Landroidx/core/util/LongSparseArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/LongSparseArray;
 
     invoke-virtual {v1}, Landroid/util/LongSparseArray;->size()I
 
@@ -74,7 +74,7 @@
 .method public final nextLong()J
     .locals 3
 
-    iget-object v0, p0, Landroidx/core/util/LongSparseArrayKt$keyIterator$1;->receiver$0:Landroid/util/LongSparseArray;
+    iget-object v0, p0, Landroidx/core/util/LongSparseArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/LongSparseArray;
 
     iget v1, p0, Landroidx/core/util/LongSparseArrayKt$keyIterator$1;->index:I
 
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 8f5234d76e..92d07b0aeb 100644
--- a/com.discord/smali/androidx/core/util/LongSparseArrayKt$valueIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/LongSparseArrayKt$valueIterator$1.smali
@@ -28,9 +28,9 @@
 
 
 # instance fields
-.field private index:I
+.field final synthetic $this_valueIterator:Landroid/util/LongSparseArray;
 
-.field final synthetic receiver$0:Landroid/util/LongSparseArray;
+.field private index:I
 
 
 # direct methods
@@ -44,7 +44,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Landroidx/core/util/LongSparseArrayKt$valueIterator$1;->receiver$0:Landroid/util/LongSparseArray;
+    iput-object p1, p0, Landroidx/core/util/LongSparseArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/LongSparseArray;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -66,7 +66,7 @@
 
     iget v0, p0, Landroidx/core/util/LongSparseArrayKt$valueIterator$1;->index:I
 
-    iget-object v1, p0, Landroidx/core/util/LongSparseArrayKt$valueIterator$1;->receiver$0:Landroid/util/LongSparseArray;
+    iget-object v1, p0, Landroidx/core/util/LongSparseArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/LongSparseArray;
 
     invoke-virtual {v1}, Landroid/util/LongSparseArray;->size()I
 
@@ -92,7 +92,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Landroidx/core/util/LongSparseArrayKt$valueIterator$1;->receiver$0:Landroid/util/LongSparseArray;
+    iget-object v0, p0, Landroidx/core/util/LongSparseArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/LongSparseArray;
 
     iget v1, p0, Landroidx/core/util/LongSparseArrayKt$valueIterator$1;->index:I
 
diff --git a/com.discord/smali/androidx/core/util/LongSparseArrayKt.smali b/com.discord/smali/androidx/core/util/LongSparseArrayKt.smali
index a8a8340e92..51b58caaf6 100644
--- a/com.discord/smali/androidx/core/util/LongSparseArrayKt.smali
+++ b/com.discord/smali/androidx/core/util/LongSparseArrayKt.smali
@@ -16,7 +16,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$contains"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -48,7 +48,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$containsKey"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -80,7 +80,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$containsValue"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -120,7 +120,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$forEach"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -171,7 +171,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getOrDefault"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -201,7 +201,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getOrElse"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -235,7 +235,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$size"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -258,7 +258,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -290,7 +290,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isNotEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -323,7 +323,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$keyIterator"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -352,7 +352,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -395,7 +395,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$putAll"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -442,7 +442,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$remove"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -488,7 +488,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$set"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -511,7 +511,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$valueIterator"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
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 89bbbcc6a0..da12cb5e56 100644
--- a/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$3.smali
+++ b/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$3.smali
@@ -68,7 +68,7 @@
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroidx/core/util/LruCacheKt$lruCache$3;->invoke(ZLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/core/util/PairKt.smali b/com.discord/smali/androidx/core/util/PairKt.smali
index f20673fb15..f811c12155 100644
--- a/com.discord/smali/androidx/core/util/PairKt.smali
+++ b/com.discord/smali/androidx/core/util/PairKt.smali
@@ -18,7 +18,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component1"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -41,7 +41,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component2"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -66,7 +66,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toAndroidPair"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -97,7 +97,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toKotlinPair"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/util/Predicate.smali b/com.discord/smali/androidx/core/util/Predicate.smali
new file mode 100644
index 0000000000..23b8219d4f
--- /dev/null
+++ b/com.discord/smali/androidx/core/util/Predicate.smali
@@ -0,0 +1,24 @@
+.class public interface abstract Landroidx/core/util/Predicate;
+.super Ljava/lang/Object;
+.source "Predicate.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract test(Ljava/lang/Object;)Z
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)Z"
+        }
+    .end annotation
+.end method
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 788ca30883..7c6bc95908 100644
--- a/com.discord/smali/androidx/core/util/RangeKt$toClosedRange$1.smali
+++ b/com.discord/smali/androidx/core/util/RangeKt$toClosedRange$1.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field final synthetic receiver$0:Landroid/util/Range;
+.field final synthetic $this_toClosedRange:Landroid/util/Range;
 
 
 # direct methods
@@ -40,7 +40,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Landroidx/core/util/RangeKt$toClosedRange$1;->receiver$0:Landroid/util/Range;
+    iput-object p1, p0, Landroidx/core/util/RangeKt$toClosedRange$1;->$this_toClosedRange:Landroid/util/Range;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -101,7 +101,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Landroidx/core/util/RangeKt$toClosedRange$1;->receiver$0:Landroid/util/Range;
+    iget-object v0, p0, Landroidx/core/util/RangeKt$toClosedRange$1;->$this_toClosedRange:Landroid/util/Range;
 
     invoke-virtual {v0}, Landroid/util/Range;->getUpper()Ljava/lang/Comparable;
 
@@ -118,7 +118,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Landroidx/core/util/RangeKt$toClosedRange$1;->receiver$0:Landroid/util/Range;
+    iget-object v0, p0, Landroidx/core/util/RangeKt$toClosedRange$1;->$this_toClosedRange:Landroid/util/Range;
 
     invoke-virtual {v0}, Landroid/util/Range;->getLower()Ljava/lang/Comparable;
 
diff --git a/com.discord/smali/androidx/core/util/RangeKt.smali b/com.discord/smali/androidx/core/util/RangeKt.smali
index 1205d06f67..edfb44d3ff 100644
--- a/com.discord/smali/androidx/core/util/RangeKt.smali
+++ b/com.discord/smali/androidx/core/util/RangeKt.smali
@@ -20,7 +20,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$and"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -55,7 +55,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -88,7 +88,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -119,7 +119,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$rangeTo"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -148,7 +148,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toClosedRange"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -175,7 +175,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$toRange"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/util/SizeKt.smali b/com.discord/smali/androidx/core/util/SizeKt.smali
index f4e7c83ee0..7801c77e8f 100644
--- a/com.discord/smali/androidx/core/util/SizeKt.smali
+++ b/com.discord/smali/androidx/core/util/SizeKt.smali
@@ -7,7 +7,7 @@
 .method public static final component1(Landroid/util/SizeF;)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component1"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -21,7 +21,7 @@
 .method public static final component1(Landroid/util/Size;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component1"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -35,7 +35,7 @@
 .method public static final component2(Landroid/util/SizeF;)F
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component2"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -49,7 +49,7 @@
 .method public static final component2(Landroid/util/Size;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$component2"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
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 f4877ca960..7d7c90d391 100644
--- a/com.discord/smali/androidx/core/util/SparseArrayKt$keyIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseArrayKt$keyIterator$1.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private index:I
+.field final synthetic $this_keyIterator:Landroid/util/SparseArray;
 
-.field final synthetic receiver$0:Landroid/util/SparseArray;
+.field private index:I
 
 
 # direct methods
@@ -31,7 +31,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Landroidx/core/util/SparseArrayKt$keyIterator$1;->receiver$0:Landroid/util/SparseArray;
+    iput-object p1, p0, Landroidx/core/util/SparseArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseArray;
 
     invoke-direct {p0}, Lkotlin/a/ab;-><init>()V
 
@@ -53,7 +53,7 @@
 
     iget v0, p0, Landroidx/core/util/SparseArrayKt$keyIterator$1;->index:I
 
-    iget-object v1, p0, Landroidx/core/util/SparseArrayKt$keyIterator$1;->receiver$0:Landroid/util/SparseArray;
+    iget-object v1, p0, Landroidx/core/util/SparseArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseArray;
 
     invoke-virtual {v1}, Landroid/util/SparseArray;->size()I
 
@@ -74,7 +74,7 @@
 .method public final nextInt()I
     .locals 3
 
-    iget-object v0, p0, Landroidx/core/util/SparseArrayKt$keyIterator$1;->receiver$0:Landroid/util/SparseArray;
+    iget-object v0, p0, Landroidx/core/util/SparseArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseArray;
 
     iget v1, p0, Landroidx/core/util/SparseArrayKt$keyIterator$1;->index:I
 
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 f2800735d9..34c7a6d599 100644
--- a/com.discord/smali/androidx/core/util/SparseArrayKt$valueIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseArrayKt$valueIterator$1.smali
@@ -28,9 +28,9 @@
 
 
 # instance fields
-.field private index:I
+.field final synthetic $this_valueIterator:Landroid/util/SparseArray;
 
-.field final synthetic receiver$0:Landroid/util/SparseArray;
+.field private index:I
 
 
 # direct methods
@@ -44,7 +44,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Landroidx/core/util/SparseArrayKt$valueIterator$1;->receiver$0:Landroid/util/SparseArray;
+    iput-object p1, p0, Landroidx/core/util/SparseArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseArray;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -66,7 +66,7 @@
 
     iget v0, p0, Landroidx/core/util/SparseArrayKt$valueIterator$1;->index:I
 
-    iget-object v1, p0, Landroidx/core/util/SparseArrayKt$valueIterator$1;->receiver$0:Landroid/util/SparseArray;
+    iget-object v1, p0, Landroidx/core/util/SparseArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseArray;
 
     invoke-virtual {v1}, Landroid/util/SparseArray;->size()I
 
@@ -92,7 +92,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Landroidx/core/util/SparseArrayKt$valueIterator$1;->receiver$0:Landroid/util/SparseArray;
+    iget-object v0, p0, Landroidx/core/util/SparseArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseArray;
 
     iget v1, p0, Landroidx/core/util/SparseArrayKt$valueIterator$1;->index:I
 
diff --git a/com.discord/smali/androidx/core/util/SparseArrayKt.smali b/com.discord/smali/androidx/core/util/SparseArrayKt.smali
index 0487259f67..ed9c767770 100644
--- a/com.discord/smali/androidx/core/util/SparseArrayKt.smali
+++ b/com.discord/smali/androidx/core/util/SparseArrayKt.smali
@@ -16,7 +16,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$contains"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -48,7 +48,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$containsKey"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -80,7 +80,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$containsValue"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -120,7 +120,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$forEach"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -171,7 +171,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getOrDefault"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -201,7 +201,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getOrElse"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -235,7 +235,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$size"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -258,7 +258,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -290,7 +290,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isNotEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -323,7 +323,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$keyIterator"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -352,7 +352,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -395,7 +395,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$putAll"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -442,7 +442,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$remove"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -488,7 +488,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$set"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -511,7 +511,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$valueIterator"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
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 165ff28ca3..ab0792df77 100644
--- a/com.discord/smali/androidx/core/util/SparseBooleanArrayKt$keyIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseBooleanArrayKt$keyIterator$1.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field private index:I
+.field final synthetic $this_keyIterator:Landroid/util/SparseBooleanArray;
 
-.field final synthetic receiver$0:Landroid/util/SparseBooleanArray;
+.field private index:I
 
 
 # direct methods
 .method constructor <init>(Landroid/util/SparseBooleanArray;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/core/util/SparseBooleanArrayKt$keyIterator$1;->receiver$0:Landroid/util/SparseBooleanArray;
+    iput-object p1, p0, Landroidx/core/util/SparseBooleanArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseBooleanArray;
 
     invoke-direct {p0}, Lkotlin/a/ab;-><init>()V
 
@@ -46,7 +46,7 @@
 
     iget v0, p0, Landroidx/core/util/SparseBooleanArrayKt$keyIterator$1;->index:I
 
-    iget-object v1, p0, Landroidx/core/util/SparseBooleanArrayKt$keyIterator$1;->receiver$0:Landroid/util/SparseBooleanArray;
+    iget-object v1, p0, Landroidx/core/util/SparseBooleanArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseBooleanArray;
 
     invoke-virtual {v1}, Landroid/util/SparseBooleanArray;->size()I
 
@@ -67,7 +67,7 @@
 .method public final nextInt()I
     .locals 3
 
-    iget-object v0, p0, Landroidx/core/util/SparseBooleanArrayKt$keyIterator$1;->receiver$0:Landroid/util/SparseBooleanArray;
+    iget-object v0, p0, Landroidx/core/util/SparseBooleanArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseBooleanArray;
 
     iget v1, p0, Landroidx/core/util/SparseBooleanArrayKt$keyIterator$1;->index:I
 
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 455021b9ab..e4ee1c2943 100644
--- a/com.discord/smali/androidx/core/util/SparseBooleanArrayKt$valueIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseBooleanArrayKt$valueIterator$1.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field private index:I
+.field final synthetic $this_valueIterator:Landroid/util/SparseBooleanArray;
 
-.field final synthetic receiver$0:Landroid/util/SparseBooleanArray;
+.field private index:I
 
 
 # direct methods
 .method constructor <init>(Landroid/util/SparseBooleanArray;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/core/util/SparseBooleanArrayKt$valueIterator$1;->receiver$0:Landroid/util/SparseBooleanArray;
+    iput-object p1, p0, Landroidx/core/util/SparseBooleanArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseBooleanArray;
 
     invoke-direct {p0}, Lkotlin/a/l;-><init>()V
 
@@ -46,7 +46,7 @@
 
     iget v0, p0, Landroidx/core/util/SparseBooleanArrayKt$valueIterator$1;->index:I
 
-    iget-object v1, p0, Landroidx/core/util/SparseBooleanArrayKt$valueIterator$1;->receiver$0:Landroid/util/SparseBooleanArray;
+    iget-object v1, p0, Landroidx/core/util/SparseBooleanArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseBooleanArray;
 
     invoke-virtual {v1}, Landroid/util/SparseBooleanArray;->size()I
 
@@ -67,7 +67,7 @@
 .method public final nextBoolean()Z
     .locals 3
 
-    iget-object v0, p0, Landroidx/core/util/SparseBooleanArrayKt$valueIterator$1;->receiver$0:Landroid/util/SparseBooleanArray;
+    iget-object v0, p0, Landroidx/core/util/SparseBooleanArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseBooleanArray;
 
     iget v1, p0, Landroidx/core/util/SparseBooleanArrayKt$valueIterator$1;->index:I
 
diff --git a/com.discord/smali/androidx/core/util/SparseBooleanArrayKt.smali b/com.discord/smali/androidx/core/util/SparseBooleanArrayKt.smali
index 77a44f2b66..6176b6d687 100644
--- a/com.discord/smali/androidx/core/util/SparseBooleanArrayKt.smali
+++ b/com.discord/smali/androidx/core/util/SparseBooleanArrayKt.smali
@@ -7,7 +7,7 @@
 .method public static final contains(Landroid/util/SparseBooleanArray;I)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$contains"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -30,7 +30,7 @@
 .method public static final containsKey(Landroid/util/SparseBooleanArray;I)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$containsKey"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -53,7 +53,7 @@
 .method public static final containsValue(Landroid/util/SparseBooleanArray;Z)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$containsValue"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -91,7 +91,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$forEach"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -137,7 +137,7 @@
 .method public static final getOrDefault(Landroid/util/SparseBooleanArray;IZ)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getOrDefault"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -161,7 +161,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getOrElse"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -200,7 +200,7 @@
 .method public static final getSize(Landroid/util/SparseBooleanArray;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$size"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -214,7 +214,7 @@
 .method public static final isEmpty(Landroid/util/SparseBooleanArray;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -237,7 +237,7 @@
 .method public static final isNotEmpty(Landroid/util/SparseBooleanArray;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isNotEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -260,7 +260,7 @@
 .method public static final keyIterator(Landroid/util/SparseBooleanArray;)Lkotlin/a/ab;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$keyIterator"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -276,7 +276,7 @@
 .method public static final plus(Landroid/util/SparseBooleanArray;Landroid/util/SparseBooleanArray;)Landroid/util/SparseBooleanArray;
     .locals 3
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -308,7 +308,7 @@
 .method public static final putAll(Landroid/util/SparseBooleanArray;Landroid/util/SparseBooleanArray;)V
     .locals 4
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$putAll"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -346,7 +346,7 @@
 .method public static final remove(Landroid/util/SparseBooleanArray;IZ)Z
     .locals 2
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$remove"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -379,7 +379,7 @@
 .method public static final set(Landroid/util/SparseBooleanArray;IZ)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$set"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -391,7 +391,7 @@
 .method public static final valueIterator(Landroid/util/SparseBooleanArray;)Lkotlin/a/l;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$valueIterator"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
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 ab80510e15..dcd78b27e9 100644
--- a/com.discord/smali/androidx/core/util/SparseIntArrayKt$keyIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseIntArrayKt$keyIterator$1.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field private index:I
+.field final synthetic $this_keyIterator:Landroid/util/SparseIntArray;
 
-.field final synthetic receiver$0:Landroid/util/SparseIntArray;
+.field private index:I
 
 
 # direct methods
 .method constructor <init>(Landroid/util/SparseIntArray;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/core/util/SparseIntArrayKt$keyIterator$1;->receiver$0:Landroid/util/SparseIntArray;
+    iput-object p1, p0, Landroidx/core/util/SparseIntArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseIntArray;
 
     invoke-direct {p0}, Lkotlin/a/ab;-><init>()V
 
@@ -46,7 +46,7 @@
 
     iget v0, p0, Landroidx/core/util/SparseIntArrayKt$keyIterator$1;->index:I
 
-    iget-object v1, p0, Landroidx/core/util/SparseIntArrayKt$keyIterator$1;->receiver$0:Landroid/util/SparseIntArray;
+    iget-object v1, p0, Landroidx/core/util/SparseIntArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseIntArray;
 
     invoke-virtual {v1}, Landroid/util/SparseIntArray;->size()I
 
@@ -67,7 +67,7 @@
 .method public final nextInt()I
     .locals 3
 
-    iget-object v0, p0, Landroidx/core/util/SparseIntArrayKt$keyIterator$1;->receiver$0:Landroid/util/SparseIntArray;
+    iget-object v0, p0, Landroidx/core/util/SparseIntArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseIntArray;
 
     iget v1, p0, Landroidx/core/util/SparseIntArrayKt$keyIterator$1;->index:I
 
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 5835c46c7a..1f2fd0ea98 100644
--- a/com.discord/smali/androidx/core/util/SparseIntArrayKt$valueIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseIntArrayKt$valueIterator$1.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field private index:I
+.field final synthetic $this_valueIterator:Landroid/util/SparseIntArray;
 
-.field final synthetic receiver$0:Landroid/util/SparseIntArray;
+.field private index:I
 
 
 # direct methods
 .method constructor <init>(Landroid/util/SparseIntArray;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/core/util/SparseIntArrayKt$valueIterator$1;->receiver$0:Landroid/util/SparseIntArray;
+    iput-object p1, p0, Landroidx/core/util/SparseIntArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseIntArray;
 
     invoke-direct {p0}, Lkotlin/a/ab;-><init>()V
 
@@ -46,7 +46,7 @@
 
     iget v0, p0, Landroidx/core/util/SparseIntArrayKt$valueIterator$1;->index:I
 
-    iget-object v1, p0, Landroidx/core/util/SparseIntArrayKt$valueIterator$1;->receiver$0:Landroid/util/SparseIntArray;
+    iget-object v1, p0, Landroidx/core/util/SparseIntArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseIntArray;
 
     invoke-virtual {v1}, Landroid/util/SparseIntArray;->size()I
 
@@ -67,7 +67,7 @@
 .method public final nextInt()I
     .locals 3
 
-    iget-object v0, p0, Landroidx/core/util/SparseIntArrayKt$valueIterator$1;->receiver$0:Landroid/util/SparseIntArray;
+    iget-object v0, p0, Landroidx/core/util/SparseIntArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseIntArray;
 
     iget v1, p0, Landroidx/core/util/SparseIntArrayKt$valueIterator$1;->index:I
 
diff --git a/com.discord/smali/androidx/core/util/SparseIntArrayKt.smali b/com.discord/smali/androidx/core/util/SparseIntArrayKt.smali
index df3556de3c..a8354f1f86 100644
--- a/com.discord/smali/androidx/core/util/SparseIntArrayKt.smali
+++ b/com.discord/smali/androidx/core/util/SparseIntArrayKt.smali
@@ -7,7 +7,7 @@
 .method public static final contains(Landroid/util/SparseIntArray;I)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$contains"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -30,7 +30,7 @@
 .method public static final containsKey(Landroid/util/SparseIntArray;I)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$containsKey"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -53,7 +53,7 @@
 .method public static final containsValue(Landroid/util/SparseIntArray;I)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$containsValue"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -91,7 +91,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$forEach"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -137,7 +137,7 @@
 .method public static final getOrDefault(Landroid/util/SparseIntArray;II)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getOrDefault"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -161,7 +161,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getOrElse"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -200,7 +200,7 @@
 .method public static final getSize(Landroid/util/SparseIntArray;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$size"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -214,7 +214,7 @@
 .method public static final isEmpty(Landroid/util/SparseIntArray;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -237,7 +237,7 @@
 .method public static final isNotEmpty(Landroid/util/SparseIntArray;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isNotEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -260,7 +260,7 @@
 .method public static final keyIterator(Landroid/util/SparseIntArray;)Lkotlin/a/ab;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$keyIterator"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -276,7 +276,7 @@
 .method public static final plus(Landroid/util/SparseIntArray;Landroid/util/SparseIntArray;)Landroid/util/SparseIntArray;
     .locals 3
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -308,7 +308,7 @@
 .method public static final putAll(Landroid/util/SparseIntArray;Landroid/util/SparseIntArray;)V
     .locals 4
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$putAll"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -346,7 +346,7 @@
 .method public static final remove(Landroid/util/SparseIntArray;II)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$remove"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -379,7 +379,7 @@
 .method public static final set(Landroid/util/SparseIntArray;II)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$set"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -391,7 +391,7 @@
 .method public static final valueIterator(Landroid/util/SparseIntArray;)Lkotlin/a/ab;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$valueIterator"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
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 304e9cd4ad..4cac0430a5 100644
--- a/com.discord/smali/androidx/core/util/SparseLongArrayKt$keyIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseLongArrayKt$keyIterator$1.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field private index:I
+.field final synthetic $this_keyIterator:Landroid/util/SparseLongArray;
 
-.field final synthetic receiver$0:Landroid/util/SparseLongArray;
+.field private index:I
 
 
 # direct methods
 .method constructor <init>(Landroid/util/SparseLongArray;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/core/util/SparseLongArrayKt$keyIterator$1;->receiver$0:Landroid/util/SparseLongArray;
+    iput-object p1, p0, Landroidx/core/util/SparseLongArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseLongArray;
 
     invoke-direct {p0}, Lkotlin/a/ab;-><init>()V
 
@@ -46,7 +46,7 @@
 
     iget v0, p0, Landroidx/core/util/SparseLongArrayKt$keyIterator$1;->index:I
 
-    iget-object v1, p0, Landroidx/core/util/SparseLongArrayKt$keyIterator$1;->receiver$0:Landroid/util/SparseLongArray;
+    iget-object v1, p0, Landroidx/core/util/SparseLongArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseLongArray;
 
     invoke-virtual {v1}, Landroid/util/SparseLongArray;->size()I
 
@@ -67,7 +67,7 @@
 .method public final nextInt()I
     .locals 3
 
-    iget-object v0, p0, Landroidx/core/util/SparseLongArrayKt$keyIterator$1;->receiver$0:Landroid/util/SparseLongArray;
+    iget-object v0, p0, Landroidx/core/util/SparseLongArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseLongArray;
 
     iget v1, p0, Landroidx/core/util/SparseLongArrayKt$keyIterator$1;->index:I
 
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 fe7b9005d3..72b3f7ba34 100644
--- a/com.discord/smali/androidx/core/util/SparseLongArrayKt$valueIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseLongArrayKt$valueIterator$1.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field private index:I
+.field final synthetic $this_valueIterator:Landroid/util/SparseLongArray;
 
-.field final synthetic receiver$0:Landroid/util/SparseLongArray;
+.field private index:I
 
 
 # direct methods
 .method constructor <init>(Landroid/util/SparseLongArray;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/core/util/SparseLongArrayKt$valueIterator$1;->receiver$0:Landroid/util/SparseLongArray;
+    iput-object p1, p0, Landroidx/core/util/SparseLongArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseLongArray;
 
     invoke-direct {p0}, Lkotlin/a/ac;-><init>()V
 
@@ -46,7 +46,7 @@
 
     iget v0, p0, Landroidx/core/util/SparseLongArrayKt$valueIterator$1;->index:I
 
-    iget-object v1, p0, Landroidx/core/util/SparseLongArrayKt$valueIterator$1;->receiver$0:Landroid/util/SparseLongArray;
+    iget-object v1, p0, Landroidx/core/util/SparseLongArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseLongArray;
 
     invoke-virtual {v1}, Landroid/util/SparseLongArray;->size()I
 
@@ -67,7 +67,7 @@
 .method public final nextLong()J
     .locals 3
 
-    iget-object v0, p0, Landroidx/core/util/SparseLongArrayKt$valueIterator$1;->receiver$0:Landroid/util/SparseLongArray;
+    iget-object v0, p0, Landroidx/core/util/SparseLongArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseLongArray;
 
     iget v1, p0, Landroidx/core/util/SparseLongArrayKt$valueIterator$1;->index:I
 
diff --git a/com.discord/smali/androidx/core/util/SparseLongArrayKt.smali b/com.discord/smali/androidx/core/util/SparseLongArrayKt.smali
index db7c906f8d..034b4c7f80 100644
--- a/com.discord/smali/androidx/core/util/SparseLongArrayKt.smali
+++ b/com.discord/smali/androidx/core/util/SparseLongArrayKt.smali
@@ -7,7 +7,7 @@
 .method public static final contains(Landroid/util/SparseLongArray;I)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$contains"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -30,7 +30,7 @@
 .method public static final containsKey(Landroid/util/SparseLongArray;I)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$containsKey"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -53,7 +53,7 @@
 .method public static final containsValue(Landroid/util/SparseLongArray;J)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$containsValue"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -91,7 +91,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$forEach"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -137,7 +137,7 @@
 .method public static final getOrDefault(Landroid/util/SparseLongArray;IJ)J
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getOrDefault"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -161,7 +161,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$getOrElse"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -200,7 +200,7 @@
 .method public static final getSize(Landroid/util/SparseLongArray;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$size"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -214,7 +214,7 @@
 .method public static final isEmpty(Landroid/util/SparseLongArray;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -237,7 +237,7 @@
 .method public static final isNotEmpty(Landroid/util/SparseLongArray;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isNotEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -260,7 +260,7 @@
 .method public static final keyIterator(Landroid/util/SparseLongArray;)Lkotlin/a/ab;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$keyIterator"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -276,7 +276,7 @@
 .method public static final plus(Landroid/util/SparseLongArray;Landroid/util/SparseLongArray;)Landroid/util/SparseLongArray;
     .locals 3
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plus"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -308,7 +308,7 @@
 .method public static final putAll(Landroid/util/SparseLongArray;Landroid/util/SparseLongArray;)V
     .locals 5
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$putAll"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -346,7 +346,7 @@
 .method public static final remove(Landroid/util/SparseLongArray;IJ)Z
     .locals 3
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$remove"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -381,7 +381,7 @@
 .method public static final set(Landroid/util/SparseLongArray;IJ)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$set"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -393,7 +393,7 @@
 .method public static final valueIterator(Landroid/util/SparseLongArray;)Lkotlin/a/ac;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$valueIterator"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/view/MenuKt$children$1.smali b/com.discord/smali/androidx/core/view/MenuKt$children$1.smali
index 9e7104a1a1..aa3f65a55d 100644
--- a/com.discord/smali/androidx/core/view/MenuKt$children$1.smali
+++ b/com.discord/smali/androidx/core/view/MenuKt$children$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic receiver$0:Landroid/view/Menu;
+.field final synthetic $this_children:Landroid/view/Menu;
 
 
 # direct methods
 .method constructor <init>(Landroid/view/Menu;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/core/view/MenuKt$children$1;->receiver$0:Landroid/view/Menu;
+    iput-object p1, p0, Landroidx/core/view/MenuKt$children$1;->$this_children:Landroid/view/Menu;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,7 +54,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Landroidx/core/view/MenuKt$children$1;->receiver$0:Landroid/view/Menu;
+    iget-object v0, p0, Landroidx/core/view/MenuKt$children$1;->$this_children:Landroid/view/Menu;
 
     invoke-static {v0}, Landroidx/core/view/MenuKt;->iterator(Landroid/view/Menu;)Ljava/util/Iterator;
 
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 a1a11ab28b..39e6ec8a76 100644
--- a/com.discord/smali/androidx/core/view/MenuKt$iterator$1.smali
+++ b/com.discord/smali/androidx/core/view/MenuKt$iterator$1.smali
@@ -29,16 +29,16 @@
 
 
 # instance fields
-.field private index:I
+.field final synthetic $this_iterator:Landroid/view/Menu;
 
-.field final synthetic receiver$0:Landroid/view/Menu;
+.field private index:I
 
 
 # direct methods
 .method constructor <init>(Landroid/view/Menu;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/core/view/MenuKt$iterator$1;->receiver$0:Landroid/view/Menu;
+    iput-object p1, p0, Landroidx/core/view/MenuKt$iterator$1;->$this_iterator:Landroid/view/Menu;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,7 +52,7 @@
 
     iget v0, p0, Landroidx/core/view/MenuKt$iterator$1;->index:I
 
-    iget-object v1, p0, Landroidx/core/view/MenuKt$iterator$1;->receiver$0:Landroid/view/Menu;
+    iget-object v1, p0, Landroidx/core/view/MenuKt$iterator$1;->$this_iterator:Landroid/view/Menu;
 
     invoke-interface {v1}, Landroid/view/Menu;->size()I
 
@@ -73,7 +73,7 @@
 .method public final next()Landroid/view/MenuItem;
     .locals 3
 
-    iget-object v0, p0, Landroidx/core/view/MenuKt$iterator$1;->receiver$0:Landroid/view/Menu;
+    iget-object v0, p0, Landroidx/core/view/MenuKt$iterator$1;->$this_iterator:Landroid/view/Menu;
 
     iget v1, p0, Landroidx/core/view/MenuKt$iterator$1;->index:I
 
@@ -112,7 +112,7 @@
 .method public final remove()V
     .locals 2
 
-    iget-object v0, p0, Landroidx/core/view/MenuKt$iterator$1;->receiver$0:Landroid/view/Menu;
+    iget-object v0, p0, Landroidx/core/view/MenuKt$iterator$1;->$this_iterator:Landroid/view/Menu;
 
     iget v1, p0, Landroidx/core/view/MenuKt$iterator$1;->index:I
 
diff --git a/com.discord/smali/androidx/core/view/MenuKt.smali b/com.discord/smali/androidx/core/view/MenuKt.smali
index 2aa52d00ce..8845b0dd92 100644
--- a/com.discord/smali/androidx/core/view/MenuKt.smali
+++ b/com.discord/smali/androidx/core/view/MenuKt.smali
@@ -7,7 +7,7 @@
 .method public static final contains(Landroid/view/Menu;Landroid/view/MenuItem;)Z
     .locals 4
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$contains"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -63,7 +63,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$forEach"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -114,7 +114,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$forEachIndexed"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -156,7 +156,7 @@
 .method public static final get(Landroid/view/Menu;I)Landroid/view/MenuItem;
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$get"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -184,7 +184,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$children"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -200,7 +200,7 @@
 .method public static final getSize(Landroid/view/Menu;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$size"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -214,7 +214,7 @@
 .method public static final isEmpty(Landroid/view/Menu;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -237,7 +237,7 @@
 .method public static final isNotEmpty(Landroid/view/Menu;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isNotEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -270,7 +270,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$iterator"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -286,7 +286,7 @@
 .method public static final minusAssign(Landroid/view/Menu;Landroid/view/MenuItem;)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minusAssign"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/view/ViewCompat$1.smali b/com.discord/smali/androidx/core/view/ViewCompat$1.smali
index 3d1518d3ea..fe66ba638a 100644
--- a/com.discord/smali/androidx/core/view/ViewCompat$1.smali
+++ b/com.discord/smali/androidx/core/view/ViewCompat$1.smali
@@ -37,7 +37,7 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
     .locals 1
 
-    invoke-static {p2}, Landroidx/core/view/WindowInsetsCompat;->wrap(Ljava/lang/Object;)Landroidx/core/view/WindowInsetsCompat;
+    invoke-static {p2}, Landroidx/core/view/WindowInsetsCompat;->toWindowInsetsCompat(Landroid/view/WindowInsets;)Landroidx/core/view/WindowInsetsCompat;
 
     move-result-object p2
 
@@ -47,11 +47,9 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Landroidx/core/view/WindowInsetsCompat;->unwrap(Landroidx/core/view/WindowInsetsCompat;)Ljava/lang/Object;
+    invoke-virtual {p1}, Landroidx/core/view/WindowInsetsCompat;->toWindowInsets()Landroid/view/WindowInsets;
 
     move-result-object p1
 
-    check-cast p1, Landroid/view/WindowInsets;
-
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/core/view/ViewCompat.smali b/com.discord/smali/androidx/core/view/ViewCompat.smali
index 837638aefd..4d60da15b1 100644
--- a/com.discord/smali/androidx/core/view/ViewCompat.smali
+++ b/com.discord/smali/androidx/core/view/ViewCompat.smali
@@ -522,13 +522,13 @@
 
     move-result-object v0
 
-    check-cast v0, Ljava/util/Map;
+    check-cast v0, Landroidx/collection/SimpleArrayMap;
 
     if-nez v0, :cond_0
 
-    new-instance v0, Landroidx/collection/ArrayMap;
+    new-instance v0, Landroidx/collection/SimpleArrayMap;
 
-    invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
+    invoke-direct {v0}, Landroidx/collection/SimpleArrayMap;-><init>()V
 
     sget v1, Landroidx/core/R$id;->tag_unhandled_key_listeners:I
 
@@ -539,7 +539,7 @@
 
     invoke-direct {v1, p1}, Landroidx/core/view/ViewCompat$2;-><init>(Landroidx/core/view/ViewCompat$OnUnhandledKeyEventListenerCompat;)V
 
-    invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, p1, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {p0, v1}, Landroid/view/View;->addOnUnhandledKeyEventListener(Landroid/view/View$OnUnhandledKeyEventListener;)V
 
@@ -786,12 +786,10 @@
 
     if-lt v0, v1, :cond_1
 
-    invoke-static {p1}, Landroidx/core/view/WindowInsetsCompat;->unwrap(Landroidx/core/view/WindowInsetsCompat;)Ljava/lang/Object;
+    invoke-virtual {p1}, Landroidx/core/view/WindowInsetsCompat;->toWindowInsets()Landroid/view/WindowInsets;
 
     move-result-object p1
 
-    check-cast p1, Landroid/view/WindowInsets;
-
     invoke-virtual {p0, p1}, Landroid/view/View;->dispatchApplyWindowInsets(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
 
     move-result-object p0
@@ -807,7 +805,7 @@
     invoke-direct {p1, p0}, Landroid/view/WindowInsets;-><init>(Landroid/view/WindowInsets;)V
 
     :cond_0
-    invoke-static {p1}, Landroidx/core/view/WindowInsetsCompat;->wrap(Ljava/lang/Object;)Landroidx/core/view/WindowInsetsCompat;
+    invoke-static {p1}, Landroidx/core/view/WindowInsetsCompat;->toWindowInsetsCompat(Landroid/view/WindowInsets;)Landroidx/core/view/WindowInsetsCompat;
 
     move-result-object p0
 
@@ -1334,6 +1332,29 @@
 .end method
 
 .method private static getAccessibilityDelegateInternal(Landroid/view/View;)Landroid/view/View$AccessibilityDelegate;
+    .locals 2
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    invoke-virtual {p0}, Landroid/view/View;->getAccessibilityDelegate()Landroid/view/View$AccessibilityDelegate;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    invoke-static {p0}, Landroidx/core/view/ViewCompat;->getAccessibilityDelegateThroughReflection(Landroid/view/View;)Landroid/view/View$AccessibilityDelegate;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method private static getAccessibilityDelegateThroughReflection(Landroid/view/View;)Landroid/view/View$AccessibilityDelegate;
     .locals 4
 
     sget-boolean v0, Landroidx/core/view/ViewCompat;->sAccessibilityDelegateCheckFailed:Z
@@ -2310,6 +2331,39 @@
     return p0
 .end method
 
+.method public static getSystemGestureExclusionRects(Landroid/view/View;)Ljava/util/List;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/view/View;",
+            ")",
+            "Ljava/util/List<",
+            "Landroid/graphics/Rect;",
+            ">;"
+        }
+    .end annotation
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    invoke-virtual {p0}, Landroid/view/View;->getSystemGestureExclusionRects()Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
 .method public static getTransitionName(Landroid/view/View;)Ljava/lang/String;
     .locals 2
 
@@ -3349,12 +3403,10 @@
 
     if-lt v0, v1, :cond_1
 
-    invoke-static {p1}, Landroidx/core/view/WindowInsetsCompat;->unwrap(Landroidx/core/view/WindowInsetsCompat;)Ljava/lang/Object;
+    invoke-virtual {p1}, Landroidx/core/view/WindowInsetsCompat;->toWindowInsets()Landroid/view/WindowInsets;
 
     move-result-object p1
 
-    check-cast p1, Landroid/view/WindowInsets;
-
     invoke-virtual {p0, p1}, Landroid/view/View;->onApplyWindowInsets(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
 
     move-result-object p0
@@ -3370,7 +3422,7 @@
     invoke-direct {p1, p0}, Landroid/view/WindowInsets;-><init>(Landroid/view/WindowInsets;)V
 
     :cond_0
-    invoke-static {p1}, Landroidx/core/view/WindowInsetsCompat;->wrap(Ljava/lang/Object;)Landroidx/core/view/WindowInsetsCompat;
+    invoke-static {p1}, Landroidx/core/view/WindowInsetsCompat;->toWindowInsetsCompat(Landroid/view/WindowInsets;)Landroidx/core/view/WindowInsetsCompat;
 
     move-result-object p0
 
@@ -3620,14 +3672,14 @@
 
     move-result-object v0
 
-    check-cast v0, Ljava/util/Map;
+    check-cast v0, Landroidx/collection/SimpleArrayMap;
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, p1}, Landroidx/collection/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -4653,6 +4705,30 @@
     return-void
 .end method
 
+.method public static setSystemGestureExclusionRects(Landroid/view/View;Ljava/util/List;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/view/View;",
+            "Ljava/util/List<",
+            "Landroid/graphics/Rect;",
+            ">;)V"
+        }
+    .end annotation
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    invoke-virtual {p0, p1}, Landroid/view/View;->setSystemGestureExclusionRects(Ljava/util/List;)V
+
+    :cond_0
+    return-void
+.end method
+
 .method public static setTooltipText(Landroid/view/View;Ljava/lang/CharSequence;)V
     .locals 2
 
diff --git a/com.discord/smali/androidx/core/view/ViewGroupKt$children$1.smali b/com.discord/smali/androidx/core/view/ViewGroupKt$children$1.smali
index 0c64422122..7b6308a601 100644
--- a/com.discord/smali/androidx/core/view/ViewGroupKt$children$1.smali
+++ b/com.discord/smali/androidx/core/view/ViewGroupKt$children$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic receiver$0:Landroid/view/ViewGroup;
+.field final synthetic $this_children:Landroid/view/ViewGroup;
 
 
 # direct methods
 .method constructor <init>(Landroid/view/ViewGroup;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/core/view/ViewGroupKt$children$1;->receiver$0:Landroid/view/ViewGroup;
+    iput-object p1, p0, Landroidx/core/view/ViewGroupKt$children$1;->$this_children:Landroid/view/ViewGroup;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,7 +54,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Landroidx/core/view/ViewGroupKt$children$1;->receiver$0:Landroid/view/ViewGroup;
+    iget-object v0, p0, Landroidx/core/view/ViewGroupKt$children$1;->$this_children:Landroid/view/ViewGroup;
 
     invoke-static {v0}, Landroidx/core/view/ViewGroupKt;->iterator(Landroid/view/ViewGroup;)Ljava/util/Iterator;
 
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 4deaef8b1d..cbeed5e0ca 100644
--- a/com.discord/smali/androidx/core/view/ViewGroupKt$iterator$1.smali
+++ b/com.discord/smali/androidx/core/view/ViewGroupKt$iterator$1.smali
@@ -29,16 +29,16 @@
 
 
 # instance fields
-.field private index:I
+.field final synthetic $this_iterator:Landroid/view/ViewGroup;
 
-.field final synthetic receiver$0:Landroid/view/ViewGroup;
+.field private index:I
 
 
 # direct methods
 .method constructor <init>(Landroid/view/ViewGroup;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/core/view/ViewGroupKt$iterator$1;->receiver$0:Landroid/view/ViewGroup;
+    iput-object p1, p0, Landroidx/core/view/ViewGroupKt$iterator$1;->$this_iterator:Landroid/view/ViewGroup;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,7 +52,7 @@
 
     iget v0, p0, Landroidx/core/view/ViewGroupKt$iterator$1;->index:I
 
-    iget-object v1, p0, Landroidx/core/view/ViewGroupKt$iterator$1;->receiver$0:Landroid/view/ViewGroup;
+    iget-object v1, p0, Landroidx/core/view/ViewGroupKt$iterator$1;->$this_iterator:Landroid/view/ViewGroup;
 
     invoke-virtual {v1}, Landroid/view/ViewGroup;->getChildCount()I
 
@@ -73,7 +73,7 @@
 .method public final next()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Landroidx/core/view/ViewGroupKt$iterator$1;->receiver$0:Landroid/view/ViewGroup;
+    iget-object v0, p0, Landroidx/core/view/ViewGroupKt$iterator$1;->$this_iterator:Landroid/view/ViewGroup;
 
     iget v1, p0, Landroidx/core/view/ViewGroupKt$iterator$1;->index:I
 
@@ -112,7 +112,7 @@
 .method public final remove()V
     .locals 2
 
-    iget-object v0, p0, Landroidx/core/view/ViewGroupKt$iterator$1;->receiver$0:Landroid/view/ViewGroup;
+    iget-object v0, p0, Landroidx/core/view/ViewGroupKt$iterator$1;->$this_iterator:Landroid/view/ViewGroup;
 
     iget v1, p0, Landroidx/core/view/ViewGroupKt$iterator$1;->index:I
 
diff --git a/com.discord/smali/androidx/core/view/ViewGroupKt.smali b/com.discord/smali/androidx/core/view/ViewGroupKt.smali
index a53c510d71..7d80796d08 100644
--- a/com.discord/smali/androidx/core/view/ViewGroupKt.smali
+++ b/com.discord/smali/androidx/core/view/ViewGroupKt.smali
@@ -7,7 +7,7 @@
 .method public static final contains(Landroid/view/ViewGroup;Landroid/view/View;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$contains"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -47,7 +47,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$forEach"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -98,7 +98,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$forEachIndexed"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -140,7 +140,7 @@
 .method public static final get(Landroid/view/ViewGroup;I)Landroid/view/View;
     .locals 3
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$get"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -197,7 +197,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$children"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -213,7 +213,7 @@
 .method public static final getSize(Landroid/view/ViewGroup;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$size"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -227,7 +227,7 @@
 .method public static final isEmpty(Landroid/view/ViewGroup;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -250,7 +250,7 @@
 .method public static final isNotEmpty(Landroid/view/ViewGroup;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isNotEmpty"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -283,7 +283,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$iterator"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -299,7 +299,7 @@
 .method public static final minusAssign(Landroid/view/ViewGroup;Landroid/view/View;)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$minusAssign"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -315,7 +315,7 @@
 .method public static final plusAssign(Landroid/view/ViewGroup;Landroid/view/View;)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$plusAssign"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -331,7 +331,7 @@
 .method public static final setMargins(Landroid/view/ViewGroup$MarginLayoutParams;I)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$setMargins"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -343,7 +343,7 @@
 .method public static final updateMargins(Landroid/view/ViewGroup$MarginLayoutParams;IIII)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$updateMargins"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -383,7 +383,7 @@
     iget p4, p0, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
 
     :cond_3
-    const-string p5, "$receiver"
+    const-string p5, "$this$updateMargins"
 
     invoke-static {p0, p5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -395,7 +395,7 @@
 .method public static final updateMarginsRelative(Landroid/view/ViewGroup$MarginLayoutParams;IIII)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$updateMarginsRelative"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -445,7 +445,7 @@
     iget p4, p0, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
 
     :cond_3
-    const-string p5, "$receiver"
+    const-string p5, "$this$updateMarginsRelative"
 
     invoke-static {p0, p5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/view/ViewKt$doOnPreDraw$1.smali b/com.discord/smali/androidx/core/view/ViewKt$doOnPreDraw$1.smali
index 78c3bb3c91..57c6b17fdc 100644
--- a/com.discord/smali/androidx/core/view/ViewKt$doOnPreDraw$1.smali
+++ b/com.discord/smali/androidx/core/view/ViewKt$doOnPreDraw$1.smali
@@ -3,12 +3,12 @@
 .source "View.kt"
 
 # interfaces
-.implements Landroid/view/ViewTreeObserver$OnPreDrawListener;
+.implements Ljava/lang/Runnable;
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/core/view/ViewKt;->doOnPreDraw(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
+    value = Landroidx/core/view/ViewKt;->doOnPreDraw(Landroid/view/View;Lkotlin/jvm/functions/Function1;)Landroidx/core/view/OneShotPreDrawListener;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -20,21 +20,17 @@
 # instance fields
 .field final synthetic $action:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic $vto:Landroid/view/ViewTreeObserver;
-
-.field final synthetic receiver$0:Landroid/view/View;
+.field final synthetic $this_doOnPreDraw:Landroid/view/View;
 
 
 # direct methods
-.method public constructor <init>(Landroid/view/View;Lkotlin/jvm/functions/Function1;Landroid/view/ViewTreeObserver;)V
+.method public constructor <init>(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/core/view/ViewKt$doOnPreDraw$1;->receiver$0:Landroid/view/View;
+    iput-object p1, p0, Landroidx/core/view/ViewKt$doOnPreDraw$1;->$this_doOnPreDraw:Landroid/view/View;
 
     iput-object p2, p0, Landroidx/core/view/ViewKt$doOnPreDraw$1;->$action:Lkotlin/jvm/functions/Function1;
 
-    iput-object p3, p0, Landroidx/core/view/ViewKt$doOnPreDraw$1;->$vto:Landroid/view/ViewTreeObserver;
-
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -42,52 +38,14 @@
 
 
 # virtual methods
-.method public final onPreDraw()Z
+.method public final run()V
     .locals 2
 
     iget-object v0, p0, Landroidx/core/view/ViewKt$doOnPreDraw$1;->$action:Lkotlin/jvm/functions/Function1;
 
-    iget-object v1, p0, Landroidx/core/view/ViewKt$doOnPreDraw$1;->receiver$0:Landroid/view/View;
+    iget-object v1, p0, Landroidx/core/view/ViewKt$doOnPreDraw$1;->$this_doOnPreDraw:Landroid/view/View;
 
     invoke-interface {v0, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Landroidx/core/view/ViewKt$doOnPreDraw$1;->$vto:Landroid/view/ViewTreeObserver;
-
-    const-string v1, "vto"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0}, Landroid/view/ViewTreeObserver;->isAlive()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Landroidx/core/view/ViewKt$doOnPreDraw$1;->$vto:Landroid/view/ViewTreeObserver;
-
-    move-object v1, p0
-
-    check-cast v1, Landroid/view/ViewTreeObserver$OnPreDrawListener;
-
-    invoke-virtual {v0, v1}, Landroid/view/ViewTreeObserver;->removeOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Landroidx/core/view/ViewKt$doOnPreDraw$1;->receiver$0:Landroid/view/View;
-
-    invoke-virtual {v0}, Landroid/view/View;->getViewTreeObserver()Landroid/view/ViewTreeObserver;
-
-    move-result-object v0
-
-    move-object v1, p0
-
-    check-cast v1, Landroid/view/ViewTreeObserver$OnPreDrawListener;
-
-    invoke-virtual {v0, v1}, Landroid/view/ViewTreeObserver;->removeOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
-
-    :goto_0
-    const/4 v0, 0x1
-
-    return v0
+    return-void
 .end method
diff --git a/com.discord/smali/androidx/core/view/ViewKt.smali b/com.discord/smali/androidx/core/view/ViewKt.smali
index 8b9ff90c7f..ae1793370a 100644
--- a/com.discord/smali/androidx/core/view/ViewKt.smali
+++ b/com.discord/smali/androidx/core/view/ViewKt.smali
@@ -18,7 +18,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnLayout"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -68,7 +68,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnNextLayout"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -87,8 +87,8 @@
     return-void
 .end method
 
-.method public static final doOnPreDraw(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
-    .locals 2
+.method public static final doOnPreDraw(Landroid/view/View;Lkotlin/jvm/functions/Function1;)Landroidx/core/view/OneShotPreDrawListener;
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -97,11 +97,12 @@
             "-",
             "Landroid/view/View;",
             "Lkotlin/Unit;",
-            ">;)V"
+            ">;)",
+            "Landroidx/core/view/OneShotPreDrawListener;"
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$doOnPreDraw"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -109,25 +110,27 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Landroid/view/View;->getViewTreeObserver()Landroid/view/ViewTreeObserver;
+    new-instance v0, Landroidx/core/view/ViewKt$doOnPreDraw$1;
 
-    move-result-object v0
+    invoke-direct {v0, p0, p1}, Landroidx/core/view/ViewKt$doOnPreDraw$1;-><init>(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
 
-    new-instance v1, Landroidx/core/view/ViewKt$doOnPreDraw$1;
+    check-cast v0, Ljava/lang/Runnable;
 
-    invoke-direct {v1, p0, p1, v0}, Landroidx/core/view/ViewKt$doOnPreDraw$1;-><init>(Landroid/view/View;Lkotlin/jvm/functions/Function1;Landroid/view/ViewTreeObserver;)V
+    invoke-static {p0, v0}, Landroidx/core/view/OneShotPreDrawListener;->add(Landroid/view/View;Ljava/lang/Runnable;)Landroidx/core/view/OneShotPreDrawListener;
 
-    check-cast v1, Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    move-result-object p0
 
-    invoke-virtual {v0, v1}, Landroid/view/ViewTreeObserver;->addOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
+    const-string p1, "OneShotPreDrawListener.add(this) { action(this) }"
 
-    return-void
+    invoke-static {p0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
 .end method
 
 .method public static final drawToBitmap(Landroid/view/View;Landroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
     .locals 3
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$drawToBitmap"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -215,7 +218,7 @@
 .method public static final getMarginBottom(Landroid/view/View;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$marginBottom"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -247,7 +250,7 @@
 .method public static final getMarginEnd(Landroid/view/View;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$marginEnd"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -276,7 +279,7 @@
 .method public static final getMarginLeft(Landroid/view/View;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$marginLeft"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -308,7 +311,7 @@
 .method public static final getMarginRight(Landroid/view/View;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$marginRight"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -340,7 +343,7 @@
 .method public static final getMarginStart(Landroid/view/View;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$marginStart"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -369,7 +372,7 @@
 .method public static final getMarginTop(Landroid/view/View;)I
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$marginTop"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -401,7 +404,7 @@
 .method public static final isGone(Landroid/view/View;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isGone"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -426,7 +429,7 @@
 .method public static final isInvisible(Landroid/view/View;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isInvisible"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -451,7 +454,7 @@
 .method public static final isVisible(Landroid/view/View;)Z
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isVisible"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -485,7 +488,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$postDelayed"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -518,7 +521,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$postOnAnimationDelayed"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -540,7 +543,7 @@
 .method public static final setGone(Landroid/view/View;Z)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isGone"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -562,7 +565,7 @@
 .method public static final setInvisible(Landroid/view/View;Z)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isInvisible"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -584,7 +587,7 @@
 .method public static final setPadding(Landroid/view/View;I)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$setPadding"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -596,7 +599,7 @@
 .method public static final setVisible(Landroid/view/View;Z)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$isVisible"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -629,7 +632,7 @@
         }
     .end annotation
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$updateLayoutParams"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -678,7 +681,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Eo()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ed()V
 
     check-cast v0, Landroid/view/ViewGroup$LayoutParams;
 
@@ -692,7 +695,7 @@
 .method public static final updatePadding(Landroid/view/View;IIII)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$updatePadding"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -740,7 +743,7 @@
     move-result p4
 
     :cond_3
-    const-string p5, "$receiver"
+    const-string p5, "$this$updatePadding"
 
     invoke-static {p0, p5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -752,7 +755,7 @@
 .method public static final updatePaddingRelative(Landroid/view/View;IIII)V
     .locals 1
 
-    const-string v0, "$receiver"
+    const-string v0, "$this$updatePaddingRelative"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -800,7 +803,7 @@
     move-result p4
 
     :cond_3
-    const-string p5, "$receiver"
+    const-string p5, "$this$updatePaddingRelative"
 
     invoke-static {p0, p5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/view/WindowInsetsCompat.smali b/com.discord/smali/androidx/core/view/WindowInsetsCompat.smali
index 7d8ad2ecfa..89e263f28a 100644
--- a/com.discord/smali/androidx/core/view/WindowInsetsCompat.smali
+++ b/com.discord/smali/androidx/core/view/WindowInsetsCompat.smali
@@ -45,7 +45,7 @@
     return-void
 .end method
 
-.method private constructor <init>(Ljava/lang/Object;)V
+.method constructor <init>(Ljava/lang/Object;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
@@ -55,33 +55,13 @@
     return-void
 .end method
 
-.method static unwrap(Landroidx/core/view/WindowInsetsCompat;)Ljava/lang/Object;
-    .locals 0
-
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x0
-
-    return-object p0
-
-    :cond_0
-    iget-object p0, p0, Landroidx/core/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object;
-
-    return-object p0
-.end method
-
-.method static wrap(Ljava/lang/Object;)Landroidx/core/view/WindowInsetsCompat;
+.method public static toWindowInsetsCompat(Landroid/view/WindowInsets;)Landroidx/core/view/WindowInsetsCompat;
     .locals 1
 
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x0
-
-    return-object p0
-
-    :cond_0
     new-instance v0, Landroidx/core/view/WindowInsetsCompat;
 
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
     invoke-direct {v0, p0}, Landroidx/core/view/WindowInsetsCompat;-><init>(Ljava/lang/Object;)V
 
     return-object v0
@@ -175,57 +155,47 @@
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x1
+    .locals 2
 
     if-ne p0, p1, :cond_0
 
-    return v0
+    const/4 p1, 0x1
+
+    return p1
 
     :cond_0
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_2
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    move-result-object v2
+    move-result-object v0
 
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    move-result-object v3
+    move-result-object v1
 
-    if-eq v2, v3, :cond_1
+    if-eq v0, v1, :cond_1
 
     goto :goto_0
 
     :cond_1
     check-cast p1, Landroidx/core/view/WindowInsetsCompat;
 
-    iget-object v2, p0, Landroidx/core/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object;
+    iget-object v0, p0, Landroidx/core/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object;
 
     iget-object p1, p1, Landroidx/core/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object;
 
-    if-nez v2, :cond_3
-
-    if-nez p1, :cond_2
-
-    return v0
-
-    :cond_2
-    return v1
-
-    :cond_3
-    invoke-virtual {v2, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Landroidx/core/util/ObjectsCompat;->equals(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
     return p1
 
-    :cond_4
+    :cond_2
     :goto_0
-    return v1
+    const/4 p1, 0x0
+
+    return p1
 .end method
 
 .method public getDisplayCutout()Landroidx/core/view/DisplayCutoutCompat;
@@ -257,6 +227,37 @@
     return-object v0
 .end method
 
+.method public getMandatorySystemGestureInsets()Landroidx/core/graphics/Insets;
+    .locals 2
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object;
+
+    check-cast v0, Landroid/view/WindowInsets;
+
+    invoke-virtual {v0}, Landroid/view/WindowInsets;->getMandatorySystemGestureInsets()Landroid/graphics/Insets;
+
+    move-result-object v0
+
+    invoke-static {v0}, Landroidx/core/graphics/Insets;->wrap(Landroid/graphics/Insets;)Landroidx/core/graphics/Insets;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    invoke-virtual {p0}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsets()Landroidx/core/graphics/Insets;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public getStableInsetBottom()I
     .locals 2
 
@@ -357,6 +358,84 @@
     return v0
 .end method
 
+.method public getStableInsets()Landroidx/core/graphics/Insets;
+    .locals 4
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object;
+
+    check-cast v0, Landroid/view/WindowInsets;
+
+    invoke-virtual {v0}, Landroid/view/WindowInsets;->getStableInsets()Landroid/graphics/Insets;
+
+    move-result-object v0
+
+    invoke-static {v0}, Landroidx/core/graphics/Insets;->wrap(Landroid/graphics/Insets;)Landroidx/core/graphics/Insets;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    invoke-virtual {p0}, Landroidx/core/view/WindowInsetsCompat;->getStableInsetLeft()I
+
+    move-result v0
+
+    invoke-virtual {p0}, Landroidx/core/view/WindowInsetsCompat;->getStableInsetTop()I
+
+    move-result v1
+
+    invoke-virtual {p0}, Landroidx/core/view/WindowInsetsCompat;->getStableInsetRight()I
+
+    move-result v2
+
+    invoke-virtual {p0}, Landroidx/core/view/WindowInsetsCompat;->getStableInsetBottom()I
+
+    move-result v3
+
+    invoke-static {v0, v1, v2, v3}, Landroidx/core/graphics/Insets;->of(IIII)Landroidx/core/graphics/Insets;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getSystemGestureInsets()Landroidx/core/graphics/Insets;
+    .locals 2
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object;
+
+    check-cast v0, Landroid/view/WindowInsets;
+
+    invoke-virtual {v0}, Landroid/view/WindowInsets;->getSystemGestureInsets()Landroid/graphics/Insets;
+
+    move-result-object v0
+
+    invoke-static {v0}, Landroidx/core/graphics/Insets;->wrap(Landroid/graphics/Insets;)Landroidx/core/graphics/Insets;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    invoke-virtual {p0}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsets()Landroidx/core/graphics/Insets;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public getSystemWindowInsetBottom()I
     .locals 2
 
@@ -457,6 +536,84 @@
     return v0
 .end method
 
+.method public getSystemWindowInsets()Landroidx/core/graphics/Insets;
+    .locals 4
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object;
+
+    check-cast v0, Landroid/view/WindowInsets;
+
+    invoke-virtual {v0}, Landroid/view/WindowInsets;->getSystemWindowInsets()Landroid/graphics/Insets;
+
+    move-result-object v0
+
+    invoke-static {v0}, Landroidx/core/graphics/Insets;->wrap(Landroid/graphics/Insets;)Landroidx/core/graphics/Insets;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    invoke-virtual {p0}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetLeft()I
+
+    move-result v0
+
+    invoke-virtual {p0}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetTop()I
+
+    move-result v1
+
+    invoke-virtual {p0}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetRight()I
+
+    move-result v2
+
+    invoke-virtual {p0}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
+
+    move-result v3
+
+    invoke-static {v0, v1, v2, v3}, Landroidx/core/graphics/Insets;->of(IIII)Landroidx/core/graphics/Insets;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getTappableElementInsets()Landroidx/core/graphics/Insets;
+    .locals 2
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object;
+
+    check-cast v0, Landroid/view/WindowInsets;
+
+    invoke-virtual {v0}, Landroid/view/WindowInsets;->getTappableElementInsets()Landroid/graphics/Insets;
+
+    move-result-object v0
+
+    invoke-static {v0}, Landroidx/core/graphics/Insets;->wrap(Landroid/graphics/Insets;)Landroidx/core/graphics/Insets;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    invoke-virtual {p0}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsets()Landroidx/core/graphics/Insets;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public hasInsets()Z
     .locals 2
 
@@ -658,3 +815,13 @@
 
     return-object p1
 .end method
+
+.method public toWindowInsets()Landroid/view/WindowInsets;
+    .locals 1
+
+    iget-object v0, p0, Landroidx/core/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object;
+
+    check-cast v0, Landroid/view/WindowInsets;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat.smali
index e81b30110b..07152b0099 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat.smali
@@ -49,6 +49,14 @@
 
 .field public static final ACTION_NEXT_HTML_ELEMENT:Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
 
+.field public static final ACTION_PAGE_DOWN:Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+
+.field public static final ACTION_PAGE_LEFT:Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+
+.field public static final ACTION_PAGE_RIGHT:Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+
+.field public static final ACTION_PAGE_UP:Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+
 .field public static final ACTION_PASTE:Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
 
 .field public static final ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY:Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
@@ -485,9 +493,11 @@
 
     sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    if-lt v2, v3, :cond_6
+    const/16 v10, 0x1d
 
-    sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_CONTEXT_CLICK:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+    if-lt v2, v10, :cond_6
+
+    sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_PAGE_UP:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 
     move-object v5, v2
 
@@ -497,6 +507,126 @@
     move-object v5, v1
 
     :goto_6
+    const v6, 0x1020046
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    move-object v4, v0
+
+    invoke-direct/range {v4 .. v9}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;-><init>(Ljava/lang/Object;ILjava/lang/CharSequence;Landroidx/core/view/accessibility/AccessibilityViewCommand;Ljava/lang/Class;)V
+
+    sput-object v0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_PAGE_UP:Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+
+    new-instance v0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+
+    sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    if-lt v2, v10, :cond_7
+
+    sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_PAGE_DOWN:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+
+    move-object v12, v2
+
+    goto :goto_7
+
+    :cond_7
+    move-object v12, v1
+
+    :goto_7
+    const v13, 0x1020047
+
+    const/4 v14, 0x0
+
+    const/4 v15, 0x0
+
+    const/16 v16, 0x0
+
+    move-object v11, v0
+
+    invoke-direct/range {v11 .. v16}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;-><init>(Ljava/lang/Object;ILjava/lang/CharSequence;Landroidx/core/view/accessibility/AccessibilityViewCommand;Ljava/lang/Class;)V
+
+    sput-object v0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_PAGE_DOWN:Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+
+    new-instance v0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+
+    sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    if-lt v2, v10, :cond_8
+
+    sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_PAGE_LEFT:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+
+    move-object v5, v2
+
+    goto :goto_8
+
+    :cond_8
+    move-object v5, v1
+
+    :goto_8
+    const v6, 0x1020048
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    move-object v4, v0
+
+    invoke-direct/range {v4 .. v9}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;-><init>(Ljava/lang/Object;ILjava/lang/CharSequence;Landroidx/core/view/accessibility/AccessibilityViewCommand;Ljava/lang/Class;)V
+
+    sput-object v0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_PAGE_LEFT:Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+
+    new-instance v0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+
+    sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    if-lt v2, v10, :cond_9
+
+    sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_PAGE_RIGHT:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+
+    move-object v12, v2
+
+    goto :goto_9
+
+    :cond_9
+    move-object v12, v1
+
+    :goto_9
+    const v13, 0x1020049
+
+    const/4 v14, 0x0
+
+    const/4 v15, 0x0
+
+    const/16 v16, 0x0
+
+    move-object v11, v0
+
+    invoke-direct/range {v11 .. v16}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;-><init>(Ljava/lang/Object;ILjava/lang/CharSequence;Landroidx/core/view/accessibility/AccessibilityViewCommand;Ljava/lang/Class;)V
+
+    sput-object v0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_PAGE_RIGHT:Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+
+    new-instance v0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+
+    sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    if-lt v2, v3, :cond_a
+
+    sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_CONTEXT_CLICK:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+
+    move-object v5, v2
+
+    goto :goto_a
+
+    :cond_a
+    move-object v5, v1
+
+    :goto_a
     const v6, 0x102003c
 
     const/4 v7, 0x0
@@ -517,18 +647,18 @@
 
     const/16 v3, 0x18
 
-    if-lt v2, v3, :cond_7
+    if-lt v2, v3, :cond_b
 
     sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SET_PROGRESS:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 
     move-object v11, v2
 
-    goto :goto_7
+    goto :goto_b
 
-    :cond_7
+    :cond_b
     move-object v11, v1
 
-    :goto_7
+    :goto_b
     const v12, 0x102003d
 
     const/4 v13, 0x0
@@ -549,18 +679,18 @@
 
     const/16 v3, 0x1a
 
-    if-lt v2, v3, :cond_8
+    if-lt v2, v3, :cond_c
 
     sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_MOVE_WINDOW:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 
     move-object v3, v2
 
-    goto :goto_8
+    goto :goto_c
 
-    :cond_8
+    :cond_c
     move-object v3, v1
 
-    :goto_8
+    :goto_c
     const v4, 0x1020042
 
     const/4 v5, 0x0
@@ -581,18 +711,18 @@
 
     const/16 v3, 0x1c
 
-    if-lt v2, v3, :cond_9
+    if-lt v2, v3, :cond_d
 
     sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SHOW_TOOLTIP:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 
     move-object v9, v2
 
-    goto :goto_9
+    goto :goto_d
 
-    :cond_9
+    :cond_d
     move-object v9, v1
 
-    :goto_9
+    :goto_d
     const v10, 0x1020044
 
     const/4 v11, 0x0
@@ -611,11 +741,11 @@
 
     sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    if-lt v2, v3, :cond_a
+    if-lt v2, v3, :cond_e
 
     sget-object v1, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_HIDE_TOOLTIP:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 
-    :cond_a
+    :cond_e
     move-object v15, v1
 
     const v16, 0x1020045
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat.smali
index 7f98de292d..37a998c109 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat.smali
@@ -208,6 +208,8 @@
 
 .method public isHeading()Z
     .locals 2
+    .annotation runtime Ljava/lang/Deprecated;
+    .end annotation
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat.smali
new file mode 100644
index 0000000000..8c9d99ba57
--- /dev/null
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat.smali
@@ -0,0 +1,143 @@
+.class public final Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat;
+.super Ljava/lang/Object;
+.source "AccessibilityNodeInfoCompat.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "TouchDelegateInfoCompat"
+.end annotation
+
+
+# instance fields
+.field final mInfo:Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;
+
+
+# direct methods
+.method constructor <init>(Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/util/Map;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Landroid/graphics/Region;",
+            "Landroid/view/View;",
+            ">;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    new-instance v0, Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;
+
+    invoke-direct {v0, p1}, Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;-><init>(Ljava/util/Map;)V
+
+    iput-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;
+
+    return-void
+
+    :cond_0
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getRegionAt(I)Landroid/graphics/Region;
+    .locals 2
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;
+
+    invoke-virtual {v0, p1}, Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;->getRegionAt(I)Landroid/graphics/Region;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
+
+.method public final getRegionCount()I
+    .locals 2
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;
+
+    invoke-virtual {v0}, Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;->getRegionCount()I
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final getTargetForRegion(Landroid/graphics/Region;)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
+    .locals 2
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;
+
+    invoke-virtual {v0, p1}, Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;->getTargetForRegion(Landroid/graphics/Region;)Landroid/view/accessibility/AccessibilityNodeInfo;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    invoke-static {p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->wrap(Landroid/view/accessibility/AccessibilityNodeInfo;)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.smali b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.smali
index 45352871ba..355aa712ca 100644
--- a/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.smali
+++ b/com.discord/smali/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.smali
@@ -6,6 +6,7 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
+        Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat;,
         Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$RangeInfoCompat;,
         Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;,
         Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;,
@@ -131,6 +132,8 @@
 
 .field public mParentVirtualDescendantId:I
 
+.field private mVirtualDescendantId:I
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -148,6 +151,8 @@
 
     iput v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mParentVirtualDescendantId:I
 
+    iput v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mVirtualDescendantId:I
+
     iput-object p1, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
 
     return-void
@@ -164,6 +169,8 @@
 
     iput v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mParentVirtualDescendantId:I
 
+    iput v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mVirtualDescendantId:I
+
     check-cast p1, Landroid/view/accessibility/AccessibilityNodeInfo;
 
     iput-object p1, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
@@ -411,10 +418,54 @@
 
     sparse-switch p0, :sswitch_data_0
 
+    packed-switch p0, :pswitch_data_0
+
+    packed-switch p0, :pswitch_data_1
+
     const-string p0, "ACTION_UNKNOWN"
 
     return-object p0
 
+    :pswitch_0
+    const-string p0, "ACTION_PAGE_RIGHT"
+
+    return-object p0
+
+    :pswitch_1
+    const-string p0, "ACTION_PAGE_LEFT"
+
+    return-object p0
+
+    :pswitch_2
+    const-string p0, "ACTION_PAGE_DOWN"
+
+    return-object p0
+
+    :pswitch_3
+    const-string p0, "ACTION_PAGE_UP"
+
+    return-object p0
+
+    :pswitch_4
+    const-string p0, "ACTION_SCROLL_RIGHT"
+
+    return-object p0
+
+    :pswitch_5
+    const-string p0, "ACTION_SCROLL_DOWN"
+
+    return-object p0
+
+    :pswitch_6
+    const-string p0, "ACTION_SCROLL_LEFT"
+
+    return-object p0
+
+    :pswitch_7
+    const-string p0, "ACTION_SCROLL_UP"
+
+    return-object p0
+
     :sswitch_0
     const-string p0, "ACTION_SET_SELECTION"
 
@@ -524,6 +575,22 @@
         0x10000 -> :sswitch_1
         0x20000 -> :sswitch_0
     .end sparse-switch
+
+    :pswitch_data_0
+    .packed-switch 0x1020038
+        :pswitch_7
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+    .end packed-switch
+
+    :pswitch_data_1
+    .packed-switch 0x1020046
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
 .end method
 
 .method private getBooleanProperty(I)Z
@@ -1145,24 +1212,42 @@
 
     if-nez v2, :cond_3
 
-    iget-object p1, p1, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
+    iget-object v2, p1, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
 
-    if-eqz p1, :cond_4
+    if-eqz v2, :cond_4
 
     return v1
 
     :cond_3
-    iget-object p1, p1, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
+    iget-object v3, p1, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
 
-    invoke-virtual {v2, p1}, Landroid/view/accessibility/AccessibilityNodeInfo;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v2, v3}, Landroid/view/accessibility/AccessibilityNodeInfo;->equals(Ljava/lang/Object;)Z
 
-    move-result p1
+    move-result v2
 
-    if-nez p1, :cond_4
+    if-nez v2, :cond_4
 
     return v1
 
     :cond_4
+    iget v2, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mVirtualDescendantId:I
+
+    iget v3, p1, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mVirtualDescendantId:I
+
+    if-eq v2, v3, :cond_5
+
+    return v1
+
+    :cond_5
+    iget v2, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mParentVirtualDescendantId:I
+
+    iget p1, p1, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mParentVirtualDescendantId:I
+
+    if-eq v2, p1, :cond_6
+
+    return v1
+
+    :cond_6
     return v0
 .end method
 
@@ -1420,6 +1505,8 @@
 
 .method public getBoundsInParent(Landroid/graphics/Rect;)V
     .locals 1
+    .annotation runtime Ljava/lang/Deprecated;
+    .end annotation
 
     iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
 
@@ -2178,6 +2265,35 @@
     return-object v0
 .end method
 
+.method public getTouchDelegateInfo()Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat;
+    .locals 2
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
+
+    invoke-virtual {v0}, Landroid/view/accessibility/AccessibilityNodeInfo;->getTouchDelegateInfo()Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    new-instance v1, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat;
+
+    invoke-direct {v1, v0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat;-><init>(Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;)V
+
+    return-object v1
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
+
 .method public getTraversalAfter()Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
     .locals 2
 
@@ -2700,8 +2816,23 @@
 .end method
 
 .method public isTextEntryKey()Z
-    .locals 1
+    .locals 2
 
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
+
+    invoke-virtual {v0}, Landroid/view/accessibility/AccessibilityNodeInfo;->isTextEntryKey()Z
+
+    move-result v0
+
+    return v0
+
+    :cond_0
     const/16 v0, 0x8
 
     invoke-direct {p0, v0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->getBooleanProperty(I)Z
@@ -2894,6 +3025,8 @@
 
 .method public setBoundsInParent(Landroid/graphics/Rect;)V
     .locals 1
+    .annotation runtime Ljava/lang/Deprecated;
+    .end annotation
 
     iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
 
@@ -3461,6 +3594,10 @@
 .method public setParent(Landroid/view/View;)V
     .locals 1
 
+    const/4 v0, -0x1
+
+    iput v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mParentVirtualDescendantId:I
+
     iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
 
     invoke-virtual {v0, p1}, Landroid/view/accessibility/AccessibilityNodeInfo;->setParent(Landroid/view/View;)V
@@ -3610,6 +3747,10 @@
 .method public setSource(Landroid/view/View;)V
     .locals 1
 
+    const/4 v0, -0x1
+
+    iput v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mVirtualDescendantId:I
+
     iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
 
     invoke-virtual {v0, p1}, Landroid/view/accessibility/AccessibilityNodeInfo;->setSource(Landroid/view/View;)V
@@ -3620,6 +3761,8 @@
 .method public setSource(Landroid/view/View;I)V
     .locals 2
 
+    iput p2, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mVirtualDescendantId:I
+
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v1, 0x10
@@ -3645,8 +3788,21 @@
 .end method
 
 .method public setTextEntryKey(Z)V
-    .locals 1
+    .locals 2
 
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
+
+    invoke-virtual {v0, p1}, Landroid/view/accessibility/AccessibilityNodeInfo;->setTextEntryKey(Z)V
+
+    return-void
+
+    :cond_0
     const/16 v0, 0x8
 
     invoke-direct {p0, v0, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setBooleanProperty(IZ)V
@@ -3707,6 +3863,25 @@
     return-void
 .end method
 
+.method public setTouchDelegateInfo(Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat;)V
+    .locals 2
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo;
+
+    iget-object p1, p1, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$TouchDelegateInfoCompat;->mInfo:Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;
+
+    invoke-virtual {v0, p1}, Landroid/view/accessibility/AccessibilityNodeInfo;->setTouchDelegateInfo(Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;)V
+
+    :cond_0
+    return-void
+.end method
+
 .method public setTraversalAfter(Landroid/view/View;)V
     .locals 2
 
@@ -3810,7 +3985,7 @@
 .end method
 
 .method public toString()Ljava/lang/String;
-    .locals 4
+    .locals 8
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -4016,41 +4191,115 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
+    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const-string v2, ", "
+
+    const/4 v3, 0x1
+
+    const/16 v4, 0x15
+
+    if-lt v1, v4, :cond_2
+
+    invoke-virtual {p0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->getActionList()Ljava/util/List;
+
+    move-result-object v1
+
+    const/4 v4, 0x0
+
+    :goto_0
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v5
+
+    if-ge v4, v5, :cond_4
+
+    invoke-interface {v1, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+
+    invoke-virtual {v5}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->getId()I
+
+    move-result v6
+
+    invoke-static {v6}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->getActionSymbolicName(I)Ljava/lang/String;
+
+    move-result-object v6
+
+    const-string v7, "ACTION_UNKNOWN"
+
+    invoke-virtual {v6, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_0
+
+    invoke-virtual {v5}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->getLabel()Ljava/lang/CharSequence;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_0
+
+    invoke-virtual {v5}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->getLabel()Ljava/lang/CharSequence;
+
+    move-result-object v5
+
+    invoke-interface {v5}, Ljava/lang/CharSequence;->toString()Ljava/lang/String;
+
+    move-result-object v6
+
+    :cond_0
+    invoke-virtual {v0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v5
+
+    sub-int/2addr v5, v3
+
+    if-eq v4, v5, :cond_1
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_1
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_0
+
+    :cond_2
     invoke-virtual {p0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->getActions()I
 
     move-result v1
 
-    :cond_0
-    :goto_0
-    if-eqz v1, :cond_1
-
-    const/4 v2, 0x1
+    :cond_3
+    :goto_1
+    if-eqz v1, :cond_4
 
     invoke-static {v1}, Ljava/lang/Integer;->numberOfTrailingZeros(I)I
 
-    move-result v3
+    move-result v4
 
-    shl-int/2addr v2, v3
+    shl-int v4, v3, v4
 
-    xor-int/lit8 v3, v2, -0x1
+    xor-int/lit8 v5, v4, -0x1
 
-    and-int/2addr v1, v3
+    and-int/2addr v1, v5
 
-    invoke-static {v2}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->getActionSymbolicName(I)Ljava/lang/String;
+    invoke-static {v4}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->getActionSymbolicName(I)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v4
+
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    if-eqz v1, :cond_3
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    if-eqz v1, :cond_0
+    goto :goto_1
 
-    const-string v2, ", "
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    goto :goto_0
-
-    :cond_1
+    :cond_4
     const-string v1, "]"
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/androidx/core/widget/NestedScrollView$AccessibilityDelegate.smali b/com.discord/smali/androidx/core/widget/NestedScrollView$AccessibilityDelegate.smali
index b8925a56e9..3de9aa9acb 100644
--- a/com.discord/smali/androidx/core/widget/NestedScrollView$AccessibilityDelegate.smali
+++ b/com.discord/smali/androidx/core/widget/NestedScrollView$AccessibilityDelegate.smali
@@ -209,7 +209,7 @@
 
     if-eq p2, p3, :cond_3
 
-    invoke-virtual {p1, v1, p2}, Landroidx/core/widget/NestedScrollView;->smoothScrollTo(II)V
+    invoke-virtual {p1, v1, p2, v0}, Landroidx/core/widget/NestedScrollView;->smoothScrollTo(IIZ)V
 
     return v0
 
@@ -253,7 +253,7 @@
 
     if-eq p2, p3, :cond_5
 
-    invoke-virtual {p1, v1, p2}, Landroidx/core/widget/NestedScrollView;->smoothScrollTo(II)V
+    invoke-virtual {p1, v1, p2, v0}, Landroidx/core/widget/NestedScrollView;->smoothScrollTo(IIZ)V
 
     return v0
 
diff --git a/com.discord/smali/androidx/core/widget/NestedScrollView.smali b/com.discord/smali/androidx/core/widget/NestedScrollView.smali
index 943c4e6f59..c9f465010b 100644
--- a/com.discord/smali/androidx/core/widget/NestedScrollView.smali
+++ b/com.discord/smali/androidx/core/widget/NestedScrollView.smali
@@ -1118,6 +1118,130 @@
     return v1
 .end method
 
+.method private smoothScrollBy(IIZ)V
+    .locals 5
+
+    invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getChildCount()I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-static {}, Landroid/view/animation/AnimationUtils;->currentAnimationTimeMillis()J
+
+    move-result-wide v0
+
+    iget-wide v2, p0, Landroidx/core/widget/NestedScrollView;->mLastScroll:J
+
+    sub-long/2addr v0, v2
+
+    const-wide/16 v2, 0xfa
+
+    cmp-long v4, v0, v2
+
+    if-lez v4, :cond_1
+
+    const/4 p1, 0x0
+
+    invoke-virtual {p0, p1}, Landroidx/core/widget/NestedScrollView;->getChildAt(I)Landroid/view/View;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+    move-result-object v1
+
+    check-cast v1, Landroid/widget/FrameLayout$LayoutParams;
+
+    invoke-virtual {v0}, Landroid/view/View;->getHeight()I
+
+    move-result v0
+
+    iget v2, v1, Landroid/widget/FrameLayout$LayoutParams;->topMargin:I
+
+    add-int/2addr v0, v2
+
+    iget v1, v1, Landroid/widget/FrameLayout$LayoutParams;->bottomMargin:I
+
+    add-int/2addr v0, v1
+
+    invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getHeight()I
+
+    move-result v1
+
+    invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getPaddingTop()I
+
+    move-result v2
+
+    sub-int/2addr v1, v2
+
+    invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getPaddingBottom()I
+
+    move-result v2
+
+    sub-int/2addr v1, v2
+
+    invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getScrollY()I
+
+    move-result v2
+
+    sub-int/2addr v0, v1
+
+    invoke-static {p1, v0}, Ljava/lang/Math;->max(II)I
+
+    move-result v0
+
+    add-int/2addr p2, v2
+
+    invoke-static {p2, v0}, Ljava/lang/Math;->min(II)I
+
+    move-result p2
+
+    invoke-static {p1, p2}, Ljava/lang/Math;->max(II)I
+
+    move-result p2
+
+    sub-int/2addr p2, v2
+
+    iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mScroller:Landroid/widget/OverScroller;
+
+    invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getScrollX()I
+
+    move-result v1
+
+    invoke-virtual {v0, v1, v2, p1, p2}, Landroid/widget/OverScroller;->startScroll(IIII)V
+
+    invoke-direct {p0, p3}, Landroidx/core/widget/NestedScrollView;->runAnimatedScroll(Z)V
+
+    goto :goto_0
+
+    :cond_1
+    iget-object p3, p0, Landroidx/core/widget/NestedScrollView;->mScroller:Landroid/widget/OverScroller;
+
+    invoke-virtual {p3}, Landroid/widget/OverScroller;->isFinished()Z
+
+    move-result p3
+
+    if-nez p3, :cond_2
+
+    invoke-direct {p0}, Landroidx/core/widget/NestedScrollView;->abortAnimatedScroll()V
+
+    :cond_2
+    invoke-virtual {p0, p1, p2}, Landroidx/core/widget/NestedScrollView;->scrollBy(II)V
+
+    :goto_0
+    invoke-static {}, Landroid/view/animation/AnimationUtils;->currentAnimationTimeMillis()J
+
+    move-result-wide p1
+
+    iput-wide p1, p0, Landroidx/core/widget/NestedScrollView;->mLastScroll:J
+
+    return-void
+.end method
+
 
 # virtual methods
 .method public addView(Landroid/view/View;)V
@@ -1621,7 +1745,11 @@
 
     invoke-static/range {p0 .. p0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
 
+    return-void
+
     :cond_7
+    invoke-virtual {v10, v12}, Landroidx/core/widget/NestedScrollView;->stopNestedScroll(I)V
+
     return-void
 .end method
 
@@ -4407,7 +4535,7 @@
 
     iget v4, v10, Landroidx/core/widget/NestedScrollView;->mMinimumVelocity:I
 
-    if-le v1, v4, :cond_12
+    if-lt v1, v4, :cond_12
 
     neg-int v0, v0
 
@@ -5104,125 +5232,11 @@
 .end method
 
 .method public final smoothScrollBy(II)V
-    .locals 5
+    .locals 1
 
-    invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getChildCount()I
+    const/4 v0, 0x0
 
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-static {}, Landroid/view/animation/AnimationUtils;->currentAnimationTimeMillis()J
-
-    move-result-wide v0
-
-    iget-wide v2, p0, Landroidx/core/widget/NestedScrollView;->mLastScroll:J
-
-    sub-long/2addr v0, v2
-
-    const-wide/16 v2, 0xfa
-
-    cmp-long v4, v0, v2
-
-    if-lez v4, :cond_1
-
-    const/4 p1, 0x0
-
-    invoke-virtual {p0, p1}, Landroidx/core/widget/NestedScrollView;->getChildAt(I)Landroid/view/View;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object v1
-
-    check-cast v1, Landroid/widget/FrameLayout$LayoutParams;
-
-    invoke-virtual {v0}, Landroid/view/View;->getHeight()I
-
-    move-result v0
-
-    iget v2, v1, Landroid/widget/FrameLayout$LayoutParams;->topMargin:I
-
-    add-int/2addr v0, v2
-
-    iget v1, v1, Landroid/widget/FrameLayout$LayoutParams;->bottomMargin:I
-
-    add-int/2addr v0, v1
-
-    invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getHeight()I
-
-    move-result v1
-
-    invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getPaddingTop()I
-
-    move-result v2
-
-    sub-int/2addr v1, v2
-
-    invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getPaddingBottom()I
-
-    move-result v2
-
-    sub-int/2addr v1, v2
-
-    invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getScrollY()I
-
-    move-result v2
-
-    sub-int/2addr v0, v1
-
-    invoke-static {p1, v0}, Ljava/lang/Math;->max(II)I
-
-    move-result v0
-
-    add-int/2addr p2, v2
-
-    invoke-static {p2, v0}, Ljava/lang/Math;->min(II)I
-
-    move-result p2
-
-    invoke-static {p1, p2}, Ljava/lang/Math;->max(II)I
-
-    move-result p2
-
-    sub-int/2addr p2, v2
-
-    iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mScroller:Landroid/widget/OverScroller;
-
-    invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getScrollX()I
-
-    move-result v1
-
-    invoke-virtual {v0, v1, v2, p1, p2}, Landroid/widget/OverScroller;->startScroll(IIII)V
-
-    invoke-direct {p0, p1}, Landroidx/core/widget/NestedScrollView;->runAnimatedScroll(Z)V
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v0, p0, Landroidx/core/widget/NestedScrollView;->mScroller:Landroid/widget/OverScroller;
-
-    invoke-virtual {v0}, Landroid/widget/OverScroller;->isFinished()Z
-
-    move-result v0
-
-    if-nez v0, :cond_2
-
-    invoke-direct {p0}, Landroidx/core/widget/NestedScrollView;->abortAnimatedScroll()V
-
-    :cond_2
-    invoke-virtual {p0, p1, p2}, Landroidx/core/widget/NestedScrollView;->scrollBy(II)V
-
-    :goto_0
-    invoke-static {}, Landroid/view/animation/AnimationUtils;->currentAnimationTimeMillis()J
-
-    move-result-wide p1
-
-    iput-wide p1, p0, Landroidx/core/widget/NestedScrollView;->mLastScroll:J
+    invoke-direct {p0, p1, p2, v0}, Landroidx/core/widget/NestedScrollView;->smoothScrollBy(IIZ)V
 
     return-void
 .end method
@@ -5230,6 +5244,16 @@
 .method public final smoothScrollTo(II)V
     .locals 1
 
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, p1, p2, v0}, Landroidx/core/widget/NestedScrollView;->smoothScrollTo(IIZ)V
+
+    return-void
+.end method
+
+.method smoothScrollTo(IIZ)V
+    .locals 1
+
     invoke-virtual {p0}, Landroidx/core/widget/NestedScrollView;->getScrollX()I
 
     move-result v0
@@ -5242,7 +5266,7 @@
 
     sub-int/2addr p2, v0
 
-    invoke-virtual {p0, p1, p2}, Landroidx/core/widget/NestedScrollView;->smoothScrollBy(II)V
+    invoke-direct {p0, p1, p2, p3}, Landroidx/core/widget/NestedScrollView;->smoothScrollBy(IIZ)V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/widget/TextViewCompat$OreoCallback.smali b/com.discord/smali/androidx/core/widget/TextViewCompat$OreoCallback.smali
index 2c5d84fcc5..5c286212f5 100644
--- a/com.discord/smali/androidx/core/widget/TextViewCompat$OreoCallback.smali
+++ b/com.discord/smali/androidx/core/widget/TextViewCompat$OreoCallback.smali
@@ -29,6 +29,13 @@
 .field private mInitializedMenuBuilderReferences:Z
 
 .field private mMenuBuilderClass:Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+.end field
 
 .field private mMenuBuilderRemoveItemAtMethod:Ljava/lang/reflect/Method;
 
diff --git a/com.discord/smali/androidx/core/widget/TextViewCompat.smali b/com.discord/smali/androidx/core/widget/TextViewCompat.smali
index 626a1abdcb..ffc2cfb1a9 100644
--- a/com.discord/smali/androidx/core/widget/TextViewCompat.smali
+++ b/com.discord/smali/androidx/core/widget/TextViewCompat.smali
@@ -1444,6 +1444,21 @@
 .method public static setPrecomputedText(Landroid/widget/TextView;Landroidx/core/text/PrecomputedTextCompat;)V
     .locals 2
 
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x1d
+
+    if-lt v0, v1, :cond_0
+
+    invoke-virtual {p1}, Landroidx/core/text/PrecomputedTextCompat;->getPrecomputedText()Landroid/text/PrecomputedText;
+
+    move-result-object p1
+
+    invoke-virtual {p0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    return-void
+
+    :cond_0
     invoke-static {p0}, Landroidx/core/widget/TextViewCompat;->getTextMetricsParams(Landroid/widget/TextView;)Landroidx/core/text/PrecomputedTextCompat$Params;
 
     move-result-object v0
@@ -1456,13 +1471,13 @@
 
     move-result v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-virtual {p0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
 
-    :cond_0
+    :cond_1
     new-instance p0, Ljava/lang/IllegalArgumentException;
 
     const-string p1, "Given text can not be applied to TextView."
diff --git a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$1.smali b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$1.smali
new file mode 100644
index 0000000000..c99225733b
--- /dev/null
+++ b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$1.smali
@@ -0,0 +1,96 @@
+.class public final Landroidx/core/widget/TextViewKt$addTextChangedListener$1;
+.super Lkotlin/jvm/internal/l;
+.source "TextView.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function4;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Landroidx/core/widget/TextViewKt;->addTextChangedListener$default(Landroid/widget/TextView;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroid/text/TextWatcher;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function4<",
+        "Ljava/lang/CharSequence;",
+        "Ljava/lang/Integer;",
+        "Ljava/lang/Integer;",
+        "Ljava/lang/Integer;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Landroidx/core/widget/TextViewKt$addTextChangedListener$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Landroidx/core/widget/TextViewKt$addTextChangedListener$1;
+
+    invoke-direct {v0}, Landroidx/core/widget/TextViewKt$addTextChangedListener$1;-><init>()V
+
+    sput-object v0, Landroidx/core/widget/TextViewKt$addTextChangedListener$1;->INSTANCE:Landroidx/core/widget/TextViewKt$addTextChangedListener$1;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x4
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    check-cast p2, Ljava/lang/Number;
+
+    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
+
+    move-result p2
+
+    check-cast p3, Ljava/lang/Number;
+
+    invoke-virtual {p3}, Ljava/lang/Number;->intValue()I
+
+    move-result p3
+
+    check-cast p4, Ljava/lang/Number;
+
+    invoke-virtual {p4}, Ljava/lang/Number;->intValue()I
+
+    move-result p4
+
+    invoke-virtual {p0, p1, p2, p3, p4}, Landroidx/core/widget/TextViewKt$addTextChangedListener$1;->invoke(Ljava/lang/CharSequence;III)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/CharSequence;III)V
+    .locals 0
+
+    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
new file mode 100644
index 0000000000..89ea9705ae
--- /dev/null
+++ b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$2.smali
@@ -0,0 +1,96 @@
+.class public final Landroidx/core/widget/TextViewKt$addTextChangedListener$2;
+.super Lkotlin/jvm/internal/l;
+.source "TextView.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function4;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Landroidx/core/widget/TextViewKt;->addTextChangedListener$default(Landroid/widget/TextView;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroid/text/TextWatcher;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function4<",
+        "Ljava/lang/CharSequence;",
+        "Ljava/lang/Integer;",
+        "Ljava/lang/Integer;",
+        "Ljava/lang/Integer;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Landroidx/core/widget/TextViewKt$addTextChangedListener$2;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Landroidx/core/widget/TextViewKt$addTextChangedListener$2;
+
+    invoke-direct {v0}, Landroidx/core/widget/TextViewKt$addTextChangedListener$2;-><init>()V
+
+    sput-object v0, Landroidx/core/widget/TextViewKt$addTextChangedListener$2;->INSTANCE:Landroidx/core/widget/TextViewKt$addTextChangedListener$2;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x4
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    check-cast p2, Ljava/lang/Number;
+
+    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
+
+    move-result p2
+
+    check-cast p3, Ljava/lang/Number;
+
+    invoke-virtual {p3}, Ljava/lang/Number;->intValue()I
+
+    move-result p3
+
+    check-cast p4, Ljava/lang/Number;
+
+    invoke-virtual {p4}, Ljava/lang/Number;->intValue()I
+
+    move-result p4
+
+    invoke-virtual {p0, p1, p2, p3, p4}, Landroidx/core/widget/TextViewKt$addTextChangedListener$2;->invoke(Ljava/lang/CharSequence;III)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/CharSequence;III)V
+    .locals 0
+
+    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
new file mode 100644
index 0000000000..b9c169b772
--- /dev/null
+++ b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$3.smali
@@ -0,0 +1,75 @@
+.class public final Landroidx/core/widget/TextViewKt$addTextChangedListener$3;
+.super Lkotlin/jvm/internal/l;
+.source "TextView.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Landroidx/core/widget/TextViewKt;->addTextChangedListener$default(Landroid/widget/TextView;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroid/text/TextWatcher;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Landroid/text/Editable;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Landroidx/core/widget/TextViewKt$addTextChangedListener$3;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Landroidx/core/widget/TextViewKt$addTextChangedListener$3;
+
+    invoke-direct {v0}, Landroidx/core/widget/TextViewKt$addTextChangedListener$3;-><init>()V
+
+    sput-object v0, Landroidx/core/widget/TextViewKt$addTextChangedListener$3;->INSTANCE:Landroidx/core/widget/TextViewKt$addTextChangedListener$3;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroid/text/Editable;
+
+    invoke-virtual {p0, p1}, Landroidx/core/widget/TextViewKt$addTextChangedListener$3;->invoke(Landroid/text/Editable;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Landroid/text/Editable;)V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1.smali b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1.smali
new file mode 100644
index 0000000000..72d66f79ed
--- /dev/null
+++ b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1.smali
@@ -0,0 +1,97 @@
+.class public final Landroidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1;
+.super Ljava/lang/Object;
+.source "TextView.kt"
+
+# interfaces
+.implements Landroid/text/TextWatcher;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Landroidx/core/widget/TextViewKt;->addTextChangedListener(Landroid/widget/TextView;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function1;)Landroid/text/TextWatcher;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $afterTextChanged:Lkotlin/jvm/functions/Function1;
+
+.field final synthetic $beforeTextChanged:Lkotlin/jvm/functions/Function4;
+
+.field final synthetic $onTextChanged:Lkotlin/jvm/functions/Function4;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;)V
+    .locals 0
+
+    iput-object p1, p0, Landroidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1;->$afterTextChanged:Lkotlin/jvm/functions/Function1;
+
+    iput-object p2, p0, Landroidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1;->$beforeTextChanged:Lkotlin/jvm/functions/Function4;
+
+    iput-object p3, p0, Landroidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1;->$onTextChanged:Lkotlin/jvm/functions/Function4;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final afterTextChanged(Landroid/text/Editable;)V
+    .locals 1
+
+    iget-object v0, p0, Landroidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1;->$afterTextChanged: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 final beforeTextChanged(Ljava/lang/CharSequence;III)V
+    .locals 1
+
+    iget-object v0, p0, Landroidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1;->$beforeTextChanged:Lkotlin/jvm/functions/Function4;
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p2
+
+    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p3
+
+    invoke-static {p4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p4
+
+    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
+.end method
+
+.method public final onTextChanged(Ljava/lang/CharSequence;III)V
+    .locals 1
+
+    iget-object v0, p0, Landroidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1;->$onTextChanged:Lkotlin/jvm/functions/Function4;
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p2
+
+    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p3
+
+    invoke-static {p4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p4
+
+    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
+.end method
diff --git a/com.discord/smali/androidx/core/widget/TextViewKt$doAfterTextChanged$$inlined$addTextChangedListener$1.smali b/com.discord/smali/androidx/core/widget/TextViewKt$doAfterTextChanged$$inlined$addTextChangedListener$1.smali
new file mode 100644
index 0000000000..d6cef3efcc
--- /dev/null
+++ b/com.discord/smali/androidx/core/widget/TextViewKt$doAfterTextChanged$$inlined$addTextChangedListener$1.smali
@@ -0,0 +1,57 @@
+.class public final Landroidx/core/widget/TextViewKt$doAfterTextChanged$$inlined$addTextChangedListener$1;
+.super Ljava/lang/Object;
+.source "TextView.kt"
+
+# interfaces
+.implements Landroid/text/TextWatcher;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Landroidx/core/widget/TextViewKt;->doAfterTextChanged(Landroid/widget/TextView;Lkotlin/jvm/functions/Function1;)Landroid/text/TextWatcher;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $afterTextChanged:Lkotlin/jvm/functions/Function1;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function1;)V
+    .locals 0
+
+    iput-object p1, p0, Landroidx/core/widget/TextViewKt$doAfterTextChanged$$inlined$addTextChangedListener$1;->$afterTextChanged:Lkotlin/jvm/functions/Function1;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final afterTextChanged(Landroid/text/Editable;)V
+    .locals 1
+
+    iget-object v0, p0, Landroidx/core/widget/TextViewKt$doAfterTextChanged$$inlined$addTextChangedListener$1;->$afterTextChanged: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 final beforeTextChanged(Ljava/lang/CharSequence;III)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final onTextChanged(Ljava/lang/CharSequence;III)V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali/androidx/core/widget/TextViewKt$doBeforeTextChanged$$inlined$addTextChangedListener$1.smali b/com.discord/smali/androidx/core/widget/TextViewKt$doBeforeTextChanged$$inlined$addTextChangedListener$1.smali
new file mode 100644
index 0000000000..eee5e2e027
--- /dev/null
+++ b/com.discord/smali/androidx/core/widget/TextViewKt$doBeforeTextChanged$$inlined$addTextChangedListener$1.smali
@@ -0,0 +1,69 @@
+.class public final Landroidx/core/widget/TextViewKt$doBeforeTextChanged$$inlined$addTextChangedListener$1;
+.super Ljava/lang/Object;
+.source "TextView.kt"
+
+# interfaces
+.implements Landroid/text/TextWatcher;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Landroidx/core/widget/TextViewKt;->doBeforeTextChanged(Landroid/widget/TextView;Lkotlin/jvm/functions/Function4;)Landroid/text/TextWatcher;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $beforeTextChanged:Lkotlin/jvm/functions/Function4;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function4;)V
+    .locals 0
+
+    iput-object p1, p0, Landroidx/core/widget/TextViewKt$doBeforeTextChanged$$inlined$addTextChangedListener$1;->$beforeTextChanged:Lkotlin/jvm/functions/Function4;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final afterTextChanged(Landroid/text/Editable;)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final beforeTextChanged(Ljava/lang/CharSequence;III)V
+    .locals 1
+
+    iget-object v0, p0, Landroidx/core/widget/TextViewKt$doBeforeTextChanged$$inlined$addTextChangedListener$1;->$beforeTextChanged:Lkotlin/jvm/functions/Function4;
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p2
+
+    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p3
+
+    invoke-static {p4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p4
+
+    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
+.end method
+
+.method public final onTextChanged(Ljava/lang/CharSequence;III)V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali/androidx/core/widget/TextViewKt$doOnTextChanged$$inlined$addTextChangedListener$1.smali b/com.discord/smali/androidx/core/widget/TextViewKt$doOnTextChanged$$inlined$addTextChangedListener$1.smali
new file mode 100644
index 0000000000..954f72521f
--- /dev/null
+++ b/com.discord/smali/androidx/core/widget/TextViewKt$doOnTextChanged$$inlined$addTextChangedListener$1.smali
@@ -0,0 +1,69 @@
+.class public final Landroidx/core/widget/TextViewKt$doOnTextChanged$$inlined$addTextChangedListener$1;
+.super Ljava/lang/Object;
+.source "TextView.kt"
+
+# interfaces
+.implements Landroid/text/TextWatcher;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Landroidx/core/widget/TextViewKt;->doOnTextChanged(Landroid/widget/TextView;Lkotlin/jvm/functions/Function4;)Landroid/text/TextWatcher;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $onTextChanged:Lkotlin/jvm/functions/Function4;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function4;)V
+    .locals 0
+
+    iput-object p1, p0, Landroidx/core/widget/TextViewKt$doOnTextChanged$$inlined$addTextChangedListener$1;->$onTextChanged:Lkotlin/jvm/functions/Function4;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final afterTextChanged(Landroid/text/Editable;)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final beforeTextChanged(Ljava/lang/CharSequence;III)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final onTextChanged(Ljava/lang/CharSequence;III)V
+    .locals 1
+
+    iget-object v0, p0, Landroidx/core/widget/TextViewKt$doOnTextChanged$$inlined$addTextChangedListener$1;->$onTextChanged:Lkotlin/jvm/functions/Function4;
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p2
+
+    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p3
+
+    invoke-static {p4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p4
+
+    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
+.end method
diff --git a/com.discord/smali/androidx/core/widget/TextViewKt.smali b/com.discord/smali/androidx/core/widget/TextViewKt.smali
new file mode 100644
index 0000000000..507b14fd19
--- /dev/null
+++ b/com.discord/smali/androidx/core/widget/TextViewKt.smali
@@ -0,0 +1,240 @@
+.class public final Landroidx/core/widget/TextViewKt;
+.super Ljava/lang/Object;
+.source "TextView.kt"
+
+
+# direct methods
+.method public static final addTextChangedListener(Landroid/widget/TextView;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function1;)Landroid/text/TextWatcher;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/widget/TextView;",
+            "Lkotlin/jvm/functions/Function4<",
+            "-",
+            "Ljava/lang/CharSequence;",
+            "-",
+            "Ljava/lang/Integer;",
+            "-",
+            "Ljava/lang/Integer;",
+            "-",
+            "Ljava/lang/Integer;",
+            "Lkotlin/Unit;",
+            ">;",
+            "Lkotlin/jvm/functions/Function4<",
+            "-",
+            "Ljava/lang/CharSequence;",
+            "-",
+            "Ljava/lang/Integer;",
+            "-",
+            "Ljava/lang/Integer;",
+            "-",
+            "Ljava/lang/Integer;",
+            "Lkotlin/Unit;",
+            ">;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Landroid/text/Editable;",
+            "Lkotlin/Unit;",
+            ">;)",
+            "Landroid/text/TextWatcher;"
+        }
+    .end annotation
+
+    const-string v0, "$this$addTextChangedListener"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "beforeTextChanged"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onTextChanged"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "afterTextChanged"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Landroidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1;
+
+    invoke-direct {v0, p3, p1, p2}, Landroidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;)V
+
+    check-cast v0, Landroid/text/TextWatcher;
+
+    invoke-virtual {p0, v0}, Landroid/widget/TextView;->addTextChangedListener(Landroid/text/TextWatcher;)V
+
+    return-object v0
+.end method
+
+.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
+
+    if-eqz p5, :cond_0
+
+    sget-object p1, Landroidx/core/widget/TextViewKt$addTextChangedListener$1;->INSTANCE:Landroidx/core/widget/TextViewKt$addTextChangedListener$1;
+
+    check-cast p1, Lkotlin/jvm/functions/Function4;
+
+    :cond_0
+    and-int/lit8 p5, p4, 0x2
+
+    if-eqz p5, :cond_1
+
+    sget-object p2, Landroidx/core/widget/TextViewKt$addTextChangedListener$2;->INSTANCE:Landroidx/core/widget/TextViewKt$addTextChangedListener$2;
+
+    check-cast p2, Lkotlin/jvm/functions/Function4;
+
+    :cond_1
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_2
+
+    sget-object p3, Landroidx/core/widget/TextViewKt$addTextChangedListener$3;->INSTANCE:Landroidx/core/widget/TextViewKt$addTextChangedListener$3;
+
+    check-cast p3, Lkotlin/jvm/functions/Function1;
+
+    :cond_2
+    const-string p4, "$this$addTextChangedListener"
+
+    invoke-static {p0, p4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p4, "beforeTextChanged"
+
+    invoke-static {p1, p4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p4, "onTextChanged"
+
+    invoke-static {p2, p4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p4, "afterTextChanged"
+
+    invoke-static {p3, p4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p4, Landroidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1;
+
+    invoke-direct {p4, p3, p1, p2}, Landroidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;)V
+
+    check-cast p4, Landroid/text/TextWatcher;
+
+    invoke-virtual {p0, p4}, Landroid/widget/TextView;->addTextChangedListener(Landroid/text/TextWatcher;)V
+
+    return-object p4
+.end method
+
+.method public static final doAfterTextChanged(Landroid/widget/TextView;Lkotlin/jvm/functions/Function1;)Landroid/text/TextWatcher;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/widget/TextView;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Landroid/text/Editable;",
+            "Lkotlin/Unit;",
+            ">;)",
+            "Landroid/text/TextWatcher;"
+        }
+    .end annotation
+
+    const-string v0, "$this$doAfterTextChanged"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Landroidx/core/widget/TextViewKt$doAfterTextChanged$$inlined$addTextChangedListener$1;
+
+    invoke-direct {v0, p1}, Landroidx/core/widget/TextViewKt$doAfterTextChanged$$inlined$addTextChangedListener$1;-><init>(Lkotlin/jvm/functions/Function1;)V
+
+    check-cast v0, Landroid/text/TextWatcher;
+
+    invoke-virtual {p0, v0}, Landroid/widget/TextView;->addTextChangedListener(Landroid/text/TextWatcher;)V
+
+    return-object v0
+.end method
+
+.method public static final doBeforeTextChanged(Landroid/widget/TextView;Lkotlin/jvm/functions/Function4;)Landroid/text/TextWatcher;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/widget/TextView;",
+            "Lkotlin/jvm/functions/Function4<",
+            "-",
+            "Ljava/lang/CharSequence;",
+            "-",
+            "Ljava/lang/Integer;",
+            "-",
+            "Ljava/lang/Integer;",
+            "-",
+            "Ljava/lang/Integer;",
+            "Lkotlin/Unit;",
+            ">;)",
+            "Landroid/text/TextWatcher;"
+        }
+    .end annotation
+
+    const-string v0, "$this$doBeforeTextChanged"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Landroidx/core/widget/TextViewKt$doBeforeTextChanged$$inlined$addTextChangedListener$1;
+
+    invoke-direct {v0, p1}, Landroidx/core/widget/TextViewKt$doBeforeTextChanged$$inlined$addTextChangedListener$1;-><init>(Lkotlin/jvm/functions/Function4;)V
+
+    check-cast v0, Landroid/text/TextWatcher;
+
+    invoke-virtual {p0, v0}, Landroid/widget/TextView;->addTextChangedListener(Landroid/text/TextWatcher;)V
+
+    return-object v0
+.end method
+
+.method public static final doOnTextChanged(Landroid/widget/TextView;Lkotlin/jvm/functions/Function4;)Landroid/text/TextWatcher;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/widget/TextView;",
+            "Lkotlin/jvm/functions/Function4<",
+            "-",
+            "Ljava/lang/CharSequence;",
+            "-",
+            "Ljava/lang/Integer;",
+            "-",
+            "Ljava/lang/Integer;",
+            "-",
+            "Ljava/lang/Integer;",
+            "Lkotlin/Unit;",
+            ">;)",
+            "Landroid/text/TextWatcher;"
+        }
+    .end annotation
+
+    const-string v0, "$this$doOnTextChanged"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Landroidx/core/widget/TextViewKt$doOnTextChanged$$inlined$addTextChangedListener$1;
+
+    invoke-direct {v0, p1}, Landroidx/core/widget/TextViewKt$doOnTextChanged$$inlined$addTextChangedListener$1;-><init>(Lkotlin/jvm/functions/Function4;)V
+
+    check-cast v0, Landroid/text/TextWatcher;
+
+    invoke-virtual {p0, v0}, Landroid/widget/TextView;->addTextChangedListener(Landroid/text/TextWatcher;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/androidx/customview/R$attr.smali b/com.discord/smali/androidx/customview/R$attr.smali
index 286f0aeb32..52dfa35a75 100644
--- a/com.discord/smali/androidx/customview/R$attr.smali
+++ b/com.discord/smali/androidx/customview/R$attr.smali
@@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$color.smali b/com.discord/smali/androidx/customview/R$color.smali
index 5becd6a05f..2df8e2d3ef 100644
--- a/com.discord/smali/androidx/customview/R$color.smali
+++ b/com.discord/smali/androidx/customview/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$dimen.smali b/com.discord/smali/androidx/customview/R$dimen.smali
index 40ba32a6bd..2b75d5d8f2 100644
--- a/com.discord/smali/androidx/customview/R$dimen.smali
+++ b/com.discord/smali/androidx/customview/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$drawable.smali b/com.discord/smali/androidx/customview/R$drawable.smali
index a71d2dbf5c..87227cdd5b 100644
--- a/com.discord/smali/androidx/customview/R$drawable.smali
+++ b/com.discord/smali/androidx/customview/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$id.smali b/com.discord/smali/androidx/customview/R$id.smali
index e4095e086f..432356a57a 100644
--- a/com.discord/smali/androidx/customview/R$id.smali
+++ b/com.discord/smali/androidx/customview/R$id.smali
@@ -15,6 +15,72 @@
 
 
 # static fields
+.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+
+.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+
+.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+
+.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+
+.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+
+.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+
+.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+
+.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+
+.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+
+.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+
+.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+
+.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+
+.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+
+.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+
+.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+
+.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+
+.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+
+.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+
+.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+
+.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+
+.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+
+.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+
+.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+
+.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+
+.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+
+.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+
+.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+
+.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+
+.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+
+.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+
+.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+
+.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+
+.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+
 .field public static final action_container:I = 0x7f0a0039
 
 .field public static final action_divider:I = 0x7f0a003b
@@ -25,51 +91,63 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final dialog_button:I = 0x7f0a025c
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final info:I = 0x7f0a039a
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_accessibility_actions:I = 0x7f0a075b
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a075c
 
-.field public static final text:I = 0x7f0a073f
+.field public static final tag_accessibility_heading:I = 0x7f0a075d
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final tag_accessibility_pane_title:I = 0x7f0a075e
 
-.field public static final time:I = 0x7f0a074e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a075f
 
-.field public static final title:I = 0x7f0a074f
+.field public static final tag_transition_group:I = 0x7f0a0760
+
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
+
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
+
+.field public static final text:I = 0x7f0a0768
+
+.field public static final text2:I = 0x7f0a0769
+
+.field public static final time:I = 0x7f0a0777
+
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$layout.smali b/com.discord/smali/androidx/customview/R$layout.smali
index 6cb8dce5cf..d195e5f72e 100644
--- a/com.discord/smali/androidx/customview/R$layout.smali
+++ b/com.discord/smali/androidx/customview/R$layout.smali
@@ -15,17 +15,19 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final custom_dialog:I = 0x7f0d0022
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
+
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali
index 188c84a2c7..3bf8da0a6f 100644
--- a/com.discord/smali/androidx/customview/R$string.smali
+++ b/com.discord/smali/androidx/customview/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$style.smali b/com.discord/smali/androidx/customview/R$style.smali
index 4f396af674..b185dab421 100644
--- a/com.discord/smali/androidx/customview/R$style.smali
+++ b/com.discord/smali/androidx/customview/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$styleable.smali b/com.discord/smali/androidx/customview/R$styleable.smali
index 7a797f25c9..6995eb2e47 100644
--- a/com.discord/smali/androidx/customview/R$styleable.smali
+++ b/com.discord/smali/androidx/customview/R$styleable.smali
@@ -149,12 +149,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +164,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper.smali b/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper.smali
index 197ab5830c..6c114fe44d 100644
--- a/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper.smali
+++ b/com.discord/smali/androidx/customview/widget/ExploreByTouchHelper.smali
@@ -805,7 +805,7 @@
 .end method
 
 .method private getAllNodes()Landroidx/collection/SparseArrayCompat;
-    .locals 4
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -834,11 +834,31 @@
 
     if-ge v2, v3, :cond_0
 
-    invoke-direct {p0, v2}, Landroidx/customview/widget/ExploreByTouchHelper;->createNodeForChild(I)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
+    invoke-interface {v0, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v3
 
-    invoke-virtual {v1, v2, v3}, Landroidx/collection/SparseArrayCompat;->put(ILjava/lang/Object;)V
+    check-cast v3, Ljava/lang/Integer;
+
+    invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
+
+    move-result v3
+
+    invoke-direct {p0, v3}, Landroidx/customview/widget/ExploreByTouchHelper;->createNodeForChild(I)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
+
+    move-result-object v3
+
+    invoke-interface {v0, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Ljava/lang/Integer;
+
+    invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
+
+    move-result v4
+
+    invoke-virtual {v1, v4, v3}, Landroidx/collection/SparseArrayCompat;->put(ILjava/lang/Object;)V
 
     add-int/lit8 v2, v2, 0x1
 
@@ -1797,7 +1817,7 @@
 .end method
 
 .method public final requestKeyboardFocusForVirtualView(I)Z
-    .locals 2
+    .locals 3
 
     iget-object v0, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mHost:Landroid/view/View;
 
@@ -1827,13 +1847,18 @@
     return v1
 
     :cond_1
-    const/high16 v1, -0x80000000
+    const/high16 v2, -0x80000000
 
-    if-eq v0, v1, :cond_2
+    if-eq v0, v2, :cond_2
 
     invoke-virtual {p0, v0}, Landroidx/customview/widget/ExploreByTouchHelper;->clearKeyboardFocusForVirtualView(I)Z
 
     :cond_2
+    if-ne p1, v2, :cond_3
+
+    return v1
+
+    :cond_3
     iput p1, p0, Landroidx/customview/widget/ExploreByTouchHelper;->mKeyboardFocusedVirtualViewId:I
 
     const/4 v0, 0x1
diff --git a/com.discord/smali/androidx/customview/widget/ViewDragHelper.smali b/com.discord/smali/androidx/customview/widget/ViewDragHelper.smali
index 0536cf16d1..f985fbe7bb 100644
--- a/com.discord/smali/androidx/customview/widget/ViewDragHelper.smali
+++ b/com.discord/smali/androidx/customview/widget/ViewDragHelper.smali
@@ -54,6 +54,8 @@
 
 .field private mCapturedView:Landroid/view/View;
 
+.field private final mDefaultEdgeSize:I
+
 .field private mDragState:I
 
 .field private mEdgeDragsInProgress:[I
@@ -153,6 +155,10 @@
 
     float-to-int p3, p3
 
+    iput p3, p0, Landroidx/customview/widget/ViewDragHelper;->mDefaultEdgeSize:I
+
+    iget p3, p0, Landroidx/customview/widget/ViewDragHelper;->mDefaultEdgeSize:I
+
     iput p3, p0, Landroidx/customview/widget/ViewDragHelper;->mEdgeSize:I
 
     invoke-virtual {p2}, Landroid/view/ViewConfiguration;->getScaledTouchSlop()I
@@ -2141,6 +2147,14 @@
     return-object v0
 .end method
 
+.method public getDefaultEdgeSize()I
+    .locals 1
+
+    iget v0, p0, Landroidx/customview/widget/ViewDragHelper;->mDefaultEdgeSize:I
+
+    return v0
+.end method
+
 .method public getEdgeSize()I
     .locals 1
 
@@ -2752,6 +2766,14 @@
     return-void
 .end method
 
+.method public setEdgeSize(I)V
+    .locals 0
+
+    iput p1, p0, Landroidx/customview/widget/ViewDragHelper;->mEdgeSize:I
+
+    return-void
+.end method
+
 .method public setEdgeTrackingEnabled(I)V
     .locals 0
 
diff --git a/com.discord/smali/androidx/drawerlayout/R$attr.smali b/com.discord/smali/androidx/drawerlayout/R$attr.smali
index 23ef6188a5..e56fbfc4d8 100644
--- a/com.discord/smali/androidx/drawerlayout/R$attr.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$attr.smali
@@ -17,27 +17,31 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final drawerLayoutStyle:I = 0x7f04010e
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final elevation:I = 0x7f040114
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final fontVariationSettings:I = 0x7f040149
+
+.field public static final fontWeight:I = 0x7f04014a
+
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$color.smali b/com.discord/smali/androidx/drawerlayout/R$color.smali
index 812b7f9302..73eef475c5 100644
--- a/com.discord/smali/androidx/drawerlayout/R$color.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$dimen.smali b/com.discord/smali/androidx/drawerlayout/R$dimen.smali
index e1dc827316..85484be3ae 100644
--- a/com.discord/smali/androidx/drawerlayout/R$dimen.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$dimen.smali
@@ -29,35 +29,37 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final def_drawer_elevation:I = 0x7f07007f
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad:I = 0x7f070118
+
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$drawable.smali b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
index d04ddc965a..61735682ad 100644
--- a/com.discord/smali/androidx/drawerlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$id.smali b/com.discord/smali/androidx/drawerlayout/R$id.smali
index a4f9d883cd..5283b87eb3 100644
--- a/com.discord/smali/androidx/drawerlayout/R$id.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$id.smali
@@ -15,6 +15,72 @@
 
 
 # static fields
+.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+
+.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+
+.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+
+.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+
+.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+
+.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+
+.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+
+.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+
+.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+
+.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+
+.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+
+.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+
+.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+
+.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+
+.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+
+.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+
+.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+
+.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+
+.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+
+.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+
+.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+
+.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+
+.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+
+.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+
+.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+
+.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+
+.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+
+.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+
+.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+
+.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+
+.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+
+.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+
+.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+
 .field public static final action_container:I = 0x7f0a0039
 
 .field public static final action_divider:I = 0x7f0a003b
@@ -25,51 +91,63 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final dialog_button:I = 0x7f0a025c
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final info:I = 0x7f0a039a
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_accessibility_actions:I = 0x7f0a075b
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a075c
 
-.field public static final text:I = 0x7f0a073f
+.field public static final tag_accessibility_heading:I = 0x7f0a075d
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final tag_accessibility_pane_title:I = 0x7f0a075e
 
-.field public static final time:I = 0x7f0a074e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a075f
 
-.field public static final title:I = 0x7f0a074f
+.field public static final tag_transition_group:I = 0x7f0a0760
+
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
+
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
+
+.field public static final text:I = 0x7f0a0768
+
+.field public static final text2:I = 0x7f0a0769
+
+.field public static final time:I = 0x7f0a0777
+
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$layout.smali b/com.discord/smali/androidx/drawerlayout/R$layout.smali
index ed30ac7224..dd3dc70fdb 100644
--- a/com.discord/smali/androidx/drawerlayout/R$layout.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$layout.smali
@@ -15,17 +15,19 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final custom_dialog:I = 0x7f0d0022
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
+
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali
index 926dff2e02..4604f9143b 100644
--- a/com.discord/smali/androidx/drawerlayout/R$string.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$style.smali b/com.discord/smali/androidx/drawerlayout/R$style.smali
index b98652a100..d855fc982f 100644
--- a/com.discord/smali/androidx/drawerlayout/R$style.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$styleable.smali b/com.discord/smali/androidx/drawerlayout/R$styleable.smali
index 570ed14bc5..0cf7e0940d 100644
--- a/com.discord/smali/androidx/drawerlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$styleable.smali
@@ -23,6 +23,10 @@
 
 .field public static final ColorStateListItem_android_color:I = 0x0
 
+.field public static final DrawerLayout:[I
+
+.field public static final DrawerLayout_elevation:I = 0x0
+
 .field public static final FontFamily:[I
 
 .field public static final FontFamilyFont:[I
@@ -94,7 +98,7 @@
 
 # direct methods
 .method static constructor <clinit>()V
-    .locals 1
+    .locals 3
 
     const/4 v0, 0x3
 
@@ -104,6 +108,18 @@
 
     sput-object v0, Landroidx/drawerlayout/R$styleable;->ColorStateListItem:[I
 
+    const/4 v0, 0x1
+
+    new-array v0, v0, [I
+
+    const/4 v1, 0x0
+
+    const v2, 0x7f040114
+
+    aput v2, v0, v1
+
+    sput-object v0, Landroidx/drawerlayout/R$styleable;->DrawerLayout:[I
+
     const/4 v0, 0x6
 
     new-array v0, v0, [I
@@ -138,8 +154,6 @@
 
     return-void
 
-    nop
-
     :array_0
     .array-data 4
         0x10101a5
@@ -149,12 +163,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +178,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate.smali
index e74e0a51aa..935547881f 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate.smali
@@ -75,10 +75,6 @@
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;->mTmpRect:Landroid/graphics/Rect;
 
-    invoke-virtual {p2, v0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->getBoundsInParent(Landroid/graphics/Rect;)V
-
-    invoke-virtual {p1, v0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setBoundsInParent(Landroid/graphics/Rect;)V
-
     invoke-virtual {p2, v0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->getBoundsInScreen(Landroid/graphics/Rect;)V
 
     invoke-virtual {p1, v0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setBoundsInScreen(Landroid/graphics/Rect;)V
@@ -113,18 +109,6 @@
 
     invoke-virtual {p1, v0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setEnabled(Z)V
 
-    invoke-virtual {p2}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->isClickable()Z
-
-    move-result v0
-
-    invoke-virtual {p1, v0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setClickable(Z)V
-
-    invoke-virtual {p2}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->isFocusable()Z
-
-    move-result v0
-
-    invoke-virtual {p1, v0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setFocusable(Z)V
-
     invoke-virtual {p2}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->isFocused()Z
 
     move-result v0
@@ -143,12 +127,6 @@
 
     invoke-virtual {p1, v0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setSelected(Z)V
 
-    invoke-virtual {p2}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->isLongClickable()Z
-
-    move-result v0
-
-    invoke-virtual {p1, v0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setLongClickable(Z)V
-
     invoke-virtual {p2}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->getActions()I
 
     move-result p2
@@ -217,11 +195,7 @@
 
     invoke-super {p0, p1, p2}, Landroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityEvent(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)V
 
-    const-class p1, Landroidx/drawerlayout/widget/DrawerLayout;
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object p1
+    const-string p1, "androidx.drawerlayout.widget.DrawerLayout"
 
     invoke-virtual {p2, p1}, Landroid/view/accessibility/AccessibilityEvent;->setClassName(Ljava/lang/CharSequence;)V
 
@@ -270,11 +244,7 @@
     invoke-direct {p0, p2, p1}, Landroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;->addChildrenForAccessibility(Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;Landroid/view/ViewGroup;)V
 
     :goto_0
-    const-class p1, Landroidx/drawerlayout/widget/DrawerLayout;
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object p1
+    const-string p1, "androidx.drawerlayout.widget.DrawerLayout"
 
     invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setClassName(Ljava/lang/CharSequence;)V
 
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ViewDragCallback.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ViewDragCallback.smali
index 9f7b266e23..f43f572a91 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ViewDragCallback.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout$ViewDragCallback.smali
@@ -249,19 +249,17 @@
 .end method
 
 .method public onViewDragStateChanged(I)V
-    .locals 3
+    .locals 2
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->this$0:Landroidx/drawerlayout/widget/DrawerLayout;
 
-    iget v1, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->mAbsGravity:I
+    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->mDragger:Landroidx/customview/widget/ViewDragHelper;
 
-    iget-object v2, p0, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->mDragger:Landroidx/customview/widget/ViewDragHelper;
+    invoke-virtual {v1}, Landroidx/customview/widget/ViewDragHelper;->getCapturedView()Landroid/view/View;
 
-    invoke-virtual {v2}, Landroidx/customview/widget/ViewDragHelper;->getCapturedView()Landroid/view/View;
+    move-result-object v1
 
-    move-result-object v2
-
-    invoke-virtual {v0, v1, p1, v2}, Landroidx/drawerlayout/widget/DrawerLayout;->updateDrawerState(IILandroid/view/View;)V
+    invoke-virtual {v0, p1, v1}, Landroidx/drawerlayout/widget/DrawerLayout;->updateDrawerState(ILandroid/view/View;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout.smali b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout.smali
index fa646dee72..a4130f7f47 100644
--- a/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout.smali
+++ b/com.discord/smali/androidx/drawerlayout/widget/DrawerLayout.smali
@@ -18,6 +18,8 @@
 
 
 # static fields
+.field private static final ACCESSIBILITY_CLASS_NAME:Ljava/lang/String; = "androidx.drawerlayout.widget.DrawerLayout"
+
 .field private static final ALLOW_EDGE_LOCK:Z = false
 
 .field static final CAN_HIDE_DESCENDANTS:Z
@@ -58,6 +60,8 @@
 
 .field private static final TOUCH_SLOP_SENSITIVITY:F = 1.0f
 
+.field private static sEdgeSizeUsingSystemGestureInsets:Z
+
 
 # instance fields
 .field private final mChildAccessibilityDelegate:Landroidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate;
@@ -68,8 +72,6 @@
 
 .field private mChildrenCanceledTouch:Z
 
-.field private mDisallowInterceptRequested:Z
-
 .field private mDrawStatusBarBackground:Z
 
 .field private mDrawerElevation:F
@@ -197,13 +199,29 @@
 
     if-lt v1, v3, :cond_1
 
+    const/4 v1, 0x1
+
     goto :goto_1
 
     :cond_1
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_1
-    sput-boolean v0, Landroidx/drawerlayout/widget/DrawerLayout;->SET_DRAWER_SHADOW_FROM_ELEVATION:Z
+    sput-boolean v1, Landroidx/drawerlayout/widget/DrawerLayout;->SET_DRAWER_SHADOW_FROM_ELEVATION:Z
+
+    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v3, 0x1d
+
+    if-lt v1, v3, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_2
+    sput-boolean v0, Landroidx/drawerlayout/widget/DrawerLayout;->sEdgeSizeUsingSystemGestureInsets:Z
 
     return-void
 .end method
@@ -221,7 +239,7 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    const/4 v0, 0x0
+    sget v0, Landroidx/drawerlayout/R$attr;->drawerLayoutStyle:I
 
     invoke-direct {p0, p1, p2, v0}, Landroidx/drawerlayout/widget/DrawerLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -229,214 +247,253 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 5
+    .locals 6
 
     invoke-direct {p0, p1, p2, p3}, Landroid/view/ViewGroup;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    new-instance p2, Landroidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate;
+    new-instance v0, Landroidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate;
 
-    invoke-direct {p2}, Landroidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate;-><init>()V
+    invoke-direct {v0}, Landroidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate;-><init>()V
 
-    iput-object p2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mChildAccessibilityDelegate:Landroidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate;
+    iput-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mChildAccessibilityDelegate:Landroidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate;
 
-    const/high16 p2, -0x67000000
+    const/high16 v0, -0x67000000
 
-    iput p2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mScrimColor:I
+    iput v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mScrimColor:I
 
-    new-instance p2, Landroid/graphics/Paint;
+    new-instance v0, Landroid/graphics/Paint;
 
-    invoke-direct {p2}, Landroid/graphics/Paint;-><init>()V
+    invoke-direct {v0}, Landroid/graphics/Paint;-><init>()V
 
-    iput-object p2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mScrimPaint:Landroid/graphics/Paint;
+    iput-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mScrimPaint:Landroid/graphics/Paint;
 
-    const/4 p2, 0x1
+    const/4 v0, 0x1
 
-    iput-boolean p2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mFirstLayout:Z
+    iput-boolean v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mFirstLayout:Z
 
-    const/4 p3, 0x3
+    const/4 v1, 0x3
 
-    iput p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLockModeLeft:I
+    iput v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLockModeLeft:I
 
-    iput p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLockModeRight:I
+    iput v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLockModeRight:I
 
-    iput p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLockModeStart:I
+    iput v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLockModeStart:I
 
-    iput p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLockModeEnd:I
+    iput v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLockModeEnd:I
 
-    const/4 v0, 0x0
+    const/4 v2, 0x0
 
-    iput-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowStart:Landroid/graphics/drawable/Drawable;
+    iput-object v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowStart:Landroid/graphics/drawable/Drawable;
 
-    iput-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowEnd:Landroid/graphics/drawable/Drawable;
+    iput-object v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowEnd:Landroid/graphics/drawable/Drawable;
 
-    iput-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowLeft:Landroid/graphics/drawable/Drawable;
+    iput-object v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowLeft:Landroid/graphics/drawable/Drawable;
 
-    iput-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowRight:Landroid/graphics/drawable/Drawable;
+    iput-object v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowRight:Landroid/graphics/drawable/Drawable;
 
-    const/high16 v1, 0x40000
+    const/high16 v3, 0x40000
 
-    invoke-virtual {p0, v1}, Landroidx/drawerlayout/widget/DrawerLayout;->setDescendantFocusability(I)V
+    invoke-virtual {p0, v3}, Landroidx/drawerlayout/widget/DrawerLayout;->setDescendantFocusability(I)V
 
     invoke-virtual {p0}, Landroidx/drawerlayout/widget/DrawerLayout;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v1
+    move-result-object v3
 
-    invoke-virtual {v1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
+    invoke-virtual {v3}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
+
+    move-result-object v3
+
+    iget v3, v3, Landroid/util/DisplayMetrics;->density:F
+
+    const/high16 v4, 0x42800000    # 64.0f
+
+    mul-float v4, v4, v3
+
+    const/high16 v5, 0x3f000000    # 0.5f
+
+    add-float/2addr v4, v5
+
+    float-to-int v4, v4
+
+    iput v4, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mMinDrawerMargin:I
+
+    const/high16 v4, 0x43c80000    # 400.0f
+
+    mul-float v3, v3, v4
+
+    new-instance v4, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
+
+    invoke-direct {v4, p0, v1}, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;I)V
+
+    iput-object v4, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftCallback:Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
+
+    new-instance v1, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
+
+    const/4 v4, 0x5
+
+    invoke-direct {v1, p0, v4}, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;I)V
+
+    iput-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightCallback:Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
+
+    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftCallback:Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
+
+    const/high16 v4, 0x3f800000    # 1.0f
+
+    invoke-static {p0, v4, v1}, Landroidx/customview/widget/ViewDragHelper;->create(Landroid/view/ViewGroup;FLandroidx/customview/widget/ViewDragHelper$Callback;)Landroidx/customview/widget/ViewDragHelper;
 
     move-result-object v1
 
-    iget v1, v1, Landroid/util/DisplayMetrics;->density:F
+    iput-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftDragger:Landroidx/customview/widget/ViewDragHelper;
 
-    const/high16 v2, 0x42800000    # 64.0f
+    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftDragger:Landroidx/customview/widget/ViewDragHelper;
 
-    mul-float v2, v2, v1
+    invoke-virtual {v1, v0}, Landroidx/customview/widget/ViewDragHelper;->setEdgeTrackingEnabled(I)V
 
-    const/high16 v3, 0x3f000000    # 0.5f
+    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftDragger:Landroidx/customview/widget/ViewDragHelper;
 
-    add-float/2addr v2, v3
+    invoke-virtual {v1, v3}, Landroidx/customview/widget/ViewDragHelper;->setMinVelocity(F)V
 
-    float-to-int v2, v2
+    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftCallback:Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
 
-    iput v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mMinDrawerMargin:I
+    iget-object v5, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftDragger:Landroidx/customview/widget/ViewDragHelper;
 
-    const/high16 v2, 0x43c80000    # 400.0f
+    invoke-virtual {v1, v5}, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->setDragger(Landroidx/customview/widget/ViewDragHelper;)V
 
-    mul-float v2, v2, v1
+    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightCallback:Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
 
-    new-instance v3, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
+    invoke-static {p0, v4, v1}, Landroidx/customview/widget/ViewDragHelper;->create(Landroid/view/ViewGroup;FLandroidx/customview/widget/ViewDragHelper$Callback;)Landroidx/customview/widget/ViewDragHelper;
 
-    invoke-direct {v3, p0, p3}, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;I)V
+    move-result-object v1
 
-    iput-object v3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftCallback:Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
+    iput-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightDragger:Landroidx/customview/widget/ViewDragHelper;
 
-    new-instance p3, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
+    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightDragger:Landroidx/customview/widget/ViewDragHelper;
 
-    const/4 v3, 0x5
+    const/4 v4, 0x2
 
-    invoke-direct {p3, p0, v3}, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;I)V
+    invoke-virtual {v1, v4}, Landroidx/customview/widget/ViewDragHelper;->setEdgeTrackingEnabled(I)V
 
-    iput-object p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightCallback:Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
+    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightDragger:Landroidx/customview/widget/ViewDragHelper;
 
-    iget-object p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftCallback:Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
+    invoke-virtual {v1, v3}, Landroidx/customview/widget/ViewDragHelper;->setMinVelocity(F)V
 
-    const/high16 v3, 0x3f800000    # 1.0f
+    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightCallback:Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
 
-    invoke-static {p0, v3, p3}, Landroidx/customview/widget/ViewDragHelper;->create(Landroid/view/ViewGroup;FLandroidx/customview/widget/ViewDragHelper$Callback;)Landroidx/customview/widget/ViewDragHelper;
+    iget-object v3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightDragger:Landroidx/customview/widget/ViewDragHelper;
 
-    move-result-object p3
+    invoke-virtual {v1, v3}, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->setDragger(Landroidx/customview/widget/ViewDragHelper;)V
 
-    iput-object p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftDragger:Landroidx/customview/widget/ViewDragHelper;
+    invoke-virtual {p0, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->setFocusableInTouchMode(Z)V
 
-    iget-object p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftDragger:Landroidx/customview/widget/ViewDragHelper;
+    invoke-static {p0, v0}, Landroidx/core/view/ViewCompat;->setImportantForAccessibility(Landroid/view/View;I)V
 
-    invoke-virtual {p3, p2}, Landroidx/customview/widget/ViewDragHelper;->setEdgeTrackingEnabled(I)V
+    new-instance v0, Landroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;
 
-    iget-object p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftDragger:Landroidx/customview/widget/ViewDragHelper;
+    invoke-direct {v0, p0}, Landroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;)V
 
-    invoke-virtual {p3, v2}, Landroidx/customview/widget/ViewDragHelper;->setMinVelocity(F)V
+    invoke-static {p0, v0}, Landroidx/core/view/ViewCompat;->setAccessibilityDelegate(Landroid/view/View;Landroidx/core/view/AccessibilityDelegateCompat;)V
 
-    iget-object p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftCallback:Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
+    const/4 v0, 0x0
 
-    iget-object v4, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftDragger:Landroidx/customview/widget/ViewDragHelper;
-
-    invoke-virtual {p3, v4}, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->setDragger(Landroidx/customview/widget/ViewDragHelper;)V
-
-    iget-object p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightCallback:Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
-
-    invoke-static {p0, v3, p3}, Landroidx/customview/widget/ViewDragHelper;->create(Landroid/view/ViewGroup;FLandroidx/customview/widget/ViewDragHelper$Callback;)Landroidx/customview/widget/ViewDragHelper;
-
-    move-result-object p3
-
-    iput-object p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightDragger:Landroidx/customview/widget/ViewDragHelper;
-
-    iget-object p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightDragger:Landroidx/customview/widget/ViewDragHelper;
-
-    const/4 v3, 0x2
-
-    invoke-virtual {p3, v3}, Landroidx/customview/widget/ViewDragHelper;->setEdgeTrackingEnabled(I)V
-
-    iget-object p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightDragger:Landroidx/customview/widget/ViewDragHelper;
-
-    invoke-virtual {p3, v2}, Landroidx/customview/widget/ViewDragHelper;->setMinVelocity(F)V
-
-    iget-object p3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightCallback:Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
-
-    iget-object v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightDragger:Landroidx/customview/widget/ViewDragHelper;
-
-    invoke-virtual {p3, v2}, Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->setDragger(Landroidx/customview/widget/ViewDragHelper;)V
-
-    invoke-virtual {p0, p2}, Landroidx/drawerlayout/widget/DrawerLayout;->setFocusableInTouchMode(Z)V
-
-    invoke-static {p0, p2}, Landroidx/core/view/ViewCompat;->setImportantForAccessibility(Landroid/view/View;I)V
-
-    new-instance p2, Landroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;
-
-    invoke-direct {p2, p0}, Landroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;)V
-
-    invoke-static {p0, p2}, Landroidx/core/view/ViewCompat;->setAccessibilityDelegate(Landroid/view/View;Landroidx/core/view/AccessibilityDelegateCompat;)V
-
-    const/4 p2, 0x0
-
-    invoke-virtual {p0, p2}, Landroidx/drawerlayout/widget/DrawerLayout;->setMotionEventSplittingEnabled(Z)V
+    invoke-virtual {p0, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->setMotionEventSplittingEnabled(Z)V
 
     invoke-static {p0}, Landroidx/core/view/ViewCompat;->getFitsSystemWindows(Landroid/view/View;)Z
 
-    move-result p3
+    move-result v1
 
-    if-eqz p3, :cond_1
+    if-eqz v1, :cond_1
 
-    sget p3, Landroid/os/Build$VERSION;->SDK_INT:I
+    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/16 v2, 0x15
+    const/16 v3, 0x15
 
-    if-lt p3, v2, :cond_0
+    if-lt v1, v3, :cond_0
 
-    new-instance p3, Landroidx/drawerlayout/widget/DrawerLayout$1;
+    new-instance v1, Landroidx/drawerlayout/widget/DrawerLayout$1;
 
-    invoke-direct {p3, p0}, Landroidx/drawerlayout/widget/DrawerLayout$1;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;)V
+    invoke-direct {v1, p0}, Landroidx/drawerlayout/widget/DrawerLayout$1;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;)V
 
-    invoke-virtual {p0, p3}, Landroidx/drawerlayout/widget/DrawerLayout;->setOnApplyWindowInsetsListener(Landroid/view/View$OnApplyWindowInsetsListener;)V
+    invoke-virtual {p0, v1}, Landroidx/drawerlayout/widget/DrawerLayout;->setOnApplyWindowInsetsListener(Landroid/view/View$OnApplyWindowInsetsListener;)V
 
-    const/16 p3, 0x500
+    const/16 v1, 0x500
 
-    invoke-virtual {p0, p3}, Landroidx/drawerlayout/widget/DrawerLayout;->setSystemUiVisibility(I)V
+    invoke-virtual {p0, v1}, Landroidx/drawerlayout/widget/DrawerLayout;->setSystemUiVisibility(I)V
 
-    sget-object p3, Landroidx/drawerlayout/widget/DrawerLayout;->THEME_ATTRS:[I
+    sget-object v1, Landroidx/drawerlayout/widget/DrawerLayout;->THEME_ATTRS:[I
 
-    invoke-virtual {p1, p3}, Landroid/content/Context;->obtainStyledAttributes([I)Landroid/content/res/TypedArray;
+    invoke-virtual {p1, v1}, Landroid/content/Context;->obtainStyledAttributes([I)Landroid/content/res/TypedArray;
 
-    move-result-object p1
+    move-result-object v1
 
     :try_start_0
-    invoke-virtual {p1, p2}, Landroid/content/res/TypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable;
+    invoke-virtual {v1, v0}, Landroid/content/res/TypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable;
 
-    move-result-object p2
+    move-result-object v2
 
-    iput-object p2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable;
+    iput-object v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
+    invoke-virtual {v1}, Landroid/content/res/TypedArray;->recycle()V
 
     goto :goto_0
 
     :catchall_0
-    move-exception p2
+    move-exception p1
 
-    invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
+    invoke-virtual {v1}, Landroid/content/res/TypedArray;->recycle()V
 
-    throw p2
+    throw p1
 
     :cond_0
-    iput-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable;
+    iput-object v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable;
 
     :cond_1
     :goto_0
-    const/high16 p1, 0x41200000    # 10.0f
+    sget-object v1, Landroidx/drawerlayout/R$styleable;->DrawerLayout:[I
 
-    mul-float v1, v1, p1
+    invoke-virtual {p1, p2, v1, p3, v0}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
 
-    iput v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDrawerElevation:F
+    move-result-object p1
+
+    :try_start_1
+    sget p2, Landroidx/drawerlayout/R$styleable;->DrawerLayout_elevation:I
+
+    invoke-virtual {p1, p2}, Landroid/content/res/TypedArray;->hasValue(I)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_2
+
+    sget p2, Landroidx/drawerlayout/R$styleable;->DrawerLayout_elevation:I
+
+    const/4 p3, 0x0
+
+    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getDimension(IF)F
+
+    move-result p2
+
+    iput p2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDrawerElevation:F
+
+    goto :goto_1
+
+    :cond_2
+    invoke-virtual {p0}, Landroidx/drawerlayout/widget/DrawerLayout;->getResources()Landroid/content/res/Resources;
+
+    move-result-object p2
+
+    sget p3, Landroidx/drawerlayout/R$dimen;->def_drawer_elevation:I
+
+    invoke-virtual {p2, p3}, Landroid/content/res/Resources;->getDimension(I)F
+
+    move-result p2
+
+    iput p2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDrawerElevation:F
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :goto_1
+    invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -445,6 +502,13 @@
     iput-object p1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mNonDrawerViews:Ljava/util/ArrayList;
 
     return-void
+
+    :catchall_1
+    move-exception p2
+
+    invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
+
+    throw p2
 .end method
 
 .method private dispatchTransformedGenericPointerEvent(Landroid/view/MotionEvent;Landroid/view/View;)Z
@@ -758,31 +822,21 @@
     return p1
 .end method
 
-.method private mirror(Landroid/graphics/drawable/Drawable;I)Z
+.method private mirror(Landroid/graphics/drawable/Drawable;I)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    if-eqz p1, :cond_0
 
     invoke-static {p1}, Landroidx/core/graphics/drawable/DrawableCompat;->isAutoMirrored(Landroid/graphics/drawable/Drawable;)Z
 
     move-result v0
 
-    if-nez v0, :cond_0
+    if-eqz v0, :cond_0
 
-    goto :goto_0
-
-    :cond_0
     invoke-static {p1, p2}, Landroidx/core/graphics/drawable/DrawableCompat;->setLayoutDirection(Landroid/graphics/drawable/Drawable;I)Z
 
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x0
-
-    return p1
+    :cond_0
+    return-void
 .end method
 
 .method private resolveLeftShadow()Landroid/graphics/drawable/Drawable;
@@ -798,7 +852,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-direct {p0, v1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->mirror(Landroid/graphics/drawable/Drawable;I)Z
+    invoke-direct {p0, v1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->mirror(Landroid/graphics/drawable/Drawable;I)V
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowStart:Landroid/graphics/drawable/Drawable;
 
@@ -809,7 +863,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-direct {p0, v1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->mirror(Landroid/graphics/drawable/Drawable;I)Z
+    invoke-direct {p0, v1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->mirror(Landroid/graphics/drawable/Drawable;I)V
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowEnd:Landroid/graphics/drawable/Drawable;
 
@@ -834,7 +888,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-direct {p0, v1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->mirror(Landroid/graphics/drawable/Drawable;I)Z
+    invoke-direct {p0, v1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->mirror(Landroid/graphics/drawable/Drawable;I)V
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowEnd:Landroid/graphics/drawable/Drawable;
 
@@ -845,7 +899,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-direct {p0, v1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->mirror(Landroid/graphics/drawable/Drawable;I)Z
+    invoke-direct {p0, v1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->mirror(Landroid/graphics/drawable/Drawable;I)V
 
     iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mShadowStart:Landroid/graphics/drawable/Drawable;
 
@@ -1352,9 +1406,7 @@
     :cond_2
     invoke-virtual {p0, p1, v3}, Landroidx/drawerlayout/widget/DrawerLayout;->moveDrawerToOffset(Landroid/view/View;F)V
 
-    iget p2, v0, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->gravity:I
-
-    invoke-virtual {p0, p2, v2, p1}, Landroidx/drawerlayout/widget/DrawerLayout;->updateDrawerState(IILandroid/view/View;)V
+    invoke-virtual {p0, v2, p1}, Landroidx/drawerlayout/widget/DrawerLayout;->updateDrawerState(ILandroid/view/View;)V
 
     invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
 
@@ -3017,8 +3069,6 @@
     :cond_1
     invoke-virtual {p0, v2}, Landroidx/drawerlayout/widget/DrawerLayout;->closeDrawers(Z)V
 
-    iput-boolean v3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDisallowInterceptRequested:Z
-
     iput-boolean v3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mChildrenCanceledTouch:Z
 
     :cond_2
@@ -3074,8 +3124,6 @@
     const/4 p1, 0x0
 
     :goto_1
-    iput-boolean v3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDisallowInterceptRequested:Z
-
     iput-boolean v3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mChildrenCanceledTouch:Z
 
     :goto_2
@@ -3436,6 +3484,53 @@
     goto/16 :goto_0
 
     :cond_a
+    sget-boolean v1, Landroidx/drawerlayout/widget/DrawerLayout;->sEdgeSizeUsingSystemGestureInsets:Z
+
+    if-eqz v1, :cond_b
+
+    invoke-virtual/range {p0 .. p0}, Landroidx/drawerlayout/widget/DrawerLayout;->getRootWindowInsets()Landroid/view/WindowInsets;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_b
+
+    invoke-static {v1}, Landroidx/core/view/WindowInsetsCompat;->toWindowInsetsCompat(Landroid/view/WindowInsets;)Landroidx/core/view/WindowInsetsCompat;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroidx/core/view/WindowInsetsCompat;->getSystemGestureInsets()Landroidx/core/graphics/Insets;
+
+    move-result-object v1
+
+    iget-object v2, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftDragger:Landroidx/customview/widget/ViewDragHelper;
+
+    invoke-virtual {v2}, Landroidx/customview/widget/ViewDragHelper;->getDefaultEdgeSize()I
+
+    move-result v3
+
+    iget v5, v1, Landroidx/core/graphics/Insets;->left:I
+
+    invoke-static {v3, v5}, Ljava/lang/Math;->max(II)I
+
+    move-result v3
+
+    invoke-virtual {v2, v3}, Landroidx/customview/widget/ViewDragHelper;->setEdgeSize(I)V
+
+    iget-object v2, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightDragger:Landroidx/customview/widget/ViewDragHelper;
+
+    invoke-virtual {v2}, Landroidx/customview/widget/ViewDragHelper;->getDefaultEdgeSize()I
+
+    move-result v3
+
+    iget v1, v1, Landroidx/core/graphics/Insets;->right:I
+
+    invoke-static {v3, v1}, Ljava/lang/Math;->max(II)I
+
+    move-result v1
+
+    invoke-virtual {v2, v1}, Landroidx/customview/widget/ViewDragHelper;->setEdgeSize(I)V
+
+    :cond_b
     iput-boolean v4, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mInLayout:Z
 
     iput-boolean v4, v0, Landroidx/drawerlayout/widget/DrawerLayout;->mFirstLayout:Z
@@ -3479,17 +3574,11 @@
 
     if-eqz v7, :cond_14
 
-    const/high16 v7, -0x80000000
-
-    if-eq v1, v7, :cond_1
-
     if-nez v1, :cond_1
 
     const/16 v3, 0x12c
 
     :cond_1
-    if-eq v2, v7, :cond_2
-
     if-nez v2, :cond_2
 
     const/16 v4, 0x12c
@@ -4134,28 +4223,26 @@
 
     and-int/lit16 v0, v0, 0xff
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
     if-eqz v0, :cond_4
 
-    if-eq v0, v1, :cond_1
+    if-eq v0, v2, :cond_1
 
     const/4 p1, 0x3
 
     if-eq v0, p1, :cond_0
 
-    goto :goto_2
+    goto :goto_0
 
     :cond_0
-    invoke-virtual {p0, v1}, Landroidx/drawerlayout/widget/DrawerLayout;->closeDrawers(Z)V
+    invoke-virtual {p0, v2}, Landroidx/drawerlayout/widget/DrawerLayout;->closeDrawers(Z)V
 
-    iput-boolean v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDisallowInterceptRequested:Z
+    iput-boolean v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mChildrenCanceledTouch:Z
 
-    iput-boolean v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mChildrenCanceledTouch:Z
-
-    goto :goto_2
+    goto :goto_0
 
     :cond_1
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
@@ -4176,13 +4263,13 @@
 
     move-result-object v3
 
-    if-eqz v3, :cond_3
+    if-eqz v3, :cond_2
 
     invoke-virtual {p0, v3}, Landroidx/drawerlayout/widget/DrawerLayout;->isContentView(Landroid/view/View;)Z
 
     move-result v3
 
-    if-eqz v3, :cond_3
+    if-eqz v3, :cond_2
 
     iget v3, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mInitialMotionX:F
 
@@ -4210,13 +4297,13 @@
 
     cmpg-float p1, v0, p1
 
-    if-gez p1, :cond_3
+    if-gez p1, :cond_2
 
     invoke-virtual {p0}, Landroidx/drawerlayout/widget/DrawerLayout;->findOpenDrawer()Landroid/view/View;
 
     move-result-object p1
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_2
 
     invoke-virtual {p0, p1}, Landroidx/drawerlayout/widget/DrawerLayout;->getDrawerLockMode(Landroid/view/View;)I
 
@@ -4224,25 +4311,15 @@
 
     const/4 v0, 0x2
 
-    if-ne p1, v0, :cond_2
-
-    goto :goto_0
+    if-ne p1, v0, :cond_3
 
     :cond_2
-    const/4 p1, 0x0
-
-    goto :goto_1
+    const/4 v1, 0x1
 
     :cond_3
-    :goto_0
-    const/4 p1, 0x1
+    invoke-virtual {p0, v1}, Landroidx/drawerlayout/widget/DrawerLayout;->closeDrawers(Z)V
 
-    :goto_1
-    invoke-virtual {p0, p1}, Landroidx/drawerlayout/widget/DrawerLayout;->closeDrawers(Z)V
-
-    iput-boolean v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDisallowInterceptRequested:Z
-
-    goto :goto_2
+    goto :goto_0
 
     :cond_4
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
@@ -4257,12 +4334,10 @@
 
     iput p1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mInitialMotionY:F
 
-    iput-boolean v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDisallowInterceptRequested:Z
+    iput-boolean v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mChildrenCanceledTouch:Z
 
-    iput-boolean v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mChildrenCanceledTouch:Z
-
-    :goto_2
-    return v1
+    :goto_0
+    return v2
 .end method
 
 .method public openDrawer(I)V
@@ -4406,9 +4481,7 @@
     :cond_2
     invoke-virtual {p0, p1, v2}, Landroidx/drawerlayout/widget/DrawerLayout;->moveDrawerToOffset(Landroid/view/View;F)V
 
-    iget p2, v0, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->gravity:I
-
-    invoke-virtual {p0, p2, v1, p1}, Landroidx/drawerlayout/widget/DrawerLayout;->updateDrawerState(IILandroid/view/View;)V
+    invoke-virtual {p0, v1, p1}, Landroidx/drawerlayout/widget/DrawerLayout;->updateDrawerState(ILandroid/view/View;)V
 
     invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
 
@@ -4466,8 +4539,6 @@
 
     invoke-super {p0, p1}, Landroid/view/ViewGroup;->requestDisallowInterceptTouchEvent(Z)V
 
-    iput-boolean p1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDisallowInterceptRequested:Z
-
     if-eqz p1, :cond_0
 
     const/4 p1, 0x1
@@ -4928,89 +4999,89 @@
     return-void
 .end method
 
-.method updateDrawerState(IILandroid/view/View;)V
-    .locals 3
+.method updateDrawerState(ILandroid/view/View;)V
+    .locals 4
 
-    iget-object p1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftDragger:Landroidx/customview/widget/ViewDragHelper;
-
-    invoke-virtual {p1}, Landroidx/customview/widget/ViewDragHelper;->getViewDragState()I
-
-    move-result p1
-
-    iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightDragger:Landroidx/customview/widget/ViewDragHelper;
+    iget-object v0, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mLeftDragger:Landroidx/customview/widget/ViewDragHelper;
 
     invoke-virtual {v0}, Landroidx/customview/widget/ViewDragHelper;->getViewDragState()I
 
     move-result v0
 
-    const/4 v1, 0x2
+    iget-object v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mRightDragger:Landroidx/customview/widget/ViewDragHelper;
 
-    const/4 v2, 0x1
+    invoke-virtual {v1}, Landroidx/customview/widget/ViewDragHelper;->getViewDragState()I
 
-    if-eq p1, v2, :cond_2
+    move-result v1
 
-    if-ne v0, v2, :cond_0
+    const/4 v2, 0x2
+
+    const/4 v3, 0x1
+
+    if-eq v0, v3, :cond_2
+
+    if-ne v1, v3, :cond_0
 
     goto :goto_0
 
     :cond_0
-    if-eq p1, v1, :cond_3
+    if-eq v0, v2, :cond_3
 
-    if-ne v0, v1, :cond_1
+    if-ne v1, v2, :cond_1
 
     goto :goto_1
 
     :cond_1
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
     goto :goto_1
 
     :cond_2
     :goto_0
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
     :cond_3
     :goto_1
-    if-eqz p3, :cond_5
+    if-eqz p2, :cond_5
 
-    if-nez p2, :cond_5
+    if-nez p1, :cond_5
 
-    invoke-virtual {p3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    invoke-virtual {p2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object p1
 
     check-cast p1, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;
 
-    iget p2, p1, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->onScreen:F
+    iget v0, p1, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->onScreen:F
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    cmpl-float p2, p2, v0
+    cmpl-float v0, v0, v1
 
-    if-nez p2, :cond_4
+    if-nez v0, :cond_4
 
-    invoke-virtual {p0, p3}, Landroidx/drawerlayout/widget/DrawerLayout;->dispatchOnDrawerClosed(Landroid/view/View;)V
+    invoke-virtual {p0, p2}, Landroidx/drawerlayout/widget/DrawerLayout;->dispatchOnDrawerClosed(Landroid/view/View;)V
 
     goto :goto_2
 
     :cond_4
     iget p1, p1, Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;->onScreen:F
 
-    const/high16 p2, 0x3f800000    # 1.0f
+    const/high16 v0, 0x3f800000    # 1.0f
 
-    cmpl-float p1, p1, p2
+    cmpl-float p1, p1, v0
 
     if-nez p1, :cond_5
 
-    invoke-virtual {p0, p3}, Landroidx/drawerlayout/widget/DrawerLayout;->dispatchOnDrawerOpened(Landroid/view/View;)V
+    invoke-virtual {p0, p2}, Landroidx/drawerlayout/widget/DrawerLayout;->dispatchOnDrawerOpened(Landroid/view/View;)V
 
     :cond_5
     :goto_2
     iget p1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDrawerState:I
 
-    if-eq v1, p1, :cond_6
+    if-eq v2, p1, :cond_6
 
-    iput v1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDrawerState:I
+    iput v2, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mDrawerState:I
 
     iget-object p1, p0, Landroidx/drawerlayout/widget/DrawerLayout;->mListeners:Ljava/util/List;
 
@@ -5020,7 +5091,7 @@
 
     move-result p1
 
-    sub-int/2addr p1, v2
+    sub-int/2addr p1, v3
 
     :goto_3
     if-ltz p1, :cond_6
@@ -5033,7 +5104,7 @@
 
     check-cast p2, Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;
 
-    invoke-interface {p2, v1}, Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;->onDrawerStateChanged(I)V
+    invoke-interface {p2, v2}, Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;->onDrawerStateChanged(I)V
 
     add-int/lit8 p1, p1, -0x1
 
diff --git a/com.discord/smali/androidx/dynamicanimation/R$attr.smali b/com.discord/smali/androidx/dynamicanimation/R$attr.smali
index 89a08729b0..c9b49d96af 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$attr.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$attr.smali
@@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$color.smali b/com.discord/smali/androidx/dynamicanimation/R$color.smali
index 8935865228..0a57b7009d 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$color.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$dimen.smali b/com.discord/smali/androidx/dynamicanimation/R$dimen.smali
index 5c7b2ccd0f..b08039369d 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$dimen.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
index f11796937f..24c087c743 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$id.smali b/com.discord/smali/androidx/dynamicanimation/R$id.smali
index 5b7aea3119..80f30d5086 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$id.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$id.smali
@@ -91,63 +91,63 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final dialog_button:I = 0x7f0a0253
+.field public static final dialog_button:I = 0x7f0a025c
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0732
+.field public static final tag_accessibility_actions:I = 0x7f0a075b
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0733
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a075c
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0734
+.field public static final tag_accessibility_heading:I = 0x7f0a075d
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0735
+.field public static final tag_accessibility_pane_title:I = 0x7f0a075e
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0736
+.field public static final tag_screen_reader_focusable:I = 0x7f0a075f
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$layout.smali b/com.discord/smali/androidx/dynamicanimation/R$layout.smali
index f633ed96ea..674a02e471 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$layout.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$layout.smali
@@ -17,17 +17,17 @@
 # static fields
 .field public static final custom_dialog:I = 0x7f0d0022
 
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$string.smali b/com.discord/smali/androidx/dynamicanimation/R$string.smali
index baafd4a51c..89eb563964 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$string.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$style.smali b/com.discord/smali/androidx/dynamicanimation/R$style.smali
index 25900794f9..f1dde355e8 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$style.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$styleable.smali b/com.discord/smali/androidx/dynamicanimation/R$styleable.smali
index b83f03dd75..2a6f40a777 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$styleable.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$styleable.smali
@@ -149,12 +149,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +164,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/fragment/R$attr.smali b/com.discord/smali/androidx/fragment/R$attr.smali
index 2728e54182..6668bfe75e 100644
--- a/com.discord/smali/androidx/fragment/R$attr.smali
+++ b/com.discord/smali/androidx/fragment/R$attr.smali
@@ -17,45 +17,45 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$color.smali b/com.discord/smali/androidx/fragment/R$color.smali
index 98d9983997..98fec7d8c7 100644
--- a/com.discord/smali/androidx/fragment/R$color.smali
+++ b/com.discord/smali/androidx/fragment/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$dimen.smali b/com.discord/smali/androidx/fragment/R$dimen.smali
index bf75c8ef07..a6a4c732e5 100644
--- a/com.discord/smali/androidx/fragment/R$dimen.smali
+++ b/com.discord/smali/androidx/fragment/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$drawable.smali b/com.discord/smali/androidx/fragment/R$drawable.smali
index 5d20a09a11..49cd558cb5 100644
--- a/com.discord/smali/androidx/fragment/R$drawable.smali
+++ b/com.discord/smali/androidx/fragment/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$id.smali b/com.discord/smali/androidx/fragment/R$id.smali
index eb8247bfb2..6df57b9569 100644
--- a/com.discord/smali/androidx/fragment/R$id.smali
+++ b/com.discord/smali/androidx/fragment/R$id.smali
@@ -25,65 +25,65 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$layout.smali b/com.discord/smali/androidx/fragment/R$layout.smali
index 22b494a2e2..5a8a040118 100644
--- a/com.discord/smali/androidx/fragment/R$layout.smali
+++ b/com.discord/smali/androidx/fragment/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali
index bf82c09421..29b89d2212 100644
--- a/com.discord/smali/androidx/fragment/R$string.smali
+++ b/com.discord/smali/androidx/fragment/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$style.smali b/com.discord/smali/androidx/fragment/R$style.smali
index e8ad32fbc6..8e0540ffff 100644
--- a/com.discord/smali/androidx/fragment/R$style.smali
+++ b/com.discord/smali/androidx/fragment/R$style.smali
@@ -15,21 +15,21 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$styleable.smali b/com.discord/smali/androidx/fragment/R$styleable.smali
index 05d4eb1379..54d5d27744 100644
--- a/com.discord/smali/androidx/fragment/R$styleable.smali
+++ b/com.discord/smali/androidx/fragment/R$styleable.smali
@@ -183,29 +183,29 @@
 
     :array_1
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_2
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_3
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_4
@@ -215,11 +215,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_5
diff --git a/com.discord/smali/androidx/fragment/app/FragmentActivity.smali b/com.discord/smali/androidx/fragment/app/FragmentActivity.smali
index 5a5e142a20..13c95e975c 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentActivity.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentActivity.smali
@@ -631,7 +631,7 @@
     return-void
 .end method
 
-.method protected onCreate(Landroid/os/Bundle;)V
+.method public onCreate(Landroid/os/Bundle;)V
     .locals 6
 
     iget-object v0, p0, Landroidx/fragment/app/FragmentActivity;->mFragments:Landroidx/fragment/app/FragmentController;
@@ -1226,7 +1226,7 @@
     return-object v2
 .end method
 
-.method protected onSaveInstanceState(Landroid/os/Bundle;)V
+.method public onSaveInstanceState(Landroid/os/Bundle;)V
     .locals 4
 
     invoke-super {p0, p1}, Landroidx/core/app/ComponentActivity;->onSaveInstanceState(Landroid/os/Bundle;)V
diff --git a/com.discord/smali/androidx/legacy/coreui/R$attr.smali b/com.discord/smali/androidx/legacy/coreui/R$attr.smali
index 57d34af3fd..3b564881b9 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$attr.smali
@@ -17,45 +17,45 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$color.smali b/com.discord/smali/androidx/legacy/coreui/R$color.smali
index cf41e01091..3149b9b012 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$color.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$dimen.smali b/com.discord/smali/androidx/legacy/coreui/R$dimen.smali
index ca023a00bd..848f7fe0ba 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # 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 d07c296fb0..a82bc802b6 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # 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 95cb322575..8976655a83 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$id.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$id.smali
@@ -25,65 +25,65 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$layout.smali b/com.discord/smali/androidx/legacy/coreui/R$layout.smali
index 8c36a3f8b8..7848d68f8e 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$layout.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # 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 693c863bf3..289ec3eb77 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # 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 63b6077857..a30ac1c72a 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$style.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$style.smali
@@ -15,21 +15,21 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # 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 c9c10a3612..e0f8771ad3 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$styleable.smali
@@ -183,29 +183,29 @@
 
     :array_1
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_2
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_3
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_4
@@ -215,11 +215,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .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 0aa36a6f48..5f0a9fc018 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$attr.smali
@@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$color.smali b/com.discord/smali/androidx/legacy/coreutils/R$color.smali
index d6b74dbafb..c96e46e117 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$color.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali b/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali
index 61ece40137..8fc7afaa32 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # 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 703a694bdf..774c0d50d0 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # 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 20ea160dd9..336da0016f 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$id.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$id.smali
@@ -25,51 +25,51 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$layout.smali b/com.discord/smali/androidx/legacy/coreutils/R$layout.smali
index 13574799ef..188df97bb9 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$layout.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # 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 d2e6927346..ff4bca2f9d 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # 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 e91007c359..8c0970879c 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$style.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # 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 67ab48c8a5..88f2fcc997 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali
@@ -149,12 +149,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +164,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/legacy/v13/R$attr.smali b/com.discord/smali/androidx/legacy/v13/R$attr.smali
index 0fb9c9260e..3a18a8f373 100644
--- a/com.discord/smali/androidx/legacy/v13/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$attr.smali
@@ -17,45 +17,45 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v13/R$color.smali b/com.discord/smali/androidx/legacy/v13/R$color.smali
index f2420b4e36..2b3fa39c16 100644
--- a/com.discord/smali/androidx/legacy/v13/R$color.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$color.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final notification_material_background_media_default_color:I = 0x7f0600b7
+.field public static final notification_material_background_media_default_color:I = 0x7f0600ba
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ec
+.field public static final primary_text_default_material_dark:I = 0x7f0600ef
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v13/R$dimen.smali b/com.discord/smali/androidx/legacy/v13/R$dimen.smali
index a1ae64e544..bd8cd588f1 100644
--- a/com.discord/smali/androidx/legacy/v13/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$dimen.smali
@@ -29,43 +29,43 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
-.field public static final subtitle_corner_radius:I = 0x7f070124
+.field public static final subtitle_corner_radius:I = 0x7f070126
 
-.field public static final subtitle_outline_width:I = 0x7f070125
+.field public static final subtitle_outline_width:I = 0x7f070127
 
-.field public static final subtitle_shadow_offset:I = 0x7f070126
+.field public static final subtitle_shadow_offset:I = 0x7f070128
 
-.field public static final subtitle_shadow_radius:I = 0x7f070127
+.field public static final subtitle_shadow_radius:I = 0x7f070129
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v13/R$drawable.smali b/com.discord/smali/androidx/legacy/v13/R$drawable.smali
index c1791550d2..4aa7ab9bf5 100644
--- a/com.discord/smali/androidx/legacy/v13/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v13/R$id.smali b/com.discord/smali/androidx/legacy/v13/R$id.smali
index 2e03e141f0..4e75e913ae 100644
--- a/com.discord/smali/androidx/legacy/v13/R$id.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$id.smali
@@ -27,73 +27,73 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final cancel_action:I = 0x7f0a0117
+.field public static final cancel_action:I = 0x7f0a0118
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final end_padder:I = 0x7f0a02bf
+.field public static final end_padder:I = 0x7f0a02c8
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final media_actions:I = 0x7f0a042c
+.field public static final media_actions:I = 0x7f0a043c
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0710
+.field public static final status_bar_latest_event_content:I = 0x7f0a0730
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v13/R$layout.smali b/com.discord/smali/androidx/legacy/v13/R$layout.smali
index e93d77bede..a7ad9d06fa 100644
--- a/com.discord/smali/androidx/legacy/v13/R$layout.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$layout.smali
@@ -15,35 +15,35 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_media_action:I = 0x7f0d0043
+.field public static final notification_media_action:I = 0x7f0d0045
 
-.field public static final notification_media_cancel_action:I = 0x7f0d0044
+.field public static final notification_media_cancel_action:I = 0x7f0d0046
 
-.field public static final notification_template_big_media:I = 0x7f0d0045
+.field public static final notification_template_big_media:I = 0x7f0d0047
 
-.field public static final notification_template_big_media_custom:I = 0x7f0d0046
+.field public static final notification_template_big_media_custom:I = 0x7f0d0048
 
-.field public static final notification_template_big_media_narrow:I = 0x7f0d0047
+.field public static final notification_template_big_media_narrow:I = 0x7f0d0049
 
-.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d0048
+.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d004a
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_lines_media:I = 0x7f0d004b
+.field public static final notification_template_lines_media:I = 0x7f0d004d
 
-.field public static final notification_template_media:I = 0x7f0d004c
+.field public static final notification_template_media:I = 0x7f0d004e
 
-.field public static final notification_template_media_custom:I = 0x7f0d004d
+.field public static final notification_template_media_custom:I = 0x7f0d004f
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v13/R$string.smali b/com.discord/smali/androidx/legacy/v13/R$string.smali
index 26d2a60464..f0606247d5 100644
--- a/com.discord/smali/androidx/legacy/v13/R$string.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v13/R$style.smali b/com.discord/smali/androidx/legacy/v13/R$style.smali
index 8fe63153ac..ea3d0bbcb8 100644
--- a/com.discord/smali/androidx/legacy/v13/R$style.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$style.smali
@@ -15,31 +15,31 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f130184
+.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f130185
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f130186
+.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f130187
 
-.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f130187
+.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f130188
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f130189
+.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f13018a
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f13018b
+.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f13018c
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v13/R$styleable.smali b/com.discord/smali/androidx/legacy/v13/R$styleable.smali
index 1497d038f8..70481f0376 100644
--- a/com.discord/smali/androidx/legacy/v13/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$styleable.smali
@@ -183,29 +183,29 @@
 
     :array_1
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_2
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_3
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_4
@@ -215,11 +215,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_5
diff --git a/com.discord/smali/androidx/legacy/v4/R$attr.smali b/com.discord/smali/androidx/legacy/v4/R$attr.smali
index 14d787bd74..2bd7a6f87b 100644
--- a/com.discord/smali/androidx/legacy/v4/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$attr.smali
@@ -17,45 +17,45 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$color.smali b/com.discord/smali/androidx/legacy/v4/R$color.smali
index 53f3c7b40d..9810321264 100644
--- a/com.discord/smali/androidx/legacy/v4/R$color.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$color.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final notification_material_background_media_default_color:I = 0x7f0600b7
+.field public static final notification_material_background_media_default_color:I = 0x7f0600ba
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ec
+.field public static final primary_text_default_material_dark:I = 0x7f0600ef
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$dimen.smali b/com.discord/smali/androidx/legacy/v4/R$dimen.smali
index 6ff76ab92a..0d46ea9f1f 100644
--- a/com.discord/smali/androidx/legacy/v4/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$dimen.smali
@@ -29,43 +29,43 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
-.field public static final subtitle_corner_radius:I = 0x7f070124
+.field public static final subtitle_corner_radius:I = 0x7f070126
 
-.field public static final subtitle_outline_width:I = 0x7f070125
+.field public static final subtitle_outline_width:I = 0x7f070127
 
-.field public static final subtitle_shadow_offset:I = 0x7f070126
+.field public static final subtitle_shadow_offset:I = 0x7f070128
 
-.field public static final subtitle_shadow_radius:I = 0x7f070127
+.field public static final subtitle_shadow_radius:I = 0x7f070129
 
 
 # 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 4add5c4ecf..f30e157d61 100644
--- a/com.discord/smali/androidx/legacy/v4/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # 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 f5e4e1ff8c..74e424d249 100644
--- a/com.discord/smali/androidx/legacy/v4/R$id.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$id.smali
@@ -27,73 +27,73 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final cancel_action:I = 0x7f0a0117
+.field public static final cancel_action:I = 0x7f0a0118
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final end_padder:I = 0x7f0a02bf
+.field public static final end_padder:I = 0x7f0a02c8
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final media_actions:I = 0x7f0a042c
+.field public static final media_actions:I = 0x7f0a043c
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0710
+.field public static final status_bar_latest_event_content:I = 0x7f0a0730
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$layout.smali b/com.discord/smali/androidx/legacy/v4/R$layout.smali
index f7019da447..43a6a9c24e 100644
--- a/com.discord/smali/androidx/legacy/v4/R$layout.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$layout.smali
@@ -15,35 +15,35 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_media_action:I = 0x7f0d0043
+.field public static final notification_media_action:I = 0x7f0d0045
 
-.field public static final notification_media_cancel_action:I = 0x7f0d0044
+.field public static final notification_media_cancel_action:I = 0x7f0d0046
 
-.field public static final notification_template_big_media:I = 0x7f0d0045
+.field public static final notification_template_big_media:I = 0x7f0d0047
 
-.field public static final notification_template_big_media_custom:I = 0x7f0d0046
+.field public static final notification_template_big_media_custom:I = 0x7f0d0048
 
-.field public static final notification_template_big_media_narrow:I = 0x7f0d0047
+.field public static final notification_template_big_media_narrow:I = 0x7f0d0049
 
-.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d0048
+.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d004a
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_lines_media:I = 0x7f0d004b
+.field public static final notification_template_lines_media:I = 0x7f0d004d
 
-.field public static final notification_template_media:I = 0x7f0d004c
+.field public static final notification_template_media:I = 0x7f0d004e
 
-.field public static final notification_template_media_custom:I = 0x7f0d004d
+.field public static final notification_template_media_custom:I = 0x7f0d004f
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # 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 e42bb571e0..dc2b690249 100644
--- a/com.discord/smali/androidx/legacy/v4/R$string.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # 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 7b570eee3b..e86b50bf5d 100644
--- a/com.discord/smali/androidx/legacy/v4/R$style.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$style.smali
@@ -15,31 +15,31 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f130184
+.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f130185
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f130186
+.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f130187
 
-.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f130187
+.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f130188
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f130189
+.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f13018a
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f13018b
+.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f13018c
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # 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 49d029a4d1..db9bf56b04 100644
--- a/com.discord/smali/androidx/legacy/v4/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$styleable.smali
@@ -183,29 +183,29 @@
 
     :array_1
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_2
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_3
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_4
@@ -215,11 +215,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_5
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali b/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
index 8e87c44cf8..b8ad3c8b10 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
@@ -17,45 +17,45 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$color.smali b/com.discord/smali/androidx/lifecycle/extensions/R$color.smali
index 40c4c86cc0..3c029053cb 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$color.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali b/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali
index 120bde6b8c..20ab1a5f52 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
index 312f3bace0..042dbe67cd 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$id.smali b/com.discord/smali/androidx/lifecycle/extensions/R$id.smali
index 1a7674d0e6..39425fb2a9 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$id.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$id.smali
@@ -25,65 +25,65 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$layout.smali b/com.discord/smali/androidx/lifecycle/extensions/R$layout.smali
index 1340e20651..531eb15c45 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$layout.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
index ac7bcb6896..7129486e0b 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$style.smali b/com.discord/smali/androidx/lifecycle/extensions/R$style.smali
index 2362dae85c..0d2161aa4b 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$style.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$style.smali
@@ -15,21 +15,21 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali b/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali
index d2619b6ef4..180b52b06c 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali
@@ -183,29 +183,29 @@
 
     :array_1
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_2
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_3
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_4
@@ -215,11 +215,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_5
diff --git a/com.discord/smali/androidx/loader/R$attr.smali b/com.discord/smali/androidx/loader/R$attr.smali
index 6e0b0ed151..9f51efe3e9 100644
--- a/com.discord/smali/androidx/loader/R$attr.smali
+++ b/com.discord/smali/androidx/loader/R$attr.smali
@@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$color.smali b/com.discord/smali/androidx/loader/R$color.smali
index fa9e79ad8e..d0d438883b 100644
--- a/com.discord/smali/androidx/loader/R$color.smali
+++ b/com.discord/smali/androidx/loader/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$dimen.smali b/com.discord/smali/androidx/loader/R$dimen.smali
index ec44ece44f..cb2376b271 100644
--- a/com.discord/smali/androidx/loader/R$dimen.smali
+++ b/com.discord/smali/androidx/loader/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$drawable.smali b/com.discord/smali/androidx/loader/R$drawable.smali
index c2eb56c943..c31c3e5138 100644
--- a/com.discord/smali/androidx/loader/R$drawable.smali
+++ b/com.discord/smali/androidx/loader/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$id.smali b/com.discord/smali/androidx/loader/R$id.smali
index ca3bced488..67ed57115f 100644
--- a/com.discord/smali/androidx/loader/R$id.smali
+++ b/com.discord/smali/androidx/loader/R$id.smali
@@ -25,51 +25,51 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$layout.smali b/com.discord/smali/androidx/loader/R$layout.smali
index 66633c1783..5d159df6d0 100644
--- a/com.discord/smali/androidx/loader/R$layout.smali
+++ b/com.discord/smali/androidx/loader/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali
index 59ccd5e60b..c6aa9c6742 100644
--- a/com.discord/smali/androidx/loader/R$string.smali
+++ b/com.discord/smali/androidx/loader/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$style.smali b/com.discord/smali/androidx/loader/R$style.smali
index eb689673bc..d13b5a30b9 100644
--- a/com.discord/smali/androidx/loader/R$style.smali
+++ b/com.discord/smali/androidx/loader/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$styleable.smali b/com.discord/smali/androidx/loader/R$styleable.smali
index aa07630126..9e2e898d68 100644
--- a/com.discord/smali/androidx/loader/R$styleable.smali
+++ b/com.discord/smali/androidx/loader/R$styleable.smali
@@ -149,12 +149,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +164,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/media/R$attr.smali b/com.discord/smali/androidx/media/R$attr.smali
index 8815583353..22cc7d74bc 100644
--- a/com.discord/smali/androidx/media/R$attr.smali
+++ b/com.discord/smali/androidx/media/R$attr.smali
@@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$color.smali b/com.discord/smali/androidx/media/R$color.smali
index a4b828fa72..12d9aa7bf1 100644
--- a/com.discord/smali/androidx/media/R$color.smali
+++ b/com.discord/smali/androidx/media/R$color.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final notification_material_background_media_default_color:I = 0x7f0600b7
+.field public static final notification_material_background_media_default_color:I = 0x7f0600ba
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ec
+.field public static final primary_text_default_material_dark:I = 0x7f0600ef
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$dimen.smali b/com.discord/smali/androidx/media/R$dimen.smali
index 87a00d10d2..b8c4afcf37 100644
--- a/com.discord/smali/androidx/media/R$dimen.smali
+++ b/com.discord/smali/androidx/media/R$dimen.smali
@@ -29,43 +29,43 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
-.field public static final subtitle_corner_radius:I = 0x7f070124
+.field public static final subtitle_corner_radius:I = 0x7f070126
 
-.field public static final subtitle_outline_width:I = 0x7f070125
+.field public static final subtitle_outline_width:I = 0x7f070127
 
-.field public static final subtitle_shadow_offset:I = 0x7f070126
+.field public static final subtitle_shadow_offset:I = 0x7f070128
 
-.field public static final subtitle_shadow_radius:I = 0x7f070127
+.field public static final subtitle_shadow_radius:I = 0x7f070129
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$drawable.smali b/com.discord/smali/androidx/media/R$drawable.smali
index 756dff12e4..a468725676 100644
--- a/com.discord/smali/androidx/media/R$drawable.smali
+++ b/com.discord/smali/androidx/media/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$id.smali b/com.discord/smali/androidx/media/R$id.smali
index d78aa32453..b1c353ccc7 100644
--- a/com.discord/smali/androidx/media/R$id.smali
+++ b/com.discord/smali/androidx/media/R$id.smali
@@ -27,59 +27,59 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final cancel_action:I = 0x7f0a0117
+.field public static final cancel_action:I = 0x7f0a0118
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final end_padder:I = 0x7f0a02bf
+.field public static final end_padder:I = 0x7f0a02c8
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final media_actions:I = 0x7f0a042c
+.field public static final media_actions:I = 0x7f0a043c
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0710
+.field public static final status_bar_latest_event_content:I = 0x7f0a0730
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$layout.smali b/com.discord/smali/androidx/media/R$layout.smali
index 5539450429..5bd897c511 100644
--- a/com.discord/smali/androidx/media/R$layout.smali
+++ b/com.discord/smali/androidx/media/R$layout.smali
@@ -15,35 +15,35 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_media_action:I = 0x7f0d0043
+.field public static final notification_media_action:I = 0x7f0d0045
 
-.field public static final notification_media_cancel_action:I = 0x7f0d0044
+.field public static final notification_media_cancel_action:I = 0x7f0d0046
 
-.field public static final notification_template_big_media:I = 0x7f0d0045
+.field public static final notification_template_big_media:I = 0x7f0d0047
 
-.field public static final notification_template_big_media_custom:I = 0x7f0d0046
+.field public static final notification_template_big_media_custom:I = 0x7f0d0048
 
-.field public static final notification_template_big_media_narrow:I = 0x7f0d0047
+.field public static final notification_template_big_media_narrow:I = 0x7f0d0049
 
-.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d0048
+.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d004a
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_lines_media:I = 0x7f0d004b
+.field public static final notification_template_lines_media:I = 0x7f0d004d
 
-.field public static final notification_template_media:I = 0x7f0d004c
+.field public static final notification_template_media:I = 0x7f0d004e
 
-.field public static final notification_template_media_custom:I = 0x7f0d004d
+.field public static final notification_template_media_custom:I = 0x7f0d004f
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali
index 966d7dd525..8be8dfde1f 100644
--- a/com.discord/smali/androidx/media/R$string.smali
+++ b/com.discord/smali/androidx/media/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$style.smali b/com.discord/smali/androidx/media/R$style.smali
index 42b3e08acc..597ef79bf1 100644
--- a/com.discord/smali/androidx/media/R$style.smali
+++ b/com.discord/smali/androidx/media/R$style.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f130184
+.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f130185
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f130186
+.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f130187
 
-.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f130187
+.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f130188
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f130189
+.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f13018a
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f13018b
+.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f13018c
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$styleable.smali b/com.discord/smali/androidx/media/R$styleable.smali
index 0ead02fed4..ecc79e569a 100644
--- a/com.discord/smali/androidx/media/R$styleable.smali
+++ b/com.discord/smali/androidx/media/R$styleable.smali
@@ -149,12 +149,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +164,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/recyclerview/R$attr.smali b/com.discord/smali/androidx/recyclerview/R$attr.smali
index 6f2b67b78b..a1e38d9347 100644
--- a/com.discord/smali/androidx/recyclerview/R$attr.smali
+++ b/com.discord/smali/androidx/recyclerview/R$attr.smali
@@ -17,63 +17,63 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final fastScrollEnabled:I = 0x7f04012b
+.field public static final fastScrollEnabled:I = 0x7f04012d
 
-.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f04012c
+.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f04012e
 
-.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f04012d
+.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f04012f
 
-.field public static final fastScrollVerticalThumbDrawable:I = 0x7f04012e
+.field public static final fastScrollVerticalThumbDrawable:I = 0x7f040130
 
-.field public static final fastScrollVerticalTrackDrawable:I = 0x7f04012f
+.field public static final fastScrollVerticalTrackDrawable:I = 0x7f040131
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final layoutManager:I = 0x7f0401ff
+.field public static final layoutManager:I = 0x7f040201
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final reverseLayout:I = 0x7f0402c7
+.field public static final reverseLayout:I = 0x7f0402ca
 
-.field public static final spanCount:I = 0x7f0402fe
+.field public static final spanCount:I = 0x7f040301
 
-.field public static final stackFromEnd:I = 0x7f040304
+.field public static final stackFromEnd:I = 0x7f040307
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$color.smali b/com.discord/smali/androidx/recyclerview/R$color.smali
index 731eb6e0de..80fdf3e19b 100644
--- a/com.discord/smali/androidx/recyclerview/R$color.smali
+++ b/com.discord/smali/androidx/recyclerview/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$dimen.smali b/com.discord/smali/androidx/recyclerview/R$dimen.smali
index f56089fb4b..87402e7b02 100644
--- a/com.discord/smali/androidx/recyclerview/R$dimen.smali
+++ b/com.discord/smali/androidx/recyclerview/R$dimen.smali
@@ -29,47 +29,47 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final fastscroll_default_thickness:I = 0x7f0700b8
+.field public static final fastscroll_default_thickness:I = 0x7f0700ba
 
-.field public static final fastscroll_margin:I = 0x7f0700b9
+.field public static final fastscroll_margin:I = 0x7f0700bb
 
-.field public static final fastscroll_minimum_range:I = 0x7f0700ba
+.field public static final fastscroll_minimum_range:I = 0x7f0700bc
 
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700cc
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700ce
 
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700cd
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700cf
 
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700ce
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d0
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$drawable.smali b/com.discord/smali/androidx/recyclerview/R$drawable.smali
index 1e81047020..daba775c51 100644
--- a/com.discord/smali/androidx/recyclerview/R$drawable.smali
+++ b/com.discord/smali/androidx/recyclerview/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$id.smali b/com.discord/smali/androidx/recyclerview/R$id.smali
index 241ea675d2..2f9285b7c1 100644
--- a/com.discord/smali/androidx/recyclerview/R$id.smali
+++ b/com.discord/smali/androidx/recyclerview/R$id.smali
@@ -25,67 +25,67 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a03fa
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040a
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$layout.smali b/com.discord/smali/androidx/recyclerview/R$layout.smali
index a6a42e35c5..df4ccfe895 100644
--- a/com.discord/smali/androidx/recyclerview/R$layout.smali
+++ b/com.discord/smali/androidx/recyclerview/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali
index 013c888d44..6483e47123 100644
--- a/com.discord/smali/androidx/recyclerview/R$string.smali
+++ b/com.discord/smali/androidx/recyclerview/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$style.smali b/com.discord/smali/androidx/recyclerview/R$style.smali
index 96c3730e6a..9b7d650669 100644
--- a/com.discord/smali/androidx/recyclerview/R$style.smali
+++ b/com.discord/smali/androidx/recyclerview/R$style.smali
@@ -15,21 +15,21 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$styleable.smali b/com.discord/smali/androidx/recyclerview/R$styleable.smali
index 3af127cf9e..04caaf95f3 100644
--- a/com.discord/smali/androidx/recyclerview/R$styleable.smali
+++ b/com.discord/smali/androidx/recyclerview/R$styleable.smali
@@ -217,29 +217,29 @@
 
     :array_1
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_2
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_3
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_4
@@ -249,11 +249,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_5
@@ -282,15 +282,15 @@
     .array-data 4
         0x10100c4
         0x10100f1
-        0x7f04012b
-        0x7f04012c
         0x7f04012d
         0x7f04012e
         0x7f04012f
-        0x7f0401ff
-        0x7f0402c7
-        0x7f0402fe
-        0x7f040304
+        0x7f040130
+        0x7f040131
+        0x7f040201
+        0x7f0402ca
+        0x7f040301
+        0x7f040307
     .end array-data
 .end method
 
diff --git a/com.discord/smali/androidx/room/R$attr.smali b/com.discord/smali/androidx/room/R$attr.smali
index 73049394eb..5b1fcd8c2c 100644
--- a/com.discord/smali/androidx/room/R$attr.smali
+++ b/com.discord/smali/androidx/room/R$attr.smali
@@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$color.smali b/com.discord/smali/androidx/room/R$color.smali
index d90d2a10ca..2ad49ed06d 100644
--- a/com.discord/smali/androidx/room/R$color.smali
+++ b/com.discord/smali/androidx/room/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$dimen.smali b/com.discord/smali/androidx/room/R$dimen.smali
index 272ee1f714..67c16582fe 100644
--- a/com.discord/smali/androidx/room/R$dimen.smali
+++ b/com.discord/smali/androidx/room/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$drawable.smali b/com.discord/smali/androidx/room/R$drawable.smali
index c0839d0504..7e10223f8b 100644
--- a/com.discord/smali/androidx/room/R$drawable.smali
+++ b/com.discord/smali/androidx/room/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$id.smali b/com.discord/smali/androidx/room/R$id.smali
index da16639672..d90a2642a0 100644
--- a/com.discord/smali/androidx/room/R$id.smali
+++ b/com.discord/smali/androidx/room/R$id.smali
@@ -25,51 +25,51 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$layout.smali b/com.discord/smali/androidx/room/R$layout.smali
index 8a1a1ed8f6..d00766e90c 100644
--- a/com.discord/smali/androidx/room/R$layout.smali
+++ b/com.discord/smali/androidx/room/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$string.smali b/com.discord/smali/androidx/room/R$string.smali
index 7c02942cca..d40ba8509a 100644
--- a/com.discord/smali/androidx/room/R$string.smali
+++ b/com.discord/smali/androidx/room/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$style.smali b/com.discord/smali/androidx/room/R$style.smali
index 24515a8baf..511b60014f 100644
--- a/com.discord/smali/androidx/room/R$style.smali
+++ b/com.discord/smali/androidx/room/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$styleable.smali b/com.discord/smali/androidx/room/R$styleable.smali
index e5a70a3462..47af620592 100644
--- a/com.discord/smali/androidx/room/R$styleable.smali
+++ b/com.discord/smali/androidx/room/R$styleable.smali
@@ -149,12 +149,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +164,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .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 e1a25f0089..536e1cb505 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$attr.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$attr.smali
@@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$color.smali b/com.discord/smali/androidx/slidingpanelayout/R$color.smali
index 535fbb0f53..9ae46b00b8 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$color.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali b/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali
index 8384dd84b8..d409e8b696 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
index 71f533534f..c8f25e8b4f 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$id.smali b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
index 7c527c89cf..a7c5b2d9f2 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$id.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
@@ -25,51 +25,51 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$layout.smali b/com.discord/smali/androidx/slidingpanelayout/R$layout.smali
index 3d24abb81b..d0cf10f669 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$layout.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
index c932b0c163..a79f60c006 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$string.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$style.smali b/com.discord/smali/androidx/slidingpanelayout/R$style.smali
index 39472bcd22..8d0c6bda43 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$style.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali b/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
index a854de7e46..790ff6cba8 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
@@ -149,12 +149,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +164,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali b/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
index 098dc23e57..7f3590dbfa 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
@@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$color.smali b/com.discord/smali/androidx/swiperefreshlayout/R$color.smali
index e6d30983d0..a921daa664 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$color.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali b/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali
index 0f53f6303e..d6298a853d 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
index b13a68f35c..4e45738d83 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
index c37fc84bf2..e287edb7a3 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
@@ -25,51 +25,51 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali b/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali
index ac4607ac89..28f6d2ad9a 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
index 61709f52ce..3e5b28135c 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$style.smali b/com.discord/smali/androidx/swiperefreshlayout/R$style.smali
index 4ed546c9e9..89fbb0241a 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$style.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
index a38e51c874..e474a266b7 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
@@ -149,12 +149,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +164,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .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 6a1ace6cf8..9a75368e28 100644
--- a/com.discord/smali/androidx/transition/R$attr.smali
+++ b/com.discord/smali/androidx/transition/R$attr.smali
@@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$color.smali b/com.discord/smali/androidx/transition/R$color.smali
index d47a9b026f..9387dfce31 100644
--- a/com.discord/smali/androidx/transition/R$color.smali
+++ b/com.discord/smali/androidx/transition/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$dimen.smali b/com.discord/smali/androidx/transition/R$dimen.smali
index 16dd2266f5..4937a587bd 100644
--- a/com.discord/smali/androidx/transition/R$dimen.smali
+++ b/com.discord/smali/androidx/transition/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$drawable.smali b/com.discord/smali/androidx/transition/R$drawable.smali
index f870495d8e..1b2a9a3cc4 100644
--- a/com.discord/smali/androidx/transition/R$drawable.smali
+++ b/com.discord/smali/androidx/transition/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$id.smali b/com.discord/smali/androidx/transition/R$id.smali
index 94562c3eb7..441972237b 100644
--- a/com.discord/smali/androidx/transition/R$id.smali
+++ b/com.discord/smali/androidx/transition/R$id.smali
@@ -25,71 +25,71 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final ghost_view:I = 0x7f0a030f
+.field public static final ghost_view:I = 0x7f0a0314
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final parent_matrix:I = 0x7f0a04c4
+.field public static final parent_matrix:I = 0x7f0a04da
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final save_image_matrix:I = 0x7f0a0596
+.field public static final save_image_matrix:I = 0x7f0a05b0
 
-.field public static final save_non_transition_alpha:I = 0x7f0a0597
+.field public static final save_non_transition_alpha:I = 0x7f0a05b1
 
-.field public static final save_scale_type:I = 0x7f0a0598
+.field public static final save_scale_type:I = 0x7f0a05b2
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final transition_current_scene:I = 0x7f0a075a
+.field public static final transition_current_scene:I = 0x7f0a0783
 
-.field public static final transition_layout_save:I = 0x7f0a075b
+.field public static final transition_layout_save:I = 0x7f0a0784
 
-.field public static final transition_position:I = 0x7f0a075c
+.field public static final transition_position:I = 0x7f0a0785
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a075d
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0786
 
-.field public static final transition_transform:I = 0x7f0a075e
+.field public static final transition_transform:I = 0x7f0a0787
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$layout.smali b/com.discord/smali/androidx/transition/R$layout.smali
index 7757ef4ff1..d8afd9922b 100644
--- a/com.discord/smali/androidx/transition/R$layout.smali
+++ b/com.discord/smali/androidx/transition/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali
index f99eebeaee..1b204932fc 100644
--- a/com.discord/smali/androidx/transition/R$string.smali
+++ b/com.discord/smali/androidx/transition/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$style.smali b/com.discord/smali/androidx/transition/R$style.smali
index 0940dd0f74..5f023d0548 100644
--- a/com.discord/smali/androidx/transition/R$style.smali
+++ b/com.discord/smali/androidx/transition/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$styleable.smali b/com.discord/smali/androidx/transition/R$styleable.smali
index 4a9c661126..fe61d6dfde 100644
--- a/com.discord/smali/androidx/transition/R$styleable.smali
+++ b/com.discord/smali/androidx/transition/R$styleable.smali
@@ -149,12 +149,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +164,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .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 566ed70b75..00e37a81db 100644
--- a/com.discord/smali/androidx/vectordrawable/R$attr.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$attr.smali
@@ -17,45 +17,45 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$color.smali b/com.discord/smali/androidx/vectordrawable/R$color.smali
index ccc0c4c884..6955e0627c 100644
--- a/com.discord/smali/androidx/vectordrawable/R$color.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$dimen.smali b/com.discord/smali/androidx/vectordrawable/R$dimen.smali
index 46407f1ad6..b1aab51262 100644
--- a/com.discord/smali/androidx/vectordrawable/R$dimen.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
index 41758172ab..20d8f09845 100644
--- a/com.discord/smali/androidx/vectordrawable/R$drawable.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$id.smali b/com.discord/smali/androidx/vectordrawable/R$id.smali
index 22d334eaf4..4e55c2eae4 100644
--- a/com.discord/smali/androidx/vectordrawable/R$id.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$id.smali
@@ -25,65 +25,65 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$layout.smali b/com.discord/smali/androidx/vectordrawable/R$layout.smali
index d532440291..bb2772674d 100644
--- a/com.discord/smali/androidx/vectordrawable/R$layout.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali
index c8c71bb7e5..ec18185066 100644
--- a/com.discord/smali/androidx/vectordrawable/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$style.smali b/com.discord/smali/androidx/vectordrawable/R$style.smali
index 1d49281d44..438d63dbd2 100644
--- a/com.discord/smali/androidx/vectordrawable/R$style.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$style.smali
@@ -15,21 +15,21 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$styleable.smali b/com.discord/smali/androidx/vectordrawable/R$styleable.smali
index 951b9a6047..a0177731c9 100644
--- a/com.discord/smali/androidx/vectordrawable/R$styleable.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$styleable.smali
@@ -183,29 +183,29 @@
 
     :array_1
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_2
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_3
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_4
@@ -215,11 +215,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_5
diff --git a/com.discord/smali/androidx/viewpager/R$attr.smali b/com.discord/smali/androidx/viewpager/R$attr.smali
index 50a0c3fc0c..bd5960d957 100644
--- a/com.discord/smali/androidx/viewpager/R$attr.smali
+++ b/com.discord/smali/androidx/viewpager/R$attr.smali
@@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$color.smali b/com.discord/smali/androidx/viewpager/R$color.smali
index 4feacc5bd6..84b32485e6 100644
--- a/com.discord/smali/androidx/viewpager/R$color.smali
+++ b/com.discord/smali/androidx/viewpager/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$dimen.smali b/com.discord/smali/androidx/viewpager/R$dimen.smali
index 8f854467f7..9523a8f1f0 100644
--- a/com.discord/smali/androidx/viewpager/R$dimen.smali
+++ b/com.discord/smali/androidx/viewpager/R$dimen.smali
@@ -29,35 +29,35 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$drawable.smali b/com.discord/smali/androidx/viewpager/R$drawable.smali
index cdb3d6c746..81d055cc7c 100644
--- a/com.discord/smali/androidx/viewpager/R$drawable.smali
+++ b/com.discord/smali/androidx/viewpager/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$id.smali b/com.discord/smali/androidx/viewpager/R$id.smali
index c2cd0f1017..a5c0ed8372 100644
--- a/com.discord/smali/androidx/viewpager/R$id.smali
+++ b/com.discord/smali/androidx/viewpager/R$id.smali
@@ -25,51 +25,51 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$layout.smali b/com.discord/smali/androidx/viewpager/R$layout.smali
index b4136bf066..dc7c603344 100644
--- a/com.discord/smali/androidx/viewpager/R$layout.smali
+++ b/com.discord/smali/androidx/viewpager/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali
index b59be54e89..ab9c14442e 100644
--- a/com.discord/smali/androidx/viewpager/R$string.smali
+++ b/com.discord/smali/androidx/viewpager/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$style.smali b/com.discord/smali/androidx/viewpager/R$style.smali
index bca02edb65..21c7fad43e 100644
--- a/com.discord/smali/androidx/viewpager/R$style.smali
+++ b/com.discord/smali/androidx/viewpager/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$styleable.smali b/com.discord/smali/androidx/viewpager/R$styleable.smali
index d42bb1cbd9..3d25c40eb9 100644
--- a/com.discord/smali/androidx/viewpager/R$styleable.smali
+++ b/com.discord/smali/androidx/viewpager/R$styleable.smali
@@ -149,12 +149,12 @@
 
     :array_1
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2
@@ -164,11 +164,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali b/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali
index c8908ba8ca..df958b249a 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali
@@ -31,13 +31,13 @@
 .end annotation
 
 .annotation runtime Lkotlin/coroutines/jvm/internal/d;
-    Ec = "CoroutineWorker.kt"
-    Ed = {
+    DR = "CoroutineWorker.kt"
+    DS = {
         0x40,
         0x43
     }
-    Ee = "invokeSuspend"
-    Ef = "androidx/work/CoroutineWorker$startWork$1"
+    DT = "invokeSuspend"
+    DU = "androidx/work/CoroutineWorker$startWork$1"
 .end annotation
 
 
@@ -106,7 +106,7 @@
 
     check-cast p1, Landroidx/work/CoroutineWorker$startWork$1;
 
-    sget-object p2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Landroidx/work/CoroutineWorker$startWork$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -118,7 +118,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object v0, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     iget v1, p0, Landroidx/work/CoroutineWorker$startWork$1;->label:I
 
@@ -202,7 +202,7 @@
     invoke-virtual {v0, p1}, Landroidx/work/impl/utils/futures/SettableFuture;->setException(Ljava/lang/Throwable;)Z
 
     :goto_2
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 
diff --git a/com.discord/smali/androidx/work/CoroutineWorker.smali b/com.discord/smali/androidx/work/CoroutineWorker.smali
index b0dcedbeb6..18081f745c 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p1, p2, v0}, Landroidx/work/impl/utils/futures/SettableFuture;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
 
-    invoke-static {}, Lkotlinx/coroutines/ap;->EW()Lkotlinx/coroutines/y;
+    invoke-static {}, Lkotlinx/coroutines/ap;->EL()Lkotlinx/coroutines/y;
 
     move-result-object p1
 
@@ -174,7 +174,7 @@
 
     new-instance v1, Lkotlinx/coroutines/internal/f;
 
-    sget-object v2, Lkotlinx/coroutines/Job;->bnm:Lkotlinx/coroutines/Job$b;
+    sget-object v2, Lkotlinx/coroutines/Job;->bnG:Lkotlinx/coroutines/Job$b;
 
     check-cast v2, Lkotlin/coroutines/CoroutineContext$c;
 
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 3c1cadf702..feaebf7a22 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
@@ -52,7 +52,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -91,7 +91,7 @@
 
     check-cast v0, Lkotlin/coroutines/Continuation;
 
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/n;->o(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 7f404ba176..b3ca1eaa30 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
@@ -52,7 +52,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -91,7 +91,7 @@
 
     check-cast v0, Lkotlin/coroutines/Continuation;
 
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/n;->o(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 40c7420b88..e4a6dd7a43 100644
--- a/com.discord/smali/androidx/work/ListenableFutureKt.smali
+++ b/com.discord/smali/androidx/work/ListenableFutureKt.smali
@@ -79,7 +79,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object v0, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     if-ne p0, v0, :cond_2
 
@@ -154,7 +154,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object v0, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     if-ne p0, v0, :cond_2
 
diff --git a/com.discord/smali/androidx/work/OneTimeWorkRequestKt.smali b/com.discord/smali/androidx/work/OneTimeWorkRequestKt.smali
index 680c4ffb45..9cc834300b 100644
--- a/com.discord/smali/androidx/work/OneTimeWorkRequestKt.smali
+++ b/com.discord/smali/androidx/work/OneTimeWorkRequestKt.smali
@@ -17,7 +17,7 @@
 
     new-instance v0, Landroidx/work/OneTimeWorkRequest$Builder;
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Eo()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ed()V
 
     const-class v1, Landroidx/work/ListenableWorker;
 
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 dee40c7d53..a04b5c265d 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
@@ -52,7 +52,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -91,7 +91,7 @@
 
     check-cast v0, Lkotlin/coroutines/Continuation;
 
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/n;->o(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 7783dd0829..aa10332f6f 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
@@ -52,7 +52,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -91,7 +91,7 @@
 
     check-cast v0, Lkotlin/coroutines/Continuation;
 
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/work/OperationKt$await$1.smali b/com.discord/smali/androidx/work/OperationKt$await$1.smali
index 5f7f774146..fb4af7ab51 100644
--- a/com.discord/smali/androidx/work/OperationKt$await$1.smali
+++ b/com.discord/smali/androidx/work/OperationKt$await$1.smali
@@ -14,13 +14,13 @@
 .end annotation
 
 .annotation runtime Lkotlin/coroutines/jvm/internal/d;
-    Ec = "Operation.kt"
-    Ed = {
+    DR = "Operation.kt"
+    DS = {
         0x1d,
         0x38
     }
-    Ee = "await"
-    Ef = "androidx/work/OperationKt"
+    DT = "await"
+    DU = "androidx/work/OperationKt"
 .end annotation
 
 
diff --git a/com.discord/smali/androidx/work/OperationKt.smali b/com.discord/smali/androidx/work/OperationKt.smali
index 17b29fd433..60f0794ad1 100644
--- a/com.discord/smali/androidx/work/OperationKt.smali
+++ b/com.discord/smali/androidx/work/OperationKt.smali
@@ -50,7 +50,7 @@
     :goto_0
     iget-object p1, v0, Landroidx/work/OperationKt$await$1;->result:Ljava/lang/Object;
 
-    sget-object v1, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object v1, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     iget v2, v0, Landroidx/work/OperationKt$await$1;->label:I
 
@@ -161,7 +161,7 @@
 
     move-result-object p1
 
-    sget-object p0, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object p0, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     if-ne p1, p0, :cond_6
 
@@ -257,7 +257,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object v0, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     if-ne p0, v0, :cond_2
 
diff --git a/com.discord/smali/androidx/work/PeriodicWorkRequestKt.smali b/com.discord/smali/androidx/work/PeriodicWorkRequestKt.smali
index db6ef4dd6a..0a65ad4591 100644
--- a/com.discord/smali/androidx/work/PeriodicWorkRequestKt.smali
+++ b/com.discord/smali/androidx/work/PeriodicWorkRequestKt.smali
@@ -19,7 +19,7 @@
 
     new-instance v0, Landroidx/work/PeriodicWorkRequest$Builder;
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Eo()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ed()V
 
     const-class v1, Landroidx/work/ListenableWorker;
 
@@ -45,7 +45,7 @@
 
     new-instance v8, Landroidx/work/PeriodicWorkRequest$Builder;
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Eo()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ed()V
 
     const-class v1, Landroidx/work/ListenableWorker;
 
@@ -79,7 +79,7 @@
 
     new-instance v0, Landroidx/work/PeriodicWorkRequest$Builder;
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Eo()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ed()V
 
     const-class v1, Landroidx/work/ListenableWorker;
 
@@ -104,7 +104,7 @@
 
     new-instance v0, Landroidx/work/PeriodicWorkRequest$Builder;
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Eo()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ed()V
 
     const-class v1, Landroidx/work/ListenableWorker;
 
diff --git a/com.discord/smali/androidx/work/R$attr.smali b/com.discord/smali/androidx/work/R$attr.smali
index c2fec27e61..84f2f4c5ca 100644
--- a/com.discord/smali/androidx/work/R$attr.smali
+++ b/com.discord/smali/androidx/work/R$attr.smali
@@ -15,23 +15,23 @@
 
 
 # static fields
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$color.smali b/com.discord/smali/androidx/work/R$color.smali
index b29017e1e5..0d847b0e44 100644
--- a/com.discord/smali/androidx/work/R$color.smali
+++ b/com.discord/smali/androidx/work/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$dimen.smali b/com.discord/smali/androidx/work/R$dimen.smali
index c9dd4538d0..c83a449ac4 100644
--- a/com.discord/smali/androidx/work/R$dimen.smali
+++ b/com.discord/smali/androidx/work/R$dimen.smali
@@ -25,35 +25,35 @@
 
 .field public static final compat_control_corner_material:I = 0x7f07007b
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$drawable.smali b/com.discord/smali/androidx/work/R$drawable.smali
index a2e806a023..f09910b0d4 100644
--- a/com.discord/smali/androidx/work/R$drawable.smali
+++ b/com.discord/smali/androidx/work/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$id.smali b/com.discord/smali/androidx/work/R$id.smali
index 4d6846708a..078ffad6dc 100644
--- a/com.discord/smali/androidx/work/R$id.smali
+++ b/com.discord/smali/androidx/work/R$id.smali
@@ -25,45 +25,45 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$layout.smali b/com.discord/smali/androidx/work/R$layout.smali
index 6267a7cdda..75e5301263 100644
--- a/com.discord/smali/androidx/work/R$layout.smali
+++ b/com.discord/smali/androidx/work/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali
index b9496bfd63..02bcce4768 100644
--- a/com.discord/smali/androidx/work/R$string.smali
+++ b/com.discord/smali/androidx/work/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$style.smali b/com.discord/smali/androidx/work/R$style.smali
index 07a8fa7c25..5bd186cdf7 100644
--- a/com.discord/smali/androidx/work/R$style.smali
+++ b/com.discord/smali/androidx/work/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$styleable.smali b/com.discord/smali/androidx/work/R$styleable.smali
index 1a391f727b..c53f79f912 100644
--- a/com.discord/smali/androidx/work/R$styleable.smali
+++ b/com.discord/smali/androidx/work/R$styleable.smali
@@ -76,12 +76,12 @@
 
     :array_0
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_1
@@ -91,11 +91,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 .end method
 
diff --git a/com.discord/smali/androidx/work/ktx/R$attr.smali b/com.discord/smali/androidx/work/ktx/R$attr.smali
index a858a1e893..ed9509357c 100644
--- a/com.discord/smali/androidx/work/ktx/R$attr.smali
+++ b/com.discord/smali/androidx/work/ktx/R$attr.smali
@@ -15,23 +15,23 @@
 
 
 # static fields
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$color.smali b/com.discord/smali/androidx/work/ktx/R$color.smali
index 5219fd856f..e1b7c954e7 100644
--- a/com.discord/smali/androidx/work/ktx/R$color.smali
+++ b/com.discord/smali/androidx/work/ktx/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$dimen.smali b/com.discord/smali/androidx/work/ktx/R$dimen.smali
index dbd4891bf4..86eb64f1af 100644
--- a/com.discord/smali/androidx/work/ktx/R$dimen.smali
+++ b/com.discord/smali/androidx/work/ktx/R$dimen.smali
@@ -25,35 +25,35 @@
 
 .field public static final compat_control_corner_material:I = 0x7f07007b
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
 
 # 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 b90c3e80c5..e2f027f00b 100644
--- a/com.discord/smali/androidx/work/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/work/ktx/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
 
 # 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 65d93c67d4..c400a15b91 100644
--- a/com.discord/smali/androidx/work/ktx/R$id.smali
+++ b/com.discord/smali/androidx/work/ktx/R$id.smali
@@ -25,45 +25,45 @@
 
 .field public static final actions:I = 0x7f0a0043
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$layout.smali b/com.discord/smali/androidx/work/ktx/R$layout.smali
index a136c3c68b..18286b8936 100644
--- a/com.discord/smali/androidx/work/ktx/R$layout.smali
+++ b/com.discord/smali/androidx/work/ktx/R$layout.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
 
 # 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 c813949aca..438671935f 100644
--- a/com.discord/smali/androidx/work/ktx/R$string.smali
+++ b/com.discord/smali/androidx/work/ktx/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # 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 58690471de..164cb4b015 100644
--- a/com.discord/smali/androidx/work/ktx/R$style.smali
+++ b/com.discord/smali/androidx/work/ktx/R$style.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
 
 # 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 0e7587fb75..ce889473e5 100644
--- a/com.discord/smali/androidx/work/ktx/R$styleable.smali
+++ b/com.discord/smali/androidx/work/ktx/R$styleable.smali
@@ -76,12 +76,12 @@
 
     :array_0
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_1
@@ -91,11 +91,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 .end method
 
diff --git a/com.discord/smali/b/a$a.smali b/com.discord/smali/b/a$a.smali
index 673bba1253..b6ad7d0b26 100644
--- a/com.discord/smali/b/a$a.smali
+++ b/com.discord/smali/b/a$a.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bGy:Lb/a$a;
+.field static final bGS:Lb/a$a;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$a;-><init>()V
 
-    sput-object v0, Lb/a$a;->bGy:Lb/a$a;
+    sput-object v0, Lb/a$a;->bGS:Lb/a$a;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/a$b.smali b/com.discord/smali/b/a$b.smali
index 9122ab16f8..fd7228e05b 100644
--- a/com.discord/smali/b/a$b.smali
+++ b/com.discord/smali/b/a$b.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bGz:Lb/a$b;
+.field static final bGT:Lb/a$b;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$b;-><init>()V
 
-    sput-object v0, Lb/a$b;->bGz:Lb/a$b;
+    sput-object v0, Lb/a$b;->bGT:Lb/a$b;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/a$c.smali b/com.discord/smali/b/a$c.smali
index 948a5ee568..31b23081a2 100644
--- a/com.discord/smali/b/a$c.smali
+++ b/com.discord/smali/b/a$c.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bGA:Lb/a$c;
+.field static final bGU:Lb/a$c;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$c;-><init>()V
 
-    sput-object v0, Lb/a$c;->bGA:Lb/a$c;
+    sput-object v0, Lb/a$c;->bGU:Lb/a$c;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/a$d.smali b/com.discord/smali/b/a$d.smali
index 340c93fed9..37649ab8bf 100644
--- a/com.discord/smali/b/a$d.smali
+++ b/com.discord/smali/b/a$d.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bGB:Lb/a$d;
+.field static final bGV:Lb/a$d;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$d;-><init>()V
 
-    sput-object v0, Lb/a$d;->bGB:Lb/a$d;
+    sput-object v0, Lb/a$d;->bGV:Lb/a$d;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/a$e.smali b/com.discord/smali/b/a$e.smali
index c6d0d8e8c3..bc98679413 100644
--- a/com.discord/smali/b/a$e.smali
+++ b/com.discord/smali/b/a$e.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bGC:Lb/a$e;
+.field static final bGW:Lb/a$e;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$e;-><init>()V
 
-    sput-object v0, Lb/a$e;->bGC:Lb/a$e;
+    sput-object v0, Lb/a$e;->bGW:Lb/a$e;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/a.smali b/com.discord/smali/b/a.smali
index 396ea7ac56..1986dde36a 100644
--- a/com.discord/smali/b/a.smali
+++ b/com.discord/smali/b/a.smali
@@ -53,12 +53,12 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lb/a$c;->bGA:Lb/a$c;
+    sget-object p1, Lb/a$c;->bGU:Lb/a$c;
 
     return-object p1
 
     :cond_0
-    sget-object p1, Lb/a$a;->bGy:Lb/a$a;
+    sget-object p1, Lb/a$a;->bGS:Lb/a$a;
 
     return-object p1
 
@@ -67,7 +67,7 @@
 
     if-ne p1, p2, :cond_2
 
-    sget-object p1, Lb/a$e;->bGC:Lb/a$e;
+    sget-object p1, Lb/a$e;->bGW:Lb/a$e;
 
     return-object p1
 
@@ -103,7 +103,7 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lb/a$b;->bGz:Lb/a$b;
+    sget-object p1, Lb/a$b;->bGT:Lb/a$b;
 
     return-object p1
 
diff --git a/com.discord/smali/b/a/a/a$a.smali b/com.discord/smali/b/a/a/a$a.smali
index 83fd569e53..e1dabdee34 100644
--- a/com.discord/smali/b/a/a/a$a.smali
+++ b/com.discord/smali/b/a/a/a$a.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field private bHR:Z
+.field private bIl:Z
 
 .field private final subscriber:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -61,7 +61,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-boolean v0, p0, Lb/a/a/a$a;->bHR:Z
+    iget-boolean v0, p0, Lb/a/a/a$a;->bIl:Z
 
     if-nez v0, :cond_0
 
@@ -76,7 +76,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 2
 
-    iget-boolean v0, p0, Lb/a/a/a$a;->bHR:Z
+    iget-boolean v0, p0, Lb/a/a/a$a;->bIl:Z
 
     if-nez v0, :cond_0
 
@@ -95,11 +95,11 @@
 
     invoke-virtual {v0, p1}, Ljava/lang/Throwable;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     return-void
 .end method
@@ -109,9 +109,9 @@
 
     check-cast p1, Lb/m;
 
-    iget-object v0, p1, Lb/m;->bHl:Lokhttp3/Response;
+    iget-object v0, p1, Lb/m;->bHF:Lokhttp3/Response;
 
-    invoke-virtual {v0}, Lokhttp3/Response;->zW()Z
+    invoke-virtual {v0}, Lokhttp3/Response;->zS()Z
 
     move-result v0
 
@@ -119,7 +119,7 @@
 
     iget-object v0, p0, Lb/a/a/a$a;->subscriber:Lrx/Subscriber;
 
-    iget-object p1, p1, Lb/m;->bHm:Ljava/lang/Object;
+    iget-object p1, p1, Lb/m;->bHG:Ljava/lang/Object;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -128,7 +128,7 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/a/a/a$a;->bHR:Z
+    iput-boolean v0, p0, Lb/a/a/a$a;->bIl:Z
 
     new-instance v1, Lb/a/a/e;
 
@@ -165,20 +165,20 @@
 
     invoke-direct {v2, v3}, Lrx/a/a;-><init>([Ljava/lang/Throwable;)V
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     return-void
 
     :catch_0
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/a/a/a.smali b/com.discord/smali/b/a/a/a.smali
index 2799ba3bab..36f0347611 100644
--- a/com.discord/smali/b/a/a/a.smali
+++ b/com.discord/smali/b/a/a/a.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field private final bHQ:Lrx/Observable$a;
+.field private final bIk:Lrx/Observable$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$a<",
@@ -51,7 +51,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/a/a/a;->bHQ:Lrx/Observable$a;
+    iput-object p1, p0, Lb/a/a/a;->bIk:Lrx/Observable$a;
 
     return-void
 .end method
@@ -63,7 +63,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/a;->bHQ:Lrx/Observable$a;
+    iget-object v0, p0, Lb/a/a/a;->bIk:Lrx/Observable$a;
 
     new-instance v1, Lb/a/a/a$a;
 
diff --git a/com.discord/smali/b/a/a/b.smali b/com.discord/smali/b/a/a/b.smali
index c36b6f8258..0440c923d1 100644
--- a/com.discord/smali/b/a/a/b.smali
+++ b/com.discord/smali/b/a/a/b.smali
@@ -128,20 +128,20 @@
 
     invoke-static {p1}, Lrx/a/b;->I(Ljava/lang/Throwable;)V
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     return-void
 
     :catch_0
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     return-void
 
@@ -183,29 +183,29 @@
 
     invoke-direct {v1, v2}, Lrx/a/a;-><init>([Ljava/lang/Throwable;)V
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     return-void
 
     :catch_1
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     return-void
 
     :catch_2
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     return-void
 .end method
@@ -258,20 +258,20 @@
 
     invoke-direct {v1, v2}, Lrx/a/a;-><init>([Ljava/lang/Throwable;)V
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     goto :goto_0
 
     :catch_0
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     :cond_0
     :goto_0
diff --git a/com.discord/smali/b/a/a/c$1.smali b/com.discord/smali/b/a/a/c$1.smali
index 01616376a1..31378f0b58 100644
--- a/com.discord/smali/b/a/a/c$1.smali
+++ b/com.discord/smali/b/a/a/c$1.smali
@@ -26,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic bHT:Lb/a/a/b;
+.field final synthetic bIn:Lb/a/a/b;
 
-.field final synthetic bHU:Lb/a/a/c;
+.field final synthetic bIo:Lb/a/a/c;
 
 
 # direct methods
 .method constructor <init>(Lb/a/a/c;Lb/a/a/b;)V
     .locals 0
 
-    iput-object p1, p0, Lb/a/a/c$1;->bHU:Lb/a/a/c;
+    iput-object p1, p0, Lb/a/a/c$1;->bIo:Lb/a/a/c;
 
-    iput-object p2, p0, Lb/a/a/c$1;->bHT:Lb/a/a/b;
+    iput-object p2, p0, Lb/a/a/c$1;->bIn:Lb/a/a/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
 
     invoke-static {p1}, Lrx/a/b;->I(Ljava/lang/Throwable;)V
 
-    iget-object v0, p0, Lb/a/a/c$1;->bHT:Lb/a/a/b;
+    iget-object v0, p0, Lb/a/a/c$1;->bIn:Lb/a/a/b;
 
     invoke-virtual {v0, p1}, Lb/a/a/b;->D(Ljava/lang/Throwable;)V
 
@@ -75,7 +75,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/a/a/c$1;->bHT:Lb/a/a/b;
+    iget-object v0, p0, Lb/a/a/c$1;->bIn:Lb/a/a/b;
 
     invoke-virtual {v0, p1}, Lb/a/a/b;->b(Lb/m;)V
 
diff --git a/com.discord/smali/b/a/a/c.smali b/com.discord/smali/b/a/a/c.smali
index 569eddff43..c86f62a314 100644
--- a/com.discord/smali/b/a/a/c.smali
+++ b/com.discord/smali/b/a/a/c.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field private final bHS:Lb/b;
+.field private final bIm:Lb/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/b<",
@@ -44,7 +44,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/a/a/c;->bHS:Lb/b;
+    iput-object p1, p0, Lb/a/a/c;->bIm:Lb/b;
 
     return-void
 .end method
@@ -56,9 +56,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/c;->bHS:Lb/b;
+    iget-object v0, p0, Lb/a/a/c;->bIm:Lb/b;
 
-    invoke-interface {v0}, Lb/b;->Jy()Lb/b;
+    invoke-interface {v0}, Lb/b;->Jl()Lb/b;
 
     move-result-object v0
 
diff --git a/com.discord/smali/b/a/a/d.smali b/com.discord/smali/b/a/a/d.smali
index fe1f291b3f..d75f8f0fd2 100644
--- a/com.discord/smali/b/a/a/d.smali
+++ b/com.discord/smali/b/a/a/d.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field private final bHS:Lb/b;
+.field private final bIm:Lb/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/b<",
@@ -44,7 +44,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/a/a/d;->bHS:Lb/b;
+    iput-object p1, p0, Lb/a/a/d;->bIm:Lb/b;
 
     return-void
 .end method
@@ -56,9 +56,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/d;->bHS:Lb/b;
+    iget-object v0, p0, Lb/a/a/d;->bIm:Lb/b;
 
-    invoke-interface {v0}, Lb/b;->Jy()Lb/b;
+    invoke-interface {v0}, Lb/b;->Jl()Lb/b;
 
     move-result-object v0
 
@@ -71,7 +71,7 @@
     invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
     :try_start_0
-    invoke-interface {v0}, Lb/b;->Jx()Lb/m;
+    invoke-interface {v0}, Lb/b;->Jk()Lb/m;
 
     move-result-object p1
     :try_end_0
diff --git a/com.discord/smali/b/a/a/g$a.smali b/com.discord/smali/b/a/a/g$a.smali
index 0affd8b53e..6a1ab4beb6 100644
--- a/com.discord/smali/b/a/a/g$a.smali
+++ b/com.discord/smali/b/a/a/g$a.smali
@@ -126,20 +126,20 @@
 
     invoke-direct {v1, v2}, Lrx/a/a;-><init>([Ljava/lang/Throwable;)V
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     return-void
 
     :catch_0
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/a/a/g.smali b/com.discord/smali/b/a/a/g.smali
index 4893c2152c..3cf15346e2 100644
--- a/com.discord/smali/b/a/a/g.smali
+++ b/com.discord/smali/b/a/a/g.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field private final bHQ:Lrx/Observable$a;
+.field private final bIk:Lrx/Observable$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$a<",
@@ -52,7 +52,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/a/a/g;->bHQ:Lrx/Observable$a;
+    iput-object p1, p0, Lb/a/a/g;->bIk:Lrx/Observable$a;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/g;->bHQ:Lrx/Observable$a;
+    iget-object v0, p0, Lb/a/a/g;->bIk:Lrx/Observable$a;
 
     new-instance v1, Lb/a/a/g$a;
 
diff --git a/com.discord/smali/b/a/a/h.smali b/com.discord/smali/b/a/a/h.smali
index 68d436c881..9639f352d6 100644
--- a/com.discord/smali/b/a/a/h.smali
+++ b/com.discord/smali/b/a/a/h.smali
@@ -22,17 +22,17 @@
 
 
 # instance fields
-.field private final bHI:Ljava/lang/reflect/Type;
+.field private final bIc:Ljava/lang/reflect/Type;
 
-.field private final bHV:Z
+.field private final bIp:Z
 
-.field private final bHW:Z
+.field private final bIq:Z
 
-.field private final bHX:Z
+.field private final bIr:Z
 
-.field private final bHY:Z
+.field private final bIs:Z
 
-.field private final bHZ:Z
+.field private final bIt:Z
 
 .field private final scheduler:Lrx/Scheduler;
     .annotation runtime Ljavax/annotation/Nullable;
@@ -50,29 +50,29 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/a/a/h;->bHI:Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lb/a/a/h;->bIc:Ljava/lang/reflect/Type;
 
     iput-object p2, p0, Lb/a/a/h;->scheduler:Lrx/Scheduler;
 
-    iput-boolean p3, p0, Lb/a/a/h;->bHV:Z
+    iput-boolean p3, p0, Lb/a/a/h;->bIp:Z
 
-    iput-boolean p4, p0, Lb/a/a/h;->bHW:Z
+    iput-boolean p4, p0, Lb/a/a/h;->bIq:Z
 
-    iput-boolean p5, p0, Lb/a/a/h;->bHX:Z
+    iput-boolean p5, p0, Lb/a/a/h;->bIr:Z
 
-    iput-boolean p6, p0, Lb/a/a/h;->bHY:Z
+    iput-boolean p6, p0, Lb/a/a/h;->bIs:Z
 
-    iput-boolean p7, p0, Lb/a/a/h;->bHZ:Z
+    iput-boolean p7, p0, Lb/a/a/h;->bIt:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Jz()Ljava/lang/reflect/Type;
+.method public final Jm()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lb/a/a/h;->bHI:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/a/a/h;->bIc:Ljava/lang/reflect/Type;
 
     return-object v0
 .end method
@@ -88,7 +88,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lb/a/a/h;->bHV:Z
+    iget-boolean v0, p0, Lb/a/a/h;->bIp:Z
 
     if-eqz v0, :cond_0
 
@@ -104,7 +104,7 @@
     invoke-direct {v0, p1}, Lb/a/a/d;-><init>(Lb/b;)V
 
     :goto_0
-    iget-boolean p1, p0, Lb/a/a/h;->bHW:Z
+    iget-boolean p1, p0, Lb/a/a/h;->bIq:Z
 
     if-eqz p1, :cond_1
 
@@ -115,7 +115,7 @@
     goto :goto_1
 
     :cond_1
-    iget-boolean p1, p0, Lb/a/a/h;->bHX:Z
+    iget-boolean p1, p0, Lb/a/a/h;->bIr:Z
 
     if-eqz p1, :cond_2
 
@@ -142,18 +142,18 @@
     move-result-object p1
 
     :cond_3
-    iget-boolean v0, p0, Lb/a/a/h;->bHY:Z
+    iget-boolean v0, p0, Lb/a/a/h;->bIs:Z
 
     if-eqz v0, :cond_4
 
-    invoke-virtual {p1}, Lrx/Observable;->JY()Lrx/f;
+    invoke-virtual {p1}, Lrx/Observable;->JL()Lrx/f;
 
     move-result-object p1
 
     return-object p1
 
     :cond_4
-    iget-boolean v0, p0, Lb/a/a/h;->bHZ:Z
+    iget-boolean v0, p0, Lb/a/a/h;->bIt:Z
 
     if-eqz v0, :cond_5
 
diff --git a/com.discord/smali/b/a/a/i.smali b/com.discord/smali/b/a/a/i.smali
index 2bb1ff2d94..f4ae2276e4 100644
--- a/com.discord/smali/b/a/a/i.smali
+++ b/com.discord/smali/b/a/a/i.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final bHV:Z
+.field private final bIp:Z
 
 .field private final scheduler:Lrx/Scheduler;
     .annotation runtime Ljavax/annotation/Nullable;
@@ -24,12 +24,12 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lb/a/a/i;->bHV:Z
+    iput-boolean v0, p0, Lb/a/a/i;->bIp:Z
 
     return-void
 .end method
 
-.method public static JM()Lb/a/a/i;
+.method public static Jz()Lb/a/a/i;
     .locals 1
 
     new-instance v0, Lb/a/a/i;
@@ -106,7 +106,7 @@
 
     iget-object v2, p0, Lb/a/a/i;->scheduler:Lrx/Scheduler;
 
-    iget-boolean v3, p0, Lb/a/a/i;->bHV:Z
+    iget-boolean v3, p0, Lb/a/a/i;->bIp:Z
 
     const/4 v4, 0x0
 
@@ -254,7 +254,7 @@
 
     iget-object v6, p0, Lb/a/a/i;->scheduler:Lrx/Scheduler;
 
-    iget-boolean v7, p0, Lb/a/a/i;->bHV:Z
+    iget-boolean v7, p0, Lb/a/a/i;->bIp:Z
 
     const/4 v11, 0x0
 
diff --git a/com.discord/smali/b/b.smali b/com.discord/smali/b/b.smali
index 8ff1192465..3b6a1387b6 100644
--- a/com.discord/smali/b/b.smali
+++ b/com.discord/smali/b/b.smali
@@ -19,7 +19,7 @@
 
 
 # virtual methods
-.method public abstract Jx()Lb/m;
+.method public abstract Jk()Lb/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -35,7 +35,7 @@
     .end annotation
 .end method
 
-.method public abstract Jy()Lb/b;
+.method public abstract Jl()Lb/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali/b/b/a/b.smali b/com.discord/smali/b/b/a/b.smali
index f9849bb92f..488d85c4e4 100644
--- a/com.discord/smali/b/b/a/b.smali
+++ b/com.discord/smali/b/b/a/b.smali
@@ -24,11 +24,11 @@
 # static fields
 .field private static final UTF_8:Ljava/nio/charset/Charset;
 
-.field private static final bIa:Lokhttp3/MediaType;
+.field private static final bIu:Lokhttp3/MediaType;
 
 
 # instance fields
-.field private final bIb:Lcom/google/gson/TypeAdapter;
+.field private final bIv:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -46,11 +46,11 @@
 
     const-string v0, "application/json; charset=UTF-8"
 
-    invoke-static {v0}, Lokhttp3/MediaType;->eo(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {v0}, Lokhttp3/MediaType;->ei(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object v0
 
-    sput-object v0, Lb/b/a/b;->bIa:Lokhttp3/MediaType;
+    sput-object v0, Lb/b/a/b;->bIu:Lokhttp3/MediaType;
 
     const-string v0, "UTF-8"
 
@@ -78,7 +78,7 @@
 
     iput-object p1, p0, Lb/b/a/b;->gson:Lcom/google/gson/Gson;
 
-    iput-object p2, p0, Lb/b/a/b;->bIb:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lb/b/a/b;->bIv:Lcom/google/gson/TypeAdapter;
 
     return-void
 .end method
@@ -113,15 +113,15 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lb/b/a/b;->bIb:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lb/b/a/b;->bIv: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, Lb/b/a/b;->bIa:Lokhttp3/MediaType;
+    sget-object p1, Lb/b/a/b;->bIu:Lokhttp3/MediaType;
 
-    invoke-virtual {v0}, Lokio/c;->HF()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/c;->Hs()Lokio/ByteString;
 
     move-result-object v0
 
diff --git a/com.discord/smali/b/b/a/c.smali b/com.discord/smali/b/b/a/c.smali
index 4519539a58..ff003bda8f 100644
--- a/com.discord/smali/b/b/a/c.smali
+++ b/com.discord/smali/b/b/a/c.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field private final bIb:Lcom/google/gson/TypeAdapter;
+.field private final bIv:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -49,7 +49,7 @@
 
     iput-object p1, p0, Lb/b/a/c;->gson:Lcom/google/gson/Gson;
 
-    iput-object p2, p0, Lb/b/a/c;->bIb:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lb/b/a/c;->bIv:Lcom/google/gson/TypeAdapter;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     iget-object v0, p0, Lb/b/a/c;->gson:Lcom/google/gson/Gson;
 
-    iget-object v1, p1, Lokhttp3/x;->bvk:Ljava/io/Reader;
+    iget-object v1, p1, Lokhttp3/x;->bvE:Ljava/io/Reader;
 
     if-eqz v1, :cond_0
 
@@ -81,7 +81,7 @@
     :cond_0
     new-instance v1, Lokhttp3/x$a;
 
-    invoke-virtual {p1}, Lokhttp3/x;->Hf()Lokio/d;
+    invoke-virtual {p1}, Lokhttp3/x;->GS()Lokio/d;
 
     move-result-object v2
 
@@ -91,7 +91,7 @@
 
     invoke-direct {v1, v2, v3}, Lokhttp3/x$a;-><init>(Lokio/d;Ljava/nio/charset/Charset;)V
 
-    iput-object v1, p1, Lokhttp3/x;->bvk:Ljava/io/Reader;
+    iput-object v1, p1, Lokhttp3/x;->bvE:Ljava/io/Reader;
 
     :goto_0
     invoke-virtual {v0, v1}, Lcom/google/gson/Gson;->a(Ljava/io/Reader;)Lcom/google/gson/stream/JsonReader;
@@ -99,7 +99,7 @@
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lb/b/a/c;->bIb:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lb/b/a/c;->bIv:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v1, v0}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/b/b/b/a.smali b/com.discord/smali/b/b/b/a.smali
index 0ca7d691dd..1e807497d9 100644
--- a/com.discord/smali/b/b/b/a.smali
+++ b/com.discord/smali/b/b/b/a.smali
@@ -22,9 +22,9 @@
 
 
 # static fields
-.field private static final bIa:Lokhttp3/MediaType;
+.field private static final bIu:Lokhttp3/MediaType;
 
-.field static final bIc:Lb/b/b/a;
+.field static final bIw:Lb/b/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/b/b/a<",
@@ -43,15 +43,15 @@
 
     invoke-direct {v0}, Lb/b/b/a;-><init>()V
 
-    sput-object v0, Lb/b/b/a;->bIc:Lb/b/b/a;
+    sput-object v0, Lb/b/b/a;->bIw:Lb/b/b/a;
 
     const-string v0, "text/plain; charset=UTF-8"
 
-    invoke-static {v0}, Lokhttp3/MediaType;->eo(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {v0}, Lokhttp3/MediaType;->ei(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object v0
 
-    sput-object v0, Lb/b/b/a;->bIa:Lokhttp3/MediaType;
+    sput-object v0, Lb/b/b/a;->bIu:Lokhttp3/MediaType;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
         }
     .end annotation
 
-    sget-object v0, Lb/b/b/a;->bIa:Lokhttp3/MediaType;
+    sget-object v0, Lb/b/b/a;->bIu:Lokhttp3/MediaType;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/b/b/b/b$a.smali b/com.discord/smali/b/b/b/b$a.smali
index 0f9d8e35f3..72ce01a2f1 100644
--- a/com.discord/smali/b/b/b/b$a.smali
+++ b/com.discord/smali/b/b/b/b$a.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bId:Lb/b/b/b$a;
+.field static final bIx:Lb/b/b/b$a;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$a;-><init>()V
 
-    sput-object v0, Lb/b/b/b$a;->bId:Lb/b/b/b$a;
+    sput-object v0, Lb/b/b/b$a;->bIx:Lb/b/b/b$a;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->Hg()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->GT()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/b/b/b$b.smali b/com.discord/smali/b/b/b/b$b.smali
index a30903e822..09b0bd75e3 100644
--- a/com.discord/smali/b/b/b/b$b.smali
+++ b/com.discord/smali/b/b/b/b$b.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bIe:Lb/b/b/b$b;
+.field static final bIy:Lb/b/b/b$b;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$b;-><init>()V
 
-    sput-object v0, Lb/b/b/b$b;->bIe:Lb/b/b/b$b;
+    sput-object v0, Lb/b/b/b$b;->bIy:Lb/b/b/b$b;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->Hg()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->GT()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/b/b/b$c.smali b/com.discord/smali/b/b/b/b$c.smali
index 9e40e01f66..14e716066c 100644
--- a/com.discord/smali/b/b/b/b$c.smali
+++ b/com.discord/smali/b/b/b/b$c.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bIf:Lb/b/b/b$c;
+.field static final bIz:Lb/b/b/b$c;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$c;-><init>()V
 
-    sput-object v0, Lb/b/b/b$c;->bIf:Lb/b/b/b$c;
+    sput-object v0, Lb/b/b/b$c;->bIz:Lb/b/b/b$c;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->Hg()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->GT()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/b/b/b$d.smali b/com.discord/smali/b/b/b/b$d.smali
index 53c231d360..507c0fbb3a 100644
--- a/com.discord/smali/b/b/b/b$d.smali
+++ b/com.discord/smali/b/b/b/b$d.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bIg:Lb/b/b/b$d;
+.field static final bIA:Lb/b/b/b$d;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$d;-><init>()V
 
-    sput-object v0, Lb/b/b/b$d;->bIg:Lb/b/b/b$d;
+    sput-object v0, Lb/b/b/b$d;->bIA:Lb/b/b/b$d;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->Hg()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->GT()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/b/b/b$e.smali b/com.discord/smali/b/b/b/b$e.smali
index 4a5cee3180..35724ebaed 100644
--- a/com.discord/smali/b/b/b/b$e.smali
+++ b/com.discord/smali/b/b/b/b$e.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bIh:Lb/b/b/b$e;
+.field static final bIB:Lb/b/b/b$e;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$e;-><init>()V
 
-    sput-object v0, Lb/b/b/b$e;->bIh:Lb/b/b/b$e;
+    sput-object v0, Lb/b/b/b$e;->bIB:Lb/b/b/b$e;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->Hg()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->GT()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/b/b/b$f.smali b/com.discord/smali/b/b/b/b$f.smali
index 160771e98e..c67d02455c 100644
--- a/com.discord/smali/b/b/b/b$f.smali
+++ b/com.discord/smali/b/b/b/b$f.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bIi:Lb/b/b/b$f;
+.field static final bIC:Lb/b/b/b$f;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$f;-><init>()V
 
-    sput-object v0, Lb/b/b/b$f;->bIi:Lb/b/b/b$f;
+    sput-object v0, Lb/b/b/b$f;->bIC:Lb/b/b/b$f;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->Hg()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->GT()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/b/b/b$g.smali b/com.discord/smali/b/b/b/b$g.smali
index e5bedb288d..4ae4ef9b03 100644
--- a/com.discord/smali/b/b/b/b$g.smali
+++ b/com.discord/smali/b/b/b/b$g.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bIj:Lb/b/b/b$g;
+.field static final bID:Lb/b/b/b$g;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$g;-><init>()V
 
-    sput-object v0, Lb/b/b/b$g;->bIj:Lb/b/b/b$g;
+    sput-object v0, Lb/b/b/b$g;->bID:Lb/b/b/b$g;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->Hg()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->GT()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/b/b/b$h.smali b/com.discord/smali/b/b/b/b$h.smali
index 811d4bc78c..8c0aa8cb5f 100644
--- a/com.discord/smali/b/b/b/b$h.smali
+++ b/com.discord/smali/b/b/b/b$h.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bIk:Lb/b/b/b$h;
+.field static final bIE:Lb/b/b/b$h;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$h;-><init>()V
 
-    sput-object v0, Lb/b/b/b$h;->bIk:Lb/b/b/b$h;
+    sput-object v0, Lb/b/b/b$h;->bIE:Lb/b/b/b$h;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->Hg()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->GT()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/b/b/b$i.smali b/com.discord/smali/b/b/b/b$i.smali
index f063d79f66..f0bf3da25f 100644
--- a/com.discord/smali/b/b/b/b$i.smali
+++ b/com.discord/smali/b/b/b/b$i.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field static final bIl:Lb/b/b/b$i;
+.field static final bIF:Lb/b/b/b$i;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/b/b/b$i;-><init>()V
 
-    sput-object v0, Lb/b/b/b$i;->bIl:Lb/b/b/b$i;
+    sput-object v0, Lb/b/b/b$i;->bIF:Lb/b/b/b$i;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->Hg()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->GT()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/b/b/c.smali b/com.discord/smali/b/b/b/c.smali
index 66af4c6da8..c360d262cf 100644
--- a/com.discord/smali/b/b/b/c.smali
+++ b/com.discord/smali/b/b/b/c.smali
@@ -12,7 +12,7 @@
     return-void
 .end method
 
-.method public static JN()Lb/b/b/c;
+.method public static JA()Lb/b/b/c;
     .locals 1
 
     new-instance v0, Lb/b/b/c;
@@ -43,7 +43,7 @@
 
     if-ne p1, p2, :cond_0
 
-    sget-object p1, Lb/b/b/b$i;->bIl:Lb/b/b/b$i;
+    sget-object p1, Lb/b/b/b$i;->bIF:Lb/b/b/b$i;
 
     return-object p1
 
@@ -142,49 +142,49 @@
 
     :cond_9
     :goto_0
-    sget-object p1, Lb/b/b/b$h;->bIk:Lb/b/b/b$h;
+    sget-object p1, Lb/b/b/b$h;->bIE:Lb/b/b/b$h;
 
     return-object p1
 
     :cond_a
     :goto_1
-    sget-object p1, Lb/b/b/b$g;->bIj:Lb/b/b/b$g;
+    sget-object p1, Lb/b/b/b$g;->bID:Lb/b/b/b$g;
 
     return-object p1
 
     :cond_b
     :goto_2
-    sget-object p1, Lb/b/b/b$f;->bIi:Lb/b/b/b$f;
+    sget-object p1, Lb/b/b/b$f;->bIC:Lb/b/b/b$f;
 
     return-object p1
 
     :cond_c
     :goto_3
-    sget-object p1, Lb/b/b/b$e;->bIh:Lb/b/b/b$e;
+    sget-object p1, Lb/b/b/b$e;->bIB:Lb/b/b/b$e;
 
     return-object p1
 
     :cond_d
     :goto_4
-    sget-object p1, Lb/b/b/b$d;->bIg:Lb/b/b/b$d;
+    sget-object p1, Lb/b/b/b$d;->bIA:Lb/b/b/b$d;
 
     return-object p1
 
     :cond_e
     :goto_5
-    sget-object p1, Lb/b/b/b$c;->bIf:Lb/b/b/b$c;
+    sget-object p1, Lb/b/b/b$c;->bIz:Lb/b/b/b$c;
 
     return-object p1
 
     :cond_f
     :goto_6
-    sget-object p1, Lb/b/b/b$b;->bIe:Lb/b/b/b$b;
+    sget-object p1, Lb/b/b/b$b;->bIy:Lb/b/b/b$b;
 
     return-object p1
 
     :cond_10
     :goto_7
-    sget-object p1, Lb/b/b/b$a;->bId:Lb/b/b/b$a;
+    sget-object p1, Lb/b/b/b$a;->bIx:Lb/b/b/b$a;
 
     return-object p1
 .end method
@@ -280,7 +280,7 @@
 
     :cond_1
     :goto_0
-    sget-object p1, Lb/b/b/a;->bIc:Lb/b/b/a;
+    sget-object p1, Lb/b/b/a;->bIw:Lb/b/b/a;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/b/c.smali b/com.discord/smali/b/c.smali
index 7d3db9058a..5cea52fd08 100644
--- a/com.discord/smali/b/c.smali
+++ b/com.discord/smali/b/c.smali
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method public abstract Jz()Ljava/lang/reflect/Type;
+.method public abstract Jm()Ljava/lang/reflect/Type;
 .end method
 
 .method public abstract a(Lb/b;)Ljava/lang/Object;
diff --git a/com.discord/smali/b/c/c.smali b/com.discord/smali/b/c/c.smali
index be7f3abf24..313d74c2fa 100644
--- a/com.discord/smali/b/c/c.smali
+++ b/com.discord/smali/b/c/c.smali
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/c;
-        JO = false
+        JB = false
     .end subannotation
 .end annotation
 
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public abstract JO()Z
+.method public abstract JB()Z
 .end method
 
 .method public abstract value()Ljava/lang/String;
diff --git a/com.discord/smali/b/c/d.smali b/com.discord/smali/b/c/d.smali
index 779c424908..1399b555ea 100644
--- a/com.discord/smali/b/c/d.smali
+++ b/com.discord/smali/b/c/d.smali
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/d;
-        JO = false
+        JB = false
     .end subannotation
 .end annotation
 
@@ -28,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract JO()Z
+.method public abstract JB()Z
 .end method
diff --git a/com.discord/smali/b/c/h.smali b/com.discord/smali/b/c/h.smali
index 85f2091cbb..0ee5abe674 100644
--- a/com.discord/smali/b/c/h.smali
+++ b/com.discord/smali/b/c/h.smali
@@ -9,8 +9,8 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/h;
-        JP = ""
-        JQ = false
+        JC = ""
+        JD = false
     .end subannotation
 .end annotation
 
@@ -29,10 +29,10 @@
 
 
 # virtual methods
-.method public abstract JP()Ljava/lang/String;
+.method public abstract JC()Ljava/lang/String;
 .end method
 
-.method public abstract JQ()Z
+.method public abstract JD()Z
 .end method
 
 .method public abstract method()Ljava/lang/String;
diff --git a/com.discord/smali/b/c/q.smali b/com.discord/smali/b/c/q.smali
index 57c5c5441d..69b7772272 100644
--- a/com.discord/smali/b/c/q.smali
+++ b/com.discord/smali/b/c/q.smali
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/q;
-        JR = "binary"
+        JE = "binary"
         value = ""
     .end subannotation
 .end annotation
@@ -29,7 +29,7 @@
 
 
 # virtual methods
-.method public abstract JR()Ljava/lang/String;
+.method public abstract JE()Ljava/lang/String;
 .end method
 
 .method public abstract value()Ljava/lang/String;
diff --git a/com.discord/smali/b/c/r.smali b/com.discord/smali/b/c/r.smali
index de2e1b5e2c..57a1c360f5 100644
--- a/com.discord/smali/b/c/r.smali
+++ b/com.discord/smali/b/c/r.smali
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/r;
-        JR = "binary"
+        JE = "binary"
     .end subannotation
 .end annotation
 
@@ -28,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract JR()Ljava/lang/String;
+.method public abstract JE()Ljava/lang/String;
 .end method
diff --git a/com.discord/smali/b/c/s.smali b/com.discord/smali/b/c/s.smali
index c9c654ef70..1ebfda6fd4 100644
--- a/com.discord/smali/b/c/s.smali
+++ b/com.discord/smali/b/c/s.smali
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/s;
-        JO = false
+        JB = false
     .end subannotation
 .end annotation
 
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public abstract JO()Z
+.method public abstract JB()Z
 .end method
 
 .method public abstract value()Ljava/lang/String;
diff --git a/com.discord/smali/b/c/t.smali b/com.discord/smali/b/c/t.smali
index 0c651a4e58..58ec971bbd 100644
--- a/com.discord/smali/b/c/t.smali
+++ b/com.discord/smali/b/c/t.smali
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/t;
-        JO = false
+        JB = false
     .end subannotation
 .end annotation
 
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public abstract JO()Z
+.method public abstract JB()Z
 .end method
 
 .method public abstract value()Ljava/lang/String;
diff --git a/com.discord/smali/b/c/u.smali b/com.discord/smali/b/c/u.smali
index 269aae5aed..b8df7127ec 100644
--- a/com.discord/smali/b/c/u.smali
+++ b/com.discord/smali/b/c/u.smali
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/u;
-        JO = false
+        JB = false
     .end subannotation
 .end annotation
 
@@ -28,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract JO()Z
+.method public abstract JB()Z
 .end method
diff --git a/com.discord/smali/b/c/v.smali b/com.discord/smali/b/c/v.smali
index 2eb9364dfb..7f7d3e9954 100644
--- a/com.discord/smali/b/c/v.smali
+++ b/com.discord/smali/b/c/v.smali
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lb/c/v;
-        JO = false
+        JB = false
     .end subannotation
 .end annotation
 
@@ -28,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract JO()Z
+.method public abstract JB()Z
 .end method
diff --git a/com.discord/smali/b/f$1.smali b/com.discord/smali/b/f$1.smali
index 1998949a12..4699d356d9 100644
--- a/com.discord/smali/b/f$1.smali
+++ b/com.discord/smali/b/f$1.smali
@@ -28,18 +28,18 @@
 
 
 # instance fields
-.field final synthetic bGE:Ljava/lang/reflect/Type;
+.field final synthetic bGY:Ljava/lang/reflect/Type;
 
-.field final synthetic bGF:Lb/f;
+.field final synthetic bGZ:Lb/f;
 
 
 # direct methods
 .method constructor <init>(Lb/f;Ljava/lang/reflect/Type;)V
     .locals 0
 
-    iput-object p1, p0, Lb/f$1;->bGF:Lb/f;
+    iput-object p1, p0, Lb/f$1;->bGZ:Lb/f;
 
-    iput-object p2, p0, Lb/f$1;->bGE:Ljava/lang/reflect/Type;
+    iput-object p2, p0, Lb/f$1;->bGY:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,10 +48,10 @@
 
 
 # virtual methods
-.method public final Jz()Ljava/lang/reflect/Type;
+.method public final Jm()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lb/f$1;->bGE:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/f$1;->bGY:Ljava/lang/reflect/Type;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/b/f.smali b/com.discord/smali/b/f.smali
index c827a95e2e..e9f34dbbee 100644
--- a/com.discord/smali/b/f.smali
+++ b/com.discord/smali/b/f.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static final bGD:Lb/c$a;
+.field static final bGX:Lb/c$a;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lb/f;-><init>()V
 
-    sput-object v0, Lb/f;->bGD:Lb/c$a;
+    sput-object v0, Lb/f;->bGX:Lb/c$a;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/g$1.smali b/com.discord/smali/b/g$1.smali
index fb9db990b4..281496747d 100644
--- a/com.discord/smali/b/g$1.smali
+++ b/com.discord/smali/b/g$1.smali
@@ -28,18 +28,18 @@
 
 
 # instance fields
-.field final synthetic bGE:Ljava/lang/reflect/Type;
+.field final synthetic bGY:Ljava/lang/reflect/Type;
 
-.field final synthetic bGH:Lb/g;
+.field final synthetic bHb:Lb/g;
 
 
 # direct methods
 .method constructor <init>(Lb/g;Ljava/lang/reflect/Type;)V
     .locals 0
 
-    iput-object p1, p0, Lb/g$1;->bGH:Lb/g;
+    iput-object p1, p0, Lb/g$1;->bHb:Lb/g;
 
-    iput-object p2, p0, Lb/g$1;->bGE:Ljava/lang/reflect/Type;
+    iput-object p2, p0, Lb/g$1;->bGY:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,10 +48,10 @@
 
 
 # virtual methods
-.method public final Jz()Ljava/lang/reflect/Type;
+.method public final Jm()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lb/g$1;->bGE:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/g$1;->bGY:Ljava/lang/reflect/Type;
 
     return-object v0
 .end method
@@ -61,9 +61,9 @@
 
     new-instance v0, Lb/g$a;
 
-    iget-object v1, p0, Lb/g$1;->bGH:Lb/g;
+    iget-object v1, p0, Lb/g$1;->bHb:Lb/g;
 
-    iget-object v1, v1, Lb/g;->bGG:Ljava/util/concurrent/Executor;
+    iget-object v1, v1, Lb/g;->bHa:Ljava/util/concurrent/Executor;
 
     invoke-direct {v0, v1, p1}, Lb/g$a;-><init>(Ljava/util/concurrent/Executor;Lb/b;)V
 
diff --git a/com.discord/smali/b/g$a$1$1.smali b/com.discord/smali/b/g$a$1$1.smali
index c33018234e..8d9b2d964a 100644
--- a/com.discord/smali/b/g$a$1$1.smali
+++ b/com.discord/smali/b/g$a$1$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bGL:Lb/m;
+.field final synthetic bHf:Lb/m;
 
-.field final synthetic bGM:Lb/g$a$1;
+.field final synthetic bHg:Lb/g$a$1;
 
 
 # direct methods
 .method constructor <init>(Lb/g$a$1;Lb/m;)V
     .locals 0
 
-    iput-object p1, p0, Lb/g$a$1$1;->bGM:Lb/g$a$1;
+    iput-object p1, p0, Lb/g$a$1$1;->bHg:Lb/g$a$1;
 
-    iput-object p2, p0, Lb/g$a$1$1;->bGL:Lb/m;
+    iput-object p2, p0, Lb/g$a$1$1;->bHf:Lb/m;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,11 +41,11 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lb/g$a$1$1;->bGM:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$1;->bHg:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->bGK:Lb/g$a;
+    iget-object v0, v0, Lb/g$a$1;->bHe:Lb/g$a;
 
-    iget-object v0, v0, Lb/g$a;->bGI:Lb/b;
+    iget-object v0, v0, Lb/g$a;->bHc:Lb/b;
 
     invoke-interface {v0}, Lb/b;->isCanceled()Z
 
@@ -53,9 +53,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lb/g$a$1$1;->bGM:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$1;->bHg:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->bGJ:Lb/d;
+    iget-object v0, v0, Lb/g$a$1;->bHd:Lb/d;
 
     new-instance v1, Ljava/io/IOException;
 
@@ -68,11 +68,11 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/g$a$1$1;->bGM:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$1;->bHg:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->bGJ:Lb/d;
+    iget-object v0, v0, Lb/g$a$1;->bHd:Lb/d;
 
-    iget-object v1, p0, Lb/g$a$1$1;->bGL:Lb/m;
+    iget-object v1, p0, Lb/g$a$1$1;->bHf:Lb/m;
 
     invoke-interface {v0, v1}, Lb/d;->a(Lb/m;)V
 
diff --git a/com.discord/smali/b/g$a$1$2.smali b/com.discord/smali/b/g$a$1$2.smali
index 0e30dd09b8..ad12286ff0 100644
--- a/com.discord/smali/b/g$a$1$2.smali
+++ b/com.discord/smali/b/g$a$1$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bGM:Lb/g$a$1;
+.field final synthetic bHg:Lb/g$a$1;
 
-.field final synthetic bGN:Ljava/lang/Throwable;
+.field final synthetic bHh:Ljava/lang/Throwable;
 
 
 # direct methods
 .method constructor <init>(Lb/g$a$1;Ljava/lang/Throwable;)V
     .locals 0
 
-    iput-object p1, p0, Lb/g$a$1$2;->bGM:Lb/g$a$1;
+    iput-object p1, p0, Lb/g$a$1$2;->bHg:Lb/g$a$1;
 
-    iput-object p2, p0, Lb/g$a$1$2;->bGN:Ljava/lang/Throwable;
+    iput-object p2, p0, Lb/g$a$1$2;->bHh:Ljava/lang/Throwable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,11 +41,11 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lb/g$a$1$2;->bGM:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$2;->bHg:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->bGJ:Lb/d;
+    iget-object v0, v0, Lb/g$a$1;->bHd:Lb/d;
 
-    iget-object v1, p0, Lb/g$a$1$2;->bGN:Ljava/lang/Throwable;
+    iget-object v1, p0, Lb/g$a$1$2;->bHh:Ljava/lang/Throwable;
 
     invoke-interface {v0, v1}, Lb/d;->C(Ljava/lang/Throwable;)V
 
diff --git a/com.discord/smali/b/g$a$1.smali b/com.discord/smali/b/g$a$1.smali
index 0e1c42d7e6..b5546cadd7 100644
--- a/com.discord/smali/b/g$a$1.smali
+++ b/com.discord/smali/b/g$a$1.smali
@@ -26,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic bGJ:Lb/d;
+.field final synthetic bHd:Lb/d;
 
-.field final synthetic bGK:Lb/g$a;
+.field final synthetic bHe:Lb/g$a;
 
 
 # direct methods
 .method constructor <init>(Lb/g$a;Lb/d;)V
     .locals 0
 
-    iput-object p1, p0, Lb/g$a$1;->bGK:Lb/g$a;
+    iput-object p1, p0, Lb/g$a$1;->bHe:Lb/g$a;
 
-    iput-object p2, p0, Lb/g$a$1;->bGJ:Lb/d;
+    iput-object p2, p0, Lb/g$a$1;->bHd:Lb/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,9 +56,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/g$a$1;->bGK:Lb/g$a;
+    iget-object v0, p0, Lb/g$a$1;->bHe:Lb/g$a;
 
-    iget-object v0, v0, Lb/g$a;->bGG:Ljava/util/concurrent/Executor;
+    iget-object v0, v0, Lb/g$a;->bHa:Ljava/util/concurrent/Executor;
 
     new-instance v1, Lb/g$a$1$2;
 
@@ -79,9 +79,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/g$a$1;->bGK:Lb/g$a;
+    iget-object v0, p0, Lb/g$a$1;->bHe:Lb/g$a;
 
-    iget-object v0, v0, Lb/g$a;->bGG:Ljava/util/concurrent/Executor;
+    iget-object v0, v0, Lb/g$a;->bHa:Ljava/util/concurrent/Executor;
 
     new-instance v1, Lb/g$a$1$1;
 
diff --git a/com.discord/smali/b/g$a.smali b/com.discord/smali/b/g$a.smali
index 5db2121cde..0285c65849 100644
--- a/com.discord/smali/b/g$a.smali
+++ b/com.discord/smali/b/g$a.smali
@@ -29,9 +29,9 @@
 
 
 # instance fields
-.field final bGG:Ljava/util/concurrent/Executor;
+.field final bHa:Ljava/util/concurrent/Executor;
 
-.field final bGI:Lb/b;
+.field final bHc:Lb/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/b<",
@@ -55,16 +55,16 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/g$a;->bGG:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lb/g$a;->bHa:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lb/g$a;->bGI:Lb/b;
+    iput-object p2, p0, Lb/g$a;->bHc:Lb/b;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Jx()Lb/m;
+.method public final Jk()Lb/m;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -80,16 +80,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/g$a;->bGI:Lb/b;
+    iget-object v0, p0, Lb/g$a;->bHc:Lb/b;
 
-    invoke-interface {v0}, Lb/b;->Jx()Lb/m;
+    invoke-interface {v0}, Lb/b;->Jk()Lb/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Jy()Lb/b;
+.method public final Jl()Lb/b;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -101,11 +101,11 @@
 
     new-instance v0, Lb/g$a;
 
-    iget-object v1, p0, Lb/g$a;->bGG:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lb/g$a;->bHa:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lb/g$a;->bGI:Lb/b;
+    iget-object v2, p0, Lb/g$a;->bHc:Lb/b;
 
-    invoke-interface {v2}, Lb/b;->Jy()Lb/b;
+    invoke-interface {v2}, Lb/b;->Jl()Lb/b;
 
     move-result-object v2
 
@@ -128,7 +128,7 @@
 
     invoke-static {p1, v0}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lb/g$a;->bGI:Lb/b;
+    iget-object v0, p0, Lb/g$a;->bHc:Lb/b;
 
     new-instance v1, Lb/g$a$1;
 
@@ -142,7 +142,7 @@
 .method public final cancel()V
     .locals 1
 
-    iget-object v0, p0, Lb/g$a;->bGI:Lb/b;
+    iget-object v0, p0, Lb/g$a;->bHc:Lb/b;
 
     invoke-interface {v0}, Lb/b;->cancel()V
 
@@ -157,7 +157,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lb/g$a;->Jy()Lb/b;
+    invoke-virtual {p0}, Lb/g$a;->Jl()Lb/b;
 
     move-result-object v0
 
@@ -167,7 +167,7 @@
 .method public final isCanceled()Z
     .locals 1
 
-    iget-object v0, p0, Lb/g$a;->bGI:Lb/b;
+    iget-object v0, p0, Lb/g$a;->bHc:Lb/b;
 
     invoke-interface {v0}, Lb/b;->isCanceled()Z
 
diff --git a/com.discord/smali/b/g.smali b/com.discord/smali/b/g.smali
index 6b0b3c32c9..f74a34f472 100644
--- a/com.discord/smali/b/g.smali
+++ b/com.discord/smali/b/g.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field final bGG:Ljava/util/concurrent/Executor;
+.field final bHa:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     invoke-direct {p0}, Lb/c$a;-><init>()V
 
-    iput-object p1, p0, Lb/g;->bGG:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lb/g;->bHa:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/h.smali b/com.discord/smali/b/h.smali
index 5f9d4d0eae..5705e6b2a7 100644
--- a/com.discord/smali/b/h.smali
+++ b/com.discord/smali/b/h.smali
@@ -39,7 +39,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p1, Lb/m;->bHl:Lokhttp3/Response;
+    iget-object v1, p1, Lb/m;->bHF:Lokhttp3/Response;
 
     iget v1, v1, Lokhttp3/Response;->code:I
 
@@ -49,7 +49,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p1, Lb/m;->bHl:Lokhttp3/Response;
+    iget-object v1, p1, Lb/m;->bHF:Lokhttp3/Response;
 
     iget-object v1, v1, Lokhttp3/Response;->message:Ljava/lang/String;
 
@@ -61,13 +61,13 @@
 
     invoke-direct {p0, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p1, Lb/m;->bHl:Lokhttp3/Response;
+    iget-object v0, p1, Lb/m;->bHF:Lokhttp3/Response;
 
     iget v0, v0, Lokhttp3/Response;->code:I
 
     iput v0, p0, Lb/h;->code:I
 
-    iget-object v0, p1, Lb/m;->bHl:Lokhttp3/Response;
+    iget-object v0, p1, Lb/m;->bHF:Lokhttp3/Response;
 
     iget-object v0, v0, Lokhttp3/Response;->message:Ljava/lang/String;
 
@@ -80,7 +80,7 @@
 
 
 # virtual methods
-.method public final DF()I
+.method public final Dv()I
     .locals 1
 
     iget v0, p0, Lb/h;->code:I
@@ -88,7 +88,7 @@
     return v0
 .end method
 
-.method public final JA()Lb/m;
+.method public final Jn()Lb/m;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/b/i$1.smali b/com.discord/smali/b/i$1.smali
index 8fa8d6a3cb..0fcbfc0cc7 100644
--- a/com.discord/smali/b/i$1.smali
+++ b/com.discord/smali/b/i$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bGJ:Lb/d;
+.field final synthetic bHd:Lb/d;
 
-.field final synthetic bGS:Lb/i;
+.field final synthetic bHm:Lb/i;
 
 
 # direct methods
 .method constructor <init>(Lb/i;Lb/d;)V
     .locals 0
 
-    iput-object p1, p0, Lb/i$1;->bGS:Lb/i;
+    iput-object p1, p0, Lb/i$1;->bHm:Lb/i;
 
-    iput-object p2, p0, Lb/i$1;->bGJ:Lb/d;
+    iput-object p2, p0, Lb/i$1;->bHd:Lb/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
     .locals 1
 
     :try_start_0
-    iget-object v0, p0, Lb/i$1;->bGJ:Lb/d;
+    iget-object v0, p0, Lb/i$1;->bHd:Lb/d;
 
     invoke-interface {v0, p1}, Lb/d;->C(Ljava/lang/Throwable;)V
     :try_end_0
@@ -67,7 +67,7 @@
     .end annotation
 
     :try_start_0
-    iget-object p1, p0, Lb/i$1;->bGS:Lb/i;
+    iget-object p1, p0, Lb/i$1;->bHm:Lb/i;
 
     invoke-virtual {p1, p2}, Lb/i;->h(Lokhttp3/Response;)Lb/m;
 
@@ -76,7 +76,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object p2, p0, Lb/i$1;->bGJ:Lb/d;
+    iget-object p2, p0, Lb/i$1;->bHd:Lb/d;
 
     invoke-interface {p2, p1}, Lb/d;->a(Lb/m;)V
     :try_end_1
@@ -95,7 +95,7 @@
     move-exception p1
 
     :try_start_2
-    iget-object p2, p0, Lb/i$1;->bGJ:Lb/d;
+    iget-object p2, p0, Lb/i$1;->bHd:Lb/d;
 
     invoke-interface {p2, p1}, Lb/d;->C(Ljava/lang/Throwable;)V
     :try_end_2
diff --git a/com.discord/smali/b/i$a$1.smali b/com.discord/smali/b/i$a$1.smali
index c9aa17210d..8f13b19509 100644
--- a/com.discord/smali/b/i$a$1.smali
+++ b/com.discord/smali/b/i$a$1.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lb/i$a;->Hf()Lokio/d;
+    value = Lb/i$a;->GS()Lokio/d;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bGV:Lb/i$a;
+.field final synthetic bHp:Lb/i$a;
 
 
 # direct methods
 .method constructor <init>(Lb/i$a;Lokio/r;)V
     .locals 0
 
-    iput-object p1, p0, Lb/i$a$1;->bGV:Lb/i$a;
+    iput-object p1, p0, Lb/i$a$1;->bHp:Lb/i$a;
 
     invoke-direct {p0, p2}, Lokio/f;-><init>(Lokio/r;)V
 
@@ -51,9 +51,9 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lb/i$a$1;->bGV:Lb/i$a;
+    iget-object p2, p0, Lb/i$a$1;->bHp:Lb/i$a;
 
-    iput-object p1, p2, Lb/i$a;->bGU:Ljava/io/IOException;
+    iput-object p1, p2, Lb/i$a;->bHo:Ljava/io/IOException;
 
     throw p1
 .end method
diff --git a/com.discord/smali/b/i$a.smali b/com.discord/smali/b/i$a.smali
index 3001c41517..73ac46caae 100644
--- a/com.discord/smali/b/i$a.smali
+++ b/com.discord/smali/b/i$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private final bGT:Lokhttp3/x;
+.field private final bHn:Lokhttp3/x;
 
-.field bGU:Ljava/io/IOException;
+.field bHo:Ljava/io/IOException;
 
 
 # direct methods
@@ -26,21 +26,21 @@
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
-    iput-object p1, p0, Lb/i$a;->bGT:Lokhttp3/x;
+    iput-object p1, p0, Lb/i$a;->bHn:Lokhttp3/x;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Hf()Lokio/d;
+.method public final GS()Lokio/d;
     .locals 2
 
     new-instance v0, Lb/i$a$1;
 
-    iget-object v1, p0, Lb/i$a;->bGT:Lokhttp3/x;
+    iget-object v1, p0, Lb/i$a;->bHn:Lokhttp3/x;
 
-    invoke-virtual {v1}, Lokhttp3/x;->Hf()Lokio/d;
+    invoke-virtual {v1}, Lokhttp3/x;->GS()Lokio/d;
 
     move-result-object v1
 
@@ -56,7 +56,7 @@
 .method public final close()V
     .locals 1
 
-    iget-object v0, p0, Lb/i$a;->bGT:Lokhttp3/x;
+    iget-object v0, p0, Lb/i$a;->bHn:Lokhttp3/x;
 
     invoke-virtual {v0}, Lokhttp3/x;->close()V
 
@@ -66,7 +66,7 @@
 .method public final contentLength()J
     .locals 2
 
-    iget-object v0, p0, Lb/i$a;->bGT:Lokhttp3/x;
+    iget-object v0, p0, Lb/i$a;->bHn:Lokhttp3/x;
 
     invoke-virtual {v0}, Lokhttp3/x;->contentLength()J
 
@@ -78,7 +78,7 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    iget-object v0, p0, Lb/i$a;->bGT:Lokhttp3/x;
+    iget-object v0, p0, Lb/i$a;->bHn:Lokhttp3/x;
 
     invoke-virtual {v0}, Lokhttp3/x;->contentType()Lokhttp3/MediaType;
 
diff --git a/com.discord/smali/b/i$b.smali b/com.discord/smali/b/i$b.smali
index 4a42c503f8..5c5b157e1e 100644
--- a/com.discord/smali/b/i$b.smali
+++ b/com.discord/smali/b/i$b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final bug:Lokhttp3/MediaType;
+.field private final buA:Lokhttp3/MediaType;
 
 .field private final contentLength:J
 
@@ -26,7 +26,7 @@
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
-    iput-object p1, p0, Lb/i$b;->bug:Lokhttp3/MediaType;
+    iput-object p1, p0, Lb/i$b;->buA:Lokhttp3/MediaType;
 
     iput-wide p2, p0, Lb/i$b;->contentLength:J
 
@@ -35,7 +35,7 @@
 
 
 # virtual methods
-.method public final Hf()Lokio/d;
+.method public final GS()Lokio/d;
     .locals 2
 
     new-instance v0, Ljava/lang/IllegalStateException;
@@ -58,7 +58,7 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    iget-object v0, p0, Lb/i$b;->bug:Lokhttp3/MediaType;
+    iget-object v0, p0, Lb/i$b;->buA:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/b/i.smali b/com.discord/smali/b/i.smali
index 533790eead..84f35a1b33 100644
--- a/com.discord/smali/b/i.smali
+++ b/com.discord/smali/b/i.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field private final bGO:Lb/o;
+.field private final bHi:Lb/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/o<",
@@ -36,24 +36,24 @@
     .end annotation
 .end field
 
-.field private final bGP:[Ljava/lang/Object;
+.field private final bHj:[Ljava/lang/Object;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bGQ:Lokhttp3/e;
+.field private bHk:Lokhttp3/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bGR:Ljava/lang/Throwable;
+.field private bHl:Ljava/lang/Throwable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private buP:Z
+.field private bvj:Z
 
-.field private volatile bwW:Z
+.field private volatile bxq:Z
 
 
 # direct methods
@@ -75,14 +75,14 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/i;->bGO:Lb/o;
+    iput-object p1, p0, Lb/i;->bHi:Lb/o;
 
-    iput-object p2, p0, Lb/i;->bGP:[Ljava/lang/Object;
+    iput-object p2, p0, Lb/i;->bHj:[Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private JB()Lb/i;
+.method private Jo()Lb/i;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -94,16 +94,16 @@
 
     new-instance v0, Lb/i;
 
-    iget-object v1, p0, Lb/i;->bGO:Lb/o;
+    iget-object v1, p0, Lb/i;->bHi:Lb/o;
 
-    iget-object v2, p0, Lb/i;->bGP:[Ljava/lang/Object;
+    iget-object v2, p0, Lb/i;->bHj:[Ljava/lang/Object;
 
     invoke-direct {v0, v1, v2}, Lb/i;-><init>(Lb/o;[Ljava/lang/Object;)V
 
     return-object v0
 .end method
 
-.method private JC()Lokhttp3/e;
+.method private Jp()Lokhttp3/e;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -111,17 +111,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/i;->bGO:Lb/o;
+    iget-object v0, p0, Lb/i;->bHi:Lb/o;
 
-    iget-object v1, p0, Lb/i;->bGP:[Ljava/lang/Object;
+    iget-object v1, p0, Lb/i;->bHj:[Ljava/lang/Object;
 
-    invoke-virtual {v0, v1}, Lb/o;->t([Ljava/lang/Object;)Lokhttp3/w;
+    invoke-virtual {v0, v1}, Lb/o;->s([Ljava/lang/Object;)Lokhttp3/w;
 
     move-result-object v0
 
-    iget-object v1, p0, Lb/i;->bGO:Lb/o;
+    iget-object v1, p0, Lb/i;->bHi:Lb/o;
 
-    iget-object v1, v1, Lb/o;->bHp:Lokhttp3/e$a;
+    iget-object v1, v1, Lb/o;->bHJ:Lokhttp3/e$a;
 
     invoke-interface {v1, v0}, Lokhttp3/e$a;->a(Lokhttp3/w;)Lokhttp3/e;
 
@@ -143,7 +143,7 @@
 
 
 # virtual methods
-.method public final Jx()Lb/m;
+.method public final Jk()Lb/m;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -162,50 +162,50 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lb/i;->buP:Z
+    iget-boolean v0, p0, Lb/i;->bvj:Z
 
     if-nez v0, :cond_4
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/i;->buP:Z
+    iput-boolean v0, p0, Lb/i;->bvj:Z
 
-    iget-object v0, p0, Lb/i;->bGR:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->bHl:Ljava/lang/Throwable;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lb/i;->bGR:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->bHl:Ljava/lang/Throwable;
 
     instance-of v0, v0, Ljava/io/IOException;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lb/i;->bGR:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->bHl:Ljava/lang/Throwable;
 
     check-cast v0, Ljava/io/IOException;
 
     throw v0
 
     :cond_0
-    iget-object v0, p0, Lb/i;->bGR:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->bHl:Ljava/lang/Throwable;
 
     check-cast v0, Ljava/lang/RuntimeException;
 
     throw v0
 
     :cond_1
-    iget-object v0, p0, Lb/i;->bGQ:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bHk:Lokhttp3/e;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     if-nez v0, :cond_2
 
     :try_start_1
-    invoke-direct {p0}, Lb/i;->JC()Lokhttp3/e;
+    invoke-direct {p0}, Lb/i;->Jp()Lokhttp3/e;
 
     move-result-object v0
 
-    iput-object v0, p0, Lb/i;->bGQ:Lokhttp3/e;
+    iput-object v0, p0, Lb/i;->bHk:Lokhttp3/e;
     :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
@@ -223,7 +223,7 @@
 
     :goto_0
     :try_start_2
-    iput-object v0, p0, Lb/i;->bGR:Ljava/lang/Throwable;
+    iput-object v0, p0, Lb/i;->bHl:Ljava/lang/Throwable;
 
     throw v0
 
@@ -233,14 +233,14 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-boolean v1, p0, Lb/i;->bwW:Z
+    iget-boolean v1, p0, Lb/i;->bxq:Z
 
     if-eqz v1, :cond_3
 
     invoke-interface {v0}, Lokhttp3/e;->cancel()V
 
     :cond_3
-    invoke-interface {v0}, Lokhttp3/e;->Gr()Lokhttp3/Response;
+    invoke-interface {v0}, Lokhttp3/e;->Gg()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -270,10 +270,10 @@
     throw v0
 .end method
 
-.method public final synthetic Jy()Lb/b;
+.method public final synthetic Jl()Lb/b;
     .locals 1
 
-    invoke-direct {p0}, Lb/i;->JB()Lb/i;
+    invoke-direct {p0}, Lb/i;->Jo()Lb/i;
 
     move-result-object v0
 
@@ -297,17 +297,17 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lb/i;->buP:Z
+    iget-boolean v0, p0, Lb/i;->bvj:Z
 
     if-nez v0, :cond_3
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/i;->buP:Z
+    iput-boolean v0, p0, Lb/i;->bvj:Z
 
-    iget-object v0, p0, Lb/i;->bGQ:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bHk:Lokhttp3/e;
 
-    iget-object v1, p0, Lb/i;->bGR:Ljava/lang/Throwable;
+    iget-object v1, p0, Lb/i;->bHl:Ljava/lang/Throwable;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
@@ -316,11 +316,11 @@
     if-nez v1, :cond_0
 
     :try_start_1
-    invoke-direct {p0}, Lb/i;->JC()Lokhttp3/e;
+    invoke-direct {p0}, Lb/i;->Jp()Lokhttp3/e;
 
     move-result-object v2
 
-    iput-object v2, p0, Lb/i;->bGQ:Lokhttp3/e;
+    iput-object v2, p0, Lb/i;->bHk:Lokhttp3/e;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -332,7 +332,7 @@
     move-exception v1
 
     :try_start_2
-    iput-object v1, p0, Lb/i;->bGR:Ljava/lang/Throwable;
+    iput-object v1, p0, Lb/i;->bHl:Ljava/lang/Throwable;
 
     :cond_0
     :goto_0
@@ -347,7 +347,7 @@
     return-void
 
     :cond_1
-    iget-boolean v1, p0, Lb/i;->bwW:Z
+    iget-boolean v1, p0, Lb/i;->bxq:Z
 
     if-eqz v1, :cond_2
 
@@ -387,12 +387,12 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/i;->bwW:Z
+    iput-boolean v0, p0, Lb/i;->bxq:Z
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lb/i;->bGQ:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bHk:Lokhttp3/e;
 
     monitor-exit p0
     :try_end_0
@@ -424,7 +424,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lb/i;->JB()Lb/i;
+    invoke-direct {p0}, Lb/i;->Jo()Lb/i;
 
     move-result-object v0
 
@@ -449,9 +449,9 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response;->Hd()Lokhttp3/Response$a;
+    invoke-virtual {p1}, Lokhttp3/Response;->GQ()Lokhttp3/Response$a;
 
     move-result-object p1
 
@@ -467,9 +467,9 @@
 
     invoke-direct {v1, v2, v3, v4}, Lb/i$b;-><init>(Lokhttp3/MediaType;J)V
 
-    iput-object v1, p1, Lokhttp3/Response$a;->bve:Lokhttp3/x;
+    iput-object v1, p1, Lokhttp3/Response$a;->bvy:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {p1}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object p1
 
@@ -502,9 +502,9 @@
     invoke-direct {v1, v0}, Lb/i$a;-><init>(Lokhttp3/x;)V
 
     :try_start_0
-    iget-object v0, p0, Lb/i;->bGO:Lb/o;
+    iget-object v0, p0, Lb/i;->bHi:Lb/o;
 
-    iget-object v0, v0, Lb/o;->bHz:Lb/e;
+    iget-object v0, v0, Lb/o;->bHT:Lb/e;
 
     invoke-interface {v0, v1}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -563,7 +563,7 @@
 .method public final isCanceled()Z
     .locals 2
 
-    iget-boolean v0, p0, Lb/i;->bwW:Z
+    iget-boolean v0, p0, Lb/i;->bxq:Z
 
     const/4 v1, 0x1
 
@@ -575,11 +575,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lb/i;->bGQ:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bHk:Lokhttp3/e;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lb/i;->bGQ:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bHk:Lokhttp3/e;
 
     invoke-interface {v0}, Lokhttp3/e;->isCanceled()Z
 
diff --git a/com.discord/smali/b/j$1.smali b/com.discord/smali/b/j$1.smali
index f89f38b1f5..68d85b276a 100644
--- a/com.discord/smali/b/j$1.smali
+++ b/com.discord/smali/b/j$1.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lb/j;->JD()Lb/j;
+    value = Lb/j;->Jq()Lb/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic bGW:Lb/j;
+.field final synthetic bHq:Lb/j;
 
 
 # direct methods
 .method constructor <init>(Lb/j;)V
     .locals 0
 
-    iput-object p1, p0, Lb/j$1;->bGW:Lb/j;
+    iput-object p1, p0, Lb/j$1;->bHq:Lb/j;
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
@@ -70,7 +70,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lb/j$1;->bGW:Lb/j;
+    iget-object v1, p0, Lb/j$1;->bHq:Lb/j;
 
     invoke-virtual {v1, p1, v0}, Lb/j;->a(Lb/l;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali/b/j$2.smali b/com.discord/smali/b/j$2.smali
index abe85ce7d9..0d406bcd01 100644
--- a/com.discord/smali/b/j$2.smali
+++ b/com.discord/smali/b/j$2.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lb/j;->JE()Lb/j;
+    value = Lb/j;->Jr()Lb/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic bGW:Lb/j;
+.field final synthetic bHq:Lb/j;
 
 
 # direct methods
 .method constructor <init>(Lb/j;)V
     .locals 0
 
-    iput-object p1, p0, Lb/j$2;->bGW:Lb/j;
+    iput-object p1, p0, Lb/j$2;->bHq:Lb/j;
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
@@ -65,7 +65,7 @@
     :goto_0
     if-ge v0, v1, :cond_1
 
-    iget-object v2, p0, Lb/j$2;->bGW:Lb/j;
+    iget-object v2, p0, Lb/j$2;->bHq:Lb/j;
 
     invoke-static {p2, v0}, Ljava/lang/reflect/Array;->get(Ljava/lang/Object;I)Ljava/lang/Object;
 
diff --git a/com.discord/smali/b/j$a.smali b/com.discord/smali/b/j$a.smali
index a7f844f36e..b8189c238c 100644
--- a/com.discord/smali/b/j$a.smali
+++ b/com.discord/smali/b/j$a.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final bGX:Lb/e;
+.field private final bHr:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -52,7 +52,7 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$a;->bGX:Lb/e;
+    iput-object p1, p0, Lb/j$a;->bHr:Lb/e;
 
     return-void
 .end method
@@ -76,7 +76,7 @@
     if-eqz p2, :cond_0
 
     :try_start_0
-    iget-object v0, p0, Lb/j$a;->bGX:Lb/e;
+    iget-object v0, p0, Lb/j$a;->bHr:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -86,7 +86,7 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iput-object v0, p1, Lb/l;->buk:Lokhttp3/RequestBody;
+    iput-object v0, p1, Lb/l;->buE:Lokhttp3/RequestBody;
 
     return-void
 
diff --git a/com.discord/smali/b/j$b.smali b/com.discord/smali/b/j$b.smali
index 2bfe82f3bc..138c066f7d 100644
--- a/com.discord/smali/b/j$b.smali
+++ b/com.discord/smali/b/j$b.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final bGY:Lb/e;
+.field private final bHs:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final bGZ:Z
+.field private final bHt:Z
 
 .field private final name:Ljava/lang/String;
 
@@ -67,9 +67,9 @@
 
     iput-object p1, p0, Lb/j$b;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lb/j$b;->bGY:Lb/e;
+    iput-object p2, p0, Lb/j$b;->bHs:Lb/e;
 
-    iput-boolean p3, p0, Lb/j$b;->bGZ:Z
+    iput-boolean p3, p0, Lb/j$b;->bHt:Z
 
     return-void
 .end method
@@ -101,7 +101,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$b;->bGY:Lb/e;
+    iget-object v0, p0, Lb/j$b;->bHs:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -116,7 +116,7 @@
     :cond_1
     iget-object v0, p0, Lb/j$b;->name:Ljava/lang/String;
 
-    iget-boolean v1, p0, Lb/j$b;->bGZ:Z
+    iget-boolean v1, p0, Lb/j$b;->bHt:Z
 
     invoke-virtual {p1, v0, p2, v1}, Lb/l;->f(Ljava/lang/String;Ljava/lang/String;Z)V
 
diff --git a/com.discord/smali/b/j$c.smali b/com.discord/smali/b/j$c.smali
index 6aa5d13e43..cc8b466d96 100644
--- a/com.discord/smali/b/j$c.smali
+++ b/com.discord/smali/b/j$c.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field private final bGY:Lb/e;
+.field private final bHs:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field private final bGZ:Z
+.field private final bHt:Z
 
 
 # direct methods
@@ -56,9 +56,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$c;->bGY:Lb/e;
+    iput-object p1, p0, Lb/j$c;->bHs:Lb/e;
 
-    iput-boolean p2, p0, Lb/j$c;->bGZ:Z
+    iput-boolean p2, p0, Lb/j$c;->bHt:Z
 
     return-void
 .end method
@@ -118,7 +118,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v3, p0, Lb/j$c;->bGY:Lb/e;
+    iget-object v3, p0, Lb/j$c;->bHs:Lb/e;
 
     invoke-interface {v3, v0}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -128,7 +128,7 @@
 
     if-eqz v3, :cond_0
 
-    iget-boolean v0, p0, Lb/j$c;->bGZ:Z
+    iget-boolean v0, p0, Lb/j$c;->bHt:Z
 
     invoke-virtual {p1, v1, v3, v0}, Lb/l;->f(Ljava/lang/String;Ljava/lang/String;Z)V
 
@@ -149,7 +149,7 @@
 
     invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v0, p0, Lb/j$c;->bGY:Lb/e;
+    iget-object v0, p0, Lb/j$c;->bHs:Lb/e;
 
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
diff --git a/com.discord/smali/b/j$d.smali b/com.discord/smali/b/j$d.smali
index 0ebbefa186..626607a9b9 100644
--- a/com.discord/smali/b/j$d.smali
+++ b/com.discord/smali/b/j$d.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final bGY:Lb/e;
+.field private final bHs:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -65,7 +65,7 @@
 
     iput-object p1, p0, Lb/j$d;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lb/j$d;->bGY:Lb/e;
+    iput-object p2, p0, Lb/j$d;->bHs:Lb/e;
 
     return-void
 .end method
@@ -97,7 +97,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$d;->bGY:Lb/e;
+    iget-object v0, p0, Lb/j$d;->bHs:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/b/j$e.smali b/com.discord/smali/b/j$e.smali
index 09afb4bee1..089eb96b7b 100644
--- a/com.discord/smali/b/j$e.smali
+++ b/com.discord/smali/b/j$e.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field private final bGY:Lb/e;
+.field private final bHs:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -54,7 +54,7 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$e;->bGY:Lb/e;
+    iput-object p1, p0, Lb/j$e;->bHs:Lb/e;
 
     return-void
 .end method
@@ -112,7 +112,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v2, p0, Lb/j$e;->bGY:Lb/e;
+    iget-object v2, p0, Lb/j$e;->bHs:Lb/e;
 
     invoke-interface {v2, v0}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/b/j$f.smali b/com.discord/smali/b/j$f.smali
index 61c4e41cfc..f20efdacf7 100644
--- a/com.discord/smali/b/j$f.smali
+++ b/com.discord/smali/b/j$f.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final bGX:Lb/e;
+.field private final bHr:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final buj:Lokhttp3/Headers;
+.field private final buD:Lokhttp3/Headers;
 
 
 # direct methods
@@ -55,9 +55,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$f;->buj:Lokhttp3/Headers;
+    iput-object p1, p0, Lb/j$f;->buD:Lokhttp3/Headers;
 
-    iput-object p2, p0, Lb/j$f;->bGX:Lb/e;
+    iput-object p2, p0, Lb/j$f;->bHr:Lb/e;
 
     return-void
 .end method
@@ -84,7 +84,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lb/j$f;->bGX:Lb/e;
+    iget-object v0, p0, Lb/j$f;->bHr:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object p2, p0, Lb/j$f;->buj:Lokhttp3/Headers;
+    iget-object p2, p0, Lb/j$f;->buD:Lokhttp3/Headers;
 
     invoke-virtual {p1, p2, v0}, Lb/l;->c(Lokhttp3/Headers;Lokhttp3/RequestBody;)V
 
diff --git a/com.discord/smali/b/j$g.smali b/com.discord/smali/b/j$g.smali
index 88145a58f2..07ebb8e6cb 100644
--- a/com.discord/smali/b/j$g.smali
+++ b/com.discord/smali/b/j$g.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field private final bGY:Lb/e;
+.field private final bHs:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field private final bHa:Ljava/lang/String;
+.field private final bHu:Ljava/lang/String;
 
 
 # direct methods
@@ -58,9 +58,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$g;->bGY:Lb/e;
+    iput-object p1, p0, Lb/j$g;->bHs:Lb/e;
 
-    iput-object p2, p0, Lb/j$g;->bHa:Ljava/lang/String;
+    iput-object p2, p0, Lb/j$g;->bHu:Ljava/lang/String;
 
     return-void
 .end method
@@ -156,7 +156,7 @@
 
     const/4 v1, 0x3
 
-    iget-object v3, p0, Lb/j$g;->bHa:Ljava/lang/String;
+    iget-object v3, p0, Lb/j$g;->bHu:Ljava/lang/String;
 
     aput-object v3, v2, v1
 
@@ -164,7 +164,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lb/j$g;->bGY:Lb/e;
+    iget-object v2, p0, Lb/j$g;->bHs:Lb/e;
 
     invoke-interface {v2, v0}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/b/j$h.smali b/com.discord/smali/b/j$h.smali
index e3d2deb689..3251d3a892 100644
--- a/com.discord/smali/b/j$h.smali
+++ b/com.discord/smali/b/j$h.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final bGY:Lb/e;
+.field private final bHs:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final bGZ:Z
+.field private final bHt:Z
 
 .field private final name:Ljava/lang/String;
 
@@ -67,9 +67,9 @@
 
     iput-object p1, p0, Lb/j$h;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lb/j$h;->bGY:Lb/e;
+    iput-object p2, p0, Lb/j$h;->bHs:Lb/e;
 
-    iput-boolean p3, p0, Lb/j$h;->bGZ:Z
+    iput-boolean p3, p0, Lb/j$h;->bHt:Z
 
     return-void
 .end method
@@ -100,7 +100,7 @@
 
     iget-object v0, p0, Lb/j$h;->name:Ljava/lang/String;
 
-    iget-object v1, p0, Lb/j$h;->bGY:Lb/e;
+    iget-object v1, p0, Lb/j$h;->bHs:Lb/e;
 
     invoke-interface {v1, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -108,13 +108,13 @@
 
     check-cast p2, Ljava/lang/String;
 
-    iget-boolean v1, p0, Lb/j$h;->bGZ:Z
+    iget-boolean v1, p0, Lb/j$h;->bHt:Z
 
-    iget-object v2, p1, Lb/l;->bHf:Ljava/lang/String;
+    iget-object v2, p1, Lb/l;->bHz:Ljava/lang/String;
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p1, Lb/l;->bHf:Ljava/lang/String;
+    iget-object v2, p1, Lb/l;->bHz:Ljava/lang/String;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -140,7 +140,7 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lb/l;->bHf:Ljava/lang/String;
+    iput-object p2, p1, Lb/l;->bHz:Ljava/lang/String;
 
     return-void
 
diff --git a/com.discord/smali/b/j$i.smali b/com.discord/smali/b/j$i.smali
index 6a0c2c55af..66f26b7862 100644
--- a/com.discord/smali/b/j$i.smali
+++ b/com.discord/smali/b/j$i.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final bGY:Lb/e;
+.field private final bHs:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final bGZ:Z
+.field private final bHt:Z
 
 .field private final name:Ljava/lang/String;
 
@@ -67,9 +67,9 @@
 
     iput-object p1, p0, Lb/j$i;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lb/j$i;->bGY:Lb/e;
+    iput-object p2, p0, Lb/j$i;->bHs:Lb/e;
 
-    iput-boolean p3, p0, Lb/j$i;->bGZ:Z
+    iput-boolean p3, p0, Lb/j$i;->bHt:Z
 
     return-void
 .end method
@@ -101,7 +101,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$i;->bGY:Lb/e;
+    iget-object v0, p0, Lb/j$i;->bHs:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -116,7 +116,7 @@
     :cond_1
     iget-object v0, p0, Lb/j$i;->name:Ljava/lang/String;
 
-    iget-boolean v1, p0, Lb/j$i;->bGZ:Z
+    iget-boolean v1, p0, Lb/j$i;->bHt:Z
 
     invoke-virtual {p1, v0, p2, v1}, Lb/l;->e(Ljava/lang/String;Ljava/lang/String;Z)V
 
diff --git a/com.discord/smali/b/j$j.smali b/com.discord/smali/b/j$j.smali
index 170f0d9fec..77c8e1b850 100644
--- a/com.discord/smali/b/j$j.smali
+++ b/com.discord/smali/b/j$j.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field private final bGY:Lb/e;
+.field private final bHs:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field private final bGZ:Z
+.field private final bHt:Z
 
 
 # direct methods
@@ -56,9 +56,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$j;->bGY:Lb/e;
+    iput-object p1, p0, Lb/j$j;->bHs:Lb/e;
 
-    iput-boolean p2, p0, Lb/j$j;->bGZ:Z
+    iput-boolean p2, p0, Lb/j$j;->bHt:Z
 
     return-void
 .end method
@@ -118,7 +118,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v3, p0, Lb/j$j;->bGY:Lb/e;
+    iget-object v3, p0, Lb/j$j;->bHs:Lb/e;
 
     invoke-interface {v3, v0}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -128,7 +128,7 @@
 
     if-eqz v3, :cond_0
 
-    iget-boolean v0, p0, Lb/j$j;->bGZ:Z
+    iget-boolean v0, p0, Lb/j$j;->bHt:Z
 
     invoke-virtual {p1, v1, v3, v0}, Lb/l;->e(Ljava/lang/String;Ljava/lang/String;Z)V
 
@@ -149,7 +149,7 @@
 
     invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v0, p0, Lb/j$j;->bGY:Lb/e;
+    iget-object v0, p0, Lb/j$j;->bHs:Lb/e;
 
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
diff --git a/com.discord/smali/b/j$k.smali b/com.discord/smali/b/j$k.smali
index f0b83560b4..6e02703e11 100644
--- a/com.discord/smali/b/j$k.smali
+++ b/com.discord/smali/b/j$k.smali
@@ -25,9 +25,9 @@
 
 
 # instance fields
-.field private final bGZ:Z
+.field private final bHt:Z
 
-.field private final bHb:Lb/e;
+.field private final bHv:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -54,9 +54,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$k;->bHb:Lb/e;
+    iput-object p1, p0, Lb/j$k;->bHv:Lb/e;
 
-    iput-boolean p2, p0, Lb/j$k;->bGZ:Z
+    iput-boolean p2, p0, Lb/j$k;->bHt:Z
 
     return-void
 .end method
@@ -88,7 +88,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$k;->bHb:Lb/e;
+    iget-object v0, p0, Lb/j$k;->bHv:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->convert(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -98,7 +98,7 @@
 
     const/4 v0, 0x0
 
-    iget-boolean v1, p0, Lb/j$k;->bGZ:Z
+    iget-boolean v1, p0, Lb/j$k;->bHt:Z
 
     invoke-virtual {p1, p2, v0, v1}, Lb/l;->e(Ljava/lang/String;Ljava/lang/String;Z)V
 
diff --git a/com.discord/smali/b/j$l.smali b/com.discord/smali/b/j$l.smali
index 611eb08d6b..ca7b287e51 100644
--- a/com.discord/smali/b/j$l.smali
+++ b/com.discord/smali/b/j$l.smali
@@ -23,7 +23,7 @@
 
 
 # static fields
-.field static final bHc:Lb/j$l;
+.field static final bHw:Lb/j$l;
 
 
 # direct methods
@@ -34,7 +34,7 @@
 
     invoke-direct {v0}, Lb/j$l;-><init>()V
 
-    sput-object v0, Lb/j$l;->bHc:Lb/j$l;
+    sput-object v0, Lb/j$l;->bHw:Lb/j$l;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p1, p1, Lb/l;->bHj:Lokhttp3/MultipartBody$a;
+    iget-object p1, p1, Lb/l;->bHD:Lokhttp3/MultipartBody$a;
 
     invoke-virtual {p1, p2}, Lokhttp3/MultipartBody$a;->a(Lokhttp3/MultipartBody$Part;)Lokhttp3/MultipartBody$a;
 
diff --git a/com.discord/smali/b/j$m.smali b/com.discord/smali/b/j$m.smali
index 76ab5e01aa..3f11542f91 100644
--- a/com.discord/smali/b/j$m.smali
+++ b/com.discord/smali/b/j$m.smali
@@ -48,7 +48,7 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lb/l;->bHf:Ljava/lang/String;
+    iput-object p2, p1, Lb/l;->bHz:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/j.smali b/com.discord/smali/b/j.smali
index 94e0ddfd12..2602f05ed3 100644
--- a/com.discord/smali/b/j.smali
+++ b/com.discord/smali/b/j.smali
@@ -43,7 +43,7 @@
 
 
 # virtual methods
-.method final JD()Lb/j;
+.method final Jq()Lb/j;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -61,7 +61,7 @@
     return-object v0
 .end method
 
-.method final JE()Lb/j;
+.method final Jr()Lb/j;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/b/k$a.smali b/com.discord/smali/b/k$a.smali
index 8a848d37e5..c526fa1e9d 100644
--- a/com.discord/smali/b/k$a.smali
+++ b/com.discord/smali/b/k$a.smali
@@ -31,7 +31,7 @@
 
 
 # virtual methods
-.method public final JH()Ljava/util/concurrent/Executor;
+.method public final Ju()Ljava/util/concurrent/Executor;
     .locals 1
 
     new-instance v0, Lb/k$a$a;
diff --git a/com.discord/smali/b/k.smali b/com.discord/smali/b/k.smali
index a8fb2cd3a6..be1c808789 100644
--- a/com.discord/smali/b/k.smali
+++ b/com.discord/smali/b/k.smali
@@ -13,18 +13,18 @@
 
 
 # static fields
-.field private static final bHd:Lb/k;
+.field private static final bHx:Lb/k;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lb/k;->JG()Lb/k;
+    invoke-static {}, Lb/k;->Jt()Lb/k;
 
     move-result-object v0
 
-    sput-object v0, Lb/k;->bHd:Lb/k;
+    sput-object v0, Lb/k;->bHx:Lb/k;
 
     return-void
 .end method
@@ -37,15 +37,15 @@
     return-void
 .end method
 
-.method static JF()Lb/k;
+.method static Js()Lb/k;
     .locals 1
 
-    sget-object v0, Lb/k;->bHd:Lb/k;
+    sget-object v0, Lb/k;->bHx:Lb/k;
 
     return-object v0
 .end method
 
-.method private static JG()Lb/k;
+.method private static Jt()Lb/k;
     .locals 1
 
     :try_start_0
@@ -90,7 +90,7 @@
 
 
 # virtual methods
-.method JH()Ljava/util/concurrent/Executor;
+.method Ju()Ljava/util/concurrent/Executor;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -116,7 +116,7 @@
     return-object v0
 
     :cond_0
-    sget-object p1, Lb/f;->bGD:Lb/c$a;
+    sget-object p1, Lb/f;->bGX:Lb/c$a;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/b/l$a.smali b/com.discord/smali/b/l$a.smali
index ae72729744..ab1fd69303 100644
--- a/com.discord/smali/b/l$a.smali
+++ b/com.discord/smali/b/l$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final bug:Lokhttp3/MediaType;
+.field private final buA:Lokhttp3/MediaType;
 
 .field private final delegate:Lokhttp3/RequestBody;
 
@@ -28,7 +28,7 @@
 
     iput-object p1, p0, Lb/l$a;->delegate:Lokhttp3/RequestBody;
 
-    iput-object p2, p0, Lb/l$a;->bug:Lokhttp3/MediaType;
+    iput-object p2, p0, Lb/l$a;->buA:Lokhttp3/MediaType;
 
     return-void
 .end method
@@ -55,7 +55,7 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    iget-object v0, p0, Lb/l$a;->bug:Lokhttp3/MediaType;
+    iget-object v0, p0, Lb/l$a;->buA:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/b/l.smali b/com.discord/smali/b/l.smali
index a2a37c2869..ef913c5a3b 100644
--- a/com.discord/smali/b/l.smali
+++ b/com.discord/smali/b/l.smali
@@ -12,42 +12,42 @@
 
 
 # static fields
-.field private static final btH:[C
+.field private static final bub:[C
 
 
 # instance fields
-.field private final bHe:Lokhttp3/s;
-
-.field bHf:Ljava/lang/String;
+.field private bHA:Lokhttp3/s$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bHg:Lokhttp3/s$a;
+.field private final bHB:Lokhttp3/w$a;
+
+.field private final bHC:Z
+
+.field bHD:Lokhttp3/MultipartBody$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final bHh:Lokhttp3/w$a;
-
-.field private final bHi:Z
-
-.field bHj:Lokhttp3/MultipartBody$a;
+.field private bHE:Lokhttp3/q$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bHk:Lokhttp3/q$a;
+.field private final bHy:Lokhttp3/s;
+
+.field bHz:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bug:Lokhttp3/MediaType;
+.field private buA:Lokhttp3/MediaType;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field buk:Lokhttp3/RequestBody;
+.field buE:Lokhttp3/RequestBody;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -65,7 +65,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lb/l;->btH:[C
+    sput-object v0, Lb/l;->bub:[C
 
     return-void
 
@@ -109,23 +109,23 @@
 
     iput-object p1, p0, Lb/l;->method:Ljava/lang/String;
 
-    iput-object p2, p0, Lb/l;->bHe:Lokhttp3/s;
+    iput-object p2, p0, Lb/l;->bHy:Lokhttp3/s;
 
-    iput-object p3, p0, Lb/l;->bHf:Ljava/lang/String;
+    iput-object p3, p0, Lb/l;->bHz:Ljava/lang/String;
 
     new-instance p1, Lokhttp3/w$a;
 
     invoke-direct {p1}, Lokhttp3/w$a;-><init>()V
 
-    iput-object p1, p0, Lb/l;->bHh:Lokhttp3/w$a;
+    iput-object p1, p0, Lb/l;->bHB:Lokhttp3/w$a;
 
-    iput-object p5, p0, Lb/l;->bug:Lokhttp3/MediaType;
+    iput-object p5, p0, Lb/l;->buA:Lokhttp3/MediaType;
 
-    iput-boolean p6, p0, Lb/l;->bHi:Z
+    iput-boolean p6, p0, Lb/l;->bHC:Z
 
     if-eqz p4, :cond_0
 
-    iget-object p1, p0, Lb/l;->bHh:Lokhttp3/w$a;
+    iget-object p1, p0, Lb/l;->bHB:Lokhttp3/w$a;
 
     invoke-virtual {p1, p4}, Lokhttp3/w$a;->b(Lokhttp3/Headers;)Lokhttp3/w$a;
 
@@ -136,7 +136,7 @@
 
     invoke-direct {p1}, Lokhttp3/q$a;-><init>()V
 
-    iput-object p1, p0, Lb/l;->bHk:Lokhttp3/q$a;
+    iput-object p1, p0, Lb/l;->bHE:Lokhttp3/q$a;
 
     return-void
 
@@ -147,11 +147,11 @@
 
     invoke-direct {p1}, Lokhttp3/MultipartBody$a;-><init>()V
 
-    iput-object p1, p0, Lb/l;->bHj:Lokhttp3/MultipartBody$a;
+    iput-object p1, p0, Lb/l;->bHD:Lokhttp3/MultipartBody$a;
 
-    iget-object p1, p0, Lb/l;->bHj:Lokhttp3/MultipartBody$a;
+    iget-object p1, p0, Lb/l;->bHD:Lokhttp3/MultipartBody$a;
 
-    sget-object p2, Lokhttp3/MultipartBody;->bua:Lokhttp3/MediaType;
+    sget-object p2, Lokhttp3/MultipartBody;->buu:Lokhttp3/MediaType;
 
     if-eqz p2, :cond_3
 
@@ -165,7 +165,7 @@
 
     if-eqz p3, :cond_2
 
-    iput-object p2, p1, Lokhttp3/MultipartBody$a;->bui:Lokhttp3/MediaType;
+    iput-object p2, p1, Lokhttp3/MultipartBody$a;->buC:Lokhttp3/MediaType;
 
     goto :goto_0
 
@@ -312,7 +312,7 @@
     goto :goto_3
 
     :cond_3
-    invoke-virtual {v3, v10}, Lokio/c;->dP(I)Lokio/c;
+    invoke-virtual {v3, v10}, Lokio/c;->dL(I)Lokio/c;
 
     goto :goto_5
 
@@ -325,10 +325,10 @@
     invoke-direct {v1}, Lokio/c;-><init>()V
 
     :cond_5
-    invoke-virtual {v1, v10}, Lokio/c;->dP(I)Lokio/c;
+    invoke-virtual {v1, v10}, Lokio/c;->dL(I)Lokio/c;
 
     :goto_4
-    invoke-virtual {v1}, Lokio/c;->Iu()Z
+    invoke-virtual {v1}, Lokio/c;->Ih()Z
 
     move-result v11
 
@@ -340,9 +340,9 @@
 
     and-int/lit16 v11, v11, 0xff
 
-    invoke-virtual {v3, v9}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v3, v9}, Lokio/c;->dM(I)Lokio/c;
 
-    sget-object v12, Lb/l;->btH:[C
+    sget-object v12, Lb/l;->bub:[C
 
     shr-int/lit8 v13, v11, 0x4
 
@@ -350,15 +350,15 @@
 
     aget-char v12, v12, v13
 
-    invoke-virtual {v3, v12}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v3, v12}, Lokio/c;->dM(I)Lokio/c;
 
-    sget-object v12, Lb/l;->btH:[C
+    sget-object v12, Lb/l;->bub:[C
 
     and-int/lit8 v11, v11, 0xf
 
     aget-char v11, v12, v11
 
-    invoke-virtual {v3, v11}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v3, v11}, Lokio/c;->dM(I)Lokio/c;
 
     goto :goto_4
 
@@ -373,7 +373,7 @@
     goto :goto_2
 
     :cond_7
-    invoke-virtual {v3}, Lokio/c;->IA()Ljava/lang/String;
+    invoke-virtual {v3}, Lokio/c;->In()Ljava/lang/String;
 
     move-result-object p0
 
@@ -383,36 +383,36 @@
 
 
 # virtual methods
-.method final Hc()Lokhttp3/w;
+.method final GP()Lokhttp3/w;
     .locals 5
 
-    iget-object v0, p0, Lb/l;->bHg:Lokhttp3/s$a;
+    iget-object v0, p0, Lb/l;->bHA:Lokhttp3/s$a;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/s$a;->GK()Lokhttp3/s;
+    invoke-virtual {v0}, Lokhttp3/s$a;->Gz()Lokhttp3/s;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lb/l;->bHe:Lokhttp3/s;
+    iget-object v0, p0, Lb/l;->bHy:Lokhttp3/s;
 
-    iget-object v1, p0, Lb/l;->bHf:Ljava/lang/String;
+    iget-object v1, p0, Lb/l;->bHz:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lokhttp3/s;->ei(Ljava/lang/String;)Lokhttp3/s;
+    invoke-virtual {v0, v1}, Lokhttp3/s;->ec(Ljava/lang/String;)Lokhttp3/s;
 
     move-result-object v0
 
     if-eqz v0, :cond_7
 
     :goto_0
-    iget-object v1, p0, Lb/l;->buk:Lokhttp3/RequestBody;
+    iget-object v1, p0, Lb/l;->buE:Lokhttp3/RequestBody;
 
     if-nez v1, :cond_4
 
-    iget-object v2, p0, Lb/l;->bHk:Lokhttp3/q$a;
+    iget-object v2, p0, Lb/l;->bHE:Lokhttp3/q$a;
 
     if-eqz v2, :cond_1
 
@@ -420,18 +420,18 @@
 
     iget-object v3, v2, Lokhttp3/q$a;->names:Ljava/util/List;
 
-    iget-object v2, v2, Lokhttp3/q$a;->btz:Ljava/util/List;
+    iget-object v2, v2, Lokhttp3/q$a;->btT:Ljava/util/List;
 
     invoke-direct {v1, v3, v2}, Lokhttp3/q;-><init>(Ljava/util/List;Ljava/util/List;)V
 
     goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Lb/l;->bHj:Lokhttp3/MultipartBody$a;
+    iget-object v2, p0, Lb/l;->bHD:Lokhttp3/MultipartBody$a;
 
     if-eqz v2, :cond_3
 
-    iget-object v1, v2, Lokhttp3/MultipartBody$a;->buh:Ljava/util/List;
+    iget-object v1, v2, Lokhttp3/MultipartBody$a;->buB:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
 
@@ -441,11 +441,11 @@
 
     new-instance v1, Lokhttp3/MultipartBody;
 
-    iget-object v3, v2, Lokhttp3/MultipartBody$a;->bue:Lokio/ByteString;
+    iget-object v3, v2, Lokhttp3/MultipartBody$a;->buy:Lokio/ByteString;
 
-    iget-object v4, v2, Lokhttp3/MultipartBody$a;->bui:Lokhttp3/MediaType;
+    iget-object v4, v2, Lokhttp3/MultipartBody$a;->buC:Lokhttp3/MediaType;
 
-    iget-object v2, v2, Lokhttp3/MultipartBody$a;->buh:Ljava/util/List;
+    iget-object v2, v2, Lokhttp3/MultipartBody$a;->buB:Ljava/util/List;
 
     invoke-direct {v1, v3, v4, v2}, Lokhttp3/MultipartBody;-><init>(Lokio/ByteString;Lokhttp3/MediaType;Ljava/util/List;)V
 
@@ -461,7 +461,7 @@
     throw v0
 
     :cond_3
-    iget-boolean v2, p0, Lb/l;->bHi:Z
+    iget-boolean v2, p0, Lb/l;->bHC:Z
 
     if-eqz v2, :cond_4
 
@@ -477,7 +477,7 @@
 
     :cond_4
     :goto_1
-    iget-object v2, p0, Lb/l;->bug:Lokhttp3/MediaType;
+    iget-object v2, p0, Lb/l;->buA:Lokhttp3/MediaType;
 
     if-eqz v2, :cond_6
 
@@ -492,7 +492,7 @@
     goto :goto_2
 
     :cond_5
-    iget-object v3, p0, Lb/l;->bHh:Lokhttp3/w$a;
+    iget-object v3, p0, Lb/l;->bHB:Lokhttp3/w$a;
 
     invoke-virtual {v2}, Lokhttp3/MediaType;->toString()Ljava/lang/String;
 
@@ -504,7 +504,7 @@
 
     :cond_6
     :goto_2
-    iget-object v2, p0, Lb/l;->bHh:Lokhttp3/w$a;
+    iget-object v2, p0, Lb/l;->bHB:Lokhttp3/w$a;
 
     invoke-virtual {v2, v0}, Lokhttp3/w$a;->b(Lokhttp3/s;)Lokhttp3/w$a;
 
@@ -516,7 +516,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object v0
 
@@ -531,7 +531,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lb/l;->bHe:Lokhttp3/s;
+    iget-object v2, p0, Lb/l;->bHy:Lokhttp3/s;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -539,7 +539,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lb/l;->bHf:Ljava/lang/String;
+    iget-object v2, p0, Lb/l;->bHz:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -563,13 +563,13 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {p2}, Lokhttp3/MediaType;->eo(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {p2}, Lokhttp3/MediaType;->ei(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object p1
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lb/l;->bug:Lokhttp3/MediaType;
+    iput-object p1, p0, Lb/l;->buA:Lokhttp3/MediaType;
 
     return-void
 
@@ -591,7 +591,7 @@
     throw p1
 
     :cond_1
-    iget-object v0, p0, Lb/l;->bHh:Lokhttp3/w$a;
+    iget-object v0, p0, Lb/l;->bHB:Lokhttp3/w$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/w$a;->aq(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
@@ -601,7 +601,7 @@
 .method final c(Lokhttp3/Headers;Lokhttp3/RequestBody;)V
     .locals 1
 
-    iget-object v0, p0, Lb/l;->bHj:Lokhttp3/MultipartBody$a;
+    iget-object v0, p0, Lb/l;->bHD:Lokhttp3/MultipartBody$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/MultipartBody$a;->a(Lokhttp3/Headers;Lokhttp3/RequestBody;)Lokhttp3/MultipartBody$a;
 
@@ -615,25 +615,25 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lb/l;->bHf:Ljava/lang/String;
+    iget-object v0, p0, Lb/l;->bHz:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lb/l;->bHe:Lokhttp3/s;
+    iget-object v1, p0, Lb/l;->bHy:Lokhttp3/s;
 
-    invoke-virtual {v1, v0}, Lokhttp3/s;->ej(Ljava/lang/String;)Lokhttp3/s$a;
+    invoke-virtual {v1, v0}, Lokhttp3/s;->ed(Ljava/lang/String;)Lokhttp3/s$a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lb/l;->bHg:Lokhttp3/s$a;
+    iput-object v0, p0, Lb/l;->bHA:Lokhttp3/s$a;
 
-    iget-object v0, p0, Lb/l;->bHg:Lokhttp3/s$a;
+    iget-object v0, p0, Lb/l;->bHA:Lokhttp3/s$a;
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lb/l;->bHf:Ljava/lang/String;
+    iput-object v0, p0, Lb/l;->bHz:Ljava/lang/String;
 
     goto :goto_0
 
@@ -646,7 +646,7 @@
 
     invoke-direct {p2, p3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object p3, p0, Lb/l;->bHe:Lokhttp3/s;
+    iget-object p3, p0, Lb/l;->bHy:Lokhttp3/s;
 
     invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -654,7 +654,7 @@
 
     invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p3, p0, Lb/l;->bHf:Ljava/lang/String;
+    iget-object p3, p0, Lb/l;->bHz:Ljava/lang/String;
 
     invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -670,14 +670,14 @@
     :goto_0
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lb/l;->bHg:Lokhttp3/s$a;
+    iget-object p3, p0, Lb/l;->bHA:Lokhttp3/s$a;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/s$a;->ao(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/s$a;
 
     return-void
 
     :cond_2
-    iget-object p3, p0, Lb/l;->bHg:Lokhttp3/s$a;
+    iget-object p3, p0, Lb/l;->bHA:Lokhttp3/s$a;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/s$a;->an(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/s$a;
 
@@ -689,14 +689,14 @@
 
     if-eqz p3, :cond_0
 
-    iget-object p3, p0, Lb/l;->bHk:Lokhttp3/q$a;
+    iget-object p3, p0, Lb/l;->bHE:Lokhttp3/q$a;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/q$a;->ai(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/q$a;
 
     return-void
 
     :cond_0
-    iget-object p3, p0, Lb/l;->bHk:Lokhttp3/q$a;
+    iget-object p3, p0, Lb/l;->bHE:Lokhttp3/q$a;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/q$a;->ah(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/q$a;
 
diff --git a/com.discord/smali/b/m.smali b/com.discord/smali/b/m.smali
index a47edcdd5f..8d01a83ce8 100644
--- a/com.discord/smali/b/m.smali
+++ b/com.discord/smali/b/m.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field public final bHl:Lokhttp3/Response;
+.field public final bHF:Lokhttp3/Response;
 
-.field public final bHm:Ljava/lang/Object;
+.field public final bHG:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field public final bHn:Lokhttp3/x;
+.field public final bHH:Lokhttp3/x;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -57,11 +57,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/m;->bHl:Lokhttp3/Response;
+    iput-object p1, p0, Lb/m;->bHF:Lokhttp3/Response;
 
-    iput-object p2, p0, Lb/m;->bHm:Ljava/lang/Object;
+    iput-object p2, p0, Lb/m;->bHG:Ljava/lang/Object;
 
-    iput-object p3, p0, Lb/m;->bHn:Lokhttp3/x;
+    iput-object p3, p0, Lb/m;->bHH:Lokhttp3/x;
 
     return-void
 .end method
@@ -88,7 +88,7 @@
 
     invoke-static {p1, v0}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lokhttp3/Response;->zW()Z
+    invoke-virtual {p1}, Lokhttp3/Response;->zS()Z
 
     move-result v0
 
@@ -135,7 +135,7 @@
 
     invoke-static {p1, v0}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lokhttp3/Response;->zW()Z
+    invoke-virtual {p1}, Lokhttp3/Response;->zS()Z
 
     move-result v0
 
@@ -161,10 +161,10 @@
 
 
 # virtual methods
-.method public final JI()Lokhttp3/Response;
+.method public final Jv()Lokhttp3/Response;
     .locals 1
 
-    iget-object v0, p0, Lb/m;->bHl:Lokhttp3/Response;
+    iget-object v0, p0, Lb/m;->bHF:Lokhttp3/Response;
 
     return-object v0
 .end method
@@ -172,7 +172,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lb/m;->bHl:Lokhttp3/Response;
+    iget-object v0, p0, Lb/m;->bHF:Lokhttp3/Response;
 
     invoke-virtual {v0}, Lokhttp3/Response;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali/b/n$1.smali b/com.discord/smali/b/n$1.smali
index d2e936d244..85d4754b39 100644
--- a/com.discord/smali/b/n$1.smali
+++ b/com.discord/smali/b/n$1.smali
@@ -18,28 +18,28 @@
 
 
 # instance fields
-.field private final bHt:Lb/k;
+.field private final bHN:Lb/k;
 
-.field final synthetic bHu:Ljava/lang/Class;
+.field final synthetic bHO:Ljava/lang/Class;
 
-.field final synthetic bHv:Lb/n;
+.field final synthetic bHP:Lb/n;
 
 
 # direct methods
 .method constructor <init>(Lb/n;Ljava/lang/Class;)V
     .locals 0
 
-    iput-object p1, p0, Lb/n$1;->bHv:Lb/n;
+    iput-object p1, p0, Lb/n$1;->bHP:Lb/n;
 
-    iput-object p2, p0, Lb/n$1;->bHu:Ljava/lang/Class;
+    iput-object p2, p0, Lb/n$1;->bHO:Ljava/lang/Class;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lb/k;->JF()Lb/k;
+    invoke-static {}, Lb/k;->Js()Lb/k;
 
     move-result-object p1
 
-    iput-object p1, p0, Lb/n$1;->bHt:Lb/k;
+    iput-object p1, p0, Lb/n$1;->bHN:Lb/k;
 
     return-void
 .end method
@@ -73,7 +73,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lb/n$1;->bHt:Lb/k;
+    iget-object v0, p0, Lb/n$1;->bHN:Lb/k;
 
     invoke-virtual {v0, p2}, Lb/k;->a(Ljava/lang/reflect/Method;)Z
 
@@ -81,9 +81,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lb/n$1;->bHt:Lb/k;
+    iget-object v0, p0, Lb/n$1;->bHN:Lb/k;
 
-    iget-object v1, p0, Lb/n$1;->bHu:Ljava/lang/Class;
+    iget-object v1, p0, Lb/n$1;->bHO:Ljava/lang/Class;
 
     invoke-virtual {v0, p2, v1, p1, p3}, Lb/k;->a(Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -92,7 +92,7 @@
     return-object p1
 
     :cond_1
-    iget-object p1, p0, Lb/n$1;->bHv:Lb/n;
+    iget-object p1, p0, Lb/n$1;->bHP:Lb/n;
 
     invoke-virtual {p1, p2}, Lb/n;->b(Ljava/lang/reflect/Method;)Lb/o;
 
@@ -102,7 +102,7 @@
 
     invoke-direct {p2, p1, p3}, Lb/i;-><init>(Lb/o;[Ljava/lang/Object;)V
 
-    iget-object p1, p1, Lb/o;->bHy:Lb/c;
+    iget-object p1, p1, Lb/o;->bHS:Lb/c;
 
     invoke-interface {p1, p2}, Lb/c;->a(Lb/b;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/b/n$a.smali b/com.discord/smali/b/n$a.smali
index 2125b8afd9..33547ba6c7 100644
--- a/com.discord/smali/b/n$a.smali
+++ b/com.discord/smali/b/n$a.smali
@@ -15,19 +15,12 @@
 
 
 # instance fields
-.field private bGG:Ljava/util/concurrent/Executor;
+.field private bHJ:Lokhttp3/e$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bHe:Lokhttp3/s;
-
-.field private bHp:Lokhttp3/e$a;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private final bHq:Ljava/util/List;
+.field private final bHK:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,7 +30,7 @@
     .end annotation
 .end field
 
-.field private final bHr:Ljava/util/List;
+.field private final bHL:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -47,16 +40,23 @@
     .end annotation
 .end field
 
-.field private bHs:Z
+.field private bHM:Z
 
-.field private final bHt:Lb/k;
+.field private final bHN:Lb/k;
+
+.field private bHa:Ljava/util/concurrent/Executor;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private bHy:Lokhttp3/s;
 
 
 # direct methods
 .method public constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lb/k;->JF()Lb/k;
+    invoke-static {}, Lb/k;->Js()Lb/k;
 
     move-result-object v0
 
@@ -74,17 +74,17 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lb/n$a;->bHq:Ljava/util/List;
+    iput-object v0, p0, Lb/n$a;->bHK:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lb/n$a;->bHr:Ljava/util/List;
+    iput-object v0, p0, Lb/n$a;->bHL:Ljava/util/List;
 
-    iput-object p1, p0, Lb/n$a;->bHt:Lb/k;
+    iput-object p1, p0, Lb/n$a;->bHN:Lb/k;
 
-    iget-object p1, p0, Lb/n$a;->bHq:Ljava/util/List;
+    iget-object p1, p0, Lb/n$a;->bHK:Ljava/util/List;
 
     new-instance v0, Lb/a;
 
@@ -97,14 +97,14 @@
 
 
 # virtual methods
-.method public final JJ()Lb/n;
+.method public final Jw()Lb/n;
     .locals 8
 
-    iget-object v0, p0, Lb/n$a;->bHe:Lokhttp3/s;
+    iget-object v0, p0, Lb/n$a;->bHy:Lokhttp3/s;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lb/n$a;->bHp:Lokhttp3/e$a;
+    iget-object v0, p0, Lb/n$a;->bHJ:Lokhttp3/e$a;
 
     if-nez v0, :cond_0
 
@@ -115,13 +115,13 @@
     :cond_0
     move-object v2, v0
 
-    iget-object v0, p0, Lb/n$a;->bGG:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lb/n$a;->bHa:Ljava/util/concurrent/Executor;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lb/n$a;->bHt:Lb/k;
+    iget-object v0, p0, Lb/n$a;->bHN:Lb/k;
 
-    invoke-virtual {v0}, Lb/k;->JH()Ljava/util/concurrent/Executor;
+    invoke-virtual {v0}, Lb/k;->Ju()Ljava/util/concurrent/Executor;
 
     move-result-object v0
 
@@ -130,11 +130,11 @@
 
     new-instance v5, Ljava/util/ArrayList;
 
-    iget-object v0, p0, Lb/n$a;->bHr:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->bHL:Ljava/util/List;
 
     invoke-direct {v5, v0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget-object v0, p0, Lb/n$a;->bHt:Lb/k;
+    iget-object v0, p0, Lb/n$a;->bHN:Lb/k;
 
     invoke-virtual {v0, v6}, Lb/k;->a(Ljava/util/concurrent/Executor;)Lb/c$a;
 
@@ -144,15 +144,15 @@
 
     new-instance v4, Ljava/util/ArrayList;
 
-    iget-object v0, p0, Lb/n$a;->bHq:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->bHK:Ljava/util/List;
 
     invoke-direct {v4, v0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
     new-instance v0, Lb/n;
 
-    iget-object v3, p0, Lb/n$a;->bHe:Lokhttp3/s;
+    iget-object v3, p0, Lb/n$a;->bHy:Lokhttp3/s;
 
-    iget-boolean v7, p0, Lb/n$a;->bHs:Z
+    iget-boolean v7, p0, Lb/n$a;->bHM:Z
 
     move-object v1, v0
 
@@ -173,7 +173,7 @@
 .method public final a(Lb/c$a;)Lb/n$a;
     .locals 2
 
-    iget-object v0, p0, Lb/n$a;->bHr:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->bHL:Ljava/util/List;
 
     const-string v1, "factory == null"
 
@@ -189,7 +189,7 @@
 .method public final a(Lb/e$a;)Lb/n$a;
     .locals 2
 
-    iget-object v0, p0, Lb/n$a;->bHq:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->bHK:Ljava/util/List;
 
     const-string v1, "factory == null"
 
@@ -221,19 +221,19 @@
 
     check-cast p1, Lokhttp3/e$a;
 
-    iput-object p1, p0, Lb/n$a;->bHp:Lokhttp3/e$a;
+    iput-object p1, p0, Lb/n$a;->bHJ:Lokhttp3/e$a;
 
     return-object p0
 .end method
 
-.method public final ff(Ljava/lang/String;)Lb/n$a;
+.method public final fa(Ljava/lang/String;)Lb/n$a;
     .locals 2
 
     const-string v0, "baseUrl == null"
 
     invoke-static {p1, v0}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    invoke-static {p1}, Lokhttp3/s;->ek(Ljava/lang/String;)Lokhttp3/s;
+    invoke-static {p1}, Lokhttp3/s;->ee(Ljava/lang/String;)Lokhttp3/s;
 
     move-result-object v1
 
@@ -241,7 +241,7 @@
 
     invoke-static {v1, v0}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object p1, v1, Lokhttp3/s;->btK:Ljava/util/List;
+    iget-object p1, v1, Lokhttp3/s;->bue:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -261,7 +261,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object v1, p0, Lb/n$a;->bHe:Lokhttp3/s;
+    iput-object v1, p0, Lb/n$a;->bHy:Lokhttp3/s;
 
     return-object p0
 
diff --git a/com.discord/smali/b/n.smali b/com.discord/smali/b/n.smali
index 5c50392722..8009f19731 100644
--- a/com.discord/smali/b/n.smali
+++ b/com.discord/smali/b/n.smali
@@ -12,14 +12,7 @@
 
 
 # instance fields
-.field final bGG:Ljava/util/concurrent/Executor;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field final bHe:Lokhttp3/s;
-
-.field private final bHo:Ljava/util/Map;
+.field private final bHI:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -30,9 +23,9 @@
     .end annotation
 .end field
 
-.field final bHp:Lokhttp3/e$a;
+.field final bHJ:Lokhttp3/e$a;
 
-.field final bHq:Ljava/util/List;
+.field final bHK:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -42,7 +35,7 @@
     .end annotation
 .end field
 
-.field final bHr:Ljava/util/List;
+.field final bHL:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -52,7 +45,14 @@
     .end annotation
 .end field
 
-.field final bHs:Z
+.field final bHM:Z
+
+.field final bHa:Ljava/util/concurrent/Executor;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field final bHy:Lokhttp3/s;
 
 
 # direct methods
@@ -84,27 +84,27 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
 
-    iput-object v0, p0, Lb/n;->bHo:Ljava/util/Map;
+    iput-object v0, p0, Lb/n;->bHI:Ljava/util/Map;
 
-    iput-object p1, p0, Lb/n;->bHp:Lokhttp3/e$a;
+    iput-object p1, p0, Lb/n;->bHJ:Lokhttp3/e$a;
 
-    iput-object p2, p0, Lb/n;->bHe:Lokhttp3/s;
+    iput-object p2, p0, Lb/n;->bHy:Lokhttp3/s;
 
     invoke-static {p3}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
 
     move-result-object p1
 
-    iput-object p1, p0, Lb/n;->bHq:Ljava/util/List;
+    iput-object p1, p0, Lb/n;->bHK:Ljava/util/List;
 
     invoke-static {p4}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
 
     move-result-object p1
 
-    iput-object p1, p0, Lb/n;->bHr:Ljava/util/List;
+    iput-object p1, p0, Lb/n;->bHL:Ljava/util/List;
 
-    iput-object p5, p0, Lb/n;->bGG:Ljava/util/concurrent/Executor;
+    iput-object p5, p0, Lb/n;->bHa:Ljava/util/concurrent/Executor;
 
-    iput-boolean p6, p0, Lb/n;->bHs:Z
+    iput-boolean p6, p0, Lb/n;->bHM:Z
 
     return-void
 .end method
@@ -125,13 +125,13 @@
 
     invoke-static {p1}, Lb/p;->Z(Ljava/lang/Class;)V
 
-    iget-boolean v0, p0, Lb/n;->bHs:Z
+    iget-boolean v0, p0, Lb/n;->bHM:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lb/k;->JF()Lb/k;
+    invoke-static {}, Lb/k;->Js()Lb/k;
 
     move-result-object v0
 
@@ -215,7 +215,7 @@
 
     invoke-static {p3, p2}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object p2, p0, Lb/n;->bHq:Ljava/util/List;
+    iget-object p2, p0, Lb/n;->bHK:Ljava/util/List;
 
     const/4 p3, 0x0
 
@@ -225,7 +225,7 @@
 
     add-int/lit8 p2, p2, 0x1
 
-    iget-object p3, p0, Lb/n;->bHq:Ljava/util/List;
+    iget-object p3, p0, Lb/n;->bHK:Ljava/util/List;
 
     invoke-interface {p3}, Ljava/util/List;->size()I
 
@@ -236,7 +236,7 @@
     :goto_0
     if-ge v0, p3, :cond_1
 
-    iget-object v1, p0, Lb/n;->bHq:Ljava/util/List;
+    iget-object v1, p0, Lb/n;->bHK:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -274,7 +274,7 @@
 
     invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p1, p0, Lb/n;->bHq:Ljava/util/List;
+    iget-object p1, p0, Lb/n;->bHK:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -287,7 +287,7 @@
 
     invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v0, p0, Lb/n;->bHq:Ljava/util/List;
+    iget-object v0, p0, Lb/n;->bHK:Ljava/util/List;
 
     invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -353,7 +353,7 @@
 
     invoke-static {p2, p1}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object p1, p0, Lb/n;->bHq:Ljava/util/List;
+    iget-object p1, p0, Lb/n;->bHK:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -364,7 +364,7 @@
     :goto_0
     if-ge p2, p1, :cond_0
 
-    iget-object v0, p0, Lb/n;->bHq:Ljava/util/List;
+    iget-object v0, p0, Lb/n;->bHK:Ljava/util/List;
 
     invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -373,7 +373,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lb/a$d;->bGB:Lb/a$d;
+    sget-object p1, Lb/a$d;->bGV:Lb/a$d;
 
     return-object p1
 .end method
@@ -390,7 +390,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/n;->bHo:Ljava/util/Map;
+    iget-object v0, p0, Lb/n;->bHI:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -403,12 +403,12 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lb/n;->bHo:Ljava/util/Map;
+    iget-object v0, p0, Lb/n;->bHI:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lb/n;->bHo:Ljava/util/Map;
+    iget-object v1, p0, Lb/n;->bHI:Ljava/util/Map;
 
     invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -422,21 +422,21 @@
 
     invoke-direct {v1, p0, p1}, Lb/o$a;-><init>(Lb/n;Ljava/lang/reflect/Method;)V
 
-    invoke-virtual {v1}, Lb/o$a;->JK()Lb/c;
+    invoke-virtual {v1}, Lb/o$a;->Jx()Lb/c;
 
     move-result-object v2
 
-    iput-object v2, v1, Lb/o$a;->bHy:Lb/c;
+    iput-object v2, v1, Lb/o$a;->bHS:Lb/c;
 
-    iget-object v2, v1, Lb/o$a;->bHy:Lb/c;
+    iget-object v2, v1, Lb/o$a;->bHS:Lb/c;
 
-    invoke-interface {v2}, Lb/c;->Jz()Ljava/lang/reflect/Type;
+    invoke-interface {v2}, Lb/c;->Jm()Ljava/lang/reflect/Type;
 
     move-result-object v2
 
-    iput-object v2, v1, Lb/o$a;->bHI:Ljava/lang/reflect/Type;
+    iput-object v2, v1, Lb/o$a;->bIc:Ljava/lang/reflect/Type;
 
-    iget-object v2, v1, Lb/o$a;->bHI:Ljava/lang/reflect/Type;
+    iget-object v2, v1, Lb/o$a;->bIc:Ljava/lang/reflect/Type;
 
     const-class v3, Lb/m;
 
@@ -446,19 +446,19 @@
 
     if-eq v2, v3, :cond_20
 
-    iget-object v2, v1, Lb/o$a;->bHI:Ljava/lang/reflect/Type;
+    iget-object v2, v1, Lb/o$a;->bIc:Ljava/lang/reflect/Type;
 
     const-class v3, Lokhttp3/Response;
 
     if-eq v2, v3, :cond_20
 
-    invoke-virtual {v1}, Lb/o$a;->JL()Lb/e;
+    invoke-virtual {v1}, Lb/o$a;->Jy()Lb/e;
 
     move-result-object v2
 
-    iput-object v2, v1, Lb/o$a;->bHz:Lb/e;
+    iput-object v2, v1, Lb/o$a;->bHT:Lb/e;
 
-    iget-object v2, v1, Lb/o$a;->bHF:[Ljava/lang/annotation/Annotation;
+    iget-object v2, v1, Lb/o$a;->bHZ:[Ljava/lang/annotation/Annotation;
 
     array-length v3, v2
 
@@ -521,7 +521,7 @@
 
     const-class v7, Ljava/lang/Void;
 
-    iget-object v8, v1, Lb/o$a;->bHI:Ljava/lang/reflect/Type;
+    iget-object v8, v1, Lb/o$a;->bIc:Ljava/lang/reflect/Type;
 
     invoke-virtual {v7, v8}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -621,11 +621,11 @@
 
     move-result-object v7
 
-    invoke-interface {v8}, Lb/c/h;->JP()Ljava/lang/String;
+    invoke-interface {v8}, Lb/c/h;->JC()Ljava/lang/String;
 
     move-result-object v9
 
-    invoke-interface {v8}, Lb/c/h;->JQ()Z
+    invoke-interface {v8}, Lb/c/h;->JD()Z
 
     move-result v8
 
@@ -652,7 +652,7 @@
 
     move-result-object v7
 
-    iput-object v7, v1, Lb/o$a;->buj:Lokhttp3/Headers;
+    iput-object v7, v1, Lb/o$a;->buD:Lokhttp3/Headers;
 
     goto :goto_1
 
@@ -672,11 +672,11 @@
 
     if-eqz v9, :cond_d
 
-    iget-boolean v8, v1, Lb/o$a;->bHB:Z
+    iget-boolean v8, v1, Lb/o$a;->bHV:Z
 
     if-nez v8, :cond_c
 
-    iput-boolean v7, v1, Lb/o$a;->bHC:Z
+    iput-boolean v7, v1, Lb/o$a;->bHW:Z
 
     goto :goto_1
 
@@ -696,11 +696,11 @@
 
     if-eqz v8, :cond_f
 
-    iget-boolean v8, v1, Lb/o$a;->bHC:Z
+    iget-boolean v8, v1, Lb/o$a;->bHW:Z
 
     if-nez v8, :cond_e
 
-    iput-boolean v7, v1, Lb/o$a;->bHB:Z
+    iput-boolean v7, v1, Lb/o$a;->bHV:Z
 
     goto :goto_1
 
@@ -722,19 +722,19 @@
     goto/16 :goto_0
 
     :cond_10
-    iget-object v2, v1, Lb/o$a;->bHA:Ljava/lang/String;
+    iget-object v2, v1, Lb/o$a;->bHU:Ljava/lang/String;
 
     if-eqz v2, :cond_1f
 
-    iget-boolean v2, v1, Lb/o$a;->bHi:Z
+    iget-boolean v2, v1, Lb/o$a;->bHC:Z
 
     if-nez v2, :cond_13
 
-    iget-boolean v2, v1, Lb/o$a;->bHC:Z
+    iget-boolean v2, v1, Lb/o$a;->bHW:Z
 
     if-nez v2, :cond_12
 
-    iget-boolean v2, v1, Lb/o$a;->bHB:Z
+    iget-boolean v2, v1, Lb/o$a;->bHV:Z
 
     if-nez v2, :cond_11
 
@@ -764,20 +764,20 @@
 
     :cond_13
     :goto_2
-    iget-object v2, v1, Lb/o$a;->bHG:[[Ljava/lang/annotation/Annotation;
+    iget-object v2, v1, Lb/o$a;->bIa:[[Ljava/lang/annotation/Annotation;
 
     array-length v2, v2
 
     new-array v3, v2, [Lb/j;
 
-    iput-object v3, v1, Lb/o$a;->bHD:[Lb/j;
+    iput-object v3, v1, Lb/o$a;->bHX:[Lb/j;
 
     const/4 v3, 0x0
 
     :goto_3
     if-ge v3, v2, :cond_16
 
-    iget-object v6, v1, Lb/o$a;->bHH:[Ljava/lang/reflect/Type;
+    iget-object v6, v1, Lb/o$a;->bIb:[Ljava/lang/reflect/Type;
 
     aget-object v6, v6, v3
 
@@ -787,13 +787,13 @@
 
     if-nez v8, :cond_15
 
-    iget-object v8, v1, Lb/o$a;->bHG:[[Ljava/lang/annotation/Annotation;
+    iget-object v8, v1, Lb/o$a;->bIa:[[Ljava/lang/annotation/Annotation;
 
     aget-object v8, v8, v3
 
     if-eqz v8, :cond_14
 
-    iget-object v9, v1, Lb/o$a;->bHD:[Lb/j;
+    iget-object v9, v1, Lb/o$a;->bHX:[Lb/j;
 
     invoke-virtual {v1, v3, v6, v8}, Lb/o$a;->a(ILjava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/j;
 
@@ -830,11 +830,11 @@
     throw p1
 
     :cond_16
-    iget-object v2, v1, Lb/o$a;->bHf:Ljava/lang/String;
+    iget-object v2, v1, Lb/o$a;->bHz:Ljava/lang/String;
 
     if-nez v2, :cond_18
 
-    iget-boolean v2, v1, Lb/o$a;->bHO:Z
+    iget-boolean v2, v1, Lb/o$a;->bIi:Z
 
     if-eqz v2, :cond_17
 
@@ -845,7 +845,7 @@
 
     new-array v2, v7, [Ljava/lang/Object;
 
-    iget-object v3, v1, Lb/o$a;->bHA:Ljava/lang/String;
+    iget-object v3, v1, Lb/o$a;->bHU:Ljava/lang/String;
 
     aput-object v3, v2, v5
 
@@ -857,7 +857,11 @@
 
     :cond_18
     :goto_4
-    iget-boolean v2, v1, Lb/o$a;->bHB:Z
+    iget-boolean v2, v1, Lb/o$a;->bHV:Z
+
+    if-nez v2, :cond_1a
+
+    iget-boolean v2, v1, Lb/o$a;->bHW:Z
 
     if-nez v2, :cond_1a
 
@@ -865,11 +869,7 @@
 
     if-nez v2, :cond_1a
 
-    iget-boolean v2, v1, Lb/o$a;->bHi:Z
-
-    if-nez v2, :cond_1a
-
-    iget-boolean v2, v1, Lb/o$a;->bHL:Z
+    iget-boolean v2, v1, Lb/o$a;->bIf:Z
 
     if-nez v2, :cond_19
 
@@ -888,11 +888,11 @@
 
     :cond_1a
     :goto_5
-    iget-boolean v2, v1, Lb/o$a;->bHB:Z
+    iget-boolean v2, v1, Lb/o$a;->bHV:Z
 
     if-eqz v2, :cond_1c
 
-    iget-boolean v2, v1, Lb/o$a;->bHJ:Z
+    iget-boolean v2, v1, Lb/o$a;->bId:Z
 
     if-eqz v2, :cond_1b
 
@@ -911,11 +911,11 @@
 
     :cond_1c
     :goto_6
-    iget-boolean v2, v1, Lb/o$a;->bHC:Z
+    iget-boolean v2, v1, Lb/o$a;->bHW:Z
 
     if-eqz v2, :cond_1e
 
-    iget-boolean v2, v1, Lb/o$a;->bHK:Z
+    iget-boolean v2, v1, Lb/o$a;->bIe:Z
 
     if-eqz v2, :cond_1d
 
@@ -938,7 +938,7 @@
 
     invoke-direct {v2, v1}, Lb/o;-><init>(Lb/o$a;)V
 
-    iget-object v1, p0, Lb/n;->bHo:Ljava/util/Map;
+    iget-object v1, p0, Lb/n;->bHI:Ljava/util/Map;
 
     invoke-interface {v1, p1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -964,7 +964,7 @@
 
     invoke-direct {p1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, v1, Lb/o$a;->bHI:Ljava/lang/reflect/Type;
+    iget-object v2, v1, Lb/o$a;->bIc:Ljava/lang/reflect/Type;
 
     invoke-static {v2}, Lb/p;->c(Ljava/lang/reflect/Type;)Ljava/lang/Class;
 
diff --git a/com.discord/smali/b/o$a.smali b/com.discord/smali/b/o$a.smali
index 27099717ef..a270513366 100644
--- a/com.discord/smali/b/o$a.smali
+++ b/com.discord/smali/b/o$a.smali
@@ -26,59 +26,9 @@
 
 
 # instance fields
-.field bHA:Ljava/lang/String;
-
-.field bHB:Z
-
 .field bHC:Z
 
-.field bHD:[Lb/j;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[",
-            "Lb/j<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-.field final bHE:Lb/n;
-
-.field final bHF:[Ljava/lang/annotation/Annotation;
-
-.field final bHG:[[Ljava/lang/annotation/Annotation;
-
-.field final bHH:[Ljava/lang/reflect/Type;
-
-.field bHI:Ljava/lang/reflect/Type;
-
-.field bHJ:Z
-
-.field bHK:Z
-
-.field bHL:Z
-
-.field bHM:Z
-
-.field bHN:Z
-
-.field bHO:Z
-
-.field bHP:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field bHf:Ljava/lang/String;
-
-.field bHi:Z
-
-.field bHy:Lb/c;
+.field bHS:Lb/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/c<",
@@ -87,7 +37,7 @@
     .end annotation
 .end field
 
-.field bHz:Lb/e;
+.field bHT:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -97,11 +47,61 @@
     .end annotation
 .end field
 
-.field final bkw:Ljava/lang/reflect/Method;
+.field bHU:Ljava/lang/String;
 
-.field bug:Lokhttp3/MediaType;
+.field bHV:Z
 
-.field buj:Lokhttp3/Headers;
+.field bHW:Z
+
+.field bHX:[Lb/j;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[",
+            "Lb/j<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+.field final bHY:Lb/n;
+
+.field final bHZ:[Ljava/lang/annotation/Annotation;
+
+.field bHz:Ljava/lang/String;
+
+.field final bIa:[[Ljava/lang/annotation/Annotation;
+
+.field final bIb:[Ljava/lang/reflect/Type;
+
+.field bIc:Ljava/lang/reflect/Type;
+
+.field bId:Z
+
+.field bIe:Z
+
+.field bIf:Z
+
+.field bIg:Z
+
+.field bIh:Z
+
+.field bIi:Z
+
+.field bIj:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field final bkQ:Ljava/lang/reflect/Method;
+
+.field buA:Lokhttp3/MediaType;
+
+.field buD:Lokhttp3/Headers;
 
 
 # direct methods
@@ -110,27 +110,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/o$a;->bHE:Lb/n;
+    iput-object p1, p0, Lb/o$a;->bHY:Lb/n;
 
-    iput-object p2, p0, Lb/o$a;->bkw:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lb/o$a;->bkQ:Ljava/lang/reflect/Method;
 
     invoke-virtual {p2}, Ljava/lang/reflect/Method;->getAnnotations()[Ljava/lang/annotation/Annotation;
 
     move-result-object p1
 
-    iput-object p1, p0, Lb/o$a;->bHF:[Ljava/lang/annotation/Annotation;
+    iput-object p1, p0, Lb/o$a;->bHZ:[Ljava/lang/annotation/Annotation;
 
     invoke-virtual {p2}, Ljava/lang/reflect/Method;->getGenericParameterTypes()[Ljava/lang/reflect/Type;
 
     move-result-object p1
 
-    iput-object p1, p0, Lb/o$a;->bHH:[Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lb/o$a;->bIb:[Ljava/lang/reflect/Type;
 
     invoke-virtual {p2}, Ljava/lang/reflect/Method;->getParameterAnnotations()[[Ljava/lang/annotation/Annotation;
 
     move-result-object p1
 
-    iput-object p1, p0, Lb/o$a;->bHG:[[Ljava/lang/annotation/Annotation;
+    iput-object p1, p0, Lb/o$a;->bIa:[[Ljava/lang/annotation/Annotation;
 
     return-void
 .end method
@@ -160,23 +160,23 @@
 
     if-eqz v0, :cond_6
 
-    iget-boolean p3, p0, Lb/o$a;->bHO:Z
+    iget-boolean p3, p0, Lb/o$a;->bIi:Z
 
     if-nez p3, :cond_5
 
-    iget-boolean p3, p0, Lb/o$a;->bHM:Z
+    iget-boolean p3, p0, Lb/o$a;->bIg:Z
 
     if-nez p3, :cond_4
 
-    iget-boolean p3, p0, Lb/o$a;->bHN:Z
+    iget-boolean p3, p0, Lb/o$a;->bIh:Z
 
     if-nez p3, :cond_3
 
-    iget-object p3, p0, Lb/o$a;->bHf:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->bHz:Ljava/lang/String;
 
     if-nez p3, :cond_2
 
-    iput-boolean v2, p0, Lb/o$a;->bHO:Z
+    iput-boolean v2, p0, Lb/o$a;->bIi:Z
 
     const-class p3, Lokhttp3/s;
 
@@ -232,7 +232,7 @@
     :cond_2
     new-array p2, v2, [Ljava/lang/Object;
 
-    iget-object p3, p0, Lb/o$a;->bHA:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->bHU:Ljava/lang/String;
 
     aput-object p3, p2, v3
 
@@ -282,19 +282,19 @@
 
     if-eqz v0, :cond_c
 
-    iget-boolean v0, p0, Lb/o$a;->bHN:Z
+    iget-boolean v0, p0, Lb/o$a;->bIh:Z
 
     if-nez v0, :cond_b
 
-    iget-boolean v0, p0, Lb/o$a;->bHO:Z
+    iget-boolean v0, p0, Lb/o$a;->bIi:Z
 
     if-nez v0, :cond_a
 
-    iget-object v0, p0, Lb/o$a;->bHf:Ljava/lang/String;
+    iget-object v0, p0, Lb/o$a;->bHz:Ljava/lang/String;
 
     if-eqz v0, :cond_9
 
-    iput-boolean v2, p0, Lb/o$a;->bHM:Z
+    iput-boolean v2, p0, Lb/o$a;->bIg:Z
 
     check-cast p4, Lb/c/s;
 
@@ -302,7 +302,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lb/o;->bHx:Ljava/util/regex/Pattern;
+    sget-object v1, Lb/o;->bHR:Ljava/util/regex/Pattern;
 
     invoke-virtual {v1, v0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -314,7 +314,7 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v1, p0, Lb/o$a;->bHP:Ljava/util/Set;
+    iget-object v1, p0, Lb/o$a;->bIj:Ljava/util/Set;
 
     invoke-interface {v1, v0}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -322,7 +322,7 @@
 
     if-eqz v1, :cond_7
 
-    iget-object p1, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p1, p2, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -330,7 +330,7 @@
 
     new-instance p2, Lb/j$h;
 
-    invoke-interface {p4}, Lb/c/s;->JO()Z
+    invoke-interface {p4}, Lb/c/s;->JB()Z
 
     move-result p3
 
@@ -341,7 +341,7 @@
     :cond_7
     new-array p2, v4, [Ljava/lang/Object;
 
-    iget-object p3, p0, Lb/o$a;->bHf:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->bHz:Ljava/lang/String;
 
     aput-object p3, p2, v3
 
@@ -358,7 +358,7 @@
     :cond_8
     new-array p2, v4, [Ljava/lang/Object;
 
-    sget-object p3, Lb/o;->bHw:Ljava/util/regex/Pattern;
+    sget-object p3, Lb/o;->bHQ:Ljava/util/regex/Pattern;
 
     invoke-virtual {p3}, Ljava/util/regex/Pattern;->pattern()Ljava/lang/String;
 
@@ -379,7 +379,7 @@
     :cond_9
     new-array p2, v2, [Ljava/lang/Object;
 
-    iget-object p3, p0, Lb/o$a;->bHA:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->bHU:Ljava/lang/String;
 
     aput-object p3, p2, v3
 
@@ -426,7 +426,7 @@
 
     move-result-object v0
 
-    invoke-interface {p4}, Lb/c/t;->JO()Z
+    invoke-interface {p4}, Lb/c/t;->JB()Z
 
     move-result p4
 
@@ -434,7 +434,7 @@
 
     move-result-object v4
 
-    iput-boolean v2, p0, Lb/o$a;->bHN:Z
+    iput-boolean v2, p0, Lb/o$a;->bIh:Z
 
     const-class v2, Ljava/lang/Iterable;
 
@@ -454,7 +454,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -464,7 +464,7 @@
 
     invoke-direct {p2, v0, p1, p4}, Lb/j$i;-><init>(Ljava/lang/String;Lb/e;Z)V
 
-    invoke-virtual {p2}, Lb/j$i;->JD()Lb/j;
+    invoke-virtual {p2}, Lb/j$i;->Jq()Lb/j;
 
     move-result-object p1
 
@@ -518,7 +518,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -528,14 +528,14 @@
 
     invoke-direct {p2, v0, p1, p4}, Lb/j$i;-><init>(Ljava/lang/String;Lb/e;Z)V
 
-    invoke-virtual {p2}, Lb/j$i;->JE()Lb/j;
+    invoke-virtual {p2}, Lb/j$i;->Jr()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_f
-    iget-object p1, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p1, p2, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -554,7 +554,7 @@
 
     check-cast p4, Lb/c/v;
 
-    invoke-interface {p4}, Lb/c/v;->JO()Z
+    invoke-interface {p4}, Lb/c/v;->JB()Z
 
     move-result p4
 
@@ -562,7 +562,7 @@
 
     move-result-object v0
 
-    iput-boolean v2, p0, Lb/o$a;->bHN:Z
+    iput-boolean v2, p0, Lb/o$a;->bIh:Z
 
     const-class v2, Ljava/lang/Iterable;
 
@@ -582,7 +582,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -592,7 +592,7 @@
 
     invoke-direct {p2, p1, p4}, Lb/j$k;-><init>(Lb/e;Z)V
 
-    invoke-virtual {p2}, Lb/j$k;->JD()Lb/j;
+    invoke-virtual {p2}, Lb/j$k;->Jq()Lb/j;
 
     move-result-object p1
 
@@ -646,7 +646,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -656,14 +656,14 @@
 
     invoke-direct {p2, p1, p4}, Lb/j$k;-><init>(Lb/e;Z)V
 
-    invoke-virtual {p2}, Lb/j$k;->JE()Lb/j;
+    invoke-virtual {p2}, Lb/j$k;->Jr()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_13
-    iget-object p1, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p1, p2, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -718,7 +718,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -728,7 +728,7 @@
 
     check-cast p4, Lb/c/u;
 
-    invoke-interface {p4}, Lb/c/u;->JO()Z
+    invoke-interface {p4}, Lb/c/u;->JB()Z
 
     move-result p3
 
@@ -808,7 +808,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -818,7 +818,7 @@
 
     invoke-direct {p2, p4, p1}, Lb/j$d;-><init>(Ljava/lang/String;Lb/e;)V
 
-    invoke-virtual {p2}, Lb/j$d;->JD()Lb/j;
+    invoke-virtual {p2}, Lb/j$d;->Jq()Lb/j;
 
     move-result-object p1
 
@@ -872,7 +872,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -882,14 +882,14 @@
 
     invoke-direct {p2, p4, p1}, Lb/j$d;-><init>(Ljava/lang/String;Lb/e;)V
 
-    invoke-virtual {p2}, Lb/j$d;->JE()Lb/j;
+    invoke-virtual {p2}, Lb/j$d;->Jr()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_1b
-    iget-object p1, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p1, p2, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -942,7 +942,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -998,7 +998,7 @@
 
     if-eqz v0, :cond_25
 
-    iget-boolean v0, p0, Lb/o$a;->bHB:Z
+    iget-boolean v0, p0, Lb/o$a;->bHV:Z
 
     if-eqz v0, :cond_24
 
@@ -1008,11 +1008,11 @@
 
     move-result-object v0
 
-    invoke-interface {p4}, Lb/c/c;->JO()Z
+    invoke-interface {p4}, Lb/c/c;->JB()Z
 
     move-result p4
 
-    iput-boolean v2, p0, Lb/o$a;->bHJ:Z
+    iput-boolean v2, p0, Lb/o$a;->bId:Z
 
     invoke-static {p2}, Lb/p;->c(Ljava/lang/reflect/Type;)Ljava/lang/Class;
 
@@ -1036,7 +1036,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -1046,7 +1046,7 @@
 
     invoke-direct {p2, v0, p1, p4}, Lb/j$b;-><init>(Ljava/lang/String;Lb/e;Z)V
 
-    invoke-virtual {p2}, Lb/j$b;->JD()Lb/j;
+    invoke-virtual {p2}, Lb/j$b;->Jq()Lb/j;
 
     move-result-object p1
 
@@ -1100,7 +1100,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -1110,14 +1110,14 @@
 
     invoke-direct {p2, v0, p1, p4}, Lb/j$b;-><init>(Ljava/lang/String;Lb/e;Z)V
 
-    invoke-virtual {p2}, Lb/j$b;->JE()Lb/j;
+    invoke-virtual {p2}, Lb/j$b;->Jr()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_23
-    iget-object p1, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p1, p2, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -1145,7 +1145,7 @@
 
     if-eqz v0, :cond_2a
 
-    iget-boolean v0, p0, Lb/o$a;->bHB:Z
+    iget-boolean v0, p0, Lb/o$a;->bHV:Z
 
     if-eqz v0, :cond_29
 
@@ -1185,19 +1185,19 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bHY:Lb/n;
 
     invoke-virtual {p2, p1, p3}, Lb/n;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lb/e;
 
     move-result-object p1
 
-    iput-boolean v2, p0, Lb/o$a;->bHJ:Z
+    iput-boolean v2, p0, Lb/o$a;->bId:Z
 
     new-instance p2, Lb/j$c;
 
     check-cast p4, Lb/c/d;
 
-    invoke-interface {p4}, Lb/c/d;->JO()Z
+    invoke-interface {p4}, Lb/c/d;->JB()Z
 
     move-result p3
 
@@ -1260,13 +1260,13 @@
 
     if-eqz v0, :cond_39
 
-    iget-boolean v0, p0, Lb/o$a;->bHC:Z
+    iget-boolean v0, p0, Lb/o$a;->bHW:Z
 
     if-eqz v0, :cond_38
 
     check-cast p4, Lb/c/q;
 
-    iput-boolean v2, p0, Lb/o$a;->bHK:Z
+    iput-boolean v2, p0, Lb/o$a;->bIe:Z
 
     invoke-interface {p4}, Lb/c/q;->value()Ljava/lang/String;
 
@@ -1314,9 +1314,9 @@
 
     if-eqz p2, :cond_2b
 
-    sget-object p1, Lb/j$l;->bHc:Lb/j$l;
+    sget-object p1, Lb/j$l;->bHw:Lb/j$l;
 
-    invoke-virtual {p1}, Lb/j$l;->JD()Lb/j;
+    invoke-virtual {p1}, Lb/j$l;->Jq()Lb/j;
 
     move-result-object p1
 
@@ -1383,9 +1383,9 @@
 
     if-eqz p2, :cond_2e
 
-    sget-object p1, Lb/j$l;->bHc:Lb/j$l;
+    sget-object p1, Lb/j$l;->bHw:Lb/j$l;
 
-    invoke-virtual {p1}, Lb/j$l;->JE()Lb/j;
+    invoke-virtual {p1}, Lb/j$l;->Jr()Lb/j;
 
     move-result-object p1
 
@@ -1409,7 +1409,7 @@
 
     if-eqz p2, :cond_30
 
-    sget-object p1, Lb/j$l;->bHc:Lb/j$l;
+    sget-object p1, Lb/j$l;->bHw:Lb/j$l;
 
     return-object p1
 
@@ -1455,7 +1455,7 @@
 
     const/4 v0, 0x3
 
-    invoke-interface {p4}, Lb/c/q;->JR()Ljava/lang/String;
+    invoke-interface {p4}, Lb/c/q;->JE()Ljava/lang/String;
 
     move-result-object p4
 
@@ -1497,9 +1497,9 @@
 
     if-nez v0, :cond_32
 
-    iget-object p1, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bHY:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bHF:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bHZ:[Ljava/lang/annotation/Annotation;
 
     invoke-virtual {p1, p2, p3, v0}, Lb/n;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -1509,7 +1509,7 @@
 
     invoke-direct {p2, p4, p1}, Lb/j$f;-><init>(Lokhttp3/Headers;Lb/e;)V
 
-    invoke-virtual {p2}, Lb/j$f;->JD()Lb/j;
+    invoke-virtual {p2}, Lb/j$f;->Jq()Lb/j;
 
     move-result-object p1
 
@@ -1580,9 +1580,9 @@
 
     if-nez v0, :cond_35
 
-    iget-object p1, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bHY:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bHF:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bHZ:[Ljava/lang/annotation/Annotation;
 
     invoke-virtual {p1, p2, p3, v0}, Lb/n;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -1592,7 +1592,7 @@
 
     invoke-direct {p2, p4, p1}, Lb/j$f;-><init>(Lokhttp3/Headers;Lb/e;)V
 
-    invoke-virtual {p2}, Lb/j$f;->JE()Lb/j;
+    invoke-virtual {p2}, Lb/j$f;->Jr()Lb/j;
 
     move-result-object p1
 
@@ -1616,9 +1616,9 @@
 
     if-nez v0, :cond_37
 
-    iget-object p1, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bHY:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bHF:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bHZ:[Ljava/lang/annotation/Annotation;
 
     invoke-virtual {p1, p2, p3, v0}, Lb/n;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -1655,11 +1655,11 @@
 
     if-eqz v0, :cond_3f
 
-    iget-boolean v0, p0, Lb/o$a;->bHC:Z
+    iget-boolean v0, p0, Lb/o$a;->bHW:Z
 
     if-eqz v0, :cond_3e
 
-    iput-boolean v2, p0, Lb/o$a;->bHK:Z
+    iput-boolean v2, p0, Lb/o$a;->bIe:Z
 
     invoke-static {p2}, Lb/p;->c(Ljava/lang/reflect/Type;)Ljava/lang/Class;
 
@@ -1709,9 +1709,9 @@
 
     if-nez v0, :cond_3a
 
-    iget-object p1, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bHY:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bHF:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bHZ:[Ljava/lang/annotation/Annotation;
 
     invoke-virtual {p1, p2, p3, v0}, Lb/n;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -1721,7 +1721,7 @@
 
     new-instance p2, Lb/j$g;
 
-    invoke-interface {p4}, Lb/c/r;->JR()Ljava/lang/String;
+    invoke-interface {p4}, Lb/c/r;->JE()Ljava/lang/String;
 
     move-result-object p3
 
@@ -1795,22 +1795,22 @@
 
     if-eqz p4, :cond_42
 
-    iget-boolean p4, p0, Lb/o$a;->bHB:Z
+    iget-boolean p4, p0, Lb/o$a;->bHV:Z
 
     if-nez p4, :cond_41
 
-    iget-boolean p4, p0, Lb/o$a;->bHC:Z
+    iget-boolean p4, p0, Lb/o$a;->bHW:Z
 
     if-nez p4, :cond_41
 
-    iget-boolean p4, p0, Lb/o$a;->bHL:Z
+    iget-boolean p4, p0, Lb/o$a;->bIf:Z
 
     if-nez p4, :cond_40
 
     :try_start_0
-    iget-object p4, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object p4, p0, Lb/o$a;->bHY:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bHF:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bHZ:[Ljava/lang/annotation/Annotation;
 
     invoke-virtual {p4, p2, p3, v0}, Lb/n;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lb/e;
 
@@ -1818,7 +1818,7 @@
     :try_end_0
     .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iput-boolean v2, p0, Lb/o$a;->bHL:Z
+    iput-boolean v2, p0, Lb/o$a;->bIf:Z
 
     new-instance p2, Lb/j$a;
 
@@ -1893,7 +1893,7 @@
 
 
 # virtual methods
-.method final JK()Lb/c;
+.method final Jx()Lb/c;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1903,7 +1903,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/o$a;->bkw:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lb/o$a;->bkQ:Ljava/lang/reflect/Method;
 
     invoke-virtual {v0}, Ljava/lang/reflect/Method;->getGenericReturnType()Ljava/lang/reflect/Type;
 
@@ -1925,14 +1925,14 @@
 
     if-eq v0, v1, :cond_3
 
-    iget-object v1, p0, Lb/o$a;->bkw:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lb/o$a;->bkQ:Ljava/lang/reflect/Method;
 
     invoke-virtual {v1}, Ljava/lang/reflect/Method;->getAnnotations()[Ljava/lang/annotation/Annotation;
 
     move-result-object v1
 
     :try_start_0
-    iget-object v5, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object v5, p0, Lb/o$a;->bHY:Lb/n;
 
     const-string v6, "returnType == null"
 
@@ -1942,7 +1942,7 @@
 
     invoke-static {v1, v6}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v1, v5, Lb/n;->bHr:Ljava/util/List;
+    iget-object v1, v5, Lb/n;->bHL:Ljava/util/List;
 
     invoke-interface {v1, v2}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I
 
@@ -1950,7 +1950,7 @@
 
     add-int/2addr v1, v4
 
-    iget-object v2, v5, Lb/n;->bHr:Ljava/util/List;
+    iget-object v2, v5, Lb/n;->bHL:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -1961,7 +1961,7 @@
     :goto_0
     if-ge v6, v2, :cond_1
 
-    iget-object v7, v5, Lb/n;->bHr:Ljava/util/List;
+    iget-object v7, v5, Lb/n;->bHL:Ljava/util/List;
 
     invoke-interface {v7, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1999,7 +1999,7 @@
 
     invoke-virtual {v2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v6, v5, Lb/n;->bHr:Ljava/util/List;
+    iget-object v6, v5, Lb/n;->bHL:Ljava/util/List;
 
     invoke-interface {v6}, Ljava/util/List;->size()I
 
@@ -2012,7 +2012,7 @@
 
     invoke-virtual {v2, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v7, v5, Lb/n;->bHr:Ljava/util/List;
+    iget-object v7, v5, Lb/n;->bHL:Ljava/util/List;
 
     invoke-interface {v7, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2093,7 +2093,7 @@
     goto :goto_2
 .end method
 
-.method final JL()Lb/e;
+.method final Jy()Lb/e;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2104,7 +2104,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/o$a;->bkw:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lb/o$a;->bkQ:Ljava/lang/reflect/Method;
 
     invoke-virtual {v0}, Ljava/lang/reflect/Method;->getAnnotations()[Ljava/lang/annotation/Annotation;
 
@@ -2113,9 +2113,9 @@
     const/4 v1, 0x1
 
     :try_start_0
-    iget-object v2, p0, Lb/o$a;->bHE:Lb/n;
+    iget-object v2, p0, Lb/o$a;->bHY:Lb/n;
 
-    iget-object v3, p0, Lb/o$a;->bHI:Ljava/lang/reflect/Type;
+    iget-object v3, p0, Lb/o$a;->bIc:Ljava/lang/reflect/Type;
 
     const-string v4, "type == null"
 
@@ -2125,7 +2125,7 @@
 
     invoke-static {v0, v4}, Lb/p;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v4, v2, Lb/n;->bHq:Ljava/util/List;
+    iget-object v4, v2, Lb/n;->bHK:Ljava/util/List;
 
     const/4 v5, 0x0
 
@@ -2135,7 +2135,7 @@
 
     add-int/2addr v4, v1
 
-    iget-object v5, v2, Lb/n;->bHq:Ljava/util/List;
+    iget-object v5, v2, Lb/n;->bHK:Ljava/util/List;
 
     invoke-interface {v5}, Ljava/util/List;->size()I
 
@@ -2146,7 +2146,7 @@
     :goto_0
     if-ge v6, v5, :cond_1
 
-    iget-object v7, v2, Lb/n;->bHq:Ljava/util/List;
+    iget-object v7, v2, Lb/n;->bHK:Ljava/util/List;
 
     invoke-interface {v7, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2184,7 +2184,7 @@
 
     invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v3, v2, Lb/n;->bHq:Ljava/util/List;
+    iget-object v3, v2, Lb/n;->bHK:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
@@ -2197,7 +2197,7 @@
 
     invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v5, v2, Lb/n;->bHq:Ljava/util/List;
+    iget-object v5, v2, Lb/n;->bHK:Ljava/util/List;
 
     invoke-interface {v5, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2239,7 +2239,7 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lb/o$a;->bHI:Ljava/lang/reflect/Type;
+    iget-object v3, p0, Lb/o$a;->bIc:Ljava/lang/reflect/Type;
 
     aput-object v3, v1, v2
 
@@ -2392,7 +2392,7 @@
 
     invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p2, p0, Lb/o$a;->bkw:Ljava/lang/reflect/Method;
+    iget-object p2, p0, Lb/o$a;->bkQ:Ljava/lang/reflect/Method;
 
     invoke-virtual {p2}, Ljava/lang/reflect/Method;->getDeclaringClass()Ljava/lang/Class;
 
@@ -2408,7 +2408,7 @@
 
     invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p2, p0, Lb/o$a;->bkw:Ljava/lang/reflect/Method;
+    iget-object p2, p0, Lb/o$a;->bkQ:Ljava/lang/reflect/Method;
 
     invoke-virtual {p2}, Ljava/lang/reflect/Method;->getName()Ljava/lang/String;
 
@@ -2428,7 +2428,7 @@
 .method final g(Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 4
 
-    iget-object v0, p0, Lb/o$a;->bHA:Ljava/lang/String;
+    iget-object v0, p0, Lb/o$a;->bHU:Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -2438,9 +2438,9 @@
 
     if-nez v0, :cond_3
 
-    iput-object p1, p0, Lb/o$a;->bHA:Ljava/lang/String;
+    iput-object p1, p0, Lb/o$a;->bHU:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lb/o$a;->bHi:Z
+    iput-boolean p3, p0, Lb/o$a;->bHC:Z
 
     invoke-virtual {p2}, Ljava/lang/String;->isEmpty()Z
 
@@ -2475,7 +2475,7 @@
 
     move-result-object p1
 
-    sget-object p3, Lb/o;->bHw:Ljava/util/regex/Pattern;
+    sget-object p3, Lb/o;->bHQ:Ljava/util/regex/Pattern;
 
     invoke-virtual {p3, p1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -2504,13 +2504,13 @@
 
     :cond_2
     :goto_0
-    iput-object p2, p0, Lb/o$a;->bHf:Ljava/lang/String;
+    iput-object p2, p0, Lb/o$a;->bHz:Ljava/lang/String;
 
-    invoke-static {p2}, Lb/o;->fg(Ljava/lang/String;)Ljava/util/Set;
+    invoke-static {p2}, Lb/o;->fb(Ljava/lang/String;)Ljava/util/Set;
 
     move-result-object p1
 
-    iput-object p1, p0, Lb/o$a;->bHP:Ljava/util/Set;
+    iput-object p1, p0, Lb/o$a;->bIj:Ljava/util/Set;
 
     return-void
 
@@ -2596,13 +2596,13 @@
 
     if-eqz v5, :cond_1
 
-    invoke-static {v4}, Lokhttp3/MediaType;->eo(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {v4}, Lokhttp3/MediaType;->ei(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object v5
 
     if-eqz v5, :cond_0
 
-    iput-object v5, p0, Lb/o$a;->bug:Lokhttp3/MediaType;
+    iput-object v5, p0, Lb/o$a;->buA:Lokhttp3/MediaType;
 
     goto :goto_1
 
@@ -2641,7 +2641,7 @@
     throw p1
 
     :cond_3
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->GA()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Gp()Lokhttp3/Headers;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/o.smali b/com.discord/smali/b/o.smali
index 13d1b4a599..ed9f81f1f7 100644
--- a/com.discord/smali/b/o.smali
+++ b/com.discord/smali/b/o.smali
@@ -23,37 +23,17 @@
 
 
 # static fields
-.field static final bHw:Ljava/util/regex/Pattern;
+.field static final bHQ:Ljava/util/regex/Pattern;
 
-.field static final bHx:Ljava/util/regex/Pattern;
+.field static final bHR:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final bHA:Ljava/lang/String;
-
-.field private final bHB:Z
-
 .field private final bHC:Z
 
-.field private final bHD:[Lb/j;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[",
-            "Lb/j<",
-            "*>;"
-        }
-    .end annotation
-.end field
+.field final bHJ:Lokhttp3/e$a;
 
-.field private final bHe:Lokhttp3/s;
-
-.field private final bHf:Ljava/lang/String;
-
-.field private final bHi:Z
-
-.field final bHp:Lokhttp3/e$a;
-
-.field final bHy:Lb/c;
+.field final bHS:Lb/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/c<",
@@ -62,7 +42,7 @@
     .end annotation
 .end field
 
-.field final bHz:Lb/e;
+.field final bHT:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -72,9 +52,29 @@
     .end annotation
 .end field
 
-.field private final bug:Lokhttp3/MediaType;
+.field private final bHU:Ljava/lang/String;
 
-.field private final buj:Lokhttp3/Headers;
+.field private final bHV:Z
+
+.field private final bHW:Z
+
+.field private final bHX:[Lb/j;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[",
+            "Lb/j<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+.field private final bHy:Lokhttp3/s;
+
+.field private final bHz:Ljava/lang/String;
+
+.field private final buA:Lokhttp3/MediaType;
+
+.field private final buD:Lokhttp3/Headers;
 
 
 # direct methods
@@ -87,7 +87,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lb/o;->bHw:Ljava/util/regex/Pattern;
+    sput-object v0, Lb/o;->bHQ:Ljava/util/regex/Pattern;
 
     const-string v0, "[a-zA-Z][a-zA-Z0-9_-]*"
 
@@ -95,7 +95,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lb/o;->bHx:Ljava/util/regex/Pattern;
+    sput-object v0, Lb/o;->bHR:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -112,57 +112,57 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lb/o$a;->bHE:Lb/n;
+    iget-object v0, p1, Lb/o$a;->bHY:Lb/n;
 
-    iget-object v0, v0, Lb/n;->bHp:Lokhttp3/e$a;
+    iget-object v0, v0, Lb/n;->bHJ:Lokhttp3/e$a;
 
-    iput-object v0, p0, Lb/o;->bHp:Lokhttp3/e$a;
+    iput-object v0, p0, Lb/o;->bHJ:Lokhttp3/e$a;
 
-    iget-object v0, p1, Lb/o$a;->bHy:Lb/c;
+    iget-object v0, p1, Lb/o$a;->bHS:Lb/c;
 
-    iput-object v0, p0, Lb/o;->bHy:Lb/c;
+    iput-object v0, p0, Lb/o;->bHS:Lb/c;
 
-    iget-object v0, p1, Lb/o$a;->bHE:Lb/n;
+    iget-object v0, p1, Lb/o$a;->bHY:Lb/n;
 
-    iget-object v0, v0, Lb/n;->bHe:Lokhttp3/s;
+    iget-object v0, v0, Lb/n;->bHy:Lokhttp3/s;
 
-    iput-object v0, p0, Lb/o;->bHe:Lokhttp3/s;
+    iput-object v0, p0, Lb/o;->bHy:Lokhttp3/s;
 
-    iget-object v0, p1, Lb/o$a;->bHz:Lb/e;
+    iget-object v0, p1, Lb/o$a;->bHT:Lb/e;
 
-    iput-object v0, p0, Lb/o;->bHz:Lb/e;
+    iput-object v0, p0, Lb/o;->bHT:Lb/e;
 
-    iget-object v0, p1, Lb/o$a;->bHA:Ljava/lang/String;
+    iget-object v0, p1, Lb/o$a;->bHU:Ljava/lang/String;
 
-    iput-object v0, p0, Lb/o;->bHA:Ljava/lang/String;
+    iput-object v0, p0, Lb/o;->bHU:Ljava/lang/String;
 
-    iget-object v0, p1, Lb/o$a;->bHf:Ljava/lang/String;
+    iget-object v0, p1, Lb/o$a;->bHz:Ljava/lang/String;
 
-    iput-object v0, p0, Lb/o;->bHf:Ljava/lang/String;
+    iput-object v0, p0, Lb/o;->bHz:Ljava/lang/String;
 
-    iget-object v0, p1, Lb/o$a;->buj:Lokhttp3/Headers;
+    iget-object v0, p1, Lb/o$a;->buD:Lokhttp3/Headers;
 
-    iput-object v0, p0, Lb/o;->buj:Lokhttp3/Headers;
+    iput-object v0, p0, Lb/o;->buD:Lokhttp3/Headers;
 
-    iget-object v0, p1, Lb/o$a;->bug:Lokhttp3/MediaType;
+    iget-object v0, p1, Lb/o$a;->buA:Lokhttp3/MediaType;
 
-    iput-object v0, p0, Lb/o;->bug:Lokhttp3/MediaType;
-
-    iget-boolean v0, p1, Lb/o$a;->bHi:Z
-
-    iput-boolean v0, p0, Lb/o;->bHi:Z
-
-    iget-boolean v0, p1, Lb/o$a;->bHB:Z
-
-    iput-boolean v0, p0, Lb/o;->bHB:Z
+    iput-object v0, p0, Lb/o;->buA:Lokhttp3/MediaType;
 
     iget-boolean v0, p1, Lb/o$a;->bHC:Z
 
     iput-boolean v0, p0, Lb/o;->bHC:Z
 
-    iget-object p1, p1, Lb/o$a;->bHD:[Lb/j;
+    iget-boolean v0, p1, Lb/o$a;->bHV:Z
 
-    iput-object p1, p0, Lb/o;->bHD:[Lb/j;
+    iput-boolean v0, p0, Lb/o;->bHV:Z
+
+    iget-boolean v0, p1, Lb/o$a;->bHW:Z
+
+    iput-boolean v0, p0, Lb/o;->bHW:Z
+
+    iget-object p1, p1, Lb/o$a;->bHX:[Lb/j;
+
+    iput-object p1, p0, Lb/o;->bHX:[Lb/j;
 
     return-void
 .end method
@@ -252,7 +252,7 @@
     return-object p0
 .end method
 
-.method static fg(Ljava/lang/String;)Ljava/util/Set;
+.method static fb(Ljava/lang/String;)Ljava/util/Set;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -265,7 +265,7 @@
         }
     .end annotation
 
-    sget-object v0, Lb/o;->bHw:Ljava/util/regex/Pattern;
+    sget-object v0, Lb/o;->bHQ:Ljava/util/regex/Pattern;
 
     invoke-virtual {v0, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -298,7 +298,7 @@
 
 
 # virtual methods
-.method final varargs t([Ljava/lang/Object;)Lokhttp3/w;
+.method final varargs s([Ljava/lang/Object;)Lokhttp3/w;
     .locals 10
     .param p1    # [Ljava/lang/Object;
         .annotation runtime Ljavax/annotation/Nullable;
@@ -312,27 +312,27 @@
 
     new-instance v9, Lb/l;
 
-    iget-object v1, p0, Lb/o;->bHA:Ljava/lang/String;
+    iget-object v1, p0, Lb/o;->bHU:Ljava/lang/String;
 
-    iget-object v2, p0, Lb/o;->bHe:Lokhttp3/s;
+    iget-object v2, p0, Lb/o;->bHy:Lokhttp3/s;
 
-    iget-object v3, p0, Lb/o;->bHf:Ljava/lang/String;
+    iget-object v3, p0, Lb/o;->bHz:Ljava/lang/String;
 
-    iget-object v4, p0, Lb/o;->buj:Lokhttp3/Headers;
+    iget-object v4, p0, Lb/o;->buD:Lokhttp3/Headers;
 
-    iget-object v5, p0, Lb/o;->bug:Lokhttp3/MediaType;
+    iget-object v5, p0, Lb/o;->buA:Lokhttp3/MediaType;
 
-    iget-boolean v6, p0, Lb/o;->bHi:Z
+    iget-boolean v6, p0, Lb/o;->bHC:Z
 
-    iget-boolean v7, p0, Lb/o;->bHB:Z
+    iget-boolean v7, p0, Lb/o;->bHV:Z
 
-    iget-boolean v8, p0, Lb/o;->bHC:Z
+    iget-boolean v8, p0, Lb/o;->bHW:Z
 
     move-object v0, v9
 
     invoke-direct/range {v0 .. v8}, Lb/l;-><init>(Ljava/lang/String;Lokhttp3/s;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/MediaType;ZZZ)V
 
-    iget-object v0, p0, Lb/o;->bHD:[Lb/j;
+    iget-object v0, p0, Lb/o;->bHX:[Lb/j;
 
     const/4 v1, 0x0
 
@@ -364,7 +364,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v9}, Lb/l;->Hc()Lokhttp3/w;
+    invoke-virtual {v9}, Lb/l;->GP()Lokhttp3/w;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/p$c.smali b/com.discord/smali/b/p$c.smali
index 7c1d6cf6b1..55e9acd53d 100644
--- a/com.discord/smali/b/p$c.smali
+++ b/com.discord/smali/b/p$c.smali
@@ -158,7 +158,7 @@
     return-object v1
 
     :cond_0
-    sget-object v0, Lb/p;->aXb:[Ljava/lang/reflect/Type;
+    sget-object v0, Lb/p;->aXt:[Ljava/lang/reflect/Type;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/b/p.smali b/com.discord/smali/b/p.smali
index 23537e8cbe..22a3b57078 100644
--- a/com.discord/smali/b/p.smali
+++ b/com.discord/smali/b/p.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field static final aXb:[Ljava/lang/reflect/Type;
+.field static final aXt:[Ljava/lang/reflect/Type;
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     new-array v0, v0, [Ljava/lang/reflect/Type;
 
-    sput-object v0, Lb/p;->aXb:[Ljava/lang/reflect/Type;
+    sput-object v0, Lb/p;->aXt:[Ljava/lang/reflect/Type;
 
     return-void
 .end method
@@ -581,7 +581,7 @@
 
     aput-object p0, p2, v1
 
-    sget-object p0, Lb/p;->aXb:[Ljava/lang/reflect/Type;
+    sget-object p0, Lb/p;->aXt:[Ljava/lang/reflect/Type;
 
     invoke-direct {p1, p2, p0}, Lb/p$c;-><init>([Ljava/lang/reflect/Type;[Ljava/lang/reflect/Type;)V
 
@@ -937,7 +937,7 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    invoke-virtual {p0}, Lokhttp3/x;->Hf()Lokio/d;
+    invoke-virtual {p0}, Lokhttp3/x;->GS()Lokio/d;
 
     move-result-object v1
 
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 7087f531df..aded3298b3 100644
--- a/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer.smali
+++ b/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer.smali
@@ -109,7 +109,7 @@
 
     new-instance p2, Ljava/util/LinkedHashSet;
 
-    invoke-static {v1}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v1}, Lkotlin/a/ad;->dj(I)I
 
     move-result v1
 
@@ -139,7 +139,7 @@
 
     invoke-interface {p1, p3, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
@@ -218,14 +218,14 @@
     invoke-interface {p1, p3}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
     monitor-exit v1
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     goto :goto_0
 
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 3219bebf0d..37875291a3 100644
--- a/com.discord/smali/co/discord/media_engine/internal/TransformStats.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/TransformStats.smali
@@ -575,7 +575,7 @@
 
     invoke-direct/range {v21 .. v45}, Lco/discord/media_engine/OutboundRtpVideo;-><init>(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;IIIFIIIILjava/lang/String;ILco/discord/media_engine/Resolution;IIIIIIIIZZ)V
 
-    sget-object v7, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v7, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     move v11, v6
 
@@ -924,7 +924,7 @@
     goto/16 :goto_8
 
     :cond_b
-    sget-object v2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     goto :goto_b
 
diff --git a/com.discord/smali/com/a/a/a/a$a$a.smali b/com.discord/smali/com/a/a/a/a$a$a.smali
index 5fd739d06e..c037bfc610 100644
--- a/com.discord/smali/com/a/a/a/a$a$a.smali
+++ b/com.discord/smali/com/a/a/a/a$a$a.smali
@@ -17,6 +17,10 @@
 .end annotation
 
 
+# static fields
+.field public static bbH:Lcom/a/a/a/a;
+
+
 # instance fields
 .field private i:Landroid/os/IBinder;
 
@@ -35,7 +39,7 @@
 
 # virtual methods
 .method public final a(IZLandroid/os/Bundle;)V
-    .locals 3
+    .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -57,48 +61,71 @@
 
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p2, :cond_0
 
-    const/4 p2, 0x1
+    const/4 v4, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 p2, 0x0
+    const/4 v4, 0x0
 
     :goto_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v4}, Landroid/os/Parcel;->writeInt(I)V
 
     if-eqz p3, :cond_1
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_1
-    iget-object p2, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
+    iget-object v4, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
 
-    invoke-interface {p2, p1, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v4, v2, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    move-result v2
+
+    if-nez v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/a;->a(IZLandroid/os/Bundle;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
+    :goto_2
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
     return-void
 
+    :cond_2
+    :try_start_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_2
+
     :catchall_0
     move-exception p1
 
@@ -106,7 +133,13 @@
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
+    goto :goto_4
+
+    :goto_3
     throw p1
+
+    :goto_4
+    goto :goto_3
 .end method
 
 .method public final asBinder()Landroid/os/IBinder;
@@ -118,7 +151,7 @@
 .end method
 
 .method public final b(IZLandroid/os/Bundle;)V
-    .locals 3
+    .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -140,50 +173,73 @@
 
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p2, :cond_0
 
-    const/4 p2, 0x1
+    const/4 v4, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 p2, 0x0
+    const/4 v4, 0x0
 
     :goto_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v4}, Landroid/os/Parcel;->writeInt(I)V
 
     if-eqz p3, :cond_1
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_1
-    iget-object p1, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
 
-    const/4 p2, 0x2
+    const/4 v4, 0x2
 
-    invoke-interface {p1, p2, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v2, v4, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    move-result v2
+
+    if-nez v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/a;->b(IZLandroid/os/Bundle;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
+    :goto_2
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
     return-void
 
+    :cond_2
+    :try_start_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_2
+
     :catchall_0
     move-exception p1
 
@@ -191,11 +247,17 @@
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
+    goto :goto_4
+
+    :goto_3
     throw p1
+
+    :goto_4
+    goto :goto_3
 .end method
 
 .method public final c(IZLandroid/os/Bundle;)V
-    .locals 3
+    .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -217,50 +279,73 @@
 
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p2, :cond_0
 
-    const/4 p2, 0x1
+    const/4 v4, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 p2, 0x0
+    const/4 v4, 0x0
 
     :goto_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v4}, Landroid/os/Parcel;->writeInt(I)V
 
     if-eqz p3, :cond_1
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_1
-    iget-object p1, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
 
-    const/4 p2, 0x3
+    const/4 v4, 0x3
 
-    invoke-interface {p1, p2, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v2, v4, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    move-result v2
+
+    if-nez v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/a;->c(IZLandroid/os/Bundle;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
+    :goto_2
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
     return-void
 
+    :cond_2
+    :try_start_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_2
+
     :catchall_0
     move-exception p1
 
@@ -268,11 +353,17 @@
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
+    goto :goto_4
+
+    :goto_3
     throw p1
+
+    :goto_4
+    goto :goto_3
 .end method
 
 .method public final d(IZLandroid/os/Bundle;)V
-    .locals 3
+    .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -294,50 +385,73 @@
 
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p2, :cond_0
 
-    const/4 p2, 0x1
+    const/4 v4, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 p2, 0x0
+    const/4 v4, 0x0
 
     :goto_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v4}, Landroid/os/Parcel;->writeInt(I)V
 
     if-eqz p3, :cond_1
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_1
-    iget-object p1, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
 
-    const/4 p2, 0x5
+    const/4 v4, 0x5
 
-    invoke-interface {p1, p2, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v2, v4, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    move-result v2
+
+    if-nez v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/a;->d(IZLandroid/os/Bundle;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
+    :goto_2
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
     return-void
 
+    :cond_2
+    :try_start_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_2
+
     :catchall_0
     move-exception p1
 
@@ -345,11 +459,17 @@
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
+    goto :goto_4
+
+    :goto_3
     throw p1
+
+    :goto_4
+    goto :goto_3
 .end method
 
 .method public final e(IZLandroid/os/Bundle;)V
-    .locals 3
+    .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -371,50 +491,73 @@
 
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p2, :cond_0
 
-    const/4 p2, 0x1
+    const/4 v4, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 p2, 0x0
+    const/4 v4, 0x0
 
     :goto_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v4}, Landroid/os/Parcel;->writeInt(I)V
 
     if-eqz p3, :cond_1
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_1
-    iget-object p1, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
 
-    const/4 p2, 0x6
+    const/4 v4, 0x6
 
-    invoke-interface {p1, p2, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v2, v4, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    move-result v2
+
+    if-nez v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/a;->e(IZLandroid/os/Bundle;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
+    :goto_2
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
     return-void
 
+    :cond_2
+    :try_start_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_2
+
     :catchall_0
     move-exception p1
 
@@ -422,11 +565,17 @@
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
+    goto :goto_4
+
+    :goto_3
     throw p1
+
+    :goto_4
+    goto :goto_3
 .end method
 
 .method public final f(IZLandroid/os/Bundle;)V
-    .locals 3
+    .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -448,50 +597,73 @@
 
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p2, :cond_0
 
-    const/4 p2, 0x1
+    const/4 v4, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 p2, 0x0
+    const/4 v4, 0x0
 
     :goto_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v4}, Landroid/os/Parcel;->writeInt(I)V
 
     if-eqz p3, :cond_1
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_1
-    iget-object p1, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
 
-    const/4 p2, 0x7
+    const/4 v4, 0x7
 
-    invoke-interface {p1, p2, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v2, v4, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    move-result v2
+
+    if-nez v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/a;->f(IZLandroid/os/Bundle;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
+    :goto_2
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
     return-void
 
+    :cond_2
+    :try_start_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_2
+
     :catchall_0
     move-exception p1
 
@@ -499,11 +671,17 @@
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
+    goto :goto_4
+
+    :goto_3
     throw p1
+
+    :goto_4
+    goto :goto_3
 .end method
 
 .method public final g(IZLandroid/os/Bundle;)V
-    .locals 3
+    .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -525,50 +703,73 @@
 
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p2, :cond_0
 
-    const/4 p2, 0x1
+    const/4 v4, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 p2, 0x0
+    const/4 v4, 0x0
 
     :goto_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v4}, Landroid/os/Parcel;->writeInt(I)V
 
     if-eqz p3, :cond_1
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_1
-    iget-object p1, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
 
-    const/16 p2, 0x8
+    const/16 v4, 0x8
 
-    invoke-interface {p1, p2, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v2, v4, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    move-result v2
+
+    if-nez v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/a;->g(IZLandroid/os/Bundle;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
+    :goto_2
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
     return-void
 
+    :cond_2
+    :try_start_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_2
+
     :catchall_0
     move-exception p1
 
@@ -576,11 +777,17 @@
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
+    goto :goto_4
+
+    :goto_3
     throw p1
+
+    :goto_4
+    goto :goto_3
 .end method
 
 .method public final h(IZLandroid/os/Bundle;)V
-    .locals 3
+    .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -602,50 +809,73 @@
 
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p2, :cond_0
 
-    const/4 p2, 0x1
+    const/4 v4, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 p2, 0x0
+    const/4 v4, 0x0
 
     :goto_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v4}, Landroid/os/Parcel;->writeInt(I)V
 
     if-eqz p3, :cond_1
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_1
-    iget-object p1, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/a/a/a/a$a$a;->i:Landroid/os/IBinder;
 
-    const/4 p2, 0x4
+    const/4 v4, 0x4
 
-    invoke-interface {p1, p2, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v2, v4, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    move-result v2
+
+    if-nez v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_2
+
+    invoke-static {}, Lcom/a/a/a/a$a;->Cf()Lcom/a/a/a/a;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/a;->h(IZLandroid/os/Bundle;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
+    :goto_2
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
     return-void
 
+    :cond_2
+    :try_start_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_2
+
     :catchall_0
     move-exception p1
 
@@ -653,5 +883,11 @@
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
+    goto :goto_4
+
+    :goto_3
     throw p1
+
+    :goto_4
+    goto :goto_3
 .end method
diff --git a/com.discord/smali/com/a/a/a/a$a.smali b/com.discord/smali/com/a/a/a/a$a.smali
index 819fe7595e..e341edd643 100644
--- a/com.discord/smali/com/a/a/a/a$a.smali
+++ b/com.discord/smali/com/a/a/a/a$a.smali
@@ -36,6 +36,14 @@
     return-void
 .end method
 
+.method public static Cf()Lcom/a/a/a/a;
+    .locals 1
+
+    sget-object v0, Lcom/a/a/a/a$a$a;->bbH:Lcom/a/a/a/a;
+
+    return-object v0
+.end method
+
 
 # virtual methods
 .method public asBinder()Landroid/os/IBinder;
diff --git a/com.discord/smali/com/a/a/a/b$a$a.smali b/com.discord/smali/com/a/a/a/b$a$a.smali
index 978e221ddc..3c95f3a4e6 100644
--- a/com.discord/smali/com/a/a/a/b$a$a.smali
+++ b/com.discord/smali/com/a/a/a/b$a$a.smali
@@ -17,6 +17,10 @@
 .end annotation
 
 
+# static fields
+.field public static bbI:Lcom/a/a/a/b;
+
+
 # instance fields
 .field private i:Landroid/os/IBinder;
 
@@ -35,7 +39,7 @@
 
 # virtual methods
 .method public final a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/a/a/a/a;)Ljava/lang/String;
-    .locals 3
+    .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -65,31 +69,59 @@
 
     invoke-interface {p4}, Lcom/a/a/a/a;->asBinder()Landroid/os/IBinder;
 
-    move-result-object p1
+    move-result-object v2
 
     goto :goto_0
 
     :cond_0
-    const/4 p1, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
 
-    iget-object p1, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
 
-    const/4 p2, 0x1
+    const/4 v3, 0x1
 
-    const/4 p3, 0x0
+    const/4 v4, 0x0
 
-    invoke-interface {p1, p2, v0, v1, p3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v2, v3, v0, v1, v4}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
+    move-result v2
+
+    if-nez v2, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3, p4}, Lcom/a/a/a/b;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/a/a/a/a;)Ljava/lang/String;
+
+    move-result-object 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-object p1
+
+    :cond_1
+    :try_start_1
     invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
 
     invoke-virtual {v1}, Landroid/os/Parcel;->readString()Ljava/lang/String;
 
     move-result-object p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
@@ -108,7 +140,7 @@
 .end method
 
 .method public final a(ILjava/lang/String;Landroid/os/Bundle;)Z
-    .locals 3
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -132,49 +164,77 @@
 
     invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 p2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p3, :cond_0
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, p2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
-    iget-object p3, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
+    iget-object v4, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
 
-    const/4 v2, 0x3
+    const/4 v5, 0x3
 
-    invoke-interface {p3, v2, v0, v1, p2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v4, v5, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
+    move-result v4
+
+    if-nez v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/b;->a(ILjava/lang/String;Landroid/os/Bundle;)Z
+
+    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
+
+    :cond_1
+    :try_start_1
     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
+    move-result p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    if-eqz p3, :cond_1
+    if-eqz p1, :cond_2
 
     goto :goto_1
 
-    :cond_1
-    const/4 p1, 0x0
+    :cond_2
+    const/4 v2, 0x0
 
     :goto_1
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
-    return p1
+    return v2
 
     :catchall_0
     move-exception p1
@@ -195,7 +255,7 @@
 .end method
 
 .method public final b(ILjava/lang/String;Landroid/os/Bundle;)Z
-    .locals 3
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -219,49 +279,77 @@
 
     invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 p2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p3, :cond_0
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, p2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
-    iget-object p3, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
+    iget-object v4, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
 
-    const/4 v2, 0x4
+    const/4 v5, 0x4
 
-    invoke-interface {p3, v2, v0, v1, p2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v4, v5, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
+    move-result v4
+
+    if-nez v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/b;->b(ILjava/lang/String;Landroid/os/Bundle;)Z
+
+    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
+
+    :cond_1
+    :try_start_1
     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
+    move-result p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    if-eqz p3, :cond_1
+    if-eqz p1, :cond_2
 
     goto :goto_1
 
-    :cond_1
-    const/4 p1, 0x0
+    :cond_2
+    const/4 v2, 0x0
 
     :goto_1
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
-    return p1
+    return v2
 
     :catchall_0
     move-exception p1
@@ -274,7 +362,7 @@
 .end method
 
 .method public final c(ILjava/lang/String;Landroid/os/Bundle;)Z
-    .locals 3
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -298,49 +386,77 @@
 
     invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 p2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p3, :cond_0
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, p2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
-    iget-object p3, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
+    iget-object v4, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
 
-    const/4 v2, 0x5
+    const/4 v5, 0x5
 
-    invoke-interface {p3, v2, v0, v1, p2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v4, v5, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
+    move-result v4
+
+    if-nez v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/b;->c(ILjava/lang/String;Landroid/os/Bundle;)Z
+
+    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
+
+    :cond_1
+    :try_start_1
     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
+    move-result p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    if-eqz p3, :cond_1
+    if-eqz p1, :cond_2
 
     goto :goto_1
 
-    :cond_1
-    const/4 p1, 0x0
+    :cond_2
+    const/4 v2, 0x0
 
     :goto_1
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
-    return p1
+    return v2
 
     :catchall_0
     move-exception p1
@@ -353,7 +469,7 @@
 .end method
 
 .method public final d(ILjava/lang/String;Landroid/os/Bundle;)Z
-    .locals 3
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -377,49 +493,77 @@
 
     invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 p2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p3, :cond_0
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, p2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
-    iget-object p3, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
+    iget-object v4, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
 
-    const/4 v2, 0x6
+    const/4 v5, 0x6
 
-    invoke-interface {p3, v2, v0, v1, p2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v4, v5, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
+    move-result v4
+
+    if-nez v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/b;->d(ILjava/lang/String;Landroid/os/Bundle;)Z
+
+    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
+
+    :cond_1
+    :try_start_1
     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
+    move-result p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    if-eqz p3, :cond_1
+    if-eqz p1, :cond_2
 
     goto :goto_1
 
-    :cond_1
-    const/4 p1, 0x0
+    :cond_2
+    const/4 v2, 0x0
 
     :goto_1
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
-    return p1
+    return v2
 
     :catchall_0
     move-exception p1
@@ -431,8 +575,8 @@
     throw p1
 .end method
 
-.method public final dE(Ljava/lang/String;)Z
-    .locals 4
+.method public final dy(Ljava/lang/String;)Z
+    .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -454,32 +598,60 @@
 
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
 
-    const/4 v2, 0x2
+    const/4 v3, 0x2
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    invoke-interface {p1, v2, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    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
+    move-result v2
 
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+    if-nez v2, :cond_0
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_0
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1}, Lcom/a/a/a/b;->dy(Ljava/lang/String;)Z
 
     move-result p1
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-eqz p1, :cond_0
-
-    const/4 v3, 0x1
-
-    :cond_0
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
-    return v3
+    return p1
+
+    :cond_0
+    :try_start_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-eqz p1, :cond_1
+
+    const/4 v4, 0x1
+
+    :cond_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return v4
 
     :catchall_0
     move-exception p1
@@ -492,7 +664,7 @@
 .end method
 
 .method public final e(ILjava/lang/String;Landroid/os/Bundle;)Z
-    .locals 3
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -516,49 +688,77 @@
 
     invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 p2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p3, :cond_0
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, p2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
-    iget-object p3, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
+    iget-object v4, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
 
-    const/4 v2, 0x7
+    const/4 v5, 0x7
 
-    invoke-interface {p3, v2, v0, v1, p2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v4, v5, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
+    move-result v4
+
+    if-nez v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/b;->e(ILjava/lang/String;Landroid/os/Bundle;)Z
+
+    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
+
+    :cond_1
+    :try_start_1
     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
+    move-result p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    if-eqz p3, :cond_1
+    if-eqz p1, :cond_2
 
     goto :goto_1
 
-    :cond_1
-    const/4 p1, 0x0
+    :cond_2
+    const/4 v2, 0x0
 
     :goto_1
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
-    return p1
+    return v2
 
     :catchall_0
     move-exception p1
@@ -571,7 +771,7 @@
 .end method
 
 .method public final f(ILjava/lang/String;Landroid/os/Bundle;)Z
-    .locals 3
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -595,49 +795,77 @@
 
     invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 p2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p3, :cond_0
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, p2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
-    iget-object p3, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
+    iget-object v4, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
 
-    const/16 v2, 0x8
+    const/16 v5, 0x8
 
-    invoke-interface {p3, v2, v0, v1, p2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v4, v5, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
+    move-result v4
+
+    if-nez v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/b;->f(ILjava/lang/String;Landroid/os/Bundle;)Z
+
+    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
+
+    :cond_1
+    :try_start_1
     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
+    move-result p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    if-eqz p3, :cond_1
+    if-eqz p1, :cond_2
 
     goto :goto_1
 
-    :cond_1
-    const/4 p1, 0x0
+    :cond_2
+    const/4 v2, 0x0
 
     :goto_1
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
-    return p1
+    return v2
 
     :catchall_0
     move-exception p1
@@ -650,7 +878,7 @@
 .end method
 
 .method public final g(ILjava/lang/String;Landroid/os/Bundle;)Z
-    .locals 3
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -674,49 +902,77 @@
 
     invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 p2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p3, :cond_0
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, p2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
-    iget-object p3, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
+    iget-object v4, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
 
-    const/16 v2, 0x9
+    const/16 v5, 0x9
 
-    invoke-interface {p3, v2, v0, v1, p2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v4, v5, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
+    move-result v4
+
+    if-nez v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/b;->g(ILjava/lang/String;Landroid/os/Bundle;)Z
+
+    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
+
+    :cond_1
+    :try_start_1
     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
+    move-result p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    if-eqz p3, :cond_1
+    if-eqz p1, :cond_2
 
     goto :goto_1
 
-    :cond_1
-    const/4 p1, 0x0
+    :cond_2
+    const/4 v2, 0x0
 
     :goto_1
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
-    return p1
+    return v2
 
     :catchall_0
     move-exception p1
@@ -729,7 +985,7 @@
 .end method
 
 .method public final h(ILjava/lang/String;Landroid/os/Bundle;)Z
-    .locals 3
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -753,49 +1009,77 @@
 
     invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    const/4 p1, 0x1
+    const/4 v2, 0x1
 
-    const/4 p2, 0x0
+    const/4 v3, 0x0
 
     if-eqz p3, :cond_0
 
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
 
-    invoke-virtual {p3, v0, p2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {p3, v0, v3}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_0
-    iget-object p3, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
+    iget-object v4, p0, Lcom/a/a/a/b$a$a;->i:Landroid/os/IBinder;
 
-    const/16 v2, 0xa
+    const/16 v5, 0xa
 
-    invoke-interface {p3, v2, v0, v1, p2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    invoke-interface {v4, v5, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
 
+    move-result v4
+
+    if-nez v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    invoke-static {}, Lcom/a/a/a/b$a;->Cg()Lcom/a/a/a/b;
+
+    move-result-object v2
+
+    invoke-interface {v2, p1, p2, p3}, Lcom/a/a/a/b;->h(ILjava/lang/String;Landroid/os/Bundle;)Z
+
+    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
+
+    :cond_1
+    :try_start_1
     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
+    move-result p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    if-eqz p3, :cond_1
+    if-eqz p1, :cond_2
 
     goto :goto_1
 
-    :cond_1
-    const/4 p1, 0x0
+    :cond_2
+    const/4 v2, 0x0
 
     :goto_1
     invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
 
     invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
 
-    return p1
+    return v2
 
     :catchall_0
     move-exception p1
diff --git a/com.discord/smali/com/a/a/a/b$a.smali b/com.discord/smali/com/a/a/a/b$a.smali
index 599c771020..f3aa77f877 100644
--- a/com.discord/smali/com/a/a/a/b$a.smali
+++ b/com.discord/smali/com/a/a/a/b$a.smali
@@ -24,6 +24,14 @@
 
 
 # direct methods
+.method public static Cg()Lcom/a/a/a/b;
+    .locals 1
+
+    sget-object v0, Lcom/a/a/a/b$a$a;->bbI:Lcom/a/a/a/b;
+
+    return-object v0
+.end method
+
 .method public static l(Landroid/os/IBinder;)Lcom/a/a/a/b;
     .locals 2
 
@@ -397,7 +405,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lcom/a/a/a/b$a;->dE(Ljava/lang/String;)Z
+    invoke-virtual {p0, p1}, Lcom/a/a/a/b$a;->dy(Ljava/lang/String;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/a/a/a/b.smali b/com.discord/smali/com/a/a/a/b.smali
index 82e40e49f2..5b97602191 100644
--- a/com.discord/smali/com/a/a/a/b.smali
+++ b/com.discord/smali/com/a/a/a/b.smali
@@ -55,7 +55,7 @@
     .end annotation
 .end method
 
-.method public abstract dE(Ljava/lang/String;)Z
+.method public abstract dy(Ljava/lang/String;)Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
diff --git a/com.discord/smali/com/adjust/sdk/a$16.smali b/com.discord/smali/com/adjust/sdk/a$16.smali
index c9b525a32c..91df3b4cef 100644
--- a/com.discord/smali/com/adjust/sdk/a$16.smali
+++ b/com.discord/smali/com/adjust/sdk/a$16.smali
@@ -63,7 +63,7 @@
     :cond_1
     iget-object v0, p0, Lcom/adjust/sdk/a$16;->ci:Lcom/adjust/sdk/u;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/u;->eW:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/u;->eV:Z
 
     if-eqz v1, :cond_2
 
diff --git a/com.discord/smali/com/adjust/sdk/a$18.smali b/com.discord/smali/com/adjust/sdk/a$18.smali
index c35bed43d0..bcd8a0ad25 100644
--- a/com.discord/smali/com/adjust/sdk/a$18.smali
+++ b/com.discord/smali/com/adjust/sdk/a$18.smali
@@ -63,7 +63,7 @@
     :cond_1
     iget-object v0, p0, Lcom/adjust/sdk/a$18;->ci:Lcom/adjust/sdk/u;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/u;->eW:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/u;->eV:Z
 
     if-nez v1, :cond_2
 
diff --git a/com.discord/smali/com/adjust/sdk/a$19.smali b/com.discord/smali/com/adjust/sdk/a$19.smali
index 7a30b99345..92808b944b 100644
--- a/com.discord/smali/com/adjust/sdk/a$19.smali
+++ b/com.discord/smali/com/adjust/sdk/a$19.smali
@@ -63,7 +63,7 @@
     :cond_1
     iget-object v0, p0, Lcom/adjust/sdk/a$19;->ck:Lcom/adjust/sdk/av;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/av;->eW:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/av;->eV:Z
 
     if-eqz v1, :cond_2
 
diff --git a/com.discord/smali/com/adjust/sdk/a$20.smali b/com.discord/smali/com/adjust/sdk/a$20.smali
index 22328db248..8edf47c72c 100644
--- a/com.discord/smali/com/adjust/sdk/a$20.smali
+++ b/com.discord/smali/com/adjust/sdk/a$20.smali
@@ -63,7 +63,7 @@
     :cond_1
     iget-object v0, p0, Lcom/adjust/sdk/a$20;->ck:Lcom/adjust/sdk/av;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/av;->eW:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/av;->eV:Z
 
     if-nez v1, :cond_2
 
diff --git a/com.discord/smali/com/adjust/sdk/a.smali b/com.discord/smali/com/adjust/sdk/a.smali
index dc67f304e5..d53090d805 100644
--- a/com.discord/smali/com/adjust/sdk/a.smali
+++ b/com.discord/smali/com/adjust/sdk/a.smali
@@ -777,7 +777,7 @@
     :cond_4
     iget-object v0, p0, Lcom/adjust/sdk/a;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dN:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dM:Ljava/lang/String;
 
     if-nez v0, :cond_5
 
@@ -791,6 +791,12 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/a;->bX:Lcom/adjust/sdk/t;
 
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dP:Ljava/lang/String;
+
+    if-nez v0, :cond_6
+
+    iget-object v0, p0, Lcom/adjust/sdk/a;->bX:Lcom/adjust/sdk/t;
+
     iget-object v0, v0, Lcom/adjust/sdk/t;->dQ:Ljava/lang/String;
 
     if-nez v0, :cond_6
@@ -801,12 +807,6 @@
 
     if-nez v0, :cond_6
 
-    iget-object v0, p0, Lcom/adjust/sdk/a;->bX:Lcom/adjust/sdk/t;
-
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dS:Ljava/lang/String;
-
-    if-nez v0, :cond_6
-
     iget-object v0, p0, Lcom/adjust/sdk/a;->bS:Lcom/adjust/sdk/x;
 
     new-array v1, v9, [Ljava/lang/Object;
@@ -1188,9 +1188,9 @@
 
     invoke-direct/range {v1 .. v7}, Lcom/adjust/sdk/am;-><init>(Lcom/adjust/sdk/f;Lcom/adjust/sdk/t;Lcom/adjust/sdk/d;Lcom/adjust/sdk/au;J)V
 
-    iput-object p5, v0, Lcom/adjust/sdk/am;->eI:Ljava/lang/String;
+    iput-object p5, v0, Lcom/adjust/sdk/am;->eH:Ljava/lang/String;
 
-    iput-wide p1, v0, Lcom/adjust/sdk/am;->eL:J
+    iput-wide p1, v0, Lcom/adjust/sdk/am;->eK:J
 
     iput-wide p3, v0, Lcom/adjust/sdk/am;->installBeginTimeInSeconds:J
 
@@ -1278,7 +1278,7 @@
     invoke-direct {p0, v0}, Lcom/adjust/sdk/a;->a(Landroid/os/Handler;)V
 
     :cond_0
-    iget-boolean v1, p1, Lcom/adjust/sdk/av;->eW:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/av;->eV:Z
 
     if-eqz v1, :cond_1
 
@@ -1293,7 +1293,7 @@
     invoke-virtual {v1}, Lcom/adjust/sdk/aw;->aD()V
 
     :cond_1
-    iget-boolean v1, p1, Lcom/adjust/sdk/av;->eW:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/av;->eV:Z
 
     const/4 v2, 0x0
 
@@ -1322,7 +1322,7 @@
     goto :goto_0
 
     :cond_2
-    iget-boolean v1, p1, Lcom/adjust/sdk/av;->eW:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/av;->eV:Z
 
     if-nez v1, :cond_3
 
@@ -1517,7 +1517,7 @@
 
     move-result-object v4
 
-    iget-object v5, v2, Lcom/adjust/sdk/am;->eE:Lcom/adjust/sdk/am$a;
+    iget-object v5, v2, Lcom/adjust/sdk/am;->eD:Lcom/adjust/sdk/am$a;
 
     iget v5, v5, Lcom/adjust/sdk/am$a;->eventCount:I
 
@@ -1690,7 +1690,7 @@
     invoke-direct {p0, v0}, Lcom/adjust/sdk/a;->a(Landroid/os/Handler;)V
 
     :cond_0
-    iget-object p1, p1, Lcom/adjust/sdk/p;->dA:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/adjust/sdk/p;->dz:Landroid/net/Uri;
 
     if-eqz p1, :cond_2
 
@@ -1779,7 +1779,7 @@
 
     invoke-direct {v0, v1}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
 
-    iget-boolean v1, p1, Lcom/adjust/sdk/u;->eW:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/u;->eV:Z
 
     const/4 v2, 0x0
 
@@ -1808,7 +1808,7 @@
     return-void
 
     :cond_0
-    iget-boolean v1, p1, Lcom/adjust/sdk/u;->eW:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/u;->eV:Z
 
     if-nez v1, :cond_1
 
@@ -2362,13 +2362,13 @@
 
     long-to-double v4, v4
 
-    sget-object v8, Lcom/adjust/sdk/az;->fi:Ljava/text/DecimalFormat;
+    sget-object v8, Lcom/adjust/sdk/az;->fh:Ljava/text/DecimalFormat;
 
     invoke-virtual {v8, v0, v1}, Ljava/text/DecimalFormat;->format(D)Ljava/lang/String;
 
     move-result-object v0
 
-    sget-object v1, Lcom/adjust/sdk/az;->fi:Ljava/text/DecimalFormat;
+    sget-object v1, Lcom/adjust/sdk/az;->fh:Ljava/text/DecimalFormat;
 
     invoke-virtual {v1, v4, v5}, Ljava/text/DecimalFormat;->format(D)Ljava/lang/String;
 
@@ -2396,7 +2396,7 @@
     move-wide v2, v4
 
     :goto_1
-    sget-object v4, Lcom/adjust/sdk/az;->fi:Ljava/text/DecimalFormat;
+    sget-object v4, Lcom/adjust/sdk/az;->fh:Ljava/text/DecimalFormat;
 
     invoke-virtual {v4, v0, v1}, Ljava/text/DecimalFormat;->format(D)Ljava/lang/String;
 
@@ -2485,7 +2485,7 @@
 
     iget-object p0, p0, Lcom/adjust/sdk/a;->bT:Lcom/adjust/sdk/ax;
 
-    iget-boolean v0, p0, Lcom/adjust/sdk/ax;->ff:Z
+    iget-boolean v0, p0, Lcom/adjust/sdk/ax;->fe:Z
 
     const/4 v1, 0x1
 
@@ -2520,7 +2520,7 @@
 
     invoke-interface {v0, v3, v1}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/ax;->fb:Lcom/adjust/sdk/s;
+    iget-object v0, p0, Lcom/adjust/sdk/ax;->fa:Lcom/adjust/sdk/s;
 
     new-instance v4, Lcom/adjust/sdk/ax$1;
 
@@ -2528,19 +2528,19 @@
 
     iget-wide v5, p0, Lcom/adjust/sdk/ax;->initialDelay:J
 
-    iget-wide v7, p0, Lcom/adjust/sdk/ax;->fe:J
+    iget-wide v7, p0, Lcom/adjust/sdk/ax;->fd:J
 
     sget-object v9, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget-object v3, v0, Lcom/adjust/sdk/s;->dH:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object v3, v0, Lcom/adjust/sdk/s;->dG:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
 
     invoke-virtual/range {v3 .. v9}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->scheduleWithFixedDelay(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/adjust/sdk/ax;->fc:Ljava/util/concurrent/ScheduledFuture;
+    iput-object v0, p0, Lcom/adjust/sdk/ax;->fb:Ljava/util/concurrent/ScheduledFuture;
 
-    iput-boolean v2, p0, Lcom/adjust/sdk/ax;->ff:Z
+    iput-boolean v2, p0, Lcom/adjust/sdk/ax;->fe:Z
 
     :cond_1
     return-void
@@ -3169,7 +3169,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/a;->bT:Lcom/adjust/sdk/ax;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/ax;->ff:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/ax;->fe:Z
 
     const/4 v2, 0x1
 
@@ -3192,7 +3192,7 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lcom/adjust/sdk/ax;->fc:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, v0, Lcom/adjust/sdk/ax;->fb:Ljava/util/concurrent/ScheduledFuture;
 
     sget-object v4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -3202,11 +3202,11 @@
 
     iput-wide v4, v0, Lcom/adjust/sdk/ax;->initialDelay:J
 
-    iget-object v1, v0, Lcom/adjust/sdk/ax;->fc:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, v0, Lcom/adjust/sdk/ax;->fb:Ljava/util/concurrent/ScheduledFuture;
 
     invoke-interface {v1, v3}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
 
-    sget-object v1, Lcom/adjust/sdk/az;->fi:Ljava/text/DecimalFormat;
+    sget-object v1, Lcom/adjust/sdk/az;->fh:Ljava/text/DecimalFormat;
 
     iget-wide v4, v0, Lcom/adjust/sdk/ax;->initialDelay:J
 
@@ -3238,7 +3238,7 @@
 
     invoke-interface {v4, v1, v5}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iput-boolean v2, v0, Lcom/adjust/sdk/ax;->ff:Z
+    iput-boolean v2, v0, Lcom/adjust/sdk/ax;->fe:Z
 
     return-void
 .end method
@@ -3334,7 +3334,7 @@
 
     check-cast p1, Lcom/adjust/sdk/at;
 
-    iget-boolean v0, p1, Lcom/adjust/sdk/at;->fa:Z
+    iget-boolean v0, p1, Lcom/adjust/sdk/at;->eZ:Z
 
     if-eqz v0, :cond_1
 
diff --git a/com.discord/smali/com/adjust/sdk/ac$1.smali b/com.discord/smali/com/adjust/sdk/ac$1.smali
index 801a4a5e0f..c909f811ed 100644
--- a/com.discord/smali/com/adjust/sdk/ac$1.smali
+++ b/com.discord/smali/com/adjust/sdk/ac$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic er:Lcom/adjust/sdk/ac;
+.field final synthetic eq:Lcom/adjust/sdk/ac;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/ac;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/ac$1;->er:Lcom/adjust/sdk/ac;
+    iput-object p1, p0, Lcom/adjust/sdk/ac$1;->eq:Lcom/adjust/sdk/ac;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/adjust/sdk/ac$1;->er:Lcom/adjust/sdk/ac;
+    iget-object v0, p0, Lcom/adjust/sdk/ac$1;->eq:Lcom/adjust/sdk/ac;
 
     invoke-virtual {v0}, Lcom/adjust/sdk/ac;->al()V
 
diff --git a/com.discord/smali/com/adjust/sdk/ac.smali b/com.discord/smali/com/adjust/sdk/ac.smali
index 92575da561..9f272a08ff 100644
--- a/com.discord/smali/com/adjust/sdk/ac.smali
+++ b/com.discord/smali/com/adjust/sdk/ac.smali
@@ -21,15 +21,15 @@
     .end annotation
 .end field
 
-.field private em:I
+.field private el:I
 
-.field private en:Z
+.field private em:Z
+
+.field private en:Ljava/lang/Object;
 
 .field private eo:Ljava/lang/Object;
 
-.field private ep:Ljava/lang/Object;
-
-.field private eq:Lcom/adjust/sdk/ay;
+.field private ep:Lcom/adjust/sdk/ay;
 
 .field private retries:I
 
@@ -42,7 +42,7 @@
 
     const/16 v0, 0xbb8
 
-    iput v0, p0, Lcom/adjust/sdk/ac;->em:I
+    iput v0, p0, Lcom/adjust/sdk/ac;->el:I
 
     invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
 
@@ -56,11 +56,11 @@
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/adjust/sdk/ac;->ep:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/adjust/sdk/ac;->eo:Ljava/lang/Object;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/adjust/sdk/ac;->en:Z
+    iput-boolean p1, p0, Lcom/adjust/sdk/ac;->em:Z
 
     iput p1, p0, Lcom/adjust/sdk/ac;->retries:I
 
@@ -74,7 +74,7 @@
 
     invoke-direct {p1, v0, v1}, Lcom/adjust/sdk/ay;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/adjust/sdk/ac;->eq:Lcom/adjust/sdk/ay;
+    iput-object p1, p0, Lcom/adjust/sdk/ac;->ep:Lcom/adjust/sdk/ay;
 
     new-instance p1, Ljava/lang/ref/WeakReference;
 
@@ -119,7 +119,7 @@
 .method private a(Ljava/lang/Class;Ljava/lang/Object;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->eo:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->en:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
@@ -219,7 +219,7 @@
 .method private an()Ljava/lang/Object;
     .locals 5
 
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->eo:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->en:Ljava/lang/Object;
 
     const/4 v1, 0x0
 
@@ -268,12 +268,12 @@
 .method private ao()V
     .locals 7
 
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->ep:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->eo:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/adjust/sdk/ac;->en:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ac;->em:Z
 
     const/4 v2, 0x0
 
@@ -321,7 +321,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->eq:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->ep:Lcom/adjust/sdk/ay;
 
     invoke-virtual {v0}, Lcom/adjust/sdk/ay;->aF()J
 
@@ -350,9 +350,9 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->eq:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->ep:Lcom/adjust/sdk/ay;
 
-    iget v1, p0, Lcom/adjust/sdk/ac;->em:I
+    iget v1, p0, Lcom/adjust/sdk/ac;->el:I
 
     int-to-long v1, v1
 
@@ -374,7 +374,7 @@
 .method private ap()V
     .locals 5
 
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->eo:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->en:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
@@ -416,7 +416,7 @@
     invoke-interface {v3, v0, v4}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
 
     :goto_0
-    iput-object v1, p0, Lcom/adjust/sdk/ac;->eo:Ljava/lang/Object;
+    iput-object v1, p0, Lcom/adjust/sdk/ac;->en:Ljava/lang/Object;
 
     return-void
 .end method
@@ -617,14 +617,14 @@
     invoke-interface/range {v4 .. v9}, Lcom/adjust/sdk/v;->a(JJLjava/lang/String;)V
 
     :cond_4
-    iget-object p1, p0, Lcom/adjust/sdk/ac;->ep:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/adjust/sdk/ac;->eo:Ljava/lang/Object;
 
     monitor-enter p1
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    iput-boolean v3, p0, Lcom/adjust/sdk/ac;->en:Z
+    iput-boolean v3, p0, Lcom/adjust/sdk/ac;->em:Z
 
     monitor-exit p1
 
@@ -846,12 +846,12 @@
 
     invoke-direct {p0}, Lcom/adjust/sdk/ac;->ap()V
 
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->ep:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->eo:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/adjust/sdk/ac;->en:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ac;->em:Z
 
     if-eqz v1, :cond_0
 
@@ -880,7 +880,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/adjust/sdk/ac;->eo:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/adjust/sdk/ac;->en:Ljava/lang/Object;
 
     invoke-direct {p0}, Lcom/adjust/sdk/ac;->am()Ljava/lang/Class;
 
diff --git a/com.discord/smali/com/adjust/sdk/ad.smali b/com.discord/smali/com/adjust/sdk/ad.smali
index 8d2af4b07e..4a2c1a3a10 100644
--- a/com.discord/smali/com/adjust/sdk/ad.smali
+++ b/com.discord/smali/com/adjust/sdk/ad.smali
@@ -14,6 +14,8 @@
 
 
 # static fields
+.field public static final enum er:Lcom/adjust/sdk/ad;
+
 .field public static final enum es:Lcom/adjust/sdk/ad;
 
 .field public static final enum et:Lcom/adjust/sdk/ad;
@@ -26,9 +28,7 @@
 
 .field public static final enum ex:Lcom/adjust/sdk/ad;
 
-.field public static final enum ey:Lcom/adjust/sdk/ad;
-
-.field private static final synthetic ez:[Lcom/adjust/sdk/ad;
+.field private static final synthetic ey:[Lcom/adjust/sdk/ad;
 
 
 # instance fields
@@ -49,7 +49,7 @@
 
     invoke-direct {v0, v3, v1, v2}, Lcom/adjust/sdk/ad;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/adjust/sdk/ad;->es:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->er:Lcom/adjust/sdk/ad;
 
     new-instance v0, Lcom/adjust/sdk/ad;
 
@@ -61,7 +61,7 @@
 
     invoke-direct {v0, v5, v3, v4}, Lcom/adjust/sdk/ad;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/adjust/sdk/ad;->et:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->es:Lcom/adjust/sdk/ad;
 
     new-instance v0, Lcom/adjust/sdk/ad;
 
@@ -71,7 +71,7 @@
 
     invoke-direct {v0, v6, v2, v5}, Lcom/adjust/sdk/ad;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/adjust/sdk/ad;->eu:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->et:Lcom/adjust/sdk/ad;
 
     new-instance v0, Lcom/adjust/sdk/ad;
 
@@ -81,7 +81,7 @@
 
     invoke-direct {v0, v7, v4, v6}, Lcom/adjust/sdk/ad;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/adjust/sdk/ad;->ev:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->eu:Lcom/adjust/sdk/ad;
 
     new-instance v0, Lcom/adjust/sdk/ad;
 
@@ -91,7 +91,7 @@
 
     invoke-direct {v0, v8, v5, v7}, Lcom/adjust/sdk/ad;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/adjust/sdk/ad;->ew:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->ev:Lcom/adjust/sdk/ad;
 
     new-instance v0, Lcom/adjust/sdk/ad;
 
@@ -101,7 +101,7 @@
 
     invoke-direct {v0, v9, v6, v8}, Lcom/adjust/sdk/ad;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/adjust/sdk/ad;->ex:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->ew:Lcom/adjust/sdk/ad;
 
     new-instance v0, Lcom/adjust/sdk/ad;
 
@@ -111,39 +111,39 @@
 
     invoke-direct {v0, v9, v7, v10}, Lcom/adjust/sdk/ad;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/adjust/sdk/ad;->ey:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->ex:Lcom/adjust/sdk/ad;
 
     new-array v0, v8, [Lcom/adjust/sdk/ad;
 
-    sget-object v8, Lcom/adjust/sdk/ad;->es:Lcom/adjust/sdk/ad;
+    sget-object v8, Lcom/adjust/sdk/ad;->er:Lcom/adjust/sdk/ad;
 
     aput-object v8, v0, v1
 
-    sget-object v1, Lcom/adjust/sdk/ad;->et:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->es:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/adjust/sdk/ad;->eu:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->et:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/adjust/sdk/ad;->ev:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->eu:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/adjust/sdk/ad;->ew:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->ev:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/adjust/sdk/ad;->ex:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->ew:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/adjust/sdk/ad;->ey:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->ex:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v7
 
-    sput-object v0, Lcom/adjust/sdk/ad;->ez:[Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->ey:[Lcom/adjust/sdk/ad;
 
     return-void
 .end method
@@ -180,7 +180,7 @@
 .method public static values()[Lcom/adjust/sdk/ad;
     .locals 1
 
-    sget-object v0, Lcom/adjust/sdk/ad;->ez:[Lcom/adjust/sdk/ad;
+    sget-object v0, Lcom/adjust/sdk/ad;->ey:[Lcom/adjust/sdk/ad;
 
     invoke-virtual {v0}, [Lcom/adjust/sdk/ad;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/adjust/sdk/ae.smali b/com.discord/smali/com/adjust/sdk/ae.smali
index 3c52b774a7..5b43f4f522 100644
--- a/com.discord/smali/com/adjust/sdk/ae.smali
+++ b/com.discord/smali/com/adjust/sdk/ae.smali
@@ -7,15 +7,15 @@
 
 
 # static fields
-.field private static eD:Ljava/lang/String; = "Error formating log message: %s, with params: %s"
+.field private static eC:Ljava/lang/String; = "Error formating log message: %s, with params: %s"
 
 
 # instance fields
-.field private eA:Lcom/adjust/sdk/ad;
+.field private eA:Z
 
 .field private eB:Z
 
-.field private eC:Z
+.field private ez:Lcom/adjust/sdk/ad;
 
 
 # direct methods
@@ -32,13 +32,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/ae;->eC:Z
-
     iput-boolean v0, p0, Lcom/adjust/sdk/ae;->eB:Z
 
-    sget-object v0, Lcom/adjust/sdk/ad;->eu:Lcom/adjust/sdk/ad;
+    iput-boolean v0, p0, Lcom/adjust/sdk/ae;->eA:Z
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->eC:Z
+    sget-object v0, Lcom/adjust/sdk/ad;->et:Lcom/adjust/sdk/ad;
+
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->eB:Z
 
     invoke-virtual {p0, v0, v1}, Lcom/adjust/sdk/ae;->a(Lcom/adjust/sdk/ad;Z)V
 
@@ -50,16 +50,16 @@
 .method public final a(Lcom/adjust/sdk/ad;Z)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/adjust/sdk/ae;->eB:Z
+    iget-boolean v0, p0, Lcom/adjust/sdk/ae;->eA:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/adjust/sdk/ae;->eA:Lcom/adjust/sdk/ad;
+    iput-object p1, p0, Lcom/adjust/sdk/ae;->ez:Lcom/adjust/sdk/ad;
 
-    iput-boolean p2, p0, Lcom/adjust/sdk/ae;->eC:Z
+    iput-boolean p2, p0, Lcom/adjust/sdk/ae;->eB:Z
 
     return-void
 .end method
@@ -69,14 +69,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->eC:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->eB:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->eA:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->ez:Lcom/adjust/sdk/ad;
 
     iget v1, v1, Lcom/adjust/sdk/ad;->androidLogLevel:I
 
@@ -100,7 +100,7 @@
     :catch_0
     sget-object v1, Ljava/util/Locale;->US:Ljava/util/Locale;
 
-    sget-object v3, Lcom/adjust/sdk/ae;->eD:Ljava/lang/String;
+    sget-object v3, Lcom/adjust/sdk/ae;->eC:Ljava/lang/String;
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -131,7 +131,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/ae;->eB:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/ae;->eA:Z
 
     return-void
 .end method
@@ -141,14 +141,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->eC:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->eB:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->eA:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->ez:Lcom/adjust/sdk/ad;
 
     iget v1, v1, Lcom/adjust/sdk/ad;->androidLogLevel:I
 
@@ -172,7 +172,7 @@
     :catch_0
     sget-object v1, Ljava/util/Locale;->US:Ljava/util/Locale;
 
-    sget-object v2, Lcom/adjust/sdk/ae;->eD:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->eC:Ljava/lang/String;
 
     const/4 v3, 0x2
 
@@ -205,14 +205,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->eC:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->eB:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->eA:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->ez:Lcom/adjust/sdk/ad;
 
     iget v1, v1, Lcom/adjust/sdk/ad;->androidLogLevel:I
 
@@ -236,7 +236,7 @@
     :catch_0
     sget-object v1, Ljava/util/Locale;->US:Ljava/util/Locale;
 
-    sget-object v2, Lcom/adjust/sdk/ae;->eD:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->eC:Ljava/lang/String;
 
     const/4 v3, 0x2
 
@@ -269,14 +269,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->eC:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->eB:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->eA:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->ez:Lcom/adjust/sdk/ad;
 
     iget v1, v1, Lcom/adjust/sdk/ad;->androidLogLevel:I
 
@@ -300,7 +300,7 @@
     :catch_0
     sget-object v1, Ljava/util/Locale;->US:Ljava/util/Locale;
 
-    sget-object v2, Lcom/adjust/sdk/ae;->eD:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->eC:Ljava/lang/String;
 
     const/4 v3, 0x2
 
@@ -333,7 +333,7 @@
 
     const-string v0, "Adjust"
 
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->eA:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->ez:Lcom/adjust/sdk/ad;
 
     iget v1, v1, Lcom/adjust/sdk/ad;->androidLogLevel:I
 
@@ -357,7 +357,7 @@
     :catch_0
     sget-object v1, Ljava/util/Locale;->US:Ljava/util/Locale;
 
-    sget-object v2, Lcom/adjust/sdk/ae;->eD:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->eC:Ljava/lang/String;
 
     const/4 v3, 0x2
 
@@ -390,14 +390,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->eC:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->eB:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->eA:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->ez:Lcom/adjust/sdk/ad;
 
     iget v1, v1, Lcom/adjust/sdk/ad;->androidLogLevel:I
 
@@ -421,7 +421,7 @@
     :catch_0
     sget-object v1, Ljava/util/Locale;->US:Ljava/util/Locale;
 
-    sget-object v2, Lcom/adjust/sdk/ae;->eD:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->eC:Ljava/lang/String;
 
     const/4 v3, 0x2
 
diff --git a/com.discord/smali/com/adjust/sdk/am$a.smali b/com.discord/smali/com/adjust/sdk/am$a.smali
index d146f8a2c7..ad967519a4 100644
--- a/com.discord/smali/com/adjust/sdk/am$a.smali
+++ b/com.discord/smali/com/adjust/sdk/am$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final synthetic eM:Lcom/adjust/sdk/am;
+.field final synthetic eL:Lcom/adjust/sdk/am;
 
 .field eventCount:I
 
@@ -38,7 +38,7 @@
 .method constructor <init>(Lcom/adjust/sdk/am;Lcom/adjust/sdk/d;)V
     .locals 3
 
-    iput-object p1, p0, Lcom/adjust/sdk/am$a;->eM:Lcom/adjust/sdk/am;
+    iput-object p1, p0, Lcom/adjust/sdk/am$a;->eL:Lcom/adjust/sdk/am;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/adjust/sdk/am.smali b/com.discord/smali/com/adjust/sdk/am.smali
index 86ba3680b6..2dfe7cd9f9 100644
--- a/com.discord/smali/com/adjust/sdk/am.smali
+++ b/com.discord/smali/com/adjust/sdk/am.smali
@@ -26,11 +26,11 @@
 
 .field clickTimeInMilliseconds:J
 
-.field eE:Lcom/adjust/sdk/am$a;
+.field eD:Lcom/adjust/sdk/am$a;
 
-.field private eF:J
+.field private eE:J
 
-.field eG:Ljava/util/Map;
+.field eF:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -41,15 +41,15 @@
     .end annotation
 .end field
 
+.field eG:Ljava/lang/String;
+
 .field eH:Ljava/lang/String;
 
 .field eI:Ljava/lang/String;
 
 .field eJ:Ljava/lang/String;
 
-.field eK:Ljava/lang/String;
-
-.field eL:J
+.field eK:J
 
 .field installBeginTimeInSeconds:J
 
@@ -76,7 +76,7 @@
 
     iput-wide v0, p0, Lcom/adjust/sdk/am;->clickTimeInMilliseconds:J
 
-    iput-wide v0, p0, Lcom/adjust/sdk/am;->eL:J
+    iput-wide v0, p0, Lcom/adjust/sdk/am;->eK:J
 
     iput-wide v0, p0, Lcom/adjust/sdk/am;->installBeginTimeInSeconds:J
 
@@ -88,11 +88,11 @@
 
     invoke-direct {p1, p0, p3}, Lcom/adjust/sdk/am$a;-><init>(Lcom/adjust/sdk/am;Lcom/adjust/sdk/d;)V
 
-    iput-object p1, p0, Lcom/adjust/sdk/am;->eE:Lcom/adjust/sdk/am$a;
+    iput-object p1, p0, Lcom/adjust/sdk/am;->eD:Lcom/adjust/sdk/am$a;
 
     iput-object p4, p0, Lcom/adjust/sdk/am;->cc:Lcom/adjust/sdk/au;
 
-    iput-wide p5, p0, Lcom/adjust/sdk/am;->eF:J
+    iput-wide p5, p0, Lcom/adjust/sdk/am;->eE:J
 
     return-void
 .end method
@@ -113,7 +113,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dT:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dS:Ljava/lang/String;
 
     const-string v1, "fb_id"
 
@@ -129,7 +129,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dU:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dT:Ljava/lang/String;
 
     const-string v1, "app_version"
 
@@ -137,7 +137,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dV:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dU:Ljava/lang/String;
 
     const-string v1, "device_type"
 
@@ -153,7 +153,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dW:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dV:Ljava/lang/String;
 
     const-string v1, "device_manufacturer"
 
@@ -161,7 +161,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dX:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dW:Ljava/lang/String;
 
     const-string v1, "os_name"
 
@@ -169,7 +169,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dY:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dX:Ljava/lang/String;
 
     const-string v1, "os_version"
 
@@ -177,7 +177,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dZ:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dY:Ljava/lang/String;
 
     const-string v1, "api_level"
 
@@ -201,7 +201,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->ea:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dZ:Ljava/lang/String;
 
     const-string v1, "screen_size"
 
@@ -209,7 +209,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->eb:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ea:Ljava/lang/String;
 
     const-string v1, "screen_format"
 
@@ -217,7 +217,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->ec:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->eb:Ljava/lang/String;
 
     const-string v1, "screen_density"
 
@@ -225,7 +225,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->ed:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ec:Ljava/lang/String;
 
     const-string v1, "display_width"
 
@@ -233,7 +233,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->ee:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ed:Ljava/lang/String;
 
     const-string v1, "display_height"
 
@@ -241,7 +241,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->ef:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ee:Ljava/lang/String;
 
     const-string v1, "hardware_name"
 
@@ -249,7 +249,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->eg:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ef:Ljava/lang/String;
 
     const-string v1, "cpu_type"
 
@@ -257,7 +257,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->eh:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->eg:Ljava/lang/String;
 
     const-string v1, "os_build"
 
@@ -265,7 +265,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->ei:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->eh:Ljava/lang/String;
 
     const-string v1, "vm_isa"
 
@@ -476,7 +476,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/adjust/sdk/az;->fj:Ljava/text/SimpleDateFormat;
+    sget-object v0, Lcom/adjust/sdk/az;->fi:Ljava/text/SimpleDateFormat;
 
     invoke-virtual {v0, p2}, Ljava/text/SimpleDateFormat;->format(Ljava/util/Date;)Ljava/lang/String;
 
@@ -610,7 +610,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dO:Ljava/lang/Boolean;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dN:Ljava/lang/Boolean;
 
     const-string v1, "tracking_enabled"
 
@@ -618,7 +618,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dN:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dM:Ljava/lang/String;
 
     const-string v1, "gps_adid"
 
@@ -626,13 +626,13 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dN:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dM:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dQ:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dP:Ljava/lang/String;
 
     const-string v1, "mac_sha1"
 
@@ -640,7 +640,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dR:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dQ:Ljava/lang/String;
 
     const-string v1, "mac_md5"
 
@@ -648,7 +648,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->dS:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->dR:Ljava/lang/String;
 
     const-string v1, "android_id"
 
@@ -738,7 +738,7 @@
 
     invoke-static {p1, v1, v0}, Lcom/adjust/sdk/am;->a(Ljava/util/Map;Ljava/lang/String;Ljava/lang/Boolean;)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/am;->eE:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->eD:Lcom/adjust/sdk/am$a;
 
     iget-object v0, v0, Lcom/adjust/sdk/am$a;->pushToken:Ljava/lang/String;
 
@@ -880,7 +880,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/adjust/sdk/am;->eE:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->eD:Lcom/adjust/sdk/am$a;
 
     iget-object v0, v0, Lcom/adjust/sdk/am$a;->uuid:Ljava/lang/String;
 
@@ -888,7 +888,7 @@
 
     invoke-static {p1, v1, v0}, Lcom/adjust/sdk/am;->a(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/am;->eE:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->eD:Lcom/adjust/sdk/am$a;
 
     iget v0, v0, Lcom/adjust/sdk/am$a;->sessionCount:I
 
@@ -898,7 +898,7 @@
 
     invoke-static {p1, v2, v0, v1}, Lcom/adjust/sdk/am;->a(Ljava/util/Map;Ljava/lang/String;J)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/am;->eE:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->eD:Lcom/adjust/sdk/am$a;
 
     iget v0, v0, Lcom/adjust/sdk/am$a;->subsessionCount:I
 
@@ -908,7 +908,7 @@
 
     invoke-static {p1, v2, v0, v1}, Lcom/adjust/sdk/am;->a(Ljava/util/Map;Ljava/lang/String;J)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/am;->eE:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->eD:Lcom/adjust/sdk/am$a;
 
     iget-wide v0, v0, Lcom/adjust/sdk/am$a;->sessionLength:J
 
@@ -916,7 +916,7 @@
 
     invoke-static {p1, v2, v0, v1}, Lcom/adjust/sdk/am;->d(Ljava/util/Map;Ljava/lang/String;J)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/am;->eE:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->eD:Lcom/adjust/sdk/am$a;
 
     iget-wide v0, v0, Lcom/adjust/sdk/am$a;->timeSpent:J
 
@@ -975,7 +975,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/adjust/sdk/am;->eF:J
+    iget-wide v0, p0, Lcom/adjust/sdk/am;->eE:J
 
     const-string v2, "created_at"
 
@@ -1120,7 +1120,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->el:Ljava/util/Map;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ek:Ljava/util/Map;
 
     if-nez v0, :cond_0
 
@@ -1129,7 +1129,7 @@
     :cond_0
     iget-object v0, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->el:Ljava/util/Map;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ek:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -1188,7 +1188,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/adjust/sdk/am;->eE:Lcom/adjust/sdk/am$a;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->eD:Lcom/adjust/sdk/am$a;
 
     iget-wide v1, v1, Lcom/adjust/sdk/am$a;->lastInterval:J
 
@@ -1206,7 +1206,7 @@
 
     iget-object v1, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v1, v1, Lcom/adjust/sdk/t;->ej:Ljava/lang/String;
+    iget-object v1, v1, Lcom/adjust/sdk/t;->ei:Ljava/lang/String;
 
     const-string v2, "installed_at"
 
@@ -1214,7 +1214,7 @@
 
     iget-object v1, p0, Lcom/adjust/sdk/am;->bX:Lcom/adjust/sdk/t;
 
-    iget-object v1, v1, Lcom/adjust/sdk/t;->ek:Ljava/lang/String;
+    iget-object v1, v1, Lcom/adjust/sdk/t;->ej:Ljava/lang/String;
 
     const-string v2, "updated_at"
 
@@ -1335,37 +1335,37 @@
 
     invoke-static {v0, p1, v1, v2}, Lcom/adjust/sdk/am;->b(Ljava/util/Map;Ljava/lang/String;J)V
 
-    iget-object v1, p0, Lcom/adjust/sdk/am;->eH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->eG:Ljava/lang/String;
 
     const-string v2, "reftag"
 
     invoke-static {v0, v2, v1}, Lcom/adjust/sdk/am;->a(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/adjust/sdk/am;->eG:Ljava/util/Map;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->eF:Ljava/util/Map;
 
     const-string v2, "params"
 
     invoke-static {v0, v2, v1}, Lcom/adjust/sdk/am;->a(Ljava/util/Map;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v1, p0, Lcom/adjust/sdk/am;->eI:Ljava/lang/String;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->eH:Ljava/lang/String;
 
     const-string v2, "referrer"
 
     invoke-static {v0, v2, v1}, Lcom/adjust/sdk/am;->a(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/adjust/sdk/am;->eJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->eI:Ljava/lang/String;
 
     const-string v2, "raw_referrer"
 
     invoke-static {v0, v2, v1}, Lcom/adjust/sdk/am;->a(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/adjust/sdk/am;->eK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->eJ:Ljava/lang/String;
 
     const-string v2, "deeplink"
 
     invoke-static {v0, v2, v1}, Lcom/adjust/sdk/am;->a(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-wide v1, p0, Lcom/adjust/sdk/am;->eL:J
+    iget-wide v1, p0, Lcom/adjust/sdk/am;->eK:J
 
     invoke-static {v0, p1, v1, v2}, Lcom/adjust/sdk/am;->c(Ljava/util/Map;Ljava/lang/String;J)V
 
@@ -1395,7 +1395,7 @@
 
     iput-wide v1, p1, Lcom/adjust/sdk/c;->clickTimeInMilliseconds:J
 
-    iget-wide v1, p0, Lcom/adjust/sdk/am;->eL:J
+    iget-wide v1, p0, Lcom/adjust/sdk/am;->eK:J
 
     iput-wide v1, p1, Lcom/adjust/sdk/c;->clickTimeInSeconds:J
 
diff --git a/com.discord/smali/com/adjust/sdk/an.smali b/com.discord/smali/com/adjust/sdk/an.smali
index ae72b98d34..eec29adf4f 100644
--- a/com.discord/smali/com/adjust/sdk/an.smali
+++ b/com.discord/smali/com/adjust/sdk/an.smali
@@ -192,11 +192,11 @@
 
     invoke-direct/range {v0 .. v6}, Lcom/adjust/sdk/am;-><init>(Lcom/adjust/sdk/f;Lcom/adjust/sdk/t;Lcom/adjust/sdk/d;Lcom/adjust/sdk/au;J)V
 
-    iput-object v7, v10, Lcom/adjust/sdk/am;->eG:Ljava/util/Map;
+    iput-object v7, v10, Lcom/adjust/sdk/am;->eF:Ljava/util/Map;
 
     iput-object v8, v10, Lcom/adjust/sdk/am;->bZ:Lcom/adjust/sdk/AdjustAttribution;
 
-    iput-object v9, v10, Lcom/adjust/sdk/am;->eH:Ljava/lang/String;
+    iput-object v9, v10, Lcom/adjust/sdk/am;->eG:Ljava/lang/String;
 
     return-object v10
 .end method
@@ -275,11 +275,11 @@
     return-object v0
 
     :cond_1
-    iput-object v1, p3, Lcom/adjust/sdk/am;->eI:Ljava/lang/String;
+    iput-object v1, p3, Lcom/adjust/sdk/am;->eH:Ljava/lang/String;
 
     iput-wide p1, p3, Lcom/adjust/sdk/am;->clickTimeInMilliseconds:J
 
-    iput-object p0, p3, Lcom/adjust/sdk/am;->eJ:Ljava/lang/String;
+    iput-object p0, p3, Lcom/adjust/sdk/am;->eI:Ljava/lang/String;
 
     const-string p0, "reftag"
 
diff --git a/com.discord/smali/com/adjust/sdk/ao$1.smali b/com.discord/smali/com/adjust/sdk/ao$1.smali
index 5dc6956f51..63e30a5fe5 100644
--- a/com.discord/smali/com/adjust/sdk/ao$1.smali
+++ b/com.discord/smali/com/adjust/sdk/ao$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic eQ:Lcom/adjust/sdk/ao;
+.field final synthetic eP:Lcom/adjust/sdk/ao;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/ao;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/ao$1;->eQ:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$1;->eP:Lcom/adjust/sdk/ao;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,7 +39,7 @@
 
     const-string v0, "Package queue"
 
-    iget-object v1, p0, Lcom/adjust/sdk/ao$1;->eQ:Lcom/adjust/sdk/ao;
+    iget-object v1, p0, Lcom/adjust/sdk/ao$1;->eP:Lcom/adjust/sdk/ao;
 
     invoke-static {v1}, Lcom/adjust/sdk/j;->a(Lcom/adjust/sdk/y;)Lcom/adjust/sdk/z;
 
@@ -51,7 +51,7 @@
 
     invoke-direct {v2}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
 
-    iput-object v2, v1, Lcom/adjust/sdk/ao;->eO:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v2, v1, Lcom/adjust/sdk/ao;->eN:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v2, 0x1
 
@@ -70,7 +70,7 @@
 
     check-cast v4, Ljava/util/List;
 
-    iput-object v4, v1, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iput-object v4, v1, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -99,10 +99,10 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, v1, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iput-object v0, v1, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
 
     :goto_0
-    iget-object v0, v1, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iget-object v0, v1, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
@@ -110,7 +110,7 @@
 
     new-array v2, v2, [Ljava/lang/Object;
 
-    iget-object v1, v1, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iget-object v1, v1, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -133,7 +133,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, v1, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iput-object v0, v1, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/adjust/sdk/ao$2.smali b/com.discord/smali/com/adjust/sdk/ao$2.smali
index e0c5d1b381..d889dbbf74 100644
--- a/com.discord/smali/com/adjust/sdk/ao$2.smali
+++ b/com.discord/smali/com/adjust/sdk/ao$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic eQ:Lcom/adjust/sdk/ao;
+.field final synthetic eP:Lcom/adjust/sdk/ao;
 
-.field final synthetic eR:Lcom/adjust/sdk/c;
+.field final synthetic eQ:Lcom/adjust/sdk/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/ao;Lcom/adjust/sdk/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/ao$2;->eQ:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$2;->eP:Lcom/adjust/sdk/ao;
 
-    iput-object p2, p0, Lcom/adjust/sdk/ao$2;->eR:Lcom/adjust/sdk/c;
+    iput-object p2, p0, Lcom/adjust/sdk/ao$2;->eQ:Lcom/adjust/sdk/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,11 +41,11 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/adjust/sdk/ao$2;->eQ:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$2;->eP:Lcom/adjust/sdk/ao;
 
-    iget-object v1, p0, Lcom/adjust/sdk/ao$2;->eR:Lcom/adjust/sdk/c;
+    iget-object v1, p0, Lcom/adjust/sdk/ao$2;->eQ:Lcom/adjust/sdk/c;
 
-    iget-object v2, v0, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iget-object v2, v0, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -55,7 +55,7 @@
 
     new-array v3, v3, [Ljava/lang/Object;
 
-    iget-object v4, v0, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iget-object v4, v0, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
diff --git a/com.discord/smali/com/adjust/sdk/ao$3.smali b/com.discord/smali/com/adjust/sdk/ao$3.smali
index 95c2a17526..57281b1581 100644
--- a/com.discord/smali/com/adjust/sdk/ao$3.smali
+++ b/com.discord/smali/com/adjust/sdk/ao$3.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic eQ:Lcom/adjust/sdk/ao;
+.field final synthetic eP:Lcom/adjust/sdk/ao;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/ao;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/ao$3;->eQ:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$3;->eP:Lcom/adjust/sdk/ao;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/adjust/sdk/ao$3;->eQ:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$3;->eP:Lcom/adjust/sdk/ao;
 
     invoke-virtual {v0}, Lcom/adjust/sdk/ao;->at()V
 
diff --git a/com.discord/smali/com/adjust/sdk/ao$4.smali b/com.discord/smali/com/adjust/sdk/ao$4.smali
index 6c65146dd4..3bb2e41a29 100644
--- a/com.discord/smali/com/adjust/sdk/ao$4.smali
+++ b/com.discord/smali/com/adjust/sdk/ao$4.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic eQ:Lcom/adjust/sdk/ao;
+.field final synthetic eP:Lcom/adjust/sdk/ao;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/ao;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/ao$4;->eQ:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$4;->eP:Lcom/adjust/sdk/ao;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/adjust/sdk/ao$4;->eQ:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$4;->eP:Lcom/adjust/sdk/ao;
 
-    iget-object v1, v0, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iget-object v1, v0, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
 
     const/4 v2, 0x0
 
@@ -47,7 +47,7 @@
 
     invoke-virtual {v0}, Lcom/adjust/sdk/ao;->au()V
 
-    iget-object v1, v0, Lcom/adjust/sdk/ao;->eO:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lcom/adjust/sdk/ao;->eN:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
diff --git a/com.discord/smali/com/adjust/sdk/ao$5.smali b/com.discord/smali/com/adjust/sdk/ao$5.smali
index 61084e80bf..2430190e8d 100644
--- a/com.discord/smali/com/adjust/sdk/ao$5.smali
+++ b/com.discord/smali/com/adjust/sdk/ao$5.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic eQ:Lcom/adjust/sdk/ao;
+.field final synthetic eP:Lcom/adjust/sdk/ao;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/ao;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/ao$5;->eQ:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$5;->eP:Lcom/adjust/sdk/ao;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/adjust/sdk/ao$5;->eQ:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$5;->eP:Lcom/adjust/sdk/ao;
 
     iget-object v0, v0, Lcom/adjust/sdk/ao;->bS:Lcom/adjust/sdk/x;
 
@@ -49,13 +49,13 @@
 
     invoke-interface {v0, v3, v2}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/ao$5;->eQ:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$5;->eP:Lcom/adjust/sdk/ao;
 
-    iget-object v0, v0, Lcom/adjust/sdk/ao;->eO:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, v0, Lcom/adjust/sdk/ao;->eN:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/ao$5;->eQ:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$5;->eP:Lcom/adjust/sdk/ao;
 
     invoke-virtual {v0}, Lcom/adjust/sdk/ao;->aj()V
 
diff --git a/com.discord/smali/com/adjust/sdk/ao$6.smali b/com.discord/smali/com/adjust/sdk/ao$6.smali
index e4c28fa00d..ebe7aa3124 100644
--- a/com.discord/smali/com/adjust/sdk/ao$6.smali
+++ b/com.discord/smali/com/adjust/sdk/ao$6.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic eQ:Lcom/adjust/sdk/ao;
+.field final synthetic eP:Lcom/adjust/sdk/ao;
 
-.field final synthetic eS:Lcom/adjust/sdk/au;
+.field final synthetic eR:Lcom/adjust/sdk/au;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/ao;Lcom/adjust/sdk/au;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/ao$6;->eQ:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$6;->eP:Lcom/adjust/sdk/ao;
 
-    iput-object p2, p0, Lcom/adjust/sdk/ao$6;->eS:Lcom/adjust/sdk/au;
+    iput-object p2, p0, Lcom/adjust/sdk/ao$6;->eR:Lcom/adjust/sdk/au;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final run()V
     .locals 8
 
-    iget-object v0, p0, Lcom/adjust/sdk/ao$6;->eQ:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$6;->eP:Lcom/adjust/sdk/ao;
 
-    iget-object v1, p0, Lcom/adjust/sdk/ao$6;->eS:Lcom/adjust/sdk/au;
+    iget-object v1, p0, Lcom/adjust/sdk/ao$6;->eR:Lcom/adjust/sdk/au;
 
     if-eqz v1, :cond_1
 
@@ -83,7 +83,7 @@
 
     invoke-interface {v2, v3, v4}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iget-object v2, v0, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iget-object v2, v0, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali/com/adjust/sdk/ao.smali b/com.discord/smali/com/adjust/sdk/ao.smali
index 855b8dbcf8..b314470afe 100644
--- a/com.discord/smali/com/adjust/sdk/ao.smali
+++ b/com.discord/smali/com/adjust/sdk/ao.smali
@@ -25,9 +25,7 @@
     .end annotation
 .end field
 
-.field private dy:Z
-
-.field eN:Ljava/util/List;
+.field eM:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,9 +35,11 @@
     .end annotation
 .end field
 
-.field eO:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field eN:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private eP:Lcom/adjust/sdk/q;
+.field private eO:Lcom/adjust/sdk/q;
+
+.field private paused:Z
 
 
 # direct methods
@@ -68,7 +68,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/adjust/sdk/ao;->eP:Lcom/adjust/sdk/q;
+    iput-object v0, p0, Lcom/adjust/sdk/ao;->eO:Lcom/adjust/sdk/q;
 
     invoke-virtual {p0, p1, p2, p3}, Lcom/adjust/sdk/ao;->b(Lcom/adjust/sdk/v;Landroid/content/Context;Z)V
 
@@ -120,7 +120,7 @@
 
     move-result p2
 
-    iget-object v1, p0, Lcom/adjust/sdk/ao;->eP:Lcom/adjust/sdk/q;
+    iget-object v1, p0, Lcom/adjust/sdk/ao;->eO:Lcom/adjust/sdk/q;
 
     invoke-static {p2, v1}, Lcom/adjust/sdk/az;->a(ILcom/adjust/sdk/q;)J
 
@@ -134,7 +134,7 @@
 
     div-double/2addr v3, v5
 
-    sget-object v5, Lcom/adjust/sdk/az;->fi:Ljava/text/DecimalFormat;
+    sget-object v5, Lcom/adjust/sdk/az;->fh:Ljava/text/DecimalFormat;
 
     invoke-virtual {v5, v3, v4}, Ljava/text/DecimalFormat;->format(D)Ljava/lang/String;
 
@@ -240,7 +240,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/ao;->dy:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/ao;->paused:Z
 
     return-void
 .end method
@@ -250,7 +250,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/ao;->dy:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/ao;->paused:Z
 
     return-void
 .end method
@@ -272,7 +272,7 @@
 .method final at()V
     .locals 4
 
-    iget-object v0, p0, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iget-object v0, p0, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -283,7 +283,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lcom/adjust/sdk/ao;->dy:Z
+    iget-boolean v0, p0, Lcom/adjust/sdk/ao;->paused:Z
 
     const/4 v1, 0x0
 
@@ -300,7 +300,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/adjust/sdk/ao;->eO:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/adjust/sdk/ao;->eN:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v2, 0x1
 
@@ -321,7 +321,7 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iget-object v0, p0, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -331,7 +331,7 @@
 
     iget-object v1, p0, Lcom/adjust/sdk/ao;->dj:Lcom/adjust/sdk/z;
 
-    iget-object v3, p0, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iget-object v3, p0, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
@@ -347,7 +347,7 @@
 .method final au()V
     .locals 4
 
-    iget-object v0, p0, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iget-object v0, p0, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
 
     iget-object v1, p0, Lcom/adjust/sdk/ao;->context:Landroid/content/Context;
 
@@ -363,7 +363,7 @@
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/adjust/sdk/ao;->eN:Ljava/util/List;
+    iget-object v2, p0, Lcom/adjust/sdk/ao;->eM:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -424,7 +424,7 @@
 
     xor-int/lit8 p1, p3, 0x1
 
-    iput-boolean p1, p0, Lcom/adjust/sdk/ao;->dy:Z
+    iput-boolean p1, p0, Lcom/adjust/sdk/ao;->paused:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/adjust/sdk/ap.smali b/com.discord/smali/com/adjust/sdk/ap.smali
index 754d906dac..233ae5e58f 100644
--- a/com.discord/smali/com/adjust/sdk/ap.smali
+++ b/com.discord/smali/com/adjust/sdk/ap.smali
@@ -292,7 +292,7 @@
 
     new-instance v0, Ljava/util/ArrayList;
 
-    sget-object v1, Lcom/adjust/sdk/r;->dG:Ljava/util/List;
+    sget-object v1, Lcom/adjust/sdk/r;->dF:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -300,7 +300,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
 
-    sget-object v1, Lcom/adjust/sdk/r;->dG:Ljava/util/List;
+    sget-object v1, Lcom/adjust/sdk/r;->dF:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali/com/adjust/sdk/aq$1.smali b/com.discord/smali/com/adjust/sdk/aq$1.smali
index 8ca3439db6..03143645b7 100644
--- a/com.discord/smali/com/adjust/sdk/aq$1.smali
+++ b/com.discord/smali/com/adjust/sdk/aq$1.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic eR:Lcom/adjust/sdk/c;
+.field final synthetic eQ:Lcom/adjust/sdk/c;
 
-.field final synthetic eU:I
+.field final synthetic eT:I
 
-.field final synthetic eV:Lcom/adjust/sdk/aq;
+.field final synthetic eU:Lcom/adjust/sdk/aq;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/aq;Lcom/adjust/sdk/c;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/aq$1;->eV:Lcom/adjust/sdk/aq;
+    iput-object p1, p0, Lcom/adjust/sdk/aq$1;->eU:Lcom/adjust/sdk/aq;
 
-    iput-object p2, p0, Lcom/adjust/sdk/aq$1;->eR:Lcom/adjust/sdk/c;
+    iput-object p2, p0, Lcom/adjust/sdk/aq$1;->eQ:Lcom/adjust/sdk/c;
 
-    iput p3, p0, Lcom/adjust/sdk/aq$1;->eU:I
+    iput p3, p0, Lcom/adjust/sdk/aq$1;->eT:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,11 +45,11 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/adjust/sdk/aq$1;->eV:Lcom/adjust/sdk/aq;
+    iget-object v0, p0, Lcom/adjust/sdk/aq$1;->eU:Lcom/adjust/sdk/aq;
 
-    iget-object v1, p0, Lcom/adjust/sdk/aq$1;->eR:Lcom/adjust/sdk/c;
+    iget-object v1, p0, Lcom/adjust/sdk/aq$1;->eQ:Lcom/adjust/sdk/c;
 
-    iget v2, p0, Lcom/adjust/sdk/aq$1;->eU:I
+    iget v2, p0, Lcom/adjust/sdk/aq$1;->eT:I
 
     invoke-static {v0, v1, v2}, Lcom/adjust/sdk/aq;->a(Lcom/adjust/sdk/aq;Lcom/adjust/sdk/c;I)V
 
diff --git a/com.discord/smali/com/adjust/sdk/aq.smali b/com.discord/smali/com/adjust/sdk/aq.smali
index 5385035ef2..ec9cbbccb4 100644
--- a/com.discord/smali/com/adjust/sdk/aq.smali
+++ b/com.discord/smali/com/adjust/sdk/aq.smali
@@ -11,7 +11,7 @@
 
 .field private bS:Lcom/adjust/sdk/x;
 
-.field private eT:Ljava/lang/ref/WeakReference;
+.field private eS:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -71,7 +71,7 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/adjust/sdk/aq;->eT:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/adjust/sdk/aq;->eS:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -180,7 +180,7 @@
 
     iput-object p2, p3, Lcom/adjust/sdk/ar;->message:Ljava/lang/String;
 
-    iget-object p2, p0, Lcom/adjust/sdk/aq;->eT:Ljava/lang/ref/WeakReference;
+    iget-object p2, p0, Lcom/adjust/sdk/aq;->eS:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {p2}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -239,7 +239,7 @@
 
     iput-object p2, p1, Lcom/adjust/sdk/ar;->message:Ljava/lang/String;
 
-    iget-object p2, p0, Lcom/adjust/sdk/aq;->eT:Ljava/lang/ref/WeakReference;
+    iget-object p2, p0, Lcom/adjust/sdk/aq;->eS:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {p2}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -280,7 +280,7 @@
 
     invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lcom/adjust/sdk/aq;->eT:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/adjust/sdk/aq;->eS:Ljava/lang/ref/WeakReference;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/adjust/sdk/ar.smali b/com.discord/smali/com/adjust/sdk/ar.smali
index 404a8265fa..bf5bb3862e 100644
--- a/com.discord/smali/com/adjust/sdk/ar.smali
+++ b/com.discord/smali/com/adjust/sdk/ar.smali
@@ -14,7 +14,7 @@
 
 .field public di:Lorg/json/JSONObject;
 
-.field public eW:Z
+.field public eV:Z
 
 .field public message:Ljava/lang/String;
 
diff --git a/com.discord/smali/com/adjust/sdk/as$1.smali b/com.discord/smali/com/adjust/sdk/as$1.smali
index 305e296c72..ab3634e798 100644
--- a/com.discord/smali/com/adjust/sdk/as$1.smali
+++ b/com.discord/smali/com/adjust/sdk/as$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic eX:Lcom/adjust/sdk/c;
+.field final synthetic eW:Lcom/adjust/sdk/c;
 
-.field final synthetic eY:Lcom/adjust/sdk/as;
+.field final synthetic eX:Lcom/adjust/sdk/as;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/as;Lcom/adjust/sdk/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/as$1;->eY:Lcom/adjust/sdk/as;
+    iput-object p1, p0, Lcom/adjust/sdk/as$1;->eX:Lcom/adjust/sdk/as;
 
-    iput-object p2, p0, Lcom/adjust/sdk/as$1;->eX:Lcom/adjust/sdk/c;
+    iput-object p2, p0, Lcom/adjust/sdk/as$1;->eW:Lcom/adjust/sdk/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,15 +41,15 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/adjust/sdk/as$1;->eY:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$1;->eX:Lcom/adjust/sdk/as;
 
-    iget-object v0, v0, Lcom/adjust/sdk/as;->eN:Ljava/util/List;
+    iget-object v0, v0, Lcom/adjust/sdk/as;->eM:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/adjust/sdk/as$1;->eX:Lcom/adjust/sdk/c;
+    iget-object v1, p0, Lcom/adjust/sdk/as$1;->eW:Lcom/adjust/sdk/c;
 
     invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/adjust/sdk/as$1;->eY:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$1;->eX:Lcom/adjust/sdk/as;
 
     iget-object v0, v0, Lcom/adjust/sdk/as;->bS:Lcom/adjust/sdk/x;
 
@@ -57,9 +57,9 @@
 
     new-array v2, v1, [Ljava/lang/Object;
 
-    iget-object v3, p0, Lcom/adjust/sdk/as$1;->eY:Lcom/adjust/sdk/as;
+    iget-object v3, p0, Lcom/adjust/sdk/as$1;->eX:Lcom/adjust/sdk/as;
 
-    iget-object v3, v3, Lcom/adjust/sdk/as;->eN:Ljava/util/List;
+    iget-object v3, v3, Lcom/adjust/sdk/as;->eM:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
@@ -77,13 +77,13 @@
 
     invoke-interface {v0, v3, v2}, Lcom/adjust/sdk/x;->b(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/as$1;->eY:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$1;->eX:Lcom/adjust/sdk/as;
 
     iget-object v0, v0, Lcom/adjust/sdk/as;->bS:Lcom/adjust/sdk/x;
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/adjust/sdk/as$1;->eX:Lcom/adjust/sdk/c;
+    iget-object v2, p0, Lcom/adjust/sdk/as$1;->eW:Lcom/adjust/sdk/c;
 
     invoke-virtual {v2}, Lcom/adjust/sdk/c;->U()Ljava/lang/String;
 
@@ -95,7 +95,7 @@
 
     invoke-interface {v0, v2, v1}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/as$1;->eY:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$1;->eX:Lcom/adjust/sdk/as;
 
     invoke-virtual {v0}, Lcom/adjust/sdk/as;->az()V
 
diff --git a/com.discord/smali/com/adjust/sdk/as$2.smali b/com.discord/smali/com/adjust/sdk/as$2.smali
index 4b151d08a6..8869d8bf37 100644
--- a/com.discord/smali/com/adjust/sdk/as$2.smali
+++ b/com.discord/smali/com/adjust/sdk/as$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic eY:Lcom/adjust/sdk/as;
+.field final synthetic eX:Lcom/adjust/sdk/as;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/as;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/as$2;->eY:Lcom/adjust/sdk/as;
+    iput-object p1, p0, Lcom/adjust/sdk/as$2;->eX:Lcom/adjust/sdk/as;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,7 +39,7 @@
 
     move-object/from16 v1, p0
 
-    iget-object v0, v1, Lcom/adjust/sdk/as$2;->eY:Lcom/adjust/sdk/as;
+    iget-object v0, v1, Lcom/adjust/sdk/as$2;->eX:Lcom/adjust/sdk/as;
 
     iget-object v0, v0, Lcom/adjust/sdk/as;->dv:Ljava/lang/ref/WeakReference;
 
@@ -125,7 +125,7 @@
 
     move-result-object v7
 
-    iget-object v8, v1, Lcom/adjust/sdk/as$2;->eY:Lcom/adjust/sdk/as;
+    iget-object v8, v1, Lcom/adjust/sdk/as$2;->eX:Lcom/adjust/sdk/as;
 
     invoke-virtual {v8, v7}, Lcom/adjust/sdk/as;->b(Lcom/adjust/sdk/c;)V
 
@@ -149,7 +149,7 @@
     :catch_0
     move-exception v0
 
-    iget-object v2, v1, Lcom/adjust/sdk/as$2;->eY:Lcom/adjust/sdk/as;
+    iget-object v2, v1, Lcom/adjust/sdk/as$2;->eX:Lcom/adjust/sdk/as;
 
     iget-object v2, v2, Lcom/adjust/sdk/as;->bS:Lcom/adjust/sdk/x;
 
diff --git a/com.discord/smali/com/adjust/sdk/as$3.smali b/com.discord/smali/com/adjust/sdk/as$3.smali
index a017dd9866..d22a86b2a2 100644
--- a/com.discord/smali/com/adjust/sdk/as$3.smali
+++ b/com.discord/smali/com/adjust/sdk/as$3.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic eY:Lcom/adjust/sdk/as;
+.field final synthetic eX:Lcom/adjust/sdk/as;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/as;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/as$3;->eY:Lcom/adjust/sdk/as;
+    iput-object p1, p0, Lcom/adjust/sdk/as$3;->eX:Lcom/adjust/sdk/as;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,13 +37,13 @@
 .method public final run()V
     .locals 11
 
-    iget-object v0, p0, Lcom/adjust/sdk/as$3;->eY:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$3;->eX:Lcom/adjust/sdk/as;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/as;->dy:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/as;->paused:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/adjust/sdk/as;->eN:Ljava/util/List;
+    iget-object v1, v0, Lcom/adjust/sdk/as;->eM:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
 
@@ -51,7 +51,7 @@
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/adjust/sdk/as;->eN:Ljava/util/List;
+    iget-object v1, v0, Lcom/adjust/sdk/as;->eM:Ljava/util/List;
 
     const/4 v2, 0x0
 
@@ -74,7 +74,7 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lcom/adjust/sdk/as;->eP:Lcom/adjust/sdk/q;
+    iget-object v1, v0, Lcom/adjust/sdk/as;->eO:Lcom/adjust/sdk/q;
 
     invoke-static {v3, v1}, Lcom/adjust/sdk/az;->a(ILcom/adjust/sdk/q;)J
 
@@ -88,7 +88,7 @@
 
     div-double/2addr v7, v9
 
-    sget-object v1, Lcom/adjust/sdk/az;->fi:Ljava/text/DecimalFormat;
+    sget-object v1, Lcom/adjust/sdk/az;->fh:Ljava/text/DecimalFormat;
 
     invoke-virtual {v1, v7, v8}, Ljava/text/DecimalFormat;->format(D)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/adjust/sdk/as$4.smali b/com.discord/smali/com/adjust/sdk/as$4.smali
index 78e9372cee..1d4192a98e 100644
--- a/com.discord/smali/com/adjust/sdk/as$4.smali
+++ b/com.discord/smali/com/adjust/sdk/as$4.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic eY:Lcom/adjust/sdk/as;
+.field final synthetic eX:Lcom/adjust/sdk/as;
 
-.field final synthetic eZ:Lcom/adjust/sdk/c;
+.field final synthetic eY:Lcom/adjust/sdk/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/as;Lcom/adjust/sdk/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/as$4;->eY:Lcom/adjust/sdk/as;
+    iput-object p1, p0, Lcom/adjust/sdk/as$4;->eX:Lcom/adjust/sdk/as;
 
-    iput-object p2, p0, Lcom/adjust/sdk/as$4;->eZ:Lcom/adjust/sdk/c;
+    iput-object p2, p0, Lcom/adjust/sdk/as$4;->eY:Lcom/adjust/sdk/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,13 +41,13 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/adjust/sdk/as$4;->eY:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$4;->eX:Lcom/adjust/sdk/as;
 
-    iget-object v1, p0, Lcom/adjust/sdk/as$4;->eZ:Lcom/adjust/sdk/c;
+    iget-object v1, p0, Lcom/adjust/sdk/as$4;->eY:Lcom/adjust/sdk/c;
 
     invoke-static {v0, v1}, Lcom/adjust/sdk/as;->a(Lcom/adjust/sdk/as;Lcom/adjust/sdk/c;)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/as$4;->eY:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$4;->eX:Lcom/adjust/sdk/as;
 
     invoke-virtual {v0}, Lcom/adjust/sdk/as;->az()V
 
diff --git a/com.discord/smali/com/adjust/sdk/as.smali b/com.discord/smali/com/adjust/sdk/as.smali
index fc7ed04889..a14ccc1b05 100644
--- a/com.discord/smali/com/adjust/sdk/as.smali
+++ b/com.discord/smali/com/adjust/sdk/as.smali
@@ -21,9 +21,7 @@
     .end annotation
 .end field
 
-.field dy:Z
-
-.field eN:Ljava/util/List;
+.field eM:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -33,7 +31,9 @@
     .end annotation
 .end field
 
-.field eP:Lcom/adjust/sdk/q;
+.field eO:Lcom/adjust/sdk/q;
+
+.field paused:Z
 
 
 # direct methods
@@ -54,7 +54,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/adjust/sdk/as;->eP:Lcom/adjust/sdk/q;
+    iput-object p1, p0, Lcom/adjust/sdk/as;->eO:Lcom/adjust/sdk/q;
 
     new-instance p1, Lcom/adjust/sdk/s;
 
@@ -195,7 +195,7 @@
     move-result-object v10
 
     :try_start_0
-    iget-object v11, p0, Lcom/adjust/sdk/as;->eN:Ljava/util/List;
+    iget-object v11, p0, Lcom/adjust/sdk/as;->eM:Ljava/util/List;
 
     invoke-interface {v11}, Ljava/util/List;->size()I
 
@@ -246,7 +246,7 @@
 
     iput-object v1, v10, Lcom/adjust/sdk/at;->installReferrer:Ljava/lang/String;
 
-    iput-boolean v3, v10, Lcom/adjust/sdk/at;->fa:Z
+    iput-boolean v3, v10, Lcom/adjust/sdk/at;->eZ:Z
 
     :cond_7
     invoke-interface {v0, v10}, Lcom/adjust/sdk/v;->a(Lcom/adjust/sdk/ar;)V
@@ -375,7 +375,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/as;->dy:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/as;->paused:Z
 
     return-void
 .end method
@@ -385,7 +385,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/as;->dy:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/as;->paused:Z
 
     invoke-virtual {p0}, Lcom/adjust/sdk/as;->az()V
 
@@ -439,13 +439,13 @@
 
     xor-int/lit8 p2, p2, 0x1
 
-    iput-boolean p2, p0, Lcom/adjust/sdk/as;->dy:Z
+    iput-boolean p2, p0, Lcom/adjust/sdk/as;->paused:Z
 
     new-instance p2, Ljava/util/ArrayList;
 
     invoke-direct {p2}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p2, p0, Lcom/adjust/sdk/as;->eN:Ljava/util/List;
+    iput-object p2, p0, Lcom/adjust/sdk/as;->eM:Ljava/util/List;
 
     new-instance p2, Ljava/lang/ref/WeakReference;
 
diff --git a/com.discord/smali/com/adjust/sdk/at.smali b/com.discord/smali/com/adjust/sdk/at.smali
index 1c0f385f94..644b975188 100644
--- a/com.discord/smali/com/adjust/sdk/at.smali
+++ b/com.discord/smali/com/adjust/sdk/at.smali
@@ -6,7 +6,7 @@
 # instance fields
 .field clickTime:J
 
-.field fa:Z
+.field eZ:Z
 
 .field installBegin:J
 
diff --git a/com.discord/smali/com/adjust/sdk/ax$1.smali b/com.discord/smali/com/adjust/sdk/ax$1.smali
index 72e6db11c3..8013180d7e 100644
--- a/com.discord/smali/com/adjust/sdk/ax$1.smali
+++ b/com.discord/smali/com/adjust/sdk/ax$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic fg:Lcom/adjust/sdk/ax;
+.field final synthetic ff:Lcom/adjust/sdk/ax;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/ax;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/ax$1;->fg:Lcom/adjust/sdk/ax;
+    iput-object p1, p0, Lcom/adjust/sdk/ax$1;->ff:Lcom/adjust/sdk/ax;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/adjust/sdk/ax$1;->fg:Lcom/adjust/sdk/ax;
+    iget-object v0, p0, Lcom/adjust/sdk/ax$1;->ff:Lcom/adjust/sdk/ax;
 
     iget-object v0, v0, Lcom/adjust/sdk/ax;->bS:Lcom/adjust/sdk/x;
 
@@ -45,7 +45,7 @@
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/adjust/sdk/ax$1;->fg:Lcom/adjust/sdk/ax;
+    iget-object v2, p0, Lcom/adjust/sdk/ax$1;->ff:Lcom/adjust/sdk/ax;
 
     iget-object v2, v2, Lcom/adjust/sdk/ax;->name:Ljava/lang/String;
 
@@ -57,9 +57,9 @@
 
     invoke-interface {v0, v2, v1}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/ax$1;->fg:Lcom/adjust/sdk/ax;
+    iget-object v0, p0, Lcom/adjust/sdk/ax$1;->ff:Lcom/adjust/sdk/ax;
 
-    iget-object v0, v0, Lcom/adjust/sdk/ax;->fd:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/adjust/sdk/ax;->fc:Ljava/lang/Runnable;
 
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
diff --git a/com.discord/smali/com/adjust/sdk/ax.smali b/com.discord/smali/com/adjust/sdk/ax.smali
index 053899da7d..d2a8cf8bd5 100644
--- a/com.discord/smali/com/adjust/sdk/ax.smali
+++ b/com.discord/smali/com/adjust/sdk/ax.smali
@@ -6,15 +6,15 @@
 # instance fields
 .field bS:Lcom/adjust/sdk/x;
 
-.field fb:Lcom/adjust/sdk/s;
+.field fa:Lcom/adjust/sdk/s;
 
-.field fc:Ljava/util/concurrent/ScheduledFuture;
+.field fb:Ljava/util/concurrent/ScheduledFuture;
 
-.field fd:Ljava/lang/Runnable;
+.field fc:Ljava/lang/Runnable;
 
-.field fe:J
+.field fd:J
 
-.field ff:Z
+.field fe:Z
 
 .field initialDelay:J
 
@@ -33,17 +33,17 @@
 
     invoke-direct {v0, p6, v1}, Lcom/adjust/sdk/s;-><init>(Ljava/lang/String;Z)V
 
-    iput-object v0, p0, Lcom/adjust/sdk/ax;->fb:Lcom/adjust/sdk/s;
+    iput-object v0, p0, Lcom/adjust/sdk/ax;->fa:Lcom/adjust/sdk/s;
 
     iput-object p6, p0, Lcom/adjust/sdk/ax;->name:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/adjust/sdk/ax;->fd:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/adjust/sdk/ax;->fc:Ljava/lang/Runnable;
 
     iput-wide p2, p0, Lcom/adjust/sdk/ax;->initialDelay:J
 
-    iput-wide p4, p0, Lcom/adjust/sdk/ax;->fe:J
+    iput-wide p4, p0, Lcom/adjust/sdk/ax;->fd:J
 
-    iput-boolean v1, p0, Lcom/adjust/sdk/ax;->ff:Z
+    iput-boolean v1, p0, Lcom/adjust/sdk/ax;->fe:Z
 
     invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
 
@@ -51,7 +51,7 @@
 
     iput-object p1, p0, Lcom/adjust/sdk/ax;->bS:Lcom/adjust/sdk/x;
 
-    sget-object p1, Lcom/adjust/sdk/az;->fi:Ljava/text/DecimalFormat;
+    sget-object p1, Lcom/adjust/sdk/az;->fh:Ljava/text/DecimalFormat;
 
     long-to-double p4, p4
 
@@ -65,7 +65,7 @@
 
     move-result-object p1
 
-    sget-object p4, Lcom/adjust/sdk/az;->fi:Ljava/text/DecimalFormat;
+    sget-object p4, Lcom/adjust/sdk/az;->fh:Ljava/text/DecimalFormat;
 
     long-to-double p2, p2
 
diff --git a/com.discord/smali/com/adjust/sdk/ay$1.smali b/com.discord/smali/com/adjust/sdk/ay$1.smali
index 59873030b1..036885576a 100644
--- a/com.discord/smali/com/adjust/sdk/ay$1.smali
+++ b/com.discord/smali/com/adjust/sdk/ay$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic fh:Lcom/adjust/sdk/ay;
+.field final synthetic fg:Lcom/adjust/sdk/ay;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/ay;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/ay$1;->fh:Lcom/adjust/sdk/ay;
+    iput-object p1, p0, Lcom/adjust/sdk/ay$1;->fg:Lcom/adjust/sdk/ay;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->fh:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->fg:Lcom/adjust/sdk/ay;
 
     iget-object v0, v0, Lcom/adjust/sdk/ay;->bS:Lcom/adjust/sdk/x;
 
@@ -45,7 +45,7 @@
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/adjust/sdk/ay$1;->fh:Lcom/adjust/sdk/ay;
+    iget-object v2, p0, Lcom/adjust/sdk/ay$1;->fg:Lcom/adjust/sdk/ay;
 
     iget-object v2, v2, Lcom/adjust/sdk/ay;->name:Ljava/lang/String;
 
@@ -57,17 +57,17 @@
 
     invoke-interface {v0, v2, v1}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->fh:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->fg:Lcom/adjust/sdk/ay;
 
-    iget-object v0, v0, Lcom/adjust/sdk/ay;->fd:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/adjust/sdk/ay;->fc:Ljava/lang/Runnable;
 
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
-    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->fh:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->fg:Lcom/adjust/sdk/ay;
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/adjust/sdk/ay;->fc:Ljava/util/concurrent/ScheduledFuture;
+    iput-object v1, v0, Lcom/adjust/sdk/ay;->fb:Ljava/util/concurrent/ScheduledFuture;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/adjust/sdk/ay.smali b/com.discord/smali/com/adjust/sdk/ay.smali
index 8ba8e9fa9b..4d0c7bd08f 100644
--- a/com.discord/smali/com/adjust/sdk/ay.smali
+++ b/com.discord/smali/com/adjust/sdk/ay.smali
@@ -6,11 +6,11 @@
 # instance fields
 .field bS:Lcom/adjust/sdk/x;
 
-.field private fb:Lcom/adjust/sdk/s;
+.field private fa:Lcom/adjust/sdk/s;
 
-.field fc:Ljava/util/concurrent/ScheduledFuture;
+.field fb:Ljava/util/concurrent/ScheduledFuture;
 
-.field fd:Ljava/lang/Runnable;
+.field fc:Ljava/lang/Runnable;
 
 .field name:Ljava/lang/String;
 
@@ -29,9 +29,9 @@
 
     invoke-direct {v0, p2, v1}, Lcom/adjust/sdk/s;-><init>(Ljava/lang/String;Z)V
 
-    iput-object v0, p0, Lcom/adjust/sdk/ay;->fb:Lcom/adjust/sdk/s;
+    iput-object v0, p0, Lcom/adjust/sdk/ay;->fa:Lcom/adjust/sdk/s;
 
-    iput-object p1, p0, Lcom/adjust/sdk/ay;->fd:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/adjust/sdk/ay;->fc:Ljava/lang/Runnable;
 
     invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
 
@@ -47,7 +47,7 @@
 .method public final aF()J
     .locals 2
 
-    iget-object v0, p0, Lcom/adjust/sdk/ay;->fc:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v0, p0, Lcom/adjust/sdk/ay;->fb:Ljava/util/concurrent/ScheduledFuture;
 
     if-nez v0, :cond_0
 
@@ -68,7 +68,7 @@
 .method final aG()V
     .locals 4
 
-    iget-object v0, p0, Lcom/adjust/sdk/ay;->fc:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v0, p0, Lcom/adjust/sdk/ay;->fb:Ljava/util/concurrent/ScheduledFuture;
 
     const/4 v1, 0x0
 
@@ -79,7 +79,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/adjust/sdk/ay;->fc:Ljava/util/concurrent/ScheduledFuture;
+    iput-object v0, p0, Lcom/adjust/sdk/ay;->fb:Ljava/util/concurrent/ScheduledFuture;
 
     iget-object v0, p0, Lcom/adjust/sdk/ay;->bS:Lcom/adjust/sdk/x;
 
@@ -103,7 +103,7 @@
 
     invoke-virtual {p0}, Lcom/adjust/sdk/ay;->aG()V
 
-    sget-object v0, Lcom/adjust/sdk/az;->fi:Ljava/text/DecimalFormat;
+    sget-object v0, Lcom/adjust/sdk/az;->fh:Ljava/text/DecimalFormat;
 
     long-to-double v1, p1
 
@@ -137,7 +137,7 @@
 
     invoke-interface {v1, v0, v2}, Lcom/adjust/sdk/x;->a(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/adjust/sdk/ay;->fb:Lcom/adjust/sdk/s;
+    iget-object v0, p0, Lcom/adjust/sdk/ay;->fa:Lcom/adjust/sdk/s;
 
     new-instance v1, Lcom/adjust/sdk/ay$1;
 
@@ -149,7 +149,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/adjust/sdk/ay;->fc:Ljava/util/concurrent/ScheduledFuture;
+    iput-object p1, p0, Lcom/adjust/sdk/ay;->fb:Ljava/util/concurrent/ScheduledFuture;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/adjust/sdk/az$2.smali b/com.discord/smali/com/adjust/sdk/az$2.smali
index 1f4a70e5b1..1ed47279d6 100644
--- a/com.discord/smali/com/adjust/sdk/az$2.smali
+++ b/com.discord/smali/com/adjust/sdk/az$2.smali
@@ -25,14 +25,14 @@
 
 
 # instance fields
-.field final synthetic fk:Lcom/adjust/sdk/ah;
+.field final synthetic fj:Lcom/adjust/sdk/ah;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/ah;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/az$2;->fk:Lcom/adjust/sdk/ah;
+    iput-object p1, p0, Lcom/adjust/sdk/az$2;->fj:Lcom/adjust/sdk/ah;
 
     invoke-direct {p0}, Landroid/os/AsyncTask;-><init>()V
 
@@ -82,7 +82,7 @@
 
     invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
 
-    iget-object v0, p0, Lcom/adjust/sdk/az$2;->fk:Lcom/adjust/sdk/ah;
+    iget-object v0, p0, Lcom/adjust/sdk/az$2;->fj:Lcom/adjust/sdk/ah;
 
     invoke-interface {v0, p1}, Lcom/adjust/sdk/ah;->onGoogleAdIdRead(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/adjust/sdk/az.smali b/com.discord/smali/com/adjust/sdk/az.smali
index 4a08642bfa..c8c1cdcca6 100644
--- a/com.discord/smali/com/adjust/sdk/az.smali
+++ b/com.discord/smali/com/adjust/sdk/az.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field public static final fi:Ljava/text/DecimalFormat;
+.field public static final fh:Ljava/text/DecimalFormat;
 
-.field public static final fj:Ljava/text/SimpleDateFormat;
+.field public static final fi:Ljava/text/SimpleDateFormat;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0, v1}, Ljava/text/DecimalFormat;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/adjust/sdk/az;->fi:Ljava/text/DecimalFormat;
+    sput-object v0, Lcom/adjust/sdk/az;->fh:Ljava/text/DecimalFormat;
 
     new-instance v0, Ljava/text/SimpleDateFormat;
 
@@ -29,7 +29,7 @@
 
     invoke-direct {v0, v2, v1}, Ljava/text/SimpleDateFormat;-><init>(Ljava/lang/String;Ljava/util/Locale;)V
 
-    sput-object v0, Lcom/adjust/sdk/az;->fj:Ljava/text/SimpleDateFormat;
+    sput-object v0, Lcom/adjust/sdk/az;->fi:Ljava/text/SimpleDateFormat;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/adjust/sdk/ba.smali b/com.discord/smali/com/adjust/sdk/ba.smali
index 7fa142659e..7c4be14dbe 100644
--- a/com.discord/smali/com/adjust/sdk/ba.smali
+++ b/com.discord/smali/com/adjust/sdk/ba.smali
@@ -78,7 +78,7 @@
 
     move-result-wide p0
 
-    sget-object v1, Lcom/adjust/sdk/az;->fj:Ljava/text/SimpleDateFormat;
+    sget-object v1, Lcom/adjust/sdk/az;->fi:Ljava/text/SimpleDateFormat;
 
     invoke-static {p0, p1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -442,7 +442,7 @@
 
     invoke-interface {v1, v0, v4}, Lcom/adjust/sdk/x;->c(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iput-boolean v3, p1, Lcom/adjust/sdk/ar;->eW:Z
+    iput-boolean v3, p1, Lcom/adjust/sdk/ar;->eV:Z
 
     goto :goto_3
 
@@ -597,7 +597,7 @@
 
     move-result-wide v5
 
-    sget-object p0, Lcom/adjust/sdk/az;->fj:Ljava/text/SimpleDateFormat;
+    sget-object p0, Lcom/adjust/sdk/az;->fi:Ljava/text/SimpleDateFormat;
 
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
diff --git a/com.discord/smali/com/adjust/sdk/f.smali b/com.discord/smali/com/adjust/sdk/f.smali
index 7d2757c1f8..1f94dd81b4 100644
--- a/com.discord/smali/com/adjust/sdk/f.smali
+++ b/com.discord/smali/com/adjust/sdk/f.smali
@@ -77,7 +77,7 @@
 
     iput-object v0, p0, Lcom/adjust/sdk/f;->bS:Lcom/adjust/sdk/x;
 
-    sget-object v0, Lcom/adjust/sdk/ad;->eu:Lcom/adjust/sdk/ad;
+    sget-object v0, Lcom/adjust/sdk/ad;->et:Lcom/adjust/sdk/ad;
 
     iget-object v1, p0, Lcom/adjust/sdk/f;->bS:Lcom/adjust/sdk/x;
 
diff --git a/com.discord/smali/com/adjust/sdk/j.smali b/com.discord/smali/com/adjust/sdk/j.smali
index a7311f4ce2..f899a0df08 100644
--- a/com.discord/smali/com/adjust/sdk/j.smali
+++ b/com.discord/smali/com/adjust/sdk/j.smali
@@ -242,7 +242,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/adjust/sdk/q;->dC:Lcom/adjust/sdk/q;
+    sget-object v0, Lcom/adjust/sdk/q;->dB:Lcom/adjust/sdk/q;
 
     :cond_0
     return-object v0
@@ -255,7 +255,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/adjust/sdk/q;->dB:Lcom/adjust/sdk/q;
+    sget-object v0, Lcom/adjust/sdk/q;->dA:Lcom/adjust/sdk/q;
 
     :cond_0
     return-object v0
diff --git a/com.discord/smali/com/adjust/sdk/o$1.smali b/com.discord/smali/com/adjust/sdk/o$1.smali
index d62adcb67e..29f0e75a3f 100644
--- a/com.discord/smali/com/adjust/sdk/o$1.smali
+++ b/com.discord/smali/com/adjust/sdk/o$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic dz:Lcom/adjust/sdk/o;
+.field final synthetic dy:Lcom/adjust/sdk/o;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/o;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/o$1;->dz:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$1;->dy:Lcom/adjust/sdk/o;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/adjust/sdk/o$1;->dz:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$1;->dy:Lcom/adjust/sdk/o;
 
     iget-object v1, v0, Lcom/adjust/sdk/o;->bP:Lcom/adjust/sdk/s;
 
diff --git a/com.discord/smali/com/adjust/sdk/o$2.smali b/com.discord/smali/com/adjust/sdk/o$2.smali
index 6a2a714138..426787ec5c 100644
--- a/com.discord/smali/com/adjust/sdk/o$2.smali
+++ b/com.discord/smali/com/adjust/sdk/o$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic dz:Lcom/adjust/sdk/o;
+.field final synthetic dy:Lcom/adjust/sdk/o;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/o;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/o$2;->dz:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$2;->dy:Lcom/adjust/sdk/o;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/adjust/sdk/o$2;->dz:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$2;->dy:Lcom/adjust/sdk/o;
 
     const-wide/16 v1, 0x0
 
diff --git a/com.discord/smali/com/adjust/sdk/o$3.smali b/com.discord/smali/com/adjust/sdk/o$3.smali
index 2dcc611312..8e793f4d8b 100644
--- a/com.discord/smali/com/adjust/sdk/o$3.smali
+++ b/com.discord/smali/com/adjust/sdk/o$3.smali
@@ -20,14 +20,14 @@
 # instance fields
 .field final synthetic ck:Lcom/adjust/sdk/av;
 
-.field final synthetic dz:Lcom/adjust/sdk/o;
+.field final synthetic dy:Lcom/adjust/sdk/o;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/o;Lcom/adjust/sdk/av;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/o$3;->dz:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$3;->dy:Lcom/adjust/sdk/o;
 
     iput-object p2, p0, Lcom/adjust/sdk/o$3;->ck:Lcom/adjust/sdk/av;
 
@@ -41,7 +41,7 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/adjust/sdk/o$3;->dz:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$3;->dy:Lcom/adjust/sdk/o;
 
     iget-object v0, v0, Lcom/adjust/sdk/o;->dv:Ljava/lang/ref/WeakReference;
 
@@ -56,7 +56,7 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/o$3;->dz:Lcom/adjust/sdk/o;
+    iget-object v1, p0, Lcom/adjust/sdk/o$3;->dy:Lcom/adjust/sdk/o;
 
     iget-object v2, p0, Lcom/adjust/sdk/o$3;->ck:Lcom/adjust/sdk/av;
 
diff --git a/com.discord/smali/com/adjust/sdk/o$4.smali b/com.discord/smali/com/adjust/sdk/o$4.smali
index 36e31f7efe..28a55ca5d2 100644
--- a/com.discord/smali/com/adjust/sdk/o$4.smali
+++ b/com.discord/smali/com/adjust/sdk/o$4.smali
@@ -20,14 +20,14 @@
 # instance fields
 .field final synthetic cj:Lcom/adjust/sdk/at;
 
-.field final synthetic dz:Lcom/adjust/sdk/o;
+.field final synthetic dy:Lcom/adjust/sdk/o;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/o;Lcom/adjust/sdk/at;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/o$4;->dz:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$4;->dy:Lcom/adjust/sdk/o;
 
     iput-object p2, p0, Lcom/adjust/sdk/o$4;->cj:Lcom/adjust/sdk/at;
 
@@ -41,7 +41,7 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/adjust/sdk/o$4;->dz:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$4;->dy:Lcom/adjust/sdk/o;
 
     iget-object v0, v0, Lcom/adjust/sdk/o;->dv:Ljava/lang/ref/WeakReference;
 
@@ -56,7 +56,7 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/o$4;->dz:Lcom/adjust/sdk/o;
+    iget-object v1, p0, Lcom/adjust/sdk/o$4;->dy:Lcom/adjust/sdk/o;
 
     iget-object v2, p0, Lcom/adjust/sdk/o$4;->cj:Lcom/adjust/sdk/at;
 
diff --git a/com.discord/smali/com/adjust/sdk/o$5.smali b/com.discord/smali/com/adjust/sdk/o$5.smali
index 79bef428c0..e502850d64 100644
--- a/com.discord/smali/com/adjust/sdk/o$5.smali
+++ b/com.discord/smali/com/adjust/sdk/o$5.smali
@@ -20,14 +20,14 @@
 # instance fields
 .field final synthetic cl:Lcom/adjust/sdk/p;
 
-.field final synthetic dz:Lcom/adjust/sdk/o;
+.field final synthetic dy:Lcom/adjust/sdk/o;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/o;Lcom/adjust/sdk/p;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/o$5;->dz:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$5;->dy:Lcom/adjust/sdk/o;
 
     iput-object p2, p0, Lcom/adjust/sdk/o$5;->cl:Lcom/adjust/sdk/p;
 
@@ -41,7 +41,7 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/adjust/sdk/o$5;->dz:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$5;->dy:Lcom/adjust/sdk/o;
 
     iget-object v0, v0, Lcom/adjust/sdk/o;->dv:Ljava/lang/ref/WeakReference;
 
@@ -56,7 +56,7 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/o$5;->dz:Lcom/adjust/sdk/o;
+    iget-object v1, p0, Lcom/adjust/sdk/o$5;->dy:Lcom/adjust/sdk/o;
 
     iget-object v2, p0, Lcom/adjust/sdk/o$5;->cl:Lcom/adjust/sdk/p;
 
@@ -90,7 +90,7 @@
 
     move-result-object v1
 
-    iput-object v1, v2, Lcom/adjust/sdk/p;->dA:Landroid/net/Uri;
+    iput-object v1, v2, Lcom/adjust/sdk/p;->dz:Landroid/net/Uri;
 
     :cond_1
     invoke-interface {v0, v2}, Lcom/adjust/sdk/v;->a(Lcom/adjust/sdk/p;)V
diff --git a/com.discord/smali/com/adjust/sdk/o$6.smali b/com.discord/smali/com/adjust/sdk/o$6.smali
index 39e1f60c79..92f5623a52 100644
--- a/com.discord/smali/com/adjust/sdk/o$6.smali
+++ b/com.discord/smali/com/adjust/sdk/o$6.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic dz:Lcom/adjust/sdk/o;
+.field final synthetic dy:Lcom/adjust/sdk/o;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/o;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/o$6;->dz:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$6;->dy:Lcom/adjust/sdk/o;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/adjust/sdk/o$6;->dz:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$6;->dy:Lcom/adjust/sdk/o;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/o;->dy:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/o;->paused:Z
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali/com/adjust/sdk/o.smali b/com.discord/smali/com/adjust/sdk/o.smali
index 1f2de1accb..b408731d13 100644
--- a/com.discord/smali/com/adjust/sdk/o.smali
+++ b/com.discord/smali/com/adjust/sdk/o.smali
@@ -25,7 +25,7 @@
 
 .field private dx:Lcom/adjust/sdk/ay;
 
-.field dy:Z
+.field paused:Z
 
 
 # direct methods
@@ -146,7 +146,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/o;->dy:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/o;->paused:Z
 
     return-void
 .end method
@@ -156,7 +156,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/o;->dy:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/o;->paused:Z
 
     return-void
 .end method
@@ -202,7 +202,7 @@
 
     xor-int/lit8 p1, p3, 0x1
 
-    iput-boolean p1, p0, Lcom/adjust/sdk/o;->dy:Z
+    iput-boolean p1, p0, Lcom/adjust/sdk/o;->paused:Z
 
     return-void
 .end method
@@ -237,7 +237,7 @@
 
     div-double/2addr v0, v2
 
-    sget-object v2, Lcom/adjust/sdk/az;->fi:Ljava/text/DecimalFormat;
+    sget-object v2, Lcom/adjust/sdk/az;->fh:Ljava/text/DecimalFormat;
 
     invoke-virtual {v2, v0, v1}, Ljava/text/DecimalFormat;->format(D)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/adjust/sdk/p.smali b/com.discord/smali/com/adjust/sdk/p.smali
index 814f8ec3da..9bb4d97424 100644
--- a/com.discord/smali/com/adjust/sdk/p.smali
+++ b/com.discord/smali/com/adjust/sdk/p.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public dA:Landroid/net/Uri;
+.field public dz:Landroid/net/Uri;
 
 
 # direct methods
diff --git a/com.discord/smali/com/adjust/sdk/q.smali b/com.discord/smali/com/adjust/sdk/q.smali
index 5b8a00c748..d0906eca87 100644
--- a/com.discord/smali/com/adjust/sdk/q.smali
+++ b/com.discord/smali/com/adjust/sdk/q.smali
@@ -14,15 +14,15 @@
 
 
 # static fields
+.field public static final enum dA:Lcom/adjust/sdk/q;
+
 .field public static final enum dB:Lcom/adjust/sdk/q;
 
 .field public static final enum dC:Lcom/adjust/sdk/q;
 
 .field public static final enum dD:Lcom/adjust/sdk/q;
 
-.field public static final enum dE:Lcom/adjust/sdk/q;
-
-.field private static final synthetic dF:[Lcom/adjust/sdk/q;
+.field private static final synthetic dE:[Lcom/adjust/sdk/q;
 
 
 # instance fields
@@ -59,7 +59,7 @@
 
     invoke-direct/range {v0 .. v9}, Lcom/adjust/sdk/q;-><init>(Ljava/lang/String;IIJJD)V
 
-    sput-object v10, Lcom/adjust/sdk/q;->dB:Lcom/adjust/sdk/q;
+    sput-object v10, Lcom/adjust/sdk/q;->dA:Lcom/adjust/sdk/q;
 
     new-instance v0, Lcom/adjust/sdk/q;
 
@@ -79,7 +79,7 @@
 
     invoke-direct/range {v11 .. v20}, Lcom/adjust/sdk/q;-><init>(Ljava/lang/String;IIJJD)V
 
-    sput-object v0, Lcom/adjust/sdk/q;->dC:Lcom/adjust/sdk/q;
+    sput-object v0, Lcom/adjust/sdk/q;->dB:Lcom/adjust/sdk/q;
 
     new-instance v0, Lcom/adjust/sdk/q;
 
@@ -99,7 +99,7 @@
 
     invoke-direct/range {v1 .. v10}, Lcom/adjust/sdk/q;-><init>(Ljava/lang/String;IIJJD)V
 
-    sput-object v0, Lcom/adjust/sdk/q;->dD:Lcom/adjust/sdk/q;
+    sput-object v0, Lcom/adjust/sdk/q;->dC:Lcom/adjust/sdk/q;
 
     new-instance v0, Lcom/adjust/sdk/q;
 
@@ -119,37 +119,37 @@
 
     invoke-direct/range {v11 .. v20}, Lcom/adjust/sdk/q;-><init>(Ljava/lang/String;IIJJD)V
 
-    sput-object v0, Lcom/adjust/sdk/q;->dE:Lcom/adjust/sdk/q;
+    sput-object v0, Lcom/adjust/sdk/q;->dD:Lcom/adjust/sdk/q;
 
     const/4 v0, 0x4
 
     new-array v0, v0, [Lcom/adjust/sdk/q;
 
-    sget-object v1, Lcom/adjust/sdk/q;->dB:Lcom/adjust/sdk/q;
+    sget-object v1, Lcom/adjust/sdk/q;->dA:Lcom/adjust/sdk/q;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/adjust/sdk/q;->dC:Lcom/adjust/sdk/q;
+    sget-object v1, Lcom/adjust/sdk/q;->dB:Lcom/adjust/sdk/q;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/adjust/sdk/q;->dD:Lcom/adjust/sdk/q;
+    sget-object v1, Lcom/adjust/sdk/q;->dC:Lcom/adjust/sdk/q;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/adjust/sdk/q;->dE:Lcom/adjust/sdk/q;
+    sget-object v1, Lcom/adjust/sdk/q;->dD:Lcom/adjust/sdk/q;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/adjust/sdk/q;->dF:[Lcom/adjust/sdk/q;
+    sput-object v0, Lcom/adjust/sdk/q;->dE:[Lcom/adjust/sdk/q;
 
     return-void
 .end method
@@ -196,7 +196,7 @@
 .method public static values()[Lcom/adjust/sdk/q;
     .locals 1
 
-    sget-object v0, Lcom/adjust/sdk/q;->dF:[Lcom/adjust/sdk/q;
+    sget-object v0, Lcom/adjust/sdk/q;->dE:[Lcom/adjust/sdk/q;
 
     invoke-virtual {v0}, [Lcom/adjust/sdk/q;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/adjust/sdk/r.smali b/com.discord/smali/com/adjust/sdk/r.smali
index fad5ead549..85429e194e 100644
--- a/com.discord/smali/com/adjust/sdk/r.smali
+++ b/com.discord/smali/com/adjust/sdk/r.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final dG:Ljava/util/List;
+.field public static final dF:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -27,7 +27,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/adjust/sdk/r;->dG:Ljava/util/List;
+    sput-object v0, Lcom/adjust/sdk/r;->dF:Ljava/util/List;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/adjust/sdk/s$1$1.smali b/com.discord/smali/com/adjust/sdk/s$1$1.smali
index ef2075bf6b..ad1b265ad9 100644
--- a/com.discord/smali/com/adjust/sdk/s$1$1.smali
+++ b/com.discord/smali/com/adjust/sdk/s$1$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic dL:Lcom/adjust/sdk/s$1;
+.field final synthetic dK:Lcom/adjust/sdk/s$1;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/s$1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/s$1$1;->dL:Lcom/adjust/sdk/s$1;
+    iput-object p1, p0, Lcom/adjust/sdk/s$1$1;->dK:Lcom/adjust/sdk/s$1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/adjust/sdk/s$1.smali b/com.discord/smali/com/adjust/sdk/s$1.smali
index a8cf0d8b48..1fe798964b 100644
--- a/com.discord/smali/com/adjust/sdk/s$1.smali
+++ b/com.discord/smali/com/adjust/sdk/s$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic dJ:Ljava/lang/String;
+.field final synthetic dI:Ljava/lang/String;
 
-.field final synthetic dK:Lcom/adjust/sdk/s;
+.field final synthetic dJ:Lcom/adjust/sdk/s;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/s;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/s$1;->dK:Lcom/adjust/sdk/s;
+    iput-object p1, p0, Lcom/adjust/sdk/s$1;->dJ:Lcom/adjust/sdk/s;
 
-    iput-object p2, p0, Lcom/adjust/sdk/s$1;->dJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/s$1;->dI:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,7 +47,7 @@
 
     new-instance v1, Lcom/adjust/sdk/s$a;
 
-    iget-object v2, p0, Lcom/adjust/sdk/s$1;->dK:Lcom/adjust/sdk/s;
+    iget-object v2, p0, Lcom/adjust/sdk/s$1;->dJ:Lcom/adjust/sdk/s;
 
     invoke-direct {v1, v2, p1}, Lcom/adjust/sdk/s$a;-><init>(Lcom/adjust/sdk/s;Ljava/lang/Runnable;)V
 
@@ -75,7 +75,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lcom/adjust/sdk/s$1;->dJ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/adjust/sdk/s$1;->dI:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/adjust/sdk/s$2.smali b/com.discord/smali/com/adjust/sdk/s$2.smali
index b94b61bb25..4c311bb1b2 100644
--- a/com.discord/smali/com/adjust/sdk/s$2.smali
+++ b/com.discord/smali/com/adjust/sdk/s$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic dJ:Ljava/lang/String;
+.field final synthetic dI:Ljava/lang/String;
 
-.field final synthetic dK:Lcom/adjust/sdk/s;
+.field final synthetic dJ:Lcom/adjust/sdk/s;
 
 
 # direct methods
 .method constructor <init>(Lcom/adjust/sdk/s;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/s$2;->dK:Lcom/adjust/sdk/s;
+    iput-object p1, p0, Lcom/adjust/sdk/s$2;->dJ:Lcom/adjust/sdk/s;
 
-    iput-object p2, p0, Lcom/adjust/sdk/s$2;->dJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/s$2;->dI:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,7 +57,7 @@
 
     aput-object p1, v0, v1
 
-    iget-object p1, p0, Lcom/adjust/sdk/s$2;->dJ:Ljava/lang/String;
+    iget-object p1, p0, Lcom/adjust/sdk/s$2;->dI:Ljava/lang/String;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali/com/adjust/sdk/s$a.smali b/com.discord/smali/com/adjust/sdk/s$a.smali
index 6cfb84ae52..bdd0d0e2d3 100644
--- a/com.discord/smali/com/adjust/sdk/s$a.smali
+++ b/com.discord/smali/com/adjust/sdk/s$a.smali
@@ -18,20 +18,20 @@
 
 
 # instance fields
-.field final synthetic dK:Lcom/adjust/sdk/s;
+.field final synthetic dJ:Lcom/adjust/sdk/s;
 
-.field private dM:Ljava/lang/Runnable;
+.field private dL:Ljava/lang/Runnable;
 
 
 # direct methods
 .method public constructor <init>(Lcom/adjust/sdk/s;Ljava/lang/Runnable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/adjust/sdk/s$a;->dK:Lcom/adjust/sdk/s;
+    iput-object p1, p0, Lcom/adjust/sdk/s$a;->dJ:Lcom/adjust/sdk/s;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/adjust/sdk/s$a;->dM:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/adjust/sdk/s$a;->dL:Ljava/lang/Runnable;
 
     return-void
 .end method
@@ -42,7 +42,7 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lcom/adjust/sdk/s$a;->dM:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/adjust/sdk/s$a;->dL:Ljava/lang/Runnable;
 
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
     :try_end_0
diff --git a/com.discord/smali/com/adjust/sdk/s.smali b/com.discord/smali/com/adjust/sdk/s.smali
index 0bbc2693f4..60a0d6e239 100644
--- a/com.discord/smali/com/adjust/sdk/s.smali
+++ b/com.discord/smali/com/adjust/sdk/s.smali
@@ -12,9 +12,9 @@
 
 
 # instance fields
-.field dH:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+.field dG:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
 
-.field private final dI:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final dH:Ljava/util/concurrent/atomic/AtomicInteger;
 
 .field private source:Ljava/lang/String;
 
@@ -31,7 +31,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object v0, p0, Lcom/adjust/sdk/s;->dI:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/adjust/sdk/s;->dH:Ljava/util/concurrent/atomic/AtomicInteger;
 
     iput-object p1, p0, Lcom/adjust/sdk/s;->source:Ljava/lang/String;
 
@@ -47,11 +47,11 @@
 
     invoke-direct {v0, v1, v2, v3}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;-><init>(ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)V
 
-    iput-object v0, p0, Lcom/adjust/sdk/s;->dH:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iput-object v0, p0, Lcom/adjust/sdk/s;->dG:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
 
     if-nez p2, :cond_0
 
-    iget-object p1, p0, Lcom/adjust/sdk/s;->dH:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object p1, p0, Lcom/adjust/sdk/s;->dG:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
 
     const-wide/16 v2, 0xa
 
@@ -59,7 +59,7 @@
 
     invoke-virtual {p1, v2, v3, p2}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->setKeepAliveTime(JLjava/util/concurrent/TimeUnit;)V
 
-    iget-object p1, p0, Lcom/adjust/sdk/s;->dH:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object p1, p0, Lcom/adjust/sdk/s;->dG:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
 
     invoke-virtual {p1, v1}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->allowCoreThreadTimeOut(Z)V
 
@@ -83,7 +83,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/adjust/sdk/s;->dH:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object v0, p0, Lcom/adjust/sdk/s;->dG:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
 
@@ -104,7 +104,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/adjust/sdk/s;->dH:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object v0, p0, Lcom/adjust/sdk/s;->dG:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
 
diff --git a/com.discord/smali/com/adjust/sdk/t.smali b/com.discord/smali/com/adjust/sdk/t.smali
index 505ca62510..379e5027a8 100644
--- a/com.discord/smali/com/adjust/sdk/t.smali
+++ b/com.discord/smali/com/adjust/sdk/t.smali
@@ -8,11 +8,13 @@
 
 .field country:Ljava/lang/String;
 
-.field dN:Ljava/lang/String;
+.field dM:Ljava/lang/String;
 
-.field dO:Ljava/lang/Boolean;
+.field dN:Ljava/lang/Boolean;
 
-.field private dP:Z
+.field private dO:Z
+
+.field dP:Ljava/lang/String;
 
 .field dQ:Ljava/lang/String;
 
@@ -56,9 +58,7 @@
 
 .field ej:Ljava/lang/String;
 
-.field ek:Ljava/lang/String;
-
-.field el:Ljava/util/Map;
+.field ek:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -82,7 +82,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/t;->dP:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/t;->dO:Z
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -116,7 +116,7 @@
 
     move-result-object v4
 
-    iput-object v4, p0, Lcom/adjust/sdk/t;->dU:Ljava/lang/String;
+    iput-object v4, p0, Lcom/adjust/sdk/t;->dT:Ljava/lang/String;
 
     and-int/lit8 v4, v1, 0xf
 
@@ -151,7 +151,7 @@
     const-string v10, "phone"
 
     :goto_0
-    iput-object v10, p0, Lcom/adjust/sdk/t;->dV:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->dU:Ljava/lang/String;
 
     sget-object v10, Landroid/os/Build;->MODEL:Ljava/lang/String;
 
@@ -159,15 +159,15 @@
 
     sget-object v10, Landroid/os/Build;->MANUFACTURER:Ljava/lang/String;
 
-    iput-object v10, p0, Lcom/adjust/sdk/t;->dW:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->dV:Ljava/lang/String;
 
     const-string v10, "android"
 
-    iput-object v10, p0, Lcom/adjust/sdk/t;->dX:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->dW:Ljava/lang/String;
 
     sget-object v10, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
-    iput-object v10, p0, Lcom/adjust/sdk/t;->dY:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->dX:Ljava/lang/String;
 
     new-instance v10, Ljava/lang/StringBuilder;
 
@@ -181,7 +181,7 @@
 
     move-result-object v10
 
-    iput-object v10, p0, Lcom/adjust/sdk/t;->dZ:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->dY:Ljava/lang/String;
 
     invoke-virtual {v3}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
 
@@ -228,7 +228,7 @@
     const-string v4, "small"
 
     :goto_1
-    iput-object v4, p0, Lcom/adjust/sdk/t;->ea:Ljava/lang/String;
+    iput-object v4, p0, Lcom/adjust/sdk/t;->dZ:Ljava/lang/String;
 
     and-int/lit8 v1, v1, 0x30
 
@@ -253,7 +253,7 @@
     move-object v1, v3
 
     :goto_2
-    iput-object v1, p0, Lcom/adjust/sdk/t;->eb:Ljava/lang/String;
+    iput-object v1, p0, Lcom/adjust/sdk/t;->ea:Ljava/lang/String;
 
     iget v1, v2, Landroid/util/DisplayMetrics;->densityDpi:I
 
@@ -283,7 +283,7 @@
     const-string v9, "medium"
 
     :goto_3
-    iput-object v9, p0, Lcom/adjust/sdk/t;->ec:Ljava/lang/String;
+    iput-object v9, p0, Lcom/adjust/sdk/t;->eb:Ljava/lang/String;
 
     iget v1, v2, Landroid/util/DisplayMetrics;->widthPixels:I
 
@@ -291,7 +291,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/adjust/sdk/t;->ed:Ljava/lang/String;
+    iput-object v1, p0, Lcom/adjust/sdk/t;->ec:Ljava/lang/String;
 
     iget v1, v2, Landroid/util/DisplayMetrics;->heightPixels:I
 
@@ -299,7 +299,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/adjust/sdk/t;->ee:Ljava/lang/String;
+    iput-object v1, p0, Lcom/adjust/sdk/t;->ed:Ljava/lang/String;
 
     const-string v1, "android4.12.0"
 
@@ -329,17 +329,17 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/adjust/sdk/t;->dT:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->dS:Ljava/lang/String;
 
     invoke-static {p1}, Lcom/adjust/sdk/az;->l(Landroid/content/Context;)Ljava/util/Map;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/adjust/sdk/t;->el:Ljava/util/Map;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->ek:Ljava/util/Map;
 
     sget-object p2, Landroid/os/Build;->DISPLAY:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/adjust/sdk/t;->ef:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->ee:Ljava/lang/String;
 
     invoke-static {}, Lcom/adjust/sdk/az;->getSupportedAbis()[Ljava/lang/String;
 
@@ -365,29 +365,29 @@
     move-result-object p2
 
     :goto_6
-    iput-object p2, p0, Lcom/adjust/sdk/t;->eg:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->ef:Ljava/lang/String;
 
     sget-object p2, Landroid/os/Build;->ID:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/adjust/sdk/t;->eh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->eg:Ljava/lang/String;
 
     invoke-static {}, Lcom/adjust/sdk/az;->aw()Ljava/lang/String;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/adjust/sdk/t;->ei:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->eh:Ljava/lang/String;
 
     invoke-static {p1}, Lcom/adjust/sdk/t;->d(Landroid/content/Context;)Ljava/lang/String;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/adjust/sdk/t;->ej:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->ei:Ljava/lang/String;
 
     invoke-static {p1}, Lcom/adjust/sdk/t;->e(Landroid/content/Context;)Ljava/lang/String;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/adjust/sdk/t;->ek:Ljava/lang/String;
+    iput-object p1, p0, Lcom/adjust/sdk/t;->ej:Ljava/lang/String;
 
     return-void
 .end method
@@ -510,7 +510,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/adjust/sdk/az;->fj:Ljava/text/SimpleDateFormat;
+    sget-object v0, Lcom/adjust/sdk/az;->fi:Ljava/text/SimpleDateFormat;
 
     new-instance v1, Ljava/util/Date;
 
@@ -550,7 +550,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/adjust/sdk/az;->fj:Ljava/text/SimpleDateFormat;
+    sget-object v0, Lcom/adjust/sdk/az;->fi:Ljava/text/SimpleDateFormat;
 
     new-instance v1, Ljava/util/Date;
 
@@ -623,19 +623,19 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/adjust/sdk/t;->dO:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/adjust/sdk/t;->dN:Ljava/lang/Boolean;
 
     invoke-static {p1}, Lcom/adjust/sdk/az;->g(Landroid/content/Context;)Ljava/lang/String;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/adjust/sdk/t;->dN:Ljava/lang/String;
+    iput-object v0, p0, Lcom/adjust/sdk/t;->dM:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/adjust/sdk/t;->dN:Ljava/lang/String;
+    iget-object v0, p0, Lcom/adjust/sdk/t;->dM:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/adjust/sdk/t;->dP:Z
+    iget-boolean v0, p0, Lcom/adjust/sdk/t;->dO:Z
 
     if-nez v0, :cond_1
 
@@ -668,23 +668,23 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/adjust/sdk/t;->dQ:Ljava/lang/String;
+    iput-object v1, p0, Lcom/adjust/sdk/t;->dP:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/adjust/sdk/t;->g(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/adjust/sdk/t;->dR:Ljava/lang/String;
+    iput-object v0, p0, Lcom/adjust/sdk/t;->dQ:Ljava/lang/String;
 
     invoke-static {p1}, Lcom/adjust/sdk/az;->j(Landroid/content/Context;)Ljava/lang/String;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/adjust/sdk/t;->dS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/adjust/sdk/t;->dR:Ljava/lang/String;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/adjust/sdk/t;->dP:Z
+    iput-boolean p1, p0, Lcom/adjust/sdk/t;->dO:Z
 
     :cond_1
     return-void
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$1.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$1.smali
index 968cfa448e..3938d4512f 100644
--- a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic fC:Lcom/airbnb/lottie/LottieAnimationView;
+.field final synthetic fB:Lcom/airbnb/lottie/LottieAnimationView;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/LottieAnimationView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView$1;->fC:Lcom/airbnb/lottie/LottieAnimationView;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView$1;->fB:Lcom/airbnb/lottie/LottieAnimationView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,7 +48,7 @@
 
     check-cast p1, Lcom/airbnb/lottie/d;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$1;->fC:Lcom/airbnb/lottie/LottieAnimationView;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$1;->fB:Lcom/airbnb/lottie/LottieAnimationView;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/LottieAnimationView;->setComposition(Lcom/airbnb/lottie/d;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$2.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$2.smali
index 6b0f55f4d5..a8db790981 100644
--- a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$2.smali
+++ b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$2.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic fC:Lcom/airbnb/lottie/LottieAnimationView;
+.field final synthetic fB:Lcom/airbnb/lottie/LottieAnimationView;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/LottieAnimationView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView$2;->fC:Lcom/airbnb/lottie/LottieAnimationView;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView$2;->fB:Lcom/airbnb/lottie/LottieAnimationView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$3.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$3.smali
index 47c9d4110b..ea8be1be26 100644
--- a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$3.smali
+++ b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$3.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final synthetic fD:[I
+.field static final synthetic fC:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->fD:[I
+    sput-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->fC:[I
 
     :try_start_0
-    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->fD:[I
+    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->fC:[I
 
-    sget-object v1, Lcom/airbnb/lottie/n;->hp:Lcom/airbnb/lottie/n;
+    sget-object v1, Lcom/airbnb/lottie/n;->ho:Lcom/airbnb/lottie/n;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/n;->ordinal()I
 
@@ -49,9 +49,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->fD:[I
+    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->fC:[I
 
-    sget-object v1, Lcom/airbnb/lottie/n;->hq:Lcom/airbnb/lottie/n;
+    sget-object v1, Lcom/airbnb/lottie/n;->hp:Lcom/airbnb/lottie/n;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/n;->ordinal()I
 
@@ -65,9 +65,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->fD:[I
+    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->fC:[I
 
-    sget-object v1, Lcom/airbnb/lottie/n;->ho:Lcom/airbnb/lottie/n;
+    sget-object v1, Lcom/airbnb/lottie/n;->hn:Lcom/airbnb/lottie/n;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/n;->ordinal()I
 
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState.smali
index 59b615fb48..48cbe11f33 100644
--- a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState.smali
+++ b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState.smali
@@ -27,13 +27,13 @@
 
 
 # instance fields
-.field fE:F
+.field fD:F
 
-.field fF:Ljava/lang/String;
+.field fE:Ljava/lang/String;
 
-.field ft:Ljava/lang/String;
+.field fs:Ljava/lang/String;
 
-.field fu:I
+.field ft:I
 
 .field isAnimating:Z
 
@@ -64,13 +64,13 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->ft:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fs:Ljava/lang/String;
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v0
 
-    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fE:F
+    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fD:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
@@ -92,7 +92,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fF:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fE:Ljava/lang/String;
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
@@ -132,11 +132,11 @@
 
     invoke-super {p0, p1, p2}, Landroid/view/View$BaseSavedState;->writeToParcel(Landroid/os/Parcel;I)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->ft:Ljava/lang/String;
+    iget-object p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fs:Ljava/lang/String;
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    iget p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fE:F
+    iget p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fD:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
@@ -144,7 +144,7 @@
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeInt(I)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fF:Ljava/lang/String;
+    iget-object p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fE:Ljava/lang/String;
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
index 03fd5a10a5..a3a7d904da 100644
--- a/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
+++ b/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
@@ -16,19 +16,9 @@
 
 
 # instance fields
-.field private fA:Lcom/airbnb/lottie/l;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/l<",
-            "Lcom/airbnb/lottie/d;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private fA:Lcom/airbnb/lottie/d;
 
-.field private fB:Lcom/airbnb/lottie/d;
-
-.field private final fq:Lcom/airbnb/lottie/h;
+.field private final fp:Lcom/airbnb/lottie/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/h<",
@@ -38,7 +28,7 @@
     .end annotation
 .end field
 
-.field private final fr:Lcom/airbnb/lottie/h;
+.field private final fq:Lcom/airbnb/lottie/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/h<",
@@ -48,21 +38,21 @@
     .end annotation
 .end field
 
-.field private final fs:Lcom/airbnb/lottie/f;
+.field private final fr:Lcom/airbnb/lottie/f;
 
-.field private ft:Ljava/lang/String;
+.field private fs:Ljava/lang/String;
 
-.field private fu:I
+.field private ft:I
+
+.field private fu:Z
 
 .field private fv:Z
 
 .field private fw:Z
 
-.field private fx:Z
+.field private fx:Lcom/airbnb/lottie/n;
 
-.field private fy:Lcom/airbnb/lottie/n;
-
-.field private fz:Ljava/util/Set;
+.field private fy:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -72,6 +62,16 @@
     .end annotation
 .end field
 
+.field private fz:Lcom/airbnb/lottie/l;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/l<",
+            "Lcom/airbnb/lottie/d;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -97,37 +97,37 @@
 
     invoke-direct {p1, p0}, Lcom/airbnb/lottie/LottieAnimationView$1;-><init>(Lcom/airbnb/lottie/LottieAnimationView;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fq:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fp:Lcom/airbnb/lottie/h;
 
     new-instance p1, Lcom/airbnb/lottie/LottieAnimationView$2;
 
     invoke-direct {p1, p0}, Lcom/airbnb/lottie/LottieAnimationView$2;-><init>(Lcom/airbnb/lottie/LottieAnimationView;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fq:Lcom/airbnb/lottie/h;
 
     new-instance p1, Lcom/airbnb/lottie/f;
 
     invoke-direct {p1}, Lcom/airbnb/lottie/f;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     const/4 p1, 0x0
 
+    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:Z
+
     iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fv:Z
 
     iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fw:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fx:Z
+    sget-object p1, Lcom/airbnb/lottie/n;->hn:Lcom/airbnb/lottie/n;
 
-    sget-object p1, Lcom/airbnb/lottie/n;->ho:Lcom/airbnb/lottie/n;
-
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fy:Lcom/airbnb/lottie/n;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fx:Lcom/airbnb/lottie/n;
 
     new-instance p1, Ljava/util/HashSet;
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fz:Ljava/util/Set;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fy:Ljava/util/Set;
 
     const/4 p1, 0x0
 
@@ -145,37 +145,37 @@
 
     invoke-direct {p1, p0}, Lcom/airbnb/lottie/LottieAnimationView$1;-><init>(Lcom/airbnb/lottie/LottieAnimationView;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fq:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fp:Lcom/airbnb/lottie/h;
 
     new-instance p1, Lcom/airbnb/lottie/LottieAnimationView$2;
 
     invoke-direct {p1, p0}, Lcom/airbnb/lottie/LottieAnimationView$2;-><init>(Lcom/airbnb/lottie/LottieAnimationView;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fq:Lcom/airbnb/lottie/h;
 
     new-instance p1, Lcom/airbnb/lottie/f;
 
     invoke-direct {p1}, Lcom/airbnb/lottie/f;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     const/4 p1, 0x0
 
+    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:Z
+
     iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fv:Z
 
     iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fw:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fx:Z
+    sget-object p1, Lcom/airbnb/lottie/n;->hn:Lcom/airbnb/lottie/n;
 
-    sget-object p1, Lcom/airbnb/lottie/n;->ho:Lcom/airbnb/lottie/n;
-
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fy:Lcom/airbnb/lottie/n;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fx:Lcom/airbnb/lottie/n;
 
     new-instance p1, Ljava/util/HashSet;
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fz:Ljava/util/Set;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fy:Ljava/util/Set;
 
     invoke-direct {p0, p2}, Lcom/airbnb/lottie/LottieAnimationView;->init(Landroid/util/AttributeSet;)V
 
@@ -191,37 +191,37 @@
 
     invoke-direct {p1, p0}, Lcom/airbnb/lottie/LottieAnimationView$1;-><init>(Lcom/airbnb/lottie/LottieAnimationView;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fq:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fp:Lcom/airbnb/lottie/h;
 
     new-instance p1, Lcom/airbnb/lottie/LottieAnimationView$2;
 
     invoke-direct {p1, p0}, Lcom/airbnb/lottie/LottieAnimationView$2;-><init>(Lcom/airbnb/lottie/LottieAnimationView;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fq:Lcom/airbnb/lottie/h;
 
     new-instance p1, Lcom/airbnb/lottie/f;
 
     invoke-direct {p1}, Lcom/airbnb/lottie/f;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     const/4 p1, 0x0
 
+    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:Z
+
     iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fv:Z
 
     iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fw:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fx:Z
+    sget-object p1, Lcom/airbnb/lottie/n;->hn:Lcom/airbnb/lottie/n;
 
-    sget-object p1, Lcom/airbnb/lottie/n;->ho:Lcom/airbnb/lottie/n;
-
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fy:Lcom/airbnb/lottie/n;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fx:Lcom/airbnb/lottie/n;
 
     new-instance p1, Ljava/util/HashSet;
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fz:Ljava/util/Set;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fy:Ljava/util/Set;
 
     invoke-direct {p0, p2}, Lcom/airbnb/lottie/LottieAnimationView;->init(Landroid/util/AttributeSet;)V
 
@@ -242,7 +242,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/airbnb/lottie/f;->a(Lcom/airbnb/lottie/c/e;Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
 
@@ -252,17 +252,17 @@
 .method private aK()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fA:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fz:Lcom/airbnb/lottie/l;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fq:Lcom/airbnb/lottie/h;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fp:Lcom/airbnb/lottie/h;
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/l;->b(Lcom/airbnb/lottie/h;)Lcom/airbnb/lottie/l;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fA:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fz:Lcom/airbnb/lottie/l;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/h;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fq:Lcom/airbnb/lottie/h;
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/l;->d(Lcom/airbnb/lottie/h;)Lcom/airbnb/lottie/l;
 
@@ -273,9 +273,9 @@
 .method private aN()V
     .locals 5
 
-    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->fD:[I
+    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->fC:[I
 
-    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fy:Lcom/airbnb/lottie/n;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fx:Lcom/airbnb/lottie/n;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/n;->ordinal()I
 
@@ -298,13 +298,13 @@
     goto :goto_2
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fA:Lcom/airbnb/lottie/d;
 
     const/4 v3, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-boolean v0, v0, Lcom/airbnb/lottie/d;->fT:Z
+    iget-boolean v0, v0, Lcom/airbnb/lottie/d;->fS:Z
 
     if-eqz v0, :cond_1
 
@@ -317,11 +317,11 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fA:Lcom/airbnb/lottie/d;
 
     if-eqz v0, :cond_2
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->fU:I
+    iget v0, v0, Lcom/airbnb/lottie/d;->fT:I
 
     const/4 v4, 0x4
 
@@ -460,9 +460,9 @@
 
     if-eqz v0, :cond_5
 
-    iput-boolean v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->fw:Z
+    iput-boolean v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->fv:Z
 
-    iput-boolean v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->fx:Z
+    iput-boolean v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->fw:Z
 
     :cond_5
     sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_loop:I
@@ -475,7 +475,7 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, v3}, Lcom/airbnb/lottie/f;->setRepeatCount(I)V
 
@@ -591,7 +591,7 @@
 
     invoke-direct {v6, v0}, Lcom/airbnb/lottie/g/c;-><init>(Ljava/lang/Object;)V
 
-    sget-object v0, Lcom/airbnb/lottie/j;->hd:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->hc:Landroid/graphics/ColorFilter;
 
     invoke-direct {p0, v5, v0, v6}, Lcom/airbnb/lottie/LottieAnimationView;->a(Lcom/airbnb/lottie/c/e;Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
 
@@ -604,7 +604,7 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     sget v5, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_scale:I
 
@@ -617,7 +617,7 @@
     :cond_b
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/LottieAnimationView;->getContext()Landroid/content/Context;
 
@@ -648,7 +648,7 @@
 .method private j(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->j(Z)V
 
@@ -668,27 +668,27 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fB:Lcom/airbnb/lottie/d;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->aS()V
 
     invoke-direct {p0}, Lcom/airbnb/lottie/LottieAnimationView;->aK()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fq:Lcom/airbnb/lottie/h;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fp:Lcom/airbnb/lottie/h;
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/l;->a(Lcom/airbnb/lottie/h;)Lcom/airbnb/lottie/l;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/h;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fq:Lcom/airbnb/lottie/h;
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/l;->c(Lcom/airbnb/lottie/h;)Lcom/airbnb/lottie/l;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fA:Lcom/airbnb/lottie/l;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fz:Lcom/airbnb/lottie/l;
 
     return-void
 .end method
@@ -704,7 +704,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->aL()V
 
@@ -715,7 +715,7 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fv:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:Z
 
     return-void
 .end method
@@ -725,13 +725,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fx:Z
-
     iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fw:Z
 
     iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fv:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:Z
+
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->aM()V
 
@@ -759,7 +759,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/airbnb/lottie/n;->hp:Lcom/airbnb/lottie/n;
+    sget-object p1, Lcom/airbnb/lottie/n;->ho:Lcom/airbnb/lottie/n;
 
     invoke-virtual {p0, p1}, Lcom/airbnb/lottie/LottieAnimationView;->setRenderMode(Lcom/airbnb/lottie/n;)V
 
@@ -770,7 +770,7 @@
 .method public getComposition()Lcom/airbnb/lottie/d;
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fA:Lcom/airbnb/lottie/d;
 
     return-object v0
 .end method
@@ -778,7 +778,7 @@
 .method public getDuration()J
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fA:Lcom/airbnb/lottie/d;
 
     if-eqz v0, :cond_0
 
@@ -799,11 +799,11 @@
 .method public getFrame()I
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
-    iget v0, v0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget v0, v0, Lcom/airbnb/lottie/f/e;->nR:F
 
     float-to-int v0, v0
 
@@ -813,9 +813,9 @@
 .method public getImageAssetsFolder()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->fF:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->fE:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -823,9 +823,9 @@
 .method public getMaxFrame()F
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->getMaxFrame()F
 
@@ -837,9 +837,9 @@
 .method public getMinFrame()F
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->getMinFrame()F
 
@@ -851,15 +851,15 @@
 .method public getPerformanceTracker()Lcom/airbnb/lottie/m;
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->fG:Lcom/airbnb/lottie/m;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->fF:Lcom/airbnb/lottie/m;
 
     return-object v0
 
@@ -872,9 +872,9 @@
 .method public getProgress()F
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->bG()F
 
@@ -886,9 +886,9 @@
 .method public getRepeatCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->getRepeatCount()I
 
@@ -900,9 +900,9 @@
 .method public getRepeatMode()I
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->getRepeatMode()I
 
@@ -914,7 +914,7 @@
 .method public getScale()F
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     iget v0, v0, Lcom/airbnb/lottie/f;->scale:F
 
@@ -924,11 +924,11 @@
 .method public getSpeed()F
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
-    iget v0, v0, Lcom/airbnb/lottie/f/e;->nP:F
+    iget v0, v0, Lcom/airbnb/lottie/f/e;->nO:F
 
     return v0
 .end method
@@ -940,7 +940,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     if-ne v0, v1, :cond_0
 
@@ -959,11 +959,11 @@
 
     invoke-super {p0}, Landroidx/appcompat/widget/AppCompatImageView;->onAttachedToWindow()V
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fx:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fw:Z
 
     if-nez v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fw:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fv:Z
 
     if-eqz v0, :cond_1
 
@@ -972,7 +972,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fx:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fw:Z
 
     :cond_1
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -994,9 +994,9 @@
 .method protected onDetachedFromWindow()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->isRunning()Z
 
@@ -1006,15 +1006,15 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fv:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     invoke-virtual {v1}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->cancel()V
 
@@ -1022,7 +1022,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fw:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fv:Z
 
     :cond_0
     invoke-super {p0}, Landroidx/appcompat/widget/AppCompatImageView;->onDetachedFromWindow()V
@@ -1050,11 +1050,11 @@
 
     invoke-super {p0, v0}, Landroidx/appcompat/widget/AppCompatImageView;->onRestoreInstanceState(Landroid/os/Parcelable;)V
 
-    iget-object v0, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->ft:Ljava/lang/String;
+    iget-object v0, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fs:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->ft:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->ft:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1062,23 +1062,23 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->ft:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Ljava/lang/String;
 
     invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setAnimation(Ljava/lang/String;)V
 
     :cond_1
-    iget v0, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fu:I
+    iget v0, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->ft:I
 
-    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:I
+    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->ft:I
 
-    iget v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:I
+    iget v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->ft:I
 
     if-eqz v0, :cond_2
 
     invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setAnimation(I)V
 
     :cond_2
-    iget v0, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fE:F
+    iget v0, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fD:F
 
     invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setProgress(F)V
 
@@ -1089,11 +1089,11 @@
     invoke-virtual {p0}, Lcom/airbnb/lottie/LottieAnimationView;->aL()V
 
     :cond_3
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fF:Ljava/lang/String;
+    iget-object v1, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fE:Ljava/lang/String;
 
-    iput-object v1, v0, Lcom/airbnb/lottie/f;->fF:Ljava/lang/String;
+    iput-object v1, v0, Lcom/airbnb/lottie/f;->fE:Ljava/lang/String;
 
     iget v0, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->repeatMode:I
 
@@ -1117,27 +1117,27 @@
 
     invoke-direct {v1, v0}, Lcom/airbnb/lottie/LottieAnimationView$SavedState;-><init>(Landroid/os/Parcelable;)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->ft:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Ljava/lang/String;
 
-    iput-object v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->ft:Ljava/lang/String;
+    iput-object v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fs:Ljava/lang/String;
 
-    iget v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:I
+    iget v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->ft:I
 
-    iput v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fu:I
+    iput v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->ft:I
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->bG()F
 
     move-result v0
 
-    iput v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fE:F
+    iput v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fD:F
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->isRunning()Z
 
@@ -1145,15 +1145,15 @@
 
     iput-boolean v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->isAnimating:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->fF:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->fE:Ljava/lang/String;
 
-    iput-object v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fF:Ljava/lang/String;
+    iput-object v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->fE:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->getRepeatMode()I
 
@@ -1161,9 +1161,9 @@
 
     iput v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->repeatMode:I
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->getRepeatCount()I
 
@@ -1177,7 +1177,7 @@
 .method protected onVisibilityChanged(Landroid/view/View;I)V
     .locals 0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     if-nez p1, :cond_0
 
@@ -1192,7 +1192,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fv:Z
+    iget-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:Z
 
     if-eqz p1, :cond_3
 
@@ -1202,7 +1202,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/f;->aT()V
 
@@ -1211,19 +1211,19 @@
     goto :goto_0
 
     :cond_1
-    iput-boolean p2, p0, Lcom/airbnb/lottie/LottieAnimationView;->fv:Z
+    iput-boolean p2, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:Z
 
     :goto_0
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fv:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:Z
 
     return-void
 
     :cond_2
-    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object p1, p1, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/f/e;->isRunning()Z
 
@@ -1233,7 +1233,7 @@
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/LottieAnimationView;->aM()V
 
-    iput-boolean p2, p0, Lcom/airbnb/lottie/LottieAnimationView;->fv:Z
+    iput-boolean p2, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:Z
 
     :cond_3
     return-void
@@ -1242,11 +1242,11 @@
 .method public setAnimation(I)V
     .locals 1
 
-    iput p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:I
+    iput p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->ft:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->ft:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Ljava/lang/String;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/LottieAnimationView;->getContext()Landroid/content/Context;
 
@@ -1264,11 +1264,11 @@
 .method public setAnimation(Ljava/lang/String;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->ft:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Ljava/lang/String;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fu:I
+    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->ft:I
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/LottieAnimationView;->getContext()Landroid/content/Context;
 
@@ -1357,13 +1357,13 @@
     invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p0}, Lcom/airbnb/lottie/f;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fB:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->a(Lcom/airbnb/lottie/d;)Z
 
@@ -1375,7 +1375,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     if-ne v0, v1, :cond_1
 
@@ -1388,7 +1388,7 @@
 
     invoke-virtual {p0, p1}, Lcom/airbnb/lottie/LottieAnimationView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {p0, p1}, Lcom/airbnb/lottie/LottieAnimationView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
@@ -1400,7 +1400,7 @@
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/LottieAnimationView;->requestLayout()V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fz:Ljava/util/Set;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fy:Ljava/util/Set;
 
     invoke-interface {p1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -1424,17 +1424,17 @@
 .method public setFontAssetDelegate(Lcom/airbnb/lottie/a;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/f;->gj:Lcom/airbnb/lottie/a;
+    iput-object p1, v0, Lcom/airbnb/lottie/f;->gi:Lcom/airbnb/lottie/a;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->gi:Lcom/airbnb/lottie/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->gh:Lcom/airbnb/lottie/b/a;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gi:Lcom/airbnb/lottie/b/a;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gh:Lcom/airbnb/lottie/b/a;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/b/a;->jp:Lcom/airbnb/lottie/a;
+    iput-object p1, v0, Lcom/airbnb/lottie/b/a;->jo:Lcom/airbnb/lottie/a;
 
     :cond_0
     return-void
@@ -1443,7 +1443,7 @@
 .method public setFrame(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->setFrame(I)V
 
@@ -1453,17 +1453,17 @@
 .method public setImageAssetDelegate(Lcom/airbnb/lottie/b;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/f;->gh:Lcom/airbnb/lottie/b;
+    iput-object p1, v0, Lcom/airbnb/lottie/f;->gg:Lcom/airbnb/lottie/b;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->gg:Lcom/airbnb/lottie/b/b;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->gf:Lcom/airbnb/lottie/b/b;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gg:Lcom/airbnb/lottie/b/b;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gf:Lcom/airbnb/lottie/b/b;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/b/b;->jt:Lcom/airbnb/lottie/b;
+    iput-object p1, v0, Lcom/airbnb/lottie/b/b;->js:Lcom/airbnb/lottie/b;
 
     :cond_0
     return-void
@@ -1472,9 +1472,9 @@
 .method public setImageAssetsFolder(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/f;->fF:Ljava/lang/String;
+    iput-object p1, v0, Lcom/airbnb/lottie/f;->fE:Ljava/lang/String;
 
     return-void
 .end method
@@ -1512,7 +1512,7 @@
 .method public setMaxFrame(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->setMaxFrame(I)V
 
@@ -1522,7 +1522,7 @@
 .method public setMaxFrame(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->setMaxFrame(Ljava/lang/String;)V
 
@@ -1532,7 +1532,7 @@
 .method public setMaxProgress(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->setMaxProgress(F)V
 
@@ -1542,7 +1542,7 @@
 .method public setMinAndMaxFrame(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->setMinAndMaxFrame(Ljava/lang/String;)V
 
@@ -1552,7 +1552,7 @@
 .method public setMinFrame(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->setMinFrame(I)V
 
@@ -1562,7 +1562,7 @@
 .method public setMinFrame(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->setMinFrame(Ljava/lang/String;)V
 
@@ -1572,7 +1572,7 @@
 .method public setMinProgress(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->setMinProgress(F)V
 
@@ -1582,15 +1582,15 @@
 .method public setPerformanceTrackingEnabled(Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iput-boolean p1, v0, Lcom/airbnb/lottie/f;->gn:Z
+    iput-boolean p1, v0, Lcom/airbnb/lottie/f;->gm:Z
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/d;->setPerformanceTrackingEnabled(Z)V
 
@@ -1601,7 +1601,7 @@
 .method public setProgress(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->setProgress(F)V
 
@@ -1611,7 +1611,7 @@
 .method public setRenderMode(Lcom/airbnb/lottie/n;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fy:Lcom/airbnb/lottie/n;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fx:Lcom/airbnb/lottie/n;
 
     invoke-direct {p0}, Lcom/airbnb/lottie/LottieAnimationView;->aN()V
 
@@ -1621,7 +1621,7 @@
 .method public setRepeatCount(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->setRepeatCount(I)V
 
@@ -1631,9 +1631,9 @@
 .method public setRepeatMode(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f/e;->setRepeatMode(I)V
 
@@ -1643,7 +1643,7 @@
 .method public setScale(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->setScale(F)V
 
@@ -1651,7 +1651,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     if-ne p1, v0, :cond_0
 
@@ -1659,7 +1659,7 @@
 
     invoke-virtual {p0, p1}, Lcom/airbnb/lottie/LottieAnimationView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {p0, p1}, Lcom/airbnb/lottie/LottieAnimationView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
@@ -1670,11 +1670,11 @@
 .method public setSpeed(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
-    iput p1, v0, Lcom/airbnb/lottie/f/e;->nP:F
+    iput p1, v0, Lcom/airbnb/lottie/f/e;->nO:F
 
     return-void
 .end method
@@ -1682,9 +1682,9 @@
 .method public setTextDelegate(Lcom/airbnb/lottie/p;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->fr:Lcom/airbnb/lottie/f;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/f;->gk:Lcom/airbnb/lottie/p;
+    iput-object p1, v0, Lcom/airbnb/lottie/f;->gj:Lcom/airbnb/lottie/p;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/R$a.smali b/com.discord/smali/com/airbnb/lottie/R$a.smali
index 2a3a172268..093ab18e11 100644
--- a/com.discord/smali/com/airbnb/lottie/R$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/R$a.smali
@@ -1204,7 +1204,7 @@
 
     new-array v5, v1, [I
 
-    const v7, 0x7f040305
+    const v7, 0x7f040308
 
     aput v7, v5, v3
 
@@ -1293,60 +1293,60 @@
         0x7f04004c
         0x7f04004e
         0x7f04004f
-        0x7f0400c8
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f0400e9
-        0x7f040103
+        0x7f0400ce
+        0x7f0400ea
         0x7f040104
-        0x7f040112
-        0x7f040156
-        0x7f04015b
-        0x7f040162
-        0x7f040163
-        0x7f0401c7
-        0x7f0401ea
-        0x7f0401f4
-        0x7f040257
-        0x7f040273
-        0x7f04028b
-        0x7f0402b9
-        0x7f0402ba
-        0x7f040313
+        0x7f040105
+        0x7f040114
+        0x7f040158
+        0x7f04015d
+        0x7f040164
+        0x7f040165
+        0x7f0401c9
+        0x7f0401ec
+        0x7f0401f6
+        0x7f04025a
+        0x7f040276
+        0x7f04028e
+        0x7f0402bc
+        0x7f0402bd
         0x7f040316
-        0x7f0403af
-        0x7f0403b9
+        0x7f040319
+        0x7f0403b2
+        0x7f0403bc
     .end array-data
 
     :array_1
     .array-data 4
         0x7f04004c
         0x7f04004e
-        0x7f0400ac
-        0x7f040156
-        0x7f040316
-        0x7f0403b9
+        0x7f0400ad
+        0x7f040158
+        0x7f040319
+        0x7f0403bc
     .end array-data
 
     :array_2
     .array-data 4
-        0x7f040118
-        0x7f0401eb
+        0x7f04011a
+        0x7f0401ed
     .end array-data
 
     :array_3
     .array-data 4
         0x10100f2
-        0x7f04007a
         0x7f04007b
-        0x7f04024e
-        0x7f04024f
-        0x7f040270
-        0x7f0402f8
-        0x7f0402f9
+        0x7f04007c
+        0x7f040251
+        0x7f040252
+        0x7f040273
+        0x7f0402fb
+        0x7f0402fc
     .end array-data
 
     :array_4
@@ -1376,17 +1376,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f040303
-        0x7f0403ad
-        0x7f0403ae
+        0x7f040306
+        0x7f0403b0
+        0x7f0403b1
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f0403aa
-        0x7f0403ab
-        0x7f0403ac
+        0x7f0403ad
+        0x7f0403ae
+        0x7f0403af
     .end array-data
 
     :array_9
@@ -1408,11 +1408,11 @@
         0x7f040048
         0x7f040049
         0x7f04004a
-        0x7f040131
-        0x7f04013f
-        0x7f0401fd
-        0x7f04024a
-        0x7f040339
+        0x7f040133
+        0x7f040141
+        0x7f0401ff
+        0x7f04024d
+        0x7f04033c
     .end array-data
 
     :array_b
@@ -1455,17 +1455,16 @@
         0x7f04002b
         0x7f04002c
         0x7f040044
-        0x7f040065
-        0x7f040074
+        0x7f040066
         0x7f040075
         0x7f040076
         0x7f040077
         0x7f040078
-        0x7f04007d
+        0x7f040079
         0x7f04007e
-        0x7f04008c
-        0x7f040091
-        0x7f0400b2
+        0x7f04007f
+        0x7f04008d
+        0x7f040092
         0x7f0400b3
         0x7f0400b4
         0x7f0400b5
@@ -1473,71 +1472,72 @@
         0x7f0400b7
         0x7f0400b8
         0x7f0400b9
-        0x7f0400bc
-        0x7f0400c1
-        0x7f0400d4
-        0x7f040100
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c2
+        0x7f0400d5
         0x7f040101
         0x7f040102
-        0x7f040108
-        0x7f04010a
-        0x7f04010d
-        0x7f04010e
+        0x7f040103
+        0x7f040109
+        0x7f04010b
         0x7f04010f
         0x7f040110
         0x7f040111
-        0x7f040162
-        0x7f0401d2
-        0x7f04024c
-        0x7f04024d
+        0x7f040112
+        0x7f040113
+        0x7f040164
+        0x7f0401d4
+        0x7f04024f
         0x7f040250
-        0x7f040251
-        0x7f040252
         0x7f040253
         0x7f040254
         0x7f040255
         0x7f040256
-        0x7f040280
-        0x7f040281
-        0x7f040282
-        0x7f04028a
-        0x7f04028c
-        0x7f0402bf
+        0x7f040257
+        0x7f040258
+        0x7f040259
+        0x7f040283
+        0x7f040284
+        0x7f040285
+        0x7f04028d
+        0x7f04028f
         0x7f0402c2
-        0x7f0402c3
-        0x7f0402c4
-        0x7f0402eb
-        0x7f0402ed
+        0x7f0402c5
+        0x7f0402c6
+        0x7f0402c7
         0x7f0402ee
-        0x7f0402ef
-        0x7f040300
-        0x7f040301
-        0x7f04031a
-        0x7f040344
-        0x7f040345
-        0x7f040346
+        0x7f0402f0
+        0x7f0402f1
+        0x7f0402f2
+        0x7f040303
+        0x7f040304
+        0x7f04031d
         0x7f040347
+        0x7f040348
         0x7f040349
         0x7f04034a
-        0x7f04034b
         0x7f04034c
+        0x7f04034d
+        0x7f04034e
         0x7f04034f
-        0x7f040350
-        0x7f0403bb
-        0x7f0403bc
-        0x7f0403bd
+        0x7f040352
+        0x7f040353
         0x7f0403be
-        0x7f0403dc
-        0x7f0403df
-        0x7f0403e0
+        0x7f0403bf
+        0x7f0403c0
+        0x7f0403c1
         0x7f0403e1
-        0x7f0403e2
-        0x7f0403e3
         0x7f0403e4
         0x7f0403e5
         0x7f0403e6
         0x7f0403e7
         0x7f0403e8
+        0x7f0403e9
+        0x7f0403ea
+        0x7f0403eb
+        0x7f0403ec
+        0x7f0403ed
     .end array-data
 
     :array_c
@@ -1550,25 +1550,25 @@
     :array_d
     .array-data 4
         0x1010107
-        0x7f04007f
         0x7f040080
+        0x7f040081
     .end array-data
 
     :array_e
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_f
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_10
@@ -1576,21 +1576,21 @@
         0x7f04003b
         0x7f04003c
         0x7f040052
-        0x7f0400b1
-        0x7f04010b
-        0x7f04014a
-        0x7f0402ff
-        0x7f0403a6
+        0x7f0400b2
+        0x7f04010c
+        0x7f04014c
+        0x7f040302
+        0x7f0403a9
     .end array-data
 
     :array_11
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_12
@@ -1600,11 +1600,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_13
@@ -1636,10 +1636,10 @@
         0x1010126
         0x1010127
         0x1010128
-        0x7f040104
-        0x7f040109
-        0x7f04026e
-        0x7f0402f5
+        0x7f040105
+        0x7f04010a
+        0x7f040271
+        0x7f0402f8
     .end array-data
 
     :array_16
@@ -1658,9 +1658,6 @@
 
     :array_18
     .array-data 4
-        0x7f040259
-        0x7f04025a
-        0x7f04025b
         0x7f04025c
         0x7f04025d
         0x7f04025e
@@ -1672,6 +1669,9 @@
         0x7f040264
         0x7f040265
         0x7f040266
+        0x7f040267
+        0x7f040268
+        0x7f040269
     .end array-data
 
     :array_19
@@ -1703,12 +1703,12 @@
         0x7f04001f
         0x7f040020
         0x7f040031
-        0x7f0400c7
-        0x7f0401cd
-        0x7f0401ce
-        0x7f040277
-        0x7f0402f1
-        0x7f0403bf
+        0x7f0400c8
+        0x7f0401cf
+        0x7f0401d0
+        0x7f04027a
+        0x7f0402f4
+        0x7f0403c2
     .end array-data
 
     :array_1b
@@ -1720,21 +1720,21 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04028d
-        0x7f040311
+        0x7f040290
+        0x7f040314
     .end array-data
 
     :array_1c
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040278
+        0x7f04027b
     .end array-data
 
     :array_1d
     .array-data 4
-        0x7f04027c
         0x7f04027f
+        0x7f040282
     .end array-data
 
     :array_1e
@@ -1743,19 +1743,19 @@
         0x101011f
         0x1010220
         0x1010264
-        0x7f0400a5
-        0x7f0400c2
-        0x7f0400ff
-        0x7f04014f
-        0x7f0401cf
-        0x7f0401fe
-        0x7f0402bd
-        0x7f0402be
-        0x7f0402e9
-        0x7f0402ea
-        0x7f040312
-        0x7f040317
-        0x7f0403dd
+        0x7f0400a6
+        0x7f0400c3
+        0x7f040100
+        0x7f040151
+        0x7f0401d1
+        0x7f040200
+        0x7f0402c0
+        0x7f0402c1
+        0x7f0402ec
+        0x7f0402ed
+        0x7f040315
+        0x7f04031a
+        0x7f0403e2
     .end array-data
 
     :array_1f
@@ -1764,7 +1764,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_20
@@ -1782,17 +1782,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f0402f7
-        0x7f040302
-        0x7f040318
-        0x7f040319
+        0x7f0402fa
+        0x7f040305
         0x7f04031b
-        0x7f0403a7
-        0x7f0403a8
-        0x7f0403a9
-        0x7f0403c0
-        0x7f0403c1
-        0x7f0403c2
+        0x7f04031c
+        0x7f04031e
+        0x7f0403aa
+        0x7f0403ab
+        0x7f0403ac
+        0x7f0403c3
+        0x7f0403c4
+        0x7f0403c5
     .end array-data
 
     :array_22
@@ -1808,50 +1808,50 @@
         0x1010163
         0x1010164
         0x10103ac
-        0x7f04013f
-        0x7f040339
+        0x7f040141
+        0x7f04033c
     .end array-data
 
     :array_23
     .array-data 4
         0x10100af
         0x1010140
-        0x7f040079
-        0x7f0400ad
+        0x7f04007a
         0x7f0400ae
-        0x7f0400c8
+        0x7f0400af
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f040257
-        0x7f040258
-        0x7f04026b
-        0x7f040271
-        0x7f040272
-        0x7f04028b
-        0x7f040313
-        0x7f040314
-        0x7f040315
-        0x7f0403af
-        0x7f0403b1
+        0x7f0400ce
+        0x7f04025a
+        0x7f04025b
+        0x7f04026e
+        0x7f040274
+        0x7f040275
+        0x7f04028e
+        0x7f040316
+        0x7f040317
+        0x7f040318
         0x7f0403b2
-        0x7f0403b3
         0x7f0403b4
         0x7f0403b5
         0x7f0403b6
         0x7f0403b7
         0x7f0403b8
+        0x7f0403b9
+        0x7f0403ba
+        0x7f0403bb
     .end array-data
 
     :array_24
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04027d
-        0x7f04027e
-        0x7f040355
+        0x7f040280
+        0x7f040281
+        0x7f040358
     .end array-data
 
     :array_25
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/a$a.smali b/com.discord/smali/com/airbnb/lottie/a/a/a$a.smali
index ce7ad01c07..c1f58673e6 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/a$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/a$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final hE:Ljava/util/List;
+.field final hD:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field final hF:Lcom/airbnb/lottie/a/a/s;
+.field final hE:Lcom/airbnb/lottie/a/a/s;
 
 
 # direct methods
@@ -38,9 +38,9 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a$a;->hE:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a$a;->hD:Ljava/util/List;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a$a;->hF:Lcom/airbnb/lottie/a/a/s;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a$a;->hE:Lcom/airbnb/lottie/a/a/s;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/a.smali b/com.discord/smali/com/airbnb/lottie/a/a/a.smali
index 9ee82d9164..684dab5cc0 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/a.smali
@@ -17,20 +17,9 @@
 
 
 # instance fields
-.field private final fs:Lcom/airbnb/lottie/f;
+.field private final fr:Lcom/airbnb/lottie/f;
 
-.field private final hA:Lcom/airbnb/lottie/a/b/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/a/b/a<",
-            "*",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private final hB:Ljava/util/List;
+.field private final hA:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -42,7 +31,7 @@
     .end annotation
 .end field
 
-.field private final hC:Lcom/airbnb/lottie/a/b/a;
+.field private final hB:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -53,7 +42,7 @@
     .end annotation
 .end field
 
-.field private hD:Lcom/airbnb/lottie/a/b/a;
+.field private hC:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -64,13 +53,13 @@
     .end annotation
 .end field
 
-.field private final hu:Landroid/graphics/PathMeasure;
+.field private final ht:Landroid/graphics/PathMeasure;
 
-.field private final hv:Landroid/graphics/Path;
+.field private final hu:Landroid/graphics/Path;
 
-.field protected final hw:Lcom/airbnb/lottie/c/c/a;
+.field protected final hv:Lcom/airbnb/lottie/c/c/a;
 
-.field private final hx:Ljava/util/List;
+.field private final hw:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -80,14 +69,25 @@
     .end annotation
 .end field
 
-.field private final hy:[F
+.field private final hx:[F
+
+.field private final hy:Lcom/airbnb/lottie/a/b/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/a/b/a<",
+            "*",
+            "Ljava/lang/Float;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field private final hz:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
             "*",
-            "Ljava/lang/Float;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -127,7 +127,7 @@
 
     invoke-direct {v0}, Landroid/graphics/PathMeasure;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/PathMeasure;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->ht:Landroid/graphics/PathMeasure;
 
     new-instance v0, Landroid/graphics/Path;
 
@@ -139,7 +139,7 @@
 
     invoke-direct {v0}, Landroid/graphics/Path;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->hv:Landroid/graphics/Path;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/Path;
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -151,7 +151,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->hx:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->hw:Ljava/util/List;
 
     new-instance v0, Lcom/airbnb/lottie/a/a;
 
@@ -161,9 +161,9 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->paint:Landroid/graphics/Paint;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fr:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/a;->hw:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/a;->hv:Lcom/airbnb/lottie/c/c/a;
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->paint:Landroid/graphics/Paint;
 
@@ -187,19 +187,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hA:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hz:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p7}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hz:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hy:Lcom/airbnb/lottie/a/b/a;
 
     if-nez p9, :cond_0
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hC:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hB:Lcom/airbnb/lottie/a/b/a;
 
     goto :goto_0
 
@@ -208,7 +208,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hC:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hB:Lcom/airbnb/lottie/a/b/a;
 
     :goto_0
     new-instance p1, Ljava/util/ArrayList;
@@ -219,7 +219,7 @@
 
     invoke-direct {p1, p3}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hB:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hA:Ljava/util/List;
 
     invoke-interface {p8}, Ljava/util/List;->size()I
 
@@ -227,7 +227,7 @@
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hy:[F
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hx:[F
 
     const/4 p1, 0x0
 
@@ -240,7 +240,7 @@
 
     if-ge p3, p4, :cond_1
 
-    iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->hB:Ljava/util/List;
+    iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->hA:Ljava/util/List;
 
     invoke-interface {p8, p3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -259,18 +259,18 @@
     goto :goto_1
 
     :cond_1
-    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hA:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hz:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p3}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hz:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hy:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p3}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
     const/4 p3, 0x0
 
     :goto_2
-    iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->hB:Ljava/util/List;
+    iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->hA:Ljava/util/List;
 
     invoke-interface {p4}, Ljava/util/List;->size()I
 
@@ -278,7 +278,7 @@
 
     if-ge p3, p4, :cond_2
 
-    iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->hB:Ljava/util/List;
+    iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->hA:Ljava/util/List;
 
     invoke-interface {p4, p3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -293,18 +293,18 @@
     goto :goto_2
 
     :cond_2
-    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hC:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hB:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz p3, :cond_3
 
     invoke-virtual {p2, p3}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
     :cond_3
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->hA:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->hz:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->hz:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->hy:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
@@ -315,7 +315,7 @@
 
     if-ge p1, p2, :cond_4
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->hB:Ljava/util/List;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->hA:Ljava/util/List;
 
     invoke-interface {p2, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -330,7 +330,7 @@
     goto :goto_3
 
     :cond_4
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hC:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hB:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz p1, :cond_5
 
@@ -347,7 +347,7 @@
 
     invoke-static {v0}, Lcom/airbnb/lottie/c;->beginSection(Ljava/lang/String;)V
 
-    iget-object v1, p2, Lcom/airbnb/lottie/a/a/a$a;->hF:Lcom/airbnb/lottie/a/a/s;
+    iget-object v1, p2, Lcom/airbnb/lottie/a/a/a$a;->hE:Lcom/airbnb/lottie/a/a/s;
 
     if-nez v1, :cond_0
 
@@ -360,7 +360,7 @@
 
     invoke-virtual {v1}, Landroid/graphics/Path;->reset()V
 
-    iget-object v1, p2, Lcom/airbnb/lottie/a/a/a$a;->hE:Ljava/util/List;
+    iget-object v1, p2, Lcom/airbnb/lottie/a/a/a$a;->hD:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -373,7 +373,7 @@
 
     iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->path:Landroid/graphics/Path;
 
-    iget-object v3, p2, Lcom/airbnb/lottie/a/a/a$a;->hE:Ljava/util/List;
+    iget-object v3, p2, Lcom/airbnb/lottie/a/a/a$a;->hD:Ljava/util/List;
 
     invoke-interface {v3, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -392,7 +392,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/PathMeasure;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->ht:Landroid/graphics/PathMeasure;
 
     iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->path:Landroid/graphics/Path;
 
@@ -400,14 +400,14 @@
 
     invoke-virtual {v1, v2, v3}, Landroid/graphics/PathMeasure;->setPath(Landroid/graphics/Path;Z)V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/PathMeasure;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->ht:Landroid/graphics/PathMeasure;
 
     invoke-virtual {v1}, Landroid/graphics/PathMeasure;->getLength()F
 
     move-result v1
 
     :goto_1
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/PathMeasure;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->ht:Landroid/graphics/PathMeasure;
 
     invoke-virtual {v2}, Landroid/graphics/PathMeasure;->nextContour()Z
 
@@ -415,7 +415,7 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/PathMeasure;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->ht:Landroid/graphics/PathMeasure;
 
     invoke-virtual {v2}, Landroid/graphics/PathMeasure;->getLength()F
 
@@ -426,9 +426,9 @@
     goto :goto_1
 
     :cond_2
-    iget-object v2, p2, Lcom/airbnb/lottie/a/a/a$a;->hF:Lcom/airbnb/lottie/a/a/s;
+    iget-object v2, p2, Lcom/airbnb/lottie/a/a/a$a;->hE:Lcom/airbnb/lottie/a/a/s;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/a/a/s;->iy:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v2, Lcom/airbnb/lottie/a/a/s;->ix:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -446,9 +446,9 @@
 
     div-float/2addr v2, v4
 
-    iget-object v4, p2, Lcom/airbnb/lottie/a/a/a$a;->hF:Lcom/airbnb/lottie/a/a/s;
+    iget-object v4, p2, Lcom/airbnb/lottie/a/a/a$a;->hE:Lcom/airbnb/lottie/a/a/s;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/a/a/s;->iw:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v4, Lcom/airbnb/lottie/a/a/s;->iv:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v4}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -468,9 +468,9 @@
 
     add-float/2addr v4, v2
 
-    iget-object v6, p2, Lcom/airbnb/lottie/a/a/a$a;->hF:Lcom/airbnb/lottie/a/a/s;
+    iget-object v6, p2, Lcom/airbnb/lottie/a/a/a$a;->hE:Lcom/airbnb/lottie/a/a/s;
 
-    iget-object v6, v6, Lcom/airbnb/lottie/a/a/s;->ix:Lcom/airbnb/lottie/a/b/a;
+    iget-object v6, v6, Lcom/airbnb/lottie/a/a/s;->iw:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v6}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -488,7 +488,7 @@
 
     add-float/2addr v6, v2
 
-    iget-object v2, p2, Lcom/airbnb/lottie/a/a/a$a;->hE:Ljava/util/List;
+    iget-object v2, p2, Lcom/airbnb/lottie/a/a/a$a;->hD:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -503,9 +503,9 @@
     :goto_2
     if-ltz v2, :cond_9
 
-    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->hv:Landroid/graphics/Path;
+    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/Path;
 
-    iget-object v9, p2, Lcom/airbnb/lottie/a/a/a$a;->hE:Ljava/util/List;
+    iget-object v9, p2, Lcom/airbnb/lottie/a/a/a$a;->hD:Ljava/util/List;
 
     invoke-interface {v9, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -519,17 +519,17 @@
 
     invoke-virtual {v8, v9}, Landroid/graphics/Path;->set(Landroid/graphics/Path;)V
 
-    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->hv:Landroid/graphics/Path;
+    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/Path;
 
     invoke-virtual {v8, p3}, Landroid/graphics/Path;->transform(Landroid/graphics/Matrix;)V
 
-    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/PathMeasure;
+    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->ht:Landroid/graphics/PathMeasure;
 
-    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->hv:Landroid/graphics/Path;
+    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/Path;
 
     invoke-virtual {v8, v9, v3}, Landroid/graphics/PathMeasure;->setPath(Landroid/graphics/Path;Z)V
 
-    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/PathMeasure;
+    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->ht:Landroid/graphics/PathMeasure;
 
     invoke-virtual {v8}, Landroid/graphics/PathMeasure;->getLength()F
 
@@ -594,7 +594,7 @@
 
     if-gez v11, :cond_5
 
-    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->hv:Landroid/graphics/Path;
+    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/Path;
 
     iget-object v10, p0, Lcom/airbnb/lottie/a/a/a;->paint:Landroid/graphics/Paint;
 
@@ -629,11 +629,11 @@
     div-float/2addr v9, v8
 
     :goto_5
-    iget-object v10, p0, Lcom/airbnb/lottie/a/a/a;->hv:Landroid/graphics/Path;
+    iget-object v10, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/Path;
 
     invoke-static {v10, v11, v9, v5}, Lcom/airbnb/lottie/f/h;->a(Landroid/graphics/Path;FFF)V
 
-    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->hv:Landroid/graphics/Path;
+    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->hu:Landroid/graphics/Path;
 
     iget-object v10, p0, Lcom/airbnb/lottie/a/a/a;->paint:Landroid/graphics/Paint;
 
@@ -679,7 +679,7 @@
 
     div-float/2addr p3, v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->hA:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->hz:Lcom/airbnb/lottie/a/b/a;
 
     check-cast v2, Lcom/airbnb/lottie/a/b/e;
 
@@ -709,7 +709,7 @@
 
     iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->paint:Landroid/graphics/Paint;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->hz:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->hy:Lcom/airbnb/lottie/a/b/a;
 
     check-cast v1, Lcom/airbnb/lottie/a/b/c;
 
@@ -746,7 +746,7 @@
 
     invoke-static {p3}, Lcom/airbnb/lottie/c;->beginSection(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->hB:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->hA:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->isEmpty()Z
 
@@ -768,7 +768,7 @@
     const/4 v4, 0x0
 
     :goto_0
-    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->hB:Ljava/util/List;
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->hA:Ljava/util/List;
 
     invoke-interface {v5}, Ljava/util/List;->size()I
 
@@ -776,9 +776,9 @@
 
     if-ge v4, v5, :cond_5
 
-    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->hy:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->hx:[F
 
-    iget-object v6, p0, Lcom/airbnb/lottie/a/a/a;->hB:Ljava/util/List;
+    iget-object v6, p0, Lcom/airbnb/lottie/a/a/a;->hA:Ljava/util/List;
 
     invoke-interface {v6, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -802,7 +802,7 @@
 
     if-nez v5, :cond_3
 
-    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->hy:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->hx:[F
 
     aget v6, v5, v4
 
@@ -817,7 +817,7 @@
     goto :goto_1
 
     :cond_3
-    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->hy:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->hx:[F
 
     aget v6, v5, v4
 
@@ -831,7 +831,7 @@
 
     :cond_4
     :goto_1
-    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->hy:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->hx:[F
 
     aget v6, v5, v4
 
@@ -844,7 +844,7 @@
     goto :goto_0
 
     :cond_5
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->hC:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->hB:Lcom/airbnb/lottie/a/b/a;
 
     if-nez v2, :cond_6
 
@@ -866,7 +866,7 @@
 
     new-instance v4, Landroid/graphics/DashPathEffect;
 
-    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->hy:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->hx:[F
 
     invoke-direct {v4, v5, v1}, Landroid/graphics/DashPathEffect;-><init>([FF)V
 
@@ -875,7 +875,7 @@
     invoke-static {p3}, Lcom/airbnb/lottie/c;->q(Ljava/lang/String;)F
 
     :goto_3
-    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hC:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz p3, :cond_7
 
@@ -891,7 +891,7 @@
 
     :cond_7
     :goto_4
-    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hx:Ljava/util/List;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hw:Ljava/util/List;
 
     invoke-interface {p3}, Ljava/util/List;->size()I
 
@@ -899,7 +899,7 @@
 
     if-ge v3, p3, :cond_a
 
-    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hx:Ljava/util/List;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->hw:Ljava/util/List;
 
     invoke-interface {p3, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -907,7 +907,7 @@
 
     check-cast p3, Lcom/airbnb/lottie/a/a/a$a;
 
-    iget-object v1, p3, Lcom/airbnb/lottie/a/a/a$a;->hF:Lcom/airbnb/lottie/a/a/s;
+    iget-object v1, p3, Lcom/airbnb/lottie/a/a/a$a;->hE:Lcom/airbnb/lottie/a/a/s;
 
     if-eqz v1, :cond_8
 
@@ -924,7 +924,7 @@
 
     invoke-virtual {v2}, Landroid/graphics/Path;->reset()V
 
-    iget-object v2, p3, Lcom/airbnb/lottie/a/a/a$a;->hE:Ljava/util/List;
+    iget-object v2, p3, Lcom/airbnb/lottie/a/a/a$a;->hD:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -937,7 +937,7 @@
 
     iget-object v4, p0, Lcom/airbnb/lottie/a/a/a;->path:Landroid/graphics/Path;
 
-    iget-object v5, p3, Lcom/airbnb/lottie/a/a/a$a;->hE:Ljava/util/List;
+    iget-object v5, p3, Lcom/airbnb/lottie/a/a/a$a;->hD:Ljava/util/List;
 
     invoke-interface {v5, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -997,7 +997,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->hx:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->hw:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -1005,7 +1005,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->hx:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->hw:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1016,7 +1016,7 @@
     const/4 v3, 0x0
 
     :goto_1
-    iget-object v4, v2, Lcom/airbnb/lottie/a/a/a$a;->hE:Ljava/util/List;
+    iget-object v4, v2, Lcom/airbnb/lottie/a/a/a$a;->hD:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -1026,7 +1026,7 @@
 
     iget-object v4, p0, Lcom/airbnb/lottie/a/a/a;->path:Landroid/graphics/Path;
 
-    iget-object v5, v2, Lcom/airbnb/lottie/a/a/a$a;->hE:Ljava/util/List;
+    iget-object v5, v2, Lcom/airbnb/lottie/a/a/a$a;->hD:Ljava/util/List;
 
     invoke-interface {v5, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1056,7 +1056,7 @@
 
     invoke-virtual {p2, v1, v0}, Landroid/graphics/Path;->computeBounds(Landroid/graphics/RectF;Z)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->hz:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->hy:Lcom/airbnb/lottie/a/b/a;
 
     check-cast p2, Lcom/airbnb/lottie/a/b/c;
 
@@ -1155,29 +1155,29 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/airbnb/lottie/j;->gF:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->gE:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hA:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
-
-    return-void
-
-    :cond_0
-    sget-object v0, Lcom/airbnb/lottie/j;->gQ:Ljava/lang/Float;
-
-    if-ne p1, v0, :cond_1
-
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hz:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     return-void
 
+    :cond_0
+    sget-object v0, Lcom/airbnb/lottie/j;->gP:Ljava/lang/Float;
+
+    if-ne p1, v0, :cond_1
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hy:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
+
+    return-void
+
     :cond_1
-    sget-object v0, Lcom/airbnb/lottie/j;->hd:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->hc:Landroid/graphics/ColorFilter;
 
     if-ne p1, v0, :cond_3
 
@@ -1185,7 +1185,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hD:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hC:Lcom/airbnb/lottie/a/b/a;
 
     return-void
 
@@ -1194,15 +1194,15 @@
 
     invoke-direct {p1, p2}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hD:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hC:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hC:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hw:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hv:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->hC:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -1249,9 +1249,9 @@
 
     check-cast v3, Lcom/airbnb/lottie/a/a/s;
 
-    iget v4, v3, Lcom/airbnb/lottie/a/a/s;->iv:I
+    iget v4, v3, Lcom/airbnb/lottie/a/a/s;->iu:I
 
-    sget v5, Lcom/airbnb/lottie/c/b/q$a;->lv:I
+    sget v5, Lcom/airbnb/lottie/c/b/q$a;->lu:I
 
     if-ne v4, v5, :cond_0
 
@@ -1293,15 +1293,15 @@
 
     check-cast v3, Lcom/airbnb/lottie/a/a/s;
 
-    iget v5, v3, Lcom/airbnb/lottie/a/a/s;->iv:I
+    iget v5, v3, Lcom/airbnb/lottie/a/a/s;->iu:I
 
-    sget v6, Lcom/airbnb/lottie/c/b/q$a;->lv:I
+    sget v6, Lcom/airbnb/lottie/c/b/q$a;->lu:I
 
     if-ne v5, v6, :cond_4
 
     if-eqz v1, :cond_3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->hx:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->hw:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -1328,7 +1328,7 @@
     invoke-direct {v1, v2, v4}, Lcom/airbnb/lottie/a/a/a$a;-><init>(Lcom/airbnb/lottie/a/a/s;B)V
 
     :cond_5
-    iget-object v3, v1, Lcom/airbnb/lottie/a/a/a$a;->hE:Ljava/util/List;
+    iget-object v3, v1, Lcom/airbnb/lottie/a/a/a$a;->hD:Ljava/util/List;
 
     check-cast v0, Lcom/airbnb/lottie/a/a/m;
 
@@ -1343,7 +1343,7 @@
     :cond_7
     if-eqz v1, :cond_8
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hx:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->hw:Ljava/util/List;
 
     invoke-interface {p1, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -1354,7 +1354,7 @@
 .method public final aX()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/b.smali b/com.discord/smali/com/airbnb/lottie/a/a/b.smali
index 31780b034a..05be7ee659 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/b.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private hG:Ljava/util/List;
+.field private hF:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/b;->hG:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/b;->hF:Ljava/util/List;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final a(Landroid/graphics/Path;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/b;->hG:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/b;->hF:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -46,7 +46,7 @@
     :goto_0
     if-ltz v0, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/b;->hG:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/b;->hF:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -67,7 +67,7 @@
 .method final a(Lcom/airbnb/lottie/a/a/s;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/b;->hG:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/b;->hF:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/d.smali b/com.discord/smali/com/airbnb/lottie/a/a/d.smali
index c7ad2ec175..603dfca752 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/d.smali
@@ -10,9 +10,9 @@
 
 
 # instance fields
-.field private final fs:Lcom/airbnb/lottie/f;
+.field private final fr:Lcom/airbnb/lottie/f;
 
-.field private final hG:Ljava/util/List;
+.field private final hF:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -22,9 +22,9 @@
     .end annotation
 .end field
 
-.field private final hH:Z
+.field private final hG:Z
 
-.field private hI:Ljava/util/List;
+.field private hH:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private hJ:Lcom/airbnb/lottie/a/b/o;
+.field private hI:Lcom/airbnb/lottie/a/b/o;
 
 .field private final matrix:Landroid/graphics/Matrix;
 
@@ -51,7 +51,7 @@
 
     iget-object v3, p3, Lcom/airbnb/lottie/c/b/n;->name:Ljava/lang/String;
 
-    iget-boolean v4, p3, Lcom/airbnb/lottie/c/b/n;->hH:Z
+    iget-boolean v4, p3, Lcom/airbnb/lottie/c/b/n;->hG:Z
 
     iget-object v0, p3, Lcom/airbnb/lottie/c/b/n;->items:Ljava/util/List;
 
@@ -115,11 +115,11 @@
 
     iput-object p3, p0, Lcom/airbnb/lottie/a/a/d;->name:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/d;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/d;->fr:Lcom/airbnb/lottie/f;
 
-    iput-boolean p4, p0, Lcom/airbnb/lottie/a/a/d;->hH:Z
+    iput-boolean p4, p0, Lcom/airbnb/lottie/a/a/d;->hG:Z
 
-    iput-object p5, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iput-object p5, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     if-eqz p6, :cond_0
 
@@ -127,13 +127,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/d;->hJ:Lcom/airbnb/lottie/a/b/o;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/d;->hI:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/d;->hJ:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/d;->hI:Lcom/airbnb/lottie/a/b/o;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/o;->a(Lcom/airbnb/lottie/c/c/a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/d;->hJ:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/d;->hI:Lcom/airbnb/lottie/a/b/o;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/o;->a(Lcom/airbnb/lottie/a/b/a$a;)V
 
@@ -311,7 +311,7 @@
 .method public final a(Landroid/graphics/Canvas;Landroid/graphics/Matrix;I)V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/d;->hH:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/d;->hG:Z
 
     if-eqz v0, :cond_0
 
@@ -322,7 +322,7 @@
 
     invoke-virtual {v0, p2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->hJ:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->hI:Lcom/airbnb/lottie/a/b/o;
 
     if-eqz p2, :cond_2
 
@@ -334,9 +334,9 @@
 
     invoke-virtual {v0, p2}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->hJ:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->hI:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p2, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     if-nez p2, :cond_1
 
@@ -345,9 +345,9 @@
     goto :goto_0
 
     :cond_1
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->hJ:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->hI:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p2, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -379,7 +379,7 @@
     float-to-int p3, p2
 
     :cond_2
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     invoke-interface {p2}, Ljava/util/List;->size()I
 
@@ -390,7 +390,7 @@
     :goto_1
     if-ltz p2, :cond_4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -422,7 +422,7 @@
 
     invoke-virtual {v0, p2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->hJ:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->hI:Lcom/airbnb/lottie/a/b/o;
 
     if-eqz p2, :cond_0
 
@@ -441,7 +441,7 @@
 
     invoke-virtual {p2, v0, v0, v0, v0}, Landroid/graphics/RectF;->set(FFFF)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     invoke-interface {p2}, Ljava/util/List;->size()I
 
@@ -452,7 +452,7 @@
     :goto_0
     if-ltz p2, :cond_2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -561,7 +561,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -569,7 +569,7 @@
 
     if-ge v0, v1, :cond_3
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -606,7 +606,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hJ:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hI:Lcom/airbnb/lottie/a/b/o;
 
     if-eqz v0, :cond_0
 
@@ -636,7 +636,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -648,7 +648,7 @@
 
     invoke-interface {p2, p1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -659,7 +659,7 @@
     :goto_0
     if-ltz p1, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -667,7 +667,7 @@
 
     check-cast v0, Lcom/airbnb/lottie/a/a/c;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     const/4 v2, 0x0
 
@@ -690,7 +690,7 @@
 .method public final aX()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
@@ -708,7 +708,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hI:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hH:Ljava/util/List;
 
     if-nez v0, :cond_1
 
@@ -716,12 +716,12 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hI:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hH:Ljava/util/List;
 
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -729,7 +729,7 @@
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -741,7 +741,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/d;->hI:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/d;->hH:Ljava/util/List;
 
     check-cast v1, Lcom/airbnb/lottie/a/a/m;
 
@@ -753,7 +753,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hI:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hH:Ljava/util/List;
 
     return-object v0
 .end method
@@ -761,7 +761,7 @@
 .method final aZ()Landroid/graphics/Matrix;
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hJ:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hI:Lcom/airbnb/lottie/a/b/o;
 
     if-eqz v0, :cond_0
 
@@ -796,7 +796,7 @@
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hJ:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hI:Lcom/airbnb/lottie/a/b/o;
 
     if-eqz v0, :cond_0
 
@@ -813,7 +813,7 @@
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/d;->hH:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/d;->hG:Z
 
     if-eqz v0, :cond_1
 
@@ -822,7 +822,7 @@
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -833,7 +833,7 @@
     :goto_0
     if-ltz v0, :cond_3
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hG:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->hF:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/f.smali b/com.discord/smali/com/airbnb/lottie/a/a/f.smali
index bc6318beaa..d7bdef7709 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/f.smali
@@ -9,7 +9,18 @@
 
 
 # instance fields
-.field private final fs:Lcom/airbnb/lottie/f;
+.field private final fr:Lcom/airbnb/lottie/f;
+
+.field private final hJ:Lcom/airbnb/lottie/a/b/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/a/b/a<",
+            "*",
+            "Landroid/graphics/PointF;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field private final hK:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -22,22 +33,11 @@
     .end annotation
 .end field
 
-.field private final hL:Lcom/airbnb/lottie/a/b/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/a/b/a<",
-            "*",
-            "Landroid/graphics/PointF;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private final hL:Lcom/airbnb/lottie/c/b/a;
 
-.field private final hM:Lcom/airbnb/lottie/c/b/a;
+.field private hM:Lcom/airbnb/lottie/a/a/b;
 
-.field private hN:Lcom/airbnb/lottie/a/a/b;
-
-.field private hO:Z
+.field private hN:Z
 
 .field private final name:Ljava/lang/String;
 
@@ -60,45 +60,45 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/a/a/b;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/f;->hN:Lcom/airbnb/lottie/a/a/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/f;->hM:Lcom/airbnb/lottie/a/a/b;
 
     iget-object v0, p3, Lcom/airbnb/lottie/c/b/a;->name:Ljava/lang/String;
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/f;->name:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/a;->kk:Lcom/airbnb/lottie/c/a/f;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/a;->kj:Lcom/airbnb/lottie/c/a/f;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/f;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hK:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hJ:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/a;->kc:Lcom/airbnb/lottie/c/a/m;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/a;->kb:Lcom/airbnb/lottie/c/a/m;
 
     invoke-interface {p1}, Lcom/airbnb/lottie/c/a/m;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hL:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hK:Lcom/airbnb/lottie/a/b/a;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/a/a/f;->hM:Lcom/airbnb/lottie/c/b/a;
+    iput-object p3, p0, Lcom/airbnb/lottie/a/a/f;->hL:Lcom/airbnb/lottie/c/b/a;
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hJ:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hK:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hL:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hK:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hJ:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hL:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hK:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
@@ -139,22 +139,22 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/airbnb/lottie/j;->gI:Landroid/graphics/PointF;
+    sget-object v0, Lcom/airbnb/lottie/j;->gH:Landroid/graphics/PointF;
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hK:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hJ:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     return-void
 
     :cond_0
-    sget-object v0, Lcom/airbnb/lottie/j;->gL:Landroid/graphics/PointF;
+    sget-object v0, Lcom/airbnb/lottie/j;->gK:Landroid/graphics/PointF;
 
     if-ne p1, v0, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hL:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->hK:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
@@ -197,13 +197,13 @@
 
     check-cast v0, Lcom/airbnb/lottie/a/a/s;
 
-    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->iv:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->iu:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/q$a;->lu:I
+    sget v2, Lcom/airbnb/lottie/c/b/q$a;->lt:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/f;->hN:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/f;->hM:Lcom/airbnb/lottie/a/a/b;
 
     invoke-virtual {v1, v0}, Lcom/airbnb/lottie/a/a/b;->a(Lcom/airbnb/lottie/a/a/s;)V
 
@@ -223,9 +223,9 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/f;->hO:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/f;->hN:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/f;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/f;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
@@ -245,7 +245,7 @@
 
     move-object/from16 v0, p0
 
-    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/f;->hO:Z
+    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/f;->hN:Z
 
     if-eqz v1, :cond_0
 
@@ -258,22 +258,22 @@
 
     invoke-virtual {v1}, Landroid/graphics/Path;->reset()V
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->hM:Lcom/airbnb/lottie/c/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->hL:Lcom/airbnb/lottie/c/b/a;
 
-    iget-boolean v1, v1, Lcom/airbnb/lottie/c/b/a;->hH:Z
+    iget-boolean v1, v1, Lcom/airbnb/lottie/c/b/a;->hG:Z
 
     const/4 v2, 0x1
 
     if-eqz v1, :cond_1
 
-    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/f;->hO:Z
+    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/f;->hN:Z
 
     iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->path:Landroid/graphics/Path;
 
     return-object v1
 
     :cond_1
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->hK:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->hJ:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -301,9 +301,9 @@
 
     invoke-virtual {v5}, Landroid/graphics/Path;->reset()V
 
-    iget-object v5, v0, Lcom/airbnb/lottie/a/a/f;->hM:Lcom/airbnb/lottie/c/b/a;
+    iget-object v5, v0, Lcom/airbnb/lottie/a/a/f;->hL:Lcom/airbnb/lottie/c/b/a;
 
-    iget-boolean v5, v5, Lcom/airbnb/lottie/c/b/a;->kl:Z
+    iget-boolean v5, v5, Lcom/airbnb/lottie/c/b/a;->kk:Z
 
     const/4 v13, 0x0
 
@@ -469,7 +469,7 @@
     invoke-virtual/range {v14 .. v20}, Landroid/graphics/Path;->cubicTo(FFFFFF)V
 
     :goto_0
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->hL:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->hK:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -489,13 +489,13 @@
 
     invoke-virtual {v1}, Landroid/graphics/Path;->close()V
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->hN:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->hM:Lcom/airbnb/lottie/a/a/b;
 
     iget-object v3, v0, Lcom/airbnb/lottie/a/a/f;->path:Landroid/graphics/Path;
 
     invoke-virtual {v1, v3}, Lcom/airbnb/lottie/a/a/b;->a(Landroid/graphics/Path;)V
 
-    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/f;->hO:Z
+    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/f;->hN:Z
 
     iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->path:Landroid/graphics/Path;
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/g.smali b/com.discord/smali/com/airbnb/lottie/a/a/g.smali
index dd8d1f3e7f..10255a6867 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/g.smali
@@ -9,20 +9,9 @@
 
 
 # instance fields
-.field private final fs:Lcom/airbnb/lottie/f;
+.field private final fr:Lcom/airbnb/lottie/f;
 
-.field private final hA:Lcom/airbnb/lottie/a/b/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/a/b/a<",
-            "Ljava/lang/Integer;",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private hD:Lcom/airbnb/lottie/a/b/a;
+.field private hC:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -33,7 +22,7 @@
     .end annotation
 .end field
 
-.field private final hE:Ljava/util/List;
+.field private final hD:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -43,9 +32,9 @@
     .end annotation
 .end field
 
-.field private final hH:Z
+.field private final hG:Z
 
-.field private final hP:Lcom/airbnb/lottie/a/b/a;
+.field private final hO:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -56,7 +45,18 @@
     .end annotation
 .end field
 
-.field private final hw:Lcom/airbnb/lottie/c/c/a;
+.field private final hv:Lcom/airbnb/lottie/c/c/a;
+
+.field private final hz:Lcom/airbnb/lottie/a/b/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/a/b/a<",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field private final name:Ljava/lang/String;
 
@@ -89,25 +89,25 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/g;->hE:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/g;->hD:Ljava/util/List;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/g;->hw:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/g;->hv:Lcom/airbnb/lottie/c/c/a;
 
     iget-object v0, p3, Lcom/airbnb/lottie/c/b/m;->name:Ljava/lang/String;
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/g;->name:Ljava/lang/String;
 
-    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/m;->hH:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/m;->hG:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/g;->hH:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/g;->hG:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->jX:Lcom/airbnb/lottie/c/a/a;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->jW:Lcom/airbnb/lottie/c/a/a;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->kf:Lcom/airbnb/lottie/c/a/d;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->ke:Lcom/airbnb/lottie/c/a/d;
 
     if-nez p1, :cond_0
 
@@ -116,39 +116,39 @@
     :cond_0
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->path:Landroid/graphics/Path;
 
-    iget-object v0, p3, Lcom/airbnb/lottie/c/b/m;->kp:Landroid/graphics/Path$FillType;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/m;->ko:Landroid/graphics/Path$FillType;
 
     invoke-virtual {p1, v0}, Landroid/graphics/Path;->setFillType(Landroid/graphics/Path$FillType;)V
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->jX:Lcom/airbnb/lottie/c/a/a;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->jW:Lcom/airbnb/lottie/c/a/a;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/a;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hP:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hO:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->kf:Lcom/airbnb/lottie/c/a/d;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->ke:Lcom/airbnb/lottie/c/a/d;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/d;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hA:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hz:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hA:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hz:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hA:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hz:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -158,9 +158,9 @@
     :goto_0
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hP:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hO:Lcom/airbnb/lottie/a/b/a;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hA:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hz:Lcom/airbnb/lottie/a/b/a;
 
     return-void
 .end method
@@ -170,7 +170,7 @@
 .method public final a(Landroid/graphics/Canvas;Landroid/graphics/Matrix;I)V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/g;->hH:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/g;->hG:Z
 
     if-eqz v0, :cond_0
 
@@ -183,7 +183,7 @@
 
     iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->paint:Landroid/graphics/Paint;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->hO:Lcom/airbnb/lottie/a/b/a;
 
     check-cast v2, Lcom/airbnb/lottie/a/b/b;
 
@@ -199,7 +199,7 @@
 
     div-float/2addr p3, v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->hA:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->hz:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -231,7 +231,7 @@
 
     invoke-virtual {v1, p3}, Landroid/graphics/Paint;->setAlpha(I)V
 
-    iget-object p3, p0, Lcom/airbnb/lottie/a/a/g;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/g;->hC:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz p3, :cond_1
 
@@ -253,7 +253,7 @@
     const/4 p3, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->hE:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->hD:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -263,7 +263,7 @@
 
     iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->path:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->hE:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->hD:Ljava/util/List;
 
     invoke-interface {v2, p3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -305,7 +305,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->hE:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->hD:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -315,7 +315,7 @@
 
     iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->path:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->hE:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->hD:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -393,29 +393,29 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/airbnb/lottie/j;->gC:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->gB:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     return-void
 
     :cond_0
-    sget-object v0, Lcom/airbnb/lottie/j;->gF:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->gE:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hA:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hz:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     return-void
 
     :cond_1
-    sget-object v0, Lcom/airbnb/lottie/j;->hd:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->hc:Landroid/graphics/ColorFilter;
 
     if-ne p1, v0, :cond_3
 
@@ -423,7 +423,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hD:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hC:Lcom/airbnb/lottie/a/b/a;
 
     return-void
 
@@ -432,15 +432,15 @@
 
     invoke-direct {p1, p2}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hD:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hC:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hC:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hw:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->hv:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/g;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/g;->hC:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -481,7 +481,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->hE:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->hD:Ljava/util/List;
 
     check-cast v0, Lcom/airbnb/lottie/a/a/m;
 
@@ -499,7 +499,7 @@
 .method public final aX()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/g;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/g;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/h.smali b/com.discord/smali/com/airbnb/lottie/a/a/h.smali
index 37a71b7991..b087688158 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/h.smali
@@ -9,20 +9,9 @@
 
 
 # instance fields
-.field private final fs:Lcom/airbnb/lottie/f;
+.field private final fr:Lcom/airbnb/lottie/f;
 
-.field private final hA:Lcom/airbnb/lottie/a/b/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/a/b/a<",
-            "Ljava/lang/Integer;",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private hD:Lcom/airbnb/lottie/a/b/a;
+.field private hC:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -33,7 +22,7 @@
     .end annotation
 .end field
 
-.field private final hE:Ljava/util/List;
+.field private final hD:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -43,9 +32,9 @@
     .end annotation
 .end field
 
-.field private final hH:Z
+.field private final hG:Z
 
-.field private final hP:Lcom/airbnb/lottie/a/b/a;
+.field private final hO:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -56,7 +45,7 @@
     .end annotation
 .end field
 
-.field private final hQ:Landroidx/collection/LongSparseArray;
+.field private final hP:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -66,7 +55,7 @@
     .end annotation
 .end field
 
-.field private final hR:Landroidx/collection/LongSparseArray;
+.field private final hQ:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -76,11 +65,22 @@
     .end annotation
 .end field
 
-.field private final hS:Landroid/graphics/Matrix;
+.field private final hR:Landroid/graphics/Matrix;
 
-.field private final hT:Landroid/graphics/RectF;
+.field private final hS:Landroid/graphics/RectF;
 
-.field private final hU:I
+.field private final hT:I
+
+.field private final hU:Lcom/airbnb/lottie/a/b/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/a/b/a<",
+            "Landroid/graphics/PointF;",
+            "Landroid/graphics/PointF;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field private final hV:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -93,23 +93,23 @@
     .end annotation
 .end field
 
-.field private final hW:Lcom/airbnb/lottie/a/b/a;
+.field private hW:Lcom/airbnb/lottie/a/b/p;
+
+.field private final hX:I
+
+.field private final hv:Lcom/airbnb/lottie/c/c/a;
+
+.field private final hz:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
-            "Landroid/graphics/PointF;",
-            "Landroid/graphics/PointF;",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
 .end field
 
-.field private hX:Lcom/airbnb/lottie/a/b/p;
-
-.field private final hY:I
-
-.field private final hw:Lcom/airbnb/lottie/c/c/a;
-
 .field private final name:Ljava/lang/String;
 
 .field private final paint:Landroid/graphics/Paint;
@@ -127,19 +127,19 @@
 
     invoke-direct {v0}, Landroidx/collection/LongSparseArray;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hQ:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hP:Landroidx/collection/LongSparseArray;
 
     new-instance v0, Landroidx/collection/LongSparseArray;
 
     invoke-direct {v0}, Landroidx/collection/LongSparseArray;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hR:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hQ:Landroidx/collection/LongSparseArray;
 
     new-instance v0, Landroid/graphics/Matrix;
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hS:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hR:Landroid/graphics/Matrix;
 
     new-instance v0, Landroid/graphics/Path;
 
@@ -159,37 +159,37 @@
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hT:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hS:Landroid/graphics/RectF;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hE:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hD:Ljava/util/List;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/h;->hw:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/h;->hv:Lcom/airbnb/lottie/c/c/a;
 
     iget-object v0, p3, Lcom/airbnb/lottie/c/b/d;->name:Ljava/lang/String;
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->name:Ljava/lang/String;
 
-    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/d;->hH:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/d;->hG:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/h;->hH:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/h;->hG:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fr:Lcom/airbnb/lottie/f;
 
-    iget v0, p3, Lcom/airbnb/lottie/c/b/d;->ko:I
+    iget v0, p3, Lcom/airbnb/lottie/c/b/d;->kn:I
 
-    iput v0, p0, Lcom/airbnb/lottie/a/a/h;->hU:I
+    iput v0, p0, Lcom/airbnb/lottie/a/a/h;->hT:I
 
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->path:Landroid/graphics/Path;
 
-    iget-object v1, p3, Lcom/airbnb/lottie/c/b/d;->kp:Landroid/graphics/Path$FillType;
+    iget-object v1, p3, Lcom/airbnb/lottie/c/b/d;->ko:Landroid/graphics/Path$FillType;
 
     invoke-virtual {v0, v1}, Landroid/graphics/Path;->setFillType(Landroid/graphics/Path$FillType;)V
 
-    iget-object p1, p1, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object p1, p1, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/d;->aO()F
 
@@ -201,37 +201,53 @@
 
     float-to-int p1, p1
 
-    iput p1, p0, Lcom/airbnb/lottie/a/a/h;->hY:I
+    iput p1, p0, Lcom/airbnb/lottie/a/a/h;->hX:I
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/d;->kq:Lcom/airbnb/lottie/c/a/c;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/d;->kp:Lcom/airbnb/lottie/c/a/c;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/c;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hP:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hO:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/d;->kf:Lcom/airbnb/lottie/c/a/d;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/d;->ke:Lcom/airbnb/lottie/c/a/d;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/d;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hA:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hz:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hA:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hz:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hA:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hz:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
+
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/d;->kq:Lcom/airbnb/lottie/c/a/f;
+
+    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/f;->bn()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hU:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hU:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hU:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -251,29 +267,13 @@
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/d;->ks:Lcom/airbnb/lottie/c/a/f;
-
-    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/f;->bn()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hW:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hW:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hW:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
-
     return-void
 .end method
 
 .method private a([I)[I
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hX:Lcom/airbnb/lottie/a/b/p;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hW:Lcom/airbnb/lottie/a/b/p;
 
     if-eqz v0, :cond_1
 
@@ -339,11 +339,11 @@
 .method private ba()I
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hV:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->hU:Lcom/airbnb/lottie/a/b/a;
 
-    iget v0, v0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v0, v0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
-    iget v1, p0, Lcom/airbnb/lottie/a/a/h;->hY:I
+    iget v1, p0, Lcom/airbnb/lottie/a/a/h;->hX:I
 
     int-to-float v1, v1
 
@@ -353,11 +353,11 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->hW:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->hV:Lcom/airbnb/lottie/a/b/a;
 
-    iget v1, v1, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v1, v1, Lcom/airbnb/lottie/a/b/a;->fD:F
 
-    iget v2, p0, Lcom/airbnb/lottie/a/a/h;->hY:I
+    iget v2, p0, Lcom/airbnb/lottie/a/a/h;->hX:I
 
     int-to-float v2, v2
 
@@ -367,11 +367,11 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/h;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/h;->hO:Lcom/airbnb/lottie/a/b/a;
 
-    iget v2, v2, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v2, v2, Lcom/airbnb/lottie/a/b/a;->fD:F
 
-    iget v3, p0, Lcom/airbnb/lottie/a/a/h;->hY:I
+    iget v3, p0, Lcom/airbnb/lottie/a/a/h;->hX:I
 
     int-to-float v3, v3
 
@@ -417,7 +417,7 @@
 
     move-object/from16 v1, p2
 
-    iget-boolean v2, v0, Lcom/airbnb/lottie/a/a/h;->hH:Z
+    iget-boolean v2, v0, Lcom/airbnb/lottie/a/a/h;->hG:Z
 
     if-eqz v2, :cond_0
 
@@ -437,7 +437,7 @@
     const/4 v4, 0x0
 
     :goto_0
-    iget-object v5, v0, Lcom/airbnb/lottie/a/a/h;->hE:Ljava/util/List;
+    iget-object v5, v0, Lcom/airbnb/lottie/a/a/h;->hD:Ljava/util/List;
 
     invoke-interface {v5}, Ljava/util/List;->size()I
 
@@ -447,7 +447,7 @@
 
     iget-object v5, v0, Lcom/airbnb/lottie/a/a/h;->path:Landroid/graphics/Path;
 
-    iget-object v6, v0, Lcom/airbnb/lottie/a/a/h;->hE:Ljava/util/List;
+    iget-object v6, v0, Lcom/airbnb/lottie/a/a/h;->hD:Ljava/util/List;
 
     invoke-interface {v6, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -468,13 +468,13 @@
     :cond_1
     iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->path:Landroid/graphics/Path;
 
-    iget-object v5, v0, Lcom/airbnb/lottie/a/a/h;->hT:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/airbnb/lottie/a/a/h;->hS:Landroid/graphics/RectF;
 
     invoke-virtual {v4, v5, v3}, Landroid/graphics/Path;->computeBounds(Landroid/graphics/RectF;Z)V
 
-    iget v3, v0, Lcom/airbnb/lottie/a/a/h;->hU:I
+    iget v3, v0, Lcom/airbnb/lottie/a/a/h;->hT:I
 
-    sget v4, Lcom/airbnb/lottie/c/b/f;->kB:I
+    sget v4, Lcom/airbnb/lottie/c/b/f;->kA:I
 
     if-ne v3, v4, :cond_3
 
@@ -482,7 +482,7 @@
 
     move-result v3
 
-    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hQ:Landroidx/collection/LongSparseArray;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hP:Landroidx/collection/LongSparseArray;
 
     int-to-long v5, v3
 
@@ -497,7 +497,7 @@
     goto/16 :goto_2
 
     :cond_2
-    iget-object v3, v0, Lcom/airbnb/lottie/a/a/h;->hV:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/h;->hU:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v3}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -505,7 +505,7 @@
 
     check-cast v3, Landroid/graphics/PointF;
 
-    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hW:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hV:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v4}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -513,7 +513,7 @@
 
     check-cast v4, Landroid/graphics/PointF;
 
-    iget-object v7, v0, Lcom/airbnb/lottie/a/a/h;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/h;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v7}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -521,13 +521,13 @@
 
     check-cast v7, Lcom/airbnb/lottie/c/b/c;
 
-    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     invoke-direct {v0, v8}, Lcom/airbnb/lottie/a/a/h;->a([I)[I
 
     move-result-object v14
 
-    iget-object v15, v7, Lcom/airbnb/lottie/c/b/c;->km:[F
+    iget-object v15, v7, Lcom/airbnb/lottie/c/b/c;->kl:[F
 
     new-instance v7, Landroid/graphics/LinearGradient;
 
@@ -545,7 +545,7 @@
 
     invoke-direct/range {v9 .. v16}, Landroid/graphics/LinearGradient;-><init>(FFFF[I[FLandroid/graphics/Shader$TileMode;)V
 
-    iget-object v3, v0, Lcom/airbnb/lottie/a/a/h;->hQ:Landroidx/collection/LongSparseArray;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/h;->hP:Landroidx/collection/LongSparseArray;
 
     invoke-virtual {v3, v5, v6, v7}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
 
@@ -558,7 +558,7 @@
 
     move-result v3
 
-    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hR:Landroidx/collection/LongSparseArray;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hQ:Landroidx/collection/LongSparseArray;
 
     int-to-long v5, v3
 
@@ -573,7 +573,7 @@
     goto :goto_2
 
     :cond_4
-    iget-object v3, v0, Lcom/airbnb/lottie/a/a/h;->hV:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/h;->hU:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v3}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -581,7 +581,7 @@
 
     check-cast v3, Landroid/graphics/PointF;
 
-    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hW:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hV:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v4}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -589,7 +589,7 @@
 
     check-cast v4, Landroid/graphics/PointF;
 
-    iget-object v7, v0, Lcom/airbnb/lottie/a/a/h;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/h;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v7}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -597,13 +597,13 @@
 
     check-cast v7, Lcom/airbnb/lottie/c/b/c;
 
-    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     invoke-direct {v0, v8}, Lcom/airbnb/lottie/a/a/h;->a([I)[I
 
     move-result-object v13
 
-    iget-object v14, v7, Lcom/airbnb/lottie/c/b/c;->km:[F
+    iget-object v14, v7, Lcom/airbnb/lottie/c/b/c;->kl:[F
 
     iget v10, v3, Landroid/graphics/PointF;->x:F
 
@@ -651,16 +651,16 @@
 
     invoke-direct/range {v9 .. v15}, Landroid/graphics/RadialGradient;-><init>(FFF[I[FLandroid/graphics/Shader$TileMode;)V
 
-    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hR:Landroidx/collection/LongSparseArray;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hQ:Landroidx/collection/LongSparseArray;
 
     invoke-virtual {v4, v5, v6, v3}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
 
     :goto_2
-    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hS:Landroid/graphics/Matrix;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hR:Landroid/graphics/Matrix;
 
     invoke-virtual {v4, v1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/h;->hS:Landroid/graphics/Matrix;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/h;->hR:Landroid/graphics/Matrix;
 
     invoke-virtual {v3, v1}, Landroid/graphics/Shader;->setLocalMatrix(Landroid/graphics/Matrix;)V
 
@@ -668,7 +668,7 @@
 
     invoke-virtual {v1, v3}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/h;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/h;->hC:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_6
 
@@ -691,7 +691,7 @@
 
     div-float/2addr v1, v3
 
-    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hA:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->hz:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v4}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -748,7 +748,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->hE:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->hD:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -758,7 +758,7 @@
 
     iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->path:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/h;->hE:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/h;->hD:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -836,18 +836,18 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/airbnb/lottie/j;->gF:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->gE:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hA:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hz:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     return-void
 
     :cond_0
-    sget-object v0, Lcom/airbnb/lottie/j;->hd:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->hc:Landroid/graphics/ColorFilter;
 
     const/4 v1, 0x0
 
@@ -855,7 +855,7 @@
 
     if-nez p2, :cond_1
 
-    iput-object v1, p0, Lcom/airbnb/lottie/a/a/h;->hD:Lcom/airbnb/lottie/a/b/a;
+    iput-object v1, p0, Lcom/airbnb/lottie/a/a/h;->hC:Lcom/airbnb/lottie/a/b/a;
 
     return-void
 
@@ -864,37 +864,37 @@
 
     invoke-direct {p1, p2}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hD:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hC:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hC:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hw:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hv:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->hC:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
     return-void
 
     :cond_2
-    sget-object v0, Lcom/airbnb/lottie/j;->he:[Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->hd:[Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_5
 
     if-nez p2, :cond_4
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hX:Lcom/airbnb/lottie/a/b/p;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hW:Lcom/airbnb/lottie/a/b/p;
 
     if-eqz p1, :cond_3
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->hw:Lcom/airbnb/lottie/c/c/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->hv:Lcom/airbnb/lottie/c/c/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->b(Lcom/airbnb/lottie/a/b/a;)V
 
     :cond_3
-    iput-object v1, p0, Lcom/airbnb/lottie/a/a/h;->hX:Lcom/airbnb/lottie/a/b/p;
+    iput-object v1, p0, Lcom/airbnb/lottie/a/a/h;->hW:Lcom/airbnb/lottie/a/b/p;
 
     return-void
 
@@ -903,15 +903,15 @@
 
     invoke-direct {p1, p2}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hX:Lcom/airbnb/lottie/a/b/p;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hW:Lcom/airbnb/lottie/a/b/p;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hX:Lcom/airbnb/lottie/a/b/p;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hW:Lcom/airbnb/lottie/a/b/p;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/p;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hw:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->hv:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->hX:Lcom/airbnb/lottie/a/b/p;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->hW:Lcom/airbnb/lottie/a/b/p;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -952,7 +952,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->hE:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->hD:Ljava/util/List;
 
     check-cast v0, Lcom/airbnb/lottie/a/a/m;
 
@@ -970,7 +970,7 @@
 .method public final aX()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/i.smali b/com.discord/smali/com/airbnb/lottie/a/a/i.smali
index ebb6c44fe1..dd1921fc41 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/i.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/i.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final hH:Z
+.field private final hG:Z
 
-.field private final hP:Lcom/airbnb/lottie/a/b/a;
+.field private final hO:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private final hQ:Landroidx/collection/LongSparseArray;
+.field private final hP:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final hR:Landroidx/collection/LongSparseArray;
+.field private final hQ:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -37,9 +37,20 @@
     .end annotation
 .end field
 
-.field private final hT:Landroid/graphics/RectF;
+.field private final hS:Landroid/graphics/RectF;
 
-.field private final hU:I
+.field private final hT:I
+
+.field private final hU:Lcom/airbnb/lottie/a/b/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/a/b/a<",
+            "Landroid/graphics/PointF;",
+            "Landroid/graphics/PointF;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field private final hV:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -52,20 +63,9 @@
     .end annotation
 .end field
 
-.field private final hW:Lcom/airbnb/lottie/a/b/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/a/b/a<",
-            "Landroid/graphics/PointF;",
-            "Landroid/graphics/PointF;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private hW:Lcom/airbnb/lottie/a/b/p;
 
-.field private hX:Lcom/airbnb/lottie/a/b/p;
-
-.field private final hY:I
+.field private final hX:I
 
 .field private final name:Ljava/lang/String;
 
@@ -74,27 +74,27 @@
 .method public constructor <init>(Lcom/airbnb/lottie/f;Lcom/airbnb/lottie/c/c/a;Lcom/airbnb/lottie/c/b/e;)V
     .locals 11
 
-    iget-object v0, p3, Lcom/airbnb/lottie/c/b/e;->kw:Lcom/airbnb/lottie/c/b/p$a;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/e;->kv:Lcom/airbnb/lottie/c/b/p$a;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/b/p$a;->bs()Landroid/graphics/Paint$Cap;
 
     move-result-object v4
 
-    iget-object v0, p3, Lcom/airbnb/lottie/c/b/e;->kx:Lcom/airbnb/lottie/c/b/p$b;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/e;->kw:Lcom/airbnb/lottie/c/b/p$b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/b/p$b;->bt()Landroid/graphics/Paint$Join;
 
     move-result-object v5
 
-    iget v6, p3, Lcom/airbnb/lottie/c/b/e;->ky:F
+    iget v6, p3, Lcom/airbnb/lottie/c/b/e;->kx:F
 
-    iget-object v7, p3, Lcom/airbnb/lottie/c/b/e;->kf:Lcom/airbnb/lottie/c/a/d;
+    iget-object v7, p3, Lcom/airbnb/lottie/c/b/e;->ke:Lcom/airbnb/lottie/c/a/d;
 
-    iget-object v8, p3, Lcom/airbnb/lottie/c/b/e;->kv:Lcom/airbnb/lottie/c/a/b;
+    iget-object v8, p3, Lcom/airbnb/lottie/c/b/e;->ku:Lcom/airbnb/lottie/c/a/b;
 
-    iget-object v9, p3, Lcom/airbnb/lottie/c/b/e;->kz:Ljava/util/List;
+    iget-object v9, p3, Lcom/airbnb/lottie/c/b/e;->ky:Ljava/util/List;
 
-    iget-object v10, p3, Lcom/airbnb/lottie/c/b/e;->kA:Lcom/airbnb/lottie/c/a/b;
+    iget-object v10, p3, Lcom/airbnb/lottie/c/b/e;->kz:Lcom/airbnb/lottie/c/a/b;
 
     move-object v1, p0
 
@@ -108,33 +108,33 @@
 
     invoke-direct {v0}, Landroidx/collection/LongSparseArray;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/i;->hQ:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/i;->hP:Landroidx/collection/LongSparseArray;
 
     new-instance v0, Landroidx/collection/LongSparseArray;
 
     invoke-direct {v0}, Landroidx/collection/LongSparseArray;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/i;->hR:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/i;->hQ:Landroidx/collection/LongSparseArray;
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     iget-object v0, p3, Lcom/airbnb/lottie/c/b/e;->name:Ljava/lang/String;
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/i;->name:Ljava/lang/String;
 
-    iget v0, p3, Lcom/airbnb/lottie/c/b/e;->ko:I
+    iget v0, p3, Lcom/airbnb/lottie/c/b/e;->kn:I
 
-    iput v0, p0, Lcom/airbnb/lottie/a/a/i;->hU:I
+    iput v0, p0, Lcom/airbnb/lottie/a/a/i;->hT:I
 
-    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/e;->hH:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/e;->hG:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/i;->hH:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/i;->hG:Z
 
-    iget-object p1, p1, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object p1, p1, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/d;->aO()F
 
@@ -146,21 +146,37 @@
 
     float-to-int p1, p1
 
-    iput p1, p0, Lcom/airbnb/lottie/a/a/i;->hY:I
+    iput p1, p0, Lcom/airbnb/lottie/a/a/i;->hX:I
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/e;->kq:Lcom/airbnb/lottie/c/a/c;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/e;->kp:Lcom/airbnb/lottie/c/a/c;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/c;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hP:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hO:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hO:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
+
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/e;->kq:Lcom/airbnb/lottie/c/a/f;
+
+    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/f;->bn()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hU:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hU:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hU:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -180,29 +196,13 @@
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/e;->ks:Lcom/airbnb/lottie/c/a/f;
-
-    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/f;->bn()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hW:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hW:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hW:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
-
     return-void
 .end method
 
 .method private a([I)[I
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/i;->hX:Lcom/airbnb/lottie/a/b/p;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/i;->hW:Lcom/airbnb/lottie/a/b/p;
 
     if-eqz v0, :cond_1
 
@@ -268,11 +268,11 @@
 .method private ba()I
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/i;->hV:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/i;->hU:Lcom/airbnb/lottie/a/b/a;
 
-    iget v0, v0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v0, v0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
-    iget v1, p0, Lcom/airbnb/lottie/a/a/i;->hY:I
+    iget v1, p0, Lcom/airbnb/lottie/a/a/i;->hX:I
 
     int-to-float v1, v1
 
@@ -282,11 +282,11 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/i;->hW:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/i;->hV:Lcom/airbnb/lottie/a/b/a;
 
-    iget v1, v1, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v1, v1, Lcom/airbnb/lottie/a/b/a;->fD:F
 
-    iget v2, p0, Lcom/airbnb/lottie/a/a/i;->hY:I
+    iget v2, p0, Lcom/airbnb/lottie/a/a/i;->hX:I
 
     int-to-float v2, v2
 
@@ -296,11 +296,11 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/i;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/i;->hO:Lcom/airbnb/lottie/a/b/a;
 
-    iget v2, v2, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v2, v2, Lcom/airbnb/lottie/a/b/a;->fD:F
 
-    iget v3, p0, Lcom/airbnb/lottie/a/a/i;->hY:I
+    iget v3, p0, Lcom/airbnb/lottie/a/a/i;->hX:I
 
     int-to-float v3, v3
 
@@ -344,14 +344,14 @@
 
     move-object/from16 v0, p0
 
-    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/i;->hH:Z
+    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/i;->hG:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     const/4 v2, 0x0
 
@@ -359,9 +359,9 @@
 
     invoke-virtual {v0, v1, v3, v2}, Lcom/airbnb/lottie/a/a/i;->a(Landroid/graphics/RectF;Landroid/graphics/Matrix;Z)V
 
-    iget v1, v0, Lcom/airbnb/lottie/a/a/i;->hU:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/i;->hT:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/f;->kB:I
+    sget v2, Lcom/airbnb/lottie/c/b/f;->kA:I
 
     const/high16 v4, 0x40000000    # 2.0f
 
@@ -371,7 +371,7 @@
 
     move-result v1
 
-    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->hQ:Landroidx/collection/LongSparseArray;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->hP:Landroidx/collection/LongSparseArray;
 
     int-to-long v5, v1
 
@@ -386,7 +386,7 @@
     goto/16 :goto_0
 
     :cond_1
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->hV:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->hU:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -394,7 +394,7 @@
 
     check-cast v1, Landroid/graphics/PointF;
 
-    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->hW:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->hV:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -402,7 +402,7 @@
 
     check-cast v2, Landroid/graphics/PointF;
 
-    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v7}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -410,19 +410,19 @@
 
     check-cast v7, Lcom/airbnb/lottie/c/b/c;
 
-    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     invoke-direct {v0, v8}, Lcom/airbnb/lottie/a/a/i;->a([I)[I
 
     move-result-object v14
 
-    iget-object v15, v7, Lcom/airbnb/lottie/c/b/c;->km:[F
+    iget-object v15, v7, Lcom/airbnb/lottie/c/b/c;->kl:[F
 
-    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     iget v7, v7, Landroid/graphics/RectF;->left:F
 
-    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     invoke-virtual {v8}, Landroid/graphics/RectF;->width()F
 
@@ -438,11 +438,11 @@
 
     float-to-int v7, v7
 
-    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     iget v8, v8, Landroid/graphics/RectF;->top:F
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     invoke-virtual {v9}, Landroid/graphics/RectF;->height()F
 
@@ -458,11 +458,11 @@
 
     float-to-int v1, v8
 
-    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     iget v8, v8, Landroid/graphics/RectF;->left:F
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     invoke-virtual {v9}, Landroid/graphics/RectF;->width()F
 
@@ -478,11 +478,11 @@
 
     float-to-int v8, v8
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     iget v9, v9, Landroid/graphics/RectF;->top:F
 
-    iget-object v10, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     invoke-virtual {v10}, Landroid/graphics/RectF;->height()F
 
@@ -514,7 +514,7 @@
 
     invoke-direct/range {v9 .. v16}, Landroid/graphics/LinearGradient;-><init>(FFFF[I[FLandroid/graphics/Shader$TileMode;)V
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->hQ:Landroidx/collection/LongSparseArray;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->hP:Landroidx/collection/LongSparseArray;
 
     invoke-virtual {v1, v5, v6, v4}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
 
@@ -527,7 +527,7 @@
 
     move-result v1
 
-    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->hR:Landroidx/collection/LongSparseArray;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->hQ:Landroidx/collection/LongSparseArray;
 
     int-to-long v5, v1
 
@@ -542,7 +542,7 @@
     goto/16 :goto_0
 
     :cond_3
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->hV:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->hU:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -550,7 +550,7 @@
 
     check-cast v1, Landroid/graphics/PointF;
 
-    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->hW:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->hV:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -558,7 +558,7 @@
 
     check-cast v2, Landroid/graphics/PointF;
 
-    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v7}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -566,19 +566,19 @@
 
     check-cast v7, Lcom/airbnb/lottie/c/b/c;
 
-    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     invoke-direct {v0, v8}, Lcom/airbnb/lottie/a/a/i;->a([I)[I
 
     move-result-object v13
 
-    iget-object v14, v7, Lcom/airbnb/lottie/c/b/c;->km:[F
+    iget-object v14, v7, Lcom/airbnb/lottie/c/b/c;->kl:[F
 
-    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     iget v7, v7, Landroid/graphics/RectF;->left:F
 
-    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     invoke-virtual {v8}, Landroid/graphics/RectF;->width()F
 
@@ -594,11 +594,11 @@
 
     float-to-int v7, v7
 
-    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     iget v8, v8, Landroid/graphics/RectF;->top:F
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     invoke-virtual {v9}, Landroid/graphics/RectF;->height()F
 
@@ -614,11 +614,11 @@
 
     float-to-int v1, v8
 
-    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     iget v8, v8, Landroid/graphics/RectF;->left:F
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     invoke-virtual {v9}, Landroid/graphics/RectF;->width()F
 
@@ -634,11 +634,11 @@
 
     float-to-int v8, v8
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     iget v9, v9, Landroid/graphics/RectF;->top:F
 
-    iget-object v10, v0, Lcom/airbnb/lottie/a/a/i;->hT:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/airbnb/lottie/a/a/i;->hS:Landroid/graphics/RectF;
 
     invoke-virtual {v10}, Landroid/graphics/RectF;->height()F
 
@@ -680,7 +680,7 @@
 
     invoke-direct/range {v9 .. v15}, Landroid/graphics/RadialGradient;-><init>(FFF[I[FLandroid/graphics/Shader$TileMode;)V
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->hR:Landroidx/collection/LongSparseArray;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->hQ:Landroidx/collection/LongSparseArray;
 
     invoke-virtual {v1, v5, v6, v2}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
 
@@ -710,26 +710,26 @@
 
     invoke-super {p0, p1, p2}, Lcom/airbnb/lottie/a/a/a;->a(Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
 
-    sget-object v0, Lcom/airbnb/lottie/j;->he:[Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->hd:[Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_2
 
     if-nez p2, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hX:Lcom/airbnb/lottie/a/b/p;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hW:Lcom/airbnb/lottie/a/b/p;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hw:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hv:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/i;->hX:Lcom/airbnb/lottie/a/b/p;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/i;->hW:Lcom/airbnb/lottie/a/b/p;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/c/c/a;->b(Lcom/airbnb/lottie/a/b/a;)V
 
     :cond_0
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hX:Lcom/airbnb/lottie/a/b/p;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hW:Lcom/airbnb/lottie/a/b/p;
 
     return-void
 
@@ -738,15 +738,15 @@
 
     invoke-direct {p1, p2}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hX:Lcom/airbnb/lottie/a/b/p;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hW:Lcom/airbnb/lottie/a/b/p;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hX:Lcom/airbnb/lottie/a/b/p;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hW:Lcom/airbnb/lottie/a/b/p;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/p;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hw:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->hv:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/i;->hX:Lcom/airbnb/lottie/a/b/p;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/i;->hW:Lcom/airbnb/lottie/a/b/p;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/l$1.smali b/com.discord/smali/com/airbnb/lottie/a/a/l$1.smali
index f462b98a11..9d77e2d6bd 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/l$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/l$1.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final synthetic ic:[I
+.field static final synthetic ib:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/a/a/l$1;->ic:[I
+    sput-object v0, Lcom/airbnb/lottie/a/a/l$1;->ib:[I
 
     :try_start_0
-    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->ic:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->ib:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kM:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kL:Lcom/airbnb/lottie/c/b/h$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/b/h$a;->ordinal()I
 
@@ -49,9 +49,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->ic:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->ib:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kN:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kM:Lcom/airbnb/lottie/c/b/h$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/b/h$a;->ordinal()I
 
@@ -65,9 +65,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->ic:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->ib:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kO:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kN:Lcom/airbnb/lottie/c/b/h$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/b/h$a;->ordinal()I
 
@@ -81,9 +81,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->ic:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->ib:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kP:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kO:Lcom/airbnb/lottie/c/b/h$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/b/h$a;->ordinal()I
 
@@ -97,9 +97,9 @@
 
     :catch_3
     :try_start_4
-    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->ic:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->ib:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kQ:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kP:Lcom/airbnb/lottie/c/b/h$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/b/h$a;->ordinal()I
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/l.smali b/com.discord/smali/com/airbnb/lottie/a/a/l.smali
index 382cee1644..04b1f366f3 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/l.smali
@@ -8,7 +8,7 @@
 
 
 # instance fields
-.field private final hI:Ljava/util/List;
+.field private final hH:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -18,11 +18,11 @@
     .end annotation
 .end field
 
+.field private final hY:Landroid/graphics/Path;
+
 .field private final hZ:Landroid/graphics/Path;
 
-.field private final ia:Landroid/graphics/Path;
-
-.field private final ib:Lcom/airbnb/lottie/c/b/h;
+.field private final ia:Lcom/airbnb/lottie/c/b/h;
 
 .field private final name:Ljava/lang/String;
 
@@ -39,13 +39,13 @@
 
     invoke-direct {v0}, Landroid/graphics/Path;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/l;->hZ:Landroid/graphics/Path;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/l;->hY:Landroid/graphics/Path;
 
     new-instance v0, Landroid/graphics/Path;
 
     invoke-direct {v0}, Landroid/graphics/Path;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/l;->ia:Landroid/graphics/Path;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/l;->hZ:Landroid/graphics/Path;
 
     new-instance v0, Landroid/graphics/Path;
 
@@ -57,7 +57,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/l;->hI:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/l;->hH:Ljava/util/List;
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -69,7 +69,7 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/l;->name:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/l;->ib:Lcom/airbnb/lottie/c/b/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/l;->ia:Lcom/airbnb/lottie/c/b/h;
 
     return-void
 
@@ -86,15 +86,15 @@
 .method private a(Landroid/graphics/Path$Op;)V
     .locals 6
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->ia:Landroid/graphics/Path;
-
-    invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
-
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->hZ:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->hI:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->hY:Landroid/graphics/Path;
+
+    invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
+
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->hH:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -105,7 +105,7 @@
     :goto_0
     if-lez v0, :cond_2
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hI:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hH:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -148,7 +148,7 @@
 
     invoke-virtual {v4, v5}, Landroid/graphics/Path;->transform(Landroid/graphics/Matrix;)V
 
-    iget-object v5, p0, Lcom/airbnb/lottie/a/a/l;->ia:Landroid/graphics/Path;
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/l;->hZ:Landroid/graphics/Path;
 
     invoke-virtual {v5, v4}, Landroid/graphics/Path;->addPath(Landroid/graphics/Path;)V
 
@@ -157,7 +157,7 @@
     goto :goto_1
 
     :cond_0
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->ia:Landroid/graphics/Path;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->hZ:Landroid/graphics/Path;
 
     invoke-interface {v1}, Lcom/airbnb/lottie/a/a/m;->getPath()Landroid/graphics/Path;
 
@@ -171,7 +171,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->hI:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->hH:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -214,7 +214,7 @@
 
     invoke-virtual {v3, v4}, Landroid/graphics/Path;->transform(Landroid/graphics/Matrix;)V
 
-    iget-object v4, p0, Lcom/airbnb/lottie/a/a/l;->hZ:Landroid/graphics/Path;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/a/l;->hY:Landroid/graphics/Path;
 
     invoke-virtual {v4, v3}, Landroid/graphics/Path;->addPath(Landroid/graphics/Path;)V
 
@@ -223,7 +223,7 @@
     goto :goto_2
 
     :cond_3
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hZ:Landroid/graphics/Path;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hY:Landroid/graphics/Path;
 
     invoke-interface {v0}, Lcom/airbnb/lottie/a/a/m;->getPath()Landroid/graphics/Path;
 
@@ -234,9 +234,9 @@
     :cond_4
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->path:Landroid/graphics/Path;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hZ:Landroid/graphics/Path;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hY:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->ia:Landroid/graphics/Path;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->hZ:Landroid/graphics/Path;
 
     invoke-virtual {v0, v1, v2, p1}, Landroid/graphics/Path;->op(Landroid/graphics/Path;Landroid/graphics/Path;Landroid/graphics/Path$Op;)Z
 
@@ -262,7 +262,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hI:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hH:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -270,7 +270,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hI:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hH:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -330,7 +330,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hI:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hH:Ljava/util/List;
 
     check-cast v0, Lcom/airbnb/lottie/a/a/m;
 
@@ -359,9 +359,9 @@
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->ib:Lcom/airbnb/lottie/c/b/h;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->ia:Lcom/airbnb/lottie/c/b/h;
 
-    iget-boolean v0, v0, Lcom/airbnb/lottie/c/b/h;->hH:Z
+    iget-boolean v0, v0, Lcom/airbnb/lottie/c/b/h;->hG:Z
 
     if-eqz v0, :cond_0
 
@@ -370,11 +370,11 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->ic:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->ib:[I
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->ib:Lcom/airbnb/lottie/c/b/h;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->ia:Lcom/airbnb/lottie/c/b/h;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/c/b/h;->kL:Lcom/airbnb/lottie/c/b/h$a;
+    iget-object v1, v1, Lcom/airbnb/lottie/c/b/h;->kK:Lcom/airbnb/lottie/c/b/h$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/b/h$a;->ordinal()I
 
@@ -436,7 +436,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hI:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->hH:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -446,7 +446,7 @@
 
     iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->path:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->hI:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->hH:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/n$1.smali b/com.discord/smali/com/airbnb/lottie/a/a/n$1.smali
index 427694e3bb..da7f72ab85 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/n$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/n$1.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final synthetic il:[I
+.field static final synthetic ik:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/a/a/n$1;->il:[I
+    sput-object v0, Lcom/airbnb/lottie/a/a/n$1;->ik:[I
 
     :try_start_0
-    sget-object v0, Lcom/airbnb/lottie/a/a/n$1;->il:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/n$1;->ik:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/i$a;->kX:Lcom/airbnb/lottie/c/b/i$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/i$a;->kW:Lcom/airbnb/lottie/c/b/i$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/b/i$a;->ordinal()I
 
@@ -49,9 +49,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/airbnb/lottie/a/a/n$1;->il:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/n$1;->ik:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/i$a;->kY:Lcom/airbnb/lottie/c/b/i$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/i$a;->kX:Lcom/airbnb/lottie/c/b/i$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/b/i$a;->ordinal()I
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/n.smali b/com.discord/smali/com/airbnb/lottie/a/a/n.smali
index 5f46b86054..50f508f554 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/n.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/n.smali
@@ -9,11 +9,11 @@
 
 
 # instance fields
-.field private final fs:Lcom/airbnb/lottie/f;
+.field private final fr:Lcom/airbnb/lottie/f;
 
-.field private final hH:Z
+.field private final hG:Z
 
-.field private final hL:Lcom/airbnb/lottie/a/b/a;
+.field private final hK:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -24,11 +24,22 @@
     .end annotation
 .end field
 
-.field private hN:Lcom/airbnb/lottie/a/a/b;
+.field private hM:Lcom/airbnb/lottie/a/a/b;
 
-.field private hO:Z
+.field private hN:Z
 
-.field private final ie:Lcom/airbnb/lottie/c/b/i$a;
+.field private final ic:Lcom/airbnb/lottie/c/b/i$a;
+
+.field private final ie:Lcom/airbnb/lottie/a/b/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/a/b/a<",
+            "*",
+            "Ljava/lang/Float;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field private final if:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -85,17 +96,6 @@
     .end annotation
 .end field
 
-.field private final ik:Lcom/airbnb/lottie/a/b/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/a/b/a<",
-            "*",
-            "Ljava/lang/Float;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private final name:Ljava/lang/String;
 
 .field private final path:Landroid/graphics/Path;
@@ -117,23 +117,39 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/a/a/b;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/n;->hN:Lcom/airbnb/lottie/a/a/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/n;->hM:Lcom/airbnb/lottie/a/a/b;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->fr:Lcom/airbnb/lottie/f;
 
     iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->name:Ljava/lang/String;
 
     iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->name:Ljava/lang/String;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->ie:Lcom/airbnb/lottie/c/b/i$a;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->ic:Lcom/airbnb/lottie/c/b/i$a;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ie:Lcom/airbnb/lottie/c/b/i$a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ic:Lcom/airbnb/lottie/c/b/i$a;
 
-    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/i;->hH:Z
+    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/i;->hG:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/n;->hH:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/n;->hG:Z
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->kS:Lcom/airbnb/lottie/c/a/b;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->kR:Lcom/airbnb/lottie/c/a/b;
+
+    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ie:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->kb:Lcom/airbnb/lottie/c/a/m;
+
+    invoke-interface {p1}, Lcom/airbnb/lottie/c/a/m;->bn()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->hK:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->kd:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
 
@@ -141,44 +157,6 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->if:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->kc:Lcom/airbnb/lottie/c/a/m;
-
-    invoke-interface {p1}, Lcom/airbnb/lottie/c/a/m;->bn()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->hL:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->ke:Lcom/airbnb/lottie/c/a/b;
-
-    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ig:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->kU:Lcom/airbnb/lottie/c/a/b;
-
-    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ii:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->kW:Lcom/airbnb/lottie/c/a/b;
-
-    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ik:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ie:Lcom/airbnb/lottie/c/b/i$a;
-
-    sget-object v0, Lcom/airbnb/lottie/c/b/i$a;->kX:Lcom/airbnb/lottie/c/b/i$a;
-
-    if-ne p1, v0, :cond_0
-
     iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->kT:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
@@ -195,42 +173,50 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ij:Lcom/airbnb/lottie/a/b/a;
 
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ic:Lcom/airbnb/lottie/c/b/i$a;
+
+    sget-object v0, Lcom/airbnb/lottie/c/b/i$a;->kW:Lcom/airbnb/lottie/c/b/i$a;
+
+    if-ne p1, v0, :cond_0
+
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->kS:Lcom/airbnb/lottie/c/a/b;
+
+    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ig:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->kU:Lcom/airbnb/lottie/c/a/b;
+
+    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ii:Lcom/airbnb/lottie/a/b/a;
+
     goto :goto_0
 
     :cond_0
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ih:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ig:Lcom/airbnb/lottie/a/b/a;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ij:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ii:Lcom/airbnb/lottie/a/b/a;
 
     :goto_0
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ie:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->hK:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
+
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->if:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->hL:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ig:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ii:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ik:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ie:Lcom/airbnb/lottie/c/b/i$a;
-
-    sget-object p3, Lcom/airbnb/lottie/c/b/i$a;->kX:Lcom/airbnb/lottie/c/b/i$a;
-
-    if-ne p1, p3, :cond_1
-
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ih:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
@@ -239,33 +225,33 @@
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ic:Lcom/airbnb/lottie/c/b/i$a;
+
+    sget-object p3, Lcom/airbnb/lottie/c/b/i$a;->kW:Lcom/airbnb/lottie/c/b/i$a;
+
+    if-ne p1, p3, :cond_1
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ig:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ii:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
+
     :cond_1
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ie:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->hK:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
+
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->if:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->hL:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ig:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ii:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ik:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ie:Lcom/airbnb/lottie/c/b/i$a;
-
-    sget-object p2, Lcom/airbnb/lottie/c/b/i$a;->kX:Lcom/airbnb/lottie/c/b/i$a;
-
-    if-ne p1, p2, :cond_2
-
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ih:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
@@ -274,6 +260,20 @@
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ic:Lcom/airbnb/lottie/c/b/i$a;
+
+    sget-object p2, Lcom/airbnb/lottie/c/b/i$a;->kW:Lcom/airbnb/lottie/c/b/i$a;
+
+    if-ne p1, p2, :cond_2
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ig:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ii:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
+
     :cond_2
     return-void
 .end method
@@ -312,44 +312,44 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/airbnb/lottie/j;->gU:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gT:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_0
 
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ie:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
+
+    return-void
+
+    :cond_0
+    sget-object v0, Lcom/airbnb/lottie/j;->gU:Ljava/lang/Float;
+
+    if-ne p1, v0, :cond_1
+
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->if:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     return-void
 
-    :cond_0
-    sget-object v0, Lcom/airbnb/lottie/j;->gV:Ljava/lang/Float;
-
-    if-ne p1, v0, :cond_1
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ig:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
-
-    return-void
-
     :cond_1
-    sget-object v0, Lcom/airbnb/lottie/j;->gL:Landroid/graphics/PointF;
+    sget-object v0, Lcom/airbnb/lottie/j;->gK:Landroid/graphics/PointF;
 
     if-ne p1, v0, :cond_2
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->hL:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->hK:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     return-void
 
     :cond_2
-    sget-object v0, Lcom/airbnb/lottie/j;->gW:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gV:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->ih:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->ig:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_3
 
@@ -358,22 +358,22 @@
     return-void
 
     :cond_3
-    sget-object v0, Lcom/airbnb/lottie/j;->gX:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gW:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_4
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ii:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ih:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     return-void
 
     :cond_4
-    sget-object v0, Lcom/airbnb/lottie/j;->gY:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gX:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_5
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->ij:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->ii:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_5
 
@@ -382,11 +382,11 @@
     return-void
 
     :cond_5
-    sget-object v0, Lcom/airbnb/lottie/j;->gZ:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gY:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_6
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ik:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->ij:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
@@ -429,13 +429,13 @@
 
     check-cast v0, Lcom/airbnb/lottie/a/a/s;
 
-    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->iv:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->iu:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/q$a;->lu:I
+    sget v2, Lcom/airbnb/lottie/c/b/q$a;->lt:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/n;->hN:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/n;->hM:Lcom/airbnb/lottie/a/a/b;
 
     invoke-virtual {v1, v0}, Lcom/airbnb/lottie/a/a/b;->a(Lcom/airbnb/lottie/a/a/s;)V
 
@@ -455,9 +455,9 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/n;->hO:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/n;->hN:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
@@ -477,7 +477,7 @@
 
     move-object/from16 v0, p0
 
-    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->hO:Z
+    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->hN:Z
 
     if-eqz v1, :cond_0
 
@@ -490,22 +490,22 @@
 
     invoke-virtual {v1}, Landroid/graphics/Path;->reset()V
 
-    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->hH:Z
+    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->hG:Z
 
     const/4 v2, 0x1
 
     if-eqz v1, :cond_1
 
-    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/n;->hO:Z
+    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/n;->hN:Z
 
     iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->path:Landroid/graphics/Path;
 
     return-object v1
 
     :cond_1
-    sget-object v1, Lcom/airbnb/lottie/a/a/n$1;->il:[I
+    sget-object v1, Lcom/airbnb/lottie/a/a/n$1;->ik:[I
 
-    iget-object v3, v0, Lcom/airbnb/lottie/a/a/n;->ie:Lcom/airbnb/lottie/c/b/i$a;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/n;->ic:Lcom/airbnb/lottie/c/b/i$a;
 
     invoke-virtual {v3}, Lcom/airbnb/lottie/c/b/i$a;->ordinal()I
 
@@ -532,7 +532,7 @@
     goto/16 :goto_11
 
     :cond_2
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->if:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->ie:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -552,7 +552,7 @@
 
     double-to-int v1, v14
 
-    iget-object v14, v0, Lcom/airbnb/lottie/a/a/n;->ig:Lcom/airbnb/lottie/a/b/a;
+    iget-object v14, v0, Lcom/airbnb/lottie/a/a/n;->if:Lcom/airbnb/lottie/a/b/a;
 
     if-nez v14, :cond_3
 
@@ -586,7 +586,7 @@
 
     double-to-float v1, v3
 
-    iget-object v3, v0, Lcom/airbnb/lottie/a/a/n;->ik:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/n;->ij:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v3}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -600,7 +600,7 @@
 
     div-float/2addr v3, v10
 
-    iget-object v4, v0, Lcom/airbnb/lottie/a/a/n;->ii:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/n;->ih:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v4}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -808,7 +808,7 @@
     goto/16 :goto_1
 
     :cond_5
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->hL:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->hK:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -831,7 +831,7 @@
     goto/16 :goto_11
 
     :cond_6
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->if:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->ie:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -843,7 +843,7 @@
 
     move-result v1
 
-    iget-object v2, v0, Lcom/airbnb/lottie/a/a/n;->ig:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/n;->if:Lcom/airbnb/lottie/a/b/a;
 
     if-nez v2, :cond_7
 
@@ -906,7 +906,7 @@
     add-double/2addr v5, v11
 
     :cond_8
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/n;->ii:Lcom/airbnb/lottie/a/b/a;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/n;->ih:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v9}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -918,7 +918,7 @@
 
     move-result v9
 
-    iget-object v11, v0, Lcom/airbnb/lottie/a/a/n;->ih:Lcom/airbnb/lottie/a/b/a;
+    iget-object v11, v0, Lcom/airbnb/lottie/a/a/n;->ig:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v11}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -930,7 +930,7 @@
 
     move-result v11
 
-    iget-object v12, v0, Lcom/airbnb/lottie/a/a/n;->ij:Lcom/airbnb/lottie/a/b/a;
+    iget-object v12, v0, Lcom/airbnb/lottie/a/a/n;->ii:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v12, :cond_9
 
@@ -952,7 +952,7 @@
     const/4 v13, 0x0
 
     :goto_4
-    iget-object v12, v0, Lcom/airbnb/lottie/a/a/n;->ik:Lcom/airbnb/lottie/a/b/a;
+    iget-object v12, v0, Lcom/airbnb/lottie/a/a/n;->ij:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v12, :cond_a
 
@@ -1439,7 +1439,7 @@
     goto/16 :goto_7
 
     :cond_16
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->hL:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->hK:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -1464,7 +1464,7 @@
 
     invoke-virtual {v1}, Landroid/graphics/Path;->close()V
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->hN:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->hM:Lcom/airbnb/lottie/a/a/b;
 
     iget-object v2, v0, Lcom/airbnb/lottie/a/a/n;->path:Landroid/graphics/Path;
 
@@ -1472,7 +1472,7 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->hO:Z
+    iput-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->hN:Z
 
     iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->path:Landroid/graphics/Path;
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/o.smali b/com.discord/smali/com/airbnb/lottie/a/a/o.smali
index 023520a771..a3b61165dc 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/o.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/o.smali
@@ -9,9 +9,20 @@
 
 
 # instance fields
-.field private final fs:Lcom/airbnb/lottie/f;
+.field private final fr:Lcom/airbnb/lottie/f;
 
-.field private final hH:Z
+.field private final hG:Z
+
+.field private final hJ:Lcom/airbnb/lottie/a/b/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/a/b/a<",
+            "*",
+            "Landroid/graphics/PointF;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field private final hK:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -24,22 +35,11 @@
     .end annotation
 .end field
 
-.field private final hL:Lcom/airbnb/lottie/a/b/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/a/b/a<",
-            "*",
-            "Landroid/graphics/PointF;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private hM:Lcom/airbnb/lottie/a/a/b;
 
-.field private hN:Lcom/airbnb/lottie/a/a/b;
+.field private hN:Z
 
-.field private hO:Z
-
-.field private final im:Lcom/airbnb/lottie/a/b/a;
+.field private final il:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -79,63 +79,63 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/a/a/b;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/o;->hN:Lcom/airbnb/lottie/a/a/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/o;->hM:Lcom/airbnb/lottie/a/a/b;
 
     iget-object v0, p3, Lcom/airbnb/lottie/c/b/j;->name:Ljava/lang/String;
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/o;->name:Ljava/lang/String;
 
-    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/j;->hH:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/j;->hG:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->hH:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->hG:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->kc:Lcom/airbnb/lottie/c/a/m;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->kb:Lcom/airbnb/lottie/c/a/m;
 
     invoke-interface {p1}, Lcom/airbnb/lottie/c/a/m;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->hL:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->hK:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->kk:Lcom/airbnb/lottie/c/a/f;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->kj:Lcom/airbnb/lottie/c/a/f;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/f;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->hK:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->hJ:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->la:Lcom/airbnb/lottie/c/a/b;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->kZ:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->im:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->hL:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->il:Lcom/airbnb/lottie/a/b/a;
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->hK:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->im:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->hJ:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->hL:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->il:Lcom/airbnb/lottie/a/b/a;
 
-    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
+    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->hK:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->im:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->hJ:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->il:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
@@ -176,33 +176,33 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/airbnb/lottie/j;->gJ:Landroid/graphics/PointF;
+    sget-object v0, Lcom/airbnb/lottie/j;->gI:Landroid/graphics/PointF;
 
     if-ne p1, v0, :cond_0
 
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->hJ:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
+
+    return-void
+
+    :cond_0
+    sget-object v0, Lcom/airbnb/lottie/j;->gK:Landroid/graphics/PointF;
+
+    if-ne p1, v0, :cond_1
+
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->hK:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     return-void
 
-    :cond_0
-    sget-object v0, Lcom/airbnb/lottie/j;->gL:Landroid/graphics/PointF;
-
-    if-ne p1, v0, :cond_1
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->hL:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
-
-    return-void
-
     :cond_1
-    sget-object v0, Lcom/airbnb/lottie/j;->gK:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gJ:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_2
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->im:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->il:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
@@ -245,13 +245,13 @@
 
     check-cast v0, Lcom/airbnb/lottie/a/a/s;
 
-    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->iv:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->iu:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/q$a;->lu:I
+    sget v2, Lcom/airbnb/lottie/c/b/q$a;->lt:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/o;->hN:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/o;->hM:Lcom/airbnb/lottie/a/a/b;
 
     invoke-virtual {v1, v0}, Lcom/airbnb/lottie/a/a/b;->a(Lcom/airbnb/lottie/a/a/s;)V
 
@@ -271,9 +271,9 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->hO:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->hN:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
@@ -291,7 +291,7 @@
 .method public final getPath()Landroid/graphics/Path;
     .locals 15
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->hO:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->hN:Z
 
     if-eqz v0, :cond_0
 
@@ -304,20 +304,20 @@
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->hH:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->hG:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_1
 
-    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/o;->hO:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/o;->hN:Z
 
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->path:Landroid/graphics/Path;
 
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->hK:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->hJ:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -335,7 +335,7 @@
 
     div-float/2addr v0, v3
 
-    iget-object v4, p0, Lcom/airbnb/lottie/a/a/o;->im:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/a/o;->il:Lcom/airbnb/lottie/a/b/a;
 
     const/4 v5, 0x0
 
@@ -364,7 +364,7 @@
     move v4, v6
 
     :cond_3
-    iget-object v6, p0, Lcom/airbnb/lottie/a/a/o;->hL:Lcom/airbnb/lottie/a/b/a;
+    iget-object v6, p0, Lcom/airbnb/lottie/a/a/o;->hK:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v6}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -602,13 +602,13 @@
 
     invoke-virtual {v0}, Landroid/graphics/Path;->close()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->hN:Lcom/airbnb/lottie/a/a/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->hM:Lcom/airbnb/lottie/a/a/b;
 
     iget-object v2, p0, Lcom/airbnb/lottie/a/a/o;->path:Landroid/graphics/Path;
 
     invoke-virtual {v0, v2}, Lcom/airbnb/lottie/a/a/b;->a(Landroid/graphics/Path;)V
 
-    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/o;->hO:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/o;->hN:Z
 
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->path:Landroid/graphics/Path;
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/p.smali b/com.discord/smali/com/airbnb/lottie/a/a/p.smali
index 94152a9bf1..6cd98a14b2 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/p.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/p.smali
@@ -11,11 +11,22 @@
 
 
 # instance fields
-.field private final fs:Lcom/airbnb/lottie/f;
+.field private final fr:Lcom/airbnb/lottie/f;
 
-.field private final hH:Z
+.field private final hG:Z
 
-.field private final hw:Lcom/airbnb/lottie/c/c/a;
+.field private final hv:Lcom/airbnb/lottie/c/c/a;
+
+.field private final im:Lcom/airbnb/lottie/a/b/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/a/b/a<",
+            "Ljava/lang/Float;",
+            "Ljava/lang/Float;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field private final io:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -28,20 +39,9 @@
     .end annotation
 .end field
 
-.field private final iq:Lcom/airbnb/lottie/a/b/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/a/b/a<",
-            "Ljava/lang/Float;",
-            "Ljava/lang/Float;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private final iq:Lcom/airbnb/lottie/a/b/o;
 
-.field private final ir:Lcom/airbnb/lottie/a/b/o;
-
-.field private is:Lcom/airbnb/lottie/a/a/d;
+.field private ir:Lcom/airbnb/lottie/a/a/d;
 
 .field private final matrix:Landroid/graphics/Matrix;
 
@@ -68,17 +68,33 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/p;->path:Landroid/graphics/Path;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->fr:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/p;->hw:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/p;->hv:Lcom/airbnb/lottie/c/c/a;
 
     iget-object p1, p3, Lcom/airbnb/lottie/c/b/k;->name:Ljava/lang/String;
 
     iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->name:Ljava/lang/String;
 
-    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/k;->hH:Z
+    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/k;->hG:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/p;->hH:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/p;->hG:Z
+
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/k;->la:Lcom/airbnb/lottie/c/a/b;
+
+    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->im:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->im:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->im:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
     iget-object p1, p3, Lcom/airbnb/lottie/c/b/k;->lb:Lcom/airbnb/lottie/c/a/b;
 
@@ -96,35 +112,19 @@
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/k;->lc:Lcom/airbnb/lottie/c/a/b;
-
-    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
-
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/k;->ld:Lcom/airbnb/lottie/c/a/l;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/k;->lc:Lcom/airbnb/lottie/c/a/l;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/l;->bq()Lcom/airbnb/lottie/a/b/o;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/b/o;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/o;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/o;->a(Lcom/airbnb/lottie/c/c/a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/o;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/o;->a(Lcom/airbnb/lottie/a/b/a$a;)V
 
@@ -136,7 +136,7 @@
 .method public final a(Landroid/graphics/Canvas;Landroid/graphics/Matrix;I)V
     .locals 9
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->io:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->im:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -148,7 +148,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/p;->io:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -160,9 +160,9 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v2, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -178,9 +178,9 @@
 
     div-float/2addr v2, v3
 
-    iget-object v4, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/a/b/o;->ji:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v4, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v4}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -207,7 +207,7 @@
 
     iget-object v5, p0, Lcom/airbnb/lottie/a/a/p;->matrix:Landroid/graphics/Matrix;
 
-    iget-object v6, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v6, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/o;
 
     int-to-float v7, v3
 
@@ -229,7 +229,7 @@
 
     mul-float v5, v5, v6
 
-    iget-object v6, p0, Lcom/airbnb/lottie/a/a/p;->is:Lcom/airbnb/lottie/a/a/d;
+    iget-object v6, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/a/d;
 
     iget-object v7, p0, Lcom/airbnb/lottie/a/a/p;->matrix:Landroid/graphics/Matrix;
 
@@ -248,7 +248,7 @@
 .method public final a(Landroid/graphics/RectF;Landroid/graphics/Matrix;Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->is:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/a/d;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/airbnb/lottie/a/a/d;->a(Landroid/graphics/RectF;Landroid/graphics/Matrix;Z)V
 
@@ -287,7 +287,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/o;
 
     invoke-virtual {v0, p1, p2}, Lcom/airbnb/lottie/a/b/o;->b(Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)Z
 
@@ -298,22 +298,22 @@
     return-void
 
     :cond_0
-    sget-object v0, Lcom/airbnb/lottie/j;->gS:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gR:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->io:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->im:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     return-void
 
     :cond_1
-    sget-object v0, Lcom/airbnb/lottie/j;->gT:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gS:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_2
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->io:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
@@ -335,7 +335,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->is:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/a/d;
 
     invoke-virtual {v0, p1, p2}, Lcom/airbnb/lottie/a/a/d;->a(Ljava/util/List;Ljava/util/List;)V
 
@@ -353,7 +353,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->is:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/a/d;
 
     if-eqz v0, :cond_0
 
@@ -399,11 +399,11 @@
 
     new-instance p1, Lcom/airbnb/lottie/a/a/d;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->fs:Lcom/airbnb/lottie/f;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/a/a/p;->hw:Lcom/airbnb/lottie/c/c/a;
+    iget-object v3, p0, Lcom/airbnb/lottie/a/a/p;->hv:Lcom/airbnb/lottie/c/c/a;
 
-    iget-boolean v5, p0, Lcom/airbnb/lottie/a/a/p;->hH:Z
+    iget-boolean v5, p0, Lcom/airbnb/lottie/a/a/p;->hG:Z
 
     const/4 v7, 0x0
 
@@ -413,7 +413,7 @@
 
     invoke-direct/range {v1 .. v7}, Lcom/airbnb/lottie/a/a/d;-><init>(Lcom/airbnb/lottie/f;Lcom/airbnb/lottie/c/c/a;Ljava/lang/String;ZLjava/util/List;Lcom/airbnb/lottie/c/a/l;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->is:Lcom/airbnb/lottie/a/a/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/a/d;
 
     return-void
 .end method
@@ -421,7 +421,7 @@
 .method public final aX()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
@@ -439,7 +439,7 @@
 .method public final getPath()Landroid/graphics/Path;
     .locals 6
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->is:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/a/d;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/a/a/d;->getPath()Landroid/graphics/Path;
 
@@ -449,7 +449,7 @@
 
     invoke-virtual {v1}, Landroid/graphics/Path;->reset()V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/p;->io:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/p;->im:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -461,7 +461,7 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->io:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -482,7 +482,7 @@
 
     iget-object v3, p0, Lcom/airbnb/lottie/a/a/p;->matrix:Landroid/graphics/Matrix;
 
-    iget-object v4, p0, Lcom/airbnb/lottie/a/a/p;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/a/p;->iq:Lcom/airbnb/lottie/a/b/o;
 
     int-to-float v5, v1
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/q.smali b/com.discord/smali/com/airbnb/lottie/a/a/q.smali
index 2ee801eb5d..3575871fe4 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/q.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/q.smali
@@ -8,15 +8,15 @@
 
 
 # instance fields
-.field private final fs:Lcom/airbnb/lottie/f;
+.field private final fr:Lcom/airbnb/lottie/f;
 
-.field private final hH:Z
+.field private final hG:Z
 
-.field private hN:Lcom/airbnb/lottie/a/a/b;
+.field private hM:Lcom/airbnb/lottie/a/a/b;
 
-.field private hO:Z
+.field private hN:Z
 
-.field private final iu:Lcom/airbnb/lottie/a/b/a;
+.field private final is:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -48,31 +48,31 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/a/a/b;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/q;->hN:Lcom/airbnb/lottie/a/a/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/q;->hM:Lcom/airbnb/lottie/a/a/b;
 
     iget-object v0, p3, Lcom/airbnb/lottie/c/b/o;->name:Ljava/lang/String;
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/q;->name:Ljava/lang/String;
 
-    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/o;->hH:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/o;->hG:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->hH:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->hG:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/q;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/q;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/o;->lh:Lcom/airbnb/lottie/c/a/h;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/o;->lg:Lcom/airbnb/lottie/c/a/h;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/h;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/q;->iu:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/q;->is:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/q;->iu:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/q;->is:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/q;->iu:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/q;->is:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
@@ -116,13 +116,13 @@
 
     check-cast v0, Lcom/airbnb/lottie/a/a/s;
 
-    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->iv:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->iu:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/q$a;->lu:I
+    sget v2, Lcom/airbnb/lottie/c/b/q$a;->lt:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/q;->hN:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/q;->hM:Lcom/airbnb/lottie/a/a/b;
 
     invoke-virtual {v1, v0}, Lcom/airbnb/lottie/a/a/b;->a(Lcom/airbnb/lottie/a/a/s;)V
 
@@ -142,9 +142,9 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->hO:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->hN:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
@@ -162,7 +162,7 @@
 .method public final getPath()Landroid/graphics/Path;
     .locals 3
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->hO:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->hN:Z
 
     if-eqz v0, :cond_0
 
@@ -175,13 +175,13 @@
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->hH:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->hG:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_1
 
-    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/q;->hO:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/q;->hN:Z
 
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->path:Landroid/graphics/Path;
 
@@ -190,7 +190,7 @@
     :cond_1
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->path:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/q;->iu:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/q;->is:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -206,13 +206,13 @@
 
     invoke-virtual {v0, v2}, Landroid/graphics/Path;->setFillType(Landroid/graphics/Path$FillType;)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->hN:Lcom/airbnb/lottie/a/a/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->hM:Lcom/airbnb/lottie/a/a/b;
 
     iget-object v2, p0, Lcom/airbnb/lottie/a/a/q;->path:Landroid/graphics/Path;
 
     invoke-virtual {v0, v2}, Lcom/airbnb/lottie/a/a/b;->a(Landroid/graphics/Path;)V
 
-    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/q;->hO:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/q;->hN:Z
 
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->path:Landroid/graphics/Path;
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/r.smali b/com.discord/smali/com/airbnb/lottie/a/a/r.smali
index 1d0763f56f..44fd8a1d47 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/r.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/r.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private hD:Lcom/airbnb/lottie/a/b/a;
+.field private hC:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -15,9 +15,9 @@
     .end annotation
 .end field
 
-.field private final hH:Z
+.field private final hG:Z
 
-.field private final hP:Lcom/airbnb/lottie/a/b/a;
+.field private final hO:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field private final hw:Lcom/airbnb/lottie/c/c/a;
+.field private final hv:Lcom/airbnb/lottie/c/c/a;
 
 .field private final name:Ljava/lang/String;
 
@@ -37,27 +37,27 @@
 .method public constructor <init>(Lcom/airbnb/lottie/f;Lcom/airbnb/lottie/c/c/a;Lcom/airbnb/lottie/c/b/p;)V
     .locals 11
 
-    iget-object v0, p3, Lcom/airbnb/lottie/c/b/p;->kw:Lcom/airbnb/lottie/c/b/p$a;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/p;->kv:Lcom/airbnb/lottie/c/b/p$a;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/b/p$a;->bs()Landroid/graphics/Paint$Cap;
 
     move-result-object v4
 
-    iget-object v0, p3, Lcom/airbnb/lottie/c/b/p;->kx:Lcom/airbnb/lottie/c/b/p$b;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/p;->kw:Lcom/airbnb/lottie/c/b/p$b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/b/p$b;->bt()Landroid/graphics/Paint$Join;
 
     move-result-object v5
 
-    iget v6, p3, Lcom/airbnb/lottie/c/b/p;->ky:F
+    iget v6, p3, Lcom/airbnb/lottie/c/b/p;->kx:F
 
-    iget-object v7, p3, Lcom/airbnb/lottie/c/b/p;->kf:Lcom/airbnb/lottie/c/a/d;
+    iget-object v7, p3, Lcom/airbnb/lottie/c/b/p;->ke:Lcom/airbnb/lottie/c/a/d;
 
-    iget-object v8, p3, Lcom/airbnb/lottie/c/b/p;->kv:Lcom/airbnb/lottie/c/a/b;
+    iget-object v8, p3, Lcom/airbnb/lottie/c/b/p;->ku:Lcom/airbnb/lottie/c/a/b;
 
-    iget-object v9, p3, Lcom/airbnb/lottie/c/b/p;->kz:Ljava/util/List;
+    iget-object v9, p3, Lcom/airbnb/lottie/c/b/p;->ky:Ljava/util/List;
 
-    iget-object v10, p3, Lcom/airbnb/lottie/c/b/p;->lc:Lcom/airbnb/lottie/c/a/b;
+    iget-object v10, p3, Lcom/airbnb/lottie/c/b/p;->lb:Lcom/airbnb/lottie/c/a/b;
 
     move-object v1, p0
 
@@ -67,29 +67,29 @@
 
     invoke-direct/range {v1 .. v10}, Lcom/airbnb/lottie/a/a/a;-><init>(Lcom/airbnb/lottie/f;Lcom/airbnb/lottie/c/c/a;Landroid/graphics/Paint$Cap;Landroid/graphics/Paint$Join;FLcom/airbnb/lottie/c/a/d;Lcom/airbnb/lottie/c/a/b;Ljava/util/List;Lcom/airbnb/lottie/c/a/b;)V
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/r;->hw:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/r;->hv:Lcom/airbnb/lottie/c/c/a;
 
     iget-object p1, p3, Lcom/airbnb/lottie/c/b/p;->name:Ljava/lang/String;
 
     iput-object p1, p0, Lcom/airbnb/lottie/a/a/r;->name:Ljava/lang/String;
 
-    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/p;->hH:Z
+    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/p;->hG:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/r;->hH:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/r;->hG:Z
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/p;->jX:Lcom/airbnb/lottie/c/a/a;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/p;->jW:Lcom/airbnb/lottie/c/a/a;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/a;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hP:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hO:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -101,7 +101,7 @@
 .method public final a(Landroid/graphics/Canvas;Landroid/graphics/Matrix;I)V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/r;->hH:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/r;->hG:Z
 
     if-eqz v0, :cond_0
 
@@ -110,7 +110,7 @@
     :cond_0
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/r;->paint:Landroid/graphics/Paint;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/r;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/r;->hO:Lcom/airbnb/lottie/a/b/a;
 
     check-cast v1, Lcom/airbnb/lottie/a/b/b;
 
@@ -120,13 +120,13 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/r;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/r;->hC:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_1
 
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/r;->paint:Landroid/graphics/Paint;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/r;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/r;->hC:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -156,18 +156,18 @@
 
     invoke-super {p0, p1, p2}, Lcom/airbnb/lottie/a/a/a;->a(Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
 
-    sget-object v0, Lcom/airbnb/lottie/j;->gD:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->gC:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     return-void
 
     :cond_0
-    sget-object v0, Lcom/airbnb/lottie/j;->hd:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->hc:Landroid/graphics/ColorFilter;
 
     if-ne p1, v0, :cond_2
 
@@ -175,7 +175,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hD:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hC:Lcom/airbnb/lottie/a/b/a;
 
     return-void
 
@@ -184,15 +184,15 @@
 
     invoke-direct {p1, p2}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hD:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hC:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hC:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hw:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->hv:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/r;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/r;->hO:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/a/s.smali b/com.discord/smali/com/airbnb/lottie/a/a/s.smali
index e82470da2f..d9a55357fd 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/s.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/s.smali
@@ -8,9 +8,20 @@
 
 
 # instance fields
-.field public final hH:Z
+.field public final hG:Z
 
-.field final iv:I
+.field final iu:I
+
+.field public final iv:Lcom/airbnb/lottie/a/b/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/a/b/a<",
+            "*",
+            "Ljava/lang/Float;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field public final iw:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -34,17 +45,6 @@
     .end annotation
 .end field
 
-.field public final iy:Lcom/airbnb/lottie/a/b/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/a/b/a<",
-            "*",
-            "Ljava/lang/Float;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private final listeners:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -74,13 +74,21 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/s;->name:Ljava/lang/String;
 
-    iget-boolean v0, p2, Lcom/airbnb/lottie/c/b/q;->hH:Z
+    iget-boolean v0, p2, Lcom/airbnb/lottie/c/b/q;->hG:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/s;->hH:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/s;->hG:Z
 
-    iget v0, p2, Lcom/airbnb/lottie/c/b/q;->iv:I
+    iget v0, p2, Lcom/airbnb/lottie/c/b/q;->iu:I
 
-    iput v0, p0, Lcom/airbnb/lottie/a/a/s;->iv:I
+    iput v0, p0, Lcom/airbnb/lottie/a/a/s;->iu:I
+
+    iget-object v0, p2, Lcom/airbnb/lottie/c/b/q;->lr:Lcom/airbnb/lottie/c/a/b;
+
+    invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/s;->iv:Lcom/airbnb/lottie/a/b/a;
 
     iget-object v0, p2, Lcom/airbnb/lottie/c/b/q;->ls:Lcom/airbnb/lottie/c/a/b;
 
@@ -90,21 +98,17 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/s;->iw:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object v0, p2, Lcom/airbnb/lottie/c/b/q;->lt:Lcom/airbnb/lottie/c/a/b;
-
-    invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/s;->ix:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p2, p2, Lcom/airbnb/lottie/c/b/q;->lc:Lcom/airbnb/lottie/c/a/b;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/b/q;->lb:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {p2}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/s;->iy:Lcom/airbnb/lottie/a/b/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/s;->ix:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/s;->iv:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
     iget-object p2, p0, Lcom/airbnb/lottie/a/a/s;->iw:Lcom/airbnb/lottie/a/b/a;
 
@@ -114,9 +118,9 @@
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/s;->iy:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/s;->iv:Lcom/airbnb/lottie/a/b/a;
 
-    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
+    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/s;->iw:Lcom/airbnb/lottie/a/b/a;
 
@@ -126,10 +130,6 @@
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/s;->iy:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
-
     return-void
 .end method
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/a.smali b/com.discord/smali/com/airbnb/lottie/a/b/a.smali
index fbb571fb78..8a33300113 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/a.smali
@@ -23,20 +23,9 @@
 
 
 # instance fields
-.field public fE:F
+.field public fD:F
 
-.field private final iA:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "+",
-            "Lcom/airbnb/lottie/g/a<",
-            "TK;>;>;"
-        }
-    .end annotation
-.end field
-
-.field protected iB:Lcom/airbnb/lottie/g/c;
+.field protected iA:Lcom/airbnb/lottie/g/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/g/c<",
@@ -45,6 +34,15 @@
     .end annotation
 .end field
 
+.field private iB:Lcom/airbnb/lottie/g/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/g/a<",
+            "TK;>;"
+        }
+    .end annotation
+.end field
+
 .field private iC:Lcom/airbnb/lottie/g/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -54,18 +52,9 @@
     .end annotation
 .end field
 
-.field private iD:Lcom/airbnb/lottie/g/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/g/a<",
-            "TK;>;"
-        }
-    .end annotation
-.end field
+.field private iD:F
 
-.field private iE:F
-
-.field private iF:Ljava/lang/Object;
+.field private iE:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TA;"
@@ -73,11 +62,22 @@
     .end annotation
 .end field
 
+.field private iF:F
+
 .field private iG:F
 
-.field private iH:F
+.field public iy:Z
 
-.field public iz:Z
+.field private final iz:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "+",
+            "Lcom/airbnb/lottie/g/a<",
+            "TK;>;>;"
+        }
+    .end annotation
+.end field
 
 .field final listeners:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
@@ -115,25 +115,25 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/b/a;->iz:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/b/a;->iy:Z
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->iE:F
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->iD:F
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/airbnb/lottie/a/b/a;->iF:Ljava/lang/Object;
+    iput-object v1, p0, Lcom/airbnb/lottie/a/b/a;->iE:Ljava/lang/Object;
+
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->iF:F
 
     iput v0, p0, Lcom/airbnb/lottie/a/b/a;->iG:F
 
-    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->iH:F
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/a;->iA:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/a;->iz:Ljava/util/List;
 
     return-void
 .end method
@@ -141,7 +141,7 @@
 .method private bf()F
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->iG:F
+    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->iF:F
 
     const/high16 v1, -0x40800000    # -1.0f
 
@@ -149,7 +149,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iz:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -162,7 +162,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iz:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -177,10 +177,10 @@
     move-result v0
 
     :goto_0
-    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->iG:F
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->iF:F
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->iG:F
+    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->iF:F
 
     return v0
 .end method
@@ -207,20 +207,20 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iA:Lcom/airbnb/lottie/g/c;
 
     if-eqz v0, :cond_0
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/airbnb/lottie/g/c;->ot:Lcom/airbnb/lottie/a/b/a;
+    iput-object v1, v0, Lcom/airbnb/lottie/g/c;->or:Lcom/airbnb/lottie/a/b/a;
 
     :cond_0
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/a;->iB:Lcom/airbnb/lottie/g/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/a;->iA:Lcom/airbnb/lottie/g/c;
 
     if-eqz p1, :cond_1
 
-    iput-object p0, p1, Lcom/airbnb/lottie/g/c;->ot:Lcom/airbnb/lottie/a/b/a;
+    iput-object p0, p1, Lcom/airbnb/lottie/g/c;->or:Lcom/airbnb/lottie/a/b/a;
 
     :cond_1
     return-void
@@ -278,11 +278,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iC:Lcom/airbnb/lottie/g/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iB:Lcom/airbnb/lottie/g/a;
 
     if-eqz v0, :cond_0
 
-    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/g/a;->f(F)Z
 
@@ -290,12 +290,12 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iC:Lcom/airbnb/lottie/g/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iB:Lcom/airbnb/lottie/g/a;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iz:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -309,7 +309,7 @@
 
     check-cast v0, Lcom/airbnb/lottie/g/a;
 
-    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/g/a;->bK()F
 
@@ -319,7 +319,7 @@
 
     if-gez v1, :cond_1
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/a;->iA:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/a;->iz:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -330,7 +330,7 @@
     :goto_0
     if-ltz v1, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iz:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -338,7 +338,7 @@
 
     check-cast v0, Lcom/airbnb/lottie/g/a;
 
-    iget v2, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v2, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     invoke-virtual {v0, v2}, Lcom/airbnb/lottie/g/a;->f(F)Z
 
@@ -351,7 +351,7 @@
     goto :goto_0
 
     :cond_1
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iC:Lcom/airbnb/lottie/g/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iB:Lcom/airbnb/lottie/g/a;
 
     return-object v0
 .end method
@@ -359,7 +359,7 @@
 .method final bd()F
     .locals 3
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/b/a;->iz:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/b/a;->iy:Z
 
     const/4 v1, 0x0
 
@@ -381,7 +381,7 @@
     return v1
 
     :cond_1
-    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/g/a;->bK()F
 
@@ -422,7 +422,7 @@
     return v0
 
     :cond_0
-    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->od:Landroid/view/animation/Interpolator;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->oc:Landroid/view/animation/Interpolator;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/a/b/a;->bd()F
 
@@ -438,7 +438,7 @@
 .method bg()F
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->iH:F
+    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->iG:F
 
     const/high16 v1, -0x40800000    # -1.0f
 
@@ -446,7 +446,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iz:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -459,7 +459,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iz:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -478,10 +478,10 @@
     move-result v0
 
     :goto_0
-    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->iH:F
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->iG:F
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->iH:F
+    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->iG:F
 
     return v0
 .end method
@@ -502,34 +502,34 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/a;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/a;->iA:Lcom/airbnb/lottie/g/c;
 
     if-nez v2, :cond_0
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/a;->iD:Lcom/airbnb/lottie/g/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/a;->iC:Lcom/airbnb/lottie/g/a;
 
     if-ne v0, v2, :cond_0
 
-    iget v2, p0, Lcom/airbnb/lottie/a/b/a;->iE:F
+    iget v2, p0, Lcom/airbnb/lottie/a/b/a;->iD:F
 
     cmpl-float v2, v2, v1
 
     if-nez v2, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iF:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iE:Ljava/lang/Object;
 
     return-object v0
 
     :cond_0
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iD:Lcom/airbnb/lottie/g/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iC:Lcom/airbnb/lottie/g/a;
 
-    iput v1, p0, Lcom/airbnb/lottie/a/b/a;->iE:F
+    iput v1, p0, Lcom/airbnb/lottie/a/b/a;->iD:F
 
     invoke-virtual {p0, v0, v1}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/a;F)Ljava/lang/Object;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iF:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iE:Ljava/lang/Object;
 
     return-object v0
 .end method
@@ -537,7 +537,7 @@
 .method public setProgress(F)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->iz:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -581,7 +581,7 @@
 
     :cond_2
     :goto_0
-    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     cmpl-float v1, p1, v1
 
@@ -590,7 +590,7 @@
     return-void
 
     :cond_3
-    iput p1, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iput p1, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/a/b/a;->bc()Lcom/airbnb/lottie/g/a;
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/b.smali b/com.discord/smali/com/airbnb/lottie/a/b/b.smali
index ea6bd8b111..264c055d6f 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/b.smali
@@ -42,23 +42,23 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     if-eqz v0, :cond_1
 
     iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
+    if-eqz v0, :cond_1
+
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
+
     check-cast v0, Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Integer;
 
@@ -66,15 +66,15 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/b;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/b;->iA:Lcom/airbnb/lottie/g/c;
 
     if-eqz v2, :cond_0
 
-    iget-object v3, p0, Lcom/airbnb/lottie/a/b/b;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/a/b/b;->iA:Lcom/airbnb/lottie/g/c;
 
-    iget v4, p1, Lcom/airbnb/lottie/g/a;->fQ:F
+    iget v4, p1, Lcom/airbnb/lottie/g/a;->fP:F
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->oe:Ljava/lang/Float;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->od:Ljava/lang/Float;
 
     invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
 
@@ -92,7 +92,7 @@
 
     move-result v9
 
-    iget v10, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v10, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     move v8, p2
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/c.smali b/com.discord/smali/com/airbnb/lottie/a/b/c.smali
index c0d44abecc..b20fa2cd78 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/c.smali
@@ -42,37 +42,37 @@
         }
     .end annotation
 
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
+
+    if-eqz v0, :cond_3
+
     iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
-
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/c;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/c;->iA:Lcom/airbnb/lottie/g/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/c;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/c;->iA:Lcom/airbnb/lottie/g/c;
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->fQ:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->fP:F
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oe:Ljava/lang/Float;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->od:Ljava/lang/Float;
 
     invoke-virtual {v0}, Ljava/lang/Float;->floatValue()F
 
     move-result v3
 
-    iget-object v4, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v4, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
-    iget-object v5, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v5, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/a/b/c;->bd()F
 
     move-result v7
 
-    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     move v6, p2
 
@@ -91,7 +91,7 @@
     return p1
 
     :cond_0
-    iget v0, p1, Lcom/airbnb/lottie/g/a;->of:F
+    iget v0, p1, Lcom/airbnb/lottie/g/a;->oe:F
 
     const v1, -0x358c9d09
 
@@ -99,7 +99,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Float;
 
@@ -107,18 +107,18 @@
 
     move-result v0
 
-    iput v0, p1, Lcom/airbnb/lottie/g/a;->of:F
+    iput v0, p1, Lcom/airbnb/lottie/g/a;->oe:F
 
     :cond_1
-    iget v0, p1, Lcom/airbnb/lottie/g/a;->of:F
+    iget v0, p1, Lcom/airbnb/lottie/g/a;->oe:F
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->og:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->of:F
 
     cmpl-float v1, v2, v1
 
     if-nez v1, :cond_2
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Float;
 
@@ -126,10 +126,10 @@
 
     move-result v1
 
-    iput v1, p1, Lcom/airbnb/lottie/g/a;->og:F
+    iput v1, p1, Lcom/airbnb/lottie/g/a;->of:F
 
     :cond_2
-    iget p1, p1, Lcom/airbnb/lottie/g/a;->og:F
+    iget p1, p1, Lcom/airbnb/lottie/g/a;->of:F
 
     invoke-static {v0, p1, p2}, Lcom/airbnb/lottie/f/g;->lerp(FFF)F
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/d.smali b/com.discord/smali/com/airbnb/lottie/a/b/d.smali
index 1a17f55f89..a2ecab03ac 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/d.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private final iI:Lcom/airbnb/lottie/c/b/c;
+.field private final iH:Lcom/airbnb/lottie/c/b/c;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     check-cast p1, Lcom/airbnb/lottie/g/a;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     check-cast p1, Lcom/airbnb/lottie/c/b/c;
 
@@ -49,7 +49,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p1, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object p1, p1, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     array-length v0, p1
 
@@ -62,7 +62,7 @@
 
     invoke-direct {p1, v1, v0}, Lcom/airbnb/lottie/c/b/c;-><init>([F[I)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/d;->iI:Lcom/airbnb/lottie/c/b/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/d;->iH:Lcom/airbnb/lottie/c/b/c;
 
     return-void
 .end method
@@ -72,21 +72,21 @@
 .method final synthetic a(Lcom/airbnb/lottie/g/a;F)Ljava/lang/Object;
     .locals 6
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/d;->iI:Lcom/airbnb/lottie/c/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/d;->iH:Lcom/airbnb/lottie/c/b/c;
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     check-cast v1, Lcom/airbnb/lottie/c/b/c;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     check-cast p1, Lcom/airbnb/lottie/c/b/c;
 
-    iget-object v2, v1, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v2, v1, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     array-length v2, v2
 
-    iget-object v3, p1, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v3, p1, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     array-length v3, v3
 
@@ -95,19 +95,19 @@
     const/4 v2, 0x0
 
     :goto_0
-    iget-object v3, v1, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v3, v1, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     array-length v3, v3
 
     if-ge v2, v3, :cond_0
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->km:[F
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->kl:[F
 
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/c;->km:[F
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/c;->kl:[F
 
     aget v4, v4, v2
 
-    iget-object v5, p1, Lcom/airbnb/lottie/c/b/c;->km:[F
+    iget-object v5, p1, Lcom/airbnb/lottie/c/b/c;->kl:[F
 
     aget v5, v5, v2
 
@@ -117,13 +117,13 @@
 
     aput v4, v3, v2
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->km:[I
 
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     aget v4, v4, v2
 
-    iget-object v5, p1, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v5, p1, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     aget v5, v5, v2
 
@@ -138,7 +138,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/d;->iI:Lcom/airbnb/lottie/c/b/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/d;->iH:Lcom/airbnb/lottie/c/b/c;
 
     return-object p1
 
@@ -151,7 +151,7 @@
 
     invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, v1, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v1, v1, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     array-length v1, v1
 
@@ -161,7 +161,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object p1, p1, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     array-length p1, p1
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/e.smali b/com.discord/smali/com/airbnb/lottie/a/b/e.smali
index 20538c1211..d21b24a0e9 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/e.smali
@@ -42,37 +42,37 @@
         }
     .end annotation
 
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
+
+    if-eqz v0, :cond_3
+
     iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
-
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/e;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/e;->iA:Lcom/airbnb/lottie/g/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/e;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/e;->iA:Lcom/airbnb/lottie/g/c;
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->fQ:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->fP:F
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oe:Ljava/lang/Float;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->od:Ljava/lang/Float;
 
     invoke-virtual {v0}, Ljava/lang/Float;->floatValue()F
 
     move-result v3
 
-    iget-object v4, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v4, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
-    iget-object v5, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v5, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/a/b/e;->bd()F
 
     move-result v7
 
-    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     move v6, p2
 
@@ -91,13 +91,13 @@
     return p1
 
     :cond_0
-    iget v0, p1, Lcom/airbnb/lottie/g/a;->oh:I
+    iget v0, p1, Lcom/airbnb/lottie/g/a;->og:I
 
     const v1, 0x2ec8fb09
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
@@ -105,16 +105,16 @@
 
     move-result v0
 
-    iput v0, p1, Lcom/airbnb/lottie/g/a;->oh:I
+    iput v0, p1, Lcom/airbnb/lottie/g/a;->og:I
 
     :cond_1
-    iget v0, p1, Lcom/airbnb/lottie/g/a;->oh:I
+    iget v0, p1, Lcom/airbnb/lottie/g/a;->og:I
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->oi:I
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->oh:I
 
     if-ne v2, v1, :cond_2
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Integer;
 
@@ -122,10 +122,10 @@
 
     move-result v1
 
-    iput v1, p1, Lcom/airbnb/lottie/g/a;->oi:I
+    iput v1, p1, Lcom/airbnb/lottie/g/a;->oh:I
 
     :cond_2
-    iget p1, p1, Lcom/airbnb/lottie/g/a;->oi:I
+    iget p1, p1, Lcom/airbnb/lottie/g/a;->oh:I
 
     invoke-static {v0, p1, p2}, Lcom/airbnb/lottie/f/g;->lerp(IIF)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/g.smali b/com.discord/smali/com/airbnb/lottie/a/b/g.smali
index 8e7bd9c0b1..47b07d1a23 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/g.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final iJ:Ljava/util/List;
+.field public final iI:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field public final iK:Ljava/util/List;
+.field public final iJ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field public final iL:Ljava/util/List;
+.field public final iK:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -53,7 +53,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/g;->iL:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/g;->iK:Ljava/util/List;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/g;->iI:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -65,16 +75,6 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/b/g;->iJ:Ljava/util/List;
 
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
-
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/g;->iK:Ljava/util/List;
-
     const/4 v0, 0x0
 
     :goto_0
@@ -84,7 +84,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/g;->iJ:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/g;->iI:Ljava/util/List;
 
     invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -92,7 +92,7 @@
 
     check-cast v2, Lcom/airbnb/lottie/c/b/g;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/c/b/g;->kF:Lcom/airbnb/lottie/c/a/h;
+    iget-object v2, v2, Lcom/airbnb/lottie/c/b/g;->kE:Lcom/airbnb/lottie/c/a/h;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/c/a/h;->bn()Lcom/airbnb/lottie/a/b/a;
 
@@ -106,9 +106,9 @@
 
     check-cast v1, Lcom/airbnb/lottie/c/b/g;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/c/b/g;->kf:Lcom/airbnb/lottie/c/a/d;
+    iget-object v1, v1, Lcom/airbnb/lottie/c/b/g;->ke:Lcom/airbnb/lottie/c/a/d;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/g;->iK:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/g;->iJ:Ljava/util/List;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/a/d;->bn()Lcom/airbnb/lottie/a/b/a;
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/h.smali b/com.discord/smali/com/airbnb/lottie/a/b/h.smali
index 2c2b379ac9..69157334b4 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/h.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private final iM:Lcom/airbnb/lottie/g/a;
+.field private final iL:Lcom/airbnb/lottie/g/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/g/a<",
@@ -40,15 +40,15 @@
         }
     .end annotation
 
-    iget-object v2, p2, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v2, p2, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
-    iget-object v3, p2, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v3, p2, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
-    iget-object v4, p2, Lcom/airbnb/lottie/g/a;->od:Landroid/view/animation/Interpolator;
+    iget-object v4, p2, Lcom/airbnb/lottie/g/a;->oc:Landroid/view/animation/Interpolator;
 
-    iget v5, p2, Lcom/airbnb/lottie/g/a;->fQ:F
+    iget v5, p2, Lcom/airbnb/lottie/g/a;->fP:F
 
-    iget-object v6, p2, Lcom/airbnb/lottie/g/a;->oe:Ljava/lang/Float;
+    iget-object v6, p2, Lcom/airbnb/lottie/g/a;->od:Ljava/lang/Float;
 
     move-object v0, p0
 
@@ -56,7 +56,7 @@
 
     invoke-direct/range {v0 .. v6}, Lcom/airbnb/lottie/g/a;-><init>(Lcom/airbnb/lottie/d;Ljava/lang/Object;Ljava/lang/Object;Landroid/view/animation/Interpolator;FLjava/lang/Float;)V
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/b/h;->iM:Lcom/airbnb/lottie/g/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/b/h;->iL:Lcom/airbnb/lottie/g/a;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/a/b/h;->bi()V
 
@@ -68,25 +68,25 @@
 .method public final bi()V
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->oc:Ljava/lang/Object;
-
-    if-eqz v0, :cond_0
-
     iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->ob:Ljava/lang/Object;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->ob:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->oa:Ljava/lang/Object;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->oa:Ljava/lang/Object;
 
     check-cast v0, Landroid/graphics/PointF;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->oc:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->ob:Ljava/lang/Object;
 
     check-cast v1, Landroid/graphics/PointF;
 
     iget v1, v1, Landroid/graphics/PointF;->x:F
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/h;->oc:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/h;->ob:Ljava/lang/Object;
 
     check-cast v2, Landroid/graphics/PointF;
 
@@ -106,27 +106,27 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->oc:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->ob:Ljava/lang/Object;
 
     if-eqz v1, :cond_1
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->ob:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->oa:Ljava/lang/Object;
 
     check-cast v0, Landroid/graphics/PointF;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->oc:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->ob:Ljava/lang/Object;
 
     check-cast v1, Landroid/graphics/PointF;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/h;->iM:Lcom/airbnb/lottie/g/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/h;->iL:Lcom/airbnb/lottie/g/a;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/g/a;->ol:Landroid/graphics/PointF;
+    iget-object v2, v2, Lcom/airbnb/lottie/g/a;->ok:Landroid/graphics/PointF;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/a/b/h;->iM:Lcom/airbnb/lottie/g/a;
+    iget-object v3, p0, Lcom/airbnb/lottie/a/b/h;->iL:Lcom/airbnb/lottie/g/a;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/g/a;->om:Landroid/graphics/PointF;
+    iget-object v3, v3, Lcom/airbnb/lottie/g/a;->ol:Landroid/graphics/PointF;
 
     invoke-static {v0, v1, v2, v3}, Lcom/airbnb/lottie/f/h;->a(Landroid/graphics/PointF;Landroid/graphics/PointF;Landroid/graphics/PointF;Landroid/graphics/PointF;)Landroid/graphics/Path;
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/i.smali b/com.discord/smali/com/airbnb/lottie/a/b/i.smali
index 09d54661f3..10061106d5 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/i.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/i.smali
@@ -14,13 +14,13 @@
 
 
 # instance fields
-.field private final iN:Landroid/graphics/PointF;
+.field private final iM:Landroid/graphics/PointF;
 
-.field private final iO:[F
+.field private final iN:[F
 
-.field private iP:Lcom/airbnb/lottie/a/b/h;
+.field private iO:Lcom/airbnb/lottie/a/b/h;
 
-.field private iQ:Landroid/graphics/PathMeasure;
+.field private iP:Landroid/graphics/PathMeasure;
 
 
 # direct methods
@@ -43,19 +43,19 @@
 
     invoke-direct {p1}, Landroid/graphics/PointF;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iN:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iM:Landroid/graphics/PointF;
 
     const/4 p1, 0x2
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iO:[F
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iN:[F
 
     new-instance p1, Landroid/graphics/PathMeasure;
 
     invoke-direct {p1}, Landroid/graphics/PathMeasure;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iQ:Landroid/graphics/PathMeasure;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iP:Landroid/graphics/PathMeasure;
 
     return-void
 .end method
@@ -73,36 +73,36 @@
 
     if-nez v1, :cond_0
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     check-cast p1, Landroid/graphics/PointF;
 
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iA:Lcom/airbnb/lottie/g/c;
 
     if-eqz p1, :cond_1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/i;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/i;->iA:Lcom/airbnb/lottie/g/c;
 
-    iget v3, v0, Lcom/airbnb/lottie/a/b/h;->fQ:F
+    iget v3, v0, Lcom/airbnb/lottie/a/b/h;->fP:F
 
-    iget-object p1, v0, Lcom/airbnb/lottie/a/b/h;->oe:Ljava/lang/Float;
+    iget-object p1, v0, Lcom/airbnb/lottie/a/b/h;->od:Ljava/lang/Float;
 
     invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
 
     move-result v4
 
-    iget-object v5, v0, Lcom/airbnb/lottie/a/b/h;->ob:Ljava/lang/Object;
+    iget-object v5, v0, Lcom/airbnb/lottie/a/b/h;->oa:Ljava/lang/Object;
 
-    iget-object v6, v0, Lcom/airbnb/lottie/a/b/h;->oc:Ljava/lang/Object;
+    iget-object v6, v0, Lcom/airbnb/lottie/a/b/h;->ob:Ljava/lang/Object;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/a/b/i;->bd()F
 
     move-result v7
 
-    iget v9, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v9, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     move v8, p2
 
@@ -117,20 +117,20 @@
     return-object p1
 
     :cond_1
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iP:Lcom/airbnb/lottie/a/b/h;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iO:Lcom/airbnb/lottie/a/b/h;
 
     const/4 v2, 0x0
 
     if-eq p1, v0, :cond_2
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iQ:Landroid/graphics/PathMeasure;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iP:Landroid/graphics/PathMeasure;
 
     invoke-virtual {p1, v1, v2}, Landroid/graphics/PathMeasure;->setPath(Landroid/graphics/Path;Z)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/i;->iP:Lcom/airbnb/lottie/a/b/h;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/i;->iO:Lcom/airbnb/lottie/a/b/h;
 
     :cond_2
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iQ:Landroid/graphics/PathMeasure;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iP:Landroid/graphics/PathMeasure;
 
     invoke-virtual {p1}, Landroid/graphics/PathMeasure;->getLength()F
 
@@ -138,15 +138,15 @@
 
     mul-float p2, p2, v0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/i;->iO:[F
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/i;->iN:[F
 
     const/4 v1, 0x0
 
     invoke-virtual {p1, p2, v0, v1}, Landroid/graphics/PathMeasure;->getPosTan(F[F[F)Z
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iN:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iM:Landroid/graphics/PointF;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/b/i;->iO:[F
+    iget-object p2, p0, Lcom/airbnb/lottie/a/b/i;->iN:[F
 
     aget v0, p2, v2
 
@@ -156,7 +156,7 @@
 
     invoke-virtual {p1, v0, p2}, Landroid/graphics/PointF;->set(FF)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iN:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->iM:Landroid/graphics/PointF;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/j.smali b/com.discord/smali/com/airbnb/lottie/a/b/j.smali
index ad8c09c4a7..b58b67b4eb 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/j.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private final iN:Landroid/graphics/PointF;
+.field private final iM:Landroid/graphics/PointF;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct {p1}, Landroid/graphics/PointF;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/j;->iN:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/j;->iM:Landroid/graphics/PointF;
 
     return-void
 .end method
@@ -46,33 +46,33 @@
 .method public final synthetic a(Lcom/airbnb/lottie/g/a;F)Ljava/lang/Object;
     .locals 10
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     if-eqz v0, :cond_1
 
     iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
+    if-eqz v0, :cond_1
+
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
+
     check-cast v0, Landroid/graphics/PointF;
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     move-object v9, v1
 
     check-cast v9, Landroid/graphics/PointF;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/j;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/j;->iA:Lcom/airbnb/lottie/g/c;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/j;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/j;->iA:Lcom/airbnb/lottie/g/c;
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->fQ:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->fP:F
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->oe:Ljava/lang/Float;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->od:Ljava/lang/Float;
 
     invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
 
@@ -82,7 +82,7 @@
 
     move-result v7
 
-    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     move-object v4, v0
 
@@ -101,7 +101,7 @@
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/j;->iN:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/j;->iM:Landroid/graphics/PointF;
 
     iget v1, v0, Landroid/graphics/PointF;->x:F
 
@@ -129,7 +129,7 @@
 
     invoke-virtual {p1, v1, v2}, Landroid/graphics/PointF;->set(FF)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/j;->iN:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/j;->iM:Landroid/graphics/PointF;
 
     return-object p1
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/k.smali b/com.discord/smali/com/airbnb/lottie/a/b/k.smali
index 3aaf632ccc..842428a5ba 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/k.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/k.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private final iR:Lcom/airbnb/lottie/g/d;
+.field private final iQ:Lcom/airbnb/lottie/g/d;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct {p1}, Lcom/airbnb/lottie/g/d;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/k;->iR:Lcom/airbnb/lottie/g/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/k;->iQ:Lcom/airbnb/lottie/g/d;
 
     return-void
 .end method
@@ -46,33 +46,33 @@
 .method public final synthetic a(Lcom/airbnb/lottie/g/a;F)Ljava/lang/Object;
     .locals 10
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     if-eqz v0, :cond_1
 
     iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
+    if-eqz v0, :cond_1
+
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
+
     check-cast v0, Lcom/airbnb/lottie/g/d;
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     move-object v9, v1
 
     check-cast v9, Lcom/airbnb/lottie/g/d;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/k;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/k;->iA:Lcom/airbnb/lottie/g/c;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/k;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/k;->iA:Lcom/airbnb/lottie/g/c;
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->fQ:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->fP:F
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->oe:Ljava/lang/Float;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->od:Ljava/lang/Float;
 
     invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
 
@@ -82,7 +82,7 @@
 
     move-result v7
 
-    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     move-object v4, v0
 
@@ -101,7 +101,7 @@
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/k;->iR:Lcom/airbnb/lottie/g/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/k;->iQ:Lcom/airbnb/lottie/g/d;
 
     iget v1, v0, Lcom/airbnb/lottie/g/d;->scaleX:F
 
@@ -123,7 +123,7 @@
 
     iput p2, p1, Lcom/airbnb/lottie/g/d;->scaleY:F
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/k;->iR:Lcom/airbnb/lottie/g/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/k;->iQ:Lcom/airbnb/lottie/g/d;
 
     return-object p1
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/l.smali b/com.discord/smali/com/airbnb/lottie/a/b/l.smali
index 500f6e047e..3dc9615614 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/l.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private final iS:Lcom/airbnb/lottie/c/b/l;
+.field private final iR:Lcom/airbnb/lottie/c/b/l;
 
-.field private final iT:Landroid/graphics/Path;
+.field private final iS:Landroid/graphics/Path;
 
 
 # direct methods
@@ -39,13 +39,13 @@
 
     invoke-direct {p1}, Lcom/airbnb/lottie/c/b/l;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/l;->iS:Lcom/airbnb/lottie/c/b/l;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/l;->iR:Lcom/airbnb/lottie/c/b/l;
 
     new-instance p1, Landroid/graphics/Path;
 
     invoke-direct {p1}, Landroid/graphics/Path;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/l;->iT:Landroid/graphics/Path;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/l;->iS:Landroid/graphics/Path;
 
     return-void
 .end method
@@ -55,17 +55,17 @@
 .method public final synthetic a(Lcom/airbnb/lottie/g/a;F)Ljava/lang/Object;
     .locals 12
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     check-cast v0, Lcom/airbnb/lottie/c/b/l;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     check-cast p1, Lcom/airbnb/lottie/c/b/l;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/l;->iS:Lcom/airbnb/lottie/c/b/l;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/l;->iR:Lcom/airbnb/lottie/c/b/l;
 
-    iget-object v2, v1, Lcom/airbnb/lottie/c/b/l;->lf:Landroid/graphics/PointF;
+    iget-object v2, v1, Lcom/airbnb/lottie/c/b/l;->le:Landroid/graphics/PointF;
 
     if-nez v2, :cond_0
 
@@ -73,7 +73,7 @@
 
     invoke-direct {v2}, Landroid/graphics/PointF;-><init>()V
 
-    iput-object v2, v1, Lcom/airbnb/lottie/c/b/l;->lf:Landroid/graphics/PointF;
+    iput-object v2, v1, Lcom/airbnb/lottie/c/b/l;->le:Landroid/graphics/PointF;
 
     :cond_0
     iget-boolean v2, v0, Lcom/airbnb/lottie/c/b/l;->closed:Z
@@ -100,13 +100,13 @@
     :goto_1
     iput-boolean v2, v1, Lcom/airbnb/lottie/c/b/l;->closed:Z
 
-    iget-object v2, v0, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
     move-result v2
 
-    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -120,7 +120,7 @@
 
     invoke-direct {v2, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, v0, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -132,7 +132,7 @@
 
     invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -147,13 +147,13 @@
     invoke-static {v2}, Lcom/airbnb/lottie/f/d;->warning(Ljava/lang/String;)V
 
     :cond_3
-    iget-object v2, v0, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
     move-result v2
 
-    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -163,7 +163,7 @@
 
     move-result v2
 
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -171,7 +171,7 @@
 
     if-ge v4, v2, :cond_4
 
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -180,7 +180,7 @@
     :goto_2
     if-ge v4, v2, :cond_5
 
-    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     new-instance v6, Lcom/airbnb/lottie/c/a;
 
@@ -193,7 +193,7 @@
     goto :goto_2
 
     :cond_4
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -201,7 +201,7 @@
 
     if-le v4, v2, :cond_5
 
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -212,9 +212,9 @@
     :goto_3
     if-lt v4, v2, :cond_5
 
-    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
-    iget-object v6, v1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v6, v1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v6}, Ljava/util/List;->size()I
 
@@ -229,9 +229,9 @@
     goto :goto_3
 
     :cond_5
-    iget-object v2, v0, Lcom/airbnb/lottie/c/b/l;->lf:Landroid/graphics/PointF;
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/l;->le:Landroid/graphics/PointF;
 
-    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->lf:Landroid/graphics/PointF;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->le:Landroid/graphics/PointF;
 
     iget v5, v2, Landroid/graphics/PointF;->x:F
 
@@ -249,7 +249,7 @@
 
     move-result v2
 
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->lf:Landroid/graphics/PointF;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->le:Landroid/graphics/PointF;
 
     if-nez v4, :cond_6
 
@@ -257,14 +257,14 @@
 
     invoke-direct {v4}, Landroid/graphics/PointF;-><init>()V
 
-    iput-object v4, v1, Lcom/airbnb/lottie/c/b/l;->lf:Landroid/graphics/PointF;
+    iput-object v4, v1, Lcom/airbnb/lottie/c/b/l;->le:Landroid/graphics/PointF;
 
     :cond_6
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->lf:Landroid/graphics/PointF;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->le:Landroid/graphics/PointF;
 
     invoke-virtual {v4, v5, v2}, Landroid/graphics/PointF;->set(FF)V
 
-    iget-object v2, v1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v2, v1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -275,7 +275,7 @@
     :goto_4
     if-ltz v2, :cond_7
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -283,7 +283,7 @@
 
     check-cast v3, Lcom/airbnb/lottie/c/a;
 
-    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v4, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -291,19 +291,19 @@
 
     check-cast v4, Lcom/airbnb/lottie/c/a;
 
-    iget-object v5, v3, Lcom/airbnb/lottie/c/a;->jv:Landroid/graphics/PointF;
+    iget-object v5, v3, Lcom/airbnb/lottie/c/a;->ju:Landroid/graphics/PointF;
 
-    iget-object v6, v3, Lcom/airbnb/lottie/c/a;->jw:Landroid/graphics/PointF;
+    iget-object v6, v3, Lcom/airbnb/lottie/c/a;->jv:Landroid/graphics/PointF;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/c/a;->jx:Landroid/graphics/PointF;
+    iget-object v3, v3, Lcom/airbnb/lottie/c/a;->jw:Landroid/graphics/PointF;
 
-    iget-object v7, v4, Lcom/airbnb/lottie/c/a;->jv:Landroid/graphics/PointF;
+    iget-object v7, v4, Lcom/airbnb/lottie/c/a;->ju:Landroid/graphics/PointF;
 
-    iget-object v8, v4, Lcom/airbnb/lottie/c/a;->jw:Landroid/graphics/PointF;
+    iget-object v8, v4, Lcom/airbnb/lottie/c/a;->jv:Landroid/graphics/PointF;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/c/a;->jx:Landroid/graphics/PointF;
+    iget-object v4, v4, Lcom/airbnb/lottie/c/a;->jw:Landroid/graphics/PointF;
 
-    iget-object v9, v1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v9, v1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v9, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -327,11 +327,11 @@
 
     move-result v5
 
-    iget-object v7, v9, Lcom/airbnb/lottie/c/a;->jv:Landroid/graphics/PointF;
+    iget-object v7, v9, Lcom/airbnb/lottie/c/a;->ju:Landroid/graphics/PointF;
 
     invoke-virtual {v7, v10, v5}, Landroid/graphics/PointF;->set(FF)V
 
-    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v5, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -355,11 +355,11 @@
 
     move-result v6
 
-    iget-object v5, v5, Lcom/airbnb/lottie/c/a;->jw:Landroid/graphics/PointF;
+    iget-object v5, v5, Lcom/airbnb/lottie/c/a;->jv:Landroid/graphics/PointF;
 
     invoke-virtual {v5, v7, v6}, Landroid/graphics/PointF;->set(FF)V
 
-    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v5, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -383,7 +383,7 @@
 
     move-result v3
 
-    iget-object v4, v5, Lcom/airbnb/lottie/c/a;->jx:Landroid/graphics/PointF;
+    iget-object v4, v5, Lcom/airbnb/lottie/c/a;->jw:Landroid/graphics/PointF;
 
     invoke-virtual {v4, v6, v3}, Landroid/graphics/PointF;->set(FF)V
 
@@ -392,13 +392,13 @@
     goto :goto_4
 
     :cond_7
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/l;->iS:Lcom/airbnb/lottie/c/b/l;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/l;->iR:Lcom/airbnb/lottie/c/b/l;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/b/l;->iT:Landroid/graphics/Path;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/b/l;->iS:Landroid/graphics/Path;
 
     invoke-static {p1, p2}, Lcom/airbnb/lottie/f/g;->a(Lcom/airbnb/lottie/c/b/l;Landroid/graphics/Path;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/l;->iT:Landroid/graphics/Path;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/l;->iS:Landroid/graphics/Path;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/m.smali b/com.discord/smali/com/airbnb/lottie/a/b/m.smali
index dde9e4dc84..5416d6d56e 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/m.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/m.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private final iN:Landroid/graphics/PointF;
+.field private final iM:Landroid/graphics/PointF;
 
-.field private final iU:Lcom/airbnb/lottie/a/b/a;
+.field private final iT:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field private final iV:Lcom/airbnb/lottie/a/b/a;
+.field private final iU:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -67,13 +67,13 @@
 
     invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/m;->iN:Landroid/graphics/PointF;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/m;->iM:Landroid/graphics/PointF;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/m;->iU:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/m;->iT:Lcom/airbnb/lottie/a/b/a;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/b/m;->iV:Lcom/airbnb/lottie/a/b/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/b/m;->iU:Lcom/airbnb/lottie/a/b/a;
 
-    iget p1, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget p1, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     invoke-virtual {p0, p1}, Lcom/airbnb/lottie/a/b/m;->setProgress(F)V
 
@@ -85,7 +85,7 @@
 .method final bridge synthetic a(Lcom/airbnb/lottie/g/a;F)Ljava/lang/Object;
     .locals 0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/m;->iN:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/m;->iM:Landroid/graphics/PointF;
 
     return-object p1
 .end method
@@ -93,7 +93,7 @@
 .method public final bridge synthetic getValue()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/m;->iN:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/m;->iM:Landroid/graphics/PointF;
 
     return-object v0
 .end method
@@ -101,17 +101,17 @@
 .method public final setProgress(F)V
     .locals 2
 
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/m;->iT:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/a;->setProgress(F)V
+
     iget-object v0, p0, Lcom/airbnb/lottie/a/b/m;->iU:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/a;->setProgress(F)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/m;->iV:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/m;->iM:Landroid/graphics/PointF;
 
-    invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/a;->setProgress(F)V
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/m;->iN:Landroid/graphics/PointF;
-
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/m;->iU:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/m;->iT:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -123,7 +123,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/m;->iV:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/m;->iU:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/n.smali b/com.discord/smali/com/airbnb/lottie/a/b/n.smali
index 095348e156..8e7553bee5 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/n.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/n.smali
@@ -36,7 +36,7 @@
 .method final bridge synthetic a(Lcom/airbnb/lottie/g/a;F)Ljava/lang/Object;
     .locals 0
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     check-cast p1, Lcom/airbnb/lottie/c/b;
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/o.smali b/com.discord/smali/com/airbnb/lottie/a/b/o.smali
index 887ab805b3..cce2af64c4 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/o.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/o.smali
@@ -4,19 +4,30 @@
 
 
 # instance fields
+.field private final iV:Landroid/graphics/Matrix;
+
 .field private final iW:Landroid/graphics/Matrix;
 
 .field private final iX:Landroid/graphics/Matrix;
 
-.field private final iY:Landroid/graphics/Matrix;
+.field private final iY:[F
 
-.field private final iZ:[F
+.field public iZ:Lcom/airbnb/lottie/a/b/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/a/b/a<",
+            "Landroid/graphics/PointF;",
+            "Landroid/graphics/PointF;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field public ja:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
-            "Landroid/graphics/PointF;",
+            "*",
             "Landroid/graphics/PointF;",
             ">;"
         }
@@ -27,8 +38,8 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
-            "*",
-            "Landroid/graphics/PointF;",
+            "Lcom/airbnb/lottie/g/d;",
+            "Lcom/airbnb/lottie/g/d;",
             ">;"
         }
     .end annotation
@@ -38,8 +49,8 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
-            "Lcom/airbnb/lottie/g/d;",
-            "Lcom/airbnb/lottie/g/d;",
+            "Ljava/lang/Float;",
+            "Ljava/lang/Float;",
             ">;"
         }
     .end annotation
@@ -49,29 +60,18 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
-            "Ljava/lang/Float;",
-            "Ljava/lang/Float;",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public je:Lcom/airbnb/lottie/a/b/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/a/b/a<",
-            "Ljava/lang/Integer;",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field public je:Lcom/airbnb/lottie/a/b/c;
 
 .field public jf:Lcom/airbnb/lottie/a/b/c;
 
-.field public jg:Lcom/airbnb/lottie/a/b/c;
-
-.field public jh:Lcom/airbnb/lottie/a/b/a;
+.field public jg:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -82,7 +82,7 @@
     .end annotation
 .end field
 
-.field public ji:Lcom/airbnb/lottie/a/b/a;
+.field public jh:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -108,7 +108,7 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->matrix:Landroid/graphics/Matrix;
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kb:Lcom/airbnb/lottie/c/a/e;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ka:Lcom/airbnb/lottie/c/a/e;
 
     const/4 v1, 0x0
 
@@ -119,16 +119,16 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kb:Lcom/airbnb/lottie/c/a/e;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ka:Lcom/airbnb/lottie/c/a/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/e;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v0
 
     :goto_0
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iZ:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kc:Lcom/airbnb/lottie/c/a/m;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kb:Lcom/airbnb/lottie/c/a/m;
 
     if-nez v0, :cond_1
 
@@ -137,16 +137,16 @@
     goto :goto_1
 
     :cond_1
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kc:Lcom/airbnb/lottie/c/a/m;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kb:Lcom/airbnb/lottie/c/a/m;
 
     invoke-interface {v0}, Lcom/airbnb/lottie/c/a/m;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v0
 
     :goto_1
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kd:Lcom/airbnb/lottie/c/a/g;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kc:Lcom/airbnb/lottie/c/a/g;
 
     if-nez v0, :cond_2
 
@@ -155,16 +155,16 @@
     goto :goto_2
 
     :cond_2
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kd:Lcom/airbnb/lottie/c/a/g;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kc:Lcom/airbnb/lottie/c/a/g;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/g;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v0
 
     :goto_2
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ke:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kd:Lcom/airbnb/lottie/c/a/b;
 
     if-nez v0, :cond_3
 
@@ -173,16 +173,16 @@
     goto :goto_3
 
     :cond_3
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ke:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kd:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v0
 
     :goto_3
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kg:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kf:Lcom/airbnb/lottie/c/a/b;
 
     if-nez v0, :cond_4
 
@@ -191,7 +191,7 @@
     goto :goto_4
 
     :cond_4
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kg:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kf:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
 
@@ -200,9 +200,9 @@
     check-cast v0, Lcom/airbnb/lottie/a/b/c;
 
     :goto_4
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/c;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/c;
 
     if-eqz v0, :cond_5
 
@@ -210,6 +210,12 @@
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iV:Landroid/graphics/Matrix;
+
+    new-instance v0, Landroid/graphics/Matrix;
+
+    invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
+
     iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iW:Landroid/graphics/Matrix;
 
     new-instance v0, Landroid/graphics/Matrix;
@@ -218,31 +224,25 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iX:Landroid/graphics/Matrix;
 
-    new-instance v0, Landroid/graphics/Matrix;
-
-    invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
-
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iY:Landroid/graphics/Matrix;
-
     const/16 v0, 0x9
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iZ:[F
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iY:[F
 
     goto :goto_5
 
     :cond_5
+    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->iV:Landroid/graphics/Matrix;
+
     iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->iW:Landroid/graphics/Matrix;
 
     iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->iX:Landroid/graphics/Matrix;
 
-    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->iY:Landroid/graphics/Matrix;
-
-    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->iZ:[F
+    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->iY:[F
 
     :goto_5
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kh:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kg:Lcom/airbnb/lottie/c/a/b;
 
     if-nez v0, :cond_6
 
@@ -251,7 +251,7 @@
     goto :goto_6
 
     :cond_6
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kh:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kg:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
 
@@ -260,55 +260,55 @@
     check-cast v0, Lcom/airbnb/lottie/a/b/c;
 
     :goto_6
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/c;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kf:Lcom/airbnb/lottie/c/a/d;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ke:Lcom/airbnb/lottie/c/a/d;
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kf:Lcom/airbnb/lottie/c/a/d;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ke:Lcom/airbnb/lottie/c/a/d;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/d;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     :cond_7
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ki:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kh:Lcom/airbnb/lottie/c/a/b;
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ki:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kh:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/a;
 
     goto :goto_7
 
     :cond_8
-    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
+    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/a;
 
     :goto_7
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->kj:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ki:Lcom/airbnb/lottie/c/a/b;
 
     if-eqz v0, :cond_9
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/a/l;->kj:Lcom/airbnb/lottie/c/a/b;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/a/l;->ki:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->ji:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
 
     return-void
 
     :cond_9
-    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->ji:Lcom/airbnb/lottie/a/b/a;
+    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
 
     return-void
 .end method
@@ -323,7 +323,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/o;->iZ:[F
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/o;->iY:[F
 
     const/4 v2, 0x0
 
@@ -342,7 +342,7 @@
 .method public final a(F)Landroid/graphics/Matrix;
     .locals 9
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
 
     const/4 v1, 0x0
 
@@ -360,7 +360,7 @@
     check-cast v0, Landroid/graphics/PointF;
 
     :goto_0
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
 
     if-nez v2, :cond_1
 
@@ -424,7 +424,7 @@
     invoke-virtual {v0, v3, v2}, Landroid/graphics/Matrix;->preScale(FF)Z
 
     :cond_3
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_7
 
@@ -438,7 +438,7 @@
 
     move-result v0
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/o;->iZ:Lcom/airbnb/lottie/a/b/a;
 
     if-nez v2, :cond_4
 
@@ -487,63 +487,63 @@
 .method public final a(Lcom/airbnb/lottie/a/b/a$a;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_0
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_1
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ji:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_2
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
     :cond_2
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iZ:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_3
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
     :cond_3
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_4
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
     :cond_4
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_5
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
     :cond_5
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_6
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
     :cond_6
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/c;
 
     if-eqz v0, :cond_7
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/c;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
     :cond_7
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
 
     if-eqz v0, :cond_8
 
@@ -556,7 +556,11 @@
 .method public final a(Lcom/airbnb/lottie/c/c/a;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p1, v0}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
+
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -564,7 +568,7 @@
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ji:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iZ:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -580,7 +584,7 @@
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/c;
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -588,10 +592,6 @@
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/c;
-
-    invoke-virtual {p1, v0}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
-
     return-void
 .end method
 
@@ -607,11 +607,11 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/airbnb/lottie/j;->gG:Landroid/graphics/PointF;
+    sget-object v0, Lcom/airbnb/lottie/j;->gF:Landroid/graphics/PointF;
 
     if-ne p1, v0, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->iZ:Lcom/airbnb/lottie/a/b/a;
 
     if-nez p1, :cond_0
 
@@ -623,47 +623,47 @@
 
     invoke-direct {p1, p2, v0}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;Ljava/lang/Object;)V
 
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->iZ:Lcom/airbnb/lottie/a/b/a;
+
+    goto/16 :goto_0
+
+    :cond_0
+    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
+
+    goto/16 :goto_0
+
+    :cond_1
+    sget-object v0, Lcom/airbnb/lottie/j;->gG:Landroid/graphics/PointF;
+
+    if-ne p1, v0, :cond_3
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
+
+    if-nez p1, :cond_2
+
+    new-instance p1, Lcom/airbnb/lottie/a/b/p;
+
+    new-instance v0, Landroid/graphics/PointF;
+
+    invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
+
+    invoke-direct {p1, p2, v0}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;Ljava/lang/Object;)V
+
     iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
 
     goto/16 :goto_0
 
-    :cond_0
-    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
-
-    goto/16 :goto_0
-
-    :cond_1
-    sget-object v0, Lcom/airbnb/lottie/j;->gH:Landroid/graphics/PointF;
-
-    if-ne p1, v0, :cond_3
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
-
-    if-nez p1, :cond_2
-
-    new-instance p1, Lcom/airbnb/lottie/a/b/p;
-
-    new-instance v0, Landroid/graphics/PointF;
-
-    invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
-
-    invoke-direct {p1, p2, v0}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;Ljava/lang/Object;)V
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
-
-    goto/16 :goto_0
-
     :cond_2
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/a;->a(Lcom/airbnb/lottie/g/c;)V
 
     goto/16 :goto_0
 
     :cond_3
-    sget-object v0, Lcom/airbnb/lottie/j;->gM:Lcom/airbnb/lottie/g/d;
+    sget-object v0, Lcom/airbnb/lottie/j;->gL:Lcom/airbnb/lottie/g/d;
 
     if-ne p1, v0, :cond_5
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
 
     if-nez p1, :cond_4
 
@@ -675,7 +675,7 @@
 
     invoke-direct {p1, p2, v0}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;Ljava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
 
     goto/16 :goto_0
 
@@ -685,13 +685,13 @@
     goto/16 :goto_0
 
     :cond_5
-    sget-object v0, Lcom/airbnb/lottie/j;->gN:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gM:Ljava/lang/Float;
 
     const/4 v1, 0x0
 
     if-ne p1, v0, :cond_7
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
 
     if-nez p1, :cond_6
 
@@ -703,7 +703,7 @@
 
     invoke-direct {p1, p2, v0}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;Ljava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
 
     goto/16 :goto_0
 
@@ -713,13 +713,13 @@
     goto/16 :goto_0
 
     :cond_7
-    sget-object v0, Lcom/airbnb/lottie/j;->gE:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->gD:Ljava/lang/Integer;
 
     const/16 v2, 0x64
 
     if-ne p1, v0, :cond_9
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     if-nez p1, :cond_8
 
@@ -731,7 +731,7 @@
 
     invoke-direct {p1, p2, v0}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;Ljava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     goto/16 :goto_0
 
@@ -741,11 +741,11 @@
     goto/16 :goto_0
 
     :cond_9
-    sget-object v0, Lcom/airbnb/lottie/j;->ha:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gZ:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_b
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_b
 
@@ -759,7 +759,7 @@
 
     invoke-direct {p1, p2, v0}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;Ljava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/a;
 
     goto :goto_0
 
@@ -769,11 +769,11 @@
     goto :goto_0
 
     :cond_b
-    sget-object v0, Lcom/airbnb/lottie/j;->hb:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->ha:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_d
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ji:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_d
 
@@ -787,7 +787,7 @@
 
     invoke-direct {p1, p2, v0}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;Ljava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->ji:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
 
     goto :goto_0
 
@@ -797,11 +797,11 @@
     goto :goto_0
 
     :cond_d
-    sget-object v0, Lcom/airbnb/lottie/j;->gO:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gN:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_f
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/c;
 
     if-eqz v0, :cond_f
 
@@ -823,21 +823,21 @@
 
     invoke-direct {p1, v0}, Lcom/airbnb/lottie/a/b/c;-><init>(Ljava/util/List;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/c;
 
     :cond_e
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/c;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/c;->a(Lcom/airbnb/lottie/g/c;)V
 
     goto :goto_0
 
     :cond_f
-    sget-object v0, Lcom/airbnb/lottie/j;->gP:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gO:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_11
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
 
     if-eqz p1, :cond_11
 
@@ -859,10 +859,10 @@
 
     invoke-direct {p1, v0}, Lcom/airbnb/lottie/a/b/c;-><init>(Ljava/util/List;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
 
     :cond_10
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/a/b/c;->a(Lcom/airbnb/lottie/g/c;)V
 
@@ -884,7 +884,7 @@
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
 
     const/4 v1, 0x0
 
@@ -918,7 +918,7 @@
     invoke-virtual {v2, v3, v0}, Landroid/graphics/Matrix;->preTranslate(FF)Z
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_3
 
@@ -955,13 +955,13 @@
     invoke-virtual {v2, v0}, Landroid/graphics/Matrix;->preRotate(F)Z
 
     :cond_3
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/c;
 
     const/high16 v2, 0x3f800000    # 1.0f
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
 
     const/high16 v3, 0x42b40000    # 90.0f
 
@@ -993,7 +993,7 @@
     double-to-float v0, v4
 
     :goto_1
-    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/c;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
 
     if-nez v4, :cond_5
 
@@ -1023,7 +1023,7 @@
     double-to-float v3, v3
 
     :goto_2
-    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/c;
 
     invoke-virtual {v4}, Lcom/airbnb/lottie/a/b/c;->bh()F
 
@@ -1043,7 +1043,7 @@
 
     invoke-direct {p0}, Lcom/airbnb/lottie/a/b/o;->bj()V
 
-    iget-object v5, p0, Lcom/airbnb/lottie/a/b/o;->iZ:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/b/o;->iY:[F
 
     const/4 v6, 0x0
 
@@ -1067,13 +1067,13 @@
 
     aput v2, v5, v11
 
-    iget-object v12, p0, Lcom/airbnb/lottie/a/b/o;->iW:Landroid/graphics/Matrix;
+    iget-object v12, p0, Lcom/airbnb/lottie/a/b/o;->iV:Landroid/graphics/Matrix;
 
     invoke-virtual {v12, v5}, Landroid/graphics/Matrix;->setValues([F)V
 
     invoke-direct {p0}, Lcom/airbnb/lottie/a/b/o;->bj()V
 
-    iget-object v5, p0, Lcom/airbnb/lottie/a/b/o;->iZ:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/b/o;->iY:[F
 
     aput v2, v5, v6
 
@@ -1083,13 +1083,13 @@
 
     aput v2, v5, v11
 
-    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->iX:Landroid/graphics/Matrix;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->iW:Landroid/graphics/Matrix;
 
     invoke-virtual {v4, v5}, Landroid/graphics/Matrix;->setValues([F)V
 
     invoke-direct {p0}, Lcom/airbnb/lottie/a/b/o;->bj()V
 
-    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->iZ:[F
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->iY:[F
 
     aput v0, v4, v6
 
@@ -1101,30 +1101,30 @@
 
     aput v2, v4, v11
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iY:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iX:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v4}, Landroid/graphics/Matrix;->setValues([F)V
 
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iW:Landroid/graphics/Matrix;
+
+    iget-object v3, p0, Lcom/airbnb/lottie/a/b/o;->iV:Landroid/graphics/Matrix;
+
+    invoke-virtual {v0, v3}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
+
     iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iX:Landroid/graphics/Matrix;
 
     iget-object v3, p0, Lcom/airbnb/lottie/a/b/o;->iW:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v3}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iY:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->matrix:Landroid/graphics/Matrix;
 
     iget-object v3, p0, Lcom/airbnb/lottie/a/b/o;->iX:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v3}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->matrix:Landroid/graphics/Matrix;
-
-    iget-object v3, p0, Lcom/airbnb/lottie/a/b/o;->iY:Landroid/graphics/Matrix;
-
-    invoke-virtual {v0, v3}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
-
     :cond_6
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_8
 
@@ -1156,7 +1156,7 @@
     invoke-virtual {v2, v3, v0}, Landroid/graphics/Matrix;->preScale(FF)Z
 
     :cond_8
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->iZ:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_a
 
diff --git a/com.discord/smali/com/airbnb/lottie/a/b/p.smali b/com.discord/smali/com/airbnb/lottie/a/b/p.smali
index 168953c5ff..d85b4a7aba 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/p.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/p.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final jj:Lcom/airbnb/lottie/g/b;
+.field private final ji:Lcom/airbnb/lottie/g/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/g/b<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final jk:Ljava/lang/Object;
+.field private final jj:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TA;"
@@ -74,11 +74,11 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/g/b;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/p;->jj:Lcom/airbnb/lottie/g/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/p;->ji:Lcom/airbnb/lottie/g/b;
 
     invoke-virtual {p0, p1}, Lcom/airbnb/lottie/a/b/p;->a(Lcom/airbnb/lottie/g/c;)V
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/b/p;->jk:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/b/p;->jj:Ljava/lang/Object;
 
     return-void
 .end method
@@ -105,7 +105,7 @@
 .method public final bb()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/p;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/p;->iA:Lcom/airbnb/lottie/g/c;
 
     if-eqz v0, :cond_0
 
@@ -131,15 +131,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/p;->iB:Lcom/airbnb/lottie/g/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/p;->iA:Lcom/airbnb/lottie/g/c;
 
-    iget-object v4, p0, Lcom/airbnb/lottie/a/b/p;->jk:Ljava/lang/Object;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/p;->jj:Ljava/lang/Object;
 
-    iget v5, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v5, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
-    iget v6, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v6, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
-    iget v7, p0, Lcom/airbnb/lottie/a/b/a;->fE:F
+    iget v7, p0, Lcom/airbnb/lottie/a/b/a;->fD:F
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/airbnb/lottie/b/a.smali b/com.discord/smali/com/airbnb/lottie/b/a.smali
index 5b33aacbba..110cd48fc5 100644
--- a/com.discord/smali/com/airbnb/lottie/b/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/b/a.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final jl:Lcom/airbnb/lottie/c/i;
+.field public final jk:Lcom/airbnb/lottie/c/i;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/c/i<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field public final jm:Ljava/util/Map;
+.field public final jl:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field public final jn:Ljava/util/Map;
+.field public final jm:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -38,11 +38,11 @@
     .end annotation
 .end field
 
-.field public final jo:Landroid/content/res/AssetManager;
+.field public final jn:Landroid/content/res/AssetManager;
 
-.field public jp:Lcom/airbnb/lottie/a;
+.field public jo:Lcom/airbnb/lottie/a;
 
-.field public jq:Ljava/lang/String;
+.field public jp:Ljava/lang/String;
 
 
 # direct methods
@@ -55,7 +55,13 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/c/i;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/b/a;->jl:Lcom/airbnb/lottie/c/i;
+    iput-object v0, p0, Lcom/airbnb/lottie/b/a;->jk:Lcom/airbnb/lottie/c/i;
+
+    new-instance v0, Ljava/util/HashMap;
+
+    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
+
+    iput-object v0, p0, Lcom/airbnb/lottie/b/a;->jl:Ljava/util/Map;
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -63,17 +69,11 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/b/a;->jm:Ljava/util/Map;
 
-    new-instance v0, Ljava/util/HashMap;
-
-    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
-
-    iput-object v0, p0, Lcom/airbnb/lottie/b/a;->jn:Ljava/util/Map;
-
     const-string v0, ".ttf"
 
-    iput-object v0, p0, Lcom/airbnb/lottie/b/a;->jq:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/b/a;->jp:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/b/a;->jp:Lcom/airbnb/lottie/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/b/a;->jo:Lcom/airbnb/lottie/a;
 
     instance-of p2, p1, Landroid/view/View;
 
@@ -85,7 +85,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/b/a;->jo:Landroid/content/res/AssetManager;
+    iput-object p1, p0, Lcom/airbnb/lottie/b/a;->jn:Landroid/content/res/AssetManager;
 
     return-void
 
@@ -100,7 +100,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/b/a;->jo:Landroid/content/res/AssetManager;
+    iput-object p1, p0, Lcom/airbnb/lottie/b/a;->jn:Landroid/content/res/AssetManager;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/b/b.smali b/com.discord/smali/com/airbnb/lottie/b/b.smali
index d9d1223527..6d5192923d 100644
--- a/com.discord/smali/com/airbnb/lottie/b/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/b/b.smali
@@ -4,17 +4,17 @@
 
 
 # static fields
-.field private static final jr:Ljava/lang/Object;
+.field private static final jq:Ljava/lang/Object;
 
 
 # instance fields
 .field public final context:Landroid/content/Context;
 
-.field private js:Ljava/lang/String;
+.field private jr:Ljava/lang/String;
 
-.field public jt:Lcom/airbnb/lottie/b;
+.field public js:Lcom/airbnb/lottie/b;
 
-.field private final ju:Ljava/util/Map;
+.field private final jt:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -34,7 +34,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/b/b;->jr:Ljava/lang/Object;
+    sput-object v0, Lcom/airbnb/lottie/b/b;->jq:Ljava/lang/Object;
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/airbnb/lottie/b/b;->js:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/b/b;->jr:Ljava/lang/String;
 
     invoke-static {p2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -64,7 +64,7 @@
 
     if-nez p2, :cond_0
 
-    iget-object p2, p0, Lcom/airbnb/lottie/b/b;->js:Ljava/lang/String;
+    iget-object p2, p0, Lcom/airbnb/lottie/b/b;->jr:Ljava/lang/String;
 
     invoke-virtual {p2}, Ljava/lang/String;->length()I
 
@@ -84,7 +84,7 @@
 
     invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/b/b;->js:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/b/b;->jr:Ljava/lang/String;
 
     invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -94,7 +94,7 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/airbnb/lottie/b/b;->js:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/b/b;->jr:Ljava/lang/String;
 
     :cond_0
     instance-of p2, p1, Landroid/view/View;
@@ -109,7 +109,7 @@
 
     invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/b/b;->ju:Ljava/util/Map;
+    iput-object p1, p0, Lcom/airbnb/lottie/b/b;->jt:Ljava/util/Map;
 
     const/4 p1, 0x0
 
@@ -126,9 +126,9 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/b/b;->context:Landroid/content/Context;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/b/b;->ju:Ljava/util/Map;
+    iput-object p4, p0, Lcom/airbnb/lottie/b/b;->jt:Ljava/util/Map;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/b/b;->jt:Lcom/airbnb/lottie/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/b/b;->js:Lcom/airbnb/lottie/b;
 
     return-void
 .end method
@@ -136,12 +136,12 @@
 .method private a(Ljava/lang/String;Landroid/graphics/Bitmap;)Landroid/graphics/Bitmap;
     .locals 2
 
-    sget-object v0, Lcom/airbnb/lottie/b/b;->jr:Ljava/lang/Object;
+    sget-object v0, Lcom/airbnb/lottie/b/b;->jq:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/airbnb/lottie/b/b;->ju:Ljava/util/Map;
+    iget-object v1, p0, Lcom/airbnb/lottie/b/b;->jt:Ljava/util/Map;
 
     invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -149,7 +149,7 @@
 
     check-cast p1, Lcom/airbnb/lottie/g;
 
-    iput-object p2, p1, Lcom/airbnb/lottie/g;->gB:Landroid/graphics/Bitmap;
+    iput-object p2, p1, Lcom/airbnb/lottie/g;->gA:Landroid/graphics/Bitmap;
 
     monitor-exit v0
 
@@ -170,7 +170,7 @@
 .method public final v(Ljava/lang/String;)Landroid/graphics/Bitmap;
     .locals 7
 
-    iget-object v0, p0, Lcom/airbnb/lottie/b/b;->ju:Ljava/util/Map;
+    iget-object v0, p0, Lcom/airbnb/lottie/b/b;->jt:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -185,14 +185,14 @@
     return-object v1
 
     :cond_0
-    iget-object v2, v0, Lcom/airbnb/lottie/g;->gB:Landroid/graphics/Bitmap;
+    iget-object v2, v0, Lcom/airbnb/lottie/g;->gA:Landroid/graphics/Bitmap;
 
     if-eqz v2, :cond_1
 
     return-object v2
 
     :cond_1
-    iget-object v2, p0, Lcom/airbnb/lottie/b/b;->jt:Lcom/airbnb/lottie/b;
+    iget-object v2, p0, Lcom/airbnb/lottie/b/b;->js:Lcom/airbnb/lottie/b;
 
     if-eqz v2, :cond_3
 
@@ -208,7 +208,7 @@
     return-object v0
 
     :cond_3
-    iget-object v2, v0, Lcom/airbnb/lottie/g;->gz:Ljava/lang/String;
+    iget-object v2, v0, Lcom/airbnb/lottie/g;->gy:Ljava/lang/String;
 
     new-instance v3, Landroid/graphics/BitmapFactory$Options;
 
@@ -282,7 +282,7 @@
 
     :cond_4
     :try_start_1
-    iget-object v4, p0, Lcom/airbnb/lottie/b/b;->js:Ljava/lang/String;
+    iget-object v4, p0, Lcom/airbnb/lottie/b/b;->jr:Ljava/lang/String;
 
     invoke-static {v4}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -300,7 +300,7 @@
 
     invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v6, p0, Lcom/airbnb/lottie/b/b;->js:Ljava/lang/String;
+    iget-object v6, p0, Lcom/airbnb/lottie/b/b;->jr:Ljava/lang/String;
 
     invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c.smali b/com.discord/smali/com/airbnb/lottie/c.smali
index 24f45ec75d..10257926f7 100644
--- a/com.discord/smali/com/airbnb/lottie/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/c.smali
@@ -6,16 +6,16 @@
 # static fields
 .field public static DBG:Z = false
 
-.field private static fl:Z = false
+.field private static fk:Z = false
 
-.field private static fm:[Ljava/lang/String;
+.field private static fl:[Ljava/lang/String;
 
-.field private static fn:[J
+.field private static fm:[J
+
+.field private static fn:I
 
 .field private static fo:I
 
-.field private static fp:I
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -27,33 +27,33 @@
 .method public static beginSection(Ljava/lang/String;)V
     .locals 4
 
-    sget-boolean v0, Lcom/airbnb/lottie/c;->fl:Z
+    sget-boolean v0, Lcom/airbnb/lottie/c;->fk:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    sget v0, Lcom/airbnb/lottie/c;->fo:I
+    sget v0, Lcom/airbnb/lottie/c;->fn:I
 
     const/16 v1, 0x14
 
     if-ne v0, v1, :cond_1
 
-    sget p0, Lcom/airbnb/lottie/c;->fp:I
+    sget p0, Lcom/airbnb/lottie/c;->fo:I
 
     add-int/lit8 p0, p0, 0x1
 
-    sput p0, Lcom/airbnb/lottie/c;->fp:I
+    sput p0, Lcom/airbnb/lottie/c;->fo:I
 
     return-void
 
     :cond_1
-    sget-object v1, Lcom/airbnb/lottie/c;->fm:[Ljava/lang/String;
+    sget-object v1, Lcom/airbnb/lottie/c;->fl:[Ljava/lang/String;
 
     aput-object p0, v1, v0
 
-    sget-object v1, Lcom/airbnb/lottie/c;->fn:[J
+    sget-object v1, Lcom/airbnb/lottie/c;->fm:[J
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
@@ -63,11 +63,11 @@
 
     invoke-static {p0}, Landroidx/core/os/TraceCompat;->beginSection(Ljava/lang/String;)V
 
-    sget p0, Lcom/airbnb/lottie/c;->fo:I
+    sget p0, Lcom/airbnb/lottie/c;->fn:I
 
     add-int/lit8 p0, p0, 0x1
 
-    sput p0, Lcom/airbnb/lottie/c;->fo:I
+    sput p0, Lcom/airbnb/lottie/c;->fn:I
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 .method public static q(Ljava/lang/String;)F
     .locals 4
 
-    sget v0, Lcom/airbnb/lottie/c;->fp:I
+    sget v0, Lcom/airbnb/lottie/c;->fo:I
 
     const/4 v1, 0x0
 
@@ -83,31 +83,31 @@
 
     add-int/lit8 v0, v0, -0x1
 
-    sput v0, Lcom/airbnb/lottie/c;->fp:I
+    sput v0, Lcom/airbnb/lottie/c;->fo:I
 
     return v1
 
     :cond_0
-    sget-boolean v0, Lcom/airbnb/lottie/c;->fl:Z
+    sget-boolean v0, Lcom/airbnb/lottie/c;->fk:Z
 
     if-nez v0, :cond_1
 
     return v1
 
     :cond_1
-    sget v0, Lcom/airbnb/lottie/c;->fo:I
+    sget v0, Lcom/airbnb/lottie/c;->fn:I
 
     add-int/lit8 v0, v0, -0x1
 
-    sput v0, Lcom/airbnb/lottie/c;->fo:I
+    sput v0, Lcom/airbnb/lottie/c;->fn:I
 
     const/4 v1, -0x1
 
     if-eq v0, v1, :cond_3
 
-    sget-object v0, Lcom/airbnb/lottie/c;->fm:[Ljava/lang/String;
+    sget-object v0, Lcom/airbnb/lottie/c;->fl:[Ljava/lang/String;
 
-    sget v1, Lcom/airbnb/lottie/c;->fo:I
+    sget v1, Lcom/airbnb/lottie/c;->fn:I
 
     aget-object v0, v0, v1
 
@@ -123,9 +123,9 @@
 
     move-result-wide v0
 
-    sget-object p0, Lcom/airbnb/lottie/c;->fn:[J
+    sget-object p0, Lcom/airbnb/lottie/c;->fm:[J
 
-    sget v2, Lcom/airbnb/lottie/c;->fo:I
+    sget v2, Lcom/airbnb/lottie/c;->fn:I
 
     aget-wide v2, p0, v2
 
@@ -154,9 +154,9 @@
 
     invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    sget-object p0, Lcom/airbnb/lottie/c;->fm:[Ljava/lang/String;
+    sget-object p0, Lcom/airbnb/lottie/c;->fl:[Ljava/lang/String;
 
-    sget v2, Lcom/airbnb/lottie/c;->fo:I
+    sget v2, Lcom/airbnb/lottie/c;->fn:I
 
     aget-object p0, p0, v2
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/a.smali b/com.discord/smali/com/airbnb/lottie/c/a.smali
index b4a82ad67f..de8376462d 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a.smali
@@ -4,12 +4,12 @@
 
 
 # instance fields
+.field public final ju:Landroid/graphics/PointF;
+
 .field public final jv:Landroid/graphics/PointF;
 
 .field public final jw:Landroid/graphics/PointF;
 
-.field public final jx:Landroid/graphics/PointF;
-
 
 # direct methods
 .method public constructor <init>()V
@@ -21,6 +21,12 @@
 
     invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
 
+    iput-object v0, p0, Lcom/airbnb/lottie/c/a;->ju:Landroid/graphics/PointF;
+
+    new-instance v0, Landroid/graphics/PointF;
+
+    invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
+
     iput-object v0, p0, Lcom/airbnb/lottie/c/a;->jv:Landroid/graphics/PointF;
 
     new-instance v0, Landroid/graphics/PointF;
@@ -29,12 +35,6 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/c/a;->jw:Landroid/graphics/PointF;
 
-    new-instance v0, Landroid/graphics/PointF;
-
-    invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
-
-    iput-object v0, p0, Lcom/airbnb/lottie/c/a;->jx:Landroid/graphics/PointF;
-
     return-void
 .end method
 
@@ -43,11 +43,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/a;->jv:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a;->ju:Landroid/graphics/PointF;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/a;->jw:Landroid/graphics/PointF;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/a;->jv:Landroid/graphics/PointF;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/a;->jx:Landroid/graphics/PointF;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/a;->jw:Landroid/graphics/PointF;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/a.smali b/com.discord/smali/com/airbnb/lottie/c/a/a.smali
index 1f5d3d9a67..0d43c81de6 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/a.smali
@@ -48,7 +48,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/a/b/b;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/a;->iA:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/a;->iz:Ljava/util/List;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/b/b;-><init>(Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/b.smali b/com.discord/smali/com/airbnb/lottie/c/a/b.smali
index c9e8663e6c..970cdff762 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/b.smali
@@ -62,7 +62,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/a/b/c;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/b;->iA:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/b;->iz:Ljava/util/List;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/b/c;-><init>(Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/c.smali b/com.discord/smali/com/airbnb/lottie/c/a/c.smali
index 100fa74846..470a2939de 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/c.smali
@@ -48,7 +48,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/a/b/d;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/c;->iA:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/c;->iz:Ljava/util/List;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/b/d;-><init>(Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/d.smali b/com.discord/smali/com/airbnb/lottie/c/a/d.smali
index aa60aea50c..3cc4268572 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/d.smali
@@ -62,7 +62,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/a/b/e;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/d;->iA:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/d;->iz:Ljava/util/List;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/b/e;-><init>(Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/e.smali b/com.discord/smali/com/airbnb/lottie/c/a/e.smali
index 6b5bda5412..c7979805d3 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/e.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field private final iA:Ljava/util/List;
+.field private final iz:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -51,7 +51,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/a/e;->iA:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/a/e;->iz:Ljava/util/List;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/a/e;->iA:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/e;->iz:Ljava/util/List;
 
     return-void
 .end method
@@ -89,7 +89,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->iz:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -107,7 +107,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/a/b/j;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/e;->iA:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/e;->iz:Ljava/util/List;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/b/j;-><init>(Ljava/util/List;)V
 
@@ -116,7 +116,7 @@
     :cond_0
     new-instance v0, Lcom/airbnb/lottie/a/b/i;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/e;->iA:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/e;->iz:Ljava/util/List;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/b/i;-><init>(Ljava/util/List;)V
 
@@ -135,7 +135,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->iz:Ljava/util/List;
 
     return-object v0
 .end method
@@ -143,7 +143,7 @@
 .method public final isStatic()Z
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->iz:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -155,7 +155,7 @@
 
     if-ne v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->iz:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/f.smali b/com.discord/smali/com/airbnb/lottie/c/a/f.smali
index 09252d915e..7cd8489eb7 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/f.smali
@@ -48,7 +48,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/a/b/j;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/f;->iA:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/f;->iz:Ljava/util/List;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/b/j;-><init>(Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/g.smali b/com.discord/smali/com/airbnb/lottie/c/a/g.smali
index 4a9027a707..9760979588 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/g.smali
@@ -70,7 +70,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/a/b/k;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/g;->iA:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/g;->iz:Ljava/util/List;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/b/k;-><init>(Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/h.smali b/com.discord/smali/com/airbnb/lottie/c/a/h.smali
index f2fd3c273a..b3bb66ff71 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/h.smali
@@ -48,7 +48,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/a/b/l;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/h;->iA:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/h;->iz:Ljava/util/List;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/b/l;-><init>(Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/i.smali b/com.discord/smali/com/airbnb/lottie/c/a/i.smali
index a4ab918199..ed83820fcf 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/i.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/i.smali
@@ -19,9 +19,9 @@
 
 
 # instance fields
-.field private final jV:Lcom/airbnb/lottie/c/a/b;
+.field private final jU:Lcom/airbnb/lottie/c/a/b;
 
-.field private final jW:Lcom/airbnb/lottie/c/a/b;
+.field private final jV:Lcom/airbnb/lottie/c/a/b;
 
 
 # direct methods
@@ -30,9 +30,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/a/i;->jV:Lcom/airbnb/lottie/c/a/b;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/i;->jU:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/a/i;->jW:Lcom/airbnb/lottie/c/a/b;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/a/i;->jV:Lcom/airbnb/lottie/c/a/b;
 
     return-void
 .end method
@@ -53,13 +53,13 @@
 
     new-instance v0, Lcom/airbnb/lottie/a/b/m;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/i;->jV:Lcom/airbnb/lottie/c/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/i;->jU:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/a/i;->jW:Lcom/airbnb/lottie/c/a/b;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/a/i;->jV:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
 
@@ -94,7 +94,7 @@
 .method public final isStatic()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/i;->jV:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/i;->jU:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->isStatic()Z
 
@@ -102,7 +102,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/i;->jW:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/i;->jV:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->isStatic()Z
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/j.smali b/com.discord/smali/com/airbnb/lottie/c/a/j.smali
index 07c64437ff..8007bad5d3 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/j.smali
@@ -59,7 +59,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/a/b/n;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/j;->iA:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/j;->iz:Ljava/util/List;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/b/n;-><init>(Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/k.smali b/com.discord/smali/com/airbnb/lottie/c/a/k.smali
index 05b4928223..11d9d7f13d 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/k.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/k.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
+.field public final jW:Lcom/airbnb/lottie/c/a/a;
+
 .field public final jX:Lcom/airbnb/lottie/c/a/a;
 
-.field public final jY:Lcom/airbnb/lottie/c/a/a;
+.field public final jY:Lcom/airbnb/lottie/c/a/b;
 
 .field public final jZ:Lcom/airbnb/lottie/c/a/b;
 
-.field public final ka:Lcom/airbnb/lottie/c/a/b;
-
 
 # direct methods
 .method public constructor <init>(Lcom/airbnb/lottie/c/a/a;Lcom/airbnb/lottie/c/a/a;Lcom/airbnb/lottie/c/a/b;Lcom/airbnb/lottie/c/a/b;)V
@@ -19,13 +19,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/a/k;->jX:Lcom/airbnb/lottie/c/a/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/k;->jW:Lcom/airbnb/lottie/c/a/a;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/a/k;->jY:Lcom/airbnb/lottie/c/a/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/a/k;->jX:Lcom/airbnb/lottie/c/a/a;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/a/k;->jZ:Lcom/airbnb/lottie/c/a/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/a/k;->jY:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/a/k;->ka:Lcom/airbnb/lottie/c/a/b;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/a/k;->jZ:Lcom/airbnb/lottie/c/a/b;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/l.smali b/com.discord/smali/com/airbnb/lottie/c/a/l.smali
index 6e54cf36e2..bf31379691 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/l.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field public final kb:Lcom/airbnb/lottie/c/a/e;
+.field public final ka:Lcom/airbnb/lottie/c/a/e;
 
-.field public final kc:Lcom/airbnb/lottie/c/a/m;
+.field public final kb:Lcom/airbnb/lottie/c/a/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/c/a/m<",
@@ -20,11 +20,13 @@
     .end annotation
 .end field
 
-.field public final kd:Lcom/airbnb/lottie/c/a/g;
+.field public final kc:Lcom/airbnb/lottie/c/a/g;
 
-.field public final ke:Lcom/airbnb/lottie/c/a/b;
+.field public final kd:Lcom/airbnb/lottie/c/a/b;
 
-.field public final kf:Lcom/airbnb/lottie/c/a/d;
+.field public final ke:Lcom/airbnb/lottie/c/a/d;
+
+.field public final kf:Lcom/airbnb/lottie/c/a/b;
 
 .field public final kg:Lcom/airbnb/lottie/c/a/b;
 
@@ -32,8 +34,6 @@
 
 .field public final ki:Lcom/airbnb/lottie/c/a/b;
 
-.field public final kj:Lcom/airbnb/lottie/c/a/b;
-
 
 # direct methods
 .method public constructor <init>()V
@@ -87,23 +87,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/a/l;->kb:Lcom/airbnb/lottie/c/a/e;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/l;->ka:Lcom/airbnb/lottie/c/a/e;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/a/l;->kc:Lcom/airbnb/lottie/c/a/m;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/a/l;->kb:Lcom/airbnb/lottie/c/a/m;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/a/l;->kd:Lcom/airbnb/lottie/c/a/g;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/a/l;->kc:Lcom/airbnb/lottie/c/a/g;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/a/l;->ke:Lcom/airbnb/lottie/c/a/b;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/a/l;->kd:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/a/l;->kf:Lcom/airbnb/lottie/c/a/d;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/a/l;->ke:Lcom/airbnb/lottie/c/a/d;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/c/a/l;->ki:Lcom/airbnb/lottie/c/a/b;
+    iput-object p6, p0, Lcom/airbnb/lottie/c/a/l;->kh:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/a/l;->kj:Lcom/airbnb/lottie/c/a/b;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/a/l;->ki:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p8, p0, Lcom/airbnb/lottie/c/a/l;->kg:Lcom/airbnb/lottie/c/a/b;
+    iput-object p8, p0, Lcom/airbnb/lottie/c/a/l;->kf:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p9, p0, Lcom/airbnb/lottie/c/a/l;->kh:Lcom/airbnb/lottie/c/a/b;
+    iput-object p9, p0, Lcom/airbnb/lottie/c/a/l;->kg:Lcom/airbnb/lottie/c/a/b;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/a/n.smali b/com.discord/smali/com/airbnb/lottie/c/a/n.smali
index 1849d0fef3..416b8f1ebb 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/n.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/n.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field final iA:Ljava/util/List;
+.field final iz:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -68,7 +68,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/a/n;->iA:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/n;->iz:Ljava/util/List;
 
     return-void
 .end method
@@ -86,7 +86,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->iz:Ljava/util/List;
 
     return-object v0
 .end method
@@ -94,7 +94,7 @@
 .method public isStatic()Z
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->iz:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -104,7 +104,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->iz:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -114,7 +114,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->iA:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->iz:Ljava/util/List;
 
     invoke-interface {v0, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -145,7 +145,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/n;->iA:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/n;->iz:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
 
@@ -157,7 +157,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/n;->iA:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/n;->iz:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->toArray()[Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/b$a.smali b/com.discord/smali/com/airbnb/lottie/c/b$a.smali
index dae60200e9..4f82d83f75 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b$a.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
-.field public static final jG:I = 0x1
+.field public static final jF:I = 0x1
 
-.field public static final jH:I = 0x2
+.field public static final jG:I = 0x2
 
-.field public static final jI:I = 0x3
+.field public static final jH:I = 0x3
 
-.field private static final synthetic jJ:[I
+.field private static final synthetic jI:[I
 
 
 # direct methods
@@ -40,25 +40,25 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/b$a;->jG:I
+    sget v1, Lcom/airbnb/lottie/c/b$a;->jF:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b$a;->jH:I
+    sget v1, Lcom/airbnb/lottie/c/b$a;->jG:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b$a;->jI:I
+    sget v1, Lcom/airbnb/lottie/c/b$a;->jH:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b$a;->jJ:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b$a;->jI:[I
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 .method public static bk()[I
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/c/b$a;->jJ:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b$a;->jI:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/b.smali b/com.discord/smali/com/airbnb/lottie/c/b.smali
index d7fdce1e26..ab46063a58 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b.smali
@@ -16,19 +16,19 @@
 
 .field public final jA:I
 
-.field public final jB:I
+.field public final jB:D
 
 .field public final jC:D
 
 .field public final jD:D
 
-.field public final jE:D
+.field public final jE:Z
 
-.field public final jF:Z
+.field public final jx:Ljava/lang/String;
 
-.field public final jy:Ljava/lang/String;
+.field public final jy:D
 
-.field public final jz:D
+.field public final jz:I
 
 .field public final strokeColor:I
 
@@ -43,25 +43,25 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/c/b;->text:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/b;->jy:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b;->jx:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/airbnb/lottie/c/b;->jz:D
+    iput-wide p3, p0, Lcom/airbnb/lottie/c/b;->jy:D
 
-    iput p5, p0, Lcom/airbnb/lottie/c/b;->jA:I
+    iput p5, p0, Lcom/airbnb/lottie/c/b;->jz:I
 
-    iput p6, p0, Lcom/airbnb/lottie/c/b;->jB:I
+    iput p6, p0, Lcom/airbnb/lottie/c/b;->jA:I
 
-    iput-wide p7, p0, Lcom/airbnb/lottie/c/b;->jC:D
+    iput-wide p7, p0, Lcom/airbnb/lottie/c/b;->jB:D
 
-    iput-wide p9, p0, Lcom/airbnb/lottie/c/b;->jD:D
+    iput-wide p9, p0, Lcom/airbnb/lottie/c/b;->jC:D
 
     iput p11, p0, Lcom/airbnb/lottie/c/b;->color:I
 
     iput p12, p0, Lcom/airbnb/lottie/c/b;->strokeColor:I
 
-    iput-wide p13, p0, Lcom/airbnb/lottie/c/b;->jE:D
+    iput-wide p13, p0, Lcom/airbnb/lottie/c/b;->jD:D
 
-    iput-boolean p15, p0, Lcom/airbnb/lottie/c/b;->jF:Z
+    iput-boolean p15, p0, Lcom/airbnb/lottie/c/b;->jE:Z
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/b;->jy:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b;->jx:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
@@ -91,7 +91,7 @@
 
     int-to-double v0, v0
 
-    iget-wide v2, p0, Lcom/airbnb/lottie/c/b;->jz:D
+    iget-wide v2, p0, Lcom/airbnb/lottie/c/b;->jy:D
 
     invoke-static {v0, v1}, Ljava/lang/Double;->isNaN(D)Z
 
@@ -101,7 +101,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/airbnb/lottie/c/b;->jA:I
+    iget v1, p0, Lcom/airbnb/lottie/c/b;->jz:I
 
     add-int/lit8 v1, v1, -0x1
 
@@ -109,11 +109,11 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/airbnb/lottie/c/b;->jB:I
+    iget v1, p0, Lcom/airbnb/lottie/c/b;->jA:I
 
     add-int/2addr v0, v1
 
-    iget-wide v1, p0, Lcom/airbnb/lottie/c/b;->jC:D
+    iget-wide v1, p0, Lcom/airbnb/lottie/c/b;->jB:D
 
     invoke-static {v1, v2}, Ljava/lang/Double;->doubleToLongBits(D)J
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/a.smali b/com.discord/smali/com/airbnb/lottie/c/b/a.smali
index 7ac395b899..064549c9a3 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/a.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field public final hH:Z
+.field public final hG:Z
 
-.field public final kc:Lcom/airbnb/lottie/c/a/m;
+.field public final kb:Lcom/airbnb/lottie/c/a/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/c/a/m<",
@@ -20,9 +20,9 @@
     .end annotation
 .end field
 
-.field public final kk:Lcom/airbnb/lottie/c/a/f;
+.field public final kj:Lcom/airbnb/lottie/c/a/f;
 
-.field public final kl:Z
+.field public final kk:Z
 
 .field public final name:Ljava/lang/String;
 
@@ -47,13 +47,13 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/c/b/a;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/b/a;->kc:Lcom/airbnb/lottie/c/a/m;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/a;->kb:Lcom/airbnb/lottie/c/a/m;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/a;->kk:Lcom/airbnb/lottie/c/a/f;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/a;->kj:Lcom/airbnb/lottie/c/a/f;
 
-    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/a;->kl:Z
+    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/a;->kk:Z
 
-    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/a;->hH:Z
+    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/a;->hG:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/c.smali b/com.discord/smali/com/airbnb/lottie/c/b/c.smali
index 170ce1311a..aff4ae043f 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/c.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field public final km:[F
+.field public final kl:[F
 
-.field public final kn:[I
+.field public final km:[I
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/b/c;->km:[F
+    iput-object p1, p0, Lcom/airbnb/lottie/c/b/c;->kl:[F
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/d.smali b/com.discord/smali/com/airbnb/lottie/c/b/d.smali
index e6ca2e9114..bc40bec64f 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/d.smali
@@ -7,24 +7,24 @@
 
 
 # instance fields
-.field public final hH:Z
+.field public final hG:Z
 
-.field public final kf:Lcom/airbnb/lottie/c/a/d;
+.field public final ke:Lcom/airbnb/lottie/c/a/d;
 
-.field public final ko:I
+.field public final kn:I
 
-.field public final kp:Landroid/graphics/Path$FillType;
+.field public final ko:Landroid/graphics/Path$FillType;
 
-.field public final kq:Lcom/airbnb/lottie/c/a/c;
+.field public final kp:Lcom/airbnb/lottie/c/a/c;
+
+.field public final kq:Lcom/airbnb/lottie/c/a/f;
 
 .field public final kr:Lcom/airbnb/lottie/c/a/f;
 
-.field public final ks:Lcom/airbnb/lottie/c/a/f;
+.field private final ks:Lcom/airbnb/lottie/c/a/b;
 
 .field private final kt:Lcom/airbnb/lottie/c/a/b;
 
-.field private final ku:Lcom/airbnb/lottie/c/a/b;
-
 .field public final name:Ljava/lang/String;
 
 
@@ -34,27 +34,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p2, p0, Lcom/airbnb/lottie/c/b/d;->ko:I
+    iput p2, p0, Lcom/airbnb/lottie/c/b/d;->kn:I
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/d;->kp:Landroid/graphics/Path$FillType;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/d;->ko:Landroid/graphics/Path$FillType;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/d;->kq:Lcom/airbnb/lottie/c/a/c;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/d;->kp:Lcom/airbnb/lottie/c/a/c;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/d;->kf:Lcom/airbnb/lottie/c/a/d;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/d;->ke:Lcom/airbnb/lottie/c/a/d;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/c/b/d;->kr:Lcom/airbnb/lottie/c/a/f;
+    iput-object p6, p0, Lcom/airbnb/lottie/c/b/d;->kq:Lcom/airbnb/lottie/c/a/f;
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/b/d;->ks:Lcom/airbnb/lottie/c/a/f;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/b/d;->kr:Lcom/airbnb/lottie/c/a/f;
 
     iput-object p1, p0, Lcom/airbnb/lottie/c/b/d;->name:Ljava/lang/String;
 
     const/4 p1, 0x0
 
+    iput-object p1, p0, Lcom/airbnb/lottie/c/b/d;->ks:Lcom/airbnb/lottie/c/a/b;
+
     iput-object p1, p0, Lcom/airbnb/lottie/c/b/d;->kt:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/b/d;->ku:Lcom/airbnb/lottie/c/a/b;
-
-    iput-boolean p8, p0, Lcom/airbnb/lottie/c/b/d;->hH:Z
+    iput-boolean p8, p0, Lcom/airbnb/lottie/c/b/d;->hG:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/e.smali b/com.discord/smali/com/airbnb/lottie/c/b/e.smali
index 482622d106..dfbece8b8e 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/e.smali
@@ -7,29 +7,27 @@
 
 
 # instance fields
-.field public final hH:Z
+.field public final hG:Z
 
-.field public final kA:Lcom/airbnb/lottie/c/a/b;
+.field public final ke:Lcom/airbnb/lottie/c/a/d;
 
-.field public final kf:Lcom/airbnb/lottie/c/a/d;
+.field public final kn:I
 
-.field public final ko:I
+.field public final kp:Lcom/airbnb/lottie/c/a/c;
 
-.field public final kq:Lcom/airbnb/lottie/c/a/c;
+.field public final kq:Lcom/airbnb/lottie/c/a/f;
 
 .field public final kr:Lcom/airbnb/lottie/c/a/f;
 
-.field public final ks:Lcom/airbnb/lottie/c/a/f;
+.field public final ku:Lcom/airbnb/lottie/c/a/b;
 
-.field public final kv:Lcom/airbnb/lottie/c/a/b;
+.field public final kv:Lcom/airbnb/lottie/c/b/p$a;
 
-.field public final kw:Lcom/airbnb/lottie/c/b/p$a;
+.field public final kw:Lcom/airbnb/lottie/c/b/p$b;
 
-.field public final kx:Lcom/airbnb/lottie/c/b/p$b;
+.field public final kx:F
 
-.field public final ky:F
-
-.field public final kz:Ljava/util/List;
+.field public final ky:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -39,6 +37,8 @@
     .end annotation
 .end field
 
+.field public final kz:Lcom/airbnb/lottie/c/a/b;
+
 .field public final name:Ljava/lang/String;
 
 
@@ -70,29 +70,29 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/c/b/e;->name:Ljava/lang/String;
 
-    iput p2, p0, Lcom/airbnb/lottie/c/b/e;->ko:I
+    iput p2, p0, Lcom/airbnb/lottie/c/b/e;->kn:I
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/e;->kq:Lcom/airbnb/lottie/c/a/c;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/e;->kp:Lcom/airbnb/lottie/c/a/c;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/e;->kf:Lcom/airbnb/lottie/c/a/d;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/e;->ke:Lcom/airbnb/lottie/c/a/d;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/e;->kr:Lcom/airbnb/lottie/c/a/f;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/e;->kq:Lcom/airbnb/lottie/c/a/f;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/c/b/e;->ks:Lcom/airbnb/lottie/c/a/f;
+    iput-object p6, p0, Lcom/airbnb/lottie/c/b/e;->kr:Lcom/airbnb/lottie/c/a/f;
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/b/e;->kv:Lcom/airbnb/lottie/c/a/b;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/b/e;->ku:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p8, p0, Lcom/airbnb/lottie/c/b/e;->kw:Lcom/airbnb/lottie/c/b/p$a;
+    iput-object p8, p0, Lcom/airbnb/lottie/c/b/e;->kv:Lcom/airbnb/lottie/c/b/p$a;
 
-    iput-object p9, p0, Lcom/airbnb/lottie/c/b/e;->kx:Lcom/airbnb/lottie/c/b/p$b;
+    iput-object p9, p0, Lcom/airbnb/lottie/c/b/e;->kw:Lcom/airbnb/lottie/c/b/p$b;
 
-    iput p10, p0, Lcom/airbnb/lottie/c/b/e;->ky:F
+    iput p10, p0, Lcom/airbnb/lottie/c/b/e;->kx:F
 
-    iput-object p11, p0, Lcom/airbnb/lottie/c/b/e;->kz:Ljava/util/List;
+    iput-object p11, p0, Lcom/airbnb/lottie/c/b/e;->ky:Ljava/util/List;
 
-    iput-object p12, p0, Lcom/airbnb/lottie/c/b/e;->kA:Lcom/airbnb/lottie/c/a/b;
+    iput-object p12, p0, Lcom/airbnb/lottie/c/b/e;->kz:Lcom/airbnb/lottie/c/a/b;
 
-    iput-boolean p13, p0, Lcom/airbnb/lottie/c/b/e;->hH:Z
+    iput-boolean p13, p0, Lcom/airbnb/lottie/c/b/e;->hG:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/f.smali b/com.discord/smali/com/airbnb/lottie/c/b/f.smali
index b7a38945f6..7b1b85bddf 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/f.smali
@@ -14,11 +14,11 @@
 
 
 # static fields
-.field public static final kB:I = 0x1
+.field public static final kA:I = 0x1
 
-.field public static final kC:I = 0x2
+.field public static final kB:I = 0x2
 
-.field private static final synthetic kD:[I
+.field private static final synthetic kC:[I
 
 
 # direct methods
@@ -29,19 +29,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/b/f;->kB:I
+    sget v1, Lcom/airbnb/lottie/c/b/f;->kA:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b/f;->kC:I
+    sget v1, Lcom/airbnb/lottie/c/b/f;->kB:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/f;->kD:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b/f;->kC:[I
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/g$a.smali b/com.discord/smali/com/airbnb/lottie/c/b/g$a.smali
index a63d475f8b..7e0e0a12d4 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/g$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/g$a.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
-.field public static final kH:I = 0x1
+.field public static final kG:I = 0x1
 
-.field public static final kI:I = 0x2
+.field public static final kH:I = 0x2
 
-.field public static final kJ:I = 0x3
+.field public static final kI:I = 0x3
 
-.field private static final synthetic kK:[I
+.field private static final synthetic kJ:[I
 
 
 # direct methods
@@ -40,25 +40,25 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/b/g$a;->kH:I
+    sget v1, Lcom/airbnb/lottie/c/b/g$a;->kG:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b/g$a;->kI:I
+    sget v1, Lcom/airbnb/lottie/c/b/g$a;->kH:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b/g$a;->kJ:I
+    sget v1, Lcom/airbnb/lottie/c/b/g$a;->kI:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/g$a;->kK:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b/g$a;->kJ:[I
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 .method public static br()[I
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/c/b/g$a;->kK:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/g$a;->kJ:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/g.smali b/com.discord/smali/com/airbnb/lottie/c/b/g.smali
index 5b20a78b0a..3d5b4cabcb 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/g.smali
@@ -12,13 +12,13 @@
 
 
 # instance fields
-.field public final kE:I
+.field public final kD:I
 
-.field public final kF:Lcom/airbnb/lottie/c/a/h;
+.field public final kE:Lcom/airbnb/lottie/c/a/h;
 
-.field public final kG:Z
+.field public final kF:Z
 
-.field public final kf:Lcom/airbnb/lottie/c/a/d;
+.field public final ke:Lcom/airbnb/lottie/c/a/d;
 
 
 # direct methods
@@ -27,13 +27,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/airbnb/lottie/c/b/g;->kE:I
+    iput p1, p0, Lcom/airbnb/lottie/c/b/g;->kD:I
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/b/g;->kF:Lcom/airbnb/lottie/c/a/h;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/g;->kE:Lcom/airbnb/lottie/c/a/h;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/g;->kf:Lcom/airbnb/lottie/c/a/d;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/g;->ke:Lcom/airbnb/lottie/c/a/d;
 
-    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/g;->kG:Z
+    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/g;->kF:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/h$a.smali b/com.discord/smali/com/airbnb/lottie/c/b/h$a.smali
index b7bf8026bc..4befc339db 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/h$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/h$a.smali
@@ -23,6 +23,8 @@
 
 
 # static fields
+.field public static final enum kL:Lcom/airbnb/lottie/c/b/h$a;
+
 .field public static final enum kM:Lcom/airbnb/lottie/c/b/h$a;
 
 .field public static final enum kN:Lcom/airbnb/lottie/c/b/h$a;
@@ -31,9 +33,7 @@
 
 .field public static final enum kP:Lcom/airbnb/lottie/c/b/h$a;
 
-.field public static final enum kQ:Lcom/airbnb/lottie/c/b/h$a;
-
-.field private static final synthetic kR:[Lcom/airbnb/lottie/c/b/h$a;
+.field private static final synthetic kQ:[Lcom/airbnb/lottie/c/b/h$a;
 
 
 # direct methods
@@ -48,7 +48,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/airbnb/lottie/c/b/h$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->kM:Lcom/airbnb/lottie/c/b/h$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->kL:Lcom/airbnb/lottie/c/b/h$a;
 
     new-instance v0, Lcom/airbnb/lottie/c/b/h$a;
 
@@ -58,7 +58,7 @@
 
     invoke-direct {v0, v3, v2}, Lcom/airbnb/lottie/c/b/h$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->kN:Lcom/airbnb/lottie/c/b/h$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->kM:Lcom/airbnb/lottie/c/b/h$a;
 
     new-instance v0, Lcom/airbnb/lottie/c/b/h$a;
 
@@ -68,7 +68,7 @@
 
     invoke-direct {v0, v4, v3}, Lcom/airbnb/lottie/c/b/h$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->kO:Lcom/airbnb/lottie/c/b/h$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->kN:Lcom/airbnb/lottie/c/b/h$a;
 
     new-instance v0, Lcom/airbnb/lottie/c/b/h$a;
 
@@ -78,7 +78,7 @@
 
     invoke-direct {v0, v5, v4}, Lcom/airbnb/lottie/c/b/h$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->kP:Lcom/airbnb/lottie/c/b/h$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->kO:Lcom/airbnb/lottie/c/b/h$a;
 
     new-instance v0, Lcom/airbnb/lottie/c/b/h$a;
 
@@ -88,33 +88,33 @@
 
     invoke-direct {v0, v6, v5}, Lcom/airbnb/lottie/c/b/h$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->kQ:Lcom/airbnb/lottie/c/b/h$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->kP:Lcom/airbnb/lottie/c/b/h$a;
 
     const/4 v0, 0x5
 
     new-array v0, v0, [Lcom/airbnb/lottie/c/b/h$a;
 
-    sget-object v6, Lcom/airbnb/lottie/c/b/h$a;->kM:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v6, Lcom/airbnb/lottie/c/b/h$a;->kL:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v6, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kN:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kM:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kO:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kN:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kP:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kO:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kQ:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->kP:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v1, v0, v5
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->kR:[Lcom/airbnb/lottie/c/b/h$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->kQ:[Lcom/airbnb/lottie/c/b/h$a;
 
     return-void
 .end method
@@ -155,34 +155,34 @@
 
     if-eq p0, v0, :cond_0
 
-    sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->kM:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->kL:Lcom/airbnb/lottie/c/b/h$a;
 
     return-object p0
 
     :cond_0
-    sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->kQ:Lcom/airbnb/lottie/c/b/h$a;
-
-    return-object p0
-
-    :cond_1
     sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->kP:Lcom/airbnb/lottie/c/b/h$a;
 
     return-object p0
 
-    :cond_2
+    :cond_1
     sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->kO:Lcom/airbnb/lottie/c/b/h$a;
 
     return-object p0
 
-    :cond_3
+    :cond_2
     sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->kN:Lcom/airbnb/lottie/c/b/h$a;
 
     return-object p0
 
-    :cond_4
+    :cond_3
     sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->kM:Lcom/airbnb/lottie/c/b/h$a;
 
     return-object p0
+
+    :cond_4
+    sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->kL:Lcom/airbnb/lottie/c/b/h$a;
+
+    return-object p0
 .end method
 
 .method public static valueOf(Ljava/lang/String;)Lcom/airbnb/lottie/c/b/h$a;
@@ -202,7 +202,7 @@
 .method public static values()[Lcom/airbnb/lottie/c/b/h$a;
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/c/b/h$a;->kR:[Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v0, Lcom/airbnb/lottie/c/b/h$a;->kQ:[Lcom/airbnb/lottie/c/b/h$a;
 
     invoke-virtual {v0}, [Lcom/airbnb/lottie/c/b/h$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/h.smali b/com.discord/smali/com/airbnb/lottie/c/b/h.smali
index 4c67ff76c2..b4cb8231fe 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/h.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field public final hH:Z
+.field public final hG:Z
 
-.field public final kL:Lcom/airbnb/lottie/c/b/h$a;
+.field public final kK:Lcom/airbnb/lottie/c/b/h$a;
 
 .field public final name:Ljava/lang/String;
 
@@ -30,9 +30,9 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/c/b/h;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/b/h;->kL:Lcom/airbnb/lottie/c/b/h$a;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/h;->kK:Lcom/airbnb/lottie/c/b/h$a;
 
-    iput-boolean p3, p0, Lcom/airbnb/lottie/c/b/h;->hH:Z
+    iput-boolean p3, p0, Lcom/airbnb/lottie/c/b/h;->hG:Z
 
     return-void
 .end method
@@ -42,7 +42,7 @@
 .method public final a(Lcom/airbnb/lottie/f;Lcom/airbnb/lottie/c/c/a;)Lcom/airbnb/lottie/a/a/c;
     .locals 0
 
-    iget-boolean p1, p1, Lcom/airbnb/lottie/f;->gl:Z
+    iget-boolean p1, p1, Lcom/airbnb/lottie/f;->gk:Z
 
     if-nez p1, :cond_0
 
@@ -71,7 +71,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/b/h;->kL:Lcom/airbnb/lottie/c/b/h$a;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/h;->kK:Lcom/airbnb/lottie/c/b/h$a;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/i$a.smali b/com.discord/smali/com/airbnb/lottie/c/b/i$a.smali
index b7382ef92f..82d24286bc 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/i$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/i$a.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
+.field public static final enum kW:Lcom/airbnb/lottie/c/b/i$a;
+
 .field public static final enum kX:Lcom/airbnb/lottie/c/b/i$a;
 
-.field public static final enum kY:Lcom/airbnb/lottie/c/b/i$a;
-
-.field private static final synthetic kZ:[Lcom/airbnb/lottie/c/b/i$a;
+.field private static final synthetic kY:[Lcom/airbnb/lottie/c/b/i$a;
 
 
 # instance fields
@@ -48,7 +48,7 @@
 
     invoke-direct {v0, v3, v1, v2}, Lcom/airbnb/lottie/c/b/i$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/i$a;->kX:Lcom/airbnb/lottie/c/b/i$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/i$a;->kW:Lcom/airbnb/lottie/c/b/i$a;
 
     new-instance v0, Lcom/airbnb/lottie/c/b/i$a;
 
@@ -58,19 +58,19 @@
 
     invoke-direct {v0, v4, v2, v3}, Lcom/airbnb/lottie/c/b/i$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/i$a;->kY:Lcom/airbnb/lottie/c/b/i$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/i$a;->kX:Lcom/airbnb/lottie/c/b/i$a;
 
     new-array v0, v3, [Lcom/airbnb/lottie/c/b/i$a;
 
-    sget-object v3, Lcom/airbnb/lottie/c/b/i$a;->kX:Lcom/airbnb/lottie/c/b/i$a;
+    sget-object v3, Lcom/airbnb/lottie/c/b/i$a;->kW:Lcom/airbnb/lottie/c/b/i$a;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/i$a;->kY:Lcom/airbnb/lottie/c/b/i$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/i$a;->kX:Lcom/airbnb/lottie/c/b/i$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/i$a;->kZ:[Lcom/airbnb/lottie/c/b/i$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/i$a;->kY:[Lcom/airbnb/lottie/c/b/i$a;
 
     return-void
 .end method
@@ -140,7 +140,7 @@
 .method public static values()[Lcom/airbnb/lottie/c/b/i$a;
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/c/b/i$a;->kZ:[Lcom/airbnb/lottie/c/b/i$a;
+    sget-object v0, Lcom/airbnb/lottie/c/b/i$a;->kY:[Lcom/airbnb/lottie/c/b/i$a;
 
     invoke-virtual {v0}, [Lcom/airbnb/lottie/c/b/i$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/i.smali b/com.discord/smali/com/airbnb/lottie/c/b/i.smali
index 5d2b9229d9..ab30376ec4 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/i.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/i.smali
@@ -15,9 +15,11 @@
 
 
 # instance fields
-.field public final hH:Z
+.field public final hG:Z
 
-.field public final ie:Lcom/airbnb/lottie/c/b/i$a;
+.field public final ic:Lcom/airbnb/lottie/c/b/i$a;
+
+.field public final kR:Lcom/airbnb/lottie/c/a/b;
 
 .field public final kS:Lcom/airbnb/lottie/c/a/b;
 
@@ -27,9 +29,7 @@
 
 .field public final kV:Lcom/airbnb/lottie/c/a/b;
 
-.field public final kW:Lcom/airbnb/lottie/c/a/b;
-
-.field public final kc:Lcom/airbnb/lottie/c/a/m;
+.field public final kb:Lcom/airbnb/lottie/c/a/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/c/a/m<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field public final ke:Lcom/airbnb/lottie/c/a/b;
+.field public final kd:Lcom/airbnb/lottie/c/a/b;
 
 .field public final name:Ljava/lang/String;
 
@@ -71,23 +71,23 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/c/b/i;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/b/i;->ie:Lcom/airbnb/lottie/c/b/i$a;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/i;->ic:Lcom/airbnb/lottie/c/b/i$a;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/i;->kS:Lcom/airbnb/lottie/c/a/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/i;->kR:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/i;->kc:Lcom/airbnb/lottie/c/a/m;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/i;->kb:Lcom/airbnb/lottie/c/a/m;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/i;->ke:Lcom/airbnb/lottie/c/a/b;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/i;->kd:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/c/b/i;->kT:Lcom/airbnb/lottie/c/a/b;
+    iput-object p6, p0, Lcom/airbnb/lottie/c/b/i;->kS:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/b/i;->kU:Lcom/airbnb/lottie/c/a/b;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/b/i;->kT:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p8, p0, Lcom/airbnb/lottie/c/b/i;->kV:Lcom/airbnb/lottie/c/a/b;
+    iput-object p8, p0, Lcom/airbnb/lottie/c/b/i;->kU:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p9, p0, Lcom/airbnb/lottie/c/b/i;->kW:Lcom/airbnb/lottie/c/a/b;
+    iput-object p9, p0, Lcom/airbnb/lottie/c/b/i;->kV:Lcom/airbnb/lottie/c/a/b;
 
-    iput-boolean p10, p0, Lcom/airbnb/lottie/c/b/i;->hH:Z
+    iput-boolean p10, p0, Lcom/airbnb/lottie/c/b/i;->hG:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/j.smali b/com.discord/smali/com/airbnb/lottie/c/b/j.smali
index 25ad1c07e8..fc850757ae 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/j.smali
@@ -7,9 +7,11 @@
 
 
 # instance fields
-.field public final hH:Z
+.field public final hG:Z
 
-.field public final kc:Lcom/airbnb/lottie/c/a/m;
+.field public final kZ:Lcom/airbnb/lottie/c/a/b;
+
+.field public final kb:Lcom/airbnb/lottie/c/a/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/c/a/m<",
@@ -20,9 +22,7 @@
     .end annotation
 .end field
 
-.field public final kk:Lcom/airbnb/lottie/c/a/f;
-
-.field public final la:Lcom/airbnb/lottie/c/a/b;
+.field public final kj:Lcom/airbnb/lottie/c/a/f;
 
 .field public final name:Ljava/lang/String;
 
@@ -48,13 +48,13 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/c/b/j;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/b/j;->kc:Lcom/airbnb/lottie/c/a/m;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/j;->kb:Lcom/airbnb/lottie/c/a/m;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/j;->kk:Lcom/airbnb/lottie/c/a/f;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/j;->kj:Lcom/airbnb/lottie/c/a/f;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/j;->la:Lcom/airbnb/lottie/c/a/b;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/j;->kZ:Lcom/airbnb/lottie/c/a/b;
 
-    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/j;->hH:Z
+    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/j;->hG:Z
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/b/j;->kc:Lcom/airbnb/lottie/c/a/m;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/j;->kb:Lcom/airbnb/lottie/c/a/m;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -88,7 +88,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/b/j;->kk:Lcom/airbnb/lottie/c/a/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/j;->kj:Lcom/airbnb/lottie/c/a/f;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/k.smali b/com.discord/smali/com/airbnb/lottie/c/b/k.smali
index 3cec3c2333..57e73a02e1 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/k.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/k.smali
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field public final hH:Z
+.field public final hG:Z
+
+.field public final la:Lcom/airbnb/lottie/c/a/b;
 
 .field public final lb:Lcom/airbnb/lottie/c/a/b;
 
-.field public final lc:Lcom/airbnb/lottie/c/a/b;
-
-.field public final ld:Lcom/airbnb/lottie/c/a/l;
+.field public final lc:Lcom/airbnb/lottie/c/a/l;
 
 .field public final name:Ljava/lang/String;
 
@@ -26,13 +26,13 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/c/b/k;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/b/k;->lb:Lcom/airbnb/lottie/c/a/b;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/k;->la:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/k;->lc:Lcom/airbnb/lottie/c/a/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/k;->lb:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/k;->ld:Lcom/airbnb/lottie/c/a/l;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/k;->lc:Lcom/airbnb/lottie/c/a/l;
 
-    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/k;->hH:Z
+    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/k;->hG:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/l.smali b/com.discord/smali/com/airbnb/lottie/c/b/l.smali
index 3598655f52..4cbff73986 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/l.smali
@@ -6,7 +6,7 @@
 # instance fields
 .field public closed:Z
 
-.field public final le:Ljava/util/List;
+.field public final ld:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field public lf:Landroid/graphics/PointF;
+.field public le:Landroid/graphics/PointF;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     return-void
 .end method
@@ -49,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/b/l;->lf:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/b/l;->le:Landroid/graphics/PointF;
 
     iput-boolean p2, p0, Lcom/airbnb/lottie/c/b/l;->closed:Z
 
@@ -57,7 +57,7 @@
 
     invoke-direct {p1, p3}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     return-void
 .end method
@@ -73,7 +73,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/m.smali b/com.discord/smali/com/airbnb/lottie/c/b/m.smali
index 30ba6f0bec..34aef11167 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/m.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/m.smali
@@ -7,15 +7,15 @@
 
 
 # instance fields
-.field public final hH:Z
+.field public final hG:Z
 
-.field public final jX:Lcom/airbnb/lottie/c/a/a;
+.field public final jW:Lcom/airbnb/lottie/c/a/a;
 
-.field public final kf:Lcom/airbnb/lottie/c/a/d;
+.field public final ke:Lcom/airbnb/lottie/c/a/d;
 
-.field public final kp:Landroid/graphics/Path$FillType;
+.field public final ko:Landroid/graphics/Path$FillType;
 
-.field private final lg:Z
+.field private final lf:Z
 
 .field public final name:Ljava/lang/String;
 
@@ -28,15 +28,15 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/c/b/m;->name:Ljava/lang/String;
 
-    iput-boolean p2, p0, Lcom/airbnb/lottie/c/b/m;->lg:Z
+    iput-boolean p2, p0, Lcom/airbnb/lottie/c/b/m;->lf:Z
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/m;->kp:Landroid/graphics/Path$FillType;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/m;->ko:Landroid/graphics/Path$FillType;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/m;->jX:Lcom/airbnb/lottie/c/a/a;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/m;->jW:Lcom/airbnb/lottie/c/a/a;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/m;->kf:Lcom/airbnb/lottie/c/a/d;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/m;->ke:Lcom/airbnb/lottie/c/a/d;
 
-    iput-boolean p6, p0, Lcom/airbnb/lottie/c/b/m;->hH:Z
+    iput-boolean p6, p0, Lcom/airbnb/lottie/c/b/m;->hG:Z
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-boolean v1, p0, Lcom/airbnb/lottie/c/b/m;->lg:Z
+    iget-boolean v1, p0, Lcom/airbnb/lottie/c/b/m;->lf:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/n.smali b/com.discord/smali/com/airbnb/lottie/c/b/n.smali
index 26734b1c6e..9c86731a99 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/n.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/n.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field public final hH:Z
+.field public final hG:Z
 
 .field public final items:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
@@ -41,7 +41,7 @@
 
     iput-object p2, p0, Lcom/airbnb/lottie/c/b/n;->items:Ljava/util/List;
 
-    iput-boolean p3, p0, Lcom/airbnb/lottie/c/b/n;->hH:Z
+    iput-boolean p3, p0, Lcom/airbnb/lottie/c/b/n;->hG:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/o.smali b/com.discord/smali/com/airbnb/lottie/c/b/o.smali
index d78720ab94..14249d18bd 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/o.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/o.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field public final hH:Z
+.field public final hG:Z
 
 .field private final index:I
 
-.field public final lh:Lcom/airbnb/lottie/c/a/h;
+.field public final lg:Lcom/airbnb/lottie/c/a/h;
 
 .field public final name:Ljava/lang/String;
 
@@ -26,9 +26,9 @@
 
     iput p2, p0, Lcom/airbnb/lottie/c/b/o;->index:I
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/o;->lh:Lcom/airbnb/lottie/c/a/h;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/o;->lg:Lcom/airbnb/lottie/c/a/h;
 
-    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/o;->hH:Z
+    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/o;->hG:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/p$1.smali b/com.discord/smali/com/airbnb/lottie/c/b/p$1.smali
index 82976c4203..dc4aad6748 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/p$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/p$1.smali
@@ -15,9 +15,9 @@
 
 
 # static fields
-.field static final synthetic li:[I
+.field static final synthetic lh:[I
 
-.field static final synthetic lj:[I
+.field static final synthetic li:[I
 
 
 # direct methods
@@ -32,14 +32,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/p$1;->lj:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$1;->li:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$1;->lj:[I
+    sget-object v1, Lcom/airbnb/lottie/c/b/p$1;->li:[I
 
-    sget-object v2, Lcom/airbnb/lottie/c/b/p$b;->lq:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v2, Lcom/airbnb/lottie/c/b/p$b;->lp:Lcom/airbnb/lottie/c/b/p$b;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/c/b/p$b;->ordinal()I
 
@@ -53,9 +53,9 @@
     const/4 v1, 0x2
 
     :try_start_1
-    sget-object v2, Lcom/airbnb/lottie/c/b/p$1;->lj:[I
+    sget-object v2, Lcom/airbnb/lottie/c/b/p$1;->li:[I
 
-    sget-object v3, Lcom/airbnb/lottie/c/b/p$b;->lo:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v3, Lcom/airbnb/lottie/c/b/p$b;->ln:Lcom/airbnb/lottie/c/b/p$b;
 
     invoke-virtual {v3}, Lcom/airbnb/lottie/c/b/p$b;->ordinal()I
 
@@ -69,9 +69,9 @@
     const/4 v2, 0x3
 
     :try_start_2
-    sget-object v3, Lcom/airbnb/lottie/c/b/p$1;->lj:[I
+    sget-object v3, Lcom/airbnb/lottie/c/b/p$1;->li:[I
 
-    sget-object v4, Lcom/airbnb/lottie/c/b/p$b;->lp:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v4, Lcom/airbnb/lottie/c/b/p$b;->lo:Lcom/airbnb/lottie/c/b/p$b;
 
     invoke-virtual {v4}, Lcom/airbnb/lottie/c/b/p$b;->ordinal()I
 
@@ -90,12 +90,12 @@
 
     new-array v3, v3, [I
 
-    sput-object v3, Lcom/airbnb/lottie/c/b/p$1;->li:[I
+    sput-object v3, Lcom/airbnb/lottie/c/b/p$1;->lh:[I
 
     :try_start_3
-    sget-object v3, Lcom/airbnb/lottie/c/b/p$1;->li:[I
+    sget-object v3, Lcom/airbnb/lottie/c/b/p$1;->lh:[I
 
-    sget-object v4, Lcom/airbnb/lottie/c/b/p$a;->lk:Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v4, Lcom/airbnb/lottie/c/b/p$a;->lj:Lcom/airbnb/lottie/c/b/p$a;
 
     invoke-virtual {v4}, Lcom/airbnb/lottie/c/b/p$a;->ordinal()I
 
@@ -107,9 +107,9 @@
 
     :catch_3
     :try_start_4
-    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->li:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->lh:[I
 
-    sget-object v3, Lcom/airbnb/lottie/c/b/p$a;->ll:Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v3, Lcom/airbnb/lottie/c/b/p$a;->lk:Lcom/airbnb/lottie/c/b/p$a;
 
     invoke-virtual {v3}, Lcom/airbnb/lottie/c/b/p$a;->ordinal()I
 
@@ -121,9 +121,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->li:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->lh:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$a;->lm:Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/p$a;->ll:Lcom/airbnb/lottie/c/b/p$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/b/p$a;->ordinal()I
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/p$a.smali b/com.discord/smali/com/airbnb/lottie/c/b/p$a.smali
index 6d23cabb0a..61d65a98c9 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/p$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/p$a.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
+.field public static final enum lj:Lcom/airbnb/lottie/c/b/p$a;
+
 .field public static final enum lk:Lcom/airbnb/lottie/c/b/p$a;
 
 .field public static final enum ll:Lcom/airbnb/lottie/c/b/p$a;
 
-.field public static final enum lm:Lcom/airbnb/lottie/c/b/p$a;
-
-.field private static final synthetic ln:[Lcom/airbnb/lottie/c/b/p$a;
+.field private static final synthetic lm:[Lcom/airbnb/lottie/c/b/p$a;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/airbnb/lottie/c/b/p$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/p$a;->lk:Lcom/airbnb/lottie/c/b/p$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$a;->lj:Lcom/airbnb/lottie/c/b/p$a;
 
     new-instance v0, Lcom/airbnb/lottie/c/b/p$a;
 
@@ -54,7 +54,7 @@
 
     invoke-direct {v0, v3, v2}, Lcom/airbnb/lottie/c/b/p$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/p$a;->ll:Lcom/airbnb/lottie/c/b/p$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$a;->lk:Lcom/airbnb/lottie/c/b/p$a;
 
     new-instance v0, Lcom/airbnb/lottie/c/b/p$a;
 
@@ -64,25 +64,25 @@
 
     invoke-direct {v0, v4, v3}, Lcom/airbnb/lottie/c/b/p$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/p$a;->lm:Lcom/airbnb/lottie/c/b/p$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$a;->ll:Lcom/airbnb/lottie/c/b/p$a;
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lcom/airbnb/lottie/c/b/p$a;
 
-    sget-object v4, Lcom/airbnb/lottie/c/b/p$a;->lk:Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v4, Lcom/airbnb/lottie/c/b/p$a;->lj:Lcom/airbnb/lottie/c/b/p$a;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$a;->ll:Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/p$a;->lk:Lcom/airbnb/lottie/c/b/p$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$a;->lm:Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/p$a;->ll:Lcom/airbnb/lottie/c/b/p$a;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/p$a;->ln:[Lcom/airbnb/lottie/c/b/p$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$a;->lm:[Lcom/airbnb/lottie/c/b/p$a;
 
     return-void
 .end method
@@ -117,7 +117,7 @@
 .method public static values()[Lcom/airbnb/lottie/c/b/p$a;
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/c/b/p$a;->ln:[Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$a;->lm:[Lcom/airbnb/lottie/c/b/p$a;
 
     invoke-virtual {v0}, [Lcom/airbnb/lottie/c/b/p$a;->clone()Ljava/lang/Object;
 
@@ -133,7 +133,7 @@
 .method public final bs()Landroid/graphics/Paint$Cap;
     .locals 2
 
-    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->li:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->lh:[I
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/c/b/p$a;->ordinal()I
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/p$b.smali b/com.discord/smali/com/airbnb/lottie/c/b/p$b.smali
index 33e0394a45..a594b64942 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/p$b.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/p$b.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
+.field public static final enum ln:Lcom/airbnb/lottie/c/b/p$b;
+
 .field public static final enum lo:Lcom/airbnb/lottie/c/b/p$b;
 
 .field public static final enum lp:Lcom/airbnb/lottie/c/b/p$b;
 
-.field public static final enum lq:Lcom/airbnb/lottie/c/b/p$b;
-
-.field private static final synthetic lr:[Lcom/airbnb/lottie/c/b/p$b;
+.field private static final synthetic lq:[Lcom/airbnb/lottie/c/b/p$b;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/airbnb/lottie/c/b/p$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/p$b;->lo:Lcom/airbnb/lottie/c/b/p$b;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$b;->ln:Lcom/airbnb/lottie/c/b/p$b;
 
     new-instance v0, Lcom/airbnb/lottie/c/b/p$b;
 
@@ -54,7 +54,7 @@
 
     invoke-direct {v0, v3, v2}, Lcom/airbnb/lottie/c/b/p$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/p$b;->lp:Lcom/airbnb/lottie/c/b/p$b;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$b;->lo:Lcom/airbnb/lottie/c/b/p$b;
 
     new-instance v0, Lcom/airbnb/lottie/c/b/p$b;
 
@@ -64,25 +64,25 @@
 
     invoke-direct {v0, v4, v3}, Lcom/airbnb/lottie/c/b/p$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/p$b;->lq:Lcom/airbnb/lottie/c/b/p$b;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$b;->lp:Lcom/airbnb/lottie/c/b/p$b;
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lcom/airbnb/lottie/c/b/p$b;
 
-    sget-object v4, Lcom/airbnb/lottie/c/b/p$b;->lo:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v4, Lcom/airbnb/lottie/c/b/p$b;->ln:Lcom/airbnb/lottie/c/b/p$b;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$b;->lp:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v1, Lcom/airbnb/lottie/c/b/p$b;->lo:Lcom/airbnb/lottie/c/b/p$b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$b;->lq:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v1, Lcom/airbnb/lottie/c/b/p$b;->lp:Lcom/airbnb/lottie/c/b/p$b;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/p$b;->lr:[Lcom/airbnb/lottie/c/b/p$b;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$b;->lq:[Lcom/airbnb/lottie/c/b/p$b;
 
     return-void
 .end method
@@ -117,7 +117,7 @@
 .method public static values()[Lcom/airbnb/lottie/c/b/p$b;
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/c/b/p$b;->lr:[Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$b;->lq:[Lcom/airbnb/lottie/c/b/p$b;
 
     invoke-virtual {v0}, [Lcom/airbnb/lottie/c/b/p$b;->clone()Ljava/lang/Object;
 
@@ -133,7 +133,7 @@
 .method public final bt()Landroid/graphics/Paint$Join;
     .locals 2
 
-    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->lj:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->li:[I
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/c/b/p$b;->ordinal()I
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/p.smali b/com.discord/smali/com/airbnb/lottie/c/b/p.smali
index 1894eebf79..d7319d0091 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/p.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/p.smali
@@ -16,21 +16,21 @@
 
 
 # instance fields
-.field public final hH:Z
+.field public final hG:Z
 
-.field public final jX:Lcom/airbnb/lottie/c/a/a;
+.field public final jW:Lcom/airbnb/lottie/c/a/a;
 
-.field public final kf:Lcom/airbnb/lottie/c/a/d;
+.field public final ke:Lcom/airbnb/lottie/c/a/d;
 
-.field public final kv:Lcom/airbnb/lottie/c/a/b;
+.field public final ku:Lcom/airbnb/lottie/c/a/b;
 
-.field public final kw:Lcom/airbnb/lottie/c/b/p$a;
+.field public final kv:Lcom/airbnb/lottie/c/b/p$a;
 
-.field public final kx:Lcom/airbnb/lottie/c/b/p$b;
+.field public final kw:Lcom/airbnb/lottie/c/b/p$b;
 
-.field public final ky:F
+.field public final kx:F
 
-.field public final kz:Ljava/util/List;
+.field public final ky:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field public final lc:Lcom/airbnb/lottie/c/a/b;
+.field public final lb:Lcom/airbnb/lottie/c/a/b;
 
 .field public final name:Ljava/lang/String;
 
@@ -69,23 +69,23 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/c/b/p;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/b/p;->lc:Lcom/airbnb/lottie/c/a/b;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/p;->lb:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/p;->kz:Ljava/util/List;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/p;->ky:Ljava/util/List;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/p;->jX:Lcom/airbnb/lottie/c/a/a;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/p;->jW:Lcom/airbnb/lottie/c/a/a;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/p;->kf:Lcom/airbnb/lottie/c/a/d;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/p;->ke:Lcom/airbnb/lottie/c/a/d;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/c/b/p;->kv:Lcom/airbnb/lottie/c/a/b;
+    iput-object p6, p0, Lcom/airbnb/lottie/c/b/p;->ku:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/b/p;->kw:Lcom/airbnb/lottie/c/b/p$a;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/b/p;->kv:Lcom/airbnb/lottie/c/b/p$a;
 
-    iput-object p8, p0, Lcom/airbnb/lottie/c/b/p;->kx:Lcom/airbnb/lottie/c/b/p$b;
+    iput-object p8, p0, Lcom/airbnb/lottie/c/b/p;->kw:Lcom/airbnb/lottie/c/b/p$b;
 
-    iput p9, p0, Lcom/airbnb/lottie/c/b/p;->ky:F
+    iput p9, p0, Lcom/airbnb/lottie/c/b/p;->kx:F
 
-    iput-boolean p10, p0, Lcom/airbnb/lottie/c/b/p;->hH:Z
+    iput-boolean p10, p0, Lcom/airbnb/lottie/c/b/p;->hG:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/q$a.smali b/com.discord/smali/com/airbnb/lottie/c/b/q$a.smali
index 1d9931c65d..0eb974c421 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/q$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/q$a.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
-.field public static final lu:I = 0x1
+.field public static final lt:I = 0x1
 
-.field public static final lv:I = 0x2
+.field public static final lu:I = 0x2
 
-.field private static final synthetic lw:[I
+.field private static final synthetic lv:[I
 
 
 # direct methods
@@ -38,19 +38,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/b/q$a;->lu:I
+    sget v1, Lcom/airbnb/lottie/c/b/q$a;->lt:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b/q$a;->lv:I
+    sget v1, Lcom/airbnb/lottie/c/b/q$a;->lu:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/q$a;->lw:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b/q$a;->lv:[I
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     if-ne p0, v0, :cond_0
 
-    sget p0, Lcom/airbnb/lottie/c/b/q$a;->lv:I
+    sget p0, Lcom/airbnb/lottie/c/b/q$a;->lu:I
 
     return p0
 
@@ -88,7 +88,7 @@
     throw v0
 
     :cond_1
-    sget p0, Lcom/airbnb/lottie/c/b/q$a;->lu:I
+    sget p0, Lcom/airbnb/lottie/c/b/q$a;->lt:I
 
     return p0
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/c/b/q.smali b/com.discord/smali/com/airbnb/lottie/c/b/q.smali
index 1a99634e71..d010a9ac0d 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/q.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/q.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field public final hH:Z
+.field public final hG:Z
 
-.field public final iv:I
+.field public final iu:I
 
-.field public final lc:Lcom/airbnb/lottie/c/a/b;
+.field public final lb:Lcom/airbnb/lottie/c/a/b;
+
+.field public final lr:Lcom/airbnb/lottie/c/a/b;
 
 .field public final ls:Lcom/airbnb/lottie/c/a/b;
 
-.field public final lt:Lcom/airbnb/lottie/c/a/b;
-
 .field public final name:Ljava/lang/String;
 
 
@@ -36,15 +36,15 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/c/b/q;->name:Ljava/lang/String;
 
-    iput p2, p0, Lcom/airbnb/lottie/c/b/q;->iv:I
+    iput p2, p0, Lcom/airbnb/lottie/c/b/q;->iu:I
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/q;->ls:Lcom/airbnb/lottie/c/a/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/q;->lr:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/q;->lt:Lcom/airbnb/lottie/c/a/b;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/q;->ls:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/q;->lc:Lcom/airbnb/lottie/c/a/b;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/q;->lb:Lcom/airbnb/lottie/c/a/b;
 
-    iput-boolean p6, p0, Lcom/airbnb/lottie/c/b/q;->hH:Z
+    iput-boolean p6, p0, Lcom/airbnb/lottie/c/b/q;->hG:Z
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/b/q;->ls:Lcom/airbnb/lottie/c/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/q;->lr:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -78,7 +78,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/b/q;->lt:Lcom/airbnb/lottie/c/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/q;->ls:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -86,7 +86,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/b/q;->lc:Lcom/airbnb/lottie/c/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/q;->lb:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c.smali b/com.discord/smali/com/airbnb/lottie/c/c.smali
index 856d0601bc..8e3170f502 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c.smali
@@ -6,9 +6,9 @@
 # instance fields
 .field private final ascent:F
 
-.field public final jK:Ljava/lang/String;
+.field public final jJ:Ljava/lang/String;
 
-.field public final jL:Ljava/lang/String;
+.field public final jK:Ljava/lang/String;
 
 .field public final name:Ljava/lang/String;
 
@@ -19,11 +19,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c;->jK:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c;->jJ:Ljava/lang/String;
 
     iput-object p2, p0, Lcom/airbnb/lottie/c/c;->name:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/c;->jL:Ljava/lang/String;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/c;->jK:Ljava/lang/String;
 
     iput p4, p0, Lcom/airbnb/lottie/c/c;->ascent:F
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/a$1.smali b/com.discord/smali/com/airbnb/lottie/c/c/a$1.smali
index 48a6f46a65..b7dcd27469 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/a$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/a$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic lO:Lcom/airbnb/lottie/a/b/c;
+.field final synthetic lN:Lcom/airbnb/lottie/a/b/c;
 
-.field final synthetic lP:Lcom/airbnb/lottie/c/c/a;
+.field final synthetic lO:Lcom/airbnb/lottie/c/c/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/c/c/a;Lcom/airbnb/lottie/a/b/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a$1;->lP:Lcom/airbnb/lottie/c/c/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a$1;->lO:Lcom/airbnb/lottie/c/c/a;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/c/a$1;->lO:Lcom/airbnb/lottie/a/b/c;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/a$1;->lN:Lcom/airbnb/lottie/a/b/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aX()V
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a$1;->lP:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a$1;->lO:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a$1;->lO:Lcom/airbnb/lottie/a/b/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a$1;->lN:Lcom/airbnb/lottie/a/b/c;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/c;->bh()F
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/a$2.smali b/com.discord/smali/com/airbnb/lottie/c/c/a$2.smali
index b599f24a46..0459f6205e 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/a$2.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/a$2.smali
@@ -15,9 +15,9 @@
 
 
 # static fields
-.field static final synthetic lQ:[I
+.field static final synthetic lP:[I
 
-.field static final synthetic lR:[I
+.field static final synthetic lQ:[I
 
 
 # direct methods
@@ -32,14 +32,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/a$2;->lR:[I
+    sput-object v0, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/c/c/a$2;->lR:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
 
-    sget v2, Lcom/airbnb/lottie/c/b/g$a;->kI:I
+    sget v2, Lcom/airbnb/lottie/c/b/g$a;->kH:I
 
     sub-int/2addr v2, v0
 
@@ -51,9 +51,9 @@
     const/4 v1, 0x2
 
     :try_start_1
-    sget-object v2, Lcom/airbnb/lottie/c/c/a$2;->lR:[I
+    sget-object v2, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
 
-    sget v3, Lcom/airbnb/lottie/c/b/g$a;->kJ:I
+    sget v3, Lcom/airbnb/lottie/c/b/g$a;->kI:I
 
     sub-int/2addr v3, v0
 
@@ -65,9 +65,9 @@
     const/4 v2, 0x3
 
     :try_start_2
-    sget-object v3, Lcom/airbnb/lottie/c/c/a$2;->lR:[I
+    sget-object v3, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
 
-    sget v4, Lcom/airbnb/lottie/c/b/g$a;->kH:I
+    sget v4, Lcom/airbnb/lottie/c/b/g$a;->kG:I
 
     sub-int/2addr v4, v0
 
@@ -84,12 +84,12 @@
 
     new-array v3, v3, [I
 
-    sput-object v3, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
+    sput-object v3, Lcom/airbnb/lottie/c/c/a$2;->lP:[I
 
     :try_start_3
-    sget-object v3, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
+    sget-object v3, Lcom/airbnb/lottie/c/c/a$2;->lP:[I
 
-    sget-object v4, Lcom/airbnb/lottie/c/c/d$a;->mr:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v4, Lcom/airbnb/lottie/c/c/d$a;->mq:Lcom/airbnb/lottie/c/c/d$a;
 
     invoke-virtual {v4}, Lcom/airbnb/lottie/c/c/d$a;->ordinal()I
 
@@ -101,9 +101,9 @@
 
     :catch_3
     :try_start_4
-    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->lP:[I
 
-    sget-object v3, Lcom/airbnb/lottie/c/c/d$a;->mn:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v3, Lcom/airbnb/lottie/c/c/d$a;->mm:Lcom/airbnb/lottie/c/c/d$a;
 
     invoke-virtual {v3}, Lcom/airbnb/lottie/c/c/d$a;->ordinal()I
 
@@ -115,9 +115,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->lP:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mo:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mn:Lcom/airbnb/lottie/c/c/d$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/c/d$a;->ordinal()I
 
@@ -129,9 +129,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->lP:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mp:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mo:Lcom/airbnb/lottie/c/c/d$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/c/d$a;->ordinal()I
 
@@ -145,9 +145,9 @@
 
     :catch_6
     :try_start_7
-    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->lP:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mq:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mp:Lcom/airbnb/lottie/c/c/d$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/c/d$a;->ordinal()I
 
@@ -161,9 +161,9 @@
 
     :catch_7
     :try_start_8
-    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->lP:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->ms:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mr:Lcom/airbnb/lottie/c/c/d$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/c/d$a;->ordinal()I
 
@@ -177,9 +177,9 @@
 
     :catch_8
     :try_start_9
-    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->lP:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mt:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->ms:Lcom/airbnb/lottie/c/c/d$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/c/d$a;->ordinal()I
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/a.smali b/com.discord/smali/com/airbnb/lottie/c/c/a.smali
index 21b43cb2f3..24fc2b9d9e 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/a.smali
@@ -9,33 +9,31 @@
 
 
 # instance fields
-.field final fs:Lcom/airbnb/lottie/f;
+.field final fr:Lcom/airbnb/lottie/f;
 
-.field final ir:Lcom/airbnb/lottie/a/b/o;
+.field final iq:Lcom/airbnb/lottie/a/b/o;
 
 .field private final lA:Landroid/graphics/Paint;
 
-.field private final lB:Landroid/graphics/Paint;
+.field private final lB:Landroid/graphics/RectF;
 
 .field private final lC:Landroid/graphics/RectF;
 
 .field private final lD:Landroid/graphics/RectF;
 
-.field private final lE:Landroid/graphics/RectF;
+.field private final lE:Ljava/lang/String;
 
-.field private final lF:Ljava/lang/String;
+.field final lF:Landroid/graphics/Matrix;
 
-.field final lG:Landroid/graphics/Matrix;
+.field final lG:Lcom/airbnb/lottie/c/c/d;
 
-.field final lH:Lcom/airbnb/lottie/c/c/d;
+.field private lH:Lcom/airbnb/lottie/a/b/g;
 
-.field private lI:Lcom/airbnb/lottie/a/b/g;
+.field lI:Lcom/airbnb/lottie/c/c/a;
 
 .field lJ:Lcom/airbnb/lottie/c/c/a;
 
-.field lK:Lcom/airbnb/lottie/c/c/a;
-
-.field private lL:Ljava/util/List;
+.field private lK:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -45,7 +43,7 @@
     .end annotation
 .end field
 
-.field private final lM:Ljava/util/List;
+.field private final lL:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -55,7 +53,9 @@
     .end annotation
 .end field
 
-.field private lN:Z
+.field private lM:Z
+
+.field private final lw:Landroid/graphics/Paint;
 
 .field private final lx:Landroid/graphics/Paint;
 
@@ -94,7 +94,7 @@
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/a;-><init>(I)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lw:Landroid/graphics/Paint;
 
     new-instance v0, Lcom/airbnb/lottie/a/a;
 
@@ -104,7 +104,7 @@
 
     invoke-direct {v0, v2, v3}, Lcom/airbnb/lottie/a/a;-><init>(Landroid/graphics/PorterDuff$Mode;B)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ly:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
 
     new-instance v0, Lcom/airbnb/lottie/a/a;
 
@@ -112,13 +112,13 @@
 
     invoke-direct {v0, v2, v3}, Lcom/airbnb/lottie/a/a;-><init>(Landroid/graphics/PorterDuff$Mode;B)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lz:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ly:Landroid/graphics/Paint;
 
     new-instance v0, Lcom/airbnb/lottie/a/a;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/a;-><init>(I)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lA:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lz:Landroid/graphics/Paint;
 
     new-instance v0, Lcom/airbnb/lottie/a/a;
 
@@ -126,7 +126,7 @@
 
     invoke-direct {v0, v2}, Lcom/airbnb/lottie/a/a;-><init>(Landroid/graphics/PorterDuff$Mode;)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lB:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lA:Landroid/graphics/Paint;
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -138,6 +138,12 @@
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lB:Landroid/graphics/RectF;
+
+    new-instance v0, Landroid/graphics/RectF;
+
+    invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
+
     iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lC:Landroid/graphics/RectF;
 
     new-instance v0, Landroid/graphics/RectF;
@@ -146,35 +152,29 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lD:Landroid/graphics/RectF;
 
-    new-instance v0, Landroid/graphics/RectF;
-
-    invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
-
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lE:Landroid/graphics/RectF;
-
     new-instance v0, Landroid/graphics/Matrix;
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lG:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lF:Landroid/graphics/Matrix;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lM:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lL:Ljava/util/List;
 
-    iput-boolean v1, p0, Lcom/airbnb/lottie/c/c/a;->lN:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/c/c/a;->lM:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->fr:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
     new-instance p1, Ljava/lang/StringBuilder;
 
     invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v0, p2, Lcom/airbnb/lottie/c/c/d;->lX:Ljava/lang/String;
+    iget-object v0, p2, Lcom/airbnb/lottie/c/c/d;->lW:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -186,15 +186,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lF:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lE:Ljava/lang/String;
 
-    iget p1, p2, Lcom/airbnb/lottie/c/c/d;->mm:I
+    iget p1, p2, Lcom/airbnb/lottie/c/c/d;->ml:I
 
-    sget v0, Lcom/airbnb/lottie/c/c/d$b;->mx:I
+    sget v0, Lcom/airbnb/lottie/c/c/d$b;->mw:I
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lA:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lz:Landroid/graphics/Paint;
 
     new-instance v0, Landroid/graphics/PorterDuffXfermode;
 
@@ -207,7 +207,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lA:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lz:Landroid/graphics/Paint;
 
     new-instance v0, Landroid/graphics/PorterDuffXfermode;
 
@@ -218,23 +218,23 @@
     invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setXfermode(Landroid/graphics/Xfermode;)Landroid/graphics/Xfermode;
 
     :goto_0
-    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->ld:Lcom/airbnb/lottie/c/a/l;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->lc:Lcom/airbnb/lottie/c/a/l;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/l;->bq()Lcom/airbnb/lottie/a/b/o;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->ir:Lcom/airbnb/lottie/a/b/o;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->iq:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->iq:Lcom/airbnb/lottie/a/b/o;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/o;->a(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->iL:Ljava/util/List;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->iK:Ljava/util/List;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->iL:Ljava/util/List;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->iK:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
@@ -244,15 +244,15 @@
 
     new-instance p1, Lcom/airbnb/lottie/a/b/g;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->iL:Ljava/util/List;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->iK:Ljava/util/List;
 
     invoke-direct {p1, p2}, Lcom/airbnb/lottie/a/b/g;-><init>(Ljava/util/List;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/a/b/g;->iJ:Ljava/util/List;
+    iget-object p1, p1, Lcom/airbnb/lottie/a/b/g;->iI:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -276,9 +276,9 @@
     goto :goto_1
 
     :cond_1
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/a/b/g;->iK:Ljava/util/List;
+    iget-object p1, p1, Lcom/airbnb/lottie/a/b/g;->iJ:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -304,9 +304,9 @@
     goto :goto_2
 
     :cond_2
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/c/d;->ml:Ljava/util/List;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/c/d;->mk:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
@@ -316,13 +316,13 @@
 
     new-instance p1, Lcom/airbnb/lottie/a/b/c;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->ml:Ljava/util/List;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->mk:Ljava/util/List;
 
     invoke-direct {p1, p2}, Lcom/airbnb/lottie/a/b/c;-><init>(Ljava/util/List;)V
 
-    iput-boolean v1, p1, Lcom/airbnb/lottie/a/b/a;->iz:Z
+    iput-boolean v1, p1, Lcom/airbnb/lottie/a/b/a;->iy:Z
 
     new-instance p2, Lcom/airbnb/lottie/c/c/a$1;
 
@@ -397,7 +397,7 @@
 
     add-float v7, v1, v2
 
-    iget-object v8, p0, Lcom/airbnb/lottie/c/c/a;->lB:Landroid/graphics/Paint;
+    iget-object v8, p0, Lcom/airbnb/lottie/c/c/a;->lA:Landroid/graphics/Paint;
 
     move-object v3, p1
 
@@ -440,15 +440,15 @@
 .method private b(F)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->fG:Lcom/airbnb/lottie/m;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->fF:Lcom/airbnb/lottie/m;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/c/c/d;->lX:Ljava/lang/String;
+    iget-object v1, v1, Lcom/airbnb/lottie/c/c/d;->lW:Ljava/lang/String;
 
     invoke-virtual {v0, v1, p1}, Lcom/airbnb/lottie/m;->a(Ljava/lang/String;F)V
 
@@ -458,7 +458,7 @@
 .method private bu()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lJ:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/c/c/a;
 
     if-eqz v0, :cond_0
 
@@ -475,11 +475,11 @@
 .method private bv()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/a/b/g;->iJ:Ljava/util/List;
+    iget-object v0, v0, Lcom/airbnb/lottie/a/b/g;->iI:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -500,14 +500,14 @@
 .method private bw()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lL:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lK:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lK:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lJ:Lcom/airbnb/lottie/c/c/a;
 
     if-nez v0, :cond_1
 
@@ -515,7 +515,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lL:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lK:Ljava/util/List;
 
     return-void
 
@@ -524,18 +524,18 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lL:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lK:Ljava/util/List;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lK:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lJ:Lcom/airbnb/lottie/c/c/a;
 
     :goto_0
     if-eqz v0, :cond_2
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a;->lL:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a;->lK:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/a;->lK:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/a;->lJ:Lcom/airbnb/lottie/c/c/a;
 
     goto :goto_0
 
@@ -554,17 +554,17 @@
 
     move-object/from16 v2, p2
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->lF:Ljava/lang/String;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->lE:Ljava/lang/String;
 
     invoke-static {v3}, Lcom/airbnb/lottie/c;->beginSection(Ljava/lang/String;)V
 
-    iget-boolean v3, v0, Lcom/airbnb/lottie/c/c/a;->lN:Z
+    iget-boolean v3, v0, Lcom/airbnb/lottie/c/c/a;->lM:Z
 
     if-eqz v3, :cond_15
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget-boolean v3, v3, Lcom/airbnb/lottie/c/c/d;->hH:Z
+    iget-boolean v3, v3, Lcom/airbnb/lottie/c/c/d;->hG:Z
 
     if-eqz v3, :cond_0
 
@@ -585,7 +585,7 @@
 
     invoke-virtual {v4, v2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-object v4, v0, Lcom/airbnb/lottie/c/c/a;->lL:Ljava/util/List;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/c/a;->lK:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -600,7 +600,7 @@
 
     iget-object v6, v0, Lcom/airbnb/lottie/c/c/a;->matrix:Landroid/graphics/Matrix;
 
-    iget-object v7, v0, Lcom/airbnb/lottie/c/c/a;->lL:Ljava/util/List;
+    iget-object v7, v0, Lcom/airbnb/lottie/c/c/a;->lK:Ljava/util/List;
 
     invoke-interface {v7, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -608,7 +608,7 @@
 
     check-cast v7, Lcom/airbnb/lottie/c/c/a;
 
-    iget-object v7, v7, Lcom/airbnb/lottie/c/c/a;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v7, v7, Lcom/airbnb/lottie/c/c/a;->iq:Lcom/airbnb/lottie/a/b/o;
 
     invoke-virtual {v7}, Lcom/airbnb/lottie/a/b/o;->getMatrix()Landroid/graphics/Matrix;
 
@@ -623,9 +623,9 @@
     :cond_1
     invoke-static {v3}, Lcom/airbnb/lottie/c;->q(Ljava/lang/String;)F
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->iq:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v3, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     if-nez v3, :cond_2
 
@@ -638,9 +638,9 @@
     goto :goto_1
 
     :cond_2
-    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->iq:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v3, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v3}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -691,7 +691,7 @@
 
     iget-object v2, v0, Lcom/airbnb/lottie/c/c/a;->matrix:Landroid/graphics/Matrix;
 
-    iget-object v4, v0, Lcom/airbnb/lottie/c/c/a;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/c/a;->iq:Lcom/airbnb/lottie/a/b/o;
 
     invoke-virtual {v4}, Lcom/airbnb/lottie/a/b/o;->getMatrix()Landroid/graphics/Matrix;
 
@@ -707,7 +707,7 @@
 
     invoke-static {v6}, Lcom/airbnb/lottie/c;->q(Ljava/lang/String;)F
 
-    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->lF:Ljava/lang/String;
+    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->lE:Ljava/lang/String;
 
     invoke-static {v1}, Lcom/airbnb/lottie/c;->q(Ljava/lang/String;)F
 
@@ -740,25 +740,25 @@
 
     if-eqz v8, :cond_4
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v8, v8, Lcom/airbnb/lottie/c/c/d;->mm:I
+    iget v8, v8, Lcom/airbnb/lottie/c/c/d;->ml:I
 
-    sget v11, Lcom/airbnb/lottie/c/c/d$b;->mx:I
+    sget v11, Lcom/airbnb/lottie/c/c/d$b;->mw:I
 
     if-eq v8, v11, :cond_4
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lD:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lC:Landroid/graphics/RectF;
 
     invoke-virtual {v8, v10, v10, v10, v10}, Landroid/graphics/RectF;->set(FFFF)V
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lJ:Lcom/airbnb/lottie/c/c/a;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lD:Landroid/graphics/RectF;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lC:Landroid/graphics/RectF;
 
     invoke-virtual {v8, v11, v2, v5}, Lcom/airbnb/lottie/c/c/a;->a(Landroid/graphics/RectF;Landroid/graphics/Matrix;Z)V
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lD:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lC:Landroid/graphics/RectF;
 
     invoke-virtual {v7, v8}, Landroid/graphics/RectF;->intersect(Landroid/graphics/RectF;)Z
 
@@ -771,7 +771,7 @@
     :cond_4
     iget-object v7, v0, Lcom/airbnb/lottie/c/c/a;->matrix:Landroid/graphics/Matrix;
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->iq:Lcom/airbnb/lottie/a/b/o;
 
     invoke-virtual {v8}, Lcom/airbnb/lottie/a/b/o;->getMatrix()Landroid/graphics/Matrix;
 
@@ -783,7 +783,7 @@
 
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->matrix:Landroid/graphics/Matrix;
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lC:Landroid/graphics/RectF;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lB:Landroid/graphics/RectF;
 
     invoke-virtual {v11, v10, v10, v10, v10}, Landroid/graphics/RectF;->set(FFFF)V
 
@@ -797,9 +797,9 @@
 
     if-eqz v11, :cond_8
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v11, v11, Lcom/airbnb/lottie/a/b/g;->iL:Ljava/util/List;
+    iget-object v11, v11, Lcom/airbnb/lottie/a/b/g;->iK:Ljava/util/List;
 
     invoke-interface {v11}, Ljava/util/List;->size()I
 
@@ -810,9 +810,9 @@
     :goto_2
     if-ge v14, v11, :cond_7
 
-    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v15, v15, Lcom/airbnb/lottie/a/b/g;->iL:Ljava/util/List;
+    iget-object v15, v15, Lcom/airbnb/lottie/a/b/g;->iK:Ljava/util/List;
 
     invoke-interface {v15, v14}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -820,9 +820,9 @@
 
     check-cast v15, Lcom/airbnb/lottie/c/b/g;
 
-    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v10, v10, Lcom/airbnb/lottie/a/b/g;->iJ:Ljava/util/List;
+    iget-object v10, v10, Lcom/airbnb/lottie/a/b/g;->iI:Ljava/util/List;
 
     invoke-interface {v10, v14}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -844,9 +844,9 @@
 
     invoke-virtual {v9, v8}, Landroid/graphics/Path;->transform(Landroid/graphics/Matrix;)V
 
-    sget-object v9, Lcom/airbnb/lottie/c/c/a$2;->lR:[I
+    sget-object v9, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
 
-    iget v10, v15, Lcom/airbnb/lottie/c/b/g;->kE:I
+    iget v10, v15, Lcom/airbnb/lottie/c/b/g;->kD:I
 
     sub-int/2addr v10, v5
 
@@ -861,14 +861,14 @@
     goto :goto_3
 
     :cond_5
-    iget-boolean v9, v15, Lcom/airbnb/lottie/c/b/g;->kG:Z
+    iget-boolean v9, v15, Lcom/airbnb/lottie/c/b/g;->kF:Z
 
     if-nez v9, :cond_8
 
     :goto_3
     iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->path:Landroid/graphics/Path;
 
-    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->lE:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->lD:Landroid/graphics/RectF;
 
     const/4 v15, 0x0
 
@@ -876,20 +876,20 @@
 
     if-nez v14, :cond_6
 
-    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lC:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lB:Landroid/graphics/RectF;
 
-    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->lE:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->lD:Landroid/graphics/RectF;
 
     invoke-virtual {v9, v10}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
     goto :goto_4
 
     :cond_6
-    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lC:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lB:Landroid/graphics/RectF;
 
     iget v10, v9, Landroid/graphics/RectF;->left:F
 
-    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->lE:Landroid/graphics/RectF;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->lD:Landroid/graphics/RectF;
 
     iget v15, v15, Landroid/graphics/RectF;->left:F
 
@@ -897,11 +897,11 @@
 
     move-result v10
 
-    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->lC:Landroid/graphics/RectF;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->lB:Landroid/graphics/RectF;
 
     iget v15, v15, Landroid/graphics/RectF;->top:F
 
-    iget-object v12, v0, Lcom/airbnb/lottie/c/c/a;->lE:Landroid/graphics/RectF;
+    iget-object v12, v0, Lcom/airbnb/lottie/c/c/a;->lD:Landroid/graphics/RectF;
 
     iget v12, v12, Landroid/graphics/RectF;->top:F
 
@@ -909,11 +909,11 @@
 
     move-result v12
 
-    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->lC:Landroid/graphics/RectF;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->lB:Landroid/graphics/RectF;
 
     iget v15, v15, Landroid/graphics/RectF;->right:F
 
-    iget-object v13, v0, Lcom/airbnb/lottie/c/c/a;->lE:Landroid/graphics/RectF;
+    iget-object v13, v0, Lcom/airbnb/lottie/c/c/a;->lD:Landroid/graphics/RectF;
 
     iget v13, v13, Landroid/graphics/RectF;->right:F
 
@@ -921,11 +921,11 @@
 
     move-result v13
 
-    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->lC:Landroid/graphics/RectF;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->lB:Landroid/graphics/RectF;
 
     iget v15, v15, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v5, v0, Lcom/airbnb/lottie/c/c/a;->lE:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/a;->lD:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->bottom:F
 
@@ -951,7 +951,7 @@
     goto/16 :goto_2
 
     :cond_7
-    iget-object v5, v0, Lcom/airbnb/lottie/c/c/a;->lC:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/a;->lB:Landroid/graphics/RectF;
 
     invoke-virtual {v7, v5}, Landroid/graphics/RectF;->intersect(Landroid/graphics/RectF;)Z
 
@@ -1010,7 +1010,7 @@
 
     iget-object v5, v0, Lcom/airbnb/lottie/c/c/a;->rect:Landroid/graphics/RectF;
 
-    iget-object v7, v0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
+    iget-object v7, v0, Lcom/airbnb/lottie/c/c/a;->lw:Landroid/graphics/Paint;
 
     const/4 v8, 0x1
 
@@ -1042,7 +1042,7 @@
 
     iget-object v7, v0, Lcom/airbnb/lottie/c/c/a;->rect:Landroid/graphics/RectF;
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->ly:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
 
     const/4 v9, 0x0
 
@@ -1053,9 +1053,9 @@
     const/4 v7, 0x0
 
     :goto_6
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v8, v8, Lcom/airbnb/lottie/a/b/g;->iL:Ljava/util/List;
+    iget-object v8, v8, Lcom/airbnb/lottie/a/b/g;->iK:Ljava/util/List;
 
     invoke-interface {v8}, Ljava/util/List;->size()I
 
@@ -1063,9 +1063,9 @@
 
     if-ge v7, v8, :cond_11
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v8, v8, Lcom/airbnb/lottie/a/b/g;->iL:Ljava/util/List;
+    iget-object v8, v8, Lcom/airbnb/lottie/a/b/g;->iK:Ljava/util/List;
 
     invoke-interface {v8, v7}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1073,9 +1073,9 @@
 
     check-cast v8, Lcom/airbnb/lottie/c/b/g;
 
-    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v9, v9, Lcom/airbnb/lottie/a/b/g;->iJ:Ljava/util/List;
+    iget-object v9, v9, Lcom/airbnb/lottie/a/b/g;->iI:Ljava/util/List;
 
     invoke-interface {v9, v7}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1083,9 +1083,9 @@
 
     check-cast v9, Lcom/airbnb/lottie/a/b/a;
 
-    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v10, v10, Lcom/airbnb/lottie/a/b/g;->iK:Ljava/util/List;
+    iget-object v10, v10, Lcom/airbnb/lottie/a/b/g;->iJ:Ljava/util/List;
 
     invoke-interface {v10, v7}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1093,9 +1093,9 @@
 
     check-cast v10, Lcom/airbnb/lottie/a/b/a;
 
-    sget-object v11, Lcom/airbnb/lottie/c/c/a$2;->lR:[I
+    sget-object v11, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
 
-    iget v12, v8, Lcom/airbnb/lottie/c/b/g;->kE:I
+    iget v12, v8, Lcom/airbnb/lottie/c/b/g;->kD:I
 
     const/4 v13, 0x1
 
@@ -1118,19 +1118,19 @@
     goto/16 :goto_8
 
     :cond_a
-    iget-boolean v8, v8, Lcom/airbnb/lottie/c/b/g;->kG:Z
+    iget-boolean v8, v8, Lcom/airbnb/lottie/c/b/g;->kF:Z
 
     if-eqz v8, :cond_b
 
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->rect:Landroid/graphics/RectF;
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lw:Landroid/graphics/Paint;
 
     invoke-static {v1, v8, v11, v13}, Lcom/airbnb/lottie/c/c/a;->a(Landroid/graphics/Canvas;Landroid/graphics/RectF;Landroid/graphics/Paint;Z)V
 
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->rect:Landroid/graphics/RectF;
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lw:Landroid/graphics/Paint;
 
     invoke-virtual {v1, v8, v11}, Landroid/graphics/Canvas;->drawRect(Landroid/graphics/RectF;Landroid/graphics/Paint;)V
 
@@ -1148,7 +1148,7 @@
 
     invoke-virtual {v8, v5}, Landroid/graphics/Path;->transform(Landroid/graphics/Matrix;)V
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lw:Landroid/graphics/Paint;
 
     invoke-virtual {v10}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -1170,7 +1170,7 @@
 
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->path:Landroid/graphics/Path;
 
-    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lz:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->ly:Landroid/graphics/Paint;
 
     invoke-virtual {v1, v8, v9}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
@@ -1193,7 +1193,7 @@
 
     invoke-virtual {v8, v5}, Landroid/graphics/Path;->transform(Landroid/graphics/Matrix;)V
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lw:Landroid/graphics/Paint;
 
     invoke-virtual {v10}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -1215,7 +1215,7 @@
 
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->path:Landroid/graphics/Path;
 
-    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lw:Landroid/graphics/Paint;
 
     invoke-virtual {v1, v8, v9}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
@@ -1224,13 +1224,13 @@
     :cond_c
     const/4 v15, 0x3
 
-    iget-boolean v8, v8, Lcom/airbnb/lottie/c/b/g;->kG:Z
+    iget-boolean v8, v8, Lcom/airbnb/lottie/c/b/g;->kF:Z
 
     if-eqz v8, :cond_d
 
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->rect:Landroid/graphics/RectF;
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->ly:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
 
     const/4 v13, 0x1
 
@@ -1238,11 +1238,11 @@
 
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->rect:Landroid/graphics/RectF;
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lw:Landroid/graphics/Paint;
 
     invoke-virtual {v1, v8, v11}, Landroid/graphics/Canvas;->drawRect(Landroid/graphics/RectF;Landroid/graphics/Paint;)V
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lz:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->ly:Landroid/graphics/Paint;
 
     invoke-virtual {v10}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -1278,7 +1278,7 @@
 
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->path:Landroid/graphics/Path;
 
-    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lz:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->ly:Landroid/graphics/Paint;
 
     invoke-virtual {v1, v8, v9}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
@@ -1289,7 +1289,7 @@
     :cond_d
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->rect:Landroid/graphics/RectF;
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->ly:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
 
     const/4 v13, 0x1
 
@@ -1309,7 +1309,7 @@
 
     invoke-virtual {v8, v5}, Landroid/graphics/Path;->transform(Landroid/graphics/Matrix;)V
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lw:Landroid/graphics/Paint;
 
     invoke-virtual {v10}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -1331,7 +1331,7 @@
 
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->path:Landroid/graphics/Path;
 
-    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lw:Landroid/graphics/Paint;
 
     invoke-virtual {v1, v8, v9}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
@@ -1362,13 +1362,13 @@
     invoke-virtual {v1, v13, v11}, Landroid/graphics/Canvas;->drawRect(Landroid/graphics/RectF;Landroid/graphics/Paint;)V
 
     :cond_f
-    iget-boolean v8, v8, Lcom/airbnb/lottie/c/b/g;->kG:Z
+    iget-boolean v8, v8, Lcom/airbnb/lottie/c/b/g;->kF:Z
 
     if-eqz v8, :cond_10
 
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->rect:Landroid/graphics/RectF;
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lz:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->ly:Landroid/graphics/Paint;
 
     const/4 v13, 0x1
 
@@ -1376,11 +1376,11 @@
 
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->rect:Landroid/graphics/RectF;
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lx:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->lw:Landroid/graphics/Paint;
 
     invoke-virtual {v1, v8, v11}, Landroid/graphics/Canvas;->drawRect(Landroid/graphics/RectF;Landroid/graphics/Paint;)V
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lz:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->ly:Landroid/graphics/Paint;
 
     invoke-virtual {v10}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -1416,7 +1416,7 @@
 
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->path:Landroid/graphics/Path;
 
-    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lz:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->ly:Landroid/graphics/Paint;
 
     invoke-virtual {v1, v8, v9}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
@@ -1443,7 +1443,7 @@
 
     iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->path:Landroid/graphics/Path;
 
-    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->lz:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->ly:Landroid/graphics/Paint;
 
     invoke-virtual {v1, v8, v9}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
@@ -1474,7 +1474,7 @@
 
     iget-object v7, v0, Lcom/airbnb/lottie/c/c/a;->rect:Landroid/graphics/RectF;
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lA:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->lz:Landroid/graphics/Paint;
 
     const/4 v9, 0x0
 
@@ -1484,7 +1484,7 @@
 
     invoke-direct/range {p0 .. p1}, Lcom/airbnb/lottie/c/c/a;->a(Landroid/graphics/Canvas;)V
 
-    iget-object v4, v0, Lcom/airbnb/lottie/c/c/a;->lJ:Lcom/airbnb/lottie/c/c/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/c/c/a;
 
     invoke-virtual {v4, v1, v2, v3}, Lcom/airbnb/lottie/c/c/a;->a(Landroid/graphics/Canvas;Landroid/graphics/Matrix;I)V
 
@@ -1504,7 +1504,7 @@
     invoke-static {v6}, Lcom/airbnb/lottie/c;->q(Ljava/lang/String;)F
 
     :cond_14
-    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->lF:Ljava/lang/String;
+    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->lE:Ljava/lang/String;
 
     invoke-static {v1}, Lcom/airbnb/lottie/c;->q(Ljava/lang/String;)F
 
@@ -1516,7 +1516,7 @@
 
     :cond_15
     :goto_9
-    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->lF:Ljava/lang/String;
+    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->lE:Ljava/lang/String;
 
     invoke-static {v1}, Lcom/airbnb/lottie/c;->q(Ljava/lang/String;)F
 
@@ -1534,13 +1534,13 @@
 
     invoke-direct {p0}, Lcom/airbnb/lottie/c/c/a;->bw()V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lG:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lF:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, p2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
     if-eqz p3, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lL:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lK:Ljava/util/List;
 
     if-eqz p1, :cond_0
 
@@ -1553,9 +1553,9 @@
     :goto_0
     if-ltz p1, :cond_1
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->lG:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->lF:Landroid/graphics/Matrix;
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/a;->lL:Ljava/util/List;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/a;->lK:Ljava/util/List;
 
     invoke-interface {p3, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1563,7 +1563,7 @@
 
     check-cast p3, Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p3, p3, Lcom/airbnb/lottie/c/c/a;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object p3, p3, Lcom/airbnb/lottie/c/c/a;->iq:Lcom/airbnb/lottie/a/b/o;
 
     invoke-virtual {p3}, Lcom/airbnb/lottie/a/b/o;->getMatrix()Landroid/graphics/Matrix;
 
@@ -1576,13 +1576,13 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lK:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lJ:Lcom/airbnb/lottie/c/c/a;
 
     if-eqz p1, :cond_1
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->lG:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->lF:Landroid/graphics/Matrix;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/c/a;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/c/a;->iq:Lcom/airbnb/lottie/a/b/o;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/a/b/o;->getMatrix()Landroid/graphics/Matrix;
 
@@ -1591,9 +1591,9 @@
     invoke-virtual {p2, p1}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
     :cond_1
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lG:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->lF:Landroid/graphics/Matrix;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->iq:Lcom/airbnb/lottie/a/b/o;
 
     invoke-virtual {p2}, Lcom/airbnb/lottie/a/b/o;->getMatrix()Landroid/graphics/Matrix;
 
@@ -1619,7 +1619,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lM:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lL:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -1641,9 +1641,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lX:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lW:Ljava/lang/String;
 
     invoke-virtual {p1, v0, p2}, Lcom/airbnb/lottie/c/e;->a(Ljava/lang/String;I)Z
 
@@ -1654,9 +1654,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lX:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lW:Ljava/lang/String;
 
     const-string v1, "__container"
 
@@ -1666,17 +1666,17 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lX:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lW:Ljava/lang/String;
 
     invoke-virtual {p4, v0}, Lcom/airbnb/lottie/c/e;->w(Ljava/lang/String;)Lcom/airbnb/lottie/c/e;
 
     move-result-object p4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lX:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lW:Ljava/lang/String;
 
     invoke-virtual {p1, v0, p2}, Lcom/airbnb/lottie/c/e;->c(Ljava/lang/String;I)Z
 
@@ -1691,9 +1691,9 @@
     invoke-interface {p3, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lX:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lW:Ljava/lang/String;
 
     invoke-virtual {p1, v0, p2}, Lcom/airbnb/lottie/c/e;->d(Ljava/lang/String;I)Z
 
@@ -1701,9 +1701,9 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lX:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lW:Ljava/lang/String;
 
     invoke-virtual {p1, v0, p2}, Lcom/airbnb/lottie/c/e;->b(Ljava/lang/String;I)I
 
@@ -1729,7 +1729,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->iq:Lcom/airbnb/lottie/a/b/o;
 
     invoke-virtual {v0, p1, p2}, Lcom/airbnb/lottie/a/b/o;->b(Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)Z
 
@@ -1756,7 +1756,7 @@
 .method public final aX()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->fs:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
@@ -1776,7 +1776,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lM:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lL:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
@@ -1804,9 +1804,9 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lX:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lW:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1814,90 +1814,90 @@
 .method setProgress(F)V
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->iq:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1, p1}, Lcom/airbnb/lottie/a/b/a;->setProgress(F)V
 
     :cond_0
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1, p1}, Lcom/airbnb/lottie/a/b/a;->setProgress(F)V
 
     :cond_1
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->ji:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->ji:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jh:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1, p1}, Lcom/airbnb/lottie/a/b/a;->setProgress(F)V
 
     :cond_2
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->iZ:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->iZ:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1, p1}, Lcom/airbnb/lottie/a/b/a;->setProgress(F)V
 
     :cond_3
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->ja:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1, p1}, Lcom/airbnb/lottie/a/b/a;->setProgress(F)V
 
     :cond_4
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_5
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jb:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1, p1}, Lcom/airbnb/lottie/a/b/a;->setProgress(F)V
 
     :cond_5
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jc:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1, p1}, Lcom/airbnb/lottie/a/b/a;->setProgress(F)V
 
     :cond_6
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/c;
 
     if-eqz v1, :cond_7
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/c;
 
     invoke-virtual {v1, p1}, Lcom/airbnb/lottie/a/b/c;->setProgress(F)V
 
     :cond_7
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
 
     if-eqz v1, :cond_8
 
-    iget-object v0, v0, Lcom/airbnb/lottie/a/b/o;->jg:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, v0, Lcom/airbnb/lottie/a/b/o;->jf:Lcom/airbnb/lottie/a/b/c;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/a/b/c;->setProgress(F)V
 
     :cond_8
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
     const/4 v1, 0x0
 
@@ -1906,9 +1906,9 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/a/b/g;->iJ:Ljava/util/List;
+    iget-object v2, v2, Lcom/airbnb/lottie/a/b/g;->iI:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -1916,9 +1916,9 @@
 
     if-ge v0, v2, :cond_9
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/a/b/g;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/a/b/g;->iJ:Ljava/util/List;
+    iget-object v2, v2, Lcom/airbnb/lottie/a/b/g;->iI:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1933,9 +1933,9 @@
     goto :goto_0
 
     :cond_9
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->mf:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->md:F
 
     const/4 v2, 0x0
 
@@ -1943,22 +1943,22 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->mf:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->md:F
 
     div-float/2addr p1, v0
 
     :cond_a
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lJ:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/c/c/a;
 
     if-eqz v0, :cond_b
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->mf:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->md:F
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->lJ:Lcom/airbnb/lottie/c/c/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/c/c/a;
 
     mul-float v0, v0, p1
 
@@ -1966,7 +1966,7 @@
 
     :cond_b
     :goto_1
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lM:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lL:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -1974,7 +1974,7 @@
 
     if-ge v1, v0, :cond_c
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lM:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->lL:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1995,13 +1995,13 @@
 .method final setVisible(Z)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/c/c/a;->lN:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/c/c/a;->lM:Z
 
     if-eq p1, v0, :cond_0
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/c/c/a;->lN:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/c/c/a;->lM:Z
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->fs:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/b$1.smali b/com.discord/smali/com/airbnb/lottie/c/c/b$1.smali
index 58d9a14e6d..126b2fb925 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/b$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/b$1.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final synthetic lU:[I
+.field static final synthetic lT:[I
 
 
 # direct methods
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/b$1;->lU:[I
+    sput-object v0, Lcom/airbnb/lottie/c/c/b$1;->lT:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/c/c/b$1;->lU:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/b$1;->lT:[I
 
-    sget v2, Lcom/airbnb/lottie/c/c/d$b;->mw:I
+    sget v2, Lcom/airbnb/lottie/c/c/d$b;->mv:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/airbnb/lottie/c/c/b$1;->lU:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/b$1;->lT:[I
 
-    sget v2, Lcom/airbnb/lottie/c/c/d$b;->mx:I
+    sget v2, Lcom/airbnb/lottie/c/c/d$b;->mw:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/b.smali b/com.discord/smali/com/airbnb/lottie/c/c/b.smali
index 2175e9db0f..d828ac9baa 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/b.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final fO:Ljava/util/List;
+.field private final fN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private lS:Lcom/airbnb/lottie/a/b/a;
+.field private lR:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final lT:Landroid/graphics/RectF;
+.field private final lS:Landroid/graphics/RectF;
 
 .field private final rect:Landroid/graphics/RectF;
 
@@ -52,7 +52,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/b;->fO:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/b;->fN:Ljava/util/List;
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -64,9 +64,9 @@
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lT:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lS:Landroid/graphics/RectF;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->mk:Lcom/airbnb/lottie/c/a/b;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->mj:Lcom/airbnb/lottie/c/a/b;
 
     const/4 v0, 0x0
 
@@ -76,25 +76,25 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/c/b;->lS:Lcom/airbnb/lottie/a/b/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/b;->lR:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/b;->lS:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/b;->lR:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p0, p2}, Lcom/airbnb/lottie/c/c/b;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/b;->lS:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/b;->lR:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
     goto :goto_0
 
     :cond_0
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lS:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lR:Lcom/airbnb/lottie/a/b/a;
 
     :goto_0
     new-instance p2, Landroidx/collection/LongSparseArray;
 
-    iget-object v1, p4, Lcom/airbnb/lottie/d;->fO:Ljava/util/List;
+    iget-object v1, p4, Lcom/airbnb/lottie/d;->fN:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -123,9 +123,9 @@
 
     check-cast v5, Lcom/airbnb/lottie/c/c/d;
 
-    sget-object v6, Lcom/airbnb/lottie/c/c/a$2;->lQ:[I
+    sget-object v6, Lcom/airbnb/lottie/c/c/a$2;->lP:[I
 
-    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->lZ:Lcom/airbnb/lottie/c/c/d$a;
+    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->lY:Lcom/airbnb/lottie/c/c/d$a;
 
     invoke-virtual {v7}, Lcom/airbnb/lottie/c/c/d$a;->ordinal()I
 
@@ -141,7 +141,7 @@
 
     invoke-direct {v6, v7}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->lZ:Lcom/airbnb/lottie/c/c/d$a;
+    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->lY:Lcom/airbnb/lottie/c/c/d$a;
 
     invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -186,9 +186,9 @@
     :pswitch_4
     new-instance v6, Lcom/airbnb/lottie/c/c/b;
 
-    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->ma:Ljava/lang/String;
+    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->lZ:Ljava/lang/String;
 
-    iget-object v8, p4, Lcom/airbnb/lottie/d;->fI:Ljava/util/Map;
+    iget-object v8, p4, Lcom/airbnb/lottie/d;->fH:Ljava/util/Map;
 
     invoke-interface {v8, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -208,28 +208,28 @@
     :goto_2
     if-eqz v6, :cond_3
 
-    iget-object v7, v6, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v7, v6, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget-wide v7, v7, Lcom/airbnb/lottie/c/c/d;->lY:J
+    iget-wide v7, v7, Lcom/airbnb/lottie/c/c/d;->lX:J
 
     invoke-virtual {p2, v7, v8, v6}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
 
     if-eqz v3, :cond_1
 
-    iput-object v6, v3, Lcom/airbnb/lottie/c/c/a;->lJ:Lcom/airbnb/lottie/c/c/a;
+    iput-object v6, v3, Lcom/airbnb/lottie/c/c/a;->lI:Lcom/airbnb/lottie/c/c/a;
 
     move-object v3, v0
 
     goto :goto_3
 
     :cond_1
-    iget-object v7, p0, Lcom/airbnb/lottie/c/c/b;->fO:Ljava/util/List;
+    iget-object v7, p0, Lcom/airbnb/lottie/c/c/b;->fN:Ljava/util/List;
 
     invoke-interface {v7, v4, v6}, Ljava/util/List;->add(ILjava/lang/Object;)V
 
-    sget-object v4, Lcom/airbnb/lottie/c/c/b$1;->lU:[I
+    sget-object v4, Lcom/airbnb/lottie/c/c/b$1;->lT:[I
 
-    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->mm:I
+    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->ml:I
 
     sub-int/2addr v5, v2
 
@@ -272,7 +272,7 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p3, p1, Lcom/airbnb/lottie/c/c/a;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object p3, p1, Lcom/airbnb/lottie/c/c/a;->lG:Lcom/airbnb/lottie/c/c/d;
 
     iget-wide p3, p3, Lcom/airbnb/lottie/c/c/d;->parentId:J
 
@@ -284,7 +284,7 @@
 
     if-eqz p3, :cond_5
 
-    iput-object p3, p1, Lcom/airbnb/lottie/c/c/a;->lK:Lcom/airbnb/lottie/c/c/a;
+    iput-object p3, p1, Lcom/airbnb/lottie/c/c/a;->lJ:Lcom/airbnb/lottie/c/c/a;
 
     :cond_5
     add-int/lit8 v4, v4, 0x1
@@ -314,7 +314,7 @@
 
     invoke-super {p0, p1, p2, p3}, Lcom/airbnb/lottie/c/c/a;->a(Landroid/graphics/RectF;Landroid/graphics/Matrix;Z)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/b;->fO:Ljava/util/List;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/b;->fN:Ljava/util/List;
 
     invoke-interface {p2}, Ljava/util/List;->size()I
 
@@ -333,7 +333,7 @@
 
     invoke-virtual {v0, v1, v1, v1, v1}, Landroid/graphics/RectF;->set(FFFF)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->fO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->fN:Ljava/util/List;
 
     invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -343,7 +343,7 @@
 
     iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->rect:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/b;->lG:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/b;->lF:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v1, v2, p3}, Lcom/airbnb/lottie/c/c/a;->a(Landroid/graphics/RectF;Landroid/graphics/Matrix;Z)V
 
@@ -373,7 +373,7 @@
 
     invoke-super {p0, p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
 
-    sget-object v0, Lcom/airbnb/lottie/j;->hc:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->hb:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_1
 
@@ -381,7 +381,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/b;->lS:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/b;->lR:Lcom/airbnb/lottie/a/b/a;
 
     return-void
 
@@ -390,9 +390,9 @@
 
     invoke-direct {p1, p2}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/b;->lS:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/b;->lR:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/b;->lS:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/b;->lR:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p0, p1}, Lcom/airbnb/lottie/c/c/b;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -409,17 +409,17 @@
 
     invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->lT:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->lS:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/b;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/b;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v2, v2, Lcom/airbnb/lottie/c/c/d;->mg:I
+    iget v2, v2, Lcom/airbnb/lottie/c/c/d;->mf:I
 
     int-to-float v2, v2
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v3, v3, Lcom/airbnb/lottie/c/c/d;->mh:I
+    iget v3, v3, Lcom/airbnb/lottie/c/c/d;->mg:I
 
     int-to-float v3, v3
 
@@ -427,11 +427,11 @@
 
     invoke-virtual {v1, v4, v4, v2, v3}, Landroid/graphics/RectF;->set(FFFF)V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->lT:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->lS:Landroid/graphics/RectF;
 
     invoke-virtual {p2, v1}, Landroid/graphics/Matrix;->mapRect(Landroid/graphics/RectF;)Z
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->fO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->fN:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -444,7 +444,7 @@
     :goto_0
     if-ltz v1, :cond_2
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->lT:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->lS:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->isEmpty()Z
 
@@ -452,7 +452,7 @@
 
     if-nez v3, :cond_0
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->lT:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->lS:Landroid/graphics/RectF;
 
     invoke-virtual {p1, v3}, Landroid/graphics/Canvas;->clipRect(Landroid/graphics/RectF;)Z
 
@@ -466,7 +466,7 @@
     :goto_1
     if-eqz v3, :cond_1
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->fO:Ljava/util/List;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->fN:Ljava/util/List;
 
     invoke-interface {v3, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -507,7 +507,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->fO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->fN:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -515,7 +515,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->fO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->fN:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -538,19 +538,19 @@
 
     invoke-super {p0, p1}, Lcom/airbnb/lottie/c/c/a;->setProgress(F)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lS:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lR:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/b;->fs:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/b;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object p1, p1, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/d;->aO()F
 
     move-result p1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lS:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lR:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -573,9 +573,9 @@
     div-float p1, v0, p1
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->mf:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->md:F
 
     const/4 v1, 0x0
 
@@ -583,18 +583,18 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->mf:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->md:F
 
     div-float/2addr p1, v0
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v1, v0, Lcom/airbnb/lottie/c/c/d;->fQ:F
+    iget v1, v0, Lcom/airbnb/lottie/c/c/d;->fP:F
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->fA:Lcom/airbnb/lottie/d;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/d;->aP()F
 
@@ -604,7 +604,7 @@
 
     sub-float/2addr p1, v1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->fO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->fN:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -615,7 +615,7 @@
     :goto_0
     if-ltz v0, :cond_2
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->fO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->fN:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/c.smali b/com.discord/smali/com/airbnb/lottie/c/c/c.smali
index 72c139c176..52b6764560 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/c.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private hD:Lcom/airbnb/lottie/a/b/a;
+.field private hC:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -15,9 +15,9 @@
     .end annotation
 .end field
 
-.field private final lV:Landroid/graphics/Rect;
+.field private final lU:Landroid/graphics/Rect;
 
-.field private final lW:Landroid/graphics/Rect;
+.field private final lV:Landroid/graphics/Rect;
 
 .field private final paint:Landroid/graphics/Paint;
 
@@ -40,13 +40,13 @@
 
     invoke-direct {p1}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->lV:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->lU:Landroid/graphics/Rect;
 
     new-instance p1, Landroid/graphics/Rect;
 
     invoke-direct {p1}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->lW:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->lV:Landroid/graphics/Rect;
 
     return-void
 .end method
@@ -54,11 +54,11 @@
 .method private getBitmap()Landroid/graphics/Bitmap;
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/c;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/c;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->ma:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->lZ:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/c;->fs:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/c;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v1, v0}, Lcom/airbnb/lottie/f;->t(Ljava/lang/String;)Landroid/graphics/Bitmap;
 
@@ -108,7 +108,7 @@
 
     invoke-virtual {p1, v0, v0, p3, p2}, Landroid/graphics/RectF;->set(FFFF)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->lG:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->lF:Landroid/graphics/Matrix;
 
     invoke-virtual {p2, p1}, Landroid/graphics/Matrix;->mapRect(Landroid/graphics/RectF;)Z
 
@@ -130,7 +130,7 @@
 
     invoke-super {p0, p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
 
-    sget-object v0, Lcom/airbnb/lottie/j;->hd:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->hc:Landroid/graphics/ColorFilter;
 
     if-ne p1, v0, :cond_1
 
@@ -138,7 +138,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->hD:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->hC:Lcom/airbnb/lottie/a/b/a;
 
     return-void
 
@@ -147,7 +147,7 @@
 
     invoke-direct {p1, p2}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->hD:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->hC:Lcom/airbnb/lottie/a/b/a;
 
     :cond_1
     return-void
@@ -179,7 +179,7 @@
 
     invoke-virtual {v2, p3}, Landroid/graphics/Paint;->setAlpha(I)V
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/c;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/c;->hC:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz p3, :cond_1
 
@@ -198,7 +198,7 @@
 
     invoke-virtual {p1, p2}, Landroid/graphics/Canvas;->concat(Landroid/graphics/Matrix;)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->lV:Landroid/graphics/Rect;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->lU:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->getWidth()I
 
@@ -212,7 +212,7 @@
 
     invoke-virtual {p2, v3, v3, p3, v2}, Landroid/graphics/Rect;->set(IIII)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->lW:Landroid/graphics/Rect;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->lV:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->getWidth()I
 
@@ -236,9 +236,9 @@
 
     invoke-virtual {p2, v3, v3, p3, v1}, Landroid/graphics/Rect;->set(IIII)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->lV:Landroid/graphics/Rect;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->lU:Landroid/graphics/Rect;
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/c;->lW:Landroid/graphics/Rect;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/c;->lV:Landroid/graphics/Rect;
 
     iget-object v1, p0, Lcom/airbnb/lottie/c/c/c;->paint:Landroid/graphics/Paint;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/d$a.smali b/com.discord/smali/com/airbnb/lottie/c/c/d$a.smali
index aa7c925dfa..a52680dc8f 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/d$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/d$a.smali
@@ -23,6 +23,8 @@
 
 
 # static fields
+.field public static final enum mm:Lcom/airbnb/lottie/c/c/d$a;
+
 .field public static final enum mn:Lcom/airbnb/lottie/c/c/d$a;
 
 .field public static final enum mo:Lcom/airbnb/lottie/c/c/d$a;
@@ -35,9 +37,7 @@
 
 .field public static final enum ms:Lcom/airbnb/lottie/c/c/d$a;
 
-.field public static final enum mt:Lcom/airbnb/lottie/c/c/d$a;
-
-.field private static final synthetic mu:[Lcom/airbnb/lottie/c/c/d$a;
+.field private static final synthetic mt:[Lcom/airbnb/lottie/c/c/d$a;
 
 
 # direct methods
@@ -52,7 +52,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/airbnb/lottie/c/c/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mn:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mm:Lcom/airbnb/lottie/c/c/d$a;
 
     new-instance v0, Lcom/airbnb/lottie/c/c/d$a;
 
@@ -62,7 +62,7 @@
 
     invoke-direct {v0, v3, v2}, Lcom/airbnb/lottie/c/c/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mo:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mn:Lcom/airbnb/lottie/c/c/d$a;
 
     new-instance v0, Lcom/airbnb/lottie/c/c/d$a;
 
@@ -72,7 +72,7 @@
 
     invoke-direct {v0, v4, v3}, Lcom/airbnb/lottie/c/c/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mp:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mo:Lcom/airbnb/lottie/c/c/d$a;
 
     new-instance v0, Lcom/airbnb/lottie/c/c/d$a;
 
@@ -82,7 +82,7 @@
 
     invoke-direct {v0, v5, v4}, Lcom/airbnb/lottie/c/c/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mq:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mp:Lcom/airbnb/lottie/c/c/d$a;
 
     new-instance v0, Lcom/airbnb/lottie/c/c/d$a;
 
@@ -92,7 +92,7 @@
 
     invoke-direct {v0, v6, v5}, Lcom/airbnb/lottie/c/c/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mr:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mq:Lcom/airbnb/lottie/c/c/d$a;
 
     new-instance v0, Lcom/airbnb/lottie/c/c/d$a;
 
@@ -102,7 +102,7 @@
 
     invoke-direct {v0, v7, v6}, Lcom/airbnb/lottie/c/c/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->ms:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mr:Lcom/airbnb/lottie/c/c/d$a;
 
     new-instance v0, Lcom/airbnb/lottie/c/c/d$a;
 
@@ -112,41 +112,41 @@
 
     invoke-direct {v0, v8, v7}, Lcom/airbnb/lottie/c/c/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mt:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->ms:Lcom/airbnb/lottie/c/c/d$a;
 
     const/4 v0, 0x7
 
     new-array v0, v0, [Lcom/airbnb/lottie/c/c/d$a;
 
-    sget-object v8, Lcom/airbnb/lottie/c/c/d$a;->mn:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v8, Lcom/airbnb/lottie/c/c/d$a;->mm:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v8, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mo:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mn:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mp:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mo:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mq:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mp:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mr:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mq:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->ms:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mr:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->mt:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->ms:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v7
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mu:[Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->mt:[Lcom/airbnb/lottie/c/c/d$a;
 
     return-void
 .end method
@@ -181,7 +181,7 @@
 .method public static values()[Lcom/airbnb/lottie/c/c/d$a;
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/c/c/d$a;->mu:[Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v0, Lcom/airbnb/lottie/c/c/d$a;->mt:[Lcom/airbnb/lottie/c/c/d$a;
 
     invoke-virtual {v0}, [Lcom/airbnb/lottie/c/c/d$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/d$b.smali b/com.discord/smali/com/airbnb/lottie/c/c/d$b.smali
index 71c6949615..39232f2323 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/d$b.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/d$b.smali
@@ -23,15 +23,15 @@
 
 
 # static fields
-.field public static final mv:I = 0x1
+.field public static final mu:I = 0x1
 
-.field public static final mw:I = 0x2
+.field public static final mv:I = 0x2
 
-.field public static final mx:I = 0x3
+.field public static final mw:I = 0x3
 
-.field public static final my:I = 0x4
+.field public static final mx:I = 0x4
 
-.field private static final synthetic mz:[I
+.field private static final synthetic my:[I
 
 
 # direct methods
@@ -42,31 +42,31 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->mv:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->mu:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->mw:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->mv:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->mx:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->mw:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->my:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->mx:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/d$b;->mz:[I
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$b;->my:[I
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 .method public static bx()[I
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/c/c/d$b;->mz:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/d$b;->my:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/d.smali b/com.discord/smali/com/airbnb/lottie/c/c/d.smali
index ede8e5c1ff..42dff9f6f2 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/d.smali
@@ -13,13 +13,13 @@
 
 
 # instance fields
-.field final fB:Lcom/airbnb/lottie/d;
+.field final fA:Lcom/airbnb/lottie/d;
 
-.field final fQ:F
+.field final fP:F
 
-.field final hH:Z
+.field final hG:Z
 
-.field final iL:Ljava/util/List;
+.field final iK:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field final jM:Ljava/util/List;
+.field final jL:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -39,35 +39,35 @@
     .end annotation
 .end field
 
-.field final lX:Ljava/lang/String;
+.field final lW:Ljava/lang/String;
 
-.field public final lY:J
+.field public final lX:J
 
-.field public final lZ:Lcom/airbnb/lottie/c/c/d$a;
+.field public final lY:Lcom/airbnb/lottie/c/c/d$a;
 
-.field final ld:Lcom/airbnb/lottie/c/a/l;
+.field final lZ:Ljava/lang/String;
 
-.field final ma:Ljava/lang/String;
+.field final lc:Lcom/airbnb/lottie/c/a/l;
+
+.field final ma:I
 
 .field final mb:I
 
 .field final mc:I
 
-.field final md:I
+.field final md:F
 
-.field final mf:F
+.field final mf:I
 
 .field final mg:I
 
-.field final mh:I
+.field final mh:Lcom/airbnb/lottie/c/a/j;
 
-.field final mi:Lcom/airbnb/lottie/c/a/j;
+.field final mi:Lcom/airbnb/lottie/c/a/k;
 
-.field final mj:Lcom/airbnb/lottie/c/a/k;
+.field final mj:Lcom/airbnb/lottie/c/a/b;
 
-.field final mk:Lcom/airbnb/lottie/c/a/b;
-
-.field final ml:Ljava/util/List;
+.field final mk:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -78,7 +78,7 @@
     .end annotation
 .end field
 
-.field final mm:I
+.field final ml:I
 
 .field final parentId:J
 
@@ -120,23 +120,23 @@
 
     move-object v1, p1
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->jM:Ljava/util/List;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->jL:Ljava/util/List;
 
     move-object v1, p2
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->fB:Lcom/airbnb/lottie/d;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->fA:Lcom/airbnb/lottie/d;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->lX:Ljava/lang/String;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->lW:Ljava/lang/String;
 
     move-wide v1, p4
 
-    iput-wide v1, v0, Lcom/airbnb/lottie/c/c/d;->lY:J
+    iput-wide v1, v0, Lcom/airbnb/lottie/c/c/d;->lX:J
 
     move-object v1, p6
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->lZ:Lcom/airbnb/lottie/c/c/d$a;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->lY:Lcom/airbnb/lottie/c/c/d$a;
 
     move-wide v1, p7
 
@@ -144,67 +144,67 @@
 
     move-object v1, p9
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->ma:Ljava/lang/String;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->lZ:Ljava/lang/String;
 
     move-object v1, p10
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->iL:Ljava/util/List;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->iK:Ljava/util/List;
 
     move-object v1, p11
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->ld:Lcom/airbnb/lottie/c/a/l;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->lc:Lcom/airbnb/lottie/c/a/l;
 
     move v1, p12
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->mb:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->ma:I
 
     move/from16 v1, p13
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->mc:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->mb:I
 
     move/from16 v1, p14
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->md:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->mc:I
 
     move/from16 v1, p15
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->mf:F
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->md:F
 
     move/from16 v1, p16
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->fQ:F
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->fP:F
 
     move/from16 v1, p17
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->mg:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->mf:I
 
     move/from16 v1, p18
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->mh:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->mg:I
 
     move-object/from16 v1, p19
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->mi:Lcom/airbnb/lottie/c/a/j;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->mh:Lcom/airbnb/lottie/c/a/j;
 
     move-object/from16 v1, p20
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->mj:Lcom/airbnb/lottie/c/a/k;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->mi:Lcom/airbnb/lottie/c/a/k;
 
     move-object/from16 v1, p21
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->ml:Ljava/util/List;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->mk:Ljava/util/List;
 
     move/from16 v1, p22
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->mm:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->ml:I
 
     move-object/from16 v1, p23
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->mk:Lcom/airbnb/lottie/c/a/b;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->mj:Lcom/airbnb/lottie/c/a/b;
 
     move/from16 v1, p24
 
-    iput-boolean v1, v0, Lcom/airbnb/lottie/c/c/d;->hH:Z
+    iput-boolean v1, v0, Lcom/airbnb/lottie/c/c/d;->hG:Z
 
     return-void
 .end method
@@ -232,7 +232,7 @@
 
     invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/d;->lX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/d;->lW:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -240,7 +240,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->fB:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->fA:Lcom/airbnb/lottie/d;
 
     iget-wide v3, p0, Lcom/airbnb/lottie/c/c/d;->parentId:J
 
@@ -254,11 +254,11 @@
 
     invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v3, v2, Lcom/airbnb/lottie/c/c/d;->lX:Ljava/lang/String;
+    iget-object v3, v2, Lcom/airbnb/lottie/c/c/d;->lW:Ljava/lang/String;
 
     invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/c/d;->fB:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/d;->fA:Lcom/airbnb/lottie/d;
 
     iget-wide v4, v2, Lcom/airbnb/lottie/c/c/d;->parentId:J
 
@@ -273,11 +273,11 @@
 
     invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v3, v2, Lcom/airbnb/lottie/c/c/d;->lX:Ljava/lang/String;
+    iget-object v3, v2, Lcom/airbnb/lottie/c/c/d;->lW:Ljava/lang/String;
 
     invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/c/d;->fB:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/d;->fA:Lcom/airbnb/lottie/d;
 
     iget-wide v4, v2, Lcom/airbnb/lottie/c/c/d;->parentId:J
 
@@ -293,7 +293,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_1
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->iL:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->iK:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->isEmpty()Z
 
@@ -307,7 +307,7 @@
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->iL:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->iK:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -318,11 +318,11 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_2
-    iget v2, p0, Lcom/airbnb/lottie/c/c/d;->mb:I
+    iget v2, p0, Lcom/airbnb/lottie/c/c/d;->ma:I
 
     if-eqz v2, :cond_3
 
-    iget v2, p0, Lcom/airbnb/lottie/c/c/d;->mc:I
+    iget v2, p0, Lcom/airbnb/lottie/c/c/d;->mb:I
 
     if-eqz v2, :cond_3
 
@@ -340,7 +340,7 @@
 
     const/4 v4, 0x0
 
-    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->mb:I
+    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->ma:I
 
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -350,7 +350,7 @@
 
     const/4 v4, 0x1
 
-    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->mc:I
+    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->mb:I
 
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -360,7 +360,7 @@
 
     const/4 v4, 0x2
 
-    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->md:I
+    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->mc:I
 
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -377,7 +377,7 @@
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_3
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->jM:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->jL:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->isEmpty()Z
 
@@ -391,7 +391,7 @@
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->jM:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->jL:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/f.smali b/com.discord/smali/com/airbnb/lottie/c/c/f.smali
index b57781ae49..38892257d8 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/f.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final is:Lcom/airbnb/lottie/a/a/d;
+.field private final ir:Lcom/airbnb/lottie/a/a/d;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/c/b/n;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->jM:Ljava/util/List;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->jL:Ljava/util/List;
 
     const-string v1, "__container"
 
@@ -27,9 +27,9 @@
 
     invoke-direct {p2, p1, p0, v0}, Lcom/airbnb/lottie/a/a/d;-><init>(Lcom/airbnb/lottie/f;Lcom/airbnb/lottie/c/c/a;Lcom/airbnb/lottie/c/b/n;)V
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/c/f;->is:Lcom/airbnb/lottie/a/a/d;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/f;->ir:Lcom/airbnb/lottie/a/a/d;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/f;->is:Lcom/airbnb/lottie/a/a/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/f;->ir:Lcom/airbnb/lottie/a/a/d;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
@@ -51,9 +51,9 @@
 
     invoke-super {p0, p1, p2, p3}, Lcom/airbnb/lottie/c/c/a;->a(Landroid/graphics/RectF;Landroid/graphics/Matrix;Z)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/f;->is:Lcom/airbnb/lottie/a/a/d;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/f;->ir:Lcom/airbnb/lottie/a/a/d;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->lG:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->lF:Landroid/graphics/Matrix;
 
     invoke-virtual {p2, p1, v0, p3}, Lcom/airbnb/lottie/a/a/d;->a(Landroid/graphics/RectF;Landroid/graphics/Matrix;Z)V
 
@@ -63,7 +63,7 @@
 .method final b(Landroid/graphics/Canvas;Landroid/graphics/Matrix;I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->is:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->ir:Lcom/airbnb/lottie/a/a/d;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/airbnb/lottie/a/a/d;->a(Landroid/graphics/Canvas;Landroid/graphics/Matrix;I)V
 
@@ -85,7 +85,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->is:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->ir:Lcom/airbnb/lottie/a/a/d;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lcom/airbnb/lottie/a/a/d;->a(Lcom/airbnb/lottie/c/e;ILjava/util/List;Lcom/airbnb/lottie/c/e;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/g.smali b/com.discord/smali/com/airbnb/lottie/c/c/g.smali
index 4186aca248..fe48ca1a15 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/g.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private hD:Lcom/airbnb/lottie/a/b/a;
+.field private hC:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field private final lH:Lcom/airbnb/lottie/c/c/d;
+.field private final lG:Lcom/airbnb/lottie/c/c/d;
 
 .field private final paint:Landroid/graphics/Paint;
 
@@ -56,7 +56,7 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/c/c/g;->path:Landroid/graphics/Path;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/c/g;->lH:Lcom/airbnb/lottie/c/c/d;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/g;->lG:Lcom/airbnb/lottie/c/c/d;
 
     iget-object p1, p0, Lcom/airbnb/lottie/c/c/g;->paint:Landroid/graphics/Paint;
 
@@ -72,7 +72,7 @@
 
     iget-object p1, p0, Lcom/airbnb/lottie/c/c/g;->paint:Landroid/graphics/Paint;
 
-    iget p2, p2, Lcom/airbnb/lottie/c/c/d;->md:I
+    iget p2, p2, Lcom/airbnb/lottie/c/c/d;->mc:I
 
     invoke-virtual {p1, p2}, Landroid/graphics/Paint;->setColor(I)V
 
@@ -88,15 +88,15 @@
 
     iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->rect:Landroid/graphics/RectF;
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget p3, p3, Lcom/airbnb/lottie/c/c/d;->mb:I
+    iget p3, p3, Lcom/airbnb/lottie/c/c/d;->ma:I
 
     int-to-float p3, p3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->mc:I
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->mb:I
 
     int-to-float v0, v0
 
@@ -104,7 +104,7 @@
 
     invoke-virtual {p2, v1, v1, p3, v0}, Landroid/graphics/RectF;->set(FFFF)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->lG:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->lF:Landroid/graphics/Matrix;
 
     iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->rect:Landroid/graphics/RectF;
 
@@ -131,7 +131,7 @@
 
     invoke-super {p0, p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
 
-    sget-object v0, Lcom/airbnb/lottie/j;->hd:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->hc:Landroid/graphics/ColorFilter;
 
     if-ne p1, v0, :cond_1
 
@@ -139,7 +139,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/g;->hD:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/g;->hC:Lcom/airbnb/lottie/a/b/a;
 
     return-void
 
@@ -148,7 +148,7 @@
 
     invoke-direct {p1, p2}, Lcom/airbnb/lottie/a/b/p;-><init>(Lcom/airbnb/lottie/g/c;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/g;->hD:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/g;->hC:Lcom/airbnb/lottie/a/b/a;
 
     :cond_1
     return-void
@@ -157,9 +157,9 @@
 .method public final b(Landroid/graphics/Canvas;Landroid/graphics/Matrix;I)V
     .locals 9
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->md:I
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->mc:I
 
     invoke-static {v0}, Landroid/graphics/Color;->alpha(I)I
 
@@ -170,9 +170,9 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->iq:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v1, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     if-nez v1, :cond_1
 
@@ -181,9 +181,9 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->iq:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v1, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -224,7 +224,7 @@
 
     invoke-virtual {v0, p3}, Landroid/graphics/Paint;->setAlpha(I)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->hD:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->hC:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_2
 
@@ -253,9 +253,9 @@
 
     aput v1, p3, v2
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/c/g;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/g;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v3, v3, Lcom/airbnb/lottie/c/c/d;->mb:I
+    iget v3, v3, Lcom/airbnb/lottie/c/c/d;->ma:I
 
     int-to-float v3, v3
 
@@ -269,9 +269,9 @@
 
     aput v1, p3, v3
 
-    iget-object v5, p0, Lcom/airbnb/lottie/c/c/g;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v5, p0, Lcom/airbnb/lottie/c/c/g;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->mb:I
+    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->ma:I
 
     int-to-float v5, v5
 
@@ -281,9 +281,9 @@
 
     iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->points:[F
 
-    iget-object v5, p0, Lcom/airbnb/lottie/c/c/g;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v5, p0, Lcom/airbnb/lottie/c/c/g;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->mc:I
+    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->mb:I
 
     int-to-float v5, v5
 
@@ -297,9 +297,9 @@
 
     aput v1, p3, v5
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->lH:Lcom/airbnb/lottie/c/c/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->lG:Lcom/airbnb/lottie/c/c/d;
 
-    iget v1, v1, Lcom/airbnb/lottie/c/c/d;->mc:I
+    iget v1, v1, Lcom/airbnb/lottie/c/c/d;->mb:I
 
     int-to-float v1, v1
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/h$1.smali b/com.discord/smali/com/airbnb/lottie/c/c/h$1.smali
index c96668ce32..435dcc39a4 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/h$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/h$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic mI:Lcom/airbnb/lottie/c/c/h;
+.field final synthetic mH:Lcom/airbnb/lottie/c/c/h;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/c/c/h;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h$1;->mI:Lcom/airbnb/lottie/c/c/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h$1;->mH:Lcom/airbnb/lottie/c/c/h;
 
     const/4 p1, 0x1
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/h$2.smali b/com.discord/smali/com/airbnb/lottie/c/c/h$2.smali
index dff221d16f..6b315a450c 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/h$2.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/h$2.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic mI:Lcom/airbnb/lottie/c/c/h;
+.field final synthetic mH:Lcom/airbnb/lottie/c/c/h;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/c/c/h;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h$2;->mI:Lcom/airbnb/lottie/c/c/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h$2;->mH:Lcom/airbnb/lottie/c/c/h;
 
     const/4 p1, 0x1
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/h$3.smali b/com.discord/smali/com/airbnb/lottie/c/c/h$3.smali
index 3b6b33e576..6d36b55d4e 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/h$3.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/h$3.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final synthetic mJ:[I
+.field static final synthetic mI:[I
 
 
 # direct methods
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/h$3;->mJ:[I
+    sput-object v0, Lcom/airbnb/lottie/c/c/h$3;->mI:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->mJ:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->mI:[I
 
-    sget v2, Lcom/airbnb/lottie/c/b$a;->jG:I
+    sget v2, Lcom/airbnb/lottie/c/b$a;->jF:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->mJ:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->mI:[I
 
-    sget v2, Lcom/airbnb/lottie/c/b$a;->jH:I
+    sget v2, Lcom/airbnb/lottie/c/b$a;->jG:I
 
     sub-int/2addr v2, v0
 
@@ -61,9 +61,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->mJ:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->mI:[I
 
-    sget v2, Lcom/airbnb/lottie/c/b$a;->jI:I
+    sget v2, Lcom/airbnb/lottie/c/b$a;->jH:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/c/h.smali b/com.discord/smali/com/airbnb/lottie/c/c/h.smali
index 162e8051ab..a1f69b6cf5 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/h.smali
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field private final fB:Lcom/airbnb/lottie/d;
+.field private final fA:Lcom/airbnb/lottie/d;
 
 .field private final fillPaint:Landroid/graphics/Paint;
 
-.field private final fs:Lcom/airbnb/lottie/f;
+.field private final fr:Lcom/airbnb/lottie/f;
 
-.field private hP:Lcom/airbnb/lottie/a/b/a;
+.field private hO:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -21,9 +21,7 @@
     .end annotation
 .end field
 
-.field private final mB:Ljava/lang/StringBuilder;
-
-.field private final mC:Ljava/util/Map;
+.field private final mB:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +33,7 @@
     .end annotation
 .end field
 
-.field private final mD:Landroidx/collection/LongSparseArray;
+.field private final mC:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -45,9 +43,9 @@
     .end annotation
 .end field
 
-.field private final mE:Lcom/airbnb/lottie/a/b/n;
+.field private final mD:Lcom/airbnb/lottie/a/b/n;
 
-.field private mF:Lcom/airbnb/lottie/a/b/a;
+.field private mE:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -58,6 +56,17 @@
     .end annotation
 .end field
 
+.field private mF:Lcom/airbnb/lottie/a/b/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/a/b/a<",
+            "Ljava/lang/Float;",
+            "Ljava/lang/Float;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field private mG:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -69,19 +78,10 @@
     .end annotation
 .end field
 
-.field private mH:Lcom/airbnb/lottie/a/b/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/a/b/a<",
-            "Ljava/lang/Float;",
-            "Ljava/lang/Float;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private final matrix:Landroid/graphics/Matrix;
 
+.field private final mz:Ljava/lang/StringBuilder;
+
 .field private final rectF:Landroid/graphics/RectF;
 
 .field private final strokePaint:Landroid/graphics/Paint;
@@ -99,7 +99,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(I)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->mB:Ljava/lang/StringBuilder;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->mz:Ljava/lang/StringBuilder;
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -129,70 +129,93 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->mC:Ljava/util/Map;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->mB:Ljava/util/Map;
 
     new-instance v0, Landroidx/collection/LongSparseArray;
 
     invoke-direct {v0}, Landroidx/collection/LongSparseArray;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->mD:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->mC:Landroidx/collection/LongSparseArray;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->fs:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->fB:Lcom/airbnb/lottie/d;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->fA:Lcom/airbnb/lottie/d;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->fB:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->mi:Lcom/airbnb/lottie/c/a/j;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->mh:Lcom/airbnb/lottie/c/a/j;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/j;->bp()Lcom/airbnb/lottie/a/b/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mE:Lcom/airbnb/lottie/a/b/n;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mD:Lcom/airbnb/lottie/a/b/n;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mE:Lcom/airbnb/lottie/a/b/n;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mD:Lcom/airbnb/lottie/a/b/n;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/n;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mE:Lcom/airbnb/lottie/a/b/n;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mD:Lcom/airbnb/lottie/a/b/n;
 
     invoke-virtual {p0, p1}, Lcom/airbnb/lottie/c/c/h;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->mj:Lcom/airbnb/lottie/c/a/k;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->mi:Lcom/airbnb/lottie/c/a/k;
 
     if-eqz p1, :cond_0
 
-    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->jX:Lcom/airbnb/lottie/c/a/a;
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->jW:Lcom/airbnb/lottie/c/a/a;
 
     if-eqz p2, :cond_0
 
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->jW:Lcom/airbnb/lottie/c/a/a;
+
+    invoke-virtual {p2}, Lcom/airbnb/lottie/c/a/a;->bn()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/h;->hO:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->hO:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p2, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
+
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->hO:Lcom/airbnb/lottie/a/b/a;
+
+    invoke-virtual {p0, p2}, Lcom/airbnb/lottie/c/c/h;->a(Lcom/airbnb/lottie/a/b/a;)V
+
+    :cond_0
+    if-eqz p1, :cond_1
+
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->jX:Lcom/airbnb/lottie/c/a/a;
+
+    if-eqz p2, :cond_1
+
     iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->jX:Lcom/airbnb/lottie/c/a/a;
 
     invoke-virtual {p2}, Lcom/airbnb/lottie/c/a/a;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/c/h;->hP:Lcom/airbnb/lottie/a/b/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/h;->mE:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->mE:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->mE:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p0, p2}, Lcom/airbnb/lottie/c/c/h;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    :cond_0
-    if-eqz p1, :cond_1
+    :cond_1
+    if-eqz p1, :cond_2
 
-    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->jY:Lcom/airbnb/lottie/c/a/a;
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->jY:Lcom/airbnb/lottie/c/a/b;
 
-    if-eqz p2, :cond_1
+    if-eqz p2, :cond_2
 
-    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->jY:Lcom/airbnb/lottie/c/a/a;
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->jY:Lcom/airbnb/lottie/c/a/b;
 
-    invoke-virtual {p2}, Lcom/airbnb/lottie/c/a/a;->bn()Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {p2}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p2
 
@@ -206,49 +229,26 @@
 
     invoke-virtual {p0, p2}, Lcom/airbnb/lottie/c/c/h;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    :cond_1
-    if-eqz p1, :cond_2
-
-    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->jZ:Lcom/airbnb/lottie/c/a/b;
-
-    if-eqz p2, :cond_2
-
-    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->jZ:Lcom/airbnb/lottie/c/a/b;
-
-    invoke-virtual {p2}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p2
-
-    iput-object p2, p0, Lcom/airbnb/lottie/c/c/h;->mG:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->mG:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p2, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
-
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->mG:Lcom/airbnb/lottie/a/b/a;
-
-    invoke-virtual {p0, p2}, Lcom/airbnb/lottie/c/c/h;->a(Lcom/airbnb/lottie/a/b/a;)V
-
     :cond_2
     if-eqz p1, :cond_3
 
-    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->ka:Lcom/airbnb/lottie/c/a/b;
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->jZ:Lcom/airbnb/lottie/c/a/b;
 
     if-eqz p2, :cond_3
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/a/k;->ka:Lcom/airbnb/lottie/c/a/b;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/a/k;->jZ:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bn()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mH:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mG:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mH:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mG:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, p0}, Lcom/airbnb/lottie/a/b/a;->b(Lcom/airbnb/lottie/a/b/a$a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mH:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mG:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p0, p1}, Lcom/airbnb/lottie/c/c/h;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -259,7 +259,7 @@
 .method private static a(ILandroid/graphics/Canvas;F)V
     .locals 2
 
-    sget-object v0, Lcom/airbnb/lottie/c/c/h$3;->mJ:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/h$3;->mI:[I
 
     const/4 v1, 0x1
 
@@ -347,11 +347,11 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/h;->fs:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/h;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v2, p2, Lcom/airbnb/lottie/c/c;->jK:Ljava/lang/String;
+    iget-object v2, p2, Lcom/airbnb/lottie/c/c;->jJ:Ljava/lang/String;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/c/c;->jL:Ljava/lang/String;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c;->jK:Ljava/lang/String;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/f;->getCallback()Landroid/graphics/drawable/Drawable$Callback;
 
@@ -366,7 +366,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v3, v1, Lcom/airbnb/lottie/f;->gi:Lcom/airbnb/lottie/b/a;
+    iget-object v3, v1, Lcom/airbnb/lottie/f;->gh:Lcom/airbnb/lottie/b/a;
 
     if-nez v3, :cond_1
 
@@ -376,29 +376,29 @@
 
     move-result-object v5
 
-    iget-object v6, v1, Lcom/airbnb/lottie/f;->gj:Lcom/airbnb/lottie/a;
+    iget-object v6, v1, Lcom/airbnb/lottie/f;->gi:Lcom/airbnb/lottie/a;
 
     invoke-direct {v3, v5, v6}, Lcom/airbnb/lottie/b/a;-><init>(Landroid/graphics/drawable/Drawable$Callback;Lcom/airbnb/lottie/a;)V
 
-    iput-object v3, v1, Lcom/airbnb/lottie/f;->gi:Lcom/airbnb/lottie/b/a;
+    iput-object v3, v1, Lcom/airbnb/lottie/f;->gh:Lcom/airbnb/lottie/b/a;
 
     :cond_1
-    iget-object v1, v1, Lcom/airbnb/lottie/f;->gi:Lcom/airbnb/lottie/b/a;
+    iget-object v1, v1, Lcom/airbnb/lottie/f;->gh:Lcom/airbnb/lottie/b/a;
 
     :goto_0
     const/4 v3, 0x0
 
     if-eqz v1, :cond_8
 
-    iget-object v4, v1, Lcom/airbnb/lottie/b/a;->jl:Lcom/airbnb/lottie/c/i;
+    iget-object v4, v1, Lcom/airbnb/lottie/b/a;->jk:Lcom/airbnb/lottie/c/i;
 
     iput-object v2, v4, Lcom/airbnb/lottie/c/i;->first:Ljava/lang/Object;
 
     iput-object p2, v4, Lcom/airbnb/lottie/c/i;->second:Ljava/lang/Object;
 
-    iget-object v4, v1, Lcom/airbnb/lottie/b/a;->jm:Ljava/util/Map;
+    iget-object v4, v1, Lcom/airbnb/lottie/b/a;->jl:Ljava/util/Map;
 
-    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->jl:Lcom/airbnb/lottie/c/i;
+    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->jk:Lcom/airbnb/lottie/c/i;
 
     invoke-interface {v4, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -411,7 +411,7 @@
     goto :goto_4
 
     :cond_2
-    iget-object v4, v1, Lcom/airbnb/lottie/b/a;->jn:Ljava/util/Map;
+    iget-object v4, v1, Lcom/airbnb/lottie/b/a;->jm:Ljava/util/Map;
 
     invoke-interface {v4, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -432,7 +432,7 @@
 
     invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->jq:Ljava/lang/String;
+    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->jp:Ljava/lang/String;
 
     invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -440,13 +440,13 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->jo:Landroid/content/res/AssetManager;
+    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->jn:Landroid/content/res/AssetManager;
 
     invoke-static {v5, v4}, Landroid/graphics/Typeface;->createFromAsset(Landroid/content/res/AssetManager;Ljava/lang/String;)Landroid/graphics/Typeface;
 
     move-result-object v4
 
-    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->jn:Ljava/util/Map;
+    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->jm:Ljava/util/Map;
 
     invoke-interface {v5, v2, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -505,9 +505,9 @@
     move-object v4, p2
 
     :goto_3
-    iget-object p2, v1, Lcom/airbnb/lottie/b/a;->jm:Ljava/util/Map;
+    iget-object p2, v1, Lcom/airbnb/lottie/b/a;->jl:Ljava/util/Map;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/b/a;->jl:Lcom/airbnb/lottie/c/i;
+    iget-object v1, v1, Lcom/airbnb/lottie/b/a;->jk:Lcom/airbnb/lottie/c/i;
 
     invoke-interface {p2, v1, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -520,17 +520,17 @@
     :cond_9
     iget-object p2, p1, Lcom/airbnb/lottie/c/b;->text:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/h;->fs:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/h;->fr:Lcom/airbnb/lottie/f;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/f;->gk:Lcom/airbnb/lottie/p;
+    iget-object v1, v1, Lcom/airbnb/lottie/f;->gj:Lcom/airbnb/lottie/p;
 
     if-eqz v1, :cond_b
 
-    iget-boolean v2, v1, Lcom/airbnb/lottie/p;->ht:Z
+    iget-boolean v2, v1, Lcom/airbnb/lottie/p;->hs:Z
 
     if-eqz v2, :cond_a
 
-    iget-object v2, v1, Lcom/airbnb/lottie/p;->hs:Ljava/util/Map;
+    iget-object v2, v1, Lcom/airbnb/lottie/p;->hr:Ljava/util/Map;
 
     invoke-interface {v2, p2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -538,7 +538,7 @@
 
     if-eqz v2, :cond_a
 
-    iget-object v1, v1, Lcom/airbnb/lottie/p;->hs:Ljava/util/Map;
+    iget-object v1, v1, Lcom/airbnb/lottie/p;->hr:Ljava/util/Map;
 
     invoke-interface {v1, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -549,11 +549,11 @@
     goto :goto_5
 
     :cond_a
-    iget-boolean v2, v1, Lcom/airbnb/lottie/p;->ht:Z
+    iget-boolean v2, v1, Lcom/airbnb/lottie/p;->hs:Z
 
     if-eqz v2, :cond_b
 
-    iget-object v1, v1, Lcom/airbnb/lottie/p;->hs:Ljava/util/Map;
+    iget-object v1, v1, Lcom/airbnb/lottie/p;->hr:Ljava/util/Map;
 
     invoke-interface {v1, p2, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -565,7 +565,7 @@
 
     iget-object v1, p0, Lcom/airbnb/lottie/c/c/h;->fillPaint:Landroid/graphics/Paint;
 
-    iget-wide v4, p1, Lcom/airbnb/lottie/c/b;->jz:D
+    iget-wide v4, p1, Lcom/airbnb/lottie/c/b;->jy:D
 
     invoke-static {}, Lcom/airbnb/lottie/f/h;->bJ()F
 
@@ -601,7 +601,7 @@
 
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setTextSize(F)V
 
-    iget-wide v1, p1, Lcom/airbnb/lottie/c/b;->jC:D
+    iget-wide v1, p1, Lcom/airbnb/lottie/c/b;->jB:D
 
     double-to-float v1, v1
 
@@ -634,7 +634,7 @@
 
     move-result v5
 
-    iget v6, p1, Lcom/airbnb/lottie/c/b;->jA:I
+    iget v6, p1, Lcom/airbnb/lottie/c/b;->jz:I
 
     invoke-static {v6, p4, v5}, Lcom/airbnb/lottie/c/c/h;->a(ILandroid/graphics/Canvas;F)V
 
@@ -828,7 +828,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v4, p0, Lcom/airbnb/lottie/c/c/h;->mD:Landroidx/collection/LongSparseArray;
+    iget-object v4, p0, Lcom/airbnb/lottie/c/c/h;->mC:Landroidx/collection/LongSparseArray;
 
     int-to-long v6, v2
 
@@ -838,7 +838,7 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->mD:Landroidx/collection/LongSparseArray;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->mC:Landroidx/collection/LongSparseArray;
 
     invoke-virtual {v2, v6, v7}, Landroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
 
@@ -849,7 +849,7 @@
     goto :goto_5
 
     :cond_3
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->mB:Ljava/lang/StringBuilder;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->mz:Ljava/lang/StringBuilder;
 
     invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->setLength(I)V
 
@@ -862,7 +862,7 @@
 
     move-result v4
 
-    iget-object v8, p0, Lcom/airbnb/lottie/c/c/h;->mB:Ljava/lang/StringBuilder;
+    iget-object v8, p0, Lcom/airbnb/lottie/c/c/h;->mz:Ljava/lang/StringBuilder;
 
     invoke-virtual {v8, v4}, Ljava/lang/StringBuilder;->appendCodePoint(I)Ljava/lang/StringBuilder;
 
@@ -875,13 +875,13 @@
     goto :goto_4
 
     :cond_4
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->mB:Ljava/lang/StringBuilder;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->mz:Ljava/lang/StringBuilder;
 
     invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/c/h;->mD:Landroidx/collection/LongSparseArray;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/h;->mC:Landroidx/collection/LongSparseArray;
 
     invoke-virtual {v3, v6, v7, v2}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
 
@@ -892,7 +892,7 @@
 
     add-int/2addr v1, v3
 
-    iget-boolean v3, p2, Lcom/airbnb/lottie/c/b;->jF:Z
+    iget-boolean v3, p2, Lcom/airbnb/lottie/c/b;->jE:Z
 
     if-eqz v3, :cond_5
 
@@ -922,7 +922,7 @@
 
     move-result v2
 
-    iget v3, p2, Lcom/airbnb/lottie/c/b;->jB:I
+    iget v3, p2, Lcom/airbnb/lottie/c/b;->jA:I
 
     int-to-float v3, v3
 
@@ -930,7 +930,7 @@
 
     div-float/2addr v3, v4
 
-    iget-object v4, p0, Lcom/airbnb/lottie/c/c/h;->mH:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, p0, Lcom/airbnb/lottie/c/c/h;->mG:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v4, :cond_6
 
@@ -1006,9 +1006,9 @@
 
     invoke-super {p0, p1, p2, p3}, Lcom/airbnb/lottie/c/c/a;->a(Landroid/graphics/RectF;Landroid/graphics/Matrix;Z)V
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->fB:Lcom/airbnb/lottie/d;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/d;->fP:Landroid/graphics/Rect;
+    iget-object p2, p2, Lcom/airbnb/lottie/d;->fO:Landroid/graphics/Rect;
 
     invoke-virtual {p2}, Landroid/graphics/Rect;->width()I
 
@@ -1016,9 +1016,9 @@
 
     int-to-float p2, p2
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/h;->fB:Lcom/airbnb/lottie/d;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/h;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object p3, p3, Lcom/airbnb/lottie/d;->fP:Landroid/graphics/Rect;
+    iget-object p3, p3, Lcom/airbnb/lottie/d;->fO:Landroid/graphics/Rect;
 
     invoke-virtual {p3}, Landroid/graphics/Rect;->height()I
 
@@ -1047,11 +1047,11 @@
 
     invoke-super {p0, p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
 
-    sget-object v0, Lcom/airbnb/lottie/j;->gC:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->gB:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->hO:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_0
 
@@ -1060,11 +1060,11 @@
     return-void
 
     :cond_0
-    sget-object v0, Lcom/airbnb/lottie/j;->gD:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->gC:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->mF:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->mE:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_1
 
@@ -1073,11 +1073,11 @@
     return-void
 
     :cond_1
-    sget-object v0, Lcom/airbnb/lottie/j;->gQ:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gP:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->mG:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->mF:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_2
 
@@ -1086,11 +1086,11 @@
     return-void
 
     :cond_2
-    sget-object v0, Lcom/airbnb/lottie/j;->gR:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->gQ:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_3
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mH:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->mG:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz p1, :cond_3
 
@@ -1111,7 +1111,7 @@
 
     invoke-virtual/range {p1 .. p1}, Landroid/graphics/Canvas;->save()I
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/c/h;->fs:Lcom/airbnb/lottie/f;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/h;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v3}, Lcom/airbnb/lottie/f;->aU()Z
 
@@ -1122,7 +1122,7 @@
     invoke-virtual/range {p1 .. p2}, Landroid/graphics/Canvas;->setMatrix(Landroid/graphics/Matrix;)V
 
     :cond_0
-    iget-object v3, v0, Lcom/airbnb/lottie/c/c/h;->mE:Lcom/airbnb/lottie/a/b/n;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/h;->mD:Lcom/airbnb/lottie/a/b/n;
 
     invoke-virtual {v3}, Lcom/airbnb/lottie/a/b/n;->getValue()Ljava/lang/Object;
 
@@ -1130,11 +1130,11 @@
 
     check-cast v3, Lcom/airbnb/lottie/c/b;
 
-    iget-object v4, v0, Lcom/airbnb/lottie/c/c/h;->fB:Lcom/airbnb/lottie/d;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/c/h;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/d;->fK:Ljava/util/Map;
+    iget-object v4, v4, Lcom/airbnb/lottie/d;->fJ:Ljava/util/Map;
 
-    iget-object v5, v3, Lcom/airbnb/lottie/c/b;->jy:Ljava/lang/String;
+    iget-object v5, v3, Lcom/airbnb/lottie/c/b;->jx:Ljava/lang/String;
 
     invoke-interface {v4, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1149,7 +1149,7 @@
     return-void
 
     :cond_1
-    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->hP:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->hO:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v5, :cond_2
 
@@ -1177,7 +1177,7 @@
     invoke-virtual {v5, v6}, Landroid/graphics/Paint;->setColor(I)V
 
     :goto_0
-    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->mF:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->mE:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v5, :cond_3
 
@@ -1205,9 +1205,9 @@
     invoke-virtual {v5, v6}, Landroid/graphics/Paint;->setColor(I)V
 
     :goto_1
-    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->iq:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v5, v5, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v5, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     const/16 v6, 0x64
 
@@ -1218,9 +1218,9 @@
     goto :goto_2
 
     :cond_4
-    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->ir:Lcom/airbnb/lottie/a/b/o;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->iq:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v5, v5, Lcom/airbnb/lottie/a/b/o;->je:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v5, Lcom/airbnb/lottie/a/b/o;->jd:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v5}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -1245,7 +1245,7 @@
 
     invoke-virtual {v6, v5}, Landroid/graphics/Paint;->setAlpha(I)V
 
-    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->mG:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->mF:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v5, :cond_5
 
@@ -1272,7 +1272,7 @@
 
     iget-object v6, v0, Lcom/airbnb/lottie/c/c/h;->strokePaint:Landroid/graphics/Paint;
 
-    iget-wide v7, v3, Lcom/airbnb/lottie/c/b;->jE:D
+    iget-wide v7, v3, Lcom/airbnb/lottie/c/b;->jD:D
 
     invoke-static {}, Lcom/airbnb/lottie/f/h;->bJ()F
 
@@ -1295,7 +1295,7 @@
     invoke-virtual {v6, v5}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
     :goto_3
-    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->fs:Lcom/airbnb/lottie/f;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->fr:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v5}, Lcom/airbnb/lottie/f;->aU()Z
 
@@ -1303,7 +1303,7 @@
 
     if-eqz v5, :cond_f
 
-    iget-wide v5, v3, Lcom/airbnb/lottie/c/b;->jz:D
+    iget-wide v5, v3, Lcom/airbnb/lottie/c/b;->jy:D
 
     double-to-float v5, v5
 
@@ -1317,7 +1317,7 @@
 
     iget-object v7, v3, Lcom/airbnb/lottie/c/b;->text:Ljava/lang/String;
 
-    iget-wide v8, v3, Lcom/airbnb/lottie/c/b;->jC:D
+    iget-wide v8, v3, Lcom/airbnb/lottie/c/b;->jB:D
 
     double-to-float v8, v8
 
@@ -1361,19 +1361,19 @@
 
     move-result v10
 
-    iget-object v13, v4, Lcom/airbnb/lottie/c/c;->jK:Ljava/lang/String;
+    iget-object v13, v4, Lcom/airbnb/lottie/c/c;->jJ:Ljava/lang/String;
 
     move-object/from16 v16, v7
 
-    iget-object v7, v4, Lcom/airbnb/lottie/c/c;->jL:Ljava/lang/String;
+    iget-object v7, v4, Lcom/airbnb/lottie/c/c;->jK:Ljava/lang/String;
 
     invoke-static {v10, v13, v7}, Lcom/airbnb/lottie/c/d;->a(CLjava/lang/String;Ljava/lang/String;)I
 
     move-result v7
 
-    iget-object v10, v0, Lcom/airbnb/lottie/c/c/h;->fB:Lcom/airbnb/lottie/d;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/h;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v10, v10, Lcom/airbnb/lottie/d;->fM:Landroidx/collection/SparseArrayCompat;
+    iget-object v10, v10, Lcom/airbnb/lottie/d;->fL:Landroidx/collection/SparseArrayCompat;
 
     invoke-virtual {v10, v7}, Landroidx/collection/SparseArrayCompat;->get(I)Ljava/lang/Object;
 
@@ -1391,7 +1391,7 @@
 
     move/from16 v17, v11
 
-    iget-wide v10, v7, Lcom/airbnb/lottie/c/d;->jO:D
+    iget-wide v10, v7, Lcom/airbnb/lottie/c/d;->jN:D
 
     move/from16 v19, v8
 
@@ -1458,7 +1458,7 @@
 
     invoke-virtual/range {p1 .. p1}, Landroid/graphics/Canvas;->save()I
 
-    iget v7, v3, Lcom/airbnb/lottie/c/b;->jA:I
+    iget v7, v3, Lcom/airbnb/lottie/c/b;->jz:I
 
     invoke-static {v7, v1, v15}, Lcom/airbnb/lottie/c/c/h;->a(ILandroid/graphics/Canvas;F)V
 
@@ -1499,17 +1499,17 @@
 
     move-result v8
 
-    iget-object v11, v4, Lcom/airbnb/lottie/c/c;->jK:Ljava/lang/String;
+    iget-object v11, v4, Lcom/airbnb/lottie/c/c;->jJ:Ljava/lang/String;
 
-    iget-object v13, v4, Lcom/airbnb/lottie/c/c;->jL:Ljava/lang/String;
+    iget-object v13, v4, Lcom/airbnb/lottie/c/c;->jK:Ljava/lang/String;
 
     invoke-static {v8, v11, v13}, Lcom/airbnb/lottie/c/d;->a(CLjava/lang/String;Ljava/lang/String;)I
 
     move-result v8
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->fB:Lcom/airbnb/lottie/d;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v11, v11, Lcom/airbnb/lottie/d;->fM:Landroidx/collection/SparseArrayCompat;
+    iget-object v11, v11, Lcom/airbnb/lottie/d;->fL:Landroidx/collection/SparseArrayCompat;
 
     invoke-virtual {v11, v8}, Landroidx/collection/SparseArrayCompat;->get(I)Ljava/lang/Object;
 
@@ -1519,7 +1519,7 @@
 
     if-eqz v8, :cond_d
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->mC:Ljava/util/Map;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->mB:Ljava/util/Map;
 
     invoke-interface {v11, v8}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -1527,7 +1527,7 @@
 
     if-eqz v11, :cond_8
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->mC:Ljava/util/Map;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->mB:Ljava/util/Map;
 
     invoke-interface {v11, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1544,7 +1544,7 @@
     goto :goto_9
 
     :cond_8
-    iget-object v11, v8, Lcom/airbnb/lottie/c/d;->jM:Ljava/util/List;
+    iget-object v11, v8, Lcom/airbnb/lottie/c/d;->jL:Ljava/util/List;
 
     invoke-interface {v11}, Ljava/util/List;->size()I
 
@@ -1575,7 +1575,7 @@
 
     move-object/from16 v20, v12
 
-    iget-object v12, v0, Lcom/airbnb/lottie/c/c/h;->fs:Lcom/airbnb/lottie/f;
+    iget-object v12, v0, Lcom/airbnb/lottie/c/c/h;->fr:Lcom/airbnb/lottie/f;
 
     invoke-direct {v11, v12, v0, v9}, Lcom/airbnb/lottie/a/a/d;-><init>(Lcom/airbnb/lottie/f;Lcom/airbnb/lottie/c/c/a;Lcom/airbnb/lottie/c/b/n;)V
 
@@ -1596,7 +1596,7 @@
 
     move-object/from16 v20, v12
 
-    iget-object v9, v0, Lcom/airbnb/lottie/c/c/h;->mC:Ljava/util/Map;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/h;->mB:Ljava/util/Map;
 
     invoke-interface {v9, v8, v14}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1634,7 +1634,7 @@
 
     move-object/from16 p3, v14
 
-    iget-wide v13, v3, Lcom/airbnb/lottie/c/b;->jD:D
+    iget-wide v13, v3, Lcom/airbnb/lottie/c/b;->jC:D
 
     neg-double v13, v13
 
@@ -1658,7 +1658,7 @@
 
     invoke-virtual {v11, v12}, Landroid/graphics/Path;->transform(Landroid/graphics/Matrix;)V
 
-    iget-boolean v12, v3, Lcom/airbnb/lottie/c/b;->jF:Z
+    iget-boolean v12, v3, Lcom/airbnb/lottie/c/b;->jE:Z
 
     if-eqz v12, :cond_a
 
@@ -1689,7 +1689,7 @@
     goto :goto_a
 
     :cond_b
-    iget-wide v8, v8, Lcom/airbnb/lottie/c/d;->jO:D
+    iget-wide v8, v8, Lcom/airbnb/lottie/c/d;->jN:D
 
     double-to-float v8, v8
 
@@ -1703,7 +1703,7 @@
 
     mul-float v8, v8, v6
 
-    iget v9, v3, Lcom/airbnb/lottie/c/b;->jB:I
+    iget v9, v3, Lcom/airbnb/lottie/c/b;->jA:I
 
     int-to-float v9, v9
 
@@ -1711,7 +1711,7 @@
 
     div-float/2addr v9, v11
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->mH:Lcom/airbnb/lottie/a/b/a;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->mG:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v11, :cond_c
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/d.smali b/com.discord/smali/com/airbnb/lottie/c/d.smali
index 423ec97d63..9b2b28f423 100644
--- a/com.discord/smali/com/airbnb/lottie/c/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/d.smali
@@ -6,9 +6,9 @@
 # instance fields
 .field private final fontFamily:Ljava/lang/String;
 
-.field private final jL:Ljava/lang/String;
+.field private final jK:Ljava/lang/String;
 
-.field public final jM:Ljava/util/List;
+.field public final jL:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -18,11 +18,11 @@
     .end annotation
 .end field
 
-.field private final jN:C
+.field private final jM:C
 
-.field public final jO:D
+.field public final jN:D
 
-.field private final jz:D
+.field private final jy:D
 
 
 # direct methods
@@ -42,15 +42,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/d;->jM:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/d;->jL:Ljava/util/List;
 
-    iput-char p2, p0, Lcom/airbnb/lottie/c/d;->jN:C
+    iput-char p2, p0, Lcom/airbnb/lottie/c/d;->jM:C
 
-    iput-wide p3, p0, Lcom/airbnb/lottie/c/d;->jz:D
+    iput-wide p3, p0, Lcom/airbnb/lottie/c/d;->jy:D
 
-    iput-wide p5, p0, Lcom/airbnb/lottie/c/d;->jO:D
+    iput-wide p5, p0, Lcom/airbnb/lottie/c/d;->jN:D
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/d;->jL:Ljava/lang/String;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/d;->jK:Ljava/lang/String;
 
     iput-object p8, p0, Lcom/airbnb/lottie/c/d;->fontFamily:Ljava/lang/String;
 
@@ -86,11 +86,11 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-char v0, p0, Lcom/airbnb/lottie/c/d;->jN:C
+    iget-char v0, p0, Lcom/airbnb/lottie/c/d;->jM:C
 
     iget-object v1, p0, Lcom/airbnb/lottie/c/d;->fontFamily:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/d;->jL:Ljava/lang/String;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/d;->jK:Ljava/lang/String;
 
     invoke-static {v0, v1, v2}, Lcom/airbnb/lottie/c/d;->a(CLjava/lang/String;Ljava/lang/String;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/e.smali b/com.discord/smali/com/airbnb/lottie/c/e.smali
index 86a70065cc..19639b7ca4 100644
--- a/com.discord/smali/com/airbnb/lottie/c/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/e.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final jP:Ljava/util/List;
+.field private final jO:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field public jQ:Lcom/airbnb/lottie/c/f;
+.field public jP:Lcom/airbnb/lottie/c/f;
 
 
 # direct methods
@@ -25,15 +25,15 @@
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p1, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v1, p1, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/e;->jQ:Lcom/airbnb/lottie/c/f;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/e;->jP:Lcom/airbnb/lottie/c/f;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/e;->jQ:Lcom/airbnb/lottie/c/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/e;->jP:Lcom/airbnb/lottie/c/f;
 
     return-void
 .end method
@@ -47,7 +47,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     return-void
 .end method
@@ -55,7 +55,7 @@
 .method private bl()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -87,7 +87,7 @@
 
     invoke-direct {v0, p0}, Lcom/airbnb/lottie/c/e;-><init>(Lcom/airbnb/lottie/c/e;)V
 
-    iput-object p1, v0, Lcom/airbnb/lottie/c/e;->jQ:Lcom/airbnb/lottie/c/f;
+    iput-object p1, v0, Lcom/airbnb/lottie/c/e;->jP:Lcom/airbnb/lottie/c/f;
 
     return-object v0
 .end method
@@ -108,7 +108,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -121,7 +121,7 @@
     return v2
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -135,7 +135,7 @@
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {p1, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -151,7 +151,7 @@
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {p1, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -193,7 +193,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -214,7 +214,7 @@
     return v2
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -227,7 +227,7 @@
     return v1
 
     :cond_2
-    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     add-int/2addr p2, v2
 
@@ -254,7 +254,7 @@
 .method public final c(Ljava/lang/String;I)Z
     .locals 5
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -267,7 +267,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -287,7 +287,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v3, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {v3, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -331,7 +331,7 @@
     :goto_2
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -358,7 +358,7 @@
     :cond_6
     if-nez v0, :cond_7
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     add-int/lit8 v4, p2, 0x1
 
@@ -384,7 +384,7 @@
     :goto_3
     if-eqz v3, :cond_a
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -394,7 +394,7 @@
 
     if-eq p2, p1, :cond_9
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -427,7 +427,7 @@
     :cond_b
     add-int/2addr p2, v2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -440,7 +440,7 @@
     return v1
 
     :cond_c
-    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -471,7 +471,7 @@
     return v0
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -481,7 +481,7 @@
 
     if-lt p2, p1, :cond_2
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {p1, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -518,7 +518,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -526,7 +526,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/e;->jQ:Lcom/airbnb/lottie/c/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/e;->jP:Lcom/airbnb/lottie/c/f;
 
     if-eqz v1, :cond_0
 
@@ -558,7 +558,7 @@
 
     invoke-direct {v0, p0}, Lcom/airbnb/lottie/c/e;-><init>(Lcom/airbnb/lottie/c/e;)V
 
-    iget-object v1, v0, Lcom/airbnb/lottie/c/e;->jP:Ljava/util/List;
+    iget-object v1, v0, Lcom/airbnb/lottie/c/e;->jO:Ljava/util/List;
 
     invoke-interface {v1, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/g.smali b/com.discord/smali/com/airbnb/lottie/c/g.smali
index d46b4a1af4..8bfc148a04 100644
--- a/com.discord/smali/com/airbnb/lottie/c/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/g.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static final jR:Lcom/airbnb/lottie/c/g;
+.field private static final jQ:Lcom/airbnb/lottie/c/g;
 
 
 # instance fields
-.field private final jS:Landroidx/collection/LruCache;
+.field private final jR:Landroidx/collection/LruCache;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LruCache<",
@@ -28,7 +28,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/c/g;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/c/g;->jR:Lcom/airbnb/lottie/c/g;
+    sput-object v0, Lcom/airbnb/lottie/c/g;->jQ:Lcom/airbnb/lottie/c/g;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 
     invoke-direct {v0, v1}, Landroidx/collection/LruCache;-><init>(I)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/g;->jS:Landroidx/collection/LruCache;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/g;->jR:Landroidx/collection/LruCache;
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 .method public static bm()Lcom/airbnb/lottie/c/g;
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/c/g;->jR:Lcom/airbnb/lottie/c/g;
+    sget-object v0, Lcom/airbnb/lottie/c/g;->jQ:Lcom/airbnb/lottie/c/g;
 
     return-object v0
 .end method
@@ -67,7 +67,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/c/g;->jS:Landroidx/collection/LruCache;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/g;->jR:Landroidx/collection/LruCache;
 
     invoke-virtual {v0, p1, p2}, Landroidx/collection/LruCache;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -84,7 +84,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/c/g;->jS:Landroidx/collection/LruCache;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/g;->jR:Landroidx/collection/LruCache;
 
     invoke-virtual {v0, p1}, Landroidx/collection/LruCache;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/c/h.smali b/com.discord/smali/com/airbnb/lottie/c/h.smali
index df5423aa44..35f4581eef 100644
--- a/com.discord/smali/com/airbnb/lottie/c/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/h.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field public static jT:Ljava/lang/String; = "\r"
+.field public static jS:Ljava/lang/String; = "\r"
 
 
 # instance fields
-.field public final fQ:F
+.field public final fP:F
 
-.field public final jU:F
+.field public final jT:F
 
 .field public final name:Ljava/lang/String;
 
@@ -29,9 +29,9 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/c/h;->name:Ljava/lang/String;
 
-    iput p3, p0, Lcom/airbnb/lottie/c/h;->jU:F
+    iput p3, p0, Lcom/airbnb/lottie/c/h;->jT:F
 
-    iput p2, p0, Lcom/airbnb/lottie/c/h;->fQ:F
+    iput p2, p0, Lcom/airbnb/lottie/c/h;->fP:F
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/d.smali b/com.discord/smali/com/airbnb/lottie/d.smali
index 2576b06aeb..e742a959c7 100644
--- a/com.discord/smali/com/airbnb/lottie/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/d.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field public final fG:Lcom/airbnb/lottie/m;
+.field public final fF:Lcom/airbnb/lottie/m;
 
-.field private final fH:Ljava/util/HashSet;
+.field private final fG:Ljava/util/HashSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashSet<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field public fI:Ljava/util/Map;
+.field public fH:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field public fJ:Ljava/util/Map;
+.field public fI:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field public fK:Ljava/util/Map;
+.field public fJ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -50,7 +50,7 @@
     .end annotation
 .end field
 
-.field public fL:Ljava/util/List;
+.field public fK:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -60,7 +60,7 @@
     .end annotation
 .end field
 
-.field public fM:Landroidx/collection/SparseArrayCompat;
+.field public fL:Landroidx/collection/SparseArrayCompat;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/SparseArrayCompat<",
@@ -70,7 +70,7 @@
     .end annotation
 .end field
 
-.field public fN:Landroidx/collection/LongSparseArray;
+.field public fM:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -80,7 +80,7 @@
     .end annotation
 .end field
 
-.field public fO:Ljava/util/List;
+.field public fN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -90,17 +90,17 @@
     .end annotation
 .end field
 
-.field public fP:Landroid/graphics/Rect;
+.field public fO:Landroid/graphics/Rect;
+
+.field public fP:F
 
 .field public fQ:F
 
 .field public fR:F
 
-.field public fS:F
+.field public fS:Z
 
-.field public fT:Z
-
-.field fU:I
+.field fT:I
 
 
 # direct methods
@@ -113,17 +113,17 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/m;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/d;->fG:Lcom/airbnb/lottie/m;
+    iput-object v0, p0, Lcom/airbnb/lottie/d;->fF:Lcom/airbnb/lottie/m;
 
     new-instance v0, Ljava/util/HashSet;
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/d;->fH:Ljava/util/HashSet;
+    iput-object v0, p0, Lcom/airbnb/lottie/d;->fG:Ljava/util/HashSet;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/airbnb/lottie/d;->fU:I
+    iput v0, p0, Lcom/airbnb/lottie/d;->fT:I
 
     return-void
 .end method
@@ -137,7 +137,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/airbnb/lottie/d;->fS:F
+    iget v1, p0, Lcom/airbnb/lottie/d;->fR:F
 
     div-float/2addr v0, v1
 
@@ -155,9 +155,9 @@
 .method public final aP()F
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/d;->fR:F
+    iget v0, p0, Lcom/airbnb/lottie/d;->fQ:F
 
-    iget v1, p0, Lcom/airbnb/lottie/d;->fQ:F
+    iget v1, p0, Lcom/airbnb/lottie/d;->fP:F
 
     sub-float/2addr v0, v1
 
@@ -167,11 +167,11 @@
 .method public final g(I)V
     .locals 1
 
-    iget v0, p0, Lcom/airbnb/lottie/d;->fU:I
+    iget v0, p0, Lcom/airbnb/lottie/d;->fT:I
 
     add-int/2addr v0, p1
 
-    iput v0, p0, Lcom/airbnb/lottie/d;->fU:I
+    iput v0, p0, Lcom/airbnb/lottie/d;->fT:I
 
     return-void
 .end method
@@ -179,7 +179,7 @@
 .method public final h(J)Lcom/airbnb/lottie/c/c/d;
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/d;->fN:Landroidx/collection/LongSparseArray;
+    iget-object v0, p0, Lcom/airbnb/lottie/d;->fM:Landroidx/collection/LongSparseArray;
 
     invoke-virtual {v0, p1, p2}, Landroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
 
@@ -195,7 +195,7 @@
 
     invoke-static {p1}, Lcom/airbnb/lottie/f/d;->warning(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/d;->fH:Ljava/util/HashSet;
+    iget-object v0, p0, Lcom/airbnb/lottie/d;->fG:Ljava/util/HashSet;
 
     invoke-virtual {v0, p1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
 
@@ -205,7 +205,7 @@
 .method public final s(Ljava/lang/String;)Lcom/airbnb/lottie/c/h;
     .locals 6
 
-    iget-object v0, p0, Lcom/airbnb/lottie/d;->fL:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/d;->fK:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -214,7 +214,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/airbnb/lottie/d;->fL:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/d;->fK:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -222,7 +222,7 @@
 
     if-ge v1, v2, :cond_3
 
-    iget-object v2, p0, Lcom/airbnb/lottie/d;->fL:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/d;->fK:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -245,7 +245,7 @@
     :cond_0
     iget-object v3, v2, Lcom/airbnb/lottie/c/h;->name:Ljava/lang/String;
 
-    sget-object v5, Lcom/airbnb/lottie/c/h;->jT:Ljava/lang/String;
+    sget-object v5, Lcom/airbnb/lottie/c/h;->jS:Ljava/lang/String;
 
     invoke-virtual {v3, v5}, Ljava/lang/String;->endsWith(Ljava/lang/String;)Z
 
@@ -297,7 +297,7 @@
 .method public final setPerformanceTrackingEnabled(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/d;->fG:Lcom/airbnb/lottie/m;
+    iget-object v0, p0, Lcom/airbnb/lottie/d;->fF:Lcom/airbnb/lottie/m;
 
     iput-boolean p1, v0, Lcom/airbnb/lottie/m;->enabled:Z
 
@@ -313,7 +313,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/d;->fO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/d;->fN:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali/com/airbnb/lottie/d/a.smali b/com.discord/smali/com/airbnb/lottie/d/a.smali
index ca45a7e4cc..7b6a097c35 100644
--- a/com.discord/smali/com/airbnb/lottie/d/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/d/a.smali
@@ -14,11 +14,11 @@
 
 
 # static fields
+.field public static final enum mJ:Lcom/airbnb/lottie/d/a;
+
 .field public static final enum mK:Lcom/airbnb/lottie/d/a;
 
-.field public static final enum mL:Lcom/airbnb/lottie/d/a;
-
-.field private static final synthetic mM:[Lcom/airbnb/lottie/d/a;
+.field private static final synthetic mL:[Lcom/airbnb/lottie/d/a;
 
 
 # instance fields
@@ -39,7 +39,7 @@
 
     invoke-direct {v0, v2, v1, v3}, Lcom/airbnb/lottie/d/a;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lcom/airbnb/lottie/d/a;->mK:Lcom/airbnb/lottie/d/a;
+    sput-object v0, Lcom/airbnb/lottie/d/a;->mJ:Lcom/airbnb/lottie/d/a;
 
     new-instance v0, Lcom/airbnb/lottie/d/a;
 
@@ -51,21 +51,21 @@
 
     invoke-direct {v0, v3, v2, v4}, Lcom/airbnb/lottie/d/a;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lcom/airbnb/lottie/d/a;->mL:Lcom/airbnb/lottie/d/a;
+    sput-object v0, Lcom/airbnb/lottie/d/a;->mK:Lcom/airbnb/lottie/d/a;
 
     const/4 v0, 0x2
 
     new-array v0, v0, [Lcom/airbnb/lottie/d/a;
 
-    sget-object v3, Lcom/airbnb/lottie/d/a;->mK:Lcom/airbnb/lottie/d/a;
+    sget-object v3, Lcom/airbnb/lottie/d/a;->mJ:Lcom/airbnb/lottie/d/a;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/d/a;->mL:Lcom/airbnb/lottie/d/a;
+    sget-object v1, Lcom/airbnb/lottie/d/a;->mK:Lcom/airbnb/lottie/d/a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/d/a;->mM:[Lcom/airbnb/lottie/d/a;
+    sput-object v0, Lcom/airbnb/lottie/d/a;->mL:[Lcom/airbnb/lottie/d/a;
 
     return-void
 .end method
@@ -104,7 +104,7 @@
 .method public static values()[Lcom/airbnb/lottie/d/a;
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/d/a;->mM:[Lcom/airbnb/lottie/d/a;
+    sget-object v0, Lcom/airbnb/lottie/d/a;->mL:[Lcom/airbnb/lottie/d/a;
 
     invoke-virtual {v0}, [Lcom/airbnb/lottie/d/a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/d/b.smali b/com.discord/smali/com/airbnb/lottie/d/b.smali
index aa926cc669..49532d6aa1 100644
--- a/com.discord/smali/com/airbnb/lottie/d/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/d/b.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final mN:Landroid/content/Context;
+.field final mM:Landroid/content/Context;
 
 .field final url:Ljava/lang/String;
 
@@ -19,7 +19,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/d/b;->mN:Landroid/content/Context;
+    iput-object p1, p0, Lcom/airbnb/lottie/d/b;->mM:Landroid/content/Context;
 
     iput-object p2, p0, Lcom/airbnb/lottie/d/b;->url:Ljava/lang/String;
 
@@ -86,7 +86,7 @@
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/d/b;->mN:Landroid/content/Context;
+    iget-object v1, p0, Lcom/airbnb/lottie/d/b;->mM:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getCacheDir()Ljava/io/File;
 
@@ -178,13 +178,13 @@
 
     new-instance v2, Ljava/io/File;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/d/b;->mN:Landroid/content/Context;
+    iget-object v3, p0, Lcom/airbnb/lottie/d/b;->mM:Landroid/content/Context;
 
     invoke-virtual {v3}, Landroid/content/Context;->getCacheDir()Ljava/io/File;
 
     move-result-object v3
 
-    sget-object v4, Lcom/airbnb/lottie/d/a;->mK:Lcom/airbnb/lottie/d/a;
+    sget-object v4, Lcom/airbnb/lottie/d/a;->mJ:Lcom/airbnb/lottie/d/a;
 
     const/4 v5, 0x0
 
@@ -205,13 +205,13 @@
     :cond_0
     new-instance v2, Ljava/io/File;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/d/b;->mN:Landroid/content/Context;
+    iget-object v3, p0, Lcom/airbnb/lottie/d/b;->mM:Landroid/content/Context;
 
     invoke-virtual {v3}, Landroid/content/Context;->getCacheDir()Ljava/io/File;
 
     move-result-object v3
 
-    sget-object v4, Lcom/airbnb/lottie/d/a;->mL:Lcom/airbnb/lottie/d/a;
+    sget-object v4, Lcom/airbnb/lottie/d/a;->mK:Lcom/airbnb/lottie/d/a;
 
     invoke-static {v1, v4, v5}, Lcom/airbnb/lottie/d/b;->a(Ljava/lang/String;Lcom/airbnb/lottie/d/a;Z)Ljava/lang/String;
 
@@ -257,12 +257,12 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lcom/airbnb/lottie/d/a;->mL:Lcom/airbnb/lottie/d/a;
+    sget-object v0, Lcom/airbnb/lottie/d/a;->mK:Lcom/airbnb/lottie/d/a;
 
     goto :goto_1
 
     :cond_3
-    sget-object v0, Lcom/airbnb/lottie/d/a;->mK:Lcom/airbnb/lottie/d/a;
+    sget-object v0, Lcom/airbnb/lottie/d/a;->mJ:Lcom/airbnb/lottie/d/a;
 
     :goto_1
     new-instance v3, Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/airbnb/lottie/d/c.smali b/com.discord/smali/com/airbnb/lottie/d/c.smali
index 4d7a15f686..65f746e69f 100644
--- a/com.discord/smali/com/airbnb/lottie/d/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/d/c.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final mN:Landroid/content/Context;
+.field private final mM:Landroid/content/Context;
 
-.field public final mO:Lcom/airbnb/lottie/d/b;
+.field public final mN:Lcom/airbnb/lottie/d/b;
 
 .field public final url:Ljava/lang/String;
 
@@ -21,17 +21,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/d/c;->mN:Landroid/content/Context;
+    iput-object p1, p0, Lcom/airbnb/lottie/d/c;->mM:Landroid/content/Context;
 
     iput-object p2, p0, Lcom/airbnb/lottie/d/c;->url:Ljava/lang/String;
 
     new-instance p1, Lcom/airbnb/lottie/d/b;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/d/c;->mN:Landroid/content/Context;
+    iget-object v0, p0, Lcom/airbnb/lottie/d/c;->mM:Landroid/content/Context;
 
     invoke-direct {p1, v0, p2}, Lcom/airbnb/lottie/d/b;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/d/c;->mO:Lcom/airbnb/lottie/d/b;
+    iput-object p1, p0, Lcom/airbnb/lottie/d/c;->mN:Lcom/airbnb/lottie/d/b;
 
     return-void
 .end method
@@ -248,9 +248,9 @@
 
     invoke-static {v1}, Lcom/airbnb/lottie/f/d;->u(Ljava/lang/String;)V
 
-    sget-object v1, Lcom/airbnb/lottie/d/a;->mK:Lcom/airbnb/lottie/d/a;
+    sget-object v1, Lcom/airbnb/lottie/d/a;->mJ:Lcom/airbnb/lottie/d/a;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/d/c;->mO:Lcom/airbnb/lottie/d/b;
+    iget-object v2, p0, Lcom/airbnb/lottie/d/c;->mN:Lcom/airbnb/lottie/d/b;
 
     invoke-virtual {v0}, Ljava/net/HttpURLConnection;->getInputStream()Ljava/io/InputStream;
 
@@ -285,9 +285,9 @@
 
     invoke-static {v1}, Lcom/airbnb/lottie/f/d;->u(Ljava/lang/String;)V
 
-    sget-object v1, Lcom/airbnb/lottie/d/a;->mL:Lcom/airbnb/lottie/d/a;
+    sget-object v1, Lcom/airbnb/lottie/d/a;->mK:Lcom/airbnb/lottie/d/a;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/d/c;->mO:Lcom/airbnb/lottie/d/b;
+    iget-object v2, p0, Lcom/airbnb/lottie/d/c;->mN:Lcom/airbnb/lottie/d/b;
 
     invoke-virtual {v0}, Ljava/net/HttpURLConnection;->getInputStream()Ljava/io/InputStream;
 
@@ -316,7 +316,7 @@
 
     if-eqz v3, :cond_6
 
-    iget-object v3, p0, Lcom/airbnb/lottie/d/c;->mO:Lcom/airbnb/lottie/d/b;
+    iget-object v3, p0, Lcom/airbnb/lottie/d/c;->mN:Lcom/airbnb/lottie/d/b;
 
     iget-object v4, v3, Lcom/airbnb/lottie/d/b;->url:Ljava/lang/String;
 
@@ -326,7 +326,7 @@
 
     new-instance v4, Ljava/io/File;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/d/b;->mN:Landroid/content/Context;
+    iget-object v3, v3, Lcom/airbnb/lottie/d/b;->mM:Landroid/content/Context;
 
     invoke-virtual {v3}, Landroid/content/Context;->getCacheDir()Ljava/io/File;
 
diff --git a/com.discord/smali/com/airbnb/lottie/e$1.smali b/com.discord/smali/com/airbnb/lottie/e$1.smali
index 1edf58ac77..96f56423b9 100644
--- a/com.discord/smali/com/airbnb/lottie/e$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/e$1.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field final synthetic fW:Ljava/lang/String;
+.field final synthetic fV:Ljava/lang/String;
 
 .field final synthetic val$context:Landroid/content/Context;
 
@@ -39,7 +39,7 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/e$1;->val$context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/e$1;->fW:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/e$1;->fV:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,13 +58,13 @@
 
     iget-object v0, p0, Lcom/airbnb/lottie/e$1;->val$context:Landroid/content/Context;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e$1;->fW:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$1;->fV:Ljava/lang/String;
 
     new-instance v2, Lcom/airbnb/lottie/d/c;
 
     invoke-direct {v2, v0, v1}, Lcom/airbnb/lottie/d/c;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    iget-object v0, v2, Lcom/airbnb/lottie/d/c;->mO:Lcom/airbnb/lottie/d/b;
+    iget-object v0, v2, Lcom/airbnb/lottie/d/c;->mN:Lcom/airbnb/lottie/d/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/d/b;->bz()Landroidx/core/util/Pair;
 
@@ -80,7 +80,7 @@
 
     check-cast v0, Ljava/io/InputStream;
 
-    sget-object v3, Lcom/airbnb/lottie/d/a;->mL:Lcom/airbnb/lottie/d/a;
+    sget-object v3, Lcom/airbnb/lottie/d/a;->mK:Lcom/airbnb/lottie/d/a;
 
     if-ne v1, v3, :cond_0
 
diff --git a/com.discord/smali/com/airbnb/lottie/e$2.smali b/com.discord/smali/com/airbnb/lottie/e$2.smali
index 3dc7f27cfa..dc1bb09a0b 100644
--- a/com.discord/smali/com/airbnb/lottie/e$2.smali
+++ b/com.discord/smali/com/airbnb/lottie/e$2.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic fX:Ljava/lang/String;
+.field final synthetic fW:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/e$2;->fX:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/e$2;->fW:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,7 +48,7 @@
 
     check-cast p1, Lcom/airbnb/lottie/d;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e$2;->fX:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/e$2;->fW:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -56,7 +56,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e$2;->fX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$2;->fW:Ljava/lang/String;
 
     invoke-virtual {v0, v1, p1}, Lcom/airbnb/lottie/c/g;->a(Ljava/lang/String;Lcom/airbnb/lottie/d;)V
 
@@ -65,7 +65,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e$2;->fX:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/e$2;->fW:Ljava/lang/String;
 
     invoke-interface {p1, v0}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/e$3.smali b/com.discord/smali/com/airbnb/lottie/e$3.smali
index 46dad10389..490900e3d5 100644
--- a/com.discord/smali/com/airbnb/lottie/e$3.smali
+++ b/com.discord/smali/com/airbnb/lottie/e$3.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic fX:Ljava/lang/String;
+.field final synthetic fW:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/e$3;->fX:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/e$3;->fW:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +50,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e$3;->fX:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/e$3;->fW:Ljava/lang/String;
 
     invoke-interface {p1, v0}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/e$4.smali b/com.discord/smali/com/airbnb/lottie/e$4.smali
index b2e28a4e0d..c3e12d5b2a 100644
--- a/com.discord/smali/com/airbnb/lottie/e$4.smali
+++ b/com.discord/smali/com/airbnb/lottie/e$4.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field final synthetic fY:Ljava/lang/String;
+.field final synthetic fX:Ljava/lang/String;
 
 .field final synthetic val$appContext:Landroid/content/Context;
 
@@ -39,7 +39,7 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/e$4;->val$appContext:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/e$4;->fY:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/e$4;->fX:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
 
     iget-object v0, p0, Lcom/airbnb/lottie/e$4;->val$appContext:Landroid/content/Context;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e$4;->fY:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$4;->fX:Ljava/lang/String;
 
     invoke-static {v0, v1}, Lcom/airbnb/lottie/e;->d(Landroid/content/Context;Ljava/lang/String;)Lcom/airbnb/lottie/k;
 
diff --git a/com.discord/smali/com/airbnb/lottie/e$5.smali b/com.discord/smali/com/airbnb/lottie/e$5.smali
index b6f6381bce..d8e26a06db 100644
--- a/com.discord/smali/com/airbnb/lottie/e$5.smali
+++ b/com.discord/smali/com/airbnb/lottie/e$5.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field final synthetic fZ:I
+.field final synthetic fY:I
 
 .field final synthetic val$appContext:Landroid/content/Context;
 
@@ -39,7 +39,7 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/e$5;->val$appContext:Landroid/content/Context;
 
-    iput p2, p0, Lcom/airbnb/lottie/e$5;->fZ:I
+    iput p2, p0, Lcom/airbnb/lottie/e$5;->fY:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
 
     iget-object v0, p0, Lcom/airbnb/lottie/e$5;->val$appContext:Landroid/content/Context;
 
-    iget v1, p0, Lcom/airbnb/lottie/e$5;->fZ:I
+    iget v1, p0, Lcom/airbnb/lottie/e$5;->fY:I
 
     invoke-static {v0, v1}, Lcom/airbnb/lottie/e;->b(Landroid/content/Context;I)Lcom/airbnb/lottie/k;
 
diff --git a/com.discord/smali/com/airbnb/lottie/e$6.smali b/com.discord/smali/com/airbnb/lottie/e$6.smali
index 2e51eb6cc9..914d797aa7 100644
--- a/com.discord/smali/com/airbnb/lottie/e$6.smali
+++ b/com.discord/smali/com/airbnb/lottie/e$6.smali
@@ -28,18 +28,18 @@
 
 
 # instance fields
-.field final synthetic fX:Ljava/lang/String;
+.field final synthetic fW:Ljava/lang/String;
 
-.field final synthetic ga:Lcom/airbnb/lottie/e/a/c;
+.field final synthetic fZ:Lcom/airbnb/lottie/e/a/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/e/a/c;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/e$6;->ga:Lcom/airbnb/lottie/e/a/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/e$6;->fZ:Lcom/airbnb/lottie/e/a/c;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/e$6;->fX:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/e$6;->fW:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,9 +56,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e$6;->ga:Lcom/airbnb/lottie/e/a/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e$6;->fZ:Lcom/airbnb/lottie/e/a/c;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e$6;->fX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$6;->fW:Ljava/lang/String;
 
     invoke-static {v0, v1}, Lcom/airbnb/lottie/e;->b(Lcom/airbnb/lottie/e/a/c;Ljava/lang/String;)Lcom/airbnb/lottie/k;
 
diff --git a/com.discord/smali/com/airbnb/lottie/e$7.smali b/com.discord/smali/com/airbnb/lottie/e$7.smali
index b3a00e9480..f83c2ca1de 100644
--- a/com.discord/smali/com/airbnb/lottie/e$7.smali
+++ b/com.discord/smali/com/airbnb/lottie/e$7.smali
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic gb:Lcom/airbnb/lottie/d;
+.field final synthetic ga:Lcom/airbnb/lottie/d;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/e$7;->gb:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/e$7;->ga:Lcom/airbnb/lottie/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,7 +54,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/k;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e$7;->gb:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$7;->ga:Lcom/airbnb/lottie/d;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/k;-><init>(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/e.smali b/com.discord/smali/com/airbnb/lottie/e.smali
index c4ab39103c..5917539812 100644
--- a/com.discord/smali/com/airbnb/lottie/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/e.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final fV:Ljava/util/Map;
+.field private static final fU:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -25,7 +25,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/e;->fV:Ljava/util/Map;
+    sput-object v0, Lcom/airbnb/lottie/e;->fU:Ljava/util/Map;
 
     return-void
 .end method
@@ -33,7 +33,7 @@
 .method private static a(Lcom/airbnb/lottie/d;Ljava/lang/String;)Lcom/airbnb/lottie/g;
     .locals 2
 
-    iget-object p0, p0, Lcom/airbnb/lottie/d;->fJ:Ljava/util/Map;
+    iget-object p0, p0, Lcom/airbnb/lottie/d;->fI:Ljava/util/Map;
 
     invoke-interface {p0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -56,7 +56,7 @@
 
     check-cast v0, Lcom/airbnb/lottie/g;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/g;->gz:Ljava/lang/String;
+    iget-object v1, v0, Lcom/airbnb/lottie/g;->gy:Ljava/lang/String;
 
     invoke-virtual {v1, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -302,7 +302,7 @@
     :cond_1
     if-eqz p0, :cond_2
 
-    sget-object v0, Lcom/airbnb/lottie/e;->fV:Ljava/util/Map;
+    sget-object v0, Lcom/airbnb/lottie/e;->fU:Ljava/util/Map;
 
     invoke-interface {v0, p0}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -310,7 +310,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p1, Lcom/airbnb/lottie/e;->fV:Ljava/util/Map;
+    sget-object p1, Lcom/airbnb/lottie/e;->fU:Ljava/util/Map;
 
     invoke-interface {p1, p0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -337,7 +337,7 @@
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/l;->c(Lcom/airbnb/lottie/h;)Lcom/airbnb/lottie/l;
 
-    sget-object p1, Lcom/airbnb/lottie/e;->fV:Ljava/util/Map;
+    sget-object p1, Lcom/airbnb/lottie/e;->fU:Ljava/util/Map;
 
     invoke-interface {p1, p0, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -347,7 +347,7 @@
 .method static synthetic aQ()Ljava/util/Map;
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/e;->fV:Ljava/util/Map;
+    sget-object v0, Lcom/airbnb/lottie/e;->fU:Ljava/util/Map;
 
     return-object v0
 .end method
@@ -660,12 +660,12 @@
 
     move-result-object v0
 
-    iput-object v0, v1, Lcom/airbnb/lottie/g;->gB:Landroid/graphics/Bitmap;
+    iput-object v0, v1, Lcom/airbnb/lottie/g;->gA:Landroid/graphics/Bitmap;
 
     goto :goto_2
 
     :cond_6
-    iget-object p0, v3, Lcom/airbnb/lottie/d;->fJ:Ljava/util/Map;
+    iget-object p0, v3, Lcom/airbnb/lottie/d;->fI:Ljava/util/Map;
 
     invoke-interface {p0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -694,7 +694,7 @@
 
     check-cast v1, Lcom/airbnb/lottie/g;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/g;->gB:Landroid/graphics/Bitmap;
+    iget-object v1, v1, Lcom/airbnb/lottie/g;->gA:Landroid/graphics/Bitmap;
 
     if-nez v1, :cond_7
 
@@ -714,7 +714,7 @@
 
     check-cast v0, Lcom/airbnb/lottie/g;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/g;->gz:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/g;->gy:Ljava/lang/String;
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/a.smali b/com.discord/smali/com/airbnb/lottie/e/a.smali
index 24c908cdd8..8f45d31f0c 100644
--- a/com.discord/smali/com/airbnb/lottie/e/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static mO:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/a;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/a;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->nr:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne v1, v2, :cond_2
 
@@ -75,7 +75,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->nv:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->nu:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne v1, v2, :cond_0
 
@@ -91,7 +91,7 @@
 
     move-result v2
 
-    sget-object v3, Lcom/airbnb/lottie/e/w;->nl:Lcom/airbnb/lottie/e/w;
+    sget-object v3, Lcom/airbnb/lottie/e/w;->nk:Lcom/airbnb/lottie/e/w;
 
     invoke-static {p0, p1, v2, v3, v1}, Lcom/airbnb/lottie/e/q;->a(Lcom/airbnb/lottie/e/a/c;Lcom/airbnb/lottie/d;FLcom/airbnb/lottie/e/ai;Z)Lcom/airbnb/lottie/g/a;
 
@@ -173,11 +173,11 @@
 
     move-result-object v5
 
-    sget-object v6, Lcom/airbnb/lottie/e/a/c$b;->nw:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v6, Lcom/airbnb/lottie/e/a/c$b;->nv:Lcom/airbnb/lottie/e/a/c$b;
 
     if-eq v5, v6, :cond_5
 
-    sget-object v5, Lcom/airbnb/lottie/e/a;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/a;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v5}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -202,7 +202,7 @@
 
     move-result-object v5
 
-    sget-object v6, Lcom/airbnb/lottie/e/a/c$b;->ny:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v6, Lcom/airbnb/lottie/e/a/c$b;->nx:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne v5, v6, :cond_1
 
@@ -222,7 +222,7 @@
 
     move-result-object v5
 
-    sget-object v6, Lcom/airbnb/lottie/e/a/c$b;->ny:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v6, Lcom/airbnb/lottie/e/a/c$b;->nx:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne v5, v6, :cond_3
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/a/c$a.smali b/com.discord/smali/com/airbnb/lottie/e/a/c$a.smali
index a4168f9128..26f87c8651 100644
--- a/com.discord/smali/com/airbnb/lottie/e/a/c$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/a/c$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final nr:Lokio/k;
+.field final nq:Lokio/k;
 
 .field final strings:[Ljava/lang/String;
 
@@ -28,7 +28,7 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/e/a/c$a;->strings:[Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/e/a/c$a;->nr:Lokio/k;
+    iput-object p2, p0, Lcom/airbnb/lottie/e/a/c$a;->nq:Lokio/k;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
-    invoke-virtual {v1}, Lokio/c;->HF()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/c;->Hs()Lokio/ByteString;
 
     move-result-object v3
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/a/c$b.smali b/com.discord/smali/com/airbnb/lottie/e/a/c$b.smali
index c4bb7cdd4e..ddd1cf1280 100644
--- a/com.discord/smali/com/airbnb/lottie/e/a/c$b.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/a/c$b.smali
@@ -27,9 +27,9 @@
 
 .field public static final enum nB:Lcom/airbnb/lottie/e/a/c$b;
 
-.field public static final enum nC:Lcom/airbnb/lottie/e/a/c$b;
+.field private static final synthetic nC:[Lcom/airbnb/lottie/e/a/c$b;
 
-.field private static final synthetic nD:[Lcom/airbnb/lottie/e/a/c$b;
+.field public static final enum nr:Lcom/airbnb/lottie/e/a/c$b;
 
 .field public static final enum nt:Lcom/airbnb/lottie/e/a/c$b;
 
@@ -58,7 +58,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/airbnb/lottie/e/a/c$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nr:Lcom/airbnb/lottie/e/a/c$b;
 
     new-instance v0, Lcom/airbnb/lottie/e/a/c$b;
 
@@ -68,7 +68,7 @@
 
     invoke-direct {v0, v3, v2}, Lcom/airbnb/lottie/e/a/c$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nu:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
 
     new-instance v0, Lcom/airbnb/lottie/e/a/c$b;
 
@@ -78,7 +78,7 @@
 
     invoke-direct {v0, v4, v3}, Lcom/airbnb/lottie/e/a/c$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nv:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nu:Lcom/airbnb/lottie/e/a/c$b;
 
     new-instance v0, Lcom/airbnb/lottie/e/a/c$b;
 
@@ -88,7 +88,7 @@
 
     invoke-direct {v0, v5, v4}, Lcom/airbnb/lottie/e/a/c$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nw:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nv:Lcom/airbnb/lottie/e/a/c$b;
 
     new-instance v0, Lcom/airbnb/lottie/e/a/c$b;
 
@@ -98,7 +98,7 @@
 
     invoke-direct {v0, v6, v5}, Lcom/airbnb/lottie/e/a/c$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nx:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nw:Lcom/airbnb/lottie/e/a/c$b;
 
     new-instance v0, Lcom/airbnb/lottie/e/a/c$b;
 
@@ -108,7 +108,7 @@
 
     invoke-direct {v0, v7, v6}, Lcom/airbnb/lottie/e/a/c$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->ny:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nx:Lcom/airbnb/lottie/e/a/c$b;
 
     new-instance v0, Lcom/airbnb/lottie/e/a/c$b;
 
@@ -118,7 +118,7 @@
 
     invoke-direct {v0, v8, v7}, Lcom/airbnb/lottie/e/a/c$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nz:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->ny:Lcom/airbnb/lottie/e/a/c$b;
 
     new-instance v0, Lcom/airbnb/lottie/e/a/c$b;
 
@@ -128,7 +128,7 @@
 
     invoke-direct {v0, v9, v8}, Lcom/airbnb/lottie/e/a/c$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nA:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nz:Lcom/airbnb/lottie/e/a/c$b;
 
     new-instance v0, Lcom/airbnb/lottie/e/a/c$b;
 
@@ -138,7 +138,7 @@
 
     invoke-direct {v0, v10, v9}, Lcom/airbnb/lottie/e/a/c$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nB:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nA:Lcom/airbnb/lottie/e/a/c$b;
 
     new-instance v0, Lcom/airbnb/lottie/e/a/c$b;
 
@@ -148,53 +148,53 @@
 
     invoke-direct {v0, v11, v10}, Lcom/airbnb/lottie/e/a/c$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nC:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nB:Lcom/airbnb/lottie/e/a/c$b;
 
     const/16 v0, 0xa
 
     new-array v0, v0, [Lcom/airbnb/lottie/e/a/c$b;
 
-    sget-object v11, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v11, Lcom/airbnb/lottie/e/a/c$b;->nr:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v11, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nu:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nv:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nu:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nw:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nv:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nx:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nw:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->ny:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nx:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nz:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->ny:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nA:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nz:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nB:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nA:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nC:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nB:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v10
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nD:[Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->nC:[Lcom/airbnb/lottie/e/a/c$b;
 
     return-void
 .end method
@@ -229,7 +229,7 @@
 .method public static values()[Lcom/airbnb/lottie/e/a/c$b;
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nD:[Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nC:[Lcom/airbnb/lottie/e/a/c$b;
 
     invoke-virtual {v0}, [Lcom/airbnb/lottie/e/a/c$b;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/a/c.smali b/com.discord/smali/com/airbnb/lottie/e/a/c.smali
index 6511a35499..bdd0e7e92a 100644
--- a/com.discord/smali/com/airbnb/lottie/e/a/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/a/c.smali
@@ -22,9 +22,9 @@
 # instance fields
 .field lenient:Z
 
-.field np:[I
+.field no:[I
 
-.field nq:Z
+.field np:Z
 
 .field pathIndices:[I
 
@@ -133,7 +133,7 @@
 
     new-array v1, v0, [I
 
-    iput-object v1, p0, Lcom/airbnb/lottie/e/a/c;->np:[I
+    iput-object v1, p0, Lcom/airbnb/lottie/e/a/c;->no:[I
 
     new-array v1, v0, [Ljava/lang/String;
 
@@ -168,7 +168,7 @@
 
     const/16 v1, 0x22
 
-    invoke-interface {p0, v1}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p0, v1}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
@@ -218,7 +218,7 @@
     invoke-interface {p0, p1, v4, v3}, Lokio/BufferedSink;->p(Ljava/lang/String;II)Lokio/BufferedSink;
 
     :cond_3
-    invoke-interface {p0, v5}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {p0, v5}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     add-int/lit8 v4, v3, 0x1
 
@@ -234,7 +234,7 @@
     invoke-interface {p0, p1, v4, v2}, Lokio/BufferedSink;->p(Ljava/lang/String;II)Lokio/BufferedSink;
 
     :cond_6
-    invoke-interface {p0, v1}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p0, v1}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
     return-void
 .end method
@@ -302,7 +302,7 @@
 
     iget v0, p0, Lcom/airbnb/lottie/e/a/c;->stackSize:I
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/c;->np:[I
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/c;->no:[I
 
     iget-object v2, p0, Lcom/airbnb/lottie/e/a/c;->pathNames:[Ljava/lang/String;
 
@@ -328,7 +328,7 @@
 
     iget v0, p0, Lcom/airbnb/lottie/e/a/c;->stackSize:I
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/c;->np:[I
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/c;->no:[I
 
     array-length v2, v1
 
@@ -346,7 +346,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/e/a/c;->np:[I
+    iput-object v0, p0, Lcom/airbnb/lottie/e/a/c;->no:[I
 
     iget-object v0, p0, Lcom/airbnb/lottie/e/a/c;->pathNames:[Ljava/lang/String;
 
@@ -401,7 +401,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/c;->np:[I
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/c;->no:[I
 
     iget v1, p0, Lcom/airbnb/lottie/e/a/c;->stackSize:I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/a/e.smali b/com.discord/smali/com/airbnb/lottie/e/a/e.smali
index 616c6c772b..6067b75bfa 100644
--- a/com.discord/smali/com/airbnb/lottie/e/a/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/a/e.smali
@@ -4,6 +4,8 @@
 
 
 # static fields
+.field private static final nD:Lokio/ByteString;
+
 .field private static final nE:Lokio/ByteString;
 
 .field private static final nF:Lokio/ByteString;
@@ -12,13 +14,11 @@
 
 .field private static final nH:Lokio/ByteString;
 
-.field private static final nI:Lokio/ByteString;
-
 
 # instance fields
-.field private final nJ:Lokio/d;
+.field private final nI:Lokio/d;
 
-.field private final nK:Lokio/c;
+.field private final nJ:Lokio/c;
 
 .field private peeked:I
 
@@ -35,44 +35,44 @@
 
     const-string v0, "\'\\"
 
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/airbnb/lottie/e/a/e;->nD:Lokio/ByteString;
+
+    const-string v0, "\"\\"
+
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
     sput-object v0, Lcom/airbnb/lottie/e/a/e;->nE:Lokio/ByteString;
 
-    const-string v0, "\"\\"
+    const-string v0, "{}[]:, \n\t\r\u000c/\\;#="
 
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
     sput-object v0, Lcom/airbnb/lottie/e/a/e;->nF:Lokio/ByteString;
 
-    const-string v0, "{}[]:, \n\t\r\u000c/\\;#="
+    const-string v0, "\n\r"
 
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
     sput-object v0, Lcom/airbnb/lottie/e/a/e;->nG:Lokio/ByteString;
 
-    const-string v0, "\n\r"
+    const-string v0, "*/"
 
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
     sput-object v0, Lcom/airbnb/lottie/e/a/e;->nH:Lokio/ByteString;
 
-    const-string v0, "*/"
-
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/ByteString;
-
     return-void
 .end method
 
@@ -87,13 +87,13 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
-    invoke-interface {p1}, Lokio/d;->Is()Lokio/c;
+    invoke-interface {p1}, Lokio/d;->If()Lokio/c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     const/4 p1, 0x6
 
@@ -169,7 +169,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
     invoke-interface {v1, p1}, Lokio/d;->k(Lokio/ByteString;)J
 
@@ -181,7 +181,7 @@
 
     if-eqz v5, :cond_3
 
-    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v3, v1, v2}, Lokio/c;->aH(J)B
 
@@ -198,7 +198,7 @@
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
     :cond_0
-    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v3, v1, v2}, Lokio/c;->aJ(J)Ljava/lang/String;
 
@@ -206,7 +206,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
@@ -221,20 +221,20 @@
     :cond_1
     if-nez v0, :cond_2
 
-    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {p1, v1, v2}, Lokio/c;->aJ(J)Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readByte()B
 
     return-object p1
 
     :cond_2
-    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {p1, v1, v2}, Lokio/c;->aJ(J)Ljava/lang/String;
 
@@ -242,7 +242,7 @@
 
     invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {p1}, Lokio/c;->readByte()B
 
@@ -277,7 +277,7 @@
     .end annotation
 
     :goto_0
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
     invoke-interface {v0, p1}, Lokio/d;->k(Lokio/ByteString;)J
 
@@ -289,7 +289,7 @@
 
     if-eqz v4, :cond_1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v2, v0, v1}, Lokio/c;->aH(J)B
 
@@ -301,7 +301,7 @@
 
     if-ne v2, v3, :cond_0
 
-    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     add-long/2addr v0, v4
 
@@ -312,7 +312,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     add-long/2addr v0, v4
 
@@ -344,9 +344,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/ByteString;
+    sget-object v1, Lcom/airbnb/lottie/e/a/e;->nH:Lokio/ByteString;
 
     invoke-interface {v0, v1}, Lokio/d;->j(Lokio/ByteString;)J
 
@@ -366,11 +366,11 @@
     const/4 v2, 0x0
 
     :goto_0
-    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     if-eqz v2, :cond_1
 
-    sget-object v4, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/ByteString;
+    sget-object v4, Lcom/airbnb/lottie/e/a/e;->nH:Lokio/ByteString;
 
     invoke-virtual {v4}, Lokio/ByteString;->size()I
 
@@ -425,7 +425,7 @@
 
     move-object/from16 v0, p0
 
-    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->np:[I
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->no:[I
 
     iget v2, v0, Lcom/airbnb/lottie/e/a/e;->stackSize:I
 
@@ -457,7 +457,7 @@
 
     if-ne v1, v3, :cond_0
 
-    iget-object v15, v0, Lcom/airbnb/lottie/e/a/e;->np:[I
+    iget-object v15, v0, Lcom/airbnb/lottie/e/a/e;->no:[I
 
     iget v6, v0, Lcom/airbnb/lottie/e/a/e;->stackSize:I
 
@@ -474,7 +474,7 @@
 
     move-result v6
 
-    iget-object v15, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v15, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v15}, Lokio/c;->readByte()B
 
@@ -514,7 +514,7 @@
     :cond_4
     if-ne v1, v13, :cond_6
 
-    iget-object v15, v0, Lcom/airbnb/lottie/e/a/e;->np:[I
+    iget-object v15, v0, Lcom/airbnb/lottie/e/a/e;->no:[I
 
     iget v14, v0, Lcom/airbnb/lottie/e/a/e;->stackSize:I
 
@@ -526,7 +526,7 @@
 
     move-result v6
 
-    iget-object v14, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v14, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v14}, Lokio/c;->readByte()B
 
@@ -540,7 +540,7 @@
 
     invoke-direct/range {p0 .. p0}, Lcom/airbnb/lottie/e/a/e;->checkLenient()V
 
-    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
     const-wide/16 v14, 0x1
 
@@ -550,7 +550,7 @@
 
     if-eqz v6, :cond_a
 
-    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v6, v4, v5}, Lokio/c;->aH(J)B
 
@@ -560,7 +560,7 @@
 
     if-ne v6, v14, :cond_a
 
-    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v6}, Lokio/c;->readByte()B
 
@@ -580,7 +580,7 @@
 
     if-ne v1, v6, :cond_7
 
-    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->np:[I
+    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->no:[I
 
     iget v14, v0, Lcom/airbnb/lottie/e/a/e;->stackSize:I
 
@@ -661,7 +661,7 @@
     return v1
 
     :cond_c
-    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1, v4, v5}, Lokio/c;->aH(J)B
 
@@ -691,7 +691,7 @@
     throw v1
 
     :cond_e
-    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
@@ -702,7 +702,7 @@
     :cond_f
     if-ne v1, v3, :cond_11
 
-    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
@@ -711,7 +711,7 @@
     return v13
 
     :cond_10
-    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
@@ -748,7 +748,7 @@
     :cond_14
     invoke-direct/range {p0 .. p0}, Lcom/airbnb/lottie/e/a/e;->checkLenient()V
 
-    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
@@ -757,7 +757,7 @@
     return v2
 
     :cond_15
-    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
@@ -778,7 +778,7 @@
 
     :cond_17
     :goto_2
-    iget-object v2, v0, Lcom/airbnb/lottie/e/a/e;->np:[I
+    iget-object v2, v0, Lcom/airbnb/lottie/e/a/e;->no:[I
 
     iget v4, v0, Lcom/airbnb/lottie/e/a/e;->stackSize:I
 
@@ -794,7 +794,7 @@
 
     move-result v4
 
-    iget-object v5, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v5, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v5}, Lokio/c;->readByte()B
 
@@ -863,7 +863,7 @@
     :cond_1c
     if-eq v1, v6, :cond_1d
 
-    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
@@ -881,7 +881,7 @@
     throw v1
 
     :cond_1e
-    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
@@ -894,7 +894,7 @@
     return v1
 
     :cond_1f
-    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
@@ -1003,7 +1003,7 @@
     const/4 v1, 0x0
 
     :goto_1
-    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
     add-int/lit8 v3, v1, 0x1
 
@@ -1015,7 +1015,7 @@
 
     if-eqz v2, :cond_7
 
-    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     int-to-long v4, v1
 
@@ -1039,7 +1039,7 @@
 
     if-eq v1, v2, :cond_6
 
-    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     add-int/lit8 v3, v3, -0x1
 
@@ -1051,7 +1051,7 @@
 
     if-ne v1, v2, :cond_4
 
-    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
     const-wide/16 v4, 0x2
 
@@ -1066,7 +1066,7 @@
     :cond_0
     invoke-direct {p0}, Lcom/airbnb/lottie/e/a/e;->checkLenient()V
 
-    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     const-wide/16 v4, 0x1
 
@@ -1083,11 +1083,11 @@
     return v1
 
     :cond_1
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
@@ -1096,11 +1096,11 @@
     goto :goto_0
 
     :cond_2
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
@@ -1171,9 +1171,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/e;->nG:Lokio/ByteString;
+    sget-object v1, Lcom/airbnb/lottie/e/a/e;->nF:Lokio/ByteString;
 
     invoke-interface {v0, v1}, Lokio/d;->k(Lokio/ByteString;)J
 
@@ -1185,7 +1185,7 @@
 
     if-eqz v4, :cond_0
 
-    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v2, v0, v1}, Lokio/c;->aJ(J)Ljava/lang/String;
 
@@ -1194,9 +1194,9 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->IA()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/c;->In()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1211,7 +1211,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     const-wide/16 v1, 0x0
 
@@ -1294,7 +1294,7 @@
     :goto_4
     if-ge v5, v4, :cond_8
 
-    iget-object v6, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v6, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
     add-int/lit8 v7, v5, 0x1
 
@@ -1309,7 +1309,7 @@
     return v1
 
     :cond_6
-    iget-object v6, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v6, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     int-to-long v8, v5
 
@@ -1337,7 +1337,7 @@
     goto :goto_4
 
     :cond_8
-    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
     add-int/lit8 v3, v4, 0x1
 
@@ -1349,7 +1349,7 @@
 
     if-eqz v2, :cond_9
 
-    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     int-to-long v5, v4
 
@@ -1366,7 +1366,7 @@
     return v1
 
     :cond_9
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     int-to-long v2, v4
 
@@ -1404,7 +1404,7 @@
     const/4 v10, 0x1
 
     :goto_0
-    iget-object v11, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v11, v0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
     add-int/lit8 v12, v5, 0x1
 
@@ -1418,7 +1418,7 @@
 
     if-eqz v11, :cond_15
 
-    iget-object v11, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v11, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     int-to-long v13, v5
 
@@ -1665,7 +1665,7 @@
     :goto_8
     iput-wide v7, v0, Lcom/airbnb/lottie/e/a/e;->peekedLong:J
 
-    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     int-to-long v2, v5
 
@@ -1712,7 +1712,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
     const-wide/16 v1, 0x1
 
@@ -1722,7 +1722,7 @@
 
     if-eqz v0, :cond_d
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readByte()B
 
@@ -1802,7 +1802,7 @@
     throw v0
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
     const-wide/16 v3, 0x4
 
@@ -1821,7 +1821,7 @@
 
     if-ge v0, v6, :cond_5
 
-    iget-object v6, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v6, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     int-to-long v7, v0
 
@@ -1889,7 +1889,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v1, v3, v4}, Lokio/c;->aJ(J)Ljava/lang/String;
 
@@ -1908,7 +1908,7 @@
     throw v0
 
     :cond_5
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v0, v3, v4}, Lokio/c;->aN(J)V
 
@@ -1989,15 +1989,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/e;->nH:Lokio/ByteString;
+    sget-object v1, Lcom/airbnb/lottie/e/a/e;->nG:Lokio/ByteString;
 
     invoke-interface {v0, v1}, Lokio/d;->k(Lokio/ByteString;)J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     const-wide/16 v3, -0x1
 
@@ -2028,15 +2028,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/e;->nG:Lokio/ByteString;
+    sget-object v1, Lcom/airbnb/lottie/e/a/e;->nF:Lokio/ByteString;
 
     invoke-interface {v0, v1}, Lokio/d;->k(Lokio/ByteString;)J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     const-wide/16 v3, -0x1
 
@@ -2098,9 +2098,9 @@
     return p1
 
     :cond_2
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
-    iget-object v3, p1, Lcom/airbnb/lottie/e/a/c$a;->nr:Lokio/k;
+    iget-object v3, p1, Lcom/airbnb/lottie/e/a/c$a;->nq:Lokio/k;
 
     invoke-interface {v0, v3}, Lokio/d;->a(Lokio/k;)I
 
@@ -2191,55 +2191,55 @@
     throw v0
 
     :pswitch_0
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nC:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :pswitch_1
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nz:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :pswitch_2
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nx:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :pswitch_3
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->ny:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :pswitch_4
     sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nB:Lcom/airbnb/lottie/e/a/c$b;
 
     return-object v0
 
-    :pswitch_5
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nA:Lcom/airbnb/lottie/e/a/c$b;
+    :pswitch_1
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->ny:Lcom/airbnb/lottie/e/a/c$b;
 
     return-object v0
 
-    :pswitch_6
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nu:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :pswitch_7
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :pswitch_8
+    :pswitch_2
     sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nw:Lcom/airbnb/lottie/e/a/c$b;
 
     return-object v0
 
-    :pswitch_9
+    :pswitch_3
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nx:Lcom/airbnb/lottie/e/a/c$b;
+
+    return-object v0
+
+    :pswitch_4
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nA:Lcom/airbnb/lottie/e/a/c$b;
+
+    return-object v0
+
+    :pswitch_5
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nz:Lcom/airbnb/lottie/e/a/c$b;
+
+    return-object v0
+
+    :pswitch_6
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
+
+    return-object v0
+
+    :pswitch_7
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nr:Lcom/airbnb/lottie/e/a/c$b;
+
+    return-object v0
+
+    :pswitch_8
     sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nv:Lcom/airbnb/lottie/e/a/c$b;
 
     return-object v0
 
+    :pswitch_9
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nu:Lcom/airbnb/lottie/e/a/c$b;
+
+    return-object v0
+
     nop
 
     :pswitch_data_0
@@ -2273,7 +2273,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/e/a/e;->nq:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/e/a/e;->np:Z
 
     if-nez v0, :cond_5
 
@@ -2299,7 +2299,7 @@
 
     if-ne v0, v1, :cond_2
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nF:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nE:Lokio/ByteString;
 
     invoke-direct {p0, v0}, Lcom/airbnb/lottie/e/a/e;->b(Lokio/ByteString;)V
 
@@ -2310,7 +2310,7 @@
 
     if-ne v0, v1, :cond_3
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nE:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nD:Lokio/ByteString;
 
     invoke-direct {p0, v0}, Lcom/airbnb/lottie/e/a/e;->b(Lokio/ByteString;)V
 
@@ -2555,7 +2555,7 @@
 
     iput v0, p0, Lcom/airbnb/lottie/e/a/e;->peeked:I
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->np:[I
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->no:[I
 
     const/16 v2, 0x8
 
@@ -2565,11 +2565,11 @@
 
     iput v0, p0, Lcom/airbnb/lottie/e/a/e;->stackSize:I
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->clear()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->close()V
 
@@ -2931,7 +2931,7 @@
 
     if-ne v0, v1, :cond_2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     iget v1, p0, Lcom/airbnb/lottie/e/a/e;->peekedNumberLength:I
 
@@ -2950,7 +2950,7 @@
 
     if-ne v0, v1, :cond_3
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nF:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nE:Lokio/ByteString;
 
     invoke-direct {p0, v0}, Lcom/airbnb/lottie/e/a/e;->a(Lokio/ByteString;)Ljava/lang/String;
 
@@ -2965,7 +2965,7 @@
 
     if-ne v0, v1, :cond_4
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nE:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nD:Lokio/ByteString;
 
     invoke-direct {p0, v0}, Lcom/airbnb/lottie/e/a/e;->a(Lokio/ByteString;)Ljava/lang/String;
 
@@ -3214,7 +3214,7 @@
 
     if-ne v0, v1, :cond_3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     iget v1, p0, Lcom/airbnb/lottie/e/a/e;->peekedNumberLength:I
 
@@ -3277,7 +3277,7 @@
     :goto_0
     if-ne v0, v1, :cond_7
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nF:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nE:Lokio/ByteString;
 
     invoke-direct {p0, v0}, Lcom/airbnb/lottie/e/a/e;->a(Lokio/ByteString;)Ljava/lang/String;
 
@@ -3286,7 +3286,7 @@
     goto :goto_1
 
     :cond_7
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nE:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nD:Lokio/ByteString;
 
     invoke-direct {p0, v0}, Lcom/airbnb/lottie/e/a/e;->a(Lokio/ByteString;)Ljava/lang/String;
 
@@ -3448,7 +3448,7 @@
 
     if-ne v0, v1, :cond_2
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nF:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nE:Lokio/ByteString;
 
     invoke-direct {p0, v0}, Lcom/airbnb/lottie/e/a/e;->a(Lokio/ByteString;)Ljava/lang/String;
 
@@ -3461,7 +3461,7 @@
 
     if-ne v0, v1, :cond_3
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nE:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nD:Lokio/ByteString;
 
     invoke-direct {p0, v0}, Lcom/airbnb/lottie/e/a/e;->a(Lokio/ByteString;)Ljava/lang/String;
 
@@ -3557,7 +3557,7 @@
 
     if-ne v0, v1, :cond_2
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nF:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nE:Lokio/ByteString;
 
     invoke-direct {p0, v0}, Lcom/airbnb/lottie/e/a/e;->a(Lokio/ByteString;)Ljava/lang/String;
 
@@ -3570,7 +3570,7 @@
 
     if-ne v0, v1, :cond_3
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nE:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->nD:Lokio/ByteString;
 
     invoke-direct {p0, v0}, Lcom/airbnb/lottie/e/a/e;->a(Lokio/ByteString;)Ljava/lang/String;
 
@@ -3609,7 +3609,7 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     iget v1, p0, Lcom/airbnb/lottie/e/a/e;->peekedNumberLength:I
 
@@ -3680,7 +3680,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/e/a/e;->nq:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/e/a/e;->np:Z
 
     if-nez v0, :cond_10
 
@@ -3852,7 +3852,7 @@
 
     if-ne v2, v3, :cond_b
 
-    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nK:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/c;
 
     iget v3, p0, Lcom/airbnb/lottie/e/a/e;->peekedNumberLength:I
 
@@ -3900,7 +3900,7 @@
 
     :cond_d
     :goto_1
-    sget-object v2, Lcom/airbnb/lottie/e/a/e;->nE:Lokio/ByteString;
+    sget-object v2, Lcom/airbnb/lottie/e/a/e;->nD:Lokio/ByteString;
 
     invoke-direct {p0, v2}, Lcom/airbnb/lottie/e/a/e;->b(Lokio/ByteString;)V
 
@@ -3908,7 +3908,7 @@
 
     :cond_e
     :goto_2
-    sget-object v2, Lcom/airbnb/lottie/e/a/e;->nF:Lokio/ByteString;
+    sget-object v2, Lcom/airbnb/lottie/e/a/e;->nE:Lokio/ByteString;
 
     invoke-direct {p0, v2}, Lcom/airbnb/lottie/e/a/e;->b(Lokio/ByteString;)V
 
@@ -3996,7 +3996,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nJ:Lokio/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->nI:Lokio/d;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/aa.smali b/com.discord/smali/com/airbnb/lottie/e/aa.smali
index 196a5aa63b..8e0fed6741 100644
--- a/com.discord/smali/com/airbnb/lottie/e/aa.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/aa.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static mO:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -49,7 +49,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/aa;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/aa;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     if-eqz v1, :cond_5
 
-    sget-object v1, Lcom/airbnb/lottie/e/aa;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v1, Lcom/airbnb/lottie/e/aa;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v1}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/ab.smali b/com.discord/smali/com/airbnb/lottie/e/ab.smali
index 1fff9414fc..bed661711a 100644
--- a/com.discord/smali/com/airbnb/lottie/e/ab.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/ab.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final nn:Lcom/airbnb/lottie/e/ab;
+.field public static final nm:Lcom/airbnb/lottie/e/ab;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/e/ab;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/e/ab;->nn:Lcom/airbnb/lottie/e/ab;
+    sput-object v0, Lcom/airbnb/lottie/e/ab;->nm:Lcom/airbnb/lottie/e/ab;
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nr:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne v0, v1, :cond_0
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/ac.smali b/com.discord/smali/com/airbnb/lottie/e/ac.smali
index f6f81134d2..441c36da4d 100644
--- a/com.discord/smali/com/airbnb/lottie/e/ac.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/ac.smali
@@ -18,9 +18,9 @@
 
 
 # static fields
-.field private static final mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final mO:Lcom/airbnb/lottie/e/a/c$a;
 
-.field public static final no:Lcom/airbnb/lottie/e/ac;
+.field public static final nn:Lcom/airbnb/lottie/e/ac;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/e/ac;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/e/ac;->no:Lcom/airbnb/lottie/e/ac;
+    sput-object v0, Lcom/airbnb/lottie/e/ac;->nn:Lcom/airbnb/lottie/e/ac;
 
     const/4 v0, 0x4
 
@@ -65,7 +65,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/ac;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ac;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -92,7 +92,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nr:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne v0, v1, :cond_0
 
@@ -120,7 +120,7 @@
 
     if-eqz v5, :cond_5
 
-    sget-object v5, Lcom/airbnb/lottie/e/ac;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/ac;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p1, v5}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -179,7 +179,7 @@
 
     move-result-object p2
 
-    sget-object v5, Lcom/airbnb/lottie/e/a/c$b;->nu:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v5, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne p2, v5, :cond_6
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/ad.smali b/com.discord/smali/com/airbnb/lottie/e/ad.smali
index dce73b669a..5a19908944 100644
--- a/com.discord/smali/com/airbnb/lottie/e/ad.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/ad.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final mO:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/ad;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ad;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -93,7 +93,7 @@
 
     if-eqz v2, :cond_6
 
-    sget-object v2, Lcom/airbnb/lottie/e/ad;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/ad;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v2}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/ae.smali b/com.discord/smali/com/airbnb/lottie/e/ae.smali
index 843be0659b..da27eb79c6 100644
--- a/com.discord/smali/com/airbnb/lottie/e/ae.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/ae.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static mO:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/ae;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ae;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     if-eqz v3, :cond_5
 
-    sget-object v3, Lcom/airbnb/lottie/e/ae;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/ae;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v3}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/af.smali b/com.discord/smali/com/airbnb/lottie/e/af.smali
index 5c81b3855b..999223d252 100644
--- a/com.discord/smali/com/airbnb/lottie/e/af.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/af.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static mP:Lcom/airbnb/lottie/e/a/c$a;
+.field static mO:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -43,7 +43,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/af;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/af;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     if-eqz v4, :cond_4
 
-    sget-object v4, Lcom/airbnb/lottie/e/af;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v4, Lcom/airbnb/lottie/e/af;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v4}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/ag.smali b/com.discord/smali/com/airbnb/lottie/e/ag.smali
index 7db1f8355f..ae7b41dbc7 100644
--- a/com.discord/smali/com/airbnb/lottie/e/ag.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/ag.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static mO:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final nb:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final na:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -75,7 +75,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/ag;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ag;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     new-array v0, v3, [Ljava/lang/String;
 
@@ -91,7 +91,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/ag;->nb:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ag;->na:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -139,7 +139,7 @@
 
     if-eqz v14, :cond_b
 
-    sget-object v14, Lcom/airbnb/lottie/e/ag;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v14, Lcom/airbnb/lottie/e/ag;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {v0, v14}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -178,7 +178,7 @@
 
     if-eqz v16, :cond_2
 
-    sget-object v2, Lcom/airbnb/lottie/e/ag;->nb:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/ag;->na:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {v0, v2}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -288,7 +288,7 @@
     goto :goto_5
 
     :cond_7
-    iput-boolean v14, v1, Lcom/airbnb/lottie/d;->fT:Z
+    iput-boolean v14, v1, Lcom/airbnb/lottie/d;->fS:Z
 
     invoke-interface {v3, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/ah.smali b/com.discord/smali/com/airbnb/lottie/e/ah.smali
index a7e280aa2e..61ec679904 100644
--- a/com.discord/smali/com/airbnb/lottie/e/ah.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/ah.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static mO:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/ah;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ah;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -91,7 +91,7 @@
 
     if-eqz v0, :cond_6
 
-    sget-object v0, Lcom/airbnb/lottie/e/ah;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/ah;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v0}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/b.smali b/com.discord/smali/com/airbnb/lottie/e/b.smali
index 54fe8898e2..0899155c92 100644
--- a/com.discord/smali/com/airbnb/lottie/e/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/b.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static mQ:Lcom/airbnb/lottie/e/a/c$a;
+.field private static mP:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static mR:Lcom/airbnb/lottie/e/a/c$a;
+.field private static mQ:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/airbnb/lottie/e/b;->mQ:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v1, Lcom/airbnb/lottie/e/b;->mP:Lcom/airbnb/lottie/e/a/c$a;
 
     const/4 v1, 0x4
 
@@ -57,7 +57,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/b;->mR:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/b;->mQ:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     if-eqz v2, :cond_6
 
-    sget-object v2, Lcom/airbnb/lottie/e/b;->mQ:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/b;->mP:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v2}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -115,7 +115,7 @@
 
     if-eqz v5, :cond_5
 
-    sget-object v5, Lcom/airbnb/lottie/e/b;->mR:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/b;->mQ:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v5}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/c.smali b/com.discord/smali/com/airbnb/lottie/e/c.smali
index 21599bf0f1..78c9b08667 100644
--- a/com.discord/smali/com/airbnb/lottie/e/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/c.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static mO:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static mS:Lcom/airbnb/lottie/e/a/c$a;
+.field private static mR:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -81,7 +81,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/c;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/c;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     new-array v0, v2, [Ljava/lang/String;
 
@@ -93,7 +93,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/c;->mS:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/c;->mR:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -114,7 +114,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->nv:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->nu:Lcom/airbnb/lottie/e/a/c$b;
 
     const/4 v10, 0x0
 
@@ -162,7 +162,7 @@
 
     if-eqz v2, :cond_6
 
-    sget-object v2, Lcom/airbnb/lottie/e/c;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/c;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {v0, v2}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -249,7 +249,7 @@
 
     const/16 v19, 0x0
 
-    iget v1, v8, Lcom/airbnb/lottie/d;->fR:F
+    iget v1, v8, Lcom/airbnb/lottie/d;->fQ:F
 
     invoke-static {v1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
@@ -284,7 +284,7 @@
 
     check-cast v1, Lcom/airbnb/lottie/g/a;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     if-nez v1, :cond_3
 
@@ -306,7 +306,7 @@
 
     const/4 v6, 0x0
 
-    iget v1, v8, Lcom/airbnb/lottie/d;->fR:F
+    iget v1, v8, Lcom/airbnb/lottie/d;->fQ:F
 
     invoke-static {v1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
@@ -329,7 +329,7 @@
     :pswitch_7
     new-instance v15, Lcom/airbnb/lottie/c/a/g;
 
-    sget-object v2, Lcom/airbnb/lottie/e/ab;->nn:Lcom/airbnb/lottie/e/ab;
+    sget-object v2, Lcom/airbnb/lottie/e/ab;->nm:Lcom/airbnb/lottie/e/ab;
 
     invoke-static {v0, v8, v3, v2}, Lcom/airbnb/lottie/e/r;->a(Lcom/airbnb/lottie/e/a/c;Lcom/airbnb/lottie/d;FLcom/airbnb/lottie/e/ai;)Ljava/util/List;
 
@@ -356,7 +356,7 @@
 
     if-eqz v2, :cond_5
 
-    sget-object v2, Lcom/airbnb/lottie/e/c;->mS:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/c;->mR:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {v0, v2}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -406,7 +406,7 @@
 
     check-cast v0, Lcom/airbnb/lottie/g/a;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     check-cast v0, Landroid/graphics/PointF;
 
@@ -455,7 +455,7 @@
 
     check-cast v0, Lcom/airbnb/lottie/g/a;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     check-cast v0, Landroid/graphics/PointF;
 
@@ -505,7 +505,7 @@
 
     check-cast v0, Lcom/airbnb/lottie/g/a;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Float;
 
@@ -557,7 +557,7 @@
 
     check-cast v0, Lcom/airbnb/lottie/g/a;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     check-cast v0, Lcom/airbnb/lottie/g/d;
 
@@ -618,7 +618,7 @@
 
     check-cast v0, Lcom/airbnb/lottie/g/a;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Float;
 
@@ -670,7 +670,7 @@
 
     check-cast v0, Lcom/airbnb/lottie/g/a;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Float;
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/d.smali b/com.discord/smali/com/airbnb/lottie/e/d.smali
index b8ab4b8de6..f2fa8881a1 100644
--- a/com.discord/smali/com/airbnb/lottie/e/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/d.smali
@@ -26,7 +26,7 @@
     const/high16 p2, 0x3f800000    # 1.0f
 
     :goto_0
-    sget-object v1, Lcom/airbnb/lottie/e/i;->mV:Lcom/airbnb/lottie/e/i;
+    sget-object v1, Lcom/airbnb/lottie/e/i;->mU:Lcom/airbnb/lottie/e/i;
 
     invoke-static {p0, p1, p2, v1}, Lcom/airbnb/lottie/e/r;->a(Lcom/airbnb/lottie/e/a/c;Lcom/airbnb/lottie/d;FLcom/airbnb/lottie/e/ai;)Ljava/util/List;
 
@@ -72,7 +72,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/c/a/d;
 
-    sget-object v1, Lcom/airbnb/lottie/e/o;->nc:Lcom/airbnb/lottie/e/o;
+    sget-object v1, Lcom/airbnb/lottie/e/o;->nb:Lcom/airbnb/lottie/e/o;
 
     const/high16 v2, 0x3f800000    # 1.0f
 
@@ -99,7 +99,7 @@
 
     move-result v1
 
-    sget-object v2, Lcom/airbnb/lottie/e/x;->nm:Lcom/airbnb/lottie/e/x;
+    sget-object v2, Lcom/airbnb/lottie/e/x;->nl:Lcom/airbnb/lottie/e/x;
 
     invoke-static {p0, p1, v1, v2}, Lcom/airbnb/lottie/e/r;->a(Lcom/airbnb/lottie/e/a/c;Lcom/airbnb/lottie/d;FLcom/airbnb/lottie/e/ai;)Ljava/util/List;
 
@@ -124,7 +124,7 @@
 
     move-result v1
 
-    sget-object v2, Lcom/airbnb/lottie/e/ac;->no:Lcom/airbnb/lottie/e/ac;
+    sget-object v2, Lcom/airbnb/lottie/e/ac;->nn:Lcom/airbnb/lottie/e/ac;
 
     invoke-static {p0, p1, v1, v2}, Lcom/airbnb/lottie/e/r;->a(Lcom/airbnb/lottie/e/a/c;Lcom/airbnb/lottie/d;FLcom/airbnb/lottie/e/ai;)Ljava/util/List;
 
@@ -145,7 +145,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/c/a/a;
 
-    sget-object v1, Lcom/airbnb/lottie/e/f;->mT:Lcom/airbnb/lottie/e/f;
+    sget-object v1, Lcom/airbnb/lottie/e/f;->mS:Lcom/airbnb/lottie/e/f;
 
     const/high16 v2, 0x3f800000    # 1.0f
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/e.smali b/com.discord/smali/com/airbnb/lottie/e/e.smali
index 884b182236..95b87f8fcb 100644
--- a/com.discord/smali/com/airbnb/lottie/e/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/e.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static mO:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -49,7 +49,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/e;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/e;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -97,7 +97,7 @@
 
     if-eqz p2, :cond_7
 
-    sget-object p2, Lcom/airbnb/lottie/e/e;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object p2, Lcom/airbnb/lottie/e/e;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, p2}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/f.smali b/com.discord/smali/com/airbnb/lottie/e/f.smali
index 168497b724..9f38a17989 100644
--- a/com.discord/smali/com/airbnb/lottie/e/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/f.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final mT:Lcom/airbnb/lottie/e/f;
+.field public static final mS:Lcom/airbnb/lottie/e/f;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/e/f;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/e/f;->mT:Lcom/airbnb/lottie/e/f;
+    sput-object v0, Lcom/airbnb/lottie/e/f;->mS:Lcom/airbnb/lottie/e/f;
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->nr:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne p2, v0, :cond_0
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/g.smali b/com.discord/smali/com/airbnb/lottie/e/g.smali
index fdde9106e0..29940677d9 100644
--- a/com.discord/smali/com/airbnb/lottie/e/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/g.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static mO:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/g;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/g;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
     if-eqz v2, :cond_2
 
-    sget-object v2, Lcom/airbnb/lottie/e/g;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/g;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v2}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/h.smali b/com.discord/smali/com/airbnb/lottie/e/h.smali
index 63138875cd..0b489a0a88 100644
--- a/com.discord/smali/com/airbnb/lottie/e/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/h.smali
@@ -18,9 +18,9 @@
 
 
 # static fields
-.field private static final mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final mO:Lcom/airbnb/lottie/e/a/c$a;
 
-.field public static final mU:Lcom/airbnb/lottie/e/h;
+.field public static final mT:Lcom/airbnb/lottie/e/h;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/e/h;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/e/h;->mU:Lcom/airbnb/lottie/e/h;
+    sput-object v0, Lcom/airbnb/lottie/e/h;->mT:Lcom/airbnb/lottie/e/h;
 
     const/16 v0, 0xb
 
@@ -107,7 +107,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/h;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/h;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -130,7 +130,7 @@
         }
     .end annotation
 
-    sget v0, Lcom/airbnb/lottie/c/b$a;->jI:I
+    sget v0, Lcom/airbnb/lottie/c/b$a;->jH:I
 
     invoke-virtual/range {p1 .. p1}, Lcom/airbnb/lottie/e/a/c;->beginObject()V
 
@@ -171,7 +171,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lcom/airbnb/lottie/e/h;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/h;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     move-object/from16 v2, p1
 
@@ -241,7 +241,7 @@
 
     move-result v0
 
-    sget v3, Lcom/airbnb/lottie/c/b$a;->jI:I
+    sget v3, Lcom/airbnb/lottie/c/b$a;->jH:I
 
     sub-int/2addr v3, v1
 
@@ -262,7 +262,7 @@
 
     :cond_1
     :goto_1
-    sget v11, Lcom/airbnb/lottie/c/b$a;->jI:I
+    sget v11, Lcom/airbnb/lottie/c/b$a;->jH:I
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/i.smali b/com.discord/smali/com/airbnb/lottie/e/i.smali
index abe87cbcca..b95885bc6a 100644
--- a/com.discord/smali/com/airbnb/lottie/e/i.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/i.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final mV:Lcom/airbnb/lottie/e/i;
+.field public static final mU:Lcom/airbnb/lottie/e/i;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/e/i;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/e/i;->mV:Lcom/airbnb/lottie/e/i;
+    sput-object v0, Lcom/airbnb/lottie/e/i;->mU:Lcom/airbnb/lottie/e/i;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/e/j.smali b/com.discord/smali/com/airbnb/lottie/e/j.smali
index b1082b9a86..e9e4c9ee88 100644
--- a/com.discord/smali/com/airbnb/lottie/e/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/j.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final mO:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final mW:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final mV:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -57,7 +57,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/j;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/j;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     new-array v0, v2, [Ljava/lang/String;
 
@@ -69,7 +69,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/j;->mW:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/j;->mV:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 
     if-eqz v0, :cond_9
 
-    sget-object v0, Lcom/airbnb/lottie/e/j;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/j;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v0}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -155,7 +155,7 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lcom/airbnb/lottie/e/j;->mW:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/j;->mV:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v0}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/k.smali b/com.discord/smali/com/airbnb/lottie/e/k.smali
index 85dff2996e..68d8a03906 100644
--- a/com.discord/smali/com/airbnb/lottie/e/k.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/k.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final mO:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -43,7 +43,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/k;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/k;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 
     if-eqz v4, :cond_4
 
-    sget-object v4, Lcom/airbnb/lottie/e/k;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v4, Lcom/airbnb/lottie/e/k;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v4}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/l.smali b/com.discord/smali/com/airbnb/lottie/e/l.smali
index ad33b6a477..a7d21b851f 100644
--- a/com.discord/smali/com/airbnb/lottie/e/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/l.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private mZ:I
+.field private mW:I
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/airbnb/lottie/e/l;->mZ:I
+    iput p1, p0, Lcom/airbnb/lottie/e/l;->mW:I
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
     move-object/from16 v2, p2
 
-    iget v3, v1, Lcom/airbnb/lottie/e/l;->mZ:I
+    iget v3, v1, Lcom/airbnb/lottie/e/l;->mW:I
 
     mul-int/lit8 v3, v3, 0x4
 
@@ -130,17 +130,17 @@
 
     :cond_2
     :goto_2
-    iget-object v2, v0, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     array-length v2, v2
 
     if-ge v7, v2, :cond_5
 
-    iget-object v2, v0, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     aget v2, v2, v7
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->km:[F
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->kl:[F
 
     aget v3, v3, v7
 
@@ -214,7 +214,7 @@
 
     move-result v2
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->kn:[I
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->km:[I
 
     aput v2, v3, v7
 
@@ -244,7 +244,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nr:Lcom/airbnb/lottie/e/a/c$b;
 
     const/4 v2, 0x1
 
@@ -292,7 +292,7 @@
     invoke-virtual {p1}, Lcom/airbnb/lottie/e/a/c;->endArray()V
 
     :cond_3
-    iget p1, p0, Lcom/airbnb/lottie/e/l;->mZ:I
+    iget p1, p0, Lcom/airbnb/lottie/e/l;->mW:I
 
     const/4 v0, -0x1
 
@@ -304,10 +304,10 @@
 
     div-int/lit8 p1, p1, 0x4
 
-    iput p1, p0, Lcom/airbnb/lottie/e/l;->mZ:I
+    iput p1, p0, Lcom/airbnb/lottie/e/l;->mW:I
 
     :cond_4
-    iget p1, p0, Lcom/airbnb/lottie/e/l;->mZ:I
+    iget p1, p0, Lcom/airbnb/lottie/e/l;->mW:I
 
     new-array v0, p1, [F
 
@@ -318,7 +318,7 @@
     const/4 v4, 0x0
 
     :goto_2
-    iget v5, p0, Lcom/airbnb/lottie/e/l;->mZ:I
+    iget v5, p0, Lcom/airbnb/lottie/e/l;->mW:I
 
     mul-int/lit8 v5, v5, 0x4
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/m.smali b/com.discord/smali/com/airbnb/lottie/e/m.smali
index 7233bfa849..253b63263f 100644
--- a/com.discord/smali/com/airbnb/lottie/e/m.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/m.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final mO:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final na:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final mZ:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -69,7 +69,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/m;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/m;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     new-array v0, v3, [Ljava/lang/String;
 
@@ -85,7 +85,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/m;->na:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/m;->mZ:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -127,7 +127,7 @@
 
     if-eqz v0, :cond_5
 
-    sget-object v0, Lcom/airbnb/lottie/e/m;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/m;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v0}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -190,12 +190,12 @@
 
     if-ne v0, v1, :cond_1
 
-    sget v0, Lcom/airbnb/lottie/c/b/f;->kB:I
+    sget v0, Lcom/airbnb/lottie/c/b/f;->kA:I
 
     goto :goto_2
 
     :cond_1
-    sget v0, Lcom/airbnb/lottie/c/b/f;->kC:I
+    sget v0, Lcom/airbnb/lottie/c/b/f;->kB:I
 
     :goto_2
     move v5, v0
@@ -221,7 +221,7 @@
 
     if-eqz v2, :cond_4
 
-    sget-object v2, Lcom/airbnb/lottie/e/m;->na:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/m;->mZ:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v2}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/n.smali b/com.discord/smali/com/airbnb/lottie/e/n.smali
index 2d32968247..188b59c4fd 100644
--- a/com.discord/smali/com/airbnb/lottie/e/n.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/n.smali
@@ -4,12 +4,12 @@
 
 
 # static fields
-.field private static mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static mO:Lcom/airbnb/lottie/e/a/c$a;
+
+.field private static final mZ:Lcom/airbnb/lottie/e/a/c$a;
 
 .field private static final na:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final nb:Lcom/airbnb/lottie/e/a/c$a;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -95,7 +95,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/n;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/n;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     new-array v0, v3, [Ljava/lang/String;
 
@@ -111,7 +111,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/n;->na:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/n;->mZ:Lcom/airbnb/lottie/e/a/c$a;
 
     new-array v0, v3, [Ljava/lang/String;
 
@@ -127,7 +127,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/n;->nb:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/n;->na:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -181,7 +181,7 @@
 
     if-eqz v17, :cond_c
 
-    sget-object v3, Lcom/airbnb/lottie/e/n;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/n;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {v0, v3}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -218,7 +218,7 @@
 
     if-eqz v19, :cond_2
 
-    sget-object v2, Lcom/airbnb/lottie/e/n;->nb:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/n;->na:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {v0, v2}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -302,7 +302,7 @@
     :goto_4
     const/4 v2, 0x1
 
-    iput-boolean v2, v1, Lcom/airbnb/lottie/d;->fT:Z
+    iput-boolean v2, v1, Lcom/airbnb/lottie/d;->fS:Z
 
     move-object/from16 v3, v18
 
@@ -428,12 +428,12 @@
 
     if-ne v3, v2, :cond_8
 
-    sget v2, Lcom/airbnb/lottie/c/b/f;->kB:I
+    sget v2, Lcom/airbnb/lottie/c/b/f;->kA:I
 
     goto :goto_7
 
     :cond_8
-    sget v2, Lcom/airbnb/lottie/c/b/f;->kC:I
+    sget v2, Lcom/airbnb/lottie/c/b/f;->kB:I
 
     :goto_7
     move v5, v2
@@ -459,7 +459,7 @@
 
     if-eqz v3, :cond_b
 
-    sget-object v3, Lcom/airbnb/lottie/e/n;->na:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/n;->mZ:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {v0, v3}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/o.smali b/com.discord/smali/com/airbnb/lottie/e/o.smali
index ab65bc3898..e776af2bb9 100644
--- a/com.discord/smali/com/airbnb/lottie/e/o.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/o.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final nc:Lcom/airbnb/lottie/e/o;
+.field public static final nb:Lcom/airbnb/lottie/e/o;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/e/o;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/e/o;->nc:Lcom/airbnb/lottie/e/o;
+    sput-object v0, Lcom/airbnb/lottie/e/o;->nb:Lcom/airbnb/lottie/e/o;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/e/p$1.smali b/com.discord/smali/com/airbnb/lottie/e/p$1.smali
index 63d1e02429..1c0ff90e0e 100644
--- a/com.discord/smali/com/airbnb/lottie/e/p$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/p$1.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final synthetic ne:[I
+.field static final synthetic nd:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/e/p$1;->ne:[I
+    sput-object v0, Lcom/airbnb/lottie/e/p$1;->nd:[I
 
     :try_start_0
-    sget-object v0, Lcom/airbnb/lottie/e/p$1;->ne:[I
+    sget-object v0, Lcom/airbnb/lottie/e/p$1;->nd:[I
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nz:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->ny:Lcom/airbnb/lottie/e/a/c$b;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/e/a/c$b;->ordinal()I
 
@@ -49,9 +49,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/airbnb/lottie/e/p$1;->ne:[I
+    sget-object v0, Lcom/airbnb/lottie/e/p$1;->nd:[I
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nr:Lcom/airbnb/lottie/e/a/c$b;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/e/a/c$b;->ordinal()I
 
@@ -65,9 +65,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lcom/airbnb/lottie/e/p$1;->ne:[I
+    sget-object v0, Lcom/airbnb/lottie/e/p$1;->nd:[I
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nv:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nu:Lcom/airbnb/lottie/e/a/c$b;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/e/a/c$b;->ordinal()I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/p.smali b/com.discord/smali/com/airbnb/lottie/e/p.smali
index 6818dbb689..60de3342fd 100644
--- a/com.discord/smali/com/airbnb/lottie/e/p.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/p.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final nd:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final nc:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/p;->nd:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/p;->nc:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -125,7 +125,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->nr:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne v1, v2, :cond_0
 
@@ -159,7 +159,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/airbnb/lottie/e/p$1;->ne:[I
+    sget-object v1, Lcom/airbnb/lottie/e/p$1;->nd:[I
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/e/a/c$b;->ordinal()I
 
@@ -234,7 +234,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/airbnb/lottie/e/p$1;->ne:[I
+    sget-object v0, Lcom/airbnb/lottie/e/p$1;->nd:[I
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/e/a/c;->bC()Lcom/airbnb/lottie/e/a/c$b;
 
@@ -372,7 +372,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/airbnb/lottie/e/a/c$b;->nu:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v3, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
 
     if-eq v2, v3, :cond_0
 
@@ -415,7 +415,7 @@
 
     if-eqz v2, :cond_2
 
-    sget-object v2, Lcom/airbnb/lottie/e/p;->nd:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/p;->nc:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v2}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/q.smali b/com.discord/smali/com/airbnb/lottie/e/q.smali
index 0c0571832f..faed391b8e 100644
--- a/com.discord/smali/com/airbnb/lottie/e/q.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/q.smali
@@ -6,9 +6,9 @@
 # static fields
 .field private static final LINEAR_INTERPOLATOR:Landroid/view/animation/Interpolator;
 
-.field static mP:Lcom/airbnb/lottie/e/a/c$a;
+.field static mO:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static nf:Landroidx/collection/SparseArrayCompat;
+.field private static ne:Landroidx/collection/SparseArrayCompat;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/SparseArrayCompat<",
@@ -86,7 +86,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/q;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/q;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -159,7 +159,7 @@
 
     if-eqz v10, :cond_1
 
-    sget-object v10, Lcom/airbnb/lottie/e/q;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v10, Lcom/airbnb/lottie/e/q;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {v0, v10}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -382,9 +382,9 @@
 
     invoke-direct/range {v7 .. v13}, Lcom/airbnb/lottie/g/a;-><init>(Lcom/airbnb/lottie/d;Ljava/lang/Object;Ljava/lang/Object;Landroid/view/animation/Interpolator;FLjava/lang/Float;)V
 
-    iput-object v14, v0, Lcom/airbnb/lottie/g/a;->ol:Landroid/graphics/PointF;
+    iput-object v14, v0, Lcom/airbnb/lottie/g/a;->ok:Landroid/graphics/PointF;
 
-    iput-object v15, v0, Lcom/airbnb/lottie/g/a;->om:Landroid/graphics/PointF;
+    iput-object v15, v0, Lcom/airbnb/lottie/g/a;->ol:Landroid/graphics/PointF;
 
     return-object v0
 
@@ -460,7 +460,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/e/q;->nf:Landroidx/collection/SparseArrayCompat;
+    sget-object v1, Lcom/airbnb/lottie/e/q;->ne:Landroidx/collection/SparseArrayCompat;
 
     invoke-virtual {v1, p0, p1}, Landroidx/collection/SparseArrayCompat;->put(ILjava/lang/Object;)V
 
@@ -494,7 +494,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/e/q;->nf:Landroidx/collection/SparseArrayCompat;
+    sget-object v1, Lcom/airbnb/lottie/e/q;->ne:Landroidx/collection/SparseArrayCompat;
 
     if-nez v1, :cond_0
 
@@ -502,10 +502,10 @@
 
     invoke-direct {v1}, Landroidx/collection/SparseArrayCompat;-><init>()V
 
-    sput-object v1, Lcom/airbnb/lottie/e/q;->nf:Landroidx/collection/SparseArrayCompat;
+    sput-object v1, Lcom/airbnb/lottie/e/q;->ne:Landroidx/collection/SparseArrayCompat;
 
     :cond_0
-    sget-object v1, Lcom/airbnb/lottie/e/q;->nf:Landroidx/collection/SparseArrayCompat;
+    sget-object v1, Lcom/airbnb/lottie/e/q;->ne:Landroidx/collection/SparseArrayCompat;
 
     invoke-virtual {v1, p0}, Landroidx/collection/SparseArrayCompat;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/r.smali b/com.discord/smali/com/airbnb/lottie/e/r.smali
index 60eb517311..9b940a9475 100644
--- a/com.discord/smali/com/airbnb/lottie/e/r.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/r.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static mP:Lcom/airbnb/lottie/e/a/c$a;
+.field static mO:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/r;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/r;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->ny:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->nx:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne v1, v2, :cond_0
 
@@ -82,7 +82,7 @@
 
     if-eqz v1, :cond_5
 
-    sget-object v1, Lcom/airbnb/lottie/e/r;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v1, Lcom/airbnb/lottie/e/r;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v1}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -99,7 +99,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->nr:Lcom/airbnb/lottie/e/a/c$b;
 
     const/4 v3, 0x0
 
@@ -111,7 +111,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->nz:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->ny:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne v1, v2, :cond_2
 
@@ -206,25 +206,25 @@
 
     check-cast v3, Lcom/airbnb/lottie/g/a;
 
-    iget v4, v3, Lcom/airbnb/lottie/g/a;->fQ:F
+    iget v4, v3, Lcom/airbnb/lottie/g/a;->fP:F
 
     invoke-static {v4}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
     move-result-object v4
 
-    iput-object v4, v2, Lcom/airbnb/lottie/g/a;->oe:Ljava/lang/Float;
+    iput-object v4, v2, Lcom/airbnb/lottie/g/a;->od:Ljava/lang/Float;
 
-    iget-object v4, v2, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v4, v2, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     if-nez v4, :cond_0
 
-    iget-object v4, v3, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v4, v3, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     if-eqz v4, :cond_0
 
-    iget-object v3, v3, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v3, v3, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
-    iput-object v3, v2, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iput-object v3, v2, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     instance-of v3, v2, Lcom/airbnb/lottie/a/b/h;
 
@@ -243,11 +243,11 @@
 
     check-cast v0, Lcom/airbnb/lottie/g/a;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v1, v0, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v1, v0, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     if-nez v1, :cond_3
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/s.smali b/com.discord/smali/com/airbnb/lottie/e/s.smali
index 3b252e3fe6..23ea15e329 100644
--- a/com.discord/smali/com/airbnb/lottie/e/s.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/s.smali
@@ -4,12 +4,12 @@
 
 
 # static fields
-.field private static final mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final mO:Lcom/airbnb/lottie/e/a/c$a;
+
+.field private static final nf:Lcom/airbnb/lottie/e/a/c$a;
 
 .field private static final ng:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final nh:Lcom/airbnb/lottie/e/a/c$a;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -161,7 +161,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/s;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/s;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -177,7 +177,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/s;->ng:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/s;->nf:Lcom/airbnb/lottie/e/a/c$a;
 
     new-array v0, v3, [Ljava/lang/String;
 
@@ -187,7 +187,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/s;->nh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/s;->ng:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -199,7 +199,7 @@
 
     move-object/from16 v0, p0
 
-    iget-object v3, v0, Lcom/airbnb/lottie/d;->fP:Landroid/graphics/Rect;
+    iget-object v3, v0, Lcom/airbnb/lottie/d;->fO:Landroid/graphics/Rect;
 
     new-instance v25, Lcom/airbnb/lottie/c/c/d;
 
@@ -209,7 +209,7 @@
 
     move-result-object v1
 
-    sget-object v6, Lcom/airbnb/lottie/c/c/d$a;->mn:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v6, Lcom/airbnb/lottie/c/c/d$a;->mm:Lcom/airbnb/lottie/c/c/d$a;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
@@ -233,7 +233,7 @@
 
     move-result-object v21
 
-    sget v22, Lcom/airbnb/lottie/c/c/d$b;->mv:I
+    sget v22, Lcom/airbnb/lottie/c/c/d$b;->mu:I
 
     const-string v3, "__container"
 
@@ -278,7 +278,7 @@
 
     move-object/from16 v7, p1
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->mv:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->mu:I
 
     new-instance v10, Ljava/util/ArrayList;
 
@@ -361,7 +361,7 @@
 
     if-eqz v5, :cond_c
 
-    sget-object v5, Lcom/airbnb/lottie/e/s;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/s;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {v0, v5}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -497,7 +497,7 @@
 
     if-eqz v6, :cond_1
 
-    sget-object v6, Lcom/airbnb/lottie/e/s;->nh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v6, Lcom/airbnb/lottie/e/s;->ng:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {v0, v6}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -552,7 +552,7 @@
 
     if-eqz v5, :cond_7
 
-    sget-object v5, Lcom/airbnb/lottie/e/s;->ng:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/s;->nf:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {v0, v5}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -603,7 +603,7 @@
     :cond_6
     new-instance v5, Lcom/airbnb/lottie/c/a/j;
 
-    sget-object v3, Lcom/airbnb/lottie/e/h;->mU:Lcom/airbnb/lottie/e/h;
+    sget-object v3, Lcom/airbnb/lottie/e/h;->mT:Lcom/airbnb/lottie/e/h;
 
     invoke-static {v0, v7, v2, v3}, Lcom/airbnb/lottie/e/r;->a(Lcom/airbnb/lottie/e/a/c;Lcom/airbnb/lottie/d;FLcom/airbnb/lottie/e/ai;)Ljava/util/List;
 
@@ -764,7 +764,7 @@
 
     move-result v3
 
-    sget-object v5, Lcom/airbnb/lottie/c/c/d$a;->mt:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v5, Lcom/airbnb/lottie/c/c/d$a;->ms:Lcom/airbnb/lottie/c/c/d$a;
 
     invoke-virtual {v5}, Lcom/airbnb/lottie/c/c/d$a;->ordinal()I
 
@@ -781,7 +781,7 @@
     goto :goto_7
 
     :cond_b
-    sget-object v16, Lcom/airbnb/lottie/c/c/d$a;->mt:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v16, Lcom/airbnb/lottie/c/c/d$a;->ms:Lcom/airbnb/lottie/c/c/d$a;
 
     goto :goto_7
 
@@ -877,7 +877,7 @@
     goto :goto_9
 
     :cond_e
-    iget v0, v7, Lcom/airbnb/lottie/d;->fR:F
+    iget v0, v7, Lcom/airbnb/lottie/d;->fQ:F
 
     move/from16 v35, v0
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/t.smali b/com.discord/smali/com/airbnb/lottie/e/t.smali
index c03cd480c6..0dd029f54c 100644
--- a/com.discord/smali/com/airbnb/lottie/e/t.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/t.smali
@@ -4,14 +4,14 @@
 
 
 # static fields
-.field private static final mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final mO:Lcom/airbnb/lottie/e/a/c$a;
 
-.field static ni:Lcom/airbnb/lottie/e/a/c$a;
+.field static nh:Lcom/airbnb/lottie/e/a/c$a;
+
+.field private static final ni:Lcom/airbnb/lottie/e/a/c$a;
 
 .field private static final nj:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final nk:Lcom/airbnb/lottie/e/a/c$a;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -91,7 +91,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/t;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/t;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     new-array v0, v10, [Ljava/lang/String;
 
@@ -117,7 +117,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/t;->ni:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/t;->nh:Lcom/airbnb/lottie/e/a/c$a;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -129,7 +129,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/t;->nj:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/t;->ni:Lcom/airbnb/lottie/e/a/c$a;
 
     new-array v0, v6, [Ljava/lang/String;
 
@@ -149,7 +149,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/t;->nk:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/t;->nj:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -238,9 +238,9 @@
 
     move-result-object v1
 
-    iget-object v2, v1, Lcom/airbnb/lottie/c/c/d;->lZ:Lcom/airbnb/lottie/c/c/d$a;
+    iget-object v2, v1, Lcom/airbnb/lottie/c/c/d;->lY:Lcom/airbnb/lottie/c/c/d$a;
 
-    sget-object v3, Lcom/airbnb/lottie/c/c/d$a;->mp:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v3, Lcom/airbnb/lottie/c/c/d$a;->mo:Lcom/airbnb/lottie/c/c/d$a;
 
     if-ne v2, v3, :cond_1
 
@@ -249,7 +249,7 @@
     :cond_1
     invoke-interface {p2, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-wide v2, v1, Lcom/airbnb/lottie/c/c/d;->lY:J
+    iget-wide v2, v1, Lcom/airbnb/lottie/c/c/d;->lX:J
 
     invoke-virtual {p3, v2, v3, v1}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
 
@@ -348,7 +348,7 @@
 
     if-eqz v2, :cond_7
 
-    sget-object v2, Lcom/airbnb/lottie/e/t;->ni:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/t;->nh:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v2}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -424,7 +424,7 @@
 
     move-result-object v2
 
-    iget-wide v3, v2, Lcom/airbnb/lottie/c/c/d;->lY:J
+    iget-wide v3, v2, Lcom/airbnb/lottie/c/c/d;->lX:J
 
     invoke-virtual {v1, v3, v4, v2}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
 
@@ -514,7 +514,7 @@
 
     if-eqz v3, :cond_3
 
-    sget-object v3, Lcom/airbnb/lottie/e/t;->nk:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/t;->nj:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v3}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -606,7 +606,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lcom/airbnb/lottie/e/t;->nj:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/t;->ni:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v0}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -718,7 +718,7 @@
 
     if-eqz v16, :cond_1
 
-    sget-object v11, Lcom/airbnb/lottie/e/t;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v11, Lcom/airbnb/lottie/e/t;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {v0, v11}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
@@ -916,29 +916,29 @@
 
     invoke-direct {v7, v10, v10, v6, v1}, Landroid/graphics/Rect;-><init>(IIII)V
 
-    iput-object v7, v9, Lcom/airbnb/lottie/d;->fP:Landroid/graphics/Rect;
+    iput-object v7, v9, Lcom/airbnb/lottie/d;->fO:Landroid/graphics/Rect;
 
-    iput v13, v9, Lcom/airbnb/lottie/d;->fQ:F
+    iput v13, v9, Lcom/airbnb/lottie/d;->fP:F
 
-    iput v14, v9, Lcom/airbnb/lottie/d;->fR:F
+    iput v14, v9, Lcom/airbnb/lottie/d;->fQ:F
 
-    iput v15, v9, Lcom/airbnb/lottie/d;->fS:F
+    iput v15, v9, Lcom/airbnb/lottie/d;->fR:F
 
-    iput-object v3, v9, Lcom/airbnb/lottie/d;->fO:Ljava/util/List;
+    iput-object v3, v9, Lcom/airbnb/lottie/d;->fN:Ljava/util/List;
 
-    iput-object v2, v9, Lcom/airbnb/lottie/d;->fN:Landroidx/collection/LongSparseArray;
+    iput-object v2, v9, Lcom/airbnb/lottie/d;->fM:Landroidx/collection/LongSparseArray;
 
-    iput-object v4, v9, Lcom/airbnb/lottie/d;->fI:Ljava/util/Map;
+    iput-object v4, v9, Lcom/airbnb/lottie/d;->fH:Ljava/util/Map;
 
-    iput-object v5, v9, Lcom/airbnb/lottie/d;->fJ:Ljava/util/Map;
+    iput-object v5, v9, Lcom/airbnb/lottie/d;->fI:Ljava/util/Map;
 
-    iput-object v8, v9, Lcom/airbnb/lottie/d;->fM:Landroidx/collection/SparseArrayCompat;
+    iput-object v8, v9, Lcom/airbnb/lottie/d;->fL:Landroidx/collection/SparseArrayCompat;
 
-    iput-object v0, v9, Lcom/airbnb/lottie/d;->fK:Ljava/util/Map;
+    iput-object v0, v9, Lcom/airbnb/lottie/d;->fJ:Ljava/util/Map;
 
     move-object/from16 v0, v18
 
-    iput-object v0, v9, Lcom/airbnb/lottie/d;->fL:Ljava/util/List;
+    iput-object v0, v9, Lcom/airbnb/lottie/d;->fK:Ljava/util/List;
 
     return-object v9
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/u.smali b/com.discord/smali/com/airbnb/lottie/e/u.smali
index 249d5a8552..5ea4db04e3 100644
--- a/com.discord/smali/com/airbnb/lottie/e/u.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/u.smali
@@ -243,7 +243,7 @@
 
     invoke-static {v0}, Lcom/airbnb/lottie/f/d;->warning(Ljava/lang/String;)V
 
-    sget v0, Lcom/airbnb/lottie/c/b/g$a;->kH:I
+    sget v0, Lcom/airbnb/lottie/c/b/g$a;->kG:I
 
     goto/16 :goto_0
 
@@ -252,20 +252,20 @@
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/d;->r(Ljava/lang/String;)V
 
-    sget v0, Lcom/airbnb/lottie/c/b/g$a;->kJ:I
-
-    goto/16 :goto_0
-
-    :cond_e
     sget v0, Lcom/airbnb/lottie/c/b/g$a;->kI:I
 
     goto/16 :goto_0
 
-    :cond_f
+    :cond_e
     sget v0, Lcom/airbnb/lottie/c/b/g$a;->kH:I
 
     goto/16 :goto_0
 
+    :cond_f
+    sget v0, Lcom/airbnb/lottie/c/b/g$a;->kG:I
+
+    goto/16 :goto_0
+
     :cond_10
     invoke-virtual {p0}, Lcom/airbnb/lottie/e/a/c;->endObject()V
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/v.smali b/com.discord/smali/com/airbnb/lottie/e/v.smali
index bfac4e6be3..25500cf19f 100644
--- a/com.discord/smali/com/airbnb/lottie/e/v.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/v.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final mO:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/v;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/v;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     if-eqz v3, :cond_3
 
-    sget-object v3, Lcom/airbnb/lottie/e/v;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/v;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v3}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/w.smali b/com.discord/smali/com/airbnb/lottie/e/w.smali
index 56e46aef54..1cafcbe99b 100644
--- a/com.discord/smali/com/airbnb/lottie/e/w.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/w.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final nl:Lcom/airbnb/lottie/e/w;
+.field public static final nk:Lcom/airbnb/lottie/e/w;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/e/w;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/e/w;->nl:Lcom/airbnb/lottie/e/w;
+    sput-object v0, Lcom/airbnb/lottie/e/w;->nk:Lcom/airbnb/lottie/e/w;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/e/x.smali b/com.discord/smali/com/airbnb/lottie/e/x.smali
index 6b39fe8c62..7d55754fa1 100644
--- a/com.discord/smali/com/airbnb/lottie/e/x.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/x.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final nm:Lcom/airbnb/lottie/e/x;
+.field public static final nl:Lcom/airbnb/lottie/e/x;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/e/x;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/e/x;->nm:Lcom/airbnb/lottie/e/x;
+    sput-object v0, Lcom/airbnb/lottie/e/x;->nl:Lcom/airbnb/lottie/e/x;
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nt:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nr:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne v0, v1, :cond_0
 
@@ -67,7 +67,7 @@
     return-object p1
 
     :cond_0
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nv:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nu:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne v0, v1, :cond_1
 
@@ -78,7 +78,7 @@
     return-object p1
 
     :cond_1
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->nz:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->ny:Lcom/airbnb/lottie/e/a/c$b;
 
     if-ne v0, v1, :cond_3
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/y.smali b/com.discord/smali/com/airbnb/lottie/e/y.smali
index 8086e23667..80857c6533 100644
--- a/com.discord/smali/com/airbnb/lottie/e/y.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/y.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final mO:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -79,7 +79,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/y;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/y;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -123,7 +123,7 @@
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/airbnb/lottie/e/y;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v1, Lcom/airbnb/lottie/e/y;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v1}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/z.smali b/com.discord/smali/com/airbnb/lottie/e/z.smali
index 44e4bf681b..2403daa13e 100644
--- a/com.discord/smali/com/airbnb/lottie/e/z.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/z.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static mP:Lcom/airbnb/lottie/e/a/c$a;
+.field private static mO:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -49,7 +49,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/z;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/z;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     if-eqz v0, :cond_5
 
-    sget-object v0, Lcom/airbnb/lottie/e/z;->mP:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/z;->mO:Lcom/airbnb/lottie/e/a/c$a;
 
     invoke-virtual {p0, v0}, Lcom/airbnb/lottie/e/a/c;->a(Lcom/airbnb/lottie/e/a/c$a;)I
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$1.smali b/com.discord/smali/com/airbnb/lottie/f$1.smali
index 118b3e7db7..d4a2462d00 100644
--- a/com.discord/smali/com/airbnb/lottie/f$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$1;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$1;->gn:Lcom/airbnb/lottie/f;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/f$1;->go:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/f$1;->gn:Lcom/airbnb/lottie/f;
 
     invoke-static {p1}, Lcom/airbnb/lottie/f;->a(Lcom/airbnb/lottie/f;)Lcom/airbnb/lottie/c/c/b;
 
@@ -45,13 +45,13 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/f$1;->go:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/f$1;->gn:Lcom/airbnb/lottie/f;
 
     invoke-static {p1}, Lcom/airbnb/lottie/f;->a(Lcom/airbnb/lottie/f;)Lcom/airbnb/lottie/c/c/b;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$1;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$1;->gn:Lcom/airbnb/lottie/f;
 
     invoke-static {v0}, Lcom/airbnb/lottie/f;->b(Lcom/airbnb/lottie/f;)Lcom/airbnb/lottie/f/e;
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$10.smali b/com.discord/smali/com/airbnb/lottie/f$10.smali
index bdab3e41c3..bfdd36dee8 100644
--- a/com.discord/smali/com/airbnb/lottie/f$10.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$10.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
 
-.field final synthetic gx:F
+.field final synthetic gw:F
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;F)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$10;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$10;->gn:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$10;->gx:F
+    iput p2, p0, Lcom/airbnb/lottie/f$10;->gw:F
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aW()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$10;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$10;->gn:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$10;->gx:F
+    iget v1, p0, Lcom/airbnb/lottie/f$10;->gw:F
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f;->setMinProgress(F)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$11.smali b/com.discord/smali/com/airbnb/lottie/f$11.smali
index 3c3355ef71..f744133783 100644
--- a/com.discord/smali/com/airbnb/lottie/f$11.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$11.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
 
-.field final synthetic gr:I
+.field final synthetic gq:I
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$11;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$11;->gn:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$11;->gr:I
+    iput p2, p0, Lcom/airbnb/lottie/f$11;->gq:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aW()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$11;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$11;->gn:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$11;->gr:I
+    iget v1, p0, Lcom/airbnb/lottie/f$11;->gq:I
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f;->setMaxFrame(I)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$12.smali b/com.discord/smali/com/airbnb/lottie/f$12.smali
index d8bf41fb10..c520b72546 100644
--- a/com.discord/smali/com/airbnb/lottie/f$12.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$12.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
 
-.field final synthetic gy:F
+.field final synthetic gx:F
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;F)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$12;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$12;->gn:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$12;->gy:F
+    iput p2, p0, Lcom/airbnb/lottie/f$12;->gx:F
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aW()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$12;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$12;->gn:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$12;->gy:F
+    iget v1, p0, Lcom/airbnb/lottie/f$12;->gx:F
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f;->setMaxProgress(F)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$13.smali b/com.discord/smali/com/airbnb/lottie/f$13.smali
index 855d0e3985..034b80233f 100644
--- a/com.discord/smali/com/airbnb/lottie/f$13.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$13.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
 
-.field final synthetic gp:Ljava/lang/String;
+.field final synthetic go:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$13;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$13;->gn:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/f$13;->gp:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/f$13;->go:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aW()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$13;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$13;->gn:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f$13;->gp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/f$13;->go:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f;->setMinFrame(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$14.smali b/com.discord/smali/com/airbnb/lottie/f$14.smali
index 19feb8f6f1..de562092e7 100644
--- a/com.discord/smali/com/airbnb/lottie/f$14.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$14.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
 
-.field final synthetic gp:Ljava/lang/String;
+.field final synthetic go:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$14;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$14;->gn:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/f$14;->gp:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/f$14;->go:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aW()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$14;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$14;->gn:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f$14;->gp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/f$14;->go:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f;->setMaxFrame(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$2.smali b/com.discord/smali/com/airbnb/lottie/f$2.smali
index a250366d4e..bcaa1b1ef5 100644
--- a/com.discord/smali/com/airbnb/lottie/f$2.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
 
-.field final synthetic gp:Ljava/lang/String;
+.field final synthetic go:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$2;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$2;->gn:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/f$2;->gp:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/f$2;->go:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aW()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$2;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$2;->gn:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f$2;->gp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/f$2;->go:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f;->setMinAndMaxFrame(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$3.smali b/com.discord/smali/com/airbnb/lottie/f$3.smali
index 14de740b3c..a1abae8937 100644
--- a/com.discord/smali/com/airbnb/lottie/f$3.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$3.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
+
+.field final synthetic gp:I
 
 .field final synthetic gq:I
 
-.field final synthetic gr:I
-
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;II)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$3;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$3;->gn:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$3;->gq:I
+    iput p2, p0, Lcom/airbnb/lottie/f$3;->gp:I
 
-    iput p3, p0, Lcom/airbnb/lottie/f$3;->gr:I
+    iput p3, p0, Lcom/airbnb/lottie/f$3;->gq:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,11 +45,11 @@
 .method public final aW()V
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$3;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$3;->gn:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$3;->gq:I
+    iget v1, p0, Lcom/airbnb/lottie/f$3;->gp:I
 
-    iget v2, p0, Lcom/airbnb/lottie/f$3;->gr:I
+    iget v2, p0, Lcom/airbnb/lottie/f$3;->gq:I
 
     invoke-virtual {v0, v1, v2}, Lcom/airbnb/lottie/f;->a(II)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$4.smali b/com.discord/smali/com/airbnb/lottie/f$4.smali
index 767e6677bd..73c7d89f53 100644
--- a/com.discord/smali/com/airbnb/lottie/f$4.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$4.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
 
-.field final synthetic gs:I
+.field final synthetic gr:I
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$4;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$4;->gn:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$4;->gs:I
+    iput p2, p0, Lcom/airbnb/lottie/f$4;->gr:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aW()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$4;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$4;->gn:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$4;->gs:I
+    iget v1, p0, Lcom/airbnb/lottie/f$4;->gr:I
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f;->setFrame(I)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$5.smali b/com.discord/smali/com/airbnb/lottie/f$5.smali
index 92f8a7dda7..0e7c482faa 100644
--- a/com.discord/smali/com/airbnb/lottie/f$5.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$5.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
 
-.field final synthetic gt:F
+.field final synthetic gs:F
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;F)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$5;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$5;->gn:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$5;->gt:F
+    iput p2, p0, Lcom/airbnb/lottie/f$5;->gs:F
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aW()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$5;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$5;->gn:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$5;->gt:F
+    iget v1, p0, Lcom/airbnb/lottie/f$5;->gs:F
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f;->setProgress(F)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$6.smali b/com.discord/smali/com/airbnb/lottie/f$6.smali
index 2633a31779..4d236a2fef 100644
--- a/com.discord/smali/com/airbnb/lottie/f$6.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$6.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
 
-.field final synthetic gu:Lcom/airbnb/lottie/c/e;
+.field final synthetic gt:Lcom/airbnb/lottie/c/e;
 
-.field final synthetic gv:Ljava/lang/Object;
+.field final synthetic gu:Ljava/lang/Object;
 
-.field final synthetic gw:Lcom/airbnb/lottie/g/c;
+.field final synthetic gv:Lcom/airbnb/lottie/g/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;Lcom/airbnb/lottie/c/e;Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$6;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$6;->gn:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/f$6;->gu:Lcom/airbnb/lottie/c/e;
+    iput-object p2, p0, Lcom/airbnb/lottie/f$6;->gt:Lcom/airbnb/lottie/c/e;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/f$6;->gv:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/airbnb/lottie/f$6;->gu:Ljava/lang/Object;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/f$6;->gw:Lcom/airbnb/lottie/g/c;
+    iput-object p4, p0, Lcom/airbnb/lottie/f$6;->gv:Lcom/airbnb/lottie/g/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,13 +49,13 @@
 .method public final aW()V
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$6;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$6;->gn:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f$6;->gu:Lcom/airbnb/lottie/c/e;
+    iget-object v1, p0, Lcom/airbnb/lottie/f$6;->gt:Lcom/airbnb/lottie/c/e;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/f$6;->gv:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/airbnb/lottie/f$6;->gu:Ljava/lang/Object;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/f$6;->gw:Lcom/airbnb/lottie/g/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/f$6;->gv:Lcom/airbnb/lottie/g/c;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/airbnb/lottie/f;->a(Lcom/airbnb/lottie/c/e;Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$7.smali b/com.discord/smali/com/airbnb/lottie/f$7.smali
index e791d70086..9c5cfee3e9 100644
--- a/com.discord/smali/com/airbnb/lottie/f$7.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$7.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$7;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$7;->gn:Lcom/airbnb/lottie/f;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final aW()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$7;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$7;->gn:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->aL()V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$8.smali b/com.discord/smali/com/airbnb/lottie/f$8.smali
index da92434695..5ae4df1eaa 100644
--- a/com.discord/smali/com/airbnb/lottie/f$8.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$8.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$8;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$8;->gn:Lcom/airbnb/lottie/f;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final aW()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$8;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$8;->gn:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->aT()V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$9.smali b/com.discord/smali/com/airbnb/lottie/f$9.smali
index 02e403eda8..4be8cdf4c3 100644
--- a/com.discord/smali/com/airbnb/lottie/f$9.smali
+++ b/com.discord/smali/com/airbnb/lottie/f$9.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic go:Lcom/airbnb/lottie/f;
+.field final synthetic gn:Lcom/airbnb/lottie/f;
 
-.field final synthetic gq:I
+.field final synthetic gp:I
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$9;->go:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$9;->gn:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$9;->gq:I
+    iput p2, p0, Lcom/airbnb/lottie/f$9;->gp:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aW()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$9;->go:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$9;->gn:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$9;->gq:I
+    iget v1, p0, Lcom/airbnb/lottie/f$9;->gp:I
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f;->setMinFrame(I)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f.smali b/com.discord/smali/com/airbnb/lottie/f.smali
index c55a9ed54e..1260616d2e 100644
--- a/com.discord/smali/com/airbnb/lottie/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/f.smali
@@ -22,15 +22,15 @@
 # instance fields
 .field private alpha:I
 
-.field public fB:Lcom/airbnb/lottie/d;
+.field public fA:Lcom/airbnb/lottie/d;
 
-.field fF:Ljava/lang/String;
+.field fE:Ljava/lang/String;
 
-.field final gc:Lcom/airbnb/lottie/f/e;
+.field final gb:Lcom/airbnb/lottie/f/e;
 
-.field private gd:Z
+.field private gc:Z
 
-.field private final ge:Ljava/util/Set;
+.field private final gd:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field final gf:Ljava/util/ArrayList;
+.field final ge:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -50,21 +50,21 @@
     .end annotation
 .end field
 
-.field gg:Lcom/airbnb/lottie/b/b;
+.field gf:Lcom/airbnb/lottie/b/b;
 
-.field gh:Lcom/airbnb/lottie/b;
+.field gg:Lcom/airbnb/lottie/b;
 
-.field public gi:Lcom/airbnb/lottie/b/a;
+.field public gh:Lcom/airbnb/lottie/b/a;
 
-.field public gj:Lcom/airbnb/lottie/a;
+.field public gi:Lcom/airbnb/lottie/a;
 
-.field public gk:Lcom/airbnb/lottie/p;
+.field public gj:Lcom/airbnb/lottie/p;
 
-.field public gl:Z
+.field public gk:Z
 
-.field private gm:Lcom/airbnb/lottie/c/c/b;
+.field private gl:Lcom/airbnb/lottie/c/c/b;
 
-.field gn:Z
+.field gm:Z
 
 .field private isDirty:Z
 
@@ -103,7 +103,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/f/e;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     const/high16 v0, 0x3f800000    # 1.0f
 
@@ -111,19 +111,19 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/f;->gd:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/f;->gc:Z
 
     new-instance v0, Ljava/util/HashSet;
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/Set;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->gd:Ljava/util/Set;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     const/16 v0, 0xff
 
@@ -133,7 +133,7 @@
 
     iput-boolean v0, p0, Lcom/airbnb/lottie/f;->isDirty:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     new-instance v1, Lcom/airbnb/lottie/f$1;
 
@@ -147,7 +147,7 @@
 .method static synthetic a(Lcom/airbnb/lottie/f;)Lcom/airbnb/lottie/c/c/b;
     .locals 0
 
-    iget-object p0, p0, Lcom/airbnb/lottie/f;->gm:Lcom/airbnb/lottie/c/c/b;
+    iget-object p0, p0, Lcom/airbnb/lottie/f;->gl:Lcom/airbnb/lottie/c/c/b;
 
     return-object p0
 .end method
@@ -165,7 +165,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gm:Lcom/airbnb/lottie/c/c/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gl:Lcom/airbnb/lottie/c/c/b;
 
     if-nez v0, :cond_0
 
@@ -184,7 +184,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->gm:Lcom/airbnb/lottie/c/c/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->gl:Lcom/airbnb/lottie/c/c/b;
 
     new-instance v2, Lcom/airbnb/lottie/c/e;
 
@@ -204,21 +204,21 @@
 
     new-instance v0, Lcom/airbnb/lottie/c/c/b;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     invoke-static {v1}, Lcom/airbnb/lottie/e/s;->b(Lcom/airbnb/lottie/d;)Lcom/airbnb/lottie/c/c/d;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/d;->fO:Ljava/util/List;
+    iget-object v2, v2, Lcom/airbnb/lottie/d;->fN:Ljava/util/List;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     invoke-direct {v0, p0, v1, v2, v3}, Lcom/airbnb/lottie/c/c/b;-><init>(Lcom/airbnb/lottie/f;Lcom/airbnb/lottie/c/c/d;Ljava/util/List;Lcom/airbnb/lottie/d;)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->gm:Lcom/airbnb/lottie/c/c/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->gl:Lcom/airbnb/lottie/c/c/b;
 
     return-void
 .end method
@@ -226,7 +226,7 @@
 .method private aV()V
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -235,7 +235,7 @@
     :cond_0
     iget v1, p0, Lcom/airbnb/lottie/f;->scale:F
 
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->fP:Landroid/graphics/Rect;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->fO:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
@@ -247,9 +247,9 @@
 
     float-to-int v0, v0
 
-    iget-object v2, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/d;->fP:Landroid/graphics/Rect;
+    iget-object v2, v2, Lcom/airbnb/lottie/d;->fO:Landroid/graphics/Rect;
 
     invoke-virtual {v2}, Landroid/graphics/Rect;->height()I
 
@@ -271,7 +271,7 @@
 .method static synthetic b(Lcom/airbnb/lottie/f;)Lcom/airbnb/lottie/f/e;
     .locals 0
 
-    iget-object p0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object p0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     return-object p0
 .end method
@@ -281,11 +281,11 @@
 .method public final a(II)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/airbnb/lottie/f$3;
 
@@ -296,7 +296,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     int-to-float p1, p1
 
@@ -325,11 +325,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gm:Lcom/airbnb/lottie/c/c/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gl:Lcom/airbnb/lottie/c/c/b;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/airbnb/lottie/f$6;
 
@@ -340,7 +340,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p1, Lcom/airbnb/lottie/c/e;->jQ:Lcom/airbnb/lottie/c/f;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/e;->jP:Lcom/airbnb/lottie/c/f;
 
     const/4 v1, 0x0
 
@@ -348,7 +348,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/e;->jQ:Lcom/airbnb/lottie/c/f;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/e;->jP:Lcom/airbnb/lottie/c/f;
 
     invoke-interface {p1, p2, p3}, Lcom/airbnb/lottie/c/f;->a(Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
 
@@ -374,7 +374,7 @@
 
     check-cast v3, Lcom/airbnb/lottie/c/e;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/c/e;->jQ:Lcom/airbnb/lottie/c/f;
+    iget-object v3, v3, Lcom/airbnb/lottie/c/e;->jP:Lcom/airbnb/lottie/c/f;
 
     invoke-interface {v3, p2, p3}, Lcom/airbnb/lottie/c/f;->a(Ljava/lang/Object;Lcom/airbnb/lottie/g/c;)V
 
@@ -399,11 +399,11 @@
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
-    sget-object p1, Lcom/airbnb/lottie/j;->hc:Ljava/lang/Float;
+    sget-object p1, Lcom/airbnb/lottie/j;->hb:Ljava/lang/Float;
 
     if-ne p2, p1, :cond_4
 
-    iget-object p1, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object p1, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/f/e;->bG()F
 
@@ -418,7 +418,7 @@
 .method public final a(Lcom/airbnb/lottie/d;)Z
     .locals 5
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     const/4 v1, 0x0
 
@@ -431,13 +431,13 @@
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f;->aS()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     invoke-direct {p0}, Lcom/airbnb/lottie/f;->aR()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
-    iget-object v2, v0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iget-object v2, v0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
     const/4 v3, 0x1
 
@@ -446,13 +446,13 @@
     const/4 v1, 0x1
 
     :cond_1
-    iput-object p1, v0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iput-object p1, v0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
     if-eqz v1, :cond_2
 
-    iget v1, v0, Lcom/airbnb/lottie/f/e;->nT:F
+    iget v1, v0, Lcom/airbnb/lottie/f/e;->nS:F
 
-    iget v2, p1, Lcom/airbnb/lottie/d;->fQ:F
+    iget v2, p1, Lcom/airbnb/lottie/d;->fP:F
 
     invoke-static {v1, v2}, Ljava/lang/Math;->max(FF)F
 
@@ -462,9 +462,9 @@
 
     int-to-float v1, v1
 
-    iget v2, v0, Lcom/airbnb/lottie/f/e;->nU:F
+    iget v2, v0, Lcom/airbnb/lottie/f/e;->nT:F
 
-    iget v4, p1, Lcom/airbnb/lottie/d;->fR:F
+    iget v4, p1, Lcom/airbnb/lottie/d;->fQ:F
 
     invoke-static {v2, v4}, Ljava/lang/Math;->min(FF)F
 
@@ -479,13 +479,13 @@
     goto :goto_0
 
     :cond_2
-    iget v1, p1, Lcom/airbnb/lottie/d;->fQ:F
+    iget v1, p1, Lcom/airbnb/lottie/d;->fP:F
 
     float-to-int v1, v1
 
     int-to-float v1, v1
 
-    iget v2, p1, Lcom/airbnb/lottie/d;->fR:F
+    iget v2, p1, Lcom/airbnb/lottie/d;->fQ:F
 
     float-to-int v2, v2
 
@@ -494,17 +494,17 @@
     invoke-virtual {v0, v1, v2}, Lcom/airbnb/lottie/f/e;->a(FF)V
 
     :goto_0
-    iget v1, v0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget v1, v0, Lcom/airbnb/lottie/f/e;->nR:F
 
     const/4 v2, 0x0
 
-    iput v2, v0, Lcom/airbnb/lottie/f/e;->nS:F
+    iput v2, v0, Lcom/airbnb/lottie/f/e;->nR:F
 
     float-to-int v1, v1
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/f/e;->setFrame(I)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->getAnimatedFraction()F
 
@@ -520,7 +520,7 @@
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
@@ -548,11 +548,11 @@
     goto :goto_1
 
     :cond_3
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->gn:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->gm:Z
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/d;->setPerformanceTrackingEnabled(Z)V
 
@@ -562,11 +562,11 @@
 .method public final aL()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gm:Lcom/airbnb/lottie/c/c/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gl:Lcom/airbnb/lottie/c/c/b;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/airbnb/lottie/f$7;
 
@@ -577,11 +577,11 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->gd:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->gc:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->getRepeatCount()I
 
@@ -590,18 +590,18 @@
     if-nez v0, :cond_2
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->aL()V
 
     :cond_2
-    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->gd:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->gc:Z
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
-    iget v0, v0, Lcom/airbnb/lottie/f/e;->nP:F
+    iget v0, v0, Lcom/airbnb/lottie/f/e;->nO:F
 
     const/4 v1, 0x0
 
@@ -609,7 +609,7 @@
 
     if-gez v0, :cond_3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->getMinFrame()F
 
@@ -618,7 +618,7 @@
     goto :goto_0
 
     :cond_3
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->getMaxFrame()F
 
@@ -636,11 +636,11 @@
 .method public final aM()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->aM()V
 
@@ -650,7 +650,7 @@
 .method public final aS()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->isRunning()Z
 
@@ -658,20 +658,20 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->cancel()V
 
     :cond_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->gm:Lcom/airbnb/lottie/c/c/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->gl:Lcom/airbnb/lottie/c/c/b;
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->gg:Lcom/airbnb/lottie/b/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->gf:Lcom/airbnb/lottie/b/b;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->aS()V
 
@@ -683,11 +683,11 @@
 .method public final aT()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gm:Lcom/airbnb/lottie/c/c/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gl:Lcom/airbnb/lottie/c/c/b;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/airbnb/lottie/f$8;
 
@@ -698,7 +698,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->aT()V
 
@@ -708,13 +708,13 @@
 .method public final aU()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gk:Lcom/airbnb/lottie/p;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gj:Lcom/airbnb/lottie/p;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->fM:Landroidx/collection/SparseArrayCompat;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->fL:Landroidx/collection/SparseArrayCompat;
 
     invoke-virtual {v0}, Landroidx/collection/SparseArrayCompat;->size()I
 
@@ -739,7 +739,7 @@
 
     move-result p1
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/f;->gd:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/f;->gc:Z
 
     return-void
 .end method
@@ -755,7 +755,7 @@
 
     invoke-static {v0}, Lcom/airbnb/lottie/c;->beginSection(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->gm:Lcom/airbnb/lottie/c/c/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->gl:Lcom/airbnb/lottie/c/c/b;
 
     if-nez v1, :cond_0
 
@@ -770,9 +770,9 @@
 
     int-to-float v2, v2
 
-    iget-object v3, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/d;->fP:Landroid/graphics/Rect;
+    iget-object v3, v3, Lcom/airbnb/lottie/d;->fO:Landroid/graphics/Rect;
 
     invoke-virtual {v3}, Landroid/graphics/Rect;->width()I
 
@@ -788,9 +788,9 @@
 
     int-to-float v3, v3
 
-    iget-object v4, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v4, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/d;->fP:Landroid/graphics/Rect;
+    iget-object v4, v4, Lcom/airbnb/lottie/d;->fO:Landroid/graphics/Rect;
 
     invoke-virtual {v4}, Landroid/graphics/Rect;->height()I
 
@@ -832,9 +832,9 @@
 
     move-result v4
 
-    iget-object v3, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/d;->fP:Landroid/graphics/Rect;
+    iget-object v3, v3, Lcom/airbnb/lottie/d;->fO:Landroid/graphics/Rect;
 
     invoke-virtual {v3}, Landroid/graphics/Rect;->width()I
 
@@ -846,9 +846,9 @@
 
     div-float/2addr v3, v5
 
-    iget-object v6, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v6, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v6, v6, Lcom/airbnb/lottie/d;->fP:Landroid/graphics/Rect;
+    iget-object v6, v6, Lcom/airbnb/lottie/d;->fO:Landroid/graphics/Rect;
 
     invoke-virtual {v6}, Landroid/graphics/Rect;->height()I
 
@@ -885,7 +885,7 @@
 
     invoke-virtual {v1, v2, v2}, Landroid/graphics/Matrix;->preScale(FF)Z
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->gm:Lcom/airbnb/lottie/c/c/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->gl:Lcom/airbnb/lottie/c/c/b;
 
     iget-object v2, p0, Lcom/airbnb/lottie/f;->matrix:Landroid/graphics/Matrix;
 
@@ -914,7 +914,7 @@
 .method public getIntrinsicHeight()I
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -923,7 +923,7 @@
     return v0
 
     :cond_0
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->fP:Landroid/graphics/Rect;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->fO:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->height()I
 
@@ -943,7 +943,7 @@
 .method public getIntrinsicWidth()I
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -952,7 +952,7 @@
     return v0
 
     :cond_0
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->fP:Landroid/graphics/Rect;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->fO:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
@@ -1023,7 +1023,7 @@
 .method public isRunning()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->isRunning()Z
 
@@ -1035,7 +1035,7 @@
 .method public final j(Z)V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->gl:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->gk:Z
 
     if-ne v0, p1, :cond_0
 
@@ -1055,9 +1055,9 @@
     return-void
 
     :cond_1
-    iput-boolean p1, p0, Lcom/airbnb/lottie/f;->gl:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/f;->gk:Z
 
-    iget-object p1, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-eqz p1, :cond_2
 
@@ -1107,11 +1107,11 @@
 .method public final setFrame(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/airbnb/lottie/f$4;
 
@@ -1122,7 +1122,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f/e;->setFrame(I)V
 
@@ -1132,11 +1132,11 @@
 .method public final setMaxFrame(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/airbnb/lottie/f$11;
 
@@ -1147,7 +1147,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     int-to-float p1, p1
 
@@ -1163,11 +1163,11 @@
 .method public final setMaxFrame(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/airbnb/lottie/f$14;
 
@@ -1184,9 +1184,9 @@
 
     if-eqz v0, :cond_1
 
-    iget p1, v0, Lcom/airbnb/lottie/c/h;->fQ:F
+    iget p1, v0, Lcom/airbnb/lottie/c/h;->fP:F
 
-    iget v0, v0, Lcom/airbnb/lottie/c/h;->jU:F
+    iget v0, v0, Lcom/airbnb/lottie/c/h;->jT:F
 
     add-float/2addr p1, v0
 
@@ -1223,11 +1223,11 @@
 .method public final setMaxProgress(F)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/airbnb/lottie/f$12;
 
@@ -1238,11 +1238,11 @@
     return-void
 
     :cond_0
-    iget v0, v0, Lcom/airbnb/lottie/d;->fQ:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->fP:F
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iget v1, v1, Lcom/airbnb/lottie/d;->fR:F
+    iget v1, v1, Lcom/airbnb/lottie/d;->fQ:F
 
     invoke-static {v0, v1, p1}, Lcom/airbnb/lottie/f/g;->lerp(FFF)F
 
@@ -1258,11 +1258,11 @@
 .method public final setMinAndMaxFrame(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/airbnb/lottie/f$2;
 
@@ -1279,11 +1279,11 @@
 
     if-eqz v0, :cond_1
 
-    iget p1, v0, Lcom/airbnb/lottie/c/h;->fQ:F
+    iget p1, v0, Lcom/airbnb/lottie/c/h;->fP:F
 
     float-to-int p1, p1
 
-    iget v0, v0, Lcom/airbnb/lottie/c/h;->jU:F
+    iget v0, v0, Lcom/airbnb/lottie/c/h;->jT:F
 
     float-to-int v0, v0
 
@@ -1320,11 +1320,11 @@
 .method public final setMinFrame(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/airbnb/lottie/f$9;
 
@@ -1335,7 +1335,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f/e;->setMinFrame(I)V
 
@@ -1345,11 +1345,11 @@
 .method public final setMinFrame(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/airbnb/lottie/f$13;
 
@@ -1366,7 +1366,7 @@
 
     if-eqz v0, :cond_1
 
-    iget p1, v0, Lcom/airbnb/lottie/c/h;->fQ:F
+    iget p1, v0, Lcom/airbnb/lottie/c/h;->fP:F
 
     float-to-int p1, p1
 
@@ -1401,11 +1401,11 @@
 .method public final setMinProgress(F)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/airbnb/lottie/f$10;
 
@@ -1416,11 +1416,11 @@
     return-void
 
     :cond_0
-    iget v0, v0, Lcom/airbnb/lottie/d;->fQ:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->fP:F
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iget v1, v1, Lcom/airbnb/lottie/d;->fR:F
+    iget v1, v1, Lcom/airbnb/lottie/d;->fQ:F
 
     invoke-static {v0, v1, p1}, Lcom/airbnb/lottie/f/g;->lerp(FFF)F
 
@@ -1436,11 +1436,11 @@
 .method public final setProgress(F)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/airbnb/lottie/f$5;
 
@@ -1451,11 +1451,11 @@
     return-void
 
     :cond_0
-    iget v0, v0, Lcom/airbnb/lottie/d;->fQ:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->fP:F
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iget v1, v1, Lcom/airbnb/lottie/d;->fR:F
+    iget v1, v1, Lcom/airbnb/lottie/d;->fQ:F
 
     invoke-static {v0, v1, p1}, Lcom/airbnb/lottie/f/g;->lerp(FFF)F
 
@@ -1471,7 +1471,7 @@
 .method public final setRepeatCount(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f/e;->setRepeatCount(I)V
 
@@ -1499,11 +1499,11 @@
 .method public stop()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ge:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gc:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gb:Lcom/airbnb/lottie/f/e;
 
     const/4 v1, 0x1
 
@@ -1534,7 +1534,7 @@
     goto :goto_2
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gg:Lcom/airbnb/lottie/b/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Lcom/airbnb/lottie/b/b;
 
     if-eqz v0, :cond_5
 
@@ -1586,10 +1586,10 @@
     :goto_1
     if-nez v0, :cond_5
 
-    iput-object v1, p0, Lcom/airbnb/lottie/f;->gg:Lcom/airbnb/lottie/b/b;
+    iput-object v1, p0, Lcom/airbnb/lottie/f;->gf:Lcom/airbnb/lottie/b/b;
 
     :cond_5
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gg:Lcom/airbnb/lottie/b/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Lcom/airbnb/lottie/b/b;
 
     if-nez v0, :cond_6
 
@@ -1599,20 +1599,20 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/airbnb/lottie/f;->fF:Ljava/lang/String;
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->fE:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/airbnb/lottie/f;->gh:Lcom/airbnb/lottie/b;
+    iget-object v4, p0, Lcom/airbnb/lottie/f;->gg:Lcom/airbnb/lottie/b;
 
-    iget-object v5, p0, Lcom/airbnb/lottie/f;->fB:Lcom/airbnb/lottie/d;
+    iget-object v5, p0, Lcom/airbnb/lottie/f;->fA:Lcom/airbnb/lottie/d;
 
-    iget-object v5, v5, Lcom/airbnb/lottie/d;->fJ:Ljava/util/Map;
+    iget-object v5, v5, Lcom/airbnb/lottie/d;->fI:Ljava/util/Map;
 
     invoke-direct {v0, v2, v3, v4, v5}, Lcom/airbnb/lottie/b/b;-><init>(Landroid/graphics/drawable/Drawable$Callback;Ljava/lang/String;Lcom/airbnb/lottie/b;Ljava/util/Map;)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->gg:Lcom/airbnb/lottie/b/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->gf:Lcom/airbnb/lottie/b/b;
 
     :cond_6
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->gg:Lcom/airbnb/lottie/b/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->gf:Lcom/airbnb/lottie/b/b;
 
     :goto_2
     if-eqz v0, :cond_7
diff --git a/com.discord/smali/com/airbnb/lottie/f/a.smali b/com.discord/smali/com/airbnb/lottie/f/a.smali
index 43e6cb88a9..4a885fe5ee 100644
--- a/com.discord/smali/com/airbnb/lottie/f/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/a.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final nL:Ljava/util/Set;
+.field private final nK:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field final nM:Ljava/util/Set;
+.field final nL:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -35,13 +35,13 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/CopyOnWriteArraySet;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f/a;->nL:Ljava/util/Set;
+    iput-object v0, p0, Lcom/airbnb/lottie/f/a;->nK:Ljava/util/Set;
 
     new-instance v0, Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-direct {v0}, Ljava/util/concurrent/CopyOnWriteArraySet;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f/a;->nM:Ljava/util/Set;
+    iput-object v0, p0, Lcom/airbnb/lottie/f/a;->nL:Ljava/util/Set;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
 .method public addListener(Landroid/animation/Animator$AnimatorListener;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nM:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nL:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -61,7 +61,7 @@
 .method public addUpdateListener(Landroid/animation/ValueAnimator$AnimatorUpdateListener;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nL:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nK:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -71,7 +71,7 @@
 .method final bF()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nL:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nK:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -113,7 +113,7 @@
 .method public final k(Z)V
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nM:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nL:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -154,7 +154,7 @@
 .method public removeAllListeners()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nM:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nL:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
@@ -164,7 +164,7 @@
 .method public removeAllUpdateListeners()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nL:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nK:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
@@ -174,7 +174,7 @@
 .method public removeListener(Landroid/animation/Animator$AnimatorListener;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nM:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nL:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
@@ -184,7 +184,7 @@
 .method public removeUpdateListener(Landroid/animation/ValueAnimator$AnimatorUpdateListener;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nL:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nK:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/airbnb/lottie/f/c.smali b/com.discord/smali/com/airbnb/lottie/f/c.smali
index 0bfa2ec7a3..b501a5d7e5 100644
--- a/com.discord/smali/com/airbnb/lottie/f/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/c.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final nN:Ljava/util/Set;
+.field private static final nM:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/f/c;->nN:Ljava/util/Set;
+    sput-object v0, Lcom/airbnb/lottie/f/c;->nM:Ljava/util/Set;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 .method public final b(Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/f/c;->nN:Ljava/util/Set;
+    sget-object v0, Lcom/airbnb/lottie/f/c;->nM:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -59,7 +59,7 @@
 
     invoke-static {v0, p1, p2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    sget-object p2, Lcom/airbnb/lottie/f/c;->nN:Ljava/util/Set;
+    sget-object p2, Lcom/airbnb/lottie/f/c;->nM:Ljava/util/Set;
 
     invoke-interface {p2, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/airbnb/lottie/f/d.smali b/com.discord/smali/com/airbnb/lottie/f/d.smali
index 72d44e9712..a2480edc41 100644
--- a/com.discord/smali/com/airbnb/lottie/f/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/d.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static nO:Lcom/airbnb/lottie/i;
+.field private static nN:Lcom/airbnb/lottie/i;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/f/c;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/f/d;->nO:Lcom/airbnb/lottie/i;
+    sput-object v0, Lcom/airbnb/lottie/f/d;->nN:Lcom/airbnb/lottie/i;
 
     return-void
 .end method
@@ -23,7 +23,7 @@
 .method public static b(Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/f/d;->nO:Lcom/airbnb/lottie/i;
+    sget-object v0, Lcom/airbnb/lottie/f/d;->nN:Lcom/airbnb/lottie/i;
 
     invoke-interface {v0, p0, p1}, Lcom/airbnb/lottie/i;->b(Ljava/lang/String;Ljava/lang/Throwable;)V
 
@@ -33,7 +33,7 @@
 .method public static u(Ljava/lang/String;)V
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/f/d;->nO:Lcom/airbnb/lottie/i;
+    sget-object v0, Lcom/airbnb/lottie/f/d;->nN:Lcom/airbnb/lottie/i;
 
     invoke-interface {v0, p0}, Lcom/airbnb/lottie/i;->u(Ljava/lang/String;)V
 
@@ -43,7 +43,7 @@
 .method public static warning(Ljava/lang/String;)V
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/f/d;->nO:Lcom/airbnb/lottie/i;
+    sget-object v0, Lcom/airbnb/lottie/f/d;->nN:Lcom/airbnb/lottie/i;
 
     invoke-interface {v0, p0}, Lcom/airbnb/lottie/i;->warning(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f/e.smali b/com.discord/smali/com/airbnb/lottie/f/e.smali
index f5f8d9c5bd..f0c6bf1d01 100644
--- a/com.discord/smali/com/airbnb/lottie/f/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/e.smali
@@ -7,20 +7,20 @@
 
 
 # instance fields
-.field public fB:Lcom/airbnb/lottie/d;
+.field public fA:Lcom/airbnb/lottie/d;
 
-.field public nP:F
+.field public nO:F
 
-.field private nQ:Z
+.field private nP:Z
 
-.field private nR:J
+.field private nQ:J
+
+.field public nR:F
 
 .field public nS:F
 
 .field public nT:F
 
-.field public nU:F
-
 .field private repeatCount:I
 
 .field protected running:Z
@@ -34,29 +34,29 @@
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->nP:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->nO:F
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->nQ:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->nP:Z
 
     const-wide/16 v1, 0x0
 
-    iput-wide v1, p0, Lcom/airbnb/lottie/f/e;->nR:J
+    iput-wide v1, p0, Lcom/airbnb/lottie/f/e;->nQ:J
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iput v1, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     iput v0, p0, Lcom/airbnb/lottie/f/e;->repeatCount:I
 
     const/high16 v1, -0x31000000
 
-    iput v1, p0, Lcom/airbnb/lottie/f/e;->nT:F
+    iput v1, p0, Lcom/airbnb/lottie/f/e;->nS:F
 
     const/high16 v1, 0x4f000000
 
-    iput v1, p0, Lcom/airbnb/lottie/f/e;->nU:F
+    iput v1, p0, Lcom/airbnb/lottie/f/e;->nT:F
 
     iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->running:Z
 
@@ -66,11 +66,11 @@
 .method private bH()V
     .locals 1
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nP:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nO:F
 
     neg-float v0, v0
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->nP:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->nO:F
 
     return-void
 .end method
@@ -107,7 +107,7 @@
 
     if-gtz v0, :cond_2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -116,10 +116,10 @@
     goto :goto_0
 
     :cond_0
-    iget v0, v0, Lcom/airbnb/lottie/d;->fQ:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->fP:F
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v1, :cond_1
 
@@ -128,22 +128,22 @@
     goto :goto_1
 
     :cond_1
-    iget v1, v1, Lcom/airbnb/lottie/d;->fR:F
+    iget v1, v1, Lcom/airbnb/lottie/d;->fQ:F
 
     :goto_1
     invoke-static {p1, v0, v1}, Lcom/airbnb/lottie/f/g;->clamp(FFF)F
 
     move-result v2
 
-    iput v2, p0, Lcom/airbnb/lottie/f/e;->nT:F
+    iput v2, p0, Lcom/airbnb/lottie/f/e;->nS:F
 
     invoke-static {p2, v0, v1}, Lcom/airbnb/lottie/f/g;->clamp(FFF)F
 
     move-result v0
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->nU:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->nT:F
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     invoke-static {v0, p1, p2}, Lcom/airbnb/lottie/f/g;->clamp(FFF)F
 
@@ -200,7 +200,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f/a;->nM:Ljava/util/Set;
+    iget-object v1, p0, Lcom/airbnb/lottie/f/a;->nL:Ljava/util/Set;
 
     invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -259,7 +259,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->nR:J
+    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->nQ:J
 
     const/4 v0, 0x0
 
@@ -285,15 +285,15 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iput-object v0, p0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
     const/high16 v0, -0x31000000
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->nT:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
 
     const/high16 v0, 0x4f000000
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->nU:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->nT:F
 
     return-void
 .end method
@@ -309,7 +309,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->nR:J
+    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->nQ:J
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->bI()Z
 
@@ -317,7 +317,7 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->getMinFrame()F
 
@@ -331,7 +331,7 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     return-void
 
@@ -342,7 +342,7 @@
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->getMaxFrame()F
 
@@ -356,7 +356,7 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     :cond_1
     return-void
@@ -365,7 +365,7 @@
 .method public final bG()F
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -374,19 +374,19 @@
     return v0
 
     :cond_0
-    iget v1, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget v1, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->fQ:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->fP:F
 
     sub-float/2addr v1, v0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->fR:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->fQ:F
 
-    iget-object v2, p0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
-    iget v2, v2, Lcom/airbnb/lottie/d;->fQ:F
+    iget v2, v2, Lcom/airbnb/lottie/d;->fP:F
 
     sub-float/2addr v0, v2
 
@@ -398,7 +398,7 @@
 .method public bI()Z
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nP:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nO:F
 
     const/4 v1, 0x0
 
@@ -419,7 +419,7 @@
 .method public final cancel()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nM:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nL:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -455,7 +455,7 @@
 
     invoke-direct {p0}, Lcom/airbnb/lottie/f/e;->postFrameCallback()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
     if-eqz v0, :cond_b
 
@@ -468,7 +468,7 @@
     goto/16 :goto_7
 
     :cond_0
-    iget-wide v0, p0, Lcom/airbnb/lottie/f/e;->nR:J
+    iget-wide v0, p0, Lcom/airbnb/lottie/f/e;->nQ:J
 
     const-wide/16 v2, 0x0
 
@@ -482,7 +482,7 @@
     sub-long v2, p1, v0
 
     :goto_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_2
 
@@ -493,11 +493,11 @@
     :cond_2
     const v1, 0x4e6e6b28    # 1.0E9f
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->fS:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->fR:F
 
     div-float/2addr v1, v0
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nP:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nO:F
 
     invoke-static {v0}, Ljava/lang/Math;->abs(F)F
 
@@ -510,7 +510,7 @@
 
     div-float/2addr v1, v0
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->bI()Z
 
@@ -523,9 +523,9 @@
     :cond_3
     add-float/2addr v0, v1
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->getMinFrame()F
 
@@ -543,7 +543,7 @@
 
     xor-int/2addr v0, v1
 
-    iget v2, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget v2, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->getMinFrame()F
 
@@ -557,9 +557,9 @@
 
     move-result v2
 
-    iput v2, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iput v2, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
-    iput-wide p1, p0, Lcom/airbnb/lottie/f/e;->nR:J
+    iput-wide p1, p0, Lcom/airbnb/lottie/f/e;->nQ:J
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->bF()V
 
@@ -583,7 +583,7 @@
 
     if-lt v0, v3, :cond_5
 
-    iget p1, p0, Lcom/airbnb/lottie/f/e;->nP:F
+    iget p1, p0, Lcom/airbnb/lottie/f/e;->nO:F
 
     const/4 p2, 0x0
 
@@ -603,7 +603,7 @@
     move-result p1
 
     :goto_2
-    iput p1, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iput p1, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     invoke-virtual {p0, v1}, Lcom/airbnb/lottie/f/e;->l(Z)V
 
@@ -616,7 +616,7 @@
     goto :goto_6
 
     :cond_5
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nM:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->nL:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -652,11 +652,11 @@
 
     if-ne v0, v2, :cond_7
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/f/e;->nQ:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f/e;->nP:Z
 
     xor-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->nQ:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->nP:Z
 
     invoke-direct {p0}, Lcom/airbnb/lottie/f/e;->bH()V
 
@@ -681,26 +681,26 @@
     move-result v0
 
     :goto_4
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     :goto_5
-    iput-wide p1, p0, Lcom/airbnb/lottie/f/e;->nR:J
+    iput-wide p1, p0, Lcom/airbnb/lottie/f/e;->nQ:J
 
     :cond_9
     :goto_6
-    iget-object p1, p0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
     if-eqz p1, :cond_b
 
-    iget p1, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget p1, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
-    iget p2, p0, Lcom/airbnb/lottie/f/e;->nT:F
+    iget p2, p0, Lcom/airbnb/lottie/f/e;->nS:F
 
     cmpg-float p2, p1, p2
 
     if-ltz p2, :cond_a
 
-    iget p2, p0, Lcom/airbnb/lottie/f/e;->nU:F
+    iget p2, p0, Lcom/airbnb/lottie/f/e;->nT:F
 
     cmpl-float p1, p1, p2
 
@@ -717,7 +717,7 @@
 
     const/4 v0, 0x0
 
-    iget v3, p0, Lcom/airbnb/lottie/f/e;->nT:F
+    iget v3, p0, Lcom/airbnb/lottie/f/e;->nS:F
 
     invoke-static {v3}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
@@ -725,7 +725,7 @@
 
     aput-object v3, p2, v0
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nU:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nT:F
 
     invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
@@ -733,7 +733,7 @@
 
     aput-object v0, p2, v1
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
@@ -759,7 +759,7 @@
 .method public final e(F)V
     .locals 1
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nT:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
 
     invoke-virtual {p0, v0, p1}, Lcom/airbnb/lottie/f/e;->a(FF)V
 
@@ -769,7 +769,7 @@
 .method public final getAnimatedFraction()F
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -788,7 +788,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget v1, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     sub-float/2addr v0, v1
 
@@ -808,7 +808,7 @@
     return v0
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->getMinFrame()F
 
@@ -844,7 +844,7 @@
 .method public final getDuration()J
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -865,35 +865,7 @@
 .method public final getMaxFrame()F
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_0
-    iget v1, p0, Lcom/airbnb/lottie/f/e;->nU:F
-
-    const/high16 v2, 0x4f000000
-
-    cmpl-float v2, v1, v2
-
-    if-nez v2, :cond_1
-
-    iget v0, v0, Lcom/airbnb/lottie/d;->fR:F
-
-    return v0
-
-    :cond_1
-    return v1
-.end method
-
-.method public final getMinFrame()F
-    .locals 3
-
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -904,7 +876,7 @@
     :cond_0
     iget v1, p0, Lcom/airbnb/lottie/f/e;->nT:F
 
-    const/high16 v2, -0x31000000
+    const/high16 v2, 0x4f000000
 
     cmpl-float v2, v1, v2
 
@@ -918,6 +890,34 @@
     return v1
 .end method
 
+.method public final getMinFrame()F
+    .locals 3
+
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->fA:Lcom/airbnb/lottie/d;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    return v0
+
+    :cond_0
+    iget v1, p0, Lcom/airbnb/lottie/f/e;->nS:F
+
+    const/high16 v2, -0x31000000
+
+    cmpl-float v2, v1, v2
+
+    if-nez v2, :cond_1
+
+    iget v0, v0, Lcom/airbnb/lottie/d;->fP:F
+
+    return v0
+
+    :cond_1
+    return v1
+.end method
+
 .method public final isRunning()Z
     .locals 1
 
@@ -948,7 +948,7 @@
 .method public final setFrame(I)V
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     int-to-float p1, p1
 
@@ -971,11 +971,11 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/airbnb/lottie/f/e;->nS:F
+    iput p1, p0, Lcom/airbnb/lottie/f/e;->nR:F
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->nR:J
+    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->nQ:J
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->bF()V
 
@@ -987,7 +987,7 @@
 
     int-to-float p1, p1
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->nU:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->nT:F
 
     float-to-int v0, v0
 
@@ -1007,13 +1007,13 @@
 
     if-eq p1, v0, :cond_0
 
-    iget-boolean p1, p0, Lcom/airbnb/lottie/f/e;->nQ:Z
+    iget-boolean p1, p0, Lcom/airbnb/lottie/f/e;->nP:Z
 
     if-eqz p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/f/e;->nQ:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/f/e;->nP:Z
 
     invoke-direct {p0}, Lcom/airbnb/lottie/f/e;->bH()V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f/f.smali b/com.discord/smali/com/airbnb/lottie/f/f.smali
index d42158dddd..b10421c5ad 100644
--- a/com.discord/smali/com/airbnb/lottie/f/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/f.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field public nV:F
+.field public nU:F
 
-.field public nW:I
+.field public nV:I
 
 
 # direct methods
diff --git a/com.discord/smali/com/airbnb/lottie/f/g.smali b/com.discord/smali/com/airbnb/lottie/f/g.smali
index e1154f7329..ac03ef81a8 100644
--- a/com.discord/smali/com/airbnb/lottie/f/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/g.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static nX:Landroid/graphics/PointF;
+.field private static nW:Landroid/graphics/PointF;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/f/g;->nX:Landroid/graphics/PointF;
+    sput-object v0, Lcom/airbnb/lottie/f/g;->nW:Landroid/graphics/PointF;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 
     invoke-virtual {p1}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/b/l;->lf:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/b/l;->le:Landroid/graphics/PointF;
 
     iget v1, v0, Landroid/graphics/PointF;->x:F
 
@@ -67,7 +67,7 @@
 
     invoke-virtual {p1, v1, v2}, Landroid/graphics/Path;->moveTo(FF)V
 
-    sget-object v1, Lcom/airbnb/lottie/f/g;->nX:Landroid/graphics/PointF;
+    sget-object v1, Lcom/airbnb/lottie/f/g;->nW:Landroid/graphics/PointF;
 
     iget v2, v0, Landroid/graphics/PointF;->x:F
 
@@ -78,7 +78,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -86,7 +86,7 @@
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/b/l;->le:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/l;->ld:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -94,13 +94,13 @@
 
     check-cast v1, Lcom/airbnb/lottie/c/a;
 
-    iget-object v2, v1, Lcom/airbnb/lottie/c/a;->jv:Landroid/graphics/PointF;
+    iget-object v2, v1, Lcom/airbnb/lottie/c/a;->ju:Landroid/graphics/PointF;
 
-    iget-object v3, v1, Lcom/airbnb/lottie/c/a;->jw:Landroid/graphics/PointF;
+    iget-object v3, v1, Lcom/airbnb/lottie/c/a;->jv:Landroid/graphics/PointF;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/c/a;->jx:Landroid/graphics/PointF;
+    iget-object v1, v1, Lcom/airbnb/lottie/c/a;->jw:Landroid/graphics/PointF;
 
-    sget-object v4, Lcom/airbnb/lottie/f/g;->nX:Landroid/graphics/PointF;
+    sget-object v4, Lcom/airbnb/lottie/f/g;->nW:Landroid/graphics/PointF;
 
     invoke-virtual {v2, v4}, Landroid/graphics/PointF;->equals(Ljava/lang/Object;)Z
 
@@ -140,7 +140,7 @@
     invoke-virtual/range {v4 .. v10}, Landroid/graphics/Path;->cubicTo(FFFFFF)V
 
     :goto_1
-    sget-object v2, Lcom/airbnb/lottie/f/g;->nX:Landroid/graphics/PointF;
+    sget-object v2, Lcom/airbnb/lottie/f/g;->nW:Landroid/graphics/PointF;
 
     iget v3, v1, Landroid/graphics/PointF;->x:F
 
diff --git a/com.discord/smali/com/airbnb/lottie/f/h.smali b/com.discord/smali/com/airbnb/lottie/f/h.smali
index e04ace959a..918a468b53 100644
--- a/com.discord/smali/com/airbnb/lottie/f/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/h.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static final iQ:Landroid/graphics/PathMeasure;
+.field private static final iP:Landroid/graphics/PathMeasure;
 
-.field private static final iT:Landroid/graphics/Path;
+.field private static final iS:Landroid/graphics/Path;
 
-.field private static final nY:Landroid/graphics/Path;
+.field private static final nX:Landroid/graphics/Path;
 
-.field private static final nZ:F
+.field private static final nY:F
 
-.field private static oa:F
+.field private static nZ:F
 
 .field private static final points:[F
 
@@ -25,19 +25,19 @@
 
     invoke-direct {v0}, Landroid/graphics/PathMeasure;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/f/h;->iQ:Landroid/graphics/PathMeasure;
+    sput-object v0, Lcom/airbnb/lottie/f/h;->iP:Landroid/graphics/PathMeasure;
 
     new-instance v0, Landroid/graphics/Path;
 
     invoke-direct {v0}, Landroid/graphics/Path;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/f/h;->iT:Landroid/graphics/Path;
+    sput-object v0, Lcom/airbnb/lottie/f/h;->iS:Landroid/graphics/Path;
 
     new-instance v0, Landroid/graphics/Path;
 
     invoke-direct {v0}, Landroid/graphics/Path;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/f/h;->nY:Landroid/graphics/Path;
+    sput-object v0, Lcom/airbnb/lottie/f/h;->nX:Landroid/graphics/Path;
 
     const/4 v0, 0x4
 
@@ -53,11 +53,11 @@
 
     double-to-float v0, v0
 
-    sput v0, Lcom/airbnb/lottie/f/h;->nZ:F
+    sput v0, Lcom/airbnb/lottie/f/h;->nY:F
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    sput v0, Lcom/airbnb/lottie/f/h;->oa:F
+    sput v0, Lcom/airbnb/lottie/f/h;->nZ:F
 
     return-void
 .end method
@@ -77,7 +77,7 @@
 
     aput v1, v0, v3
 
-    sget v1, Lcom/airbnb/lottie/f/h;->nZ:F
+    sget v1, Lcom/airbnb/lottie/f/h;->nY:F
 
     const/4 v4, 0x2
 
@@ -304,13 +304,13 @@
 
     invoke-static {v0}, Lcom/airbnb/lottie/c;->beginSection(Ljava/lang/String;)V
 
-    sget-object v1, Lcom/airbnb/lottie/f/h;->iQ:Landroid/graphics/PathMeasure;
+    sget-object v1, Lcom/airbnb/lottie/f/h;->iP:Landroid/graphics/PathMeasure;
 
     const/4 v2, 0x0
 
     invoke-virtual {v1, p0, v2}, Landroid/graphics/PathMeasure;->setPath(Landroid/graphics/Path;Z)V
 
-    sget-object v1, Lcom/airbnb/lottie/f/h;->iQ:Landroid/graphics/PathMeasure;
+    sget-object v1, Lcom/airbnb/lottie/f/h;->iP:Landroid/graphics/PathMeasure;
 
     invoke-virtual {v1}, Landroid/graphics/PathMeasure;->getLength()F
 
@@ -435,13 +435,13 @@
     sub-float/2addr v2, v1
 
     :cond_6
-    sget-object p2, Lcom/airbnb/lottie/f/h;->iT:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->iS:Landroid/graphics/Path;
 
     invoke-virtual {p2}, Landroid/graphics/Path;->reset()V
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->iQ:Landroid/graphics/PathMeasure;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->iP:Landroid/graphics/PathMeasure;
 
-    sget-object p3, Lcom/airbnb/lottie/f/h;->iT:Landroid/graphics/Path;
+    sget-object p3, Lcom/airbnb/lottie/f/h;->iS:Landroid/graphics/Path;
 
     const/4 v4, 0x1
 
@@ -451,21 +451,21 @@
 
     if-lez p2, :cond_7
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->nY:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->nX:Landroid/graphics/Path;
 
     invoke-virtual {p2}, Landroid/graphics/Path;->reset()V
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->iQ:Landroid/graphics/PathMeasure;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->iP:Landroid/graphics/PathMeasure;
 
     rem-float/2addr p1, v1
 
-    sget-object p3, Lcom/airbnb/lottie/f/h;->nY:Landroid/graphics/Path;
+    sget-object p3, Lcom/airbnb/lottie/f/h;->nX:Landroid/graphics/Path;
 
     invoke-virtual {p2, v3, p1, p3, v4}, Landroid/graphics/PathMeasure;->getSegment(FFLandroid/graphics/Path;Z)Z
 
-    sget-object p1, Lcom/airbnb/lottie/f/h;->iT:Landroid/graphics/Path;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->iS:Landroid/graphics/Path;
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->nY:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->nX:Landroid/graphics/Path;
 
     invoke-virtual {p1, p2}, Landroid/graphics/Path;->addPath(Landroid/graphics/Path;)V
 
@@ -476,27 +476,27 @@
 
     if-gez p1, :cond_8
 
-    sget-object p1, Lcom/airbnb/lottie/f/h;->nY:Landroid/graphics/Path;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->nX:Landroid/graphics/Path;
 
     invoke-virtual {p1}, Landroid/graphics/Path;->reset()V
 
-    sget-object p1, Lcom/airbnb/lottie/f/h;->iQ:Landroid/graphics/PathMeasure;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->iP:Landroid/graphics/PathMeasure;
 
     add-float/2addr v2, v1
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->nY:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->nX:Landroid/graphics/Path;
 
     invoke-virtual {p1, v2, v1, p2, v4}, Landroid/graphics/PathMeasure;->getSegment(FFLandroid/graphics/Path;Z)Z
 
-    sget-object p1, Lcom/airbnb/lottie/f/h;->iT:Landroid/graphics/Path;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->iS:Landroid/graphics/Path;
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->nY:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->nX:Landroid/graphics/Path;
 
     invoke-virtual {p1, p2}, Landroid/graphics/Path;->addPath(Landroid/graphics/Path;)V
 
     :cond_8
     :goto_0
-    sget-object p1, Lcom/airbnb/lottie/f/h;->iT:Landroid/graphics/Path;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->iS:Landroid/graphics/Path;
 
     invoke-virtual {p0, p1}, Landroid/graphics/Path;->set(Landroid/graphics/Path;)V
 
@@ -516,14 +516,14 @@
 
     if-eqz p1, :cond_1
 
-    iget-boolean v0, p1, Lcom/airbnb/lottie/a/a/s;->hH:Z
+    iget-boolean v0, p1, Lcom/airbnb/lottie/a/a/s;->hG:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/airbnb/lottie/a/a/s;->iw:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p1, Lcom/airbnb/lottie/a/a/s;->iv:Lcom/airbnb/lottie/a/b/a;
 
     check-cast v0, Lcom/airbnb/lottie/a/b/c;
 
@@ -531,7 +531,7 @@
 
     move-result v0
 
-    iget-object v1, p1, Lcom/airbnb/lottie/a/a/s;->ix:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p1, Lcom/airbnb/lottie/a/a/s;->iw:Lcom/airbnb/lottie/a/b/a;
 
     check-cast v1, Lcom/airbnb/lottie/a/b/c;
 
@@ -539,7 +539,7 @@
 
     move-result v1
 
-    iget-object p1, p1, Lcom/airbnb/lottie/a/a/s;->iy:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p1, Lcom/airbnb/lottie/a/a/s;->ix:Lcom/airbnb/lottie/a/b/a;
 
     check-cast p1, Lcom/airbnb/lottie/a/b/c;
 
@@ -661,7 +661,7 @@
 .method public static bJ()F
     .locals 2
 
-    sget v0, Lcom/airbnb/lottie/f/h;->oa:F
+    sget v0, Lcom/airbnb/lottie/f/h;->nZ:F
 
     const/high16 v1, -0x40800000    # -1.0f
 
@@ -679,10 +679,10 @@
 
     iget v0, v0, Landroid/util/DisplayMetrics;->density:F
 
-    sput v0, Lcom/airbnb/lottie/f/h;->oa:F
+    sput v0, Lcom/airbnb/lottie/f/h;->nZ:F
 
     :cond_0
-    sget v0, Lcom/airbnb/lottie/f/h;->oa:F
+    sget v0, Lcom/airbnb/lottie/f/h;->nZ:F
 
     return v0
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/g.smali b/com.discord/smali/com/airbnb/lottie/g.smali
index f68d434764..e5df282df3 100644
--- a/com.discord/smali/com/airbnb/lottie/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/g.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final gA:Ljava/lang/String;
+.field public gA:Landroid/graphics/Bitmap;
 
-.field public gB:Landroid/graphics/Bitmap;
+.field public final gy:Ljava/lang/String;
 
-.field public final gz:Ljava/lang/String;
+.field private final gz:Ljava/lang/String;
 
 .field public final height:I
 
@@ -29,9 +29,9 @@
 
     iput-object p3, p0, Lcom/airbnb/lottie/g;->id:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/g;->gz:Ljava/lang/String;
+    iput-object p4, p0, Lcom/airbnb/lottie/g;->gy:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/g;->gA:Ljava/lang/String;
+    iput-object p5, p0, Lcom/airbnb/lottie/g;->gz:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/g/a.smali b/com.discord/smali/com/airbnb/lottie/g/a.smali
index e4f508e175..869f701e41 100644
--- a/com.discord/smali/com/airbnb/lottie/g/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/g/a.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field private final fB:Lcom/airbnb/lottie/d;
+.field private final fA:Lcom/airbnb/lottie/d;
 
-.field public final fQ:F
+.field public final fP:F
 
-.field public final ob:Ljava/lang/Object;
+.field public final oa:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field public oc:Ljava/lang/Object;
+.field public ob:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -35,26 +35,26 @@
     .end annotation
 .end field
 
-.field public final od:Landroid/view/animation/Interpolator;
+.field public final oc:Landroid/view/animation/Interpolator;
 
-.field public oe:Ljava/lang/Float;
+.field public od:Ljava/lang/Float;
+
+.field public oe:F
 
 .field public of:F
 
-.field public og:F
+.field public og:I
 
 .field public oh:I
 
-.field public oi:I
+.field private oi:F
 
 .field private oj:F
 
-.field private ok:F
+.field public ok:Landroid/graphics/PointF;
 
 .field public ol:Landroid/graphics/PointF;
 
-.field public om:Landroid/graphics/PointF;
-
 
 # direct methods
 .method public constructor <init>(Lcom/airbnb/lottie/d;Ljava/lang/Object;Ljava/lang/Object;Landroid/view/animation/Interpolator;FLjava/lang/Float;)V
@@ -75,39 +75,39 @@
 
     const v0, -0x358c9d09
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->of:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->oe:F
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->og:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->of:F
 
     const v0, 0x2ec8fb09
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->oh:I
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->og:I
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->oi:I
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->oh:I
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->oj:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->oi:F
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->ok:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->oj:F
 
     const/4 v0, 0x0
 
+    iput-object v0, p0, Lcom/airbnb/lottie/g/a;->ok:Landroid/graphics/PointF;
+
     iput-object v0, p0, Lcom/airbnb/lottie/g/a;->ol:Landroid/graphics/PointF;
 
-    iput-object v0, p0, Lcom/airbnb/lottie/g/a;->om:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->fA:Lcom/airbnb/lottie/d;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->fB:Lcom/airbnb/lottie/d;
+    iput-object p2, p0, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/airbnb/lottie/g/a;->oc:Landroid/view/animation/Interpolator;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/g/a;->od:Landroid/view/animation/Interpolator;
+    iput p5, p0, Lcom/airbnb/lottie/g/a;->fP:F
 
-    iput p5, p0, Lcom/airbnb/lottie/g/a;->fQ:F
-
-    iput-object p6, p0, Lcom/airbnb/lottie/g/a;->oe:Ljava/lang/Float;
+    iput-object p6, p0, Lcom/airbnb/lottie/g/a;->od:Ljava/lang/Float;
 
     return-void
 .end method
@@ -124,37 +124,37 @@
 
     const v0, -0x358c9d09
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->of:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->oe:F
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->og:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->of:F
 
     const v0, 0x2ec8fb09
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->oh:I
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->og:I
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->oi:I
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->oh:I
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->oj:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->oi:F
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->ok:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->oj:F
 
     const/4 v1, 0x0
 
+    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->ok:Landroid/graphics/PointF;
+
     iput-object v1, p0, Lcom/airbnb/lottie/g/a;->ol:Landroid/graphics/PointF;
 
-    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->om:Landroid/graphics/PointF;
+    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->fA:Lcom/airbnb/lottie/d;
 
-    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->fB:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     iput-object p1, p0, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->oc:Landroid/view/animation/Interpolator;
 
-    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->od:Landroid/view/animation/Interpolator;
-
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->fQ:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->fP:F
 
     const p1, 0x7f7fffff    # Float.MAX_VALUE
 
@@ -162,7 +162,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->oe:Ljava/lang/Float;
+    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->od:Ljava/lang/Float;
 
     return-void
 .end method
@@ -172,7 +172,7 @@
 .method public final bK()F
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->fA:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -181,7 +181,7 @@
     return v0
 
     :cond_0
-    iget v1, p0, Lcom/airbnb/lottie/g/a;->oj:F
+    iget v1, p0, Lcom/airbnb/lottie/g/a;->oi:F
 
     const/4 v2, 0x1
 
@@ -189,13 +189,13 @@
 
     if-nez v1, :cond_1
 
-    iget v1, p0, Lcom/airbnb/lottie/g/a;->fQ:F
+    iget v1, p0, Lcom/airbnb/lottie/g/a;->fP:F
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->fQ:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->fP:F
 
     sub-float/2addr v1, v0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->fA:Lcom/airbnb/lottie/d;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/d;->aP()F
 
@@ -203,10 +203,10 @@
 
     div-float/2addr v1, v0
 
-    iput v1, p0, Lcom/airbnb/lottie/g/a;->oj:F
+    iput v1, p0, Lcom/airbnb/lottie/g/a;->oi:F
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/g/a;->oj:F
+    iget v0, p0, Lcom/airbnb/lottie/g/a;->oi:F
 
     return v0
 .end method
@@ -214,7 +214,7 @@
 .method public final bg()F
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->fB:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->fA:Lcom/airbnb/lottie/d;
 
     const/high16 v1, 0x3f800000    # 1.0f
 
@@ -223,7 +223,7 @@
     return v1
 
     :cond_0
-    iget v0, p0, Lcom/airbnb/lottie/g/a;->ok:F
+    iget v0, p0, Lcom/airbnb/lottie/g/a;->oj:F
 
     const/4 v2, 0x1
 
@@ -231,11 +231,11 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->oe:Ljava/lang/Float;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->od:Ljava/lang/Float;
 
     if-nez v0, :cond_1
 
-    iput v1, p0, Lcom/airbnb/lottie/g/a;->ok:F
+    iput v1, p0, Lcom/airbnb/lottie/g/a;->oj:F
 
     goto :goto_0
 
@@ -244,17 +244,17 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->oe:Ljava/lang/Float;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->od:Ljava/lang/Float;
 
     invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
 
     move-result v1
 
-    iget v2, p0, Lcom/airbnb/lottie/g/a;->fQ:F
+    iget v2, p0, Lcom/airbnb/lottie/g/a;->fP:F
 
     sub-float/2addr v1, v2
 
-    iget-object v2, p0, Lcom/airbnb/lottie/g/a;->fB:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/g/a;->fA:Lcom/airbnb/lottie/d;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/d;->aP()F
 
@@ -264,11 +264,11 @@
 
     add-float/2addr v0, v1
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->ok:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->oj:F
 
     :cond_2
     :goto_0
-    iget v0, p0, Lcom/airbnb/lottie/g/a;->ok:F
+    iget v0, p0, Lcom/airbnb/lottie/g/a;->oj:F
 
     return v0
 .end method
@@ -305,7 +305,7 @@
 .method public final isStatic()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->od:Landroid/view/animation/Interpolator;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->oc:Landroid/view/animation/Interpolator;
 
     if-nez v0, :cond_0
 
@@ -328,7 +328,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->oa:Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -336,7 +336,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->oc:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->ob:Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -344,7 +344,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/airbnb/lottie/g/a;->fQ:F
+    iget v1, p0, Lcom/airbnb/lottie/g/a;->fP:F
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder;
 
@@ -352,7 +352,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->oe:Ljava/lang/Float;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->od:Ljava/lang/Float;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -360,7 +360,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->od:Landroid/view/animation/Interpolator;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->oc:Landroid/view/animation/Interpolator;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/airbnb/lottie/g/b.smali b/com.discord/smali/com/airbnb/lottie/g/b.smali
index d94b57c651..c5621ce67d 100644
--- a/com.discord/smali/com/airbnb/lottie/g/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/g/b.smali
@@ -15,9 +15,17 @@
 
 
 # instance fields
+.field fP:F
+
 .field fQ:F
 
-.field fR:F
+.field oa:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
 
 .field ob:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -27,20 +35,12 @@
     .end annotation
 .end field
 
-.field oc:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
+.field om:F
 
 .field oo:F
 
 .field oq:F
 
-.field or:F
-
 
 # direct methods
 .method public constructor <init>()V
diff --git a/com.discord/smali/com/airbnb/lottie/g/c.smali b/com.discord/smali/com/airbnb/lottie/g/c.smali
index 119a74257e..50f624fd5a 100644
--- a/com.discord/smali/com/airbnb/lottie/g/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/g/c.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final jj:Lcom/airbnb/lottie/g/b;
+.field private final ji:Lcom/airbnb/lottie/g/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/g/b<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field public ot:Lcom/airbnb/lottie/a/b/a;
+.field public or:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -52,7 +52,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/g/b;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/g/c;->jj:Lcom/airbnb/lottie/g/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/g/c;->ji:Lcom/airbnb/lottie/g/b;
 
     const/4 v0, 0x0
 
@@ -75,7 +75,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/g/b;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/g/c;->jj:Lcom/airbnb/lottie/g/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/g/c;->ji:Lcom/airbnb/lottie/g/b;
 
     const/4 v0, 0x0
 
@@ -96,21 +96,21 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/c;->jj:Lcom/airbnb/lottie/g/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/c;->ji:Lcom/airbnb/lottie/g/b;
 
-    iput p1, v0, Lcom/airbnb/lottie/g/b;->fQ:F
+    iput p1, v0, Lcom/airbnb/lottie/g/b;->fP:F
 
-    iput p2, v0, Lcom/airbnb/lottie/g/b;->fR:F
+    iput p2, v0, Lcom/airbnb/lottie/g/b;->fQ:F
 
-    iput-object p3, v0, Lcom/airbnb/lottie/g/b;->ob:Ljava/lang/Object;
+    iput-object p3, v0, Lcom/airbnb/lottie/g/b;->oa:Ljava/lang/Object;
 
-    iput-object p4, v0, Lcom/airbnb/lottie/g/b;->oc:Ljava/lang/Object;
+    iput-object p4, v0, Lcom/airbnb/lottie/g/b;->ob:Ljava/lang/Object;
 
-    iput p5, v0, Lcom/airbnb/lottie/g/b;->oo:F
+    iput p5, v0, Lcom/airbnb/lottie/g/b;->om:F
 
-    iput p6, v0, Lcom/airbnb/lottie/g/b;->oq:F
+    iput p6, v0, Lcom/airbnb/lottie/g/b;->oo:F
 
-    iput p7, v0, Lcom/airbnb/lottie/g/b;->or:F
+    iput p7, v0, Lcom/airbnb/lottie/g/b;->oq:F
 
     iget-object p1, p0, Lcom/airbnb/lottie/g/c;->value:Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/j.smali b/com.discord/smali/com/airbnb/lottie/j.smali
index dd8a1f8d23..a1dc0d80ac 100644
--- a/com.discord/smali/com/airbnb/lottie/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/j.smali
@@ -4,13 +4,15 @@
 
 
 # static fields
+.field public static final gB:Ljava/lang/Integer;
+
 .field public static final gC:Ljava/lang/Integer;
 
 .field public static final gD:Ljava/lang/Integer;
 
 .field public static final gE:Ljava/lang/Integer;
 
-.field public static final gF:Ljava/lang/Integer;
+.field public static final gF:Landroid/graphics/PointF;
 
 .field public static final gG:Landroid/graphics/PointF;
 
@@ -18,13 +20,13 @@
 
 .field public static final gI:Landroid/graphics/PointF;
 
-.field public static final gJ:Landroid/graphics/PointF;
+.field public static final gJ:Ljava/lang/Float;
 
-.field public static final gK:Ljava/lang/Float;
+.field public static final gK:Landroid/graphics/PointF;
 
-.field public static final gL:Landroid/graphics/PointF;
+.field public static final gL:Lcom/airbnb/lottie/g/d;
 
-.field public static final gM:Lcom/airbnb/lottie/g/d;
+.field public static final gM:Ljava/lang/Float;
 
 .field public static final gN:Ljava/lang/Float;
 
@@ -56,11 +58,9 @@
 
 .field public static final hb:Ljava/lang/Float;
 
-.field public static final hc:Ljava/lang/Float;
+.field public static final hc:Landroid/graphics/ColorFilter;
 
-.field public static final hd:Landroid/graphics/ColorFilter;
-
-.field public static final he:[Ljava/lang/Integer;
+.field public static final hd:[Ljava/lang/Integer;
 
 
 # direct methods
@@ -73,7 +73,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gC:Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->gB:Ljava/lang/Integer;
 
     const/4 v0, 0x2
 
@@ -81,7 +81,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gD:Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->gC:Ljava/lang/Integer;
 
     const/4 v0, 0x3
 
@@ -89,7 +89,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gE:Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->gD:Ljava/lang/Integer;
 
     const/4 v0, 0x4
 
@@ -97,7 +97,13 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gF:Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->gE:Ljava/lang/Integer;
+
+    new-instance v0, Landroid/graphics/PointF;
+
+    invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
+
+    sput-object v0, Lcom/airbnb/lottie/j;->gF:Landroid/graphics/PointF;
 
     new-instance v0, Landroid/graphics/PointF;
 
@@ -117,31 +123,25 @@
 
     sput-object v0, Lcom/airbnb/lottie/j;->gI:Landroid/graphics/PointF;
 
-    new-instance v0, Landroid/graphics/PointF;
-
-    invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
-
-    sput-object v0, Lcom/airbnb/lottie/j;->gJ:Landroid/graphics/PointF;
-
     const/4 v0, 0x0
 
     invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gK:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->gJ:Ljava/lang/Float;
 
     new-instance v1, Landroid/graphics/PointF;
 
     invoke-direct {v1}, Landroid/graphics/PointF;-><init>()V
 
-    sput-object v1, Lcom/airbnb/lottie/j;->gL:Landroid/graphics/PointF;
+    sput-object v1, Lcom/airbnb/lottie/j;->gK:Landroid/graphics/PointF;
 
     new-instance v1, Lcom/airbnb/lottie/g/d;
 
     invoke-direct {v1}, Lcom/airbnb/lottie/g/d;-><init>()V
 
-    sput-object v1, Lcom/airbnb/lottie/j;->gM:Lcom/airbnb/lottie/g/d;
+    sput-object v1, Lcom/airbnb/lottie/j;->gL:Lcom/airbnb/lottie/g/d;
 
     const/high16 v1, 0x3f800000    # 1.0f
 
@@ -149,19 +149,19 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/airbnb/lottie/j;->gN:Ljava/lang/Float;
+    sput-object v1, Lcom/airbnb/lottie/j;->gM:Ljava/lang/Float;
+
+    sput-object v0, Lcom/airbnb/lottie/j;->gN:Ljava/lang/Float;
 
     sput-object v0, Lcom/airbnb/lottie/j;->gO:Ljava/lang/Float;
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gP:Ljava/lang/Float;
-
     const/high16 v0, 0x40000000    # 2.0f
 
     invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gQ:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->gP:Ljava/lang/Float;
 
     const/high16 v0, 0x40400000    # 3.0f
 
@@ -169,7 +169,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gR:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->gQ:Ljava/lang/Float;
 
     const/high16 v0, 0x40800000    # 4.0f
 
@@ -177,7 +177,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gS:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->gR:Ljava/lang/Float;
 
     const/high16 v0, 0x40a00000    # 5.0f
 
@@ -185,7 +185,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gT:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->gS:Ljava/lang/Float;
 
     const/high16 v0, 0x40c00000    # 6.0f
 
@@ -193,7 +193,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gU:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->gT:Ljava/lang/Float;
 
     const/high16 v0, 0x40e00000    # 7.0f
 
@@ -201,7 +201,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gV:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->gU:Ljava/lang/Float;
 
     const/high16 v0, 0x41000000    # 8.0f
 
@@ -209,7 +209,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gW:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->gV:Ljava/lang/Float;
 
     const/high16 v0, 0x41100000    # 9.0f
 
@@ -217,7 +217,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gX:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->gW:Ljava/lang/Float;
 
     const/high16 v0, 0x41200000    # 10.0f
 
@@ -225,7 +225,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gY:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->gX:Ljava/lang/Float;
 
     const/high16 v0, 0x41300000    # 11.0f
 
@@ -233,7 +233,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->gZ:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->gY:Ljava/lang/Float;
 
     const/high16 v0, 0x41400000    # 12.0f
 
@@ -241,9 +241,9 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->ha:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->gZ:Ljava/lang/Float;
 
-    sput-object v0, Lcom/airbnb/lottie/j;->hb:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->ha:Ljava/lang/Float;
 
     const/high16 v0, 0x41500000    # 13.0f
 
@@ -251,19 +251,19 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->hc:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->hb:Ljava/lang/Float;
 
     new-instance v0, Landroid/graphics/ColorFilter;
 
     invoke-direct {v0}, Landroid/graphics/ColorFilter;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/j;->hd:Landroid/graphics/ColorFilter;
+    sput-object v0, Lcom/airbnb/lottie/j;->hc:Landroid/graphics/ColorFilter;
 
     const/4 v0, 0x0
 
     new-array v0, v0, [Ljava/lang/Integer;
 
-    sput-object v0, Lcom/airbnb/lottie/j;->he:[Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->hd:[Ljava/lang/Integer;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/airbnb/lottie/l$1.smali b/com.discord/smali/com/airbnb/lottie/l$1.smali
index c1da6e252a..ba4b0ab838 100644
--- a/com.discord/smali/com/airbnb/lottie/l$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/l$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic hj:Lcom/airbnb/lottie/l;
+.field final synthetic hi:Lcom/airbnb/lottie/l;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/l;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/l$1;->hj:Lcom/airbnb/lottie/l;
+    iput-object p1, p0, Lcom/airbnb/lottie/l$1;->hi:Lcom/airbnb/lottie/l;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/l$1;->hj:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/l$1;->hi:Lcom/airbnb/lottie/l;
 
     invoke-static {v0}, Lcom/airbnb/lottie/l;->a(Lcom/airbnb/lottie/l;)Lcom/airbnb/lottie/k;
 
@@ -48,7 +48,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/l$1;->hj:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/l$1;->hi:Lcom/airbnb/lottie/l;
 
     invoke-static {v0}, Lcom/airbnb/lottie/l;->a(Lcom/airbnb/lottie/l;)Lcom/airbnb/lottie/k;
 
@@ -58,7 +58,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/airbnb/lottie/l$1;->hj:Lcom/airbnb/lottie/l;
+    iget-object v1, p0, Lcom/airbnb/lottie/l$1;->hi:Lcom/airbnb/lottie/l;
 
     iget-object v0, v0, Lcom/airbnb/lottie/k;->value:Ljava/lang/Object;
 
@@ -67,7 +67,7 @@
     return-void
 
     :cond_1
-    iget-object v1, p0, Lcom/airbnb/lottie/l$1;->hj:Lcom/airbnb/lottie/l;
+    iget-object v1, p0, Lcom/airbnb/lottie/l$1;->hi:Lcom/airbnb/lottie/l;
 
     iget-object v0, v0, Lcom/airbnb/lottie/k;->exception:Ljava/lang/Throwable;
 
diff --git a/com.discord/smali/com/airbnb/lottie/l$a.smali b/com.discord/smali/com/airbnb/lottie/l$a.smali
index 0bfe2eeff4..105b5500d9 100644
--- a/com.discord/smali/com/airbnb/lottie/l$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/l$a.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field final synthetic hj:Lcom/airbnb/lottie/l;
+.field final synthetic hi:Lcom/airbnb/lottie/l;
 
 
 # direct methods
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/airbnb/lottie/l$a;->hj:Lcom/airbnb/lottie/l;
+    iput-object p1, p0, Lcom/airbnb/lottie/l$a;->hi:Lcom/airbnb/lottie/l;
 
     invoke-direct {p0, p2}, Ljava/util/concurrent/FutureTask;-><init>(Ljava/util/concurrent/Callable;)V
 
@@ -60,7 +60,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/airbnb/lottie/l$a;->hj:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/l$a;->hi:Lcom/airbnb/lottie/l;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/l$a;->get()Ljava/lang/Object;
 
@@ -84,7 +84,7 @@
     move-exception v0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/l$a;->hj:Lcom/airbnb/lottie/l;
+    iget-object v1, p0, Lcom/airbnb/lottie/l$a;->hi:Lcom/airbnb/lottie/l;
 
     new-instance v2, Lcom/airbnb/lottie/k;
 
diff --git a/com.discord/smali/com/airbnb/lottie/l.smali b/com.discord/smali/com/airbnb/lottie/l.smali
index 88aa740631..957194bde9 100644
--- a/com.discord/smali/com/airbnb/lottie/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/l.smali
@@ -21,13 +21,13 @@
 
 
 # static fields
-.field public static hf:Ljava/util/concurrent/Executor;
+.field public static he:Ljava/util/concurrent/Executor;
 
 
 # instance fields
 .field private final handler:Landroid/os/Handler;
 
-.field private final hg:Ljava/util/Set;
+.field private final hf:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private final hh:Ljava/util/Set;
+.field private final hg:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -48,7 +48,7 @@
     .end annotation
 .end field
 
-.field private volatile hi:Lcom/airbnb/lottie/k;
+.field private volatile hh:Lcom/airbnb/lottie/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/k<",
@@ -66,7 +66,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/l;->hf:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/airbnb/lottie/l;->he:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
@@ -108,13 +108,13 @@
 
     invoke-direct {p2, v0}, Ljava/util/LinkedHashSet;-><init>(I)V
 
-    iput-object p2, p0, Lcom/airbnb/lottie/l;->hg:Ljava/util/Set;
+    iput-object p2, p0, Lcom/airbnb/lottie/l;->hf:Ljava/util/Set;
 
     new-instance p2, Ljava/util/LinkedHashSet;
 
     invoke-direct {p2, v0}, Ljava/util/LinkedHashSet;-><init>(I)V
 
-    iput-object p2, p0, Lcom/airbnb/lottie/l;->hh:Ljava/util/Set;
+    iput-object p2, p0, Lcom/airbnb/lottie/l;->hg:Ljava/util/Set;
 
     new-instance p2, Landroid/os/Handler;
 
@@ -128,9 +128,9 @@
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/airbnb/lottie/l;->hi:Lcom/airbnb/lottie/k;
+    iput-object p2, p0, Lcom/airbnb/lottie/l;->hh:Lcom/airbnb/lottie/k;
 
-    sget-object p2, Lcom/airbnb/lottie/l;->hf:Ljava/util/concurrent/Executor;
+    sget-object p2, Lcom/airbnb/lottie/l;->he:Ljava/util/concurrent/Executor;
 
     new-instance v0, Lcom/airbnb/lottie/l$a;
 
@@ -144,7 +144,7 @@
 .method static synthetic a(Lcom/airbnb/lottie/l;)Lcom/airbnb/lottie/k;
     .locals 0
 
-    iget-object p0, p0, Lcom/airbnb/lottie/l;->hi:Lcom/airbnb/lottie/k;
+    iget-object p0, p0, Lcom/airbnb/lottie/l;->hh:Lcom/airbnb/lottie/k;
 
     return-object p0
 .end method
@@ -152,11 +152,11 @@
 .method static synthetic a(Lcom/airbnb/lottie/l;Lcom/airbnb/lottie/k;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->hi:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->hh:Lcom/airbnb/lottie/k;
 
     if-nez v0, :cond_0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/l;->hi:Lcom/airbnb/lottie/k;
+    iput-object p1, p0, Lcom/airbnb/lottie/l;->hh:Lcom/airbnb/lottie/k;
 
     iget-object p1, p0, Lcom/airbnb/lottie/l;->handler:Landroid/os/Handler;
 
@@ -202,7 +202,7 @@
     :try_start_0
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/l;->hh:Ljava/util/Set;
+    iget-object v1, p0, Lcom/airbnb/lottie/l;->hg:Ljava/util/Set;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
@@ -279,7 +279,7 @@
     :try_start_0
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/l;->hg:Ljava/util/Set;
+    iget-object v1, p0, Lcom/airbnb/lottie/l;->hf:Ljava/util/Set;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
@@ -342,24 +342,24 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->hi:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->hh:Lcom/airbnb/lottie/k;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->hi:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->hh:Lcom/airbnb/lottie/k;
 
     iget-object v0, v0, Lcom/airbnb/lottie/k;->value:Ljava/lang/Object;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->hi:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->hh:Lcom/airbnb/lottie/k;
 
     iget-object v0, v0, Lcom/airbnb/lottie/k;->value:Ljava/lang/Object;
 
     invoke-interface {p1, v0}, Lcom/airbnb/lottie/h;->p(Ljava/lang/Object;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->hg:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->hf:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -392,7 +392,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->hg:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->hf:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
     :try_end_0
@@ -426,24 +426,24 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->hi:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->hh:Lcom/airbnb/lottie/k;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->hi:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->hh:Lcom/airbnb/lottie/k;
 
     iget-object v0, v0, Lcom/airbnb/lottie/k;->exception:Ljava/lang/Throwable;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->hi:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->hh:Lcom/airbnb/lottie/k;
 
     iget-object v0, v0, Lcom/airbnb/lottie/k;->exception:Ljava/lang/Throwable;
 
     invoke-interface {p1, v0}, Lcom/airbnb/lottie/h;->p(Ljava/lang/Object;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->hh:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->hg:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -477,7 +477,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->hh:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->hg:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
     :try_end_0
diff --git a/com.discord/smali/com/airbnb/lottie/m$1.smali b/com.discord/smali/com/airbnb/lottie/m$1.smali
index 2fcd4dad76..9b201e62ae 100644
--- a/com.discord/smali/com/airbnb/lottie/m$1.smali
+++ b/com.discord/smali/com/airbnb/lottie/m$1.smali
@@ -29,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic hn:Lcom/airbnb/lottie/m;
+.field final synthetic hm:Lcom/airbnb/lottie/m;
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/m;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/m$1;->hn:Lcom/airbnb/lottie/m;
+    iput-object p1, p0, Lcom/airbnb/lottie/m$1;->hm:Lcom/airbnb/lottie/m;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/airbnb/lottie/m.smali b/com.discord/smali/com/airbnb/lottie/m.smali
index ad93564a71..74fd1d40e8 100644
--- a/com.discord/smali/com/airbnb/lottie/m.smali
+++ b/com.discord/smali/com/airbnb/lottie/m.smali
@@ -6,7 +6,7 @@
 # instance fields
 .field enabled:Z
 
-.field private final hk:Ljava/util/Set;
+.field private final hj:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private final hl:Ljava/util/Map;
+.field private final hk:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final hm:Ljava/util/Comparator;
+.field private final hl:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -54,19 +54,19 @@
 
     invoke-direct {v0}, Landroidx/collection/ArraySet;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/m;->hk:Ljava/util/Set;
+    iput-object v0, p0, Lcom/airbnb/lottie/m;->hj:Ljava/util/Set;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/m;->hl:Ljava/util/Map;
+    iput-object v0, p0, Lcom/airbnb/lottie/m;->hk:Ljava/util/Map;
 
     new-instance v0, Lcom/airbnb/lottie/m$1;
 
     invoke-direct {v0, p0}, Lcom/airbnb/lottie/m$1;-><init>(Lcom/airbnb/lottie/m;)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/m;->hm:Ljava/util/Comparator;
+    iput-object v0, p0, Lcom/airbnb/lottie/m;->hl:Ljava/util/Comparator;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/m;->hl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/airbnb/lottie/m;->hk:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -97,42 +97,42 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/f/f;-><init>()V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/m;->hl:Ljava/util/Map;
+    iget-object v1, p0, Lcom/airbnb/lottie/m;->hk:Ljava/util/Map;
 
     invoke-interface {v1, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_1
-    iget v1, v0, Lcom/airbnb/lottie/f/f;->nV:F
+    iget v1, v0, Lcom/airbnb/lottie/f/f;->nU:F
 
     add-float/2addr v1, p2
 
-    iput v1, v0, Lcom/airbnb/lottie/f/f;->nV:F
+    iput v1, v0, Lcom/airbnb/lottie/f/f;->nU:F
 
-    iget p2, v0, Lcom/airbnb/lottie/f/f;->nW:I
+    iget p2, v0, Lcom/airbnb/lottie/f/f;->nV:I
 
     add-int/lit8 p2, p2, 0x1
 
-    iput p2, v0, Lcom/airbnb/lottie/f/f;->nW:I
+    iput p2, v0, Lcom/airbnb/lottie/f/f;->nV:I
 
-    iget p2, v0, Lcom/airbnb/lottie/f/f;->nW:I
+    iget p2, v0, Lcom/airbnb/lottie/f/f;->nV:I
 
     const v1, 0x7fffffff
 
     if-ne p2, v1, :cond_2
 
-    iget p2, v0, Lcom/airbnb/lottie/f/f;->nV:F
+    iget p2, v0, Lcom/airbnb/lottie/f/f;->nU:F
 
     const/high16 v1, 0x40000000    # 2.0f
 
     div-float/2addr p2, v1
 
-    iput p2, v0, Lcom/airbnb/lottie/f/f;->nV:F
+    iput p2, v0, Lcom/airbnb/lottie/f/f;->nU:F
 
-    iget p2, v0, Lcom/airbnb/lottie/f/f;->nW:I
+    iget p2, v0, Lcom/airbnb/lottie/f/f;->nV:I
 
     div-int/lit8 p2, p2, 0x2
 
-    iput p2, v0, Lcom/airbnb/lottie/f/f;->nW:I
+    iput p2, v0, Lcom/airbnb/lottie/f/f;->nV:I
 
     :cond_2
     const-string p2, "__container"
@@ -143,7 +143,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/airbnb/lottie/m;->hk:Ljava/util/Set;
+    iget-object p1, p0, Lcom/airbnb/lottie/m;->hj:Ljava/util/Set;
 
     invoke-interface {p1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali/com/airbnb/lottie/n.smali b/com.discord/smali/com/airbnb/lottie/n.smali
index b434d1b629..b6b1fba8d6 100644
--- a/com.discord/smali/com/airbnb/lottie/n.smali
+++ b/com.discord/smali/com/airbnb/lottie/n.smali
@@ -14,13 +14,13 @@
 
 
 # static fields
+.field public static final enum hn:Lcom/airbnb/lottie/n;
+
 .field public static final enum ho:Lcom/airbnb/lottie/n;
 
 .field public static final enum hp:Lcom/airbnb/lottie/n;
 
-.field public static final enum hq:Lcom/airbnb/lottie/n;
-
-.field private static final synthetic hr:[Lcom/airbnb/lottie/n;
+.field private static final synthetic hq:[Lcom/airbnb/lottie/n;
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/airbnb/lottie/n;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/n;->ho:Lcom/airbnb/lottie/n;
+    sput-object v0, Lcom/airbnb/lottie/n;->hn:Lcom/airbnb/lottie/n;
 
     new-instance v0, Lcom/airbnb/lottie/n;
 
@@ -45,7 +45,7 @@
 
     invoke-direct {v0, v3, v2}, Lcom/airbnb/lottie/n;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/n;->hp:Lcom/airbnb/lottie/n;
+    sput-object v0, Lcom/airbnb/lottie/n;->ho:Lcom/airbnb/lottie/n;
 
     new-instance v0, Lcom/airbnb/lottie/n;
 
@@ -55,25 +55,25 @@
 
     invoke-direct {v0, v4, v3}, Lcom/airbnb/lottie/n;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/airbnb/lottie/n;->hq:Lcom/airbnb/lottie/n;
+    sput-object v0, Lcom/airbnb/lottie/n;->hp:Lcom/airbnb/lottie/n;
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lcom/airbnb/lottie/n;
 
-    sget-object v4, Lcom/airbnb/lottie/n;->ho:Lcom/airbnb/lottie/n;
+    sget-object v4, Lcom/airbnb/lottie/n;->hn:Lcom/airbnb/lottie/n;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/n;->hp:Lcom/airbnb/lottie/n;
+    sget-object v1, Lcom/airbnb/lottie/n;->ho:Lcom/airbnb/lottie/n;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/airbnb/lottie/n;->hq:Lcom/airbnb/lottie/n;
+    sget-object v1, Lcom/airbnb/lottie/n;->hp:Lcom/airbnb/lottie/n;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/airbnb/lottie/n;->hr:[Lcom/airbnb/lottie/n;
+    sput-object v0, Lcom/airbnb/lottie/n;->hq:[Lcom/airbnb/lottie/n;
 
     return-void
 .end method
@@ -108,7 +108,7 @@
 .method public static values()[Lcom/airbnb/lottie/n;
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/n;->hr:[Lcom/airbnb/lottie/n;
+    sget-object v0, Lcom/airbnb/lottie/n;->hq:[Lcom/airbnb/lottie/n;
 
     invoke-virtual {v0}, [Lcom/airbnb/lottie/n;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/airbnb/lottie/p.smali b/com.discord/smali/com/airbnb/lottie/p.smali
index a08cfeca3c..fd4dbb21b7 100644
--- a/com.discord/smali/com/airbnb/lottie/p.smali
+++ b/com.discord/smali/com/airbnb/lottie/p.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final hs:Ljava/util/Map;
+.field public final hr:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,4 +15,4 @@
     .end annotation
 .end field
 
-.field public ht:Z
+.field public hs:Z
diff --git a/com.discord/smali/com/angarron/colorpicker/R$a.smali b/com.discord/smali/com/angarron/colorpicker/R$a.smali
index 27a818b265..fcf3e22b00 100644
--- a/com.discord/smali/com/angarron/colorpicker/R$a.smali
+++ b/com.discord/smali/com/angarron/colorpicker/R$a.smali
@@ -53,165 +53,165 @@
 
 .field public static final always:I = 0x7f0a0074
 
-.field public static final beginning:I = 0x7f0a00c9
+.field public static final beginning:I = 0x7f0a00ca
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final buttonPanel:I = 0x7f0a010c
+.field public static final buttonPanel:I = 0x7f0a010d
 
-.field public static final cancel_action:I = 0x7f0a0117
+.field public static final cancel_action:I = 0x7f0a0118
 
-.field public static final checkbox:I = 0x7f0a0212
+.field public static final checkbox:I = 0x7f0a0213
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final collapseActionView:I = 0x7f0a021c
+.field public static final collapseActionView:I = 0x7f0a021d
 
-.field public static final color_picker_gridview:I = 0x7f0a021f
+.field public static final color_picker_gridview:I = 0x7f0a0220
 
-.field public static final contentPanel:I = 0x7f0a0233
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final custom:I = 0x7f0a0247
+.field public static final custom:I = 0x7f0a0250
 
-.field public static final customPanel:I = 0x7f0a0248
+.field public static final customPanel:I = 0x7f0a0251
 
-.field public static final decor_content_parent:I = 0x7f0a024c
+.field public static final decor_content_parent:I = 0x7f0a0255
 
-.field public static final default_activity_button:I = 0x7f0a024d
+.field public static final default_activity_button:I = 0x7f0a0256
 
-.field public static final disableHome:I = 0x7f0a0271
+.field public static final disableHome:I = 0x7f0a027a
 
-.field public static final edit_query:I = 0x7f0a02a3
+.field public static final edit_query:I = 0x7f0a02ac
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final end_padder:I = 0x7f0a02bf
+.field public static final end_padder:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02c4
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02c5
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final home:I = 0x7f0a0382
+.field public static final home:I = 0x7f0a0392
 
-.field public static final homeAsUp:I = 0x7f0a0383
+.field public static final homeAsUp:I = 0x7f0a0393
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final ifRoom:I = 0x7f0a0387
+.field public static final ifRoom:I = 0x7f0a0397
 
-.field public static final image:I = 0x7f0a0388
+.field public static final image:I = 0x7f0a0398
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final listMode:I = 0x7f0a040d
+.field public static final listMode:I = 0x7f0a041d
 
-.field public static final list_item:I = 0x7f0a040e
+.field public static final list_item:I = 0x7f0a041e
 
-.field public static final media_actions:I = 0x7f0a042c
+.field public static final media_actions:I = 0x7f0a043c
 
-.field public static final middle:I = 0x7f0a0473
+.field public static final middle:I = 0x7f0a0486
 
-.field public static final multiply:I = 0x7f0a0477
+.field public static final multiply:I = 0x7f0a048a
 
-.field public static final never:I = 0x7f0a0484
+.field public static final never:I = 0x7f0a0497
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final parentPanel:I = 0x7f0a04c3
+.field public static final parentPanel:I = 0x7f0a04d9
 
-.field public static final progress_circular:I = 0x7f0a0543
+.field public static final progress_circular:I = 0x7f0a0553
 
-.field public static final progress_horizontal:I = 0x7f0a0545
+.field public static final progress_horizontal:I = 0x7f0a0555
 
-.field public static final radio:I = 0x7f0a0550
+.field public static final radio:I = 0x7f0a0560
 
-.field public static final screen:I = 0x7f0a059a
+.field public static final screen:I = 0x7f0a05b4
 
-.field public static final scrollIndicatorDown:I = 0x7f0a059c
+.field public static final scrollIndicatorDown:I = 0x7f0a05b6
 
-.field public static final scrollIndicatorUp:I = 0x7f0a059d
+.field public static final scrollIndicatorUp:I = 0x7f0a05b7
 
-.field public static final scrollView:I = 0x7f0a059e
+.field public static final scrollView:I = 0x7f0a05b8
 
-.field public static final search_badge:I = 0x7f0a05a2
+.field public static final search_badge:I = 0x7f0a05bc
 
-.field public static final search_bar:I = 0x7f0a05a3
+.field public static final search_bar:I = 0x7f0a05bd
 
-.field public static final search_button:I = 0x7f0a05a4
+.field public static final search_button:I = 0x7f0a05be
 
-.field public static final search_close_btn:I = 0x7f0a05a6
+.field public static final search_close_btn:I = 0x7f0a05c0
 
-.field public static final search_edit_frame:I = 0x7f0a05a7
+.field public static final search_edit_frame:I = 0x7f0a05c1
 
-.field public static final search_go_btn:I = 0x7f0a05aa
+.field public static final search_go_btn:I = 0x7f0a05c4
 
-.field public static final search_mag_icon:I = 0x7f0a05ac
+.field public static final search_mag_icon:I = 0x7f0a05c6
 
-.field public static final search_plate:I = 0x7f0a05ad
+.field public static final search_plate:I = 0x7f0a05c7
 
-.field public static final search_src_text:I = 0x7f0a05b0
+.field public static final search_src_text:I = 0x7f0a05ca
 
-.field public static final search_voice_btn:I = 0x7f0a05bc
+.field public static final search_voice_btn:I = 0x7f0a05d6
 
-.field public static final select_dialog_listview:I = 0x7f0a05bd
+.field public static final select_dialog_listview:I = 0x7f0a05d7
 
-.field public static final selected_checkmark:I = 0x7f0a05bf
+.field public static final selected_checkmark:I = 0x7f0a05d9
 
-.field public static final shortcut:I = 0x7f0a06f7
+.field public static final shortcut:I = 0x7f0a0711
 
-.field public static final showCustom:I = 0x7f0a06f8
+.field public static final showCustom:I = 0x7f0a0712
 
-.field public static final showHome:I = 0x7f0a06f9
+.field public static final showHome:I = 0x7f0a0713
 
-.field public static final showTitle:I = 0x7f0a06fa
+.field public static final showTitle:I = 0x7f0a0714
 
-.field public static final spacer:I = 0x7f0a0703
+.field public static final spacer:I = 0x7f0a071d
 
-.field public static final split_action_bar:I = 0x7f0a0704
+.field public static final split_action_bar:I = 0x7f0a0724
 
-.field public static final src_atop:I = 0x7f0a0707
+.field public static final src_atop:I = 0x7f0a0727
 
-.field public static final src_in:I = 0x7f0a0708
+.field public static final src_in:I = 0x7f0a0728
 
-.field public static final src_over:I = 0x7f0a0709
+.field public static final src_over:I = 0x7f0a0729
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0710
+.field public static final status_bar_latest_event_content:I = 0x7f0a0730
 
-.field public static final submenuarrow:I = 0x7f0a0724
+.field public static final submenuarrow:I = 0x7f0a074d
 
-.field public static final submit_area:I = 0x7f0a0725
+.field public static final submit_area:I = 0x7f0a074e
 
-.field public static final tabMode:I = 0x7f0a0731
+.field public static final tabMode:I = 0x7f0a075a
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0741
+.field public static final textSpacerNoButtons:I = 0x7f0a076a
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final title_template:I = 0x7f0a0751
+.field public static final title_template:I = 0x7f0a077a
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
-.field public static final topPanel:I = 0x7f0a0757
+.field public static final topPanel:I = 0x7f0a0780
 
-.field public static final up:I = 0x7f0a076d
+.field public static final up:I = 0x7f0a0796
 
-.field public static final useLogo:I = 0x7f0a0776
+.field public static final useLogo:I = 0x7f0a079f
 
-.field public static final withText:I = 0x7f0a082c
+.field public static final withText:I = 0x7f0a0869
 
-.field public static final wrap_content:I = 0x7f0a082e
+.field public static final wrap_content:I = 0x7f0a086b
 
 
 # direct methods
diff --git a/com.discord/smali/com/angarron/colorpicker/R$b.smali b/com.discord/smali/com/angarron/colorpicker/R$b.smali
index 8d5937e180..3380e080bf 100644
--- a/com.discord/smali/com/angarron/colorpicker/R$b.smali
+++ b/com.discord/smali/com/angarron/colorpicker/R$b.smali
@@ -69,27 +69,27 @@
 
 .field public static final color_picker_dialog:I = 0x7f0d0021
 
-.field public static final notification_media_action:I = 0x7f0d0043
+.field public static final notification_media_action:I = 0x7f0d0045
 
-.field public static final notification_media_cancel_action:I = 0x7f0d0044
+.field public static final notification_media_cancel_action:I = 0x7f0d0046
 
-.field public static final notification_template_big_media:I = 0x7f0d0045
+.field public static final notification_template_big_media:I = 0x7f0d0047
 
-.field public static final notification_template_big_media_narrow:I = 0x7f0d0047
+.field public static final notification_template_big_media_narrow:I = 0x7f0d0049
 
-.field public static final notification_template_media:I = 0x7f0d004c
+.field public static final notification_template_media:I = 0x7f0d004e
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
-.field public static final select_dialog_item_material:I = 0x7f0d005d
+.field public static final select_dialog_item_material:I = 0x7f0d005f
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d005e
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0060
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d005f
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d0061
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0066
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0069
 
 
 # direct methods
diff --git a/com.discord/smali/com/angarron/colorpicker/a$1.smali b/com.discord/smali/com/angarron/colorpicker/a$1.smali
index 53f831fda3..480ed615d1 100644
--- a/com.discord/smali/com/angarron/colorpicker/a$1.smali
+++ b/com.discord/smali/com/angarron/colorpicker/a$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic ox:Lcom/angarron/colorpicker/a;
+.field final synthetic ow:Lcom/angarron/colorpicker/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/angarron/colorpicker/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/angarron/colorpicker/a$1;->ox:Lcom/angarron/colorpicker/a;
+    iput-object p1, p0, Lcom/angarron/colorpicker/a$1;->ow:Lcom/angarron/colorpicker/a;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,13 +34,13 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/a$1;->ox:Lcom/angarron/colorpicker/a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a$1;->ow:Lcom/angarron/colorpicker/a;
 
     invoke-static {p1}, Lcom/angarron/colorpicker/a;->b(Lcom/angarron/colorpicker/a;)Landroid/widget/ImageView;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/a$1;->ox:Lcom/angarron/colorpicker/a;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a$1;->ow:Lcom/angarron/colorpicker/a;
 
     invoke-static {v0}, Lcom/angarron/colorpicker/a;->a(Lcom/angarron/colorpicker/a;)Z
 
@@ -58,7 +58,7 @@
     :goto_0
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/a$1;->ox:Lcom/angarron/colorpicker/a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a$1;->ow:Lcom/angarron/colorpicker/a;
 
     invoke-static {p1}, Lcom/angarron/colorpicker/a;->a(Lcom/angarron/colorpicker/a;)Z
 
diff --git a/com.discord/smali/com/angarron/colorpicker/a$2.smali b/com.discord/smali/com/angarron/colorpicker/a$2.smali
index 998cdb5409..fb3a1a20ec 100644
--- a/com.discord/smali/com/angarron/colorpicker/a$2.smali
+++ b/com.discord/smali/com/angarron/colorpicker/a$2.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic ox:Lcom/angarron/colorpicker/a;
+.field final synthetic ow:Lcom/angarron/colorpicker/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/angarron/colorpicker/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/angarron/colorpicker/a$2;->ox:Lcom/angarron/colorpicker/a;
+    iput-object p1, p0, Lcom/angarron/colorpicker/a$2;->ow:Lcom/angarron/colorpicker/a;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,13 +34,13 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/a$2;->ox:Lcom/angarron/colorpicker/a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a$2;->ow:Lcom/angarron/colorpicker/a;
 
     invoke-static {p1}, Lcom/angarron/colorpicker/a;->b(Lcom/angarron/colorpicker/a;)Landroid/widget/ImageView;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/a$2;->ox:Lcom/angarron/colorpicker/a;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a$2;->ow:Lcom/angarron/colorpicker/a;
 
     invoke-static {v0}, Lcom/angarron/colorpicker/a;->a(Lcom/angarron/colorpicker/a;)Z
 
@@ -58,7 +58,7 @@
     :goto_0
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/a$2;->ox:Lcom/angarron/colorpicker/a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a$2;->ow:Lcom/angarron/colorpicker/a;
 
     invoke-static {p1}, Lcom/angarron/colorpicker/a;->a(Lcom/angarron/colorpicker/a;)Z
 
diff --git a/com.discord/smali/com/angarron/colorpicker/a.smali b/com.discord/smali/com/angarron/colorpicker/a.smali
index 97a47c5a52..4934250402 100644
--- a/com.discord/smali/com/angarron/colorpicker/a.smali
+++ b/com.discord/smali/com/angarron/colorpicker/a.smali
@@ -19,11 +19,11 @@
 
 .field private mIsSelected:Z
 
-.field private ou:Landroid/widget/ImageView;
+.field private ot:Landroid/widget/ImageView;
 
-.field private ov:I
+.field private ou:I
 
-.field private ow:Lcom/angarron/colorpicker/a$a;
+.field private ov:Lcom/angarron/colorpicker/a$a;
 
 
 # direct methods
@@ -34,7 +34,7 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/angarron/colorpicker/a;->ov:I
+    iput p1, p0, Lcom/angarron/colorpicker/a;->ou:I
 
     iput-boolean p1, p0, Lcom/angarron/colorpicker/a;->mIsSelected:Z
 
@@ -68,9 +68,9 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/angarron/colorpicker/a;->ou:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/angarron/colorpicker/a;->ot:Landroid/widget/ImageView;
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/a;->ou:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a;->ot:Landroid/widget/ImageView;
 
     iget p2, p0, Lcom/angarron/colorpicker/a;->mColor:I
 
@@ -116,7 +116,7 @@
 .method static synthetic b(Lcom/angarron/colorpicker/a;)Landroid/widget/ImageView;
     .locals 0
 
-    iget-object p0, p0, Lcom/angarron/colorpicker/a;->ou:Landroid/widget/ImageView;
+    iget-object p0, p0, Lcom/angarron/colorpicker/a;->ot:Landroid/widget/ImageView;
 
     return-object p0
 .end method
@@ -165,7 +165,7 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/GradientDrawable;->setShape(I)V
 
-    iget v1, p0, Lcom/angarron/colorpicker/a;->ov:I
+    iget v1, p0, Lcom/angarron/colorpicker/a;->ou:I
 
     if-eqz v1, :cond_1
 
@@ -372,15 +372,15 @@
 .method private setItemCheckmarkAttributes(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/a;->ou:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->ot:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setAlpha(F)V
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/a;->ou:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->ot:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setScaleX(F)V
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/a;->ou:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->ot:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setScaleY(F)V
 
@@ -412,7 +412,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/a;->ow:Lcom/angarron/colorpicker/a$a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a;->ov:Lcom/angarron/colorpicker/a$a;
 
     if-eqz p1, :cond_0
 
@@ -445,11 +445,11 @@
 
     invoke-direct {p0, v3}, Lcom/angarron/colorpicker/a;->setItemCheckmarkAttributes(F)V
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/a;->ou:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->ot:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/a;->ou:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a;->ot:Landroid/widget/ImageView;
 
     invoke-virtual {p1}, Landroid/widget/ImageView;->animate()Landroid/view/ViewPropertyAnimator;
 
@@ -490,13 +490,13 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/a;->ou:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->ot:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setVisibility(I)V
 
     invoke-direct {p0, v4}, Lcom/angarron/colorpicker/a;->setItemCheckmarkAttributes(F)V
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/a;->ou:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a;->ot:Landroid/widget/ImageView;
 
     invoke-virtual {p1}, Landroid/widget/ImageView;->animate()Landroid/view/ViewPropertyAnimator;
 
@@ -531,7 +531,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/angarron/colorpicker/a;->ou:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->ot:Landroid/widget/ImageView;
 
     iget-boolean v1, p0, Lcom/angarron/colorpicker/a;->mIsSelected:Z
 
@@ -553,7 +553,7 @@
 .method public final setOnSelectedListener(Lcom/angarron/colorpicker/a$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/angarron/colorpicker/a;->ow:Lcom/angarron/colorpicker/a$a;
+    iput-object p1, p0, Lcom/angarron/colorpicker/a;->ov:Lcom/angarron/colorpicker/a$a;
 
     return-void
 .end method
@@ -561,7 +561,7 @@
 .method public final setOutlineWidth(I)V
     .locals 0
 
-    iput p1, p0, Lcom/angarron/colorpicker/a;->ov:I
+    iput p1, p0, Lcom/angarron/colorpicker/a;->ou:I
 
     invoke-direct {p0}, Lcom/angarron/colorpicker/a;->bL()V
 
diff --git a/com.discord/smali/com/angarron/colorpicker/b$a.smali b/com.discord/smali/com/angarron/colorpicker/b$a.smali
index 02e759064c..3bd0db532c 100644
--- a/com.discord/smali/com/angarron/colorpicker/b$a.smali
+++ b/com.discord/smali/com/angarron/colorpicker/b$a.smali
@@ -19,11 +19,11 @@
 
 .field public listener:Lcom/angarron/colorpicker/OnColorSelectedListener;
 
-.field public oB:[I
+.field public oA:[I
 
-.field public oC:I
+.field public oB:I
 
-.field public oE:F
+.field public oD:F
 
 
 # direct methods
@@ -36,11 +36,11 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/angarron/colorpicker/b$a;->oE:F
+    iput v0, p0, Lcom/angarron/colorpicker/b$a;->oD:F
 
     const/4 v0, -0x2
 
-    iput v0, p0, Lcom/angarron/colorpicker/b$a;->oC:I
+    iput v0, p0, Lcom/angarron/colorpicker/b$a;->oB:I
 
     iput-object p1, p0, Lcom/angarron/colorpicker/b$a;->context:Landroid/content/Context;
 
@@ -52,7 +52,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/angarron/colorpicker/b$a;->oB:[I
+    iput-object p1, p0, Lcom/angarron/colorpicker/b$a;->oA:[I
 
     return-void
 .end method
diff --git a/com.discord/smali/com/angarron/colorpicker/b.smali b/com.discord/smali/com/angarron/colorpicker/b.smali
index 968c5887a8..c0d960d8f6 100644
--- a/com.discord/smali/com/angarron/colorpicker/b.smali
+++ b/com.discord/smali/com/angarron/colorpicker/b.smali
@@ -15,9 +15,9 @@
 
 
 # static fields
-.field private static oy:F = 30.0f
+.field private static ox:F = 30.0f
 
-.field private static oz:[I
+.field private static oy:[I
 
 
 # instance fields
@@ -25,13 +25,13 @@
 
 .field public listener:Lcom/angarron/colorpicker/OnColorSelectedListener;
 
-.field public final oA:F
+.field private final oA:[I
 
-.field private final oB:[I
+.field private oB:I
 
-.field private oC:I
+.field private oC:Lcom/angarron/colorpicker/a;
 
-.field private oD:Lcom/angarron/colorpicker/a;
+.field public final oz:F
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/angarron/colorpicker/b;->oz:[I
+    sput-object v0, Lcom/angarron/colorpicker/b;->oy:[I
 
     return-void
 
@@ -68,11 +68,11 @@
 
     iput-object p1, p0, Lcom/angarron/colorpicker/b;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/angarron/colorpicker/b;->oB:[I
+    iput-object p2, p0, Lcom/angarron/colorpicker/b;->oA:[I
 
-    iput p3, p0, Lcom/angarron/colorpicker/b;->oC:I
+    iput p3, p0, Lcom/angarron/colorpicker/b;->oB:I
 
-    iput p4, p0, Lcom/angarron/colorpicker/b;->oA:F
+    iput p4, p0, Lcom/angarron/colorpicker/b;->oz:F
 
     return-void
 .end method
@@ -122,7 +122,7 @@
 .method static synthetic bO()F
     .locals 1
 
-    sget v0, Lcom/angarron/colorpicker/b;->oy:F
+    sget v0, Lcom/angarron/colorpicker/b;->ox:F
 
     return v0
 .end method
@@ -130,7 +130,7 @@
 .method static synthetic bP()[I
     .locals 1
 
-    sget-object v0, Lcom/angarron/colorpicker/b;->oz:[I
+    sget-object v0, Lcom/angarron/colorpicker/b;->oy:[I
 
     return-object v0
 .end method
@@ -140,7 +140,7 @@
 .method public final c(Lcom/angarron/colorpicker/a;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/b;->oD:Lcom/angarron/colorpicker/a;
+    iget-object v0, p0, Lcom/angarron/colorpicker/b;->oC:Lcom/angarron/colorpicker/a;
 
     if-eqz v0, :cond_0
 
@@ -149,19 +149,19 @@
     invoke-virtual {v0, v1}, Lcom/angarron/colorpicker/a;->setChecked(Z)V
 
     :cond_0
-    iput-object p1, p0, Lcom/angarron/colorpicker/b;->oD:Lcom/angarron/colorpicker/a;
+    iput-object p1, p0, Lcom/angarron/colorpicker/b;->oC:Lcom/angarron/colorpicker/a;
 
     invoke-virtual {p1}, Lcom/angarron/colorpicker/a;->getColor()I
 
     move-result p1
 
-    iput p1, p0, Lcom/angarron/colorpicker/b;->oC:I
+    iput p1, p0, Lcom/angarron/colorpicker/b;->oB:I
 
     iget-object p1, p0, Lcom/angarron/colorpicker/b;->listener:Lcom/angarron/colorpicker/OnColorSelectedListener;
 
     if-eqz p1, :cond_1
 
-    iget v0, p0, Lcom/angarron/colorpicker/b;->oC:I
+    iget v0, p0, Lcom/angarron/colorpicker/b;->oB:I
 
     invoke-interface {p1, v0}, Lcom/angarron/colorpicker/OnColorSelectedListener;->onColorSelected(I)V
 
@@ -196,7 +196,7 @@
 .method public final getCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/b;->oB:[I
+    iget-object v0, p0, Lcom/angarron/colorpicker/b;->oA:[I
 
     array-length v0, v0
 
@@ -206,7 +206,7 @@
 .method public final getItem(I)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/b;->oB:[I
+    iget-object v0, p0, Lcom/angarron/colorpicker/b;->oA:[I
 
     aget p1, v0, p1
 
@@ -230,11 +230,11 @@
 
     if-nez p2, :cond_2
 
-    iget-object p2, p0, Lcom/angarron/colorpicker/b;->oB:[I
+    iget-object p2, p0, Lcom/angarron/colorpicker/b;->oA:[I
 
     aget p2, p2, p1
 
-    iget p3, p0, Lcom/angarron/colorpicker/b;->oC:I
+    iget p3, p0, Lcom/angarron/colorpicker/b;->oB:I
 
     if-ne p2, p3, :cond_0
 
@@ -250,7 +250,7 @@
 
     iget-object v0, p0, Lcom/angarron/colorpicker/b;->context:Landroid/content/Context;
 
-    iget-object v1, p0, Lcom/angarron/colorpicker/b;->oB:[I
+    iget-object v1, p0, Lcom/angarron/colorpicker/b;->oA:[I
 
     aget p1, v1, p1
 
@@ -258,10 +258,10 @@
 
     if-eqz p2, :cond_1
 
-    iput-object p3, p0, Lcom/angarron/colorpicker/b;->oD:Lcom/angarron/colorpicker/a;
+    iput-object p3, p0, Lcom/angarron/colorpicker/b;->oC:Lcom/angarron/colorpicker/a;
 
     :cond_1
-    iget p1, p0, Lcom/angarron/colorpicker/b;->oA:F
+    iget p1, p0, Lcom/angarron/colorpicker/b;->oz:F
 
     invoke-virtual {p0, p1}, Lcom/angarron/colorpicker/b;->g(F)I
 
diff --git a/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider.smali b/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider.smali
index 5729851c3b..c23d4345a5 100644
--- a/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider.smali
+++ b/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider.smali
@@ -65,7 +65,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -84,7 +84,7 @@
     if-eqz p0, :cond_1
 
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -111,7 +111,7 @@
     :catchall_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -208,7 +208,7 @@
 
     if-eqz v1, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -235,7 +235,7 @@
 
     invoke-static {v0, v1}, Lio/fabric/sdk/android/c;->a(Landroid/content/Context;[Lio/fabric/sdk/android/i;)Lio/fabric/sdk/android/c;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -248,7 +248,7 @@
     goto :goto_1
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -259,7 +259,7 @@
     return v3
 
     :cond_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/a.smali b/com.discord/smali/com/crashlytics/android/a.smali
index 0f935f1f91..f73778804c 100644
--- a/com.discord/smali/com/crashlytics/android/a.smali
+++ b/com.discord/smali/com/crashlytics/android/a.smali
@@ -18,13 +18,13 @@
 
 
 # instance fields
-.field public final oF:Lcom/crashlytics/android/answers/Answers;
+.field public final oE:Lcom/crashlytics/android/answers/Answers;
 
-.field public final oG:Lcom/crashlytics/android/beta/a;
+.field public final oF:Lcom/crashlytics/android/beta/a;
 
-.field public final oH:Lcom/crashlytics/android/core/l;
+.field public final oG:Lcom/crashlytics/android/core/l;
 
-.field public final oI:Ljava/util/Collection;
+.field public final oH:Ljava/util/Collection;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Collection<",
@@ -62,11 +62,11 @@
 
     invoke-direct {p0}, Lio/fabric/sdk/android/i;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/a;->oF:Lcom/crashlytics/android/answers/Answers;
+    iput-object p1, p0, Lcom/crashlytics/android/a;->oE:Lcom/crashlytics/android/answers/Answers;
 
-    iput-object p2, p0, Lcom/crashlytics/android/a;->oG:Lcom/crashlytics/android/beta/a;
+    iput-object p2, p0, Lcom/crashlytics/android/a;->oF:Lcom/crashlytics/android/beta/a;
 
-    iput-object p3, p0, Lcom/crashlytics/android/a;->oH:Lcom/crashlytics/android/core/l;
+    iput-object p3, p0, Lcom/crashlytics/android/a;->oG:Lcom/crashlytics/android/core/l;
 
     const/4 v0, 0x3
 
@@ -92,7 +92,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/crashlytics/android/a;->oI:Ljava/util/Collection;
+    iput-object p1, p0, Lcom/crashlytics/android/a;->oH:Ljava/util/Collection;
 
     return-void
 .end method
@@ -106,33 +106,33 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/a;->oH:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->oG:Lcom/crashlytics/android/core/l;
 
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sl:Z
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sk:Z
 
     if-nez v1, :cond_0
 
     const-string v1, "prior to setting user data."
 
-    invoke-static {v1}, Lcom/crashlytics/android/core/l;->P(Ljava/lang/String;)Z
+    invoke-static {v1}, Lcom/crashlytics/android/core/l;->L(Ljava/lang/String;)Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    invoke-static {p0}, Lcom/crashlytics/android/core/l;->Q(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lcom/crashlytics/android/core/l;->M(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
-    iput-object p0, v0, Lcom/crashlytics/android/core/l;->si:Ljava/lang/String;
+    iput-object p0, v0, Lcom/crashlytics/android/core/l;->sh:Ljava/lang/String;
 
-    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->si:Ljava/lang/String;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sh:Ljava/lang/String;
 
     iget-object v2, v0, Lcom/crashlytics/android/core/l;->userName:Ljava/lang/String;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sj:Ljava/lang/String;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->si:Ljava/lang/String;
 
     invoke-virtual {p0, v1, v2, v0}, Lcom/crashlytics/android/core/k;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -149,33 +149,33 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/a;->oH:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->oG:Lcom/crashlytics/android/core/l;
 
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sl:Z
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sk:Z
 
     if-nez v1, :cond_0
 
     const-string v1, "prior to setting user data."
 
-    invoke-static {v1}, Lcom/crashlytics/android/core/l;->P(Ljava/lang/String;)Z
+    invoke-static {v1}, Lcom/crashlytics/android/core/l;->L(Ljava/lang/String;)Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    invoke-static {p0}, Lcom/crashlytics/android/core/l;->Q(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lcom/crashlytics/android/core/l;->M(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
     iput-object p0, v0, Lcom/crashlytics/android/core/l;->userName:Ljava/lang/String;
 
-    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->si:Ljava/lang/String;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sh:Ljava/lang/String;
 
     iget-object v2, v0, Lcom/crashlytics/android/core/l;->userName:Ljava/lang/String;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sj:Ljava/lang/String;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->si:Ljava/lang/String;
 
     invoke-virtual {p0, v1, v2, v0}, Lcom/crashlytics/android/core/k;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -192,33 +192,33 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/a;->oH:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->oG:Lcom/crashlytics/android/core/l;
 
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sl:Z
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sk:Z
 
     if-nez v1, :cond_0
 
     const-string v1, "prior to setting user data."
 
-    invoke-static {v1}, Lcom/crashlytics/android/core/l;->P(Ljava/lang/String;)Z
+    invoke-static {v1}, Lcom/crashlytics/android/core/l;->L(Ljava/lang/String;)Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    invoke-static {p0}, Lcom/crashlytics/android/core/l;->Q(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lcom/crashlytics/android/core/l;->M(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
-    iput-object p0, v0, Lcom/crashlytics/android/core/l;->sj:Ljava/lang/String;
+    iput-object p0, v0, Lcom/crashlytics/android/core/l;->si:Ljava/lang/String;
 
-    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->si:Ljava/lang/String;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sh:Ljava/lang/String;
 
     iget-object v2, v0, Lcom/crashlytics/android/core/l;->userName:Ljava/lang/String;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sj:Ljava/lang/String;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->si:Ljava/lang/String;
 
     invoke-virtual {p0, v1, v2, v0}, Lcom/crashlytics/android/core/k;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -235,15 +235,15 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/a;->oH:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->oG:Lcom/crashlytics/android/core/l;
 
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sl:Z
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sk:Z
 
     if-nez v1, :cond_1
 
     const-string v1, "prior to logging exceptions."
 
-    invoke-static {v1}, Lcom/crashlytics/android/core/l;->P(Ljava/lang/String;)Z
+    invoke-static {v1}, Lcom/crashlytics/android/core/l;->L(Ljava/lang/String;)Z
 
     move-result v1
 
@@ -251,7 +251,7 @@
 
     if-nez p0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -266,7 +266,7 @@
     return-void
 
     :cond_0
-    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
@@ -276,7 +276,7 @@
 
     invoke-direct {v2}, Ljava/util/Date;-><init>()V
 
-    iget-object v3, v0, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v3, v0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance v4, Lcom/crashlytics/android/core/k$25;
 
@@ -332,7 +332,7 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/a;->oH:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->oG:Lcom/crashlytics/android/core/l;
 
     const-string v1, "CrashlyticsCore"
 
@@ -350,25 +350,25 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/a;->oH:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->oG:Lcom/crashlytics/android/core/l;
 
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sl:Z
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sk:Z
 
     if-nez v1, :cond_2
 
     const-string v1, "prior to setting keys."
 
-    invoke-static {v1}, Lcom/crashlytics/android/core/l;->P(Ljava/lang/String;)Z
+    invoke-static {v1}, Lcom/crashlytics/android/core/l;->L(Ljava/lang/String;)Z
 
     move-result v1
 
     if-eqz v1, :cond_2
 
-    invoke-static {p0}, Lcom/crashlytics/android/core/l;->Q(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lcom/crashlytics/android/core/l;->M(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sd:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sc:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v1}, Ljava/util/concurrent/ConcurrentHashMap;->size()I
 
@@ -378,7 +378,7 @@
 
     if-lt v1, v2, :cond_0
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sd:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sc:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v1, p0}, Ljava/util/concurrent/ConcurrentHashMap;->containsKey(Ljava/lang/Object;)Z
 
@@ -386,7 +386,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -406,20 +406,20 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {p1}, Lcom/crashlytics/android/core/l;->Q(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/crashlytics/android/core/l;->M(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
     :goto_0
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sd:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sc:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v1, p0, p1}, Ljava/util/concurrent/ConcurrentHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
-    iget-object p1, v0, Lcom/crashlytics/android/core/l;->sd:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object p1, v0, Lcom/crashlytics/android/core/l;->sc:Ljava/util/concurrent/ConcurrentHashMap;
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance v1, Lcom/crashlytics/android/core/k$3;
 
@@ -445,7 +445,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/a;->oI:Ljava/util/Collection;
+    iget-object v0, p0, Lcom/crashlytics/android/a;->oH:Ljava/util/Collection;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/Answers.smali b/com.discord/smali/com/crashlytics/android/answers/Answers.smali
index df48d0fb93..716a8cb842 100644
--- a/com.discord/smali/com/crashlytics/android/answers/Answers.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/Answers.smali
@@ -14,9 +14,9 @@
 
 
 # instance fields
-.field oK:Z
+.field public oJ:Z
 
-.field public oL:Lcom/crashlytics/android/answers/ac;
+.field public oK:Lcom/crashlytics/android/answers/ac;
 
 
 # direct methods
@@ -27,15 +27,15 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->oK:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->oJ:Z
 
     return-void
 .end method
 
-.method private static D(Ljava/lang/String;)V
+.method public static D(Ljava/lang/String;)V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -87,13 +87,13 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/l;->Db()Z
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/l;->CS()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -103,7 +103,7 @@
 
     invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->oL:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/answers/ac;->disable()V
 
@@ -113,17 +113,17 @@
 
     :cond_0
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DV()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DL()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->DS()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->DI()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v1
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -136,13 +136,13 @@
     return-object v0
 
     :cond_1
-    iget-object v2, v1, Lio/fabric/sdk/android/a/g/t;->bjj:Lio/fabric/sdk/android/a/g/m;
+    iget-object v2, v1, Lio/fabric/sdk/android/a/g/t;->bjD:Lio/fabric/sdk/android/a/g/m;
 
-    iget-boolean v2, v2, Lio/fabric/sdk/android/a/g/m;->biK:Z
+    iget-boolean v2, v2, Lio/fabric/sdk/android/a/g/m;->bje:Z
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -150,9 +150,9 @@
 
     invoke-interface {v2, v0, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/crashlytics/android/answers/Answers;->oL:Lcom/crashlytics/android/answers/ac;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
 
-    iget-object v1, v1, Lio/fabric/sdk/android/a/g/t;->pO:Lio/fabric/sdk/android/a/g/b;
+    iget-object v1, v1, Lio/fabric/sdk/android/a/g/t;->pN:Lio/fabric/sdk/android/a/g/b;
 
     iget-object v3, p0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -162,13 +162,13 @@
 
     move-result-object v3
 
-    iget-object v4, v2, Lcom/crashlytics/android/answers/ac;->pf:Lcom/crashlytics/android/answers/k;
+    iget-object v4, v2, Lcom/crashlytics/android/answers/ac;->pe:Lcom/crashlytics/android/answers/k;
 
-    iget-boolean v5, v1, Lio/fabric/sdk/android/a/g/b;->pm:Z
+    iget-boolean v5, v1, Lio/fabric/sdk/android/a/g/b;->pl:Z
 
-    iput-boolean v5, v4, Lcom/crashlytics/android/answers/k;->pm:Z
+    iput-boolean v5, v4, Lcom/crashlytics/android/answers/k;->pl:Z
 
-    iget-object v2, v2, Lcom/crashlytics/android/answers/ac;->pR:Lcom/crashlytics/android/answers/e;
+    iget-object v2, v2, Lcom/crashlytics/android/answers/ac;->pQ:Lcom/crashlytics/android/answers/e;
 
     new-instance v4, Lcom/crashlytics/android/answers/e$1;
 
@@ -181,7 +181,7 @@
     return-object v0
 
     :cond_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -189,7 +189,7 @@
 
     invoke-interface {v1, v0, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/Answers;->oL:Lcom/crashlytics/android/answers/ac;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
 
     invoke-virtual {v1}, Lcom/crashlytics/android/answers/ac;->disable()V
 
@@ -202,7 +202,7 @@
     :catch_0
     move-exception v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -217,60 +217,12 @@
 
 
 # virtual methods
-.method public final a(Lcom/crashlytics/android/answers/ai;)V
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->oK:Z
-
-    if-eqz v0, :cond_0
-
-    const-string p1, "logShare"
-
-    invoke-static {p1}, Lcom/crashlytics/android/answers/Answers;->D(Ljava/lang/String;)V
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->oL:Lcom/crashlytics/android/answers/ac;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0, p1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
-
-    :cond_1
-    return-void
-.end method
-
-.method public final a(Lcom/crashlytics/android/answers/aj;)V
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->oK:Z
-
-    if-eqz v0, :cond_0
-
-    const-string p1, "logSignUp"
-
-    invoke-static {p1}, Lcom/crashlytics/android/answers/Answers;->D(Ljava/lang/String;)V
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->oL:Lcom/crashlytics/android/answers/ac;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0, p1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
-
-    :cond_1
-    return-void
-.end method
-
 .method public final a(Lcom/crashlytics/android/answers/l;)V
     .locals 4
 
     if-eqz p1, :cond_2
 
-    iget-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->oK:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->oJ:Z
 
     if-eqz v0, :cond_0
 
@@ -281,11 +233,11 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->oL:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -303,23 +255,23 @@
 
     invoke-interface {v1, v3, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/ac;->pR:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/ac;->pQ:Lcom/crashlytics/android/answers/e;
 
     new-instance v1, Lcom/crashlytics/android/answers/ae$a;
 
-    sget-object v2, Lcom/crashlytics/android/answers/ae$b;->qi:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v2, Lcom/crashlytics/android/answers/ae$b;->qh:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-direct {v1, v2}, Lcom/crashlytics/android/answers/ae$a;-><init>(Lcom/crashlytics/android/answers/ae$b;)V
 
-    iget-object v2, p1, Lcom/crashlytics/android/answers/l;->pq:Ljava/lang/String;
+    iget-object v2, p1, Lcom/crashlytics/android/answers/l;->pp:Ljava/lang/String;
 
-    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->pX:Ljava/lang/String;
+    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->pW:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/c;->oO:Lcom/crashlytics/android/answers/b;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/c;->oN:Lcom/crashlytics/android/answers/b;
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/b;->oN:Ljava/util/Map;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/b;->oM:Ljava/util/Map;
 
-    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->pY:Ljava/util/Map;
+    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->pX:Ljava/util/Map;
 
     const/4 p1, 0x0
 
@@ -338,30 +290,6 @@
     throw p1
 .end method
 
-.method public final a(Lcom/crashlytics/android/answers/v;)V
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->oK:Z
-
-    if-eqz v0, :cond_0
-
-    const-string p1, "logLogin"
-
-    invoke-static {p1}, Lcom/crashlytics/android/answers/Answers;->D(Ljava/lang/String;)V
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->oL:Lcom/crashlytics/android/answers/ac;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0, p1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
-
-    :cond_1
-    return-void
-.end method
-
 .method public final synthetic bS()Ljava/lang/Object;
     .locals 1
 
@@ -447,7 +375,7 @@
     goto :goto_1
 
     :goto_2
-    iget-object v1, v9, Lio/fabric/sdk/android/i;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, v9, Lio/fabric/sdk/android/i;->qu:Lio/fabric/sdk/android/a/b/s;
 
     new-instance v6, Lcom/crashlytics/android/answers/ah;
 
@@ -463,7 +391,7 @@
 
     new-instance v7, Lio/fabric/sdk/android/a/e/b;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -475,7 +403,7 @@
 
     const-string v1, "Answers Events Handler"
 
-    invoke-static {v1}, Lio/fabric/sdk/android/a/b/o;->dI(Ljava/lang/String;)Ljava/util/concurrent/ThreadFactory;
+    invoke-static {v1}, Lio/fabric/sdk/android/a/b/o;->dC(Ljava/lang/String;)Ljava/util/concurrent/ThreadFactory;
 
     move-result-object v2
 
@@ -535,11 +463,11 @@
 
     invoke-direct/range {v13 .. v19}, Lcom/crashlytics/android/answers/ac;-><init>(Lcom/crashlytics/android/answers/e;Lio/fabric/sdk/android/a;Lcom/crashlytics/android/answers/k;Lcom/crashlytics/android/answers/h;J)V
 
-    iput-object v1, v9, Lcom/crashlytics/android/answers/Answers;->oL:Lcom/crashlytics/android/answers/ac;
+    iput-object v1, v9, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
 
-    iget-object v1, v9, Lcom/crashlytics/android/answers/Answers;->oL:Lcom/crashlytics/android/answers/ac;
+    iget-object v1, v9, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->pR:Lcom/crashlytics/android/answers/e;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->pQ:Lcom/crashlytics/android/answers/e;
 
     new-instance v3, Lcom/crashlytics/android/answers/e$4;
 
@@ -547,27 +475,27 @@
 
     invoke-virtual {v2, v3}, Lcom/crashlytics/android/answers/e;->c(Ljava/lang/Runnable;)V
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->pS:Lio/fabric/sdk/android/a;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->pR:Lio/fabric/sdk/android/a;
 
     new-instance v3, Lcom/crashlytics/android/answers/g;
 
-    iget-object v4, v1, Lcom/crashlytics/android/answers/ac;->pf:Lcom/crashlytics/android/answers/k;
+    iget-object v4, v1, Lcom/crashlytics/android/answers/ac;->pe:Lcom/crashlytics/android/answers/k;
 
     invoke-direct {v3, v1, v4}, Lcom/crashlytics/android/answers/g;-><init>(Lcom/crashlytics/android/answers/ac;Lcom/crashlytics/android/answers/k;)V
 
     invoke-virtual {v2, v3}, Lio/fabric/sdk/android/a;->a(Lio/fabric/sdk/android/a$b;)Z
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->pf:Lcom/crashlytics/android/answers/k;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->pe:Lcom/crashlytics/android/answers/k;
 
     iget-object v2, v2, Lcom/crashlytics/android/answers/k;->listeners:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->pT:Lcom/crashlytics/android/answers/h;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->pS:Lcom/crashlytics/android/answers/h;
 
-    iget-object v2, v2, Lcom/crashlytics/android/answers/h;->pg:Lio/fabric/sdk/android/a/f/c;
+    iget-object v2, v2, Lcom/crashlytics/android/answers/h;->pf:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->DO()Landroid/content/SharedPreferences;
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->DE()Landroid/content/SharedPreferences;
 
     move-result-object v2
 
@@ -581,9 +509,9 @@
 
     if-eqz v2, :cond_2
 
-    iget-wide v4, v1, Lcom/crashlytics/android/answers/ac;->pQ:J
+    iget-wide v4, v1, Lcom/crashlytics/android/answers/ac;->pP:J
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -591,11 +519,11 @@
 
     invoke-interface {v2, v10, v6}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->pR:Lcom/crashlytics/android/answers/e;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->pQ:Lcom/crashlytics/android/answers/e;
 
     new-instance v6, Lcom/crashlytics/android/answers/ae$a;
 
-    sget-object v7, Lcom/crashlytics/android/answers/ae$b;->qh:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v7, Lcom/crashlytics/android/answers/ae$b;->qg:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-direct {v6, v7}, Lcom/crashlytics/android/answers/ae$a;-><init>(Lcom/crashlytics/android/answers/ae$b;)V
 
@@ -609,15 +537,15 @@
 
     move-result-object v4
 
-    iput-object v4, v6, Lcom/crashlytics/android/answers/ae$a;->pW:Ljava/util/Map;
+    iput-object v4, v6, Lcom/crashlytics/android/answers/ae$a;->pV:Ljava/util/Map;
 
     invoke-virtual {v2, v6, v11, v3}, Lcom/crashlytics/android/answers/e;->a(Lcom/crashlytics/android/answers/ae$a;ZZ)V
 
-    iget-object v1, v1, Lcom/crashlytics/android/answers/ac;->pT:Lcom/crashlytics/android/answers/h;
+    iget-object v1, v1, Lcom/crashlytics/android/answers/ac;->pS:Lcom/crashlytics/android/answers/h;
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/h;->pg:Lio/fabric/sdk/android/a/f/c;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/h;->pf:Lio/fabric/sdk/android/a/f/c;
 
-    iget-object v1, v1, Lcom/crashlytics/android/answers/h;->pg:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, v1, Lcom/crashlytics/android/answers/h;->pf:Lio/fabric/sdk/android/a/f/c;
 
     invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -638,7 +566,7 @@
 
     move-result v0
 
-    iput-boolean v0, v9, Lcom/crashlytics/android/answers/Answers;->oK:Z
+    iput-boolean v0, v9, Lcom/crashlytics/android/answers/Answers;->oJ:Z
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -647,7 +575,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/a.smali b/com.discord/smali/com/crashlytics/android/answers/a.smali
index c27a911eb1..80431a9649 100644
--- a/com.discord/smali/com/crashlytics/android/answers/a.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/a.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field static final oJ:Ljava/math/BigDecimal;
+.field static final oI:Ljava/math/BigDecimal;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/answers/a;->oJ:Ljava/math/BigDecimal;
+    sput-object v0, Lcom/crashlytics/android/answers/a;->oI:Ljava/math/BigDecimal;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/aa.smali b/com.discord/smali/com/crashlytics/android/answers/aa.smali
index b18f03627f..be08bf8632 100644
--- a/com.discord/smali/com/crashlytics/android/answers/aa.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/aa.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field pO:Lio/fabric/sdk/android/a/g/b;
+.field pN:Lio/fabric/sdk/android/a/g/b;
 
 
 # direct methods
@@ -56,9 +56,9 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->bhl:Lio/fabric/sdk/android/a/b/k;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->bhF:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->Da()J
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->CR()J
 
     move-result-wide v2
 
@@ -78,7 +78,7 @@
 .method public final ce()I
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->pO:Lio/fabric/sdk/android/a/g/b;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->pN:Lio/fabric/sdk/android/a/g/b;
 
     if-nez v0, :cond_0
 
@@ -89,7 +89,7 @@
     return v0
 
     :cond_0
-    iget v0, v0, Lio/fabric/sdk/android/a/g/b;->bij:I
+    iget v0, v0, Lio/fabric/sdk/android/a/g/b;->biD:I
 
     return v0
 .end method
@@ -97,7 +97,7 @@
 .method public final cf()I
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->pO:Lio/fabric/sdk/android/a/g/b;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->pN:Lio/fabric/sdk/android/a/g/b;
 
     if-nez v0, :cond_0
 
@@ -108,7 +108,7 @@
     return v0
 
     :cond_0
-    iget v0, v0, Lio/fabric/sdk/android/a/g/b;->bih:I
+    iget v0, v0, Lio/fabric/sdk/android/a/g/b;->biB:I
 
     return v0
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/ab.smali b/com.discord/smali/com/crashlytics/android/answers/ab.smali
index 232f774cda..2f426235ff 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ab.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ab.smali
@@ -7,14 +7,14 @@
 
 
 # instance fields
-.field private final pP:Ljava/lang/String;
+.field private final pO:Ljava/lang/String;
 
 
 # direct methods
 .method public constructor <init>(Lio/fabric/sdk/android/i;Ljava/lang/String;Ljava/lang/String;Lio/fabric/sdk/android/a/e/e;Ljava/lang/String;)V
     .locals 6
 
-    sget v5, Lio/fabric/sdk/android/a/e/c;->bhA:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->bhU:I
 
     move-object v0, p0
 
@@ -28,7 +28,7 @@
 
     invoke-direct/range {v0 .. v5}, Lio/fabric/sdk/android/a/b/a;-><init>(Lio/fabric/sdk/android/i;Ljava/lang/String;Ljava/lang/String;Lio/fabric/sdk/android/a/e/e;I)V
 
-    iput-object p5, p0, Lcom/crashlytics/android/answers/ab;->pP:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/ab;->pO:Ljava/lang/String;
 
     return-void
 .end method
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/crashlytics/android/answers/ab;->CR()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lcom/crashlytics/android/answers/ab;->CI()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
@@ -58,7 +58,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ab;->oS:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ab;->oR:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String;
 
@@ -70,7 +70,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ab;->pP:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ab;->pO:Ljava/lang/String;
 
     const-string v2, "X-CRASHLYTICS-API-KEY"
 
@@ -124,7 +124,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -156,11 +156,11 @@
 
     invoke-interface {v1, v3, p1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->DF()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->Dv()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -176,7 +176,7 @@
 
     invoke-interface {v0, v3, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lio/fabric/sdk/android/a/b/v;->dl(I)I
+    invoke-static {p1}, Lio/fabric/sdk/android/a/b/v;->di(I)I
 
     move-result p1
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/ac.smali b/com.discord/smali/com/crashlytics/android/answers/ac.smali
index 699ba9642d..7f2fe487b4 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ac.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ac.smali
@@ -7,15 +7,15 @@
 
 
 # instance fields
-.field final pQ:J
+.field final pP:J
 
-.field public final pR:Lcom/crashlytics/android/answers/e;
+.field public final pQ:Lcom/crashlytics/android/answers/e;
 
-.field final pS:Lio/fabric/sdk/android/a;
+.field final pR:Lio/fabric/sdk/android/a;
 
-.field final pT:Lcom/crashlytics/android/answers/h;
+.field final pS:Lcom/crashlytics/android/answers/h;
 
-.field final pf:Lcom/crashlytics/android/answers/k;
+.field final pe:Lcom/crashlytics/android/answers/k;
 
 
 # direct methods
@@ -24,15 +24,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ac;->pR:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ac;->pQ:Lcom/crashlytics/android/answers/e;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/ac;->pS:Lio/fabric/sdk/android/a;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/ac;->pR:Lio/fabric/sdk/android/a;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/ac;->pf:Lcom/crashlytics/android/answers/k;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/ac;->pe:Lcom/crashlytics/android/answers/k;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/ac;->pT:Lcom/crashlytics/android/answers/h;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/ac;->pS:Lcom/crashlytics/android/answers/h;
 
-    iput-wide p5, p0, Lcom/crashlytics/android/answers/ac;->pQ:J
+    iput-wide p5, p0, Lcom/crashlytics/android/answers/ac;->pP:J
 
     return-void
 .end method
@@ -42,7 +42,7 @@
 .method public final a(Landroid/app/Activity;Lcom/crashlytics/android/answers/ae$b;)V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -66,7 +66,7 @@
 
     invoke-interface {v0, v2, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->pR:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->pQ:Lcom/crashlytics/android/answers/e;
 
     invoke-static {p2, p1}, Lcom/crashlytics/android/answers/ae;->a(Lcom/crashlytics/android/answers/ae$b;Landroid/app/Activity;)Lcom/crashlytics/android/answers/ae$a;
 
@@ -82,7 +82,7 @@
 .method public final a(Lcom/crashlytics/android/answers/w;)V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -100,15 +100,35 @@
 
     invoke-interface {v0, v2, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->pR:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->pQ:Lcom/crashlytics/android/answers/e;
 
-    invoke-static {p1}, Lcom/crashlytics/android/answers/ae;->b(Lcom/crashlytics/android/answers/w;)Lcom/crashlytics/android/answers/ae$a;
+    new-instance v1, Lcom/crashlytics/android/answers/ae$a;
 
-    move-result-object p1
+    sget-object v2, Lcom/crashlytics/android/answers/ae$b;->qi:Lcom/crashlytics/android/answers/ae$b;
 
-    const/4 v1, 0x0
+    invoke-direct {v1, v2}, Lcom/crashlytics/android/answers/ae$a;-><init>(Lcom/crashlytics/android/answers/ae$b;)V
 
-    invoke-virtual {v0, p1, v1, v1}, Lcom/crashlytics/android/answers/e;->a(Lcom/crashlytics/android/answers/ae$a;ZZ)V
+    invoke-virtual {p1}, Lcom/crashlytics/android/answers/w;->bT()Ljava/lang/String;
+
+    move-result-object v2
+
+    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->pY:Ljava/lang/String;
+
+    iget-object v2, p1, Lcom/crashlytics/android/answers/w;->pG:Lcom/crashlytics/android/answers/b;
+
+    iget-object v2, v2, Lcom/crashlytics/android/answers/b;->oM:Ljava/util/Map;
+
+    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->pZ:Ljava/util/Map;
+
+    iget-object p1, p1, Lcom/crashlytics/android/answers/c;->oN:Lcom/crashlytics/android/answers/b;
+
+    iget-object p1, p1, Lcom/crashlytics/android/answers/b;->oM:Ljava/util/Map;
+
+    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->pX:Ljava/util/Map;
+
+    const/4 p1, 0x0
+
+    invoke-virtual {v0, v1, p1, p1}, Lcom/crashlytics/android/answers/e;->a(Lcom/crashlytics/android/answers/ae$a;ZZ)V
 
     return-void
 .end method
@@ -116,7 +136,7 @@
 .method public final bY()V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -126,7 +146,7 @@
 
     invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->pR:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->pQ:Lcom/crashlytics/android/answers/e;
 
     new-instance v1, Lcom/crashlytics/android/answers/e$5;
 
@@ -140,11 +160,11 @@
 .method public final disable()V
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->pS:Lio/fabric/sdk/android/a;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->pR:Lio/fabric/sdk/android/a;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a;->CE()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a;->Cv()V
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->pR:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->pQ:Lcom/crashlytics/android/answers/e;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/answers/e;->disable()V
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/ae$a.smali b/com.discord/smali/com/crashlytics/android/answers/ae$a.smali
index 371d00161a..cfd3e28186 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ae$a.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ae$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field final pV:Lcom/crashlytics/android/answers/ae$b;
+.field final pU:Lcom/crashlytics/android/answers/ae$b;
 
-.field public pW:Ljava/util/Map;
+.field public pV:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -28,9 +28,9 @@
     .end annotation
 .end field
 
-.field pX:Ljava/lang/String;
+.field pW:Ljava/lang/String;
 
-.field public pY:Ljava/util/Map;
+.field public pX:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -41,9 +41,9 @@
     .end annotation
 .end field
 
-.field pZ:Ljava/lang/String;
+.field pY:Ljava/lang/String;
 
-.field qa:Ljava/util/Map;
+.field pZ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -63,7 +63,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->pV:Lcom/crashlytics/android/answers/ae$b;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->pU:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
@@ -73,15 +73,15 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->pW:Ljava/util/Map;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->pV:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->pX:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->pW:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->pY:Ljava/util/Map;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->pX:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->pZ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->pY:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qa:Ljava/util/Map;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->pZ:Ljava/util/Map;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/ae$b.smali b/com.discord/smali/com/crashlytics/android/answers/ae$b.smali
index d13ad35f65..8ba3ca7e18 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ae$b.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ae$b.smali
@@ -23,6 +23,8 @@
 
 
 # static fields
+.field public static final enum qb:Lcom/crashlytics/android/answers/ae$b;
+
 .field public static final enum qc:Lcom/crashlytics/android/answers/ae$b;
 
 .field public static final enum qd:Lcom/crashlytics/android/answers/ae$b;
@@ -37,9 +39,7 @@
 
 .field public static final enum qi:Lcom/crashlytics/android/answers/ae$b;
 
-.field public static final enum qj:Lcom/crashlytics/android/answers/ae$b;
-
-.field private static final synthetic qk:[Lcom/crashlytics/android/answers/ae$b;
+.field private static final synthetic qj:[Lcom/crashlytics/android/answers/ae$b;
 
 
 # direct methods
@@ -54,7 +54,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/crashlytics/android/answers/ae$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qc:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qb:Lcom/crashlytics/android/answers/ae$b;
 
     new-instance v0, Lcom/crashlytics/android/answers/ae$b;
 
@@ -64,7 +64,7 @@
 
     invoke-direct {v0, v3, v2}, Lcom/crashlytics/android/answers/ae$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qd:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qc:Lcom/crashlytics/android/answers/ae$b;
 
     new-instance v0, Lcom/crashlytics/android/answers/ae$b;
 
@@ -74,7 +74,7 @@
 
     invoke-direct {v0, v4, v3}, Lcom/crashlytics/android/answers/ae$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qe:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qd:Lcom/crashlytics/android/answers/ae$b;
 
     new-instance v0, Lcom/crashlytics/android/answers/ae$b;
 
@@ -84,7 +84,7 @@
 
     invoke-direct {v0, v5, v4}, Lcom/crashlytics/android/answers/ae$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qf:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qe:Lcom/crashlytics/android/answers/ae$b;
 
     new-instance v0, Lcom/crashlytics/android/answers/ae$b;
 
@@ -94,7 +94,7 @@
 
     invoke-direct {v0, v6, v5}, Lcom/crashlytics/android/answers/ae$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qg:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qf:Lcom/crashlytics/android/answers/ae$b;
 
     new-instance v0, Lcom/crashlytics/android/answers/ae$b;
 
@@ -104,7 +104,7 @@
 
     invoke-direct {v0, v7, v6}, Lcom/crashlytics/android/answers/ae$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qh:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qg:Lcom/crashlytics/android/answers/ae$b;
 
     new-instance v0, Lcom/crashlytics/android/answers/ae$b;
 
@@ -114,7 +114,7 @@
 
     invoke-direct {v0, v8, v7}, Lcom/crashlytics/android/answers/ae$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qi:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qh:Lcom/crashlytics/android/answers/ae$b;
 
     new-instance v0, Lcom/crashlytics/android/answers/ae$b;
 
@@ -124,45 +124,45 @@
 
     invoke-direct {v0, v9, v8}, Lcom/crashlytics/android/answers/ae$b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qj:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qi:Lcom/crashlytics/android/answers/ae$b;
 
     const/16 v0, 0x8
 
     new-array v0, v0, [Lcom/crashlytics/android/answers/ae$b;
 
-    sget-object v9, Lcom/crashlytics/android/answers/ae$b;->qc:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v9, Lcom/crashlytics/android/answers/ae$b;->qb:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v9, v0, v1
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qd:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qc:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qe:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qd:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qf:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qe:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qg:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qf:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qh:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qg:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qi:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qh:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qj:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qi:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v8
 
-    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qk:[Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qj:[Lcom/crashlytics/android/answers/ae$b;
 
     return-void
 .end method
@@ -197,7 +197,7 @@
 .method public static values()[Lcom/crashlytics/android/answers/ae$b;
     .locals 1
 
-    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qk:[Lcom/crashlytics/android/answers/ae$b;
+    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qj:[Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v0}, [Lcom/crashlytics/android/answers/ae$b;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/ae.smali b/com.discord/smali/com/crashlytics/android/answers/ae.smali
index da7b070901..6afb353f98 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ae.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ae.smali
@@ -13,11 +13,11 @@
 
 
 # instance fields
-.field public final pU:Lcom/crashlytics/android/answers/af;
+.field public final pT:Lcom/crashlytics/android/answers/af;
 
-.field public final pV:Lcom/crashlytics/android/answers/ae$b;
+.field public final pU:Lcom/crashlytics/android/answers/ae$b;
 
-.field public final pW:Ljava/util/Map;
+.field public final pV:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -28,9 +28,9 @@
     .end annotation
 .end field
 
-.field public final pX:Ljava/lang/String;
+.field public final pW:Ljava/lang/String;
 
-.field public final pY:Ljava/util/Map;
+.field public final pX:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -41,9 +41,9 @@
     .end annotation
 .end field
 
-.field public final pZ:Ljava/lang/String;
+.field public final pY:Ljava/lang/String;
 
-.field public final qa:Ljava/util/Map;
+.field public final pZ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -54,7 +54,7 @@
     .end annotation
 .end field
 
-.field private qb:Ljava/lang/String;
+.field private qa:Ljava/lang/String;
 
 .field public final timestamp:J
 
@@ -87,21 +87,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/af;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae;->pT:Lcom/crashlytics/android/answers/af;
 
     iput-wide p2, p0, Lcom/crashlytics/android/answers/ae;->timestamp:J
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/ae;->pV:Lcom/crashlytics/android/answers/ae$b;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/ae$b;
 
-    iput-object p5, p0, Lcom/crashlytics/android/answers/ae;->pW:Ljava/util/Map;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/ae;->pV:Ljava/util/Map;
 
-    iput-object p6, p0, Lcom/crashlytics/android/answers/ae;->pX:Ljava/lang/String;
+    iput-object p6, p0, Lcom/crashlytics/android/answers/ae;->pW:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/crashlytics/android/answers/ae;->pY:Ljava/util/Map;
+    iput-object p7, p0, Lcom/crashlytics/android/answers/ae;->pX:Ljava/util/Map;
 
-    iput-object p8, p0, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iput-object p8, p0, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
-    iput-object p9, p0, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iput-object p9, p0, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     return-void
 .end method
@@ -135,45 +135,7 @@
 
     invoke-direct {v0, p0}, Lcom/crashlytics/android/answers/ae$a;-><init>(Lcom/crashlytics/android/answers/ae$b;)V
 
-    iput-object p1, v0, Lcom/crashlytics/android/answers/ae$a;->pW:Ljava/util/Map;
-
-    return-object v0
-.end method
-
-.method public static b(Lcom/crashlytics/android/answers/w;)Lcom/crashlytics/android/answers/ae$a;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/crashlytics/android/answers/w<",
-            "*>;)",
-            "Lcom/crashlytics/android/answers/ae$a;"
-        }
-    .end annotation
-
-    new-instance v0, Lcom/crashlytics/android/answers/ae$a;
-
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qj:Lcom/crashlytics/android/answers/ae$b;
-
-    invoke-direct {v0, v1}, Lcom/crashlytics/android/answers/ae$a;-><init>(Lcom/crashlytics/android/answers/ae$b;)V
-
-    invoke-virtual {p0}, Lcom/crashlytics/android/answers/w;->bT()Ljava/lang/String;
-
-    move-result-object v1
-
-    iput-object v1, v0, Lcom/crashlytics/android/answers/ae$a;->pZ:Ljava/lang/String;
-
-    iget-object v1, p0, Lcom/crashlytics/android/answers/w;->pH:Lcom/crashlytics/android/answers/b;
-
-    iget-object v1, v1, Lcom/crashlytics/android/answers/b;->oN:Ljava/util/Map;
-
-    iput-object v1, v0, Lcom/crashlytics/android/answers/ae$a;->qa:Ljava/util/Map;
-
-    iget-object p0, p0, Lcom/crashlytics/android/answers/c;->oO:Lcom/crashlytics/android/answers/b;
-
-    iget-object p0, p0, Lcom/crashlytics/android/answers/b;->oN:Ljava/util/Map;
-
-    iput-object p0, v0, Lcom/crashlytics/android/answers/ae$a;->pY:Ljava/util/Map;
+    iput-object p1, v0, Lcom/crashlytics/android/answers/ae$a;->pV:Ljava/util/Map;
 
     return-object v0
 .end method
@@ -183,7 +145,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ae;->qb:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ae;->qa:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
@@ -215,7 +177,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pV:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -223,7 +185,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pW:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pV:Ljava/util/Map;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -231,7 +193,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pW:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -239,7 +201,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pY:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pX:Ljava/util/Map;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -247,7 +209,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -255,7 +217,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -263,7 +225,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/af;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pT:Lcom/crashlytics/android/answers/af;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -275,10 +237,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/crashlytics/android/answers/ae;->qb:Ljava/lang/String;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/ae;->qa:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ae;->qb:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ae;->qa:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/af.smali b/com.discord/smali/com/crashlytics/android/answers/af.smali
index be9da56c3d..dc083c4365 100644
--- a/com.discord/smali/com/crashlytics/android/answers/af.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/af.smali
@@ -4,17 +4,19 @@
 
 
 # instance fields
-.field public final dY:Ljava/lang/String;
+.field public final dX:Ljava/lang/String;
 
-.field private qb:Ljava/lang/String;
+.field private qa:Ljava/lang/String;
+
+.field public final qk:Ljava/lang/String;
 
 .field public final ql:Ljava/lang/String;
 
 .field public final qm:Ljava/lang/String;
 
-.field public final qn:Ljava/lang/String;
+.field public final qn:Ljava/lang/Boolean;
 
-.field public final qo:Ljava/lang/Boolean;
+.field public final qo:Ljava/lang/String;
 
 .field public final qq:Ljava/lang/String;
 
@@ -24,8 +26,6 @@
 
 .field public final qt:Ljava/lang/String;
 
-.field public final qu:Ljava/lang/String;
-
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
@@ -33,25 +33,25 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/af;->ql:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/af;->qk:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/af;->qm:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/af;->ql:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/af;->qn:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/af;->qm:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/af;->qo:Ljava/lang/Boolean;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/af;->qn:Ljava/lang/Boolean;
 
-    iput-object p5, p0, Lcom/crashlytics/android/answers/af;->qq:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/af;->qo:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/crashlytics/android/answers/af;->qr:Ljava/lang/String;
+    iput-object p6, p0, Lcom/crashlytics/android/answers/af;->qq:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/crashlytics/android/answers/af;->dY:Ljava/lang/String;
+    iput-object p7, p0, Lcom/crashlytics/android/answers/af;->dX:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/crashlytics/android/answers/af;->qs:Ljava/lang/String;
+    iput-object p8, p0, Lcom/crashlytics/android/answers/af;->qr:Ljava/lang/String;
 
-    iput-object p9, p0, Lcom/crashlytics/android/answers/af;->qt:Ljava/lang/String;
+    iput-object p9, p0, Lcom/crashlytics/android/answers/af;->qs:Ljava/lang/String;
 
-    iput-object p10, p0, Lcom/crashlytics/android/answers/af;->qu:Ljava/lang/String;
+    iput-object p10, p0, Lcom/crashlytics/android/answers/af;->qt:Ljava/lang/String;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/af;->qb:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/af;->qa:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
@@ -71,7 +71,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->ql:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qk:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -79,7 +79,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qm:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->ql:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -87,7 +87,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qn:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qm:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -95,7 +95,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qo:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qn:Ljava/lang/Boolean;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -103,7 +103,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qo:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -111,7 +111,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qq:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -119,7 +119,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->dY:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->dX:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -127,7 +127,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qs:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qr:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -135,7 +135,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qt:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qs:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -143,7 +143,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qu:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qt:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -151,10 +151,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/crashlytics/android/answers/af;->qb:Ljava/lang/String;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/af;->qa:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/af;->qb:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/af;->qa:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/ag.smali b/com.discord/smali/com/crashlytics/android/answers/ag.smali
index 1e5e40445a..eea7c5c985 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ag.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ag.smali
@@ -39,65 +39,65 @@
 
     invoke-direct {v0}, Lorg/json/JSONObject;-><init>()V
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/af;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pT:Lcom/crashlytics/android/answers/af;
 
     const-string v2, "appBundleId"
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->ql:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qk:Ljava/lang/String;
 
     invoke-virtual {v0, v2, v3}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
     const-string v2, "executionId"
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qm:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->ql:Ljava/lang/String;
 
     invoke-virtual {v0, v2, v3}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
     const-string v2, "installationId"
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qn:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qm:Ljava/lang/String;
 
     invoke-virtual {v0, v2, v3}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
     const-string v2, "limitAdTrackingEnabled"
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qo:Ljava/lang/Boolean;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qn:Ljava/lang/Boolean;
 
     invoke-virtual {v0, v2, v3}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
     const-string v2, "betaDeviceToken"
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qq:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qo:Ljava/lang/String;
 
     invoke-virtual {v0, v2, v3}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
     const-string v2, "buildId"
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qr:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qq:Ljava/lang/String;
 
     invoke-virtual {v0, v2, v3}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
     const-string v2, "osVersion"
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->dY:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->dX:Ljava/lang/String;
 
     invoke-virtual {v0, v2, v3}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
     const-string v2, "deviceModel"
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qs:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qr:Ljava/lang/String;
 
     invoke-virtual {v0, v2, v3}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
     const-string v2, "appVersionCode"
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qt:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qs:Ljava/lang/String;
 
     invoke-virtual {v0, v2, v3}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
     const-string v2, "appVersionName"
 
-    iget-object v1, v1, Lcom/crashlytics/android/answers/af;->qu:Ljava/lang/String;
+    iget-object v1, v1, Lcom/crashlytics/android/answers/af;->qt:Ljava/lang/String;
 
     invoke-virtual {v0, v2, v1}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
@@ -109,7 +109,7 @@
 
     const-string v1, "type"
 
-    iget-object v2, p0, Lcom/crashlytics/android/answers/ae;->pV:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v2}, Lcom/crashlytics/android/answers/ae$b;->toString()Ljava/lang/String;
 
@@ -117,7 +117,7 @@
 
     invoke-virtual {v0, v1, v2}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pW:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pV:Ljava/util/Map;
 
     if-eqz v1, :cond_0
 
@@ -125,7 +125,7 @@
 
     new-instance v2, Lorg/json/JSONObject;
 
-    iget-object v3, p0, Lcom/crashlytics/android/answers/ae;->pW:Ljava/util/Map;
+    iget-object v3, p0, Lcom/crashlytics/android/answers/ae;->pV:Ljava/util/Map;
 
     invoke-direct {v2, v3}, Lorg/json/JSONObject;-><init>(Ljava/util/Map;)V
 
@@ -134,11 +134,11 @@
     :cond_0
     const-string v1, "customType"
 
-    iget-object v2, p0, Lcom/crashlytics/android/answers/ae;->pX:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/ae;->pW:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pY:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pX:Ljava/util/Map;
 
     if-eqz v1, :cond_1
 
@@ -146,7 +146,7 @@
 
     new-instance v2, Lorg/json/JSONObject;
 
-    iget-object v3, p0, Lcom/crashlytics/android/answers/ae;->pY:Ljava/util/Map;
+    iget-object v3, p0, Lcom/crashlytics/android/answers/ae;->pX:Ljava/util/Map;
 
     invoke-direct {v2, v3}, Lorg/json/JSONObject;-><init>(Ljava/util/Map;)V
 
@@ -155,11 +155,11 @@
     :cond_1
     const-string v1, "predefinedType"
 
-    iget-object v2, p0, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     if-eqz v1, :cond_2
 
@@ -167,7 +167,7 @@
 
     new-instance v2, Lorg/json/JSONObject;
 
-    iget-object p0, p0, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object p0, p0, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     invoke-direct {v2, p0}, Lorg/json/JSONObject;-><init>(Ljava/util/Map;)V
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/ah.smali b/com.discord/smali/com/crashlytics/android/answers/ah.smali
index 4f5f75147e..3822ef066d 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ah.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ah.smali
@@ -6,9 +6,9 @@
 # instance fields
 .field final context:Landroid/content/Context;
 
-.field final qv:Lio/fabric/sdk/android/a/b/s;
+.field final qu:Lio/fabric/sdk/android/a/b/s;
 
-.field final qw:Ljava/lang/String;
+.field final qv:Ljava/lang/String;
 
 .field final versionName:Ljava/lang/String;
 
@@ -21,9 +21,9 @@
 
     iput-object p1, p0, Lcom/crashlytics/android/answers/ah;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/ah;->qv:Lio/fabric/sdk/android/a/b/s;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/ah;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/ah;->qw:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/ah;->qv:Ljava/lang/String;
 
     iput-object p4, p0, Lcom/crashlytics/android/answers/ah;->versionName:Ljava/lang/String;
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/ai.smali b/com.discord/smali/com/crashlytics/android/answers/ai.smali
index e02c96f811..a4d7623249 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ai.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ai.smali
@@ -24,30 +24,6 @@
 
 
 # virtual methods
-.method public final I(Ljava/lang/String;)Lcom/crashlytics/android/answers/ai;
-    .locals 2
-
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ai;->pH:Lcom/crashlytics/android/answers/b;
-
-    const-string v1, "contentId"
-
-    invoke-virtual {v0, v1, p1}, Lcom/crashlytics/android/answers/b;->put(Ljava/lang/String;Ljava/lang/String;)V
-
-    return-object p0
-.end method
-
-.method public final J(Ljava/lang/String;)Lcom/crashlytics/android/answers/ai;
-    .locals 2
-
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ai;->pH:Lcom/crashlytics/android/answers/b;
-
-    const-string v1, "contentType"
-
-    invoke-virtual {v0, v1, p1}, Lcom/crashlytics/android/answers/b;->put(Ljava/lang/String;Ljava/lang/String;)V
-
-    return-object p0
-.end method
-
 .method final bT()Ljava/lang/String;
     .locals 1
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/aj.smali b/com.discord/smali/com/crashlytics/android/answers/aj.smali
index 88c538a542..d39444d720 100644
--- a/com.discord/smali/com/crashlytics/android/answers/aj.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/aj.smali
@@ -24,18 +24,6 @@
 
 
 # virtual methods
-.method public final K(Ljava/lang/String;)Lcom/crashlytics/android/answers/aj;
-    .locals 2
-
-    iget-object v0, p0, Lcom/crashlytics/android/answers/aj;->pH:Lcom/crashlytics/android/answers/b;
-
-    const-string v1, "method"
-
-    invoke-virtual {v0, v1, p1}, Lcom/crashlytics/android/answers/b;->put(Ljava/lang/String;Ljava/lang/String;)V
-
-    return-object p0
-.end method
-
 .method final bT()Ljava/lang/String;
     .locals 1
 
@@ -43,19 +31,3 @@
 
     return-object v0
 .end method
-
-.method public final n(Z)Lcom/crashlytics/android/answers/aj;
-    .locals 2
-
-    iget-object v0, p0, Lcom/crashlytics/android/answers/aj;->pH:Lcom/crashlytics/android/answers/b;
-
-    invoke-static {p1}, Ljava/lang/Boolean;->toString(Z)Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v1, "success"
-
-    invoke-virtual {v0, v1, p1}, Lcom/crashlytics/android/answers/b;->put(Ljava/lang/String;Ljava/lang/String;)V
-
-    return-object p0
-.end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/b.smali b/com.discord/smali/com/crashlytics/android/answers/b.smali
index bfeb8f70a8..802a3ee3d3 100644
--- a/com.discord/smali/com/crashlytics/android/answers/b.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/b.smali
@@ -1,12 +1,12 @@
-.class final Lcom/crashlytics/android/answers/b;
+.class public final Lcom/crashlytics/android/answers/b;
 .super Ljava/lang/Object;
 .source "AnswersAttributes.java"
 
 
 # instance fields
-.field final oM:Lcom/crashlytics/android/answers/d;
+.field final oL:Lcom/crashlytics/android/answers/d;
 
-.field final oN:Ljava/util/Map;
+.field final oM:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -28,9 +28,9 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/crashlytics/android/answers/b;->oN:Ljava/util/Map;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/b;->oM:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/b;->oM:Lcom/crashlytics/android/answers/d;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/b;->oL:Lcom/crashlytics/android/answers/d;
 
     return-void
 .end method
@@ -40,9 +40,9 @@
 .method final a(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->oM:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->oL:Lcom/crashlytics/android/answers/d;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/b;->oN:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/b;->oM:Ljava/util/Map;
 
     invoke-virtual {v0, v1, p1}, Lcom/crashlytics/android/answers/d;->a(Ljava/util/Map;Ljava/lang/String;)Z
 
@@ -50,7 +50,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->oN:Ljava/util/Map;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->oM:Ljava/util/Map;
 
     invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -58,10 +58,10 @@
     return-void
 .end method
 
-.method final put(Ljava/lang/String;Ljava/lang/String;)V
+.method public final put(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->oM:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->oL:Lcom/crashlytics/android/answers/d;
 
     const-string v1, "key"
 
@@ -71,7 +71,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->oM:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->oL:Lcom/crashlytics/android/answers/d;
 
     const-string v1, "value"
 
@@ -84,13 +84,13 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->oM:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->oL:Lcom/crashlytics/android/answers/d;
 
     invoke-virtual {v0, p1}, Lcom/crashlytics/android/answers/d;->E(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->oM:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->oL:Lcom/crashlytics/android/answers/d;
 
     invoke-virtual {v0, p2}, Lcom/crashlytics/android/answers/d;->E(Ljava/lang/String;)Ljava/lang/String;
 
@@ -108,7 +108,7 @@
 
     new-instance v0, Lorg/json/JSONObject;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/b;->oN:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/b;->oM:Ljava/util/Map;
 
     invoke-direct {v0, v1}, Lorg/json/JSONObject;-><init>(Ljava/util/Map;)V
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/c.smali b/com.discord/smali/com/crashlytics/android/answers/c.smali
index 298ec2efdc..78de23d706 100644
--- a/com.discord/smali/com/crashlytics/android/answers/c.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/c.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field final oM:Lcom/crashlytics/android/answers/d;
+.field final oL:Lcom/crashlytics/android/answers/d;
 
-.field final oO:Lcom/crashlytics/android/answers/b;
+.field final oN:Lcom/crashlytics/android/answers/b;
 
 
 # direct methods
@@ -28,21 +28,21 @@
 
     new-instance v0, Lcom/crashlytics/android/answers/d;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CG()Z
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cx()Z
 
     move-result v1
 
     invoke-direct {v0, v1}, Lcom/crashlytics/android/answers/d;-><init>(Z)V
 
-    iput-object v0, p0, Lcom/crashlytics/android/answers/c;->oM:Lcom/crashlytics/android/answers/d;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/c;->oL:Lcom/crashlytics/android/answers/d;
 
     new-instance v0, Lcom/crashlytics/android/answers/b;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/c;->oM:Lcom/crashlytics/android/answers/d;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/c;->oL:Lcom/crashlytics/android/answers/d;
 
     invoke-direct {v0, v1}, Lcom/crashlytics/android/answers/b;-><init>(Lcom/crashlytics/android/answers/d;)V
 
-    iput-object v0, p0, Lcom/crashlytics/android/answers/c;->oO:Lcom/crashlytics/android/answers/b;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/c;->oN:Lcom/crashlytics/android/answers/b;
 
     return-void
 .end method
@@ -60,9 +60,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/c;->oO:Lcom/crashlytics/android/answers/b;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/c;->oN:Lcom/crashlytics/android/answers/b;
 
-    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->oM:Lcom/crashlytics/android/answers/d;
+    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->oL:Lcom/crashlytics/android/answers/d;
 
     const-string v2, "key"
 
@@ -72,7 +72,7 @@
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->oM:Lcom/crashlytics/android/answers/d;
+    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->oL:Lcom/crashlytics/android/answers/d;
 
     const-string v2, "value"
 
@@ -85,7 +85,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->oM:Lcom/crashlytics/android/answers/d;
+    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->oL:Lcom/crashlytics/android/answers/d;
 
     invoke-virtual {v1, p1}, Lcom/crashlytics/android/answers/d;->E(Ljava/lang/String;)Ljava/lang/String;
 
@@ -109,7 +109,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/c;->oO:Lcom/crashlytics/android/answers/b;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/c;->oN:Lcom/crashlytics/android/answers/b;
 
     invoke-virtual {v0, p1, p2}, Lcom/crashlytics/android/answers/b;->put(Ljava/lang/String;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/d.smali b/com.discord/smali/com/crashlytics/android/answers/d.smali
index 23dd580757..6006c94398 100644
--- a/com.discord/smali/com/crashlytics/android/answers/d.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/d.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
+.field final oO:I
+
 .field final oP:I
 
-.field final oQ:I
-
-.field oR:Z
+.field oQ:Z
 
 
 # direct methods
@@ -19,13 +19,13 @@
 
     const/16 v0, 0x14
 
-    iput v0, p0, Lcom/crashlytics/android/answers/d;->oP:I
+    iput v0, p0, Lcom/crashlytics/android/answers/d;->oO:I
 
     const/16 v0, 0x64
 
-    iput v0, p0, Lcom/crashlytics/android/answers/d;->oQ:I
+    iput v0, p0, Lcom/crashlytics/android/answers/d;->oP:I
 
-    iput-boolean p1, p0, Lcom/crashlytics/android/answers/d;->oR:Z
+    iput-boolean p1, p0, Lcom/crashlytics/android/answers/d;->oQ:Z
 
     return-void
 .end method
@@ -33,11 +33,11 @@
 .method private a(Ljava/lang/RuntimeException;)V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/crashlytics/android/answers/d;->oR:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/answers/d;->oQ:Z
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -62,7 +62,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/crashlytics/android/answers/d;->oQ:I
+    iget v1, p0, Lcom/crashlytics/android/answers/d;->oP:I
 
     if-le v0, v1, :cond_0
 
@@ -72,7 +72,7 @@
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    iget v2, p0, Lcom/crashlytics/android/answers/d;->oQ:I
+    iget v2, p0, Lcom/crashlytics/android/answers/d;->oP:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -94,7 +94,7 @@
 
     invoke-direct {p0, v1}, Lcom/crashlytics/android/answers/d;->a(Ljava/lang/RuntimeException;)V
 
-    iget v0, p0, Lcom/crashlytics/android/answers/d;->oQ:I
+    iget v0, p0, Lcom/crashlytics/android/answers/d;->oP:I
 
     invoke-virtual {p1, v3, v0}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
@@ -157,7 +157,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/crashlytics/android/answers/d;->oP:I
+    iget v1, p0, Lcom/crashlytics/android/answers/d;->oO:I
 
     const/4 v2, 0x0
 
@@ -175,7 +175,7 @@
 
     new-array v0, p2, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/crashlytics/android/answers/d;->oP:I
+    iget v1, p0, Lcom/crashlytics/android/answers/d;->oO:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/e$1.smali b/com.discord/smali/com/crashlytics/android/answers/e$1.smali
index 9a8bca2459..a8f76b22a8 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e$1.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e$1.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic oZ:Lio/fabric/sdk/android/a/g/b;
+.field final synthetic oY:Lio/fabric/sdk/android/a/g/b;
 
-.field final synthetic pa:Ljava/lang/String;
+.field final synthetic oZ:Ljava/lang/String;
 
-.field final synthetic pb:Lcom/crashlytics/android/answers/e;
+.field final synthetic pa:Lcom/crashlytics/android/answers/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/answers/e;Lio/fabric/sdk/android/a/g/b;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/e$1;->pb:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$1;->pa:Lcom/crashlytics/android/answers/e;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/e$1;->oZ:Lio/fabric/sdk/android/a/g/b;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/e$1;->oY:Lio/fabric/sdk/android/a/g/b;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/e$1;->pa:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/e$1;->oZ:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,13 +46,13 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/e$1;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$1;->pa:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oY:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oX:Lcom/crashlytics/android/answers/ad;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/e$1;->oZ:Lio/fabric/sdk/android/a/g/b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/e$1;->oY:Lio/fabric/sdk/android/a/g/b;
 
-    iget-object v2, p0, Lcom/crashlytics/android/answers/e$1;->pa:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/e$1;->oZ:Ljava/lang/String;
 
     invoke-interface {v0, v1, v2}, Lcom/crashlytics/android/answers/ad;->a(Lio/fabric/sdk/android/a/g/b;Ljava/lang/String;)V
     :try_end_0
@@ -63,7 +63,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/e$2.smali b/com.discord/smali/com/crashlytics/android/answers/e$2.smali
index 76fc22ad19..8c4448facf 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e$2.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic pb:Lcom/crashlytics/android/answers/e;
+.field final synthetic pa:Lcom/crashlytics/android/answers/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/answers/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/e$2;->pb:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$2;->pa:Lcom/crashlytics/android/answers/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,17 +38,17 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/e$2;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$2;->pa:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oY:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oX:Lcom/crashlytics/android/answers/ad;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/e$2;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/e$2;->pa:Lcom/crashlytics/android/answers/e;
 
     new-instance v2, Lcom/crashlytics/android/answers/m;
 
     invoke-direct {v2}, Lcom/crashlytics/android/answers/m;-><init>()V
 
-    iput-object v2, v1, Lcom/crashlytics/android/answers/e;->oY:Lcom/crashlytics/android/answers/ad;
+    iput-object v2, v1, Lcom/crashlytics/android/answers/e;->oX:Lcom/crashlytics/android/answers/ad;
 
     invoke-interface {v0}, Lcom/crashlytics/android/answers/ad;->ca()V
     :try_end_0
@@ -59,7 +59,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/e$3.smali b/com.discord/smali/com/crashlytics/android/answers/e$3.smali
index df4946f94e..8ab803282e 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e$3.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e$3.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic pb:Lcom/crashlytics/android/answers/e;
+.field final synthetic pa:Lcom/crashlytics/android/answers/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/answers/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/e$3;->pb:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$3;->pa:Lcom/crashlytics/android/answers/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,9 +38,9 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/e$3;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$3;->pa:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oY:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oX:Lcom/crashlytics/android/answers/ad;
 
     invoke-interface {v0}, Lcom/crashlytics/android/answers/ad;->bZ()V
     :try_end_0
@@ -51,7 +51,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/e$4.smali b/com.discord/smali/com/crashlytics/android/answers/e$4.smali
index d4c4d14b5b..b2d6c7b5b1 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e$4.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e$4.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic pb:Lcom/crashlytics/android/answers/e;
+.field final synthetic pa:Lcom/crashlytics/android/answers/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/answers/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/e$4;->pb:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$4;->pa:Lcom/crashlytics/android/answers/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,33 +40,33 @@
     move-object/from16 v1, p0
 
     :try_start_0
-    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pa:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oU:Lcom/crashlytics/android/answers/ah;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oT:Lcom/crashlytics/android/answers/ah;
 
-    iget-object v2, v0, Lcom/crashlytics/android/answers/ah;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v2, v0, Lcom/crashlytics/android/answers/ah;->qu:Lio/fabric/sdk/android/a/b/s;
 
     invoke-virtual {v2}, Lio/fabric/sdk/android/a/b/s;->cg()Ljava/util/Map;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v5, v3, Lio/fabric/sdk/android/a/b/s;->beH:Ljava/lang/String;
+    iget-object v5, v3, Lio/fabric/sdk/android/a/b/s;->bfb:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/s;->Dc()Ljava/lang/String;
+    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/s;->CT()Ljava/lang/String;
 
     move-result-object v7
 
-    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    iget-boolean v4, v3, Lio/fabric/sdk/android/a/b/s;->bfX:Z
+    iget-boolean v4, v3, Lio/fabric/sdk/android/a/b/s;->bgr:Z
 
     if-eqz v4, :cond_0
 
-    iget-object v4, v3, Lio/fabric/sdk/android/a/b/s;->mN:Landroid/content/Context;
+    iget-object v4, v3, Lio/fabric/sdk/android/a/b/s;->mM:Landroid/content/Context;
 
     invoke-static {v4}, Lio/fabric/sdk/android/a/b/r;->be(Landroid/content/Context;)Z
 
@@ -86,13 +86,13 @@
 
     if-eqz v4, :cond_1
 
-    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/s;->CV()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/s;->CM()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v3
 
     if-eqz v3, :cond_1
 
-    iget-boolean v3, v3, Lio/fabric/sdk/android/a/b/b;->bfb:Z
+    iget-boolean v3, v3, Lio/fabric/sdk/android/a/b/b;->bfw:Z
 
     invoke-static {v3}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -101,7 +101,7 @@
     :cond_1
     move-object v8, v6
 
-    sget-object v3, Lio/fabric/sdk/android/a/b/s$a;->bgf:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v3, Lio/fabric/sdk/android/a/b/s$a;->bgz:Lio/fabric/sdk/android/a/b/s$a;
 
     invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -123,7 +123,7 @@
 
     sget-object v3, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
-    invoke-static {v3}, Lio/fabric/sdk/android/a/b/s;->dJ(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lio/fabric/sdk/android/a/b/s;->dD(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
@@ -135,7 +135,7 @@
 
     sget-object v3, Landroid/os/Build$VERSION;->INCREMENTAL:Ljava/lang/String;
 
-    invoke-static {v3}, Lio/fabric/sdk/android/a/b/s;->dJ(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lio/fabric/sdk/android/a/b/s;->dD(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
@@ -145,7 +145,7 @@
 
     move-result-object v11
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/s;->Dd()Ljava/lang/String;
+    invoke-static {}, Lio/fabric/sdk/android/a/b/s;->getModelName()Ljava/lang/String;
 
     move-result-object v12
 
@@ -159,7 +159,7 @@
 
     new-instance v19, Lcom/crashlytics/android/answers/af;
 
-    iget-object v13, v0, Lcom/crashlytics/android/answers/ah;->qw:Ljava/lang/String;
+    iget-object v13, v0, Lcom/crashlytics/android/answers/ah;->qv:Ljava/lang/String;
 
     iget-object v14, v0, Lcom/crashlytics/android/answers/ah;->versionName:Ljava/lang/String;
 
@@ -167,9 +167,9 @@
 
     invoke-direct/range {v4 .. v14}, Lcom/crashlytics/android/answers/af;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pa:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oT:Lcom/crashlytics/android/answers/f;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oS:Lcom/crashlytics/android/answers/f;
 
     invoke-static {}, Landroid/os/Looper;->myLooper()Landroid/os/Looper;
 
@@ -189,7 +189,7 @@
 
     invoke-direct {v3}, Lio/fabric/sdk/android/a/b/w;-><init>()V
 
-    iget-object v4, v0, Lcom/crashlytics/android/answers/f;->pe:Lio/fabric/sdk/android/a/f/a;
+    iget-object v4, v0, Lcom/crashlytics/android/answers/f;->pd:Lio/fabric/sdk/android/a/f/a;
 
     invoke-interface {v4}, Lio/fabric/sdk/android/a/f/a;->getFilesDir()Ljava/io/File;
 
@@ -211,33 +211,33 @@
 
     invoke-direct {v4, v0, v2, v3, v5}, Lcom/crashlytics/android/answers/aa;-><init>(Landroid/content/Context;Lcom/crashlytics/android/answers/ag;Lio/fabric/sdk/android/a/b/k;Lio/fabric/sdk/android/a/d/c;)V
 
-    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pa:Lcom/crashlytics/android/answers/e;
 
     invoke-virtual {v4, v0}, Lcom/crashlytics/android/answers/aa;->a(Lio/fabric/sdk/android/a/d/d;)V
 
-    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pa:Lcom/crashlytics/android/answers/e;
 
     new-instance v2, Lcom/crashlytics/android/answers/n;
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pa:Lcom/crashlytics/android/answers/e;
 
-    iget-object v14, v3, Lcom/crashlytics/android/answers/e;->oS:Lio/fabric/sdk/android/i;
+    iget-object v14, v3, Lcom/crashlytics/android/answers/e;->oR:Lio/fabric/sdk/android/i;
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pa:Lcom/crashlytics/android/answers/e;
 
     iget-object v15, v3, Lcom/crashlytics/android/answers/e;->context:Landroid/content/Context;
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pa:Lcom/crashlytics/android/answers/e;
 
-    iget-object v3, v3, Lcom/crashlytics/android/answers/e;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v3, v3, Lcom/crashlytics/android/answers/e;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget-object v5, v1, Lcom/crashlytics/android/answers/e$4;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v5, v1, Lcom/crashlytics/android/answers/e$4;->pa:Lcom/crashlytics/android/answers/e;
 
-    iget-object v5, v5, Lcom/crashlytics/android/answers/e;->oV:Lio/fabric/sdk/android/a/e/e;
+    iget-object v5, v5, Lcom/crashlytics/android/answers/e;->oU:Lio/fabric/sdk/android/a/e/e;
 
-    iget-object v6, v1, Lcom/crashlytics/android/answers/e$4;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v6, v1, Lcom/crashlytics/android/answers/e$4;->pa:Lcom/crashlytics/android/answers/e;
 
-    iget-object v6, v6, Lcom/crashlytics/android/answers/e;->oW:Lcom/crashlytics/android/answers/q;
+    iget-object v6, v6, Lcom/crashlytics/android/answers/e;->oV:Lcom/crashlytics/android/answers/q;
 
     move-object v13, v2
 
@@ -251,7 +251,7 @@
 
     invoke-direct/range {v13 .. v20}, Lcom/crashlytics/android/answers/n;-><init>(Lio/fabric/sdk/android/i;Landroid/content/Context;Ljava/util/concurrent/ScheduledExecutorService;Lcom/crashlytics/android/answers/aa;Lio/fabric/sdk/android/a/e/e;Lcom/crashlytics/android/answers/af;Lcom/crashlytics/android/answers/q;)V
 
-    iput-object v2, v0, Lcom/crashlytics/android/answers/e;->oY:Lcom/crashlytics/android/answers/ad;
+    iput-object v2, v0, Lcom/crashlytics/android/answers/e;->oX:Lcom/crashlytics/android/answers/ad;
 
     return-void
 
@@ -269,7 +269,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/e$5.smali b/com.discord/smali/com/crashlytics/android/answers/e$5.smali
index 6fa4e87981..1e5b3c4f85 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e$5.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e$5.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic pb:Lcom/crashlytics/android/answers/e;
+.field final synthetic pa:Lcom/crashlytics/android/answers/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/answers/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/e$5;->pb:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$5;->pa:Lcom/crashlytics/android/answers/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,9 +38,9 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/e$5;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$5;->pa:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oY:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oX:Lcom/crashlytics/android/answers/ad;
 
     invoke-interface {v0}, Lcom/crashlytics/android/answers/ad;->cb()Z
     :try_end_0
@@ -51,7 +51,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/e$6.smali b/com.discord/smali/com/crashlytics/android/answers/e$6.smali
index d6abae652e..65b201a4ac 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e$6.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e$6.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic pb:Lcom/crashlytics/android/answers/e;
+.field final synthetic pa:Lcom/crashlytics/android/answers/e;
 
-.field final synthetic pc:Lcom/crashlytics/android/answers/ae$a;
+.field final synthetic pb:Lcom/crashlytics/android/answers/ae$a;
 
-.field final synthetic pd:Z
+.field final synthetic pc:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/answers/e;Lcom/crashlytics/android/answers/ae$a;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/e$6;->pb:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$6;->pa:Lcom/crashlytics/android/answers/e;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/e$6;->pc:Lcom/crashlytics/android/answers/ae$a;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/e$6;->pb:Lcom/crashlytics/android/answers/ae$a;
 
-    iput-boolean p3, p0, Lcom/crashlytics/android/answers/e$6;->pd:Z
+    iput-boolean p3, p0, Lcom/crashlytics/android/answers/e$6;->pc:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,21 +46,21 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/e$6;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$6;->pa:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oY:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oX:Lcom/crashlytics/android/answers/ad;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/e$6;->pc:Lcom/crashlytics/android/answers/ae$a;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/e$6;->pb:Lcom/crashlytics/android/answers/ae$a;
 
     invoke-interface {v0, v1}, Lcom/crashlytics/android/answers/ad;->a(Lcom/crashlytics/android/answers/ae$a;)V
 
-    iget-boolean v0, p0, Lcom/crashlytics/android/answers/e$6;->pd:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/answers/e$6;->pc:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/e$6;->pb:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$6;->pa:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oY:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->oX:Lcom/crashlytics/android/answers/ad;
 
     invoke-interface {v0}, Lcom/crashlytics/android/answers/ad;->cb()Z
     :try_end_0
@@ -72,7 +72,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/e.smali b/com.discord/smali/com/crashlytics/android/answers/e.smali
index 096fa54920..0a01529fa1 100644
--- a/com.discord/smali/com/crashlytics/android/answers/e.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/e.smali
@@ -9,19 +9,19 @@
 # instance fields
 .field final context:Landroid/content/Context;
 
-.field final oS:Lio/fabric/sdk/android/i;
+.field final oR:Lio/fabric/sdk/android/i;
 
-.field final oT:Lcom/crashlytics/android/answers/f;
+.field final oS:Lcom/crashlytics/android/answers/f;
 
-.field final oU:Lcom/crashlytics/android/answers/ah;
+.field final oT:Lcom/crashlytics/android/answers/ah;
 
-.field final oV:Lio/fabric/sdk/android/a/e/e;
+.field final oU:Lio/fabric/sdk/android/a/e/e;
 
-.field final oW:Lcom/crashlytics/android/answers/q;
+.field final oV:Lcom/crashlytics/android/answers/q;
 
-.field final oX:Ljava/util/concurrent/ScheduledExecutorService;
+.field final oW:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field oY:Lcom/crashlytics/android/answers/ad;
+.field oX:Lcom/crashlytics/android/answers/ad;
 
 
 # direct methods
@@ -34,21 +34,21 @@
 
     invoke-direct {v0}, Lcom/crashlytics/android/answers/m;-><init>()V
 
-    iput-object v0, p0, Lcom/crashlytics/android/answers/e;->oY:Lcom/crashlytics/android/answers/ad;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/e;->oX:Lcom/crashlytics/android/answers/ad;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/e;->oS:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e;->oR:Lio/fabric/sdk/android/i;
 
     iput-object p2, p0, Lcom/crashlytics/android/answers/e;->context:Landroid/content/Context;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/e;->oT:Lcom/crashlytics/android/answers/f;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/e;->oS:Lcom/crashlytics/android/answers/f;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/e;->oU:Lcom/crashlytics/android/answers/ah;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/e;->oT:Lcom/crashlytics/android/answers/ah;
 
-    iput-object p5, p0, Lcom/crashlytics/android/answers/e;->oV:Lio/fabric/sdk/android/a/e/e;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/e;->oU:Lio/fabric/sdk/android/a/e/e;
 
-    iput-object p6, p0, Lcom/crashlytics/android/answers/e;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p6, p0, Lcom/crashlytics/android/answers/e;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iput-object p7, p0, Lcom/crashlytics/android/answers/e;->oW:Lcom/crashlytics/android/answers/q;
+    iput-object p7, p0, Lcom/crashlytics/android/answers/e;->oV:Lcom/crashlytics/android/answers/q;
 
     return-void
 .end method
@@ -57,7 +57,7 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/e;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {v0, p1}, Ljava/util/concurrent/ScheduledExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
 
@@ -72,7 +72,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -122,7 +122,7 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/e;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {v0, p1}, Ljava/util/concurrent/ScheduledExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
     :try_end_0
@@ -133,7 +133,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/f.smali b/com.discord/smali/com/crashlytics/android/answers/f.smali
index 75ddf5c97d..367c946cf8 100644
--- a/com.discord/smali/com/crashlytics/android/answers/f.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/f.smali
@@ -6,7 +6,7 @@
 # instance fields
 .field final context:Landroid/content/Context;
 
-.field final pe:Lio/fabric/sdk/android/a/f/a;
+.field final pd:Lio/fabric/sdk/android/a/f/a;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     iput-object p1, p0, Lcom/crashlytics/android/answers/f;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/f;->pe:Lio/fabric/sdk/android/a/f/a;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/f;->pd:Lio/fabric/sdk/android/a/f/a;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/g.smali b/com.discord/smali/com/crashlytics/android/answers/g.smali
index e6f64abf4d..102684dcb8 100644
--- a/com.discord/smali/com/crashlytics/android/answers/g.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/g.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final oL:Lcom/crashlytics/android/answers/ac;
+.field private final oK:Lcom/crashlytics/android/answers/ac;
 
-.field private final pf:Lcom/crashlytics/android/answers/k;
+.field private final pe:Lcom/crashlytics/android/answers/k;
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a$b;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/g;->oL:Lcom/crashlytics/android/answers/ac;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/g;->oK:Lcom/crashlytics/android/answers/ac;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/g;->pf:Lcom/crashlytics/android/answers/k;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/g;->pe:Lcom/crashlytics/android/answers/k;
 
     return-void
 .end method
@@ -33,32 +33,32 @@
 .method public final onActivityPaused(Landroid/app/Activity;)V
     .locals 6
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->oL:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->oK:Lcom/crashlytics/android/answers/ac;
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qe:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qd:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v0, p1, v1}, Lcom/crashlytics/android/answers/ac;->a(Landroid/app/Activity;Lcom/crashlytics/android/answers/ae$b;)V
 
-    iget-object p1, p0, Lcom/crashlytics/android/answers/g;->pf:Lcom/crashlytics/android/answers/k;
+    iget-object p1, p0, Lcom/crashlytics/android/answers/g;->pe:Lcom/crashlytics/android/answers/k;
 
-    iget-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pm:Z
+    iget-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pl:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p1, Lcom/crashlytics/android/answers/k;->po:Z
+    iget-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pn:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p1, Lcom/crashlytics/android/answers/k;->po:Z
+    iput-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pn:Z
 
     :try_start_0
-    iget-object v0, p1, Lcom/crashlytics/android/answers/k;->pn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p1, Lcom/crashlytics/android/answers/k;->pm:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
-    iget-object v2, p1, Lcom/crashlytics/android/answers/k;->pl:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v2, p1, Lcom/crashlytics/android/answers/k;->pk:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v3, Lcom/crashlytics/android/answers/k$1;
 
@@ -81,7 +81,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -98,19 +98,19 @@
 .method public final onActivityResumed(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->oL:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->oK:Lcom/crashlytics/android/answers/ac;
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qd:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qc:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v0, p1, v1}, Lcom/crashlytics/android/answers/ac;->a(Landroid/app/Activity;Lcom/crashlytics/android/answers/ae$b;)V
 
-    iget-object p1, p0, Lcom/crashlytics/android/answers/g;->pf:Lcom/crashlytics/android/answers/k;
+    iget-object p1, p0, Lcom/crashlytics/android/answers/g;->pe:Lcom/crashlytics/android/answers/k;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p1, Lcom/crashlytics/android/answers/k;->po:Z
+    iput-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pn:Z
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/k;->pn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/k;->pm:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
@@ -131,9 +131,9 @@
 .method public final onActivityStarted(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->oL:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->oK:Lcom/crashlytics/android/answers/ac;
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qc:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qb:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v0, p1, v1}, Lcom/crashlytics/android/answers/ac;->a(Landroid/app/Activity;Lcom/crashlytics/android/answers/ae$b;)V
 
@@ -143,9 +143,9 @@
 .method public final onActivityStopped(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->oL:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->oK:Lcom/crashlytics/android/answers/ac;
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qf:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qe:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v0, p1, v1}, Lcom/crashlytics/android/answers/ac;->a(Landroid/app/Activity;Lcom/crashlytics/android/answers/ae$b;)V
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/h.smali b/com.discord/smali/com/crashlytics/android/answers/h.smali
index 9bd7e31923..8a666ae608 100644
--- a/com.discord/smali/com/crashlytics/android/answers/h.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/h.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final pg:Lio/fabric/sdk/android/a/f/c;
+.field final pf:Lio/fabric/sdk/android/a/f/c;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/h;->pg:Lio/fabric/sdk/android/a/f/c;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/h;->pf:Lio/fabric/sdk/android/a/f/c;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/i.smali b/com.discord/smali/com/crashlytics/android/answers/i.smali
index 506c36639f..24c4aeb0c5 100644
--- a/com.discord/smali/com/crashlytics/android/answers/i.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/i.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final ph:Lcom/crashlytics/android/answers/ab;
+.field private final pg:Lcom/crashlytics/android/answers/ab;
 
-.field private final pi:Lcom/crashlytics/android/answers/y;
+.field private final ph:Lcom/crashlytics/android/answers/y;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/i;->ph:Lcom/crashlytics/android/answers/ab;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/i;->pg:Lcom/crashlytics/android/answers/ab;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/i;->pi:Lcom/crashlytics/android/answers/y;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/i;->ph:Lcom/crashlytics/android/answers/y;
 
     return-void
 .end method
@@ -42,11 +42,11 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/crashlytics/android/answers/i;->pi:Lcom/crashlytics/android/answers/y;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/i;->ph:Lcom/crashlytics/android/answers/y;
 
-    iget-object v3, v2, Lcom/crashlytics/android/answers/y;->pL:Lio/fabric/sdk/android/a/c/a/e;
+    iget-object v3, v2, Lcom/crashlytics/android/answers/y;->pK:Lio/fabric/sdk/android/a/c/a/e;
 
-    iget-object v4, v3, Lio/fabric/sdk/android/a/c/a/e;->pI:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v4, v3, Lio/fabric/sdk/android/a/c/a/e;->pH:Lio/fabric/sdk/android/a/c/a/a;
 
     iget v3, v3, Lio/fabric/sdk/android/a/c/a/e;->retryCount:I
 
@@ -58,7 +58,7 @@
 
     mul-long v3, v3, v5
 
-    iget-wide v5, v2, Lcom/crashlytics/android/answers/y;->pK:J
+    iget-wide v5, v2, Lcom/crashlytics/android/answers/y;->pJ:J
 
     sub-long v5, v0, v5
 
@@ -80,7 +80,7 @@
     :goto_0
     if-eqz v3, :cond_2
 
-    iget-object v3, p0, Lcom/crashlytics/android/answers/i;->ph:Lcom/crashlytics/android/answers/ab;
+    iget-object v3, p0, Lcom/crashlytics/android/answers/i;->pg:Lcom/crashlytics/android/answers/ab;
 
     invoke-virtual {v3, p1}, Lcom/crashlytics/android/answers/ab;->h(Ljava/util/List;)Z
 
@@ -88,32 +88,32 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/crashlytics/android/answers/i;->pi:Lcom/crashlytics/android/answers/y;
+    iget-object p1, p0, Lcom/crashlytics/android/answers/i;->ph:Lcom/crashlytics/android/answers/y;
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p1, Lcom/crashlytics/android/answers/y;->pK:J
+    iput-wide v0, p1, Lcom/crashlytics/android/answers/y;->pJ:J
 
-    iget-object v0, p1, Lcom/crashlytics/android/answers/y;->pL:Lio/fabric/sdk/android/a/c/a/e;
+    iget-object v0, p1, Lcom/crashlytics/android/answers/y;->pK:Lio/fabric/sdk/android/a/c/a/e;
 
     new-instance v1, Lio/fabric/sdk/android/a/c/a/e;
 
-    iget-object v3, v0, Lio/fabric/sdk/android/a/c/a/e;->pI:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v3, v0, Lio/fabric/sdk/android/a/c/a/e;->pH:Lio/fabric/sdk/android/a/c/a/a;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bhj:Lio/fabric/sdk/android/a/c/a/d;
+    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bhD:Lio/fabric/sdk/android/a/c/a/d;
 
     invoke-direct {v1, v3, v0}, Lio/fabric/sdk/android/a/c/a/e;-><init>(Lio/fabric/sdk/android/a/c/a/a;Lio/fabric/sdk/android/a/c/a/d;)V
 
-    iput-object v1, p1, Lcom/crashlytics/android/answers/y;->pL:Lio/fabric/sdk/android/a/c/a/e;
+    iput-object v1, p1, Lcom/crashlytics/android/answers/y;->pK:Lio/fabric/sdk/android/a/c/a/e;
 
     return v2
 
     :cond_1
-    iget-object p1, p0, Lcom/crashlytics/android/answers/i;->pi:Lcom/crashlytics/android/answers/y;
+    iget-object p1, p0, Lcom/crashlytics/android/answers/i;->ph:Lcom/crashlytics/android/answers/y;
 
-    iput-wide v0, p1, Lcom/crashlytics/android/answers/y;->pK:J
+    iput-wide v0, p1, Lcom/crashlytics/android/answers/y;->pJ:J
 
-    iget-object v0, p1, Lcom/crashlytics/android/answers/y;->pL:Lio/fabric/sdk/android/a/c/a/e;
+    iget-object v0, p1, Lcom/crashlytics/android/answers/y;->pK:Lio/fabric/sdk/android/a/c/a/e;
 
     new-instance v1, Lio/fabric/sdk/android/a/c/a/e;
 
@@ -121,13 +121,13 @@
 
     add-int/2addr v3, v2
 
-    iget-object v2, v0, Lio/fabric/sdk/android/a/c/a/e;->pI:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v2, v0, Lio/fabric/sdk/android/a/c/a/e;->pH:Lio/fabric/sdk/android/a/c/a/a;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bhj:Lio/fabric/sdk/android/a/c/a/d;
+    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bhD:Lio/fabric/sdk/android/a/c/a/d;
 
     invoke-direct {v1, v3, v2, v0}, Lio/fabric/sdk/android/a/c/a/e;-><init>(ILio/fabric/sdk/android/a/c/a/a;Lio/fabric/sdk/android/a/c/a/d;)V
 
-    iput-object v1, p1, Lcom/crashlytics/android/answers/y;->pL:Lio/fabric/sdk/android/a/c/a/e;
+    iput-object v1, p1, Lcom/crashlytics/android/answers/y;->pK:Lio/fabric/sdk/android/a/c/a/e;
 
     :cond_2
     return v7
diff --git a/com.discord/smali/com/crashlytics/android/answers/j.smali b/com.discord/smali/com/crashlytics/android/answers/j.smali
index c36e0e9e61..78cb101c21 100644
--- a/com.discord/smali/com/crashlytics/android/answers/j.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/j.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final pj:Ljava/lang/reflect/Method;
+.field private final pi:Ljava/lang/reflect/Method;
 
-.field private final pk:Ljava/lang/Object;
+.field private final pj:Ljava/lang/Object;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/j;->pk:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/j;->pj:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/j;->pj:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/j;->pi:Ljava/lang/reflect/Method;
 
     return-void
 .end method
@@ -174,9 +174,9 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/j;->pj:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/j;->pi:Ljava/lang/reflect/Method;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/j;->pk:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/j;->pj:Ljava/lang/Object;
 
     const/4 v2, 0x3
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/k$1.smali b/com.discord/smali/com/crashlytics/android/answers/k$1.smali
index ff04931bbc..26bf8771bb 100644
--- a/com.discord/smali/com/crashlytics/android/answers/k$1.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/k$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic pp:Lcom/crashlytics/android/answers/k;
+.field final synthetic po:Lcom/crashlytics/android/answers/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/answers/k;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/k$1;->pp:Lcom/crashlytics/android/answers/k;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/k$1;->po:Lcom/crashlytics/android/answers/k;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +37,15 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/k$1;->pp:Lcom/crashlytics/android/answers/k;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/k$1;->po:Lcom/crashlytics/android/answers/k;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/k;->pn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/k;->pm:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/k$1;->pp:Lcom/crashlytics/android/answers/k;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/k$1;->po:Lcom/crashlytics/android/answers/k;
 
     iget-object v0, v0, Lcom/crashlytics/android/answers/k;->listeners:Ljava/util/List;
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/k.smali b/com.discord/smali/com/crashlytics/android/answers/k.smali
index 5093046fef..061ce2551d 100644
--- a/com.discord/smali/com/crashlytics/android/answers/k.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/k.smali
@@ -22,11 +22,11 @@
     .end annotation
 .end field
 
-.field final pl:Ljava/util/concurrent/ScheduledExecutorService;
+.field final pk:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field volatile pm:Z
+.field volatile pl:Z
 
-.field final pn:Ljava/util/concurrent/atomic/AtomicReference;
+.field final pm:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field po:Z
+.field pn:Z
 
 
 # direct methods
@@ -53,17 +53,17 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/k;->pm:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/k;->pl:Z
 
     new-instance v1, Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v1, p0, Lcom/crashlytics/android/answers/k;->pn:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v1, p0, Lcom/crashlytics/android/answers/k;->pm:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/k;->po:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/k;->pn:Z
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/k;->pl:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/k;->pk:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/l.smali b/com.discord/smali/com/crashlytics/android/answers/l.smali
index 4a0b40ceb3..8887c6fbd9 100644
--- a/com.discord/smali/com/crashlytics/android/answers/l.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/l.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field final pq:Ljava/lang/String;
+.field final pp:Ljava/lang/String;
 
 
 # direct methods
@@ -23,13 +23,13 @@
 
     invoke-direct {p0}, Lcom/crashlytics/android/answers/c;-><init>()V
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/l;->oM:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/l;->oL:Lcom/crashlytics/android/answers/d;
 
     invoke-virtual {v0, p1}, Lcom/crashlytics/android/answers/d;->E(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/l;->pq:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/l;->pp:Ljava/lang/String;
 
     return-void
 .end method
@@ -45,7 +45,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/l;->pq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/l;->pp:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -57,7 +57,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/l;->oO:Lcom/crashlytics/android/answers/b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/l;->oN:Lcom/crashlytics/android/answers/b;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/n.smali b/com.discord/smali/com/crashlytics/android/answers/n.smali
index 3f281ae4fc..a88eb2abfc 100644
--- a/com.discord/smali/com/crashlytics/android/answers/n.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/n.smali
@@ -9,23 +9,21 @@
 # instance fields
 .field private final context:Landroid/content/Context;
 
-.field private final oS:Lio/fabric/sdk/android/i;
+.field private final oR:Lio/fabric/sdk/android/i;
 
-.field private final oW:Lcom/crashlytics/android/answers/q;
+.field private final oV:Lcom/crashlytics/android/answers/q;
 
-.field volatile pA:I
+.field pA:Z
 
 .field pB:Z
 
-.field pC:Z
+.field private final pk:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private final pl:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final pq:Lio/fabric/sdk/android/a/e/e;
 
-.field private final pr:Lio/fabric/sdk/android/a/e/e;
+.field private final pr:Lcom/crashlytics/android/answers/aa;
 
-.field private final ps:Lcom/crashlytics/android/answers/aa;
-
-.field private final pt:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final ps:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -35,17 +33,19 @@
     .end annotation
 .end field
 
-.field final pu:Lcom/crashlytics/android/answers/af;
+.field final pt:Lcom/crashlytics/android/answers/af;
 
-.field pv:Lio/fabric/sdk/android/a/d/f;
+.field pu:Lio/fabric/sdk/android/a/d/f;
 
-.field pw:Lio/fabric/sdk/android/a/b/g;
+.field pv:Lio/fabric/sdk/android/a/b/g;
 
-.field px:Lcom/crashlytics/android/answers/o;
+.field pw:Lcom/crashlytics/android/answers/o;
+
+.field px:Z
 
 .field py:Z
 
-.field pz:Z
+.field volatile pz:I
 
 
 # direct methods
@@ -58,49 +58,49 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->pt:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->ps:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/g;
 
     invoke-direct {v0}, Lio/fabric/sdk/android/a/b/g;-><init>()V
 
-    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->pw:Lio/fabric/sdk/android/a/b/g;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->pv:Lio/fabric/sdk/android/a/b/g;
 
     new-instance v0, Lcom/crashlytics/android/answers/u;
 
     invoke-direct {v0}, Lcom/crashlytics/android/answers/u;-><init>()V
 
-    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->px:Lcom/crashlytics/android/answers/o;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->pw:Lcom/crashlytics/android/answers/o;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->py:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->px:Z
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->pz:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->py:Z
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/crashlytics/android/answers/n;->pA:I
+    iput v0, p0, Lcom/crashlytics/android/answers/n;->pz:I
 
     const/4 v0, 0x0
 
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->pA:Z
+
     iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->pB:Z
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->pC:Z
-
-    iput-object p1, p0, Lcom/crashlytics/android/answers/n;->oS:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/n;->oR:Lio/fabric/sdk/android/i;
 
     iput-object p2, p0, Lcom/crashlytics/android/answers/n;->context:Landroid/content/Context;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/n;->pl:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/n;->pk:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/n;->ps:Lcom/crashlytics/android/answers/aa;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/n;->pr:Lcom/crashlytics/android/answers/aa;
 
-    iput-object p5, p0, Lcom/crashlytics/android/answers/n;->pr:Lio/fabric/sdk/android/a/e/e;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/n;->pq:Lio/fabric/sdk/android/a/e/e;
 
-    iput-object p6, p0, Lcom/crashlytics/android/answers/n;->pu:Lcom/crashlytics/android/answers/af;
+    iput-object p6, p0, Lcom/crashlytics/android/answers/n;->pt:Lcom/crashlytics/android/answers/af;
 
-    iput-object p7, p0, Lcom/crashlytics/android/answers/n;->oW:Lcom/crashlytics/android/answers/q;
+    iput-object p7, p0, Lcom/crashlytics/android/answers/n;->oV:Lcom/crashlytics/android/answers/q;
 
     return-void
 .end method
@@ -108,7 +108,7 @@
 .method private a(JJ)V
     .locals 8
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pt:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->ps:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -153,9 +153,9 @@
     invoke-static {v0, v1}, Lio/fabric/sdk/android/a/b/i;->v(Landroid/content/Context;Ljava/lang/String;)V
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pt:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->ps:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/n;->pl:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/n;->pk:Ljava/util/concurrent/ScheduledExecutorService;
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -193,23 +193,23 @@
 
     move-object/from16 v0, p1
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/n;->pu:Lcom/crashlytics/android/answers/af;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/n;->pt:Lcom/crashlytics/android/answers/af;
 
     new-instance v13, Lcom/crashlytics/android/answers/ae;
 
     iget-wide v4, v0, Lcom/crashlytics/android/answers/ae$a;->timestamp:J
 
-    iget-object v6, v0, Lcom/crashlytics/android/answers/ae$a;->pV:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v6, v0, Lcom/crashlytics/android/answers/ae$a;->pU:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v7, v0, Lcom/crashlytics/android/answers/ae$a;->pW:Ljava/util/Map;
+    iget-object v7, v0, Lcom/crashlytics/android/answers/ae$a;->pV:Ljava/util/Map;
 
-    iget-object v8, v0, Lcom/crashlytics/android/answers/ae$a;->pX:Ljava/lang/String;
+    iget-object v8, v0, Lcom/crashlytics/android/answers/ae$a;->pW:Ljava/lang/String;
 
-    iget-object v9, v0, Lcom/crashlytics/android/answers/ae$a;->pY:Ljava/util/Map;
+    iget-object v9, v0, Lcom/crashlytics/android/answers/ae$a;->pX:Ljava/util/Map;
 
-    iget-object v10, v0, Lcom/crashlytics/android/answers/ae$a;->pZ:Ljava/lang/String;
+    iget-object v10, v0, Lcom/crashlytics/android/answers/ae$a;->pY:Ljava/lang/String;
 
-    iget-object v11, v0, Lcom/crashlytics/android/answers/ae$a;->qa:Ljava/util/Map;
+    iget-object v11, v0, Lcom/crashlytics/android/answers/ae$a;->pZ:Ljava/util/Map;
 
     const/4 v12, 0x0
 
@@ -217,15 +217,15 @@
 
     invoke-direct/range {v2 .. v12}, Lcom/crashlytics/android/answers/ae;-><init>(Lcom/crashlytics/android/answers/af;JLcom/crashlytics/android/answers/ae$b;Ljava/util/Map;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/util/Map;B)V
 
-    iget-boolean v0, v1, Lcom/crashlytics/android/answers/n;->py:Z
+    iget-boolean v0, v1, Lcom/crashlytics/android/answers/n;->px:Z
 
     const-string v2, "Answers"
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qi:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qh:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pV:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v0, v3}, Lcom/crashlytics/android/answers/ae$b;->equals(Ljava/lang/Object;)Z
 
@@ -233,7 +233,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -252,13 +252,13 @@
     return-void
 
     :cond_0
-    iget-boolean v0, v1, Lcom/crashlytics/android/answers/n;->pz:Z
+    iget-boolean v0, v1, Lcom/crashlytics/android/answers/n;->py:Z
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qj:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qi:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pV:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v0, v3}, Lcom/crashlytics/android/answers/ae$b;->equals(Ljava/lang/Object;)Z
 
@@ -266,7 +266,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -285,7 +285,7 @@
     return-void
 
     :cond_1
-    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->px:Lcom/crashlytics/android/answers/o;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->pw:Lcom/crashlytics/android/answers/o;
 
     invoke-interface {v0, v13}, Lcom/crashlytics/android/answers/o;->a(Lcom/crashlytics/android/answers/ae;)Z
 
@@ -293,7 +293,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -313,7 +313,7 @@
 
     :cond_2
     :try_start_0
-    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->ps:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->pr:Lcom/crashlytics/android/answers/aa;
 
     invoke-virtual {v0, v13}, Lcom/crashlytics/android/answers/aa;->aV(Ljava/lang/Object;)V
     :try_end_0
@@ -324,7 +324,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -341,7 +341,7 @@
     invoke-interface {v3, v2, v4, v0}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :goto_0
-    iget v0, v1, Lcom/crashlytics/android/answers/n;->pA:I
+    iget v0, v1, Lcom/crashlytics/android/answers/n;->pz:I
 
     const/4 v3, -0x1
 
@@ -357,20 +357,20 @@
     :goto_1
     if-eqz v0, :cond_4
 
-    iget v0, v1, Lcom/crashlytics/android/answers/n;->pA:I
+    iget v0, v1, Lcom/crashlytics/android/answers/n;->pz:I
 
     int-to-long v6, v0
 
-    iget v0, v1, Lcom/crashlytics/android/answers/n;->pA:I
+    iget v0, v1, Lcom/crashlytics/android/answers/n;->pz:I
 
     int-to-long v8, v0
 
     invoke-direct {v1, v6, v7, v8, v9}, Lcom/crashlytics/android/answers/n;->a(JJ)V
 
     :cond_4
-    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qi:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qh:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->pV:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v0, v6}, Lcom/crashlytics/android/answers/ae$b;->equals(Ljava/lang/Object;)Z
 
@@ -378,9 +378,9 @@
 
     if-nez v0, :cond_6
 
-    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qj:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qi:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->pV:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v0, v6}, Lcom/crashlytics/android/answers/ae$b;->equals(Ljava/lang/Object;)Z
 
@@ -400,7 +400,7 @@
     const/4 v0, 0x1
 
     :goto_3
-    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     const-string v7, "purchase"
 
@@ -408,7 +408,7 @@
 
     move-result v6
 
-    iget-boolean v8, v1, Lcom/crashlytics/android/answers/n;->pB:Z
+    iget-boolean v8, v1, Lcom/crashlytics/android/answers/n;->pA:Z
 
     if-eqz v8, :cond_29
 
@@ -419,7 +419,7 @@
     :cond_7
     if-eqz v6, :cond_8
 
-    iget-boolean v0, v1, Lcom/crashlytics/android/answers/n;->pC:Z
+    iget-boolean v0, v1, Lcom/crashlytics/android/answers/n;->pB:Z
 
     if-nez v0, :cond_8
 
@@ -427,9 +427,9 @@
 
     :cond_8
     :try_start_1
-    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->oW:Lcom/crashlytics/android/answers/q;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->oV:Lcom/crashlytics/android/answers/q;
 
-    iget-object v6, v0, Lcom/crashlytics/android/answers/q;->pE:Lcom/crashlytics/android/answers/p;
+    iget-object v6, v0, Lcom/crashlytics/android/answers/q;->pD:Lcom/crashlytics/android/answers/p;
 
     if-nez v6, :cond_9
 
@@ -439,14 +439,14 @@
 
     move-result-object v6
 
-    iput-object v6, v0, Lcom/crashlytics/android/answers/q;->pE:Lcom/crashlytics/android/answers/p;
+    iput-object v6, v0, Lcom/crashlytics/android/answers/q;->pD:Lcom/crashlytics/android/answers/p;
 
     :cond_9
-    iget-object v0, v0, Lcom/crashlytics/android/answers/q;->pE:Lcom/crashlytics/android/answers/p;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/q;->pD:Lcom/crashlytics/android/answers/p;
 
     if-nez v0, :cond_a
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -457,9 +457,9 @@
     return-void
 
     :cond_a
-    sget-object v6, Lcom/crashlytics/android/answers/ae$b;->qi:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v6, Lcom/crashlytics/android/answers/ae$b;->qh:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v8, v13, Lcom/crashlytics/android/answers/ae;->pV:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v8, v13, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v6, v8}, Lcom/crashlytics/android/answers/ae$b;->equals(Ljava/lang/Object;)Z
 
@@ -467,7 +467,7 @@
 
     if-eqz v6, :cond_b
 
-    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->pX:Ljava/lang/String;
+    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->pW:Ljava/lang/String;
 
     if-eqz v6, :cond_b
 
@@ -479,9 +479,9 @@
     const/4 v6, 0x0
 
     :goto_4
-    sget-object v8, Lcom/crashlytics/android/answers/ae$b;->qj:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v8, Lcom/crashlytics/android/answers/ae$b;->qi:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v9, v13, Lcom/crashlytics/android/answers/ae;->pV:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v9, v13, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v8, v9}, Lcom/crashlytics/android/answers/ae$b;->equals(Ljava/lang/Object;)Z
 
@@ -489,7 +489,7 @@
 
     if-eqz v8, :cond_c
 
-    iget-object v8, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v8, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
 
@@ -533,7 +533,7 @@
 
     invoke-direct {v15}, Landroid/os/Bundle;-><init>()V
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v7, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -550,7 +550,7 @@
     if-eqz v3, :cond_e
 
     :try_start_3
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     move-object/from16 v16, v0
 
@@ -564,7 +564,7 @@
 
     invoke-static {v15, v5, v0}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v3, "itemName"
 
@@ -578,7 +578,7 @@
 
     const-string v0, "item_category"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v4, "itemType"
 
@@ -592,7 +592,7 @@
 
     const-string v0, "value"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v4, "itemPrice"
 
@@ -606,7 +606,7 @@
 
     invoke-static {v15, v0, v3}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Double;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -623,7 +623,7 @@
 
     const-string v0, "addToCart"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -631,7 +631,7 @@
 
     if-eqz v0, :cond_f
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v3, "itemId"
 
@@ -643,7 +643,7 @@
 
     invoke-static {v15, v5, v0}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v3, "itemName"
 
@@ -657,7 +657,7 @@
 
     const-string v0, "item_category"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v4, "itemType"
 
@@ -671,7 +671,7 @@
 
     const-string v0, "price"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v4, "itemPrice"
 
@@ -687,7 +687,7 @@
 
     const-string v0, "value"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v4, "itemPrice"
 
@@ -701,7 +701,7 @@
 
     invoke-static {v15, v0, v3}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Double;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -722,7 +722,7 @@
     :cond_f
     const-string v0, "startCheckout"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -732,7 +732,7 @@
 
     const-string v0, "quantity"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v4, "itemCount"
 
@@ -756,7 +756,7 @@
 
     const-string v0, "value"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v4, "totalPrice"
 
@@ -770,7 +770,7 @@
 
     invoke-static {v15, v0, v3}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Double;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -785,7 +785,7 @@
     :cond_10
     const-string v0, "contentView"
 
-    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -795,7 +795,7 @@
 
     const-string v0, "content_type"
 
-    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v3, "contentType"
 
@@ -807,7 +807,7 @@
 
     invoke-static {v15, v0, v1}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v1, "contentId"
 
@@ -819,7 +819,7 @@
 
     invoke-static {v15, v5, v0}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v1, "contentName"
 
@@ -834,7 +834,7 @@
     goto/16 :goto_6
 
     :cond_11
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v6, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -844,7 +844,7 @@
 
     const-string v0, "search_term"
 
-    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v3, "query"
 
@@ -861,7 +861,7 @@
     :cond_12
     const-string v0, "share"
 
-    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -874,7 +874,7 @@
     if-eqz v0, :cond_13
 
     :try_start_4
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -886,7 +886,7 @@
 
     const-string v0, "content_type"
 
-    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v3, "contentType"
 
@@ -898,7 +898,7 @@
 
     invoke-static {v15, v0, v1}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v1, "contentId"
 
@@ -910,7 +910,7 @@
 
     invoke-static {v15, v5, v0}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v1, "contentName"
 
@@ -925,7 +925,7 @@
     goto/16 :goto_6
 
     :cond_13
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v14, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -933,7 +933,7 @@
 
     if-eqz v0, :cond_14
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     invoke-interface {v0, v14}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -947,7 +947,7 @@
 
     const-string v0, "content_type"
 
-    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v3, "contentType"
 
@@ -959,7 +959,7 @@
 
     invoke-static {v15, v0, v1}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v1, "contentId"
 
@@ -971,7 +971,7 @@
 
     invoke-static {v15, v5, v0}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v1, "contentName"
 
@@ -988,7 +988,7 @@
     :cond_14
     const-string v0, "signUp"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -996,7 +996,7 @@
 
     if-eqz v0, :cond_15
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1009,7 +1009,7 @@
     goto/16 :goto_6
 
     :cond_15
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v12, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1017,7 +1017,7 @@
 
     if-eqz v0, :cond_16
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1030,7 +1030,7 @@
     goto :goto_6
 
     :cond_16
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v10, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1038,7 +1038,7 @@
 
     if-eqz v0, :cond_17
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1053,7 +1053,7 @@
     :cond_17
     const-string v0, "levelStart"
 
-    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1063,7 +1063,7 @@
 
     const-string v0, "level_name"
 
-    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v3, "levelName"
 
@@ -1078,7 +1078,7 @@
     goto :goto_6
 
     :cond_18
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v9, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1088,7 +1088,7 @@
 
     const-string v0, "score"
 
-    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v3, "score"
 
@@ -1104,7 +1104,7 @@
 
     const-string v0, "level_name"
 
-    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     const-string v3, "levelName"
 
@@ -1116,7 +1116,7 @@
 
     invoke-static {v15, v0, v1}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     invoke-interface {v0, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1132,7 +1132,7 @@
 
     :cond_19
     :goto_6
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pX:Ljava/util/Map;
 
     invoke-static {v15, v0}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/util/Map;)V
 
@@ -1145,11 +1145,11 @@
 
     invoke-direct {v15}, Landroid/os/Bundle;-><init>()V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pX:Ljava/util/Map;
 
     if-eqz v0, :cond_1b
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pX:Ljava/util/Map;
 
     invoke-static {v15, v0}, Lcom/crashlytics/android/answers/t;->a(Landroid/os/Bundle;Ljava/util/Map;)V
 
@@ -1157,7 +1157,7 @@
     :goto_7
     if-eqz v8, :cond_26
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qa:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/util/Map;
 
     invoke-interface {v0, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1181,7 +1181,7 @@
     const/4 v0, 0x0
 
     :goto_8
-    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     if-eqz v0, :cond_24
 
@@ -1495,7 +1495,7 @@
     goto :goto_e
 
     :cond_26
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pX:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pW:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/crashlytics/android/answers/t;->F(Ljava/lang/String;)Ljava/lang/String;
 
@@ -1503,7 +1503,7 @@
 
     :goto_e
     :pswitch_b
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -1518,7 +1518,7 @@
     :goto_f
     if-nez v3, :cond_27
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -1537,15 +1537,15 @@
     return-void
 
     :cond_27
-    iget-object v0, v3, Lcom/crashlytics/android/answers/s;->pq:Ljava/lang/String;
+    iget-object v0, v3, Lcom/crashlytics/android/answers/s;->pp:Ljava/lang/String;
 
-    iget-object v1, v3, Lcom/crashlytics/android/answers/s;->pF:Landroid/os/Bundle;
+    iget-object v1, v3, Lcom/crashlytics/android/answers/s;->pE:Landroid/os/Bundle;
 
     move-object/from16 v4, v16
 
     invoke-interface {v4, v0, v1}, Lcom/crashlytics/android/answers/p;->b(Ljava/lang/String;Landroid/os/Bundle;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pZ:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->pY:Ljava/lang/String;
 
     invoke-virtual {v9, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1555,7 +1555,7 @@
 
     const-string v0, "post_score"
 
-    iget-object v1, v3, Lcom/crashlytics/android/answers/s;->pF:Landroid/os/Bundle;
+    iget-object v1, v3, Lcom/crashlytics/android/answers/s;->pE:Landroid/os/Bundle;
 
     invoke-interface {v4, v0, v1}, Lcom/crashlytics/android/answers/p;->b(Ljava/lang/String;Landroid/os/Bundle;)V
     :try_end_4
@@ -1567,7 +1567,7 @@
     :catch_1
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -1625,13 +1625,13 @@
 
     new-instance v6, Lcom/crashlytics/android/answers/ab;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/n;->oS:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/n;->oR:Lio/fabric/sdk/android/i;
 
-    iget-object v3, p1, Lio/fabric/sdk/android/a/g/b;->bif:Ljava/lang/String;
+    iget-object v3, p1, Lio/fabric/sdk/android/a/g/b;->biz:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/crashlytics/android/answers/n;->pr:Lio/fabric/sdk/android/a/e/e;
+    iget-object v4, p0, Lcom/crashlytics/android/answers/n;->pq:Lio/fabric/sdk/android/a/e/e;
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pw:Lio/fabric/sdk/android/a/b/g;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pv:Lio/fabric/sdk/android/a/b/g;
 
     iget-object v2, p0, Lcom/crashlytics/android/answers/n;->context:Landroid/content/Context;
 
@@ -1671,21 +1671,21 @@
 
     invoke-direct {v0, v6, p2}, Lcom/crashlytics/android/answers/i;-><init>(Lcom/crashlytics/android/answers/ab;Lcom/crashlytics/android/answers/y;)V
 
-    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->pv:Lio/fabric/sdk/android/a/d/f;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->pu:Lio/fabric/sdk/android/a/d/f;
 
-    iget-object p2, p0, Lcom/crashlytics/android/answers/n;->ps:Lcom/crashlytics/android/answers/aa;
+    iget-object p2, p0, Lcom/crashlytics/android/answers/n;->pr:Lcom/crashlytics/android/answers/aa;
 
-    iput-object p1, p2, Lcom/crashlytics/android/answers/aa;->pO:Lio/fabric/sdk/android/a/g/b;
+    iput-object p1, p2, Lcom/crashlytics/android/answers/aa;->pN:Lio/fabric/sdk/android/a/g/b;
 
-    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->bik:Z
+    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->biE:Z
+
+    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->pA:Z
+
+    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->pB:Z
 
     iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->pB:Z
 
-    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->pC:Z
-
-    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->pC:Z
-
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -1695,7 +1695,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-boolean v1, p0, Lcom/crashlytics/android/answers/n;->pB:Z
+    iget-boolean v1, p0, Lcom/crashlytics/android/answers/n;->pA:Z
 
     const-string v2, "enabled"
 
@@ -1721,7 +1721,7 @@
 
     invoke-interface {p2, v1, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -1731,7 +1731,7 @@
 
     invoke-direct {v0, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-boolean v4, p0, Lcom/crashlytics/android/answers/n;->pC:Z
+    iget-boolean v4, p0, Lcom/crashlytics/android/answers/n;->pB:Z
 
     if-eqz v4, :cond_1
 
@@ -1751,11 +1751,11 @@
 
     invoke-interface {p2, v1, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->bil:Z
+    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->biF:Z
 
-    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->py:Z
+    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->px:Z
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -1765,7 +1765,7 @@
 
     invoke-direct {v0, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-boolean v4, p0, Lcom/crashlytics/android/answers/n;->py:Z
+    iget-boolean v4, p0, Lcom/crashlytics/android/answers/n;->px:Z
 
     if-eqz v4, :cond_2
 
@@ -1785,11 +1785,11 @@
 
     invoke-interface {p2, v1, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->bim:Z
+    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->biG:Z
 
-    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->pz:Z
+    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->py:Z
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -1799,7 +1799,7 @@
 
     invoke-direct {v0, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-boolean v4, p0, Lcom/crashlytics/android/answers/n;->pz:Z
+    iget-boolean v4, p0, Lcom/crashlytics/android/answers/n;->py:Z
 
     if-eqz v4, :cond_3
 
@@ -1817,13 +1817,13 @@
 
     invoke-interface {p2, v1, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget p2, p1, Lio/fabric/sdk/android/a/g/b;->pM:I
+    iget p2, p1, Lio/fabric/sdk/android/a/g/b;->pL:I
 
     const/4 v0, 0x1
 
     if-le p2, v0, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -1833,20 +1833,20 @@
 
     new-instance p2, Lcom/crashlytics/android/answers/z;
 
-    iget v0, p1, Lio/fabric/sdk/android/a/g/b;->pM:I
+    iget v0, p1, Lio/fabric/sdk/android/a/g/b;->pL:I
 
     invoke-direct {p2, v0}, Lcom/crashlytics/android/answers/z;-><init>(I)V
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/n;->px:Lcom/crashlytics/android/answers/o;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/n;->pw:Lcom/crashlytics/android/answers/o;
 
     :cond_4
-    iget p1, p1, Lio/fabric/sdk/android/a/g/b;->big:I
+    iget p1, p1, Lio/fabric/sdk/android/a/g/b;->biA:I
 
-    iput p1, p0, Lcom/crashlytics/android/answers/n;->pA:I
+    iput p1, p0, Lcom/crashlytics/android/answers/n;->pz:I
 
     const-wide/16 p1, 0x0
 
-    iget v0, p0, Lcom/crashlytics/android/answers/n;->pA:I
+    iget v0, p0, Lcom/crashlytics/android/answers/n;->pz:I
 
     int-to-long v0, v0
 
@@ -1858,7 +1858,7 @@
 .method public final bZ()V
     .locals 8
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pv:Lio/fabric/sdk/android/a/d/f;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pu:Lio/fabric/sdk/android/a/d/f;
 
     if-nez v0, :cond_0
 
@@ -1877,9 +1877,9 @@
 
     invoke-static {v0, v1}, Lio/fabric/sdk/android/a/b/i;->v(Landroid/content/Context;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->ps:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pr:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Ds()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Di()Ljava/util/List;
 
     move-result-object v0
 
@@ -1921,7 +1921,7 @@
 
     invoke-static {v3, v4}, Lio/fabric/sdk/android/a/b/i;->v(Landroid/content/Context;Ljava/lang/String;)V
 
-    iget-object v3, p0, Lcom/crashlytics/android/answers/n;->pv:Lio/fabric/sdk/android/a/d/f;
+    iget-object v3, p0, Lcom/crashlytics/android/answers/n;->pu:Lio/fabric/sdk/android/a/d/f;
 
     invoke-interface {v3, v0}, Lio/fabric/sdk/android/a/d/f;->h(Ljava/util/List;)Z
 
@@ -1935,16 +1935,16 @@
 
     add-int/2addr v2, v4
 
-    iget-object v4, p0, Lcom/crashlytics/android/answers/n;->ps:Lcom/crashlytics/android/answers/aa;
+    iget-object v4, p0, Lcom/crashlytics/android/answers/n;->pr:Lcom/crashlytics/android/answers/aa;
 
     invoke-virtual {v4, v0}, Lcom/crashlytics/android/answers/aa;->W(Ljava/util/List;)V
 
     :cond_1
     if-eqz v3, :cond_2
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->ps:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pr:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Ds()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Di()Ljava/util/List;
 
     move-result-object v0
     :try_end_0
@@ -1978,9 +1978,9 @@
     :cond_2
     if-nez v2, :cond_3
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->ps:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pr:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Du()V
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Dk()V
 
     :cond_3
     return-void
@@ -1989,9 +1989,9 @@
 .method public final ca()V
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->ps:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pr:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Dt()V
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Dj()V
 
     return-void
 .end method
@@ -2000,7 +2000,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->ps:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pr:Lcom/crashlytics/android/answers/aa;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->cb()Z
 
@@ -2025,7 +2025,7 @@
 .method public final cc()V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pt:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->ps:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -2039,7 +2039,7 @@
 
     invoke-static {v0, v1}, Lio/fabric/sdk/android/a/b/i;->v(Landroid/content/Context;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pt:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->ps:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -2051,7 +2051,7 @@
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pt:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->ps:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/q.smali b/com.discord/smali/com/crashlytics/android/answers/q.smali
index 1f8fb585ab..2c626caf3a 100644
--- a/com.discord/smali/com/crashlytics/android/answers/q.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/q.smali
@@ -6,9 +6,9 @@
 # instance fields
 .field final context:Landroid/content/Context;
 
-.field final pD:Lcom/crashlytics/android/answers/t;
+.field final pC:Lcom/crashlytics/android/answers/t;
 
-.field pE:Lcom/crashlytics/android/answers/p;
+.field pD:Lcom/crashlytics/android/answers/p;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     iput-object p1, p0, Lcom/crashlytics/android/answers/q;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/q;->pD:Lcom/crashlytics/android/answers/t;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/q;->pC:Lcom/crashlytics/android/answers/t;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/s.smali b/com.discord/smali/com/crashlytics/android/answers/s.smali
index 63d69700d1..111b15bf16 100644
--- a/com.discord/smali/com/crashlytics/android/answers/s.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/s.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final pF:Landroid/os/Bundle;
+.field final pE:Landroid/os/Bundle;
 
-.field final pq:Ljava/lang/String;
+.field final pp:Ljava/lang/String;
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/s;->pq:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/s;->pp:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/s;->pF:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/s;->pE:Landroid/os/Bundle;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/t.smali b/com.discord/smali/com/crashlytics/android/answers/t.smali
index 2a463cb837..69639788ec 100644
--- a/com.discord/smali/com/crashlytics/android/answers/t.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/t.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final pG:Ljava/util/Set;
+.field private static final pF:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -187,7 +187,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    sput-object v0, Lcom/crashlytics/android/answers/t;->pG:Ljava/util/Set;
+    sput-object v0, Lcom/crashlytics/android/answers/t;->pF:Ljava/util/Set;
 
     return-void
 .end method
@@ -214,7 +214,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lcom/crashlytics/android/answers/t;->pG:Ljava/util/Set;
+    sget-object v0, Lcom/crashlytics/android/answers/t;->pF:Ljava/util/Set;
 
     invoke-interface {v0, p0}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -652,7 +652,7 @@
 
     invoke-direct {v0, v1, v2}, Ljava/math/BigDecimal;-><init>(J)V
 
-    sget-object p0, Lcom/crashlytics/android/answers/a;->oJ:Ljava/math/BigDecimal;
+    sget-object p0, Lcom/crashlytics/android/answers/a;->oI:Ljava/math/BigDecimal;
 
     invoke-virtual {v0, p0}, Ljava/math/BigDecimal;->divide(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/v.smali b/com.discord/smali/com/crashlytics/android/answers/v.smali
index 26b95e26a3..b839ee169b 100644
--- a/com.discord/smali/com/crashlytics/android/answers/v.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/v.smali
@@ -24,18 +24,6 @@
 
 
 # virtual methods
-.method public final H(Ljava/lang/String;)Lcom/crashlytics/android/answers/v;
-    .locals 2
-
-    iget-object v0, p0, Lcom/crashlytics/android/answers/v;->pH:Lcom/crashlytics/android/answers/b;
-
-    const-string v1, "method"
-
-    invoke-virtual {v0, v1, p1}, Lcom/crashlytics/android/answers/b;->put(Ljava/lang/String;Ljava/lang/String;)V
-
-    return-object p0
-.end method
-
 .method final bT()Ljava/lang/String;
     .locals 1
 
@@ -43,19 +31,3 @@
 
     return-object v0
 .end method
-
-.method public final m(Z)Lcom/crashlytics/android/answers/v;
-    .locals 2
-
-    iget-object v0, p0, Lcom/crashlytics/android/answers/v;->pH:Lcom/crashlytics/android/answers/b;
-
-    invoke-static {p1}, Ljava/lang/Boolean;->toString(Z)Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v1, "success"
-
-    invoke-virtual {v0, v1, p1}, Lcom/crashlytics/android/answers/b;->put(Ljava/lang/String;Ljava/lang/String;)V
-
-    return-object p0
-.end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/w.smali b/com.discord/smali/com/crashlytics/android/answers/w.smali
index 9c492db604..fe548e9d9f 100644
--- a/com.discord/smali/com/crashlytics/android/answers/w.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/w.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field final pH:Lcom/crashlytics/android/answers/b;
+.field public final pG:Lcom/crashlytics/android/answers/b;
 
 
 # direct methods
@@ -27,11 +27,11 @@
 
     new-instance v0, Lcom/crashlytics/android/answers/b;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/w;->oM:Lcom/crashlytics/android/answers/d;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/w;->oL:Lcom/crashlytics/android/answers/d;
 
     invoke-direct {v0, v1}, Lcom/crashlytics/android/answers/b;-><init>(Lcom/crashlytics/android/answers/d;)V
 
-    iput-object v0, p0, Lcom/crashlytics/android/answers/w;->pH:Lcom/crashlytics/android/answers/b;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/w;->pG:Lcom/crashlytics/android/answers/b;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/w;->pH:Lcom/crashlytics/android/answers/b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/w;->pG:Lcom/crashlytics/android/answers/b;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -72,7 +72,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/w;->oO:Lcom/crashlytics/android/answers/b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/w;->oN:Lcom/crashlytics/android/answers/b;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/x.smali b/com.discord/smali/com/crashlytics/android/answers/x.smali
index d2f9f0831d..ed3fd86e8d 100644
--- a/com.discord/smali/com/crashlytics/android/answers/x.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/x.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field final pI:Lio/fabric/sdk/android/a/c/a/a;
+.field final pH:Lio/fabric/sdk/android/a/c/a/a;
 
-.field final pJ:D
+.field final pI:D
 
 .field final random:Ljava/util/Random;
 
@@ -36,11 +36,11 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/x;->pI:Lio/fabric/sdk/android/a/c/a/a;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/x;->pH:Lio/fabric/sdk/android/a/c/a/a;
 
     const-wide p1, 0x3fb999999999999aL    # 0.1
 
-    iput-wide p1, p0, Lcom/crashlytics/android/answers/x;->pJ:D
+    iput-wide p1, p0, Lcom/crashlytics/android/answers/x;->pI:D
 
     iput-object p4, p0, Lcom/crashlytics/android/answers/x;->random:Ljava/util/Random;
 
@@ -61,7 +61,7 @@
 .method public final q(I)J
     .locals 6
 
-    iget-wide v0, p0, Lcom/crashlytics/android/answers/x;->pJ:D
+    iget-wide v0, p0, Lcom/crashlytics/android/answers/x;->pI:D
 
     const-wide/high16 v2, 0x3ff0000000000000L    # 1.0
 
@@ -81,7 +81,7 @@
 
     add-double/2addr v4, v0
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/x;->pI:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/x;->pH:Lio/fabric/sdk/android/a/c/a/a;
 
     invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/c/a/a;->q(I)J
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/y.smali b/com.discord/smali/com/crashlytics/android/answers/y.smali
index 910f383a66..4c2658cc6e 100644
--- a/com.discord/smali/com/crashlytics/android/answers/y.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/y.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field pK:J
+.field pJ:J
 
-.field pL:Lio/fabric/sdk/android/a/c/a/e;
+.field pK:Lio/fabric/sdk/android/a/c/a/e;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/y;->pL:Lio/fabric/sdk/android/a/c/a/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/y;->pK:Lio/fabric/sdk/android/a/c/a/e;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/z$1.smali b/com.discord/smali/com/crashlytics/android/answers/z$1.smali
index 469a54db21..538bbfaa8f 100644
--- a/com.discord/smali/com/crashlytics/android/answers/z$1.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/z$1.smali
@@ -28,6 +28,10 @@
 
     invoke-direct {p0}, Ljava/util/HashSet;-><init>()V
 
+    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qb:Lcom/crashlytics/android/answers/ae$b;
+
+    invoke-virtual {p0, v0}, Lcom/crashlytics/android/answers/z$1;->add(Ljava/lang/Object;)Z
+
     sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qc:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {p0, v0}, Lcom/crashlytics/android/answers/z$1;->add(Ljava/lang/Object;)Z
@@ -40,9 +44,5 @@
 
     invoke-virtual {p0, v0}, Lcom/crashlytics/android/answers/z$1;->add(Ljava/lang/Object;)Z
 
-    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qf:Lcom/crashlytics/android/answers/ae$b;
-
-    invoke-virtual {p0, v0}, Lcom/crashlytics/android/answers/z$1;->add(Ljava/lang/Object;)Z
-
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/answers/z.smali b/com.discord/smali/com/crashlytics/android/answers/z.smali
index 5db0c36cd6..c7f77aaa84 100644
--- a/com.discord/smali/com/crashlytics/android/answers/z.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/z.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final pN:Ljava/util/Set;
+.field static final pM:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field final pM:I
+.field final pL:I
 
 
 # direct methods
@@ -30,7 +30,7 @@
 
     invoke-direct {v0}, Lcom/crashlytics/android/answers/z$1;-><init>()V
 
-    sput-object v0, Lcom/crashlytics/android/answers/z;->pN:Ljava/util/Set;
+    sput-object v0, Lcom/crashlytics/android/answers/z;->pM:Ljava/util/Set;
 
     return-void
 .end method
@@ -40,7 +40,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/crashlytics/android/answers/z;->pM:I
+    iput p1, p0, Lcom/crashlytics/android/answers/z;->pL:I
 
     return-void
 .end method
@@ -50,9 +50,9 @@
 .method public final a(Lcom/crashlytics/android/answers/ae;)Z
     .locals 4
 
-    sget-object v0, Lcom/crashlytics/android/answers/z;->pN:Ljava/util/Set;
+    sget-object v0, Lcom/crashlytics/android/answers/z;->pM:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/crashlytics/android/answers/ae;->pV:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v1, p1, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-interface {v0, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -64,9 +64,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/af;
+    iget-object v0, p1, Lcom/crashlytics/android/answers/ae;->pT:Lcom/crashlytics/android/answers/af;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/af;->qq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/af;->qo:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
@@ -78,15 +78,15 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object p1, p1, Lcom/crashlytics/android/answers/ae;->pU:Lcom/crashlytics/android/answers/af;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/ae;->pT:Lcom/crashlytics/android/answers/af;
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/af;->qn:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/af;->qm:Ljava/lang/String;
 
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
     move-result p1
 
-    iget v3, p0, Lcom/crashlytics/android/answers/z;->pM:I
+    iget v3, p0, Lcom/crashlytics/android/answers/z;->pL:I
 
     rem-int/2addr p1, v3
 
diff --git a/com.discord/smali/com/crashlytics/android/b.smali b/com.discord/smali/com/crashlytics/android/b.smali
index bbd309c83f..190b1372ef 100644
--- a/com.discord/smali/com/crashlytics/android/b.smali
+++ b/com.discord/smali/com/crashlytics/android/b.smali
@@ -24,7 +24,7 @@
 
     move-result-object p1
 
-    iget-boolean p1, p1, Lio/fabric/sdk/android/a/b/l;->bfC:Z
+    iget-boolean p1, p1, Lio/fabric/sdk/android/a/b/l;->bfW:Z
 
     return p1
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/beta/a.smali b/com.discord/smali/com/crashlytics/android/beta/a.smali
index 726f7d5030..72988a422c 100644
--- a/com.discord/smali/com/crashlytics/android/beta/a.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/a.smali
@@ -31,7 +31,7 @@
 .method public final synthetic bS()Ljava/lang/Object;
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/a.smali b/com.discord/smali/com/crashlytics/android/core/a.smali
index 1894f0c3c3..e005a7b6df 100644
--- a/com.discord/smali/com/crashlytics/android/core/a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/a.smali
@@ -6,13 +6,13 @@
 # instance fields
 .field public final installerPackageName:Ljava/lang/String;
 
-.field public final pP:Ljava/lang/String;
+.field public final pO:Ljava/lang/String;
 
 .field public final packageName:Ljava/lang/String;
 
-.field public final qr:Ljava/lang/String;
+.field public final qq:Ljava/lang/String;
 
-.field public final qw:Ljava/lang/String;
+.field public final qv:Ljava/lang/String;
 
 .field public final versionName:Ljava/lang/String;
 
@@ -23,15 +23,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/a;->pP:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/a;->pO:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/a;->qr:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/a;->qq:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/crashlytics/android/core/a;->installerPackageName:Ljava/lang/String;
 
     iput-object p4, p0, Lcom/crashlytics/android/core/a;->packageName:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/a;->qw:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/core/a;->qv:Ljava/lang/String;
 
     iput-object p6, p0, Lcom/crashlytics/android/core/a;->versionName:Ljava/lang/String;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ab.smali b/com.discord/smali/com/crashlytics/android/core/ab.smali
index 337c5a11af..41090f6bed 100644
--- a/com.discord/smali/com/crashlytics/android/core/ab.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ab.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final sH:[Ljava/io/File;
+.field private final sG:[Ljava/io/File;
 
-.field private final sI:Ljava/util/Map;
+.field private final sH:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -20,7 +20,7 @@
     .end annotation
 .end field
 
-.field private final sJ:Ljava/lang/String;
+.field private final sI:Ljava/lang/String;
 
 
 # direct methods
@@ -29,44 +29,32 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ab;->sH:[Ljava/io/File;
+    iput-object p2, p0, Lcom/crashlytics/android/core/ab;->sG:[Ljava/io/File;
 
     new-instance p2, Ljava/util/HashMap;
 
-    sget-object v0, Lcom/crashlytics/android/core/ar;->tj:Ljava/util/Map;
+    sget-object v0, Lcom/crashlytics/android/core/ar;->ti:Ljava/util/Map;
 
     invoke-direct {p2, v0}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ab;->sI:Ljava/util/Map;
+    iput-object p2, p0, Lcom/crashlytics/android/core/ab;->sH:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ab;->sJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ab;->sI:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final cU()Ljava/io/File;
-    .locals 2
-
-    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->sH:[Ljava/io/File;
-
-    const/4 v1, 0x0
-
-    aget-object v0, v0, v1
-
-    return-object v0
-.end method
-
-.method public final cV()[Ljava/io/File;
+.method public final cU()[Ljava/io/File;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->sH:[Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->sG:[Ljava/io/File;
 
     return-object v0
 .end method
 
-.method public final cW()Ljava/util/Map;
+.method public final cV()Ljava/util/Map;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -78,7 +66,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->sI:Ljava/util/Map;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->sH:Ljava/util/Map;
 
     invoke-static {v0}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
 
@@ -87,18 +75,30 @@
     return-object v0
 .end method
 
-.method public final cX()I
+.method public final cW()I
     .locals 1
 
-    sget v0, Lcom/crashlytics/android/core/aq$a;->tg:I
+    sget v0, Lcom/crashlytics/android/core/aq$a;->tf:I
 
     return v0
 .end method
 
+.method public final getFile()Ljava/io/File;
+    .locals 2
+
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->sG:[Ljava/io/File;
+
+    const/4 v1, 0x0
+
+    aget-object v0, v0, v1
+
+    return-object v0
+.end method
+
 .method public final getFileName()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->sH:[Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->sG:[Ljava/io/File;
 
     const/4 v1, 0x0
 
@@ -114,7 +114,7 @@
 .method public final getIdentifier()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->sJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->sI:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -122,7 +122,7 @@
 .method public final remove()V
     .locals 7
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->sH:[Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->sG:[Ljava/io/File;
 
     array-length v1, v0
 
@@ -133,7 +133,7 @@
 
     aget-object v3, v0, v2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ac.smali b/com.discord/smali/com/crashlytics/android/core/ac.smali
index 98bbb88ac7..e738c74da9 100644
--- a/com.discord/smali/com/crashlytics/android/core/ac.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ac.smali
@@ -13,15 +13,15 @@
 
 
 # static fields
-.field private static final sK:Lcom/crashlytics/android/core/ac$b;
+.field private static final sJ:Lcom/crashlytics/android/core/ac$b;
 
 
 # instance fields
 .field private final context:Landroid/content/Context;
 
-.field private final sL:Lcom/crashlytics/android/core/ac$a;
+.field private final sK:Lcom/crashlytics/android/core/ac$a;
 
-.field sM:Lcom/crashlytics/android/core/aa;
+.field sL:Lcom/crashlytics/android/core/aa;
 
 
 # direct methods
@@ -34,7 +34,7 @@
 
     invoke-direct {v0, v1}, Lcom/crashlytics/android/core/ac$b;-><init>(B)V
 
-    sput-object v0, Lcom/crashlytics/android/core/ac;->sK:Lcom/crashlytics/android/core/ac$b;
+    sput-object v0, Lcom/crashlytics/android/core/ac;->sJ:Lcom/crashlytics/android/core/ac$b;
 
     return-void
 .end method
@@ -56,18 +56,18 @@
 
     iput-object p1, p0, Lcom/crashlytics/android/core/ac;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ac;->sL:Lcom/crashlytics/android/core/ac$a;
+    iput-object p2, p0, Lcom/crashlytics/android/core/ac;->sK:Lcom/crashlytics/android/core/ac$a;
 
-    sget-object p1, Lcom/crashlytics/android/core/ac;->sK:Lcom/crashlytics/android/core/ac$b;
+    sget-object p1, Lcom/crashlytics/android/core/ac;->sJ:Lcom/crashlytics/android/core/ac$b;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ac;->sM:Lcom/crashlytics/android/core/aa;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ac;->sL:Lcom/crashlytics/android/core/aa;
 
-    invoke-virtual {p0, p3}, Lcom/crashlytics/android/core/ac;->T(Ljava/lang/String;)V
+    invoke-virtual {p0, p3}, Lcom/crashlytics/android/core/ac;->P(Ljava/lang/String;)V
 
     return-void
 .end method
 
-.method private U(Ljava/lang/String;)Ljava/io/File;
+.method private Q(Ljava/lang/String;)Ljava/io/File;
     .locals 2
 
     new-instance v0, Ljava/lang/StringBuilder;
@@ -88,7 +88,7 @@
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/ac;->sL:Lcom/crashlytics/android/core/ac$a;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ac;->sK:Lcom/crashlytics/android/core/ac$a;
 
     invoke-interface {v1}, Lcom/crashlytics/android/core/ac$a;->cx()Ljava/io/File;
 
@@ -108,23 +108,23 @@
 
     invoke-direct {v0, p1, v1}, Lcom/crashlytics/android/core/ao;-><init>(Ljava/io/File;I)V
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ac;->sM:Lcom/crashlytics/android/core/aa;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ac;->sL:Lcom/crashlytics/android/core/aa;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final T(Ljava/lang/String;)V
+.method final P(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->sM:Lcom/crashlytics/android/core/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->sL:Lcom/crashlytics/android/core/aa;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/aa;->cS()V
 
-    sget-object v0, Lcom/crashlytics/android/core/ac;->sK:Lcom/crashlytics/android/core/ac$b;
+    sget-object v0, Lcom/crashlytics/android/core/ac;->sJ:Lcom/crashlytics/android/core/ac$b;
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ac;->sM:Lcom/crashlytics/android/core/aa;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ac;->sL:Lcom/crashlytics/android/core/aa;
 
     if-nez p1, :cond_0
 
@@ -143,7 +143,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -156,7 +156,7 @@
     return-void
 
     :cond_1
-    invoke-direct {p0, p1}, Lcom/crashlytics/android/core/ac;->U(Ljava/lang/String;)Ljava/io/File;
+    invoke-direct {p0, p1}, Lcom/crashlytics/android/core/ac;->Q(Ljava/lang/String;)Ljava/io/File;
 
     move-result-object p1
 
@@ -176,7 +176,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->sL:Lcom/crashlytics/android/core/ac$a;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->sK:Lcom/crashlytics/android/core/ac$a;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/ac$a;->cx()Ljava/io/File;
 
@@ -238,10 +238,10 @@
     return-void
 .end method
 
-.method final cY()V
+.method final cX()V
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->sM:Lcom/crashlytics/android/core/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->sL:Lcom/crashlytics/android/core/aa;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/aa;->cT()V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ad.smali b/com.discord/smali/com/crashlytics/android/core/ad.smali
index 5abfd6bf93..2afdca4b3d 100644
--- a/com.discord/smali/com/crashlytics/android/core/ad.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ad.smali
@@ -27,7 +27,7 @@
 
 
 # virtual methods
-.method public final cZ()Ljava/lang/String;
+.method public final cY()Ljava/lang/String;
     .locals 4
 
     iget-object v0, p0, Lcom/crashlytics/android/core/ad;->context:Landroid/content/Context;
diff --git a/com.discord/smali/com/crashlytics/android/core/ae$1.smali b/com.discord/smali/com/crashlytics/android/core/ae$1.smali
index 1d6ea9f51d..6ac3252b4d 100644
--- a/com.discord/smali/com/crashlytics/android/core/ae$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ae$1.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final synthetic sO:Lcom/crashlytics/android/core/az;
+.field final synthetic sN:Lcom/crashlytics/android/core/az;
 
 
 # direct methods
@@ -27,11 +27,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ae$1;->sO:Lcom/crashlytics/android/core/az;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ae$1;->sN:Lcom/crashlytics/android/core/az;
 
     invoke-direct {p0}, Lorg/json/JSONObject;-><init>()V
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->sO:Lcom/crashlytics/android/core/az;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->sN:Lcom/crashlytics/android/core/az;
 
     iget-object p1, p1, Lcom/crashlytics/android/core/az;->id:Ljava/lang/String;
 
@@ -39,7 +39,7 @@
 
     invoke-virtual {p0, v0, p1}, Lcom/crashlytics/android/core/ae$1;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->sO:Lcom/crashlytics/android/core/az;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->sN:Lcom/crashlytics/android/core/az;
 
     iget-object p1, p1, Lcom/crashlytics/android/core/az;->name:Ljava/lang/String;
 
@@ -47,7 +47,7 @@
 
     invoke-virtual {p0, v0, p1}, Lcom/crashlytics/android/core/ae$1;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->sO:Lcom/crashlytics/android/core/az;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->sN:Lcom/crashlytics/android/core/az;
 
     iget-object p1, p1, Lcom/crashlytics/android/core/az;->email:Ljava/lang/String;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ae.smali b/com.discord/smali/com/crashlytics/android/core/ae.smali
index d44c6a8888..de99edc083 100644
--- a/com.discord/smali/com/crashlytics/android/core/ae.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ae.smali
@@ -8,7 +8,7 @@
 
 
 # instance fields
-.field private final sN:Ljava/io/File;
+.field private final sM:Ljava/io/File;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ae;->sN:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ae;->sM:Ljava/io/File;
 
     return-void
 .end method
@@ -108,12 +108,12 @@
 
 
 # virtual methods
-.method public final V(Ljava/lang/String;)Lcom/crashlytics/android/core/az;
+.method public final R(Ljava/lang/String;)Lcom/crashlytics/android/core/az;
     .locals 5
 
     const-string v0, "Failed to close user metadata file."
 
-    invoke-virtual {p0, p1}, Lcom/crashlytics/android/core/ae;->W(Ljava/lang/String;)Ljava/io/File;
+    invoke-virtual {p0, p1}, Lcom/crashlytics/android/core/ae;->S(Ljava/lang/String;)Ljava/io/File;
 
     move-result-object p1
 
@@ -123,7 +123,7 @@
 
     if-nez v1, :cond_0
 
-    sget-object p1, Lcom/crashlytics/android/core/az;->tx:Lcom/crashlytics/android/core/az;
+    sget-object p1, Lcom/crashlytics/android/core/az;->tw:Lcom/crashlytics/android/core/az;
 
     return-object p1
 
@@ -200,7 +200,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -214,7 +214,7 @@
 
     invoke-static {v1, v0}, Lio/fabric/sdk/android/a/b/i;->a(Ljava/io/Closeable;Ljava/lang/String;)V
 
-    sget-object p1, Lcom/crashlytics/android/core/az;->tx:Lcom/crashlytics/android/core/az;
+    sget-object p1, Lcom/crashlytics/android/core/az;->tw:Lcom/crashlytics/android/core/az;
 
     return-object p1
 
@@ -224,12 +224,12 @@
     throw p1
 .end method
 
-.method public final W(Ljava/lang/String;)Ljava/io/File;
+.method public final S(Ljava/lang/String;)Ljava/io/File;
     .locals 3
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/ae;->sN:Ljava/io/File;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ae;->sM:Ljava/io/File;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -250,12 +250,12 @@
     return-object v0
 .end method
 
-.method public final X(Ljava/lang/String;)Ljava/io/File;
+.method public final T(Ljava/lang/String;)Ljava/io/File;
     .locals 3
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/ae;->sN:Ljava/io/File;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ae;->sM:Ljava/io/File;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/af.smali b/com.discord/smali/com/crashlytics/android/core/af.smali
index ecfc216897..0aceff54cc 100644
--- a/com.discord/smali/com/crashlytics/android/core/af.smali
+++ b/com.discord/smali/com/crashlytics/android/core/af.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final sP:I
+.field private final sO:I
 
-.field private final sQ:[Lcom/crashlytics/android/core/aw;
+.field private final sP:[Lcom/crashlytics/android/core/aw;
 
-.field private final sR:Lcom/crashlytics/android/core/ag;
+.field private final sQ:Lcom/crashlytics/android/core/ag;
 
 
 # direct methods
@@ -22,15 +22,15 @@
 
     const/16 v0, 0x400
 
-    iput v0, p0, Lcom/crashlytics/android/core/af;->sP:I
+    iput v0, p0, Lcom/crashlytics/android/core/af;->sO:I
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/af;->sQ:[Lcom/crashlytics/android/core/aw;
+    iput-object p1, p0, Lcom/crashlytics/android/core/af;->sP:[Lcom/crashlytics/android/core/aw;
 
     new-instance p1, Lcom/crashlytics/android/core/ag;
 
     invoke-direct {p1, v0}, Lcom/crashlytics/android/core/ag;-><init>(I)V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/af;->sR:Lcom/crashlytics/android/core/ag;
+    iput-object p1, p0, Lcom/crashlytics/android/core/af;->sQ:Lcom/crashlytics/android/core/ag;
 
     return-void
 .end method
@@ -42,14 +42,14 @@
 
     array-length v0, p1
 
-    iget v1, p0, Lcom/crashlytics/android/core/af;->sP:I
+    iget v1, p0, Lcom/crashlytics/android/core/af;->sO:I
 
     if-gt v0, v1, :cond_0
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/af;->sQ:[Lcom/crashlytics/android/core/aw;
+    iget-object v0, p0, Lcom/crashlytics/android/core/af;->sP:[Lcom/crashlytics/android/core/aw;
 
     array-length v1, v0
 
@@ -64,7 +64,7 @@
 
     array-length v5, v3
 
-    iget v6, p0, Lcom/crashlytics/android/core/af;->sP:I
+    iget v6, p0, Lcom/crashlytics/android/core/af;->sO:I
 
     if-le v5, v6, :cond_1
 
@@ -79,11 +79,11 @@
     :cond_1
     array-length p1, v3
 
-    iget v0, p0, Lcom/crashlytics/android/core/af;->sP:I
+    iget v0, p0, Lcom/crashlytics/android/core/af;->sO:I
 
     if-le p1, v0, :cond_2
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/af;->sR:Lcom/crashlytics/android/core/ag;
+    iget-object p1, p0, Lcom/crashlytics/android/core/af;->sQ:Lcom/crashlytics/android/core/ag;
 
     invoke-virtual {p1, v3}, Lcom/crashlytics/android/core/ag;->a([Ljava/lang/StackTraceElement;)[Ljava/lang/StackTraceElement;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ag.smali b/com.discord/smali/com/crashlytics/android/core/ag.smali
index c510b65c67..c09addd12a 100644
--- a/com.discord/smali/com/crashlytics/android/core/ag.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ag.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final sS:I
+.field private final sR:I
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     const/16 p1, 0x400
 
-    iput p1, p0, Lcom/crashlytics/android/core/ag;->sS:I
+    iput p1, p0, Lcom/crashlytics/android/core/ag;->sR:I
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 
     array-length v0, p1
 
-    iget v1, p0, Lcom/crashlytics/android/core/ag;->sS:I
+    iget v1, p0, Lcom/crashlytics/android/core/ag;->sR:I
 
     if-gt v0, v1, :cond_0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ah.smali b/com.discord/smali/com/crashlytics/android/core/ah.smali
index d50756f8fb..230c8b26d2 100644
--- a/com.discord/smali/com/crashlytics/android/core/ah.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ah.smali
@@ -10,7 +10,7 @@
 .method public constructor <init>(Lio/fabric/sdk/android/i;Ljava/lang/String;Ljava/lang/String;Lio/fabric/sdk/android/a/e/e;)V
     .locals 6
 
-    sget v5, Lio/fabric/sdk/android/a/e/c;->bhA:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->bhU:I
 
     move-object v0, p0
 
@@ -40,7 +40,7 @@
 
     invoke-virtual {p0, v1, v2, v0}, Lio/fabric/sdk/android/a/e/d;->k(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
 
-    invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cV()[Ljava/io/File;
+    invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cU()[Ljava/io/File;
 
     move-result-object p1
 
@@ -297,11 +297,11 @@
 .method public final a(Lcom/crashlytics/android/core/u;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/crashlytics/android/core/ah;->CR()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lcom/crashlytics/android/core/ah;->CI()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/u;->pP:Ljava/lang/String;
+    iget-object v1, p1, Lcom/crashlytics/android/core/u;->pO:Ljava/lang/String;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -309,7 +309,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/ah;->oS:Lio/fabric/sdk/android/i;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ah;->oR:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v3}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String;
 
@@ -335,7 +335,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/ah;->oS:Lio/fabric/sdk/android/i;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ah;->oR:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v3}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String;
 
@@ -351,13 +351,13 @@
 
     invoke-virtual {v2, v3, v1}, Lio/fabric/sdk/android/a/e/d;->ac(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/u;->sa:Lcom/crashlytics/android/core/aq;
+    iget-object p1, p1, Lcom/crashlytics/android/core/u;->rZ:Lcom/crashlytics/android/core/aq;
 
     invoke-static {v0, p1}, Lcom/crashlytics/android/core/ah;->a(Lio/fabric/sdk/android/a/e/d;Lcom/crashlytics/android/core/aq;)Lio/fabric/sdk/android/a/e/d;
 
     move-result-object p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -379,11 +379,11 @@
 
     invoke-interface {v0, v2, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->DF()I
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->Dv()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -399,7 +399,7 @@
 
     invoke-interface {v0, v2, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lio/fabric/sdk/android/a/b/v;->dl(I)I
+    invoke-static {p1}, Lio/fabric/sdk/android/a/b/v;->di(I)I
 
     move-result p1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/aj.smali b/com.discord/smali/com/crashlytics/android/core/aj.smali
index 261a6736ad..2539270ea5 100644
--- a/com.discord/smali/com/crashlytics/android/core/aj.smali
+++ b/com.discord/smali/com/crashlytics/android/core/aj.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final sT:Ljava/io/File;
+.field private final sS:Ljava/io/File;
 
 
 # direct methods
@@ -16,25 +16,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/aj;->sT:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/aj;->sS:Ljava/io/File;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final cU()Ljava/io/File;
+.method public final cU()[Ljava/io/File;
     .locals 1
 
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public final cV()[Ljava/io/File;
-    .locals 1
-
-    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->sT:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->sS:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->listFiles()[Ljava/io/File;
 
@@ -43,7 +35,7 @@
     return-object v0
 .end method
 
-.method public final cW()Ljava/util/Map;
+.method public final cV()Ljava/util/Map;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -60,14 +52,22 @@
     return-object v0
 .end method
 
-.method public final cX()I
+.method public final cW()I
     .locals 1
 
-    sget v0, Lcom/crashlytics/android/core/aq$a;->th:I
+    sget v0, Lcom/crashlytics/android/core/aq$a;->tg:I
 
     return v0
 .end method
 
+.method public final getFile()Ljava/io/File;
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
+
 .method public final getFileName()Ljava/lang/String;
     .locals 1
 
@@ -79,7 +79,7 @@
 .method public final getIdentifier()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->sT:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->sS:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->getName()Ljava/lang/String;
 
@@ -91,7 +91,7 @@
 .method public final remove()V
     .locals 8
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->sT:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->sS:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->listFiles()[Ljava/io/File;
 
@@ -108,7 +108,7 @@
 
     aget-object v4, v0, v2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -137,7 +137,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -147,7 +147,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/aj;->sT:Ljava/io/File;
+    iget-object v2, p0, Lcom/crashlytics/android/core/aj;->sS:Ljava/io/File;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -157,7 +157,7 @@
 
     invoke-interface {v0, v3, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->sT:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->sS:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->delete()Z
 
diff --git a/com.discord/smali/com/crashlytics/android/core/al.smali b/com.discord/smali/com/crashlytics/android/core/al.smali
index a2ea1cc3b8..c51664f181 100644
--- a/com.discord/smali/com/crashlytics/android/core/al.smali
+++ b/com.discord/smali/com/crashlytics/android/core/al.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final sU:Lio/fabric/sdk/android/a/f/c;
+.field final sT:Lio/fabric/sdk/android/a/f/c;
 
-.field final sV:Lcom/crashlytics/android/core/l;
+.field final sU:Lcom/crashlytics/android/core/l;
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/al;->sU:Lio/fabric/sdk/android/a/f/c;
+    iput-object p1, p0, Lcom/crashlytics/android/core/al;->sT:Lio/fabric/sdk/android/a/f/c;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/al;->sV:Lcom/crashlytics/android/core/l;
+    iput-object p2, p0, Lcom/crashlytics/android/core/al;->sU:Lcom/crashlytics/android/core/l;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/core/am.smali b/com.discord/smali/com/crashlytics/android/core/am.smali
index b6e556589b..308b297818 100644
--- a/com.discord/smali/com/crashlytics/android/core/am.smali
+++ b/com.discord/smali/com/crashlytics/android/core/am.smali
@@ -6,9 +6,9 @@
 # instance fields
 .field public final path:Ljava/lang/String;
 
-.field public final sW:J
+.field public final sV:J
 
-.field public final sX:Ljava/lang/String;
+.field public final sW:Ljava/lang/String;
 
 .field public final size:J
 
@@ -19,11 +19,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide p1, p0, Lcom/crashlytics/android/core/am;->sW:J
+    iput-wide p1, p0, Lcom/crashlytics/android/core/am;->sV:J
 
     iput-wide p3, p0, Lcom/crashlytics/android/core/am;->size:J
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/am;->sX:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/core/am;->sW:Ljava/lang/String;
 
     iput-object p6, p0, Lcom/crashlytics/android/core/am;->path:Ljava/lang/String;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/an.smali b/com.discord/smali/com/crashlytics/android/core/an.smali
index 5d06eb7162..f01bdd3ba8 100644
--- a/com.discord/smali/com/crashlytics/android/core/an.smali
+++ b/com.discord/smali/com/crashlytics/android/core/an.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final sY:Ljava/util/regex/Pattern;
+.field private static final sX:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -17,15 +17,15 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/an;->sY:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/crashlytics/android/core/an;->sX:Ljava/util/regex/Pattern;
 
     return-void
 .end method
 
-.method public static Y(Ljava/lang/String;)Lcom/crashlytics/android/core/am;
+.method public static U(Ljava/lang/String;)Lcom/crashlytics/android/core/am;
     .locals 11
 
-    sget-object v0, Lcom/crashlytics/android/core/an;->sY:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/crashlytics/android/core/an;->sX:Ljava/util/regex/Pattern;
 
     invoke-virtual {v0, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -98,7 +98,7 @@
     return-object v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ao$1.smali b/com.discord/smali/com/crashlytics/android/core/ao$1.smali
index 9eb2868ec9..dbabb6c40e 100644
--- a/com.discord/smali/com/crashlytics/android/core/ao$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ao$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/crashlytics/android/core/ao;->da()Lcom/crashlytics/android/core/ao$a;
+    value = Lcom/crashlytics/android/core/ao;->cZ()Lcom/crashlytics/android/core/ao$a;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic tc:[B
+.field final synthetic tb:[B
 
-.field final synthetic td:[I
+.field final synthetic tc:[I
 
-.field final synthetic te:Lcom/crashlytics/android/core/ao;
+.field final synthetic td:Lcom/crashlytics/android/core/ao;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/ao;[B[I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ao$1;->te:Lcom/crashlytics/android/core/ao;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ao$1;->td:Lcom/crashlytics/android/core/ao;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ao$1;->tc:[B
+    iput-object p2, p0, Lcom/crashlytics/android/core/ao$1;->tb:[B
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/ao$1;->td:[I
+    iput-object p3, p0, Lcom/crashlytics/android/core/ao$1;->tc:[I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,9 +51,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/ao$1;->tc:[B
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao$1;->tb:[B
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/ao$1;->td:[I
+    iget-object v1, p0, Lcom/crashlytics/android/core/ao$1;->tc:[I
 
     const/4 v2, 0x0
 
@@ -61,7 +61,7 @@
 
     invoke-virtual {p1, v0, v1, p2}, Ljava/io/InputStream;->read([BII)I
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ao$1;->td:[I
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao$1;->tc:[I
 
     aget v1, v0, v2
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ao$a.smali b/com.discord/smali/com/crashlytics/android/core/ao$a.smali
index 479bb49ce2..f374efa076 100644
--- a/com.discord/smali/com/crashlytics/android/core/ao$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ao$a.smali
@@ -17,20 +17,20 @@
 # instance fields
 .field public final offset:I
 
-.field public final qy:[B
+.field public final qx:[B
 
-.field final synthetic te:Lcom/crashlytics/android/core/ao;
+.field final synthetic td:Lcom/crashlytics/android/core/ao;
 
 
 # direct methods
 .method public constructor <init>(Lcom/crashlytics/android/core/ao;[BI)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ao$a;->te:Lcom/crashlytics/android/core/ao;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ao$a;->td:Lcom/crashlytics/android/core/ao;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ao$a;->qy:[B
+    iput-object p2, p0, Lcom/crashlytics/android/core/ao$a;->qx:[B
 
     iput p3, p0, Lcom/crashlytics/android/core/ao$a;->offset:I
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ao.smali b/com.discord/smali/com/crashlytics/android/core/ao.smali
index b4257c8b2c..7131b80d21 100644
--- a/com.discord/smali/com/crashlytics/android/core/ao.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ao.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field private final sZ:Ljava/io/File;
+.field private final sY:Ljava/io/File;
 
-.field private final ta:I
+.field private final sZ:I
 
-.field private tb:Lio/fabric/sdk/android/a/b/u;
+.field private ta:Lio/fabric/sdk/android/a/b/u;
 
 
 # direct methods
@@ -28,19 +28,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ao;->sZ:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ao;->sY:Ljava/io/File;
 
     const/high16 p1, 0x10000
 
-    iput p1, p0, Lcom/crashlytics/android/core/ao;->ta:I
+    iput p1, p0, Lcom/crashlytics/android/core/ao;->sZ:I
 
     return-void
 .end method
 
-.method private da()Lcom/crashlytics/android/core/ao$a;
+.method private cZ()Lcom/crashlytics/android/core/ao$a;
     .locals 7
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->sZ:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->sY:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->exists()Z
 
@@ -53,9 +53,9 @@
     return-object v1
 
     :cond_0
-    invoke-direct {p0}, Lcom/crashlytics/android/core/ao;->db()V
+    invoke-direct {p0}, Lcom/crashlytics/android/core/ao;->da()V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tb:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->ta:Lio/fabric/sdk/android/a/b/u;
 
     if-nez v0, :cond_1
 
@@ -70,14 +70,14 @@
 
     aput v2, v1, v2
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->De()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->CU()I
 
     move-result v0
 
     new-array v0, v0, [B
 
     :try_start_0
-    iget-object v3, p0, Lcom/crashlytics/android/core/ao;->tb:Lio/fabric/sdk/android/a/b/u;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ao;->ta:Lio/fabric/sdk/android/a/b/u;
 
     new-instance v4, Lcom/crashlytics/android/core/ao$1;
 
@@ -92,7 +92,7 @@
     :catch_0
     move-exception v3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -112,21 +112,21 @@
     return-object v3
 .end method
 
-.method private db()V
+.method private da()V
     .locals 4
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tb:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->ta:Lio/fabric/sdk/android/a/b/u;
 
     if-nez v0, :cond_0
 
     :try_start_0
     new-instance v0, Lio/fabric/sdk/android/a/b/u;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/ao;->sZ:Ljava/io/File;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ao;->sY:Ljava/io/File;
 
     invoke-direct {v0, v1}, Lio/fabric/sdk/android/a/b/u;-><init>(Ljava/io/File;)V
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ao;->tb:Lio/fabric/sdk/android/a/b/u;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ao;->ta:Lio/fabric/sdk/android/a/b/u;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -135,7 +135,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -145,7 +145,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/ao;->sZ:Ljava/io/File;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ao;->sY:Ljava/io/File;
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -168,9 +168,9 @@
 
     const-string v0, " "
 
-    invoke-direct {p0}, Lcom/crashlytics/android/core/ao;->db()V
+    invoke-direct {p0}, Lcom/crashlytics/android/core/ao;->da()V
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/ao;->tb:Lio/fabric/sdk/android/a/b/u;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ao;->ta:Lio/fabric/sdk/android/a/b/u;
 
     if-eqz v1, :cond_3
 
@@ -180,7 +180,7 @@
 
     :cond_0
     :try_start_0
-    iget v1, p0, Lcom/crashlytics/android/core/ao;->ta:I
+    iget v1, p0, Lcom/crashlytics/android/core/ao;->sZ:I
 
     div-int/lit8 v1, v1, 0x4
 
@@ -255,14 +255,14 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/crashlytics/android/core/ao;->tb:Lio/fabric/sdk/android/a/b/u;
+    iget-object p2, p0, Lcom/crashlytics/android/core/ao;->ta:Lio/fabric/sdk/android/a/b/u;
 
     array-length p3, p1
 
     invoke-virtual {p2, p1, p3}, Lio/fabric/sdk/android/a/b/u;->m([BI)V
 
     :goto_0
-    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->tb:Lio/fabric/sdk/android/a/b/u;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->ta:Lio/fabric/sdk/android/a/b/u;
 
     invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/u;->isEmpty()Z
 
@@ -270,17 +270,17 @@
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->tb:Lio/fabric/sdk/android/a/b/u;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->ta:Lio/fabric/sdk/android/a/b/u;
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/u;->De()I
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/u;->CU()I
 
     move-result p1
 
-    iget p2, p0, Lcom/crashlytics/android/core/ao;->ta:I
+    iget p2, p0, Lcom/crashlytics/android/core/ao;->sZ:I
 
     if-le p1, p2, :cond_2
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->tb:Lio/fabric/sdk/android/a/b/u;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->ta:Lio/fabric/sdk/android/a/b/u;
 
     invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/u;->remove()V
     :try_end_0
@@ -294,7 +294,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -311,7 +311,7 @@
 .method public final cQ()Lcom/crashlytics/android/core/d;
     .locals 2
 
-    invoke-direct {p0}, Lcom/crashlytics/android/core/ao;->da()Lcom/crashlytics/android/core/ao$a;
+    invoke-direct {p0}, Lcom/crashlytics/android/core/ao;->cZ()Lcom/crashlytics/android/core/ao$a;
 
     move-result-object v0
 
@@ -322,7 +322,7 @@
     return-object v0
 
     :cond_0
-    iget-object v1, v0, Lcom/crashlytics/android/core/ao$a;->qy:[B
+    iget-object v1, v0, Lcom/crashlytics/android/core/ao$a;->qx:[B
 
     iget v0, v0, Lcom/crashlytics/android/core/ao$a;->offset:I
 
@@ -336,7 +336,7 @@
 .method public final cR()[B
     .locals 1
 
-    invoke-direct {p0}, Lcom/crashlytics/android/core/ao;->da()Lcom/crashlytics/android/core/ao$a;
+    invoke-direct {p0}, Lcom/crashlytics/android/core/ao;->cZ()Lcom/crashlytics/android/core/ao$a;
 
     move-result-object v0
 
@@ -347,7 +347,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lcom/crashlytics/android/core/ao$a;->qy:[B
+    iget-object v0, v0, Lcom/crashlytics/android/core/ao$a;->qx:[B
 
     return-object v0
 .end method
@@ -355,7 +355,7 @@
 .method public final cS()V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tb:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->ta:Lio/fabric/sdk/android/a/b/u;
 
     const-string v1, "There was a problem closing the Crashlytics log file."
 
@@ -363,7 +363,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ao;->tb:Lio/fabric/sdk/android/a/b/u;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ao;->ta:Lio/fabric/sdk/android/a/b/u;
 
     return-void
 .end method
@@ -373,7 +373,7 @@
 
     invoke-virtual {p0}, Lcom/crashlytics/android/core/ao;->cS()V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->sZ:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->sY:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->delete()Z
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ap.smali b/com.discord/smali/com/crashlytics/android/core/ap.smali
index fdecaeb68b..f3dc7ee03d 100644
--- a/com.discord/smali/com/crashlytics/android/core/ap.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ap.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final tf:I
+.field private final te:I
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/crashlytics/android/core/ap;->tf:I
+    iput p1, p0, Lcom/crashlytics/android/core/ap;->te:I
 
     return-void
 .end method
@@ -84,7 +84,7 @@
 .method public final a([Ljava/lang/StackTraceElement;)[Ljava/lang/StackTraceElement;
     .locals 11
 
-    iget v0, p0, Lcom/crashlytics/android/core/ap;->tf:I
+    iget v0, p0, Lcom/crashlytics/android/core/ap;->te:I
 
     new-instance v1, Ljava/util/HashMap;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/aq$a.smali b/com.discord/smali/com/crashlytics/android/core/aq$a.smali
index 0470d30410..541a604f8e 100644
--- a/com.discord/smali/com/crashlytics/android/core/aq$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/aq$a.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
-.field public static final tg:I = 0x1
+.field public static final tf:I = 0x1
 
-.field public static final th:I = 0x2
+.field public static final tg:I = 0x2
 
-.field private static final synthetic ti:[I
+.field private static final synthetic th:[I
 
 
 # direct methods
@@ -38,27 +38,27 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/crashlytics/android/core/aq$a;->tg:I
+    sget v1, Lcom/crashlytics/android/core/aq$a;->tf:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/crashlytics/android/core/aq$a;->th:I
+    sget v1, Lcom/crashlytics/android/core/aq$a;->tg:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/crashlytics/android/core/aq$a;->ti:[I
+    sput-object v0, Lcom/crashlytics/android/core/aq$a;->th:[I
 
     return-void
 .end method
 
-.method public static dc()[I
+.method public static db()[I
     .locals 1
 
-    sget-object v0, Lcom/crashlytics/android/core/aq$a;->ti:[I
+    sget-object v0, Lcom/crashlytics/android/core/aq$a;->th:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/aq.smali b/com.discord/smali/com/crashlytics/android/core/aq.smali
index 77ded9fbe0..457eadad97 100644
--- a/com.discord/smali/com/crashlytics/android/core/aq.smali
+++ b/com.discord/smali/com/crashlytics/android/core/aq.smali
@@ -12,13 +12,10 @@
 
 
 # virtual methods
-.method public abstract cU()Ljava/io/File;
+.method public abstract cU()[Ljava/io/File;
 .end method
 
-.method public abstract cV()[Ljava/io/File;
-.end method
-
-.method public abstract cW()Ljava/util/Map;
+.method public abstract cV()Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -30,7 +27,10 @@
     .end annotation
 .end method
 
-.method public abstract cX()I
+.method public abstract cW()I
+.end method
+
+.method public abstract getFile()Ljava/io/File;
 .end method
 
 .method public abstract getFileName()Ljava/lang/String;
diff --git a/com.discord/smali/com/crashlytics/android/core/ar$e.smali b/com.discord/smali/com/crashlytics/android/core/ar$e.smali
index 82b3cd8a3b..2b8fbc2b5f 100644
--- a/com.discord/smali/com/crashlytics/android/core/ar$e.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ar$e.smali
@@ -15,37 +15,37 @@
 
 
 # instance fields
-.field private final sk:F
+.field private final sj:F
 
-.field private final to:Lcom/crashlytics/android/core/ar$d;
+.field private final tn:Lcom/crashlytics/android/core/ar$d;
 
-.field final synthetic tp:Lcom/crashlytics/android/core/ar;
+.field final synthetic to:Lcom/crashlytics/android/core/ar;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/ar;FLcom/crashlytics/android/core/ar$d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ar$e;->tp:Lcom/crashlytics/android/core/ar;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ar$e;->to:Lcom/crashlytics/android/core/ar;
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a/b/h;-><init>()V
 
-    iput p2, p0, Lcom/crashlytics/android/core/ar$e;->sk:F
+    iput p2, p0, Lcom/crashlytics/android/core/ar$e;->sj:F
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/ar$e;->to:Lcom/crashlytics/android/core/ar$d;
+    iput-object p3, p0, Lcom/crashlytics/android/core/ar$e;->tn:Lcom/crashlytics/android/core/ar$d;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final df()V
+.method public final de()V
     .locals 8
 
     const-string v0, "CrashlyticsCore"
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -55,7 +55,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v3, p0, Lcom/crashlytics/android/core/ar$e;->sk:F
+    iget v3, p0, Lcom/crashlytics/android/core/ar$e;->sj:F
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder;
 
@@ -69,7 +69,7 @@
 
     invoke-interface {v1, v0, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/crashlytics/android/core/ar$e;->sk:F
+    iget v1, p0, Lcom/crashlytics/android/core/ar$e;->sj:F
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_2
 
@@ -80,7 +80,7 @@
     if-lez v1, :cond_0
 
     :try_start_1
-    iget v1, p0, Lcom/crashlytics/android/core/ar$e;->sk:F
+    iget v1, p0, Lcom/crashlytics/android/core/ar$e;->sj:F
 
     const/high16 v2, 0x447a0000    # 1000.0f
 
@@ -107,13 +107,13 @@
 
     :cond_0
     :goto_0
-    iget-object v1, p0, Lcom/crashlytics/android/core/ar$e;->tp:Lcom/crashlytics/android/core/ar;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ar$e;->to:Lcom/crashlytics/android/core/ar;
 
-    invoke-virtual {v1}, Lcom/crashlytics/android/core/ar;->dd()Ljava/util/List;
+    invoke-virtual {v1}, Lcom/crashlytics/android/core/ar;->dc()Ljava/util/List;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/ar$e;->tp:Lcom/crashlytics/android/core/ar;
+    iget-object v2, p0, Lcom/crashlytics/android/core/ar$e;->to:Lcom/crashlytics/android/core/ar;
 
     invoke-static {v2}, Lcom/crashlytics/android/core/ar;->b(Lcom/crashlytics/android/core/ar;)Lcom/crashlytics/android/core/ar$b;
 
@@ -131,7 +131,7 @@
 
     if-nez v2, :cond_1
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/ar$e;->to:Lcom/crashlytics/android/core/ar$d;
+    iget-object v2, p0, Lcom/crashlytics/android/core/ar$e;->tn:Lcom/crashlytics/android/core/ar$d;
 
     invoke-interface {v2}, Lcom/crashlytics/android/core/ar$d;->cy()Z
 
@@ -139,7 +139,7 @@
 
     if-nez v2, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -197,7 +197,7 @@
 
     if-nez v3, :cond_4
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/ar$e;->tp:Lcom/crashlytics/android/core/ar;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ar$e;->to:Lcom/crashlytics/android/core/ar;
 
     invoke-static {v3}, Lcom/crashlytics/android/core/ar;->b(Lcom/crashlytics/android/core/ar;)Lcom/crashlytics/android/core/ar$b;
 
@@ -209,7 +209,7 @@
 
     if-nez v3, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -252,16 +252,16 @@
 
     check-cast v3, Lcom/crashlytics/android/core/aq;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/ar$e;->tp:Lcom/crashlytics/android/core/ar;
+    iget-object v4, p0, Lcom/crashlytics/android/core/ar$e;->to:Lcom/crashlytics/android/core/ar;
 
     invoke-virtual {v4, v3}, Lcom/crashlytics/android/core/ar;->a(Lcom/crashlytics/android/core/aq;)Z
 
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/crashlytics/android/core/ar$e;->tp:Lcom/crashlytics/android/core/ar;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ar$e;->to:Lcom/crashlytics/android/core/ar;
 
-    invoke-virtual {v1}, Lcom/crashlytics/android/core/ar;->dd()Ljava/util/List;
+    invoke-virtual {v1}, Lcom/crashlytics/android/core/ar;->dc()Ljava/util/List;
 
     move-result-object v1
 
@@ -271,13 +271,13 @@
 
     if-nez v3, :cond_2
 
-    invoke-static {}, Lcom/crashlytics/android/core/ar;->de()[S
+    invoke-static {}, Lcom/crashlytics/android/core/ar;->dd()[S
 
     move-result-object v3
 
     add-int/lit8 v4, v2, 0x1
 
-    invoke-static {}, Lcom/crashlytics/android/core/ar;->de()[S
+    invoke-static {}, Lcom/crashlytics/android/core/ar;->dd()[S
 
     move-result-object v5
 
@@ -293,7 +293,7 @@
 
     int-to-long v2, v2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -346,7 +346,7 @@
     :catch_2
     move-exception v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -356,7 +356,7 @@
 
     :cond_4
     :goto_4
-    iget-object v0, p0, Lcom/crashlytics/android/core/ar$e;->tp:Lcom/crashlytics/android/core/ar;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ar$e;->to:Lcom/crashlytics/android/core/ar;
 
     invoke-static {v0}, Lcom/crashlytics/android/core/ar;->a(Lcom/crashlytics/android/core/ar;)Ljava/lang/Thread;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ar.smali b/com.discord/smali/com/crashlytics/android/core/ar.smali
index 8a185f649b..63e08a4203 100644
--- a/com.discord/smali/com/crashlytics/android/core/ar.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ar.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field static final tj:Ljava/util/Map;
+.field static final ti:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,21 +27,21 @@
     .end annotation
 .end field
 
-.field private static final tk:[S
+.field private static final tj:[S
 
 
 # instance fields
-.field private final pP:Ljava/lang/String;
+.field private final pO:Ljava/lang/String;
 
-.field private final ri:Lcom/crashlytics/android/core/ar$c;
+.field private final rh:Lcom/crashlytics/android/core/ar$c;
 
-.field private final rj:Lcom/crashlytics/android/core/ar$b;
+.field private final ri:Lcom/crashlytics/android/core/ar$b;
 
-.field private final tl:Ljava/lang/Object;
+.field private final tk:Ljava/lang/Object;
 
-.field private final tm:Lcom/crashlytics/android/core/v;
+.field private final tl:Lcom/crashlytics/android/core/v;
 
-.field private tn:Ljava/lang/Thread;
+.field private tm:Ljava/lang/Thread;
 
 
 # direct methods
@@ -56,7 +56,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/ar;->tj:Ljava/util/Map;
+    sput-object v0, Lcom/crashlytics/android/core/ar;->ti:Ljava/util/Map;
 
     const/4 v0, 0x6
 
@@ -64,7 +64,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/crashlytics/android/core/ar;->tk:[S
+    sput-object v0, Lcom/crashlytics/android/core/ar;->tj:[S
 
     return-void
 
@@ -90,17 +90,17 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ar;->tl:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ar;->tk:Ljava/lang/Object;
 
     if-eqz p2, :cond_0
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ar;->tm:Lcom/crashlytics/android/core/v;
+    iput-object p2, p0, Lcom/crashlytics/android/core/ar;->tl:Lcom/crashlytics/android/core/v;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ar;->pP:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ar;->pO:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/ar;->ri:Lcom/crashlytics/android/core/ar$c;
+    iput-object p3, p0, Lcom/crashlytics/android/core/ar;->rh:Lcom/crashlytics/android/core/ar$c;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/ar;->rj:Lcom/crashlytics/android/core/ar$b;
+    iput-object p4, p0, Lcom/crashlytics/android/core/ar;->ri:Lcom/crashlytics/android/core/ar$b;
 
     return-void
 
@@ -119,7 +119,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ar;->tn:Ljava/lang/Thread;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ar;->tm:Ljava/lang/Thread;
 
     return-object v0
 .end method
@@ -127,15 +127,15 @@
 .method static synthetic b(Lcom/crashlytics/android/core/ar;)Lcom/crashlytics/android/core/ar$b;
     .locals 0
 
-    iget-object p0, p0, Lcom/crashlytics/android/core/ar;->rj:Lcom/crashlytics/android/core/ar$b;
+    iget-object p0, p0, Lcom/crashlytics/android/core/ar;->ri:Lcom/crashlytics/android/core/ar$b;
 
     return-object p0
 .end method
 
-.method static synthetic de()[S
+.method static synthetic dd()[S
     .locals 1
 
-    sget-object v0, Lcom/crashlytics/android/core/ar;->tk:[S
+    sget-object v0, Lcom/crashlytics/android/core/ar;->tj:[S
 
     return-object v0
 .end method
@@ -148,11 +148,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/ar;->tn:Ljava/lang/Thread;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ar;->tm:Ljava/lang/Thread;
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -180,9 +180,9 @@
 
     invoke-direct {p1, v0, p2}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ar;->tn:Ljava/lang/Thread;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ar;->tm:Ljava/lang/Thread;
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/ar;->tn:Ljava/lang/Thread;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ar;->tm:Ljava/lang/Thread;
 
     invoke-virtual {p1}, Ljava/lang/Thread;->start()V
     :try_end_1
@@ -203,7 +203,7 @@
 .method final a(Lcom/crashlytics/android/core/aq;)Z
     .locals 7
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ar;->tl:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ar;->tk:Ljava/lang/Object;
 
     monitor-enter v0
 
@@ -212,17 +212,17 @@
     :try_start_0
     new-instance v2, Lcom/crashlytics/android/core/u;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/ar;->pP:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ar;->pO:Ljava/lang/String;
 
     invoke-direct {v2, v3, p1}, Lcom/crashlytics/android/core/u;-><init>(Ljava/lang/String;Lcom/crashlytics/android/core/aq;)V
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/ar;->tm:Lcom/crashlytics/android/core/v;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ar;->tl:Lcom/crashlytics/android/core/v;
 
     invoke-interface {v3, v2}, Lcom/crashlytics/android/core/v;->a(Lcom/crashlytics/android/core/u;)Z
 
     move-result v2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -280,7 +280,7 @@
     move-exception v2
 
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -312,7 +312,7 @@
     throw p1
 .end method
 
-.method final dd()Ljava/util/List;
+.method final dc()Ljava/util/List;
     .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -323,7 +323,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -333,24 +333,24 @@
 
     invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ar;->tl:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ar;->tk:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/crashlytics/android/core/ar;->ri:Lcom/crashlytics/android/core/ar$c;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ar;->rh:Lcom/crashlytics/android/core/ar$c;
 
     invoke-interface {v1}, Lcom/crashlytics/android/core/ar$c;->cz()[Ljava/io/File;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/ar;->ri:Lcom/crashlytics/android/core/ar$c;
+    iget-object v2, p0, Lcom/crashlytics/android/core/ar;->rh:Lcom/crashlytics/android/core/ar$c;
 
     invoke-interface {v2}, Lcom/crashlytics/android/core/ar$c;->cA()[Ljava/io/File;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/ar;->ri:Lcom/crashlytics/android/core/ar$c;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ar;->rh:Lcom/crashlytics/android/core/ar$c;
 
     invoke-interface {v3}, Lcom/crashlytics/android/core/ar$c;->cB()[Ljava/io/File;
 
@@ -377,7 +377,7 @@
 
     aget-object v7, v1, v6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v8
 
@@ -478,7 +478,7 @@
 
     check-cast v5, Ljava/lang/String;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v6
 
@@ -549,7 +549,7 @@
 
     if-eqz v1, :cond_5
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/as.smali b/com.discord/smali/com/crashlytics/android/core/as.smali
index 24c07e0bc6..10aaff45df 100644
--- a/com.discord/smali/com/crashlytics/android/core/as.smali
+++ b/com.discord/smali/com/crashlytics/android/core/as.smali
@@ -9,11 +9,11 @@
 # instance fields
 .field private final context:Landroid/content/Context;
 
-.field private rm:Ljava/lang/String;
+.field private rl:Ljava/lang/String;
 
-.field private final tq:Lcom/crashlytics/android/core/ay;
+.field private final tp:Lcom/crashlytics/android/core/ay;
 
-.field private tr:Z
+.field private tq:Z
 
 
 # direct methods
@@ -24,21 +24,21 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/core/as;->tr:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/core/as;->tq:Z
 
     iput-object p1, p0, Lcom/crashlytics/android/core/as;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/as;->tq:Lcom/crashlytics/android/core/ay;
+    iput-object p2, p0, Lcom/crashlytics/android/core/as;->tp:Lcom/crashlytics/android/core/ay;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final cZ()Ljava/lang/String;
+.method public final cY()Ljava/lang/String;
     .locals 1
 
-    iget-boolean v0, p0, Lcom/crashlytics/android/core/as;->tr:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/core/as;->tq:Z
 
     if-nez v0, :cond_0
 
@@ -48,25 +48,25 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/as;->rm:Ljava/lang/String;
+    iput-object v0, p0, Lcom/crashlytics/android/core/as;->rl:Ljava/lang/String;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/core/as;->tr:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/core/as;->tq:Z
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/as;->rm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/as;->rl:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/crashlytics/android/core/as;->tq:Lcom/crashlytics/android/core/ay;
+    iget-object v0, p0, Lcom/crashlytics/android/core/as;->tp:Lcom/crashlytics/android/core/ay;
 
     if-eqz v0, :cond_2
 
-    invoke-interface {v0}, Lcom/crashlytics/android/core/ay;->cZ()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/crashlytics/android/core/ay;->cY()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/at.smali b/com.discord/smali/com/crashlytics/android/core/at.smali
index b4378b495f..baa4ee7027 100644
--- a/com.discord/smali/com/crashlytics/android/core/at.smali
+++ b/com.discord/smali/com/crashlytics/android/core/at.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final ts:Lcom/crashlytics/android/core/d;
+.field private static final tr:Lcom/crashlytics/android/core/d;
 
-.field private static final tt:Lcom/crashlytics/android/core/d;
+.field private static final ts:Lcom/crashlytics/android/core/d;
 
 
 # direct methods
@@ -15,24 +15,24 @@
 
     const-string v0, "0"
 
-    invoke-static {v0}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {v0}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/crashlytics/android/core/at;->tr:Lcom/crashlytics/android/core/d;
+
+    const-string v0, "Unity"
+
+    invoke-static {v0}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v0
 
     sput-object v0, Lcom/crashlytics/android/core/at;->ts:Lcom/crashlytics/android/core/d;
 
-    const-string v0, "Unity"
-
-    invoke-static {v0}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/crashlytics/android/core/at;->tt:Lcom/crashlytics/android/core/d;
-
     return-void
 .end method
 
-.method private static Z(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+.method private static V(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
     .locals 0
 
     if-nez p0, :cond_0
@@ -42,7 +42,7 @@
     return-object p0
 
     :cond_0
-    invoke-static {p0}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p0}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object p0
 
@@ -54,7 +54,7 @@
 
     iget-object v0, p0, Lcom/crashlytics/android/core/ax;->className:Ljava/lang/String;
 
-    invoke-static {v0}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {v0}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v0
 
@@ -68,13 +68,13 @@
 
     add-int/2addr v0, v2
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/ax;->tu:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ax;->tt:Ljava/lang/String;
 
     if-eqz v3, :cond_0
 
     const/4 v4, 0x3
 
-    invoke-static {v3}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {v3}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v3
 
@@ -85,7 +85,7 @@
     add-int/2addr v0, v3
 
     :cond_0
-    iget-object v3, p0, Lcom/crashlytics/android/core/ax;->tv:[Ljava/lang/StackTraceElement;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ax;->tu:[Ljava/lang/StackTraceElement;
 
     array-length v4, v3
 
@@ -123,7 +123,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p0, p0, Lcom/crashlytics/android/core/ax;->tw:Lcom/crashlytics/android/core/ax;
+    iget-object p0, p0, Lcom/crashlytics/android/core/ax;->tv:Lcom/crashlytics/android/core/ax;
 
     if-eqz p0, :cond_4
 
@@ -157,7 +157,7 @@
     :goto_1
     if-eqz p0, :cond_3
 
-    iget-object p0, p0, Lcom/crashlytics/android/core/ax;->tw:Lcom/crashlytics/android/core/ax;
+    iget-object p0, p0, Lcom/crashlytics/android/core/ax;->tv:Lcom/crashlytics/android/core/ax;
 
     add-int/lit8 v2, v2, 0x1
 
@@ -282,7 +282,7 @@
 
     add-int/2addr v2, p1
 
-    invoke-static {}, Lcom/crashlytics/android/core/at;->dg()I
+    invoke-static {}, Lcom/crashlytics/android/core/at;->df()I
 
     move-result p0
 
@@ -525,7 +525,7 @@
 
     move-result p0
 
-    invoke-static {p1}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p1}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object p1
 
@@ -660,7 +660,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {v1}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v1
 
@@ -684,7 +684,7 @@
 
     move-result-object v4
 
-    invoke-static {v4}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {v4}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v4
 
@@ -745,7 +745,7 @@
 
     move-result-object p0
 
-    invoke-static {p0}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p0}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object p0
 
@@ -872,7 +872,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p1}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object p1
 
@@ -890,7 +890,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {v0}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v0
 
@@ -972,15 +972,15 @@
 
     move/from16 v7, p10
 
-    invoke-static/range {p2 .. p2}, Lcom/crashlytics/android/core/at;->Z(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static/range {p2 .. p2}, Lcom/crashlytics/android/core/at;->V(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v8
 
-    invoke-static/range {p12 .. p12}, Lcom/crashlytics/android/core/at;->Z(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static/range {p12 .. p12}, Lcom/crashlytics/android/core/at;->V(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v9
 
-    invoke-static/range {p11 .. p11}, Lcom/crashlytics/android/core/at;->Z(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static/range {p11 .. p11}, Lcom/crashlytics/android/core/at;->V(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v10
 
@@ -1241,7 +1241,7 @@
 
     check-cast v2, Ljava/lang/String;
 
-    invoke-static {v2}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {v2}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v2
 
@@ -1319,7 +1319,7 @@
 
     move-object/from16 v3, p14
 
-    invoke-static/range {p13 .. p13}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static/range {p13 .. p13}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v12
 
@@ -1338,7 +1338,7 @@
 
     move-result-object v3
 
-    invoke-static {v3}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {v3}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v3
 
@@ -1347,7 +1347,7 @@
 
     move-object/from16 v3, p10
 
-    iget-object v4, v3, Lcom/crashlytics/android/core/ac;->sM:Lcom/crashlytics/android/core/aa;
+    iget-object v4, v3, Lcom/crashlytics/android/core/ac;->sL:Lcom/crashlytics/android/core/aa;
 
     invoke-interface {v4}, Lcom/crashlytics/android/core/aa;->cQ()Lcom/crashlytics/android/core/d;
 
@@ -1355,7 +1355,7 @@
 
     if-nez v9, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -1366,7 +1366,7 @@
     invoke-interface {v4, v5, v6}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_1
-    invoke-virtual/range {p10 .. p10}, Lcom/crashlytics/android/core/ac;->cY()V
+    invoke-virtual/range {p10 .. p10}, Lcom/crashlytics/android/core/ac;->cX()V
 
     const/16 v3, 0xa
 
@@ -1384,7 +1384,7 @@
 
     add-int/2addr v3, v6
 
-    invoke-static/range {p3 .. p3}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static/range {p3 .. p3}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v4
 
@@ -1509,7 +1509,7 @@
 
     invoke-virtual {v0, v3, v1, v2}, Lcom/crashlytics/android/core/g;->a(IJ)V
 
-    invoke-static/range {p3 .. p3}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static/range {p3 .. p3}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v1
 
@@ -1605,17 +1605,17 @@
 
     invoke-virtual {v0, v12, v13}, Lcom/crashlytics/android/core/g;->f(II)V
 
-    invoke-static {}, Lcom/crashlytics/android/core/at;->dg()I
+    invoke-static {}, Lcom/crashlytics/android/core/at;->df()I
 
     move-result v2
 
     invoke-virtual {v0, v2}, Lcom/crashlytics/android/core/g;->u(I)V
 
-    sget-object v2, Lcom/crashlytics/android/core/at;->ts:Lcom/crashlytics/android/core/d;
+    sget-object v2, Lcom/crashlytics/android/core/at;->tr:Lcom/crashlytics/android/core/d;
 
     invoke-virtual {v0, v4, v2}, Lcom/crashlytics/android/core/g;->a(ILcom/crashlytics/android/core/d;)V
 
-    sget-object v2, Lcom/crashlytics/android/core/at;->ts:Lcom/crashlytics/android/core/d;
+    sget-object v2, Lcom/crashlytics/android/core/at;->tr:Lcom/crashlytics/android/core/d;
 
     invoke-virtual {v0, v13, v2}, Lcom/crashlytics/android/core/g;->a(ILcom/crashlytics/android/core/d;)V
 
@@ -1701,7 +1701,7 @@
 
     check-cast v4, Ljava/lang/String;
 
-    invoke-static {v4}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {v4}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v4
 
@@ -1722,7 +1722,7 @@
     move-object/from16 v11, v18
 
     :cond_5
-    invoke-static {v11}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {v11}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v3
 
@@ -1888,26 +1888,26 @@
 
     iget-object v0, p1, Lcom/crashlytics/android/core/ax;->className:Ljava/lang/String;
 
-    invoke-static {v0}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {v0}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v0
 
     invoke-virtual {p0, p4, v0}, Lcom/crashlytics/android/core/g;->a(ILcom/crashlytics/android/core/d;)V
 
-    iget-object v0, p1, Lcom/crashlytics/android/core/ax;->tu:Ljava/lang/String;
+    iget-object v0, p1, Lcom/crashlytics/android/core/ax;->tt:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
     const/4 v1, 0x3
 
-    invoke-static {v0}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {v0}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v0
 
     invoke-virtual {p0, v1, v0}, Lcom/crashlytics/android/core/g;->a(ILcom/crashlytics/android/core/d;)V
 
     :cond_0
-    iget-object v0, p1, Lcom/crashlytics/android/core/ax;->tv:[Ljava/lang/StackTraceElement;
+    iget-object v0, p1, Lcom/crashlytics/android/core/ax;->tu:[Ljava/lang/StackTraceElement;
 
     array-length v1, v0
 
@@ -1929,7 +1929,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object p1, p1, Lcom/crashlytics/android/core/ax;->tw:Lcom/crashlytics/android/core/ax;
+    iget-object p1, p1, Lcom/crashlytics/android/core/ax;->tv:Lcom/crashlytics/android/core/ax;
 
     if-eqz p1, :cond_4
 
@@ -1945,7 +1945,7 @@
     :goto_2
     if-eqz p1, :cond_3
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/ax;->tw:Lcom/crashlytics/android/core/ax;
+    iget-object p1, p1, Lcom/crashlytics/android/core/ax;->tv:Lcom/crashlytics/android/core/ax;
 
     add-int/lit8 v2, v2, 0x1
 
@@ -1968,7 +1968,7 @@
         }
     .end annotation
 
-    invoke-static {p2}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p2}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object p2
 
@@ -1976,7 +1976,7 @@
 
     invoke-virtual {p0, v0, p2}, Lcom/crashlytics/android/core/g;->a(ILcom/crashlytics/android/core/d;)V
 
-    invoke-static {p1}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p1}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object p1
 
@@ -2004,15 +2004,15 @@
     const-string p1, ""
 
     :cond_0
-    invoke-static {p1}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p1}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object p1
 
-    invoke-static {p2}, Lcom/crashlytics/android/core/at;->Z(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p2}, Lcom/crashlytics/android/core/at;->V(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v0
 
-    invoke-static {p3}, Lcom/crashlytics/android/core/at;->Z(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p3}, Lcom/crashlytics/android/core/at;->V(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v1
 
@@ -2079,29 +2079,29 @@
 
     move/from16 v1, p6
 
-    invoke-static/range {p1 .. p1}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static/range {p1 .. p1}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v2
 
-    invoke-static/range {p2 .. p2}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static/range {p2 .. p2}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v3
 
-    invoke-static/range {p3 .. p3}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static/range {p3 .. p3}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v4
 
-    invoke-static/range {p4 .. p4}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static/range {p4 .. p4}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v5
 
-    invoke-static/range {p5 .. p5}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static/range {p5 .. p5}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v6
 
     if-eqz p7, :cond_0
 
-    invoke-static/range {p7 .. p7}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static/range {p7 .. p7}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object v7
 
@@ -2175,7 +2175,7 @@
 
     if-eqz v7, :cond_1
 
-    sget-object v12, Lcom/crashlytics/android/core/at;->tt:Lcom/crashlytics/android/core/d;
+    sget-object v12, Lcom/crashlytics/android/core/at;->ts:Lcom/crashlytics/android/core/d;
 
     invoke-static {v15, v12}, Lcom/crashlytics/android/core/g;->b(ILcom/crashlytics/android/core/d;)I
 
@@ -2224,7 +2224,7 @@
 
     if-eqz v7, :cond_2
 
-    sget-object v2, Lcom/crashlytics/android/core/at;->tt:Lcom/crashlytics/android/core/d;
+    sget-object v2, Lcom/crashlytics/android/core/at;->ts:Lcom/crashlytics/android/core/d;
 
     invoke-virtual {v0, v15, v2}, Lcom/crashlytics/android/core/g;->a(ILcom/crashlytics/android/core/d;)V
 
@@ -2244,11 +2244,11 @@
         }
     .end annotation
 
-    invoke-static {p1}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p1}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object p1
 
-    invoke-static {p2}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p2}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object p2
 
@@ -2325,7 +2325,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p1}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object p1
 
@@ -2354,10 +2354,10 @@
     return-void
 .end method
 
-.method private static dg()I
+.method private static df()I
     .locals 4
 
-    sget-object v0, Lcom/crashlytics/android/core/at;->ts:Lcom/crashlytics/android/core/d;
+    sget-object v0, Lcom/crashlytics/android/core/at;->tr:Lcom/crashlytics/android/core/d;
 
     const/4 v1, 0x1
 
@@ -2367,7 +2367,7 @@
 
     add-int/lit8 v0, v0, 0x0
 
-    sget-object v1, Lcom/crashlytics/android/core/at;->ts:Lcom/crashlytics/android/core/d;
+    sget-object v1, Lcom/crashlytics/android/core/at;->tr:Lcom/crashlytics/android/core/d;
 
     const/4 v2, 0x2
 
@@ -2393,7 +2393,7 @@
 .method private static m(Ljava/lang/String;Ljava/lang/String;)I
     .locals 1
 
-    invoke-static {p0}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p0}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object p0
 
@@ -2408,7 +2408,7 @@
     const-string p1, ""
 
     :cond_0
-    invoke-static {p1}, Lcom/crashlytics/android/core/d;->N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+    invoke-static {p1}, Lcom/crashlytics/android/core/d;->J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/au.smali b/com.discord/smali/com/crashlytics/android/core/au.smali
index 2225812bc5..110a045fc7 100644
--- a/com.discord/smali/com/crashlytics/android/core/au.smali
+++ b/com.discord/smali/com/crashlytics/android/core/au.smali
@@ -9,9 +9,9 @@
 # instance fields
 .field private final file:Ljava/io/File;
 
-.field private final sH:[Ljava/io/File;
+.field private final sG:[Ljava/io/File;
 
-.field private final sI:Ljava/util/Map;
+.field private final sH:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -61,13 +61,13 @@
 
     aput-object p1, v0, v1
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/au;->sH:[Ljava/io/File;
+    iput-object v0, p0, Lcom/crashlytics/android/core/au;->sG:[Ljava/io/File;
 
     new-instance p1, Ljava/util/HashMap;
 
     invoke-direct {p1, p2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/au;->sI:Ljava/util/Map;
+    iput-object p1, p0, Lcom/crashlytics/android/core/au;->sH:Ljava/util/Map;
 
     iget-object p1, p0, Lcom/crashlytics/android/core/au;->file:Ljava/io/File;
 
@@ -81,9 +81,9 @@
 
     if-nez v2, :cond_0
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/au;->sI:Ljava/util/Map;
+    iget-object p1, p0, Lcom/crashlytics/android/core/au;->sH:Ljava/util/Map;
 
-    sget-object p2, Lcom/crashlytics/android/core/ar;->tj:Ljava/util/Map;
+    sget-object p2, Lcom/crashlytics/android/core/ar;->ti:Ljava/util/Map;
 
     invoke-interface {p1, p2}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
 
@@ -93,23 +93,15 @@
 
 
 # virtual methods
-.method public final cU()Ljava/io/File;
+.method public final cU()[Ljava/io/File;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/au;->file:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->sG:[Ljava/io/File;
 
     return-object v0
 .end method
 
-.method public final cV()[Ljava/io/File;
-    .locals 1
-
-    iget-object v0, p0, Lcom/crashlytics/android/core/au;->sH:[Ljava/io/File;
-
-    return-object v0
-.end method
-
-.method public final cW()Ljava/util/Map;
+.method public final cV()Ljava/util/Map;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -121,7 +113,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/au;->sI:Ljava/util/Map;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->sH:Ljava/util/Map;
 
     invoke-static {v0}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
 
@@ -130,14 +122,22 @@
     return-object v0
 .end method
 
-.method public final cX()I
+.method public final cW()I
     .locals 1
 
-    sget v0, Lcom/crashlytics/android/core/aq$a;->tg:I
+    sget v0, Lcom/crashlytics/android/core/aq$a;->tf:I
 
     return v0
 .end method
 
+.method public final getFile()Ljava/io/File;
+    .locals 1
+
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->file:Ljava/io/File;
+
+    return-object v0
+.end method
+
 .method public final getFileName()Ljava/lang/String;
     .locals 1
 
@@ -177,7 +177,7 @@
 .method public final remove()V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/av.smali b/com.discord/smali/com/crashlytics/android/core/av.smali
index 4ecd4fc03a..aedb58c18e 100644
--- a/com.discord/smali/com/crashlytics/android/core/av.smali
+++ b/com.discord/smali/com/crashlytics/android/core/av.smali
@@ -15,7 +15,7 @@
     return-void
 .end method
 
-.method private static aa(Ljava/lang/String;)Ljava/lang/String;
+.method private static W(Ljava/lang/String;)Ljava/lang/String;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -77,7 +77,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lcom/crashlytics/android/core/av;->aa(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/crashlytics/android/core/av;->W(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ax.smali b/com.discord/smali/com/crashlytics/android/core/ax.smali
index b65431f727..79f1b93422 100644
--- a/com.discord/smali/com/crashlytics/android/core/ax.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ax.smali
@@ -6,11 +6,11 @@
 # instance fields
 .field public final className:Ljava/lang/String;
 
-.field public final tu:Ljava/lang/String;
+.field public final tt:Ljava/lang/String;
 
-.field public final tv:[Ljava/lang/StackTraceElement;
+.field public final tu:[Ljava/lang/StackTraceElement;
 
-.field public final tw:Lcom/crashlytics/android/core/ax;
+.field public final tv:Lcom/crashlytics/android/core/ax;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->tu:Ljava/lang/String;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->tt:Ljava/lang/String;
 
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -43,7 +43,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->tv:[Ljava/lang/StackTraceElement;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->tu:[Ljava/lang/StackTraceElement;
 
     invoke-virtual {p1}, Ljava/lang/Throwable;->getCause()Ljava/lang/Throwable;
 
@@ -61,7 +61,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->tw:Lcom/crashlytics/android/core/ax;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->tv:Lcom/crashlytics/android/core/ax;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/core/ay.smali b/com.discord/smali/com/crashlytics/android/core/ay.smali
index d84bd056c0..ae348ce660 100644
--- a/com.discord/smali/com/crashlytics/android/core/ay.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ay.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract cZ()Ljava/lang/String;
+.method public abstract cY()Ljava/lang/String;
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/core/az.smali b/com.discord/smali/com/crashlytics/android/core/az.smali
index e2cefff6a1..42305e2344 100644
--- a/com.discord/smali/com/crashlytics/android/core/az.smali
+++ b/com.discord/smali/com/crashlytics/android/core/az.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final tx:Lcom/crashlytics/android/core/az;
+.field public static final tw:Lcom/crashlytics/android/core/az;
 
 
 # instance fields
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Lcom/crashlytics/android/core/az;-><init>()V
 
-    sput-object v0, Lcom/crashlytics/android/core/az;->tx:Lcom/crashlytics/android/core/az;
+    sput-object v0, Lcom/crashlytics/android/core/az;->tw:Lcom/crashlytics/android/core/az;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/core/ba.smali b/com.discord/smali/com/crashlytics/android/core/ba.smali
index 41d2242104..a4eac42ad0 100644
--- a/com.discord/smali/com/crashlytics/android/core/ba.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ba.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final ty:Ljava/io/FilenameFilter;
+.field private static final tx:Ljava/io/FilenameFilter;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/crashlytics/android/core/ba$1;-><init>()V
 
-    sput-object v0, Lcom/crashlytics/android/core/ba;->ty:Ljava/io/FilenameFilter;
+    sput-object v0, Lcom/crashlytics/android/core/ba;->tx:Ljava/io/FilenameFilter;
 
     return-void
 .end method
@@ -33,7 +33,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/crashlytics/android/core/ba;->ty:Ljava/io/FilenameFilter;
+    sget-object v0, Lcom/crashlytics/android/core/ba;->tx:Ljava/io/FilenameFilter;
 
     invoke-static {p0, v0, p1, p2}, Lcom/crashlytics/android/core/ba;->a(Ljava/io/File;Ljava/io/FilenameFilter;ILjava/util/Comparator;)I
 
diff --git a/com.discord/smali/com/crashlytics/android/core/bb.smali b/com.discord/smali/com/crashlytics/android/core/bb.smali
index 8f5802ae23..e39a7b9091 100644
--- a/com.discord/smali/com/crashlytics/android/core/bb.smali
+++ b/com.discord/smali/com/crashlytics/android/core/bb.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field static final tA:I = 0xc
+.field static final tA:I = 0x10
 
-.field static final tB:I = 0x10
+.field static final tB:I = 0x1a
 
-.field static final tC:I = 0x1a
+.field static final ty:I = 0xb
 
-.field static final tz:I = 0xb
+.field static final tz:I = 0xc
 
 
 # direct methods
diff --git a/com.discord/smali/com/crashlytics/android/core/c.smali b/com.discord/smali/com/crashlytics/android/core/c.smali
index de57e2c7db..da47301323 100644
--- a/com.discord/smali/com/crashlytics/android/core/c.smali
+++ b/com.discord/smali/com/crashlytics/android/core/c.smali
@@ -14,7 +14,7 @@
 # instance fields
 .field private final context:Landroid/content/Context;
 
-.field private final qx:Lcom/crashlytics/android/core/c$a;
+.field private final qw:Lcom/crashlytics/android/core/c$a;
 
 
 # direct methods
@@ -25,17 +25,17 @@
 
     iput-object p1, p0, Lcom/crashlytics/android/core/c;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/c;->qx:Lcom/crashlytics/android/core/c$a;
+    iput-object p2, p0, Lcom/crashlytics/android/core/c;->qw:Lcom/crashlytics/android/core/c$a;
 
     return-void
 .end method
 
-.method private M(Ljava/lang/String;)Lorg/json/JSONObject;
+.method private I(Ljava/lang/String;)Lorg/json/JSONObject;
     .locals 7
 
     const-string v0, "CrashlyticsCore"
 
-    invoke-static {p1}, Lcom/crashlytics/android/core/an;->Y(Ljava/lang/String;)Lcom/crashlytics/android/core/am;
+    invoke-static {p1}, Lcom/crashlytics/android/core/an;->U(Ljava/lang/String;)Lcom/crashlytics/android/core/am;
 
     move-result-object p1
 
@@ -43,7 +43,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object v2, p1, Lcom/crashlytics/android/core/am;->sX:Ljava/lang/String;
+    iget-object v2, p1, Lcom/crashlytics/android/core/am;->sW:Ljava/lang/String;
 
     const/16 v3, 0x78
 
@@ -96,7 +96,7 @@
 
     :cond_2
     :try_start_0
-    iget-object v2, p0, Lcom/crashlytics/android/core/c;->qx:Lcom/crashlytics/android/core/c$a;
+    iget-object v2, p0, Lcom/crashlytics/android/core/c;->qw:Lcom/crashlytics/android/core/c$a;
 
     invoke-interface {v2, v3}, Lcom/crashlytics/android/core/c$a;->b(Ljava/io/File;)Ljava/lang/String;
 
@@ -111,7 +111,7 @@
 
     const-string v4, "base_address"
 
-    iget-wide v5, p1, Lcom/crashlytics/android/core/am;->sW:J
+    iget-wide v5, p1, Lcom/crashlytics/android/core/am;->sV:J
 
     invoke-virtual {v3, v4, v5, v6}, Lorg/json/JSONObject;->put(Ljava/lang/String;J)Lorg/json/JSONObject;
 
@@ -138,7 +138,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -151,7 +151,7 @@
     :catch_1
     move-exception v2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -238,7 +238,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -280,7 +280,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -338,7 +338,7 @@
 
 
 # virtual methods
-.method final L(Ljava/lang/String;)Lorg/json/JSONArray;
+.method final H(Ljava/lang/String;)Lorg/json/JSONArray;
     .locals 4
 
     new-instance v0, Lorg/json/JSONArray;
@@ -377,7 +377,7 @@
 
     aget-object v2, p1, v1
 
-    invoke-direct {p0, v2}, Lcom/crashlytics/android/core/c;->M(Ljava/lang/String;)Lorg/json/JSONObject;
+    invoke-direct {p0, v2}, Lcom/crashlytics/android/core/c;->I(Ljava/lang/String;)Lorg/json/JSONObject;
 
     move-result-object v2
 
@@ -396,7 +396,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -429,7 +429,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-direct {p0, v1}, Lcom/crashlytics/android/core/c;->M(Ljava/lang/String;)Lorg/json/JSONObject;
+    invoke-direct {p0, v1}, Lcom/crashlytics/android/core/c;->I(Ljava/lang/String;)Lorg/json/JSONObject;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/d.smali b/com.discord/smali/com/crashlytics/android/core/d.smali
index 13cc5aa131..8f0cff6541 100644
--- a/com.discord/smali/com/crashlytics/android/core/d.smali
+++ b/com.discord/smali/com/crashlytics/android/core/d.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field public static final qz:Lcom/crashlytics/android/core/d;
+.field public static final qy:Lcom/crashlytics/android/core/d;
 
 
 # instance fields
-.field private volatile qA:I
+.field final qx:[B
 
-.field final qy:[B
+.field private volatile qz:I
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     invoke-direct {v0, v1}, Lcom/crashlytics/android/core/d;-><init>([B)V
 
-    sput-object v0, Lcom/crashlytics/android/core/d;->qz:Lcom/crashlytics/android/core/d;
+    sput-object v0, Lcom/crashlytics/android/core/d;->qy:Lcom/crashlytics/android/core/d;
 
     return-void
 .end method
@@ -37,14 +37,14 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/crashlytics/android/core/d;->qA:I
+    iput v0, p0, Lcom/crashlytics/android/core/d;->qz:I
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/d;->qy:[B
+    iput-object p1, p0, Lcom/crashlytics/android/core/d;->qx:[B
 
     return-void
 .end method
 
-.method public static N(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
+.method public static J(Ljava/lang/String;)Lcom/crashlytics/android/core/d;
     .locals 2
 
     :try_start_0
@@ -95,7 +95,7 @@
 .method public final a([BIII)V
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/d;->qy:[B
+    iget-object v0, p0, Lcom/crashlytics/android/core/d;->qx:[B
 
     invoke-static {v0, p2, p1, p3, p4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -123,11 +123,11 @@
     :cond_1
     check-cast p1, Lcom/crashlytics/android/core/d;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/d;->qy:[B
+    iget-object v1, p0, Lcom/crashlytics/android/core/d;->qx:[B
 
     array-length v3, v1
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/d;->qy:[B
+    iget-object p1, p1, Lcom/crashlytics/android/core/d;->qx:[B
 
     array-length v4, p1
 
@@ -161,11 +161,11 @@
 .method public final hashCode()I
     .locals 5
 
-    iget v0, p0, Lcom/crashlytics/android/core/d;->qA:I
+    iget v0, p0, Lcom/crashlytics/android/core/d;->qz:I
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/d;->qy:[B
+    iget-object v0, p0, Lcom/crashlytics/android/core/d;->qx:[B
 
     array-length v1, v0
 
@@ -197,7 +197,7 @@
     move v0, v3
 
     :goto_1
-    iput v0, p0, Lcom/crashlytics/android/core/d;->qA:I
+    iput v0, p0, Lcom/crashlytics/android/core/d;->qz:I
 
     :cond_2
     return v0
diff --git a/com.discord/smali/com/crashlytics/android/core/e.smali b/com.discord/smali/com/crashlytics/android/core/e.smali
index d80135174e..2c9c1e8aa5 100644
--- a/com.discord/smali/com/crashlytics/android/core/e.smali
+++ b/com.discord/smali/com/crashlytics/android/core/e.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final qB:Ljava/util/concurrent/atomic/AtomicLong;
+.field private static final qA:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private static qC:Ljava/lang/String;
+.field private static qB:Ljava/lang/String;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;-><init>(J)V
 
-    sput-object v0, Lcom/crashlytics/android/core/e;->qB:Ljava/util/concurrent/atomic/AtomicLong;
+    sput-object v0, Lcom/crashlytics/android/core/e;->qA:Ljava/util/concurrent/atomic/AtomicLong;
 
     return-void
 .end method
@@ -105,7 +105,7 @@
 
     aput-byte v1, v0, v2
 
-    sget-object v1, Lcom/crashlytics/android/core/e;->qB:Ljava/util/concurrent/atomic/AtomicLong;
+    sget-object v1, Lcom/crashlytics/android/core/e;->qA:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
 
@@ -157,7 +157,7 @@
 
     aput-byte v1, v0, v2
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/s;->Dc()Ljava/lang/String;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/s;->CT()Ljava/lang/String;
 
     move-result-object p1
 
@@ -215,7 +215,7 @@
 
     move-result-object p1
 
-    sput-object p1, Lcom/crashlytics/android/core/e;->qC:Ljava/lang/String;
+    sput-object p1, Lcom/crashlytics/android/core/e;->qB:Ljava/lang/String;
 
     return-void
 .end method
@@ -255,7 +255,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/crashlytics/android/core/e;->qC:Ljava/lang/String;
+    sget-object v0, Lcom/crashlytics/android/core/e;->qB:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/core/f.smali b/com.discord/smali/com/crashlytics/android/core/f.smali
index 26173234d8..c0a3ceb223 100644
--- a/com.discord/smali/com/crashlytics/android/core/f.smali
+++ b/com.discord/smali/com/crashlytics/android/core/f.smali
@@ -4,18 +4,18 @@
 
 
 # static fields
-.field public static final qG:Ljava/io/FilenameFilter;
+.field public static final qF:Ljava/io/FilenameFilter;
 
 
 # instance fields
 .field private closed:Z
 
-.field private final qD:Ljava/lang/String;
+.field private final qC:Ljava/lang/String;
+
+.field private qD:Ljava/io/File;
 
 .field private qE:Ljava/io/File;
 
-.field private qF:Ljava/io/File;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -25,7 +25,7 @@
 
     invoke-direct {v0}, Lcom/crashlytics/android/core/f$1;-><init>()V
 
-    sput-object v0, Lcom/crashlytics/android/core/f;->qG:Ljava/io/FilenameFilter;
+    sput-object v0, Lcom/crashlytics/android/core/f;->qF:Ljava/io/FilenameFilter;
 
     return-void
 .end method
@@ -78,7 +78,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/f;->qD:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/f;->qC:Ljava/lang/String;
 
     new-instance p1, Ljava/io/File;
 
@@ -86,7 +86,7 @@
 
     invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/f;->qD:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/f;->qC:Ljava/lang/String;
 
     invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -98,7 +98,7 @@
 
     invoke-direct {p1, p2}, Ljava/io/File;-><init>(Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/f;->qE:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/f;->qD:Ljava/io/File;
 
     return-void
 .end method
@@ -168,7 +168,7 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/f;->qD:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/core/f;->qC:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -182,7 +182,7 @@
 
     invoke-direct {v0, v1}, Ljava/io/File;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/f;->qE:Ljava/io/File;
+    iget-object v1, p0, Lcom/crashlytics/android/core/f;->qD:Ljava/io/File;
 
     invoke-virtual {v1, v0}, Ljava/io/File;->renameTo(Ljava/io/File;)Z
 
@@ -192,9 +192,9 @@
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/crashlytics/android/core/f;->qE:Ljava/io/File;
+    iput-object v1, p0, Lcom/crashlytics/android/core/f;->qD:Ljava/io/File;
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/f;->qF:Ljava/io/File;
+    iput-object v0, p0, Lcom/crashlytics/android/core/f;->qE:Ljava/io/File;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -212,7 +212,7 @@
 
     if-nez v2, :cond_2
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/f;->qE:Ljava/io/File;
+    iget-object v2, p0, Lcom/crashlytics/android/core/f;->qD:Ljava/io/File;
 
     invoke-virtual {v2}, Ljava/io/File;->exists()Z
 
@@ -237,7 +237,7 @@
 
     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/f;->qE:Ljava/io/File;
+    iget-object v4, p0, Lcom/crashlytics/android/core/f;->qD:Ljava/io/File;
 
     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/g.smali b/com.discord/smali/com/crashlytics/android/core/g.smali
index 639f1f24e4..63d579fe74 100644
--- a/com.discord/smali/com/crashlytics/android/core/g.smali
+++ b/com.discord/smali/com/crashlytics/android/core/g.smali
@@ -21,7 +21,7 @@
 
 .field position:I
 
-.field final qH:Ljava/io/OutputStream;
+.field final qG:Ljava/io/OutputStream;
 
 
 # direct methods
@@ -30,7 +30,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/g;->qH:Ljava/io/OutputStream;
+    iput-object p1, p0, Lcom/crashlytics/android/core/g;->qG:Ljava/io/OutputStream;
 
     iput-object p2, p0, Lcom/crashlytics/android/core/g;->buffer:[B
 
@@ -200,7 +200,7 @@
 
     move-result p0
 
-    iget-object v0, p1, Lcom/crashlytics/android/core/d;->qy:[B
+    iget-object v0, p1, Lcom/crashlytics/android/core/d;->qx:[B
 
     array-length v0, v0
 
@@ -208,7 +208,7 @@
 
     move-result v0
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/d;->qy:[B
+    iget-object p1, p1, Lcom/crashlytics/android/core/d;->qx:[B
 
     array-length p1, p1
 
@@ -489,13 +489,13 @@
 
     invoke-virtual {p0, p1, v0}, Lcom/crashlytics/android/core/g;->f(II)V
 
-    iget-object p1, p2, Lcom/crashlytics/android/core/d;->qy:[B
+    iget-object p1, p2, Lcom/crashlytics/android/core/d;->qx:[B
 
     array-length p1, p1
 
     invoke-virtual {p0, p1}, Lcom/crashlytics/android/core/g;->u(I)V
 
-    iget-object p1, p2, Lcom/crashlytics/android/core/d;->qy:[B
+    iget-object p1, p2, Lcom/crashlytics/android/core/d;->qx:[B
 
     array-length p1, p1
 
@@ -553,7 +553,7 @@
     :cond_1
     new-instance v0, Ljava/io/ByteArrayInputStream;
 
-    iget-object p2, p2, Lcom/crashlytics/android/core/d;->qy:[B
+    iget-object p2, p2, Lcom/crashlytics/android/core/d;->qx:[B
 
     invoke-direct {v0, p2}, Ljava/io/ByteArrayInputStream;-><init>([B)V
 
@@ -584,7 +584,7 @@
 
     if-ne v1, p2, :cond_2
 
-    iget-object p2, p0, Lcom/crashlytics/android/core/g;->qH:Ljava/io/OutputStream;
+    iget-object p2, p0, Lcom/crashlytics/android/core/g;->qG:Ljava/io/OutputStream;
 
     iget-object v2, p0, Lcom/crashlytics/android/core/g;->buffer:[B
 
@@ -692,7 +692,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/g;->qH:Ljava/io/OutputStream;
+    iget-object v0, p0, Lcom/crashlytics/android/core/g;->qG:Ljava/io/OutputStream;
 
     if-eqz v0, :cond_0
 
@@ -741,7 +741,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/g;->qH:Ljava/io/OutputStream;
+    iget-object v0, p0, Lcom/crashlytics/android/core/g;->qG:Ljava/io/OutputStream;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/h$1.smali b/com.discord/smali/com/crashlytics/android/core/h$1.smali
index fe7add2b86..2c6e907d3d 100644
--- a/com.discord/smali/com/crashlytics/android/core/h$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/h$1.smali
@@ -15,14 +15,14 @@
 
 
 # static fields
-.field static final synthetic qK:[I
+.field static final synthetic qJ:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 3
 
-    invoke-static {}, Lcom/crashlytics/android/core/aq$a;->dc()[I
+    invoke-static {}, Lcom/crashlytics/android/core/aq$a;->db()[I
 
     move-result-object v0
 
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/crashlytics/android/core/h$1;->qK:[I
+    sput-object v0, Lcom/crashlytics/android/core/h$1;->qJ:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/crashlytics/android/core/h$1;->qK:[I
+    sget-object v1, Lcom/crashlytics/android/core/h$1;->qJ:[I
 
-    sget v2, Lcom/crashlytics/android/core/aq$a;->tg:I
+    sget v2, Lcom/crashlytics/android/core/aq$a;->tf:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/crashlytics/android/core/h$1;->qK:[I
+    sget-object v1, Lcom/crashlytics/android/core/h$1;->qJ:[I
 
-    sget v2, Lcom/crashlytics/android/core/aq$a;->th:I
+    sget v2, Lcom/crashlytics/android/core/aq$a;->tg:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/h.smali b/com.discord/smali/com/crashlytics/android/core/h.smali
index 057add03d9..fd026ccb58 100644
--- a/com.discord/smali/com/crashlytics/android/core/h.smali
+++ b/com.discord/smali/com/crashlytics/android/core/h.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final qI:Lcom/crashlytics/android/core/x;
+.field private final qH:Lcom/crashlytics/android/core/x;
 
-.field private final qJ:Lcom/crashlytics/android/core/ah;
+.field private final qI:Lcom/crashlytics/android/core/ah;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/h;->qI:Lcom/crashlytics/android/core/x;
+    iput-object p1, p0, Lcom/crashlytics/android/core/h;->qH:Lcom/crashlytics/android/core/x;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/h;->qJ:Lcom/crashlytics/android/core/ah;
+    iput-object p2, p0, Lcom/crashlytics/android/core/h;->qI:Lcom/crashlytics/android/core/ah;
 
     return-void
 .end method
@@ -30,11 +30,11 @@
 .method public final a(Lcom/crashlytics/android/core/u;)Z
     .locals 3
 
-    sget-object v0, Lcom/crashlytics/android/core/h$1;->qK:[I
+    sget-object v0, Lcom/crashlytics/android/core/h$1;->qJ:[I
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/u;->sa:Lcom/crashlytics/android/core/aq;
+    iget-object v1, p1, Lcom/crashlytics/android/core/u;->rZ:Lcom/crashlytics/android/core/aq;
 
-    invoke-interface {v1}, Lcom/crashlytics/android/core/aq;->cX()I
+    invoke-interface {v1}, Lcom/crashlytics/android/core/aq;->cW()I
 
     move-result v1
 
@@ -55,14 +55,14 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/h;->qJ:Lcom/crashlytics/android/core/ah;
+    iget-object v0, p0, Lcom/crashlytics/android/core/h;->qI:Lcom/crashlytics/android/core/ah;
 
     invoke-virtual {v0, p1}, Lcom/crashlytics/android/core/ah;->a(Lcom/crashlytics/android/core/u;)Z
 
     return v2
 
     :cond_1
-    iget-object v0, p0, Lcom/crashlytics/android/core/h;->qI:Lcom/crashlytics/android/core/x;
+    iget-object v0, p0, Lcom/crashlytics/android/core/h;->qH:Lcom/crashlytics/android/core/x;
 
     invoke-virtual {v0, p1}, Lcom/crashlytics/android/core/x;->a(Lcom/crashlytics/android/core/u;)Z
 
diff --git a/com.discord/smali/com/crashlytics/android/core/i$1.smali b/com.discord/smali/com/crashlytics/android/core/i$1.smali
index ae30acd537..f8446daa05 100644
--- a/com.discord/smali/com/crashlytics/android/core/i$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/i$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic qN:Lcom/crashlytics/android/core/i$b;
+.field final synthetic qM:Lcom/crashlytics/android/core/i$b;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/i$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/i$1;->qN:Lcom/crashlytics/android/core/i$b;
+    iput-object p1, p0, Lcom/crashlytics/android/core/i$1;->qM:Lcom/crashlytics/android/core/i$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,11 +37,11 @@
 .method public final onClick(Landroid/content/DialogInterface;I)V
     .locals 1
 
-    iget-object p2, p0, Lcom/crashlytics/android/core/i$1;->qN:Lcom/crashlytics/android/core/i$b;
+    iget-object p2, p0, Lcom/crashlytics/android/core/i$1;->qM:Lcom/crashlytics/android/core/i$b;
 
     const/4 v0, 0x1
 
-    invoke-virtual {p2, v0}, Lcom/crashlytics/android/core/i$b;->o(Z)V
+    invoke-virtual {p2, v0}, Lcom/crashlytics/android/core/i$b;->m(Z)V
 
     invoke-interface {p1}, Landroid/content/DialogInterface;->dismiss()V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/i$2.smali b/com.discord/smali/com/crashlytics/android/core/i$2.smali
index f376ab3e59..6bd167e747 100644
--- a/com.discord/smali/com/crashlytics/android/core/i$2.smali
+++ b/com.discord/smali/com/crashlytics/android/core/i$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic qN:Lcom/crashlytics/android/core/i$b;
+.field final synthetic qM:Lcom/crashlytics/android/core/i$b;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/i$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/i$2;->qN:Lcom/crashlytics/android/core/i$b;
+    iput-object p1, p0, Lcom/crashlytics/android/core/i$2;->qM:Lcom/crashlytics/android/core/i$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,11 +37,11 @@
 .method public final onClick(Landroid/content/DialogInterface;I)V
     .locals 1
 
-    iget-object p2, p0, Lcom/crashlytics/android/core/i$2;->qN:Lcom/crashlytics/android/core/i$b;
+    iget-object p2, p0, Lcom/crashlytics/android/core/i$2;->qM:Lcom/crashlytics/android/core/i$b;
 
     const/4 v0, 0x0
 
-    invoke-virtual {p2, v0}, Lcom/crashlytics/android/core/i$b;->o(Z)V
+    invoke-virtual {p2, v0}, Lcom/crashlytics/android/core/i$b;->m(Z)V
 
     invoke-interface {p1}, Landroid/content/DialogInterface;->dismiss()V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/i$3.smali b/com.discord/smali/com/crashlytics/android/core/i$3.smali
index e8d974f6cc..e57a79787d 100644
--- a/com.discord/smali/com/crashlytics/android/core/i$3.smali
+++ b/com.discord/smali/com/crashlytics/android/core/i$3.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic qN:Lcom/crashlytics/android/core/i$b;
+.field final synthetic qM:Lcom/crashlytics/android/core/i$b;
 
-.field final synthetic qO:Lcom/crashlytics/android/core/i$a;
+.field final synthetic qN:Lcom/crashlytics/android/core/i$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/i$a;Lcom/crashlytics/android/core/i$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/i$3;->qO:Lcom/crashlytics/android/core/i$a;
+    iput-object p1, p0, Lcom/crashlytics/android/core/i$3;->qN:Lcom/crashlytics/android/core/i$a;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/i$3;->qN:Lcom/crashlytics/android/core/i$b;
+    iput-object p2, p0, Lcom/crashlytics/android/core/i$3;->qM:Lcom/crashlytics/android/core/i$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,15 +41,15 @@
 .method public final onClick(Landroid/content/DialogInterface;I)V
     .locals 1
 
-    iget-object p2, p0, Lcom/crashlytics/android/core/i$3;->qO:Lcom/crashlytics/android/core/i$a;
+    iget-object p2, p0, Lcom/crashlytics/android/core/i$3;->qN:Lcom/crashlytics/android/core/i$a;
 
     invoke-interface {p2}, Lcom/crashlytics/android/core/i$a;->cl()V
 
-    iget-object p2, p0, Lcom/crashlytics/android/core/i$3;->qN:Lcom/crashlytics/android/core/i$b;
+    iget-object p2, p0, Lcom/crashlytics/android/core/i$3;->qM:Lcom/crashlytics/android/core/i$b;
 
     const/4 v0, 0x1
 
-    invoke-virtual {p2, v0}, Lcom/crashlytics/android/core/i$b;->o(Z)V
+    invoke-virtual {p2, v0}, Lcom/crashlytics/android/core/i$b;->m(Z)V
 
     invoke-interface {p1}, Landroid/content/DialogInterface;->dismiss()V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/i$b.smali b/com.discord/smali/com/crashlytics/android/core/i$b.smali
index 808016f3ac..5c596e928d 100644
--- a/com.discord/smali/com/crashlytics/android/core/i$b.smali
+++ b/com.discord/smali/com/crashlytics/android/core/i$b.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field qP:Z
+.field qO:Z
 
-.field final qQ:Ljava/util/concurrent/CountDownLatch;
+.field final qP:Ljava/util/concurrent/CountDownLatch;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/core/i$b;->qP:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/core/i$b;->qO:Z
 
     new-instance v0, Ljava/util/concurrent/CountDownLatch;
 
@@ -36,7 +36,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/i$b;->qQ:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lcom/crashlytics/android/core/i$b;->qP:Ljava/util/concurrent/CountDownLatch;
 
     return-void
 .end method
@@ -51,12 +51,12 @@
 
 
 # virtual methods
-.method final o(Z)V
+.method final m(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/crashlytics/android/core/i$b;->qP:Z
+    iput-boolean p1, p0, Lcom/crashlytics/android/core/i$b;->qO:Z
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/i$b;->qQ:Ljava/util/concurrent/CountDownLatch;
+    iget-object p1, p0, Lcom/crashlytics/android/core/i$b;->qP:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {p1}, Ljava/util/concurrent/CountDownLatch;->countDown()V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/i.smali b/com.discord/smali/com/crashlytics/android/core/i.smali
index b1bb0359ed..6734e9bcee 100644
--- a/com.discord/smali/com/crashlytics/android/core/i.smali
+++ b/com.discord/smali/com/crashlytics/android/core/i.smali
@@ -13,9 +13,9 @@
 
 
 # instance fields
-.field final qL:Lcom/crashlytics/android/core/i$b;
+.field final qK:Lcom/crashlytics/android/core/i$b;
 
-.field final qM:Landroid/app/AlertDialog$Builder;
+.field final qL:Landroid/app/AlertDialog$Builder;
 
 
 # direct methods
@@ -24,9 +24,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/i;->qL:Lcom/crashlytics/android/core/i$b;
+    iput-object p2, p0, Lcom/crashlytics/android/core/i;->qK:Lcom/crashlytics/android/core/i$b;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/i;->qM:Landroid/app/AlertDialog$Builder;
+    iput-object p1, p0, Lcom/crashlytics/android/core/i;->qL:Landroid/app/AlertDialog$Builder;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/core/j$1.smali b/com.discord/smali/com/crashlytics/android/core/j$1.smali
index ae9e17c3af..22b147317c 100644
--- a/com.discord/smali/com/crashlytics/android/core/j$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/j$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic qR:Ljava/lang/Runnable;
+.field final synthetic qQ:Ljava/lang/Runnable;
 
-.field final synthetic qS:Lcom/crashlytics/android/core/j;
+.field final synthetic qR:Lcom/crashlytics/android/core/j;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/j;Ljava/lang/Runnable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/j$1;->qS:Lcom/crashlytics/android/core/j;
+    iput-object p1, p0, Lcom/crashlytics/android/core/j$1;->qR:Lcom/crashlytics/android/core/j;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/j$1;->qR:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/crashlytics/android/core/j$1;->qQ:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/j$1;->qR:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/crashlytics/android/core/j$1;->qQ:Ljava/lang/Runnable;
 
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
     :try_end_0
@@ -53,7 +53,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/j$2.smali b/com.discord/smali/com/crashlytics/android/core/j$2.smali
index 57ea6cfe9b..dde118d210 100644
--- a/com.discord/smali/com/crashlytics/android/core/j$2.smali
+++ b/com.discord/smali/com/crashlytics/android/core/j$2.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field final synthetic qS:Lcom/crashlytics/android/core/j;
+.field final synthetic qR:Lcom/crashlytics/android/core/j;
 
 .field final synthetic val$callable:Ljava/util/concurrent/Callable;
 
@@ -35,7 +35,7 @@
 .method constructor <init>(Lcom/crashlytics/android/core/j;Ljava/util/concurrent/Callable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/j$2;->qS:Lcom/crashlytics/android/core/j;
+    iput-object p1, p0, Lcom/crashlytics/android/core/j$2;->qR:Lcom/crashlytics/android/core/j;
 
     iput-object p2, p0, Lcom/crashlytics/android/core/j$2;->val$callable:Ljava/util/concurrent/Callable;
 
@@ -74,7 +74,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/j.smali b/com.discord/smali/com/crashlytics/android/core/j.smali
index 4ab2eaf3f7..307734faf0 100644
--- a/com.discord/smali/com/crashlytics/android/core/j.smali
+++ b/com.discord/smali/com/crashlytics/android/core/j.smali
@@ -82,7 +82,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -93,7 +93,7 @@
     return-object v1
 
     :catch_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -132,7 +132,7 @@
     return-object p1
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -177,7 +177,7 @@
     return-object p1
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$10$1.smali b/com.discord/smali/com/crashlytics/android/core/k$10$1.smali
index 06864b6ca9..7fd1e81bb6 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$10$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$10$1.smali
@@ -37,7 +37,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$10$1;->this$1:Lcom/crashlytics/android/core/k$10;
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/k$10;->ry:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$10;->rx:Ljava/lang/String;
 
     const-string v0, "session_id"
 
@@ -45,7 +45,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$10$1;->this$1:Lcom/crashlytics/android/core/k$10;
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/k$10;->rz:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$10;->ry:Ljava/lang/String;
 
     const-string v0, "generator"
 
@@ -53,7 +53,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$10$1;->this$1:Lcom/crashlytics/android/core/k$10;
 
-    iget-wide v0, p1, Lcom/crashlytics/android/core/k$10;->rA:J
+    iget-wide v0, p1, Lcom/crashlytics/android/core/k$10;->rz:J
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$10.smali b/com.discord/smali/com/crashlytics/android/core/k$10.smali
index 255a99340f..411ec72679 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$10.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$10.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field final synthetic rA:J
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rx:Ljava/lang/String;
 
 .field final synthetic ry:Ljava/lang/String;
 
-.field final synthetic rz:Ljava/lang/String;
+.field final synthetic rz:J
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;Ljava/lang/String;Ljava/lang/String;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$10;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$10;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$10;->ry:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$10;->rx:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$10;->rz:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$10;->ry:Ljava/lang/String;
 
-    iput-wide p4, p0, Lcom/crashlytics/android/core/k$10;->rA:J
+    iput-wide p4, p0, Lcom/crashlytics/android/core/k$10;->rz:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$11.smali b/com.discord/smali/com/crashlytics/android/core/k$11.smali
index 6dc121a302..247cbdf0b3 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$11.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$11.smali
@@ -18,34 +18,34 @@
 
 
 # instance fields
+.field final synthetic rA:Ljava/lang/String;
+
 .field final synthetic rB:Ljava/lang/String;
 
 .field final synthetic rC:Ljava/lang/String;
 
 .field final synthetic rD:Ljava/lang/String;
 
-.field final synthetic rE:Ljava/lang/String;
+.field final synthetic rE:I
 
-.field final synthetic rF:I
-
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$11;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$11;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$11;->rB:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$11;->rA:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$11;->rC:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$11;->rB:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$11;->rD:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$11;->rC:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/k$11;->rE:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/core/k$11;->rD:Ljava/lang/String;
 
-    iput p6, p0, Lcom/crashlytics/android/core/k$11;->rF:I
+    iput p6, p0, Lcom/crashlytics/android/core/k$11;->rE:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -62,25 +62,25 @@
         }
     .end annotation
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$11;->rB:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$11;->rA:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$11;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$11;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v0}, Lcom/crashlytics/android/core/k;->f(Lcom/crashlytics/android/core/k;)Lcom/crashlytics/android/core/a;
 
     move-result-object v0
 
-    iget-object v2, v0, Lcom/crashlytics/android/core/a;->pP:Ljava/lang/String;
+    iget-object v2, v0, Lcom/crashlytics/android/core/a;->pO:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$11;->rC:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$11;->rB:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/k$11;->rD:Ljava/lang/String;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k$11;->rC:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/crashlytics/android/core/k$11;->rE:Ljava/lang/String;
+    iget-object v5, p0, Lcom/crashlytics/android/core/k$11;->rD:Ljava/lang/String;
 
-    iget v6, p0, Lcom/crashlytics/android/core/k$11;->rF:I
+    iget v6, p0, Lcom/crashlytics/android/core/k$11;->rE:I
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$11;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$11;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v0}, Lcom/crashlytics/android/core/k;->g(Lcom/crashlytics/android/core/k;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$13$1.smali b/com.discord/smali/com/crashlytics/android/core/k$13$1.smali
index 4c61120f83..c24d62dae2 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$13$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$13$1.smali
@@ -37,7 +37,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$13$1;->this$1:Lcom/crashlytics/android/core/k$13;
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rB:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rA:Ljava/lang/String;
 
     const-string v0, "app_identifier"
 
@@ -45,13 +45,13 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$13$1;->this$1:Lcom/crashlytics/android/core/k$13;
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rt:Lcom/crashlytics/android/core/k;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {p1}, Lcom/crashlytics/android/core/k;->f(Lcom/crashlytics/android/core/k;)Lcom/crashlytics/android/core/a;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/a;->pP:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/a;->pO:Ljava/lang/String;
 
     const-string v0, "api_key"
 
@@ -59,7 +59,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$13$1;->this$1:Lcom/crashlytics/android/core/k$13;
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rC:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rB:Ljava/lang/String;
 
     const-string v0, "version_code"
 
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$13$1;->this$1:Lcom/crashlytics/android/core/k$13;
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rD:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rC:Ljava/lang/String;
 
     const-string v0, "version_name"
 
@@ -75,7 +75,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$13$1;->this$1:Lcom/crashlytics/android/core/k$13;
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rE:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rD:Ljava/lang/String;
 
     const-string v0, "install_uuid"
 
@@ -83,7 +83,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$13$1;->this$1:Lcom/crashlytics/android/core/k$13;
 
-    iget p1, p1, Lcom/crashlytics/android/core/k$13;->rF:I
+    iget p1, p1, Lcom/crashlytics/android/core/k$13;->rE:I
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -95,7 +95,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$13$1;->this$1:Lcom/crashlytics/android/core/k$13;
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rt:Lcom/crashlytics/android/core/k;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {p1}, Lcom/crashlytics/android/core/k;->g(Lcom/crashlytics/android/core/k;)Ljava/lang/String;
 
@@ -114,7 +114,7 @@
     :cond_0
     iget-object p1, p0, Lcom/crashlytics/android/core/k$13$1;->this$1:Lcom/crashlytics/android/core/k$13;
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rt:Lcom/crashlytics/android/core/k;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {p1}, Lcom/crashlytics/android/core/k;->g(Lcom/crashlytics/android/core/k;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$13.smali b/com.discord/smali/com/crashlytics/android/core/k$13.smali
index 485ba7c8c7..8da7315b51 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$13.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$13.smali
@@ -18,34 +18,34 @@
 
 
 # instance fields
+.field final synthetic rA:Ljava/lang/String;
+
 .field final synthetic rB:Ljava/lang/String;
 
 .field final synthetic rC:Ljava/lang/String;
 
 .field final synthetic rD:Ljava/lang/String;
 
-.field final synthetic rE:Ljava/lang/String;
+.field final synthetic rE:I
 
-.field final synthetic rF:I
-
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$13;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$13;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$13;->rB:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$13;->rA:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$13;->rC:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$13;->rB:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$13;->rD:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$13;->rC:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/k$13;->rE:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/core/k$13;->rD:Ljava/lang/String;
 
-    iput p6, p0, Lcom/crashlytics/android/core/k$13;->rF:I
+    iput p6, p0, Lcom/crashlytics/android/core/k$13;->rE:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$14.smali b/com.discord/smali/com/crashlytics/android/core/k$14.smali
index c234fdf82c..bbb0efcb49 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$14.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$14.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic rG:Z
+.field final synthetic rF:Z
 
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$14;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$14;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-boolean p2, p0, Lcom/crashlytics/android/core/k$14;->rG:Z
+    iput-boolean p2, p0, Lcom/crashlytics/android/core/k$14;->rF:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +50,7 @@
 
     sget-object v1, Landroid/os/Build$VERSION;->CODENAME:Ljava/lang/String;
 
-    iget-boolean v2, p0, Lcom/crashlytics/android/core/k$14;->rG:Z
+    iget-boolean v2, p0, Lcom/crashlytics/android/core/k$14;->rF:Z
 
     invoke-static {p1, v0, v1, v2}, Lcom/crashlytics/android/core/at;->a(Lcom/crashlytics/android/core/g;Ljava/lang/String;Ljava/lang/String;Z)V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$15$1.smali b/com.discord/smali/com/crashlytics/android/core/k$15$1.smali
index 7a3b46fbd2..a223fb07ae 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$15$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$15$1.smali
@@ -49,7 +49,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$15$1;->this$1:Lcom/crashlytics/android/core/k$15;
 
-    iget-boolean p1, p1, Lcom/crashlytics/android/core/k$15;->rG:Z
+    iget-boolean p1, p1, Lcom/crashlytics/android/core/k$15;->rF:Z
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$15.smali b/com.discord/smali/com/crashlytics/android/core/k$15.smali
index 27b2d48eb6..fe158c381a 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$15.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$15.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic rG:Z
+.field final synthetic rF:Z
 
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$15;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$15;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-boolean p2, p0, Lcom/crashlytics/android/core/k$15;->rG:Z
+    iput-boolean p2, p0, Lcom/crashlytics/android/core/k$15;->rF:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$16.smali b/com.discord/smali/com/crashlytics/android/core/k$16.smali
index c3df4409e6..02f80374af 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$16.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$16.smali
@@ -18,42 +18,42 @@
 
 
 # instance fields
+.field final synthetic rG:I
+
 .field final synthetic rH:I
 
-.field final synthetic rI:I
+.field final synthetic rI:J
 
 .field final synthetic rJ:J
 
-.field final synthetic rK:J
+.field final synthetic rK:Z
 
-.field final synthetic rL:Z
+.field final synthetic rL:Ljava/util/Map;
 
-.field final synthetic rM:Ljava/util/Map;
+.field final synthetic rM:I
 
-.field final synthetic rN:I
-
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;IIJJZLjava/util/Map;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$16;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$16;->rs:Lcom/crashlytics/android/core/k;
 
-    iput p2, p0, Lcom/crashlytics/android/core/k$16;->rH:I
+    iput p2, p0, Lcom/crashlytics/android/core/k$16;->rG:I
 
-    iput p3, p0, Lcom/crashlytics/android/core/k$16;->rI:I
+    iput p3, p0, Lcom/crashlytics/android/core/k$16;->rH:I
 
-    iput-wide p4, p0, Lcom/crashlytics/android/core/k$16;->rJ:J
+    iput-wide p4, p0, Lcom/crashlytics/android/core/k$16;->rI:J
 
-    iput-wide p6, p0, Lcom/crashlytics/android/core/k$16;->rK:J
+    iput-wide p6, p0, Lcom/crashlytics/android/core/k$16;->rJ:J
 
-    iput-boolean p8, p0, Lcom/crashlytics/android/core/k$16;->rL:Z
+    iput-boolean p8, p0, Lcom/crashlytics/android/core/k$16;->rK:Z
 
-    iput-object p9, p0, Lcom/crashlytics/android/core/k$16;->rM:Ljava/util/Map;
+    iput-object p9, p0, Lcom/crashlytics/android/core/k$16;->rL:Ljava/util/Map;
 
-    iput p10, p0, Lcom/crashlytics/android/core/k$16;->rN:I
+    iput p10, p0, Lcom/crashlytics/android/core/k$16;->rM:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -70,21 +70,21 @@
         }
     .end annotation
 
-    iget v1, p0, Lcom/crashlytics/android/core/k$16;->rH:I
+    iget v1, p0, Lcom/crashlytics/android/core/k$16;->rG:I
 
     sget-object v2, Landroid/os/Build;->MODEL:Ljava/lang/String;
 
-    iget v3, p0, Lcom/crashlytics/android/core/k$16;->rI:I
+    iget v3, p0, Lcom/crashlytics/android/core/k$16;->rH:I
 
-    iget-wide v4, p0, Lcom/crashlytics/android/core/k$16;->rJ:J
+    iget-wide v4, p0, Lcom/crashlytics/android/core/k$16;->rI:J
 
-    iget-wide v6, p0, Lcom/crashlytics/android/core/k$16;->rK:J
+    iget-wide v6, p0, Lcom/crashlytics/android/core/k$16;->rJ:J
 
-    iget-boolean v8, p0, Lcom/crashlytics/android/core/k$16;->rL:Z
+    iget-boolean v8, p0, Lcom/crashlytics/android/core/k$16;->rK:Z
 
-    iget-object v9, p0, Lcom/crashlytics/android/core/k$16;->rM:Ljava/util/Map;
+    iget-object v9, p0, Lcom/crashlytics/android/core/k$16;->rL:Ljava/util/Map;
 
-    iget v10, p0, Lcom/crashlytics/android/core/k$16;->rN:I
+    iget v10, p0, Lcom/crashlytics/android/core/k$16;->rM:I
 
     sget-object v11, Landroid/os/Build;->MANUFACTURER:Ljava/lang/String;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$17$1.smali b/com.discord/smali/com/crashlytics/android/core/k$17$1.smali
index d6d757c86b..1259c51930 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$17$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$17$1.smali
@@ -37,7 +37,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$17$1;->this$1:Lcom/crashlytics/android/core/k$17;
 
-    iget p1, p1, Lcom/crashlytics/android/core/k$17;->rH:I
+    iget p1, p1, Lcom/crashlytics/android/core/k$17;->rG:I
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -55,7 +55,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$17$1;->this$1:Lcom/crashlytics/android/core/k$17;
 
-    iget p1, p1, Lcom/crashlytics/android/core/k$17;->rI:I
+    iget p1, p1, Lcom/crashlytics/android/core/k$17;->rH:I
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$17$1;->this$1:Lcom/crashlytics/android/core/k$17;
 
-    iget-wide v0, p1, Lcom/crashlytics/android/core/k$17;->rJ:J
+    iget-wide v0, p1, Lcom/crashlytics/android/core/k$17;->rI:J
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -79,7 +79,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$17$1;->this$1:Lcom/crashlytics/android/core/k$17;
 
-    iget-wide v0, p1, Lcom/crashlytics/android/core/k$17;->rK:J
+    iget-wide v0, p1, Lcom/crashlytics/android/core/k$17;->rJ:J
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -91,7 +91,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$17$1;->this$1:Lcom/crashlytics/android/core/k$17;
 
-    iget-boolean p1, p1, Lcom/crashlytics/android/core/k$17;->rL:Z
+    iget-boolean p1, p1, Lcom/crashlytics/android/core/k$17;->rK:Z
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -103,7 +103,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$17$1;->this$1:Lcom/crashlytics/android/core/k$17;
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/k$17;->rM:Ljava/util/Map;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$17;->rL:Ljava/util/Map;
 
     const-string v0, "ids"
 
@@ -111,7 +111,7 @@
 
     iget-object p1, p0, Lcom/crashlytics/android/core/k$17$1;->this$1:Lcom/crashlytics/android/core/k$17;
 
-    iget p1, p1, Lcom/crashlytics/android/core/k$17;->rN:I
+    iget p1, p1, Lcom/crashlytics/android/core/k$17;->rM:I
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$17.smali b/com.discord/smali/com/crashlytics/android/core/k$17.smali
index 843d7df12c..d5478349eb 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$17.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$17.smali
@@ -18,42 +18,42 @@
 
 
 # instance fields
+.field final synthetic rG:I
+
 .field final synthetic rH:I
 
-.field final synthetic rI:I
+.field final synthetic rI:J
 
 .field final synthetic rJ:J
 
-.field final synthetic rK:J
+.field final synthetic rK:Z
 
-.field final synthetic rL:Z
+.field final synthetic rL:Ljava/util/Map;
 
-.field final synthetic rM:Ljava/util/Map;
+.field final synthetic rM:I
 
-.field final synthetic rN:I
-
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;IIJJZLjava/util/Map;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$17;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$17;->rs:Lcom/crashlytics/android/core/k;
 
-    iput p2, p0, Lcom/crashlytics/android/core/k$17;->rH:I
+    iput p2, p0, Lcom/crashlytics/android/core/k$17;->rG:I
 
-    iput p3, p0, Lcom/crashlytics/android/core/k$17;->rI:I
+    iput p3, p0, Lcom/crashlytics/android/core/k$17;->rH:I
 
-    iput-wide p4, p0, Lcom/crashlytics/android/core/k$17;->rJ:J
+    iput-wide p4, p0, Lcom/crashlytics/android/core/k$17;->rI:J
 
-    iput-wide p6, p0, Lcom/crashlytics/android/core/k$17;->rK:J
+    iput-wide p6, p0, Lcom/crashlytics/android/core/k$17;->rJ:J
 
-    iput-boolean p8, p0, Lcom/crashlytics/android/core/k$17;->rL:Z
+    iput-boolean p8, p0, Lcom/crashlytics/android/core/k$17;->rK:Z
 
-    iput-object p9, p0, Lcom/crashlytics/android/core/k$17;->rM:Ljava/util/Map;
+    iput-object p9, p0, Lcom/crashlytics/android/core/k$17;->rL:Ljava/util/Map;
 
-    iput p10, p0, Lcom/crashlytics/android/core/k$17;->rN:I
+    iput p10, p0, Lcom/crashlytics/android/core/k$17;->rM:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$18.smali b/com.discord/smali/com/crashlytics/android/core/k$18.smali
index 388c7409b2..2b6788a6fe 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$18.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$18.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic rO:Lcom/crashlytics/android/core/az;
+.field final synthetic rN:Lcom/crashlytics/android/core/az;
 
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;Lcom/crashlytics/android/core/az;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$18;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$18;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$18;->rO:Lcom/crashlytics/android/core/az;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$18;->rN:Lcom/crashlytics/android/core/az;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,15 +46,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$18;->rO:Lcom/crashlytics/android/core/az;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$18;->rN:Lcom/crashlytics/android/core/az;
 
     iget-object v0, v0, Lcom/crashlytics/android/core/az;->id:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$18;->rO:Lcom/crashlytics/android/core/az;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$18;->rN:Lcom/crashlytics/android/core/az;
 
     iget-object v1, v1, Lcom/crashlytics/android/core/az;->name:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/k$18;->rO:Lcom/crashlytics/android/core/az;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$18;->rN:Lcom/crashlytics/android/core/az;
 
     iget-object v2, v2, Lcom/crashlytics/android/core/az;->email:Ljava/lang/String;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$2.smali b/com.discord/smali/com/crashlytics/android/core/k$2.smali
index d71333d38e..38ed8ac0f6 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$2.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$2.smali
@@ -27,26 +27,26 @@
 
 
 # instance fields
+.field final synthetic rp:Ljava/lang/String;
+
 .field final synthetic rq:Ljava/lang/String;
 
 .field final synthetic rr:Ljava/lang/String;
 
-.field final synthetic rs:Ljava/lang/String;
-
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$2;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$2;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$2;->rq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$2;->rp:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$2;->rr:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$2;->rq:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$2;->rs:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$2;->rr:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,7 +63,7 @@
 
     const-string v0, "Failed to close user metadata file."
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$2;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$2;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v1}, Lcom/crashlytics/android/core/k;->d(Lcom/crashlytics/android/core/k;)Ljava/lang/String;
 
@@ -71,7 +71,7 @@
 
     new-instance v2, Lcom/crashlytics/android/core/ae;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$2;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$2;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v3}, Lcom/crashlytics/android/core/k;->getFilesDir()Ljava/io/File;
 
@@ -81,15 +81,15 @@
 
     new-instance v3, Lcom/crashlytics/android/core/az;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/k$2;->rq:Ljava/lang/String;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k$2;->rp:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/crashlytics/android/core/k$2;->rr:Ljava/lang/String;
+    iget-object v5, p0, Lcom/crashlytics/android/core/k$2;->rq:Ljava/lang/String;
 
-    iget-object v6, p0, Lcom/crashlytics/android/core/k$2;->rs:Ljava/lang/String;
+    iget-object v6, p0, Lcom/crashlytics/android/core/k$2;->rr:Ljava/lang/String;
 
     invoke-direct {v3, v4, v5, v6}, Lcom/crashlytics/android/core/az;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v2, v1}, Lcom/crashlytics/android/core/ae;->W(Ljava/lang/String;)Ljava/io/File;
+    invoke-virtual {v2, v1}, Lcom/crashlytics/android/core/ae;->S(Ljava/lang/String;)Ljava/io/File;
 
     move-result-object v1
 
@@ -144,7 +144,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$22.smali b/com.discord/smali/com/crashlytics/android/core/k$22.smali
index 6a61daf9e3..13fe8752e4 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$22.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$22.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$22;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$22;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final b(Lcom/crashlytics/android/core/t$b;Ljava/lang/Thread;Ljava/lang/Throwable;Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$22;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$22;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/t$b;Ljava/lang/Thread;Ljava/lang/Throwable;Z)V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$23.smali b/com.discord/smali/com/crashlytics/android/core/k$23.smali
index 85b064707c..f09ad4a96c 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$23.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$23.smali
@@ -27,15 +27,15 @@
 
 
 # instance fields
-.field final synthetic rP:Ljava/util/Date;
+.field final synthetic rO:Ljava/util/Date;
 
-.field final synthetic rQ:Ljava/lang/Throwable;
+.field final synthetic rP:Ljava/lang/Throwable;
 
-.field final synthetic rR:Lcom/crashlytics/android/core/t$b;
+.field final synthetic rQ:Lcom/crashlytics/android/core/t$b;
 
-.field final synthetic rS:Z
+.field final synthetic rR:Z
 
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 .field final synthetic val$thread:Ljava/lang/Thread;
 
@@ -44,17 +44,17 @@
 .method constructor <init>(Lcom/crashlytics/android/core/k;Ljava/util/Date;Ljava/lang/Thread;Ljava/lang/Throwable;Lcom/crashlytics/android/core/t$b;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$23;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$23;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$23;->rP:Ljava/util/Date;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$23;->rO:Ljava/util/Date;
 
     iput-object p3, p0, Lcom/crashlytics/android/core/k$23;->val$thread:Ljava/lang/Thread;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$23;->rQ:Ljava/lang/Throwable;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$23;->rP:Ljava/lang/Throwable;
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/k$23;->rR:Lcom/crashlytics/android/core/t$b;
+    iput-object p5, p0, Lcom/crashlytics/android/core/k$23;->rQ:Lcom/crashlytics/android/core/t$b;
 
-    iput-boolean p6, p0, Lcom/crashlytics/android/core/k$23;->rS:Z
+    iput-boolean p6, p0, Lcom/crashlytics/android/core/k$23;->rR:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -71,27 +71,27 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$23;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$23;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v0}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/k;)Lcom/crashlytics/android/core/l;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sf:Lcom/crashlytics/android/core/m;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->se:Lcom/crashlytics/android/core/m;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/m;->cK()Z
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$23;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$23;->rs:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$23;->rP:Ljava/util/Date;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$23;->rO:Ljava/util/Date;
 
     iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->val$thread:Ljava/lang/Thread;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->rQ:Ljava/lang/Throwable;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->rP:Ljava/lang/Throwable;
 
     invoke-static {v0, v1, v2, v3}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/k;Ljava/util/Date;Ljava/lang/Thread;Ljava/lang/Throwable;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$23;->rR:Lcom/crashlytics/android/core/t$b;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$23;->rQ:Lcom/crashlytics/android/core/t$b;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/t$b;->cw()Lio/fabric/sdk/android/a/g/t;
 
@@ -101,9 +101,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v2, v0, Lio/fabric/sdk/android/a/g/t;->bji:Lio/fabric/sdk/android/a/g/p;
+    iget-object v2, v0, Lio/fabric/sdk/android/a/g/t;->bjC:Lio/fabric/sdk/android/a/g/p;
 
-    iget-object v3, v0, Lio/fabric/sdk/android/a/g/t;->bjj:Lio/fabric/sdk/android/a/g/m;
+    iget-object v3, v0, Lio/fabric/sdk/android/a/g/t;->bjD:Lio/fabric/sdk/android/a/g/m;
 
     goto :goto_0
 
@@ -119,7 +119,7 @@
 
     if-eqz v3, :cond_2
 
-    iget-boolean v3, v3, Lio/fabric/sdk/android/a/g/m;->biL:Z
+    iget-boolean v3, v3, Lio/fabric/sdk/android/a/g/m;->bjf:Z
 
     if-eqz v3, :cond_1
 
@@ -137,14 +137,14 @@
     :goto_2
     if-nez v3, :cond_3
 
-    iget-boolean v3, p0, Lcom/crashlytics/android/core/k$23;->rS:Z
+    iget-boolean v3, p0, Lcom/crashlytics/android/core/k$23;->rR:Z
 
     if-eqz v3, :cond_4
 
     :cond_3
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->rs:Lcom/crashlytics/android/core/k;
 
-    iget-object v6, p0, Lcom/crashlytics/android/core/k$23;->rP:Ljava/util/Date;
+    iget-object v6, p0, Lcom/crashlytics/android/core/k$23;->rO:Ljava/util/Date;
 
     invoke-virtual {v6}, Ljava/util/Date;->getTime()J
 
@@ -153,25 +153,25 @@
     invoke-static {v3, v6, v7}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/k;J)V
 
     :cond_4
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v3, v2, v5}, Lcom/crashlytics/android/core/k;->a(Lio/fabric/sdk/android/a/g/p;Z)V
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v3}, Lcom/crashlytics/android/core/k;->b(Lcom/crashlytics/android/core/k;)V
 
     if-eqz v2, :cond_5
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->rs:Lcom/crashlytics/android/core/k;
 
-    iget v2, v2, Lio/fabric/sdk/android/a/g/p;->biY:I
+    iget v2, v2, Lio/fabric/sdk/android/a/g/p;->bjs:I
 
     invoke-virtual {v3}, Lcom/crashlytics/android/core/k;->cr()Ljava/io/File;
 
     move-result-object v6
 
-    sget-object v7, Lcom/crashlytics/android/core/k;->qX:Ljava/util/Comparator;
+    sget-object v7, Lcom/crashlytics/android/core/k;->qW:Ljava/util/Comparator;
 
     invoke-static {v6, v2, v7}, Lcom/crashlytics/android/core/ba;->a(Ljava/io/File;ILjava/util/Comparator;)I
 
@@ -183,7 +183,7 @@
 
     move-result-object v6
 
-    sget-object v7, Lcom/crashlytics/android/core/k;->qX:Ljava/util/Comparator;
+    sget-object v7, Lcom/crashlytics/android/core/k;->qW:Ljava/util/Comparator;
 
     invoke-static {v6, v2, v7}, Lcom/crashlytics/android/core/ba;->a(Ljava/io/File;ILjava/util/Comparator;)I
 
@@ -195,14 +195,14 @@
 
     move-result-object v3
 
-    sget-object v6, Lcom/crashlytics/android/core/k;->qU:Ljava/io/FilenameFilter;
+    sget-object v6, Lcom/crashlytics/android/core/k;->qT:Ljava/io/FilenameFilter;
 
-    sget-object v7, Lcom/crashlytics/android/core/k;->qX:Ljava/util/Comparator;
+    sget-object v7, Lcom/crashlytics/android/core/k;->qW:Ljava/util/Comparator;
 
     invoke-static {v3, v6, v2, v7}, Lcom/crashlytics/android/core/ba;->a(Ljava/io/File;Ljava/io/FilenameFilter;ILjava/util/Comparator;)I
 
     :cond_5
-    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v2}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/k;)Lcom/crashlytics/android/core/l;
 
@@ -214,13 +214,13 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lio/fabric/sdk/android/a/b/l;->Db()Z
+    invoke-virtual {v2}, Lio/fabric/sdk/android/a/b/l;->CS()Z
 
     move-result v2
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v2, v0}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/k;Lio/fabric/sdk/android/a/g/t;)Z
 
@@ -236,7 +236,7 @@
     :goto_3
     if-eqz v4, :cond_7
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v2, v0}, Lcom/crashlytics/android/core/k;->b(Lcom/crashlytics/android/core/k;Lio/fabric/sdk/android/a/g/t;)V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$24.smali b/com.discord/smali/com/crashlytics/android/core/k$24.smali
index 87d6856ddd..a01b2cf0ce 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$24.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$24.smali
@@ -27,22 +27,22 @@
 
 
 # instance fields
-.field final synthetic rT:J
+.field final synthetic rS:J
 
-.field final synthetic rU:Ljava/lang/String;
+.field final synthetic rT:Ljava/lang/String;
 
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;JLjava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$24;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$24;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-wide p2, p0, Lcom/crashlytics/android/core/k$24;->rT:J
+    iput-wide p2, p0, Lcom/crashlytics/android/core/k$24;->rS:J
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$24;->rU:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$24;->rT:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$24;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$24;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->cq()Z
 
@@ -67,17 +67,17 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$24;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$24;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v0}, Lcom/crashlytics/android/core/k;->c(Lcom/crashlytics/android/core/k;)Lcom/crashlytics/android/core/ac;
 
     move-result-object v0
 
-    iget-wide v1, p0, Lcom/crashlytics/android/core/k$24;->rT:J
+    iget-wide v1, p0, Lcom/crashlytics/android/core/k$24;->rS:J
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$24;->rU:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$24;->rT:Ljava/lang/String;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/ac;->sM:Lcom/crashlytics/android/core/aa;
+    iget-object v0, v0, Lcom/crashlytics/android/core/ac;->sL:Lcom/crashlytics/android/core/aa;
 
     invoke-interface {v0, v1, v2, v3}, Lcom/crashlytics/android/core/aa;->a(JLjava/lang/String;)V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$25.smali b/com.discord/smali/com/crashlytics/android/core/k$25.smali
index 16cf1c9ea3..16be488be0 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$25.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$25.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field final synthetic rQ:Ljava/lang/Throwable;
+.field final synthetic rP:Ljava/lang/Throwable;
 
-.field final synthetic rV:Ljava/util/Date;
+.field final synthetic rU:Ljava/util/Date;
 
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 .field final synthetic val$thread:Ljava/lang/Thread;
 
@@ -31,13 +31,13 @@
 .method public constructor <init>(Lcom/crashlytics/android/core/k;Ljava/util/Date;Ljava/lang/Thread;Ljava/lang/Throwable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$25;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$25;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$25;->rV:Ljava/util/Date;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$25;->rU:Ljava/util/Date;
 
     iput-object p3, p0, Lcom/crashlytics/android/core/k$25;->val$thread:Ljava/lang/Thread;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$25;->rQ:Ljava/lang/Throwable;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$25;->rP:Ljava/lang/Throwable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,7 +49,7 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$25;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$25;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->cq()Z
 
@@ -57,13 +57,13 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$25;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$25;->rs:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$25;->rV:Ljava/util/Date;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$25;->rU:Ljava/util/Date;
 
     iget-object v2, p0, Lcom/crashlytics/android/core/k$25;->val$thread:Ljava/lang/Thread;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$25;->rQ:Ljava/lang/Throwable;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$25;->rP:Ljava/lang/Throwable;
 
     invoke-static {v0, v1, v2, v3}, Lcom/crashlytics/android/core/k;->b(Lcom/crashlytics/android/core/k;Ljava/util/Date;Ljava/lang/Thread;Ljava/lang/Throwable;)V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$3.smali b/com.discord/smali/com/crashlytics/android/core/k$3.smali
index 18cbbf4d54..713fb44d1b 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$3.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$3.smali
@@ -27,18 +27,18 @@
 
 
 # instance fields
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
-.field final synthetic ru:Ljava/util/Map;
+.field final synthetic rt:Ljava/util/Map;
 
 
 # direct methods
 .method public constructor <init>(Lcom/crashlytics/android/core/k;Ljava/util/Map;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$3;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$3;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$3;->ru:Ljava/util/Map;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$3;->rt:Ljava/util/Map;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,7 +55,7 @@
 
     const-string v0, "Failed to close key/value metadata file."
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$3;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$3;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v1}, Lcom/crashlytics/android/core/k;->d(Lcom/crashlytics/android/core/k;)Ljava/lang/String;
 
@@ -63,7 +63,7 @@
 
     new-instance v2, Lcom/crashlytics/android/core/ae;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$3;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$3;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v3}, Lcom/crashlytics/android/core/k;->getFilesDir()Ljava/io/File;
 
@@ -71,9 +71,9 @@
 
     invoke-direct {v2, v3}, Lcom/crashlytics/android/core/ae;-><init>(Ljava/io/File;)V
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$3;->ru:Ljava/util/Map;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$3;->rt:Ljava/util/Map;
 
-    invoke-virtual {v2, v1}, Lcom/crashlytics/android/core/ae;->X(Ljava/lang/String;)Ljava/io/File;
+    invoke-virtual {v2, v1}, Lcom/crashlytics/android/core/ae;->T(Ljava/lang/String;)Ljava/io/File;
 
     move-result-object v1
 
@@ -128,7 +128,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$4.smali b/com.discord/smali/com/crashlytics/android/core/k$4.smali
index 376a1658c5..b60d629e45 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$4.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$4.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$4;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$4;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$4;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$4;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v0}, Lcom/crashlytics/android/core/k;->b(Lcom/crashlytics/android/core/k;)V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$5.smali b/com.discord/smali/com/crashlytics/android/core/k$5.smali
index 089cac0c2b..5d971d5fc7 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$5.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$5.smali
@@ -27,18 +27,18 @@
 
 
 # instance fields
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
-.field final synthetic rv:Lio/fabric/sdk/android/a/g/p;
+.field final synthetic ru:Lio/fabric/sdk/android/a/g/p;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;Lio/fabric/sdk/android/a/g/p;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$5;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$5;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$5;->rv:Lio/fabric/sdk/android/a/g/p;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$5;->ru:Lio/fabric/sdk/android/a/g/p;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,7 +55,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$5;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$5;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->cq()Z
 
@@ -65,7 +65,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -78,7 +78,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -86,13 +86,13 @@
 
     invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$5;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$5;->rs:Lcom/crashlytics/android/core/k;
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/k$5;->rv:Lio/fabric/sdk/android/a/g/p;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$5;->ru:Lio/fabric/sdk/android/a/g/p;
 
     invoke-static {v0, v2}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/k;Lio/fabric/sdk/android/a/g/p;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$6.smali b/com.discord/smali/com/crashlytics/android/core/k$6.smali
index c32d0de1b7..d0ac11a3c6 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$6.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$6.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$6;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$6;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 11
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$6;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$6;->rs:Lcom/crashlytics/android/core/k;
 
     new-instance v1, Lcom/crashlytics/android/core/k$f;
 
@@ -64,7 +64,7 @@
 
     aget-object v7, v1, v5
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v8
 
@@ -125,7 +125,7 @@
 
     aget-object v5, v2, v4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v7
 
@@ -155,7 +155,7 @@
 
     if-nez v7, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v7
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$7.smali b/com.discord/smali/com/crashlytics/android/core/k$7.smali
index 32c0d5a231..7335bb92fd 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$7.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$7.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
-.field final synthetic rw:Ljava/util/Set;
+.field final synthetic rv:Ljava/util/Set;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;Ljava/util/Set;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$7;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$7;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$7;->rw:Ljava/util/Set;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$7;->rv:Ljava/util/Set;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,7 +54,7 @@
     return v0
 
     :cond_0
-    iget-object p1, p0, Lcom/crashlytics/android/core/k$7;->rw:Ljava/util/Set;
+    iget-object p1, p0, Lcom/crashlytics/android/core/k$7;->rv:Ljava/util/Set;
 
     invoke-virtual {p2, v0, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$8.smali b/com.discord/smali/com/crashlytics/android/core/k$8.smali
index 2513ff355c..a08170b6f8 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$8.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$8.smali
@@ -27,18 +27,18 @@
 
 
 # instance fields
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
-.field final synthetic rx:Lcom/crashlytics/android/core/p;
+.field final synthetic rw:Lcom/crashlytics/android/core/p;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;Lcom/crashlytics/android/core/p;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$8;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$8;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$8;->rx:Lcom/crashlytics/android/core/p;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$8;->rw:Lcom/crashlytics/android/core/p;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,11 +55,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$8;->rx:Lcom/crashlytics/android/core/p;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$8;->rw:Lcom/crashlytics/android/core/p;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/p;->sq:Ljava/util/TreeSet;
+    iget-object v0, v0, Lcom/crashlytics/android/core/p;->sp:Ljava/util/TreeSet;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$8;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$8;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v1}, Lcom/crashlytics/android/core/k;->e(Lcom/crashlytics/android/core/k;)Ljava/lang/String;
 
@@ -81,7 +81,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$8;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$8;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v3}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/k;)Lcom/crashlytics/android/core/l;
 
@@ -92,7 +92,7 @@
     invoke-static {v3, v4, v2, v1}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/k;Landroid/content/Context;Ljava/io/File;Ljava/lang/String;)V
 
     :cond_0
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$8;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$8;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-static {v1, v0}, Lcom/crashlytics/android/core/k;->a(Lcom/crashlytics/android/core/k;Ljava/util/Set;)V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$9.smali b/com.discord/smali/com/crashlytics/android/core/k$9.smali
index ad3d7f161a..cdf920f789 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$9.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$9.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field final synthetic rA:J
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rx:Ljava/lang/String;
 
 .field final synthetic ry:Ljava/lang/String;
 
-.field final synthetic rz:Ljava/lang/String;
+.field final synthetic rz:J
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;Ljava/lang/String;Ljava/lang/String;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$9;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$9;->rs:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$9;->ry:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$9;->rx:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$9;->rz:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$9;->ry:Ljava/lang/String;
 
-    iput-wide p4, p0, Lcom/crashlytics/android/core/k$9;->rA:J
+    iput-wide p4, p0, Lcom/crashlytics/android/core/k$9;->rz:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,11 +54,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$9;->ry:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$9;->rx:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$9;->rz:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$9;->ry:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/crashlytics/android/core/k$9;->rA:J
+    iget-wide v2, p0, Lcom/crashlytics/android/core/k$9;->rz:J
 
     invoke-static {p1, v0, v1, v2, v3}, Lcom/crashlytics/android/core/at;->a(Lcom/crashlytics/android/core/g;Ljava/lang/String;Ljava/lang/String;J)V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$a.smali b/com.discord/smali/com/crashlytics/android/core/k$a.smali
index 29f039981f..45ac2bba20 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$a.smali
@@ -39,7 +39,7 @@
 .method public final accept(Ljava/io/File;Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/crashlytics/android/core/k;->qU:Ljava/io/FilenameFilter;
+    sget-object v0, Lcom/crashlytics/android/core/k;->qT:Ljava/io/FilenameFilter;
 
     invoke-interface {v0, p1, p2}, Ljava/io/FilenameFilter;->accept(Ljava/io/File;Ljava/lang/String;)Z
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$c.smali b/com.discord/smali/com/crashlytics/android/core/k$c.smali
index 6f6380339a..036cbf8a90 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$c.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$c.smali
@@ -39,11 +39,11 @@
 .method public final cw()Lio/fabric/sdk/android/a/g/t;
     .locals 1
 
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DV()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DL()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->DS()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->DI()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$f.smali b/com.discord/smali/com/crashlytics/android/core/k$f.smali
index 30bf7386c6..4133a4812c 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$f.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$f.smali
@@ -31,7 +31,7 @@
 .method public final accept(Ljava/io/File;Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/crashlytics/android/core/f;->qG:Ljava/io/FilenameFilter;
+    sget-object v0, Lcom/crashlytics/android/core/f;->qF:Ljava/io/FilenameFilter;
 
     invoke-interface {v0, p1, p2}, Ljava/io/FilenameFilter;->accept(Ljava/io/File;Ljava/lang/String;)Z
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$g.smali b/com.discord/smali/com/crashlytics/android/core/k$g.smali
index cf77ca7141..87ba0eef6a 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$g.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$g.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final rW:Lio/fabric/sdk/android/a/f/a;
+.field private final rV:Lio/fabric/sdk/android/a/f/a;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$g;->rW:Lio/fabric/sdk/android/a/f/a;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$g;->rV:Lio/fabric/sdk/android/a/f/a;
 
     return-void
 .end method
@@ -39,7 +39,7 @@
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$g;->rW:Lio/fabric/sdk/android/a/f/a;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$g;->rV:Lio/fabric/sdk/android/a/f/a;
 
     invoke-interface {v1}, Lio/fabric/sdk/android/a/f/a;->getFilesDir()Ljava/io/File;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$h$1.smali b/com.discord/smali/com/crashlytics/android/core/k$h$1.smali
index 611d2f7e8d..f13af27a4a 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$h$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$h$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic rY:Lcom/crashlytics/android/core/k$h;
+.field final synthetic rX:Lcom/crashlytics/android/core/k$h;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k$h;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$h$1;->rY:Lcom/crashlytics/android/core/k$h;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$h$1;->rX:Lcom/crashlytics/android/core/k$h;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,13 +37,13 @@
 .method public final cl()V
     .locals 4
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$h$1;->rY:Lcom/crashlytics/android/core/k$h;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$h$1;->rX:Lcom/crashlytics/android/core/k$h;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/k$h;->re:Lcom/crashlytics/android/core/al;
+    iget-object v0, v0, Lcom/crashlytics/android/core/k$h;->rd:Lcom/crashlytics/android/core/al;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/al;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, v0, Lcom/crashlytics/android/core/al;->sT:Lio/fabric/sdk/android/a/f/c;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/al;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object v0, v0, Lcom/crashlytics/android/core/al;->sT:Lio/fabric/sdk/android/a/f/c;
 
     invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->edit()Landroid/content/SharedPreferences$Editor;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$h$2.smali b/com.discord/smali/com/crashlytics/android/core/k$h$2.smali
index 86608f8dab..a4f04a5d35 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$h$2.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$h$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic rY:Lcom/crashlytics/android/core/k$h;
+.field final synthetic rX:Lcom/crashlytics/android/core/k$h;
 
-.field final synthetic rZ:Lcom/crashlytics/android/core/i;
+.field final synthetic rY:Lcom/crashlytics/android/core/i;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k$h;Lcom/crashlytics/android/core/i;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$h$2;->rY:Lcom/crashlytics/android/core/k$h;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$h$2;->rX:Lcom/crashlytics/android/core/k$h;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$h$2;->rZ:Lcom/crashlytics/android/core/i;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$h$2;->rY:Lcom/crashlytics/android/core/i;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$h$2;->rZ:Lcom/crashlytics/android/core/i;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$h$2;->rY:Lcom/crashlytics/android/core/i;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/i;->qM:Landroid/app/AlertDialog$Builder;
+    iget-object v0, v0, Lcom/crashlytics/android/core/i;->qL:Landroid/app/AlertDialog$Builder;
 
     invoke-virtual {v0}, Landroid/app/AlertDialog$Builder;->show()Landroid/app/AlertDialog;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$h.smali b/com.discord/smali/com/crashlytics/android/core/k$h.smali
index 30601da1cb..f764bc5957 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$h.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$h.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field private final oS:Lio/fabric/sdk/android/i;
+.field private final oR:Lio/fabric/sdk/android/i;
 
-.field private final rX:Lio/fabric/sdk/android/a/g/o;
+.field private final rW:Lio/fabric/sdk/android/a/g/o;
 
-.field final re:Lcom/crashlytics/android/core/al;
+.field final rd:Lcom/crashlytics/android/core/al;
 
 
 # direct methods
@@ -31,11 +31,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$h;->oS:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$h;->oR:Lio/fabric/sdk/android/i;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$h;->re:Lcom/crashlytics/android/core/al;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$h;->rd:Lcom/crashlytics/android/core/al;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$h;->rX:Lio/fabric/sdk/android/a/g/o;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$h;->rW:Lio/fabric/sdk/android/a/g/o;
 
     return-void
 .end method
@@ -45,15 +45,15 @@
 .method public final cy()Z
     .locals 14
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$h;->oS:Lio/fabric/sdk/android/i;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$h;->oR:Lio/fabric/sdk/android/i;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/i;->beM:Lio/fabric/sdk/android/c;
+    iget-object v0, v0, Lio/fabric/sdk/android/i;->bfg:Lio/fabric/sdk/android/c;
 
-    iget-object v1, v0, Lio/fabric/sdk/android/c;->bex:Ljava/lang/ref/WeakReference;
+    iget-object v1, v0, Lio/fabric/sdk/android/c;->beR:Ljava/lang/ref/WeakReference;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lio/fabric/sdk/android/c;->bex:Ljava/lang/ref/WeakReference;
+    iget-object v0, v0, Lio/fabric/sdk/android/c;->beR:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -82,7 +82,7 @@
 
     invoke-direct {v1, p0}, Lcom/crashlytics/android/core/k$h$1;-><init>(Lcom/crashlytics/android/core/k$h;)V
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/k$h;->rX:Lio/fabric/sdk/android/a/g/o;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$h;->rW:Lio/fabric/sdk/android/a/g/o;
 
     new-instance v3, Lcom/crashlytics/android/core/i$b;
 
@@ -98,7 +98,7 @@
 
     invoke-direct {v6, v0}, Landroid/app/AlertDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    iget-object v7, v5, Lcom/crashlytics/android/core/z;->rX:Lio/fabric/sdk/android/a/g/o;
+    iget-object v7, v5, Lcom/crashlytics/android/core/z;->rW:Lio/fabric/sdk/android/a/g/o;
 
     iget-object v7, v7, Lio/fabric/sdk/android/a/g/o;->message:Ljava/lang/String;
 
@@ -182,7 +182,7 @@
 
     move-result-object v7
 
-    iget-object v9, v5, Lcom/crashlytics/android/core/z;->rX:Lio/fabric/sdk/android/a/g/o;
+    iget-object v9, v5, Lcom/crashlytics/android/core/z;->rW:Lio/fabric/sdk/android/a/g/o;
 
     iget-object v9, v9, Lio/fabric/sdk/android/a/g/o;->title:Ljava/lang/String;
 
@@ -200,9 +200,9 @@
 
     move-result-object v4
 
-    iget-object v7, v5, Lcom/crashlytics/android/core/z;->rX:Lio/fabric/sdk/android/a/g/o;
+    iget-object v7, v5, Lcom/crashlytics/android/core/z;->rW:Lio/fabric/sdk/android/a/g/o;
 
-    iget-object v7, v7, Lio/fabric/sdk/android/a/g/o;->biN:Ljava/lang/String;
+    iget-object v7, v7, Lio/fabric/sdk/android/a/g/o;->bjh:Ljava/lang/String;
 
     const-string v9, "com.crashlytics.CrashSubmissionSendTitle"
 
@@ -212,7 +212,7 @@
 
     invoke-virtual {v4, v7, v8}, Landroid/app/AlertDialog$Builder;->setNeutralButton(Ljava/lang/CharSequence;Landroid/content/DialogInterface$OnClickListener;)Landroid/app/AlertDialog$Builder;
 
-    iget-boolean v4, v2, Lio/fabric/sdk/android/a/g/o;->biO:Z
+    iget-boolean v4, v2, Lio/fabric/sdk/android/a/g/o;->bji:Z
 
     if-eqz v4, :cond_2
 
@@ -220,9 +220,9 @@
 
     invoke-direct {v4, v3}, Lcom/crashlytics/android/core/i$2;-><init>(Lcom/crashlytics/android/core/i$b;)V
 
-    iget-object v7, v5, Lcom/crashlytics/android/core/z;->rX:Lio/fabric/sdk/android/a/g/o;
+    iget-object v7, v5, Lcom/crashlytics/android/core/z;->rW:Lio/fabric/sdk/android/a/g/o;
 
-    iget-object v7, v7, Lio/fabric/sdk/android/a/g/o;->biP:Ljava/lang/String;
+    iget-object v7, v7, Lio/fabric/sdk/android/a/g/o;->bjj:Ljava/lang/String;
 
     const-string v8, "com.crashlytics.CrashSubmissionCancelTitle"
 
@@ -233,7 +233,7 @@
     invoke-virtual {v6, v7, v4}, Landroid/app/AlertDialog$Builder;->setNegativeButton(Ljava/lang/CharSequence;Landroid/content/DialogInterface$OnClickListener;)Landroid/app/AlertDialog$Builder;
 
     :cond_2
-    iget-boolean v2, v2, Lio/fabric/sdk/android/a/g/o;->biQ:Z
+    iget-boolean v2, v2, Lio/fabric/sdk/android/a/g/o;->bjk:Z
 
     if-eqz v2, :cond_3
 
@@ -241,9 +241,9 @@
 
     invoke-direct {v2, v1, v3}, Lcom/crashlytics/android/core/i$3;-><init>(Lcom/crashlytics/android/core/i$a;Lcom/crashlytics/android/core/i$b;)V
 
-    iget-object v1, v5, Lcom/crashlytics/android/core/z;->rX:Lio/fabric/sdk/android/a/g/o;
+    iget-object v1, v5, Lcom/crashlytics/android/core/z;->rW:Lio/fabric/sdk/android/a/g/o;
 
-    iget-object v1, v1, Lio/fabric/sdk/android/a/g/o;->biR:Ljava/lang/String;
+    iget-object v1, v1, Lio/fabric/sdk/android/a/g/o;->bjl:Ljava/lang/String;
 
     const-string v4, "com.crashlytics.CrashSubmissionAlwaysSendTitle"
 
@@ -264,7 +264,7 @@
 
     invoke-virtual {v0, v2}, Landroid/app/Activity;->runOnUiThread(Ljava/lang/Runnable;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -274,19 +274,19 @@
 
     invoke-interface {v0, v2, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v1, Lcom/crashlytics/android/core/i;->qL:Lcom/crashlytics/android/core/i$b;
+    iget-object v0, v1, Lcom/crashlytics/android/core/i;->qK:Lcom/crashlytics/android/core/i$b;
 
     :try_start_0
-    iget-object v0, v0, Lcom/crashlytics/android/core/i$b;->qQ:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, v0, Lcom/crashlytics/android/core/i$b;->qP:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->await()V
     :try_end_0
     .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
-    iget-object v0, v1, Lcom/crashlytics/android/core/i;->qL:Lcom/crashlytics/android/core/i$b;
+    iget-object v0, v1, Lcom/crashlytics/android/core/i;->qK:Lcom/crashlytics/android/core/i$b;
 
-    iget-boolean v0, v0, Lcom/crashlytics/android/core/i$b;->qP:Z
+    iget-boolean v0, v0, Lcom/crashlytics/android/core/i$b;->qO:Z
 
     return v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$i.smali b/com.discord/smali/com/crashlytics/android/core/k$i.smali
index 79d85b6bb7..ac817aca5f 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$i.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$i.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method private constructor <init>(Lcom/crashlytics/android/core/k;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$i;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$i;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,7 +45,7 @@
 .method public final cA()[Ljava/io/File;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->ct()Ljava/io/File;
 
@@ -61,9 +61,9 @@
 .method public final cB()[Ljava/io/File;
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->rs:Lcom/crashlytics/android/core/k;
 
-    sget-object v1, Lcom/crashlytics/android/core/k;->qV:Ljava/io/FileFilter;
+    sget-object v1, Lcom/crashlytics/android/core/k;->qU:Ljava/io/FileFilter;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->getFilesDir()Ljava/io/File;
 
@@ -83,7 +83,7 @@
 .method public final cz()[Ljava/io/File;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->cn()[Ljava/io/File;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$j.smali b/com.discord/smali/com/crashlytics/android/core/k$j.smali
index 10dc548e5e..24d680ffaa 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$j.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$j.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic rt:Lcom/crashlytics/android/core/k;
+.field final synthetic rs:Lcom/crashlytics/android/core/k;
 
 
 # direct methods
 .method private constructor <init>(Lcom/crashlytics/android/core/k;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$j;->rt:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$j;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,7 +45,7 @@
 .method public final cq()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$j;->rt:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$j;->rs:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->cq()Z
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$k.smali b/com.discord/smali/com/crashlytics/android/core/k$k.smali
index 96c249db7a..09a2ce3229 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$k.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$k.smali
@@ -20,9 +20,9 @@
 # instance fields
 .field private final context:Landroid/content/Context;
 
-.field private final sa:Lcom/crashlytics/android/core/aq;
+.field private final rZ:Lcom/crashlytics/android/core/aq;
 
-.field private final sc:Lcom/crashlytics/android/core/ar;
+.field private final sa:Lcom/crashlytics/android/core/ar;
 
 
 # direct methods
@@ -33,9 +33,9 @@
 
     iput-object p1, p0, Lcom/crashlytics/android/core/k$k;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$k;->sa:Lcom/crashlytics/android/core/aq;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$k;->rZ:Lcom/crashlytics/android/core/aq;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$k;->sc:Lcom/crashlytics/android/core/ar;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$k;->sa:Lcom/crashlytics/android/core/ar;
 
     return-void
 .end method
@@ -56,7 +56,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -66,9 +66,9 @@
 
     invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$k;->sc:Lcom/crashlytics/android/core/ar;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$k;->sa:Lcom/crashlytics/android/core/ar;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$k;->sa:Lcom/crashlytics/android/core/aq;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$k;->rZ:Lcom/crashlytics/android/core/aq;
 
     invoke-virtual {v0, v1}, Lcom/crashlytics/android/core/ar;->a(Lcom/crashlytics/android/core/aq;)Z
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k.smali b/com.discord/smali/com/crashlytics/android/core/k.smali
index e690ec7d50..5f54e8b291 100644
--- a/com.discord/smali/com/crashlytics/android/core/k.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k.smali
@@ -23,11 +23,21 @@
 
 
 # static fields
+.field static final qS:Ljava/io/FilenameFilter;
+
 .field static final qT:Ljava/io/FilenameFilter;
 
-.field static final qU:Ljava/io/FilenameFilter;
+.field static final qU:Ljava/io/FileFilter;
 
-.field static final qV:Ljava/io/FileFilter;
+.field static final qV:Ljava/util/Comparator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Comparator<",
+            "Ljava/io/File;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field static final qW:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
@@ -39,19 +49,9 @@
     .end annotation
 .end field
 
-.field static final qX:Ljava/util/Comparator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Comparator<",
-            "Ljava/io/File;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private static final qX:Ljava/util/regex/Pattern;
 
-.field private static final qY:Ljava/util/regex/Pattern;
-
-.field private static final qZ:Ljava/util/Map;
+.field private static final qY:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -62,45 +62,45 @@
     .end annotation
 .end field
 
-.field private static final ra:[Ljava/lang/String;
+.field private static final qZ:[Ljava/lang/String;
 
 
 # instance fields
-.field private final pe:Lio/fabric/sdk/android/a/f/a;
+.field private final pd:Lio/fabric/sdk/android/a/f/a;
 
-.field private final pr:Lio/fabric/sdk/android/a/e/e;
+.field private final pq:Lio/fabric/sdk/android/a/e/e;
 
-.field private final qv:Lio/fabric/sdk/android/a/b/s;
+.field private final qu:Lio/fabric/sdk/android/a/b/s;
 
-.field private final rb:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final ra:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field final rc:Lcom/crashlytics/android/core/l;
+.field final rb:Lcom/crashlytics/android/core/l;
 
-.field public final rd:Lcom/crashlytics/android/core/j;
+.field public final rc:Lcom/crashlytics/android/core/j;
 
-.field final re:Lcom/crashlytics/android/core/al;
+.field final rd:Lcom/crashlytics/android/core/al;
 
-.field final rf:Lcom/crashlytics/android/core/a;
+.field final re:Lcom/crashlytics/android/core/a;
 
-.field private final rg:Lcom/crashlytics/android/core/k$g;
+.field private final rf:Lcom/crashlytics/android/core/k$g;
 
-.field private final rh:Lcom/crashlytics/android/core/ac;
+.field private final rg:Lcom/crashlytics/android/core/ac;
 
-.field final ri:Lcom/crashlytics/android/core/ar$c;
+.field final rh:Lcom/crashlytics/android/core/ar$c;
 
-.field final rj:Lcom/crashlytics/android/core/ar$b;
+.field final ri:Lcom/crashlytics/android/core/ar$b;
 
-.field final rk:Lcom/crashlytics/android/core/y;
+.field final rj:Lcom/crashlytics/android/core/y;
 
-.field private final rl:Lcom/crashlytics/android/core/aw;
+.field private final rk:Lcom/crashlytics/android/core/aw;
 
-.field private final rm:Ljava/lang/String;
+.field private final rl:Ljava/lang/String;
 
-.field final rn:Lcom/crashlytics/android/core/b;
+.field final rm:Lcom/crashlytics/android/core/b;
 
-.field private final ro:Lcom/crashlytics/android/answers/p;
+.field private final rn:Lcom/crashlytics/android/answers/p;
 
-.field rp:Lcom/crashlytics/android/core/t;
+.field ro:Lcom/crashlytics/android/core/t;
 
 
 # direct methods
@@ -113,31 +113,31 @@
 
     invoke-direct {v0, v1}, Lcom/crashlytics/android/core/k$1;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/crashlytics/android/core/k;->qT:Ljava/io/FilenameFilter;
+    sput-object v0, Lcom/crashlytics/android/core/k;->qS:Ljava/io/FilenameFilter;
 
     new-instance v0, Lcom/crashlytics/android/core/k$12;
 
     invoke-direct {v0}, Lcom/crashlytics/android/core/k$12;-><init>()V
 
-    sput-object v0, Lcom/crashlytics/android/core/k;->qU:Ljava/io/FilenameFilter;
+    sput-object v0, Lcom/crashlytics/android/core/k;->qT:Ljava/io/FilenameFilter;
 
     new-instance v0, Lcom/crashlytics/android/core/k$19;
 
     invoke-direct {v0}, Lcom/crashlytics/android/core/k$19;-><init>()V
 
-    sput-object v0, Lcom/crashlytics/android/core/k;->qV:Ljava/io/FileFilter;
+    sput-object v0, Lcom/crashlytics/android/core/k;->qU:Ljava/io/FileFilter;
 
     new-instance v0, Lcom/crashlytics/android/core/k$20;
 
     invoke-direct {v0}, Lcom/crashlytics/android/core/k$20;-><init>()V
 
-    sput-object v0, Lcom/crashlytics/android/core/k;->qW:Ljava/util/Comparator;
+    sput-object v0, Lcom/crashlytics/android/core/k;->qV:Ljava/util/Comparator;
 
     new-instance v0, Lcom/crashlytics/android/core/k$21;
 
     invoke-direct {v0}, Lcom/crashlytics/android/core/k$21;-><init>()V
 
-    sput-object v0, Lcom/crashlytics/android/core/k;->qX:Ljava/util/Comparator;
+    sput-object v0, Lcom/crashlytics/android/core/k;->qW:Ljava/util/Comparator;
 
     const-string v0, "([\\d|A-Z|a-z]{12}\\-[\\d|A-Z|a-z]{4}\\-[\\d|A-Z|a-z]{4}\\-[\\d|A-Z|a-z]{12}).+"
 
@@ -145,7 +145,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/k;->qY:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/crashlytics/android/core/k;->qX:Ljava/util/regex/Pattern;
 
     const-string v0, "X-CRASHLYTICS-SEND-FLAGS"
 
@@ -155,7 +155,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/k;->qZ:Ljava/util/Map;
+    sput-object v0, Lcom/crashlytics/android/core/k;->qY:Ljava/util/Map;
 
     const/4 v0, 0x4
 
@@ -185,7 +185,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/crashlytics/android/core/k;->ra:[Ljava/lang/String;
+    sput-object v0, Lcom/crashlytics/android/core/k;->qZ:[Ljava/lang/String;
 
     return-void
 .end method
@@ -201,31 +201,31 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/k;->rb:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/crashlytics/android/core/k;->ra:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/j;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/j;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k;->pr:Lio/fabric/sdk/android/a/e/e;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k;->pq:Lio/fabric/sdk/android/a/e/e;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k;->qv:Lio/fabric/sdk/android/a/b/s;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/k;->re:Lcom/crashlytics/android/core/al;
+    iput-object p5, p0, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/al;
 
-    iput-object p6, p0, Lcom/crashlytics/android/core/k;->pe:Lio/fabric/sdk/android/a/f/a;
+    iput-object p6, p0, Lcom/crashlytics/android/core/k;->pd:Lio/fabric/sdk/android/a/f/a;
 
-    iput-object p7, p0, Lcom/crashlytics/android/core/k;->rf:Lcom/crashlytics/android/core/a;
+    iput-object p7, p0, Lcom/crashlytics/android/core/k;->re:Lcom/crashlytics/android/core/a;
 
-    invoke-interface {p8}, Lcom/crashlytics/android/core/ay;->cZ()Ljava/lang/String;
+    invoke-interface {p8}, Lcom/crashlytics/android/core/ay;->cY()Ljava/lang/String;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rm:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rl:Ljava/lang/String;
 
-    iput-object p9, p0, Lcom/crashlytics/android/core/k;->rn:Lcom/crashlytics/android/core/b;
+    iput-object p9, p0, Lcom/crashlytics/android/core/k;->rm:Lcom/crashlytics/android/core/b;
 
-    iput-object p10, p0, Lcom/crashlytics/android/core/k;->ro:Lcom/crashlytics/android/answers/p;
+    iput-object p10, p0, Lcom/crashlytics/android/core/k;->rn:Lcom/crashlytics/android/answers/p;
 
     iget-object p1, p1, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -233,33 +233,33 @@
 
     invoke-direct {p2, p6}, Lcom/crashlytics/android/core/k$g;-><init>(Lio/fabric/sdk/android/a/f/a;)V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rg:Lcom/crashlytics/android/core/k$g;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rf:Lcom/crashlytics/android/core/k$g;
 
     new-instance p2, Lcom/crashlytics/android/core/ac;
 
-    iget-object p3, p0, Lcom/crashlytics/android/core/k;->rg:Lcom/crashlytics/android/core/k$g;
+    iget-object p3, p0, Lcom/crashlytics/android/core/k;->rf:Lcom/crashlytics/android/core/k$g;
 
     invoke-direct {p2, p1, p3}, Lcom/crashlytics/android/core/ac;-><init>(Landroid/content/Context;Lcom/crashlytics/android/core/ac$a;)V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rh:Lcom/crashlytics/android/core/ac;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rg:Lcom/crashlytics/android/core/ac;
 
     new-instance p2, Lcom/crashlytics/android/core/k$i;
 
     invoke-direct {p2, p0, v1}, Lcom/crashlytics/android/core/k$i;-><init>(Lcom/crashlytics/android/core/k;B)V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k;->ri:Lcom/crashlytics/android/core/ar$c;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rh:Lcom/crashlytics/android/core/ar$c;
 
     new-instance p2, Lcom/crashlytics/android/core/k$j;
 
     invoke-direct {p2, p0, v1}, Lcom/crashlytics/android/core/k$j;-><init>(Lcom/crashlytics/android/core/k;B)V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rj:Lcom/crashlytics/android/core/ar$b;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->ri:Lcom/crashlytics/android/core/ar$b;
 
     new-instance p2, Lcom/crashlytics/android/core/y;
 
     invoke-direct {p2, p1}, Lcom/crashlytics/android/core/y;-><init>(Landroid/content/Context;)V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rk:Lcom/crashlytics/android/core/y;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rj:Lcom/crashlytics/android/core/y;
 
     new-instance p1, Lcom/crashlytics/android/core/af;
 
@@ -277,12 +277,12 @@
 
     invoke-direct {p1, p2}, Lcom/crashlytics/android/core/af;-><init>([Lcom/crashlytics/android/core/aw;)V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k;->rl:Lcom/crashlytics/android/core/aw;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k;->rk:Lcom/crashlytics/android/core/aw;
 
     return-void
 .end method
 
-.method private O(Ljava/lang/String;)V
+.method private K(Ljava/lang/String;)V
     .locals 3
 
     new-instance v0, Lcom/crashlytics/android/core/k$l;
@@ -315,7 +315,7 @@
 .method static synthetic a(Lcom/crashlytics/android/core/k;)Lcom/crashlytics/android/core/l;
     .locals 0
 
-    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
     return-object p0
 .end method
@@ -338,7 +338,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -369,7 +369,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -442,7 +442,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/crashlytics/android/core/k;->ra:[Ljava/lang/String;
+    sget-object v0, Lcom/crashlytics/android/core/k;->qZ:[Ljava/lang/String;
 
     array-length v1, v0
 
@@ -487,7 +487,7 @@
 
     if-nez v6, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -514,7 +514,7 @@
     goto :goto_1
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v6
 
@@ -561,13 +561,13 @@
 
     new-instance v5, Lcom/crashlytics/android/core/ax;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/k;->rl:Lcom/crashlytics/android/core/aw;
+    iget-object v1, v0, Lcom/crashlytics/android/core/k;->rk:Lcom/crashlytics/android/core/aw;
 
     move-object/from16 v2, p4
 
     invoke-direct {v5, v2, v1}, Lcom/crashlytics/android/core/ax;-><init>(Ljava/lang/Throwable;Lcom/crashlytics/android/core/aw;)V
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v1, v0, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
     iget-object v1, v1, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -583,9 +583,9 @@
 
     move-result-object v16
 
-    iget-object v4, v0, Lcom/crashlytics/android/core/k;->rk:Lcom/crashlytics/android/core/y;
+    iget-object v4, v0, Lcom/crashlytics/android/core/k;->rj:Lcom/crashlytics/android/core/y;
 
-    iget-boolean v4, v4, Lcom/crashlytics/android/core/y;->sF:Z
+    iget-boolean v4, v4, Lcom/crashlytics/android/core/y;->sE:Z
 
     invoke-static {v1, v4}, Lio/fabric/sdk/android/a/b/i;->b(Landroid/content/Context;Z)I
 
@@ -605,7 +605,7 @@
 
     iget v13, v4, Landroid/content/res/Configuration;->orientation:I
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->CY()J
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->CP()J
 
     move-result-wide v6
 
@@ -623,7 +623,7 @@
 
     move-result-object v4
 
-    invoke-static {v4}, Lio/fabric/sdk/android/a/b/i;->dG(Ljava/lang/String;)J
+    invoke-static {v4}, Lio/fabric/sdk/android/a/b/i;->dA(Ljava/lang/String;)J
 
     move-result-wide v21
 
@@ -639,15 +639,15 @@
 
     invoke-direct {v9}, Ljava/util/LinkedList;-><init>()V
 
-    iget-object v7, v5, Lcom/crashlytics/android/core/ax;->tv:[Ljava/lang/StackTraceElement;
+    iget-object v7, v5, Lcom/crashlytics/android/core/ax;->tu:[Ljava/lang/StackTraceElement;
 
-    iget-object v4, v0, Lcom/crashlytics/android/core/k;->rf:Lcom/crashlytics/android/core/a;
+    iget-object v4, v0, Lcom/crashlytics/android/core/k;->re:Lcom/crashlytics/android/core/a;
 
-    iget-object v15, v4, Lcom/crashlytics/android/core/a;->qr:Ljava/lang/String;
+    iget-object v15, v4, Lcom/crashlytics/android/core/a;->qq:Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/crashlytics/android/core/k;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v4, v0, Lcom/crashlytics/android/core/k;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v14, v4, Lio/fabric/sdk/android/a/b/s;->beH:Ljava/lang/String;
+    iget-object v14, v4, Lio/fabric/sdk/android/a/b/s;->bfb:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -692,7 +692,7 @@
 
     aput-object v23, v10, v4
 
-    iget-object v6, v0, Lcom/crashlytics/android/core/k;->rl:Lcom/crashlytics/android/core/aw;
+    iget-object v6, v0, Lcom/crashlytics/android/core/k;->rk:Lcom/crashlytics/android/core/aw;
 
     invoke-interface {v11}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
@@ -742,9 +742,9 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, v0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v1, v0, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
-    iget-object v1, v1, Lcom/crashlytics/android/core/l;->sd:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, v1, Lcom/crashlytics/android/core/l;->sc:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-static {v1}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
 
@@ -771,7 +771,7 @@
     move-object v10, v1
 
     :goto_3
-    iget-object v11, v0, Lcom/crashlytics/android/core/k;->rh:Lcom/crashlytics/android/core/ac;
+    iget-object v11, v0, Lcom/crashlytics/android/core/k;->rg:Lcom/crashlytics/android/core/ac;
 
     move-object/from16 v1, p1
 
@@ -789,7 +789,7 @@
 
     const-string v0, "CrashlyticsCore"
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i;->bfk:Ljava/util/Comparator;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i;->bfF:Ljava/util/Comparator;
 
     invoke-static {p1, v1}, Ljava/util/Arrays;->sort([Ljava/lang/Object;Ljava/util/Comparator;)V
 
@@ -805,7 +805,7 @@
     aget-object v4, p1, v3
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -842,7 +842,7 @@
     :catch_0
     move-exception v4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -870,7 +870,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -881,11 +881,11 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->ro:Lcom/crashlytics/android/answers/p;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rn:Lcom/crashlytics/android/answers/p;
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -911,7 +911,7 @@
 
     invoke-virtual {v0, v1, p1, p2}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    iget-object p0, p0, Lcom/crashlytics/android/core/k;->ro:Lcom/crashlytics/android/answers/p;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rn:Lcom/crashlytics/android/answers/p;
 
     const-string p1, "clx"
 
@@ -922,7 +922,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1029,7 +1029,7 @@
 
     invoke-direct {v3, p1, v4}, Lcom/crashlytics/android/core/c;-><init>(Landroid/content/Context;Lcom/crashlytics/android/core/c$a;)V
 
-    invoke-virtual {v3, v2}, Lcom/crashlytics/android/core/c;->L(Ljava/lang/String;)Lorg/json/JSONArray;
+    invoke-virtual {v3, v2}, Lcom/crashlytics/android/core/c;->H(Ljava/lang/String;)Lorg/json/JSONArray;
 
     move-result-object p1
 
@@ -1086,7 +1086,7 @@
 
     invoke-direct {v6, v7}, Lcom/crashlytics/android/core/ae;-><init>(Ljava/io/File;)V
 
-    invoke-virtual {v6, p3}, Lcom/crashlytics/android/core/ae;->W(Ljava/lang/String;)Ljava/io/File;
+    invoke-virtual {v6, p3}, Lcom/crashlytics/android/core/ae;->S(Ljava/lang/String;)Ljava/io/File;
 
     move-result-object v6
 
@@ -1096,21 +1096,21 @@
 
     new-instance v7, Lcom/crashlytics/android/core/ac;
 
-    iget-object v8, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v8, p0, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
     iget-object v8, v8, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
-    iget-object v9, p0, Lcom/crashlytics/android/core/k;->rg:Lcom/crashlytics/android/core/k$g;
+    iget-object v9, p0, Lcom/crashlytics/android/core/k;->rf:Lcom/crashlytics/android/core/k$g;
 
     invoke-direct {v7, v8, v9, p3}, Lcom/crashlytics/android/core/ac;-><init>(Landroid/content/Context;Lcom/crashlytics/android/core/ac$a;Ljava/lang/String;)V
 
-    iget-object v8, v7, Lcom/crashlytics/android/core/ac;->sM:Lcom/crashlytics/android/core/aa;
+    iget-object v8, v7, Lcom/crashlytics/android/core/ac;->sL:Lcom/crashlytics/android/core/aa;
 
     invoke-interface {v8}, Lcom/crashlytics/android/core/aa;->cR()[B
 
     move-result-object v8
 
-    invoke-virtual {v7}, Lcom/crashlytics/android/core/ac;->cY()V
+    invoke-virtual {v7}, Lcom/crashlytics/android/core/ac;->cX()V
 
     new-instance v7, Lcom/crashlytics/android/core/ae;
 
@@ -1120,7 +1120,7 @@
 
     invoke-direct {v7, v9}, Lcom/crashlytics/android/core/ae;-><init>(Ljava/io/File;)V
 
-    invoke-virtual {v7, p3}, Lcom/crashlytics/android/core/ae;->X(Ljava/lang/String;)Ljava/io/File;
+    invoke-virtual {v7, p3}, Lcom/crashlytics/android/core/ae;->T(Ljava/lang/String;)Ljava/io/File;
 
     move-result-object v7
 
@@ -1130,7 +1130,7 @@
 
     new-instance v9, Ljava/io/File;
 
-    iget-object p0, p0, Lcom/crashlytics/android/core/k;->pe:Lio/fabric/sdk/android/a/f/a;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->pd:Lio/fabric/sdk/android/a/f/a;
 
     invoke-interface {p0}, Lio/fabric/sdk/android/a/f/a;->getFilesDir()Ljava/io/File;
 
@@ -1144,7 +1144,7 @@
 
     if-nez p0, :cond_6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1239,7 +1239,7 @@
 
     :cond_7
     :goto_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1291,7 +1291,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -1394,7 +1394,7 @@
 
     :goto_0
     :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v6
 
@@ -1512,7 +1512,7 @@
 
     move-result-object v8
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v7
 
@@ -1625,7 +1625,7 @@
 
     :goto_2
     :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v6
 
@@ -1754,7 +1754,7 @@
     return-void
 
     :cond_2
-    iget-object p1, p1, Lcom/crashlytics/android/core/g;->qH:Ljava/io/OutputStream;
+    iget-object p1, p1, Lcom/crashlytics/android/core/g;->qG:Ljava/io/OutputStream;
 
     invoke-virtual {p1, p2, v2, p0}, Ljava/io/OutputStream;->write([BII)V
 
@@ -2037,7 +2037,7 @@
 
     move/from16 v2, p3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -2060,7 +2060,7 @@
 
     move-result-object v6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v7
 
@@ -2076,7 +2076,7 @@
 
     invoke-interface {v7, v4, v8}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v7
 
@@ -2132,7 +2132,7 @@
     const/4 v10, 0x0
 
     :goto_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v11
 
@@ -2194,7 +2194,7 @@
     const/4 v12, 0x0
 
     :goto_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v15
 
@@ -2227,7 +2227,7 @@
     goto :goto_3
 
     :cond_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -2251,7 +2251,7 @@
 
     if-le v8, v2, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v8
 
@@ -2315,7 +2315,7 @@
     invoke-direct {v0, v5, v6, v11, v7}, Lcom/crashlytics/android/core/k;->a(Ljava/io/File;Ljava/lang/String;[Ljava/io/File;Ljava/io/File;)V
 
     :goto_5
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -2331,7 +2331,7 @@
 
     invoke-interface {v5, v4, v7}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-direct {v0, v6}, Lcom/crashlytics/android/core/k;->O(Ljava/lang/String;)V
+    invoke-direct {v0, v6}, Lcom/crashlytics/android/core/k;->K(Ljava/lang/String;)V
 
     add-int/lit8 v3, v3, 0x1
 
@@ -2366,7 +2366,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/crashlytics/android/core/k;->qY:Ljava/util/regex/Pattern;
+    sget-object v4, Lcom/crashlytics/android/core/k;->qX:Ljava/util/regex/Pattern;
 
     invoke-virtual {v4, v3}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -2380,7 +2380,7 @@
 
     if-nez v5, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -2413,7 +2413,7 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -2504,7 +2504,7 @@
 
     new-instance v1, Lcom/crashlytics/android/core/e;
 
-    iget-object v2, v11, Lcom/crashlytics/android/core/k;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v2, v11, Lcom/crashlytics/android/core/k;->qu:Lio/fabric/sdk/android/a/b/s;
 
     invoke-direct {v1, v2}, Lcom/crashlytics/android/core/e;-><init>(Lio/fabric/sdk/android/a/b/s;)V
 
@@ -2512,7 +2512,7 @@
 
     move-result-object v12
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -2584,29 +2584,29 @@
 
     invoke-direct {v11, v12, v0, v9}, Lcom/crashlytics/android/core/k;->a(Ljava/lang/String;Ljava/lang/String;Lcom/crashlytics/android/core/k$e;)V
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v7, v0, Lio/fabric/sdk/android/a/b/s;->beH:Ljava/lang/String;
+    iget-object v7, v0, Lio/fabric/sdk/android/a/b/s;->bfb:Ljava/lang/String;
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rf:Lcom/crashlytics/android/core/a;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->re:Lcom/crashlytics/android/core/a;
 
-    iget-object v8, v0, Lcom/crashlytics/android/core/a;->qw:Ljava/lang/String;
+    iget-object v8, v0, Lcom/crashlytics/android/core/a;->qv:Ljava/lang/String;
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rf:Lcom/crashlytics/android/core/a;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->re:Lcom/crashlytics/android/core/a;
 
     iget-object v9, v0, Lcom/crashlytics/android/core/a;->versionName:Ljava/lang/String;
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/s;->Dc()Ljava/lang/String;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/s;->CT()Ljava/lang/String;
 
     move-result-object v10
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rf:Lcom/crashlytics/android/core/a;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->re:Lcom/crashlytics/android/core/a;
 
     iget-object v0, v0, Lcom/crashlytics/android/core/a;->installerPackageName:Ljava/lang/String;
 
-    invoke-static {v0}, Lio/fabric/sdk/android/a/b/m;->dH(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/m;
+    invoke-static {v0}, Lio/fabric/sdk/android/a/b/m;->dB(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/m;
 
     move-result-object v0
 
@@ -2642,7 +2642,7 @@
 
     invoke-direct {v11, v12, v0, v14}, Lcom/crashlytics/android/core/k;->a(Ljava/lang/String;Ljava/lang/String;Lcom/crashlytics/android/core/k$e;)V
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
     iget-object v0, v0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -2666,7 +2666,7 @@
 
     invoke-direct {v11, v12, v0, v1}, Lcom/crashlytics/android/core/k;->a(Ljava/lang/String;Ljava/lang/String;Lcom/crashlytics/android/core/k$e;)V
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
     iget-object v0, v0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -2682,7 +2682,7 @@
 
     invoke-direct {v1, v2}, Landroid/os/StatFs;-><init>(Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->CX()I
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->CO()I
 
     move-result v13
 
@@ -2694,7 +2694,7 @@
 
     move-result v14
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->CY()J
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->CP()J
 
     move-result-wide v15
 
@@ -2716,7 +2716,7 @@
 
     move-result v19
 
-    iget-object v1, v11, Lcom/crashlytics/android/core/k;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, v11, Lcom/crashlytics/android/core/k;->qu:Lio/fabric/sdk/android/a/b/s;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/s;->cg()Ljava/util/Map;
 
@@ -2768,9 +2768,9 @@
 
     invoke-direct {v11, v12, v0, v15}, Lcom/crashlytics/android/core/k;->a(Ljava/lang/String;Ljava/lang/String;Lcom/crashlytics/android/core/k$e;)V
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rh:Lcom/crashlytics/android/core/ac;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rg:Lcom/crashlytics/android/core/ac;
 
-    invoke-virtual {v0, v12}, Lcom/crashlytics/android/core/ac;->T(Ljava/lang/String;)V
+    invoke-virtual {v0, v12}, Lcom/crashlytics/android/core/ac;->P(Ljava/lang/String;)V
 
     return-void
 .end method
@@ -2780,7 +2780,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -2793,17 +2793,17 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
     iget-object v0, v0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
-    iget-object v1, p1, Lio/fabric/sdk/android/a/g/t;->bjh:Lio/fabric/sdk/android/a/g/e;
+    iget-object v1, p1, Lio/fabric/sdk/android/a/g/t;->bjB:Lio/fabric/sdk/android/a/g/e;
 
-    iget-object v1, v1, Lio/fabric/sdk/android/a/g/e;->biw:Ljava/lang/String;
+    iget-object v1, v1, Lio/fabric/sdk/android/a/g/e;->biQ:Ljava/lang/String;
 
-    iget-object p1, p1, Lio/fabric/sdk/android/a/g/t;->bjh:Lio/fabric/sdk/android/a/g/e;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/t;->bjB:Lio/fabric/sdk/android/a/g/e;
 
-    iget-object p1, p1, Lio/fabric/sdk/android/a/g/e;->bix:Ljava/lang/String;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/e;->biR:Ljava/lang/String;
 
     invoke-virtual {p0, v1, p1}, Lcom/crashlytics/android/core/k;->h(Ljava/lang/String;Ljava/lang/String;)Lcom/crashlytics/android/core/v;
 
@@ -2811,13 +2811,13 @@
 
     new-instance v1, Lcom/crashlytics/android/core/ar;
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/k;->rf:Lcom/crashlytics/android/core/a;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k;->re:Lcom/crashlytics/android/core/a;
 
-    iget-object v2, v2, Lcom/crashlytics/android/core/a;->pP:Ljava/lang/String;
+    iget-object v2, v2, Lcom/crashlytics/android/core/a;->pO:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k;->ri:Lcom/crashlytics/android/core/ar$c;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k;->rh:Lcom/crashlytics/android/core/ar$c;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rj:Lcom/crashlytics/android/core/ar$b;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k;->ri:Lcom/crashlytics/android/core/ar$b;
 
     invoke-direct {v1, v2, p1, v3, v4}, Lcom/crashlytics/android/core/ar;-><init>(Ljava/lang/String;Lcom/crashlytics/android/core/v;Lcom/crashlytics/android/core/ar$c;Lcom/crashlytics/android/core/ar$b;)V
 
@@ -2836,11 +2836,11 @@
 
     new-instance v5, Lcom/crashlytics/android/core/au;
 
-    sget-object v6, Lcom/crashlytics/android/core/k;->qZ:Ljava/util/Map;
+    sget-object v6, Lcom/crashlytics/android/core/k;->qY:Ljava/util/Map;
 
     invoke-direct {v5, v4, v6}, Lcom/crashlytics/android/core/au;-><init>(Ljava/io/File;Ljava/util/Map;)V
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance v6, Lcom/crashlytics/android/core/k$k;
 
@@ -2875,7 +2875,7 @@
 
     if-nez v11, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -2904,7 +2904,7 @@
 
     if-nez v2, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -2921,7 +2921,7 @@
 
     :goto_0
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -2951,13 +2951,13 @@
 
     invoke-interface {v0, v12, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v8, Lcom/crashlytics/android/core/k;->rb:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v8, Lcom/crashlytics/android/core/k;->ra:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
 
     move-result v0
 
-    invoke-static {v0}, Lio/fabric/sdk/android/a/b/i;->dg(I)Ljava/lang/String;
+    invoke-static {v0}, Lio/fabric/sdk/android/a/b/i;->dd(I)Ljava/lang/String;
 
     move-result-object v0
 
@@ -3053,7 +3053,7 @@
 
     :goto_1
     :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -3082,7 +3082,7 @@
 
     move-object v1, v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -3106,7 +3106,7 @@
 .method static synthetic c(Lcom/crashlytics/android/core/k;)Lcom/crashlytics/android/core/ac;
     .locals 0
 
-    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rh:Lcom/crashlytics/android/core/ac;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rg:Lcom/crashlytics/android/core/ac;
 
     return-object p0
 .end method
@@ -3159,13 +3159,13 @@
 .method private co()[Ljava/io/File;
     .locals 2
 
-    sget-object v0, Lcom/crashlytics/android/core/k;->qT:Ljava/io/FilenameFilter;
+    sget-object v0, Lcom/crashlytics/android/core/k;->qS:Ljava/io/FilenameFilter;
 
     invoke-virtual {p0, v0}, Lcom/crashlytics/android/core/k;->a(Ljava/io/FilenameFilter;)[Ljava/io/File;
 
     move-result-object v0
 
-    sget-object v1, Lcom/crashlytics/android/core/k;->qW:Ljava/util/Comparator;
+    sget-object v1, Lcom/crashlytics/android/core/k;->qV:Ljava/util/Comparator;
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->sort([Ljava/lang/Object;Ljava/util/Comparator;)V
 
@@ -3195,7 +3195,7 @@
 .method static synthetic cv()Ljava/util/regex/Pattern;
     .locals 1
 
-    sget-object v0, Lcom/crashlytics/android/core/k;->qY:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/crashlytics/android/core/k;->qX:Ljava/util/regex/Pattern;
 
     return-object v0
 .end method
@@ -3296,7 +3296,7 @@
 
     invoke-direct {v1, p1}, Lcom/crashlytics/android/core/k$d;-><init>(Ljava/lang/String;)V
 
-    sget-object p1, Lcom/crashlytics/android/core/k;->qX:Ljava/util/Comparator;
+    sget-object p1, Lcom/crashlytics/android/core/k;->qW:Ljava/util/Comparator;
 
     invoke-static {v0, v1, p2, p1}, Lcom/crashlytics/android/core/ba;->a(Ljava/io/File;Ljava/io/FilenameFilter;ILjava/util/Comparator;)I
 
@@ -3306,7 +3306,7 @@
 .method static synthetic f(Lcom/crashlytics/android/core/k;)Lcom/crashlytics/android/core/a;
     .locals 0
 
-    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rf:Lcom/crashlytics/android/core/a;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->re:Lcom/crashlytics/android/core/a;
 
     return-object p0
 .end method
@@ -3314,7 +3314,7 @@
 .method static synthetic g(Lcom/crashlytics/android/core/k;)Ljava/lang/String;
     .locals 0
 
-    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rm:Ljava/lang/String;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rl:Ljava/lang/String;
 
     return-object p0
 .end method
@@ -3362,7 +3362,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -3379,15 +3379,15 @@
 
     invoke-direct {v1, p0, p1}, Lio/fabric/sdk/android/a/b/j$a;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->oL:Lcom/crashlytics/android/answers/ac;
+    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
 
     if-eqz p0, :cond_2
 
-    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->oL:Lcom/crashlytics/android/answers/ac;
+    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
 
     iget-object p1, v1, Lio/fabric/sdk/android/a/b/j;->sessionId:Ljava/lang/String;
 
-    iget-object v0, v1, Lio/fabric/sdk/android/a/b/j;->bfy:Ljava/lang/String;
+    iget-object v0, v1, Lio/fabric/sdk/android/a/b/j;->bfS:Ljava/lang/String;
 
     invoke-static {}, Landroid/os/Looper;->myLooper()Landroid/os/Looper;
 
@@ -3399,7 +3399,7 @@
 
     if-eq v1, v2, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -3409,7 +3409,7 @@
 
     invoke-interface {v1, v2, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p0, p0, Lcom/crashlytics/android/answers/ac;->pR:Lcom/crashlytics/android/answers/e;
+    iget-object p0, p0, Lcom/crashlytics/android/answers/ac;->pQ:Lcom/crashlytics/android/answers/e;
 
     const-string v1, "sessionId"
 
@@ -3419,11 +3419,11 @@
 
     new-instance v1, Lcom/crashlytics/android/answers/ae$a;
 
-    sget-object v2, Lcom/crashlytics/android/answers/ae$b;->qg:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v2, Lcom/crashlytics/android/answers/ae$b;->qf:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-direct {v1, v2}, Lcom/crashlytics/android/answers/ae$a;-><init>(Lcom/crashlytics/android/answers/ae$b;)V
 
-    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->pW:Ljava/util/Map;
+    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->pV:Ljava/util/Map;
 
     const-string p1, "exceptionName"
 
@@ -3431,7 +3431,7 @@
 
     move-result-object p1
 
-    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->pY:Ljava/util/Map;
+    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->pX:Ljava/util/Map;
 
     const/4 p1, 0x1
 
@@ -3460,7 +3460,7 @@
 .method final a(JLjava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance v1, Lcom/crashlytics/android/core/k$24;
 
@@ -3477,7 +3477,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -3507,9 +3507,9 @@
 
     invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rk:Lcom/crashlytics/android/core/y;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rj:Lcom/crashlytics/android/core/y;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/y;->sC:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lcom/crashlytics/android/core/y;->sB:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v2, 0x0
 
@@ -3521,13 +3521,13 @@
 
     iget-object v1, v0, Lcom/crashlytics/android/core/y;->context:Landroid/content/Context;
 
-    iget-object v2, v0, Lcom/crashlytics/android/core/y;->sE:Landroid/content/BroadcastReceiver;
+    iget-object v2, v0, Lcom/crashlytics/android/core/y;->sD:Landroid/content/BroadcastReceiver;
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->unregisterReceiver(Landroid/content/BroadcastReceiver;)V
 
     iget-object v1, v0, Lcom/crashlytics/android/core/y;->context:Landroid/content/Context;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/y;->sD:Landroid/content/BroadcastReceiver;
+    iget-object v0, v0, Lcom/crashlytics/android/core/y;->sC:Landroid/content/BroadcastReceiver;
 
     invoke-virtual {v1, v0}, Landroid/content/Context;->unregisterReceiver(Landroid/content/BroadcastReceiver;)V
 
@@ -3536,7 +3536,7 @@
 
     invoke-direct {v2}, Ljava/util/Date;-><init>()V
 
-    iget-object v7, p0, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v7, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance v8, Lcom/crashlytics/android/core/k$23;
 
@@ -3614,7 +3614,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rh:Lcom/crashlytics/android/core/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rg:Lcom/crashlytics/android/core/ac;
 
     invoke-virtual {v0, v1}, Lcom/crashlytics/android/core/ac;->a(Ljava/util/Set;)V
 
@@ -3638,7 +3638,7 @@
 
     if-gt v1, p2, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -3663,19 +3663,19 @@
 
     new-instance v3, Lcom/crashlytics/android/core/az;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
     invoke-virtual {v4}, Lcom/crashlytics/android/core/l;->cE()Ljava/lang/String;
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v5, p0, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
     invoke-virtual {v5}, Lcom/crashlytics/android/core/l;->getUserName()Ljava/lang/String;
 
     move-result-object v5
 
-    iget-object v6, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v6, p0, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
     invoke-virtual {v6}, Lcom/crashlytics/android/core/l;->cF()Ljava/lang/String;
 
@@ -3694,7 +3694,7 @@
 
     invoke-direct {v3, v4}, Lcom/crashlytics/android/core/ae;-><init>(Ljava/io/File;)V
 
-    invoke-virtual {v3, v1}, Lcom/crashlytics/android/core/ae;->V(Ljava/lang/String;)Lcom/crashlytics/android/core/az;
+    invoke-virtual {v3, v1}, Lcom/crashlytics/android/core/ae;->R(Ljava/lang/String;)Lcom/crashlytics/android/core/az;
 
     move-result-object v3
 
@@ -3709,7 +3709,7 @@
 
     if-nez p1, :cond_3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -3720,7 +3720,7 @@
     return-void
 
     :cond_3
-    iget p1, p1, Lio/fabric/sdk/android/a/g/p;->biU:I
+    iget p1, p1, Lio/fabric/sdk/android/a/g/p;->bjo:I
 
     invoke-direct {p0, v0, p2, p1}, Lcom/crashlytics/android/core/k;->a([Ljava/io/File;II)V
 
@@ -3730,7 +3730,7 @@
 .method public final a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance v1, Lcom/crashlytics/android/core/k$2;
 
@@ -3751,17 +3751,17 @@
     return v0
 
     :cond_0
-    iget-object p1, p1, Lio/fabric/sdk/android/a/g/t;->bjj:Lio/fabric/sdk/android/a/g/m;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/t;->bjD:Lio/fabric/sdk/android/a/g/m;
 
-    iget-boolean p1, p1, Lio/fabric/sdk/android/a/g/m;->biH:Z
+    iget-boolean p1, p1, Lio/fabric/sdk/android/a/g/m;->bjb:Z
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/k;->re:Lcom/crashlytics/android/core/al;
+    iget-object p1, p0, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/al;
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/al;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, p1, Lcom/crashlytics/android/core/al;->sT:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->DO()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->DE()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -3779,13 +3779,13 @@
 
     new-instance v1, Lio/fabric/sdk/android/a/f/d;
 
-    iget-object v5, p1, Lcom/crashlytics/android/core/al;->sV:Lcom/crashlytics/android/core/l;
+    iget-object v5, p1, Lcom/crashlytics/android/core/al;->sU:Lcom/crashlytics/android/core/l;
 
     invoke-direct {v1, v5}, Lio/fabric/sdk/android/a/f/d;-><init>(Lio/fabric/sdk/android/i;)V
 
-    iget-object v5, p1, Lcom/crashlytics/android/core/al;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object v5, p1, Lcom/crashlytics/android/core/al;->sT:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v5}, Lio/fabric/sdk/android/a/f/c;->DO()Landroid/content/SharedPreferences;
+    invoke-interface {v5}, Lio/fabric/sdk/android/a/f/c;->DE()Landroid/content/SharedPreferences;
 
     move-result-object v5
 
@@ -3795,7 +3795,7 @@
 
     if-nez v5, :cond_1
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->DO()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->DE()Landroid/content/SharedPreferences;
 
     move-result-object v5
 
@@ -3815,7 +3815,7 @@
     :goto_0
     if-eqz v5, :cond_2
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->DO()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->DE()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -3823,9 +3823,9 @@
 
     move-result v1
 
-    iget-object v5, p1, Lcom/crashlytics/android/core/al;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object v5, p1, Lcom/crashlytics/android/core/al;->sT:Lio/fabric/sdk/android/a/f/c;
 
-    iget-object v6, p1, Lcom/crashlytics/android/core/al;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object v6, p1, Lcom/crashlytics/android/core/al;->sT:Lio/fabric/sdk/android/a/f/c;
 
     invoke-interface {v6}, Lio/fabric/sdk/android/a/f/c;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -3838,9 +3838,9 @@
     invoke-interface {v5, v1}, Lio/fabric/sdk/android/a/f/c;->a(Landroid/content/SharedPreferences$Editor;)Z
 
     :cond_2
-    iget-object v1, p1, Lcom/crashlytics/android/core/al;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, p1, Lcom/crashlytics/android/core/al;->sT:Lio/fabric/sdk/android/a/f/c;
 
-    iget-object v5, p1, Lcom/crashlytics/android/core/al;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object v5, p1, Lcom/crashlytics/android/core/al;->sT:Lio/fabric/sdk/android/a/f/c;
 
     invoke-interface {v5}, Lio/fabric/sdk/android/a/f/c;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -3853,9 +3853,9 @@
     invoke-interface {v1, v2}, Lio/fabric/sdk/android/a/f/c;->a(Landroid/content/SharedPreferences$Editor;)Z
 
     :cond_3
-    iget-object p1, p1, Lcom/crashlytics/android/core/al;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object p1, p1, Lcom/crashlytics/android/core/al;->sT:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->DO()Landroid/content/SharedPreferences;
+    invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->DE()Landroid/content/SharedPreferences;
 
     move-result-object p1
 
@@ -3896,7 +3896,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/crashlytics/android/core/k;->qU:Ljava/io/FilenameFilter;
+    sget-object v2, Lcom/crashlytics/android/core/k;->qT:Ljava/io/FilenameFilter;
 
     invoke-static {v1, v2}, Lcom/crashlytics/android/core/k;->a(Ljava/io/File;Ljava/io/FilenameFilter;)[Ljava/io/File;
 
@@ -3908,7 +3908,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/crashlytics/android/core/k;->qU:Ljava/io/FilenameFilter;
+    sget-object v2, Lcom/crashlytics/android/core/k;->qT:Ljava/io/FilenameFilter;
 
     invoke-static {v1, v2}, Lcom/crashlytics/android/core/k;->a(Ljava/io/File;Ljava/io/FilenameFilter;)[Ljava/io/File;
 
@@ -3920,7 +3920,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/crashlytics/android/core/k;->qU:Ljava/io/FilenameFilter;
+    sget-object v2, Lcom/crashlytics/android/core/k;->qT:Ljava/io/FilenameFilter;
 
     invoke-static {v1, v2}, Lcom/crashlytics/android/core/k;->a(Ljava/io/File;Ljava/io/FilenameFilter;)[Ljava/io/File;
 
@@ -4021,11 +4021,11 @@
 .method final cq()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rp:Lcom/crashlytics/android/core/t;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->ro:Lcom/crashlytics/android/core/t;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/t;->sv:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, v0, Lcom/crashlytics/android/core/t;->su:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -4094,7 +4094,7 @@
 .method final getFilesDir()Ljava/io/File;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->pe:Lio/fabric/sdk/android/a/f/a;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->pd:Lio/fabric/sdk/android/a/f/a;
 
     invoke-interface {v0}, Lio/fabric/sdk/android/a/f/a;->getFilesDir()Ljava/io/File;
 
@@ -4106,7 +4106,7 @@
 .method final h(Ljava/lang/String;Ljava/lang/String;)Lcom/crashlytics/android/core/v;
     .locals 4
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
     iget-object v0, v0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -4118,17 +4118,17 @@
 
     new-instance v1, Lcom/crashlytics/android/core/x;
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k;->pr:Lio/fabric/sdk/android/a/e/e;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k;->pq:Lio/fabric/sdk/android/a/e/e;
 
     invoke-direct {v1, v2, v0, p1, v3}, Lcom/crashlytics/android/core/x;-><init>(Lio/fabric/sdk/android/i;Ljava/lang/String;Ljava/lang/String;Lio/fabric/sdk/android/a/e/e;)V
 
     new-instance p1, Lcom/crashlytics/android/core/ah;
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k;->pr:Lio/fabric/sdk/android/a/e/e;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k;->pq:Lio/fabric/sdk/android/a/e/e;
 
     invoke-direct {p1, v2, v0, p2, v3}, Lcom/crashlytics/android/core/ah;-><init>(Lio/fabric/sdk/android/i;Ljava/lang/String;Ljava/lang/String;Lio/fabric/sdk/android/a/e/e;)V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/l$1.smali b/com.discord/smali/com/crashlytics/android/core/l$1.smali
index 5e5afe3611..d2874f2c01 100644
--- a/com.discord/smali/com/crashlytics/android/core/l$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/l$1.smali
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic so:Lcom/crashlytics/android/core/l;
+.field final synthetic sn:Lcom/crashlytics/android/core/l;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/l;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/l$1;->so:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l$1;->sn:Lcom/crashlytics/android/core/l;
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a/c/g;-><init>()V
 
@@ -42,7 +42,7 @@
 .method public final cI()I
     .locals 1
 
-    sget v0, Lio/fabric/sdk/android/a/c/e;->bgW:I
+    sget v0, Lio/fabric/sdk/android/a/c/e;->bhq:I
 
     return v0
 .end method
@@ -55,7 +55,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/l$1;->so:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l$1;->sn:Lcom/crashlytics/android/core/l;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/l;->cC()Ljava/lang/Void;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/l$2.smali b/com.discord/smali/com/crashlytics/android/core/l$2.smali
index de154f9aec..b25308fb68 100644
--- a/com.discord/smali/com/crashlytics/android/core/l$2.smali
+++ b/com.discord/smali/com/crashlytics/android/core/l$2.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic so:Lcom/crashlytics/android/core/l;
+.field final synthetic sn:Lcom/crashlytics/android/core/l;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/l;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/l$2;->so:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l$2;->sn:Lcom/crashlytics/android/core/l;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/l$2;->so:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l$2;->sn:Lcom/crashlytics/android/core/l;
 
     invoke-static {v0}, Lcom/crashlytics/android/core/l;->a(Lcom/crashlytics/android/core/l;)Lcom/crashlytics/android/core/m;
 
@@ -59,7 +59,7 @@
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/m;->cK()Z
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/l$3.smali b/com.discord/smali/com/crashlytics/android/core/l$3.smali
index 50a16b572a..be1a6f2b9c 100644
--- a/com.discord/smali/com/crashlytics/android/core/l$3.smali
+++ b/com.discord/smali/com/crashlytics/android/core/l$3.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic so:Lcom/crashlytics/android/core/l;
+.field final synthetic sn:Lcom/crashlytics/android/core/l;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/l;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/l$3;->so:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l$3;->sn:Lcom/crashlytics/android/core/l;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,7 +52,7 @@
     const-string v0, "CrashlyticsCore"
 
     :try_start_0
-    iget-object v1, p0, Lcom/crashlytics/android/core/l$3;->so:Lcom/crashlytics/android/core/l;
+    iget-object v1, p0, Lcom/crashlytics/android/core/l$3;->sn:Lcom/crashlytics/android/core/l;
 
     invoke-static {v1}, Lcom/crashlytics/android/core/l;->a(Lcom/crashlytics/android/core/l;)Lcom/crashlytics/android/core/m;
 
@@ -66,7 +66,7 @@
 
     move-result v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -93,7 +93,7 @@
     :catch_0
     move-exception v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/crashlytics/android/core/l$a.smali b/com.discord/smali/com/crashlytics/android/core/l$a.smali
index 1999821f93..2e6a240ae7 100644
--- a/com.discord/smali/com/crashlytics/android/core/l$a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/l$a.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field private final sf:Lcom/crashlytics/android/core/m;
+.field private final se:Lcom/crashlytics/android/core/m;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/l$a;->sf:Lcom/crashlytics/android/core/m;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l$a;->se:Lcom/crashlytics/android/core/m;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/l$a;->sf:Lcom/crashlytics/android/core/m;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l$a;->se:Lcom/crashlytics/android/core/m;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/m;->cL()Ljava/io/File;
 
@@ -68,7 +68,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -78,7 +78,7 @@
 
     invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/l$a;->sf:Lcom/crashlytics/android/core/m;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l$a;->se:Lcom/crashlytics/android/core/m;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/m;->cL()Ljava/io/File;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/l.smali b/com.discord/smali/com/crashlytics/android/core/l.smali
index 6ebf2cf47a..817dfd494e 100644
--- a/com.discord/smali/com/crashlytics/android/core/l.smali
+++ b/com.discord/smali/com/crashlytics/android/core/l.smali
@@ -27,11 +27,11 @@
 
 
 # instance fields
-.field private pr:Lio/fabric/sdk/android/a/e/e;
+.field private pq:Lio/fabric/sdk/android/a/e/e;
 
-.field private rd:Lcom/crashlytics/android/core/j;
+.field private rc:Lcom/crashlytics/android/core/j;
 
-.field public final sd:Ljava/util/concurrent/ConcurrentHashMap;
+.field public final sc:Ljava/util/concurrent/ConcurrentHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentHashMap<",
@@ -42,25 +42,25 @@
     .end annotation
 .end field
 
-.field private se:Lcom/crashlytics/android/core/m;
+.field private sd:Lcom/crashlytics/android/core/m;
 
-.field sf:Lcom/crashlytics/android/core/m;
+.field se:Lcom/crashlytics/android/core/m;
 
-.field private sg:Lcom/crashlytics/android/core/o;
+.field private sf:Lcom/crashlytics/android/core/o;
 
-.field public sh:Lcom/crashlytics/android/core/k;
+.field public sg:Lcom/crashlytics/android/core/k;
+
+.field public sh:Ljava/lang/String;
 
 .field public si:Ljava/lang/String;
 
-.field public sj:Ljava/lang/String;
+.field private sj:F
 
-.field private sk:F
+.field public sk:Z
 
-.field public sl:Z
+.field private final sl:Lcom/crashlytics/android/core/ak;
 
-.field private final sm:Lcom/crashlytics/android/core/ak;
-
-.field public sn:Lcom/crashlytics/android/core/q;
+.field public sm:Lcom/crashlytics/android/core/q;
 
 .field private final startTime:J
 
@@ -83,7 +83,7 @@
 
     const-string p1, "Crashlytics Exception Handler"
 
-    invoke-static {p1}, Lio/fabric/sdk/android/a/b/o;->dI(Ljava/lang/String;)Ljava/util/concurrent/ThreadFactory;
+    invoke-static {p1}, Lio/fabric/sdk/android/a/b/o;->dC(Ljava/lang/String;)Ljava/util/concurrent/ThreadFactory;
 
     move-result-object v0
 
@@ -115,15 +115,15 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/l;->si:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sh:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sj:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l;->si:Ljava/lang/String;
 
     iput-object p1, p0, Lcom/crashlytics/android/core/l;->userName:Ljava/lang/String;
 
     const/high16 p2, 0x3f800000    # 1.0f
 
-    iput p2, p0, Lcom/crashlytics/android/core/l;->sk:F
+    iput p2, p0, Lcom/crashlytics/android/core/l;->sj:F
 
     new-instance p2, Lcom/crashlytics/android/core/l$b;
 
@@ -131,23 +131,23 @@
 
     invoke-direct {p2, p3}, Lcom/crashlytics/android/core/l$b;-><init>(B)V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/o;
+    iput-object p2, p0, Lcom/crashlytics/android/core/l;->sf:Lcom/crashlytics/android/core/o;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sm:Lcom/crashlytics/android/core/ak;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sl:Lcom/crashlytics/android/core/ak;
 
-    iput-boolean p3, p0, Lcom/crashlytics/android/core/l;->sl:Z
+    iput-boolean p3, p0, Lcom/crashlytics/android/core/l;->sk:Z
 
     new-instance p1, Lcom/crashlytics/android/core/j;
 
     invoke-direct {p1, p5}, Lcom/crashlytics/android/core/j;-><init>(Ljava/util/concurrent/ExecutorService;)V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/l;->rd:Lcom/crashlytics/android/core/j;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance p1, Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-direct {p1}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sd:Ljava/util/concurrent/ConcurrentHashMap;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sc:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
@@ -158,7 +158,7 @@
     return-void
 .end method
 
-.method public static P(Ljava/lang/String;)Z
+.method public static L(Ljava/lang/String;)Z
     .locals 3
 
     invoke-static {}, Lcom/crashlytics/android/core/l;->cD()Lcom/crashlytics/android/core/l;
@@ -167,7 +167,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
     if-nez v0, :cond_0
 
@@ -180,7 +180,7 @@
 
     :cond_1
     :goto_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -205,7 +205,7 @@
     return p0
 .end method
 
-.method public static Q(Ljava/lang/String;)Ljava/lang/String;
+.method public static M(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
     if-eqz p0, :cond_0
@@ -235,7 +235,7 @@
 .method static synthetic a(Lcom/crashlytics/android/core/l;)Lcom/crashlytics/android/core/m;
     .locals 0
 
-    iget-object p0, p0, Lcom/crashlytics/android/core/l;->se:Lcom/crashlytics/android/core/m;
+    iget-object p0, p0, Lcom/crashlytics/android/core/l;->sd:Lcom/crashlytics/android/core/m;
 
     return-object p0
 .end method
@@ -249,7 +249,7 @@
 
     const/4 v0, 0x3
 
-    invoke-static {v0}, Lio/fabric/sdk/android/a/b/i;->dh(I)Ljava/lang/String;
+    invoke-static {v0}, Lio/fabric/sdk/android/a/b/i;->de(I)Ljava/lang/String;
 
     move-result-object v0
 
@@ -295,9 +295,9 @@
 
     invoke-direct {v0, p0}, Lcom/crashlytics/android/core/l$1;-><init>(Lcom/crashlytics/android/core/l;)V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/i;->beN:Lio/fabric/sdk/android/h;
+    iget-object v1, p0, Lio/fabric/sdk/android/i;->bfh:Lio/fabric/sdk/android/h;
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/h;->Dk()Ljava/util/Collection;
+    invoke-virtual {v1}, Lio/fabric/sdk/android/h;->Da()Ljava/util/Collection;
 
     move-result-object v1
 
@@ -323,7 +323,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lio/fabric/sdk/android/i;->beM:Lio/fabric/sdk/android/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/i;->bfg:Lio/fabric/sdk/android/c;
 
     iget-object v1, v1, Lio/fabric/sdk/android/c;->executorService:Ljava/util/concurrent/ExecutorService;
 
@@ -331,7 +331,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -357,7 +357,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -370,7 +370,7 @@
     :catch_1
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -383,7 +383,7 @@
     :catch_2
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -397,7 +397,7 @@
 .method private cH()V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/l;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance v1, Lcom/crashlytics/android/core/l$3;
 
@@ -419,7 +419,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/l;->Db()Z
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/l;->CS()Z
 
     move-result v1
 
@@ -429,7 +429,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -437,10 +437,10 @@
 
     invoke-interface {v1, v14, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iput-boolean v13, v12, Lcom/crashlytics/android/core/l;->sl:Z
+    iput-boolean v13, v12, Lcom/crashlytics/android/core/l;->sk:Z
 
     :cond_0
-    iget-boolean v1, v12, Lcom/crashlytics/android/core/l;->sl:Z
+    iget-boolean v1, v12, Lcom/crashlytics/android/core/l;->sk:Z
 
     const/4 v15, 0x0
 
@@ -476,7 +476,7 @@
 
     if-nez v1, :cond_3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -490,7 +490,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {v4}, Lio/fabric/sdk/android/a/b/i;->S(Ljava/lang/String;)Z
+    invoke-static {v4}, Lio/fabric/sdk/android/a/b/i;->O(Ljava/lang/String;)Z
 
     move-result v1
 
@@ -567,7 +567,7 @@
     const/4 v11, 0x0
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -593,7 +593,7 @@
 
     invoke-direct {v1, v2, v9}, Lcom/crashlytics/android/core/m;-><init>(Ljava/lang/String;Lio/fabric/sdk/android/a/f/a;)V
 
-    iput-object v1, v12, Lcom/crashlytics/android/core/l;->sf:Lcom/crashlytics/android/core/m;
+    iput-object v1, v12, Lcom/crashlytics/android/core/l;->se:Lcom/crashlytics/android/core/m;
 
     new-instance v1, Lcom/crashlytics/android/core/m;
 
@@ -601,7 +601,7 @@
 
     invoke-direct {v1, v2, v9}, Lcom/crashlytics/android/core/m;-><init>(Ljava/lang/String;Lio/fabric/sdk/android/a/f/a;)V
 
-    iput-object v1, v12, Lcom/crashlytics/android/core/l;->se:Lcom/crashlytics/android/core/m;
+    iput-object v1, v12, Lcom/crashlytics/android/core/l;->sd:Lcom/crashlytics/android/core/m;
 
     new-instance v1, Lio/fabric/sdk/android/a/f/d;
 
@@ -615,13 +615,13 @@
 
     invoke-direct {v10, v1, v12}, Lcom/crashlytics/android/core/al;-><init>(Lio/fabric/sdk/android/a/f/c;Lcom/crashlytics/android/core/l;)V
 
-    iget-object v1, v12, Lcom/crashlytics/android/core/l;->sm:Lcom/crashlytics/android/core/ak;
+    iget-object v1, v12, Lcom/crashlytics/android/core/l;->sl:Lcom/crashlytics/android/core/ak;
 
     if-eqz v1, :cond_5
 
     new-instance v1, Lcom/crashlytics/android/core/s;
 
-    iget-object v2, v12, Lcom/crashlytics/android/core/l;->sm:Lcom/crashlytics/android/core/ak;
+    iget-object v2, v12, Lcom/crashlytics/android/core/l;->sl:Lcom/crashlytics/android/core/ak;
 
     invoke-direct {v1, v2}, Lcom/crashlytics/android/core/s;-><init>(Lcom/crashlytics/android/core/ak;)V
 
@@ -633,19 +633,19 @@
     :goto_2
     new-instance v2, Lio/fabric/sdk/android/a/e/b;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
     invoke-direct {v2, v5}, Lio/fabric/sdk/android/a/e/b;-><init>(Lio/fabric/sdk/android/l;)V
 
-    iput-object v2, v12, Lcom/crashlytics/android/core/l;->pr:Lio/fabric/sdk/android/a/e/e;
+    iput-object v2, v12, Lcom/crashlytics/android/core/l;->pq:Lio/fabric/sdk/android/a/e/e;
 
-    iget-object v2, v12, Lcom/crashlytics/android/core/l;->pr:Lio/fabric/sdk/android/a/e/e;
+    iget-object v2, v12, Lcom/crashlytics/android/core/l;->pq:Lio/fabric/sdk/android/a/e/e;
 
     invoke-interface {v2, v1}, Lio/fabric/sdk/android/a/e/e;->a(Lio/fabric/sdk/android/a/e/f;)V
 
-    iget-object v1, v12, Lio/fabric/sdk/android/i;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, v12, Lio/fabric/sdk/android/i;->qu:Lio/fabric/sdk/android/a/b/s;
 
     invoke-virtual/range {p1 .. p1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
@@ -713,9 +713,9 @@
 
     new-instance v5, Lcom/crashlytics/android/core/k;
 
-    iget-object v3, v12, Lcom/crashlytics/android/core/l;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v3, v12, Lcom/crashlytics/android/core/l;->rc:Lcom/crashlytics/android/core/j;
 
-    iget-object v4, v12, Lcom/crashlytics/android/core/l;->pr:Lio/fabric/sdk/android/a/e/e;
+    iget-object v4, v12, Lcom/crashlytics/android/core/l;->pq:Lio/fabric/sdk/android/a/e/e;
 
     move-object/from16 v17, v1
 
@@ -745,9 +745,9 @@
 
     invoke-direct/range {v1 .. v11}, Lcom/crashlytics/android/core/k;-><init>(Lcom/crashlytics/android/core/l;Lcom/crashlytics/android/core/j;Lio/fabric/sdk/android/a/e/e;Lio/fabric/sdk/android/a/b/s;Lcom/crashlytics/android/core/al;Lio/fabric/sdk/android/a/f/a;Lcom/crashlytics/android/core/a;Lcom/crashlytics/android/core/ay;Lcom/crashlytics/android/core/b;Lcom/crashlytics/android/answers/p;)V
 
-    iput-object v13, v12, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iput-object v13, v12, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, v12, Lcom/crashlytics/android/core/l;->se:Lcom/crashlytics/android/core/m;
+    iget-object v1, v12, Lcom/crashlytics/android/core/l;->sd:Lcom/crashlytics/android/core/m;
 
     invoke-virtual {v1}, Lcom/crashlytics/android/core/m;->cL()Ljava/io/File;
 
@@ -757,11 +757,11 @@
 
     move-result v1
 
-    iget-object v2, v12, Lcom/crashlytics/android/core/l;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v2, v12, Lcom/crashlytics/android/core/l;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance v3, Lcom/crashlytics/android/core/l$a;
 
-    iget-object v4, v12, Lcom/crashlytics/android/core/l;->sf:Lcom/crashlytics/android/core/m;
+    iget-object v4, v12, Lcom/crashlytics/android/core/l;->se:Lcom/crashlytics/android/core/m;
 
     invoke-direct {v3, v4}, Lcom/crashlytics/android/core/l$a;-><init>(Lcom/crashlytics/android/core/m;)V
 
@@ -783,13 +783,13 @@
 
     move-result v2
 
-    iget-object v3, v12, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object v3, v12, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
     invoke-static {}, Ljava/lang/Thread;->getDefaultUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
 
     move-result-object v4
 
-    iget-object v5, v3, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v5, v3, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance v6, Lcom/crashlytics/android/core/k$4;
 
@@ -809,9 +809,9 @@
 
     invoke-direct {v6, v5, v7, v2, v4}, Lcom/crashlytics/android/core/t;-><init>(Lcom/crashlytics/android/core/t$a;Lcom/crashlytics/android/core/t$b;ZLjava/lang/Thread$UncaughtExceptionHandler;)V
 
-    iput-object v6, v3, Lcom/crashlytics/android/core/k;->rp:Lcom/crashlytics/android/core/t;
+    iput-object v6, v3, Lcom/crashlytics/android/core/k;->ro:Lcom/crashlytics/android/core/t;
 
-    iget-object v2, v3, Lcom/crashlytics/android/core/k;->rp:Lcom/crashlytics/android/core/t;
+    iget-object v2, v3, Lcom/crashlytics/android/core/k;->ro:Lcom/crashlytics/android/core/t;
 
     invoke-static {v2}, Ljava/lang/Thread;->setDefaultUncaughtExceptionHandler(Ljava/lang/Thread$UncaughtExceptionHandler;)V
 
@@ -823,7 +823,7 @@
 
     if-eqz v0, :cond_7
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -838,7 +838,7 @@
     return v15
 
     :cond_7
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -853,7 +853,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -863,7 +863,7 @@
 
     const/4 v1, 0x0
 
-    iput-object v1, v12, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iput-object v1, v12, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
     return v15
 
@@ -910,7 +910,7 @@
 
     const-string v0, "CrashlyticsCore"
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/l;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v1, p0, Lcom/crashlytics/android/core/l;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance v2, Lcom/crashlytics/android/core/l$2;
 
@@ -918,9 +918,9 @@
 
     invoke-virtual {v1, v2}, Lcom/crashlytics/android/core/j;->a(Ljava/util/concurrent/Callable;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
-    iget-object v2, v1, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v2, v1, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance v3, Lcom/crashlytics/android/core/k$6;
 
@@ -931,11 +931,11 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
-    iget-object v2, v2, Lcom/crashlytics/android/core/k;->rk:Lcom/crashlytics/android/core/y;
+    iget-object v2, v2, Lcom/crashlytics/android/core/k;->rj:Lcom/crashlytics/android/core/y;
 
-    iget-object v3, v2, Lcom/crashlytics/android/core/y;->sC:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v3, v2, Lcom/crashlytics/android/core/y;->sB:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v4, 0x1
 
@@ -947,7 +947,7 @@
 
     iget-object v3, v2, Lcom/crashlytics/android/core/y;->context:Landroid/content/Context;
 
-    sget-object v5, Lcom/crashlytics/android/core/y;->sz:Landroid/content/IntentFilter;
+    sget-object v5, Lcom/crashlytics/android/core/y;->sy:Landroid/content/IntentFilter;
 
     invoke-virtual {v3, v1, v5}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
 
@@ -984,36 +984,36 @@
     const/4 v3, 0x1
 
     :goto_1
-    iput-boolean v3, v2, Lcom/crashlytics/android/core/y;->sF:Z
+    iput-boolean v3, v2, Lcom/crashlytics/android/core/y;->sE:Z
 
     iget-object v3, v2, Lcom/crashlytics/android/core/y;->context:Landroid/content/Context;
 
-    iget-object v5, v2, Lcom/crashlytics/android/core/y;->sE:Landroid/content/BroadcastReceiver;
+    iget-object v5, v2, Lcom/crashlytics/android/core/y;->sD:Landroid/content/BroadcastReceiver;
 
-    sget-object v6, Lcom/crashlytics/android/core/y;->sA:Landroid/content/IntentFilter;
+    sget-object v6, Lcom/crashlytics/android/core/y;->sz:Landroid/content/IntentFilter;
 
     invoke-virtual {v3, v5, v6}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
 
     iget-object v3, v2, Lcom/crashlytics/android/core/y;->context:Landroid/content/Context;
 
-    iget-object v2, v2, Lcom/crashlytics/android/core/y;->sD:Landroid/content/BroadcastReceiver;
+    iget-object v2, v2, Lcom/crashlytics/android/core/y;->sC:Landroid/content/BroadcastReceiver;
 
-    sget-object v5, Lcom/crashlytics/android/core/y;->sB:Landroid/content/IntentFilter;
+    sget-object v5, Lcom/crashlytics/android/core/y;->sA:Landroid/content/IntentFilter;
 
     invoke-virtual {v3, v2, v5}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
 
     :cond_3
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DV()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DL()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lio/fabric/sdk/android/a/g/q;->DS()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v2}, Lio/fabric/sdk/android/a/g/q;->DI()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v2
 
     if-nez v2, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -1030,21 +1030,21 @@
 
     :cond_4
     :try_start_1
-    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
-    iget-object v5, v2, Lio/fabric/sdk/android/a/g/t;->bjj:Lio/fabric/sdk/android/a/g/m;
+    iget-object v5, v2, Lio/fabric/sdk/android/a/g/t;->bjD:Lio/fabric/sdk/android/a/g/m;
 
-    iget-boolean v5, v5, Lio/fabric/sdk/android/a/g/m;->biL:Z
+    iget-boolean v5, v5, Lio/fabric/sdk/android/a/g/m;->bjf:Z
 
     if-eqz v5, :cond_5
 
-    iget-object v3, v3, Lcom/crashlytics/android/core/k;->rn:Lcom/crashlytics/android/core/b;
+    iget-object v3, v3, Lcom/crashlytics/android/core/k;->rm:Lcom/crashlytics/android/core/b;
 
     invoke-interface {v3}, Lcom/crashlytics/android/core/b;->ch()Z
 
     move-result v3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -1061,13 +1061,13 @@
     invoke-interface {v5, v0, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_5
-    iget-object v3, v2, Lio/fabric/sdk/android/a/g/t;->bjj:Lio/fabric/sdk/android/a/g/m;
+    iget-object v3, v2, Lio/fabric/sdk/android/a/g/t;->bjD:Lio/fabric/sdk/android/a/g/m;
 
-    iget-boolean v3, v3, Lio/fabric/sdk/android/a/g/m;->biJ:Z
+    iget-boolean v3, v3, Lio/fabric/sdk/android/a/g/m;->bjd:Z
 
     if-nez v3, :cond_6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -1090,13 +1090,13 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/l;->Db()Z
+    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/l;->CS()Z
 
     move-result v3
 
     if-nez v3, :cond_7
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -1113,11 +1113,11 @@
 
     :cond_7
     :try_start_3
-    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sn:Lcom/crashlytics/android/core/q;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sm:Lcom/crashlytics/android/core/q;
 
     if-eqz v3, :cond_8
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sn:Lcom/crashlytics/android/core/q;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sm:Lcom/crashlytics/android/core/q;
 
     invoke-interface {v3}, Lcom/crashlytics/android/core/q;->cM()Lcom/crashlytics/android/core/p;
 
@@ -1131,14 +1131,14 @@
     :goto_2
     if-eqz v3, :cond_a
 
-    iget-object v5, p0, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object v5, p0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
     if-nez v3, :cond_9
 
     goto :goto_3
 
     :cond_9
-    iget-object v4, v5, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v4, v5, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance v6, Lcom/crashlytics/android/core/k$8;
 
@@ -1157,7 +1157,7 @@
     :goto_3
     if-nez v4, :cond_a
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -1166,11 +1166,11 @@
     invoke-interface {v3, v0, v4}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_a
-    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
-    iget-object v4, v2, Lio/fabric/sdk/android/a/g/t;->bji:Lio/fabric/sdk/android/a/g/p;
+    iget-object v4, v2, Lio/fabric/sdk/android/a/g/t;->bjC:Lio/fabric/sdk/android/a/g/p;
 
-    iget-object v5, v3, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/j;
+    iget-object v5, v3, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/j;
 
     new-instance v6, Lcom/crashlytics/android/core/k$5;
 
@@ -1188,7 +1188,7 @@
 
     if-nez v3, :cond_b
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -1197,13 +1197,13 @@
     invoke-interface {v3, v0, v4}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_b
-    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
-    iget v4, p0, Lcom/crashlytics/android/core/l;->sk:F
+    iget v4, p0, Lcom/crashlytics/android/core/l;->sj:F
 
     if-nez v2, :cond_c
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -1214,13 +1214,13 @@
     goto :goto_5
 
     :cond_c
-    iget-object v5, v2, Lio/fabric/sdk/android/a/g/t;->bjh:Lio/fabric/sdk/android/a/g/e;
+    iget-object v5, v2, Lio/fabric/sdk/android/a/g/t;->bjB:Lio/fabric/sdk/android/a/g/e;
 
-    iget-object v5, v5, Lio/fabric/sdk/android/a/g/e;->biw:Ljava/lang/String;
+    iget-object v5, v5, Lio/fabric/sdk/android/a/g/e;->biQ:Ljava/lang/String;
 
-    iget-object v6, v2, Lio/fabric/sdk/android/a/g/t;->bjh:Lio/fabric/sdk/android/a/g/e;
+    iget-object v6, v2, Lio/fabric/sdk/android/a/g/t;->bjB:Lio/fabric/sdk/android/a/g/e;
 
-    iget-object v6, v6, Lio/fabric/sdk/android/a/g/e;->bix:Ljava/lang/String;
+    iget-object v6, v6, Lio/fabric/sdk/android/a/g/e;->biR:Ljava/lang/String;
 
     invoke-virtual {v3, v5, v6}, Lcom/crashlytics/android/core/k;->h(Ljava/lang/String;Ljava/lang/String;)Lcom/crashlytics/android/core/v;
 
@@ -1234,11 +1234,11 @@
 
     new-instance v6, Lcom/crashlytics/android/core/k$h;
 
-    iget-object v7, v3, Lcom/crashlytics/android/core/k;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v7, v3, Lcom/crashlytics/android/core/k;->rb:Lcom/crashlytics/android/core/l;
 
-    iget-object v8, v3, Lcom/crashlytics/android/core/k;->re:Lcom/crashlytics/android/core/al;
+    iget-object v8, v3, Lcom/crashlytics/android/core/k;->rd:Lcom/crashlytics/android/core/al;
 
-    iget-object v2, v2, Lio/fabric/sdk/android/a/g/t;->rX:Lio/fabric/sdk/android/a/g/o;
+    iget-object v2, v2, Lio/fabric/sdk/android/a/g/t;->rW:Lio/fabric/sdk/android/a/g/o;
 
     invoke-direct {v6, v7, v8, v2}, Lcom/crashlytics/android/core/k$h;-><init>(Lio/fabric/sdk/android/i;Lcom/crashlytics/android/core/al;Lio/fabric/sdk/android/a/g/o;)V
 
@@ -1252,13 +1252,13 @@
     :goto_4
     new-instance v2, Lcom/crashlytics/android/core/ar;
 
-    iget-object v7, v3, Lcom/crashlytics/android/core/k;->rf:Lcom/crashlytics/android/core/a;
+    iget-object v7, v3, Lcom/crashlytics/android/core/k;->re:Lcom/crashlytics/android/core/a;
 
-    iget-object v7, v7, Lcom/crashlytics/android/core/a;->pP:Ljava/lang/String;
+    iget-object v7, v7, Lcom/crashlytics/android/core/a;->pO:Ljava/lang/String;
 
-    iget-object v8, v3, Lcom/crashlytics/android/core/k;->ri:Lcom/crashlytics/android/core/ar$c;
+    iget-object v8, v3, Lcom/crashlytics/android/core/k;->rh:Lcom/crashlytics/android/core/ar$c;
 
-    iget-object v3, v3, Lcom/crashlytics/android/core/k;->rj:Lcom/crashlytics/android/core/ar$b;
+    iget-object v3, v3, Lcom/crashlytics/android/core/k;->ri:Lcom/crashlytics/android/core/ar$b;
 
     invoke-direct {v2, v7, v5, v8, v3}, Lcom/crashlytics/android/core/ar;-><init>(Ljava/lang/String;Lcom/crashlytics/android/core/v;Lcom/crashlytics/android/core/ar$c;Lcom/crashlytics/android/core/ar$b;)V
 
@@ -1278,7 +1278,7 @@
     move-exception v2
 
     :try_start_4
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -1302,13 +1302,13 @@
 .method final cE()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/i;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v0, p0, Lio/fabric/sdk/android/i;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    iget-boolean v0, v0, Lio/fabric/sdk/android/a/b/s;->bfY:Z
+    iget-boolean v0, v0, Lio/fabric/sdk/android/a/b/s;->bgs:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/l;->si:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l;->sh:Ljava/lang/String;
 
     return-object v0
 
@@ -1321,13 +1321,13 @@
 .method final cF()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/i;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v0, p0, Lio/fabric/sdk/android/i;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    iget-boolean v0, v0, Lio/fabric/sdk/android/a/b/s;->bfY:Z
+    iget-boolean v0, v0, Lio/fabric/sdk/android/a/b/s;->bgs:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/l;->sj:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l;->si:Ljava/lang/String;
 
     return-object v0
 
@@ -1348,9 +1348,9 @@
 .method final getUserName()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/i;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v0, p0, Lio/fabric/sdk/android/i;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    iget-boolean v0, v0, Lio/fabric/sdk/android/a/b/s;->bfY:Z
+    iget-boolean v0, v0, Lio/fabric/sdk/android/a/b/s;->bgs:Z
 
     if-eqz v0, :cond_0
 
@@ -1375,7 +1375,7 @@
 .method public j(Ljava/lang/String;Ljava/lang/String;)V
     .locals 4
 
-    iget-boolean v0, p0, Lcom/crashlytics/android/core/l;->sl:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/core/l;->sk:Z
 
     if-eqz v0, :cond_0
 
@@ -1384,7 +1384,7 @@
     :cond_0
     const-string v0, "prior to logging messages."
 
-    invoke-static {v0}, Lcom/crashlytics/android/core/l;->P(Ljava/lang/String;)Z
+    invoke-static {v0}, Lcom/crashlytics/android/core/l;->L(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -1401,7 +1401,7 @@
 
     sub-long/2addr v0, v2
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/l;->sh:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/l;->sg:Lcom/crashlytics/android/core/k;
 
     const/4 v3, 0x3
 
diff --git a/com.discord/smali/com/crashlytics/android/core/m.smali b/com.discord/smali/com/crashlytics/android/core/m.smali
index b6a7c24454..d70bd7b837 100644
--- a/com.discord/smali/com/crashlytics/android/core/m.smali
+++ b/com.discord/smali/com/crashlytics/android/core/m.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final pe:Lio/fabric/sdk/android/a/f/a;
+.field private final pd:Lio/fabric/sdk/android/a/f/a;
 
-.field private final sp:Ljava/lang/String;
+.field private final so:Ljava/lang/String;
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/m;->sp:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/m;->so:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/m;->pe:Lio/fabric/sdk/android/a/f/a;
+    iput-object p2, p0, Lcom/crashlytics/android/core/m;->pd:Lio/fabric/sdk/android/a/f/a;
 
     return-void
 .end method
@@ -43,7 +43,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -53,7 +53,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/m;->sp:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/m;->so:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -76,13 +76,13 @@
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/m;->pe:Lio/fabric/sdk/android/a/f/a;
+    iget-object v1, p0, Lcom/crashlytics/android/core/m;->pd:Lio/fabric/sdk/android/a/f/a;
 
     invoke-interface {v1}, Lio/fabric/sdk/android/a/f/a;->getFilesDir()Ljava/io/File;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/m;->sp:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/core/m;->so:Ljava/lang/String;
 
     invoke-direct {v0, v1, v2}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/p.smali b/com.discord/smali/com/crashlytics/android/core/p.smali
index 924edef66f..4e72407e7d 100644
--- a/com.discord/smali/com/crashlytics/android/core/p.smali
+++ b/com.discord/smali/com/crashlytics/android/core/p.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final sq:Ljava/util/TreeSet;
+.field public final sp:Ljava/util/TreeSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/TreeSet<",
@@ -29,7 +29,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/p;->sq:Ljava/util/TreeSet;
+    iput-object p1, p0, Lcom/crashlytics/android/core/p;->sp:Ljava/util/TreeSet;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/core/s.smali b/com.discord/smali/com/crashlytics/android/core/s.smali
index 9587d63bf4..aa53deef62 100644
--- a/com.discord/smali/com/crashlytics/android/core/s.smali
+++ b/com.discord/smali/com/crashlytics/android/core/s.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final sm:Lcom/crashlytics/android/core/ak;
+.field private final sl:Lcom/crashlytics/android/core/ak;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/s;->sm:Lcom/crashlytics/android/core/ak;
+    iput-object p1, p0, Lcom/crashlytics/android/core/s;->sl:Lcom/crashlytics/android/core/ak;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final cN()Ljava/io/InputStream;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sm:Lcom/crashlytics/android/core/ak;
+    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sl:Lcom/crashlytics/android/core/ak;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/ak;->cN()Ljava/io/InputStream;
 
@@ -38,7 +38,7 @@
 .method public final cO()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sm:Lcom/crashlytics/android/core/ak;
+    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sl:Lcom/crashlytics/android/core/ak;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/ak;->cO()Ljava/lang/String;
 
@@ -50,7 +50,7 @@
 .method public final cP()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sm:Lcom/crashlytics/android/core/ak;
+    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sl:Lcom/crashlytics/android/core/ak;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/ak;->cP()[Ljava/lang/String;
 
diff --git a/com.discord/smali/com/crashlytics/android/core/t.smali b/com.discord/smali/com/crashlytics/android/core/t.smali
index 7382f49131..75f7f6f5c1 100644
--- a/com.discord/smali/com/crashlytics/android/core/t.smali
+++ b/com.discord/smali/com/crashlytics/android/core/t.smali
@@ -16,15 +16,15 @@
 
 
 # instance fields
-.field private final sr:Lcom/crashlytics/android/core/t$a;
+.field private final sq:Lcom/crashlytics/android/core/t$a;
 
-.field private final ss:Lcom/crashlytics/android/core/t$b;
+.field private final sr:Lcom/crashlytics/android/core/t$b;
 
-.field private final st:Z
+.field private final ss:Z
 
-.field private final su:Ljava/lang/Thread$UncaughtExceptionHandler;
+.field private final st:Ljava/lang/Thread$UncaughtExceptionHandler;
 
-.field final sv:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final su:Ljava/util/concurrent/atomic/AtomicBoolean;
 
 
 # direct methods
@@ -33,13 +33,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/t;->sr:Lcom/crashlytics/android/core/t$a;
+    iput-object p1, p0, Lcom/crashlytics/android/core/t;->sq:Lcom/crashlytics/android/core/t$a;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/t;->ss:Lcom/crashlytics/android/core/t$b;
+    iput-object p2, p0, Lcom/crashlytics/android/core/t;->sr:Lcom/crashlytics/android/core/t$b;
 
-    iput-boolean p3, p0, Lcom/crashlytics/android/core/t;->st:Z
+    iput-boolean p3, p0, Lcom/crashlytics/android/core/t;->ss:Z
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/t;->su:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iput-object p4, p0, Lcom/crashlytics/android/core/t;->st:Ljava/lang/Thread$UncaughtExceptionHandler;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicBoolean;
 
@@ -47,7 +47,7 @@
 
     invoke-direct {p1, p2}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/t;->sv:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lcom/crashlytics/android/core/t;->su:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
     const-string v1, "CrashlyticsCore"
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/t;->sv:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v2, p0, Lcom/crashlytics/android/core/t;->su:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v3, 0x1
 
@@ -70,11 +70,11 @@
     const/4 v2, 0x0
 
     :try_start_0
-    iget-object v3, p0, Lcom/crashlytics/android/core/t;->sr:Lcom/crashlytics/android/core/t$a;
+    iget-object v3, p0, Lcom/crashlytics/android/core/t;->sq:Lcom/crashlytics/android/core/t$a;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/t;->ss:Lcom/crashlytics/android/core/t$b;
+    iget-object v4, p0, Lcom/crashlytics/android/core/t;->sr:Lcom/crashlytics/android/core/t$b;
 
-    iget-boolean v5, p0, Lcom/crashlytics/android/core/t;->st:Z
+    iget-boolean v5, p0, Lcom/crashlytics/android/core/t;->ss:Z
 
     invoke-interface {v3, v4, p1, p2, v5}, Lcom/crashlytics/android/core/t$a;->b(Lcom/crashlytics/android/core/t$b;Ljava/lang/Thread;Ljava/lang/Throwable;Z)V
     :try_end_0
@@ -82,17 +82,17 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :goto_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
     invoke-interface {v3, v1, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/t;->su:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object v0, p0, Lcom/crashlytics/android/core/t;->st:Ljava/lang/Thread$UncaughtExceptionHandler;
 
     invoke-interface {v0, p1, p2}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/t;->sv:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/crashlytics/android/core/t;->su:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {p1, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
@@ -107,7 +107,7 @@
     move-exception v3
 
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -120,17 +120,17 @@
     goto :goto_0
 
     :goto_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
     invoke-interface {v4, v1, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/t;->su:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object v0, p0, Lcom/crashlytics/android/core/t;->st:Ljava/lang/Thread$UncaughtExceptionHandler;
 
     invoke-interface {v0, p1, p2}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/t;->sv:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/crashlytics/android/core/t;->su:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {p1, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
diff --git a/com.discord/smali/com/crashlytics/android/core/u.smali b/com.discord/smali/com/crashlytics/android/core/u.smali
index 25eb789de9..ad8521a9a9 100644
--- a/com.discord/smali/com/crashlytics/android/core/u.smali
+++ b/com.discord/smali/com/crashlytics/android/core/u.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field public final pP:Ljava/lang/String;
+.field public final pO:Ljava/lang/String;
 
-.field public final sa:Lcom/crashlytics/android/core/aq;
+.field public final rZ:Lcom/crashlytics/android/core/aq;
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/u;->pP:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/u;->pO:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/u;->sa:Lcom/crashlytics/android/core/aq;
+    iput-object p2, p0, Lcom/crashlytics/android/core/u;->rZ:Lcom/crashlytics/android/core/aq;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/core/w$1.smali b/com.discord/smali/com/crashlytics/android/core/w$1.smali
index 3035572217..a4070cf73a 100644
--- a/com.discord/smali/com/crashlytics/android/core/w$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/w$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic sy:Lcom/crashlytics/android/core/w;
+.field final synthetic sx:Lcom/crashlytics/android/core/w;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/w;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/w$1;->sy:Lcom/crashlytics/android/core/w;
+    iput-object p1, p0, Lcom/crashlytics/android/core/w$1;->sx:Lcom/crashlytics/android/core/w;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -192,7 +192,7 @@
 
     if-nez p1, :cond_6
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/w$1;->sy:Lcom/crashlytics/android/core/w;
+    iget-object p1, p0, Lcom/crashlytics/android/core/w$1;->sx:Lcom/crashlytics/android/core/w;
 
     invoke-static {p1}, Lcom/crashlytics/android/core/w;->a(Lcom/crashlytics/android/core/w;)Lcom/crashlytics/android/core/l;
 
@@ -256,7 +256,7 @@
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/crashlytics/android/core/w.smali b/com.discord/smali/com/crashlytics/android/core/w.smali
index b3b80975f0..7a1b29f214 100644
--- a/com.discord/smali/com/crashlytics/android/core/w.smali
+++ b/com.discord/smali/com/crashlytics/android/core/w.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final sw:Ljava/util/List;
+.field private static final sv:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -19,9 +19,9 @@
 
 
 # instance fields
-.field private final rc:Lcom/crashlytics/android/core/l;
+.field private final rb:Lcom/crashlytics/android/core/l;
 
-.field private sx:Ljava/lang/Object;
+.field private sw:Ljava/lang/Object;
 
 
 # direct methods
@@ -64,7 +64,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/w;->sw:Ljava/util/List;
+    sput-object v0, Lcom/crashlytics/android/core/w;->sv:Ljava/util/List;
 
     return-void
 .end method
@@ -74,12 +74,12 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/w;->rc:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/w;->rb:Lcom/crashlytics/android/core/l;
 
     return-void
 .end method
 
-.method private R(Ljava/lang/String;)Ljava/lang/Class;
+.method private N(Ljava/lang/String;)Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -92,7 +92,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/w;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/w;->rb:Lcom/crashlytics/android/core/l;
 
     iget-object v0, v0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -117,7 +117,7 @@
 .method static synthetic a(Lcom/crashlytics/android/core/w;)Lcom/crashlytics/android/core/l;
     .locals 0
 
-    iget-object p0, p0, Lcom/crashlytics/android/core/w;->rc:Lcom/crashlytics/android/core/l;
+    iget-object p0, p0, Lcom/crashlytics/android/core/w;->rb:Lcom/crashlytics/android/core/l;
 
     return-object p0
 .end method
@@ -151,7 +151,7 @@
     return-void
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -175,7 +175,7 @@
 
     array-length v0, p0
 
-    sget-object v1, Lcom/crashlytics/android/core/w;->sw:Ljava/util/List;
+    sget-object v1, Lcom/crashlytics/android/core/w;->sv:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -188,7 +188,7 @@
     return v2
 
     :cond_0
-    sget-object v0, Lcom/crashlytics/android/core/w;->sw:Ljava/util/List;
+    sget-object v0, Lcom/crashlytics/android/core/w;->sv:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -321,7 +321,7 @@
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/w;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v2, p0, Lcom/crashlytics/android/core/w;->rb:Lcom/crashlytics/android/core/l;
 
     iget-object v2, v2, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -347,11 +347,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/w;->sx:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/crashlytics/android/core/w;->sw:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/w;->rc:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/w;->rb:Lcom/crashlytics/android/core/l;
 
     iget-object v0, v0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -375,10 +375,10 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/w;->sx:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/crashlytics/android/core/w;->sw:Ljava/lang/Object;
 
     :cond_0
-    iget-object p1, p0, Lcom/crashlytics/android/core/w;->sx:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/crashlytics/android/core/w;->sw:Ljava/lang/Object;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -401,7 +401,7 @@
 
     const-string v0, "com.google.android.gms.measurement.AppMeasurement"
 
-    invoke-direct {p0, v0}, Lcom/crashlytics/android/core/w;->R(Ljava/lang/String;)Ljava/lang/Class;
+    invoke-direct {p0, v0}, Lcom/crashlytics/android/core/w;->N(Ljava/lang/String;)Ljava/lang/Class;
 
     move-result-object v0
 
@@ -411,7 +411,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -428,7 +428,7 @@
 
     if-nez v3, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -441,13 +441,13 @@
     :cond_1
     const-string v4, "com.google.android.gms.measurement.AppMeasurement$OnEventListener"
 
-    invoke-direct {p0, v4}, Lcom/crashlytics/android/core/w;->R(Ljava/lang/String;)Ljava/lang/Class;
+    invoke-direct {p0, v4}, Lcom/crashlytics/android/core/w;->N(Ljava/lang/String;)Ljava/lang/Class;
 
     move-result-object v4
 
     if-nez v4, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -489,7 +489,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -517,7 +517,7 @@
     :catch_1
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
diff --git a/com.discord/smali/com/crashlytics/android/core/x.smali b/com.discord/smali/com/crashlytics/android/core/x.smali
index e02d496282..532df75195 100644
--- a/com.discord/smali/com/crashlytics/android/core/x.smali
+++ b/com.discord/smali/com/crashlytics/android/core/x.smali
@@ -10,7 +10,7 @@
 .method public constructor <init>(Lio/fabric/sdk/android/i;Ljava/lang/String;Ljava/lang/String;Lio/fabric/sdk/android/a/e/e;)V
     .locals 6
 
-    sget v5, Lio/fabric/sdk/android/a/e/c;->bhA:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->bhU:I
 
     move-object v0, p0
 
@@ -32,11 +32,11 @@
 .method public final a(Lcom/crashlytics/android/core/u;)Z
     .locals 14
 
-    invoke-virtual {p0}, Lcom/crashlytics/android/core/x;->CR()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lcom/crashlytics/android/core/x;->CI()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/u;->pP:Ljava/lang/String;
+    iget-object v1, p1, Lcom/crashlytics/android/core/u;->pO:Ljava/lang/String;
 
     const-string v2, "X-CRASHLYTICS-API-KEY"
 
@@ -52,7 +52,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/x;->oS:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lcom/crashlytics/android/core/x;->oR:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String;
 
@@ -64,9 +64,9 @@
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/u;->sa:Lcom/crashlytics/android/core/aq;
+    iget-object v1, p1, Lcom/crashlytics/android/core/u;->rZ:Lcom/crashlytics/android/core/aq;
 
-    invoke-interface {v1}, Lcom/crashlytics/android/core/aq;->cW()Ljava/util/Map;
+    invoke-interface {v1}, Lcom/crashlytics/android/core/aq;->cV()Ljava/util/Map;
 
     move-result-object v1
 
@@ -110,7 +110,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p1, Lcom/crashlytics/android/core/u;->sa:Lcom/crashlytics/android/core/aq;
+    iget-object p1, p1, Lcom/crashlytics/android/core/u;->rZ:Lcom/crashlytics/android/core/aq;
 
     invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getIdentifier()Ljava/lang/String;
 
@@ -122,7 +122,7 @@
 
     invoke-virtual {v0, v3, v2, v1}, Lio/fabric/sdk/android/a/e/d;->k(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
 
-    invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cV()[Ljava/io/File;
+    invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cU()[Ljava/io/File;
 
     move-result-object v1
 
@@ -140,7 +140,7 @@
 
     if-ne v1, v5, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -174,7 +174,7 @@
 
     move-result-object v1
 
-    invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cU()Ljava/io/File;
+    invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getFile()Ljava/io/File;
 
     move-result-object p1
 
@@ -187,7 +187,7 @@
     goto :goto_2
 
     :cond_1
-    invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cV()[Ljava/io/File;
+    invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cU()[Ljava/io/File;
 
     move-result-object v1
 
@@ -202,7 +202,7 @@
 
     aget-object v10, v1, v8
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v11
 
@@ -262,7 +262,7 @@
 
     :cond_2
     :goto_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -282,11 +282,11 @@
 
     invoke-interface {p1, v6, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->DF()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->Dv()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -298,7 +298,7 @@
 
     const-string v3, "X-REQUEST-ID"
 
-    invoke-virtual {v0, v3}, Lio/fabric/sdk/android/a/e/d;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v3}, Lio/fabric/sdk/android/a/e/d;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -310,7 +310,7 @@
 
     invoke-interface {v1, v6, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -326,7 +326,7 @@
 
     invoke-interface {v0, v6, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lio/fabric/sdk/android/a/b/v;->dl(I)I
+    invoke-static {p1}, Lio/fabric/sdk/android/a/b/v;->di(I)I
 
     move-result p1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/y$1.smali b/com.discord/smali/com/crashlytics/android/core/y$1.smali
index fd039e8554..f4486452cf 100644
--- a/com.discord/smali/com/crashlytics/android/core/y$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/y$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic sG:Lcom/crashlytics/android/core/y;
+.field final synthetic sF:Lcom/crashlytics/android/core/y;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/y;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/y$1;->sG:Lcom/crashlytics/android/core/y;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y$1;->sF:Lcom/crashlytics/android/core/y;
 
     invoke-direct {p0}, Landroid/content/BroadcastReceiver;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/y$1;->sG:Lcom/crashlytics/android/core/y;
+    iget-object p1, p0, Lcom/crashlytics/android/core/y$1;->sF:Lcom/crashlytics/android/core/y;
 
     const/4 p2, 0x1
 
diff --git a/com.discord/smali/com/crashlytics/android/core/y$2.smali b/com.discord/smali/com/crashlytics/android/core/y$2.smali
index 59f8a10127..afab975e54 100644
--- a/com.discord/smali/com/crashlytics/android/core/y$2.smali
+++ b/com.discord/smali/com/crashlytics/android/core/y$2.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic sG:Lcom/crashlytics/android/core/y;
+.field final synthetic sF:Lcom/crashlytics/android/core/y;
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/y;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/y$2;->sG:Lcom/crashlytics/android/core/y;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y$2;->sF:Lcom/crashlytics/android/core/y;
 
     invoke-direct {p0}, Landroid/content/BroadcastReceiver;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/y$2;->sG:Lcom/crashlytics/android/core/y;
+    iget-object p1, p0, Lcom/crashlytics/android/core/y$2;->sF:Lcom/crashlytics/android/core/y;
 
     const/4 p2, 0x0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/y.smali b/com.discord/smali/com/crashlytics/android/core/y.smali
index b65141a118..011ca5da8c 100644
--- a/com.discord/smali/com/crashlytics/android/core/y.smali
+++ b/com.discord/smali/com/crashlytics/android/core/y.smali
@@ -6,7 +6,7 @@
 # static fields
 .field static final sA:Landroid/content/IntentFilter;
 
-.field static final sB:Landroid/content/IntentFilter;
+.field static final sy:Landroid/content/IntentFilter;
 
 .field static final sz:Landroid/content/IntentFilter;
 
@@ -14,13 +14,13 @@
 # instance fields
 .field final context:Landroid/content/Context;
 
-.field final sC:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final sB:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+.field final sC:Landroid/content/BroadcastReceiver;
 
 .field final sD:Landroid/content/BroadcastReceiver;
 
-.field final sE:Landroid/content/BroadcastReceiver;
-
-.field sF:Z
+.field sE:Z
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     invoke-direct {v0, v1}, Landroid/content/IntentFilter;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/crashlytics/android/core/y;->sz:Landroid/content/IntentFilter;
+    sput-object v0, Lcom/crashlytics/android/core/y;->sy:Landroid/content/IntentFilter;
 
     new-instance v0, Landroid/content/IntentFilter;
 
@@ -41,7 +41,7 @@
 
     invoke-direct {v0, v1}, Landroid/content/IntentFilter;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/crashlytics/android/core/y;->sA:Landroid/content/IntentFilter;
+    sput-object v0, Lcom/crashlytics/android/core/y;->sz:Landroid/content/IntentFilter;
 
     new-instance v0, Landroid/content/IntentFilter;
 
@@ -49,7 +49,7 @@
 
     invoke-direct {v0, v1}, Landroid/content/IntentFilter;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/crashlytics/android/core/y;->sB:Landroid/content/IntentFilter;
+    sput-object v0, Lcom/crashlytics/android/core/y;->sA:Landroid/content/IntentFilter;
 
     return-void
 .end method
@@ -65,13 +65,13 @@
 
     invoke-direct {p1, p0}, Lcom/crashlytics/android/core/y$1;-><init>(Lcom/crashlytics/android/core/y;)V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/y;->sE:Landroid/content/BroadcastReceiver;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y;->sD:Landroid/content/BroadcastReceiver;
 
     new-instance p1, Lcom/crashlytics/android/core/y$2;
 
     invoke-direct {p1, p0}, Lcom/crashlytics/android/core/y$2;-><init>(Lcom/crashlytics/android/core/y;)V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/y;->sD:Landroid/content/BroadcastReceiver;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y;->sC:Landroid/content/BroadcastReceiver;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicBoolean;
 
@@ -79,7 +79,7 @@
 
     invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/y;->sC:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y;->sB:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-void
 .end method
@@ -87,7 +87,7 @@
 .method static synthetic a(Lcom/crashlytics/android/core/y;Z)Z
     .locals 0
 
-    iput-boolean p1, p0, Lcom/crashlytics/android/core/y;->sF:Z
+    iput-boolean p1, p0, Lcom/crashlytics/android/core/y;->sE:Z
 
     return p1
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/core/z.smali b/com.discord/smali/com/crashlytics/android/core/z.smali
index 0f442e69ea..7d2a7a1fdb 100644
--- a/com.discord/smali/com/crashlytics/android/core/z.smali
+++ b/com.discord/smali/com/crashlytics/android/core/z.smali
@@ -6,7 +6,7 @@
 # instance fields
 .field private final context:Landroid/content/Context;
 
-.field final rX:Lio/fabric/sdk/android/a/g/o;
+.field final rW:Lio/fabric/sdk/android/a/g/o;
 
 
 # direct methods
@@ -17,12 +17,12 @@
 
     iput-object p1, p0, Lcom/crashlytics/android/core/z;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/z;->rX:Lio/fabric/sdk/android/a/g/o;
+    iput-object p2, p0, Lcom/crashlytics/android/core/z;->rW:Lio/fabric/sdk/android/a/g/o;
 
     return-void
 .end method
 
-.method private static S(Ljava/lang/String;)Z
+.method private static O(Ljava/lang/String;)Z
     .locals 0
 
     if-eqz p0, :cond_1
@@ -50,7 +50,7 @@
 .method private static l(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    invoke-static {p0}, Lcom/crashlytics/android/core/z;->S(Ljava/lang/String;)Z
+    invoke-static {p0}, Lcom/crashlytics/android/core/z;->O(Ljava/lang/String;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/crashlytics/android/ndk/a.smali b/com.discord/smali/com/crashlytics/android/ndk/a.smali
index e082f0ce14..1ba645cb26 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/a.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/a.smali
@@ -9,9 +9,9 @@
 # instance fields
 .field private final context:Landroid/content/Context;
 
-.field private final tD:Lcom/crashlytics/android/ndk/d;
+.field private final tC:Lcom/crashlytics/android/ndk/d;
 
-.field private final tE:Lcom/crashlytics/android/ndk/b;
+.field private final tD:Lcom/crashlytics/android/ndk/b;
 
 
 # direct methods
@@ -22,21 +22,21 @@
 
     iput-object p1, p0, Lcom/crashlytics/android/ndk/a;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/ndk/a;->tD:Lcom/crashlytics/android/ndk/d;
+    iput-object p2, p0, Lcom/crashlytics/android/ndk/a;->tC:Lcom/crashlytics/android/ndk/d;
 
-    iput-object p3, p0, Lcom/crashlytics/android/ndk/a;->tE:Lcom/crashlytics/android/ndk/b;
+    iput-object p3, p0, Lcom/crashlytics/android/ndk/a;->tD:Lcom/crashlytics/android/ndk/b;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final dh()Z
+.method public final dg()Z
     .locals 5
 
-    iget-object v0, p0, Lcom/crashlytics/android/ndk/a;->tE:Lcom/crashlytics/android/ndk/b;
+    iget-object v0, p0, Lcom/crashlytics/android/ndk/a;->tD:Lcom/crashlytics/android/ndk/b;
 
-    invoke-interface {v0}, Lcom/crashlytics/android/ndk/b;->dj()Ljava/io/File;
+    invoke-interface {v0}, Lcom/crashlytics/android/ndk/b;->di()Ljava/io/File;
 
     move-result-object v0
 
@@ -49,7 +49,7 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/crashlytics/android/ndk/a;->tD:Lcom/crashlytics/android/ndk/d;
+    iget-object v2, p0, Lcom/crashlytics/android/ndk/a;->tC:Lcom/crashlytics/android/ndk/d;
 
     iget-object v3, p0, Lcom/crashlytics/android/ndk/a;->context:Landroid/content/Context;
 
@@ -70,7 +70,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -85,7 +85,7 @@
     return v1
 .end method
 
-.method public final di()Lcom/crashlytics/android/core/p;
+.method public final dh()Lcom/crashlytics/android/core/p;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -93,9 +93,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/ndk/a;->tE:Lcom/crashlytics/android/ndk/b;
+    iget-object v0, p0, Lcom/crashlytics/android/ndk/a;->tD:Lcom/crashlytics/android/ndk/b;
 
-    invoke-interface {v0}, Lcom/crashlytics/android/ndk/b;->dk()Ljava/util/TreeSet;
+    invoke-interface {v0}, Lcom/crashlytics/android/ndk/b;->dj()Ljava/util/TreeSet;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/ndk/b.smali b/com.discord/smali/com/crashlytics/android/ndk/b.smali
index 48f45790b6..9203f989e1 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/b.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/b.smali
@@ -4,10 +4,10 @@
 
 
 # virtual methods
-.method public abstract dj()Ljava/io/File;
+.method public abstract di()Ljava/io/File;
 .end method
 
-.method public abstract dk()Ljava/util/TreeSet;
+.method public abstract dj()Ljava/util/TreeSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali/com/crashlytics/android/ndk/c.smali b/com.discord/smali/com/crashlytics/android/ndk/c.smali
index 1613336178..d91934f637 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/c.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/c.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field private tF:Lcom/crashlytics/android/ndk/f;
+.field private tE:Lcom/crashlytics/android/ndk/f;
 
-.field private tG:Lcom/crashlytics/android/core/p;
+.field private tF:Lcom/crashlytics/android/core/p;
 
 
 # direct methods
@@ -36,13 +36,13 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/ndk/c;->tF:Lcom/crashlytics/android/ndk/f;
+    iget-object v0, p0, Lcom/crashlytics/android/ndk/c;->tE:Lcom/crashlytics/android/ndk/f;
 
-    invoke-interface {v0}, Lcom/crashlytics/android/ndk/f;->di()Lcom/crashlytics/android/core/p;
+    invoke-interface {v0}, Lcom/crashlytics/android/ndk/f;->dh()Lcom/crashlytics/android/core/p;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/crashlytics/android/ndk/c;->tG:Lcom/crashlytics/android/core/p;
+    iput-object v0, p0, Lcom/crashlytics/android/ndk/c;->tF:Lcom/crashlytics/android/core/p;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -51,7 +51,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -114,17 +114,17 @@
 
     invoke-direct {v2}, Lcom/crashlytics/android/core/n;-><init>()V
 
-    iput-object v1, p0, Lcom/crashlytics/android/ndk/c;->tF:Lcom/crashlytics/android/ndk/f;
+    iput-object v1, p0, Lcom/crashlytics/android/ndk/c;->tE:Lcom/crashlytics/android/ndk/f;
 
-    invoke-interface {v1}, Lcom/crashlytics/android/ndk/f;->dh()Z
+    invoke-interface {v1}, Lcom/crashlytics/android/ndk/f;->dg()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    iput-object p0, v0, Lcom/crashlytics/android/core/l;->sn:Lcom/crashlytics/android/core/q;
+    iput-object p0, v0, Lcom/crashlytics/android/core/l;->sm:Lcom/crashlytics/android/core/q;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -150,7 +150,7 @@
 .method public final cM()Lcom/crashlytics/android/core/p;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/ndk/c;->tG:Lcom/crashlytics/android/core/p;
+    iget-object v0, p0, Lcom/crashlytics/android/ndk/c;->tF:Lcom/crashlytics/android/core/p;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/ndk/e.smali b/com.discord/smali/com/crashlytics/android/ndk/e.smali
index fbf202bf1d..05db5e8eb5 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/e.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/e.smali
@@ -7,11 +7,11 @@
 
 
 # static fields
-.field private static final tH:Ljava/io/FileFilter;
+.field private static final tG:Ljava/io/FileFilter;
 
 
 # instance fields
-.field private final pe:Lio/fabric/sdk/android/a/f/a;
+.field private final pd:Lio/fabric/sdk/android/a/f/a;
 
 
 # direct methods
@@ -22,7 +22,7 @@
 
     invoke-direct {v0}, Lcom/crashlytics/android/ndk/e$1;-><init>()V
 
-    sput-object v0, Lcom/crashlytics/android/ndk/e;->tH:Ljava/io/FileFilter;
+    sput-object v0, Lcom/crashlytics/android/ndk/e;->tG:Ljava/io/FileFilter;
 
     return-void
 .end method
@@ -32,17 +32,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/ndk/e;->pe:Lio/fabric/sdk/android/a/f/a;
+    iput-object p1, p0, Lcom/crashlytics/android/ndk/e;->pd:Lio/fabric/sdk/android/a/f/a;
 
     return-void
 .end method
 
-.method private dl()Ljava/io/File;
+.method private dk()Ljava/io/File;
     .locals 3
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/crashlytics/android/ndk/e;->pe:Lio/fabric/sdk/android/a/f/a;
+    iget-object v1, p0, Lcom/crashlytics/android/ndk/e;->pd:Lio/fabric/sdk/android/a/f/a;
 
     invoke-interface {v1}, Lio/fabric/sdk/android/a/f/a;->getFilesDir()Ljava/io/File;
 
@@ -57,10 +57,10 @@
 
 
 # virtual methods
-.method public final dj()Ljava/io/File;
+.method public final di()Ljava/io/File;
     .locals 5
 
-    invoke-direct {p0}, Lcom/crashlytics/android/ndk/e;->dl()Ljava/io/File;
+    invoke-direct {p0}, Lcom/crashlytics/android/ndk/e;->dk()Ljava/io/File;
 
     move-result-object v0
 
@@ -109,7 +109,7 @@
     return-object v2
 .end method
 
-.method public final dk()Ljava/util/TreeSet;
+.method public final dj()Ljava/util/TreeSet;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -120,7 +120,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/crashlytics/android/ndk/e;->dl()Ljava/io/File;
+    invoke-direct {p0}, Lcom/crashlytics/android/ndk/e;->dk()Ljava/io/File;
 
     move-result-object v0
 
@@ -137,7 +137,7 @@
     return-object v0
 
     :cond_0
-    sget-object v1, Lcom/crashlytics/android/ndk/e;->tH:Ljava/io/FileFilter;
+    sget-object v1, Lcom/crashlytics/android/ndk/e;->tG:Ljava/io/FileFilter;
 
     invoke-virtual {v0, v1}, Ljava/io/File;->listFiles(Ljava/io/FileFilter;)[Ljava/io/File;
 
diff --git a/com.discord/smali/com/crashlytics/android/ndk/f.smali b/com.discord/smali/com/crashlytics/android/ndk/f.smali
index f3f375b77c..1f9fec8e19 100644
--- a/com.discord/smali/com/crashlytics/android/ndk/f.smali
+++ b/com.discord/smali/com/crashlytics/android/ndk/f.smali
@@ -4,10 +4,10 @@
 
 
 # virtual methods
-.method public abstract dh()Z
+.method public abstract dg()Z
 .end method
 
-.method public abstract di()Lcom/crashlytics/android/core/p;
+.method public abstract dh()Lcom/crashlytics/android/core/p;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index 010d358850..bb58af7cd9 100644
--- a/com.discord/smali/com/discord/BuildConfig.smali
+++ b/com.discord/smali/com/discord/BuildConfig.smali
@@ -36,11 +36,11 @@
 
 .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f"
 
-.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/950"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/963"
 
-.field public static final VERSION_CODE:I = 0x3b6
+.field public static final VERSION_CODE:I = 0x3c3
 
-.field public static final VERSION_NAME:Ljava/lang/String; = "9.5.0"
+.field public static final VERSION_NAME:Ljava/lang/String; = "9.6.3"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/R$a.smali b/com.discord/smali/com/discord/R$a.smali
index c46152f5f5..18bbff88d3 100644
--- a/com.discord/smali/com/discord/R$a.smali
+++ b/com.discord/smali/com/discord/R$a.smali
@@ -1163,6 +1163,10 @@
 
 .field public static final DrawerArrowToggle_thickness:I = 0x7
 
+.field public static final DrawerLayout:[I
+
+.field public static final DrawerLayout_elevation:I = 0x0
+
 .field public static final FlexInput:[I
 
 .field public static final FlexInput_hint:I = 0x0
@@ -1445,11 +1449,13 @@
 
 .field public static final LoadingButton:[I
 
-.field public static final LoadingButton_lb_progress_color:I = 0x0
+.field public static final LoadingButton_lb_disabled_alpha:I = 0x0
 
-.field public static final LoadingButton_lb_text:I = 0x1
+.field public static final LoadingButton_lb_progress_color:I = 0x1
 
-.field public static final LoadingButton_lb_text_color:I = 0x2
+.field public static final LoadingButton_lb_text:I = 0x2
+
+.field public static final LoadingButton_lb_text_color:I = 0x3
 
 .field public static final LoadingImageView:[I
 
@@ -2199,6 +2205,14 @@
 
 .field public static final Toolbar_titleTextColor:I = 0x1c
 
+.field public static final UserAvatarPresenceView:[I
+
+.field public static final UserAvatarPresenceView_user_avatar_background_color:I = 0x0
+
+.field public static final UserProfileHeaderView:[I
+
+.field public static final UserProfileHeaderView_user_profile_header_background_color:I = 0x0
+
 .field public static final VideoCallParticipantView:[I
 
 .field public static final VideoCallParticipantView_vcpv_is_overlay:I = 0x0
@@ -2596,6 +2610,14 @@
 
     sput-object v5, Lcom/discord/R$a;->DrawerArrowToggle:[I
 
+    new-array v5, v1, [I
+
+    const v7, 0x7f040114
+
+    aput v7, v5, v3
+
+    sput-object v5, Lcom/discord/R$a;->DrawerLayout:[I
+
     new-array v5, v10, [I
 
     fill-array-data v5, :array_26
@@ -2654,7 +2676,7 @@
 
     new-array v5, v1, [I
 
-    const v7, 0x7f040130
+    const v7, 0x7f040132
 
     aput v7, v5, v3
 
@@ -2682,7 +2704,7 @@
 
     new-array v5, v1, [I
 
-    const v7, 0x7f040154
+    const v7, 0x7f040156
 
     aput v7, v5, v3
 
@@ -2716,7 +2738,7 @@
 
     sput-object v5, Lcom/discord/R$a;->ListPopupWindow:[I
 
-    new-array v5, v10, [I
+    new-array v5, v6, [I
 
     fill-array-data v5, :array_34
 
@@ -2756,7 +2778,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f04026d
+    const v6, 0x7f040270
 
     aput v6, v5, v3
 
@@ -2806,7 +2828,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040305
+    const v6, 0x7f040308
 
     aput v6, v5, v3
 
@@ -2826,7 +2848,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f0401ec
+    const v6, 0x7f0401ee
 
     aput v6, v5, v3
 
@@ -2952,6 +2974,22 @@
 
     sput-object v0, Lcom/discord/R$a;->Toolbar:[I
 
+    new-array v0, v1, [I
+
+    const v2, 0x7f0403db
+
+    aput v2, v0, v3
+
+    sput-object v0, Lcom/discord/R$a;->UserAvatarPresenceView:[I
+
+    new-array v0, v1, [I
+
+    const v2, 0x7f0403dd
+
+    aput v2, v0, v3
+
+    sput-object v0, Lcom/discord/R$a;->UserProfileHeaderView:[I
+
     new-array v0, v4, [I
 
     fill-array-data v0, :array_51
@@ -2978,7 +3016,7 @@
 
     new-array v0, v1, [I
 
-    const v1, 0x7f0403de
+    const v1, 0x7f0403e3
 
     aput v1, v0, v3
 
@@ -3004,65 +3042,67 @@
 
     return-void
 
+    nop
+
     :array_0
     .array-data 4
         0x7f04004c
         0x7f04004e
         0x7f04004f
-        0x7f0400c8
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f0400e9
-        0x7f040103
+        0x7f0400ce
+        0x7f0400ea
         0x7f040104
-        0x7f040112
-        0x7f040156
-        0x7f04015b
-        0x7f040162
-        0x7f040163
-        0x7f0401c7
-        0x7f0401ea
-        0x7f0401f4
-        0x7f040257
-        0x7f040273
-        0x7f04028b
-        0x7f0402b9
-        0x7f0402ba
-        0x7f040313
+        0x7f040105
+        0x7f040114
+        0x7f040158
+        0x7f04015d
+        0x7f040164
+        0x7f040165
+        0x7f0401c9
+        0x7f0401ec
+        0x7f0401f6
+        0x7f04025a
+        0x7f040276
+        0x7f04028e
+        0x7f0402bc
+        0x7f0402bd
         0x7f040316
-        0x7f0403af
-        0x7f0403b9
+        0x7f040319
+        0x7f0403b2
+        0x7f0403bc
     .end array-data
 
     :array_1
     .array-data 4
         0x7f04004c
         0x7f04004e
-        0x7f0400ac
-        0x7f040156
-        0x7f040316
-        0x7f0403b9
+        0x7f0400ad
+        0x7f040158
+        0x7f040319
+        0x7f0403bc
     .end array-data
 
     :array_2
     .array-data 4
-        0x7f040118
-        0x7f0401eb
+        0x7f04011a
+        0x7f0401ed
     .end array-data
 
     :array_3
     .array-data 4
         0x10100f2
-        0x7f04007a
         0x7f04007b
-        0x7f04024e
-        0x7f04024f
-        0x7f040270
-        0x7f0402f8
-        0x7f0402f9
+        0x7f04007c
+        0x7f040251
+        0x7f040252
+        0x7f040273
+        0x7f0402fb
+        0x7f0402fc
     .end array-data
 
     :array_4
@@ -3094,39 +3134,39 @@
         0x10100d4
         0x101048f
         0x1010540
-        0x7f040112
-        0x7f040119
-        0x7f040249
+        0x7f040114
+        0x7f04011b
+        0x7f04024c
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f040306
-        0x7f040307
-        0x7f040308
         0x7f040309
+        0x7f04030a
+        0x7f04030b
+        0x7f04030c
     .end array-data
 
     :array_9
     .array-data 4
-        0x7f040243
-        0x7f040244
+        0x7f040245
+        0x7f040246
     .end array-data
 
     :array_a
     .array-data 4
         0x1010119
-        0x7f040303
-        0x7f0403ad
-        0x7f0403ae
+        0x7f040306
+        0x7f0403b0
+        0x7f0403b1
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f0403aa
-        0x7f0403ab
-        0x7f0403ac
+        0x7f0403ad
+        0x7f0403ae
+        0x7f0403af
     .end array-data
 
     :array_c
@@ -3148,11 +3188,11 @@
         0x7f040048
         0x7f040049
         0x7f04004a
-        0x7f040131
-        0x7f04013f
-        0x7f0401fd
-        0x7f04024a
-        0x7f040339
+        0x7f040133
+        0x7f040141
+        0x7f0401ff
+        0x7f04024d
+        0x7f04033c
     .end array-data
 
     :array_e
@@ -3195,17 +3235,16 @@
         0x7f04002b
         0x7f04002c
         0x7f040044
-        0x7f040065
-        0x7f040074
+        0x7f040066
         0x7f040075
         0x7f040076
         0x7f040077
         0x7f040078
-        0x7f04007d
+        0x7f040079
         0x7f04007e
-        0x7f04008c
-        0x7f040091
-        0x7f0400b2
+        0x7f04007f
+        0x7f04008d
+        0x7f040092
         0x7f0400b3
         0x7f0400b4
         0x7f0400b5
@@ -3213,103 +3252,104 @@
         0x7f0400b7
         0x7f0400b8
         0x7f0400b9
-        0x7f0400bc
-        0x7f0400c1
-        0x7f0400d4
-        0x7f040100
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c2
+        0x7f0400d5
         0x7f040101
         0x7f040102
-        0x7f040108
-        0x7f04010a
-        0x7f04010d
-        0x7f04010e
+        0x7f040103
+        0x7f040109
+        0x7f04010b
         0x7f04010f
         0x7f040110
         0x7f040111
-        0x7f040162
-        0x7f0401d2
-        0x7f04024c
-        0x7f04024d
+        0x7f040112
+        0x7f040113
+        0x7f040164
+        0x7f0401d4
+        0x7f04024f
         0x7f040250
-        0x7f040251
-        0x7f040252
         0x7f040253
         0x7f040254
         0x7f040255
         0x7f040256
-        0x7f040280
-        0x7f040281
-        0x7f040282
-        0x7f04028a
-        0x7f04028c
-        0x7f0402bf
+        0x7f040257
+        0x7f040258
+        0x7f040259
+        0x7f040283
+        0x7f040284
+        0x7f040285
+        0x7f04028d
+        0x7f04028f
         0x7f0402c2
-        0x7f0402c3
-        0x7f0402c4
-        0x7f0402eb
-        0x7f0402ed
+        0x7f0402c5
+        0x7f0402c6
+        0x7f0402c7
         0x7f0402ee
-        0x7f0402ef
-        0x7f040300
-        0x7f040301
-        0x7f04031a
-        0x7f040344
-        0x7f040345
-        0x7f040346
+        0x7f0402f0
+        0x7f0402f1
+        0x7f0402f2
+        0x7f040303
+        0x7f040304
+        0x7f04031d
         0x7f040347
+        0x7f040348
         0x7f040349
         0x7f04034a
-        0x7f04034b
         0x7f04034c
+        0x7f04034d
+        0x7f04034e
         0x7f04034f
-        0x7f040350
-        0x7f0403bb
-        0x7f0403bc
-        0x7f0403bd
+        0x7f040352
+        0x7f040353
         0x7f0403be
-        0x7f0403dc
-        0x7f0403df
-        0x7f0403e0
+        0x7f0403bf
+        0x7f0403c0
+        0x7f0403c1
         0x7f0403e1
-        0x7f0403e2
-        0x7f0403e3
         0x7f0403e4
         0x7f0403e5
         0x7f0403e6
         0x7f0403e7
         0x7f0403e8
+        0x7f0403e9
+        0x7f0403ea
+        0x7f0403eb
+        0x7f0403ec
+        0x7f0403ed
     .end array-data
 
     :array_f
     .array-data 4
         0x101014f
-        0x7f0403c4
-        0x7f0403c5
-        0x7f0403c6
+        0x7f0403c7
+        0x7f0403c8
+        0x7f0403c9
     .end array-data
 
     :array_10
     .array-data 4
         0x7f040050
-        0x7f040121
-        0x7f040122
         0x7f040123
         0x7f040124
-        0x7f04015c
+        0x7f040125
+        0x7f040126
+        0x7f04015e
     .end array-data
 
     :array_11
     .array-data 4
-        0x7f040112
-        0x7f0401ee
+        0x7f040114
         0x7f0401f0
         0x7f0401f2
-        0x7f0401f3
-        0x7f0401f7
-        0x7f0401f8
+        0x7f0401f4
+        0x7f0401f5
         0x7f0401f9
-        0x7f0401fc
-        0x7f04026f
+        0x7f0401fa
+        0x7f0401fb
+        0x7f0401fe
+        0x7f040272
     .end array-data
 
     :array_12
@@ -3322,9 +3362,9 @@
 
     :array_13
     .array-data 4
-        0x7f040073
-        0x7f040338
-        0x7f040354
+        0x7f040074
+        0x7f04033b
+        0x7f040357
     .end array-data
 
     :array_14
@@ -3332,25 +3372,25 @@
         0x101011e
         0x7f04003e
         0x7f040045
-        0x7f040127
-        0x7f040134
+        0x7f040129
+        0x7f040136
     .end array-data
 
     :array_15
     .array-data 4
         0x101013f
         0x1010140
-        0x7f040081
         0x7f040082
         0x7f040083
         0x7f040084
         0x7f040085
         0x7f040086
-        0x7f0400ce
+        0x7f040087
         0x7f0400cf
         0x7f0400d0
         0x7f0400d1
         0x7f0400d2
+        0x7f0400d3
     .end array-data
 
     :array_16
@@ -3363,7 +3403,6 @@
 
     :array_17
     .array-data 4
-        0x7f0400db
         0x7f0400dc
         0x7f0400dd
         0x7f0400de
@@ -3377,6 +3416,7 @@
         0x7f0400e6
         0x7f0400e7
         0x7f0400e8
+        0x7f0400e9
     .end array-data
 
     :array_18
@@ -3386,50 +3426,49 @@
         0x101011f
         0x101014f
         0x10101e5
-        0x7f04008e
         0x7f04008f
         0x7f040090
-        0x7f040092
+        0x7f040091
         0x7f040093
         0x7f040094
-        0x7f040096
+        0x7f040095
         0x7f040097
         0x7f040098
         0x7f040099
         0x7f04009a
         0x7f04009b
-        0x7f0400a0
+        0x7f04009c
         0x7f0400a1
         0x7f0400a2
-        0x7f0400a5
+        0x7f0400a3
         0x7f0400a6
         0x7f0400a7
         0x7f0400a8
         0x7f0400a9
         0x7f0400aa
         0x7f0400ab
-        0x7f04015a
-        0x7f0401c8
-        0x7f0401cc
-        0x7f0402c8
-        0x7f0402f6
-        0x7f040351
-        0x7f040353
+        0x7f0400ac
+        0x7f04015c
+        0x7f0401ca
+        0x7f0401ce
+        0x7f0402cb
+        0x7f0402f9
+        0x7f040354
+        0x7f040356
     .end array-data
 
     :array_19
     .array-data 4
-        0x7f04008d
-        0x7f04009c
+        0x7f04008e
         0x7f04009d
         0x7f04009e
-        0x7f0402fa
-        0x7f0402fb
+        0x7f04009f
+        0x7f0402fd
+        0x7f0402fe
     .end array-data
 
     :array_1a
     .array-data 4
-        0x7f0400ea
         0x7f0400eb
         0x7f0400ec
         0x7f0400ed
@@ -3450,32 +3489,33 @@
         0x7f0400fc
         0x7f0400fd
         0x7f0400fe
+        0x7f0400ff
     .end array-data
 
     :array_1b
     .array-data 4
-        0x7f0400af
         0x7f0400b0
-        0x7f0400d3
-        0x7f04011a
-        0x7f04011b
+        0x7f0400b1
+        0x7f0400d4
         0x7f04011c
         0x7f04011d
         0x7f04011e
         0x7f04011f
         0x7f040120
-        0x7f0402e6
-        0x7f0402e8
-        0x7f04030b
-        0x7f0403af
-        0x7f0403b0
-        0x7f0403ba
+        0x7f040121
+        0x7f040122
+        0x7f0402e9
+        0x7f0402eb
+        0x7f04030e
+        0x7f0403b2
+        0x7f0403b3
+        0x7f0403bd
     .end array-data
 
     :array_1c
     .array-data 4
-        0x7f040204
-        0x7f040205
+        0x7f040206
+        0x7f040207
     .end array-data
 
     :array_1d
@@ -3488,8 +3528,8 @@
     :array_1e
     .array-data 4
         0x1010107
-        0x7f04007f
         0x7f040080
+        0x7f040081
     .end array-data
 
     :array_1f
@@ -3501,11 +3541,9 @@
         0x1010140
         0x7f040053
         0x7f040054
-        0x7f040089
-        0x7f0400c3
+        0x7f04008a
         0x7f0400c4
-        0x7f040206
-        0x7f040207
+        0x7f0400c5
         0x7f040208
         0x7f040209
         0x7f04020a
@@ -3545,21 +3583,23 @@
         0x7f04022c
         0x7f04022d
         0x7f04022e
+        0x7f04022f
         0x7f040230
-        0x7f040231
-        0x7f040235
-        0x7f040236
+        0x7f040232
+        0x7f040233
         0x7f040237
         0x7f040238
         0x7f040239
         0x7f04023a
-        0x7f040241
+        0x7f04023b
+        0x7f04023c
+        0x7f040243
     .end array-data
 
     :array_20
     .array-data 4
-        0x7f0400c6
-        0x7f040113
+        0x7f0400c7
+        0x7f040115
     .end array-data
 
     :array_21
@@ -3593,10 +3633,8 @@
         0x1010440
         0x7f040053
         0x7f040054
-        0x7f040089
-        0x7f0400c4
-        0x7f040206
-        0x7f040207
+        0x7f04008a
+        0x7f0400c5
         0x7f040208
         0x7f040209
         0x7f04020a
@@ -3636,37 +3674,39 @@
         0x7f04022c
         0x7f04022d
         0x7f04022e
+        0x7f04022f
         0x7f040230
-        0x7f040231
-        0x7f040235
-        0x7f040236
+        0x7f040232
+        0x7f040233
         0x7f040237
         0x7f040238
         0x7f040239
         0x7f04023a
+        0x7f04023b
+        0x7f04023c
     .end array-data
 
     :array_22
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_23
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_24
     .array-data 4
-        0x7f040068
         0x7f040069
+        0x7f04006a
     .end array-data
 
     :array_25
@@ -3674,82 +3714,82 @@
         0x7f04003b
         0x7f04003c
         0x7f040052
-        0x7f0400b1
-        0x7f04010b
-        0x7f04014a
-        0x7f0402ff
-        0x7f0403a6
+        0x7f0400b2
+        0x7f04010c
+        0x7f04014c
+        0x7f040302
+        0x7f0403a9
     .end array-data
 
     :array_26
     .array-data 4
-        0x7f04015d
         0x7f04015f
-        0x7f040290
+        0x7f040161
+        0x7f040293
     .end array-data
 
     :array_27
     .array-data 4
         0x7f04002d
         0x7f04002e
-        0x7f040105
         0x7f040106
         0x7f040107
-        0x7f040135
-        0x7f04013c
-        0x7f0401fa
-        0x7f0402f2
-        0x7f0402f3
-        0x7f0402f4
+        0x7f040108
+        0x7f040137
+        0x7f04013e
+        0x7f0401fc
+        0x7f0402f5
+        0x7f0402f6
+        0x7f0402f7
     .end array-data
 
     :array_28
     .array-data 4
-        0x7f040200
-        0x7f040232
-        0x7f040233
+        0x7f040202
         0x7f040234
-        0x7f04023d
-        0x7f04023e
+        0x7f040235
+        0x7f040236
         0x7f04023f
         0x7f040240
+        0x7f040241
         0x7f040242
-        0x7f040245
+        0x7f040244
+        0x7f040247
     .end array-data
 
     :array_29
     .array-data 4
         0x7f040050
         0x7f040051
-        0x7f040064
-        0x7f040112
-        0x7f040125
-        0x7f040126
-        0x7f04015a
-        0x7f040164
-        0x7f04026c
-        0x7f04028f
-        0x7f0402c8
-        0x7f0402f6
-        0x7f0403d7
+        0x7f040065
+        0x7f040114
+        0x7f040127
+        0x7f040128
+        0x7f04015c
+        0x7f040166
+        0x7f04026f
+        0x7f040292
+        0x7f0402cb
+        0x7f0402f9
+        0x7f0403da
     .end array-data
 
     :array_2a
     .array-data 4
-        0x7f040132
-        0x7f040133
-        0x7f0401f5
-        0x7f04024b
+        0x7f040134
+        0x7f040135
+        0x7f0401f7
+        0x7f04024e
     .end array-data
 
     :array_2b
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_2c
@@ -3759,39 +3799,36 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_2d
     .array-data 4
         0x1010109
         0x1010200
-        0x7f040149
+        0x7f04014b
     .end array-data
 
     :array_2e
     .array-data 4
         0x7f040027
         0x7f04004d
-        0x7f040128
-        0x7f040129
         0x7f04012a
-        0x7f040279
-        0x7f040288
-        0x7f040289
-        0x7f04028e
-        0x7f0402b6
-        0x7f0402b7
-        0x7f0402b8
-        0x7f0402c5
-        0x7f0402c6
+        0x7f04012b
+        0x7f04012c
+        0x7f04027c
+        0x7f04028b
+        0x7f04028c
+        0x7f040291
+        0x7f0402b9
+        0x7f0402ba
+        0x7f0402bb
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f0402cb
         0x7f0402cc
         0x7f0402cd
         0x7f0402ce
@@ -3803,7 +3840,10 @@
         0x7f0402d4
         0x7f0402d5
         0x7f0402d6
-        0x7f0403db
+        0x7f0402d7
+        0x7f0402d8
+        0x7f0402d9
+        0x7f0403e0
     .end array-data
 
     :array_2f
@@ -3835,10 +3875,10 @@
         0x1010126
         0x1010127
         0x1010128
-        0x7f040104
-        0x7f040109
-        0x7f04026e
-        0x7f0402f5
+        0x7f040105
+        0x7f04010a
+        0x7f040271
+        0x7f0402f8
     .end array-data
 
     :array_32
@@ -3857,23 +3897,21 @@
 
     :array_34
     .array-data 4
-        0x7f040246
-        0x7f040247
         0x7f040248
+        0x7f040249
+        0x7f04024a
+        0x7f04024b
     .end array-data
 
     :array_35
     .array-data 4
-        0x7f0400a4
-        0x7f0401d0
-        0x7f0401d1
+        0x7f0400a5
+        0x7f0401d2
+        0x7f0401d3
     .end array-data
 
     :array_36
     .array-data 4
-        0x7f040259
-        0x7f04025a
-        0x7f04025b
         0x7f04025c
         0x7f04025d
         0x7f04025e
@@ -3885,6 +3923,9 @@
         0x7f040264
         0x7f040265
         0x7f040266
+        0x7f040267
+        0x7f040268
+        0x7f040269
     .end array-data
 
     :array_37
@@ -3895,47 +3936,44 @@
         0x10101ba
         0x7f040050
         0x7f040051
-        0x7f0400d6
-        0x7f0401c7
+        0x7f0400d7
         0x7f0401c9
-        0x7f0401ca
         0x7f0401cb
+        0x7f0401cc
         0x7f0401cd
-        0x7f0401ce
-        0x7f0402c8
-        0x7f04030f
-        0x7f040310
+        0x7f0401cf
+        0x7f0401d0
+        0x7f0402cb
+        0x7f040312
+        0x7f040313
     .end array-data
 
     :array_38
     .array-data 4
-        0x7f04030f
-        0x7f040310
+        0x7f040312
+        0x7f040313
     .end array-data
 
     :array_39
     .array-data 4
-        0x7f040068
         0x7f040069
-        0x7f040095
-        0x7f04009f
-        0x7f0400a3
-        0x7f0400b2
+        0x7f04006a
+        0x7f040096
+        0x7f0400a0
+        0x7f0400a4
         0x7f0400b3
-        0x7f0400b9
-        0x7f0400bc
-        0x7f0400c0
-        0x7f040111
-        0x7f04013d
-        0x7f040268
-        0x7f040269
-        0x7f040274
-        0x7f0402e7
-        0x7f0402fc
-        0x7f040332
-        0x7f04033a
-        0x7f04033b
-        0x7f04033c
+        0x7f0400b4
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c1
+        0x7f040113
+        0x7f04013f
+        0x7f04026b
+        0x7f04026c
+        0x7f040277
+        0x7f0402ea
+        0x7f0402ff
+        0x7f040335
         0x7f04033d
         0x7f04033e
         0x7f04033f
@@ -3943,10 +3981,13 @@
         0x7f040341
         0x7f040342
         0x7f040343
-        0x7f040348
-        0x7f04034d
-        0x7f04034e
-        0x7f040352
+        0x7f040344
+        0x7f040345
+        0x7f040346
+        0x7f04034b
+        0x7f040350
+        0x7f040351
+        0x7f040355
     .end array-data
 
     :array_3a
@@ -3978,12 +4019,12 @@
         0x7f04001f
         0x7f040020
         0x7f040031
-        0x7f0400c7
-        0x7f0401cd
-        0x7f0401ce
-        0x7f040277
-        0x7f0402f1
-        0x7f0403bf
+        0x7f0400c8
+        0x7f0401cf
+        0x7f0401d0
+        0x7f04027a
+        0x7f0402f4
+        0x7f0403c2
     .end array-data
 
     :array_3c
@@ -3995,8 +4036,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04028d
-        0x7f040311
+        0x7f040290
+        0x7f040314
     .end array-data
 
     :array_3d
@@ -4004,43 +4045,43 @@
         0x10100d4
         0x10100dd
         0x101011f
-        0x7f040112
-        0x7f040155
-        0x7f0401ee
-        0x7f0401ef
+        0x7f040114
+        0x7f040157
+        0x7f0401f0
         0x7f0401f1
         0x7f0401f3
-        0x7f0401f6
-        0x7f0401f9
-        0x7f04026f
+        0x7f0401f5
+        0x7f0401f8
+        0x7f0401fb
+        0x7f040272
     .end array-data
 
     :array_3e
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040278
+        0x7f04027b
     .end array-data
 
     :array_3f
     .array-data 4
-        0x7f04027c
         0x7f04027f
+        0x7f040282
     .end array-data
 
     :array_40
     .array-data 4
         0x10100c4
         0x10100f1
-        0x7f04012b
-        0x7f04012c
         0x7f04012d
         0x7f04012e
         0x7f04012f
-        0x7f0401ff
-        0x7f0402c7
-        0x7f0402fe
-        0x7f040304
+        0x7f040130
+        0x7f040131
+        0x7f040201
+        0x7f0402ca
+        0x7f040301
+        0x7f040307
     .end array-data
 
     :array_41
@@ -4049,26 +4090,26 @@
         0x101011f
         0x1010220
         0x1010264
-        0x7f0400a5
-        0x7f0400c2
-        0x7f0400ff
-        0x7f04014f
-        0x7f0401cf
-        0x7f0401fe
-        0x7f0402bd
-        0x7f0402be
-        0x7f0402e9
-        0x7f0402ea
-        0x7f040312
-        0x7f040317
-        0x7f0403dd
+        0x7f0400a6
+        0x7f0400c3
+        0x7f040100
+        0x7f040151
+        0x7f0401d1
+        0x7f040200
+        0x7f0402c0
+        0x7f0402c1
+        0x7f0402ec
+        0x7f0402ed
+        0x7f040315
+        0x7f04031a
+        0x7f0403e2
     .end array-data
 
     :array_42
     .array-data 4
-        0x7f04007c
-        0x7f0400bf
-        0x7f0402e5
+        0x7f04007d
+        0x7f0400c0
+        0x7f0402e8
     .end array-data
 
     :array_43
@@ -4077,21 +4118,18 @@
         0x7f040027
         0x7f040028
         0x7f04004d
-        0x7f040128
-        0x7f040129
         0x7f04012a
-        0x7f040279
-        0x7f040288
-        0x7f040289
-        0x7f04028e
-        0x7f0402b6
-        0x7f0402b7
-        0x7f0402b8
-        0x7f0402c5
-        0x7f0402c6
+        0x7f04012b
+        0x7f04012c
+        0x7f04027c
+        0x7f04028b
+        0x7f04028c
+        0x7f040291
+        0x7f0402b9
+        0x7f0402ba
+        0x7f0402bb
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f0402cb
         0x7f0402cc
         0x7f0402cd
         0x7f0402ce
@@ -4103,20 +4141,23 @@
         0x7f0402d4
         0x7f0402d5
         0x7f0402d6
-        0x7f0403db
+        0x7f0402d7
+        0x7f0402d8
+        0x7f0402d9
+        0x7f0403e0
     .end array-data
 
     :array_44
     .array-data 4
-        0x7f0402fc
-        0x7f0402fd
+        0x7f0402ff
+        0x7f040300
     .end array-data
 
     :array_45
     .array-data 4
         0x101011f
-        0x7f040112
-        0x7f04026a
+        0x7f040114
+        0x7f04026d
     .end array-data
 
     :array_46
@@ -4125,7 +4166,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_47
@@ -4140,9 +4181,6 @@
 
     :array_48
     .array-data 4
-        0x7f0402d7
-        0x7f0402d8
-        0x7f0402d9
         0x7f0402da
         0x7f0402db
         0x7f0402dc
@@ -4154,6 +4192,9 @@
         0x7f0402e2
         0x7f0402e3
         0x7f0402e4
+        0x7f0402e5
+        0x7f0402e6
+        0x7f0402e7
     .end array-data
 
     :array_49
@@ -4161,17 +4202,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f0402f7
-        0x7f040302
-        0x7f040318
-        0x7f040319
+        0x7f0402fa
+        0x7f040305
         0x7f04031b
-        0x7f0403a7
-        0x7f0403a8
-        0x7f0403a9
-        0x7f0403c0
-        0x7f0403c1
-        0x7f0403c2
+        0x7f04031c
+        0x7f04031e
+        0x7f0403aa
+        0x7f0403ab
+        0x7f0403ac
+        0x7f0403c3
+        0x7f0403c4
+        0x7f0403c5
     .end array-data
 
     :array_4a
@@ -4183,9 +4224,6 @@
 
     :array_4b
     .array-data 4
-        0x7f04031c
-        0x7f04031d
-        0x7f04031e
         0x7f04031f
         0x7f040320
         0x7f040321
@@ -4205,15 +4243,18 @@
         0x7f04032f
         0x7f040330
         0x7f040331
+        0x7f040332
         0x7f040333
         0x7f040334
-        0x7f040335
+        0x7f040336
+        0x7f040337
+        0x7f040338
     .end array-data
 
     :array_4c
     .array-data 4
         0x101014f
-        0x7f040336
+        0x7f040339
     .end array-data
 
     :array_4d
@@ -4229,15 +4270,14 @@
         0x1010163
         0x1010164
         0x10103ac
-        0x7f04013f
-        0x7f040339
+        0x7f040141
+        0x7f04033c
     .end array-data
 
     :array_4e
     .array-data 4
         0x101009a
         0x1010150
-        0x7f04006a
         0x7f04006b
         0x7f04006c
         0x7f04006d
@@ -4246,78 +4286,79 @@
         0x7f040070
         0x7f040071
         0x7f040072
-        0x7f0400d7
+        0x7f040073
         0x7f0400d8
         0x7f0400d9
         0x7f0400da
-        0x7f040116
-        0x7f040117
-        0x7f040157
-        0x7f040158
+        0x7f0400db
+        0x7f040118
+        0x7f040119
         0x7f040159
-        0x7f04015e
+        0x7f04015a
+        0x7f04015b
         0x7f040160
-        0x7f040161
-        0x7f040283
-        0x7f040284
-        0x7f040285
+        0x7f040162
+        0x7f040163
         0x7f040286
         0x7f040287
+        0x7f040288
+        0x7f040289
+        0x7f04028a
     .end array-data
 
     :array_4f
     .array-data 4
         0x1010034
-        0x7f040114
-        0x7f040115
+        0x7f040116
+        0x7f040117
     .end array-data
 
     :array_50
     .array-data 4
         0x10100af
         0x1010140
-        0x7f040079
-        0x7f0400ad
+        0x7f04007a
         0x7f0400ae
-        0x7f0400c8
+        0x7f0400af
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f040257
-        0x7f040258
-        0x7f04026b
-        0x7f040271
-        0x7f040272
-        0x7f04028b
-        0x7f040313
-        0x7f040314
-        0x7f040315
-        0x7f0403af
-        0x7f0403b1
+        0x7f0400ce
+        0x7f04025a
+        0x7f04025b
+        0x7f04026e
+        0x7f040274
+        0x7f040275
+        0x7f04028e
+        0x7f040316
+        0x7f040317
+        0x7f040318
         0x7f0403b2
-        0x7f0403b3
         0x7f0403b4
         0x7f0403b5
         0x7f0403b6
         0x7f0403b7
         0x7f0403b8
+        0x7f0403b9
+        0x7f0403ba
+        0x7f0403bb
     .end array-data
 
     :array_51
     .array-data 4
-        0x7f0403d9
-        0x7f0403da
+        0x7f0403de
+        0x7f0403df
     .end array-data
 
     :array_52
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04027d
-        0x7f04027e
-        0x7f040355
+        0x7f040280
+        0x7f040281
+        0x7f040358
     .end array-data
 
     :array_53
@@ -4337,21 +4378,18 @@
     :array_55
     .array-data 4
         0x7f04004b
-        0x7f0403d8
+        0x7f0403dc
     .end array-data
 
     :array_56
     .array-data 4
-        0x7f0403c7
-        0x7f0403c8
-        0x7f0403c9
+        0x7f0403ca
+        0x7f0403cb
+        0x7f0403cc
     .end array-data
 
     :array_57
     .array-data 4
-        0x7f0403ca
-        0x7f0403cb
-        0x7f0403cc
         0x7f0403cd
         0x7f0403ce
         0x7f0403cf
@@ -4362,6 +4400,9 @@
         0x7f0403d4
         0x7f0403d5
         0x7f0403d6
+        0x7f0403d7
+        0x7f0403d8
+        0x7f0403d9
     .end array-data
 .end method
 
diff --git a/com.discord/smali/com/discord/a/b$b$a.smali b/com.discord/smali/com/discord/a/b$b$a.smali
deleted file mode 100644
index fc188f50dd..0000000000
--- a/com.discord/smali/com/discord/a/b$b$a.smali
+++ /dev/null
@@ -1,68 +0,0 @@
-.class final Lcom/discord/a/b$b$a;
-.super Ljava/lang/Object;
-.source "SelectorDialog.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/b$b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic wE:Lcom/discord/a/b$b;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/a/b$b;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/a/b$b$a;->wE:Lcom/discord/a/b$b;
-
-    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/a/b$b$a;->wE:Lcom/discord/a/b$b;
-
-    iget-object p1, p1, Lcom/discord/a/b$b;->this$0:Lcom/discord/a/b;
-
-    iget-object p1, p1, Lcom/discord/a/b;->wB:Lkotlin/jvm/functions/Function1;
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lcom/discord/a/b$b$a;->wE:Lcom/discord/a/b$b;
-
-    invoke-virtual {v0}, Lcom/discord/a/b$b;->getAdapterPosition()I
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_0
-    iget-object p1, p0, Lcom/discord/a/b$b$a;->wE:Lcom/discord/a/b$b;
-
-    iget-object p1, p1, Lcom/discord/a/b$b;->this$0:Lcom/discord/a/b;
-
-    invoke-virtual {p1}, Lcom/discord/a/b;->dismiss()V
-
-    return-void
-.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 5f65baa8c8..c8403aed29 100644
--- a/com.discord/smali/com/discord/app/App$b.smali
+++ b/com.discord/smali/com/discord/app/App$b.smali
@@ -30,7 +30,7 @@
 
 
 # static fields
-.field public static final tL:Lcom/discord/app/App$b;
+.field public static final tK:Lcom/discord/app/App$b;
 
 
 # direct methods
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/App$b;-><init>()V
 
-    sput-object v0, Lcom/discord/app/App$b;->tL:Lcom/discord/app/App$b;
+    sput-object v0, Lcom/discord/app/App$b;->tK:Lcom/discord/app/App$b;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
     check-cast p1, Ljava/lang/Boolean;
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/app/App$c.smali b/com.discord/smali/com/discord/app/App$c.smali
index 03d5fe569a..723dec09bf 100644
--- a/com.discord/smali/com/discord/app/App$c.smali
+++ b/com.discord/smali/com/discord/app/App$c.smali
@@ -98,7 +98,7 @@
 
     invoke-virtual {p4, p1, p2, p3}, Lcom/discord/app/AppLog;->a(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/App$d.smali b/com.discord/smali/com/discord/app/App$d.smali
index 89c8dd93a5..97d72a8a14 100644
--- a/com.discord/smali/com/discord/app/App$d.smali
+++ b/com.discord/smali/com/discord/app/App$d.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final tM:Lcom/discord/app/App$d;
+.field public static final tL:Lcom/discord/app/App$d;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/App$d;-><init>()V
 
-    sput-object v0, Lcom/discord/app/App$d;->tM:Lcom/discord/app/App$d;
+    sput-object v0, Lcom/discord/app/App$d;->tL:Lcom/discord/app/App$d;
 
     return-void
 .end method
@@ -86,7 +86,7 @@
 
     invoke-static {p1, p2, v0, v1, v0}, Lcom/discord/utilities/uri/UriHandler;->handle$default(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/App.smali b/com.discord/smali/com/discord/app/App.smali
index 1551bdac07..29070c76a4 100644
--- a/com.discord/smali/com/discord/app/App.smali
+++ b/com.discord/smali/com/discord/app/App.smali
@@ -12,13 +12,13 @@
 
 
 # static fields
-.field private static final tJ:Z
+.field private static final tI:Z
 
-.field public static final tK:Lcom/discord/app/App$a;
+.field public static final tJ:Lcom/discord/app/App$a;
 
 
 # instance fields
-.field private final tI:Z
+.field private final tH:Z
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/app/App$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/app/App;->tK:Lcom/discord/app/App$a;
+    sput-object v0, Lcom/discord/app/App;->tJ:Lcom/discord/app/App$a;
 
     const-string v0, "productionDiscordExternal"
 
@@ -45,7 +45,7 @@
 
     move-result v0
 
-    sput-boolean v0, Lcom/discord/app/App;->tJ:Z
+    sput-boolean v0, Lcom/discord/app/App;->tI:Z
 
     return-void
 .end method
@@ -58,10 +58,10 @@
     return-void
 .end method
 
-.method public static final synthetic dm()Z
+.method public static final synthetic dl()Z
     .locals 1
 
-    sget-boolean v0, Lcom/discord/app/App;->tJ:Z
+    sget-boolean v0, Lcom/discord/app/App;->tI:Z
 
     return v0
 .end method
@@ -77,7 +77,7 @@
 
     invoke-super {p0, p1}, Landroid/app/Application;->attachBaseContext(Landroid/content/Context;)V
 
-    iget-boolean p1, p0, Lcom/discord/app/App;->tI:Z
+    iget-boolean p1, p0, Lcom/discord/app/App;->tH:Z
 
     if-nez p1, :cond_0
 
@@ -104,7 +104,7 @@
 
     sget-object v1, Lcom/discord/utilities/analytics/AdjustConfig;->INSTANCE:Lcom/discord/utilities/analytics/AdjustConfig;
 
-    iget-boolean v2, p0, Lcom/discord/app/App;->tI:Z
+    iget-boolean v2, p0, Lcom/discord/app/App;->tH:Z
 
     invoke-virtual {v1, v0, v2}, Lcom/discord/utilities/analytics/AdjustConfig;->init(Landroid/app/Application;Z)V
 
@@ -130,11 +130,11 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v1
 
-    sget-object v3, Lcom/discord/app/App$b;->tL:Lcom/discord/app/App$b;
+    sget-object v3, Lcom/discord/app/App$b;->tK:Lcom/discord/app/App$b;
 
     check-cast v3, Lrx/functions/Action1;
 
@@ -158,7 +158,7 @@
 
     new-instance v1, Lcom/discord/app/App$c;
 
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-direct {v1, v2}, Lcom/discord/app/App$c;-><init>(Lcom/discord/app/AppLog;)V
 
@@ -180,11 +180,15 @@
 
     sget-object v1, Lcom/discord/utilities/view/text/LinkifiedTextView;->Companion:Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;
 
-    sget-object v2, Lcom/discord/app/App$d;->tM:Lcom/discord/app/App$d;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
-    check-cast v2, Lkotlin/jvm/functions/Function2;
+    check-cast v2, Lcom/discord/utilities/logging/Logger;
 
-    invoke-virtual {v1, v2}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
+    sget-object v3, Lcom/discord/app/App$d;->tL:Lcom/discord/app/App$d;
+
+    check-cast v3, Lkotlin/jvm/functions/Function2;
+
+    invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lcom/discord/utilities/logging/Logger;Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
 
     const-string v1, "https://cdn.discordapp.com"
 
@@ -194,6 +198,10 @@
 
     invoke-virtual {v1, v0}, Lcom/discord/utilities/surveys/SurveyUtils;->init(Landroid/app/Application;)V
 
+    const/4 v0, 0x1
+
+    invoke-static {v0}, Landroidx/appcompat/app/AppCompatDelegate;->setDefaultNightMode(I)V
+
     const-string v0, "Application initialized."
 
     invoke-static {v0}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/app/AppActivity$AppAction.smali b/com.discord/smali/com/discord/app/AppActivity$AppAction.smali
index 175246745c..441ed4675c 100644
--- a/com.discord/smali/com/discord/app/AppActivity$AppAction.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$AppAction.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field private final tR:Lkotlin/Lazy;
+.field private final tQ:Lkotlin/Lazy;
 
 
 # direct methods
@@ -74,7 +74,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity$AppAction;->tR:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppActivity$AppAction;->tQ:Lkotlin/Lazy;
 
     return-void
 .end method
@@ -93,7 +93,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity$AppAction;->tR:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppActivity$AppAction;->tQ:Lkotlin/Lazy;
 
     invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
 
@@ -109,7 +109,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppActivity;->onCreate(Landroid/os/Bundle;)V
 
-    sget-boolean p1, Lcom/discord/app/AppActivity;->tT:Z
+    sget-boolean p1, Lcom/discord/app/AppActivity;->tS:Z
 
     if-eqz p1, :cond_0
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$b$a$a.smali b/com.discord/smali/com/discord/app/AppActivity$b$a$a.smali
index 7f4ffb9341..0b252f8ef3 100644
--- a/com.discord/smali/com/discord/app/AppActivity$b$a$a.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$b$a$a.smali
@@ -30,7 +30,7 @@
 
 
 # static fields
-.field public static final ua:Lcom/discord/app/AppActivity$b$a$a;
+.field public static final tZ:Lcom/discord/app/AppActivity$b$a$a;
 
 
 # direct methods
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/AppActivity$b$a$a;-><init>()V
 
-    sput-object v0, Lcom/discord/app/AppActivity$b$a$a;->ua:Lcom/discord/app/AppActivity$b$a$a;
+    sput-object v0, Lcom/discord/app/AppActivity$b$a$a;->tZ:Lcom/discord/app/AppActivity$b$a$a;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/AppActivity$b.smali b/com.discord/smali/com/discord/app/AppActivity$b.smali
index 1d03004b3c..c960e46500 100644
--- a/com.discord/smali/com/discord/app/AppActivity$b.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$b.smali
@@ -21,15 +21,15 @@
 
 
 # static fields
-.field public static final tZ:Lcom/discord/app/AppActivity$b$a;
+.field public static final tY:Lcom/discord/app/AppActivity$b$a;
 
 
 # instance fields
 .field final fontScale:I
 
-.field final tX:Ljava/lang/String;
+.field final tW:Ljava/lang/String;
 
-.field final tY:Ljava/lang/String;
+.field final tX:Ljava/lang/String;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/app/AppActivity$b$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/app/AppActivity$b;->tZ:Lcom/discord/app/AppActivity$b$a;
+    sput-object v0, Lcom/discord/app/AppActivity$b;->tY:Lcom/discord/app/AppActivity$b$a;
 
     return-void
 .end method
@@ -60,9 +60,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/app/AppActivity$b;->tX:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/app/AppActivity$b;->tW:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/discord/app/AppActivity$b;->tY:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/app/AppActivity$b;->tX:Ljava/lang/String;
 
     iput p3, p0, Lcom/discord/app/AppActivity$b;->fontScale:I
 
@@ -86,9 +86,9 @@
 
     check-cast p1, Lcom/discord/app/AppActivity$b;
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->tX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->tW:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/discord/app/AppActivity$b;->tX:Ljava/lang/String;
+    iget-object v3, p1, Lcom/discord/app/AppActivity$b;->tW:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -96,9 +96,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->tY:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->tX:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/discord/app/AppActivity$b;->tY:Ljava/lang/String;
+    iget-object v3, p1, Lcom/discord/app/AppActivity$b;->tX:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -135,7 +135,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity$b;->tX:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/app/AppActivity$b;->tW:Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -153,7 +153,7 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/app/AppActivity$b;->tY:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/app/AppActivity$b;->tX:Ljava/lang/String;
 
     if-eqz v2, :cond_1
 
@@ -168,6 +168,10 @@
 
     iget v1, p0, Lcom/discord/app/AppActivity$b;->fontScale:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
@@ -182,7 +186,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->tX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->tW:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -190,7 +194,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->tY:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->tX:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$c.smali b/com.discord/smali/com/discord/app/AppActivity$c.smali
index ba89be88a5..94385d79c8 100644
--- a/com.discord/smali/com/discord/app/AppActivity$c.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$c.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/app/AppActivity$c;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -58,13 +58,13 @@
 .method public final invoke()V
     .locals 3
 
-    invoke-static {}, Lcom/discord/app/AppActivity;->do()Z
+    invoke-static {}, Lcom/discord/app/AppActivity;->dn()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/discord/app/AppActivity;->dp()V
+    invoke-static {}, Lcom/discord/app/AppActivity;->do()V
 
     const-string v0, "Application activity initialized."
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$d.smali b/com.discord/smali/com/discord/app/AppActivity$d.smali
index 4cfd1863fa..6970896152 100644
--- a/com.discord/smali/com/discord/app/AppActivity$d.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$d.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/app/AppActivity$d;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -108,7 +108,7 @@
 
     check-cast v0, Landroid/app/Activity;
 
-    const v1, 0x7f060136
+    const v1, 0x7f060138
 
     invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$e.smali b/com.discord/smali/com/discord/app/AppActivity$e.smali
index e67ebc52ac..6f69ae674e 100644
--- a/com.discord/smali/com/discord/app/AppActivity$e.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$e.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/app/AppActivity$e;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -78,7 +78,7 @@
 
     move-result-object v0
 
-    iput-object v0, v1, Lcom/discord/app/j;->vJ:Lcom/discord/app/j$a;
+    iput-object v0, v1, Lcom/discord/app/j;->vH:Lcom/discord/app/j$a;
 
     iget-object v0, p0, Lcom/discord/app/AppActivity$e;->this$0:Lcom/discord/app/AppActivity;
 
@@ -115,7 +115,7 @@
     return-void
 
     :cond_1
-    sget-object v0, Lcom/discord/app/f;->uP:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->uO:Lcom/discord/app/f;
 
     iget-object v0, p0, Lcom/discord/app/AppActivity$e;->this$0:Lcom/discord/app/AppActivity;
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$f.smali b/com.discord/smali/com/discord/app/AppActivity$f.smali
index e7bdd3abf6..5b4c02b7b5 100644
--- a/com.discord/smali/com/discord/app/AppActivity$f.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$f.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/app/AppActivity$f;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 b0e2ea9baf..e09158cb38 100644
--- a/com.discord/smali/com/discord/app/AppActivity$g.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$g.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppActivity$g;->w(Landroid/content/Context;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -122,7 +122,7 @@
 
     mul-float v3, v3, v4
 
-    invoke-static {v3}, Lkotlin/e/a;->D(F)I
+    invoke-static {v3}, Lkotlin/e/a;->C(F)I
 
     move-result v3
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$h.smali b/com.discord/smali/com/discord/app/AppActivity$h.smali
index 7190d9d4ce..d0ef88082c 100644
--- a/com.discord/smali/com/discord/app/AppActivity$h.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$h.smali
@@ -68,7 +68,7 @@
     invoke-static {p1}, Lcom/discord/app/AppActivity;->b(Lcom/discord/app/AppActivity;)V
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/AppActivity$j.smali b/com.discord/smali/com/discord/app/AppActivity$j.smali
index d4ce86efc5..c4a67c7529 100644
--- a/com.discord/smali/com/discord/app/AppActivity$j.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$j.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field final synthetic ub:Landroidx/appcompat/widget/Toolbar;
+.field final synthetic ua:Landroidx/appcompat/widget/Toolbar;
 
-.field final synthetic uc:I
+.field final synthetic ub:I
 
-.field final synthetic ud:Lrx/functions/Action2;
+.field final synthetic uc:Lrx/functions/Action2;
 
-.field final synthetic ue:Lrx/functions/Action1;
+.field final synthetic ud:Lrx/functions/Action1;
 
 
 # direct methods
 .method constructor <init>(Landroidx/appcompat/widget/Toolbar;ILrx/functions/Action2;Lrx/functions/Action1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/AppActivity$j;->ub:Landroidx/appcompat/widget/Toolbar;
+    iput-object p1, p0, Lcom/discord/app/AppActivity$j;->ua:Landroidx/appcompat/widget/Toolbar;
 
-    iput p2, p0, Lcom/discord/app/AppActivity$j;->uc:I
+    iput p2, p0, Lcom/discord/app/AppActivity$j;->ub:I
 
-    iput-object p3, p0, Lcom/discord/app/AppActivity$j;->ud:Lrx/functions/Action2;
+    iput-object p3, p0, Lcom/discord/app/AppActivity$j;->uc:Lrx/functions/Action2;
 
-    iput-object p4, p0, Lcom/discord/app/AppActivity$j;->ue:Lrx/functions/Action1;
+    iput-object p4, p0, Lcom/discord/app/AppActivity$j;->ud:Lrx/functions/Action1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,11 +49,11 @@
 .method public final onMenuItemClick(Landroid/view/MenuItem;)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity$j;->ud:Lrx/functions/Action2;
+    iget-object v0, p0, Lcom/discord/app/AppActivity$j;->uc:Lrx/functions/Action2;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity$j;->ub:Landroidx/appcompat/widget/Toolbar;
+    iget-object v1, p0, Lcom/discord/app/AppActivity$j;->ua:Landroidx/appcompat/widget/Toolbar;
 
     invoke-virtual {v1}, Landroidx/appcompat/widget/Toolbar;->getContext()Landroid/content/Context;
 
@@ -61,7 +61,7 @@
 
     invoke-interface {v0, p1, v1}, Lrx/functions/Action2;->call(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     :cond_0
     const/4 p1, 0x1
diff --git a/com.discord/smali/com/discord/app/AppActivity$m.smali b/com.discord/smali/com/discord/app/AppActivity$m.smali
index 0bd9935ca0..54a9726e90 100644
--- a/com.discord/smali/com/discord/app/AppActivity$m.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$m.smali
@@ -27,7 +27,7 @@
 
 
 # static fields
-.field public static final uf:Lcom/discord/app/AppActivity$m;
+.field public static final ue:Lcom/discord/app/AppActivity$m;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/AppActivity$m;-><init>()V
 
-    sput-object v0, Lcom/discord/app/AppActivity$m;->uf:Lcom/discord/app/AppActivity$m;
+    sput-object v0, Lcom/discord/app/AppActivity$m;->ue:Lcom/discord/app/AppActivity$m;
 
     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 0e769f9479..35d4d9f54b 100644
--- a/com.discord/smali/com/discord/app/AppActivity.smali
+++ b/com.discord/smali/com/discord/app/AppActivity.smali
@@ -20,13 +20,13 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field static tT:Z
+.field static tS:Z
 
-.field private static final tU:Landroid/content/Intent;
+.field private static final tT:Landroid/content/Intent;
 
-.field private static tV:Z
+.field private static tU:Z
 
-.field public static final tW:Lcom/discord/app/AppActivity$a;
+.field public static final tV:Lcom/discord/app/AppActivity$a;
 
 
 # instance fields
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field final tN:Ljava/util/LinkedHashMap;
+.field final tM:Ljava/util/LinkedHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedHashMap<",
@@ -54,15 +54,15 @@
     .end annotation
 .end field
 
-.field private tO:I
+.field private tN:I
 
-.field private tP:Ljava/lang/String;
+.field private tO:Ljava/lang/String;
+
+.field private final tP:Lkotlin/Lazy;
 
 .field private final tQ:Lkotlin/Lazy;
 
-.field private final tR:Lkotlin/Lazy;
-
-.field private tS:Landroid/content/Intent;
+.field private tR:Landroid/content/Intent;
 
 .field public toolbar:Landroidx/appcompat/widget/Toolbar;
 
@@ -127,15 +127,15 @@
 
     invoke-direct {v0, v3}, Lcom/discord/app/AppActivity$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/app/AppActivity;->tW:Lcom/discord/app/AppActivity$a;
+    sput-object v0, Lcom/discord/app/AppActivity;->tV:Lcom/discord/app/AppActivity$a;
 
     new-instance v0, Landroid/content/Intent;
 
     invoke-direct {v0}, Landroid/content/Intent;-><init>()V
 
-    sput-object v0, Lcom/discord/app/AppActivity;->tU:Landroid/content/Intent;
+    sput-object v0, Lcom/discord/app/AppActivity;->tT:Landroid/content/Intent;
 
-    sput-boolean v2, Lcom/discord/app/AppActivity;->tV:Z
+    sput-boolean v2, Lcom/discord/app/AppActivity;->tU:Z
 
     return-void
 .end method
@@ -149,17 +149,17 @@
 
     invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity;->tN:Ljava/util/LinkedHashMap;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->tM:Ljava/util/LinkedHashMap;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/app/AppActivity;->tO:I
+    iput v0, p0, Lcom/discord/app/AppActivity;->tN:I
 
     const-string v0, ""
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity;->tP:Ljava/lang/String;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->tO:Ljava/lang/String;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -171,9 +171,9 @@
 
     iput-object v0, p0, Lcom/discord/app/AppActivity;->paused:Lrx/subjects/Subject;
 
-    sget-object v0, Lkotlin/j;->bjA:Lkotlin/j;
+    sget-object v0, Lkotlin/j;->bjU:Lkotlin/j;
 
-    sget-object v1, Lcom/discord/app/AppActivity$m;->uf:Lcom/discord/app/AppActivity$m;
+    sget-object v1, Lcom/discord/app/AppActivity$m;->ue:Lcom/discord/app/AppActivity$m;
 
     check-cast v1, Lkotlin/jvm/functions/Function0;
 
@@ -237,7 +237,7 @@
     check-cast v0, Lkotlin/Lazy;
 
     :goto_0
-    iput-object v0, p0, Lcom/discord/app/AppActivity;->tQ:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->tP:Lkotlin/Lazy;
 
     new-instance v0, Lcom/discord/app/AppActivity$i;
 
@@ -249,11 +249,11 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity;->tR:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->tQ:Lkotlin/Lazy;
 
-    sget-object v0, Lcom/discord/app/AppActivity;->tU:Landroid/content/Intent;
+    sget-object v0, Lcom/discord/app/AppActivity;->tT:Landroid/content/Intent;
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity;->tS:Landroid/content/Intent;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->tR:Landroid/content/Intent;
 
     return-void
 .end method
@@ -281,7 +281,7 @@
 
     move-result p1
 
-    sput-boolean p1, Lcom/discord/app/AppActivity;->tT:Z
+    sput-boolean p1, Lcom/discord/app/AppActivity;->tS:Z
 
     return-void
 .end method
@@ -289,7 +289,7 @@
 .method public static final synthetic a(Lcom/discord/app/AppActivity;I)V
     .locals 0
 
-    iput p1, p0, Lcom/discord/app/AppActivity;->tO:I
+    iput p1, p0, Lcom/discord/app/AppActivity;->tN:I
 
     return-void
 .end method
@@ -305,9 +305,9 @@
 .method public static final synthetic a(Lcom/discord/app/AppActivity;Ljava/lang/String;)V
     .locals 1
 
-    sget-object v0, Lcom/discord/app/f;->uP:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->uO:Lcom/discord/app/f;
 
-    invoke-static {}, Lcom/discord/app/f;->dx()Ljava/util/List;
+    invoke-static {}, Lcom/discord/app/f;->dw()Ljava/util/List;
 
     move-result-object v0
 
@@ -325,7 +325,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f13001e
+    const p1, 0x7f13001f
 
     goto :goto_0
 
@@ -362,7 +362,7 @@
 .method public static final synthetic a(Lcom/discord/app/AppActivity;Lcom/discord/app/AppActivity$b;)Z
     .locals 5
 
-    iget-object v0, p1, Lcom/discord/app/AppActivity$b;->tY:Ljava/lang/String;
+    iget-object v0, p1, Lcom/discord/app/AppActivity$b;->tX:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/discord/models/domain/ModelUserSettings;->getLocaleObject(Ljava/lang/String;)Ljava/util/Locale;
 
@@ -380,18 +380,18 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p1, Lcom/discord/app/AppActivity$b;->tY:Ljava/lang/String;
+    iget-object p1, p1, Lcom/discord/app/AppActivity$b;->tX:Ljava/lang/String;
 
     invoke-direct {p0, p1, v1}, Lcom/discord/app/AppActivity;->b(Ljava/lang/String;Z)V
 
     return v1
 
     :cond_0
-    iget-object v0, p1, Lcom/discord/app/AppActivity$b;->tX:Ljava/lang/String;
+    iget-object v0, p1, Lcom/discord/app/AppActivity$b;->tW:Ljava/lang/String;
 
-    sget-object v2, Lcom/discord/app/f;->uP:Lcom/discord/app/f;
+    sget-object v2, Lcom/discord/app/f;->uO:Lcom/discord/app/f;
 
-    invoke-static {}, Lcom/discord/app/f;->dx()Ljava/util/List;
+    invoke-static {}, Lcom/discord/app/f;->dw()Ljava/util/List;
 
     move-result-object v2
 
@@ -412,7 +412,7 @@
 
     invoke-direct {v2, p0}, Lcom/discord/app/AppActivity$k;-><init>(Lcom/discord/app/AppActivity;)V
 
-    const v4, 0x7f04038e
+    const v4, 0x7f040391
 
     invoke-virtual {v2, v4, v1}, Lcom/discord/app/AppActivity$k;->b(IZ)Landroid/util/TypedValue;
 
@@ -449,14 +449,14 @@
 
     if-ne p1, v2, :cond_2
 
-    iget v4, p0, Lcom/discord/app/AppActivity;->tO:I
+    iget v4, p0, Lcom/discord/app/AppActivity;->tN:I
 
     if-ne v4, v0, :cond_3
 
     :cond_2
     if-eq p1, v2, :cond_4
 
-    iget p0, p0, Lcom/discord/app/AppActivity;->tO:I
+    iget p0, p0, Lcom/discord/app/AppActivity;->tN:I
 
     if-eq p0, p1, :cond_4
 
@@ -641,9 +641,9 @@
     goto :goto_1
 
     :cond_2
-    sget-object p1, Lcom/discord/app/f;->uP:Lcom/discord/app/f;
+    sget-object p1, Lcom/discord/app/f;->uO:Lcom/discord/app/f;
 
-    invoke-static {}, Lcom/discord/app/f;->dv()Ljava/util/List;
+    invoke-static {}, Lcom/discord/app/f;->du()Ljava/util/List;
 
     move-result-object p1
 
@@ -653,7 +653,7 @@
 
     if-eqz p0, :cond_3
 
-    sget-object p0, Lcom/discord/app/j$c;->vS:Lcom/discord/app/j$c;
+    sget-object p0, Lcom/discord/app/j$c;->vQ:Lcom/discord/app/j$c;
 
     goto :goto_1
 
@@ -676,7 +676,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lcom/discord/app/AppActivity;->p(Z)V
+    invoke-direct {p0, v0}, Lcom/discord/app/AppActivity;->n(Z)V
 
     return-void
 .end method
@@ -776,26 +776,26 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lcom/discord/app/AppActivity;->p(Z)V
+    invoke-direct {p0, p1}, Lcom/discord/app/AppActivity;->n(Z)V
 
     :cond_1
     return-void
 .end method
 
-.method public static final synthetic do()Z
+.method public static final synthetic dn()Z
     .locals 1
 
-    sget-boolean v0, Lcom/discord/app/AppActivity;->tV:Z
+    sget-boolean v0, Lcom/discord/app/AppActivity;->tU:Z
 
     return v0
 .end method
 
-.method public static final synthetic dp()V
+.method public static final synthetic do()V
     .locals 1
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/discord/app/AppActivity;->tV:Z
+    sput-boolean v0, Lcom/discord/app/AppActivity;->tU:Z
 
     return-void
 .end method
@@ -803,7 +803,7 @@
 .method private final getUserSettings()Lcom/discord/stores/StoreUserSettings;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->tQ:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->tP:Lkotlin/Lazy;
 
     invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
 
@@ -814,14 +814,14 @@
     return-object v0
 .end method
 
-.method private final p(Z)V
+.method private final n(Z)V
     .locals 2
 
     invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getIntent()Landroid/content/Intent;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/j$c;->vQ:Lcom/discord/app/j$c;
+    sget-object v0, Lcom/discord/app/j$c;->vO:Lcom/discord/app/j$c;
 
     check-cast v0, Ljava/io/Serializable;
 
@@ -855,7 +855,7 @@
 
     iput-object p1, p0, Lcom/discord/app/AppActivity;->toolbar:Landroidx/appcompat/widget/Toolbar;
 
-    invoke-virtual {p0}, Lcom/discord/app/AppActivity;->dn()Lcom/discord/views/ToolbarTitleLayout;
+    invoke-virtual {p0}, Lcom/discord/app/AppActivity;->dm()Lcom/discord/views/ToolbarTitleLayout;
 
     move-result-object p1
 
@@ -968,11 +968,11 @@
 
     mul-float v1, v1, v2
 
-    invoke-static {v1}, Lkotlin/e/a;->D(F)I
+    invoke-static {v1}, Lkotlin/e/a;->C(F)I
 
     move-result v1
 
-    iput v1, p0, Lcom/discord/app/AppActivity;->tO:I
+    iput v1, p0, Lcom/discord/app/AppActivity;->tN:I
 
     sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -995,7 +995,7 @@
     return-void
 .end method
 
-.method final dn()Lcom/discord/views/ToolbarTitleLayout;
+.method final dm()Lcom/discord/views/ToolbarTitleLayout;
     .locals 3
 
     iget-object v0, p0, Lcom/discord/app/AppActivity;->toolbar:Landroidx/appcompat/widget/Toolbar;
@@ -1031,9 +1031,9 @@
 .method public final getMostRecentIntent()Landroid/content/Intent;
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->tS:Landroid/content/Intent;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->tR:Landroid/content/Intent;
 
-    sget-object v1, Lcom/discord/app/AppActivity;->tU:Landroid/content/Intent;
+    sget-object v1, Lcom/discord/app/AppActivity;->tT:Landroid/content/Intent;
 
     if-ne v0, v1, :cond_0
 
@@ -1045,7 +1045,7 @@
 
     new-instance v0, Landroid/content/Intent;
 
-    sget-object v1, Lcom/discord/app/AppActivity;->tU:Landroid/content/Intent;
+    sget-object v1, Lcom/discord/app/AppActivity;->tT:Landroid/content/Intent;
 
     invoke-direct {v0, v1}, Landroid/content/Intent;-><init>(Landroid/content/Intent;)V
 
@@ -1082,7 +1082,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->tR:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->tQ:Lkotlin/Lazy;
 
     invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
 
@@ -1300,7 +1300,7 @@
 .method public onDestroy()V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->tN:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->tM:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0}, Ljava/util/LinkedHashMap;->clear()V
 
@@ -1316,10 +1316,10 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/discord/app/AppActivity;->tU:Landroid/content/Intent;
+    sget-object p1, Lcom/discord/app/AppActivity;->tT:Landroid/content/Intent;
 
     :cond_0
-    iput-object p1, p0, Lcom/discord/app/AppActivity;->tS:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/discord/app/AppActivity;->tR:Landroid/content/Intent;
 
     invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getMostRecentIntent()Landroid/content/Intent;
 
@@ -1331,7 +1331,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->tN:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->tM:Ljava/util/LinkedHashMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -1391,7 +1391,7 @@
 
     invoke-super {p0}, Lcom/discord/app/c;->onResume()V
 
-    sget-object v0, Lcom/discord/app/f;->uP:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->uO:Lcom/discord/app/f;
 
     invoke-static {p0}, Lcom/discord/app/f;->c(Lcom/discord/app/AppActivity;)Z
 
@@ -1410,7 +1410,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity;->tP:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/app/AppActivity;->tO:Ljava/lang/String;
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -1422,7 +1422,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->tP:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->tO:Ljava/lang/String;
 
     const-string v2, ""
 
@@ -1434,7 +1434,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-direct {p0, v1}, Lcom/discord/app/AppActivity;->p(Z)V
+    invoke-direct {p0, v1}, Lcom/discord/app/AppActivity;->n(Z)V
 
     return-void
 
@@ -1451,9 +1451,9 @@
 
     invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity;->tP:Ljava/lang/String;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->tO:Ljava/lang/String;
 
-    sget-object v0, Lcom/discord/app/AppActivity$b;->tZ:Lcom/discord/app/AppActivity$b$a;
+    sget-object v0, Lcom/discord/app/AppActivity$b;->tY:Lcom/discord/app/AppActivity$b$a;
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -1485,7 +1485,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/app/AppActivity$b$a$a;->ua:Lcom/discord/app/AppActivity$b$a$a;
+    sget-object v3, Lcom/discord/app/AppActivity$b$a$a;->tZ:Lcom/discord/app/AppActivity$b$a$a;
 
     check-cast v3, Lkotlin/jvm/functions/Function3;
 
@@ -1552,7 +1552,7 @@
 .method public final setActionBarSubtitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/app/AppActivity;->dn()Lcom/discord/views/ToolbarTitleLayout;
+    invoke-virtual {p0}, Lcom/discord/app/AppActivity;->dm()Lcom/discord/views/ToolbarTitleLayout;
 
     move-result-object v0
 
@@ -1560,7 +1560,7 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/views/ToolbarTitleLayout;->setSubtitle(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 
@@ -1573,7 +1573,7 @@
 .method public final setActionBarTitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/app/AppActivity;->dn()Lcom/discord/views/ToolbarTitleLayout;
+    invoke-virtual {p0}, Lcom/discord/app/AppActivity;->dm()Lcom/discord/views/ToolbarTitleLayout;
 
     move-result-object v0
 
@@ -1581,7 +1581,7 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/views/ToolbarTitleLayout;->setTitle(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 
diff --git a/com.discord/smali/com/discord/app/AppBottomSheet$d.smali b/com.discord/smali/com/discord/app/AppBottomSheet$d.smali
index a68cb300e8..2f1d63e46d 100644
--- a/com.discord/smali/com/discord/app/AppBottomSheet$d.smali
+++ b/com.discord/smali/com/discord/app/AppBottomSheet$d.smali
@@ -20,9 +20,9 @@
 # instance fields
 .field final synthetic this$0:Lcom/discord/app/AppBottomSheet;
 
-.field final synthetic ug:Landroid/view/View;
+.field final synthetic uf:Landroid/view/View;
 
-.field final synthetic uh:Lkotlin/jvm/functions/Function1;
+.field final synthetic ug:Lkotlin/jvm/functions/Function1;
 
 
 # direct methods
@@ -31,9 +31,9 @@
 
     iput-object p1, p0, Lcom/discord/app/AppBottomSheet$d;->this$0:Lcom/discord/app/AppBottomSheet;
 
-    iput-object p2, p0, Lcom/discord/app/AppBottomSheet$d;->ug:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/app/AppBottomSheet$d;->uf:Landroid/view/View;
 
-    iput-object p3, p0, Lcom/discord/app/AppBottomSheet$d;->uh:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/AppBottomSheet$d;->ug:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,9 +45,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/app/AppBottomSheet$d;->uh:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p0, Lcom/discord/app/AppBottomSheet$d;->ug:Lkotlin/jvm/functions/Function1;
 
-    iget-object v0, p0, Lcom/discord/app/AppBottomSheet$d;->ug:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/app/AppBottomSheet$d;->uf:Landroid/view/View;
 
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/app/AppBottomSheet.smali b/com.discord/smali/com/discord/app/AppBottomSheet.smali
index 1c16498f15..ff725091fa 100644
--- a/com.discord/smali/com/discord/app/AppBottomSheet.smali
+++ b/com.discord/smali/com/discord/app/AppBottomSheet.smali
@@ -74,7 +74,7 @@
 
     invoke-direct {p0}, Lcom/google/android/material/bottomsheet/BottomSheetDialogFragment;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -117,20 +117,6 @@
     return-void
 .end method
 
-.method private final getAppPermissions()Lcom/discord/app/AppPermissions;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/app/AppBottomSheet;->appPermissions$delegate:Lkotlin/Lazy;
-
-    invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/app/AppPermissions;
-
-    return-object v0
-.end method
-
 .method private final getBottomSheetBehavior()Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
@@ -317,6 +303,20 @@
     return-object v0
 .end method
 
+.method protected final getAppPermissions()Lcom/discord/app/AppPermissions;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/app/AppBottomSheet;->appPermissions$delegate:Lkotlin/Lazy;
+
+    invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/app/AppPermissions;
+
+    return-object v0
+.end method
+
 .method public final getArgumentsOrDefault()Landroid/os/Bundle;
     .locals 2
 
@@ -463,7 +463,7 @@
 
     invoke-super {p0, p1, p2, p3}, Lcom/google/android/material/bottomsheet/BottomSheetDialogFragment;->onRequestPermissionsResult(I[Ljava/lang/String;[I)V
 
-    invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
 
     move-result-object p2
 
@@ -518,7 +518,7 @@
 .method public requestMedia(Lrx/functions/Action0;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
 
     move-result-object v0
 
@@ -530,7 +530,7 @@
 .method public requestMediaDownload(Lrx/functions/Action0;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
 
     move-result-object v0
 
@@ -542,7 +542,7 @@
 .method public requestMicrophone(Lrx/functions/Action0;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
 
     move-result-object v0
 
@@ -554,7 +554,7 @@
 .method public requestVideoCallPermissions(Lrx/functions/Action0;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/app/AppDialog$a.smali b/com.discord/smali/com/discord/app/AppDialog$a.smali
index aac6251d90..a320bf649d 100644
--- a/com.discord/smali/com/discord/app/AppDialog$a.smali
+++ b/com.discord/smali/com/discord/app/AppDialog$a.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic ug:Landroid/view/View;
+.field final synthetic uf:Landroid/view/View;
 
-.field final synthetic uh:Lkotlin/jvm/functions/Function1;
+.field final synthetic ug:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic ui:Lcom/discord/app/AppDialog;
+.field final synthetic uh:Lcom/discord/app/AppDialog;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/app/AppDialog;Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/AppDialog$a;->ui:Lcom/discord/app/AppDialog;
+    iput-object p1, p0, Lcom/discord/app/AppDialog$a;->uh:Lcom/discord/app/AppDialog;
 
-    iput-object p2, p0, Lcom/discord/app/AppDialog$a;->ug:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/app/AppDialog$a;->uf:Landroid/view/View;
 
-    iput-object p3, p0, Lcom/discord/app/AppDialog$a;->uh:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/AppDialog$a;->ug:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,13 +45,13 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/app/AppDialog$a;->uh:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p0, Lcom/discord/app/AppDialog$a;->ug:Lkotlin/jvm/functions/Function1;
 
-    iget-object v0, p0, Lcom/discord/app/AppDialog$a;->ug:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/app/AppDialog$a;->uf:Landroid/view/View;
 
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p1, p0, Lcom/discord/app/AppDialog$a;->ui:Lcom/discord/app/AppDialog;
+    iget-object p1, p0, Lcom/discord/app/AppDialog$a;->uh:Lcom/discord/app/AppDialog;
 
     invoke-virtual {p1}, Lcom/discord/app/AppDialog;->dismiss()V
 
diff --git a/com.discord/smali/com/discord/app/AppDialog.smali b/com.discord/smali/com/discord/app/AppDialog.smali
index 27facee338..2dc21bd9c4 100644
--- a/com.discord/smali/com/discord/app/AppDialog.smali
+++ b/com.discord/smali/com/discord/app/AppDialog.smali
@@ -29,7 +29,7 @@
 
     invoke-direct {p0}, Landroidx/fragment/app/DialogFragment;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -405,7 +405,7 @@
     return-void
 
     :cond_0
-    sget-object p2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object p2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/app/AppEditText.smali b/com.discord/smali/com/discord/app/AppEditText.smali
index 87958c0354..09bc8ad8f0 100644
--- a/com.discord/smali/com/discord/app/AppEditText.smali
+++ b/com.discord/smali/com/discord/app/AppEditText.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private uj:Z
+.field private ui:Z
 
 
 # direct methods
@@ -86,7 +86,7 @@
 .method public final onKeyPreIme(ILandroid/view/KeyEvent;)Z
     .locals 2
 
-    iget-boolean v0, p0, Lcom/discord/app/AppEditText;->uj:Z
+    iget-boolean v0, p0, Lcom/discord/app/AppEditText;->ui:Z
 
     if-eqz v0, :cond_0
 
@@ -113,7 +113,7 @@
 .method public final setOnBackClearFocus(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/discord/app/AppEditText;->uj:Z
+    iput-boolean p1, p0, Lcom/discord/app/AppEditText;->ui:Z
 
     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 fc988c2247..1b9fec01c8 100644
--- a/com.discord/smali/com/discord/app/AppFragment$b.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$b.smali
@@ -84,7 +84,7 @@
 
     iget-object v2, p0, Lcom/discord/app/AppFragment$b;->this$0:Lcom/discord/app/AppFragment;
 
-    const v3, 0x7f12050c
+    const v3, 0x7f120517
 
     invoke-virtual {v2, v3}, Lcom/discord/app/AppFragment;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/app/AppFragment$c.smali b/com.discord/smali/com/discord/app/AppFragment$c.smali
index 6df482a23e..cb10ecb2a6 100644
--- a/com.discord/smali/com/discord/app/AppFragment$c.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$c.smali
@@ -72,7 +72,7 @@
 
     aput-object p1, v2, v3
 
-    const p1, 0x7f1211da
+    const p1, 0x7f12121f
 
     invoke-virtual {v1, p1, v2}, Lcom/discord/app/AppFragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/app/AppFragment.smali b/com.discord/smali/com/discord/app/AppFragment.smali
index 101a4e6143..53184c5a81 100644
--- a/com.discord/smali/com/discord/app/AppFragment.smali
+++ b/com.discord/smali/com/discord/app/AppFragment.smali
@@ -97,7 +97,7 @@
 
     invoke-direct {p0}, Landroidx/fragment/app/Fragment;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -164,7 +164,7 @@
     invoke-virtual {p1, p2}, Lcom/discord/app/AppActivity;->a(Landroidx/appcompat/widget/Toolbar;)V
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 
@@ -174,20 +174,6 @@
     return-object p1
 .end method
 
-.method private final getAppPermissions()Lcom/discord/app/AppPermissions;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/app/AppFragment;->appPermissions$delegate:Lkotlin/Lazy;
-
-    invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/app/AppPermissions;
-
-    return-object v0
-.end method
-
 .method public static synthetic hideKeyboard$default(Lcom/discord/app/AppFragment;Landroid/view/View;ILjava/lang/Object;)V
     .locals 0
 
@@ -365,7 +351,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/discord/app/AppActivity;->dn()Lcom/discord/views/ToolbarTitleLayout;
+    invoke-virtual {v0}, Lcom/discord/app/AppActivity;->dm()Lcom/discord/views/ToolbarTitleLayout;
 
     move-result-object v0
 
@@ -389,6 +375,20 @@
     return-object v0
 .end method
 
+.method protected final getAppPermissions()Lcom/discord/app/AppPermissions;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/app/AppFragment;->appPermissions$delegate:Lkotlin/Lazy;
+
+    invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/app/AppPermissions;
+
+    return-object v0
+.end method
+
 .method public abstract getContentViewResId()I
 .end method
 
@@ -413,7 +413,7 @@
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/lytefast/flexinput/managers/FileManager;->Cp()Ljava/io/File;
+    invoke-interface {v0}, Lcom/lytefast/flexinput/managers/FileManager;->Ce()Ljava/io/File;
 
     move-result-object v0
 
@@ -561,7 +561,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/discord/app/c;->uk:Ljava/util/TreeMap;
+    iget-object v0, v0, Lcom/discord/app/c;->uj:Ljava/util/TreeMap;
 
     invoke-virtual {v0}, Ljava/util/TreeMap;->values()Ljava/util/Collection;
 
@@ -595,7 +595,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lkotterknife/a;->bpH:Lkotterknife/a;
+    sget-object v0, Lkotterknife/a;->bqb:Lkotterknife/a;
 
     invoke-static {p0}, Lkotterknife/a;->reset(Ljava/lang/Object;)V
 
@@ -629,7 +629,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/discord/app/AppActivity;->tN:Ljava/util/LinkedHashMap;
+    iget-object v0, v0, Lcom/discord/app/AppActivity;->tM:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0, v1}, Ljava/util/LinkedHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -696,7 +696,7 @@
 
     invoke-super {p0, p1, p2, p3}, Landroidx/fragment/app/Fragment;->onRequestPermissionsResult(I[Ljava/lang/String;[I)V
 
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
 
     move-result-object p2
 
@@ -786,7 +786,7 @@
 .method public requestMedia(Lrx/functions/Action0;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
 
     move-result-object v0
 
@@ -798,7 +798,7 @@
 .method public requestMediaDownload(Lrx/functions/Action0;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
 
     move-result-object v0
 
@@ -810,7 +810,7 @@
 .method public requestMicrophone(Lrx/functions/Action0;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
 
     move-result-object v0
 
@@ -822,7 +822,7 @@
 .method public requestVideoCallPermissions(Lrx/functions/Action0;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
 
     move-result-object v0
 
@@ -882,7 +882,7 @@
 
     check-cast p1, Landroid/view/View;
 
-    const v2, 0x7f040166
+    const v2, 0x7f040168
 
     const/4 v3, 0x0
 
@@ -1125,7 +1125,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/app/AppActivity;->dn()Lcom/discord/views/ToolbarTitleLayout;
+    invoke-virtual {v1}, Lcom/discord/app/AppActivity;->dm()Lcom/discord/views/ToolbarTitleLayout;
 
     move-result-object v0
 
@@ -1133,7 +1133,7 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/views/ToolbarTitleLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 
@@ -1210,7 +1210,7 @@
 
     invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, v0, Lcom/discord/app/c;->uk:Ljava/util/TreeMap;
+    iget-object v2, v0, Lcom/discord/app/c;->uj:Ljava/util/TreeMap;
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1239,7 +1239,7 @@
 
     invoke-interface {v3, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p1, v0, Lcom/discord/app/c;->uk:Ljava/util/TreeMap;
+    iget-object p1, v0, Lcom/discord/app/c;->uj:Ljava/util/TreeMap;
 
     check-cast p1, Ljava/util/Map;
 
@@ -1286,7 +1286,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, v1, Lcom/discord/app/AppActivity;->tN:Ljava/util/LinkedHashMap;
+    iget-object v0, v1, Lcom/discord/app/AppActivity;->tM:Ljava/util/LinkedHashMap;
 
     check-cast v0, Ljava/util/Map;
 
diff --git a/com.discord/smali/com/discord/app/AppLog$Elapsed$b.smali b/com.discord/smali/com/discord/app/AppLog$Elapsed$b.smali
index f65b86ee43..70908a1631 100644
--- a/com.discord/smali/com/discord/app/AppLog$Elapsed$b.smali
+++ b/com.discord/smali/com/discord/app/AppLog$Elapsed$b.smali
@@ -50,7 +50,7 @@
 
     iget-object v0, p0, Lcom/discord/app/AppLog$Elapsed$b;->this$0:Lcom/discord/app/AppLog$Elapsed;
 
-    invoke-virtual {v0}, Lcom/discord/app/AppLog$Elapsed;->ds()J
+    invoke-virtual {v0}, Lcom/discord/app/AppLog$Elapsed;->dr()J
 
     move-result-wide v0
 
diff --git a/com.discord/smali/com/discord/app/AppLog$Elapsed.smali b/com.discord/smali/com/discord/app/AppLog$Elapsed.smali
index 56a85fe497..30da1c3f16 100644
--- a/com.discord/smali/com/discord/app/AppLog$Elapsed.smali
+++ b/com.discord/smali/com/discord/app/AppLog$Elapsed.smali
@@ -21,9 +21,9 @@
 # instance fields
 .field private final startTime:J
 
-.field private final uC:Lkotlin/Lazy;
+.field private final uB:Lkotlin/Lazy;
 
-.field private final uD:Lkotlin/Lazy;
+.field private final uC:Lkotlin/Lazy;
 
 
 # direct methods
@@ -106,7 +106,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->uC:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->uB:Lkotlin/Lazy;
 
     new-instance v0, Lcom/discord/app/AppLog$Elapsed$b;
 
@@ -118,7 +118,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->uD:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->uC:Lkotlin/Lazy;
 
     return-void
 .end method
@@ -133,10 +133,10 @@
 
 
 # virtual methods
-.method public final ds()J
+.method public final dr()J
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->uC:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->uB:Lkotlin/Lazy;
 
     invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
 
@@ -151,10 +151,10 @@
     return-wide v0
 .end method
 
-.method public final dt()F
+.method public final ds()F
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->uD:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->uC:Lkotlin/Lazy;
 
     invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/app/AppLog$LoggedItem.smali b/com.discord/smali/com/discord/app/AppLog$LoggedItem.smali
index a2707312ce..b08d8edf34 100644
--- a/com.discord/smali/com/discord/app/AppLog$LoggedItem.smali
+++ b/com.discord/smali/com/discord/app/AppLog$LoggedItem.smali
@@ -144,6 +144,10 @@
 
     iget v0, p0, Lcom/discord/app/AppLog$LoggedItem;->priority:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget-object v1, p0, Lcom/discord/app/AppLog$LoggedItem;->message:Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/app/AppLog$a.smali b/com.discord/smali/com/discord/app/AppLog$a.smali
index b4aa400728..8e9103515c 100644
--- a/com.discord/smali/com/discord/app/AppLog$a.smali
+++ b/com.discord/smali/com/discord/app/AppLog$a.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/app/AppLog;->ab(Ljava/lang/String;)Lkotlin/jvm/functions/Function3;
+    value = Lcom/discord/app/AppLog;->X(Ljava/lang/String;)Lkotlin/jvm/functions/Function3;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -86,7 +86,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/StringBuilder;
 
@@ -119,7 +119,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object p1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -144,7 +144,7 @@
     goto :goto_0
 
     :cond_2
-    sget-object p1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -167,7 +167,7 @@
     invoke-virtual {p1, p2, p3}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :goto_0
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 68ede50680..a80a8ebf6c 100644
--- a/com.discord/smali/com/discord/app/AppLog$b.smali
+++ b/com.discord/smali/com/discord/app/AppLog$b.smali
@@ -70,7 +70,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/app/AppLog$b;->invoke(Ljava/lang/String;I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -109,7 +109,7 @@
 
     iget v0, p0, Lcom/discord/app/AppLog$b;->$priority:I
 
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-static {v1}, Lcom/discord/app/AppLog;->a(Lcom/discord/app/AppLog;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/app/AppLog$c.smali b/com.discord/smali/com/discord/app/AppLog$c.smali
index c01ab56475..021e195e42 100644
--- a/com.discord/smali/com/discord/app/AppLog$c.smali
+++ b/com.discord/smali/com/discord/app/AppLog$c.smali
@@ -86,7 +86,7 @@
 
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppLog;->v(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 f35d809f18..b2af37e757 100644
--- a/com.discord/smali/com/discord/app/AppLog$d.smali
+++ b/com.discord/smali/com/discord/app/AppLog$d.smali
@@ -100,7 +100,7 @@
     invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
     :cond_2
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/AppLog.smali b/com.discord/smali/com/discord/app/AppLog.smali
index b25c474b62..615128be45 100644
--- a/com.discord/smali/com/discord/app/AppLog.smali
+++ b/com.discord/smali/com/discord/app/AppLog.smali
@@ -13,7 +13,11 @@
 
 
 # static fields
-.field private static final uA:Lrx/subjects/SerializedSubject;
+.field public static final uA:Lcom/discord/app/AppLog;
+
+.field private static uy:Landroid/content/SharedPreferences;
+
+.field private static final uz:Lrx/subjects/SerializedSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/SerializedSubject<",
@@ -24,10 +28,6 @@
     .end annotation
 .end field
 
-.field public static final uB:Lcom/discord/app/AppLog;
-
-.field private static uz:Landroid/content/SharedPreferences;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -37,11 +37,11 @@
 
     invoke-direct {v0}, Lcom/discord/app/AppLog;-><init>()V
 
-    sput-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sput-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/a;->LK()Lrx/subjects/a;
+    invoke-static {}, Lrx/subjects/a;->Ly()Lrx/subjects/a;
 
     move-result-object v1
 
@@ -49,7 +49,7 @@
 
     invoke-direct {v0, v1}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
 
-    sput-object v0, Lcom/discord/app/AppLog;->uA:Lrx/subjects/SerializedSubject;
+    sput-object v0, Lcom/discord/app/AppLog;->uz:Lrx/subjects/SerializedSubject;
 
     return-void
 .end method
@@ -64,6 +64,35 @@
     return-void
 .end method
 
+.method public static X(Ljava/lang/String;)Lkotlin/jvm/functions/Function3;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            ")",
+            "Lkotlin/jvm/functions/Function3<",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
+            "Ljava/lang/Exception;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "tag"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/app/AppLog$a;
+
+    invoke-direct {v0, p0}, Lcom/discord/app/AppLog$a;-><init>(Ljava/lang/String;)V
+
+    check-cast v0, Lkotlin/jvm/functions/Function3;
+
+    return-object v0
+.end method
+
 .method public static final synthetic a(Lcom/discord/app/AppLog;)Ljava/lang/String;
     .locals 0
 
@@ -87,7 +116,7 @@
 .method public static final a(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    sget-object v0, Lcom/discord/app/AppLog;->uz:Landroid/content/SharedPreferences;
+    sget-object v0, Lcom/discord/app/AppLog;->uy:Landroid/content/SharedPreferences;
 
     if-eqz v0, :cond_0
 
@@ -140,7 +169,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/AppLog;->uA:Lrx/subjects/SerializedSubject;
+    sget-object v0, Lcom/discord/app/AppLog;->uz:Lrx/subjects/SerializedSubject;
 
     new-instance v1, Lcom/discord/app/AppLog$LoggedItem;
 
@@ -385,36 +414,7 @@
     return-void
 .end method
 
-.method public static ab(Ljava/lang/String;)Lkotlin/jvm/functions/Function3;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            ")",
-            "Lkotlin/jvm/functions/Function3<",
-            "Ljava/lang/Integer;",
-            "Ljava/lang/String;",
-            "Ljava/lang/Exception;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-
-    const-string v0, "tag"
-
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/app/AppLog$a;
-
-    invoke-direct {v0, p0}, Lcom/discord/app/AppLog$a;-><init>(Ljava/lang/String;)V
-
-    check-cast v0, Lkotlin/jvm/functions/Function3;
-
-    return-object v0
-.end method
-
-.method public static final dr()Lrx/Observable;
+.method public static final dq()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -425,7 +425,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/AppLog;->uA:Lrx/subjects/SerializedSubject;
+    sget-object v0, Lcom/discord/app/AppLog;->uz:Lrx/subjects/SerializedSubject;
 
     check-cast v0, Lrx/Observable;
 
@@ -433,7 +433,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -451,7 +451,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v1, 0x0
 
@@ -473,7 +473,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/AppLog;->uz:Landroid/content/SharedPreferences;
+    sput-object v0, Lcom/discord/app/AppLog;->uy:Landroid/content/SharedPreferences;
 
     const/4 v0, 0x2
 
@@ -515,7 +515,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/app/AppPermissions$Requests.smali b/com.discord/smali/com/discord/app/AppPermissions$Requests.smali
index d9220d51e9..6d86e6b0f1 100644
--- a/com.discord/smali/com/discord/app/AppPermissions$Requests.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions$Requests.smali
@@ -15,5 +15,8 @@
 
 
 # virtual methods
+.method public abstract requestMicrophone(Lrx/functions/Action0;)V
+.end method
+
 .method public abstract requestVideoCallPermissions(Lrx/functions/Action0;)V
 .end method
diff --git a/com.discord/smali/com/discord/app/AppPermissions$b$1.smali b/com.discord/smali/com/discord/app/AppPermissions$b$1.smali
index f569ff03ed..8976e39495 100644
--- a/com.discord/smali/com/discord/app/AppPermissions$b$1.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions$b$1.smali
@@ -68,7 +68,7 @@
 
     invoke-static {v0, v1}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     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 c41440ed9a..cb7a0aa930 100644
--- a/com.discord/smali/com/discord/app/AppPermissions$c.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions$c.smali
@@ -54,7 +54,7 @@
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 
diff --git a/com.discord/smali/com/discord/app/AppPermissions.smali b/com.discord/smali/com/discord/app/AppPermissions.smali
index b69c77a8e9..0ffec12288 100644
--- a/com.discord/smali/com/discord/app/AppPermissions.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions.smali
@@ -13,7 +13,7 @@
 
 
 # static fields
-.field private static final uF:Ljava/util/HashMap;
+.field private static final uE:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -26,18 +26,18 @@
 .end field
 
 # The value of this static final field might be set in the static constructor
-.field private static final uG:I = 0xd2
+.field private static final uF:I = 0xd2
 
 # The value of this static final field might be set in the static constructor
-.field private static final uH:I = 0xd3
+.field private static final uG:I = 0xd3
 
 # The value of this static final field might be set in the static constructor
-.field private static final uI:I = 0xde
+.field private static final uH:I = 0xde
 
 # The value of this static final field might be set in the static constructor
-.field private static final uJ:I = 0xd5
+.field private static final uI:I = 0xd5
 
-.field public static final uK:Lcom/discord/app/AppPermissions$a;
+.field public static final uJ:Lcom/discord/app/AppPermissions$a;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
@@ -46,7 +46,7 @@
 # instance fields
 .field private final fragment:Landroidx/fragment/app/Fragment;
 
-.field private final uE:Ljava/util/HashMap;
+.field private final uD:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -69,35 +69,35 @@
 
     invoke-direct {v0, v1}, Lcom/discord/app/AppPermissions$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/app/AppPermissions;->uK:Lcom/discord/app/AppPermissions$a;
+    sput-object v0, Lcom/discord/app/AppPermissions;->uJ:Lcom/discord/app/AppPermissions$a;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v0, Lcom/discord/app/AppPermissions;->uF:Ljava/util/HashMap;
+    sput-object v0, Lcom/discord/app/AppPermissions;->uE:Ljava/util/HashMap;
 
     const/16 v0, 0xd2
 
-    sput v0, Lcom/discord/app/AppPermissions;->uG:I
+    sput v0, Lcom/discord/app/AppPermissions;->uF:I
 
     const/16 v0, 0xd3
 
-    sput v0, Lcom/discord/app/AppPermissions;->uH:I
+    sput v0, Lcom/discord/app/AppPermissions;->uG:I
 
     const/16 v0, 0xde
 
-    sput v0, Lcom/discord/app/AppPermissions;->uI:I
+    sput v0, Lcom/discord/app/AppPermissions;->uH:I
 
     const/16 v0, 0xd5
 
-    sput v0, Lcom/discord/app/AppPermissions;->uJ:I
+    sput v0, Lcom/discord/app/AppPermissions;->uI:I
 
-    sget-object v0, Lcom/discord/app/AppPermissions;->uF:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/app/AppPermissions;->uE:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
-    sget v2, Lcom/discord/app/AppPermissions;->uH:I
+    sget v2, Lcom/discord/app/AppPermissions;->uG:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -113,11 +113,11 @@
 
     invoke-interface {v0, v2, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/discord/app/AppPermissions;->uF:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/app/AppPermissions;->uE:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
-    sget v2, Lcom/discord/app/AppPermissions;->uG:I
+    sget v2, Lcom/discord/app/AppPermissions;->uF:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -135,11 +135,11 @@
 
     invoke-interface {v0, v2, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/discord/app/AppPermissions;->uF:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/app/AppPermissions;->uE:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
-    sget v2, Lcom/discord/app/AppPermissions;->uI:I
+    sget v2, Lcom/discord/app/AppPermissions;->uH:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -161,11 +161,11 @@
 
     invoke-interface {v0, v2, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/discord/app/AppPermissions;->uF:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/app/AppPermissions;->uE:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
-    sget v2, Lcom/discord/app/AppPermissions;->uJ:I
+    sget v2, Lcom/discord/app/AppPermissions;->uI:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -195,7 +195,7 @@
 
     invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/app/AppPermissions;->uE:Ljava/util/HashMap;
+    iput-object p1, p0, Lcom/discord/app/AppPermissions;->uD:Ljava/util/HashMap;
 
     return-void
 .end method
@@ -220,7 +220,7 @@
 
     check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    sget-object p2, Lcom/discord/app/AppPermissions;->uF:Ljava/util/HashMap;
+    sget-object p2, Lcom/discord/app/AppPermissions;->uE:Ljava/util/HashMap;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -312,7 +312,7 @@
 
     :cond_2
     :try_start_2
-    iget-object v1, p0, Lcom/discord/app/AppPermissions;->uE:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/discord/app/AppPermissions;->uD:Ljava/util/HashMap;
 
     check-cast v1, Ljava/util/Map;
 
@@ -399,7 +399,7 @@
 
     invoke-direct {v0, p0}, Lcom/discord/app/AppPermissions$b;-><init>(Lcom/discord/app/AppPermissions;)V
 
-    iget-object v1, p0, Lcom/discord/app/AppPermissions;->uE:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/discord/app/AppPermissions;->uD:Ljava/util/HashMap;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -411,11 +411,11 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function0;
 
-    sget v2, Lcom/discord/app/AppPermissions;->uH:I
+    sget v2, Lcom/discord/app/AppPermissions;->uG:I
 
     if-ne p1, v2, :cond_0
 
-    const p1, 0x7f120d22
+    const p1, 0x7f120d68
 
     invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->x(I)Lkotlin/jvm/functions/Function0;
 
@@ -424,11 +424,11 @@
     goto :goto_0
 
     :cond_0
-    sget v2, Lcom/discord/app/AppPermissions;->uI:I
+    sget v2, Lcom/discord/app/AppPermissions;->uH:I
 
     if-ne p1, v2, :cond_1
 
-    const p1, 0x7f120d20
+    const p1, 0x7f120d66
 
     invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->x(I)Lkotlin/jvm/functions/Function0;
 
@@ -437,11 +437,11 @@
     goto :goto_0
 
     :cond_1
-    sget v2, Lcom/discord/app/AppPermissions;->uJ:I
+    sget v2, Lcom/discord/app/AppPermissions;->uI:I
 
     if-ne p1, v2, :cond_2
 
-    const p1, 0x7f120d21
+    const p1, 0x7f120d67
 
     invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->x(I)Lkotlin/jvm/functions/Function0;
 
@@ -502,7 +502,7 @@
 .method public final requestMedia(Lrx/functions/Action0;)V
     .locals 1
 
-    sget v0, Lcom/discord/app/AppPermissions;->uI:I
+    sget v0, Lcom/discord/app/AppPermissions;->uH:I
 
     invoke-direct {p0, v0, p1}, Lcom/discord/app/AppPermissions;->a(ILrx/functions/Action0;)V
 
@@ -512,7 +512,7 @@
 .method public final requestMediaDownload(Lrx/functions/Action0;)V
     .locals 1
 
-    sget v0, Lcom/discord/app/AppPermissions;->uJ:I
+    sget v0, Lcom/discord/app/AppPermissions;->uI:I
 
     invoke-direct {p0, v0, p1}, Lcom/discord/app/AppPermissions;->a(ILrx/functions/Action0;)V
 
@@ -522,7 +522,7 @@
 .method public final requestMicrophone(Lrx/functions/Action0;)V
     .locals 1
 
-    sget v0, Lcom/discord/app/AppPermissions;->uH:I
+    sget v0, Lcom/discord/app/AppPermissions;->uG:I
 
     invoke-direct {p0, v0, p1}, Lcom/discord/app/AppPermissions;->a(ILrx/functions/Action0;)V
 
@@ -532,7 +532,7 @@
 .method public final requestVideoCallPermissions(Lrx/functions/Action0;)V
     .locals 1
 
-    sget v0, Lcom/discord/app/AppPermissions;->uG:I
+    sget v0, Lcom/discord/app/AppPermissions;->uF:I
 
     invoke-direct {p0, v0, p1}, Lcom/discord/app/AppPermissions;->a(ILrx/functions/Action0;)V
 
diff --git a/com.discord/smali/com/discord/app/AppScrollingViewBehavior$a.smali b/com.discord/smali/com/discord/app/AppScrollingViewBehavior$a.smali
index c493af0ed7..c33bba3ca9 100644
--- a/com.discord/smali/com/discord/app/AppScrollingViewBehavior$a.smali
+++ b/com.discord/smali/com/discord/app/AppScrollingViewBehavior$a.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic uT:Lcom/discord/app/AppScrollingViewBehavior;
+.field final synthetic uS:Lcom/discord/app/AppScrollingViewBehavior;
 
-.field final synthetic uU:Landroid/view/View;
+.field final synthetic uT:Landroid/view/View;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/app/AppScrollingViewBehavior;Landroid/view/View;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->uT:Lcom/discord/app/AppScrollingViewBehavior;
+    iput-object p1, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->uS:Lcom/discord/app/AppScrollingViewBehavior;
 
-    iput-object p2, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->uU:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->uT:Landroid/view/View;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->uT:Lcom/discord/app/AppScrollingViewBehavior;
+    iget-object v0, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->uS:Lcom/discord/app/AppScrollingViewBehavior;
 
-    iget-object v1, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->uU:Landroid/view/View;
+    iget-object v1, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->uT:Landroid/view/View;
 
     invoke-static {v0, v1}, Lcom/discord/app/AppScrollingViewBehavior;->a(Lcom/discord/app/AppScrollingViewBehavior;Landroid/view/View;)V
 
diff --git a/com.discord/smali/com/discord/app/AppScrollingViewBehavior.smali b/com.discord/smali/com/discord/app/AppScrollingViewBehavior.smali
index a3777e44d4..de43b280e6 100644
--- a/com.discord/smali/com/discord/app/AppScrollingViewBehavior.smali
+++ b/com.discord/smali/com/discord/app/AppScrollingViewBehavior.smali
@@ -6,9 +6,9 @@
 # instance fields
 .field private appBarLayout:Lcom/google/android/material/appbar/AppBarLayout;
 
-.field private final uR:F
+.field private final uQ:F
 
-.field private uS:Z
+.field private uR:Z
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/discord/app/AppScrollingViewBehavior;->uR:F
+    iput p1, p0, Lcom/discord/app/AppScrollingViewBehavior;->uQ:F
 
     return-void
 .end method
@@ -45,7 +45,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/discord/app/AppScrollingViewBehavior;->uS:Z
+    iput-boolean v0, p0, Lcom/discord/app/AppScrollingViewBehavior;->uR:Z
 
     invoke-static {p1}, Lcom/discord/app/AppScrollingViewBehavior;->b(Landroid/view/View;)I
 
@@ -74,7 +74,7 @@
     :cond_0
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/discord/app/AppScrollingViewBehavior;->uS:Z
+    iput-boolean p1, p0, Lcom/discord/app/AppScrollingViewBehavior;->uR:Z
 
     return-void
 .end method
@@ -150,7 +150,7 @@
 
     div-float/2addr p1, v0
 
-    iget v0, p0, Lcom/discord/app/AppScrollingViewBehavior;->uR:F
+    iget v0, p0, Lcom/discord/app/AppScrollingViewBehavior;->uQ:F
 
     invoke-static {v0, p1}, Ljava/lang/Math;->min(FF)F
 
diff --git a/com.discord/smali/com/discord/app/AppTextView.smali b/com.discord/smali/com/discord/app/AppTextView.smali
index bc5ede643f..d4f1e9079d 100644
--- a/com.discord/smali/com/discord/app/AppTextView.smali
+++ b/com.discord/smali/com/discord/app/AppTextView.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
+.field private uY:I
+
 .field private uZ:I
 
-.field private va:I
-
-.field private vb:Ljava/lang/String;
+.field private va:Ljava/lang/String;
 
 
 # direct methods
@@ -63,7 +63,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/app/AppTextView;->va:I
+    iput v0, p0, Lcom/discord/app/AppTextView;->uZ:I
 
     if-eqz p2, :cond_1
 
@@ -79,7 +79,7 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/discord/app/AppTextView;->vb:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/app/AppTextView;->va:Ljava/lang/String;
 
     const/4 p2, 0x3
 
@@ -87,7 +87,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/discord/app/AppTextView;->va:I
+    iput p2, p0, Lcom/discord/app/AppTextView;->uZ:I
 
     const/4 p2, 0x2
 
@@ -95,7 +95,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/discord/app/AppTextView;->uZ:I
+    iput p2, p0, Lcom/discord/app/AppTextView;->uY:I
 
     const/4 p2, 0x1
 
@@ -105,11 +105,11 @@
 
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
-    iget p1, p0, Lcom/discord/app/AppTextView;->uZ:I
+    iget p1, p0, Lcom/discord/app/AppTextView;->uY:I
 
     if-lez p1, :cond_0
 
-    iget p1, p0, Lcom/discord/app/AppTextView;->va:I
+    iget p1, p0, Lcom/discord/app/AppTextView;->uZ:I
 
     if-lez p1, :cond_0
 
@@ -123,7 +123,7 @@
 
     move-result-object v1
 
-    iget v3, p0, Lcom/discord/app/AppTextView;->uZ:I
+    iget v3, p0, Lcom/discord/app/AppTextView;->uY:I
 
     new-array p2, p2, [Ljava/lang/Object;
 
@@ -137,12 +137,12 @@
 
     move-result-object p1
 
-    sget-object p2, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
-
-    const-string p2, "quantityString"
+    const-string p2, "resources.getQuantityStr\u2026esId, quantity, quantity)"
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
+    sget-object p2, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
+
     array-length p2, v0
 
     invoke-static {v0, p2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
@@ -170,7 +170,7 @@
     :cond_0
     if-eqz p3, :cond_1
 
-    iget-object p1, p0, Lcom/discord/app/AppTextView;->vb:Ljava/lang/String;
+    iget-object p1, p0, Lcom/discord/app/AppTextView;->va:Ljava/lang/String;
 
     new-array p2, v2, [Ljava/lang/Object;
 
@@ -300,7 +300,7 @@
 .method public final getAttrText()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/app/AppTextView;->vb:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/app/AppTextView;->va:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -308,7 +308,7 @@
 .method public final setAttrText(Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/AppTextView;->vb:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/app/AppTextView;->va:Ljava/lang/String;
 
     return-void
 .end method
@@ -320,9 +320,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
-    iget-object v0, p0, Lcom/discord/app/AppTextView;->vb:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/app/AppTextView;->va:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService$a.smali b/com.discord/smali/com/discord/app/DiscordConnectService$a.smali
index b5ac5e6102..3e82d96734 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService$a.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService$a.smali
@@ -34,7 +34,7 @@
 .method static log(Ljava/lang/String;)V
     .locals 6
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-class v1, Lcom/discord/app/DiscordConnectService;
 
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService$b.smali b/com.discord/smali/com/discord/app/DiscordConnectService$b.smali
index 4fa913ed90..2f3539e716 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService$b.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService$b.smali
@@ -33,7 +33,7 @@
 
 
 # static fields
-.field public static final wa:Lcom/discord/app/DiscordConnectService$b;
+.field public static final vY:Lcom/discord/app/DiscordConnectService$b;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/DiscordConnectService$b;-><init>()V
 
-    sput-object v0, Lcom/discord/app/DiscordConnectService$b;->wa:Lcom/discord/app/DiscordConnectService$b;
+    sput-object v0, Lcom/discord/app/DiscordConnectService$b;->vY:Lcom/discord/app/DiscordConnectService$b;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService$c$1.smali b/com.discord/smali/com/discord/app/DiscordConnectService$c$1.smali
index 804f6e3707..9e3ea5abdd 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService$c$1.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService$c$1.smali
@@ -33,7 +33,7 @@
 
 
 # static fields
-.field public static final wc:Lcom/discord/app/DiscordConnectService$c$1;
+.field public static final wa:Lcom/discord/app/DiscordConnectService$c$1;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/DiscordConnectService$c$1;-><init>()V
 
-    sput-object v0, Lcom/discord/app/DiscordConnectService$c$1;->wc:Lcom/discord/app/DiscordConnectService$c$1;
+    sput-object v0, Lcom/discord/app/DiscordConnectService$c$1;->wa:Lcom/discord/app/DiscordConnectService$c$1;
 
     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 40d22b5077..03a2bda6c4 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService$c.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService$c.smali
@@ -33,7 +33,7 @@
 
 
 # static fields
-.field public static final wb:Lcom/discord/app/DiscordConnectService$c;
+.field public static final vZ:Lcom/discord/app/DiscordConnectService$c;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/DiscordConnectService$c;-><init>()V
 
-    sput-object v0, Lcom/discord/app/DiscordConnectService$c;->wb:Lcom/discord/app/DiscordConnectService$c;
+    sput-object v0, Lcom/discord/app/DiscordConnectService$c;->vZ:Lcom/discord/app/DiscordConnectService$c;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/DiscordConnectService$c$1;->wc:Lcom/discord/app/DiscordConnectService$c$1;
+    sget-object v0, Lcom/discord/app/DiscordConnectService$c$1;->wa:Lcom/discord/app/DiscordConnectService$c$1;
 
     check-cast v0, Lrx/functions/b;
 
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService$d.smali b/com.discord/smali/com/discord/app/DiscordConnectService$d.smali
index 8bf565f77f..22a7e8ef20 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService$d.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService$d.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final wd:Lcom/discord/app/DiscordConnectService$d;
+.field public static final wb:Lcom/discord/app/DiscordConnectService$d;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/DiscordConnectService$d;-><init>()V
 
-    sput-object v0, Lcom/discord/app/DiscordConnectService$d;->wd:Lcom/discord/app/DiscordConnectService$d;
+    sput-object v0, Lcom/discord/app/DiscordConnectService$d;->wb:Lcom/discord/app/DiscordConnectService$d;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService$e.smali b/com.discord/smali/com/discord/app/DiscordConnectService$e.smali
index 8d67cd3e8f..e9849dd328 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService$e.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService$e.smali
@@ -52,7 +52,7 @@
 .method public final synthetic invoke()Ljava/lang/Object;
     .locals 2
 
-    sget-object v0, Lcom/discord/app/DiscordConnectService;->vZ:Lcom/discord/app/DiscordConnectService$a;
+    sget-object v0, Lcom/discord/app/DiscordConnectService;->vX:Lcom/discord/app/DiscordConnectService$a;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -80,7 +80,7 @@
 
     invoke-static {v0, v1}, Lcom/discord/app/DiscordConnectService;->a(Lcom/discord/app/DiscordConnectService;I)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService$f.smali b/com.discord/smali/com/discord/app/DiscordConnectService$f.smali
index 06da9d8cf2..5fafdf59ec 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService$f.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService$f.smali
@@ -59,7 +59,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/DiscordConnectService;->vZ:Lcom/discord/app/DiscordConnectService$a;
+    sget-object v0, Lcom/discord/app/DiscordConnectService;->vX:Lcom/discord/app/DiscordConnectService$a;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -89,7 +89,7 @@
 
     invoke-static {p1, v0}, Lcom/discord/app/DiscordConnectService;->a(Lcom/discord/app/DiscordConnectService;I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService.smali b/com.discord/smali/com/discord/app/DiscordConnectService.smali
index 5931110ebe..4518b74bc1 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService.smali
@@ -12,9 +12,9 @@
 
 
 # static fields
-.field private static final vY:Z
+.field private static final vW:Z
 
-.field public static final vZ:Lcom/discord/app/DiscordConnectService$a;
+.field public static final vX:Lcom/discord/app/DiscordConnectService$a;
 
 
 # direct methods
@@ -27,15 +27,15 @@
 
     invoke-direct {v0, v1}, Lcom/discord/app/DiscordConnectService$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/app/DiscordConnectService;->vZ:Lcom/discord/app/DiscordConnectService$a;
+    sput-object v0, Lcom/discord/app/DiscordConnectService;->vX:Lcom/discord/app/DiscordConnectService$a;
 
-    sget-object v0, Lcom/discord/samsung/a;->zM:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->en()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eq()Z
 
     move-result v0
 
-    sput-boolean v0, Lcom/discord/app/DiscordConnectService;->vY:Z
+    sput-boolean v0, Lcom/discord/app/DiscordConnectService;->vW:Z
 
     return-void
 .end method
@@ -89,7 +89,7 @@
 
     invoke-super {p0}, Landroid/app/Service;->onCreate()V
 
-    sget-boolean v0, Lcom/discord/app/DiscordConnectService;->vY:Z
+    sget-boolean v0, Lcom/discord/app/DiscordConnectService;->vW:Z
 
     if-eqz v0, :cond_0
 
@@ -125,7 +125,7 @@
     invoke-static {v0}, Lcom/discord/app/DiscordConnectService$a;->log(Ljava/lang/String;)V
 
     :goto_0
-    sget-object v0, Lcom/discord/app/g;->uX:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->uW:Lcom/discord/app/g;
 
     invoke-virtual {v0, p0}, Lcom/discord/app/g;->u(Ljava/lang/Object;)V
 
@@ -153,13 +153,13 @@
 
     move-result-object v0
 
-    const v2, 0x7f080300
+    const v2, 0x7f080311
 
     invoke-virtual {v0, v2}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
     move-result-object v0
 
-    const v2, 0x7f06002c
+    const v2, 0x7f06002d
 
     invoke-static {v1, v2}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 
@@ -169,7 +169,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120429
+    const v1, 0x7f120432
 
     invoke-virtual {p0, v1}, Lcom/discord/app/DiscordConnectService;->getString(I)Ljava/lang/String;
 
@@ -181,7 +181,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120430
+    const v1, 0x7f120439
 
     invoke-virtual {p0, v1}, Lcom/discord/app/DiscordConnectService;->getString(I)Ljava/lang/String;
 
@@ -233,7 +233,7 @@
 
     invoke-static {v0}, Lcom/discord/app/DiscordConnectService$a;->log(Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/g;->uX:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->uW:Lcom/discord/app/g;
 
     invoke-virtual {v0, p0}, Lcom/discord/app/g;->v(Ljava/lang/Object;)V
 
@@ -275,7 +275,7 @@
     move-object v3, v2
 
     :goto_0
-    sget-boolean v4, Lcom/discord/app/DiscordConnectService;->vY:Z
+    sget-boolean v4, Lcom/discord/app/DiscordConnectService;->vW:Z
 
     if-eqz v4, :cond_b
 
@@ -329,7 +329,7 @@
 
     check-cast v2, Landroid/content/Context;
 
-    const v3, 0x7f120c9f
+    const v3, 0x7f120cda
 
     invoke-static {v2, v3}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
@@ -355,9 +355,9 @@
     goto/16 :goto_5
 
     :cond_3
-    sget-object v4, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v4, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
-    invoke-static {}, Lcom/discord/app/a/a;->dK()Lkotlin/text/Regex;
+    invoke-static {}, Lcom/discord/app/a/a;->dJ()Lkotlin/text/Regex;
 
     move-result-object v4
 
@@ -378,7 +378,7 @@
 
     if-eqz v4, :cond_5
 
-    invoke-interface {v4}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {v4}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object v6
 
@@ -392,7 +392,7 @@
 
     if-eqz v5, :cond_5
 
-    invoke-static {v5}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v5}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v2
 
@@ -531,7 +531,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/app/DiscordConnectService$b;->wa:Lcom/discord/app/DiscordConnectService$b;
+    sget-object v3, Lcom/discord/app/DiscordConnectService$b;->vY:Lcom/discord/app/DiscordConnectService$b;
 
     check-cast v3, Lrx/functions/b;
 
@@ -555,7 +555,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/app/DiscordConnectService$c;->wb:Lcom/discord/app/DiscordConnectService$c;
+    sget-object v3, Lcom/discord/app/DiscordConnectService$c;->vZ:Lcom/discord/app/DiscordConnectService$c;
 
     check-cast v3, Lrx/functions/b;
 
@@ -580,7 +580,7 @@
 
     invoke-virtual {v2, v3}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->launchForConnect(Landroid/content/Context;)V
 
-    sget-object v2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-static {v2}, Lrx/Observable;->bI(Ljava/lang/Object;)Lrx/Observable;
 
@@ -640,7 +640,7 @@
 
     const/4 v13, 0x0
 
-    sget-object v2, Lcom/discord/app/DiscordConnectService$d;->wd:Lcom/discord/app/DiscordConnectService$d;
+    sget-object v2, Lcom/discord/app/DiscordConnectService$d;->wb:Lcom/discord/app/DiscordConnectService$d;
 
     move-object/from16 v16, v2
 
diff --git a/com.discord/smali/com/discord/app/a/a.smali b/com.discord/smali/com/discord/app/a/a.smali
index 265179738b..976660ac4a 100644
--- a/com.discord/smali/com/discord/app/a/a.smali
+++ b/com.discord/smali/com/discord/app/a/a.smali
@@ -10,19 +10,23 @@
 
 .field private static final HOST_INVITE:Ljava/lang/String;
 
+.field private static final wc:Ljava/lang/String;
+
+.field private static final wd:Ljava/lang/String;
+
 .field private static final we:Ljava/lang/String;
 
-.field private static final wf:Ljava/lang/String;
+.field private static final wf:Lkotlin/text/Regex;
 
-.field private static final wg:Ljava/lang/String;
+.field private static final wg:Lkotlin/text/Regex;
 
-.field private static final wh:Lkotlin/text/Regex;
+.field public static final wh:Lkotlin/text/Regex;
 
-.field private static final wi:Lkotlin/text/Regex;
+.field public static final wi:Lkotlin/text/Regex;
 
-.field public static final wj:Lkotlin/text/Regex;
+.field private static final wj:Lkotlin/text/Regex;
 
-.field public static final wk:Lkotlin/text/Regex;
+.field private static final wk:Lkotlin/text/Regex;
 
 .field private static final wl:Lkotlin/text/Regex;
 
@@ -36,11 +40,7 @@
 
 .field private static final wq:Lkotlin/text/Regex;
 
-.field private static final wr:Lkotlin/text/Regex;
-
-.field private static final ws:Lkotlin/text/Regex;
-
-.field public static final wt:Lcom/discord/app/a/a;
+.field public static final wr:Lcom/discord/app/a/a;
 
 
 # direct methods
@@ -51,11 +51,11 @@
 
     invoke-direct {v0}, Lcom/discord/app/a/a;-><init>()V
 
-    sput-object v0, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sput-object v0, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
     const-string v0, "https://discordapp.com"
 
-    invoke-static {v0}, Lcom/discord/app/a/a;->af(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/discord/app/a/a;->ab(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -63,7 +63,7 @@
 
     const-string v0, "https://discord.gift"
 
-    invoke-static {v0}, Lcom/discord/app/a/a;->af(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/discord/app/a/a;->ab(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -71,7 +71,7 @@
 
     const-string v0, "https://discord.gg"
 
-    invoke-static {v0}, Lcom/discord/app/a/a;->af(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/discord/app/a/a;->ab(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -89,7 +89,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/a/a;->we:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/a/a;->wc:Ljava/lang/String;
 
     sget-object v0, Lcom/discord/app/a/a;->HOST_GIFT:Ljava/lang/String;
 
@@ -97,7 +97,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/a/a;->wf:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/a/a;->wd:Ljava/lang/String;
 
     sget-object v0, Lcom/discord/app/a/a;->HOST_INVITE:Ljava/lang/String;
 
@@ -105,9 +105,9 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/a/a;->wg:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/a/a;->we:Ljava/lang/String;
 
-    sget-object v0, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -115,9 +115,9 @@
 
     invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lkotlin/text/k;)V
 
-    sput-object v1, Lcom/discord/app/a/a;->wh:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wf:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -125,7 +125,7 @@
 
     invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lkotlin/text/k;)V
 
-    sput-object v1, Lcom/discord/app/a/a;->wi:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wg:Lkotlin/text/Regex;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -133,7 +133,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/a/a;->we:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/a/a;->wc:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -141,7 +141,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    sget-object v1, Lcom/discord/app/a/a;->wg:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/a/a;->we:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -149,7 +149,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    sget-object v1, Lcom/discord/app/a/a;->wg:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/a/a;->we:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -161,13 +161,13 @@
 
     move-result-object v0
 
-    sget-object v2, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sget-object v2, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     new-instance v3, Lkotlin/text/Regex;
 
     invoke-direct {v3, v0, v2}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lkotlin/text/k;)V
 
-    sput-object v3, Lcom/discord/app/a/a;->wj:Lkotlin/text/Regex;
+    sput-object v3, Lcom/discord/app/a/a;->wh:Lkotlin/text/Regex;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -175,7 +175,7 @@
 
     invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/app/a/a;->we:Ljava/lang/String;
+    sget-object v2, Lcom/discord/app/a/a;->wc:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -183,7 +183,7 @@
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    sget-object v2, Lcom/discord/app/a/a;->wf:Ljava/lang/String;
+    sget-object v2, Lcom/discord/app/a/a;->wd:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -193,15 +193,15 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sget-object v1, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     new-instance v2, Lkotlin/text/Regex;
 
     invoke-direct {v2, v0, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lkotlin/text/k;)V
 
-    sput-object v2, Lcom/discord/app/a/a;->wk:Lkotlin/text/Regex;
+    sput-object v2, Lcom/discord/app/a/a;->wi:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -209,9 +209,9 @@
 
     invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lkotlin/text/k;)V
 
-    sput-object v1, Lcom/discord/app/a/a;->wl:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wj:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -219,9 +219,9 @@
 
     invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lkotlin/text/k;)V
 
-    sput-object v1, Lcom/discord/app/a/a;->wm:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wk:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -229,9 +229,9 @@
 
     invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lkotlin/text/k;)V
 
-    sput-object v1, Lcom/discord/app/a/a;->wn:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wl:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -239,9 +239,9 @@
 
     invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lkotlin/text/k;)V
 
-    sput-object v1, Lcom/discord/app/a/a;->wo:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wm:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -249,7 +249,7 @@
 
     invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lkotlin/text/k;)V
 
-    sput-object v1, Lcom/discord/app/a/a;->wp:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wn:Lkotlin/text/Regex;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -257,7 +257,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/a/a;->we:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/a/a;->wc:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -269,15 +269,15 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sget-object v1, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     new-instance v2, Lkotlin/text/Regex;
 
     invoke-direct {v2, v0, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lkotlin/text/k;)V
 
-    sput-object v2, Lcom/discord/app/a/a;->wq:Lkotlin/text/Regex;
+    sput-object v2, Lcom/discord/app/a/a;->wo:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -285,9 +285,9 @@
 
     invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lkotlin/text/k;)V
 
-    sput-object v1, Lcom/discord/app/a/a;->wr:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wp:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -295,7 +295,7 @@
 
     invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lkotlin/text/k;)V
 
-    sput-object v1, Lcom/discord/app/a/a;->ws:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wq:Lkotlin/text/Regex;
 
     return-void
 .end method
@@ -349,7 +349,7 @@
 
     check-cast p0, Ljava/lang/CharSequence;
 
-    sget-object v0, Lcom/discord/app/a/a;->wi:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wg:Lkotlin/text/Regex;
 
     invoke-virtual {v0, p0}, Lkotlin/text/Regex;->g(Ljava/lang/CharSequence;)Z
 
@@ -369,7 +369,7 @@
     return v1
 .end method
 
-.method public static ae(Ljava/lang/String;)Z
+.method public static aa(Ljava/lang/String;)Z
     .locals 1
 
     if-nez p0, :cond_0
@@ -406,7 +406,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object v0, Lcom/discord/app/a/a;->wq:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wo:Lkotlin/text/Regex;
 
     check-cast p0, Ljava/lang/CharSequence;
 
@@ -423,7 +423,7 @@
     return p0
 .end method
 
-.method private static af(Ljava/lang/String;)Ljava/lang/String;
+.method private static ab(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
     invoke-static {p0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
@@ -446,7 +446,7 @@
     return-object p0
 .end method
 
-.method public static dG()Ljava/lang/String;
+.method public static dF()Ljava/lang/String;
     .locals 1
 
     sget-object v0, Lcom/discord/app/a/a;->HOST:Ljava/lang/String;
@@ -454,7 +454,7 @@
     return-object v0
 .end method
 
-.method public static dH()Ljava/lang/String;
+.method public static dG()Ljava/lang/String;
     .locals 1
 
     sget-object v0, Lcom/discord/app/a/a;->HOST_INVITE:Ljava/lang/String;
@@ -462,10 +462,18 @@
     return-object v0
 .end method
 
+.method public static dH()Lkotlin/text/Regex;
+    .locals 1
+
+    sget-object v0, Lcom/discord/app/a/a;->wf:Lkotlin/text/Regex;
+
+    return-object v0
+.end method
+
 .method public static dI()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->wh:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wg:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -473,7 +481,7 @@
 .method public static dJ()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->wi:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wj:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -481,7 +489,7 @@
 .method public static dK()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->wl:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wk:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -489,7 +497,7 @@
 .method public static dL()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->wm:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wl:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -497,7 +505,7 @@
 .method public static dM()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->wn:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wm:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -505,7 +513,7 @@
 .method public static dN()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->wo:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wn:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -521,15 +529,7 @@
 .method public static dP()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->wr:Lkotlin/text/Regex;
-
-    return-object v0
-.end method
-
-.method public static dQ()Lkotlin/text/Regex;
-    .locals 1
-
-    sget-object v0, Lcom/discord/app/a/a;->ws:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wq:Lkotlin/text/Regex;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/app/c.smali b/com.discord/smali/com/discord/app/c.smali
index 9a3d980cb5..b5891f99f6 100644
--- a/com.discord/smali/com/discord/app/c.smali
+++ b/com.discord/smali/com/discord/app/c.smali
@@ -12,11 +12,11 @@
 
 
 # static fields
-.field public static final ul:Lcom/discord/app/c$a;
+.field public static final uk:Lcom/discord/app/c$a;
 
 
 # instance fields
-.field final uk:Ljava/util/TreeMap;
+.field final uj:Ljava/util/TreeMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/TreeMap<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/app/c$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/app/c;->ul:Lcom/discord/app/c$a;
+    sput-object v0, Lcom/discord/app/c;->uk:Lcom/discord/app/c$a;
 
     return-void
 .end method
@@ -55,7 +55,7 @@
 
     invoke-direct {v0}, Ljava/util/TreeMap;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/app/c;->uk:Ljava/util/TreeMap;
+    iput-object v0, p0, Lcom/discord/app/c;->uj:Ljava/util/TreeMap;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 .method public onBackPressed()V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/app/c;->uk:Ljava/util/TreeMap;
+    iget-object v0, p0, Lcom/discord/app/c;->uj:Ljava/util/TreeMap;
 
     invoke-virtual {v0}, Ljava/util/TreeMap;->values()Ljava/util/Collection;
 
diff --git a/com.discord/smali/com/discord/app/e.smali b/com.discord/smali/com/discord/app/e.smali
index 73e7afb443..72613e8e0f 100644
--- a/com.discord/smali/com/discord/app/e.smali
+++ b/com.discord/smali/com/discord/app/e.smali
@@ -5,39 +5,39 @@
 
 # static fields
 # The value of this static final field might be set in the static constructor
-.field public static final um:Ljava/lang/String; = "https://status.discordapp.com/"
+.field public static final ul:Ljava/lang/String; = "https://status.discordapp.com/"
 
 # The value of this static final field might be set in the static constructor
-.field public static final un:Ljava/lang/String; = "https://support.discordapp.com"
+.field public static final um:Ljava/lang/String; = "https://support.discordapp.com"
 
 # The value of this static final field might be set in the static constructor
-.field public static final uo:Ljava/lang/String; = "https://support-dev.discordapp.com"
+.field public static final un:Ljava/lang/String; = "https://support-dev.discordapp.com"
 
 # The value of this static final field might be set in the static constructor
-.field public static final uq:Ljava/lang/String; = "https://discordapp.com/acknowledgements"
+.field public static final uo:Ljava/lang/String; = "https://discordapp.com/acknowledgements"
 
 # The value of this static final field might be set in the static constructor
-.field public static final ur:J = 0xd1679fcL
+.field public static final uq:J = 0xd1679fcL
 
 # The value of this static final field might be set in the static constructor
-.field public static final us:J = 0x53d1ea1c57L
+.field public static final ur:J = 0x53d1ea1c57L
 
 # The value of this static final field might be set in the static constructor
-.field public static final ut:J = 0x53d1e9852cL
+.field public static final us:J = 0x53d1e9852cL
 
 # The value of this static final field might be set in the static constructor
-.field public static final uu:J = 0x53d1eac657L
+.field public static final ut:J = 0x53d1eac657L
 
 # The value of this static final field might be set in the static constructor
-.field public static final uv:J = 0x53d28f5538L
+.field public static final uu:J = 0x53d28f5538L
 
 # The value of this static final field might be set in the static constructor
-.field public static final uw:J = 0x53d3623db8L
+.field public static final uv:J = 0x53d3623db8L
 
 # The value of this static final field might be set in the static constructor
-.field public static final ux:J = 0x53d357e4d0L
+.field public static final uw:J = 0x53d357e4d0L
 
-.field public static final uy:Lcom/discord/app/e;
+.field public static final ux:Lcom/discord/app/e;
 
 
 # direct methods
@@ -48,51 +48,51 @@
 
     invoke-direct {v0}, Lcom/discord/app/e;-><init>()V
 
-    sput-object v0, Lcom/discord/app/e;->uy:Lcom/discord/app/e;
+    sput-object v0, Lcom/discord/app/e;->ux:Lcom/discord/app/e;
 
     const-string v0, "https://status.discordapp.com/"
 
-    sput-object v0, Lcom/discord/app/e;->um:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/e;->ul:Ljava/lang/String;
 
     const-string v0, "https://support.discordapp.com"
 
-    sput-object v0, Lcom/discord/app/e;->un:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/e;->um:Ljava/lang/String;
 
     const-string v0, "https://support-dev.discordapp.com"
 
-    sput-object v0, Lcom/discord/app/e;->uo:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/e;->un:Ljava/lang/String;
 
     const-string v0, "https://discordapp.com/acknowledgements"
 
-    sput-object v0, Lcom/discord/app/e;->uq:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/e;->uo:Ljava/lang/String;
 
     const-wide/32 v0, 0xd1679fc
 
-    sput-wide v0, Lcom/discord/app/e;->ur:J
+    sput-wide v0, Lcom/discord/app/e;->uq:J
 
     const-wide v0, 0x53d1ea1c57L
 
-    sput-wide v0, Lcom/discord/app/e;->us:J
+    sput-wide v0, Lcom/discord/app/e;->ur:J
 
     const-wide v0, 0x53d1e9852cL
 
-    sput-wide v0, Lcom/discord/app/e;->ut:J
+    sput-wide v0, Lcom/discord/app/e;->us:J
 
     const-wide v0, 0x53d1eac657L
 
-    sput-wide v0, Lcom/discord/app/e;->uu:J
+    sput-wide v0, Lcom/discord/app/e;->ut:J
 
     const-wide v0, 0x53d28f5538L
 
-    sput-wide v0, Lcom/discord/app/e;->uv:J
+    sput-wide v0, Lcom/discord/app/e;->uu:J
 
     const-wide v0, 0x53d3623db8L
 
-    sput-wide v0, Lcom/discord/app/e;->uw:J
+    sput-wide v0, Lcom/discord/app/e;->uv:J
 
     const-wide v0, 0x53d357e4d0L
 
-    sput-wide v0, Lcom/discord/app/e;->ux:J
+    sput-wide v0, Lcom/discord/app/e;->uw:J
 
     return-void
 .end method
@@ -105,14 +105,14 @@
     return-void
 .end method
 
-.method public static final dq()Ljava/lang/String;
+.method public static final dp()Ljava/lang/String;
     .locals 4
 
     new-instance v0, Ljava/lang/StringBuilder;
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v1, Lcom/discord/app/e;->un:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/e;->um:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -226,7 +226,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v1, Lcom/discord/app/e;->un:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/e;->um:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/app/f$a.smali b/com.discord/smali/com/discord/app/f$a.smali
index 8f1e8f160e..a339eb0bf1 100644
--- a/com.discord/smali/com/discord/app/f$a.smali
+++ b/com.discord/smali/com/discord/app/f$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic uQ:Lcom/discord/app/AppActivity;
+.field final synthetic uP:Lcom/discord/app/AppActivity;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/app/AppActivity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/f$a;->uQ:Lcom/discord/app/AppActivity;
+    iput-object p1, p0, Lcom/discord/app/f$a;->uP:Lcom/discord/app/AppActivity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/app/f$a;->uQ:Lcom/discord/app/AppActivity;
+    iget-object v0, p0, Lcom/discord/app/f$a;->uP:Lcom/discord/app/AppActivity;
 
     invoke-virtual {v0}, Lcom/discord/app/AppActivity;->recreate()V
 
diff --git a/com.discord/smali/com/discord/app/f.smali b/com.discord/smali/com/discord/app/f.smali
index 8d4a5073a5..42c0d33bdc 100644
--- a/com.discord/smali/com/discord/app/f.smali
+++ b/com.discord/smali/com/discord/app/f.smali
@@ -4,6 +4,18 @@
 
 
 # static fields
+.field private static final uK:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lkotlin/reflect/b<",
+            "+",
+            "Lcom/discord/app/AppFragment;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
 .field private static final uL:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -22,25 +34,13 @@
             "Ljava/util/List<",
             "Lkotlin/reflect/b<",
             "+",
-            "Lcom/discord/app/AppFragment;",
+            "Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;",
             ">;>;"
         }
     .end annotation
 .end field
 
 .field private static final uN:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lkotlin/reflect/b<",
-            "+",
-            "Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;",
-            ">;>;"
-        }
-    .end annotation
-.end field
-
-.field private static final uO:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -52,7 +52,7 @@
     .end annotation
 .end field
 
-.field public static final uP:Lcom/discord/app/f;
+.field public static final uO:Lcom/discord/app/f;
 
 
 # direct methods
@@ -63,7 +63,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/f;-><init>()V
 
-    sput-object v0, Lcom/discord/app/f;->uP:Lcom/discord/app/f;
+    sput-object v0, Lcom/discord/app/f;->uO:Lcom/discord/app/f;
 
     const/4 v0, 0x6
 
@@ -129,11 +129,11 @@
 
     aput-object v2, v1, v8
 
-    invoke-static {v1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v1
 
-    sput-object v1, Lcom/discord/app/f;->uL:Ljava/util/List;
+    sput-object v1, Lcom/discord/app/f;->uK:Ljava/util/List;
 
     const/16 v1, 0x21
 
@@ -225,7 +225,7 @@
 
     aput-object v2, v1, v9
 
-    const-class v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
     invoke-static {v2}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -455,11 +455,11 @@
 
     aput-object v2, v1, v9
 
-    invoke-static {v1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v1
 
-    sput-object v1, Lcom/discord/app/f;->uM:Ljava/util/List;
+    sput-object v1, Lcom/discord/app/f;->uL:Ljava/util/List;
 
     new-array v0, v0, [Lkotlin/reflect/b;
 
@@ -511,11 +511,11 @@
 
     aput-object v1, v0, v8
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/f;->uN:Ljava/util/List;
+    sput-object v0, Lcom/discord/app/f;->uM:Ljava/util/List;
 
     new-array v0, v5, [Lkotlin/reflect/b;
 
@@ -535,11 +535,11 @@
 
     aput-object v1, v0, v4
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/f;->uO:Ljava/util/List;
+    sput-object v0, Lcom/discord/app/f;->uN:Ljava/util/List;
 
     return-void
 .end method
@@ -857,6 +857,24 @@
     return v0
 .end method
 
+.method public static dt()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lkotlin/reflect/b<",
+            "+",
+            "Lcom/discord/app/AppFragment;",
+            ">;>;"
+        }
+    .end annotation
+
+    sget-object v0, Lcom/discord/app/f;->uK:Ljava/util/List;
+
+    return-object v0
+.end method
+
 .method public static du()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -883,7 +901,7 @@
             "Ljava/util/List<",
             "Lkotlin/reflect/b<",
             "+",
-            "Lcom/discord/app/AppFragment;",
+            "Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;",
             ">;>;"
         }
     .end annotation
@@ -894,24 +912,6 @@
 .end method
 
 .method public static dw()Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Lkotlin/reflect/b<",
-            "+",
-            "Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;",
-            ">;>;"
-        }
-    .end annotation
-
-    sget-object v0, Lcom/discord/app/f;->uN:Ljava/util/List;
-
-    return-object v0
-.end method
-
-.method public static dx()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -924,7 +924,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/f;->uO:Ljava/util/List;
+    sget-object v0, Lcom/discord/app/f;->uN:Ljava/util/List;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/app/g$a.smali b/com.discord/smali/com/discord/app/g$a.smali
index 81b0e1de6f..15d896bddf 100644
--- a/com.discord/smali/com/discord/app/g$a.smali
+++ b/com.discord/smali/com/discord/app/g$a.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/app/g;->dy()Lrx/Observable;
+    value = Lcom/discord/app/g;->dx()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final uY:Lcom/discord/app/g$a;
+.field public static final uX:Lcom/discord/app/g$a;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/g$a;-><init>()V
 
-    sput-object v0, Lcom/discord/app/g$a;->uY:Lcom/discord/app/g$a;
+    sput-object v0, Lcom/discord/app/g$a;->uX:Lcom/discord/app/g$a;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/g.smali b/com.discord/smali/com/discord/app/g.smali
index e4efa205cf..acf00bf75a 100644
--- a/com.discord/smali/com/discord/app/g.smali
+++ b/com.discord/smali/com/discord/app/g.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final uV:Ljava/util/ArrayList;
+.field private static final uU:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private static final uW:Lrx/subjects/BehaviorSubject;
+.field private static final uV:Lrx/subjects/BehaviorSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/BehaviorSubject<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field public static final uX:Lcom/discord/app/g;
+.field public static final uW:Lcom/discord/app/g;
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/g;-><init>()V
 
-    sput-object v0, Lcom/discord/app/g;->uX:Lcom/discord/app/g;
+    sput-object v0, Lcom/discord/app/g;->uW:Lcom/discord/app/g;
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -43,7 +43,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
 
-    sput-object v0, Lcom/discord/app/g;->uV:Ljava/util/ArrayList;
+    sput-object v0, Lcom/discord/app/g;->uU:Ljava/util/ArrayList;
 
     const/4 v0, 0x0
 
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/g;->uW:Lrx/subjects/BehaviorSubject;
+    sput-object v0, Lcom/discord/app/g;->uV:Lrx/subjects/BehaviorSubject;
 
     return-void
 .end method
@@ -68,7 +68,7 @@
     return-void
 .end method
 
-.method public static dy()Lrx/Observable;
+.method public static dx()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -79,9 +79,9 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/g;->uW:Lrx/subjects/BehaviorSubject;
+    sget-object v0, Lcom/discord/app/g;->uV:Lrx/subjects/BehaviorSubject;
 
-    sget-object v1, Lcom/discord/app/g$a;->uY:Lcom/discord/app/g$a;
+    sget-object v1, Lcom/discord/app/g$a;->uX:Lcom/discord/app/g$a;
 
     check-cast v1, Lrx/functions/b;
 
@@ -89,7 +89,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -112,13 +112,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/g;->uV:Ljava/util/ArrayList;
+    sget-object v0, Lcom/discord/app/g;->uU:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/util/Collection;
 
     invoke-interface {v0, p1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-string v1, "Gateway Connection consumer add "
 
@@ -136,9 +136,9 @@
 
     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, Lcom/discord/app/g;->uW:Lrx/subjects/BehaviorSubject;
+    sget-object p1, Lcom/discord/app/g;->uV:Lrx/subjects/BehaviorSubject;
 
-    sget-object v0, Lcom/discord/app/g;->uV:Ljava/util/ArrayList;
+    sget-object v0, Lcom/discord/app/g;->uU:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
@@ -174,13 +174,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/g;->uV:Ljava/util/ArrayList;
+    sget-object v0, Lcom/discord/app/g;->uU:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/util/Collection;
 
     invoke-interface {v0, p1}, Ljava/util/Collection;->remove(Ljava/lang/Object;)Z
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-string v1, "Gateway Connection consumer rm "
 
@@ -198,9 +198,9 @@
 
     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, Lcom/discord/app/g;->uW:Lrx/subjects/BehaviorSubject;
+    sget-object p1, Lcom/discord/app/g;->uV:Lrx/subjects/BehaviorSubject;
 
-    sget-object v0, Lcom/discord/app/g;->uV:Ljava/util/ArrayList;
+    sget-object v0, Lcom/discord/app/g;->uU:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
diff --git a/com.discord/smali/com/discord/app/h.smali b/com.discord/smali/com/discord/app/h.smali
index 72817bfa8c..3b7cc972fb 100644
--- a/com.discord/smali/com/discord/app/h.smali
+++ b/com.discord/smali/com/discord/app/h.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final vc:Lcom/discord/app/h;
+.field public static final vb:Lcom/discord/app/h;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/h;-><init>()V
 
-    sput-object v0, Lcom/discord/app/h;->vc:Lcom/discord/app/h;
+    sput-object v0, Lcom/discord/app/h;->vb:Lcom/discord/app/h;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     new-instance v1, Landroid/view/ContextThemeWrapper;
 
-    const v2, 0x7f13028e
+    const v2, 0x7f130290
 
     invoke-direct {v1, p0, v2}, Landroid/view/ContextThemeWrapper;-><init>(Landroid/content/Context;I)V
 
@@ -244,7 +244,7 @@
 .method public static synthetic c(Landroid/content/Context;Ljava/lang/CharSequence;)V
     .locals 1
 
-    const v0, 0x7f120444
+    const v0, 0x7f12044d
 
     invoke-static {p0, p1, v0}, Lcom/discord/app/h;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V
 
@@ -264,7 +264,7 @@
 .method public static final d(Landroid/content/Context;Ljava/lang/CharSequence;)V
     .locals 1
 
-    const v0, 0x7f120444
+    const v0, 0x7f12044d
 
     invoke-static {p0, p1, v0}, Lcom/discord/app/h;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V
 
diff --git a/com.discord/smali/com/discord/app/i$a.smali b/com.discord/smali/com/discord/app/i$a.smali
index e05e7f5eda..cc725cfa76 100644
--- a/com.discord/smali/com/discord/app/i$a.smali
+++ b/com.discord/smali/com/discord/app/i$a.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    value = Lcom/discord/app/i;->dB()Lrx/Observable$c;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final ve:Lcom/discord/app/i$a;
+.field public static final vd:Lcom/discord/app/i$a;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/i$a;-><init>()V
 
-    sput-object v0, Lcom/discord/app/i$a;->ve:Lcom/discord/app/i$a;
+    sput-object v0, Lcom/discord/app/i$a;->vd:Lcom/discord/app/i$a;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/i$b.smali b/com.discord/smali/com/discord/app/i$b.smali
index 9ee12f0250..2db7ad8e78 100644
--- a/com.discord/smali/com/discord/app/i$b.smali
+++ b/com.discord/smali/com/discord/app/i$b.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    value = Lcom/discord/app/i;->dC()Lrx/Observable$c;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final vf:Lcom/discord/app/i$b;
+.field public static final ve:Lcom/discord/app/i$b;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/i$b;-><init>()V
 
-    sput-object v0, Lcom/discord/app/i$b;->vf:Lcom/discord/app/i$b;
+    sput-object v0, Lcom/discord/app/i$b;->ve:Lcom/discord/app/i$b;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/app/i$c.smali b/com.discord/smali/com/discord/app/i$c.smali
index 2c720f518b..bac50e8378 100644
--- a/com.discord/smali/com/discord/app/i$c.smali
+++ b/com.discord/smali/com/discord/app/i$c.smali
@@ -26,7 +26,7 @@
 
 
 # static fields
-.field public static final vg:Lcom/discord/app/i$c;
+.field public static final vf:Lcom/discord/app/i$c;
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/i$c;-><init>()V
 
-    sput-object v0, Lcom/discord/app/i$c;->vg:Lcom/discord/app/i$c;
+    sput-object v0, Lcom/discord/app/i$c;->vf:Lcom/discord/app/i$c;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     return-object p1
diff --git a/com.discord/smali/com/discord/app/i$d.smali b/com.discord/smali/com/discord/app/i$d.smali
index 3827699e3d..1f2e0faaaa 100644
--- a/com.discord/smali/com/discord/app/i$d.smali
+++ b/com.discord/smali/com/discord/app/i$d.smali
@@ -34,7 +34,7 @@
 
 
 # static fields
-.field public static final vh:Lcom/discord/app/i$d;
+.field public static final vg:Lcom/discord/app/i$d;
 
 
 # direct methods
@@ -45,7 +45,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/i$d;-><init>()V
 
-    sput-object v0, Lcom/discord/app/i$d;->vh:Lcom/discord/app/i$d;
+    sput-object v0, Lcom/discord/app/i$d;->vg:Lcom/discord/app/i$d;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/i$e$1$1.smali b/com.discord/smali/com/discord/app/i$e$1$1.smali
index 9217ca8182..219b0e37fc 100644
--- a/com.discord/smali/com/discord/app/i$e$1$1.smali
+++ b/com.discord/smali/com/discord/app/i$e$1$1.smali
@@ -33,14 +33,14 @@
 
 
 # instance fields
-.field final synthetic vl:Ljava/util/Map;
+.field final synthetic vk:Ljava/util/Map;
 
 
 # direct methods
 .method constructor <init>(Ljava/util/Map;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/i$e$1$1;->vl:Ljava/util/Map;
+    iput-object p1, p0, Lcom/discord/app/i$e$1$1;->vk:Ljava/util/Map;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,7 +52,7 @@
 .method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/app/i$e$1$1;->vl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/app/i$e$1$1;->vk:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/app/i$e$1$2.smali b/com.discord/smali/com/discord/app/i$e$1$2.smali
index 4b873598f6..b9301edfae 100644
--- a/com.discord/smali/com/discord/app/i$e$1$2.smali
+++ b/com.discord/smali/com/discord/app/i$e$1$2.smali
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final vm:Lcom/discord/app/i$e$1$2;
+.field public static final vl:Lcom/discord/app/i$e$1$2;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/i$e$1$2;-><init>()V
 
-    sput-object v0, Lcom/discord/app/i$e$1$2;->vm:Lcom/discord/app/i$e$1$2;
+    sput-object v0, Lcom/discord/app/i$e$1$2;->vl:Lcom/discord/app/i$e$1$2;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/i$e$1$3.smali b/com.discord/smali/com/discord/app/i$e$1$3.smali
index 9566f2ba9b..f952ecbaff 100644
--- a/com.discord/smali/com/discord/app/i$e$1$3.smali
+++ b/com.discord/smali/com/discord/app/i$e$1$3.smali
@@ -31,18 +31,18 @@
 
 
 # instance fields
-.field final synthetic vl:Ljava/util/Map;
+.field final synthetic vk:Ljava/util/Map;
 
-.field final synthetic vn:Lcom/discord/app/i$e$1;
+.field final synthetic vm:Lcom/discord/app/i$e$1;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/app/i$e$1;Ljava/util/Map;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/i$e$1$3;->vn:Lcom/discord/app/i$e$1;
+    iput-object p1, p0, Lcom/discord/app/i$e$1$3;->vm:Lcom/discord/app/i$e$1;
 
-    iput-object p2, p0, Lcom/discord/app/i$e$1$3;->vl:Ljava/util/Map;
+    iput-object p2, p0, Lcom/discord/app/i$e$1$3;->vk:Ljava/util/Map;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,13 +59,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/app/i$e$1$3;->vn:Lcom/discord/app/i$e$1;
+    iget-object v0, p0, Lcom/discord/app/i$e$1$3;->vm:Lcom/discord/app/i$e$1;
 
-    iget-object v0, v0, Lcom/discord/app/i$e$1;->vk:Lcom/discord/app/i$e;
+    iget-object v0, v0, Lcom/discord/app/i$e$1;->vj:Lcom/discord/app/i$e;
 
-    iget-object v0, v0, Lcom/discord/app/i$e;->vj:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/app/i$e;->vi:Lkotlin/jvm/functions/Function1;
 
-    iget-object v1, p0, Lcom/discord/app/i$e$1$3;->vl:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/app/i$e$1$3;->vk:Ljava/util/Map;
 
     invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/app/i$e$1.smali b/com.discord/smali/com/discord/app/i$e$1.smali
index 1ea1915566..22651fd017 100644
--- a/com.discord/smali/com/discord/app/i$e$1.smali
+++ b/com.discord/smali/com/discord/app/i$e$1.smali
@@ -33,14 +33,14 @@
 
 
 # instance fields
-.field final synthetic vk:Lcom/discord/app/i$e;
+.field final synthetic vj:Lcom/discord/app/i$e;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/app/i$e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/i$e$1;->vk:Lcom/discord/app/i$e;
+    iput-object p1, p0, Lcom/discord/app/i$e$1;->vj:Lcom/discord/app/i$e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,9 +54,9 @@
 
     check-cast p1, Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/discord/app/i$e$1;->vk:Lcom/discord/app/i$e;
+    iget-object v0, p0, Lcom/discord/app/i$e$1;->vj:Lcom/discord/app/i$e;
 
-    iget-object v0, v0, Lcom/discord/app/i$e;->vi:Ljava/util/Collection;
+    iget-object v0, v0, Lcom/discord/app/i$e;->vh:Ljava/util/Collection;
 
     check-cast v0, Ljava/lang/Iterable;
 
@@ -74,7 +74,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i$e$1$2;->vm:Lcom/discord/app/i$e$1$2;
+    sget-object v1, Lcom/discord/app/i$e$1$2;->vl:Lcom/discord/app/i$e$1$2;
 
     check-cast v1, Lrx/functions/b;
 
diff --git a/com.discord/smali/com/discord/app/i$e.smali b/com.discord/smali/com/discord/app/i$e.smali
index 3722e68194..d355a6abd8 100644
--- a/com.discord/smali/com/discord/app/i$e.smali
+++ b/com.discord/smali/com/discord/app/i$e.smali
@@ -34,18 +34,18 @@
 
 
 # instance fields
-.field final synthetic vi:Ljava/util/Collection;
+.field final synthetic vh:Ljava/util/Collection;
 
-.field final synthetic vj:Lkotlin/jvm/functions/Function1;
+.field final synthetic vi:Lkotlin/jvm/functions/Function1;
 
 
 # direct methods
 .method constructor <init>(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/i$e;->vi:Ljava/util/Collection;
+    iput-object p1, p0, Lcom/discord/app/i$e;->vh:Ljava/util/Collection;
 
-    iput-object p2, p0, Lcom/discord/app/i$e;->vj:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/app/i$e;->vi:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -69,7 +69,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/app/i$f$1.smali b/com.discord/smali/com/discord/app/i$f$1.smali
index d10f57ce50..33562c2f25 100644
--- a/com.discord/smali/com/discord/app/i$f$1.smali
+++ b/com.discord/smali/com/discord/app/i$f$1.smali
@@ -33,14 +33,14 @@
 
 
 # instance fields
-.field final synthetic vr:Lcom/discord/app/i$f;
+.field final synthetic vq:Lcom/discord/app/i$f;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/app/i$f;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/i$f$1;->vr:Lcom/discord/app/i$f;
+    iput-object p1, p0, Lcom/discord/app/i$f$1;->vq:Lcom/discord/app/i$f;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,9 +52,9 @@
 .method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/app/i$f$1;->vr:Lcom/discord/app/i$f;
+    iget-object v0, p0, Lcom/discord/app/i$f$1;->vq:Lcom/discord/app/i$f;
 
-    iget-object v0, v0, Lcom/discord/app/i$f;->vo:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/app/i$f;->vn:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -75,21 +75,21 @@
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/app/i$f$1;->vr:Lcom/discord/app/i$f;
+    iget-object p1, p0, Lcom/discord/app/i$f$1;->vq:Lcom/discord/app/i$f;
 
-    iget-object p1, p1, Lcom/discord/app/i$f;->vp:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/discord/app/i$f;->vo:Ljava/lang/Object;
 
     invoke-static {p1}, Lrx/Observable;->bI(Ljava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/app/i$f$1;->vr:Lcom/discord/app/i$f;
+    iget-object v0, p0, Lcom/discord/app/i$f$1;->vq:Lcom/discord/app/i$f;
 
     iget-wide v0, v0, Lcom/discord/app/i$f;->$timeout:J
 
-    iget-object v2, p0, Lcom/discord/app/i$f$1;->vr:Lcom/discord/app/i$f;
+    iget-object v2, p0, Lcom/discord/app/i$f$1;->vq:Lcom/discord/app/i$f;
 
-    iget-object v2, v2, Lcom/discord/app/i$f;->vq:Ljava/util/concurrent/TimeUnit;
+    iget-object v2, v2, Lcom/discord/app/i$f;->vp:Ljava/util/concurrent/TimeUnit;
 
     invoke-virtual {p1, v0, v1, v2}, Lrx/Observable;->j(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/app/i$f.smali b/com.discord/smali/com/discord/app/i$f.smali
index e9daf9b523..0d33247f42 100644
--- a/com.discord/smali/com/discord/app/i$f.smali
+++ b/com.discord/smali/com/discord/app/i$f.smali
@@ -33,24 +33,24 @@
 # instance fields
 .field final synthetic $timeout:J
 
-.field final synthetic vo:Lkotlin/jvm/functions/Function1;
+.field final synthetic vn:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic vp:Ljava/lang/Object;
+.field final synthetic vo:Ljava/lang/Object;
 
-.field final synthetic vq:Ljava/util/concurrent/TimeUnit;
+.field final synthetic vp:Ljava/util/concurrent/TimeUnit;
 
 
 # direct methods
 .method constructor <init>(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/i$f;->vo:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/app/i$f;->vn:Lkotlin/jvm/functions/Function1;
 
-    iput-object p2, p0, Lcom/discord/app/i$f;->vp:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/discord/app/i$f;->vo:Ljava/lang/Object;
 
     iput-wide p3, p0, Lcom/discord/app/i$f;->$timeout:J
 
-    iput-object p5, p0, Lcom/discord/app/i$f;->vq:Ljava/util/concurrent/TimeUnit;
+    iput-object p5, p0, Lcom/discord/app/i$f;->vp:Ljava/util/concurrent/TimeUnit;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/discord/app/i$g.smali b/com.discord/smali/com/discord/app/i$g.smali
index 67cd5b6025..a3a1b55a0d 100644
--- a/com.discord/smali/com/discord/app/i$g.smali
+++ b/com.discord/smali/com/discord/app/i$g.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/app/i;->q(Z)Lrx/Observable$c;
+    value = Lcom/discord/app/i;->o(Z)Lrx/Observable$c;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,14 +31,14 @@
 
 
 # instance fields
-.field final synthetic vs:Z
+.field final synthetic vr:Z
 
 
 # direct methods
 .method constructor <init>(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/discord/app/i$g;->vs:Z
+    iput-boolean p1, p0, Lcom/discord/app/i$g;->vr:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,7 +56,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean v0, p0, Lcom/discord/app/i$g;->vs:Z
+    iget-boolean v0, p0, Lcom/discord/app/i$g;->vr:Z
 
     invoke-static {p1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn(Lrx/Observable;Z)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/app/i$h.smali b/com.discord/smali/com/discord/app/i$h.smali
index 0721670213..f95b9a9f80 100644
--- a/com.discord/smali/com/discord/app/i$h.smali
+++ b/com.discord/smali/com/discord/app/i$h.smali
@@ -77,7 +77,7 @@
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/i$i.smali b/com.discord/smali/com/discord/app/i$i.smali
index f9b17a6964..a0c9b7e964 100644
--- a/com.discord/smali/com/discord/app/i$i.smali
+++ b/com.discord/smali/com/discord/app/i$i.smali
@@ -77,7 +77,7 @@
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/i$j$1.smali b/com.discord/smali/com/discord/app/i$j$1.smali
index 422c401ed0..989818635c 100644
--- a/com.discord/smali/com/discord/app/i$j$1.smali
+++ b/com.discord/smali/com/discord/app/i$j$1.smali
@@ -27,7 +27,7 @@
 
 
 # static fields
-.field public static final vx:Lcom/discord/app/i$j$1;
+.field public static final vv:Lcom/discord/app/i$j$1;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/i$j$1;-><init>()V
 
-    sput-object v0, Lcom/discord/app/i$j$1;->vx:Lcom/discord/app/i$j$1;
+    sput-object v0, Lcom/discord/app/i$j$1;->vv:Lcom/discord/app/i$j$1;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 .method public final bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/app/i$j.smali b/com.discord/smali/com/discord/app/i$j.smali
index 46afb01d6b..b490a3ebdd 100644
--- a/com.discord/smali/com/discord/app/i$j.smali
+++ b/com.discord/smali/com/discord/app/i$j.smali
@@ -33,15 +33,15 @@
 # instance fields
 .field final synthetic $context:Landroid/content/Context;
 
+.field final synthetic $onCompleted:Lkotlin/jvm/functions/Function0;
+
 .field final synthetic $onNext:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic vt:Ljava/lang/Class;
+.field final synthetic vs:Ljava/lang/Class;
 
-.field final synthetic vu:Lkotlin/jvm/functions/Function1;
+.field final synthetic vt:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic vv:Lrx/functions/Action1;
-
-.field final synthetic vw:Lkotlin/jvm/functions/Function0;
+.field final synthetic vu:Lrx/functions/Action1;
 
 
 # direct methods
@@ -50,15 +50,15 @@
 
     iput-object p1, p0, Lcom/discord/app/i$j;->$context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/discord/app/i$j;->vt:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/discord/app/i$j;->vs:Ljava/lang/Class;
 
-    iput-object p3, p0, Lcom/discord/app/i$j;->vu:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/i$j;->vt:Lkotlin/jvm/functions/Function1;
 
     iput-object p4, p0, Lcom/discord/app/i$j;->$onNext:Lkotlin/jvm/functions/Function1;
 
-    iput-object p5, p0, Lcom/discord/app/i$j;->vv:Lrx/functions/Action1;
+    iput-object p5, p0, Lcom/discord/app/i$j;->vu:Lrx/functions/Action1;
 
-    iput-object p6, p0, Lcom/discord/app/i$j;->vw:Lkotlin/jvm/functions/Function0;
+    iput-object p6, p0, Lcom/discord/app/i$j;->$onCompleted:Lkotlin/jvm/functions/Function0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -80,7 +80,7 @@
 
     iget-object v1, p0, Lcom/discord/app/i$j;->$context:Landroid/content/Context;
 
-    iget-object p1, p0, Lcom/discord/app/i$j;->vt:Ljava/lang/Class;
+    iget-object p1, p0, Lcom/discord/app/i$j;->vs:Ljava/lang/Class;
 
     invoke-virtual {p1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -90,17 +90,17 @@
 
     invoke-static {v2, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v3, p0, Lcom/discord/app/i$j;->vu:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p0, Lcom/discord/app/i$j;->vt:Lkotlin/jvm/functions/Function1;
 
     iget-object v4, p0, Lcom/discord/app/i$j;->$onNext:Lkotlin/jvm/functions/Function1;
 
-    iget-object p1, p0, Lcom/discord/app/i$j;->vv:Lrx/functions/Action1;
+    iget-object p1, p0, Lcom/discord/app/i$j;->vu:Lrx/functions/Action1;
 
     const/4 v7, 0x0
 
     if-eqz p1, :cond_0
 
-    sget-object v5, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v5, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v5, Lcom/discord/app/i$y;
 
@@ -114,11 +114,11 @@
     move-object v5, v7
 
     :goto_0
-    iget-object p1, p0, Lcom/discord/app/i$j;->vw:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/app/i$j;->$onCompleted:Lkotlin/jvm/functions/Function0;
 
     if-nez p1, :cond_1
 
-    sget-object p1, Lcom/discord/app/i$j$1;->vx:Lcom/discord/app/i$j$1;
+    sget-object p1, Lcom/discord/app/i$j$1;->vv:Lcom/discord/app/i$j$1;
 
     check-cast p1, Lkotlin/jvm/functions/Function0;
 
diff --git a/com.discord/smali/com/discord/app/i$k$1.smali b/com.discord/smali/com/discord/app/i$k$1.smali
index eaea091028..3e89d3a953 100644
--- a/com.discord/smali/com/discord/app/i$k$1.smali
+++ b/com.discord/smali/com/discord/app/i$k$1.smali
@@ -27,7 +27,7 @@
 
 
 # static fields
-.field public static final vy:Lcom/discord/app/i$k$1;
+.field public static final vw:Lcom/discord/app/i$k$1;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/i$k$1;-><init>()V
 
-    sput-object v0, Lcom/discord/app/i$k$1;->vy:Lcom/discord/app/i$k$1;
+    sput-object v0, Lcom/discord/app/i$k$1;->vw:Lcom/discord/app/i$k$1;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 .method public final bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/app/i$k.smali b/com.discord/smali/com/discord/app/i$k.smali
index 9e4382062f..1f3ebd00ad 100644
--- a/com.discord/smali/com/discord/app/i$k.smali
+++ b/com.discord/smali/com/discord/app/i$k.smali
@@ -37,11 +37,11 @@
 
 .field final synthetic $errorTag:Ljava/lang/String;
 
+.field final synthetic $onCompleted:Lkotlin/jvm/functions/Function0;
+
 .field final synthetic $onNext:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic vu:Lkotlin/jvm/functions/Function1;
-
-.field final synthetic vw:Lkotlin/jvm/functions/Function0;
+.field final synthetic vt:Lkotlin/jvm/functions/Function1;
 
 
 # direct methods
@@ -52,13 +52,13 @@
 
     iput-object p2, p0, Lcom/discord/app/i$k;->$errorTag:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/discord/app/i$k;->vu:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/i$k;->vt:Lkotlin/jvm/functions/Function1;
 
     iput-object p4, p0, Lcom/discord/app/i$k;->$onNext:Lkotlin/jvm/functions/Function1;
 
     iput-object p5, p0, Lcom/discord/app/i$k;->$errorHandler:Lkotlin/jvm/functions/Function1;
 
-    iput-object p6, p0, Lcom/discord/app/i$k;->vw:Lkotlin/jvm/functions/Function0;
+    iput-object p6, p0, Lcom/discord/app/i$k;->$onCompleted:Lkotlin/jvm/functions/Function0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -82,17 +82,17 @@
 
     iget-object v2, p0, Lcom/discord/app/i$k;->$errorTag:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/discord/app/i$k;->vu:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p0, Lcom/discord/app/i$k;->vt:Lkotlin/jvm/functions/Function1;
 
     iget-object v4, p0, Lcom/discord/app/i$k;->$onNext:Lkotlin/jvm/functions/Function1;
 
     iget-object v5, p0, Lcom/discord/app/i$k;->$errorHandler:Lkotlin/jvm/functions/Function1;
 
-    iget-object p1, p0, Lcom/discord/app/i$k;->vw:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/app/i$k;->$onCompleted:Lkotlin/jvm/functions/Function0;
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/discord/app/i$k$1;->vy:Lcom/discord/app/i$k$1;
+    sget-object p1, Lcom/discord/app/i$k$1;->vw:Lcom/discord/app/i$k$1;
 
     check-cast p1, Lkotlin/jvm/functions/Function0;
 
diff --git a/com.discord/smali/com/discord/app/i$l.smali b/com.discord/smali/com/discord/app/i$l.smali
index b6cd6b98bc..49025c0abf 100644
--- a/com.discord/smali/com/discord/app/i$l.smali
+++ b/com.discord/smali/com/discord/app/i$l.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final vz:Lcom/discord/app/i$l;
+.field public static final vx:Lcom/discord/app/i$l;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/i$l;-><init>()V
 
-    sput-object v0, Lcom/discord/app/i$l;->vz:Lcom/discord/app/i$l;
+    sput-object v0, Lcom/discord/app/i$l;->vx:Lcom/discord/app/i$l;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/i$m.smali b/com.discord/smali/com/discord/app/i$m.smali
index e62676394b..a023cb996e 100644
--- a/com.discord/smali/com/discord/app/i$m.smali
+++ b/com.discord/smali/com/discord/app/i$m.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final vA:Lcom/discord/app/i$m;
+.field public static final vy:Lcom/discord/app/i$m;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/i$m;-><init>()V
 
-    sput-object v0, Lcom/discord/app/i$m;->vA:Lcom/discord/app/i$m;
+    sput-object v0, Lcom/discord/app/i$m;->vy:Lcom/discord/app/i$m;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/i$n.smali b/com.discord/smali/com/discord/app/i$n.smali
index 27d8a3f1bf..f1353eeb85 100644
--- a/com.discord/smali/com/discord/app/i$n.smali
+++ b/com.discord/smali/com/discord/app/i$n.smali
@@ -77,7 +77,7 @@
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/i$o.smali b/com.discord/smali/com/discord/app/i$o.smali
index 82b14586a3..b5823f47bf 100644
--- a/com.discord/smali/com/discord/app/i$o.smali
+++ b/com.discord/smali/com/discord/app/i$o.smali
@@ -77,7 +77,7 @@
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/i$p.smali b/com.discord/smali/com/discord/app/i$p.smali
index c90df700bc..7bb47e6d14 100644
--- a/com.discord/smali/com/discord/app/i$p.smali
+++ b/com.discord/smali/com/discord/app/i$p.smali
@@ -77,7 +77,7 @@
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/i$q$1.smali b/com.discord/smali/com/discord/app/i$q$1.smali
index 51ab7289ae..4f06f4d3b5 100644
--- a/com.discord/smali/com/discord/app/i$q$1.smali
+++ b/com.discord/smali/com/discord/app/i$q$1.smali
@@ -33,14 +33,14 @@
 
 
 # instance fields
-.field final synthetic vE:Lcom/discord/app/i$q;
+.field final synthetic vC:Lcom/discord/app/i$q;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/app/i$q;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/i$q$1;->vE:Lcom/discord/app/i$q;
+    iput-object p1, p0, Lcom/discord/app/i$q$1;->vC:Lcom/discord/app/i$q;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,9 +52,9 @@
 .method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/app/i$q$1;->vE:Lcom/discord/app/i$q;
+    iget-object v0, p0, Lcom/discord/app/i$q$1;->vC:Lcom/discord/app/i$q;
 
-    iget-object v0, v0, Lcom/discord/app/i$q;->vB:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/app/i$q;->vz:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -68,9 +68,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/app/i$q$1;->vE:Lcom/discord/app/i$q;
+    iget-object v0, p0, Lcom/discord/app/i$q$1;->vC:Lcom/discord/app/i$q;
 
-    iget-object v0, v0, Lcom/discord/app/i$q;->vC:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/app/i$q;->vA:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -81,9 +81,9 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/app/i$q$1;->vE:Lcom/discord/app/i$q;
+    iget-object v0, p0, Lcom/discord/app/i$q$1;->vC:Lcom/discord/app/i$q;
 
-    iget-object v0, v0, Lcom/discord/app/i$q;->vD:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/app/i$q;->vB:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/app/i$q.smali b/com.discord/smali/com/discord/app/i$q.smali
index 676e9cb127..347061ef14 100644
--- a/com.discord/smali/com/discord/app/i$q.smali
+++ b/com.discord/smali/com/discord/app/i$q.smali
@@ -31,22 +31,22 @@
 
 
 # instance fields
+.field final synthetic vA:Lkotlin/jvm/functions/Function1;
+
 .field final synthetic vB:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic vC:Lkotlin/jvm/functions/Function1;
-
-.field final synthetic vD:Lkotlin/jvm/functions/Function1;
+.field final synthetic vz:Lkotlin/jvm/functions/Function1;
 
 
 # direct methods
 .method constructor <init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/i$q;->vB:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/app/i$q;->vz:Lkotlin/jvm/functions/Function1;
 
-    iput-object p2, p0, Lcom/discord/app/i$q;->vC:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/app/i$q;->vA:Lkotlin/jvm/functions/Function1;
 
-    iput-object p3, p0, Lcom/discord/app/i$q;->vD:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/i$q;->vB:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/discord/app/i$r.smali b/com.discord/smali/com/discord/app/i$r.smali
index f6cc380b85..8b75a414b8 100644
--- a/com.discord/smali/com/discord/app/i$r.smali
+++ b/com.discord/smali/com/discord/app/i$r.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final vF:Lcom/discord/app/i$r;
+.field public static final vD:Lcom/discord/app/i$r;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/i$r;-><init>()V
 
-    sput-object v0, Lcom/discord/app/i$r;->vF:Lcom/discord/app/i$r;
+    sput-object v0, Lcom/discord/app/i$r;->vD:Lcom/discord/app/i$r;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/i$u.smali b/com.discord/smali/com/discord/app/i$u.smali
index e2ea82e9b7..7bb7b81d5e 100644
--- a/com.discord/smali/com/discord/app/i$u.smali
+++ b/com.discord/smali/com/discord/app/i$u.smali
@@ -31,7 +31,7 @@
 
 
 # instance fields
-.field final synthetic vG:J
+.field final synthetic vE:J
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     const-wide/16 p1, 0x1388
 
-    iput-wide p1, p0, Lcom/discord/app/i$u;->vG:J
+    iput-wide p1, p0, Lcom/discord/app/i$u;->vE:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,7 +60,7 @@
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-wide v1, p0, Lcom/discord/app/i$u;->vG:J
+    iget-wide v1, p0, Lcom/discord/app/i$u;->vE:J
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali/com/discord/app/i$v.smali b/com.discord/smali/com/discord/app/i$v.smali
index fa8e19f416..8df5cc995c 100644
--- a/com.discord/smali/com/discord/app/i$v.smali
+++ b/com.discord/smali/com/discord/app/i$v.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/app/i;->dz()Lrx/Observable$c;
+    value = Lcom/discord/app/i;->dy()Lrx/Observable$c;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final vH:Lcom/discord/app/i$v;
+.field public static final vF:Lcom/discord/app/i$v;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/i$v;-><init>()V
 
-    sput-object v0, Lcom/discord/app/i$v;->vH:Lcom/discord/app/i$v;
+    sput-object v0, Lcom/discord/app/i$v;->vF:Lcom/discord/app/i$v;
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     check-cast p1, Lrx/Observable;
 
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/app/i$x$1.smali b/com.discord/smali/com/discord/app/i$x$1.smali
index d594490da0..66f022eaa7 100644
--- a/com.discord/smali/com/discord/app/i$x$1.smali
+++ b/com.discord/smali/com/discord/app/i$x$1.smali
@@ -57,7 +57,7 @@
 
     iget-object v0, p0, Lcom/discord/app/i$x$1;->this$0:Lcom/discord/app/i$x;
 
-    iget-object v0, v0, Lcom/discord/app/i$x;->vI:Lcom/discord/utilities/dimmer/DimmerView;
+    iget-object v0, v0, Lcom/discord/app/i$x;->vG:Lcom/discord/utilities/dimmer/DimmerView;
 
     if-eqz v0, :cond_0
 
@@ -70,7 +70,7 @@
     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;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/i$x.smali b/com.discord/smali/com/discord/app/i$x.smali
index ea07b628e6..ef50c94293 100644
--- a/com.discord/smali/com/discord/app/i$x.smali
+++ b/com.discord/smali/com/discord/app/i$x.smali
@@ -33,14 +33,14 @@
 # instance fields
 .field final synthetic $delay:J
 
-.field final synthetic vI:Lcom/discord/utilities/dimmer/DimmerView;
+.field final synthetic vG:Lcom/discord/utilities/dimmer/DimmerView;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/utilities/dimmer/DimmerView;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/app/i$x;->vI:Lcom/discord/utilities/dimmer/DimmerView;
+    iput-object p1, p0, Lcom/discord/app/i$x;->vG:Lcom/discord/utilities/dimmer/DimmerView;
 
     iput-wide p2, p0, Lcom/discord/app/i$x;->$delay:J
 
diff --git a/com.discord/smali/com/discord/app/i$y.smali b/com.discord/smali/com/discord/app/i$y.smali
index 3460df1998..2be8550bf0 100644
--- a/com.discord/smali/com/discord/app/i$y.smali
+++ b/com.discord/smali/com/discord/app/i$y.smali
@@ -53,7 +53,7 @@
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/i.smali b/com.discord/smali/com/discord/app/i.smali
index e6bc13e35b..05435a98f1 100644
--- a/com.discord/smali/com/discord/app/i.smali
+++ b/com.discord/smali/com/discord/app/i.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final vd:Lcom/discord/app/i;
+.field public static final vc:Lcom/discord/app/i;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/i;-><init>()V
 
-    sput-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sput-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     return-void
 .end method
@@ -28,6 +28,57 @@
     return-void
 .end method
 
+.method public static synthetic Y(Ljava/lang/String;)Lrx/Observable$c;
+    .locals 7
+
+    const-string v0, "err"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/app/i$l;->vx:Lcom/discord/app/i$l;
+
+    move-object v1, v0
+
+    check-cast v1, Lkotlin/jvm/functions/Function1;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/16 v6, 0x38
+
+    move-object v2, p0
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/app/i;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;I)Lrx/Observable$c;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final Z(Ljava/lang/String;)Lrx/Observable$c;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/String;",
+            ")",
+            "Lrx/Observable$c<",
+            "TT;TT;>;"
+        }
+    .end annotation
+
+    invoke-static {p0}, Lcom/discord/app/i;->Y(Ljava/lang/String;)Lrx/Observable$c;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
 .method public static synthetic a(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
     .locals 1
 
@@ -134,7 +185,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/i$r;->vF:Lcom/discord/app/i$r;
+    sget-object v0, Lcom/discord/app/i$r;->vD:Lcom/discord/app/i$r;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -174,7 +225,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/i$c;->vg:Lcom/discord/app/i$c;
+    sget-object v0, Lcom/discord/app/i$c;->vf:Lcom/discord/app/i$c;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -233,7 +284,7 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/discord/app/i$d;->vh:Lcom/discord/app/i$d;
+    sget-object p0, Lcom/discord/app/i$d;->vg:Lcom/discord/app/i$d;
 
     check-cast p0, Lrx/Observable$c;
 
@@ -707,7 +758,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     invoke-virtual {p1}, Lcom/discord/app/AppDialog;->getContext()Landroid/content/Context;
 
@@ -752,7 +803,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     invoke-virtual {p1}, Lcom/discord/app/AppFragment;->getContext()Landroid/content/Context;
 
@@ -935,57 +986,6 @@
     return-object p0
 .end method
 
-.method public static synthetic ac(Ljava/lang/String;)Lrx/Observable$c;
-    .locals 7
-
-    const-string v0, "err"
-
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v0, Lcom/discord/app/i$l;->vz:Lcom/discord/app/i$l;
-
-    move-object v1, v0
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/16 v6, 0x38
-
-    move-object v2, p0
-
-    invoke-static/range {v1 .. v6}, Lcom/discord/app/i;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;I)Lrx/Observable$c;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final ad(Ljava/lang/String;)Lrx/Observable$c;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/String;",
-            ")",
-            "Lrx/Observable$c<",
-            "TT;TT;>;"
-        }
-    .end annotation
-
-    invoke-static {p0}, Lcom/discord/app/i;->ac(Ljava/lang/String;)Lrx/Observable$c;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
 .method public static final b(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -1057,12 +1057,21 @@
     return-object p0
 .end method
 
-.method public static synthetic dA()Lrx/Observable$c;
+.method public static final dA()Lrx/Observable$c;
     .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">()",
+            "Lrx/Observable$c<",
+            "TT;TT;>;"
+        }
+    .end annotation
 
     const/4 v0, 0x1
 
-    invoke-static {v0}, Lcom/discord/app/i;->q(Z)Lrx/Observable$c;
+    invoke-static {v0}, Lcom/discord/app/i;->o(Z)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -1081,11 +1090,9 @@
         }
     .end annotation
 
-    const/4 v0, 0x1
+    sget-object v0, Lcom/discord/app/i$a;->vd:Lcom/discord/app/i$a;
 
-    invoke-static {v0}, Lcom/discord/app/i;->q(Z)Lrx/Observable$c;
-
-    move-result-object v0
+    check-cast v0, Lrx/Observable$c;
 
     return-object v0
 .end method
@@ -1102,7 +1109,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/i$a;->ve:Lcom/discord/app/i$a;
+    sget-object v0, Lcom/discord/app/i$b;->ve:Lcom/discord/app/i$b;
 
     check-cast v0, Lrx/Observable$c;
 
@@ -1110,25 +1117,6 @@
 .end method
 
 .method public static final dD()Lrx/Observable$c;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">()",
-            "Lrx/Observable$c<",
-            "TT;TT;>;"
-        }
-    .end annotation
-
-    sget-object v0, Lcom/discord/app/i$b;->vf:Lcom/discord/app/i$b;
-
-    check-cast v0, Lrx/Observable$c;
-
-    return-object v0
-.end method
-
-.method public static final dE()Lrx/Observable$c;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1151,7 +1139,7 @@
     return-object v0
 .end method
 
-.method public static final dz()Lrx/Observable$c;
+.method public static final dy()Lrx/Observable$c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1163,13 +1151,25 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/i$v;->vH:Lcom/discord/app/i$v;
+    sget-object v0, Lcom/discord/app/i$v;->vF:Lcom/discord/app/i$v;
 
     check-cast v0, Lrx/Observable$c;
 
     return-object v0
 .end method
 
+.method public static synthetic dz()Lrx/Observable$c;
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-static {v0}, Lcom/discord/app/i;->o(Z)Lrx/Observable$c;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public static synthetic f(Ljava/lang/Class;)Lrx/Observable$c;
     .locals 7
 
@@ -1177,7 +1177,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/i$m;->vA:Lcom/discord/app/i$m;
+    sget-object v0, Lcom/discord/app/i$m;->vy:Lcom/discord/app/i$m;
 
     move-object v1, v0
 
@@ -1200,7 +1200,7 @@
     return-object p0
 .end method
 
-.method public static final q(Z)Lrx/Observable$c;
+.method public static final o(Z)Lrx/Observable$c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/discord/app/j$a.smali b/com.discord/smali/com/discord/app/j$a.smali
index 344a3c7e5c..fd2946610b 100644
--- a/com.discord/smali/com/discord/app/j$a.smali
+++ b/com.discord/smali/com/discord/app/j$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
+.field final vK:I
+
+.field final vL:I
+
 .field final vM:I
 
 .field final vN:I
 
-.field final vO:I
-
-.field final vP:I
-
 
 # direct methods
 .method public constructor <init>(IIII)V
@@ -30,13 +30,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/app/j$a;->vM:I
+    iput p1, p0, Lcom/discord/app/j$a;->vK:I
 
-    iput p2, p0, Lcom/discord/app/j$a;->vN:I
+    iput p2, p0, Lcom/discord/app/j$a;->vL:I
 
-    iput p3, p0, Lcom/discord/app/j$a;->vO:I
+    iput p3, p0, Lcom/discord/app/j$a;->vM:I
 
-    iput p4, p0, Lcom/discord/app/j$a;->vP:I
+    iput p4, p0, Lcom/discord/app/j$a;->vN:I
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/j$c.smali b/com.discord/smali/com/discord/app/j$c.smali
index 54a057b17f..bdce6731a7 100644
--- a/com.discord/smali/com/discord/app/j$c.smali
+++ b/com.discord/smali/com/discord/app/j$c.smali
@@ -23,6 +23,10 @@
 
 
 # static fields
+.field public static final enum vO:Lcom/discord/app/j$c;
+
+.field public static final enum vP:Lcom/discord/app/j$c;
+
 .field public static final enum vQ:Lcom/discord/app/j$c;
 
 .field public static final enum vR:Lcom/discord/app/j$c;
@@ -33,11 +37,7 @@
 
 .field public static final enum vU:Lcom/discord/app/j$c;
 
-.field public static final enum vV:Lcom/discord/app/j$c;
-
-.field public static final enum vW:Lcom/discord/app/j$c;
-
-.field private static final synthetic vX:[Lcom/discord/app/j$c;
+.field private static final synthetic vV:[Lcom/discord/app/j$c;
 
 
 # instance fields
@@ -72,7 +72,7 @@
 
     invoke-direct {v1, v4, v3, v2}, Lcom/discord/app/j$c;-><init>(Ljava/lang/String;ILcom/discord/app/j$a;)V
 
-    sput-object v1, Lcom/discord/app/j$c;->vQ:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->vO:Lcom/discord/app/j$c;
 
     aput-object v1, v0, v3
 
@@ -96,7 +96,7 @@
 
     invoke-direct {v1, v5, v4, v2}, Lcom/discord/app/j$c;-><init>(Ljava/lang/String;ILcom/discord/app/j$a;)V
 
-    sput-object v1, Lcom/discord/app/j$c;->vR:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->vP:Lcom/discord/app/j$c;
 
     aput-object v1, v0, v4
 
@@ -120,7 +120,7 @@
 
     invoke-direct {v1, v5, v4, v2}, Lcom/discord/app/j$c;-><init>(Ljava/lang/String;ILcom/discord/app/j$a;)V
 
-    sput-object v1, Lcom/discord/app/j$c;->vS:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->vQ:Lcom/discord/app/j$c;
 
     aput-object v1, v0, v4
 
@@ -144,7 +144,7 @@
 
     invoke-direct {v1, v5, v4, v2}, Lcom/discord/app/j$c;-><init>(Ljava/lang/String;ILcom/discord/app/j$a;)V
 
-    sput-object v1, Lcom/discord/app/j$c;->vT:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->vR:Lcom/discord/app/j$c;
 
     aput-object v1, v0, v4
 
@@ -168,7 +168,7 @@
 
     invoke-direct {v1, v5, v4, v2}, Lcom/discord/app/j$c;-><init>(Ljava/lang/String;ILcom/discord/app/j$a;)V
 
-    sput-object v1, Lcom/discord/app/j$c;->vU:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->vS:Lcom/discord/app/j$c;
 
     aput-object v1, v0, v4
 
@@ -192,7 +192,7 @@
 
     invoke-direct {v1, v5, v4, v2}, Lcom/discord/app/j$c;-><init>(Ljava/lang/String;ILcom/discord/app/j$a;)V
 
-    sput-object v1, Lcom/discord/app/j$c;->vV:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->vT:Lcom/discord/app/j$c;
 
     aput-object v1, v0, v4
 
@@ -208,11 +208,11 @@
 
     invoke-direct {v1, v4, v3, v2}, Lcom/discord/app/j$c;-><init>(Ljava/lang/String;ILcom/discord/app/j$a;)V
 
-    sput-object v1, Lcom/discord/app/j$c;->vW:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->vU:Lcom/discord/app/j$c;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/discord/app/j$c;->vX:[Lcom/discord/app/j$c;
+    sput-object v0, Lcom/discord/app/j$c;->vV:[Lcom/discord/app/j$c;
 
     return-void
 .end method
@@ -251,7 +251,7 @@
 .method public static values()[Lcom/discord/app/j$c;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/j$c;->vX:[Lcom/discord/app/j$c;
+    sget-object v0, Lcom/discord/app/j$c;->vV:[Lcom/discord/app/j$c;
 
     invoke-virtual {v0}, [Lcom/discord/app/j$c;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/app/j.smali b/com.discord/smali/com/discord/app/j.smali
index bb83897046..cb72cc8fa5 100644
--- a/com.discord/smali/com/discord/app/j.smali
+++ b/com.discord/smali/com/discord/app/j.smali
@@ -14,13 +14,13 @@
 
 
 # static fields
-.field private static vK:Z
+.field private static vI:Z
 
-.field public static final vL:Lcom/discord/app/j$b;
+.field public static final vJ:Lcom/discord/app/j$b;
 
 
 # instance fields
-.field vJ:Lcom/discord/app/j$a;
+.field vH:Lcom/discord/app/j$a;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/app/j$b;-><init>(B)V
 
-    sput-object v0, Lcom/discord/app/j;->vL:Lcom/discord/app/j$b;
+    sput-object v0, Lcom/discord/app/j;->vJ:Lcom/discord/app/j$b;
 
     return-void
 .end method
@@ -43,11 +43,11 @@
 
     invoke-direct {p0}, Landroidx/appcompat/app/AppCompatActivity;-><init>()V
 
-    sget-object v0, Lcom/discord/app/j$c;->vU:Lcom/discord/app/j$c;
+    sget-object v0, Lcom/discord/app/j$c;->vS:Lcom/discord/app/j$c;
 
     iget-object v0, v0, Lcom/discord/app/j$c;->animations:Lcom/discord/app/j$a;
 
-    iput-object v0, p0, Lcom/discord/app/j;->vJ:Lcom/discord/app/j$a;
+    iput-object v0, p0, Lcom/discord/app/j;->vH:Lcom/discord/app/j$a;
 
     return-void
 .end method
@@ -68,28 +68,28 @@
     return-void
 
     :cond_2
-    iget-object p1, p0, Lcom/discord/app/j;->vJ:Lcom/discord/app/j$a;
+    iget-object p1, p0, Lcom/discord/app/j;->vH:Lcom/discord/app/j$a;
 
     if-eqz p1, :cond_5
 
     if-eqz p2, :cond_3
 
-    iget v0, p1, Lcom/discord/app/j$a;->vM:I
+    iget v0, p1, Lcom/discord/app/j$a;->vK:I
 
     goto :goto_0
 
     :cond_3
-    iget v0, p1, Lcom/discord/app/j$a;->vO:I
+    iget v0, p1, Lcom/discord/app/j$a;->vM:I
 
     :goto_0
     if-eqz p2, :cond_4
 
-    iget p1, p1, Lcom/discord/app/j$a;->vN:I
+    iget p1, p1, Lcom/discord/app/j$a;->vL:I
 
     goto :goto_1
 
     :cond_4
-    iget p1, p1, Lcom/discord/app/j$a;->vP:I
+    iget p1, p1, Lcom/discord/app/j$a;->vN:I
 
     :goto_1
     invoke-virtual {p0, v0, p1}, Lcom/discord/app/j;->overridePendingTransition(II)V
@@ -98,12 +98,12 @@
     return-void
 .end method
 
-.method public static final synthetic dF()V
+.method public static final synthetic dE()V
     .locals 1
 
     const/4 v0, 0x1
 
-    sput-boolean v0, Lcom/discord/app/j;->vK:Z
+    sput-boolean v0, Lcom/discord/app/j;->vI:Z
 
     return-void
 .end method
@@ -117,7 +117,7 @@
 
     const/4 v0, 0x1
 
-    sput-boolean v0, Lcom/discord/app/j;->vK:Z
+    sput-boolean v0, Lcom/discord/app/j;->vI:Z
 
     return-void
 .end method
@@ -127,7 +127,7 @@
 
     invoke-super {p0}, Landroidx/appcompat/app/AppCompatActivity;->onPause()V
 
-    sget-boolean v0, Lcom/discord/app/j;->vK:Z
+    sget-boolean v0, Lcom/discord/app/j;->vI:Z
 
     const/4 v1, 0x0
 
@@ -141,7 +141,7 @@
 
     invoke-super {p0}, Landroidx/appcompat/app/AppCompatActivity;->onResume()V
 
-    sget-boolean v0, Lcom/discord/app/j;->vK:Z
+    sget-boolean v0, Lcom/discord/app/j;->vI:Z
 
     const/4 v1, 0x1
 
@@ -149,7 +149,7 @@
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/discord/app/j;->vK:Z
+    sput-boolean v0, Lcom/discord/app/j;->vI:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/k.smali b/com.discord/smali/com/discord/app/k.smali
new file mode 100644
index 0000000000..7e6e388f2a
--- /dev/null
+++ b/com.discord/smali/com/discord/app/k.smali
@@ -0,0 +1,76 @@
+.class public abstract Lcom/discord/app/k;
+.super Landroidx/lifecycle/ViewModel;
+.source "AppViewModel.kt"
+
+# interfaces
+.implements Lcom/discord/app/AppComponent;
+
+
+# instance fields
+.field private final paused:Lrx/subjects/Subject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/Subject<",
+            "Ljava/lang/Void;",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Landroidx/lifecycle/ViewModel;-><init>()V
+
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
+
+    move-result-object v0
+
+    const-string v1, "PublishSubject.create()"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lrx/subjects/Subject;
+
+    iput-object v0, p0, Lcom/discord/app/k;->paused:Lrx/subjects/Subject;
+
+    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
+
+    iget-object v0, p0, Lcom/discord/app/k;->paused:Lrx/subjects/Subject;
+
+    return-object v0
+.end method
+
+.method public onCleared()V
+    .locals 2
+
+    invoke-super {p0}, Landroidx/lifecycle/ViewModel;->onCleared()V
+
+    invoke-virtual {p0}, Lcom/discord/app/k;->getPaused()Lrx/subjects/Subject;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Lrx/subjects/Subject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$PreviewType.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$PreviewType.smali
new file mode 100644
index 0000000000..7968fbadbf
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$PreviewType.smali
@@ -0,0 +1,135 @@
+.class public final enum Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+.super Ljava/lang/Enum;
+.source "ImageUploadDialog.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/dialogs/ImageUploadDialog;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "PreviewType"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/discord/dialogs/ImageUploadDialog$PreviewType;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum wA:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+.field public static final enum wB:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+.field private static final synthetic wC:[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+.field public static final enum wz:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+
+# instance fields
+.field final previewSizeDimenId:I
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 5
+
+    const/4 v0, 0x3
+
+    new-array v0, v0, [Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    new-instance v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    const/4 v2, 0x0
+
+    const-string v3, "EMOJI"
+
+    const v4, 0x7f0700b8
+
+    invoke-direct {v1, v3, v2, v4}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;-><init>(Ljava/lang/String;II)V
+
+    sput-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->wz:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    const/4 v2, 0x1
+
+    const-string v3, "USER_AVATAR"
+
+    const v4, 0x7f070054
+
+    invoke-direct {v1, v3, v2, v4}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;-><init>(Ljava/lang/String;II)V
+
+    sput-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->wA:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    const/4 v2, 0x2
+
+    const-string v3, "GUILD_AVATAR"
+
+    const v4, 0x7f07005c
+
+    invoke-direct {v1, v3, v2, v4}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;-><init>(Ljava/lang/String;II)V
+
+    sput-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->wB:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->wC:[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    return-void
+.end method
+
+.method private 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, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->previewSizeDimenId:I
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    .locals 1
+
+    const-class v0, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    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/dialogs/ImageUploadDialog$PreviewType;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    .locals 1
+
+    sget-object v0, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->wC:[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    invoke-virtual {v0}, [Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$a.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$a.smali
new file mode 100644
index 0000000000..751031d434
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$a.smali
@@ -0,0 +1,32 @@
+.class public final Lcom/discord/dialogs/ImageUploadDialog$a;
+.super Ljava/lang/Object;
+.source "ImageUploadDialog.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/dialogs/ImageUploadDialog;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(B)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/dialogs/ImageUploadDialog$a;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$b.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$b.smali
new file mode 100644
index 0000000000..d20ef1ad3b
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$b.smali
@@ -0,0 +1,69 @@
+.class final Lcom/discord/dialogs/ImageUploadDialog$b;
+.super Ljava/lang/Object;
+.source "ImageUploadDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/dialogs/ImageUploadDialog;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $mimeType:Ljava/lang/String;
+
+.field final synthetic wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/dialogs/ImageUploadDialog;Ljava/lang/String;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+    iput-object p2, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->$mimeType:Ljava/lang/String;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 3
+
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+    invoke-virtual {p1}, Lcom/discord/dialogs/ImageUploadDialog;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+    invoke-virtual {v0}, Lcom/discord/dialogs/ImageUploadDialog;->getUri()Landroid/net/Uri;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->$mimeType:Ljava/lang/String;
+
+    iget-object v2, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+    iget-object v2, v2, Lcom/discord/dialogs/ImageUploadDialog;->ww:Lrx/functions/Action1;
+
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/images/MGImages;->requestDataUrl(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;Lrx/functions/Action1;)V
+
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+    invoke-virtual {p1}, Lcom/discord/dialogs/ImageUploadDialog;->dismiss()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$c.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$c.smali
new file mode 100644
index 0000000000..12bb81130c
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$c.smali
@@ -0,0 +1,70 @@
+.class final Lcom/discord/dialogs/ImageUploadDialog$c;
+.super Ljava/lang/Object;
+.source "ImageUploadDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/dialogs/ImageUploadDialog;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/dialogs/ImageUploadDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 2
+
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+    invoke-virtual {p1}, Lcom/discord/dialogs/ImageUploadDialog;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+    iget-object v0, v0, Lcom/discord/dialogs/ImageUploadDialog;->wv:Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "provider"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    iget-object v1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+    invoke-virtual {v1}, Lcom/discord/dialogs/ImageUploadDialog;->getUri()Landroid/net/Uri;
+
+    move-result-object v1
+
+    invoke-static {p1, v0, v1}, Lcom/discord/utilities/images/MGImages;->requestAvatarCrop(Landroid/content/Context;Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Landroid/net/Uri;)V
+
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+    invoke-virtual {p1}, Lcom/discord/dialogs/ImageUploadDialog;->dismiss()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$d.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$d.smali
new file mode 100644
index 0000000000..3a3dec5ed7
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$d.smali
@@ -0,0 +1,45 @@
+.class final Lcom/discord/dialogs/ImageUploadDialog$d;
+.super Ljava/lang/Object;
+.source "ImageUploadDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/dialogs/ImageUploadDialog;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/dialogs/ImageUploadDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$d;->wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+    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/dialogs/ImageUploadDialog$d;->wD:Lcom/discord/dialogs/ImageUploadDialog;
+
+    invoke-virtual {p1}, Lcom/discord/dialogs/ImageUploadDialog;->dismiss()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali
new file mode 100644
index 0000000000..50c6f03aa3
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali
@@ -0,0 +1,468 @@
+.class public final Lcom/discord/dialogs/ImageUploadDialog;
+.super Lcom/discord/app/AppDialog;
+.source "ImageUploadDialog.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/dialogs/ImageUploadDialog$PreviewType;,
+        Lcom/discord/dialogs/ImageUploadDialog$a;
+    }
+.end annotation
+
+
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+.field public static final wy:Lcom/discord/dialogs/ImageUploadDialog$a;
+
+
+# instance fields
+.field private final cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final image$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public mimeType:Ljava/lang/String;
+
+.field public uri:Landroid/net/Uri;
+
+.field private final wt:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final wu:Lkotlin/properties/ReadOnlyProperty;
+
+.field public wv:Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
+
+.field public ww:Lrx/functions/Action1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Action1<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public wx:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 7
+
+    const-class v0, Lcom/discord/dialogs/ImageUploadDialog;
+
+    const/4 v1, 0x4
+
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "upload"
+
+    const-string v5, "getUpload()Landroid/view/View;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v4
+
+    const-string v5, "crop"
+
+    const-string v6, "getCrop()Landroid/view/View;"
+
+    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v4, 0x1
+
+    aput-object v2, v1, v4
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v4
+
+    const-string v5, "cancel"
+
+    const-string v6, "getCancel()Landroid/view/View;"
+
+    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v4, 0x2
+
+    aput-object v2, v1, v4
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    const-string v4, "image"
+
+    const-string v5, "getImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
+
+    invoke-direct {v2, v0, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x3
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Lcom/discord/dialogs/ImageUploadDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    new-instance v0, Lcom/discord/dialogs/ImageUploadDialog$a;
+
+    invoke-direct {v0, v3}, Lcom/discord/dialogs/ImageUploadDialog$a;-><init>(B)V
+
+    sput-object v0, Lcom/discord/dialogs/ImageUploadDialog;->wy:Lcom/discord/dialogs/ImageUploadDialog$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
+
+    const v0, 0x7f0a04a9
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->wt:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a04a4
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->wu:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a04a3
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a04a7
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method private final dQ()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->wu:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/dialogs/ImageUploadDialog;->$$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/view/View;
+
+    return-object v0
+.end method
+
+.method private final getImage()Lcom/facebook/drawee/view/SimpleDraweeView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/dialogs/ImageUploadDialog;->$$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/facebook/drawee/view/SimpleDraweeView;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public final getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d003a
+
+    return v0
+.end method
+
+.method public final getUri()Landroid/net/Uri;
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->uri:Landroid/net/Uri;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "uri"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    return-object v0
+.end method
+
+.method public final onViewBound(Landroid/view/View;)V
+    .locals 14
+
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p0, v0}, Lcom/discord/dialogs/ImageUploadDialog;->setRetainInstance(Z)V
+
+    iget-object v1, p0, Lcom/discord/dialogs/ImageUploadDialog;->wx:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    iget-object v2, p0, Lcom/discord/dialogs/ImageUploadDialog;->mimeType:Ljava/lang/String;
+
+    if-eqz v1, :cond_4
+
+    if-nez v2, :cond_0
+
+    goto/16 :goto_1
+
+    :cond_0
+    const-string v3, "image/gif"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    iget-object v4, p0, Lcom/discord/dialogs/ImageUploadDialog;->wt:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v6, 0x0
+
+    aget-object v5, v5, v6
+
+    invoke-interface {v4, p0, v5}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Landroid/view/View;
+
+    new-instance v5, Lcom/discord/dialogs/ImageUploadDialog$b;
+
+    invoke-direct {v5, p0, v2}, Lcom/discord/dialogs/ImageUploadDialog$b;-><init>(Lcom/discord/dialogs/ImageUploadDialog;Ljava/lang/String;)V
+
+    check-cast v5, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v4, v5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/ImageUploadDialog;->dQ()Landroid/view/View;
+
+    move-result-object v2
+
+    xor-int/lit8 v4, v3, 0x1
+
+    const/4 v5, 0x4
+
+    invoke-static {v2, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;ZI)V
+
+    if-nez v3, :cond_1
+
+    invoke-direct {p0}, Lcom/discord/dialogs/ImageUploadDialog;->dQ()Landroid/view/View;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/dialogs/ImageUploadDialog$c;
+
+    invoke-direct {v3, p0}, Lcom/discord/dialogs/ImageUploadDialog$c;-><init>(Lcom/discord/dialogs/ImageUploadDialog;)V
+
+    check-cast v3, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    :cond_1
+    iget-object v2, p0, Lcom/discord/dialogs/ImageUploadDialog;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v3, Lcom/discord/dialogs/ImageUploadDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v4, 0x2
+
+    aget-object v3, v3, v4
+
+    invoke-interface {v2, p0, v3}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Landroid/view/View;
+
+    new-instance v3, Lcom/discord/dialogs/ImageUploadDialog$d;
+
+    invoke-direct {v3, p0}, Lcom/discord/dialogs/ImageUploadDialog$d;-><init>(Lcom/discord/dialogs/ImageUploadDialog;)V
+
+    check-cast v3, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/ImageUploadDialog;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v2
+
+    iget v3, v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->previewSizeDimenId:I
+
+    invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+
+    move-result v8
+
+    invoke-direct {p0}, Lcom/discord/dialogs/ImageUploadDialog;->getImage()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/facebook/drawee/view/SimpleDraweeView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+    move-result-object v2
+
+    iput v8, v2, Landroid/view/ViewGroup$LayoutParams;->height:I
+
+    iput v8, v2, Landroid/view/ViewGroup$LayoutParams;->width:I
+
+    invoke-direct {p0}, Lcom/discord/dialogs/ImageUploadDialog;->getImage()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object v3
+
+    invoke-virtual {v3, v2}, Lcom/facebook/drawee/view/SimpleDraweeView;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+
+    sget-object v2, Lcom/discord/dialogs/b;->$EnumSwitchMapping$0:[I
+
+    invoke-virtual {v1}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->ordinal()I
+
+    move-result v1
+
+    aget v1, v2, v1
+
+    if-eq v1, v0, :cond_2
+
+    if-eq v1, v4, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    invoke-direct {p0}, Lcom/discord/dialogs/ImageUploadDialog;->getImage()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object v1
+
+    check-cast v1, Landroid/widget/ImageView;
+
+    int-to-float v2, v8
+
+    const v3, 0x7f0402a7
+
+    invoke-static {p1, v3}, 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 p1
+
+    invoke-static {v1, v2, v0, p1}, Lcom/discord/utilities/images/MGImages;->setCornerRadius(Landroid/widget/ImageView;FZLjava/lang/Integer;)V
+
+    :goto_0
+    invoke-direct {p0}, Lcom/discord/dialogs/ImageUploadDialog;->getImage()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object p1
+
+    move-object v5, p1
+
+    check-cast v5, Landroid/widget/ImageView;
+
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog;->uri:Landroid/net/Uri;
+
+    if-nez p1, :cond_3
+
+    const-string v0, "uri"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_3
+    invoke-virtual {p1}, Landroid/net/Uri;->toString()Ljava/lang/String;
+
+    move-result-object v6
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    const/16 v12, 0x70
+
+    const/4 v13, 0x0
+
+    move v7, v8
+
+    invoke-static/range {v5 .. v13}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+
+    return-void
+
+    :cond_4
+    :goto_1
+    invoke-virtual {p0}, Lcom/discord/dialogs/ImageUploadDialog;->dismiss()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/a$a.smali b/com.discord/smali/com/discord/dialogs/a$a.smali
new file mode 100644
index 0000000000..6490ec05a0
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/a$a.smali
@@ -0,0 +1,65 @@
+.class final Lcom/discord/dialogs/a$a;
+.super Lkotlin/jvm/internal/l;
+.source "FriendRequestDialogs.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/dialogs/a;->a(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Landroid/view/View;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $onAccept:Lkotlin/jvm/functions/Function0;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/functions/Function0;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/dialogs/a$a;->$onAccept:Lkotlin/jvm/functions/Function0;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Landroid/view/View;
+
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/dialogs/a$a;->$onAccept:Lkotlin/jvm/functions/Function0;
+
+    invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/a$b.smali b/com.discord/smali/com/discord/dialogs/a$b.smali
new file mode 100644
index 0000000000..9d8292f7d7
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/a$b.smali
@@ -0,0 +1,65 @@
+.class final Lcom/discord/dialogs/a$b;
+.super Lkotlin/jvm/internal/l;
+.source "FriendRequestDialogs.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/dialogs/a;->a(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Landroid/view/View;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $onIgnore:Lkotlin/jvm/functions/Function0;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/functions/Function0;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/dialogs/a$b;->$onIgnore:Lkotlin/jvm/functions/Function0;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Landroid/view/View;
+
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/dialogs/a$b;->$onIgnore:Lkotlin/jvm/functions/Function0;
+
+    invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/a$c.smali b/com.discord/smali/com/discord/dialogs/a$c.smali
new file mode 100644
index 0000000000..7f98de7780
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/a$c.smali
@@ -0,0 +1,71 @@
+.class final Lcom/discord/dialogs/a$c;
+.super Lkotlin/jvm/internal/l;
+.source "FriendRequestDialogs.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/dialogs/a;->a(Lcom/discord/models/domain/ModelUser;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;Lkotlin/jvm/functions/Function1;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Landroid/view/View;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $onConfirm:Lkotlin/jvm/functions/Function1;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/functions/Function1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/dialogs/a$c;->$onConfirm:Lkotlin/jvm/functions/Function1;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Landroid/view/View;
+
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/dialogs/a$c;->$onConfirm:Lkotlin/jvm/functions/Function1;
+
+    const v0, 0x7f12068e
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/a.smali b/com.discord/smali/com/discord/dialogs/a.smali
new file mode 100644
index 0000000000..0095c7fe7d
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/a.smali
@@ -0,0 +1,291 @@
+.class public final Lcom/discord/dialogs/a;
+.super Ljava/lang/Object;
+.source "FriendRequestDialogs.kt"
+
+
+# static fields
+.field public static final ws:Lcom/discord/dialogs/a;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/dialogs/a;
+
+    invoke-direct {v0}, Lcom/discord/dialogs/a;-><init>()V
+
+    sput-object v0, Lcom/discord/dialogs/a;->ws:Lcom/discord/dialogs/a;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static a(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+    .locals 19
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroidx/fragment/app/FragmentManager;",
+            "Landroid/content/Context;",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    move-object/from16 v0, p1
+
+    move-object/from16 v1, p2
+
+    move-object/from16 v2, p3
+
+    const-string v3, "context"
+
+    invoke-static {v0, v3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "onAccept"
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "onIgnore"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v4, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
+
+    const v3, 0x7f120997
+
+    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v6
+
+    const-string v3, "context.getString(R.stri\u2026.incoming_friend_request)"
+
+    invoke-static {v6, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v3, 0x7f12127a
+
+    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v7
+
+    const-string v3, "context.getString(R.stri\u2026iend_request_dialog_body)"
+
+    invoke-static {v7, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v3, 0x7f12068c
+
+    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v8
+
+    const v3, 0x7f12068f
+
+    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v9
+
+    const/4 v0, 0x2
+
+    new-array v0, v0, [Lkotlin/Pair;
+
+    const v3, 0x7f0a04a8
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    new-instance v5, Lcom/discord/dialogs/a$a;
+
+    invoke-direct {v5, v1}, Lcom/discord/dialogs/a$a;-><init>(Lkotlin/jvm/functions/Function0;)V
+
+    invoke-static {v3, v5}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v1
+
+    const/4 v3, 0x0
+
+    aput-object v1, v0, v3
+
+    const v1, 0x7f0a04a3
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    new-instance v3, Lcom/discord/dialogs/a$b;
+
+    invoke-direct {v3, v2}, Lcom/discord/dialogs/a$b;-><init>(Lkotlin/jvm/functions/Function0;)V
+
+    invoke-static {v1, v3}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v1
+
+    const/4 v2, 0x1
+
+    aput-object v1, v0, v2
+
+    invoke-static {v0}, Lkotlin/a/ad;->a([Lkotlin/Pair;)Ljava/util/Map;
+
+    move-result-object v10
+
+    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, 0xfc0
+
+    const/16 v18, 0x0
+
+    move-object/from16 v5, p0
+
+    invoke-static/range {v4 .. v18}, 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;ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public static final a(Lcom/discord/models/domain/ModelUser;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;Lkotlin/jvm/functions/Function1;)V
+    .locals 18
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Landroid/content/Context;",
+            "Landroidx/fragment/app/FragmentManager;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Integer;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    move-object/from16 v0, p1
+
+    move-object/from16 v1, p3
+
+    const-string v2, "user"
+
+    move-object/from16 v3, p0
+
+    invoke-static {v3, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "context"
+
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "onConfirm"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
+
+    const v4, 0x7f120cc5
+
+    invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v5
+
+    const-string v4, "context.getString(R.stri\u2026.outgoing_friend_request)"
+
+    invoke-static {v5, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v4, 0x1
+
+    new-array v4, v4, [Ljava/lang/Object;
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+
+    move-result-object v3
+
+    const/4 v6, 0x0
+
+    aput-object v3, v4, v6
+
+    const v3, 0x7f120cc6
+
+    invoke-virtual {v0, v3, v4}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v6
+
+    const-string v3, "context.getString(R.stri\u2026elete_msg, user.username)"
+
+    invoke-static {v6, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v3, 0x7f1204cf
+
+    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v7
+
+    const v3, 0x7f12036d
+
+    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v8
+
+    const v0, 0x7f0a04a8
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    new-instance v3, Lcom/discord/dialogs/a$c;
+
+    invoke-direct {v3, v1}, Lcom/discord/dialogs/a$c;-><init>(Lkotlin/jvm/functions/Function1;)V
+
+    invoke-static {v0, v3}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lkotlin/a/ad;->a(Lkotlin/Pair;)Ljava/util/Map;
+
+    move-result-object v9
+
+    const v0, 0x7f040279
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v13
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    const/4 v12, 0x0
+
+    const/4 v14, 0x0
+
+    const/4 v15, 0x0
+
+    const/16 v16, 0xdc0
+
+    const/16 v17, 0x0
+
+    move-object v3, v2
+
+    move-object/from16 v4, p2
+
+    invoke-static/range {v3 .. 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;ILjava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/b.smali b/com.discord/smali/com/discord/dialogs/b.smali
new file mode 100644
index 0000000000..d80402a794
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/b.smali
@@ -0,0 +1,46 @@
+.class public final synthetic Lcom/discord/dialogs/b;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field public static final synthetic $EnumSwitchMapping$0:[I
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 3
+
+    invoke-static {}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->values()[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Lcom/discord/dialogs/b;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->wA:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    invoke-virtual {v1}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/dialogs/b;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->wB:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    invoke-virtual {v1}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x2
+
+    aput v2, v0, v1
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/a/a$a.smali b/com.discord/smali/com/discord/dialogs/c$a.smali
similarity index 82%
rename from com.discord/smali/com/discord/a/a$a.smali
rename to com.discord/smali/com/discord/dialogs/c$a.smali
index 4deb27ce69..c305cc7a7e 100644
--- a/com.discord/smali/com/discord/a/a$a.smali
+++ b/com.discord/smali/com/discord/dialogs/c$a.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/a/a$a;
+.class public final Lcom/discord/dialogs/c$a;
 .super Ljava/lang/Object;
 .source "PremiumUpsellDialog.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/a;
+    value = Lcom/discord/dialogs/c;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 .method public synthetic constructor <init>(B)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/a/a$a;-><init>()V
+    invoke-direct {p0}, Lcom/discord/dialogs/c$a;-><init>()V
 
     return-void
 .end method
@@ -104,7 +104,7 @@
 
     move v4, p1
 
-    invoke-static/range {v3 .. v10}, Lcom/discord/a/a$a;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static/range {v3 .. v10}, Lcom/discord/dialogs/c$a;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
 .end method
@@ -116,9 +116,9 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/a/a;
+    new-instance v0, Lcom/discord/dialogs/c;
 
-    invoke-direct {v0}, Lcom/discord/a/a;-><init>()V
+    invoke-direct {v0}, Lcom/discord/dialogs/c;-><init>()V
 
     new-instance v1, Landroid/os/Bundle;
 
@@ -158,9 +158,9 @@
 
     invoke-virtual {v1, p1, p7}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lcom/discord/a/a;->setArguments(Landroid/os/Bundle;)V
+    invoke-virtual {v0, v1}, Lcom/discord/dialogs/c;->setArguments(Landroid/os/Bundle;)V
 
-    const-class p1, Lcom/discord/a/a;
+    const-class p1, Lcom/discord/dialogs/c;
 
     invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
@@ -170,7 +170,7 @@
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, p0, p1}, Lcom/discord/a/a;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+    invoke-virtual {v0, p0, p1}, Lcom/discord/dialogs/c;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/a/a$b.smali b/com.discord/smali/com/discord/dialogs/c$b.smali
similarity index 69%
rename from com.discord/smali/com/discord/a/a$b.smali
rename to com.discord/smali/com/discord/dialogs/c$b.smali
index b26e05661d..a7da13a288 100644
--- a/com.discord/smali/com/discord/a/a$b.smali
+++ b/com.discord/smali/com/discord/dialogs/c$b.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/a/a$b;
+.class public final Lcom/discord/dialogs/c$b;
 .super Ljava/lang/Object;
 .source "PremiumUpsellDialog.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/a;
+    value = Lcom/discord/dialogs/c;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -19,7 +19,7 @@
 
 .field headerText:Ljava/lang/String;
 
-.field final wx:I
+.field final wH:I
 
 
 # direct methods
@@ -36,11 +36,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/a/a$b;->wx:I
+    iput p1, p0, Lcom/discord/dialogs/c$b;->wH:I
 
-    iput-object p2, p0, Lcom/discord/a/a$b;->headerText:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/dialogs/c$b;->headerText:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/discord/a/a$b;->bodyText:Ljava/lang/String;
+    iput-object p3, p0, Lcom/discord/dialogs/c$b;->bodyText:Ljava/lang/String;
 
     return-void
 .end method
@@ -54,17 +54,17 @@
 
     if-eq p0, p1, :cond_2
 
-    instance-of v1, p1, Lcom/discord/a/a$b;
+    instance-of v1, p1, Lcom/discord/dialogs/c$b;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_1
 
-    check-cast p1, Lcom/discord/a/a$b;
+    check-cast p1, Lcom/discord/dialogs/c$b;
 
-    iget v1, p0, Lcom/discord/a/a$b;->wx:I
+    iget v1, p0, Lcom/discord/dialogs/c$b;->wH:I
 
-    iget v3, p1, Lcom/discord/a/a$b;->wx:I
+    iget v3, p1, Lcom/discord/dialogs/c$b;->wH:I
 
     if-ne v1, v3, :cond_0
 
@@ -78,9 +78,9 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/a/a$b;->headerText:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/dialogs/c$b;->headerText:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/discord/a/a$b;->headerText:Ljava/lang/String;
+    iget-object v3, p1, Lcom/discord/dialogs/c$b;->headerText:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -88,9 +88,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/a/a$b;->bodyText:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/dialogs/c$b;->bodyText:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/discord/a/a$b;->bodyText:Ljava/lang/String;
+    iget-object p1, p1, Lcom/discord/dialogs/c$b;->bodyText:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -111,11 +111,15 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lcom/discord/a/a$b;->wx:I
+    iget v0, p0, Lcom/discord/dialogs/c$b;->wH:I
+
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/a/a$b;->headerText:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/dialogs/c$b;->headerText:Ljava/lang/String;
 
     const/4 v2, 0x0
 
@@ -135,7 +139,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/a/a$b;->bodyText:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/dialogs/c$b;->bodyText:Ljava/lang/String;
 
     if-eqz v1, :cond_1
 
@@ -158,7 +162,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/discord/a/a$b;->wx:I
+    iget v1, p0, Lcom/discord/dialogs/c$b;->wH:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -166,7 +170,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/a/a$b;->headerText:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/dialogs/c$b;->headerText:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -174,7 +178,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/a/a$b;->bodyText:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/dialogs/c$b;->bodyText:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/a/a$c$a.smali b/com.discord/smali/com/discord/dialogs/c$c$a.smali
similarity index 76%
rename from com.discord/smali/com/discord/a/a$c$a.smali
rename to com.discord/smali/com/discord/dialogs/c$c$a.smali
index 11874c9659..ae1584f93a 100644
--- a/com.discord/smali/com/discord/a/a$c$a.smali
+++ b/com.discord/smali/com/discord/dialogs/c$c$a.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/a/a$c$a;
+.class public final Lcom/discord/dialogs/c$c$a;
 .super Ljava/lang/Object;
 .source "PremiumUpsellDialog.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/a$c;
+    value = Lcom/discord/dialogs/c$c;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 .method public synthetic constructor <init>(B)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/a/a$c$a;-><init>()V
+    invoke-direct {p0}, Lcom/discord/dialogs/c$c$a;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/a/a$c.smali b/com.discord/smali/com/discord/dialogs/c$c.smali
similarity index 76%
rename from com.discord/smali/com/discord/a/a$c.smali
rename to com.discord/smali/com/discord/dialogs/c$c.smali
index c7c1556715..b70881b123 100644
--- a/com.discord/smali/com/discord/a/a$c.smali
+++ b/com.discord/smali/com/discord/dialogs/c$c.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/a/a$c;
+.class public final Lcom/discord/dialogs/c$c;
 .super Lcom/discord/app/AppFragment;
 .source "PremiumUpsellDialog.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/a;
+    value = Lcom/discord/dialogs/c;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/a/a$c$a;
+        Lcom/discord/dialogs/c$c$a;
     }
 .end annotation
 
@@ -23,7 +23,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final wy:Lcom/discord/a/a$c$a;
+.field public static final wI:Lcom/discord/dialogs/c$c$a;
 
 
 # instance fields
@@ -38,7 +38,7 @@
 .method static constructor <clinit>()V
     .locals 7
 
-    const-class v0, Lcom/discord/a/a$c;
+    const-class v0, Lcom/discord/dialogs/c$c;
 
     const/4 v1, 0x3
 
@@ -110,13 +110,13 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/a/a$c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/dialogs/c$c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    new-instance v0, Lcom/discord/a/a$c$a;
+    new-instance v0, Lcom/discord/dialogs/c$c$a;
 
-    invoke-direct {v0, v3}, Lcom/discord/a/a$c$a;-><init>(B)V
+    invoke-direct {v0, v3}, Lcom/discord/dialogs/c$c$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/a/a$c;->wy:Lcom/discord/a/a$c$a;
+    sput-object v0, Lcom/discord/dialogs/c$c;->wI:Lcom/discord/dialogs/c$c$a;
 
     return-void
 .end method
@@ -126,29 +126,29 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0520
+    const v0, 0x7f0a0538
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/a$c;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/c$c;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a051f
+    const v0, 0x7f0a0537
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/a$c;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/c$c;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a051c
+    const v0, 0x7f0a0534
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/a$c;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/c$c;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
@@ -158,7 +158,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d015b
+    const v0, 0x7f0d0165
 
     return v0
 .end method
@@ -168,9 +168,9 @@
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
 
-    iget-object v0, p0, Lcom/discord/a/a$c;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/c$c;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/a/a$c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/dialogs/c$c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -182,7 +182,7 @@
 
     check-cast v0, Landroid/widget/ImageView;
 
-    invoke-virtual {p0}, Lcom/discord/a/a$c;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/discord/dialogs/c$c;->getArguments()Landroid/os/Bundle;
 
     move-result-object v1
 
@@ -197,9 +197,9 @@
     :cond_0
     invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    iget-object v0, p0, Lcom/discord/a/a$c;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/c$c;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/a/a$c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/dialogs/c$c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -211,7 +211,7 @@
 
     check-cast v0, Landroid/widget/TextView;
 
-    invoke-virtual {p0}, Lcom/discord/a/a$c;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/discord/dialogs/c$c;->getArguments()Landroid/os/Bundle;
 
     move-result-object v1
 
@@ -235,9 +235,9 @@
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v0, p0, Lcom/discord/a/a$c;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/c$c;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/a/a$c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/dialogs/c$c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v3, 0x2
 
@@ -249,7 +249,7 @@
 
     check-cast v0, Landroid/widget/TextView;
 
-    invoke-virtual {p0}, Lcom/discord/a/a$c;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/discord/dialogs/c$c;->getArguments()Landroid/os/Bundle;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/a/a$d.smali b/com.discord/smali/com/discord/dialogs/c$d.smali
similarity index 82%
rename from com.discord/smali/com/discord/a/a$d.smali
rename to com.discord/smali/com/discord/dialogs/c$d.smali
index 88f21cf8c8..c3fb5952d8 100644
--- a/com.discord/smali/com/discord/a/a$d.smali
+++ b/com.discord/smali/com/discord/dialogs/c$d.smali
@@ -1,11 +1,11 @@
-.class final Lcom/discord/a/a$d;
+.class final Lcom/discord/dialogs/c$d;
 .super Landroidx/fragment/app/FragmentStatePagerAdapter;
 .source "PremiumUpsellDialog.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/a;
+    value = Lcom/discord/dialogs/c;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field wz:Ljava/util/List;
+.field wJ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
-            "Lcom/discord/a/a$c;",
+            "Lcom/discord/dialogs/c$c;",
             ">;"
         }
     .end annotation
@@ -44,7 +44,7 @@
 .method public final getCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/a/a$d;->wz:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/dialogs/c$d;->wJ:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
@@ -65,7 +65,7 @@
 .method public final synthetic getItem(I)Landroidx/fragment/app/Fragment;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/a/a$d;->wz:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/dialogs/c$d;->wJ:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
@@ -73,7 +73,7 @@
 
     move-result-object p1
 
-    check-cast p1, Lcom/discord/a/a$c;
+    check-cast p1, Lcom/discord/dialogs/c$c;
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/a/a$e.smali b/com.discord/smali/com/discord/dialogs/c$e.smali
similarity index 56%
rename from com.discord/smali/com/discord/a/a$e.smali
rename to com.discord/smali/com/discord/dialogs/c$e.smali
index 4c13d3c3af..2fcc9cbebc 100644
--- a/com.discord/smali/com/discord/a/a$e.smali
+++ b/com.discord/smali/com/discord/dialogs/c$e.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/a$e;
+.class final Lcom/discord/dialogs/c$e;
 .super Ljava/lang/Object;
 .source "PremiumUpsellDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/a/a;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/dialogs/c;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic wA:Lcom/discord/a/a;
+.field final synthetic wK:Lcom/discord/dialogs/c;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/a/a;)V
+.method constructor <init>(Lcom/discord/dialogs/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/a/a$e;->wA:Lcom/discord/a/a;
+    iput-object p1, p0, Lcom/discord/dialogs/c$e;->wK:Lcom/discord/dialogs/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/a/a$e;->wA:Lcom/discord/a/a;
+    iget-object p1, p0, Lcom/discord/dialogs/c$e;->wK:Lcom/discord/dialogs/c;
 
-    invoke-virtual {p1}, Lcom/discord/a/a;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/c;->dismiss()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/a/a$f.smali b/com.discord/smali/com/discord/dialogs/c$f.smali
similarity index 67%
rename from com.discord/smali/com/discord/a/a$f.smali
rename to com.discord/smali/com/discord/dialogs/c$f.smali
index 8c31b083da..e77eee7e0d 100644
--- a/com.discord/smali/com/discord/a/a$f.smali
+++ b/com.discord/smali/com/discord/dialogs/c$f.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/a$f;
+.class final Lcom/discord/dialogs/c$f;
 .super Ljava/lang/Object;
 .source "PremiumUpsellDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/a/a;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/dialogs/c;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic wA:Lcom/discord/a/a;
+.field final synthetic wK:Lcom/discord/dialogs/c;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/a/a;)V
+.method constructor <init>(Lcom/discord/dialogs/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/a/a$f;->wA:Lcom/discord/a/a;
+    iput-object p1, p0, Lcom/discord/dialogs/c$f;->wK:Lcom/discord/dialogs/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,9 +39,9 @@
 
     new-instance v8, Lcom/discord/utilities/analytics/Traits$Location;
 
-    iget-object v0, p0, Lcom/discord/a/a$f;->wA:Lcom/discord/a/a;
+    iget-object v0, p0, Lcom/discord/dialogs/c$f;->wK:Lcom/discord/dialogs/c;
 
-    invoke-virtual {v0}, Lcom/discord/a/a;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {v0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -63,9 +63,9 @@
     move-object v1, v9
 
     :goto_0
-    iget-object v0, p0, Lcom/discord/a/a$f;->wA:Lcom/discord/a/a;
+    iget-object v0, p0, Lcom/discord/dialogs/c$f;->wK:Lcom/discord/dialogs/c;
 
-    invoke-virtual {v0}, Lcom/discord/a/a;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {v0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -85,9 +85,9 @@
     move-object v2, v9
 
     :goto_1
-    iget-object v0, p0, Lcom/discord/a/a$f;->wA:Lcom/discord/a/a;
+    iget-object v0, p0, Lcom/discord/dialogs/c$f;->wK:Lcom/discord/dialogs/c;
 
-    invoke-virtual {v0}, Lcom/discord/a/a;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {v0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -107,9 +107,9 @@
     move-object v3, v9
 
     :goto_2
-    iget-object v0, p0, Lcom/discord/a/a$f;->wA:Lcom/discord/a/a;
+    iget-object v0, p0, Lcom/discord/dialogs/c$f;->wK:Lcom/discord/dialogs/c;
 
-    invoke-virtual {v0}, Lcom/discord/a/a;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {v0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -143,7 +143,7 @@
 
     invoke-virtual {v0, v8}, Lcom/discord/utilities/analytics/AnalyticsTracker;->premiumSettingsOpened(Lcom/discord/utilities/analytics/Traits$Location;)V
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
     const-string v1, "it"
 
@@ -159,11 +159,11 @@
 
     const/4 v1, 0x2
 
-    invoke-static {v0, p1, v9, v1, v9}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;->launch$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;Landroid/content/Context;Ljava/lang/Integer;ILjava/lang/Object;)V
+    invoke-static {v0, p1, v9, v1, v9}, 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
 
-    iget-object p1, p0, Lcom/discord/a/a$f;->wA:Lcom/discord/a/a;
+    iget-object p1, p0, Lcom/discord/dialogs/c$f;->wK:Lcom/discord/dialogs/c;
 
-    invoke-virtual {p1}, Lcom/discord/a/a;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/c;->dismiss()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/a/a.smali b/com.discord/smali/com/discord/dialogs/c.smali
similarity index 64%
rename from com.discord/smali/com/discord/a/a.smali
rename to com.discord/smali/com/discord/dialogs/c.smali
index 234d773b06..f9f6a601ce 100644
--- a/com.discord/smali/com/discord/a/a.smali
+++ b/com.discord/smali/com/discord/dialogs/c.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/a/a;
+.class public final Lcom/discord/dialogs/c;
 .super Lcom/discord/app/AppDialog;
 .source "PremiumUpsellDialog.kt"
 
@@ -6,10 +6,10 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/a/a$d;,
-        Lcom/discord/a/a$c;,
-        Lcom/discord/a/a$b;,
-        Lcom/discord/a/a$a;
+        Lcom/discord/dialogs/c$d;,
+        Lcom/discord/dialogs/c$c;,
+        Lcom/discord/dialogs/c$b;,
+        Lcom/discord/dialogs/c$a;
     }
 .end annotation
 
@@ -17,7 +17,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final ww:Lcom/discord/a/a$a;
+.field public static final wG:Lcom/discord/dialogs/c$a;
 
 
 # instance fields
@@ -27,16 +27,16 @@
 
 .field private final viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final wu:Lkotlin/properties/ReadOnlyProperty;
+.field private final wE:Lkotlin/properties/ReadOnlyProperty;
 
-.field private wv:Lcom/discord/a/a$d;
+.field private wF:Lcom/discord/dialogs/c$d;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 7
 
-    const-class v0, Lcom/discord/a/a;
+    const-class v0, Lcom/discord/dialogs/c;
 
     const/4 v1, 0x4
 
@@ -130,13 +130,13 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/a/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/dialogs/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    new-instance v0, Lcom/discord/a/a$a;
+    new-instance v0, Lcom/discord/dialogs/c$a;
 
-    invoke-direct {v0, v3}, Lcom/discord/a/a$a;-><init>(B)V
+    invoke-direct {v0, v3}, Lcom/discord/dialogs/c$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/a/a;->ww:Lcom/discord/a/a$a;
+    sput-object v0, Lcom/discord/dialogs/c;->wG:Lcom/discord/dialogs/c$a;
 
     return-void
 .end method
@@ -146,37 +146,37 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0522
+    const v0, 0x7f0a053a
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/a;->viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/c;->viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a051e
+    const v0, 0x7f0a0536
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/a;->wu:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/c;->wE:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a051d
+    const v0, 0x7f0a0535
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/a;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/c;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0521
+    const v0, 0x7f0a0539
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/a;->learnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/c;->learnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
@@ -200,7 +200,7 @@
 
     move-object v5, p4
 
-    invoke-static/range {v0 .. v7}, Lcom/discord/a/a$a;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static/range {v0 .. v7}, Lcom/discord/dialogs/c$a;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
 .end method
@@ -208,9 +208,9 @@
 .method private final dR()Landroidx/viewpager/widget/ViewPager;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/a/a;->viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/c;->viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/a/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/dialogs/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -230,7 +230,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d005a
+    const v0, 0x7f0d005c
 
     return v0
 .end method
@@ -240,7 +240,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onCreate(Landroid/os/Bundle;)V
 
-    invoke-virtual {p0}, Lcom/discord/a/a;->getActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object p1
 
@@ -256,13 +256,13 @@
 
     const/4 p1, 0x6
 
-    new-array p1, p1, [Lcom/discord/a/a$b;
+    new-array p1, p1, [Lcom/discord/dialogs/c$b;
 
-    new-instance v1, Lcom/discord/a/a$b;
+    new-instance v1, Lcom/discord/dialogs/c$b;
 
-    const v3, 0x7f120e5b
+    const v3, 0x7f120e92
 
-    invoke-virtual {p0, v3}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v3}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
@@ -270,9 +270,9 @@
 
     invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120e5a
+    const v4, 0x7f120e91
 
-    invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v4}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
 
     move-result-object v4
 
@@ -280,17 +280,17 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f080429
+    const v5, 0x7f080444
 
-    invoke-direct {v1, v5, v3, v4}, Lcom/discord/a/a$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v1, v5, v3, v4}, Lcom/discord/dialogs/c$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
     aput-object v1, p1, v2
 
-    new-instance v1, Lcom/discord/a/a$b;
+    new-instance v1, Lcom/discord/dialogs/c$b;
 
-    const v3, 0x7f120e58
+    const v3, 0x7f120e8f
 
-    invoke-virtual {p0, v3}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v3}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
@@ -298,9 +298,9 @@
 
     invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120e57
+    const v4, 0x7f120e8e
 
-    invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v4}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
 
     move-result-object v4
 
@@ -308,19 +308,19 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f080406
+    const v5, 0x7f08041f
 
-    invoke-direct {v1, v5, v3, v4}, Lcom/discord/a/a$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v1, v5, v3, v4}, Lcom/discord/dialogs/c$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
     const/4 v3, 0x1
 
     aput-object v1, p1, v3
 
-    new-instance v1, Lcom/discord/a/a$b;
+    new-instance v1, Lcom/discord/dialogs/c$b;
 
-    const v4, 0x7f120e52
+    const v4, 0x7f120e89
 
-    invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v4}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
 
     move-result-object v4
 
@@ -328,9 +328,9 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f120e51
+    const v5, 0x7f120e88
 
-    invoke-virtual {p0, v5}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v5}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
 
     move-result-object v5
 
@@ -338,19 +338,19 @@
 
     invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f0803e3
+    const v6, 0x7f0803fb
 
-    invoke-direct {v1, v6, v4, v5}, Lcom/discord/a/a$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v1, v6, v4, v5}, Lcom/discord/dialogs/c$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
     const/4 v4, 0x2
 
     aput-object v1, p1, v4
 
-    new-instance v1, Lcom/discord/a/a$b;
+    new-instance v1, Lcom/discord/dialogs/c$b;
 
-    const v5, 0x7f120e5e
+    const v5, 0x7f120e95
 
-    invoke-virtual {p0, v5}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v5}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
 
     move-result-object v5
 
@@ -358,47 +358,55 @@
 
     invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-array v4, v4, [Ljava/lang/Object;
+    const/4 v6, 0x3
 
-    const v6, 0x7f1205a0
+    new-array v7, v6, [Ljava/lang/Object;
 
-    invoke-virtual {p0, v6}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
+    const v8, 0x7f1205ac
 
-    move-result-object v6
+    invoke-virtual {p0, v8}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
 
-    aput-object v6, v4, v2
+    move-result-object v8
 
-    const v6, 0x7f12059e
+    aput-object v8, v7, v2
 
-    invoke-virtual {p0, v6}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
+    const v8, 0x7f1205ab
 
-    move-result-object v6
+    invoke-virtual {p0, v8}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
 
-    aput-object v6, v4, v3
+    move-result-object v8
 
-    const v6, 0x7f120e5d
+    aput-object v8, v7, v3
 
-    invoke-virtual {p0, v6, v4}, Lcom/discord/a/a;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    const v8, 0x7f1205aa
+
+    invoke-virtual {p0, v8}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
+
+    move-result-object v8
+
+    aput-object v8, v7, v4
+
+    const v4, 0x7f120e94
+
+    invoke-virtual {p0, v4, v7}, Lcom/discord/dialogs/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v4
 
-    const-string v6, "getString(R.string.premi\u2026le_upload_limit_premium))"
+    const-string v7, "getString(R.string.premi\u2026ad_limit_premium_tier_1))"
 
-    invoke-static {v4, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v7}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f08042a
+    const v7, 0x7f080445
 
-    invoke-direct {v1, v6, v5, v4}, Lcom/discord/a/a$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v1, v7, v5, v4}, Lcom/discord/dialogs/c$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
-    const/4 v4, 0x3
+    aput-object v1, p1, v6
 
-    aput-object v1, p1, v4
+    new-instance v1, Lcom/discord/dialogs/c$b;
 
-    new-instance v1, Lcom/discord/a/a$b;
+    const v4, 0x7f120e86
 
-    const v4, 0x7f120e4f
-
-    invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v4}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
 
     move-result-object v4
 
@@ -406,9 +414,9 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f120e4e
+    const v5, 0x7f120e85
 
-    invoke-virtual {p0, v5}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v5}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
 
     move-result-object v5
 
@@ -416,17 +424,17 @@
 
     invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f0803ec
+    const v6, 0x7f080404
 
-    invoke-direct {v1, v6, v4, v5}, Lcom/discord/a/a$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v1, v6, v4, v5}, Lcom/discord/dialogs/c$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
     aput-object v1, p1, v0
 
-    new-instance v0, Lcom/discord/a/a$b;
+    new-instance v0, Lcom/discord/dialogs/c$b;
 
-    const v1, 0x7f120e55
+    const v1, 0x7f120e8c
 
-    invoke-virtual {p0, v1}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v1}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
 
     move-result-object v1
 
@@ -434,9 +442,9 @@
 
     invoke-static {v1, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120e54
+    const v4, 0x7f120e8b
 
-    invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v4}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
 
     move-result-object v4
 
@@ -444,19 +452,19 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f0803ef
+    const v5, 0x7f080407
 
-    invoke-direct {v0, v5, v1, v4}, Lcom/discord/a/a$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v0, v5, v1, v4}, Lcom/discord/dialogs/c$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
     const/4 v1, 0x5
 
     aput-object v0, p1, v1
 
-    invoke-static {p1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {p1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/discord/a/a;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -474,7 +482,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/discord/a/a;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
 
     move-result-object v1
 
@@ -496,9 +504,9 @@
 
     move-result-object v1
 
-    check-cast v1, Lcom/discord/a/a$b;
+    check-cast v1, Lcom/discord/dialogs/c$b;
 
-    invoke-virtual {p0}, Lcom/discord/a/a;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
 
     move-result-object v7
 
@@ -516,10 +524,10 @@
     :cond_2
     invoke-static {v7, v4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v7, v1, Lcom/discord/a/a$b;->headerText:Ljava/lang/String;
+    iput-object v7, v1, Lcom/discord/dialogs/c$b;->headerText:Ljava/lang/String;
 
     :cond_3
-    invoke-virtual {p0}, Lcom/discord/a/a;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
 
     move-result-object v1
 
@@ -537,9 +545,9 @@
 
     move-result-object v1
 
-    check-cast v1, Lcom/discord/a/a$b;
+    check-cast v1, Lcom/discord/dialogs/c$b;
 
-    invoke-virtual {p0}, Lcom/discord/a/a;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
 
     move-result-object v8
 
@@ -560,12 +568,12 @@
     :goto_1
     invoke-static {v5, v4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v5, v1, Lcom/discord/a/a$b;->bodyText:Ljava/lang/String;
+    iput-object v5, v1, Lcom/discord/dialogs/c$b;->bodyText:Ljava/lang/String;
 
     :cond_6
-    new-instance v1, Lcom/discord/a/a$d;
+    new-instance v1, Lcom/discord/dialogs/c$d;
 
-    invoke-virtual {p0}, Lcom/discord/a/a;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
+    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v4
 
@@ -573,23 +581,23 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, v4}, Lcom/discord/a/a$d;-><init>(Landroidx/fragment/app/FragmentManager;)V
+    invoke-direct {v1, v4}, Lcom/discord/dialogs/c$d;-><init>(Landroidx/fragment/app/FragmentManager;)V
 
-    iput-object v1, p0, Lcom/discord/a/a;->wv:Lcom/discord/a/a$d;
+    iput-object v1, p0, Lcom/discord/dialogs/c;->wF:Lcom/discord/dialogs/c$d;
 
     invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v1
 
-    check-cast v1, Lcom/discord/a/a$b;
+    check-cast v1, Lcom/discord/dialogs/c$b;
 
-    iget-object v4, p0, Lcom/discord/a/a;->wv:Lcom/discord/a/a$d;
+    iget-object v4, p0, Lcom/discord/dialogs/c;->wF:Lcom/discord/dialogs/c$d;
 
     if-nez v4, :cond_7
 
     const-string v5, "pagerAdapter"
 
-    invoke-static {v5}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v5}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_7
     invoke-static {v1}, Lkotlin/a/m;->ba(Ljava/lang/Object;)Ljava/util/List;
@@ -627,7 +635,7 @@
 
     if-gez v8, :cond_8
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_8
     if-eq v8, v0, :cond_9
@@ -687,15 +695,15 @@
 
     move-result-object v1
 
-    check-cast v1, Lcom/discord/a/a$b;
+    check-cast v1, Lcom/discord/dialogs/c$b;
 
-    sget-object v2, Lcom/discord/a/a$c;->wy:Lcom/discord/a/a$c$a;
+    sget-object v2, Lcom/discord/dialogs/c$c;->wI:Lcom/discord/dialogs/c$c$a;
 
-    iget v2, v1, Lcom/discord/a/a$b;->wx:I
+    iget v2, v1, Lcom/discord/dialogs/c$b;->wH:I
 
-    iget-object v3, v1, Lcom/discord/a/a$b;->headerText:Ljava/lang/String;
+    iget-object v3, v1, Lcom/discord/dialogs/c$b;->headerText:Ljava/lang/String;
 
-    iget-object v1, v1, Lcom/discord/a/a$b;->bodyText:Ljava/lang/String;
+    iget-object v1, v1, Lcom/discord/dialogs/c$b;->bodyText:Ljava/lang/String;
 
     const-string v5, "headerText"
 
@@ -717,11 +725,11 @@
 
     invoke-virtual {v5, v7, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/a/a$c;
+    new-instance v1, Lcom/discord/dialogs/c$c;
 
-    invoke-direct {v1}, Lcom/discord/a/a$c;-><init>()V
+    invoke-direct {v1}, Lcom/discord/dialogs/c$c;-><init>()V
 
-    invoke-virtual {v1, v5}, Lcom/discord/a/a$c;->setArguments(Landroid/os/Bundle;)V
+    invoke-virtual {v1, v5}, Lcom/discord/dialogs/c$c;->setArguments(Landroid/os/Bundle;)V
 
     invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
@@ -730,7 +738,7 @@
     :cond_c
     check-cast v0, Ljava/util/List;
 
-    iput-object v0, v4, Lcom/discord/a/a$d;->wz:Ljava/util/List;
+    iput-object v0, v4, Lcom/discord/dialogs/c$d;->wJ:Ljava/util/List;
 
     return-void
 .end method
@@ -744,26 +752,26 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    invoke-direct {p0}, Lcom/discord/a/a;->dR()Landroidx/viewpager/widget/ViewPager;
+    invoke-direct {p0}, Lcom/discord/dialogs/c;->dR()Landroidx/viewpager/widget/ViewPager;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/a/a;->wv:Lcom/discord/a/a$d;
+    iget-object v0, p0, Lcom/discord/dialogs/c;->wF:Lcom/discord/dialogs/c$d;
 
     if-nez v0, :cond_0
 
     const-string v1, "pagerAdapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast v0, Landroidx/viewpager/widget/PagerAdapter;
 
     invoke-virtual {p1, v0}, Landroidx/viewpager/widget/ViewPager;->setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
 
-    iget-object p1, p0, Lcom/discord/a/a;->wu:Lkotlin/properties/ReadOnlyProperty;
+    iget-object p1, p0, Lcom/discord/dialogs/c;->wE:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v0, Lcom/discord/a/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v0, Lcom/discord/dialogs/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v1, 0x1
 
@@ -775,15 +783,15 @@
 
     check-cast p1, Lcom/google/android/material/tabs/TabLayout;
 
-    invoke-direct {p0}, Lcom/discord/a/a;->dR()Landroidx/viewpager/widget/ViewPager;
+    invoke-direct {p0}, Lcom/discord/dialogs/c;->dR()Landroidx/viewpager/widget/ViewPager;
 
     move-result-object v0
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/tabs/TabLayout;->setupWithViewPager(Landroidx/viewpager/widget/ViewPager;)V
 
-    iget-object p1, p0, Lcom/discord/a/a;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object p1, p0, Lcom/discord/dialogs/c;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v0, Lcom/discord/a/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v0, Lcom/discord/dialogs/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v1, 0x2
 
@@ -795,17 +803,17 @@
 
     check-cast p1, Landroid/view/View;
 
-    new-instance v0, Lcom/discord/a/a$e;
+    new-instance v0, Lcom/discord/dialogs/c$e;
 
-    invoke-direct {v0, p0}, Lcom/discord/a/a$e;-><init>(Lcom/discord/a/a;)V
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/c$e;-><init>(Lcom/discord/dialogs/c;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object p1, p0, Lcom/discord/a/a;->learnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object p1, p0, Lcom/discord/dialogs/c;->learnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v0, Lcom/discord/a/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v0, Lcom/discord/dialogs/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v1, 0x3
 
@@ -817,9 +825,9 @@
 
     check-cast p1, Landroid/view/View;
 
-    new-instance v0, Lcom/discord/a/a$f;
+    new-instance v0, Lcom/discord/dialogs/c$f;
 
-    invoke-direct {v0, p0}, Lcom/discord/a/a$f;-><init>(Lcom/discord/a/a;)V
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/c$f;-><init>(Lcom/discord/dialogs/c;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
diff --git a/com.discord/smali/com/discord/a/b$a.smali b/com.discord/smali/com/discord/dialogs/d$a.smali
similarity index 77%
rename from com.discord/smali/com/discord/a/b$a.smali
rename to com.discord/smali/com/discord/dialogs/d$a.smali
index 8877b71f88..ac5fe055d7 100644
--- a/com.discord/smali/com/discord/a/b$a.smali
+++ b/com.discord/smali/com/discord/dialogs/d$a.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/a/b$a;
+.class public final Lcom/discord/dialogs/d$a;
 .super Ljava/lang/Object;
 .source "SelectorDialog.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/b;
+    value = Lcom/discord/dialogs/d;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,12 +26,12 @@
 .method public synthetic constructor <init>(B)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/a/b$a;-><init>()V
+    invoke-direct {p0}, Lcom/discord/dialogs/d$a;-><init>()V
 
     return-void
 .end method
 
-.method public static a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;[Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Lcom/discord/a/b;
+.method public static a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;[Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Lcom/discord/dialogs/d;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -45,7 +45,7 @@
             "Ljava/lang/Integer;",
             "Lkotlin/Unit;",
             ">;)",
-            "Lcom/discord/a/b;"
+            "Lcom/discord/dialogs/d;"
         }
     .end annotation
 
@@ -65,9 +65,9 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/a/b;
+    new-instance v0, Lcom/discord/dialogs/d;
 
-    invoke-direct {v0}, Lcom/discord/a/b;-><init>()V
+    invoke-direct {v0}, Lcom/discord/dialogs/d;-><init>()V
 
     new-instance v1, Landroid/os/Bundle;
 
@@ -81,11 +81,11 @@
 
     invoke-virtual {v1, p1, p2}, Landroid/os/Bundle;->putCharSequenceArray(Ljava/lang/String;[Ljava/lang/CharSequence;)V
 
-    invoke-virtual {v0, v1}, Lcom/discord/a/b;->setArguments(Landroid/os/Bundle;)V
+    invoke-virtual {v0, v1}, Lcom/discord/dialogs/d;->setArguments(Landroid/os/Bundle;)V
 
-    iput-object p3, v0, Lcom/discord/a/b;->wB:Lkotlin/jvm/functions/Function1;
+    iput-object p3, v0, Lcom/discord/dialogs/d;->wL:Lkotlin/jvm/functions/Function1;
 
-    const-class p1, Lcom/discord/a/b;
+    const-class p1, Lcom/discord/dialogs/d;
 
     invoke-static {p1}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -95,7 +95,7 @@
 
     move-result-object p1
 
-    invoke-virtual {v0, p0, p1}, Lcom/discord/a/b;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+    invoke-virtual {v0, p0, p1}, Lcom/discord/dialogs/d;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/d$b$a.smali b/com.discord/smali/com/discord/dialogs/d$b$a.smali
new file mode 100644
index 0000000000..a1877dd1fd
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/d$b$a.smali
@@ -0,0 +1,68 @@
+.class final Lcom/discord/dialogs/d$b$a;
+.super Ljava/lang/Object;
+.source "SelectorDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/dialogs/d$b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic wO:Lcom/discord/dialogs/d$b;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/dialogs/d$b;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/dialogs/d$b$a;->wO:Lcom/discord/dialogs/d$b;
+
+    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/dialogs/d$b$a;->wO:Lcom/discord/dialogs/d$b;
+
+    iget-object p1, p1, Lcom/discord/dialogs/d$b;->this$0:Lcom/discord/dialogs/d;
+
+    iget-object p1, p1, Lcom/discord/dialogs/d;->wL:Lkotlin/jvm/functions/Function1;
+
+    if-eqz p1, :cond_0
+
+    iget-object v0, p0, Lcom/discord/dialogs/d$b$a;->wO:Lcom/discord/dialogs/d$b;
+
+    invoke-virtual {v0}, Lcom/discord/dialogs/d$b;->getAdapterPosition()I
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_0
+    iget-object p1, p0, Lcom/discord/dialogs/d$b$a;->wO:Lcom/discord/dialogs/d$b;
+
+    iget-object p1, p1, Lcom/discord/dialogs/d$b;->this$0:Lcom/discord/dialogs/d;
+
+    invoke-virtual {p1}, Lcom/discord/dialogs/d;->dismiss()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/a/b$b.smali b/com.discord/smali/com/discord/dialogs/d$b.smali
similarity index 70%
rename from com.discord/smali/com/discord/a/b$b.smali
rename to com.discord/smali/com/discord/dialogs/d$b.smali
index 049d167a2b..c0a0059d1f 100644
--- a/com.discord/smali/com/discord/a/b$b.smali
+++ b/com.discord/smali/com/discord/dialogs/d$b.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/a/b$b;
+.class public final Lcom/discord/dialogs/d$b;
 .super Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;
 .source "SelectorDialog.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/b;
+    value = Lcom/discord/dialogs/d;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -25,11 +25,11 @@
 # instance fields
 .field private final nameTv:Landroid/widget/TextView;
 
-.field final synthetic this$0:Lcom/discord/a/b;
+.field final synthetic this$0:Lcom/discord/dialogs/d;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/a/b;Landroid/view/View;)V
+.method public constructor <init>(Lcom/discord/dialogs/d;Landroid/view/View;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -43,13 +43,13 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/a/b$b;->this$0:Lcom/discord/a/b;
+    iput-object p1, p0, Lcom/discord/dialogs/d$b;->this$0:Lcom/discord/dialogs/d;
 
     invoke-direct {p0, p2}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;-><init>(Landroid/view/View;)V
 
     check-cast p2, Landroid/widget/TextView;
 
-    iput-object p2, p0, Lcom/discord/a/b$b;->nameTv:Landroid/widget/TextView;
+    iput-object p2, p0, Lcom/discord/dialogs/d$b;->nameTv:Landroid/widget/TextView;
 
     return-void
 .end method
@@ -65,15 +65,15 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/a/b$b;->nameTv:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/dialogs/d$b;->nameTv:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object p1, p0, Lcom/discord/a/b$b;->nameTv:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/dialogs/d$b;->nameTv:Landroid/widget/TextView;
 
-    new-instance v0, Lcom/discord/a/b$b$a;
+    new-instance v0, Lcom/discord/dialogs/d$b$a;
 
-    invoke-direct {v0, p0}, Lcom/discord/a/b$b$a;-><init>(Lcom/discord/a/b$b;)V
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/d$b$a;-><init>(Lcom/discord/dialogs/d$b;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
diff --git a/com.discord/smali/com/discord/a/b$c.smali b/com.discord/smali/com/discord/dialogs/d$c.smali
similarity index 56%
rename from com.discord/smali/com/discord/a/b$c.smali
rename to com.discord/smali/com/discord/dialogs/d$c.smali
index 935ba074e9..007bcd51c5 100644
--- a/com.discord/smali/com/discord/a/b$c.smali
+++ b/com.discord/smali/com/discord/dialogs/d$c.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/b$c;
+.class final Lcom/discord/dialogs/d$c;
 .super Ljava/lang/Object;
 .source "SelectorDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/a/b;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/dialogs/d;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/a/b;
+.field final synthetic this$0:Lcom/discord/dialogs/d;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/a/b;)V
+.method constructor <init>(Lcom/discord/dialogs/d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/a/b$c;->this$0:Lcom/discord/a/b;
+    iput-object p1, p0, Lcom/discord/dialogs/d$c;->this$0:Lcom/discord/dialogs/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/a/b$c;->this$0:Lcom/discord/a/b;
+    iget-object p1, p0, Lcom/discord/dialogs/d$c;->this$0:Lcom/discord/dialogs/d;
 
-    invoke-virtual {p1}, Lcom/discord/a/b;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/d;->dismiss()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/a/b$d.smali b/com.discord/smali/com/discord/dialogs/d$d.smali
similarity index 73%
rename from com.discord/smali/com/discord/a/b$d.smali
rename to com.discord/smali/com/discord/dialogs/d$d.smali
index 6fec22ff70..999d8dfd07 100644
--- a/com.discord/smali/com/discord/a/b$d.smali
+++ b/com.discord/smali/com/discord/dialogs/d$d.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/b$d;
+.class final Lcom/discord/dialogs/d$d;
 .super Lkotlin/jvm/internal/l;
 .source "SelectorDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/a/b;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/dialogs/d;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -22,21 +22,21 @@
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/LayoutInflater;",
         "Landroid/view/ViewGroup;",
-        "Lcom/discord/a/b$b;",
+        "Lcom/discord/dialogs/d$b;",
         ">;"
     }
 .end annotation
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/a/b;
+.field final synthetic this$0:Lcom/discord/dialogs/d;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/a/b;)V
+.method constructor <init>(Lcom/discord/dialogs/d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/a/b$d;->this$0:Lcom/discord/a/b;
+    iput-object p1, p0, Lcom/discord/dialogs/d$d;->this$0:Lcom/discord/dialogs/d;
 
     const/4 p1, 0x2
 
@@ -70,15 +70,15 @@
 
     move-result-object p1
 
-    new-instance p2, Lcom/discord/a/b$b;
+    new-instance p2, Lcom/discord/dialogs/d$b;
 
-    iget-object v0, p0, Lcom/discord/a/b$d;->this$0:Lcom/discord/a/b;
+    iget-object v0, p0, Lcom/discord/dialogs/d$d;->this$0:Lcom/discord/dialogs/d;
 
     const-string v1, "itemView"
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p2, v0, p1}, Lcom/discord/a/b$b;-><init>(Lcom/discord/a/b;Landroid/view/View;)V
+    invoke-direct {p2, v0, p1}, Lcom/discord/dialogs/d$b;-><init>(Lcom/discord/dialogs/d;Landroid/view/View;)V
 
     return-object p2
 .end method
diff --git a/com.discord/smali/com/discord/a/b.smali b/com.discord/smali/com/discord/dialogs/d.smali
similarity index 75%
rename from com.discord/smali/com/discord/a/b.smali
rename to com.discord/smali/com/discord/dialogs/d.smali
index fac8700857..6c00c82852 100644
--- a/com.discord/smali/com/discord/a/b.smali
+++ b/com.discord/smali/com/discord/dialogs/d.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/a/b;
+.class public final Lcom/discord/dialogs/d;
 .super Lcom/discord/app/AppDialog;
 .source "SelectorDialog.kt"
 
@@ -6,8 +6,8 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/a/b$b;,
-        Lcom/discord/a/b$a;
+        Lcom/discord/dialogs/d$b;,
+        Lcom/discord/dialogs/d$a;
     }
 .end annotation
 
@@ -15,7 +15,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final wD:Lcom/discord/a/b$a;
+.field public static final wN:Lcom/discord/dialogs/d$a;
 
 
 # instance fields
@@ -23,7 +23,7 @@
 
 .field private final titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field wB:Lkotlin/jvm/functions/Function1;
+.field wL:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -35,14 +35,14 @@
     .end annotation
 .end field
 
-.field private final wC:Lkotlin/properties/ReadOnlyProperty;
+.field private final wM:Lkotlin/properties/ReadOnlyProperty;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 7
 
-    const-class v0, Lcom/discord/a/b;
+    const-class v0, Lcom/discord/dialogs/d;
 
     const/4 v1, 0x3
 
@@ -114,13 +114,13 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/a/b;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/dialogs/d;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    new-instance v0, Lcom/discord/a/b$a;
+    new-instance v0, Lcom/discord/dialogs/d$a;
 
-    invoke-direct {v0, v3}, Lcom/discord/a/b$a;-><init>(B)V
+    invoke-direct {v0, v3}, Lcom/discord/dialogs/d$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/a/b;->wD:Lcom/discord/a/b$a;
+    sput-object v0, Lcom/discord/dialogs/d;->wN:Lcom/discord/dialogs/d$a;
 
     return-void
 .end method
@@ -130,29 +130,29 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0269
+    const v0, 0x7f0a0272
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/b;->titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/d;->titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0268
+    const v0, 0x7f0a0271
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/b;->wC:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/d;->wM:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0254
+    const v0, 0x7f0a025d
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/b;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/d;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
@@ -160,9 +160,9 @@
 .method private final dS()Landroidx/recyclerview/widget/RecyclerView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/a/b;->wC:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/d;->wM:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/a/b;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/dialogs/d;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -192,7 +192,7 @@
 
     invoke-super {p0}, Lcom/discord/app/AppDialog;->onPause()V
 
-    invoke-virtual {p0}, Lcom/discord/a/b;->dismiss()V
+    invoke-virtual {p0}, Lcom/discord/dialogs/d;->dismiss()V
 
     return-void
 .end method
@@ -206,9 +206,9 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    iget-object p1, p0, Lcom/discord/a/b;->titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object p1, p0, Lcom/discord/dialogs/d;->titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v0, Lcom/discord/a/b;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v0, Lcom/discord/dialogs/d;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v1, 0x0
 
@@ -220,7 +220,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    invoke-virtual {p0}, Lcom/discord/a/b;->getArgumentsOrDefault()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/discord/dialogs/d;->getArgumentsOrDefault()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -236,9 +236,9 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object p1, p0, Lcom/discord/a/b;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object p1, p0, Lcom/discord/dialogs/d;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v0, Lcom/discord/a/b;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v0, Lcom/discord/dialogs/d;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -250,15 +250,15 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    new-instance v0, Lcom/discord/a/b$c;
+    new-instance v0, Lcom/discord/dialogs/d$c;
 
-    invoke-direct {v0, p0}, Lcom/discord/a/b$c;-><init>(Lcom/discord/a/b;)V
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/d$c;-><init>(Lcom/discord/dialogs/d;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-virtual {p0}, Lcom/discord/a/b;->getArgumentsOrDefault()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/discord/dialogs/d;->getArgumentsOrDefault()Landroid/os/Bundle;
 
     move-result-object p1
 
@@ -270,7 +270,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dS()Landroidx/recyclerview/widget/RecyclerView;
+    invoke-direct {p0}, Lcom/discord/dialogs/d;->dS()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object v0
 
@@ -280,9 +280,9 @@
 
     move-result-object p1
 
-    new-instance v3, Lcom/discord/a/b$d;
+    new-instance v3, Lcom/discord/dialogs/d$d;
 
-    invoke-direct {v3, p0}, Lcom/discord/a/b$d;-><init>(Lcom/discord/a/b;)V
+    invoke-direct {v3, p0}, Lcom/discord/dialogs/d$d;-><init>(Lcom/discord/dialogs/d;)V
 
     check-cast v3, Lkotlin/jvm/functions/Function2;
 
@@ -292,7 +292,7 @@
 
     invoke-virtual {v0, v2}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dS()Landroidx/recyclerview/widget/RecyclerView;
+    invoke-direct {p0}, Lcom/discord/dialogs/d;->dS()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object p1
 
@@ -311,7 +311,7 @@
 
     sget-object p1, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->Companion:Lcom/discord/utilities/views/SimpleRecyclerAdapter$Companion;
 
-    invoke-direct {p0}, Lcom/discord/a/b;->dS()Landroidx/recyclerview/widget/RecyclerView;
+    invoke-direct {p0}, Lcom/discord/dialogs/d;->dS()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/a/c$a$a.smali b/com.discord/smali/com/discord/dialogs/e$a$a.smali
similarity index 70%
rename from com.discord/smali/com/discord/a/c$a$a.smali
rename to com.discord/smali/com/discord/dialogs/e$a$a.smali
index b0d09cd8fd..6330a250cf 100644
--- a/com.discord/smali/com/discord/a/c$a$a.smali
+++ b/com.discord/smali/com/discord/dialogs/e$a$a.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/c$a$a;
+.class final Lcom/discord/dialogs/e$a$a;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/a/c$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
+    value = Lcom/discord/dialogs/e$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -39,11 +39,11 @@
 .method constructor <init>(Ljava/lang/String;Ljava/lang/String;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/a/c$a$a;->$giftCode:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/dialogs/e$a$a;->$giftCode:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/discord/a/c$a$a;->$source:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/dialogs/e$a$a;->$source:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/discord/a/c$a$a;->$channelId:J
+    iput-wide p3, p0, Lcom/discord/dialogs/e$a$a;->$channelId:J
 
     const/4 p1, 0x1
 
@@ -69,35 +69,35 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/a/c$a$a;->$giftCode:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/dialogs/e$a$a;->$giftCode:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/discord/a/c$a$a;->$source:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/dialogs/e$a$a;->$source:Ljava/lang/String;
 
-    iget-wide v3, p0, Lcom/discord/a/c$a$a;->$channelId:J
+    iget-wide v3, p0, Lcom/discord/dialogs/e$a$a;->$channelId:J
 
     invoke-virtual {v0, v1, v2, v3, v4}, Lcom/discord/stores/StoreAnalytics;->trackOpenGiftAcceptModal(Ljava/lang/String;Ljava/lang/String;J)V
 
-    new-instance v0, Lcom/discord/a/c;
+    new-instance v0, Lcom/discord/dialogs/e;
 
-    invoke-direct {v0}, Lcom/discord/a/c;-><init>()V
+    invoke-direct {v0}, Lcom/discord/dialogs/e;-><init>()V
 
     new-instance v1, Landroid/os/Bundle;
 
     invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
 
-    iget-object v2, p0, Lcom/discord/a/c$a$a;->$giftCode:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/dialogs/e$a$a;->$giftCode:Ljava/lang/String;
 
     const-string v3, "ARG_GIFT_CODE"
 
     invoke-virtual {v1, v3, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lcom/discord/a/c;->setArguments(Landroid/os/Bundle;)V
+    invoke-virtual {v0, v1}, Lcom/discord/dialogs/e;->setArguments(Landroid/os/Bundle;)V
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object p1
 
-    const-class v1, Lcom/discord/a/c;
+    const-class v1, Lcom/discord/dialogs/e;
 
     invoke-static {v1}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -107,7 +107,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, p1, v1}, Lcom/discord/a/c;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+    invoke-virtual {v0, p1, v1}, Lcom/discord/dialogs/e;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
diff --git a/com.discord/smali/com/discord/a/c$a.smali b/com.discord/smali/com/discord/dialogs/e$a.smali
similarity index 83%
rename from com.discord/smali/com/discord/a/c$a.smali
rename to com.discord/smali/com/discord/dialogs/e$a.smali
index 8b2cf1d2d6..7fb2b82d39 100644
--- a/com.discord/smali/com/discord/a/c$a.smali
+++ b/com.discord/smali/com/discord/dialogs/e$a.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/a/c$a;
+.class public final Lcom/discord/dialogs/e$a;
 .super Ljava/lang/Object;
 .source "WidgetGiftAcceptDialog.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/c;
+    value = Lcom/discord/dialogs/e;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 .method public synthetic constructor <init>(B)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/a/c$a;-><init>()V
+    invoke-direct {p0}, Lcom/discord/dialogs/e$a;-><init>()V
 
     return-void
 .end method
@@ -48,7 +48,7 @@
 
     new-instance v2, Lcom/discord/stores/StoreNotices$Notice;
 
-    invoke-static/range {p0 .. p0}, Lcom/discord/a/c$a;->getNoticeName(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p0 .. p0}, Lcom/discord/dialogs/e$a;->getNoticeName(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -56,7 +56,7 @@
 
     new-array v3, v3, [Lkotlin/reflect/b;
 
-    const-class v5, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+    const-class v5, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
     invoke-static {v5}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -76,15 +76,15 @@
 
     aput-object v5, v3, v6
 
-    invoke-static {v3}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v3}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v10
 
-    new-instance v3, Lcom/discord/a/c$a$a;
+    new-instance v3, Lcom/discord/dialogs/e$a$a;
 
     move-wide/from16 v5, p2
 
-    invoke-direct {v3, v0, v1, v5, v6}, Lcom/discord/a/c$a$a;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
+    invoke-direct {v3, v0, v1, v5, v6}, Lcom/discord/dialogs/e$a$a;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
 
     move-object v15, v3
 
diff --git a/com.discord/smali/com/discord/a/c$c.smali b/com.discord/smali/com/discord/dialogs/e$b.smali
similarity index 58%
rename from com.discord/smali/com/discord/a/c$c.smali
rename to com.discord/smali/com/discord/dialogs/e$b.smali
index 57f580d5ac..62bc890e54 100644
--- a/com.discord/smali/com/discord/a/c$c.smali
+++ b/com.discord/smali/com/discord/dialogs/e$b.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/c$c;
+.class final Lcom/discord/dialogs/e$b;
 .super Ljava/lang/Object;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/c;
+    value = Lcom/discord/dialogs/e;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/a/c;
+.field final synthetic this$0:Lcom/discord/dialogs/e;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/a/c;)V
+.method constructor <init>(Lcom/discord/dialogs/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/a/c$c;->this$0:Lcom/discord/a/c;
+    iput-object p1, p0, Lcom/discord/dialogs/e$b;->this$0:Lcom/discord/dialogs/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/a/c$c;->this$0:Lcom/discord/a/c;
+    iget-object p1, p0, Lcom/discord/dialogs/e$b;->this$0:Lcom/discord/dialogs/e;
 
-    invoke-virtual {p1}, Lcom/discord/a/c;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/e;->dismiss()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/a/c$e.smali b/com.discord/smali/com/discord/dialogs/e$c.smali
similarity index 58%
rename from com.discord/smali/com/discord/a/c$e.smali
rename to com.discord/smali/com/discord/dialogs/e$c.smali
index fc29e4c8b6..2b4c49e81d 100644
--- a/com.discord/smali/com/discord/a/c$e.smali
+++ b/com.discord/smali/com/discord/dialogs/e$c.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/c$e;
+.class final Lcom/discord/dialogs/e$c;
 .super Ljava/lang/Object;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/c;
+    value = Lcom/discord/dialogs/e;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/a/c;
+.field final synthetic this$0:Lcom/discord/dialogs/e;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/a/c;)V
+.method constructor <init>(Lcom/discord/dialogs/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/a/c$e;->this$0:Lcom/discord/a/c;
+    iput-object p1, p0, Lcom/discord/dialogs/e$c;->this$0:Lcom/discord/dialogs/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/a/c$e;->this$0:Lcom/discord/a/c;
+    iget-object p1, p0, Lcom/discord/dialogs/e$c;->this$0:Lcom/discord/dialogs/e;
 
-    invoke-virtual {p1}, Lcom/discord/a/c;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/e;->dismiss()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/a/c$d.smali b/com.discord/smali/com/discord/dialogs/e$d.smali
similarity index 76%
rename from com.discord/smali/com/discord/a/c$d.smali
rename to com.discord/smali/com/discord/dialogs/e$d.smali
index a124cf15f9..3469eccd0a 100644
--- a/com.discord/smali/com/discord/a/c$d.smali
+++ b/com.discord/smali/com/discord/dialogs/e$d.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/c$d;
+.class final Lcom/discord/dialogs/e$d;
 .super Ljava/lang/Object;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/c;
+    value = Lcom/discord/dialogs/e;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic wI:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
+.field final synthetic wS:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/a/c$d;->wI:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
+    iput-object p1, p0, Lcom/discord/dialogs/e$d;->wS:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,7 +43,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/a/c$d;->wI:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
+    iget-object v0, p0, Lcom/discord/dialogs/e$d;->wS:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;->getGift()Lcom/discord/models/domain/ModelGift;
 
diff --git a/com.discord/smali/com/discord/a/c$f.smali b/com.discord/smali/com/discord/dialogs/e$e.smali
similarity index 58%
rename from com.discord/smali/com/discord/a/c$f.smali
rename to com.discord/smali/com/discord/dialogs/e$e.smali
index a019b95106..70a1154deb 100644
--- a/com.discord/smali/com/discord/a/c$f.smali
+++ b/com.discord/smali/com/discord/dialogs/e$e.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/c$f;
+.class final Lcom/discord/dialogs/e$e;
 .super Ljava/lang/Object;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/c;
+    value = Lcom/discord/dialogs/e;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/a/c;
+.field final synthetic this$0:Lcom/discord/dialogs/e;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/a/c;)V
+.method constructor <init>(Lcom/discord/dialogs/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/a/c$f;->this$0:Lcom/discord/a/c;
+    iput-object p1, p0, Lcom/discord/dialogs/e$e;->this$0:Lcom/discord/dialogs/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/a/c$f;->this$0:Lcom/discord/a/c;
+    iget-object p1, p0, Lcom/discord/dialogs/e$e;->this$0:Lcom/discord/dialogs/e;
 
-    invoke-virtual {p1}, Lcom/discord/a/c;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/e;->dismiss()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/a/c$b.smali b/com.discord/smali/com/discord/dialogs/e$f.smali
similarity index 58%
rename from com.discord/smali/com/discord/a/c$b.smali
rename to com.discord/smali/com/discord/dialogs/e$f.smali
index 725997c434..b8a4786877 100644
--- a/com.discord/smali/com/discord/a/c$b.smali
+++ b/com.discord/smali/com/discord/dialogs/e$f.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/c$b;
+.class final Lcom/discord/dialogs/e$f;
 .super Ljava/lang/Object;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/c;
+    value = Lcom/discord/dialogs/e;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/a/c;
+.field final synthetic this$0:Lcom/discord/dialogs/e;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/a/c;)V
+.method constructor <init>(Lcom/discord/dialogs/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/a/c$b;->this$0:Lcom/discord/a/c;
+    iput-object p1, p0, Lcom/discord/dialogs/e$f;->this$0:Lcom/discord/dialogs/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/a/c$b;->this$0:Lcom/discord/a/c;
+    iget-object p1, p0, Lcom/discord/dialogs/e$f;->this$0:Lcom/discord/dialogs/e;
 
-    invoke-virtual {p1}, Lcom/discord/a/c;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/e;->dismiss()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/a/c$g.smali b/com.discord/smali/com/discord/dialogs/e$g.smali
similarity index 80%
rename from com.discord/smali/com/discord/a/c$g.smali
rename to com.discord/smali/com/discord/dialogs/e$g.smali
index c40ee1ced6..2d57ae0e18 100644
--- a/com.discord/smali/com/discord/a/c$g.smali
+++ b/com.discord/smali/com/discord/dialogs/e$g.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/c$g;
+.class final Lcom/discord/dialogs/e$g;
 .super Ljava/lang/Object;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/a/c;
+    value = Lcom/discord/dialogs/e;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -25,7 +25,7 @@
 .method constructor <init>(Lcom/discord/models/domain/ModelGift;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/a/c$g;->$gift:Lcom/discord/models/domain/ModelGift;
+    iput-object p1, p0, Lcom/discord/dialogs/e$g;->$gift:Lcom/discord/models/domain/ModelGift;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,7 +43,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/a/c$g;->$gift:Lcom/discord/models/domain/ModelGift;
+    iget-object v0, p0, Lcom/discord/dialogs/e$g;->$gift:Lcom/discord/models/domain/ModelGift;
 
     invoke-virtual {p1, v0}, Lcom/discord/stores/StoreGifting;->acceptGift(Lcom/discord/models/domain/ModelGift;)V
 
diff --git a/com.discord/smali/com/discord/a/c$h.smali b/com.discord/smali/com/discord/dialogs/e$h.smali
similarity index 78%
rename from com.discord/smali/com/discord/a/c$h.smali
rename to com.discord/smali/com/discord/dialogs/e$h.smali
index 2234c91d14..9e5e6b1a9b 100644
--- a/com.discord/smali/com/discord/a/c$h.smali
+++ b/com.discord/smali/com/discord/dialogs/e$h.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/c$h;
+.class final Lcom/discord/dialogs/e$h;
 .super Ljava/lang/Object;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/a/c;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/dialogs/e;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,18 +33,18 @@
 
 
 # static fields
-.field public static final wJ:Lcom/discord/a/c$h;
+.field public static final wT:Lcom/discord/dialogs/e$h;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/a/c$h;
+    new-instance v0, Lcom/discord/dialogs/e$h;
 
-    invoke-direct {v0}, Lcom/discord/a/c$h;-><init>()V
+    invoke-direct {v0}, Lcom/discord/dialogs/e$h;-><init>()V
 
-    sput-object v0, Lcom/discord/a/c$h;->wJ:Lcom/discord/a/c$h;
+    sput-object v0, Lcom/discord/dialogs/e$h;->wT:Lcom/discord/dialogs/e$h;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/a/c$i.smali b/com.discord/smali/com/discord/dialogs/e$i.smali
similarity index 68%
rename from com.discord/smali/com/discord/a/c$i.smali
rename to com.discord/smali/com/discord/dialogs/e$i.smali
index 36680a181d..e43ea791fc 100644
--- a/com.discord/smali/com/discord/a/c$i.smali
+++ b/com.discord/smali/com/discord/dialogs/e$i.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/c$i;
+.class final Lcom/discord/dialogs/e$i;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/a/c;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/dialogs/e;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/a/c;
+.field final synthetic this$0:Lcom/discord/dialogs/e;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/a/c;)V
+.method constructor <init>(Lcom/discord/dialogs/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/a/c$i;->this$0:Lcom/discord/a/c;
+    iput-object p1, p0, Lcom/discord/dialogs/e$i;->this$0:Lcom/discord/dialogs/e;
 
     const/4 p1, 0x1
 
@@ -55,11 +55,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/a/c$i;->this$0:Lcom/discord/a/c;
+    iget-object p1, p0, Lcom/discord/dialogs/e$i;->this$0:Lcom/discord/dialogs/e;
 
-    invoke-virtual {p1}, Lcom/discord/a/c;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/e;->dismiss()V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/a/c$j.smali b/com.discord/smali/com/discord/dialogs/e$j.smali
similarity index 67%
rename from com.discord/smali/com/discord/a/c$j.smali
rename to com.discord/smali/com/discord/dialogs/e$j.smali
index 0d424d1bb0..657b5bc595 100644
--- a/com.discord/smali/com/discord/a/c$j.smali
+++ b/com.discord/smali/com/discord/dialogs/e$j.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/a/c$j;
+.class final Lcom/discord/dialogs/e$j;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/a/c;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/dialogs/e;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,14 +33,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/a/c;
+.field final synthetic this$0:Lcom/discord/dialogs/e;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/a/c;)V
+.method constructor <init>(Lcom/discord/dialogs/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/a/c$j;->this$0:Lcom/discord/a/c;
+    iput-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
 
     const/4 p1, 0x1
 
@@ -80,7 +80,7 @@
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+    sget-object v1, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
     const-string v2, "me"
 
@@ -90,19 +90,19 @@
 
     move-result-object v2
 
-    invoke-virtual {v1, p1, v2}, Lcom/discord/utilities/nitro/NitroUtils;->isAcceptableNitroGift(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGift;)Z
+    invoke-virtual {v1, p1, v2}, Lcom/discord/utilities/premium/PremiumUtils;->isAcceptableNitroGift(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGift;)Z
 
     move-result p1
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/a/c$j;->this$0:Lcom/discord/a/c;
+    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lcom/discord/a/c;->a(Lcom/discord/a/c;Lcom/discord/models/domain/ModelGift;)V
+    invoke-static {p1, v0}, Lcom/discord/dialogs/e;->a(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
 
     goto :goto_0
 
@@ -117,13 +117,13 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/discord/a/c$j;->this$0:Lcom/discord/a/c;
+    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lcom/discord/a/c;->b(Lcom/discord/a/c;Lcom/discord/models/domain/ModelGift;)V
+    invoke-static {p1, v0}, Lcom/discord/dialogs/e;->b(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
 
     goto :goto_0
 
@@ -146,24 +146,24 @@
 
     if-ne p1, v1, :cond_2
 
-    iget-object p1, p0, Lcom/discord/a/c$j;->this$0:Lcom/discord/a/c;
+    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lcom/discord/a/c;->c(Lcom/discord/a/c;Lcom/discord/models/domain/ModelGift;)V
+    invoke-static {p1, v0}, Lcom/discord/dialogs/e;->c(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
 
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/discord/a/c$j;->this$0:Lcom/discord/a/c;
+    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lcom/discord/a/c;->d(Lcom/discord/a/c;Lcom/discord/models/domain/ModelGift;)V
+    invoke-static {p1, v0}, Lcom/discord/dialogs/e;->d(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
 
     goto :goto_0
 
@@ -172,7 +172,7 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/discord/a/c$j;->this$0:Lcom/discord/a/c;
+    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
 
     check-cast v0, Lcom/discord/stores/StoreGifting$GiftState$Redeeming;
 
@@ -180,7 +180,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lcom/discord/a/c;->e(Lcom/discord/a/c;Lcom/discord/models/domain/ModelGift;)V
+    invoke-static {p1, v0}, Lcom/discord/dialogs/e;->e(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
 
     goto :goto_0
 
@@ -189,21 +189,21 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/discord/a/c$j;->this$0:Lcom/discord/a/c;
+    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
 
     check-cast v0, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
 
-    invoke-static {p1, v0}, Lcom/discord/a/c;->a(Lcom/discord/a/c;Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
+    invoke-static {p1, v0}, Lcom/discord/dialogs/e;->a(Lcom/discord/dialogs/e;Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
 
     goto :goto_0
 
     :cond_5
-    iget-object p1, p0, Lcom/discord/a/c$j;->this$0:Lcom/discord/a/c;
+    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
 
-    invoke-virtual {p1}, Lcom/discord/a/c;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/e;->dismiss()V
 
     :goto_0
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/a/c.smali b/com.discord/smali/com/discord/dialogs/e.smali
similarity index 70%
rename from com.discord/smali/com/discord/a/c.smali
rename to com.discord/smali/com/discord/dialogs/e.smali
index 56025e3b55..bc93996978 100644
--- a/com.discord/smali/com/discord/a/c.smali
+++ b/com.discord/smali/com/discord/dialogs/e.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/a/c;
+.class public final Lcom/discord/dialogs/e;
 .super Lcom/discord/app/AppDialog;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -6,7 +6,7 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/a/c$a;
+        Lcom/discord/dialogs/e$a;
     }
 .end annotation
 
@@ -14,7 +14,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final wH:Lcom/discord/a/c$a;
+.field public static final wR:Lcom/discord/dialogs/e$a;
 
 
 # instance fields
@@ -24,16 +24,16 @@
 
 .field private final progress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final wF:Lkotlin/properties/ReadOnlyProperty;
+.field private final wP:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final wG:Lkotlin/properties/ReadOnlyProperty;
+.field private final wQ:Lkotlin/properties/ReadOnlyProperty;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 7
 
-    const-class v0, Lcom/discord/a/c;
+    const-class v0, Lcom/discord/dialogs/e;
 
     const/4 v1, 0x5
 
@@ -149,13 +149,13 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/a/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/dialogs/e;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    new-instance v0, Lcom/discord/a/c$a;
+    new-instance v0, Lcom/discord/dialogs/e$a;
 
-    invoke-direct {v0, v3}, Lcom/discord/a/c$a;-><init>(B)V
+    invoke-direct {v0, v3}, Lcom/discord/dialogs/e$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/a/c;->wH:Lcom/discord/a/c$a;
+    sput-object v0, Lcom/discord/dialogs/e;->wR:Lcom/discord/dialogs/e$a;
 
     return-void
 .end method
@@ -171,7 +171,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/c;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/e;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a0008
 
@@ -179,7 +179,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/c;->dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/e;->dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a0007
 
@@ -187,7 +187,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/c;->wF:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/e;->wP:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a0009
 
@@ -195,7 +195,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/c;->wG:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/e;->wQ:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a000b
 
@@ -203,23 +203,23 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/a/c;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/e;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
 
-.method public static final synthetic a(Lcom/discord/a/c;Lcom/discord/models/domain/ModelGift;)V
+.method public static final synthetic a(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
     .locals 2
 
-    invoke-direct {p0, p1}, Lcom/discord/a/c;->a(Lcom/discord/models/domain/ModelGift;)V
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/e;->a(Lcom/discord/models/domain/ModelGift;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dT()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dT()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
-    const v0, 0x7f120757
+    const v0, 0x7f120772
 
-    invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v0}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
 
     move-result-object v0
 
@@ -227,13 +227,13 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dU()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dU()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
-    const v0, 0x7f12073a
+    const v0, 0x7f120756
 
-    invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v0}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
 
     move-result-object v0
 
@@ -241,17 +241,17 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/discord/a/c;->getContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f12074f
+    const v1, 0x7f12076b
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -265,13 +265,13 @@
     :goto_0
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/a/c$f;
+    new-instance v0, Lcom/discord/dialogs/e$f;
 
-    invoke-direct {v0, p0}, Lcom/discord/a/c$f;-><init>(Lcom/discord/a/c;)V
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/e$f;-><init>(Lcom/discord/dialogs/e;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
@@ -280,22 +280,22 @@
     return-void
 .end method
 
-.method public static final synthetic a(Lcom/discord/a/c;Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
+.method public static final synthetic a(Lcom/discord/dialogs/e;Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
     .locals 5
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;->getGift()Lcom/discord/models/domain/ModelGift;
 
     move-result-object v0
 
-    invoke-direct {p0, v0}, Lcom/discord/a/c;->a(Lcom/discord/models/domain/ModelGift;)V
+    invoke-direct {p0, v0}, Lcom/discord/dialogs/e;->a(Lcom/discord/models/domain/ModelGift;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dT()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dT()Lcom/discord/app/AppTextView;
 
     move-result-object v0
 
-    const v1, 0x7f120757
+    const v1, 0x7f120772
 
-    invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v1}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
 
     move-result-object v1
 
@@ -303,13 +303,13 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dU()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dU()Lcom/discord/app/AppTextView;
 
     move-result-object v0
 
-    const v1, 0x7f12074b
+    const v1, 0x7f120767
 
-    invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v1}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
@@ -327,11 +327,11 @@
 
     if-eqz v0, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dU()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dU()Lcom/discord/app/AppTextView;
 
     move-result-object v0
 
-    invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v1}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
 
     move-result-object v1
 
@@ -339,17 +339,17 @@
 
     invoke-virtual {v0, v1, v3}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/discord/a/c;->getContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getContext()Landroid/content/Context;
 
     move-result-object v1
 
     if-eqz v1, :cond_0
 
-    const v2, 0x7f120ee7
+    const v2, 0x7f120f1e
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -358,13 +358,13 @@
     :cond_0
     invoke-virtual {v0, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object p0
 
-    new-instance v0, Lcom/discord/a/c$d;
+    new-instance v0, Lcom/discord/dialogs/e$d;
 
-    invoke-direct {v0, p1}, Lcom/discord/a/c$d;-><init>(Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
+    invoke-direct {v0, p1}, Lcom/discord/dialogs/e$d;-><init>(Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
@@ -390,11 +390,11 @@
 
     if-ne v0, v1, :cond_3
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dU()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dU()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
-    const v0, 0x7f12073e
+    const v0, 0x7f12075a
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
 
@@ -415,11 +415,11 @@
 
     if-ne v0, v1, :cond_5
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dU()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dU()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
-    const v0, 0x7f12073a
+    const v0, 0x7f120756
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
 
@@ -440,11 +440,11 @@
 
     if-ne v0, v1, :cond_7
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dU()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dU()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
-    const v0, 0x7f12073b
+    const v0, 0x7f120757
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
 
@@ -465,27 +465,27 @@
 
     if-ne p1, v0, :cond_9
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dU()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dU()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
-    const v0, 0x7f120739
+    const v0, 0x7f120755
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
 
     :cond_9
     :goto_3
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/discord/a/c;->getContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
     if-eqz v0, :cond_a
 
-    const v1, 0x7f12074f
+    const v1, 0x7f12076b
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -494,13 +494,13 @@
     :cond_a
     invoke-virtual {p1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/a/c$e;
+    new-instance v0, Lcom/discord/dialogs/e$e;
 
-    invoke-direct {v0, p0}, Lcom/discord/a/c$e;-><init>(Lcom/discord/a/c;)V
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/e$e;-><init>(Lcom/discord/dialogs/e;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
@@ -520,15 +520,15 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dV()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dV()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object v0
 
     check-cast v0, Landroid/widget/ImageView;
 
-    sget-object v2, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+    sget-object v2, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
-    invoke-virtual {v2, p1}, Lcom/discord/utilities/nitro/NitroUtils;->getNitroGiftIcon(Lcom/discord/models/domain/ModelGift;)I
+    invoke-virtual {v2, p1}, Lcom/discord/utilities/premium/PremiumUtils;->getNitroGiftIcon(Lcom/discord/models/domain/ModelGift;)I
 
     move-result p1
 
@@ -600,14 +600,14 @@
     move-result-object v1
 
     :cond_2
-    invoke-direct {p0}, Lcom/discord/a/c;->dV()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dV()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object p1
 
     invoke-virtual {p1, v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
 
     :goto_1
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object p1
 
@@ -615,7 +615,7 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setVisibility(I)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dX()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dX()Landroid/view/View;
 
     move-result-object p1
 
@@ -644,7 +644,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/a/d;->$EnumSwitchMapping$0:[I
+    sget-object v1, Lcom/discord/dialogs/f;->$EnumSwitchMapping$0:[I
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
 
@@ -675,7 +675,7 @@
     const v0, 0x7f10004f
 
     :goto_0
-    invoke-virtual {p0}, Lcom/discord/a/c;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/dialogs/e;->requireContext()Landroid/content/Context;
 
     move-result-object v3
 
@@ -709,11 +709,15 @@
 
     move-result-object v0
 
+    const-string v3, "requireContext().resourc\u2026t, subPlan.intervalCount)"
+
+    invoke-static {v0, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getInterval()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
     move-result-object v3
 
-    sget-object v4, Lcom/discord/a/d;->$EnumSwitchMapping$1:[I
+    sget-object v4, Lcom/discord/dialogs/f;->$EnumSwitchMapping$1:[I
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
 
@@ -727,7 +731,7 @@
 
     if-ne v3, v1, :cond_3
 
-    const v3, 0x7f12075b
+    const v3, 0x7f120776
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -743,7 +747,7 @@
 
     aput-object v0, v1, v2
 
-    invoke-virtual {p0, v3, v1}, Lcom/discord/a/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v3, v1}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -759,7 +763,7 @@
     throw p1
 
     :cond_4
-    const v3, 0x7f12075a
+    const v3, 0x7f120775
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -775,7 +779,7 @@
 
     aput-object v0, v1, v2
 
-    invoke-virtual {p0, v3, v1}, Lcom/discord/a/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v3, v1}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -784,10 +788,10 @@
     return-object p1
 .end method
 
-.method public static final synthetic b(Lcom/discord/a/c;Lcom/discord/models/domain/ModelGift;)V
+.method public static final synthetic b(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
     .locals 6
 
-    invoke-direct {p0, p1}, Lcom/discord/a/c;->a(Lcom/discord/models/domain/ModelGift;)V
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/e;->a(Lcom/discord/models/domain/ModelGift;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
 
@@ -811,7 +815,7 @@
     const-string v0, ""
 
     :cond_1
-    invoke-direct {p0, p1}, Lcom/discord/a/c;->b(Lcom/discord/models/domain/ModelGift;)Ljava/lang/String;
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/e;->b(Lcom/discord/models/domain/ModelGift;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -825,22 +829,22 @@
 
     if-eqz v2, :cond_2
 
-    const v2, 0x7f120759
+    const v2, 0x7f120774
 
     new-array v5, v3, [Ljava/lang/Object;
 
     aput-object v0, v5, v4
 
-    invoke-virtual {p0, v2, v5}, Lcom/discord/a/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v2, v5}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
     goto :goto_0
 
     :cond_2
-    const v2, 0x7f120758
+    const v2, 0x7f120773
 
-    invoke-virtual {p0, v2}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v2}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
@@ -855,13 +859,13 @@
 
     if-eqz v5, :cond_3
 
-    const p1, 0x7f120746
+    const p1, 0x7f120761
 
     new-array v0, v3, [Ljava/lang/Object;
 
     aput-object v1, v0, v4
 
-    invoke-virtual {p0, p1, v0}, Lcom/discord/a/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, p1, v0}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -874,26 +878,26 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f120745
+    const p1, 0x7f120762
 
     new-array v0, v3, [Ljava/lang/Object;
 
     aput-object v1, v0, v4
 
-    invoke-virtual {p0, p1, v0}, Lcom/discord/a/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, p1, v0}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
     goto :goto_1
 
     :cond_4
-    const p1, 0x7f120744
+    const p1, 0x7f120760
 
     new-array v1, v3, [Ljava/lang/Object;
 
     aput-object v0, v1, v4
 
-    invoke-virtual {p0, p1, v1}, Lcom/discord/a/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, p1, v1}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -902,7 +906,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dT()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dT()Lcom/discord/app/AppTextView;
 
     move-result-object v0
 
@@ -910,7 +914,7 @@
 
     invoke-virtual {v0, v2}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dU()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dU()Lcom/discord/app/AppTextView;
 
     move-result-object v0
 
@@ -918,17 +922,17 @@
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/discord/a/c;->getContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
     if-eqz v0, :cond_5
 
-    const v1, 0x7f120753
+    const v1, 0x7f12076f
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -942,13 +946,13 @@
     :goto_2
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/a/c$b;
+    new-instance v0, Lcom/discord/dialogs/e$b;
 
-    invoke-direct {v0, p0}, Lcom/discord/a/c$b;-><init>(Lcom/discord/a/c;)V
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/e$b;-><init>(Lcom/discord/dialogs/e;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
@@ -957,18 +961,18 @@
     return-void
 .end method
 
-.method public static final synthetic c(Lcom/discord/a/c;Lcom/discord/models/domain/ModelGift;)V
+.method public static final synthetic c(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
     .locals 2
 
-    invoke-direct {p0, p1}, Lcom/discord/a/c;->a(Lcom/discord/models/domain/ModelGift;)V
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/e;->a(Lcom/discord/models/domain/ModelGift;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dT()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dT()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
-    const v0, 0x7f120757
+    const v0, 0x7f120772
 
-    invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v0}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
 
     move-result-object v0
 
@@ -976,13 +980,13 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dU()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dU()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
-    const v0, 0x7f120736
+    const v0, 0x7f120752
 
-    invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v0}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
 
     move-result-object v0
 
@@ -992,17 +996,17 @@
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/discord/a/c;->getContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f12074f
+    const v1, 0x7f12076b
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -1016,13 +1020,13 @@
     :goto_0
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/a/c$c;
+    new-instance v0, Lcom/discord/dialogs/e$c;
 
-    invoke-direct {v0, p0}, Lcom/discord/a/c$c;-><init>(Lcom/discord/a/c;)V
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/e$c;-><init>(Lcom/discord/dialogs/e;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
@@ -1031,10 +1035,10 @@
     return-void
 .end method
 
-.method public static final synthetic d(Lcom/discord/a/c;Lcom/discord/models/domain/ModelGift;)V
+.method public static final synthetic d(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
     .locals 7
 
-    invoke-direct {p0, p1}, Lcom/discord/a/c;->a(Lcom/discord/models/domain/ModelGift;)V
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/e;->a(Lcom/discord/models/domain/ModelGift;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
 
@@ -1070,22 +1074,22 @@
 
     if-eqz v2, :cond_1
 
-    const v2, 0x7f120756
+    const v2, 0x7f120771
 
     new-array v5, v3, [Ljava/lang/Object;
 
     aput-object v0, v5, v4
 
-    invoke-virtual {p0, v2, v5}, Lcom/discord/a/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v2, v5}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
     goto :goto_1
 
     :cond_1
-    const v2, 0x7f120755
+    const v2, 0x7f120770
 
-    invoke-virtual {p0, v2}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v2}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
@@ -1100,7 +1104,7 @@
 
     if-eqz v5, :cond_2
 
-    const v5, 0x7f120738
+    const v5, 0x7f120754
 
     const/4 v6, 0x2
 
@@ -1108,26 +1112,26 @@
 
     aput-object v0, v6, v4
 
-    invoke-direct {p0, p1}, Lcom/discord/a/c;->b(Lcom/discord/models/domain/ModelGift;)Ljava/lang/String;
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/e;->b(Lcom/discord/models/domain/ModelGift;)Ljava/lang/String;
 
     move-result-object v0
 
     aput-object v0, v6, v3
 
-    invoke-virtual {p0, v5, v6}, Lcom/discord/a/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v5, v6}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
     goto :goto_2
 
     :cond_2
-    const v5, 0x7f120737
+    const v5, 0x7f120753
 
     new-array v3, v3, [Ljava/lang/Object;
 
     aput-object v0, v3, v4
 
-    invoke-virtual {p0, v5, v3}, Lcom/discord/a/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v5, v3}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -1136,7 +1140,7 @@
 
     invoke-static {v0, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dT()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dT()Lcom/discord/app/AppTextView;
 
     move-result-object v3
 
@@ -1144,7 +1148,7 @@
 
     invoke-virtual {v3, v2}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dU()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dU()Lcom/discord/app/AppTextView;
 
     move-result-object v2
 
@@ -1152,17 +1156,17 @@
 
     invoke-virtual {v2, v0, v3}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/discord/a/c;->getContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getContext()Landroid/content/Context;
 
     move-result-object v2
 
     if-eqz v2, :cond_3
 
-    const v1, 0x7f12074d
+    const v1, 0x7f120769
 
     invoke-virtual {v2, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -1171,13 +1175,13 @@
     :cond_3
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object p0
 
-    new-instance v0, Lcom/discord/a/c$g;
+    new-instance v0, Lcom/discord/dialogs/e$g;
 
-    invoke-direct {v0, p1}, Lcom/discord/a/c$g;-><init>(Lcom/discord/models/domain/ModelGift;)V
+    invoke-direct {v0, p1}, Lcom/discord/dialogs/e$g;-><init>(Lcom/discord/models/domain/ModelGift;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
@@ -1189,9 +1193,9 @@
 .method private final dT()Lcom/discord/app/AppTextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/a/c;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/e;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/a/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/dialogs/e;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -1209,9 +1213,9 @@
 .method private final dU()Lcom/discord/app/AppTextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/a/c;->dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/e;->dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/a/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/dialogs/e;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -1229,9 +1233,9 @@
 .method private final dV()Lcom/facebook/drawee/view/SimpleDraweeView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/a/c;->wF:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/e;->wP:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/a/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/dialogs/e;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -1249,9 +1253,9 @@
 .method private final dW()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/a/c;->wG:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/e;->wQ:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/a/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/dialogs/e;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x3
 
@@ -1269,9 +1273,9 @@
 .method private final dX()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/a/c;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/e;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/a/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/dialogs/e;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x4
 
@@ -1286,10 +1290,10 @@
     return-object v0
 .end method
 
-.method public static final synthetic e(Lcom/discord/a/c;Lcom/discord/models/domain/ModelGift;)V
+.method public static final synthetic e(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
     .locals 6
 
-    invoke-direct {p0, p1}, Lcom/discord/a/c;->a(Lcom/discord/models/domain/ModelGift;)V
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/e;->a(Lcom/discord/models/domain/ModelGift;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
 
@@ -1313,7 +1317,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-direct {p0}, Lcom/discord/a/c;->dW()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dW()Landroid/widget/Button;
 
     move-result-object v1
 
@@ -1321,7 +1325,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setVisibility(I)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dX()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dX()Landroid/view/View;
 
     move-result-object v1
 
@@ -1337,22 +1341,22 @@
 
     if-eqz v1, :cond_1
 
-    const v1, 0x7f120756
+    const v1, 0x7f120771
 
     new-array v4, v3, [Ljava/lang/Object;
 
     aput-object v0, v4, v2
 
-    invoke-virtual {p0, v1, v4}, Lcom/discord/a/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v1, v4}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
     goto :goto_1
 
     :cond_1
-    const v1, 0x7f120755
+    const v1, 0x7f120770
 
-    invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v1}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
 
     move-result-object v1
 
@@ -1367,7 +1371,7 @@
 
     if-eqz v4, :cond_2
 
-    const v4, 0x7f120738
+    const v4, 0x7f120754
 
     const/4 v5, 0x2
 
@@ -1375,26 +1379,26 @@
 
     aput-object v0, v5, v2
 
-    invoke-direct {p0, p1}, Lcom/discord/a/c;->b(Lcom/discord/models/domain/ModelGift;)Ljava/lang/String;
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/e;->b(Lcom/discord/models/domain/ModelGift;)Ljava/lang/String;
 
     move-result-object p1
 
     aput-object p1, v5, v3
 
-    invoke-virtual {p0, v4, v5}, Lcom/discord/a/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v4, v5}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f120737
+    const p1, 0x7f120753
 
     new-array v3, v3, [Ljava/lang/Object;
 
     aput-object v0, v3, v2
 
-    invoke-virtual {p0, p1, v3}, Lcom/discord/a/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, p1, v3}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -1403,7 +1407,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dT()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dT()Lcom/discord/app/AppTextView;
 
     move-result-object v0
 
@@ -1411,7 +1415,7 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/a/c;->dU()Lcom/discord/app/AppTextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->dU()Lcom/discord/app/AppTextView;
 
     move-result-object p0
 
@@ -1427,7 +1431,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00b9
+    const v0, 0x7f0d00c2
 
     return v0
 .end method
@@ -1435,7 +1439,7 @@
 .method public final onDestroy()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/discord/a/c;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getArguments()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -1449,7 +1453,11 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {v0}, Lcom/discord/a/c$a;->getNoticeName(Ljava/lang/String;)Ljava/lang/String;
+    const-string v1, "it"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lcom/discord/dialogs/e$a;->getNoticeName(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -1478,7 +1486,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    invoke-virtual {p0}, Lcom/discord/a/c;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getArguments()Landroid/os/Bundle;
 
     move-result-object p1
 
@@ -1500,7 +1508,7 @@
     :goto_0
     if-nez p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/discord/a/c;->dismiss()V
+    invoke-virtual {p0}, Lcom/discord/dialogs/e;->dismiss()V
 
     return-void
 
@@ -1525,7 +1533,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/a/c$h;->wJ:Lcom/discord/a/c$h;
+    sget-object v2, Lcom/discord/dialogs/e$h;->wT:Lcom/discord/dialogs/e$h;
 
     check-cast v2, Lrx/functions/Func2;
 
@@ -1555,9 +1563,9 @@
 
     const/4 v6, 0x0
 
-    new-instance p1, Lcom/discord/a/c$i;
+    new-instance p1, Lcom/discord/dialogs/e$i;
 
-    invoke-direct {p1, p0}, Lcom/discord/a/c$i;-><init>(Lcom/discord/a/c;)V
+    invoke-direct {p1, p0}, Lcom/discord/dialogs/e$i;-><init>(Lcom/discord/dialogs/e;)V
 
     move-object v7, p1
 
@@ -1565,9 +1573,9 @@
 
     const/4 v8, 0x0
 
-    new-instance p1, Lcom/discord/a/c$j;
+    new-instance p1, Lcom/discord/dialogs/e$j;
 
-    invoke-direct {p1, p0}, Lcom/discord/a/c$j;-><init>(Lcom/discord/a/c;)V
+    invoke-direct {p1, p0}, Lcom/discord/dialogs/e$j;-><init>(Lcom/discord/dialogs/e;)V
 
     move-object v9, p1
 
diff --git a/com.discord/smali/com/discord/a/d.smali b/com.discord/smali/com/discord/dialogs/f.smali
similarity index 86%
rename from com.discord/smali/com/discord/a/d.smali
rename to com.discord/smali/com/discord/dialogs/f.smali
index d509b48945..d296f92a02 100644
--- a/com.discord/smali/com/discord/a/d.smali
+++ b/com.discord/smali/com/discord/dialogs/f.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/a/d;
+.class public final synthetic Lcom/discord/dialogs/f;
 .super Ljava/lang/Object;
 
 
@@ -20,7 +20,7 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/discord/a/d;->$EnumSwitchMapping$0:[I
+    sput-object v0, Lcom/discord/dialogs/f;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->MONTHLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
@@ -32,7 +32,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/a/d;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/dialogs/f;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->YEARLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
@@ -52,7 +52,7 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/discord/a/d;->$EnumSwitchMapping$1:[I
+    sput-object v0, Lcom/discord/dialogs/f;->$EnumSwitchMapping$1:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->MONTHLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
@@ -62,7 +62,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/a/d;->$EnumSwitchMapping$1:[I
+    sget-object v0, Lcom/discord/dialogs/f;->$EnumSwitchMapping$1:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->YEARLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
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 d5288f93bb..59e5563ed2 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewayDiscovery$Cache$setGatewayUrl$1;->invoke(Landroid/content/SharedPreferences$Editor;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 a08af4a6b4..dcc177ff50 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache.smali
@@ -54,7 +54,7 @@
 
     const-string v1, "sharedPreferences"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     const/4 v1, 0x0
@@ -97,7 +97,7 @@
 
     const-string v1, "sharedPreferences"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v1, Lcom/discord/gateway/GatewayDiscovery$Cache$setGatewayUrl$1;
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 03b07ef60d..9d7532640a 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 f95920c8f7..47d06a0cab 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$2.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$2;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 4fe085c250..16a8319883 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$3.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$3.smali
@@ -77,7 +77,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$3;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 22b3ba53bf..7d41063eab 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$4.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$4.smali
@@ -77,7 +77,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$4;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 9db9585557..fe9c879b5c 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$3.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$3.smali
index eceada2cec..3dbc3f9194 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$3.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$3.smali
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$3;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 def7b9183d..c2bc8ea6af 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$callConnect$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$callConnect$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$callConnect$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 64c5baffef..8f07956530 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$close$1$1;->invoke(Lcom/discord/utilities/websocket/WebSocket;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 7cfe5ddd62..1fedfcfeaf 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$close$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$close$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$close$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 1dd670ae4e..19c72a1116 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$1;->invoke(Lcom/discord/utilities/websocket/WebSocket$Opened;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 29f627f4a7..4a82afa834 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$2;->invoke(Lcom/discord/utilities/websocket/WebSocket$Closed;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 358a9e0234..aa18ad552f 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$3;->invoke(Lcom/google/gson/stream/JsonReader;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 4f8e61f419..23bbf20b19 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$4;->invoke(Lcom/discord/utilities/websocket/WebSocket$Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 f453518a23..4931276b2a 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$connect$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 b64d592d8c..06f9933e83 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$connect$2;->invoke(Lcom/discord/utilities/websocket/WebSocket;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 f8de37d51d..01d873cdb5 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$3.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$3.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$connect$3;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 b073b089b3..64b8338d5d 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$4.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$4.smali
@@ -85,7 +85,7 @@
 
     invoke-virtual {p0, p1, p2, p3}, Lcom/discord/gateway/GatewaySocket$connect$4;->invoke(Ljava/lang/String;Ljava/lang/Exception;Ljava/util/Map;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 8337ff5a20..56e5b57d35 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$discover$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$discover$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$discover$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 4b5257548d..f3b026577f 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$discover$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$discover$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$discover$2;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 8ff3a5a40e..d3f9030d74 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$discoveryFailed$delay$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 23ff51c825..73fd77cbda 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 c48e930196..c938378e41 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1$2;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 b142997ae2..2fa2eb64c2 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1.smali
@@ -62,7 +62,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 b8fa0991a2..d23c9fa29e 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$handleClose$1;->invoke(Lcom/discord/utilities/websocket/WebSocket;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 729cf2b0fa..00d91f8632 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$handleClose$delay$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 49e5746570..8cbdccf081 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatAck$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatAck$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$handleHeartbeatAck$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 d845ace84b..c4942dfab9 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1;->invoke(Lcom/discord/utilities/websocket/WebSocket;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 21a7d3ea58..115cddadb7 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$handleHeartbeatTimeout$delay$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 695099b160..23c3e88359 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleReconnect$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleReconnect$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$handleReconnect$1;->invoke(Lcom/discord/utilities/websocket/WebSocket;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$incomingParser$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$incomingParser$1.smali
index 355c8a4f33..ceeb3a4f37 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$incomingParser$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$incomingParser$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$incomingParser$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 05b8f5752d..62eb72fa53 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1.smali
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -166,7 +166,7 @@
 
     if-nez v4, :cond_1
 
-    sget-object v4, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v4, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v4, Ljava/util/List;
 
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 25f39d5e68..f5f24a7273 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$requestGuildMembers$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$requestGuildMembers$1.smali
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$requestGuildMembers$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 e058931876..8025efbc72 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$startHeartbeater$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$startHeartbeater$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$startHeartbeater$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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
new file mode 100644
index 0000000000..e67997b6f2
--- /dev/null
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$streamDelete$1.smali
@@ -0,0 +1,120 @@
+.class final Lcom/discord/gateway/GatewaySocket$streamDelete$1;
+.super Lkotlin/jvm/internal/l;
+.source "GatewaySocket.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/gateway/GatewaySocket;->streamDelete(Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $streamKey:Ljava/lang/String;
+
+.field final synthetic this$0:Lcom/discord/gateway/GatewaySocket;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/gateway/GatewaySocket;Ljava/lang/String;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/gateway/GatewaySocket$streamDelete$1;->this$0:Lcom/discord/gateway/GatewaySocket;
+
+    iput-object p2, p0, Lcom/discord/gateway/GatewaySocket$streamDelete$1;->$streamKey:Ljava/lang/String;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$streamDelete$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 12
+
+    sget-object v0, Lcom/discord/gateway/GatewaySocket;->Companion:Lcom/discord/gateway/GatewaySocket$Companion;
+
+    iget-object v1, p0, Lcom/discord/gateway/GatewaySocket$streamDelete$1;->this$0:Lcom/discord/gateway/GatewaySocket;
+
+    invoke-static {v1}, Lcom/discord/gateway/GatewaySocket;->access$getLogger$p(Lcom/discord/gateway/GatewaySocket;)Lcom/discord/utilities/logging/Logger;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    const-string v3, "Sending STREAM_DELETE: "
+
+    invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v3, p0, Lcom/discord/gateway/GatewaySocket$streamDelete$1;->$streamKey: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
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x2
+
+    const/4 v5, 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
+
+    iget-object v6, p0, Lcom/discord/gateway/GatewaySocket$streamDelete$1;->this$0:Lcom/discord/gateway/GatewaySocket;
+
+    new-instance v7, Lcom/discord/gateway/io/Outgoing;
+
+    new-instance v0, Lcom/discord/gateway/io/OutgoingPayload$DeleteStream;
+
+    iget-object v1, p0, Lcom/discord/gateway/GatewaySocket$streamDelete$1;->$streamKey:Ljava/lang/String;
+
+    invoke-direct {v0, v1}, Lcom/discord/gateway/io/OutgoingPayload$DeleteStream;-><init>(Ljava/lang/String;)V
+
+    const/16 v1, 0x13
+
+    invoke-direct {v7, v1, v0}, Lcom/discord/gateway/io/Outgoing;-><init>(ILjava/lang/Object;)V
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x6
+
+    const/4 v11, 0x0
+
+    invoke-static/range {v6 .. v11}, Lcom/discord/gateway/GatewaySocket;->send$default(Lcom/discord/gateway/GatewaySocket;Lcom/discord/gateway/io/Outgoing;ZLcom/google/gson/Gson;ILjava/lang/Object;)V
+
+    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
new file mode 100644
index 0000000000..585553be04
--- /dev/null
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$streamWatch$1.smali
@@ -0,0 +1,120 @@
+.class final Lcom/discord/gateway/GatewaySocket$streamWatch$1;
+.super Lkotlin/jvm/internal/l;
+.source "GatewaySocket.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/gateway/GatewaySocket;->streamWatch(Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $streamKey:Ljava/lang/String;
+
+.field final synthetic this$0:Lcom/discord/gateway/GatewaySocket;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/gateway/GatewaySocket;Ljava/lang/String;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/gateway/GatewaySocket$streamWatch$1;->this$0:Lcom/discord/gateway/GatewaySocket;
+
+    iput-object p2, p0, Lcom/discord/gateway/GatewaySocket$streamWatch$1;->$streamKey:Ljava/lang/String;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$streamWatch$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 12
+
+    sget-object v0, Lcom/discord/gateway/GatewaySocket;->Companion:Lcom/discord/gateway/GatewaySocket$Companion;
+
+    iget-object v1, p0, Lcom/discord/gateway/GatewaySocket$streamWatch$1;->this$0:Lcom/discord/gateway/GatewaySocket;
+
+    invoke-static {v1}, Lcom/discord/gateway/GatewaySocket;->access$getLogger$p(Lcom/discord/gateway/GatewaySocket;)Lcom/discord/utilities/logging/Logger;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    const-string v3, "Sending STREAM_WATCH: "
+
+    invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v3, p0, Lcom/discord/gateway/GatewaySocket$streamWatch$1;->$streamKey: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
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x2
+
+    const/4 v5, 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
+
+    iget-object v6, p0, Lcom/discord/gateway/GatewaySocket$streamWatch$1;->this$0:Lcom/discord/gateway/GatewaySocket;
+
+    new-instance v7, Lcom/discord/gateway/io/Outgoing;
+
+    new-instance v0, Lcom/discord/gateway/io/OutgoingPayload$WatchStream;
+
+    iget-object v1, p0, Lcom/discord/gateway/GatewaySocket$streamWatch$1;->$streamKey:Ljava/lang/String;
+
+    invoke-direct {v0, v1}, Lcom/discord/gateway/io/OutgoingPayload$WatchStream;-><init>(Ljava/lang/String;)V
+
+    const/16 v1, 0x14
+
+    invoke-direct {v7, v1, v0}, Lcom/discord/gateway/io/Outgoing;-><init>(ILjava/lang/Object;)V
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x6
+
+    const/4 v11, 0x0
+
+    invoke-static/range {v6 .. v11}, Lcom/discord/gateway/GatewaySocket;->send$default(Lcom/discord/gateway/GatewaySocket;Lcom/discord/gateway/io/Outgoing;ZLcom/google/gson/Gson;ILjava/lang/Object;)V
+
+    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 7e28983481..e545940054 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$voiceServerPing$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$voiceServerPing$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$voiceServerPing$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 3b19ac501a..ae8dfffd71 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$voiceStateUpdate$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$voiceStateUpdate$1.smali
@@ -70,7 +70,7 @@
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$voiceStateUpdate$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket.smali b/com.discord/smali/com/discord/gateway/GatewaySocket.smali
index cf12d16255..af50799e35 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket.smali
@@ -48,7 +48,7 @@
 
 .field private static final GATEWAY_URL_RESET_THRESHOLD:I = 0x4
 
-.field private static final GATEWAY_VERSION:I = 0x6
+.field private static final GATEWAY_VERSION:I = 0x7
 
 .field private static final HEARTBEAT_MAX_RESUME_THRESHOLD:I = 0x2bf20
 
@@ -165,7 +165,7 @@
 
     iput-boolean v1, v0, Lcom/google/gson/f;->serializeNulls:Z
 
-    invoke-virtual {v0}, Lcom/google/gson/f;->BJ()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->By()Lcom/google/gson/Gson;
 
     move-result-object v0
 
@@ -175,7 +175,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/f;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/gson/f;->BJ()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->By()Lcom/google/gson/Gson;
 
     move-result-object v0
 
@@ -195,7 +195,7 @@
 
     aput-object v2, v0, v1
 
-    invoke-static {v0}, Lkotlin/a/ak;->p([Ljava/lang/Object;)Ljava/util/Set;
+    invoke-static {v0}, Lkotlin/a/ak;->o([Ljava/lang/Object;)Ljava/util/Set;
 
     move-result-object v0
 
@@ -405,7 +405,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v1
 
@@ -871,7 +871,7 @@
 
     invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v3, ", encoding: json, version 6."
+    const-string v3, ", encoding: json, version 7."
 
     invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -967,7 +967,7 @@
 
     invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string p1, "/?encoding=json&v=6&compress=zlib-stream"
+    const-string p1, "/?encoding=json&v=7&compress=zlib-stream"
 
     invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1933,7 +1933,7 @@
 
     iget-object p1, p0, Lcom/discord/gateway/GatewaySocket;->eventHandler:Lcom/discord/gateway/GatewayEventHandler;
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-interface {p1, p2, v0}, Lcom/discord/gateway/GatewayEventHandler;->handleDispatch(Ljava/lang/String;Ljava/lang/Object;)V
 
@@ -3296,6 +3296,42 @@
     return-void
 .end method
 
+.method public final streamDelete(Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/gateway/GatewaySocket$streamDelete$1;
+
+    invoke-direct {v0, p0, p1}, Lcom/discord/gateway/GatewaySocket$streamDelete$1;-><init>(Lcom/discord/gateway/GatewaySocket;Ljava/lang/String;)V
+
+    check-cast v0, Lkotlin/jvm/functions/Function0;
+
+    invoke-direct {p0, v0}, Lcom/discord/gateway/GatewaySocket;->schedule(Lkotlin/jvm/functions/Function0;)V
+
+    return-void
+.end method
+
+.method public final streamWatch(Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/gateway/GatewaySocket$streamWatch$1;
+
+    invoke-direct {v0, p0, p1}, Lcom/discord/gateway/GatewaySocket$streamWatch$1;-><init>(Lcom/discord/gateway/GatewaySocket;Ljava/lang/String;)V
+
+    check-cast v0, Lkotlin/jvm/functions/Function0;
+
+    invoke-direct {p0, v0}, Lcom/discord/gateway/GatewaySocket;->schedule(Lkotlin/jvm/functions/Function0;)V
+
+    return-void
+.end method
+
 .method public final updateGuildSubscriptions(JLcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;)V
     .locals 13
 
diff --git a/com.discord/smali/com/discord/gateway/R$attr.smali b/com.discord/smali/com/discord/gateway/R$attr.smali
index 894450f578..e5d59c5ddc 100644
--- a/com.discord/smali/com/discord/gateway/R$attr.smali
+++ b/com.discord/smali/com/discord/gateway/R$attr.smali
@@ -149,987 +149,987 @@
 
 .field public static final behavior_skipCollapsed:I = 0x7f04005a
 
-.field public static final borderWidth:I = 0x7f040064
+.field public static final borderWidth:I = 0x7f040065
 
-.field public static final borderlessButtonStyle:I = 0x7f040065
+.field public static final borderlessButtonStyle:I = 0x7f040066
 
-.field public static final bottomAppBarStyle:I = 0x7f040066
+.field public static final bottomAppBarStyle:I = 0x7f040067
 
-.field public static final bottomNavigationStyle:I = 0x7f040067
+.field public static final bottomNavigationStyle:I = 0x7f040068
 
-.field public static final bottomSheetDialogTheme:I = 0x7f040068
+.field public static final bottomSheetDialogTheme:I = 0x7f040069
 
-.field public static final bottomSheetStyle:I = 0x7f040069
+.field public static final bottomSheetStyle:I = 0x7f04006a
 
-.field public static final boxBackgroundColor:I = 0x7f04006a
+.field public static final boxBackgroundColor:I = 0x7f04006b
 
-.field public static final boxBackgroundMode:I = 0x7f04006b
+.field public static final boxBackgroundMode:I = 0x7f04006c
 
-.field public static final boxCollapsedPaddingTop:I = 0x7f04006c
+.field public static final boxCollapsedPaddingTop:I = 0x7f04006d
 
-.field public static final boxCornerRadiusBottomEnd:I = 0x7f04006d
+.field public static final boxCornerRadiusBottomEnd:I = 0x7f04006e
 
-.field public static final boxCornerRadiusBottomStart:I = 0x7f04006e
+.field public static final boxCornerRadiusBottomStart:I = 0x7f04006f
 
-.field public static final boxCornerRadiusTopEnd:I = 0x7f04006f
+.field public static final boxCornerRadiusTopEnd:I = 0x7f040070
 
-.field public static final boxCornerRadiusTopStart:I = 0x7f040070
+.field public static final boxCornerRadiusTopStart:I = 0x7f040071
 
-.field public static final boxStrokeColor:I = 0x7f040071
+.field public static final boxStrokeColor:I = 0x7f040072
 
-.field public static final boxStrokeWidth:I = 0x7f040072
+.field public static final boxStrokeWidth:I = 0x7f040073
 
-.field public static final buttonBarButtonStyle:I = 0x7f040074
+.field public static final buttonBarButtonStyle:I = 0x7f040075
 
-.field public static final buttonBarNegativeButtonStyle:I = 0x7f040075
+.field public static final buttonBarNegativeButtonStyle:I = 0x7f040076
 
-.field public static final buttonBarNeutralButtonStyle:I = 0x7f040076
+.field public static final buttonBarNeutralButtonStyle:I = 0x7f040077
 
-.field public static final buttonBarPositiveButtonStyle:I = 0x7f040077
+.field public static final buttonBarPositiveButtonStyle:I = 0x7f040078
 
-.field public static final buttonBarStyle:I = 0x7f040078
+.field public static final buttonBarStyle:I = 0x7f040079
 
-.field public static final buttonGravity:I = 0x7f040079
+.field public static final buttonGravity:I = 0x7f04007a
 
-.field public static final buttonIconDimen:I = 0x7f04007a
+.field public static final buttonIconDimen:I = 0x7f04007b
 
-.field public static final buttonPanelSideLayout:I = 0x7f04007b
+.field public static final buttonPanelSideLayout:I = 0x7f04007c
 
-.field public static final buttonSize:I = 0x7f04007c
+.field public static final buttonSize:I = 0x7f04007d
 
-.field public static final buttonStyle:I = 0x7f04007d
+.field public static final buttonStyle:I = 0x7f04007e
 
-.field public static final buttonStyleSmall:I = 0x7f04007e
+.field public static final buttonStyleSmall:I = 0x7f04007f
 
-.field public static final buttonTint:I = 0x7f04007f
+.field public static final buttonTint:I = 0x7f040080
 
-.field public static final buttonTintMode:I = 0x7f040080
+.field public static final buttonTintMode:I = 0x7f040081
 
-.field public static final cardBackgroundColor:I = 0x7f040081
+.field public static final cardBackgroundColor:I = 0x7f040082
 
-.field public static final cardCornerRadius:I = 0x7f040082
+.field public static final cardCornerRadius:I = 0x7f040083
 
-.field public static final cardElevation:I = 0x7f040083
+.field public static final cardElevation:I = 0x7f040084
 
-.field public static final cardMaxElevation:I = 0x7f040084
+.field public static final cardMaxElevation:I = 0x7f040085
 
-.field public static final cardPreventCornerOverlap:I = 0x7f040085
+.field public static final cardPreventCornerOverlap:I = 0x7f040086
 
-.field public static final cardUseCompatPadding:I = 0x7f040086
+.field public static final cardUseCompatPadding:I = 0x7f040087
 
-.field public static final cardViewStyle:I = 0x7f040087
+.field public static final cardViewStyle:I = 0x7f040088
 
-.field public static final checkboxStyle:I = 0x7f04008c
+.field public static final checkboxStyle:I = 0x7f04008d
 
-.field public static final checkedChip:I = 0x7f04008d
+.field public static final checkedChip:I = 0x7f04008e
 
-.field public static final checkedIcon:I = 0x7f04008e
+.field public static final checkedIcon:I = 0x7f04008f
 
-.field public static final checkedIconEnabled:I = 0x7f04008f
+.field public static final checkedIconEnabled:I = 0x7f040090
 
-.field public static final checkedIconVisible:I = 0x7f040090
+.field public static final checkedIconVisible:I = 0x7f040091
 
-.field public static final checkedTextViewStyle:I = 0x7f040091
+.field public static final checkedTextViewStyle:I = 0x7f040092
 
-.field public static final chipBackgroundColor:I = 0x7f040092
+.field public static final chipBackgroundColor:I = 0x7f040093
 
-.field public static final chipCornerRadius:I = 0x7f040093
+.field public static final chipCornerRadius:I = 0x7f040094
 
-.field public static final chipEndPadding:I = 0x7f040094
+.field public static final chipEndPadding:I = 0x7f040095
 
-.field public static final chipGroupStyle:I = 0x7f040095
+.field public static final chipGroupStyle:I = 0x7f040096
 
-.field public static final chipIcon:I = 0x7f040096
+.field public static final chipIcon:I = 0x7f040097
 
-.field public static final chipIconEnabled:I = 0x7f040097
+.field public static final chipIconEnabled:I = 0x7f040098
 
-.field public static final chipIconSize:I = 0x7f040098
+.field public static final chipIconSize:I = 0x7f040099
 
-.field public static final chipIconTint:I = 0x7f040099
+.field public static final chipIconTint:I = 0x7f04009a
 
-.field public static final chipIconVisible:I = 0x7f04009a
+.field public static final chipIconVisible:I = 0x7f04009b
 
-.field public static final chipMinHeight:I = 0x7f04009b
+.field public static final chipMinHeight:I = 0x7f04009c
 
-.field public static final chipSpacing:I = 0x7f04009c
+.field public static final chipSpacing:I = 0x7f04009d
 
-.field public static final chipSpacingHorizontal:I = 0x7f04009d
+.field public static final chipSpacingHorizontal:I = 0x7f04009e
 
-.field public static final chipSpacingVertical:I = 0x7f04009e
+.field public static final chipSpacingVertical:I = 0x7f04009f
 
-.field public static final chipStandaloneStyle:I = 0x7f04009f
+.field public static final chipStandaloneStyle:I = 0x7f0400a0
 
-.field public static final chipStartPadding:I = 0x7f0400a0
+.field public static final chipStartPadding:I = 0x7f0400a1
 
-.field public static final chipStrokeColor:I = 0x7f0400a1
+.field public static final chipStrokeColor:I = 0x7f0400a2
 
-.field public static final chipStrokeWidth:I = 0x7f0400a2
+.field public static final chipStrokeWidth:I = 0x7f0400a3
 
-.field public static final chipStyle:I = 0x7f0400a3
+.field public static final chipStyle:I = 0x7f0400a4
 
-.field public static final circleCrop:I = 0x7f0400a4
+.field public static final circleCrop:I = 0x7f0400a5
 
-.field public static final closeIcon:I = 0x7f0400a5
+.field public static final closeIcon:I = 0x7f0400a6
 
-.field public static final closeIconEnabled:I = 0x7f0400a6
+.field public static final closeIconEnabled:I = 0x7f0400a7
 
-.field public static final closeIconEndPadding:I = 0x7f0400a7
+.field public static final closeIconEndPadding:I = 0x7f0400a8
 
-.field public static final closeIconSize:I = 0x7f0400a8
+.field public static final closeIconSize:I = 0x7f0400a9
 
-.field public static final closeIconStartPadding:I = 0x7f0400a9
+.field public static final closeIconStartPadding:I = 0x7f0400aa
 
-.field public static final closeIconTint:I = 0x7f0400aa
+.field public static final closeIconTint:I = 0x7f0400ab
 
-.field public static final closeIconVisible:I = 0x7f0400ab
+.field public static final closeIconVisible:I = 0x7f0400ac
 
-.field public static final closeItemLayout:I = 0x7f0400ac
+.field public static final closeItemLayout:I = 0x7f0400ad
 
-.field public static final collapseContentDescription:I = 0x7f0400ad
+.field public static final collapseContentDescription:I = 0x7f0400ae
 
-.field public static final collapseIcon:I = 0x7f0400ae
+.field public static final collapseIcon:I = 0x7f0400af
 
-.field public static final collapsedTitleGravity:I = 0x7f0400af
+.field public static final collapsedTitleGravity:I = 0x7f0400b0
 
-.field public static final collapsedTitleTextAppearance:I = 0x7f0400b0
+.field public static final collapsedTitleTextAppearance:I = 0x7f0400b1
 
-.field public static final color:I = 0x7f0400b1
+.field public static final color:I = 0x7f0400b2
 
-.field public static final colorAccent:I = 0x7f0400b2
+.field public static final colorAccent:I = 0x7f0400b3
 
-.field public static final colorBackgroundFloating:I = 0x7f0400b3
+.field public static final colorBackgroundFloating:I = 0x7f0400b4
 
-.field public static final colorButtonNormal:I = 0x7f0400b4
+.field public static final colorButtonNormal:I = 0x7f0400b5
 
-.field public static final colorControlActivated:I = 0x7f0400b5
+.field public static final colorControlActivated:I = 0x7f0400b6
 
-.field public static final colorControlHighlight:I = 0x7f0400b6
+.field public static final colorControlHighlight:I = 0x7f0400b7
 
-.field public static final colorControlNormal:I = 0x7f0400b7
+.field public static final colorControlNormal:I = 0x7f0400b8
 
-.field public static final colorError:I = 0x7f0400b8
+.field public static final colorError:I = 0x7f0400b9
 
-.field public static final colorPrimary:I = 0x7f0400b9
+.field public static final colorPrimary:I = 0x7f0400ba
 
-.field public static final colorPrimaryDark:I = 0x7f0400bc
+.field public static final colorPrimaryDark:I = 0x7f0400bd
 
-.field public static final colorScheme:I = 0x7f0400bf
+.field public static final colorScheme:I = 0x7f0400c0
 
-.field public static final colorSecondary:I = 0x7f0400c0
+.field public static final colorSecondary:I = 0x7f0400c1
 
-.field public static final colorSwitchThumbNormal:I = 0x7f0400c1
+.field public static final colorSwitchThumbNormal:I = 0x7f0400c2
 
-.field public static final commitIcon:I = 0x7f0400c2
+.field public static final commitIcon:I = 0x7f0400c3
 
-.field public static final contentDescription:I = 0x7f0400c7
+.field public static final contentDescription:I = 0x7f0400c8
 
-.field public static final contentInsetEnd:I = 0x7f0400c8
+.field public static final contentInsetEnd:I = 0x7f0400c9
 
-.field public static final contentInsetEndWithActions:I = 0x7f0400c9
+.field public static final contentInsetEndWithActions:I = 0x7f0400ca
 
-.field public static final contentInsetLeft:I = 0x7f0400ca
+.field public static final contentInsetLeft:I = 0x7f0400cb
 
-.field public static final contentInsetRight:I = 0x7f0400cb
+.field public static final contentInsetRight:I = 0x7f0400cc
 
-.field public static final contentInsetStart:I = 0x7f0400cc
+.field public static final contentInsetStart:I = 0x7f0400cd
 
-.field public static final contentInsetStartWithNavigation:I = 0x7f0400cd
+.field public static final contentInsetStartWithNavigation:I = 0x7f0400ce
 
-.field public static final contentPadding:I = 0x7f0400ce
+.field public static final contentPadding:I = 0x7f0400cf
 
-.field public static final contentPaddingBottom:I = 0x7f0400cf
+.field public static final contentPaddingBottom:I = 0x7f0400d0
 
-.field public static final contentPaddingLeft:I = 0x7f0400d0
+.field public static final contentPaddingLeft:I = 0x7f0400d1
 
-.field public static final contentPaddingRight:I = 0x7f0400d1
+.field public static final contentPaddingRight:I = 0x7f0400d2
 
-.field public static final contentPaddingTop:I = 0x7f0400d2
+.field public static final contentPaddingTop:I = 0x7f0400d3
 
-.field public static final contentScrim:I = 0x7f0400d3
+.field public static final contentScrim:I = 0x7f0400d4
 
-.field public static final controlBackground:I = 0x7f0400d4
+.field public static final controlBackground:I = 0x7f0400d5
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final cornerRadius:I = 0x7f0400d6
+.field public static final cornerRadius:I = 0x7f0400d7
 
-.field public static final counterEnabled:I = 0x7f0400d7
+.field public static final counterEnabled:I = 0x7f0400d8
 
-.field public static final counterMaxLength:I = 0x7f0400d8
+.field public static final counterMaxLength:I = 0x7f0400d9
 
-.field public static final counterOverflowTextAppearance:I = 0x7f0400d9
+.field public static final counterOverflowTextAppearance:I = 0x7f0400da
 
-.field public static final counterTextAppearance:I = 0x7f0400da
+.field public static final counterTextAppearance:I = 0x7f0400db
 
-.field public static final customNavigationLayout:I = 0x7f0400e9
+.field public static final customNavigationLayout:I = 0x7f0400ea
 
-.field public static final cv_bg_color:I = 0x7f0400ea
+.field public static final cv_bg_color:I = 0x7f0400eb
 
-.field public static final cv_bg_color_clicked:I = 0x7f0400eb
+.field public static final cv_bg_color_clicked:I = 0x7f0400ec
 
-.field public static final cv_bg_color_error_clicked:I = 0x7f0400ec
+.field public static final cv_bg_color_error_clicked:I = 0x7f0400ed
 
-.field public static final cv_chip_layout:I = 0x7f0400ed
+.field public static final cv_chip_layout:I = 0x7f0400ee
 
-.field public static final cv_color:I = 0x7f0400ee
+.field public static final cv_color:I = 0x7f0400ef
 
-.field public static final cv_color_clicked:I = 0x7f0400ef
+.field public static final cv_color_clicked:I = 0x7f0400f0
 
-.field public static final cv_color_error_clicked:I = 0x7f0400f0
+.field public static final cv_color_error_clicked:I = 0x7f0400f1
 
-.field public static final cv_dialog_cancel:I = 0x7f0400f1
+.field public static final cv_dialog_cancel:I = 0x7f0400f2
 
-.field public static final cv_dialog_confirm:I = 0x7f0400f2
+.field public static final cv_dialog_confirm:I = 0x7f0400f3
 
-.field public static final cv_dialog_error_msg:I = 0x7f0400f3
+.field public static final cv_dialog_error_msg:I = 0x7f0400f4
 
-.field public static final cv_dialog_et_placeholder:I = 0x7f0400f4
+.field public static final cv_dialog_et_placeholder:I = 0x7f0400f5
 
-.field public static final cv_dialog_title:I = 0x7f0400f5
+.field public static final cv_dialog_title:I = 0x7f0400f6
 
-.field public static final cv_icon_delete:I = 0x7f0400f6
+.field public static final cv_icon_delete:I = 0x7f0400f7
 
-.field public static final cv_icon_placeholder:I = 0x7f0400f7
+.field public static final cv_icon_placeholder:I = 0x7f0400f8
 
-.field public static final cv_max_height:I = 0x7f0400f8
+.field public static final cv_max_height:I = 0x7f0400f9
 
-.field public static final cv_search_text_color:I = 0x7f0400f9
+.field public static final cv_search_text_color:I = 0x7f0400fa
 
-.field public static final cv_search_text_size:I = 0x7f0400fa
+.field public static final cv_search_text_size:I = 0x7f0400fb
 
-.field public static final cv_text_color:I = 0x7f0400fb
+.field public static final cv_text_color:I = 0x7f0400fc
 
-.field public static final cv_text_color_clicked:I = 0x7f0400fc
+.field public static final cv_text_color_clicked:I = 0x7f0400fd
 
-.field public static final cv_text_color_error_clicked:I = 0x7f0400fd
+.field public static final cv_text_color_error_clicked:I = 0x7f0400fe
 
-.field public static final cv_vertical_spacing:I = 0x7f0400fe
+.field public static final cv_vertical_spacing:I = 0x7f0400ff
 
-.field public static final defaultQueryHint:I = 0x7f0400ff
+.field public static final defaultQueryHint:I = 0x7f040100
 
-.field public static final dialogCornerRadius:I = 0x7f040100
+.field public static final dialogCornerRadius:I = 0x7f040101
 
-.field public static final dialogPreferredPadding:I = 0x7f040101
+.field public static final dialogPreferredPadding:I = 0x7f040102
 
-.field public static final dialogTheme:I = 0x7f040102
+.field public static final dialogTheme:I = 0x7f040103
 
-.field public static final displayOptions:I = 0x7f040103
+.field public static final displayOptions:I = 0x7f040104
 
-.field public static final divider:I = 0x7f040104
+.field public static final divider:I = 0x7f040105
 
-.field public static final dividerDrawable:I = 0x7f040105
+.field public static final dividerDrawable:I = 0x7f040106
 
-.field public static final dividerDrawableHorizontal:I = 0x7f040106
+.field public static final dividerDrawableHorizontal:I = 0x7f040107
 
-.field public static final dividerDrawableVertical:I = 0x7f040107
+.field public static final dividerDrawableVertical:I = 0x7f040108
 
-.field public static final dividerHorizontal:I = 0x7f040108
+.field public static final dividerHorizontal:I = 0x7f040109
 
-.field public static final dividerPadding:I = 0x7f040109
+.field public static final dividerPadding:I = 0x7f04010a
 
-.field public static final dividerVertical:I = 0x7f04010a
+.field public static final dividerVertical:I = 0x7f04010b
 
-.field public static final drawableSize:I = 0x7f04010b
+.field public static final drawableSize:I = 0x7f04010c
 
-.field public static final drawerArrowStyle:I = 0x7f04010c
+.field public static final drawerArrowStyle:I = 0x7f04010d
 
-.field public static final dropDownListViewStyle:I = 0x7f04010d
+.field public static final dropDownListViewStyle:I = 0x7f04010f
 
-.field public static final dropdownListPreferredItemHeight:I = 0x7f04010e
+.field public static final dropdownListPreferredItemHeight:I = 0x7f040110
 
-.field public static final editTextBackground:I = 0x7f04010f
+.field public static final editTextBackground:I = 0x7f040111
 
-.field public static final editTextColor:I = 0x7f040110
+.field public static final editTextColor:I = 0x7f040112
 
-.field public static final editTextStyle:I = 0x7f040111
+.field public static final editTextStyle:I = 0x7f040113
 
-.field public static final elevation:I = 0x7f040112
+.field public static final elevation:I = 0x7f040114
 
-.field public static final enforceMaterialTheme:I = 0x7f040114
+.field public static final enforceMaterialTheme:I = 0x7f040116
 
-.field public static final enforceTextAppearance:I = 0x7f040115
+.field public static final enforceTextAppearance:I = 0x7f040117
 
-.field public static final errorEnabled:I = 0x7f040116
+.field public static final errorEnabled:I = 0x7f040118
 
-.field public static final errorTextAppearance:I = 0x7f040117
+.field public static final errorTextAppearance:I = 0x7f040119
 
-.field public static final expandActivityOverflowButtonDrawable:I = 0x7f040118
+.field public static final expandActivityOverflowButtonDrawable:I = 0x7f04011a
 
-.field public static final expanded:I = 0x7f040119
+.field public static final expanded:I = 0x7f04011b
 
-.field public static final expandedTitleGravity:I = 0x7f04011a
+.field public static final expandedTitleGravity:I = 0x7f04011c
 
-.field public static final expandedTitleMargin:I = 0x7f04011b
+.field public static final expandedTitleMargin:I = 0x7f04011d
 
-.field public static final expandedTitleMarginBottom:I = 0x7f04011c
+.field public static final expandedTitleMarginBottom:I = 0x7f04011e
 
-.field public static final expandedTitleMarginEnd:I = 0x7f04011d
+.field public static final expandedTitleMarginEnd:I = 0x7f04011f
 
-.field public static final expandedTitleMarginStart:I = 0x7f04011e
+.field public static final expandedTitleMarginStart:I = 0x7f040120
 
-.field public static final expandedTitleMarginTop:I = 0x7f04011f
+.field public static final expandedTitleMarginTop:I = 0x7f040121
 
-.field public static final expandedTitleTextAppearance:I = 0x7f040120
+.field public static final expandedTitleTextAppearance:I = 0x7f040122
 
-.field public static final fabAlignmentMode:I = 0x7f040121
+.field public static final fabAlignmentMode:I = 0x7f040123
 
-.field public static final fabCradleMargin:I = 0x7f040122
+.field public static final fabCradleMargin:I = 0x7f040124
 
-.field public static final fabCradleRoundedCornerRadius:I = 0x7f040123
+.field public static final fabCradleRoundedCornerRadius:I = 0x7f040125
 
-.field public static final fabCradleVerticalOffset:I = 0x7f040124
+.field public static final fabCradleVerticalOffset:I = 0x7f040126
 
-.field public static final fabCustomSize:I = 0x7f040125
+.field public static final fabCustomSize:I = 0x7f040127
 
-.field public static final fabSize:I = 0x7f040126
+.field public static final fabSize:I = 0x7f040128
 
-.field public static final fadeDuration:I = 0x7f040128
+.field public static final fadeDuration:I = 0x7f04012a
 
-.field public static final failureImage:I = 0x7f040129
+.field public static final failureImage:I = 0x7f04012b
 
-.field public static final failureImageScaleType:I = 0x7f04012a
+.field public static final failureImageScaleType:I = 0x7f04012c
 
-.field public static final fastScrollEnabled:I = 0x7f04012b
+.field public static final fastScrollEnabled:I = 0x7f04012d
 
-.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f04012c
+.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f04012e
 
-.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f04012d
+.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f04012f
 
-.field public static final fastScrollVerticalThumbDrawable:I = 0x7f04012e
+.field public static final fastScrollVerticalThumbDrawable:I = 0x7f040130
 
-.field public static final fastScrollVerticalTrackDrawable:I = 0x7f04012f
+.field public static final fastScrollVerticalTrackDrawable:I = 0x7f040131
 
-.field public static final fgl_max_linear_views:I = 0x7f040130
+.field public static final fgl_max_linear_views:I = 0x7f040132
 
-.field public static final firstBaselineToTopHeight:I = 0x7f040131
+.field public static final firstBaselineToTopHeight:I = 0x7f040133
 
-.field public static final flexDirection:I = 0x7f040135
+.field public static final flexDirection:I = 0x7f040137
 
-.field public static final flexWrap:I = 0x7f04013c
+.field public static final flexWrap:I = 0x7f04013e
 
-.field public static final floatingActionButtonStyle:I = 0x7f04013d
+.field public static final floatingActionButtonStyle:I = 0x7f04013f
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontFamily:I = 0x7f04013f
+.field public static final fontFamily:I = 0x7f040141
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final foregroundInsidePadding:I = 0x7f040149
+.field public static final foregroundInsidePadding:I = 0x7f04014b
 
-.field public static final gapBetweenBars:I = 0x7f04014a
+.field public static final gapBetweenBars:I = 0x7f04014c
 
-.field public static final goIcon:I = 0x7f04014f
+.field public static final goIcon:I = 0x7f040151
 
-.field public static final headerLayout:I = 0x7f040155
+.field public static final headerLayout:I = 0x7f040157
 
-.field public static final height:I = 0x7f040156
+.field public static final height:I = 0x7f040158
 
-.field public static final helperText:I = 0x7f040157
+.field public static final helperText:I = 0x7f040159
 
-.field public static final helperTextEnabled:I = 0x7f040158
+.field public static final helperTextEnabled:I = 0x7f04015a
 
-.field public static final helperTextTextAppearance:I = 0x7f040159
+.field public static final helperTextTextAppearance:I = 0x7f04015b
 
-.field public static final hideMotionSpec:I = 0x7f04015a
+.field public static final hideMotionSpec:I = 0x7f04015c
 
-.field public static final hideOnContentScroll:I = 0x7f04015b
+.field public static final hideOnContentScroll:I = 0x7f04015d
 
-.field public static final hideOnScroll:I = 0x7f04015c
+.field public static final hideOnScroll:I = 0x7f04015e
 
-.field public static final hintAnimationEnabled:I = 0x7f04015e
+.field public static final hintAnimationEnabled:I = 0x7f040160
 
-.field public static final hintEnabled:I = 0x7f040160
+.field public static final hintEnabled:I = 0x7f040162
 
-.field public static final hintTextAppearance:I = 0x7f040161
+.field public static final hintTextAppearance:I = 0x7f040163
 
-.field public static final homeAsUpIndicator:I = 0x7f040162
+.field public static final homeAsUpIndicator:I = 0x7f040164
 
-.field public static final homeLayout:I = 0x7f040163
+.field public static final homeLayout:I = 0x7f040165
 
-.field public static final hoveredFocusedTranslationZ:I = 0x7f040164
+.field public static final hoveredFocusedTranslationZ:I = 0x7f040166
 
-.field public static final icon:I = 0x7f0401c7
+.field public static final icon:I = 0x7f0401c9
 
-.field public static final iconEndPadding:I = 0x7f0401c8
+.field public static final iconEndPadding:I = 0x7f0401ca
 
-.field public static final iconGravity:I = 0x7f0401c9
+.field public static final iconGravity:I = 0x7f0401cb
 
-.field public static final iconPadding:I = 0x7f0401ca
+.field public static final iconPadding:I = 0x7f0401cc
 
-.field public static final iconSize:I = 0x7f0401cb
+.field public static final iconSize:I = 0x7f0401cd
 
-.field public static final iconStartPadding:I = 0x7f0401cc
+.field public static final iconStartPadding:I = 0x7f0401ce
 
-.field public static final iconTint:I = 0x7f0401cd
+.field public static final iconTint:I = 0x7f0401cf
 
-.field public static final iconTintMode:I = 0x7f0401ce
+.field public static final iconTintMode:I = 0x7f0401d0
 
-.field public static final iconifiedByDefault:I = 0x7f0401cf
+.field public static final iconifiedByDefault:I = 0x7f0401d1
 
-.field public static final imageAspectRatio:I = 0x7f0401d0
+.field public static final imageAspectRatio:I = 0x7f0401d2
 
-.field public static final imageAspectRatioAdjust:I = 0x7f0401d1
+.field public static final imageAspectRatioAdjust:I = 0x7f0401d3
 
-.field public static final imageButtonStyle:I = 0x7f0401d2
+.field public static final imageButtonStyle:I = 0x7f0401d4
 
-.field public static final indeterminateProgressStyle:I = 0x7f0401ea
+.field public static final indeterminateProgressStyle:I = 0x7f0401ec
 
-.field public static final initialActivityCount:I = 0x7f0401eb
+.field public static final initialActivityCount:I = 0x7f0401ed
 
-.field public static final insetForeground:I = 0x7f0401ec
+.field public static final insetForeground:I = 0x7f0401ee
 
-.field public static final isLightTheme:I = 0x7f0401ed
+.field public static final isLightTheme:I = 0x7f0401ef
 
-.field public static final itemBackground:I = 0x7f0401ee
+.field public static final itemBackground:I = 0x7f0401f0
 
-.field public static final itemHorizontalPadding:I = 0x7f0401ef
+.field public static final itemHorizontalPadding:I = 0x7f0401f1
 
-.field public static final itemHorizontalTranslationEnabled:I = 0x7f0401f0
+.field public static final itemHorizontalTranslationEnabled:I = 0x7f0401f2
 
-.field public static final itemIconPadding:I = 0x7f0401f1
+.field public static final itemIconPadding:I = 0x7f0401f3
 
-.field public static final itemIconSize:I = 0x7f0401f2
+.field public static final itemIconSize:I = 0x7f0401f4
 
-.field public static final itemIconTint:I = 0x7f0401f3
+.field public static final itemIconTint:I = 0x7f0401f5
 
-.field public static final itemPadding:I = 0x7f0401f4
+.field public static final itemPadding:I = 0x7f0401f6
 
-.field public static final itemSpacing:I = 0x7f0401f5
+.field public static final itemSpacing:I = 0x7f0401f7
 
-.field public static final itemTextAppearance:I = 0x7f0401f6
+.field public static final itemTextAppearance:I = 0x7f0401f8
 
-.field public static final itemTextAppearanceActive:I = 0x7f0401f7
+.field public static final itemTextAppearanceActive:I = 0x7f0401f9
 
-.field public static final itemTextAppearanceInactive:I = 0x7f0401f8
+.field public static final itemTextAppearanceInactive:I = 0x7f0401fa
 
-.field public static final itemTextColor:I = 0x7f0401f9
+.field public static final itemTextColor:I = 0x7f0401fb
 
-.field public static final justifyContent:I = 0x7f0401fa
+.field public static final justifyContent:I = 0x7f0401fc
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final labelVisibilityMode:I = 0x7f0401fc
+.field public static final labelVisibilityMode:I = 0x7f0401fe
 
-.field public static final lastBaselineToBottomHeight:I = 0x7f0401fd
+.field public static final lastBaselineToBottomHeight:I = 0x7f0401ff
 
-.field public static final layout:I = 0x7f0401fe
+.field public static final layout:I = 0x7f040200
 
-.field public static final layoutManager:I = 0x7f0401ff
+.field public static final layoutManager:I = 0x7f040201
 
-.field public static final layout_alignSelf:I = 0x7f040200
+.field public static final layout_alignSelf:I = 0x7f040202
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_collapseMode:I = 0x7f040204
+.field public static final layout_collapseMode:I = 0x7f040206
 
-.field public static final layout_collapseParallaxMultiplier:I = 0x7f040205
+.field public static final layout_collapseParallaxMultiplier:I = 0x7f040207
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_flexBasisPercent:I = 0x7f040232
+.field public static final layout_flexBasisPercent:I = 0x7f040234
 
-.field public static final layout_flexGrow:I = 0x7f040233
+.field public static final layout_flexGrow:I = 0x7f040235
 
-.field public static final layout_flexShrink:I = 0x7f040234
+.field public static final layout_flexShrink:I = 0x7f040236
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final layout_maxHeight:I = 0x7f04023d
+.field public static final layout_maxHeight:I = 0x7f04023f
 
-.field public static final layout_maxWidth:I = 0x7f04023e
+.field public static final layout_maxWidth:I = 0x7f040240
 
-.field public static final layout_minHeight:I = 0x7f04023f
+.field public static final layout_minHeight:I = 0x7f040241
 
-.field public static final layout_minWidth:I = 0x7f040240
+.field public static final layout_minWidth:I = 0x7f040242
 
-.field public static final layout_order:I = 0x7f040242
+.field public static final layout_order:I = 0x7f040244
 
-.field public static final layout_scrollFlags:I = 0x7f040243
+.field public static final layout_scrollFlags:I = 0x7f040245
 
-.field public static final layout_scrollInterpolator:I = 0x7f040244
+.field public static final layout_scrollInterpolator:I = 0x7f040246
 
-.field public static final layout_wrapBefore:I = 0x7f040245
+.field public static final layout_wrapBefore:I = 0x7f040247
 
-.field public static final liftOnScroll:I = 0x7f040249
+.field public static final liftOnScroll:I = 0x7f04024c
 
-.field public static final lineHeight:I = 0x7f04024a
+.field public static final lineHeight:I = 0x7f04024d
 
-.field public static final lineSpacing:I = 0x7f04024b
+.field public static final lineSpacing:I = 0x7f04024e
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04024c
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04024f
 
-.field public static final listDividerAlertDialog:I = 0x7f04024d
+.field public static final listDividerAlertDialog:I = 0x7f040250
 
-.field public static final listItemLayout:I = 0x7f04024e
+.field public static final listItemLayout:I = 0x7f040251
 
-.field public static final listLayout:I = 0x7f04024f
+.field public static final listLayout:I = 0x7f040252
 
-.field public static final listMenuViewStyle:I = 0x7f040250
+.field public static final listMenuViewStyle:I = 0x7f040253
 
-.field public static final listPopupWindowStyle:I = 0x7f040251
+.field public static final listPopupWindowStyle:I = 0x7f040254
 
-.field public static final listPreferredItemHeight:I = 0x7f040252
+.field public static final listPreferredItemHeight:I = 0x7f040255
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040253
+.field public static final listPreferredItemHeightLarge:I = 0x7f040256
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040254
+.field public static final listPreferredItemHeightSmall:I = 0x7f040257
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040255
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040258
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040256
+.field public static final listPreferredItemPaddingRight:I = 0x7f040259
 
-.field public static final logo:I = 0x7f040257
+.field public static final logo:I = 0x7f04025a
 
-.field public static final logoDescription:I = 0x7f040258
+.field public static final logoDescription:I = 0x7f04025b
 
-.field public static final materialButtonStyle:I = 0x7f040268
+.field public static final materialButtonStyle:I = 0x7f04026b
 
-.field public static final materialCardViewStyle:I = 0x7f040269
+.field public static final materialCardViewStyle:I = 0x7f04026c
 
-.field public static final maxActionInlineWidth:I = 0x7f04026a
+.field public static final maxActionInlineWidth:I = 0x7f04026d
 
-.field public static final maxButtonHeight:I = 0x7f04026b
+.field public static final maxButtonHeight:I = 0x7f04026e
 
-.field public static final maxImageSize:I = 0x7f04026c
+.field public static final maxImageSize:I = 0x7f04026f
 
-.field public static final max_height:I = 0x7f04026d
+.field public static final max_height:I = 0x7f040270
 
-.field public static final measureWithLargestChild:I = 0x7f04026e
+.field public static final measureWithLargestChild:I = 0x7f040271
 
-.field public static final menu:I = 0x7f04026f
+.field public static final menu:I = 0x7f040272
 
-.field public static final multiChoiceItemLayout:I = 0x7f040270
+.field public static final multiChoiceItemLayout:I = 0x7f040273
 
-.field public static final navigationContentDescription:I = 0x7f040271
+.field public static final navigationContentDescription:I = 0x7f040274
 
-.field public static final navigationIcon:I = 0x7f040272
+.field public static final navigationIcon:I = 0x7f040275
 
-.field public static final navigationMode:I = 0x7f040273
+.field public static final navigationMode:I = 0x7f040276
 
-.field public static final navigationViewStyle:I = 0x7f040274
+.field public static final navigationViewStyle:I = 0x7f040277
 
-.field public static final numericModifiers:I = 0x7f040277
+.field public static final numericModifiers:I = 0x7f04027a
 
-.field public static final overlapAnchor:I = 0x7f040278
+.field public static final overlapAnchor:I = 0x7f04027b
 
-.field public static final overlayImage:I = 0x7f040279
+.field public static final overlayImage:I = 0x7f04027c
 
-.field public static final paddingBottomNoButtons:I = 0x7f04027c
+.field public static final paddingBottomNoButtons:I = 0x7f04027f
 
-.field public static final paddingEnd:I = 0x7f04027d
+.field public static final paddingEnd:I = 0x7f040280
 
-.field public static final paddingStart:I = 0x7f04027e
+.field public static final paddingStart:I = 0x7f040281
 
-.field public static final paddingTopNoTitle:I = 0x7f04027f
+.field public static final paddingTopNoTitle:I = 0x7f040282
 
-.field public static final panelBackground:I = 0x7f040280
+.field public static final panelBackground:I = 0x7f040283
 
-.field public static final panelMenuListTheme:I = 0x7f040281
+.field public static final panelMenuListTheme:I = 0x7f040284
 
-.field public static final panelMenuListWidth:I = 0x7f040282
+.field public static final panelMenuListWidth:I = 0x7f040285
 
-.field public static final passwordToggleContentDescription:I = 0x7f040283
+.field public static final passwordToggleContentDescription:I = 0x7f040286
 
-.field public static final passwordToggleDrawable:I = 0x7f040284
+.field public static final passwordToggleDrawable:I = 0x7f040287
 
-.field public static final passwordToggleEnabled:I = 0x7f040285
+.field public static final passwordToggleEnabled:I = 0x7f040288
 
-.field public static final passwordToggleTint:I = 0x7f040286
+.field public static final passwordToggleTint:I = 0x7f040289
 
-.field public static final passwordToggleTintMode:I = 0x7f040287
+.field public static final passwordToggleTintMode:I = 0x7f04028a
 
-.field public static final placeholderImage:I = 0x7f040288
+.field public static final placeholderImage:I = 0x7f04028b
 
-.field public static final placeholderImageScaleType:I = 0x7f040289
+.field public static final placeholderImageScaleType:I = 0x7f04028c
 
-.field public static final popupMenuStyle:I = 0x7f04028a
+.field public static final popupMenuStyle:I = 0x7f04028d
 
-.field public static final popupTheme:I = 0x7f04028b
+.field public static final popupTheme:I = 0x7f04028e
 
-.field public static final popupWindowStyle:I = 0x7f04028c
+.field public static final popupWindowStyle:I = 0x7f04028f
 
-.field public static final preserveIconSpacing:I = 0x7f04028d
+.field public static final preserveIconSpacing:I = 0x7f040290
 
-.field public static final pressedStateOverlayImage:I = 0x7f04028e
+.field public static final pressedStateOverlayImage:I = 0x7f040291
 
-.field public static final pressedTranslationZ:I = 0x7f04028f
+.field public static final pressedTranslationZ:I = 0x7f040292
 
-.field public static final progressBarAutoRotateInterval:I = 0x7f0402b6
+.field public static final progressBarAutoRotateInterval:I = 0x7f0402b9
 
-.field public static final progressBarImage:I = 0x7f0402b7
+.field public static final progressBarImage:I = 0x7f0402ba
 
-.field public static final progressBarImageScaleType:I = 0x7f0402b8
+.field public static final progressBarImageScaleType:I = 0x7f0402bb
 
-.field public static final progressBarPadding:I = 0x7f0402b9
+.field public static final progressBarPadding:I = 0x7f0402bc
 
-.field public static final progressBarStyle:I = 0x7f0402ba
+.field public static final progressBarStyle:I = 0x7f0402bd
 
-.field public static final queryBackground:I = 0x7f0402bd
+.field public static final queryBackground:I = 0x7f0402c0
 
-.field public static final queryHint:I = 0x7f0402be
+.field public static final queryHint:I = 0x7f0402c1
 
-.field public static final radioButtonStyle:I = 0x7f0402bf
+.field public static final radioButtonStyle:I = 0x7f0402c2
 
-.field public static final ratingBarStyle:I = 0x7f0402c2
+.field public static final ratingBarStyle:I = 0x7f0402c5
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402c3
+.field public static final ratingBarStyleIndicator:I = 0x7f0402c6
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402c4
+.field public static final ratingBarStyleSmall:I = 0x7f0402c7
 
-.field public static final retryImage:I = 0x7f0402c5
+.field public static final retryImage:I = 0x7f0402c8
 
-.field public static final retryImageScaleType:I = 0x7f0402c6
+.field public static final retryImageScaleType:I = 0x7f0402c9
 
-.field public static final reverseLayout:I = 0x7f0402c7
+.field public static final reverseLayout:I = 0x7f0402ca
 
-.field public static final rippleColor:I = 0x7f0402c8
+.field public static final rippleColor:I = 0x7f0402cb
 
-.field public static final roundAsCircle:I = 0x7f0402c9
+.field public static final roundAsCircle:I = 0x7f0402cc
 
-.field public static final roundBottomEnd:I = 0x7f0402ca
+.field public static final roundBottomEnd:I = 0x7f0402cd
 
-.field public static final roundBottomLeft:I = 0x7f0402cb
+.field public static final roundBottomLeft:I = 0x7f0402ce
 
-.field public static final roundBottomRight:I = 0x7f0402cc
+.field public static final roundBottomRight:I = 0x7f0402cf
 
-.field public static final roundBottomStart:I = 0x7f0402cd
+.field public static final roundBottomStart:I = 0x7f0402d0
 
-.field public static final roundTopEnd:I = 0x7f0402ce
+.field public static final roundTopEnd:I = 0x7f0402d1
 
-.field public static final roundTopLeft:I = 0x7f0402cf
+.field public static final roundTopLeft:I = 0x7f0402d2
 
-.field public static final roundTopRight:I = 0x7f0402d0
+.field public static final roundTopRight:I = 0x7f0402d3
 
-.field public static final roundTopStart:I = 0x7f0402d1
+.field public static final roundTopStart:I = 0x7f0402d4
 
-.field public static final roundWithOverlayColor:I = 0x7f0402d2
+.field public static final roundWithOverlayColor:I = 0x7f0402d5
 
-.field public static final roundedCornerRadius:I = 0x7f0402d3
+.field public static final roundedCornerRadius:I = 0x7f0402d6
 
-.field public static final roundingBorderColor:I = 0x7f0402d4
+.field public static final roundingBorderColor:I = 0x7f0402d7
 
-.field public static final roundingBorderPadding:I = 0x7f0402d5
+.field public static final roundingBorderPadding:I = 0x7f0402d8
 
-.field public static final roundingBorderWidth:I = 0x7f0402d6
+.field public static final roundingBorderWidth:I = 0x7f0402d9
 
-.field public static final scopeUris:I = 0x7f0402e5
+.field public static final scopeUris:I = 0x7f0402e8
 
-.field public static final scrimAnimationDuration:I = 0x7f0402e6
+.field public static final scrimAnimationDuration:I = 0x7f0402e9
 
-.field public static final scrimBackground:I = 0x7f0402e7
+.field public static final scrimBackground:I = 0x7f0402ea
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f0402e8
+.field public static final scrimVisibleHeightTrigger:I = 0x7f0402eb
 
-.field public static final searchHintIcon:I = 0x7f0402e9
+.field public static final searchHintIcon:I = 0x7f0402ec
 
-.field public static final searchIcon:I = 0x7f0402ea
+.field public static final searchIcon:I = 0x7f0402ed
 
-.field public static final searchViewStyle:I = 0x7f0402eb
+.field public static final searchViewStyle:I = 0x7f0402ee
 
-.field public static final seekBarStyle:I = 0x7f0402ed
+.field public static final seekBarStyle:I = 0x7f0402f0
 
-.field public static final selectableItemBackground:I = 0x7f0402ee
+.field public static final selectableItemBackground:I = 0x7f0402f1
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ef
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402f2
 
-.field public static final showAsAction:I = 0x7f0402f1
+.field public static final showAsAction:I = 0x7f0402f4
 
-.field public static final showDivider:I = 0x7f0402f2
+.field public static final showDivider:I = 0x7f0402f5
 
-.field public static final showDividerHorizontal:I = 0x7f0402f3
+.field public static final showDividerHorizontal:I = 0x7f0402f6
 
-.field public static final showDividerVertical:I = 0x7f0402f4
+.field public static final showDividerVertical:I = 0x7f0402f7
 
-.field public static final showDividers:I = 0x7f0402f5
+.field public static final showDividers:I = 0x7f0402f8
 
-.field public static final showMotionSpec:I = 0x7f0402f6
+.field public static final showMotionSpec:I = 0x7f0402f9
 
-.field public static final showText:I = 0x7f0402f7
+.field public static final showText:I = 0x7f0402fa
 
-.field public static final showTitle:I = 0x7f0402f8
+.field public static final showTitle:I = 0x7f0402fb
 
-.field public static final singleChoiceItemLayout:I = 0x7f0402f9
+.field public static final singleChoiceItemLayout:I = 0x7f0402fc
 
-.field public static final singleLine:I = 0x7f0402fa
+.field public static final singleLine:I = 0x7f0402fd
 
-.field public static final singleSelection:I = 0x7f0402fb
+.field public static final singleSelection:I = 0x7f0402fe
 
-.field public static final snackbarButtonStyle:I = 0x7f0402fc
+.field public static final snackbarButtonStyle:I = 0x7f0402ff
 
-.field public static final snackbarStyle:I = 0x7f0402fd
+.field public static final snackbarStyle:I = 0x7f040300
 
-.field public static final spanCount:I = 0x7f0402fe
+.field public static final spanCount:I = 0x7f040301
 
-.field public static final spinBars:I = 0x7f0402ff
+.field public static final spinBars:I = 0x7f040302
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f040300
+.field public static final spinnerDropDownItemStyle:I = 0x7f040303
 
-.field public static final spinnerStyle:I = 0x7f040301
+.field public static final spinnerStyle:I = 0x7f040304
 
-.field public static final splitTrack:I = 0x7f040302
+.field public static final splitTrack:I = 0x7f040305
 
-.field public static final srcCompat:I = 0x7f040303
+.field public static final srcCompat:I = 0x7f040306
 
-.field public static final stackFromEnd:I = 0x7f040304
+.field public static final stackFromEnd:I = 0x7f040307
 
-.field public static final state_above_anchor:I = 0x7f040305
+.field public static final state_above_anchor:I = 0x7f040308
 
-.field public static final state_collapsed:I = 0x7f040306
+.field public static final state_collapsed:I = 0x7f040309
 
-.field public static final state_collapsible:I = 0x7f040307
+.field public static final state_collapsible:I = 0x7f04030a
 
-.field public static final state_liftable:I = 0x7f040308
+.field public static final state_liftable:I = 0x7f04030b
 
-.field public static final state_lifted:I = 0x7f040309
+.field public static final state_lifted:I = 0x7f04030c
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final statusBarScrim:I = 0x7f04030b
+.field public static final statusBarScrim:I = 0x7f04030e
 
-.field public static final strokeColor:I = 0x7f04030f
+.field public static final strokeColor:I = 0x7f040312
 
-.field public static final strokeWidth:I = 0x7f040310
+.field public static final strokeWidth:I = 0x7f040313
 
-.field public static final subMenuArrow:I = 0x7f040311
+.field public static final subMenuArrow:I = 0x7f040314
 
-.field public static final submitBackground:I = 0x7f040312
+.field public static final submitBackground:I = 0x7f040315
 
-.field public static final subtitle:I = 0x7f040313
+.field public static final subtitle:I = 0x7f040316
 
-.field public static final subtitleTextAppearance:I = 0x7f040314
+.field public static final subtitleTextAppearance:I = 0x7f040317
 
-.field public static final subtitleTextColor:I = 0x7f040315
+.field public static final subtitleTextColor:I = 0x7f040318
 
-.field public static final subtitleTextStyle:I = 0x7f040316
+.field public static final subtitleTextStyle:I = 0x7f040319
 
-.field public static final suggestionRowLayout:I = 0x7f040317
+.field public static final suggestionRowLayout:I = 0x7f04031a
 
-.field public static final switchMinWidth:I = 0x7f040318
+.field public static final switchMinWidth:I = 0x7f04031b
 
-.field public static final switchPadding:I = 0x7f040319
+.field public static final switchPadding:I = 0x7f04031c
 
-.field public static final switchStyle:I = 0x7f04031a
+.field public static final switchStyle:I = 0x7f04031d
 
-.field public static final switchTextAppearance:I = 0x7f04031b
+.field public static final switchTextAppearance:I = 0x7f04031e
 
-.field public static final tabBackground:I = 0x7f04031c
+.field public static final tabBackground:I = 0x7f04031f
 
-.field public static final tabContentStart:I = 0x7f04031d
+.field public static final tabContentStart:I = 0x7f040320
 
-.field public static final tabGravity:I = 0x7f04031e
+.field public static final tabGravity:I = 0x7f040321
 
-.field public static final tabIconTint:I = 0x7f04031f
+.field public static final tabIconTint:I = 0x7f040322
 
-.field public static final tabIconTintMode:I = 0x7f040320
+.field public static final tabIconTintMode:I = 0x7f040323
 
-.field public static final tabIndicator:I = 0x7f040321
+.field public static final tabIndicator:I = 0x7f040324
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f040322
+.field public static final tabIndicatorAnimationDuration:I = 0x7f040325
 
-.field public static final tabIndicatorColor:I = 0x7f040323
+.field public static final tabIndicatorColor:I = 0x7f040326
 
-.field public static final tabIndicatorFullWidth:I = 0x7f040324
+.field public static final tabIndicatorFullWidth:I = 0x7f040327
 
-.field public static final tabIndicatorGravity:I = 0x7f040325
+.field public static final tabIndicatorGravity:I = 0x7f040328
 
-.field public static final tabIndicatorHeight:I = 0x7f040326
+.field public static final tabIndicatorHeight:I = 0x7f040329
 
-.field public static final tabInlineLabel:I = 0x7f040327
+.field public static final tabInlineLabel:I = 0x7f04032a
 
-.field public static final tabMaxWidth:I = 0x7f040328
+.field public static final tabMaxWidth:I = 0x7f04032b
 
-.field public static final tabMinWidth:I = 0x7f040329
+.field public static final tabMinWidth:I = 0x7f04032c
 
-.field public static final tabMode:I = 0x7f04032a
+.field public static final tabMode:I = 0x7f04032d
 
-.field public static final tabPadding:I = 0x7f04032b
+.field public static final tabPadding:I = 0x7f04032e
 
-.field public static final tabPaddingBottom:I = 0x7f04032c
+.field public static final tabPaddingBottom:I = 0x7f04032f
 
-.field public static final tabPaddingEnd:I = 0x7f04032d
+.field public static final tabPaddingEnd:I = 0x7f040330
 
-.field public static final tabPaddingStart:I = 0x7f04032e
+.field public static final tabPaddingStart:I = 0x7f040331
 
-.field public static final tabPaddingTop:I = 0x7f04032f
+.field public static final tabPaddingTop:I = 0x7f040332
 
-.field public static final tabRippleColor:I = 0x7f040330
+.field public static final tabRippleColor:I = 0x7f040333
 
-.field public static final tabSelectedTextColor:I = 0x7f040331
+.field public static final tabSelectedTextColor:I = 0x7f040334
 
-.field public static final tabStyle:I = 0x7f040332
+.field public static final tabStyle:I = 0x7f040335
 
-.field public static final tabTextAppearance:I = 0x7f040333
+.field public static final tabTextAppearance:I = 0x7f040336
 
-.field public static final tabTextColor:I = 0x7f040334
+.field public static final tabTextColor:I = 0x7f040337
 
-.field public static final tabUnboundedRipple:I = 0x7f040335
+.field public static final tabUnboundedRipple:I = 0x7f040338
 
-.field public static final textAllCaps:I = 0x7f040339
+.field public static final textAllCaps:I = 0x7f04033c
 
-.field public static final textAppearanceBody1:I = 0x7f04033a
+.field public static final textAppearanceBody1:I = 0x7f04033d
 
-.field public static final textAppearanceBody2:I = 0x7f04033b
+.field public static final textAppearanceBody2:I = 0x7f04033e
 
-.field public static final textAppearanceButton:I = 0x7f04033c
+.field public static final textAppearanceButton:I = 0x7f04033f
 
-.field public static final textAppearanceCaption:I = 0x7f04033d
+.field public static final textAppearanceCaption:I = 0x7f040340
 
-.field public static final textAppearanceHeadline1:I = 0x7f04033e
+.field public static final textAppearanceHeadline1:I = 0x7f040341
 
-.field public static final textAppearanceHeadline2:I = 0x7f04033f
+.field public static final textAppearanceHeadline2:I = 0x7f040342
 
-.field public static final textAppearanceHeadline3:I = 0x7f040340
+.field public static final textAppearanceHeadline3:I = 0x7f040343
 
-.field public static final textAppearanceHeadline4:I = 0x7f040341
+.field public static final textAppearanceHeadline4:I = 0x7f040344
 
-.field public static final textAppearanceHeadline5:I = 0x7f040342
+.field public static final textAppearanceHeadline5:I = 0x7f040345
 
-.field public static final textAppearanceHeadline6:I = 0x7f040343
+.field public static final textAppearanceHeadline6:I = 0x7f040346
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040344
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040347
 
-.field public static final textAppearanceListItem:I = 0x7f040345
+.field public static final textAppearanceListItem:I = 0x7f040348
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040346
+.field public static final textAppearanceListItemSecondary:I = 0x7f040349
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040347
+.field public static final textAppearanceListItemSmall:I = 0x7f04034a
 
-.field public static final textAppearanceOverline:I = 0x7f040348
+.field public static final textAppearanceOverline:I = 0x7f04034b
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040349
+.field public static final textAppearancePopupMenuHeader:I = 0x7f04034c
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04034a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04034d
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04034b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04034e
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04034c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04034f
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04034d
+.field public static final textAppearanceSubtitle1:I = 0x7f040350
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04034e
+.field public static final textAppearanceSubtitle2:I = 0x7f040351
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04034f
+.field public static final textColorAlertDialogListItem:I = 0x7f040352
 
-.field public static final textColorSearchUrl:I = 0x7f040350
+.field public static final textColorSearchUrl:I = 0x7f040353
 
-.field public static final textEndPadding:I = 0x7f040351
+.field public static final textEndPadding:I = 0x7f040354
 
-.field public static final textInputStyle:I = 0x7f040352
+.field public static final textInputStyle:I = 0x7f040355
 
-.field public static final textStartPadding:I = 0x7f040353
+.field public static final textStartPadding:I = 0x7f040356
 
-.field public static final theme:I = 0x7f040355
+.field public static final theme:I = 0x7f040358
 
-.field public static final thickness:I = 0x7f0403a6
+.field public static final thickness:I = 0x7f0403a9
 
-.field public static final thumbTextPadding:I = 0x7f0403a7
+.field public static final thumbTextPadding:I = 0x7f0403aa
 
-.field public static final thumbTint:I = 0x7f0403a8
+.field public static final thumbTint:I = 0x7f0403ab
 
-.field public static final thumbTintMode:I = 0x7f0403a9
+.field public static final thumbTintMode:I = 0x7f0403ac
 
-.field public static final tickMark:I = 0x7f0403aa
+.field public static final tickMark:I = 0x7f0403ad
 
-.field public static final tickMarkTint:I = 0x7f0403ab
+.field public static final tickMarkTint:I = 0x7f0403ae
 
-.field public static final tickMarkTintMode:I = 0x7f0403ac
+.field public static final tickMarkTintMode:I = 0x7f0403af
 
-.field public static final tint:I = 0x7f0403ad
+.field public static final tint:I = 0x7f0403b0
 
-.field public static final tintMode:I = 0x7f0403ae
+.field public static final tintMode:I = 0x7f0403b1
 
-.field public static final title:I = 0x7f0403af
+.field public static final title:I = 0x7f0403b2
 
-.field public static final titleEnabled:I = 0x7f0403b0
+.field public static final titleEnabled:I = 0x7f0403b3
 
-.field public static final titleMargin:I = 0x7f0403b1
+.field public static final titleMargin:I = 0x7f0403b4
 
-.field public static final titleMarginBottom:I = 0x7f0403b2
+.field public static final titleMarginBottom:I = 0x7f0403b5
 
-.field public static final titleMarginEnd:I = 0x7f0403b3
+.field public static final titleMarginEnd:I = 0x7f0403b6
 
-.field public static final titleMarginStart:I = 0x7f0403b4
+.field public static final titleMarginStart:I = 0x7f0403b7
 
-.field public static final titleMarginTop:I = 0x7f0403b5
+.field public static final titleMarginTop:I = 0x7f0403b8
 
-.field public static final titleMargins:I = 0x7f0403b6
+.field public static final titleMargins:I = 0x7f0403b9
 
-.field public static final titleTextAppearance:I = 0x7f0403b7
+.field public static final titleTextAppearance:I = 0x7f0403ba
 
-.field public static final titleTextColor:I = 0x7f0403b8
+.field public static final titleTextColor:I = 0x7f0403bb
 
-.field public static final titleTextStyle:I = 0x7f0403b9
+.field public static final titleTextStyle:I = 0x7f0403bc
 
-.field public static final toolbarId:I = 0x7f0403ba
+.field public static final toolbarId:I = 0x7f0403bd
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f0403bb
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0403be
 
-.field public static final toolbarStyle:I = 0x7f0403bc
+.field public static final toolbarStyle:I = 0x7f0403bf
 
-.field public static final tooltipForegroundColor:I = 0x7f0403bd
+.field public static final tooltipForegroundColor:I = 0x7f0403c0
 
-.field public static final tooltipFrameBackground:I = 0x7f0403be
+.field public static final tooltipFrameBackground:I = 0x7f0403c1
 
-.field public static final tooltipText:I = 0x7f0403bf
+.field public static final tooltipText:I = 0x7f0403c2
 
-.field public static final track:I = 0x7f0403c0
+.field public static final track:I = 0x7f0403c3
 
-.field public static final trackTint:I = 0x7f0403c1
+.field public static final trackTint:I = 0x7f0403c4
 
-.field public static final trackTintMode:I = 0x7f0403c2
+.field public static final trackTintMode:I = 0x7f0403c5
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
-.field public static final useCompatPadding:I = 0x7f0403d7
+.field public static final useCompatPadding:I = 0x7f0403da
 
-.field public static final viewAspectRatio:I = 0x7f0403db
+.field public static final viewAspectRatio:I = 0x7f0403e0
 
-.field public static final viewInflaterClass:I = 0x7f0403dc
+.field public static final viewInflaterClass:I = 0x7f0403e1
 
-.field public static final voiceIcon:I = 0x7f0403dd
+.field public static final voiceIcon:I = 0x7f0403e2
 
-.field public static final windowActionBar:I = 0x7f0403df
+.field public static final windowActionBar:I = 0x7f0403e4
 
-.field public static final windowActionBarOverlay:I = 0x7f0403e0
+.field public static final windowActionBarOverlay:I = 0x7f0403e5
 
-.field public static final windowActionModeOverlay:I = 0x7f0403e1
+.field public static final windowActionModeOverlay:I = 0x7f0403e6
 
-.field public static final windowFixedHeightMajor:I = 0x7f0403e2
+.field public static final windowFixedHeightMajor:I = 0x7f0403e7
 
-.field public static final windowFixedHeightMinor:I = 0x7f0403e3
+.field public static final windowFixedHeightMinor:I = 0x7f0403e8
 
-.field public static final windowFixedWidthMajor:I = 0x7f0403e4
+.field public static final windowFixedWidthMajor:I = 0x7f0403e9
 
-.field public static final windowFixedWidthMinor:I = 0x7f0403e5
+.field public static final windowFixedWidthMinor:I = 0x7f0403ea
 
-.field public static final windowMinWidthMajor:I = 0x7f0403e6
+.field public static final windowMinWidthMajor:I = 0x7f0403eb
 
-.field public static final windowMinWidthMinor:I = 0x7f0403e7
+.field public static final windowMinWidthMinor:I = 0x7f0403ec
 
-.field public static final windowNoTitle:I = 0x7f0403e8
+.field public static final windowNoTitle:I = 0x7f0403ed
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$color.smali b/com.discord/smali/com/discord/gateway/R$color.smali
index 4c84ea79f8..3b3e03fd6a 100644
--- a/com.discord/smali/com/discord/gateway/R$color.smali
+++ b/com.discord/smali/com/discord/gateway/R$color.smali
@@ -75,223 +75,223 @@
 
 .field public static final background_material_light:I = 0x7f06001f
 
-.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060035
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
 
-.field public static final bright_foreground_material_dark:I = 0x7f060038
+.field public static final bright_foreground_material_dark:I = 0x7f060039
 
-.field public static final bright_foreground_material_light:I = 0x7f060039
+.field public static final bright_foreground_material_light:I = 0x7f06003a
 
-.field public static final button_material_dark:I = 0x7f06003f
+.field public static final button_material_dark:I = 0x7f060040
 
-.field public static final button_material_light:I = 0x7f060040
+.field public static final button_material_light:I = 0x7f060041
 
-.field public static final cardview_dark_background:I = 0x7f060041
+.field public static final cardview_dark_background:I = 0x7f060042
 
-.field public static final cardview_light_background:I = 0x7f060042
+.field public static final cardview_light_background:I = 0x7f060043
 
-.field public static final cardview_shadow_end_color:I = 0x7f060043
+.field public static final cardview_shadow_end_color:I = 0x7f060044
 
-.field public static final cardview_shadow_start_color:I = 0x7f060044
+.field public static final cardview_shadow_start_color:I = 0x7f060045
 
-.field public static final common_google_signin_btn_text_dark:I = 0x7f06004c
+.field public static final common_google_signin_btn_text_dark:I = 0x7f06004f
 
-.field public static final common_google_signin_btn_text_dark_default:I = 0x7f06004d
+.field public static final common_google_signin_btn_text_dark_default:I = 0x7f060050
 
-.field public static final common_google_signin_btn_text_dark_disabled:I = 0x7f06004e
+.field public static final common_google_signin_btn_text_dark_disabled:I = 0x7f060051
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f06004f
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f060052
 
-.field public static final common_google_signin_btn_text_dark_pressed:I = 0x7f060050
+.field public static final common_google_signin_btn_text_dark_pressed:I = 0x7f060053
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f060051
+.field public static final common_google_signin_btn_text_light:I = 0x7f060054
 
-.field public static final common_google_signin_btn_text_light_default:I = 0x7f060052
+.field public static final common_google_signin_btn_text_light_default:I = 0x7f060055
 
-.field public static final common_google_signin_btn_text_light_disabled:I = 0x7f060053
+.field public static final common_google_signin_btn_text_light_disabled:I = 0x7f060056
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f060054
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f060057
 
-.field public static final common_google_signin_btn_text_light_pressed:I = 0x7f060055
+.field public static final common_google_signin_btn_text_light_pressed:I = 0x7f060058
 
-.field public static final common_google_signin_btn_tint:I = 0x7f060056
+.field public static final common_google_signin_btn_tint:I = 0x7f060059
 
-.field public static final design_bottom_navigation_shadow_color:I = 0x7f060059
+.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005c
 
-.field public static final design_default_color_primary:I = 0x7f06005a
+.field public static final design_default_color_primary:I = 0x7f06005d
 
-.field public static final design_default_color_primary_dark:I = 0x7f06005b
+.field public static final design_default_color_primary_dark:I = 0x7f06005e
 
-.field public static final design_error:I = 0x7f06005c
+.field public static final design_error:I = 0x7f06005f
 
-.field public static final design_fab_shadow_end_color:I = 0x7f06005d
+.field public static final design_fab_shadow_end_color:I = 0x7f060060
 
-.field public static final design_fab_shadow_mid_color:I = 0x7f06005e
+.field public static final design_fab_shadow_mid_color:I = 0x7f060061
 
-.field public static final design_fab_shadow_start_color:I = 0x7f06005f
+.field public static final design_fab_shadow_start_color:I = 0x7f060062
 
-.field public static final design_fab_stroke_end_inner_color:I = 0x7f060060
+.field public static final design_fab_stroke_end_inner_color:I = 0x7f060063
 
-.field public static final design_fab_stroke_end_outer_color:I = 0x7f060061
+.field public static final design_fab_stroke_end_outer_color:I = 0x7f060064
 
-.field public static final design_fab_stroke_top_inner_color:I = 0x7f060062
+.field public static final design_fab_stroke_top_inner_color:I = 0x7f060065
 
-.field public static final design_fab_stroke_top_outer_color:I = 0x7f060063
+.field public static final design_fab_stroke_top_outer_color:I = 0x7f060066
 
-.field public static final design_snackbar_background_color:I = 0x7f060064
+.field public static final design_snackbar_background_color:I = 0x7f060067
 
-.field public static final design_tint_password_toggle:I = 0x7f060065
+.field public static final design_tint_password_toggle:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060066
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060067
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f060068
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f060069
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final error_color_material_dark:I = 0x7f06006a
+.field public static final error_color_material_dark:I = 0x7f06006d
 
-.field public static final error_color_material_light:I = 0x7f06006b
+.field public static final error_color_material_light:I = 0x7f06006e
 
-.field public static final foreground_material_dark:I = 0x7f060070
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060071
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060080
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060081
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f06008f
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060090
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060091
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060092
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060093
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060094
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060095
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060096
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060097
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f060098
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f060099
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009a
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009b
+.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009e
 
-.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009c
+.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009f
 
-.field public static final mtrl_btn_bg_color_disabled:I = 0x7f06009d
+.field public static final mtrl_btn_bg_color_disabled:I = 0x7f0600a0
 
-.field public static final mtrl_btn_bg_color_selector:I = 0x7f06009e
+.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a1
 
-.field public static final mtrl_btn_ripple_color:I = 0x7f06009f
+.field public static final mtrl_btn_ripple_color:I = 0x7f0600a2
 
-.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a0
+.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a3
 
-.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a1
+.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a4
 
-.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a2
+.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a5
 
-.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a3
+.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a6
 
-.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a4
+.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a7
 
-.field public static final mtrl_chip_background_color:I = 0x7f0600a5
+.field public static final mtrl_chip_background_color:I = 0x7f0600a8
 
-.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a6
+.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a9
 
-.field public static final mtrl_chip_ripple_color:I = 0x7f0600a7
+.field public static final mtrl_chip_ripple_color:I = 0x7f0600aa
 
-.field public static final mtrl_chip_text_color:I = 0x7f0600a8
+.field public static final mtrl_chip_text_color:I = 0x7f0600ab
 
-.field public static final mtrl_fab_ripple_color:I = 0x7f0600a9
+.field public static final mtrl_fab_ripple_color:I = 0x7f0600ac
 
-.field public static final mtrl_scrim_color:I = 0x7f0600aa
+.field public static final mtrl_scrim_color:I = 0x7f0600ad
 
-.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ab
+.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ae
 
-.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600ac
+.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600af
 
-.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600ad
+.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600b0
 
-.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600ae
+.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b1
 
-.field public static final mtrl_tabs_ripple_color:I = 0x7f0600af
+.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b2
 
-.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b0
+.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b3
 
-.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b1
+.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b4
 
-.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b2
+.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b5
 
-.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b3
+.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b6
 
-.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b4
+.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b7
 
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final notification_material_background_media_default_color:I = 0x7f0600b7
+.field public static final notification_material_background_media_default_color:I = 0x7f0600ba
 
-.field public static final primary_dark_material_dark:I = 0x7f0600d9
+.field public static final primary_dark_material_dark:I = 0x7f0600dc
 
-.field public static final primary_dark_material_light:I = 0x7f0600da
+.field public static final primary_dark_material_light:I = 0x7f0600dd
 
-.field public static final primary_material_dark:I = 0x7f0600ea
+.field public static final primary_material_dark:I = 0x7f0600ed
 
-.field public static final primary_material_light:I = 0x7f0600eb
+.field public static final primary_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ec
+.field public static final primary_text_default_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ed
+.field public static final primary_text_default_material_light:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ee
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f1
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f2
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fb
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600ff
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f060100
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060133
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060134
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060136
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060137
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$dimen.smali b/com.discord/smali/com/discord/gateway/R$dimen.smali
index 8a58230bf5..13b5f40986 100644
--- a/com.discord/smali/com/discord/gateway/R$dimen.smali
+++ b/com.discord/smali/com/discord/gateway/R$dimen.smali
@@ -187,273 +187,273 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final design_appbar_elevation:I = 0x7f070080
+.field public static final design_appbar_elevation:I = 0x7f070081
 
-.field public static final design_bottom_navigation_active_item_max_width:I = 0x7f070081
+.field public static final design_bottom_navigation_active_item_max_width:I = 0x7f070082
 
-.field public static final design_bottom_navigation_active_item_min_width:I = 0x7f070082
+.field public static final design_bottom_navigation_active_item_min_width:I = 0x7f070083
 
-.field public static final design_bottom_navigation_active_text_size:I = 0x7f070083
+.field public static final design_bottom_navigation_active_text_size:I = 0x7f070084
 
-.field public static final design_bottom_navigation_elevation:I = 0x7f070084
+.field public static final design_bottom_navigation_elevation:I = 0x7f070085
 
-.field public static final design_bottom_navigation_height:I = 0x7f070085
+.field public static final design_bottom_navigation_height:I = 0x7f070086
 
-.field public static final design_bottom_navigation_icon_size:I = 0x7f070086
+.field public static final design_bottom_navigation_icon_size:I = 0x7f070087
 
-.field public static final design_bottom_navigation_item_max_width:I = 0x7f070087
+.field public static final design_bottom_navigation_item_max_width:I = 0x7f070088
 
-.field public static final design_bottom_navigation_item_min_width:I = 0x7f070088
+.field public static final design_bottom_navigation_item_min_width:I = 0x7f070089
 
-.field public static final design_bottom_navigation_margin:I = 0x7f070089
+.field public static final design_bottom_navigation_margin:I = 0x7f07008a
 
-.field public static final design_bottom_navigation_shadow_height:I = 0x7f07008a
+.field public static final design_bottom_navigation_shadow_height:I = 0x7f07008b
 
-.field public static final design_bottom_navigation_text_size:I = 0x7f07008b
+.field public static final design_bottom_navigation_text_size:I = 0x7f07008c
 
-.field public static final design_bottom_sheet_modal_elevation:I = 0x7f07008c
+.field public static final design_bottom_sheet_modal_elevation:I = 0x7f07008d
 
-.field public static final design_bottom_sheet_peek_height_min:I = 0x7f07008d
+.field public static final design_bottom_sheet_peek_height_min:I = 0x7f07008e
 
-.field public static final design_fab_border_width:I = 0x7f07008e
+.field public static final design_fab_border_width:I = 0x7f07008f
 
-.field public static final design_fab_elevation:I = 0x7f07008f
+.field public static final design_fab_elevation:I = 0x7f070090
 
-.field public static final design_fab_image_size:I = 0x7f070090
+.field public static final design_fab_image_size:I = 0x7f070091
 
-.field public static final design_fab_size_mini:I = 0x7f070091
+.field public static final design_fab_size_mini:I = 0x7f070092
 
-.field public static final design_fab_size_normal:I = 0x7f070092
+.field public static final design_fab_size_normal:I = 0x7f070093
 
-.field public static final design_fab_translation_z_hovered_focused:I = 0x7f070093
+.field public static final design_fab_translation_z_hovered_focused:I = 0x7f070094
 
-.field public static final design_fab_translation_z_pressed:I = 0x7f070094
+.field public static final design_fab_translation_z_pressed:I = 0x7f070095
 
-.field public static final design_navigation_elevation:I = 0x7f070095
+.field public static final design_navigation_elevation:I = 0x7f070096
 
-.field public static final design_navigation_icon_padding:I = 0x7f070096
+.field public static final design_navigation_icon_padding:I = 0x7f070097
 
-.field public static final design_navigation_icon_size:I = 0x7f070097
+.field public static final design_navigation_icon_size:I = 0x7f070098
 
-.field public static final design_navigation_item_horizontal_padding:I = 0x7f070098
+.field public static final design_navigation_item_horizontal_padding:I = 0x7f070099
 
-.field public static final design_navigation_item_icon_padding:I = 0x7f070099
+.field public static final design_navigation_item_icon_padding:I = 0x7f07009a
 
-.field public static final design_navigation_max_width:I = 0x7f07009a
+.field public static final design_navigation_max_width:I = 0x7f07009b
 
-.field public static final design_navigation_padding_bottom:I = 0x7f07009b
+.field public static final design_navigation_padding_bottom:I = 0x7f07009c
 
-.field public static final design_navigation_separator_vertical_padding:I = 0x7f07009c
+.field public static final design_navigation_separator_vertical_padding:I = 0x7f07009d
 
-.field public static final design_snackbar_action_inline_max_width:I = 0x7f07009d
+.field public static final design_snackbar_action_inline_max_width:I = 0x7f07009e
 
-.field public static final design_snackbar_background_corner_radius:I = 0x7f07009e
+.field public static final design_snackbar_background_corner_radius:I = 0x7f07009f
 
-.field public static final design_snackbar_elevation:I = 0x7f07009f
+.field public static final design_snackbar_elevation:I = 0x7f0700a0
 
-.field public static final design_snackbar_extra_spacing_horizontal:I = 0x7f0700a0
+.field public static final design_snackbar_extra_spacing_horizontal:I = 0x7f0700a1
 
-.field public static final design_snackbar_max_width:I = 0x7f0700a1
+.field public static final design_snackbar_max_width:I = 0x7f0700a2
 
-.field public static final design_snackbar_min_width:I = 0x7f0700a2
+.field public static final design_snackbar_min_width:I = 0x7f0700a3
 
-.field public static final design_snackbar_padding_horizontal:I = 0x7f0700a3
+.field public static final design_snackbar_padding_horizontal:I = 0x7f0700a4
 
-.field public static final design_snackbar_padding_vertical:I = 0x7f0700a4
+.field public static final design_snackbar_padding_vertical:I = 0x7f0700a5
 
-.field public static final design_snackbar_padding_vertical_2lines:I = 0x7f0700a5
+.field public static final design_snackbar_padding_vertical_2lines:I = 0x7f0700a6
 
-.field public static final design_snackbar_text_size:I = 0x7f0700a6
+.field public static final design_snackbar_text_size:I = 0x7f0700a7
 
-.field public static final design_tab_max_width:I = 0x7f0700a7
+.field public static final design_tab_max_width:I = 0x7f0700a8
 
-.field public static final design_tab_scrollable_min_width:I = 0x7f0700a8
+.field public static final design_tab_scrollable_min_width:I = 0x7f0700a9
 
-.field public static final design_tab_text_size:I = 0x7f0700a9
+.field public static final design_tab_text_size:I = 0x7f0700aa
 
-.field public static final design_tab_text_size_2line:I = 0x7f0700aa
+.field public static final design_tab_text_size_2line:I = 0x7f0700ab
 
-.field public static final design_textinput_caption_translate_y:I = 0x7f0700ab
+.field public static final design_textinput_caption_translate_y:I = 0x7f0700ac
 
-.field public static final disabled_alpha_material_dark:I = 0x7f0700b1
+.field public static final disabled_alpha_material_dark:I = 0x7f0700b2
 
-.field public static final disabled_alpha_material_light:I = 0x7f0700b2
+.field public static final disabled_alpha_material_light:I = 0x7f0700b3
 
-.field public static final fastscroll_default_thickness:I = 0x7f0700b8
+.field public static final fastscroll_default_thickness:I = 0x7f0700ba
 
-.field public static final fastscroll_margin:I = 0x7f0700b9
+.field public static final fastscroll_margin:I = 0x7f0700bb
 
-.field public static final fastscroll_minimum_range:I = 0x7f0700ba
+.field public static final fastscroll_minimum_range:I = 0x7f0700bc
 
-.field public static final highlight_alpha_material_colored:I = 0x7f0700c4
+.field public static final highlight_alpha_material_colored:I = 0x7f0700c6
 
-.field public static final highlight_alpha_material_dark:I = 0x7f0700c5
+.field public static final highlight_alpha_material_dark:I = 0x7f0700c7
 
-.field public static final highlight_alpha_material_light:I = 0x7f0700c6
+.field public static final highlight_alpha_material_light:I = 0x7f0700c8
 
-.field public static final hint_alpha_material_dark:I = 0x7f0700c7
+.field public static final hint_alpha_material_dark:I = 0x7f0700c9
 
-.field public static final hint_alpha_material_light:I = 0x7f0700c8
+.field public static final hint_alpha_material_light:I = 0x7f0700ca
 
-.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700c9
+.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700cb
 
-.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ca
+.field public static final hint_pressed_alpha_material_light:I = 0x7f0700cc
 
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700cc
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700ce
 
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700cd
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700cf
 
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700ce
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d0
 
-.field public static final mtrl_bottomappbar_fabOffsetEndMode:I = 0x7f0700d8
+.field public static final mtrl_bottomappbar_fabOffsetEndMode:I = 0x7f0700da
 
-.field public static final mtrl_bottomappbar_fab_cradle_margin:I = 0x7f0700d9
+.field public static final mtrl_bottomappbar_fab_cradle_margin:I = 0x7f0700db
 
-.field public static final mtrl_bottomappbar_fab_cradle_rounded_corner_radius:I = 0x7f0700da
+.field public static final mtrl_bottomappbar_fab_cradle_rounded_corner_radius:I = 0x7f0700dc
 
-.field public static final mtrl_bottomappbar_fab_cradle_vertical_offset:I = 0x7f0700db
+.field public static final mtrl_bottomappbar_fab_cradle_vertical_offset:I = 0x7f0700dd
 
-.field public static final mtrl_bottomappbar_height:I = 0x7f0700dc
+.field public static final mtrl_bottomappbar_height:I = 0x7f0700de
 
-.field public static final mtrl_btn_corner_radius:I = 0x7f0700dd
+.field public static final mtrl_btn_corner_radius:I = 0x7f0700df
 
-.field public static final mtrl_btn_dialog_btn_min_width:I = 0x7f0700de
+.field public static final mtrl_btn_dialog_btn_min_width:I = 0x7f0700e0
 
-.field public static final mtrl_btn_disabled_elevation:I = 0x7f0700df
+.field public static final mtrl_btn_disabled_elevation:I = 0x7f0700e1
 
-.field public static final mtrl_btn_disabled_z:I = 0x7f0700e0
+.field public static final mtrl_btn_disabled_z:I = 0x7f0700e2
 
-.field public static final mtrl_btn_elevation:I = 0x7f0700e1
+.field public static final mtrl_btn_elevation:I = 0x7f0700e3
 
-.field public static final mtrl_btn_focused_z:I = 0x7f0700e2
+.field public static final mtrl_btn_focused_z:I = 0x7f0700e4
 
-.field public static final mtrl_btn_hovered_z:I = 0x7f0700e3
+.field public static final mtrl_btn_hovered_z:I = 0x7f0700e5
 
-.field public static final mtrl_btn_icon_btn_padding_left:I = 0x7f0700e4
+.field public static final mtrl_btn_icon_btn_padding_left:I = 0x7f0700e6
 
-.field public static final mtrl_btn_icon_padding:I = 0x7f0700e5
+.field public static final mtrl_btn_icon_padding:I = 0x7f0700e7
 
-.field public static final mtrl_btn_inset:I = 0x7f0700e6
+.field public static final mtrl_btn_inset:I = 0x7f0700e8
 
-.field public static final mtrl_btn_letter_spacing:I = 0x7f0700e7
+.field public static final mtrl_btn_letter_spacing:I = 0x7f0700e9
 
-.field public static final mtrl_btn_padding_bottom:I = 0x7f0700e8
+.field public static final mtrl_btn_padding_bottom:I = 0x7f0700ea
 
-.field public static final mtrl_btn_padding_left:I = 0x7f0700e9
+.field public static final mtrl_btn_padding_left:I = 0x7f0700eb
 
-.field public static final mtrl_btn_padding_right:I = 0x7f0700ea
+.field public static final mtrl_btn_padding_right:I = 0x7f0700ec
 
-.field public static final mtrl_btn_padding_top:I = 0x7f0700eb
+.field public static final mtrl_btn_padding_top:I = 0x7f0700ed
 
-.field public static final mtrl_btn_pressed_z:I = 0x7f0700ec
+.field public static final mtrl_btn_pressed_z:I = 0x7f0700ee
 
-.field public static final mtrl_btn_stroke_size:I = 0x7f0700ed
+.field public static final mtrl_btn_stroke_size:I = 0x7f0700ef
 
-.field public static final mtrl_btn_text_btn_icon_padding:I = 0x7f0700ee
+.field public static final mtrl_btn_text_btn_icon_padding:I = 0x7f0700f0
 
-.field public static final mtrl_btn_text_btn_padding_left:I = 0x7f0700ef
+.field public static final mtrl_btn_text_btn_padding_left:I = 0x7f0700f1
 
-.field public static final mtrl_btn_text_btn_padding_right:I = 0x7f0700f0
+.field public static final mtrl_btn_text_btn_padding_right:I = 0x7f0700f2
 
-.field public static final mtrl_btn_text_size:I = 0x7f0700f1
+.field public static final mtrl_btn_text_size:I = 0x7f0700f3
 
-.field public static final mtrl_btn_z:I = 0x7f0700f2
+.field public static final mtrl_btn_z:I = 0x7f0700f4
 
-.field public static final mtrl_card_elevation:I = 0x7f0700f3
+.field public static final mtrl_card_elevation:I = 0x7f0700f5
 
-.field public static final mtrl_card_spacing:I = 0x7f0700f4
+.field public static final mtrl_card_spacing:I = 0x7f0700f6
 
-.field public static final mtrl_chip_pressed_translation_z:I = 0x7f0700f5
+.field public static final mtrl_chip_pressed_translation_z:I = 0x7f0700f7
 
-.field public static final mtrl_chip_text_size:I = 0x7f0700f6
+.field public static final mtrl_chip_text_size:I = 0x7f0700f8
 
-.field public static final mtrl_fab_elevation:I = 0x7f0700f7
+.field public static final mtrl_fab_elevation:I = 0x7f0700f9
 
-.field public static final mtrl_fab_translation_z_hovered_focused:I = 0x7f0700f8
+.field public static final mtrl_fab_translation_z_hovered_focused:I = 0x7f0700fa
 
-.field public static final mtrl_fab_translation_z_pressed:I = 0x7f0700f9
+.field public static final mtrl_fab_translation_z_pressed:I = 0x7f0700fb
 
-.field public static final mtrl_navigation_elevation:I = 0x7f0700fa
+.field public static final mtrl_navigation_elevation:I = 0x7f0700fc
 
-.field public static final mtrl_navigation_item_horizontal_padding:I = 0x7f0700fb
+.field public static final mtrl_navigation_item_horizontal_padding:I = 0x7f0700fd
 
-.field public static final mtrl_navigation_item_icon_padding:I = 0x7f0700fc
+.field public static final mtrl_navigation_item_icon_padding:I = 0x7f0700fe
 
-.field public static final mtrl_snackbar_background_corner_radius:I = 0x7f0700fd
+.field public static final mtrl_snackbar_background_corner_radius:I = 0x7f0700ff
 
-.field public static final mtrl_snackbar_margin:I = 0x7f0700fe
+.field public static final mtrl_snackbar_margin:I = 0x7f070100
 
-.field public static final mtrl_textinput_box_bottom_offset:I = 0x7f0700ff
+.field public static final mtrl_textinput_box_bottom_offset:I = 0x7f070101
 
-.field public static final mtrl_textinput_box_corner_radius_medium:I = 0x7f070100
+.field public static final mtrl_textinput_box_corner_radius_medium:I = 0x7f070102
 
-.field public static final mtrl_textinput_box_corner_radius_small:I = 0x7f070101
+.field public static final mtrl_textinput_box_corner_radius_small:I = 0x7f070103
 
-.field public static final mtrl_textinput_box_label_cutout_padding:I = 0x7f070102
+.field public static final mtrl_textinput_box_label_cutout_padding:I = 0x7f070104
 
-.field public static final mtrl_textinput_box_padding_end:I = 0x7f070103
+.field public static final mtrl_textinput_box_padding_end:I = 0x7f070105
 
-.field public static final mtrl_textinput_box_stroke_width_default:I = 0x7f070104
+.field public static final mtrl_textinput_box_stroke_width_default:I = 0x7f070106
 
-.field public static final mtrl_textinput_box_stroke_width_focused:I = 0x7f070105
+.field public static final mtrl_textinput_box_stroke_width_focused:I = 0x7f070107
 
-.field public static final mtrl_textinput_outline_box_expanded_padding:I = 0x7f070106
+.field public static final mtrl_textinput_outline_box_expanded_padding:I = 0x7f070108
 
-.field public static final mtrl_toolbar_default_height:I = 0x7f070107
+.field public static final mtrl_toolbar_default_height:I = 0x7f070109
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
-.field public static final subtitle_corner_radius:I = 0x7f070124
+.field public static final subtitle_corner_radius:I = 0x7f070126
 
-.field public static final subtitle_outline_width:I = 0x7f070125
+.field public static final subtitle_outline_width:I = 0x7f070127
 
-.field public static final subtitle_shadow_offset:I = 0x7f070126
+.field public static final subtitle_shadow_offset:I = 0x7f070128
 
-.field public static final subtitle_shadow_radius:I = 0x7f070127
+.field public static final subtitle_shadow_radius:I = 0x7f070129
 
-.field public static final tooltip_corner_radius:I = 0x7f07012b
+.field public static final tooltip_corner_radius:I = 0x7f07012d
 
-.field public static final tooltip_horizontal_padding:I = 0x7f07012c
+.field public static final tooltip_horizontal_padding:I = 0x7f07012e
 
-.field public static final tooltip_margin:I = 0x7f07012d
+.field public static final tooltip_margin:I = 0x7f07012f
 
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07012e
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f070130
 
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07012f
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f070131
 
-.field public static final tooltip_vertical_padding:I = 0x7f070130
+.field public static final tooltip_vertical_padding:I = 0x7f070132
 
-.field public static final tooltip_y_offset_non_touch:I = 0x7f070131
+.field public static final tooltip_y_offset_non_touch:I = 0x7f070133
 
-.field public static final tooltip_y_offset_touch:I = 0x7f070132
+.field public static final tooltip_y_offset_touch:I = 0x7f070134
 
 
 # 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 e7aaea3484..406b481021 100644
--- a/com.discord/smali/com/discord/gateway/R$drawable.smali
+++ b/com.discord/smali/com/discord/gateway/R$drawable.smali
@@ -15,277 +15,277 @@
 
 
 # static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080017
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080017
+.field public static final abc_action_bar_item_background_material:I = 0x7f080018
 
-.field public static final abc_btn_borderless_material:I = 0x7f080018
+.field public static final abc_btn_borderless_material:I = 0x7f080019
 
-.field public static final abc_btn_check_material:I = 0x7f080019
+.field public static final abc_btn_check_material:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
 
-.field public static final abc_btn_colored_material:I = 0x7f08001c
+.field public static final abc_btn_colored_material:I = 0x7f08001d
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
 
-.field public static final abc_btn_radio_material:I = 0x7f08001e
+.field public static final abc_btn_radio_material:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080023
+.field public static final abc_cab_background_internal_bg:I = 0x7f080024
 
-.field public static final abc_cab_background_top_material:I = 0x7f080024
+.field public static final abc_cab_background_top_material:I = 0x7f080025
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
 
-.field public static final abc_control_background_material:I = 0x7f080026
+.field public static final abc_control_background_material:I = 0x7f080027
 
-.field public static final abc_dialog_material_background:I = 0x7f080027
+.field public static final abc_dialog_material_background:I = 0x7f080028
 
-.field public static final abc_edit_text_material:I = 0x7f080028
+.field public static final abc_edit_text_material:I = 0x7f080029
 
-.field public static final abc_ic_ab_back_material:I = 0x7f080029
+.field public static final abc_ic_ab_back_material:I = 0x7f08002a
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
 
-.field public static final abc_ic_clear_material:I = 0x7f08002b
+.field public static final abc_ic_clear_material:I = 0x7f08002c
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
 
-.field public static final abc_ic_search_api_material:I = 0x7f080034
+.field public static final abc_ic_search_api_material:I = 0x7f080035
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080035
+.field public static final abc_ic_star_black_16dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080036
+.field public static final abc_ic_star_black_36dp:I = 0x7f080037
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080037
+.field public static final abc_ic_star_black_48dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003c
+.field public static final abc_item_background_holo_dark:I = 0x7f08003d
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003d
+.field public static final abc_item_background_holo_light:I = 0x7f08003e
 
-.field public static final abc_list_divider_material:I = 0x7f08003e
+.field public static final abc_list_divider_material:I = 0x7f08003f
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
 
-.field public static final abc_list_focused_holo:I = 0x7f080040
+.field public static final abc_list_focused_holo:I = 0x7f080041
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080041
+.field public static final abc_list_longpressed_holo:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080043
+.field public static final abc_list_pressed_holo_light:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080048
+.field public static final abc_list_selector_holo_dark:I = 0x7f080049
 
-.field public static final abc_list_selector_holo_light:I = 0x7f080049
+.field public static final abc_list_selector_holo_light:I = 0x7f08004a
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_material:I = 0x7f08004d
+.field public static final abc_ratingbar_material:I = 0x7f08004e
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004e
+.field public static final abc_ratingbar_small_material:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080054
+.field public static final abc_seekbar_thumb_material:I = 0x7f080055
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
 
-.field public static final abc_seekbar_track_material:I = 0x7f080056
+.field public static final abc_seekbar_track_material:I = 0x7f080057
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
 
-.field public static final abc_switch_thumb_material:I = 0x7f080059
+.field public static final abc_switch_thumb_material:I = 0x7f08005a
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005b
+.field public static final abc_tab_indicator_material:I = 0x7f08005c
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
 
-.field public static final abc_text_cursor_material:I = 0x7f08005d
+.field public static final abc_text_cursor_material:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
 
-.field public static final abc_textfield_search_material:I = 0x7f080068
+.field public static final abc_textfield_search_material:I = 0x7f080069
 
-.field public static final abc_vector_test:I = 0x7f080069
+.field public static final abc_vector_test:I = 0x7f08006a
 
-.field public static final avd_hide_password:I = 0x7f080089
+.field public static final avd_hide_password:I = 0x7f08008a
 
-.field public static final avd_show_password:I = 0x7f08008a
+.field public static final avd_show_password:I = 0x7f08008b
 
-.field public static final common_full_open_on_phone:I = 0x7f08009f
+.field public static final common_full_open_on_phone:I = 0x7f0800a2
 
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a0
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a3
 
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a1
+.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a4
 
-.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a2
+.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a5
 
-.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a3
+.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a6
 
-.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a4
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a7
 
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a5
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a8
 
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a6
+.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a9
 
-.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800a7
+.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800aa
 
-.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800a8
+.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800ab
 
-.field public static final common_google_signin_btn_text_dark:I = 0x7f0800a9
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ac
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800aa
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ad
 
-.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ab
+.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ae
 
-.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800ac
+.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800af
 
-.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800ad
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800b0
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800ae
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800b1
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800af
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b2
 
-.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b0
+.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b3
 
-.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b1
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b4
 
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800b2
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
 
-.field public static final design_fab_background:I = 0x7f0800b3
+.field public static final design_fab_background:I = 0x7f0800b6
 
-.field public static final design_ic_visibility:I = 0x7f0800b4
+.field public static final design_ic_visibility:I = 0x7f0800b7
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b5
+.field public static final design_ic_visibility_off:I = 0x7f0800b8
 
-.field public static final design_password_eye:I = 0x7f0800b6
+.field public static final design_password_eye:I = 0x7f0800b9
 
-.field public static final design_snackbar_background:I = 0x7f0800b7
+.field public static final design_snackbar_background:I = 0x7f0800ba
 
-.field public static final drawable_chip_background:I = 0x7f0800fe
+.field public static final drawable_chip_background:I = 0x7f080105
 
-.field public static final drawable_chip_circle:I = 0x7f0800ff
+.field public static final drawable_chip_circle:I = 0x7f080106
 
-.field public static final drawable_chip_delete:I = 0x7f080100
+.field public static final drawable_chip_delete:I = 0x7f080107
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801ac
+.field public static final googleg_disabled_color_18:I = 0x7f0801bb
 
-.field public static final googleg_standard_color_18:I = 0x7f0801ad
+.field public static final googleg_standard_color_18:I = 0x7f0801bc
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802f0
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080300
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802f1
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080301
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802f2
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080302
 
-.field public static final mtrl_snackbar_background:I = 0x7f080439
+.field public static final mtrl_snackbar_background:I = 0x7f080454
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f08043a
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080455
 
-.field public static final navigation_empty_icon:I = 0x7f08043b
+.field public static final navigation_empty_icon:I = 0x7f080456
 
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
-.field public static final tooltip_frame_dark:I = 0x7f08044c
+.field public static final tooltip_frame_dark:I = 0x7f08046a
 
-.field public static final tooltip_frame_light:I = 0x7f08044d
+.field public static final tooltip_frame_light:I = 0x7f08046b
 
 
 # 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 59a37a62a3..0a1cbaef09 100644
--- a/com.discord/smali/com/discord/gateway/R$id.smali
+++ b/com.discord/smali/com/discord/gateway/R$id.smali
@@ -63,329 +63,329 @@
 
 .field public static final alertTitle:I = 0x7f0a0061
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final auto:I = 0x7f0a00b8
+.field public static final auto:I = 0x7f0a00b9
 
-.field public static final baseline:I = 0x7f0a00c8
+.field public static final baseline:I = 0x7f0a00c9
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final buttonPanel:I = 0x7f0a010c
+.field public static final buttonPanel:I = 0x7f0a010d
 
-.field public static final cancel_action:I = 0x7f0a0117
+.field public static final cancel_action:I = 0x7f0a0118
 
-.field public static final center:I = 0x7f0a0123
+.field public static final center:I = 0x7f0a0124
 
-.field public static final centerCrop:I = 0x7f0a0124
+.field public static final centerCrop:I = 0x7f0a0125
 
-.field public static final centerInside:I = 0x7f0a0125
+.field public static final centerInside:I = 0x7f0a0126
 
-.field public static final checkbox:I = 0x7f0a0212
+.field public static final checkbox:I = 0x7f0a0213
 
-.field public static final chip_image:I = 0x7f0a0214
+.field public static final chip_image:I = 0x7f0a0215
 
-.field public static final chip_text:I = 0x7f0a0215
+.field public static final chip_text:I = 0x7f0a0216
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final column:I = 0x7f0a0221
+.field public static final column:I = 0x7f0a0222
 
-.field public static final column_reverse:I = 0x7f0a0222
+.field public static final column_reverse:I = 0x7f0a0223
 
-.field public static final container:I = 0x7f0a0231
+.field public static final container:I = 0x7f0a0232
 
-.field public static final content:I = 0x7f0a0232
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0233
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final coordinator:I = 0x7f0a0237
+.field public static final coordinator:I = 0x7f0a0238
 
-.field public static final custom:I = 0x7f0a0247
+.field public static final custom:I = 0x7f0a0250
 
-.field public static final customPanel:I = 0x7f0a0248
+.field public static final customPanel:I = 0x7f0a0251
 
-.field public static final dark:I = 0x7f0a0249
+.field public static final dark:I = 0x7f0a0252
 
-.field public static final decor_content_parent:I = 0x7f0a024c
+.field public static final decor_content_parent:I = 0x7f0a0255
 
-.field public static final default_activity_button:I = 0x7f0a024d
+.field public static final default_activity_button:I = 0x7f0a0256
 
-.field public static final design_bottom_sheet:I = 0x7f0a024e
+.field public static final design_bottom_sheet:I = 0x7f0a0257
 
-.field public static final design_menu_item_action_area:I = 0x7f0a024f
+.field public static final design_menu_item_action_area:I = 0x7f0a0258
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a0250
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a0259
 
-.field public static final design_menu_item_text:I = 0x7f0a0251
+.field public static final design_menu_item_text:I = 0x7f0a025a
 
-.field public static final design_navigation_view:I = 0x7f0a0252
+.field public static final design_navigation_view:I = 0x7f0a025b
 
-.field public static final edit_query:I = 0x7f0a02a3
+.field public static final edit_query:I = 0x7f0a02ac
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final end_padder:I = 0x7f0a02bf
+.field public static final end_padder:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02c4
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02c5
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final fill:I = 0x7f0a02d9
+.field public static final fill:I = 0x7f0a02e2
 
-.field public static final filled:I = 0x7f0a02dc
+.field public static final filled:I = 0x7f0a02e5
 
-.field public static final fitBottomStart:I = 0x7f0a02dd
+.field public static final fitBottomStart:I = 0x7f0a02e6
 
-.field public static final fitCenter:I = 0x7f0a02de
+.field public static final fitCenter:I = 0x7f0a02e7
 
-.field public static final fitEnd:I = 0x7f0a02df
+.field public static final fitEnd:I = 0x7f0a02e8
 
-.field public static final fitStart:I = 0x7f0a02e0
+.field public static final fitStart:I = 0x7f0a02e9
 
-.field public static final fitXY:I = 0x7f0a02e1
+.field public static final fitXY:I = 0x7f0a02ea
 
-.field public static final fixed:I = 0x7f0a02e2
+.field public static final fixed:I = 0x7f0a02eb
 
-.field public static final flex_end:I = 0x7f0a02e3
+.field public static final flex_end:I = 0x7f0a02ec
 
-.field public static final flex_start:I = 0x7f0a02e4
+.field public static final flex_start:I = 0x7f0a02ed
 
-.field public static final focusCrop:I = 0x7f0a02e5
+.field public static final focusCrop:I = 0x7f0a02ee
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final ghost_view:I = 0x7f0a030f
+.field public static final ghost_view:I = 0x7f0a0314
 
-.field public static final group_divider:I = 0x7f0a0322
+.field public static final group_divider:I = 0x7f0a032b
 
-.field public static final home:I = 0x7f0a0382
+.field public static final home:I = 0x7f0a0392
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final icon_only:I = 0x7f0a0386
+.field public static final icon_only:I = 0x7f0a0396
 
-.field public static final image:I = 0x7f0a0388
+.field public static final image:I = 0x7f0a0398
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a03fa
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040a
 
-.field public static final labeled:I = 0x7f0a0401
+.field public static final labeled:I = 0x7f0a0411
 
-.field public static final largeLabel:I = 0x7f0a0402
+.field public static final largeLabel:I = 0x7f0a0412
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final light:I = 0x7f0a0409
+.field public static final light:I = 0x7f0a0419
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final listMode:I = 0x7f0a040d
+.field public static final listMode:I = 0x7f0a041d
 
-.field public static final list_item:I = 0x7f0a040e
+.field public static final list_item:I = 0x7f0a041e
 
-.field public static final masked:I = 0x7f0a042b
+.field public static final masked:I = 0x7f0a043b
 
-.field public static final media_actions:I = 0x7f0a042c
+.field public static final media_actions:I = 0x7f0a043c
 
-.field public static final message:I = 0x7f0a046f
+.field public static final message:I = 0x7f0a0482
 
-.field public static final mini:I = 0x7f0a0474
+.field public static final mini:I = 0x7f0a0487
 
-.field public static final mtrl_child_content_container:I = 0x7f0a0475
+.field public static final mtrl_child_content_container:I = 0x7f0a0488
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0476
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0489
 
-.field public static final multiply:I = 0x7f0a0477
+.field public static final multiply:I = 0x7f0a048a
 
-.field public static final navigation_header_container:I = 0x7f0a0479
+.field public static final navigation_header_container:I = 0x7f0a048c
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final nowrap:I = 0x7f0a0497
+.field public static final nowrap:I = 0x7f0a04ad
 
-.field public static final outline:I = 0x7f0a04b2
+.field public static final outline:I = 0x7f0a04c8
 
-.field public static final parallax:I = 0x7f0a04c1
+.field public static final parallax:I = 0x7f0a04d7
 
-.field public static final parentPanel:I = 0x7f0a04c3
+.field public static final parentPanel:I = 0x7f0a04d9
 
-.field public static final parent_matrix:I = 0x7f0a04c4
+.field public static final parent_matrix:I = 0x7f0a04da
 
-.field public static final pin:I = 0x7f0a0500
+.field public static final pin:I = 0x7f0a0517
 
-.field public static final progress_circular:I = 0x7f0a0543
+.field public static final progress_circular:I = 0x7f0a0553
 
-.field public static final progress_horizontal:I = 0x7f0a0545
+.field public static final progress_horizontal:I = 0x7f0a0555
 
-.field public static final radio:I = 0x7f0a0550
+.field public static final radio:I = 0x7f0a0560
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final row:I = 0x7f0a0594
+.field public static final row:I = 0x7f0a05ae
 
-.field public static final row_reverse:I = 0x7f0a0595
+.field public static final row_reverse:I = 0x7f0a05af
 
-.field public static final save_image_matrix:I = 0x7f0a0596
+.field public static final save_image_matrix:I = 0x7f0a05b0
 
-.field public static final save_non_transition_alpha:I = 0x7f0a0597
+.field public static final save_non_transition_alpha:I = 0x7f0a05b1
 
-.field public static final save_scale_type:I = 0x7f0a0598
+.field public static final save_scale_type:I = 0x7f0a05b2
 
-.field public static final screen:I = 0x7f0a059a
+.field public static final screen:I = 0x7f0a05b4
 
-.field public static final scrollIndicatorDown:I = 0x7f0a059c
+.field public static final scrollIndicatorDown:I = 0x7f0a05b6
 
-.field public static final scrollIndicatorUp:I = 0x7f0a059d
+.field public static final scrollIndicatorUp:I = 0x7f0a05b7
 
-.field public static final scrollView:I = 0x7f0a059e
+.field public static final scrollView:I = 0x7f0a05b8
 
-.field public static final scrollable:I = 0x7f0a05a0
+.field public static final scrollable:I = 0x7f0a05ba
 
-.field public static final search_badge:I = 0x7f0a05a2
+.field public static final search_badge:I = 0x7f0a05bc
 
-.field public static final search_bar:I = 0x7f0a05a3
+.field public static final search_bar:I = 0x7f0a05bd
 
-.field public static final search_button:I = 0x7f0a05a4
+.field public static final search_button:I = 0x7f0a05be
 
-.field public static final search_close_btn:I = 0x7f0a05a6
+.field public static final search_close_btn:I = 0x7f0a05c0
 
-.field public static final search_edit_frame:I = 0x7f0a05a7
+.field public static final search_edit_frame:I = 0x7f0a05c1
 
-.field public static final search_go_btn:I = 0x7f0a05aa
+.field public static final search_go_btn:I = 0x7f0a05c4
 
-.field public static final search_mag_icon:I = 0x7f0a05ac
+.field public static final search_mag_icon:I = 0x7f0a05c6
 
-.field public static final search_plate:I = 0x7f0a05ad
+.field public static final search_plate:I = 0x7f0a05c7
 
-.field public static final search_src_text:I = 0x7f0a05b0
+.field public static final search_src_text:I = 0x7f0a05ca
 
-.field public static final search_voice_btn:I = 0x7f0a05bc
+.field public static final search_voice_btn:I = 0x7f0a05d6
 
-.field public static final select_dialog_listview:I = 0x7f0a05bd
+.field public static final select_dialog_listview:I = 0x7f0a05d7
 
-.field public static final selected:I = 0x7f0a05be
+.field public static final selected:I = 0x7f0a05d8
 
-.field public static final shortcut:I = 0x7f0a06f7
+.field public static final shortcut:I = 0x7f0a0711
 
-.field public static final smallLabel:I = 0x7f0a06fb
+.field public static final smallLabel:I = 0x7f0a0715
 
-.field public static final snackbar_action:I = 0x7f0a06fc
+.field public static final snackbar_action:I = 0x7f0a0716
 
-.field public static final snackbar_text:I = 0x7f0a06fd
+.field public static final snackbar_text:I = 0x7f0a0717
 
-.field public static final space_around:I = 0x7f0a0701
+.field public static final space_around:I = 0x7f0a071b
 
-.field public static final space_between:I = 0x7f0a0702
+.field public static final space_between:I = 0x7f0a071c
 
-.field public static final spacer:I = 0x7f0a0703
+.field public static final spacer:I = 0x7f0a071d
 
-.field public static final split_action_bar:I = 0x7f0a0704
+.field public static final split_action_bar:I = 0x7f0a0724
 
-.field public static final src_atop:I = 0x7f0a0707
+.field public static final src_atop:I = 0x7f0a0727
 
-.field public static final src_in:I = 0x7f0a0708
+.field public static final src_in:I = 0x7f0a0728
 
-.field public static final src_over:I = 0x7f0a0709
+.field public static final src_over:I = 0x7f0a0729
 
-.field public static final standard:I = 0x7f0a070b
+.field public static final standard:I = 0x7f0a072b
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0710
+.field public static final status_bar_latest_event_content:I = 0x7f0a0730
 
-.field public static final stretch:I = 0x7f0a0723
+.field public static final stretch:I = 0x7f0a074c
 
-.field public static final submenuarrow:I = 0x7f0a0724
+.field public static final submenuarrow:I = 0x7f0a074d
 
-.field public static final submit_area:I = 0x7f0a0725
+.field public static final submit_area:I = 0x7f0a074e
 
-.field public static final tabMode:I = 0x7f0a0731
+.field public static final tabMode:I = 0x7f0a075a
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0741
+.field public static final textSpacerNoButtons:I = 0x7f0a076a
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0742
+.field public static final textSpacerNoTitle:I = 0x7f0a076b
 
-.field public static final text_input_password_toggle:I = 0x7f0a0745
+.field public static final text_input_password_toggle:I = 0x7f0a076e
 
-.field public static final textinput_counter:I = 0x7f0a0748
+.field public static final textinput_counter:I = 0x7f0a0771
 
-.field public static final textinput_error:I = 0x7f0a0749
+.field public static final textinput_error:I = 0x7f0a0772
 
-.field public static final textinput_helper_text:I = 0x7f0a074a
+.field public static final textinput_helper_text:I = 0x7f0a0773
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0750
+.field public static final titleDividerNoCustom:I = 0x7f0a0779
 
-.field public static final title_template:I = 0x7f0a0751
+.field public static final title_template:I = 0x7f0a077a
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
-.field public static final topPanel:I = 0x7f0a0757
+.field public static final topPanel:I = 0x7f0a0780
 
-.field public static final touch_outside:I = 0x7f0a0759
+.field public static final touch_outside:I = 0x7f0a0782
 
-.field public static final transition_current_scene:I = 0x7f0a075a
+.field public static final transition_current_scene:I = 0x7f0a0783
 
-.field public static final transition_layout_save:I = 0x7f0a075b
+.field public static final transition_layout_save:I = 0x7f0a0784
 
-.field public static final transition_position:I = 0x7f0a075c
+.field public static final transition_position:I = 0x7f0a0785
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a075d
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0786
 
-.field public static final transition_transform:I = 0x7f0a075e
+.field public static final transition_transform:I = 0x7f0a0787
 
-.field public static final uniform:I = 0x7f0a076a
+.field public static final uniform:I = 0x7f0a0793
 
-.field public static final unlabeled:I = 0x7f0a076b
+.field public static final unlabeled:I = 0x7f0a0794
 
-.field public static final up:I = 0x7f0a076d
+.field public static final up:I = 0x7f0a0796
 
-.field public static final view_offset_helper:I = 0x7f0a07db
+.field public static final view_offset_helper:I = 0x7f0a0818
 
-.field public static final visible:I = 0x7f0a07de
+.field public static final visible:I = 0x7f0a081b
 
-.field public static final wide:I = 0x7f0a080a
+.field public static final wide:I = 0x7f0a0848
 
-.field public static final wrap:I = 0x7f0a082d
+.field public static final wrap:I = 0x7f0a086a
 
-.field public static final wrap_content:I = 0x7f0a082e
+.field public static final wrap_content:I = 0x7f0a086b
 
-.field public static final wrap_reverse:I = 0x7f0a082f
+.field public static final wrap_reverse:I = 0x7f0a086c
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$layout.smali b/com.discord/smali/com/discord/gateway/R$layout.smali
index a58031d8c0..b4b1c236d6 100644
--- a/com.discord/smali/com/discord/gateway/R$layout.smali
+++ b/com.discord/smali/com/discord/gateway/R$layout.smali
@@ -99,49 +99,49 @@
 
 .field public static final design_text_input_password_icon:I = 0x7f0d0030
 
-.field public static final mtrl_layout_snackbar:I = 0x7f0d003f
+.field public static final mtrl_layout_snackbar:I = 0x7f0d0041
 
-.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0040
+.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0042
 
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_media_action:I = 0x7f0d0043
+.field public static final notification_media_action:I = 0x7f0d0045
 
-.field public static final notification_media_cancel_action:I = 0x7f0d0044
+.field public static final notification_media_cancel_action:I = 0x7f0d0046
 
-.field public static final notification_template_big_media:I = 0x7f0d0045
+.field public static final notification_template_big_media:I = 0x7f0d0047
 
-.field public static final notification_template_big_media_custom:I = 0x7f0d0046
+.field public static final notification_template_big_media_custom:I = 0x7f0d0048
 
-.field public static final notification_template_big_media_narrow:I = 0x7f0d0047
+.field public static final notification_template_big_media_narrow:I = 0x7f0d0049
 
-.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d0048
+.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d004a
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_lines_media:I = 0x7f0d004b
+.field public static final notification_template_lines_media:I = 0x7f0d004d
 
-.field public static final notification_template_media:I = 0x7f0d004c
+.field public static final notification_template_media:I = 0x7f0d004e
 
-.field public static final notification_template_media_custom:I = 0x7f0d004d
+.field public static final notification_template_media_custom:I = 0x7f0d004f
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
-.field public static final select_dialog_item_material:I = 0x7f0d005d
+.field public static final select_dialog_item_material:I = 0x7f0d005f
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d005e
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0060
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d005f
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d0061
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0066
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0069
 
-.field public static final view_chip_default:I = 0x7f0d0081
+.field public static final view_chip_default:I = 0x7f0d0088
 
 
 # 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 0a055c68e9..6d5c5df9f1 100644
--- a/com.discord/smali/com/discord/gateway/R$string.smali
+++ b/com.discord/smali/com/discord/gateway/R$string.smali
@@ -93,73 +93,73 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f12002a
 
-.field public static final app_name:I = 0x7f1200d2
+.field public static final app_name:I = 0x7f1200d5
 
-.field public static final appbar_scrolling_view_behavior:I = 0x7f1200dc
+.field public static final appbar_scrolling_view_behavior:I = 0x7f1200df
 
-.field public static final bottom_sheet_behavior:I = 0x7f12032d
+.field public static final bottom_sheet_behavior:I = 0x7f120332
 
-.field public static final character_counter_content_description:I = 0x7f1203b8
+.field public static final character_counter_content_description:I = 0x7f1203bd
 
-.field public static final character_counter_pattern:I = 0x7f1203b9
+.field public static final character_counter_pattern:I = 0x7f1203be
 
-.field public static final common_google_play_services_enable_button:I = 0x7f1203f6
+.field public static final common_google_play_services_enable_button:I = 0x7f1203fd
 
-.field public static final common_google_play_services_enable_text:I = 0x7f1203f7
+.field public static final common_google_play_services_enable_text:I = 0x7f1203fe
 
-.field public static final common_google_play_services_enable_title:I = 0x7f1203f8
+.field public static final common_google_play_services_enable_title:I = 0x7f1203ff
 
-.field public static final common_google_play_services_install_button:I = 0x7f1203f9
+.field public static final common_google_play_services_install_button:I = 0x7f120400
 
-.field public static final common_google_play_services_install_text:I = 0x7f1203fa
+.field public static final common_google_play_services_install_text:I = 0x7f120401
 
-.field public static final common_google_play_services_install_title:I = 0x7f1203fb
+.field public static final common_google_play_services_install_title:I = 0x7f120402
 
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203fc
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120403
 
-.field public static final common_google_play_services_notification_ticker:I = 0x7f1203fd
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120404
 
-.field public static final common_google_play_services_unknown_issue:I = 0x7f1203fe
+.field public static final common_google_play_services_unknown_issue:I = 0x7f120405
 
-.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ff
+.field public static final common_google_play_services_unsupported_text:I = 0x7f120406
 
-.field public static final common_google_play_services_update_button:I = 0x7f120400
+.field public static final common_google_play_services_update_button:I = 0x7f120407
 
-.field public static final common_google_play_services_update_text:I = 0x7f120401
+.field public static final common_google_play_services_update_text:I = 0x7f120408
 
-.field public static final common_google_play_services_update_title:I = 0x7f120402
+.field public static final common_google_play_services_update_title:I = 0x7f120409
 
-.field public static final common_google_play_services_updating_text:I = 0x7f120403
+.field public static final common_google_play_services_updating_text:I = 0x7f12040a
 
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120404
+.field public static final common_google_play_services_wear_update_text:I = 0x7f12040b
 
-.field public static final common_open_on_phone:I = 0x7f120405
+.field public static final common_open_on_phone:I = 0x7f12040c
 
-.field public static final common_signin_button_text:I = 0x7f120406
+.field public static final common_signin_button_text:I = 0x7f12040d
 
-.field public static final common_signin_button_text_long:I = 0x7f120407
+.field public static final common_signin_button_text_long:I = 0x7f12040e
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120594
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205a0
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120595
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205a1
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1208e1
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120901
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120b7f
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120bb0
 
-.field public static final password_toggle_content_description:I = 0x7f120cd9
+.field public static final password_toggle_content_description:I = 0x7f120d13
 
-.field public static final path_password_eye:I = 0x7f120cdc
+.field public static final path_password_eye:I = 0x7f120d16
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120cdd
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120d17
 
-.field public static final path_password_eye_mask_visible:I = 0x7f120cde
+.field public static final path_password_eye_mask_visible:I = 0x7f120d18
 
-.field public static final path_password_strike_through:I = 0x7f120cdf
+.field public static final path_password_strike_through:I = 0x7f120d19
 
-.field public static final search_menu_title:I = 0x7f120fa3
+.field public static final search_menu_title:I = 0x7f120fdd
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # 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 468972df33..6b03c24425 100644
--- a/com.discord/smali/com/discord/gateway/R$style.smali
+++ b/com.discord/smali/com/discord/gateway/R$style.smali
@@ -27,993 +27,993 @@
 
 .field public static final Animation_Design_BottomSheetDialog:I = 0x7f130005
 
-.field public static final Base_AlertDialog_AppCompat:I = 0x7f130037
+.field public static final Base_AlertDialog_AppCompat:I = 0x7f130038
 
-.field public static final Base_AlertDialog_AppCompat_Light:I = 0x7f130038
+.field public static final Base_AlertDialog_AppCompat_Light:I = 0x7f130039
 
-.field public static final Base_Animation_AppCompat_Dialog:I = 0x7f130039
+.field public static final Base_Animation_AppCompat_Dialog:I = 0x7f13003a
 
-.field public static final Base_Animation_AppCompat_DropDownUp:I = 0x7f13003a
+.field public static final Base_Animation_AppCompat_DropDownUp:I = 0x7f13003b
 
-.field public static final Base_Animation_AppCompat_Tooltip:I = 0x7f13003b
+.field public static final Base_Animation_AppCompat_Tooltip:I = 0x7f13003c
 
-.field public static final Base_CardView:I = 0x7f13003c
+.field public static final Base_CardView:I = 0x7f13003d
 
-.field public static final Base_DialogWindowTitleBackground_AppCompat:I = 0x7f13003e
+.field public static final Base_DialogWindowTitleBackground_AppCompat:I = 0x7f13003f
 
-.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003d
+.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003e
 
-.field public static final Base_TextAppearance_AppCompat:I = 0x7f13003f
+.field public static final Base_TextAppearance_AppCompat:I = 0x7f130040
 
-.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130040
+.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130041
 
-.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130041
+.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130042
 
-.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130042
+.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130043
 
-.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130043
+.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130044
 
-.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130044
+.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130045
 
-.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130045
+.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130046
 
-.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130046
+.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130047
 
-.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130047
+.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130048
 
-.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130048
+.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130049
 
-.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f130049
+.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f13004a
 
-.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004a
+.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004b
 
-.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004b
+.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004c
 
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004c
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004d
 
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004d
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004e
 
-.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004e
+.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004f
 
-.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f13004f
+.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130050
 
-.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130050
+.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130051
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130051
+.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130052
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130052
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130053
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130053
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130054
 
-.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130054
+.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130055
 
-.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130055
+.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130056
 
-.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130056
+.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130057
 
-.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130057
+.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130058
 
-.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130058
+.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130059
 
-.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f130059
+.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f13005a
 
-.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005a
+.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005b
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005b
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005c
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005c
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005d
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005d
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005e
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005e
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005f
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f13005f
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130060
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130060
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130061
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130061
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130062
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130062
+.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130063
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130063
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130064
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130064
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130065
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130065
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130066
 
-.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130066
+.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130067
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130067
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130068
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130068
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130069
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f130069
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13006a
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006a
+.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006b
 
-.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006b
+.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006c
 
-.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006c
+.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006d
 
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006d
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006e
 
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006e
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006f
 
-.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008e
+.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008f
 
-.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f13008f
+.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f130090
 
-.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130090
+.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130091
 
-.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130091
+.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130092
 
-.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130092
+.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130093
 
-.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130093
+.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130094
 
-.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130094
+.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130095
 
-.field public static final Base_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f130095
+.field public static final Base_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f130096
 
-.field public static final Base_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f130096
+.field public static final Base_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f130097
 
-.field public static final Base_Theme_AppCompat:I = 0x7f13006f
+.field public static final Base_Theme_AppCompat:I = 0x7f130070
 
-.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130070
+.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130071
 
-.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130071
+.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130072
 
-.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130075
+.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130076
 
-.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130072
+.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130073
 
-.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130073
+.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130074
 
-.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130074
+.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130075
 
-.field public static final Base_Theme_AppCompat_Light:I = 0x7f130076
+.field public static final Base_Theme_AppCompat_Light:I = 0x7f130077
 
-.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130077
+.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130078
 
-.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130078
+.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130079
 
-.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007c
+.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007d
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f130079
+.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f13007a
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007a
+.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007b
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007b
+.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007c
 
-.field public static final Base_Theme_MaterialComponents:I = 0x7f13007d
+.field public static final Base_Theme_MaterialComponents:I = 0x7f13007e
 
-.field public static final Base_Theme_MaterialComponents_Bridge:I = 0x7f13007e
+.field public static final Base_Theme_MaterialComponents_Bridge:I = 0x7f13007f
 
-.field public static final Base_Theme_MaterialComponents_CompactMenu:I = 0x7f13007f
+.field public static final Base_Theme_MaterialComponents_CompactMenu:I = 0x7f130080
 
-.field public static final Base_Theme_MaterialComponents_Dialog:I = 0x7f130080
+.field public static final Base_Theme_MaterialComponents_Dialog:I = 0x7f130081
 
-.field public static final Base_Theme_MaterialComponents_DialogWhenLarge:I = 0x7f130084
+.field public static final Base_Theme_MaterialComponents_DialogWhenLarge:I = 0x7f130085
 
-.field public static final Base_Theme_MaterialComponents_Dialog_Alert:I = 0x7f130081
+.field public static final Base_Theme_MaterialComponents_Dialog_Alert:I = 0x7f130082
 
-.field public static final Base_Theme_MaterialComponents_Dialog_FixedSize:I = 0x7f130082
+.field public static final Base_Theme_MaterialComponents_Dialog_FixedSize:I = 0x7f130083
 
-.field public static final Base_Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f130083
+.field public static final Base_Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f130084
 
-.field public static final Base_Theme_MaterialComponents_Light:I = 0x7f130085
+.field public static final Base_Theme_MaterialComponents_Light:I = 0x7f130086
 
-.field public static final Base_Theme_MaterialComponents_Light_Bridge:I = 0x7f130086
+.field public static final Base_Theme_MaterialComponents_Light_Bridge:I = 0x7f130087
 
-.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f130087
+.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f130088
 
-.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f130088
+.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f130089
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog:I = 0x7f130089
+.field public static final Base_Theme_MaterialComponents_Light_Dialog:I = 0x7f13008a
 
-.field public static final Base_Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f13008d
+.field public static final Base_Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f13008e
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f13008a
+.field public static final Base_Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f13008b
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog_FixedSize:I = 0x7f13008b
+.field public static final Base_Theme_MaterialComponents_Light_Dialog_FixedSize:I = 0x7f13008c
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f13008c
+.field public static final Base_Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f13008d
 
-.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f13009e
+.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f13009f
 
-.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f13009f
+.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f1300a0
 
-.field public static final Base_V14_Theme_MaterialComponents:I = 0x7f130097
+.field public static final Base_V14_Theme_MaterialComponents:I = 0x7f130098
 
-.field public static final Base_V14_Theme_MaterialComponents_Bridge:I = 0x7f130098
+.field public static final Base_V14_Theme_MaterialComponents_Bridge:I = 0x7f130099
 
-.field public static final Base_V14_Theme_MaterialComponents_Dialog:I = 0x7f130099
+.field public static final Base_V14_Theme_MaterialComponents_Dialog:I = 0x7f13009a
 
-.field public static final Base_V14_Theme_MaterialComponents_Light:I = 0x7f13009a
+.field public static final Base_V14_Theme_MaterialComponents_Light:I = 0x7f13009b
 
-.field public static final Base_V14_Theme_MaterialComponents_Light_Bridge:I = 0x7f13009b
+.field public static final Base_V14_Theme_MaterialComponents_Light_Bridge:I = 0x7f13009c
 
-.field public static final Base_V14_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f13009c
+.field public static final Base_V14_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f13009d
 
-.field public static final Base_V14_Theme_MaterialComponents_Light_Dialog:I = 0x7f13009d
+.field public static final Base_V14_Theme_MaterialComponents_Light_Dialog:I = 0x7f13009e
 
-.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a4
+.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a5
 
-.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a0
+.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a1
 
-.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a1
+.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a2
 
-.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a2
+.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a3
 
-.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a3
+.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a4
 
-.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a5
+.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a6
 
-.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a6
+.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a7
 
-.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a7
+.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a8
 
-.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a8
+.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a9
 
-.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300a9
+.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300aa
 
-.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300aa
+.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300ab
 
-.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ab
+.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ac
 
-.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ac
+.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ad
 
-.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ad
+.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ae
 
-.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b2
+.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b3
 
-.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300ae
+.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300af
 
-.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300af
+.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300b0
 
-.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b0
+.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b1
 
-.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b1
+.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b2
 
-.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b3
+.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b4
 
-.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b4
+.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b5
 
-.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b5
+.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b6
 
-.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b6
+.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b7
 
-.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b7
+.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b8
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b8
+.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b9
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300b9
+.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300ba
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300ba
+.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300bb
 
-.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bb
+.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bc
 
-.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bc
+.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bd
 
-.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300bd
+.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300be
 
-.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300be
+.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300bf
 
-.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300bf
+.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300c0
 
-.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c0
+.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c1
 
-.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c1
+.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c2
 
-.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c7
+.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c8
 
-.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c8
+.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c9
 
-.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c2
+.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c3
 
-.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c3
+.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c4
 
-.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c4
+.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c5
 
-.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c5
+.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c6
 
-.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c6
+.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c7
 
-.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300c9
+.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300ca
 
-.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300ca
+.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300cb
 
-.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cb
+.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cc
 
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cc
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cd
 
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300cd
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300ce
 
-.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300ce
+.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300cf
 
-.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300cf
+.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300d0
 
-.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d0
+.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d1
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d1
+.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d2
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d2
+.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d3
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d3
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d4
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d4
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d5
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d5
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d6
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d6
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d7
 
-.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d7
+.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d8
 
-.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d8
+.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d9
 
-.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300d9
+.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300da
 
-.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300da
+.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300db
 
-.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300db
+.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300dc
 
-.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dc
+.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dd
 
-.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300dd
+.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300de
 
-.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300de
+.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300df
 
-.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300df
+.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300e0
 
-.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e0
+.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e1
 
-.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e1
+.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e2
 
-.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e2
+.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e3
 
-.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e3
+.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e4
 
-.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e4
+.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e5
 
-.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e5
+.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e6
 
-.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e6
+.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e7
 
-.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e7
+.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e8
 
-.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e8
+.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e9
 
-.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300e9
+.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300ea
 
-.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300ea
+.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300eb
 
-.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300eb
+.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300ec
 
-.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ec
+.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ed
 
-.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ed
+.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ee
 
-.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300ee
+.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300ef
 
-.field public static final Base_Widget_Design_TabLayout:I = 0x7f1300ef
+.field public static final Base_Widget_Design_TabLayout:I = 0x7f1300f0
 
-.field public static final Base_Widget_MaterialComponents_Chip:I = 0x7f1300f0
+.field public static final Base_Widget_MaterialComponents_Chip:I = 0x7f1300f1
 
-.field public static final Base_Widget_MaterialComponents_TextInputEditText:I = 0x7f1300f1
+.field public static final Base_Widget_MaterialComponents_TextInputEditText:I = 0x7f1300f2
 
-.field public static final Base_Widget_MaterialComponents_TextInputLayout:I = 0x7f1300f2
+.field public static final Base_Widget_MaterialComponents_TextInputLayout:I = 0x7f1300f3
 
-.field public static final CardView:I = 0x7f1300f3
+.field public static final CardView:I = 0x7f1300f4
 
-.field public static final CardView_Dark:I = 0x7f1300f4
+.field public static final CardView_Dark:I = 0x7f1300f5
 
-.field public static final CardView_Light:I = 0x7f1300f5
+.field public static final CardView_Light:I = 0x7f1300f6
 
-.field public static final Platform_AppCompat:I = 0x7f130131
+.field public static final Platform_AppCompat:I = 0x7f130132
 
-.field public static final Platform_AppCompat_Light:I = 0x7f130132
+.field public static final Platform_AppCompat_Light:I = 0x7f130133
 
-.field public static final Platform_MaterialComponents:I = 0x7f130133
+.field public static final Platform_MaterialComponents:I = 0x7f130134
 
-.field public static final Platform_MaterialComponents_Dialog:I = 0x7f130134
+.field public static final Platform_MaterialComponents_Dialog:I = 0x7f130135
 
-.field public static final Platform_MaterialComponents_Light:I = 0x7f130135
+.field public static final Platform_MaterialComponents_Light:I = 0x7f130136
 
-.field public static final Platform_MaterialComponents_Light_Dialog:I = 0x7f130136
+.field public static final Platform_MaterialComponents_Light_Dialog:I = 0x7f130137
 
-.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130137
+.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130138
 
-.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130138
+.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130139
 
-.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f130139
+.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f13013a
 
-.field public static final Platform_V21_AppCompat:I = 0x7f13013a
+.field public static final Platform_V21_AppCompat:I = 0x7f13013b
 
-.field public static final Platform_V21_AppCompat_Light:I = 0x7f13013b
+.field public static final Platform_V21_AppCompat_Light:I = 0x7f13013c
 
-.field public static final Platform_V25_AppCompat:I = 0x7f13013c
+.field public static final Platform_V25_AppCompat:I = 0x7f13013d
 
-.field public static final Platform_V25_AppCompat_Light:I = 0x7f13013d
+.field public static final Platform_V25_AppCompat_Light:I = 0x7f13013e
 
-.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13013e
+.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13013f
 
-.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f13013f
+.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f130140
 
-.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f130140
+.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f130141
 
-.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f130141
+.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f130142
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f130142
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f130143
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130143
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130144
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130144
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130145
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130145
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130146
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130146
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130147
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130147
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130148
 
-.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13014d
+.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13014e
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130148
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130149
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f130149
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f13014a
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f13014a
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f13014b
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f13014b
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f13014c
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f13014c
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f13014d
 
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13014e
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13014f
 
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f13014f
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f130150
 
-.field public static final TextAppearance_AppCompat:I = 0x7f130152
+.field public static final TextAppearance_AppCompat:I = 0x7f130153
 
-.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130153
+.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130154
 
-.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130154
+.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130155
 
-.field public static final TextAppearance_AppCompat_Button:I = 0x7f130155
+.field public static final TextAppearance_AppCompat_Button:I = 0x7f130156
 
-.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130156
+.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130157
 
-.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130157
+.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130158
 
-.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130158
+.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130159
 
-.field public static final TextAppearance_AppCompat_Display3:I = 0x7f130159
+.field public static final TextAppearance_AppCompat_Display3:I = 0x7f13015a
 
-.field public static final TextAppearance_AppCompat_Display4:I = 0x7f13015a
+.field public static final TextAppearance_AppCompat_Display4:I = 0x7f13015b
 
-.field public static final TextAppearance_AppCompat_Headline:I = 0x7f13015b
+.field public static final TextAppearance_AppCompat_Headline:I = 0x7f13015c
 
-.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13015c
+.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13015d
 
-.field public static final TextAppearance_AppCompat_Large:I = 0x7f13015d
+.field public static final TextAppearance_AppCompat_Large:I = 0x7f13015e
 
-.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13015e
+.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13015f
 
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f13015f
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f130160
 
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f130160
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f130161
 
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130161
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130162
 
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130162
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130163
 
-.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130163
+.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130164
 
-.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130164
+.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130165
 
-.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130165
+.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130166
 
-.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130166
+.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130167
 
-.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130167
+.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130168
 
-.field public static final TextAppearance_AppCompat_Small:I = 0x7f130168
+.field public static final TextAppearance_AppCompat_Small:I = 0x7f130169
 
-.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f130169
+.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f13016a
 
-.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f13016a
+.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f13016b
 
-.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13016b
+.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13016c
 
-.field public static final TextAppearance_AppCompat_Title:I = 0x7f13016c
+.field public static final TextAppearance_AppCompat_Title:I = 0x7f13016d
 
-.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13016d
+.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13016e
 
-.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13016e
+.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13016f
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13016f
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f130170
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130170
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130171
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130171
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130172
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130172
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130173
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130173
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130174
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130174
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130175
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f130175
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f130176
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130176
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130177
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f130177
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f130178
 
-.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f130178
+.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f130179
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130179
+.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f13017a
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f13017a
+.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f13017b
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f13017b
+.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f13017c
 
-.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13017c
+.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13017d
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13017d
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13017e
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13017e
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13017f
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13017f
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f130180
 
-.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f130180
+.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f130181
 
-.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f130181
+.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f130182
 
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f130184
+.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f130185
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f130186
+.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f130187
 
-.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f130187
+.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f130188
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f130189
+.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f13018a
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f13018b
+.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f13018c
 
-.field public static final TextAppearance_Design_CollapsingToolbar_Expanded:I = 0x7f13018c
+.field public static final TextAppearance_Design_CollapsingToolbar_Expanded:I = 0x7f13018d
 
-.field public static final TextAppearance_Design_Counter:I = 0x7f13018d
+.field public static final TextAppearance_Design_Counter:I = 0x7f13018e
 
-.field public static final TextAppearance_Design_Counter_Overflow:I = 0x7f13018e
+.field public static final TextAppearance_Design_Counter_Overflow:I = 0x7f13018f
 
-.field public static final TextAppearance_Design_Error:I = 0x7f13018f
+.field public static final TextAppearance_Design_Error:I = 0x7f130190
 
-.field public static final TextAppearance_Design_HelperText:I = 0x7f130190
+.field public static final TextAppearance_Design_HelperText:I = 0x7f130191
 
-.field public static final TextAppearance_Design_Hint:I = 0x7f130191
+.field public static final TextAppearance_Design_Hint:I = 0x7f130192
 
-.field public static final TextAppearance_Design_Snackbar_Message:I = 0x7f130192
+.field public static final TextAppearance_Design_Snackbar_Message:I = 0x7f130193
 
-.field public static final TextAppearance_Design_Tab:I = 0x7f130193
+.field public static final TextAppearance_Design_Tab:I = 0x7f130194
 
-.field public static final TextAppearance_MaterialComponents_Body1:I = 0x7f130195
+.field public static final TextAppearance_MaterialComponents_Body1:I = 0x7f130196
 
-.field public static final TextAppearance_MaterialComponents_Body2:I = 0x7f130196
+.field public static final TextAppearance_MaterialComponents_Body2:I = 0x7f130197
 
-.field public static final TextAppearance_MaterialComponents_Button:I = 0x7f130197
+.field public static final TextAppearance_MaterialComponents_Button:I = 0x7f130198
 
-.field public static final TextAppearance_MaterialComponents_Caption:I = 0x7f130198
+.field public static final TextAppearance_MaterialComponents_Caption:I = 0x7f130199
 
-.field public static final TextAppearance_MaterialComponents_Chip:I = 0x7f130199
+.field public static final TextAppearance_MaterialComponents_Chip:I = 0x7f13019a
 
-.field public static final TextAppearance_MaterialComponents_Headline1:I = 0x7f13019a
+.field public static final TextAppearance_MaterialComponents_Headline1:I = 0x7f13019b
 
-.field public static final TextAppearance_MaterialComponents_Headline2:I = 0x7f13019b
+.field public static final TextAppearance_MaterialComponents_Headline2:I = 0x7f13019c
 
-.field public static final TextAppearance_MaterialComponents_Headline3:I = 0x7f13019c
+.field public static final TextAppearance_MaterialComponents_Headline3:I = 0x7f13019d
 
-.field public static final TextAppearance_MaterialComponents_Headline4:I = 0x7f13019d
+.field public static final TextAppearance_MaterialComponents_Headline4:I = 0x7f13019e
 
-.field public static final TextAppearance_MaterialComponents_Headline5:I = 0x7f13019e
+.field public static final TextAppearance_MaterialComponents_Headline5:I = 0x7f13019f
 
-.field public static final TextAppearance_MaterialComponents_Headline6:I = 0x7f13019f
+.field public static final TextAppearance_MaterialComponents_Headline6:I = 0x7f1301a0
 
-.field public static final TextAppearance_MaterialComponents_Overline:I = 0x7f1301a0
+.field public static final TextAppearance_MaterialComponents_Overline:I = 0x7f1301a1
 
-.field public static final TextAppearance_MaterialComponents_Subtitle1:I = 0x7f1301a1
+.field public static final TextAppearance_MaterialComponents_Subtitle1:I = 0x7f1301a2
 
-.field public static final TextAppearance_MaterialComponents_Subtitle2:I = 0x7f1301a2
+.field public static final TextAppearance_MaterialComponents_Subtitle2:I = 0x7f1301a3
 
-.field public static final TextAppearance_MaterialComponents_Tab:I = 0x7f1301a3
+.field public static final TextAppearance_MaterialComponents_Tab:I = 0x7f1301a4
 
-.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301a4
+.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301a5
 
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301a5
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301a6
 
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301a6
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301a7
 
-.field public static final ThemeOverlay_AppCompat:I = 0x7f1301d9
+.field public static final ThemeOverlay_AppCompat:I = 0x7f1301da
 
-.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f1301da
+.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f1301db
 
-.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f1301db
+.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f1301dc
 
-.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f1301dc
+.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f1301dd
 
-.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f1301dd
+.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f1301de
 
-.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f1301de
+.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f1301df
 
-.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f1301df
+.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f1301e0
 
-.field public static final ThemeOverlay_MaterialComponents:I = 0x7f1301e0
+.field public static final ThemeOverlay_MaterialComponents:I = 0x7f1301e1
 
-.field public static final ThemeOverlay_MaterialComponents_ActionBar:I = 0x7f1301e1
+.field public static final ThemeOverlay_MaterialComponents_ActionBar:I = 0x7f1301e2
 
-.field public static final ThemeOverlay_MaterialComponents_Dark:I = 0x7f1301e2
+.field public static final ThemeOverlay_MaterialComponents_Dark:I = 0x7f1301e3
 
-.field public static final ThemeOverlay_MaterialComponents_Dark_ActionBar:I = 0x7f1301e3
+.field public static final ThemeOverlay_MaterialComponents_Dark_ActionBar:I = 0x7f1301e4
 
-.field public static final ThemeOverlay_MaterialComponents_Dialog:I = 0x7f1301e4
+.field public static final ThemeOverlay_MaterialComponents_Dialog:I = 0x7f1301e5
 
-.field public static final ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f1301e5
+.field public static final ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f1301e6
 
-.field public static final ThemeOverlay_MaterialComponents_Light:I = 0x7f1301e6
+.field public static final ThemeOverlay_MaterialComponents_Light:I = 0x7f1301e7
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText:I = 0x7f1301e7
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText:I = 0x7f1301e8
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f1301e8
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f1301e9
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f1301e9
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f1301ea
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f1301ea
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f1301eb
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f1301eb
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f1301ec
 
-.field public static final Theme_AppCompat:I = 0x7f1301a7
+.field public static final Theme_AppCompat:I = 0x7f1301a8
 
-.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301a8
+.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301a9
 
-.field public static final Theme_AppCompat_DayNight:I = 0x7f1301a9
+.field public static final Theme_AppCompat_DayNight:I = 0x7f1301aa
 
-.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301aa
+.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301ab
 
-.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301ab
+.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301ac
 
-.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301ae
+.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301af
 
-.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301ac
+.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301ad
 
-.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301ad
+.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301ae
 
-.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301af
+.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301b0
 
-.field public static final Theme_AppCompat_Dialog:I = 0x7f1301b0
+.field public static final Theme_AppCompat_Dialog:I = 0x7f1301b1
 
-.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301b3
+.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301b4
 
-.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301b1
+.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301b2
 
-.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301b2
+.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301b3
 
-.field public static final Theme_AppCompat_Light:I = 0x7f1301b4
+.field public static final Theme_AppCompat_Light:I = 0x7f1301b5
 
-.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301b5
+.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301b6
 
-.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301b6
+.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301b7
 
-.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301b9
+.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301ba
 
-.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301b7
+.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301b8
 
-.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301b8
+.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301b9
 
-.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301ba
+.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301bb
 
-.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301bb
+.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301bc
 
-.field public static final Theme_Design:I = 0x7f1301be
+.field public static final Theme_Design:I = 0x7f1301bf
 
-.field public static final Theme_Design_BottomSheetDialog:I = 0x7f1301bf
+.field public static final Theme_Design_BottomSheetDialog:I = 0x7f1301c0
 
-.field public static final Theme_Design_Light:I = 0x7f1301c0
+.field public static final Theme_Design_Light:I = 0x7f1301c1
 
-.field public static final Theme_Design_Light_BottomSheetDialog:I = 0x7f1301c1
+.field public static final Theme_Design_Light_BottomSheetDialog:I = 0x7f1301c2
 
-.field public static final Theme_Design_Light_NoActionBar:I = 0x7f1301c2
+.field public static final Theme_Design_Light_NoActionBar:I = 0x7f1301c3
 
-.field public static final Theme_Design_NoActionBar:I = 0x7f1301c3
+.field public static final Theme_Design_NoActionBar:I = 0x7f1301c4
 
-.field public static final Theme_MaterialComponents:I = 0x7f1301c4
+.field public static final Theme_MaterialComponents:I = 0x7f1301c5
 
-.field public static final Theme_MaterialComponents_BottomSheetDialog:I = 0x7f1301c5
+.field public static final Theme_MaterialComponents_BottomSheetDialog:I = 0x7f1301c6
 
-.field public static final Theme_MaterialComponents_Bridge:I = 0x7f1301c6
+.field public static final Theme_MaterialComponents_Bridge:I = 0x7f1301c7
 
-.field public static final Theme_MaterialComponents_CompactMenu:I = 0x7f1301c7
+.field public static final Theme_MaterialComponents_CompactMenu:I = 0x7f1301c8
 
-.field public static final Theme_MaterialComponents_Dialog:I = 0x7f1301c8
+.field public static final Theme_MaterialComponents_Dialog:I = 0x7f1301c9
 
-.field public static final Theme_MaterialComponents_DialogWhenLarge:I = 0x7f1301cb
+.field public static final Theme_MaterialComponents_DialogWhenLarge:I = 0x7f1301cc
 
-.field public static final Theme_MaterialComponents_Dialog_Alert:I = 0x7f1301c9
+.field public static final Theme_MaterialComponents_Dialog_Alert:I = 0x7f1301ca
 
-.field public static final Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f1301ca
+.field public static final Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f1301cb
 
-.field public static final Theme_MaterialComponents_Light:I = 0x7f1301cc
+.field public static final Theme_MaterialComponents_Light:I = 0x7f1301cd
 
-.field public static final Theme_MaterialComponents_Light_BottomSheetDialog:I = 0x7f1301cd
+.field public static final Theme_MaterialComponents_Light_BottomSheetDialog:I = 0x7f1301ce
 
-.field public static final Theme_MaterialComponents_Light_Bridge:I = 0x7f1301ce
+.field public static final Theme_MaterialComponents_Light_Bridge:I = 0x7f1301cf
 
-.field public static final Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f1301cf
+.field public static final Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f1301d0
 
-.field public static final Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f1301d0
+.field public static final Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f1301d1
 
-.field public static final Theme_MaterialComponents_Light_Dialog:I = 0x7f1301d1
+.field public static final Theme_MaterialComponents_Light_Dialog:I = 0x7f1301d2
 
-.field public static final Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f1301d4
+.field public static final Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f1301d5
 
-.field public static final Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f1301d2
+.field public static final Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f1301d3
 
-.field public static final Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f1301d3
+.field public static final Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f1301d4
 
-.field public static final Theme_MaterialComponents_Light_NoActionBar:I = 0x7f1301d5
+.field public static final Theme_MaterialComponents_Light_NoActionBar:I = 0x7f1301d6
 
-.field public static final Theme_MaterialComponents_Light_NoActionBar_Bridge:I = 0x7f1301d6
+.field public static final Theme_MaterialComponents_Light_NoActionBar_Bridge:I = 0x7f1301d7
 
-.field public static final Theme_MaterialComponents_NoActionBar:I = 0x7f1301d7
+.field public static final Theme_MaterialComponents_NoActionBar:I = 0x7f1301d8
 
-.field public static final Theme_MaterialComponents_NoActionBar_Bridge:I = 0x7f1301d8
+.field public static final Theme_MaterialComponents_NoActionBar_Bridge:I = 0x7f1301d9
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302ac
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302af
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302ad
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302b0
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302ae
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302b1
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302af
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302b2
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302b0
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302b3
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302b1
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302b4
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302b2
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302b5
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302b3
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302b6
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302b4
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302b7
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302b5
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302b8
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302b6
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302b9
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1302b7
+.field public static final Widget_AppCompat_Button:I = 0x7f1302ba
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302bd
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302c0
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302be
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302c1
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302b8
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302bb
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302b9
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302bc
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302ba
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302bd
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302bb
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302be
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302bc
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302bf
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302bf
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302c2
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302c0
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302c3
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302c1
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302c4
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1302c2
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1302c5
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1302c3
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1302c6
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1302c4
+.field public static final Widget_AppCompat_EditText:I = 0x7f1302c7
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1302c5
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1302c8
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1302c6
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1302c9
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1302c7
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1302ca
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1302c8
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1302cb
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1302c9
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1302cc
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1302ca
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1302cd
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1302cb
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1302ce
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1302cc
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1302cf
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1302cd
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1302d0
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1302ce
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1302d1
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1302cf
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1302d2
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1302d0
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1302d3
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1302d1
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1302d4
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1302d2
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1302d5
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1302d3
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1302d6
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1302d4
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1302d7
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1302d5
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1302d8
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1302d6
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1302d9
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1302d7
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1302da
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1302d8
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1302db
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1302d9
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1302dc
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1302da
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1302dd
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1302db
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1302de
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1302dc
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1302df
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1302dd
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1302e0
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1302de
+.field public static final Widget_AppCompat_ListView:I = 0x7f1302e1
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1302df
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1302e2
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1302e0
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1302e3
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1302e1
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1302e4
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1302e2
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1302e5
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1302e3
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1302e6
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1302e4
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1302e7
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1302e5
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1302e8
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1302e6
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1302e9
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1302e7
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1302ea
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1302e8
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1302eb
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1302e9
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1302ec
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1302ea
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1302ed
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1302eb
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1302ee
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1302ec
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1302ef
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1302ed
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1302f0
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1302ee
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1302f1
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1302ef
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1302f2
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1302f0
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1302f3
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1302f1
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1302f4
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1302f2
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1302f5
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1302f3
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1302f6
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Design_AppBarLayout:I = 0x7f1302f7
+.field public static final Widget_Design_AppBarLayout:I = 0x7f1302fa
 
-.field public static final Widget_Design_BottomNavigationView:I = 0x7f1302f8
+.field public static final Widget_Design_BottomNavigationView:I = 0x7f1302fb
 
-.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1302f9
+.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1302fc
 
-.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1302fa
+.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1302fd
 
-.field public static final Widget_Design_FloatingActionButton:I = 0x7f1302fb
+.field public static final Widget_Design_FloatingActionButton:I = 0x7f1302fe
 
-.field public static final Widget_Design_NavigationView:I = 0x7f1302fc
+.field public static final Widget_Design_NavigationView:I = 0x7f1302ff
 
-.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f1302fd
+.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f130300
 
-.field public static final Widget_Design_Snackbar:I = 0x7f1302fe
+.field public static final Widget_Design_Snackbar:I = 0x7f130301
 
-.field public static final Widget_Design_TabLayout:I = 0x7f1302ff
+.field public static final Widget_Design_TabLayout:I = 0x7f130302
 
-.field public static final Widget_Design_TextInputLayout:I = 0x7f130300
+.field public static final Widget_Design_TextInputLayout:I = 0x7f130303
 
-.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f130301
+.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f130304
 
-.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f130302
+.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f130305
 
-.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f130303
+.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f130306
 
-.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f130304
+.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f130307
 
-.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130305
+.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130308
 
-.field public static final Widget_MaterialComponents_Button:I = 0x7f130306
+.field public static final Widget_MaterialComponents_Button:I = 0x7f130309
 
-.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f130307
+.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f13030a
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f130308
+.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f13030b
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f130309
+.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f13030c
 
-.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f13030a
+.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f13030d
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f13030b
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f13030e
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f13030c
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f13030f
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f13030d
+.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f130310
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f13030e
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f130311
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f13030f
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f130312
 
-.field public static final Widget_MaterialComponents_CardView:I = 0x7f130310
+.field public static final Widget_MaterialComponents_CardView:I = 0x7f130313
 
-.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130315
+.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130318
 
-.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f130311
+.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f130314
 
-.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130312
+.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130315
 
-.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130313
+.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130316
 
-.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130314
+.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130317
 
-.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f130316
+.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f130319
 
-.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f130317
+.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f13031a
 
-.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f130318
+.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f13031b
 
-.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f130319
+.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f13031c
 
-.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13031a
+.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13031d
 
-.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13031b
+.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13031e
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f13031c
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f13031f
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f13031d
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f130320
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f13031e
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f130321
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f13031f
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f130322
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130320
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130323
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130321
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130324
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130322
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130325
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130323
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130326
 
-.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f130324
+.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f130327
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # 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 f32658cd7d..d254e23db9 100644
--- a/com.discord/smali/com/discord/gateway/R$styleable.smali
+++ b/com.discord/smali/com/discord/gateway/R$styleable.smali
@@ -2060,7 +2060,7 @@
 
     new-array v5, v1, [I
 
-    const v7, 0x7f040130
+    const v7, 0x7f040132
 
     aput v7, v5, v3
 
@@ -2134,7 +2134,7 @@
 
     new-array v6, v1, [I
 
-    const v9, 0x7f04026d
+    const v9, 0x7f040270
 
     aput v9, v6, v3
 
@@ -2180,7 +2180,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040305
+    const v6, 0x7f040308
 
     aput v6, v5, v3
 
@@ -2200,7 +2200,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f0401ec
+    const v6, 0x7f0401ee
 
     aput v6, v5, v3
 
@@ -2347,60 +2347,60 @@
         0x7f04004c
         0x7f04004e
         0x7f04004f
-        0x7f0400c8
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f0400e9
-        0x7f040103
+        0x7f0400ce
+        0x7f0400ea
         0x7f040104
-        0x7f040112
-        0x7f040156
-        0x7f04015b
-        0x7f040162
-        0x7f040163
-        0x7f0401c7
-        0x7f0401ea
-        0x7f0401f4
-        0x7f040257
-        0x7f040273
-        0x7f04028b
-        0x7f0402b9
-        0x7f0402ba
-        0x7f040313
+        0x7f040105
+        0x7f040114
+        0x7f040158
+        0x7f04015d
+        0x7f040164
+        0x7f040165
+        0x7f0401c9
+        0x7f0401ec
+        0x7f0401f6
+        0x7f04025a
+        0x7f040276
+        0x7f04028e
+        0x7f0402bc
+        0x7f0402bd
         0x7f040316
-        0x7f0403af
-        0x7f0403b9
+        0x7f040319
+        0x7f0403b2
+        0x7f0403bc
     .end array-data
 
     :array_1
     .array-data 4
         0x7f04004c
         0x7f04004e
-        0x7f0400ac
-        0x7f040156
-        0x7f040316
-        0x7f0403b9
+        0x7f0400ad
+        0x7f040158
+        0x7f040319
+        0x7f0403bc
     .end array-data
 
     :array_2
     .array-data 4
-        0x7f040118
-        0x7f0401eb
+        0x7f04011a
+        0x7f0401ed
     .end array-data
 
     :array_3
     .array-data 4
         0x10100f2
-        0x7f04007a
         0x7f04007b
-        0x7f04024e
-        0x7f04024f
-        0x7f040270
-        0x7f0402f8
-        0x7f0402f9
+        0x7f04007c
+        0x7f040251
+        0x7f040252
+        0x7f040273
+        0x7f0402fb
+        0x7f0402fc
     .end array-data
 
     :array_4
@@ -2432,39 +2432,39 @@
         0x10100d4
         0x101048f
         0x1010540
-        0x7f040112
-        0x7f040119
-        0x7f040249
+        0x7f040114
+        0x7f04011b
+        0x7f04024c
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f040306
-        0x7f040307
-        0x7f040308
         0x7f040309
+        0x7f04030a
+        0x7f04030b
+        0x7f04030c
     .end array-data
 
     :array_9
     .array-data 4
-        0x7f040243
-        0x7f040244
+        0x7f040245
+        0x7f040246
     .end array-data
 
     :array_a
     .array-data 4
         0x1010119
-        0x7f040303
-        0x7f0403ad
-        0x7f0403ae
+        0x7f040306
+        0x7f0403b0
+        0x7f0403b1
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f0403aa
-        0x7f0403ab
-        0x7f0403ac
+        0x7f0403ad
+        0x7f0403ae
+        0x7f0403af
     .end array-data
 
     :array_c
@@ -2486,11 +2486,11 @@
         0x7f040048
         0x7f040049
         0x7f04004a
-        0x7f040131
-        0x7f04013f
-        0x7f0401fd
-        0x7f04024a
-        0x7f040339
+        0x7f040133
+        0x7f040141
+        0x7f0401ff
+        0x7f04024d
+        0x7f04033c
     .end array-data
 
     :array_e
@@ -2533,17 +2533,16 @@
         0x7f04002b
         0x7f04002c
         0x7f040044
-        0x7f040065
-        0x7f040074
+        0x7f040066
         0x7f040075
         0x7f040076
         0x7f040077
         0x7f040078
-        0x7f04007d
+        0x7f040079
         0x7f04007e
-        0x7f04008c
-        0x7f040091
-        0x7f0400b2
+        0x7f04007f
+        0x7f04008d
+        0x7f040092
         0x7f0400b3
         0x7f0400b4
         0x7f0400b5
@@ -2551,95 +2550,96 @@
         0x7f0400b7
         0x7f0400b8
         0x7f0400b9
-        0x7f0400bc
-        0x7f0400c1
-        0x7f0400d4
-        0x7f040100
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c2
+        0x7f0400d5
         0x7f040101
         0x7f040102
-        0x7f040108
-        0x7f04010a
-        0x7f04010d
-        0x7f04010e
+        0x7f040103
+        0x7f040109
+        0x7f04010b
         0x7f04010f
         0x7f040110
         0x7f040111
-        0x7f040162
-        0x7f0401d2
-        0x7f04024c
-        0x7f04024d
+        0x7f040112
+        0x7f040113
+        0x7f040164
+        0x7f0401d4
+        0x7f04024f
         0x7f040250
-        0x7f040251
-        0x7f040252
         0x7f040253
         0x7f040254
         0x7f040255
         0x7f040256
-        0x7f040280
-        0x7f040281
-        0x7f040282
-        0x7f04028a
-        0x7f04028c
-        0x7f0402bf
+        0x7f040257
+        0x7f040258
+        0x7f040259
+        0x7f040283
+        0x7f040284
+        0x7f040285
+        0x7f04028d
+        0x7f04028f
         0x7f0402c2
-        0x7f0402c3
-        0x7f0402c4
-        0x7f0402eb
-        0x7f0402ed
+        0x7f0402c5
+        0x7f0402c6
+        0x7f0402c7
         0x7f0402ee
-        0x7f0402ef
-        0x7f040300
-        0x7f040301
-        0x7f04031a
-        0x7f040344
-        0x7f040345
-        0x7f040346
+        0x7f0402f0
+        0x7f0402f1
+        0x7f0402f2
+        0x7f040303
+        0x7f040304
+        0x7f04031d
         0x7f040347
+        0x7f040348
         0x7f040349
         0x7f04034a
-        0x7f04034b
         0x7f04034c
+        0x7f04034d
+        0x7f04034e
         0x7f04034f
-        0x7f040350
-        0x7f0403bb
-        0x7f0403bc
-        0x7f0403bd
+        0x7f040352
+        0x7f040353
         0x7f0403be
-        0x7f0403dc
-        0x7f0403df
-        0x7f0403e0
+        0x7f0403bf
+        0x7f0403c0
+        0x7f0403c1
         0x7f0403e1
-        0x7f0403e2
-        0x7f0403e3
         0x7f0403e4
         0x7f0403e5
         0x7f0403e6
         0x7f0403e7
         0x7f0403e8
+        0x7f0403e9
+        0x7f0403ea
+        0x7f0403eb
+        0x7f0403ec
+        0x7f0403ed
     .end array-data
 
     :array_f
     .array-data 4
         0x7f040050
-        0x7f040121
-        0x7f040122
         0x7f040123
         0x7f040124
-        0x7f04015c
+        0x7f040125
+        0x7f040126
+        0x7f04015e
     .end array-data
 
     :array_10
     .array-data 4
-        0x7f040112
-        0x7f0401ee
+        0x7f040114
         0x7f0401f0
         0x7f0401f2
-        0x7f0401f3
-        0x7f0401f7
-        0x7f0401f8
+        0x7f0401f4
+        0x7f0401f5
         0x7f0401f9
-        0x7f0401fc
-        0x7f04026f
+        0x7f0401fa
+        0x7f0401fb
+        0x7f0401fe
+        0x7f040272
     .end array-data
 
     :array_11
@@ -2654,17 +2654,17 @@
     .array-data 4
         0x101013f
         0x1010140
-        0x7f040081
         0x7f040082
         0x7f040083
         0x7f040084
         0x7f040085
         0x7f040086
-        0x7f0400ce
+        0x7f040087
         0x7f0400cf
         0x7f0400d0
         0x7f0400d1
         0x7f0400d2
+        0x7f0400d3
     .end array-data
 
     :array_13
@@ -2674,50 +2674,49 @@
         0x101011f
         0x101014f
         0x10101e5
-        0x7f04008e
         0x7f04008f
         0x7f040090
-        0x7f040092
+        0x7f040091
         0x7f040093
         0x7f040094
-        0x7f040096
+        0x7f040095
         0x7f040097
         0x7f040098
         0x7f040099
         0x7f04009a
         0x7f04009b
-        0x7f0400a0
+        0x7f04009c
         0x7f0400a1
         0x7f0400a2
-        0x7f0400a5
+        0x7f0400a3
         0x7f0400a6
         0x7f0400a7
         0x7f0400a8
         0x7f0400a9
         0x7f0400aa
         0x7f0400ab
-        0x7f04015a
-        0x7f0401c8
-        0x7f0401cc
-        0x7f0402c8
-        0x7f0402f6
-        0x7f040351
-        0x7f040353
+        0x7f0400ac
+        0x7f04015c
+        0x7f0401ca
+        0x7f0401ce
+        0x7f0402cb
+        0x7f0402f9
+        0x7f040354
+        0x7f040356
     .end array-data
 
     :array_14
     .array-data 4
-        0x7f04008d
-        0x7f04009c
+        0x7f04008e
         0x7f04009d
         0x7f04009e
-        0x7f0402fa
-        0x7f0402fb
+        0x7f04009f
+        0x7f0402fd
+        0x7f0402fe
     .end array-data
 
     :array_15
     .array-data 4
-        0x7f0400ea
         0x7f0400eb
         0x7f0400ec
         0x7f0400ed
@@ -2738,32 +2737,33 @@
         0x7f0400fc
         0x7f0400fd
         0x7f0400fe
+        0x7f0400ff
     .end array-data
 
     :array_16
     .array-data 4
-        0x7f0400af
         0x7f0400b0
-        0x7f0400d3
-        0x7f04011a
-        0x7f04011b
+        0x7f0400b1
+        0x7f0400d4
         0x7f04011c
         0x7f04011d
         0x7f04011e
         0x7f04011f
         0x7f040120
-        0x7f0402e6
-        0x7f0402e8
-        0x7f04030b
-        0x7f0403af
-        0x7f0403b0
-        0x7f0403ba
+        0x7f040121
+        0x7f040122
+        0x7f0402e9
+        0x7f0402eb
+        0x7f04030e
+        0x7f0403b2
+        0x7f0403b3
+        0x7f0403bd
     .end array-data
 
     :array_17
     .array-data 4
-        0x7f040204
-        0x7f040205
+        0x7f040206
+        0x7f040207
     .end array-data
 
     :array_18
@@ -2776,31 +2776,31 @@
     :array_19
     .array-data 4
         0x1010107
-        0x7f04007f
         0x7f040080
+        0x7f040081
     .end array-data
 
     :array_1a
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_1b
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_1c
     .array-data 4
-        0x7f040068
         0x7f040069
+        0x7f04006a
     .end array-data
 
     :array_1d
@@ -2808,75 +2808,75 @@
         0x7f04003b
         0x7f04003c
         0x7f040052
-        0x7f0400b1
-        0x7f04010b
-        0x7f04014a
-        0x7f0402ff
-        0x7f0403a6
+        0x7f0400b2
+        0x7f04010c
+        0x7f04014c
+        0x7f040302
+        0x7f0403a9
     .end array-data
 
     :array_1e
     .array-data 4
         0x7f04002d
         0x7f04002e
-        0x7f040105
         0x7f040106
         0x7f040107
-        0x7f040135
-        0x7f04013c
-        0x7f0401fa
-        0x7f0402f2
-        0x7f0402f3
-        0x7f0402f4
+        0x7f040108
+        0x7f040137
+        0x7f04013e
+        0x7f0401fc
+        0x7f0402f5
+        0x7f0402f6
+        0x7f0402f7
     .end array-data
 
     :array_1f
     .array-data 4
-        0x7f040200
-        0x7f040232
-        0x7f040233
+        0x7f040202
         0x7f040234
-        0x7f04023d
-        0x7f04023e
+        0x7f040235
+        0x7f040236
         0x7f04023f
         0x7f040240
+        0x7f040241
         0x7f040242
-        0x7f040245
+        0x7f040244
+        0x7f040247
     .end array-data
 
     :array_20
     .array-data 4
         0x7f040050
         0x7f040051
-        0x7f040064
-        0x7f040112
-        0x7f040125
-        0x7f040126
-        0x7f04015a
-        0x7f040164
-        0x7f04026c
-        0x7f04028f
-        0x7f0402c8
-        0x7f0402f6
-        0x7f0403d7
+        0x7f040065
+        0x7f040114
+        0x7f040127
+        0x7f040128
+        0x7f04015c
+        0x7f040166
+        0x7f04026f
+        0x7f040292
+        0x7f0402cb
+        0x7f0402f9
+        0x7f0403da
     .end array-data
 
     :array_21
     .array-data 4
-        0x7f040132
-        0x7f040133
-        0x7f0401f5
-        0x7f04024b
+        0x7f040134
+        0x7f040135
+        0x7f0401f7
+        0x7f04024e
     .end array-data
 
     :array_22
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_23
@@ -2886,39 +2886,36 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_24
     .array-data 4
         0x1010109
         0x1010200
-        0x7f040149
+        0x7f04014b
     .end array-data
 
     :array_25
     .array-data 4
         0x7f040027
         0x7f04004d
-        0x7f040128
-        0x7f040129
         0x7f04012a
-        0x7f040279
-        0x7f040288
-        0x7f040289
-        0x7f04028e
-        0x7f0402b6
-        0x7f0402b7
-        0x7f0402b8
-        0x7f0402c5
-        0x7f0402c6
+        0x7f04012b
+        0x7f04012c
+        0x7f04027c
+        0x7f04028b
+        0x7f04028c
+        0x7f040291
+        0x7f0402b9
+        0x7f0402ba
+        0x7f0402bb
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f0402cb
         0x7f0402cc
         0x7f0402cd
         0x7f0402ce
@@ -2930,7 +2927,10 @@
         0x7f0402d4
         0x7f0402d5
         0x7f0402d6
-        0x7f0403db
+        0x7f0402d7
+        0x7f0402d8
+        0x7f0402d9
+        0x7f0403e0
     .end array-data
 
     :array_26
@@ -2962,10 +2962,10 @@
         0x1010126
         0x1010127
         0x1010128
-        0x7f040104
-        0x7f040109
-        0x7f04026e
-        0x7f0402f5
+        0x7f040105
+        0x7f04010a
+        0x7f040271
+        0x7f0402f8
     .end array-data
 
     :array_29
@@ -2984,9 +2984,9 @@
 
     :array_2b
     .array-data 4
-        0x7f0400a4
-        0x7f0401d0
-        0x7f0401d1
+        0x7f0400a5
+        0x7f0401d2
+        0x7f0401d3
     .end array-data
 
     :array_2c
@@ -2997,47 +2997,44 @@
         0x10101ba
         0x7f040050
         0x7f040051
-        0x7f0400d6
-        0x7f0401c7
+        0x7f0400d7
         0x7f0401c9
-        0x7f0401ca
         0x7f0401cb
+        0x7f0401cc
         0x7f0401cd
-        0x7f0401ce
-        0x7f0402c8
-        0x7f04030f
-        0x7f040310
+        0x7f0401cf
+        0x7f0401d0
+        0x7f0402cb
+        0x7f040312
+        0x7f040313
     .end array-data
 
     :array_2d
     .array-data 4
-        0x7f04030f
-        0x7f040310
+        0x7f040312
+        0x7f040313
     .end array-data
 
     :array_2e
     .array-data 4
-        0x7f040068
         0x7f040069
-        0x7f040095
-        0x7f04009f
-        0x7f0400a3
-        0x7f0400b2
+        0x7f04006a
+        0x7f040096
+        0x7f0400a0
+        0x7f0400a4
         0x7f0400b3
-        0x7f0400b9
-        0x7f0400bc
-        0x7f0400c0
-        0x7f040111
-        0x7f04013d
-        0x7f040268
-        0x7f040269
-        0x7f040274
-        0x7f0402e7
-        0x7f0402fc
-        0x7f040332
-        0x7f04033a
-        0x7f04033b
-        0x7f04033c
+        0x7f0400b4
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c1
+        0x7f040113
+        0x7f04013f
+        0x7f04026b
+        0x7f04026c
+        0x7f040277
+        0x7f0402ea
+        0x7f0402ff
+        0x7f040335
         0x7f04033d
         0x7f04033e
         0x7f04033f
@@ -3045,10 +3042,13 @@
         0x7f040341
         0x7f040342
         0x7f040343
-        0x7f040348
-        0x7f04034d
-        0x7f04034e
-        0x7f040352
+        0x7f040344
+        0x7f040345
+        0x7f040346
+        0x7f04034b
+        0x7f040350
+        0x7f040351
+        0x7f040355
     .end array-data
 
     :array_2f
@@ -3080,12 +3080,12 @@
         0x7f04001f
         0x7f040020
         0x7f040031
-        0x7f0400c7
-        0x7f0401cd
-        0x7f0401ce
-        0x7f040277
-        0x7f0402f1
-        0x7f0403bf
+        0x7f0400c8
+        0x7f0401cf
+        0x7f0401d0
+        0x7f04027a
+        0x7f0402f4
+        0x7f0403c2
     .end array-data
 
     :array_31
@@ -3097,8 +3097,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04028d
-        0x7f040311
+        0x7f040290
+        0x7f040314
     .end array-data
 
     :array_32
@@ -3106,43 +3106,43 @@
         0x10100d4
         0x10100dd
         0x101011f
-        0x7f040112
-        0x7f040155
-        0x7f0401ee
-        0x7f0401ef
+        0x7f040114
+        0x7f040157
+        0x7f0401f0
         0x7f0401f1
         0x7f0401f3
-        0x7f0401f6
-        0x7f0401f9
-        0x7f04026f
+        0x7f0401f5
+        0x7f0401f8
+        0x7f0401fb
+        0x7f040272
     .end array-data
 
     :array_33
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040278
+        0x7f04027b
     .end array-data
 
     :array_34
     .array-data 4
-        0x7f04027c
         0x7f04027f
+        0x7f040282
     .end array-data
 
     :array_35
     .array-data 4
         0x10100c4
         0x10100f1
-        0x7f04012b
-        0x7f04012c
         0x7f04012d
         0x7f04012e
         0x7f04012f
-        0x7f0401ff
-        0x7f0402c7
-        0x7f0402fe
-        0x7f040304
+        0x7f040130
+        0x7f040131
+        0x7f040201
+        0x7f0402ca
+        0x7f040301
+        0x7f040307
     .end array-data
 
     :array_36
@@ -3151,26 +3151,26 @@
         0x101011f
         0x1010220
         0x1010264
-        0x7f0400a5
-        0x7f0400c2
-        0x7f0400ff
-        0x7f04014f
-        0x7f0401cf
-        0x7f0401fe
-        0x7f0402bd
-        0x7f0402be
-        0x7f0402e9
-        0x7f0402ea
-        0x7f040312
-        0x7f040317
-        0x7f0403dd
+        0x7f0400a6
+        0x7f0400c3
+        0x7f040100
+        0x7f040151
+        0x7f0401d1
+        0x7f040200
+        0x7f0402c0
+        0x7f0402c1
+        0x7f0402ec
+        0x7f0402ed
+        0x7f040315
+        0x7f04031a
+        0x7f0403e2
     .end array-data
 
     :array_37
     .array-data 4
-        0x7f04007c
-        0x7f0400bf
-        0x7f0402e5
+        0x7f04007d
+        0x7f0400c0
+        0x7f0402e8
     .end array-data
 
     :array_38
@@ -3179,21 +3179,18 @@
         0x7f040027
         0x7f040028
         0x7f04004d
-        0x7f040128
-        0x7f040129
         0x7f04012a
-        0x7f040279
-        0x7f040288
-        0x7f040289
-        0x7f04028e
-        0x7f0402b6
-        0x7f0402b7
-        0x7f0402b8
-        0x7f0402c5
-        0x7f0402c6
+        0x7f04012b
+        0x7f04012c
+        0x7f04027c
+        0x7f04028b
+        0x7f04028c
+        0x7f040291
+        0x7f0402b9
+        0x7f0402ba
+        0x7f0402bb
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f0402cb
         0x7f0402cc
         0x7f0402cd
         0x7f0402ce
@@ -3205,20 +3202,23 @@
         0x7f0402d4
         0x7f0402d5
         0x7f0402d6
-        0x7f0403db
+        0x7f0402d7
+        0x7f0402d8
+        0x7f0402d9
+        0x7f0403e0
     .end array-data
 
     :array_39
     .array-data 4
-        0x7f0402fc
-        0x7f0402fd
+        0x7f0402ff
+        0x7f040300
     .end array-data
 
     :array_3a
     .array-data 4
         0x101011f
-        0x7f040112
-        0x7f04026a
+        0x7f040114
+        0x7f04026d
     .end array-data
 
     :array_3b
@@ -3227,7 +3227,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_3c
@@ -3245,17 +3245,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f0402f7
-        0x7f040302
-        0x7f040318
-        0x7f040319
+        0x7f0402fa
+        0x7f040305
         0x7f04031b
-        0x7f0403a7
-        0x7f0403a8
-        0x7f0403a9
-        0x7f0403c0
-        0x7f0403c1
-        0x7f0403c2
+        0x7f04031c
+        0x7f04031e
+        0x7f0403aa
+        0x7f0403ab
+        0x7f0403ac
+        0x7f0403c3
+        0x7f0403c4
+        0x7f0403c5
     .end array-data
 
     :array_3e
@@ -3267,9 +3267,6 @@
 
     :array_3f
     .array-data 4
-        0x7f04031c
-        0x7f04031d
-        0x7f04031e
         0x7f04031f
         0x7f040320
         0x7f040321
@@ -3289,9 +3286,12 @@
         0x7f04032f
         0x7f040330
         0x7f040331
+        0x7f040332
         0x7f040333
         0x7f040334
-        0x7f040335
+        0x7f040336
+        0x7f040337
+        0x7f040338
     .end array-data
 
     :array_40
@@ -3307,15 +3307,14 @@
         0x1010163
         0x1010164
         0x10103ac
-        0x7f04013f
-        0x7f040339
+        0x7f040141
+        0x7f04033c
     .end array-data
 
     :array_41
     .array-data 4
         0x101009a
         0x1010150
-        0x7f04006a
         0x7f04006b
         0x7f04006c
         0x7f04006d
@@ -3324,72 +3323,73 @@
         0x7f040070
         0x7f040071
         0x7f040072
-        0x7f0400d7
+        0x7f040073
         0x7f0400d8
         0x7f0400d9
         0x7f0400da
-        0x7f040116
-        0x7f040117
-        0x7f040157
-        0x7f040158
+        0x7f0400db
+        0x7f040118
+        0x7f040119
         0x7f040159
-        0x7f04015e
+        0x7f04015a
+        0x7f04015b
         0x7f040160
-        0x7f040161
-        0x7f040283
-        0x7f040284
-        0x7f040285
+        0x7f040162
+        0x7f040163
         0x7f040286
         0x7f040287
+        0x7f040288
+        0x7f040289
+        0x7f04028a
     .end array-data
 
     :array_42
     .array-data 4
         0x1010034
-        0x7f040114
-        0x7f040115
+        0x7f040116
+        0x7f040117
     .end array-data
 
     :array_43
     .array-data 4
         0x10100af
         0x1010140
-        0x7f040079
-        0x7f0400ad
+        0x7f04007a
         0x7f0400ae
-        0x7f0400c8
+        0x7f0400af
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f040257
-        0x7f040258
-        0x7f04026b
-        0x7f040271
-        0x7f040272
-        0x7f04028b
-        0x7f040313
-        0x7f040314
-        0x7f040315
-        0x7f0403af
-        0x7f0403b1
+        0x7f0400ce
+        0x7f04025a
+        0x7f04025b
+        0x7f04026e
+        0x7f040274
+        0x7f040275
+        0x7f04028e
+        0x7f040316
+        0x7f040317
+        0x7f040318
         0x7f0403b2
-        0x7f0403b3
         0x7f0403b4
         0x7f0403b5
         0x7f0403b6
         0x7f0403b7
         0x7f0403b8
+        0x7f0403b9
+        0x7f0403ba
+        0x7f0403bb
     .end array-data
 
     :array_44
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04027d
-        0x7f04027e
-        0x7f040355
+        0x7f040280
+        0x7f040281
+        0x7f040358
     .end array-data
 
     :array_45
diff --git a/com.discord/smali/com/discord/gateway/io/IncomingParser.smali b/com.discord/smali/com/discord/gateway/io/IncomingParser.smali
index a1127dc92c..74cb81a915 100644
--- a/com.discord/smali/com/discord/gateway/io/IncomingParser.smali
+++ b/com.discord/smali/com/discord/gateway/io/IncomingParser.smali
@@ -262,6 +262,25 @@
     goto/16 :goto_e
 
     :sswitch_0
+    const-string v1, "STREAM_UPDATE"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_b
+
+    sget-object v0, Lcom/discord/models/domain/StreamUpdate$Parser;->INSTANCE:Lcom/discord/models/domain/StreamUpdate$Parser;
+
+    invoke-virtual {v0, p1}, Lcom/discord/models/domain/StreamUpdate$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamUpdate;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/gateway/io/IncomingParser;->data:Ljava/lang/Object;
+
+    return-void
+
+    :sswitch_1
     const-string v1, "GUILD_ROLE_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -272,7 +291,7 @@
 
     goto/16 :goto_2
 
-    :sswitch_1
+    :sswitch_2
     const-string v1, "VOICE_SERVER_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -295,7 +314,7 @@
 
     return-void
 
-    :sswitch_2
+    :sswitch_3
     const-string v1, "VOICE_STATE_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -318,7 +337,7 @@
 
     return-void
 
-    :sswitch_3
+    :sswitch_4
     const-string v1, "PRESENCES_REPLACE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -341,7 +360,26 @@
 
     return-void
 
-    :sswitch_4
+    :sswitch_5
+    const-string v1, "STREAM_DELETE"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_b
+
+    sget-object v0, Lcom/discord/models/domain/StreamDelete$Parser;->INSTANCE:Lcom/discord/models/domain/StreamDelete$Parser;
+
+    invoke-virtual {v0, p1}, Lcom/discord/models/domain/StreamDelete$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamDelete;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/gateway/io/IncomingParser;->data:Ljava/lang/Object;
+
+    return-void
+
+    :sswitch_6
     const-string v1, "GUILD_BAN_REMOVE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -352,7 +390,26 @@
 
     goto/16 :goto_a
 
-    :sswitch_5
+    :sswitch_7
+    const-string v1, "STREAM_CREATE"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_b
+
+    sget-object v0, Lcom/discord/models/domain/StreamCreate$Parser;->INSTANCE:Lcom/discord/models/domain/StreamCreate$Parser;
+
+    invoke-virtual {v0, p1}, Lcom/discord/models/domain/StreamCreate$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamCreate;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/gateway/io/IncomingParser;->data:Ljava/lang/Object;
+
+    return-void
+
+    :sswitch_8
     const-string v1, "MESSAGE_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -363,7 +420,7 @@
 
     goto/16 :goto_3
 
-    :sswitch_6
+    :sswitch_9
     const-string v1, "GUILD_ROLE_DELETE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -374,7 +431,7 @@
 
     goto :goto_2
 
-    :sswitch_7
+    :sswitch_a
     const-string v1, "USER_CONNECTIONS_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -385,7 +442,7 @@
 
     goto/16 :goto_d
 
-    :sswitch_8
+    :sswitch_b
     const-string v1, "GUILD_ROLE_CREATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -409,7 +466,7 @@
 
     return-void
 
-    :sswitch_9
+    :sswitch_c
     const-string v1, "USER_GUILD_SETTINGS_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -432,7 +489,7 @@
 
     return-void
 
-    :sswitch_a
+    :sswitch_d
     const-string v1, "MESSAGE_ACK"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -455,7 +512,7 @@
 
     return-void
 
-    :sswitch_b
+    :sswitch_e
     const-string v1, "GUILD_EMOJIS_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -478,7 +535,7 @@
 
     return-void
 
-    :sswitch_c
+    :sswitch_f
     const-string v1, "MESSAGE_REACTION_REMOVE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -489,7 +546,7 @@
 
     goto/16 :goto_c
 
-    :sswitch_d
+    :sswitch_10
     const-string v1, "CHANNEL_RECIPIENT_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -500,7 +557,7 @@
 
     goto/16 :goto_6
 
-    :sswitch_e
+    :sswitch_11
     const-string v1, "MESSAGE_DELETE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -511,7 +568,7 @@
 
     goto/16 :goto_4
 
-    :sswitch_f
+    :sswitch_12
     const-string v1, "MESSAGE_CREATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -535,7 +592,7 @@
 
     return-void
 
-    :sswitch_10
+    :sswitch_13
     const-string v1, "USER_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -558,7 +615,7 @@
 
     return-void
 
-    :sswitch_11
+    :sswitch_14
     const-string v1, "CALL_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -569,7 +626,7 @@
 
     goto/16 :goto_5
 
-    :sswitch_12
+    :sswitch_15
     const-string v1, "GUILD_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -580,7 +637,26 @@
 
     goto/16 :goto_8
 
-    :sswitch_13
+    :sswitch_16
+    const-string v1, "STREAM_SERVER_UPDATE"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_b
+
+    sget-object v0, Lcom/discord/models/domain/StreamServerUpdate$Parser;->INSTANCE:Lcom/discord/models/domain/StreamServerUpdate$Parser;
+
+    invoke-virtual {v0, p1}, Lcom/discord/models/domain/StreamServerUpdate$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamServerUpdate;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/gateway/io/IncomingParser;->data:Ljava/lang/Object;
+
+    return-void
+
+    :sswitch_17
     const-string v1, "READY"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -639,7 +715,7 @@
 
     return-void
 
-    :sswitch_14
+    :sswitch_18
     const-string v1, "GUILD_MEMBER_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -650,7 +726,7 @@
 
     goto/16 :goto_9
 
-    :sswitch_15
+    :sswitch_19
     const-string v1, "MESSAGE_DELETE_BULK"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -674,7 +750,7 @@
 
     return-void
 
-    :sswitch_16
+    :sswitch_1a
     const-string v1, "GUILD_MEMBER_REMOVE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -697,7 +773,7 @@
 
     return-void
 
-    :sswitch_17
+    :sswitch_1b
     const-string v1, "CHANNEL_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -708,7 +784,26 @@
 
     goto/16 :goto_7
 
-    :sswitch_18
+    :sswitch_1c
+    const-string v1, "CHANNEL_UNREAD_UPDATE"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_b
+
+    sget-object v0, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser;->INSTANCE:Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser;
+
+    invoke-virtual {v0, p1}, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannelUnreadUpdate;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/gateway/io/IncomingParser;->data:Ljava/lang/Object;
+
+    return-void
+
+    :sswitch_1d
     const-string v1, "CALL_DELETE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -719,7 +814,7 @@
 
     goto :goto_5
 
-    :sswitch_19
+    :sswitch_1e
     const-string v1, "CALL_CREATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -743,7 +838,7 @@
 
     return-void
 
-    :sswitch_1a
+    :sswitch_1f
     const-string v1, "GUILD_DELETE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -754,7 +849,7 @@
 
     goto/16 :goto_8
 
-    :sswitch_1b
+    :sswitch_20
     const-string v1, "GUILD_CREATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -765,7 +860,7 @@
 
     goto/16 :goto_8
 
-    :sswitch_1c
+    :sswitch_21
     const-string v1, "TYPING_START"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -788,7 +883,7 @@
 
     return-void
 
-    :sswitch_1d
+    :sswitch_22
     const-string v1, "CHANNEL_RECIPIENT_REMOVE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -812,7 +907,7 @@
 
     return-void
 
-    :sswitch_1e
+    :sswitch_23
     const-string v1, "CHANNEL_DELETE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -823,7 +918,7 @@
 
     goto :goto_7
 
-    :sswitch_1f
+    :sswitch_24
     const-string v1, "CHANNEL_CREATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -847,7 +942,7 @@
 
     return-void
 
-    :sswitch_20
+    :sswitch_25
     const-string v1, "RELATIONSHIP_REMOVE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -858,7 +953,7 @@
 
     goto/16 :goto_b
 
-    :sswitch_21
+    :sswitch_26
     const-string v1, "USER_SETTINGS_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -881,7 +976,7 @@
 
     return-void
 
-    :sswitch_22
+    :sswitch_27
     const-string v1, "GUILD_INTEGRATIONS_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -904,7 +999,7 @@
 
     return-void
 
-    :sswitch_23
+    :sswitch_28
     const-string v1, "PRESENCE_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -927,7 +1022,7 @@
 
     return-void
 
-    :sswitch_24
+    :sswitch_29
     const-string v1, "GUILD_SYNC"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -951,7 +1046,7 @@
 
     return-void
 
-    :sswitch_25
+    :sswitch_2a
     const-string v1, "USER_NOTE_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -974,7 +1069,7 @@
 
     return-void
 
-    :sswitch_26
+    :sswitch_2b
     const-string v1, "GUILD_MEMBER_LIST_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -993,7 +1088,7 @@
 
     return-void
 
-    :sswitch_27
+    :sswitch_2c
     const-string v1, "MESSAGE_REACTION_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1004,7 +1099,7 @@
 
     goto :goto_c
 
-    :sswitch_28
+    :sswitch_2d
     const-string v1, "GUILD_MEMBER_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1028,7 +1123,7 @@
 
     return-void
 
-    :sswitch_29
+    :sswitch_2e
     const-string v1, "GUILD_BAN_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1052,7 +1147,7 @@
 
     return-void
 
-    :sswitch_2a
+    :sswitch_2f
     const-string v1, "RELATIONSHIP_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1076,7 +1171,7 @@
 
     return-void
 
-    :sswitch_2b
+    :sswitch_30
     const-string v1, "USER_REQUIRED_ACTION_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1099,7 +1194,7 @@
 
     return-void
 
-    :sswitch_2c
+    :sswitch_31
     const-string v1, "MESSAGE_REACTION_REMOVE_ALL"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1123,7 +1218,7 @@
 
     return-void
 
-    :sswitch_2d
+    :sswitch_32
     const-string v1, "GUILD_MEMBERS_CHUNK"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1146,7 +1241,7 @@
 
     return-void
 
-    :sswitch_2e
+    :sswitch_33
     const-string v1, "USER_CONNECTIONS_INTEGRATION_JOINING"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1158,13 +1253,13 @@
     :goto_d
     invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     iput-object p1, p0, Lcom/discord/gateway/io/IncomingParser;->data:Ljava/lang/Object;
 
     return-void
 
-    :sswitch_2f
+    :sswitch_34
     const-string v1, "SESSIONS_REPLACE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1205,56 +1300,63 @@
 
     return-void
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
-        -0x78ca470e -> :sswitch_2f
-        -0x70da87b1 -> :sswitch_2e
-        -0x6cd113e5 -> :sswitch_2d
-        -0x5c91e13c -> :sswitch_2c
-        -0x57767eba -> :sswitch_2b
-        -0x4f1a5206 -> :sswitch_2a
-        -0x4b2dfc3b -> :sswitch_29
-        -0x4a71b2b8 -> :sswitch_28
-        -0x49d2993d -> :sswitch_27
-        -0x47a432af -> :sswitch_26
-        -0x394108be -> :sswitch_25
-        -0x37ee0c79 -> :sswitch_24
-        -0x35d8e373 -> :sswitch_23
-        -0x32448a83 -> :sswitch_22
-        -0x2e5f9c0f -> :sswitch_21
-        -0x2ad96395 -> :sswitch_20
-        -0x283cac28 -> :sswitch_1f
-        -0x273bc779 -> :sswitch_1e
-        -0x20ab369a -> :sswitch_1d
-        -0x1e714c86 -> :sswitch_1c
-        -0x10511518 -> :sswitch_1b
-        -0xf503069 -> :sswitch_1a
-        -0xdeca603 -> :sswitch_19
-        -0xcebc154 -> :sswitch_18
-        -0x9a2145b -> :sswitch_17
-        -0x816eda3 -> :sswitch_16
-        -0x669dd32 -> :sswitch_15
-        -0x261ad5e -> :sswitch_14
-        0x4a3e183 -> :sswitch_13
-        0xe4982b5 -> :sswitch_12
-        0x10adf1ca -> :sswitch_11
-        0x17547bbd -> :sswitch_10
-        0x3b7f2454 -> :sswitch_f
-        0x3c800903 -> :sswitch_e
-        0x46f81adf -> :sswitch_d
-        0x4a7f4302 -> :sswitch_c
-        0x4c1b20ef -> :sswitch_b
-        0x4c5c6c11 -> :sswitch_a
-        0x52d81e85 -> :sswitch_9
-        0x58044679 -> :sswitch_8
-        0x581fe407 -> :sswitch_7
-        0x59052b28 -> :sswitch_6
-        0x5a19bc21 -> :sswitch_5
-        0x60ba6ec0 -> :sswitch_4
-        0x64b9c00d -> :sswitch_3
-        0x654afa64 -> :sswitch_2
-        0x702fd8d8 -> :sswitch_1
-        0x769ede46 -> :sswitch_0
+        -0x78ca470e -> :sswitch_34
+        -0x70da87b1 -> :sswitch_33
+        -0x6cd113e5 -> :sswitch_32
+        -0x5c91e13c -> :sswitch_31
+        -0x57767eba -> :sswitch_30
+        -0x4f1a5206 -> :sswitch_2f
+        -0x4b2dfc3b -> :sswitch_2e
+        -0x4a71b2b8 -> :sswitch_2d
+        -0x49d2993d -> :sswitch_2c
+        -0x47a432af -> :sswitch_2b
+        -0x394108be -> :sswitch_2a
+        -0x37ee0c79 -> :sswitch_29
+        -0x35d8e373 -> :sswitch_28
+        -0x32448a83 -> :sswitch_27
+        -0x2e5f9c0f -> :sswitch_26
+        -0x2ad96395 -> :sswitch_25
+        -0x283cac28 -> :sswitch_24
+        -0x273bc779 -> :sswitch_23
+        -0x20ab369a -> :sswitch_22
+        -0x1e714c86 -> :sswitch_21
+        -0x10511518 -> :sswitch_20
+        -0xf503069 -> :sswitch_1f
+        -0xdeca603 -> :sswitch_1e
+        -0xcebc154 -> :sswitch_1d
+        -0xc585f03 -> :sswitch_1c
+        -0x9a2145b -> :sswitch_1b
+        -0x816eda3 -> :sswitch_1a
+        -0x669dd32 -> :sswitch_19
+        -0x261ad5e -> :sswitch_18
+        0x4a3e183 -> :sswitch_17
+        0x5195ac6 -> :sswitch_16
+        0xe4982b5 -> :sswitch_15
+        0x10adf1ca -> :sswitch_14
+        0x17547bbd -> :sswitch_13
+        0x3b7f2454 -> :sswitch_12
+        0x3c800903 -> :sswitch_11
+        0x46f81adf -> :sswitch_10
+        0x4a7f4302 -> :sswitch_f
+        0x4c1b20ef -> :sswitch_e
+        0x4c5c6c11 -> :sswitch_d
+        0x52d81e85 -> :sswitch_c
+        0x58044679 -> :sswitch_b
+        0x581fe407 -> :sswitch_a
+        0x59052b28 -> :sswitch_9
+        0x5a19bc21 -> :sswitch_8
+        0x60555e9b -> :sswitch_7
+        0x60ba6ec0 -> :sswitch_6
+        0x6156434a -> :sswitch_5
+        0x64b9c00d -> :sswitch_4
+        0x654afa64 -> :sswitch_3
+        0x702fd8d8 -> :sswitch_2
+        0x769ede46 -> :sswitch_1
+        0x7eeff668 -> :sswitch_0
     .end sparse-switch
 .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
new file mode 100644
index 0000000000..e9f42498cc
--- /dev/null
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$DeleteStream.smali
@@ -0,0 +1,46 @@
+.class public final Lcom/discord/gateway/io/OutgoingPayload$DeleteStream;
+.super Lcom/discord/gateway/io/OutgoingPayload;
+.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 = "DeleteStream"
+.end annotation
+
+
+# instance fields
+.field private final stream_key:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "stream_key"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+
+# virtual methods
+.method public final getStream_key()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/gateway/io/OutgoingPayload$DeleteStream;->stream_key:Ljava/lang/String;
+
+    return-object v0
+.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 44d1392996..1f4f7040c0 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$PresenceUpdate.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$PresenceUpdate.smali
@@ -88,7 +88,7 @@
 
     if-eqz p6, :cond_1
 
-    sget-object p3, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p3, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p3, Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$WatchStream.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$WatchStream.smali
new file mode 100644
index 0000000000..e3702b7c88
--- /dev/null
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$WatchStream.smali
@@ -0,0 +1,46 @@
+.class public final Lcom/discord/gateway/io/OutgoingPayload$WatchStream;
+.super Lcom/discord/gateway/io/OutgoingPayload;
+.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 = "WatchStream"
+.end annotation
+
+
+# instance fields
+.field private final stream_key:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "stream_key"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+
+# virtual methods
+.method public final getStream_key()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/gateway/io/OutgoingPayload$WatchStream;->stream_key:Ljava/lang/String;
+
+    return-object 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 2170e1d4c7..e843500b06 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload.smali
@@ -13,7 +13,9 @@
         Lcom/discord/gateway/io/OutgoingPayload$CallConnect;,
         Lcom/discord/gateway/io/OutgoingPayload$PresenceUpdate;,
         Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptionsUpdate;,
-        Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;
+        Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;,
+        Lcom/discord/gateway/io/OutgoingPayload$WatchStream;,
+        Lcom/discord/gateway/io/OutgoingPayload$DeleteStream;
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/gateway/opcodes/Opcodes.smali b/com.discord/smali/com/discord/gateway/opcodes/Opcodes.smali
index ae51d0375c..0a8b257719 100644
--- a/com.discord/smali/com/discord/gateway/opcodes/Opcodes.smali
+++ b/com.discord/smali/com/discord/gateway/opcodes/Opcodes.smali
@@ -30,6 +30,10 @@
 
 .field public static final RESUME:I = 0x6
 
+.field public static final STREAM_DELETE:I = 0x13
+
+.field public static final STREAM_WATCH:I = 0x14
+
 .field public static final VOICE_SERVER_PING:I = 0x5
 
 .field public static final VOICE_STATE_UPDATE:I = 0x4
diff --git a/com.discord/smali/com/discord/gateway/rest/RestClient.smali b/com.discord/smali/com/discord/gateway/rest/RestClient.smali
index ae40f9b1d7..f6798b68ba 100644
--- a/com.discord/smali/com/discord/gateway/rest/RestClient.smali
+++ b/com.discord/smali/com/discord/gateway/rest/RestClient.smali
@@ -51,14 +51,14 @@
 
     const-string v2, "restApi"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-interface {v1}, Lcom/discord/gateway/rest/RestApi;->getGateway()Lrx/Observable;
 
     move-result-object v1
 
-    invoke-static {}, Lrx/d/a;->LG()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lu()Lrx/Scheduler;
 
     move-result-object v2
 
@@ -148,7 +148,7 @@
 
     check-cast v2, Lokhttp3/Interceptor;
 
-    iget-object v3, p2, Lkotlin/jvm/internal/y;->bkH:Ljava/util/ArrayList;
+    iget-object v3, p2, Lkotlin/jvm/internal/y;->blb:Ljava/util/ArrayList;
 
     invoke-virtual {v3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -180,9 +180,9 @@
 
     if-lez v2, :cond_1
 
-    iget-object v2, p2, Lkotlin/jvm/internal/y;->bkH:Ljava/util/ArrayList;
+    iget-object v2, p2, Lkotlin/jvm/internal/y;->blb:Ljava/util/ArrayList;
 
-    iget-object v3, p2, Lkotlin/jvm/internal/y;->bkH:Ljava/util/ArrayList;
+    iget-object v3, p2, Lkotlin/jvm/internal/y;->blb:Ljava/util/ArrayList;
 
     invoke-virtual {v3}, Ljava/util/ArrayList;->size()I
 
@@ -194,7 +194,7 @@
 
     invoke-virtual {v2, v3}, Ljava/util/ArrayList;->ensureCapacity(I)V
 
-    iget-object v2, p2, Lkotlin/jvm/internal/y;->bkH:Ljava/util/ArrayList;
+    iget-object v2, p2, Lkotlin/jvm/internal/y;->blb:Ljava/util/ArrayList;
 
     invoke-static {v2, p1}, Ljava/util/Collections;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
 
@@ -225,7 +225,7 @@
 
     :cond_1
     :goto_0
-    iget-object p1, p2, Lkotlin/jvm/internal/y;->bkH:Ljava/util/ArrayList;
+    iget-object p1, p2, Lkotlin/jvm/internal/y;->blb:Ljava/util/ArrayList;
 
     invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
 
@@ -233,7 +233,7 @@
 
     new-array p1, p1, [Lokhttp3/Interceptor;
 
-    iget-object p2, p2, Lkotlin/jvm/internal/y;->bkH:Ljava/util/ArrayList;
+    iget-object p2, p2, Lkotlin/jvm/internal/y;->blb:Ljava/util/ArrayList;
 
     invoke-virtual {p2, p1}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
 
@@ -241,7 +241,7 @@
 
     check-cast p1, [Lokhttp3/Interceptor;
 
-    invoke-static {p1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {p1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v7
 
diff --git a/com.discord/smali/com/discord/gateway/rest/RestConfig.smali b/com.discord/smali/com/discord/gateway/rest/RestConfig.smali
index f85108180e..69180f5276 100644
--- a/com.discord/smali/com/discord/gateway/rest/RestConfig.smali
+++ b/com.discord/smali/com/discord/gateway/rest/RestConfig.smali
@@ -64,7 +64,7 @@
 
     if-eqz p4, :cond_0
 
-    sget-object p3, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p3, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p3, Ljava/util/List;
 
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 ded0fcd303..fdf944db51 100644
--- a/com.discord/smali/com/discord/models/application/Unread$Marker.smali
+++ b/com.discord/smali/com/discord/models/application/Unread$Marker.smali
@@ -201,37 +201,33 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 2
 
     iget-wide v0, p0, Lcom/discord/models/application/Unread$Marker;->channelId:J
 
-    const/16 v2, 0x20
-
-    ushr-long v2, v0, v2
-
-    xor-long/2addr v0, v2
-
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/models/application/Unread$Marker;->messageId:Ljava/lang/Long;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
     move-result v0
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lcom/discord/models/application/Unread$Marker;->messageId:Ljava/lang/Long;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/models/application/Unread.smali b/com.discord/smali/com/discord/models/application/Unread.smali
index cad1e2e266..c1f4535c9b 100644
--- a/com.discord/smali/com/discord/models/application/Unread.smali
+++ b/com.discord/smali/com/discord/models/application/Unread.smali
@@ -295,6 +295,10 @@
 
     iget v1, p0, Lcom/discord/models/application/Unread;->count:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/models/domain/Model$TypeAdapterFactory$1.smali b/com.discord/smali/com/discord/models/domain/Model$TypeAdapterFactory$1.smali
index 289c0ba69e..1e5fa120d4 100644
--- a/com.discord/smali/com/discord/models/domain/Model$TypeAdapterFactory$1.smali
+++ b/com.discord/smali/com/discord/models/domain/Model$TypeAdapterFactory$1.smali
@@ -63,7 +63,7 @@
     :try_start_0
     iget-object v1, p0, Lcom/discord/models/domain/Model$TypeAdapterFactory$1;->val$type:Lcom/google/gson/reflect/TypeToken;
 
-    iget-object v1, v1, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object v1, v1, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     invoke-virtual {v1}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/models/domain/Model$TypeAdapterFactory.smali b/com.discord/smali/com/discord/models/domain/Model$TypeAdapterFactory.smali
index 812698799b..ad74d28b73 100644
--- a/com.discord/smali/com/discord/models/domain/Model$TypeAdapterFactory.smali
+++ b/com.discord/smali/com/discord/models/domain/Model$TypeAdapterFactory.smali
@@ -45,7 +45,7 @@
 
     const-class p1, Lcom/discord/models/domain/Model;
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     invoke-virtual {p1, v0}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
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 1703183aca..ad0b7ea9be 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplication$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplication$Parser.smali
@@ -122,7 +122,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
@@ -137,7 +137,7 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
     iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
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 3224a71ddc..48cd8205e1 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplicationStream$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplicationStream$Companion.smali
@@ -33,6 +33,80 @@
 
 
 # virtual methods
+.method public final decodeStreamKey(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStream;
+    .locals 10
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    const/4 v0, 0x1
+
+    new-array v1, v0, [Ljava/lang/String;
+
+    const/4 v2, 0x0
+
+    const-string v3, ":"
+
+    aput-object v3, v1, v2
+
+    invoke-static {p1, v1, v2, v2}, Lkotlin/text/l;->b(Ljava/lang/CharSequence;[Ljava/lang/String;ZI)Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-interface {p1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    move-object v3, v1
+
+    check-cast v3, Ljava/lang/String;
+
+    invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+
+    invoke-static {v0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+
+    move-result-wide v6
+
+    const/4 v0, 0x2
+
+    invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+
+    invoke-static {v0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+
+    move-result-wide v8
+
+    const/4 v0, 0x3
+
+    invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-static {p1}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+
+    move-result-wide v4
+
+    new-instance p1, Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-object v2, p1
+
+    invoke-direct/range {v2 .. v9}, Lcom/discord/models/domain/ModelApplicationStream;-><init>(Ljava/lang/String;JJJ)V
+
+    return-object p1
+.end method
+
 .method public final encodeStreamKey(Lcom/discord/models/domain/ModelApplicationStream;)Ljava/lang/String;
     .locals 9
 
@@ -44,6 +118,10 @@
 
     check-cast v1, Lcom/discord/models/domain/ModelApplicationStream$Companion;
 
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplicationStream;->getStreamType()Ljava/lang/String;
+
+    move-result-object v2
+
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplicationStream;->getOwnerId()J
 
     move-result-wide v3
@@ -56,8 +134,6 @@
 
     move-result-wide v7
 
-    const-string v2, "guild"
-
     invoke-virtual/range {v1 .. v8}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->encodeStreamKey(Ljava/lang/String;JJJ)Ljava/lang/String;
 
     move-result-object p1
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplicationStream.smali b/com.discord/smali/com/discord/models/domain/ModelApplicationStream.smali
index 7fd74fc570..2b50e35d18 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplicationStream.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplicationStream.smali
@@ -22,6 +22,8 @@
 
 .field private final ownerId:J
 
+.field private final streamType:Ljava/lang/String;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -38,53 +40,72 @@
     return-void
 .end method
 
-.method public constructor <init>(JJJ)V
-    .locals 0
+.method public constructor <init>(Ljava/lang/String;JJJ)V
+    .locals 1
+
+    const-string v0, "streamType"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide p1, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
+    iput-object p1, p0, Lcom/discord/models/domain/ModelApplicationStream;->streamType:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
+    iput-wide p2, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
 
-    iput-wide p5, p0, Lcom/discord/models/domain/ModelApplicationStream;->channelId:J
+    iput-wide p4, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
+
+    iput-wide p6, p0, Lcom/discord/models/domain/ModelApplicationStream;->channelId:J
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/models/domain/ModelApplicationStream;JJJILjava/lang/Object;)Lcom/discord/models/domain/ModelApplicationStream;
-    .locals 7
+.method public static synthetic copy$default(Lcom/discord/models/domain/ModelApplicationStream;Ljava/lang/String;JJJILjava/lang/Object;)Lcom/discord/models/domain/ModelApplicationStream;
+    .locals 4
 
-    and-int/lit8 p8, p7, 0x1
+    and-int/lit8 p9, p8, 0x1
 
-    if-eqz p8, :cond_0
+    if-eqz p9, :cond_0
 
-    iget-wide p1, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
+    iget-object p1, p0, Lcom/discord/models/domain/ModelApplicationStream;->streamType:Ljava/lang/String;
 
     :cond_0
-    move-wide v1, p1
+    and-int/lit8 p9, p8, 0x2
 
-    and-int/lit8 p1, p7, 0x2
+    if-eqz p9, :cond_1
 
-    if-eqz p1, :cond_1
-
-    iget-wide p3, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
+    iget-wide p2, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
 
     :cond_1
-    move-wide v3, p3
+    move-wide v0, p2
 
-    and-int/lit8 p1, p7, 0x4
+    and-int/lit8 p2, p8, 0x4
 
-    if-eqz p1, :cond_2
+    if-eqz p2, :cond_2
 
-    iget-wide p5, p0, Lcom/discord/models/domain/ModelApplicationStream;->channelId:J
+    iget-wide p4, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
 
     :cond_2
-    move-wide v5, p5
+    move-wide v2, p4
 
-    move-object v0, p0
+    and-int/lit8 p2, p8, 0x8
 
-    invoke-virtual/range {v0 .. v6}, Lcom/discord/models/domain/ModelApplicationStream;->copy(JJJ)Lcom/discord/models/domain/ModelApplicationStream;
+    if-eqz p2, :cond_3
+
+    iget-wide p6, p0, Lcom/discord/models/domain/ModelApplicationStream;->channelId:J
+
+    :cond_3
+    move-wide p8, p6
+
+    move-object p2, p0
+
+    move-object p3, p1
+
+    move-wide p4, v0
+
+    move-wide p6, v2
+
+    invoke-virtual/range {p2 .. p9}, Lcom/discord/models/domain/ModelApplicationStream;->copy(Ljava/lang/String;JJJ)Lcom/discord/models/domain/ModelApplicationStream;
 
     move-result-object p0
 
@@ -93,7 +114,15 @@
 
 
 # virtual methods
-.method public final component1()J
+.method public final component1()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelApplicationStream;->streamType:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component2()J
     .locals 2
 
     iget-wide v0, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
@@ -101,7 +130,7 @@
     return-wide v0
 .end method
 
-.method public final component2()J
+.method public final component3()J
     .locals 2
 
     iget-wide v0, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
@@ -109,7 +138,7 @@
     return-wide v0
 .end method
 
-.method public final component3()J
+.method public final component4()J
     .locals 2
 
     iget-wide v0, p0, Lcom/discord/models/domain/ModelApplicationStream;->channelId:J
@@ -117,22 +146,28 @@
     return-wide v0
 .end method
 
-.method public final copy(JJJ)Lcom/discord/models/domain/ModelApplicationStream;
-    .locals 8
+.method public final copy(Ljava/lang/String;JJJ)Lcom/discord/models/domain/ModelApplicationStream;
+    .locals 9
 
-    new-instance v7, Lcom/discord/models/domain/ModelApplicationStream;
+    const-string v0, "streamType"
 
-    move-object v0, v7
+    move-object v2, p1
 
-    move-wide v1, p1
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v3, p3
+    new-instance v0, Lcom/discord/models/domain/ModelApplicationStream;
 
-    move-wide v5, p5
+    move-object v1, v0
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/models/domain/ModelApplicationStream;-><init>(JJJ)V
+    move-wide v3, p2
 
-    return-object v7
+    move-wide v5, p4
+
+    move-wide v7, p6
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/models/domain/ModelApplicationStream;-><init>(Ljava/lang/String;JJJ)V
+
+    return-object v0
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
@@ -150,6 +185,16 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelApplicationStream;
 
+    iget-object v1, p0, Lcom/discord/models/domain/ModelApplicationStream;->streamType:Ljava/lang/String;
+
+    iget-object v3, p1, Lcom/discord/models/domain/ModelApplicationStream;->streamType:Ljava/lang/String;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
     iget-wide v3, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
 
     iget-wide v5, p1, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
@@ -238,44 +283,70 @@
     return-wide v0
 .end method
 
+.method public final getStreamType()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelApplicationStream;->streamType:Ljava/lang/String;
+
+    return-object v0
+.end method
+
 .method public final hashCode()I
-    .locals 7
+    .locals 6
 
-    iget-wide v0, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
+    iget-object v0, p0, Lcom/discord/models/domain/ModelApplicationStream;->streamType:Ljava/lang/String;
 
-    const/16 v2, 0x20
+    if-eqz v0, :cond_0
 
-    ushr-long v3, v0, v2
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
-    xor-long/2addr v0, v3
+    move-result v0
 
-    long-to-int v1, v0
+    goto :goto_0
 
-    mul-int/lit8 v1, v1, 0x1f
+    :cond_0
+    const/4 v0, 0x0
 
-    iget-wide v3, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
 
-    ushr-long v5, v3, v2
+    iget-wide v1, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
 
-    xor-long/2addr v3, v5
+    const/16 v3, 0x20
 
-    long-to-int v0, v3
+    ushr-long v4, v1, v3
 
-    add-int/2addr v1, v0
+    xor-long/2addr v1, v4
 
-    mul-int/lit8 v1, v1, 0x1f
+    long-to-int v2, v1
 
-    iget-wide v3, p0, Lcom/discord/models/domain/ModelApplicationStream;->channelId:J
+    add-int/2addr v0, v2
 
-    ushr-long v5, v3, v2
+    mul-int/lit8 v0, v0, 0x1f
 
-    xor-long/2addr v3, v5
+    iget-wide v1, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
 
-    long-to-int v0, v3
+    ushr-long v4, v1, v3
 
-    add-int/2addr v1, v0
+    xor-long/2addr v1, v4
 
-    return v1
+    long-to-int v2, v1
+
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-wide v1, p0, Lcom/discord/models/domain/ModelApplicationStream;->channelId:J
+
+    ushr-long v3, v1, v3
+
+    xor-long/2addr v1, v3
+
+    long-to-int v2, v1
+
+    add-int/2addr v0, v2
+
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
@@ -283,10 +354,18 @@
 
     new-instance v0, Ljava/lang/StringBuilder;
 
-    const-string v1, "ModelApplicationStream(ownerId="
+    const-string v1, "ModelApplicationStream(streamType="
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
+    iget-object v1, p0, Lcom/discord/models/domain/ModelApplicationStream;->streamType:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", ownerId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     iget-wide v1, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/models/domain/ModelChannel.smali b/com.discord/smali/com/discord/models/domain/ModelChannel.smali
index ff00d61465..bf36337c36 100644
--- a/com.discord/smali/com/discord/models/domain/ModelChannel.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelChannel.smali
@@ -54,7 +54,7 @@
 
 .field public static final GROUP_DM:I = 0x3
 
-.field public static final GUILD_NEWS:I = 0x5
+.field public static final GUILD_ANNOUNCEMENT:I = 0x5
 
 .field public static final GUILD_TEXT:I = 0x0
 
@@ -196,6 +196,30 @@
     return-void
 .end method
 
+.method private constructor <init>(JLjava/lang/String;IJJ)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, Lcom/discord/models/domain/ModelChannel;->computedName:Ljava/util/concurrent/atomic/AtomicReference;
+
+    iput-wide p1, p0, Lcom/discord/models/domain/ModelChannel;->id:J
+
+    iput-object p3, p0, Lcom/discord/models/domain/ModelChannel;->name:Ljava/lang/String;
+
+    iput p4, p0, Lcom/discord/models/domain/ModelChannel;->type:I
+
+    iput-wide p5, p0, Lcom/discord/models/domain/ModelChannel;->guildId:J
+
+    iput-wide p7, p0, Lcom/discord/models/domain/ModelChannel;->ownerId:J
+
+    return-void
+.end method
+
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;J)V
     .locals 5
 
@@ -486,6 +510,28 @@
     return-object p0
 .end method
 
+.method public static createForTesting(JLjava/lang/String;IJJ)Lcom/discord/models/domain/ModelChannel;
+    .locals 10
+
+    new-instance v9, Lcom/discord/models/domain/ModelChannel;
+
+    move-object v0, v9
+
+    move-wide v1, p0
+
+    move-object v3, p2
+
+    move v4, p3
+
+    move-wide v5, p4
+
+    move-wide/from16 v7, p6
+
+    invoke-direct/range {v0 .. v8}, Lcom/discord/models/domain/ModelChannel;-><init>(JLjava/lang/String;IJJ)V
+
+    return-object v9
+.end method
+
 .method private getComputedName()Ljava/lang/String;
     .locals 3
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1$1.smali b/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1$1.smali
new file mode 100644
index 0000000000..5d4c1757b1
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1$1.smali
@@ -0,0 +1,79 @@
+.class final Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1$1;
+.super Ljava/lang/Object;
+.source "ModelChannelUnreadUpdate.kt"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;->call(Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lcom/discord/models/domain/Model$JsonReader$ItemFactory<",
+        "Lcom/discord/models/domain/ModelReadState;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1$1;->this$0:Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()Lcom/discord/models/domain/ModelReadState;
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1$1;->this$0:Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;
+
+    iget-object v0, v0, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    new-instance v1, Lcom/discord/models/domain/ModelReadState;
+
+    invoke-direct {v1}, Lcom/discord/models/domain/ModelReadState;-><init>()V
+
+    check-cast v1, Lcom/discord/models/domain/Model;
+
+    invoke-virtual {v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/models/domain/ModelReadState;
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic get()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1$1;->get()Lcom/discord/models/domain/ModelReadState;
+
+    move-result-object v0
+
+    return-object v0
+.end method
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
new file mode 100644
index 0000000000..11d529b3f6
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1.smali
@@ -0,0 +1,119 @@
+.class final Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;
+.super Ljava/lang/Object;
+.source "ModelChannelUnreadUpdate.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannelUnreadUpdate;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $channelReadStates:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+.field final synthetic $reader:Lcom/discord/models/domain/Model$JsonReader;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;->$channelReadStates:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iput-object p2, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-virtual {p0, p1}, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;->call(Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public final call(Ljava/lang/String;)V
+    .locals 2
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    const v1, -0x11cd390a
+
+    if-eq v0, v1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const-string v0, "channel_unread_updates"
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    iget-object p1, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;->$channelReadStates:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    new-instance v1, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1$1;-><init>(Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;)V
+
+    check-cast v1, Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+    invoke-virtual {v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
+
+    move-result-object v0
+
+    const-string v1, "reader.nextList { reader.parse(ModelReadState()) }"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    return-void
+
+    :cond_2
+    :goto_0
+    iget-object p1, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser.smali
new file mode 100644
index 0000000000..79092973c9
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser.smali
@@ -0,0 +1,105 @@
+.class public final Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser;
+.super Ljava/lang/Object;
+.source "ModelChannelUnreadUpdate.kt"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$Parser;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/models/domain/ModelChannelUnreadUpdate;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Parser"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lcom/discord/models/domain/Model$Parser<",
+        "Lcom/discord/models/domain/ModelChannelUnreadUpdate;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser;
+
+    invoke-direct {v0}, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser;-><init>()V
+
+    sput-object v0, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser;->INSTANCE:Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannelUnreadUpdate;
+    .locals 2
+
+    const-string v0, "reader"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;
+
+    invoke-direct {v1, v0, p1}, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;)V
+
+    check-cast v1, Lrx/functions/Action1;
+
+    invoke-virtual {p1, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+
+    new-instance p1, Lcom/discord/models/domain/ModelChannelUnreadUpdate;
+
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "channelReadStates"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    check-cast v0, Ljava/util/List;
+
+    invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelChannelUnreadUpdate;-><init>(Ljava/util/List;)V
+
+    return-object p1
+.end method
+
+.method public final bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannelUnreadUpdate;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate.smali b/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate.smali
new file mode 100644
index 0000000000..17c168084c
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate.smali
@@ -0,0 +1,201 @@
+.class public final Lcom/discord/models/domain/ModelChannelUnreadUpdate;
+.super Ljava/lang/Object;
+.source "ModelChannelUnreadUpdate.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser;
+    }
+.end annotation
+
+
+# instance fields
+.field private final channelReadStates:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelReadState;",
+            ">;"
+        }
+    .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<",
+            "+",
+            "Lcom/discord/models/domain/ModelReadState;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "channelReadStates"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/models/domain/ModelChannelUnreadUpdate;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/ModelChannelUnreadUpdate;
+    .locals 0
+
+    and-int/lit8 p2, p2, 0x1
+
+    if-eqz p2, :cond_0
+
+    iget-object p1, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate;->channelReadStates:Ljava/util/List;
+
+    :cond_0
+    invoke-virtual {p0, p1}, Lcom/discord/models/domain/ModelChannelUnreadUpdate;->copy(Ljava/util/List;)Lcom/discord/models/domain/ModelChannelUnreadUpdate;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelReadState;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate;->channelReadStates:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/util/List;)Lcom/discord/models/domain/ModelChannelUnreadUpdate;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/ModelReadState;",
+            ">;)",
+            "Lcom/discord/models/domain/ModelChannelUnreadUpdate;"
+        }
+    .end annotation
+
+    const-string v0, "channelReadStates"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/models/domain/ModelChannelUnreadUpdate;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannelUnreadUpdate;
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate;->channelReadStates:Ljava/util/List;
+
+    iget-object p1, p1, Lcom/discord/models/domain/ModelChannelUnreadUpdate;->channelReadStates:Ljava/util/List;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getChannelReadStates()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelReadState;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate;->channelReadStates:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate;->channelReadStates:Ljava/util/List;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "ModelChannelUnreadUpdate(channelReadStates="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate;->channelReadStates:Ljava/util/List;
+
+    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/ModelEntitlement.smali b/com.discord/smali/com/discord/models/domain/ModelEntitlement.smali
index 87ee5fad8f..b4d15bc13b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelEntitlement.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelEntitlement.smali
@@ -8,6 +8,8 @@
 
 .field private final id:J
 
+.field private final parentId:Ljava/lang/Long;
+
 .field private final sku:Lcom/discord/models/domain/ModelSku;
 
 .field private final skuId:J
@@ -20,7 +22,7 @@
 
 
 # direct methods
-.method public constructor <init>(JJIJJLcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan;)V
+.method public constructor <init>(JJIJJLcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan;Ljava/lang/Long;)V
     .locals 1
 
     const-string v0, "sku"
@@ -43,113 +45,131 @@
 
     iput-object p11, p0, Lcom/discord/models/domain/ModelEntitlement;->subscriptionPlan:Lcom/discord/models/domain/ModelSubscriptionPlan;
 
+    iput-object p12, p0, Lcom/discord/models/domain/ModelEntitlement;->parentId:Ljava/lang/Long;
+
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/models/domain/ModelEntitlement;JJIJJLcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan;ILjava/lang/Object;)Lcom/discord/models/domain/ModelEntitlement;
-    .locals 12
+.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;
+    .locals 13
 
     move-object v0, p0
 
-    and-int/lit8 v1, p12, 0x1
+    move/from16 v1, p13
 
-    if-eqz v1, :cond_0
+    and-int/lit8 v2, v1, 0x1
 
-    iget-wide v1, v0, Lcom/discord/models/domain/ModelEntitlement;->id:J
+    if-eqz v2, :cond_0
+
+    iget-wide v2, v0, Lcom/discord/models/domain/ModelEntitlement;->id:J
 
     goto :goto_0
 
     :cond_0
-    move-wide v1, p1
+    move-wide v2, p1
 
     :goto_0
-    and-int/lit8 v3, p12, 0x2
+    and-int/lit8 v4, v1, 0x2
 
-    if-eqz v3, :cond_1
+    if-eqz v4, :cond_1
 
-    iget-wide v3, v0, Lcom/discord/models/domain/ModelEntitlement;->applicationId:J
+    iget-wide v4, v0, Lcom/discord/models/domain/ModelEntitlement;->applicationId:J
 
     goto :goto_1
 
     :cond_1
-    move-wide v3, p3
+    move-wide/from16 v4, p3
 
     :goto_1
-    and-int/lit8 v5, p12, 0x4
+    and-int/lit8 v6, v1, 0x4
 
-    if-eqz v5, :cond_2
+    if-eqz v6, :cond_2
 
-    iget v5, v0, Lcom/discord/models/domain/ModelEntitlement;->type:I
+    iget v6, v0, Lcom/discord/models/domain/ModelEntitlement;->type:I
 
     goto :goto_2
 
     :cond_2
-    move/from16 v5, p5
+    move/from16 v6, p5
 
     :goto_2
-    and-int/lit8 v6, p12, 0x8
+    and-int/lit8 v7, v1, 0x8
 
-    if-eqz v6, :cond_3
+    if-eqz v7, :cond_3
 
-    iget-wide v6, v0, Lcom/discord/models/domain/ModelEntitlement;->userId:J
+    iget-wide v7, v0, Lcom/discord/models/domain/ModelEntitlement;->userId:J
 
     goto :goto_3
 
     :cond_3
-    move-wide/from16 v6, p6
+    move-wide/from16 v7, p6
 
     :goto_3
-    and-int/lit8 v8, p12, 0x10
+    and-int/lit8 v9, v1, 0x10
 
-    if-eqz v8, :cond_4
+    if-eqz v9, :cond_4
 
-    iget-wide v8, v0, Lcom/discord/models/domain/ModelEntitlement;->skuId:J
+    iget-wide v9, v0, Lcom/discord/models/domain/ModelEntitlement;->skuId:J
 
     goto :goto_4
 
     :cond_4
-    move-wide/from16 v8, p8
+    move-wide/from16 v9, p8
 
     :goto_4
-    and-int/lit8 v10, p12, 0x20
+    and-int/lit8 v11, v1, 0x20
 
-    if-eqz v10, :cond_5
+    if-eqz v11, :cond_5
 
-    iget-object v10, v0, Lcom/discord/models/domain/ModelEntitlement;->sku:Lcom/discord/models/domain/ModelSku;
+    iget-object v11, v0, Lcom/discord/models/domain/ModelEntitlement;->sku:Lcom/discord/models/domain/ModelSku;
 
     goto :goto_5
 
     :cond_5
-    move-object/from16 v10, p10
+    move-object/from16 v11, p10
 
     :goto_5
-    and-int/lit8 v11, p12, 0x40
+    and-int/lit8 v12, v1, 0x40
 
-    if-eqz v11, :cond_6
+    if-eqz v12, :cond_6
 
-    iget-object v11, v0, Lcom/discord/models/domain/ModelEntitlement;->subscriptionPlan:Lcom/discord/models/domain/ModelSubscriptionPlan;
+    iget-object v12, v0, Lcom/discord/models/domain/ModelEntitlement;->subscriptionPlan:Lcom/discord/models/domain/ModelSubscriptionPlan;
 
     goto :goto_6
 
     :cond_6
-    move-object/from16 v11, p11
+    move-object/from16 v12, p11
 
     :goto_6
-    move-wide p1, v1
+    and-int/lit16 v1, v1, 0x80
 
-    move-wide p3, v3
+    if-eqz v1, :cond_7
 
-    move/from16 p5, v5
+    iget-object v1, v0, Lcom/discord/models/domain/ModelEntitlement;->parentId:Ljava/lang/Long;
 
-    move-wide/from16 p6, v6
+    goto :goto_7
 
-    move-wide/from16 p8, v8
+    :cond_7
+    move-object/from16 v1, p12
 
-    move-object/from16 p10, v10
+    :goto_7
+    move-wide p1, v2
 
-    move-object/from16 p11, v11
+    move-wide/from16 p3, v4
 
-    invoke-virtual/range {p0 .. p11}, Lcom/discord/models/domain/ModelEntitlement;->copy(JJIJJLcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan;)Lcom/discord/models/domain/ModelEntitlement;
+    move/from16 p5, v6
+
+    move-wide/from16 p6, v7
+
+    move-wide/from16 p8, v9
+
+    move-object/from16 p10, v11
+
+    move-object/from16 p11, v12
+
+    move-object/from16 p12, v1
+
+    invoke-virtual/range {p0 .. p12}, Lcom/discord/models/domain/ModelEntitlement;->copy(JJIJJLcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan;Ljava/lang/Long;)Lcom/discord/models/domain/ModelEntitlement;
 
     move-result-object v0
 
@@ -214,8 +234,16 @@
     return-object v0
 .end method
 
-.method public final copy(JJIJJLcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan;)Lcom/discord/models/domain/ModelEntitlement;
-    .locals 13
+.method public final component8()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelEntitlement;->parentId:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
+.method public final copy(JJIJJLcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan;Ljava/lang/Long;)Lcom/discord/models/domain/ModelEntitlement;
+    .locals 14
 
     const-string v0, "sku"
 
@@ -239,7 +267,9 @@
 
     move-object/from16 v12, p11
 
-    invoke-direct/range {v1 .. v12}, Lcom/discord/models/domain/ModelEntitlement;-><init>(JJIJJLcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan;)V
+    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
@@ -359,7 +389,17 @@
 
     iget-object v1, p0, Lcom/discord/models/domain/ModelEntitlement;->subscriptionPlan:Lcom/discord/models/domain/ModelSubscriptionPlan;
 
-    iget-object p1, p1, Lcom/discord/models/domain/ModelEntitlement;->subscriptionPlan:Lcom/discord/models/domain/ModelSubscriptionPlan;
+    iget-object v3, p1, Lcom/discord/models/domain/ModelEntitlement;->subscriptionPlan:Lcom/discord/models/domain/ModelSubscriptionPlan;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_5
+
+    iget-object v1, p0, Lcom/discord/models/domain/ModelEntitlement;->parentId:Ljava/lang/Long;
+
+    iget-object p1, p1, Lcom/discord/models/domain/ModelEntitlement;->parentId:Ljava/lang/Long;
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -393,6 +433,14 @@
     return-wide v0
 .end method
 
+.method public final getParentId()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelEntitlement;->parentId:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
 .method public final getSku()Lcom/discord/models/domain/ModelSku;
     .locals 1
 
@@ -516,9 +564,27 @@
 
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
-    move-result v2
+    move-result v0
+
+    goto :goto_1
 
     :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
+    add-int/2addr v1, v0
+
+    mul-int/lit8 v1, v1, 0x1f
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelEntitlement;->parentId:Ljava/lang/Long;
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    :cond_2
     add-int/2addr v1, v2
 
     return v1
@@ -585,6 +651,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", parentId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/models/domain/ModelEntitlement;->parentId: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;
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 c47ef611f6..20fcde7d7a 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGift$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGift$Parser.smali
@@ -258,7 +258,7 @@
 
     if-nez v9, :cond_5
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_5
     move-object/from16 v1, v19
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuild.smali b/com.discord/smali/com/discord/models/domain/ModelGuild.smali
index b6aa29c156..49a0f1f27a 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuild.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuild.smali
@@ -77,7 +77,7 @@
 
 .field public static final TIER_2_BOOSTS:I = 0xa
 
-.field public static final TIER_3_BOOSTS:I = 0x32
+.field public static final TIER_3_BOOSTS:I = 0x14
 
 .field public static final VERIFICATION_LEVEL_HIGH:I = 0x3
 
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 1ccad3953d..3b31c5336c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildFolder$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildFolder$Parser.smali
@@ -118,7 +118,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     iget-object v2, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
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 b1ab8db7a8..0e0c76e66d 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
@@ -96,7 +96,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;-><init>(Lcom/discord/models/domain/ModelGuildMember;)V
@@ -120,7 +120,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;-><init>(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;)V
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 4fbef47758..1739490780 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
@@ -145,7 +145,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
@@ -175,7 +175,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
     iget-object v1, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
@@ -184,7 +184,7 @@
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     invoke-direct {p1, v0, v1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync;-><init>(Lkotlin/ranges/IntRange;Ljava/util/List;)V
@@ -210,7 +210,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;-><init>(Lkotlin/ranges/IntRange;)V
@@ -236,7 +236,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_4
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
@@ -249,7 +249,7 @@
 
     if-nez v1, :cond_5
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_5
     invoke-direct {p1, v0, v1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update;-><init>(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)V
@@ -275,7 +275,7 @@
 
     if-nez v0, :cond_6
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_6
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
@@ -288,7 +288,7 @@
 
     if-nez v1, :cond_7
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_7
     invoke-direct {p1, v0, v1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert;-><init>(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)V
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 d07239a1dc..e3c982c7a2 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser.smali
@@ -114,7 +114,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
@@ -140,7 +140,7 @@
 
     if-nez v5, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
@@ -151,7 +151,7 @@
 
     if-nez v6, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     move-object v1, p1
diff --git a/com.discord/smali/com/discord/models/domain/ModelInvite.smali b/com.discord/smali/com/discord/models/domain/ModelInvite.smali
index e141c3adf9..a635fbf970 100644
--- a/com.discord/smali/com/discord/models/domain/ModelInvite.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelInvite.smali
@@ -42,14 +42,26 @@
 
 
 # direct methods
-.method public constructor <init>()V
+.method private constructor <init>(Lcom/discord/models/domain/ModelChannel;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
+    iput-object p1, p0, Lcom/discord/models/domain/ModelInvite;->channel:Lcom/discord/models/domain/ModelChannel;
+
     return-void
 .end method
 
+.method public static createForTesting(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/models/domain/ModelInvite;
+    .locals 1
+
+    new-instance v0, Lcom/discord/models/domain/ModelInvite;
+
+    invoke-direct {v0, p0}, Lcom/discord/models/domain/ModelInvite;-><init>(Lcom/discord/models/domain/ModelChannel;)V
+
+    return-object v0
+.end method
+
 
 # virtual methods
 .method protected canEqual(Ljava/lang/Object;)Z
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 5138d69aa6..cefdf21a7c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser.smali
@@ -124,7 +124,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
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 c3afbca539..dc442d4383 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPaymentSource$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPaymentSource$Companion.smali
@@ -66,7 +66,7 @@
 
     if-nez v3, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/models/domain/PaymentSourceRaw;->getId()Ljava/lang/String;
@@ -127,7 +127,7 @@
 
     if-nez v1, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     invoke-virtual {p1}, Lcom/discord/models/domain/PaymentSourceRaw;->getLast_4()Ljava/lang/String;
@@ -136,7 +136,7 @@
 
     if-nez v2, :cond_4
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_4
     invoke-virtual {p1}, Lcom/discord/models/domain/PaymentSourceRaw;->getExpiresMonth()I
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 04cac6eb1a..f7963e6b40 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
@@ -155,7 +155,7 @@
     if-nez v0, :cond_5
 
     :cond_4
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v0, 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 5de3734d1f..bcf6569174 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSku$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSku$Parser.smali
@@ -185,7 +185,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
@@ -198,7 +198,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_4
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
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 1f21a67797..edd60e691b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser.smali
@@ -90,7 +90,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     iget-object v1, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser$TestUser.smali b/com.discord/smali/com/discord/models/domain/ModelUser$TestUser.smali
new file mode 100644
index 0000000000..19207f7616
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelUser$TestUser.smali
@@ -0,0 +1,26 @@
+.class public Lcom/discord/models/domain/ModelUser$TestUser;
+.super Lcom/discord/models/domain/ModelUser;
+.source "ModelUser.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/models/domain/ModelUser;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "TestUser"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(J)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/models/domain/ModelUser;-><init>()V
+
+    iput-wide p1, p0, Lcom/discord/models/domain/ModelUser$TestUser;->id:J
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser.smali b/com.discord/smali/com/discord/models/domain/ModelUser.smali
index ca44056646..c9741ccc54 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser.smali
@@ -17,6 +17,7 @@
         Lcom/discord/models/domain/ModelUser$TokenHandoff;,
         Lcom/discord/models/domain/ModelUser$Token;,
         Lcom/discord/models/domain/ModelUser$Me;,
+        Lcom/discord/models/domain/ModelUser$TestUser;,
         Lcom/discord/models/domain/ModelUser$RequiredAction;
     }
 .end annotation
@@ -242,6 +243,87 @@
     return v0
 .end method
 
+.method public static compareUserNames(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/String;)I
+    .locals 4
+
+    const/4 v0, 0x0
+
+    const/4 v1, -0x1
+
+    if-nez p0, :cond_1
+
+    if-nez p1, :cond_0
+
+    return v0
+
+    :cond_0
+    return v1
+
+    :cond_1
+    const/4 v2, 0x1
+
+    if-nez p1, :cond_2
+
+    return v2
+
+    :cond_2
+    invoke-static {p2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+
+    move-result v3
+
+    if-nez v3, :cond_3
+
+    goto :goto_0
+
+    :cond_3
+    iget-object p2, p0, Lcom/discord/models/domain/ModelUser;->username:Ljava/lang/String;
+
+    :goto_0
+    invoke-static {p3}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+
+    move-result v3
+
+    if-nez v3, :cond_4
+
+    goto :goto_1
+
+    :cond_4
+    iget-object p3, p1, Lcom/discord/models/domain/ModelUser;->username:Ljava/lang/String;
+
+    :goto_1
+    if-nez p2, :cond_6
+
+    if-nez p3, :cond_5
+
+    return v0
+
+    :cond_5
+    return v1
+
+    :cond_6
+    if-nez p3, :cond_7
+
+    return v2
+
+    :cond_7
+    invoke-virtual {p2, p3}, Ljava/lang/String;->compareToIgnoreCase(Ljava/lang/String;)I
+
+    move-result p2
+
+    if-eqz p2, :cond_8
+
+    return p2
+
+    :cond_8
+    iget-wide p2, p0, Lcom/discord/models/domain/ModelUser;->id:J
+
+    iget-wide p0, p1, Lcom/discord/models/domain/ModelUser;->id:J
+
+    cmp-long v0, p2, p0
+
+    return v0
+.end method
+
 .method private static createClydeBot()Lcom/discord/models/domain/ModelUser;
     .locals 3
 
@@ -1059,6 +1141,34 @@
     return-wide v0
 .end method
 
+.method public getMaxFileSizeMB()I
+    .locals 2
+
+    iget v0, p0, Lcom/discord/models/domain/ModelUser;->premiumType:I
+
+    const/4 v1, 0x1
+
+    if-eq v0, v1, :cond_1
+
+    const/4 v1, 0x2
+
+    if-eq v0, v1, :cond_0
+
+    const/16 v0, 0x8
+
+    return v0
+
+    :cond_0
+    const/16 v0, 0x64
+
+    return v0
+
+    :cond_1
+    const/16 v0, 0x32
+
+    return v0
+.end method
+
 .method public getMember()Lcom/discord/models/domain/ModelGuildMember;
     .locals 1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelVoice$User.smali b/com.discord/smali/com/discord/models/domain/ModelVoice$User.smali
index 9b48097fc4..1f970b4107 100644
--- a/com.discord/smali/com/discord/models/domain/ModelVoice$User.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelVoice$User.smali
@@ -21,8 +21,12 @@
 
 .field private final isSpeaking:Z
 
+.field private final isSpectating:Z
+
 .field private final nickname:Ljava/lang/String;
 
+.field private final stream:Lcom/discord/models/domain/ModelApplicationStream;
+
 .field private final streamId:Ljava/lang/Integer;
 
 .field private final user:Lcom/discord/models/domain/ModelUser;
@@ -31,7 +35,7 @@
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelVoice$State;ZZLjava/lang/Integer;ZLjava/lang/String;)V
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelVoice$State;ZZLjava/lang/Integer;ZLjava/lang/String;Lcom/discord/models/domain/ModelApplicationStream;Z)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
@@ -50,6 +54,10 @@
 
     iput-object p7, p0, Lcom/discord/models/domain/ModelVoice$User;->nickname:Ljava/lang/String;
 
+    iput-object p8, p0, Lcom/discord/models/domain/ModelVoice$User;->stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    iput-boolean p9, p0, Lcom/discord/models/domain/ModelVoice$User;->isSpectating:Z
+
     return-void
 .end method
 
@@ -213,25 +221,63 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getNickname()Ljava/lang/String;
 
-    move-result-object p1
+    move-result-object v3
 
     if-nez v1, :cond_c
 
-    if-eqz p1, :cond_d
+    if-eqz v3, :cond_d
 
     goto :goto_3
 
     :cond_c
-    invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
-    move-result p1
+    move-result v1
 
-    if-nez p1, :cond_d
+    if-nez v1, :cond_d
 
     :goto_3
     return v2
 
     :cond_d
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelVoice$User;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v3
+
+    if-nez v1, :cond_e
+
+    if-eqz v3, :cond_f
+
+    goto :goto_4
+
+    :cond_e
+    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_f
+
+    :goto_4
+    return v2
+
+    :cond_f
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelVoice$User;->isSpectating()Z
+
+    move-result v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->isSpectating()Z
+
+    move-result p1
+
+    if-eq v1, p1, :cond_10
+
+    return v2
+
+    :cond_10
     return v0
 .end method
 
@@ -260,6 +306,14 @@
     return-object v0
 .end method
 
+.method public getStream()Lcom/discord/models/domain/ModelApplicationStream;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelVoice$User;->stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    return-object v0
+.end method
+
 .method public getStreamId()Ljava/lang/Integer;
     .locals 1
 
@@ -395,13 +449,15 @@
 
     if-eqz v2, :cond_5
 
+    const/16 v2, 0x4f
+
     goto :goto_5
 
     :cond_5
-    const/16 v3, 0x61
+    const/16 v2, 0x61
 
     :goto_5
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelVoice$User;->getNickname()Ljava/lang/String;
 
@@ -411,16 +467,52 @@
 
     if-nez v2, :cond_6
 
+    const/16 v2, 0x2b
+
     goto :goto_6
 
     :cond_6
     invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
-    move-result v1
+    move-result v2
 
     :goto_6
+    add-int/2addr v0, v2
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelVoice$User;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v2
+
+    mul-int/lit8 v0, v0, 0x3b
+
+    if-nez v2, :cond_7
+
+    goto :goto_7
+
+    :cond_7
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :goto_7
     add-int/2addr v0, v1
 
+    mul-int/lit8 v0, v0, 0x3b
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelVoice$User;->isSpectating()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_8
+
+    goto :goto_8
+
+    :cond_8
+    const/16 v3, 0x61
+
+    :goto_8
+    add-int/2addr v0, v3
+
     return v0
 .end method
 
@@ -491,6 +583,14 @@
     return v0
 .end method
 
+.method public isSpectating()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/models/domain/ModelVoice$User;->isSpectating:Z
+
+    return v0
+.end method
+
 .method public toString()Ljava/lang/String;
     .locals 2
 
@@ -566,6 +666,26 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", stream="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelVoice$User;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", isSpectating="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelVoice$User;->isSpectating()Z
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
     const-string v1, ")"
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/models/domain/StreamCreate$Parser$parse$1$1.smali b/com.discord/smali/com/discord/models/domain/StreamCreate$Parser$parse$1$1.smali
new file mode 100644
index 0000000000..3e068c5f25
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamCreate$Parser$parse$1$1.smali
@@ -0,0 +1,77 @@
+.class final Lcom/discord/models/domain/StreamCreate$Parser$parse$1$1;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/models/domain/StreamCreate$Parser$parse$1;->call(Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lcom/discord/models/domain/Model$JsonReader$ItemFactory<",
+        "Ljava/lang/Long;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/models/domain/StreamCreate$Parser$parse$1;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/models/domain/StreamCreate$Parser$parse$1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/models/domain/StreamCreate$Parser$parse$1$1;->this$0:Lcom/discord/models/domain/StreamCreate$Parser$parse$1;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()J
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamCreate$Parser$parse$1$1;->this$0:Lcom/discord/models/domain/StreamCreate$Parser$parse$1;
+
+    iget-object v0, v0, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    const-wide/16 v1, 0x0
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final synthetic get()Ljava/lang/Object;
+    .locals 2
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/StreamCreate$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
diff --git a/com.discord/smali/com/discord/models/domain/StreamCreate$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/StreamCreate$Parser$parse$1.smali
new file mode 100644
index 0000000000..4c532393fb
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamCreate$Parser$parse$1.smali
@@ -0,0 +1,200 @@
+.class final Lcom/discord/models/domain/StreamCreate$Parser$parse$1;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/models/domain/StreamCreate$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamCreate;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $paused:Lkotlin/jvm/internal/Ref$BooleanRef;
+
+.field final synthetic $reader:Lcom/discord/models/domain/Model$JsonReader;
+
+.field final synthetic $rtcServerId:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+.field final synthetic $streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+.field final synthetic $viewerIds:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$BooleanRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;->$streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iput-object p2, p0, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    iput-object p3, p0, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;->$rtcServerId:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iput-object p4, p0, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;->$paused:Lkotlin/jvm/internal/Ref$BooleanRef;
+
+    iput-object p5, p0, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;->$viewerIds:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-virtual {p0, p1}, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;->call(Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public final call(Ljava/lang/String;)V
+    .locals 2
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    sparse-switch v0, :sswitch_data_0
+
+    goto :goto_0
+
+    :sswitch_0
+    const-string v0, "rtc_server_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/StreamCreate$Parser$parse$1;->$rtcServerId:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    return-void
+
+    :sswitch_1
+    const-string v0, "paused"
+
+    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/StreamCreate$Parser$parse$1;->$paused:Lkotlin/jvm/internal/Ref$BooleanRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextBoolean(Z)Z
+
+    move-result v0
+
+    iput-boolean v0, p1, Lkotlin/jvm/internal/Ref$BooleanRef;->element:Z
+
+    return-void
+
+    :sswitch_2
+    const-string v0, "stream_key"
+
+    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/StreamCreate$Parser$parse$1;->$streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    return-void
+
+    :sswitch_3
+    const-string v0, "viewer_ids"
+
+    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/StreamCreate$Parser$parse$1;->$viewerIds:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    new-instance v1, Lcom/discord/models/domain/StreamCreate$Parser$parse$1$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/models/domain/StreamCreate$Parser$parse$1$1;-><init>(Lcom/discord/models/domain/StreamCreate$Parser$parse$1;)V
+
+    check-cast v1, Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+    invoke-virtual {v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    return-void
+
+    :cond_1
+    :goto_0
+    iget-object p1, p0, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V
+
+    return-void
+
+    nop
+
+    :sswitch_data_0
+    .sparse-switch
+        -0x506b60f5 -> :sswitch_3
+        -0x4731a2e0 -> :sswitch_2
+        -0x3b5366d2 -> :sswitch_1
+        -0x1d3ab8c7 -> :sswitch_0
+    .end sparse-switch
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/StreamCreate$Parser.smali b/com.discord/smali/com/discord/models/domain/StreamCreate$Parser.smali
new file mode 100644
index 0000000000..9519d73c1f
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamCreate$Parser.smali
@@ -0,0 +1,157 @@
+.class public final Lcom/discord/models/domain/StreamCreate$Parser;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$Parser;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/models/domain/StreamCreate;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Parser"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lcom/discord/models/domain/Model$Parser<",
+        "Lcom/discord/models/domain/StreamCreate;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/models/domain/StreamCreate$Parser;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/models/domain/StreamCreate$Parser;
+
+    invoke-direct {v0}, Lcom/discord/models/domain/StreamCreate$Parser;-><init>()V
+
+    sput-object v0, Lcom/discord/models/domain/StreamCreate$Parser;->INSTANCE:Lcom/discord/models/domain/StreamCreate$Parser;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamCreate;
+    .locals 11
+
+    const-string v0, "reader"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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 v7, Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+
+    iput-object v1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    new-instance v8, Lkotlin/jvm/internal/Ref$BooleanRef;
+
+    invoke-direct {v8}, Lkotlin/jvm/internal/Ref$BooleanRef;-><init>()V
+
+    const/4 v2, 0x0
+
+    iput-boolean v2, v8, Lkotlin/jvm/internal/Ref$BooleanRef;->element:Z
+
+    new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+
+    iput-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    new-instance v10, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;
+
+    move-object v1, v10
+
+    move-object v2, v0
+
+    move-object v3, p1
+
+    move-object v4, v7
+
+    move-object v5, v8
+
+    move-object v6, v9
+
+    invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/StreamCreate$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$BooleanRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+
+    check-cast v10, Lrx/functions/Action1;
+
+    invoke-virtual {p1, v10}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+
+    new-instance p1, Lcom/discord/models/domain/StreamCreate;
+
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/String;
+
+    if-nez v0, :cond_0
+
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
+
+    :cond_0
+    iget-object v1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v1, Ljava/lang/String;
+
+    if-nez v1, :cond_1
+
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
+
+    :cond_1
+    iget-boolean v2, v8, Lkotlin/jvm/internal/Ref$BooleanRef;->element:Z
+
+    iget-object v3, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v3, Ljava/util/List;
+
+    if-nez v3, :cond_2
+
+    sget-object v3, Lkotlin/a/y;->bko:Lkotlin/a/y;
+
+    check-cast v3, Ljava/util/List;
+
+    :cond_2
+    invoke-direct {p1, v0, v1, v2, v3}, Lcom/discord/models/domain/StreamCreate;-><init>(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V
+
+    return-object p1
+.end method
+
+.method public final bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lcom/discord/models/domain/StreamCreate$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamCreate;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/StreamCreate.smali b/com.discord/smali/com/discord/models/domain/StreamCreate.smali
new file mode 100644
index 0000000000..8d36be814f
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamCreate.smali
@@ -0,0 +1,407 @@
+.class public final Lcom/discord/models/domain/StreamCreate;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/models/domain/StreamCreate$Parser;
+    }
+.end annotation
+
+
+# instance fields
+.field private final paused:Z
+
+.field private final rtcServerId:Ljava/lang/String;
+
+.field private final streamKey:Ljava/lang/String;
+
+.field private final viewerIds:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            "Z",
+            "Ljava/util/List<",
+            "Ljava/lang/Long;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rtcServerId"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "viewerIds"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/models/domain/StreamCreate;->streamKey:Ljava/lang/String;
+
+    iput-object p2, p0, Lcom/discord/models/domain/StreamCreate;->rtcServerId:Ljava/lang/String;
+
+    iput-boolean p3, p0, Lcom/discord/models/domain/StreamCreate;->paused:Z
+
+    iput-object p4, p0, Lcom/discord/models/domain/StreamCreate;->viewerIds:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/models/domain/StreamCreate;Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/StreamCreate;
+    .locals 0
+
+    and-int/lit8 p6, p5, 0x1
+
+    if-eqz p6, :cond_0
+
+    iget-object p1, p0, Lcom/discord/models/domain/StreamCreate;->streamKey:Ljava/lang/String;
+
+    :cond_0
+    and-int/lit8 p6, p5, 0x2
+
+    if-eqz p6, :cond_1
+
+    iget-object p2, p0, Lcom/discord/models/domain/StreamCreate;->rtcServerId:Ljava/lang/String;
+
+    :cond_1
+    and-int/lit8 p6, p5, 0x4
+
+    if-eqz p6, :cond_2
+
+    iget-boolean p3, p0, Lcom/discord/models/domain/StreamCreate;->paused:Z
+
+    :cond_2
+    and-int/lit8 p5, p5, 0x8
+
+    if-eqz p5, :cond_3
+
+    iget-object p4, p0, Lcom/discord/models/domain/StreamCreate;->viewerIds:Ljava/util/List;
+
+    :cond_3
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/models/domain/StreamCreate;->copy(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)Lcom/discord/models/domain/StreamCreate;
+
+    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/StreamCreate;->streamKey:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamCreate;->rtcServerId:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component3()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/models/domain/StreamCreate;->paused:Z
+
+    return v0
+.end method
+
+.method public final component4()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/StreamCreate;->viewerIds:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)Lcom/discord/models/domain/StreamCreate;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            "Z",
+            "Ljava/util/List<",
+            "Ljava/lang/Long;",
+            ">;)",
+            "Lcom/discord/models/domain/StreamCreate;"
+        }
+    .end annotation
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rtcServerId"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "viewerIds"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/models/domain/StreamCreate;
+
+    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/models/domain/StreamCreate;-><init>(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Lcom/discord/models/domain/StreamCreate;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lcom/discord/models/domain/StreamCreate;
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamCreate;->streamKey:Ljava/lang/String;
+
+    iget-object v3, p1, Lcom/discord/models/domain/StreamCreate;->streamKey:Ljava/lang/String;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamCreate;->rtcServerId:Ljava/lang/String;
+
+    iget-object v3, p1, Lcom/discord/models/domain/StreamCreate;->rtcServerId:Ljava/lang/String;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-boolean v1, p0, Lcom/discord/models/domain/StreamCreate;->paused:Z
+
+    iget-boolean v3, p1, Lcom/discord/models/domain/StreamCreate;->paused:Z
+
+    if-ne v1, v3, :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, p0, Lcom/discord/models/domain/StreamCreate;->viewerIds:Ljava/util/List;
+
+    iget-object p1, p1, Lcom/discord/models/domain/StreamCreate;->viewerIds:Ljava/util/List;
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    return v2
+
+    :cond_2
+    :goto_1
+    return v0
+.end method
+
+.method public final getPaused()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/models/domain/StreamCreate;->paused:Z
+
+    return v0
+.end method
+
+.method public final getRtcServerId()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamCreate;->rtcServerId:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getStreamKey()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamCreate;->streamKey:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getViewerIds()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/StreamCreate;->viewerIds:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamCreate;->streamKey: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/StreamCreate;->rtcServerId: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/models/domain/StreamCreate;->paused:Z
+
+    if-eqz v2, :cond_2
+
+    const/4 v2, 0x1
+
+    :cond_2
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/models/domain/StreamCreate;->viewerIds:Ljava/util/List;
+
+    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 final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "StreamCreate(streamKey="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamCreate;->streamKey:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", rtcServerId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamCreate;->rtcServerId:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", paused="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/models/domain/StreamCreate;->paused:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", viewerIds="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamCreate;->viewerIds:Ljava/util/List;
+
+    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/StreamDelete$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/StreamDelete$Parser$parse$1.smali
new file mode 100644
index 0000000000..ca849a350a
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamDelete$Parser$parse$1.smali
@@ -0,0 +1,167 @@
+.class final Lcom/discord/models/domain/StreamDelete$Parser$parse$1;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/models/domain/StreamDelete$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamDelete;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $reader:Lcom/discord/models/domain/Model$JsonReader;
+
+.field final synthetic $reasonStr:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+.field final synthetic $streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+.field final synthetic $unavailable:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iput-object p2, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    iput-object p3, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$reasonStr:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iput-object p4, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$unavailable:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-virtual {p0, p1}, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->call(Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public final call(Ljava/lang/String;)V
+    .locals 2
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    const v1, -0x4731a2e0
+
+    if-eq v0, v1, :cond_3
+
+    const v1, -0x37ba6dbc
+
+    if-eq v0, v1, :cond_2
+
+    const v1, -0x27aa27b0
+
+    if-eq v0, v1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const-string v0, "unavailable"
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    iget-object p1, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$unavailable:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextBooleanOrNull()Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    return-void
+
+    :cond_2
+    const-string v0, "reason"
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    iget-object p1, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$reasonStr:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    return-void
+
+    :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_4
+
+    iget-object p1, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    return-void
+
+    :cond_4
+    :goto_0
+    iget-object p1, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/StreamDelete$Parser.smali b/com.discord/smali/com/discord/models/domain/StreamDelete$Parser.smali
new file mode 100644
index 0000000000..edd461a7b5
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamDelete$Parser.smali
@@ -0,0 +1,202 @@
+.class public final Lcom/discord/models/domain/StreamDelete$Parser;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$Parser;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/models/domain/StreamDelete;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Parser"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lcom/discord/models/domain/Model$Parser<",
+        "Lcom/discord/models/domain/StreamDelete;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/models/domain/StreamDelete$Parser;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/models/domain/StreamDelete$Parser;
+
+    invoke-direct {v0}, Lcom/discord/models/domain/StreamDelete$Parser;-><init>()V
+
+    sput-object v0, Lcom/discord/models/domain/StreamDelete$Parser;->INSTANCE:Lcom/discord/models/domain/StreamDelete$Parser;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamDelete;
+    .locals 4
+
+    const-string v0, "reader"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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 v2, Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {v2}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+
+    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 v1, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    new-instance v1, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;
+
+    invoke-direct {v1, 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
+
+    check-cast v1, Lrx/functions/Action1;
+
+    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;
+
+    check-cast p1, Ljava/lang/String;
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result v1
+
+    const v2, -0x793b8406
+
+    if-eq v1, v2, :cond_3
+
+    const v2, 0x250258f4
+
+    if-eq v1, v2, :cond_2
+
+    const v2, 0x60fb3bee
+
+    if-eq v1, v2, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const-string v1, "stream_full"
+
+    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    sget-object p1, Lcom/discord/models/domain/StreamDelete$Reason;->STREAM_FULL:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    goto :goto_1
+
+    :cond_2
+    const-string v1, "unauthorized"
+
+    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    sget-object p1, Lcom/discord/models/domain/StreamDelete$Reason;->UNAUTHORIZED:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    goto :goto_1
+
+    :cond_3
+    const-string v1, "user_requested"
+
+    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    sget-object p1, Lcom/discord/models/domain/StreamDelete$Reason;->USER_REQUESTED:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    goto :goto_1
+
+    :cond_4
+    :goto_0
+    sget-object p1, Lcom/discord/models/domain/StreamDelete$Reason;->UNKNOWN:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    :goto_1
+    new-instance v1, Lcom/discord/models/domain/StreamDelete;
+
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/String;
+
+    if-nez v0, :cond_5
+
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
+
+    :cond_5
+    iget-object v2, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v2, Ljava/lang/Boolean;
+
+    if-eqz v2, :cond_6
+
+    invoke-virtual {v2}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v2
+
+    goto :goto_2
+
+    :cond_6
+    const/4 v2, 0x0
+
+    :goto_2
+    invoke-direct {v1, v0, p1, v2}, Lcom/discord/models/domain/StreamDelete;-><init>(Ljava/lang/String;Lcom/discord/models/domain/StreamDelete$Reason;Z)V
+
+    return-object v1
+.end method
+
+.method public final bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lcom/discord/models/domain/StreamDelete$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamDelete;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/StreamDelete$Reason.smali b/com.discord/smali/com/discord/models/domain/StreamDelete$Reason.smali
new file mode 100644
index 0000000000..44ecde7736
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamDelete$Reason.smali
@@ -0,0 +1,137 @@
+.class public final enum Lcom/discord/models/domain/StreamDelete$Reason;
+.super Ljava/lang/Enum;
+.source "ModelApplicationStream.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/models/domain/StreamDelete;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "Reason"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/discord/models/domain/StreamDelete$Reason;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final synthetic $VALUES:[Lcom/discord/models/domain/StreamDelete$Reason;
+
+.field public static final enum STREAM_FULL:Lcom/discord/models/domain/StreamDelete$Reason;
+
+.field public static final enum UNAUTHORIZED:Lcom/discord/models/domain/StreamDelete$Reason;
+
+.field public static final enum UNKNOWN:Lcom/discord/models/domain/StreamDelete$Reason;
+
+.field public static final enum USER_REQUESTED:Lcom/discord/models/domain/StreamDelete$Reason;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x4
+
+    new-array v0, v0, [Lcom/discord/models/domain/StreamDelete$Reason;
+
+    new-instance v1, Lcom/discord/models/domain/StreamDelete$Reason;
+
+    const/4 v2, 0x0
+
+    const-string v3, "USER_REQUESTED"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/models/domain/StreamDelete$Reason;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/models/domain/StreamDelete$Reason;->USER_REQUESTED:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/models/domain/StreamDelete$Reason;
+
+    const/4 v2, 0x1
+
+    const-string v3, "STREAM_FULL"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/models/domain/StreamDelete$Reason;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/models/domain/StreamDelete$Reason;->STREAM_FULL:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/models/domain/StreamDelete$Reason;
+
+    const/4 v2, 0x2
+
+    const-string v3, "UNAUTHORIZED"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/models/domain/StreamDelete$Reason;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/models/domain/StreamDelete$Reason;->UNAUTHORIZED:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/models/domain/StreamDelete$Reason;
+
+    const/4 v2, 0x3
+
+    const-string v3, "UNKNOWN"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/models/domain/StreamDelete$Reason;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/models/domain/StreamDelete$Reason;->UNKNOWN:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/models/domain/StreamDelete$Reason;->$VALUES:[Lcom/discord/models/domain/StreamDelete$Reason;
+
+    return-void
+.end method
+
+.method private 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/models/domain/StreamDelete$Reason;
+    .locals 1
+
+    const-class v0, Lcom/discord/models/domain/StreamDelete$Reason;
+
+    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/models/domain/StreamDelete$Reason;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/discord/models/domain/StreamDelete$Reason;
+    .locals 1
+
+    sget-object v0, Lcom/discord/models/domain/StreamDelete$Reason;->$VALUES:[Lcom/discord/models/domain/StreamDelete$Reason;
+
+    invoke-virtual {v0}, [Lcom/discord/models/domain/StreamDelete$Reason;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/discord/models/domain/StreamDelete$Reason;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/StreamDelete.smali b/com.discord/smali/com/discord/models/domain/StreamDelete.smali
new file mode 100644
index 0000000000..f94cca2559
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamDelete.smali
@@ -0,0 +1,290 @@
+.class public final Lcom/discord/models/domain/StreamDelete;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/models/domain/StreamDelete$Parser;,
+        Lcom/discord/models/domain/StreamDelete$Reason;
+    }
+.end annotation
+
+
+# instance fields
+.field private final reason:Lcom/discord/models/domain/StreamDelete$Reason;
+
+.field private final streamKey:Ljava/lang/String;
+
+.field private final unavailable:Z
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lcom/discord/models/domain/StreamDelete$Reason;Z)V
+    .locals 1
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "reason"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/models/domain/StreamDelete;->streamKey:Ljava/lang/String;
+
+    iput-object p2, p0, Lcom/discord/models/domain/StreamDelete;->reason:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    iput-boolean p3, p0, Lcom/discord/models/domain/StreamDelete;->unavailable:Z
+
+    return-void
+.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;
+    .locals 0
+
+    and-int/lit8 p5, p4, 0x1
+
+    if-eqz p5, :cond_0
+
+    iget-object p1, p0, Lcom/discord/models/domain/StreamDelete;->streamKey:Ljava/lang/String;
+
+    :cond_0
+    and-int/lit8 p5, p4, 0x2
+
+    if-eqz p5, :cond_1
+
+    iget-object p2, p0, Lcom/discord/models/domain/StreamDelete;->reason:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    :cond_1
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_2
+
+    iget-boolean p3, p0, Lcom/discord/models/domain/StreamDelete;->unavailable:Z
+
+    :cond_2
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/models/domain/StreamDelete;->copy(Ljava/lang/String;Lcom/discord/models/domain/StreamDelete$Reason;Z)Lcom/discord/models/domain/StreamDelete;
+
+    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/StreamDelete;->streamKey:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component2()Lcom/discord/models/domain/StreamDelete$Reason;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamDelete;->reason:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    return-object v0
+.end method
+
+.method public final component3()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/models/domain/StreamDelete;->unavailable:Z
+
+    return v0
+.end method
+
+.method public final copy(Ljava/lang/String;Lcom/discord/models/domain/StreamDelete$Reason;Z)Lcom/discord/models/domain/StreamDelete;
+    .locals 1
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "reason"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Lcom/discord/models/domain/StreamDelete;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lcom/discord/models/domain/StreamDelete;
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamDelete;->streamKey:Ljava/lang/String;
+
+    iget-object v3, p1, Lcom/discord/models/domain/StreamDelete;->streamKey:Ljava/lang/String;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamDelete;->reason:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    iget-object v3, p1, Lcom/discord/models/domain/StreamDelete;->reason:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-boolean v1, p0, Lcom/discord/models/domain/StreamDelete;->unavailable:Z
+
+    iget-boolean p1, p1, Lcom/discord/models/domain/StreamDelete;->unavailable:Z
+
+    if-ne v1, 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 final getReason()Lcom/discord/models/domain/StreamDelete$Reason;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamDelete;->reason:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    return-object v0
+.end method
+
+.method public final getStreamKey()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamDelete;->streamKey:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getUnavailable()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/models/domain/StreamDelete;->unavailable:Z
+
+    return v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamDelete;->streamKey: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/StreamDelete;->reason:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    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/models/domain/StreamDelete;->unavailable:Z
+
+    if-eqz v1, :cond_2
+
+    const/4 v1, 0x1
+
+    :cond_2
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "StreamDelete(streamKey="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamDelete;->streamKey:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", reason="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamDelete;->reason:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", unavailable="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/models/domain/StreamDelete;->unavailable:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    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/StreamServerUpdate$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser$parse$1.smali
new file mode 100644
index 0000000000..445d009565
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser$parse$1.smali
@@ -0,0 +1,167 @@
+.class final Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/models/domain/StreamServerUpdate$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamServerUpdate;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $endpoint:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+.field final synthetic $reader:Lcom/discord/models/domain/Model$JsonReader;
+
+.field final synthetic $streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+.field final synthetic $token:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iput-object p2, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    iput-object p3, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$endpoint:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iput-object p4, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$token:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-virtual {p0, p1}, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->call(Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public final call(Ljava/lang/String;)V
+    .locals 2
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    const v1, -0x4731a2e0
+
+    if-eq v0, v1, :cond_3
+
+    const v1, 0x696b9f9
+
+    if-eq v0, v1, :cond_2
+
+    const v1, 0x67c71d95
+
+    if-eq v0, v1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const-string v0, "endpoint"
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    iget-object p1, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$endpoint:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    return-void
+
+    :cond_2
+    const-string v0, "token"
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    iget-object p1, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$token:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    return-void
+
+    :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_4
+
+    iget-object p1, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    return-void
+
+    :cond_4
+    :goto_0
+    iget-object p1, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser.smali b/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser.smali
new file mode 100644
index 0000000000..263f54a139
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser.smali
@@ -0,0 +1,123 @@
+.class public final Lcom/discord/models/domain/StreamServerUpdate$Parser;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$Parser;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/models/domain/StreamServerUpdate;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Parser"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lcom/discord/models/domain/Model$Parser<",
+        "Lcom/discord/models/domain/StreamServerUpdate;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/models/domain/StreamServerUpdate$Parser;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/models/domain/StreamServerUpdate$Parser;
+
+    invoke-direct {v0}, Lcom/discord/models/domain/StreamServerUpdate$Parser;-><init>()V
+
+    sput-object v0, Lcom/discord/models/domain/StreamServerUpdate$Parser;->INSTANCE:Lcom/discord/models/domain/StreamServerUpdate$Parser;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamServerUpdate;
+    .locals 4
+
+    const-string v0, "reader"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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 v2, Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {v2}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+
+    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 v1, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    new-instance v1, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;
+
+    invoke-direct {v1, 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
+
+    check-cast v1, Lrx/functions/Action1;
+
+    invoke-virtual {p1, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+
+    new-instance p1, Lcom/discord/models/domain/StreamServerUpdate;
+
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/String;
+
+    if-nez v0, :cond_0
+
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
+
+    :cond_0
+    iget-object v1, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v1, Ljava/lang/String;
+
+    iget-object v2, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v2, Ljava/lang/String;
+
+    invoke-direct {p1, v0, v1, v2}, Lcom/discord/models/domain/StreamServerUpdate;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method public final bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lcom/discord/models/domain/StreamServerUpdate$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamServerUpdate;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/StreamServerUpdate.smali b/com.discord/smali/com/discord/models/domain/StreamServerUpdate.smali
new file mode 100644
index 0000000000..a992e702ba
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamServerUpdate.smali
@@ -0,0 +1,282 @@
+.class public final Lcom/discord/models/domain/StreamServerUpdate;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/models/domain/StreamServerUpdate$Parser;
+    }
+.end annotation
+
+
+# instance fields
+.field private final endpoint:Ljava/lang/String;
+
+.field private final streamKey:Ljava/lang/String;
+
+.field private final token:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/models/domain/StreamServerUpdate;->streamKey:Ljava/lang/String;
+
+    iput-object p2, p0, Lcom/discord/models/domain/StreamServerUpdate;->endpoint:Ljava/lang/String;
+
+    iput-object p3, p0, Lcom/discord/models/domain/StreamServerUpdate;->token:Ljava/lang/String;
+
+    return-void
+.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;
+    .locals 0
+
+    and-int/lit8 p5, p4, 0x1
+
+    if-eqz p5, :cond_0
+
+    iget-object p1, p0, Lcom/discord/models/domain/StreamServerUpdate;->streamKey:Ljava/lang/String;
+
+    :cond_0
+    and-int/lit8 p5, p4, 0x2
+
+    if-eqz p5, :cond_1
+
+    iget-object p2, p0, Lcom/discord/models/domain/StreamServerUpdate;->endpoint:Ljava/lang/String;
+
+    :cond_1
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_2
+
+    iget-object p3, p0, Lcom/discord/models/domain/StreamServerUpdate;->token:Ljava/lang/String;
+
+    :cond_2
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/models/domain/StreamServerUpdate;->copy(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/models/domain/StreamServerUpdate;
+
+    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/StreamServerUpdate;->streamKey:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamServerUpdate;->endpoint:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component3()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamServerUpdate;->token:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/models/domain/StreamServerUpdate;
+    .locals 1
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/models/domain/StreamServerUpdate;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/models/domain/StreamServerUpdate;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamServerUpdate;->streamKey:Ljava/lang/String;
+
+    iget-object v1, p1, Lcom/discord/models/domain/StreamServerUpdate;->streamKey:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamServerUpdate;->endpoint:Ljava/lang/String;
+
+    iget-object v1, p1, Lcom/discord/models/domain/StreamServerUpdate;->endpoint:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamServerUpdate;->token:Ljava/lang/String;
+
+    iget-object p1, p1, Lcom/discord/models/domain/StreamServerUpdate;->token:Ljava/lang/String;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getEndpoint()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamServerUpdate;->endpoint:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getStreamKey()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamServerUpdate;->streamKey:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getToken()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamServerUpdate;->token:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamServerUpdate;->streamKey: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/StreamServerUpdate;->endpoint: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/models/domain/StreamServerUpdate;->token: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 final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "StreamServerUpdate(streamKey="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamServerUpdate;->streamKey:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", endpoint="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamServerUpdate;->endpoint:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", token="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamServerUpdate;->token: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;
+
+    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/StreamUpdate$Parser$parse$1$1.smali b/com.discord/smali/com/discord/models/domain/StreamUpdate$Parser$parse$1$1.smali
new file mode 100644
index 0000000000..78e9591ce4
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamUpdate$Parser$parse$1$1.smali
@@ -0,0 +1,77 @@
+.class final Lcom/discord/models/domain/StreamUpdate$Parser$parse$1$1;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;->call(Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lcom/discord/models/domain/Model$JsonReader$ItemFactory<",
+        "Ljava/lang/Long;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1$1;->this$0:Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()J
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1$1;->this$0:Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;
+
+    iget-object v0, v0, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    const-wide/16 v1, 0x0
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final synthetic get()Ljava/lang/Object;
+    .locals 2
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/StreamUpdate$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
diff --git a/com.discord/smali/com/discord/models/domain/StreamUpdate$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/StreamUpdate$Parser$parse$1.smali
new file mode 100644
index 0000000000..2289a512d4
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamUpdate$Parser$parse$1.smali
@@ -0,0 +1,200 @@
+.class final Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/models/domain/StreamUpdate$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamUpdate;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $paused:Lkotlin/jvm/internal/Ref$BooleanRef;
+
+.field final synthetic $reader:Lcom/discord/models/domain/Model$JsonReader;
+
+.field final synthetic $rtcServerId:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+.field final synthetic $streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+.field final synthetic $viewerIds:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$BooleanRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;->$streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iput-object p2, p0, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    iput-object p3, p0, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;->$rtcServerId:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iput-object p4, p0, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;->$paused:Lkotlin/jvm/internal/Ref$BooleanRef;
+
+    iput-object p5, p0, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;->$viewerIds:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-virtual {p0, p1}, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;->call(Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public final call(Ljava/lang/String;)V
+    .locals 2
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    sparse-switch v0, :sswitch_data_0
+
+    goto :goto_0
+
+    :sswitch_0
+    const-string v0, "rtc_server_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/StreamUpdate$Parser$parse$1;->$rtcServerId:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    return-void
+
+    :sswitch_1
+    const-string v0, "paused"
+
+    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/StreamUpdate$Parser$parse$1;->$paused:Lkotlin/jvm/internal/Ref$BooleanRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextBoolean(Z)Z
+
+    move-result v0
+
+    iput-boolean v0, p1, Lkotlin/jvm/internal/Ref$BooleanRef;->element:Z
+
+    return-void
+
+    :sswitch_2
+    const-string v0, "stream_key"
+
+    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/StreamUpdate$Parser$parse$1;->$streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    return-void
+
+    :sswitch_3
+    const-string v0, "viewer_ids"
+
+    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/StreamUpdate$Parser$parse$1;->$viewerIds:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    new-instance v1, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1$1;-><init>(Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;)V
+
+    check-cast v1, Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+    invoke-virtual {v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    return-void
+
+    :cond_1
+    :goto_0
+    iget-object p1, p0, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V
+
+    return-void
+
+    nop
+
+    :sswitch_data_0
+    .sparse-switch
+        -0x506b60f5 -> :sswitch_3
+        -0x4731a2e0 -> :sswitch_2
+        -0x3b5366d2 -> :sswitch_1
+        -0x1d3ab8c7 -> :sswitch_0
+    .end sparse-switch
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/StreamUpdate$Parser.smali b/com.discord/smali/com/discord/models/domain/StreamUpdate$Parser.smali
new file mode 100644
index 0000000000..b395d512ac
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamUpdate$Parser.smali
@@ -0,0 +1,152 @@
+.class public final Lcom/discord/models/domain/StreamUpdate$Parser;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$Parser;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/models/domain/StreamUpdate;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Parser"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lcom/discord/models/domain/Model$Parser<",
+        "Lcom/discord/models/domain/StreamUpdate;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/models/domain/StreamUpdate$Parser;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/models/domain/StreamUpdate$Parser;
+
+    invoke-direct {v0}, Lcom/discord/models/domain/StreamUpdate$Parser;-><init>()V
+
+    sput-object v0, Lcom/discord/models/domain/StreamUpdate$Parser;->INSTANCE:Lcom/discord/models/domain/StreamUpdate$Parser;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamUpdate;
+    .locals 11
+
+    const-string v0, "reader"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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 v7, Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+
+    iput-object v1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    new-instance v8, Lkotlin/jvm/internal/Ref$BooleanRef;
+
+    invoke-direct {v8}, Lkotlin/jvm/internal/Ref$BooleanRef;-><init>()V
+
+    const/4 v2, 0x0
+
+    iput-boolean v2, v8, Lkotlin/jvm/internal/Ref$BooleanRef;->element:Z
+
+    new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+
+    iput-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    new-instance v10, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;
+
+    move-object v1, v10
+
+    move-object v2, v0
+
+    move-object v3, p1
+
+    move-object v4, v7
+
+    move-object v5, v8
+
+    move-object v6, v9
+
+    invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/StreamUpdate$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$BooleanRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+
+    check-cast v10, Lrx/functions/Action1;
+
+    invoke-virtual {p1, v10}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+
+    new-instance p1, Lcom/discord/models/domain/StreamUpdate;
+
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/String;
+
+    if-nez v0, :cond_0
+
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
+
+    :cond_0
+    iget-object v1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v1, Ljava/lang/String;
+
+    iget-boolean v2, v8, Lkotlin/jvm/internal/Ref$BooleanRef;->element:Z
+
+    iget-object v3, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v3, Ljava/util/List;
+
+    if-nez v3, :cond_1
+
+    sget-object v3, Lkotlin/a/y;->bko:Lkotlin/a/y;
+
+    check-cast v3, Ljava/util/List;
+
+    :cond_1
+    invoke-direct {p1, v0, v1, v2, v3}, Lcom/discord/models/domain/StreamUpdate;-><init>(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V
+
+    return-object p1
+.end method
+
+.method public final bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lcom/discord/models/domain/StreamUpdate$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamUpdate;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/StreamUpdate.smali b/com.discord/smali/com/discord/models/domain/StreamUpdate.smali
new file mode 100644
index 0000000000..f543e86c36
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/StreamUpdate.smali
@@ -0,0 +1,399 @@
+.class public final Lcom/discord/models/domain/StreamUpdate;
+.super Ljava/lang/Object;
+.source "ModelApplicationStream.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/models/domain/StreamUpdate$Parser;
+    }
+.end annotation
+
+
+# instance fields
+.field private final paused:Z
+
+.field private final rtcServerId:Ljava/lang/String;
+
+.field private final streamKey:Ljava/lang/String;
+
+.field private final viewerIds:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            "Z",
+            "Ljava/util/List<",
+            "Ljava/lang/Long;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "viewerIds"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/models/domain/StreamUpdate;->streamKey:Ljava/lang/String;
+
+    iput-object p2, p0, Lcom/discord/models/domain/StreamUpdate;->rtcServerId:Ljava/lang/String;
+
+    iput-boolean p3, p0, Lcom/discord/models/domain/StreamUpdate;->paused:Z
+
+    iput-object p4, p0, Lcom/discord/models/domain/StreamUpdate;->viewerIds:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/models/domain/StreamUpdate;Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/StreamUpdate;
+    .locals 0
+
+    and-int/lit8 p6, p5, 0x1
+
+    if-eqz p6, :cond_0
+
+    iget-object p1, p0, Lcom/discord/models/domain/StreamUpdate;->streamKey:Ljava/lang/String;
+
+    :cond_0
+    and-int/lit8 p6, p5, 0x2
+
+    if-eqz p6, :cond_1
+
+    iget-object p2, p0, Lcom/discord/models/domain/StreamUpdate;->rtcServerId:Ljava/lang/String;
+
+    :cond_1
+    and-int/lit8 p6, p5, 0x4
+
+    if-eqz p6, :cond_2
+
+    iget-boolean p3, p0, Lcom/discord/models/domain/StreamUpdate;->paused:Z
+
+    :cond_2
+    and-int/lit8 p5, p5, 0x8
+
+    if-eqz p5, :cond_3
+
+    iget-object p4, p0, Lcom/discord/models/domain/StreamUpdate;->viewerIds:Ljava/util/List;
+
+    :cond_3
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/models/domain/StreamUpdate;->copy(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)Lcom/discord/models/domain/StreamUpdate;
+
+    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/StreamUpdate;->streamKey:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamUpdate;->rtcServerId:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component3()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/models/domain/StreamUpdate;->paused:Z
+
+    return v0
+.end method
+
+.method public final component4()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/StreamUpdate;->viewerIds:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)Lcom/discord/models/domain/StreamUpdate;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            "Z",
+            "Ljava/util/List<",
+            "Ljava/lang/Long;",
+            ">;)",
+            "Lcom/discord/models/domain/StreamUpdate;"
+        }
+    .end annotation
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "viewerIds"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/models/domain/StreamUpdate;
+
+    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/models/domain/StreamUpdate;-><init>(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Lcom/discord/models/domain/StreamUpdate;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lcom/discord/models/domain/StreamUpdate;
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamUpdate;->streamKey:Ljava/lang/String;
+
+    iget-object v3, p1, Lcom/discord/models/domain/StreamUpdate;->streamKey:Ljava/lang/String;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamUpdate;->rtcServerId:Ljava/lang/String;
+
+    iget-object v3, p1, Lcom/discord/models/domain/StreamUpdate;->rtcServerId:Ljava/lang/String;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-boolean v1, p0, Lcom/discord/models/domain/StreamUpdate;->paused:Z
+
+    iget-boolean v3, p1, Lcom/discord/models/domain/StreamUpdate;->paused:Z
+
+    if-ne v1, v3, :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, p0, Lcom/discord/models/domain/StreamUpdate;->viewerIds:Ljava/util/List;
+
+    iget-object p1, p1, Lcom/discord/models/domain/StreamUpdate;->viewerIds:Ljava/util/List;
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    return v2
+
+    :cond_2
+    :goto_1
+    return v0
+.end method
+
+.method public final getPaused()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/models/domain/StreamUpdate;->paused:Z
+
+    return v0
+.end method
+
+.method public final getRtcServerId()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamUpdate;->rtcServerId:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getStreamKey()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamUpdate;->streamKey:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getViewerIds()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/StreamUpdate;->viewerIds:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/models/domain/StreamUpdate;->streamKey: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/StreamUpdate;->rtcServerId: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/models/domain/StreamUpdate;->paused:Z
+
+    if-eqz v2, :cond_2
+
+    const/4 v2, 0x1
+
+    :cond_2
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/models/domain/StreamUpdate;->viewerIds:Ljava/util/List;
+
+    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 final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "StreamUpdate(streamKey="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamUpdate;->streamKey:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", rtcServerId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamUpdate;->rtcServerId:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", paused="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/models/domain/StreamUpdate;->paused:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", viewerIds="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/models/domain/StreamUpdate;->viewerIds:Ljava/util/List;
+
+    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/auth/Scopes.smali b/com.discord/smali/com/discord/models/domain/auth/Scopes.smali
index f54f23736c..bb15d2c47f 100644
--- a/com.discord/smali/com/discord/models/domain/auth/Scopes.smali
+++ b/com.discord/smali/com/discord/models/domain/auth/Scopes.smali
@@ -34,6 +34,8 @@
 
 .field public static final MESSAGES_READ:Ljava/lang/String; = "messages.read"
 
+.field public static final RELATIONSHIPS_READ:Ljava/lang/String; = "relationships.read"
+
 .field public static final RPC:Ljava/lang/String; = "rpc"
 
 .field public static final RPC_API:Ljava/lang/String; = "rpc.api"
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager$a.smali b/com.discord/smali/com/discord/overlay/OverlayManager$a.smali
index 318fdb115e..23aff6dd76 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager$a.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager$a.smali
@@ -60,7 +60,7 @@
     :cond_0
     iget-object v0, p0, Lcom/discord/overlay/OverlayManager$a;->this$0:Lcom/discord/overlay/OverlayManager;
 
-    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->wP:Lcom/discord/overlay/views/a;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->wZ:Lcom/discord/overlay/views/a;
 
     if-eqz v0, :cond_1
 
@@ -76,7 +76,7 @@
 
     float-to-int v4, v4
 
-    iget-object v0, v0, Lcom/discord/overlay/views/a;->xx:Landroid/graphics/Rect;
+    iget-object v0, v0, Lcom/discord/overlay/views/a;->xH:Landroid/graphics/Rect;
 
     invoke-virtual {v0, v3, v4}, Landroid/graphics/Rect;->contains(II)Z
 
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager$b.smali b/com.discord/smali/com/discord/overlay/OverlayManager$b.smali
index 0b75c3015e..714c936d8e 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager$b.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager$b.smali
@@ -54,7 +54,7 @@
     :try_start_0
     iget-object v0, p0, Lcom/discord/overlay/OverlayManager$b;->this$0:Lcom/discord/overlay/OverlayManager;
 
-    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->wT:Landroid/view/WindowManager;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->xd:Landroid/view/WindowManager;
 
     move-object v1, p1
 
@@ -64,7 +64,7 @@
 
     iget-object v0, p0, Lcom/discord/overlay/OverlayManager$b;->this$0:Lcom/discord/overlay/OverlayManager;
 
-    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->wO:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->wY:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager$c.smali b/com.discord/smali/com/discord/overlay/OverlayManager$c.smali
index b5e633cb16..53757237c1 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager$c.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager$c.smali
@@ -63,11 +63,11 @@
 
     iget-object p1, p0, Lcom/discord/overlay/OverlayManager$c;->this$0:Lcom/discord/overlay/OverlayManager;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wP:Lcom/discord/overlay/views/a;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wZ:Lcom/discord/overlay/views/a;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p1, Lcom/discord/overlay/views/a;->xv:Landroid/animation/Animator;
+    iget-object p1, p1, Lcom/discord/overlay/views/a;->xF:Landroid/animation/Animator;
 
     invoke-virtual {p1}, Landroid/animation/Animator;->start()V
 
@@ -76,11 +76,11 @@
     :cond_0
     iget-object p1, p0, Lcom/discord/overlay/OverlayManager$c;->this$0:Lcom/discord/overlay/OverlayManager;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wP:Lcom/discord/overlay/views/a;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wZ:Lcom/discord/overlay/views/a;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p1, Lcom/discord/overlay/views/a;->xw:Landroid/animation/Animator;
+    iget-object p1, p1, Lcom/discord/overlay/views/a;->xG:Landroid/animation/Animator;
 
     invoke-virtual {p1}, Landroid/animation/Animator;->start()V
 
@@ -93,7 +93,7 @@
 
     :cond_2
     :goto_0
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager$d$1$a.smali b/com.discord/smali/com/discord/overlay/OverlayManager$d$1$a.smali
index cc61a4d60e..de41b6e306 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager$d$1$a.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager$d$1$a.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic wY:Lcom/discord/overlay/OverlayManager$d$1;
+.field final synthetic xi:Lcom/discord/overlay/OverlayManager$d$1;
 
-.field final synthetic wZ:Landroid/view/View;
+.field final synthetic xj:Landroid/view/View;
 
 
 # direct methods
 .method public constructor <init>(Lcom/discord/overlay/OverlayManager$d$1;Landroid/view/View;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->wY:Lcom/discord/overlay/OverlayManager$d$1;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->xi:Lcom/discord/overlay/OverlayManager$d$1;
 
-    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->wZ:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->xj:Landroid/view/View;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,13 +51,13 @@
 
     invoke-virtual {p1, p2}, Landroid/view/View;->removeOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
-    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->wZ:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->xj:Landroid/view/View;
 
-    iget-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->wY:Lcom/discord/overlay/OverlayManager$d$1;
+    iget-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->xi:Lcom/discord/overlay/OverlayManager$d$1;
 
-    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d$1;->wX:Lcom/discord/overlay/OverlayManager$d;
+    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d$1;->xh:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d;->wW:Ljava/lang/Object;
+    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d;->xg:Ljava/lang/Object;
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewWithTag(Ljava/lang/Object;)Landroid/view/View;
 
@@ -67,11 +67,11 @@
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->wY:Lcom/discord/overlay/OverlayManager$d$1;
+    iget-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->xi:Lcom/discord/overlay/OverlayManager$d$1;
 
-    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d$1;->wX:Lcom/discord/overlay/OverlayManager$d;
+    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d$1;->xh:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d;->wV:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d;->xf:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-virtual {p2, p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;->d(Landroid/view/View;)V
 
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager$d$1.smali b/com.discord/smali/com/discord/overlay/OverlayManager$d$1.smali
index 17885950c0..abc2d9c59f 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager$d$1.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager$d$1.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic wX:Lcom/discord/overlay/OverlayManager$d;
+.field final synthetic xh:Lcom/discord/overlay/OverlayManager$d;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->wX:Lcom/discord/overlay/OverlayManager$d;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->xh:Lcom/discord/overlay/OverlayManager$d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,9 +58,9 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d$1;->wX:Lcom/discord/overlay/OverlayManager$d;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d$1;->xh:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object v0, v0, Lcom/discord/overlay/OverlayManager$d;->wW:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager$d;->xg:Ljava/lang/Object;
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewWithTag(Ljava/lang/Object;)Landroid/view/View;
 
@@ -70,9 +70,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d$1;->wX:Lcom/discord/overlay/OverlayManager$d;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d$1;->xh:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object v0, v0, Lcom/discord/overlay/OverlayManager$d;->wV:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager$d;->xf:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-virtual {v0, p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;->d(Landroid/view/View;)V
 
@@ -93,9 +93,9 @@
 .method public final onViewDetachedFromWindow(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->wX:Lcom/discord/overlay/OverlayManager$d;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->xh:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->wV:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->xf:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     check-cast p1, Landroid/view/View;
 
@@ -105,19 +105,19 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->wX:Lcom/discord/overlay/OverlayManager$d;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->xh:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->wV:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->xf:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     const/4 v0, 0x1
 
     invoke-virtual {p1, v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->setBubbleTouchable(Z)V
 
-    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->wX:Lcom/discord/overlay/OverlayManager$d;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->xh:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->wV:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->xf:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-    invoke-virtual {p1, v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->r(Z)V
+    invoke-virtual {p1, v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->p(Z)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager$d.smali b/com.discord/smali/com/discord/overlay/OverlayManager$d.smali
index eef7f02152..6db4fed23a 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager$d.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager$d.smali
@@ -20,11 +20,11 @@
 # instance fields
 .field final synthetic this$0:Lcom/discord/overlay/OverlayManager;
 
-.field final synthetic wU:Lkotlin/jvm/functions/Function1;
+.field final synthetic xe:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic wV:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field final synthetic xf:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-.field final synthetic wW:Ljava/lang/Object;
+.field final synthetic xg:Ljava/lang/Object;
 
 
 # direct methods
@@ -33,11 +33,11 @@
 
     iput-object p1, p0, Lcom/discord/overlay/OverlayManager$d;->this$0:Lcom/discord/overlay/OverlayManager;
 
-    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$d;->wU:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$d;->xe:Lkotlin/jvm/functions/Function1;
 
-    iput-object p3, p0, Lcom/discord/overlay/OverlayManager$d;->wV:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p3, p0, Lcom/discord/overlay/OverlayManager$d;->xf:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-    iput-object p4, p0, Lcom/discord/overlay/OverlayManager$d;->wW:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/discord/overlay/OverlayManager$d;->xg:Ljava/lang/Object;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,9 +49,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d;->wU:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d;->xe:Lkotlin/jvm/functions/Function1;
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->wV:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->xf:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -71,7 +71,7 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/overlay/OverlayManager;->b(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
 
-    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d;->wV:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d;->xf:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     const/4 v0, 0x0
 
@@ -79,9 +79,9 @@
 
     iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d;->this$0:Lcom/discord/overlay/OverlayManager;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wT:Landroid/view/WindowManager;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->xd:Landroid/view/WindowManager;
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->wV:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->xf:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     check-cast v0, Landroid/view/View;
 
@@ -89,9 +89,9 @@
 
     iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d;->this$0:Lcom/discord/overlay/OverlayManager;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wT:Landroid/view/WindowManager;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->xd:Landroid/view/WindowManager;
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->wV:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->xf:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     move-object v1, v0
 
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager$e.smali b/com.discord/smali/com/discord/overlay/OverlayManager$e.smali
index 8942aa29aa..d9c642a322 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager$e.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager$e.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final xa:Lcom/discord/overlay/OverlayManager$e;
+.field public static final xk:Lcom/discord/overlay/OverlayManager$e;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/overlay/OverlayManager$e;-><init>()V
 
-    sput-object v0, Lcom/discord/overlay/OverlayManager$e;->xa:Lcom/discord/overlay/OverlayManager$e;
+    sput-object v0, Lcom/discord/overlay/OverlayManager$e;->xk:Lcom/discord/overlay/OverlayManager$e;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager$f.smali b/com.discord/smali/com/discord/overlay/OverlayManager$f.smali
index 13e62df5ad..72d227b03f 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager$f.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager$f.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final xb:Lcom/discord/overlay/OverlayManager$f;
+.field public static final xl:Lcom/discord/overlay/OverlayManager$f;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/overlay/OverlayManager$f;-><init>()V
 
-    sput-object v0, Lcom/discord/overlay/OverlayManager$f;->xb:Lcom/discord/overlay/OverlayManager$f;
+    sput-object v0, Lcom/discord/overlay/OverlayManager$f;->xl:Lcom/discord/overlay/OverlayManager$f;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager$g.smali b/com.discord/smali/com/discord/overlay/OverlayManager$g.smali
index 99ed8edddc..f65fa77a65 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager$g.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager$g.smali
@@ -20,7 +20,7 @@
 # instance fields
 .field final synthetic this$0:Lcom/discord/overlay/OverlayManager;
 
-.field final synthetic xc:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field final synthetic xm:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     iput-object p1, p0, Lcom/discord/overlay/OverlayManager$g;->this$0:Lcom/discord/overlay/OverlayManager;
 
-    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$g;->xc:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$g;->xm:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,22 +57,26 @@
 
     iget-object p1, p0, Lcom/discord/overlay/OverlayManager$g;->this$0:Lcom/discord/overlay/OverlayManager;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wP:Lcom/discord/overlay/views/a;
+    invoke-virtual {p1}, Lcom/discord/overlay/OverlayManager;->dY()Lcom/discord/overlay/views/a;
+
+    move-result-object p1
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$g;->xc:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$g;->xm:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-virtual {p1, v0}, Lcom/discord/overlay/views/a;->f(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
 
     :cond_0
     iget-object p1, p0, Lcom/discord/overlay/OverlayManager$g;->this$0:Lcom/discord/overlay/OverlayManager;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wQ:Lcom/discord/overlay/a;
+    invoke-virtual {p1}, Lcom/discord/overlay/OverlayManager;->dZ()Lcom/discord/overlay/a;
+
+    move-result-object p1
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$g;->xc:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$g;->xm:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-interface {p1, v0}, Lcom/discord/overlay/a;->f(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
 
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager.smali b/com.discord/smali/com/discord/overlay/OverlayManager.smali
index 049d94ccdf..6ad73f7106 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final wK:Landroid/graphics/Rect;
+.field private final wU:Landroid/graphics/Rect;
 
-.field private final wL:Ljava/util/ArrayList;
+.field private final wV:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -19,7 +19,7 @@
     .end annotation
 .end field
 
-.field public final wM:Ljava/util/List;
+.field public final wW:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field public wN:Lkotlin/jvm/functions/Function1;
+.field public wX:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field wO:Lkotlin/jvm/functions/Function1;
+.field wY:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -53,15 +53,15 @@
     .end annotation
 .end field
 
-.field wP:Lcom/discord/overlay/views/a;
+.field wZ:Lcom/discord/overlay/views/a;
 
-.field wQ:Lcom/discord/overlay/a;
+.field xa:Lcom/discord/overlay/a;
 
-.field public wR:Landroid/view/View$OnTouchListener;
+.field public xb:Landroid/view/View$OnTouchListener;
 
-.field private wS:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field private xc:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-.field final wT:Landroid/view/WindowManager;
+.field final xd:Landroid/view/WindowManager;
 
 
 # direct methods
@@ -74,13 +74,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wT:Landroid/view/WindowManager;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->xd:Landroid/view/WindowManager;
 
     new-instance p1, Landroid/graphics/Rect;
 
     invoke-direct {p1}, Landroid/graphics/Rect;-><init>()V
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wT:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->xd:Landroid/view/WindowManager;
 
     invoke-interface {v0}, Landroid/view/WindowManager;->getDefaultDisplay()Landroid/view/Display;
 
@@ -88,7 +88,7 @@
 
     invoke-virtual {v0, p1}, Landroid/view/Display;->getRectSize(Landroid/graphics/Rect;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wK:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wU:Landroid/graphics/Rect;
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -96,25 +96,25 @@
 
     invoke-direct {p1, v0}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wL:Ljava/util/ArrayList;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wV:Ljava/util/ArrayList;
 
-    iget-object p1, p0, Lcom/discord/overlay/OverlayManager;->wL:Ljava/util/ArrayList;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager;->wV:Ljava/util/ArrayList;
 
     check-cast p1, Ljava/util/List;
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wM:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wW:Ljava/util/List;
 
-    sget-object p1, Lcom/discord/overlay/OverlayManager$e;->xa:Lcom/discord/overlay/OverlayManager$e;
+    sget-object p1, Lcom/discord/overlay/OverlayManager$e;->xk:Lcom/discord/overlay/OverlayManager$e;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wN:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wX:Lkotlin/jvm/functions/Function1;
 
-    sget-object p1, Lcom/discord/overlay/OverlayManager$f;->xb:Lcom/discord/overlay/OverlayManager$f;
+    sget-object p1, Lcom/discord/overlay/OverlayManager$f;->xl:Lcom/discord/overlay/OverlayManager$f;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wO:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wY:Lkotlin/jvm/functions/Function1;
 
     new-instance p1, Lcom/discord/overlay/OverlayManager$a;
 
@@ -122,7 +122,7 @@
 
     check-cast p1, Landroid/view/View$OnTouchListener;
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wR:Landroid/view/View$OnTouchListener;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->xb:Landroid/view/View$OnTouchListener;
 
     return-void
 .end method
@@ -130,17 +130,17 @@
 .method public static final synthetic a(Lcom/discord/overlay/OverlayManager;Lcom/discord/overlay/views/OverlayBubbleWrap;)V
     .locals 3
 
-    iget-object v0, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->xq:Landroid/graphics/Point;
+    iget-object v0, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->xA:Landroid/graphics/Point;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v1, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     iget v2, v0, Landroid/graphics/Point;->x:I
 
     iput v2, v1, Landroid/graphics/Point;->x:I
 
-    iget-object v1, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v1, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     iget v0, v0, Landroid/graphics/Point;->y:I
 
@@ -160,7 +160,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v2, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -237,7 +237,7 @@
 .method private final c(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wS:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->xc:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -248,16 +248,16 @@
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wS:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->xc:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wP:Lcom/discord/overlay/views/a;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wZ:Lcom/discord/overlay/views/a;
 
     if-eqz v0, :cond_1
 
     invoke-virtual {v0, p1}, Lcom/discord/overlay/views/a;->g(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
 
     :cond_1
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wQ:Lcom/discord/overlay/a;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->xa:Lcom/discord/overlay/a;
 
     if-eqz v0, :cond_2
 
@@ -276,7 +276,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wL:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wV:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
 
@@ -284,7 +284,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wT:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->xd:Landroid/view/WindowManager;
 
     move-object v1, p1
 
@@ -292,7 +292,7 @@
 
     invoke-interface {v0, v1}, Landroid/view/WindowManager;->removeViewImmediate(Landroid/view/View;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wO:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wY:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -317,7 +317,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wO:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->wY:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -329,7 +329,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wT:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->xd:Landroid/view/WindowManager;
 
     move-object v1, p1
 
@@ -343,13 +343,13 @@
 
     invoke-interface {v0, v1, v2}, Landroid/view/WindowManager;->addView(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wL:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wV:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/util/Collection;
 
     invoke-interface {v0, p1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wN:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wX:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -359,7 +359,7 @@
 .method public close()V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wL:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wV:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/util/List;
 
@@ -371,11 +371,11 @@
 
     invoke-static {v0, v1}, Lkotlin/a/m;->a(Ljava/util/List;Lkotlin/jvm/functions/Function1;)Z
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wP:Lcom/discord/overlay/views/a;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wZ:Lcom/discord/overlay/views/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->wT:Landroid/view/WindowManager;
+    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->xd:Landroid/view/WindowManager;
 
     check-cast v0, Landroid/view/View;
 
@@ -384,7 +384,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/overlay/OverlayManager;->wP:Lcom/discord/overlay/views/a;
+    iput-object v0, p0, Lcom/discord/overlay/OverlayManager;->wZ:Lcom/discord/overlay/views/a;
 
     return-void
 .end method
@@ -396,13 +396,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wT:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->xd:Landroid/view/WindowManager;
 
     invoke-interface {v0}, Landroid/view/WindowManager;->getDefaultDisplay()Landroid/view/Display;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->wK:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->wU:Landroid/graphics/Rect;
 
     invoke-virtual {v0, v1}, Landroid/view/Display;->getRectSize(Landroid/graphics/Rect;)V
 
@@ -410,7 +410,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->wK:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->wU:Landroid/graphics/Rect;
 
     invoke-virtual {v1}, Landroid/graphics/Rect;->centerX()I
 
@@ -443,3 +443,19 @@
 
     return-void
 .end method
+
+.method public final dY()Lcom/discord/overlay/views/a;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->wZ:Lcom/discord/overlay/views/a;
+
+    return-object v0
+.end method
+
+.method public final dZ()Lcom/discord/overlay/a;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->xa:Lcom/discord/overlay/a;
+
+    return-object v0
+.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 ed61d4fb96..0a49c38e48 100644
--- a/com.discord/smali/com/discord/overlay/OverlayService$c.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayService$c.smali
@@ -61,7 +61,7 @@
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wM:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wW:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
@@ -69,7 +69,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 
diff --git a/com.discord/smali/com/discord/overlay/OverlayService.smali b/com.discord/smali/com/discord/overlay/OverlayService.smali
index 2e40c36a34..a3d4f4830a 100644
--- a/com.discord/smali/com/discord/overlay/OverlayService.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayService.smali
@@ -64,7 +64,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {v0, p1}, Lcom/discord/overlay/OverlayManager;->b(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
@@ -81,10 +81,10 @@
 
     if-nez p1, :cond_2
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wP:Lcom/discord/overlay/views/a;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wZ:Lcom/discord/overlay/views/a;
 
     if-nez p1, :cond_4
 
@@ -104,16 +104,16 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     const-string v1, "trashWrap"
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, v0, Lcom/discord/overlay/OverlayManager;->wP:Lcom/discord/overlay/views/a;
+    iput-object p1, v0, Lcom/discord/overlay/OverlayManager;->wZ:Lcom/discord/overlay/views/a;
 
-    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->wT:Landroid/view/WindowManager;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->xd:Landroid/view/WindowManager;
 
     move-object v1, p1
 
@@ -150,7 +150,7 @@
 
     const-string v1, "overlayManager"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -195,7 +195,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v2, Lcom/discord/overlay/OverlayService$b;
@@ -204,13 +204,13 @@
 
     check-cast v2, Lcom/discord/overlay/a;
 
-    iput-object v2, v0, Lcom/discord/overlay/OverlayManager;->wQ:Lcom/discord/overlay/a;
+    iput-object v2, v0, Lcom/discord/overlay/OverlayManager;->xa:Lcom/discord/overlay/a;
 
     iget-object v0, p0, Lcom/discord/overlay/OverlayService;->overlayManager:Lcom/discord/overlay/OverlayManager;
 
     if-nez v0, :cond_1
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     new-instance v1, Lcom/discord/overlay/OverlayService$c;
@@ -242,7 +242,7 @@
 
     const-string v1, "overlayManager"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/discord/overlay/OverlayManager;->close()V
diff --git a/com.discord/smali/com/discord/overlay/R$b.smali b/com.discord/smali/com/discord/overlay/R$b.smali
index 3b1d22a38f..918ed3b1f9 100644
--- a/com.discord/smali/com/discord/overlay/R$b.smali
+++ b/com.discord/smali/com/discord/overlay/R$b.smali
@@ -181,75 +181,75 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final disabled_alpha_material_dark:I = 0x7f0700b1
+.field public static final disabled_alpha_material_dark:I = 0x7f0700b2
 
-.field public static final disabled_alpha_material_light:I = 0x7f0700b2
+.field public static final disabled_alpha_material_light:I = 0x7f0700b3
 
-.field public static final highlight_alpha_material_colored:I = 0x7f0700c4
+.field public static final highlight_alpha_material_colored:I = 0x7f0700c6
 
-.field public static final highlight_alpha_material_dark:I = 0x7f0700c5
+.field public static final highlight_alpha_material_dark:I = 0x7f0700c7
 
-.field public static final highlight_alpha_material_light:I = 0x7f0700c6
+.field public static final highlight_alpha_material_light:I = 0x7f0700c8
 
-.field public static final hint_alpha_material_dark:I = 0x7f0700c7
+.field public static final hint_alpha_material_dark:I = 0x7f0700c9
 
-.field public static final hint_alpha_material_light:I = 0x7f0700c8
+.field public static final hint_alpha_material_light:I = 0x7f0700ca
 
-.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700c9
+.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700cb
 
-.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ca
+.field public static final hint_pressed_alpha_material_light:I = 0x7f0700cc
 
-.field public static final movement_threshold_dp:I = 0x7f0700d7
+.field public static final movement_threshold_dp:I = 0x7f0700d9
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
-.field public static final tooltip_corner_radius:I = 0x7f07012b
+.field public static final tooltip_corner_radius:I = 0x7f07012d
 
-.field public static final tooltip_horizontal_padding:I = 0x7f07012c
+.field public static final tooltip_horizontal_padding:I = 0x7f07012e
 
-.field public static final tooltip_margin:I = 0x7f07012d
+.field public static final tooltip_margin:I = 0x7f07012f
 
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07012e
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f070130
 
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07012f
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f070131
 
-.field public static final tooltip_vertical_padding:I = 0x7f070130
+.field public static final tooltip_vertical_padding:I = 0x7f070132
 
-.field public static final tooltip_y_offset_non_touch:I = 0x7f070131
+.field public static final tooltip_y_offset_non_touch:I = 0x7f070133
 
-.field public static final tooltip_y_offset_touch:I = 0x7f070132
+.field public static final tooltip_y_offset_touch:I = 0x7f070134
 
-.field public static final trash_wrap_min_dimen:I = 0x7f070133
+.field public static final trash_wrap_min_dimen:I = 0x7f070135
 
-.field public static final vertical_safe_margin:I = 0x7f070163
+.field public static final vertical_safe_margin:I = 0x7f070165
 
 
 # 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 1a4c0705f6..3a16d144a7 100644
--- a/com.discord/smali/com/discord/overlay/R$c.smali
+++ b/com.discord/smali/com/discord/overlay/R$c.smali
@@ -15,209 +15,209 @@
 
 
 # static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080017
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080017
+.field public static final abc_action_bar_item_background_material:I = 0x7f080018
 
-.field public static final abc_btn_borderless_material:I = 0x7f080018
+.field public static final abc_btn_borderless_material:I = 0x7f080019
 
-.field public static final abc_btn_check_material:I = 0x7f080019
+.field public static final abc_btn_check_material:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
 
-.field public static final abc_btn_colored_material:I = 0x7f08001c
+.field public static final abc_btn_colored_material:I = 0x7f08001d
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
 
-.field public static final abc_btn_radio_material:I = 0x7f08001e
+.field public static final abc_btn_radio_material:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080023
+.field public static final abc_cab_background_internal_bg:I = 0x7f080024
 
-.field public static final abc_cab_background_top_material:I = 0x7f080024
+.field public static final abc_cab_background_top_material:I = 0x7f080025
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
 
-.field public static final abc_control_background_material:I = 0x7f080026
+.field public static final abc_control_background_material:I = 0x7f080027
 
-.field public static final abc_dialog_material_background:I = 0x7f080027
+.field public static final abc_dialog_material_background:I = 0x7f080028
 
-.field public static final abc_edit_text_material:I = 0x7f080028
+.field public static final abc_edit_text_material:I = 0x7f080029
 
-.field public static final abc_ic_ab_back_material:I = 0x7f080029
+.field public static final abc_ic_ab_back_material:I = 0x7f08002a
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
 
-.field public static final abc_ic_clear_material:I = 0x7f08002b
+.field public static final abc_ic_clear_material:I = 0x7f08002c
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
 
-.field public static final abc_ic_search_api_material:I = 0x7f080034
+.field public static final abc_ic_search_api_material:I = 0x7f080035
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080035
+.field public static final abc_ic_star_black_16dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080036
+.field public static final abc_ic_star_black_36dp:I = 0x7f080037
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080037
+.field public static final abc_ic_star_black_48dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003c
+.field public static final abc_item_background_holo_dark:I = 0x7f08003d
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003d
+.field public static final abc_item_background_holo_light:I = 0x7f08003e
 
-.field public static final abc_list_divider_material:I = 0x7f08003e
+.field public static final abc_list_divider_material:I = 0x7f08003f
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
 
-.field public static final abc_list_focused_holo:I = 0x7f080040
+.field public static final abc_list_focused_holo:I = 0x7f080041
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080041
+.field public static final abc_list_longpressed_holo:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080043
+.field public static final abc_list_pressed_holo_light:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080048
+.field public static final abc_list_selector_holo_dark:I = 0x7f080049
 
-.field public static final abc_list_selector_holo_light:I = 0x7f080049
+.field public static final abc_list_selector_holo_light:I = 0x7f08004a
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_material:I = 0x7f08004d
+.field public static final abc_ratingbar_material:I = 0x7f08004e
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004e
+.field public static final abc_ratingbar_small_material:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080054
+.field public static final abc_seekbar_thumb_material:I = 0x7f080055
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
 
-.field public static final abc_seekbar_track_material:I = 0x7f080056
+.field public static final abc_seekbar_track_material:I = 0x7f080057
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
 
-.field public static final abc_switch_thumb_material:I = 0x7f080059
+.field public static final abc_switch_thumb_material:I = 0x7f08005a
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005b
+.field public static final abc_tab_indicator_material:I = 0x7f08005c
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
 
-.field public static final abc_text_cursor_material:I = 0x7f08005d
+.field public static final abc_text_cursor_material:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
 
-.field public static final abc_textfield_search_material:I = 0x7f080068
+.field public static final abc_textfield_search_material:I = 0x7f080069
 
-.field public static final abc_vector_test:I = 0x7f080069
+.field public static final abc_vector_test:I = 0x7f08006a
 
-.field public static final bubble_state_selector:I = 0x7f080097
+.field public static final bubble_state_selector:I = 0x7f08009a
 
-.field public static final ic_close_24dp:I = 0x7f080234
+.field public static final ic_close_24dp:I = 0x7f080244
 
-.field public static final ic_trash_outline:I = 0x7f080387
+.field public static final ic_trash_outline:I = 0x7f080399
 
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
-.field public static final tooltip_frame_dark:I = 0x7f08044c
+.field public static final tooltip_frame_dark:I = 0x7f08046a
 
-.field public static final tooltip_frame_light:I = 0x7f08044d
+.field public static final tooltip_frame_light:I = 0x7f08046b
 
-.field public static final trash_bg:I = 0x7f08044e
+.field public static final trash_bg:I = 0x7f08046c
 
 
 # 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 e7bdec8667..7e97111bc9 100644
--- a/com.discord/smali/com/discord/overlay/R$d.smali
+++ b/com.discord/smali/com/discord/overlay/R$d.smali
@@ -123,191 +123,191 @@
 
 .field public static final alertTitle:I = 0x7f0a0061
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final buttonPanel:I = 0x7f0a010c
+.field public static final buttonPanel:I = 0x7f0a010d
 
-.field public static final checkbox:I = 0x7f0a0212
+.field public static final checkbox:I = 0x7f0a0213
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final content:I = 0x7f0a0232
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0233
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final custom:I = 0x7f0a0247
+.field public static final custom:I = 0x7f0a0250
 
-.field public static final customPanel:I = 0x7f0a0248
+.field public static final customPanel:I = 0x7f0a0251
 
-.field public static final decor_content_parent:I = 0x7f0a024c
+.field public static final decor_content_parent:I = 0x7f0a0255
 
-.field public static final default_activity_button:I = 0x7f0a024d
+.field public static final default_activity_button:I = 0x7f0a0256
 
-.field public static final dialog_button:I = 0x7f0a0253
+.field public static final dialog_button:I = 0x7f0a025c
 
-.field public static final edit_query:I = 0x7f0a02a3
+.field public static final edit_query:I = 0x7f0a02ac
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final expand_activities_button:I = 0x7f0a02c4
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02c5
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final group_divider:I = 0x7f0a0322
+.field public static final group_divider:I = 0x7f0a032b
 
-.field public static final home:I = 0x7f0a0382
+.field public static final home:I = 0x7f0a0392
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final image:I = 0x7f0a0388
+.field public static final image:I = 0x7f0a0398
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final listMode:I = 0x7f0a040d
+.field public static final listMode:I = 0x7f0a041d
 
-.field public static final list_item:I = 0x7f0a040e
+.field public static final list_item:I = 0x7f0a041e
 
-.field public static final message:I = 0x7f0a046f
+.field public static final message:I = 0x7f0a0482
 
-.field public static final multiply:I = 0x7f0a0477
+.field public static final multiply:I = 0x7f0a048a
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final parentPanel:I = 0x7f0a04c3
+.field public static final parentPanel:I = 0x7f0a04d9
 
-.field public static final progress_circular:I = 0x7f0a0543
+.field public static final progress_circular:I = 0x7f0a0553
 
-.field public static final progress_horizontal:I = 0x7f0a0545
+.field public static final progress_horizontal:I = 0x7f0a0555
 
-.field public static final radio:I = 0x7f0a0550
+.field public static final radio:I = 0x7f0a0560
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final screen:I = 0x7f0a059a
+.field public static final screen:I = 0x7f0a05b4
 
-.field public static final scrollIndicatorDown:I = 0x7f0a059c
+.field public static final scrollIndicatorDown:I = 0x7f0a05b6
 
-.field public static final scrollIndicatorUp:I = 0x7f0a059d
+.field public static final scrollIndicatorUp:I = 0x7f0a05b7
 
-.field public static final scrollView:I = 0x7f0a059e
+.field public static final scrollView:I = 0x7f0a05b8
 
-.field public static final search_badge:I = 0x7f0a05a2
+.field public static final search_badge:I = 0x7f0a05bc
 
-.field public static final search_bar:I = 0x7f0a05a3
+.field public static final search_bar:I = 0x7f0a05bd
 
-.field public static final search_button:I = 0x7f0a05a4
+.field public static final search_button:I = 0x7f0a05be
 
-.field public static final search_close_btn:I = 0x7f0a05a6
+.field public static final search_close_btn:I = 0x7f0a05c0
 
-.field public static final search_edit_frame:I = 0x7f0a05a7
+.field public static final search_edit_frame:I = 0x7f0a05c1
 
-.field public static final search_go_btn:I = 0x7f0a05aa
+.field public static final search_go_btn:I = 0x7f0a05c4
 
-.field public static final search_mag_icon:I = 0x7f0a05ac
+.field public static final search_mag_icon:I = 0x7f0a05c6
 
-.field public static final search_plate:I = 0x7f0a05ad
+.field public static final search_plate:I = 0x7f0a05c7
 
-.field public static final search_src_text:I = 0x7f0a05b0
+.field public static final search_src_text:I = 0x7f0a05ca
 
-.field public static final search_voice_btn:I = 0x7f0a05bc
+.field public static final search_voice_btn:I = 0x7f0a05d6
 
-.field public static final select_dialog_listview:I = 0x7f0a05bd
+.field public static final select_dialog_listview:I = 0x7f0a05d7
 
-.field public static final shortcut:I = 0x7f0a06f7
+.field public static final shortcut:I = 0x7f0a0711
 
-.field public static final spacer:I = 0x7f0a0703
+.field public static final spacer:I = 0x7f0a071d
 
-.field public static final split_action_bar:I = 0x7f0a0704
+.field public static final split_action_bar:I = 0x7f0a0724
 
-.field public static final src_atop:I = 0x7f0a0707
+.field public static final src_atop:I = 0x7f0a0727
 
-.field public static final src_in:I = 0x7f0a0708
+.field public static final src_in:I = 0x7f0a0728
 
-.field public static final src_over:I = 0x7f0a0709
+.field public static final src_over:I = 0x7f0a0729
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final submenuarrow:I = 0x7f0a0724
+.field public static final submenuarrow:I = 0x7f0a074d
 
-.field public static final submit_area:I = 0x7f0a0725
+.field public static final submit_area:I = 0x7f0a074e
 
-.field public static final tabMode:I = 0x7f0a0731
+.field public static final tabMode:I = 0x7f0a075a
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0732
+.field public static final tag_accessibility_actions:I = 0x7f0a075b
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0733
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a075c
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0734
+.field public static final tag_accessibility_heading:I = 0x7f0a075d
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0735
+.field public static final tag_accessibility_pane_title:I = 0x7f0a075e
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0736
+.field public static final tag_screen_reader_focusable:I = 0x7f0a075f
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0741
+.field public static final textSpacerNoButtons:I = 0x7f0a076a
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0742
+.field public static final textSpacerNoTitle:I = 0x7f0a076b
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0750
+.field public static final titleDividerNoCustom:I = 0x7f0a0779
 
-.field public static final title_template:I = 0x7f0a0751
+.field public static final title_template:I = 0x7f0a077a
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
-.field public static final topPanel:I = 0x7f0a0757
+.field public static final topPanel:I = 0x7f0a0780
 
-.field public static final trash_wrap_icon:I = 0x7f0a075f
+.field public static final trash_wrap_icon:I = 0x7f0a0788
 
-.field public static final trash_wrap_target_container:I = 0x7f0a0760
+.field public static final trash_wrap_target_container:I = 0x7f0a0789
 
-.field public static final trash_wrap_target_zone:I = 0x7f0a0761
+.field public static final trash_wrap_target_zone:I = 0x7f0a078a
 
-.field public static final uniform:I = 0x7f0a076a
+.field public static final uniform:I = 0x7f0a0793
 
-.field public static final up:I = 0x7f0a076d
+.field public static final up:I = 0x7f0a0796
 
-.field public static final wrap_content:I = 0x7f0a082e
+.field public static final wrap_content:I = 0x7f0a086b
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/overlay/R$e.smali b/com.discord/smali/com/discord/overlay/R$e.smali
index 82f4081560..df04a88274 100644
--- a/com.discord/smali/com/discord/overlay/R$e.smali
+++ b/com.discord/smali/com/discord/overlay/R$e.smali
@@ -73,27 +73,27 @@
 
 .field public static final custom_dialog:I = 0x7f0d0022
 
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
-.field public static final select_dialog_item_material:I = 0x7f0d005d
+.field public static final select_dialog_item_material:I = 0x7f0d005f
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d005e
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0060
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d005f
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d0061
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0066
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0069
 
-.field public static final trash_wrap:I = 0x7f0d0069
+.field public static final trash_wrap:I = 0x7f0d006c
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/overlay/b.smali b/com.discord/smali/com/discord/overlay/b.smali
index e4a3b93624..92bca63651 100644
--- a/com.discord/smali/com/discord/overlay/b.smali
+++ b/com.discord/smali/com/discord/overlay/b.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final xd:Lcom/discord/overlay/b;
+.field public static final xn:Lcom/discord/overlay/b;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/discord/overlay/b;-><init>()V
 
-    sput-object v0, Lcom/discord/overlay/b;->xd:Lcom/discord/overlay/b;
+    sput-object v0, Lcom/discord/overlay/b;->xn:Lcom/discord/overlay/b;
 
     return-void
 .end method
@@ -88,7 +88,7 @@
     return-object p1
 .end method
 
-.method public static dY()Landroid/view/WindowManager$LayoutParams;
+.method public static ea()Landroid/view/WindowManager$LayoutParams;
     .locals 7
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
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 14a2787e05..8574b41395 100644
--- a/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap$a.smali
+++ b/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap$a.smali
@@ -25,7 +25,7 @@
 # instance fields
 .field final synthetic $initialValue:Ljava/lang/Object;
 
-.field final synthetic xr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field final synthetic xB:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
 
 # direct methods
@@ -34,7 +34,7 @@
 
     iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->$initialValue:Ljava/lang/Object;
 
-    iput-object p3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->xr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->xB:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-direct {p0, p2}, Lkotlin/properties/b;-><init>(Ljava/lang/Object;)V
 
@@ -74,7 +74,7 @@
 
     if-eq p2, p1, :cond_2
 
-    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->xr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->xB:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-virtual {p2}, Lcom/discord/overlay/views/OverlayBubbleWrap;->getOnMovingStateChanged()Lkotlin/jvm/functions/Function1;
 
@@ -91,13 +91,13 @@
     :cond_0
     if-eqz p1, :cond_1
 
-    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->xr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->xB:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     const/4 p3, 0x1
 
     invoke-virtual {p2, p3}, Lcom/discord/overlay/views/OverlayBubbleWrap;->performHapticFeedback(I)Z
 
-    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->xr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->xB:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-virtual {p2}, Lcom/discord/overlay/views/OverlayBubbleWrap;->getSpringAnimationX()Landroidx/dynamicanimation/animation/SpringAnimation;
 
@@ -105,7 +105,7 @@
 
     invoke-virtual {p2}, Landroidx/dynamicanimation/animation/SpringAnimation;->cancel()V
 
-    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->xr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->xB:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-virtual {p2}, Lcom/discord/overlay/views/OverlayBubbleWrap;->getSpringAnimationY()Landroidx/dynamicanimation/animation/SpringAnimation;
 
@@ -114,7 +114,7 @@
     invoke-virtual {p2}, Landroidx/dynamicanimation/animation/SpringAnimation;->cancel()V
 
     :cond_1
-    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->xr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->xB:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-virtual {p2, p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;->setPressed(Z)V
 
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 978b63a666..90a1a5508a 100644
--- a/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap$b.smali
+++ b/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap$b.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic xr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field final synthetic xB:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
 
 # direct methods
 .method public constructor <init>(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$b;->xr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$b;->xB:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,7 +47,7 @@
 
     invoke-virtual {p1, p2}, Landroid/view/View;->removeOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$b;->xr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$b;->xB:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-static {p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;->i(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
 
diff --git a/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap.smali b/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap.smali
index 4e4cf9c667..c9873e3929 100644
--- a/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap.smali
+++ b/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap.smali
@@ -8,19 +8,21 @@
 
 
 # instance fields
-.field private final wT:Landroid/view/WindowManager;
+.field public xA:Landroid/graphics/Point;
 
-.field private xe:Landroid/view/WindowManager$LayoutParams;
+.field private final xd:Landroid/view/WindowManager;
 
-.field private final xf:Landroid/graphics/Rect;
+.field private xo:Landroid/view/WindowManager$LayoutParams;
 
-.field private final xg:I
+.field private final xp:Landroid/graphics/Rect;
 
-.field private final xh:Landroid/graphics/Rect;
+.field private final xq:I
 
-.field private final xi:Lkotlin/properties/ReadWriteProperty;
+.field private final xr:Landroid/graphics/Rect;
 
-.field private xj:Lkotlin/jvm/functions/Function1;
+.field private final xs:Lkotlin/properties/ReadWriteProperty;
+
+.field private xt:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -32,19 +34,17 @@
     .end annotation
 .end field
 
-.field private final xk:[I
+.field private final xu:[I
 
-.field private xl:I
+.field private xv:I
 
-.field private xm:I
+.field private xw:I
 
-.field private final xn:Landroidx/dynamicanimation/animation/SpringAnimation;
+.field private final xx:Landroidx/dynamicanimation/animation/SpringAnimation;
 
-.field private final xo:Landroidx/dynamicanimation/animation/SpringAnimation;
+.field private final xy:Landroidx/dynamicanimation/animation/SpringAnimation;
 
-.field public xp:Landroid/graphics/Point;
-
-.field public xq:Landroid/graphics/Point;
+.field public xz:Landroid/graphics/Point;
 
 
 # direct methods
@@ -107,11 +107,11 @@
 
     check-cast p1, Landroid/view/WindowManager;
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->wT:Landroid/view/WindowManager;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xd:Landroid/view/WindowManager;
 
-    sget-object p1, Lcom/discord/overlay/b;->xd:Lcom/discord/overlay/b;
+    sget-object p1, Lcom/discord/overlay/b;->xn:Lcom/discord/overlay/b;
 
-    invoke-static {}, Lcom/discord/overlay/b;->dY()Landroid/view/WindowManager$LayoutParams;
+    invoke-static {}, Lcom/discord/overlay/b;->ea()Landroid/view/WindowManager$LayoutParams;
 
     move-result-object p1
 
@@ -119,13 +119,13 @@
 
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->gravity:I
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     new-instance p1, Landroid/graphics/Rect;
 
     invoke-direct {p1}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xf:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Rect;
 
     invoke-virtual {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->getResources()Landroid/content/res/Resources;
 
@@ -137,7 +137,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xg:I
+    iput p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xq:I
 
     sget p1, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -162,7 +162,7 @@
 
     invoke-direct {p1}, Landroid/graphics/Rect;-><init>()V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->wT:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xd:Landroid/view/WindowManager;
 
     invoke-interface {v0}, Landroid/view/WindowManager;->getDefaultDisplay()Landroid/view/Display;
 
@@ -170,9 +170,9 @@
 
     invoke-virtual {v0, p1}, Landroid/view/Display;->getRectSize(Landroid/graphics/Rect;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xh:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xr:Landroid/graphics/Rect;
 
-    sget-object p1, Lkotlin/properties/a;->bkJ:Lkotlin/properties/a;
+    sget-object p1, Lkotlin/properties/a;->bld:Lkotlin/properties/a;
 
     sget-object p1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
@@ -182,13 +182,13 @@
 
     check-cast v0, Lkotlin/properties/ReadWriteProperty;
 
-    iput-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xi:Lkotlin/properties/ReadWriteProperty;
+    iput-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xs:Lkotlin/properties/ReadWriteProperty;
 
     const/4 p1, 0x2
 
     new-array p1, p1, [I
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xk:[I
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xu:[I
 
     new-instance p1, Landroidx/dynamicanimation/animation/SpringAnimation;
 
@@ -226,7 +226,7 @@
 
     invoke-virtual {v2, v5}, Landroidx/dynamicanimation/animation/SpringForce;->setDampingRatio(F)Landroidx/dynamicanimation/animation/SpringForce;
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xn:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xx:Landroidx/dynamicanimation/animation/SpringAnimation;
 
     new-instance p1, Landroidx/dynamicanimation/animation/SpringAnimation;
 
@@ -254,21 +254,21 @@
 
     invoke-virtual {v0, v4}, Landroidx/dynamicanimation/animation/SpringForce;->setStiffness(F)Landroidx/dynamicanimation/animation/SpringForce;
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xy:Landroidx/dynamicanimation/animation/SpringAnimation;
 
     new-instance p1, Landroid/graphics/Point;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     iget v0, v0, Landroid/view/WindowManager$LayoutParams;->x:I
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     iget v1, v1, Landroid/view/WindowManager$LayoutParams;->y:I
 
     invoke-direct {p1, v0, v1}, Landroid/graphics/Point;-><init>(II)V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     return-void
 
@@ -307,9 +307,9 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xn:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xx:Landroidx/dynamicanimation/animation/SpringAnimation;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     iget v1, v1, Landroid/view/WindowManager$LayoutParams;->x:I
 
@@ -337,9 +337,9 @@
 
     move-result p1
 
-    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xy:Landroidx/dynamicanimation/animation/SpringAnimation;
 
-    iget-object p3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object p3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     iget p3, p3, Landroid/view/WindowManager$LayoutParams;->y:I
 
@@ -355,11 +355,11 @@
 .method private final a(Landroid/graphics/Rect;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xh:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xr:Landroid/graphics/Rect;
 
     iget v1, p1, Landroid/graphics/Rect;->left:I
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xf:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Rect;
 
     iget v2, v2, Landroid/graphics/Rect;->left:I
 
@@ -369,7 +369,7 @@
 
     iget v1, p1, Landroid/graphics/Rect;->right:I
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xf:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Rect;
 
     iget v2, v2, Landroid/graphics/Rect;->right:I
 
@@ -379,7 +379,7 @@
 
     iget v1, p1, Landroid/graphics/Rect;->top:I
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xf:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Rect;
 
     iget v2, v2, Landroid/graphics/Rect;->top:I
 
@@ -389,7 +389,7 @@
 
     iget p1, p1, Landroid/graphics/Rect;->bottom:I
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xf:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Rect;
 
     iget v1, v1, Landroid/graphics/Rect;->bottom:I
 
@@ -419,27 +419,27 @@
 .method public static synthetic a(Lcom/discord/overlay/views/OverlayBubbleWrap;II)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xh:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xr:Landroid/graphics/Rect;
 
     invoke-direct {p0, p1, p2, v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->a(IILandroid/graphics/Rect;)V
 
     return-void
 .end method
 
-.method private final dZ()V
+.method private final eb()V
     .locals 4
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xk:[I
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xu:[I
 
     invoke-virtual {p0, v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->getLocationOnScreen([I)V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xk:[I
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xu:[I
 
     const/4 v1, 0x0
 
     aget v2, v0, v1
 
-    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     iget v3, v3, Landroid/view/WindowManager$LayoutParams;->x:I
 
@@ -447,13 +447,13 @@
 
     aput v2, v0, v1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xk:[I
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xu:[I
 
     const/4 v1, 0x1
 
     aget v2, v0, v1
 
-    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     iget v3, v3, Landroid/view/WindowManager$LayoutParams;->y:I
 
@@ -469,7 +469,7 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->r(Z)V
+    invoke-virtual {p0, v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->p(Z)V
 
     return-void
 .end method
@@ -477,7 +477,7 @@
 .method public static final synthetic i(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->dZ()V
+    invoke-direct {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->eb()V
 
     return-void
 .end method
@@ -491,7 +491,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/overlay/b;->xd:Lcom/discord/overlay/b;
+    sget-object v0, Lcom/discord/overlay/b;->xn:Lcom/discord/overlay/b;
 
     const/4 v0, 0x2
 
@@ -505,7 +505,7 @@
 
     aget v3, v1, v2
 
-    iget-object v4, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xk:[I
+    iget-object v4, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xu:[I
 
     aget v2, v4, v2
 
@@ -545,7 +545,7 @@
 
     invoke-direct {v1}, Landroid/graphics/Rect;-><init>()V
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->wT:Landroid/view/WindowManager;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xd:Landroid/view/WindowManager;
 
     invoke-interface {v2}, Landroid/view/WindowManager;->getDefaultDisplay()Landroid/view/Display;
 
@@ -573,7 +573,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -624,9 +624,9 @@
 
     if-nez v0, :cond_2
 
-    iget v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xl:I
+    iget v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xv:I
 
-    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     iget v3, v3, Landroid/view/WindowManager$LayoutParams;->x:I
 
@@ -644,7 +644,7 @@
 
     move-result v0
 
-    iget v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xg:I
+    iget v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xq:I
 
     if-le v0, v3, :cond_1
 
@@ -658,7 +658,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawX()F
 
@@ -666,13 +666,13 @@
 
     float-to-int v1, v1
 
-    iget v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xl:I
+    iget v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xv:I
 
     sub-int/2addr v1, v2
 
     iput v1, v0, Landroid/graphics/Point;->x:I
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
 
@@ -680,7 +680,7 @@
 
     float-to-int v1, v1
 
-    iget v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xm:I
+    iget v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xw:I
 
     sub-int/2addr v1, v2
 
@@ -696,29 +696,29 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xq:Landroid/graphics/Point;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xA:Landroid/graphics/Point;
 
     if-nez v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     iget v2, v2, Landroid/graphics/Point;->x:I
 
     iput v2, v1, Landroid/view/WindowManager$LayoutParams;->x:I
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     iget v2, v2, Landroid/graphics/Point;->y:I
 
     iput v2, v1, Landroid/view/WindowManager$LayoutParams;->y:I
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->wT:Landroid/view/WindowManager;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xd:Landroid/view/WindowManager;
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     check-cast v2, Landroid/view/ViewGroup$LayoutParams;
 
@@ -744,13 +744,13 @@
 
     float-to-int v0, v0
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     iget v1, v1, Landroid/view/WindowManager$LayoutParams;->x:I
 
     sub-int/2addr v0, v1
 
-    iput v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xl:I
+    iput v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xv:I
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
 
@@ -758,13 +758,13 @@
 
     float-to-int v0, v0
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     iget v1, v1, Landroid/view/WindowManager$LayoutParams;->y:I
 
     sub-int/2addr v0, v1
 
-    iput v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xm:I
+    iput v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xw:I
 
     :cond_5
     :goto_0
@@ -778,7 +778,7 @@
 .method protected final getAllowedAreaBounds()Landroid/graphics/Rect;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xh:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xr:Landroid/graphics/Rect;
 
     return-object v0
 .end method
@@ -786,7 +786,7 @@
 .method public final getCenterX()I
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     iget v0, v0, Landroid/view/WindowManager$LayoutParams;->x:I
 
@@ -804,7 +804,7 @@
 .method public final getCenterY()I
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     iget v0, v0, Landroid/view/WindowManager$LayoutParams;->y:I
 
@@ -822,7 +822,7 @@
 .method public final getInsetMargins()Landroid/graphics/Rect;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xf:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Rect;
 
     return-object v0
 .end method
@@ -830,7 +830,7 @@
 .method public final getMoveThresholdPx()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xg:I
+    iget v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xq:I
 
     return v0
 .end method
@@ -847,7 +847,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xj:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xt:Lkotlin/jvm/functions/Function1;
 
     return-object v0
 .end method
@@ -855,7 +855,7 @@
 .method public final getScreenOffset()[I
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xk:[I
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xu:[I
 
     return-object v0
 .end method
@@ -863,7 +863,7 @@
 .method protected final getSpringAnimationX()Landroidx/dynamicanimation/animation/SpringAnimation;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xn:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xx:Landroidx/dynamicanimation/animation/SpringAnimation;
 
     return-object v0
 .end method
@@ -871,7 +871,7 @@
 .method protected final getSpringAnimationY()Landroidx/dynamicanimation/animation/SpringAnimation;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xy:Landroidx/dynamicanimation/animation/SpringAnimation;
 
     return-object v0
 .end method
@@ -879,7 +879,7 @@
 .method public final getWindowLayoutParams()Landroid/view/WindowManager$LayoutParams;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     return-object v0
 .end method
@@ -887,7 +887,7 @@
 .method protected final getWindowManager()Landroid/view/WindowManager;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->wT:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xd:Landroid/view/WindowManager;
 
     return-object v0
 .end method
@@ -895,7 +895,7 @@
 .method public getX()F
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     iget v0, v0, Landroid/view/WindowManager$LayoutParams;->x:I
 
@@ -907,7 +907,7 @@
 .method public getY()F
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     iget v0, v0, Landroid/view/WindowManager$LayoutParams;->y:I
 
@@ -919,7 +919,7 @@
 .method public isMoving()Z
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xi:Lkotlin/properties/ReadWriteProperty;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xs:Lkotlin/properties/ReadWriteProperty;
 
     sget-object v1, Lcom/discord/overlay/views/OverlayBubbleWrap;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -945,17 +945,17 @@
 
     invoke-super {p0}, Landroid/widget/FrameLayout;->onAttachedToWindow()V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->wT:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xd:Landroid/view/WindowManager;
 
     invoke-interface {v0}, Landroid/view/WindowManager;->getDefaultDisplay()Landroid/view/Display;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xh:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xr:Landroid/graphics/Rect;
 
     invoke-virtual {v0, v1}, Landroid/view/Display;->getRectSize(Landroid/graphics/Rect;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xh:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xr:Landroid/graphics/Rect;
 
     invoke-direct {p0, v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->a(Landroid/graphics/Rect;)V
 
@@ -967,27 +967,27 @@
 
     invoke-super {p0, p1}, Landroid/widget/FrameLayout;->onConfigurationChanged(Landroid/content/res/Configuration;)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->wT:Landroid/view/WindowManager;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xd:Landroid/view/WindowManager;
 
     invoke-interface {p1}, Landroid/view/WindowManager;->getDefaultDisplay()Landroid/view/Display;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xh:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xr:Landroid/graphics/Rect;
 
     invoke-virtual {p1, v0}, Landroid/view/Display;->getRectSize(Landroid/graphics/Rect;)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xh:Landroid/graphics/Rect;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xr:Landroid/graphics/Rect;
 
     invoke-direct {p0, p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;->a(Landroid/graphics/Rect;)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->wT:Landroid/view/WindowManager;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xd:Landroid/view/WindowManager;
 
     move-object v0, p0
 
     check-cast v0, Landroid/view/View;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     check-cast v1, Landroid/view/ViewGroup$LayoutParams;
 
@@ -1005,7 +1005,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->dZ()V
+    invoke-direct {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->eb()V
 
     return-void
 
@@ -1057,13 +1057,13 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->dZ()V
+    invoke-direct {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->eb()V
 
     :cond_0
     return-void
 .end method
 
-.method public r(Z)V
+.method public p(Z)V
     .locals 3
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
@@ -1080,7 +1080,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xq:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xA:Landroid/graphics/Point;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1088,7 +1088,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1100,23 +1100,23 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xq:Landroid/graphics/Point;
+    iput-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xA:Landroid/graphics/Point;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xn:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xx:Landroidx/dynamicanimation/animation/SpringAnimation;
 
     invoke-virtual {v0}, Landroidx/dynamicanimation/animation/SpringAnimation;->cancel()V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xy:Landroidx/dynamicanimation/animation/SpringAnimation;
 
     invoke-virtual {v0}, Landroidx/dynamicanimation/animation/SpringAnimation;->cancel()V
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     iget p1, p1, Landroid/graphics/Point;->x:I
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     iget v0, v0, Landroid/graphics/Point;->y:I
 
@@ -1125,29 +1125,29 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     iget v0, v0, Landroid/graphics/Point;->x:I
 
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->x:I
 
-    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     iget v0, v0, Landroid/graphics/Point;->y:I
 
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->y:I
 
-    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->wT:Landroid/view/WindowManager;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xd:Landroid/view/WindowManager;
 
     move-object v0, p0
 
     check-cast v0, Landroid/view/View;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     check-cast v1, Landroid/view/ViewGroup$LayoutParams;
 
@@ -1163,7 +1163,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     invoke-virtual {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->getX()F
 
@@ -1173,7 +1173,7 @@
 
     iput v1, v0, Landroid/graphics/Point;->x:I
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     invoke-virtual {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->getY()F
 
@@ -1183,7 +1183,7 @@
 
     iput v1, v0, Landroid/graphics/Point;->y:I
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xq:Landroid/graphics/Point;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xA:Landroid/graphics/Point;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -1199,7 +1199,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xp:Landroid/graphics/Point;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xz:Landroid/graphics/Point;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1207,7 +1207,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xq:Landroid/graphics/Point;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xA:Landroid/graphics/Point;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1223,9 +1223,9 @@
 .method public final setBubbleTouchable(Z)V
     .locals 2
 
-    sget-object v0, Lcom/discord/overlay/b;->xd:Lcom/discord/overlay/b;
+    sget-object v0, Lcom/discord/overlay/b;->xn:Lcom/discord/overlay/b;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     const-string v1, "$this$setFlagTouchable"
 
@@ -1251,13 +1251,13 @@
     invoke-static {v0, p1}, Lcom/discord/overlay/b;->a(Landroid/view/WindowManager$LayoutParams;I)V
 
     :goto_0
-    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->wT:Landroid/view/WindowManager;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xd:Landroid/view/WindowManager;
 
     move-object v0, p0
 
     check-cast v0, Landroid/view/View;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     check-cast v1, Landroid/view/ViewGroup$LayoutParams;
 
@@ -1269,7 +1269,7 @@
 .method public setMoving(Z)V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xi:Lkotlin/properties/ReadWriteProperty;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xs:Lkotlin/properties/ReadWriteProperty;
 
     sget-object v1, Lcom/discord/overlay/views/OverlayBubbleWrap;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -1299,7 +1299,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xj:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xt:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -1311,7 +1311,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     return-void
 .end method
@@ -1319,7 +1319,7 @@
 .method public setX(F)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     float-to-int p1, p1
 
@@ -1335,9 +1335,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->wT:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xd:Landroid/view/WindowManager;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     check-cast v1, Landroid/view/ViewGroup$LayoutParams;
 
@@ -1350,7 +1350,7 @@
 .method public setY(F)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     float-to-int p1, p1
 
@@ -1366,9 +1366,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->wT:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xd:Landroid/view/WindowManager;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->xo:Landroid/view/WindowManager$LayoutParams;
 
     check-cast v1, Landroid/view/ViewGroup$LayoutParams;
 
diff --git a/com.discord/smali/com/discord/overlay/views/OverlayDialog.smali b/com.discord/smali/com/discord/overlay/views/OverlayDialog.smali
index fb50894b23..cdf0176e7c 100644
--- a/com.discord/smali/com/discord/overlay/views/OverlayDialog.smali
+++ b/com.discord/smali/com/discord/overlay/views/OverlayDialog.smali
@@ -29,7 +29,7 @@
 
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->y:I
 
-    sget-object v0, Lcom/discord/overlay/b;->xd:Lcom/discord/overlay/b;
+    sget-object v0, Lcom/discord/overlay/b;->xn:Lcom/discord/overlay/b;
 
     const/4 v0, 0x2
 
diff --git a/com.discord/smali/com/discord/overlay/views/a$a.smali b/com.discord/smali/com/discord/overlay/views/a$a.smali
index 4dd2fefc33..bc3d23aee7 100644
--- a/com.discord/smali/com/discord/overlay/views/a$a.smali
+++ b/com.discord/smali/com/discord/overlay/views/a$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic xA:Lcom/discord/overlay/views/a;
+.field final synthetic xK:Lcom/discord/overlay/views/a;
 
 
 # direct methods
 .method public constructor <init>(Lcom/discord/overlay/views/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a$a;->xA:Lcom/discord/overlay/views/a;
+    iput-object p1, p0, Lcom/discord/overlay/views/a$a;->xK:Lcom/discord/overlay/views/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -71,7 +71,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/a$a;->xA:Lcom/discord/overlay/views/a;
+    iget-object p1, p0, Lcom/discord/overlay/views/a$a;->xK:Lcom/discord/overlay/views/a;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali/com/discord/overlay/views/a$b.smali b/com.discord/smali/com/discord/overlay/views/a$b.smali
index 165bae4b6c..922e1186f4 100644
--- a/com.discord/smali/com/discord/overlay/views/a$b.smali
+++ b/com.discord/smali/com/discord/overlay/views/a$b.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic xA:Lcom/discord/overlay/views/a;
+.field final synthetic xK:Lcom/discord/overlay/views/a;
 
 
 # direct methods
 .method public constructor <init>(Lcom/discord/overlay/views/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a$b;->xA:Lcom/discord/overlay/views/a;
+    iput-object p1, p0, Lcom/discord/overlay/views/a$b;->xK:Lcom/discord/overlay/views/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,7 +51,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/a$b;->xA:Lcom/discord/overlay/views/a;
+    iget-object p1, p0, Lcom/discord/overlay/views/a$b;->xK:Lcom/discord/overlay/views/a;
 
     const/4 v0, 0x4
 
diff --git a/com.discord/smali/com/discord/overlay/views/a.smali b/com.discord/smali/com/discord/overlay/views/a.smali
index 70952f26ee..14bf777196 100644
--- a/com.discord/smali/com/discord/overlay/views/a.smali
+++ b/com.discord/smali/com/discord/overlay/views/a.smali
@@ -7,23 +7,23 @@
 
 
 # instance fields
-.field private xe:Landroid/view/WindowManager$LayoutParams;
+.field private final xC:Landroid/view/View;
 
-.field private final xs:Landroid/view/View;
+.field private final xD:Landroid/view/View;
 
-.field private final xt:Landroid/view/View;
+.field private final xE:Landroid/widget/ImageView;
 
-.field private final xu:Landroid/widget/ImageView;
+.field public final xF:Landroid/animation/Animator;
 
-.field public final xv:Landroid/animation/Animator;
+.field public final xG:Landroid/animation/Animator;
 
-.field public final xw:Landroid/animation/Animator;
+.field public final xH:Landroid/graphics/Rect;
 
-.field public final xx:Landroid/graphics/Rect;
+.field private final xI:[I
 
-.field private final xy:[I
+.field private xJ:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-.field private xz:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field private xo:Landroid/view/WindowManager$LayoutParams;
 
 
 # direct methods
@@ -36,9 +36,9 @@
 
     invoke-direct {p0, p1}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;)V
 
-    sget-object p1, Lcom/discord/overlay/b;->xd:Lcom/discord/overlay/b;
+    sget-object p1, Lcom/discord/overlay/b;->xn:Lcom/discord/overlay/b;
 
-    invoke-static {}, Lcom/discord/overlay/b;->dY()Landroid/view/WindowManager$LayoutParams;
+    invoke-static {}, Lcom/discord/overlay/b;->ea()Landroid/view/WindowManager$LayoutParams;
 
     move-result-object p1
 
@@ -50,13 +50,13 @@
 
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->gravity:I
 
-    sget-object v0, Lcom/discord/overlay/b;->xd:Lcom/discord/overlay/b;
+    sget-object v0, Lcom/discord/overlay/b;->xn:Lcom/discord/overlay/b;
 
     const/16 v0, 0x10
 
     invoke-static {p1, v0}, Lcom/discord/overlay/b;->a(Landroid/view/WindowManager$LayoutParams;I)V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->xe:Landroid/view/WindowManager$LayoutParams;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->xo:Landroid/view/WindowManager$LayoutParams;
 
     invoke-virtual {p0}, Lcom/discord/overlay/views/a;->getContext()Landroid/content/Context;
 
@@ -88,7 +88,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->xs:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->xC:Landroid/view/View;
 
     sget p1, Lcom/discord/overlay/R$d;->trash_wrap_target_container:I
 
@@ -100,7 +100,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->xt:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->xD:Landroid/view/View;
 
     sget p1, Lcom/discord/overlay/R$d;->trash_wrap_icon:I
 
@@ -114,7 +114,7 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->xu:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->xE:Landroid/widget/ImageView;
 
     new-instance p1, Landroid/animation/AnimatorSet;
 
@@ -150,7 +150,7 @@
 
     move-result-object v2
 
-    iget-object v4, p0, Lcom/discord/overlay/views/a;->xs:Landroid/view/View;
+    iget-object v4, p0, Lcom/discord/overlay/views/a;->xC:Landroid/view/View;
 
     invoke-virtual {v2, v4}, Landroid/animation/Animator;->setTarget(Ljava/lang/Object;)V
 
@@ -170,7 +170,7 @@
 
     invoke-virtual {p1, v1}, Landroid/animation/Animator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->xv:Landroid/animation/Animator;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->xF:Landroid/animation/Animator;
 
     new-instance p1, Landroid/animation/AnimatorSet;
 
@@ -202,7 +202,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/discord/overlay/views/a;->xs:Landroid/view/View;
+    iget-object v3, p0, Lcom/discord/overlay/views/a;->xC:Landroid/view/View;
 
     invoke-virtual {v2, v3}, Landroid/animation/Animator;->setTarget(Ljava/lang/Object;)V
 
@@ -220,19 +220,19 @@
 
     invoke-virtual {p1, v1}, Landroid/animation/Animator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->xw:Landroid/animation/Animator;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->xG:Landroid/animation/Animator;
 
     new-instance p1, Landroid/graphics/Rect;
 
     invoke-direct {p1}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->xx:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->xH:Landroid/graphics/Rect;
 
     new-array p1, v0, [I
 
     fill-array-data p1, :array_0
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->xy:[I
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->xI:[I
 
     return-void
 
@@ -268,7 +268,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v4, p0, Lcom/discord/overlay/views/a;->xt:Landroid/view/View;
+    iget-object v4, p0, Lcom/discord/overlay/views/a;->xD:Landroid/view/View;
 
     invoke-virtual {v4, v3}, Landroid/view/View;->setActivated(Z)V
 
@@ -284,7 +284,7 @@
 
     move-result v4
 
-    iget-object v5, p0, Lcom/discord/overlay/views/a;->xt:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->xD:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getWidth()I
 
@@ -296,7 +296,7 @@
 
     int-to-float v4, v4
 
-    iget-object v5, p0, Lcom/discord/overlay/views/a;->xt:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->xD:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getWidth()I
 
@@ -312,25 +312,25 @@
 
     new-instance v4, Landroid/view/animation/ScaleAnimation;
 
-    iget-object v5, p0, Lcom/discord/overlay/views/a;->xt:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->xD:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getScaleX()F
 
     move-result v7
 
-    iget-object v5, p0, Lcom/discord/overlay/views/a;->xt:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->xD:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getScaleY()F
 
     move-result v9
 
-    iget-object v5, p0, Lcom/discord/overlay/views/a;->xt:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->xD:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getPivotX()F
 
     move-result v11
 
-    iget-object v5, p0, Lcom/discord/overlay/views/a;->xt:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->xD:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getPivotY()F
 
@@ -354,7 +354,7 @@
 
     invoke-virtual {v4, v3}, Landroid/view/animation/ScaleAnimation;->setFillAfter(Z)V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/a;->xt:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->xD:Landroid/view/View;
 
     check-cast v4, Landroid/view/animation/Animation;
 
@@ -363,7 +363,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v4, p0, Lcom/discord/overlay/views/a;->xt:Landroid/view/View;
+    iget-object v4, p0, Lcom/discord/overlay/views/a;->xD:Landroid/view/View;
 
     invoke-virtual {v4, v2}, Landroid/view/View;->setActivated(Z)V
 
@@ -371,13 +371,13 @@
 
     new-instance v4, Landroid/view/animation/ScaleAnimation;
 
-    iget-object v5, p0, Lcom/discord/overlay/views/a;->xt:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->xD:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getScaleX()F
 
     move-result v5
 
-    iget-object v6, p0, Lcom/discord/overlay/views/a;->xt:Landroid/view/View;
+    iget-object v6, p0, Lcom/discord/overlay/views/a;->xD:Landroid/view/View;
 
     invoke-virtual {v6}, Landroid/view/View;->getScaleY()F
 
@@ -399,14 +399,14 @@
 
     invoke-virtual {v4, v3}, Landroid/view/animation/ScaleAnimation;->setFillAfter(Z)V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/a;->xt:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->xD:Landroid/view/View;
 
     check-cast v4, Landroid/view/animation/Animation;
 
     invoke-virtual {v0, v4}, Landroid/view/View;->startAnimation(Landroid/view/animation/Animation;)V
 
     :goto_0
-    iget-object v0, p0, Lcom/discord/overlay/views/a;->xz:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->xJ:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -418,7 +418,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/a;->xu:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->xE:Landroid/widget/ImageView;
 
     check-cast v0, Landroid/view/View;
 
@@ -436,14 +436,14 @@
     :cond_2
     invoke-virtual {p0, v2}, Lcom/discord/overlay/views/a;->performHapticFeedback(I)Z
 
-    iget-object v0, p0, Lcom/discord/overlay/views/a;->xz:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->xJ:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     if-eqz v0, :cond_3
 
     invoke-static {v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->h(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
 
     :cond_3
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->xz:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->xJ:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     :cond_4
     return-void
@@ -452,7 +452,7 @@
 .method protected final getHideAnimator()Landroid/animation/Animator;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/a;->xw:Landroid/animation/Animator;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->xG:Landroid/animation/Animator;
 
     return-object v0
 .end method
@@ -460,7 +460,7 @@
 .method protected final getShowAnimator()Landroid/animation/Animator;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/a;->xv:Landroid/animation/Animator;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->xF:Landroid/animation/Animator;
 
     return-object v0
 .end method
@@ -468,7 +468,7 @@
 .method public final getWindowLayoutParams()Landroid/view/WindowManager$LayoutParams;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/a;->xe:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->xo:Landroid/view/WindowManager$LayoutParams;
 
     return-object v0
 .end method
@@ -480,13 +480,13 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/overlay/views/a;->xs:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/overlay/views/a;->xC:Landroid/view/View;
 
-    iget-object p2, p0, Lcom/discord/overlay/views/a;->xy:[I
+    iget-object p2, p0, Lcom/discord/overlay/views/a;->xI:[I
 
     invoke-virtual {p1, p2}, Landroid/view/View;->getLocationOnScreen([I)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/a;->xy:[I
+    iget-object p1, p0, Lcom/discord/overlay/views/a;->xI:[I
 
     const/4 p2, 0x0
 
@@ -496,9 +496,9 @@
 
     aget p1, p1, p3
 
-    iget-object p3, p0, Lcom/discord/overlay/views/a;->xx:Landroid/graphics/Rect;
+    iget-object p3, p0, Lcom/discord/overlay/views/a;->xH:Landroid/graphics/Rect;
 
-    iget-object p4, p0, Lcom/discord/overlay/views/a;->xs:Landroid/view/View;
+    iget-object p4, p0, Lcom/discord/overlay/views/a;->xC:Landroid/view/View;
 
     invoke-virtual {p4}, Landroid/view/View;->getWidth()I
 
@@ -506,7 +506,7 @@
 
     add-int/2addr p4, p2
 
-    iget-object p5, p0, Lcom/discord/overlay/views/a;->xs:Landroid/view/View;
+    iget-object p5, p0, Lcom/discord/overlay/views/a;->xC:Landroid/view/View;
 
     invoke-virtual {p5}, Landroid/view/View;->getHeight()I
 
@@ -527,7 +527,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->xe:Landroid/view/WindowManager$LayoutParams;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->xo:Landroid/view/WindowManager$LayoutParams;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali b/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali
index 0079847b9a..dd0fa7b966 100644
--- a/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali
+++ b/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali
@@ -34,7 +34,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GL()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GA()Lokhttp3/w;
 
     move-result-object v0
 
@@ -42,7 +42,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lokhttp3/w;->GY()Lokhttp3/s;
+    invoke-virtual {v0}, Lokhttp3/w;->GM()Lokhttp3/s;
 
     move-result-object v0
 
@@ -102,7 +102,7 @@
 
     invoke-virtual {v2, v3, v1, v0}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GL()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GA()Lokhttp3/w;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/restapi/R$attr.smali b/com.discord/smali/com/discord/restapi/R$attr.smali
index 64a41df4dd..186b7d7a49 100644
--- a/com.discord/smali/com/discord/restapi/R$attr.smali
+++ b/com.discord/smali/com/discord/restapi/R$attr.smali
@@ -149,987 +149,987 @@
 
 .field public static final behavior_skipCollapsed:I = 0x7f04005a
 
-.field public static final borderWidth:I = 0x7f040064
+.field public static final borderWidth:I = 0x7f040065
 
-.field public static final borderlessButtonStyle:I = 0x7f040065
+.field public static final borderlessButtonStyle:I = 0x7f040066
 
-.field public static final bottomAppBarStyle:I = 0x7f040066
+.field public static final bottomAppBarStyle:I = 0x7f040067
 
-.field public static final bottomNavigationStyle:I = 0x7f040067
+.field public static final bottomNavigationStyle:I = 0x7f040068
 
-.field public static final bottomSheetDialogTheme:I = 0x7f040068
+.field public static final bottomSheetDialogTheme:I = 0x7f040069
 
-.field public static final bottomSheetStyle:I = 0x7f040069
+.field public static final bottomSheetStyle:I = 0x7f04006a
 
-.field public static final boxBackgroundColor:I = 0x7f04006a
+.field public static final boxBackgroundColor:I = 0x7f04006b
 
-.field public static final boxBackgroundMode:I = 0x7f04006b
+.field public static final boxBackgroundMode:I = 0x7f04006c
 
-.field public static final boxCollapsedPaddingTop:I = 0x7f04006c
+.field public static final boxCollapsedPaddingTop:I = 0x7f04006d
 
-.field public static final boxCornerRadiusBottomEnd:I = 0x7f04006d
+.field public static final boxCornerRadiusBottomEnd:I = 0x7f04006e
 
-.field public static final boxCornerRadiusBottomStart:I = 0x7f04006e
+.field public static final boxCornerRadiusBottomStart:I = 0x7f04006f
 
-.field public static final boxCornerRadiusTopEnd:I = 0x7f04006f
+.field public static final boxCornerRadiusTopEnd:I = 0x7f040070
 
-.field public static final boxCornerRadiusTopStart:I = 0x7f040070
+.field public static final boxCornerRadiusTopStart:I = 0x7f040071
 
-.field public static final boxStrokeColor:I = 0x7f040071
+.field public static final boxStrokeColor:I = 0x7f040072
 
-.field public static final boxStrokeWidth:I = 0x7f040072
+.field public static final boxStrokeWidth:I = 0x7f040073
 
-.field public static final buttonBarButtonStyle:I = 0x7f040074
+.field public static final buttonBarButtonStyle:I = 0x7f040075
 
-.field public static final buttonBarNegativeButtonStyle:I = 0x7f040075
+.field public static final buttonBarNegativeButtonStyle:I = 0x7f040076
 
-.field public static final buttonBarNeutralButtonStyle:I = 0x7f040076
+.field public static final buttonBarNeutralButtonStyle:I = 0x7f040077
 
-.field public static final buttonBarPositiveButtonStyle:I = 0x7f040077
+.field public static final buttonBarPositiveButtonStyle:I = 0x7f040078
 
-.field public static final buttonBarStyle:I = 0x7f040078
+.field public static final buttonBarStyle:I = 0x7f040079
 
-.field public static final buttonGravity:I = 0x7f040079
+.field public static final buttonGravity:I = 0x7f04007a
 
-.field public static final buttonIconDimen:I = 0x7f04007a
+.field public static final buttonIconDimen:I = 0x7f04007b
 
-.field public static final buttonPanelSideLayout:I = 0x7f04007b
+.field public static final buttonPanelSideLayout:I = 0x7f04007c
 
-.field public static final buttonSize:I = 0x7f04007c
+.field public static final buttonSize:I = 0x7f04007d
 
-.field public static final buttonStyle:I = 0x7f04007d
+.field public static final buttonStyle:I = 0x7f04007e
 
-.field public static final buttonStyleSmall:I = 0x7f04007e
+.field public static final buttonStyleSmall:I = 0x7f04007f
 
-.field public static final buttonTint:I = 0x7f04007f
+.field public static final buttonTint:I = 0x7f040080
 
-.field public static final buttonTintMode:I = 0x7f040080
+.field public static final buttonTintMode:I = 0x7f040081
 
-.field public static final cardBackgroundColor:I = 0x7f040081
+.field public static final cardBackgroundColor:I = 0x7f040082
 
-.field public static final cardCornerRadius:I = 0x7f040082
+.field public static final cardCornerRadius:I = 0x7f040083
 
-.field public static final cardElevation:I = 0x7f040083
+.field public static final cardElevation:I = 0x7f040084
 
-.field public static final cardMaxElevation:I = 0x7f040084
+.field public static final cardMaxElevation:I = 0x7f040085
 
-.field public static final cardPreventCornerOverlap:I = 0x7f040085
+.field public static final cardPreventCornerOverlap:I = 0x7f040086
 
-.field public static final cardUseCompatPadding:I = 0x7f040086
+.field public static final cardUseCompatPadding:I = 0x7f040087
 
-.field public static final cardViewStyle:I = 0x7f040087
+.field public static final cardViewStyle:I = 0x7f040088
 
-.field public static final checkboxStyle:I = 0x7f04008c
+.field public static final checkboxStyle:I = 0x7f04008d
 
-.field public static final checkedChip:I = 0x7f04008d
+.field public static final checkedChip:I = 0x7f04008e
 
-.field public static final checkedIcon:I = 0x7f04008e
+.field public static final checkedIcon:I = 0x7f04008f
 
-.field public static final checkedIconEnabled:I = 0x7f04008f
+.field public static final checkedIconEnabled:I = 0x7f040090
 
-.field public static final checkedIconVisible:I = 0x7f040090
+.field public static final checkedIconVisible:I = 0x7f040091
 
-.field public static final checkedTextViewStyle:I = 0x7f040091
+.field public static final checkedTextViewStyle:I = 0x7f040092
 
-.field public static final chipBackgroundColor:I = 0x7f040092
+.field public static final chipBackgroundColor:I = 0x7f040093
 
-.field public static final chipCornerRadius:I = 0x7f040093
+.field public static final chipCornerRadius:I = 0x7f040094
 
-.field public static final chipEndPadding:I = 0x7f040094
+.field public static final chipEndPadding:I = 0x7f040095
 
-.field public static final chipGroupStyle:I = 0x7f040095
+.field public static final chipGroupStyle:I = 0x7f040096
 
-.field public static final chipIcon:I = 0x7f040096
+.field public static final chipIcon:I = 0x7f040097
 
-.field public static final chipIconEnabled:I = 0x7f040097
+.field public static final chipIconEnabled:I = 0x7f040098
 
-.field public static final chipIconSize:I = 0x7f040098
+.field public static final chipIconSize:I = 0x7f040099
 
-.field public static final chipIconTint:I = 0x7f040099
+.field public static final chipIconTint:I = 0x7f04009a
 
-.field public static final chipIconVisible:I = 0x7f04009a
+.field public static final chipIconVisible:I = 0x7f04009b
 
-.field public static final chipMinHeight:I = 0x7f04009b
+.field public static final chipMinHeight:I = 0x7f04009c
 
-.field public static final chipSpacing:I = 0x7f04009c
+.field public static final chipSpacing:I = 0x7f04009d
 
-.field public static final chipSpacingHorizontal:I = 0x7f04009d
+.field public static final chipSpacingHorizontal:I = 0x7f04009e
 
-.field public static final chipSpacingVertical:I = 0x7f04009e
+.field public static final chipSpacingVertical:I = 0x7f04009f
 
-.field public static final chipStandaloneStyle:I = 0x7f04009f
+.field public static final chipStandaloneStyle:I = 0x7f0400a0
 
-.field public static final chipStartPadding:I = 0x7f0400a0
+.field public static final chipStartPadding:I = 0x7f0400a1
 
-.field public static final chipStrokeColor:I = 0x7f0400a1
+.field public static final chipStrokeColor:I = 0x7f0400a2
 
-.field public static final chipStrokeWidth:I = 0x7f0400a2
+.field public static final chipStrokeWidth:I = 0x7f0400a3
 
-.field public static final chipStyle:I = 0x7f0400a3
+.field public static final chipStyle:I = 0x7f0400a4
 
-.field public static final circleCrop:I = 0x7f0400a4
+.field public static final circleCrop:I = 0x7f0400a5
 
-.field public static final closeIcon:I = 0x7f0400a5
+.field public static final closeIcon:I = 0x7f0400a6
 
-.field public static final closeIconEnabled:I = 0x7f0400a6
+.field public static final closeIconEnabled:I = 0x7f0400a7
 
-.field public static final closeIconEndPadding:I = 0x7f0400a7
+.field public static final closeIconEndPadding:I = 0x7f0400a8
 
-.field public static final closeIconSize:I = 0x7f0400a8
+.field public static final closeIconSize:I = 0x7f0400a9
 
-.field public static final closeIconStartPadding:I = 0x7f0400a9
+.field public static final closeIconStartPadding:I = 0x7f0400aa
 
-.field public static final closeIconTint:I = 0x7f0400aa
+.field public static final closeIconTint:I = 0x7f0400ab
 
-.field public static final closeIconVisible:I = 0x7f0400ab
+.field public static final closeIconVisible:I = 0x7f0400ac
 
-.field public static final closeItemLayout:I = 0x7f0400ac
+.field public static final closeItemLayout:I = 0x7f0400ad
 
-.field public static final collapseContentDescription:I = 0x7f0400ad
+.field public static final collapseContentDescription:I = 0x7f0400ae
 
-.field public static final collapseIcon:I = 0x7f0400ae
+.field public static final collapseIcon:I = 0x7f0400af
 
-.field public static final collapsedTitleGravity:I = 0x7f0400af
+.field public static final collapsedTitleGravity:I = 0x7f0400b0
 
-.field public static final collapsedTitleTextAppearance:I = 0x7f0400b0
+.field public static final collapsedTitleTextAppearance:I = 0x7f0400b1
 
-.field public static final color:I = 0x7f0400b1
+.field public static final color:I = 0x7f0400b2
 
-.field public static final colorAccent:I = 0x7f0400b2
+.field public static final colorAccent:I = 0x7f0400b3
 
-.field public static final colorBackgroundFloating:I = 0x7f0400b3
+.field public static final colorBackgroundFloating:I = 0x7f0400b4
 
-.field public static final colorButtonNormal:I = 0x7f0400b4
+.field public static final colorButtonNormal:I = 0x7f0400b5
 
-.field public static final colorControlActivated:I = 0x7f0400b5
+.field public static final colorControlActivated:I = 0x7f0400b6
 
-.field public static final colorControlHighlight:I = 0x7f0400b6
+.field public static final colorControlHighlight:I = 0x7f0400b7
 
-.field public static final colorControlNormal:I = 0x7f0400b7
+.field public static final colorControlNormal:I = 0x7f0400b8
 
-.field public static final colorError:I = 0x7f0400b8
+.field public static final colorError:I = 0x7f0400b9
 
-.field public static final colorPrimary:I = 0x7f0400b9
+.field public static final colorPrimary:I = 0x7f0400ba
 
-.field public static final colorPrimaryDark:I = 0x7f0400bc
+.field public static final colorPrimaryDark:I = 0x7f0400bd
 
-.field public static final colorScheme:I = 0x7f0400bf
+.field public static final colorScheme:I = 0x7f0400c0
 
-.field public static final colorSecondary:I = 0x7f0400c0
+.field public static final colorSecondary:I = 0x7f0400c1
 
-.field public static final colorSwitchThumbNormal:I = 0x7f0400c1
+.field public static final colorSwitchThumbNormal:I = 0x7f0400c2
 
-.field public static final commitIcon:I = 0x7f0400c2
+.field public static final commitIcon:I = 0x7f0400c3
 
-.field public static final contentDescription:I = 0x7f0400c7
+.field public static final contentDescription:I = 0x7f0400c8
 
-.field public static final contentInsetEnd:I = 0x7f0400c8
+.field public static final contentInsetEnd:I = 0x7f0400c9
 
-.field public static final contentInsetEndWithActions:I = 0x7f0400c9
+.field public static final contentInsetEndWithActions:I = 0x7f0400ca
 
-.field public static final contentInsetLeft:I = 0x7f0400ca
+.field public static final contentInsetLeft:I = 0x7f0400cb
 
-.field public static final contentInsetRight:I = 0x7f0400cb
+.field public static final contentInsetRight:I = 0x7f0400cc
 
-.field public static final contentInsetStart:I = 0x7f0400cc
+.field public static final contentInsetStart:I = 0x7f0400cd
 
-.field public static final contentInsetStartWithNavigation:I = 0x7f0400cd
+.field public static final contentInsetStartWithNavigation:I = 0x7f0400ce
 
-.field public static final contentPadding:I = 0x7f0400ce
+.field public static final contentPadding:I = 0x7f0400cf
 
-.field public static final contentPaddingBottom:I = 0x7f0400cf
+.field public static final contentPaddingBottom:I = 0x7f0400d0
 
-.field public static final contentPaddingLeft:I = 0x7f0400d0
+.field public static final contentPaddingLeft:I = 0x7f0400d1
 
-.field public static final contentPaddingRight:I = 0x7f0400d1
+.field public static final contentPaddingRight:I = 0x7f0400d2
 
-.field public static final contentPaddingTop:I = 0x7f0400d2
+.field public static final contentPaddingTop:I = 0x7f0400d3
 
-.field public static final contentScrim:I = 0x7f0400d3
+.field public static final contentScrim:I = 0x7f0400d4
 
-.field public static final controlBackground:I = 0x7f0400d4
+.field public static final controlBackground:I = 0x7f0400d5
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final cornerRadius:I = 0x7f0400d6
+.field public static final cornerRadius:I = 0x7f0400d7
 
-.field public static final counterEnabled:I = 0x7f0400d7
+.field public static final counterEnabled:I = 0x7f0400d8
 
-.field public static final counterMaxLength:I = 0x7f0400d8
+.field public static final counterMaxLength:I = 0x7f0400d9
 
-.field public static final counterOverflowTextAppearance:I = 0x7f0400d9
+.field public static final counterOverflowTextAppearance:I = 0x7f0400da
 
-.field public static final counterTextAppearance:I = 0x7f0400da
+.field public static final counterTextAppearance:I = 0x7f0400db
 
-.field public static final customNavigationLayout:I = 0x7f0400e9
+.field public static final customNavigationLayout:I = 0x7f0400ea
 
-.field public static final cv_bg_color:I = 0x7f0400ea
+.field public static final cv_bg_color:I = 0x7f0400eb
 
-.field public static final cv_bg_color_clicked:I = 0x7f0400eb
+.field public static final cv_bg_color_clicked:I = 0x7f0400ec
 
-.field public static final cv_bg_color_error_clicked:I = 0x7f0400ec
+.field public static final cv_bg_color_error_clicked:I = 0x7f0400ed
 
-.field public static final cv_chip_layout:I = 0x7f0400ed
+.field public static final cv_chip_layout:I = 0x7f0400ee
 
-.field public static final cv_color:I = 0x7f0400ee
+.field public static final cv_color:I = 0x7f0400ef
 
-.field public static final cv_color_clicked:I = 0x7f0400ef
+.field public static final cv_color_clicked:I = 0x7f0400f0
 
-.field public static final cv_color_error_clicked:I = 0x7f0400f0
+.field public static final cv_color_error_clicked:I = 0x7f0400f1
 
-.field public static final cv_dialog_cancel:I = 0x7f0400f1
+.field public static final cv_dialog_cancel:I = 0x7f0400f2
 
-.field public static final cv_dialog_confirm:I = 0x7f0400f2
+.field public static final cv_dialog_confirm:I = 0x7f0400f3
 
-.field public static final cv_dialog_error_msg:I = 0x7f0400f3
+.field public static final cv_dialog_error_msg:I = 0x7f0400f4
 
-.field public static final cv_dialog_et_placeholder:I = 0x7f0400f4
+.field public static final cv_dialog_et_placeholder:I = 0x7f0400f5
 
-.field public static final cv_dialog_title:I = 0x7f0400f5
+.field public static final cv_dialog_title:I = 0x7f0400f6
 
-.field public static final cv_icon_delete:I = 0x7f0400f6
+.field public static final cv_icon_delete:I = 0x7f0400f7
 
-.field public static final cv_icon_placeholder:I = 0x7f0400f7
+.field public static final cv_icon_placeholder:I = 0x7f0400f8
 
-.field public static final cv_max_height:I = 0x7f0400f8
+.field public static final cv_max_height:I = 0x7f0400f9
 
-.field public static final cv_search_text_color:I = 0x7f0400f9
+.field public static final cv_search_text_color:I = 0x7f0400fa
 
-.field public static final cv_search_text_size:I = 0x7f0400fa
+.field public static final cv_search_text_size:I = 0x7f0400fb
 
-.field public static final cv_text_color:I = 0x7f0400fb
+.field public static final cv_text_color:I = 0x7f0400fc
 
-.field public static final cv_text_color_clicked:I = 0x7f0400fc
+.field public static final cv_text_color_clicked:I = 0x7f0400fd
 
-.field public static final cv_text_color_error_clicked:I = 0x7f0400fd
+.field public static final cv_text_color_error_clicked:I = 0x7f0400fe
 
-.field public static final cv_vertical_spacing:I = 0x7f0400fe
+.field public static final cv_vertical_spacing:I = 0x7f0400ff
 
-.field public static final defaultQueryHint:I = 0x7f0400ff
+.field public static final defaultQueryHint:I = 0x7f040100
 
-.field public static final dialogCornerRadius:I = 0x7f040100
+.field public static final dialogCornerRadius:I = 0x7f040101
 
-.field public static final dialogPreferredPadding:I = 0x7f040101
+.field public static final dialogPreferredPadding:I = 0x7f040102
 
-.field public static final dialogTheme:I = 0x7f040102
+.field public static final dialogTheme:I = 0x7f040103
 
-.field public static final displayOptions:I = 0x7f040103
+.field public static final displayOptions:I = 0x7f040104
 
-.field public static final divider:I = 0x7f040104
+.field public static final divider:I = 0x7f040105
 
-.field public static final dividerDrawable:I = 0x7f040105
+.field public static final dividerDrawable:I = 0x7f040106
 
-.field public static final dividerDrawableHorizontal:I = 0x7f040106
+.field public static final dividerDrawableHorizontal:I = 0x7f040107
 
-.field public static final dividerDrawableVertical:I = 0x7f040107
+.field public static final dividerDrawableVertical:I = 0x7f040108
 
-.field public static final dividerHorizontal:I = 0x7f040108
+.field public static final dividerHorizontal:I = 0x7f040109
 
-.field public static final dividerPadding:I = 0x7f040109
+.field public static final dividerPadding:I = 0x7f04010a
 
-.field public static final dividerVertical:I = 0x7f04010a
+.field public static final dividerVertical:I = 0x7f04010b
 
-.field public static final drawableSize:I = 0x7f04010b
+.field public static final drawableSize:I = 0x7f04010c
 
-.field public static final drawerArrowStyle:I = 0x7f04010c
+.field public static final drawerArrowStyle:I = 0x7f04010d
 
-.field public static final dropDownListViewStyle:I = 0x7f04010d
+.field public static final dropDownListViewStyle:I = 0x7f04010f
 
-.field public static final dropdownListPreferredItemHeight:I = 0x7f04010e
+.field public static final dropdownListPreferredItemHeight:I = 0x7f040110
 
-.field public static final editTextBackground:I = 0x7f04010f
+.field public static final editTextBackground:I = 0x7f040111
 
-.field public static final editTextColor:I = 0x7f040110
+.field public static final editTextColor:I = 0x7f040112
 
-.field public static final editTextStyle:I = 0x7f040111
+.field public static final editTextStyle:I = 0x7f040113
 
-.field public static final elevation:I = 0x7f040112
+.field public static final elevation:I = 0x7f040114
 
-.field public static final enforceMaterialTheme:I = 0x7f040114
+.field public static final enforceMaterialTheme:I = 0x7f040116
 
-.field public static final enforceTextAppearance:I = 0x7f040115
+.field public static final enforceTextAppearance:I = 0x7f040117
 
-.field public static final errorEnabled:I = 0x7f040116
+.field public static final errorEnabled:I = 0x7f040118
 
-.field public static final errorTextAppearance:I = 0x7f040117
+.field public static final errorTextAppearance:I = 0x7f040119
 
-.field public static final expandActivityOverflowButtonDrawable:I = 0x7f040118
+.field public static final expandActivityOverflowButtonDrawable:I = 0x7f04011a
 
-.field public static final expanded:I = 0x7f040119
+.field public static final expanded:I = 0x7f04011b
 
-.field public static final expandedTitleGravity:I = 0x7f04011a
+.field public static final expandedTitleGravity:I = 0x7f04011c
 
-.field public static final expandedTitleMargin:I = 0x7f04011b
+.field public static final expandedTitleMargin:I = 0x7f04011d
 
-.field public static final expandedTitleMarginBottom:I = 0x7f04011c
+.field public static final expandedTitleMarginBottom:I = 0x7f04011e
 
-.field public static final expandedTitleMarginEnd:I = 0x7f04011d
+.field public static final expandedTitleMarginEnd:I = 0x7f04011f
 
-.field public static final expandedTitleMarginStart:I = 0x7f04011e
+.field public static final expandedTitleMarginStart:I = 0x7f040120
 
-.field public static final expandedTitleMarginTop:I = 0x7f04011f
+.field public static final expandedTitleMarginTop:I = 0x7f040121
 
-.field public static final expandedTitleTextAppearance:I = 0x7f040120
+.field public static final expandedTitleTextAppearance:I = 0x7f040122
 
-.field public static final fabAlignmentMode:I = 0x7f040121
+.field public static final fabAlignmentMode:I = 0x7f040123
 
-.field public static final fabCradleMargin:I = 0x7f040122
+.field public static final fabCradleMargin:I = 0x7f040124
 
-.field public static final fabCradleRoundedCornerRadius:I = 0x7f040123
+.field public static final fabCradleRoundedCornerRadius:I = 0x7f040125
 
-.field public static final fabCradleVerticalOffset:I = 0x7f040124
+.field public static final fabCradleVerticalOffset:I = 0x7f040126
 
-.field public static final fabCustomSize:I = 0x7f040125
+.field public static final fabCustomSize:I = 0x7f040127
 
-.field public static final fabSize:I = 0x7f040126
+.field public static final fabSize:I = 0x7f040128
 
-.field public static final fadeDuration:I = 0x7f040128
+.field public static final fadeDuration:I = 0x7f04012a
 
-.field public static final failureImage:I = 0x7f040129
+.field public static final failureImage:I = 0x7f04012b
 
-.field public static final failureImageScaleType:I = 0x7f04012a
+.field public static final failureImageScaleType:I = 0x7f04012c
 
-.field public static final fastScrollEnabled:I = 0x7f04012b
+.field public static final fastScrollEnabled:I = 0x7f04012d
 
-.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f04012c
+.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f04012e
 
-.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f04012d
+.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f04012f
 
-.field public static final fastScrollVerticalThumbDrawable:I = 0x7f04012e
+.field public static final fastScrollVerticalThumbDrawable:I = 0x7f040130
 
-.field public static final fastScrollVerticalTrackDrawable:I = 0x7f04012f
+.field public static final fastScrollVerticalTrackDrawable:I = 0x7f040131
 
-.field public static final fgl_max_linear_views:I = 0x7f040130
+.field public static final fgl_max_linear_views:I = 0x7f040132
 
-.field public static final firstBaselineToTopHeight:I = 0x7f040131
+.field public static final firstBaselineToTopHeight:I = 0x7f040133
 
-.field public static final flexDirection:I = 0x7f040135
+.field public static final flexDirection:I = 0x7f040137
 
-.field public static final flexWrap:I = 0x7f04013c
+.field public static final flexWrap:I = 0x7f04013e
 
-.field public static final floatingActionButtonStyle:I = 0x7f04013d
+.field public static final floatingActionButtonStyle:I = 0x7f04013f
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontFamily:I = 0x7f04013f
+.field public static final fontFamily:I = 0x7f040141
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final foregroundInsidePadding:I = 0x7f040149
+.field public static final foregroundInsidePadding:I = 0x7f04014b
 
-.field public static final gapBetweenBars:I = 0x7f04014a
+.field public static final gapBetweenBars:I = 0x7f04014c
 
-.field public static final goIcon:I = 0x7f04014f
+.field public static final goIcon:I = 0x7f040151
 
-.field public static final headerLayout:I = 0x7f040155
+.field public static final headerLayout:I = 0x7f040157
 
-.field public static final height:I = 0x7f040156
+.field public static final height:I = 0x7f040158
 
-.field public static final helperText:I = 0x7f040157
+.field public static final helperText:I = 0x7f040159
 
-.field public static final helperTextEnabled:I = 0x7f040158
+.field public static final helperTextEnabled:I = 0x7f04015a
 
-.field public static final helperTextTextAppearance:I = 0x7f040159
+.field public static final helperTextTextAppearance:I = 0x7f04015b
 
-.field public static final hideMotionSpec:I = 0x7f04015a
+.field public static final hideMotionSpec:I = 0x7f04015c
 
-.field public static final hideOnContentScroll:I = 0x7f04015b
+.field public static final hideOnContentScroll:I = 0x7f04015d
 
-.field public static final hideOnScroll:I = 0x7f04015c
+.field public static final hideOnScroll:I = 0x7f04015e
 
-.field public static final hintAnimationEnabled:I = 0x7f04015e
+.field public static final hintAnimationEnabled:I = 0x7f040160
 
-.field public static final hintEnabled:I = 0x7f040160
+.field public static final hintEnabled:I = 0x7f040162
 
-.field public static final hintTextAppearance:I = 0x7f040161
+.field public static final hintTextAppearance:I = 0x7f040163
 
-.field public static final homeAsUpIndicator:I = 0x7f040162
+.field public static final homeAsUpIndicator:I = 0x7f040164
 
-.field public static final homeLayout:I = 0x7f040163
+.field public static final homeLayout:I = 0x7f040165
 
-.field public static final hoveredFocusedTranslationZ:I = 0x7f040164
+.field public static final hoveredFocusedTranslationZ:I = 0x7f040166
 
-.field public static final icon:I = 0x7f0401c7
+.field public static final icon:I = 0x7f0401c9
 
-.field public static final iconEndPadding:I = 0x7f0401c8
+.field public static final iconEndPadding:I = 0x7f0401ca
 
-.field public static final iconGravity:I = 0x7f0401c9
+.field public static final iconGravity:I = 0x7f0401cb
 
-.field public static final iconPadding:I = 0x7f0401ca
+.field public static final iconPadding:I = 0x7f0401cc
 
-.field public static final iconSize:I = 0x7f0401cb
+.field public static final iconSize:I = 0x7f0401cd
 
-.field public static final iconStartPadding:I = 0x7f0401cc
+.field public static final iconStartPadding:I = 0x7f0401ce
 
-.field public static final iconTint:I = 0x7f0401cd
+.field public static final iconTint:I = 0x7f0401cf
 
-.field public static final iconTintMode:I = 0x7f0401ce
+.field public static final iconTintMode:I = 0x7f0401d0
 
-.field public static final iconifiedByDefault:I = 0x7f0401cf
+.field public static final iconifiedByDefault:I = 0x7f0401d1
 
-.field public static final imageAspectRatio:I = 0x7f0401d0
+.field public static final imageAspectRatio:I = 0x7f0401d2
 
-.field public static final imageAspectRatioAdjust:I = 0x7f0401d1
+.field public static final imageAspectRatioAdjust:I = 0x7f0401d3
 
-.field public static final imageButtonStyle:I = 0x7f0401d2
+.field public static final imageButtonStyle:I = 0x7f0401d4
 
-.field public static final indeterminateProgressStyle:I = 0x7f0401ea
+.field public static final indeterminateProgressStyle:I = 0x7f0401ec
 
-.field public static final initialActivityCount:I = 0x7f0401eb
+.field public static final initialActivityCount:I = 0x7f0401ed
 
-.field public static final insetForeground:I = 0x7f0401ec
+.field public static final insetForeground:I = 0x7f0401ee
 
-.field public static final isLightTheme:I = 0x7f0401ed
+.field public static final isLightTheme:I = 0x7f0401ef
 
-.field public static final itemBackground:I = 0x7f0401ee
+.field public static final itemBackground:I = 0x7f0401f0
 
-.field public static final itemHorizontalPadding:I = 0x7f0401ef
+.field public static final itemHorizontalPadding:I = 0x7f0401f1
 
-.field public static final itemHorizontalTranslationEnabled:I = 0x7f0401f0
+.field public static final itemHorizontalTranslationEnabled:I = 0x7f0401f2
 
-.field public static final itemIconPadding:I = 0x7f0401f1
+.field public static final itemIconPadding:I = 0x7f0401f3
 
-.field public static final itemIconSize:I = 0x7f0401f2
+.field public static final itemIconSize:I = 0x7f0401f4
 
-.field public static final itemIconTint:I = 0x7f0401f3
+.field public static final itemIconTint:I = 0x7f0401f5
 
-.field public static final itemPadding:I = 0x7f0401f4
+.field public static final itemPadding:I = 0x7f0401f6
 
-.field public static final itemSpacing:I = 0x7f0401f5
+.field public static final itemSpacing:I = 0x7f0401f7
 
-.field public static final itemTextAppearance:I = 0x7f0401f6
+.field public static final itemTextAppearance:I = 0x7f0401f8
 
-.field public static final itemTextAppearanceActive:I = 0x7f0401f7
+.field public static final itemTextAppearanceActive:I = 0x7f0401f9
 
-.field public static final itemTextAppearanceInactive:I = 0x7f0401f8
+.field public static final itemTextAppearanceInactive:I = 0x7f0401fa
 
-.field public static final itemTextColor:I = 0x7f0401f9
+.field public static final itemTextColor:I = 0x7f0401fb
 
-.field public static final justifyContent:I = 0x7f0401fa
+.field public static final justifyContent:I = 0x7f0401fc
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final labelVisibilityMode:I = 0x7f0401fc
+.field public static final labelVisibilityMode:I = 0x7f0401fe
 
-.field public static final lastBaselineToBottomHeight:I = 0x7f0401fd
+.field public static final lastBaselineToBottomHeight:I = 0x7f0401ff
 
-.field public static final layout:I = 0x7f0401fe
+.field public static final layout:I = 0x7f040200
 
-.field public static final layoutManager:I = 0x7f0401ff
+.field public static final layoutManager:I = 0x7f040201
 
-.field public static final layout_alignSelf:I = 0x7f040200
+.field public static final layout_alignSelf:I = 0x7f040202
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_collapseMode:I = 0x7f040204
+.field public static final layout_collapseMode:I = 0x7f040206
 
-.field public static final layout_collapseParallaxMultiplier:I = 0x7f040205
+.field public static final layout_collapseParallaxMultiplier:I = 0x7f040207
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_flexBasisPercent:I = 0x7f040232
+.field public static final layout_flexBasisPercent:I = 0x7f040234
 
-.field public static final layout_flexGrow:I = 0x7f040233
+.field public static final layout_flexGrow:I = 0x7f040235
 
-.field public static final layout_flexShrink:I = 0x7f040234
+.field public static final layout_flexShrink:I = 0x7f040236
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final layout_maxHeight:I = 0x7f04023d
+.field public static final layout_maxHeight:I = 0x7f04023f
 
-.field public static final layout_maxWidth:I = 0x7f04023e
+.field public static final layout_maxWidth:I = 0x7f040240
 
-.field public static final layout_minHeight:I = 0x7f04023f
+.field public static final layout_minHeight:I = 0x7f040241
 
-.field public static final layout_minWidth:I = 0x7f040240
+.field public static final layout_minWidth:I = 0x7f040242
 
-.field public static final layout_order:I = 0x7f040242
+.field public static final layout_order:I = 0x7f040244
 
-.field public static final layout_scrollFlags:I = 0x7f040243
+.field public static final layout_scrollFlags:I = 0x7f040245
 
-.field public static final layout_scrollInterpolator:I = 0x7f040244
+.field public static final layout_scrollInterpolator:I = 0x7f040246
 
-.field public static final layout_wrapBefore:I = 0x7f040245
+.field public static final layout_wrapBefore:I = 0x7f040247
 
-.field public static final liftOnScroll:I = 0x7f040249
+.field public static final liftOnScroll:I = 0x7f04024c
 
-.field public static final lineHeight:I = 0x7f04024a
+.field public static final lineHeight:I = 0x7f04024d
 
-.field public static final lineSpacing:I = 0x7f04024b
+.field public static final lineSpacing:I = 0x7f04024e
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04024c
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04024f
 
-.field public static final listDividerAlertDialog:I = 0x7f04024d
+.field public static final listDividerAlertDialog:I = 0x7f040250
 
-.field public static final listItemLayout:I = 0x7f04024e
+.field public static final listItemLayout:I = 0x7f040251
 
-.field public static final listLayout:I = 0x7f04024f
+.field public static final listLayout:I = 0x7f040252
 
-.field public static final listMenuViewStyle:I = 0x7f040250
+.field public static final listMenuViewStyle:I = 0x7f040253
 
-.field public static final listPopupWindowStyle:I = 0x7f040251
+.field public static final listPopupWindowStyle:I = 0x7f040254
 
-.field public static final listPreferredItemHeight:I = 0x7f040252
+.field public static final listPreferredItemHeight:I = 0x7f040255
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040253
+.field public static final listPreferredItemHeightLarge:I = 0x7f040256
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040254
+.field public static final listPreferredItemHeightSmall:I = 0x7f040257
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040255
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040258
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040256
+.field public static final listPreferredItemPaddingRight:I = 0x7f040259
 
-.field public static final logo:I = 0x7f040257
+.field public static final logo:I = 0x7f04025a
 
-.field public static final logoDescription:I = 0x7f040258
+.field public static final logoDescription:I = 0x7f04025b
 
-.field public static final materialButtonStyle:I = 0x7f040268
+.field public static final materialButtonStyle:I = 0x7f04026b
 
-.field public static final materialCardViewStyle:I = 0x7f040269
+.field public static final materialCardViewStyle:I = 0x7f04026c
 
-.field public static final maxActionInlineWidth:I = 0x7f04026a
+.field public static final maxActionInlineWidth:I = 0x7f04026d
 
-.field public static final maxButtonHeight:I = 0x7f04026b
+.field public static final maxButtonHeight:I = 0x7f04026e
 
-.field public static final maxImageSize:I = 0x7f04026c
+.field public static final maxImageSize:I = 0x7f04026f
 
-.field public static final max_height:I = 0x7f04026d
+.field public static final max_height:I = 0x7f040270
 
-.field public static final measureWithLargestChild:I = 0x7f04026e
+.field public static final measureWithLargestChild:I = 0x7f040271
 
-.field public static final menu:I = 0x7f04026f
+.field public static final menu:I = 0x7f040272
 
-.field public static final multiChoiceItemLayout:I = 0x7f040270
+.field public static final multiChoiceItemLayout:I = 0x7f040273
 
-.field public static final navigationContentDescription:I = 0x7f040271
+.field public static final navigationContentDescription:I = 0x7f040274
 
-.field public static final navigationIcon:I = 0x7f040272
+.field public static final navigationIcon:I = 0x7f040275
 
-.field public static final navigationMode:I = 0x7f040273
+.field public static final navigationMode:I = 0x7f040276
 
-.field public static final navigationViewStyle:I = 0x7f040274
+.field public static final navigationViewStyle:I = 0x7f040277
 
-.field public static final numericModifiers:I = 0x7f040277
+.field public static final numericModifiers:I = 0x7f04027a
 
-.field public static final overlapAnchor:I = 0x7f040278
+.field public static final overlapAnchor:I = 0x7f04027b
 
-.field public static final overlayImage:I = 0x7f040279
+.field public static final overlayImage:I = 0x7f04027c
 
-.field public static final paddingBottomNoButtons:I = 0x7f04027c
+.field public static final paddingBottomNoButtons:I = 0x7f04027f
 
-.field public static final paddingEnd:I = 0x7f04027d
+.field public static final paddingEnd:I = 0x7f040280
 
-.field public static final paddingStart:I = 0x7f04027e
+.field public static final paddingStart:I = 0x7f040281
 
-.field public static final paddingTopNoTitle:I = 0x7f04027f
+.field public static final paddingTopNoTitle:I = 0x7f040282
 
-.field public static final panelBackground:I = 0x7f040280
+.field public static final panelBackground:I = 0x7f040283
 
-.field public static final panelMenuListTheme:I = 0x7f040281
+.field public static final panelMenuListTheme:I = 0x7f040284
 
-.field public static final panelMenuListWidth:I = 0x7f040282
+.field public static final panelMenuListWidth:I = 0x7f040285
 
-.field public static final passwordToggleContentDescription:I = 0x7f040283
+.field public static final passwordToggleContentDescription:I = 0x7f040286
 
-.field public static final passwordToggleDrawable:I = 0x7f040284
+.field public static final passwordToggleDrawable:I = 0x7f040287
 
-.field public static final passwordToggleEnabled:I = 0x7f040285
+.field public static final passwordToggleEnabled:I = 0x7f040288
 
-.field public static final passwordToggleTint:I = 0x7f040286
+.field public static final passwordToggleTint:I = 0x7f040289
 
-.field public static final passwordToggleTintMode:I = 0x7f040287
+.field public static final passwordToggleTintMode:I = 0x7f04028a
 
-.field public static final placeholderImage:I = 0x7f040288
+.field public static final placeholderImage:I = 0x7f04028b
 
-.field public static final placeholderImageScaleType:I = 0x7f040289
+.field public static final placeholderImageScaleType:I = 0x7f04028c
 
-.field public static final popupMenuStyle:I = 0x7f04028a
+.field public static final popupMenuStyle:I = 0x7f04028d
 
-.field public static final popupTheme:I = 0x7f04028b
+.field public static final popupTheme:I = 0x7f04028e
 
-.field public static final popupWindowStyle:I = 0x7f04028c
+.field public static final popupWindowStyle:I = 0x7f04028f
 
-.field public static final preserveIconSpacing:I = 0x7f04028d
+.field public static final preserveIconSpacing:I = 0x7f040290
 
-.field public static final pressedStateOverlayImage:I = 0x7f04028e
+.field public static final pressedStateOverlayImage:I = 0x7f040291
 
-.field public static final pressedTranslationZ:I = 0x7f04028f
+.field public static final pressedTranslationZ:I = 0x7f040292
 
-.field public static final progressBarAutoRotateInterval:I = 0x7f0402b6
+.field public static final progressBarAutoRotateInterval:I = 0x7f0402b9
 
-.field public static final progressBarImage:I = 0x7f0402b7
+.field public static final progressBarImage:I = 0x7f0402ba
 
-.field public static final progressBarImageScaleType:I = 0x7f0402b8
+.field public static final progressBarImageScaleType:I = 0x7f0402bb
 
-.field public static final progressBarPadding:I = 0x7f0402b9
+.field public static final progressBarPadding:I = 0x7f0402bc
 
-.field public static final progressBarStyle:I = 0x7f0402ba
+.field public static final progressBarStyle:I = 0x7f0402bd
 
-.field public static final queryBackground:I = 0x7f0402bd
+.field public static final queryBackground:I = 0x7f0402c0
 
-.field public static final queryHint:I = 0x7f0402be
+.field public static final queryHint:I = 0x7f0402c1
 
-.field public static final radioButtonStyle:I = 0x7f0402bf
+.field public static final radioButtonStyle:I = 0x7f0402c2
 
-.field public static final ratingBarStyle:I = 0x7f0402c2
+.field public static final ratingBarStyle:I = 0x7f0402c5
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402c3
+.field public static final ratingBarStyleIndicator:I = 0x7f0402c6
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402c4
+.field public static final ratingBarStyleSmall:I = 0x7f0402c7
 
-.field public static final retryImage:I = 0x7f0402c5
+.field public static final retryImage:I = 0x7f0402c8
 
-.field public static final retryImageScaleType:I = 0x7f0402c6
+.field public static final retryImageScaleType:I = 0x7f0402c9
 
-.field public static final reverseLayout:I = 0x7f0402c7
+.field public static final reverseLayout:I = 0x7f0402ca
 
-.field public static final rippleColor:I = 0x7f0402c8
+.field public static final rippleColor:I = 0x7f0402cb
 
-.field public static final roundAsCircle:I = 0x7f0402c9
+.field public static final roundAsCircle:I = 0x7f0402cc
 
-.field public static final roundBottomEnd:I = 0x7f0402ca
+.field public static final roundBottomEnd:I = 0x7f0402cd
 
-.field public static final roundBottomLeft:I = 0x7f0402cb
+.field public static final roundBottomLeft:I = 0x7f0402ce
 
-.field public static final roundBottomRight:I = 0x7f0402cc
+.field public static final roundBottomRight:I = 0x7f0402cf
 
-.field public static final roundBottomStart:I = 0x7f0402cd
+.field public static final roundBottomStart:I = 0x7f0402d0
 
-.field public static final roundTopEnd:I = 0x7f0402ce
+.field public static final roundTopEnd:I = 0x7f0402d1
 
-.field public static final roundTopLeft:I = 0x7f0402cf
+.field public static final roundTopLeft:I = 0x7f0402d2
 
-.field public static final roundTopRight:I = 0x7f0402d0
+.field public static final roundTopRight:I = 0x7f0402d3
 
-.field public static final roundTopStart:I = 0x7f0402d1
+.field public static final roundTopStart:I = 0x7f0402d4
 
-.field public static final roundWithOverlayColor:I = 0x7f0402d2
+.field public static final roundWithOverlayColor:I = 0x7f0402d5
 
-.field public static final roundedCornerRadius:I = 0x7f0402d3
+.field public static final roundedCornerRadius:I = 0x7f0402d6
 
-.field public static final roundingBorderColor:I = 0x7f0402d4
+.field public static final roundingBorderColor:I = 0x7f0402d7
 
-.field public static final roundingBorderPadding:I = 0x7f0402d5
+.field public static final roundingBorderPadding:I = 0x7f0402d8
 
-.field public static final roundingBorderWidth:I = 0x7f0402d6
+.field public static final roundingBorderWidth:I = 0x7f0402d9
 
-.field public static final scopeUris:I = 0x7f0402e5
+.field public static final scopeUris:I = 0x7f0402e8
 
-.field public static final scrimAnimationDuration:I = 0x7f0402e6
+.field public static final scrimAnimationDuration:I = 0x7f0402e9
 
-.field public static final scrimBackground:I = 0x7f0402e7
+.field public static final scrimBackground:I = 0x7f0402ea
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f0402e8
+.field public static final scrimVisibleHeightTrigger:I = 0x7f0402eb
 
-.field public static final searchHintIcon:I = 0x7f0402e9
+.field public static final searchHintIcon:I = 0x7f0402ec
 
-.field public static final searchIcon:I = 0x7f0402ea
+.field public static final searchIcon:I = 0x7f0402ed
 
-.field public static final searchViewStyle:I = 0x7f0402eb
+.field public static final searchViewStyle:I = 0x7f0402ee
 
-.field public static final seekBarStyle:I = 0x7f0402ed
+.field public static final seekBarStyle:I = 0x7f0402f0
 
-.field public static final selectableItemBackground:I = 0x7f0402ee
+.field public static final selectableItemBackground:I = 0x7f0402f1
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ef
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402f2
 
-.field public static final showAsAction:I = 0x7f0402f1
+.field public static final showAsAction:I = 0x7f0402f4
 
-.field public static final showDivider:I = 0x7f0402f2
+.field public static final showDivider:I = 0x7f0402f5
 
-.field public static final showDividerHorizontal:I = 0x7f0402f3
+.field public static final showDividerHorizontal:I = 0x7f0402f6
 
-.field public static final showDividerVertical:I = 0x7f0402f4
+.field public static final showDividerVertical:I = 0x7f0402f7
 
-.field public static final showDividers:I = 0x7f0402f5
+.field public static final showDividers:I = 0x7f0402f8
 
-.field public static final showMotionSpec:I = 0x7f0402f6
+.field public static final showMotionSpec:I = 0x7f0402f9
 
-.field public static final showText:I = 0x7f0402f7
+.field public static final showText:I = 0x7f0402fa
 
-.field public static final showTitle:I = 0x7f0402f8
+.field public static final showTitle:I = 0x7f0402fb
 
-.field public static final singleChoiceItemLayout:I = 0x7f0402f9
+.field public static final singleChoiceItemLayout:I = 0x7f0402fc
 
-.field public static final singleLine:I = 0x7f0402fa
+.field public static final singleLine:I = 0x7f0402fd
 
-.field public static final singleSelection:I = 0x7f0402fb
+.field public static final singleSelection:I = 0x7f0402fe
 
-.field public static final snackbarButtonStyle:I = 0x7f0402fc
+.field public static final snackbarButtonStyle:I = 0x7f0402ff
 
-.field public static final snackbarStyle:I = 0x7f0402fd
+.field public static final snackbarStyle:I = 0x7f040300
 
-.field public static final spanCount:I = 0x7f0402fe
+.field public static final spanCount:I = 0x7f040301
 
-.field public static final spinBars:I = 0x7f0402ff
+.field public static final spinBars:I = 0x7f040302
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f040300
+.field public static final spinnerDropDownItemStyle:I = 0x7f040303
 
-.field public static final spinnerStyle:I = 0x7f040301
+.field public static final spinnerStyle:I = 0x7f040304
 
-.field public static final splitTrack:I = 0x7f040302
+.field public static final splitTrack:I = 0x7f040305
 
-.field public static final srcCompat:I = 0x7f040303
+.field public static final srcCompat:I = 0x7f040306
 
-.field public static final stackFromEnd:I = 0x7f040304
+.field public static final stackFromEnd:I = 0x7f040307
 
-.field public static final state_above_anchor:I = 0x7f040305
+.field public static final state_above_anchor:I = 0x7f040308
 
-.field public static final state_collapsed:I = 0x7f040306
+.field public static final state_collapsed:I = 0x7f040309
 
-.field public static final state_collapsible:I = 0x7f040307
+.field public static final state_collapsible:I = 0x7f04030a
 
-.field public static final state_liftable:I = 0x7f040308
+.field public static final state_liftable:I = 0x7f04030b
 
-.field public static final state_lifted:I = 0x7f040309
+.field public static final state_lifted:I = 0x7f04030c
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final statusBarScrim:I = 0x7f04030b
+.field public static final statusBarScrim:I = 0x7f04030e
 
-.field public static final strokeColor:I = 0x7f04030f
+.field public static final strokeColor:I = 0x7f040312
 
-.field public static final strokeWidth:I = 0x7f040310
+.field public static final strokeWidth:I = 0x7f040313
 
-.field public static final subMenuArrow:I = 0x7f040311
+.field public static final subMenuArrow:I = 0x7f040314
 
-.field public static final submitBackground:I = 0x7f040312
+.field public static final submitBackground:I = 0x7f040315
 
-.field public static final subtitle:I = 0x7f040313
+.field public static final subtitle:I = 0x7f040316
 
-.field public static final subtitleTextAppearance:I = 0x7f040314
+.field public static final subtitleTextAppearance:I = 0x7f040317
 
-.field public static final subtitleTextColor:I = 0x7f040315
+.field public static final subtitleTextColor:I = 0x7f040318
 
-.field public static final subtitleTextStyle:I = 0x7f040316
+.field public static final subtitleTextStyle:I = 0x7f040319
 
-.field public static final suggestionRowLayout:I = 0x7f040317
+.field public static final suggestionRowLayout:I = 0x7f04031a
 
-.field public static final switchMinWidth:I = 0x7f040318
+.field public static final switchMinWidth:I = 0x7f04031b
 
-.field public static final switchPadding:I = 0x7f040319
+.field public static final switchPadding:I = 0x7f04031c
 
-.field public static final switchStyle:I = 0x7f04031a
+.field public static final switchStyle:I = 0x7f04031d
 
-.field public static final switchTextAppearance:I = 0x7f04031b
+.field public static final switchTextAppearance:I = 0x7f04031e
 
-.field public static final tabBackground:I = 0x7f04031c
+.field public static final tabBackground:I = 0x7f04031f
 
-.field public static final tabContentStart:I = 0x7f04031d
+.field public static final tabContentStart:I = 0x7f040320
 
-.field public static final tabGravity:I = 0x7f04031e
+.field public static final tabGravity:I = 0x7f040321
 
-.field public static final tabIconTint:I = 0x7f04031f
+.field public static final tabIconTint:I = 0x7f040322
 
-.field public static final tabIconTintMode:I = 0x7f040320
+.field public static final tabIconTintMode:I = 0x7f040323
 
-.field public static final tabIndicator:I = 0x7f040321
+.field public static final tabIndicator:I = 0x7f040324
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f040322
+.field public static final tabIndicatorAnimationDuration:I = 0x7f040325
 
-.field public static final tabIndicatorColor:I = 0x7f040323
+.field public static final tabIndicatorColor:I = 0x7f040326
 
-.field public static final tabIndicatorFullWidth:I = 0x7f040324
+.field public static final tabIndicatorFullWidth:I = 0x7f040327
 
-.field public static final tabIndicatorGravity:I = 0x7f040325
+.field public static final tabIndicatorGravity:I = 0x7f040328
 
-.field public static final tabIndicatorHeight:I = 0x7f040326
+.field public static final tabIndicatorHeight:I = 0x7f040329
 
-.field public static final tabInlineLabel:I = 0x7f040327
+.field public static final tabInlineLabel:I = 0x7f04032a
 
-.field public static final tabMaxWidth:I = 0x7f040328
+.field public static final tabMaxWidth:I = 0x7f04032b
 
-.field public static final tabMinWidth:I = 0x7f040329
+.field public static final tabMinWidth:I = 0x7f04032c
 
-.field public static final tabMode:I = 0x7f04032a
+.field public static final tabMode:I = 0x7f04032d
 
-.field public static final tabPadding:I = 0x7f04032b
+.field public static final tabPadding:I = 0x7f04032e
 
-.field public static final tabPaddingBottom:I = 0x7f04032c
+.field public static final tabPaddingBottom:I = 0x7f04032f
 
-.field public static final tabPaddingEnd:I = 0x7f04032d
+.field public static final tabPaddingEnd:I = 0x7f040330
 
-.field public static final tabPaddingStart:I = 0x7f04032e
+.field public static final tabPaddingStart:I = 0x7f040331
 
-.field public static final tabPaddingTop:I = 0x7f04032f
+.field public static final tabPaddingTop:I = 0x7f040332
 
-.field public static final tabRippleColor:I = 0x7f040330
+.field public static final tabRippleColor:I = 0x7f040333
 
-.field public static final tabSelectedTextColor:I = 0x7f040331
+.field public static final tabSelectedTextColor:I = 0x7f040334
 
-.field public static final tabStyle:I = 0x7f040332
+.field public static final tabStyle:I = 0x7f040335
 
-.field public static final tabTextAppearance:I = 0x7f040333
+.field public static final tabTextAppearance:I = 0x7f040336
 
-.field public static final tabTextColor:I = 0x7f040334
+.field public static final tabTextColor:I = 0x7f040337
 
-.field public static final tabUnboundedRipple:I = 0x7f040335
+.field public static final tabUnboundedRipple:I = 0x7f040338
 
-.field public static final textAllCaps:I = 0x7f040339
+.field public static final textAllCaps:I = 0x7f04033c
 
-.field public static final textAppearanceBody1:I = 0x7f04033a
+.field public static final textAppearanceBody1:I = 0x7f04033d
 
-.field public static final textAppearanceBody2:I = 0x7f04033b
+.field public static final textAppearanceBody2:I = 0x7f04033e
 
-.field public static final textAppearanceButton:I = 0x7f04033c
+.field public static final textAppearanceButton:I = 0x7f04033f
 
-.field public static final textAppearanceCaption:I = 0x7f04033d
+.field public static final textAppearanceCaption:I = 0x7f040340
 
-.field public static final textAppearanceHeadline1:I = 0x7f04033e
+.field public static final textAppearanceHeadline1:I = 0x7f040341
 
-.field public static final textAppearanceHeadline2:I = 0x7f04033f
+.field public static final textAppearanceHeadline2:I = 0x7f040342
 
-.field public static final textAppearanceHeadline3:I = 0x7f040340
+.field public static final textAppearanceHeadline3:I = 0x7f040343
 
-.field public static final textAppearanceHeadline4:I = 0x7f040341
+.field public static final textAppearanceHeadline4:I = 0x7f040344
 
-.field public static final textAppearanceHeadline5:I = 0x7f040342
+.field public static final textAppearanceHeadline5:I = 0x7f040345
 
-.field public static final textAppearanceHeadline6:I = 0x7f040343
+.field public static final textAppearanceHeadline6:I = 0x7f040346
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040344
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040347
 
-.field public static final textAppearanceListItem:I = 0x7f040345
+.field public static final textAppearanceListItem:I = 0x7f040348
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040346
+.field public static final textAppearanceListItemSecondary:I = 0x7f040349
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040347
+.field public static final textAppearanceListItemSmall:I = 0x7f04034a
 
-.field public static final textAppearanceOverline:I = 0x7f040348
+.field public static final textAppearanceOverline:I = 0x7f04034b
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040349
+.field public static final textAppearancePopupMenuHeader:I = 0x7f04034c
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04034a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04034d
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04034b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04034e
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04034c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04034f
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04034d
+.field public static final textAppearanceSubtitle1:I = 0x7f040350
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04034e
+.field public static final textAppearanceSubtitle2:I = 0x7f040351
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04034f
+.field public static final textColorAlertDialogListItem:I = 0x7f040352
 
-.field public static final textColorSearchUrl:I = 0x7f040350
+.field public static final textColorSearchUrl:I = 0x7f040353
 
-.field public static final textEndPadding:I = 0x7f040351
+.field public static final textEndPadding:I = 0x7f040354
 
-.field public static final textInputStyle:I = 0x7f040352
+.field public static final textInputStyle:I = 0x7f040355
 
-.field public static final textStartPadding:I = 0x7f040353
+.field public static final textStartPadding:I = 0x7f040356
 
-.field public static final theme:I = 0x7f040355
+.field public static final theme:I = 0x7f040358
 
-.field public static final thickness:I = 0x7f0403a6
+.field public static final thickness:I = 0x7f0403a9
 
-.field public static final thumbTextPadding:I = 0x7f0403a7
+.field public static final thumbTextPadding:I = 0x7f0403aa
 
-.field public static final thumbTint:I = 0x7f0403a8
+.field public static final thumbTint:I = 0x7f0403ab
 
-.field public static final thumbTintMode:I = 0x7f0403a9
+.field public static final thumbTintMode:I = 0x7f0403ac
 
-.field public static final tickMark:I = 0x7f0403aa
+.field public static final tickMark:I = 0x7f0403ad
 
-.field public static final tickMarkTint:I = 0x7f0403ab
+.field public static final tickMarkTint:I = 0x7f0403ae
 
-.field public static final tickMarkTintMode:I = 0x7f0403ac
+.field public static final tickMarkTintMode:I = 0x7f0403af
 
-.field public static final tint:I = 0x7f0403ad
+.field public static final tint:I = 0x7f0403b0
 
-.field public static final tintMode:I = 0x7f0403ae
+.field public static final tintMode:I = 0x7f0403b1
 
-.field public static final title:I = 0x7f0403af
+.field public static final title:I = 0x7f0403b2
 
-.field public static final titleEnabled:I = 0x7f0403b0
+.field public static final titleEnabled:I = 0x7f0403b3
 
-.field public static final titleMargin:I = 0x7f0403b1
+.field public static final titleMargin:I = 0x7f0403b4
 
-.field public static final titleMarginBottom:I = 0x7f0403b2
+.field public static final titleMarginBottom:I = 0x7f0403b5
 
-.field public static final titleMarginEnd:I = 0x7f0403b3
+.field public static final titleMarginEnd:I = 0x7f0403b6
 
-.field public static final titleMarginStart:I = 0x7f0403b4
+.field public static final titleMarginStart:I = 0x7f0403b7
 
-.field public static final titleMarginTop:I = 0x7f0403b5
+.field public static final titleMarginTop:I = 0x7f0403b8
 
-.field public static final titleMargins:I = 0x7f0403b6
+.field public static final titleMargins:I = 0x7f0403b9
 
-.field public static final titleTextAppearance:I = 0x7f0403b7
+.field public static final titleTextAppearance:I = 0x7f0403ba
 
-.field public static final titleTextColor:I = 0x7f0403b8
+.field public static final titleTextColor:I = 0x7f0403bb
 
-.field public static final titleTextStyle:I = 0x7f0403b9
+.field public static final titleTextStyle:I = 0x7f0403bc
 
-.field public static final toolbarId:I = 0x7f0403ba
+.field public static final toolbarId:I = 0x7f0403bd
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f0403bb
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0403be
 
-.field public static final toolbarStyle:I = 0x7f0403bc
+.field public static final toolbarStyle:I = 0x7f0403bf
 
-.field public static final tooltipForegroundColor:I = 0x7f0403bd
+.field public static final tooltipForegroundColor:I = 0x7f0403c0
 
-.field public static final tooltipFrameBackground:I = 0x7f0403be
+.field public static final tooltipFrameBackground:I = 0x7f0403c1
 
-.field public static final tooltipText:I = 0x7f0403bf
+.field public static final tooltipText:I = 0x7f0403c2
 
-.field public static final track:I = 0x7f0403c0
+.field public static final track:I = 0x7f0403c3
 
-.field public static final trackTint:I = 0x7f0403c1
+.field public static final trackTint:I = 0x7f0403c4
 
-.field public static final trackTintMode:I = 0x7f0403c2
+.field public static final trackTintMode:I = 0x7f0403c5
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
-.field public static final useCompatPadding:I = 0x7f0403d7
+.field public static final useCompatPadding:I = 0x7f0403da
 
-.field public static final viewAspectRatio:I = 0x7f0403db
+.field public static final viewAspectRatio:I = 0x7f0403e0
 
-.field public static final viewInflaterClass:I = 0x7f0403dc
+.field public static final viewInflaterClass:I = 0x7f0403e1
 
-.field public static final voiceIcon:I = 0x7f0403dd
+.field public static final voiceIcon:I = 0x7f0403e2
 
-.field public static final windowActionBar:I = 0x7f0403df
+.field public static final windowActionBar:I = 0x7f0403e4
 
-.field public static final windowActionBarOverlay:I = 0x7f0403e0
+.field public static final windowActionBarOverlay:I = 0x7f0403e5
 
-.field public static final windowActionModeOverlay:I = 0x7f0403e1
+.field public static final windowActionModeOverlay:I = 0x7f0403e6
 
-.field public static final windowFixedHeightMajor:I = 0x7f0403e2
+.field public static final windowFixedHeightMajor:I = 0x7f0403e7
 
-.field public static final windowFixedHeightMinor:I = 0x7f0403e3
+.field public static final windowFixedHeightMinor:I = 0x7f0403e8
 
-.field public static final windowFixedWidthMajor:I = 0x7f0403e4
+.field public static final windowFixedWidthMajor:I = 0x7f0403e9
 
-.field public static final windowFixedWidthMinor:I = 0x7f0403e5
+.field public static final windowFixedWidthMinor:I = 0x7f0403ea
 
-.field public static final windowMinWidthMajor:I = 0x7f0403e6
+.field public static final windowMinWidthMajor:I = 0x7f0403eb
 
-.field public static final windowMinWidthMinor:I = 0x7f0403e7
+.field public static final windowMinWidthMinor:I = 0x7f0403ec
 
-.field public static final windowNoTitle:I = 0x7f0403e8
+.field public static final windowNoTitle:I = 0x7f0403ed
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$color.smali b/com.discord/smali/com/discord/restapi/R$color.smali
index 2f2a8f814b..8bc7219196 100644
--- a/com.discord/smali/com/discord/restapi/R$color.smali
+++ b/com.discord/smali/com/discord/restapi/R$color.smali
@@ -75,223 +75,223 @@
 
 .field public static final background_material_light:I = 0x7f06001f
 
-.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060035
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
 
-.field public static final bright_foreground_material_dark:I = 0x7f060038
+.field public static final bright_foreground_material_dark:I = 0x7f060039
 
-.field public static final bright_foreground_material_light:I = 0x7f060039
+.field public static final bright_foreground_material_light:I = 0x7f06003a
 
-.field public static final button_material_dark:I = 0x7f06003f
+.field public static final button_material_dark:I = 0x7f060040
 
-.field public static final button_material_light:I = 0x7f060040
+.field public static final button_material_light:I = 0x7f060041
 
-.field public static final cardview_dark_background:I = 0x7f060041
+.field public static final cardview_dark_background:I = 0x7f060042
 
-.field public static final cardview_light_background:I = 0x7f060042
+.field public static final cardview_light_background:I = 0x7f060043
 
-.field public static final cardview_shadow_end_color:I = 0x7f060043
+.field public static final cardview_shadow_end_color:I = 0x7f060044
 
-.field public static final cardview_shadow_start_color:I = 0x7f060044
+.field public static final cardview_shadow_start_color:I = 0x7f060045
 
-.field public static final common_google_signin_btn_text_dark:I = 0x7f06004c
+.field public static final common_google_signin_btn_text_dark:I = 0x7f06004f
 
-.field public static final common_google_signin_btn_text_dark_default:I = 0x7f06004d
+.field public static final common_google_signin_btn_text_dark_default:I = 0x7f060050
 
-.field public static final common_google_signin_btn_text_dark_disabled:I = 0x7f06004e
+.field public static final common_google_signin_btn_text_dark_disabled:I = 0x7f060051
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f06004f
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f060052
 
-.field public static final common_google_signin_btn_text_dark_pressed:I = 0x7f060050
+.field public static final common_google_signin_btn_text_dark_pressed:I = 0x7f060053
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f060051
+.field public static final common_google_signin_btn_text_light:I = 0x7f060054
 
-.field public static final common_google_signin_btn_text_light_default:I = 0x7f060052
+.field public static final common_google_signin_btn_text_light_default:I = 0x7f060055
 
-.field public static final common_google_signin_btn_text_light_disabled:I = 0x7f060053
+.field public static final common_google_signin_btn_text_light_disabled:I = 0x7f060056
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f060054
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f060057
 
-.field public static final common_google_signin_btn_text_light_pressed:I = 0x7f060055
+.field public static final common_google_signin_btn_text_light_pressed:I = 0x7f060058
 
-.field public static final common_google_signin_btn_tint:I = 0x7f060056
+.field public static final common_google_signin_btn_tint:I = 0x7f060059
 
-.field public static final design_bottom_navigation_shadow_color:I = 0x7f060059
+.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005c
 
-.field public static final design_default_color_primary:I = 0x7f06005a
+.field public static final design_default_color_primary:I = 0x7f06005d
 
-.field public static final design_default_color_primary_dark:I = 0x7f06005b
+.field public static final design_default_color_primary_dark:I = 0x7f06005e
 
-.field public static final design_error:I = 0x7f06005c
+.field public static final design_error:I = 0x7f06005f
 
-.field public static final design_fab_shadow_end_color:I = 0x7f06005d
+.field public static final design_fab_shadow_end_color:I = 0x7f060060
 
-.field public static final design_fab_shadow_mid_color:I = 0x7f06005e
+.field public static final design_fab_shadow_mid_color:I = 0x7f060061
 
-.field public static final design_fab_shadow_start_color:I = 0x7f06005f
+.field public static final design_fab_shadow_start_color:I = 0x7f060062
 
-.field public static final design_fab_stroke_end_inner_color:I = 0x7f060060
+.field public static final design_fab_stroke_end_inner_color:I = 0x7f060063
 
-.field public static final design_fab_stroke_end_outer_color:I = 0x7f060061
+.field public static final design_fab_stroke_end_outer_color:I = 0x7f060064
 
-.field public static final design_fab_stroke_top_inner_color:I = 0x7f060062
+.field public static final design_fab_stroke_top_inner_color:I = 0x7f060065
 
-.field public static final design_fab_stroke_top_outer_color:I = 0x7f060063
+.field public static final design_fab_stroke_top_outer_color:I = 0x7f060066
 
-.field public static final design_snackbar_background_color:I = 0x7f060064
+.field public static final design_snackbar_background_color:I = 0x7f060067
 
-.field public static final design_tint_password_toggle:I = 0x7f060065
+.field public static final design_tint_password_toggle:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060066
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060067
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f060068
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f060069
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final error_color_material_dark:I = 0x7f06006a
+.field public static final error_color_material_dark:I = 0x7f06006d
 
-.field public static final error_color_material_light:I = 0x7f06006b
+.field public static final error_color_material_light:I = 0x7f06006e
 
-.field public static final foreground_material_dark:I = 0x7f060070
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060071
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060080
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060081
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f06008f
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060090
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060091
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060092
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060093
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060094
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060095
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060096
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060097
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f060098
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f060099
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009a
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009b
+.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009e
 
-.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009c
+.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009f
 
-.field public static final mtrl_btn_bg_color_disabled:I = 0x7f06009d
+.field public static final mtrl_btn_bg_color_disabled:I = 0x7f0600a0
 
-.field public static final mtrl_btn_bg_color_selector:I = 0x7f06009e
+.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a1
 
-.field public static final mtrl_btn_ripple_color:I = 0x7f06009f
+.field public static final mtrl_btn_ripple_color:I = 0x7f0600a2
 
-.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a0
+.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a3
 
-.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a1
+.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a4
 
-.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a2
+.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a5
 
-.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a3
+.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a6
 
-.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a4
+.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a7
 
-.field public static final mtrl_chip_background_color:I = 0x7f0600a5
+.field public static final mtrl_chip_background_color:I = 0x7f0600a8
 
-.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a6
+.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a9
 
-.field public static final mtrl_chip_ripple_color:I = 0x7f0600a7
+.field public static final mtrl_chip_ripple_color:I = 0x7f0600aa
 
-.field public static final mtrl_chip_text_color:I = 0x7f0600a8
+.field public static final mtrl_chip_text_color:I = 0x7f0600ab
 
-.field public static final mtrl_fab_ripple_color:I = 0x7f0600a9
+.field public static final mtrl_fab_ripple_color:I = 0x7f0600ac
 
-.field public static final mtrl_scrim_color:I = 0x7f0600aa
+.field public static final mtrl_scrim_color:I = 0x7f0600ad
 
-.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ab
+.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ae
 
-.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600ac
+.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600af
 
-.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600ad
+.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600b0
 
-.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600ae
+.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b1
 
-.field public static final mtrl_tabs_ripple_color:I = 0x7f0600af
+.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b2
 
-.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b0
+.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b3
 
-.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b1
+.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b4
 
-.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b2
+.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b5
 
-.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b3
+.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b6
 
-.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b4
+.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b7
 
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final notification_material_background_media_default_color:I = 0x7f0600b7
+.field public static final notification_material_background_media_default_color:I = 0x7f0600ba
 
-.field public static final primary_dark_material_dark:I = 0x7f0600d9
+.field public static final primary_dark_material_dark:I = 0x7f0600dc
 
-.field public static final primary_dark_material_light:I = 0x7f0600da
+.field public static final primary_dark_material_light:I = 0x7f0600dd
 
-.field public static final primary_material_dark:I = 0x7f0600ea
+.field public static final primary_material_dark:I = 0x7f0600ed
 
-.field public static final primary_material_light:I = 0x7f0600eb
+.field public static final primary_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ec
+.field public static final primary_text_default_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ed
+.field public static final primary_text_default_material_light:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ee
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f1
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f2
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fb
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600ff
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f060100
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060133
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060134
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060136
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060137
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$dimen.smali b/com.discord/smali/com/discord/restapi/R$dimen.smali
index 66ead3e563..1a8e89a77e 100644
--- a/com.discord/smali/com/discord/restapi/R$dimen.smali
+++ b/com.discord/smali/com/discord/restapi/R$dimen.smali
@@ -187,273 +187,273 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final design_appbar_elevation:I = 0x7f070080
+.field public static final design_appbar_elevation:I = 0x7f070081
 
-.field public static final design_bottom_navigation_active_item_max_width:I = 0x7f070081
+.field public static final design_bottom_navigation_active_item_max_width:I = 0x7f070082
 
-.field public static final design_bottom_navigation_active_item_min_width:I = 0x7f070082
+.field public static final design_bottom_navigation_active_item_min_width:I = 0x7f070083
 
-.field public static final design_bottom_navigation_active_text_size:I = 0x7f070083
+.field public static final design_bottom_navigation_active_text_size:I = 0x7f070084
 
-.field public static final design_bottom_navigation_elevation:I = 0x7f070084
+.field public static final design_bottom_navigation_elevation:I = 0x7f070085
 
-.field public static final design_bottom_navigation_height:I = 0x7f070085
+.field public static final design_bottom_navigation_height:I = 0x7f070086
 
-.field public static final design_bottom_navigation_icon_size:I = 0x7f070086
+.field public static final design_bottom_navigation_icon_size:I = 0x7f070087
 
-.field public static final design_bottom_navigation_item_max_width:I = 0x7f070087
+.field public static final design_bottom_navigation_item_max_width:I = 0x7f070088
 
-.field public static final design_bottom_navigation_item_min_width:I = 0x7f070088
+.field public static final design_bottom_navigation_item_min_width:I = 0x7f070089
 
-.field public static final design_bottom_navigation_margin:I = 0x7f070089
+.field public static final design_bottom_navigation_margin:I = 0x7f07008a
 
-.field public static final design_bottom_navigation_shadow_height:I = 0x7f07008a
+.field public static final design_bottom_navigation_shadow_height:I = 0x7f07008b
 
-.field public static final design_bottom_navigation_text_size:I = 0x7f07008b
+.field public static final design_bottom_navigation_text_size:I = 0x7f07008c
 
-.field public static final design_bottom_sheet_modal_elevation:I = 0x7f07008c
+.field public static final design_bottom_sheet_modal_elevation:I = 0x7f07008d
 
-.field public static final design_bottom_sheet_peek_height_min:I = 0x7f07008d
+.field public static final design_bottom_sheet_peek_height_min:I = 0x7f07008e
 
-.field public static final design_fab_border_width:I = 0x7f07008e
+.field public static final design_fab_border_width:I = 0x7f07008f
 
-.field public static final design_fab_elevation:I = 0x7f07008f
+.field public static final design_fab_elevation:I = 0x7f070090
 
-.field public static final design_fab_image_size:I = 0x7f070090
+.field public static final design_fab_image_size:I = 0x7f070091
 
-.field public static final design_fab_size_mini:I = 0x7f070091
+.field public static final design_fab_size_mini:I = 0x7f070092
 
-.field public static final design_fab_size_normal:I = 0x7f070092
+.field public static final design_fab_size_normal:I = 0x7f070093
 
-.field public static final design_fab_translation_z_hovered_focused:I = 0x7f070093
+.field public static final design_fab_translation_z_hovered_focused:I = 0x7f070094
 
-.field public static final design_fab_translation_z_pressed:I = 0x7f070094
+.field public static final design_fab_translation_z_pressed:I = 0x7f070095
 
-.field public static final design_navigation_elevation:I = 0x7f070095
+.field public static final design_navigation_elevation:I = 0x7f070096
 
-.field public static final design_navigation_icon_padding:I = 0x7f070096
+.field public static final design_navigation_icon_padding:I = 0x7f070097
 
-.field public static final design_navigation_icon_size:I = 0x7f070097
+.field public static final design_navigation_icon_size:I = 0x7f070098
 
-.field public static final design_navigation_item_horizontal_padding:I = 0x7f070098
+.field public static final design_navigation_item_horizontal_padding:I = 0x7f070099
 
-.field public static final design_navigation_item_icon_padding:I = 0x7f070099
+.field public static final design_navigation_item_icon_padding:I = 0x7f07009a
 
-.field public static final design_navigation_max_width:I = 0x7f07009a
+.field public static final design_navigation_max_width:I = 0x7f07009b
 
-.field public static final design_navigation_padding_bottom:I = 0x7f07009b
+.field public static final design_navigation_padding_bottom:I = 0x7f07009c
 
-.field public static final design_navigation_separator_vertical_padding:I = 0x7f07009c
+.field public static final design_navigation_separator_vertical_padding:I = 0x7f07009d
 
-.field public static final design_snackbar_action_inline_max_width:I = 0x7f07009d
+.field public static final design_snackbar_action_inline_max_width:I = 0x7f07009e
 
-.field public static final design_snackbar_background_corner_radius:I = 0x7f07009e
+.field public static final design_snackbar_background_corner_radius:I = 0x7f07009f
 
-.field public static final design_snackbar_elevation:I = 0x7f07009f
+.field public static final design_snackbar_elevation:I = 0x7f0700a0
 
-.field public static final design_snackbar_extra_spacing_horizontal:I = 0x7f0700a0
+.field public static final design_snackbar_extra_spacing_horizontal:I = 0x7f0700a1
 
-.field public static final design_snackbar_max_width:I = 0x7f0700a1
+.field public static final design_snackbar_max_width:I = 0x7f0700a2
 
-.field public static final design_snackbar_min_width:I = 0x7f0700a2
+.field public static final design_snackbar_min_width:I = 0x7f0700a3
 
-.field public static final design_snackbar_padding_horizontal:I = 0x7f0700a3
+.field public static final design_snackbar_padding_horizontal:I = 0x7f0700a4
 
-.field public static final design_snackbar_padding_vertical:I = 0x7f0700a4
+.field public static final design_snackbar_padding_vertical:I = 0x7f0700a5
 
-.field public static final design_snackbar_padding_vertical_2lines:I = 0x7f0700a5
+.field public static final design_snackbar_padding_vertical_2lines:I = 0x7f0700a6
 
-.field public static final design_snackbar_text_size:I = 0x7f0700a6
+.field public static final design_snackbar_text_size:I = 0x7f0700a7
 
-.field public static final design_tab_max_width:I = 0x7f0700a7
+.field public static final design_tab_max_width:I = 0x7f0700a8
 
-.field public static final design_tab_scrollable_min_width:I = 0x7f0700a8
+.field public static final design_tab_scrollable_min_width:I = 0x7f0700a9
 
-.field public static final design_tab_text_size:I = 0x7f0700a9
+.field public static final design_tab_text_size:I = 0x7f0700aa
 
-.field public static final design_tab_text_size_2line:I = 0x7f0700aa
+.field public static final design_tab_text_size_2line:I = 0x7f0700ab
 
-.field public static final design_textinput_caption_translate_y:I = 0x7f0700ab
+.field public static final design_textinput_caption_translate_y:I = 0x7f0700ac
 
-.field public static final disabled_alpha_material_dark:I = 0x7f0700b1
+.field public static final disabled_alpha_material_dark:I = 0x7f0700b2
 
-.field public static final disabled_alpha_material_light:I = 0x7f0700b2
+.field public static final disabled_alpha_material_light:I = 0x7f0700b3
 
-.field public static final fastscroll_default_thickness:I = 0x7f0700b8
+.field public static final fastscroll_default_thickness:I = 0x7f0700ba
 
-.field public static final fastscroll_margin:I = 0x7f0700b9
+.field public static final fastscroll_margin:I = 0x7f0700bb
 
-.field public static final fastscroll_minimum_range:I = 0x7f0700ba
+.field public static final fastscroll_minimum_range:I = 0x7f0700bc
 
-.field public static final highlight_alpha_material_colored:I = 0x7f0700c4
+.field public static final highlight_alpha_material_colored:I = 0x7f0700c6
 
-.field public static final highlight_alpha_material_dark:I = 0x7f0700c5
+.field public static final highlight_alpha_material_dark:I = 0x7f0700c7
 
-.field public static final highlight_alpha_material_light:I = 0x7f0700c6
+.field public static final highlight_alpha_material_light:I = 0x7f0700c8
 
-.field public static final hint_alpha_material_dark:I = 0x7f0700c7
+.field public static final hint_alpha_material_dark:I = 0x7f0700c9
 
-.field public static final hint_alpha_material_light:I = 0x7f0700c8
+.field public static final hint_alpha_material_light:I = 0x7f0700ca
 
-.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700c9
+.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700cb
 
-.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ca
+.field public static final hint_pressed_alpha_material_light:I = 0x7f0700cc
 
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700cc
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700ce
 
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700cd
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700cf
 
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700ce
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d0
 
-.field public static final mtrl_bottomappbar_fabOffsetEndMode:I = 0x7f0700d8
+.field public static final mtrl_bottomappbar_fabOffsetEndMode:I = 0x7f0700da
 
-.field public static final mtrl_bottomappbar_fab_cradle_margin:I = 0x7f0700d9
+.field public static final mtrl_bottomappbar_fab_cradle_margin:I = 0x7f0700db
 
-.field public static final mtrl_bottomappbar_fab_cradle_rounded_corner_radius:I = 0x7f0700da
+.field public static final mtrl_bottomappbar_fab_cradle_rounded_corner_radius:I = 0x7f0700dc
 
-.field public static final mtrl_bottomappbar_fab_cradle_vertical_offset:I = 0x7f0700db
+.field public static final mtrl_bottomappbar_fab_cradle_vertical_offset:I = 0x7f0700dd
 
-.field public static final mtrl_bottomappbar_height:I = 0x7f0700dc
+.field public static final mtrl_bottomappbar_height:I = 0x7f0700de
 
-.field public static final mtrl_btn_corner_radius:I = 0x7f0700dd
+.field public static final mtrl_btn_corner_radius:I = 0x7f0700df
 
-.field public static final mtrl_btn_dialog_btn_min_width:I = 0x7f0700de
+.field public static final mtrl_btn_dialog_btn_min_width:I = 0x7f0700e0
 
-.field public static final mtrl_btn_disabled_elevation:I = 0x7f0700df
+.field public static final mtrl_btn_disabled_elevation:I = 0x7f0700e1
 
-.field public static final mtrl_btn_disabled_z:I = 0x7f0700e0
+.field public static final mtrl_btn_disabled_z:I = 0x7f0700e2
 
-.field public static final mtrl_btn_elevation:I = 0x7f0700e1
+.field public static final mtrl_btn_elevation:I = 0x7f0700e3
 
-.field public static final mtrl_btn_focused_z:I = 0x7f0700e2
+.field public static final mtrl_btn_focused_z:I = 0x7f0700e4
 
-.field public static final mtrl_btn_hovered_z:I = 0x7f0700e3
+.field public static final mtrl_btn_hovered_z:I = 0x7f0700e5
 
-.field public static final mtrl_btn_icon_btn_padding_left:I = 0x7f0700e4
+.field public static final mtrl_btn_icon_btn_padding_left:I = 0x7f0700e6
 
-.field public static final mtrl_btn_icon_padding:I = 0x7f0700e5
+.field public static final mtrl_btn_icon_padding:I = 0x7f0700e7
 
-.field public static final mtrl_btn_inset:I = 0x7f0700e6
+.field public static final mtrl_btn_inset:I = 0x7f0700e8
 
-.field public static final mtrl_btn_letter_spacing:I = 0x7f0700e7
+.field public static final mtrl_btn_letter_spacing:I = 0x7f0700e9
 
-.field public static final mtrl_btn_padding_bottom:I = 0x7f0700e8
+.field public static final mtrl_btn_padding_bottom:I = 0x7f0700ea
 
-.field public static final mtrl_btn_padding_left:I = 0x7f0700e9
+.field public static final mtrl_btn_padding_left:I = 0x7f0700eb
 
-.field public static final mtrl_btn_padding_right:I = 0x7f0700ea
+.field public static final mtrl_btn_padding_right:I = 0x7f0700ec
 
-.field public static final mtrl_btn_padding_top:I = 0x7f0700eb
+.field public static final mtrl_btn_padding_top:I = 0x7f0700ed
 
-.field public static final mtrl_btn_pressed_z:I = 0x7f0700ec
+.field public static final mtrl_btn_pressed_z:I = 0x7f0700ee
 
-.field public static final mtrl_btn_stroke_size:I = 0x7f0700ed
+.field public static final mtrl_btn_stroke_size:I = 0x7f0700ef
 
-.field public static final mtrl_btn_text_btn_icon_padding:I = 0x7f0700ee
+.field public static final mtrl_btn_text_btn_icon_padding:I = 0x7f0700f0
 
-.field public static final mtrl_btn_text_btn_padding_left:I = 0x7f0700ef
+.field public static final mtrl_btn_text_btn_padding_left:I = 0x7f0700f1
 
-.field public static final mtrl_btn_text_btn_padding_right:I = 0x7f0700f0
+.field public static final mtrl_btn_text_btn_padding_right:I = 0x7f0700f2
 
-.field public static final mtrl_btn_text_size:I = 0x7f0700f1
+.field public static final mtrl_btn_text_size:I = 0x7f0700f3
 
-.field public static final mtrl_btn_z:I = 0x7f0700f2
+.field public static final mtrl_btn_z:I = 0x7f0700f4
 
-.field public static final mtrl_card_elevation:I = 0x7f0700f3
+.field public static final mtrl_card_elevation:I = 0x7f0700f5
 
-.field public static final mtrl_card_spacing:I = 0x7f0700f4
+.field public static final mtrl_card_spacing:I = 0x7f0700f6
 
-.field public static final mtrl_chip_pressed_translation_z:I = 0x7f0700f5
+.field public static final mtrl_chip_pressed_translation_z:I = 0x7f0700f7
 
-.field public static final mtrl_chip_text_size:I = 0x7f0700f6
+.field public static final mtrl_chip_text_size:I = 0x7f0700f8
 
-.field public static final mtrl_fab_elevation:I = 0x7f0700f7
+.field public static final mtrl_fab_elevation:I = 0x7f0700f9
 
-.field public static final mtrl_fab_translation_z_hovered_focused:I = 0x7f0700f8
+.field public static final mtrl_fab_translation_z_hovered_focused:I = 0x7f0700fa
 
-.field public static final mtrl_fab_translation_z_pressed:I = 0x7f0700f9
+.field public static final mtrl_fab_translation_z_pressed:I = 0x7f0700fb
 
-.field public static final mtrl_navigation_elevation:I = 0x7f0700fa
+.field public static final mtrl_navigation_elevation:I = 0x7f0700fc
 
-.field public static final mtrl_navigation_item_horizontal_padding:I = 0x7f0700fb
+.field public static final mtrl_navigation_item_horizontal_padding:I = 0x7f0700fd
 
-.field public static final mtrl_navigation_item_icon_padding:I = 0x7f0700fc
+.field public static final mtrl_navigation_item_icon_padding:I = 0x7f0700fe
 
-.field public static final mtrl_snackbar_background_corner_radius:I = 0x7f0700fd
+.field public static final mtrl_snackbar_background_corner_radius:I = 0x7f0700ff
 
-.field public static final mtrl_snackbar_margin:I = 0x7f0700fe
+.field public static final mtrl_snackbar_margin:I = 0x7f070100
 
-.field public static final mtrl_textinput_box_bottom_offset:I = 0x7f0700ff
+.field public static final mtrl_textinput_box_bottom_offset:I = 0x7f070101
 
-.field public static final mtrl_textinput_box_corner_radius_medium:I = 0x7f070100
+.field public static final mtrl_textinput_box_corner_radius_medium:I = 0x7f070102
 
-.field public static final mtrl_textinput_box_corner_radius_small:I = 0x7f070101
+.field public static final mtrl_textinput_box_corner_radius_small:I = 0x7f070103
 
-.field public static final mtrl_textinput_box_label_cutout_padding:I = 0x7f070102
+.field public static final mtrl_textinput_box_label_cutout_padding:I = 0x7f070104
 
-.field public static final mtrl_textinput_box_padding_end:I = 0x7f070103
+.field public static final mtrl_textinput_box_padding_end:I = 0x7f070105
 
-.field public static final mtrl_textinput_box_stroke_width_default:I = 0x7f070104
+.field public static final mtrl_textinput_box_stroke_width_default:I = 0x7f070106
 
-.field public static final mtrl_textinput_box_stroke_width_focused:I = 0x7f070105
+.field public static final mtrl_textinput_box_stroke_width_focused:I = 0x7f070107
 
-.field public static final mtrl_textinput_outline_box_expanded_padding:I = 0x7f070106
+.field public static final mtrl_textinput_outline_box_expanded_padding:I = 0x7f070108
 
-.field public static final mtrl_toolbar_default_height:I = 0x7f070107
+.field public static final mtrl_toolbar_default_height:I = 0x7f070109
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
-.field public static final subtitle_corner_radius:I = 0x7f070124
+.field public static final subtitle_corner_radius:I = 0x7f070126
 
-.field public static final subtitle_outline_width:I = 0x7f070125
+.field public static final subtitle_outline_width:I = 0x7f070127
 
-.field public static final subtitle_shadow_offset:I = 0x7f070126
+.field public static final subtitle_shadow_offset:I = 0x7f070128
 
-.field public static final subtitle_shadow_radius:I = 0x7f070127
+.field public static final subtitle_shadow_radius:I = 0x7f070129
 
-.field public static final tooltip_corner_radius:I = 0x7f07012b
+.field public static final tooltip_corner_radius:I = 0x7f07012d
 
-.field public static final tooltip_horizontal_padding:I = 0x7f07012c
+.field public static final tooltip_horizontal_padding:I = 0x7f07012e
 
-.field public static final tooltip_margin:I = 0x7f07012d
+.field public static final tooltip_margin:I = 0x7f07012f
 
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07012e
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f070130
 
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07012f
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f070131
 
-.field public static final tooltip_vertical_padding:I = 0x7f070130
+.field public static final tooltip_vertical_padding:I = 0x7f070132
 
-.field public static final tooltip_y_offset_non_touch:I = 0x7f070131
+.field public static final tooltip_y_offset_non_touch:I = 0x7f070133
 
-.field public static final tooltip_y_offset_touch:I = 0x7f070132
+.field public static final tooltip_y_offset_touch:I = 0x7f070134
 
 
 # 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 f7d5440275..b32b51e7d3 100644
--- a/com.discord/smali/com/discord/restapi/R$drawable.smali
+++ b/com.discord/smali/com/discord/restapi/R$drawable.smali
@@ -15,277 +15,277 @@
 
 
 # static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080017
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080017
+.field public static final abc_action_bar_item_background_material:I = 0x7f080018
 
-.field public static final abc_btn_borderless_material:I = 0x7f080018
+.field public static final abc_btn_borderless_material:I = 0x7f080019
 
-.field public static final abc_btn_check_material:I = 0x7f080019
+.field public static final abc_btn_check_material:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
 
-.field public static final abc_btn_colored_material:I = 0x7f08001c
+.field public static final abc_btn_colored_material:I = 0x7f08001d
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
 
-.field public static final abc_btn_radio_material:I = 0x7f08001e
+.field public static final abc_btn_radio_material:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080023
+.field public static final abc_cab_background_internal_bg:I = 0x7f080024
 
-.field public static final abc_cab_background_top_material:I = 0x7f080024
+.field public static final abc_cab_background_top_material:I = 0x7f080025
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
 
-.field public static final abc_control_background_material:I = 0x7f080026
+.field public static final abc_control_background_material:I = 0x7f080027
 
-.field public static final abc_dialog_material_background:I = 0x7f080027
+.field public static final abc_dialog_material_background:I = 0x7f080028
 
-.field public static final abc_edit_text_material:I = 0x7f080028
+.field public static final abc_edit_text_material:I = 0x7f080029
 
-.field public static final abc_ic_ab_back_material:I = 0x7f080029
+.field public static final abc_ic_ab_back_material:I = 0x7f08002a
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
 
-.field public static final abc_ic_clear_material:I = 0x7f08002b
+.field public static final abc_ic_clear_material:I = 0x7f08002c
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
 
-.field public static final abc_ic_search_api_material:I = 0x7f080034
+.field public static final abc_ic_search_api_material:I = 0x7f080035
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080035
+.field public static final abc_ic_star_black_16dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080036
+.field public static final abc_ic_star_black_36dp:I = 0x7f080037
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080037
+.field public static final abc_ic_star_black_48dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003c
+.field public static final abc_item_background_holo_dark:I = 0x7f08003d
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003d
+.field public static final abc_item_background_holo_light:I = 0x7f08003e
 
-.field public static final abc_list_divider_material:I = 0x7f08003e
+.field public static final abc_list_divider_material:I = 0x7f08003f
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
 
-.field public static final abc_list_focused_holo:I = 0x7f080040
+.field public static final abc_list_focused_holo:I = 0x7f080041
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080041
+.field public static final abc_list_longpressed_holo:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080043
+.field public static final abc_list_pressed_holo_light:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080048
+.field public static final abc_list_selector_holo_dark:I = 0x7f080049
 
-.field public static final abc_list_selector_holo_light:I = 0x7f080049
+.field public static final abc_list_selector_holo_light:I = 0x7f08004a
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_material:I = 0x7f08004d
+.field public static final abc_ratingbar_material:I = 0x7f08004e
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004e
+.field public static final abc_ratingbar_small_material:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080054
+.field public static final abc_seekbar_thumb_material:I = 0x7f080055
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
 
-.field public static final abc_seekbar_track_material:I = 0x7f080056
+.field public static final abc_seekbar_track_material:I = 0x7f080057
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
 
-.field public static final abc_switch_thumb_material:I = 0x7f080059
+.field public static final abc_switch_thumb_material:I = 0x7f08005a
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005b
+.field public static final abc_tab_indicator_material:I = 0x7f08005c
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
 
-.field public static final abc_text_cursor_material:I = 0x7f08005d
+.field public static final abc_text_cursor_material:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
 
-.field public static final abc_textfield_search_material:I = 0x7f080068
+.field public static final abc_textfield_search_material:I = 0x7f080069
 
-.field public static final abc_vector_test:I = 0x7f080069
+.field public static final abc_vector_test:I = 0x7f08006a
 
-.field public static final avd_hide_password:I = 0x7f080089
+.field public static final avd_hide_password:I = 0x7f08008a
 
-.field public static final avd_show_password:I = 0x7f08008a
+.field public static final avd_show_password:I = 0x7f08008b
 
-.field public static final common_full_open_on_phone:I = 0x7f08009f
+.field public static final common_full_open_on_phone:I = 0x7f0800a2
 
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a0
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a3
 
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a1
+.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a4
 
-.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a2
+.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a5
 
-.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a3
+.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a6
 
-.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a4
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a7
 
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a5
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a8
 
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a6
+.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a9
 
-.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800a7
+.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800aa
 
-.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800a8
+.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800ab
 
-.field public static final common_google_signin_btn_text_dark:I = 0x7f0800a9
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ac
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800aa
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ad
 
-.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ab
+.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ae
 
-.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800ac
+.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800af
 
-.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800ad
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800b0
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800ae
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800b1
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800af
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b2
 
-.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b0
+.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b3
 
-.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b1
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b4
 
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800b2
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
 
-.field public static final design_fab_background:I = 0x7f0800b3
+.field public static final design_fab_background:I = 0x7f0800b6
 
-.field public static final design_ic_visibility:I = 0x7f0800b4
+.field public static final design_ic_visibility:I = 0x7f0800b7
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b5
+.field public static final design_ic_visibility_off:I = 0x7f0800b8
 
-.field public static final design_password_eye:I = 0x7f0800b6
+.field public static final design_password_eye:I = 0x7f0800b9
 
-.field public static final design_snackbar_background:I = 0x7f0800b7
+.field public static final design_snackbar_background:I = 0x7f0800ba
 
-.field public static final drawable_chip_background:I = 0x7f0800fe
+.field public static final drawable_chip_background:I = 0x7f080105
 
-.field public static final drawable_chip_circle:I = 0x7f0800ff
+.field public static final drawable_chip_circle:I = 0x7f080106
 
-.field public static final drawable_chip_delete:I = 0x7f080100
+.field public static final drawable_chip_delete:I = 0x7f080107
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801ac
+.field public static final googleg_disabled_color_18:I = 0x7f0801bb
 
-.field public static final googleg_standard_color_18:I = 0x7f0801ad
+.field public static final googleg_standard_color_18:I = 0x7f0801bc
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802f0
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080300
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802f1
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080301
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802f2
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080302
 
-.field public static final mtrl_snackbar_background:I = 0x7f080439
+.field public static final mtrl_snackbar_background:I = 0x7f080454
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f08043a
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080455
 
-.field public static final navigation_empty_icon:I = 0x7f08043b
+.field public static final navigation_empty_icon:I = 0x7f080456
 
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
-.field public static final tooltip_frame_dark:I = 0x7f08044c
+.field public static final tooltip_frame_dark:I = 0x7f08046a
 
-.field public static final tooltip_frame_light:I = 0x7f08044d
+.field public static final tooltip_frame_light:I = 0x7f08046b
 
 
 # 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 80f71fe535..59371806a2 100644
--- a/com.discord/smali/com/discord/restapi/R$id.smali
+++ b/com.discord/smali/com/discord/restapi/R$id.smali
@@ -63,329 +63,329 @@
 
 .field public static final alertTitle:I = 0x7f0a0061
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final auto:I = 0x7f0a00b8
+.field public static final auto:I = 0x7f0a00b9
 
-.field public static final baseline:I = 0x7f0a00c8
+.field public static final baseline:I = 0x7f0a00c9
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final buttonPanel:I = 0x7f0a010c
+.field public static final buttonPanel:I = 0x7f0a010d
 
-.field public static final cancel_action:I = 0x7f0a0117
+.field public static final cancel_action:I = 0x7f0a0118
 
-.field public static final center:I = 0x7f0a0123
+.field public static final center:I = 0x7f0a0124
 
-.field public static final centerCrop:I = 0x7f0a0124
+.field public static final centerCrop:I = 0x7f0a0125
 
-.field public static final centerInside:I = 0x7f0a0125
+.field public static final centerInside:I = 0x7f0a0126
 
-.field public static final checkbox:I = 0x7f0a0212
+.field public static final checkbox:I = 0x7f0a0213
 
-.field public static final chip_image:I = 0x7f0a0214
+.field public static final chip_image:I = 0x7f0a0215
 
-.field public static final chip_text:I = 0x7f0a0215
+.field public static final chip_text:I = 0x7f0a0216
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final column:I = 0x7f0a0221
+.field public static final column:I = 0x7f0a0222
 
-.field public static final column_reverse:I = 0x7f0a0222
+.field public static final column_reverse:I = 0x7f0a0223
 
-.field public static final container:I = 0x7f0a0231
+.field public static final container:I = 0x7f0a0232
 
-.field public static final content:I = 0x7f0a0232
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0233
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final coordinator:I = 0x7f0a0237
+.field public static final coordinator:I = 0x7f0a0238
 
-.field public static final custom:I = 0x7f0a0247
+.field public static final custom:I = 0x7f0a0250
 
-.field public static final customPanel:I = 0x7f0a0248
+.field public static final customPanel:I = 0x7f0a0251
 
-.field public static final dark:I = 0x7f0a0249
+.field public static final dark:I = 0x7f0a0252
 
-.field public static final decor_content_parent:I = 0x7f0a024c
+.field public static final decor_content_parent:I = 0x7f0a0255
 
-.field public static final default_activity_button:I = 0x7f0a024d
+.field public static final default_activity_button:I = 0x7f0a0256
 
-.field public static final design_bottom_sheet:I = 0x7f0a024e
+.field public static final design_bottom_sheet:I = 0x7f0a0257
 
-.field public static final design_menu_item_action_area:I = 0x7f0a024f
+.field public static final design_menu_item_action_area:I = 0x7f0a0258
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a0250
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a0259
 
-.field public static final design_menu_item_text:I = 0x7f0a0251
+.field public static final design_menu_item_text:I = 0x7f0a025a
 
-.field public static final design_navigation_view:I = 0x7f0a0252
+.field public static final design_navigation_view:I = 0x7f0a025b
 
-.field public static final edit_query:I = 0x7f0a02a3
+.field public static final edit_query:I = 0x7f0a02ac
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final end_padder:I = 0x7f0a02bf
+.field public static final end_padder:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02c4
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02c5
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final fill:I = 0x7f0a02d9
+.field public static final fill:I = 0x7f0a02e2
 
-.field public static final filled:I = 0x7f0a02dc
+.field public static final filled:I = 0x7f0a02e5
 
-.field public static final fitBottomStart:I = 0x7f0a02dd
+.field public static final fitBottomStart:I = 0x7f0a02e6
 
-.field public static final fitCenter:I = 0x7f0a02de
+.field public static final fitCenter:I = 0x7f0a02e7
 
-.field public static final fitEnd:I = 0x7f0a02df
+.field public static final fitEnd:I = 0x7f0a02e8
 
-.field public static final fitStart:I = 0x7f0a02e0
+.field public static final fitStart:I = 0x7f0a02e9
 
-.field public static final fitXY:I = 0x7f0a02e1
+.field public static final fitXY:I = 0x7f0a02ea
 
-.field public static final fixed:I = 0x7f0a02e2
+.field public static final fixed:I = 0x7f0a02eb
 
-.field public static final flex_end:I = 0x7f0a02e3
+.field public static final flex_end:I = 0x7f0a02ec
 
-.field public static final flex_start:I = 0x7f0a02e4
+.field public static final flex_start:I = 0x7f0a02ed
 
-.field public static final focusCrop:I = 0x7f0a02e5
+.field public static final focusCrop:I = 0x7f0a02ee
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final ghost_view:I = 0x7f0a030f
+.field public static final ghost_view:I = 0x7f0a0314
 
-.field public static final group_divider:I = 0x7f0a0322
+.field public static final group_divider:I = 0x7f0a032b
 
-.field public static final home:I = 0x7f0a0382
+.field public static final home:I = 0x7f0a0392
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final icon_only:I = 0x7f0a0386
+.field public static final icon_only:I = 0x7f0a0396
 
-.field public static final image:I = 0x7f0a0388
+.field public static final image:I = 0x7f0a0398
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a03fa
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040a
 
-.field public static final labeled:I = 0x7f0a0401
+.field public static final labeled:I = 0x7f0a0411
 
-.field public static final largeLabel:I = 0x7f0a0402
+.field public static final largeLabel:I = 0x7f0a0412
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final light:I = 0x7f0a0409
+.field public static final light:I = 0x7f0a0419
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final listMode:I = 0x7f0a040d
+.field public static final listMode:I = 0x7f0a041d
 
-.field public static final list_item:I = 0x7f0a040e
+.field public static final list_item:I = 0x7f0a041e
 
-.field public static final masked:I = 0x7f0a042b
+.field public static final masked:I = 0x7f0a043b
 
-.field public static final media_actions:I = 0x7f0a042c
+.field public static final media_actions:I = 0x7f0a043c
 
-.field public static final message:I = 0x7f0a046f
+.field public static final message:I = 0x7f0a0482
 
-.field public static final mini:I = 0x7f0a0474
+.field public static final mini:I = 0x7f0a0487
 
-.field public static final mtrl_child_content_container:I = 0x7f0a0475
+.field public static final mtrl_child_content_container:I = 0x7f0a0488
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0476
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0489
 
-.field public static final multiply:I = 0x7f0a0477
+.field public static final multiply:I = 0x7f0a048a
 
-.field public static final navigation_header_container:I = 0x7f0a0479
+.field public static final navigation_header_container:I = 0x7f0a048c
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final nowrap:I = 0x7f0a0497
+.field public static final nowrap:I = 0x7f0a04ad
 
-.field public static final outline:I = 0x7f0a04b2
+.field public static final outline:I = 0x7f0a04c8
 
-.field public static final parallax:I = 0x7f0a04c1
+.field public static final parallax:I = 0x7f0a04d7
 
-.field public static final parentPanel:I = 0x7f0a04c3
+.field public static final parentPanel:I = 0x7f0a04d9
 
-.field public static final parent_matrix:I = 0x7f0a04c4
+.field public static final parent_matrix:I = 0x7f0a04da
 
-.field public static final pin:I = 0x7f0a0500
+.field public static final pin:I = 0x7f0a0517
 
-.field public static final progress_circular:I = 0x7f0a0543
+.field public static final progress_circular:I = 0x7f0a0553
 
-.field public static final progress_horizontal:I = 0x7f0a0545
+.field public static final progress_horizontal:I = 0x7f0a0555
 
-.field public static final radio:I = 0x7f0a0550
+.field public static final radio:I = 0x7f0a0560
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final row:I = 0x7f0a0594
+.field public static final row:I = 0x7f0a05ae
 
-.field public static final row_reverse:I = 0x7f0a0595
+.field public static final row_reverse:I = 0x7f0a05af
 
-.field public static final save_image_matrix:I = 0x7f0a0596
+.field public static final save_image_matrix:I = 0x7f0a05b0
 
-.field public static final save_non_transition_alpha:I = 0x7f0a0597
+.field public static final save_non_transition_alpha:I = 0x7f0a05b1
 
-.field public static final save_scale_type:I = 0x7f0a0598
+.field public static final save_scale_type:I = 0x7f0a05b2
 
-.field public static final screen:I = 0x7f0a059a
+.field public static final screen:I = 0x7f0a05b4
 
-.field public static final scrollIndicatorDown:I = 0x7f0a059c
+.field public static final scrollIndicatorDown:I = 0x7f0a05b6
 
-.field public static final scrollIndicatorUp:I = 0x7f0a059d
+.field public static final scrollIndicatorUp:I = 0x7f0a05b7
 
-.field public static final scrollView:I = 0x7f0a059e
+.field public static final scrollView:I = 0x7f0a05b8
 
-.field public static final scrollable:I = 0x7f0a05a0
+.field public static final scrollable:I = 0x7f0a05ba
 
-.field public static final search_badge:I = 0x7f0a05a2
+.field public static final search_badge:I = 0x7f0a05bc
 
-.field public static final search_bar:I = 0x7f0a05a3
+.field public static final search_bar:I = 0x7f0a05bd
 
-.field public static final search_button:I = 0x7f0a05a4
+.field public static final search_button:I = 0x7f0a05be
 
-.field public static final search_close_btn:I = 0x7f0a05a6
+.field public static final search_close_btn:I = 0x7f0a05c0
 
-.field public static final search_edit_frame:I = 0x7f0a05a7
+.field public static final search_edit_frame:I = 0x7f0a05c1
 
-.field public static final search_go_btn:I = 0x7f0a05aa
+.field public static final search_go_btn:I = 0x7f0a05c4
 
-.field public static final search_mag_icon:I = 0x7f0a05ac
+.field public static final search_mag_icon:I = 0x7f0a05c6
 
-.field public static final search_plate:I = 0x7f0a05ad
+.field public static final search_plate:I = 0x7f0a05c7
 
-.field public static final search_src_text:I = 0x7f0a05b0
+.field public static final search_src_text:I = 0x7f0a05ca
 
-.field public static final search_voice_btn:I = 0x7f0a05bc
+.field public static final search_voice_btn:I = 0x7f0a05d6
 
-.field public static final select_dialog_listview:I = 0x7f0a05bd
+.field public static final select_dialog_listview:I = 0x7f0a05d7
 
-.field public static final selected:I = 0x7f0a05be
+.field public static final selected:I = 0x7f0a05d8
 
-.field public static final shortcut:I = 0x7f0a06f7
+.field public static final shortcut:I = 0x7f0a0711
 
-.field public static final smallLabel:I = 0x7f0a06fb
+.field public static final smallLabel:I = 0x7f0a0715
 
-.field public static final snackbar_action:I = 0x7f0a06fc
+.field public static final snackbar_action:I = 0x7f0a0716
 
-.field public static final snackbar_text:I = 0x7f0a06fd
+.field public static final snackbar_text:I = 0x7f0a0717
 
-.field public static final space_around:I = 0x7f0a0701
+.field public static final space_around:I = 0x7f0a071b
 
-.field public static final space_between:I = 0x7f0a0702
+.field public static final space_between:I = 0x7f0a071c
 
-.field public static final spacer:I = 0x7f0a0703
+.field public static final spacer:I = 0x7f0a071d
 
-.field public static final split_action_bar:I = 0x7f0a0704
+.field public static final split_action_bar:I = 0x7f0a0724
 
-.field public static final src_atop:I = 0x7f0a0707
+.field public static final src_atop:I = 0x7f0a0727
 
-.field public static final src_in:I = 0x7f0a0708
+.field public static final src_in:I = 0x7f0a0728
 
-.field public static final src_over:I = 0x7f0a0709
+.field public static final src_over:I = 0x7f0a0729
 
-.field public static final standard:I = 0x7f0a070b
+.field public static final standard:I = 0x7f0a072b
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0710
+.field public static final status_bar_latest_event_content:I = 0x7f0a0730
 
-.field public static final stretch:I = 0x7f0a0723
+.field public static final stretch:I = 0x7f0a074c
 
-.field public static final submenuarrow:I = 0x7f0a0724
+.field public static final submenuarrow:I = 0x7f0a074d
 
-.field public static final submit_area:I = 0x7f0a0725
+.field public static final submit_area:I = 0x7f0a074e
 
-.field public static final tabMode:I = 0x7f0a0731
+.field public static final tabMode:I = 0x7f0a075a
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0741
+.field public static final textSpacerNoButtons:I = 0x7f0a076a
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0742
+.field public static final textSpacerNoTitle:I = 0x7f0a076b
 
-.field public static final text_input_password_toggle:I = 0x7f0a0745
+.field public static final text_input_password_toggle:I = 0x7f0a076e
 
-.field public static final textinput_counter:I = 0x7f0a0748
+.field public static final textinput_counter:I = 0x7f0a0771
 
-.field public static final textinput_error:I = 0x7f0a0749
+.field public static final textinput_error:I = 0x7f0a0772
 
-.field public static final textinput_helper_text:I = 0x7f0a074a
+.field public static final textinput_helper_text:I = 0x7f0a0773
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0750
+.field public static final titleDividerNoCustom:I = 0x7f0a0779
 
-.field public static final title_template:I = 0x7f0a0751
+.field public static final title_template:I = 0x7f0a077a
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
-.field public static final topPanel:I = 0x7f0a0757
+.field public static final topPanel:I = 0x7f0a0780
 
-.field public static final touch_outside:I = 0x7f0a0759
+.field public static final touch_outside:I = 0x7f0a0782
 
-.field public static final transition_current_scene:I = 0x7f0a075a
+.field public static final transition_current_scene:I = 0x7f0a0783
 
-.field public static final transition_layout_save:I = 0x7f0a075b
+.field public static final transition_layout_save:I = 0x7f0a0784
 
-.field public static final transition_position:I = 0x7f0a075c
+.field public static final transition_position:I = 0x7f0a0785
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a075d
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0786
 
-.field public static final transition_transform:I = 0x7f0a075e
+.field public static final transition_transform:I = 0x7f0a0787
 
-.field public static final uniform:I = 0x7f0a076a
+.field public static final uniform:I = 0x7f0a0793
 
-.field public static final unlabeled:I = 0x7f0a076b
+.field public static final unlabeled:I = 0x7f0a0794
 
-.field public static final up:I = 0x7f0a076d
+.field public static final up:I = 0x7f0a0796
 
-.field public static final view_offset_helper:I = 0x7f0a07db
+.field public static final view_offset_helper:I = 0x7f0a0818
 
-.field public static final visible:I = 0x7f0a07de
+.field public static final visible:I = 0x7f0a081b
 
-.field public static final wide:I = 0x7f0a080a
+.field public static final wide:I = 0x7f0a0848
 
-.field public static final wrap:I = 0x7f0a082d
+.field public static final wrap:I = 0x7f0a086a
 
-.field public static final wrap_content:I = 0x7f0a082e
+.field public static final wrap_content:I = 0x7f0a086b
 
-.field public static final wrap_reverse:I = 0x7f0a082f
+.field public static final wrap_reverse:I = 0x7f0a086c
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$layout.smali b/com.discord/smali/com/discord/restapi/R$layout.smali
index 22edbdd98c..4dd762ca54 100644
--- a/com.discord/smali/com/discord/restapi/R$layout.smali
+++ b/com.discord/smali/com/discord/restapi/R$layout.smali
@@ -99,49 +99,49 @@
 
 .field public static final design_text_input_password_icon:I = 0x7f0d0030
 
-.field public static final mtrl_layout_snackbar:I = 0x7f0d003f
+.field public static final mtrl_layout_snackbar:I = 0x7f0d0041
 
-.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0040
+.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0042
 
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_media_action:I = 0x7f0d0043
+.field public static final notification_media_action:I = 0x7f0d0045
 
-.field public static final notification_media_cancel_action:I = 0x7f0d0044
+.field public static final notification_media_cancel_action:I = 0x7f0d0046
 
-.field public static final notification_template_big_media:I = 0x7f0d0045
+.field public static final notification_template_big_media:I = 0x7f0d0047
 
-.field public static final notification_template_big_media_custom:I = 0x7f0d0046
+.field public static final notification_template_big_media_custom:I = 0x7f0d0048
 
-.field public static final notification_template_big_media_narrow:I = 0x7f0d0047
+.field public static final notification_template_big_media_narrow:I = 0x7f0d0049
 
-.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d0048
+.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d004a
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_lines_media:I = 0x7f0d004b
+.field public static final notification_template_lines_media:I = 0x7f0d004d
 
-.field public static final notification_template_media:I = 0x7f0d004c
+.field public static final notification_template_media:I = 0x7f0d004e
 
-.field public static final notification_template_media_custom:I = 0x7f0d004d
+.field public static final notification_template_media_custom:I = 0x7f0d004f
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
-.field public static final select_dialog_item_material:I = 0x7f0d005d
+.field public static final select_dialog_item_material:I = 0x7f0d005f
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d005e
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0060
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d005f
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d0061
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0066
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0069
 
-.field public static final view_chip_default:I = 0x7f0d0081
+.field public static final view_chip_default:I = 0x7f0d0088
 
 
 # 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 d2c2a49fc5..13ae8ec2a4 100644
--- a/com.discord/smali/com/discord/restapi/R$string.smali
+++ b/com.discord/smali/com/discord/restapi/R$string.smali
@@ -93,71 +93,71 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f12002a
 
-.field public static final appbar_scrolling_view_behavior:I = 0x7f1200dc
+.field public static final appbar_scrolling_view_behavior:I = 0x7f1200df
 
-.field public static final bottom_sheet_behavior:I = 0x7f12032d
+.field public static final bottom_sheet_behavior:I = 0x7f120332
 
-.field public static final character_counter_content_description:I = 0x7f1203b8
+.field public static final character_counter_content_description:I = 0x7f1203bd
 
-.field public static final character_counter_pattern:I = 0x7f1203b9
+.field public static final character_counter_pattern:I = 0x7f1203be
 
-.field public static final common_google_play_services_enable_button:I = 0x7f1203f6
+.field public static final common_google_play_services_enable_button:I = 0x7f1203fd
 
-.field public static final common_google_play_services_enable_text:I = 0x7f1203f7
+.field public static final common_google_play_services_enable_text:I = 0x7f1203fe
 
-.field public static final common_google_play_services_enable_title:I = 0x7f1203f8
+.field public static final common_google_play_services_enable_title:I = 0x7f1203ff
 
-.field public static final common_google_play_services_install_button:I = 0x7f1203f9
+.field public static final common_google_play_services_install_button:I = 0x7f120400
 
-.field public static final common_google_play_services_install_text:I = 0x7f1203fa
+.field public static final common_google_play_services_install_text:I = 0x7f120401
 
-.field public static final common_google_play_services_install_title:I = 0x7f1203fb
+.field public static final common_google_play_services_install_title:I = 0x7f120402
 
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203fc
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120403
 
-.field public static final common_google_play_services_notification_ticker:I = 0x7f1203fd
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120404
 
-.field public static final common_google_play_services_unknown_issue:I = 0x7f1203fe
+.field public static final common_google_play_services_unknown_issue:I = 0x7f120405
 
-.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ff
+.field public static final common_google_play_services_unsupported_text:I = 0x7f120406
 
-.field public static final common_google_play_services_update_button:I = 0x7f120400
+.field public static final common_google_play_services_update_button:I = 0x7f120407
 
-.field public static final common_google_play_services_update_text:I = 0x7f120401
+.field public static final common_google_play_services_update_text:I = 0x7f120408
 
-.field public static final common_google_play_services_update_title:I = 0x7f120402
+.field public static final common_google_play_services_update_title:I = 0x7f120409
 
-.field public static final common_google_play_services_updating_text:I = 0x7f120403
+.field public static final common_google_play_services_updating_text:I = 0x7f12040a
 
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120404
+.field public static final common_google_play_services_wear_update_text:I = 0x7f12040b
 
-.field public static final common_open_on_phone:I = 0x7f120405
+.field public static final common_open_on_phone:I = 0x7f12040c
 
-.field public static final common_signin_button_text:I = 0x7f120406
+.field public static final common_signin_button_text:I = 0x7f12040d
 
-.field public static final common_signin_button_text_long:I = 0x7f120407
+.field public static final common_signin_button_text_long:I = 0x7f12040e
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120594
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205a0
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120595
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205a1
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1208e1
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120901
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120b7f
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120bb0
 
-.field public static final password_toggle_content_description:I = 0x7f120cd9
+.field public static final password_toggle_content_description:I = 0x7f120d13
 
-.field public static final path_password_eye:I = 0x7f120cdc
+.field public static final path_password_eye:I = 0x7f120d16
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120cdd
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120d17
 
-.field public static final path_password_eye_mask_visible:I = 0x7f120cde
+.field public static final path_password_eye_mask_visible:I = 0x7f120d18
 
-.field public static final path_password_strike_through:I = 0x7f120cdf
+.field public static final path_password_strike_through:I = 0x7f120d19
 
-.field public static final search_menu_title:I = 0x7f120fa3
+.field public static final search_menu_title:I = 0x7f120fdd
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # 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 5672c72994..12e41fb3a6 100644
--- a/com.discord/smali/com/discord/restapi/R$style.smali
+++ b/com.discord/smali/com/discord/restapi/R$style.smali
@@ -27,993 +27,993 @@
 
 .field public static final Animation_Design_BottomSheetDialog:I = 0x7f130005
 
-.field public static final Base_AlertDialog_AppCompat:I = 0x7f130037
+.field public static final Base_AlertDialog_AppCompat:I = 0x7f130038
 
-.field public static final Base_AlertDialog_AppCompat_Light:I = 0x7f130038
+.field public static final Base_AlertDialog_AppCompat_Light:I = 0x7f130039
 
-.field public static final Base_Animation_AppCompat_Dialog:I = 0x7f130039
+.field public static final Base_Animation_AppCompat_Dialog:I = 0x7f13003a
 
-.field public static final Base_Animation_AppCompat_DropDownUp:I = 0x7f13003a
+.field public static final Base_Animation_AppCompat_DropDownUp:I = 0x7f13003b
 
-.field public static final Base_Animation_AppCompat_Tooltip:I = 0x7f13003b
+.field public static final Base_Animation_AppCompat_Tooltip:I = 0x7f13003c
 
-.field public static final Base_CardView:I = 0x7f13003c
+.field public static final Base_CardView:I = 0x7f13003d
 
-.field public static final Base_DialogWindowTitleBackground_AppCompat:I = 0x7f13003e
+.field public static final Base_DialogWindowTitleBackground_AppCompat:I = 0x7f13003f
 
-.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003d
+.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003e
 
-.field public static final Base_TextAppearance_AppCompat:I = 0x7f13003f
+.field public static final Base_TextAppearance_AppCompat:I = 0x7f130040
 
-.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130040
+.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130041
 
-.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130041
+.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130042
 
-.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130042
+.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130043
 
-.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130043
+.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130044
 
-.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130044
+.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130045
 
-.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130045
+.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130046
 
-.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130046
+.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130047
 
-.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130047
+.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130048
 
-.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130048
+.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130049
 
-.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f130049
+.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f13004a
 
-.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004a
+.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004b
 
-.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004b
+.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004c
 
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004c
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004d
 
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004d
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004e
 
-.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004e
+.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004f
 
-.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f13004f
+.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130050
 
-.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130050
+.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130051
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130051
+.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130052
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130052
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130053
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130053
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130054
 
-.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130054
+.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130055
 
-.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130055
+.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130056
 
-.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130056
+.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130057
 
-.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130057
+.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130058
 
-.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130058
+.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130059
 
-.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f130059
+.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f13005a
 
-.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005a
+.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005b
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005b
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005c
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005c
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005d
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005d
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005e
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005e
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005f
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f13005f
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130060
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130060
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130061
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130061
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130062
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130062
+.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130063
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130063
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130064
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130064
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130065
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130065
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130066
 
-.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130066
+.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130067
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130067
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130068
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130068
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130069
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f130069
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13006a
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006a
+.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006b
 
-.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006b
+.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006c
 
-.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006c
+.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006d
 
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006d
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006e
 
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006e
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006f
 
-.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008e
+.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008f
 
-.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f13008f
+.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f130090
 
-.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130090
+.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130091
 
-.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130091
+.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130092
 
-.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130092
+.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130093
 
-.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130093
+.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130094
 
-.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130094
+.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130095
 
-.field public static final Base_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f130095
+.field public static final Base_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f130096
 
-.field public static final Base_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f130096
+.field public static final Base_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f130097
 
-.field public static final Base_Theme_AppCompat:I = 0x7f13006f
+.field public static final Base_Theme_AppCompat:I = 0x7f130070
 
-.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130070
+.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130071
 
-.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130071
+.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130072
 
-.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130075
+.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130076
 
-.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130072
+.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130073
 
-.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130073
+.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130074
 
-.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130074
+.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130075
 
-.field public static final Base_Theme_AppCompat_Light:I = 0x7f130076
+.field public static final Base_Theme_AppCompat_Light:I = 0x7f130077
 
-.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130077
+.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130078
 
-.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130078
+.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130079
 
-.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007c
+.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007d
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f130079
+.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f13007a
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007a
+.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007b
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007b
+.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007c
 
-.field public static final Base_Theme_MaterialComponents:I = 0x7f13007d
+.field public static final Base_Theme_MaterialComponents:I = 0x7f13007e
 
-.field public static final Base_Theme_MaterialComponents_Bridge:I = 0x7f13007e
+.field public static final Base_Theme_MaterialComponents_Bridge:I = 0x7f13007f
 
-.field public static final Base_Theme_MaterialComponents_CompactMenu:I = 0x7f13007f
+.field public static final Base_Theme_MaterialComponents_CompactMenu:I = 0x7f130080
 
-.field public static final Base_Theme_MaterialComponents_Dialog:I = 0x7f130080
+.field public static final Base_Theme_MaterialComponents_Dialog:I = 0x7f130081
 
-.field public static final Base_Theme_MaterialComponents_DialogWhenLarge:I = 0x7f130084
+.field public static final Base_Theme_MaterialComponents_DialogWhenLarge:I = 0x7f130085
 
-.field public static final Base_Theme_MaterialComponents_Dialog_Alert:I = 0x7f130081
+.field public static final Base_Theme_MaterialComponents_Dialog_Alert:I = 0x7f130082
 
-.field public static final Base_Theme_MaterialComponents_Dialog_FixedSize:I = 0x7f130082
+.field public static final Base_Theme_MaterialComponents_Dialog_FixedSize:I = 0x7f130083
 
-.field public static final Base_Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f130083
+.field public static final Base_Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f130084
 
-.field public static final Base_Theme_MaterialComponents_Light:I = 0x7f130085
+.field public static final Base_Theme_MaterialComponents_Light:I = 0x7f130086
 
-.field public static final Base_Theme_MaterialComponents_Light_Bridge:I = 0x7f130086
+.field public static final Base_Theme_MaterialComponents_Light_Bridge:I = 0x7f130087
 
-.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f130087
+.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f130088
 
-.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f130088
+.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f130089
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog:I = 0x7f130089
+.field public static final Base_Theme_MaterialComponents_Light_Dialog:I = 0x7f13008a
 
-.field public static final Base_Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f13008d
+.field public static final Base_Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f13008e
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f13008a
+.field public static final Base_Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f13008b
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog_FixedSize:I = 0x7f13008b
+.field public static final Base_Theme_MaterialComponents_Light_Dialog_FixedSize:I = 0x7f13008c
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f13008c
+.field public static final Base_Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f13008d
 
-.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f13009e
+.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f13009f
 
-.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f13009f
+.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f1300a0
 
-.field public static final Base_V14_Theme_MaterialComponents:I = 0x7f130097
+.field public static final Base_V14_Theme_MaterialComponents:I = 0x7f130098
 
-.field public static final Base_V14_Theme_MaterialComponents_Bridge:I = 0x7f130098
+.field public static final Base_V14_Theme_MaterialComponents_Bridge:I = 0x7f130099
 
-.field public static final Base_V14_Theme_MaterialComponents_Dialog:I = 0x7f130099
+.field public static final Base_V14_Theme_MaterialComponents_Dialog:I = 0x7f13009a
 
-.field public static final Base_V14_Theme_MaterialComponents_Light:I = 0x7f13009a
+.field public static final Base_V14_Theme_MaterialComponents_Light:I = 0x7f13009b
 
-.field public static final Base_V14_Theme_MaterialComponents_Light_Bridge:I = 0x7f13009b
+.field public static final Base_V14_Theme_MaterialComponents_Light_Bridge:I = 0x7f13009c
 
-.field public static final Base_V14_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f13009c
+.field public static final Base_V14_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f13009d
 
-.field public static final Base_V14_Theme_MaterialComponents_Light_Dialog:I = 0x7f13009d
+.field public static final Base_V14_Theme_MaterialComponents_Light_Dialog:I = 0x7f13009e
 
-.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a4
+.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a5
 
-.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a0
+.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a1
 
-.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a1
+.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a2
 
-.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a2
+.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a3
 
-.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a3
+.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a4
 
-.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a5
+.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a6
 
-.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a6
+.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a7
 
-.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a7
+.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a8
 
-.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a8
+.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a9
 
-.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300a9
+.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300aa
 
-.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300aa
+.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300ab
 
-.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ab
+.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ac
 
-.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ac
+.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ad
 
-.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ad
+.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ae
 
-.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b2
+.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b3
 
-.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300ae
+.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300af
 
-.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300af
+.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300b0
 
-.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b0
+.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b1
 
-.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b1
+.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b2
 
-.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b3
+.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b4
 
-.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b4
+.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b5
 
-.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b5
+.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b6
 
-.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b6
+.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b7
 
-.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b7
+.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b8
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b8
+.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b9
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300b9
+.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300ba
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300ba
+.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300bb
 
-.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bb
+.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bc
 
-.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bc
+.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bd
 
-.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300bd
+.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300be
 
-.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300be
+.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300bf
 
-.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300bf
+.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300c0
 
-.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c0
+.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c1
 
-.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c1
+.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c2
 
-.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c7
+.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c8
 
-.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c8
+.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c9
 
-.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c2
+.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c3
 
-.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c3
+.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c4
 
-.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c4
+.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c5
 
-.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c5
+.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c6
 
-.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c6
+.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c7
 
-.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300c9
+.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300ca
 
-.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300ca
+.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300cb
 
-.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cb
+.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cc
 
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cc
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cd
 
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300cd
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300ce
 
-.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300ce
+.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300cf
 
-.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300cf
+.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300d0
 
-.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d0
+.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d1
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d1
+.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d2
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d2
+.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d3
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d3
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d4
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d4
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d5
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d5
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d6
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d6
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d7
 
-.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d7
+.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d8
 
-.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d8
+.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d9
 
-.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300d9
+.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300da
 
-.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300da
+.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300db
 
-.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300db
+.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300dc
 
-.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dc
+.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dd
 
-.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300dd
+.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300de
 
-.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300de
+.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300df
 
-.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300df
+.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300e0
 
-.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e0
+.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e1
 
-.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e1
+.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e2
 
-.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e2
+.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e3
 
-.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e3
+.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e4
 
-.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e4
+.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e5
 
-.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e5
+.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e6
 
-.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e6
+.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e7
 
-.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e7
+.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e8
 
-.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e8
+.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e9
 
-.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300e9
+.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300ea
 
-.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300ea
+.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300eb
 
-.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300eb
+.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300ec
 
-.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ec
+.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ed
 
-.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ed
+.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ee
 
-.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300ee
+.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300ef
 
-.field public static final Base_Widget_Design_TabLayout:I = 0x7f1300ef
+.field public static final Base_Widget_Design_TabLayout:I = 0x7f1300f0
 
-.field public static final Base_Widget_MaterialComponents_Chip:I = 0x7f1300f0
+.field public static final Base_Widget_MaterialComponents_Chip:I = 0x7f1300f1
 
-.field public static final Base_Widget_MaterialComponents_TextInputEditText:I = 0x7f1300f1
+.field public static final Base_Widget_MaterialComponents_TextInputEditText:I = 0x7f1300f2
 
-.field public static final Base_Widget_MaterialComponents_TextInputLayout:I = 0x7f1300f2
+.field public static final Base_Widget_MaterialComponents_TextInputLayout:I = 0x7f1300f3
 
-.field public static final CardView:I = 0x7f1300f3
+.field public static final CardView:I = 0x7f1300f4
 
-.field public static final CardView_Dark:I = 0x7f1300f4
+.field public static final CardView_Dark:I = 0x7f1300f5
 
-.field public static final CardView_Light:I = 0x7f1300f5
+.field public static final CardView_Light:I = 0x7f1300f6
 
-.field public static final Platform_AppCompat:I = 0x7f130131
+.field public static final Platform_AppCompat:I = 0x7f130132
 
-.field public static final Platform_AppCompat_Light:I = 0x7f130132
+.field public static final Platform_AppCompat_Light:I = 0x7f130133
 
-.field public static final Platform_MaterialComponents:I = 0x7f130133
+.field public static final Platform_MaterialComponents:I = 0x7f130134
 
-.field public static final Platform_MaterialComponents_Dialog:I = 0x7f130134
+.field public static final Platform_MaterialComponents_Dialog:I = 0x7f130135
 
-.field public static final Platform_MaterialComponents_Light:I = 0x7f130135
+.field public static final Platform_MaterialComponents_Light:I = 0x7f130136
 
-.field public static final Platform_MaterialComponents_Light_Dialog:I = 0x7f130136
+.field public static final Platform_MaterialComponents_Light_Dialog:I = 0x7f130137
 
-.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130137
+.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130138
 
-.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130138
+.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130139
 
-.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f130139
+.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f13013a
 
-.field public static final Platform_V21_AppCompat:I = 0x7f13013a
+.field public static final Platform_V21_AppCompat:I = 0x7f13013b
 
-.field public static final Platform_V21_AppCompat_Light:I = 0x7f13013b
+.field public static final Platform_V21_AppCompat_Light:I = 0x7f13013c
 
-.field public static final Platform_V25_AppCompat:I = 0x7f13013c
+.field public static final Platform_V25_AppCompat:I = 0x7f13013d
 
-.field public static final Platform_V25_AppCompat_Light:I = 0x7f13013d
+.field public static final Platform_V25_AppCompat_Light:I = 0x7f13013e
 
-.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13013e
+.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13013f
 
-.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f13013f
+.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f130140
 
-.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f130140
+.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f130141
 
-.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f130141
+.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f130142
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f130142
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f130143
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130143
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130144
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130144
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130145
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130145
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130146
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130146
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130147
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130147
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130148
 
-.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13014d
+.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13014e
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130148
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130149
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f130149
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f13014a
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f13014a
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f13014b
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f13014b
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f13014c
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f13014c
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f13014d
 
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13014e
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13014f
 
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f13014f
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f130150
 
-.field public static final TextAppearance_AppCompat:I = 0x7f130152
+.field public static final TextAppearance_AppCompat:I = 0x7f130153
 
-.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130153
+.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130154
 
-.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130154
+.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130155
 
-.field public static final TextAppearance_AppCompat_Button:I = 0x7f130155
+.field public static final TextAppearance_AppCompat_Button:I = 0x7f130156
 
-.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130156
+.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130157
 
-.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130157
+.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130158
 
-.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130158
+.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130159
 
-.field public static final TextAppearance_AppCompat_Display3:I = 0x7f130159
+.field public static final TextAppearance_AppCompat_Display3:I = 0x7f13015a
 
-.field public static final TextAppearance_AppCompat_Display4:I = 0x7f13015a
+.field public static final TextAppearance_AppCompat_Display4:I = 0x7f13015b
 
-.field public static final TextAppearance_AppCompat_Headline:I = 0x7f13015b
+.field public static final TextAppearance_AppCompat_Headline:I = 0x7f13015c
 
-.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13015c
+.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13015d
 
-.field public static final TextAppearance_AppCompat_Large:I = 0x7f13015d
+.field public static final TextAppearance_AppCompat_Large:I = 0x7f13015e
 
-.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13015e
+.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13015f
 
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f13015f
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f130160
 
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f130160
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f130161
 
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130161
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130162
 
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130162
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130163
 
-.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130163
+.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130164
 
-.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130164
+.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130165
 
-.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130165
+.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130166
 
-.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130166
+.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130167
 
-.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130167
+.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130168
 
-.field public static final TextAppearance_AppCompat_Small:I = 0x7f130168
+.field public static final TextAppearance_AppCompat_Small:I = 0x7f130169
 
-.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f130169
+.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f13016a
 
-.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f13016a
+.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f13016b
 
-.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13016b
+.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13016c
 
-.field public static final TextAppearance_AppCompat_Title:I = 0x7f13016c
+.field public static final TextAppearance_AppCompat_Title:I = 0x7f13016d
 
-.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13016d
+.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13016e
 
-.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13016e
+.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13016f
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13016f
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f130170
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130170
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130171
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130171
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130172
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130172
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130173
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130173
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130174
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130174
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130175
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f130175
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f130176
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130176
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130177
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f130177
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f130178
 
-.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f130178
+.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f130179
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130179
+.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f13017a
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f13017a
+.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f13017b
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f13017b
+.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f13017c
 
-.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13017c
+.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13017d
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13017d
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13017e
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13017e
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13017f
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13017f
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f130180
 
-.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f130180
+.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f130181
 
-.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f130181
+.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f130182
 
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f130184
+.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f130185
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f130186
+.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f130187
 
-.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f130187
+.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f130188
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f130189
+.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f13018a
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f13018b
+.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f13018c
 
-.field public static final TextAppearance_Design_CollapsingToolbar_Expanded:I = 0x7f13018c
+.field public static final TextAppearance_Design_CollapsingToolbar_Expanded:I = 0x7f13018d
 
-.field public static final TextAppearance_Design_Counter:I = 0x7f13018d
+.field public static final TextAppearance_Design_Counter:I = 0x7f13018e
 
-.field public static final TextAppearance_Design_Counter_Overflow:I = 0x7f13018e
+.field public static final TextAppearance_Design_Counter_Overflow:I = 0x7f13018f
 
-.field public static final TextAppearance_Design_Error:I = 0x7f13018f
+.field public static final TextAppearance_Design_Error:I = 0x7f130190
 
-.field public static final TextAppearance_Design_HelperText:I = 0x7f130190
+.field public static final TextAppearance_Design_HelperText:I = 0x7f130191
 
-.field public static final TextAppearance_Design_Hint:I = 0x7f130191
+.field public static final TextAppearance_Design_Hint:I = 0x7f130192
 
-.field public static final TextAppearance_Design_Snackbar_Message:I = 0x7f130192
+.field public static final TextAppearance_Design_Snackbar_Message:I = 0x7f130193
 
-.field public static final TextAppearance_Design_Tab:I = 0x7f130193
+.field public static final TextAppearance_Design_Tab:I = 0x7f130194
 
-.field public static final TextAppearance_MaterialComponents_Body1:I = 0x7f130195
+.field public static final TextAppearance_MaterialComponents_Body1:I = 0x7f130196
 
-.field public static final TextAppearance_MaterialComponents_Body2:I = 0x7f130196
+.field public static final TextAppearance_MaterialComponents_Body2:I = 0x7f130197
 
-.field public static final TextAppearance_MaterialComponents_Button:I = 0x7f130197
+.field public static final TextAppearance_MaterialComponents_Button:I = 0x7f130198
 
-.field public static final TextAppearance_MaterialComponents_Caption:I = 0x7f130198
+.field public static final TextAppearance_MaterialComponents_Caption:I = 0x7f130199
 
-.field public static final TextAppearance_MaterialComponents_Chip:I = 0x7f130199
+.field public static final TextAppearance_MaterialComponents_Chip:I = 0x7f13019a
 
-.field public static final TextAppearance_MaterialComponents_Headline1:I = 0x7f13019a
+.field public static final TextAppearance_MaterialComponents_Headline1:I = 0x7f13019b
 
-.field public static final TextAppearance_MaterialComponents_Headline2:I = 0x7f13019b
+.field public static final TextAppearance_MaterialComponents_Headline2:I = 0x7f13019c
 
-.field public static final TextAppearance_MaterialComponents_Headline3:I = 0x7f13019c
+.field public static final TextAppearance_MaterialComponents_Headline3:I = 0x7f13019d
 
-.field public static final TextAppearance_MaterialComponents_Headline4:I = 0x7f13019d
+.field public static final TextAppearance_MaterialComponents_Headline4:I = 0x7f13019e
 
-.field public static final TextAppearance_MaterialComponents_Headline5:I = 0x7f13019e
+.field public static final TextAppearance_MaterialComponents_Headline5:I = 0x7f13019f
 
-.field public static final TextAppearance_MaterialComponents_Headline6:I = 0x7f13019f
+.field public static final TextAppearance_MaterialComponents_Headline6:I = 0x7f1301a0
 
-.field public static final TextAppearance_MaterialComponents_Overline:I = 0x7f1301a0
+.field public static final TextAppearance_MaterialComponents_Overline:I = 0x7f1301a1
 
-.field public static final TextAppearance_MaterialComponents_Subtitle1:I = 0x7f1301a1
+.field public static final TextAppearance_MaterialComponents_Subtitle1:I = 0x7f1301a2
 
-.field public static final TextAppearance_MaterialComponents_Subtitle2:I = 0x7f1301a2
+.field public static final TextAppearance_MaterialComponents_Subtitle2:I = 0x7f1301a3
 
-.field public static final TextAppearance_MaterialComponents_Tab:I = 0x7f1301a3
+.field public static final TextAppearance_MaterialComponents_Tab:I = 0x7f1301a4
 
-.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301a4
+.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301a5
 
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301a5
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301a6
 
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301a6
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301a7
 
-.field public static final ThemeOverlay_AppCompat:I = 0x7f1301d9
+.field public static final ThemeOverlay_AppCompat:I = 0x7f1301da
 
-.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f1301da
+.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f1301db
 
-.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f1301db
+.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f1301dc
 
-.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f1301dc
+.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f1301dd
 
-.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f1301dd
+.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f1301de
 
-.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f1301de
+.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f1301df
 
-.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f1301df
+.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f1301e0
 
-.field public static final ThemeOverlay_MaterialComponents:I = 0x7f1301e0
+.field public static final ThemeOverlay_MaterialComponents:I = 0x7f1301e1
 
-.field public static final ThemeOverlay_MaterialComponents_ActionBar:I = 0x7f1301e1
+.field public static final ThemeOverlay_MaterialComponents_ActionBar:I = 0x7f1301e2
 
-.field public static final ThemeOverlay_MaterialComponents_Dark:I = 0x7f1301e2
+.field public static final ThemeOverlay_MaterialComponents_Dark:I = 0x7f1301e3
 
-.field public static final ThemeOverlay_MaterialComponents_Dark_ActionBar:I = 0x7f1301e3
+.field public static final ThemeOverlay_MaterialComponents_Dark_ActionBar:I = 0x7f1301e4
 
-.field public static final ThemeOverlay_MaterialComponents_Dialog:I = 0x7f1301e4
+.field public static final ThemeOverlay_MaterialComponents_Dialog:I = 0x7f1301e5
 
-.field public static final ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f1301e5
+.field public static final ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f1301e6
 
-.field public static final ThemeOverlay_MaterialComponents_Light:I = 0x7f1301e6
+.field public static final ThemeOverlay_MaterialComponents_Light:I = 0x7f1301e7
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText:I = 0x7f1301e7
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText:I = 0x7f1301e8
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f1301e8
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f1301e9
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f1301e9
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f1301ea
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f1301ea
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f1301eb
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f1301eb
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f1301ec
 
-.field public static final Theme_AppCompat:I = 0x7f1301a7
+.field public static final Theme_AppCompat:I = 0x7f1301a8
 
-.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301a8
+.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301a9
 
-.field public static final Theme_AppCompat_DayNight:I = 0x7f1301a9
+.field public static final Theme_AppCompat_DayNight:I = 0x7f1301aa
 
-.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301aa
+.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301ab
 
-.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301ab
+.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301ac
 
-.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301ae
+.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301af
 
-.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301ac
+.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301ad
 
-.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301ad
+.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301ae
 
-.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301af
+.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301b0
 
-.field public static final Theme_AppCompat_Dialog:I = 0x7f1301b0
+.field public static final Theme_AppCompat_Dialog:I = 0x7f1301b1
 
-.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301b3
+.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301b4
 
-.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301b1
+.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301b2
 
-.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301b2
+.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301b3
 
-.field public static final Theme_AppCompat_Light:I = 0x7f1301b4
+.field public static final Theme_AppCompat_Light:I = 0x7f1301b5
 
-.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301b5
+.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301b6
 
-.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301b6
+.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301b7
 
-.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301b9
+.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301ba
 
-.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301b7
+.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301b8
 
-.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301b8
+.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301b9
 
-.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301ba
+.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301bb
 
-.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301bb
+.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301bc
 
-.field public static final Theme_Design:I = 0x7f1301be
+.field public static final Theme_Design:I = 0x7f1301bf
 
-.field public static final Theme_Design_BottomSheetDialog:I = 0x7f1301bf
+.field public static final Theme_Design_BottomSheetDialog:I = 0x7f1301c0
 
-.field public static final Theme_Design_Light:I = 0x7f1301c0
+.field public static final Theme_Design_Light:I = 0x7f1301c1
 
-.field public static final Theme_Design_Light_BottomSheetDialog:I = 0x7f1301c1
+.field public static final Theme_Design_Light_BottomSheetDialog:I = 0x7f1301c2
 
-.field public static final Theme_Design_Light_NoActionBar:I = 0x7f1301c2
+.field public static final Theme_Design_Light_NoActionBar:I = 0x7f1301c3
 
-.field public static final Theme_Design_NoActionBar:I = 0x7f1301c3
+.field public static final Theme_Design_NoActionBar:I = 0x7f1301c4
 
-.field public static final Theme_MaterialComponents:I = 0x7f1301c4
+.field public static final Theme_MaterialComponents:I = 0x7f1301c5
 
-.field public static final Theme_MaterialComponents_BottomSheetDialog:I = 0x7f1301c5
+.field public static final Theme_MaterialComponents_BottomSheetDialog:I = 0x7f1301c6
 
-.field public static final Theme_MaterialComponents_Bridge:I = 0x7f1301c6
+.field public static final Theme_MaterialComponents_Bridge:I = 0x7f1301c7
 
-.field public static final Theme_MaterialComponents_CompactMenu:I = 0x7f1301c7
+.field public static final Theme_MaterialComponents_CompactMenu:I = 0x7f1301c8
 
-.field public static final Theme_MaterialComponents_Dialog:I = 0x7f1301c8
+.field public static final Theme_MaterialComponents_Dialog:I = 0x7f1301c9
 
-.field public static final Theme_MaterialComponents_DialogWhenLarge:I = 0x7f1301cb
+.field public static final Theme_MaterialComponents_DialogWhenLarge:I = 0x7f1301cc
 
-.field public static final Theme_MaterialComponents_Dialog_Alert:I = 0x7f1301c9
+.field public static final Theme_MaterialComponents_Dialog_Alert:I = 0x7f1301ca
 
-.field public static final Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f1301ca
+.field public static final Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f1301cb
 
-.field public static final Theme_MaterialComponents_Light:I = 0x7f1301cc
+.field public static final Theme_MaterialComponents_Light:I = 0x7f1301cd
 
-.field public static final Theme_MaterialComponents_Light_BottomSheetDialog:I = 0x7f1301cd
+.field public static final Theme_MaterialComponents_Light_BottomSheetDialog:I = 0x7f1301ce
 
-.field public static final Theme_MaterialComponents_Light_Bridge:I = 0x7f1301ce
+.field public static final Theme_MaterialComponents_Light_Bridge:I = 0x7f1301cf
 
-.field public static final Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f1301cf
+.field public static final Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f1301d0
 
-.field public static final Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f1301d0
+.field public static final Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f1301d1
 
-.field public static final Theme_MaterialComponents_Light_Dialog:I = 0x7f1301d1
+.field public static final Theme_MaterialComponents_Light_Dialog:I = 0x7f1301d2
 
-.field public static final Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f1301d4
+.field public static final Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f1301d5
 
-.field public static final Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f1301d2
+.field public static final Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f1301d3
 
-.field public static final Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f1301d3
+.field public static final Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f1301d4
 
-.field public static final Theme_MaterialComponents_Light_NoActionBar:I = 0x7f1301d5
+.field public static final Theme_MaterialComponents_Light_NoActionBar:I = 0x7f1301d6
 
-.field public static final Theme_MaterialComponents_Light_NoActionBar_Bridge:I = 0x7f1301d6
+.field public static final Theme_MaterialComponents_Light_NoActionBar_Bridge:I = 0x7f1301d7
 
-.field public static final Theme_MaterialComponents_NoActionBar:I = 0x7f1301d7
+.field public static final Theme_MaterialComponents_NoActionBar:I = 0x7f1301d8
 
-.field public static final Theme_MaterialComponents_NoActionBar_Bridge:I = 0x7f1301d8
+.field public static final Theme_MaterialComponents_NoActionBar_Bridge:I = 0x7f1301d9
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302ac
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302af
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302ad
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302b0
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302ae
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302b1
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302af
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302b2
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302b0
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302b3
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302b1
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302b4
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302b2
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302b5
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302b3
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302b6
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302b4
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302b7
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302b5
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302b8
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302b6
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302b9
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1302b7
+.field public static final Widget_AppCompat_Button:I = 0x7f1302ba
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302bd
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302c0
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302be
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302c1
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302b8
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302bb
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302b9
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302bc
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302ba
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302bd
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302bb
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302be
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302bc
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302bf
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302bf
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302c2
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302c0
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302c3
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302c1
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302c4
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1302c2
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1302c5
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1302c3
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1302c6
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1302c4
+.field public static final Widget_AppCompat_EditText:I = 0x7f1302c7
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1302c5
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1302c8
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1302c6
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1302c9
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1302c7
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1302ca
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1302c8
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1302cb
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1302c9
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1302cc
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1302ca
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1302cd
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1302cb
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1302ce
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1302cc
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1302cf
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1302cd
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1302d0
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1302ce
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1302d1
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1302cf
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1302d2
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1302d0
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1302d3
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1302d1
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1302d4
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1302d2
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1302d5
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1302d3
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1302d6
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1302d4
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1302d7
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1302d5
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1302d8
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1302d6
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1302d9
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1302d7
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1302da
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1302d8
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1302db
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1302d9
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1302dc
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1302da
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1302dd
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1302db
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1302de
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1302dc
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1302df
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1302dd
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1302e0
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1302de
+.field public static final Widget_AppCompat_ListView:I = 0x7f1302e1
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1302df
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1302e2
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1302e0
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1302e3
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1302e1
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1302e4
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1302e2
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1302e5
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1302e3
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1302e6
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1302e4
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1302e7
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1302e5
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1302e8
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1302e6
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1302e9
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1302e7
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1302ea
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1302e8
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1302eb
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1302e9
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1302ec
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1302ea
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1302ed
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1302eb
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1302ee
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1302ec
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1302ef
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1302ed
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1302f0
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1302ee
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1302f1
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1302ef
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1302f2
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1302f0
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1302f3
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1302f1
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1302f4
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1302f2
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1302f5
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1302f3
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1302f6
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Design_AppBarLayout:I = 0x7f1302f7
+.field public static final Widget_Design_AppBarLayout:I = 0x7f1302fa
 
-.field public static final Widget_Design_BottomNavigationView:I = 0x7f1302f8
+.field public static final Widget_Design_BottomNavigationView:I = 0x7f1302fb
 
-.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1302f9
+.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1302fc
 
-.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1302fa
+.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1302fd
 
-.field public static final Widget_Design_FloatingActionButton:I = 0x7f1302fb
+.field public static final Widget_Design_FloatingActionButton:I = 0x7f1302fe
 
-.field public static final Widget_Design_NavigationView:I = 0x7f1302fc
+.field public static final Widget_Design_NavigationView:I = 0x7f1302ff
 
-.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f1302fd
+.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f130300
 
-.field public static final Widget_Design_Snackbar:I = 0x7f1302fe
+.field public static final Widget_Design_Snackbar:I = 0x7f130301
 
-.field public static final Widget_Design_TabLayout:I = 0x7f1302ff
+.field public static final Widget_Design_TabLayout:I = 0x7f130302
 
-.field public static final Widget_Design_TextInputLayout:I = 0x7f130300
+.field public static final Widget_Design_TextInputLayout:I = 0x7f130303
 
-.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f130301
+.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f130304
 
-.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f130302
+.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f130305
 
-.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f130303
+.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f130306
 
-.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f130304
+.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f130307
 
-.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130305
+.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130308
 
-.field public static final Widget_MaterialComponents_Button:I = 0x7f130306
+.field public static final Widget_MaterialComponents_Button:I = 0x7f130309
 
-.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f130307
+.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f13030a
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f130308
+.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f13030b
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f130309
+.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f13030c
 
-.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f13030a
+.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f13030d
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f13030b
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f13030e
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f13030c
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f13030f
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f13030d
+.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f130310
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f13030e
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f130311
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f13030f
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f130312
 
-.field public static final Widget_MaterialComponents_CardView:I = 0x7f130310
+.field public static final Widget_MaterialComponents_CardView:I = 0x7f130313
 
-.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130315
+.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130318
 
-.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f130311
+.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f130314
 
-.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130312
+.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130315
 
-.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130313
+.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130316
 
-.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130314
+.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130317
 
-.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f130316
+.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f130319
 
-.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f130317
+.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f13031a
 
-.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f130318
+.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f13031b
 
-.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f130319
+.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f13031c
 
-.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13031a
+.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13031d
 
-.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13031b
+.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13031e
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f13031c
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f13031f
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f13031d
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f130320
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f13031e
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f130321
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f13031f
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f130322
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130320
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130323
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130321
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130324
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130322
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130325
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130323
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130326
 
-.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f130324
+.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f130327
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # 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 50e70f7cc4..2e17f6a4f2 100644
--- a/com.discord/smali/com/discord/restapi/R$styleable.smali
+++ b/com.discord/smali/com/discord/restapi/R$styleable.smali
@@ -2060,7 +2060,7 @@
 
     new-array v5, v1, [I
 
-    const v7, 0x7f040130
+    const v7, 0x7f040132
 
     aput v7, v5, v3
 
@@ -2134,7 +2134,7 @@
 
     new-array v6, v1, [I
 
-    const v9, 0x7f04026d
+    const v9, 0x7f040270
 
     aput v9, v6, v3
 
@@ -2180,7 +2180,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040305
+    const v6, 0x7f040308
 
     aput v6, v5, v3
 
@@ -2200,7 +2200,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f0401ec
+    const v6, 0x7f0401ee
 
     aput v6, v5, v3
 
@@ -2347,60 +2347,60 @@
         0x7f04004c
         0x7f04004e
         0x7f04004f
-        0x7f0400c8
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f0400e9
-        0x7f040103
+        0x7f0400ce
+        0x7f0400ea
         0x7f040104
-        0x7f040112
-        0x7f040156
-        0x7f04015b
-        0x7f040162
-        0x7f040163
-        0x7f0401c7
-        0x7f0401ea
-        0x7f0401f4
-        0x7f040257
-        0x7f040273
-        0x7f04028b
-        0x7f0402b9
-        0x7f0402ba
-        0x7f040313
+        0x7f040105
+        0x7f040114
+        0x7f040158
+        0x7f04015d
+        0x7f040164
+        0x7f040165
+        0x7f0401c9
+        0x7f0401ec
+        0x7f0401f6
+        0x7f04025a
+        0x7f040276
+        0x7f04028e
+        0x7f0402bc
+        0x7f0402bd
         0x7f040316
-        0x7f0403af
-        0x7f0403b9
+        0x7f040319
+        0x7f0403b2
+        0x7f0403bc
     .end array-data
 
     :array_1
     .array-data 4
         0x7f04004c
         0x7f04004e
-        0x7f0400ac
-        0x7f040156
-        0x7f040316
-        0x7f0403b9
+        0x7f0400ad
+        0x7f040158
+        0x7f040319
+        0x7f0403bc
     .end array-data
 
     :array_2
     .array-data 4
-        0x7f040118
-        0x7f0401eb
+        0x7f04011a
+        0x7f0401ed
     .end array-data
 
     :array_3
     .array-data 4
         0x10100f2
-        0x7f04007a
         0x7f04007b
-        0x7f04024e
-        0x7f04024f
-        0x7f040270
-        0x7f0402f8
-        0x7f0402f9
+        0x7f04007c
+        0x7f040251
+        0x7f040252
+        0x7f040273
+        0x7f0402fb
+        0x7f0402fc
     .end array-data
 
     :array_4
@@ -2432,39 +2432,39 @@
         0x10100d4
         0x101048f
         0x1010540
-        0x7f040112
-        0x7f040119
-        0x7f040249
+        0x7f040114
+        0x7f04011b
+        0x7f04024c
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f040306
-        0x7f040307
-        0x7f040308
         0x7f040309
+        0x7f04030a
+        0x7f04030b
+        0x7f04030c
     .end array-data
 
     :array_9
     .array-data 4
-        0x7f040243
-        0x7f040244
+        0x7f040245
+        0x7f040246
     .end array-data
 
     :array_a
     .array-data 4
         0x1010119
-        0x7f040303
-        0x7f0403ad
-        0x7f0403ae
+        0x7f040306
+        0x7f0403b0
+        0x7f0403b1
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f0403aa
-        0x7f0403ab
-        0x7f0403ac
+        0x7f0403ad
+        0x7f0403ae
+        0x7f0403af
     .end array-data
 
     :array_c
@@ -2486,11 +2486,11 @@
         0x7f040048
         0x7f040049
         0x7f04004a
-        0x7f040131
-        0x7f04013f
-        0x7f0401fd
-        0x7f04024a
-        0x7f040339
+        0x7f040133
+        0x7f040141
+        0x7f0401ff
+        0x7f04024d
+        0x7f04033c
     .end array-data
 
     :array_e
@@ -2533,17 +2533,16 @@
         0x7f04002b
         0x7f04002c
         0x7f040044
-        0x7f040065
-        0x7f040074
+        0x7f040066
         0x7f040075
         0x7f040076
         0x7f040077
         0x7f040078
-        0x7f04007d
+        0x7f040079
         0x7f04007e
-        0x7f04008c
-        0x7f040091
-        0x7f0400b2
+        0x7f04007f
+        0x7f04008d
+        0x7f040092
         0x7f0400b3
         0x7f0400b4
         0x7f0400b5
@@ -2551,95 +2550,96 @@
         0x7f0400b7
         0x7f0400b8
         0x7f0400b9
-        0x7f0400bc
-        0x7f0400c1
-        0x7f0400d4
-        0x7f040100
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c2
+        0x7f0400d5
         0x7f040101
         0x7f040102
-        0x7f040108
-        0x7f04010a
-        0x7f04010d
-        0x7f04010e
+        0x7f040103
+        0x7f040109
+        0x7f04010b
         0x7f04010f
         0x7f040110
         0x7f040111
-        0x7f040162
-        0x7f0401d2
-        0x7f04024c
-        0x7f04024d
+        0x7f040112
+        0x7f040113
+        0x7f040164
+        0x7f0401d4
+        0x7f04024f
         0x7f040250
-        0x7f040251
-        0x7f040252
         0x7f040253
         0x7f040254
         0x7f040255
         0x7f040256
-        0x7f040280
-        0x7f040281
-        0x7f040282
-        0x7f04028a
-        0x7f04028c
-        0x7f0402bf
+        0x7f040257
+        0x7f040258
+        0x7f040259
+        0x7f040283
+        0x7f040284
+        0x7f040285
+        0x7f04028d
+        0x7f04028f
         0x7f0402c2
-        0x7f0402c3
-        0x7f0402c4
-        0x7f0402eb
-        0x7f0402ed
+        0x7f0402c5
+        0x7f0402c6
+        0x7f0402c7
         0x7f0402ee
-        0x7f0402ef
-        0x7f040300
-        0x7f040301
-        0x7f04031a
-        0x7f040344
-        0x7f040345
-        0x7f040346
+        0x7f0402f0
+        0x7f0402f1
+        0x7f0402f2
+        0x7f040303
+        0x7f040304
+        0x7f04031d
         0x7f040347
+        0x7f040348
         0x7f040349
         0x7f04034a
-        0x7f04034b
         0x7f04034c
+        0x7f04034d
+        0x7f04034e
         0x7f04034f
-        0x7f040350
-        0x7f0403bb
-        0x7f0403bc
-        0x7f0403bd
+        0x7f040352
+        0x7f040353
         0x7f0403be
-        0x7f0403dc
-        0x7f0403df
-        0x7f0403e0
+        0x7f0403bf
+        0x7f0403c0
+        0x7f0403c1
         0x7f0403e1
-        0x7f0403e2
-        0x7f0403e3
         0x7f0403e4
         0x7f0403e5
         0x7f0403e6
         0x7f0403e7
         0x7f0403e8
+        0x7f0403e9
+        0x7f0403ea
+        0x7f0403eb
+        0x7f0403ec
+        0x7f0403ed
     .end array-data
 
     :array_f
     .array-data 4
         0x7f040050
-        0x7f040121
-        0x7f040122
         0x7f040123
         0x7f040124
-        0x7f04015c
+        0x7f040125
+        0x7f040126
+        0x7f04015e
     .end array-data
 
     :array_10
     .array-data 4
-        0x7f040112
-        0x7f0401ee
+        0x7f040114
         0x7f0401f0
         0x7f0401f2
-        0x7f0401f3
-        0x7f0401f7
-        0x7f0401f8
+        0x7f0401f4
+        0x7f0401f5
         0x7f0401f9
-        0x7f0401fc
-        0x7f04026f
+        0x7f0401fa
+        0x7f0401fb
+        0x7f0401fe
+        0x7f040272
     .end array-data
 
     :array_11
@@ -2654,17 +2654,17 @@
     .array-data 4
         0x101013f
         0x1010140
-        0x7f040081
         0x7f040082
         0x7f040083
         0x7f040084
         0x7f040085
         0x7f040086
-        0x7f0400ce
+        0x7f040087
         0x7f0400cf
         0x7f0400d0
         0x7f0400d1
         0x7f0400d2
+        0x7f0400d3
     .end array-data
 
     :array_13
@@ -2674,50 +2674,49 @@
         0x101011f
         0x101014f
         0x10101e5
-        0x7f04008e
         0x7f04008f
         0x7f040090
-        0x7f040092
+        0x7f040091
         0x7f040093
         0x7f040094
-        0x7f040096
+        0x7f040095
         0x7f040097
         0x7f040098
         0x7f040099
         0x7f04009a
         0x7f04009b
-        0x7f0400a0
+        0x7f04009c
         0x7f0400a1
         0x7f0400a2
-        0x7f0400a5
+        0x7f0400a3
         0x7f0400a6
         0x7f0400a7
         0x7f0400a8
         0x7f0400a9
         0x7f0400aa
         0x7f0400ab
-        0x7f04015a
-        0x7f0401c8
-        0x7f0401cc
-        0x7f0402c8
-        0x7f0402f6
-        0x7f040351
-        0x7f040353
+        0x7f0400ac
+        0x7f04015c
+        0x7f0401ca
+        0x7f0401ce
+        0x7f0402cb
+        0x7f0402f9
+        0x7f040354
+        0x7f040356
     .end array-data
 
     :array_14
     .array-data 4
-        0x7f04008d
-        0x7f04009c
+        0x7f04008e
         0x7f04009d
         0x7f04009e
-        0x7f0402fa
-        0x7f0402fb
+        0x7f04009f
+        0x7f0402fd
+        0x7f0402fe
     .end array-data
 
     :array_15
     .array-data 4
-        0x7f0400ea
         0x7f0400eb
         0x7f0400ec
         0x7f0400ed
@@ -2738,32 +2737,33 @@
         0x7f0400fc
         0x7f0400fd
         0x7f0400fe
+        0x7f0400ff
     .end array-data
 
     :array_16
     .array-data 4
-        0x7f0400af
         0x7f0400b0
-        0x7f0400d3
-        0x7f04011a
-        0x7f04011b
+        0x7f0400b1
+        0x7f0400d4
         0x7f04011c
         0x7f04011d
         0x7f04011e
         0x7f04011f
         0x7f040120
-        0x7f0402e6
-        0x7f0402e8
-        0x7f04030b
-        0x7f0403af
-        0x7f0403b0
-        0x7f0403ba
+        0x7f040121
+        0x7f040122
+        0x7f0402e9
+        0x7f0402eb
+        0x7f04030e
+        0x7f0403b2
+        0x7f0403b3
+        0x7f0403bd
     .end array-data
 
     :array_17
     .array-data 4
-        0x7f040204
-        0x7f040205
+        0x7f040206
+        0x7f040207
     .end array-data
 
     :array_18
@@ -2776,31 +2776,31 @@
     :array_19
     .array-data 4
         0x1010107
-        0x7f04007f
         0x7f040080
+        0x7f040081
     .end array-data
 
     :array_1a
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_1b
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_1c
     .array-data 4
-        0x7f040068
         0x7f040069
+        0x7f04006a
     .end array-data
 
     :array_1d
@@ -2808,75 +2808,75 @@
         0x7f04003b
         0x7f04003c
         0x7f040052
-        0x7f0400b1
-        0x7f04010b
-        0x7f04014a
-        0x7f0402ff
-        0x7f0403a6
+        0x7f0400b2
+        0x7f04010c
+        0x7f04014c
+        0x7f040302
+        0x7f0403a9
     .end array-data
 
     :array_1e
     .array-data 4
         0x7f04002d
         0x7f04002e
-        0x7f040105
         0x7f040106
         0x7f040107
-        0x7f040135
-        0x7f04013c
-        0x7f0401fa
-        0x7f0402f2
-        0x7f0402f3
-        0x7f0402f4
+        0x7f040108
+        0x7f040137
+        0x7f04013e
+        0x7f0401fc
+        0x7f0402f5
+        0x7f0402f6
+        0x7f0402f7
     .end array-data
 
     :array_1f
     .array-data 4
-        0x7f040200
-        0x7f040232
-        0x7f040233
+        0x7f040202
         0x7f040234
-        0x7f04023d
-        0x7f04023e
+        0x7f040235
+        0x7f040236
         0x7f04023f
         0x7f040240
+        0x7f040241
         0x7f040242
-        0x7f040245
+        0x7f040244
+        0x7f040247
     .end array-data
 
     :array_20
     .array-data 4
         0x7f040050
         0x7f040051
-        0x7f040064
-        0x7f040112
-        0x7f040125
-        0x7f040126
-        0x7f04015a
-        0x7f040164
-        0x7f04026c
-        0x7f04028f
-        0x7f0402c8
-        0x7f0402f6
-        0x7f0403d7
+        0x7f040065
+        0x7f040114
+        0x7f040127
+        0x7f040128
+        0x7f04015c
+        0x7f040166
+        0x7f04026f
+        0x7f040292
+        0x7f0402cb
+        0x7f0402f9
+        0x7f0403da
     .end array-data
 
     :array_21
     .array-data 4
-        0x7f040132
-        0x7f040133
-        0x7f0401f5
-        0x7f04024b
+        0x7f040134
+        0x7f040135
+        0x7f0401f7
+        0x7f04024e
     .end array-data
 
     :array_22
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_23
@@ -2886,39 +2886,36 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_24
     .array-data 4
         0x1010109
         0x1010200
-        0x7f040149
+        0x7f04014b
     .end array-data
 
     :array_25
     .array-data 4
         0x7f040027
         0x7f04004d
-        0x7f040128
-        0x7f040129
         0x7f04012a
-        0x7f040279
-        0x7f040288
-        0x7f040289
-        0x7f04028e
-        0x7f0402b6
-        0x7f0402b7
-        0x7f0402b8
-        0x7f0402c5
-        0x7f0402c6
+        0x7f04012b
+        0x7f04012c
+        0x7f04027c
+        0x7f04028b
+        0x7f04028c
+        0x7f040291
+        0x7f0402b9
+        0x7f0402ba
+        0x7f0402bb
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f0402cb
         0x7f0402cc
         0x7f0402cd
         0x7f0402ce
@@ -2930,7 +2927,10 @@
         0x7f0402d4
         0x7f0402d5
         0x7f0402d6
-        0x7f0403db
+        0x7f0402d7
+        0x7f0402d8
+        0x7f0402d9
+        0x7f0403e0
     .end array-data
 
     :array_26
@@ -2962,10 +2962,10 @@
         0x1010126
         0x1010127
         0x1010128
-        0x7f040104
-        0x7f040109
-        0x7f04026e
-        0x7f0402f5
+        0x7f040105
+        0x7f04010a
+        0x7f040271
+        0x7f0402f8
     .end array-data
 
     :array_29
@@ -2984,9 +2984,9 @@
 
     :array_2b
     .array-data 4
-        0x7f0400a4
-        0x7f0401d0
-        0x7f0401d1
+        0x7f0400a5
+        0x7f0401d2
+        0x7f0401d3
     .end array-data
 
     :array_2c
@@ -2997,47 +2997,44 @@
         0x10101ba
         0x7f040050
         0x7f040051
-        0x7f0400d6
-        0x7f0401c7
+        0x7f0400d7
         0x7f0401c9
-        0x7f0401ca
         0x7f0401cb
+        0x7f0401cc
         0x7f0401cd
-        0x7f0401ce
-        0x7f0402c8
-        0x7f04030f
-        0x7f040310
+        0x7f0401cf
+        0x7f0401d0
+        0x7f0402cb
+        0x7f040312
+        0x7f040313
     .end array-data
 
     :array_2d
     .array-data 4
-        0x7f04030f
-        0x7f040310
+        0x7f040312
+        0x7f040313
     .end array-data
 
     :array_2e
     .array-data 4
-        0x7f040068
         0x7f040069
-        0x7f040095
-        0x7f04009f
-        0x7f0400a3
-        0x7f0400b2
+        0x7f04006a
+        0x7f040096
+        0x7f0400a0
+        0x7f0400a4
         0x7f0400b3
-        0x7f0400b9
-        0x7f0400bc
-        0x7f0400c0
-        0x7f040111
-        0x7f04013d
-        0x7f040268
-        0x7f040269
-        0x7f040274
-        0x7f0402e7
-        0x7f0402fc
-        0x7f040332
-        0x7f04033a
-        0x7f04033b
-        0x7f04033c
+        0x7f0400b4
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c1
+        0x7f040113
+        0x7f04013f
+        0x7f04026b
+        0x7f04026c
+        0x7f040277
+        0x7f0402ea
+        0x7f0402ff
+        0x7f040335
         0x7f04033d
         0x7f04033e
         0x7f04033f
@@ -3045,10 +3042,13 @@
         0x7f040341
         0x7f040342
         0x7f040343
-        0x7f040348
-        0x7f04034d
-        0x7f04034e
-        0x7f040352
+        0x7f040344
+        0x7f040345
+        0x7f040346
+        0x7f04034b
+        0x7f040350
+        0x7f040351
+        0x7f040355
     .end array-data
 
     :array_2f
@@ -3080,12 +3080,12 @@
         0x7f04001f
         0x7f040020
         0x7f040031
-        0x7f0400c7
-        0x7f0401cd
-        0x7f0401ce
-        0x7f040277
-        0x7f0402f1
-        0x7f0403bf
+        0x7f0400c8
+        0x7f0401cf
+        0x7f0401d0
+        0x7f04027a
+        0x7f0402f4
+        0x7f0403c2
     .end array-data
 
     :array_31
@@ -3097,8 +3097,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04028d
-        0x7f040311
+        0x7f040290
+        0x7f040314
     .end array-data
 
     :array_32
@@ -3106,43 +3106,43 @@
         0x10100d4
         0x10100dd
         0x101011f
-        0x7f040112
-        0x7f040155
-        0x7f0401ee
-        0x7f0401ef
+        0x7f040114
+        0x7f040157
+        0x7f0401f0
         0x7f0401f1
         0x7f0401f3
-        0x7f0401f6
-        0x7f0401f9
-        0x7f04026f
+        0x7f0401f5
+        0x7f0401f8
+        0x7f0401fb
+        0x7f040272
     .end array-data
 
     :array_33
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040278
+        0x7f04027b
     .end array-data
 
     :array_34
     .array-data 4
-        0x7f04027c
         0x7f04027f
+        0x7f040282
     .end array-data
 
     :array_35
     .array-data 4
         0x10100c4
         0x10100f1
-        0x7f04012b
-        0x7f04012c
         0x7f04012d
         0x7f04012e
         0x7f04012f
-        0x7f0401ff
-        0x7f0402c7
-        0x7f0402fe
-        0x7f040304
+        0x7f040130
+        0x7f040131
+        0x7f040201
+        0x7f0402ca
+        0x7f040301
+        0x7f040307
     .end array-data
 
     :array_36
@@ -3151,26 +3151,26 @@
         0x101011f
         0x1010220
         0x1010264
-        0x7f0400a5
-        0x7f0400c2
-        0x7f0400ff
-        0x7f04014f
-        0x7f0401cf
-        0x7f0401fe
-        0x7f0402bd
-        0x7f0402be
-        0x7f0402e9
-        0x7f0402ea
-        0x7f040312
-        0x7f040317
-        0x7f0403dd
+        0x7f0400a6
+        0x7f0400c3
+        0x7f040100
+        0x7f040151
+        0x7f0401d1
+        0x7f040200
+        0x7f0402c0
+        0x7f0402c1
+        0x7f0402ec
+        0x7f0402ed
+        0x7f040315
+        0x7f04031a
+        0x7f0403e2
     .end array-data
 
     :array_37
     .array-data 4
-        0x7f04007c
-        0x7f0400bf
-        0x7f0402e5
+        0x7f04007d
+        0x7f0400c0
+        0x7f0402e8
     .end array-data
 
     :array_38
@@ -3179,21 +3179,18 @@
         0x7f040027
         0x7f040028
         0x7f04004d
-        0x7f040128
-        0x7f040129
         0x7f04012a
-        0x7f040279
-        0x7f040288
-        0x7f040289
-        0x7f04028e
-        0x7f0402b6
-        0x7f0402b7
-        0x7f0402b8
-        0x7f0402c5
-        0x7f0402c6
+        0x7f04012b
+        0x7f04012c
+        0x7f04027c
+        0x7f04028b
+        0x7f04028c
+        0x7f040291
+        0x7f0402b9
+        0x7f0402ba
+        0x7f0402bb
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f0402cb
         0x7f0402cc
         0x7f0402cd
         0x7f0402ce
@@ -3205,20 +3202,23 @@
         0x7f0402d4
         0x7f0402d5
         0x7f0402d6
-        0x7f0403db
+        0x7f0402d7
+        0x7f0402d8
+        0x7f0402d9
+        0x7f0403e0
     .end array-data
 
     :array_39
     .array-data 4
-        0x7f0402fc
-        0x7f0402fd
+        0x7f0402ff
+        0x7f040300
     .end array-data
 
     :array_3a
     .array-data 4
         0x101011f
-        0x7f040112
-        0x7f04026a
+        0x7f040114
+        0x7f04026d
     .end array-data
 
     :array_3b
@@ -3227,7 +3227,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_3c
@@ -3245,17 +3245,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f0402f7
-        0x7f040302
-        0x7f040318
-        0x7f040319
+        0x7f0402fa
+        0x7f040305
         0x7f04031b
-        0x7f0403a7
-        0x7f0403a8
-        0x7f0403a9
-        0x7f0403c0
-        0x7f0403c1
-        0x7f0403c2
+        0x7f04031c
+        0x7f04031e
+        0x7f0403aa
+        0x7f0403ab
+        0x7f0403ac
+        0x7f0403c3
+        0x7f0403c4
+        0x7f0403c5
     .end array-data
 
     :array_3e
@@ -3267,9 +3267,6 @@
 
     :array_3f
     .array-data 4
-        0x7f04031c
-        0x7f04031d
-        0x7f04031e
         0x7f04031f
         0x7f040320
         0x7f040321
@@ -3289,9 +3286,12 @@
         0x7f04032f
         0x7f040330
         0x7f040331
+        0x7f040332
         0x7f040333
         0x7f040334
-        0x7f040335
+        0x7f040336
+        0x7f040337
+        0x7f040338
     .end array-data
 
     :array_40
@@ -3307,15 +3307,14 @@
         0x1010163
         0x1010164
         0x10103ac
-        0x7f04013f
-        0x7f040339
+        0x7f040141
+        0x7f04033c
     .end array-data
 
     :array_41
     .array-data 4
         0x101009a
         0x1010150
-        0x7f04006a
         0x7f04006b
         0x7f04006c
         0x7f04006d
@@ -3324,72 +3323,73 @@
         0x7f040070
         0x7f040071
         0x7f040072
-        0x7f0400d7
+        0x7f040073
         0x7f0400d8
         0x7f0400d9
         0x7f0400da
-        0x7f040116
-        0x7f040117
-        0x7f040157
-        0x7f040158
+        0x7f0400db
+        0x7f040118
+        0x7f040119
         0x7f040159
-        0x7f04015e
+        0x7f04015a
+        0x7f04015b
         0x7f040160
-        0x7f040161
-        0x7f040283
-        0x7f040284
-        0x7f040285
+        0x7f040162
+        0x7f040163
         0x7f040286
         0x7f040287
+        0x7f040288
+        0x7f040289
+        0x7f04028a
     .end array-data
 
     :array_42
     .array-data 4
         0x1010034
-        0x7f040114
-        0x7f040115
+        0x7f040116
+        0x7f040117
     .end array-data
 
     :array_43
     .array-data 4
         0x10100af
         0x1010140
-        0x7f040079
-        0x7f0400ad
+        0x7f04007a
         0x7f0400ae
-        0x7f0400c8
+        0x7f0400af
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f040257
-        0x7f040258
-        0x7f04026b
-        0x7f040271
-        0x7f040272
-        0x7f04028b
-        0x7f040313
-        0x7f040314
-        0x7f040315
-        0x7f0403af
-        0x7f0403b1
+        0x7f0400ce
+        0x7f04025a
+        0x7f04025b
+        0x7f04026e
+        0x7f040274
+        0x7f040275
+        0x7f04028e
+        0x7f040316
+        0x7f040317
+        0x7f040318
         0x7f0403b2
-        0x7f0403b3
         0x7f0403b4
         0x7f0403b5
         0x7f0403b6
         0x7f0403b7
         0x7f0403b8
+        0x7f0403b9
+        0x7f0403ba
+        0x7f0403bb
     .end array-data
 
     :array_44
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04027d
-        0x7f04027e
-        0x7f040355
+        0x7f040280
+        0x7f040281
+        0x7f040358
     .end array-data
 
     :array_45
diff --git a/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor.smali b/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor.smali
index 1f5594b26f..5dd0424e48 100644
--- a/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor.smali
+++ b/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor.smali
@@ -66,11 +66,11 @@
 
     move-result-object v3
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GL()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GA()Lokhttp3/w;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lokhttp3/w;->GZ()Lokhttp3/w$a;
+    invoke-virtual {v4}, Lokhttp3/w;->GN()Lokhttp3/w$a;
 
     move-result-object v4
 
@@ -101,7 +101,7 @@
     invoke-virtual {v3, v0, v2}, Lokhttp3/w$a;->aq(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
     :cond_2
-    invoke-virtual {v3}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {v3}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object v0
 
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 e18205ac02..5e6bc5c935 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
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/restapi/RestAPIBuilder$Companion$clientCallback$1;->invoke(Ljava/lang/String;Lokhttp3/t;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali b/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
index d6b60ace8a..7fb7a234e8 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
@@ -199,9 +199,9 @@
 
     invoke-direct {v0}, Lcom/google/gson/f;-><init>()V
 
-    sget-object v1, Lcom/google/gson/d;->aWt:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aWL:Lcom/google/gson/d;
 
-    iput-object v1, v0, Lcom/google/gson/f;->aWK:Lcom/google/gson/e;
+    iput-object v1, v0, Lcom/google/gson/f;->aXc:Lcom/google/gson/e;
 
     new-instance v1, Lcom/discord/models/domain/Model$TypeAdapterFactory;
 
@@ -209,7 +209,7 @@
 
     check-cast v1, Lcom/google/gson/r;
 
-    iget-object v2, v0, Lcom/google/gson/f;->aWz:Ljava/util/List;
+    iget-object v2, v0, Lcom/google/gson/f;->aWR:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -229,7 +229,7 @@
 
     move-result-object v1
 
-    iget-object v4, v0, Lcom/google/gson/f;->aWz:Ljava/util/List;
+    iget-object v4, v0, Lcom/google/gson/f;->aWR:Ljava/util/List;
 
     invoke-static {v1, v2}, Lcom/google/gson/internal/a/l;->a(Lcom/google/gson/reflect/TypeToken;Ljava/lang/Object;)Lcom/google/gson/r;
 
@@ -242,7 +242,7 @@
     iput-boolean v3, v0, Lcom/google/gson/f;->serializeNulls:Z
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/gson/f;->BJ()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->By()Lcom/google/gson/Gson;
 
     move-result-object p4
 
@@ -276,7 +276,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lb/a/a/i;->JM()Lb/a/a/i;
+    invoke-static {}, Lb/a/a/i;->Jz()Lb/a/a/i;
 
     move-result-object p5
 
@@ -286,7 +286,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lb/b/b/c;->JN()Lb/b/b/c;
+    invoke-static {}, Lb/b/b/c;->JA()Lb/b/b/c;
 
     move-result-object p5
 
@@ -306,11 +306,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, p3}, Lb/n$a;->ff(Ljava/lang/String;)Lb/n$a;
+    invoke-virtual {p1, p3}, Lb/n$a;->fa(Ljava/lang/String;)Lb/n$a;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lb/n$a;->JJ()Lb/n;
+    invoke-virtual {p1}, Lb/n$a;->Jw()Lb/n;
 
     move-result-object p1
 
@@ -432,7 +432,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/t$a;->GS()Lokhttp3/t;
+    invoke-virtual {p1}, Lokhttp3/t$a;->GG()Lokhttp3/t;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIInterface$DefaultImpls.smali b/com.discord/smali/com/discord/restapi/RestAPIInterface$DefaultImpls.smali
index 501c511da3..e4a4c73ef4 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIInterface$DefaultImpls.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIInterface$DefaultImpls.smali
@@ -135,12 +135,12 @@
     throw p0
 .end method
 
-.method public static synthetic postOauth2Authorize$default(Lcom/discord/restapi/RestAPIInterface;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lrx/Observable;
-    .locals 12
+.method public static synthetic postOauth2Authorize$default(Lcom/discord/restapi/RestAPIInterface;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;ILjava/lang/Object;)Lrx/Observable;
+    .locals 14
 
-    move/from16 v0, p9
+    move/from16 v0, p11
 
-    if-nez p10, :cond_4
+    if-nez p12, :cond_6
 
     and-int/lit8 v1, v0, 0x4
 
@@ -153,7 +153,7 @@
     goto :goto_0
 
     :cond_0
-    move-object v6, p3
+    move-object/from16 v6, p3
 
     :goto_0
     and-int/lit8 v1, v0, 0x10
@@ -182,9 +182,33 @@
     move-object/from16 v10, p7
 
     :goto_2
-    and-int/lit16 v0, v0, 0x80
+    and-int/lit16 v1, v0, 0x80
 
-    if-eqz v0, :cond_3
+    if-eqz v1, :cond_3
+
+    move-object v11, v2
+
+    goto :goto_3
+
+    :cond_3
+    move-object/from16 v11, p8
+
+    :goto_3
+    and-int/lit16 v1, v0, 0x100
+
+    if-eqz v1, :cond_4
+
+    move-object v12, v2
+
+    goto :goto_4
+
+    :cond_4
+    move-object/from16 v12, p9
+
+    :goto_4
+    and-int/lit16 v0, v0, 0x200
+
+    if-eqz v0, :cond_5
 
     const-string v0, "authorize"
 
@@ -198,31 +222,31 @@
 
     move-result-object v0
 
-    move-object v11, v0
+    move-object v13, v0
 
-    goto :goto_3
+    goto :goto_5
 
-    :cond_3
-    move-object/from16 v11, p8
+    :cond_5
+    move-object/from16 v13, p10
 
-    :goto_3
+    :goto_5
     move-object v3, p0
 
     move-object v4, p1
 
-    move-object v5, p2
+    move-object/from16 v5, p2
 
     move-object/from16 v7, p4
 
     move-object/from16 v9, p6
 
-    invoke-interface/range {v3 .. 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/util/Map;)Lrx/Observable;
+    invoke-interface/range {v3 .. v13}, 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
 
     return-object v0
 
-    :cond_4
+    :cond_6
     new-instance v0, Ljava/lang/UnsupportedOperationException;
 
     const-string v1, "Super calls with default arguments not supported in this target, function: postOauth2Authorize"
diff --git a/com.discord/smali/com/discord/restapi/RestAPIInterface.smali b/com.discord/smali/com/discord/restapi/RestAPIInterface.smali
index a09c6e92b6..674a137855 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIInterface.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIInterface.smali
@@ -135,7 +135,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            JO = true
+            JB = true
             value = "reaction"
         .end annotation
     .end param
@@ -1588,6 +1588,27 @@
     .end annotation
 .end method
 
+.method public abstract getMyEntitlements(J)Lrx/Observable;
+    .param p1    # J
+        .annotation runtime Lb/c/s;
+            value = "applicationId"
+        .end annotation
+    .end param
+    .annotation runtime Lb/c/f;
+        value = "users/@me/applications/{applicationId}/entitlements"
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(J)",
+            "Lrx/Observable<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;>;"
+        }
+    .end annotation
+.end method
+
 .method public abstract getOAuthTokens()Lrx/Observable;
     .annotation runtime Lb/c/f;
         value = "oauth2/tokens"
@@ -1768,7 +1789,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            JO = true
+            JB = true
             value = "emoji"
         .end annotation
     .end param
@@ -2350,7 +2371,7 @@
     .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/util/Map;)Lrx/Observable;
+.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 Lb/c/t;
             value = "client_id"
@@ -2386,7 +2407,17 @@
             value = "permissions"
         .end annotation
     .end param
-    .param p8    # Ljava/util/Map;
+    .param p8    # Ljava/lang/String;
+        .annotation runtime Lb/c/t;
+            value = "code_challenge"
+        .end annotation
+    .end param
+    .param p9    # Ljava/lang/String;
+        .annotation runtime Lb/c/t;
+            value = "code_challenge_method"
+        .end annotation
+    .end param
+    .param p10    # Ljava/util/Map;
         .annotation runtime Lb/c/a;
         .end annotation
     .end param
@@ -2404,6 +2435,8 @@
             "Ljava/lang/String;",
             "Ljava/lang/String;",
             "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
             "Ljava/util/Map<",
             "Ljava/lang/String;",
             "Ljava/lang/String;",
@@ -2503,7 +2536,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            JO = true
+            JB = true
             value = "reaction"
         .end annotation
     .end param
@@ -2568,7 +2601,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            JO = true
+            JB = true
             value = "reaction"
         .end annotation
     .end param
@@ -2928,21 +2961,6 @@
     .end annotation
 .end method
 
-.method public abstract sendEmailToDownloadDesktop()Lrx/Observable;
-    .annotation runtime Lb/c/o;
-        value = "download/email/desktop"
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Ljava/lang/Void;",
-            ">;"
-        }
-    .end annotation
-.end method
-
 .method public abstract sendMessage(JLcom/discord/restapi/RestAPIParams$Message;)Lrx/Observable;
     .param p1    # J
         .annotation runtime Lb/c/s;
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Consents.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Consents.smali
index 5609bb25db..37f92477da 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Consents.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Consents.smali
@@ -93,7 +93,7 @@
 
     if-eqz p4, :cond_0
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -102,7 +102,7 @@
 
     if-eqz p3, :cond_1
 
-    sget-object p2, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p2, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p2, Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateChannel.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateChannel.smali
index 9e9c55fbe3..7398c82e6f 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateChannel.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateChannel.smali
@@ -58,7 +58,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali b/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali
index 139def1e4e..20c2ea4eb2 100644
--- a/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali
+++ b/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali
@@ -34,11 +34,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GL()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GA()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->GZ()Lokhttp3/w$a;
+    invoke-virtual {v0}, Lokhttp3/w;->GN()Lokhttp3/w$a;
 
     move-result-object v0
 
@@ -64,7 +64,7 @@
 
     invoke-virtual {v0, v2, v1}, Lokhttp3/w$a;->aq(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object v0
 
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 e965024e28..a1a04e6695 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
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/restapi/utils/CountingRequestBody$writeTo$countingSink$1;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
index 4f854d76a7..5c6c1f08f9 100644
--- a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
+++ b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
@@ -152,11 +152,11 @@
 
     iget-object v0, p0, Lcom/discord/restapi/utils/CountingRequestBody;->bytesWrittenSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kd()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JR()Lrx/Observable;
 
     move-result-object v0
 
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 0926808fe5..967b8b94b9 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
@@ -89,23 +89,23 @@
 
     check-cast v0, Lb/h;
 
-    invoke-virtual {v0}, Lb/h;->DF()I
+    invoke-virtual {v0}, Lb/h;->Dv()I
 
     move-result v2
 
-    invoke-virtual {v0}, Lb/h;->JA()Lb/m;
+    invoke-virtual {v0}, Lb/h;->Jn()Lb/m;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lb/m;->JI()Lokhttp3/Response;
+    invoke-virtual {v0}, Lb/m;->Jv()Lokhttp3/Response;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/Response;->GL()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/Response;->GA()Lokhttp3/w;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$1$1.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$1$1.smali
index 519ac010c8..d985e6f5c4 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$1$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$1$1.smali
@@ -68,7 +68,7 @@
 
     invoke-static {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->b(Lcom/discord/rtcconnection/RtcConnection;Z)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$1.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$1.smali
index 5e6bd8334f..f775a3e8ea 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/RtcConnection;-><init>(Ljava/lang/Long;JLjava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;Lcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
+    value = Lcom/discord/rtcconnection/RtcConnection;-><init>(Ljava/lang/Long;JLjava/lang/String;Ljava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;ZLcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$AnalyticsEvent.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$AnalyticsEvent.smali
index 5db91b90e2..8fcab86162 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$AnalyticsEvent.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$AnalyticsEvent.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
-.field public static final enum xQ:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+.field public static final enum yb:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
-.field public static final enum xR:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+.field public static final enum yc:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
-.field public static final enum xS:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+.field public static final enum yd:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
-.field private static final synthetic xT:[Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+.field private static final synthetic ye:[Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
 
 # direct methods
@@ -48,7 +48,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->xQ:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->yb:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     aput-object v1, v0, v2
 
@@ -60,7 +60,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->xR:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->yc:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     aput-object v1, v0, v2
 
@@ -72,11 +72,11 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->xS:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->yd:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->xT:[Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->ye:[Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 .method public static values()[Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
     .locals 1
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->xT:[Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->ye:[Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     invoke-virtual {v0}, [Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$Quality.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$Quality.smali
index 7ca1e5d763..c10b83df64 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$Quality.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$Quality.smali
@@ -29,17 +29,17 @@
 
 
 # static fields
-.field public static final enum xU:Lcom/discord/rtcconnection/RtcConnection$Quality;
+.field public static final enum yf:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
-.field public static final enum xV:Lcom/discord/rtcconnection/RtcConnection$Quality;
+.field public static final enum yg:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
-.field public static final enum xW:Lcom/discord/rtcconnection/RtcConnection$Quality;
+.field public static final enum yh:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
-.field public static final enum xX:Lcom/discord/rtcconnection/RtcConnection$Quality;
+.field public static final enum yi:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
-.field private static final synthetic xY:[Lcom/discord/rtcconnection/RtcConnection$Quality;
+.field private static final synthetic yj:[Lcom/discord/rtcconnection/RtcConnection$Quality;
 
-.field public static final xZ:Lcom/discord/rtcconnection/RtcConnection$Quality$a;
+.field public static final yk:Lcom/discord/rtcconnection/RtcConnection$Quality$a;
 
 
 # direct methods
@@ -58,7 +58,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/RtcConnection$Quality;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xU:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yf:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     aput-object v1, v0, v2
 
@@ -70,7 +70,7 @@
 
     invoke-direct {v1, v4, v3}, Lcom/discord/rtcconnection/RtcConnection$Quality;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xV:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yg:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     aput-object v1, v0, v3
 
@@ -82,7 +82,7 @@
 
     invoke-direct {v1, v4, v3}, Lcom/discord/rtcconnection/RtcConnection$Quality;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xW:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yh:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     aput-object v1, v0, v3
 
@@ -94,17 +94,17 @@
 
     invoke-direct {v1, v4, v3}, Lcom/discord/rtcconnection/RtcConnection$Quality;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xX:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yi:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->xY:[Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->yj:[Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     new-instance v0, Lcom/discord/rtcconnection/RtcConnection$Quality$a;
 
     invoke-direct {v0, v2}, Lcom/discord/rtcconnection/RtcConnection$Quality$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->xZ:Lcom/discord/rtcconnection/RtcConnection$Quality$a;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->yk:Lcom/discord/rtcconnection/RtcConnection$Quality$a;
 
     return-void
 .end method
@@ -139,7 +139,7 @@
 .method public static values()[Lcom/discord/rtcconnection/RtcConnection$Quality;
     .locals 1
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->xY:[Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->yj:[Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     invoke-virtual {v0}, [Lcom/discord/rtcconnection/RtcConnection$Quality;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$a.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$a.smali
index 4fbf047ff7..9842714ae4 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$a.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final ya:Lcom/discord/rtcconnection/RtcConnection$State$a;
+.field public static final yl:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/RtcConnection$State$a;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->ya:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->yl:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$b.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$b.smali
index 06f14297a5..965b4fb170 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$b.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final yb:Lcom/discord/rtcconnection/RtcConnection$State$b;
+.field public static final ym:Lcom/discord/rtcconnection/RtcConnection$State$b;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/RtcConnection$State$b;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$b;->yb:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$b;->ym:Lcom/discord/rtcconnection/RtcConnection$State$b;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$c.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$c.smali
index 454072039b..ce8b8f6927 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$c.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final yc:Lcom/discord/rtcconnection/RtcConnection$State$c;
+.field public static final yn:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/RtcConnection$State$c;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$c;->yc:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$c;->yn:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$d.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$d.smali
index 82468be00b..3cc5aa8041 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$d.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$d.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public final yd:Z
+.field public final yo:Z
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {p0, v0}, Lcom/discord/rtcconnection/RtcConnection$State;-><init>(B)V
 
-    iput-boolean p1, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->yd:Z
+    iput-boolean p1, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->yo:Z
 
     return-void
 .end method
@@ -48,9 +48,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
-    iget-boolean v1, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->yd:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->yo:Z
 
-    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->yd:Z
+    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->yo:Z
 
     if-ne v1, p1, :cond_0
 
@@ -77,7 +77,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->yd:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->yo:Z
 
     if-eqz v0, :cond_0
 
@@ -96,7 +96,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-boolean v1, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->yd:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->yo:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$e.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$e.smali
index 4bb5f74a4c..bfda4e32ab 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$e.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$e.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final ye:Lcom/discord/rtcconnection/RtcConnection$State$e;
+.field public static final yp:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/RtcConnection$State$e;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$e;->ye:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$e;->yp:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$f.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$f.smali
index 34eb6c1017..9c1d82b04a 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$f.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$f.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final yf:Lcom/discord/rtcconnection/RtcConnection$State$f;
+.field public static final yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/RtcConnection$State$f;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yf:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$g.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$g.smali
index 6e77fa698c..34cf1b3a05 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$g.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$g.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final yg:Lcom/discord/rtcconnection/RtcConnection$State$g;
+.field public static final yr:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/RtcConnection$State$g;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->yg:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->yr:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$h.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$h.smali
index db2493538a..9e5bd8afa4 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$h.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$State$h.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final yh:Lcom/discord/rtcconnection/RtcConnection$State$h;
+.field public static final ys:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/RtcConnection$State$h;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->yh:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->ys:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$c.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$c.smali
index a4e560fe57..a359c888ea 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$c.smali
@@ -65,7 +65,7 @@
 
     invoke-interface {p1, v0, v1}, Lcom/discord/rtcconnection/RtcConnection$b;->onAnalyticsEvent(Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;Ljava/util/Map;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$d.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$d.smali
index f0aab0695d..df430c435b 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$d.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$d.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/rtcconnection/RtcConnection$d;
+.class final Lcom/discord/rtcconnection/RtcConnection$d;
 .super Lkotlin/jvm/internal/l;
 .source "RtcConnection.kt"
 
@@ -7,12 +7,12 @@
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/rtcconnection/RtcConnection;
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/rtcconnection/RtcConnection;->a(Ljava/lang/String;Ljava/lang/String;Ljavax/net/ssl/SSLSocketFactory;)Ljava/util/concurrent/Future;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
+    accessFlags = 0x18
     name = null
 .end annotation
 
@@ -37,7 +37,7 @@
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/rtcconnection/RtcConnection;Ljavax/net/ssl/SSLSocketFactory;Ljava/lang/String;Ljava/lang/String;)V
+.method constructor <init>(Lcom/discord/rtcconnection/RtcConnection;Ljavax/net/ssl/SSLSocketFactory;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
@@ -58,7 +58,7 @@
 
 # virtual methods
 .method public final synthetic invoke()Ljava/lang/Object;
-    .locals 12
+    .locals 13
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
@@ -80,86 +80,94 @@
     const-string v0, "ws"
 
     :goto_0
-    new-instance v1, Ljava/lang/StringBuilder;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$endpoint:Ljava/lang/String;
 
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+    const/4 v2, 0x0
 
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    const-string v3, ".gg"
+
+    const-string v4, ".media"
+
+    invoke-static {v1, v3, v4, v2}, Lkotlin/text/l;->c(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;
+
+    move-result-object v1
+
+    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-string v0, "://"
 
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$endpoint:Ljava/lang/String;
+    invoke-virtual {v3, 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 {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
 
-    const/4 v1, 0x0
+    const-string v3, ":80"
 
-    const-string v2, ":80"
+    const-string v4, ":443"
 
-    const-string v3, ":443"
+    invoke-static {v0, v3, v4, v2}, Lkotlin/text/l;->c(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;
 
-    invoke-static {v0, v2, v3, v1}, Lkotlin/text/l;->c(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;
+    move-result-object v6
 
-    move-result-object v5
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+    invoke-static {v3}, Lcom/discord/rtcconnection/RtcConnection;->b(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/rtcconnection/socket/a;
 
-    invoke-static {v2}, Lcom/discord/rtcconnection/RtcConnection;->b(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/rtcconnection/socket/a;
+    move-result-object v3
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const/4 v3, 0x0
+    if-eqz v3, :cond_1
 
-    if-eqz v2, :cond_1
-
-    iget-object v2, v2, Lcom/discord/rtcconnection/socket/a;->endpoint:Ljava/lang/String;
+    iget-object v3, v3, Lcom/discord/rtcconnection/socket/a;->endpoint:Ljava/lang/String;
 
     goto :goto_1
 
     :cond_1
-    move-object v2, v3
+    move-object v3, v4
 
     :goto_1
-    invoke-static {v2, v5}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v6}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v2
+    move-result v3
 
-    if-eqz v2, :cond_3
+    if-eqz v3, :cond_3
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    invoke-static {v2}, Lcom/discord/rtcconnection/RtcConnection;->b(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/rtcconnection/socket/a;
+    invoke-static {v3}, Lcom/discord/rtcconnection/RtcConnection;->b(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/rtcconnection/socket/a;
 
-    move-result-object v2
+    move-result-object v3
 
-    if-eqz v2, :cond_2
+    if-eqz v3, :cond_2
 
-    iget-object v3, v2, Lcom/discord/rtcconnection/socket/a;->token:Ljava/lang/String;
+    iget-object v4, v3, Lcom/discord/rtcconnection/socket/a;->token:Ljava/lang/String;
 
     :cond_2
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$token:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$token:Ljava/lang/String;
 
-    invoke-static {v3, v2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v4, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v2
+    move-result v3
 
-    if-eqz v2, :cond_3
+    if-eqz v3, :cond_3
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    invoke-static {v2}, Lcom/discord/rtcconnection/RtcConnection;->c(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/rtcconnection/RtcConnection$State;
+    invoke-static {v3}, Lcom/discord/rtcconnection/RtcConnection;->c(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/rtcconnection/RtcConnection$State;
 
-    move-result-object v2
+    move-result-object v3
 
-    instance-of v2, v2, Lcom/discord/rtcconnection/RtcConnection$State$d;
+    instance-of v3, v3, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
-    if-nez v2, :cond_3
+    if-nez v3, :cond_3
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
@@ -186,161 +194,159 @@
     goto/16 :goto_3
 
     :cond_3
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    invoke-static {v2}, Lcom/discord/rtcconnection/RtcConnection;->b(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/rtcconnection/socket/a;
+    invoke-static {v3}, Lcom/discord/rtcconnection/RtcConnection;->b(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/rtcconnection/socket/a;
 
-    move-result-object v2
+    move-result-object v3
 
-    const/4 v3, 0x1
+    const/4 v4, 0x1
 
-    if-eqz v2, :cond_4
+    if-eqz v3, :cond_4
 
-    invoke-virtual {v2}, Lcom/discord/rtcconnection/socket/a;->removeAllListeners()V
+    invoke-virtual {v3}, Lcom/discord/rtcconnection/socket/a;->removeAllListeners()V
 
-    sget-object v4, Lcom/discord/rtcconnection/socket/a$d;->zC:Lcom/discord/rtcconnection/socket/a$d;
+    sget-object v5, Lcom/discord/rtcconnection/socket/a$d;->zL:Lcom/discord/rtcconnection/socket/a$d;
 
-    check-cast v4, Lkotlin/jvm/functions/Function1;
+    check-cast v5, Lkotlin/jvm/functions/Function1;
 
-    invoke-virtual {v2, v4}, Lcom/discord/rtcconnection/socket/a;->g(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v3, v5}, Lcom/discord/rtcconnection/socket/a;->g(Lkotlin/jvm/functions/Function1;)V
 
-    iput-boolean v3, v2, Lcom/discord/rtcconnection/socket/a;->zt:Z
+    iput-boolean v4, v3, Lcom/discord/rtcconnection/socket/a;->zC:Z
 
     :cond_4
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    invoke-static {v2}, Lcom/discord/rtcconnection/RtcConnection;->f(Lcom/discord/rtcconnection/RtcConnection;)Z
+    invoke-static {v3}, Lcom/discord/rtcconnection/RtcConnection;->f(Lcom/discord/rtcconnection/RtcConnection;)Z
 
-    move-result v2
+    move-result v3
 
-    if-eqz v2, :cond_5
+    if-eqz v3, :cond_5
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
     invoke-static {v0}, Lcom/discord/rtcconnection/RtcConnection;->d(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/utilities/logging/Logger;
 
-    move-result-object v2
+    move-result-object v3
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
     invoke-static {v0}, Lcom/discord/rtcconnection/RtcConnection;->e(Lcom/discord/rtcconnection/RtcConnection;)Ljava/lang/String;
 
-    move-result-object v3
-
-    const/4 v5, 0x0
+    move-result-object v4
 
     const/4 v6, 0x0
 
-    const/16 v7, 0xc
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    const/16 v8, 0xc
 
-    const-string v4, "Connect called on destroyed instance."
+    const/4 v9, 0x0
 
-    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
+    const-string v5, "Connect called on destroyed instance."
+
+    invoke-static/range {v3 .. v9}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    invoke-static {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Z)V
+    invoke-static {v0, v2}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Z)V
 
     goto/16 :goto_3
 
     :cond_5
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$token:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$token:Ljava/lang/String;
 
-    if-nez v2, :cond_6
+    if-nez v3, :cond_6
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
     invoke-static {v0}, Lcom/discord/rtcconnection/RtcConnection;->d(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/utilities/logging/Logger;
 
-    move-result-object v2
+    move-result-object v3
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
     invoke-static {v0}, Lcom/discord/rtcconnection/RtcConnection;->e(Lcom/discord/rtcconnection/RtcConnection;)Ljava/lang/String;
 
-    move-result-object v3
-
-    const/4 v5, 0x0
+    move-result-object v4
 
     const/4 v6, 0x0
 
-    const/16 v7, 0xc
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    const/16 v8, 0xc
 
-    const-string v4, "Connect called with no token."
+    const/4 v9, 0x0
 
-    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
+    const-string v5, "Connect called with no token."
+
+    invoke-static/range {v3 .. v9}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    invoke-static {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Z)V
+    invoke-static {v0, v2}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Z)V
 
     goto/16 :goto_3
 
     :cond_6
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    invoke-static {v2}, Lcom/discord/rtcconnection/RtcConnection;->d(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/utilities/logging/Logger;
-
-    move-result-object v6
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    const-string v4, "connecting via endpoint: "
-
-    invoke-direct {v2, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-object v4, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$endpoint:Ljava/lang/String;
-
-    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v4, " token: "
-
-    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v4, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$token:Ljava/lang/String;
-
-    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-static {v3}, Lcom/discord/rtcconnection/RtcConnection;->d(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/utilities/logging/Logger;
 
     move-result-object v7
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+    new-instance v3, Ljava/lang/StringBuilder;
 
-    invoke-static {v2}, Lcom/discord/rtcconnection/RtcConnection;->e(Lcom/discord/rtcconnection/RtcConnection;)Ljava/lang/String;
+    const-string v5, "connecting via endpoint: "
+
+    invoke-direct {v3, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v5, " token: "
+
+    invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v5, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$token:Ljava/lang/String;
+
+    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 v8
 
-    const/4 v9, 0x0
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    const/4 v10, 0x4
+    invoke-static {v3}, Lcom/discord/rtcconnection/RtcConnection;->e(Lcom/discord/rtcconnection/RtcConnection;)Ljava/lang/String;
 
-    const/4 v11, 0x0
+    move-result-object v9
 
-    invoke-static/range {v6 .. v11}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
+    const/4 v10, 0x0
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$endpoint:Ljava/lang/String;
+    const/4 v11, 0x4
 
-    check-cast v2, Ljava/lang/CharSequence;
+    const/4 v12, 0x0
 
-    invoke-interface {v2}, Ljava/lang/CharSequence;->length()I
+    invoke-static/range {v7 .. v12}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
 
-    move-result v2
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$endpoint:Ljava/lang/String;
 
-    if-nez v2, :cond_7
+    check-cast v3, Ljava/lang/CharSequence;
 
-    const/4 v1, 0x1
+    invoke-interface {v3}, Ljava/lang/CharSequence;->length()I
+
+    move-result v3
+
+    if-nez v3, :cond_7
+
+    const/4 v2, 0x1
 
     :cond_7
-    if-eqz v1, :cond_8
+    if-eqz v2, :cond_8
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$State$b;->yb:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$State$b;->ym:Lcom/discord/rtcconnection/RtcConnection$State$b;
 
     check-cast v1, Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -350,29 +356,29 @@
 
     :cond_8
     :try_start_0
-    new-instance v1, Ljava/net/URI;
+    new-instance v2, Ljava/net/URI;
 
-    invoke-direct {v1, v0}, Ljava/net/URI;-><init>(Ljava/lang/String;)V
+    invoke-direct {v2, v0}, Ljava/net/URI;-><init>(Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    invoke-virtual {v1}, Ljava/net/URI;->getHost()Ljava/lang/String;
+    invoke-virtual {v2}, Ljava/net/URI;->getHost()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-static {v0, v3}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+
+    invoke-virtual {v2}, Ljava/net/URI;->getPort()I
+
+    move-result v2
+
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
 
-    invoke-static {v0, v2}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
-
-    invoke-virtual {v1}, Ljava/net/URI;->getPort()I
-
-    move-result v1
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/Integer;)V
+    invoke-static {v0, v2}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/Integer;)V
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -381,42 +387,40 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    invoke-static {v1}, Lcom/discord/rtcconnection/RtcConnection;->d(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/utilities/logging/Logger;
+    invoke-static {v2}, Lcom/discord/rtcconnection/RtcConnection;->d(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/utilities/logging/Logger;
 
-    move-result-object v1
+    move-result-object v2
 
     check-cast v0, Ljava/lang/Throwable;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$endpoint:Ljava/lang/String;
-
     const-string v3, "endpoint"
 
-    invoke-static {v3, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {v3, v1}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-static {v2}, Lkotlin/a/ad;->a(Lkotlin/Pair;)Ljava/util/Map;
+    invoke-static {v1}, Lkotlin/a/ad;->a(Lkotlin/Pair;)Ljava/util/Map;
 
-    move-result-object v2
+    move-result-object v1
 
     const-string v3, "Failed to parse RTC endpoint"
 
-    invoke-virtual {v1, v3, v0, v2}, Lcom/discord/utilities/logging/Logger;->e(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v2, v3, v0, v1}, Lcom/discord/utilities/logging/Logger;->e(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
     :goto_2
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
     new-instance v1, Lcom/discord/rtcconnection/socket/a;
 
-    iget-object v6, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$token:Ljava/lang/String;
+    iget-object v7, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$token:Ljava/lang/String;
 
-    iget-object v7, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v8, p0, Lcom/discord/rtcconnection/RtcConnection$d;->$sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-static {v0}, Lcom/discord/rtcconnection/RtcConnection;->d(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/utilities/logging/Logger;
 
-    move-result-object v8
+    move-result-object v9
 
     iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
@@ -424,13 +428,13 @@
 
     move-result-object v2
 
-    invoke-interface {v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->eg()Ljava/util/concurrent/ExecutorService;
+    invoke-interface {v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->ej()Ljava/util/concurrent/ExecutorService;
 
-    move-result-object v9
+    move-result-object v10
 
-    move-object v4, v1
+    move-object v5, v1
 
-    invoke-direct/range {v4 .. v9}, Lcom/discord/rtcconnection/socket/a;-><init>(Ljava/lang/String;Ljava/lang/String;Ljavax/net/ssl/SSLSocketFactory;Lcom/discord/utilities/logging/Logger;Ljava/util/concurrent/ExecutorService;)V
+    invoke-direct/range {v5 .. v10}, Lcom/discord/rtcconnection/socket/a;-><init>(Ljava/lang/String;Ljava/lang/String;Ljavax/net/ssl/SSLSocketFactory;Lcom/discord/utilities/logging/Logger;Ljava/util/concurrent/ExecutorService;)V
 
     iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
@@ -453,7 +457,7 @@
     invoke-static {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/rtcconnection/socket/a;)V
 
     :goto_3
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 869f72a4ea..a975d5fb65 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$e.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$e.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/rtcconnection/RtcConnection$e;
+.class final Lcom/discord/rtcconnection/RtcConnection$e;
 .super Lkotlin/jvm/internal/l;
 .source "RtcConnection.kt"
 
@@ -7,12 +7,12 @@
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/rtcconnection/RtcConnection;
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/rtcconnection/RtcConnection;->ec()Ljava/util/concurrent/Future;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
+    accessFlags = 0x18
     name = null
 .end annotation
 
@@ -31,7 +31,7 @@
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/rtcconnection/RtcConnection;)V
+.method constructor <init>(Lcom/discord/rtcconnection/RtcConnection;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection$e;->this$0:Lcom/discord/rtcconnection/RtcConnection;
@@ -52,7 +52,7 @@
 
     invoke-static {v0}, Lcom/discord/rtcconnection/RtcConnection;->i(Lcom/discord/rtcconnection/RtcConnection;)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 4e4fd9b69f..c6eb38c00e 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$f.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$f.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/RtcConnection;->s(Z)V
+    value = Lcom/discord/rtcconnection/RtcConnection;->q(Z)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final yi:Lcom/discord/rtcconnection/RtcConnection$f;
+.field public static final yt:Lcom/discord/rtcconnection/RtcConnection$f;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/RtcConnection$f;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$f;->yi:Lcom/discord/rtcconnection/RtcConnection$f;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$f;->yt:Lcom/discord/rtcconnection/RtcConnection$f;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     invoke-interface {p1}, Lcom/discord/rtcconnection/RtcConnection$b;->onFatalClose()V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$g.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$g.smali
index c9e2b6af0b..c96d08ada4 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$g.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$g.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/RtcConnection;-><init>(Ljava/lang/Long;JLjava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;Lcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
+    value = Lcom/discord/rtcconnection/RtcConnection;-><init>(Ljava/lang/Long;JLjava/lang/String;Ljava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;ZLcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -39,11 +39,12 @@
 
 
 # virtual methods
-.method public final onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
+.method public final onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
+            "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;",
             "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;",
             "Ljava/util/List<",
             "Lcom/discord/rtcconnection/mediaengine/a;",
@@ -51,51 +52,67 @@
         }
     .end annotation
 
-    const-string v0, "transportInfo"
+    const-string v0, "connection"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "supportedVideoCodecs"
+    const-string p1, "transportInfo"
 
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$g;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+    const-string p1, "supportedVideoCodecs"
 
-    invoke-static {v0, p1, p2}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
+    invoke-static {p3, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection$g;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+
+    invoke-static {p1, p2, p3}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
 
     return-void
 .end method
 
-.method public final onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+.method public final onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
     .locals 1
 
-    const-string v0, "connectionState"
+    const-string v0, "connection"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$g;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+    const-string p1, "connectionState"
 
-    invoke-static {v0, p1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection$g;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+
+    invoke-static {p1, p2}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
     return-void
 .end method
 
-.method public final onDestroy()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+.method public final onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
     .locals 1
 
-    const-string v0, "exception"
+    const-string v0, "connection"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$g;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+    return-void
+.end method
 
-    invoke-static {v0, p1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+.method public final onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+    .locals 1
+
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "exception"
+
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection$g;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+
+    invoke-static {p1, p2}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$h.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$h.smali
index 58156c1531..a8179dd1d0 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$h.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$h.smali
@@ -65,7 +65,7 @@
 
     invoke-interface {p1, v0, v1, v2}, Lcom/discord/rtcconnection/RtcConnection$b;->onSpeaking(JZ)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$i.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$i.smali
index c0bb772b5d..629cad4c98 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$i.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$i.smali
@@ -65,7 +65,7 @@
 
     invoke-interface {p1, v0, v1, v2}, Lcom/discord/rtcconnection/RtcConnection$b;->onVideoStream(JLjava/lang/Integer;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$j.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$j.smali
index d922036e2a..6e19407ae0 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$j.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$j.smali
@@ -52,7 +52,7 @@
 
     invoke-static {v0}, Lcom/discord/rtcconnection/RtcConnection;->j(Lcom/discord/rtcconnection/RtcConnection;)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$k.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$k.smali
index 5da74acae8..2befb0bfde 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$k.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$k.smali
@@ -99,7 +99,7 @@
 
     invoke-static {p1, v0}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$l.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$l.smali
index b145b73123..e4f1e10c72 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$l.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$l.smali
@@ -59,7 +59,7 @@
 
     invoke-interface {p1, v0}, Lcom/discord/rtcconnection/RtcConnection$b;->onQualityUpdate(Lcom/discord/rtcconnection/RtcConnection$Quality;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$m.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$m.smali
index f0e8ffb926..64a00f3835 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$m.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$m.smali
@@ -59,7 +59,7 @@
 
     invoke-interface {p1, v0}, Lcom/discord/rtcconnection/RtcConnection$b;->onStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$n.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$n.smali
index 1dd4651063..0ea386ba22 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$n.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$n.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/RtcConnection;-><init>(Ljava/lang/Long;JLjava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;Lcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
+    value = Lcom/discord/rtcconnection/RtcConnection;-><init>(Ljava/lang/Long;JLjava/lang/String;Ljava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;ZLcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -86,7 +86,7 @@
     return-void
 .end method
 
-.method public final ag(Ljava/lang/String;)V
+.method public final ac(Ljava/lang/String;)V
     .locals 1
 
     const-string v0, "mediaSessionId"
@@ -114,7 +114,7 @@
     return-void
 .end method
 
-.method public final ec()V
+.method public final ef()V
     .locals 1
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$n;->this$0:Lcom/discord/rtcconnection/RtcConnection;
@@ -124,7 +124,7 @@
     return-void
 .end method
 
-.method public final ed()V
+.method public final eg()V
     .locals 1
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$n;->this$0:Lcom/discord/rtcconnection/RtcConnection;
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali
index bbf48c23b4..c407c1e840 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali
@@ -16,9 +16,9 @@
 
 
 # static fields
-.field private static xO:I
+.field private static xZ:I
 
-.field public static final xP:Lcom/discord/rtcconnection/RtcConnection$a;
+.field public static final ya:Lcom/discord/rtcconnection/RtcConnection$a;
 
 
 # instance fields
@@ -32,7 +32,7 @@
 
 .field public final id:Ljava/lang/String;
 
-.field public final listeners:Ljava/util/List;
+.field private final listeners:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -46,23 +46,25 @@
 
 .field private final mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
-.field private mediaSessionId:Ljava/lang/String;
+.field public mediaSessionId:Ljava/lang/String;
+
+.field private final rtcServerId:Ljava/lang/String;
 
 .field public sessionId:Ljava/lang/String;
 
 .field private final userId:J
 
-.field private final xB:Ljava/lang/String;
+.field private final xL:Ljava/lang/String;
 
-.field private final xC:Lcom/discord/rtcconnection/d;
+.field private final xM:Lcom/discord/rtcconnection/d;
 
-.field private final xD:Lcom/discord/utilities/networking/Backoff;
+.field private final xN:Lcom/discord/utilities/networking/Backoff;
 
-.field private xE:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
+.field private xO:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
 
-.field private xF:Z
+.field private xP:Z
 
-.field private xG:Ljava/util/LinkedList;
+.field private xQ:Ljava/util/LinkedList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedList<",
@@ -72,19 +74,21 @@
     .end annotation
 .end field
 
-.field private xH:Lcom/discord/rtcconnection/socket/a;
+.field private xR:Lcom/discord/rtcconnection/socket/a;
 
-.field private xI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+.field public xS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-.field private xJ:Ljava/lang/Integer;
+.field private xT:Ljava/lang/Integer;
 
-.field private xK:I
+.field private xU:I
 
-.field private xL:Ljava/lang/Long;
+.field private xV:Ljava/lang/Long;
 
-.field private final xM:Lcom/discord/rtcconnection/RtcConnection$n;
+.field private final xW:Lcom/discord/rtcconnection/RtcConnection$n;
 
-.field private final xN:Lcom/discord/rtcconnection/RtcConnection$g;
+.field private final xX:Lcom/discord/rtcconnection/RtcConnection$g;
+
+.field private final xY:Z
 
 
 # direct methods
@@ -97,59 +101,71 @@
 
     invoke-direct {v0, v1}, Lcom/discord/rtcconnection/RtcConnection$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection;->xP:Lcom/discord/rtcconnection/RtcConnection$a;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection;->ya:Lcom/discord/rtcconnection/RtcConnection$a;
 
     return-void
 .end method
 
-.method public constructor <init>(Ljava/lang/Long;JLjava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;Lcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
-    .locals 16
+.method public constructor <init>(Ljava/lang/Long;JLjava/lang/String;Ljava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;ZLcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
+    .locals 12
 
-    move-object/from16 v0, p0
+    move-object v0, p0
 
     move-object/from16 v1, p4
 
-    move-object/from16 v2, p7
+    move-object/from16 v2, p5
 
     move-object/from16 v3, p8
 
-    const-string v4, "sessionId"
+    move-object/from16 v4, p10
 
-    invoke-static {v1, v4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v5, "sessionId"
 
-    const-string v4, "mediaEngine"
+    invoke-static {v1, v5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v5, "rtcServerId"
 
-    const-string v4, "logger"
+    invoke-static {v2, v5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v5, "mediaEngine"
 
-    const-string v4, "networkMonitor"
+    invoke-static {v3, v5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v5, p9
+    const-string v5, "logger"
 
-    invoke-static {v5, v4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct/range {p0 .. p0}, Ljava/lang/Object;-><init>()V
+    const-string v5, "networkMonitor"
 
-    move-object/from16 v4, p1
+    move-object/from16 v6, p11
 
-    iput-object v4, v0, Lcom/discord/rtcconnection/RtcConnection;->guildId:Ljava/lang/Long;
+    invoke-static {v6, v5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide/from16 v6, p2
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide v6, v0, Lcom/discord/rtcconnection/RtcConnection;->channelId:J
+    move-object v5, p1
+
+    iput-object v5, v0, Lcom/discord/rtcconnection/RtcConnection;->guildId:Ljava/lang/Long;
+
+    move-wide v7, p2
+
+    iput-wide v7, v0, Lcom/discord/rtcconnection/RtcConnection;->channelId:J
 
     iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->sessionId:Ljava/lang/String;
 
-    move-wide/from16 v6, p5
+    iput-object v2, v0, Lcom/discord/rtcconnection/RtcConnection;->rtcServerId:Ljava/lang/String;
 
-    iput-wide v6, v0, Lcom/discord/rtcconnection/RtcConnection;->userId:J
+    move-wide/from16 v1, p6
 
-    iput-object v2, v0, Lcom/discord/rtcconnection/RtcConnection;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
+    iput-wide v1, v0, Lcom/discord/rtcconnection/RtcConnection;->userId:J
 
-    iput-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
+    iput-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
+
+    move/from16 v1, p9
+
+    iput-boolean v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xY:Z
+
+    iput-object v4, v0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
     invoke-static {}, Ljava/util/UUID;->randomUUID()Ljava/util/UUID;
 
@@ -181,11 +197,11 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget v2, Lcom/discord/rtcconnection/RtcConnection;->xO:I
+    sget v2, Lcom/discord/rtcconnection/RtcConnection;->xZ:I
 
     add-int/lit8 v2, v2, 0x1
 
-    sput v2, Lcom/discord/rtcconnection/RtcConnection;->xO:I
+    sput v2, Lcom/discord/rtcconnection/RtcConnection;->xZ:I
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -193,7 +209,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
 
     new-instance v1, Ljava/util/ArrayList;
 
@@ -209,29 +225,43 @@
 
     invoke-direct {v1, v2}, Lcom/discord/rtcconnection/d;-><init>(Lcom/discord/utilities/logging/Logger;)V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xC:Lcom/discord/rtcconnection/d;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xM:Lcom/discord/rtcconnection/d;
 
     new-instance v1, Lcom/discord/utilities/networking/Backoff;
 
-    const-wide/16 v7, 0x3e8
+    const-wide/16 v2, 0x3e8
 
-    const-wide/16 v9, 0x2710
+    const-wide/16 v4, 0x2710
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/16 v10, 0x1c
 
     const/4 v11, 0x0
 
-    const/4 v12, 0x0
+    move-object p1, v1
 
-    const/4 v13, 0x0
+    move-wide p2, v2
 
-    const/16 v14, 0x1c
+    move-wide/from16 p4, v4
 
-    const/4 v15, 0x0
+    move/from16 p6, v7
 
-    move-object v6, v1
+    move/from16 p7, v8
 
-    invoke-direct/range {v6 .. v15}, Lcom/discord/utilities/networking/Backoff;-><init>(JJIZLcom/discord/utilities/networking/Backoff$Scheduler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object/from16 p8, v9
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xD:Lcom/discord/utilities/networking/Backoff;
+    move/from16 p9, v10
+
+    move-object/from16 p10, v11
+
+    invoke-direct/range {p1 .. p10}, Lcom/discord/utilities/networking/Backoff;-><init>(JJIZLcom/discord/utilities/networking/Backoff$Scheduler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xN:Lcom/discord/utilities/networking/Backoff;
 
     new-instance v1, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
@@ -247,7 +277,7 @@
 
     invoke-direct {v1}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xG:Ljava/util/LinkedList;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xQ:Ljava/util/LinkedList;
 
     iget-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
@@ -273,39 +303,39 @@
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
+    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
 
     const/4 v4, 0x0
 
-    const/4 v6, 0x4
+    const/4 v5, 0x4
 
     const/4 v7, 0x0
 
-    move-object/from16 p1, v1
+    move-object p1, v1
 
-    move-object/from16 p2, v2
+    move-object p2, v2
 
-    move-object/from16 p3, v3
+    move-object p3, v3
 
     move-object/from16 p4, v4
 
-    move/from16 p5, v6
+    move/from16 p5, v5
 
     move-object/from16 p6, v7
 
     invoke-static/range {p1 .. p6}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
 
-    invoke-virtual/range {p9 .. p9}, Lcom/discord/utilities/networking/NetworkMonitor;->getIsConnected()Lrx/Observable;
+    invoke-virtual/range {p11 .. p11}, Lcom/discord/utilities/networking/NetworkMonitor;->getIsConnected()Lrx/Observable;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->Kf()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->JT()Lrx/Observable;
 
     move-result-object v1
 
     new-instance v2, Lcom/discord/rtcconnection/RtcConnection$1;
 
-    invoke-direct {v2, v0}, Lcom/discord/rtcconnection/RtcConnection$1;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
+    invoke-direct {v2, p0}, Lcom/discord/rtcconnection/RtcConnection$1;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
 
     check-cast v2, Lrx/functions/Action1;
 
@@ -313,15 +343,15 @@
 
     new-instance v1, Lcom/discord/rtcconnection/RtcConnection$n;
 
-    invoke-direct {v1, v0}, Lcom/discord/rtcconnection/RtcConnection$n;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
+    invoke-direct {v1, p0}, Lcom/discord/rtcconnection/RtcConnection$n;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xM:Lcom/discord/rtcconnection/RtcConnection$n;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xW:Lcom/discord/rtcconnection/RtcConnection$n;
 
     new-instance v1, Lcom/discord/rtcconnection/RtcConnection$g;
 
-    invoke-direct {v1, v0}, Lcom/discord/rtcconnection/RtcConnection$g;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
+    invoke-direct {v1, p0}, Lcom/discord/rtcconnection/RtcConnection$g;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xN:Lcom/discord/rtcconnection/RtcConnection$g;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xX:Lcom/discord/rtcconnection/RtcConnection$g;
 
     return-void
 .end method
@@ -329,7 +359,7 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/utilities/networking/Backoff;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xD:Lcom/discord/utilities/networking/Backoff;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xN:Lcom/discord/utilities/networking/Backoff;
 
     return-object p0
 .end method
@@ -337,13 +367,50 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/RtcConnection;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
     .locals 0
 
-    invoke-virtual {p0, p1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    invoke-direct {p0, p1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
     move-result-object p0
 
     return-object p0
 .end method
 
+.method private final a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;)",
+            "Ljava/util/concurrent/Future<",
+            "*>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
+
+    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->ej()Ljava/util/concurrent/ExecutorService;
+
+    move-result-object v0
+
+    if-eqz p1, :cond_0
+
+    new-instance v1, Lcom/discord/rtcconnection/c;
+
+    invoke-direct {v1, p1}, Lcom/discord/rtcconnection/c;-><init>(Lkotlin/jvm/functions/Function0;)V
+
+    move-object p1, v1
+
+    :cond_0
+    check-cast p1, Ljava/lang/Runnable;
+
+    invoke-interface {v0, p1}, Ljava/util/concurrent/ExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
 .method private final a(Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;Ljava/util/Map;)V
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
@@ -372,7 +439,7 @@
     invoke-interface {p2, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xJ:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xT:Ljava/lang/Integer;
 
     if-eqz v0, :cond_1
 
@@ -430,7 +497,7 @@
 .end method
 
 .method public static final synthetic a(Lcom/discord/rtcconnection/RtcConnection;IILjava/lang/String;)V
-    .locals 6
+    .locals 7
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
@@ -444,7 +511,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
 
     const/4 v3, 0x0
 
@@ -454,33 +521,37 @@
 
     invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->yg:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->yr:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
     check-cast v0, Lcom/discord/rtcconnection/RtcConnection$State;
 
     invoke-direct {p0, v0}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
-    iget-wide v1, p0, Lcom/discord/rtcconnection/RtcConnection;->userId:J
+    iget-wide v2, p0, Lcom/discord/rtcconnection/RtcConnection;->userId:J
 
-    new-instance v3, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;
+    new-instance v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;
 
-    invoke-direct {v3, p2, p3, p1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;-><init>(ILjava/lang/String;I)V
+    invoke-direct {v4, p2, p3, p1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;-><init>(ILjava/lang/String;I)V
+
+    iget-boolean v5, p0, Lcom/discord/rtcconnection/RtcConnection;->xY:Z
 
     new-instance p1, Lcom/discord/rtcconnection/RtcConnection$k;
 
     invoke-direct {p1, p0}, Lcom/discord/rtcconnection/RtcConnection$k;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
 
-    check-cast p1, Lkotlin/jvm/functions/Function1;
+    move-object v6, p1
 
-    invoke-interface {v0, v1, v2, v3, p1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    check-cast v6, Lkotlin/jvm/functions/Function1;
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;ZLkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     move-result-object p1
 
     if-eqz p1, :cond_1
 
-    iget-object p2, p0, Lcom/discord/rtcconnection/RtcConnection;->xC:Lcom/discord/rtcconnection/d;
+    iget-object p2, p0, Lcom/discord/rtcconnection/RtcConnection;->xM:Lcom/discord/rtcconnection/d;
 
     const-string p3, "connection"
 
@@ -488,7 +559,7 @@
 
     const/4 p3, 0x0
 
-    iput-object p3, p2, Lcom/discord/rtcconnection/d;->yj:Lco/discord/media_engine/Stats;
+    iput-object p3, p2, Lcom/discord/rtcconnection/d;->yu:Lco/discord/media_engine/Stats;
 
     iget-object p3, p2, Lcom/discord/rtcconnection/d;->subscription:Lrx/Subscription;
 
@@ -500,10 +571,10 @@
 
     if-nez p3, :cond_0
 
-    invoke-virtual {p2}, Lcom/discord/rtcconnection/d;->ee()Lkotlin/Unit;
+    invoke-virtual {p2}, Lcom/discord/rtcconnection/d;->eh()Lkotlin/Unit;
 
     :cond_0
-    iget-wide v0, p2, Lcom/discord/rtcconnection/d;->yk:J
+    iget-wide v0, p2, Lcom/discord/rtcconnection/d;->yv:J
 
     sget-object p3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -529,13 +600,13 @@
 
     iput-object p3, p2, Lcom/discord/rtcconnection/d;->subscription:Lrx/Subscription;
 
-    iget-object p2, p0, Lcom/discord/rtcconnection/RtcConnection;->xN:Lcom/discord/rtcconnection/RtcConnection$g;
+    iget-object p2, p0, Lcom/discord/rtcconnection/RtcConnection;->xX:Lcom/discord/rtcconnection/RtcConnection$g;
 
     check-cast p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
     invoke-interface {p1, p2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;)V
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     :cond_1
     return-void
@@ -544,7 +615,7 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/RtcConnection;J)V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xG:Ljava/util/LinkedList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xQ:Ljava/util/LinkedList;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -552,7 +623,7 @@
 
     invoke-virtual {v0, v1}, Ljava/util/LinkedList;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xG:Ljava/util/LinkedList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xQ:Ljava/util/LinkedList;
 
     invoke-virtual {v0}, Ljava/util/LinkedList;->size()I
 
@@ -562,7 +633,7 @@
 
     if-le v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xG:Ljava/util/LinkedList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xQ:Ljava/util/LinkedList;
 
     invoke-virtual {v0}, Ljava/util/LinkedList;->removeFirst()Ljava/lang/Object;
 
@@ -573,14 +644,14 @@
 
     if-lez v2, :cond_1
 
-    iget v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xK:I
+    iget v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xU:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xK:I
+    iput v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xU:I
 
     :cond_1
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->xZ:Lcom/discord/rtcconnection/RtcConnection$Quality$a;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->yk:Lcom/discord/rtcconnection/RtcConnection$Quality$a;
 
     long-to-double p1, p1
 
@@ -590,7 +661,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xU:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yf:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     goto :goto_0
 
@@ -601,7 +672,7 @@
 
     if-gez v2, :cond_3
 
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xX:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yi:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     goto :goto_0
 
@@ -612,12 +683,12 @@
 
     if-gez v2, :cond_4
 
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xW:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yh:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     goto :goto_0
 
     :cond_4
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xV:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yg:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     :goto_0
     new-instance p2, Lcom/discord/rtcconnection/RtcConnection$l;
@@ -640,7 +711,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz p0, :cond_0
 
@@ -661,7 +732,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz p0, :cond_0
 
@@ -684,7 +755,7 @@
 
     if-nez v2, :cond_0
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xH:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xR:Lcom/discord/rtcconnection/socket/a;
 
     if-eqz v0, :cond_0
 
@@ -692,7 +763,7 @@
 
     new-instance v9, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
 
-    invoke-static {p4}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {p4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v4
 
@@ -712,11 +783,33 @@
 
     move v3, p3
 
-    invoke-direct/range {v2 .. v8}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;-><init>(ILjava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v2 .. v8}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;-><init>(ILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     invoke-virtual {v0, v1, v9}, Lcom/discord/rtcconnection/socket/a;->a(ILjava/lang/Object;)V
 
     :cond_0
+    new-instance p3, Ljava/lang/StringBuilder;
+
+    const-string v0, "connection speaking: "
+
+    invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p3, p1, p2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v0, " == isSpeaking: "
+
+    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3, p4}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p3
+
+    const-string v0, "findme"
+
+    invoke-static {v0, p3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
     new-instance p3, Lcom/discord/rtcconnection/RtcConnection$h;
 
     invoke-direct {p3, p1, p2, p4}, Lcom/discord/rtcconnection/RtcConnection$h;-><init>(JZ)V
@@ -741,7 +834,7 @@
 
     if-nez v5, :cond_0
 
-    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->xH:Lcom/discord/rtcconnection/socket/a;
+    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->xR:Lcom/discord/rtcconnection/socket/a;
 
     if-eqz v3, :cond_0
 
@@ -806,7 +899,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -840,7 +933,7 @@
 
     if-ne p1, v2, :cond_0
 
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$e;->ye:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$e;->yp:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -854,34 +947,34 @@
     throw p0
 
     :cond_1
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$f;->yf:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$f;->yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
 
     goto :goto_0
 
     :cond_2
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$g;->yg:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$g;->yr:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
 
     goto :goto_0
 
     :cond_3
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$h;->yh:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$h;->ys:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
 
     :goto_0
     invoke-direct {p0, p1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$g;->yg:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$g;->yr:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
     if-ne v0, p1, :cond_4
 
     iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->yh:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->ys:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     if-ne p1, v0, :cond_4
 
@@ -890,11 +983,11 @@
     :cond_4
     iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yf:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     if-ne p1, v0, :cond_5
 
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->xQ:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->yb:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     new-array v0, v1, [Lkotlin/Pair;
 
@@ -924,7 +1017,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xV:Ljava/lang/Long;
 
     :cond_5
     return-void
@@ -1007,7 +1100,7 @@
 
     move-result-object v13
 
-    iget-object v14, v0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
+    iget-object v14, v0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
 
     const/4 v15, 0x0
 
@@ -1022,7 +1115,7 @@
     :cond_1
     iget-object v4, v0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v5, v0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
+    iget-object v5, v0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
 
     move-object v7, v1
 
@@ -1036,7 +1129,7 @@
 
     invoke-static/range {v4 .. v10}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->xR:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->yc:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     new-array v2, v11, [Lkotlin/Pair;
 
@@ -1057,7 +1150,7 @@
     invoke-direct {v0, v1, v2}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;Ljava/util/Map;)V
 
     :goto_1
-    invoke-direct {v0, v11}, Lcom/discord/rtcconnection/RtcConnection;->s(Z)V
+    invoke-direct {v0, v11}, Lcom/discord/rtcconnection/RtcConnection;->q(Z)V
 
     return-void
 .end method
@@ -1071,13 +1164,13 @@
 
     move-object/from16 v2, p2
 
-    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->xD:Lcom/discord/utilities/networking/Backoff;
+    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->xN:Lcom/discord/utilities/networking/Backoff;
 
     invoke-virtual {v3}, Lcom/discord/utilities/networking/Backoff;->succeed()V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xE:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->xO:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
 
-    iget-object v3, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v3, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     sget-object v4, Lcom/discord/rtcconnection/b;->$EnumSwitchMapping$0:[I
 
@@ -1093,7 +1186,7 @@
 
     iget-object v5, v0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v6, v0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
+    iget-object v6, v0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -1101,7 +1194,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v1, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1119,14 +1212,14 @@
 
     invoke-static/range {v5 .. v11}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
-    invoke-direct {v0, v4}, Lcom/discord/rtcconnection/RtcConnection;->s(Z)V
+    invoke-direct {v0, v4}, Lcom/discord/rtcconnection/RtcConnection;->q(Z)V
 
     return-void
 
     :cond_0
     iget-object v12, v0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v14, v0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
+    iget-object v14, v0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
 
     const/4 v15, 0x0
 
@@ -1138,7 +1231,7 @@
 
     invoke-static/range {v12 .. v17}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
 
-    iget-object v0, v0, Lcom/discord/rtcconnection/RtcConnection;->xH:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, v0, Lcom/discord/rtcconnection/RtcConnection;->xR:Lcom/discord/rtcconnection/socket/a;
 
     if-eqz v0, :cond_2
 
@@ -1174,7 +1267,7 @@
 
     check-cast v1, Ljava/lang/Iterable;
 
-    sget-object v2, Lcom/discord/rtcconnection/socket/a;->zu:Lcom/discord/rtcconnection/socket/a$a;
+    sget-object v2, Lcom/discord/rtcconnection/socket/a;->zD:Lcom/discord/rtcconnection/socket/a$a;
 
     new-instance v2, Ljava/util/ArrayList;
 
@@ -1241,7 +1334,7 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/rtcconnection/socket/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xH:Lcom/discord/rtcconnection/socket/a;
+    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xR:Lcom/discord/rtcconnection/socket/a;
 
     return-void
 .end method
@@ -1249,7 +1342,7 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/Integer;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xJ:Ljava/lang/Integer;
+    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xT:Ljava/lang/Integer;
 
     return-void
 .end method
@@ -1265,7 +1358,7 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz p0, :cond_0
 
@@ -1278,7 +1371,7 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/String;Ljava/util/List;)V
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz p0, :cond_0
 
@@ -1297,7 +1390,7 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/RtcConnection;Z)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/rtcconnection/RtcConnection;->s(Z)V
+    invoke-direct {p0, p1}, Lcom/discord/rtcconnection/RtcConnection;->q(Z)V
 
     return-void
 .end method
@@ -1331,7 +1424,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
 
     const/4 v3, 0x0
 
@@ -1341,18 +1434,18 @@
 
     invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz p1, :cond_0
 
     invoke-interface {p1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->destroy()V
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xN:Lcom/discord/rtcconnection/RtcConnection$g;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xX:Lcom/discord/rtcconnection/RtcConnection$g;
 
     check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -1365,12 +1458,12 @@
 
     if-nez p1, :cond_2
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->eb()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ee()V
 
     :cond_2
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xK:I
+    iput p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xU:I
 
     const-wide/16 v0, 0x0
 
@@ -1378,7 +1471,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/Long;
+    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xV:Ljava/lang/Long;
 
     if-nez p2, :cond_3
 
@@ -1407,7 +1500,7 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xD:Lcom/discord/utilities/networking/Backoff;
+    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->xN:Lcom/discord/utilities/networking/Backoff;
 
     new-instance v0, Lcom/discord/rtcconnection/RtcConnection$j;
 
@@ -1421,7 +1514,7 @@
 
     iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
 
     new-instance p0, Ljava/lang/StringBuilder;
 
@@ -1470,7 +1563,7 @@
 .method public static final synthetic b(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/rtcconnection/socket/a;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xH:Lcom/discord/rtcconnection/socket/a;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xR:Lcom/discord/rtcconnection/socket/a;
 
     return-object p0
 .end method
@@ -1486,7 +1579,7 @@
 .method public static final synthetic b(Lcom/discord/rtcconnection/RtcConnection;Z)V
     .locals 3
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xH:Lcom/discord/rtcconnection/socket/a;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xR:Lcom/discord/rtcconnection/socket/a;
 
     if-eqz p0, :cond_1
 
@@ -1574,19 +1667,19 @@
 .method public static final synthetic e(Lcom/discord/rtcconnection/RtcConnection;)Ljava/lang/String;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
 
     return-object p0
 .end method
 
-.method private final ea()V
+.method private final ed()V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xD:Lcom/discord/utilities/networking/Backoff;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xN:Lcom/discord/utilities/networking/Backoff;
 
     invoke-virtual {v0}, Lcom/discord/utilities/networking/Backoff;->cancel()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xH:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xR:Lcom/discord/rtcconnection/socket/a;
 
     if-eqz v0, :cond_0
 
@@ -1597,7 +1690,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xH:Lcom/discord/rtcconnection/socket/a;
+    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xR:Lcom/discord/rtcconnection/socket/a;
 
     iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -1605,17 +1698,17 @@
 
     if-nez v1, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->eb()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ee()V
 
     :cond_1
-    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->xI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->xS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz v1, :cond_2
 
     invoke-interface {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->destroy()V
 
     :cond_2
-    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     new-instance v0, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
@@ -1633,12 +1726,12 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xF:Z
+    iput-boolean v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xP:Z
 
     return-void
 .end method
 
-.method private final eb()V
+.method private final ee()V
     .locals 6
 
     const/4 v0, 0x2
@@ -1657,7 +1750,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/discord/rtcconnection/RtcConnection;->xK:I
+    iget v1, p0, Lcom/discord/rtcconnection/RtcConnection;->xU:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1677,7 +1770,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->xG:Ljava/util/LinkedList;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->xQ:Ljava/util/LinkedList;
 
     check-cast v1, Ljava/lang/Iterable;
 
@@ -1713,9 +1806,9 @@
     invoke-interface {v0, v3, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_1
-    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->xC:Lcom/discord/rtcconnection/d;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->xM:Lcom/discord/rtcconnection/d;
 
-    iget-object v1, v1, Lcom/discord/rtcconnection/d;->yj:Lco/discord/media_engine/Stats;
+    iget-object v1, v1, Lcom/discord/rtcconnection/d;->yu:Lco/discord/media_engine/Stats;
 
     if-eqz v1, :cond_4
 
@@ -1811,7 +1904,7 @@
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_4
-    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/Long;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->xV:Ljava/lang/Long;
 
     if-eqz v1, :cond_5
 
@@ -1836,13 +1929,13 @@
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_5
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->xS:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->yd:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     invoke-direct {p0, v1, v0}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;Ljava/util/Map;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xC:Lcom/discord/rtcconnection/d;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xM:Lcom/discord/rtcconnection/d;
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->ee()Lkotlin/Unit;
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->eh()Lkotlin/Unit;
 
     return-void
 .end method
@@ -1850,7 +1943,7 @@
 .method public static final synthetic f(Lcom/discord/rtcconnection/RtcConnection;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xF:Z
+    iget-boolean p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xP:Z
 
     return p0
 .end method
@@ -1866,7 +1959,7 @@
 .method public static final synthetic h(Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/rtcconnection/RtcConnection$n;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xM:Lcom/discord/rtcconnection/RtcConnection$n;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->xW:Lcom/discord/rtcconnection/RtcConnection$n;
 
     return-object p0
 .end method
@@ -1874,7 +1967,7 @@
 .method public static final synthetic i(Lcom/discord/rtcconnection/RtcConnection;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ea()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ed()V
 
     return-void
 .end method
@@ -1890,7 +1983,7 @@
 .method public static final synthetic k(Lcom/discord/rtcconnection/RtcConnection;)V
     .locals 7
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xD:Lcom/discord/utilities/networking/Backoff;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xN:Lcom/discord/utilities/networking/Backoff;
 
     invoke-virtual {v0}, Lcom/discord/utilities/networking/Backoff;->cancel()V
 
@@ -1902,7 +1995,7 @@
 
     invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->xH:Lcom/discord/rtcconnection/socket/a;
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->xR:Lcom/discord/rtcconnection/socket/a;
 
     if-eqz v2, :cond_0
 
@@ -1920,7 +2013,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -1930,7 +2023,7 @@
 
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$c;->yc:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$c;->yn:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
     check-cast v0, Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -1940,15 +2033,15 @@
 .end method
 
 .method public static final synthetic l(Lcom/discord/rtcconnection/RtcConnection;)V
-    .locals 14
+    .locals 12
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xD:Lcom/discord/utilities/networking/Backoff;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xN:Lcom/discord/utilities/networking/Backoff;
 
     invoke-virtual {v0}, Lcom/discord/utilities/networking/Backoff;->cancel()V
 
     iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
 
     const-string v2, "Connected to RTC server."
 
@@ -1960,86 +2053,70 @@
 
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xH:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xR:Lcom/discord/rtcconnection/socket/a;
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->guildId:Ljava/lang/Long;
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->rtcServerId:Ljava/lang/String;
+
+    iget-wide v3, p0, Lcom/discord/rtcconnection/RtcConnection;->userId:J
+
+    iget-object v5, p0, Lcom/discord/rtcconnection/RtcConnection;->sessionId:Ljava/lang/String;
+
+    const-string v1, "serverId"
+
+    invoke-static {v2, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "sessionId"
+
+    invoke-static {v5, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v1, v0, Lcom/discord/rtcconnection/socket/a;->zC:Z
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    iget-object v6, v0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    move-result-wide v1
+    iget-object v7, v0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x4
+
+    const/4 v11, 0x0
+
+    const-string v8, "identify called on canceled instance of RtcControlSocket"
+
+    invoke-static/range {v6 .. v11}, 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 :goto_0
 
     :cond_0
-    iget-wide v1, p0, Lcom/discord/rtcconnection/RtcConnection;->channelId:J
+    iput-object v2, v0, Lcom/discord/rtcconnection/socket/a;->serverId:Ljava/lang/String;
 
-    :goto_0
-    invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+    iput-object v5, v0, Lcom/discord/rtcconnection/socket/a;->sessionId:Ljava/lang/String;
 
-    move-result-object v4
+    sget v1, Lcom/discord/rtcconnection/socket/a$b;->zG:I
 
-    iget-wide v5, p0, Lcom/discord/rtcconnection/RtcConnection;->userId:J
+    iput v1, v0, Lcom/discord/rtcconnection/socket/a;->zw:I
 
-    iget-object v7, p0, Lcom/discord/rtcconnection/RtcConnection;->sessionId:Ljava/lang/String;
+    const/4 v8, 0x0
 
-    const-string v1, "serverId"
+    new-instance v9, Lcom/discord/rtcconnection/socket/io/Payloads$Identify;
 
-    invoke-static {v4, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    iget-object v6, v0, Lcom/discord/rtcconnection/socket/a;->token:Ljava/lang/String;
 
-    const-string v1, "sessionId"
+    const/4 v7, 0x1
 
-    invoke-static {v7, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object v1, v9
 
-    iget-boolean v1, v0, Lcom/discord/rtcconnection/socket/a;->zt:Z
+    invoke-direct/range {v1 .. v7}, Lcom/discord/rtcconnection/socket/io/Payloads$Identify;-><init>(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Z)V
 
-    if-eqz v1, :cond_1
-
-    iget-object v8, v0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
-
-    iget-object v9, v0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
-
-    const/4 v11, 0x0
-
-    const/4 v12, 0x4
-
-    const/4 v13, 0x0
-
-    const-string v10, "identify called on canceled instance of RtcControlSocket"
-
-    invoke-static/range {v8 .. v13}, 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 :goto_1
+    invoke-virtual {v0, v8, v9}, Lcom/discord/rtcconnection/socket/a;->a(ILjava/lang/Object;)V
 
     :cond_1
-    iput-object v4, v0, Lcom/discord/rtcconnection/socket/a;->serverId:Ljava/lang/String;
-
-    iput-object v7, v0, Lcom/discord/rtcconnection/socket/a;->sessionId:Ljava/lang/String;
-
-    sget v1, Lcom/discord/rtcconnection/socket/a$b;->zx:I
-
-    iput v1, v0, Lcom/discord/rtcconnection/socket/a;->zn:I
-
-    const/4 v1, 0x0
-
-    new-instance v2, Lcom/discord/rtcconnection/socket/io/Payloads$Identify;
-
-    iget-object v8, v0, Lcom/discord/rtcconnection/socket/a;->token:Ljava/lang/String;
-
-    const/4 v9, 0x1
-
-    move-object v3, v2
-
-    invoke-direct/range {v3 .. v9}, Lcom/discord/rtcconnection/socket/io/Payloads$Identify;-><init>(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Z)V
-
-    invoke-virtual {v0, v1, v2}, Lcom/discord/rtcconnection/socket/a;->a(ILjava/lang/Object;)V
-
-    :cond_2
-    :goto_1
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->ya:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    :goto_0
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->yl:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
     check-cast v0, Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -2048,43 +2125,14 @@
     return-void
 .end method
 
-.method private final reconnect()V
-    .locals 6
-
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
-
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->xB:Ljava/lang/String;
-
-    const-string v1, "reconnect"
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x4
-
-    const/4 v5, 0x0
-
-    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
-
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xH:Lcom/discord/rtcconnection/socket/a;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/a;->close()V
-
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/a;->connect()Z
-
-    :cond_0
-    return-void
-.end method
-
-.method private final s(Z)V
+.method private final q(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xC:Lcom/discord/rtcconnection/d;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xM:Lcom/discord/rtcconnection/d;
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->ee()Lkotlin/Unit;
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->eh()Lkotlin/Unit;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz v0, :cond_0
 
@@ -2093,9 +2141,9 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xD:Lcom/discord/utilities/networking/Backoff;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xN:Lcom/discord/utilities/networking/Backoff;
 
     invoke-virtual {v0}, Lcom/discord/utilities/networking/Backoff;->cancel()V
 
@@ -2114,52 +2162,112 @@
     return-void
 
     :cond_1
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$f;->yi:Lcom/discord/rtcconnection/RtcConnection$f;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$f;->yt:Lcom/discord/rtcconnection/RtcConnection$f;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0, p1}, Lcom/discord/rtcconnection/RtcConnection;->b(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ea()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ed()V
 
     return-void
 .end method
 
+.method private final reconnect()V
+    .locals 6
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
+
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->xL:Ljava/lang/String;
+
+    const-string v1, "reconnect"
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x4
+
+    const/4 v5, 0x0
+
+    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->xR:Lcom/discord/rtcconnection/socket/a;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/a;->close()V
+
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/a;->connect()Z
+
+    :cond_0
+    return-void
+.end method
+
 
 # virtual methods
-.method public final a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
-    .locals 2
+.method public final a(Ljava/lang/String;Ljava/lang/String;Ljavax/net/ssl/SSLSocketFactory;)Ljava/util/concurrent/Future;
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lkotlin/jvm/functions/Function0<",
-            "Lkotlin/Unit;",
-            ">;)",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            "Ljavax/net/ssl/SSLSocketFactory;",
+            ")",
             "Ljava/util/concurrent/Future<",
             "*>;"
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
+    const-string v0, "endpoint"
 
-    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->eg()Ljava/util/concurrent/ExecutorService;
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v0
+    new-instance v0, Lcom/discord/rtcconnection/RtcConnection$d;
 
-    if-eqz p1, :cond_0
+    invoke-direct {v0, p0, p3, p1, p2}, Lcom/discord/rtcconnection/RtcConnection$d;-><init>(Lcom/discord/rtcconnection/RtcConnection;Ljavax/net/ssl/SSLSocketFactory;Ljava/lang/String;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/rtcconnection/c;
+    check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    invoke-direct {v1, p1}, Lcom/discord/rtcconnection/c;-><init>(Lkotlin/jvm/functions/Function0;)V
-
-    move-object p1, v1
-
-    :cond_0
-    check-cast p1, Ljava/lang/Runnable;
-
-    invoke-interface {v0, p1}, Ljava/util/concurrent/ExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
+    invoke-direct {p0, v0}, Lcom/discord/rtcconnection/RtcConnection;->a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public final a(Lcom/discord/rtcconnection/RtcConnection$b;)V
+    .locals 1
+
+    const-string v0, "listener"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->listeners:Ljava/util/List;
+
+    invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    return-void
+.end method
+
+.method public final ec()Ljava/util/concurrent/Future;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/concurrent/Future<",
+            "*>;"
+        }
+    .end annotation
+
+    new-instance v0, Lcom/discord/rtcconnection/RtcConnection$e;
+
+    invoke-direct {v0, p0}, Lcom/discord/rtcconnection/RtcConnection$e;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
+
+    check-cast v0, Lkotlin/jvm/functions/Function0;
+
+    invoke-direct {p0, v0}, Lcom/discord/rtcconnection/RtcConnection;->a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/rtcconnection/a.smali b/com.discord/smali/com/discord/rtcconnection/a.smali
index 21b4c022aa..6144450c3c 100644
--- a/com.discord/smali/com/discord/rtcconnection/a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/a.smali
@@ -20,7 +20,7 @@
 
     sput-object v0, Lcom/discord/rtcconnection/a;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yx:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yH:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->ordinal()I
 
@@ -32,7 +32,7 @@
 
     sget-object v0, Lcom/discord/rtcconnection/a;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yz:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yJ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->ordinal()I
 
@@ -44,7 +44,7 @@
 
     sget-object v0, Lcom/discord/rtcconnection/a;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yy:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->ordinal()I
 
diff --git a/com.discord/smali/com/discord/rtcconnection/b.smali b/com.discord/smali/com/discord/rtcconnection/b.smali
index 9eb47a6aba..769bb80da7 100644
--- a/com.discord/smali/com/discord/rtcconnection/b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/b.smali
@@ -22,7 +22,7 @@
 
     sput-object v0, Lcom/discord/rtcconnection/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->yO:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->yY:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->ordinal()I
 
@@ -42,7 +42,7 @@
 
     sput-object v0, Lcom/discord/rtcconnection/b;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->ys:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yC:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->ordinal()I
 
@@ -52,7 +52,7 @@
 
     sget-object v0, Lcom/discord/rtcconnection/b;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yt:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yD:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->ordinal()I
 
@@ -64,7 +64,7 @@
 
     sget-object v0, Lcom/discord/rtcconnection/b;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yu:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yE:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->ordinal()I
 
@@ -76,7 +76,7 @@
 
     sget-object v0, Lcom/discord/rtcconnection/b;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yv:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yF:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->ordinal()I
 
diff --git a/com.discord/smali/com/discord/rtcconnection/d$a$1.smali b/com.discord/smali/com/discord/rtcconnection/d$a$1.smali
index 397a07465c..2f429b7116 100644
--- a/com.discord/smali/com/discord/rtcconnection/d$a$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/d$a$1.smali
@@ -83,7 +83,7 @@
 
     invoke-static {v0, p1}, Lcom/discord/rtcconnection/d;->a(Lcom/discord/rtcconnection/d;Lco/discord/media_engine/Stats;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/d$a.smali b/com.discord/smali/com/discord/rtcconnection/d$a.smali
index 5bbb2b3777..675de11617 100644
--- a/com.discord/smali/com/discord/rtcconnection/d$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/d$a.smali
@@ -30,18 +30,18 @@
 
 
 # instance fields
-.field final synthetic yl:Lcom/discord/rtcconnection/d;
+.field final synthetic $connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-.field final synthetic ym:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+.field final synthetic yw:Lcom/discord/rtcconnection/d;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/rtcconnection/d;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/d$a;->yl:Lcom/discord/rtcconnection/d;
+    iput-object p1, p0, Lcom/discord/rtcconnection/d$a;->yw:Lcom/discord/rtcconnection/d;
 
-    iput-object p2, p0, Lcom/discord/rtcconnection/d$a;->ym:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iput-object p2, p0, Lcom/discord/rtcconnection/d$a;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,11 +53,11 @@
 .method public final synthetic call(Ljava/lang/Object;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/d$a;->ym:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p1, p0, Lcom/discord/rtcconnection/d$a;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     new-instance v0, Lcom/discord/rtcconnection/d$a$1;
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/d$a;->yl:Lcom/discord/rtcconnection/d;
+    iget-object v1, p0, Lcom/discord/rtcconnection/d$a;->yw:Lcom/discord/rtcconnection/d;
 
     invoke-direct {v0, v1}, Lcom/discord/rtcconnection/d$a$1;-><init>(Lcom/discord/rtcconnection/d;)V
 
diff --git a/com.discord/smali/com/discord/rtcconnection/d$b.smali b/com.discord/smali/com/discord/rtcconnection/d$b.smali
index ad258e3b4c..3890f9414c 100644
--- a/com.discord/smali/com/discord/rtcconnection/d$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/d$b.smali
@@ -30,14 +30,14 @@
 
 
 # instance fields
-.field final synthetic yl:Lcom/discord/rtcconnection/d;
+.field final synthetic yw:Lcom/discord/rtcconnection/d;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/rtcconnection/d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/d$b;->yl:Lcom/discord/rtcconnection/d;
+    iput-object p1, p0, Lcom/discord/rtcconnection/d$b;->yw:Lcom/discord/rtcconnection/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,7 +53,7 @@
 
     check-cast v2, Ljava/lang/Throwable;
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/d$b;->yl:Lcom/discord/rtcconnection/d;
+    iget-object p1, p0, Lcom/discord/rtcconnection/d$b;->yw:Lcom/discord/rtcconnection/d;
 
     invoke-static {p1}, Lcom/discord/rtcconnection/d;->a(Lcom/discord/rtcconnection/d;)Lcom/discord/utilities/logging/Logger;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/d.smali b/com.discord/smali/com/discord/rtcconnection/d.smali
index 911e288b66..13a4b8085a 100644
--- a/com.discord/smali/com/discord/rtcconnection/d.smali
+++ b/com.discord/smali/com/discord/rtcconnection/d.smali
@@ -8,9 +8,9 @@
 
 .field subscription:Lrx/Subscription;
 
-.field yj:Lco/discord/media_engine/Stats;
+.field yu:Lco/discord/media_engine/Stats;
 
-.field final yk:J
+.field final yv:J
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     const-wide/16 v0, 0x7530
 
-    iput-wide v0, p0, Lcom/discord/rtcconnection/d;->yk:J
+    iput-wide v0, p0, Lcom/discord/rtcconnection/d;->yv:J
 
     iput-object p1, p0, Lcom/discord/rtcconnection/d;->logger:Lcom/discord/utilities/logging/Logger;
 
@@ -43,14 +43,14 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/d;Lco/discord/media_engine/Stats;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/d;->yj:Lco/discord/media_engine/Stats;
+    iput-object p1, p0, Lcom/discord/rtcconnection/d;->yu:Lco/discord/media_engine/Stats;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final ee()Lkotlin/Unit;
+.method public final eh()Lkotlin/Unit;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/rtcconnection/d;->subscription:Lrx/Subscription;
@@ -59,7 +59,7 @@
 
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus.smali
index caad0389d1..32add42eb1 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus.smali
@@ -17,7 +17,7 @@
 # instance fields
 .field public final isSpeaking:Z
 
-.field public final yn:F
+.field public final yx:F
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->yn:F
+    iput p1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->yx:F
 
     iput-boolean p2, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->isSpeaking:Z
 
@@ -50,9 +50,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->yn:F
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->yx:F
 
-    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->yn:F
+    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->yx:F
 
     invoke-static {v1, v3}, Ljava/lang/Float;->compare(FF)I
 
@@ -89,7 +89,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget v0, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->yn:F
+    iget v0, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->yx:F
 
     invoke-static {v0}, Ljava/lang/Float;->floatToIntBits(F)I
 
@@ -118,7 +118,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->yn:F
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->yx:F
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig.smali
index f33ab269cb..ee942e1f94 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
-.field public static final enum yo:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+.field public static final enum yA:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
-.field public static final enum yp:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+.field private static final synthetic yB:[Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
-.field public static final enum yq:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+.field public static final enum yy:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
-.field private static final synthetic yr:[Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+.field public static final enum yz:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
 
 # direct methods
@@ -48,7 +48,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yo:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yy:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     aput-object v1, v0, v2
 
@@ -60,7 +60,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yp:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yz:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     aput-object v1, v0, v2
 
@@ -72,11 +72,11 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yq:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yA:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yr:[Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yB:[Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 .method public static values()[Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
     .locals 1
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yr:[Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yB:[Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     invoke-virtual {v0}, [Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali
index f6612ea53f..9819663591 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali
@@ -19,11 +19,12 @@
 .method public abstract A(I)V
 .end method
 
-.method public abstract a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+.method public abstract a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;ZLkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
             "Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;",
+            "Z",
             "Lkotlin/jvm/functions/Function1<",
             "-",
             "Ljava/lang/Exception;",
@@ -63,10 +64,10 @@
     .end annotation
 .end method
 
-.method public abstract ef()Lcom/hammerandchisel/libdiscord/Discord;
+.method public abstract ei()Lcom/hammerandchisel/libdiscord/Discord;
 .end method
 
-.method public abstract eg()Ljava/util/concurrent/ExecutorService;
+.method public abstract ej()Ljava/util/concurrent/ExecutorService;
 .end method
 
 .method public abstract getConnections()Ljava/util/List;
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState.smali
index 17078a7fae..b6c1561e2e 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState.smali
@@ -23,15 +23,15 @@
 
 
 # static fields
-.field public static final enum ys:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+.field public static final enum yC:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-.field public static final enum yt:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+.field public static final enum yD:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-.field public static final enum yu:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+.field public static final enum yE:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-.field public static final enum yv:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+.field public static final enum yF:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-.field private static final synthetic yw:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+.field private static final synthetic yG:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
 
 # direct methods
@@ -50,7 +50,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->ys:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yC:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     aput-object v1, v0, v2
 
@@ -62,7 +62,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yt:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yD:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     aput-object v1, v0, v2
 
@@ -74,7 +74,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yu:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yE:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     aput-object v1, v0, v2
 
@@ -86,11 +86,11 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yv:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yF:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yw:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yG:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     return-void
 .end method
@@ -125,7 +125,7 @@
 .method public static values()[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
     .locals 1
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yw:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yG:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     invoke-virtual {v0}, [Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a.smali
index ec48d0efa0..68cd0859f3 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a.smali
@@ -29,21 +29,21 @@
 
 
 # static fields
-.field public static final enum yA:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+.field public static final enum yH:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-.field public static final enum yB:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+.field public static final enum yI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-.field public static final enum yC:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+.field public static final enum yJ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-.field private static final synthetic yD:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+.field public static final enum yK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-.field public static final yE:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
+.field public static final enum yL:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-.field public static final enum yx:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+.field public static final enum yM:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-.field public static final enum yy:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+.field private static final synthetic yN:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-.field public static final enum yz:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+.field public static final yO:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
 
 
 # direct methods
@@ -62,7 +62,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yx:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yH:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     aput-object v1, v0, v2
 
@@ -74,7 +74,7 @@
 
     invoke-direct {v1, v4, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yy:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     aput-object v1, v0, v3
 
@@ -86,7 +86,7 @@
 
     invoke-direct {v1, v4, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yz:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yJ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     aput-object v1, v0, v3
 
@@ -98,7 +98,7 @@
 
     invoke-direct {v1, v4, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yA:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     aput-object v1, v0, v3
 
@@ -110,7 +110,7 @@
 
     invoke-direct {v1, v4, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yB:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yL:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     aput-object v1, v0, v3
 
@@ -122,17 +122,17 @@
 
     invoke-direct {v1, v4, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yC:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yM:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yD:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yN:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
 
     invoke-direct {v0, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yE:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yO:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
 
     return-void
 .end method
@@ -167,7 +167,7 @@
 .method public static values()[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
     .locals 1
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yD:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yN:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     invoke-virtual {v0}, [Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->clone()Ljava/lang/Object;
 
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 6ce3573df5..91332507de 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException.smali
@@ -28,7 +28,7 @@
 .method public synthetic constructor <init>(Ljava/lang/String;)V
     .locals 4
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yE:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yO:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
 
     const/4 v0, 0x1
 
@@ -56,7 +56,7 @@
     :goto_0
     if-eqz v2, :cond_1
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yx:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yH:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     goto :goto_2
 
@@ -83,7 +83,7 @@
     :goto_1
     if-eqz v2, :cond_3
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yy:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     goto :goto_2
 
@@ -105,12 +105,12 @@
     :cond_4
     if-eqz v1, :cond_5
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yz:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yJ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     goto :goto_2
 
     :cond_5
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yC:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yM:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     :goto_2
     invoke-direct {p0, p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;)V
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode.smali
index 158eb1913b..b3f694471f 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
-.field public static final enum yF:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+.field public static final enum yP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
-.field public static final enum yG:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+.field public static final enum yQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
-.field private static final synthetic yH:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+.field private static final synthetic yR:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
 
 # instance fields
@@ -52,7 +52,7 @@
 
     invoke-direct {v2, v5, v3, v4}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yF:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sput-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     aput-object v2, v1, v3
 
@@ -62,11 +62,11 @@
 
     invoke-direct {v2, v3, v4, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yG:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sput-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     aput-object v2, v1, v4
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yH:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yR:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 .method public static values()[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
     .locals 1
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yH:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yR:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     invoke-virtual {v0}, [Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a.smali
index 5f62c05f41..76c6f8228d 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
-.field public static final enum yO:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+.field public static final enum yY:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
-.field public static final enum yP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+.field public static final enum yZ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
-.field private static final synthetic yQ:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+.field private static final synthetic za:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
 
 # direct methods
@@ -46,7 +46,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->yO:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->yY:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     aput-object v1, v0, v2
 
@@ -58,11 +58,11 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->yP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->yZ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->yQ:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->za:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     return-void
 .end method
@@ -97,7 +97,7 @@
 .method public static values()[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
     .locals 1
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->yQ:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->za:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     invoke-virtual {v0}, [Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->clone()Ljava/lang/Object;
 
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 c07a6e72e7..7ce2b08f9d 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo.smali
@@ -25,7 +25,7 @@
 
 .field public final port:I
 
-.field public final yN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+.field public final yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
 
 # direct methods
@@ -46,7 +46,7 @@
 
     iput p2, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->port:I
 
-    iput-object p3, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iput-object p3, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     return-void
 .end method
@@ -94,9 +94,9 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
-    iget-object p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -141,7 +141,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     if-eqz v2, :cond_1
 
@@ -180,7 +180,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$a.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$a.smali
index d85b878d2c..fc14ec4fb9 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$a.smali
@@ -15,15 +15,15 @@
 
 
 # instance fields
-.field public final yI:I
+.field public final yS:I
 
-.field public final yJ:I
+.field public final yT:I
 
-.field public final yK:I
+.field public final yU:I
 
-.field public final yL:Z
+.field public final yV:Z
 
-.field public final yM:I
+.field public final yW:I
 
 
 # direct methods
@@ -52,15 +52,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yI:I
+    iput p1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yS:I
 
-    iput p2, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yJ:I
+    iput p2, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yT:I
 
-    iput p3, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yK:I
+    iput p3, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yU:I
 
-    iput-boolean p4, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yL:Z
+    iput-boolean p4, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yV:Z
 
-    iput p5, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yM:I
+    iput p5, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yW:I
 
     return-void
 .end method
@@ -82,9 +82,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yI:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yS:I
 
-    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yI:I
+    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yS:I
 
     if-ne v1, v3, :cond_0
 
@@ -98,9 +98,9 @@
     :goto_0
     if-eqz v1, :cond_5
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yJ:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yT:I
 
-    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yJ:I
+    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yT:I
 
     if-ne v1, v3, :cond_1
 
@@ -114,9 +114,9 @@
     :goto_1
     if-eqz v1, :cond_5
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yK:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yU:I
 
-    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yK:I
+    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yU:I
 
     if-ne v1, v3, :cond_2
 
@@ -130,9 +130,9 @@
     :goto_2
     if-eqz v1, :cond_5
 
-    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yL:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yV:Z
 
-    iget-boolean v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yL:Z
+    iget-boolean v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yV:Z
 
     if-ne v1, v3, :cond_3
 
@@ -146,9 +146,9 @@
     :goto_3
     if-eqz v1, :cond_5
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yM:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yW:I
 
-    iget p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yM:I
+    iget p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yW:I
 
     if-ne v1, p1, :cond_4
 
@@ -175,23 +175,23 @@
 .method public final hashCode()I
     .locals 2
 
-    iget v0, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yI:I
+    iget v0, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yS:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yJ:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yT:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yK:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yU:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yL:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yV:Z
 
     if-eqz v1, :cond_0
 
@@ -202,7 +202,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yM:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yW:I
 
     add-int/2addr v0, v1
 
@@ -218,7 +218,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yI:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yS:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -226,7 +226,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yJ:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yT:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -234,7 +234,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yK:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yU:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -242,7 +242,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yL:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yV:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -250,7 +250,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yM:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yW:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$b.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$b.smali
index c791e870e6..03402b0db3 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$b.smali
@@ -15,10 +15,11 @@
 
 
 # virtual methods
-.method public abstract onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
+.method public abstract onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
+            "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;",
             "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;",
             "Ljava/util/List<",
             "Lcom/discord/rtcconnection/mediaengine/a;",
@@ -27,13 +28,13 @@
     .end annotation
 .end method
 
-.method public abstract onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+.method public abstract onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 .end method
 
-.method public abstract onDestroy()V
+.method public abstract onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 .end method
 
-.method public abstract onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+.method public abstract onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
 .end method
 
 .method public abstract onSpeaking(JIZ)V
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
index f53e9e671e..55bda8eb26 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
@@ -57,6 +57,9 @@
 .method public abstract p(Ljava/lang/String;Ljava/lang/String;)V
 .end method
 
+.method public abstract r(Z)V
+.end method
+
 .method public abstract setPttActive(Z)V
 .end method
 
@@ -65,6 +68,3 @@
 
 .method public abstract setVideoBroadcast(Z)V
 .end method
-
-.method public abstract t(Z)V
-.end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$b.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$b.smali
index 83cc3df88d..baf830b826 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$b.smali
@@ -30,12 +30,16 @@
 # instance fields
 .field final synthetic $value:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
+.field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+
 
 # direct methods
-.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$b;->$value:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$b;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$b;->$value:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     const/4 p1, 0x1
 
@@ -47,7 +51,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+    .locals 2
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -55,11 +59,15 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$b;->$value:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$b;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$b;->$value:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+
+    invoke-interface {p1, v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$c$a.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$c$a.smali
index acd2f283cb..dd088a19da 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$c$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$c$a.smali
@@ -72,7 +72,7 @@
 
     invoke-static {v0, v1, v2, v3, v4}, Lcom/discord/rtcconnection/mediaengine/a/a;->a(Lcom/discord/rtcconnection/mediaengine/a/a;JILjava/lang/String;)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$d$a.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$d$a.smali
index 6f94f868cc..5b09fd614a 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$d$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$d$a.smali
@@ -66,7 +66,7 @@
 
     invoke-static {v0, v1, v2, v3}, Lcom/discord/rtcconnection/mediaengine/a/a;->a(Lcom/discord/rtcconnection/mediaengine/a/a;JZ)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$d.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$d.smali
index 5edd440cb2..26ec028487 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$d.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$d.smali
@@ -40,7 +40,33 @@
 
 # virtual methods
 .method public final onUserSpeakingStatusChanged(JZZ)V
-    .locals 1
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "handleSpeaking: "
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1, p2}, 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;
+
+    invoke-virtual {v0, p3}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p4}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p4
+
+    const-string v0, "findme"
+
+    invoke-static {v0, p4}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     iget-object p4, p0, Lcom/discord/rtcconnection/mediaengine/a/a$d;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$e$1.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$e$1.smali
index 0d0c0a530c..83859a651b 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$e$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$e$1.smali
@@ -66,7 +66,7 @@
 
     invoke-static {v0, v1, v2}, Lcom/discord/rtcconnection/mediaengine/a/a;->a(Lcom/discord/rtcconnection/mediaengine/a/a;Lcom/hammerandchisel/libdiscord/Discord$ConnectionInfo;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$g.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$g.smali
index da715f6212..00847eb0ff 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$g.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$g.smali
@@ -27,29 +27,19 @@
 .end annotation
 
 
-# static fields
-.field public static final yZ:Lcom/discord/rtcconnection/mediaengine/a/a$g;
+# instance fields
+.field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 1
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
+    .locals 0
 
-    new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a$g;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$g;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    invoke-direct {v0}, Lcom/discord/rtcconnection/mediaengine/a/a$g;-><init>()V
+    const/4 p1, 0x1
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/a$g;->yZ:Lcom/discord/rtcconnection/mediaengine/a/a$g;
-
-    return-void
-.end method
-
-.method constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
 
     return-void
 .end method
@@ -57,7 +47,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+    .locals 2
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -65,13 +55,21 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->ys:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$g;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    invoke-interface {p1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onDestroy()V
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yC:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    invoke-interface {p1, v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$g;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+
+    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+
+    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$h.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$h.smali
index 6c2674a042..e179a0b4a4 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$h.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$h.smali
@@ -20,7 +20,7 @@
 # instance fields
 .field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-.field final synthetic za:Lkotlin/jvm/functions/Function1;
+.field final synthetic zj:Lkotlin/jvm/functions/Function1;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$h;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$h;->za:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$h;->zj:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,7 +52,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$h;->za:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$h;->zj:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -72,10 +72,6 @@
 
     move-result-object v2
 
-    const-string v0, "TAG"
-
-    invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     const-string v3, "error collecting stats"
 
     const/4 v5, 0x0
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$i.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$i.smali
index 5f85b95565..e4f4a4a7f5 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$i.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$i.smali
@@ -51,7 +51,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
+    .locals 3
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -59,19 +59,23 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$i;->$transportInfo:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$i;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$i;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+    move-object v1, v0
 
-    invoke-static {v1}, Lcom/discord/rtcconnection/mediaengine/a/a;->c(Lcom/discord/rtcconnection/mediaengine/a/a;)Ljava/util/ArrayList;
+    check-cast v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    move-result-object v1
+    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$i;->$transportInfo:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
 
-    check-cast v1, Ljava/util/List;
+    invoke-static {v0}, Lcom/discord/rtcconnection/mediaengine/a/a;->c(Lcom/discord/rtcconnection/mediaengine/a/a;)Ljava/util/ArrayList;
 
-    invoke-interface {p1, v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
+    move-result-object v0
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    check-cast v0, Ljava/util/List;
+
+    invoke-interface {p1, v1, v2, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$j.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$j.smali
index a137cc9729..74573968bb 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$j.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$j.smali
@@ -27,29 +27,19 @@
 .end annotation
 
 
-# static fields
-.field public static final zb:Lcom/discord/rtcconnection/mediaengine/a/a$j;
+# instance fields
+.field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 1
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
+    .locals 0
 
-    new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a$j;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$j;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    invoke-direct {v0}, Lcom/discord/rtcconnection/mediaengine/a/a$j;-><init>()V
+    const/4 p1, 0x1
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/a$j;->zb:Lcom/discord/rtcconnection/mediaengine/a/a$j;
-
-    return-void
-.end method
-
-.method constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
 
     return-void
 .end method
@@ -57,7 +47,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
+    .locals 4
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -65,17 +55,21 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$j;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yA:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    const-string v2, "No connection info"
+    new-instance v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
 
-    invoke-direct {v0, v2, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;)V
+    sget-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+    const-string v3, "No connection info"
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    invoke-direct {v1, v3, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;)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;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$k.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$k.smali
index 40d3946074..989aaa18c4 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$k.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$k.smali
@@ -30,12 +30,16 @@
 # instance fields
 .field final synthetic $errorMessage:Ljava/lang/String;
 
+.field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+
 
 # direct methods
-.method constructor <init>(Ljava/lang/String;)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$k;->$errorMessage:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$k;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$k;->$errorMessage:Ljava/lang/String;
 
     const/4 p1, 0x1
 
@@ -47,7 +51,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
+    .locals 3
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -55,15 +59,19 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$k;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$k;->$errorMessage:Ljava/lang/String;
+    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    invoke-direct {v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;)V
+    new-instance v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
 
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$k;->$errorMessage:Ljava/lang/String;
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    invoke-direct {v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;)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;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$l.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$l.smali
index 948baf2070..d170f11c80 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$l.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$l.smali
@@ -71,7 +71,7 @@
 
     invoke-interface {p1, v0, v1, v2, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onSpeaking(JIZ)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$m.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$m.smali
index ddb2b5e489..d38748a381 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$m.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$m.smali
@@ -75,7 +75,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Lkotlin/text/l;->dU(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {p1}, Lkotlin/text/l;->dO(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object p1
 
@@ -126,7 +126,7 @@
 
     invoke-interface/range {v0 .. v6}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onVideo(JLjava/lang/Integer;III)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$n.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$n.smali
index 35ce7eefed..bb28e95f10 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$n.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$n.smali
@@ -30,12 +30,16 @@
 # instance fields
 .field final synthetic $audioCodec:Ljava/lang/String;
 
+.field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+
 
 # direct methods
-.method constructor <init>(Ljava/lang/String;)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$n;->$audioCodec:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$n;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$n;->$audioCodec:Ljava/lang/String;
 
     const/4 p1, 0x1
 
@@ -47,7 +51,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
+    .locals 4
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -55,33 +59,37 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$n;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    new-instance v1, Ljava/lang/StringBuilder;
+    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    const-string v2, "Missing audio codec: "
+    new-instance v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
 
-    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    new-instance v2, Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$n;->$audioCodec:Ljava/lang/String;
+    const-string v3, "Missing audio codec: "
 
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    const/16 v2, 0x2e
+    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/a$n;->$audioCodec:Ljava/lang/String;
 
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    const/16 v3, 0x2e
 
-    move-result-object v1
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yB:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    invoke-direct {v0, v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;)V
+    move-result-object v2
 
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yL:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    invoke-direct {v1, v2, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;)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;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$o.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$o.smali
index 4a514c9a9a..3b17746a60 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$o.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$o.smali
@@ -30,12 +30,16 @@
 # instance fields
 .field final synthetic $videoCodec:Ljava/lang/String;
 
+.field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+
 
 # direct methods
-.method constructor <init>(Ljava/lang/String;)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$o;->$videoCodec:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$o;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$o;->$videoCodec:Ljava/lang/String;
 
     const/4 p1, 0x1
 
@@ -47,7 +51,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
+    .locals 4
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -55,33 +59,37 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$o;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    new-instance v1, Ljava/lang/StringBuilder;
+    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    const-string v2, "Missing video codec: "
+    new-instance v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
 
-    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    new-instance v2, Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$o;->$videoCodec:Ljava/lang/String;
+    const-string v3, "Missing video codec: "
 
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    const/16 v2, 0x2e
+    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/a$o;->$videoCodec:Ljava/lang/String;
 
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    const/16 v3, 0x2e
 
-    move-result-object v1
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yB:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    invoke-direct {v0, v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;)V
+    move-result-object v2
 
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yL:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    invoke-direct {v1, v2, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;)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;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$p.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$p.smali
index da761e04e4..4a041b1218 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$p.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$p.smali
@@ -30,12 +30,16 @@
 # instance fields
 .field final synthetic $videoCodec:Ljava/lang/String;
 
+.field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+
 
 # direct methods
-.method constructor <init>(Ljava/lang/String;)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$p;->$videoCodec:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$p;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$p;->$videoCodec:Ljava/lang/String;
 
     const/4 p1, 0x1
 
@@ -47,7 +51,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
+    .locals 4
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -55,33 +59,37 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$p;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    new-instance v1, Ljava/lang/StringBuilder;
+    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    const-string v2, "Video codec "
+    new-instance v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
 
-    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    new-instance v2, Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$p;->$videoCodec:Ljava/lang/String;
+    const-string v3, "Video codec "
 
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    const-string v2, " rtxPayloadType was null."
+    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/a$p;->$videoCodec:Ljava/lang/String;
 
-    invoke-virtual {v1, v2}, 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 {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    const-string v3, " rtxPayloadType was null."
 
-    move-result-object v1
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    sget-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yB:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    invoke-direct {v0, v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;)V
+    move-result-object v2
 
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->yL:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    invoke-direct {v1, v2, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;)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;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a.smali
index aad530a3d3..89ba93a7a8 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a.smali
@@ -17,7 +17,7 @@
 # static fields
 .field private static final TAG:Ljava/lang/String;
 
-.field public static final yY:Lcom/discord/rtcconnection/mediaengine/a/a$a;
+.field public static final zi:Lcom/discord/rtcconnection/mediaengine/a/a$a;
 
 
 # instance fields
@@ -35,9 +35,9 @@
 
 .field private final logger:Lcom/discord/utilities/logging/Logger;
 
-.field private yS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+.field private zc:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-.field private final yT:Ljava/util/HashMap;
+.field private final zd:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -48,7 +48,7 @@
     .end annotation
 .end field
 
-.field private final yU:Ljava/util/HashMap;
+.field private final ze:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -59,7 +59,7 @@
     .end annotation
 .end field
 
-.field private final yV:Ljava/util/ArrayList;
+.field private final zf:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -69,9 +69,9 @@
     .end annotation
 .end field
 
-.field private final yW:Lco/discord/media_engine/Connection;
+.field private final zg:Lco/discord/media_engine/Connection;
 
-.field private final yX:Lcom/hammerandchisel/libdiscord/Discord;
+.field private final zh:Lcom/hammerandchisel/libdiscord/Discord;
 
 
 # direct methods
@@ -84,7 +84,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/rtcconnection/mediaengine/a/a$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/a;->yY:Lcom/discord/rtcconnection/mediaengine/a/a$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/a;->zi:Lcom/discord/rtcconnection/mediaengine/a/a$a;
 
     const-class v0, Lcom/discord/rtcconnection/mediaengine/a/a;
 
@@ -92,20 +92,24 @@
 
     move-result-object v0
 
+    const-string v1, "MediaEngineConnectionLegacy::class.java.simpleName"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/a;->TAG:Ljava/lang/String;
 
     return-void
 .end method
 
-.method public constructor <init>(Ljava/util/concurrent/ExecutorService;Lcom/discord/utilities/logging/Logger;Lcom/hammerandchisel/libdiscord/Discord;JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Ljava/util/List;)V
-    .locals 7
+.method public constructor <init>(Ljava/util/concurrent/ExecutorService;Lcom/discord/utilities/logging/Logger;Lcom/hammerandchisel/libdiscord/Discord;ZJLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Ljava/util/List;)V
+    .locals 14
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/concurrent/ExecutorService;",
             "Lcom/discord/utilities/logging/Logger;",
             "Lcom/hammerandchisel/libdiscord/Discord;",
-            "J",
+            "ZJ",
             "Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;",
             "Ljava/util/List<",
             "+",
@@ -114,149 +118,171 @@
         }
     .end annotation
 
-    const-string v0, "executorService"
+    move-object v0, p0
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object v1, p1
 
-    const-string v0, "logger"
+    move-object/from16 v2, p2
 
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object/from16 v3, p3
 
-    const-string v0, "voiceEngineLegacy"
+    move-object/from16 v4, p7
 
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object/from16 v5, p8
 
-    const-string v0, "connectionOptions"
+    const-string v6, "executorService"
 
-    invoke-static {p6, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v6}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "listeners"
+    const-string v6, "logger"
 
-    invoke-static {p7, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v6}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "voiceEngineLegacy"
+
+    invoke-static {v3, v6}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "connectionOptions"
+
+    invoke-static {v4, v6}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "listeners"
+
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->executorService:Ljava/util/concurrent/ExecutorService;
+    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->executorService:Ljava/util/concurrent/ExecutorService;
 
-    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->logger:Lcom/discord/utilities/logging/Logger;
+    iput-object v2, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iput-object p3, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iput-object v3, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
-    sget-object p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yt:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yD:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->zc:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    const/4 p1, 0x1
+    const/4 v1, 0x1
 
-    new-array p2, p1, [Lkotlin/Pair;
+    new-array v2, v1, [Lkotlin/Pair;
 
-    invoke-static {p4, p5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static/range {p5 .. p6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object p3
+    move-result-object v3
 
-    iget v0, p6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ssrc:I
+    iget v6, v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ssrc:I
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v0
+    move-result-object v6
 
-    invoke-static {p3, v0}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {v3, v6}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    move-result-object p3
+    move-result-object v3
 
-    const/4 v0, 0x0
+    const/4 v6, 0x0
 
-    aput-object p3, p2, v0
+    aput-object v3, v2, v6
 
-    const-string p3, "pairs"
+    const-string v3, "pairs"
 
-    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance p3, Ljava/util/HashMap;
+    new-instance v3, Ljava/util/HashMap;
 
-    invoke-static {p1}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v1}, Lkotlin/a/ad;->dj(I)I
 
-    move-result p1
+    move-result v1
 
-    invoke-direct {p3, p1}, Ljava/util/HashMap;-><init>(I)V
+    invoke-direct {v3, v1}, Ljava/util/HashMap;-><init>(I)V
 
-    move-object p1, p3
+    move-object v1, v3
 
-    check-cast p1, Ljava/util/Map;
+    check-cast v1, Ljava/util/Map;
 
-    invoke-static {p1, p2}, Lkotlin/a/ad;->a(Ljava/util/Map;[Lkotlin/Pair;)V
+    invoke-static {v1, v2}, Lkotlin/a/ad;->a(Ljava/util/Map;[Lkotlin/Pair;)V
 
-    iput-object p3, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yT:Ljava/util/HashMap;
+    iput-object v3, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->zd:Ljava/util/HashMap;
 
-    new-instance p1, Ljava/util/HashMap;
+    new-instance v1, Ljava/util/HashMap;
 
-    invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
+    invoke-direct {v1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yU:Ljava/util/HashMap;
+    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->ze:Ljava/util/HashMap;
 
-    new-instance p1, Ljava/util/ArrayList;
+    new-instance v1, Ljava/util/ArrayList;
 
-    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yV:Ljava/util/ArrayList;
+    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->zf:Ljava/util/ArrayList;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v6, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
-    iget v1, p6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ssrc:I
+    iget v7, v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ssrc:I
 
-    iget-object v4, p6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ip:Ljava/lang/String;
+    iget-object v10, v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ip:Ljava/lang/String;
 
-    iget v5, p6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->port:I
+    iget v11, v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->port:I
 
-    new-instance p1, Lcom/discord/rtcconnection/mediaengine/a/a$e;
+    new-instance v1, Lcom/discord/rtcconnection/mediaengine/a/a$e;
 
-    invoke-direct {p1, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$e;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
+    invoke-direct {v1, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$e;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
 
-    move-object v6, p1
+    move-object v13, v1
 
-    check-cast v6, Lcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;
+    check-cast v13, Lcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;
 
-    move-wide v2, p4
+    move-wide/from16 v8, p5
 
-    invoke-virtual/range {v0 .. v6}, Lcom/hammerandchisel/libdiscord/Discord;->connectToServer(IJLjava/lang/String;ILcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;)Lco/discord/media_engine/Connection;
+    move/from16 v12, p4
 
-    move-result-object p1
+    invoke-virtual/range {v6 .. v13}, Lcom/hammerandchisel/libdiscord/Discord;->connectToServer(IJLjava/lang/String;IZLcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;)Lco/discord/media_engine/Connection;
 
-    new-instance p2, Lcom/discord/rtcconnection/mediaengine/a/a$c;
+    move-result-object v1
 
-    invoke-direct {p2, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$c;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
+    new-instance v2, Lcom/discord/rtcconnection/mediaengine/a/a$c;
 
-    check-cast p2, Lco/discord/media_engine/Connection$OnVideoCallback;
+    invoke-direct {v2, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$c;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
 
-    invoke-virtual {p1, p2}, Lco/discord/media_engine/Connection;->setOnVideoCallback(Lco/discord/media_engine/Connection$OnVideoCallback;)V
+    check-cast v2, Lco/discord/media_engine/Connection$OnVideoCallback;
 
-    new-instance p2, Lcom/discord/rtcconnection/mediaengine/a/a$d;
+    invoke-virtual {v1, v2}, Lco/discord/media_engine/Connection;->setOnVideoCallback(Lco/discord/media_engine/Connection$OnVideoCallback;)V
 
-    invoke-direct {p2, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$d;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
+    new-instance v2, Lcom/discord/rtcconnection/mediaengine/a/a$d;
 
-    check-cast p2, Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;
+    invoke-direct {v2, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$d;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
 
-    invoke-virtual {p1, p2}, Lco/discord/media_engine/Connection;->setUserSpeakingStatusChangedCallback(Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;)V
+    check-cast v2, Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;
 
-    const-string p2, "connection"
+    invoke-virtual {v1, v2}, Lco/discord/media_engine/Connection;->setUserSpeakingStatusChangedCallback(Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;)V
 
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v2, "findme"
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yW:Lco/discord/media_engine/Connection;
+    const-string v3, "added speaking listener"
 
-    new-instance p1, Ljava/util/ArrayList;
+    invoke-static {v2, v3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    check-cast p7, Ljava/util/Collection;
+    const-string v2, "connection"
 
-    invoke-direct {p1, p7}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast p1, Ljava/util/List;
+    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->zg:Lco/discord/media_engine/Connection;
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->listeners:Ljava/util/List;
+    new-instance v1, Ljava/util/ArrayList;
 
-    sget-object p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yt:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    move-object v2, v5
 
-    invoke-direct {p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a;->a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+    check-cast v2, Ljava/util/Collection;
+
+    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+
+    check-cast v1, Ljava/util/List;
+
+    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->listeners:Ljava/util/List;
+
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yD:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+
+    invoke-direct {p0, v1}, Lcom/discord/rtcconnection/mediaengine/a/a;->a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
     return-void
 .end method
@@ -315,11 +341,11 @@
 .method private final a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zc:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a$b;
 
-    invoke-direct {v0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a$b;-><init>(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+    invoke-direct {v0, p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a$b;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -331,7 +357,7 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/mediaengine/a/a;JILjava/lang/String;)V
     .locals 9
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yU:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->ze:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -367,9 +393,9 @@
 .end method
 
 .method public static final synthetic a(Lcom/discord/rtcconnection/mediaengine/a/a;JZ)V
-    .locals 2
+    .locals 3
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yT:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zd:Ljava/util/HashMap;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -398,6 +424,28 @@
 
     move-result v0
 
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    const-string v2, "handleSpeaking: "
+
+    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v1, p1, p2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v2, " -- "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p3}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "findme"
+
+    invoke-static {v2, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
     new-instance v1, Lcom/discord/rtcconnection/mediaengine/a/a$l;
 
     invoke-direct {v1, p1, p2, v0, p3}, Lcom/discord/rtcconnection/mediaengine/a/a$l;-><init>(JIZ)V
@@ -416,10 +464,6 @@
 
     sget-object v1, Lcom/discord/rtcconnection/mediaengine/a/a;->TAG:Ljava/lang/String;
 
-    const-string v2, "TAG"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
@@ -502,7 +546,7 @@
 
     invoke-direct {v3, p2, v0, p1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;-><init>(Ljava/lang/String;ILcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;)V
 
-    sget-object p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yu:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yE:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     invoke-direct {p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a;->a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
@@ -522,7 +566,7 @@
 
     invoke-direct/range {v4 .. v9}, Lcom/discord/rtcconnection/mediaengine/a;-><init>(Ljava/lang/String;ILjava/lang/String;ILjava/lang/Integer;)V
 
-    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     invoke-virtual {p2}, Lcom/hammerandchisel/libdiscord/Discord;->getSupportedVideoCodecs()[Ljava/lang/String;
 
@@ -542,7 +586,7 @@
 
     if-eq v0, v2, :cond_2
 
-    invoke-static {p2}, Lkotlin/a/g;->h([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {p2}, Lkotlin/a/g;->g([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p2
 
@@ -558,7 +602,7 @@
     goto :goto_2
 
     :cond_3
-    sget-object p2, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p2, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p2, Ljava/util/List;
 
@@ -567,15 +611,15 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yV:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zf:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yV:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zf:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yV:Ljava/util/ArrayList;
+    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zf:Ljava/util/ArrayList;
 
     check-cast p2, Ljava/util/Collection;
 
@@ -603,7 +647,9 @@
     :cond_5
     if-nez p1, :cond_6
 
-    sget-object p1, Lcom/discord/rtcconnection/mediaengine/a/a$j;->zb:Lcom/discord/rtcconnection/mediaengine/a/a$j;
+    new-instance p1, Lcom/discord/rtcconnection/mediaengine/a/a$j;
+
+    invoke-direct {p1, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$j;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
@@ -614,7 +660,7 @@
     :cond_6
     new-instance p1, Lcom/discord/rtcconnection/mediaengine/a/a$k;
 
-    invoke-direct {p1, p2}, Lcom/discord/rtcconnection/mediaengine/a/a$k;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p0, p2}, Lcom/discord/rtcconnection/mediaengine/a/a$k;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
@@ -634,7 +680,7 @@
 .method public static final synthetic b(Lcom/discord/rtcconnection/mediaengine/a/a;)Ljava/util/HashMap;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yT:Ljava/util/HashMap;
+    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zd:Ljava/util/HashMap;
 
     return-object p0
 .end method
@@ -642,7 +688,7 @@
 .method public static final synthetic c(Lcom/discord/rtcconnection/mediaengine/a/a;)Ljava/util/ArrayList;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yV:Ljava/util/ArrayList;
+    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zf:Ljava/util/ArrayList;
 
     return-object p0
 .end method
@@ -695,10 +741,6 @@
 
     sget-object v3, Lcom/discord/rtcconnection/mediaengine/a/a;->TAG:Ljava/lang/String;
 
-    const-string v4, "TAG"
-
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     move-object v5, v1
 
     check-cast v5, Ljava/lang/Throwable;
@@ -835,7 +877,7 @@
 
     if-gez v1, :cond_2
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_2
     move-object v4, v2
@@ -879,7 +921,7 @@
 .method public final a(JI)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yW:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zg:Lco/discord/media_engine/Connection;
 
     int-to-float p3, p3
 
@@ -897,7 +939,7 @@
 
     if-nez p4, :cond_0
 
-    iget-object p4, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yU:Ljava/util/HashMap;
+    iget-object p4, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->ze:Ljava/util/HashMap;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -924,7 +966,7 @@
     const/4 p4, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yT:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zd:Ljava/util/HashMap;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -958,7 +1000,7 @@
     const/4 v1, 0x0
 
     :goto_2
-    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yU:Ljava/util/HashMap;
+    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->ze:Ljava/util/HashMap;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -990,7 +1032,7 @@
     if-eqz v0, :cond_7
 
     :cond_6
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yW:Lco/discord/media_engine/Connection;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zg:Lco/discord/media_engine/Connection;
 
     invoke-static {p4}, Lcom/discord/rtcconnection/mediaengine/a/a;->B(I)I
 
@@ -1009,7 +1051,7 @@
     invoke-virtual/range {v1 .. v8}, Lco/discord/media_engine/Connection;->connectUser(JIIIZF)V
 
     :cond_7
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yT:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zd:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -1023,7 +1065,7 @@
 
     invoke-interface {v0, v1, p3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p3, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yU:Ljava/util/HashMap;
+    iget-object p3, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->ze:Ljava/util/HashMap;
 
     check-cast p3, Ljava/util/Map;
 
@@ -1043,7 +1085,7 @@
 .method public final a(JZ)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yW:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zg:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0, p1, p2, p3}, Lco/discord/media_engine/Connection;->muteUser(JZ)V
 
@@ -1061,23 +1103,23 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yW:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zg:Lco/discord/media_engine/Connection;
 
-    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yJ:I
+    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yT:I
 
     invoke-virtual {v0, v1}, Lco/discord/media_engine/Connection;->setVADLeadingFramesToBuffer(I)V
 
-    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yK:I
+    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yU:I
 
     invoke-virtual {v0, v1}, Lco/discord/media_engine/Connection;->setVADTrailingFramesToSend(I)V
 
-    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yI:I
+    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yS:I
 
     int-to-float v1, v1
 
     invoke-virtual {v0, v1}, Lco/discord/media_engine/Connection;->setVADTriggerThreshold(F)V
 
-    iget-boolean p2, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yL:Z
+    iget-boolean p2, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yV:Z
 
     if-eqz p2, :cond_0
 
@@ -1103,7 +1145,7 @@
 
     invoke-virtual {v0, p2}, Lco/discord/media_engine/Connection;->setExpectedPacketLossRate(F)V
 
-    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     invoke-virtual {p2, p1}, Lcom/hammerandchisel/libdiscord/Discord;->enableBuiltInAEC(Z)V
 
@@ -1111,7 +1153,7 @@
 .end method
 
 .method public final a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;)V
-    .locals 1
+    .locals 2
 
     const-string v0, "listener"
 
@@ -1121,9 +1163,13 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    move-object v0, p0
 
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zc:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+
+    invoke-interface {p1, v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
     return-void
 .end method
@@ -1143,7 +1189,7 @@
 
     invoke-direct {v0, p1, p2}, Lco/discord/media_engine/EncryptionSettings;-><init>(Ljava/lang/String;[I)V
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yW:Lco/discord/media_engine/Connection;
+    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zg:Lco/discord/media_engine/Connection;
 
     invoke-virtual {p1, v0}, Lco/discord/media_engine/Connection;->setEncryptionSettings(Lco/discord/media_engine/EncryptionSettings;)V
 
@@ -1171,10 +1217,6 @@
 
     sget-object v1, Lcom/discord/rtcconnection/mediaengine/a/a;->TAG:Ljava/lang/String;
 
-    const-string v2, "TAG"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     const-string v2, "destroy(). Disconnecting from server"
 
     const/4 v3, 0x0
@@ -1185,11 +1227,13 @@
 
     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
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yW:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zg:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0}, Lco/discord/media_engine/Connection;->dispose()V
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/a/a$g;->yZ:Lcom/discord/rtcconnection/mediaengine/a/a$g;
+    new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a$g;
+
+    invoke-direct {v0, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$g;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1215,7 +1259,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yW:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zg:Lco/discord/media_engine/Connection;
 
     new-instance v1, Lcom/discord/rtcconnection/mediaengine/a/a$h;
 
@@ -1239,7 +1283,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yV:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zf:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/lang/Iterable;
 
@@ -1282,7 +1326,7 @@
 
     check-cast v8, Lcom/discord/rtcconnection/mediaengine/a;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yV:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zf:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/lang/Iterable;
 
@@ -1327,7 +1371,7 @@
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a$n;
 
-    invoke-direct {v0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a$n;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a$n;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1340,7 +1384,7 @@
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a$o;
 
-    invoke-direct {v0, p2}, Lcom/discord/rtcconnection/mediaengine/a/a$o;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, p0, p2}, Lcom/discord/rtcconnection/mediaengine/a/a$o;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1355,7 +1399,7 @@
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a$p;
 
-    invoke-direct {v0, p2}, Lcom/discord/rtcconnection/mediaengine/a/a$p;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, p0, p2}, Lcom/discord/rtcconnection/mediaengine/a/a$p;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1468,7 +1512,7 @@
 
     invoke-direct {v4, p2, v5, v7, v0}, Lco/discord/media_engine/VideoDecoder;-><init>(Ljava/lang/String;IILjava/util/Map;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yW:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zg:Lco/discord/media_engine/Connection;
 
     new-array v5, v3, [Lco/discord/media_engine/AudioDecoder;
 
@@ -1483,10 +1527,20 @@
     return-void
 .end method
 
+.method public final r(Z)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zg:Lco/discord/media_engine/Connection;
+
+    invoke-virtual {v0, p1}, Lco/discord/media_engine/Connection;->muteLocalUser(Z)V
+
+    return-void
+.end method
+
 .method public final setPttActive(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yW:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zg:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0, p1}, Lco/discord/media_engine/Connection;->setPTTActive(Z)V
 
@@ -1496,7 +1550,7 @@
 .method public final setSelfDeafen(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yW:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zg:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0, p1}, Lco/discord/media_engine/Connection;->deafenLocalUser(Z)V
 
@@ -1506,19 +1560,9 @@
 .method public final setVideoBroadcast(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yW:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->zg:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0, p1}, Lco/discord/media_engine/Connection;->setVideoBroadcast(Z)V
 
     return-void
 .end method
-
-.method public final t(Z)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->yW:Lco/discord/media_engine/Connection;
-
-    invoke-virtual {v0, p1}, Lco/discord/media_engine/Connection;->muteLocalUser(Z)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b$1.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b$1.smali
index a74f4d37cc..475646c9e9 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/mediaengine/a/c$b;->onDestroy()V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c$b;->onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,15 +27,19 @@
 
 
 # instance fields
+.field final synthetic $connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+
 .field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/c$b;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$1;->this$0:Lcom/discord/rtcconnection/mediaengine/a/c$b;
 
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$1;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+
     const/4 p1, 0x0
 
     invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
@@ -46,15 +50,17 @@
 
 # virtual methods
 .method public final synthetic invoke()Ljava/lang/Object;
-    .locals 1
+    .locals 2
 
     iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$1;->this$0:Lcom/discord/rtcconnection/mediaengine/a/c$b;
 
-    iget-object v0, v0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zg:Lcom/discord/rtcconnection/mediaengine/a/c;
+    iget-object v0, v0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zo:Lcom/discord/rtcconnection/mediaengine/a/c;
 
-    invoke-static {v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;)V
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$1;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    invoke-static {v0, v1}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b$2.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b$2.smali
index 80b82b8d11..b4ed8d8010 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b$2.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/mediaengine/a/c$b;->onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c$b;->onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,15 +27,19 @@
 
 
 # instance fields
+.field final synthetic $connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+
 .field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/c$b;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$2;->this$0:Lcom/discord/rtcconnection/mediaengine/a/c$b;
 
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$2;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+
     const/4 p1, 0x0
 
     invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
@@ -46,15 +50,17 @@
 
 # virtual methods
 .method public final synthetic invoke()Ljava/lang/Object;
-    .locals 1
+    .locals 2
 
     iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$2;->this$0:Lcom/discord/rtcconnection/mediaengine/a/c$b;
 
-    iget-object v0, v0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zg:Lcom/discord/rtcconnection/mediaengine/a/c;
+    iget-object v0, v0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zo:Lcom/discord/rtcconnection/mediaengine/a/c;
 
-    invoke-static {v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;)V
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$2;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    invoke-static {v0, v1}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b$3.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b$3.smali
index 428fc14d69..b6b0ac087a 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b$3.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b$3.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/mediaengine/a/c$b;->onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c$b;->onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,15 +27,19 @@
 
 
 # instance fields
+.field final synthetic $connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+
 .field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/c$b;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$3;->this$0:Lcom/discord/rtcconnection/mediaengine/a/c$b;
 
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$3;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+
     const/4 p1, 0x0
 
     invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
@@ -46,15 +50,17 @@
 
 # virtual methods
 .method public final synthetic invoke()Ljava/lang/Object;
-    .locals 1
+    .locals 2
 
     iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$3;->this$0:Lcom/discord/rtcconnection/mediaengine/a/c$b;
 
-    iget-object v0, v0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zg:Lcom/discord/rtcconnection/mediaengine/a/c;
+    iget-object v0, v0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zo:Lcom/discord/rtcconnection/mediaengine/a/c;
 
-    invoke-static {v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;)V
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$3;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    invoke-static {v0, v1}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b.smali
index 2a34114781..be5268ec56 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$b.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/mediaengine/a/c;->a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    value = Lcom/discord/rtcconnection/mediaengine/a/c;->a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;ZLkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -20,20 +20,24 @@
 # instance fields
 .field final synthetic $userId$inlined:J
 
-.field final synthetic zg:Lcom/discord/rtcconnection/mediaengine/a/c;
+.field final synthetic zo:Lcom/discord/rtcconnection/mediaengine/a/c;
 
-.field final synthetic zh:Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;
+.field final synthetic zp:Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;
+
+.field final synthetic zq:Z
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c;Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;J)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c;Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;ZJ)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zg:Lcom/discord/rtcconnection/mediaengine/a/c;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zo:Lcom/discord/rtcconnection/mediaengine/a/c;
 
-    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zh:Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zp:Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;
 
-    iput-wide p3, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->$userId$inlined:J
+    iput-boolean p3, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zq:Z
+
+    iput-wide p4, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->$userId$inlined:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,11 +46,12 @@
 
 
 # virtual methods
-.method public final onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
+.method public final onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
+            "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;",
             "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;",
             "Ljava/util/List<",
             "Lcom/discord/rtcconnection/mediaengine/a;",
@@ -54,50 +59,62 @@
         }
     .end annotation
 
-    const-string v0, "transportInfo"
+    const-string v0, "connection"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string p1, "supportedVideoCodecs"
+    const-string p1, "transportInfo"
 
     invoke-static {p2, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string p1, "supportedVideoCodecs"
+
+    invoke-static {p3, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-void
 .end method
 
-.method public final onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+.method public final onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
     .locals 1
 
-    const-string v0, "connectionState"
+    const-string v0, "connection"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->ys:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    const-string v0, "connectionState"
 
-    if-ne p1, v0, :cond_0
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zg:Lcom/discord/rtcconnection/mediaengine/a/c;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->yC:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+
+    if-ne p2, v0, :cond_0
+
+    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zo:Lcom/discord/rtcconnection/mediaengine/a/c;
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/c$b$2;
 
-    invoke-direct {v0, p0}, Lcom/discord/rtcconnection/mediaengine/a/c$b$2;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;)V
+    invoke-direct {v0, p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/c$b$2;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    invoke-static {p1, v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    invoke-static {p2, v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
     :cond_0
     return-void
 .end method
 
-.method public final onDestroy()V
+.method public final onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zg:Lcom/discord/rtcconnection/mediaengine/a/c;
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zo:Lcom/discord/rtcconnection/mediaengine/a/c;
 
     new-instance v1, Lcom/discord/rtcconnection/mediaengine/a/c$b$1;
 
-    invoke-direct {v1, p0}, Lcom/discord/rtcconnection/mediaengine/a/c$b$1;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;)V
+    invoke-direct {v1, p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/c$b$1;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function0;
 
@@ -106,22 +123,26 @@
     return-void
 .end method
 
-.method public final onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+.method public final onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
     .locals 1
 
-    const-string v0, "exception"
+    const-string v0, "connection"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zg:Lcom/discord/rtcconnection/mediaengine/a/c;
+    const-string v0, "exception"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->zo:Lcom/discord/rtcconnection/mediaengine/a/c;
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/c$b$3;
 
-    invoke-direct {v0, p0}, Lcom/discord/rtcconnection/mediaengine/a/c$b$3;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;)V
+    invoke-direct {v0, p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/c$b$3;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    invoke-static {p1, v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    invoke-static {p2, v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$c.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$c.smali
index d51ebf3c41..8cb827e771 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$c.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/mediaengine/a/c;->a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    value = Lcom/discord/rtcconnection/mediaengine/a/c;->a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;ZLkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -61,7 +61,7 @@
 
     invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$b;->onNewConnection(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$d.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$d.smali
index a8b2107dc4..6f9e1e0dc3 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$d.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$d.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic zi:Lkotlin/jvm/functions/Function1;
+.field final synthetic zr:Lkotlin/jvm/functions/Function1;
 
 
 # direct methods
 .method constructor <init>(Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$d;->zi:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$d;->zr:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,7 +49,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$d;->zi:Lkotlin/jvm/functions/Function1;
+    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$d;->zr:Lkotlin/jvm/functions/Function1;
 
     new-instance v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$e.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$e.smali
index e52a600c03..e8b197e174 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$e.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$e.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/mediaengine/a/c;->eh()V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c;->ek()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic zg:Lcom/discord/rtcconnection/mediaengine/a/c;
+.field final synthetic zo:Lcom/discord/rtcconnection/mediaengine/a/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$e;->zg:Lcom/discord/rtcconnection/mediaengine/a/c;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$e;->zo:Lcom/discord/rtcconnection/mediaengine/a/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 8
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c$e;->zg:Lcom/discord/rtcconnection/mediaengine/a/c;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c$e;->zo:Lcom/discord/rtcconnection/mediaengine/a/c;
 
-    invoke-static {v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->b(Lcom/discord/rtcconnection/mediaengine/a/c;)Lcom/discord/utilities/logging/Logger;
+    invoke-static {v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;)Lcom/discord/utilities/logging/Logger;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$f.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$f.smali
index 7dfe381100..0d1fa0af18 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$f.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c$f.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/mediaengine/a/c;->eh()V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c;->ek()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final zj:Lcom/discord/rtcconnection/mediaengine/a/c$f;
+.field public static final zs:Lcom/discord/rtcconnection/mediaengine/a/c$f;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/mediaengine/a/c$f;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/c$f;->zj:Lcom/discord/rtcconnection/mediaengine/a/c$f;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/c$f;->zs:Lcom/discord/rtcconnection/mediaengine/a/c$f;
 
     return-void
 .end method
@@ -95,7 +95,7 @@
 
     invoke-interface {p1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$b;->onNativeEngineInitialized()V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c.smali
index d32bab15bf..0bb14e22c6 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c.smali
@@ -17,7 +17,7 @@
 # static fields
 .field private static final TAG:Ljava/lang/String;
 
-.field public static final zf:Lcom/discord/rtcconnection/mediaengine/a/c$a;
+.field public static final zn:Lcom/discord/rtcconnection/mediaengine/a/c$a;
 
 
 # instance fields
@@ -27,9 +27,19 @@
 
 .field private final openSLESConfig:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
-.field private yX:Lcom/hammerandchisel/libdiscord/Discord;
+.field private zh:Lcom/hammerandchisel/libdiscord/Discord;
 
-.field private final zc:Ljava/util/ArrayList;
+.field private final zk:Ljava/util/ArrayList;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/ArrayList<",
+            "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final zl:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -39,9 +49,7 @@
     .end annotation
 .end field
 
-.field private zd:Lcom/discord/rtcconnection/mediaengine/a/a;
-
-.field private final ze:Ljava/util/concurrent/ExecutorService;
+.field private final zm:Ljava/util/concurrent/ExecutorService;
 
 
 # direct methods
@@ -54,7 +62,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/rtcconnection/mediaengine/a/c$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/c;->zf:Lcom/discord/rtcconnection/mediaengine/a/c$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/c;->zn:Lcom/discord/rtcconnection/mediaengine/a/c$a;
 
     const-class v0, Lcom/discord/rtcconnection/mediaengine/a/c;
 
@@ -62,6 +70,10 @@
 
     move-result-object v0
 
+    const-string v1, "MediaEngineLegacy::class.java.simpleName"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
 
     return-void
@@ -90,7 +102,7 @@
 
     iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->ze:Ljava/util/concurrent/ExecutorService;
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zm:Ljava/util/concurrent/ExecutorService;
 
     iput-object p3, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->openSLESConfig:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
@@ -100,15 +112,29 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zc:Ljava/util/ArrayList;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zk:Ljava/util/ArrayList;
+
+    new-instance p1, Ljava/util/ArrayList;
+
+    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zl:Ljava/util/ArrayList;
 
     return-void
 .end method
 
+.method public static final synthetic a(Lcom/discord/rtcconnection/mediaengine/a/c;)Lcom/discord/utilities/logging/Logger;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
+
+    return-object p0
+.end method
+
 .method public static final synthetic a(Lcom/discord/rtcconnection/mediaengine/a/c;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->ze:Ljava/util/concurrent/ExecutorService;
+    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zm:Ljava/util/concurrent/ExecutorService;
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/f;
 
@@ -123,35 +149,29 @@
     return-object p0
 .end method
 
-.method public static final synthetic a(Lcom/discord/rtcconnection/mediaengine/a/c;)V
+.method public static final synthetic a(Lcom/discord/rtcconnection/mediaengine/a/c;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
-
-    const/4 v1, 0x0
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
+    const/4 v1, 0x0
+
     invoke-virtual {v0, v1}, Lcom/hammerandchisel/libdiscord/Discord;->setLocalVoiceLevelChangedCallback(Lcom/hammerandchisel/libdiscord/Discord$LocalVoiceLevelChangedCallback;)V
 
     :cond_0
-    iput-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zd:Lcom/discord/rtcconnection/mediaengine/a/a;
+    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zk:Ljava/util/ArrayList;
+
+    invoke-virtual {p0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
 
     return-void
 .end method
 
-.method public static final synthetic b(Lcom/discord/rtcconnection/mediaengine/a/c;)Lcom/discord/utilities/logging/Logger;
-    .locals 0
+.method private final ek()V
+    .locals 8
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
-
-    return-object p0
-.end method
-
-.method private final eh()V
-    .locals 9
-
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -162,21 +182,17 @@
 
     sget-object v2, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
 
-    const-string v0, "TAG"
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v3, "initializing voice engine. OpenSL ES: "
 
-    new-instance v3, Ljava/lang/StringBuilder;
+    invoke-direct {v0, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    const-string v4, "initializing voice engine. OpenSL ES: "
+    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->openSLESConfig:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
-    invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    iget-object v4, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->openSLESConfig:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v3
 
@@ -188,53 +204,53 @@
 
     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
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->openSLESConfig:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->openSLESConfig:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
-    sget-object v2, Lcom/discord/rtcconnection/mediaengine/a/d;->$EnumSwitchMapping$0:[I
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/a/d;->$EnumSwitchMapping$0:[I
 
-    invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->ordinal()I
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->ordinal()I
 
-    move-result v1
+    move-result v0
 
-    aget v1, v2, v1
+    aget v0, v1, v0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    if-eq v1, v2, :cond_2
+    if-eq v0, v1, :cond_2
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    if-eq v1, v3, :cond_1
+    if-eq v0, v2, :cond_1
 
     goto :goto_0
 
     :cond_1
-    invoke-static {v2}, Lorg/webrtc/voiceengine/WebRtcAudioManager;->setBlacklistDeviceForOpenSLESUsage(Z)V
+    invoke-static {v1}, Lorg/webrtc/voiceengine/WebRtcAudioManager;->setBlacklistDeviceForOpenSLESUsage(Z)V
 
     goto :goto_0
 
     :cond_2
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-static {v1}, Lorg/webrtc/voiceengine/WebRtcAudioManager;->setBlacklistDeviceForOpenSLESUsage(Z)V
+    invoke-static {v0}, Lorg/webrtc/voiceengine/WebRtcAudioManager;->setBlacklistDeviceForOpenSLESUsage(Z)V
 
     :goto_0
-    new-instance v1, Lcom/discord/rtcconnection/mediaengine/a/c$e;
+    new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/c$e;
 
-    invoke-direct {v1, p0}, Lcom/discord/rtcconnection/mediaengine/a/c$e;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c;)V
+    invoke-direct {v0, p0}, Lcom/discord/rtcconnection/mediaengine/a/c$e;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c;)V
 
-    check-cast v1, Lorg/webrtc/Logging$ExternalReporter;
+    check-cast v0, Lorg/webrtc/Logging$ExternalReporter;
 
-    sput-object v1, Lorg/webrtc/Logging;->externalReporter:Lorg/webrtc/Logging$ExternalReporter;
+    sput-object v0, Lorg/webrtc/Logging;->externalReporter:Lorg/webrtc/Logging$ExternalReporter;
 
     :try_start_0
-    new-instance v1, Lcom/hammerandchisel/libdiscord/Discord;
+    new-instance v0, Lcom/hammerandchisel/libdiscord/Discord;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->context:Landroid/content/Context;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->context:Landroid/content/Context;
 
-    invoke-direct {v1, v2}, Lcom/hammerandchisel/libdiscord/Discord;-><init>(Landroid/content/Context;)V
+    invoke-direct {v0, v1}, Lcom/hammerandchisel/libdiscord/Discord;-><init>(Landroid/content/Context;)V
 
-    iput-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iput-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
     :try_end_0
     .catch Ljava/lang/ExceptionInInitializerError; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/UnsatisfiedLinkError; {:try_start_0 .. :try_end_0} :catch_0
@@ -243,82 +259,76 @@
     goto :goto_1
 
     :catchall_0
-    move-exception v1
+    move-exception v0
 
-    move-object v5, v1
+    move-object v4, v0
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
 
-    sget-object v3, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
+    sget-object v2, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
 
-    invoke-static {v3, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0x8
 
-    const/16 v7, 0x8
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    const-string v3, "Unable to initialize voice engine, new error discovered"
 
-    const-string v4, "Unable to initialize voice engine, new error discovered"
-
-    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
     goto :goto_1
 
     :catch_0
-    move-exception v1
+    move-exception v0
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
 
-    sget-object v3, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
+    sget-object v2, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
 
-    invoke-static {v3, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object v4, v0
 
-    move-object v5, v1
+    check-cast v4, Ljava/lang/Throwable;
 
-    check-cast v5, Ljava/lang/Throwable;
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0x8
 
-    const/16 v7, 0x8
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    const-string v3, "Unable to initialize voice engine."
 
-    const-string v4, "Unable to initialize voice engine."
-
-    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
     goto :goto_1
 
     :catch_1
-    move-exception v1
+    move-exception v0
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
 
-    sget-object v3, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
+    sget-object v2, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
 
-    invoke-static {v3, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object v4, v0
 
-    move-object v5, v1
+    check-cast v4, Ljava/lang/Throwable;
 
-    check-cast v5, Ljava/lang/Throwable;
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0x8
 
-    const/16 v7, 0x8
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    const-string v3, "Unable to initialize voice engine."
 
-    const-string v4, "Unable to initialize voice engine."
-
-    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
     :goto_1
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/a/c$f;->zj:Lcom/discord/rtcconnection/mediaengine/a/c$f;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/a/c$f;->zs:Lcom/discord/rtcconnection/mediaengine/a/c$f;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -341,7 +351,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zc:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zl:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/lang/Iterable;
 
@@ -376,10 +386,6 @@
 
     sget-object v3, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
 
-    const-string v4, "TAG"
-
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     move-object v5, v1
 
     check-cast v5, Ljava/lang/Throwable;
@@ -405,7 +411,7 @@
 .method public final A(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -415,12 +421,13 @@
     return-void
 .end method
 
-.method public final a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
-    .locals 11
+.method public final a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;ZLkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    .locals 16
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
             "Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;",
+            "Z",
             "Lkotlin/jvm/functions/Function1<",
             "-",
             "Ljava/lang/Exception;",
@@ -430,78 +437,92 @@
         }
     .end annotation
 
-    const-string v0, "options"
+    move-object/from16 v6, p0
 
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object/from16 v0, p5
 
-    const-string v0, "onFailure"
+    const-string v1, "options"
 
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object/from16 v14, p3
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->eh()V
+    invoke-static {v14, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    const-string v1, "onFailure"
 
-    if-nez v0, :cond_0
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$c;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->ek()V
 
-    invoke-direct {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$c;-><init>()V
+    iget-object v1, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
-    invoke-interface {p4, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    if-nez v1, :cond_0
+
+    new-instance v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$c;
+
+    invoke-direct {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$c;-><init>()V
+
+    invoke-interface {v0, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    iget-object v4, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v10, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
-    if-eqz v4, :cond_1
+    if-eqz v10, :cond_1
 
-    iget-object v5, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
+    iget-object v0, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
 
-    sget-object v6, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
 
-    const-string p4, "TAG"
+    invoke-static/range {p3 .. p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
-    invoke-static {v6, p4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v2
 
-    invoke-static {p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    const-string v3, "Connecting with options: "
 
-    move-result-object p4
+    invoke-virtual {v3, v2}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
 
-    const-string v0, "Connecting with options: "
+    move-result-object v2
 
-    invoke-virtual {v0, p4}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+    const/4 v3, 0x0
 
-    move-result-object v7
+    const/4 v4, 0x4
 
-    const/4 v8, 0x0
+    const/4 v5, 0x0
 
-    const/4 v9, 0x4
+    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
 
-    const/4 v10, 0x0
+    new-instance v7, Lcom/discord/rtcconnection/mediaengine/a/c$b;
 
-    invoke-static/range {v5 .. v10}, 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
+    move-object v0, v7
 
-    new-instance p4, Lcom/discord/rtcconnection/mediaengine/a/c$b;
+    move-object/from16 v1, p0
 
-    invoke-direct {p4, p0, p3, p1, p2}, Lcom/discord/rtcconnection/mediaengine/a/c$b;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c;Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;J)V
+    move-object/from16 v2, p3
+
+    move/from16 v3, p4
+
+    move-wide/from16 v4, p1
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/rtcconnection/mediaengine/a/c$b;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c;Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;ZJ)V
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->ze:Ljava/util/concurrent/ExecutorService;
+    iget-object v8, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->zm:Ljava/util/concurrent/ExecutorService;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
+    iget-object v9, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
 
-    invoke-static {p4}, Lkotlin/a/m;->ba(Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v7}, Lkotlin/a/m;->ba(Ljava/lang/Object;)Ljava/util/List;
 
-    move-result-object v8
+    move-result-object v15
 
-    move-object v1, v0
+    move-object v7, v0
 
-    move-wide v5, p1
+    move/from16 v11, p4
 
-    move-object v7, p3
+    move-wide/from16 v12, p1
 
-    invoke-direct/range {v1 .. v8}, Lcom/discord/rtcconnection/mediaengine/a/a;-><init>(Ljava/util/concurrent/ExecutorService;Lcom/discord/utilities/logging/Logger;Lcom/hammerandchisel/libdiscord/Discord;JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Ljava/util/List;)V
+    move-object/from16 v14, p3
+
+    invoke-direct/range {v7 .. v15}, Lcom/discord/rtcconnection/mediaengine/a/a;-><init>(Ljava/util/concurrent/ExecutorService;Lcom/discord/utilities/logging/Logger;Lcom/hammerandchisel/libdiscord/Discord;ZJLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Ljava/util/List;)V
 
     goto :goto_0
 
@@ -509,26 +530,24 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zd:Lcom/discord/rtcconnection/mediaengine/a/a;
+    if-eqz v0, :cond_2
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zd:Lcom/discord/rtcconnection/mediaengine/a/a;
+    iget-object v1, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->zk:Ljava/util/ArrayList;
 
-    if-eqz p1, :cond_2
+    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    new-instance p2, Lcom/discord/rtcconnection/mediaengine/a/c$c;
+    new-instance v1, Lcom/discord/rtcconnection/mediaengine/a/c$c;
 
-    invoke-direct {p2, p1}, Lcom/discord/rtcconnection/mediaengine/a/c$c;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
+    invoke-direct {v1, v0}, Lcom/discord/rtcconnection/mediaengine/a/c$c;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
 
-    check-cast p2, Lkotlin/jvm/functions/Function1;
+    check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    invoke-direct {p0, p2}, Lcom/discord/rtcconnection/mediaengine/a/c;->f(Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {v6, v1}, Lcom/discord/rtcconnection/mediaengine/a/c;->f(Lkotlin/jvm/functions/Function1;)V
 
     :cond_2
-    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zd:Lcom/discord/rtcconnection/mediaengine/a/a;
+    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
-
-    return-object p1
+    return-object v0
 .end method
 
 .method public final a(Lcom/discord/rtcconnection/mediaengine/MediaEngine$b;)V
@@ -538,7 +557,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zc:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zl:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -562,9 +581,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->eh()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->ek()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -595,9 +614,9 @@
 
     if-eqz p1, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->eh()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->ek()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -613,7 +632,7 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz p1, :cond_2
 
@@ -625,56 +644,36 @@
     return-void
 .end method
 
-.method public final ef()Lcom/hammerandchisel/libdiscord/Discord;
+.method public final ei()Lcom/hammerandchisel/libdiscord/Discord;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     return-object v0
 .end method
 
-.method public final eg()Ljava/util/concurrent/ExecutorService;
+.method public final ej()Ljava/util/concurrent/ExecutorService;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->ze:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zm:Ljava/util/concurrent/ExecutorService;
 
     return-object v0
 .end method
 
-.method public final getConnections()Ljava/util/List;
+.method public final bridge synthetic getConnections()Ljava/util/List;
     .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;",
-            ">;"
-        }
-    .end annotation
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zd:Lcom/discord/rtcconnection/mediaengine/a/a;
-
-    if-eqz v0, :cond_0
-
-    invoke-static {v0}, Lkotlin/a/m;->ba(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1
-
-    :cond_0
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zk:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/util/List;
 
-    :cond_1
     return-object v0
 .end method
 
 .method public final setAutomaticGainControl(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -687,7 +686,7 @@
 .method public final setEchoCancellation(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -700,7 +699,7 @@
 .method public final setNoiseSuppression(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -713,7 +712,7 @@
 .method public final setOutputVolume(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->yX:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->zh:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/d.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/d.smali
index a986510921..f5cb2ff0ab 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/d.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/d.smali
@@ -20,7 +20,7 @@
 
     sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/d;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yp:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yz:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->ordinal()I
 
@@ -32,7 +32,7 @@
 
     sget-object v0, Lcom/discord/rtcconnection/mediaengine/a/d;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yq:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yA:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->ordinal()I
 
@@ -44,7 +44,7 @@
 
     sget-object v0, Lcom/discord/rtcconnection/mediaengine/a/d;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yo:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yy:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->ordinal()I
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/b.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/b.smali
index 3b1a0d3ebc..0759e76fb4 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/b.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final yR:Lcom/discord/rtcconnection/mediaengine/b;
+.field public static final zb:Lcom/discord/rtcconnection/mediaengine/b;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/mediaengine/b;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/b;->yR:Lcom/discord/rtcconnection/mediaengine/b;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/b;->zb:Lcom/discord/rtcconnection/mediaengine/b;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$b.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$b.smali
index f7b92c820e..1fe4424884 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$b.smali
@@ -23,19 +23,19 @@
 
 
 # static fields
-.field public static final zA:I
+.field public static final zE:I
 
-.field private static final synthetic zB:[I
+.field public static final zF:I
 
-.field public static final zv:I
+.field public static final zG:I
 
-.field public static final zw:I
+.field public static final zH:I
 
-.field public static final zx:I
+.field public static final zI:I
 
-.field public static final zy:I
+.field public static final zJ:I
 
-.field public static final zz:I
+.field private static final synthetic zK:[I
 
 
 # direct methods
@@ -50,27 +50,27 @@
 
     const/4 v2, 0x1
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->zv:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->zE:I
 
     const/4 v2, 0x2
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->zw:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->zF:I
 
     const/4 v2, 0x3
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->zx:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->zG:I
 
     const/4 v2, 0x4
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->zy:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->zH:I
 
     const/4 v2, 0x5
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->zz:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->zI:I
 
-    sput v0, Lcom/discord/rtcconnection/socket/a$b;->zA:I
+    sput v0, Lcom/discord/rtcconnection/socket/a$b;->zJ:I
 
-    sput-object v1, Lcom/discord/rtcconnection/socket/a$b;->zB:[I
+    sput-object v1, Lcom/discord/rtcconnection/socket/a$b;->zK:[I
 
     return-void
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$c.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$c.smali
index 6402336a98..d9d5f59e81 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$c.smali
@@ -33,16 +33,16 @@
 .method public abstract a(ZLjava/lang/Integer;Ljava/lang/String;)V
 .end method
 
-.method public abstract ag(Ljava/lang/String;)V
+.method public abstract ac(Ljava/lang/String;)V
 .end method
 
 .method public abstract c(IILjava/lang/String;)V
 .end method
 
-.method public abstract ec()V
+.method public abstract ef()V
 .end method
 
-.method public abstract ed()V
+.method public abstract eg()V
 .end method
 
 .method public abstract l(J)V
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$d.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$d.smali
index 44fb765d71..a86871bc9b 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$d.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$d.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final zC:Lcom/discord/rtcconnection/socket/a$d;
+.field public static final zL:Lcom/discord/rtcconnection/socket/a$d;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/socket/a$d;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/socket/a$d;->zC:Lcom/discord/rtcconnection/socket/a$d;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$d;->zL:Lcom/discord/rtcconnection/socket/a$d;
 
     return-void
 .end method
@@ -95,7 +95,7 @@
 
     invoke-interface {p1}, Lokhttp3/WebSocket;->cancel()V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$e.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$e.smali
index 5eb5423855..edd6f25360 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$e.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$e.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final zD:Lcom/discord/rtcconnection/socket/a$e;
+.field public static final zM:Lcom/discord/rtcconnection/socket/a$e;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/socket/a$e;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/socket/a$e;->zD:Lcom/discord/rtcconnection/socket/a$e;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$e;->zM:Lcom/discord/rtcconnection/socket/a$e;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-interface {p1, v0, v1}, Lokhttp3/WebSocket;->f(ILjava/lang/String;)Z
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$f.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$f.smali
index 7a68e2124b..9a5cc847b5 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$f.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$f.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final zE:Lcom/discord/rtcconnection/socket/a$f;
+.field public static final zN:Lcom/discord/rtcconnection/socket/a$f;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/socket/a$f;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/socket/a$f;->zE:Lcom/discord/rtcconnection/socket/a$f;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$f;->zN:Lcom/discord/rtcconnection/socket/a$f;
 
     return-void
 .end method
@@ -77,7 +77,7 @@
 
     invoke-interface {p1, v1, v0, v2}, Lcom/discord/rtcconnection/socket/a$c;->a(ZLjava/lang/Integer;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$g.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$g.smali
index 04d3df4ff9..cb0ac5f07b 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$g.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$g.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/socket/a;->ei()V
+    value = Lcom/discord/rtcconnection/socket/a;->el()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final zF:Lcom/discord/rtcconnection/socket/a$g;
+.field public static final zO:Lcom/discord/rtcconnection/socket/a$g;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/socket/a$g;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/socket/a$g;->zF:Lcom/discord/rtcconnection/socket/a$g;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$g;->zO:Lcom/discord/rtcconnection/socket/a$g;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-interface {p1, v0, v1}, Lokhttp3/WebSocket;->f(ILjava/lang/String;)Z
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$h$a.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$h$a.smali
index 2b010dd903..ed77382c88 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$h$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$h$a.smali
@@ -58,7 +58,7 @@
 
     invoke-static {v0, v1, v2}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Ljava/lang/Integer;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$h.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$h.smali
index 6802fca336..01c0c0df76 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$h.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$h.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/socket/a;->ei()V
+    value = Lcom/discord/rtcconnection/socket/a;->el()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$i.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$i.smali
index 6d3eabe4a2..8e79b257dc 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$i.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$i.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/socket/a;->ei()V
+    value = Lcom/discord/rtcconnection/socket/a;->el()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final zG:Lcom/discord/rtcconnection/socket/a$i;
+.field public static final zP:Lcom/discord/rtcconnection/socket/a$i;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/socket/a$i;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/socket/a$i;->zG:Lcom/discord/rtcconnection/socket/a$i;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$i;->zP:Lcom/discord/rtcconnection/socket/a$i;
 
     return-void
 .end method
@@ -65,9 +65,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->ec()V
+    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->ef()V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$j$a.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$j$a.smali
index 5d1a1f3aec..15d3a76fd5 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$j$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$j$a.smali
@@ -54,7 +54,7 @@
 
     invoke-static {v0}, Lcom/discord/rtcconnection/socket/a;->k(Lcom/discord/rtcconnection/socket/a;)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$j.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$j.smali
index 9168cb0edd..5d9146dcfd 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$j.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$j.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/socket/a;->em()Ljava/util/TimerTask;
+    value = Lcom/discord/rtcconnection/socket/a;->ep()Ljava/util/TimerTask;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$k.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$k.smali
index 24dac86d7c..e67bfd0ae1 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$k.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$k.smali
@@ -71,7 +71,7 @@
 
     invoke-interface {p1, v0, v1, v2}, Lcom/discord/rtcconnection/socket/a$c;->a(ZLjava/lang/Integer;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$l.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$l.smali
index 6d97515be8..a0d2e8287b 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$l.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$l.smali
@@ -72,7 +72,7 @@
 
     invoke-static {v0, v1, v2, v3}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;ZLjava/lang/Integer;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$m.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$m.smali
index a87ef583b5..81e1aefb0d 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$m.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$m.smali
@@ -59,7 +59,7 @@
 
     invoke-interface {p1, v0, v1}, Lcom/discord/rtcconnection/socket/a$c;->l(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$n.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$n.smali
index b73f2b60f4..a89b240012 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$n.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$n.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final zH:Lcom/discord/rtcconnection/socket/a$n;
+.field public static final zQ:Lcom/discord/rtcconnection/socket/a$n;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/socket/a$n;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/socket/a$n;->zH:Lcom/discord/rtcconnection/socket/a$n;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$n;->zQ:Lcom/discord/rtcconnection/socket/a$n;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-interface {p1, v0, v1}, Lokhttp3/WebSocket;->f(ILjava/lang/String;)Z
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$o.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$o.smali
index b95739d766..65125eccf2 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$o.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$o.smali
@@ -62,7 +62,7 @@
 
     invoke-static {v0, v2, v1, v3}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;ZLjava/lang/Integer;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$p.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$p.smali
index a46d0cc97a..c7b81f6e48 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$p.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$p.smali
@@ -75,7 +75,7 @@
 
     invoke-interface {p1, v0, v1, v2}, Lcom/discord/rtcconnection/socket/a$c;->c(IILjava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$q.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$q.smali
index 7c51228d4c..2ffaba0b31 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$q.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$q.smali
@@ -91,10 +91,10 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/socket/a$c;->ag(Ljava/lang/String;)V
+    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/socket/a$c;->ac(Ljava/lang/String;)V
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$r.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$r.smali
index ff2dca93e8..2d45e374a2 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$r.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$r.smali
@@ -63,10 +63,10 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/socket/a$c;->ag(Ljava/lang/String;)V
+    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/socket/a$c;->ac(Ljava/lang/String;)V
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$s.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$s.smali
index 6e35a6cebe..639c8046fe 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$s.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$s.smali
@@ -28,15 +28,19 @@
 
 
 # instance fields
+.field final synthetic $isSpeaking:Z
+
 .field final synthetic $speaking:Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;)V
+.method constructor <init>(Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;Z)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/rtcconnection/socket/a$s;->$speaking:Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
 
+    iput-boolean p2, p0, Lcom/discord/rtcconnection/socket/a$s;->$isSpeaking:Z
+
     const/4 p1, 0x1
 
     invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
@@ -71,19 +75,11 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a$s;->$speaking:Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
-
-    invoke-virtual {v3}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->getSpeaking()Ljava/lang/Boolean;
-
-    move-result-object v3
-
-    invoke-virtual {v3}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v3
+    iget-boolean v3, p0, Lcom/discord/rtcconnection/socket/a$s;->$isSpeaking:Z
 
     invoke-interface {p1, v0, v1, v2, v3}, Lcom/discord/rtcconnection/socket/a$c;->onSpeaking(JIZ)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$t.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$t.smali
index 047862685b..3bbccef939 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$t.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$t.smali
@@ -79,7 +79,7 @@
 
     invoke-interface {p1, v0, v1, v2, v3}, Lcom/discord/rtcconnection/socket/a$c;->a(JII)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$u.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$u.smali
index 22de8430a6..9b0b46666d 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$u.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$u.smali
@@ -89,7 +89,7 @@
     invoke-static {v0, v1, v2}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Ljava/lang/Integer;Ljava/lang/String;)V
 
     :cond_0
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$v$1.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$v$1.smali
index 90c542727e..202246596d 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$v$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$v$1.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final zI:Lcom/discord/rtcconnection/socket/a$v$1;
+.field public static final zR:Lcom/discord/rtcconnection/socket/a$v$1;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/socket/a$v$1;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/socket/a$v$1;->zI:Lcom/discord/rtcconnection/socket/a$v$1;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$v$1;->zR:Lcom/discord/rtcconnection/socket/a$v$1;
 
     return-void
 .end method
@@ -77,7 +77,7 @@
 
     invoke-interface {p1, v1, v0, v2}, Lcom/discord/rtcconnection/socket/a$c;->a(ZLjava/lang/Integer;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$v.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$v.smali
index 0b2903cbaa..ac978c7ebd 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$v.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$v.smali
@@ -84,7 +84,7 @@
 
     iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$v;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    sget-object v1, Lcom/discord/rtcconnection/socket/a$v$1;->zI:Lcom/discord/rtcconnection/socket/a$v$1;
+    sget-object v1, Lcom/discord/rtcconnection/socket/a$v$1;->zR:Lcom/discord/rtcconnection/socket/a$v$1;
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -119,7 +119,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$w.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$w.smali
index c4251a8915..19f2cae5b0 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$w.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$w.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field final synthetic $text:Ljava/lang/String;
+.field final synthetic $message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
 
 .field final synthetic $webSocket:Lokhttp3/WebSocket;
 
@@ -35,14 +35,14 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/rtcconnection/socket/a;Lokhttp3/WebSocket;Ljava/lang/String;)V
+.method constructor <init>(Lcom/discord/rtcconnection/socket/a;Lokhttp3/WebSocket;Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
 
     iput-object p2, p0, Lcom/discord/rtcconnection/socket/a$w;->$webSocket:Lokhttp3/WebSocket;
 
-    iput-object p3, p0, Lcom/discord/rtcconnection/socket/a$w;->$text:Ljava/lang/String;
+    iput-object p3, p0, Lcom/discord/rtcconnection/socket/a$w;->$message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
 
     const/4 p1, 0x0
 
@@ -54,7 +54,7 @@
 
 # virtual methods
 .method public final synthetic invoke()Ljava/lang/Object;
-    .locals 8
+    .locals 7
 
     iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->$webSocket:Lokhttp3/WebSocket;
 
@@ -72,151 +72,143 @@
 
     if-nez v0, :cond_9
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
-
-    invoke-static {v0}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$w;->$text:Ljava/lang/String;
-
-    const-class v2, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
-
-    invoke-virtual {v0, v1, v2}, Lcom/google/gson/Gson;->b(Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
-
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getOpcode()I
-
-    move-result v1
-
-    const/4 v2, 0x2
-
-    if-eq v1, v2, :cond_8
-
-    const/4 v2, 0x3
-
-    if-eq v1, v2, :cond_7
-
-    const/4 v2, 0x4
-
-    if-eq v1, v2, :cond_6
-
-    const/4 v2, 0x5
-
-    if-eq v1, v2, :cond_5
-
-    const/4 v2, 0x6
-
-    if-eq v1, v2, :cond_4
-
-    const/16 v2, 0x8
-
-    if-eq v1, v2, :cond_3
-
-    const/16 v2, 0x9
-
-    if-eq v1, v2, :cond_2
-
-    const/16 v2, 0xc
-
-    if-eq v1, v2, :cond_1
-
-    const/16 v2, 0xe
-
-    if-eq v1, v2, :cond_0
-
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
-
-    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/discord/utilities/logging/Logger;
-
-    move-result-object v2
-
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
-
-    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->g(Lcom/discord/rtcconnection/socket/a;)Ljava/lang/String;
-
-    move-result-object v3
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    const-string v4, "unknown opcode: "
-
-    invoke-direct {v1, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->$message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
 
     invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getOpcode()I
 
     move-result v0
 
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    const/4 v1, 0x2
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    if-eq v0, v1, :cond_8
 
-    move-result-object v4
+    const/4 v1, 0x3
 
-    const/4 v5, 0x0
+    if-eq v0, v1, :cond_7
 
-    const/4 v6, 0x4
+    const/4 v1, 0x4
 
-    const/4 v7, 0x0
+    if-eq v0, v1, :cond_6
 
-    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
+    const/4 v1, 0x5
+
+    if-eq v0, v1, :cond_5
+
+    const/4 v1, 0x6
+
+    if-eq v0, v1, :cond_4
+
+    const/16 v1, 0x8
+
+    if-eq v0, v1, :cond_3
+
+    const/16 v1, 0x9
+
+    if-eq v0, v1, :cond_2
+
+    const/16 v1, 0xc
+
+    if-eq v0, v1, :cond_1
+
+    const/16 v1, 0xe
+
+    if-eq v0, v1, :cond_0
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+
+    invoke-static {v0}, Lcom/discord/rtcconnection/socket/a;->f(Lcom/discord/rtcconnection/socket/a;)Lcom/discord/utilities/logging/Logger;
+
+    move-result-object v1
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+
+    invoke-static {v0}, Lcom/discord/rtcconnection/socket/a;->g(Lcom/discord/rtcconnection/socket/a;)Ljava/lang/String;
+
+    move-result-object v2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v3, "unknown opcode: "
+
+    invoke-direct {v0, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a$w;->$message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
+
+    invoke-virtual {v3}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getOpcode()I
+
+    move-result v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x4
+
+    const/4 v6, 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
 
     goto/16 :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+    invoke-static {v0}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a$w;->$message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
+
+    invoke-virtual {v2}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
 
     move-result-object v2
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
-
-    move-result-object v0
-
     const-class v3, Lcom/discord/rtcconnection/socket/io/Payloads$SessionUpdate;
 
-    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
+    invoke-virtual {v1, v2, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
     const-string v2, "Gson.fromJson(message.da\u2026essionUpdate::class.java)"
 
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Lcom/discord/rtcconnection/socket/io/Payloads$SessionUpdate;
+    check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$SessionUpdate;
 
-    invoke-static {v1, v0}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$SessionUpdate;)V
+    invoke-static {v0, v1}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$SessionUpdate;)V
 
     goto/16 :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+    invoke-static {v0}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a$w;->$message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
+
+    invoke-virtual {v2}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
 
     move-result-object v2
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
-
-    move-result-object v0
-
     const-class v3, Lcom/discord/rtcconnection/socket/io/Payloads$Video;
 
-    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
+    invoke-virtual {v1, v2, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
     const-string v2, "Gson.fromJson(message.da\u2026yloads.Video::class.java)"
 
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Lcom/discord/rtcconnection/socket/io/Payloads$Video;
+    check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$Video;
 
-    invoke-static {v1, v0}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Video;)V
+    invoke-static {v0, v1}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Video;)V
 
     goto/16 :goto_0
 
@@ -228,114 +220,138 @@
     goto/16 :goto_0
 
     :cond_3
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+    invoke-static {v0}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a$w;->$message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
+
+    invoke-virtual {v2}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
 
     move-result-object v2
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
-
-    move-result-object v0
-
     const-class v3, Lcom/discord/rtcconnection/socket/io/Payloads$Hello;
 
-    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
+    invoke-virtual {v1, v2, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
     const-string v2, "Gson.fromJson(message.da\u2026yloads.Hello::class.java)"
 
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Lcom/discord/rtcconnection/socket/io/Payloads$Hello;
+    check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$Hello;
 
-    invoke-static {v1, v0}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Hello;)V
+    invoke-static {v0, v1}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Hello;)V
 
     goto/16 :goto_0
 
     :cond_4
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+    invoke-static {v0}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a$w;->$message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
+
+    invoke-virtual {v2}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
 
     move-result-object v2
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
-
-    move-result-object v0
-
     sget-object v3, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
 
-    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
+    invoke-virtual {v1, v2, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
     const-string v2, "Gson.fromJson(message.data, Long::class.java)"
 
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Ljava/lang/Number;
+    check-cast v1, Ljava/lang/Number;
 
-    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
+    invoke-virtual {v1}, Ljava/lang/Number;->longValue()J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    invoke-static {v1, v2, v3}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;J)V
+    invoke-static {v0, v1, v2}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;J)V
 
     goto :goto_0
 
     :cond_5
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
-
-    move-result-object v2
-
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
+    invoke-static {v0}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
 
     move-result-object v0
 
-    const-class v3, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
+    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$w;->$message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
 
-    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
+
+    move-result-object v1
+
+    const-class v2, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
+
+    invoke-virtual {v0, v1, v2}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
 
     move-result-object v0
 
-    const-string v2, "Gson.fromJson(message.da\u2026ads.Speaking::class.java)"
-
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     check-cast v0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
 
+    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "got speaking payload: "
+
+    invoke-virtual {v2, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "findme"
+
+    invoke-static {v2, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+
+    const-string v2, "inc"
+
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-static {v1, v0}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;)V
 
     goto :goto_0
 
     :cond_6
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+    invoke-static {v0}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a$w;->$message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
+
+    invoke-virtual {v2}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
 
     move-result-object v2
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
-
-    move-result-object v0
-
     const-class v3, Lcom/discord/rtcconnection/socket/io/Payloads$Description;
 
-    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
+    invoke-virtual {v1, v2, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
     const-string v2, "Gson.fromJson(message.da\u2026.Description::class.java)"
 
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Lcom/discord/rtcconnection/socket/io/Payloads$Description;
+    check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$Description;
 
-    invoke-static {v1, v0}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Description;)V
+    invoke-static {v0, v1}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Description;)V
 
     goto :goto_0
 
@@ -347,33 +363,35 @@
     goto :goto_0
 
     :cond_8
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    invoke-static {v1}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+    invoke-static {v0}, Lcom/discord/rtcconnection/socket/a;->h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a$w;->$message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
+
+    invoke-virtual {v2}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
 
     move-result-object v2
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getData()Lcom/google/gson/JsonElement;
-
-    move-result-object v0
-
     const-class v3, Lcom/discord/rtcconnection/socket/io/Payloads$Ready;
 
-    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
+    invoke-virtual {v1, v2, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
     const-string v2, "Gson.fromJson(message.da\u2026yloads.Ready::class.java)"
 
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Lcom/discord/rtcconnection/socket/io/Payloads$Ready;
+    check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$Ready;
 
-    invoke-static {v1, v0}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Ready;)V
+    invoke-static {v0, v1}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Ready;)V
 
     :cond_9
     :goto_0
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$x$1.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$x$1.smali
index cdc6e3010e..65e2d6b0cd 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$x$1.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$x$1.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final zJ:Lcom/discord/rtcconnection/socket/a$x$1;
+.field public static final zS:Lcom/discord/rtcconnection/socket/a$x$1;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/socket/a$x$1;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/socket/a$x$1;->zJ:Lcom/discord/rtcconnection/socket/a$x$1;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$x$1;->zS:Lcom/discord/rtcconnection/socket/a$x$1;
 
     return-void
 .end method
@@ -65,9 +65,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->ed()V
+    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->eg()V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$x$2.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$x$2.smali
index 432f6af3c5..2ab8f2fa21 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$x$2.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$x$2.smali
@@ -63,7 +63,7 @@
 
     invoke-interface {p1, v0, v1}, Lcom/discord/rtcconnection/socket/a$c;->l(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$x.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$x.smali
index 034add97a1..5721cd9683 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$x.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$x.smali
@@ -74,13 +74,13 @@
 
     move-result v0
 
-    sget v1, Lcom/discord/rtcconnection/socket/a$b;->zw:I
+    sget v1, Lcom/discord/rtcconnection/socket/a$b;->zF:I
 
     if-ne v0, v1, :cond_0
 
     iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$x;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    sget-object v1, Lcom/discord/rtcconnection/socket/a$x$1;->zJ:Lcom/discord/rtcconnection/socket/a$x$1;
+    sget-object v1, Lcom/discord/rtcconnection/socket/a$x$1;->zS:Lcom/discord/rtcconnection/socket/a$x$1;
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -95,7 +95,7 @@
 
     move-result v0
 
-    sget v1, Lcom/discord/rtcconnection/socket/a$b;->zA:I
+    sget v1, Lcom/discord/rtcconnection/socket/a$b;->zJ:I
 
     if-ne v0, v1, :cond_1
 
@@ -109,7 +109,7 @@
     :goto_0
     iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$x;->this$0:Lcom/discord/rtcconnection/socket/a;
 
-    sget v1, Lcom/discord/rtcconnection/socket/a$b;->zz:I
+    sget v1, Lcom/discord/rtcconnection/socket/a$b;->zI:I
 
     invoke-static {v0, v1}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;I)V
 
@@ -185,7 +185,7 @@
 
     :cond_3
     :goto_2
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$y.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$y.smali
index 1c2a374956..fd7123294f 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$y.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$y.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final zK:Lcom/discord/rtcconnection/socket/a$y;
+.field public static final zT:Lcom/discord/rtcconnection/socket/a$y;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/socket/a$y;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/socket/a$y;->zK:Lcom/discord/rtcconnection/socket/a$y;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$y;->zT:Lcom/discord/rtcconnection/socket/a$y;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-interface {p1, v0, v1}, Lokhttp3/WebSocket;->f(ILjava/lang/String;)Z
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a$z.smali b/com.discord/smali/com/discord/rtcconnection/socket/a$z.smali
index d15cc4a85e..f6d1636e70 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$z.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$z.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final zL:Lcom/discord/rtcconnection/socket/a$z;
+.field public static final zU:Lcom/discord/rtcconnection/socket/a$z;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/rtcconnection/socket/a$z;-><init>()V
 
-    sput-object v0, Lcom/discord/rtcconnection/socket/a$z;->zL:Lcom/discord/rtcconnection/socket/a$z;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$z;->zU:Lcom/discord/rtcconnection/socket/a$z;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/a.smali b/com.discord/smali/com/discord/rtcconnection/socket/a.smali
index 66040534cb..6dd41950d9 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a.smali
@@ -14,9 +14,9 @@
 
 
 # static fields
-.field private static xO:I
+.field private static xZ:I
 
-.field public static final zu:Lcom/discord/rtcconnection/socket/a$a;
+.field public static final zD:Lcom/discord/rtcconnection/socket/a$a;
 
 
 # instance fields
@@ -48,29 +48,29 @@
 
 .field public final token:Ljava/lang/String;
 
-.field public final xB:Ljava/lang/String;
+.field public final xL:Ljava/lang/String;
 
-.field private final ze:Ljava/util/concurrent/ExecutorService;
+.field private zA:Ljava/lang/Long;
 
-.field private final zk:Lcom/google/gson/Gson;
+.field private zB:Ljava/util/TimerTask;
 
-.field private zl:Lokhttp3/WebSocket;
+.field public zC:Z
 
-.field private zm:Z
+.field private final zm:Ljava/util/concurrent/ExecutorService;
 
-.field public zn:I
+.field private final zt:Lcom/google/gson/Gson;
 
-.field private zo:Ljava/lang/Long;
+.field private zu:Lokhttp3/WebSocket;
 
-.field private zp:Ljava/lang/Long;
+.field private zv:Z
 
-.field private zq:Ljava/util/TimerTask;
+.field public zw:I
 
-.field private zr:Ljava/lang/Long;
+.field private zx:Ljava/lang/Long;
 
-.field private zs:Ljava/util/TimerTask;
+.field private zy:Ljava/lang/Long;
 
-.field public zt:Z
+.field private zz:Ljava/util/TimerTask;
 
 
 # direct methods
@@ -83,7 +83,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/rtcconnection/socket/a$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/rtcconnection/socket/a;->zu:Lcom/discord/rtcconnection/socket/a$a;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a;->zD:Lcom/discord/rtcconnection/socket/a$a;
 
     return-void
 .end method
@@ -117,7 +117,7 @@
 
     iput-object p4, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iput-object p5, p0, Lcom/discord/rtcconnection/socket/a;->ze:Ljava/util/concurrent/ExecutorService;
+    iput-object p5, p0, Lcom/discord/rtcconnection/socket/a;->zm:Ljava/util/concurrent/ExecutorService;
 
     new-instance p1, Ljava/lang/StringBuilder;
 
@@ -135,11 +135,11 @@
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget p2, Lcom/discord/rtcconnection/socket/a;->xO:I
+    sget p2, Lcom/discord/rtcconnection/socket/a;->xZ:I
 
     add-int/lit8 p2, p2, 0x1
 
-    sput p2, Lcom/discord/rtcconnection/socket/a;->xO:I
+    sput p2, Lcom/discord/rtcconnection/socket/a;->xZ:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -147,17 +147,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     new-instance p1, Lcom/google/gson/f;
 
     invoke-direct {p1}, Lcom/google/gson/f;-><init>()V
 
-    invoke-virtual {p1}, Lcom/google/gson/f;->BJ()Lcom/google/gson/Gson;
+    invoke-virtual {p1}, Lcom/google/gson/f;->By()Lcom/google/gson/Gson;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->zk:Lcom/google/gson/Gson;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->zt:Lcom/google/gson/Gson;
 
     new-instance p1, Ljava/util/Timer;
 
@@ -187,15 +187,15 @@
 
     iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->backoff:Lcom/discord/utilities/networking/Backoff;
 
-    sget p1, Lcom/discord/rtcconnection/socket/a$b;->zv:I
+    sget p1, Lcom/discord/rtcconnection/socket/a$b;->zE:I
 
-    iput p1, p0, Lcom/discord/rtcconnection/socket/a;->zn:I
+    iput p1, p0, Lcom/discord/rtcconnection/socket/a;->zw:I
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->em()Ljava/util/TimerTask;
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ep()Ljava/util/TimerTask;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->zq:Ljava/util/TimerTask;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->zz:Ljava/util/TimerTask;
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -231,7 +231,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->ze:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zm:Ljava/util/concurrent/ExecutorService;
 
     if-eqz p1, :cond_0
 
@@ -264,7 +264,7 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/socket/a;I)V
     .locals 0
 
-    iput p1, p0, Lcom/discord/rtcconnection/socket/a;->zn:I
+    iput p1, p0, Lcom/discord/rtcconnection/socket/a;->zw:I
 
     return-void
 .end method
@@ -272,13 +272,13 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/socket/a;J)V
     .locals 8
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zt:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zC:Z
 
     if-eqz v0, :cond_0
 
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -301,7 +301,7 @@
 
     iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     new-instance v4, Ljava/lang/StringBuilder;
 
@@ -331,7 +331,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zr:Ljava/lang/Long;
+    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zA:Ljava/lang/Long;
 
     const/4 v0, 0x1
 
@@ -361,7 +361,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/discord/rtcconnection/socket/a;->zm:Z
+    iput-boolean p1, p0, Lcom/discord/rtcconnection/socket/a;->zv:Z
 
     return-void
 .end method
@@ -369,13 +369,13 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Hello;)V
     .locals 7
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zt:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zC:Z
 
     if-eqz v0, :cond_0
 
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -390,7 +390,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zs:Ljava/util/TimerTask;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zB:Ljava/util/TimerTask;
 
     if-eqz v0, :cond_1
 
@@ -399,7 +399,7 @@
     :cond_1
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -425,7 +425,7 @@
 
     long-to-double v0, v0
 
-    const-wide v2, 0x3fb999999999999aL    # 0.1
+    const-wide/high16 v2, 0x3ff0000000000000L    # 1.0
 
     invoke-static {v0, v1}, Ljava/lang/Double;->isNaN(D)Z
 
@@ -437,9 +437,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->zp:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->zy:Ljava/lang/Long;
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/socket/a;->zq:Ljava/util/TimerTask;
+    iget-object p1, p0, Lcom/discord/rtcconnection/socket/a;->zz:Ljava/util/TimerTask;
 
     invoke-virtual {p1}, Ljava/util/TimerTask;->cancel()Z
 
@@ -447,7 +447,7 @@
 
     iput-boolean p1, p0, Lcom/discord/rtcconnection/socket/a;->heartbeatAck:Z
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ek()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->en()V
 
     return-void
 .end method
@@ -463,7 +463,7 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->zo:Ljava/lang/Long;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->zx:Ljava/lang/Long;
 
     if-eqz v2, :cond_0
 
@@ -481,7 +481,7 @@
 
     iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     new-instance v4, Ljava/lang/StringBuilder;
 
@@ -533,29 +533,53 @@
 .end method
 
 .method public static final synthetic a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;)V
-    .locals 1
+    .locals 2
 
     invoke-virtual {p1}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->getUserId()Ljava/lang/Long;
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_2
 
-    invoke-virtual {p1}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->getSpeaking()Ljava/lang/Boolean;
+    invoke-virtual {p1}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->getSpeaking()Ljava/lang/Integer;
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_2
 
+    invoke-virtual {p1}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->getSpeaking()Ljava/lang/Integer;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    if-ne v0, v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    const/4 v1, 0x0
+
+    :goto_1
     new-instance v0, Lcom/discord/rtcconnection/socket/a$s;
 
-    invoke-direct {v0, p1}, Lcom/discord/rtcconnection/socket/a$s;-><init>(Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;)V
+    invoke-direct {v0, p1, v1}, Lcom/discord/rtcconnection/socket/a$s;-><init>(Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;Z)V
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0, v0}, Lcom/discord/rtcconnection/socket/a;->b(Lkotlin/jvm/functions/Function1;)V
 
-    :cond_0
+    :cond_2
     return-void
 .end method
 
@@ -583,9 +607,9 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/socket/a;Ljava/lang/Integer;Ljava/lang/String;)V
     .locals 8
 
-    sget v0, Lcom/discord/rtcconnection/socket/a$b;->zv:I
+    sget v0, Lcom/discord/rtcconnection/socket/a$b;->zE:I
 
-    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->zn:I
+    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->zw:I
 
     const/4 v0, 0x1
 
@@ -658,7 +682,7 @@
 
     iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v5, 0x0
 
@@ -725,7 +749,7 @@
 
     iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     new-instance p0, Ljava/lang/StringBuilder;
 
@@ -790,7 +814,7 @@
     return-void
 .end method
 
-.method private final ah(Ljava/lang/String;)V
+.method private final ad(Ljava/lang/String;)V
     .locals 7
 
     iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->backoff:Lcom/discord/utilities/networking/Backoff;
@@ -801,13 +825,13 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zl:Lokhttp3/WebSocket;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zu:Lokhttp3/WebSocket;
 
     if-nez v0, :cond_0
 
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -850,7 +874,7 @@
 .method public static final synthetic b(Lcom/discord/rtcconnection/socket/a;)Lokhttp3/WebSocket;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->zl:Lokhttp3/WebSocket;
+    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->zu:Lokhttp3/WebSocket;
 
     return-object p0
 .end method
@@ -902,13 +926,13 @@
 
     move-object v0, p0
 
-    iget-boolean v1, v0, Lcom/discord/rtcconnection/socket/a;->zt:Z
+    iget-boolean v1, v0, Lcom/discord/rtcconnection/socket/a;->zC:Z
 
     if-eqz v1, :cond_0
 
     iget-object v2, v0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v3, v0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v3, v0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v5, 0x0
 
@@ -925,7 +949,7 @@
     :cond_0
     iget-object v8, v0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v9, v0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v9, v0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -965,17 +989,17 @@
 
     invoke-static/range {v8 .. v13}, 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 v1, Lcom/discord/rtcconnection/socket/a$y;->zK:Lcom/discord/rtcconnection/socket/a$y;
+    sget-object v1, Lcom/discord/rtcconnection/socket/a$y;->zT:Lcom/discord/rtcconnection/socket/a$y;
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {p0, v1}, Lcom/discord/rtcconnection/socket/a;->g(Lkotlin/jvm/functions/Function1;)V
 
-    sget v1, Lcom/discord/rtcconnection/socket/a$b;->zA:I
+    sget v1, Lcom/discord/rtcconnection/socket/a$b;->zJ:I
 
-    iput v1, v0, Lcom/discord/rtcconnection/socket/a;->zn:I
+    iput v1, v0, Lcom/discord/rtcconnection/socket/a;->zw:I
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ei()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->el()V
 
     return-void
 .end method
@@ -983,7 +1007,7 @@
 .method public static final synthetic c(Lcom/discord/rtcconnection/socket/a;)I
     .locals 0
 
-    iget p0, p0, Lcom/discord/rtcconnection/socket/a;->zn:I
+    iget p0, p0, Lcom/discord/rtcconnection/socket/a;->zw:I
 
     return p0
 .end method
@@ -999,13 +1023,13 @@
 
     move-object/from16 v3, p3
 
-    iget-boolean v4, v0, Lcom/discord/rtcconnection/socket/a;->zt:Z
+    iget-boolean v4, v0, Lcom/discord/rtcconnection/socket/a;->zC:Z
 
     if-eqz v4, :cond_0
 
     iget-object v5, v0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v6, v0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v6, v0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v8, 0x0
 
@@ -1022,7 +1046,7 @@
     :cond_0
     iget-object v11, v0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v12, v0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v12, v0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     new-instance v4, Ljava/lang/StringBuilder;
 
@@ -1062,7 +1086,7 @@
 
     invoke-virtual {v0, v4}, Lcom/discord/rtcconnection/socket/a;->g(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/rtcconnection/socket/a;->ej()V
+    invoke-direct/range {p0 .. p0}, Lcom/discord/rtcconnection/socket/a;->em()V
 
     new-instance v4, Lcom/discord/rtcconnection/socket/a$k;
 
@@ -1076,7 +1100,7 @@
 .end method
 
 .method public static final synthetic d(Lcom/discord/rtcconnection/socket/a;)V
-    .locals 10
+    .locals 12
 
     iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->sessionId:Ljava/lang/String;
 
@@ -1084,74 +1108,89 @@
 
     iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->token:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->zr:Ljava/lang/Long;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->zA:Ljava/lang/Long;
 
-    if-eqz v0, :cond_1
+    const/4 v4, 0x0
 
-    if-eqz v1, :cond_1
-
-    iget-boolean v4, p0, Lcom/discord/rtcconnection/socket/a;->zm:Z
-
-    if-eqz v4, :cond_1
-
-    if-eqz v3, :cond_0
+    if-eqz v3, :cond_1
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
-    move-result-wide v4
+    move-result-wide v5
 
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v6
+    move-result-wide v7
 
-    sub-long/2addr v4, v6
+    sub-long/2addr v5, v7
 
-    const-wide/32 v6, 0xea60
+    const-wide/32 v7, 0xea60
 
-    cmp-long v3, v4, v6
+    cmp-long v3, v5, v7
 
-    if-gtz v3, :cond_1
+    if-gtz v3, :cond_0
+
+    goto :goto_0
 
     :cond_0
-    iget-object v4, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
+    const/4 v3, 0x0
 
-    iget-object v5, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    const/4 v3, 0x1
+
+    :goto_1
+    if-eqz v0, :cond_2
+
+    if-eqz v1, :cond_2
+
+    iget-boolean v5, p0, Lcom/discord/rtcconnection/socket/a;->zv:Z
+
+    if-eqz v5, :cond_2
+
+    if-eqz v3, :cond_2
+
+    iget-object v6, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
+
+    iget-object v7, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
-    const-string v6, "[RESUME] resuming session. serverId="
+    const-string v4, "[RESUME] resuming session. serverId="
 
-    invoke-direct {v3, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
     invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v6, " sessionId="
+    const-string v4, " sessionId="
 
-    invoke-virtual {v3, v6}, 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 {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 v6
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x4
+    move-result-object v8
 
     const/4 v9, 0x0
 
-    invoke-static/range {v4 .. v9}, 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
+    const/4 v10, 0x4
 
-    sget-object v3, Lcom/discord/rtcconnection/socket/a$z;->zL:Lcom/discord/rtcconnection/socket/a$z;
+    const/4 v11, 0x0
+
+    invoke-static/range {v6 .. v11}, 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 v3, Lcom/discord/rtcconnection/socket/a$z;->zU:Lcom/discord/rtcconnection/socket/a$z;
 
     check-cast v3, Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0, v3}, Lcom/discord/rtcconnection/socket/a;->b(Lkotlin/jvm/functions/Function1;)V
 
-    sget v3, Lcom/discord/rtcconnection/socket/a$b;->zy:I
+    sget v3, Lcom/discord/rtcconnection/socket/a$b;->zH:I
 
-    iput v3, p0, Lcom/discord/rtcconnection/socket/a;->zn:I
+    iput v3, p0, Lcom/discord/rtcconnection/socket/a;->zw:I
 
     const/4 v3, 0x7
 
@@ -1163,8 +1202,26 @@
 
     return-void
 
-    :cond_1
-    const/4 v0, 0x0
+    :cond_2
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "Cannot resume connection. resumable: "
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/socket/a;->zv:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, " -- isHeartbeatRecentEnough: "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
 
     const/16 v1, 0x12c1
 
@@ -1172,9 +1229,7 @@
 
     move-result-object v1
 
-    const-string v2, "Cannot resume connection."
-
-    invoke-direct {p0, v0, v1, v2}, Lcom/discord/rtcconnection/socket/a;->c(ZLjava/lang/Integer;Ljava/lang/String;)V
+    invoke-direct {p0, v4, v1, v0}, Lcom/discord/rtcconnection/socket/a;->c(ZLjava/lang/Integer;Ljava/lang/String;)V
 
     return-void
 .end method
@@ -1182,21 +1237,21 @@
 .method public static final synthetic e(Lcom/discord/rtcconnection/socket/a;)Ljava/lang/Long;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->zo:Ljava/lang/Long;
+    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->zx:Ljava/lang/Long;
 
     return-object p0
 .end method
 
-.method private final ei()V
+.method private final el()V
     .locals 13
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zt:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zC:Z
 
     if-eqz v0, :cond_0
 
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -1213,7 +1268,7 @@
     :cond_0
     iget-object v7, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v8, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v8, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -1237,13 +1292,13 @@
 
     invoke-static/range {v7 .. v12}, 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
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zl:Lokhttp3/WebSocket;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zu:Lokhttp3/WebSocket;
 
     if-eqz v0, :cond_1
 
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -1257,7 +1312,7 @@
 
     invoke-static/range {v1 .. v7}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
-    sget-object v0, Lcom/discord/rtcconnection/socket/a$g;->zF:Lcom/discord/rtcconnection/socket/a$g;
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$g;->zO:Lcom/discord/rtcconnection/socket/a$g;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1274,9 +1329,9 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zo:Ljava/lang/Long;
+    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zx:Ljava/lang/Long;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zs:Ljava/util/TimerTask;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zB:Ljava/util/TimerTask;
 
     if-eqz v0, :cond_2
 
@@ -1289,11 +1344,11 @@
 
     check-cast v0, Ljava/util/TimerTask;
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zs:Ljava/util/TimerTask;
+    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zB:Ljava/util/TimerTask;
 
     iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->timer:Ljava/util/Timer;
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->zs:Ljava/util/TimerTask;
+    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->zB:Ljava/util/TimerTask;
 
     const-wide/16 v2, 0x4e20
 
@@ -1326,7 +1381,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v2, "?v=3"
+    const-string v2, "?v=4"
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1336,7 +1391,7 @@
 
     iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1356,7 +1411,7 @@
 
     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-virtual {v0}, Lokhttp3/t$a;->GS()Lokhttp3/t;
+    invoke-virtual {v0}, Lokhttp3/t$a;->GG()Lokhttp3/t;
 
     move-result-object v0
 
@@ -1364,11 +1419,11 @@
 
     invoke-direct {v2}, Lokhttp3/w$a;-><init>()V
 
-    invoke-virtual {v2, v1}, Lokhttp3/w$a;->eq(Ljava/lang/String;)Lokhttp3/w$a;
+    invoke-virtual {v2, v1}, Lokhttp3/w$a;->ek(Ljava/lang/String;)Lokhttp3/w$a;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {v1}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object v1
 
@@ -1380,9 +1435,9 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zl:Lokhttp3/WebSocket;
+    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zu:Lokhttp3/WebSocket;
 
-    sget-object v0, Lcom/discord/rtcconnection/socket/a$i;->zG:Lcom/discord/rtcconnection/socket/a$i;
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$i;->zP:Lcom/discord/rtcconnection/socket/a$i;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1391,7 +1446,7 @@
     return-void
 .end method
 
-.method private final ej()V
+.method private final em()V
     .locals 1
 
     const/4 v0, 0x0
@@ -1402,25 +1457,25 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zm:Z
+    iput-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zv:Z
 
-    sget v0, Lcom/discord/rtcconnection/socket/a$b;->zv:I
+    sget v0, Lcom/discord/rtcconnection/socket/a$b;->zE:I
 
-    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->zn:I
+    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->zw:I
 
     return-void
 .end method
 
-.method private final ek()V
-    .locals 9
+.method private final en()V
+    .locals 10
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zt:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zC:Z
 
     if-eqz v0, :cond_0
 
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -1435,39 +1490,92 @@
     return-void
 
     :cond_0
-    iget-boolean v1, p0, Lcom/discord/rtcconnection/socket/a;->heartbeatAck:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->heartbeatAck:Z
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_1
-
-    iput-boolean v2, p0, Lcom/discord/rtcconnection/socket/a;->heartbeatAck:Z
-
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->el()V
-
-    goto :goto_0
-
-    :cond_1
     if-eqz v0, :cond_2
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v4, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
-    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 v5, "handleHeartbeatTimeout called on canceled instance of RtcControlSocket"
+    const-string v4, "had heartbeatAck, sending heartbeat"
 
-    invoke-static/range {v3 .. v8}, 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 {v2 .. v7}, 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
 
-    goto :goto_0
+    iput-boolean v1, p0, Lcom/discord/rtcconnection/socket/a;->heartbeatAck:Z
+
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eo()V
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zy:Ljava/lang/Long;
+
+    if-eqz v0, :cond_1
+
+    check-cast v0, Ljava/lang/Number;
+
+    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
+
+    move-result-wide v0
+
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ep()Ljava/util/TimerTask;
+
+    move-result-object v2
+
+    iput-object v2, p0, Lcom/discord/rtcconnection/socket/a;->zz:Ljava/util/TimerTask;
+
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->timer:Ljava/util/Timer;
+
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->zz:Ljava/util/TimerTask;
+
+    invoke-virtual {v2, v3, v0, v1}, Ljava/util/Timer;->schedule(Ljava/util/TimerTask;J)V
+
+    :cond_1
+    return-void
 
     :cond_2
-    sget-object v0, Lcom/discord/rtcconnection/socket/a$n;->zH:Lcom/discord/rtcconnection/socket/a$n;
+    iget-object v4, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
+
+    iget-object v5, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x4
+
+    const/4 v9, 0x0
+
+    const-string v6, "did not have heartbeat ack, doing a timeout"
+
+    invoke-static/range {v4 .. v9}, 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
+
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zC:Z
+
+    if-eqz v0, :cond_3
+
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
+
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x4
+
+    const/4 v7, 0x0
+
+    const-string v4, "handleHeartbeatTimeout called on canceled instance of RtcControlSocket"
+
+    invoke-static/range {v2 .. v7}, 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_3
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$n;->zQ:Lcom/discord/rtcconnection/socket/a$n;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1475,35 +1583,35 @@
 
     iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->backoff:Lcom/discord/utilities/networking/Backoff;
 
-    new-instance v1, Lcom/discord/rtcconnection/socket/a$o;
+    new-instance v2, Lcom/discord/rtcconnection/socket/a$o;
 
-    invoke-direct {v1, p0}, Lcom/discord/rtcconnection/socket/a$o;-><init>(Lcom/discord/rtcconnection/socket/a;)V
+    invoke-direct {v2, p0}, Lcom/discord/rtcconnection/socket/a$o;-><init>(Lcom/discord/rtcconnection/socket/a;)V
 
-    check-cast v1, Lkotlin/jvm/functions/Function0;
+    check-cast v2, Lkotlin/jvm/functions/Function0;
 
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/networking/Backoff;->fail(Lkotlin/jvm/functions/Function0;)J
+    invoke-virtual {v0, v2}, Lcom/discord/utilities/networking/Backoff;->fail(Lkotlin/jvm/functions/Function0;)J
 
-    move-result-wide v0
+    move-result-wide v2
 
-    const/4 v3, 0x1
+    const/4 v0, 0x1
 
-    new-array v4, v3, [Ljava/lang/Object;
+    new-array v4, v0, [Ljava/lang/Object;
 
-    long-to-double v0, v0
+    long-to-double v2, v2
 
     const-wide v5, 0x408f400000000000L    # 1000.0
 
-    invoke-static {v0, v1}, Ljava/lang/Double;->isNaN(D)Z
+    invoke-static {v2, v3}, Ljava/lang/Double;->isNaN(D)Z
 
-    div-double/2addr v0, v5
+    div-double/2addr v2, v5
 
-    invoke-static {v0, v1}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
+    invoke-static {v2, v3}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
 
-    move-result-object v0
+    move-result-object v2
 
-    aput-object v0, v4, v2
+    aput-object v2, v4, v1
 
-    invoke-static {v4, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+    invoke-static {v4, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1519,7 +1627,7 @@
 
     iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -1545,34 +1653,10 @@
 
     invoke-static/range {v2 .. v7}, 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_0
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zp:Ljava/lang/Long;
-
-    if-eqz v0, :cond_3
-
-    check-cast v0, Ljava/lang/Number;
-
-    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v0
-
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->em()Ljava/util/TimerTask;
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/discord/rtcconnection/socket/a;->zq:Ljava/util/TimerTask;
-
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->timer:Ljava/util/Timer;
-
-    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->zq:Ljava/util/TimerTask;
-
-    invoke-virtual {v2, v3, v0, v1}, Ljava/util/Timer;->schedule(Ljava/util/TimerTask;J)V
-
-    :cond_3
     return-void
 .end method
 
-.method private final el()V
+.method private final eo()V
     .locals 2
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
@@ -1590,7 +1674,7 @@
     return-void
 .end method
 
-.method private final em()Ljava/util/TimerTask;
+.method private final ep()Ljava/util/TimerTask;
     .locals 1
 
     new-instance v0, Lcom/discord/rtcconnection/socket/a$j;
@@ -1613,7 +1697,7 @@
 .method public static final synthetic g(Lcom/discord/rtcconnection/socket/a;)Ljava/lang/String;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     return-object p0
 .end method
@@ -1621,7 +1705,7 @@
 .method public static final synthetic h(Lcom/discord/rtcconnection/socket/a;)Lcom/google/gson/Gson;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->zk:Lcom/google/gson/Gson;
+    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->zt:Lcom/google/gson/Gson;
 
     return-object p0
 .end method
@@ -1629,7 +1713,7 @@
 .method public static final synthetic i(Lcom/discord/rtcconnection/socket/a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->el()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eo()V
 
     return-void
 .end method
@@ -1647,7 +1731,7 @@
 .method public static final synthetic k(Lcom/discord/rtcconnection/socket/a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ek()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->en()V
 
     return-void
 .end method
@@ -1663,7 +1747,7 @@
 
     move-object/from16 v2, p2
 
-    iget-object v3, v0, Lcom/discord/rtcconnection/socket/a;->zl:Lokhttp3/WebSocket;
+    iget-object v3, v0, Lcom/discord/rtcconnection/socket/a;->zu:Lokhttp3/WebSocket;
 
     if-nez v3, :cond_0
 
@@ -1671,7 +1755,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v4, v0, Lcom/discord/rtcconnection/socket/a;->zk:Lcom/google/gson/Gson;
+    iget-object v4, v0, Lcom/discord/rtcconnection/socket/a;->zt:Lcom/google/gson/Gson;
 
     new-instance v5, Lcom/discord/rtcconnection/socket/io/Payloads$Outgoing;
 
@@ -1683,7 +1767,7 @@
 
     iget-object v5, v0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v6, v0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v6, v0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const-string v7, "sending: "
 
@@ -1703,7 +1787,7 @@
 
     invoke-static/range {v5 .. v10}, 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-interface {v3, v4}, Lokhttp3/WebSocket;->et(Ljava/lang/String;)Z
+    invoke-interface {v3, v4}, Lokhttp3/WebSocket;->eo(Ljava/lang/String;)Z
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1712,7 +1796,7 @@
     :catch_0
     iget-object v11, v0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v12, v0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v12, v0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -1750,13 +1834,13 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zt:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zC:Z
 
     if-eqz v0, :cond_0
 
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -1771,13 +1855,13 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zl:Lokhttp3/WebSocket;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zu:Lokhttp3/WebSocket;
 
     if-eqz v0, :cond_1
 
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     invoke-static {p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1797,19 +1881,19 @@
 
     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
 
-    iget-object p3, p0, Lcom/discord/rtcconnection/socket/a;->zq:Ljava/util/TimerTask;
+    iget-object p3, p0, Lcom/discord/rtcconnection/socket/a;->zz:Ljava/util/TimerTask;
 
     invoke-virtual {p3}, Ljava/util/TimerTask;->cancel()Z
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->em()Ljava/util/TimerTask;
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ep()Ljava/util/TimerTask;
 
     move-result-object p3
 
-    iput-object p3, p0, Lcom/discord/rtcconnection/socket/a;->zq:Ljava/util/TimerTask;
+    iput-object p3, p0, Lcom/discord/rtcconnection/socket/a;->zz:Ljava/util/TimerTask;
 
     iget-object p3, p0, Lcom/discord/rtcconnection/socket/a;->timer:Ljava/util/Timer;
 
-    iget-object p4, p0, Lcom/discord/rtcconnection/socket/a;->zq:Ljava/util/TimerTask;
+    iget-object p4, p0, Lcom/discord/rtcconnection/socket/a;->zz:Ljava/util/TimerTask;
 
     invoke-virtual {p3, p4, p1, p2}, Ljava/util/Timer;->schedule(Ljava/util/TimerTask;J)V
 
@@ -1820,14 +1904,14 @@
 
     const-string p1, "Immediate heartbeat when socket was disconnected."
 
-    invoke-direct {p0, p1}, Lcom/discord/rtcconnection/socket/a;->ah(Ljava/lang/String;)V
+    invoke-direct {p0, p1}, Lcom/discord/rtcconnection/socket/a;->ad(Ljava/lang/String;)V
 
     return-void
 
     :cond_2
     iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     invoke-static {p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1853,13 +1937,13 @@
 .method public final close()V
     .locals 13
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zt:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zC:Z
 
     if-eqz v0, :cond_0
 
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -1876,7 +1960,7 @@
     :cond_0
     iget-object v7, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v8, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v8, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v10, 0x0
 
@@ -1888,15 +1972,15 @@
 
     invoke-static/range {v7 .. v12}, 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/rtcconnection/socket/a$e;->zD:Lcom/discord/rtcconnection/socket/a$e;
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$e;->zM:Lcom/discord/rtcconnection/socket/a$e;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {p0, v0}, Lcom/discord/rtcconnection/socket/a;->g(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ej()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->em()V
 
-    sget-object v0, Lcom/discord/rtcconnection/socket/a$f;->zE:Lcom/discord/rtcconnection/socket/a$f;
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$f;->zN:Lcom/discord/rtcconnection/socket/a$f;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1908,7 +1992,7 @@
 .method public final connect()Z
     .locals 9
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zt:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zC:Z
 
     const/4 v1, 0x0
 
@@ -1916,7 +2000,7 @@
 
     iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v5, 0x0
 
@@ -1931,15 +2015,15 @@
     return v1
 
     :cond_0
-    iget v0, p0, Lcom/discord/rtcconnection/socket/a;->zn:I
+    iget v0, p0, Lcom/discord/rtcconnection/socket/a;->zw:I
 
-    sget v2, Lcom/discord/rtcconnection/socket/a$b;->zv:I
+    sget v2, Lcom/discord/rtcconnection/socket/a$b;->zE:I
 
     if-eq v0, v2, :cond_1
 
     iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v4, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v4, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v6, 0x0
 
@@ -1954,11 +2038,11 @@
     return v1
 
     :cond_1
-    sget v0, Lcom/discord/rtcconnection/socket/a$b;->zw:I
+    sget v0, Lcom/discord/rtcconnection/socket/a$b;->zF:I
 
-    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->zn:I
+    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->zw:I
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->ei()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->el()V
 
     const/4 v0, 0x1
 
@@ -1978,13 +2062,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zt:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->zC:Z
 
     if-eqz v0, :cond_0
 
     iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xB:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->xL:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -2003,18 +2087,18 @@
 
     invoke-virtual {v0}, Lcom/discord/utilities/networking/Backoff;->cancel()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zq:Ljava/util/TimerTask;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zz:Ljava/util/TimerTask;
 
     invoke-virtual {v0}, Ljava/util/TimerTask;->cancel()Z
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zs:Ljava/util/TimerTask;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zB:Ljava/util/TimerTask;
 
     if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Ljava/util/TimerTask;->cancel()Z
 
     :cond_1
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zl:Lokhttp3/WebSocket;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zu:Lokhttp3/WebSocket;
 
     if-eqz v0, :cond_2
 
@@ -2025,7 +2109,7 @@
     :cond_2
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->zl:Lokhttp3/WebSocket;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->zu:Lokhttp3/WebSocket;
 
     return-void
 .end method
@@ -2079,7 +2163,7 @@
 .end method
 
 .method public final onMessage(Lokhttp3/WebSocket;Ljava/lang/String;)V
-    .locals 1
+    .locals 2
 
     const-string v0, "webSocket"
 
@@ -2089,15 +2173,25 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->zt:Lcom/google/gson/Gson;
+
+    const-class v1, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
+
+    invoke-virtual {v0, p2, v1}, Lcom/google/gson/Gson;->b(Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
+
     invoke-super {p0, p1, p2}, Lokhttp3/WebSocketListener;->onMessage(Lokhttp3/WebSocket;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/rtcconnection/socket/a$w;
+    new-instance p2, Lcom/discord/rtcconnection/socket/a$w;
 
-    invoke-direct {v0, p0, p1, p2}, Lcom/discord/rtcconnection/socket/a$w;-><init>(Lcom/discord/rtcconnection/socket/a;Lokhttp3/WebSocket;Ljava/lang/String;)V
+    invoke-direct {p2, p0, p1, v0}, Lcom/discord/rtcconnection/socket/a$w;-><init>(Lcom/discord/rtcconnection/socket/a;Lokhttp3/WebSocket;Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;)V
 
-    check-cast v0, Lkotlin/jvm/functions/Function0;
+    check-cast p2, Lkotlin/jvm/functions/Function0;
 
-    invoke-direct {p0, v0}, Lcom/discord/rtcconnection/socket/a;->a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    invoke-direct {p0, p2}, Lcom/discord/rtcconnection/socket/a;->a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
     return-void
 .end method
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 ebf67aedf7..a875b07030 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
@@ -17,7 +17,7 @@
 # instance fields
 .field private final delay:Ljava/lang/Integer;
 
-.field private final speaking:Ljava/lang/Boolean;
+.field private final speaking:Ljava/lang/Integer;
 
 .field private final ssrc:I
 
@@ -29,14 +29,14 @@
 
 
 # direct methods
-.method public constructor <init>(ILjava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Long;)V
+.method public constructor <init>(ILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput p1, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->ssrc:I
 
-    iput-object p2, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
+    iput-object p2, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Integer;
 
     iput-object p3, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->delay:Ljava/lang/Integer;
 
@@ -45,7 +45,7 @@
     return-void
 .end method
 
-.method public synthetic constructor <init>(ILjava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+.method public synthetic constructor <init>(ILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 1
 
     and-int/lit8 p6, p5, 0x2
@@ -71,12 +71,12 @@
     move-object p4, v0
 
     :cond_2
-    invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;-><init>(ILjava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Long;)V
+    invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;-><init>(ILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;)V
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;ILjava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Long;ILjava/lang/Object;)Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
+.method public static synthetic copy$default(Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;ILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;ILjava/lang/Object;)Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
     .locals 0
 
     and-int/lit8 p6, p5, 0x1
@@ -90,7 +90,7 @@
 
     if-eqz p6, :cond_1
 
-    iget-object p2, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
+    iget-object p2, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Integer;
 
     :cond_1
     and-int/lit8 p6, p5, 0x4
@@ -107,7 +107,7 @@
     iget-object p4, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->userId:Ljava/lang/Long;
 
     :cond_3
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->copy(ILjava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Long;)Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->copy(ILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;)Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
 
     move-result-object p0
 
@@ -124,10 +124,10 @@
     return v0
 .end method
 
-.method public final component2()Ljava/lang/Boolean;
+.method public final component2()Ljava/lang/Integer;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Integer;
 
     return-object v0
 .end method
@@ -148,12 +148,12 @@
     return-object v0
 .end method
 
-.method public final copy(ILjava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Long;)Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
+.method public final copy(ILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;)Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
     .locals 1
 
     new-instance v0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
 
-    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;-><init>(ILjava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Long;)V
+    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;-><init>(ILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;)V
 
     return-object v0
 .end method
@@ -189,9 +189,9 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Integer;
 
-    iget-object v3, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
+    iget-object v3, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Integer;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -237,10 +237,10 @@
     return-object v0
 .end method
 
-.method public final getSpeaking()Ljava/lang/Boolean;
+.method public final getSpeaking()Ljava/lang/Integer;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Integer;
 
     return-object v0
 .end method
@@ -268,7 +268,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Integer;
 
     const/4 v2, 0x0
 
@@ -337,7 +337,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Integer;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/samsung/SamsungConnectActivity$a.smali b/com.discord/smali/com/discord/samsung/SamsungConnectActivity$a.smali
index 266169ff6c..3ee32cdf9e 100644
--- a/com.discord/smali/com/discord/samsung/SamsungConnectActivity$a.smali
+++ b/com.discord/smali/com/discord/samsung/SamsungConnectActivity$a.smali
@@ -62,6 +62,10 @@
 
     move-result-object p1
 
+    const-string p2, "Intent(fragment.requireA\u2026AG_ACTIVITY_NO_ANIMATION)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/16 p2, 0x1553
 
     invoke-virtual {p0, p1, p2}, Landroidx/fragment/app/Fragment;->startActivityForResult(Landroid/content/Intent;I)V
diff --git a/com.discord/smali/com/discord/samsung/SamsungConnectActivity$b.smali b/com.discord/smali/com/discord/samsung/SamsungConnectActivity$b.smali
index 1d3274d2ad..597f303dc1 100644
--- a/com.discord/smali/com/discord/samsung/SamsungConnectActivity$b.smali
+++ b/com.discord/smali/com/discord/samsung/SamsungConnectActivity$b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final synthetic zR:Lcom/discord/samsung/SamsungConnectActivity;
+.field final synthetic Aa:Lcom/discord/samsung/SamsungConnectActivity;
 
 
 # direct methods
@@ -27,7 +27,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$b;->zR:Lcom/discord/samsung/SamsungConnectActivity;
+    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$b;->Aa:Lcom/discord/samsung/SamsungConnectActivity;
 
     invoke-direct {p0}, Lcom/a/a/a/a$a;-><init>()V
 
@@ -236,7 +236,7 @@
     move-object p3, p1
 
     :goto_5
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -262,7 +262,7 @@
 
     const/4 v4, 0x4
 
-    invoke-static {v4, p2}, Lkotlin/ranges/c;->aa(II)I
+    invoke-static {v4, p2}, Lkotlin/ranges/c;->Z(II)I
 
     move-result v4
 
@@ -299,7 +299,7 @@
     invoke-static {v2, p2, p1, p3, p1}, Lcom/discord/utilities/logging/Logger;->w$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     :cond_8
-    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$b;->zR:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$b;->Aa:Lcom/discord/samsung/SamsungConnectActivity;
 
     invoke-static {p1, v0, v1}, Lcom/discord/samsung/SamsungConnectActivity;->a(Lcom/discord/samsung/SamsungConnectActivity;Ljava/lang/String;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/samsung/SamsungConnectActivity$c.smali b/com.discord/smali/com/discord/samsung/SamsungConnectActivity$c.smali
index a8cd3e479f..367547fe3d 100644
--- a/com.discord/smali/com/discord/samsung/SamsungConnectActivity$c.smali
+++ b/com.discord/smali/com/discord/samsung/SamsungConnectActivity$c.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic zR:Lcom/discord/samsung/SamsungConnectActivity;
+.field final synthetic Aa:Lcom/discord/samsung/SamsungConnectActivity;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->zR:Lcom/discord/samsung/SamsungConnectActivity;
+    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Aa:Lcom/discord/samsung/SamsungConnectActivity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 .method public final onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V
     .locals 6
 
-    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->zR:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Aa:Lcom/discord/samsung/SamsungConnectActivity;
 
     const/4 v0, 0x1
 
@@ -63,7 +63,7 @@
 
     const-string v2, "com.discord"
 
-    iget-object v3, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->zR:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object v3, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Aa:Lcom/discord/samsung/SamsungConnectActivity;
 
     invoke-static {v3}, Lcom/discord/samsung/SamsungConnectActivity;->a(Lcom/discord/samsung/SamsungConnectActivity;)Lcom/a/a/a/a;
 
@@ -87,7 +87,7 @@
 
     if-nez p2, :cond_0
 
-    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->zR:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Aa:Lcom/discord/samsung/SamsungConnectActivity;
 
     invoke-static {p1}, Lcom/discord/samsung/SamsungConnectActivity;->b(Lcom/discord/samsung/SamsungConnectActivity;)V
 
@@ -156,7 +156,7 @@
 
     move-object v2, p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v3, 0x0
 
@@ -168,7 +168,7 @@
 
     invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->zR:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Aa:Lcom/discord/samsung/SamsungConnectActivity;
 
     const/4 p2, 0x0
 
@@ -185,13 +185,13 @@
 
     invoke-static {p1}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->zR:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Aa:Lcom/discord/samsung/SamsungConnectActivity;
 
     const/4 v0, 0x0
 
     invoke-static {p1, v0}, Lcom/discord/samsung/SamsungConnectActivity;->a(Lcom/discord/samsung/SamsungConnectActivity;Z)V
 
-    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->zR:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Aa:Lcom/discord/samsung/SamsungConnectActivity;
 
     invoke-virtual {p1}, Lcom/discord/samsung/SamsungConnectActivity;->finish()V
 
diff --git a/com.discord/smali/com/discord/samsung/SamsungConnectActivity.smali b/com.discord/smali/com/discord/samsung/SamsungConnectActivity.smali
index a72eb2d8d7..00c1616208 100644
--- a/com.discord/smali/com/discord/samsung/SamsungConnectActivity.smali
+++ b/com.discord/smali/com/discord/samsung/SamsungConnectActivity.smali
@@ -12,15 +12,15 @@
 
 
 # static fields
-.field public static final zQ:Lcom/discord/samsung/SamsungConnectActivity$a;
+.field public static final zZ:Lcom/discord/samsung/SamsungConnectActivity$a;
 
 
 # instance fields
 .field private serviceBound:Z
 
-.field private zO:Lcom/a/a/a/a;
+.field private zX:Lcom/a/a/a/a;
 
-.field private final zP:Lcom/discord/samsung/SamsungConnectActivity$c;
+.field private final zY:Lcom/discord/samsung/SamsungConnectActivity$c;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/samsung/SamsungConnectActivity$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/samsung/SamsungConnectActivity;->zQ:Lcom/discord/samsung/SamsungConnectActivity$a;
+    sput-object v0, Lcom/discord/samsung/SamsungConnectActivity;->zZ:Lcom/discord/samsung/SamsungConnectActivity$a;
 
     return-void
 .end method
@@ -47,7 +47,7 @@
 
     invoke-direct {v0, p0}, Lcom/discord/samsung/SamsungConnectActivity$c;-><init>(Lcom/discord/samsung/SamsungConnectActivity;)V
 
-    iput-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->zP:Lcom/discord/samsung/SamsungConnectActivity$c;
+    iput-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->zY:Lcom/discord/samsung/SamsungConnectActivity$c;
 
     return-void
 .end method
@@ -55,13 +55,13 @@
 .method public static final synthetic a(Lcom/discord/samsung/SamsungConnectActivity;)Lcom/a/a/a/a;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/samsung/SamsungConnectActivity;->zO:Lcom/a/a/a/a;
+    iget-object p0, p0, Lcom/discord/samsung/SamsungConnectActivity;->zX:Lcom/a/a/a/a;
 
     if-nez p0, :cond_0
 
     const-string v0, "samsungAccountServiceCallback"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -209,7 +209,7 @@
 
     check-cast p1, Lcom/a/a/a/a;
 
-    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity;->zO:Lcom/a/a/a/a;
+    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity;->zX:Lcom/a/a/a/a;
 
     new-instance p1, Landroid/content/Intent;
 
@@ -223,6 +223,10 @@
 
     move-result-object p1
 
+    const-string v0, "Intent(SAMSUNG_REQ_SA_SE\u2026(SAMSUNG_ACCOUNT_SERVICE)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-string v0, "Samsung starting SA Service"
 
     invoke-static {v0}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
@@ -233,7 +237,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v3, 0x0
 
@@ -250,7 +254,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->zP:Lcom/discord/samsung/SamsungConnectActivity$c;
+    iget-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->zY:Lcom/discord/samsung/SamsungConnectActivity$c;
 
     check-cast v0, Landroid/content/ServiceConnection;
 
@@ -262,7 +266,7 @@
 
     if-nez p1, :cond_1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v2, 0x0
 
@@ -287,7 +291,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->zP:Lcom/discord/samsung/SamsungConnectActivity$c;
+    iget-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->zY:Lcom/discord/samsung/SamsungConnectActivity$c;
 
     check-cast v0, Landroid/content/ServiceConnection;
 
diff --git a/com.discord/smali/com/discord/samsung/a$b.smali b/com.discord/smali/com/discord/samsung/a$b.smali
index 417dc41f41..4de0e4b8a6 100644
--- a/com.discord/smali/com/discord/samsung/a$b.smali
+++ b/com.discord/smali/com/discord/samsung/a$b.smali
@@ -31,10 +31,10 @@
 .end annotation
 
 .annotation runtime Lkotlin/coroutines/jvm/internal/d;
-    Ec = "SamsungConnect.kt"
-    Ed = {}
-    Ee = "invokeSuspend"
-    Ef = "com.discord.samsung.SamsungConnect$getSamsungAuthorizeCallback$2"
+    DR = "SamsungConnect.kt"
+    DS = {}
+    DT = "invokeSuspend"
+    DU = "com.discord.samsung.SamsungConnect$getSamsungAuthorizeCallback$2"
 .end annotation
 
 
@@ -109,7 +109,7 @@
 
     check-cast p1, Lcom/discord/samsung/a$b;
 
-    sget-object p2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/discord/samsung/a$b;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -119,9 +119,9 @@
 .end method
 
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+    .locals 2
 
-    sget-object p1, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object p1, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     iget p1, p0, Lcom/discord/samsung/a$b;->label:I
 
@@ -131,31 +131,37 @@
 
     invoke-direct {p1}, Lokhttp3/w$a;-><init>()V
 
-    invoke-virtual {p1}, Lokhttp3/w$a;->Hb()Lokhttp3/w$a;
+    const/4 v0, 0x0
+
+    const-string v1, "GET"
+
+    invoke-virtual {p1, v1, v0}, Lokhttp3/w$a;->a(Ljava/lang/String;Lokhttp3/RequestBody;)Lokhttp3/w$a;
 
     move-result-object p1
 
     iget-object v0, p0, Lcom/discord/samsung/a$b;->$url:Ljava/lang/String;
 
-    invoke-virtual {p1, v0}, Lokhttp3/w$a;->eq(Ljava/lang/String;)Lokhttp3/w$a;
+    invoke-virtual {p1, v0}, Lokhttp3/w$a;->ek(Ljava/lang/String;)Lokhttp3/w$a;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {p1}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object p1
 
     iget-object v0, p0, Lcom/discord/samsung/a$b;->$okHttpClient:Lokhttp3/t;
 
-    invoke-virtual {v0, p1}, Lokhttp3/t;->a(Lokhttp3/w;)Lokhttp3/e;
+    const/4 v1, 0x0
+
+    invoke-static {v0, p1, v1}, Lokhttp3/v;->a(Lokhttp3/t;Lokhttp3/w;Z)Lokhttp3/v;
 
     move-result-object p1
 
-    invoke-interface {p1}, Lokhttp3/e;->Gr()Lokhttp3/Response;
+    invoke-interface {p1}, Lokhttp3/e;->Gg()Lokhttp3/Response;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/samsung/a;->zM:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
 
     const-string v0, "response"
 
diff --git a/com.discord/smali/com/discord/samsung/a$c.smali b/com.discord/smali/com/discord/samsung/a$c.smali
index 52386accb6..513a462caf 100644
--- a/com.discord/smali/com/discord/samsung/a$c.smali
+++ b/com.discord/smali/com/discord/samsung/a$c.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/samsung/a;->eo()Lrx/Observable;
+    value = Lcom/discord/samsung/a;->er()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final zN:Lcom/discord/samsung/a$c;
+.field public static final zW:Lcom/discord/samsung/a$c;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0}, Lcom/discord/samsung/a$c;-><init>()V
 
-    sput-object v0, Lcom/discord/samsung/a$c;->zN:Lcom/discord/samsung/a$c;
+    sput-object v0, Lcom/discord/samsung/a$c;->zW:Lcom/discord/samsung/a$c;
 
     return-void
 .end method
@@ -76,9 +76,9 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lcom/discord/samsung/a;->zM:Lcom/discord/samsung/a;
+    sget-object p1, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->en()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eq()Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/samsung/a$d.smali b/com.discord/smali/com/discord/samsung/a$d.smali
index c7f5e8c59b..6d3622f3b8 100644
--- a/com.discord/smali/com/discord/samsung/a$d.smali
+++ b/com.discord/smali/com/discord/samsung/a$d.smali
@@ -31,10 +31,10 @@
 .end annotation
 
 .annotation runtime Lkotlin/coroutines/jvm/internal/d;
-    Ec = "SamsungConnect.kt"
-    Ed = {}
-    Ee = "invokeSuspend"
-    Ef = "com.discord.samsung.SamsungConnect$postSamsungAuthorizeCallback$2"
+    DR = "SamsungConnect.kt"
+    DS = {}
+    DT = "invokeSuspend"
+    DU = "com.discord.samsung.SamsungConnect$postSamsungAuthorizeCallback$2"
 .end annotation
 
 
@@ -125,7 +125,7 @@
 
     check-cast p1, Lcom/discord/samsung/a$d;
 
-    sget-object p2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/discord/samsung/a$d;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -135,9 +135,9 @@
 .end method
 
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 9
+    .locals 10
 
-    sget-object p1, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object p1, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     iget p1, p0, Lcom/discord/samsung/a$d;->label:I
 
@@ -147,45 +147,45 @@
 
     new-array p1, p1, [Lkotlin/Pair;
 
-    const/4 v0, 0x0
+    iget-object v0, p0, Lcom/discord/samsung/a$d;->$state:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/discord/samsung/a$d;->$state:Ljava/lang/String;
+    const-string v1, "state"
 
-    const-string v2, "state"
+    invoke-static {v1, v0}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    invoke-static {v2, v1}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    move-result-object v0
 
-    move-result-object v1
+    const/4 v1, 0x0
 
-    aput-object v1, p1, v0
+    aput-object v0, p1, v1
 
     const/4 v0, 0x1
 
-    new-instance v1, Ljava/lang/StringBuilder;
+    new-instance v2, Ljava/lang/StringBuilder;
 
-    const-string v2, "{\"code\":\""
+    const-string v3, "{\"code\":\""
 
-    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/samsung/a$d;->$samsungAuthCode:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/samsung/a$d;->$samsungAuthCode:Ljava/lang/String;
 
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v2, "\"}"
+    const-string v3, "\"}"
 
-    invoke-virtual {v1, v2}, 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 {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v2
 
-    const-string v2, "code"
+    const-string v3, "code"
 
-    invoke-static {v2, v1}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {v3, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    move-result-object v1
+    move-result-object v2
 
-    aput-object v1, p1, v0
+    aput-object v2, p1, v0
 
     invoke-static {p1}, Lkotlin/a/ad;->a([Lkotlin/Pair;)Ljava/util/Map;
 
@@ -195,9 +195,9 @@
 
     invoke-interface {p1}, Ljava/util/Map;->size()I
 
-    move-result v1
+    move-result v2
 
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v0, v2}, Ljava/util/ArrayList;-><init>(I)V
 
     check-cast v0, Ljava/util/Collection;
 
@@ -212,62 +212,60 @@
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v1
+    move-result v2
 
-    if-eqz v1, :cond_0
+    if-eqz v2, :cond_0
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v2
 
-    check-cast v1, Ljava/util/Map$Entry;
+    check-cast v2, Ljava/util/Map$Entry;
 
-    invoke-interface {v1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+    invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/String;
+
+    invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
     move-result-object v2
 
     check-cast v2, Ljava/lang/String;
 
-    invoke-interface {v1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+    new-instance v4, Ljava/lang/StringBuilder;
 
-    move-result-object v1
+    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
 
-    check-cast v1, Ljava/lang/String;
+    invoke-virtual {v4, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    new-instance v3, Ljava/lang/StringBuilder;
+    const/16 v3, 0x3d
 
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-virtual {v4, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const/16 v2, 0x3d
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    move-result-object v2
 
-    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
-
-    invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v0, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_0
     check-cast v0, Ljava/util/List;
 
-    move-object v1, v0
+    move-object v2, v0
 
-    check-cast v1, Ljava/lang/Iterable;
+    check-cast v2, Ljava/lang/Iterable;
 
     const-string p1, "&"
 
-    move-object v2, p1
+    move-object v3, p1
 
-    check-cast v2, Ljava/lang/CharSequence;
-
-    const/4 v3, 0x0
+    check-cast v3, Ljava/lang/CharSequence;
 
     const/4 v4, 0x0
 
@@ -277,15 +275,17 @@
 
     const/4 v7, 0x0
 
-    const/16 v8, 0x3e
+    const/4 v8, 0x0
 
-    invoke-static/range {v1 .. v8}, Lkotlin/a/m;->a(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    const/16 v9, 0x3e
+
+    invoke-static/range {v2 .. v9}, Lkotlin/a/m;->a(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
 
     const-string v0, "application/x-www-form-urlencoded"
 
-    invoke-static {v0}, Lokhttp3/MediaType;->en(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {v0}, Lokhttp3/MediaType;->eh(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object v0
 
@@ -297,31 +297,33 @@
 
     invoke-direct {v0}, Lokhttp3/w$a;-><init>()V
 
-    invoke-virtual {v0, p1}, Lokhttp3/w$a;->a(Lokhttp3/RequestBody;)Lokhttp3/w$a;
+    const-string v2, "POST"
+
+    invoke-virtual {v0, v2, p1}, Lokhttp3/w$a;->a(Ljava/lang/String;Lokhttp3/RequestBody;)Lokhttp3/w$a;
 
     move-result-object p1
 
     iget-object v0, p0, Lcom/discord/samsung/a$d;->$url:Ljava/lang/String;
 
-    invoke-virtual {p1, v0}, Lokhttp3/w$a;->eq(Ljava/lang/String;)Lokhttp3/w$a;
+    invoke-virtual {p1, v0}, Lokhttp3/w$a;->ek(Ljava/lang/String;)Lokhttp3/w$a;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {p1}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object p1
 
     iget-object v0, p0, Lcom/discord/samsung/a$d;->$okHttpClient:Lokhttp3/t;
 
-    invoke-virtual {v0, p1}, Lokhttp3/t;->a(Lokhttp3/w;)Lokhttp3/e;
+    invoke-static {v0, p1, v1}, Lokhttp3/v;->a(Lokhttp3/t;Lokhttp3/w;Z)Lokhttp3/v;
 
     move-result-object p1
 
-    invoke-interface {p1}, Lokhttp3/e;->Gr()Lokhttp3/Response;
+    invoke-interface {p1}, Lokhttp3/e;->Gg()Lokhttp3/Response;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/samsung/a;->zM:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
 
     const-string v0, "response"
 
diff --git a/com.discord/smali/com/discord/samsung/a.smali b/com.discord/smali/com/discord/samsung/a.smali
index d07547adeb..b9a0c13d40 100644
--- a/com.discord/smali/com/discord/samsung/a.smali
+++ b/com.discord/smali/com/discord/samsung/a.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field public static final zM:Lcom/discord/samsung/a;
+.field public static final zV:Lcom/discord/samsung/a;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Lcom/discord/samsung/a;-><init>()V
 
-    sput-object v0, Lcom/discord/samsung/a;->zM:Lcom/discord/samsung/a;
+    sput-object v0, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 
     const-string v0, "Location"
 
-    invoke-virtual {p0, v0}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p0, v0}, Lokhttp3/Response;->em(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -79,42 +79,62 @@
 
     invoke-static {v4, v5, v3}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
-    move-result v3
+    move-result v4
+
+    goto :goto_1
 
     :cond_1
-    if-nez v3, :cond_3
+    const/4 v4, 0x0
 
-    invoke-virtual {p0}, Lokhttp3/Response;->zW()Z
+    :goto_1
+    if-nez v4, :cond_4
 
-    move-result v3
+    invoke-virtual {p0}, Lokhttp3/Response;->zS()Z
 
-    if-nez v3, :cond_2
+    move-result v4
 
-    invoke-virtual {p0}, Lokhttp3/Response;->isRedirect()Z
+    if-nez v4, :cond_3
 
-    move-result v3
+    iget v4, p0, Lokhttp3/Response;->code:I
 
-    if-eqz v3, :cond_3
+    const/16 v5, 0x133
+
+    if-eq v4, v5, :cond_2
+
+    const/16 v5, 0x134
+
+    if-eq v4, v5, :cond_2
+
+    packed-switch v4, :pswitch_data_0
+
+    goto :goto_2
 
     :cond_2
-    return-object v0
+    :pswitch_0
+    const/4 v3, 0x1
+
+    :goto_2
+    if-eqz v3, :cond_4
 
     :cond_3
+    return-object v0
+
+    :cond_4
     new-instance v3, Lcom/discord/samsung/a$a;
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_5
 
     invoke-virtual {v0, v2}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
-    if-nez v2, :cond_5
-
-    :cond_4
-    const-string v2, "unknown"
+    if-nez v2, :cond_6
 
     :cond_5
-    if-eqz v0, :cond_6
+    const-string v2, "unknown"
+
+    :cond_6
+    if-eqz v0, :cond_7
 
     const-string v1, "error_description"
 
@@ -122,10 +142,10 @@
 
     move-result-object v1
 
-    :cond_6
+    :cond_7
     invoke-direct {v3, v2, v1}, Lcom/discord/samsung/a$a;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -142,6 +162,14 @@
     invoke-virtual {v0, p0, v3}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     throw v3
+
+    :pswitch_data_0
+    .packed-switch 0x12c
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+    .end packed-switch
 .end method
 
 .method public static a(Lokhttp3/t;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -161,7 +189,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlinx/coroutines/ap;->EY()Lkotlinx/coroutines/y;
+    invoke-static {}, Lkotlinx/coroutines/ap;->EN()Lkotlinx/coroutines/y;
 
     move-result-object v0
 
@@ -207,7 +235,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlinx/coroutines/ap;->EY()Lkotlinx/coroutines/y;
+    invoke-static {}, Lkotlinx/coroutines/ap;->EN()Lkotlinx/coroutines/y;
 
     move-result-object v0
 
@@ -228,7 +256,7 @@
     return-object p0
 .end method
 
-.method public static ai(Ljava/lang/String;)Ljava/lang/String;
+.method public static ae(Ljava/lang/String;)Ljava/lang/String;
     .locals 3
 
     const-string v0, "authServerUrl"
@@ -303,7 +331,7 @@
     return-object v2
 .end method
 
-.method public static en()Z
+.method public static eq()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -332,7 +360,7 @@
     return v0
 .end method
 
-.method public static eo()Lrx/Observable;
+.method public static er()Lrx/Observable;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -359,7 +387,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/samsung/a$c;->zN:Lcom/discord/samsung/a$c;
+    sget-object v1, Lcom/discord/samsung/a$c;->zW:Lcom/discord/samsung/a$c;
 
     check-cast v1, Lrx/functions/b;
 
@@ -374,7 +402,7 @@
     return-object v0
 .end method
 
-.method public static ep()Landroid/content/Intent;
+.method public static es()Landroid/content/Intent;
     .locals 3
 
     new-instance v0, Landroid/content/Intent;
@@ -397,3 +425,61 @@
 
     return-object v0
 .end method
+
+.method public static et()Landroid/content/Intent;
+    .locals 3
+
+    sget-object v0, Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;->getOauth2Authorize()Landroid/net/Uri;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Landroid/net/Uri;->buildUpon()Landroid/net/Uri$Builder;
+
+    move-result-object v0
+
+    const-string v1, "client_id"
+
+    const-string v2, "591317049637339146"
+
+    invoke-virtual {v0, v1, v2}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+    move-result-object v0
+
+    const-string v1, "prompt"
+
+    const-string v2, "consent"
+
+    invoke-virtual {v0, v1, v2}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+    move-result-object v0
+
+    const-string v1, "response_type"
+
+    const-string v2, "code"
+
+    invoke-virtual {v0, v1, v2}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+    move-result-object v0
+
+    const-string v1, "scope"
+
+    const-string v2, "identify activities.read activities.write"
+
+    invoke-virtual {v0, v1, v2}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
+
+    move-result-object v0
+
+    new-instance v1, Landroid/content/Intent;
+
+    const-string v2, "android.intent.action.VIEW"
+
+    invoke-direct {v1, v2, v0}, Landroid/content/Intent;-><init>(Ljava/lang/String;Landroid/net/Uri;)V
+
+    return-object v1
+.end method
diff --git a/com.discord/smali/com/discord/simpleast/a/a$a.smali b/com.discord/smali/com/discord/simpleast/a/a$a.smali
index ccd3338fbc..45a73942cd 100644
--- a/com.discord/smali/com/discord/simpleast/a/a$a.smali
+++ b/com.discord/smali/com/discord/simpleast/a/a$a.smali
@@ -81,15 +81,15 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0}, Lcom/discord/simpleast/core/a/a;->u(Z)Ljava/util/List;
+    invoke-static {v0}, Lcom/discord/simpleast/core/a/a;->s(Z)Ljava/util/List;
 
     move-result-object v0
 
     check-cast v0, Ljava/util/Collection;
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->et()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->ex()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
@@ -138,9 +138,9 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/simpleast/a/a;->Ar:Lcom/discord/simpleast/a/a;
+    sget-object v0, Lcom/discord/simpleast/a/a;->AA:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->ez()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->eD()Ljava/util/regex/Pattern;
 
     move-result-object v0
 
@@ -385,7 +385,7 @@
     goto :goto_3
 
     :cond_7
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     move-object p2, p1
 
@@ -418,7 +418,7 @@
     move-object p1, v0
 
     :goto_4
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     check-cast p1, Lcom/discord/simpleast/core/node/Node;
 
diff --git a/com.discord/smali/com/discord/simpleast/a/a$b.smali b/com.discord/smali/com/discord/simpleast/a/a$b.smali
index 0084bf1bcc..0b078facdb 100644
--- a/com.discord/smali/com/discord/simpleast/a/a$b.smali
+++ b/com.discord/smali/com/discord/simpleast/a/a$b.smali
@@ -62,9 +62,9 @@
 
     if-eqz p3, :cond_0
 
-    sget-object p1, Lcom/discord/simpleast/a/a;->Ar:Lcom/discord/simpleast/a/a;
+    sget-object p1, Lcom/discord/simpleast/a/a;->AA:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->ey()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->eC()Ljava/util/regex/Pattern;
 
     move-result-object p1
 
@@ -170,7 +170,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     const/4 p2, 0x2
 
diff --git a/com.discord/smali/com/discord/simpleast/a/a$c.smali b/com.discord/smali/com/discord/simpleast/a/a$c.smali
index dec6f0f7b1..b156ad9566 100644
--- a/com.discord/smali/com/discord/simpleast/a/a$c.smali
+++ b/com.discord/smali/com/discord/simpleast/a/a$c.smali
@@ -90,9 +90,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/simpleast/a/a;->Ar:Lcom/discord/simpleast/a/a;
+    sget-object v0, Lcom/discord/simpleast/a/a;->AA:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->ex()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->eB()Ljava/util/regex/Pattern;
 
     move-result-object v0
 
@@ -188,7 +188,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     const/4 p2, 0x1
 
diff --git a/com.discord/smali/com/discord/simpleast/a/a.smali b/com.discord/smali/com/discord/simpleast/a/a.smali
index 4249ef2651..3640ff594e 100644
--- a/com.discord/smali/com/discord/simpleast/a/a.smali
+++ b/com.discord/smali/com/discord/simpleast/a/a.smali
@@ -14,15 +14,15 @@
 
 
 # static fields
-.field private static final An:Ljava/util/regex/Pattern;
+.field public static final AA:Lcom/discord/simpleast/a/a;
 
-.field private static final Ao:Ljava/util/regex/Pattern;
+.field private static final Aw:Ljava/util/regex/Pattern;
 
-.field private static final Ap:Ljava/util/regex/Pattern;
+.field private static final Ax:Ljava/util/regex/Pattern;
 
-.field private static final Aq:Ljava/util/regex/Pattern;
+.field private static final Ay:Ljava/util/regex/Pattern;
 
-.field public static final Ar:Lcom/discord/simpleast/a/a;
+.field private static final Az:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     invoke-direct {v0}, Lcom/discord/simpleast/a/a;-><init>()V
 
-    sput-object v0, Lcom/discord/simpleast/a/a;->Ar:Lcom/discord/simpleast/a/a;
+    sput-object v0, Lcom/discord/simpleast/a/a;->AA:Lcom/discord/simpleast/a/a;
 
     const/4 v0, 0x0
 
@@ -47,7 +47,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sput-object v1, Lcom/discord/simpleast/a/a;->An:Ljava/util/regex/Pattern;
+    sput-object v1, Lcom/discord/simpleast/a/a;->Aw:Ljava/util/regex/Pattern;
 
     const-string v1, "^\\s*(#+)[ \\t](.*) *(?=\\n|$)"
 
@@ -57,7 +57,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sput-object v1, Lcom/discord/simpleast/a/a;->Ao:Ljava/util/regex/Pattern;
+    sput-object v1, Lcom/discord/simpleast/a/a;->Ax:Ljava/util/regex/Pattern;
 
     const-string v1, "^\\s*(.+)\\n *(=|-){3,} *(?=\\n|$)"
 
@@ -67,7 +67,7 @@
 
     invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/discord/simpleast/a/a;->Ap:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/a/a;->Ay:Ljava/util/regex/Pattern;
 
     new-instance v0, Lkotlin/text/Regex;
 
@@ -77,7 +77,7 @@
 
     iget-object v0, v0, Lkotlin/text/Regex;->nativePattern:Ljava/util/regex/Pattern;
 
-    sput-object v0, Lcom/discord/simpleast/a/a;->Aq:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/a/a;->Az:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -90,34 +90,34 @@
     return-void
 .end method
 
-.method public static ew()Ljava/util/regex/Pattern;
+.method public static eA()Ljava/util/regex/Pattern;
     .locals 1
 
-    sget-object v0, Lcom/discord/simpleast/a/a;->An:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/a/a;->Aw:Ljava/util/regex/Pattern;
 
     return-object v0
 .end method
 
-.method public static ex()Ljava/util/regex/Pattern;
+.method public static eB()Ljava/util/regex/Pattern;
     .locals 1
 
-    sget-object v0, Lcom/discord/simpleast/a/a;->Ao:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/a/a;->Ax:Ljava/util/regex/Pattern;
 
     return-object v0
 .end method
 
-.method public static ey()Ljava/util/regex/Pattern;
+.method public static eC()Ljava/util/regex/Pattern;
     .locals 1
 
-    sget-object v0, Lcom/discord/simpleast/a/a;->Ap:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/a/a;->Ay:Ljava/util/regex/Pattern;
 
     return-object v0
 .end method
 
-.method public static ez()Ljava/util/regex/Pattern;
+.method public static eD()Ljava/util/regex/Pattern;
     .locals 1
 
-    sget-object v0, Lcom/discord/simpleast/a/a;->Aq:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/a/a;->Az:Ljava/util/regex/Pattern;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/simpleast/core/a/a$a.smali b/com.discord/smali/com/discord/simpleast/core/a/a$a.smali
index b1f0633bef..3c935640da 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/a$a.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/a$a.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/simpleast/core/a/a;->es()Lcom/discord/simpleast/core/parser/Rule;
+    value = Lcom/discord/simpleast/core/a/a;->ew()Lcom/discord/simpleast/core/parser/Rule;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final Ah:Lcom/discord/simpleast/core/a/a$a;
+.field public static final Aq:Lcom/discord/simpleast/core/a/a$a;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/discord/simpleast/core/a/a$a;-><init>()V
 
-    sput-object v0, Lcom/discord/simpleast/core/a/a$a;->Ah:Lcom/discord/simpleast/core/a/a$a;
+    sput-object v0, Lcom/discord/simpleast/core/a/a$a;->Aq:Lcom/discord/simpleast/core/a/a$a;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/simpleast/core/a/a$b.smali b/com.discord/smali/com/discord/simpleast/core/a/a$b.smali
index 3c8395539b..5c0e1308ad 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/a$b.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/a$b.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/simpleast/core/a/a;->eu()Lcom/discord/simpleast/core/parser/Rule;
+    value = Lcom/discord/simpleast/core/a/a;->ey()Lcom/discord/simpleast/core/parser/Rule;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field final synthetic Ai:Lcom/discord/simpleast/core/a/a;
+.field final synthetic Ar:Lcom/discord/simpleast/core/a/a;
 
 
 # direct methods
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$b;->Ai:Lcom/discord/simpleast/core/a/a;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$b;->Ar:Lcom/discord/simpleast/core/a/a;
 
     invoke-direct {p0, p2}, Lcom/discord/simpleast/core/parser/Rule;-><init>(Ljava/util/regex/Pattern;)V
 
@@ -72,7 +72,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/simpleast/core/node/a;
 
diff --git a/com.discord/smali/com/discord/simpleast/core/a/a$c.smali b/com.discord/smali/com/discord/simpleast/core/a/a$c.smali
index 79475c1777..5df0db7308 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/a$c.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/a$c.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field final synthetic Ai:Lcom/discord/simpleast/core/a/a;
+.field final synthetic Ar:Lcom/discord/simpleast/core/a/a;
 
 
 # direct methods
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$c;->Ai:Lcom/discord/simpleast/core/a/a;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$c;->Ar:Lcom/discord/simpleast/core/a/a;
 
     invoke-direct {p0, p2}, Lcom/discord/simpleast/core/parser/Rule;-><init>(Ljava/util/regex/Pattern;)V
 
@@ -124,7 +124,7 @@
 
     invoke-direct {p2, v2}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
 
-    sget-object v1, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v1, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     check-cast p2, Lcom/discord/simpleast/core/node/Node;
 
diff --git a/com.discord/smali/com/discord/simpleast/core/a/a$d.smali b/com.discord/smali/com/discord/simpleast/core/a/a$d.smali
index 18122eafac..bdbb087aef 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/a$d.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/a$d.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field final synthetic Ai:Lcom/discord/simpleast/core/a/a;
+.field final synthetic Ar:Lcom/discord/simpleast/core/a/a;
 
 
 # direct methods
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$d;->Ai:Lcom/discord/simpleast/core/a/a;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$d;->Ar:Lcom/discord/simpleast/core/a/a;
 
     invoke-direct {p0, p2}, Lcom/discord/simpleast/core/parser/Rule$BlockRule;-><init>(Ljava/util/regex/Pattern;)V
 
@@ -78,7 +78,7 @@
 
     invoke-direct {p1, p2}, Lcom/discord/simpleast/core/node/a;-><init>(Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     check-cast p1, Lcom/discord/simpleast/core/node/Node;
 
diff --git a/com.discord/smali/com/discord/simpleast/core/a/a$e.smali b/com.discord/smali/com/discord/simpleast/core/a/a$e.smali
index 0ee38500b3..b72ac7a1aa 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/a$e.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/a$e.smali
@@ -26,14 +26,14 @@
 # instance fields
 .field final synthetic $pattern:Ljava/util/regex/Pattern;
 
-.field final synthetic Aj:Lkotlin/jvm/functions/Function0;
+.field final synthetic As:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
 .method constructor <init>(Lkotlin/jvm/functions/Function0;Ljava/util/regex/Pattern;Ljava/util/regex/Pattern;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$e;->Aj:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$e;->As:Lkotlin/jvm/functions/Function0;
 
     iput-object p2, p0, Lcom/discord/simpleast/core/a/a$e;->$pattern:Ljava/util/regex/Pattern;
 
@@ -71,7 +71,7 @@
 
     new-instance p2, Lcom/discord/simpleast/core/node/StyleNode;
 
-    iget-object v0, p0, Lcom/discord/simpleast/core/a/a$e;->Aj:Lkotlin/jvm/functions/Function0;
+    iget-object v0, p0, Lcom/discord/simpleast/core/a/a$e;->As:Lkotlin/jvm/functions/Function0;
 
     invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
@@ -81,7 +81,7 @@
 
     invoke-direct {p2, v0}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
 
-    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     check-cast p2, Lcom/discord/simpleast/core/node/Node;
 
diff --git a/com.discord/smali/com/discord/simpleast/core/a/a$f.smali b/com.discord/smali/com/discord/simpleast/core/a/a$f.smali
index f51ce7c6a1..65b854ce9d 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/a$f.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/a$f.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final Ak:Lcom/discord/simpleast/core/a/a$f;
+.field public static final At:Lcom/discord/simpleast/core/a/a$f;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/discord/simpleast/core/a/a$f;-><init>()V
 
-    sput-object v0, Lcom/discord/simpleast/core/a/a$f;->Ak:Lcom/discord/simpleast/core/a/a$f;
+    sput-object v0, Lcom/discord/simpleast/core/a/a$f;->At:Lcom/discord/simpleast/core/a/a$f;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/simpleast/core/a/a$g.smali b/com.discord/smali/com/discord/simpleast/core/a/a$g.smali
index 78b45bcced..5f225656ee 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/a$g.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/a$g.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/simpleast/core/a/a;->et()Lcom/discord/simpleast/core/parser/Rule;
+    value = Lcom/discord/simpleast/core/a/a;->ex()Lcom/discord/simpleast/core/parser/Rule;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field final synthetic Ai:Lcom/discord/simpleast/core/a/a;
+.field final synthetic Ar:Lcom/discord/simpleast/core/a/a;
 
 
 # direct methods
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$g;->Ai:Lcom/discord/simpleast/core/a/a;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$g;->Ar:Lcom/discord/simpleast/core/a/a;
 
     invoke-direct {p0, p2}, Lcom/discord/simpleast/core/parser/Rule;-><init>(Ljava/util/regex/Pattern;)V
 
@@ -84,7 +84,7 @@
 
     invoke-direct {p2, p1}, Lcom/discord/simpleast/core/node/a;-><init>(Ljava/lang/String;)V
 
-    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     check-cast p2, Lcom/discord/simpleast/core/node/Node;
 
diff --git a/com.discord/smali/com/discord/simpleast/core/a/a$h.smali b/com.discord/smali/com/discord/simpleast/core/a/a$h.smali
index 0114c60c9a..131cd5a6cf 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/a$h.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/a$h.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final Al:Lcom/discord/simpleast/core/a/a$h;
+.field public static final Au:Lcom/discord/simpleast/core/a/a$h;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/discord/simpleast/core/a/a$h;-><init>()V
 
-    sput-object v0, Lcom/discord/simpleast/core/a/a$h;->Al:Lcom/discord/simpleast/core/a/a$h;
+    sput-object v0, Lcom/discord/simpleast/core/a/a$h;->Au:Lcom/discord/simpleast/core/a/a$h;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/simpleast/core/a/a.smali b/com.discord/smali/com/discord/simpleast/core/a/a.smali
index 226d583a24..6ab6f4cf65 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/a.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/a.smali
@@ -4,21 +4,21 @@
 
 
 # static fields
-.field private static final Aa:Ljava/util/regex/Pattern;
+.field private static final Ai:Ljava/util/regex/Pattern;
 
-.field private static final Ab:Ljava/util/regex/Pattern;
+.field private static final Aj:Ljava/util/regex/Pattern;
 
-.field private static final Ac:Ljava/util/regex/Pattern;
+.field private static final Ak:Ljava/util/regex/Pattern;
 
-.field private static final Ad:Ljava/util/regex/Pattern;
+.field private static final Al:Ljava/util/regex/Pattern;
 
-.field private static final Ae:Ljava/util/regex/Pattern;
+.field private static final Am:Ljava/util/regex/Pattern;
 
-.field private static final Af:Ljava/util/regex/Pattern;
+.field private static final An:Ljava/util/regex/Pattern;
 
-.field public static final Ag:Lcom/discord/simpleast/core/a/a;
+.field private static final Ao:Ljava/util/regex/Pattern;
 
-.field private static final zZ:Ljava/util/regex/Pattern;
+.field public static final Ap:Lcom/discord/simpleast/core/a/a;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/discord/simpleast/core/a/a;-><init>()V
 
-    sput-object v0, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
     const-string v0, "^\\*\\*([\\s\\S]+?)\\*\\*(?!\\*)"
 
@@ -37,7 +37,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/simpleast/core/a/a;->zZ:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Ai:Ljava/util/regex/Pattern;
 
     const-string v0, "^__([\\s\\S]+?)__(?!_)"
 
@@ -45,7 +45,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/simpleast/core/a/a;->Aa:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Aj:Ljava/util/regex/Pattern;
 
     const-string v0, "^~~(?=\\S)([\\s\\S]*?\\S)~~"
 
@@ -53,7 +53,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/simpleast/core/a/a;->Ab:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Ak:Ljava/util/regex/Pattern;
 
     const-string v0, "^(?:\\n *)*\\n"
 
@@ -61,7 +61,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/simpleast/core/a/a;->Ac:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Al:Ljava/util/regex/Pattern;
 
     const-string v0, "^[\\s\\S]+?(?=[^0-9A-Za-z\\s\\u00c0-\\uffff]|\\n| {2,}\\n|\\w+:\\S|$)"
 
@@ -69,7 +69,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/simpleast/core/a/a;->Ad:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Am:Ljava/util/regex/Pattern;
 
     const-string v0, "^\\\\([^0-9A-Za-z\\s])"
 
@@ -77,7 +77,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/simpleast/core/a/a;->Ae:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->An:Ljava/util/regex/Pattern;
 
     const-string v0, "^\\b_((?:__|\\\\[\\s\\S]|[^\\\\_])+?)_\\b|^\\*(?=\\S)((?:\\*\\*|\\s+(?:[^*\\s]|\\*\\*)|[^\\s*])+?)\\*(?!\\*)"
 
@@ -85,7 +85,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/simpleast/core/a/a;->Af:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Ao:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -138,23 +138,23 @@
     return-object v0
 .end method
 
-.method public static eq()Ljava/util/regex/Pattern;
+.method public static eu()Ljava/util/regex/Pattern;
     .locals 1
 
-    sget-object v0, Lcom/discord/simpleast/core/a/a;->zZ:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/core/a/a;->Ai:Ljava/util/regex/Pattern;
 
     return-object v0
 .end method
 
-.method public static er()Ljava/util/regex/Pattern;
+.method public static ev()Ljava/util/regex/Pattern;
     .locals 1
 
-    sget-object v0, Lcom/discord/simpleast/core/a/a;->Ad:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/core/a/a;->Am:Ljava/util/regex/Pattern;
 
     return-object v0
 .end method
 
-.method public static es()Lcom/discord/simpleast/core/parser/Rule;
+.method public static ew()Lcom/discord/simpleast/core/parser/Rule;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -170,13 +170,13 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/simpleast/core/a/a;->zZ:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/core/a/a;->Ai:Ljava/util/regex/Pattern;
 
     const-string v1, "PATTERN_BOLD"
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a$a;->Ah:Lcom/discord/simpleast/core/a/a$a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a$a;->Aq:Lcom/discord/simpleast/core/a/a$a;
 
     check-cast v1, Lkotlin/jvm/functions/Function0;
 
@@ -187,19 +187,19 @@
     return-object v0
 .end method
 
-.method public static synthetic ev()Ljava/util/List;
+.method public static synthetic ez()Ljava/util/List;
     .locals 1
 
     const/4 v0, 0x1
 
-    invoke-static {v0}, Lcom/discord/simpleast/core/a/a;->u(Z)Ljava/util/List;
+    invoke-static {v0}, Lcom/discord/simpleast/core/a/a;->s(Z)Ljava/util/List;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static final u(Z)Ljava/util/List;
+.method public static final s(Z)Ljava/util/List;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -220,19 +220,19 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eu()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->ey()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
     invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
     new-instance v2, Lcom/discord/simpleast/core/a/a$d;
 
-    sget-object v3, Lcom/discord/simpleast/core/a/a;->Ac:Ljava/util/regex/Pattern;
+    sget-object v3, Lcom/discord/simpleast/core/a/a;->Al:Ljava/util/regex/Pattern;
 
     const-string v4, "PATTERN_NEWLINE"
 
@@ -244,19 +244,19 @@
 
     invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->es()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ew()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
     invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Aa:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Aj:Ljava/util/regex/Pattern;
 
     const-string v2, "PATTERN_UNDERLINE"
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/simpleast/core/a/a$h;->Al:Lcom/discord/simpleast/core/a/a$h;
+    sget-object v2, Lcom/discord/simpleast/core/a/a$h;->Au:Lcom/discord/simpleast/core/a/a$h;
 
     check-cast v2, Lkotlin/jvm/functions/Function0;
 
@@ -266,11 +266,11 @@
 
     invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
     new-instance v2, Lcom/discord/simpleast/core/a/a$c;
 
-    sget-object v3, Lcom/discord/simpleast/core/a/a;->Af:Ljava/util/regex/Pattern;
+    sget-object v3, Lcom/discord/simpleast/core/a/a;->Ao:Ljava/util/regex/Pattern;
 
     const-string v4, "PATTERN_ITALICS"
 
@@ -282,13 +282,13 @@
 
     invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ab:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ak:Ljava/util/regex/Pattern;
 
     const-string v2, "PATTERN_STRIKETHRU"
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/simpleast/core/a/a$f;->Ak:Lcom/discord/simpleast/core/a/a$f;
+    sget-object v2, Lcom/discord/simpleast/core/a/a$f;->At:Lcom/discord/simpleast/core/a/a$f;
 
     check-cast v2, Lkotlin/jvm/functions/Function0;
 
@@ -300,9 +300,9 @@
 
     if-eqz p0, :cond_0
 
-    sget-object p0, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object p0, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {p0}, Lcom/discord/simpleast/core/a/a;->et()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p0}, Lcom/discord/simpleast/core/a/a;->ex()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object p0
 
@@ -316,7 +316,7 @@
 
 
 # virtual methods
-.method public final et()Lcom/discord/simpleast/core/parser/Rule;
+.method public final ex()Lcom/discord/simpleast/core/parser/Rule;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -334,7 +334,7 @@
 
     new-instance v0, Lcom/discord/simpleast/core/a/a$g;
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ad:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Am:Ljava/util/regex/Pattern;
 
     const-string v2, "PATTERN_TEXT"
 
@@ -347,7 +347,7 @@
     return-object v0
 .end method
 
-.method public final eu()Lcom/discord/simpleast/core/parser/Rule;
+.method public final ey()Lcom/discord/simpleast/core/parser/Rule;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -365,7 +365,7 @@
 
     new-instance v0, Lcom/discord/simpleast/core/a/a$b;
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ae:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->An:Ljava/util/regex/Pattern;
 
     const-string v2, "PATTERN_ESCAPE"
 
diff --git a/com.discord/smali/com/discord/simpleast/core/a/b.smali b/com.discord/smali/com/discord/simpleast/core/a/b.smali
index 36e2fce4ff..0ca2647e4d 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/b.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/b.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final Am:Lcom/discord/simpleast/core/a/b;
+.field public static final Av:Lcom/discord/simpleast/core/a/b;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/discord/simpleast/core/a/b;-><init>()V
 
-    sput-object v0, Lcom/discord/simpleast/core/a/b;->Am:Lcom/discord/simpleast/core/a/b;
+    sput-object v0, Lcom/discord/simpleast/core/a/b;->Av:Lcom/discord/simpleast/core/a/b;
 
     return-void
 .end method
@@ -84,7 +84,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ev()Ljava/util/List;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ez()Ljava/util/List;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/simpleast/core/b/a.smali b/com.discord/smali/com/discord/simpleast/core/b/a.smali
index f1be8b743d..7afd09a025 100644
--- a/com.discord/smali/com/discord/simpleast/core/b/a.smali
+++ b/com.discord/smali/com/discord/simpleast/core/b/a.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method private static a(Lcom/discord/simpleast/core/node/Node;Lcom/discord/simpleast/core/b/b;)V
+.method public static a(Lcom/discord/simpleast/core/node/Node;Lcom/discord/simpleast/core/b/b;)V
     .locals 1
 
     invoke-interface {p1, p0}, Lcom/discord/simpleast/core/b/b;->processNode(Lcom/discord/simpleast/core/node/Node;)V
@@ -75,7 +75,7 @@
 
     check-cast v0, Lcom/discord/simpleast/core/node/Node;
 
-    invoke-static {v0, p1}, Lcom/discord/simpleast/core/b/a;->a(Lcom/discord/simpleast/core/node/Node;Lcom/discord/simpleast/core/b/b;)V
+    invoke-static {v0, p1}, Lcom/discord/simpleast/core/b/a;->b(Lcom/discord/simpleast/core/node/Node;Lcom/discord/simpleast/core/b/b;)V
 
     goto :goto_0
 
@@ -122,42 +122,3 @@
 
     return-void
 .end method
-
-.method public static b(Ljava/util/Collection;Lcom/discord/simpleast/core/b/b;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "+",
-            "Lcom/discord/simpleast/core/node/Node;",
-            ">;",
-            "Lcom/discord/simpleast/core/b/b;",
-            ")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}, Lcom/discord/simpleast/core/b/a;->b(Lcom/discord/simpleast/core/node/Node;Lcom/discord/simpleast/core/b/b;)V
-
-    goto :goto_0
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/simpleast/core/node/StyleNode$b.smali b/com.discord/smali/com/discord/simpleast/core/node/StyleNode$b.smali
index 542b8f312d..ab372b12cd 100644
--- a/com.discord/smali/com/discord/simpleast/core/node/StyleNode$b.smali
+++ b/com.discord/smali/com/discord/simpleast/core/node/StyleNode$b.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final zU:Lcom/discord/simpleast/core/node/StyleNode$b;
+.field public static final Ad:Lcom/discord/simpleast/core/node/StyleNode$b;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/discord/simpleast/core/node/StyleNode$b;-><init>()V
 
-    sput-object v0, Lcom/discord/simpleast/core/node/StyleNode$b;->zU:Lcom/discord/simpleast/core/node/StyleNode$b;
+    sput-object v0, Lcom/discord/simpleast/core/node/StyleNode$b;->Ad:Lcom/discord/simpleast/core/node/StyleNode$b;
 
     return-void
 .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 0893865c47..2aa6fdd1bd 100644
--- a/com.discord/smali/com/discord/simpleast/core/node/StyleNode.smali
+++ b/com.discord/smali/com/discord/simpleast/core/node/StyleNode.smali
@@ -24,11 +24,11 @@
 
 
 # static fields
-.field public static final zT:Lcom/discord/simpleast/core/node/StyleNode$a;
+.field public static final Ac:Lcom/discord/simpleast/core/node/StyleNode$a;
 
 
 # instance fields
-.field private final zS:Ljava/util/List;
+.field private final Ab:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -48,7 +48,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/simpleast/core/node/StyleNode$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/simpleast/core/node/StyleNode;->zT:Lcom/discord/simpleast/core/node/StyleNode$a;
+    sput-object v0, Lcom/discord/simpleast/core/node/StyleNode;->Ac:Lcom/discord/simpleast/core/node/StyleNode$a;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     invoke-direct {p0}, Lcom/discord/simpleast/core/node/Node;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/simpleast/core/node/StyleNode;->zS:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/simpleast/core/node/StyleNode;->Ab:Ljava/util/List;
 
     return-void
 .end method
@@ -166,7 +166,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lcom/discord/simpleast/core/node/StyleNode;->zS:Ljava/util/List;
+    iget-object p2, p0, Lcom/discord/simpleast/core/node/StyleNode;->Ab:Ljava/util/List;
 
     check-cast p2, Ljava/lang/Iterable;
 
@@ -252,7 +252,7 @@
 
     const/4 v7, 0x0
 
-    sget-object v1, Lcom/discord/simpleast/core/node/StyleNode$b;->zU:Lcom/discord/simpleast/core/node/StyleNode$b;
+    sget-object v1, Lcom/discord/simpleast/core/node/StyleNode$b;->Ad:Lcom/discord/simpleast/core/node/StyleNode$b;
 
     move-object v8, v1
 
diff --git a/com.discord/smali/com/discord/simpleast/core/parser/ParseSpec.smali b/com.discord/smali/com/discord/simpleast/core/parser/ParseSpec.smali
index 7b6cef5c74..5df9874132 100644
--- a/com.discord/smali/com/discord/simpleast/core/parser/ParseSpec.smali
+++ b/com.discord/smali/com/discord/simpleast/core/parser/ParseSpec.smali
@@ -25,10 +25,22 @@
 
 
 # static fields
-.field public static final zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+.field public static final Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
 
 # instance fields
+.field public final Ae:Lcom/discord/simpleast/core/node/Node;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+.field final Af:Z
+
+.field Ag:I
+
 .field startIndex:I
 
 .field final state:Ljava/lang/Object;
@@ -39,18 +51,6 @@
     .end annotation
 .end field
 
-.field public final zV:Lcom/discord/simpleast/core/node/Node;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-.field final zW:Z
-
-.field zX:I
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -62,7 +62,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/simpleast/core/parser/ParseSpec$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sput-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     return-void
 .end method
@@ -77,13 +77,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->zV:Lcom/discord/simpleast/core/node/Node;
+    iput-object p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Ae:Lcom/discord/simpleast/core/node/Node;
 
     iput-object p2, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->state:Ljava/lang/Object;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->zW:Z
+    iput-boolean p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Af:Z
 
     return-void
 .end method
@@ -98,17 +98,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->zV:Lcom/discord/simpleast/core/node/Node;
+    iput-object p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Ae:Lcom/discord/simpleast/core/node/Node;
 
     iput-object p2, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->state:Ljava/lang/Object;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->zW:Z
+    iput-boolean p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Af:Z
 
     iput p3, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->startIndex:I
 
-    iput p4, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->zX:I
+    iput p4, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Ag:I
 
     return-void
 .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 d49ddd15e4..21b089ca20 100644
--- a/com.discord/smali/com/discord/simpleast/core/parser/Parser.smali
+++ b/com.discord/smali/com/discord/simpleast/core/parser/Parser.smali
@@ -432,7 +432,7 @@
 
     iget v5, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->startIndex:I
 
-    iget v6, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zX:I
+    iget v6, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ag:I
 
     if-ge v5, v6, :cond_a
 
@@ -440,7 +440,7 @@
 
     iget v5, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->startIndex:I
 
-    iget v6, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zX:I
+    iget v6, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ag:I
 
     invoke-interface {p1, v5, v6}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
 
@@ -492,9 +492,9 @@
 
     move-result-object v5
 
-    iget-object v7, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zV:Lcom/discord/simpleast/core/node/Node;
+    iget-object v7, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ae:Lcom/discord/simpleast/core/node/Node;
 
-    iget-object v8, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->zV:Lcom/discord/simpleast/core/node/Node;
+    iget-object v8, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Ae:Lcom/discord/simpleast/core/node/Node;
 
     if-eqz v8, :cond_4
 
@@ -509,15 +509,15 @@
 
     :cond_4
     :goto_3
-    iget v8, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zX:I
+    iget v8, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ag:I
 
     if-eq v3, v8, :cond_5
 
-    sget-object v8, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v8, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     iget-object v8, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->state:Ljava/lang/Object;
 
-    iget p2, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zX:I
+    iget p2, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ag:I
 
     invoke-static {v7, v8, v3, p2}, Lcom/discord/simpleast/core/parser/ParseSpec$a;->a(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;II)Lcom/discord/simpleast/core/parser/ParseSpec;
 
@@ -526,7 +526,7 @@
     invoke-virtual {v0, p2}, Ljava/util/Stack;->push(Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_5
-    iget-boolean p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->zW:Z
+    iget-boolean p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Af:Z
 
     if-nez p2, :cond_6
 
@@ -536,11 +536,11 @@
 
     iput p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->startIndex:I
 
-    iget p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->zX:I
+    iget p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Ag:I
 
     add-int/2addr p2, v6
 
-    iput p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->zX:I
+    iput p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Ag:I
 
     invoke-virtual {v0, v5}, Ljava/util/Stack;->push(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/stores/NotificationTextUtils.smali b/com.discord/smali/com/discord/stores/NotificationTextUtils.smali
index d659196f86..280e1f9472 100644
--- a/com.discord/smali/com/discord/stores/NotificationTextUtils.smali
+++ b/com.discord/smali/com/discord/stores/NotificationTextUtils.smali
@@ -656,7 +656,7 @@
     if-nez v0, :cond_8
 
     :cond_7
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v0, Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/stores/Store.smali b/com.discord/smali/com/discord/stores/Store.smali
index 89ba3e340c..3b4db58335 100644
--- a/com.discord/smali/com/discord/stores/Store.smali
+++ b/com.discord/smali/com/discord/stores/Store.smali
@@ -29,7 +29,7 @@
 
     const-string v1, "prefs"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -44,7 +44,7 @@
 
     const-string v1, "prefsSessionDurable"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$ScreenViewed.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$ScreenViewed.smali
index 83a485f2ea..e3c521086d 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$ScreenViewed.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$ScreenViewed.smali
@@ -209,7 +209,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics$ScreenViewed;->screen:Ljava/lang/Class;
 
@@ -229,15 +229,11 @@
 
     iget-wide v1, p0, Lcom/discord/stores/StoreAnalytics$ScreenViewed;->timestamp:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
 .end method
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 220016ce41..f9ff2cd001 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$ackMessage$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$ackMessage$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAnalytics$ackMessage$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 73f9717c7f..e746be36e0 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$deepLinkReceived$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$deepLinkReceived$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAnalytics$deepLinkReceived$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 71785ea4bd..b026857620 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$init$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAnalytics$init$1;->invoke(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 61f5044f14..f44e2690fc 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$init$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAnalytics$init$2;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 853b44d641..2180c2e3fe 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$init$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$init$4.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAnalytics$init$4;->invoke(Lcom/discord/stores/StoreAnalytics$ScreenViewed;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 6c20882521..f103a93cf5 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$inviteSent$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$inviteSent$1.smali
@@ -62,7 +62,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAnalytics$inviteSent$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 6c35ad6723..864e77ba5a 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$onGuildSettingsPaneViewed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$onGuildSettingsPaneViewed$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAnalytics$onGuildSettingsPaneViewed$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 166f56974b..563d571a3e 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$onOverlayVoiceEvent$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$onOverlayVoiceEvent$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAnalytics$onOverlayVoiceEvent$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 6030cd8405..849bc1c7f1 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$onScreenViewed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$onScreenViewed$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAnalytics$onScreenViewed$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -178,11 +178,11 @@
 
     move-result-object v0
 
-    :goto_0
-    const-string v1, "screenName"
+    const-string v1, "screenViewed.screen.simpleName"
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
+    :goto_0
     iget-object v1, p0, Lcom/discord/stores/StoreAnalytics$onScreenViewed$1;->$screenViewed:Lcom/discord/stores/StoreAnalytics$ScreenViewed;
 
     invoke-virtual {v1}, Lcom/discord/stores/StoreAnalytics$ScreenViewed;->getTimestamp()J
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 ebe4e11fa1..a1a48ec1ca 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$onUserSettingsPaneViewed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$onUserSettingsPaneViewed$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAnalytics$onUserSettingsPaneViewed$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$reportStreamProblem$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$reportStreamProblem$1.smali
new file mode 100644
index 0000000000..5d136559bb
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$reportStreamProblem$1.smali
@@ -0,0 +1,119 @@
+.class final Lcom/discord/stores/StoreAnalytics$reportStreamProblem$1;
+.super Lkotlin/jvm/internal/l;
+.source "StoreAnalytics.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreAnalytics;->reportStreamProblem(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $problem:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+.field final synthetic this$0:Lcom/discord/stores/StoreAnalytics;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/stores/StoreAnalytics;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreAnalytics$reportStreamProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
+
+    iput-object p2, p0, Lcom/discord/stores/StoreAnalytics$reportStreamProblem$1;->$problem:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/stores/StoreAnalytics$reportStreamProblem$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 4
+
+    iget-object v0, p0, Lcom/discord/stores/StoreAnalytics$reportStreamProblem$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;->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-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v1, p0, Lcom/discord/stores/StoreAnalytics$reportStreamProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
+
+    invoke-static {v1}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getStreamRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreStreamRtcConnection;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStreamRtcConnection;->getRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/rtcconnection/RtcConnection;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, v1, Lcom/discord/rtcconnection/RtcConnection;->mediaSessionId:Ljava/lang/String;
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    sget-object v2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+
+    iget-object v3, p0, Lcom/discord/stores/StoreAnalytics$reportStreamProblem$1;->$problem:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    invoke-virtual {v2, v3, v0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->reportStreamProblem(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;Lcom/discord/models/domain/ModelApplicationStream;Ljava/lang/String;)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 d82ea1aa78..eb0a4bee5e 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackOpenGiftAcceptModal$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackOpenGiftAcceptModal$1.smali
@@ -62,7 +62,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAnalytics$trackOpenGiftAcceptModal$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics.smali b/com.discord/smali/com/discord/stores/StoreAnalytics.smali
index 2cd09fee70..ad7a4312d2 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics.smali
@@ -57,7 +57,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreAnalytics;->hasTrackedAppUiShown:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -1356,11 +1356,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kg()Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lrx/Observable;->Ke()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JP()Lrx/Observable;
 
     move-result-object v0
 
@@ -1471,6 +1467,26 @@
     return-void
 .end method
 
+.method public final reportStreamProblem(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;)V
+    .locals 2
+
+    const-string v0, "problem"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->stores:Lcom/discord/stores/StoreStream;
+
+    new-instance v1, Lcom/discord/stores/StoreAnalytics$reportStreamProblem$1;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreAnalytics$reportStreamProblem$1;-><init>(Lcom/discord/stores/StoreAnalytics;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;)V
+
+    check-cast v1, Lkotlin/jvm/functions/Function0;
+
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream;->schedule(Lkotlin/jvm/functions/Function0;)V
+
+    return-void
+.end method
+
 .method public final trackOpenGiftAcceptModal(Ljava/lang/String;Ljava/lang/String;J)V
     .locals 8
 
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 537ad74a62..b6314bb0e8 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplication$fetchIfNonexisting$1$1;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 0c460531df..77f26137c1 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplication$fetchIfNonexisting$1$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 a75e848ad2..3375420c26 100644
--- a/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreApplication$fetchIfNonexisting$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplication.smali b/com.discord/smali/com/discord/stores/StoreApplication.smali
index c3a7b61e48..12f9a4d58e 100644
--- a/com.discord/smali/com/discord/stores/StoreApplication.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplication.smali
@@ -309,7 +309,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationNews$fetchIfNonexisting$1$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationNews$fetchIfNonexisting$1$1.smali
index 3726e7de64..5d81fb6cba 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationNews$fetchIfNonexisting$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationNews$fetchIfNonexisting$1$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationNews$fetchIfNonexisting$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationNews$fetchIfNonexisting$2$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationNews$fetchIfNonexisting$2$1.smali
index fa6c034795..1ea061c1f0 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationNews$fetchIfNonexisting$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationNews$fetchIfNonexisting$2$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationNews$fetchIfNonexisting$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationNews$requestFetch$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationNews$requestFetch$1.smali
index 3806e42715..ac2d552158 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationNews$requestFetch$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationNews$requestFetch$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationNews$requestFetch$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 88850d906a..b78c30fb56 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 e69044173b..e1610cf907 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 a2ab8e9b59..e958357325 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$2;->invoke(Lcom/discord/models/domain/ModelApplicationStreamPreview;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 46905cb20b..59b62e7406 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$3$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 01d5239222..8b771fb6d0 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$3;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 58902fb5cb..8b03c05cf7 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions.smali
@@ -52,7 +52,7 @@
 
     const-string v0, "store"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -67,7 +67,7 @@
 
     const-string v0, "stream"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -102,7 +102,7 @@
 
     const-string v1, "stream"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v1, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$1;
@@ -127,7 +127,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v1
 
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 c130e0fea6..fc70b48467 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved.smali
@@ -157,7 +157,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved;->url:Ljava/lang/String;
 
@@ -177,15 +177,11 @@
 
     iget-wide v1, p0, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved;->expires:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews.smali
index 95cd1e0568..865eb3b242 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews.smali
@@ -183,7 +183,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$Actions$stopWatchingStream$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$Actions$stopWatchingStream$1.smali
new file mode 100644
index 0000000000..1c4c7c3200
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$Actions$stopWatchingStream$1.smali
@@ -0,0 +1,72 @@
+.class final Lcom/discord/stores/StoreApplicationStreaming$Actions$stopWatchingStream$1;
+.super Lkotlin/jvm/internal/l;
+.source "StoreApplicationStreaming.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreApplicationStreaming$Actions;->stopWatchingStream(Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $streamKey:Ljava/lang/String;
+
+
+# direct methods
+.method constructor <init>(Ljava/lang/String;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$Actions$stopWatchingStream$1;->$streamKey:Ljava/lang/String;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming$Actions$stopWatchingStream$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 2
+
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$Actions;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$Actions;
+
+    invoke-static {v0}, Lcom/discord/stores/StoreApplicationStreaming$Actions;->access$getStoreStream$p(Lcom/discord/stores/StoreApplicationStreaming$Actions;)Lcom/discord/stores/StoreStream;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming$Actions$stopWatchingStream$1;->$streamKey:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream;->streamDelete(Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$Actions$targetStream$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$Actions$targetStream$1.smali
new file mode 100644
index 0000000000..c405fcb90b
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$Actions$targetStream$1.smali
@@ -0,0 +1,72 @@
+.class final Lcom/discord/stores/StoreApplicationStreaming$Actions$targetStream$1;
+.super Lkotlin/jvm/internal/l;
+.source "StoreApplicationStreaming.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreApplicationStreaming$Actions;->targetStream(Lcom/discord/models/domain/ModelApplicationStream;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/models/domain/ModelApplicationStream;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$Actions$targetStream$1;->$stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming$Actions$targetStream$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 2
+
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$Actions;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$Actions;
+
+    invoke-static {v0}, Lcom/discord/stores/StoreApplicationStreaming$Actions;->access$getStore$p(Lcom/discord/stores/StoreApplicationStreaming$Actions;)Lcom/discord/stores/StoreApplicationStreaming;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming$Actions$targetStream$1;->$stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreApplicationStreaming;->handleStreamTargeted(Lcom/discord/models/domain/ModelApplicationStream;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$Actions.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$Actions.smali
new file mode 100644
index 0000000000..a1403b31c6
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$Actions.smali
@@ -0,0 +1,164 @@
+.class public final Lcom/discord/stores/StoreApplicationStreaming$Actions;
+.super Ljava/lang/Object;
+.source "StoreApplicationStreaming.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/stores/StoreApplicationStreaming;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Actions"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$Actions;
+
+.field private static store:Lcom/discord/stores/StoreApplicationStreaming;
+
+.field private static storeStream:Lcom/discord/stores/StoreStream;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$Actions;
+
+    invoke-direct {v0}, Lcom/discord/stores/StoreApplicationStreaming$Actions;-><init>()V
+
+    sput-object v0, Lcom/discord/stores/StoreApplicationStreaming$Actions;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$Actions;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$getStore$p(Lcom/discord/stores/StoreApplicationStreaming$Actions;)Lcom/discord/stores/StoreApplicationStreaming;
+    .locals 1
+
+    sget-object p0, Lcom/discord/stores/StoreApplicationStreaming$Actions;->store:Lcom/discord/stores/StoreApplicationStreaming;
+
+    if-nez p0, :cond_0
+
+    const-string v0, "store"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static final synthetic access$getStoreStream$p(Lcom/discord/stores/StoreApplicationStreaming$Actions;)Lcom/discord/stores/StoreStream;
+    .locals 1
+
+    sget-object p0, Lcom/discord/stores/StoreApplicationStreaming$Actions;->storeStream:Lcom/discord/stores/StoreStream;
+
+    if-nez p0, :cond_0
+
+    const-string v0, "storeStream"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static final synthetic access$setStore$p(Lcom/discord/stores/StoreApplicationStreaming$Actions;Lcom/discord/stores/StoreApplicationStreaming;)V
+    .locals 0
+
+    sput-object p1, Lcom/discord/stores/StoreApplicationStreaming$Actions;->store:Lcom/discord/stores/StoreApplicationStreaming;
+
+    return-void
+.end method
+
+.method public static final synthetic access$setStoreStream$p(Lcom/discord/stores/StoreApplicationStreaming$Actions;Lcom/discord/stores/StoreStream;)V
+    .locals 0
+
+    sput-object p1, Lcom/discord/stores/StoreApplicationStreaming$Actions;->storeStream:Lcom/discord/stores/StoreStream;
+
+    return-void
+.end method
+
+.method public static final stopWatchingStream(Ljava/lang/String;)V
+    .locals 2
+
+    const-string v0, "streamKey"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$Actions;->storeStream:Lcom/discord/stores/StoreStream;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "storeStream"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$Actions$stopWatchingStream$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/stores/StoreApplicationStreaming$Actions$stopWatchingStream$1;-><init>(Ljava/lang/String;)V
+
+    check-cast v1, Lkotlin/jvm/functions/Function0;
+
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream;->schedule(Lkotlin/jvm/functions/Function0;)V
+
+    return-void
+.end method
+
+.method public static final targetStream(Lcom/discord/models/domain/ModelApplicationStream;)V
+    .locals 2
+
+    const-string v0, "stream"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$Actions;->storeStream:Lcom/discord/stores/StoreStream;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "storeStream"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$Actions$targetStream$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/stores/StoreApplicationStreaming$Actions$targetStream$1;-><init>(Lcom/discord/models/domain/ModelApplicationStream;)V
+
+    check-cast v1, Lkotlin/jvm/functions/Function0;
+
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream;->schedule(Lkotlin/jvm/functions/Function0;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final init(Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreStream;)V
+    .locals 1
+
+    const-string v0, "store"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeStream"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sput-object p1, Lcom/discord/stores/StoreApplicationStreaming$Actions;->store:Lcom/discord/stores/StoreApplicationStreaming;
+
+    sput-object p2, Lcom/discord/stores/StoreApplicationStreaming$Actions;->storeStream:Lcom/discord/stores/StoreStream;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State.smali
new file mode 100644
index 0000000000..4d506a9868
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State.smali
@@ -0,0 +1,179 @@
+.class public final enum Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+.super Ljava/lang/Enum;
+.source "StoreApplicationStreaming.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "State"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final synthetic $VALUES:[Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+.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 enum DENIED_FULL:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+.field public static final enum EJECTED: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 static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x7
+
+    new-array v0, v0, [Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    const/4 v2, 0x0
+
+    const-string v3, "CONNECTING"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->CONNECTING:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    const/4 v2, 0x1
+
+    const-string v3, "ACTIVE"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ACTIVE:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    const/4 v2, 0x2
+
+    const-string v3, "RECONNECTING"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->RECONNECTING:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    const/4 v2, 0x3
+
+    const-string v3, "ENDED"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ENDED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    const/4 v2, 0x4
+
+    const-string v3, "PAUSED"
+
+    invoke-direct {v1, v3, v2}, 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, v2
+
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    const/4 v2, 0x5
+
+    const-string v3, "EJECTED"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->EJECTED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    const/4 v2, 0x6
+
+    const-string v3, "DENIED_FULL"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->DENIED_FULL:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->$VALUES:[Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    return-void
+.end method
+
+.method private 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/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+    .locals 1
+
+    const-class v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$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/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+    .locals 1
+
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->$VALUES:[Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-virtual {v0}, [Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream.smali
new file mode 100644
index 0000000000..c052726820
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream.smali
@@ -0,0 +1,236 @@
+.class public final Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+.super Ljava/lang/Object;
+.source "StoreApplicationStreaming.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/stores/StoreApplicationStreaming;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ActiveApplicationStream"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+    }
+.end annotation
+
+
+# instance fields
+.field private final state:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+.field private final stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;)V
+    .locals 1
+
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "stream"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->state:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    iput-object p2, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    return-void
+.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;
+    .locals 0
+
+    and-int/lit8 p4, p3, 0x1
+
+    if-eqz p4, :cond_0
+
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->state:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    :cond_0
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_1
+
+    iget-object p2, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    :cond_1
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->copy(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->state:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    return-object v0
+.end method
+
+.method public final component2()Lcom/discord/models/domain/ModelApplicationStream;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+    .locals 1
+
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "stream"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->state:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    iget-object v1, p1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->state:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    iget-object p1, p1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->state:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    return-object v0
+.end method
+
+.method public final getStream()Lcom/discord/models/domain/ModelApplicationStream;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->state:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$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/StoreApplicationStreaming$ActiveApplicationStream;->stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    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 final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "ActiveApplicationStream(state="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->state:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", stream="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->stream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$RtcStream.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$RtcStream.smali
new file mode 100644
index 0000000000..1611ad7895
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$RtcStream.smali
@@ -0,0 +1,202 @@
+.class public final Lcom/discord/stores/StoreApplicationStreaming$RtcStream;
+.super Ljava/lang/Object;
+.source "StoreApplicationStreaming.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/stores/StoreApplicationStreaming;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "RtcStream"
+.end annotation
+
+
+# instance fields
+.field private final viewerIds:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .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/Long;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "viewerIds"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;->viewerIds:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/stores/StoreApplicationStreaming$RtcStream;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/stores/StoreApplicationStreaming$RtcStream;
+    .locals 0
+
+    and-int/lit8 p2, p2, 0x1
+
+    if-eqz p2, :cond_0
+
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;->viewerIds:Ljava/util/List;
+
+    :cond_0
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;->copy(Ljava/util/List;)Lcom/discord/stores/StoreApplicationStreaming$RtcStream;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;->viewerIds:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/util/List;)Lcom/discord/stores/StoreApplicationStreaming$RtcStream;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Ljava/lang/Long;",
+            ">;)",
+            "Lcom/discord/stores/StoreApplicationStreaming$RtcStream;"
+        }
+    .end annotation
+
+    const-string v0, "viewerIds"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;
+
+    invoke-direct {v0, p1}, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;-><init>(Ljava/util/List;)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;->viewerIds:Ljava/util/List;
+
+    iget-object p1, p1, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;->viewerIds:Ljava/util/List;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getViewerIds()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/stores/StoreApplicationStreaming$RtcStream;->viewerIds:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;->viewerIds:Ljava/util/List;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "RtcStream(viewerIds="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;->viewerIds:Ljava/util/List;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$State.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$State.smali
new file mode 100644
index 0000000000..b615b37783
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$State.smali
@@ -0,0 +1,378 @@
+.class public final Lcom/discord/stores/StoreApplicationStreaming$State;
+.super Ljava/lang/Object;
+.source "StoreApplicationStreaming.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/stores/StoreApplicationStreaming;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "State"
+.end annotation
+
+
+# instance fields
+.field private final activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+.field private final rtcStreams:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Lcom/discord/stores/StoreApplicationStreaming$RtcStream;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final streamsByUser:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelApplicationStream;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelApplicationStream;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Lcom/discord/stores/StoreApplicationStreaming$RtcStream;",
+            ">;",
+            "Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "streamsByUser"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rtcStreams"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->streamsByUser:Ljava/util/Map;
+
+    iput-object p2, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->rtcStreams:Ljava/util/Map;
+
+    iput-object p3, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    return-void
+.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;
+    .locals 0
+
+    and-int/lit8 p5, p4, 0x1
+
+    if-eqz p5, :cond_0
+
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->streamsByUser:Ljava/util/Map;
+
+    :cond_0
+    and-int/lit8 p5, p4, 0x2
+
+    if-eqz p5, :cond_1
+
+    iget-object p2, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->rtcStreams:Ljava/util/Map;
+
+    :cond_1
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_2
+
+    iget-object p3, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    :cond_2
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/stores/StoreApplicationStreaming$State;->copy(Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelApplicationStream;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->streamsByUser:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Lcom/discord/stores/StoreApplicationStreaming$RtcStream;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->rtcStreams:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final component3()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)Lcom/discord/stores/StoreApplicationStreaming$State;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelApplicationStream;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Lcom/discord/stores/StoreApplicationStreaming$RtcStream;",
+            ">;",
+            "Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;",
+            ")",
+            "Lcom/discord/stores/StoreApplicationStreaming$State;"
+        }
+    .end annotation
+
+    const-string v0, "streamsByUser"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rtcStreams"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->streamsByUser:Ljava/util/Map;
+
+    iget-object v1, p1, Lcom/discord/stores/StoreApplicationStreaming$State;->streamsByUser:Ljava/util/Map;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->rtcStreams:Ljava/util/Map;
+
+    iget-object v1, p1, Lcom/discord/stores/StoreApplicationStreaming$State;->rtcStreams:Ljava/util/Map;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    iget-object p1, p1, Lcom/discord/stores/StoreApplicationStreaming$State;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getActiveApplicationStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    return-object v0
+.end method
+
+.method public final getRtcStreams()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Lcom/discord/stores/StoreApplicationStreaming$RtcStream;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->rtcStreams:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final getStreamsByUser()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelApplicationStream;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->streamsByUser:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->streamsByUser:Ljava/util/Map;
+
+    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/StoreApplicationStreaming$State;->rtcStreams:Ljava/util/Map;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    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 final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "State(streamsByUser="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->streamsByUser:Ljava/util/Map;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", rtcStreams="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->rtcStreams:Ljava/util/Map;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", activeApplicationStream="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getActiveStream$1.smali
similarity index 52%
rename from com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1.smali
rename to com.discord/smali/com/discord/stores/StoreApplicationStreaming$getActiveStream$1.smali
index 23cdfc03a6..1c199629f8 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getActiveStream$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;
+.class final Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;
 .super Ljava/lang/Object;
 .source "StoreApplicationStreaming.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperimentObservable()Lrx/Observable;
+    value = Lcom/discord/stores/StoreApplicationStreaming;->getActiveStream()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,18 +31,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;
+.field public static final INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;
+    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;
 
-    invoke-direct {v0}, Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;-><init>()V
 
-    sput-object v0, Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;
+    sput-object v0, Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;
 
     return-void
 .end method
@@ -57,32 +57,24 @@
 
 
 # virtual methods
-.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Lcom/discord/stores/StoreApplicationStreaming$State;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;->call(Lcom/discord/models/domain/ModelUser;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreaming$State;->getActiveApplicationStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/models/domain/ModelUser;)Z
-    .locals 1
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    const-string v0, "me"
+    check-cast p1, Lcom/discord/stores/StoreApplicationStreaming$State;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;->call(Lcom/discord/stores/StoreApplicationStreaming$State;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+    move-result-object p1
 
-    move-result p1
-
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreams$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreams$1.smali
new file mode 100644
index 0000000000..0fd5c3a6b8
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreams$1.smali
@@ -0,0 +1,91 @@
+.class final Lcom/discord/stores/StoreApplicationStreaming$getStreams$1;
+.super Ljava/lang/Object;
+.source "StoreApplicationStreaming.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreApplicationStreaming;->getStreams()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;TR;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getStreams$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$getStreams$1;
+
+    invoke-direct {v0}, Lcom/discord/stores/StoreApplicationStreaming$getStreams$1;-><init>()V
+
+    sput-object v0, Lcom/discord/stores/StoreApplicationStreaming$getStreams$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getStreams$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getStreams$1;->call(Lcom/discord/stores/StoreApplicationStreaming$State;)Ljava/util/Map;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lcom/discord/stores/StoreApplicationStreaming$State;)Ljava/util/Map;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/stores/StoreApplicationStreaming$State;",
+            ")",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelApplicationStream;",
+            ">;"
+        }
+    .end annotation
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreaming$State;->getStreamsByUser()Ljava/util/Map;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1.smali
new file mode 100644
index 0000000000..cd9fd4556f
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1.smali
@@ -0,0 +1,91 @@
+.class final Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1;
+.super Ljava/lang/Object;
+.source "StoreApplicationStreaming.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;TR;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1;
+
+    invoke-direct {v0}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1;-><init>()V
+
+    sput-object v0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1;->call(Lcom/discord/stores/StoreApplicationStreaming$State;)Ljava/util/Map;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lcom/discord/stores/StoreApplicationStreaming$State;)Ljava/util/Map;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/stores/StoreApplicationStreaming$State;",
+            ")",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelApplicationStream;",
+            ">;"
+        }
+    .end annotation
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreaming$State;->getStreamsByUser()Ljava/util/Map;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForGuild$1$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$2.smali
similarity index 85%
rename from com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForGuild$1$1.smali
rename to com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$2.smali
index 7b530990cc..abb17678bd 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForGuild$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$2.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1$1;
+.class final Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$2;
 .super Ljava/lang/Object;
 .source "StoreApplicationStreaming.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
+    value = Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,14 +31,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;
+.field final synthetic this$0:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;)V
+.method constructor <init>(Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$2;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,7 +52,7 @@
 
     check-cast p1, Ljava/util/Map;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1$1;->call(Ljava/util/Map;)Ljava/util/Map;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$2;->call(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object p1
 
@@ -117,9 +117,9 @@
 
     move-result-wide v2
 
-    iget-object v4, p0, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;
+    iget-object v4, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$2;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;
 
-    iget-wide v4, v4, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;->$guildId:J
+    iget-wide v4, v4, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;->$guildId:J
 
     cmp-long v6, v2, v4
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForGuild$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1.smali
similarity index 71%
rename from com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForGuild$1.smali
rename to com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1.smali
index 3477ab8f03..c50f0b89cd 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForGuild$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;
+.class final Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;
 .super Ljava/lang/Object;
 .source "StoreApplicationStreaming.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreApplicationStreaming;->getForGuild(J)Lrx/Observable;
+    value = Lcom/discord/stores/StoreApplicationStreaming;->getStreamsForGuild(J)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -42,9 +42,9 @@
 .method constructor <init>(Lcom/discord/stores/StoreApplicationStreaming;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
 
-    iput-wide p2, p0, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;->$guildId:J
+    iput-wide p2, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;->$guildId:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
 
     check-cast p1, Ljava/lang/Boolean;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
 
     move-result-object p1
 
@@ -90,15 +90,13 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
 
-    invoke-static {p1}, Lcom/discord/stores/StoreApplicationStreaming;->access$getStreamsPublisher$p(Lcom/discord/stores/StoreApplicationStreaming;)Lrx/subjects/BehaviorSubject;
+    invoke-static {p1}, Lcom/discord/stores/StoreApplicationStreaming;->access$getStateSubject$p(Lcom/discord/stores/StoreApplicationStreaming;)Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1$1;
-
-    invoke-direct {v0, p0}, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;)V
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1;
 
     check-cast v0, Lrx/functions/b;
 
@@ -106,7 +104,17 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$2;
+
+    invoke-direct {v0, p0}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$2;-><init>(Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;)V
+
+    check-cast v0, Lrx/functions/b;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1.smali
new file mode 100644
index 0000000000..5fb2828145
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1.smali
@@ -0,0 +1,91 @@
+.class final Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1;
+.super Ljava/lang/Object;
+.source "StoreApplicationStreaming.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;TR;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1;
+
+    invoke-direct {v0}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1;-><init>()V
+
+    sput-object v0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1;->call(Lcom/discord/stores/StoreApplicationStreaming$State;)Ljava/util/Map;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lcom/discord/stores/StoreApplicationStreaming$State;)Ljava/util/Map;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/stores/StoreApplicationStreaming$State;",
+            ")",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelApplicationStream;",
+            ">;"
+        }
+    .end annotation
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreaming$State;->getStreamsByUser()Ljava/util/Map;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForUser$1$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2.smali
similarity index 76%
rename from com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForUser$1$1.smali
rename to com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2.smali
index 1668277307..0cf0083aec 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForUser$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreApplicationStreaming$getForUser$1$1;
+.class final Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2;
 .super Ljava/lang/Object;
 .source "StoreApplicationStreaming.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
+    value = Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,14 +31,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;
+.field final synthetic this$0:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;)V
+.method constructor <init>(Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,9 +60,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;
 
-    iget-wide v0, v0, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;->$userId:J
+    iget-wide v0, v0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;->$userId:J
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -82,7 +82,7 @@
 
     check-cast p1, Ljava/util/Map;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1$1;->call(Ljava/util/Map;)Lcom/discord/models/domain/ModelApplicationStream;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2;->call(Ljava/util/Map;)Lcom/discord/models/domain/ModelApplicationStream;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForUser$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1.smali
similarity index 71%
rename from com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForUser$1.smali
rename to com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1.smali
index de5b1d33c0..03ab4f270b 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForUser$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;
+.class final Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;
 .super Ljava/lang/Object;
 .source "StoreApplicationStreaming.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreApplicationStreaming;->getForUser(J)Lrx/Observable;
+    value = Lcom/discord/stores/StoreApplicationStreaming;->getStreamsForUser(J)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -42,9 +42,9 @@
 .method constructor <init>(Lcom/discord/stores/StoreApplicationStreaming;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
 
-    iput-wide p2, p0, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;->$userId:J
+    iput-wide p2, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;->$userId:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
 
     check-cast p1, Ljava/lang/Boolean;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
 
     move-result-object p1
 
@@ -89,15 +89,13 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
 
-    invoke-static {p1}, Lcom/discord/stores/StoreApplicationStreaming;->access$getStreamsPublisher$p(Lcom/discord/stores/StoreApplicationStreaming;)Lrx/subjects/BehaviorSubject;
+    invoke-static {p1}, Lcom/discord/stores/StoreApplicationStreaming;->access$getStateSubject$p(Lcom/discord/stores/StoreApplicationStreaming;)Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1$1;
-
-    invoke-direct {v0, p0}, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;)V
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1;
 
     check-cast v0, Lrx/functions/b;
 
@@ -105,7 +103,17 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2;
+
+    invoke-direct {v0, p0}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2;-><init>(Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;)V
+
+    check-cast v0, Lrx/functions/b;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali
index 63373c5ef6..bda713314f 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali
@@ -6,9 +6,45 @@
 .implements Lcom/discord/stores/DispatchHandler;
 
 
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/stores/StoreApplicationStreaming$State;,
+        Lcom/discord/stores/StoreApplicationStreaming$RtcStream;,
+        Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;,
+        Lcom/discord/stores/StoreApplicationStreaming$Actions;
+    }
+.end annotation
+
+
 # instance fields
+.field private activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
 .field private isDirty:Z
 
+.field private final rtcStreams:Ljava/util/HashMap;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/HashMap<",
+            "Ljava/lang/String;",
+            "Lcom/discord/stores/StoreApplicationStreaming$RtcStream;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final stateSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Lcom/discord/stores/StoreApplicationStreaming$State;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final storeStream:Lcom/discord/stores/StoreStream;
+
 .field private final streamsByUser:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -20,33 +56,37 @@
     .end annotation
 .end field
 
-.field private final streamsPublisher:Lrx/subjects/BehaviorSubject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/BehaviorSubject<",
-            "Ljava/util/Map<",
-            "Ljava/lang/Long;",
-            "Lcom/discord/models/domain/ModelApplicationStream;",
-            ">;>;"
-        }
-    .end annotation
-.end field
+.field private targetStream:Lcom/discord/models/domain/ModelApplicationStream;
 
 .field private final userStore:Lcom/discord/stores/StoreUser;
 
+.field private final voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
+
 
 # direct methods
-.method public constructor <init>(Lcom/discord/stores/StoreUser;)V
+.method public constructor <init>(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreStream;)V
     .locals 1
 
     const-string v0, "userStore"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "voiceChannelSelectedStore"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeStream"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->userStore:Lcom/discord/stores/StoreUser;
 
+    iput-object p2, p0, Lcom/discord/stores/StoreApplicationStreaming;->voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
+
+    iput-object p3, p0, Lcom/discord/stores/StoreApplicationStreaming;->storeStream:Lcom/discord/stores/StoreStream;
+
     new-instance p1, Ljava/util/HashMap;
 
     invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
@@ -57,27 +97,126 @@
 
     invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
 
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->rtcStreams:Ljava/util/HashMap;
+
+    new-instance p1, Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
+
+    move-result-object p2
+
+    invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
+
+    move-result-object p3
+
+    const/4 v0, 0x0
+
+    invoke-direct {p1, p2, p3, v0}, Lcom/discord/stores/StoreApplicationStreaming$State;-><init>(Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)V
+
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
-    const-string v0, "BehaviorSubject.create(HashMap())"
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->stateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    sget-object p1, Lcom/discord/stores/StoreApplicationStreaming$Actions;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$Actions;
 
-    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsPublisher:Lrx/subjects/BehaviorSubject;
+    iget-object p2, p0, Lcom/discord/stores/StoreApplicationStreaming;->storeStream:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {p1, p0, p2}, Lcom/discord/stores/StoreApplicationStreaming$Actions;->init(Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreStream;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$getStreamsPublisher$p(Lcom/discord/stores/StoreApplicationStreaming;)Lrx/subjects/BehaviorSubject;
+.method public static final synthetic access$getStateSubject$p(Lcom/discord/stores/StoreApplicationStreaming;)Lrx/subjects/BehaviorSubject;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsPublisher:Lrx/subjects/BehaviorSubject;
+    iget-object p0, p0, Lcom/discord/stores/StoreApplicationStreaming;->stateSubject:Lrx/subjects/BehaviorSubject;
 
     return-object p0
 .end method
 
+.method private final handleStreamCreateOrUpdate(Ljava/lang/String;ZLjava/util/List;)V
+    .locals 2
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Z",
+            "Ljava/util/List<",
+            "Ljava/lang/Long;",
+            ">;)V"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "handleStreamCreateOrUpdate: "
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, " -- viewerIds count: "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-interface {p3}, Ljava/util/List;->size()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
+
+    const-string v1, "findme"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    if-eqz p2, :cond_0
+
+    sget-object p2, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->PAUSED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    goto :goto_0
+
+    :cond_0
+    sget-object p2, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ACTIVE:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    :goto_0
+    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 v1
+
+    invoke-direct {v0, p2, v1}, 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;
+
+    iget-object p2, p0, Lcom/discord/stores/StoreApplicationStreaming;->rtcStreams:Ljava/util/HashMap;
+
+    check-cast p2, Ljava/util/Map;
+
+    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;
+
+    invoke-direct {v0, p3}, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;-><init>(Ljava/util/List;)V
+
+    invoke-interface {p2, 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/StoreApplicationStreaming;->isDirty:Z
+
+    return-void
+.end method
+
 .method public static synthetic handleVoiceStateUpdate$default(Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/models/domain/ModelVoice$State;JILjava/lang/Object;)V
     .locals 0
 
@@ -95,10 +234,110 @@
     return-void
 .end method
 
+.method private final isInSpectatorExperiment()Z
+    .locals 1
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreExperiments;->isExperimentalAlpha()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method private final isInSpectatorExperimentObservable()Lrx/Observable;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreExperiments;->getExperimentalAlpha()Lrx/Observable;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 
 # virtual methods
-.method public final get()Lrx/Observable;
+.method public final getActiveApplicationStream$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
     .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    return-object v0
+.end method
+
+.method public final getActiveStream()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->stateSubject:Lrx/subjects/BehaviorSubject;
+
+    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "stateSubject\n      .map \u2026activeApplicationStream }"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public final getState()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/stores/StoreApplicationStreaming$State;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->stateSubject:Lrx/subjects/BehaviorSubject;
+
+    const-string v1, "stateSubject"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lrx/Observable;
+
+    return-object v0
+.end method
+
+.method public final getStreams()Lrx/Observable;
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -110,14 +349,24 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsPublisher:Lrx/subjects/BehaviorSubject;
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->stateSubject:Lrx/subjects/BehaviorSubject;
 
-    check-cast v0, Lrx/Observable;
+    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$getStreams$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getStreams$1;
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "stateSubject.map { it.streamsByUser }"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
 
-.method public final getForGuild(J)Lrx/Observable;
+.method public final getStreamsForGuild(J)Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -130,13 +379,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperimentObservable()Lrx/Observable;
+    invoke-direct {p0}, Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperimentObservable()Lrx/Observable;
 
     move-result-object v0
 
-    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;
 
-    invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming;J)V
+    invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming;J)V
 
     check-cast v1, Lrx/functions/b;
 
@@ -151,7 +400,7 @@
     return-object p1
 .end method
 
-.method public final getForUser(J)Lrx/Observable;
+.method public final getStreamsForUser(J)Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -162,13 +411,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperimentObservable()Lrx/Observable;
+    invoke-direct {p0}, Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperimentObservable()Lrx/Observable;
 
     move-result-object v0
 
-    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;
 
-    invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming;J)V
+    invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming;J)V
 
     check-cast v1, Lrx/functions/b;
 
@@ -272,6 +521,350 @@
     return-void
 .end method
 
+.method public final handleStreamCreate(Lcom/discord/models/domain/StreamCreate;)V
+    .locals 2
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "streamCreate"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamCreate;->getStreamKey()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamCreate;->getPaused()Z
+
+    move-result v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamCreate;->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 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}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "stream delete: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "app_stream_store"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->rtcStreams: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
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    if-nez v0, :cond_2
+
+    :cond_1
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    :cond_2
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_3
+
+    sget-object v3, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
+
+    invoke-virtual {v3, v0}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->encodeStreamKey(Lcom/discord/models/domain/ModelApplicationStream;)Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_3
+    move-object v0, v1
+
+    :goto_0
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getStreamKey()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-static {v0, v3}, Lkotlin/jvm/internal/k;->n(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 p1
+
+    const/4 v0, 0x2
+
+    if-eqz p1, :cond_4
+
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    if-eqz p1, :cond_5
+
+    sget-object v3, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->RECONNECTING:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-static {p1, v3, 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 v1
+
+    goto :goto_1
+
+    :cond_4
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    if-eqz p1, :cond_5
+
+    sget-object v3, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ENDED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-static {p1, v3, 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 v1
+
+    :cond_5
+    :goto_1
+    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(Lcom/discord/models/domain/ModelApplicationStream;)V
+    .locals 5
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "stream"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    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 v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+
+    move-result-wide v2
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->storeStream:Lcom/discord/stores/StoreStream;
+
+    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;->encodeStreamKey(Lcom/discord/models/domain/ModelApplicationStream;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStream;->streamWatch(Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    return-void
+
+    :cond_0
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    return-void
+.end method
+
+.method public final handleStreamUpdate(Lcom/discord/models/domain/StreamUpdate;)V
+    .locals 2
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "streamUpdate"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamUpdate;->getStreamKey()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamUpdate;->getPaused()Z
+
+    move-result v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamUpdate;->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}, Lkotlin/jvm/internal/k;->h(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
+    .locals 4
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+
+    move-result-wide v2
+
+    cmp-long v0, p1, v2
+
+    if-nez v0, :cond_1
+
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->storeStream:Lcom/discord/stores/StoreStream;
+
+    sget-object p2, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    if-nez v0, :cond_0
+
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
+
+    :cond_0
+    invoke-virtual {p2, v0}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->encodeStreamKey(Lcom/discord/models/domain/ModelApplicationStream;)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Lcom/discord/stores/StoreStream;->streamWatch(Ljava/lang/String;)V
+
+    iput-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    return-void
+
+    :cond_1
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+
+    move-result-wide v2
+
+    cmp-long v0, v2, p1
+
+    if-eqz v0, :cond_3
+
+    :cond_2
+    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;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
+
+    :cond_3
+    return-void
+.end method
+
 .method public final handleVoiceStateUpdate(Lcom/discord/models/domain/ModelVoice$State;)V
     .locals 6
     .annotation runtime Lcom/discord/stores/StoreThread;
@@ -293,53 +886,57 @@
 .end method
 
 .method public final handleVoiceStateUpdate(Lcom/discord/models/domain/ModelVoice$State;J)V
-    .locals 11
+    .locals 18
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const-string v0, "voiceState"
+    move-object/from16 v0, p0
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v1, "voiceState"
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
+    move-object/from16 v2, p1
 
-    move-result-object v0
+    invoke-static {v2, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->getUserId()J
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
 
-    move-result-wide v2
+    move-result-object v1
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfStream()Z
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelVoice$State;->getUserId()J
 
-    move-result p1
+    move-result-wide v11
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfStream()Z
+
+    move-result v3
 
     const-wide/16 v4, 0x0
 
-    const/4 v1, 0x0
+    const/4 v6, 0x0
 
-    const/4 v8, 0x1
+    const/4 v13, 0x1
 
-    cmp-long v6, p2, v4
+    cmp-long v7, p2, v4
 
-    if-eqz v6, :cond_0
+    if-eqz v7, :cond_0
 
-    const/4 v6, 0x1
+    const/4 v7, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v6, 0x0
+    const/4 v7, 0x0
 
     :goto_0
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v9
+    move-result-wide v8
 
-    cmp-long v7, v9, v4
+    cmp-long v10, v8, v4
 
-    if-eqz v7, :cond_1
+    if-eqz v10, :cond_1
 
     const/4 v4, 0x1
 
@@ -349,144 +946,166 @@
     const/4 v4, 0x0
 
     :goto_1
-    if-eqz p1, :cond_2
+    if-eqz v3, :cond_3
 
-    if-eqz v6, :cond_2
+    if-eqz v7, :cond_3
 
-    if-eqz v4, :cond_2
+    if-eqz v4, :cond_3
 
-    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
+    iget-object v3, v0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
 
-    check-cast p1, Ljava/util/Map;
+    move-object v14, v3
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    check-cast v14, Ljava/util/Map;
 
-    move-result-object v9
+    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    new-instance v10, Lcom/discord/models/domain/ModelApplicationStream;
+    move-result-object v15
 
-    const-string v1, "channelId"
+    new-instance v9, Lcom/discord/models/domain/ModelApplicationStream;
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v3, "channelId"
 
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-wide v6
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    move-object v1, v10
+    move-result-wide v16
 
-    move-wide v4, p2
+    const-string v4, "guild"
 
-    invoke-direct/range {v1 .. v7}, Lcom/discord/models/domain/ModelApplicationStream;-><init>(JJJ)V
+    move-object v3, v9
 
-    invoke-interface {p1, v9, v10}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    move-wide v5, v11
 
-    goto :goto_3
+    move-wide/from16 v7, p2
+
+    move-object v1, v9
+
+    move-wide/from16 v9, v16
+
+    invoke-direct/range {v3 .. v10}, Lcom/discord/models/domain/ModelApplicationStream;-><init>(Ljava/lang/String;JJJ)V
+
+    invoke-interface {v14, v15, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_2
-    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
+    :goto_2
+    const/4 v6, 0x1
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_3
-
-    const/4 p1, 0x1
-
-    goto :goto_2
+    goto :goto_4
 
     :cond_3
-    const/4 p1, 0x0
+    iget-object v1, v0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
 
-    :goto_2
-    iget-boolean p2, p0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
+    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    if-nez p2, :cond_5
+    move-result-object v3
 
-    if-eqz p1, :cond_4
+    invoke-virtual {v1, v3}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_4
+
+    const/4 v1, 0x1
 
     goto :goto_3
 
     :cond_4
-    const/4 v8, 0x0
+    const/4 v1, 0x0
+
+    :goto_3
+    iget-boolean v3, v0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
+
+    if-nez v3, :cond_2
+
+    if-eqz v1, :cond_5
+
+    goto :goto_2
 
     :cond_5
-    :goto_3
-    iput-boolean v8, p0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
+    :goto_4
+    iput-boolean v6, v0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
 
+    iget-object v1, v0, Lcom/discord/stores/StoreApplicationStreaming;->userStore:Lcom/discord/stores/StoreUser;
+
+    iget-object v1, v1, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
+
+    if-eqz v1, :cond_8
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser$Me;->getId()J
+
+    move-result-wide v3
+
+    cmp-long v1, v11, v3
+
+    if-nez v1, :cond_8
+
+    iget-object v1, v0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    const/4 v3, 0x0
+
+    if-eqz v1, :cond_6
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_6
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+
+    move-result-wide v4
+
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    goto :goto_5
+
+    :cond_6
+    move-object v1, v3
+
+    :goto_5
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    xor-int/2addr v1, v13
+
+    if-eqz v1, :cond_8
+
+    iget-object v1, v0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    if-eqz v1, :cond_7
+
+    sget-object v2, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->EJECTED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    const/4 v4, 0x2
+
+    invoke-static {v1, v2, v3, v4, v3}, 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 v3
+
+    :cond_7
+    iput-object v3, v0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    iput-boolean v13, v0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
+
+    :cond_8
     return-void
 .end method
 
-.method public final isInSpectatorExperiment()Z
-    .locals 2
-    .annotation runtime Lcom/discord/stores/StoreThread;
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->userStore:Lcom/discord/stores/StoreUser;
-
-    iget-object v0, v0, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser$Me;->isStaff()Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_0
-
-    return v1
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public final isInSpectatorExperimentObservable()Lrx/Observable;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->userStore:Lcom/discord/stores/StoreUser;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lrx/Observable;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;
-
-    check-cast v1, Lrx/functions/b;
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object v0
-
-    const-string v1, "userStore\n            .g\u2026.map { me -> me.isStaff }"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
-
 .method public final isUserStreaming(J)Z
     .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperiment()Z
+    invoke-direct {p0}, Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperiment()Z
 
     move-result v0
 
@@ -517,7 +1136,7 @@
 .end method
 
 .method public final onDispatchEnded()V
-    .locals 3
+    .locals 5
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -528,15 +1147,33 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsPublisher:Lrx/subjects/BehaviorSubject;
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->stateSubject:Lrx/subjects/BehaviorSubject;
 
-    new-instance v1, Ljava/util/HashMap;
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$State;
 
-    iget-object v2, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
+    new-instance v2, Ljava/util/HashMap;
+
+    iget-object v3, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
+
+    check-cast v3, Ljava/util/Map;
+
+    invoke-direct {v2, v3}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
     check-cast v2, Ljava/util/Map;
 
-    invoke-direct {v1, v2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
+    new-instance v3, Ljava/util/HashMap;
+
+    iget-object v4, p0, Lcom/discord/stores/StoreApplicationStreaming;->rtcStreams:Ljava/util/HashMap;
+
+    check-cast v4, Ljava/util/Map;
+
+    invoke-direct {v3, v4}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
+
+    check-cast v3, Ljava/util/Map;
+
+    iget-object v4, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    invoke-direct {v1, v2, v3, v4}, Lcom/discord/stores/StoreApplicationStreaming$State;-><init>(Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)V
 
     invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
@@ -546,3 +1183,11 @@
 
     return-void
 .end method
+
+.method public final setActiveApplicationStream$app_productionDiscordExternalRelease(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreamingKt.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreamingKt.smali
new file mode 100644
index 0000000000..119cf3b7fd
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreamingKt.smali
@@ -0,0 +1,7 @@
+.class public final Lcom/discord/stores/StoreApplicationStreamingKt;
+.super Ljava/lang/Object;
+.source "StoreApplicationStreaming.kt"
+
+
+# static fields
+.field private static final TAG:Ljava/lang/String; = "app_stream_store"
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings.smali
index 13f25ebeab..113c675ae6 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings.smali
@@ -268,6 +268,10 @@
 
     iget v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;->settingMode:I
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
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 490fc6fde8..7504563618 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
@@ -23,68 +23,103 @@
 
 .field private final outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
 
+.field private final streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
 
 # direct methods
-.method public constructor <init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)V
+.method public constructor <init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)V
     .locals 1
 
     const-string v0, "connectionState"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "outputMode"
+    const-string v0, "streamConnectionState"
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "audioOutputState"
+    const-string v0, "outputMode"
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "audioOutputState"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    iput-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
+    iput-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    iput-object p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+    iput-object p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
 
-    iput p4, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
+    iput-object p4, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+
+    iput p5, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;IILjava/lang/Object;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
-    .locals 0
+.method public static synthetic copy$default(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;IILjava/lang/Object;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+    .locals 3
 
-    and-int/lit8 p6, p5, 0x1
+    and-int/lit8 p7, p6, 0x1
 
-    if-eqz p6, :cond_0
+    if-eqz p7, :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 p7, p6, 0x2
 
-    if-eqz p6, :cond_1
+    if-eqz p7, :cond_1
 
-    iget-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
+    iget-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
     :cond_1
-    and-int/lit8 p6, p5, 0x4
+    move-object p7, p2
 
-    if-eqz p6, :cond_2
+    and-int/lit8 p2, p6, 0x4
 
-    iget-object p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+    if-eqz p2, :cond_2
+
+    iget-object p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
 
     :cond_2
-    and-int/lit8 p5, p5, 0x8
+    move-object v0, p3
 
-    if-eqz p5, :cond_3
+    and-int/lit8 p2, p6, 0x8
 
-    iget p4, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
+    if-eqz p2, :cond_3
+
+    iget-object p4, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
 
     :cond_3
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+    move-object v1, p4
+
+    and-int/lit8 p2, p6, 0x10
+
+    if-eqz p2, :cond_4
+
+    iget p5, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
+
+    :cond_4
+    move v2, p5
+
+    move-object p2, p0
+
+    move-object p3, p1
+
+    move-object p4, p7
+
+    move-object p5, v0
+
+    move-object p6, v1
+
+    move p7, v2
+
+    invoke-virtual/range {p2 .. p7}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
 
     move-result-object p0
 
@@ -101,7 +136,15 @@
     return-object v0
 .end method
 
-.method public final component2()Lcom/discord/models/domain/ModelVoice$OutputMode;
+.method public final component2()Lcom/discord/rtcconnection/RtcConnection$State;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    return-object v0
+.end method
+
+.method public final component3()Lcom/discord/models/domain/ModelVoice$OutputMode;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
@@ -109,7 +152,7 @@
     return-object v0
 .end method
 
-.method public final component3()Lcom/discord/utilities/media/AudioOutputState;
+.method public final component4()Lcom/discord/utilities/media/AudioOutputState;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
@@ -117,7 +160,7 @@
     return-object v0
 .end method
 
-.method public final component4()I
+.method public final component5()I
     .locals 1
 
     iget v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
@@ -125,24 +168,40 @@
     return v0
 .end method
 
-.method public final copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
-    .locals 1
+.method public final copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+    .locals 7
 
     const-string v0, "connectionState"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "outputMode"
+    const-string v0, "streamConnectionState"
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "audioOutputState"
+    const-string v0, "outputMode"
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "audioOutputState"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(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/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)V
+    move-object v1, v0
+
+    move-object v2, p1
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    move v6, p5
+
+    invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)V
 
     return-object v0
 .end method
@@ -172,6 +231,16 @@
 
     if-eqz v1, :cond_1
 
+    iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    iget-object v3, p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
     iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
 
     iget-object v3, p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
@@ -250,6 +319,14 @@
     return-object v0
 .end method
 
+.method public final getStreamConnectionState()Lcom/discord/rtcconnection/RtcConnection$State;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    return-object v0
+.end method
+
 .method public final hashCode()I
     .locals 3
 
@@ -271,7 +348,7 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
+    iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
     if-eqz v2, :cond_1
 
@@ -289,21 +366,43 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+    iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
 
     if-eqz v2, :cond_2
 
     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/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+
+    if-eqz v2, :cond_3
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_3
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
@@ -322,6 +421,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", streamConnectionState="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
     const-string v1, ", outputMode="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
index 82120659b8..823855ac21 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
@@ -178,17 +178,21 @@
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component2()Lcom/discord/models/domain/ModelVoice$OutputMode;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component2()Lcom/discord/rtcconnection/RtcConnection$State;
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component3()Lcom/discord/utilities/media/AudioOutputState;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component3()Lcom/discord/models/domain/ModelVoice$OutputMode;
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/rtcconnection/RtcConnection$State$f;->yf:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component4()Lcom/discord/utilities/media/AudioOutputState;
 
-    if-ne v0, v3, :cond_5
+    move-result-object v3
+
+    sget-object v4, Lcom/discord/rtcconnection/RtcConnection$State$f;->yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
+
+    if-ne v0, v4, :cond_6
 
     iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 
@@ -205,20 +209,28 @@
 
     sget-object v0, Lcom/discord/models/domain/ModelVoice$OutputMode;->SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    const/4 v4, 0x1
+    const/4 v5, 0x1
 
-    if-ne v1, v0, :cond_2
+    if-eq v2, v0, :cond_3
 
-    const/4 v0, 0x1
+    instance-of v0, v1, Lcom/discord/rtcconnection/RtcConnection$State$f;
+
+    if-eqz v0, :cond_2
 
     goto :goto_0
 
     :cond_2
     const/4 v0, 0x0
 
+    goto :goto_1
+
+    :cond_3
     :goto_0
+    const/4 v0, 0x1
+
+    :goto_1
     iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
     invoke-virtual {v1, v0}, Landroid/media/AudioManager;->setSpeakerphoneOn(Z)V
@@ -229,38 +241,38 @@
 
     move-result p1
 
-    const/4 v5, 0x2
+    const/4 v2, 0x2
 
     const/4 v6, 0x3
 
-    if-eq p1, v5, :cond_3
+    if-eq p1, v2, :cond_4
 
-    goto :goto_1
-
-    :cond_3
-    const/4 v6, 0x2
-
-    :goto_1
-    invoke-virtual {v1, v6}, Landroid/media/AudioManager;->setMode(I)V
-
-    if-nez v0, :cond_4
-
-    invoke-virtual {v2}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothHeadsetDisconnected()Z
-
-    move-result p1
-
-    if-nez p1, :cond_4
-
-    invoke-virtual {v2}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothScoDisconnected()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_4
-
-    const/4 v3, 0x1
+    goto :goto_2
 
     :cond_4
-    if-eqz v3, :cond_7
+    const/4 v6, 0x2
+
+    :goto_2
+    invoke-virtual {v1, v6}, Landroid/media/AudioManager;->setMode(I)V
+
+    if-nez v0, :cond_5
+
+    invoke-virtual {v3}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothHeadsetDisconnected()Z
+
+    move-result p1
+
+    if-nez p1, :cond_5
+
+    invoke-virtual {v3}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothScoDisconnected()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_5
+
+    const/4 v4, 0x1
+
+    :cond_5
+    if-eqz v4, :cond_8
 
     iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
@@ -268,11 +280,11 @@
 
     move-result p1
 
-    if-nez p1, :cond_7
+    if-nez p1, :cond_8
 
     iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
-    invoke-virtual {p1, v4}, Landroid/media/AudioManager;->setBluetoothScoOn(Z)V
+    invoke-virtual {p1, v5}, Landroid/media/AudioManager;->setBluetoothScoOn(Z)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
@@ -280,20 +292,20 @@
 
     return-void
 
-    :cond_5
+    :cond_6
     iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_7
 
     iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
     invoke-direct {p0, v0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->useSettings(Landroid/media/AudioManager;Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;)V
 
-    :cond_6
+    :cond_7
     const/4 p1, 0x0
 
     iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 
-    :cond_7
+    :cond_8
     return-void
 .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 57e34ca21d..ff08cc02c7 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$init$1.smali
@@ -3,7 +3,7 @@
 .source "StoreAudioManager.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function4;
+.implements Lkotlin/jvm/functions/Function5;
 
 
 # annotations
@@ -19,7 +19,8 @@
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lkotlin/jvm/internal/j;",
-        "Lkotlin/jvm/functions/Function4<",
+        "Lkotlin/jvm/functions/Function5<",
+        "Lcom/discord/rtcconnection/RtcConnection$State;",
         "Lcom/discord/rtcconnection/RtcConnection$State;",
         "Lcom/discord/models/domain/ModelVoice$OutputMode;",
         "Lcom/discord/utilities/media/AudioOutputState;",
@@ -50,7 +51,7 @@
 .method constructor <init>()V
     .locals 1
 
-    const/4 v0, 0x4
+    const/4 v0, 0x5
 
     invoke-direct {p0, v0}, Lkotlin/jvm/internal/j;-><init>(I)V
 
@@ -82,13 +83,13 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "<init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)V"
+    const-string v0, "<init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)V"
 
     return-object v0
 .end method
 
-.method public final invoke(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
-    .locals 1
+.method public final invoke(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+    .locals 7
 
     const-string v0, "p1"
 
@@ -102,29 +103,57 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "p4"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(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/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)V
+    move-object v1, v0
+
+    move-object v2, p1
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    move v6, p5
+
+    invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)V
 
     return-object v0
 .end method
 
-.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 6
 
-    check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
+    move-object v1, p1
 
-    check-cast p2, Lcom/discord/models/domain/ModelVoice$OutputMode;
+    check-cast v1, Lcom/discord/rtcconnection/RtcConnection$State;
 
-    check-cast p3, Lcom/discord/utilities/media/AudioOutputState;
+    move-object v2, p2
 
-    check-cast p4, Ljava/lang/Number;
+    check-cast v2, Lcom/discord/rtcconnection/RtcConnection$State;
 
-    invoke-virtual {p4}, Ljava/lang/Number;->intValue()I
+    move-object v3, p3
 
-    move-result p4
+    check-cast v3, Lcom/discord/models/domain/ModelVoice$OutputMode;
 
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreAudioManager$init$1;->invoke(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+    move-object v4, p4
+
+    check-cast v4, Lcom/discord/utilities/media/AudioOutputState;
+
+    check-cast p5, Ljava/lang/Number;
+
+    invoke-virtual {p5}, Ljava/lang/Number;->intValue()I
+
+    move-result v5
+
+    move-object v0, p0
+
+    invoke-virtual/range {v0 .. v5}, Lcom/discord/stores/StoreAudioManager$init$1;->invoke(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
 
     move-result-object p1
 
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 b97e6dc13c..11cc76f486 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$init$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAudioManager$init$2;->invoke(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     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 79b8f403b2..0000000000
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class 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 private final synthetic function:Lkotlin/jvm/functions/Function4;
-
-
-# direct methods
-.method 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$sam$rx_functions_Func5$0.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0.smali
new file mode 100644
index 0000000000..824ec6f22a
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0.smali
@@ -0,0 +1,46 @@
+.class final Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;
+.super Ljava/lang/Object;
+.source "StoreAudioManager.kt"
+
+# interfaces
+.implements Lrx/functions/Func5;
+
+
+# instance fields
+.field private final synthetic function:Lkotlin/jvm/functions/Function5;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/functions/Function5;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;->function:Lkotlin/jvm/functions/Function5;
+
+    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;
+    .locals 6
+
+    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;->function:Lkotlin/jvm/functions/Function5;
+
+    move-object v1, p1
+
+    move-object v2, p2
+
+    move-object v3, p3
+
+    move-object v4, p4
+
+    move-object v5, p5
+
+    invoke-interface/range {v0 .. v5}, Lkotlin/jvm/functions/Function5;->invoke(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/stores/StoreAudioManager.smali b/com.discord/smali/com/discord/stores/StoreAudioManager.smali
index 4c8657f20c..3dcf52d408 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager.smali
@@ -16,9 +16,11 @@
 
 .field private final rtcConnectionStore:Lcom/discord/stores/StoreRtcConnection;
 
+.field private final streamRtcConnectionStore:Lcom/discord/stores/StoreStreamRtcConnection;
+
 
 # direct methods
-.method public constructor <init>(Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreRtcConnection;)V
+.method public constructor <init>(Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreRtcConnection;Lcom/discord/stores/StoreStreamRtcConnection;)V
     .locals 1
 
     const-string v0, "mediaSettings"
@@ -29,12 +31,18 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "streamRtcConnectionStore"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
     iput-object p1, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
 
     iput-object p2, p0, Lcom/discord/stores/StoreAudioManager;->rtcConnectionStore:Lcom/discord/stores/StoreRtcConnection;
 
+    iput-object p3, p0, Lcom/discord/stores/StoreAudioManager;->streamRtcConnectionStore:Lcom/discord/stores/StoreStreamRtcConnection;
+
     return-void
 .end method
 
@@ -57,42 +65,50 @@
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreRtcConnection;->getConnectionState()Lrx/Observable;
 
-    move-result-object p1
-
-    iget-object v1, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getOutputMode()Lrx/Observable;
-
     move-result-object v1
 
-    iget-object v2, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+    iget-object p1, p0, Lcom/discord/stores/StoreAudioManager;->streamRtcConnectionStore:Lcom/discord/stores/StoreStreamRtcConnection;
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreMediaSettings;->getAudioOutputState()Lrx/Observable;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStreamRtcConnection;->getRtcConnectionState()Lrx/Observable;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+    iget-object p1, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
 
-    invoke-virtual {v3}, Lcom/discord/stores/StoreMediaSettings;->getAudioMode()Lrx/Observable;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->getOutputMode()Lrx/Observable;
 
     move-result-object v3
 
-    sget-object v4, Lcom/discord/stores/StoreAudioManager$init$1;->INSTANCE:Lcom/discord/stores/StoreAudioManager$init$1;
+    iget-object p1, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
 
-    check-cast v4, Lkotlin/jvm/functions/Function4;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->getAudioOutputState()Lrx/Observable;
 
-    if-eqz v4, :cond_0
+    move-result-object v4
 
-    new-instance v5, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0;
+    iget-object p1, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
 
-    invoke-direct {v5, v4}, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0;-><init>(Lkotlin/jvm/functions/Function4;)V
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->getAudioMode()Lrx/Observable;
 
-    move-object v4, v5
+    move-result-object v5
+
+    sget-object p1, Lcom/discord/stores/StoreAudioManager$init$1;->INSTANCE:Lcom/discord/stores/StoreAudioManager$init$1;
+
+    check-cast p1, Lkotlin/jvm/functions/Function5;
+
+    if-eqz p1, :cond_0
+
+    new-instance v6, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;
+
+    invoke-direct {v6, p1}, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;-><init>(Lkotlin/jvm/functions/Function5;)V
+
+    move-object p1, v6
 
     :cond_0
-    check-cast v4, Lrx/functions/Func4;
+    move-object v6, p1
 
-    invoke-static {p1, v1, v2, v3, v4}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
+    check-cast v6, Lrx/functions/Func5;
+
+    invoke-static/range {v1 .. v6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;)Lrx/Observable;
 
     move-result-object p1
 
@@ -104,7 +120,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogFilter.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogFilter.smali
index 169fec573b..e71095f3fd 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogFilter.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogFilter.smali
@@ -185,25 +185,25 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 2
 
     iget-wide v0, p0, Lcom/discord/stores/StoreAuditLog$AuditLogFilter;->userFilter:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v2, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v2
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
+    iget v1, p0, Lcom/discord/stores/StoreAuditLog$AuditLogFilter;->actionFilter:I
 
-    mul-int/lit8 v1, v1, 0x1f
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
-    iget v0, p0, Lcom/discord/stores/StoreAuditLog$AuditLogFilter;->actionFilter:I
+    move-result v1
 
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
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 2774e5221e..f689ca3aeb 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
@@ -186,7 +186,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
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 9293850e2d..401127db3d 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuditLog$fetchAuditLogs$1;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 23e0a83c45..7e126c9eef 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$2.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuditLog$fetchAuditLogs$2;->invoke(Lcom/discord/models/domain/ModelAuditLog;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 18b5a86dbd..4b3d13963d 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$getAuditLogState$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$getAuditLogState$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAuditLog$getAuditLogState$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 8f63e6157e..92e5b80fe0 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$handleAuditLogResponse$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$handleAuditLogResponse$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAuditLog$handleAuditLogResponse$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -107,13 +107,13 @@
 
     move-result v2
 
-    invoke-static {v2}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v2}, Lkotlin/a/ad;->dj(I)I
 
     move-result v2
 
     const/16 v3, 0x10
 
-    invoke-static {v2, v3}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v2, v3}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v2
 
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 7b11460223..c7dd035050 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$handleFetchFailure$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$handleFetchFailure$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAuditLog$handleFetchFailure$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 57ca157035..cc261fbd62 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$scrollToBottom$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$scrollToBottom$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAuditLog$scrollToBottom$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 8d0e7fae68..71813d40fb 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterActionId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterActionId$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAuditLog$setAuditLogFilterActionId$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 aca30d958f..90700bb189 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterUserId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterUserId$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAuditLog$setAuditLogFilterUserId$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 44da094b93..570a080b24 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$toggleSelectedState$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$toggleSelectedState$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAuditLog$toggleSelectedState$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog.smali b/com.discord/smali/com/discord/stores/StoreAuditLog.smali
index 353497b953..c07904abdd 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog.smali
@@ -152,7 +152,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreAuditLog;->deletedTargets:Ljava/util/HashMap;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -400,7 +400,7 @@
 
     move-result-object p3
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -1002,7 +1002,7 @@
     goto :goto_a
 
     :cond_c
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v0, Ljava/util/List;
 
@@ -1340,7 +1340,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 eca4b0e704..49a62fde19 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$init$3.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuthentication$init$3;->invoke(Lkotlin/Pair;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 60adc6b2f4..1390ec8dc8 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$logout$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$logout$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuthentication$logout$2;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 2649f0ec12..4c7173b392 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$logout$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$logout$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuthentication$logout$3;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$register$2$2.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$register$2$2.smali
index fd29563dff..3a3dfad1a3 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$register$2$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$register$2$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuthentication$register$2$2;->invoke(Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 7b87c51bad..151dfdf53a 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuthentication$requestConsentRequired$1;->invoke(Lcom/discord/models/domain/ConsentRequired;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 b91f654712..b02815b054 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuthentication$requestConsentRequired$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 47a4bd07d6..6069f94adc 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuthentication$requestConsentRequired$3;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication.smali b/com.discord/smali/com/discord/stores/StoreAuthentication.smali
index 68d89de980..2af575a76d 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication.smali
@@ -85,7 +85,7 @@
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -93,7 +93,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -105,7 +105,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -183,7 +183,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->fingerprintSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->Kg()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->JU()Lrx/Observable;
 
     move-result-object v0
 
@@ -429,7 +429,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->tokenSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -461,7 +461,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->fingerprintSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -668,7 +668,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->userInitiatedAuthEventSubject:Lrx/subjects/PublishSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/PublishSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/PublishSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1206,7 +1206,7 @@
 
     if-nez p2, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     invoke-static {p2, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->externalFingerprintDropped(Ljava/lang/String;Ljava/lang/String;)V
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 da6239b161..5d69a885e6 100644
--- a/com.discord/smali/com/discord/stores/StoreBans$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreBans$get$1.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreBans$get$1;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 c075109744..e0d89d2d44 100644
--- a/com.discord/smali/com/discord/stores/StoreBans$onLoadedBans$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreBans$onLoadedBans$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreBans$onLoadedBans$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreBans.smali b/com.discord/smali/com/discord/stores/StoreBans.smali
index 0e166369c8..c27bb2ae67 100644
--- a/com.discord/smali/com/discord/stores/StoreBans.smali
+++ b/com.discord/smali/com/discord/stores/StoreBans.smali
@@ -203,7 +203,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 69e4ff5c28..9dffd621c7 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppFragment;JLkotlin/jvm/functions/Function0;)V
+    value = Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;JLkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreCalls$call$1;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     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 d1df640dbe..3714b2fc54 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
@@ -111,7 +111,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     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 71f4029615..c1f15bb801 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreCalls$call$2$2;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 a9e0c918b2..5ba178432e 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,9 +1,9 @@
 .class final Lcom/discord/stores/StoreCalls$call$2$3;
-.super Ljava/lang/Object;
+.super Lkotlin/jvm/internal/l;
 .source "StoreCalls.kt"
 
 # interfaces
-.implements Lrx/functions/Action1;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
@@ -18,12 +18,10 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
+        "Lkotlin/Unit;",
         ">;"
     }
 .end annotation
@@ -43,16 +41,34 @@
 
     iput-wide p2, p0, Lcom/discord/stores/StoreCalls$call$2$3;->$userId:J
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final call(Lcom/discord/utilities/error/Error;)V
+.method public final 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/stores/StoreCalls$call$2$3;->invoke(Lcom/discord/utilities/error/Error;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 3
 
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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;
 
     iget-object v0, v0, Lcom/discord/stores/StoreCalls$call$2;->$onError:Lkotlin/jvm/functions/Function0;
@@ -62,15 +78,11 @@
     invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
     :cond_0
-    const-string v0, "it"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(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 v0
 
-    const-string v1, "it.response"
+    const-string v1, "error.response"
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -90,11 +102,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreCalls$call$2$3;->this$0:Lcom/discord/stores/StoreCalls$call$2;
 
-    iget-object v0, v0, Lcom/discord/stores/StoreCalls$call$2;->$fragment:Lcom/discord/app/AppFragment;
-
-    invoke-virtual {v0}, Lcom/discord/app/AppFragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
-
-    move-result-object v0
+    iget-object v0, v0, Lcom/discord/stores/StoreCalls$call$2;->$fragmentManager:Landroidx/fragment/app/FragmentManager;
 
     iget-wide v1, p0, Lcom/discord/stores/StoreCalls$call$2$3;->$userId:J
 
@@ -103,13 +111,3 @@
     :cond_1
     return-void
 .end method
-
-.method public final bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Lcom/discord/utilities/error/Error;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreCalls$call$2$3;->call(Lcom/discord/utilities/error/Error;)V
-
-    return-void
-.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 0025da34d8..3332f58e56 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppFragment;JLkotlin/jvm/functions/Function0;)V
+    value = Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;JLkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,26 +28,38 @@
 
 
 # instance fields
+.field final synthetic $appComponent:Lcom/discord/app/AppComponent;
+
 .field final synthetic $channelId:J
 
+.field final synthetic $context:Landroid/content/Context;
+
 .field final synthetic $doCall$1:Lcom/discord/stores/StoreCalls$call$1;
 
-.field final synthetic $fragment:Lcom/discord/app/AppFragment;
+.field final synthetic $fragmentManager:Landroidx/fragment/app/FragmentManager;
 
 .field final synthetic $onError:Lkotlin/jvm/functions/Function0;
 
+.field final synthetic this$0:Lcom/discord/stores/StoreCalls;
+
 
 # direct methods
-.method constructor <init>(JLcom/discord/app/AppFragment;Lcom/discord/stores/StoreCalls$call$1;Lkotlin/jvm/functions/Function0;)V
+.method constructor <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
     .locals 0
 
-    iput-wide p1, p0, Lcom/discord/stores/StoreCalls$call$2;->$channelId:J
+    iput-object p1, p0, Lcom/discord/stores/StoreCalls$call$2;->this$0:Lcom/discord/stores/StoreCalls;
 
-    iput-object p3, p0, Lcom/discord/stores/StoreCalls$call$2;->$fragment:Lcom/discord/app/AppFragment;
+    iput-wide p2, p0, Lcom/discord/stores/StoreCalls$call$2;->$channelId:J
 
-    iput-object p4, p0, Lcom/discord/stores/StoreCalls$call$2;->$doCall$1:Lcom/discord/stores/StoreCalls$call$1;
+    iput-object p4, p0, Lcom/discord/stores/StoreCalls$call$2;->$appComponent:Lcom/discord/app/AppComponent;
 
-    iput-object p5, p0, Lcom/discord/stores/StoreCalls$call$2;->$onError:Lkotlin/jvm/functions/Function0;
+    iput-object p5, p0, Lcom/discord/stores/StoreCalls$call$2;->$context:Landroid/content/Context;
+
+    iput-object p6, p0, Lcom/discord/stores/StoreCalls$call$2;->$doCall$1:Lcom/discord/stores/StoreCalls$call$1;
+
+    iput-object p7, p0, Lcom/discord/stores/StoreCalls$call$2;->$onError:Lkotlin/jvm/functions/Function0;
+
+    iput-object p8, p0, Lcom/discord/stores/StoreCalls$call$2;->$fragmentManager:Landroidx/fragment/app/FragmentManager;
 
     const/4 p1, 0x1
 
@@ -69,13 +81,13 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreCalls$call$2;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
 .method public final invoke(J)V
-    .locals 8
+    .locals 13
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -113,43 +125,47 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/stores/StoreCalls$call$2;->$fragment:Lcom/discord/app/AppFragment;
+    iget-object v1, p0, Lcom/discord/stores/StoreCalls$call$2;->$appComponent:Lcom/discord/app/AppComponent;
 
-    check-cast v1, Lcom/discord/app/AppComponent;
+    const/4 v2, 0x0
 
-    invoke-static {v1}, Lcom/discord/app/i;->a(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    const/4 v3, 0x2
 
-    move-result-object v1
+    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;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+    move-result-object v4
 
-    move-result-object v0
+    iget-object v6, p0, Lcom/discord/stores/StoreCalls$call$2;->$context:Landroid/content/Context;
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    iget-object v0, p0, Lcom/discord/stores/StoreCalls$call$2;->this$0:Lcom/discord/stores/StoreCalls;
 
-    iget-object v2, p0, Lcom/discord/stores/StoreCalls$call$2;->$fragment:Lcom/discord/app/AppFragment;
+    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    invoke-virtual {v2}, Lcom/discord/app/AppFragment;->getContext()Landroid/content/Context;
+    move-result-object v5
 
-    move-result-object v2
+    new-instance v0, Lcom/discord/stores/StoreCalls$call$2$2;
 
-    new-instance v3, Lcom/discord/stores/StoreCalls$call$2$2;
+    invoke-direct {v0, p0}, Lcom/discord/stores/StoreCalls$call$2$2;-><init>(Lcom/discord/stores/StoreCalls$call$2;)V
 
-    invoke-direct {v3, p0}, Lcom/discord/stores/StoreCalls$call$2$2;-><init>(Lcom/discord/stores/StoreCalls$call$2;)V
+    move-object v10, v0
 
-    check-cast v3, Lkotlin/jvm/functions/Function1;
+    check-cast v10, Lkotlin/jvm/functions/Function1;
 
-    new-instance v4, Lcom/discord/stores/StoreCalls$call$2$3;
+    new-instance v0, Lcom/discord/stores/StoreCalls$call$2$3;
 
-    invoke-direct {v4, p0, p1, p2}, Lcom/discord/stores/StoreCalls$call$2$3;-><init>(Lcom/discord/stores/StoreCalls$call$2;J)V
+    invoke-direct {v0, p0, p1, p2}, Lcom/discord/stores/StoreCalls$call$2$3;-><init>(Lcom/discord/stores/StoreCalls$call$2;J)V
 
-    check-cast v4, Lrx/functions/Action1;
+    move-object v8, v0
 
-    invoke-virtual {v1, v2, v3, v4}, Lcom/discord/app/i;->a(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    check-cast v8, Lkotlin/jvm/functions/Function1;
 
-    move-result-object p1
+    const/4 v9, 0x0
 
-    invoke-virtual {v0, p1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+    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
 .end method
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 839075d9a1..477ace8c16 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$3.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppFragment;JLkotlin/jvm/functions/Function0;)V
+    value = Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;JLkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 de0015819d..2ad5d24078 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$4.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppFragment;JLkotlin/jvm/functions/Function0;)V
+    value = Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;JLkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 bae5c55c9d..24bc119a1c 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$5.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppFragment;JLkotlin/jvm/functions/Function0;)V
+    value = Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;JLkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -65,7 +65,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreCalls$call$5;->invoke(Lkotlin/Pair;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 e10cc81693..402bf9dd9e 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$findCall$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$findCall$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreCalls$findCall$2;->invoke(Lcom/discord/models/domain/ModelCall;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 e6e7b798e3..8ba3b209c5 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$ring$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$ring$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreCalls$ring$1;->invoke(Lcom/discord/models/domain/ModelCall;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 3db3f9e8df..44e62489cc 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$stopRinging$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$stopRinging$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreCalls$stopRinging$1;->invoke(Lcom/discord/models/domain/ModelCall;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreCalls.smali b/com.discord/smali/com/discord/stores/StoreCalls.smali
index 28163bdd8f..269f029581 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls.smali
@@ -60,7 +60,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -81,17 +81,29 @@
     return-object p0
 .end method
 
-.method public static synthetic call$default(Lcom/discord/stores/StoreCalls;Lcom/discord/app/AppFragment;JLkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
-    .locals 0
+.method public static synthetic call$default(Lcom/discord/stores/StoreCalls;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;JLkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+    .locals 7
 
-    and-int/lit8 p5, p5, 0x4
+    and-int/lit8 p7, p7, 0x10
 
-    if-eqz p5, :cond_0
+    if-eqz p7, :cond_0
 
-    const/4 p4, 0x0
+    const/4 p6, 0x0
 
     :cond_0
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppFragment;JLkotlin/jvm/functions/Function0;)V
+    move-object v6, p6
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    move-object v2, p2
+
+    move-object v3, p3
+
+    move-wide v4, p4
+
+    invoke-virtual/range {v0 .. v6}, Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;JLkotlin/jvm/functions/Function0;)V
 
     return-void
 .end method
@@ -309,12 +321,14 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/app/AppFragment;JLkotlin/jvm/functions/Function0;)V
-    .locals 20
+.method public final call(Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;JLkotlin/jvm/functions/Function0;)V
+    .locals 14
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lcom/discord/app/AppFragment;",
+            "Lcom/discord/app/AppComponent;",
+            "Landroid/content/Context;",
+            "Landroidx/fragment/app/FragmentManager;",
             "J",
             "Lkotlin/jvm/functions/Function0<",
             "Lkotlin/Unit;",
@@ -322,31 +336,45 @@
         }
     .end annotation
 
-    move-wide/from16 v6, p2
+    move-wide/from16 v9, p4
 
-    const-string v0, "fragment"
+    const-string v0, "appComponent"
 
-    move-object/from16 v3, p1
+    move-object v4, p1
 
-    invoke-static {v3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v8, Lcom/discord/stores/StoreCalls$call$1;
+    const-string v0, "context"
 
-    move-object/from16 v9, p0
+    move-object/from16 v5, p2
 
-    invoke-direct {v8, v9, v6, v7}, Lcom/discord/stores/StoreCalls$call$1;-><init>(Lcom/discord/stores/StoreCalls;J)V
+    invoke-static {v5, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v10, Lcom/discord/stores/StoreCalls$call$2;
+    const-string v0, "fragmentManager"
 
-    move-object v0, v10
+    move-object/from16 v8, p3
 
-    move-wide/from16 v1, p2
+    invoke-static {v8, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v4, v8
+    new-instance v11, Lcom/discord/stores/StoreCalls$call$1;
 
-    move-object/from16 v5, p4
+    move-object v12, p0
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/stores/StoreCalls$call$2;-><init>(JLcom/discord/app/AppFragment;Lcom/discord/stores/StoreCalls$call$1;Lkotlin/jvm/functions/Function0;)V
+    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 v6, v11
+
+    move-object/from16 v7, p6
+
+    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;
 
@@ -354,7 +382,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, v6, v7}, Lcom/discord/stores/StoreChannels;->get(J)Lrx/Observable;
+    invoke-virtual {v0, v9, v10}, Lcom/discord/stores/StoreChannels;->get(J)Lrx/Observable;
 
     move-result-object v0
 
@@ -384,7 +412,7 @@
 
     const-wide/16 v2, 0x0
 
-    invoke-virtual {v1, v2, v3, v6, v7}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable;
+    invoke-virtual {v1, v2, v3, v9, v10}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable;
 
     move-result-object v1
 
@@ -396,39 +424,39 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JU()Lrx/Observable;
 
-    move-result-object v11
+    move-result-object v1
 
     const-string v0, "Observable\n        .zip(\u2026       )\n        .take(1)"
 
-    invoke-static {v11, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    move-result-object v12
+    move-result-object v2
 
     new-instance v0, Lcom/discord/stores/StoreCalls$call$5;
 
-    invoke-direct {v0, v10, v8}, Lcom/discord/stores/StoreCalls$call$5;-><init>(Lcom/discord/stores/StoreCalls$call$2;Lcom/discord/stores/StoreCalls$call$1;)V
+    invoke-direct {v0, v13, v11}, Lcom/discord/stores/StoreCalls$call$5;-><init>(Lcom/discord/stores/StoreCalls$call$2;Lcom/discord/stores/StoreCalls$call$1;)V
 
-    move-object/from16 v17, v0
+    move-object v7, v0
 
-    check-cast v17, Lkotlin/jvm/functions/Function1;
+    check-cast v7, Lkotlin/jvm/functions/Function1;
 
-    const/4 v13, 0x0
+    const/4 v3, 0x0
 
-    const/4 v14, 0x0
+    const/4 v4, 0x0
 
-    const/4 v15, 0x0
+    const/4 v5, 0x0
 
-    const/16 v16, 0x0
+    const/4 v6, 0x0
 
-    const/16 v18, 0x1e
+    const/16 v8, 0x1e
 
-    const/16 v19, 0x0
+    const/4 v9, 0x0
 
-    invoke-static/range {v11 .. v19}, 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
 .end method
@@ -464,7 +492,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali b/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali
index 4160eef20c..3ce2d2ea78 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;
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -303,7 +303,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
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 6f959f0a70..436b485c5b 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog$handleConnectionOpen$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog$handleConnectionOpen$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChangeLog$handleConnectionOpen$1;->invoke(Ljava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 0599850fad..8c029a0aab 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog$lastSeenChangeLogVersion$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog$lastSeenChangeLogVersion$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChangeLog$lastSeenChangeLogVersion$1;->invoke(Landroid/content/SharedPreferences$Editor;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog.smali b/com.discord/smali/com/discord/stores/StoreChangeLog.smali
index 5516c1e790..c755d11f35 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog.smali
@@ -211,7 +211,7 @@
     :cond_0
     sget-object v0, Lcom/discord/utilities/StringUtils;->INSTANCE:Lcom/discord/utilities/StringUtils;
 
-    const v4, 0x7f12038d
+    const v4, 0x7f120392
 
     invoke-virtual {v0, p1, v4, v1}, Lcom/discord/utilities/StringUtils;->getStringByLocale(Landroid/content/Context;ILjava/lang/String;)Ljava/lang/String;
 
@@ -277,12 +277,16 @@
     goto :goto_2
 
     :cond_4
-    const p2, 0x7f12038e
+    const p2, 0x7f120393
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
+    const-string p2, "context.getString(R.string.change_log_md_date)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Lcom/discord/stores/StoreChangeLog;->getLastSeenChangeLogVersion()Ljava/lang/String;
 
     move-result-object p2
@@ -313,7 +317,7 @@
 
     const-string v1, "app"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -352,7 +356,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v1
 
@@ -410,31 +414,35 @@
 .end method
 
 .method public final markSeen(Landroid/content/Context;)V
-    .locals 6
+    .locals 7
 
     const-string v0, "context"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f12038e
+    const v0, 0x7f120393
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
+    const-string v0, "context.getString(R.string.change_log_md_date)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(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-string v1, "CHANGE_LOG"
+    const-string v2, "CHANGE_LOG"
 
-    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
 
-    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
 .end method
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 3c23f579cc..48200ad686 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelCategories$getCollapsedCategories$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelCategories$getCollapsedCategories$1.smali
@@ -94,7 +94,7 @@
     return-object p1
 
     :cond_0
-    sget-object p1, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p1, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast p1, Ljava/util/Set;
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelCategories.smali b/com.discord/smali/com/discord/stores/StoreChannelCategories.smali
index b1206fed9e..c7b621973a 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelCategories.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelCategories.smali
@@ -210,7 +210,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -356,7 +356,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$1.smali
index 077785edcd..2a74114ae1 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelMembersLazy$1;->invoke(Lkotlin/Unit;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger.smali
index fb213d4c32..1a458e3bd3 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger.smali
@@ -170,7 +170,7 @@
 
     invoke-static {p1}, Lcom/crashlytics/android/a;->log(Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance p1, Lcom/discord/stores/StoreChannelMembersLazy$MemberListUpdateException;
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$doFlush$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$doFlush$1.smali
index f2178e669d..35f539104f 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$doFlush$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$doFlush$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreChannelMembersLazy$doFlush$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -72,7 +72,7 @@
 
     move-result v2
 
-    invoke-static {v2}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v2}, Lkotlin/a/ad;->dj(I)I
 
     move-result v2
 
@@ -119,7 +119,7 @@
 
     move-result v5
 
-    invoke-static {v5}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v5}, Lkotlin/a/ad;->dj(I)I
 
     move-result v5
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali
index 9b3201a55e..aefb713f23 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali
@@ -111,7 +111,7 @@
     throw p1
 
     :cond_1
-    const v0, 0x7f121072
+    const v0, 0x7f1210af
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -120,7 +120,7 @@
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f121073
+    const v0, 0x7f1210b0
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy.smali
index 3ab396594d..3eece9bbb4 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy.smali
@@ -141,7 +141,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreChannelMembersLazy;->memberListPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -163,7 +163,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance p2, Lcom/discord/stores/StoreChannelMembersLazy$1;
 
@@ -678,7 +678,7 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
@@ -1070,7 +1070,7 @@
 
     :cond_4
     :goto_2
-    sget-object v5, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v5, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -1126,7 +1126,7 @@
 
     if-nez p3, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelUser;->getId()J
@@ -1195,7 +1195,7 @@
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p3}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p3
 
@@ -1469,7 +1469,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreChannelMembersLazy;->flushTrigger:Lrx/subjects/PublishSubject;
 
-    sget-object v1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {v0, v1}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
 
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 e2c85500cc..095d7e0ba8 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$2.smali
@@ -76,7 +76,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
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 16f75c002a..9d69a28873 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
@@ -82,7 +82,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JV()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 7f4a3bfe5c..576a847096 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3.smali
@@ -126,7 +126,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JV()Lrx/Observable;
 
     move-result-object v0
 
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 7c040bbeb5..7e7c3bfe2b 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
@@ -62,7 +62,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$createGroupWithRecipients$2$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$createGroupWithRecipients$2$1.smali
index fde8af214b..45923e39fc 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$createGroupWithRecipients$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$createGroupWithRecipients$2$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreChannels$createGroupWithRecipients$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 e270dc87e5..007e88d301 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1.smali
@@ -114,7 +114,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
@@ -158,7 +158,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v0
 
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 98f0f137e1..5c6f92f0fe 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$delete$2;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -79,12 +79,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f120379
+    const p1, 0x7f12037e
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f12039e
+    const p1, 0x7f1203a3
 
     :goto_0
     invoke-static {v0, p1}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
diff --git a/com.discord/smali/com/discord/stores/StoreChannels.smali b/com.discord/smali/com/discord/stores/StoreChannels.smali
index 702264438d..76ddcee757 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels.smali
@@ -606,7 +606,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v0
 
@@ -750,7 +750,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -954,7 +954,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -987,7 +987,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1019,7 +1019,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1120,7 +1120,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -1303,7 +1303,7 @@
 
     if-nez v3, :cond_7
 
-    sget-object v3, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v3, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v3, Ljava/util/List;
 
@@ -1457,7 +1457,7 @@
 
     if-nez p1, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
     check-cast p1, Ljava/util/Map;
@@ -1480,7 +1480,7 @@
 
     if-nez p1, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     check-cast p1, Ljava/util/Map;
@@ -1504,7 +1504,7 @@
 
     if-nez p1, :cond_4
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -2150,7 +2150,7 @@
 
     if-nez p1, :cond_5
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_5
     check-cast p1, Ljava/util/Map;
@@ -2442,19 +2442,25 @@
 
     check-cast v0, Ljava/lang/Iterable;
 
+    invoke-static {v0}, Lkotlin/a/m;->n(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Iterable;
+
     const/16 v1, 0xa
 
     invoke-static {v0, v1}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
 
     move-result v1
 
-    invoke-static {v1}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v1}, Lkotlin/a/ad;->dj(I)I
 
     move-result v1
 
     const/16 v2, 0x10
 
-    invoke-static {v1, v2}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v1, v2}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v1
 
@@ -2508,6 +2514,12 @@
 
     check-cast v0, Ljava/lang/Iterable;
 
+    invoke-static {v0}, Lkotlin/a/m;->n(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Iterable;
+
     new-instance v1, Ljava/util/LinkedHashMap;
 
     invoke-direct {v1}, Ljava/util/LinkedHashMap;-><init>()V
@@ -2760,13 +2772,13 @@
 
     move-result v3
 
-    invoke-static {v3}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v3}, Lkotlin/a/ad;->dj(I)I
 
     move-result v3
 
     const/16 v6, 0x10
 
-    invoke-static {v3, v6}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v3, v6}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v3
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected.smali
index ebd6f62cd6..45051ccbb4 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected.smali
@@ -195,7 +195,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/stores/StoreChannelsSelected$Selected;->channel:Lcom/discord/models/domain/ModelChannel;
 
@@ -215,15 +215,11 @@
 
     iget-wide v1, p0, Lcom/discord/stores/StoreChannelsSelected$Selected;->channelId:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
 .end method
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 3fb5d3cd2c..3fd9be04c5 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1.smali
@@ -94,7 +94,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
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 5f5b9c6829..abf03a4097 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2;->invoke(Lcom/discord/stores/StoreChannelsSelected$Selected;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     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 b6a658191d..f4eae82dee 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelsSelected$findAndSet$3;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 3f52ddc8fb..2cfb5783fd 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 603c6e0f89..a6775ed780 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -91,7 +91,7 @@
 
     invoke-virtual {p1, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v1, "/2131231378"
+    const-string v1, "/2131231394"
 
     invoke-virtual {p1, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
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 bdaf53c962..d0c0c7a34b 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelsSelected$findAndSet$4;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -139,7 +139,7 @@
 
     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
 
-    sget-object v12, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v12, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     iget-object v1, v0, Lcom/discord/stores/StoreChannelsSelected$findAndSet$4;->this$0:Lcom/discord/stores/StoreChannelsSelected;
 
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 3b9a403c73..e6c2102c3e 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSetDirectMessage$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSetDirectMessage$1.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreChannelsSelected$findAndSetDirectMessage$1;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     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 14172ea2b1..56aacb83af 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$1.smali
@@ -64,7 +64,7 @@
 
     invoke-virtual {p0, v0, v1, p1, p2}, Lcom/discord/stores/StoreChannelsSelected$set$1;->invoke(JJ)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 2b58d86580..6eebbef030 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$2.smali
@@ -51,7 +51,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelsSelected$set$2;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 e8dc74f5e2..e7543e8876 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$3.smali
@@ -69,7 +69,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelsSelected$set$3;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali
index 69b72c7052..c9046d392e 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali
@@ -144,7 +144,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -194,7 +194,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreChannelsSelected;->frecency:Lcom/discord/widgets/user/search/ChannelFrecencyTracker;
 
-    sget-object p1, Lkotlin/properties/a;->bkJ:Lkotlin/properties/a;
+    sget-object p1, Lkotlin/properties/a;->bld:Lkotlin/properties/a;
 
     new-instance p1, Lcom/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1;
 
@@ -278,7 +278,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v1
 
@@ -867,7 +867,7 @@
 
     new-instance v2, Ljava/util/HashSet;
 
-    invoke-static {v0}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v0}, Lkotlin/a/ad;->dj(I)I
 
     move-result v3
 
diff --git a/com.discord/smali/com/discord/stores/StoreChat$InteractionState.smali b/com.discord/smali/com/discord/stores/StoreChat$InteractionState.smali
index 9840d21d1d..196ee75014 100644
--- a/com.discord/smali/com/discord/stores/StoreChat$InteractionState.smali
+++ b/com.discord/smali/com/discord/stores/StoreChat$InteractionState.smali
@@ -355,48 +355,46 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/stores/StoreChat$InteractionState;->channelId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v3
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
+    iget-wide v1, p0, Lcom/discord/stores/StoreChat$InteractionState;->lastMessageId:J
 
-    mul-int/lit8 v1, v1, 0x1f
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    iget-wide v3, p0, Lcom/discord/stores/StoreChat$InteractionState;->lastMessageId:J
+    move-result v1
 
-    ushr-long v5, v3, v2
+    add-int/2addr v0, v1
 
-    xor-long/2addr v3, v5
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v0, v3
+    iget-boolean v1, p0, Lcom/discord/stores/StoreChat$InteractionState;->isTouchedSinceLastJump:Z
 
-    add-int/2addr v1, v0
+    if-eqz v1, :cond_0
 
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-boolean v0, p0, Lcom/discord/stores/StoreChat$InteractionState;->isTouchedSinceLastJump:Z
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget v0, p0, Lcom/discord/stores/StoreChat$InteractionState;->scrollState$1:I
+    iget v1, p0, Lcom/discord/stores/StoreChat$InteractionState;->scrollState$1:I
 
-    add-int/2addr v1, v0
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
-    return v1
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    return v0
 .end method
 
 .method public final isAtBottom()Z
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 fd649824ef..12622de2e1 100644
--- a/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$2.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChat$toggleBlockedMessageGroup$2;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChat.smali b/com.discord/smali/com/discord/stores/StoreChat.smali
index f2af1ea580..0b476a803e 100644
--- a/com.discord/smali/com/discord/stores/StoreChat.smali
+++ b/com.discord/smali/com/discord/stores/StoreChat.smali
@@ -79,7 +79,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -117,7 +117,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    sget-object v1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v1, Ljava/util/List;
 
@@ -234,7 +234,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -309,7 +309,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
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 cba1b6fcab..e7773a38ff 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion$init$2.smali
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreClientVersion$init$2;->invoke(I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 b29b4a7f7e..4254e1aed3 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion$setClientMinVersion$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion$setClientMinVersion$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreClientVersion$setClientMinVersion$1;->invoke(Landroid/content/SharedPreferences$Editor;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index c43b7568aa..3a23df19d0 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, 0x3b6
+    const/16 v0, 0x3c3
 
     iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
 
@@ -149,7 +149,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreConnectivity.smali b/com.discord/smali/com/discord/stores/StoreConnectivity.smali
index 9c758b24c9..468e42c89b 100644
--- a/com.discord/smali/com/discord/stores/StoreConnectivity.smali
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity.smali
@@ -336,7 +336,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -430,7 +430,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -474,7 +474,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->connectionOpenSubject:Lrx/subjects/Subject;
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -506,7 +506,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->statePublisher:Lrx/subjects/Subject;
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object v1
 
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 f28100d962..ed084d20c2 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$1;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 07f72fc178..048e17cc34 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
@@ -47,22 +47,38 @@
 
 # virtual methods
 .method public final onSuccess(Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;)V
-    .locals 1
+    .locals 2
 
     iget-object v0, p0, Lcom/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$2;->$it:Lrx/Emitter;
 
+    if-eqz p1, :cond_1
+
+    iget-object v1, p1, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aUC:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+
+    if-eqz v1, :cond_0
+
+    iget-object p1, p1, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aUC:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+
+    iget-object p1, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUD:Ljava/lang/String;
+
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->AW()Landroid/net/Uri;
+    invoke-static {p1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object p1
 
-    if-nez p1, :cond_1
+    goto :goto_0
 
     :cond_0
-    sget-object p1, Landroid/net/Uri;->EMPTY:Landroid/net/Uri;
+    const/4 p1, 0x0
+
+    :goto_0
+    if-nez p1, :cond_2
 
     :cond_1
+    sget-object p1, Landroid/net/Uri;->EMPTY:Landroid/net/Uri;
+
+    :cond_2
     invoke-interface {v0, p1}, Lrx/Emitter;->onNext(Ljava/lang/Object;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$2;->$it:Lrx/Emitter;
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 fe2f50abe5..bd2748f092 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
@@ -67,7 +67,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/firebase/dynamiclinks/a;->AV()Lcom/google/firebase/dynamiclinks/a;
+    invoke-static {}, Lcom/google/firebase/dynamiclinks/a;->AR()Lcom/google/firebase/dynamiclinks/a;
 
     move-result-object v0
 
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 088c7b72cb..72bd426e35 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$handleDataReceived$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$handleDataReceived$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreDynamicLink$handleDataReceived$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 0c5b249f72..0cdf9cefc8 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$1.smali
@@ -73,7 +73,7 @@
     return-object v1
 
     :cond_0
-    sget-object v0, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
     const-string v0, "uri"
 
@@ -85,9 +85,9 @@
 
     if-eqz v0, :cond_4
 
-    sget-object v0, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
-    invoke-static {}, Lcom/discord/app/a/a;->dJ()Lkotlin/text/Regex;
+    invoke-static {}, Lcom/discord/app/a/a;->dI()Lkotlin/text/Regex;
 
     move-result-object v0
 
@@ -111,7 +111,7 @@
 
     if-eqz v0, :cond_4
 
-    invoke-interface {v0}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {v0}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object v0
 
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 ed6b1d1561..015610da36 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$3.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$3;->invoke(Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink.smali
index d92d41259e..698b8d76e6 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink.smali
@@ -89,7 +89,7 @@
 
     check-cast v0, Lrx/functions/Action1;
 
-    sget p1, Lrx/Emitter$a;->bIB:I
+    sget p1, Lrx/Emitter$a;->bIV:I
 
     invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;I)Lrx/Observable;
 
@@ -220,7 +220,7 @@
 
 # virtual methods
 .method public final storeLinkIfExists(Landroid/content/Intent;Landroid/content/Context;)V
-    .locals 7
+    .locals 10
 
     const-string v0, "intent"
 
@@ -250,7 +250,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -260,35 +260,37 @@
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/functions/Action1;)Lrx/Observable;
 
-    move-result-object p1
+    move-result-object v1
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    const-string p1, "getDynamicLinkObservable\u2026())\n          }\n        }"
 
-    new-instance v0, Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$3;
-
-    invoke-direct {v0, p0, p2}, Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$3;-><init>(Lcom/discord/stores/StoreDynamicLink;Landroid/content/Context;)V
-
-    move-object v1, v0
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object v2
 
+    new-instance p1, Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$3;
+
+    invoke-direct {p1, p0, p2}, Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$3;-><init>(Lcom/discord/stores/StoreDynamicLink;Landroid/content/Context;)V
+
+    move-object v7, p1
+
+    check-cast v7, Lkotlin/jvm/functions/Function1;
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
     const/4 v5, 0x0
 
-    const/16 v6, 0x3c
+    const/4 v6, 0x0
 
-    invoke-static/range {v1 .. v6}, Lcom/discord/app/i;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Class;Lrx/functions/Action1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;I)Lrx/Observable$c;
+    const/16 v8, 0x1e
 
-    move-result-object p2
+    const/4 v9, 0x0
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$2.smali b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$2.smali
index cab8017207..650a287e6f 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$2.smali
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreEmoji$buildUsableEmojiSet$2;->invoke(Ljava/util/Map;Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$3.smali b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$3.smali
index a59c6f086d..d323f711a9 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$3.smali
@@ -95,7 +95,7 @@
 
     invoke-virtual {p0, p1, v0, v1}, Lcom/discord/stores/StoreEmoji$buildUsableEmojiSet$3;->invoke(Ljava/util/Map;J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     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 ac3b67a270..781c196347 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1;->invoke(Lcom/discord/models/domain/emoji/ModelEmojiUnicode;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji.smali b/com.discord/smali/com/discord/stores/StoreEmoji.smali
index 5b6e7cf491..b06e8c2ce6 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji.smali
@@ -274,7 +274,7 @@
 
     if-nez v2, :cond_1
 
-    invoke-static/range {v18 .. v18}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static/range {v18 .. v18}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-interface {v2}, Ljava/util/Map;->values()Ljava/util/Collection;
@@ -366,7 +366,7 @@
 
     const-string v3, "unicodeEmojisNamesMap"
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     invoke-interface {v2}, Ljava/util/Map;->keySet()Ljava/util/Set;
@@ -496,7 +496,7 @@
 
     if-nez v2, :cond_a
 
-    invoke-static/range {v18 .. v18}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static/range {v18 .. v18}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_a
     move-object/from16 v3, v17
@@ -523,7 +523,7 @@
 
     const-string v1, "unicodeEmojiSurrogateMap"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
@@ -724,7 +724,7 @@
 
     const-string v9, "unicodeEmojisNamesMap"
 
-    invoke-static {v9}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v9}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-interface {v8, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
@@ -765,7 +765,7 @@
 
     aput-object p1, v2, v1
 
-    invoke-static {v2}, Lkotlin/sequences/i;->r([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    invoke-static {v2}, Lkotlin/sequences/i;->q([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
@@ -1035,7 +1035,7 @@
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p3}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p3
 
@@ -1074,7 +1074,7 @@
 
     const-string v1, "unicodeEmojiSurrogateMap"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -1098,7 +1098,7 @@
 
     const-string v1, "unicodeEmojisNamesMap"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -1113,7 +1113,7 @@
 
     const-string v1, "unicodeEmojisPattern"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
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 1c3797e22c..6cf4a58f1e 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1.smali
@@ -64,7 +64,7 @@
 
     invoke-virtual {p0, v0, v1, p2}, Lcom/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1;->invoke(JLcom/discord/models/domain/emoji/ModelEmojiCustom;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali b/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
index 8fa7ea7bba..4975a9f4ed 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
@@ -320,13 +320,13 @@
 
     move-result p2
 
-    invoke-static {p2}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {p2}, Lkotlin/a/ad;->dj(I)I
 
     move-result p2
 
     const/16 v1, 0x10
 
-    invoke-static {p2, v1}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {p2, v1}, Lkotlin/ranges/c;->Y(II)I
 
     move-result p2
 
@@ -408,7 +408,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -623,7 +623,7 @@
 
     invoke-direct {p0, v1, v2, v0, p1}, Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLcom/discord/models/domain/ModelGuildMember;Ljava/util/Collection;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 
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 85c548facd..53199b8ec4 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiGuild$activate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiGuild$activate$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreEmojiGuild$activate$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 e41e25cb97..00767b2e35 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiGuild$deactivate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiGuild$deactivate$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreEmojiGuild$deactivate$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 4a230ffc5a..cc879de954 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiGuild$deleteEmoji$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiGuild$deleteEmoji$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreEmojiGuild$deleteEmoji$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -160,7 +160,7 @@
     goto :goto_2
 
     :cond_3
-    sget-object v2, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v2, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     move-object v4, v2
 
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 8005f08c89..fc58277813 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiGuild$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiGuild$get$1.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEmojiGuild$get$1;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 be84f25e57..3730139702 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiGuild$handleGuildEmojisLoaded$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiGuild$handleGuildEmojisLoaded$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreEmojiGuild$handleGuildEmojisLoaded$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiGuild.smali b/com.discord/smali/com/discord/stores/StoreEmojiGuild.smali
index d7fbfeb1fe..c7bd467f14 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiGuild.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiGuild.smali
@@ -281,7 +281,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1.smali
new file mode 100644
index 0000000000..3c96b696a5
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1.smali
@@ -0,0 +1,80 @@
+.class final Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1;
+.super Lkotlin/jvm/internal/l;
+.source "StoreEntitlements.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreEntitlements$Actions;->fetchMyEntitlementsForApplication(J)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1;
+
+    invoke-direct {v0}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1;-><init>()V
+
+    sput-object v0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 1
+
+    sget-object v0, Lcom/discord/stores/StoreEntitlements$Actions;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions;
+
+    invoke-static {v0}, Lcom/discord/stores/StoreEntitlements$Actions;->access$getStore$p(Lcom/discord/stores/StoreEntitlements$Actions;)Lcom/discord/stores/StoreEntitlements;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreEntitlements;->handleFetchingState()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2$1.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2$1.smali
new file mode 100644
index 0000000000..8be08efac6
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2$1.smali
@@ -0,0 +1,80 @@
+.class final Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2$1;
+.super Lkotlin/jvm/internal/l;
+.source "StoreEntitlements.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2;->invoke(Lcom/discord/utilities/error/Error;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2$1;
+
+    invoke-direct {v0}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2$1;-><init>()V
+
+    sput-object v0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2$1;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 1
+
+    sget-object v0, Lcom/discord/stores/StoreEntitlements$Actions;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions;
+
+    invoke-static {v0}, Lcom/discord/stores/StoreEntitlements$Actions;->access$getStore$p(Lcom/discord/stores/StoreEntitlements$Actions;)Lcom/discord/stores/StoreEntitlements;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreEntitlements;->handleFetchError()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2.smali
new file mode 100644
index 0000000000..0c88246a84
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2.smali
@@ -0,0 +1,91 @@
+.class final Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2;
+.super Lkotlin/jvm/internal/l;
+.source "StoreEntitlements.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreEntitlements$Actions;->fetchMyEntitlementsForApplication(J)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/error/Error;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2;
+
+    invoke-direct {v0}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2;-><init>()V
+
+    sput-object v0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/error/Error;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2;->invoke(Lcom/discord/utilities/error/Error;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ: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}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p1, Lcom/discord/stores/StoreEntitlements$Actions;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions;
+
+    invoke-static {p1}, Lcom/discord/stores/StoreEntitlements$Actions;->access$getStream$p(Lcom/discord/stores/StoreEntitlements$Actions;)Lcom/discord/stores/StoreStream;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2$1;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2$1;
+
+    check-cast v0, Lkotlin/jvm/functions/Function0;
+
+    invoke-virtual {p1, v0}, Lcom/discord/stores/StoreStream;->schedule(Lkotlin/jvm/functions/Function0;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3$1.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3$1.smali
new file mode 100644
index 0000000000..3251ee468e
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3$1.smali
@@ -0,0 +1,80 @@
+.class final Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3$1;
+.super Lkotlin/jvm/internal/l;
+.source "StoreEntitlements.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3;->invoke(Ljava/util/List;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $entitlements:Ljava/util/List;
+
+.field final synthetic this$0:Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3;Ljava/util/List;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3$1;->this$0:Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3;
+
+    iput-object p2, p0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3$1;->$entitlements:Ljava/util/List;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 4
+
+    sget-object v0, Lcom/discord/stores/StoreEntitlements$Actions;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions;
+
+    invoke-static {v0}, Lcom/discord/stores/StoreEntitlements$Actions;->access$getStore$p(Lcom/discord/stores/StoreEntitlements$Actions;)Lcom/discord/stores/StoreEntitlements;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3$1;->this$0:Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3;
+
+    iget-wide v1, v1, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3;->$applicationId:J
+
+    iget-object v3, p0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3$1;->$entitlements:Ljava/util/List;
+
+    invoke-virtual {v0, v1, v2, v3}, Lcom/discord/stores/StoreEntitlements;->handleFetchEntitlementsSuccess(JLjava/util/List;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3.smali
new file mode 100644
index 0000000000..0ad8a2e0ac
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3.smali
@@ -0,0 +1,94 @@
+.class final Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3;
+.super Lkotlin/jvm/internal/l;
+.source "StoreEntitlements.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreEntitlements$Actions;->fetchMyEntitlementsForApplication(J)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelEntitlement;",
+        ">;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $applicationId:J
+
+
+# direct methods
+.method constructor <init>(J)V
+    .locals 0
+
+    iput-wide p1, p0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3;->$applicationId:J
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/List;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3;->invoke(Ljava/util/List;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ: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/ModelEntitlement;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "entitlements"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/stores/StoreEntitlements$Actions;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions;
+
+    invoke-static {v0}, Lcom/discord/stores/StoreEntitlements$Actions;->access$getStream$p(Lcom/discord/stores/StoreEntitlements$Actions;)Lcom/discord/stores/StoreStream;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3$1;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3$1;-><init>(Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3;Ljava/util/List;)V
+
+    check-cast v1, Lkotlin/jvm/functions/Function0;
+
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream;->schedule(Lkotlin/jvm/functions/Function0;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$1.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$1.smali
index 4720e901be..5719b5c6f6 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$1.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$2$1.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$2$1.smali
index 04be8db382..019e8bc74d 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$2$1.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$2.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$2.smali
index 838134fc41..0ba5680fcf 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$3$1.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$3$1.smali
index 136287effa..d93af68a27 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$3$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$3$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -66,7 +66,7 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$3$1;->$entitlements:Ljava/util/List;
 
-    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreEntitlements;->handleFetchStateSuccess(Ljava/util/List;)V
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreEntitlements;->handleFetchGiftsSuccess(Ljava/util/List;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$3.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$3.smali
index 8795649131..db6944d91d 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$3.smali
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$3;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions.smali
index ebe839d873..3e914e9a14 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions.smali
@@ -52,7 +52,7 @@
 
     const-string v0, "store"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -67,7 +67,7 @@
 
     const-string v0, "stream"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -91,6 +91,75 @@
 
 
 # virtual methods
+.method public final fetchMyEntitlementsForApplication(J)V
+    .locals 13
+
+    sget-object v0, Lcom/discord/stores/StoreEntitlements$Actions;->stream:Lcom/discord/stores/StoreStream;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "stream"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    sget-object v1, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1;
+
+    check-cast v1, Lkotlin/jvm/functions/Function0;
+
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream;->schedule(Lkotlin/jvm/functions/Function0;)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 {v0, p1, p2}, Lcom/discord/utilities/rest/RestAPI;->getMyEntitlements(J)Lrx/Observable;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v4
+
+    const-class v5, Lcom/discord/stores/StoreEntitlements;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    sget-object v0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2;
+
+    move-object v8, v0
+
+    check-cast v8, Lkotlin/jvm/functions/Function1;
+
+    const/4 v9, 0x0
+
+    new-instance v0, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3;
+
+    invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3;-><init>(J)V
+
+    move-object v10, v0
+
+    check-cast v10, Lkotlin/jvm/functions/Function1;
+
+    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
+
+    return-void
+.end method
+
 .method public final fetchMyGiftEntitlements()V
     .locals 13
 
@@ -100,7 +169,7 @@
 
     const-string v1, "stream"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     sget-object v1, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$1;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions$fetchMyGiftEntitlements$1;
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 4106989618..c7b82dc134 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$State$Loaded.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$State$Loaded.smali
@@ -15,7 +15,19 @@
 
 
 # instance fields
-.field private final giftEntitlementMap:Ljava/util/Map;
+.field private final giftableEntitlements:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+.field private final ownedEntitlements:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -29,7 +41,7 @@
 
 
 # direct methods
-.method public constructor <init>(Ljava/util/Map;)V
+.method public constructor <init>(Ljava/util/Map;Ljava/util/Map;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -39,34 +51,53 @@
             "+",
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;>;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
             ">;>;)V"
         }
     .end annotation
 
-    const-string v0, "giftEntitlementMap"
+    const-string v0, "giftableEntitlements"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "ownedEntitlements"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
     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;->giftEntitlementMap:Ljava/util/Map;
+    iput-object p1, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftableEntitlements:Ljava/util/Map;
+
+    iput-object p2, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->ownedEntitlements:Ljava/util/Map;
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/stores/StoreEntitlements$State$Loaded;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/stores/StoreEntitlements$State$Loaded;
+.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;
     .locals 0
 
-    and-int/lit8 p2, p2, 0x1
+    and-int/lit8 p4, p3, 0x1
 
-    if-eqz p2, :cond_0
+    if-eqz p4, :cond_0
 
-    iget-object p1, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftEntitlementMap:Ljava/util/Map;
+    iget-object p1, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftableEntitlements:Ljava/util/Map;
 
     :cond_0
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEntitlements$State$Loaded;->copy(Ljava/util/Map;)Lcom/discord/stores/StoreEntitlements$State$Loaded;
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_1
+
+    iget-object p2, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->ownedEntitlements:Ljava/util/Map;
+
+    :cond_1
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreEntitlements$State$Loaded;->copy(Ljava/util/Map;Ljava/util/Map;)Lcom/discord/stores/StoreEntitlements$State$Loaded;
 
     move-result-object p0
 
@@ -88,12 +119,30 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftEntitlementMap:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftableEntitlements:Ljava/util/Map;
 
     return-object v0
 .end method
 
-.method public final copy(Ljava/util/Map;)Lcom/discord/stores/StoreEntitlements$State$Loaded;
+.method public final component2()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->ownedEntitlements:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/util/Map;Ljava/util/Map;)Lcom/discord/stores/StoreEntitlements$State$Loaded;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -103,24 +152,72 @@
             "+",
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;>;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
             ">;>;)",
             "Lcom/discord/stores/StoreEntitlements$State$Loaded;"
         }
     .end annotation
 
-    const-string v0, "giftEntitlementMap"
+    const-string v0, "giftableEntitlements"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "ownedEntitlements"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Lcom/discord/stores/StoreEntitlements$State$Loaded;
 
-    invoke-direct {v0, p1}, Lcom/discord/stores/StoreEntitlements$State$Loaded;-><init>(Ljava/util/Map;)V
+    invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreEntitlements$State$Loaded;-><init>(Ljava/util/Map;Ljava/util/Map;)V
+
+    return-object v0
+.end method
+
+.method public final deepCopy()Lcom/discord/stores/StoreEntitlements$State$Loaded;
+    .locals 3
+
+    new-instance v0, Ljava/util/HashMap;
+
+    iget-object v1, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftableEntitlements:Ljava/util/Map;
+
+    invoke-direct {v0, v1}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
+
+    check-cast v0, Ljava/util/Map;
+
+    new-instance v1, Ljava/util/HashMap;
+
+    iget-object v2, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->ownedEntitlements:Ljava/util/Map;
+
+    invoke-direct {v1, v2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
+
+    check-cast v1, Ljava/util/Map;
+
+    invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreEntitlements$State$Loaded;->copy(Ljava/util/Map;Ljava/util/Map;)Lcom/discord/stores/StoreEntitlements$State$Loaded;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic deepCopy()Lcom/discord/stores/StoreEntitlements$State;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/stores/StoreEntitlements$State$Loaded;->deepCopy()Lcom/discord/stores/StoreEntitlements$State$Loaded;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/stores/StoreEntitlements$State;
 
     return-object v0
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
-    .locals 1
+    .locals 2
 
     if-eq p0, p1, :cond_1
 
@@ -130,9 +227,19 @@
 
     check-cast p1, Lcom/discord/stores/StoreEntitlements$State$Loaded;
 
-    iget-object v0, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftEntitlementMap:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftableEntitlements:Ljava/util/Map;
 
-    iget-object p1, p1, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftEntitlementMap:Ljava/util/Map;
+    iget-object v1, p1, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftableEntitlements:Ljava/util/Map;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->ownedEntitlements:Ljava/util/Map;
+
+    iget-object p1, p1, Lcom/discord/stores/StoreEntitlements$State$Loaded;->ownedEntitlements:Ljava/util/Map;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -154,7 +261,7 @@
     return p1
 .end method
 
-.method public final getGiftEntitlementMap()Ljava/util/Map;
+.method public final getGiftableEntitlements()Ljava/util/Map;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -167,15 +274,35 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftEntitlementMap:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftableEntitlements:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final getOwnedEntitlements()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->ownedEntitlements:Ljava/util/Map;
 
     return-object v0
 .end method
 
 .method public final hashCode()I
-    .locals 1
+    .locals 3
 
-    iget-object v0, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftEntitlementMap:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftableEntitlements:Ljava/util/Map;
+
+    const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
@@ -183,11 +310,25 @@
 
     move-result v0
 
-    return 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/StoreEntitlements$State$Loaded;->ownedEntitlements:Ljava/util/Map;
+
+    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
 
@@ -196,11 +337,19 @@
 
     new-instance v0, Ljava/lang/StringBuilder;
 
-    const-string v1, "Loaded(giftEntitlementMap="
+    const-string v1, "Loaded(giftableEntitlements="
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftEntitlementMap:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftableEntitlements:Ljava/util/Map;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", ownedEntitlements="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->ownedEntitlements:Ljava/util/Map;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$State.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$State.smali
index 039b42dd52..76b8a0108a 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$State.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$State.smali
@@ -38,3 +38,11 @@
 
     return-void
 .end method
+
+
+# virtual methods
+.method public deepCopy()Lcom/discord/stores/StoreEntitlements$State;
+    .locals 0
+
+    return-object p0
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements.smali b/com.discord/smali/com/discord/stores/StoreEntitlements.smali
index 8a12dc6091..109cbd6a5f 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements.smali
@@ -16,6 +16,31 @@
 
 
 # instance fields
+.field private entitlementMap:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+.field private giftEntitlementMap:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
 .field private isDirty:Z
 
 .field private state:Lcom/discord/stores/StoreEntitlements$State;
@@ -45,6 +70,20 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreEntitlements;->stream:Lcom/discord/stores/StoreStream;
 
+    invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/stores/StoreEntitlements;->giftEntitlementMap:Ljava/util/Map;
+
+    new-instance p1, Ljava/util/LinkedHashMap;
+
+    invoke-direct {p1}, Ljava/util/LinkedHashMap;-><init>()V
+
+    check-cast p1, Ljava/util/Map;
+
+    iput-object p1, p0, Lcom/discord/stores/StoreEntitlements;->entitlementMap:Ljava/util/Map;
+
     sget-object p1, Lcom/discord/stores/StoreEntitlements$State$Loading;->INSTANCE:Lcom/discord/stores/StoreEntitlements$State$Loading;
 
     check-cast p1, Lcom/discord/stores/StoreEntitlements$State;
@@ -100,6 +139,51 @@
     return-object v0
 .end method
 
+.method public final handleFetchEntitlementsSuccess(JLjava/util/List;)V
+    .locals 1
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(J",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "entitlements"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreEntitlements;->entitlementMap:Ljava/util/Map;
+
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    invoke-interface {v0, p1, p3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    new-instance p1, Lcom/discord/stores/StoreEntitlements$State$Loaded;
+
+    iget-object p2, p0, Lcom/discord/stores/StoreEntitlements;->giftEntitlementMap:Ljava/util/Map;
+
+    iget-object p3, p0, Lcom/discord/stores/StoreEntitlements;->entitlementMap:Ljava/util/Map;
+
+    invoke-direct {p1, p2, p3}, Lcom/discord/stores/StoreEntitlements$State$Loaded;-><init>(Ljava/util/Map;Ljava/util/Map;)V
+
+    check-cast p1, Lcom/discord/stores/StoreEntitlements$State;
+
+    iput-object p1, p0, Lcom/discord/stores/StoreEntitlements;->state:Lcom/discord/stores/StoreEntitlements$State;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Lcom/discord/stores/StoreEntitlements;->isDirty:Z
+
+    return-void
+.end method
+
 .method public final handleFetchError()V
     .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
@@ -118,7 +202,7 @@
     return-void
 .end method
 
-.method public final handleFetchStateSuccess(Ljava/util/List;)V
+.method public final handleFetchGiftsSuccess(Ljava/util/List;)V
     .locals 6
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
@@ -132,7 +216,7 @@
         }
     .end annotation
 
-    const-string v0, "entitlements"
+    const-string v0, "giftEntitlements"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -182,7 +266,7 @@
     check-cast v2, Ljava/util/List;
 
     :cond_0
-    const-string v3, "entitlementMap[entitlement.skuId] ?: ArrayList()"
+    const-string v3, "newGiftEntitlementMap[en\u2026ent.skuId] ?: ArrayList()"
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -205,11 +289,17 @@
     goto :goto_0
 
     :cond_1
-    new-instance p1, Lcom/discord/stores/StoreEntitlements$State$Loaded;
-
     check-cast v0, Ljava/util/Map;
 
-    invoke-direct {p1, v0}, Lcom/discord/stores/StoreEntitlements$State$Loaded;-><init>(Ljava/util/Map;)V
+    iput-object v0, p0, Lcom/discord/stores/StoreEntitlements;->giftEntitlementMap:Ljava/util/Map;
+
+    new-instance p1, Lcom/discord/stores/StoreEntitlements$State$Loaded;
+
+    iget-object v0, p0, Lcom/discord/stores/StoreEntitlements;->giftEntitlementMap:Ljava/util/Map;
+
+    iget-object v1, p0, Lcom/discord/stores/StoreEntitlements;->entitlementMap:Ljava/util/Map;
+
+    invoke-direct {p1, v0, v1}, Lcom/discord/stores/StoreEntitlements$State$Loaded;-><init>(Ljava/util/Map;Ljava/util/Map;)V
 
     check-cast p1, Lcom/discord/stores/StoreEntitlements$State;
 
@@ -253,6 +343,10 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreEntitlements;->state:Lcom/discord/stores/StoreEntitlements$State;
 
+    invoke-virtual {v1}, Lcom/discord/stores/StoreEntitlements$State;->deepCopy()Lcom/discord/stores/StoreEntitlements$State;
+
+    move-result-object v1
+
     invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     const/4 v0, 0x0
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 d52b7653f7..0e35aec0eb 100644
--- a/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders$closeFolder$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders$closeFolder$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreExpandedGuildFolders$closeFolder$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 0d9e4d5851..29d4e4a000 100644
--- a/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders$openFolder$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders$openFolder$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreExpandedGuildFolders$openFolder$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$Triggered.smali b/com.discord/smali/com/discord/stores/StoreExperiments$Triggered.smali
index 97796e161a..31d0785fb7 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$Triggered.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$Triggered.smali
@@ -163,31 +163,25 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/stores/StoreExperiments$Triggered;->time:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v3
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
+    iget-wide v1, p0, Lcom/discord/stores/StoreExperiments$Triggered;->experimentHash:J
 
-    mul-int/lit8 v1, v1, 0x1f
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    iget-wide v3, p0, Lcom/discord/stores/StoreExperiments$Triggered;->experimentHash:J
+    move-result v1
 
-    ushr-long v5, v3, v2
+    add-int/2addr v0, v1
 
-    xor-long/2addr v3, v5
-
-    long-to-int v0, v3
-
-    add-int/2addr v1, v0
-
-    return v1
+    return v0
 .end method
 
 .method public final isStale(J)Z
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments.smali b/com.discord/smali/com/discord/stores/StoreExperiments.smali
index fd76142933..f62231b830 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments.smali
@@ -654,7 +654,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -802,7 +802,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -892,7 +892,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
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 e4a78a7f8f..86cb330afb 100644
--- a/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2.smali
@@ -98,7 +98,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/stores/StoreGameParty.smali b/com.discord/smali/com/discord/stores/StoreGameParty.smali
index 3d13eb3788..265c88f2d3 100644
--- a/com.discord/smali/com/discord/stores/StoreGameParty.smali
+++ b/com.discord/smali/com/discord/stores/StoreGameParty.smali
@@ -504,7 +504,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 9267294d71..e327f1a771 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion.smali
@@ -127,9 +127,9 @@
 
     move-result-object p1
 
-    sget-object v2, Lcom/discord/app/g;->uX:Lcom/discord/app/g;
+    sget-object v2, Lcom/discord/app/g;->uW:Lcom/discord/app/g;
 
-    invoke-static {}, Lcom/discord/app/g;->dy()Lrx/Observable;
+    invoke-static {}, Lcom/discord/app/g;->dx()Lrx/Observable;
 
     move-result-object v2
 
@@ -143,9 +143,9 @@
 
     check-cast v3, Lkotlin/jvm/functions/Function4;
 
-    new-instance v4, Lcom/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0;
+    new-instance v4, Lcom/discord/stores/StoreGatewayConnectionKt$sam$rx_functions_Func4$0;
 
-    invoke-direct {v4, v3}, Lcom/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0;-><init>(Lkotlin/jvm/functions/Function4;)V
+    invoke-direct {v4, v3}, Lcom/discord/stores/StoreGatewayConnectionKt$sam$rx_functions_Func4$0;-><init>(Lkotlin/jvm/functions/Function4;)V
 
     check-cast v4, Lrx/functions/Func4;
 
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 41960e1ad4..11adfc5313 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$callConnect$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$callConnect$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGatewayConnection$callConnect$1;->invoke(Lcom/discord/gateway/GatewaySocket;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 5784804307..572e78bb05 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$init$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGatewayConnection$init$1;->invoke(Lcom/discord/stores/StoreGatewayConnection$ClientState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 2d4967ebc4..07b72e2f91 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$presenceUpdate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$presenceUpdate$1.smali
@@ -65,7 +65,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;->invoke(Lcom/discord/gateway/GatewaySocket;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 246c77ddc4..fe05eca22c 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$requestGuildMembers$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$requestGuildMembers$1.smali
@@ -65,7 +65,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGatewayConnection$requestGuildMembers$1;->invoke(Lcom/discord/gateway/GatewaySocket;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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
new file mode 100644
index 0000000000..6a1bd8186d
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamDelete$1.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/stores/StoreGatewayConnection$streamDelete$1;
+.super Lkotlin/jvm/internal/l;
+.source "StoreGatewayConnection.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreGatewayConnection;->streamDelete(Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/gateway/GatewaySocket;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $streamKey:Ljava/lang/String;
+
+
+# direct methods
+.method constructor <init>(Ljava/lang/String;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnection$streamDelete$1;->$streamKey:Ljava/lang/String;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/gateway/GatewaySocket;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGatewayConnection$streamDelete$1;->invoke(Lcom/discord/gateway/GatewaySocket;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/gateway/GatewaySocket;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.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
new file mode 100644
index 0000000000..99d5e50b1d
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamWatch$1.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/stores/StoreGatewayConnection$streamWatch$1;
+.super Lkotlin/jvm/internal/l;
+.source "StoreGatewayConnection.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreGatewayConnection;->streamWatch(Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/gateway/GatewaySocket;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $streamKey:Ljava/lang/String;
+
+
+# direct methods
+.method constructor <init>(Ljava/lang/String;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnection$streamWatch$1;->$streamKey:Ljava/lang/String;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/gateway/GatewaySocket;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGatewayConnection$streamWatch$1;->invoke(Lcom/discord/gateway/GatewaySocket;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/gateway/GatewaySocket;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection$streamWatch$1;->$streamKey:Ljava/lang/String;
+
+    invoke-virtual {p1, v0}, Lcom/discord/gateway/GatewaySocket;->streamWatch(Ljava/lang/String;)V
+
+    return-void
+.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 9d1535771a..9cb77b2e0c 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1;->invoke(Lcom/discord/gateway/GatewaySocket;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 8148b5eb12..f4ce5ec4e0 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceServerPing$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceServerPing$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGatewayConnection$voiceServerPing$1;->invoke(Lcom/discord/gateway/GatewaySocket;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 331466687e..d67d54ddde 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceStateUpdate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceStateUpdate$1.smali
@@ -69,7 +69,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;->invoke(Lcom/discord/gateway/GatewaySocket;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali
index a44c4db35f..0b1933706a 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali
@@ -81,6 +81,17 @@
     .end annotation
 .end field
 
+.field private final channelUnreadUpdate:Lrx/subjects/SerializedSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/SerializedSubject<",
+            "Lcom/discord/models/domain/ModelChannelUnreadUpdate;",
+            "Lcom/discord/models/domain/ModelChannelUnreadUpdate;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field private clientState:Lcom/discord/stores/StoreGatewayConnection$ClientState;
 
 .field private final connected:Lrx/subjects/SerializedSubject;
@@ -392,6 +403,50 @@
 
 .field private final stream:Lcom/discord/stores/StoreStream;
 
+.field private final streamCreate:Lrx/subjects/SerializedSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/SerializedSubject<",
+            "Lcom/discord/models/domain/StreamCreate;",
+            "Lcom/discord/models/domain/StreamCreate;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final streamDelete:Lrx/subjects/SerializedSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/SerializedSubject<",
+            "Lcom/discord/models/domain/StreamDelete;",
+            "Lcom/discord/models/domain/StreamDelete;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final streamServerUpdate:Lrx/subjects/SerializedSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/SerializedSubject<",
+            "Lcom/discord/models/domain/StreamServerUpdate;",
+            "Lcom/discord/models/domain/StreamServerUpdate;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final streamUpdate:Lrx/subjects/SerializedSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/SerializedSubject<",
+            "Lcom/discord/models/domain/StreamUpdate;",
+            "Lcom/discord/models/domain/StreamUpdate;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field private final typingStart:Lrx/subjects/SerializedSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -574,7 +629,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -586,7 +641,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -598,7 +653,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -610,7 +665,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -622,7 +677,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -634,7 +689,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -646,7 +701,19 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
+
+    move-result-object p2
+
+    check-cast p2, Lrx/subjects/Subject;
+
+    invoke-direct {p1, p2}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->channelUnreadUpdate:Lrx/subjects/SerializedSubject;
+
+    new-instance p1, Lrx/subjects/SerializedSubject;
+
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -658,7 +725,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -670,7 +737,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -682,7 +749,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -694,7 +761,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -706,7 +773,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -718,7 +785,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -730,7 +797,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -742,7 +809,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -754,7 +821,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -766,7 +833,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -778,7 +845,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -790,7 +857,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -802,7 +869,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -814,7 +881,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -826,7 +893,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -838,7 +905,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -850,7 +917,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -862,7 +929,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -874,7 +941,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -886,7 +953,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -898,7 +965,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -910,7 +977,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -922,7 +989,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -934,7 +1001,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -946,7 +1013,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -958,7 +1025,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -970,7 +1037,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -982,7 +1049,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -994,7 +1061,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1006,7 +1073,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1018,7 +1085,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1030,7 +1097,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1042,7 +1109,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1054,7 +1121,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1066,7 +1133,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1076,6 +1143,54 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userSubscriptionsUpdate:Lrx/subjects/SerializedSubject;
 
+    new-instance p1, Lrx/subjects/SerializedSubject;
+
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
+
+    move-result-object p2
+
+    check-cast p2, Lrx/subjects/Subject;
+
+    invoke-direct {p1, p2}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->streamCreate:Lrx/subjects/SerializedSubject;
+
+    new-instance p1, Lrx/subjects/SerializedSubject;
+
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
+
+    move-result-object p2
+
+    check-cast p2, Lrx/subjects/Subject;
+
+    invoke-direct {p1, p2}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->streamUpdate:Lrx/subjects/SerializedSubject;
+
+    new-instance p1, Lrx/subjects/SerializedSubject;
+
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
+
+    move-result-object p2
+
+    check-cast p2, Lrx/subjects/Subject;
+
+    invoke-direct {p1, p2}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->streamServerUpdate:Lrx/subjects/SerializedSubject;
+
+    new-instance p1, Lrx/subjects/SerializedSubject;
+
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
+
+    move-result-object p2
+
+    check-cast p2, Lrx/subjects/Subject;
+
+    invoke-direct {p1, p2}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->streamDelete:Lrx/subjects/SerializedSubject;
+
     return-void
 .end method
 
@@ -1153,13 +1268,13 @@
 
     aput-object v1, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/App;->tK:Lcom/discord/app/App$a;
+    sget-object v1, Lcom/discord/app/App;->tJ:Lcom/discord/app/App$a;
 
-    invoke-static {}, Lcom/discord/app/App;->dm()Z
+    invoke-static {}, Lcom/discord/app/App;->dl()Z
 
     move-result v1
 
@@ -1179,9 +1294,9 @@
     move-object v12, v1
 
     :goto_0
-    sget-object v1, Lcom/discord/app/App;->tK:Lcom/discord/app/App$a;
+    sget-object v1, Lcom/discord/app/App;->tJ:Lcom/discord/app/App$a;
 
-    invoke-static {}, Lcom/discord/app/App;->dm()Z
+    invoke-static {}, Lcom/discord/app/App;->dl()Z
 
     move-result v1
 
@@ -1216,7 +1331,7 @@
 
     iget-object v7, p0, Lcom/discord/stores/StoreGatewayConnection;->scheduler:Lrx/Scheduler;
 
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     move-object v8, v2
 
@@ -1617,6 +1732,23 @@
     return-object v0
 .end method
 
+.method public final getChannelUnreadUpdate()Lrx/subjects/SerializedSubject;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/subjects/SerializedSubject<",
+            "Lcom/discord/models/domain/ModelChannelUnreadUpdate;",
+            "Lcom/discord/models/domain/ModelChannelUnreadUpdate;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection;->channelUnreadUpdate:Lrx/subjects/SerializedSubject;
+
+    return-object v0
+.end method
+
 .method public final getConnected()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
@@ -1630,7 +1762,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection;->connected:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1654,7 +1786,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection;->connectionReady:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -2096,6 +2228,74 @@
     return-object v0
 .end method
 
+.method public final getStreamCreate()Lrx/subjects/SerializedSubject;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/subjects/SerializedSubject<",
+            "Lcom/discord/models/domain/StreamCreate;",
+            "Lcom/discord/models/domain/StreamCreate;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection;->streamCreate:Lrx/subjects/SerializedSubject;
+
+    return-object v0
+.end method
+
+.method public final getStreamDelete()Lrx/subjects/SerializedSubject;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/subjects/SerializedSubject<",
+            "Lcom/discord/models/domain/StreamDelete;",
+            "Lcom/discord/models/domain/StreamDelete;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection;->streamDelete:Lrx/subjects/SerializedSubject;
+
+    return-object v0
+.end method
+
+.method public final getStreamServerUpdate()Lrx/subjects/SerializedSubject;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/subjects/SerializedSubject<",
+            "Lcom/discord/models/domain/StreamServerUpdate;",
+            "Lcom/discord/models/domain/StreamServerUpdate;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection;->streamServerUpdate:Lrx/subjects/SerializedSubject;
+
+    return-object v0
+.end method
+
+.method public final getStreamUpdate()Lrx/subjects/SerializedSubject;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/subjects/SerializedSubject<",
+            "Lcom/discord/models/domain/StreamUpdate;",
+            "Lcom/discord/models/domain/StreamUpdate;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection;->streamUpdate:Lrx/subjects/SerializedSubject;
+
+    return-object v0
+.end method
+
 .method public final getTypingStart()Lrx/subjects/SerializedSubject;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -2349,6 +2549,21 @@
     goto/16 :goto_6
 
     :sswitch_0
+    const-string v0, "STREAM_UPDATE"
+
+    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/stores/StoreGatewayConnection;->streamUpdate:Lrx/subjects/SerializedSubject;
+
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+
+    :sswitch_1
     const-string v0, "GUILD_ROLE_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2357,9 +2572,9 @@
 
     if-eqz p1, :cond_1
 
-    goto :goto_0
+    goto/16 :goto_0
 
-    :sswitch_1
+    :sswitch_2
     const-string v0, "VOICE_SERVER_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2374,7 +2589,7 @@
 
     return-void
 
-    :sswitch_2
+    :sswitch_3
     const-string v0, "VOICE_STATE_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2389,7 +2604,7 @@
 
     return-void
 
-    :sswitch_3
+    :sswitch_4
     const-string v0, "PRESENCES_REPLACE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2404,7 +2619,22 @@
 
     return-void
 
-    :sswitch_4
+    :sswitch_5
+    const-string v0, "STREAM_DELETE"
+
+    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/stores/StoreGatewayConnection;->streamDelete:Lrx/subjects/SerializedSubject;
+
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    goto/16 :goto_6
+
+    :sswitch_6
     const-string v0, "GUILD_BAN_REMOVE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2419,7 +2649,22 @@
 
     return-void
 
-    :sswitch_5
+    :sswitch_7
+    const-string v0, "STREAM_CREATE"
+
+    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/stores/StoreGatewayConnection;->streamCreate:Lrx/subjects/SerializedSubject;
+
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+
+    :sswitch_8
     const-string v0, "MESSAGE_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2434,7 +2679,7 @@
 
     return-void
 
-    :sswitch_6
+    :sswitch_9
     const-string v0, "GUILD_ROLE_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2449,7 +2694,7 @@
 
     return-void
 
-    :sswitch_7
+    :sswitch_a
     const-string p2, "USER_CONNECTIONS_UPDATE"
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2460,13 +2705,13 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userConnectionUpdate:Lrx/subjects/SerializedSubject;
 
-    sget-object p2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
 
-    :sswitch_8
+    :sswitch_b
     const-string v0, "GUILD_ROLE_CREATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2482,7 +2727,7 @@
 
     return-void
 
-    :sswitch_9
+    :sswitch_c
     const-string v0, "USER_GUILD_SETTINGS_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2497,7 +2742,7 @@
 
     return-void
 
-    :sswitch_a
+    :sswitch_d
     const-string v0, "MESSAGE_ACK"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2512,7 +2757,7 @@
 
     return-void
 
-    :sswitch_b
+    :sswitch_e
     const-string v0, "GUILD_EMOJIS_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2527,7 +2772,7 @@
 
     return-void
 
-    :sswitch_c
+    :sswitch_f
     const-string v0, "MESSAGE_REACTION_REMOVE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2542,7 +2787,7 @@
 
     return-void
 
-    :sswitch_d
+    :sswitch_10
     const-string v0, "CHANNEL_RECIPIENT_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2557,7 +2802,7 @@
 
     return-void
 
-    :sswitch_e
+    :sswitch_11
     const-string v0, "MESSAGE_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2568,7 +2813,7 @@
 
     goto :goto_1
 
-    :sswitch_f
+    :sswitch_12
     const-string v0, "MESSAGE_CREATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2583,7 +2828,7 @@
 
     return-void
 
-    :sswitch_10
+    :sswitch_13
     const-string v0, "USER_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2598,7 +2843,7 @@
 
     return-void
 
-    :sswitch_11
+    :sswitch_14
     const-string v0, "CALL_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2607,9 +2852,9 @@
 
     if-eqz p1, :cond_1
 
-    goto :goto_2
+    goto/16 :goto_2
 
-    :sswitch_12
+    :sswitch_15
     const-string v0, "GUILD_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2618,9 +2863,24 @@
 
     if-eqz p1, :cond_1
 
-    goto :goto_3
+    goto/16 :goto_3
 
-    :sswitch_13
+    :sswitch_16
+    const-string v0, "STREAM_SERVER_UPDATE"
+
+    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/stores/StoreGatewayConnection;->streamServerUpdate:Lrx/subjects/SerializedSubject;
+
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+
+    :sswitch_17
     const-string v0, "READY"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2635,7 +2895,7 @@
 
     return-void
 
-    :sswitch_14
+    :sswitch_18
     const-string v0, "GUILD_MEMBER_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2646,7 +2906,7 @@
 
     goto/16 :goto_5
 
-    :sswitch_15
+    :sswitch_19
     const-string v0, "MESSAGE_DELETE_BULK"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2662,7 +2922,7 @@
 
     return-void
 
-    :sswitch_16
+    :sswitch_1a
     const-string v0, "GUILD_MEMBER_REMOVE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2677,7 +2937,7 @@
 
     return-void
 
-    :sswitch_17
+    :sswitch_1b
     const-string v0, "CHANNEL_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2688,7 +2948,22 @@
 
     goto/16 :goto_4
 
-    :sswitch_18
+    :sswitch_1c
+    const-string v0, "CHANNEL_UNREAD_UPDATE"
+
+    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/stores/StoreGatewayConnection;->channelUnreadUpdate:Lrx/subjects/SerializedSubject;
+
+    invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+
+    :sswitch_1d
     const-string v0, "CALL_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2703,7 +2978,7 @@
 
     return-void
 
-    :sswitch_19
+    :sswitch_1e
     const-string v0, "CALL_CREATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2719,7 +2994,7 @@
 
     return-void
 
-    :sswitch_1a
+    :sswitch_1f
     const-string v0, "GUILD_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2734,7 +3009,7 @@
 
     return-void
 
-    :sswitch_1b
+    :sswitch_20
     const-string v0, "GUILD_CREATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2750,7 +3025,7 @@
 
     return-void
 
-    :sswitch_1c
+    :sswitch_21
     const-string v0, "USER_PAYMENT_SOURCES_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2765,7 +3040,7 @@
 
     return-void
 
-    :sswitch_1d
+    :sswitch_22
     const-string v0, "TYPING_START"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2780,7 +3055,7 @@
 
     return-void
 
-    :sswitch_1e
+    :sswitch_23
     const-string v0, "CHANNEL_RECIPIENT_REMOVE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2795,7 +3070,7 @@
 
     return-void
 
-    :sswitch_1f
+    :sswitch_24
     const-string v0, "CHANNEL_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2810,7 +3085,7 @@
 
     return-void
 
-    :sswitch_20
+    :sswitch_25
     const-string v0, "CHANNEL_CREATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2826,7 +3101,7 @@
 
     return-void
 
-    :sswitch_21
+    :sswitch_26
     const-string v0, "RELATIONSHIP_REMOVE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2841,7 +3116,7 @@
 
     return-void
 
-    :sswitch_22
+    :sswitch_27
     const-string v0, "USER_SETTINGS_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2856,7 +3131,7 @@
 
     return-void
 
-    :sswitch_23
+    :sswitch_28
     const-string v0, "GUILD_INTEGRATIONS_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2871,7 +3146,7 @@
 
     return-void
 
-    :sswitch_24
+    :sswitch_29
     const-string v0, "PRESENCE_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2886,7 +3161,7 @@
 
     return-void
 
-    :sswitch_25
+    :sswitch_2a
     const-string v0, "USER_NOTE_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2901,7 +3176,7 @@
 
     return-void
 
-    :sswitch_26
+    :sswitch_2b
     const-string v0, "USER_SUBSCRIPTIONS_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2914,9 +3189,9 @@
 
     invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
-    goto/16 :goto_6
+    return-void
 
-    :sswitch_27
+    :sswitch_2c
     const-string v0, "GUILD_MEMBER_LIST_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2931,7 +3206,7 @@
 
     return-void
 
-    :sswitch_28
+    :sswitch_2d
     const-string v0, "MESSAGE_REACTION_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2946,7 +3221,7 @@
 
     return-void
 
-    :sswitch_29
+    :sswitch_2e
     const-string v0, "GUILD_MEMBER_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2962,7 +3237,7 @@
 
     return-void
 
-    :sswitch_2a
+    :sswitch_2f
     const-string v0, "GUILD_BAN_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2977,7 +3252,7 @@
 
     return-void
 
-    :sswitch_2b
+    :sswitch_30
     const-string v0, "RELATIONSHIP_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2992,7 +3267,7 @@
 
     return-void
 
-    :sswitch_2c
+    :sswitch_31
     const-string v0, "USER_REQUIRED_ACTION_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3007,7 +3282,7 @@
 
     return-void
 
-    :sswitch_2d
+    :sswitch_32
     const-string v0, "MESSAGE_REACTION_REMOVE_ALL"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3022,7 +3297,7 @@
 
     return-void
 
-    :sswitch_2e
+    :sswitch_33
     const-string v0, "GUILD_MEMBERS_CHUNK"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3037,7 +3312,7 @@
 
     return-void
 
-    :sswitch_2f
+    :sswitch_34
     const-string v0, "SESSIONS_REPLACE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3054,56 +3329,63 @@
     :goto_6
     return-void
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
-        -0x78ca470e -> :sswitch_2f
-        -0x6cd113e5 -> :sswitch_2e
-        -0x5c91e13c -> :sswitch_2d
-        -0x57767eba -> :sswitch_2c
-        -0x4f1a5206 -> :sswitch_2b
-        -0x4b2dfc3b -> :sswitch_2a
-        -0x4a71b2b8 -> :sswitch_29
-        -0x49d2993d -> :sswitch_28
-        -0x47a432af -> :sswitch_27
-        -0x3a1461ba -> :sswitch_26
-        -0x394108be -> :sswitch_25
-        -0x35d8e373 -> :sswitch_24
-        -0x32448a83 -> :sswitch_23
-        -0x2e5f9c0f -> :sswitch_22
-        -0x2ad96395 -> :sswitch_21
-        -0x283cac28 -> :sswitch_20
-        -0x273bc779 -> :sswitch_1f
-        -0x20ab369a -> :sswitch_1e
-        -0x1e714c86 -> :sswitch_1d
-        -0x11eeea43 -> :sswitch_1c
-        -0x10511518 -> :sswitch_1b
-        -0xf503069 -> :sswitch_1a
-        -0xdeca603 -> :sswitch_19
-        -0xcebc154 -> :sswitch_18
-        -0x9a2145b -> :sswitch_17
-        -0x816eda3 -> :sswitch_16
-        -0x669dd32 -> :sswitch_15
-        -0x261ad5e -> :sswitch_14
-        0x4a3e183 -> :sswitch_13
-        0xe4982b5 -> :sswitch_12
-        0x10adf1ca -> :sswitch_11
-        0x17547bbd -> :sswitch_10
-        0x3b7f2454 -> :sswitch_f
-        0x3c800903 -> :sswitch_e
-        0x46f81adf -> :sswitch_d
-        0x4a7f4302 -> :sswitch_c
-        0x4c1b20ef -> :sswitch_b
-        0x4c5c6c11 -> :sswitch_a
-        0x52d81e85 -> :sswitch_9
-        0x58044679 -> :sswitch_8
-        0x581fe407 -> :sswitch_7
-        0x59052b28 -> :sswitch_6
-        0x5a19bc21 -> :sswitch_5
-        0x60ba6ec0 -> :sswitch_4
-        0x64b9c00d -> :sswitch_3
-        0x654afa64 -> :sswitch_2
-        0x702fd8d8 -> :sswitch_1
-        0x769ede46 -> :sswitch_0
+        -0x78ca470e -> :sswitch_34
+        -0x6cd113e5 -> :sswitch_33
+        -0x5c91e13c -> :sswitch_32
+        -0x57767eba -> :sswitch_31
+        -0x4f1a5206 -> :sswitch_30
+        -0x4b2dfc3b -> :sswitch_2f
+        -0x4a71b2b8 -> :sswitch_2e
+        -0x49d2993d -> :sswitch_2d
+        -0x47a432af -> :sswitch_2c
+        -0x3a1461ba -> :sswitch_2b
+        -0x394108be -> :sswitch_2a
+        -0x35d8e373 -> :sswitch_29
+        -0x32448a83 -> :sswitch_28
+        -0x2e5f9c0f -> :sswitch_27
+        -0x2ad96395 -> :sswitch_26
+        -0x283cac28 -> :sswitch_25
+        -0x273bc779 -> :sswitch_24
+        -0x20ab369a -> :sswitch_23
+        -0x1e714c86 -> :sswitch_22
+        -0x11eeea43 -> :sswitch_21
+        -0x10511518 -> :sswitch_20
+        -0xf503069 -> :sswitch_1f
+        -0xdeca603 -> :sswitch_1e
+        -0xcebc154 -> :sswitch_1d
+        -0xc585f03 -> :sswitch_1c
+        -0x9a2145b -> :sswitch_1b
+        -0x816eda3 -> :sswitch_1a
+        -0x669dd32 -> :sswitch_19
+        -0x261ad5e -> :sswitch_18
+        0x4a3e183 -> :sswitch_17
+        0x5195ac6 -> :sswitch_16
+        0xe4982b5 -> :sswitch_15
+        0x10adf1ca -> :sswitch_14
+        0x17547bbd -> :sswitch_13
+        0x3b7f2454 -> :sswitch_12
+        0x3c800903 -> :sswitch_11
+        0x46f81adf -> :sswitch_10
+        0x4a7f4302 -> :sswitch_f
+        0x4c1b20ef -> :sswitch_e
+        0x4c5c6c11 -> :sswitch_d
+        0x52d81e85 -> :sswitch_c
+        0x58044679 -> :sswitch_b
+        0x581fe407 -> :sswitch_a
+        0x59052b28 -> :sswitch_9
+        0x5a19bc21 -> :sswitch_8
+        0x60555e9b -> :sswitch_7
+        0x60ba6ec0 -> :sswitch_6
+        0x6156434a -> :sswitch_5
+        0x64b9c00d -> :sswitch_4
+        0x654afa64 -> :sswitch_3
+        0x702fd8d8 -> :sswitch_2
+        0x769ede46 -> :sswitch_1
+        0x7eeff668 -> :sswitch_0
     .end sparse-switch
 .end method
 
@@ -3140,7 +3422,7 @@
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
-    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->yd:Z
+    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->yo:Z
 
     if-eqz p1, :cond_0
 
@@ -3455,6 +3737,42 @@
     return p1
 .end method
 
+.method public final streamDelete(Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/stores/StoreGatewayConnection$streamDelete$1;
+
+    invoke-direct {v0, p1}, Lcom/discord/stores/StoreGatewayConnection$streamDelete$1;-><init>(Ljava/lang/String;)V
+
+    check-cast v0, Lkotlin/jvm/functions/Function1;
+
+    invoke-direct {p0, v0}, Lcom/discord/stores/StoreGatewayConnection;->requestIfSessionEstablished(Lkotlin/jvm/functions/Function1;)Z
+
+    return-void
+.end method
+
+.method public final streamWatch(Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/stores/StoreGatewayConnection$streamWatch$1;
+
+    invoke-direct {v0, p1}, Lcom/discord/stores/StoreGatewayConnection$streamWatch$1;-><init>(Ljava/lang/String;)V
+
+    check-cast v0, Lkotlin/jvm/functions/Function1;
+
+    invoke-direct {p0, v0}, Lcom/discord/stores/StoreGatewayConnection;->requestIfSessionEstablished(Lkotlin/jvm/functions/Function1;)Z
+
+    return-void
+.end method
+
 .method public final updateGuildSubscriptions(JLcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;)Z
     .locals 4
 
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnectionKt$sam$rx_functions_Func4$0.smali
similarity index 79%
rename from com.discord/smali/com/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0.smali
rename to com.discord/smali/com/discord/stores/StoreGatewayConnectionKt$sam$rx_functions_Func4$0.smali
index e17f0d265c..61eca8bc11 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnectionKt$sam$rx_functions_Func4$0.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0;
+.class final Lcom/discord/stores/StoreGatewayConnectionKt$sam$rx_functions_Func4$0;
 .super Ljava/lang/Object;
 .source "StoreGatewayConnection.kt"
 
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0;->function:Lkotlin/jvm/functions/Function4;
+    iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnectionKt$sam$rx_functions_Func4$0;->function:Lkotlin/jvm/functions/Function4;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .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/StoreGatewayConnection$sam$rx_functions_Func4$0;->function:Lkotlin/jvm/functions/Function4;
+    iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnectionKt$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;
 
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnectionKt.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnectionKt.smali
new file mode 100644
index 0000000000..f5f0d9f12e
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnectionKt.smali
@@ -0,0 +1,7 @@
+.class public final Lcom/discord/stores/StoreGatewayConnectionKt;
+.super Ljava/lang/Object;
+.source "StoreGatewayConnection.kt"
+
+
+# static fields
+.field private static final TAG:Ljava/lang/String; = "StoreGatewayConnection"
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 bb10ec564c..5a854b93a4 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$acceptGift$1$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 4ad321a8f1..18c4026b97 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGifting$acceptGift$1$1;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 67cd6bfb4b..ce95b95c3f 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$acceptGift$1$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 b5163efe11..53cfb857ae 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGifting$acceptGift$1$2;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 131ab81f60..9bd5248115 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$acceptGift$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -96,7 +96,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->LG()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lu()Lrx/Scheduler;
 
     move-result-object v1
 
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 f601405949..937687e124 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$fetchGift$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 4dd9c332cd..caaf59a21e 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGifting$fetchGift$1;->invoke(Lcom/discord/models/domain/ModelGift;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 df8bc84a82..3e01fb145e 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$fetchGift$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 9a99caa080..abf111391f 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGifting$fetchGift$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 aee600ad6a..49d0fee0f2 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$fetchMyGiftsForSku$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 972c1d641e..37ef5b5ac1 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$fetchMyGiftsForSku$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -84,7 +84,7 @@
 
     if-eq v0, v1, :cond_0
 
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/Exception;
 
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 6e80b57392..b44c23b7b6 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$2.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGifting$fetchMyGiftsForSku$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 7b92a2a5e3..242df39081 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$fetchMyGiftsForSku$3$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 b15e1966a8..3fb1094172 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$3.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGifting$fetchMyGiftsForSku$3;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 1031306327..c14c0ad357 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$generateGiftCode$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 4f1b3662f9..1e790c8793 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$generateGiftCode$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -84,7 +84,7 @@
 
     if-eq v0, v1, :cond_0
 
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/Exception;
 
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 1a8bde49c8..cb3abec921 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$2.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGifting$generateGiftCode$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 fb5ac1632c..a8e9e851a0 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$generateGiftCode$3$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 224b455d64..1765f2c73c 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$3.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGifting$generateGiftCode$3;->invoke(Lcom/discord/models/domain/ModelGift;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 c9b4a725b7..1e2d0f6b5f 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$requestGift$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$requestGift$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$requestGift$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 99cd7d4ea5..54419b2abb 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$revokeGiftCode$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 a6048d9741..dd1346f9fd 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$revokeGiftCode$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -62,7 +62,7 @@
 .method public final invoke()V
     .locals 6
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/Exception;
 
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 92bb167c4d..fa08430584 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$2.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGifting$revokeGiftCode$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 1f6b9f0e17..0b4813e342 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGifting$revokeGiftCode$3$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 0ebb845381..9919385a87 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$3.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGifting$revokeGiftCode$3;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting.smali b/com.discord/smali/com/discord/stores/StoreGifting.smali
index 17bd980a27..11e61cba17 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting.smali
@@ -621,7 +621,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 27afc5741f..f75554040d 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
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 59444ad115..3f6ee8b230 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1;->invoke(Ljava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 5298bfc6c4..a72907be4b 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 0cfdda01f7..4a5f9a0f2c 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenOpened$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenOpened$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenOpened$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 503206750f..c55041ca8f 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 7a7e2d0385..6152f737e5 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali
index 9690ad692e..095bc9cf03 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali
@@ -179,13 +179,13 @@
 
     move-result p2
 
-    invoke-static {p2}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {p2}, Lkotlin/a/ad;->dj(I)I
 
     move-result p2
 
     const/16 v1, 0x10
 
-    invoke-static {p2, v1}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {p2, v1}, Lkotlin/ranges/c;->Y(II)I
 
     move-result p2
 
@@ -257,7 +257,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -265,7 +265,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1;
 
@@ -323,7 +323,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -359,7 +359,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -412,7 +412,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1;
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildMemberCounts.smali b/com.discord/smali/com/discord/stores/StoreGuildMemberCounts.smali
index a43072c94d..b24447fcb9 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildMemberCounts.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildMemberCounts.smali
@@ -83,7 +83,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 be15a6395e..1859d69f5a 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$2.smali
@@ -85,7 +85,7 @@
 
     invoke-virtual {p0, v0, v1, p2}, Lcom/discord/stores/StoreGuildMemberRequester$requestManager$2;->invoke(JLjava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 95ca13cd8d..904296e2c1 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected$set$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected$set$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGuildSelected$set$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected.smali
index 2db3e49fa8..946cdd0cb5 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected.smali
@@ -131,7 +131,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildSelected;->selectedGuildIdsCache:Lcom/discord/utilities/persister/Persister;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -149,7 +149,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -177,7 +177,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -262,7 +262,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali
index c7fdaf0e59..c46eadb6cd 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali
@@ -87,14 +87,14 @@
 
     if-lez p1, :cond_0
 
-    invoke-static {v1, p3}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v1, p3}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object v2
 
     invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_0
-    invoke-static {p1, p2}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {p1, p2}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object p1
 
@@ -121,13 +121,13 @@
 
     if-eqz v1, :cond_5
 
-    sget-object p2, Lkotlin/ranges/IntProgression;->bkT:Lkotlin/ranges/IntProgression$a;
+    sget-object p2, Lkotlin/ranges/IntProgression;->bln:Lkotlin/ranges/IntProgression$a;
 
-    iget p2, p1, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget p2, p1, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget v1, p1, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v1, p1, Lkotlin/ranges/IntProgression;->bll:I
 
-    iget p1, p1, Lkotlin/ranges/IntProgression;->bkS:I
+    iget p1, p1, Lkotlin/ranges/IntProgression;->blm:I
 
     if-lez p1, :cond_2
 
@@ -143,11 +143,11 @@
 
     move-result-object p1
 
-    iget p2, p1, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget p2, p1, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget v1, p1, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v1, p1, Lkotlin/ranges/IntProgression;->bll:I
 
-    iget p1, p1, Lkotlin/ranges/IntProgression;->bkS:I
+    iget p1, p1, Lkotlin/ranges/IntProgression;->blm:I
 
     if-ltz p1, :cond_3
 
@@ -161,7 +161,7 @@
     :goto_1
     add-int v2, p2, p3
 
-    invoke-static {p2, v2}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {p2, v2}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object v2
 
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 f8ee875ff9..5b4fec5ffc 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeChannelRange$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeChannelRange$1.smali
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGuildSubscriptions$subscribeChannelRange$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 1d78cecf4d..69be0a043e 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeUser$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeUser$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGuildSubscriptions$subscribeUser$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 7d0e10fcb8..5205268b7c 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscriptionsManager$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscriptionsManager$1.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, v0, v1, p2}, Lcom/discord/stores/StoreGuildSubscriptions$subscriptionsManager$1;->invoke(JLcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 c6b3cf9f80..d47da8ec22 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$unsubscribeUser$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$unsubscribeUser$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGuildSubscriptions$unsubscribeUser$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions.smali
index 1b8c9ed49d..7f54e8bd49 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions.smali
@@ -140,7 +140,7 @@
 
     aput-object v2, v0, v1
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali b/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali
index 2dcf7b8d3c..2ef403718b 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali
@@ -177,7 +177,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -187,7 +187,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -205,7 +205,7 @@
 
     const-string p1, "requestGuildMembers"
 
-    invoke-static {p1}, Lcom/discord/app/i;->ad(Ljava/lang/String;)Lrx/Observable$c;
+    invoke-static {p1}, Lcom/discord/app/i;->Z(Ljava/lang/String;)Lrx/Observable$c;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds.smali b/com.discord/smali/com/discord/stores/StoreGuilds.smali
index f498d778ab..bd44e74852 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds.smali
@@ -1448,11 +1448,11 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kj()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JX()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JV()Lrx/Observable;
 
     move-result-object p0
 
@@ -1647,7 +1647,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -1681,7 +1681,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -1705,7 +1705,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputedPublisher:Lrx/subjects/Subject;
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -1741,7 +1741,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -1828,7 +1828,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -1862,7 +1862,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -1889,7 +1889,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -1921,7 +1921,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -1957,7 +1957,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -2017,7 +2017,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -2038,7 +2038,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsUnavailablePublisher:Lrx/subjects/Subject;
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -2070,7 +2070,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 4147463a26..f3f9920085 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsNsfw$allow$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsNsfw$allow$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuildsNsfw$allow$1;->invoke(Landroid/content/SharedPreferences$Editor;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 664c95f80f..0f5626f438 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsNsfw$deny$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsNsfw$deny$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuildsNsfw$deny$1;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsNsfw.smali b/com.discord/smali/com/discord/stores/StoreGuildsNsfw.smali
index cc4416775c..1c2271dba9 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsNsfw.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsNsfw.smali
@@ -60,7 +60,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildsNsfw;->stream:Lcom/discord/stores/StoreStream;
 
-    sget-object p1, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p1, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast p1, Ljava/util/Set;
 
@@ -143,7 +143,7 @@
 
     check-cast v1, Ljava/lang/String;
 
-    invoke-static {v1}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v1}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v1
 
@@ -360,7 +360,7 @@
 
     const-string v0, "GUILDS_ALLOWED_KEY"
 
-    sget-object v1, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object v1, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast v1, Ljava/util/Set;
 
@@ -377,7 +377,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    sget-object p1, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p1, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast p1, Ljava/util/Set;
 
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 d3d053c2dc..5094eef915 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$Entry$Folder.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$Entry$Folder.smali
@@ -376,70 +376,66 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->id:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v2, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v2
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->guilds:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->guilds:Ljava/util/List;
 
     const/4 v2, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->color:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->color:Ljava/lang/Integer;
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()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 v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->name:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->name:Ljava/lang/String;
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v2
 
     :cond_2
-    add-int/2addr v1, v2
+    add-int/2addr v0, v2
 
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
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 6d780a9600..eb6b130322 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGuildsSorted$init$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 6a21697152..e1554e85fc 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuildsSorted$init$1;->invoke(Lcom/discord/stores/StoreGuildsSorted$State;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 6e3290250d..7f3b837e35 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$setPositions$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$setPositions$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreGuildsSorted$setPositions$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali
index 3bb8c29d1d..fb66aa4947 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali
@@ -86,7 +86,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildsSorted;->entries:Ljava/util/ArrayList;
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -294,7 +294,7 @@
 
     if-gez v3, :cond_3
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_3
     move-object v7, v4
@@ -818,7 +818,7 @@
 
     if-nez v6, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     check-cast v6, Lcom/discord/models/domain/ModelGuild;
@@ -873,7 +873,7 @@
 
     if-nez v1, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     check-cast v1, Lcom/discord/models/domain/ModelGuild;
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 4ba12970a3..14c6c72b21 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$get$1.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreInstantInvites$get$1;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 310093737f..5c4dcc0072 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$1.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreInstantInvites$requestInvite$1;->invoke(Lcom/discord/models/domain/ModelInvite;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 886a328be7..9a1870e187 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$2.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreInstantInvites$requestInvite$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites.smali
index 94cc646f34..f2c741f138 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites.smali
@@ -77,7 +77,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -93,7 +93,7 @@
 
     iput-object v0, p0, Lcom/discord/stores/StoreInstantInvites;->knownInvites:Ljava/util/HashMap;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -271,7 +271,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -315,7 +315,7 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreInstantInvites;->invitesPublisher:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {p1}, Lrx/subjects/SerializedSubject;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/subjects/SerializedSubject;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -408,7 +408,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -465,7 +465,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     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 b301adaf16..5bd3dd2ae8 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4.smali
@@ -95,7 +95,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    invoke-static {}, Lrx/Observable;->JZ()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->JM()Lrx/Observable;
 
     move-result-object p1
 
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 91111b0b67..47b9a5f951 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreInviteSettings$trackWithInvite$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings.smali
index e49ef19690..229afcc0b9 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings.smali
@@ -196,7 +196,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -261,7 +261,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v0
 
@@ -391,7 +391,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreInviteSettings;->pendingInviteCodeSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -425,7 +425,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
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 40e195e0f5..4d06a53d9e 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreLibrary$fetchApplications$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 ec7fc6fbc4..487c8f9321 100644
--- a/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1.smali
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreLibrary$fetchApplications$1;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 c38f6b4f6e..f20ba0b326 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$LurkRequest.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$LurkRequest.smali
@@ -170,37 +170,33 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 2
 
     iget-wide v0, p0, Lcom/discord/stores/StoreLurking$LurkRequest;->guildId:J
 
-    const/16 v2, 0x20
-
-    ushr-long v2, v0, v2
-
-    xor-long/2addr v0, v2
-
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/stores/StoreLurking$LurkRequest;->channelId:Ljava/lang/Long;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
     move-result v0
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lcom/discord/stores/StoreLurking$LurkRequest;->channelId:Ljava/lang/Long;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
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 1123a58dda..7f5fa2052a 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$joinGuild$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$joinGuild$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreLurking$joinGuild$1;->invoke(Lcom/discord/models/domain/ModelGuild;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 a23fd0a2ae..949bcac94c 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$postLeaveGuild$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$postLeaveGuild$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreLurking$postLeaveGuild$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 e41b6c5b8a..17659a9d06 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$startLurking$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$startLurking$2.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreLurking$startLurking$2;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 4d34573df5..bf355d73da 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreLurking$startLurkingInternal$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 219cb63d49..bf0fb2f550 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreLurking$startLurkingInternal$1;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 2349539de0..109a242880 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$2.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreLurking$startLurkingInternal$2;->invoke(Lcom/discord/models/domain/ModelGuild;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 2f5144ab60..3425042035 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
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreLurking$startLurkingInternal$jumpToDestination$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLurking.smali b/com.discord/smali/com/discord/stores/StoreLurking.smali
index b04532c381..22309df445 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking.smali
@@ -87,7 +87,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreLurking;->lurkingGuildIds:Ljava/util/ArrayList;
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -223,7 +223,7 @@
 
     if-nez v4, :cond_0
 
-    sget-object v4, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v6, Ljava/lang/StringBuilder;
 
@@ -776,7 +776,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -879,7 +879,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
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 770a3db6d0..6a5d9c0e64 100644
--- a/com.discord/smali/com/discord/stores/StoreMFA$togglingSMSBackup$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMFA$togglingSMSBackup$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMFA$togglingSMSBackup$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 237a4bb9d0..7d5a7bea93 100644
--- a/com.discord/smali/com/discord/stores/StoreMFA$updatePendingMFAState$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMFA$updatePendingMFAState$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMFA$updatePendingMFAState$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 0f4ecfd016..b3220211a8 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$Companion.smali
@@ -109,11 +109,11 @@
 
     move-result v8
 
-    iget v6, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yJ:I
+    iget v6, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yT:I
 
-    iget v7, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yK:I
+    iget v7, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yU:I
 
-    iget v9, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yM:I
+    iget v9, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->yW:I
 
     new-instance v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;
 
@@ -133,7 +133,7 @@
 
     move-result v1
 
-    invoke-interface {v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->t(Z)V
+    invoke-interface {v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->r(Z)V
 
     goto :goto_0
 
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 58153ce344..80deaf416a 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$enableLocalVoiceStatusListening$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$enableLocalVoiceStatusListening$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$enableLocalVoiceStatusListening$1;->invoke(Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 c344661eb6..d02707181d 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$getVideoInputDevicesNative$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$getVideoInputDevicesNative$1.smali
@@ -76,7 +76,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$getVideoInputDevicesNative$1;->invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1.smali
index e1b93b1c91..ba107dd0aa 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->onDestroy()V
+    value = Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;->invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 bc1dda45b6..1aa12252ac 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
@@ -45,11 +45,12 @@
 
 
 # virtual methods
-.method public final onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
+.method public final onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
+            "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;",
             "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;",
             "Ljava/util/List<",
             "Lcom/discord/rtcconnection/mediaengine/a;",
@@ -57,54 +58,70 @@
         }
     .end annotation
 
-    const-string v0, "transportInfo"
+    const-string v0, "connection"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string p1, "transportInfo"
+
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-string p1, "supportedVideoCodecs"
 
+    invoke-static {p3, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public final onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+    .locals 1
+
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "connectionState"
+
     invoke-static {p2, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
 
-.method public final onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+.method public final onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
     .locals 1
 
-    const-string v0, "connectionState"
+    const-string v0, "connection"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    iget-object p1, p0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->$connectionSubscription:Lrx/Subscription;
+
+    invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
+
+    iget-object p1, p0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
+
+    new-instance v0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;-><init>(Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;)V
+
+    check-cast v0, Lkotlin/jvm/functions/Function1;
+
+    invoke-static {p1, v0}, Lcom/discord/stores/StoreMediaEngine;->access$getVideoInputDevicesNative(Lcom/discord/stores/StoreMediaEngine;Lkotlin/jvm/functions/Function1;)V
+
     return-void
 .end method
 
-.method public final onDestroy()V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->$connectionSubscription:Lrx/Subscription;
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
-
-    new-instance v1, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;
-
-    invoke-direct {v1, p0}, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;-><init>(Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    invoke-static {v0, v1}, Lcom/discord/stores/StoreMediaEngine;->access$getVideoInputDevicesNative(Lcom/discord/stores/StoreMediaEngine;Lkotlin/jvm/functions/Function1;)V
-
-    return-void
-.end method
-
-.method public final onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+.method public final onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
     .locals 1
 
-    const-string v0, "exception"
+    const-string v0, "connection"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string p1, "exception"
+
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-void
 .end method
 
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 0f77cabfdb..f826c62488 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$2.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$2;->invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 23fb131cdd..12b45fc5cb 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$1.smali
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMediaEngine$localVoiceStatus$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 53d0257279..8070e2d109 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$2.smali
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMediaEngine$localVoiceStatus$2;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 a645403ed7..5c8336c54e 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1;->invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -165,7 +165,7 @@
     :goto_4
     if-nez v5, :cond_6
 
-    invoke-static {p1}, Lkotlin/a/g;->d([Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p1}, Lkotlin/a/g;->c([Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
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 c559fff595..48c423908d 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$selectVideoInputDevice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$selectVideoInputDevice$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$selectVideoInputDevice$1;->invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$1.smali
index 555f5ac262..a0029edc8c 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$1;->invoke(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$2.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$2.smali
index 49b7be93d4..124e007bac 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$2.smali
@@ -69,7 +69,7 @@
 .method public final call(Ljava/lang/Throwable;)V
     .locals 6
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-string v1, "handleVoiceConfigChanged"
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$3.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$3.smali
index df8caea924..1e7285b273 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$3.smali
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$3;->invoke(Ljava/util/Map;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$4.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$4.smali
index 31409817ec..f6b4f4241c 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$4.smali
@@ -69,7 +69,7 @@
 .method public final call(Ljava/lang/Throwable;)V
     .locals 6
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-string v1, "handleUsersVolume"
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$5.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$5.smali
index 1599bdd680..6be194cdd7 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$5.smali
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$5;->invoke(Ljava/util/Map;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$6.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$6.smali
index c261a817be..689b44b9e5 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$6.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupPerConnectionSubscriptions$subscriptionsPerConnection$6.smali
@@ -69,7 +69,7 @@
 .method public final call(Ljava/lang/Throwable;)V
     .locals 6
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-string v1, "handleUsersMuted"
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
index eb8f09e255..dfe973c091 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
@@ -145,7 +145,7 @@
 
     sput-object v0, Lcom/discord/stores/StoreMediaEngine;->LOCAL_VOICE_STATUS_DEFAULT:Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yq:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yA:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     sput-object v0, Lcom/discord/stores/StoreMediaEngine;->DEFAULT_OPENSLES_CONFIG:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
@@ -233,7 +233,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -269,7 +269,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -317,7 +317,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/b/b;->Lo()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/b/b;->Lc()Lrx/Observable;
 
     move-result-object p1
 
@@ -446,7 +446,7 @@
 
     const-string v1, "mediaEngine"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     const/4 v1, 0x0
@@ -479,7 +479,7 @@
 
     const-string v1, "mediaEngine"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v1, Lcom/discord/stores/StoreMediaEngine$enableLocalVoiceStatusListening$1;
@@ -528,7 +528,7 @@
 
     const-string v1, "mediaEngine"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v1, Lcom/discord/stores/StoreMediaEngine$getVideoInputDevicesNative$1;
@@ -663,7 +663,7 @@
 
     const-string v2, "mediaEngine"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-interface {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->getConnections()Ljava/util/List;
@@ -777,7 +777,7 @@
 
     const-string v2, "mediaEngine"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-interface {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->getConnections()Ljava/util/List;
@@ -913,7 +913,7 @@
 
     const-string v4, "mediaEngine"
 
-    invoke-static {v4}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-interface {v0, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->A(I)V
@@ -924,7 +924,7 @@
 
     const-string v3, "mediaEngine"
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     invoke-interface {v0, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->A(I)V
@@ -935,7 +935,7 @@
 
     const-string v3, "mediaEngine"
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_5
     invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->getConnections()Ljava/util/List;
@@ -1081,7 +1081,7 @@
 
     const-string v2, "mediaEngine"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0, v1, p1}, Lcom/discord/stores/StoreMediaEngine$Companion;->setVoiceConfig(Lcom/discord/rtcconnection/mediaengine/MediaEngine;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)V
@@ -1293,7 +1293,7 @@
     :try_start_1
     iget-object v1, p0, Lcom/discord/stores/StoreMediaEngine;->videoInputDevices:[Lco/discord/media_engine/VideoInputDeviceDescription;
 
-    invoke-static {v1}, Lkotlin/a/g;->g([Ljava/lang/Object;)I
+    invoke-static {v1}, Lkotlin/a/g;->f([Ljava/lang/Object;)I
 
     move-result v1
 
@@ -1374,7 +1374,7 @@
 
     const-string v1, "mediaEngine"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -1411,7 +1411,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine;->selectedVideoInputDeviceSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1444,7 +1444,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine;->videoInputDevicesSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1467,10 +1467,10 @@
 
     const-string v1, "mediaEngine"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
-    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->ef()Lcom/hammerandchisel/libdiscord/Discord;
+    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->ei()Lcom/hammerandchisel/libdiscord/Discord;
 
     move-result-object v0
     :try_end_0
@@ -1570,6 +1570,10 @@
     move-result-object v0
 
     :cond_0
+    const-string v1, "prefsSessionDurable\n    \u2026AULT_OPENSLES_CONFIG.name"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-static {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->valueOf(Ljava/lang/String;)Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     move-result-object v0
@@ -1578,7 +1582,7 @@
 
     invoke-virtual {v1, v0}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/b;->yR:Lcom/discord/rtcconnection/mediaengine/b;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/b;->zb:Lcom/discord/rtcconnection/mediaengine/b;
 
     invoke-static {}, Ljava/util/concurrent/Executors;->newSingleThreadExecutor()Ljava/util/concurrent/ExecutorService;
 
@@ -1588,7 +1592,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     check-cast v2, Lcom/discord/utilities/logging/Logger;
 
@@ -1705,7 +1709,7 @@
 
     const-string v1, "mediaEngine"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->getConnections()Ljava/util/List;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
index f37a12ff6b..436ce5c2a5 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
@@ -54,12 +54,12 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f120433
+    const p1, 0x7f12043c
 
     goto :goto_0
 
     :cond_0
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->yb:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->ym:Lcom/discord/rtcconnection/RtcConnection$State$b;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -67,12 +67,12 @@
 
     if-eqz p2, :cond_1
 
-    const p1, 0x7f120430
+    const p1, 0x7f120439
 
     goto :goto_0
 
     :cond_1
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$a;->ya:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$a;->yl:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -80,12 +80,12 @@
 
     if-eqz p2, :cond_2
 
-    const p1, 0x7f12042f
+    const p1, 0x7f120438
 
     goto :goto_0
 
     :cond_2
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$c;->yc:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$c;->yn:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -93,12 +93,12 @@
 
     if-eqz p2, :cond_3
 
-    const p1, 0x7f120432
+    const p1, 0x7f12043b
 
     goto :goto_0
 
     :cond_3
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->yh:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->ys:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -106,12 +106,12 @@
 
     if-eqz p2, :cond_4
 
-    const p1, 0x7f120437
+    const p1, 0x7f120440
 
     goto :goto_0
 
     :cond_4
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->yg:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->yr:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -119,12 +119,12 @@
 
     if-eqz p2, :cond_5
 
-    const p1, 0x7f120436
+    const p1, 0x7f12043f
 
     goto :goto_0
 
     :cond_5
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$f;->yf:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$f;->yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -132,12 +132,12 @@
 
     if-eqz p2, :cond_6
 
-    const p1, 0x7f120431
+    const p1, 0x7f12043a
 
     goto :goto_0
 
     :cond_6
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->ye:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->yp:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -145,7 +145,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f120435
+    const p1, 0x7f12043e
 
     :goto_0
     iput p1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->stateString:I
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
index 9938f55401..0c12ceb60d 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
@@ -73,7 +73,7 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->$context:Landroid/content/Context;
 
-    const v0, 0x7f121291
+    const v0, 0x7f1212e2
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$4.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$4.smali
index 750a835fb0..c75db11fee 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$4.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaNotification$init$4;->invoke(Lcom/discord/stores/StoreMediaNotification$NotificationData;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -116,7 +116,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yf:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1.smali
index 72c5f997ce..c6d0bda3ef 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1.smali
@@ -74,7 +74,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->yh:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->ys:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification.smali
index 1e78111f07..3d95cca401 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification.smali
@@ -82,7 +82,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -104,7 +104,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -168,7 +168,7 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreMediaNotification;->notificationDataObservable:Lrx/Observable;
 
-    sget-object v2, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v2, Lcom/discord/stores/StoreMediaNotification$init$4;
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali
index bdf6d8c694..0d63e30c5a 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali
@@ -654,7 +654,7 @@
 
     iget v1, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->sensitivity:F
 
-    invoke-static {v1}, Ljava/lang/Float;->floatToIntBits(F)I
+    invoke-static {v1}, L$r8$java8methods$utility$Float$hashCode$IF;->hashCode(F)I
 
     move-result v1
 
@@ -697,6 +697,10 @@
 
     iget v1, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputVolume:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return 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 6b22f4fb51..6b44a8b41f 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$init$1;->invoke(Lcom/discord/utilities/media/AudioOutputState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$3.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$3.smali
index 968461649e..1cef92013c 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$3.smali
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$init$3;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     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 bd19ac412c..59c18f15df 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
@@ -48,7 +48,7 @@
     .end annotation
 .end field
 
-.field private final audioOutputMonitor:Lcom/discord/utilities/media/AudioOutputMonitor;
+.field private audioOutputMonitor:Lcom/discord/utilities/media/AudioOutputMonitor;
 
 .field private final audioOutputStateSubject:Lrx/subjects/SerializedSubject;
     .annotation system Ldalvik/annotation/Signature;
@@ -206,7 +206,7 @@
 
     new-instance v0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    sget-object v10, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yF:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v10, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     sget-object v11, Lcom/discord/models/domain/ModelVoice$OutputMode;->SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
 
@@ -408,12 +408,6 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->audioModeSubject:Lrx/subjects/SerializedSubject;
 
-    new-instance p1, Lcom/discord/utilities/media/AudioOutputMonitor;
-
-    invoke-direct {p1}, Lcom/discord/utilities/media/AudioOutputMonitor;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->audioOutputMonitor:Lcom/discord/utilities/media/AudioOutputMonitor;
-
     new-instance p1, Lrx/subjects/SerializedSubject;
 
     sget-object v0, Lcom/discord/stores/StoreMediaSettings;->DEFAULT_OUTPUT_STATE:Lcom/discord/utilities/media/AudioOutputState;
@@ -476,7 +470,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v3, 0x0
 
@@ -501,7 +495,7 @@
 
     if-nez v0, :cond_1
 
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v3, 0x0
 
@@ -674,7 +668,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yF:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     if-ne v0, v1, :cond_0
 
@@ -767,7 +761,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -807,7 +801,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -847,7 +841,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -887,7 +881,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -917,7 +911,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -957,7 +951,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -997,7 +991,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1037,7 +1031,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1077,7 +1071,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1117,7 +1111,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1167,7 +1161,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -1209,7 +1203,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -1241,7 +1235,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1273,7 +1267,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1303,7 +1297,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1333,12 +1327,18 @@
 .end method
 
 .method public final init(Landroid/content/Context;)V
-    .locals 9
+    .locals 10
 
     const-string v0, "context"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    new-instance v0, Lcom/discord/utilities/media/AudioOutputMonitor;
+
+    invoke-direct {v0}, Lcom/discord/utilities/media/AudioOutputMonitor;-><init>()V
+
+    iput-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->audioOutputMonitor:Lcom/discord/utilities/media/AudioOutputMonitor;
+
     iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfigurationCache:Lcom/discord/utilities/persister/Persister;
 
     invoke-virtual {v0}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
@@ -1403,42 +1403,54 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->audioOutputMonitor:Lcom/discord/utilities/media/AudioOutputMonitor;
 
+    const-string v1, "audioOutputMonitor"
+
+    if-nez v0, :cond_0
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
     invoke-virtual {v0}, Lcom/discord/utilities/media/AudioOutputMonitor;->getOutputState()Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
-    new-instance v1, Lcom/discord/stores/StoreMediaSettings$init$1;
+    new-instance v2, Lcom/discord/stores/StoreMediaSettings$init$1;
 
-    iget-object v2, p0, Lcom/discord/stores/StoreMediaSettings;->audioOutputStateSubject:Lrx/subjects/SerializedSubject;
+    iget-object v3, p0, Lcom/discord/stores/StoreMediaSettings;->audioOutputStateSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreMediaSettings$init$1;-><init>(Lrx/subjects/SerializedSubject;)V
+    invoke-direct {v2, v3}, Lcom/discord/stores/StoreMediaSettings$init$1;-><init>(Lrx/subjects/SerializedSubject;)V
 
-    move-object v3, v1
+    move-object v4, v2
 
-    check-cast v3, Lkotlin/jvm/functions/Function1;
+    check-cast v4, Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    move-result-object v4
-
-    const/4 v5, 0x0
+    move-result-object v5
 
     const/4 v6, 0x0
 
     const/4 v7, 0x0
 
-    const/16 v8, 0x3c
+    const/4 v8, 0x0
 
-    invoke-static/range {v3 .. v8}, Lcom/discord/app/i;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Class;Lrx/functions/Action1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;I)Lrx/Observable$c;
+    const/16 v9, 0x3c
 
-    move-result-object v1
+    invoke-static/range {v4 .. v9}, Lcom/discord/app/i;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Class;Lrx/functions/Action1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;I)Lrx/Observable$c;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+    move-result-object v2
+
+    invoke-virtual {v0, v2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->audioOutputMonitor:Lcom/discord/utilities/media/AudioOutputMonitor;
 
+    if-nez v0, :cond_1
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_1
     invoke-virtual {v0, p1}, Lcom/discord/utilities/media/AudioOutputMonitor;->bindContext(Landroid/content/Context;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->stream:Lcom/discord/stores/StoreStream;
@@ -1461,7 +1473,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/stores/StoreMediaSettings$init$3;
 
@@ -1481,6 +1493,10 @@
 
     const/4 v4, 0x0
 
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
     const/16 v7, 0x3c
 
     invoke-static/range {v2 .. v7}, Lcom/discord/app/i;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Class;Lrx/functions/Action1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;I)Lrx/Observable$c;
@@ -1521,7 +1537,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1561,7 +1577,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMentions$init$2.smali b/com.discord/smali/com/discord/stores/StoreMentions$init$2.smali
index 30e7cf1f07..b821a39012 100644
--- a/com.discord/smali/com/discord/stores/StoreMentions$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMentions$init$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMentions$init$2;->invoke(Lcom/discord/stores/StoreMentions$init$Tuple;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -96,7 +96,7 @@
 
     invoke-static {p1, v0}, Lcom/discord/stores/StoreMentions;->access$tryPublishMentionCounts(Lcom/discord/stores/StoreMentions;Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$Ack.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$Ack.smali
index cd1ec3d29e..20404e54ac 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$Ack.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$Ack.smali
@@ -211,30 +211,26 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 2
 
     iget-wide v0, p0, Lcom/discord/stores/StoreMessageAck$Ack;->messageId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v2, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v2
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
+    iget-boolean v1, p0, Lcom/discord/stores/StoreMessageAck$Ack;->viewed:Z
 
-    mul-int/lit8 v1, v1, 0x1f
+    if-eqz v1, :cond_0
 
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMessageAck$Ack;->viewed:Z
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck.smali
index 83b7ccbb6b..75a2bc2bc4 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck.smali
@@ -211,37 +211,33 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 2
 
     iget-wide v0, p0, Lcom/discord/stores/StoreMessageAck$PendingAck;->channelId:J
 
-    const/16 v2, 0x20
-
-    ushr-long v2, v0, v2
-
-    xor-long/2addr v0, v2
-
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMessageAck$PendingAck;->ack:Lcom/discord/stores/StoreMessageAck$Ack;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
     move-result v0
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lcom/discord/stores/StoreMessageAck$PendingAck;->ack:Lcom/discord/stores/StoreMessageAck$Ack;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
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 b9a3365490..84b73c3349 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$ack$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$ack$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMessageAck$ack$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 0a8ddf3e20..9c99e48467 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$ackGuild$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$ackGuild$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$ackGuild$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali
index 41b5dbb511..8ba60e6ed1 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali
@@ -126,7 +126,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v1
 
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 fa08479166..395708b1ad 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
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMessageAck$postPendingAck$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 351ce362f6..cf9951a899 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$postPendingAck$1$3;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 998167a348..bd730f56ae 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$postPendingAck$1;->invoke(Lcom/discord/stores/StoreMessageAck$PendingAck;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     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 de74e9a3ed..030036c259 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$3.smali
@@ -77,7 +77,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$postPendingAck$3;->invoke(Lcom/discord/stores/StoreMessageAck$PendingAck;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck.smali b/com.discord/smali/com/discord/stores/StoreMessageAck.smali
index fd7306dd15..9add43766a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck.smali
@@ -413,7 +413,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -449,13 +449,13 @@
 
     move-result v1
 
-    invoke-static {v1}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v1}, Lkotlin/a/ad;->dj(I)I
 
     move-result v1
 
     const/16 v2, 0x10
 
-    invoke-static {v1, v2}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v1, v2}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v1
 
@@ -923,7 +923,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 26960f7a23..b15698c37d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions$EmojiResults$Failure.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions$EmojiResults$Failure.smali
@@ -226,49 +226,43 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;->channelId:J
 
-    const/16 v2, 0x20
-
-    ushr-long v3, v0, v2
-
-    xor-long/2addr v0, v3
-
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-wide v3, p0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;->messageId:J
-
-    ushr-long v5, v3, v2
-
-    xor-long/2addr v3, v5
-
-    long-to-int v0, v3
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;->emoji:Lcom/discord/models/domain/ModelMessageReaction$Emoji;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
     move-result v0
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-wide v1, p0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;->messageId:J
+
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;->emoji:Lcom/discord/models/domain/ModelMessageReaction$Emoji;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
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 098605c2ae..7c586ce19f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions$EmojiResults$Users.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions$EmojiResults$Users.smali
@@ -355,7 +355,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 4
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;->users:Ljava/util/LinkedHashMap;
 
@@ -377,27 +377,21 @@
 
     iget-wide v2, p0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;->channelId:J
 
-    const/16 v4, 0x20
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v5, v2, v4
+    move-result v2
 
-    xor-long/2addr v2, v5
-
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v2, p0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;->messageId:J
 
-    ushr-long v4, v2, v4
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    xor-long/2addr v2, v4
+    move-result v2
 
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
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 46b47d4844..971369a908 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMessageReactions$fetchReactions$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 e046f66a9c..071a590636 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMessageReactions$fetchReactions$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 c91edd9e9a..869915290f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions$forceRetryFetchReactions$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions$forceRetryFetchReactions$1.smali
@@ -62,7 +62,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMessageReactions$forceRetryFetchReactions$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 3c24bb932f..ebb10b3fa3 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$1.smali
@@ -62,7 +62,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMessageReactions$getMessageReactions$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$State.smali b/com.discord/smali/com/discord/stores/StoreMessageState$State.smali
index a0539dd3ad..a6e60fb4fe 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$State.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$State.smali
@@ -92,7 +92,7 @@
 
     if-eqz p4, :cond_0
 
-    sget-object p1, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p1, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast p1, Ljava/util/Set;
 
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 a9d25c7f6b..0b2fce6800 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMessageState$revealSpoiler$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 7c770e6caf..0dc42d810d 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
@@ -65,7 +65,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object v2, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast v2, Ljava/util/Set;
 
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 0ee0bfdd6d..81ad27d89d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMessageState$revealSpoilerEmbed$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 f58ed0843d..94f5af2575 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
@@ -71,7 +71,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast v0, Ljava/util/Set;
 
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 f5ab270775..582af27f8c 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbedData$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbedData$1.smali
@@ -62,7 +62,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMessageState$revealSpoilerEmbedData$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageState.smali b/com.discord/smali/com/discord/stores/StoreMessageState.smali
index 52bd46a514..d6d6e1f1b7 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState.smali
@@ -294,7 +294,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessageState;->messageStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
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 03b0f2940a..62b7713285 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing.smali
@@ -196,6 +196,10 @@
 
     iget v0, p0, Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing;->numFiles:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget-object v1, p0, Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing;->displayName:Ljava/lang/String;
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 3ca2151fa4..a4852525a3 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$get$1.smali
@@ -89,7 +89,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
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 32a405c152..0f6c47aa80 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMessages$sendMessage$request$1$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 808a25fedf..05b47f00ab 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessages$sendMessage$request$1$1;->invoke(Lcom/discord/utilities/messagesend/MessageResult;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 3fd20331d5..ffa362eb49 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
@@ -62,7 +62,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMessages$sendMessage$request$1$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -100,7 +100,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     iget v2, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1$2$1;->$numFiles:I
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 dbfeb3cd2e..2d9061faeb 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessages$sendMessage$request$1$2;->invoke(Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 299abf74df..f2a9691843 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreMessages$sendMessage$request$1$3$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -92,7 +92,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     iget-object v2, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1$3$1;->$uploads:Ljava/util/List;
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 79260494c6..1a890b6433 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessages$sendMessage$request$1$3;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages.smali b/com.discord/smali/com/discord/stores/StoreMessages.smali
index cf0c1aa685..6b86044d99 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages.smali
@@ -66,7 +66,7 @@
 
     const-string v0, "context"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -142,7 +142,7 @@
 
     const-string v2, "context"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {v1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
@@ -341,7 +341,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -351,7 +351,7 @@
 
     const-string v0, "deleteMessage"
 
-    invoke-static {v0}, Lcom/discord/app/i;->ac(Ljava/lang/String;)Lrx/Observable$c;
+    invoke-static {v0}, Lcom/discord/app/i;->Y(Ljava/lang/String;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -492,7 +492,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -777,7 +777,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -844,7 +844,7 @@
 
     move-result-object v10
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     move-object v11, p1
 
@@ -968,7 +968,7 @@
 
     check-cast p4, Lrx/functions/Action1;
 
-    sget p1, Lrx/Emitter$a;->bIA:I
+    sget p1, Lrx/Emitter$a;->bIU:I
 
     invoke-static {p4, p1}, Lrx/Observable;->a(Lrx/functions/Action1;I)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali b/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali
index 9e2ec122e5..2f15c32f93 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali
@@ -172,7 +172,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelChunk.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelChunk.smali
index 0d9ce8025e..b9c15fd9ea 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelChunk.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelChunk.smali
@@ -404,83 +404,79 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->channelId:J
 
-    const/16 v2, 0x20
-
-    ushr-long v2, v0, v2
-
-    xor-long/2addr v0, v2
-
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->messages:Ljava/util/List;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
     move-result v0
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->messages:Ljava/util/List;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isInitial:Z
+    iget-boolean v1, p0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isInitial:Z
 
     const/4 v2, 0x1
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_1
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isPresent:Z
+    iget-boolean v1, p0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isPresent:Z
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_2
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isAppendingTop:Z
+    iget-boolean v1, p0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isAppendingTop:Z
 
-    if-eqz v0, :cond_3
+    if-eqz v1, :cond_3
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_3
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isJump:Z
+    iget-boolean v1, p0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isJump:Z
 
-    if-eqz v0, :cond_4
+    if-eqz v1, :cond_4
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_4
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final isAppendingTop()Z
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 542da05ccb..b62bd462e2 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$init$1;->invoke(Lcom/discord/stores/StoreChat$InteractionState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 a7325af872..909d7a0d07 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$2.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$init$2;->invoke(Ljava/util/Set;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 087c4c6624..3c907a7efb 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$1;->invoke(Lcom/discord/models/domain/ModelMessage;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 9cc5454df9..680883a6a0 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$2;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 5ab5b8ee8d..8e2c925808 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.smali
@@ -77,7 +77,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$5;->invoke(Lcom/discord/models/domain/ModelMessage;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 5c7b13fd1f..032afab1c2 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$7.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$7.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$7;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -75,7 +75,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v0, 0x0
 
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 f18491ec1d..b58468933b 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali
@@ -77,7 +77,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$8;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 a5fcc682fc..c1f7a77e21 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$1;->invoke(Ljava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 85b8bd7216..50376cae6f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 e21083d710..3e84d14c65 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
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3$2;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 8f2d9e5b27..3515a6d48b 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3$4;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 91871d451c..439c5399f5 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.smali
@@ -124,7 +124,7 @@
 
     invoke-virtual/range {v0 .. v5}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;->invoke(JLjava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -235,7 +235,7 @@
     :goto_3
     const/4 v1, 0x0
 
-    invoke-static {v1}, Lcom/discord/app/i;->q(Z)Lrx/Observable$c;
+    invoke-static {v1}, Lcom/discord/app/i;->o(Z)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -251,7 +251,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3$2;
 
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 3cb6c8eafc..1dbe533448 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.smali
@@ -85,7 +85,7 @@
 
     invoke-virtual/range {v0 .. v5}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$4;->invoke(JLjava/util/List;ZZ)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
index 3c0d427029..2c9f6503db 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
@@ -140,7 +140,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -190,7 +190,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreMessagesLoader;->scrollToSubject:Lrx/subjects/SerializedSubject;
 
-    sget-object p1, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p1, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast p1, Ljava/util/Set;
 
@@ -1695,7 +1695,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -2158,7 +2158,7 @@
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {p3}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object p3
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali b/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali
index ae557f829f..ca7b468654 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali
@@ -117,6 +117,69 @@
     return v0
 .end method
 
+.method private final mostRecentIdsUpdateFromChannels(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
+    .locals 6
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannelUnreadUpdate;->getChannelReadStates()Ljava/util/List;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Iterable;
+
+    iget-boolean v0, p0, Lcom/discord/stores/StoreMessagesMostRecent;->updated:Z
+
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/models/domain/ModelReadState;
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelReadState;->getChannelId()J
+
+    move-result-wide v2
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelReadState;->getLastMessageId()J
+
+    move-result-wide v4
+
+    invoke-direct {p0, v2, v3, v4, v5}, Lcom/discord/stores/StoreMessagesMostRecent;->mostRecentIdsUpdate(JJ)Z
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    const/4 v0, 0x0
+
+    goto :goto_0
+
+    :cond_1
+    :goto_1
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    iput-boolean v0, p0, Lcom/discord/stores/StoreMessagesMostRecent;->updated:Z
+
+    return-void
+.end method
+
 .method private final mostRecentIdsUpdateFromChannels(Ljava/util/Collection;)V
     .locals 6
     .annotation system Ldalvik/annotation/Signature;
@@ -321,7 +384,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -352,6 +415,20 @@
     return-void
 .end method
 
+.method public final handleChannelUnreadUpdate(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
+    .locals 1
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "channelReadStateUpdate"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreMessagesMostRecent;->mostRecentIdsUpdateFromChannels(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
+
+    return-void
+.end method
+
 .method public final handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
     .locals 2
     .annotation runtime Lcom/discord/stores/StoreThread;
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 65954ef4f8..6a5a8a02e5 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
@@ -70,7 +70,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1$1;->invoke(Lcom/discord/app/AppActivity;Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -92,6 +92,10 @@
 
     move-result-object v0
 
+    const-string v1, "Intent()\n            .ad\u2026FLAG_ACTIVITY_CLEAR_TASK)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     check-cast p1, Landroid/content/Context;
 
     invoke-static {p1, p2, v0}, Lcom/discord/app/f;->a(Landroid/content/Context;ZLandroid/content/Intent;)V
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 033f46d781..9f87a48a84 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
@@ -86,9 +86,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/f;->uP:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->uO:Lcom/discord/app/f;
 
-    invoke-static {}, Lcom/discord/app/f;->du()Ljava/util/List;
+    invoke-static {}, Lcom/discord/app/f;->dt()Ljava/util/List;
 
     move-result-object v0
 
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 5843109d35..2ec578d633 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
@@ -123,7 +123,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getNotice()Lcom/discord/stores/StoreNotices$Notice;
 
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 419c7d5076..d127c36c9b 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1;->invoke(Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 aff427e691..bb74dac1fc 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
@@ -86,9 +86,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/f;->uP:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->uO:Lcom/discord/app/f;
 
-    invoke-static {}, Lcom/discord/app/f;->dw()Ljava/util/List;
+    invoke-static {}, Lcom/discord/app/f;->dv()Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali
index 53c31865bc..c0badc875a 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali
@@ -351,7 +351,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -423,7 +423,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
index 44bdfc1ce0..1aacda561a 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
@@ -75,7 +75,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f12042a
+    const v0, 0x7f120433
 
     invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
index 26d88ab7b7..cf9cdbb70b 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
@@ -71,7 +71,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    const v2, 0x7f121075
+    const v2, 0x7f1210b2
 
     invoke-virtual {p1, v2}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
@@ -81,7 +81,7 @@
 
     aput-object v2, v0, v3
 
-    const v2, 0x7f121162
+    const v2, 0x7f1211a4
 
     invoke-virtual {p1, v2}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
@@ -91,7 +91,7 @@
 
     aput-object v2, v0, v3
 
-    const v2, 0x7f12042e
+    const v2, 0x7f120437
 
     invoke-virtual {p1, v2, v0}, Landroid/app/Activity;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$3.smali b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$3.smali
index 1848a12400..c5f2582393 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$3.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$3;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -83,7 +83,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/e;->um:Ljava/lang/String;
+    sget-object v0, Lcom/discord/app/e;->ul:Ljava/lang/String;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$init$2.smali b/com.discord/smali/com/discord/stores/StoreNavigation$init$2.smali
index 73487b8d13..65d0e926c0 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$2.smali
@@ -105,7 +105,7 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lrx/Observable;->JZ()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->JM()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$init$3.smali b/com.discord/smali/com/discord/stores/StoreNavigation$init$3.smali
index 6e514acf1f..020f8190dd 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNavigation$init$3;->invoke(Ljava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     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 a073f16ebe..addee2e917 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation.smali
@@ -129,7 +129,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -179,7 +179,7 @@
 
     const-string v1, "CONNECTION_ISSUES"
 
-    const v4, 0x7f08038b
+    const v4, 0x7f08039d
 
     const/16 v5, 0x1e
 
@@ -228,7 +228,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -258,7 +258,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -288,7 +288,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -358,7 +358,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$Notice.smali b/com.discord/smali/com/discord/stores/StoreNotices$Notice.smali
index 4ea25164fc..ebd39b6817 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$Notice.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$Notice.smali
@@ -209,7 +209,7 @@
 
     aput-object v2, v1, v3
 
-    invoke-static {v1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v1
 
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 b70b7a1a2c..b85bd141b6 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotices$firstUseTimestamp$2$1;->invoke(Landroid/content/SharedPreferences$Editor;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$init$3.smali b/com.discord/smali/com/discord/stores/StoreNotices$init$3.smali
index b680149641..9fc209a4ad 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$init$3.smali
@@ -59,7 +59,7 @@
 .method public final call(Ljava/lang/Throwable;)V
     .locals 6
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/stores/StoreNotices.smali b/com.discord/smali/com/discord/stores/StoreNotices.smali
index 0a12b6707a..73aad4f22c 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices.smali
@@ -217,7 +217,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreNotices;->lastShownTimes:Ljava/util/HashMap;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -401,7 +401,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreNotices;->noticePublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -429,7 +429,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
-    sget-object p1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v0, 0x2
 
@@ -439,7 +439,7 @@
 
     invoke-static {p1, v2, 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
 
-    sget-object p1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -797,7 +797,7 @@
 
     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;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -829,7 +829,7 @@
     :cond_9
     iget-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/PublishSubject;
 
-    sget-object p2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
     :try_end_0
@@ -969,7 +969,7 @@
 
     invoke-static {v0}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -1006,7 +1006,7 @@
     :cond_3
     iget-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/PublishSubject;
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, v0}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
     :try_end_0
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 2f6dc36d1f..81601007fd 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$configureNotificationClient$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 967c45a7aa..4332b3f34b 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$3.smali
@@ -68,7 +68,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$configureNotificationClient$3;->invoke(Lkotlin/Pair;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 1a837d7b3d..20a6c94850 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$displayPopup$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$displayPopup$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$displayPopup$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 d7779b5792..dfbe7f964d 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$tryTokenPersist$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$tryTokenPersist$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$tryTokenPersist$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications.smali b/com.discord/smali/com/discord/stores/StoreNotifications.smali
index e14e803d5d..1ad370d072 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications.smali
@@ -185,7 +185,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -209,7 +209,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v1
 
@@ -455,7 +455,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v2
 
@@ -471,7 +471,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v3, Lcom/discord/stores/StoreNotifications$tryTokenPersist$1;
 
@@ -535,7 +535,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -969,6 +969,26 @@
     return-void
 .end method
 
+.method public final handlePreLogout()V
+    .locals 5
+
+    iget-object v0, p0, Lcom/discord/stores/StoreNotifications;->notificationSettings:Lcom/discord/utilities/persister/Persister;
+
+    invoke-direct {p0}, Lcom/discord/stores/StoreNotifications;->getDefaultSettings()Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;
+
+    move-result-object v1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x2
+
+    const/4 v4, 0x0
+
+    invoke-static {v0, v1, v2, v3, v4}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
+
 .method public final init(Landroid/content/Context;)V
     .locals 1
 
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 083b3098c2..a0075bcc28 100644
--- a/com.discord/smali/com/discord/stores/StoreNux$updateNux$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNux$updateNux$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreNux$updateNux$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNux.smali b/com.discord/smali/com/discord/stores/StoreNux.smali
index fe653f86c4..c51ce8be00 100644
--- a/com.discord/smali/com/discord/stores/StoreNux.smali
+++ b/com.discord/smali/com/discord/stores/StoreNux.smali
@@ -85,7 +85,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreNux;->nuxStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StorePaymentSources$Actions$fetchPaymentSources$1.smali b/com.discord/smali/com/discord/stores/StorePaymentSources$Actions$fetchPaymentSources$1.smali
index 1f172cbc26..a19ced9202 100644
--- a/com.discord/smali/com/discord/stores/StorePaymentSources$Actions$fetchPaymentSources$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePaymentSources$Actions$fetchPaymentSources$1.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StorePaymentSources$Actions$fetchPaymentSources$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePaymentSources$Actions.smali b/com.discord/smali/com/discord/stores/StorePaymentSources$Actions.smali
index 507c882219..39c99ffc01 100644
--- a/com.discord/smali/com/discord/stores/StorePaymentSources$Actions.smali
+++ b/com.discord/smali/com/discord/stores/StorePaymentSources$Actions.smali
@@ -52,7 +52,7 @@
 
     const-string v0, "store"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -75,7 +75,7 @@
 
     const-string v1, "stream"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     sget-object v1, Lcom/discord/stores/StorePaymentSources$Actions$fetchPaymentSources$1;->INSTANCE:Lcom/discord/stores/StorePaymentSources$Actions$fetchPaymentSources$1;
diff --git a/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$2$1.smali b/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$2$1.smali
index 2215991066..66990493b2 100644
--- a/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$2$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StorePaymentSources$fetchPaymentSources$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$3$1.smali b/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$3$1.smali
index 2b54596f53..56525d030a 100644
--- a/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$3$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StorePaymentSources$fetchPaymentSources$3$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePaymentSources.smali b/com.discord/smali/com/discord/stores/StorePaymentSources.smali
index d39c1169cd..dc3eda90ec 100644
--- a/com.discord/smali/com/discord/stores/StorePaymentSources.smali
+++ b/com.discord/smali/com/discord/stores/StorePaymentSources.smali
@@ -130,7 +130,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v0, Ljava/util/List;
 
@@ -392,7 +392,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StorePaymentSources;->paymentSourcesStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StorePermissions.smali b/com.discord/smali/com/discord/stores/StorePermissions.smali
index 94dcf32ec2..deccaf3e74 100644
--- a/com.discord/smali/com/discord/stores/StorePermissions.smali
+++ b/com.discord/smali/com/discord/stores/StorePermissions.smali
@@ -239,13 +239,13 @@
 
     move-result v3
 
-    invoke-static {v3}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v3}, Lkotlin/a/ad;->dj(I)I
 
     move-result v3
 
     const/16 v5, 0x10
 
-    invoke-static {v3, v5}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v3, v5}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v3
 
@@ -577,7 +577,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -641,7 +641,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -711,7 +711,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -745,7 +745,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StorePinnedMessages.smali b/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
index d728e35057..1234cd4e9e 100644
--- a/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
+++ b/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
@@ -309,7 +309,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -317,7 +317,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dy()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -446,7 +446,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -454,7 +454,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -487,7 +487,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -495,7 +495,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1.smali
index a0457687ed..1defb54938 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$1.smali
index ea3adca8b4..5ffa923d27 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$1.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1.smali
index da947bce31..106787ac79 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4.smali
index 24b6dae20b..efb57d1b7d 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1.smali
index 74b33b1e5e..15c9ffd525 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5.smali
index ca46da44e1..06a1fa18a3 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5.smali
@@ -70,7 +70,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5;->invoke(Lkotlin/Pair;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1.smali
index 5cb79dfcb4..aaeae89b34 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions.smali
index a42aa0a943..437994f19f 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions.smali
@@ -52,7 +52,7 @@
 
     const-string v0, "store"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -67,7 +67,7 @@
 
     const-string v0, "stream"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -104,7 +104,7 @@
 
     const-string v1, "stream"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v1, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1;
@@ -127,7 +127,7 @@
 
     const-string v1, "stream"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     sget-object v1, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$1;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$1;
@@ -246,7 +246,7 @@
 
     const-string v1, "stream"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v1, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1;
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates.smali b/com.discord/smali/com/discord/stores/StoreReadStates.smali
index 24064efd06..fd085a857c 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates.smali
@@ -130,7 +130,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v0
 
@@ -208,7 +208,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -608,7 +608,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v0
 
@@ -624,7 +624,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v1
 
@@ -801,7 +801,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -825,7 +825,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -909,11 +909,11 @@
 
     invoke-direct {v0, p0}, Lcom/discord/stores/-$$Lambda$StoreReadStates$BEpBYAlVtMYsmcI--VrnnzTNNnc;-><init>(Lcom/discord/stores/StoreReadStates;)V
 
-    invoke-static {}, Lrx/functions/a;->Kq()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Ke()Lrx/functions/a$b;
 
     move-result-object v1
 
-    invoke-static {}, Lrx/functions/a;->Kq()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Ke()Lrx/functions/a$b;
 
     move-result-object v2
 
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 3af50158b9..a7875be169 100644
--- a/com.discord/smali/com/discord/stores/StoreReviewRequest$onReviewRequestShown$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreReviewRequest$onReviewRequestShown$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreReviewRequest$onReviewRequestShown$1;->invoke(Landroid/content/SharedPreferences$Editor;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 74ccca3e26..07e2ffa3f3 100644
--- a/com.discord/smali/com/discord/stores/StoreReviewRequest$onUserAcceptedRequest$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreReviewRequest$onUserAcceptedRequest$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreReviewRequest$onUserAcceptedRequest$1;->invoke(Landroid/content/SharedPreferences$Editor;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$WhenMappings.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$WhenMappings.smali
index 94ff3b5e66..75f3bd695f 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$WhenMappings.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$WhenMappings.smali
@@ -20,7 +20,7 @@
 
     sput-object v0, Lcom/discord/stores/StoreRtcConnection$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->xQ:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->yb:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->ordinal()I
 
@@ -32,7 +32,7 @@
 
     sget-object v0, Lcom/discord/stores/StoreRtcConnection$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->xR:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->yc:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->ordinal()I
 
@@ -44,7 +44,7 @@
 
     sget-object v0, Lcom/discord/stores/StoreRtcConnection$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->xS:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->yd:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->ordinal()I
 
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 124d8757ce..a15e4e6c35 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreRtcConnection$init$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 65de72c640..77927ad11f 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreRtcConnection$init$1;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 94ba5c21ca..36e56d1d91 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreRtcConnection$init$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 ddc18a9a34..172c60d5b4 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreRtcConnection$init$2;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     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 806e6bf562..9d07208a06 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreRtcConnection$init$4$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 1ff23874dc..b9f036f230 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreRtcConnection$init$4;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 ec94a69a44..b6573dd101 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$onVideoStream$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$onVideoStream$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreRtcConnection$onVideoStream$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection.smali
index 9141b42a70..fff9dae499 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection.smali
@@ -103,13 +103,13 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreRtcConnection;->stream:Lcom/discord/stores/StoreStream;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
     iput-object p1, p0, Lcom/discord/stores/StoreRtcConnection;->speakingUsersSubject:Lrx/subjects/PublishSubject;
 
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xU:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yf:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -161,7 +161,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -183,7 +183,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -205,7 +205,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -319,9 +319,9 @@
     return-void
 
     :cond_3
-    sget-object v2, Lcom/discord/app/App;->tK:Lcom/discord/app/App$a;
+    sget-object v2, Lcom/discord/app/App;->tJ:Lcom/discord/app/App$a;
 
-    invoke-static {}, Lcom/discord/app/App;->dm()Z
+    invoke-static {}, Lcom/discord/app/App;->dl()Z
 
     move-result v2
 
@@ -351,17 +351,7 @@
 
     move-result-object v1
 
-    const-string v3, "endpoint"
-
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v3, Lcom/discord/rtcconnection/RtcConnection$d;
-
-    invoke-direct {v3, v0, v4, v2, v1}, Lcom/discord/rtcconnection/RtcConnection$d;-><init>(Lcom/discord/rtcconnection/RtcConnection;Ljavax/net/ssl/SSLSocketFactory;Ljava/lang/String;Ljava/lang/String;)V
-
-    check-cast v3, Lkotlin/jvm/functions/Function0;
-
-    invoke-virtual {v0, v3}, Lcom/discord/rtcconnection/RtcConnection;->a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    invoke-virtual {v0, v2, v1, v4}, Lcom/discord/rtcconnection/RtcConnection;->a(Ljava/lang/String;Ljava/lang/String;Ljavax/net/ssl/SSLSocketFactory;)Ljava/util/concurrent/Future;
 
     :cond_5
     :goto_1
@@ -369,7 +359,7 @@
 .end method
 
 .method private final createRtcConnection()V
-    .locals 12
+    .locals 14
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -469,15 +459,15 @@
 
     invoke-virtual {v4}, Lcom/discord/stores/StoreMediaEngine;->getMediaEngine()Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
-    move-result-object v9
+    move-result-object v10
 
-    if-eqz v0, :cond_9
+    if-eqz v0, :cond_a
 
-    if-eqz v6, :cond_9
+    if-eqz v6, :cond_a
 
     if-nez v2, :cond_4
 
-    goto :goto_5
+    goto :goto_6
 
     :cond_4
     iget-object v4, p0, Lcom/discord/stores/StoreRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
@@ -524,54 +514,68 @@
 
     move-result-wide v4
 
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+    if-eqz v3, :cond_8
+
+    invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v7
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    goto :goto_5
 
-    move-object v10, v0
+    :cond_8
+    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
-    check-cast v10, Lcom/discord/utilities/logging/Logger;
+    move-result-wide v7
 
-    new-instance v11, Lcom/discord/utilities/networking/NetworkMonitor;
+    :goto_5
+    invoke-static {v7, v8}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v8
+
+    const/4 v11, 0x0
+
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
+
+    move-object v12, v0
+
+    check-cast v12, Lcom/discord/utilities/logging/Logger;
+
+    new-instance v13, Lcom/discord/utilities/networking/NetworkMonitor;
 
     iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection;->context:Landroid/content/Context;
 
-    if-nez v0, :cond_8
+    if-nez v0, :cond_9
 
     const-string v2, "context"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
-    :cond_8
-    invoke-direct {v11, v0}, Lcom/discord/utilities/networking/NetworkMonitor;-><init>(Landroid/content/Context;)V
+    :cond_9
+    invoke-direct {v13, v0}, Lcom/discord/utilities/networking/NetworkMonitor;-><init>(Landroid/content/Context;)V
 
     move-object v2, v1
 
-    invoke-direct/range {v2 .. v11}, Lcom/discord/rtcconnection/RtcConnection;-><init>(Ljava/lang/Long;JLjava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;Lcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
+    invoke-direct/range {v2 .. v13}, Lcom/discord/rtcconnection/RtcConnection;-><init>(Ljava/lang/Long;JLjava/lang/String;Ljava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;ZLcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
 
     move-object v0, p0
 
     check-cast v0, Lcom/discord/rtcconnection/RtcConnection$b;
 
-    const-string v2, "listener"
-
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v2, v1, Lcom/discord/rtcconnection/RtcConnection;->listeners:Ljava/util/List;
-
-    invoke-interface {v2, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v1, v0}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection$b;)V
 
     iput-object v1, p0, Lcom/discord/stores/StoreRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
 
-    :cond_9
-    :goto_5
+    :cond_a
+    :goto_6
     return-void
 .end method
 
 .method private final destroyRtcConnection()V
-    .locals 2
+    .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -587,13 +591,7 @@
 
     if-eqz v0, :cond_0
 
-    new-instance v1, Lcom/discord/rtcconnection/RtcConnection$e;
-
-    invoke-direct {v1, v0}, Lcom/discord/rtcconnection/RtcConnection$e;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function0;
-
-    invoke-virtual {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/RtcConnection;->ec()Ljava/util/concurrent/Future;
 
     :cond_0
     const/4 v0, 0x0
@@ -946,7 +944,7 @@
 .method private final recordBreadcrumb(Ljava/lang/String;)V
     .locals 6
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1365,7 +1363,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/stores/StoreRtcConnection$init$1;
 
@@ -1403,7 +1401,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/stores/StoreRtcConnection$init$2;
 
@@ -1441,7 +1439,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/stores/StoreRtcConnection$init$4;
 
@@ -1559,7 +1557,29 @@
 .end method
 
 .method public final onSpeaking(JZ)V
-    .locals 1
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "got speaking user: "
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1, p2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v1, " -- isSpeaking: "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p3}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "findme"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection;->speakingUsersSubject:Lrx/subjects/PublishSubject;
 
diff --git a/com.discord/smali/com/discord/stores/StoreRunningGame$RunningGame.smali b/com.discord/smali/com/discord/stores/StoreRunningGame$RunningGame.smali
index cf442ccfe4..86f88fb048 100644
--- a/com.discord/smali/com/discord/stores/StoreRunningGame$RunningGame.smali
+++ b/com.discord/smali/com/discord/stores/StoreRunningGame$RunningGame.smali
@@ -273,70 +273,66 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/stores/StoreRunningGame$RunningGame;->lastUsed:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v2, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v2
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/stores/StoreRunningGame$RunningGame;->appName:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/stores/StoreRunningGame$RunningGame;->appName:Ljava/lang/String;
 
     const/4 v2, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/stores/StoreRunningGame$RunningGame;->packageName:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/stores/StoreRunningGame$RunningGame;->packageName:Ljava/lang/String;
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()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 v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/stores/StoreRunningGame$RunningGame;->icon:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/discord/stores/StoreRunningGame$RunningGame;->icon:Landroid/graphics/drawable/Drawable;
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v2
 
     :cond_2
-    add-int/2addr v1, v2
+    add-int/2addr v0, v2
 
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
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 2538972176..26ef006a93 100644
--- a/com.discord/smali/com/discord/stores/StoreRunningGame$setRunningGame$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRunningGame$setRunningGame$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreRunningGame$setRunningGame$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreRunningGame.smali b/com.discord/smali/com/discord/stores/StoreRunningGame.smali
index b2361b7554..5685598a93 100644
--- a/com.discord/smali/com/discord/stores/StoreRunningGame.smali
+++ b/com.discord/smali/com/discord/stores/StoreRunningGame.smali
@@ -74,7 +74,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreRunningGame;->trackedLaunchedTimes:Ljava/util/HashMap;
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -202,7 +202,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreRunningGame;->forceGameDetectionSubject:Lrx/subjects/BehaviorSubject;
 
-    sget-object v1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
@@ -244,7 +244,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreRunningGame;->runningGameSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget.smali b/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget.smali
index 9c3f21ffbd..d65e6cfbf7 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget.smali
@@ -169,7 +169,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearch$SearchTarget;->type:Lcom/discord/stores/StoreSearch$SearchTarget$Type;
 
@@ -189,15 +189,11 @@
 
     iget-wide v1, p0, Lcom/discord/stores/StoreSearch$SearchTarget;->id:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
 .end method
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 093a53b64a..4a8dbc2153 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$getHistory$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$getHistory$1.smali
@@ -91,7 +91,7 @@
     return-object p1
 
     :cond_0
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
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 9a0fa7458b..9d9b2b91d7 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$init$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$init$4.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearch$init$4;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 5259a16e81..3c395f5d49 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$init$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$init$5.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearch$init$5;->invoke(Lcom/discord/stores/StoreSearch$DisplayState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearch.smali b/com.discord/smali/com/discord/stores/StoreSearch.smali
index 5fef5e93b6..ac4a087b76 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch.smali
@@ -142,7 +142,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -496,7 +496,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
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 1ef53fbf75..4234861d0c 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData$init$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearchData$init$1;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 eaba7b3ae4..6f54134415 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData$init$2.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearchData$init$2;->invoke(Lcom/discord/utilities/search/validation/SearchData;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchData.smali b/com.discord/smali/com/discord/stores/StoreSearchData.smali
index c673c6dab9..36fe392f89 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData.smali
@@ -372,7 +372,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearchInput$2.smali b/com.discord/smali/com/discord/stores/StoreSearchInput$2.smali
index aa4837d469..fa709c5044 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearchInput$2;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 9583b29ab7..1726a845d3 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput$init$2.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearchInput$init$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 7b242249a3..6000d3d849 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput$init$3.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearchInput$init$3;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchInput.smali b/com.discord/smali/com/discord/stores/StoreSearchInput.smali
index 7bd87207c2..9e07393c77 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput.smali
@@ -94,7 +94,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -132,7 +132,7 @@
 
     iput-object v0, p0, Lcom/discord/stores/StoreSearchInput;->isInputValidSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -180,7 +180,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -188,7 +188,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/stores/StoreSearchInput$2;
 
@@ -452,7 +452,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -466,7 +466,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v0
 
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 03cc34fd14..c8cca8a652 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$1.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearchQuery$makeQuery$1;->invoke(Lcom/discord/models/domain/ModelSearchResponse;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 dc18a46996..9cded9bab1 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearchQuery$makeQuery$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 bc5f23726b..971ef3fe1b 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearchQuery$makeQuery$3;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 3eca79f3c2..fc9f22fd4e 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$4.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearchQuery$parseAndQuery$4;->invoke(Lcom/discord/utilities/search/network/SearchQuery;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery.smali
index 9535dfde7c..61bbaa798f 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery.smali
@@ -530,7 +530,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearchQuery;->searchStateSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -768,7 +768,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode.smali b/com.discord/smali/com/discord/stores/StoreSlowMode.smali
index e8b48067f0..6da47ba7b5 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode.smali
@@ -197,7 +197,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -235,7 +235,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/b/b;->Lo()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/b/b;->Lc()Lrx/Observable;
 
     move-result-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 cc3ea256b8..20879781f7 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$SpotifyState.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$SpotifyState.smali
@@ -347,7 +347,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/stores/StoreSpotify$SpotifyState;->track:Lcom/discord/models/domain/spotify/ModelSpotifyTrack;
 
@@ -378,21 +378,21 @@
 
     iget v1, p0, Lcom/discord/stores/StoreSpotify$SpotifyState;->position:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v1, p0, Lcom/discord/stores/StoreSpotify$SpotifyState;->start:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
 .end method
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 b1e02a3608..70218e29f1 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreSpotify$init$3$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 064239caf5..dbbff6e055 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$init$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSpotify$init$3;->invoke(Lcom/discord/models/domain/spotify/ModelSpotifyTrack;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     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 abc6b44a51..cff3f8117a 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$setPlayingStatus$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$setPlayingStatus$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreSpotify$setPlayingStatus$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -143,7 +143,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
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 5abdd5f74e..24dc09bd21 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSpotify$startStateExpiration$1;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 9edb518f67..4f6acfa79e 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreSpotify$startStateExpiration$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 e9333c348e..85eb88742e 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSpotify$startStateExpiration$2;->invoke(Ljava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify.smali b/com.discord/smali/com/discord/stores/StoreSpotify.smali
index 238fdeb179..648984c1e3 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify.smali
@@ -43,7 +43,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -245,7 +245,7 @@
 
     if-nez v1, :cond_6
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_6
     invoke-virtual {v1}, Lcom/discord/stores/StoreSpotify$SpotifyState;->component1()Lcom/discord/models/domain/spotify/ModelSpotifyTrack;
@@ -639,7 +639,7 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreSpotify;->publishStateTrigger:Lrx/subjects/BehaviorSubject;
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
@@ -655,7 +655,7 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreSpotify;->publishStateTrigger:Lrx/subjects/BehaviorSubject;
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
@@ -781,7 +781,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$4.smali b/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$4.smali
deleted file mode 100644
index 67274eb52b..0000000000
--- a/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$4.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class final Lcom/discord/stores/StoreStream$Companion$initialize$4;
-.super Lkotlin/jvm/internal/l;
-.source "StoreStream.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream$Companion;->initialize(Landroid/app/Application;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Landroid/app/Application;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic $application:Landroid/app/Application;
-
-
-# direct methods
-.method constructor <init>(Landroid/app/Application;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/stores/StoreStream$Companion$initialize$4;->$application:Landroid/app/Application;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Landroid/app/Application;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$Companion$initialize$4;->invoke(Landroid/app/Application;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Landroid/app/Application;)V
-    .locals 1
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->access$getCollector$cp()Lcom/discord/stores/StoreStream;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$Companion$initialize$4;->$application:Landroid/app/Application;
-
-    invoke-virtual {p1, v0}, Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)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 c8204e1f9f..f504fb82ad 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
@@ -1069,6 +1069,20 @@
     return-object v0
 .end method
 
+.method public final getVideoStreams()Lcom/discord/stores/StoreVideoStreams;
+    .locals 1
+
+    invoke-static {}, Lcom/discord/stores/StoreStream;->access$getCollector$cp()Lcom/discord/stores/StoreStream;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getVideoStreams$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVideoStreams;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public final getVideoSupport()Lcom/discord/stores/StoreVideoSupport;
     .locals 1
 
@@ -1126,7 +1140,7 @@
 .end method
 
 .method public final initialize(Landroid/app/Application;)V
-    .locals 10
+    .locals 1
 
     const-string v0, "application"
 
@@ -1145,20 +1159,6 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getUserSettings$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUserSettings;
-
-    move-result-object v0
-
-    move-object v1, p1
-
-    check-cast v1, Landroid/content/Context;
-
-    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreUserSettings;->init(Landroid/content/Context;)V
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->access$getCollector$cp()Lcom/discord/stores/StoreStream;
-
-    move-result-object v0
-
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getEmojis$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreEmoji;
 
     move-result-object v0
@@ -1171,11 +1171,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getEmojis$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreEmoji;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreEmoji;->initBlocking(Landroid/content/Context;)V
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$init(Lcom/discord/stores/StoreStream;Landroid/app/Application;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream$Companion$initialize$1;->INSTANCE:Lcom/discord/stores/StoreStream$Companion$initialize$1;
 
@@ -1195,37 +1191,11 @@
 
     sput-object v0, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->localeProvider:Lkotlin/jvm/functions/Function0;
 
-    invoke-static {p1}, Lrx/Observable;->bI(Ljava/lang/Object;)Lrx/Observable;
+    invoke-static {}, Lcom/discord/stores/StoreStream;->access$getCollector$cp()Lcom/discord/stores/StoreStream;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v0, "Observable\n          .just(application)"
-
-    invoke-static {v1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v2, 0x0
-
-    new-instance v0, Lcom/discord/stores/StoreStream$Companion$initialize$4;
-
-    invoke-direct {v0, p1}, Lcom/discord/stores/StoreStream$Companion$initialize$4;-><init>(Landroid/app/Application;)V
-
-    move-object v5, v0
-
-    check-cast v5, Lkotlin/jvm/functions/Function1;
-
-    const/4 v4, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/16 v8, 0x35
-
-    const/4 v9, 0x0
-
-    const-string v3, "streamInit"
-
-    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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$deferredInit(Lcom/discord/stores/StoreStream;Landroid/app/Application;)V
 
     const/4 p1, 0x1
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$init$1.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$1.smali
similarity index 59%
rename from com.discord/smali/com/discord/stores/StoreStream$init$1.smali
rename to com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$1.smali
index a0f85f80a9..d992a73470 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreStream$init$1;
+.class final Lcom/discord/stores/StoreStream$deferredInit$1$1;
 .super Lkotlin/jvm/internal/l;
 .source "StoreStream.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+    value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/stores/StoreStream;
+.field final synthetic this$0:Lcom/discord/stores/StoreStream$deferredInit$1;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/stores/StoreStream;)V
+.method constructor <init>(Lcom/discord/stores/StoreStream$deferredInit$1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/stores/StoreStream$init$1;->this$0:Lcom/discord/stores/StoreStream;
+    iput-object p1, p0, Lcom/discord/stores/StoreStream$deferredInit$1$1;->this$0:Lcom/discord/stores/StoreStream$deferredInit$1;
 
     const/4 p1, 0x1
 
@@ -55,9 +55,9 @@
 
     move-result p1
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$init$1;->invoke(Z)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$1;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Z)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/stores/StoreStream$init$1;->this$0:Lcom/discord/stores/StoreStream;
+    iget-object p1, p0, Lcom/discord/stores/StoreStream$deferredInit$1$1;->this$0:Lcom/discord/stores/StoreStream$deferredInit$1;
+
+    iget-object p1, p1, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
 
     invoke-static {p1}, Lcom/discord/stores/StoreStream;->access$handlePreLogout(Lcom/discord/stores/StoreStream;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$init$10.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$10.smali
similarity index 85%
rename from com.discord/smali/com/discord/stores/StoreStream$init$10.smali
rename to com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$10.smali
index d278992aa2..b3a3343a75 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$init$10.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$10.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/stores/StoreStream$init$10;
+.class final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$10;
 .super Lkotlin/jvm/internal/j;
 .source "StoreStream.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+    value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -77,9 +77,9 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreStream$init$10;->invoke(J)V
+    invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreStream$deferredInit$1$10;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,7 +87,7 @@
 .method public final invoke(J)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$init$10;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$deferredInit$1$10;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$init$11.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$11.smali
similarity index 82%
rename from com.discord/smali/com/discord/stores/StoreStream$init$11.smali
rename to com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$11.smali
index 676e4df718..24edbd40ce 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$init$11.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$11.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/stores/StoreStream$init$11;
+.class final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$11;
 .super Lkotlin/jvm/internal/j;
 .source "StoreStream.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+    value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -77,9 +77,9 @@
 
     move-result p1
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$init$11;->invoke(Z)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$11;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,7 +87,7 @@
 .method public final invoke(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$init$11;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$deferredInit$1$11;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$init$12.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$12.smali
similarity index 79%
rename from com.discord/smali/com/discord/stores/StoreStream$init$12.smali
rename to com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$12.smali
index b12dd96aab..0a22a8106b 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$init$12.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$12.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreStream$init$12;
+.class final Lcom/discord/stores/StoreStream$deferredInit$1$12;
 .super Ljava/lang/Object;
 .source "StoreStream.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+    value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,18 +33,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreStream$init$12;
+.field public static final INSTANCE:Lcom/discord/stores/StoreStream$deferredInit$1$12;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/stores/StoreStream$init$12;
+    new-instance v0, Lcom/discord/stores/StoreStream$deferredInit$1$12;
 
-    invoke-direct {v0}, Lcom/discord/stores/StoreStream$init$12;-><init>()V
+    invoke-direct {v0}, Lcom/discord/stores/StoreStream$deferredInit$1$12;-><init>()V
 
-    sput-object v0, Lcom/discord/stores/StoreStream$init$12;->INSTANCE:Lcom/discord/stores/StoreStream$init$12;
+    sput-object v0, Lcom/discord/stores/StoreStream$deferredInit$1$12;->INSTANCE:Lcom/discord/stores/StoreStream$deferredInit$1$12;
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     check-cast p2, Ljava/lang/Boolean;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreStream$init$12;->call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreStream$deferredInit$1$12;->call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$init$13.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali
similarity index 81%
rename from com.discord/smali/com/discord/stores/StoreStream$init$13.smali
rename to com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali
index 6047dcc0ba..35e691330d 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$init$13.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/stores/StoreStream$init$13;
+.class final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$13;
 .super Lkotlin/jvm/internal/j;
 .source "StoreStream.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+    value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -73,9 +73,9 @@
 
     check-cast p1, Ljava/lang/Boolean;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$init$13;->invoke(Ljava/lang/Boolean;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$13;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -83,7 +83,7 @@
 .method public final invoke(Ljava/lang/Boolean;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$init$13;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$deferredInit$1$13;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lrx/subjects/BehaviorSubject;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$init$2.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$2.smali
similarity index 81%
rename from com.discord/smali/com/discord/stores/StoreStream$init$2.smali
rename to com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$2.smali
index 0f881efb95..5094f49dcf 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$2.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/stores/StoreStream$init$2;
+.class final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$2;
 .super Lkotlin/jvm/internal/j;
 .source "StoreStream.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+    value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -73,9 +73,9 @@
 
     check-cast p1, Ljava/lang/String;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$init$2;->invoke(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$2;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -83,7 +83,7 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$init$2;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$deferredInit$1$2;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$init$3.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$3.smali
similarity index 81%
rename from com.discord/smali/com/discord/stores/StoreStream$init$3.smali
rename to com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$3.smali
index e41e0158f3..35e7d00ff2 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$3.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/stores/StoreStream$init$3;
+.class final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$3;
 .super Lkotlin/jvm/internal/j;
 .source "StoreStream.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+    value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -73,9 +73,9 @@
 
     check-cast p1, Ljava/lang/String;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$init$3;->invoke(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$3;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -83,7 +83,7 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$init$3;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$deferredInit$1$3;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$init$4.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$4.smali
similarity index 85%
rename from com.discord/smali/com/discord/stores/StoreStream$init$4.smali
rename to com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$4.smali
index 4b8a31af30..2d3374d5ef 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$init$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$4.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/stores/StoreStream$init$4;
+.class final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$4;
 .super Lkotlin/jvm/internal/j;
 .source "StoreStream.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+    value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -76,9 +76,9 @@
 
     check-cast p1, Ljava/util/List;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$init$4;->invoke(Ljava/util/List;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$4;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -98,7 +98,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$init$4;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$deferredInit$1$4;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$init$5.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$5.smali
similarity index 85%
rename from com.discord/smali/com/discord/stores/StoreStream$init$5.smali
rename to com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$5.smali
index 45ef17c6e5..9af5038038 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$init$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$5.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/stores/StoreStream$init$5;
+.class final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$5;
 .super Lkotlin/jvm/internal/j;
 .source "StoreStream.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+    value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -77,9 +77,9 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreStream$init$5;->invoke(J)V
+    invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreStream$deferredInit$1$5;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,7 +87,7 @@
 .method public final invoke(J)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$init$5;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$deferredInit$1$5;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$init$6.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$6.smali
similarity index 85%
rename from com.discord/smali/com/discord/stores/StoreStream$init$6.smali
rename to com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$6.smali
index 1b1f0bcf12..0eb972b72f 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$init$6.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$6.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/stores/StoreStream$init$6;
+.class final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$6;
 .super Lkotlin/jvm/internal/j;
 .source "StoreStream.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+    value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -77,9 +77,9 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreStream$init$6;->invoke(J)V
+    invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreStream$deferredInit$1$6;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,7 +87,7 @@
 .method public final invoke(J)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$init$6;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$deferredInit$1$6;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$init$7.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$7.smali
similarity index 84%
rename from com.discord/smali/com/discord/stores/StoreStream$init$7.smali
rename to com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$7.smali
index 420e14482e..6fcfc7d659 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$init$7.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$7.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/stores/StoreStream$init$7;
+.class final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$7;
 .super Lkotlin/jvm/internal/j;
 .source "StoreStream.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+    value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -76,9 +76,9 @@
 
     check-cast p1, Ljava/util/Set;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$init$7;->invoke(Ljava/util/Set;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$7;->invoke(Ljava/util/Set;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -98,7 +98,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$init$7;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$deferredInit$1$7;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$init$8.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$8.smali
similarity index 82%
rename from com.discord/smali/com/discord/stores/StoreStream$init$8.smali
rename to com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$8.smali
index 6846b8773f..6047846ebc 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$init$8.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$8.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/stores/StoreStream$init$8;
+.class final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$8;
 .super Lkotlin/jvm/internal/j;
 .source "StoreStream.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+    value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -73,9 +73,9 @@
 
     check-cast p1, Lco/discord/media_engine/VideoInputDeviceDescription;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$init$8;->invoke(Lco/discord/media_engine/VideoInputDeviceDescription;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$8;->invoke(Lco/discord/media_engine/VideoInputDeviceDescription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -83,7 +83,7 @@
 .method public final invoke(Lco/discord/media_engine/VideoInputDeviceDescription;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$init$8;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$deferredInit$1$8;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$init$9.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$9.smali
similarity index 83%
rename from com.discord/smali/com/discord/stores/StoreStream$init$9.smali
rename to com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$9.smali
index 3a4d79b163..6d66c772a3 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$init$9.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$9.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/stores/StoreStream$init$9;
+.class final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$9;
 .super Lkotlin/jvm/internal/j;
 .source "StoreStream.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+    value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -73,9 +73,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$init$9;->invoke(Lcom/discord/rtcconnection/RtcConnection$State;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$9;->invoke(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,7 +87,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$init$9;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$deferredInit$1$9;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
new file mode 100644
index 0000000000..c6eeeaa7e1
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
@@ -0,0 +1,864 @@
+.class final Lcom/discord/stores/StoreStream$deferredInit$1;
+.super Lkotlin/jvm/internal/l;
+.source "StoreStream.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreStream;->deferredInit(Landroid/app/Application;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $context:Landroid/app/Application;
+
+.field final synthetic this$0:Lcom/discord/stores/StoreStream;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/stores/StoreStream;Landroid/app/Application;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    iput-object p2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 11
+
+    new-instance v0, Lcom/discord/app/AppLog$Elapsed;
+
+    invoke-direct {v0}, Lcom/discord/app/AppLog$Elapsed;-><init>()V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getMediaEngine$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaEngine;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMediaEngine;->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;->getExperiments$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreExperiments;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreExperiments;->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;->getGatewaySocket$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreGatewayConnection;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreGatewayConnection;->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;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreUser;->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;->getNavigation$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreNavigation;
+
+    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/StoreNavigation;->init(Landroid/app/Application;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getNux$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreNux;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreNux;->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;->getChannels$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreChannels;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreChannels;->init$app_productionDiscordExternalRelease()V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getGuilds$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreGuilds;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreGuilds;->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;->getGuildsSorted$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreGuildsSorted;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreGuildsSorted;->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;->getGuildsNsfw$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreGuildsNsfw;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreGuildsNsfw;->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;->getGuildSelected$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreGuildSelected;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreGuildSelected;->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;->getChannelsSelected$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreChannelsSelected;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreChannelsSelected;->init()V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getMessages$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMessages;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMessages;->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;->getMessagesLoader$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMessagesLoader;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMessagesLoader;->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;->getMessageAck$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMessageAck;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMessageAck;->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;->getMessagesMostRecent$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMessagesMostRecent;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMessagesMostRecent;->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;->getMentions$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMentions;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMentions;->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;->getNotifications$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreNotifications;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreNotifications;->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;->getVideoSupport$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVideoSupport;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreVideoSupport;->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;->getRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreRtcConnection;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreRtcConnection;->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;->getReadStates$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreReadStates;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreReadStates;->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;->getVoiceChannelSelected$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceChannelSelected;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreVoiceChannelSelected;->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;->getVoiceSpeaking$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceSpeaking;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreVoiceSpeaking;->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;->getVoiceParticipants$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceParticipants;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreVoiceParticipants;->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;->getConnectivity$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreConnectivity;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreConnectivity;->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;->getClientVersion$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreClientVersion;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreClientVersion;->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;->getMediaSettings$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMediaSettings;->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;->getAnalytics$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAnalytics;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreAnalytics;->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;->getStoreChannelCategories$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreChannelCategories;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreChannelCategories;->init()V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-static {v1}, Lcom/discord/stores/StoreStream;->access$getAudioManager$p(Lcom/discord/stores/StoreStream;)Lcom/discord/stores/StoreAudioManager;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreAudioManager;->init(Landroid/content/Context;)V
+
+    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;
+
+    check-cast v2, Landroid/content/Context;
+
+    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
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreUserGuildSettings;->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;->getNotices$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreNotices;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreNotices;->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;->getUserConnections$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUserConnections;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreUserConnections;->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;->getChangeLogStore$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreChangeLog;
+
+    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/StoreChangeLog;->init(Landroid/app/Application;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getReviewRequestStore$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreReviewRequest;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreReviewRequest;->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;->getPresences$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUserPresence;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreUserPresence;->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;->getSpotify$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreSpotify;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreSpotify;->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;->getStreamRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreStreamRtcConnection;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreStreamRtcConnection;->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;->getGuildsSorted$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreGuildsSorted;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreGuildsSorted;->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;->getExpandedGuildFolders$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreExpandedGuildFolders;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreExpandedGuildFolders;->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;->getAuthentication$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAuthentication;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreAuthentication;->getPreLogoutSignal$app_productionDiscordExternalRelease()Lrx/Observable;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/stores/StoreStream$deferredInit$1$1;
+
+    invoke-direct {v3, p0}, Lcom/discord/stores/StoreStream$deferredInit$1$1;-><init>(Lcom/discord/stores/StoreStream$deferredInit$1;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const-string v4, "streamPreLogout"
+
+    invoke-static {v1, v2, v4, v3}, Lcom/discord/stores/StoreStream;->access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getAuthentication$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAuthentication;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreAuthentication;->getAuthedToken$app_productionDiscordExternalRelease()Lrx/Observable;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/stores/StoreStream$deferredInit$1$2;
+
+    iget-object v4, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-direct {v3, v4}, Lcom/discord/stores/StoreStream$deferredInit$1$2;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const-string v4, "streamAuthedToken"
+
+    invoke-static {v1, v2, v4, v3}, Lcom/discord/stores/StoreStream;->access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getAuthentication$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAuthentication;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreAuthentication;->getFingerPrint$app_productionDiscordExternalRelease()Lrx/Observable;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/stores/StoreStream$deferredInit$1$3;
+
+    iget-object v4, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-direct {v3, v4}, Lcom/discord/stores/StoreStream$deferredInit$1$3;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const-string v4, "streamAuthedFingerprint"
+
+    invoke-static {v1, v2, v4, v3}, Lcom/discord/stores/StoreStream;->access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v5, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v5}, Lcom/discord/stores/StoreStream;->getMessagesLoader$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMessagesLoader;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMessagesLoader;->get()Lrx/Observable;
+
+    move-result-object v6
+
+    new-instance v1, Lcom/discord/stores/StoreStream$deferredInit$1$4;
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$deferredInit$1$4;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    move-object v10, v1
+
+    check-cast v10, Lkotlin/jvm/functions/Function1;
+
+    const-string v7, "streamMessagesLoaded"
+
+    const-wide/16 v8, 0xfa
+
+    invoke-static/range {v5 .. v10}, Lcom/discord/stores/StoreStream;->access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;JLkotlin/jvm/functions/Function1;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getChannelsSelected$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreChannelsSelected;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreChannelsSelected;->getId()Lrx/Observable;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/stores/StoreStream$deferredInit$1$5;
+
+    iget-object v4, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-direct {v3, v4}, Lcom/discord/stores/StoreStream$deferredInit$1$5;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const-string v4, "streamChannelSelected"
+
+    invoke-static {v1, v2, v4, v3}, Lcom/discord/stores/StoreStream;->access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getVoiceChannelSelected$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceChannelSelected;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreVoiceChannelSelected;->getId()Lrx/Observable;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/stores/StoreStream$deferredInit$1$6;
+
+    iget-object v4, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-direct {v3, v4}, Lcom/discord/stores/StoreStream$deferredInit$1$6;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const-string v4, "streamVoiceChannelSelected"
+
+    invoke-static {v1, v2, v4, v3}, Lcom/discord/stores/StoreStream;->access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getVoiceSpeaking$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceSpeaking;
+
+    move-result-object v2
+
+    iget-object v2, v2, Lcom/discord/stores/StoreVoiceSpeaking;->speakingUsersPublisher:Lrx/subjects/Subject;
+
+    const-string v3, "voiceSpeaking\n        .speakingUsersPublisher"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v2, Lrx/Observable;
+
+    new-instance v3, Lcom/discord/stores/StoreStream$deferredInit$1$7;
+
+    iget-object v4, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-direct {v3, v4}, Lcom/discord/stores/StoreStream$deferredInit$1$7;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const-string v4, "streamUserSpeaking"
+
+    invoke-static {v1, v2, v4, v3}, Lcom/discord/stores/StoreStream;->access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getMediaEngine$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaEngine;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreMediaEngine;->getSelectedVideoInputDevice()Lrx/Observable;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/stores/StoreStream$deferredInit$1$8;
+
+    iget-object v4, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-direct {v3, v4}, Lcom/discord/stores/StoreStream$deferredInit$1$8;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const-string v4, "streamVideoInputDeviceSelected"
+
+    invoke-static {v1, v2, v4, v3}, Lcom/discord/stores/StoreStream;->access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreRtcConnection;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreRtcConnection;->getConnectionState()Lrx/Observable;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/stores/StoreStream$deferredInit$1$9;
+
+    iget-object v4, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-direct {v3, v4}, Lcom/discord/stores/StoreStream$deferredInit$1$9;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const-string v4, "streamRtcConnectionStateChanged"
+
+    invoke-static {v1, v2, v4, v3}, Lcom/discord/stores/StoreStream;->access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getGuildSelected$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreGuildSelected;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreGuildSelected;->getId()Lrx/Observable;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/stores/StoreStream$deferredInit$1$10;
+
+    iget-object v4, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-direct {v3, v4}, Lcom/discord/stores/StoreStream$deferredInit$1$10;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const-string v4, "streamGuildSelected"
+
+    invoke-static {v1, v2, v4, v3}, Lcom/discord/stores/StoreStream;->access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-static {v1}, Lcom/discord/stores/StoreStream;->access$initGatewaySocketListeners(Lcom/discord/stores/StoreStream;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-static {}, Lcom/miguelgaeta/backgrounded/Backgrounded;->get()Lrx/Observable;
+
+    move-result-object v2
+
+    const-string v3, "Backgrounded\n        .get()"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v3, Lcom/discord/stores/StoreStream$deferredInit$1$11;
+
+    iget-object v4, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-direct {v3, v4}, Lcom/discord/stores/StoreStream$deferredInit$1$11;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const-string v4, "streamBackgrounded"
+
+    invoke-static {v1, v2, v4, v3}, Lcom/discord/stores/StoreStream;->access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getExperiments$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreExperiments;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreExperiments;->isInitialized()Lrx/Observable;
+
+    move-result-object v2
+
+    sget-object v3, Lcom/discord/utilities/persister/Persister;->Companion:Lcom/discord/utilities/persister/Persister$Companion;
+
+    invoke-virtual {v3}, Lcom/discord/utilities/persister/Persister$Companion;->isPreloaded()Lrx/Observable;
+
+    move-result-object v3
+
+    sget-object v4, Lcom/discord/stores/StoreStream$deferredInit$1$12;->INSTANCE:Lcom/discord/stores/StoreStream$deferredInit$1$12;
+
+    check-cast v4, Lrx/functions/Func2;
+
+    invoke-static {v2, v3, v4}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+
+    move-result-object v2
+
+    const-string v3, "Observable\n        .comb\u2026ed && cachesInitialized }"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v3, Lcom/discord/stores/StoreStream$deferredInit$1$13;
+
+    iget-object v4, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-static {v4}, Lcom/discord/stores/StoreStream;->access$getInitialized$p(Lcom/discord/stores/StoreStream;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object v4
+
+    invoke-direct {v3, v4}, Lcom/discord/stores/StoreStream$deferredInit$1$13;-><init>(Lrx/subjects/BehaviorSubject;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const-string v4, "streamInit"
+
+    invoke-static {v1, v2, v4, v3}, Lcom/discord/stores/StoreStream;->access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    const-string v2, "Application stores initialized in: "
+
+    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Lcom/discord/app/AppLog$Elapsed;->ds()F
+
+    move-result v0
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder;
+
+    const-string v0, " seconds."
+
+    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}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$dispatchSubscribe$2.smali b/com.discord/smali/com/discord/stores/StoreStream$dispatchSubscribe$2.smali
index cb1ba062eb..82deee91c9 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$dispatchSubscribe$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$dispatchSubscribe$2.smali
@@ -55,7 +55,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$dispatchSubscribe$2;->invoke(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 88e08fcaba..c0705742af 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$1;->invoke(Lcom/discord/models/domain/ModelPayload;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 24b7835e40..cfc5abb47a 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$10.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$10.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$10;->invoke(Lcom/discord/models/domain/ModelGuildIntegration$Update;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 0f85c42c56..2a1004982a 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$11.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$11.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$11;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 9076fd6e18..8cae196047 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$12.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$12.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$12;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 d0e7db7de4..7a0c7d9f3d 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$13.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$13.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$13;->invoke(Lcom/discord/models/domain/ModelGuildMember;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 a743ad1628..944e06f744 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$14.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$14.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$14;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 3b28e12868..61af778dbe 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$15.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$15.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$15;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 9feba97e5a..df719dc9a3 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$16.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$16.smali
@@ -20,10 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Ljava/util/List<",
-        "+",
-        "Lcom/discord/models/domain/ModelUser;",
-        ">;",
+        "Lcom/discord/models/domain/ModelChannelUnreadUpdate;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -46,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleUserUpdated"
+    const-string v0, "handleChannelUnreadUpdate"
 
     return-object v0
 .end method
@@ -66,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleUserUpdated(Ljava/util/List;)V"
+    const-string v0, "handleChannelUnreadUpdate(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V"
 
     return-object v0
 .end method
@@ -74,26 +71,17 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Ljava/util/List;
+    check-cast p1, Lcom/discord/models/domain/ModelChannelUnreadUpdate;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$16;->invoke(Ljava/util/List;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$16;->invoke(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Ljava/util/List;)V
+.method public final invoke(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
     .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Lcom/discord/models/domain/ModelUser;",
-            ">;)V"
-        }
-    .end annotation
 
     const-string v0, "p1"
 
@@ -103,7 +91,7 @@
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
-    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStream;->handleUserUpdated(Ljava/util/List;)V
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleChannelUnreadUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
 
     return-void
 .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 60a50a0b99..a188cb30a3 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$17.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$17.smali
@@ -20,7 +20,10 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelUser$Notes$Update;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -43,7 +46,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleUserNoteUpdated"
+    const-string v0, "handleUserUpdated"
 
     return-object v0
 .end method
@@ -63,7 +66,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleUserNoteUpdated(Lcom/discord/models/domain/ModelUser$Notes$Update;)V"
+    const-string v0, "handleUserUpdated(Ljava/util/List;)V"
 
     return-object v0
 .end method
@@ -71,17 +74,26 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelUser$Notes$Update;
+    check-cast p1, Ljava/util/List;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$17;->invoke(Lcom/discord/models/domain/ModelUser$Notes$Update;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$17;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelUser$Notes$Update;)V
+.method public final invoke(Ljava/util/List;)V
     .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;)V"
+        }
+    .end annotation
 
     const-string v0, "p1"
 
@@ -91,7 +103,7 @@
 
     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/ModelUser$Notes$Update;)V
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStream;->handleUserUpdated(Ljava/util/List;)V
 
     return-void
 .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 e122aa91ab..7ae8eb1e8f 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$18.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$18.smali
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelUserRelationship;",
+        "Lcom/discord/models/domain/ModelUser$Notes$Update;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -43,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleRelationshipAdd"
+    const-string v0, "handleUserNoteUpdated"
 
     return-object v0
 .end method
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleRelationshipAdd(Lcom/discord/models/domain/ModelUserRelationship;)V"
+    const-string v0, "handleUserNoteUpdated(Lcom/discord/models/domain/ModelUser$Notes$Update;)V"
 
     return-object v0
 .end method
@@ -71,16 +71,16 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelUserRelationship;
+    check-cast p1, Lcom/discord/models/domain/ModelUser$Notes$Update;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$18;->invoke(Lcom/discord/models/domain/ModelUserRelationship;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$18;->invoke(Lcom/discord/models/domain/ModelUser$Notes$Update;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelUserRelationship;)V
+.method public final invoke(Lcom/discord/models/domain/ModelUser$Notes$Update;)V
     .locals 1
 
     const-string v0, "p1"
@@ -91,7 +91,7 @@
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
-    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStream;->handleRelationshipAdd(Lcom/discord/models/domain/ModelUserRelationship;)V
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleUserNoteUpdated(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelUser$Notes$Update;)V
 
     return-void
 .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 4554e0dcda..3b4265148a 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$19.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$19.smali
@@ -43,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleRelationshipRemove"
+    const-string v0, "handleRelationshipAdd"
 
     return-object v0
 .end method
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleRelationshipRemove(Lcom/discord/models/domain/ModelUserRelationship;)V"
+    const-string v0, "handleRelationshipAdd(Lcom/discord/models/domain/ModelUserRelationship;)V"
 
     return-object v0
 .end method
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$19;->invoke(Lcom/discord/models/domain/ModelUserRelationship;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -91,7 +91,7 @@
 
     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
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStream;->handleRelationshipAdd(Lcom/discord/models/domain/ModelUserRelationship;)V
 
     return-void
 .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 b3d24105e8..b08d74dc12 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$2.smali
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$2;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 665b33e683..2204f95858 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$20.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$20.smali
@@ -20,10 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Ljava/util/List<",
-        "+",
-        "Lcom/discord/models/domain/ModelMessage;",
-        ">;",
+        "Lcom/discord/models/domain/ModelUserRelationship;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -46,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleMessageUpdate"
+    const-string v0, "handleRelationshipRemove"
 
     return-object v0
 .end method
@@ -66,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleMessageUpdate(Ljava/util/List;)V"
+    const-string v0, "handleRelationshipRemove(Lcom/discord/models/domain/ModelUserRelationship;)V"
 
     return-object v0
 .end method
@@ -74,26 +71,17 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Ljava/util/List;
+    check-cast p1, Lcom/discord/models/domain/ModelUserRelationship;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$20;->invoke(Ljava/util/List;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$20;->invoke(Lcom/discord/models/domain/ModelUserRelationship;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Ljava/util/List;)V
+.method public final invoke(Lcom/discord/models/domain/ModelUserRelationship;)V
     .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Lcom/discord/models/domain/ModelMessage;",
-            ">;)V"
-        }
-    .end annotation
 
     const-string v0, "p1"
 
@@ -103,7 +91,7 @@
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
-    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleMessageUpdate(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleRelationshipRemove(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelUserRelationship;)V
 
     return-void
 .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 96d225fa1f..c1747c96c9 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$21.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$21.smali
@@ -46,7 +46,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleMessageCreate"
+    const-string v0, "handleMessageUpdate"
 
     return-object v0
 .end method
@@ -66,7 +66,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleMessageCreate(Ljava/util/List;)V"
+    const-string v0, "handleMessageUpdate(Ljava/util/List;)V"
 
     return-object v0
 .end method
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$21;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -103,7 +103,7 @@
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
-    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleMessageCreate(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleMessageUpdate(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
 
     return-void
 .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 51fc1881bd..7ee2a0bc15 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$22.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$22.smali
@@ -22,7 +22,7 @@
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
-        "Lcom/discord/models/domain/ModelMessageReaction$Update;",
+        "Lcom/discord/models/domain/ModelMessage;",
         ">;",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleReactionAdd"
+    const-string v0, "handleMessageCreate"
 
     return-object v0
 .end method
@@ -66,7 +66,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleReactionAdd(Ljava/util/List;)V"
+    const-string v0, "handleMessageCreate(Ljava/util/List;)V"
 
     return-object v0
 .end method
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$22;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -90,7 +90,7 @@
             "(",
             "Ljava/util/List<",
             "+",
-            "Lcom/discord/models/domain/ModelMessageReaction$Update;",
+            "Lcom/discord/models/domain/ModelMessage;",
             ">;)V"
         }
     .end annotation
@@ -103,7 +103,7 @@
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
-    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleReactionAdd(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleMessageCreate(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
 
     return-void
 .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 55cd3b1f38..101f4e57c6 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$23.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$23.smali
@@ -46,7 +46,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleReactionRemove"
+    const-string v0, "handleReactionAdd"
 
     return-object v0
 .end method
@@ -66,7 +66,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleReactionRemove(Ljava/util/List;)V"
+    const-string v0, "handleReactionAdd(Ljava/util/List;)V"
 
     return-object v0
 .end method
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$23;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -103,7 +103,7 @@
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
-    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleReactionRemove(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleReactionAdd(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
 
     return-void
 .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 b076ee0f53..1a00f8c141 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$24.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$24.smali
@@ -20,7 +20,10 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
+        "Ljava/util/List<",
+        "+",
         "Lcom/discord/models/domain/ModelMessageReaction$Update;",
+        ">;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -43,7 +46,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleReactionRemoveAll"
+    const-string v0, "handleReactionRemove"
 
     return-object v0
 .end method
@@ -63,7 +66,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleReactionRemoveAll(Lcom/discord/models/domain/ModelMessageReaction$Update;)V"
+    const-string v0, "handleReactionRemove(Ljava/util/List;)V"
 
     return-object v0
 .end method
@@ -71,17 +74,26 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelMessageReaction$Update;
+    check-cast p1, Ljava/util/List;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$24;->invoke(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$24;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
+.method public final invoke(Ljava/util/List;)V
     .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/ModelMessageReaction$Update;",
+            ">;)V"
+        }
+    .end annotation
 
     const-string v0, "p1"
 
@@ -91,7 +103,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleReactionRemove(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
 
     return-void
 .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 57b7e002ba..87f0a75327 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$25.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$25.smali
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelMessageDelete;",
+        "Lcom/discord/models/domain/ModelMessageReaction$Update;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -43,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleMessageDelete"
+    const-string v0, "handleReactionRemoveAll"
 
     return-object v0
 .end method
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleMessageDelete(Lcom/discord/models/domain/ModelMessageDelete;)V"
+    const-string v0, "handleReactionRemoveAll(Lcom/discord/models/domain/ModelMessageReaction$Update;)V"
 
     return-object v0
 .end method
@@ -71,16 +71,16 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelMessageDelete;
+    check-cast p1, Lcom/discord/models/domain/ModelMessageReaction$Update;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$25;->invoke(Lcom/discord/models/domain/ModelMessageDelete;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$25;->invoke(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelMessageDelete;)V
+.method public final invoke(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
     .locals 1
 
     const-string v0, "p1"
@@ -91,7 +91,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleReactionRemoveAll(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelMessageReaction$Update;)V
 
     return-void
 .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 12e79ac020..a353f95bae 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$26.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$26.smali
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelReadState;",
+        "Lcom/discord/models/domain/ModelMessageDelete;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -43,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleMessageAck"
+    const-string v0, "handleMessageDelete"
 
     return-object v0
 .end method
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleMessageAck(Lcom/discord/models/domain/ModelReadState;)V"
+    const-string v0, "handleMessageDelete(Lcom/discord/models/domain/ModelMessageDelete;)V"
 
     return-object v0
 .end method
@@ -71,16 +71,16 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelReadState;
+    check-cast p1, Lcom/discord/models/domain/ModelMessageDelete;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$26;->invoke(Lcom/discord/models/domain/ModelReadState;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$26;->invoke(Lcom/discord/models/domain/ModelMessageDelete;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelReadState;)V
+.method public final invoke(Lcom/discord/models/domain/ModelMessageDelete;)V
     .locals 1
 
     const-string v0, "p1"
@@ -91,7 +91,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleMessageDelete(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelMessageDelete;)V
 
     return-void
 .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 6c3581671c..72e4b1841d 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$27.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$27.smali
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelVoice$State;",
+        "Lcom/discord/models/domain/ModelReadState;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -43,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleVoiceStateUpdate"
+    const-string v0, "handleMessageAck"
 
     return-object v0
 .end method
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleVoiceStateUpdate(Lcom/discord/models/domain/ModelVoice$State;)V"
+    const-string v0, "handleMessageAck(Lcom/discord/models/domain/ModelReadState;)V"
 
     return-object v0
 .end method
@@ -71,16 +71,16 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelVoice$State;
+    check-cast p1, Lcom/discord/models/domain/ModelReadState;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$27;->invoke(Lcom/discord/models/domain/ModelVoice$State;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$27;->invoke(Lcom/discord/models/domain/ModelReadState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelVoice$State;)V
+.method public final invoke(Lcom/discord/models/domain/ModelReadState;)V
     .locals 1
 
     const-string v0, "p1"
@@ -91,7 +91,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleMessageAck(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelReadState;)V
 
     return-void
 .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 dcadf51009..68e4d25ba8 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$28.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$28.smali
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelVoice$Server;",
+        "Lcom/discord/models/domain/ModelVoice$State;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -43,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleVoiceServerUpdate"
+    const-string v0, "handleVoiceStateUpdate"
 
     return-object v0
 .end method
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleVoiceServerUpdate(Lcom/discord/models/domain/ModelVoice$Server;)V"
+    const-string v0, "handleVoiceStateUpdate(Lcom/discord/models/domain/ModelVoice$State;)V"
 
     return-object v0
 .end method
@@ -71,16 +71,16 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelVoice$Server;
+    check-cast p1, Lcom/discord/models/domain/ModelVoice$State;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$28;->invoke(Lcom/discord/models/domain/ModelVoice$Server;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$28;->invoke(Lcom/discord/models/domain/ModelVoice$State;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelVoice$Server;)V
+.method public final invoke(Lcom/discord/models/domain/ModelVoice$State;)V
     .locals 1
 
     const-string v0, "p1"
@@ -91,7 +91,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleVoiceStateUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelVoice$State;)V
 
     return-void
 .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 8edb361c41..498c20ca20 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$29.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$29.smali
@@ -20,10 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Ljava/util/List<",
-        "+",
-        "Lcom/discord/models/domain/ModelUserGuildSettings;",
-        ">;",
+        "Lcom/discord/models/domain/ModelVoice$Server;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -46,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleGuildSettingUpdated"
+    const-string v0, "handleVoiceServerUpdate"
 
     return-object v0
 .end method
@@ -66,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleGuildSettingUpdated(Ljava/util/List;)V"
+    const-string v0, "handleVoiceServerUpdate(Lcom/discord/models/domain/ModelVoice$Server;)V"
 
     return-object v0
 .end method
@@ -74,26 +71,17 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Ljava/util/List;
+    check-cast p1, Lcom/discord/models/domain/ModelVoice$Server;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$29;->invoke(Ljava/util/List;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$29;->invoke(Lcom/discord/models/domain/ModelVoice$Server;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Ljava/util/List;)V
+.method public final invoke(Lcom/discord/models/domain/ModelVoice$Server;)V
     .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Lcom/discord/models/domain/ModelUserGuildSettings;",
-            ">;)V"
-        }
-    .end annotation
 
     const-string v0, "p1"
 
@@ -103,7 +91,7 @@
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
-    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleGuildSettingUpdated(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleVoiceServerUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelVoice$Server;)V
 
     return-void
 .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 3bfaa75d7a..aaaf9e2176 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$3.smali
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$3;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 429a7b3d39..79f1a7c51c 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$30.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$30.smali
@@ -20,7 +20,10 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelUserSettings;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelUserGuildSettings;",
+        ">;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -43,7 +46,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleUserSettingsUpdate"
+    const-string v0, "handleGuildSettingUpdated"
 
     return-object v0
 .end method
@@ -63,7 +66,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleUserSettingsUpdate(Lcom/discord/models/domain/ModelUserSettings;)V"
+    const-string v0, "handleGuildSettingUpdated(Ljava/util/List;)V"
 
     return-object v0
 .end method
@@ -71,17 +74,26 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelUserSettings;
+    check-cast p1, Ljava/util/List;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$30;->invoke(Lcom/discord/models/domain/ModelUserSettings;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$30;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelUserSettings;)V
+.method public final invoke(Ljava/util/List;)V
     .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/ModelUserGuildSettings;",
+            ">;)V"
+        }
+    .end annotation
 
     const-string v0, "p1"
 
@@ -91,7 +103,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleGuildSettingUpdated(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
 
     return-void
 .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 d232e6a1f0..a670a27b10 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$31.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$31.smali
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelUser$Typing;",
+        "Lcom/discord/models/domain/ModelUserSettings;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -43,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleTypingStart"
+    const-string v0, "handleUserSettingsUpdate"
 
     return-object v0
 .end method
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleTypingStart(Lcom/discord/models/domain/ModelUser$Typing;)V"
+    const-string v0, "handleUserSettingsUpdate(Lcom/discord/models/domain/ModelUserSettings;)V"
 
     return-object v0
 .end method
@@ -71,16 +71,16 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelUser$Typing;
+    check-cast p1, Lcom/discord/models/domain/ModelUserSettings;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$31;->invoke(Lcom/discord/models/domain/ModelUser$Typing;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$31;->invoke(Lcom/discord/models/domain/ModelUserSettings;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelUser$Typing;)V
+.method public final invoke(Lcom/discord/models/domain/ModelUserSettings;)V
     .locals 1
 
     const-string v0, "p1"
@@ -91,7 +91,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleUserSettingsUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelUserSettings;)V
 
     return-void
 .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 172ac1f3b2..56b89ce0b0 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 final Lcom/discord/stores/StoreStream$initGatewaySocketListeners$32;
-.super Lkotlin/jvm/internal/l;
+.class final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$32;
+.super Lkotlin/jvm/internal/j;
 .source "StoreStream.kt"
 
 # interfaces
@@ -12,66 +12,86 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
+    accessFlags = 0x1018
     name = null
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelPresence;",
+        "Lcom/discord/models/domain/ModelUser$Typing;",
         "Lkotlin/Unit;",
         ">;"
     }
 .end annotation
 
 
-# instance fields
-.field final synthetic this$0:Lcom/discord/stores/StoreStream;
-
-
 # direct methods
 .method constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 0
+    .locals 1
 
-    iput-object p1, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$32;->this$0:Lcom/discord/stores/StoreStream;
+    const/4 v0, 0x1
 
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)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}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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 final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelPresence;
+    check-cast p1, Lcom/discord/models/domain/ModelUser$Typing;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$32;->invoke(Lcom/discord/models/domain/ModelPresence;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$32;->invoke(Lcom/discord/models/domain/ModelUser$Typing;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelPresence;)V
-    .locals 3
+.method public final invoke(Lcom/discord/models/domain/ModelUser$Typing;)V
+    .locals 1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$32;->this$0:Lcom/discord/stores/StoreStream;
+    const-string v0, "p1"
 
-    const-string v1, "it"
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$32;->receiver:Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getGuildId()J
+    check-cast v0, Lcom/discord/stores/StoreStream;
 
-    move-result-wide v1
-
-    invoke-static {v0, v1, v2, p1}, Lcom/discord/stores/StoreStream;->access$handlePresenceUpdate(Lcom/discord/stores/StoreStream;JLcom/discord/models/domain/ModelPresence;)V
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleTypingStart(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelUser$Typing;)V
 
     return-void
 .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 f7578b6002..ccae266baf 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 final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$33;
-.super Lkotlin/jvm/internal/j;
+.class final Lcom/discord/stores/StoreStream$initGatewaySocketListeners$33;
+.super Lkotlin/jvm/internal/l;
 .source "StoreStream.kt"
 
 # interfaces
@@ -12,98 +12,66 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1018
+    accessFlags = 0x18
     name = null
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/internal/l;",
         "Lkotlin/jvm/functions/Function1<",
-        "Ljava/util/List<",
-        "+",
         "Lcom/discord/models/domain/ModelPresence;",
-        ">;",
         "Lkotlin/Unit;",
         ">;"
     }
 .end annotation
 
 
+# instance fields
+.field final synthetic this$0:Lcom/discord/stores/StoreStream;
+
+
 # direct methods
 .method constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 0
 
-    const/4 v0, 0x1
+    iput-object p1, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$33;->this$0:Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(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}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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 final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Ljava/util/List;
+    check-cast p1, Lcom/discord/models/domain/ModelPresence;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$33;->invoke(Ljava/util/List;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$33;->invoke(Lcom/discord/models/domain/ModelPresence;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Ljava/util/List;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Lcom/discord/models/domain/ModelPresence;",
-            ">;)V"
-        }
-    .end annotation
+.method public final invoke(Lcom/discord/models/domain/ModelPresence;)V
+    .locals 3
 
-    const-string v0, "p1"
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$33;->this$0:Lcom/discord/stores/StoreStream;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v1, "it"
 
-    iget-object v0, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$33;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Lcom/discord/stores/StoreStream;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getGuildId()J
 
-    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handlePresenceReplace(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
+    move-result-wide v1
+
+    invoke-static {v0, v1, v2, p1}, Lcom/discord/stores/StoreStream;->access$handlePresenceUpdate(Lcom/discord/stores/StoreStream;JLcom/discord/models/domain/ModelPresence;)V
 
     return-void
 .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 0a3e2b605a..7cc422a678 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$34.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$34.smali
@@ -20,7 +20,10 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelChannel$Recipient;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelPresence;",
+        ">;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -43,7 +46,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleGroupDMRecipientAdd"
+    const-string v0, "handlePresenceReplace"
 
     return-object v0
 .end method
@@ -63,7 +66,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleGroupDMRecipientAdd(Lcom/discord/models/domain/ModelChannel$Recipient;)V"
+    const-string v0, "handlePresenceReplace(Ljava/util/List;)V"
 
     return-object v0
 .end method
@@ -71,17 +74,26 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelChannel$Recipient;
+    check-cast p1, Ljava/util/List;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$34;->invoke(Lcom/discord/models/domain/ModelChannel$Recipient;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$34;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelChannel$Recipient;)V
+.method public final invoke(Ljava/util/List;)V
     .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/ModelPresence;",
+            ">;)V"
+        }
+    .end annotation
 
     const-string v0, "p1"
 
@@ -91,7 +103,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handlePresenceReplace(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
 
     return-void
 .end method
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 9b603ecce2..2077dc5721 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$35.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$35.smali
@@ -43,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleGroupDMRecipientRemove"
+    const-string v0, "handleGroupDMRecipientAdd"
 
     return-object v0
 .end method
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleGroupDMRecipientRemove(Lcom/discord/models/domain/ModelChannel$Recipient;)V"
+    const-string v0, "handleGroupDMRecipientAdd(Lcom/discord/models/domain/ModelChannel$Recipient;)V"
 
     return-object v0
 .end method
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$35;->invoke(Lcom/discord/models/domain/ModelChannel$Recipient;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -91,7 +91,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleGroupDMRecipientAdd(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelChannel$Recipient;)V
 
     return-void
 .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 b3b77ad990..4f65daa2f9 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$36.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$36.smali
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelCall;",
+        "Lcom/discord/models/domain/ModelChannel$Recipient;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -43,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleCallDelete"
+    const-string v0, "handleGroupDMRecipientRemove"
 
     return-object v0
 .end method
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleCallDelete(Lcom/discord/models/domain/ModelCall;)V"
+    const-string v0, "handleGroupDMRecipientRemove(Lcom/discord/models/domain/ModelChannel$Recipient;)V"
 
     return-object v0
 .end method
@@ -71,16 +71,16 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelCall;
+    check-cast p1, Lcom/discord/models/domain/ModelChannel$Recipient;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$36;->invoke(Lcom/discord/models/domain/ModelCall;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$36;->invoke(Lcom/discord/models/domain/ModelChannel$Recipient;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelCall;)V
+.method public final invoke(Lcom/discord/models/domain/ModelChannel$Recipient;)V
     .locals 1
 
     const-string v0, "p1"
@@ -91,7 +91,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleGroupDMRecipientRemove(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelChannel$Recipient;)V
 
     return-void
 .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 0937f45a8f..66cf78756a 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$37.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$37.smali
@@ -43,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleCallCreateOrUpdate"
+    const-string v0, "handleCallDelete"
 
     return-object v0
 .end method
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleCallCreateOrUpdate(Lcom/discord/models/domain/ModelCall;)V"
+    const-string v0, "handleCallDelete(Lcom/discord/models/domain/ModelCall;)V"
 
     return-object v0
 .end method
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$37;->invoke(Lcom/discord/models/domain/ModelCall;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -91,7 +91,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleCallDelete(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelCall;)V
 
     return-void
 .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 3040fa1e46..3edc45be59 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$38.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$38.smali
@@ -20,10 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Ljava/util/List<",
-        "+",
-        "Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;",
-        ">;",
+        "Lcom/discord/models/domain/ModelCall;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -46,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleEmojisUpdate"
+    const-string v0, "handleCallCreateOrUpdate"
 
     return-object v0
 .end method
@@ -66,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleEmojisUpdate(Ljava/util/List;)V"
+    const-string v0, "handleCallCreateOrUpdate(Lcom/discord/models/domain/ModelCall;)V"
 
     return-object v0
 .end method
@@ -74,26 +71,17 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Ljava/util/List;
+    check-cast p1, Lcom/discord/models/domain/ModelCall;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$38;->invoke(Ljava/util/List;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$38;->invoke(Lcom/discord/models/domain/ModelCall;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Ljava/util/List;)V
+.method public final invoke(Lcom/discord/models/domain/ModelCall;)V
     .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;",
-            ">;)V"
-        }
-    .end annotation
 
     const-string v0, "p1"
 
@@ -103,7 +91,7 @@
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
-    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleEmojisUpdate(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleCallCreateOrUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelCall;)V
 
     return-void
 .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 ddc8ce8533..bb090778de 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$39.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$39.smali
@@ -20,7 +20,10 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;",
+        ">;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -43,7 +46,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleRequiredActionUpdate"
+    const-string v0, "handleEmojisUpdate"
 
     return-object v0
 .end method
@@ -63,7 +66,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleRequiredActionUpdate(Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;)V"
+    const-string v0, "handleEmojisUpdate(Ljava/util/List;)V"
 
     return-object v0
 .end method
@@ -71,17 +74,26 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;
+    check-cast p1, Ljava/util/List;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$39;->invoke(Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$39;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;)V
+.method public final invoke(Ljava/util/List;)V
     .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;",
+            ">;)V"
+        }
+    .end annotation
 
     const-string v0, "p1"
 
@@ -91,7 +103,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleEmojisUpdate(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
 
     return-void
 .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 70d66b8bb7..695821c645 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$4.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$4;->invoke(Lcom/discord/models/domain/ModelGuild;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 4e21a3c3f3..63d90db4fc 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$40.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$40.smali
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelGuildMemberListUpdate;",
+        "Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -43,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleGuildMemberListUpdate"
+    const-string v0, "handleRequiredActionUpdate"
 
     return-object v0
 .end method
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleGuildMemberListUpdate(Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V"
+    const-string v0, "handleRequiredActionUpdate(Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;)V"
 
     return-object v0
 .end method
@@ -71,16 +71,16 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate;
+    check-cast p1, Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$40;->invoke(Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$40;->invoke(Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V
+.method public final invoke(Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;)V
     .locals 1
 
     const-string v0, "p1"
@@ -91,7 +91,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleRequiredActionUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;)V
 
     return-void
 .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 e22484d26b..a0932a291f 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$41.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$41.smali
@@ -20,10 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Ljava/util/List<",
-        "+",
-        "Lcom/discord/models/domain/ModelSession;",
-        ">;",
+        "Lcom/discord/models/domain/ModelGuildMemberListUpdate;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -46,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleSessionsReplace"
+    const-string v0, "handleGuildMemberListUpdate"
 
     return-object v0
 .end method
@@ -66,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "handleSessionsReplace(Ljava/util/List;)V"
+    const-string v0, "handleGuildMemberListUpdate(Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V"
 
     return-object v0
 .end method
@@ -74,26 +71,17 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Ljava/util/List;
+    check-cast p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$41;->invoke(Ljava/util/List;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$41;->invoke(Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Ljava/util/List;)V
+.method public final invoke(Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V
     .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Lcom/discord/models/domain/ModelSession;",
-            ">;)V"
-        }
-    .end annotation
 
     const-string v0, "p1"
 
@@ -103,7 +91,7 @@
 
     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
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleGuildMemberListUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V
 
     return-void
 .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 26807d3344..f6bb11da3f 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 final Lcom/discord/stores/StoreStream$initGatewaySocketListeners$42;
-.super Lkotlin/jvm/internal/l;
+.class final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$42;
+.super Lkotlin/jvm/internal/j;
 .source "StoreStream.kt"
 
 # interfaces
@@ -12,58 +12,98 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
+    accessFlags = 0x1018
     name = null
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lkotlin/Unit;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelSession;",
+        ">;",
         "Lkotlin/Unit;",
         ">;"
     }
 .end annotation
 
 
-# instance fields
-.field final synthetic this$0:Lcom/discord/stores/StoreStream;
-
-
 # direct methods
 .method constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 0
+    .locals 1
 
-    iput-object p1, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$42;->this$0:Lcom/discord/stores/StoreStream;
+    const/4 v0, 0x1
 
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)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}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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 final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lkotlin/Unit;
+    check-cast p1, Ljava/util/List;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$42;->invoke(Lkotlin/Unit;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$42;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lkotlin/Unit;)V
-    .locals 0
+.method public final invoke(Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/ModelSession;",
+            ">;)V"
+        }
+    .end annotation
 
-    iget-object p1, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$42;->this$0:Lcom/discord/stores/StoreStream;
+    const-string v0, "p1"
 
-    invoke-static {p1}, Lcom/discord/stores/StoreStream;->access$handleUserPaymentSourcesUpdate(Lcom/discord/stores/StoreStream;)V
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$42;->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
 .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 87d802fed7..a4baa185c3 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$43.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$43.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$43;->invoke(Lkotlin/Unit;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -63,7 +63,7 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$43;->this$0:Lcom/discord/stores/StoreStream;
 
-    invoke-static {p1}, Lcom/discord/stores/StoreStream;->access$handleUserSubscriptionsUpdate(Lcom/discord/stores/StoreStream;)V
+    invoke-static {p1}, Lcom/discord/stores/StoreStream;->access$handleUserPaymentSourcesUpdate(Lcom/discord/stores/StoreStream;)V
 
     return-void
 .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
new file mode 100644
index 0000000000..de00b072a0
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$44.smali
@@ -0,0 +1,69 @@
+.class final Lcom/discord/stores/StoreStream$initGatewaySocketListeners$44;
+.super Lkotlin/jvm/internal/l;
+.source "StoreStream.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreStream;->initGatewaySocketListeners()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lkotlin/Unit;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/stores/StoreStream;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/stores/StoreStream;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$44;->this$0:Lcom/discord/stores/StoreStream;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lkotlin/Unit;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$44;->invoke(Lkotlin/Unit;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lkotlin/Unit;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$44;->this$0:Lcom/discord/stores/StoreStream;
+
+    invoke-static {p1}, Lcom/discord/stores/StoreStream;->access$handleUserSubscriptionsUpdate(Lcom/discord/stores/StoreStream;)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
new file mode 100644
index 0000000000..3a6a52daf0
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$45.smali
@@ -0,0 +1,97 @@
+.class final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$45;
+.super Lkotlin/jvm/internal/j;
+.source "StoreStream.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreStream;->initGatewaySocketListeners()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/models/domain/StreamCreate;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/stores/StoreStream;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)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}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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/StreamCreate;)V"
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/StreamCreate;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$45;->invoke(Lcom/discord/models/domain/StreamCreate;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/models/domain/StreamCreate;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$45;->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/StreamCreate;)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
new file mode 100644
index 0000000000..f0cd5bbb0d
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$46.smali
@@ -0,0 +1,97 @@
+.class final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$46;
+.super Lkotlin/jvm/internal/j;
+.source "StoreStream.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreStream;->initGatewaySocketListeners()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/models/domain/StreamUpdate;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/stores/StoreStream;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)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}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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/StreamUpdate;)V"
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/StreamUpdate;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$46;->invoke(Lcom/discord/models/domain/StreamUpdate;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/models/domain/StreamUpdate;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$46;->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/StreamUpdate;)V
+
+    return-void
+.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
new file mode 100644
index 0000000000..7221721eea
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$47.smali
@@ -0,0 +1,97 @@
+.class final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$47;
+.super Lkotlin/jvm/internal/j;
+.source "StoreStream.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreStream;->initGatewaySocketListeners()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/models/domain/StreamDelete;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/stores/StoreStream;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getName()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "handleStreamDelete"
+
+    return-object v0
+.end method
+
+.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
+    .locals 1
+
+    const-class v0, Lcom/discord/stores/StoreStream;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final getSignature()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "handleStreamDelete(Lcom/discord/models/domain/StreamDelete;)V"
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/StreamDelete;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$47;->invoke(Lcom/discord/models/domain/StreamDelete;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/models/domain/StreamDelete;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$47;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/stores/StoreStream;
+
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleStreamDelete(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/StreamDelete;)V
+
+    return-void
+.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
new file mode 100644
index 0000000000..cc7a24b411
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$48.smali
@@ -0,0 +1,97 @@
+.class final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$48;
+.super Lkotlin/jvm/internal/j;
+.source "StoreStream.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreStream;->initGatewaySocketListeners()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/models/domain/StreamServerUpdate;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/stores/StoreStream;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)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}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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 final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/StreamServerUpdate;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$48;->invoke(Lcom/discord/models/domain/StreamServerUpdate;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/models/domain/StreamServerUpdate;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$48;->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
+.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 b327e48f21..31dbba4c38 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$5.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$5;->invoke(Lcom/discord/models/domain/ModelGuildRole$Payload;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 413be13ee5..6aed88bd49 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$6.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$6.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$6;->invoke(Lcom/discord/models/domain/ModelGuild;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 4aefa85b6c..8d29c8ee4e 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$7.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$7.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$7;->invoke(Lcom/discord/models/domain/ModelGuildRole$Payload;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 e7ba7c45eb..2d0671809d 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$8.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$8.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$8;->invoke(Lcom/discord/models/domain/ModelBan;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 8e0a533af5..d867344481 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$9.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$9.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$9;->invoke(Lcom/discord/models/domain/ModelBan;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream.smali b/com.discord/smali/com/discord/stores/StoreStream.smali
index 65c97beffd..32a8ae63e6 100644
--- a/com.discord/smali/com/discord/stores/StoreStream.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream.smali
@@ -186,6 +186,8 @@
 
 .field private final storeDynamicLink:Lcom/discord/stores/StoreDynamicLink;
 
+.field private final streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
 .field private final subscriptions:Lcom/discord/stores/StoreSubscriptions;
 
 .field private final userConnections:Lcom/discord/stores/StoreUserConnections;
@@ -639,16 +641,6 @@
 
     iput-object v0, p0, Lcom/discord/stores/StoreStream;->mediaEngine:Lcom/discord/stores/StoreMediaEngine;
 
-    new-instance v0, Lcom/discord/stores/StoreAudioManager;
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
-
-    iget-object v2, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
-
-    invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreAudioManager;-><init>(Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreRtcConnection;)V
-
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->audioManager:Lcom/discord/stores/StoreAudioManager;
-
     new-instance v0, Lcom/discord/stores/StoreMediaNotification;
 
     iget-object v1, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
@@ -817,10 +809,30 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
-    invoke-direct {v0, v1}, Lcom/discord/stores/StoreApplicationStreaming;-><init>(Lcom/discord/stores/StoreUser;)V
+    iget-object v2, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
+
+    invoke-direct {v0, v1, v2, p0}, Lcom/discord/stores/StoreApplicationStreaming;-><init>(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreStream;)V
 
     iput-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
 
+    new-instance v0, Lcom/discord/stores/StoreStreamRtcConnection;
+
+    invoke-direct {v0, p0}, Lcom/discord/stores/StoreStreamRtcConnection;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    iput-object v0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
+    new-instance v0, Lcom/discord/stores/StoreAudioManager;
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
+
+    iget-object v3, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
+    invoke-direct {v0, v1, v2, v3}, Lcom/discord/stores/StoreAudioManager;-><init>(Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreRtcConnection;Lcom/discord/stores/StoreStreamRtcConnection;)V
+
+    iput-object v0, p0, Lcom/discord/stores/StoreStream;->audioManager:Lcom/discord/stores/StoreAudioManager;
+
     new-instance v0, Lcom/discord/stores/StoreApplicationStreamPreviews;
 
     invoke-direct {v0, p0}, Lcom/discord/stores/StoreApplicationStreamPreviews;-><init>(Lcom/discord/stores/StoreStream;)V
@@ -864,6 +876,38 @@
     return-void
 .end method
 
+.method public static final synthetic access$deferredInit(Lcom/discord/stores/StoreStream;Landroid/app/Application;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreStream;->deferredInit(Landroid/app/Application;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;JLkotlin/jvm/functions/Function1;)V
+    .locals 0
+
+    invoke-direct/range {p0 .. p5}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;JLkotlin/jvm/functions/Function1;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$dispatchSubscribe(Lcom/discord/stores/StoreStream;Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+    .locals 0
+
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$getAudioManager$p(Lcom/discord/stores/StoreStream;)Lcom/discord/stores/StoreAudioManager;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/stores/StoreStream;->audioManager:Lcom/discord/stores/StoreAudioManager;
+
+    return-object p0
+.end method
+
 .method public static final synthetic access$getCollector$cp()Lcom/discord/stores/StoreStream;
     .locals 1
 
@@ -880,6 +924,14 @@
     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$handleAuthToken(Lcom/discord/stores/StoreStream;Ljava/lang/String;)V
     .locals 0
 
@@ -952,6 +1004,14 @@
     return-void
 .end method
 
+.method public static final synthetic access$handleChannelUnreadUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreStream;->handleChannelUnreadUpdate(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
+
+    return-void
+.end method
+
 .method public static final synthetic access$handleConnected(Lcom/discord/stores/StoreStream;Z)V
     .locals 0
 
@@ -1224,6 +1284,38 @@
     return-void
 .end method
 
+.method public static final synthetic access$handleStreamCreate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/StreamCreate;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreStream;->handleStreamCreate(Lcom/discord/models/domain/StreamCreate;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$handleStreamDelete(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/StreamDelete;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreStream;->handleStreamDelete(Lcom/discord/models/domain/StreamDelete;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$handleStreamServerUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/StreamServerUpdate;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreStream;->handleStreamServerUpdate(Lcom/discord/models/domain/StreamServerUpdate;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$handleStreamUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/StreamUpdate;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreStream;->handleStreamUpdate(Lcom/discord/models/domain/StreamUpdate;)V
+
+    return-void
+.end method
+
 .method public static final synthetic access$handleTypingStart(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelUser$Typing;)V
     .locals 0
 
@@ -1296,6 +1388,22 @@
     return-void
 .end method
 
+.method public static final synthetic access$init(Lcom/discord/stores/StoreStream;Landroid/app/Application;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreStream;->init(Landroid/app/Application;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$initGatewaySocketListeners(Lcom/discord/stores/StoreStream;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/stores/StoreStream;->initGatewaySocketListeners()V
+
+    return-void
+.end method
+
 .method public static final synthetic access$isInitialized$cp()Z
     .locals 1
 
@@ -1331,7 +1439,7 @@
         }
     .end annotation
 
-    const/16 v0, 0x23
+    const/16 v0, 0x24
 
     new-array v0, v0, [Lcom/discord/stores/DispatchHandler;
 
@@ -1615,13 +1723,35 @@
 
     aput-object v1, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/m;->n([Ljava/lang/Object;)Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
+    check-cast v1, Lcom/discord/stores/DispatchHandler;
+
+    const/16 v2, 0x23
+
+    aput-object v1, v0, v2
+
+    invoke-static {v0}, Lkotlin/a/m;->m([Ljava/lang/Object;)Ljava/util/ArrayList;
 
     move-result-object v0
 
     return-object v0
 .end method
 
+.method private final deferredInit(Landroid/app/Application;)V
+    .locals 1
+
+    new-instance v0, Lcom/discord/stores/StoreStream$deferredInit$1;
+
+    invoke-direct {v0, p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1;-><init>(Lcom/discord/stores/StoreStream;Landroid/app/Application;)V
+
+    check-cast v0, Lkotlin/jvm/functions/Function0;
+
+    invoke-virtual {p0, v0}, Lcom/discord/stores/StoreStream;->schedule(Lkotlin/jvm/functions/Function0;)V
+
+    return-void
+.end method
+
 .method private final dispatchSubscribe(Lrx/Observable;Ljava/lang/String;JILkotlin/jvm/functions/Function1;)V
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
@@ -1642,7 +1772,7 @@
         }
     .end annotation
 
-    invoke-virtual {p1}, Lrx/Observable;->Kc()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JQ()Lrx/Observable;
 
     move-result-object p1
 
@@ -1735,7 +1865,7 @@
         }
     .end annotation
 
-    invoke-virtual {p1}, Lrx/Observable;->Kc()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JQ()Lrx/Observable;
 
     move-result-object p1
 
@@ -2664,6 +2794,18 @@
     return-object v0
 .end method
 
+.method public static final getVideoStreams()Lcom/discord/stores/StoreVideoStreams;
+    .locals 1
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getVideoStreams()Lcom/discord/stores/StoreVideoStreams;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public static final getVideoSupport()Lcom/discord/stores/StoreVideoSupport;
     .locals 1
 
@@ -2916,6 +3058,18 @@
     return-void
 .end method
 
+.method private final handleChannelUnreadUpdate(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
+    .locals 1
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->messagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent;
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMessagesMostRecent;->handleChannelUnreadUpdate(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
+
+    return-void
+.end method
+
 .method private final handleConnected(Z)V
     .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
@@ -3101,13 +3255,17 @@
 
     invoke-virtual {v1, p1}, Lcom/discord/stores/StoreChangeLog;->handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
 
+    iget-object v1, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
+    invoke-virtual {v1, p1}, Lcom/discord/stores/StoreStreamRtcConnection;->handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
+
     new-instance p1, Ljava/lang/StringBuilder;
 
     const-string v1, "Processed ready payload in "
 
     invoke-direct {p1, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lcom/discord/app/AppLog$Elapsed;->dt()F
+    invoke-virtual {v0}, Lcom/discord/app/AppLog$Elapsed;->ds()F
 
     move-result v0
 
@@ -4102,6 +4260,10 @@
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->handlePreLogout()V
 
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->notifications:Lcom/discord/stores/StoreNotifications;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreNotifications;->handlePreLogout()V
+
     return-void
 .end method
 
@@ -4383,6 +4545,104 @@
     return-void
 .end method
 
+.method private final handleStreamCreate(Lcom/discord/models/domain/StreamCreate;)V
+    .locals 2
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "handle stream create: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "findme"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStreamRtcConnection;->handleStreamCreate(Lcom/discord/models/domain/StreamCreate;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreApplicationStreaming;->handleStreamCreate(Lcom/discord/models/domain/StreamCreate;)V
+
+    return-void
+.end method
+
+.method private final handleStreamDelete(Lcom/discord/models/domain/StreamDelete;)V
+    .locals 2
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "handle stream delete: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "findme"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStreamRtcConnection;->handleStreamDelete(Lcom/discord/models/domain/StreamDelete;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreApplicationStreaming;->handleStreamDelete(Lcom/discord/models/domain/StreamDelete;)V
+
+    return-void
+.end method
+
+.method private final handleStreamServerUpdate(Lcom/discord/models/domain/StreamServerUpdate;)V
+    .locals 1
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStreamRtcConnection;->handleStreamServerUpdate(Lcom/discord/models/domain/StreamServerUpdate;)V
+
+    return-void
+.end method
+
+.method private final handleStreamUpdate(Lcom/discord/models/domain/StreamUpdate;)V
+    .locals 2
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "handle stream update: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "findme"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreApplicationStreaming;->handleStreamUpdate(Lcom/discord/models/domain/StreamUpdate;)V
+
+    return-void
+.end method
+
 .method private final handleTypingStart(Lcom/discord/models/domain/ModelUser$Typing;)V
     .locals 3
     .annotation runtime Lcom/discord/stores/StoreThread;
@@ -4502,6 +4762,10 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreRtcConnection;->handleVoiceChannelSelected(Ljava/lang/Long;)V
 
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming;->handleVoiceChannelSelected(J)V
+
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->voiceSpeaking:Lcom/discord/stores/StoreVoiceSpeaking;
 
     invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreVoiceSpeaking;->handleVoiceChannelSelected(J)V
@@ -4591,6 +4855,26 @@
     return-void
 .end method
 
+.method private final init(Landroid/app/Application;)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
+
+    check-cast p1, Landroid/content/Context;
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreAuthentication;->init(Landroid/content/Context;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->userSettings:Lcom/discord/stores/StoreUserSettings;
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUserSettings;->init(Landroid/content/Context;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->emojis:Lcom/discord/stores/StoreEmoji;
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreEmoji;->initBlocking(Landroid/content/Context;)V
+
+    return-void
+.end method
+
 .method private final initGatewaySocketListeners()V
     .locals 9
     .annotation runtime Lcom/discord/stores/StoreThread;
@@ -4880,11 +5164,29 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
 
+    invoke-virtual {v0}, Lcom/discord/stores/StoreGatewayConnection;->getChannelUnreadUpdate()Lrx/subjects/SerializedSubject;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Observable;
+
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$16;
+
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$16;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v1, Lkotlin/jvm/functions/Function1;
+
+    const-string v3, "streamChannelUnreadUpdate"
+
+    invoke-direct {p0, v0, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
+
     invoke-virtual {v0}, Lcom/discord/stores/StoreGatewayConnection;->getUserUpdate()Lrx/subjects/SerializedSubject;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->JO()Lrx/Observable;
 
     move-result-object v4
 
@@ -4892,9 +5194,9 @@
 
     invoke-static {v4, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$16;
+    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$17;
 
-    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$16;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$17;-><init>(Lcom/discord/stores/StoreStream;)V
 
     move-object v8, v0
 
@@ -4916,9 +5218,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$17;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$18;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$17;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$18;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -4934,9 +5236,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$18;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$19;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$18;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$19;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -4952,9 +5254,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$19;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$20;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$19;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$20;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -4972,9 +5274,9 @@
 
     check-cast v4, Lrx/Observable;
 
-    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$20;
+    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$21;
 
-    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$20;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$21;-><init>(Lcom/discord/stores/StoreStream;)V
 
     move-object v8, v0
 
@@ -4998,9 +5300,9 @@
 
     check-cast v4, Lrx/Observable;
 
-    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$21;
+    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$22;
 
-    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$21;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$22;-><init>(Lcom/discord/stores/StoreStream;)V
 
     move-object v8, v0
 
@@ -5022,9 +5324,9 @@
 
     check-cast v4, Lrx/Observable;
 
-    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$22;
+    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$23;
 
-    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$22;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$23;-><init>(Lcom/discord/stores/StoreStream;)V
 
     move-object v8, v0
 
@@ -5046,9 +5348,9 @@
 
     check-cast v4, Lrx/Observable;
 
-    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$23;
+    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$24;
 
-    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$23;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$24;-><init>(Lcom/discord/stores/StoreStream;)V
 
     move-object v8, v0
 
@@ -5066,9 +5368,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$24;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$25;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$24;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$25;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5084,9 +5386,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$25;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$26;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$25;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$26;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5102,9 +5404,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$26;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$27;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$26;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$27;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5120,9 +5422,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$27;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$28;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$27;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$28;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5138,9 +5440,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$28;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$29;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$28;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$29;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5158,9 +5460,9 @@
 
     check-cast v4, Lrx/Observable;
 
-    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$29;
+    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$30;
 
-    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$29;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$30;-><init>(Lcom/discord/stores/StoreStream;)V
 
     move-object v8, v0
 
@@ -5180,9 +5482,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$30;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$31;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$30;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$31;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5198,9 +5500,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$31;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$32;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$31;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$32;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5216,9 +5518,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$32;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$33;
 
-    invoke-direct {v1, p0}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$32;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, p0}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$33;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5234,9 +5536,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$33;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$34;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$33;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$34;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5252,9 +5554,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$34;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$35;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$34;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$35;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5270,9 +5572,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$35;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$36;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$35;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$36;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5288,9 +5590,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$36;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$37;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$36;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$37;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5306,9 +5608,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$37;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$38;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$37;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$38;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5326,9 +5628,9 @@
 
     check-cast v4, Lrx/Observable;
 
-    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$38;
+    new-instance v0, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$39;
 
-    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$38;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$39;-><init>(Lcom/discord/stores/StoreStream;)V
 
     move-object v8, v0
 
@@ -5348,9 +5650,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$39;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$40;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$39;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$40;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5366,9 +5668,9 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$40;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$41;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$40;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$41;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -5384,15 +5686,15 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$41;
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$42;
 
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$41;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$42;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const-string v2, "streamSessionsReplace"
+    const-string v3, "streamSessionsReplace"
 
-    invoke-direct {p0, v0, v2, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {p0, v0, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
 
@@ -5402,31 +5704,103 @@
 
     check-cast v0, Lrx/Observable;
 
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$42;
-
-    invoke-direct {v1, p0}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$42;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v2, "streamUserPaymentSourcesUpdate"
-
-    invoke-direct {p0, v0, v2, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreGatewayConnection;->getUserSubscriptionsUpdate()Lrx/subjects/SerializedSubject;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/Observable;
-
     new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$43;
 
     invoke-direct {v1, p0}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$43;-><init>(Lcom/discord/stores/StoreStream;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const-string v2, "streamUserSubscriptionsUpdate"
+    const-string v3, "streamUserPaymentSourcesUpdate"
+
+    invoke-direct {p0, v0, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreGatewayConnection;->getUserSubscriptionsUpdate()Lrx/subjects/SerializedSubject;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Observable;
+
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$44;
+
+    invoke-direct {v1, p0}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$44;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v1, Lkotlin/jvm/functions/Function1;
+
+    const-string v3, "streamUserSubscriptionsUpdate"
+
+    invoke-direct {p0, v0, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreGatewayConnection;->getStreamCreate()Lrx/subjects/SerializedSubject;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Observable;
+
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$45;
+
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$45;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v1, Lkotlin/jvm/functions/Function1;
+
+    const-string v3, "streamStreamCreate"
+
+    invoke-direct {p0, v0, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreGatewayConnection;->getStreamUpdate()Lrx/subjects/SerializedSubject;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Observable;
+
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$46;
+
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$46;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v1, Lkotlin/jvm/functions/Function1;
+
+    const-string v3, "streamStreamUpdate"
+
+    invoke-direct {p0, v0, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreGatewayConnection;->getStreamDelete()Lrx/subjects/SerializedSubject;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Observable;
+
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$47;
+
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$47;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v1, Lkotlin/jvm/functions/Function1;
+
+    const-string v3, "streamStreamDelete"
+
+    invoke-direct {p0, v0, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreGatewayConnection;->getStreamServerUpdate()Lrx/subjects/SerializedSubject;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Observable;
+
+    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$48;
+
+    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$48;-><init>(Lcom/discord/stores/StoreStream;)V
+
+    check-cast v1, Lkotlin/jvm/functions/Function1;
+
+    const-string v2, "streamStreamServerUpdate"
 
     invoke-direct {p0, v0, v2, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 
@@ -6171,6 +6545,14 @@
     return-object v0
 .end method
 
+.method public final getStreamRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreStreamRtcConnection;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
+    return-object v0
+.end method
+
 .method public final getSubscriptions$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreSubscriptions;
     .locals 1
 
@@ -6390,452 +6772,6 @@
     return-void
 .end method
 
-.method public final init(Landroid/app/Application;)V
-    .locals 10
-    .annotation runtime Lcom/discord/stores/StoreThread;
-    .end annotation
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/app/AppLog$Elapsed;
-
-    invoke-direct {v0}, Lcom/discord/app/AppLog$Elapsed;-><init>()V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->mediaEngine:Lcom/discord/stores/StoreMediaEngine;
-
-    move-object v2, p1
-
-    check-cast v2, Landroid/content/Context;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMediaEngine;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->experiments:Lcom/discord/stores/StoreExperiments;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreExperiments;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreGatewayConnection;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreUser;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->navigation:Lcom/discord/stores/StoreNavigation;
-
-    invoke-virtual {v1, p1}, Lcom/discord/stores/StoreNavigation;->init(Landroid/app/Application;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->nux:Lcom/discord/stores/StoreNux;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreNux;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreChannels;->init$app_productionDiscordExternalRelease()V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreGuilds;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->guildsSorted:Lcom/discord/stores/StoreGuildsSorted;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreGuildsSorted;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->guildsNsfw:Lcom/discord/stores/StoreGuildsNsfw;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreGuildsNsfw;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreAuthentication;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->guildSelected:Lcom/discord/stores/StoreGuildSelected;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreGuildSelected;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->channelsSelected:Lcom/discord/stores/StoreChannelsSelected;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreChannelsSelected;->init()V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->messages:Lcom/discord/stores/StoreMessages;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMessages;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->messagesLoader:Lcom/discord/stores/StoreMessagesLoader;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMessagesLoader;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->messageAck:Lcom/discord/stores/StoreMessageAck;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMessageAck;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->messagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMessagesMostRecent;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->mentions:Lcom/discord/stores/StoreMentions;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMentions;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->notifications:Lcom/discord/stores/StoreNotifications;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreNotifications;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->videoSupport:Lcom/discord/stores/StoreVideoSupport;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreVideoSupport;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreRtcConnection;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->readStates:Lcom/discord/stores/StoreReadStates;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreReadStates;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreVoiceChannelSelected;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->voiceSpeaking:Lcom/discord/stores/StoreVoiceSpeaking;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreVoiceSpeaking;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->voiceParticipants:Lcom/discord/stores/StoreVoiceParticipants;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreVoiceParticipants;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->connectivity:Lcom/discord/stores/StoreConnectivity;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreConnectivity;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->clientVersion:Lcom/discord/stores/StoreClientVersion;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreClientVersion;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMediaSettings;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreAnalytics;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->storeChannelCategories:Lcom/discord/stores/StoreChannelCategories;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreChannelCategories;->init()V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->audioManager:Lcom/discord/stores/StoreAudioManager;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreAudioManager;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->mediaNotification:Lcom/discord/stores/StoreMediaNotification;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMediaNotification;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreUserGuildSettings;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->notices:Lcom/discord/stores/StoreNotices;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreNotices;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->userConnections:Lcom/discord/stores/StoreUserConnections;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreUserConnections;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->changeLogStore:Lcom/discord/stores/StoreChangeLog;
-
-    invoke-virtual {v1, p1}, Lcom/discord/stores/StoreChangeLog;->init(Landroid/app/Application;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->reviewRequestStore:Lcom/discord/stores/StoreReviewRequest;
-
-    invoke-virtual {p1, v2}, Lcom/discord/stores/StoreReviewRequest;->init(Landroid/content/Context;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence;
-
-    invoke-virtual {p1, v2}, Lcom/discord/stores/StoreUserPresence;->init(Landroid/content/Context;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->spotify:Lcom/discord/stores/StoreSpotify;
-
-    invoke-virtual {p1, v2}, Lcom/discord/stores/StoreSpotify;->init(Landroid/content/Context;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->guildsSorted:Lcom/discord/stores/StoreGuildsSorted;
-
-    invoke-virtual {p1, v2}, Lcom/discord/stores/StoreGuildsSorted;->init(Landroid/content/Context;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->expandedGuildFolders:Lcom/discord/stores/StoreExpandedGuildFolders;
-
-    invoke-virtual {p1, v2}, Lcom/discord/stores/StoreExpandedGuildFolders;->init(Landroid/content/Context;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreAuthentication;->getPreLogoutSignal$app_productionDiscordExternalRelease()Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/stores/StoreStream$init$1;
-
-    invoke-direct {v1, p0}, Lcom/discord/stores/StoreStream$init$1;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v3, "streamPreLogout"
-
-    invoke-direct {p0, p1, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreAuthentication;->getAuthedToken$app_productionDiscordExternalRelease()Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/stores/StoreStream$init$2;
-
-    move-object v3, p0
-
-    check-cast v3, Lcom/discord/stores/StoreStream;
-
-    invoke-direct {v1, v3}, Lcom/discord/stores/StoreStream$init$2;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v4, "streamAuthedToken"
-
-    invoke-direct {p0, p1, v4, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreAuthentication;->getFingerPrint$app_productionDiscordExternalRelease()Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/stores/StoreStream$init$3;
-
-    invoke-direct {v1, v3}, Lcom/discord/stores/StoreStream$init$3;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v4, "streamAuthedFingerprint"
-
-    invoke-direct {p0, p1, v4, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->messagesLoader:Lcom/discord/stores/StoreMessagesLoader;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMessagesLoader;->get()Lrx/Observable;
-
-    move-result-object v5
-
-    new-instance p1, Lcom/discord/stores/StoreStream$init$4;
-
-    invoke-direct {p1, v3}, Lcom/discord/stores/StoreStream$init$4;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    move-object v9, p1
-
-    check-cast v9, Lkotlin/jvm/functions/Function1;
-
-    const-string v6, "streamMessagesLoaded"
-
-    const-wide/16 v7, 0xfa
-
-    move-object v4, p0
-
-    invoke-direct/range {v4 .. v9}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;JLkotlin/jvm/functions/Function1;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->channelsSelected:Lcom/discord/stores/StoreChannelsSelected;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreChannelsSelected;->getId()Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/stores/StoreStream$init$5;
-
-    invoke-direct {v1, v3}, Lcom/discord/stores/StoreStream$init$5;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v4, "streamChannelSelected"
-
-    invoke-direct {p0, p1, v4, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceChannelSelected;->getId()Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/stores/StoreStream$init$6;
-
-    invoke-direct {v1, v3}, Lcom/discord/stores/StoreStream$init$6;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v4, "streamVoiceChannelSelected"
-
-    invoke-direct {p0, p1, v4, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->voiceSpeaking:Lcom/discord/stores/StoreVoiceSpeaking;
-
-    iget-object p1, p1, Lcom/discord/stores/StoreVoiceSpeaking;->speakingUsersPublisher:Lrx/subjects/Subject;
-
-    const-string v1, "voiceSpeaking\n        .speakingUsersPublisher"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lrx/Observable;
-
-    new-instance v1, Lcom/discord/stores/StoreStream$init$7;
-
-    invoke-direct {v1, v3}, Lcom/discord/stores/StoreStream$init$7;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v4, "streamUserSpeaking"
-
-    invoke-direct {p0, p1, v4, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->mediaEngine:Lcom/discord/stores/StoreMediaEngine;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaEngine;->getSelectedVideoInputDevice()Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/stores/StoreStream$init$8;
-
-    invoke-direct {v1, v3}, Lcom/discord/stores/StoreStream$init$8;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v4, "streamVideoInputDeviceSelected"
-
-    invoke-direct {p0, p1, v4, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreRtcConnection;->getConnectionState()Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/stores/StoreStream$init$9;
-
-    invoke-direct {v1, v3}, Lcom/discord/stores/StoreStream$init$9;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v4, "streamRtcConnectionStateChanged"
-
-    invoke-direct {p0, p1, v4, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->guildSelected:Lcom/discord/stores/StoreGuildSelected;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreGuildSelected;->getId()Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/stores/StoreStream$init$10;
-
-    invoke-direct {v1, v3}, Lcom/discord/stores/StoreStream$init$10;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v4, "streamGuildSelected"
-
-    invoke-direct {p0, p1, v4, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    invoke-direct {p0}, Lcom/discord/stores/StoreStream;->initGatewaySocketListeners()V
-
-    invoke-static {}, Lcom/miguelgaeta/backgrounded/Backgrounded;->get()Lrx/Observable;
-
-    move-result-object p1
-
-    const-string v1, "Backgrounded\n        .get()"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v1, Lcom/discord/stores/StoreStream$init$11;
-
-    invoke-direct {v1, v3}, Lcom/discord/stores/StoreStream$init$11;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v3, "streamBackgrounded"
-
-    invoke-direct {p0, p1, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreStream;->experiments:Lcom/discord/stores/StoreExperiments;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments;->isInitialized()Lrx/Observable;
-
-    move-result-object p1
-
-    sget-object v1, Lcom/discord/utilities/persister/Persister;->Companion:Lcom/discord/utilities/persister/Persister$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/utilities/persister/Persister$Companion;->isPreloaded()Lrx/Observable;
-
-    move-result-object v1
-
-    sget-object v3, Lcom/discord/stores/StoreStream$init$12;->INSTANCE:Lcom/discord/stores/StoreStream$init$12;
-
-    check-cast v3, Lrx/functions/Func2;
-
-    invoke-static {p1, v1, v3}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
-
-    move-result-object p1
-
-    const-string v1, "Observable\n        .comb\u2026ed && cachesInitialized }"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v1, Lcom/discord/stores/StoreStream$init$13;
-
-    iget-object v3, p0, Lcom/discord/stores/StoreStream;->initialized:Lrx/subjects/BehaviorSubject;
-
-    invoke-direct {v1, v3}, Lcom/discord/stores/StoreStream$init$13;-><init>(Lrx/subjects/BehaviorSubject;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v3, "streamInit"
-
-    invoke-direct {p0, p1, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    new-instance p1, Ljava/lang/StringBuilder;
-
-    const-string v1, "Application stores initialized in: "
-
-    invoke-direct {p1, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v0}, Lcom/discord/app/AppLog$Elapsed;->dt()F
-
-    move-result v0
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder;
-
-    const-string v0, " seconds."
-
-    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-static {p1}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
-
-    sget-object p1, Lcom/discord/utilities/games/GameDetectionService;->Companion:Lcom/discord/utilities/games/GameDetectionService$Companion;
-
-    invoke-virtual {p1, v2}, Lcom/discord/utilities/games/GameDetectionService$Companion;->startIfEnabled(Landroid/content/Context;)V
-
-    invoke-static {v2}, Lcom/discord/utilities/games/GameDetectionHelper;->appHasUsagePermission(Landroid/content/Context;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->appLaunchWithGameDetection(Z)V
-
-    return-void
-.end method
-
 .method public final schedule(Lkotlin/jvm/functions/Function0;)V
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
@@ -6853,7 +6789,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
@@ -6867,3 +6803,39 @@
 
     return-void
 .end method
+
+.method public final streamDelete(Ljava/lang/String;)V
+    .locals 1
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreGatewayConnection;->streamDelete(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
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreApplicationStreaming;->handleStreamWatch(Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreGatewayConnection;->streamWatch(Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Actions$videoUpdate$1.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Actions$videoUpdate$1.smali
new file mode 100644
index 0000000000..2f78a1d4ab
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Actions$videoUpdate$1.smali
@@ -0,0 +1,78 @@
+.class final Lcom/discord/stores/StoreStreamRtcConnection$Actions$videoUpdate$1;
+.super Lkotlin/jvm/internal/l;
+.source "StoreStreamRtcConnection.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreStreamRtcConnection$Actions;->videoUpdate(JLjava/lang/Integer;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $streamId:Ljava/lang/Integer;
+
+.field final synthetic $userId:J
+
+
+# direct methods
+.method constructor <init>(JLjava/lang/Integer;)V
+    .locals 0
+
+    iput-wide p1, p0, Lcom/discord/stores/StoreStreamRtcConnection$Actions$videoUpdate$1;->$userId:J
+
+    iput-object p3, p0, Lcom/discord/stores/StoreStreamRtcConnection$Actions$videoUpdate$1;->$streamId:Ljava/lang/Integer;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/stores/StoreStreamRtcConnection$Actions$videoUpdate$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 4
+
+    sget-object v0, Lcom/discord/stores/StoreStreamRtcConnection$Actions;->INSTANCE:Lcom/discord/stores/StoreStreamRtcConnection$Actions;
+
+    invoke-static {v0}, Lcom/discord/stores/StoreStreamRtcConnection$Actions;->access$getStoreStream$p(Lcom/discord/stores/StoreStreamRtcConnection$Actions;)Lcom/discord/stores/StoreStream;
+
+    move-result-object v0
+
+    iget-wide v1, p0, Lcom/discord/stores/StoreStreamRtcConnection$Actions$videoUpdate$1;->$userId:J
+
+    iget-object v3, p0, Lcom/discord/stores/StoreStreamRtcConnection$Actions$videoUpdate$1;->$streamId:Ljava/lang/Integer;
+
+    invoke-virtual {v0, v1, v2, v3}, Lcom/discord/stores/StoreStream;->handleVideoStreamUpdate(JLjava/lang/Integer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Actions.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Actions.smali
new file mode 100644
index 0000000000..1391020f5d
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Actions.smali
@@ -0,0 +1,102 @@
+.class public final Lcom/discord/stores/StoreStreamRtcConnection$Actions;
+.super Ljava/lang/Object;
+.source "StoreStreamRtcConnection.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/stores/StoreStreamRtcConnection;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Actions"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreStreamRtcConnection$Actions;
+
+.field private static storeStream:Lcom/discord/stores/StoreStream;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/stores/StoreStreamRtcConnection$Actions;
+
+    invoke-direct {v0}, Lcom/discord/stores/StoreStreamRtcConnection$Actions;-><init>()V
+
+    sput-object v0, Lcom/discord/stores/StoreStreamRtcConnection$Actions;->INSTANCE:Lcom/discord/stores/StoreStreamRtcConnection$Actions;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$getStoreStream$p(Lcom/discord/stores/StoreStreamRtcConnection$Actions;)Lcom/discord/stores/StoreStream;
+    .locals 1
+
+    sget-object p0, Lcom/discord/stores/StoreStreamRtcConnection$Actions;->storeStream:Lcom/discord/stores/StoreStream;
+
+    if-nez p0, :cond_0
+
+    const-string v0, "storeStream"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static final synthetic access$setStoreStream$p(Lcom/discord/stores/StoreStreamRtcConnection$Actions;Lcom/discord/stores/StoreStream;)V
+    .locals 0
+
+    sput-object p1, Lcom/discord/stores/StoreStreamRtcConnection$Actions;->storeStream:Lcom/discord/stores/StoreStream;
+
+    return-void
+.end method
+
+.method public static final videoUpdate(JLjava/lang/Integer;)V
+    .locals 2
+
+    sget-object v0, Lcom/discord/stores/StoreStreamRtcConnection$Actions;->storeStream:Lcom/discord/stores/StoreStream;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "storeStream"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    new-instance v1, Lcom/discord/stores/StoreStreamRtcConnection$Actions$videoUpdate$1;
+
+    invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreStreamRtcConnection$Actions$videoUpdate$1;-><init>(JLjava/lang/Integer;)V
+
+    check-cast v1, Lkotlin/jvm/functions/Function0;
+
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream;->schedule(Lkotlin/jvm/functions/Function0;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final init(Lcom/discord/stores/StoreStream;)V
+    .locals 1
+
+    const-string v0, "storeStream"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sput-object p1, Lcom/discord/stores/StoreStreamRtcConnection$Actions;->storeStream:Lcom/discord/stores/StoreStream;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem$Companion.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Companion.smali
similarity index 58%
rename from com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem$Companion.smali
rename to com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Companion.smali
index b7f7e573ac..3302123d9d 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem$Companion;
+.class public final Lcom/discord/stores/StoreStreamRtcConnection$Companion;
 .super Ljava/lang/Object;
-.source "BoostPerkViewAdapter.kt"
+.source "StoreStreamRtcConnection.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
+    value = Lcom/discord/stores/StoreStreamRtcConnection;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/stores/StoreStreamRtcConnection$Companion;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali
new file mode 100644
index 0000000000..939f519f3f
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali
@@ -0,0 +1,683 @@
+.class public final Lcom/discord/stores/StoreStreamRtcConnection;
+.super Ljava/lang/Object;
+.source "StoreStreamRtcConnection.kt"
+
+# interfaces
+.implements Lcom/discord/rtcconnection/RtcConnection$b;
+.implements Lcom/discord/stores/DispatchHandler;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/stores/StoreStreamRtcConnection$Actions;,
+        Lcom/discord/stores/StoreStreamRtcConnection$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/stores/StoreStreamRtcConnection$Companion;
+
+.field private static final STREAM_VOLUME:I = 0x12c
+
+
+# instance fields
+.field private context:Landroid/content/Context;
+
+.field private isDirty:Z
+
+.field private rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+.field private rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+.field private final rtcConnectionStateSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Lcom/discord/rtcconnection/RtcConnection$State;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private sessionId:Ljava/lang/String;
+
+.field private final storeStream:Lcom/discord/stores/StoreStream;
+
+.field private streamOwner:Ljava/lang/Long;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/stores/StoreStreamRtcConnection$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreStreamRtcConnection$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/stores/StoreStreamRtcConnection;->Companion:Lcom/discord/stores/StoreStreamRtcConnection$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lcom/discord/stores/StoreStream;)V
+    .locals 1
+
+    const-string v0, "storeStream"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->storeStream:Lcom/discord/stores/StoreStream;
+
+    new-instance p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
+
+    const/4 v0, 0x0
+
+    invoke-direct {p1, v0}, Lcom/discord/rtcconnection/RtcConnection$State$d;-><init>(Z)V
+
+    check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
+
+    iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    iget-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    invoke-static {p1}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnectionStateSubject:Lrx/subjects/BehaviorSubject;
+
+    return-void
+.end method
+
+.method private final createRtcConnection(JJLjava/lang/String;)V
+    .locals 15
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    move-object v0, p0
+
+    iget-object v1, v0, Lcom/discord/stores/StoreStreamRtcConnection;->storeStream:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
+
+    move-result-object v1
+
+    iget-object v1, v1, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser$Me;->getId()J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    goto :goto_0
+
+    :cond_0
+    move-object v1, v2
+
+    :goto_0
+    iget-object v7, v0, Lcom/discord/stores/StoreStreamRtcConnection;->sessionId:Ljava/lang/String;
+
+    sget-object v3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v3}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Lcom/discord/stores/StoreMediaEngine;->getMediaEngine()Lcom/discord/rtcconnection/mediaengine/MediaEngine;
+
+    move-result-object v11
+
+    if-eqz v1, :cond_5
+
+    if-nez v7, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    iget-object v3, v0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    if-eqz v3, :cond_3
+
+    iget-wide v3, v3, Lcom/discord/rtcconnection/RtcConnection;->channelId:J
+
+    cmp-long v5, v3, p3
+
+    if-nez v5, :cond_3
+
+    iget-object v3, v0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    if-eqz v3, :cond_2
+
+    iget-object v2, v3, Lcom/discord/rtcconnection/RtcConnection;->sessionId:Ljava/lang/String;
+
+    :cond_2
+    invoke-static {v2, v7}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_3
+
+    return-void
+
+    :cond_3
+    new-instance v2, Lcom/discord/rtcconnection/RtcConnection;
+
+    invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v9
+
+    const/4 v12, 0x1
+
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
+
+    move-object v13, v1
+
+    check-cast v13, Lcom/discord/utilities/logging/Logger;
+
+    new-instance v14, Lcom/discord/utilities/networking/NetworkMonitor;
+
+    iget-object v1, v0, Lcom/discord/stores/StoreStreamRtcConnection;->context:Landroid/content/Context;
+
+    if-nez v1, :cond_4
+
+    const-string v3, "context"
+
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_4
+    invoke-direct {v14, v1}, Lcom/discord/utilities/networking/NetworkMonitor;-><init>(Landroid/content/Context;)V
+
+    move-object v3, v2
+
+    move-wide/from16 v5, p3
+
+    move-object/from16 v8, p5
+
+    invoke-direct/range {v3 .. v14}, Lcom/discord/rtcconnection/RtcConnection;-><init>(Ljava/lang/Long;JLjava/lang/String;Ljava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;ZLcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
+
+    move-object v1, v0
+
+    check-cast v1, Lcom/discord/rtcconnection/RtcConnection$b;
+
+    invoke-virtual {v2, v1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection$b;)V
+
+    iput-object v2, v0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    :cond_5
+    :goto_1
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/rtcconnection/RtcConnection;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    return-object v0
+.end method
+
+.method public final getRtcConnectionState()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/rtcconnection/RtcConnection$State;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnectionStateSubject:Lrx/subjects/BehaviorSubject;
+
+    const-string v1, "rtcConnectionStateSubject"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lrx/Observable;
+
+    return-object v0
+.end method
+
+.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}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getSessionId()Ljava/lang/String;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->sessionId:Ljava/lang/String;
+
+    return-void
+.end method
+
+.method public final handleStreamCreate(Lcom/discord/models/domain/StreamCreate;)V
+    .locals 7
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "streamCreate"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "handleStreamCreate: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "findme"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    sget-object v0, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamCreate;->getStreamKey()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->decodeStreamKey(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getGuildId()J
+
+    move-result-wide v2
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+
+    move-result-wide v4
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamCreate;->getRtcServerId()Ljava/lang/String;
+
+    move-result-object v6
+
+    move-object v1, p0
+
+    invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreStreamRtcConnection;->createRtcConnection(JJLjava/lang/String;)V
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getOwnerId()J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->streamOwner:Ljava/lang/Long;
+
+    return-void
+.end method
+
+.method public final handleStreamDelete(Lcom/discord/models/domain/StreamDelete;)V
+    .locals 1
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "streamDelete"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "handleStreamDelete: "
+
+    invoke-virtual {v0, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "findme"
+
+    invoke-static {v0, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    iget-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p1}, Lcom/discord/rtcconnection/RtcConnection;->ec()Ljava/util/concurrent/Future;
+
+    :cond_0
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->streamOwner:Ljava/lang/Long;
+
+    return-void
+.end method
+
+.method public final handleStreamServerUpdate(Lcom/discord/models/domain/StreamServerUpdate;)V
+    .locals 3
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "streamServerUpdate"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "handleStreamServerUpdate: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "findme"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    sget-object v0, Lcom/discord/app/App;->tJ:Lcom/discord/app/App$a;
+
+    invoke-static {}, Lcom/discord/app/App;->dl()Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    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 v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamServerUpdate;->getEndpoint()Ljava/lang/String;
+
+    move-result-object v2
+
+    if-nez v2, :cond_1
+
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
+
+    :cond_1
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamServerUpdate;->getToken()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, v2, p1, v1}, Lcom/discord/rtcconnection/RtcConnection;->a(Ljava/lang/String;Ljava/lang/String;Ljavax/net/ssl/SSLSocketFactory;)Ljava/util/concurrent/Future;
+
+    :cond_2
+    return-void
+.end method
+
+.method public final init(Landroid/content/Context;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->context:Landroid/content/Context;
+
+    sget-object p1, Lcom/discord/stores/StoreStreamRtcConnection$Actions;->INSTANCE:Lcom/discord/stores/StoreStreamRtcConnection$Actions;
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->storeStream:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {p1, v0}, Lcom/discord/stores/StoreStreamRtcConnection$Actions;->init(Lcom/discord/stores/StoreStream;)V
+
+    return-void
+.end method
+
+.method public final onAnalyticsEvent(Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;Ljava/util/Map;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/Object;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "properties"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string p2, "onAnalyticsEvent: "
+
+    invoke-virtual {p2, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string p2, "streamEvent"
+
+    invoke-static {p2, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
+.end method
+
+.method public final onDispatchEnded()V
+    .locals 2
+
+    iget-boolean v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->isDirty:Z
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnectionStateSubject:Lrx/subjects/BehaviorSubject;
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->isDirty:Z
+
+    :cond_0
+    return-void
+.end method
+
+.method public final onFatalClose()V
+    .locals 2
+
+    const-string v0, "streamEvent"
+
+    const-string v1, "onFatalClose"
+
+    invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
+.end method
+
+.method public final onQualityUpdate(Lcom/discord/rtcconnection/RtcConnection$Quality;)V
+    .locals 1
+
+    const-string v0, "quality"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "onQualityUpdate: "
+
+    invoke-virtual {v0, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "streamEvent"
+
+    invoke-static {v0, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
+.end method
+
+.method public final onSpeaking(JZ)V
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "onSpeaking: userId "
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1, p2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string p1, ", isSpeaking "
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p3}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string p2, "streamEvent"
+
+    invoke-static {p2, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
+.end method
+
+.method public final onStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
+    .locals 4
+
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "state change: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "streamEvent"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->streamOwner:Ljava/lang/Long;
+
+    if-eqz v0, :cond_0
+
+    check-cast v0, Ljava/lang/Number;
+
+    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
+
+    move-result-wide v0
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    if-eqz v2, :cond_0
+
+    iget-object v2, v2, Lcom/discord/rtcconnection/RtcConnection;->xS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+
+    if-eqz v2, :cond_0
+
+    const/16 v3, 0x12c
+
+    invoke-interface {v2, v0, v1, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->a(JI)V
+
+    :cond_0
+    iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->isDirty:Z
+
+    return-void
+.end method
+
+.method public final onVideoStream(JLjava/lang/Integer;)V
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "video stream: userId: "
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1, p2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v1, " -- stream id: "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "streamEvent"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    invoke-static {p1, p2, p3}, Lcom/discord/stores/StoreStreamRtcConnection$Actions;->videoUpdate(JLjava/lang/Integer;)V
+
+    return-void
+.end method
+
+.method public final setRtcConnection$app_productionDiscordExternalRelease(Lcom/discord/rtcconnection/RtcConnection;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreSubscriptions$Actions$fetchSubscriptions$1.smali b/com.discord/smali/com/discord/stores/StoreSubscriptions$Actions$fetchSubscriptions$1.smali
index 8223ca22cf..c208dd333a 100644
--- a/com.discord/smali/com/discord/stores/StoreSubscriptions$Actions$fetchSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSubscriptions$Actions$fetchSubscriptions$1.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreSubscriptions$Actions$fetchSubscriptions$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSubscriptions$Actions.smali b/com.discord/smali/com/discord/stores/StoreSubscriptions$Actions.smali
index dc0152eec4..29890c0254 100644
--- a/com.discord/smali/com/discord/stores/StoreSubscriptions$Actions.smali
+++ b/com.discord/smali/com/discord/stores/StoreSubscriptions$Actions.smali
@@ -52,7 +52,7 @@
 
     const-string v0, "store"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -75,7 +75,7 @@
 
     const-string v1, "stream"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     sget-object v1, Lcom/discord/stores/StoreSubscriptions$Actions$fetchSubscriptions$1;->INSTANCE:Lcom/discord/stores/StoreSubscriptions$Actions$fetchSubscriptions$1;
diff --git a/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1$1.smali b/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1$1.smali
index b068b6e379..8eebaa3a68 100644
--- a/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreSubscriptions$fetchSubscriptions$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$2$1.smali b/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$2$1.smali
index fb9766f472..2fc814aec5 100644
--- a/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$2$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreSubscriptions$fetchSubscriptions$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSubscriptions.smali b/com.discord/smali/com/discord/stores/StoreSubscriptions.smali
index 3fee8e9879..6fd694ae5c 100644
--- a/com.discord/smali/com/discord/stores/StoreSubscriptions.smali
+++ b/com.discord/smali/com/discord/stores/StoreSubscriptions.smali
@@ -233,7 +233,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreSubscriptions;->subscriptionsStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreUser.smali b/com.discord/smali/com/discord/stores/StoreUser.smali
index 953a38a9ab..6d9ff23b28 100644
--- a/com.discord/smali/com/discord/stores/StoreUser.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser.smali
@@ -373,7 +373,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -455,7 +455,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -489,7 +489,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -523,7 +523,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -1333,7 +1333,7 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStream;->handleUserUpdated(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -1364,7 +1364,7 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream;->schedule(Lkotlin/jvm/functions/Function0;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -1380,7 +1380,7 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStream;->handleUserUpdated(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 17c6115642..f11e4d19a5 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$authorizeConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$authorizeConnection$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserConnections$authorizeConnection$1;->invoke(Lcom/discord/models/domain/ModelUrl;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 fe6f722501..05b9a25fc1 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$deleteUserConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$deleteUserConnection$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserConnections$deleteUserConnection$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 a1d0107cbe..794681e2ea 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreUserConnections$fetchConnectedAccounts$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 71bccf34a8..b44073ed8d 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1.smali
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserConnections$fetchConnectedAccounts$1;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 2801932710..08501a7dac 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$init$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserConnections$init$1;->invoke(Lkotlin/Unit;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 a8ae60b447..eb31d5f3f1 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserConnections$submitPinCode$2;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 34f6ce5d79..8be3b98213 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$updateUserConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$updateUserConnection$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserConnections$updateUserConnection$1;->invoke(Lcom/discord/models/domain/ModelConnectedAccount;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserConnections.smali b/com.discord/smali/com/discord/stores/StoreUserConnections.smali
index d1d10cd58d..be8b324cde 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections.smali
@@ -45,7 +45,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -502,7 +502,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     move-object p3, p5
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
index 6d41b25846..0bfbd2d940 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
@@ -263,7 +263,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JV()Lrx/Observable;
 
     move-result-object p0
 
@@ -317,7 +317,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p3
 
@@ -325,7 +325,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dy()Lrx/Observable$c;
 
     move-result-object p3
 
@@ -367,7 +367,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -409,7 +409,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -441,7 +441,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -470,7 +470,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -525,7 +525,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dE()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -581,7 +581,7 @@
 
     invoke-direct {v5, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
 
-    const v6, 0x7f1203ab
+    const v6, 0x7f1203b0
 
     move-object v1, p0
 
@@ -625,16 +625,16 @@
 
     if-eqz p2, :cond_0
 
-    const p2, 0x7f1203ab
+    const p2, 0x7f1203b0
 
-    const v6, 0x7f1203ab
+    const v6, 0x7f1203b0
 
     goto :goto_0
 
     :cond_0
-    const p2, 0x7f12037c
+    const p2, 0x7f120381
 
-    const v6, 0x7f12037c
+    const v6, 0x7f120381
 
     :goto_0
     move-object v1, p0
@@ -677,7 +677,7 @@
 
     invoke-direct {v5, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
 
-    const v6, 0x7f1203ab
+    const v6, 0x7f1203b0
 
     move-object v1, p0
 
@@ -699,7 +699,7 @@
 
     invoke-direct {v4, p3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(I)V
 
-    const v5, 0x7f120fe5
+    const v5, 0x7f121021
 
     move-object v0, p0
 
@@ -721,7 +721,7 @@
 
     invoke-direct {v4, p3, p4, p5}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V
 
-    const v5, 0x7f120fe5
+    const v5, 0x7f121021
 
     move-object v0, p0
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserNotes.smali b/com.discord/smali/com/discord/stores/StoreUserNotes.smali
index 66c9cdc447..e40b918130 100644
--- a/com.discord/smali/com/discord/stores/StoreUserNotes.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserNotes.smali
@@ -141,7 +141,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserNotes;->notesPublisher:Lrx/subjects/Subject;
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -175,7 +175,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence$TimestampedPresence.smali b/com.discord/smali/com/discord/stores/StoreUserPresence$TimestampedPresence.smali
index 4458678e47..6ab900120a 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence$TimestampedPresence.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence$TimestampedPresence.smali
@@ -163,7 +163,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->presence:Lcom/discord/models/domain/ModelPresence;
 
@@ -183,15 +183,11 @@
 
     iget-wide v1, p0, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->timestamp:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence.smali b/com.discord/smali/com/discord/stores/StoreUserPresence.smali
index 2dd0f06450..5152bbc331 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence.smali
@@ -808,7 +808,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -853,7 +853,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -883,7 +883,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserProfile.smali b/com.discord/smali/com/discord/stores/StoreUserProfile.smali
index baf7ed2650..aa0912f42e 100644
--- a/com.discord/smali/com/discord/stores/StoreUserProfile.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserProfile.smali
@@ -228,7 +228,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -297,7 +297,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
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 0e90347596..71c4598d49 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$1.smali
@@ -86,7 +86,7 @@
         }
     .end annotation
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
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 b09175ede7..70648f3ce9 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreUserRelationships$requestAllRelationships$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 68ba69aeb3..0a56dd40ca 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2.smali
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserRelationships$requestAllRelationships$2;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships.smali
index 1ff718f9a2..ddfb6de32b 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships.smali
@@ -170,7 +170,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -208,7 +208,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -242,7 +242,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -509,7 +509,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -525,7 +525,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/stores/StoreUserRelationships$requestAllRelationships$2;
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserRequiredActions.smali b/com.discord/smali/com/discord/stores/StoreUserRequiredActions.smali
index 5d4a02c083..e59f13b07e 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRequiredActions.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRequiredActions.smali
@@ -74,7 +74,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserSettings.smali b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
index 940c9fa565..eda34cd389 100644
--- a/com.discord/smali/com/discord/stores/StoreUserSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
@@ -122,7 +122,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -132,7 +132,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -142,7 +142,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -210,7 +210,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -220,7 +220,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -603,7 +603,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -651,7 +651,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -697,7 +697,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -721,7 +721,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->defaultGuildsRestrictedSubject:Lrx/subjects/Subject;
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -761,7 +761,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->explicitContentFilterSubject:Lrx/subjects/Subject;
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -823,7 +823,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->friendSourceFlagsSubject:Lrx/subjects/Subject;
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -852,7 +852,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -924,7 +924,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->localePublisher:Lrx/subjects/Subject;
 
-    invoke-virtual {v0}, Lrx/subjects/Subject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/Subject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -997,7 +997,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -1108,7 +1108,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1373,7 +1373,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f12112e
+    const v1, 0x7f121170
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1528,7 +1528,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f120aac
+    const v0, 0x7f120acd
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1856,7 +1856,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f12112e
+    const v0, 0x7f121170
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1887,7 +1887,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f12112d
+    const v0, 0x7f12116f
 
     invoke-static {v0}, 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 2b6e600161..0004180dd6 100644
--- a/com.discord/smali/com/discord/stores/StoreUserTyping$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserTyping$get$1.smali
@@ -92,7 +92,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p1, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     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 86292a0bdb..8a6a727a8a 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreUserTyping$handleTypingStart$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 cb763bd80c..2dbff6963d 100644
--- a/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserTyping$handleTypingStart$1;->invoke(Lcom/discord/models/domain/ModelUser$Typing;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 8420def10b..174cba6fc3 100644
--- a/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$2.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserTyping$handleTypingStart$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 ad9e22b71f..dd68132ca8 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreUserTyping$setUserTyping$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 dcc7221e27..ddc9d31af9 100644
--- a/com.discord/smali/com/discord/stores/StoreUserTyping$setUserTyping$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserTyping$setUserTyping$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserTyping$setUserTyping$1;->invoke(Lcom/discord/models/domain/ModelTypingResponse;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserTyping.smali b/com.discord/smali/com/discord/stores/StoreUserTyping.smali
index 27ea84c05d..83f2c0a316 100644
--- a/com.discord/smali/com/discord/stores/StoreUserTyping.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserTyping.smali
@@ -189,7 +189,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -494,7 +494,7 @@
 
     move-result v2
 
-    invoke-static {v2}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v2}, Lkotlin/a/ad;->dj(I)I
 
     move-result v2
 
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 b42b02ccfb..9e748c18a3 100644
--- a/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds$get$1.smali
@@ -100,13 +100,13 @@
 
     move-result v1
 
-    invoke-static {v1}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v1}, Lkotlin/a/ad;->dj(I)I
 
     move-result v1
 
     const/16 v2, 0x10
 
-    invoke-static {v1, v2}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v1, v2}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali b/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali
index dcc3056dd9..6c82b7f455 100644
--- a/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali
+++ b/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali
@@ -89,7 +89,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 3132939f13..05edaf7577 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoSupport$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoSupport$init$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreVideoSupport$init$2;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreVideoSupport.smali b/com.discord/smali/com/discord/stores/StoreVideoSupport.smali
index 12b0f231b8..d617a9a78f 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoSupport.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoSupport.smali
@@ -109,7 +109,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
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 dca103a05c..140e6a9983 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$clear$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$clear$1.smali
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreVoiceChannelSelected$clear$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 d8563c77ad..e1311b5c17 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$set$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$set$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreVoiceChannelSelected$set$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
index d075cc7fe7..a145993f0d 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
@@ -100,7 +100,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -122,7 +122,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -420,7 +420,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -447,6 +447,14 @@
     return-object v0
 .end method
 
+.method public final getSelectedVoiceChannelId$app_productionDiscordExternalRelease()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->selectedVoiceChannelId:J
+
+    return-wide v0
+.end method
+
 .method public final getTimeChannelSelected()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -868,3 +876,11 @@
 
     return-void
 .end method
+
+.method public final setSelectedVoiceChannelId$app_productionDiscordExternalRelease(J)V
+    .locals 0
+
+    iput-wide p1, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->selectedVoiceChannelId:J
+
+    return-void
+.end method
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 0869b09775..ddeeba2a7c 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
@@ -91,7 +91,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
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 eb7ffc1232..5ea4fd870c 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
@@ -1,9 +1,9 @@
-.class final synthetic Lcom/discord/stores/StoreVoiceParticipants$get$1$2;
-.super Lkotlin/jvm/internal/j;
+.class final Lcom/discord/stores/StoreVoiceParticipants$get$1$2;
+.super Ljava/lang/Object;
 .source "StoreVoiceParticipants.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function7;
+.implements Lrx/functions/Func8;
 
 
 # annotations
@@ -12,93 +12,60 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1018
+    accessFlags = 0x18
     name = null
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lkotlin/jvm/internal/j;",
-        "Lkotlin/jvm/functions/Function7<",
-        "Lcom/discord/models/domain/ModelUser;",
-        "Ljava/util/Collection<",
-        "+",
-        "Lcom/discord/models/domain/ModelUser;",
-        ">;",
-        "Ljava/util/Map<",
-        "Ljava/lang/Long;",
-        "+",
-        "Lcom/discord/models/domain/ModelVoice$State;",
-        ">;",
-        "Ljava/util/Set<",
-        "+",
-        "Ljava/lang/Long;",
-        ">;",
-        "Ljava/util/Collection<",
-        "+",
-        "Ljava/lang/Long;",
-        ">;",
-        "Ljava/util/Map<",
-        "Ljava/lang/Long;",
-        "+",
-        "Ljava/lang/Integer;",
-        ">;",
-        "Ljava/util/Map<",
-        "Ljava/lang/Long;",
-        "+",
-        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
-        ">;",
-        "Ljava/util/Map<",
-        "Ljava/lang/Long;",
-        "+",
-        "Lcom/discord/models/domain/ModelVoice$User;",
-        ">;>;"
+        "<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;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func8<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TR;>;"
     }
 .end annotation
 
 
+# instance fields
+.field final synthetic $guildId:Ljava/lang/Long;
+
+.field final synthetic this$0:Lcom/discord/stores/StoreVoiceParticipants$get$1;
+
+
 # direct methods
-.method constructor <init>(Lcom/discord/stores/StoreVoiceParticipants;)V
-    .locals 1
+.method constructor <init>(Lcom/discord/stores/StoreVoiceParticipants$get$1;Ljava/lang/Long;)V
+    .locals 0
 
-    const/4 v0, 0x7
+    iput-object p1, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;->this$0:Lcom/discord/stores/StoreVoiceParticipants$get$1;
 
-    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
+    iput-object p2, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;->$guildId:Ljava/lang/Long;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()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/StoreVoiceParticipants;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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/models/domain/ModelUser;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Set;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;"
-
-    return-object v0
-.end method
-
-.method public final 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;
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Lcom/discord/models/domain/ModelUser;
@@ -109,21 +76,23 @@
 
     check-cast p4, Ljava/util/Set;
 
-    check-cast p5, Ljava/util/Collection;
+    check-cast p5, Ljava/util/List;
 
     check-cast p6, Ljava/util/Map;
 
     check-cast p7, Ljava/util/Map;
 
-    invoke-virtual/range {p0 .. p7}, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;->invoke(Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Set;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
+    check-cast p8, Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    invoke-virtual/range {p0 .. p8}, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;->call(Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Set;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$State;)Ljava/util/Map;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Set;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
-    .locals 9
+.method public final call(Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Set;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$State;)Ljava/util/Map;
+    .locals 14
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -140,7 +109,7 @@
             "Ljava/util/Set<",
             "Ljava/lang/Long;",
             ">;",
-            "Ljava/util/Collection<",
+            "Ljava/util/List<",
             "Ljava/lang/Long;",
             ">;",
             "Ljava/util/Map<",
@@ -149,9 +118,10 @@
             ">;",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
-            "+",
             "Lcom/discord/models/domain/ModelGuildMember$Computed;",
-            ">;)",
+            ">;",
+            "Lcom/discord/stores/StoreApplicationStreaming$State;",
+            ")",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/models/domain/ModelVoice$User;",
@@ -159,55 +129,77 @@
         }
     .end annotation
 
-    const-string v0, "p1"
-
-    move-object v2, p1
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p2"
-
-    move-object v3, p2
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p3"
-
-    move-object v4, p3
-
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p4"
-
-    move-object v5, p4
-
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p5"
-
-    move-object v6, p5
-
-    invoke-static {p5, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p6"
-
-    move-object v7, p6
-
-    invoke-static {p6, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p7"
-
-    move-object/from16 v8, p7
-
-    invoke-static {v8, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
     move-object v0, p0
 
-    iget-object v1, v0, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;->receiver:Ljava/lang/Object;
+    move-object/from16 v1, p5
 
-    check-cast v1, Lcom/discord/stores/StoreVoiceParticipants;
+    const-string v2, "isRinging"
 
-    invoke-static/range {v1 .. v8}, 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;)Ljava/util/Map;
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, v0, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;->this$0:Lcom/discord/stores/StoreVoiceParticipants$get$1;
+
+    iget-object v3, v2, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants;
+
+    iget-object v2, v0, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;->$guildId:Ljava/lang/Long;
+
+    const-string v4, "guildId"
+
+    invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v4
+
+    const-string v2, "meUser"
+
+    move-object v6, p1
+
+    invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "otherUsers"
+
+    move-object/from16 v7, p2
+
+    invoke-static {v7, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "voiceStates"
+
+    move-object/from16 v8, p3
+
+    invoke-static {v8, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "speakingUsers"
+
+    move-object/from16 v9, p4
+
+    invoke-static {v9, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v10, v1
+
+    check-cast v10, Ljava/util/Collection;
+
+    const-string v1, "videoStreams"
+
+    move-object/from16 v2, p6
+
+    invoke-static {v2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "guildMembers"
+
+    move-object/from16 v12, p7
+
+    invoke-static {v12, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "applicationStreamingState"
+
+    move-object/from16 v13, p8
+
+    invoke-static {v13, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object/from16 v11, p6
+
+    invoke-static/range {v3 .. v13}, Lcom/discord/stores/StoreVoiceParticipants;->access$create(Lcom/discord/stores/StoreVoiceParticipants;JLcom/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;)Ljava/util/Map;
 
     move-result-object v1
 
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 b73d60c8fd..449b18c1da 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1.smali
@@ -66,7 +66,7 @@
 .end method
 
 .method public final call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
-    .locals 10
+    .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -235,41 +235,47 @@
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v0
+    move-result-wide v8
 
-    invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreGuilds;->getComputed(J)Lrx/Observable;
+    invoke-virtual {p1, v8, v9}, Lcom/discord/stores/StoreGuilds;->getComputed(J)Lrx/Observable;
 
     move-result-object p1
 
-    const-string v0, "stream\n                 \u2026    .getComputed(guildId)"
+    const-string v1, "stream\n                 \u2026    .getComputed(guildId)"
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-wide/16 v0, 0x1
+    const-wide/16 v8, 0x1
 
-    sget-object v8, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v1, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-static {p1, v0, v1, v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-static {p1, v8, v9, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object v8
 
+    iget-object p1, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceParticipants;->getStream()Lcom/discord/stores/StoreStream;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream;->getApplicationStreaming$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreApplicationStreaming;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreaming;->getState()Lrx/Observable;
+
+    move-result-object v9
+
     new-instance p1, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;
 
-    iget-object v0, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants;
+    invoke-direct {p1, p0, v0}, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;-><init>(Lcom/discord/stores/StoreVoiceParticipants$get$1;Ljava/lang/Long;)V
 
-    invoke-direct {p1, v0}, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;-><init>(Lcom/discord/stores/StoreVoiceParticipants;)V
+    move-object v10, p1
 
-    check-cast p1, Lkotlin/jvm/functions/Function7;
+    check-cast v10, Lrx/functions/Func8;
 
-    new-instance v0, Lcom/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0;
-
-    invoke-direct {v0, p1}, Lcom/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0;-><init>(Lkotlin/jvm/functions/Function7;)V
-
-    move-object v9, v0
-
-    check-cast v9, Lrx/functions/Func7;
-
-    invoke-static/range {v2 .. v9}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func7;)Lrx/Observable;
+    invoke-static/range {v2 .. v10}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func8;)Lrx/Observable;
 
     move-result-object p1
 
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 213ede5807..1e7627f0ee 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$init$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreVoiceParticipants$init$1;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0.smali
deleted file mode 100644
index 62de350811..0000000000
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0.smali
+++ /dev/null
@@ -1,50 +0,0 @@
-.class final Lcom/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0;
-.super Ljava/lang/Object;
-.source "StoreVoiceParticipants.kt"
-
-# interfaces
-.implements Lrx/functions/Func7;
-
-
-# instance fields
-.field private final synthetic function:Lkotlin/jvm/functions/Function7;
-
-
-# direct methods
-.method constructor <init>(Lkotlin/jvm/functions/Function7;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0;->function:Lkotlin/jvm/functions/Function7;
-
-    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;
-    .locals 8
-
-    iget-object v0, p0, Lcom/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0;->function:Lkotlin/jvm/functions/Function7;
-
-    move-object v1, p1
-
-    move-object v2, p2
-
-    move-object v3, p3
-
-    move-object v4, p4
-
-    move-object v5, p5
-
-    move-object v6, p6
-
-    move-object v7, p7
-
-    invoke-interface/range {v0 .. v7}, Lkotlin/jvm/functions/Function7;->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;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali
index ec85aa70ed..de93f8ef8f 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali
@@ -44,10 +44,10 @@
     return-void
 .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;)Ljava/util/Map;
+.method public static final synthetic access$create(Lcom/discord/stores/StoreVoiceParticipants;JLcom/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;)Ljava/util/Map;
     .locals 0
 
-    invoke-direct/range {p0 .. p7}, Lcom/discord/stores/StoreVoiceParticipants;->create(Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Set;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
+    invoke-direct/range {p0 .. p10}, Lcom/discord/stores/StoreVoiceParticipants;->create(JLcom/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;)Ljava/util/Map;
 
     move-result-object p0
 
@@ -64,11 +64,11 @@
     return-object p0
 .end method
 
-.method private final create(Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Set;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
-    .locals 25
+.method private final create(JLcom/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;)Ljava/util/Map;
+    .locals 32
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(",
+            "(J",
             "Lcom/discord/models/domain/ModelUser;",
             "Ljava/util/Collection<",
             "+",
@@ -93,7 +93,9 @@
             "Ljava/lang/Long;",
             "+",
             "Lcom/discord/models/domain/ModelGuildMember$Computed;",
-            ">;)",
+            ">;",
+            "Lcom/discord/stores/StoreApplicationStreaming$State;",
+            ")",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/models/domain/ModelVoice$User;",
@@ -101,282 +103,514 @@
         }
     .end annotation
 
-    move-object/from16 v0, p3
+    move-object/from16 v0, p5
 
-    move-object/from16 v1, p4
+    move-object/from16 v1, p6
 
-    move-object/from16 v2, p5
+    move-object/from16 v2, p7
 
-    move-object/from16 v3, p6
+    move-object/from16 v3, p8
 
-    move-object/from16 v4, p7
+    move-object/from16 v4, p9
 
-    const/4 v5, 0x1
+    invoke-virtual/range {p10 .. p10}, Lcom/discord/stores/StoreApplicationStreaming$State;->getStreamsByUser()Ljava/util/Map;
 
-    new-array v5, v5, [Lkotlin/Pair;
+    move-result-object v5
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+    new-instance v6, Ljava/util/LinkedHashMap;
 
-    move-result-wide v6
+    invoke-direct {v6}, Ljava/util/LinkedHashMap;-><init>()V
 
-    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    check-cast v6, Ljava/util/Map;
 
-    move-result-object v6
+    invoke-interface {v5}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
-    new-instance v15, Lcom/discord/models/domain/ModelVoice$User;
+    move-result-object v5
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-interface {v5}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
-    move-result-wide v7
+    move-result-object v5
 
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    :cond_0
+    :goto_0
+    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v7
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x1
+
+    if-eqz v7, :cond_2
+
+    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v7
 
-    invoke-interface {v0, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    check-cast v7, Ljava/util/Map$Entry;
+
+    invoke-interface {v7}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v10
+
+    check-cast v10, Lcom/discord/models/domain/ModelApplicationStream;
+
+    invoke-virtual {v10}, Lcom/discord/models/domain/ModelApplicationStream;->getGuildId()J
+
+    move-result-wide v10
+
+    cmp-long v12, v10, p1
+
+    if-nez v12, :cond_1
+
+    const/4 v8, 0x1
+
+    :cond_1
+    if-eqz v8, :cond_0
+
+    invoke-interface {v7}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+    move-result-object v8
+
+    invoke-interface {v7}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
     move-result-object v7
 
-    move-object v9, v7
-
-    check-cast v9, Lcom/discord/models/domain/ModelVoice$State;
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v7
-
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v7
-
-    invoke-interface {v1, v7}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
-
-    move-result v10
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v7
-
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v7
-
-    invoke-interface {v2, v7}, Ljava/util/Collection;->contains(Ljava/lang/Object;)Z
-
-    move-result v11
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v7
-
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v7
-
-    invoke-interface {v3, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v7
-
-    move-object v12, v7
-
-    check-cast v12, Ljava/lang/Integer;
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v7
-
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v7
-
-    invoke-interface {v4, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v7
-
-    check-cast v7, Lcom/discord/models/domain/ModelGuildMember$Computed;
-
-    const/16 v16, 0x0
-
-    if-eqz v7, :cond_0
-
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getNick()Ljava/lang/String;
-
-    move-result-object v7
-
-    move-object v14, v7
+    invoke-interface {v6, v8, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_0
 
-    :cond_0
-    move-object/from16 v14, v16
+    :cond_2
+    new-array v5, v9, [Lkotlin/Pair;
 
-    :goto_0
-    const/4 v13, 0x1
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-object v7, v15
+    move-result-wide v10
 
-    move-object/from16 v8, p1
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-direct/range {v7 .. v14}, Lcom/discord/models/domain/ModelVoice$User;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelVoice$State;ZZLjava/lang/Integer;ZLjava/lang/String;)V
+    move-result-object v7
 
-    invoke-static {v6, v15}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-object v6
+    move-result-wide v10
 
-    const/4 v7, 0x0
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    aput-object v6, v5, v7
+    move-result-object v10
+
+    invoke-interface {v0, v10}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v10
+
+    move-object v13, v10
+
+    check-cast v13, Lcom/discord/models/domain/ModelVoice$State;
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v10
+
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v10
+
+    invoke-interface {v1, v10}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+
+    move-result v14
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v10
+
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v10
+
+    invoke-interface {v2, v10}, Ljava/util/Collection;->contains(Ljava/lang/Object;)Z
+
+    move-result v15
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v10
+
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v10
+
+    invoke-interface {v3, v10}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v10
+
+    move-object/from16 v16, v10
+
+    check-cast v16, Ljava/lang/Integer;
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v10
+
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v10
+
+    invoke-interface {v4, v10}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v10
+
+    check-cast v10, Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    const/16 v21, 0x0
+
+    if-eqz v10, :cond_3
+
+    invoke-virtual {v10}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getNick()Ljava/lang/String;
+
+    move-result-object v10
+
+    move-object/from16 v18, v10
+
+    goto :goto_1
+
+    :cond_3
+    move-object/from16 v18, v21
+
+    :goto_1
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v10
+
+    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v10
+
+    invoke-interface {v6, v10}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v10
+
+    move-object/from16 v19, v10
+
+    check-cast v19, Lcom/discord/models/domain/ModelApplicationStream;
+
+    invoke-virtual/range {p10 .. p10}, Lcom/discord/stores/StoreApplicationStreaming$State;->getRtcStreams()Ljava/util/Map;
+
+    move-result-object v10
+
+    invoke-interface {v10}, Ljava/util/Map;->values()Ljava/util/Collection;
+
+    move-result-object v10
+
+    check-cast v10, Ljava/lang/Iterable;
+
+    instance-of v11, v10, Ljava/util/Collection;
+
+    if-eqz v11, :cond_4
+
+    move-object v11, v10
+
+    check-cast v11, Ljava/util/Collection;
+
+    invoke-interface {v11}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v11
+
+    if-nez v11, :cond_6
+
+    :cond_4
+    invoke-interface {v10}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v10
+
+    :cond_5
+    invoke-interface {v10}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v11
+
+    if-eqz v11, :cond_6
+
+    invoke-interface {v10}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v11
+
+    check-cast v11, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;
+
+    invoke-virtual {v11}, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;->getViewerIds()Ljava/util/List;
+
+    move-result-object v11
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v22
+
+    invoke-static/range {v22 .. v23}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v12
+
+    invoke-interface {v11, v12}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+    move-result v11
+
+    if-eqz v11, :cond_5
+
+    const/16 v20, 0x1
+
+    goto :goto_2
+
+    :cond_6
+    const/16 v20, 0x0
+
+    :goto_2
+    new-instance v10, Lcom/discord/models/domain/ModelVoice$User;
+
+    const/16 v17, 0x1
+
+    move-object v11, v10
+
+    move-object/from16 v12, p3
+
+    invoke-direct/range {v11 .. v20}, Lcom/discord/models/domain/ModelVoice$User;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelVoice$State;ZZLjava/lang/Integer;ZLjava/lang/String;Lcom/discord/models/domain/ModelApplicationStream;Z)V
+
+    invoke-static {v7, v10}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v7
+
+    aput-object v7, v5, v8
 
     invoke-static {v5}, Lkotlin/a/ad;->b([Lkotlin/Pair;)Ljava/util/Map;
 
     move-result-object v5
 
-    move-object/from16 v6, p2
-
-    check-cast v6, Ljava/lang/Iterable;
-
-    new-instance v7, Ljava/util/ArrayList;
-
-    const/16 v8, 0xa
-
-    invoke-static {v6, v8}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
-
-    move-result v8
-
-    invoke-direct {v7, v8}, Ljava/util/ArrayList;-><init>(I)V
-
-    check-cast v7, Ljava/util/Collection;
-
-    invoke-interface {v6}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v6
-
-    :goto_1
-    invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v8
-
-    if-eqz v8, :cond_2
-
-    invoke-interface {v6}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v8
-
-    move-object/from16 v18, v8
-
-    check-cast v18, Lcom/discord/models/domain/ModelUser;
-
-    new-instance v8, Lcom/discord/models/domain/ModelVoice$User;
-
-    invoke-virtual/range {v18 .. v18}, 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 v9
-
-    invoke-interface {v0, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v9
-
-    move-object/from16 v19, v9
-
-    check-cast v19, Lcom/discord/models/domain/ModelVoice$State;
-
-    invoke-virtual/range {v18 .. v18}, 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 v9
-
-    invoke-interface {v1, v9}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
-
-    move-result v20
-
-    invoke-virtual/range {v18 .. v18}, 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 v9
-
-    invoke-interface {v2, v9}, Ljava/util/Collection;->contains(Ljava/lang/Object;)Z
-
-    move-result v21
-
-    invoke-virtual/range {v18 .. v18}, 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 v9
-
-    invoke-interface {v3, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v9
-
-    move-object/from16 v22, v9
-
-    check-cast v22, Ljava/lang/Integer;
-
-    const/16 v23, 0x0
-
-    invoke-virtual/range {v18 .. v18}, 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 v9
-
-    invoke-interface {v4, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Lcom/discord/models/domain/ModelGuildMember$Computed;
-
-    if-eqz v9, :cond_1
-
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getNick()Ljava/lang/String;
-
-    move-result-object v9
-
-    move-object/from16 v24, v9
-
-    goto :goto_2
-
-    :cond_1
-    move-object/from16 v24, v16
-
-    :goto_2
-    move-object/from16 v17, v8
-
-    invoke-direct/range {v17 .. v24}, Lcom/discord/models/domain/ModelVoice$User;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelVoice$State;ZZLjava/lang/Integer;ZLjava/lang/String;)V
-
-    invoke-interface {v7, v8}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_1
-
-    :cond_2
-    check-cast v7, Ljava/util/List;
+    move-object/from16 v7, p4
 
     check-cast v7, Ljava/lang/Iterable;
 
+    new-instance v10, Ljava/util/ArrayList;
+
+    const/16 v11, 0xa
+
+    invoke-static {v7, v11}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
+
+    move-result v11
+
+    invoke-direct {v10, v11}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast v10, Ljava/util/Collection;
+
     invoke-interface {v7}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
+    move-result-object v7
+
+    :goto_3
+    invoke-interface {v7}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v11
+
+    if-eqz v11, :cond_b
+
+    invoke-interface {v7}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v11
+
+    move-object/from16 v23, v11
+
+    check-cast v23, Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual/range {v23 .. v23}, 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-interface {v0, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v11
+
+    move-object/from16 v24, v11
+
+    check-cast v24, Lcom/discord/models/domain/ModelVoice$State;
+
+    invoke-virtual/range {v23 .. v23}, 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-interface {v1, v11}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+
+    move-result v25
+
+    invoke-virtual/range {v23 .. v23}, 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-interface {v2, v11}, Ljava/util/Collection;->contains(Ljava/lang/Object;)Z
+
+    move-result v26
+
+    invoke-virtual/range {v23 .. v23}, 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-interface {v3, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v11
+
+    move-object/from16 v27, v11
+
+    check-cast v27, Ljava/lang/Integer;
+
+    invoke-virtual/range {v23 .. v23}, 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-interface {v4, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v11
+
+    check-cast v11, Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    if-eqz v11, :cond_7
+
+    invoke-virtual {v11}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getNick()Ljava/lang/String;
+
+    move-result-object v11
+
+    move-object/from16 v29, v11
+
+    goto :goto_4
+
+    :cond_7
+    move-object/from16 v29, v21
+
+    :goto_4
+    invoke-virtual/range {v23 .. v23}, 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-interface {v6, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v11
+
+    move-object/from16 v30, v11
+
+    check-cast v30, Lcom/discord/models/domain/ModelApplicationStream;
+
+    invoke-virtual/range {p10 .. p10}, Lcom/discord/stores/StoreApplicationStreaming$State;->getRtcStreams()Ljava/util/Map;
+
+    move-result-object v11
+
+    invoke-interface {v11}, Ljava/util/Map;->values()Ljava/util/Collection;
+
+    move-result-object v11
+
+    check-cast v11, Ljava/lang/Iterable;
+
+    instance-of v12, v11, Ljava/util/Collection;
+
+    if-eqz v12, :cond_8
+
+    move-object v12, v11
+
+    check-cast v12, Ljava/util/Collection;
+
+    invoke-interface {v12}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v12
+
+    if-nez v12, :cond_a
+
+    :cond_8
+    invoke-interface {v11}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v11
+
+    :cond_9
+    invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v12
+
+    if-eqz v12, :cond_a
+
+    invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v12
+
+    check-cast v12, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;
+
+    invoke-virtual {v12}, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;->getViewerIds()Ljava/util/List;
+
+    move-result-object v12
+
+    invoke-virtual/range {v23 .. v23}, 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
+
+    invoke-interface {v12, v13}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_9
+
+    const/16 v31, 0x1
+
+    goto :goto_5
+
+    :cond_a
+    const/16 v31, 0x0
+
+    :goto_5
+    new-instance v11, Lcom/discord/models/domain/ModelVoice$User;
+
+    const/16 v28, 0x0
+
+    move-object/from16 v22, v11
+
+    invoke-direct/range {v22 .. v31}, Lcom/discord/models/domain/ModelVoice$User;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelVoice$State;ZZLjava/lang/Integer;ZLjava/lang/String;Lcom/discord/models/domain/ModelApplicationStream;Z)V
+
+    invoke-interface {v10, v11}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto/16 :goto_3
+
+    :cond_b
+    check-cast v10, Ljava/util/List;
+
+    check-cast v10, Ljava/lang/Iterable;
+
+    invoke-interface {v10}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
     move-result-object v0
 
-    :goto_3
+    :goto_6
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v1
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_c
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -402,9 +636,9 @@
 
     invoke-interface {v5, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_3
+    goto :goto_6
 
-    :cond_3
+    :cond_c
     return-object v5
 .end method
 
@@ -442,7 +676,7 @@
 
     if-eq v0, v1, :cond_1
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -542,7 +776,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -576,7 +810,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali b/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali
index 399e53526d..6d465772fd 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali
@@ -47,7 +47,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -209,7 +209,7 @@
     return-object p0
 
     :cond_0
-    invoke-static {}, Lrx/Observable;->Ka()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->JN()Lrx/Observable;
 
     move-result-object p0
 
@@ -258,7 +258,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreVoiceSpeaking;->speakingUsersPublisher:Lrx/subjects/Subject;
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -292,7 +292,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceStates.smali b/com.discord/smali/com/discord/stores/StoreVoiceStates.smali
index 1e9367555e..f54465b379 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceStates.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceStates.smali
@@ -378,7 +378,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -416,7 +416,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index 7429ea4efe..c1ff8d2bcf 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
@@ -99,7 +99,7 @@
 
     sput-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superPropertiesStringBase64:Ljava/lang/String;
 
-    sget-object v1, Lkotlin/properties/a;->bkJ:Lkotlin/properties/a;
+    sget-object v1, Lkotlin/properties/a;->bld:Lkotlin/properties/a;
 
     invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
 
@@ -179,7 +179,7 @@
 
     const-string v1, "browser_user_agent"
 
-    const-string v2, "Discord-Android/950"
+    const-string v2, "Discord-Android/963"
 
     invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
@@ -189,7 +189,7 @@
 
     aput-object v1, v0, v2
 
-    const/16 v1, 0x3b6
+    const/16 v1, 0x3c3
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -207,7 +207,7 @@
 
     const-string v1, "client_version"
 
-    const-string v2, "9.5.0"
+    const-string v2, "9.6.3"
 
     invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
@@ -455,6 +455,10 @@
     goto/16 :goto_8
 
     :cond_0
+    const-string v1, "intent.extras?.getString\u2026PERTY_REFERRER) ?: return"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v1, 0x1
 
     new-array v2, v1, [Lkotlin/Pair;
@@ -786,8 +790,6 @@
     :goto_8
     return-void
 
-    nop
-
     :sswitch_data_0
     .sparse-switch
         -0x5bc8ed18 -> :sswitch_8
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$WhenMappings.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$WhenMappings.smali
new file mode 100644
index 0000000000..88f3e250f5
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$WhenMappings.smali
@@ -0,0 +1,94 @@
+.class public final synthetic Lcom/discord/utilities/analytics/AnalyticsTracker$WhenMappings;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field public static final synthetic $EnumSwitchMapping$0:[I
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 3
+
+    invoke-static {}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->values()[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->BLACK_SCREEN:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->BLURRY:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x2
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->LAGGING:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x3
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->OUT_OF_SYNC:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x4
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->AUDIO_MISSING:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x5
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->AUDIO_POOR:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x6
+
+    aput v2, v0, v1
+
+    return-void
+.end method
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 4062c5984c..ea585e2754 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
@@ -67,7 +67,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker$addAttachment$2;->invoke(Ljava/util/Map;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1.smali
new file mode 100644
index 0000000000..aef5289c68
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1.smali
@@ -0,0 +1,598 @@
+.class final Lcom/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1;
+.super Ljava/lang/Object;
+.source "AnalyticsTracker.kt"
+
+# interfaces
+.implements Lrx/functions/Func9;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/analytics/AnalyticsTracker;->getAppSnapshot(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    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;",
+        "T6:",
+        "Ljava/lang/Object;",
+        "T7:",
+        "Ljava/lang/Object;",
+        "T8:",
+        "Ljava/lang/Object;",
+        "T9:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func9<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;TR;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1;
+
+    invoke-direct {v0}, Lcom/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1;-><init>()V
+
+    sput-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    check-cast p2, Lcom/discord/models/domain/ModelChannel;
+
+    check-cast p3, Ljava/util/Map;
+
+    check-cast p4, Ljava/lang/Integer;
+
+    check-cast p5, Ljava/util/Map;
+
+    check-cast p6, Lcom/discord/models/domain/ModelGuild;
+
+    check-cast p7, Ljava/util/Map;
+
+    check-cast p8, Ljava/util/Map;
+
+    check-cast p9, Ljava/lang/Integer;
+
+    invoke-virtual/range {p0 .. p9}, Lcom/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1;->call(Ljava/lang/Long;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/Map;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Integer;)Ljava/util/Map;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Ljava/lang/Long;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/Map;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Integer;)Ljava/util/Map;
+    .locals 15
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelChannel;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelChannel;",
+            ">;",
+            "Ljava/lang/Integer;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelPresence;",
+            ">;",
+            "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/lang/Integer;",
+            ")",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+
+    move-object/from16 v0, p2
+
+    move-object/from16 v1, p8
+
+    const-string v2, "channel"
+
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "guildChannels"
+
+    move-object/from16 v3, p3
+
+    invoke-static {v3, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "channelPresences"
+
+    move-object/from16 v4, p5
+
+    invoke-static {v4, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "guildRoles"
+
+    move-object/from16 v5, p7
+
+    invoke-static {v5, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "guildMembers"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v2, 0x2
+
+    new-array v6, v2, [Lkotlin/Pair;
+
+    const/4 v7, 0x0
+
+    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v8
+
+    if-eqz p4, :cond_0
+
+    invoke-virtual/range {p4 .. p4}, Ljava/lang/Integer;->intValue()I
+
+    move-result v9
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v9, 0x0
+
+    :goto_0
+    invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v9
+
+    const-string v10, "channel_member_perms"
+
+    invoke-static {v10, v9}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v9
+
+    aput-object v9, v6, v7
+
+    invoke-interface/range {p5 .. p5}, Ljava/util/Map;->values()Ljava/util/Collection;
+
+    move-result-object v4
+
+    check-cast v4, Ljava/lang/Iterable;
+
+    instance-of v9, v4, Ljava/util/Collection;
+
+    const/4 v10, 0x1
+
+    if-eqz v9, :cond_1
+
+    move-object v9, v4
+
+    check-cast v9, Ljava/util/Collection;
+
+    invoke-interface {v9}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v9
+
+    if-eqz v9, :cond_1
+
+    const/4 v9, 0x0
+
+    goto :goto_3
+
+    :cond_1
+    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v4
+
+    const/4 v9, 0x0
+
+    :cond_2
+    :goto_1
+    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v11
+
+    if-eqz v11, :cond_4
+
+    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v11
+
+    check-cast v11, Lcom/discord/models/domain/ModelPresence;
+
+    invoke-virtual {v11}, Lcom/discord/models/domain/ModelPresence;->getStatus()I
+
+    move-result v11
+
+    const/4 v12, 0x4
+
+    if-ne v11, v12, :cond_3
+
+    const/4 v11, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v11, 0x0
+
+    :goto_2
+    if-eqz v11, :cond_2
+
+    add-int/lit8 v9, v9, 0x1
+
+    if-gez v9, :cond_2
+
+    invoke-static {}, Lkotlin/a/m;->DO()V
+
+    goto :goto_1
+
+    :cond_4
+    :goto_3
+    invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v4
+
+    const-string v9, "channel_size_online"
+
+    invoke-static {v9, v4}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v4
+
+    aput-object v4, v6, v10
+
+    invoke-static {v6}, Lkotlin/a/ad;->b([Lkotlin/Pair;)Ljava/util/Map;
+
+    move-result-object v4
+
+    sget-object v6, Lcom/discord/utilities/analytics/AnalyticsUtils;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsUtils;
+
+    invoke-virtual {v6, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils;->getProperties$app_productionDiscordExternalRelease(Lcom/discord/models/domain/ModelChannel;)Ljava/util/Map;
+
+    move-result-object v6
+
+    invoke-interface {v4, v6}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
+
+    invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelChannel;->getPermissionOverwrites()Ljava/util/Map;
+
+    move-result-object v6
+
+    invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v9
+
+    invoke-interface {v6, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v6
+
+    check-cast v6, Lcom/discord/models/domain/ModelPermissionOverwrite;
+
+    const/16 v9, 0x400
+
+    invoke-static {v6, v9}, Lcom/discord/models/domain/ModelPermissionOverwrite;->denies(Lcom/discord/models/domain/ModelPermissionOverwrite;I)Z
+
+    move-result v6
+
+    invoke-static {v6}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v6
+
+    const-string v9, "channel_hidden"
+
+    invoke-interface {v4, v9, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v6
+
+    invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v11
+
+    const-wide/16 v13, 0x0
+
+    cmp-long v6, v11, v13
+
+    if-lez v6, :cond_5
+
+    invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v0
+
+    const-string v6, "channel.guildId"
+
+    invoke-static {v0, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "guild_id"
+
+    invoke-interface {v4, v6, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_5
+    if-eqz p6, :cond_10
+
+    invoke-interface/range {p3 .. p3}, Ljava/util/Map;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_6
+
+    const/4 v6, 0x0
+
+    goto :goto_6
+
+    :cond_6
+    invoke-interface/range {p3 .. p3}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    const/4 v6, 0x0
+
+    :cond_7
+    :goto_4
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v9
+
+    if-eqz v9, :cond_9
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/Map$Entry;
+
+    invoke-interface {v9}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {v9}, Lcom/discord/models/domain/ModelChannel;->getType()I
+
+    move-result v9
+
+    if-ne v9, v2, :cond_8
+
+    const/4 v9, 0x1
+
+    goto :goto_5
+
+    :cond_8
+    const/4 v9, 0x0
+
+    :goto_5
+    if-eqz v9, :cond_7
+
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_4
+
+    :cond_9
+    :goto_6
+    invoke-interface/range {p3 .. p3}, Ljava/util/Map;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_a
+
+    goto :goto_9
+
+    :cond_a
+    invoke-interface/range {p3 .. p3}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    const/4 v3, 0x0
+
+    :cond_b
+    :goto_7
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v9
+
+    if-eqz v9, :cond_d
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/util/Map$Entry;
+
+    invoke-interface {v9}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {v9}, Lcom/discord/models/domain/ModelChannel;->getType()I
+
+    move-result v9
+
+    if-eq v9, v2, :cond_c
+
+    const/4 v9, 0x1
+
+    goto :goto_8
+
+    :cond_c
+    const/4 v9, 0x0
+
+    :goto_8
+    if-eqz v9, :cond_b
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_7
+
+    :cond_d
+    move v7, v3
+
+    :goto_9
+    invoke-interface/range {p8 .. p8}, Ljava/util/Map;->size()I
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    const-string v2, "guild_size_total"
+
+    invoke-interface {v4, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-object/from16 v0, p1
+
+    invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    if-eqz v0, :cond_e
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_e
+
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    goto :goto_a
+
+    :cond_e
+    move-object v0, v8
+
+    :goto_a
+    const-string v1, "guild_member_num_roles"
+
+    invoke-interface {v4, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    add-int v0, v7, v6
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    const-string v1, "guild_num_channels"
+
+    invoke-interface {v4, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    const-string v1, "guild_num_text_channels"
+
+    invoke-interface {v4, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    const-string v1, "guild_num_voice_channels"
+
+    invoke-interface {v4, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-interface/range {p7 .. p7}, Ljava/util/Map;->size()I
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    const-string v1, "guild_num_roles"
+
+    invoke-interface {v4, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    if-nez p9, :cond_f
+
+    goto :goto_b
+
+    :cond_f
+    move-object/from16 v8, p9
+
+    :goto_b
+    const-string v0, "guild_member_perms"
+
+    invoke-interface {v4, v0, v8}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-virtual/range {p6 .. p6}, Lcom/discord/models/domain/ModelGuild;->isVip()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    const-string v1, "guild_is_vip"
+
+    invoke-interface {v4, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_10
+    return-object v4
+.end method
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 22723a680b..d5c30d7466 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
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->invoke(Ljava/util/Set;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackFor$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackFor$1.smali
new file mode 100644
index 0000000000..18c8f8b0cc
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackFor$1.smali
@@ -0,0 +1,100 @@
+.class final Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$1;
+.super Ljava/lang/Object;
+.source "AnalyticsTracker.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/analytics/AnalyticsTracker;->trackFor(Ljava/lang/String;JLjava/util/Map;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TR;>;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$1;
+
+    invoke-direct {v0}, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$1;-><init>()V
+
+    sput-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$1;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$1;->call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelChannel;",
+            ")",
+            "Lrx/Observable<",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/Object;",
+            ">;>;"
+        }
+    .end annotation
+
+    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+
+    const-string v1, "channel"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->access$getAppSnapshot(Lcom/discord/utilities/analytics/AnalyticsTracker;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackFor$2.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackFor$2.smali
new file mode 100644
index 0000000000..89bfd0ef1b
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackFor$2.smali
@@ -0,0 +1,107 @@
+.class final Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$2;
+.super Lkotlin/jvm/internal/l;
+.source "AnalyticsTracker.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/analytics/AnalyticsTracker;->trackFor(Ljava/lang/String;JLjava/util/Map;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "Ljava/lang/Object;",
+        ">;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $eventName:Ljava/lang/String;
+
+.field final synthetic $properties:Ljava/util/Map;
+
+
+# direct methods
+.method constructor <init>(Ljava/util/Map;Ljava/lang/String;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$2;->$properties:Ljava/util/Map;
+
+    iput-object p2, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$2;->$eventName:Ljava/lang/String;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$2;->invoke(Ljava/util/Map;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/util/Map;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/Object;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "appSnapshotProps"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$2;->$properties:Ljava/util/Map;
+
+    invoke-static {p1, v0}, Lkotlin/a/ad;->a(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getTracker()Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$2;->$eventName:Ljava/lang/String;
+
+    sget-object v2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+
+    invoke-static {v2, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->access$filterNonNullValues(Lcom/discord/utilities/analytics/AnalyticsTracker;Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object p1
+
+    invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackFor$3.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackFor$3.smali
new file mode 100644
index 0000000000..a5e3dd9f48
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackFor$3.smali
@@ -0,0 +1,89 @@
+.class final Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$3;
+.super Lkotlin/jvm/internal/l;
+.source "AnalyticsTracker.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/analytics/AnalyticsTracker;->trackFor(Ljava/lang/String;JLjava/util/Map;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/error/Error;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $eventName:Ljava/lang/String;
+
+.field final synthetic $properties:Ljava/util/Map;
+
+
+# direct methods
+.method constructor <init>(Ljava/lang/String;Ljava/util/Map;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$3;->$eventName:Ljava/lang/String;
+
+    iput-object p2, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$3;->$properties:Ljava/util/Map;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/error/Error;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$3;->invoke(Lcom/discord/utilities/error/Error;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/utilities/error/Error;)V
+    .locals 2
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/error/Error;->setShowErrorToasts(Z)V
+
+    sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+
+    invoke-virtual {p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getTracker()Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$3;->$eventName:Ljava/lang/String;
+
+    iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$3;->$properties:Ljava/util/Map;
+
+    invoke-virtual {p1, v0, v1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
+
+    return-void
+.end method
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 31cecbc978..c7ddba5c94 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
@@ -64,7 +64,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1;->invoke(Ljava/util/Map;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -147,7 +147,7 @@
 
     check-cast v2, Lkotlin/jvm/functions/Function0;
 
-    const-wide/16 v3, 0x3a98
+    const-wide/32 v3, 0xdbba0
 
     invoke-virtual {v0, v1, v3, v4, v2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V
 
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 31f5d394c9..38aaf813e6 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1;->invoke(Ljava/util/Map;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$1.smali
index 26b7ab5e08..165746f961 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$1.smali
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$1;->invoke(Ljava/util/Map;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 83282300df..a1fd5cd427 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker$voiceChannelLeave$1;->invoke(Ljava/util/Map;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 a4bd87b11a..e48e2d129d 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
@@ -22,11 +22,11 @@
 
 .field public static final INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-.field private static final THROTTLE_LONG:J = 0x3a98L
+.field private static final THROTTLE_LONG:J = 0xdbba0L
 
-.field private static final THROTTLE_MEDIUM:J = 0x1388L
+.field private static final THROTTLE_MEDIUM:J = 0x493e0L
 
-.field private static final THROTTLE_SHORT:J = 0x3e8L
+.field private static final THROTTLE_SHORT:J = 0xea60L
 
 .field private static appOpenTimestamp:Ljava/lang/Long;
 
@@ -92,6 +92,16 @@
     return-object p0
 .end method
 
+.method public static final synthetic access$getAppSnapshot(Lcom/discord/utilities/analytics/AnalyticsTracker;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getAppSnapshot(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
 .method public static synthetic accountLinkFailed$default(Lcom/discord/utilities/analytics/AnalyticsTracker;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
     .locals 1
 
@@ -196,7 +206,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v0
 
@@ -242,7 +252,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object p1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker$addAttachment$2;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$addAttachment$2;
 
@@ -426,7 +436,7 @@
 
     sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
-    const-wide/16 v2, 0x1388
+    const-wide/32 v2, 0x493e0
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -1014,6 +1024,180 @@
     return-void
 .end method
 
+.method private final getAppSnapshot(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+    .locals 12
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelChannel;",
+            ")",
+            "Lrx/Observable<",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/Object;",
+            ">;>;"
+        }
+    .end annotation
+
+    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
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeId()Lrx/Observable;
+
+    move-result-object v1
+
+    invoke-static {p1}, Lrx/Observable;->bI(Ljava/lang/Object;)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;->getChannels()Lcom/discord/stores/StoreChannels;
+
+    move-result-object v3
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v0
+
+    const-string v9, "guildId"
+
+    invoke-static {v0, v9}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v4
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x2
+
+    const/4 v8, 0x0
+
+    invoke-static/range {v3 .. v8}, Lcom/discord/stores/StoreChannels;->getForGuild$default(Lcom/discord/stores/StoreChannels;JLjava/lang/Integer;ILjava/lang/Object;)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;->getPermissions()Lcom/discord/stores/StorePermissions;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v4
+
+    invoke-virtual {v0, v4, v5}, Lcom/discord/stores/StorePermissions;->getForChannel(J)Lrx/Observable;
+
+    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;->getPresences()Lcom/discord/stores/StoreUserPresence;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUserPresence;->get()Lrx/Observable;
+
+    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;->getGuilds()Lcom/discord/stores/StoreGuilds;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v6
+
+    invoke-static {v6, v9}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v6
+
+    invoke-virtual {v0, v6, v7}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable;
+
+    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;->getGuilds()Lcom/discord/stores/StoreGuilds;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v7
+
+    invoke-static {v7, v9}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v7}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v7
+
+    invoke-virtual {v0, v7, v8}, Lcom/discord/stores/StoreGuilds;->getRoles(J)Lrx/Observable;
+
+    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;->getGuilds()Lcom/discord/stores/StoreGuilds;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v8
+
+    invoke-static {v8, v9}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v8}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v10
+
+    invoke-virtual {v0, v10, v11}, Lcom/discord/stores/StoreGuilds;->getComputed(J)Lrx/Observable;
+
+    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;->getPermissions()Lcom/discord/stores/StorePermissions;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object p1
+
+    invoke-static {p1, v9}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v9
+
+    invoke-virtual {v0, v9, v10}, Lcom/discord/stores/StorePermissions;->getForGuild(J)Lrx/Observable;
+
+    move-result-object v9
+
+    sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1;
+
+    move-object v10, p1
+
+    check-cast v10, Lrx/functions/Func9;
+
+    invoke-static/range {v1 .. v10}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func9;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
 .method private final getFabricTracker()Lcom/crashlytics/android/answers/Answers;
     .locals 1
 
@@ -1435,11 +1619,15 @@
 
     move-result-object v0
 
+    const-string v1, "it"
+
     if-eqz v0, :cond_0
 
-    const-string v1, "uri_host"
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    const-string v2, "uri_host"
+
+    invoke-interface {p1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
     invoke-virtual {p2}, Landroid/net/Uri;->getScheme()Ljava/lang/String;
@@ -1448,6 +1636,8 @@
 
     if-eqz v0, :cond_1
 
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-string v1, "uri_scheme"
 
     invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -1518,10 +1708,6 @@
 
     :cond_5
     :goto_2
-    const-string v0, "if (path.length > 100) p\u2026ubstring(0, 99) else path"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     const-string v0, "uri_path"
 
     invoke-interface {p1, v0, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -1774,7 +1960,7 @@
 .end method
 
 .method public static final inviteShareClicked(Lcom/discord/models/domain/ModelInvite;)V
-    .locals 4
+    .locals 5
 
     if-nez p0, :cond_0
 
@@ -1884,21 +2070,29 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_6
 
     new-instance v1, Lcom/crashlytics/android/answers/ai;
 
     invoke-direct {v1}, Lcom/crashlytics/android/answers/ai;-><init>()V
 
-    const-string v2, "invite"
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ai;->pG:Lcom/crashlytics/android/answers/b;
 
-    invoke-virtual {v1, v2}, Lcom/crashlytics/android/answers/ai;->J(Ljava/lang/String;)Lcom/crashlytics/android/answers/ai;
+    const-string v3, "invite"
+
+    const-string v4, "contentType"
+
+    invoke-virtual {v2, v4, v3}, Lcom/crashlytics/android/answers/b;->put(Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelInvite;->getCode()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {v1, v2}, Lcom/crashlytics/android/answers/ai;->I(Ljava/lang/String;)Lcom/crashlytics/android/answers/ai;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/ai;->pG:Lcom/crashlytics/android/answers/b;
+
+    const-string v4, "contentId"
+
+    invoke-virtual {v3, v4, v2}, Lcom/crashlytics/android/answers/b;->put(Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -1929,9 +2123,26 @@
     invoke-virtual {v1, v2, p0}, Lcom/crashlytics/android/answers/ai;->a(Ljava/lang/String;Ljava/lang/Number;)Lcom/crashlytics/android/answers/c;
 
     :cond_4
-    invoke-virtual {v0, v1}, Lcom/crashlytics/android/answers/Answers;->a(Lcom/crashlytics/android/answers/ai;)V
+    iget-boolean p0, v0, Lcom/crashlytics/android/answers/Answers;->oJ:Z
+
+    if-eqz p0, :cond_5
+
+    const-string p0, "logShare"
+
+    invoke-static {p0}, Lcom/crashlytics/android/answers/Answers;->D(Ljava/lang/String;)V
+
+    return-void
 
     :cond_5
+    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
+
+    if-eqz p0, :cond_6
+
+    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
+
+    invoke-virtual {p0, v1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
+
+    :cond_6
     return-void
 .end method
 
@@ -2268,7 +2479,7 @@
     :goto_1
     if-eqz p1, :cond_2
 
-    invoke-static {p1}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p1}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p1
 
@@ -2486,6 +2697,112 @@
     return-object p2
 .end method
 
+.method private final trackFor(Ljava/lang/String;JLjava/util/Map;)V
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "J",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "+",
+            "Ljava/lang/Object;",
+            ">;)V"
+        }
+    .end annotation
+
+    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 v0
+
+    invoke-virtual {v0, p2, p3}, Lcom/discord/stores/StoreChannels;->get(J)Lrx/Observable;
+
+    move-result-object p2
+
+    sget-object p3, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
+
+    check-cast p3, Lrx/functions/b;
+
+    invoke-virtual {p2, p3}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p2
+
+    sget-object p3, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
+
+    check-cast p3, Lrx/functions/b;
+
+    invoke-virtual {p2, p3}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p2
+
+    const-string p3, "filter { it != null }.map { it!! }"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p3, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$1;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$1;
+
+    check-cast p3, Lrx/functions/b;
+
+    invoke-virtual {p2, p3}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string p2, "StoreStream\n          .g\u2026hannel.getAppSnapshot() }"
+
+    invoke-static {v0, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v1, 0x1f4
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x2
+
+    const/4 v5, 0x0
+
+    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object p2
+
+    invoke-static {p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance p2, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$2;
+
+    invoke-direct {p2, p4, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$2;-><init>(Ljava/util/Map;Ljava/lang/String;)V
+
+    move-object v4, p2
+
+    check-cast v4, Lkotlin/jvm/functions/Function1;
+
+    new-instance p2, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$3;
+
+    invoke-direct {p2, p1, p4}, Lcom/discord/utilities/analytics/AnalyticsTracker$trackFor$3;-><init>(Ljava/lang/String;Ljava/util/Map;)V
+
+    move-object v5, p2
+
+    check-cast v5, Lkotlin/jvm/functions/Function1;
+
+    const/4 v1, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x24
+
+    const/4 v8, 0x0
+
+    move-object v2, p1
+
+    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
+.end method
+
 .method private final trackUserVoiceEvent(Lcom/discord/models/domain/ModelChannel;JLjava/lang/String;Lkotlin/Pair;)V
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
@@ -2503,7 +2820,7 @@
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
-    const-wide/16 v1, 0x3a98
+    const-wide/32 v1, 0xdbba0
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -2578,7 +2895,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     sget-object p2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -2794,7 +3111,7 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function0;
 
-    const-wide/16 v2, 0x3a98
+    const-wide/32 v2, 0xdbba0
 
     invoke-virtual {v0, p1, v2, v3, v1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V
 
@@ -3844,7 +4161,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;
 
@@ -3945,7 +4262,7 @@
 .end method
 
 .method public final loginAttempt(ZZ)V
-    .locals 3
+    .locals 5
 
     if-eqz p1, :cond_0
 
@@ -3958,17 +4275,29 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_3
 
     new-instance v1, Lcom/crashlytics/android/answers/v;
 
     invoke-direct {v1}, Lcom/crashlytics/android/answers/v;-><init>()V
 
-    const-string v2, "email"
+    iget-object v2, v1, Lcom/crashlytics/android/answers/v;->pG:Lcom/crashlytics/android/answers/b;
 
-    invoke-virtual {v1, v2}, Lcom/crashlytics/android/answers/v;->H(Ljava/lang/String;)Lcom/crashlytics/android/answers/v;
+    const-string v3, "email"
 
-    invoke-virtual {v1, p1}, Lcom/crashlytics/android/answers/v;->m(Z)Lcom/crashlytics/android/answers/v;
+    const-string v4, "method"
+
+    invoke-virtual {v2, v4, v3}, Lcom/crashlytics/android/answers/b;->put(Ljava/lang/String;Ljava/lang/String;)V
+
+    iget-object v2, v1, Lcom/crashlytics/android/answers/v;->pG:Lcom/crashlytics/android/answers/b;
+
+    invoke-static {p1}, Ljava/lang/Boolean;->toString(Z)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v3, "success"
+
+    invoke-virtual {v2, v3, p1}, Lcom/crashlytics/android/answers/b;->put(Ljava/lang/String;Ljava/lang/String;)V
 
     if-eqz p2, :cond_1
 
@@ -3981,9 +4310,26 @@
     invoke-virtual {v1, p2, p1}, Lcom/crashlytics/android/answers/v;->f(Ljava/lang/String;Ljava/lang/String;)Lcom/crashlytics/android/answers/c;
 
     :cond_1
-    invoke-virtual {v0, v1}, Lcom/crashlytics/android/answers/Answers;->a(Lcom/crashlytics/android/answers/v;)V
+    iget-boolean p1, v0, Lcom/crashlytics/android/answers/Answers;->oJ:Z
+
+    if-eqz p1, :cond_2
+
+    const-string p1, "logLogin"
+
+    invoke-static {p1}, Lcom/crashlytics/android/answers/Answers;->D(Ljava/lang/String;)V
+
+    return-void
 
     :cond_2
+    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
+
+    if-eqz p1, :cond_3
+
+    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
+
+    invoke-virtual {p1, v1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
+
+    :cond_3
     return-void
 .end method
 
@@ -4831,7 +5177,7 @@
     return-void
 
     :cond_d
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/StringBuilder;
 
@@ -4899,7 +5245,7 @@
 .end method
 
 .method public final registered(Z)V
-    .locals 3
+    .locals 5
 
     if-eqz p1, :cond_0
 
@@ -4912,24 +5258,188 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
     new-instance v1, Lcom/crashlytics/android/answers/aj;
 
     invoke-direct {v1}, Lcom/crashlytics/android/answers/aj;-><init>()V
 
-    const-string v2, "email"
+    iget-object v2, v1, Lcom/crashlytics/android/answers/aj;->pG:Lcom/crashlytics/android/answers/b;
 
-    invoke-virtual {v1, v2}, Lcom/crashlytics/android/answers/aj;->K(Ljava/lang/String;)Lcom/crashlytics/android/answers/aj;
+    const-string v3, "email"
 
-    invoke-virtual {v1, p1}, Lcom/crashlytics/android/answers/aj;->n(Z)Lcom/crashlytics/android/answers/aj;
+    const-string v4, "method"
 
-    invoke-virtual {v0, v1}, Lcom/crashlytics/android/answers/Answers;->a(Lcom/crashlytics/android/answers/aj;)V
+    invoke-virtual {v2, v4, v3}, Lcom/crashlytics/android/answers/b;->put(Ljava/lang/String;Ljava/lang/String;)V
+
+    iget-object v2, v1, Lcom/crashlytics/android/answers/aj;->pG:Lcom/crashlytics/android/answers/b;
+
+    invoke-static {p1}, Ljava/lang/Boolean;->toString(Z)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v3, "success"
+
+    invoke-virtual {v2, v3, p1}, Lcom/crashlytics/android/answers/b;->put(Ljava/lang/String;Ljava/lang/String;)V
+
+    iget-boolean p1, v0, Lcom/crashlytics/android/answers/Answers;->oJ:Z
+
+    if-eqz p1, :cond_1
+
+    const-string p1, "logSignUp"
+
+    invoke-static {p1}, Lcom/crashlytics/android/answers/Answers;->D(Ljava/lang/String;)V
+
+    return-void
 
     :cond_1
+    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
+
+    if-eqz p1, :cond_2
+
+    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->oK:Lcom/crashlytics/android/answers/ac;
+
+    invoke-virtual {p1, v1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
+
+    :cond_2
     return-void
 .end method
 
+.method public final reportStreamProblem(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;Lcom/discord/models/domain/ModelApplicationStream;Ljava/lang/String;)V
+    .locals 3
+
+    const-string v0, "problem"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "stream"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/HashMap;
+
+    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->NONE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    if-eq p1, v1, :cond_0
+
+    move-object v1, v0
+
+    check-cast v1, Ljava/util/Map;
+
+    sget-object v2, Lcom/discord/utilities/analytics/AnalyticsTracker$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result p1
+
+    aget p1, v2, p1
+
+    packed-switch p1, :pswitch_data_0
+
+    const-string p1, ""
+
+    goto :goto_0
+
+    :pswitch_0
+    const-string p1, "AUDIO_POOR"
+
+    goto :goto_0
+
+    :pswitch_1
+    const-string p1, "AUDIO_MISSING"
+
+    goto :goto_0
+
+    :pswitch_2
+    const-string p1, "OUT_OF_SYNC"
+
+    goto :goto_0
+
+    :pswitch_3
+    const-string p1, "LAGGING"
+
+    goto :goto_0
+
+    :pswitch_4
+    const-string p1, "BLURRY"
+
+    goto :goto_0
+
+    :pswitch_5
+    const-string p1, "BLACK_SCREEN"
+
+    :goto_0
+    const-string v2, "reason"
+
+    invoke-interface {v1, v2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_0
+    check-cast v0, Ljava/util/Map;
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelApplicationStream;->getOwnerId()J
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v1, "streamer_user_id"
+
+    invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v1, "stream_channel_id"
+
+    invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelApplicationStream;->getGuildId()J
+
+    move-result-wide p1
+
+    invoke-static {p1, p2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string p2, "guild_id"
+
+    invoke-interface {v0, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    if-eqz p3, :cond_1
+
+    const-string p1, "media_session_id"
+
+    invoke-interface {v0, p1, p3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_1
+    sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
+
+    const-string p2, "stream_report_problem"
+
+    invoke-virtual {p1, p2, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
+
+    return-void
+
+    :pswitch_data_0
+    .packed-switch 0x1
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
 .method public final settingsPaneViewed(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
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 680e7c8108..25bc9ca854 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
@@ -133,7 +133,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v2
 
@@ -345,7 +345,7 @@
 
     move-object v2, p2
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance p2, Ljava/lang/StringBuilder;
 
@@ -685,7 +685,7 @@
 .end method
 
 .method public final trackFireBase(Ljava/lang/String;Ljava/util/Map;)V
-    .locals 1
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -712,18 +712,55 @@
 
     invoke-direct {p0, v0, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->putMap(Landroid/os/Bundle;Ljava/util/Map;)Landroid/os/Bundle;
 
+    move-result-object v4
+
+    sget-object p2, Lcom/discord/utilities/analytics/AnalyticsUtils;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsUtils;
+
+    invoke-static {p2}, Lcom/discord/utilities/analytics/AnalyticsUtils;->access$getFireBaseInstance$p(Lcom/discord/utilities/analytics/AnalyticsUtils;)Lcom/google/firebase/analytics/FirebaseAnalytics;
+
     move-result-object p2
 
-    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsUtils;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsUtils;
+    if-eqz p2, :cond_1
 
-    invoke-static {v0}, Lcom/discord/utilities/analytics/AnalyticsUtils;->access$getFireBaseInstance$p(Lcom/discord/utilities/analytics/AnalyticsUtils;)Lcom/google/firebase/analytics/FirebaseAnalytics;
-
-    move-result-object v0
+    iget-boolean v0, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1, p2}, Lcom/google/firebase/analytics/FirebaseAnalytics;->b(Ljava/lang/String;Landroid/os/Bundle;)V
+    iget-object p2, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTC:Lcom/google/android/gms/internal/measurement/lw;
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p2, v0, p1, v4, v1}, Lcom/google/android/gms/internal/measurement/lw;->a(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;Z)V
+
+    return-void
 
     :cond_0
+    iget-object p2, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->aDp:Lcom/google/android/gms/measurement/internal/ek;
+
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
+
+    move-result-object v1
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x1
+
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
+
+    move-result-object p2
+
+    invoke-interface {p2}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
+
+    move-result-wide v7
+
+    const-string v2, "app"
+
+    move-object v3, p1
+
+    invoke-virtual/range {v1 .. v8}, Lcom/google/android/gms/measurement/internal/fr;->logEvent(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;ZZJ)V
+
+    :cond_1
     return-void
 .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 9c06c84f56..6e742c512d 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1;->invoke(Lcom/discord/models/domain/ModelUser;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -91,7 +91,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1, v0}, Lcom/google/firebase/analytics/FirebaseAnalytics;->dq(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/firebase/analytics/FirebaseAnalytics;->cc(Ljava/lang/String;)V
 
     :cond_0
     return-void
@@ -113,7 +113,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lcom/google/firebase/analytics/FirebaseAnalytics;->dq(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/firebase/analytics/FirebaseAnalytics;->cc(Ljava/lang/String;)V
 
     :cond_2
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
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 09f9754b7f..98b133f99d 100644
--- a/com.discord/smali/com/discord/utilities/analytics/Traits$Payment.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/Traits$Payment.smali
@@ -338,12 +338,20 @@
 
     iget v2, p0, Lcom/discord/utilities/analytics/Traits$Payment;->price:I
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget v2, p0, Lcom/discord/utilities/analytics/Traits$Payment;->regularPrice:I
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
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 d64d0f7a1a..f4db815d27 100644
--- a/com.discord/smali/com/discord/utilities/analytics/Traits$Subscription.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/Traits$Subscription.smali
@@ -222,7 +222,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/utilities/analytics/Traits$Subscription;->gatewayPlanId:Ljava/lang/String;
 
@@ -242,21 +242,21 @@
 
     iget v1, p0, Lcom/discord/utilities/analytics/Traits$Subscription;->type:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v1, p0, Lcom/discord/utilities/analytics/Traits$Subscription;->planId:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
 .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 dd9ab650a2..460d32e72e 100644
--- a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
@@ -474,7 +474,7 @@
     const/16 v4, 0x3f
 
     :goto_2
-    invoke-virtual {v3, v4}, Lokio/c;->dP(I)Lokio/c;
+    invoke-virtual {v3, v4}, Lokio/c;->dL(I)Lokio/c;
 
     invoke-static {v0}, Ljava/lang/Character;->charCount(I)I
 
@@ -492,7 +492,7 @@
     throw p0
 
     :cond_3
-    invoke-virtual {v3}, Lokio/c;->IA()Ljava/lang/String;
+    invoke-virtual {v3}, Lokio/c;->In()Ljava/lang/String;
 
     move-result-object p0
 
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 b41efe553c..3e12c4e189 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
@@ -73,28 +73,26 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;)Z
-    .locals 0
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Ljava/lang/CharSequence;
 
-    if-eqz p1, :cond_1
-
     invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
 
     move-result p1
 
     if-nez p1, :cond_0
 
-    goto :goto_0
+    const/4 p1, 0x1
+
+    return p1
 
     :cond_0
     const/4 p1, 0x0
 
     return p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x1
-
-    return 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 c754f5fa01..70ca539c3e 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
@@ -126,7 +126,7 @@
     :try_start_1
     new-array v5, v12, [Ljava/lang/Object;
 
-    sget-object v8, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object v8, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
     const-string v8, "#%06X"
 
@@ -1204,7 +1204,7 @@
     :catch_0
     move-exception v0
 
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v4, Ljava/lang/StringBuilder;
 
@@ -1257,7 +1257,7 @@
     goto :goto_6
 
     :catch_1
-    sget-object v5, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v5, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -1334,9 +1334,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f120818
+    const v0, 0x7f120834
 
-    const v1, 0x7f120817
+    const v1, 0x7f120833
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1353,9 +1353,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f120816
+    const v0, 0x7f120832
 
-    const v1, 0x7f120815
+    const v1, 0x7f120831
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1372,9 +1372,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f12081b
+    const v0, 0x7f120837
 
-    const v1, 0x7f12081a
+    const v1, 0x7f120836
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1391,7 +1391,7 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f120814
+    const p1, 0x7f120830
 
     return p1
 
@@ -1418,7 +1418,7 @@
 
     if-nez p1, :cond_1
 
-    const p1, 0x7f12080d
+    const p1, 0x7f120829
 
     return p1
 
@@ -1427,7 +1427,7 @@
 
     if-ne p1, v0, :cond_2
 
-    const p1, 0x7f12080e
+    const p1, 0x7f12082a
 
     return p1
 
@@ -1456,9 +1456,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f12080c
+    const v0, 0x7f120828
 
-    const v1, 0x7f12080b
+    const v1, 0x7f120827
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1475,7 +1475,7 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f120813
+    const p1, 0x7f12082f
 
     return p1
 
@@ -1488,9 +1488,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f120808
+    const v0, 0x7f120824
 
-    const v1, 0x7f120807
+    const v1, 0x7f120823
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1507,7 +1507,7 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f120820
+    const p1, 0x7f12083c
 
     return p1
 
@@ -1568,9 +1568,9 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f120824
+    const v0, 0x7f120840
 
-    const v1, 0x7f120823
+    const v1, 0x7f12083f
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1587,7 +1587,7 @@
 
     if-eqz p1, :cond_3
 
-    const p1, 0x7f120820
+    const p1, 0x7f12083c
 
     return p1
 
@@ -1631,7 +1631,7 @@
 
     const-string p1, ""
 
-    return-object p1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
@@ -1652,7 +1652,7 @@
 
     move-result-object p1
 
-    return-object p1
+    goto :goto_0
 
     :cond_1
     invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
@@ -1673,7 +1673,7 @@
 
     move-result-object p1
 
-    return-object p1
+    goto :goto_0
 
     :cond_2
     invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
@@ -1694,7 +1694,7 @@
 
     move-result-object p1
 
-    return-object p1
+    goto :goto_0
 
     :cond_3
     invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
@@ -1713,7 +1713,7 @@
 
     move-result-object p1
 
-    return-object p1
+    goto :goto_0
 
     :cond_4
     invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
@@ -1736,15 +1736,20 @@
 
     move-result-object p1
 
-    return-object p1
+    goto :goto_0
 
     :cond_5
-    const p1, 0x7f120be3
+    const p1, 0x7f120c15
 
     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      }"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-object p1
 .end method
 
@@ -1799,14 +1804,14 @@
 
     if-ne p1, v5, :cond_1
 
-    const p1, 0x7f120845
+    const p1, 0x7f120862
 
     return p1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f120844
+    const p1, 0x7f120861
 
     return p1
 
@@ -1835,7 +1840,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120835
+    const p1, 0x7f120851
 
     return p1
 
@@ -1848,9 +1853,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f120843
+    const v0, 0x7f120860
 
-    const v1, 0x7f120842
+    const v1, 0x7f12085f
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1867,9 +1872,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f12083c
+    const v0, 0x7f120859
 
-    const v1, 0x7f12083b
+    const v1, 0x7f120858
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1907,12 +1912,12 @@
     return v1
 
     :cond_4
-    const p1, 0x7f12082b
+    const p1, 0x7f120847
 
     return p1
 
     :cond_5
-    const p1, 0x7f12082a
+    const p1, 0x7f120846
 
     return p1
 
@@ -1953,12 +1958,12 @@
     return v1
 
     :cond_7
-    const p1, 0x7f120833
+    const p1, 0x7f12084f
 
     return p1
 
     :cond_8
-    const p1, 0x7f120832
+    const p1, 0x7f12084e
 
     return p1
 
@@ -1978,7 +1983,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120837
+    const p1, 0x7f120854
 
     return p1
 
@@ -1991,7 +1996,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120834
+    const p1, 0x7f120850
 
     return p1
 
@@ -2004,7 +2009,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120828
+    const p1, 0x7f120844
 
     return p1
 
@@ -2048,27 +2053,27 @@
     return v1
 
     :cond_a
-    const p1, 0x7f120841
+    const p1, 0x7f12085e
 
     return p1
 
     :cond_b
-    const p1, 0x7f12083d
+    const p1, 0x7f12085a
 
     return p1
 
     :cond_c
-    const p1, 0x7f12083f
+    const p1, 0x7f12085c
 
     return p1
 
     :cond_d
-    const p1, 0x7f12083e
+    const p1, 0x7f12085b
 
     return p1
 
     :cond_e
-    const p1, 0x7f120840
+    const p1, 0x7f12085d
 
     return p1
 
@@ -2088,7 +2093,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120836
+    const p1, 0x7f120853
 
     return p1
 
@@ -2101,7 +2106,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120820
+    const p1, 0x7f12083c
 
     return p1
 
@@ -2114,9 +2119,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f120839
+    const v0, 0x7f120856
 
-    const v1, 0x7f120838
+    const v1, 0x7f120855
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -2133,7 +2138,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120831
+    const p1, 0x7f12084d
 
     return p1
 
@@ -2146,9 +2151,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f120827
+    const v0, 0x7f120843
 
-    const v1, 0x7f120826
+    const v1, 0x7f120842
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -2188,17 +2193,17 @@
     return v1
 
     :cond_10
-    const p1, 0x7f12082e
+    const p1, 0x7f12084a
 
     return p1
 
     :cond_11
-    const p1, 0x7f120830
+    const p1, 0x7f12084c
 
     return p1
 
     :cond_12
-    const p1, 0x7f12082f
+    const p1, 0x7f12084b
 
     return p1
 
@@ -2218,7 +2223,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120829
+    const p1, 0x7f120845
 
     return p1
 
@@ -2297,14 +2302,14 @@
 
     if-ne p1, v0, :cond_1
 
-    const p1, 0x7f12084f
+    const p1, 0x7f12086c
 
     return p1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f12084e
+    const p1, 0x7f12086b
 
     return p1
 
@@ -2349,12 +2354,12 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f12084a
+    const p1, 0x7f120867
 
     return p1
 
     :cond_4
-    const p1, 0x7f12084b
+    const p1, 0x7f120868
 
     return p1
 
@@ -2390,12 +2395,12 @@
 
     if-eqz p1, :cond_6
 
-    const p1, 0x7f12084c
+    const p1, 0x7f120869
 
     return p1
 
     :cond_6
-    const p1, 0x7f12084d
+    const p1, 0x7f12086a
 
     return p1
 
@@ -2415,7 +2420,7 @@
 
     if-eqz p1, :cond_8
 
-    const p1, 0x7f120847
+    const p1, 0x7f120864
 
     return p1
 
@@ -2428,7 +2433,7 @@
 
     if-eqz p1, :cond_8
 
-    const p1, 0x7f120820
+    const p1, 0x7f12083c
 
     return p1
 
@@ -2441,7 +2446,7 @@
 
     if-eqz p1, :cond_8
 
-    const p1, 0x7f120846
+    const p1, 0x7f120863
 
     return p1
 
@@ -2771,7 +2776,7 @@
 
     if-eqz p2, :cond_9
 
-    const p2, 0x7f120814
+    const p2, 0x7f120830
 
     new-array p3, v4, [Ljava/lang/Object;
 
@@ -2822,7 +2827,7 @@
 
     if-eqz p2, :cond_9
 
-    const p2, 0x7f120813
+    const p2, 0x7f12082f
 
     new-array p3, v4, [Ljava/lang/Object;
 
@@ -3184,14 +3189,14 @@
 
     if-ne p1, v3, :cond_1
 
-    const p1, 0x7f120869
+    const p1, 0x7f120886
 
     return p1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f120868
+    const p1, 0x7f120885
 
     return p1
 
@@ -3236,12 +3241,12 @@
 
     if-nez p1, :cond_4
 
-    const p1, 0x7f120865
+    const p1, 0x7f120882
 
     return p1
 
     :cond_4
-    const p1, 0x7f120863
+    const p1, 0x7f120880
 
     return p1
 
@@ -3263,7 +3268,7 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f12086f
+    const p1, 0x7f12088c
 
     return p1
 
@@ -3290,14 +3295,14 @@
 
     if-ne p1, v3, :cond_6
 
-    const p1, 0x7f12086b
+    const p1, 0x7f120888
 
     return p1
 
     :cond_6
     if-nez p1, :cond_7
 
-    const p1, 0x7f12086a
+    const p1, 0x7f120887
 
     return p1
 
@@ -3324,9 +3329,9 @@
 
     if-eqz v0, :cond_9
 
-    const v0, 0x7f12086d
+    const v0, 0x7f12088a
 
-    const v1, 0x7f12086c
+    const v1, 0x7f120889
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -3343,7 +3348,7 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f12086e
+    const p1, 0x7f12088b
 
     return p1
 
@@ -3356,7 +3361,7 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f120820
+    const p1, 0x7f12083c
 
     return p1
 
@@ -3398,127 +3403,127 @@
     return p1
 
     :sswitch_0
-    const p1, 0x7f120b13
+    const p1, 0x7f120b42
 
     return p1
 
     :sswitch_1
-    const p1, 0x7f120b22
+    const p1, 0x7f120b52
 
     return p1
 
     :sswitch_2
-    const p1, 0x7f120b1c
+    const p1, 0x7f120b4c
 
     return p1
 
     :sswitch_3
-    const p1, 0x7f120b18
+    const p1, 0x7f120b48
 
     return p1
 
     :sswitch_4
-    const p1, 0x7f120392
+    const p1, 0x7f120397
 
     return p1
 
     :sswitch_5
-    const p1, 0x7f1211e7
+    const p1, 0x7f12122e
 
     return p1
 
     :sswitch_6
-    const p1, 0x7f120b7b
+    const p1, 0x7f120bac
 
     return p1
 
     :sswitch_7
-    const p1, 0x7f1204bb
+    const p1, 0x7f1204c5
 
     return p1
 
     :sswitch_8
-    const p1, 0x7f120b87
+    const p1, 0x7f120bb8
 
     return p1
 
     :sswitch_9
-    const p1, 0x7f12104a
+    const p1, 0x7f121087
 
     return p1
 
     :sswitch_a
-    const p1, 0x7f120413
+    const p1, 0x7f12041a
 
     return p1
 
     :sswitch_b
-    const p1, 0x7f1211e4
+    const p1, 0x7f12122b
 
     return p1
 
     :sswitch_c
-    const p1, 0x7f120b3e
+    const p1, 0x7f120b6f
 
     return p1
 
     :sswitch_d
-    const p1, 0x7f120ea9
+    const p1, 0x7f120edf
 
     return p1
 
     :sswitch_e
-    const p1, 0x7f12025c
+    const p1, 0x7f12025f
 
     return p1
 
     :sswitch_f
-    const p1, 0x7f120559
+    const p1, 0x7f120564
 
     return p1
 
     :sswitch_10
-    const p1, 0x7f120b16
+    const p1, 0x7f120b45
 
     return p1
 
     :sswitch_11
-    const p1, 0x7f120fce
+    const p1, 0x7f121008
 
     return p1
 
     :sswitch_12
-    const p1, 0x7f120fcc
+    const p1, 0x7f121006
 
     return p1
 
     :sswitch_13
-    const p1, 0x7f120eaa
+    const p1, 0x7f120ee0
 
     return p1
 
     :sswitch_14
-    const p1, 0x7f121081
+    const p1, 0x7f1210be
 
     return p1
 
     :sswitch_15
-    const p1, 0x7f120e64
+    const p1, 0x7f120e9a
 
     return p1
 
     :sswitch_16
-    const p1, 0x7f1212cc
+    const p1, 0x7f12131d
 
     return p1
 
     :sswitch_17
-    const p1, 0x7f1200b9
+    const p1, 0x7f1200bb
 
     return p1
 
     :sswitch_18
-    const p1, 0x7f120b1e
+    const p1, 0x7f120b4e
 
     return p1
 
@@ -3531,32 +3536,32 @@
 
     if-ne p1, p2, :cond_0
 
-    const p1, 0x7f120b0f
+    const p1, 0x7f120b3e
 
     return p1
 
     :cond_0
-    const p1, 0x7f120b11
+    const p1, 0x7f120b40
 
     return p1
 
     :sswitch_1a
-    const p1, 0x7f1200bf
+    const p1, 0x7f1200c2
 
     return p1
 
     :sswitch_1b
-    const p1, 0x7f12028f
+    const p1, 0x7f120293
 
     return p1
 
     :cond_1
-    const p1, 0x7f120aa1
+    const p1, 0x7f120ac2
 
     return p1
 
     :cond_2
-    const p1, 0x7f120460
+    const p1, 0x7f12046a
 
     return p1
 
@@ -3628,7 +3633,7 @@
     if-eq p2, v0, :cond_1
 
     :goto_0
-    const p2, 0x7f0600c1
+    const p2, 0x7f0600c4
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -3637,7 +3642,7 @@
     return p1
 
     :cond_1
-    const p2, 0x7f06011a
+    const p2, 0x7f06011c
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -3646,7 +3651,7 @@
     return p1
 
     :cond_2
-    const p2, 0x7f060125
+    const p2, 0x7f060127
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -3655,7 +3660,7 @@
     return p1
 
     :cond_3
-    const p2, 0x7f060104
+    const p2, 0x7f060106
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -3697,7 +3702,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f120860
+    const p1, 0x7f12087d
 
     return p1
 
@@ -3710,19 +3715,19 @@
 
     if-eqz v0, :cond_7
 
-    const v0, 0x7f120859
+    const v0, 0x7f120876
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v3
 
-    const v0, 0x7f12085a
+    const v0, 0x7f120877
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v4
 
-    const v0, 0x7f12085b
+    const v0, 0x7f120878
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -3767,14 +3772,14 @@
 
     if-ne p1, v3, :cond_1
 
-    const p1, 0x7f120858
+    const p1, 0x7f120875
 
     return p1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f120857
+    const p1, 0x7f120874
 
     return p1
 
@@ -3815,14 +3820,14 @@
 
     if-ne p1, v3, :cond_4
 
-    const p1, 0x7f120855
+    const p1, 0x7f120872
 
     return p1
 
     :cond_4
     if-nez p1, :cond_5
 
-    const p1, 0x7f120854
+    const p1, 0x7f120871
 
     return p1
 
@@ -3849,7 +3854,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f12085f
+    const p1, 0x7f12087c
 
     return p1
 
@@ -3862,7 +3867,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f120820
+    const p1, 0x7f12083c
 
     return p1
 
@@ -3875,7 +3880,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f12085d
+    const p1, 0x7f12087a
 
     return p1
 
@@ -3926,7 +3931,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f120872
+    const p1, 0x7f12088f
 
     return p1
 
@@ -3939,9 +3944,9 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f120878
+    const v0, 0x7f120895
 
-    const v1, 0x7f120877
+    const v1, 0x7f120894
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -3958,7 +3963,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f120820
+    const p1, 0x7f12083c
 
     return p1
 
@@ -3971,9 +3976,9 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f120874
+    const v0, 0x7f120891
 
-    const v1, 0x7f120873
+    const v1, 0x7f120890
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -4920,7 +4925,7 @@
     goto :goto_1
 
     :cond_4
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -5393,7 +5398,7 @@
 
     invoke-virtual {v9, v0}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
-    sget-object v0, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
     new-array v0, v15, [Ljava/lang/Object;
 
@@ -5476,7 +5481,7 @@
     throw v0
 
     :cond_d
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
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 4b089dde30..6e4565a240 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
@@ -324,7 +324,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
index 7b3619dac8..de85338707 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
@@ -102,117 +102,117 @@
     goto/16 :goto_0
 
     :pswitch_0
-    const p1, 0x7f120822
+    const p1, 0x7f12083e
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f120825
+    const p1, 0x7f120841
 
     return p1
 
     :pswitch_2
-    const p1, 0x7f120821
+    const p1, 0x7f12083d
 
     return p1
 
     :pswitch_3
-    const p1, 0x7f120876
+    const p1, 0x7f120893
 
     return p1
 
     :pswitch_4
-    const p1, 0x7f120879
+    const p1, 0x7f120896
 
     return p1
 
     :pswitch_5
-    const p1, 0x7f120875
+    const p1, 0x7f120892
 
     return p1
 
     :pswitch_6
-    const p1, 0x7f120849
-
-    return p1
-
-    :pswitch_7
-    const p1, 0x7f120850
-
-    return p1
-
-    :pswitch_8
-    const p1, 0x7f120848
-
-    return p1
-
-    :pswitch_9
-    const p1, 0x7f120867
-
-    return p1
-
-    :pswitch_a
-    const p1, 0x7f120870
-
-    return p1
-
-    :pswitch_b
     const p1, 0x7f120866
 
     return p1
 
+    :pswitch_7
+    const p1, 0x7f12086d
+
+    return p1
+
+    :pswitch_8
+    const p1, 0x7f120865
+
+    return p1
+
+    :pswitch_9
+    const p1, 0x7f120884
+
+    return p1
+
+    :pswitch_a
+    const p1, 0x7f12088d
+
+    return p1
+
+    :pswitch_b
+    const p1, 0x7f120883
+
+    return p1
+
     :pswitch_c
-    const p1, 0x7f12085e
+    const p1, 0x7f12087b
 
     return p1
 
     :pswitch_d
-    const p1, 0x7f120861
+    const p1, 0x7f12087e
 
     return p1
 
     :pswitch_e
-    const p1, 0x7f120853
+    const p1, 0x7f120870
 
     return p1
 
     :pswitch_f
-    const p1, 0x7f120852
+    const p1, 0x7f12086f
 
     return p1
 
     :pswitch_10
-    const p1, 0x7f12085c
+    const p1, 0x7f120879
 
     return p1
 
     :pswitch_11
-    const p1, 0x7f120856
+    const p1, 0x7f120873
 
     return p1
 
     :pswitch_12
-    const p1, 0x7f120810
+    const p1, 0x7f12082c
 
     return p1
 
     :pswitch_13
-    const p1, 0x7f120811
+    const p1, 0x7f12082d
 
     return p1
 
     :pswitch_14
-    const p1, 0x7f12080f
+    const p1, 0x7f12082b
 
     return p1
 
     :pswitch_15
-    const p1, 0x7f12080a
+    const p1, 0x7f120826
 
     return p1
 
     :pswitch_16
-    const p1, 0x7f12081e
+    const p1, 0x7f12083a
 
     return p1
 
@@ -292,17 +292,17 @@
 
     if-eq p1, v0, :cond_3
 
-    const p1, 0x7f120819
+    const p1, 0x7f120835
 
     return p1
 
     :cond_3
-    const p1, 0x7f120809
+    const p1, 0x7f120825
 
     return p1
 
     :cond_4
-    const p1, 0x7f12081f
+    const p1, 0x7f12083b
 
     return p1
 
@@ -322,12 +322,12 @@
     return p1
 
     :cond_7
-    const p1, 0x7f120862
+    const p1, 0x7f12087f
 
     return p1
 
     :cond_8
-    const p1, 0x7f12083a
+    const p1, 0x7f120857
 
     return p1
 
@@ -946,7 +946,7 @@
 
     if-gez v5, :cond_0
 
-    const v0, 0x7f120871
+    const v0, 0x7f12088e
 
     const/4 v1, 0x2
 
@@ -1038,137 +1038,137 @@
     return p1
 
     :pswitch_0
-    const p1, 0x7f1207f4
+    const p1, 0x7f120810
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f1207f5
+    const p1, 0x7f120811
 
     return p1
 
     :pswitch_2
-    const p1, 0x7f1207f3
+    const p1, 0x7f12080f
 
     return p1
 
     :pswitch_3
-    const p1, 0x7f120805
+    const p1, 0x7f120821
 
     return p1
 
     :pswitch_4
-    const p1, 0x7f120806
+    const p1, 0x7f120822
 
     return p1
 
     :pswitch_5
-    const p1, 0x7f120804
+    const p1, 0x7f120820
 
     return p1
 
     :pswitch_6
-    const p1, 0x7f1207f8
+    const p1, 0x7f120814
 
     return p1
 
     :pswitch_7
-    const p1, 0x7f1207f9
+    const p1, 0x7f120815
 
     return p1
 
     :pswitch_8
-    const p1, 0x7f1207f7
+    const p1, 0x7f120813
 
     return p1
 
     :pswitch_9
-    const p1, 0x7f120802
+    const p1, 0x7f12081e
 
     return p1
 
     :pswitch_a
-    const p1, 0x7f120803
+    const p1, 0x7f12081f
 
     return p1
 
     :pswitch_b
-    const p1, 0x7f120801
+    const p1, 0x7f12081d
 
     return p1
 
     :pswitch_c
-    const p1, 0x7f1207fe
+    const p1, 0x7f12081a
 
     return p1
 
     :pswitch_d
-    const p1, 0x7f1207ff
+    const p1, 0x7f12081b
 
     return p1
 
     :pswitch_e
-    const p1, 0x7f1207fb
+    const p1, 0x7f120817
 
     return p1
 
     :pswitch_f
-    const p1, 0x7f1207fa
+    const p1, 0x7f120816
 
     return p1
 
     :pswitch_10
-    const p1, 0x7f1207fd
+    const p1, 0x7f120819
 
     return p1
 
     :pswitch_11
-    const p1, 0x7f1207fc
+    const p1, 0x7f120818
 
     return p1
 
     :pswitch_12
-    const p1, 0x7f1207f0
+    const p1, 0x7f12080c
 
     return p1
 
     :pswitch_13
-    const p1, 0x7f1207f1
+    const p1, 0x7f12080d
 
     return p1
 
     :pswitch_14
-    const p1, 0x7f1207ef
+    const p1, 0x7f12080b
 
     return p1
 
     :pswitch_15
-    const p1, 0x7f1207ee
+    const p1, 0x7f12080a
 
     return p1
 
     :pswitch_16
-    const p1, 0x7f1207f2
+    const p1, 0x7f12080e
 
     return p1
 
     :pswitch_17
-    const p1, 0x7f1207ed
+    const p1, 0x7f120809
 
     return p1
 
     :cond_0
-    const p1, 0x7f120800
+    const p1, 0x7f12081c
 
     return p1
 
     :cond_1
-    const p1, 0x7f1207f6
+    const p1, 0x7f120812
 
     return p1
 
     :cond_2
-    const p1, 0x7f120885
+    const p1, 0x7f1208a2
 
     return p1
 
@@ -1261,17 +1261,17 @@
     return p1
 
     :cond_1
-    const p1, 0x7f0801dc
+    const p1, 0x7f0801eb
 
     return p1
 
     :cond_2
-    const p1, 0x7f0801dd
+    const p1, 0x7f0801ec
 
     return p1
 
     :cond_3
-    const p1, 0x7f0801db
+    const p1, 0x7f0801ea
 
     return p1
 .end method
@@ -1396,7 +1396,7 @@
 
     move-result-object p1
 
-    return-object p1
+    goto/16 :goto_7
 
     :pswitch_0
     sget-object p4, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
@@ -1477,7 +1477,7 @@
 
     move-result-object p1
 
-    return-object p1
+    goto/16 :goto_7
 
     :cond_4
     sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
@@ -1626,7 +1626,7 @@
 
     move-result-object p1
 
-    return-object p1
+    goto/16 :goto_7
 
     :cond_a
     sget-object p4, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
@@ -1707,7 +1707,7 @@
 
     move-result-object p1
 
-    return-object p1
+    goto :goto_7
 
     :cond_e
     sget-object p4, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
@@ -1778,6 +1778,11 @@
 
     move-result-object p1
 
+    :goto_7
+    const-string p2, "when (auditLogEntry.acti\u2026rgetId), prefix))\n      }"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-object p1
 
     nop
@@ -1811,7 +1816,7 @@
 
     if-ne p2, v2, :cond_0
 
-    const p2, 0x7f040170
+    const p2, 0x7f040172
 
     invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
@@ -1833,7 +1838,7 @@
     return v1
 
     :pswitch_0
-    const p2, 0x7f04016c
+    const p2, 0x7f04016e
 
     invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
@@ -1842,7 +1847,7 @@
     return p1
 
     :pswitch_1
-    const p2, 0x7f040173
+    const p2, 0x7f040175
 
     invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
@@ -1851,24 +1856,6 @@
     return p1
 
     :pswitch_2
-    const p2, 0x7f04016d
-
-    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
-
-    move-result p1
-
-    return p1
-
-    :pswitch_3
-    const p2, 0x7f040171
-
-    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
-
-    move-result p1
-
-    return p1
-
-    :pswitch_4
     const p2, 0x7f04016f
 
     invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
@@ -1877,8 +1864,26 @@
 
     return p1
 
+    :pswitch_3
+    const p2, 0x7f040173
+
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+
+    move-result p1
+
+    return p1
+
+    :pswitch_4
+    const p2, 0x7f040171
+
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+
+    move-result p1
+
+    return p1
+
     :pswitch_5
-    const p2, 0x7f04016b
+    const p2, 0x7f04016d
 
     invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
@@ -1887,7 +1892,7 @@
     return p1
 
     :pswitch_6
-    const p2, 0x7f040172
+    const p2, 0x7f040174
 
     invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
@@ -1896,7 +1901,7 @@
     return p1
 
     :pswitch_7
-    const p2, 0x7f04016a
+    const p2, 0x7f04016c
 
     invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
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 57961306ce..94aaa40445 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
@@ -62,7 +62,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lkotlin/text/l;->dU(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v0}, Lkotlin/text/l;->dO(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v1
 
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 e31cedfad6..ea8d654ce4 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
@@ -90,7 +90,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/utilities/auth/AuthUtils.smali b/com.discord/smali/com/discord/utilities/auth/AuthUtils.smali
index 7fb828c4d3..ddb7775245 100644
--- a/com.discord/smali/com/discord/utilities/auth/AuthUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auth/AuthUtils.smali
@@ -88,7 +88,7 @@
 
     invoke-virtual {v0, v1, p2, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
 
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -295,7 +295,7 @@
 
     const/16 v0, 0xa
 
-    invoke-virtual {v2, v0}, Lkotlin/f/c;->do(I)[B
+    invoke-virtual {v2, v0}, Lkotlin/f/c;->dl(I)[B
 
     move-result-object v0
 
@@ -330,7 +330,7 @@
 
     iget v0, v4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget v1, v4, Lorg/apache/commons/a/a/b$a;->bCi:I
+    iget v1, v4, Lorg/apache/commons/a/a/b$a;->bCC:I
 
     sub-int/2addr v0, v1
 
@@ -348,7 +348,7 @@
 
     iget v5, v4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget v6, v4, Lorg/apache/commons/a/a/b$a;->bCi:I
+    iget v6, v4, Lorg/apache/commons/a/a/b$a;->bCC:I
 
     sub-int/2addr v5, v6
 
@@ -364,17 +364,17 @@
 
     iget-object v5, v4, Lorg/apache/commons/a/a/b$a;->buffer:[B
 
-    iget v6, v4, Lorg/apache/commons/a/a/b$a;->bCi:I
+    iget v6, v4, Lorg/apache/commons/a/a/b$a;->bCC:I
 
     invoke-static {v5, v6, v0, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget v5, v4, Lorg/apache/commons/a/a/b$a;->bCi:I
+    iget v5, v4, Lorg/apache/commons/a/a/b$a;->bCC:I
 
     add-int/2addr v5, v1
 
-    iput v5, v4, Lorg/apache/commons/a/a/b$a;->bCi:I
+    iput v5, v4, Lorg/apache/commons/a/a/b$a;->bCC:I
 
-    iget v1, v4, Lorg/apache/commons/a/a/b$a;->bCi:I
+    iget v1, v4, Lorg/apache/commons/a/a/b$a;->bCC:I
 
     iget v5, v4, Lorg/apache/commons/a/a/b$a;->pos:I
 
@@ -472,7 +472,7 @@
 
     aput-object v3, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali b/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
index 36e043de39..3432803593 100644
--- a/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
@@ -103,7 +103,7 @@
 
     aput-object v5, v4, v7
 
-    invoke-static {v4}, Lkotlin/a/ak;->p([Ljava/lang/Object;)Ljava/util/Set;
+    invoke-static {v4}, Lkotlin/a/ak;->o([Ljava/lang/Object;)Ljava/util/Set;
 
     move-result-object v4
 
@@ -131,7 +131,7 @@
 
     aput-object v8, v5, v6
 
-    invoke-static {v5}, Lkotlin/a/ak;->p([Ljava/lang/Object;)Ljava/util/Set;
+    invoke-static {v5}, Lkotlin/a/ak;->o([Ljava/lang/Object;)Ljava/util/Set;
 
     move-result-object v5
 
@@ -171,7 +171,7 @@
 
     aput-object v1, v5, v6
 
-    invoke-static {v5}, Lkotlin/a/ak;->p([Ljava/lang/Object;)Ljava/util/Set;
+    invoke-static {v5}, Lkotlin/a/ak;->o([Ljava/lang/Object;)Ljava/util/Set;
 
     move-result-object v1
 
@@ -213,7 +213,7 @@
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    sget-object v2, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object v2, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast v2, Ljava/util/Set;
 
@@ -307,14 +307,14 @@
 
     if-eqz v0, :cond_0
 
-    const p0, 0x7f08023f
+    const p0, 0x7f08024f
 
     return p0
 
     :cond_0
     instance-of v0, p0, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard;
 
-    const v1, 0x7f08023d
+    const v1, 0x7f08024d
 
     if-eqz v0, :cond_3
 
@@ -362,7 +362,7 @@
 
     if-eqz p0, :cond_1
 
-    const p0, 0x7f08023c
+    const p0, 0x7f08024c
 
     return p0
 
@@ -386,7 +386,7 @@
 
     if-eqz p0, :cond_1
 
-    const p0, 0x7f080240
+    const p0, 0x7f080250
 
     return p0
 
@@ -400,7 +400,7 @@
     if-eqz p0, :cond_1
 
     :goto_0
-    const p0, 0x7f08023b
+    const p0, 0x7f08024b
 
     return p0
 
@@ -414,7 +414,7 @@
     if-eqz p0, :cond_1
 
     :goto_1
-    const p0, 0x7f08023e
+    const p0, 0x7f08024e
 
     return p0
 
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 f6c638d82b..17357423fe 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$Failure.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$Failure.smali
@@ -165,6 +165,10 @@
 
     iget v0, p0, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;->errorStringId:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget-object v1, p0, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;->reasonCode:Ljava/lang/String;
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 3e71ef572c..60d0366611 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
@@ -45,7 +45,7 @@
 
     new-instance v0, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
 
-    const v1, 0x7f120371
+    const v1, 0x7f120376
 
     const-string v2, "missing_dependencies"
 
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 2c2d1b244e..b9ce1387d6 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
@@ -53,7 +53,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse;->vv()Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/j;->aei:Lcom/google/android/gms/common/api/k;
+
+    check-cast p1, Lcom/google/android/gms/safetynet/SafetyNetApi$a;
+
+    invoke-interface {p1}, Lcom/google/android/gms/safetynet/SafetyNetApi$a;->vt()Ljava/lang/String;
 
     move-result-object p1
 
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 ee81a944bd..01e74cf85e 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
@@ -45,7 +45,7 @@
 
     new-instance v0, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
 
-    const v1, 0x7f120370
+    const v1, 0x7f120375
 
     const-string v2, "expired"
 
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 643abc9dd0..d65b179f62 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 4406f1fca1..865eed2c01 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 9ff8383806..b5484dc893 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
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -72,7 +72,7 @@
 
     iget-object v1, v1, Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1;->$activity:Landroid/app/Activity;
 
-    invoke-static {v1}, Lcom/google/android/gms/safetynet/a;->g(Landroid/app/Activity;)Lcom/google/android/gms/safetynet/SafetyNetClient;
+    invoke-static {v1}, Lcom/google/android/gms/safetynet/a;->f(Landroid/app/Activity;)Lcom/google/android/gms/safetynet/SafetyNetClient;
 
     move-result-object v1
 
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 549121ca7a..7d0277de7f 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$errorHandler$1;->invoke(Lcom/discord/utilities/captcha/CaptchaHelper$Failure;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 d388e543e6..bf48fb29a6 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
@@ -75,7 +75,7 @@
 
     sget-object v1, Lcom/discord/utilities/captcha/CaptchaHelper;->INSTANCE:Lcom/discord/utilities/captcha/CaptchaHelper;
 
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kZ()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kX()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
index d39b2ff649..210bde51b2 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
@@ -88,18 +88,52 @@
 
     move-result v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/common/GoogleApiAvailability;->bc(I)Z
 
     move-result v1
 
-    if-eqz v1, :cond_0
+    if-eqz v1, :cond_1
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/common/GoogleApiAvailability;->b(Landroid/app/Activity;)Lcom/google/android/gms/tasks/Task;
+    sget v0, Lcom/google/android/gms/common/GoogleApiAvailability;->GOOGLE_PLAY_SERVICES_VERSION_CODE:I
+
+    const-string v1, "makeGooglePlayServicesAvailable must be called from the main thread"
+
+    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aR(Ljava/lang/String;)V
+
+    invoke-virtual {p1, p2, v0}, Lcom/google/android/gms/common/GoogleApiAvailability;->isGooglePlayServicesAvailable(Landroid/content/Context;I)I
+
+    move-result p1
+
+    const/4 v0, 0x0
+
+    if-nez p1, :cond_0
+
+    invoke-static {v0}, Lcom/google/android/gms/tasks/j;->aH(Ljava/lang/Object;)Lcom/google/android/gms/tasks/Task;
 
     move-result-object p1
 
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p2}, Lcom/google/android/gms/common/api/internal/ad;->c(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/ad;
+
+    move-result-object p2
+
+    new-instance v1, Lcom/google/android/gms/common/ConnectionResult;
+
+    invoke-direct {v1, p1, v0}, Lcom/google/android/gms/common/ConnectionResult;-><init>(ILandroid/app/PendingIntent;)V
+
+    const/4 p1, 0x0
+
+    invoke-virtual {p2, v1, p1}, Lcom/google/android/gms/common/api/internal/ay;->c(Lcom/google/android/gms/common/ConnectionResult;I)V
+
+    iget-object p1, p2, Lcom/google/android/gms/common/api/internal/ad;->aga:Lcom/google/android/gms/tasks/h;
+
+    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
+
+    :goto_0
     new-instance p2, Lcom/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$1;
 
     invoke-direct {p2, p3}, Lcom/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$1;-><init>(Lkotlin/jvm/functions/Function0;)V
@@ -126,17 +160,17 @@
 
     return-void
 
-    :cond_0
-    if-nez v0, :cond_1
+    :cond_1
+    if-nez v0, :cond_2
 
     invoke-interface {p3}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
     return-void
 
-    :cond_1
+    :cond_2
     new-instance p1, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
 
-    const p2, 0x7f120372
+    const p2, 0x7f120377
 
     const-string p3, "unsupported_device"
 
@@ -148,7 +182,7 @@
 .end method
 
 .method private final showCaptcha(Lcom/google/android/gms/safetynet/SafetyNetClient;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
-    .locals 1
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -166,9 +200,21 @@
         }
     .end annotation
 
-    const-string v0, "6Lff5jIUAAAAAImNXvYYPv2VW2En3Dexy4oX2o4s"
+    sget-object v0, Lcom/google/android/gms/safetynet/a;->aOG:Lcom/google/android/gms/safetynet/SafetyNetApi;
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/safetynet/SafetyNetClient;->dp(Ljava/lang/String;)Lcom/google/android/gms/tasks/Task;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/e;->adZ:Lcom/google/android/gms/common/api/f;
+
+    const-string v1, "6Lff5jIUAAAAAImNXvYYPv2VW2En3Dexy4oX2o4s"
+
+    invoke-interface {v0, p1, v1}, Lcom/google/android/gms/safetynet/SafetyNetApi;->a(Lcom/google/android/gms/common/api/f;Ljava/lang/String;)Lcom/google/android/gms/common/api/g;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse;
+
+    invoke-direct {v0}, Lcom/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse;-><init>()V
+
+    invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/q;->a(Lcom/google/android/gms/common/api/g;Lcom/google/android/gms/common/api/j;)Lcom/google/android/gms/tasks/Task;
 
     move-result-object p1
 
@@ -238,19 +284,19 @@
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v2, 0x7f120375
+    const v2, 0x7f12037a
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f120376
+    const v2, 0x7f12037b
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f120374
+    const v2, 0x7f120379
 
     new-instance v3, Lcom/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1;
 
@@ -262,7 +308,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f120368
+    const p2, 0x7f12036d
 
     const/4 v1, 0x2
 
@@ -312,7 +358,7 @@
 
     check-cast v0, Lrx/functions/Action1;
 
-    sget p1, Lrx/Emitter$a;->bIB:I
+    sget p1, Lrx/Emitter$a;->bIV:I
 
     invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;I)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
index c062e99df5..fc179e0122 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
@@ -105,13 +105,13 @@
 
     move-result v0
 
-    invoke-static {v0}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v0}, Lkotlin/a/ad;->dj(I)I
 
     move-result v0
 
     const/16 v1, 0x10
 
-    invoke-static {v0, v1}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v0, v1}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v0
 
@@ -314,7 +314,7 @@
     :cond_1
     if-eqz v0, :cond_2
 
-    const p2, 0x7f1207b0
+    const p2, 0x7f1207cc
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -328,7 +328,7 @@
     :cond_3
     if-eqz v0, :cond_4
 
-    const p2, 0x7f1209b9
+    const p2, 0x7f1209da
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -348,7 +348,7 @@
 
     if-eqz v0, :cond_6
 
-    const p2, 0x7f1204f4
+    const p2, 0x7f1204ff
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -372,7 +372,7 @@
 
     if-eqz v0, :cond_8
 
-    const p2, 0x7f1209b8
+    const p2, 0x7f1209d9
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 0963386034..8bacfb0c44 100644
--- a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion.smali
@@ -130,7 +130,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 0abf96899f..ea82e562df 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali
@@ -74,7 +74,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0, p1}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, p1}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali
index c806432171..5a6acd83d4 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali
@@ -309,7 +309,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     const/4 v0, 0x0
 
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 d8d6ed7644..d7b202bd63 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap.smali
@@ -181,7 +181,7 @@
 
     if-gez v1, :cond_0
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_0
     check-cast v2, Ljava/util/Map;
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali
index 3010c2f801..917cbd1a3d 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali
@@ -75,7 +75,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0, p1}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, p1}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali
index 11f2118e14..686376de68 100644
--- a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali
@@ -66,7 +66,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0, p1}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, p1}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali b/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali
index 8b77f3d467..7569299d58 100644
--- a/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali
@@ -936,7 +936,7 @@
 
     if-gez v1, :cond_3
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_3
     invoke-static {v3, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
diff --git a/com.discord/smali/com/discord/utilities/device/DeviceUtils.smali b/com.discord/smali/com/discord/utilities/device/DeviceUtils.smali
new file mode 100644
index 0000000000..c8892a2040
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/device/DeviceUtils.smali
@@ -0,0 +1,101 @@
+.class public final Lcom/discord/utilities/device/DeviceUtils;
+.super Ljava/lang/Object;
+.source "DeviceUtils.kt"
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/device/DeviceUtils;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/utilities/device/DeviceUtils;
+
+    invoke-direct {v0}, Lcom/discord/utilities/device/DeviceUtils;-><init>()V
+
+    sput-object v0, Lcom/discord/utilities/device/DeviceUtils;->INSTANCE:Lcom/discord/utilities/device/DeviceUtils;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final canDrawOverlays(Landroid/content/Context;)Z
+    .locals 2
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x16
+
+    if-le v0, v1, :cond_1
+
+    invoke-static {p1}, Landroid/provider/Settings;->canDrawOverlays(Landroid/content/Context;)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 isMeizuAndroid7Device()Z
+    .locals 3
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x18
+
+    if-ne v0, v1, :cond_0
+
+    sget-object v0, Landroid/os/Build;->MANUFACTURER:Ljava/lang/String;
+
+    const-string v1, "Build.MANUFACTURER"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Ljava/lang/CharSequence;
+
+    const-string v1, "meizu"
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    const/4 v2, 0x1
+
+    invoke-static {v0, v1, v2}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return v2
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/dimen/DimenUtils.smali b/com.discord/smali/com/discord/utilities/dimen/DimenUtils.smali
index 6b794d9a71..d8ad26fa0d 100644
--- a/com.discord/smali/com/discord/utilities/dimen/DimenUtils.smali
+++ b/com.discord/smali/com/discord/utilities/dimen/DimenUtils.smali
@@ -44,6 +44,28 @@
     return p0
 .end method
 
+.method public static final getScreenHeightPx(Landroid/view/WindowManager;)I
+    .locals 1
+
+    const-string v0, "$this$screenHeightPx"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Landroid/util/DisplayMetrics;
+
+    invoke-direct {v0}, Landroid/util/DisplayMetrics;-><init>()V
+
+    invoke-interface {p0}, Landroid/view/WindowManager;->getDefaultDisplay()Landroid/view/Display;
+
+    move-result-object p0
+
+    invoke-virtual {p0, v0}, Landroid/view/Display;->getMetrics(Landroid/util/DisplayMetrics;)V
+
+    iget p0, v0, Landroid/util/DisplayMetrics;->heightPixels:I
+
+    return p0
+.end method
+
 .method public static final getScreenWidthPx(Landroid/view/WindowManager;)I
     .locals 1
 
diff --git a/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali b/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
index 12987c83b7..548a020531 100644
--- a/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
+++ b/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
@@ -253,7 +253,7 @@
 
     mul-float p3, p3, p2
 
-    invoke-static {p3}, Lkotlin/e/a;->D(F)I
+    invoke-static {p3}, Lkotlin/e/a;->C(F)I
 
     move-result p3
 
@@ -263,7 +263,7 @@
 
     div-float/2addr p1, p2
 
-    invoke-static {p1}, Lkotlin/e/a;->D(F)I
+    invoke-static {p1}, Lkotlin/e/a;->C(F)I
 
     move-result p1
 
@@ -276,7 +276,7 @@
 
     mul-float p1, p1, p2
 
-    invoke-static {p1}, Lkotlin/e/a;->D(F)I
+    invoke-static {p1}, Lkotlin/e/a;->C(F)I
 
     move-result p1
 
@@ -316,7 +316,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f07014e
+    const v1, 0x7f070150
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -405,7 +405,7 @@
     return p1
 
     :cond_2
-    const p1, 0x7f08027b
+    const p1, 0x7f08028b
 
     return p1
 .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 3f42eef924..250e58890d 100644
--- a/com.discord/smali/com/discord/utilities/embed/FileType.smali
+++ b/com.discord/smali/com/discord/utilities/embed/FileType.smali
@@ -324,7 +324,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     check-cast v0, Ljava/util/regex/Matcher;
@@ -392,52 +392,52 @@
     throw v0
 
     :pswitch_0
-    const v0, 0x7f08027e
+    const v0, 0x7f08028e
 
     return v0
 
     :pswitch_1
-    const v0, 0x7f08027a
+    const v0, 0x7f08028a
 
     return v0
 
     :pswitch_2
-    const v0, 0x7f080273
+    const v0, 0x7f080283
 
     return v0
 
     :pswitch_3
-    const v0, 0x7f080272
+    const v0, 0x7f080282
 
     return v0
 
     :pswitch_4
-    const v0, 0x7f080271
+    const v0, 0x7f080281
 
     return v0
 
     :pswitch_5
-    const v0, 0x7f080270
+    const v0, 0x7f080280
 
     return v0
 
     :pswitch_6
-    const v0, 0x7f080279
+    const v0, 0x7f080289
 
     return v0
 
     :pswitch_7
-    const v0, 0x7f08026f
+    const v0, 0x7f08027f
 
     return v0
 
     :pswitch_8
-    const v0, 0x7f08026e
+    const v0, 0x7f08027e
 
     return v0
 
     :pswitch_9
-    const v0, 0x7f08027d
+    const v0, 0x7f08028d
 
     return v0
 
diff --git a/com.discord/smali/com/discord/utilities/error/Error.smali b/com.discord/smali/com/discord/utilities/error/Error.smali
index e7d555d905..f130e9e913 100644
--- a/com.discord/smali/com/discord/utilities/error/Error.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error.smali
@@ -136,11 +136,11 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v4, v0, Lb/m;->bHl:Lokhttp3/Response;
+    iget-object v4, v0, Lb/m;->bHF:Lokhttp3/Response;
 
-    iget-object v4, v4, Lokhttp3/Response;->buj:Lokhttp3/Headers;
+    iget-object v4, v4, Lokhttp3/Response;->buD:Lokhttp3/Headers;
 
-    iget-object v5, v0, Lb/m;->bHn:Lokhttp3/x;
+    iget-object v5, v0, Lb/m;->bHH:Lokhttp3/x;
 
     if-eqz v5, :cond_2
 
@@ -162,11 +162,11 @@
     :goto_0
     if-eqz v6, :cond_1
 
-    iget-object v1, v6, Lokhttp3/MediaType;->btU:Ljava/lang/String;
+    iget-object v1, v6, Lokhttp3/MediaType;->buo:Ljava/lang/String;
 
     :cond_1
     :try_start_0
-    invoke-virtual {v5}, Lokhttp3/x;->Hg()Ljava/lang/String;
+    invoke-virtual {v5}, Lokhttp3/x;->GT()Ljava/lang/String;
 
     move-result-object v6
     :try_end_0
@@ -197,7 +197,7 @@
     move-object v7, v6
 
     :goto_1
-    iget-object v0, v0, Lb/m;->bHl:Lokhttp3/Response;
+    iget-object v0, v0, Lb/m;->bHF:Lokhttp3/Response;
 
     invoke-static {v0}, Lcom/discord/utilities/error/Error;->getRequestUrl(Lokhttp3/Response;)Ljava/lang/String;
 
@@ -585,22 +585,22 @@
 
     if-eqz p0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object p0, p0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object p0, p0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    iget-object p0, p0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object p0, p0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-virtual {p0}, Lokhttp3/s;->toString()Ljava/lang/String;
 
@@ -641,7 +641,7 @@
     packed-switch v0, :pswitch_data_0
 
     :pswitch_0
-    const v0, 0x7f120b95
+    const v0, 0x7f120bc7
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -654,7 +654,7 @@
     return-object p1
 
     :pswitch_1
-    const v0, 0x7f1209b1
+    const v0, 0x7f1209d2
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -667,7 +667,7 @@
     return-object p1
 
     :pswitch_2
-    const v0, 0x7f120b94
+    const v0, 0x7f120bc6
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -680,7 +680,7 @@
     return-object p1
 
     :pswitch_3
-    const v0, 0x7f120b91
+    const v0, 0x7f120bc3
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -693,7 +693,7 @@
     return-object p1
 
     :pswitch_4
-    const v0, 0x7f121132
+    const v0, 0x7f121174
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -706,7 +706,7 @@
     return-object p1
 
     :pswitch_5
-    const v0, 0x7f120b93
+    const v0, 0x7f120bc5
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -719,7 +719,7 @@
     return-object p1
 
     :pswitch_6
-    const v0, 0x7f120b8f
+    const v0, 0x7f120bc1
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -734,7 +734,7 @@
     :pswitch_7
     iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
 
-    const v1, 0x7f120b8c
+    const v1, 0x7f120bbe
 
     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;
 
@@ -749,7 +749,7 @@
     :pswitch_8
     iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
 
-    const v1, 0x7f120b90
+    const v1, 0x7f120bc2
 
     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;
 
@@ -762,7 +762,7 @@
     return-object p1
 
     :pswitch_9
-    const v0, 0x7f120e9c
+    const v0, 0x7f120ed2
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -775,7 +775,7 @@
     return-object p1
 
     :pswitch_a
-    const v0, 0x7f120b8e
+    const v0, 0x7f120bc0
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -788,7 +788,7 @@
     return-object p1
 
     :pswitch_b
-    const v0, 0x7f120b8d
+    const v0, 0x7f120bbf
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -803,7 +803,7 @@
     :pswitch_c
     iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
 
-    const v1, 0x7f120b92
+    const v1, 0x7f120bc4
 
     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;
 
@@ -851,59 +851,58 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Throwable;
+        }
+    .end annotation
 
-    :try_start_0
     invoke-static {p0}, Lcom/discord/utilities/error/Error;->create(Ljava/lang/Throwable;)Lcom/discord/utilities/error/Error;
 
     move-result-object p0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
+
+    invoke-virtual {p0}, Lcom/discord/utilities/error/Error;->getType()Lcom/discord/utilities/error/Error$Type;
+
+    sget-object v0, Lcom/discord/utilities/error/Error$Type;->OTHER:Lcom/discord/utilities/error/Error$Type;
 
     if-eqz p2, :cond_0
 
-    :try_start_1
+    :try_start_0
     invoke-interface {p2, p0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
     :cond_0
     invoke-direct {p0, p1}, Lcom/discord/utilities/error/Error;->logError(Ljava/lang/String;)V
 
     invoke-virtual {p0, p3}, Lcom/discord/utilities/error/Error;->showToasts(Landroid/content/Context;)V
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
     return-void
 
     :catch_0
     move-exception p2
 
-    goto :goto_0
+    const/4 p3, 0x0
 
-    :catch_1
-    move-exception p2
-
-    move-object p0, v0
-
-    :goto_0
     if-eqz p0, :cond_1
 
     invoke-virtual {p0}, Lcom/discord/utilities/error/Error;->toString()Ljava/lang/String;
 
     move-result-object p0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
-    move-object p0, v0
+    move-object p0, p3
 
-    :goto_1
-    sget-object p3, Lcom/discord/utilities/error/Error;->onUnhandledError:Lrx/functions/Action4;
+    :goto_0
+    sget-object v0, Lcom/discord/utilities/error/Error;->onUnhandledError:Lrx/functions/Action4;
 
     new-instance v1, Ljava/lang/Exception;
 
     invoke-direct {v1, p0, p2}, Ljava/lang/Exception;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-interface {p3, p1, v1, v0}, Lrx/functions/Action4;->a(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-interface {v0, p1, v1, p3}, Lrx/functions/Action4;->a(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
     return-void
 .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 d37296eaae..a98b9a8315 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali
@@ -59,7 +59,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {v0}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v0}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v0
 
@@ -77,7 +77,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p1}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p1
 
@@ -87,7 +87,7 @@
 
     move-result-wide v2
 
-    sget-object p1, Lcom/discord/workers/MessageAckWorker;->Er:Lcom/discord/workers/MessageAckWorker$a;
+    sget-object p1, Lcom/discord/workers/MessageAckWorker;->EI:Lcom/discord/workers/MessageAckWorker$a;
 
     new-instance p1, Landroidx/work/Data$Builder;
 
@@ -240,7 +240,7 @@
 
     if-eqz v0, :cond_4
 
-    invoke-static {v0}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v0}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v0
 
@@ -270,6 +270,10 @@
 
     if-eqz p2, :cond_3
 
+    const-string v4, "it"
+
+    invoke-static {p2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-static {p2}, Lkotlin/text/l;->j(Ljava/lang/CharSequence;)Z
 
     move-result v4
@@ -299,7 +303,7 @@
     goto/16 :goto_1
 
     :cond_1
-    sget-object p1, Lcom/discord/workers/MessageSendWorker;->Es:Lcom/discord/workers/MessageSendWorker$a;
+    sget-object p1, Lcom/discord/workers/MessageSendWorker;->EJ:Lcom/discord/workers/MessageSendWorker$a;
 
     const-string p1, "message"
 
@@ -492,6 +496,10 @@
     return-void
 
     :cond_2
+    const-string v2, "intent.data.takeIf { it?\u2026y == \"action\" } ?: return"
+
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v0}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
     move-result-object v2
@@ -543,7 +551,7 @@
 
     :cond_6
     :goto_2
-    sget-object p1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance p2, Ljava/lang/StringBuilder;
 
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 fc290219c2..cad2bb747f 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$FCMMessagingService.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$FCMMessagingService.smali
@@ -26,11 +26,13 @@
 
 # virtual methods
 .method public final onMessageReceived(Lcom/google/firebase/messaging/RemoteMessage;)V
-    .locals 13
+    .locals 16
 
-    if-nez p1, :cond_0
+    move-object/from16 v0, p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    if-nez v0, :cond_0
+
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v2, 0x0
 
@@ -47,367 +49,480 @@
     return-void
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Bw()Ljava/util/Map;
+    iget-object v1, v0, Lcom/google/firebase/messaging/RemoteMessage;->aVo:Ljava/util/Map;
 
-    move-result-object v0
+    const-string v2, "message_type"
 
-    const/4 v1, 0x4
+    const-string v3, "collapse_key"
 
-    const/4 v2, 0x3
+    const-string v4, "from"
 
-    const/4 v3, 0x2
+    if-nez v1, :cond_3
 
-    const/4 v4, 0x1
+    iget-object v1, v0, Lcom/google/firebase/messaging/RemoteMessage;->aWq:Landroid/os/Bundle;
 
-    const/4 v5, 0x0
+    new-instance v5, Landroidx/collection/ArrayMap;
 
-    if-nez v0, :cond_6
+    invoke-direct {v5}, Landroidx/collection/ArrayMap;-><init>()V
 
-    sget-object v6, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    invoke-virtual {v1}, Landroid/os/Bundle;->keySet()Ljava/util/Set;
 
-    const/4 v8, 0x0
+    move-result-object v6
 
-    const/4 v0, 0x5
+    invoke-interface {v6}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
-    new-array v0, v0, [Lkotlin/Pair;
-
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Bv()Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v9, "null"
-
-    if-nez v7, :cond_1
-
-    move-object v7, v9
+    move-result-object v6
 
     :cond_1
-    const-string v10, "fcm_from"
+    :goto_0
+    invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z
 
-    invoke-static {v10, v7}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    move-result v7
+
+    if-eqz v7, :cond_2
+
+    invoke-interface {v6}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v7
 
-    aput-object v7, v0, v5
+    check-cast v7, Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->getTo()Ljava/lang/String;
+    invoke-virtual {v1, v7}, Landroid/os/Bundle;->get(Ljava/lang/String;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v8
 
-    if-nez v5, :cond_2
+    instance-of v9, v8, Ljava/lang/String;
 
-    move-object v5, v9
+    if-eqz v9, :cond_1
+
+    check-cast v8, Ljava/lang/String;
+
+    const-string v9, "google."
+
+    invoke-virtual {v7, v9}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+
+    move-result v9
+
+    if-nez v9, :cond_1
+
+    const-string v9, "gcm."
+
+    invoke-virtual {v7, v9}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+
+    move-result v9
+
+    if-nez v9, :cond_1
+
+    invoke-virtual {v7, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v9
+
+    if-nez v9, :cond_1
+
+    invoke-virtual {v7, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v9
+
+    if-nez v9, :cond_1
+
+    invoke-virtual {v7, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v9
+
+    if-nez v9, :cond_1
+
+    invoke-virtual {v5, v7, v8}, Landroidx/collection/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_0
 
     :cond_2
-    const-string v7, "fcm_to"
-
-    invoke-static {v7, v5}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
-
-    move-result-object v5
-
-    aput-object v5, v0, v4
-
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->By()Ljava/lang/String;
-
-    move-result-object v4
-
-    if-nez v4, :cond_3
-
-    move-object v4, v9
+    iput-object v5, v0, Lcom/google/firebase/messaging/RemoteMessage;->aVo:Ljava/util/Map;
 
     :cond_3
-    const-string v5, "fcm_messageId"
+    iget-object v1, v0, Lcom/google/firebase/messaging/RemoteMessage;->aVo:Ljava/util/Map;
 
-    invoke-static {v5, v4}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    const/4 v5, 0x4
+
+    const/4 v6, 0x3
+
+    const/4 v7, 0x2
+
+    const/4 v8, 0x1
+
+    const/4 v9, 0x0
+
+    if-nez v1, :cond_a
+
+    sget-object v10, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
+
+    const/4 v12, 0x0
+
+    const/4 v1, 0x5
+
+    new-array v1, v1, [Lkotlin/Pair;
+
+    iget-object v11, v0, Lcom/google/firebase/messaging/RemoteMessage;->aWq:Landroid/os/Bundle;
+
+    invoke-virtual {v11, v4}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
-    aput-object v4, v0, v3
+    const-string v11, "null"
 
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Bx()Ljava/lang/String;
+    if-nez v4, :cond_4
+
+    move-object v4, v11
+
+    :cond_4
+    const-string v13, "fcm_from"
+
+    invoke-static {v13, v4}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v4
+
+    aput-object v4, v1, v9
+
+    iget-object v4, v0, Lcom/google/firebase/messaging/RemoteMessage;->aWq:Landroid/os/Bundle;
+
+    const-string v9, "google.to"
+
+    invoke-virtual {v4, v9}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v4
+
+    if-nez v4, :cond_5
+
+    move-object v4, v11
+
+    :cond_5
+    const-string v9, "fcm_to"
+
+    invoke-static {v9, v4}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v4
+
+    aput-object v4, v1, v8
+
+    iget-object v4, v0, Lcom/google/firebase/messaging/RemoteMessage;->aWq:Landroid/os/Bundle;
+
+    const-string v8, "google.message_id"
+
+    invoke-virtual {v4, v8}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v4
+
+    if-nez v4, :cond_6
+
+    iget-object v4, v0, Lcom/google/firebase/messaging/RemoteMessage;->aWq:Landroid/os/Bundle;
+
+    const-string v8, "message_id"
+
+    invoke-virtual {v4, v8}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v4
+
+    :cond_6
+    if-nez v4, :cond_7
+
+    move-object v4, v11
+
+    :cond_7
+    const-string v8, "fcm_messageId"
+
+    invoke-static {v8, v4}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v4
+
+    aput-object v4, v1, v7
+
+    iget-object v4, v0, Lcom/google/firebase/messaging/RemoteMessage;->aWq:Landroid/os/Bundle;
+
+    invoke-virtual {v4, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
-    if-nez v3, :cond_4
+    if-nez v3, :cond_8
 
-    move-object v3, v9
+    move-object v3, v11
 
-    :cond_4
+    :cond_8
     const-string v4, "fcm_collapseKey"
 
     invoke-static {v4, v3}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
     move-result-object v3
 
-    aput-object v3, v0, v2
+    aput-object v3, v1, v6
 
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/RemoteMessage;->Bz()Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/firebase/messaging/RemoteMessage;->aWq:Landroid/os/Bundle;
 
-    move-result-object p1
-
-    if-nez p1, :cond_5
-
-    move-object p1, v9
-
-    :cond_5
-    const-string v2, "fcm_messageType"
-
-    invoke-static {v2, p1}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
-
-    move-result-object p1
-
-    aput-object p1, v0, v1
-
-    invoke-static {v0}, Lkotlin/a/ad;->a([Lkotlin/Pair;)Ljava/util/Map;
-
-    move-result-object v9
-
-    const/4 v10, 0x2
-
-    const/4 v11, 0x0
-
-    const-string v7, "Got remote message with null data."
-
-    invoke-static/range {v6 .. v11}, 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_6
-    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v6, "Got notification: "
-
-    invoke-virtual {v6, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
-
-    new-instance p1, Lcom/discord/utilities/fcm/NotificationData;
-
-    invoke-direct {p1, v0}, Lcom/discord/utilities/fcm/NotificationData;-><init>(Ljava/util/Map;)V
-
-    sget-object v0, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
-
-    invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient;->getSettings$app_productionDiscordExternalRelease()Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;
+    invoke-virtual {v0, v2}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationData;->getAckChannelIds()Ljava/util/List;
+    if-nez v0, :cond_9
 
-    move-result-object v6
-
-    invoke-interface {v6}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v6
-
-    :goto_0
-    invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v7
-
-    if-eqz v7, :cond_7
-
-    invoke-interface {v6}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v7
-
-    check-cast v7, Ljava/lang/Number;
-
-    invoke-virtual {v7}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v7
-
-    sget-object v9, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
-
-    sget-object v10, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
-
-    invoke-static {v10}, Lcom/discord/utilities/fcm/NotificationClient;->access$getContext$p(Lcom/discord/utilities/fcm/NotificationClient;)Landroid/content/Context;
-
-    move-result-object v10
-
-    invoke-virtual {v9, v7, v8, v10}, Lcom/discord/utilities/fcm/NotificationClient;->clear(JLandroid/content/Context;)V
-
-    goto :goto_0
-
-    :cond_7
-    sget-object v6, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
-
-    invoke-static {v6}, Lcom/discord/utilities/fcm/NotificationClient;->access$getContext$p(Lcom/discord/utilities/fcm/NotificationClient;)Landroid/content/Context;
-
-    move-result-object v6
-
-    if-nez v6, :cond_8
-
-    sget-object v7, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x6
-
-    const/4 v12, 0x0
-
-    const-string v8, "Not showing notification because context was null."
-
-    invoke-static/range {v7 .. v12}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
-
-    return-void
-
-    :cond_8
-    invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationData;->isValid()Z
-
-    move-result v7
-
-    if-eqz v7, :cond_c
-
-    invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isAuthed()Z
-
-    move-result v7
-
-    if-nez v7, :cond_9
-
-    goto :goto_1
+    move-object v0, v11
 
     :cond_9
-    sget-object v1, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
+    const-string v2, "fcm_messageType"
 
-    invoke-static {v1}, Lcom/discord/utilities/fcm/NotificationClient;->access$isBackgrounded$p(Lcom/discord/utilities/fcm/NotificationClient;)Z
+    invoke-static {v2, v0}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    move-result v1
+    move-result-object v0
 
-    if-eqz v1, :cond_a
+    aput-object v0, v1, v5
 
-    invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled()Z
+    invoke-static {v1}, Lkotlin/a/ad;->a([Lkotlin/Pair;)Ljava/util/Map;
 
-    move-result v1
+    move-result-object v13
 
-    if-eqz v1, :cond_a
+    const/4 v14, 0x2
 
-    sget-object v1, Lcom/discord/utilities/fcm/NotificationRenderer;->INSTANCE:Lcom/discord/utilities/fcm/NotificationRenderer;
+    const/4 v15, 0x0
 
-    invoke-virtual {v1, v6, p1, v0}, Lcom/discord/utilities/fcm/NotificationRenderer;->display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V
+    const-string v11, "Got remote message with null data."
+
+    invoke-static/range {v10 .. v15}, 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_a
+    invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v2, "Got notification: "
+
+    invoke-virtual {v2, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/utilities/fcm/NotificationData;
+
+    invoke-direct {v0, v1}, Lcom/discord/utilities/fcm/NotificationData;-><init>(Ljava/util/Map;)V
+
     sget-object v1, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
 
-    invoke-static {v1}, Lcom/discord/utilities/fcm/NotificationClient;->access$isBackgrounded$p(Lcom/discord/utilities/fcm/NotificationClient;)Z
+    invoke-virtual {v1}, Lcom/discord/utilities/fcm/NotificationClient;->getSettings$app_productionDiscordExternalRelease()Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;
 
-    move-result v1
+    move-result-object v1
 
-    if-nez v1, :cond_b
+    invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationData;->getAckChannelIds()Ljava/util/List;
 
-    invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp()Z
+    move-result-object v2
 
-    move-result v0
+    invoke-interface {v2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
-    if-eqz v0, :cond_b
+    move-result-object v2
 
-    sget-object v0, Lcom/discord/utilities/fcm/NotificationRenderer;->INSTANCE:Lcom/discord/utilities/fcm/NotificationRenderer;
+    :goto_1
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
-    invoke-virtual {v0, v6, p1}, Lcom/discord/utilities/fcm/NotificationRenderer;->displayInApp(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;)V
+    move-result v3
+
+    if-eqz v3, :cond_b
+
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/Number;
+
+    invoke-virtual {v3}, Ljava/lang/Number;->longValue()J
+
+    move-result-wide v3
+
+    sget-object v10, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
+
+    sget-object v11, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
+
+    invoke-static {v11}, Lcom/discord/utilities/fcm/NotificationClient;->access$getContext$p(Lcom/discord/utilities/fcm/NotificationClient;)Landroid/content/Context;
+
+    move-result-object v11
+
+    invoke-virtual {v10, v3, v4, v11}, Lcom/discord/utilities/fcm/NotificationClient;->clear(JLandroid/content/Context;)V
+
+    goto :goto_1
 
     :cond_b
-    return-void
+    sget-object v2, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
 
-    :cond_c
-    :goto_1
-    invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationData;->getType()Ljava/lang/String;
+    invoke-static {v2}, Lcom/discord/utilities/fcm/NotificationClient;->access$getContext$p(Lcom/discord/utilities/fcm/NotificationClient;)Landroid/content/Context;
 
-    move-result-object v6
+    move-result-object v2
 
-    const-string v7, "MESSAGE_CREATE"
+    if-nez v2, :cond_c
 
-    invoke-static {v6, v7}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_d
-
-    sget-object v7, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
-
-    const/4 v9, 0x0
-
-    new-array v1, v1, [Lkotlin/Pair;
-
-    invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationData;->getMessageId()J
-
-    move-result-wide v10
-
-    invoke-static {v10, v11}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
-
-    move-result-object v6
-
-    const-string v8, "messageId"
-
-    invoke-static {v8, v6}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
-
-    move-result-object v6
-
-    aput-object v6, v1, v5
-
-    invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationData;->getChannelId()J
-
-    move-result-wide v5
-
-    invoke-static {v5, v6}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
-
-    move-result-object v5
-
-    const-string v6, "channelId"
-
-    invoke-static {v6, v5}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
-
-    move-result-object v5
-
-    aput-object v5, v1, v4
-
-    invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isAuthed()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/String;->valueOf(Z)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v4, "isAuthed"
-
-    invoke-static {v4, v0}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
-
-    move-result-object v0
-
-    aput-object v0, v1, v3
-
-    invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationData;->getType()Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v0, "type"
-
-    invoke-static {v0, p1}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
-
-    move-result-object p1
-
-    aput-object p1, v1, v2
-
-    invoke-static {v1}, Lkotlin/a/ad;->a([Lkotlin/Pair;)Ljava/util/Map;
-
-    move-result-object v10
-
-    const/4 v11, 0x2
+    sget-object v10, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v12, 0x0
 
-    const-string v8, "Not showing invalid notification"
+    const/4 v13, 0x0
 
-    invoke-static/range {v7 .. v12}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
+    const/4 v14, 0x6
+
+    const/4 v15, 0x0
+
+    const-string v11, "Not showing notification because context was null."
+
+    invoke-static/range {v10 .. v15}, 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_c
+    invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationData;->isValid()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_10
+
+    invoke-virtual {v1}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isAuthed()Z
+
+    move-result v3
+
+    if-nez v3, :cond_d
+
+    goto :goto_2
 
     :cond_d
+    sget-object v3, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
+
+    invoke-static {v3}, Lcom/discord/utilities/fcm/NotificationClient;->access$isBackgrounded$p(Lcom/discord/utilities/fcm/NotificationClient;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_e
+
+    invoke-virtual {v1}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_e
+
+    sget-object v3, Lcom/discord/utilities/fcm/NotificationRenderer;->INSTANCE:Lcom/discord/utilities/fcm/NotificationRenderer;
+
+    invoke-virtual {v3, v2, v0, v1}, Lcom/discord/utilities/fcm/NotificationRenderer;->display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V
+
+    return-void
+
+    :cond_e
+    sget-object v3, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
+
+    invoke-static {v3}, Lcom/discord/utilities/fcm/NotificationClient;->access$isBackgrounded$p(Lcom/discord/utilities/fcm/NotificationClient;)Z
+
+    move-result v3
+
+    if-nez v3, :cond_f
+
+    invoke-virtual {v1}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_f
+
+    sget-object v1, Lcom/discord/utilities/fcm/NotificationRenderer;->INSTANCE:Lcom/discord/utilities/fcm/NotificationRenderer;
+
+    invoke-virtual {v1, v2, v0}, Lcom/discord/utilities/fcm/NotificationRenderer;->displayInApp(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;)V
+
+    :cond_f
+    return-void
+
+    :cond_10
+    :goto_2
+    invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationData;->getType()Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "MESSAGE_CREATE"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_11
+
+    sget-object v10, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
+
+    const/4 v12, 0x0
+
+    new-array v2, v5, [Lkotlin/Pair;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationData;->getMessageId()J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v4, "messageId"
+
+    invoke-static {v4, v3}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v3
+
+    aput-object v3, v2, v9
+
+    invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationData;->getChannelId()J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v4, "channelId"
+
+    invoke-static {v4, v3}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v3
+
+    aput-object v3, v2, v8
+
+    invoke-virtual {v1}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isAuthed()Z
+
+    move-result v1
+
+    invoke-static {v1}, Ljava/lang/String;->valueOf(Z)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v3, "isAuthed"
+
+    invoke-static {v3, v1}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v1
+
+    aput-object v1, v2, v7
+
+    invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationData;->getType()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "type"
+
+    invoke-static {v1, v0}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v0
+
+    aput-object v0, v2, v6
+
+    invoke-static {v2}, Lkotlin/a/ad;->a([Lkotlin/Pair;)Ljava/util/Map;
+
+    move-result-object v13
+
+    const/4 v14, 0x2
+
+    const/4 v15, 0x0
+
+    const-string v11, "Not showing invalid notification"
+
+    invoke-static/range {v10 .. v15}, 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
+
+    :cond_11
     return-void
 .end method
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$4.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$4.smali
index 4c4648d0db..8f625085a8 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$4.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$4.smali
@@ -47,7 +47,7 @@
 .method public final onCanceled()V
     .locals 4
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v1, 0x0
 
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 d593386fc5..f59a501130 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
@@ -51,7 +51,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     move-object v3, p1
 
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 b5e43f1060..4b0d3a33cf 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/fcm/NotificationClient$tokenCallback$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -71,7 +71,7 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 6
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     sget-object p1, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali
index e1c414b98b..cf32df07f2 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali
@@ -266,7 +266,7 @@
     sput-object p1, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->localeProvider:Lkotlin/jvm/functions/Function0;
 
     :try_start_0
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AZ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AU()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
@@ -274,7 +274,15 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bd()Lcom/google/android/gms/tasks/Task;
+    iget-object v0, p1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUR:Lcom/google/firebase/FirebaseApp;
+
+    invoke-static {v0}, Lcom/google/firebase/iid/g;->c(Lcom/google/firebase/FirebaseApp;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "*"
+
+    invoke-virtual {p1, v0, v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->V(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/tasks/Task;
 
     move-result-object p1
 
@@ -307,7 +315,7 @@
     :catch_0
     move-exception p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     move-object v2, p1
 
@@ -364,7 +372,7 @@
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
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 b0202d6cb8..5f77102a2b 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData$Companion.smali
@@ -244,7 +244,7 @@
 
     check-cast v3, Ljava/lang/String;
 
-    invoke-static {v3}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v3}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v3
 
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 e5b899dcb3..ce55bae812 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData$DisplayPayload.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData$DisplayPayload.smali
@@ -124,13 +124,13 @@
 
     move-result v0
 
-    invoke-static {v0}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v0}, Lkotlin/a/ad;->dj(I)I
 
     move-result v0
 
     const/16 v1, 0x10
 
-    invoke-static {v0, v1}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v0, v1}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
index 6a3df3fcdd..39b7982c2c 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
@@ -396,7 +396,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {v1}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v1}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v1
 
@@ -424,7 +424,7 @@
 
     if-eqz v1, :cond_2
 
-    invoke-static {v1}, Lkotlin/text/l;->dU(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v1}, Lkotlin/text/l;->dO(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v1
 
@@ -458,7 +458,7 @@
 
     if-eqz v9, :cond_3
 
-    invoke-static {v9}, Lkotlin/text/l;->dU(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v9}, Lkotlin/text/l;->dO(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v9
 
@@ -492,7 +492,7 @@
 
     if-eqz v11, :cond_4
 
-    invoke-static {v11}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v11}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v11
 
@@ -532,7 +532,7 @@
 
     if-eqz v14, :cond_5
 
-    invoke-static {v14}, Lkotlin/text/l;->dU(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v14}, Lkotlin/text/l;->dO(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v14
 
@@ -576,7 +576,7 @@
 
     if-eqz v2, :cond_6
 
-    invoke-static {v2}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v2}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v2
 
@@ -622,7 +622,7 @@
 
     if-eqz v2, :cond_7
 
-    invoke-static {v2}, Lkotlin/text/l;->dU(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v2}, Lkotlin/text/l;->dO(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v2
 
@@ -650,7 +650,7 @@
 
     if-eqz v2, :cond_8
 
-    invoke-static {v2}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v2}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v2
 
@@ -696,7 +696,7 @@
 
     if-eqz v2, :cond_9
 
-    invoke-static {v2}, Lkotlin/text/l;->dU(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v2}, Lkotlin/text/l;->dO(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v2
 
@@ -734,7 +734,7 @@
 
     if-eqz v2, :cond_a
 
-    invoke-static {v2}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v2}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v2
 
@@ -1181,7 +1181,7 @@
 
     if-eqz v0, :cond_c
 
-    const v0, 0x7f120c92
+    const v0, 0x7f120ccd
 
     new-array v1, v6, [Ljava/lang/Object;
 
@@ -1269,7 +1269,7 @@
     return-object v1
 
     :cond_2
-    const v0, 0x7f120c24
+    const v0, 0x7f120c58
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1290,7 +1290,7 @@
     return-object p1
 
     :cond_3
-    const v0, 0x7f120c22
+    const v0, 0x7f120c56
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1342,7 +1342,7 @@
 
     if-ne v0, v4, :cond_6
 
-    const v0, 0x7f120c2a
+    const v0, 0x7f120c5e
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1365,7 +1365,7 @@
     :cond_6
     if-ne v0, v6, :cond_7
 
-    const v0, 0x7f120c28
+    const v0, 0x7f120c5c
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1412,7 +1412,7 @@
 
     if-nez v0, :cond_9
 
-    const v0, 0x7f120c20
+    const v0, 0x7f120c54
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1442,7 +1442,7 @@
 
     if-eqz v0, :cond_c
 
-    const v0, 0x7f1206e5
+    const v0, 0x7f120700
 
     new-array v1, v6, [Ljava/lang/Object;
 
@@ -1476,7 +1476,7 @@
     goto :goto_0
 
     :cond_a
-    const v0, 0x7f120c2c
+    const v0, 0x7f120c60
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1485,7 +1485,7 @@
     goto :goto_0
 
     :cond_b
-    const v0, 0x7f120c1e
+    const v0, 0x7f120c52
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1789,7 +1789,7 @@
 
     invoke-direct {p2, v0}, Landroidx/core/app/RemoteInput$Builder;-><init>(Ljava/lang/String;)V
 
-    const v0, 0x7f120fca
+    const v0, 0x7f121004
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1837,9 +1837,9 @@
 
     new-instance v2, Landroidx/core/app/NotificationCompat$Action$Builder;
 
-    const v3, 0x7f080355
+    const v3, 0x7f080366
 
-    const v4, 0x7f120c2d
+    const v4, 0x7f120c61
 
     invoke-virtual {p1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2211,9 +2211,9 @@
 
     new-instance v1, Landroidx/core/app/NotificationCompat$Action$Builder;
 
-    const v2, 0x7f080225
+    const v2, 0x7f080234
 
-    const v3, 0x7f120b25
+    const v3, 0x7f120b55
 
     invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2597,7 +2597,7 @@
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f12050c
+    const v0, 0x7f120517
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2871,7 +2871,7 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f080301
+    const v0, 0x7f080312
 
     return v0
 
@@ -2884,7 +2884,7 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f080303
+    const v0, 0x7f080314
 
     return v0
 
@@ -2897,13 +2897,13 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f080302
+    const v0, 0x7f080313
 
     return v0
 
     :cond_3
     :goto_0
-    const v0, 0x7f080300
+    const v0, 0x7f080311
 
     return v0
 .end method
@@ -2947,7 +2947,7 @@
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f120973
+    const v0, 0x7f120993
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -3065,7 +3065,7 @@
 
     if-nez v0, :cond_4
 
-    const v0, 0x7f120c32
+    const v0, 0x7f120c66
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -3085,7 +3085,7 @@
 
     if-eqz v0, :cond_5
 
-    const v0, 0x7f1206e6
+    const v0, 0x7f120701
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 23ba9029ee..520caba56c 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/fcm/NotificationRenderer$clear$1;->invoke(I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$1.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$1.smali
index a53669c519..dd4a767154 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$1.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$1.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/fcm/NotificationRenderer$display$1;->invoke(Landroid/graphics/Bitmap;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,7 +87,7 @@
     :catch_0
     move-exception p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     move-object v2, p1
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$2.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$2.smali
index a33bfe89a5..91c1ade657 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$2.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/fcm/NotificationRenderer$display$2;->invoke(Landroid/graphics/Bitmap;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$3.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$3.smali
index 39989f56f5..85959c3d14 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$3.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/fcm/NotificationRenderer$display$3;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 987fef3e77..e1e3fd45d3 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/fcm/NotificationRenderer$displayInApp$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 23baf29541..aea1c8d04f 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
@@ -136,7 +136,7 @@
 
     move-result-object v0
 
-    const v2, 0x7f06002c
+    const v2, 0x7f06002d
 
     invoke-static {p1, v2}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 
@@ -281,7 +281,7 @@
 
     if-nez p3, :cond_3
 
-    const p3, 0x7f0600f4
+    const p3, 0x7f0600f7
 
     invoke-static {p1, p3}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -387,7 +387,7 @@
     :catch_0
     move-exception p2
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     move-object v2, p2
 
@@ -432,7 +432,7 @@
 
     invoke-direct {v0}, Landroidx/core/app/Person$Builder;-><init>()V
 
-    const v1, 0x7f120b33
+    const v1, 0x7f120b64
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -823,12 +823,12 @@
 
     if-eqz p5, :cond_0
 
-    const p5, 0x7f120c2f
+    const p5, 0x7f120c63
 
     goto :goto_0
 
     :cond_0
-    const p5, 0x7f120c2e
+    const p5, 0x7f120c62
 
     :goto_0
     sget-object v0, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion;
@@ -879,7 +879,7 @@
 
     move-result-object p3
 
-    const v3, 0x7f080303
+    const v3, 0x7f080314
 
     invoke-virtual {p3, v3}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
@@ -947,7 +947,7 @@
 
     new-instance v0, Landroid/app/NotificationChannel;
 
-    const v1, 0x7f120356
+    const v1, 0x7f12035b
 
     invoke-virtual {p1, v1}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -963,7 +963,7 @@
 
     new-instance v2, Landroid/app/NotificationChannel;
 
-    const v4, 0x7f1212d5
+    const v4, 0x7f121326
 
     invoke-virtual {p1, v4}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -979,7 +979,7 @@
 
     new-instance v4, Landroid/app/NotificationChannel;
 
-    const v6, 0x7f120b57
+    const v6, 0x7f120b88
 
     invoke-virtual {p1, v6}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -995,7 +995,7 @@
 
     new-instance v6, Landroid/app/NotificationChannel;
 
-    const v8, 0x7f1204f5
+    const v8, 0x7f120500
 
     invoke-virtual {p1, v8}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -1009,7 +1009,7 @@
 
     new-instance v8, Landroid/app/NotificationChannel;
 
-    const v9, 0x7f12068a
+    const v9, 0x7f120698
 
     invoke-virtual {p1, v9}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -1023,7 +1023,7 @@
 
     new-instance v9, Landroid/app/NotificationChannel;
 
-    const v10, 0x7f1206c2
+    const v10, 0x7f1206dd
 
     invoke-virtual {p1, v10}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -1057,7 +1057,7 @@
 
     aput-object v9, v10, v3
 
-    invoke-static {v10}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v10}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v3
 
@@ -1088,7 +1088,7 @@
 
     invoke-virtual {v6, v11}, Landroid/app/NotificationChannel;->enableLights(Z)V
 
-    const v7, 0x7f0600f4
+    const v7, 0x7f0600f7
 
     invoke-virtual {p1, v7}, Landroid/app/Application;->getColor(I)I
 
diff --git a/com.discord/smali/com/discord/utilities/font/FontUtils.smali b/com.discord/smali/com/discord/utilities/font/FontUtils.smali
index 1e0bba4fdf..5960b5fd3c 100644
--- a/com.discord/smali/com/discord/utilities/font/FontUtils.smali
+++ b/com.discord/smali/com/discord/utilities/font/FontUtils.smali
@@ -55,7 +55,7 @@
 
     mul-float p1, p1, v0
 
-    invoke-static {p1}, Lkotlin/e/a;->D(F)I
+    invoke-static {p1}, Lkotlin/e/a;->C(F)I
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker.smali b/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker.smali
index cf63890261..d0c498844a 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, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -329,7 +329,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v0, Ljava/util/List;
 
@@ -370,7 +370,7 @@
 
     if-nez p3, :cond_2
 
-    sget-object p2, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p2, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p2, Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali
index 664e08e266..fb4bdd6bf0 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali
@@ -215,7 +215,7 @@
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     invoke-virtual {v1}, Landroid/app/usage/UsageStats;->getLastTimeStamp()J
@@ -479,7 +479,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-virtual {v0, v4, v5, v2, v3}, Landroid/app/usage/UsageStatsManager;->queryAndAggregateUsageStats(JJ)Ljava/util/Map;
@@ -494,7 +494,7 @@
 
     if-eqz v2, :cond_1
 
-    sget-object p1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -598,7 +598,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
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 dfea20e5d5..50d39bb009 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
@@ -96,7 +96,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f06002c
+    const v3, 0x7f06002d
 
     invoke-static {p1, v3}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 
@@ -106,13 +106,13 @@
 
     move-result-object v2
 
-    const v3, 0x7f080300
+    const v3, 0x7f080311
 
     invoke-virtual {v2, v3}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
     move-result-object v2
 
-    const v3, 0x7f12050c
+    const v3, 0x7f120517
 
     invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -126,7 +126,7 @@
 
     if-nez p2, :cond_0
 
-    const p2, 0x7f1206c2
+    const p2, 0x7f1206dd
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -135,7 +135,7 @@
     goto :goto_0
 
     :cond_0
-    const v3, 0x7f1206bd
+    const v3, 0x7f1206d8
 
     const/4 v4, 0x1
 
@@ -239,7 +239,7 @@
 
     :catch_0
     :try_start_2
-    sget-object p1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-string v0, "Cannot start Game Detection Service"
 
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 d258fcaec0..0773a92960 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
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0, p1, p2, p3}, Lcom/discord/utilities/games/GameDetectionService$onCreate$1;->call(Ljava/lang/Boolean;Ljava/lang/Long;Lkotlin/Unit;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 8661e73f24..f401e5116c 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/games/GameDetectionService$onCreate$2;->invoke(Lkotlin/Unit;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$3.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$3.smali
index 4e05350d02..92dc5c53e8 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$3.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$3.smali
@@ -59,7 +59,7 @@
 .method public final call(Lcom/discord/utilities/error/Error;)V
     .locals 3
 
-    sget-object p1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v0, 0x0
 
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 b6a303e869..60ec1f6eb5 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/games/GameDetectionService$onCreate$4;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 093cec7656..0e14e0bb47 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/games/GameDetectionService$onCreate$5;->invoke(Lcom/discord/stores/StoreRunningGame$RunningGame;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 6766944c9d..2c34698678 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/games/GameDetectionService$onCreate$6;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 4939512ee2..f4f16c46b3 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService.smali
@@ -161,7 +161,7 @@
 
     invoke-super {p0}, Landroid/app/Service;->onCreate()V
 
-    sget-object v0, Lcom/discord/app/g;->uX:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->uW:Lcom/discord/app/g;
 
     invoke-virtual {v0, p0}, Lcom/discord/app/g;->u(Ljava/lang/Object;)V
 
@@ -211,7 +211,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/utilities/games/GameDetectionService$onCreate$2;
 
@@ -257,7 +257,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/utilities/games/GameDetectionService$onCreate$5;
 
@@ -317,7 +317,7 @@
 
     invoke-virtual {v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->gameDetectionServiceDestroyed()V
 
-    sget-object v0, Lcom/discord/app/g;->uX:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->uW:Lcom/discord/app/g;
 
     invoke-virtual {v0, p0}, Lcom/discord/app/g;->v(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali/com/discord/utilities/guilds/RoleUtils.smali b/com.discord/smali/com/discord/utilities/guilds/RoleUtils.smali
index 0cdde97faa..d393938862 100644
--- a/com.discord/smali/com/discord/utilities/guilds/RoleUtils.smali
+++ b/com.discord/smali/com/discord/utilities/guilds/RoleUtils.smali
@@ -82,7 +82,7 @@
 
     if-eqz p3, :cond_0
 
-    const p2, 0x7f0600c1
+    const p2, 0x7f0600c4
 
     :cond_0
     invoke-static {p0, p1, p2}, Lcom/discord/utilities/guilds/RoleUtils;->getRoleColor(Lcom/discord/models/domain/ModelGuildRole;Landroid/content/Context;I)I
diff --git a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
index c5492a46f8..2e74bba9e6 100644
--- a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
+++ b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
@@ -8,18 +8,28 @@
 
 .field public static final DEFAULT_ICON_BLURPLE:Ljava/lang/String; = "asset://asset/images/default_icon_selected.jpg"
 
+.field private static final GROUP_DM_DEFAULT_ICONS:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field private static final IMAGE_SIZE_ASSET_DEFAULT_PX:I = 0xa0
 
 .field public static final INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
 .field private static final MEDIA_PROXY_SIZES:[Ljava/lang/Integer;
 
-.field private static final UNRESTRICTED:I = 0x7f07005c
+.field private static final UNRESTRICTED:I = 0x7f07005b
 
 
 # direct methods
 .method static constructor <clinit>()V
-    .locals 4
+    .locals 8
 
     new-instance v0, Lcom/discord/utilities/icon/IconUtils;
 
@@ -27,79 +37,143 @@
 
     sput-object v0, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
+    new-instance v0, Lkotlin/ranges/IntRange;
+
+    const/4 v1, 0x7
+
+    const/4 v2, 0x0
+
+    invoke-direct {v0, v2, v1}, Lkotlin/ranges/IntRange;-><init>(II)V
+
+    check-cast v0, Ljava/lang/Iterable;
+
+    new-instance v3, Ljava/util/ArrayList;
+
+    const/16 v4, 0xa
+
+    invoke-static {v0, v4}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
+
+    move-result v5
+
+    invoke-direct {v3, v5}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast v3, Ljava/util/Collection;
+
+    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 v5
+
+    if-eqz v5, :cond_0
+
+    move-object v5, v0
+
+    check-cast v5, Lkotlin/a/ab;
+
+    invoke-virtual {v5}, Lkotlin/a/ab;->nextInt()I
+
+    move-result v5
+
+    new-instance v6, Ljava/lang/StringBuilder;
+
+    const-string v7, "asset://asset/images/group_dm_icon_"
+
+    invoke-direct {v6, v7}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v6, v5}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v5, ".png"
+
+    invoke-virtual {v6, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-interface {v3, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    check-cast v3, Ljava/util/List;
+
+    sput-object v3, Lcom/discord/utilities/icon/IconUtils;->GROUP_DM_DEFAULT_ICONS:Ljava/util/List;
+
     const/16 v0, 0x12
 
     new-array v0, v0, [Ljava/lang/Integer;
 
-    const/16 v1, 0x10
+    const/16 v3, 0x10
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v2
+    move-result-object v5
 
-    const/4 v3, 0x0
+    aput-object v5, v0, v2
 
-    aput-object v2, v0, v3
+    const/4 v2, 0x1
 
-    const/16 v2, 0x14
+    const/16 v5, 0x14
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v2
+    move-result-object v5
 
-    const/4 v3, 0x1
+    aput-object v5, v0, v2
 
-    aput-object v2, v0, v3
+    const/4 v2, 0x2
 
-    const/16 v2, 0x20
+    const/16 v5, 0x20
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v2
+    move-result-object v5
 
-    const/4 v3, 0x2
+    aput-object v5, v0, v2
 
-    aput-object v2, v0, v3
+    const/4 v2, 0x3
 
-    const/16 v2, 0x28
+    const/16 v5, 0x28
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v2
+    move-result-object v5
 
-    const/4 v3, 0x3
+    aput-object v5, v0, v2
 
-    aput-object v2, v0, v3
+    const/4 v2, 0x4
 
-    const/16 v2, 0x40
+    const/16 v5, 0x40
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v2
+    move-result-object v5
 
-    const/4 v3, 0x4
+    aput-object v5, v0, v2
 
-    aput-object v2, v0, v3
+    const/4 v2, 0x5
 
-    const/16 v2, 0x50
+    const/16 v5, 0x50
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v2
+    move-result-object v5
 
-    const/4 v3, 0x5
+    aput-object v5, v0, v2
 
-    aput-object v2, v0, v3
+    const/4 v2, 0x6
 
-    const/16 v2, 0x80
+    const/16 v5, 0x80
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v2
+    move-result-object v5
 
-    const/4 v3, 0x6
-
-    aput-object v2, v0, v3
+    aput-object v5, v0, v2
 
     const/16 v2, 0xa0
 
@@ -107,9 +181,9 @@
 
     move-result-object v2
 
-    const/4 v3, 0x7
+    aput-object v2, v0, v1
 
-    aput-object v2, v0, v3
+    const/16 v1, 0x8
 
     const/16 v2, 0x100
 
@@ -117,9 +191,9 @@
 
     move-result-object v2
 
-    const/16 v3, 0x8
+    aput-object v2, v0, v1
 
-    aput-object v2, v0, v3
+    const/16 v1, 0x9
 
     const/16 v2, 0x140
 
@@ -127,19 +201,17 @@
 
     move-result-object v2
 
-    const/16 v3, 0x9
+    aput-object v2, v0, v1
 
-    aput-object v2, v0, v3
+    const/16 v1, 0x200
 
-    const/16 v2, 0x200
+    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
+    aput-object v1, v0, v4
 
-    const/16 v3, 0xa
-
-    aput-object v2, v0, v3
+    const/16 v1, 0xb
 
     const/16 v2, 0x280
 
@@ -147,9 +219,9 @@
 
     move-result-object v2
 
-    const/16 v3, 0xb
+    aput-object v2, v0, v1
 
-    aput-object v2, v0, v3
+    const/16 v1, 0xc
 
     const/16 v2, 0x400
 
@@ -157,9 +229,9 @@
 
     move-result-object v2
 
-    const/16 v3, 0xc
+    aput-object v2, v0, v1
 
-    aput-object v2, v0, v3
+    const/16 v1, 0xd
 
     const/16 v2, 0x500
 
@@ -167,9 +239,9 @@
 
     move-result-object v2
 
-    const/16 v3, 0xd
+    aput-object v2, v0, v1
 
-    aput-object v2, v0, v3
+    const/16 v1, 0xe
 
     const/16 v2, 0x600
 
@@ -177,9 +249,9 @@
 
     move-result-object v2
 
-    const/16 v3, 0xe
+    aput-object v2, v0, v1
 
-    aput-object v2, v0, v3
+    const/16 v1, 0xf
 
     const/16 v2, 0x800
 
@@ -187,11 +259,19 @@
 
     move-result-object v2
 
-    const/16 v3, 0xf
+    aput-object v2, v0, v1
 
-    aput-object v2, v0, v3
+    const/16 v1, 0xc00
 
-    const/16 v2, 0xc00
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    aput-object v1, v0, v3
+
+    const/16 v1, 0x11
+
+    const/16 v2, 0x1000
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -199,16 +279,6 @@
 
     aput-object v2, v0, v1
 
-    const/16 v1, 0x1000
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    const/16 v2, 0x11
-
-    aput-object v1, v0, v2
-
     sput-object v0, Lcom/discord/utilities/icon/IconUtils;->MEDIA_PROXY_SIZES:[Ljava/lang/Integer;
 
     return-void
@@ -514,7 +584,37 @@
     :goto_0
     if-eqz v2, :cond_5
 
-    const-string p0, "asset://asset/images/default_group.png"
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v0
+
+    const/16 p0, 0x16
+
+    ushr-long/2addr v0, p0
+
+    const-wide v2, 0x14aa2cab000L
+
+    add-long/2addr v0, v2
+
+    sget-object p0, Lcom/discord/utilities/icon/IconUtils;->GROUP_DM_DEFAULT_ICONS:Ljava/util/List;
+
+    invoke-interface {p0}, Ljava/util/List;->size()I
+
+    move-result p0
+
+    int-to-long v2, p0
+
+    rem-long/2addr v0, v2
+
+    long-to-int p0, v0
+
+    sget-object v0, Lcom/discord/utilities/icon/IconUtils;->GROUP_DM_DEFAULT_ICONS:Ljava/util/List;
+
+    invoke-interface {v0, p0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Ljava/lang/String;
 
     return-object p0
 
@@ -722,7 +822,7 @@
 
     if-nez p1, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     const-string p2, "a_"
@@ -1682,7 +1782,7 @@
 
     if-eqz p5, :cond_0
 
-    const p2, 0x7f07005c
+    const p2, 0x7f07005b
 
     :cond_0
     and-int/lit8 p4, p4, 0x8
@@ -1706,7 +1806,7 @@
 
     if-eqz p6, :cond_0
 
-    const p2, 0x7f07005c
+    const p2, 0x7f07005b
 
     :cond_0
     and-int/lit8 p6, p5, 0x8
@@ -1737,7 +1837,7 @@
 
     if-eqz p6, :cond_0
 
-    const p2, 0x7f07005c
+    const p2, 0x7f07005b
 
     :cond_0
     and-int/lit8 p6, p5, 0x8
@@ -1768,7 +1868,7 @@
 
     if-eqz p6, :cond_0
 
-    const p2, 0x7f07005c
+    const p2, 0x7f07005b
 
     :cond_0
     and-int/lit8 p6, p5, 0x8
@@ -2028,7 +2128,7 @@
     :cond_5
     sget-object v0, Lcom/discord/utilities/icon/IconUtils;->MEDIA_PROXY_SIZES:[Ljava/lang/Integer;
 
-    invoke-static {v0}, Lkotlin/a/g;->e([Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0}, Lkotlin/a/g;->d([Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2233,7 +2333,7 @@
     :cond_4
     sget-object p4, Lcom/discord/utilities/icon/IconUtils;->MEDIA_PROXY_SIZES:[Ljava/lang/Integer;
 
-    invoke-static {p4}, Lkotlin/a/g;->e([Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p4}, Lkotlin/a/g;->d([Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p4
 
@@ -2407,7 +2507,7 @@
     :cond_4
     sget-object v0, Lcom/discord/utilities/icon/IconUtils;->MEDIA_PROXY_SIZES:[Ljava/lang/Integer;
 
-    invoke-static {v0}, Lkotlin/a/g;->e([Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0}, Lkotlin/a/g;->d([Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2592,7 +2692,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803bb
+    const p1, 0x7f0803d3
 
     return p1
 
@@ -2605,7 +2705,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803c8
+    const p1, 0x7f0803e0
 
     return p1
 
@@ -2618,7 +2718,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803cb
+    const p1, 0x7f0803e3
 
     return p1
 
@@ -2653,7 +2753,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803c4
+    const p1, 0x7f0803dc
 
     return p1
 
@@ -2666,7 +2766,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803b7
+    const p1, 0x7f0803cf
 
     return p1
 
@@ -2679,7 +2779,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803d0
+    const p1, 0x7f0803e8
 
     return p1
 
@@ -2692,7 +2792,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803c3
+    const p1, 0x7f0803db
 
     return p1
 
@@ -2705,7 +2805,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803ce
+    const p1, 0x7f0803e6
 
     return p1
 
@@ -2740,7 +2840,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803d1
+    const p1, 0x7f0803e9
 
     return p1
 
@@ -2754,7 +2854,7 @@
     if-eqz p1, :cond_1
 
     :goto_0
-    const p1, 0x7f0803be
+    const p1, 0x7f0803d6
 
     return p1
 
@@ -2768,13 +2868,13 @@
     if-eqz p1, :cond_1
 
     :goto_1
-    const p1, 0x7f0803c0
+    const p1, 0x7f0803d8
 
     return p1
 
     :cond_1
     :goto_2
-    const p1, 0x7f0803d6
+    const p1, 0x7f0803ee
 
     return p1
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali b/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali
index ca8efa657e..1ebb19e354 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali
@@ -41,7 +41,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f12119d
+    const v1, 0x7f1211e1
 
     const/4 v2, 0x1
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImages.smali b/com.discord/smali/com/discord/utilities/images/MGImages.smali
index 5226648db8..595b96931d 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages.smali
@@ -73,11 +73,21 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/DraweeView;->he()Z
+    iget-object v1, v0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
-    move-result v1
+    iget-object v1, v1, Lcom/facebook/drawee/view/b;->Oh:Lcom/facebook/drawee/d/b;
 
-    if-nez v1, :cond_0
+    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
 
     new-instance v1, Lcom/facebook/drawee/generic/a;
 
@@ -87,7 +97,7 @@
 
     invoke-direct {v1, p1}, Lcom/facebook/drawee/generic/a;-><init>(Landroid/content/res/Resources;)V
 
-    invoke-virtual {v1}, Lcom/facebook/drawee/generic/a;->gX()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {v1}, Lcom/facebook/drawee/generic/a;->hb()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
     move-result-object p1
 
@@ -95,18 +105,18 @@
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/view/DraweeView;->setHierarchy(Lcom/facebook/drawee/d/b;)V
 
-    :cond_0
+    :cond_1
     invoke-virtual {v0}, Lcom/facebook/drawee/view/DraweeView;->getHierarchy()Lcom/facebook/drawee/d/b;
 
     move-result-object p1
 
-    if-eqz p1, :cond_1
+    if-eqz p1, :cond_2
 
     check-cast p1, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
     return-object p1
 
-    :cond_1
+    :cond_2
     new-instance p1, Lkotlin/r;
 
     const-string v0, "null cannot be cast to non-null type com.facebook.drawee.generic.GenericDraweeHierarchy"
@@ -131,11 +141,9 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YA:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YS:Lcom/facebook/imagepipeline/request/b$b;
 
-    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->a(Lcom/facebook/imagepipeline/request/b$b;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
-
-    move-result-object v0
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ww:Lcom/facebook/imagepipeline/request/b$b;
 
     const-string v1, "requestBuilder"
 
@@ -160,16 +168,16 @@
     goto :goto_0
 
     :cond_0
-    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->Yy:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->YQ:Lcom/facebook/imagepipeline/request/b$a;
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->Yx:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->YP:Lcom/facebook/imagepipeline/request/b$a;
 
     :goto_1
-    invoke-virtual {v0, p0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->a(Lcom/facebook/imagepipeline/request/b$a;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YG:Lcom/facebook/imagepipeline/request/b$a;
 
     if-lez p1, :cond_2
 
@@ -184,12 +192,96 @@
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/imagepipeline/a/e;-><init>(II)V
 
-    invoke-virtual {v0, p0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->b(Lcom/facebook/imagepipeline/a/e;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     :cond_3
     return-object v0
 .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 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/net/Uri;",
+            "Ljava/lang/String;",
+            "Landroidx/fragment/app/FragmentManager;",
+            "Lcom/miguelgaeta/media_picker/MediaPicker$Provider;",
+            "Lrx/functions/Action1<",
+            "Ljava/lang/String;",
+            ">;",
+            "Lcom/discord/dialogs/ImageUploadDialog$PreviewType;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "uri"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "mimeType"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "fragmentManager"
+
+    invoke-static {p2, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "provider"
+
+    invoke-static {p3, v3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "previewType"
+
+    invoke-static {p5, v4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog;->wy:Lcom/discord/dialogs/ImageUploadDialog$a;
+
+    invoke-static {p2, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p3, v3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p5, v4}, Lkotlin/jvm/internal/k;->h(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}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p0, v0, Lcom/discord/dialogs/ImageUploadDialog;->uri:Landroid/net/Uri;
+
+    invoke-static {p3, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p3, v0, Lcom/discord/dialogs/ImageUploadDialog;->wv:Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
+
+    iput-object p1, v0, Lcom/discord/dialogs/ImageUploadDialog;->mimeType:Ljava/lang/String;
+
+    iput-object p4, v0, Lcom/discord/dialogs/ImageUploadDialog;->ww:Lrx/functions/Action1;
+
+    iput-object p5, v0, Lcom/discord/dialogs/ImageUploadDialog;->wx:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    const-class p0, Lcom/discord/dialogs/ImageUploadDialog;
+
+    invoke-virtual {p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "ImageUploadDialog::class.java.name"
+
+    invoke-static {p0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, p2, p0}, Lcom/discord/dialogs/ImageUploadDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+
+    return-void
+.end method
+
 .method public static final requestAvatarCrop(Landroid/content/Context;Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Landroid/net/Uri;)V
     .locals 7
 
@@ -205,35 +297,51 @@
 
     invoke-direct {v6}, Lcom/yalantis/ucrop/a$a;-><init>()V
 
-    const v0, 0x7f06002c
+    const v0, 0x7f06002d
 
     invoke-static {p0, v0}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v1
 
-    invoke-virtual {v6, v1}, Lcom/yalantis/ucrop/a$a;->cX(I)V
+    iget-object v2, v6, Lcom/yalantis/ucrop/a$a;->bbL:Landroid/os/Bundle;
 
-    const v1, 0x7f060030
+    const-string v3, "com.yalantis.ucrop.ToolbarColor"
+
+    invoke-virtual {v2, v3, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+
+    const v1, 0x7f060031
 
     invoke-static {p0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v1
 
-    invoke-virtual {v6, v1}, Lcom/yalantis/ucrop/a$a;->setStatusBarColor(I)V
+    iget-object v2, v6, Lcom/yalantis/ucrop/a$a;->bbL:Landroid/os/Bundle;
 
-    const v1, 0x7f060149
+    const-string v3, "com.yalantis.ucrop.StatusBarColor"
+
+    invoke-virtual {v2, v3, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+
+    const v1, 0x7f06014b
 
     invoke-static {p0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v1
 
-    invoke-virtual {v6, v1}, Lcom/yalantis/ucrop/a$a;->cZ(I)V
+    iget-object v2, v6, Lcom/yalantis/ucrop/a$a;->bbL:Landroid/os/Bundle;
+
+    const-string v3, "com.yalantis.ucrop.UcropToolbarWidgetColor"
+
+    invoke-virtual {v2, v3, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     invoke-static {p0, v0}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v0
 
-    invoke-virtual {v6, v0}, Lcom/yalantis/ucrop/a$a;->cY(I)V
+    iget-object v1, v6, Lcom/yalantis/ucrop/a$a;->bbL:Landroid/os/Bundle;
+
+    const-string v2, "com.yalantis.ucrop.UcropColorWidgetActive"
+
+    invoke-virtual {v1, v2, v0}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     new-instance v0, Lcom/discord/utilities/images/MGImages$requestAvatarCrop$1;
 
@@ -284,7 +392,7 @@
 
     const/4 v1, 0x1
 
-    const v2, 0x7f120285
+    const v2, 0x7f120289
 
     const/4 v3, 0x0
 
@@ -319,7 +427,7 @@
 
     invoke-interface {p3, p2}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    sget-object p2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -410,22 +518,28 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {}, Lcom/facebook/drawee/generic/d;->gZ()Lcom/facebook/drawee/generic/d;
+    invoke-static {}, Lcom/facebook/drawee/generic/d;->hd()Lcom/facebook/drawee/generic/d;
 
     move-result-object p1
 
-    sget-object p2, Lcom/facebook/drawee/generic/d$a;->Nq:Lcom/facebook/drawee/generic/d$a;
+    sget-object p2, Lcom/facebook/drawee/generic/d$a;->NI:Lcom/facebook/drawee/generic/d$a;
 
-    invoke-virtual {p1, p2}, Lcom/facebook/drawee/generic/d;->a(Lcom/facebook/drawee/generic/d$a;)Lcom/facebook/drawee/generic/d;
-
-    move-result-object p1
+    iput-object p2, p1, Lcom/facebook/drawee/generic/d;->NF:Lcom/facebook/drawee/generic/d$a;
 
     goto :goto_0
 
     :cond_0
-    invoke-static {p1}, Lcom/facebook/drawee/generic/d;->l(F)Lcom/facebook/drawee/generic/d;
+    new-instance p2, Lcom/facebook/drawee/generic/d;
 
-    move-result-object p1
+    invoke-direct {p2}, Lcom/facebook/drawee/generic/d;-><init>()V
+
+    invoke-virtual {p2}, Lcom/facebook/drawee/generic/d;->hc()[F
+
+    move-result-object v0
+
+    invoke-static {v0, p1}, Ljava/util/Arrays;->fill([FF)V
+
+    move-object p1, p2
 
     :goto_0
     if-eqz p3, :cond_1
@@ -924,9 +1038,9 @@
     :cond_0
     array-length p6, p1
 
-    const/4 v0, 0x1
+    const/4 v0, 0x0
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
     if-nez p6, :cond_1
 
@@ -979,7 +1093,7 @@
     invoke-interface {p5, v4}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_3
-    invoke-virtual {v4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jS()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v4
 
@@ -994,17 +1108,17 @@
 
     check-cast p6, Ljava/util/Collection;
 
-    new-array p1, v1, [Lcom/facebook/imagepipeline/request/b;
+    new-array p1, v0, [Lcom/facebook/imagepipeline/request/b;
 
     invoke-interface {p6, p1}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
 
     move-result-object p1
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_7
 
     check-cast p1, [Lcom/facebook/imagepipeline/request/b;
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gi()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gm()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object p2
 
@@ -1024,25 +1138,37 @@
 
     check-cast p2, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p2, v0}, Lcom/facebook/drawee/backends/pipeline/e;->w(Z)Lcom/facebook/drawee/controller/a;
-
-    move-result-object p2
+    iput-boolean v1, p2, Lcom/facebook/drawee/controller/a;->KW:Z
 
     check-cast p2, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p2, p1}, Lcom/facebook/drawee/backends/pipeline/e;->c([Ljava/lang/Object;)Lcom/facebook/drawee/controller/a;
+    if-eqz p1, :cond_5
 
-    move-result-object p1
+    array-length p3, p1
 
-    check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
+    if-lez p3, :cond_6
 
-    sget-object p2, Lcom/discord/utilities/images/MGImages;->INSTANCE:Lcom/discord/utilities/images/MGImages;
+    :cond_5
+    const/4 v0, 0x1
 
-    invoke-direct {p2, p0}, Lcom/discord/utilities/images/MGImages;->getDrawee(Landroid/widget/ImageView;)Lcom/facebook/drawee/view/DraweeView;
+    :cond_6
+    const-string p3, "No requests specified!"
+
+    invoke-static {v0, p3}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
+
+    iput-object p1, p2, Lcom/facebook/drawee/controller/a;->KU:[Ljava/lang/Object;
+
+    iput-boolean v1, p2, Lcom/facebook/drawee/controller/a;->KV:Z
+
+    check-cast p2, Lcom/facebook/drawee/backends/pipeline/e;
+
+    sget-object p1, Lcom/discord/utilities/images/MGImages;->INSTANCE:Lcom/discord/utilities/images/MGImages;
+
+    invoke-direct {p1, p0}, Lcom/discord/utilities/images/MGImages;->getDrawee(Landroid/widget/ImageView;)Lcom/facebook/drawee/view/DraweeView;
 
     move-result-object p0
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gF()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p2}, Lcom/facebook/drawee/backends/pipeline/e;->gJ()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
@@ -1052,7 +1178,7 @@
 
     return-void
 
-    :cond_5
+    :cond_7
     new-instance p0, Lkotlin/r;
 
     const-string p1, "null cannot be cast to non-null type kotlin.Array<T>"
@@ -1287,7 +1413,15 @@
 
     move-result-object p0
 
-    invoke-virtual {p0, p1}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->b(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
+    invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
+
+    const/4 v0, 0x2
+
+    invoke-virtual {p0, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->T(I)Lcom/facebook/drawee/drawable/p;
+
+    move-result-object p0
+
+    invoke-virtual {p0, p1}, Lcom/facebook/drawee/drawable/p;->a(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
 
     return-void
 .end method
@@ -1349,7 +1483,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {p2}, Lkotlin/text/l;->dU(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {p2}, Lkotlin/text/l;->dO(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$CirclePostProcessor.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$CirclePostProcessor.smali
index 15bdae46c5..bf31f70521 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$CirclePostProcessor.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$CirclePostProcessor.smali
@@ -77,7 +77,9 @@
 
     iget v1, p0, Lcom/discord/utilities/images/MGImagesBitmap$CirclePostProcessor;->height:I
 
-    invoke-virtual {p2, v0, v1}, Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;->m(II)Lcom/facebook/common/references/CloseableReference;
+    sget-object v2, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
+
+    invoke-virtual {p2, v0, v1, v2}, Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;->c(IILandroid/graphics/Bitmap$Config;)Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali
index cc8a370650..1762a7cee7 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali
@@ -43,7 +43,7 @@
 
 # virtual methods
 .method public final getBitmap(Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -74,7 +74,7 @@
 
     invoke-static {p6, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gj()Lcom/facebook/imagepipeline/b/g;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gn()Lcom/facebook/imagepipeline/b/g;
 
     move-result-object v0
 
@@ -92,21 +92,53 @@
 
     check-cast p4, Lcom/facebook/imagepipeline/request/c;
 
-    invoke-virtual {p1, p4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->a(Lcom/facebook/imagepipeline/request/c;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
+    iput-object p4, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     :cond_0
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jS()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p1
 
-    invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/g;->b(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/b/c;
+    sget-object p2, Lcom/facebook/imagepipeline/request/b$b;->YS:Lcom/facebook/imagepipeline/request/b$b;
+
+    const/4 p3, 0x0
+
+    invoke-virtual {v0, p1, p3, p2, p3}, Lcom/facebook/imagepipeline/b/g;->a(Lcom/facebook/imagepipeline/request/b;Ljava/lang/Object;Lcom/facebook/imagepipeline/request/b$b;Lcom/facebook/imagepipeline/g/c;)Lcom/facebook/b/c;
 
     move-result-object p1
 
     :try_start_0
-    invoke-static {p1}, Lcom/facebook/b/d;->f(Lcom/facebook/b/c;)Ljava/lang/Object;
+    new-instance p2, Ljava/util/concurrent/CountDownLatch;
 
-    move-result-object p2
+    const/4 p4, 0x1
+
+    invoke-direct {p2, p4}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
+
+    new-instance p4, Lcom/facebook/b/d$a;
+
+    invoke-direct {p4, v1}, Lcom/facebook/b/d$a;-><init>(B)V
+
+    new-instance v0, Lcom/facebook/b/d$a;
+
+    invoke-direct {v0, v1}, Lcom/facebook/b/d$a;-><init>(B)V
+
+    new-instance v1, Lcom/facebook/b/d$2;
+
+    invoke-direct {v1, p4, p2, v0}, Lcom/facebook/b/d$2;-><init>(Lcom/facebook/b/d$a;Ljava/util/concurrent/CountDownLatch;Lcom/facebook/b/d$a;)V
+
+    new-instance v2, Lcom/facebook/b/d$3;
+
+    invoke-direct {v2}, Lcom/facebook/b/d$3;-><init>()V
+
+    invoke-interface {p1, v1, v2}, Lcom/facebook/b/c;->a(Lcom/facebook/b/e;Ljava/util/concurrent/Executor;)V
+
+    invoke-virtual {p2}, Ljava/util/concurrent/CountDownLatch;->await()V
+
+    iget-object p2, v0, Lcom/facebook/b/d$a;->value:Ljava/lang/Object;
+
+    if-nez p2, :cond_4
+
+    iget-object p2, p4, Lcom/facebook/b/d$a;->value:Ljava/lang/Object;
 
     check-cast p2, Lcom/facebook/common/references/CloseableReference;
 
@@ -117,55 +149,53 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
     :try_start_1
-    move-object p3, p2
+    move-object p4, p2
 
-    check-cast p3, Lcom/facebook/common/references/CloseableReference;
+    check-cast p4, Lcom/facebook/common/references/CloseableReference;
 
-    invoke-virtual {p3}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
+    invoke-virtual {p4}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
-    move-result-object p3
+    move-result-object p4
 
-    instance-of p4, p3, Lcom/facebook/imagepipeline/f/b;
+    instance-of v0, p4, Lcom/facebook/imagepipeline/f/b;
 
-    const/4 v0, 0x0
+    if-nez v0, :cond_1
 
-    if-nez p4, :cond_1
-
-    move-object p3, v0
+    move-object p4, p3
 
     :cond_1
-    check-cast p3, Lcom/facebook/imagepipeline/f/b;
+    check-cast p4, Lcom/facebook/imagepipeline/f/b;
 
-    if-eqz p3, :cond_2
+    if-eqz p4, :cond_2
 
-    invoke-virtual {p3}, Lcom/facebook/imagepipeline/f/b;->iB()Landroid/graphics/Bitmap;
+    invoke-virtual {p4}, Lcom/facebook/imagepipeline/f/b;->iA()Landroid/graphics/Bitmap;
 
-    move-result-object p3
+    move-result-object p4
 
-    const-string p4, "closeableBitmap.underlyingBitmap"
+    const-string v0, "closeableBitmap.underlyingBitmap"
 
-    invoke-static {p3, p4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p5, p3}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p5, p4}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_0
 
     :cond_2
-    new-instance p3, Ljava/lang/Throwable;
+    new-instance p4, Ljava/lang/Throwable;
 
-    const-string p4, "Unable to decode image as bitmap."
+    const-string p5, "Unable to decode image as bitmap."
 
-    invoke-direct {p3, p4}, Ljava/lang/Throwable;-><init>(Ljava/lang/String;)V
+    invoke-direct {p4, p5}, Ljava/lang/Throwable;-><init>(Ljava/lang/String;)V
 
-    invoke-interface {p6, p3}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p6, p4}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     :goto_0
-    sget-object p3, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p4, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-static {p2, v0}, Lkotlin/d/a;->a(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {p2, p3}, Lkotlin/d/a;->a(Ljava/io/Closeable;Ljava/lang/Throwable;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_2
 
@@ -199,26 +229,36 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_2
 
     :goto_1
-    invoke-interface {p1}, Lcom/facebook/b/c;->fX()Z
+    invoke-interface {p1}, Lcom/facebook/b/c;->gb()Z
 
     return-void
 
+    :cond_4
+    :try_start_5
+    iget-object p2, v0, Lcom/facebook/b/d$a;->value:Ljava/lang/Object;
+
+    check-cast p2, Ljava/lang/Throwable;
+
+    throw p2
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_2
+
     :catchall_2
     move-exception p2
 
-    :try_start_5
+    :try_start_6
     invoke-interface {p6, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_3
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_3
 
-    invoke-interface {p1}, Lcom/facebook/b/c;->fX()Z
+    invoke-interface {p1}, Lcom/facebook/b/c;->gb()Z
 
     return-void
 
     :catchall_3
     move-exception p2
 
-    invoke-interface {p1}, Lcom/facebook/b/c;->fX()Z
+    invoke-interface {p1}, Lcom/facebook/b/c;->gb()Z
 
     throw p2
 .end method
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1.smali b/com.discord/smali/com/discord/utilities/images/MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1.smali
index 0ecb0c1a5c..c64c6dc88b 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1.smali
@@ -40,15 +40,15 @@
 
     new-instance v7, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v2, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Rz:I
+    iget v2, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RR:I
 
-    iget v3, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RA:I
+    iget v3, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RS:I
 
-    iget v4, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RB:I
+    iget v4, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RT:I
 
-    iget v5, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RC:I
+    iget v5, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RU:I
 
-    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Rz:I
+    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RR:I
 
     div-int/lit8 v6, v0, 0x3
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali b/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali
index f5a92f5f74..7ebef42dd1 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali
@@ -78,19 +78,19 @@
 
     move-result-object p1
 
-    invoke-virtual {v0, p1}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->m(Ljava/io/File;)Lcom/facebook/cache/disk/DiskCacheConfig$a;
+    invoke-static {p1}, Lcom/facebook/common/d/l;->y(Ljava/lang/Object;)Lcom/facebook/common/d/k;
 
     move-result-object p1
 
-    invoke-virtual {p1, p2}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->ar(Ljava/lang/String;)Lcom/facebook/cache/disk/DiskCacheConfig$a;
+    iput-object p1, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FS:Lcom/facebook/common/d/k;
 
-    move-result-object p1
+    iput-object p2, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FR:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->fp()Lcom/facebook/cache/disk/DiskCacheConfig$a;
+    const-wide/32 p1, 0x2800000
 
-    move-result-object p1
+    iput-wide p1, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Ga:J
 
-    invoke-virtual {p1}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->fq()Lcom/facebook/cache/disk/DiskCacheConfig;
+    invoke-virtual {v0}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->fu()Lcom/facebook/cache/disk/DiskCacheConfig;
 
     move-result-object p1
 
@@ -104,7 +104,7 @@
 
 # virtual methods
 .method public final init(Landroid/app/Application;)V
-    .locals 2
+    .locals 3
 
     const-string v0, "context"
 
@@ -116,47 +116,45 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/h$a;->hW()Lcom/facebook/imagepipeline/b/h$a;
+    const/4 v1, 0x1
 
-    move-result-object v0
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/h$a;->SY:Z
 
-    const-string v1, "app_images_cache"
+    const-string v2, "app_images_cache"
 
-    invoke-direct {p0, p1, v1}, Lcom/discord/utilities/images/MGImagesConfig;->newDiskCacheConfig(Landroid/content/Context;Ljava/lang/String;)Lcom/facebook/cache/disk/DiskCacheConfig;
+    invoke-direct {p0, p1, v2}, Lcom/discord/utilities/images/MGImagesConfig;->newDiskCacheConfig(Landroid/content/Context;Ljava/lang/String;)Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/b/h$a;->c(Lcom/facebook/cache/disk/DiskCacheConfig;)Lcom/facebook/imagepipeline/b/h$a;
+    iput-object v2, v0, Lcom/facebook/imagepipeline/b/h$a;->Te:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    move-result-object v0
+    const-string v2, "app_images_cache_small"
 
-    const-string v1, "app_images_cache_small"
+    invoke-direct {p0, p1, v2}, Lcom/discord/utilities/images/MGImagesConfig;->newDiskCacheConfig(Landroid/content/Context;Ljava/lang/String;)Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    invoke-direct {p0, p1, v1}, Lcom/discord/utilities/images/MGImagesConfig;->newDiskCacheConfig(Landroid/content/Context;Ljava/lang/String;)Lcom/facebook/cache/disk/DiskCacheConfig;
+    move-result-object v2
 
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/b/h$a;->d(Lcom/facebook/cache/disk/DiskCacheConfig;)Lcom/facebook/imagepipeline/b/h$a;
-
-    move-result-object v0
+    iput-object v2, v0, Lcom/facebook/imagepipeline/b/h$a;->Tm:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/images/MGImagesConfig;->getAppBitmapMemoryCacheParamsSupplier(Landroid/content/Context;)Lcom/facebook/imagepipeline/cache/DefaultBitmapMemoryCacheParamsSupplier;
 
-    move-result-object v1
+    move-result-object v2
 
-    check-cast v1, Lcom/facebook/common/d/k;
+    check-cast v2, Lcom/facebook/common/d/k;
 
-    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/b/h$a;->b(Lcom/facebook/common/d/k;)Lcom/facebook/imagepipeline/b/h$a;
+    invoke-static {v2}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v2
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/h$a;->hX()Lcom/facebook/imagepipeline/b/i$a;
+    check-cast v2, Lcom/facebook/common/d/k;
 
-    move-result-object v0
+    iput-object v2, v0, Lcom/facebook/imagepipeline/b/h$a;->SW:Lcom/facebook/common/d/k;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/i$a;->hZ()Lcom/facebook/imagepipeline/b/h$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h$a;->Tu:Lcom/facebook/imagepipeline/b/i$a;
 
-    move-result-object v0
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/i$a;->Pm:Z
+
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i$a;->TK:Lcom/facebook/imagepipeline/b/h$a;
 
     invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/h$a;->hY()Lcom/facebook/imagepipeline/b/h;
 
@@ -168,7 +166,7 @@
 .end method
 
 .method public final onTrimMemory(I)V
-    .locals 1
+    .locals 2
 
     const/4 v0, 0x5
 
@@ -197,11 +195,21 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gj()Lcom/facebook/imagepipeline/b/g;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gn()Lcom/facebook/imagepipeline/b/g;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/b/g;->hU()V
+    new-instance v0, Lcom/facebook/imagepipeline/b/g$1;
+
+    invoke-direct {v0, p1}, Lcom/facebook/imagepipeline/b/g$1;-><init>(Lcom/facebook/imagepipeline/b/g;)V
+
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/g;->SL:Lcom/facebook/imagepipeline/cache/o;
+
+    invoke-interface {v1, v0}, Lcom/facebook/imagepipeline/cache/o;->b(Lcom/facebook/common/d/j;)I
+
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/g;->SM:Lcom/facebook/imagepipeline/cache/o;
+
+    invoke-interface {p1, v0}, Lcom/facebook/imagepipeline/cache/o;->b(Lcom/facebook/common/d/j;)I
 
     :goto_0
     return-void
diff --git a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1$1.smali b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1$1.smali
index 9a31ffcb23..ca5c152496 100644
--- a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1$1;->invoke(Lcom/discord/models/domain/ModelActivityMetaData;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1.smali
index 3a4172bbf5..eb67163694 100644
--- a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/integrations/SpotifyHelper$launchAlbum$$inlined$let$lambda$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 286bcb5a4d..3f9725571b 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/integrations/SpotifyHelper$launchTrack$$inlined$let$lambda$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali
index 64ce28fb81..fcfa162e25 100644
--- a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali
+++ b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali
@@ -69,7 +69,7 @@
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    sget-object v1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
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 c04967089a..e24e73e3c4 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
@@ -57,6 +57,22 @@
     return-object v0
 .end method
 
+.method public final getOauth2Authorize()Landroid/net/Uri;
+    .locals 2
+
+    const-string v0, "discord://action/oauth2/authorize"
+
+    invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+
+    move-result-object v0
+
+    const-string v1, "Uri.parse(\"discord://action/oauth2/authorize\")"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
 .method public final getSelectSettingsBilling()Landroid/net/Uri;
     .locals 2
 
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 d39c9d59f4..60e2a5fa30 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders.smali
@@ -240,9 +240,9 @@
     :cond_0
     if-eqz p1, :cond_1
 
-    sget-object v0, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
-    invoke-static {}, Lcom/discord/app/a/a;->dH()Ljava/lang/String;
+    invoke-static {}, Lcom/discord/app/a/a;->dG()Ljava/lang/String;
 
     move-result-object v0
 
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 334592aab5..925fe811f9 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
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/intent/IntentUtils$consumeExternalRoutingIntent$1;->invoke(Landroid/net/Uri;Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 ea5810df1b..2dc9191776 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
@@ -70,7 +70,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/intent/IntentUtils$consumeRoutingIntent$1;->invoke(Landroid/net/Uri;Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
index 465286bd69..358b3a0588 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, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
-    invoke-static {}, Lcom/discord/app/a/a;->dL()Lkotlin/text/Regex;
+    invoke-static {}, Lcom/discord/app/a/a;->dK()Lkotlin/text/Regex;
 
     move-result-object v1
 
@@ -64,9 +64,9 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
-    invoke-static {}, Lcom/discord/app/a/a;->dN()Lkotlin/text/Regex;
+    invoke-static {}, Lcom/discord/app/a/a;->dM()Lkotlin/text/Regex;
 
     move-result-object v1
 
@@ -84,9 +84,9 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
-    invoke-static {}, Lcom/discord/app/a/a;->dO()Lkotlin/text/Regex;
+    invoke-static {}, Lcom/discord/app/a/a;->dN()Lkotlin/text/Regex;
 
     move-result-object v1
 
@@ -104,9 +104,9 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
-    invoke-static {}, Lcom/discord/app/a/a;->dP()Lkotlin/text/Regex;
+    invoke-static {}, Lcom/discord/app/a/a;->dO()Lkotlin/text/Regex;
 
     move-result-object v1
 
@@ -124,9 +124,9 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
-    invoke-static {}, Lcom/discord/app/a/a;->dK()Lkotlin/text/Regex;
+    invoke-static {}, Lcom/discord/app/a/a;->dJ()Lkotlin/text/Regex;
 
     move-result-object v1
 
@@ -144,9 +144,9 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
-    invoke-static {}, Lcom/discord/app/a/a;->dM()Lkotlin/text/Regex;
+    invoke-static {}, Lcom/discord/app/a/a;->dL()Lkotlin/text/Regex;
 
     move-result-object v1
 
@@ -164,9 +164,9 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
-    invoke-static {}, Lcom/discord/app/a/a;->dQ()Lkotlin/text/Regex;
+    invoke-static {}, Lcom/discord/app/a/a;->dP()Lkotlin/text/Regex;
 
     move-result-object v1
 
@@ -184,9 +184,9 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
-    invoke-static {}, Lcom/discord/app/a/a;->dI()Lkotlin/text/Regex;
+    invoke-static {}, Lcom/discord/app/a/a;->dH()Lkotlin/text/Regex;
 
     move-result-object v1
 
@@ -253,9 +253,9 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
-    invoke-static {}, Lcom/discord/app/a/a;->dG()Ljava/lang/String;
+    invoke-static {}, Lcom/discord/app/a/a;->dF()Ljava/lang/String;
 
     move-result-object v0
 
@@ -273,7 +273,7 @@
 .method private final isHttpDomainUrl(Landroid/net/Uri;)Z
     .locals 3
 
-    sget-object v0, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -301,13 +301,13 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/discord/app/a/a;->wt:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->wr:Lcom/discord/app/a/a;
 
     invoke-virtual {p1}, Landroid/net/Uri;->getHost()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p1}, Lcom/discord/app/a/a;->ae(Ljava/lang/String;)Z
+    invoke-static {p1}, Lcom/discord/app/a/a;->aa(Ljava/lang/String;)Z
 
     move-result p1
 
@@ -376,7 +376,7 @@
 
     if-eqz p3, :cond_0
 
-    const p2, 0x7f12101e
+    const p2, 0x7f12105b
 
     invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -450,7 +450,7 @@
 .end method
 
 .method public final consumeRoutingIntent(Landroid/content/Intent;Landroid/content/Context;Lkotlin/jvm/functions/Function2;)Z
-    .locals 7
+    .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -595,6 +595,10 @@
 
     if-eqz v6, :cond_5
 
+    const-string v7, "it"
+
+    invoke-static {v6, v7}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     check-cast v6, Ljava/lang/CharSequence;
 
     invoke-virtual {v4, v6}, Lkotlin/text/Regex;->i(Ljava/lang/CharSequence;)Lkotlin/text/MatchResult;
@@ -616,7 +620,7 @@
 
     check-cast p2, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
 
-    sget-object p3, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object p3, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-string v1, "Intent handler activated for: "
 
@@ -654,7 +658,7 @@
 .end method
 
 .method public final isDiscordAppUri(Landroid/net/Uri;)Z
-    .locals 2
+    .locals 4
 
     const-string v0, "uri"
 
@@ -670,28 +674,104 @@
 
     move-result v0
 
-    if-eqz v0, :cond_0
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_6
 
     invoke-virtual {p1}, Landroid/net/Uri;->getHost()Ljava/lang/String;
 
     move-result-object p1
 
-    const-string v0, "app"
+    if-eqz p1, :cond_1
 
-    invoke-static {p1, v0}, Lkotlin/text/l;->af(Ljava/lang/String;Ljava/lang/String;)Z
+    sget-object v0, Ljava/util/Locale;->ENGLISH:Ljava/util/Locale;
 
-    move-result p1
+    const-string v2, "Locale.ENGLISH"
+
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
-    const/4 p1, 0x1
+    invoke-virtual {p1, v0}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
 
-    return p1
+    move-result-object p1
+
+    const-string v0, "(this as java.lang.String).toLowerCase(locale)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_0
 
     :cond_0
+    new-instance p1, Lkotlin/r;
+
+    const-string v0, "null cannot be cast to non-null type java.lang.String"
+
+    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
     const/4 p1, 0x0
 
-    return p1
+    :goto_0
+    const/4 v0, 0x1
+
+    if-nez p1, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result v2
+
+    const v3, -0x54d081ca
+
+    if-eq v2, v3, :cond_4
+
+    const v3, 0x17a21
+
+    if-eq v2, v3, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    const-string v2, "app"
+
+    invoke-virtual {p1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_5
+
+    goto :goto_1
+
+    :cond_4
+    const-string v2, "action"
+
+    invoke-virtual {p1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_5
+
+    :goto_1
+    const/4 p1, 0x1
+
+    goto :goto_3
+
+    :cond_5
+    :goto_2
+    const/4 p1, 0x0
+
+    :goto_3
+    if-eqz p1, :cond_6
+
+    return v0
+
+    :cond_6
+    return v1
 .end method
 
 .method public final toExternalizedSend(Landroid/content/Intent;)Landroid/content/Intent;
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectSettings$1.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectSettings$1.smali
index fa7028f6dd..f4a2355c5c 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectSettings$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectSettings$1.smali
@@ -124,7 +124,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
     check-cast p1, Landroid/content/Context;
 
@@ -141,7 +141,7 @@
     const-string v1, ""
 
     :cond_1
-    invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;->onSuccess(Landroid/content/Context;Ljava/lang/String;)V
+    invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->onSuccess(Landroid/content/Context;Ljava/lang/String;)V
 
     goto :goto_1
 
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 07f25940e5..565cf8ac61 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
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/intent/RouteHandlers$voiceConnect$1;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 554de4f261..7786275b4d 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers.smali
@@ -53,7 +53,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object p2
 
@@ -81,6 +81,10 @@
 
     if-eqz p1, :cond_2
 
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     move-object v1, p1
 
     check-cast v1, Ljava/lang/CharSequence;
@@ -105,6 +109,10 @@
     const-string p1, "Deeplink"
 
     :cond_3
+    const-string p3, "uri.getQueryParameter(\"s\u2026ettings.LOCATION_DEEPLINK"
+
+    invoke-static {p1, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     if-eqz p2, :cond_4
 
     move-object p3, p2
@@ -119,11 +127,11 @@
 
     if-ne p3, v0, :cond_4
 
-    sget-object p3, Lcom/discord/a/c;->wH:Lcom/discord/a/c$a;
+    sget-object p3, Lcom/discord/dialogs/e;->wR:Lcom/discord/dialogs/e$a;
 
     const-wide/16 v0, 0x0
 
-    invoke-static {p2, p1, v0, v1}, Lcom/discord/a/c$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
+    invoke-static {p2, p1, v0, v1}, Lcom/discord/dialogs/e$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
 
     :cond_4
     new-instance p1, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
@@ -194,7 +202,7 @@
 
     if-eqz p2, :cond_1
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object p1
 
@@ -225,7 +233,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {p1}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p1}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p1
 
@@ -244,7 +252,7 @@
     :goto_1
     if-eqz p2, :cond_2
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object p1
 
@@ -272,7 +280,7 @@
     :goto_2
     if-eqz p2, :cond_3
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object p1
 
@@ -288,7 +296,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-static {p1}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p1}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p1
 
@@ -358,7 +366,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object p1
 
@@ -372,7 +380,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p1}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p1
 
@@ -425,7 +433,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object p1
 
@@ -453,7 +461,7 @@
     :goto_0
     if-eqz p2, :cond_1
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object p1
 
@@ -469,7 +477,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p1}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p1
 
@@ -513,7 +521,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object p1
 
@@ -543,7 +551,7 @@
     const-wide/16 p1, 0x0
 
     :goto_1
-    invoke-static {p3, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    invoke-static {p3, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
 
     new-instance p1, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
 
@@ -577,7 +585,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object p2
 
@@ -661,7 +669,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object p2
 
@@ -687,6 +695,10 @@
 
     if-eqz p1, :cond_2
 
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     move-object v0, p1
 
     check-cast v0, Ljava/lang/CharSequence;
@@ -711,6 +723,10 @@
     const-string p1, "Deeplink"
 
     :cond_3
+    const-string p3, "uri.getQueryParameter(\"s\u2026ettings.LOCATION_DEEPLINK"
+
+    invoke-static {p1, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     if-eqz p2, :cond_4
 
     sget-object p3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
@@ -758,7 +774,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-interface/range {p2 .. p2}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface/range {p2 .. p2}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object v2
 
@@ -774,7 +790,7 @@
 
     if-eqz v2, :cond_0
 
-    invoke-static {v2}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v2}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v2
 
@@ -910,7 +926,7 @@
 
     if-eqz p2, :cond_1
 
-    invoke-interface {p2}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {p2}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object v1
 
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 1ed30fdb70..ed05aa660c 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
@@ -62,7 +62,7 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/io/NetworkUtils$downloadFile$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -155,7 +155,7 @@
     invoke-interface {v1, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     :goto_0
-    sget-object v1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali b/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali
index e8a3051662..261f08a34a 100644
--- a/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali
+++ b/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali
@@ -46,7 +46,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/f;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/gson/f;->BJ()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->By()Lcom/google/gson/Gson;
 
     move-result-object v0
 
@@ -146,7 +146,7 @@
 
     const-wide/16 v0, 0x1
 
-    if-eqz v3, :cond_3
+    if-eqz v3, :cond_5
 
     if-nez p2, :cond_2
 
@@ -182,18 +182,22 @@
 
     sget-object p1, Landroid/os/Environment;->DIRECTORY_DOWNLOADS:Ljava/lang/String;
 
+    if-eqz p2, :cond_3
+
     sget-object p3, Lcom/discord/utilities/StringUtils;->INSTANCE:Lcom/discord/utilities/StringUtils;
 
-    const-string v2, "title"
-
-    invoke-static {p2, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     check-cast p2, Ljava/lang/CharSequence;
 
     invoke-virtual {p3, p2}, Lcom/discord/utilities/StringUtils;->filenameSanitized(Ljava/lang/CharSequence;)Ljava/lang/String;
 
     move-result-object p2
 
+    if-nez p2, :cond_4
+
+    :cond_3
+    const-string p2, "file"
+
+    :cond_4
     invoke-virtual {p0, p1, p2}, Landroid/app/DownloadManager$Request;->setDestinationInExternalPublicDir(Ljava/lang/String;Ljava/lang/String;)Landroid/app/DownloadManager$Request;
 
     move-result-object p0
@@ -215,13 +219,13 @@
 
     return-void
 
-    :cond_3
+    :cond_5
     move-wide p0, v0
 
     :goto_1
     cmp-long p2, p0, v0
 
-    if-nez p2, :cond_4
+    if-nez p2, :cond_6
 
     new-instance p0, Lcom/discord/utilities/io/NetworkUtils$DownloadManagerNotFound;
 
@@ -231,12 +235,12 @@
 
     return-void
 
-    :cond_4
+    :cond_6
     const-wide/16 p2, 0x0
 
     cmp-long v0, p0, p2
 
-    if-nez v0, :cond_5
+    if-nez v0, :cond_7
 
     new-instance p0, Lcom/discord/utilities/io/NetworkUtils$DownloadManagerEnqueueFailure;
 
@@ -246,7 +250,7 @@
 
     return-void
 
-    :cond_5
+    :cond_7
     sget-object p2, Lcom/discord/utilities/io/NetworkUtils;->onDownloadListeners:Ljava/util/Map;
 
     invoke-static {p0, p1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$1$value$1.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$1$value$1.smali
index fdd1856149..d47f98cf56 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$1$value$1.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$1$value$1.smali
@@ -63,7 +63,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lkotlin/text/l;->dU(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {p1}, Lkotlin/text/l;->dO(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$2.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$2.smali
index 357e1923aa..d9641deef8 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$2.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/keyboard/Keyboard$KeyboardMetrics$keyboardHeightsCache$2;->invoke(Landroid/content/SharedPreferences$Editor;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics.smali
index f0577d9f93..b9c963cb62 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics.smali
@@ -166,13 +166,13 @@
 
     move-result v1
 
-    invoke-static {v1}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v1}, Lkotlin/a/ad;->dj(I)I
 
     move-result v1
 
     const/16 v2, 0x10
 
-    invoke-static {v1, v2}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v1, v2}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v1
 
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1$LayoutListener.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1$LayoutListener.smali
index abdd725d6c..2431e58b82 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1$LayoutListener.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1$LayoutListener.smali
@@ -133,7 +133,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard.smali
index 4c96e37c6f..48b882a844 100644
--- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard.smali
+++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard.smali
@@ -233,7 +233,7 @@
 
     sget-object v0, Lcom/discord/utilities/keyboard/Keyboard;->isOpenedSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali b/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali
index 1c467685d5..63e811dee9 100644
--- a/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali
+++ b/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali
@@ -71,7 +71,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0, p3}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, p3}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object p3
 
diff --git a/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali b/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali
index 30c5bda021..4bc6fb3df1 100644
--- a/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali
+++ b/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali
@@ -67,7 +67,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0, p3}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, p3}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object p3
 
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 2254512511..8fd43b0126 100644
--- a/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList.smali
@@ -358,7 +358,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget v0, p1, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v0, p1, Lkotlin/ranges/IntProgression;->bll:I
 
     iget-object v1, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->rows:Lcom/discord/utilities/collections/SparseMutableList;
 
@@ -372,7 +372,7 @@
 
     move-result v0
 
-    iget p1, p1, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget p1, p1, Lkotlin/ranges/IntProgression;->blk:I
 
     if-gt p1, v0, :cond_0
 
@@ -436,7 +436,7 @@
 
     if-gez v1, :cond_0
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_0
     check-cast v2, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;
@@ -508,13 +508,13 @@
 
     move-result v0
 
-    invoke-static {v0}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v0}, Lkotlin/a/ad;->dj(I)I
 
     move-result v0
 
     const/16 v1, 0x10
 
-    invoke-static {v0, v1}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v0, v1}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v0
 
@@ -628,7 +628,7 @@
 
     if-gez v0, :cond_0
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_0
     check-cast v1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;
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 4aef38f58a..76638ae05f 100644
--- a/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager.smali
@@ -277,7 +277,7 @@
 
     if-gez v2, :cond_1
 
-    invoke-static {}, Lkotlin/a/m;->DZ()V
+    invoke-static {}, Lkotlin/a/m;->DO()V
 
     goto :goto_0
 
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 4042f7e2db..5c33f33a1d 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.smali
@@ -107,7 +107,7 @@
 
     if-eqz p3, :cond_0
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object p2
 
@@ -406,7 +406,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    sget-object p1, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p1, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast p1, Ljava/util/Set;
 
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 d44524b8a4..33b088d019 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
@@ -90,7 +90,7 @@
 
     move-result v2
 
-    invoke-static {v2}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v2}, Lkotlin/a/ad;->dj(I)I
 
     move-result v2
 
@@ -168,7 +168,7 @@
 
     const/4 v7, 0x0
 
-    iget v8, v5, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v8, v5, Lkotlin/ranges/IntProgression;->blk:I
 
     invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -178,7 +178,7 @@
 
     const/4 v7, 0x1
 
-    iget v5, v5, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v5, v5, Lkotlin/ranges/IntProgression;->bll:I
 
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -186,7 +186,7 @@
 
     aput-object v5, v6, v7
 
-    invoke-static {v6}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v6}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v5
 
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 773d977799..844b4478cd 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
@@ -88,7 +88,7 @@
 
     invoke-virtual {p0, v0, v1, p2}, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildChannelSubscriptionsManager$1;->invoke(JLjava/util/Map;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 40d44b3dbf..119665b314 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
@@ -92,7 +92,7 @@
 
     invoke-virtual {p0, v0, v1, p2, p1}, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$1;->invoke(JLjava/util/Set;Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 d927915d35..c6288901da 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/media/AudioOutputMonitor$intentHandlers$1;->invoke(Landroid/content/Intent;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 46c81ea326..9fb735ca9d 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/media/AudioOutputMonitor$intentHandlers$2;->invoke(Landroid/content/Intent;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 13a7771b87..c251e2968d 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/media/AudioOutputMonitor$intentHandlers$3;->invoke(Landroid/content/Intent;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 ef1b8bcfbe..a9aa590af5 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/media/AudioOutputMonitor$intentHandlers$4;->invoke(Landroid/content/Intent;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 953c85fe04..2eed85bbb4 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali
@@ -629,7 +629,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/media/AudioOutputMonitor;->outputStateSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -654,6 +654,10 @@
     goto :goto_0
 
     :cond_0
+    const-string v0, "intent?.action ?: return"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, p0, Lcom/discord/utilities/media/AudioOutputMonitor;->intentHandlers:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
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 4ec190cf81..b3aea509bf 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/messagesend/MessageQueue$doEdit$1;->invoke(Lcom/discord/models/domain/ModelMessage;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 f348c882c3..35f7abe836 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/messagesend/MessageQueue$doEdit$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 b17c9fd071..9d826652a4 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
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/messagesend/MessageQueue$doEdit$3;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 f3e42ab446..cebe334965 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/messagesend/MessageQueue$doSend$3;->invoke(Lcom/discord/models/domain/ModelMessage;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 7a495dc741..cf510259bf 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/messagesend/MessageQueue$doSend$4;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 e39624edc4..659bb8f407 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
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/messagesend/MessageQueue$doSend$5;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 5f1e3fd948..e488652244 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1;->invoke(Lcom/discord/utilities/messagesend/MessageResult;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 190d03b716..646684976a 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue.smali
@@ -307,7 +307,7 @@
 
     if-nez v5, :cond_2
 
-    sget-object v5, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v5, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v5, Ljava/util/List;
 
@@ -350,7 +350,7 @@
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v2}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v2
 
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 e5c1ea343d..21ee1987f8 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/messagesend/MessageRequest$Edit$1;->invoke(Lcom/discord/utilities/messagesend/MessageResult;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 2a74b0b519..146a9aa382 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Send.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Send.smali
@@ -105,7 +105,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     const/4 v1, 0x0
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 0de5135bf4..7580a9b089 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali
@@ -94,7 +94,7 @@
 
     const/4 v1, 0x0
 
-    invoke-static {v1, v0}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v1, v0}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object v0
 
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 130fb2835e..752c8217f0 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
@@ -131,7 +131,7 @@
 
     invoke-direct {v2, v3, p1}, Ljava/lang/Exception;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    sget-object v4, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     move-object v6, v2
 
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 29493481a9..04c44d1d47 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali
@@ -156,7 +156,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f1200cb
+    const v1, 0x7f1200ce
 
     const/4 v2, 0x1
 
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 764322ff19..31f45978a8 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.smali
@@ -158,7 +158,7 @@
 
     invoke-direct {p0, v0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->addErrorLoggingMetadata(Ljava/util/Map;)V
 
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-string v2, "Unable to configure recycler."
 
@@ -292,7 +292,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v2
 
@@ -306,7 +306,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
 
     move-result-object v2
 
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 61e9141ed9..3c62c3327e 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/networking/Backoff$fail$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 0eb3585a87..1fdfdc1aa7 100644
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali
@@ -157,7 +157,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->isConnectedSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -183,7 +183,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v0
 
@@ -203,7 +203,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
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 376721da5a..8b1dc1082d 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -132,7 +132,7 @@
     return-void
 
     :cond_2
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/Exception;
 
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 b98344e9d4..ae4a4e1a2f 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 b7a7314187..6e922e41c1 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$2;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 8abb8a9712..10f11cbf6f 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
@@ -137,7 +137,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f12050a
+    const v1, 0x7f120515
 
     invoke-virtual {p1, v1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -157,7 +157,7 @@
 
     invoke-static {v3, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f120509
+    const v0, 0x7f120514
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -167,7 +167,7 @@
 
     invoke-static {v4, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0a0493
+    const v0, 0x7f0a04a8
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -185,7 +185,7 @@
 
     move-result-object v7
 
-    const p2, 0x7f120507
+    const p2, 0x7f120512
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -222,7 +222,7 @@
 
     new-instance p2, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
 
-    const v0, 0x7f120e9f
+    const v0, 0x7f120ed5
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -232,7 +232,7 @@
 
     invoke-static {v1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f120e9e
+    const v0, 0x7f120ed4
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -242,7 +242,7 @@
 
     invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d009b
+    const v0, 0x7f0d00a3
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -266,7 +266,7 @@
 
     aput-object v4, v0, v3
 
-    const v3, 0x7f0a0493
+    const v3, 0x7f0a04a8
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -286,13 +286,13 @@
 
     move-result-object v5
 
-    const v0, 0x7f120c77
+    const v0, 0x7f120cb0
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    const v0, 0x7f120be2
+    const v0, 0x7f120c14
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 ba5ed8a320..718cec9fa4 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/Integer;Ljava/util/Map;IZ)Lcom/discord/utilities/permissions/ManageGuildContext;
-    .locals 13
+    .locals 16
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -51,47 +51,41 @@
         }
     .end annotation
 
-    move-object v0, p1
-
-    move v8, p2
+    move-object/from16 v0, p1
 
     move-object/from16 v1, p3
 
     move-object/from16 v2, p4
 
-    move/from16 v3, p5
+    const-string v3, "categories"
 
-    move/from16 v4, p6
+    invoke-static {v0, v3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v5, "categories"
+    const-string v3, "channelPermissions"
 
-    invoke-static {p1, v5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v5, "channelPermissions"
-
-    invoke-static {v2, v5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Ljava/lang/Iterable;
 
-    instance-of v5, v0, Ljava/util/Collection;
+    instance-of v3, v0, Ljava/util/Collection;
 
-    const/16 v6, 0x10
+    const/16 v4, 0x10
 
-    const/4 v7, 0x1
+    const/4 v5, 0x1
 
-    const/4 v9, 0x0
+    const/4 v6, 0x0
 
-    if-eqz v5, :cond_0
+    if-eqz v3, :cond_0
 
-    move-object v5, v0
+    move-object v3, v0
 
-    check-cast v5, Ljava/util/Collection;
+    check-cast v3, Ljava/util/Collection;
 
-    invoke-interface {v5}, Ljava/util/Collection;->isEmpty()Z
+    invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z
 
-    move-result v5
+    move-result v3
 
-    if-nez v5, :cond_2
+    if-nez v3, :cond_2
 
     :cond_0
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
@@ -101,35 +95,35 @@
     :cond_1
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v5
+    move-result v3
 
-    if-eqz v5, :cond_2
+    if-eqz v3, :cond_2
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v3
 
-    check-cast v5, Lcom/discord/models/domain/ModelChannel;
+    check-cast v3, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->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 v5
+    move-result-object v3
 
-    invoke-interface {v2, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v3
 
-    check-cast v5, Ljava/lang/Integer;
+    check-cast v3, Ljava/lang/Integer;
 
-    invoke-static {v6, v5}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
+    invoke-static {v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
 
-    move-result v5
+    move-result v3
 
-    if-eqz v5, :cond_1
+    if-eqz v3, :cond_1
 
     const/4 v0, 0x1
 
@@ -139,11 +133,11 @@
     const/4 v0, 0x0
 
     :goto_0
-    if-nez v8, :cond_4
+    if-nez p2, :cond_4
 
     const/16 v2, 0x20
 
-    invoke-static {v2, v1, v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
+    invoke-static {v2, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
 
     move-result v2
 
@@ -152,42 +146,42 @@
     goto :goto_1
 
     :cond_3
-    const/4 v2, 0x0
+    const/4 v8, 0x0
 
     goto :goto_2
 
     :cond_4
     :goto_1
-    const/4 v2, 0x1
+    const/4 v8, 0x1
 
     :goto_2
-    if-nez v8, :cond_6
+    if-nez p2, :cond_6
 
-    invoke-static {v6, v1, v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
+    invoke-static {v4, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
 
-    move-result v5
+    move-result v2
 
-    if-nez v5, :cond_6
+    if-nez v2, :cond_6
 
     if-eqz v0, :cond_5
 
     goto :goto_3
 
     :cond_5
-    const/4 v5, 0x0
+    const/4 v9, 0x0
 
     goto :goto_4
 
     :cond_6
     :goto_3
-    const/4 v5, 0x1
+    const/4 v9, 0x1
 
     :goto_4
-    if-nez v8, :cond_8
+    if-nez p2, :cond_8
 
     const/high16 v0, 0x10000000
 
-    invoke-static {v0, v1, v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
+    invoke-static {v0, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
 
     move-result v0
 
@@ -196,20 +190,20 @@
     goto :goto_5
 
     :cond_7
-    const/4 v6, 0x0
+    const/4 v10, 0x0
 
     goto :goto_6
 
     :cond_8
     :goto_5
-    const/4 v6, 0x1
+    const/4 v10, 0x1
 
     :goto_6
-    if-nez v8, :cond_a
+    if-nez p2, :cond_a
 
     const/4 v0, 0x4
 
-    invoke-static {v0, v1, v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
+    invoke-static {v0, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
 
     move-result v0
 
@@ -218,20 +212,20 @@
     goto :goto_7
 
     :cond_9
-    const/4 v10, 0x0
+    const/4 v11, 0x0
 
     goto :goto_8
 
     :cond_a
     :goto_7
-    const/4 v10, 0x1
+    const/4 v11, 0x1
 
     :goto_8
-    if-nez v8, :cond_c
+    if-nez p2, :cond_c
 
-    const/high16 v0, 0x40000000    # 2.0f
+    const/high16 v0, 0x8000000
 
-    invoke-static {v0, v1, v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
+    invoke-static {v0, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
 
     move-result v0
 
@@ -240,18 +234,20 @@
     goto :goto_9
 
     :cond_b
-    const/4 v11, 0x0
+    const/4 v12, 0x0
 
     goto :goto_a
 
     :cond_c
     :goto_9
-    const/4 v11, 0x1
+    const/4 v12, 0x1
 
     :goto_a
-    if-nez v8, :cond_e
+    if-nez p2, :cond_e
 
-    invoke-static {p2, v4, v3, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->canManageGuildMembers(ZZILjava/lang/Integer;)Z
+    const/high16 v0, 0x40000000    # 2.0f
+
+    invoke-static {v0, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
 
     move-result v0
 
@@ -260,20 +256,20 @@
     goto :goto_b
 
     :cond_d
-    const/4 v12, 0x0
+    const/4 v13, 0x0
 
     goto :goto_c
 
     :cond_e
     :goto_b
-    const/4 v12, 0x1
+    const/4 v13, 0x1
 
     :goto_c
-    if-nez v8, :cond_10
+    if-nez p2, :cond_10
 
     const/16 v0, 0x80
 
-    invoke-static {v0, v1, v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
+    invoke-static {v0, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
 
     move-result v0
 
@@ -282,29 +278,40 @@
     goto :goto_d
 
     :cond_f
-    const/4 v7, 0x0
+    const/4 v14, 0x0
+
+    goto :goto_e
 
     :cond_10
     :goto_d
-    new-instance v9, Lcom/discord/utilities/permissions/ManageGuildContext;
+    const/4 v14, 0x1
 
-    move-object v0, v9
+    :goto_e
+    if-eqz p2, :cond_11
 
-    move v1, v2
+    move/from16 v0, p5
 
-    move v2, v5
+    move/from16 v1, p6
 
-    move v3, v6
+    invoke-static {v1, v0}, Lcom/discord/utilities/permissions/PermissionUtils;->isElevated(ZI)Z
 
-    move v4, v10
+    move-result v0
 
-    move v5, v11
+    if-eqz v0, :cond_11
 
-    move v6, v12
+    const/4 v15, 0x1
 
-    move v8, p2
+    goto :goto_f
 
-    invoke-direct/range {v0 .. v8}, Lcom/discord/utilities/permissions/ManageGuildContext;-><init>(ZZZZZZZZ)V
+    :cond_11
+    const/4 v15, 0x0
 
-    return-object v9
+    :goto_f
+    new-instance v0, Lcom/discord/utilities/permissions/ManageGuildContext;
+
+    move-object v7, v0
+
+    invoke-direct/range {v7 .. v15}, Lcom/discord/utilities/permissions/ManageGuildContext;-><init>(ZZZZZZZZ)V
+
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext.smali b/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext.smali
index 6b53587e1b..ca93e796f1 100644
--- a/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext.smali
+++ b/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext.smali
@@ -22,7 +22,7 @@
 
 .field private final canManageEmojis:Z
 
-.field private final canManageMembers:Z
+.field private final canManageNicknames:Z
 
 .field private final canManageRoles:Z
 
@@ -30,7 +30,7 @@
 
 .field private final canViewAuditLogs:Z
 
-.field private final isOwner:Z
+.field private final isOwnerWithRequiredMFALevel:Z
 
 
 # direct methods
@@ -61,13 +61,13 @@
 
     iput-boolean p4, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageBans:Z
 
-    iput-boolean p5, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageEmojis:Z
+    iput-boolean p5, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageNicknames:Z
 
-    iput-boolean p6, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageMembers:Z
+    iput-boolean p6, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageEmojis:Z
 
     iput-boolean p7, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canViewAuditLogs:Z
 
-    iput-boolean p8, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwner:Z
+    iput-boolean p8, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwnerWithRequiredMFALevel:Z
 
     return-void
 .end method
@@ -131,7 +131,7 @@
 
     if-eqz v6, :cond_4
 
-    iget-boolean v6, v0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageEmojis:Z
+    iget-boolean v6, v0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageNicknames:Z
 
     goto :goto_4
 
@@ -143,7 +143,7 @@
 
     if-eqz v7, :cond_5
 
-    iget-boolean v7, v0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageMembers:Z
+    iget-boolean v7, v0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageEmojis:Z
 
     goto :goto_5
 
@@ -167,7 +167,7 @@
 
     if-eqz v1, :cond_7
 
-    iget-boolean v1, v0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwner:Z
+    iget-boolean v1, v0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwnerWithRequiredMFALevel:Z
 
     goto :goto_7
 
@@ -274,7 +274,7 @@
 .method public final component5()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageEmojis:Z
+    iget-boolean v0, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageNicknames:Z
 
     return v0
 .end method
@@ -282,7 +282,7 @@
 .method public final component6()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageMembers:Z
+    iget-boolean v0, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageEmojis:Z
 
     return v0
 .end method
@@ -298,7 +298,7 @@
 .method public final component8()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwner:Z
+    iget-boolean v0, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwnerWithRequiredMFALevel:Z
 
     return v0
 .end method
@@ -410,9 +410,9 @@
     :goto_3
     if-eqz v1, :cond_8
 
-    iget-boolean v1, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageEmojis:Z
+    iget-boolean v1, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageNicknames:Z
 
-    iget-boolean v3, p1, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageEmojis:Z
+    iget-boolean v3, p1, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageNicknames:Z
 
     if-ne v1, v3, :cond_4
 
@@ -426,9 +426,9 @@
     :goto_4
     if-eqz v1, :cond_8
 
-    iget-boolean v1, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageMembers:Z
+    iget-boolean v1, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageEmojis:Z
 
-    iget-boolean v3, p1, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageMembers:Z
+    iget-boolean v3, p1, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageEmojis:Z
 
     if-ne v1, v3, :cond_5
 
@@ -458,9 +458,9 @@
     :goto_6
     if-eqz v1, :cond_8
 
-    iget-boolean v1, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwner:Z
+    iget-boolean v1, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwnerWithRequiredMFALevel:Z
 
-    iget-boolean p1, p1, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwner:Z
+    iget-boolean p1, p1, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwnerWithRequiredMFALevel:Z
 
     if-ne v1, p1, :cond_7
 
@@ -508,10 +508,10 @@
     return v0
 .end method
 
-.method public final getCanManageMembers()Z
+.method public final getCanManageNicknames()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageMembers:Z
+    iget-boolean v0, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageNicknames:Z
 
     return v0
 .end method
@@ -587,7 +587,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v2, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageEmojis:Z
+    iget-boolean v2, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageNicknames:Z
 
     if-eqz v2, :cond_4
 
@@ -598,7 +598,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v2, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageMembers:Z
+    iget-boolean v2, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageEmojis:Z
 
     if-eqz v2, :cond_5
 
@@ -620,7 +620,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v2, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwner:Z
+    iget-boolean v2, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwnerWithRequiredMFALevel:Z
 
     if-eqz v2, :cond_7
 
@@ -635,10 +635,10 @@
     return v0
 .end method
 
-.method public final isOwner()Z
+.method public final isOwnerWithRequiredMFALevel()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwner:Z
+    iget-boolean v0, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwnerWithRequiredMFALevel:Z
 
     return v0
 .end method
@@ -680,6 +680,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
+    const-string v1, ", canManageNicknames="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageNicknames:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
     const-string v1, ", canManageEmojis="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
@@ -688,14 +696,6 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
-    const-string v1, ", canManageMembers="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->canManageMembers:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
     const-string v1, ", canViewAuditLogs="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
@@ -704,11 +704,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
-    const-string v1, ", isOwner="
+    const-string v1, ", isOwnerWithRequiredMFALevel="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwner:Z
+    iget-boolean v1, p0, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwnerWithRequiredMFALevel:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
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 ec9aedb0f8..80feb7ca2d 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/persister/Persister$Companion$init$2;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 e831ddefcb..143ce1f70f 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/persister/Persister$Companion$kryoConfig$1;->invoke(Lcom/esotericsoftware/kryo/Kryo;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 82a0ef00fe..49cc25de65 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
@@ -73,7 +73,7 @@
 
     invoke-virtual {p0, p1, p2, p3}, Lcom/discord/utilities/persister/Persister$Companion$logger$1;->invoke(ILjava/lang/String;Ljava/lang/Exception;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 5c7e553d8b..c4e699a2fb 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
@@ -64,7 +64,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/persister/Persister$Companion$persistAll$1$1;->invoke(Lcom/discord/utilities/persister/Persister;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,7 +87,7 @@
 
     invoke-static {p1}, Lcom/discord/utilities/persister/Persister;->access$persist(Lcom/discord/utilities/persister/Persister;)V
 
-    invoke-virtual {v0}, Lcom/discord/app/AppLog$Elapsed;->ds()J
+    invoke-virtual {v0}, Lcom/discord/app/AppLog$Elapsed;->dr()J
 
     move-result-wide v1
 
@@ -125,7 +125,7 @@
 
     invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0}, Lcom/discord/app/AppLog$Elapsed;->dt()F
+    invoke-virtual {v0}, Lcom/discord/app/AppLog$Elapsed;->ds()F
 
     move-result p1
 
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 ea1e87d8fb..af76ca28f4 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali
@@ -60,7 +60,7 @@
 
     const-string v1, "context"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     const-string v1, "activity"
@@ -138,7 +138,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     sget-object v2, Lcom/discord/utilities/persister/Persister$Companion$persistAll$1$1;->INSTANCE:Lcom/discord/utilities/persister/Persister$Companion$persistAll$1$1;
 
@@ -248,7 +248,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     sget-object p2, Lcom/discord/utilities/persister/Persister$Companion$init$2;->INSTANCE:Lcom/discord/utilities/persister/Persister$Companion$init$2;
 
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 19a9382980..5807717896 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/persister/Persister$Preloader$2;->invoke(Lcom/discord/utilities/persister/Persister;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     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 6f6df76adf..a25c09d43f 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader.smali
@@ -54,7 +54,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -86,7 +86,7 @@
 
     aput-object v2, v0, v1
 
-    invoke-static {v0}, Lkotlin/a/m;->m([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
@@ -110,7 +110,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/utilities/persister/Persister$Preloader$2;
 
@@ -221,7 +221,7 @@
 
     iget-object v3, p0, Lcom/discord/utilities/persister/Persister$Preloader;->preloadTime:Lcom/discord/app/AppLog$Elapsed;
 
-    invoke-virtual {v3}, Lcom/discord/app/AppLog$Elapsed;->dt()F
+    invoke-virtual {v3}, Lcom/discord/app/AppLog$Elapsed;->ds()F
 
     move-result v3
 
@@ -275,7 +275,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
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 5233a20320..0ff702d65e 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
@@ -47,7 +47,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/persister/Persister$getObservable$1$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 a0aed94cbb..f8c4b609b2 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
@@ -67,7 +67,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister.smali b/com.discord/smali/com/discord/utilities/persister/Persister.smali
index 8b2ecdd954..3ca8b48789 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister.smali
@@ -307,7 +307,7 @@
 
     const-string v3, "context"
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v2}, Landroid/content/Context;->getFilesDir()Ljava/io/File;
@@ -387,7 +387,7 @@
 
     const-string v1, "context"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     iget-object v1, p0, Lcom/discord/utilities/persister/Persister;->key:Ljava/lang/String;
@@ -450,6 +450,10 @@
     goto :goto_1
 
     :cond_0
+    const-string v5, "kryos.get() ?: return@use this.value"
+
+    invoke-static {v3, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v3, v2}, Lcom/esotericsoftware/kryo/Kryo;->readClassAndObject(Lcom/esotericsoftware/kryo/io/Input;)Ljava/lang/Object;
 
     move-result-object v2
@@ -686,7 +690,7 @@
 
     invoke-virtual {v2, v1, v3}, Lcom/esotericsoftware/kryo/Kryo;->writeClassAndObject(Lcom/esotericsoftware/kryo/io/Output;Ljava/lang/Object;)V
 
-    sget-object v1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
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 43040a8bff..e27b0db46d 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/persister/PersisterConfig$init$1;->invoke(Lcom/esotericsoftware/kryo/Kryo;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 b46395d527..08a084fd17 100644
--- a/com.discord/smali/com/discord/utilities/persister/PersisterConfig.smali
+++ b/com.discord/smali/com/discord/utilities/persister/PersisterConfig.smali
@@ -85,13 +85,13 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kf()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JT()Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/g;->uX:Lcom/discord/app/g;
+    sget-object v1, Lcom/discord/app/g;->uW:Lcom/discord/app/g;
 
-    invoke-static {}, Lcom/discord/app/g;->dy()Lrx/Observable;
+    invoke-static {}, Lcom/discord/app/g;->dx()Lrx/Observable;
 
     move-result-object v1
 
@@ -103,7 +103,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -129,11 +129,11 @@
 
     sget-object v0, Lcom/discord/utilities/persister/Persister;->Companion:Lcom/discord/utilities/persister/Persister$Companion;
 
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-string v1, "[Persister]"
 
-    invoke-static {v1}, Lcom/discord/app/AppLog;->ab(Ljava/lang/String;)Lkotlin/jvm/functions/Function3;
+    invoke-static {v1}, Lcom/discord/app/AppLog;->X(Ljava/lang/String;)Lkotlin/jvm/functions/Function3;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/utilities/platform/Platform.smali b/com.discord/smali/com/discord/utilities/platform/Platform.smali
index 0e93382b18..7d546ac11b 100644
--- a/com.discord/smali/com/discord/utilities/platform/Platform.smali
+++ b/com.discord/smali/com/discord/utilities/platform/Platform.smali
@@ -93,11 +93,11 @@
 
     const-string v4, "Xbox Live"
 
-    const v5, 0x7f060157
+    const v5, 0x7f060159
 
-    const v6, 0x7f0801bf
+    const v6, 0x7f0801ce
 
-    const v7, 0x7f0803b3
+    const v7, 0x7f0803cb
 
     const/4 v8, 0x0
 
@@ -129,9 +129,9 @@
 
     const v18, 0x7f060020
 
-    const v19, 0x7f0801ae
+    const v19, 0x7f0801bd
 
-    const v20, 0x7f0801fb
+    const v20, 0x7f08020a
 
     const/16 v21, 0x0
 
@@ -161,11 +161,11 @@
 
     const-string v6, "Facebook"
 
-    const v7, 0x7f06006c
+    const v7, 0x7f06006f
 
-    const v8, 0x7f0801b3
+    const v8, 0x7f0801c2
 
-    const v9, 0x7f08026c
+    const v9, 0x7f08027c
 
     const/4 v11, 0x0
 
@@ -193,11 +193,11 @@
 
     const-string v6, "Google"
 
-    const v7, 0x7f060072
+    const v7, 0x7f060075
 
-    const v8, 0x7f0801b4
+    const v8, 0x7f0801c3
 
-    const v9, 0x7f08028e
+    const v9, 0x7f08029e
 
     const/4 v10, 0x0
 
@@ -223,11 +223,11 @@
 
     const-string v6, "League of Legends"
 
-    const v7, 0x7f060085
+    const v7, 0x7f060088
 
-    const v8, 0x7f0801b5
+    const v8, 0x7f0801c4
 
-    const v9, 0x7f0802d6
+    const v9, 0x7f0802e6
 
     move-object v3, v1
 
@@ -249,7 +249,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f0801b7
+    const v8, 0x7f0801c6
 
     const/4 v9, 0x0
 
@@ -273,7 +273,7 @@
 
     const-string v6, "Patreon"
 
-    const v8, 0x7f0801b8
+    const v8, 0x7f0801c7
 
     move-object v3, v1
 
@@ -293,11 +293,11 @@
 
     const-string v6, "Reddit"
 
-    const v7, 0x7f0600f7
+    const v7, 0x7f0600fa
 
-    const v8, 0x7f0801b9
+    const v8, 0x7f0801c8
 
-    const v9, 0x7f080343
+    const v9, 0x7f080354
 
     const/4 v12, 0x1
 
@@ -351,11 +351,11 @@
 
     const-string v6, "Skype"
 
-    const v7, 0x7f0600ff
+    const v7, 0x7f060101
 
-    const v8, 0x7f0801ba
+    const v8, 0x7f0801c9
 
-    const v9, 0x7f080360
+    const v9, 0x7f080371
 
     const/4 v10, 0x1
 
@@ -381,11 +381,11 @@
 
     const-string v6, "Spotify"
 
-    const v7, 0x7f060100
+    const v7, 0x7f060102
 
-    const v8, 0x7f0801bb
+    const v8, 0x7f0801ca
 
-    const v9, 0x7f080367
+    const v9, 0x7f080378
 
     const/4 v10, 0x0
 
@@ -413,11 +413,11 @@
 
     const-string v6, "Steam"
 
-    const v7, 0x7f06012c
+    const v7, 0x7f06012e
 
-    const v8, 0x7f0801bc
+    const v8, 0x7f0801cb
 
-    const v9, 0x7f08036f
+    const v9, 0x7f080380
 
     const/4 v11, 0x0
 
@@ -441,11 +441,11 @@
 
     const-string v6, "Twitch"
 
-    const v7, 0x7f060137
+    const v7, 0x7f060139
 
-    const v8, 0x7f0801bd
+    const v8, 0x7f0801cc
 
-    const v9, 0x7f080388
+    const v9, 0x7f08039a
 
     move-object v3, v1
 
@@ -465,11 +465,11 @@
 
     const-string v6, "Twitter"
 
-    const v7, 0x7f060138
+    const v7, 0x7f06013a
 
-    const v8, 0x7f0801be
+    const v8, 0x7f0801cd
 
-    const v9, 0x7f08038a
+    const v9, 0x7f08039c
 
     move-object v3, v1
 
@@ -491,7 +491,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f0801c0
+    const v8, 0x7f0801cf
 
     const/4 v9, 0x0
 
@@ -517,11 +517,11 @@
 
     const-string v6, "Youtube"
 
-    const v7, 0x7f060158
+    const v7, 0x7f06015a
 
-    const v8, 0x7f0801c1
+    const v8, 0x7f0801d0
 
-    const v9, 0x7f0803b4
+    const v9, 0x7f0803cc
 
     const/4 v12, 0x1
 
diff --git a/com.discord/smali/com/discord/utilities/nitro/BoostUtils.smali b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.smali
similarity index 79%
rename from com.discord/smali/com/discord/utilities/nitro/BoostUtils.smali
rename to com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.smali
index 43c423941e..5f241bb2ef 100644
--- a/com.discord/smali/com/discord/utilities/nitro/BoostUtils.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.smali
@@ -1,21 +1,21 @@
-.class public final Lcom/discord/utilities/nitro/BoostUtils;
+.class public final Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 .super Ljava/lang/Object;
-.source "BoostUtils.kt"
+.source "PremiumGuildSubscriptionUtils.kt"
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/utilities/nitro/BoostUtils;
+.field public static final INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/utilities/nitro/BoostUtils;
+    new-instance v0, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
-    invoke-direct {v0}, Lcom/discord/utilities/nitro/BoostUtils;-><init>()V
+    invoke-direct {v0}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;-><init>()V
 
-    sput-object v0, Lcom/discord/utilities/nitro/BoostUtils;->INSTANCE:Lcom/discord/utilities/nitro/BoostUtils;
+    sput-object v0, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
     return-void
 .end method
@@ -48,7 +48,7 @@
     return p1
 
     :cond_0
-    const/16 p1, 0x32
+    const/16 p1, 0x14
 
     return p1
 
@@ -84,7 +84,7 @@
     return p1
 
     :cond_1
-    const/16 p1, 0x32
+    const/16 p1, 0x14
 
     return p1
 
@@ -108,11 +108,11 @@
     return p1
 
     :cond_0
-    invoke-direct {p0, p1}, Lcom/discord/utilities/nitro/BoostUtils;->getNextTierSubs(I)I
+    invoke-direct {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getNextTierSubs(I)I
 
     move-result v0
 
-    invoke-direct {p0, p1}, Lcom/discord/utilities/nitro/BoostUtils;->getCurrentTierSubs(I)I
+    invoke-direct {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getCurrentTierSubs(I)I
 
     move-result p1
 
@@ -128,51 +128,46 @@
 
     mul-float p1, p1, p2
 
-    invoke-static {p1}, Lkotlin/e/a;->D(F)I
+    invoke-static {p1}, Lkotlin/e/a;->C(F)I
 
     move-result p1
 
     return p1
 .end method
 
-.method public final calculateTotalBoostCount(Lcom/discord/models/domain/ModelUser;Ljava/util/List;)I
+.method public final calculateTotalBoostCount(Ljava/util/List;)I
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lcom/discord/models/domain/ModelUser;",
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelSubscription;",
             ">;)I"
         }
     .end annotation
 
-    const-string v0, "meUser"
+    const-string v0, "subscriptions"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "subscriptions"
+    check-cast p1, Ljava/lang/Iterable;
 
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    check-cast p2, Ljava/lang/Iterable;
-
-    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p2
+    move-result-object p1
 
     const/4 v0, 0x0
 
     const/4 v1, 0x0
 
     :goto_0
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
 
     if-eqz v2, :cond_4
 
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -299,12 +294,6 @@
     goto :goto_0
 
     :cond_4
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
-
-    move-result p1
-
-    add-int/2addr v1, p1
-
     return v1
 .end method
 
@@ -320,11 +309,11 @@
     return p1
 
     :cond_0
-    invoke-direct {p0, p1}, Lcom/discord/utilities/nitro/BoostUtils;->getNextTierSubs(I)I
+    invoke-direct {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getNextTierSubs(I)I
 
     move-result v0
 
-    invoke-direct {p0, p1}, Lcom/discord/utilities/nitro/BoostUtils;->getCurrentTierSubs(I)I
+    invoke-direct {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getCurrentTierSubs(I)I
 
     move-result v1
 
@@ -348,7 +337,7 @@
 
     add-float/2addr p1, p2
 
-    invoke-static {p1}, Lkotlin/e/a;->D(F)I
+    invoke-static {p1}, Lkotlin/e/a;->C(F)I
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/nitro/NitroUtils$WhenMappings.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$WhenMappings.smali
similarity index 77%
rename from com.discord/smali/com/discord/utilities/nitro/NitroUtils$WhenMappings.smali
rename to com.discord/smali/com/discord/utilities/premium/PremiumUtils$WhenMappings.smali
index b878deebad..95c488a9db 100644
--- a/com.discord/smali/com/discord/utilities/nitro/NitroUtils$WhenMappings.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$WhenMappings.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/utilities/nitro/NitroUtils$WhenMappings;
+.class public final synthetic Lcom/discord/utilities/premium/PremiumUtils$WhenMappings;
 .super Ljava/lang/Object;
 
 
@@ -18,7 +18,7 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/discord/utilities/nitro/NitroUtils$WhenMappings;->$EnumSwitchMapping$0:[I
+    sput-object v0, Lcom/discord/utilities/premium/PremiumUtils$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSku$SkuCategory;->NITRO_CLASSIC:Lcom/discord/models/domain/ModelSku$SkuCategory;
 
@@ -30,7 +30,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/utilities/nitro/NitroUtils$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/utilities/premium/PremiumUtils$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSku$SkuCategory;->NITRO:Lcom/discord/models/domain/ModelSku$SkuCategory;
 
diff --git a/com.discord/smali/com/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1$1.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1.smali
similarity index 70%
rename from com.discord/smali/com/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1$1.smali
rename to com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1.smali
index 77449ec762..751514e7f1 100644
--- a/com.discord/smali/com/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1$1;
+.class final Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1;
 .super Lkotlin/jvm/internal/l;
-.source "NitroUtils.kt"
+.source "PremiumUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1;->invoke(Landroid/net/Uri;)V
+    value = Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;->invoke(Landroid/net/Uri;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -35,7 +35,7 @@
 .method constructor <init>(Lcom/discord/app/AppFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1$1;->$fragment:Lcom/discord/app/AppFragment;
+    iput-object p1, p0, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1;->$fragment:Lcom/discord/app/AppFragment;
 
     const/4 p1, 0x1
 
@@ -51,9 +51,9 @@
 
     check-cast p1, Landroidx/browser/customtabs/CustomTabsIntent;
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1$1;->invoke(Landroidx/browser/customtabs/CustomTabsIntent;)V
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1;->invoke(Landroidx/browser/customtabs/CustomTabsIntent;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1$1;->$fragment:Lcom/discord/app/AppFragment;
+    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;
 
diff --git a/com.discord/smali/com/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali
similarity index 69%
rename from com.discord/smali/com/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1.smali
rename to com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali
index f7f8a8d71c..6da4de7e54 100644
--- a/com.discord/smali/com/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1;
+.class final Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;
 .super Lkotlin/jvm/internal/l;
-.source "NitroUtils.kt"
+.source "PremiumUtils.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/utilities/nitro/NitroUtils;->openWebHandoffBilling(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;)V
+    value = Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -35,7 +35,7 @@
 .method constructor <init>(Ljava/lang/ref/WeakReference;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1;->$weakFragment:Ljava/lang/ref/WeakReference;
+    iput-object p1, p0, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;->$weakFragment:Ljava/lang/ref/WeakReference;
 
     const/4 p1, 0x1
 
@@ -51,9 +51,9 @@
 
     check-cast p1, Landroid/net/Uri;
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1;->invoke(Landroid/net/Uri;)V
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;->invoke(Landroid/net/Uri;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1;->$weakFragment:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;->$weakFragment:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -92,9 +92,9 @@
 
     const/4 v2, 0x1
 
-    new-instance v3, Lcom/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1$1;
+    new-instance v3, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1;
 
-    invoke-direct {v3, v0}, Lcom/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1$1;-><init>(Lcom/discord/app/AppFragment;)V
+    invoke-direct {v3, v0}, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1;-><init>(Lcom/discord/app/AppFragment;)V
 
     check-cast v3, Lkotlin/jvm/functions/Function1;
 
diff --git a/com.discord/smali/com/discord/utilities/nitro/NitroUtils.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
similarity index 81%
rename from com.discord/smali/com/discord/utilities/nitro/NitroUtils.smali
rename to com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
index b8d00d7578..25368067df 100644
--- a/com.discord/smali/com/discord/utilities/nitro/NitroUtils.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
@@ -1,25 +1,25 @@
-.class public final Lcom/discord/utilities/nitro/NitroUtils;
+.class public final Lcom/discord/utilities/premium/PremiumUtils;
 .super Ljava/lang/Object;
-.source "NitroUtils.kt"
+.source "PremiumUtils.kt"
 
 
 # static fields
 .field public static final BILLING_TAB_REQUEST_CODE:I = 0xfbbc
 
-.field public static final INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+.field public static final INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
-.field private static final MODE_PARAM_ADD:Ljava/lang/String; = "add=1"
+.field public static final PREMIUM_APPLICATION_ID:J = 0x73df54a4a020016L
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/utilities/nitro/NitroUtils;
+    new-instance v0, Lcom/discord/utilities/premium/PremiumUtils;
 
-    invoke-direct {v0}, Lcom/discord/utilities/nitro/NitroUtils;-><init>()V
+    invoke-direct {v0}, Lcom/discord/utilities/premium/PremiumUtils;-><init>()V
 
-    sput-object v0, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+    sput-object v0, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
     return-void
 .end method
@@ -32,24 +32,14 @@
     return-void
 .end method
 
-.method private final openWebHandoffBilling(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;)V
+.method private final getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;)V
     .locals 10
 
     new-instance v0, Ljava/lang/ref/WeakReference;
 
     invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    invoke-static {p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string p3, "/billing/premium?"
-
-    invoke-virtual {p3, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {p3}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object p1
 
@@ -99,9 +89,9 @@
 
     move-result-object v2
 
-    new-instance p1, Lcom/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1;
+    new-instance p1, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;
 
-    invoke-direct {p1, v0}, Lcom/discord/utilities/nitro/NitroUtils$openWebHandoffBilling$1;-><init>(Ljava/lang/ref/WeakReference;)V
+    invoke-direct {p1, v0}, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;-><init>(Ljava/lang/ref/WeakReference;)V
 
     move-object v7, p1
 
@@ -124,7 +114,7 @@
     return-void
 .end method
 
-.method public static synthetic openWebPurchasePremium$default(Lcom/discord/utilities/nitro/NitroUtils;Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;ZILjava/lang/Object;)V
+.method public static synthetic openWebPurchasePremium$default(Lcom/discord/utilities/premium/PremiumUtils;Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;ZILjava/lang/Object;)V
     .locals 0
 
     and-int/lit8 p5, p5, 0x8
@@ -134,7 +124,7 @@
     const/4 p4, 0x0
 
     :cond_0
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/utilities/nitro/NitroUtils;->openWebPurchasePremium(Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;Z)V
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/utilities/premium/PremiumUtils;->openWebPurchasePremium(Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;Z)V
 
     return-void
 .end method
@@ -164,7 +154,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/nitro/NitroUtils;->getNitroGiftIcon(Lcom/discord/models/domain/ModelSku;)I
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/premium/PremiumUtils;->getNitroGiftIcon(Lcom/discord/models/domain/ModelSku;)I
 
     move-result p1
 
@@ -191,7 +181,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object v0, Lcom/discord/utilities/nitro/NitroUtils$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/utilities/premium/PremiumUtils$WhenMappings;->$EnumSwitchMapping$0:[I
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSku$SkuCategory;->ordinal()I
 
@@ -213,12 +203,12 @@
     return p1
 
     :cond_2
-    const p1, 0x7f080125
+    const p1, 0x7f08012c
 
     return p1
 
     :cond_3
-    const p1, 0x7f080126
+    const p1, 0x7f08012d
 
     return p1
 .end method
@@ -366,7 +356,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f1200de
+    const v0, 0x7f1200e1
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -402,9 +392,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "add=1"
+    const-string v0, "/billing/payment-sources/create"
 
-    invoke-direct {p0, p1, p2, v0}, Lcom/discord/utilities/nitro/NitroUtils;->openWebHandoffBilling(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;)V
+    invoke-direct {p0, p1, p2, v0}, Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;)V
 
     return-void
 .end method
@@ -456,7 +446,7 @@
 
     if-eqz p4, :cond_0
 
-    const-string p3, "&isGift=true"
+    const-string p3, "&gift=true"
 
     goto :goto_0
 
@@ -472,15 +462,15 @@
 
     new-instance v0, Ljava/lang/StringBuilder;
 
-    const-string v1, "plan="
+    const-string v1, "/billing/premium/subscribe?plan_id="
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPlanTypeString()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPlanId()J
 
-    move-result-object p2
+    move-result-wide v1
 
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -488,7 +478,7 @@
 
     move-result-object p2
 
-    invoke-direct {p0, p1, p4, p2}, Lcom/discord/utilities/nitro/NitroUtils;->openWebHandoffBilling(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;)V
+    invoke-direct {p0, p1, p4, p2}, Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;)V
 
     return-void
 .end method
@@ -512,17 +502,17 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x1
+    const/4 v2, 0x2
 
     new-array v2, v2, [Landroid/net/Uri;
 
-    const-string v3, "https://discordapp.com/billing/premium"
+    const-string v3, "https://discordapp.com/billing/premium/subscribe"
 
     invoke-static {v3}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v3
 
-    const-string v4, "Uri.parse(\"${BuildConfig.HOST}/billing/premium\")"
+    const-string v4, "Uri.parse(\"${BuildConfig\u2026lling/premium/subscribe\")"
 
     invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -530,6 +520,20 @@
 
     aput-object v3, v2, v4
 
+    const-string v3, "https://discordapp.com/billing/payment-sources/create"
+
+    invoke-static {v3}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+
+    move-result-object v3
+
+    const-string v4, "Uri.parse(\"${BuildConfig\u2026/payment-sources/create\")"
+
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v4, 0x1
+
+    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
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivityString$1.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivityString$1.smali
index 0d2dc7efdb..c206398996 100644
--- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivityString$1.smali
+++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivityString$1.smali
@@ -101,7 +101,7 @@
     return-object p1
 
     :cond_0
-    const p2, 0x7f1212ee
+    const p2, 0x7f121341
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -110,7 +110,7 @@
     return-object p1
 
     :cond_1
-    const p2, 0x7f120af4
+    const p2, 0x7f120b22
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -119,7 +119,7 @@
     return-object p1
 
     :cond_2
-    const p2, 0x7f1210b6
+    const p2, 0x7f1210f7
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -128,7 +128,7 @@
     return-object p1
 
     :cond_3
-    const p2, 0x7f120d4b
+    const p2, 0x7f120d91
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
index d92d224642..7b4db4a4bc 100644
--- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
+++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
@@ -62,7 +62,7 @@
     goto :goto_1
 
     :cond_0
-    const v0, 0x7f121204
+    const v0, 0x7f12124b
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -79,7 +79,7 @@
     goto :goto_2
 
     :cond_1
-    const v0, 0x7f1211ff
+    const v0, 0x7f121246
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -96,7 +96,7 @@
     goto :goto_2
 
     :cond_2
-    const v0, 0x7f121200
+    const v0, 0x7f121247
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -143,7 +143,7 @@
     :goto_0
     if-eqz p1, :cond_6
 
-    const v0, 0x7f121202
+    const v0, 0x7f121249
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -164,14 +164,14 @@
 
     :cond_6
     :goto_1
-    const p1, 0x7f121201
+    const p1, 0x7f121248
 
     invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p0
 
     :goto_2
-    const-string p1, "activityHeader"
+    const-string p1, "when (activity.type) {\n \u2026ity_header_playing)\n    }"
 
     invoke-static {p0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -219,7 +219,7 @@
     return-object v1
 
     :cond_1
-    sget-object v0, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
     const/4 v0, 0x1
 
@@ -269,7 +269,7 @@
 
     if-eqz p2, :cond_0
 
-    const v0, 0x7f1210b6
+    const v0, 0x7f1210f7
 
     const/4 v1, 0x1
 
@@ -294,14 +294,14 @@
     if-nez p2, :cond_1
 
     :cond_0
-    const p2, 0x7f1210b7
+    const p2, 0x7f1210f8
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p2
 
     :cond_1
-    const-string p1, "activity"
+    const-string p1, "presence?.playingActivit\u2026.string.streaming_a_game)"
 
     invoke-static {p2, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -333,7 +333,7 @@
 
     if-ne v0, v1, :cond_0
 
-    const p1, 0x7f08036d
+    const p1, 0x7f08037e
 
     return p1
 
@@ -367,7 +367,7 @@
 
     if-ne v0, v1, :cond_3
 
-    const p1, 0x7f08036c
+    const p1, 0x7f08037d
 
     return p1
 
@@ -386,7 +386,7 @@
 
     if-ne v0, v1, :cond_5
 
-    const p1, 0x7f08036a
+    const p1, 0x7f08037b
 
     return p1
 
@@ -405,7 +405,7 @@
 
     if-ne v0, v1, :cond_7
 
-    const p1, 0x7f080369
+    const p1, 0x7f08037a
 
     return p1
 
@@ -419,7 +419,7 @@
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
     :goto_4
-    const p1, 0x7f08036b
+    const p1, 0x7f08037c
 
     return p1
 .end method
@@ -456,7 +456,7 @@
 
     if-ne v0, v1, :cond_2
 
-    const p1, 0x7f121073
+    const p1, 0x7f1210b0
 
     return p1
 
@@ -475,7 +475,7 @@
 
     if-ne v0, v1, :cond_4
 
-    const p1, 0x7f12106f
+    const p1, 0x7f1210ac
 
     return p1
 
@@ -494,13 +494,13 @@
 
     if-ne p1, v0, :cond_6
 
-    const p1, 0x7f12106d
+    const p1, 0x7f1210aa
 
     return p1
 
     :cond_6
     :goto_3
-    const p1, 0x7f121072
+    const p1, 0x7f1210af
 
     return p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener.smali b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener.smali
index 18ae6a3b1a..61381d3d7a 100644
--- a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener.smali
+++ b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener.smali
@@ -126,7 +126,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Kc()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 97ca385366..6194af9cbb 100644
--- a/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.smali
+++ b/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.smali
@@ -71,7 +71,7 @@
     return-void
 
     :catch_0
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali b/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
index f2f019d8f7..a950c73643 100644
--- a/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
+++ b/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
@@ -107,7 +107,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lokhttp3/MediaType;->eo(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {v0}, Lokhttp3/MediaType;->ei(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object v0
 
@@ -227,7 +227,7 @@
     :catch_0
     move-exception p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     check-cast p1, Ljava/lang/Throwable;
 
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 9c797633a1..e209c345d0 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
@@ -167,7 +167,7 @@
 .method public final getUserAgent()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "Discord-Android/950"
+    const-string v0, "Discord-Android/963"
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$1.smali
index 42292889d3..d18482f13e 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$1.smali
@@ -47,11 +47,11 @@
 .method public final intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
     .locals 3
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GL()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GA()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->GZ()Lokhttp3/w$a;
+    invoke-virtual {v0}, Lokhttp3/w;->GN()Lokhttp3/w$a;
 
     move-result-object v0
 
@@ -67,7 +67,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object v0
 
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 b7bd39d2d4..84e9157d0f 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
@@ -47,7 +47,7 @@
 .method public final log(Ljava/lang/String;)V
     .locals 3
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-string v1, "it"
 
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 753f170edd..0c2b8d84c8 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion.smali
@@ -78,11 +78,11 @@
 
     invoke-direct {v0, v1}, Lokhttp3/a/a;-><init>(Lokhttp3/a/a$b;)V
 
-    sget v1, Lokhttp3/a/a$a;->bAX:I
+    sget v1, Lokhttp3/a/a$a;->bBr:I
 
-    invoke-virtual {v0, v1}, Lokhttp3/a/a;->dO(I)Lokhttp3/a/a;
+    if-eqz v1, :cond_0
 
-    move-result-object v0
+    iput v1, v0, Lokhttp3/a/a;->bBp:I
 
     const-string v1, "HttpLoggingInterceptor(H\u2026.Level.BASIC\n          })"
 
@@ -91,6 +91,15 @@
     check-cast v0, Lokhttp3/Interceptor;
 
     return-object v0
+
+    :cond_0
+    new-instance v0, Ljava/lang/NullPointerException;
+
+    const-string v1, "level == null. Use Level.NONE instead."
+
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw v0
 .end method
 
 .method public final getApi()Lcom/discord/utilities/rest/RestAPI;
@@ -104,7 +113,7 @@
 
     const-string v1, "api"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -121,7 +130,7 @@
 
     const-string v1, "apiClientVersions"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -138,7 +147,7 @@
 
     const-string v1, "apiRelaxedTimeout"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -155,7 +164,7 @@
 
     const-string v1, "apiSerializeNulls"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -172,7 +181,7 @@
 
     const-string v1, "apiSpotify"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -197,7 +206,7 @@
 
     new-instance v2, Lcom/discord/restapi/BreadcrumbInterceptor;
 
-    sget-object v3, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v3, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     check-cast v3, Lcom/discord/utilities/logging/Logger;
 
@@ -243,7 +252,7 @@
 
     aput-object v2, v6, v4
 
-    invoke-static {v6}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v6}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v4
 
@@ -253,7 +262,7 @@
 
     aput-object v2, v6, v1
 
-    invoke-static {v6}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v6}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v2
 
@@ -417,7 +426,7 @@
 
     aput-object v2, v1, v4
 
-    invoke-static {v1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v14
 
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 2d046cfe74..b0c44bf1ec 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
@@ -62,7 +62,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p1, Lcom/google/gson/JsonObject;->aWV:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p1, Lcom/google/gson/JsonObject;->aXn:Lcom/google/gson/internal/LinkedTreeMap;
 
     const-string v0, "discord_android_min_version"
 
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
index dd65964393..8b8ac9c69d 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
@@ -281,7 +281,7 @@
 
     const-string v1, "api"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -296,7 +296,7 @@
 
     const-string v1, "apiRelaxedTimeout"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -311,7 +311,7 @@
 
     const-string v1, "apiSerializeNulls"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -326,7 +326,7 @@
 
     const-string v1, "apiSpotify"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -427,7 +427,7 @@
     :catch_0
     move-exception v3
 
-    sget-object v4, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     move-object v7, v3
 
@@ -575,7 +575,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -589,7 +589,7 @@
     if-nez p2, :cond_3
 
     :cond_2
-    sget-object p2, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p2, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p2, Ljava/util/List;
 
@@ -791,7 +791,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            JO = true
+            JB = true
             value = "reaction"
         .end annotation
     .end param
@@ -2681,7 +2681,7 @@
 
     const-string v1, "apiClientVersions"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     const-string v1, "https://dl.discordapp.net/apps/android/versions.json"
@@ -3262,6 +3262,36 @@
     return-object p1
 .end method
 
+.method public final getMyEntitlements(J)Lrx/Observable;
+    .locals 1
+    .param p1    # J
+        .annotation runtime Lb/c/s;
+            value = "applicationId"
+        .end annotation
+    .end param
+    .annotation runtime Lb/c/f;
+        value = "users/@me/applications/{applicationId}/entitlements"
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(J)",
+            "Lrx/Observable<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+
+    invoke-interface {v0, p1, p2}, Lcom/discord/restapi/RestAPIInterface;->getMyEntitlements(J)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
 .method public final getOAuthTokens()Lrx/Observable;
     .locals 1
     .annotation runtime Lb/c/f;
@@ -3540,7 +3570,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            JO = true
+            JB = true
             value = "emoji"
         .end annotation
     .end param
@@ -4593,8 +4623,8 @@
     return-object p1
 .end method
 
-.method public final postOauth2Authorize(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 10
+.method public final 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 12
     .param p1    # Ljava/lang/String;
         .annotation runtime Lb/c/t;
             value = "client_id"
@@ -4630,7 +4660,17 @@
             value = "permissions"
         .end annotation
     .end param
-    .param p8    # Ljava/util/Map;
+    .param p8    # Ljava/lang/String;
+        .annotation runtime Lb/c/t;
+            value = "code_challenge"
+        .end annotation
+    .end param
+    .param p9    # Ljava/lang/String;
+        .annotation runtime Lb/c/t;
+            value = "code_challenge_method"
+        .end annotation
+    .end param
+    .param p10    # Ljava/util/Map;
         .annotation runtime Lb/c/a;
         .end annotation
     .end param
@@ -4648,6 +4688,8 @@
             "Ljava/lang/String;",
             "Ljava/lang/String;",
             "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
             "Ljava/util/Map<",
             "Ljava/lang/String;",
             "Ljava/lang/String;",
@@ -4666,9 +4708,9 @@
 
     const-string v0, "prompt"
 
-    move-object v6, p5
+    move-object/from16 v6, p5
 
-    invoke-static {p5, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "scope"
 
@@ -4678,9 +4720,9 @@
 
     const-string v0, "body"
 
-    move-object/from16 v9, p8
+    move-object/from16 v11, p10
 
-    invoke-static {v9, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v0, p0
 
@@ -4690,11 +4732,15 @@
 
     move-object v4, p3
 
-    move-object v5, p4
+    move-object/from16 v5, p4
 
     move-object/from16 v8, p7
 
-    invoke-interface/range {v1 .. v9}, 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/util/Map;)Lrx/Observable;
+    move-object/from16 v9, p8
+
+    move-object/from16 v10, p9
+
+    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 v1
 
@@ -4817,7 +4863,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            JO = true
+            JB = true
             value = "reaction"
         .end annotation
     .end param
@@ -4966,7 +5012,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            JO = true
+            JB = true
             value = "reaction"
         .end annotation
     .end param
@@ -5567,30 +5613,6 @@
     return-object v1
 .end method
 
-.method public final sendEmailToDownloadDesktop()Lrx/Observable;
-    .locals 1
-    .annotation runtime Lb/c/o;
-        value = "download/email/desktop"
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Ljava/lang/Void;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
-
-    invoke-interface {v0}, Lcom/discord/restapi/RestAPIInterface;->sendEmailToDownloadDesktop()Lrx/Observable;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
 .method public final sendMessage(JLcom/discord/restapi/RestAPIParams$Message;)Lrx/Observable;
     .locals 1
     .param p1    # J
@@ -5718,7 +5740,7 @@
 
     const-string v0, "apiRelaxedTimeout"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast p4, Ljava/util/Collection;
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali
index 089a3328b1..7d25a64c65 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali
@@ -38,7 +38,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120323
+    const v2, 0x7f120328
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -58,7 +58,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f12031f
+    const v3, 0x7f120324
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -78,7 +78,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f12031e
+    const v3, 0x7f120323
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -98,7 +98,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120320
+    const v3, 0x7f120325
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -118,7 +118,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f12009a
+    const v3, 0x7f12009c
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
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 a1b68dfab5..3f41c97319 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload.smali
@@ -405,7 +405,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 6
+    .locals 4
 
     iget-object v0, p0, Lcom/discord/utilities/rest/SendUtils$FileUpload;->name:Ljava/lang/String;
 
@@ -427,15 +427,11 @@
 
     iget-wide v2, p0, Lcom/discord/utilities/rest/SendUtils$FileUpload;->contentLength:J
 
-    const/16 v4, 0x20
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v4, v2, v4
+    move-result v2
 
-    xor-long/2addr v2, v4
-
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
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 9debce0702..82d5baf4fa 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
@@ -196,6 +196,10 @@
 
     iget v0, p0, Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;->numFiles:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget-object v1, p0, Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;->name:Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
index e6cf14a054..792ef011b4 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
@@ -278,7 +278,7 @@
 
     check-cast v0, Lrx/functions/Action1;
 
-    sget p1, Lrx/Emitter$a;->bIB:I
+    sget p1, Lrx/Emitter$a;->bIV:I
 
     invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;I)Lrx/Observable;
 
@@ -324,20 +324,20 @@
     goto :goto_0
 
     :cond_0
-    const p2, 0x7f12059f
+    const p2, 0x7f1205ab
 
     goto :goto_0
 
     :cond_1
-    const p2, 0x7f12059e
+    const p2, 0x7f1205aa
 
     goto :goto_0
 
     :cond_2
-    const p2, 0x7f1205a0
+    const p2, 0x7f1205ac
 
     :goto_0
-    const v0, 0x7f0d00ef
+    const v0, 0x7f0d00f8
 
     const/4 v2, 0x0
 
@@ -357,7 +357,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f0a01cc
+    const v3, 0x7f0a01cd
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -391,7 +391,7 @@
 
     if-eqz p1, :cond_3
 
-    const p2, 0x7f060136
+    const p2, 0x7f060138
 
     invoke-virtual {p1, p2}, Landroid/view/Window;->setBackgroundDrawableResource(I)V
 
@@ -557,7 +557,7 @@
 
     if-gez v2, :cond_1
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_1
     check-cast v3, Lcom/lytefast/flexinput/model/Attachment;
@@ -593,7 +593,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JV()Lrx/Observable;
 
     move-result-object p1
 
@@ -620,7 +620,7 @@
     :cond_3
     new-instance p1, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;
 
-    sget-object p3, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p3, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p3, Ljava/util/List;
 
@@ -702,7 +702,7 @@
     goto :goto_0
 
     :cond_1
-    const p3, 0x7f120b8c
+    const p3, 0x7f120bbe
 
     invoke-static {p2, p3}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
@@ -745,11 +745,11 @@
     :cond_0
     if-nez p5, :cond_1
 
-    sget-object p3, Lcom/discord/a/a;->ww:Lcom/discord/a/a$a;
+    sget-object p3, Lcom/discord/dialogs/c;->wG:Lcom/discord/dialogs/c$a;
 
     const/4 v1, 0x3
 
-    const p3, 0x7f120e5c
+    const p3, 0x7f120e93
 
     invoke-virtual {p1, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -767,7 +767,7 @@
 
     move-object v0, p2
 
-    invoke-static/range {v0 .. v7}, Lcom/discord/a/a$a;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
+    invoke-static/range {v0 .. v7}, Lcom/discord/dialogs/c$a;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtilsKt.smali b/com.discord/smali/com/discord/utilities/rest/SendUtilsKt.smali
index 2590134208..7c68904e0b 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtilsKt.smali
@@ -172,7 +172,7 @@
     :catch_1
     move-exception p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle.smali b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle.smali
index e4745ce26b..da3dc4f203 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 {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -88,7 +88,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/rx/LeadingEdgeThrottle;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object v6
 
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 4381f0e13b..9f94197395 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
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 6795f57d7e..c8c11793e9 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
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$2;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 491d8e7280..573c52dbd7 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
@@ -76,7 +76,7 @@
 .method public final call(Ljava/lang/Object;)Z
     .locals 0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Eo()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ed()V
 
     instance-of p1, p1, Ljava/lang/Object;
 
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 da035480c8..bd7d7be65b 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
@@ -67,7 +67,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Eo()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ed()V
 
     check-cast p1, Ljava/lang/Object;
 
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 17236372a7..4d97792629 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
@@ -67,7 +67,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     return-object p1
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1.smali
similarity index 75%
rename from com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1.smali
rename to com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1.smali
index 0cf11dc1c7..e384eef4f7 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1;
+.class final Lcom/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1;
 .super Ljava/lang/Object;
 .source "ObservableExtensions.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)Lrx/Observable;
+    value = Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeUntilComponentFinished(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -40,7 +40,7 @@
 .method constructor <init>(Lcom/discord/app/AppComponent;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1;->$appComponent$inlined:Lcom/discord/app/AppComponent;
+    iput-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1;->$appComponent$inlined:Lcom/discord/app/AppComponent;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,7 +52,7 @@
 .method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1;->call(Ljava/lang/Object;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1;->call(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -71,7 +71,7 @@
         }
     .end annotation
 
-    iget-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1;->$appComponent$inlined:Lcom/discord/app/AppComponent;
+    iget-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1;->$appComponent$inlined:Lcom/discord/app/AppComponent;
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
@@ -81,7 +81,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1;->$appComponent$inlined:Lcom/discord/app/AppComponent;
+    iget-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1;->$appComponent$inlined:Lcom/discord/app/AppComponent;
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
@@ -91,7 +91,7 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1;->$appComponent$inlined:Lcom/discord/app/AppComponent;
+    iget-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1;->$appComponent$inlined:Lcom/discord/app/AppComponent;
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$2.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$1.smali
similarity index 90%
rename from com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$2.smali
rename to com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$1.smali
index 07df7aca5e..de53308442 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$2.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$2;
+.class final Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$1;
 .super Ljava/lang/Object;
 .source "ObservableExtensions.kt"
 
@@ -25,7 +25,7 @@
 .method constructor <init>(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$2;->$adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+    iput-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$1;->$adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final call()V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$2;->$adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+    iget-object v0, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$1;->$adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali
index 29bae095ef..dd4aaf6f54 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali
@@ -320,11 +320,11 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lrx/Observable;->Kc()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JQ()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -332,7 +332,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -365,11 +365,11 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lrx/Observable;->Kd()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JR()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -377,7 +377,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -410,7 +410,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Ep()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ee()V
 
     sget-object v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterIs$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterIs$1;
 
@@ -420,7 +420,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Ep()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ee()V
 
     sget-object v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterIs$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterIs$2;
 
@@ -537,7 +537,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lrx/d/a;->LG()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lu()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -612,7 +612,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object p0
 
@@ -673,6 +673,68 @@
     return-object p0
 .end method
 
+.method public static final takeUntilComponentFinished(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lrx/Observable<",
+            "TT;>;",
+            "Lcom/discord/app/AppComponent;",
+            ")",
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$takeUntilComponentFinished"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "appComponent"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Lcom/discord/app/AppComponent;->getPaused()Lrx/subjects/Subject;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Observable;
+
+    invoke-virtual {p0, v0}, Lrx/Observable;->c(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object p0
+
+    instance-of v0, p1, Landroidx/fragment/app/Fragment;
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1;
+
+    invoke-direct {v0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1;-><init>(Lcom/discord/app/AppComponent;)V
+
+    check-cast v0, Lrx/functions/b;
+
+    invoke-virtual {p0, v0}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p0
+
+    const-string p1, "observable.filter {\n    \u2026hing == false\n          }"
+
+    invoke-static {p0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+
+    :cond_0
+    const-string p1, "observable"
+
+    invoke-static {p0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
 .method public static final ui(Lrx/Observable;)Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -691,7 +753,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -731,7 +793,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -739,34 +801,17 @@
 
     move-result-object p0
 
-    invoke-interface {p1}, Lcom/discord/app/AppComponent;->getPaused()Lrx/subjects/Subject;
+    const-string v0, "observeOn(AndroidSchedulers.mainThread())"
 
-    move-result-object v0
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Lrx/Observable;
-
-    invoke-virtual {p0, v0}, Lrx/Observable;->c(Lrx/Observable;)Lrx/Observable;
+    invoke-static {p0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeUntilComponentFinished(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
     move-result-object p0
 
-    instance-of v0, p1, Landroidx/fragment/app/Fragment;
+    new-instance p1, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$1;
 
-    if-eqz v0, :cond_0
-
-    new-instance v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1;
-
-    invoke-direct {v0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1;-><init>(Lcom/discord/app/AppComponent;)V
-
-    check-cast v0, Lrx/functions/b;
-
-    invoke-virtual {p0, v0}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object p0
-
-    :cond_0
-    new-instance p1, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$2;
-
-    invoke-direct {p1, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$2;-><init>(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)V
+    invoke-direct {p1, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$1;-><init>(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)V
 
     check-cast p1, Lrx/functions/Action0;
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.smali b/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.smali
index 72c63f4360..9233a27f9c 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 {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v5
 
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 5a3a4a6ef5..2b289b348f 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$2;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 6163e0327a..084ced399b 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$2;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 dc40f049c7..47439cdf8f 100644
--- a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler.smali
@@ -117,7 +117,7 @@
 
     if-eqz p2, :cond_2
 
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
 
     move-result-object p5
 
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 1e0a7cd11d..9979583bb7 100644
--- a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$Companion.smali
@@ -47,7 +47,7 @@
 
     if-eqz p4, :cond_1
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object p6
 
diff --git a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay.smali b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay.smali
index c0cfc43c2a..5482c7e5f2 100644
--- a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay.smali
@@ -139,7 +139,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/rx/OperatorBufferedDelay;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
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 94a8a3873f..2a8111a048 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
@@ -55,7 +55,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$2;->invoke(Ljava/util/LinkedList;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 41bba7ce93..aa7f252b2a 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
@@ -55,7 +55,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$2;->invoke(Ljava/util/LinkedList;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 abfb7d25bb..28157ceecc 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.smali
@@ -403,7 +403,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v0
 
@@ -417,7 +417,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$2;
 
@@ -515,7 +515,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v0
 
@@ -529,7 +529,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance p2, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$2;
 
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 03789d2b54..f58b431101 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher.smali
@@ -101,7 +101,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object p2
 
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 12eb12c09a..59434d0d46 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
@@ -274,7 +274,7 @@
 
     aput-object p1, v0, v1
 
-    invoke-static {v0}, Lkotlin/a/m;->m([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p1
 
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 9da514288c..51b449eabf 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
@@ -474,6 +474,10 @@
 
     iget v1, p0, Lcom/discord/utilities/search/network/state/SearchState;->totalResults:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
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 da0478c056..91afa5a65b 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
@@ -148,7 +148,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    sget-object v1, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object v1, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
     const/4 v1, 0x1
 
@@ -222,7 +222,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/ak;->p([Ljava/lang/Object;)Ljava/util/Set;
+    invoke-static {v0}, Lkotlin/a/ak;->o([Ljava/lang/Object;)Ljava/util/Set;
 
     move-result-object v0
 
@@ -250,6 +250,10 @@
 
     iget v1, p0, Lcom/discord/utilities/search/query/node/answer/UserNode;->discriminator:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
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 0a232ad6a1..8e2f61703c 100644
--- a/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali
+++ b/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali
@@ -38,7 +38,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    const v0, 0x7f120f89
+    const v0, 0x7f120fc3
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -50,7 +50,7 @@
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fromFilterString:Ljava/lang/String;
 
-    const v0, 0x7f120f8b
+    const v0, 0x7f120fc5
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -62,7 +62,7 @@
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->inFilterString:Ljava/lang/String;
 
-    const v0, 0x7f120f8d
+    const v0, 0x7f120fc7
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -74,7 +74,7 @@
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->mentionsFilterString:Ljava/lang/String;
 
-    const v0, 0x7f120f8a
+    const v0, 0x7f120fc4
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -86,7 +86,7 @@
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->hasFilterString:Ljava/lang/String;
 
-    const v0, 0x7f120f75
+    const v0, 0x7f120faf
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -98,7 +98,7 @@
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->linkAnswerString:Ljava/lang/String;
 
-    const v0, 0x7f120f73
+    const v0, 0x7f120fad
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -110,7 +110,7 @@
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->embedAnswerString:Ljava/lang/String;
 
-    const v0, 0x7f120f72
+    const v0, 0x7f120fac
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -122,7 +122,7 @@
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fileAnswerString:Ljava/lang/String;
 
-    const v0, 0x7f120f77
+    const v0, 0x7f120fb1
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -134,7 +134,7 @@
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->videoAnswerString:Ljava/lang/String;
 
-    const v0, 0x7f120f74
+    const v0, 0x7f120fae
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -146,7 +146,7 @@
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->imageAnswerString:Ljava/lang/String;
 
-    const v0, 0x7f120f76
+    const v0, 0x7f120fb0
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 64e3985595..4651dd6602 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$3;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 3ef8da7624..a5614ec25f 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine.smali
@@ -46,7 +46,7 @@
 
     new-instance v1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object v2
 
@@ -95,7 +95,7 @@
 
     if-eq p2, v0, :cond_0
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -549,7 +549,7 @@
 
     if-eq p2, v0, :cond_0
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -947,7 +947,7 @@
 
     if-eq p2, v1, :cond_0
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -1157,7 +1157,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v1
 
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 3b9a7d1e98..d231f4e779 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
@@ -80,7 +80,7 @@
 
     move-result v0
 
-    invoke-static {v2, v0}, Lkotlin/ranges/c;->aa(II)I
+    invoke-static {v2, v0}, Lkotlin/ranges/c;->Z(II)I
 
     move-result v0
 
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 10ee48b7ae..5a8aebfa36 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
@@ -195,7 +195,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;->channelName:Ljava/lang/String;
 
@@ -215,15 +215,11 @@
 
     iget-wide v1, p0, Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;->channelId:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return 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 d9fcaf6086..73db882c96 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
@@ -547,7 +547,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 6
+    .locals 4
 
     iget-object v0, p0, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;->userName:Ljava/lang/String;
 
@@ -569,21 +569,21 @@
 
     iget v2, p0, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;->discriminator:I
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v2, p0, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;->userId:J
 
-    const/16 v4, 0x20
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v4, v2, v4
+    move-result v2
 
-    xor-long/2addr v2, v4
-
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
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 83681cb3c3..5b8d47c928 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
@@ -65,7 +65,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1;->invoke(Lcom/discord/models/domain/ModelUser;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/spans/BulletSpan.smali b/com.discord/smali/com/discord/utilities/spans/BulletSpan.smali
index af31e62c1d..f9bce038c1 100644
--- a/com.discord/smali/com/discord/utilities/spans/BulletSpan.smali
+++ b/com.discord/smali/com/discord/utilities/spans/BulletSpan.smali
@@ -261,7 +261,7 @@
 
     if-nez p3, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     invoke-virtual {p1, p3, p2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
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 45dbd7b565..4e2dfb6ac3 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$1;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 c31b62598f..0b754bc6d8 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$2;->invoke(Lcom/discord/models/domain/spotify/ModelSpotifyTrack;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 7df5573829..bdac25d237 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1;->invoke(Lcom/discord/models/domain/ModelConnectionAccessToken;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 badd954f5a..53a52b778a 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 c708ce97ff..f860321c93 100644
--- a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient.smali
+++ b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient.smali
@@ -46,7 +46,7 @@
 
     iput-object v0, p0, Lcom/discord/utilities/spotify/SpotifyApiClient;->spotifyTracks:Ljava/util/HashMap;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -297,7 +297,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1;
 
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 cff64b6e33..8158fae887 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
@@ -134,7 +134,7 @@
 
     check-cast v0, Landroid/content/Context;
 
-    const v1, 0x7f0d0082
+    const v1, 0x7f0d0089
 
     const/4 v2, 0x0
 
@@ -158,7 +158,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a07d8
+    const v2, 0x7f0a0815
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -166,7 +166,7 @@
 
     check-cast v2, Landroid/widget/TextView;
 
-    const v3, 0x7f0a07d9
+    const v3, 0x7f0a0816
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -174,7 +174,7 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    const v4, 0x7f0a07d6
+    const v4, 0x7f0a0813
 
     invoke-virtual {v0, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -182,7 +182,7 @@
 
     check-cast v4, Landroid/widget/TextView;
 
-    const v5, 0x7f0a07d7
+    const v5, 0x7f0a0814
 
     invoke-virtual {v0, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -190,11 +190,11 @@
 
     check-cast v0, Landroid/widget/TextView;
 
-    const v5, 0x7f120505
+    const v5, 0x7f120510
 
     invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V
 
-    const v2, 0x7f120506
+    const v2, 0x7f120511
 
     invoke-virtual {v3, v2}, Landroid/widget/TextView;->setText(I)V
 
@@ -206,7 +206,7 @@
 
     invoke-virtual {v4, v2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const v2, 0x7f120c77
+    const v2, 0x7f120cb0
 
     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 3ee1e5eaf6..5cb1392753 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/stateful/StatefulViews$configureSaveActionView$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 bf443318ac..2d9990246e 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/stateful/StatefulViews$configureSaveActionView$2;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 e76bbcd085..bec5880ec0 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
@@ -65,7 +65,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/stateful/StatefulViews$setupTextWatcherWithSaveAction$$inlined$forEach$lambda$1;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 912d268dec..a3b63e772b 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews.smali
@@ -205,7 +205,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion$get$1.smali b/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion$get$1.smali
index 60e2d22250..bb094a0e68 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion$get$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/utilities/streams/StreamContext$Companion;->get(JZ)Lrx/Observable;
+    value = Lcom/discord/utilities/streams/StreamContext$Companion;->get(JZLcom/discord/stores/StoreApplicationStreaming;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion.smali b/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion.smali
index f421bea713..9ae64bbc3e 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion.smali
@@ -41,17 +41,28 @@
     return-object p0
 .end method
 
-.method public static synthetic get$default(Lcom/discord/utilities/streams/StreamContext$Companion;JZILjava/lang/Object;)Lrx/Observable;
+.method public static synthetic get$default(Lcom/discord/utilities/streams/StreamContext$Companion;JZLcom/discord/stores/StoreApplicationStreaming;ILjava/lang/Object;)Lrx/Observable;
     .locals 0
 
-    and-int/lit8 p4, p4, 0x2
+    and-int/lit8 p6, p5, 0x2
 
-    if-eqz p4, :cond_0
+    if-eqz p6, :cond_0
 
     const/4 p3, 0x0
 
     :cond_0
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/utilities/streams/StreamContext$Companion;->get(JZ)Lrx/Observable;
+    and-int/lit8 p5, p5, 0x4
+
+    if-eqz p5, :cond_1
+
+    sget-object p4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p4}, Lcom/discord/stores/StoreStream$Companion;->getApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
+
+    move-result-object p4
+
+    :cond_1
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/utilities/streams/StreamContext$Companion;->get(JZLcom/discord/stores/StoreApplicationStreaming;)Lrx/Observable;
 
     move-result-object p0
 
@@ -99,7 +110,7 @@
 
 # virtual methods
 .method public final get(J)Lrx/Observable;
-    .locals 6
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J)",
@@ -111,15 +122,17 @@
 
     const/4 v3, 0x0
 
-    const/4 v4, 0x2
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x6
+
+    const/4 v6, 0x0
 
     move-object v0, p0
 
     move-wide v1, p1
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/streams/StreamContext$Companion;->get$default(Lcom/discord/utilities/streams/StreamContext$Companion;JZILjava/lang/Object;)Lrx/Observable;
+    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/streams/StreamContext$Companion;->get$default(Lcom/discord/utilities/streams/StreamContext$Companion;JZLcom/discord/stores/StoreApplicationStreaming;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
@@ -127,7 +140,7 @@
 .end method
 
 .method public final get(JZ)Lrx/Observable;
-    .locals 1
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(JZ)",
@@ -137,13 +150,43 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    const/4 v4, 0x0
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
+    const/4 v5, 0x4
 
-    move-result-object v0
+    const/4 v6, 0x0
 
-    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming;->getForUser(J)Lrx/Observable;
+    move-object v0, p0
+
+    move-wide v1, p1
+
+    move v3, p3
+
+    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/streams/StreamContext$Companion;->get$default(Lcom/discord/utilities/streams/StreamContext$Companion;JZLcom/discord/stores/StoreApplicationStreaming;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final get(JZLcom/discord/stores/StoreApplicationStreaming;)Lrx/Observable;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(JZ",
+            "Lcom/discord/stores/StoreApplicationStreaming;",
+            ")",
+            "Lrx/Observable<",
+            "Lcom/discord/utilities/streams/StreamContext;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "storeApplicationStreaming"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p4, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming;->getStreamsForUser(J)Lrx/Observable;
 
     move-result-object p1
 
@@ -157,7 +200,7 @@
 
     move-result-object p1
 
-    const-string p2, "StoreStream\n          .g\u2026            }\n          }"
+    const-string p2, "storeApplicationStreamin\u2026            }\n          }"
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey$Companion.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey$Companion.smali
deleted file mode 100644
index 910e6ec328..0000000000
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey$Companion.smali
+++ /dev/null
@@ -1,65 +0,0 @@
-.class public final Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey$Companion;
-.super Ljava/lang/Object;
-.source "SurveyUtils.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Companion"
-.end annotation
-
-
-# direct methods
-.method private 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/surveys/SurveyUtils$Survey$KoreaSurvey$Companion;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final createFromBucket(Lcom/discord/models/domain/ModelUser;I)Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;
-    .locals 2
-
-    const-string v0, "meUser"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    if-eq p2, v1, :cond_0
-
-    move-object p2, v0
-
-    goto :goto_0
-
-    :cond_0
-    const-string p2, "PCP9PW2"
-
-    :goto_0
-    if-eqz p2, :cond_1
-
-    new-instance v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;
-
-    invoke-direct {v0, p1, p2}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)V
-
-    :cond_1
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey.smali
deleted file mode 100644
index 3ed362cd8d..0000000000
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey.smali
+++ /dev/null
@@ -1,318 +0,0 @@
-.class public final Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;
-.super Lcom/discord/utilities/surveys/SurveyUtils$Survey;
-.source "SurveyUtils.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/utilities/surveys/SurveyUtils$Survey;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "KoreaSurvey"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey$Companion;
-    }
-.end annotation
-
-
-# static fields
-.field public static final Companion:Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey$Companion;
-
-
-# instance fields
-.field private final meUser:Lcom/discord/models/domain/ModelUser;
-
-.field private final surveyId:Ljava/lang/String;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->Companion:Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey$Companion;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)V
-    .locals 2
-
-    const-string v0, "meUser"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "surveyId"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "NOTICE_KEY_KOREA_SURVEY"
-
-    const/4 v1, 0x0
-
-    invoke-direct {p0, p1, p2, v0, v1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    iput-object p1, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    iput-object p2, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->surveyId:Ljava/lang/String;
-
-    return-void
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;
-    .locals 0
-
-    and-int/lit8 p4, p3, 0x1
-
-    if-eqz p4, :cond_0
-
-    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getMeUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
-
-    :cond_0
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_1
-
-    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getSurveyId()Ljava/lang/String;
-
-    move-result-object p2
-
-    :cond_1
-    invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->copy(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final component1()Lcom/discord/models/domain/ModelUser;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getMeUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final component2()Ljava/lang/String;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getSurveyId()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final copy(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;
-    .locals 1
-
-    const-string v0, "meUser"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "surveyId"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;
-
-    invoke-direct {v0, p1, p2}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)V
-
-    return-object v0
-.end method
-
-.method public final equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    if-eq p0, p1, :cond_1
-
-    instance-of v0, p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;
-
-    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getMeUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v0
-
-    invoke-virtual {p1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getMeUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getSurveyId()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {p1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getSurveyId()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getMeUser()Lcom/discord/models/domain/ModelUser;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    return-object v0
-.end method
-
-.method public final getSurveyId()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->surveyId:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final getSurveyUrl()Ljava/lang/String;
-    .locals 3
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "https://ko.surveymonkey.com/r/"
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getSurveyId()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, "?id="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getMeUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v1
-
-    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
-
-.method public final hashCode()I
-    .locals 3
-
-    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getMeUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v0
-
-    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
-
-    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getSurveyId()Ljava/lang/String;
-
-    move-result-object v2
-
-    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 final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "KoreaSurvey(meUser="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getMeUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", surveyId="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->getSurveyId()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/com/discord/utilities/surveys/SurveyUtils$Survey$None.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$None.smali
new file mode 100644
index 0000000000..96b5432425
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$None.smali
@@ -0,0 +1,60 @@
+.class public final Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;
+.super Lcom/discord/utilities/surveys/SurveyUtils$Survey;
+.source "SurveyUtils.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/utilities/surveys/SurveyUtils$Survey;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "None"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;
+
+    invoke-direct {v0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;-><init>()V
+
+    sput-object v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 2
+
+    const-string v0, ""
+
+    const/4 v1, 0x0
+
+    invoke-direct {p0, v1, v0, v0, v1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getSurveyUrl()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "invalid survey"
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    throw v0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$NoticeKeys.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$NoticeKeys.smali
index 7428fe51d4..a98957c66c 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$NoticeKeys.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$NoticeKeys.smali
@@ -17,7 +17,7 @@
 # static fields
 .field public static final INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$NoticeKeys;
 
-.field public static final NOTICE_KEY_KOREA_SURVEY:Ljava/lang/String; = "NOTICE_KEY_KOREA_SURVEY"
+.field public static final NOTICE_KEY_NPS_SURVEY:Ljava/lang/String; = "NOTICE_KEY_NPS_SURVEY"
 
 .field public static final NOTICE_KEY_USER_SURVEY:Ljava/lang/String; = "NOTICE_KEY_USER_SURVEY"
 
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
new file mode 100644
index 0000000000..ed0c56861e
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey.smali
@@ -0,0 +1,179 @@
+.class public final Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;
+.super Lcom/discord/utilities/surveys/SurveyUtils$Survey;
+.source "SurveyUtils.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/utilities/surveys/SurveyUtils$Survey;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "NpsSurvey"
+.end annotation
+
+
+# instance fields
+.field private final meUser:Lcom/discord/models/domain/ModelUser;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;)V
+    .locals 3
+
+    const-string v0, "meUser"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "PKSGNJ8"
+
+    const-string v1, "NOTICE_KEY_NPS_SURVEY"
+
+    const/4 v2, 0x0
+
+    invoke-direct {p0, p1, v0, v1, v2}, Lcom/discord/utilities/surveys/SurveyUtils$Survey;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object p1, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    return-void
+.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;
+    .locals 0
+
+    and-int/lit8 p2, p2, 0x1
+
+    if-eqz p2, :cond_0
+
+    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;->getMeUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object p1
+
+    :cond_0
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;->copy(Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;->getMeUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;
+    .locals 1
+
+    const-string v0, "meUser"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;
+
+    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;->getMeUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;->getMeUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object p1
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getMeUser()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;->getMeUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "NpsSurvey(meUser="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;->getMeUser()Lcom/discord/models/domain/ModelUser;
+
+    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/utilities/surveys/SurveyUtils$Survey.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali
index b89982c33f..356c17ac19 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali
@@ -15,9 +15,10 @@
 
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
+        Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;,
         Lcom/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey;,
         Lcom/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey;,
-        Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;,
+        Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;,
         Lcom/discord/utilities/surveys/SurveyUtils$Survey$NoticeKeys;
     }
 .end annotation
@@ -103,11 +104,23 @@
 
     move-result-object v1
 
+    if-eqz v1, :cond_0
+
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v1
 
-    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :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;
 
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
new file mode 100644
index 0000000000..59c0a0029f
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1.smali
@@ -0,0 +1,91 @@
+.class final Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1;
+.super Ljava/lang/Object;
+.source "SurveyUtils.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/surveys/SurveyUtils;->getGenericSurvey(Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;TR;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1;
+
+    invoke-direct {v0}, Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1;-><init>()V
+
+    sput-object v0, Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1;
+
+    return-void
+.end method
+
+.method 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/models/domain/ModelExperiment;)Ljava/lang/Integer;
+    .locals 0
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelExperiment;->getBucket()I
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelExperiment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1;->call(Lcom/discord/models/domain/ModelExperiment;)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
+.end method
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
new file mode 100644
index 0000000000..4097adf89b
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2.smali
@@ -0,0 +1,95 @@
+.class final Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2;
+.super Ljava/lang/Object;
+.source "SurveyUtils.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/surveys/SurveyUtils;->getGenericSurvey(Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $meUser:Lcom/discord/models/domain/ModelUser;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/models/domain/ModelUser;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2;->$meUser:Lcom/discord/models/domain/ModelUser;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Integer;)Lcom/discord/utilities/surveys/SurveyUtils$Survey;
+    .locals 1
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    const/4 v0, 0x3
+
+    if-ne p1, v0, :cond_1
+
+    new-instance p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;
+
+    iget-object v0, p0, Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2;->$meUser:Lcom/discord/models/domain/ModelUser;
+
+    invoke-direct {p1, v0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;-><init>(Lcom/discord/models/domain/ModelUser;)V
+
+    check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey;
+
+    return-object p1
+
+    :cond_1
+    :goto_0
+    sget-object p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;
+
+    check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey;
+
+    return-object p1
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Integer;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2;->call(Ljava/lang/Integer;)Lcom/discord/utilities/surveys/SurveyUtils$Survey;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getKoreaSurvey$1.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getKoreaSurvey$1.smali
deleted file mode 100644
index 73e49a6f9b..0000000000
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getKoreaSurvey$1.smali
+++ /dev/null
@@ -1,106 +0,0 @@
-.class final Lcom/discord/utilities/surveys/SurveyUtils$getKoreaSurvey$1;
-.super Ljava/lang/Object;
-.source "SurveyUtils.kt"
-
-# interfaces
-.implements Lrx/functions/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/utilities/surveys/SurveyUtils;->getKoreaSurvey(Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/b<",
-        "TT;",
-        "Lrx/Observable<",
-        "+TR;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic $meUser:Lcom/discord/models/domain/ModelUser;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/models/domain/ModelUser;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/utilities/surveys/SurveyUtils$getKoreaSurvey$1;->$meUser:Lcom/discord/models/domain/ModelUser;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelExperiment;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getKoreaSurvey$1;->call(Lcom/discord/models/domain/ModelExperiment;)Lrx/Observable;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelExperiment;)Lrx/Observable;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/models/domain/ModelExperiment;",
-            ")",
-            "Lrx/Observable<",
-            "+",
-            "Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;",
-            ">;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    sget-object v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;->Companion:Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey$Companion;
-
-    iget-object v1, p0, Lcom/discord/utilities/surveys/SurveyUtils$getKoreaSurvey$1;->$meUser:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelExperiment;->getBucket()I
-
-    move-result p1
-
-    invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey$Companion;->createFromBucket(Lcom/discord/models/domain/ModelUser;I)Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lrx/Observable;->bI(Ljava/lang/Object;)Lrx/Observable;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    invoke-static {p1}, Lrx/Observable;->bI(Ljava/lang/Object;)Lrx/Observable;
-
-    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 a96f9bd492..ab6840a4e6 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
@@ -52,24 +52,23 @@
 .method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;
+    check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey;
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2$1;->call(Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2$1;->call(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;)Lrx/Observable;
+.method public final call(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;",
+            "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
             ")",
             "Lrx/Observable<",
-            "+",
             "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
             ">;"
         }
@@ -81,7 +80,7 @@
 
     move-result-object p1
 
-    return-object p1
+    if-nez p1, :cond_1
 
     :cond_0
     sget-object p1, Lcom/discord/utilities/surveys/SurveyUtils;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils;
@@ -92,9 +91,10 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1, v0}, Lcom/discord/utilities/surveys/SurveyUtils;->access$getUserSurvey(Lcom/discord/utilities/surveys/SurveyUtils;Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
+    invoke-static {p1, v0}, Lcom/discord/utilities/surveys/SurveyUtils;->access$getGenericSurvey(Lcom/discord/utilities/surveys/SurveyUtils;Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
 
     move-result-object p1
 
+    :cond_1
     return-object p1
 .end method
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 7499bf71d9..4c1d3892e8 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
@@ -90,7 +90,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0, p1}, Lcom/discord/utilities/surveys/SurveyUtils;->access$getKoreaSurvey(Lcom/discord/utilities/surveys/SurveyUtils;Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
+    invoke-static {v0, p1}, Lcom/discord/utilities/surveys/SurveyUtils;->access$getUserSurvey(Lcom/discord/utilities/surveys/SurveyUtils;Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
 
     move-result-object v0
 
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 43d9455933..a4808a4d1e 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
@@ -47,7 +47,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/lang/Boolean;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey;
+.method public final call(Ljava/lang/Boolean;)Lcom/discord/utilities/surveys/SurveyUtils$Survey;
     .locals 1
 
     const-string v0, "isInExperiment"
@@ -66,10 +66,14 @@
 
     invoke-direct {p1, v0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
+    check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey;
+
     return-object p1
 
     :cond_0
-    const/4 p1, 0x0
+    sget-object p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;
+
+    check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey;
 
     return-object p1
 .end method
@@ -79,7 +83,7 @@
 
     check-cast p1, Ljava/lang/Boolean;
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$2;->call(Ljava/lang/Boolean;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey;
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$2;->call(Ljava/lang/Boolean;)Lcom/discord/utilities/surveys/SurveyUtils$Survey;
 
     move-result-object p1
 
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 969fdcbf85..ca5515163a 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
@@ -47,7 +47,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/lang/Boolean;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey;
+.method public final call(Ljava/lang/Boolean;)Lcom/discord/utilities/surveys/SurveyUtils$Survey;
     .locals 1
 
     const-string v0, "isInExperiment"
@@ -66,10 +66,14 @@
 
     invoke-direct {p1, v0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
+    check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey;
+
     return-object p1
 
     :cond_0
-    const/4 p1, 0x0
+    sget-object p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;
+
+    check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey;
 
     return-object p1
 .end method
@@ -79,7 +83,7 @@
 
     check-cast p1, Ljava/lang/Boolean;
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$4;->call(Ljava/lang/Boolean;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey;
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$4;->call(Ljava/lang/Boolean;)Lcom/discord/utilities/surveys/SurveyUtils$Survey;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils.smali
index 7c0f135927..43ea5c32b4 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils.smali
@@ -12,6 +12,8 @@
 
 
 # static fields
+.field private static final GENERIC_SURVEY_BUCKET_NPS:I = 0x3
+
 .field public static final INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils;
 
 .field private static final MIN_APP_INSTALL_TIME:J = 0x240c8400L
@@ -40,10 +42,10 @@
     return-void
 .end method
 
-.method public static final synthetic access$getKoreaSurvey(Lcom/discord/utilities/surveys/SurveyUtils;Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
+.method public static final synthetic access$getGenericSurvey(Lcom/discord/utilities/surveys/SurveyUtils;Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils;->getKoreaSurvey(Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
+    invoke-direct {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils;->getGenericSurvey(Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
 
     move-result-object p0
 
@@ -60,7 +62,7 @@
     return-object p0
 .end method
 
-.method private final getKoreaSurvey(Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
+.method private final getGenericSurvey(Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -68,7 +70,7 @@
             "Lcom/discord/models/domain/ModelUser;",
             ")",
             "Lrx/Observable<",
-            "Lcom/discord/utilities/surveys/SurveyUtils$Survey$KoreaSurvey;",
+            "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
             ">;"
         }
     .end annotation
@@ -81,7 +83,7 @@
 
     const/4 v1, 0x0
 
-    const-string v2, "2019-07_survey_kr"
+    const-string v2, "2019-04_mobile-survey"
 
     const/4 v3, 0x2
 
@@ -89,17 +91,25 @@
 
     move-result-object v0
 
-    new-instance v1, Lcom/discord/utilities/surveys/SurveyUtils$getKoreaSurvey$1;
-
-    invoke-direct {v1, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getKoreaSurvey$1;-><init>(Lcom/discord/models/domain/ModelUser;)V
+    sget-object v1, Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1;
 
     check-cast v1, Lrx/functions/b;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2;
+
+    invoke-direct {v1, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2;-><init>(Lcom/discord/models/domain/ModelUser;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
 
     move-result-object p1
 
-    const-string v0, "StoreStream\n        .get\u2026ll)\n          }\n        }"
+    const-string v0, "StoreStream\n        .get\u2026one\n          }\n        }"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -226,7 +236,7 @@
     if-nez v1, :cond_0
 
     :try_start_1
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v1}, Landroid/app/Application;->getPackageManager()Landroid/content/pm/PackageManager;
@@ -237,7 +247,7 @@
 
     if-nez v3, :cond_1
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {v3}, Landroid/app/Application;->getPackageName()Ljava/lang/String;
@@ -290,13 +300,13 @@
 
     if-nez v0, :cond_0
 
-    const/4 v0, 0x0
+    sget-object v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;
 
     invoke-static {v0}, Lrx/Observable;->bI(Ljava/lang/Object;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "Observable.just(null)"
+    const-string v1, "Observable.just(Survey.None)"
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
index 949dd3098a..8cc45d2f6c 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
@@ -235,7 +235,7 @@
 .end method
 
 .method private final processQuoteChildren(Ljava/util/Collection;)V
-    .locals 1
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<R::",
@@ -248,7 +248,7 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     invoke-static {p1}, Lkotlin/jvm/internal/aa;->be(Ljava/lang/Object;)Ljava/util/Collection;
 
@@ -262,18 +262,44 @@
 
     check-cast v0, Lcom/discord/simpleast/core/b/b;
 
-    invoke-static {p1, v0}, Lcom/discord/simpleast/core/b/a;->a(Ljava/util/Collection;Lcom/discord/simpleast/core/b/b;)V
+    invoke-interface {p1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
 
-    return-void
+    move-result-object p1
+
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/simpleast/core/node/Node;
+
+    invoke-static {v1, v0}, Lcom/discord/simpleast/core/b/a;->a(Lcom/discord/simpleast/core/node/Node;Lcom/discord/simpleast/core/b/b;)V
+
+    goto :goto_0
 
     :cond_0
+    return-void
+
+    :cond_1
     new-instance p1, Lkotlin/r;
 
     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/r;-><init>(Ljava/lang/String;)V
 
+    goto :goto_2
+
+    :goto_1
     throw p1
+
+    :goto_2
+    goto :goto_1
 .end method
 
 .method private final processSpoilerChildren()V
@@ -389,7 +415,7 @@
 
     check-cast v2, Lcom/discord/simpleast/core/b/b;
 
-    invoke-static {v1, v2}, Lcom/discord/simpleast/core/b/a;->b(Ljava/util/Collection;Lcom/discord/simpleast/core/b/b;)V
+    invoke-static {v1, v2}, Lcom/discord/simpleast/core/b/a;->a(Ljava/util/Collection;Lcom/discord/simpleast/core/b/b;)V
 
     goto :goto_4
 
@@ -500,7 +526,7 @@
 
     check-cast v0, Lcom/discord/simpleast/core/b/b;
 
-    invoke-static {p1, v0}, Lcom/discord/simpleast/core/b/a;->b(Ljava/util/Collection;Lcom/discord/simpleast/core/b/b;)V
+    invoke-static {p1, v0}, Lcom/discord/simpleast/core/b/a;->a(Ljava/util/Collection;Lcom/discord/simpleast/core/b/b;)V
 
     iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->shouldJumboify:Z
 
@@ -510,7 +536,7 @@
 
     check-cast v0, Lcom/discord/simpleast/core/b/b;
 
-    invoke-static {p1, v0}, Lcom/discord/simpleast/core/b/a;->b(Ljava/util/Collection;Lcom/discord/simpleast/core/b/b;)V
+    invoke-static {p1, v0}, Lcom/discord/simpleast/core/b/a;->a(Ljava/util/Collection;Lcom/discord/simpleast/core/b/b;)V
 
     :cond_0
     invoke-direct {p0}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->processSpoilerChildren()V
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 edf508f98a..caecad02fd 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$1.smali
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/textprocessing/MessageRenderContext$1;->invoke(Landroid/content/Context;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 dbfae90f87..a342587678 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$2.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/MessageRenderContext$2;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 b723622c40..0f9f4c34b1 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext.smali
@@ -757,9 +757,9 @@
 
     if-eqz v2, :cond_3
 
-    const v2, 0x7f06008a
+    const v2, 0x7f06008d
 
-    const v8, 0x7f06008a
+    const v8, 0x7f06008d
 
     goto :goto_3
 
@@ -803,7 +803,7 @@
 
     if-eqz v2, :cond_6
 
-    const v2, 0x7f04036f
+    const v2, 0x7f040372
 
     invoke-static {p1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -821,7 +821,7 @@
 
     if-eqz v2, :cond_7
 
-    const v2, 0x7f040370
+    const v2, 0x7f040373
 
     invoke-static {p1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -1699,7 +1699,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 6
+    .locals 4
 
     invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->getContext()Landroid/content/Context;
 
@@ -1725,15 +1725,11 @@
 
     move-result-wide v2
 
-    const/16 v4, 0x20
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v4, v2, v4
+    move-result v2
 
-    xor-long/2addr v2, v4
-
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
@@ -1814,6 +1810,10 @@
 
     move-result v2
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
@@ -1862,6 +1862,10 @@
 
     move-result v2
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
@@ -1870,6 +1874,10 @@
 
     move-result v2
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
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 bb7ce73004..b8eee08965 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
@@ -87,7 +87,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p2}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p2}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p2
 
@@ -141,7 +141,7 @@
     move-result-object p1
 
     :goto_1
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/simpleast/core/node/a;
 
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 367fb3b328..9cab5a7095 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
@@ -109,7 +109,7 @@
     move-result-object p1
 
     :goto_0
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/simpleast/core/node/a;
 
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 03af0cec7e..9855fb99d3 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
@@ -87,7 +87,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v0}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v0
 
@@ -178,7 +178,7 @@
     move-result-object p1
 
     :goto_3
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/simpleast/core/node/a;
 
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 58ab4832a7..639dadbf45 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
@@ -87,7 +87,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p2}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p2}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p2
 
@@ -147,7 +147,7 @@
     move-result-object p1
 
     :goto_1
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/simpleast/core/node/a;
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali
index 0bf1b5100d..267cfb15e5 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali
@@ -33,7 +33,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     sput-object v0, Lcom/discord/utilities/textprocessing/MessageUnparser;->PATTERN_USER_MENTION:Ljava/util/regex/Pattern;
@@ -46,7 +46,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
     sput-object v0, Lcom/discord/utilities/textprocessing/MessageUnparser;->PATTERN_ROLE_MENTION:Ljava/util/regex/Pattern;
@@ -59,7 +59,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     sput-object v0, Lcom/discord/utilities/textprocessing/MessageUnparser;->PATTERN_CHANNEL_MENTION:Ljava/util/regex/Pattern;
@@ -72,7 +72,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     sput-object v0, Lcom/discord/utilities/textprocessing/MessageUnparser;->PATTERN_CUSTOM_EMOJI:Ljava/util/regex/Pattern;
@@ -282,7 +282,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -315,9 +315,9 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object p2, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->et()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->ex()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
index 86d30d9b25..e355462b62 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
@@ -33,45 +33,45 @@
 
     :array_0
     .array-data 4
-        0x7f1210df
-        0x7f1210e0
-        0x7f1210e1
-        0x7f1210e2
-        0x7f1210e3
-        0x7f1210e4
-        0x7f1210e5
-        0x7f1210e6
-        0x7f1210e7
-        0x7f1210e8
-        0x7f1210e9
-        0x7f1210ea
-        0x7f1210eb
-        0x7f1210ec
-        0x7f1210ed
-        0x7f1210ee
-        0x7f1210ef
-        0x7f1210f0
-        0x7f1210f1
-        0x7f1210f2
-        0x7f1210f3
-        0x7f1210f4
-        0x7f1210f5
-        0x7f1210f6
-        0x7f1210f7
-        0x7f1210f8
-        0x7f1210f9
-        0x7f1210fa
-        0x7f1210fb
-        0x7f1210fc
-        0x7f1210fd
-        0x7f1210fe
-        0x7f1210ff
-        0x7f121100
-        0x7f121101
-        0x7f121102
-        0x7f121103
-        0x7f121104
-        0x7f121105
+        0x7f121121
+        0x7f121122
+        0x7f121123
+        0x7f121124
+        0x7f121125
+        0x7f121126
+        0x7f121127
+        0x7f121128
+        0x7f121129
+        0x7f12112a
+        0x7f12112b
+        0x7f12112c
+        0x7f12112d
+        0x7f12112e
+        0x7f12112f
+        0x7f121130
+        0x7f121131
+        0x7f121132
+        0x7f121133
+        0x7f121134
+        0x7f121135
+        0x7f121136
+        0x7f121137
+        0x7f121138
+        0x7f121139
+        0x7f12113a
+        0x7f12113b
+        0x7f12113c
+        0x7f12113d
+        0x7f12113e
+        0x7f12113f
+        0x7f121140
+        0x7f121141
+        0x7f121142
+        0x7f121143
+        0x7f121144
+        0x7f121145
+        0x7f121146
+        0x7f121147
     .end array-data
 .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 c2089a99b6..5e5e6915d9 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
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onClickUrl$1;->invoke(Landroid/content/Context;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 ed4ecb5438..781d6cbba7 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onLongPressUrl$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1.smali
index 0966492902..ffb874ada9 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1.smali
@@ -46,7 +46,7 @@
 
     iput-object p1, p0, Lcom/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1;->context:Landroid/content/Context;
 
-    const p1, 0x7f06008a
+    const p1, 0x7f06008d
 
     iput p1, p0, Lcom/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1;->linkColorResId:I
 
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 fe0bfe4b4d..60dc432942 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
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$1;->invoke(Landroid/content/Context;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 31e777b986..8d5bc68bfa 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$2;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 11ef49d32e..ff9b2642d7 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onClickUrl$1;->invoke(Landroid/content/Context;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 07635c45c1..54479f2917 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onLongPressUrl$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1.smali
index ac9e4d3b8f..5adbccd5c0 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1.smali
@@ -74,7 +74,7 @@
 
     iput-object p2, p0, Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1;->context:Landroid/content/Context;
 
-    const p1, 0x7f06008a
+    const p1, 0x7f06008d
 
     iput p1, p0, Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1;->linkColorResId:I
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali b/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali
index 94dc4cc555..370db5ee3d 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali
@@ -111,7 +111,7 @@
 
     aput-object v1, v0, p1
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p1
 
@@ -302,7 +302,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0}, Lcom/discord/simpleast/core/a/a;->u(Z)Ljava/util/List;
+    invoke-static {v0}, Lcom/discord/simpleast/core/a/a;->s(Z)Ljava/util/List;
 
     move-result-object v0
 
@@ -334,9 +334,9 @@
 
     invoke-direct {v0, v2, v3, v1}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sget-object v2, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eu()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->ey()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v2
 
@@ -344,9 +344,9 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->es()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ew()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v2
 
@@ -354,9 +354,9 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->et()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->ex()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v2
 
@@ -440,9 +440,9 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->es()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ew()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v2
 
@@ -450,9 +450,9 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->et()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->ex()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v2
 
@@ -460,7 +460,7 @@
 
     move-result-object v3
 
-    sget-object v5, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v5, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     const/4 v6, 0x0
 
@@ -650,7 +650,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ev()Ljava/util/List;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ez()Ljava/util/List;
 
     move-result-object v1
 
@@ -660,7 +660,7 @@
 
     move-result-object v2
 
-    sget-object v4, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v4, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     const/4 v5, 0x0
 
@@ -776,14 +776,14 @@
     :cond_1
     if-nez v0, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     invoke-interface {v0}, Lkotlin/text/MatchResult;->getRange()Lkotlin/ranges/IntRange;
 
     move-result-object v5
 
-    iget v5, v5, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v5, v5, Lkotlin/ranges/IntProgression;->blk:I
 
     invoke-virtual {v4, p1, v2, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;II)Ljava/lang/StringBuilder;
 
@@ -799,11 +799,11 @@
 
     move-result-object v2
 
-    iget v2, v2, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v2, v2, Lkotlin/ranges/IntProgression;->bll:I
 
     add-int/lit8 v2, v2, 0x1
 
-    invoke-interface {v0}, Lkotlin/text/MatchResult;->Ex()Lkotlin/text/MatchResult;
+    invoke-interface {v0}, Lkotlin/text/MatchResult;->Em()Lkotlin/text/MatchResult;
 
     move-result-object v0
 
@@ -844,7 +844,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ev()Ljava/util/List;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ez()Ljava/util/List;
 
     move-result-object v0
 
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 693e927c28..b481d00329 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$HeaderLineClassedRule.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$HeaderLineClassedRule.smali
@@ -118,7 +118,7 @@
 
     move-result-object p1
 
-    iget-object p2, p1, Lcom/discord/simpleast/core/parser/ParseSpec;->zV:Lcom/discord/simpleast/core/node/Node;
+    iget-object p2, p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Ae:Lcom/discord/simpleast/core/node/Node;
 
     if-eqz p2, :cond_0
 
@@ -136,7 +136,7 @@
 
     invoke-virtual {p1, p2}, Lcom/discord/simpleast/core/node/StyleNode;->addChild(Lcom/discord/simpleast/core/node/Node;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     check-cast p1, Lcom/discord/simpleast/core/node/Node;
 
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 6ecc1f94aa..e32cdbac34 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$MarkdownListItemRule.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$MarkdownListItemRule.smali
@@ -60,9 +60,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/simpleast/a/a;->Ar:Lcom/discord/simpleast/a/a;
+    sget-object v0, Lcom/discord/simpleast/a/a;->AA:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->ew()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->eA()Ljava/util/regex/Pattern;
 
     move-result-object v0
 
@@ -112,7 +112,7 @@
 
     invoke-direct {p2, v0}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
 
-    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     check-cast p2, Lcom/discord/simpleast/core/node/Node;
 
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 99e764868a..9587a3e386 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
@@ -146,7 +146,7 @@
 
     move-result-object p2
 
-    sget-object p3, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p3, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p3, Lcom/discord/utilities/textprocessing/node/BlockQuoteNode;
 
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 c982b8601a..c6c0a9ca81 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
@@ -94,7 +94,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
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 f765caf331..0c35171294 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
@@ -88,7 +88,7 @@
 
     move-result-wide p1
 
-    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance v0, Lcom/discord/utilities/textprocessing/node/ChannelMentionNode;
 
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 cb47c13613..206676441b 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
@@ -93,7 +93,7 @@
     const-string p1, ""
 
     :cond_0
-    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance v0, Lcom/discord/utilities/textprocessing/node/CodeNode;
 
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 3136cd917e..3cd5c1b550 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
@@ -132,7 +132,7 @@
 
     invoke-direct/range {v1 .. v7}, Lcom/discord/utilities/textprocessing/node/EmojiNode;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function3;IIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     check-cast p1, Lcom/discord/simpleast/core/node/Node;
 
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 5d212f8f9e..20efbe783d 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
@@ -72,11 +72,11 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/simpleast/core/node/StyleNode;
 
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v0, Ljava/util/List;
 
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 ab5872a509..987d73daa1 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
@@ -76,7 +76,7 @@
 
     invoke-static {p3, p2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/utilities/textprocessing/node/CodeNode;
 
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 26e49067e1..e4b81a18a5 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
@@ -84,7 +84,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance v0, Lcom/discord/utilities/textprocessing/node/UrlNode;
 
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 18f995c7ff..4dc4e9fcf1 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
@@ -96,7 +96,7 @@
 
     if-eqz p2, :cond_0
 
-    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     sget-object p1, Lcom/discord/utilities/textprocessing/node/EmojiNode;->Companion:Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;
 
@@ -119,7 +119,7 @@
     return-object p1
 
     :cond_0
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/simpleast/core/node/a;
 
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 0cb9a8d19a..9c66eafa4f 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
@@ -72,7 +72,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/simpleast/core/node/a;
 
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 a188fd27e5..a63e969655 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
@@ -88,7 +88,7 @@
 
     move-result-wide p1
 
-    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance v0, Lcom/discord/utilities/textprocessing/node/RoleMentionNode;
 
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 e52c262970..4843b010ee 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
@@ -72,7 +72,7 @@
 
     invoke-static {p2, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p1, Lcom/discord/simpleast/core/node/a;
 
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 82afe59ef9..b264b1b2ba 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
@@ -72,7 +72,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/utilities/textprocessing/node/SpoilerNode;
 
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 fb7b00930b..81088c2edb 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
@@ -68,9 +68,9 @@
 
     aput-object p2, p1, v0
 
-    sget-object p2, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object p2, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->et()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->ex()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object p2
 
@@ -78,7 +78,7 @@
 
     aput-object p2, p1, v0
 
-    invoke-static {p1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {p1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p1
 
@@ -184,7 +184,7 @@
     :cond_1
     new-instance p2, Lcom/discord/simpleast/core/node/StyleNode;
 
-    sget-object v1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v1, Ljava/util/List;
 
@@ -226,7 +226,7 @@
     check-cast p1, Lcom/discord/simpleast/core/node/Node;
 
     :goto_1
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     invoke-static {p1, p3}, Lcom/discord/simpleast/core/parser/ParseSpec$a;->a(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
 
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 49fb83668b..76a7d731fa 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
@@ -72,7 +72,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/simpleast/core/node/a;
 
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 d355cd20f4..8b0a7d5fc9 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
@@ -94,7 +94,7 @@
 
     if-eqz p2, :cond_0
 
-    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     sget-object p1, Lcom/discord/utilities/textprocessing/node/EmojiNode;->Companion:Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;
 
@@ -117,7 +117,7 @@
     return-object p1
 
     :cond_0
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/simpleast/core/node/a;
 
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 a3fbbdfb71..08365bf018 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
@@ -78,7 +78,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/utilities/textprocessing/node/UrlNode;
 
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 5c04fd6974..1019a5d30a 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
@@ -78,7 +78,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/utilities/textprocessing/node/UrlNode;
 
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 be01b14c75..3183532e21 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
@@ -100,7 +100,7 @@
 
     move-result-wide p1
 
-    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance v0, Lcom/discord/utilities/textprocessing/node/UserMentionNode;
 
@@ -117,7 +117,7 @@
     return-object p1
 
     :cond_0
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->zY:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Ah:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/utilities/textprocessing/node/UserMentionNode;
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali
index bd94b9c9b5..1d2711e932 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali
@@ -266,7 +266,7 @@
 
     const-string v0, "emojiDataProvider"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -327,7 +327,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-interface {v1}, Lcom/discord/utilities/textprocessing/Rules$EmojiDataProvider;->getUnicodeEmojisPattern()Ljava/util/regex/Pattern;
@@ -356,7 +356,7 @@
 
     if-nez v3, :cond_2
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     invoke-interface {v3}, Lcom/discord/utilities/textprocessing/Rules$EmojiDataProvider;->getUnicodeEmojiSurrogateMap()Ljava/util/Map;
@@ -487,9 +487,9 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object v0, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eq()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eu()Ljava/util/regex/Pattern;
 
     move-result-object v0
 
@@ -869,9 +869,9 @@
 
     new-instance v0, Lcom/discord/utilities/textprocessing/Rules$createTextReplacementRule$1;
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->er()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->ev()Ljava/util/regex/Pattern;
 
     move-result-object v1
 
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 3d2e3342ff..a660ae55f6 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
@@ -90,7 +90,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;->$context:Landroid/content/Context;
 
-    const v1, 0x7f13012c
+    const v1, 0x7f13012d
 
     invoke-direct {p1, v0, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
 
@@ -109,7 +109,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;->$context:Landroid/content/Context;
 
-    const v1, 0x7f13012b
+    const v1, 0x7f13012c
 
     invoke-direct {p1, v0, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
 
@@ -128,7 +128,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;->$context:Landroid/content/Context;
 
-    const v1, 0x7f13012d
+    const v1, 0x7f13012e
 
     invoke-direct {p1, v0, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
 
@@ -147,7 +147,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;->$context:Landroid/content/Context;
 
-    const v1, 0x7f13012e
+    const v1, 0x7f13012f
 
     invoke-direct {p1, v0, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
 
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 00be4b64af..dd5ca91afc 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
@@ -68,7 +68,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1;->$context:Landroid/content/Context;
 
-    const v1, 0x7f13012a
+    const v1, 0x7f13012b
 
     invoke-direct {p1, v0, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
 
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 ff05d9df07..67ecf89b3d 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
@@ -108,7 +108,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali b/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali
index ffc0fab1d6..755587d1a1 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali
@@ -54,7 +54,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0700d6
+    const v1, 0x7f0700d8
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -91,7 +91,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0700d5
+    const v1, 0x7f0700d7
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -101,7 +101,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f0700d3
+    const v1, 0x7f0700d5
 
     invoke-virtual {p1, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -165,7 +165,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0700d1
+    const v1, 0x7f0700d3
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -179,7 +179,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f06002c
+    const v3, 0x7f06002d
 
     invoke-static {v1, v3, v2}, Landroidx/core/content/res/ResourcesCompat;->getColor(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)I
 
@@ -189,7 +189,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f0700d2
+    const v2, 0x7f0700d4
 
     invoke-virtual {p1, v2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder.smali b/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder.smali
index 5528a4f849..25c0c30599 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder.smali
@@ -221,7 +221,7 @@
 
     check-cast v0, Lcom/discord/simpleast/core/b/b;
 
-    invoke-static {p1, v0}, Lcom/discord/simpleast/core/b/a;->b(Ljava/util/Collection;Lcom/discord/simpleast/core/b/b;)V
+    invoke-static {p1, v0}, Lcom/discord/simpleast/core/b/a;->a(Ljava/util/Collection;Lcom/discord/simpleast/core/b/b;)V
 
     return-void
 .end method
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 56745dd4c7..823ebc9bfd 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/BlockQuoteNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/BlockQuoteNode.smali
@@ -185,7 +185,7 @@
 
     new-instance v3, Lcom/discord/utilities/spans/QuoteSpan;
 
-    const v4, 0x7f040357
+    const v4, 0x7f04035a
 
     invoke-static {p2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
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 e5aada02a6..13945dc27e 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/node/ChannelMentionNode$render$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 4dba1cda8c..bca60e5047 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode.smali
@@ -137,7 +137,7 @@
     const/4 p2, 0x0
 
     :goto_0
-    const v3, 0x7f0600f0
+    const v3, 0x7f0600f3
 
     if-eqz p2, :cond_1
 
@@ -189,7 +189,7 @@
     :goto_1
     new-instance v3, Landroid/text/style/BackgroundColorSpan;
 
-    const v4, 0x7f0600f1
+    const v4, 0x7f0600f4
 
     invoke-static {v0, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
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 13c6726a7e..f804fa3f39 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali
@@ -175,7 +175,7 @@
 
     new-instance v5, Landroid/text/style/ForegroundColorSpan;
 
-    const v7, 0x7f060049
+    const v7, 0x7f06004a
 
     invoke-static {v4, v7}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -189,7 +189,7 @@
 
     const/4 v7, 0x5
 
-    const v8, 0x7f04035a
+    const v8, 0x7f04035d
 
     const/16 v9, 0xa
 
@@ -306,7 +306,7 @@
     goto :goto_2
 
     :cond_5
-    const v2, 0x7f04036f
+    const v2, 0x7f040372
 
     invoke-static {v4, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -315,7 +315,7 @@
     goto :goto_2
 
     :goto_3
-    const v2, 0x7f04035b
+    const v2, 0x7f04035e
 
     invoke-static {v4, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
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 c4d37be102..0dc948cbc8 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
@@ -80,7 +80,7 @@
 
     if-nez v4, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     invoke-static {v4}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
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 8d85440bee..81f03add1d 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali
@@ -339,7 +339,7 @@
 .end method
 
 .method public final render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -358,123 +358,119 @@
 
     invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;->getContext()Landroid/content/Context;
 
-    move-result-object v2
+    move-result-object v0
 
     invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I
 
-    move-result v5
+    move-result v1
 
     invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->getContent()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v2
 
-    check-cast v0, Ljava/lang/CharSequence;
+    check-cast v2, Ljava/lang/CharSequence;
 
-    invoke-virtual {p1, v0}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-virtual {p1, v2}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
-    iget-object v0, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->urlProvider:Lkotlin/jvm/functions/Function3;
+    iget-object v2, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->urlProvider:Lkotlin/jvm/functions/Function3;
 
     invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;->isAnimationEnabled()Z
 
-    move-result v1
-
-    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v1
-
-    iget v3, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->width:I
-
-    invoke-static {v3}, Lcom/discord/utilities/icon/IconUtils;->getMediaProxySize(I)I
-
     move-result v3
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v3}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object v3
 
-    invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;->getContext()Landroid/content/Context;
+    iget v4, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->width:I
+
+    invoke-static {v4}, Lcom/discord/utilities/icon/IconUtils;->getMediaProxySize(I)I
+
+    move-result v4
+
+    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v4
 
-    invoke-interface {v0, v1, v3, v4}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;->getContext()Landroid/content/Context;
 
-    move-result-object v0
+    move-result-object v5
 
-    check-cast v0, Ljava/lang/String;
+    invoke-interface {v2, v3, v4, v5}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v1, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->width:I
+    move-result-object v2
 
-    iget v3, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->height:I
+    check-cast v2, Ljava/lang/String;
 
-    const/4 v4, 0x1
+    iget v3, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->width:I
 
-    invoke-static {v0, v1, v3, v4}, Lcom/discord/utilities/images/MGImages;->getImageRequest(Ljava/lang/String;IIZ)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
+    iget v4, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->height:I
 
-    move-result-object v0
+    const/4 v5, 0x1
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jS()Lcom/facebook/imagepipeline/request/b;
+    invoke-static {v2, v3, v4, v5}, Lcom/discord/utilities/images/MGImages;->getImageRequest(Ljava/lang/String;IIZ)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
 
-    move-result-object v0
+    move-result-object v2
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gi()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jQ()Lcom/facebook/imagepipeline/request/b;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1, v0}, Lcom/facebook/drawee/backends/pipeline/e;->I(Ljava/lang/Object;)Lcom/facebook/drawee/controller/a;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gm()Lcom/facebook/drawee/backends/pipeline/e;
 
-    move-result-object v0
+    move-result-object v3
 
-    check-cast v0, Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-virtual {v3, v2}, Lcom/facebook/drawee/backends/pipeline/e;->I(Ljava/lang/Object;)Lcom/facebook/drawee/controller/a;
 
-    invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isRevealed()Z
+    move-result-object v2
 
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lcom/facebook/drawee/backends/pipeline/e;->w(Z)Lcom/facebook/drawee/controller/a;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/facebook/drawee/backends/pipeline/e;
-
-    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->gF()Lcom/facebook/drawee/controller/AbstractDraweeController;
-
-    move-result-object v0
-
-    invoke-virtual {v2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v1
-
-    invoke-static {v1}, Lcom/facebook/drawee/generic/a;->a(Landroid/content/res/Resources;)Lcom/facebook/drawee/generic/a;
-
-    move-result-object v1
-
-    new-instance v3, Landroid/graphics/drawable/ColorDrawable;
-
-    const/4 v6, 0x0
-
-    invoke-direct {v3, v6}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
-
-    check-cast v3, Landroid/graphics/drawable/Drawable;
-
-    invoke-virtual {v1, v3}, Lcom/facebook/drawee/generic/a;->i(Landroid/graphics/drawable/Drawable;)Lcom/facebook/drawee/generic/a;
-
-    move-result-object v1
-
-    sget-object v3, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MH:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    invoke-virtual {v1, v3}, Lcom/facebook/drawee/generic/a;->c(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/generic/a;
-
-    move-result-object v1
+    check-cast v2, Lcom/facebook/drawee/backends/pipeline/e;
 
     invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isRevealed()Z
 
     move-result v3
 
-    if-nez v3, :cond_2
+    iput-boolean v3, v2, Lcom/facebook/drawee/controller/a;->KW:Z
 
-    instance-of v3, p2, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;
+    check-cast v2, Lcom/facebook/drawee/backends/pipeline/e;
 
-    if-nez v3, :cond_0
+    invoke-virtual {v2}, Lcom/facebook/drawee/backends/pipeline/e;->gJ()Lcom/facebook/drawee/controller/AbstractDraweeController;
+
+    move-result-object v2
+
+    invoke-virtual {v0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v3
+
+    invoke-static {v3}, Lcom/facebook/drawee/generic/a;->a(Landroid/content/res/Resources;)Lcom/facebook/drawee/generic/a;
+
+    move-result-object v3
+
+    new-instance v4, Landroid/graphics/drawable/ColorDrawable;
+
+    const/4 v6, 0x0
+
+    invoke-direct {v4, v6}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
+
+    check-cast v4, Landroid/graphics/drawable/Drawable;
+
+    iput-object v4, v3, Lcom/facebook/drawee/generic/a;->Nq:Landroid/graphics/drawable/Drawable;
+
+    sget-object v4, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MZ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    invoke-virtual {v3, v4}, Lcom/facebook/drawee/generic/a;->b(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/generic/a;
+
+    move-result-object v3
+
+    invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isRevealed()Z
+
+    move-result v4
+
+    if-nez v4, :cond_2
+
+    instance-of v4, p2, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;
+
+    if-nez v4, :cond_0
 
     const/4 p2, 0x0
 
@@ -490,54 +486,112 @@
     goto :goto_0
 
     :cond_1
-    const p2, 0x7f04036f
+    const p2, 0x7f040372
 
-    invoke-static {v2, p2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+    invoke-static {v0, p2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
     move-result p2
 
     :goto_0
-    new-instance v3, Landroid/graphics/drawable/ColorDrawable;
+    new-instance v0, Landroid/graphics/drawable/ColorDrawable;
 
-    invoke-direct {v3, p2}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
+    invoke-direct {v0, p2}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
 
-    check-cast v3, Landroid/graphics/drawable/Drawable;
+    check-cast v0, Landroid/graphics/drawable/Drawable;
 
-    invoke-virtual {v1, v3}, Lcom/facebook/drawee/generic/a;->j(Landroid/graphics/drawable/Drawable;)Lcom/facebook/drawee/generic/a;
+    invoke-virtual {v3, v0}, Lcom/facebook/drawee/generic/a;->i(Landroid/graphics/drawable/Drawable;)Lcom/facebook/drawee/generic/a;
 
     :cond_2
     move-object p2, p1
 
     check-cast p2, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
-    invoke-virtual {v1}, Lcom/facebook/drawee/generic/a;->gX()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {v3}, Lcom/facebook/drawee/generic/a;->hb()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
-    move-result-object v1
+    move-result-object v0
 
-    move-object v3, v1
+    check-cast v0, Lcom/facebook/drawee/d/b;
 
-    check-cast v3, Lcom/facebook/drawee/d/b;
-
-    check-cast v0, Lcom/facebook/drawee/d/a;
+    check-cast v2, Lcom/facebook/drawee/d/a;
 
     invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I
 
     move-result p1
 
-    add-int/lit8 v6, p1, -0x1
+    sub-int/2addr p1, v5
 
-    iget v7, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->width:I
+    iget v3, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->width:I
 
-    iget v8, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->height:I
+    iget v4, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->height:I
 
-    iget v9, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->verticalAlignment:I
+    iget v7, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->verticalAlignment:I
 
-    move-object v1, p2
+    invoke-static {v0}, Lcom/facebook/drawee/view/b;->a(Lcom/facebook/drawee/d/b;)Lcom/facebook/drawee/view/b;
 
-    move-object v4, v0
+    move-result-object v0
 
-    invoke-virtual/range {v1 .. v9}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->a(Landroid/content/Context;Lcom/facebook/drawee/d/b;Lcom/facebook/drawee/d/a;IIIII)V
+    invoke-virtual {v0, v2}, Lcom/facebook/drawee/view/b;->setController(Lcom/facebook/drawee/d/a;)V
 
+    invoke-virtual {p2}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->length()I
+
+    move-result v2
+
+    if-ge p1, v2, :cond_6
+
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_4
+
+    invoke-virtual {v2}, Landroid/graphics/drawable/Drawable;->getBounds()Landroid/graphics/Rect;
+
+    move-result-object v8
+
+    invoke-virtual {v8}, Landroid/graphics/Rect;->isEmpty()Z
+
+    move-result v8
+
+    if-eqz v8, :cond_3
+
+    invoke-virtual {v2, v6, v6, v3, v4}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+
+    :cond_3
+    iget-object v3, p2, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NW:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
+
+    invoke-virtual {v2, v3}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
+
+    :cond_4
+    new-instance v2, Lcom/facebook/drawee/span/a;
+
+    invoke-direct {v2, v0, v7}, Lcom/facebook/drawee/span/a;-><init>(Lcom/facebook/drawee/view/b;I)V
+
+    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
+
+    instance-of v3, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;
+
+    if-eqz v3, :cond_5
+
+    check-cast v0, Lcom/facebook/drawee/controller/AbstractDraweeController;
+
+    new-instance v3, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;
+
+    invoke-direct {v3, p2, v2, v6, v4}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;-><init>(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;Lcom/facebook/drawee/span/a;ZI)V
+
+    invoke-virtual {v0, v3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Lcom/facebook/drawee/controller/ControllerListener;)V
+
+    :cond_5
+    iget-object v0, p2, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NV:Ljava/util/Set;
+
+    invoke-interface {v0, v2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+
+    add-int/2addr p1, v5
+
+    const/16 v0, 0x21
+
+    invoke-virtual {p2, v2, v1, p1, v0}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->setSpan(Ljava/lang/Object;III)V
+
+    :cond_6
     return-void
 .end method
 
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 9e9550ea96..25042128fc 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/RoleMentionNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/RoleMentionNode.smali
@@ -169,7 +169,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f0600f0
+    const v4, 0x7f0600f3
 
     invoke-static {v3, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -199,7 +199,7 @@
 
     move-result-object p2
 
-    const v1, 0x7f0600f1
+    const v1, 0x7f0600f4
 
     invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -234,7 +234,7 @@
 
     aput-object v4, v1, v3
 
-    invoke-static {v1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p2
 
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 867a28c91a..39c6b7b769 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
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/node/SpoilerNode$createStyles$$inlined$let$lambda$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 a88cb2fce8..b18d6b2dff 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali
@@ -108,7 +108,7 @@
 
     new-instance v3, Landroid/text/style/ForegroundColorSpan;
 
-    const v4, 0x7f060136
+    const v4, 0x7f060138
 
     invoke-static {v0, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -164,7 +164,7 @@
 
     aput-object v2, v1, p1
 
-    invoke-static {v1}, Lkotlin/a/m;->o([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lkotlin/a/m;->n([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p1
 
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 b87c73cec0..b5df7dc268 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/node/UrlNode$render$style$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 7858ba1875..452fda21f4 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/node/UrlNode$render$style$2;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 49065238e4..f33251679a 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/node/UserMentionNode$renderUserMention$clickableSpan$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 cae63c4ed5..b34277b26b 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode.smali
@@ -161,7 +161,7 @@
 
     new-instance v4, Landroid/text/style/BackgroundColorSpan;
 
-    const v6, 0x7f0600f1
+    const v6, 0x7f0600f4
 
     invoke-static {p2, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -171,7 +171,7 @@
 
     invoke-virtual {v3, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    const v4, 0x7f0600f0
+    const v4, 0x7f0600f3
 
     if-eqz v5, :cond_4
 
@@ -354,7 +354,7 @@
 
     move-result-object v2
 
-    const v4, 0x7f0600f1
+    const v4, 0x7f0600f4
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -372,7 +372,7 @@
 
     move-result-object p2
 
-    const v3, 0x7f0600f0
+    const v3, 0x7f0600f3
 
     invoke-static {p2, v3}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -382,7 +382,7 @@
 
     aput-object v2, v0, v1
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p2
 
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 11f0db8b6d..d37c1b13ce 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/uri/UriHandler$directToPlayStore$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 0b4261dc2a..ada6f4b4d0 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/uri/UriHandler$openUrlWithCustomTabs$1;->invoke(Landroidx/browser/customtabs/CustomTabsIntent;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
index 92db9f2c01..821f69f7f2 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
@@ -519,7 +519,7 @@
     :catch_0
     move-exception p1
 
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance p2, Ljava/lang/Exception;
 
@@ -595,14 +595,14 @@
 
     invoke-direct {p2, p1, p3}, Lcom/discord/utilities/uri/UriHandler;->showUnhandledUrlDialog(Landroid/content/Context;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     goto :goto_0
 
     :cond_1
     invoke-virtual {p1, v0}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     :cond_2
     :goto_0
@@ -677,7 +677,7 @@
 
     invoke-direct {v0}, Landroidx/browser/customtabs/CustomTabsIntent$Builder;-><init>()V
 
-    const v1, 0x7f06004a
+    const v1, 0x7f06004b
 
     invoke-static {p0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -699,9 +699,9 @@
 
     invoke-virtual {v0, p0, p2, v1}, Landroidx/browser/customtabs/CustomTabsIntent$Builder;->setExitAnimations(Landroid/content/Context;II)Landroidx/browser/customtabs/CustomTabsIntent$Builder;
 
-    sget-object p2, Lcom/discord/app/j;->vL:Lcom/discord/app/j$b;
+    sget-object p2, Lcom/discord/app/j;->vJ:Lcom/discord/app/j$b;
 
-    invoke-static {}, Lcom/discord/app/j;->dF()V
+    invoke-static {}, Lcom/discord/app/j;->dE()V
 
     invoke-virtual {v0}, Landroidx/browser/customtabs/CustomTabsIntent$Builder;->build()Landroidx/browser/customtabs/CustomTabsIntent;
 
@@ -784,7 +784,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d003e
+    const v1, 0x7f0d0040
 
     const/4 v2, 0x0
 
@@ -804,7 +804,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f0a0768
+    const v1, 0x7f0a0791
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -812,7 +812,7 @@
 
     check-cast v1, Landroid/widget/TextView;
 
-    const v2, 0x7f0a0769
+    const v2, 0x7f0a0792
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1041,7 +1041,7 @@
 
     :cond_7
     :goto_2
-    const p2, 0x7f1211a9
+    const p2, 0x7f1211ed
 
     invoke-static {p1, p2}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
diff --git a/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali b/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali
index 0127eeddfa..1dd5595788 100644
--- a/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali
+++ b/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali
@@ -193,7 +193,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -207,7 +207,7 @@
 
     check-cast v1, Lrx/functions/Action0;
 
-    invoke-static {}, Lrx/functions/a;->Kq()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Ke()Lrx/functions/a$b;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/utilities/view/chips/ChipsImageUtil.smali b/com.discord/smali/com/discord/utilities/view/chips/ChipsImageUtil.smali
index ac18c3f203..12d16a7c6b 100644
--- a/com.discord/smali/com/discord/utilities/view/chips/ChipsImageUtil.smali
+++ b/com.discord/smali/com/discord/utilities/view/chips/ChipsImageUtil.smali
@@ -27,9 +27,9 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YA:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YS:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->We:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ww:Lcom/facebook/imagepipeline/request/b$b;
 
     const-string v1, "gif"
 
@@ -55,15 +55,15 @@
     :goto_0
     if-eqz p0, :cond_1
 
-    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->Yx:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->YP:Lcom/facebook/imagepipeline/request/b$a;
 
     goto :goto_1
 
     :cond_1
-    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->Yy:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->YQ:Lcom/facebook/imagepipeline/request/b$a;
 
     :goto_1
-    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yo:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YG:Lcom/facebook/imagepipeline/request/b$a;
 
     if-lez p1, :cond_2
 
@@ -73,7 +73,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/imagepipeline/a/e;-><init>(II)V
 
-    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QN:Lcom/facebook/imagepipeline/a/e;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     :cond_2
     return-object v0
@@ -105,7 +105,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gi()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gm()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v1
 
@@ -125,7 +125,7 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/facebook/drawee/controller/a;->KF:Z
+    iput-boolean v1, v0, Lcom/facebook/drawee/controller/a;->KW:Z
 
     check-cast v0, Lcom/facebook/drawee/backends/pipeline/e;
 
@@ -133,7 +133,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jS()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p1
 
@@ -143,7 +143,7 @@
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gF()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gJ()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
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 9dc207a084..2bf024c8e4 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions$fadeIn$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 ae70797775..d08137d5ee 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions$fadeIn$2;->invoke(Landroid/view/ViewPropertyAnimator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 4e31a114bd..349925eb12 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions$fadeOut$1;->invoke(Landroid/view/ViewPropertyAnimator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 aa8c3bd36a..4e2934a91d 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions.smali
@@ -828,12 +828,12 @@
 
     move-result-object p1
 
-    sget-object p2, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
-
-    const-string p2, "quantityString"
+    const-string p2, "resources.getQuantityStr\u2026esId, quantity, quantity)"
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
+    sget-object p2, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
+
     array-length p2, p3
 
     invoke-static {p3, p2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
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 3b177f9a28..da16997355 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/view/grid/FrameGridLayout$bindViews$1;->invoke(Lcom/discord/utilities/view/grid/FrameGridLayout$Data;Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 798453aab5..a7f608bf22 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/view/grid/FrameGridLayout$onLayout$1;->invoke(Landroid/view/View;Lcom/discord/utilities/view/grid/FrameGridLayout$PositionSpec;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 c1030af2d8..d85b1b88cd 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/view/grid/FrameGridLayout$onMeasure$1;->invoke(Landroid/view/View;Lcom/discord/utilities/view/grid/FrameGridLayout$PositionSpec;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 996b007b0b..f2e213324e 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali
@@ -118,7 +118,7 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    sget-object p3, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p3, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p3, Ljava/util/List;
 
@@ -244,7 +244,7 @@
 
     move-result v1
 
-    invoke-static {v0, v1}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, v1}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object v0
 
@@ -481,7 +481,7 @@
 
     if-gez v2, :cond_5
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_5
     check-cast v4, Lcom/discord/utilities/view/grid/FrameGridLayout$Data;
@@ -523,7 +523,7 @@
 
     const/4 v3, 0x0
 
-    invoke-static {v3, v2}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v3, v2}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object v2
 
@@ -747,7 +747,7 @@
 
     const/4 v2, 0x0
 
-    invoke-static {v1, v2}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntProgression;
+    invoke-static {v1, v2}, Lkotlin/ranges/c;->W(II)Lkotlin/ranges/IntProgression;
 
     move-result-object v1
 
@@ -835,7 +835,7 @@
 
     const/4 v1, 0x0
 
-    invoke-static {v1, v0}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v1, v0}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object v0
 
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 fa5c52f07f..8ebf09f94d 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$$inlined$apply$lambda$1;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 5fd20f900b..fbe6b41522 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
@@ -32,7 +32,7 @@
 
 
 # instance fields
-.field final synthetic $it:Landroid/widget/TextView;
+.field final synthetic $it:Landroid/view/View;
 
 .field final synthetic $this_launch$inlined:Lkotlinx/coroutines/CoroutineScope;
 
@@ -44,10 +44,10 @@
 
 
 # direct methods
-.method constructor <init>(Landroid/widget/TextView;Lkotlin/coroutines/Continuation;Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;Lkotlinx/coroutines/CoroutineScope;)V
+.method constructor <init>(Landroid/view/View;Lkotlin/coroutines/Continuation;Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;Lkotlinx/coroutines/CoroutineScope;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;->$it:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;->$it:Landroid/view/View;
 
     iput-object p3, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;->this$0:Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;
 
@@ -82,13 +82,13 @@
 
     new-instance v0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;
 
-    iget-object v1, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;->$it:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;->$it:Landroid/view/View;
 
     iget-object v2, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;->this$0:Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;
 
     iget-object v3, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;->$this_launch$inlined:Lkotlinx/coroutines/CoroutineScope;
 
-    invoke-direct {v0, v1, p2, v2, v3}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;-><init>(Landroid/widget/TextView;Lkotlin/coroutines/Continuation;Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;Lkotlinx/coroutines/CoroutineScope;)V
+    invoke-direct {v0, v1, p2, v2, v3}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;-><init>(Landroid/view/View;Lkotlin/coroutines/Continuation;Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;Lkotlinx/coroutines/CoroutineScope;)V
 
     check-cast p1, Lkotlinx/coroutines/CoroutineScope;
 
@@ -108,7 +108,7 @@
 
     check-cast p1, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;
 
-    sget-object p2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -120,7 +120,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
 
-    sget-object p1, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object p1, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     iget p1, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;->label:I
 
@@ -128,21 +128,23 @@
 
     iget-object p1, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;->this$0:Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;
 
-    iget-object p1, p1, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->$clickableSpan:Landroid/text/style/ClickableSpan;
+    iget-object p1, p1, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->$clickableSpan:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object p1, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast p1, Landroid/text/style/ClickableSpan;
 
     check-cast p1, Lcom/discord/utilities/spans/ClickableSpan;
 
-    iget-object v0, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;->$it:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;->$it:Landroid/view/View;
 
     const-string v1, "it"
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Landroid/view/View;
-
     invoke-virtual {p1, v0}, Lcom/discord/utilities/spans/ClickableSpan;->onLongPress(Landroid/view/View;)Lkotlin/Unit;
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 
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 df1d902f93..a54cab5afe 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
@@ -31,17 +31,17 @@
 .end annotation
 
 .annotation runtime Lkotlin/coroutines/jvm/internal/d;
-    Ec = "LinkifiedTextView.kt"
-    Ed = {
-        0x66
+    DR = "LinkifiedTextView.kt"
+    DS = {
+        0x7e
     }
-    Ee = "invokeSuspend"
-    Ef = "com.discord.utilities.view.text.LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1"
+    DT = "invokeSuspend"
+    DU = "com.discord.utilities.view.text.LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1"
 .end annotation
 
 
 # instance fields
-.field final synthetic $clickableSpan:Landroid/text/style/ClickableSpan;
+.field final synthetic $clickableSpan:Lkotlin/jvm/internal/Ref$ObjectRef;
 
 .field final synthetic $weakView:Ljava/lang/ref/WeakReference;
 
@@ -55,14 +55,14 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;Ljava/lang/ref/WeakReference;Landroid/text/style/ClickableSpan;Lkotlin/coroutines/Continuation;)V
+.method constructor <init>(Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;Ljava/lang/ref/WeakReference;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/coroutines/Continuation;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->this$0:Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;
 
     iput-object p2, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->$weakView:Ljava/lang/ref/WeakReference;
 
-    iput-object p3, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->$clickableSpan:Landroid/text/style/ClickableSpan;
+    iput-object p3, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->$clickableSpan:Lkotlin/jvm/internal/Ref$ObjectRef;
 
     const/4 p1, 0x2
 
@@ -97,9 +97,9 @@
 
     iget-object v2, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->$weakView:Ljava/lang/ref/WeakReference;
 
-    iget-object v3, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->$clickableSpan:Landroid/text/style/ClickableSpan;
+    iget-object v3, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->$clickableSpan:Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    invoke-direct {v0, v1, v2, v3, p2}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;-><init>(Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;Ljava/lang/ref/WeakReference;Landroid/text/style/ClickableSpan;Lkotlin/coroutines/Continuation;)V
+    invoke-direct {v0, v1, v2, v3, p2}, 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
 
     check-cast p1, Lkotlinx/coroutines/CoroutineScope;
 
@@ -119,7 +119,7 @@
 
     check-cast p1, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;
 
-    sget-object p2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -131,7 +131,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 9
 
-    sget-object p1, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object p1, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     iget v0, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->label:I
 
@@ -177,7 +177,7 @@
 
     if-gtz v7, :cond_2
 
-    sget-object v3, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v3, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     goto :goto_0
 
@@ -202,7 +202,7 @@
 
     invoke-static {v7, v8}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v8, Lkotlin/coroutines/c;->bkh:Lkotlin/coroutines/c$a;
+    sget-object v8, Lkotlin/coroutines/c;->bkB:Lkotlin/coroutines/c$a;
 
     check-cast v8, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -221,7 +221,7 @@
 
     if-nez v7, :cond_4
 
-    invoke-static {}, Lkotlinx/coroutines/ai;->EU()Lkotlinx/coroutines/ak;
+    invoke-static {}, Lkotlinx/coroutines/ai;->EJ()Lkotlinx/coroutines/ak;
 
     move-result-object v7
 
@@ -232,7 +232,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object v4, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     if-ne v3, v4, :cond_5
 
@@ -266,11 +266,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lkotlinx/coroutines/CoroutineScope;->Ey()Lkotlin/coroutines/CoroutineContext;
+    invoke-interface {p1}, Lkotlinx/coroutines/CoroutineScope;->En()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v0
 
-    sget-object v3, Lkotlinx/coroutines/Job;->bnm:Lkotlinx/coroutines/Job$b;
+    sget-object v3, Lkotlinx/coroutines/Job;->bnG:Lkotlinx/coroutines/Job$b;
 
     check-cast v3, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -295,11 +295,11 @@
 
     move-result-object v0
 
-    check-cast v0, Landroid/widget/TextView;
+    check-cast v0, Landroid/view/View;
 
     if-eqz v0, :cond_8
 
-    invoke-static {}, Lkotlinx/coroutines/ap;->EX()Lkotlinx/coroutines/bm;
+    invoke-static {}, Lkotlinx/coroutines/ap;->EM()Lkotlinx/coroutines/bm;
 
     move-result-object v2
 
@@ -307,7 +307,7 @@
 
     new-instance v3, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;
 
-    invoke-direct {v3, v0, v1, p0, p1}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;-><init>(Landroid/widget/TextView;Lkotlin/coroutines/Continuation;Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;Lkotlinx/coroutines/CoroutineScope;)V
+    invoke-direct {v3, v0, v1, p0, p1}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;-><init>(Landroid/view/View;Lkotlin/coroutines/Continuation;Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;Lkotlinx/coroutines/CoroutineScope;)V
 
     check-cast v3, Lkotlin/jvm/functions/Function2;
 
@@ -316,7 +316,7 @@
     invoke-static {p1, v2, v3, v0}, Lkotlinx/coroutines/d;->a(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;I)Lkotlinx/coroutines/Job;
 
     :cond_8
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 6fc3375361..bf01787386 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
@@ -236,7 +236,7 @@
 
 # virtual methods
 .method public final onTouch(Landroid/view/View;Landroid/view/MotionEvent;)Z
-    .locals 5
+    .locals 12
 
     const-string v0, "view"
 
@@ -262,29 +262,288 @@
     :goto_0
     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 v1, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    const/4 v3, 0x2
+
+    const/4 v4, 0x3
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x1
+
     if-eqz v0, :cond_1
 
+    :try_start_0
     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 v0
+    move-result-object v7
 
-    if-eqz v0, :cond_1
+    if-eqz v7, :cond_1
 
-    invoke-static {v0}, Lkotlin/a/g;->d([Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v7}, Lkotlin/a/g;->c([Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v7
 
-    check-cast v0, Landroid/text/style/ClickableSpan;
+    check-cast v7, Landroid/text/style/ClickableSpan;
 
     goto :goto_1
 
+    :catch_0
+    move-exception v7
+
+    goto :goto_2
+
     :cond_1
-    move-object v0, v1
+    move-object v7, v1
 
     :goto_1
-    const/4 v2, 0x0
+    iput-object v7, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    :try_end_0
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
 
-    if-nez v0, :cond_3
+    goto/16 :goto_8
+
+    :goto_2
+    const/16 v8, 0x8
+
+    new-array v8, v8, [Lkotlin/Pair;
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Landroid/widget/TextView;->getText()Ljava/lang/CharSequence;
+
+    move-result-object v9
+
+    goto :goto_3
+
+    :cond_2
+    move-object v9, v1
+
+    :goto_3
+    invoke-static {v9}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v9
+
+    const-string v10, "text"
+
+    invoke-static {v10, v9}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v9
+
+    aput-object v9, v8, v5
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {v0}, Landroid/widget/TextView;->getX()F
+
+    move-result v9
+
+    invoke-static {v9}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+
+    move-result-object v9
+
+    goto :goto_4
+
+    :cond_3
+    move-object v9, v1
+
+    :goto_4
+    invoke-static {v9}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v9
+
+    const-string v10, "view_x"
+
+    invoke-static {v10, v9}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v9
+
+    aput-object v9, v8, v6
+
+    if-eqz v0, :cond_4
+
+    invoke-virtual {v0}, Landroid/widget/TextView;->getY()F
+
+    move-result v9
+
+    invoke-static {v9}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+
+    move-result-object v9
+
+    goto :goto_5
+
+    :cond_4
+    move-object v9, v1
+
+    :goto_5
+    invoke-static {v9}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v9
+
+    const-string v10, "view_y"
+
+    invoke-static {v10, v9}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v9
+
+    aput-object v9, v8, v3
+
+    invoke-virtual {p2}, Landroid/view/MotionEvent;->getX()F
+
+    move-result v9
+
+    invoke-static {v9}, Ljava/lang/String;->valueOf(F)Ljava/lang/String;
+
+    move-result-object v9
+
+    const-string v10, "event_x"
+
+    invoke-static {v10, v9}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v9
+
+    aput-object v9, v8, v4
+
+    const/4 v9, 0x4
+
+    invoke-virtual {p2}, Landroid/view/MotionEvent;->getY()F
+
+    move-result v10
+
+    invoke-static {v10}, Ljava/lang/String;->valueOf(F)Ljava/lang/String;
+
+    move-result-object v10
+
+    const-string v11, "event_y"
+
+    invoke-static {v11, v10}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v10
+
+    aput-object v10, v8, v9
+
+    const/4 v9, 0x5
+
+    invoke-virtual {p2}, Landroid/view/MotionEvent;->getAction()I
+
+    move-result v10
+
+    invoke-static {v10}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+
+    move-result-object v10
+
+    const-string v11, "event_action"
+
+    invoke-static {v11, v10}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v10
+
+    aput-object v10, v8, v9
+
+    const/4 v9, 0x6
+
+    if-eqz v0, :cond_5
+
+    invoke-virtual {v0}, Landroid/widget/TextView;->getWidth()I
+
+    move-result v10
+
+    invoke-static {v10}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v10
+
+    goto :goto_6
+
+    :cond_5
+    move-object v10, v1
+
+    :goto_6
+    invoke-static {v10}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v10
+
+    const-string v11, "width"
+
+    invoke-static {v11, v10}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v10
+
+    aput-object v10, v8, v9
+
+    const/4 v9, 0x7
+
+    if-eqz v0, :cond_6
+
+    invoke-virtual {v0}, Landroid/widget/TextView;->getHeight()I
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    goto :goto_7
+
+    :cond_6
+    move-object v0, v1
+
+    :goto_7
+    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v10, "height"
+
+    invoke-static {v10, v0}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v0
+
+    aput-object v0, v8, v9
+
+    invoke-static {v8}, Lkotlin/a/ad;->a([Lkotlin/Pair;)Ljava/util/Map;
+
+    move-result-object v0
+
+    invoke-static {}, Lcom/discord/utilities/view/text/LinkifiedTextView;->access$getLogger$cp()Lcom/discord/utilities/logging/Logger;
+
+    move-result-object v8
+
+    if-nez v8, :cond_7
+
+    const-string v9, "logger"
+
+    invoke-static {v9}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_7
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v9
+
+    invoke-virtual {v9}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v9
+
+    const-string v10, "javaClass.name"
+
+    invoke-static {v9, v10}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v7, Ljava/lang/Throwable;
+
+    const-string v10, "failed to get touched clickable spans"
+
+    invoke-virtual {v8, v9, v10, v7, v0}, Lcom/discord/utilities/logging/Logger;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
+
+    :goto_8
+    iget-object v0, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v0, Landroid/text/style/ClickableSpan;
+
+    if-nez v0, :cond_9
 
     iget-object p1, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;->job:Ljava/util/concurrent/atomic/AtomicReference;
 
@@ -294,31 +553,27 @@
 
     check-cast p1, Lkotlinx/coroutines/Job;
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_8
 
     invoke-interface {p1, v1}, Lkotlinx/coroutines/Job;->a(Ljava/util/concurrent/CancellationException;)V
 
-    :cond_2
-    return v2
+    :cond_8
+    return v5
 
-    :cond_3
+    :cond_9
     invoke-virtual {p2}, Landroid/view/MotionEvent;->getAction()I
 
     move-result p2
 
-    const/4 v3, 0x1
+    if-eqz p2, :cond_11
 
-    if-eqz p2, :cond_b
+    if-eq p2, v6, :cond_c
 
-    if-eq p2, v3, :cond_6
+    if-eq p2, v4, :cond_a
 
-    const/4 p1, 0x3
+    return v5
 
-    if-eq p2, p1, :cond_4
-
-    return v2
-
-    :cond_4
+    :cond_a
     iget-object p1, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;->job:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
@@ -327,14 +582,14 @@
 
     check-cast p1, Lkotlinx/coroutines/Job;
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_b
 
     invoke-interface {p1, v1}, Lkotlinx/coroutines/Job;->a(Ljava/util/concurrent/CancellationException;)V
 
-    :cond_5
-    return v3
+    :cond_b
+    return v6
 
-    :cond_6
+    :cond_c
     iget-object p2, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;->job:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
@@ -343,65 +598,79 @@
 
     check-cast p2, Lkotlinx/coroutines/Job;
 
-    if-eqz p2, :cond_7
+    if-eqz p2, :cond_d
 
     invoke-interface {p2, v1}, Lkotlinx/coroutines/Job;->a(Ljava/util/concurrent/CancellationException;)V
 
-    :cond_7
+    :cond_d
     iget-object p2, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;->isClickHandled:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    invoke-virtual {p2, v3}, Ljava/util/concurrent/atomic/AtomicBoolean;->getAndSet(Z)Z
+    invoke-virtual {p2, v6}, Ljava/util/concurrent/atomic/AtomicBoolean;->getAndSet(Z)Z
 
     move-result p2
 
-    if-nez p2, :cond_a
+    if-nez p2, :cond_10
 
-    instance-of p2, v0, Landroid/text/style/URLSpan;
+    iget-object p2, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    if-eqz p2, :cond_9
+    check-cast p2, Landroid/text/style/ClickableSpan;
+
+    instance-of p2, p2, Landroid/text/style/URLSpan;
+
+    if-eqz p2, :cond_f
 
     iget-object p2, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;->onURLSpanClicked:Lkotlin/jvm/functions/Function2;
 
-    if-eqz p2, :cond_8
+    if-eqz p2, :cond_e
 
-    move-object v1, v0
+    iget-object v0, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Landroid/text/style/URLSpan;
+    check-cast v0, Landroid/text/style/ClickableSpan;
 
-    invoke-virtual {v1}, Landroid/text/style/URLSpan;->getURL()Ljava/lang/String;
+    check-cast v0, Landroid/text/style/URLSpan;
 
-    move-result-object v1
+    invoke-virtual {v0}, Landroid/text/style/URLSpan;->getURL()Ljava/lang/String;
 
-    const-string v2, "clickableSpan.url"
+    move-result-object v0
 
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v1, "clickableSpan.url"
 
-    invoke-interface {p2, p1, v1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p2, p1, v0}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p2
 
     check-cast p2, Lkotlin/Unit;
 
-    if-nez p2, :cond_a
+    if-nez p2, :cond_10
 
-    :cond_8
-    invoke-virtual {v0, p1}, Landroid/text/style/ClickableSpan;->onClick(Landroid/view/View;)V
+    :cond_e
+    iget-object p2, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    check-cast p2, Landroid/text/style/ClickableSpan;
 
-    goto :goto_2
+    invoke-virtual {p2, p1}, Landroid/text/style/ClickableSpan;->onClick(Landroid/view/View;)V
 
-    :cond_9
-    invoke-virtual {v0, p1}, Landroid/text/style/ClickableSpan;->onClick(Landroid/view/View;)V
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
-    :cond_a
-    :goto_2
-    return v3
+    goto :goto_9
 
-    :cond_b
+    :cond_f
+    iget-object p2, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast p2, Landroid/text/style/ClickableSpan;
+
+    invoke-virtual {p2, p1}, Landroid/text/style/ClickableSpan;->onClick(Landroid/view/View;)V
+
+    :cond_10
+    :goto_9
+    return v6
+
+    :cond_11
     iget-object p2, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;->isClickHandled:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    invoke-virtual {p2, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
+    invoke-virtual {p2, v5}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
     iget-object p2, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;->job:Ljava/util/concurrent/atomic/AtomicReference;
 
@@ -411,38 +680,40 @@
 
     check-cast p2, Lkotlinx/coroutines/Job;
 
-    if-eqz p2, :cond_c
+    if-eqz p2, :cond_12
 
     invoke-interface {p2, v1}, Lkotlinx/coroutines/Job;->a(Ljava/util/concurrent/CancellationException;)V
 
-    :cond_c
-    instance-of p2, v0, Lcom/discord/utilities/spans/ClickableSpan;
+    :cond_12
+    iget-object p2, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    if-eqz p2, :cond_d
+    check-cast p2, Landroid/text/style/ClickableSpan;
+
+    instance-of p2, p2, Lcom/discord/utilities/spans/ClickableSpan;
+
+    if-eqz p2, :cond_13
 
     new-instance p2, Ljava/lang/ref/WeakReference;
 
     invoke-direct {p2, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlinx/coroutines/ax;->bnh:Lkotlinx/coroutines/ax;
+    sget-object p1, Lkotlinx/coroutines/ax;->bnB:Lkotlinx/coroutines/ax;
 
     check-cast p1, Lkotlinx/coroutines/CoroutineScope;
 
-    invoke-static {}, Lkotlinx/coroutines/ap;->EW()Lkotlinx/coroutines/y;
+    invoke-static {}, Lkotlinx/coroutines/ap;->EL()Lkotlinx/coroutines/y;
 
-    move-result-object v2
+    move-result-object v0
 
-    check-cast v2, Lkotlin/coroutines/CoroutineContext;
+    check-cast v0, Lkotlin/coroutines/CoroutineContext;
 
     new-instance v4, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;
 
-    invoke-direct {v4, p0, p2, v0, v1}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;-><init>(Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;Ljava/lang/ref/WeakReference;Landroid/text/style/ClickableSpan;Lkotlin/coroutines/Continuation;)V
+    invoke-direct {v4, 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
 
     check-cast v4, Lkotlin/jvm/functions/Function2;
 
-    const/4 p2, 0x2
-
-    invoke-static {p1, v2, v4, p2}, Lkotlinx/coroutines/d;->a(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;I)Lkotlinx/coroutines/Job;
+    invoke-static {p1, v0, v4, v3}, Lkotlinx/coroutines/d;->a(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;I)Lkotlinx/coroutines/Job;
 
     move-result-object p1
 
@@ -462,10 +733,10 @@
 
     check-cast p1, Lkotlinx/coroutines/Job;
 
-    if-eqz p1, :cond_d
+    if-eqz p1, :cond_13
 
     invoke-interface {p1, v1}, Lkotlinx/coroutines/Job;->a(Ljava/util/concurrent/CancellationException;)V
 
-    :cond_d
-    return v3
+    :cond_13
+    return v6
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$Companion.smali b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$Companion.smali
index 72c4908900..c389aa57d6 100644
--- a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$Companion.smali
@@ -31,17 +31,17 @@
     return-void
 .end method
 
-.method public static synthetic init$default(Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlin/Unit;
+.method public static synthetic init$default(Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;Lcom/discord/utilities/logging/Logger;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlin/Unit;
     .locals 0
 
-    and-int/lit8 p2, p2, 0x1
+    and-int/lit8 p3, p3, 0x2
 
-    if-eqz p2, :cond_0
+    if-eqz p3, :cond_0
 
-    const/4 p1, 0x0
+    const/4 p2, 0x0
 
     :cond_0
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lcom/discord/utilities/logging/Logger;Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
 
     move-result-object p0
 
@@ -50,11 +50,12 @@
 
 
 # virtual methods
-.method public final init(Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
-    .locals 0
+.method public final init(Lcom/discord/utilities/logging/Logger;Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
+            "Lcom/discord/utilities/logging/Logger;",
             "Lkotlin/jvm/functions/Function2<",
             "-",
             "Landroid/view/View;",
@@ -66,11 +67,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "logger"
 
-    invoke-static {p1}, Lcom/discord/utilities/view/text/LinkifiedTextView;->access$setOnURLSpanClicked$cp(Lkotlin/jvm/functions/Function2;)V
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    if-eqz p2, :cond_0
+
+    invoke-static {p1}, Lcom/discord/utilities/view/text/LinkifiedTextView;->access$setLogger$cp(Lcom/discord/utilities/logging/Logger;)V
+
+    invoke-static {p2}, Lcom/discord/utilities/view/text/LinkifiedTextView;->access$setOnURLSpanClicked$cp(Lkotlin/jvm/functions/Function2;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 
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 e71490965d..45f737e203 100644
--- a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView.smali
@@ -15,6 +15,8 @@
 # static fields
 .field public static final Companion:Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;
 
+.field private static logger:Lcom/discord/utilities/logging/Logger;
+
 .field private static onURLSpanClicked:Lkotlin/jvm/functions/Function2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -137,6 +139,14 @@
     return-void
 .end method
 
+.method public static final synthetic access$getLogger$cp()Lcom/discord/utilities/logging/Logger;
+    .locals 1
+
+    sget-object v0, Lcom/discord/utilities/view/text/LinkifiedTextView;->logger:Lcom/discord/utilities/logging/Logger;
+
+    return-object v0
+.end method
+
 .method public static final synthetic access$getOnURLSpanClicked$cp()Lkotlin/jvm/functions/Function2;
     .locals 1
 
@@ -145,6 +155,14 @@
     return-object v0
 .end method
 
+.method public static final synthetic access$setLogger$cp(Lcom/discord/utilities/logging/Logger;)V
+    .locals 0
+
+    sput-object p0, Lcom/discord/utilities/view/text/LinkifiedTextView;->logger:Lcom/discord/utilities/logging/Logger;
+
+    return-void
+.end method
+
 .method public static final synthetic access$setOnURLSpanClicked$cp(Lkotlin/jvm/functions/Function2;)V
     .locals 0
 
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 af4b066c4f..c670e151c3 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/view/text/TextWatcher$Companion$addBindedTextWatcher$1;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 0c190bd66e..566be4a793 100644
--- a/com.discord/smali/com/discord/utilities/view/text/TextWatcher.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/TextWatcher.smali
@@ -213,7 +213,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     :cond_1
     return-void
@@ -251,7 +251,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     :cond_1
     return-void
@@ -289,7 +289,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     :cond_1
     return-void
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 aa506f6be7..05281b05a4 100644
--- a/com.discord/smali/com/discord/utilities/view/validators/ValidationManager.smali
+++ b/com.discord/smali/com/discord/utilities/view/validators/ValidationManager.smali
@@ -107,14 +107,14 @@
     :goto_0
     if-eqz v2, :cond_1
 
-    sget-object v1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v1, Ljava/util/List;
 
     goto :goto_1
 
     :cond_1
-    invoke-static {v1}, Lkotlin/a/g;->h([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lkotlin/a/g;->g([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v1
 
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 3d51a6e01a..e484640cc8 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
@@ -56,7 +56,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0a02ce
+    const v0, 0x7f0a02d7
 
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali
index 303f8f9fbc..92e874350a 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali
@@ -203,7 +203,7 @@
 
     move-result v0
 
-    const v1, 0x7f0a02cd
+    const v1, 0x7f0a02d6
 
     if-ne v0, v1, :cond_0
 
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 14b0751e0d..66ccedc7d7 100644
--- a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$Companion.smali
@@ -44,7 +44,7 @@
 
     check-cast v0, Landroid/view/View;
 
-    const v1, 0x7f0400bd
+    const v1, 0x7f0400be
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter.smali b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter.smali
index 1f9d5a7dc5..dbdde1b18a 100644
--- a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter.smali
+++ b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter.smali
@@ -105,7 +105,7 @@
 
     if-eqz p3, :cond_0
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
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 e63d2a1291..3c8065b96a 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
@@ -78,7 +78,7 @@
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
-    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->yd:Z
+    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->yo:Z
 
     if-nez p1, :cond_0
 
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 6a81391210..fb284272ef 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion$launchForConnect$2;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 de0688554c..6af14f3170 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion.smali
@@ -76,7 +76,7 @@
 
     if-nez v0, :cond_0
 
-    const v0, 0x7f120c9c
+    const v0, 0x7f120cd7
 
     const/4 v1, 0x1
 
@@ -249,7 +249,7 @@
     :catchall_0
     move-exception p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
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 34ce1c4277..44a6648e41 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/voice/DiscordOverlayService$createMenu$1;->invoke(Lcom/discord/overlay/views/OverlayDialog;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 cda78ab231..cea53f2884 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
@@ -63,7 +63,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a04b8
+    const v1, 0x7f0a04ce
 
     invoke-virtual {v0, v1}, Lcom/discord/overlay/views/OverlayDialog;->findViewById(I)Landroid/view/View;
 
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 9c7bcc2195..c0fe3f7505 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/voice/DiscordOverlayService$createVoiceSelector$1;->invoke(Lcom/discord/overlay/views/OverlayDialog;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 66bf7ab7c5..fc767cf6dd 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/voice/DiscordOverlayService$onCreate$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 84df45dfcc..6d38b65d7b 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/voice/DiscordOverlayService$onCreate$2;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -108,7 +108,7 @@
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wM:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wW:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
index fb5409ed61..da04506e36 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
@@ -99,7 +99,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f070163
+    const v3, 0x7f070165
 
     invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getDimensionPixelOffset(I)I
 
@@ -127,7 +127,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f070119
+    const v1, 0x7f07011b
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelOffset(I)I
 
@@ -195,7 +195,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, v0, Lcom/discord/overlay/OverlayManager;->wR:Landroid/view/View$OnTouchListener;
+    iget-object v2, v0, Lcom/discord/overlay/OverlayManager;->xb:Landroid/view/View$OnTouchListener;
 
     invoke-virtual {v1, v2}, Lcom/discord/overlay/views/OverlayBubbleWrap;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V
 
@@ -307,13 +307,13 @@
 
     move-result-object v2
 
-    const v4, 0x7f080300
+    const v4, 0x7f080311
 
     invoke-virtual {v2, v4}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
     move-result-object v2
 
-    const v4, 0x7f060105
+    const v4, 0x7f060107
 
     invoke-static {p1, v4}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 
@@ -323,7 +323,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f120c8c
+    const v2, 0x7f120cc7
 
     invoke-virtual {p0, v2}, Lcom/discord/utilities/voice/DiscordOverlayService;->getString(I)Ljava/lang/String;
 
@@ -335,7 +335,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f120c9d
+    const v2, 0x7f120cd8
 
     invoke-virtual {p0, v2}, Lcom/discord/utilities/voice/DiscordOverlayService;->getString(I)Ljava/lang/String;
 
@@ -351,7 +351,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f1203d0
+    const v2, 0x7f1203d6
 
     invoke-virtual {p0, v2}, Lcom/discord/utilities/voice/DiscordOverlayService;->getString(I)Ljava/lang/String;
 
@@ -359,13 +359,13 @@
 
     check-cast v2, Ljava/lang/CharSequence;
 
-    const v3, 0x7f080235
+    const v3, 0x7f080245
 
     invoke-virtual {p1, v3, v2, v0}, Landroidx/core/app/NotificationCompat$Builder;->addAction(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder;
 
     move-result-object p1
 
-    const v0, 0x7f120ff3
+    const v0, 0x7f12102f
 
     invoke-virtual {p0, v0}, Lcom/discord/utilities/voice/DiscordOverlayService;->getString(I)Ljava/lang/String;
 
@@ -373,7 +373,7 @@
 
     check-cast v0, Ljava/lang/CharSequence;
 
-    const v2, 0x7f080359
+    const v2, 0x7f08036a
 
     invoke-virtual {p1, v2, v0, v1}, Landroidx/core/app/NotificationCompat$Builder;->addAction(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder;
 
@@ -454,7 +454,7 @@
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wM:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wW:Ljava/util/List;
 
     check-cast p1, Ljava/lang/Iterable;
 
@@ -515,7 +515,7 @@
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wM:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->wW:Ljava/util/List;
 
     check-cast p1, Ljava/lang/Iterable;
 
@@ -579,6 +579,18 @@
     return-void
 
     :cond_0
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p0}, Lcom/discord/utilities/voice/DiscordOverlayService;->getApplication()Landroid/app/Application;
+
+    move-result-object v1
+
+    const-string v2, "application"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream$Companion;->initialize(Landroid/app/Application;)V
+
     invoke-virtual {p0}, Lcom/discord/utilities/voice/DiscordOverlayService;->getOverlayManager()Lcom/discord/overlay/OverlayManager;
 
     move-result-object v0
@@ -591,7 +603,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v1, v0, Lcom/discord/overlay/OverlayManager;->wN:Lkotlin/jvm/functions/Function1;
+    iput-object v1, v0, Lcom/discord/overlay/OverlayManager;->wX:Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {p0}, Lcom/discord/utilities/voice/DiscordOverlayService;->getOverlayManager()Lcom/discord/overlay/OverlayManager;
 
@@ -660,8 +672,43 @@
 
     move-result v0
 
-    if-eqz v0, :cond_2
+    if-nez v0, :cond_3
 
+    sget-object v0, Lcom/discord/utilities/device/DeviceUtils;->INSTANCE:Lcom/discord/utilities/device/DeviceUtils;
+
+    move-object v1, p0
+
+    check-cast v1, Landroid/content/Context;
+
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/device/DeviceUtils;->canDrawOverlays(Landroid/content/Context;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    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-nez v0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    invoke-super {p0, p1, p2, p3}, Lcom/discord/overlay/OverlayService;->onStartCommand(Landroid/content/Intent;II)I
+
+    move-result p1
+
+    return p1
+
+    :cond_3
+    :goto_1
     const/4 p1, 0x1
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/voice/DiscordOverlayService;->stopForeground(Z)V
@@ -671,11 +718,4 @@
     const/4 p1, 0x2
 
     return p1
-
-    :cond_2
-    invoke-super {p0, p1, p2, p3}, Lcom/discord/overlay/OverlayService;->onStartCommand(Landroid/content/Intent;II)I
-
-    move-result p1
-
-    return 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 c70e7aa827..c9e1d13128 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
@@ -142,7 +142,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f080300
+    const v2, 0x7f080311
 
     invoke-virtual {v1, v2}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
@@ -296,13 +296,13 @@
 
     new-instance v8, Landroidx/core/app/NotificationCompat$Action;
 
-    const v9, 0x7f080204
+    const v9, 0x7f080213
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object v10
 
-    const v11, 0x7f120507
+    const v11, 0x7f120512
 
     invoke-virtual {v10, v11}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -318,12 +318,12 @@
 
     if-eqz v3, :cond_0
 
-    const v8, 0x7f0802ec
+    const v8, 0x7f0802fc
 
     goto :goto_0
 
     :cond_0
-    const v8, 0x7f0802eb
+    const v8, 0x7f0802fb
 
     :goto_0
     if-eqz v3, :cond_1
@@ -332,7 +332,7 @@
 
     move-result-object v3
 
-    const v9, 0x7f1211b0
+    const v9, 0x7f1211f4
 
     invoke-virtual {v3, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -345,7 +345,7 @@
 
     move-result-object v3
 
-    const v9, 0x7f120b80
+    const v9, 0x7f120bb1
 
     invoke-virtual {v3, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -362,12 +362,12 @@
 
     if-eqz p0, :cond_2
 
-    const v4, 0x7f0802ad
+    const v4, 0x7f0802bd
 
     goto :goto_2
 
     :cond_2
-    const v4, 0x7f0802ac
+    const v4, 0x7f0802bc
 
     :goto_2
     if-eqz p0, :cond_3
@@ -376,7 +376,7 @@
 
     move-result-object p0
 
-    const v6, 0x7f1211a7
+    const v6, 0x7f1211eb
 
     invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -389,7 +389,7 @@
 
     move-result-object p0
 
-    const v6, 0x7f1204ba
+    const v6, 0x7f1204c4
 
     invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali
index 4685127ad1..d06033f0b8 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali
@@ -347,7 +347,7 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    sget-object v0, Lcom/discord/app/g;->uX:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->uW:Lcom/discord/app/g;
 
     invoke-virtual {v0, p0}, Lcom/discord/app/g;->u(Ljava/lang/Object;)V
 
@@ -371,7 +371,7 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    sget-object v0, Lcom/discord/app/g;->uX:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->uW:Lcom/discord/app/g;
 
     invoke-virtual {v0, p0}, Lcom/discord/app/g;->v(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils$WhenMappings.smali b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils$WhenMappings.smali
index 160ba7423f..ecd9b54e78 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils$WhenMappings.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils$WhenMappings.smali
@@ -22,7 +22,7 @@
 
     sput-object v0, Lcom/discord/utilities/voice/VoiceViewUtils$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xV:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yg:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/RtcConnection$Quality;->ordinal()I
 
@@ -34,7 +34,7 @@
 
     sget-object v0, Lcom/discord/utilities/voice/VoiceViewUtils$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xW:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yh:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/RtcConnection$Quality;->ordinal()I
 
@@ -46,7 +46,7 @@
 
     sget-object v0, Lcom/discord/utilities/voice/VoiceViewUtils$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xX:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yi:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/RtcConnection$Quality;->ordinal()I
 
@@ -58,7 +58,7 @@
 
     sget-object v0, Lcom/discord/utilities/voice/VoiceViewUtils$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xU:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yf:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/RtcConnection$Quality;->ordinal()I
 
@@ -78,7 +78,7 @@
 
     sput-object v0, Lcom/discord/utilities/voice/VoiceViewUtils$WhenMappings;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xV:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yg:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/RtcConnection$Quality;->ordinal()I
 
@@ -88,7 +88,7 @@
 
     sget-object v0, Lcom/discord/utilities/voice/VoiceViewUtils$WhenMappings;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xW:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yh:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/RtcConnection$Quality;->ordinal()I
 
@@ -98,7 +98,7 @@
 
     sget-object v0, Lcom/discord/utilities/voice/VoiceViewUtils$WhenMappings;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xX:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yi:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/RtcConnection$Quality;->ordinal()I
 
@@ -108,7 +108,7 @@
 
     sget-object v0, Lcom/discord/utilities/voice/VoiceViewUtils$WhenMappings;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->xU:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->yf:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/RtcConnection$Quality;->ordinal()I
 
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
index 1ec12063fa..9f469aa84b 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
@@ -37,19 +37,19 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yf:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
-    const v1, 0x7f06011b
+    const v1, 0x7f06011d
 
-    const v2, 0x7f060126
+    const v2, 0x7f060128
 
     if-eqz v0, :cond_4
 
-    const p1, 0x7f060105
+    const p1, 0x7f060107
 
     if-nez p2, :cond_0
 
@@ -109,7 +109,7 @@
     return p1
 
     :cond_4
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->yb:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->ym:Lcom/discord/rtcconnection/RtcConnection$State$b;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -117,7 +117,7 @@
 
     if-nez p2, :cond_9
 
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$c;->yc:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$c;->yn:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -125,7 +125,7 @@
 
     if-nez p2, :cond_9
 
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$a;->ya:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$a;->yl:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -133,7 +133,7 @@
 
     if-nez p2, :cond_9
 
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->yg:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->yr:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -144,7 +144,7 @@
     goto :goto_2
 
     :cond_5
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->ye:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->yp:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -161,11 +161,11 @@
     :cond_6
     instance-of p2, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
-    const v0, 0x7f040292
+    const v0, 0x7f040295
 
     if-nez p2, :cond_8
 
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->yh:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->ys:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -202,7 +202,7 @@
 .method public final getQualityIndicator(Lcom/discord/rtcconnection/RtcConnection$Quality;)I
     .locals 2
 
-    const v0, 0x7f0803aa
+    const v0, 0x7f0803c1
 
     if-nez p1, :cond_0
 
@@ -238,17 +238,17 @@
     return v0
 
     :cond_2
-    const p1, 0x7f0803a9
+    const p1, 0x7f0803c0
 
     return p1
 
     :cond_3
-    const p1, 0x7f0803a7
+    const p1, 0x7f0803be
 
     return p1
 
     :cond_4
-    const p1, 0x7f0803a8
+    const p1, 0x7f0803bf
 
     return p1
 .end method
@@ -256,7 +256,7 @@
 .method public final getTextResId(Lcom/discord/rtcconnection/RtcConnection$State;)I
     .locals 2
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$c;->yc:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$c;->yn:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -264,12 +264,12 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f120432
+    const p1, 0x7f12043b
 
     return p1
 
     :cond_0
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$e;->ye:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$e;->yp:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -277,12 +277,12 @@
 
     if-eqz v0, :cond_1
 
-    const p1, 0x7f120435
+    const p1, 0x7f12043e
 
     return p1
 
     :cond_1
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$b;->yb:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$b;->ym:Lcom/discord/rtcconnection/RtcConnection$State$b;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -290,12 +290,12 @@
 
     if-eqz v0, :cond_2
 
-    const p1, 0x7f120430
+    const p1, 0x7f120439
 
     return p1
 
     :cond_2
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->ya:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->yl:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -303,12 +303,12 @@
 
     if-eqz v0, :cond_3
 
-    const p1, 0x7f12042f
+    const p1, 0x7f120438
 
     return p1
 
     :cond_3
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->yg:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->yr:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -316,12 +316,12 @@
 
     if-eqz v0, :cond_4
 
-    const p1, 0x7f120436
+    const p1, 0x7f12043f
 
     return p1
 
     :cond_4
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yf:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -329,18 +329,18 @@
 
     if-eqz v0, :cond_5
 
-    const p1, 0x7f12043a
+    const p1, 0x7f120443
 
     return p1
 
     :cond_5
     instance-of v0, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
-    const v1, 0x7f120433
+    const v1, 0x7f12043c
 
     if-nez v0, :cond_6
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->yh:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->ys:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
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 b2aa0441b2..d2cde62f0c 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
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/websocket/WebSocket$connect$1$onClosed$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 7e863ea9c7..2aad472ba0 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
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/websocket/WebSocket$connect$1$onFailure$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onMessage$1.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onMessage$1.smali
index eafd970096..bd2f0bc294 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onMessage$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onMessage$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/websocket/WebSocket$connect$1$onMessage$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 92d2e212b6..d150c3b255 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
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/websocket/WebSocket$connect$1$onOpen$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 ebb86d9b15..cd13223fa4 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/websocket/WebSocket$onClosed$1;->invoke(Lcom/discord/utilities/websocket/WebSocket$Closed;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 25e4c6a4fe..12f15e7948 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/websocket/WebSocket$onError$1;->invoke(Lcom/discord/utilities/websocket/WebSocket$Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 53e257ad9e..8009875b9f 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/websocket/WebSocket$onMessage$1;->invoke(Lcom/google/gson/stream/JsonReader;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 606f33c575..b78c811906 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/websocket/WebSocket$onOpened$1;->invoke(Lcom/discord/utilities/websocket/WebSocket$Opened;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 219e38c7f8..56f62ee7a5 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/websocket/WebSocket$resetListeners$1;->invoke(Lcom/discord/utilities/websocket/WebSocket$Opened;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 2bc01aa6f6..a4a5559e4d 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/websocket/WebSocket$resetListeners$2;->invoke(Lcom/discord/utilities/websocket/WebSocket$Closed;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 7031a27f39..1e9836e6ee 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/websocket/WebSocket$resetListeners$3;->invoke(Lcom/google/gson/stream/JsonReader;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 e65bc7507d..c7c089df60 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/websocket/WebSocket$resetListeners$4;->invoke(Lcom/discord/utilities/websocket/WebSocket$Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 7c9769256f..13a92a1c3d 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket.smali
@@ -152,7 +152,7 @@
 
     iput-object p3, p0, Lcom/discord/utilities/websocket/WebSocket;->socketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -188,13 +188,13 @@
 
     iget-object p2, p0, Lcom/discord/utilities/websocket/WebSocket;->schedulerSubject:Lrx/subjects/PublishSubject;
 
-    invoke-virtual {p2}, Lrx/subjects/PublishSubject;->Kc()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/subjects/PublishSubject;->JQ()Lrx/Observable;
 
     move-result-object p2
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lrx/d/a;->LE()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ls()Lrx/Scheduler;
 
     move-result-object p1
 
@@ -292,7 +292,7 @@
 
     invoke-virtual {v0, v1, v2, p2}, Lokhttp3/t$a;->b(JLjava/util/concurrent/TimeUnit;)Lokhttp3/t$a;
 
-    invoke-virtual {v0}, Lokhttp3/t$a;->GS()Lokhttp3/t;
+    invoke-virtual {v0}, Lokhttp3/t$a;->GG()Lokhttp3/t;
 
     move-result-object p2
 
@@ -300,11 +300,11 @@
 
     invoke-direct {v0}, Lokhttp3/w$a;-><init>()V
 
-    invoke-virtual {v0, p1}, Lokhttp3/w$a;->eq(Ljava/lang/String;)Lokhttp3/w$a;
+    invoke-virtual {v0, p1}, Lokhttp3/w$a;->ek(Ljava/lang/String;)Lokhttp3/w$a;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {p1}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object p1
 
@@ -627,7 +627,7 @@
     if-ne v1, v2, :cond_1
 
     :try_start_0
-    invoke-interface {v0, p1}, Lokhttp3/WebSocket;->et(Ljava/lang/String;)Z
+    invoke-interface {v0, p1}, Lokhttp3/WebSocket;->eo(Ljava/lang/String;)Z
     :try_end_0
     .catch Ljava/lang/IllegalStateException; {:try_start_0 .. :try_end_0} :catch_0
 
diff --git a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali
index fd7f607146..135c71c528 100644
--- a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali
@@ -181,7 +181,7 @@
 
     invoke-virtual {v1, p1, v0}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;->onInflatedMessage(Lokhttp3/WebSocket;Ljava/io/InputStreamReader;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
diff --git a/com.discord/smali/com/discord/utils/R$b.smali b/com.discord/smali/com/discord/utils/R$b.smali
index cb1e77513c..7e50f2f02e 100644
--- a/com.discord/smali/com/discord/utils/R$b.smali
+++ b/com.discord/smali/com/discord/utils/R$b.smali
@@ -187,273 +187,273 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final design_appbar_elevation:I = 0x7f070080
+.field public static final design_appbar_elevation:I = 0x7f070081
 
-.field public static final design_bottom_navigation_active_item_max_width:I = 0x7f070081
+.field public static final design_bottom_navigation_active_item_max_width:I = 0x7f070082
 
-.field public static final design_bottom_navigation_active_item_min_width:I = 0x7f070082
+.field public static final design_bottom_navigation_active_item_min_width:I = 0x7f070083
 
-.field public static final design_bottom_navigation_active_text_size:I = 0x7f070083
+.field public static final design_bottom_navigation_active_text_size:I = 0x7f070084
 
-.field public static final design_bottom_navigation_elevation:I = 0x7f070084
+.field public static final design_bottom_navigation_elevation:I = 0x7f070085
 
-.field public static final design_bottom_navigation_height:I = 0x7f070085
+.field public static final design_bottom_navigation_height:I = 0x7f070086
 
-.field public static final design_bottom_navigation_icon_size:I = 0x7f070086
+.field public static final design_bottom_navigation_icon_size:I = 0x7f070087
 
-.field public static final design_bottom_navigation_item_max_width:I = 0x7f070087
+.field public static final design_bottom_navigation_item_max_width:I = 0x7f070088
 
-.field public static final design_bottom_navigation_item_min_width:I = 0x7f070088
+.field public static final design_bottom_navigation_item_min_width:I = 0x7f070089
 
-.field public static final design_bottom_navigation_margin:I = 0x7f070089
+.field public static final design_bottom_navigation_margin:I = 0x7f07008a
 
-.field public static final design_bottom_navigation_shadow_height:I = 0x7f07008a
+.field public static final design_bottom_navigation_shadow_height:I = 0x7f07008b
 
-.field public static final design_bottom_navigation_text_size:I = 0x7f07008b
+.field public static final design_bottom_navigation_text_size:I = 0x7f07008c
 
-.field public static final design_bottom_sheet_modal_elevation:I = 0x7f07008c
+.field public static final design_bottom_sheet_modal_elevation:I = 0x7f07008d
 
-.field public static final design_bottom_sheet_peek_height_min:I = 0x7f07008d
+.field public static final design_bottom_sheet_peek_height_min:I = 0x7f07008e
 
-.field public static final design_fab_border_width:I = 0x7f07008e
+.field public static final design_fab_border_width:I = 0x7f07008f
 
-.field public static final design_fab_elevation:I = 0x7f07008f
+.field public static final design_fab_elevation:I = 0x7f070090
 
-.field public static final design_fab_image_size:I = 0x7f070090
+.field public static final design_fab_image_size:I = 0x7f070091
 
-.field public static final design_fab_size_mini:I = 0x7f070091
+.field public static final design_fab_size_mini:I = 0x7f070092
 
-.field public static final design_fab_size_normal:I = 0x7f070092
+.field public static final design_fab_size_normal:I = 0x7f070093
 
-.field public static final design_fab_translation_z_hovered_focused:I = 0x7f070093
+.field public static final design_fab_translation_z_hovered_focused:I = 0x7f070094
 
-.field public static final design_fab_translation_z_pressed:I = 0x7f070094
+.field public static final design_fab_translation_z_pressed:I = 0x7f070095
 
-.field public static final design_navigation_elevation:I = 0x7f070095
+.field public static final design_navigation_elevation:I = 0x7f070096
 
-.field public static final design_navigation_icon_padding:I = 0x7f070096
+.field public static final design_navigation_icon_padding:I = 0x7f070097
 
-.field public static final design_navigation_icon_size:I = 0x7f070097
+.field public static final design_navigation_icon_size:I = 0x7f070098
 
-.field public static final design_navigation_item_horizontal_padding:I = 0x7f070098
+.field public static final design_navigation_item_horizontal_padding:I = 0x7f070099
 
-.field public static final design_navigation_item_icon_padding:I = 0x7f070099
+.field public static final design_navigation_item_icon_padding:I = 0x7f07009a
 
-.field public static final design_navigation_max_width:I = 0x7f07009a
+.field public static final design_navigation_max_width:I = 0x7f07009b
 
-.field public static final design_navigation_padding_bottom:I = 0x7f07009b
+.field public static final design_navigation_padding_bottom:I = 0x7f07009c
 
-.field public static final design_navigation_separator_vertical_padding:I = 0x7f07009c
+.field public static final design_navigation_separator_vertical_padding:I = 0x7f07009d
 
-.field public static final design_snackbar_action_inline_max_width:I = 0x7f07009d
+.field public static final design_snackbar_action_inline_max_width:I = 0x7f07009e
 
-.field public static final design_snackbar_background_corner_radius:I = 0x7f07009e
+.field public static final design_snackbar_background_corner_radius:I = 0x7f07009f
 
-.field public static final design_snackbar_elevation:I = 0x7f07009f
+.field public static final design_snackbar_elevation:I = 0x7f0700a0
 
-.field public static final design_snackbar_extra_spacing_horizontal:I = 0x7f0700a0
+.field public static final design_snackbar_extra_spacing_horizontal:I = 0x7f0700a1
 
-.field public static final design_snackbar_max_width:I = 0x7f0700a1
+.field public static final design_snackbar_max_width:I = 0x7f0700a2
 
-.field public static final design_snackbar_min_width:I = 0x7f0700a2
+.field public static final design_snackbar_min_width:I = 0x7f0700a3
 
-.field public static final design_snackbar_padding_horizontal:I = 0x7f0700a3
+.field public static final design_snackbar_padding_horizontal:I = 0x7f0700a4
 
-.field public static final design_snackbar_padding_vertical:I = 0x7f0700a4
+.field public static final design_snackbar_padding_vertical:I = 0x7f0700a5
 
-.field public static final design_snackbar_padding_vertical_2lines:I = 0x7f0700a5
+.field public static final design_snackbar_padding_vertical_2lines:I = 0x7f0700a6
 
-.field public static final design_snackbar_text_size:I = 0x7f0700a6
+.field public static final design_snackbar_text_size:I = 0x7f0700a7
 
-.field public static final design_tab_max_width:I = 0x7f0700a7
+.field public static final design_tab_max_width:I = 0x7f0700a8
 
-.field public static final design_tab_scrollable_min_width:I = 0x7f0700a8
+.field public static final design_tab_scrollable_min_width:I = 0x7f0700a9
 
-.field public static final design_tab_text_size:I = 0x7f0700a9
+.field public static final design_tab_text_size:I = 0x7f0700aa
 
-.field public static final design_tab_text_size_2line:I = 0x7f0700aa
+.field public static final design_tab_text_size_2line:I = 0x7f0700ab
 
-.field public static final design_textinput_caption_translate_y:I = 0x7f0700ab
+.field public static final design_textinput_caption_translate_y:I = 0x7f0700ac
 
-.field public static final disabled_alpha_material_dark:I = 0x7f0700b1
+.field public static final disabled_alpha_material_dark:I = 0x7f0700b2
 
-.field public static final disabled_alpha_material_light:I = 0x7f0700b2
+.field public static final disabled_alpha_material_light:I = 0x7f0700b3
 
-.field public static final fastscroll_default_thickness:I = 0x7f0700b8
+.field public static final fastscroll_default_thickness:I = 0x7f0700ba
 
-.field public static final fastscroll_margin:I = 0x7f0700b9
+.field public static final fastscroll_margin:I = 0x7f0700bb
 
-.field public static final fastscroll_minimum_range:I = 0x7f0700ba
+.field public static final fastscroll_minimum_range:I = 0x7f0700bc
 
-.field public static final highlight_alpha_material_colored:I = 0x7f0700c4
+.field public static final highlight_alpha_material_colored:I = 0x7f0700c6
 
-.field public static final highlight_alpha_material_dark:I = 0x7f0700c5
+.field public static final highlight_alpha_material_dark:I = 0x7f0700c7
 
-.field public static final highlight_alpha_material_light:I = 0x7f0700c6
+.field public static final highlight_alpha_material_light:I = 0x7f0700c8
 
-.field public static final hint_alpha_material_dark:I = 0x7f0700c7
+.field public static final hint_alpha_material_dark:I = 0x7f0700c9
 
-.field public static final hint_alpha_material_light:I = 0x7f0700c8
+.field public static final hint_alpha_material_light:I = 0x7f0700ca
 
-.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700c9
+.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700cb
 
-.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ca
+.field public static final hint_pressed_alpha_material_light:I = 0x7f0700cc
 
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700cc
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700ce
 
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700cd
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700cf
 
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700ce
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d0
 
-.field public static final mtrl_bottomappbar_fabOffsetEndMode:I = 0x7f0700d8
+.field public static final mtrl_bottomappbar_fabOffsetEndMode:I = 0x7f0700da
 
-.field public static final mtrl_bottomappbar_fab_cradle_margin:I = 0x7f0700d9
+.field public static final mtrl_bottomappbar_fab_cradle_margin:I = 0x7f0700db
 
-.field public static final mtrl_bottomappbar_fab_cradle_rounded_corner_radius:I = 0x7f0700da
+.field public static final mtrl_bottomappbar_fab_cradle_rounded_corner_radius:I = 0x7f0700dc
 
-.field public static final mtrl_bottomappbar_fab_cradle_vertical_offset:I = 0x7f0700db
+.field public static final mtrl_bottomappbar_fab_cradle_vertical_offset:I = 0x7f0700dd
 
-.field public static final mtrl_bottomappbar_height:I = 0x7f0700dc
+.field public static final mtrl_bottomappbar_height:I = 0x7f0700de
 
-.field public static final mtrl_btn_corner_radius:I = 0x7f0700dd
+.field public static final mtrl_btn_corner_radius:I = 0x7f0700df
 
-.field public static final mtrl_btn_dialog_btn_min_width:I = 0x7f0700de
+.field public static final mtrl_btn_dialog_btn_min_width:I = 0x7f0700e0
 
-.field public static final mtrl_btn_disabled_elevation:I = 0x7f0700df
+.field public static final mtrl_btn_disabled_elevation:I = 0x7f0700e1
 
-.field public static final mtrl_btn_disabled_z:I = 0x7f0700e0
+.field public static final mtrl_btn_disabled_z:I = 0x7f0700e2
 
-.field public static final mtrl_btn_elevation:I = 0x7f0700e1
+.field public static final mtrl_btn_elevation:I = 0x7f0700e3
 
-.field public static final mtrl_btn_focused_z:I = 0x7f0700e2
+.field public static final mtrl_btn_focused_z:I = 0x7f0700e4
 
-.field public static final mtrl_btn_hovered_z:I = 0x7f0700e3
+.field public static final mtrl_btn_hovered_z:I = 0x7f0700e5
 
-.field public static final mtrl_btn_icon_btn_padding_left:I = 0x7f0700e4
+.field public static final mtrl_btn_icon_btn_padding_left:I = 0x7f0700e6
 
-.field public static final mtrl_btn_icon_padding:I = 0x7f0700e5
+.field public static final mtrl_btn_icon_padding:I = 0x7f0700e7
 
-.field public static final mtrl_btn_inset:I = 0x7f0700e6
+.field public static final mtrl_btn_inset:I = 0x7f0700e8
 
-.field public static final mtrl_btn_letter_spacing:I = 0x7f0700e7
+.field public static final mtrl_btn_letter_spacing:I = 0x7f0700e9
 
-.field public static final mtrl_btn_padding_bottom:I = 0x7f0700e8
+.field public static final mtrl_btn_padding_bottom:I = 0x7f0700ea
 
-.field public static final mtrl_btn_padding_left:I = 0x7f0700e9
+.field public static final mtrl_btn_padding_left:I = 0x7f0700eb
 
-.field public static final mtrl_btn_padding_right:I = 0x7f0700ea
+.field public static final mtrl_btn_padding_right:I = 0x7f0700ec
 
-.field public static final mtrl_btn_padding_top:I = 0x7f0700eb
+.field public static final mtrl_btn_padding_top:I = 0x7f0700ed
 
-.field public static final mtrl_btn_pressed_z:I = 0x7f0700ec
+.field public static final mtrl_btn_pressed_z:I = 0x7f0700ee
 
-.field public static final mtrl_btn_stroke_size:I = 0x7f0700ed
+.field public static final mtrl_btn_stroke_size:I = 0x7f0700ef
 
-.field public static final mtrl_btn_text_btn_icon_padding:I = 0x7f0700ee
+.field public static final mtrl_btn_text_btn_icon_padding:I = 0x7f0700f0
 
-.field public static final mtrl_btn_text_btn_padding_left:I = 0x7f0700ef
+.field public static final mtrl_btn_text_btn_padding_left:I = 0x7f0700f1
 
-.field public static final mtrl_btn_text_btn_padding_right:I = 0x7f0700f0
+.field public static final mtrl_btn_text_btn_padding_right:I = 0x7f0700f2
 
-.field public static final mtrl_btn_text_size:I = 0x7f0700f1
+.field public static final mtrl_btn_text_size:I = 0x7f0700f3
 
-.field public static final mtrl_btn_z:I = 0x7f0700f2
+.field public static final mtrl_btn_z:I = 0x7f0700f4
 
-.field public static final mtrl_card_elevation:I = 0x7f0700f3
+.field public static final mtrl_card_elevation:I = 0x7f0700f5
 
-.field public static final mtrl_card_spacing:I = 0x7f0700f4
+.field public static final mtrl_card_spacing:I = 0x7f0700f6
 
-.field public static final mtrl_chip_pressed_translation_z:I = 0x7f0700f5
+.field public static final mtrl_chip_pressed_translation_z:I = 0x7f0700f7
 
-.field public static final mtrl_chip_text_size:I = 0x7f0700f6
+.field public static final mtrl_chip_text_size:I = 0x7f0700f8
 
-.field public static final mtrl_fab_elevation:I = 0x7f0700f7
+.field public static final mtrl_fab_elevation:I = 0x7f0700f9
 
-.field public static final mtrl_fab_translation_z_hovered_focused:I = 0x7f0700f8
+.field public static final mtrl_fab_translation_z_hovered_focused:I = 0x7f0700fa
 
-.field public static final mtrl_fab_translation_z_pressed:I = 0x7f0700f9
+.field public static final mtrl_fab_translation_z_pressed:I = 0x7f0700fb
 
-.field public static final mtrl_navigation_elevation:I = 0x7f0700fa
+.field public static final mtrl_navigation_elevation:I = 0x7f0700fc
 
-.field public static final mtrl_navigation_item_horizontal_padding:I = 0x7f0700fb
+.field public static final mtrl_navigation_item_horizontal_padding:I = 0x7f0700fd
 
-.field public static final mtrl_navigation_item_icon_padding:I = 0x7f0700fc
+.field public static final mtrl_navigation_item_icon_padding:I = 0x7f0700fe
 
-.field public static final mtrl_snackbar_background_corner_radius:I = 0x7f0700fd
+.field public static final mtrl_snackbar_background_corner_radius:I = 0x7f0700ff
 
-.field public static final mtrl_snackbar_margin:I = 0x7f0700fe
+.field public static final mtrl_snackbar_margin:I = 0x7f070100
 
-.field public static final mtrl_textinput_box_bottom_offset:I = 0x7f0700ff
+.field public static final mtrl_textinput_box_bottom_offset:I = 0x7f070101
 
-.field public static final mtrl_textinput_box_corner_radius_medium:I = 0x7f070100
+.field public static final mtrl_textinput_box_corner_radius_medium:I = 0x7f070102
 
-.field public static final mtrl_textinput_box_corner_radius_small:I = 0x7f070101
+.field public static final mtrl_textinput_box_corner_radius_small:I = 0x7f070103
 
-.field public static final mtrl_textinput_box_label_cutout_padding:I = 0x7f070102
+.field public static final mtrl_textinput_box_label_cutout_padding:I = 0x7f070104
 
-.field public static final mtrl_textinput_box_padding_end:I = 0x7f070103
+.field public static final mtrl_textinput_box_padding_end:I = 0x7f070105
 
-.field public static final mtrl_textinput_box_stroke_width_default:I = 0x7f070104
+.field public static final mtrl_textinput_box_stroke_width_default:I = 0x7f070106
 
-.field public static final mtrl_textinput_box_stroke_width_focused:I = 0x7f070105
+.field public static final mtrl_textinput_box_stroke_width_focused:I = 0x7f070107
 
-.field public static final mtrl_textinput_outline_box_expanded_padding:I = 0x7f070106
+.field public static final mtrl_textinput_outline_box_expanded_padding:I = 0x7f070108
 
-.field public static final mtrl_toolbar_default_height:I = 0x7f070107
+.field public static final mtrl_toolbar_default_height:I = 0x7f070109
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
-.field public static final subtitle_corner_radius:I = 0x7f070124
+.field public static final subtitle_corner_radius:I = 0x7f070126
 
-.field public static final subtitle_outline_width:I = 0x7f070125
+.field public static final subtitle_outline_width:I = 0x7f070127
 
-.field public static final subtitle_shadow_offset:I = 0x7f070126
+.field public static final subtitle_shadow_offset:I = 0x7f070128
 
-.field public static final subtitle_shadow_radius:I = 0x7f070127
+.field public static final subtitle_shadow_radius:I = 0x7f070129
 
-.field public static final tooltip_corner_radius:I = 0x7f07012b
+.field public static final tooltip_corner_radius:I = 0x7f07012d
 
-.field public static final tooltip_horizontal_padding:I = 0x7f07012c
+.field public static final tooltip_horizontal_padding:I = 0x7f07012e
 
-.field public static final tooltip_margin:I = 0x7f07012d
+.field public static final tooltip_margin:I = 0x7f07012f
 
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07012e
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f070130
 
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07012f
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f070131
 
-.field public static final tooltip_vertical_padding:I = 0x7f070130
+.field public static final tooltip_vertical_padding:I = 0x7f070132
 
-.field public static final tooltip_y_offset_non_touch:I = 0x7f070131
+.field public static final tooltip_y_offset_non_touch:I = 0x7f070133
 
-.field public static final tooltip_y_offset_touch:I = 0x7f070132
+.field public static final tooltip_y_offset_touch:I = 0x7f070134
 
 
 # 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 eda1aad9f5..12acd1e5b2 100644
--- a/com.discord/smali/com/discord/utils/R$c.smali
+++ b/com.discord/smali/com/discord/utils/R$c.smali
@@ -15,277 +15,277 @@
 
 
 # static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080017
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080017
+.field public static final abc_action_bar_item_background_material:I = 0x7f080018
 
-.field public static final abc_btn_borderless_material:I = 0x7f080018
+.field public static final abc_btn_borderless_material:I = 0x7f080019
 
-.field public static final abc_btn_check_material:I = 0x7f080019
+.field public static final abc_btn_check_material:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
 
-.field public static final abc_btn_colored_material:I = 0x7f08001c
+.field public static final abc_btn_colored_material:I = 0x7f08001d
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
 
-.field public static final abc_btn_radio_material:I = 0x7f08001e
+.field public static final abc_btn_radio_material:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080023
+.field public static final abc_cab_background_internal_bg:I = 0x7f080024
 
-.field public static final abc_cab_background_top_material:I = 0x7f080024
+.field public static final abc_cab_background_top_material:I = 0x7f080025
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
 
-.field public static final abc_control_background_material:I = 0x7f080026
+.field public static final abc_control_background_material:I = 0x7f080027
 
-.field public static final abc_dialog_material_background:I = 0x7f080027
+.field public static final abc_dialog_material_background:I = 0x7f080028
 
-.field public static final abc_edit_text_material:I = 0x7f080028
+.field public static final abc_edit_text_material:I = 0x7f080029
 
-.field public static final abc_ic_ab_back_material:I = 0x7f080029
+.field public static final abc_ic_ab_back_material:I = 0x7f08002a
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
 
-.field public static final abc_ic_clear_material:I = 0x7f08002b
+.field public static final abc_ic_clear_material:I = 0x7f08002c
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
 
-.field public static final abc_ic_search_api_material:I = 0x7f080034
+.field public static final abc_ic_search_api_material:I = 0x7f080035
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080035
+.field public static final abc_ic_star_black_16dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080036
+.field public static final abc_ic_star_black_36dp:I = 0x7f080037
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080037
+.field public static final abc_ic_star_black_48dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003c
+.field public static final abc_item_background_holo_dark:I = 0x7f08003d
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003d
+.field public static final abc_item_background_holo_light:I = 0x7f08003e
 
-.field public static final abc_list_divider_material:I = 0x7f08003e
+.field public static final abc_list_divider_material:I = 0x7f08003f
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
 
-.field public static final abc_list_focused_holo:I = 0x7f080040
+.field public static final abc_list_focused_holo:I = 0x7f080041
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080041
+.field public static final abc_list_longpressed_holo:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080043
+.field public static final abc_list_pressed_holo_light:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080048
+.field public static final abc_list_selector_holo_dark:I = 0x7f080049
 
-.field public static final abc_list_selector_holo_light:I = 0x7f080049
+.field public static final abc_list_selector_holo_light:I = 0x7f08004a
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_material:I = 0x7f08004d
+.field public static final abc_ratingbar_material:I = 0x7f08004e
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004e
+.field public static final abc_ratingbar_small_material:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080054
+.field public static final abc_seekbar_thumb_material:I = 0x7f080055
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
 
-.field public static final abc_seekbar_track_material:I = 0x7f080056
+.field public static final abc_seekbar_track_material:I = 0x7f080057
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
 
-.field public static final abc_switch_thumb_material:I = 0x7f080059
+.field public static final abc_switch_thumb_material:I = 0x7f08005a
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005b
+.field public static final abc_tab_indicator_material:I = 0x7f08005c
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
 
-.field public static final abc_text_cursor_material:I = 0x7f08005d
+.field public static final abc_text_cursor_material:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
 
-.field public static final abc_textfield_search_material:I = 0x7f080068
+.field public static final abc_textfield_search_material:I = 0x7f080069
 
-.field public static final abc_vector_test:I = 0x7f080069
+.field public static final abc_vector_test:I = 0x7f08006a
 
-.field public static final avd_hide_password:I = 0x7f080089
+.field public static final avd_hide_password:I = 0x7f08008a
 
-.field public static final avd_show_password:I = 0x7f08008a
+.field public static final avd_show_password:I = 0x7f08008b
 
-.field public static final common_full_open_on_phone:I = 0x7f08009f
+.field public static final common_full_open_on_phone:I = 0x7f0800a2
 
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a0
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a3
 
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a1
+.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a4
 
-.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a2
+.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a5
 
-.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a3
+.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a6
 
-.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a4
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a7
 
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a5
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a8
 
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a6
+.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a9
 
-.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800a7
+.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800aa
 
-.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800a8
+.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800ab
 
-.field public static final common_google_signin_btn_text_dark:I = 0x7f0800a9
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ac
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800aa
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ad
 
-.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ab
+.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ae
 
-.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800ac
+.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800af
 
-.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800ad
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800b0
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800ae
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800b1
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800af
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b2
 
-.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b0
+.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b3
 
-.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b1
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b4
 
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800b2
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
 
-.field public static final design_fab_background:I = 0x7f0800b3
+.field public static final design_fab_background:I = 0x7f0800b6
 
-.field public static final design_ic_visibility:I = 0x7f0800b4
+.field public static final design_ic_visibility:I = 0x7f0800b7
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b5
+.field public static final design_ic_visibility_off:I = 0x7f0800b8
 
-.field public static final design_password_eye:I = 0x7f0800b6
+.field public static final design_password_eye:I = 0x7f0800b9
 
-.field public static final design_snackbar_background:I = 0x7f0800b7
+.field public static final design_snackbar_background:I = 0x7f0800ba
 
-.field public static final drawable_chip_background:I = 0x7f0800fe
+.field public static final drawable_chip_background:I = 0x7f080105
 
-.field public static final drawable_chip_circle:I = 0x7f0800ff
+.field public static final drawable_chip_circle:I = 0x7f080106
 
-.field public static final drawable_chip_delete:I = 0x7f080100
+.field public static final drawable_chip_delete:I = 0x7f080107
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801ac
+.field public static final googleg_disabled_color_18:I = 0x7f0801bb
 
-.field public static final googleg_standard_color_18:I = 0x7f0801ad
+.field public static final googleg_standard_color_18:I = 0x7f0801bc
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802f0
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080300
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802f1
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080301
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802f2
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080302
 
-.field public static final mtrl_snackbar_background:I = 0x7f080439
+.field public static final mtrl_snackbar_background:I = 0x7f080454
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f08043a
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080455
 
-.field public static final navigation_empty_icon:I = 0x7f08043b
+.field public static final navigation_empty_icon:I = 0x7f080456
 
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
-.field public static final tooltip_frame_dark:I = 0x7f08044c
+.field public static final tooltip_frame_dark:I = 0x7f08046a
 
-.field public static final tooltip_frame_light:I = 0x7f08044d
+.field public static final tooltip_frame_light:I = 0x7f08046b
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/utils/R$d.smali b/com.discord/smali/com/discord/utils/R$d.smali
index a51be74ec6..d1f06c5dcf 100644
--- a/com.discord/smali/com/discord/utils/R$d.smali
+++ b/com.discord/smali/com/discord/utils/R$d.smali
@@ -63,329 +63,329 @@
 
 .field public static final alertTitle:I = 0x7f0a0061
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final auto:I = 0x7f0a00b8
+.field public static final auto:I = 0x7f0a00b9
 
-.field public static final baseline:I = 0x7f0a00c8
+.field public static final baseline:I = 0x7f0a00c9
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final buttonPanel:I = 0x7f0a010c
+.field public static final buttonPanel:I = 0x7f0a010d
 
-.field public static final cancel_action:I = 0x7f0a0117
+.field public static final cancel_action:I = 0x7f0a0118
 
-.field public static final center:I = 0x7f0a0123
+.field public static final center:I = 0x7f0a0124
 
-.field public static final centerCrop:I = 0x7f0a0124
+.field public static final centerCrop:I = 0x7f0a0125
 
-.field public static final centerInside:I = 0x7f0a0125
+.field public static final centerInside:I = 0x7f0a0126
 
-.field public static final checkbox:I = 0x7f0a0212
+.field public static final checkbox:I = 0x7f0a0213
 
-.field public static final chip_image:I = 0x7f0a0214
+.field public static final chip_image:I = 0x7f0a0215
 
-.field public static final chip_text:I = 0x7f0a0215
+.field public static final chip_text:I = 0x7f0a0216
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final column:I = 0x7f0a0221
+.field public static final column:I = 0x7f0a0222
 
-.field public static final column_reverse:I = 0x7f0a0222
+.field public static final column_reverse:I = 0x7f0a0223
 
-.field public static final container:I = 0x7f0a0231
+.field public static final container:I = 0x7f0a0232
 
-.field public static final content:I = 0x7f0a0232
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0233
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final coordinator:I = 0x7f0a0237
+.field public static final coordinator:I = 0x7f0a0238
 
-.field public static final custom:I = 0x7f0a0247
+.field public static final custom:I = 0x7f0a0250
 
-.field public static final customPanel:I = 0x7f0a0248
+.field public static final customPanel:I = 0x7f0a0251
 
-.field public static final dark:I = 0x7f0a0249
+.field public static final dark:I = 0x7f0a0252
 
-.field public static final decor_content_parent:I = 0x7f0a024c
+.field public static final decor_content_parent:I = 0x7f0a0255
 
-.field public static final default_activity_button:I = 0x7f0a024d
+.field public static final default_activity_button:I = 0x7f0a0256
 
-.field public static final design_bottom_sheet:I = 0x7f0a024e
+.field public static final design_bottom_sheet:I = 0x7f0a0257
 
-.field public static final design_menu_item_action_area:I = 0x7f0a024f
+.field public static final design_menu_item_action_area:I = 0x7f0a0258
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a0250
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a0259
 
-.field public static final design_menu_item_text:I = 0x7f0a0251
+.field public static final design_menu_item_text:I = 0x7f0a025a
 
-.field public static final design_navigation_view:I = 0x7f0a0252
+.field public static final design_navigation_view:I = 0x7f0a025b
 
-.field public static final edit_query:I = 0x7f0a02a3
+.field public static final edit_query:I = 0x7f0a02ac
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final end_padder:I = 0x7f0a02bf
+.field public static final end_padder:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02c4
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02c5
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final fill:I = 0x7f0a02d9
+.field public static final fill:I = 0x7f0a02e2
 
-.field public static final filled:I = 0x7f0a02dc
+.field public static final filled:I = 0x7f0a02e5
 
-.field public static final fitBottomStart:I = 0x7f0a02dd
+.field public static final fitBottomStart:I = 0x7f0a02e6
 
-.field public static final fitCenter:I = 0x7f0a02de
+.field public static final fitCenter:I = 0x7f0a02e7
 
-.field public static final fitEnd:I = 0x7f0a02df
+.field public static final fitEnd:I = 0x7f0a02e8
 
-.field public static final fitStart:I = 0x7f0a02e0
+.field public static final fitStart:I = 0x7f0a02e9
 
-.field public static final fitXY:I = 0x7f0a02e1
+.field public static final fitXY:I = 0x7f0a02ea
 
-.field public static final fixed:I = 0x7f0a02e2
+.field public static final fixed:I = 0x7f0a02eb
 
-.field public static final flex_end:I = 0x7f0a02e3
+.field public static final flex_end:I = 0x7f0a02ec
 
-.field public static final flex_start:I = 0x7f0a02e4
+.field public static final flex_start:I = 0x7f0a02ed
 
-.field public static final focusCrop:I = 0x7f0a02e5
+.field public static final focusCrop:I = 0x7f0a02ee
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final ghost_view:I = 0x7f0a030f
+.field public static final ghost_view:I = 0x7f0a0314
 
-.field public static final group_divider:I = 0x7f0a0322
+.field public static final group_divider:I = 0x7f0a032b
 
-.field public static final home:I = 0x7f0a0382
+.field public static final home:I = 0x7f0a0392
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final icon_only:I = 0x7f0a0386
+.field public static final icon_only:I = 0x7f0a0396
 
-.field public static final image:I = 0x7f0a0388
+.field public static final image:I = 0x7f0a0398
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a03fa
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040a
 
-.field public static final labeled:I = 0x7f0a0401
+.field public static final labeled:I = 0x7f0a0411
 
-.field public static final largeLabel:I = 0x7f0a0402
+.field public static final largeLabel:I = 0x7f0a0412
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final light:I = 0x7f0a0409
+.field public static final light:I = 0x7f0a0419
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final listMode:I = 0x7f0a040d
+.field public static final listMode:I = 0x7f0a041d
 
-.field public static final list_item:I = 0x7f0a040e
+.field public static final list_item:I = 0x7f0a041e
 
-.field public static final masked:I = 0x7f0a042b
+.field public static final masked:I = 0x7f0a043b
 
-.field public static final media_actions:I = 0x7f0a042c
+.field public static final media_actions:I = 0x7f0a043c
 
-.field public static final message:I = 0x7f0a046f
+.field public static final message:I = 0x7f0a0482
 
-.field public static final mini:I = 0x7f0a0474
+.field public static final mini:I = 0x7f0a0487
 
-.field public static final mtrl_child_content_container:I = 0x7f0a0475
+.field public static final mtrl_child_content_container:I = 0x7f0a0488
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0476
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0489
 
-.field public static final multiply:I = 0x7f0a0477
+.field public static final multiply:I = 0x7f0a048a
 
-.field public static final navigation_header_container:I = 0x7f0a0479
+.field public static final navigation_header_container:I = 0x7f0a048c
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final nowrap:I = 0x7f0a0497
+.field public static final nowrap:I = 0x7f0a04ad
 
-.field public static final outline:I = 0x7f0a04b2
+.field public static final outline:I = 0x7f0a04c8
 
-.field public static final parallax:I = 0x7f0a04c1
+.field public static final parallax:I = 0x7f0a04d7
 
-.field public static final parentPanel:I = 0x7f0a04c3
+.field public static final parentPanel:I = 0x7f0a04d9
 
-.field public static final parent_matrix:I = 0x7f0a04c4
+.field public static final parent_matrix:I = 0x7f0a04da
 
-.field public static final pin:I = 0x7f0a0500
+.field public static final pin:I = 0x7f0a0517
 
-.field public static final progress_circular:I = 0x7f0a0543
+.field public static final progress_circular:I = 0x7f0a0553
 
-.field public static final progress_horizontal:I = 0x7f0a0545
+.field public static final progress_horizontal:I = 0x7f0a0555
 
-.field public static final radio:I = 0x7f0a0550
+.field public static final radio:I = 0x7f0a0560
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final row:I = 0x7f0a0594
+.field public static final row:I = 0x7f0a05ae
 
-.field public static final row_reverse:I = 0x7f0a0595
+.field public static final row_reverse:I = 0x7f0a05af
 
-.field public static final save_image_matrix:I = 0x7f0a0596
+.field public static final save_image_matrix:I = 0x7f0a05b0
 
-.field public static final save_non_transition_alpha:I = 0x7f0a0597
+.field public static final save_non_transition_alpha:I = 0x7f0a05b1
 
-.field public static final save_scale_type:I = 0x7f0a0598
+.field public static final save_scale_type:I = 0x7f0a05b2
 
-.field public static final screen:I = 0x7f0a059a
+.field public static final screen:I = 0x7f0a05b4
 
-.field public static final scrollIndicatorDown:I = 0x7f0a059c
+.field public static final scrollIndicatorDown:I = 0x7f0a05b6
 
-.field public static final scrollIndicatorUp:I = 0x7f0a059d
+.field public static final scrollIndicatorUp:I = 0x7f0a05b7
 
-.field public static final scrollView:I = 0x7f0a059e
+.field public static final scrollView:I = 0x7f0a05b8
 
-.field public static final scrollable:I = 0x7f0a05a0
+.field public static final scrollable:I = 0x7f0a05ba
 
-.field public static final search_badge:I = 0x7f0a05a2
+.field public static final search_badge:I = 0x7f0a05bc
 
-.field public static final search_bar:I = 0x7f0a05a3
+.field public static final search_bar:I = 0x7f0a05bd
 
-.field public static final search_button:I = 0x7f0a05a4
+.field public static final search_button:I = 0x7f0a05be
 
-.field public static final search_close_btn:I = 0x7f0a05a6
+.field public static final search_close_btn:I = 0x7f0a05c0
 
-.field public static final search_edit_frame:I = 0x7f0a05a7
+.field public static final search_edit_frame:I = 0x7f0a05c1
 
-.field public static final search_go_btn:I = 0x7f0a05aa
+.field public static final search_go_btn:I = 0x7f0a05c4
 
-.field public static final search_mag_icon:I = 0x7f0a05ac
+.field public static final search_mag_icon:I = 0x7f0a05c6
 
-.field public static final search_plate:I = 0x7f0a05ad
+.field public static final search_plate:I = 0x7f0a05c7
 
-.field public static final search_src_text:I = 0x7f0a05b0
+.field public static final search_src_text:I = 0x7f0a05ca
 
-.field public static final search_voice_btn:I = 0x7f0a05bc
+.field public static final search_voice_btn:I = 0x7f0a05d6
 
-.field public static final select_dialog_listview:I = 0x7f0a05bd
+.field public static final select_dialog_listview:I = 0x7f0a05d7
 
-.field public static final selected:I = 0x7f0a05be
+.field public static final selected:I = 0x7f0a05d8
 
-.field public static final shortcut:I = 0x7f0a06f7
+.field public static final shortcut:I = 0x7f0a0711
 
-.field public static final smallLabel:I = 0x7f0a06fb
+.field public static final smallLabel:I = 0x7f0a0715
 
-.field public static final snackbar_action:I = 0x7f0a06fc
+.field public static final snackbar_action:I = 0x7f0a0716
 
-.field public static final snackbar_text:I = 0x7f0a06fd
+.field public static final snackbar_text:I = 0x7f0a0717
 
-.field public static final space_around:I = 0x7f0a0701
+.field public static final space_around:I = 0x7f0a071b
 
-.field public static final space_between:I = 0x7f0a0702
+.field public static final space_between:I = 0x7f0a071c
 
-.field public static final spacer:I = 0x7f0a0703
+.field public static final spacer:I = 0x7f0a071d
 
-.field public static final split_action_bar:I = 0x7f0a0704
+.field public static final split_action_bar:I = 0x7f0a0724
 
-.field public static final src_atop:I = 0x7f0a0707
+.field public static final src_atop:I = 0x7f0a0727
 
-.field public static final src_in:I = 0x7f0a0708
+.field public static final src_in:I = 0x7f0a0728
 
-.field public static final src_over:I = 0x7f0a0709
+.field public static final src_over:I = 0x7f0a0729
 
-.field public static final standard:I = 0x7f0a070b
+.field public static final standard:I = 0x7f0a072b
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0710
+.field public static final status_bar_latest_event_content:I = 0x7f0a0730
 
-.field public static final stretch:I = 0x7f0a0723
+.field public static final stretch:I = 0x7f0a074c
 
-.field public static final submenuarrow:I = 0x7f0a0724
+.field public static final submenuarrow:I = 0x7f0a074d
 
-.field public static final submit_area:I = 0x7f0a0725
+.field public static final submit_area:I = 0x7f0a074e
 
-.field public static final tabMode:I = 0x7f0a0731
+.field public static final tabMode:I = 0x7f0a075a
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0741
+.field public static final textSpacerNoButtons:I = 0x7f0a076a
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0742
+.field public static final textSpacerNoTitle:I = 0x7f0a076b
 
-.field public static final text_input_password_toggle:I = 0x7f0a0745
+.field public static final text_input_password_toggle:I = 0x7f0a076e
 
-.field public static final textinput_counter:I = 0x7f0a0748
+.field public static final textinput_counter:I = 0x7f0a0771
 
-.field public static final textinput_error:I = 0x7f0a0749
+.field public static final textinput_error:I = 0x7f0a0772
 
-.field public static final textinput_helper_text:I = 0x7f0a074a
+.field public static final textinput_helper_text:I = 0x7f0a0773
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0750
+.field public static final titleDividerNoCustom:I = 0x7f0a0779
 
-.field public static final title_template:I = 0x7f0a0751
+.field public static final title_template:I = 0x7f0a077a
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
-.field public static final topPanel:I = 0x7f0a0757
+.field public static final topPanel:I = 0x7f0a0780
 
-.field public static final touch_outside:I = 0x7f0a0759
+.field public static final touch_outside:I = 0x7f0a0782
 
-.field public static final transition_current_scene:I = 0x7f0a075a
+.field public static final transition_current_scene:I = 0x7f0a0783
 
-.field public static final transition_layout_save:I = 0x7f0a075b
+.field public static final transition_layout_save:I = 0x7f0a0784
 
-.field public static final transition_position:I = 0x7f0a075c
+.field public static final transition_position:I = 0x7f0a0785
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a075d
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0786
 
-.field public static final transition_transform:I = 0x7f0a075e
+.field public static final transition_transform:I = 0x7f0a0787
 
-.field public static final uniform:I = 0x7f0a076a
+.field public static final uniform:I = 0x7f0a0793
 
-.field public static final unlabeled:I = 0x7f0a076b
+.field public static final unlabeled:I = 0x7f0a0794
 
-.field public static final up:I = 0x7f0a076d
+.field public static final up:I = 0x7f0a0796
 
-.field public static final view_offset_helper:I = 0x7f0a07db
+.field public static final view_offset_helper:I = 0x7f0a0818
 
-.field public static final visible:I = 0x7f0a07de
+.field public static final visible:I = 0x7f0a081b
 
-.field public static final wide:I = 0x7f0a080a
+.field public static final wide:I = 0x7f0a0848
 
-.field public static final wrap:I = 0x7f0a082d
+.field public static final wrap:I = 0x7f0a086a
 
-.field public static final wrap_content:I = 0x7f0a082e
+.field public static final wrap_content:I = 0x7f0a086b
 
-.field public static final wrap_reverse:I = 0x7f0a082f
+.field public static final wrap_reverse:I = 0x7f0a086c
 
 
 # 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 83f5e6b976..f29a5a25b3 100644
--- a/com.discord/smali/com/discord/utils/R$e.smali
+++ b/com.discord/smali/com/discord/utils/R$e.smali
@@ -99,49 +99,49 @@
 
 .field public static final design_text_input_password_icon:I = 0x7f0d0030
 
-.field public static final mtrl_layout_snackbar:I = 0x7f0d003f
+.field public static final mtrl_layout_snackbar:I = 0x7f0d0041
 
-.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0040
+.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0042
 
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_media_action:I = 0x7f0d0043
+.field public static final notification_media_action:I = 0x7f0d0045
 
-.field public static final notification_media_cancel_action:I = 0x7f0d0044
+.field public static final notification_media_cancel_action:I = 0x7f0d0046
 
-.field public static final notification_template_big_media:I = 0x7f0d0045
+.field public static final notification_template_big_media:I = 0x7f0d0047
 
-.field public static final notification_template_big_media_custom:I = 0x7f0d0046
+.field public static final notification_template_big_media_custom:I = 0x7f0d0048
 
-.field public static final notification_template_big_media_narrow:I = 0x7f0d0047
+.field public static final notification_template_big_media_narrow:I = 0x7f0d0049
 
-.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d0048
+.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d004a
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_lines_media:I = 0x7f0d004b
+.field public static final notification_template_lines_media:I = 0x7f0d004d
 
-.field public static final notification_template_media:I = 0x7f0d004c
+.field public static final notification_template_media:I = 0x7f0d004e
 
-.field public static final notification_template_media_custom:I = 0x7f0d004d
+.field public static final notification_template_media_custom:I = 0x7f0d004f
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
-.field public static final select_dialog_item_material:I = 0x7f0d005d
+.field public static final select_dialog_item_material:I = 0x7f0d005f
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d005e
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0060
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d005f
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d0061
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0066
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0069
 
-.field public static final view_chip_default:I = 0x7f0d0081
+.field public static final view_chip_default:I = 0x7f0d0088
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/utils/R$f.smali b/com.discord/smali/com/discord/utils/R$f.smali
index 4a08f7f622..4ec8c73957 100644
--- a/com.discord/smali/com/discord/utils/R$f.smali
+++ b/com.discord/smali/com/discord/utils/R$f.smali
@@ -2060,7 +2060,7 @@
 
     new-array v5, v1, [I
 
-    const v7, 0x7f040130
+    const v7, 0x7f040132
 
     aput v7, v5, v3
 
@@ -2134,7 +2134,7 @@
 
     new-array v6, v1, [I
 
-    const v9, 0x7f04026d
+    const v9, 0x7f040270
 
     aput v9, v6, v3
 
@@ -2180,7 +2180,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040305
+    const v6, 0x7f040308
 
     aput v6, v5, v3
 
@@ -2200,7 +2200,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f0401ec
+    const v6, 0x7f0401ee
 
     aput v6, v5, v3
 
@@ -2347,60 +2347,60 @@
         0x7f04004c
         0x7f04004e
         0x7f04004f
-        0x7f0400c8
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f0400e9
-        0x7f040103
+        0x7f0400ce
+        0x7f0400ea
         0x7f040104
-        0x7f040112
-        0x7f040156
-        0x7f04015b
-        0x7f040162
-        0x7f040163
-        0x7f0401c7
-        0x7f0401ea
-        0x7f0401f4
-        0x7f040257
-        0x7f040273
-        0x7f04028b
-        0x7f0402b9
-        0x7f0402ba
-        0x7f040313
+        0x7f040105
+        0x7f040114
+        0x7f040158
+        0x7f04015d
+        0x7f040164
+        0x7f040165
+        0x7f0401c9
+        0x7f0401ec
+        0x7f0401f6
+        0x7f04025a
+        0x7f040276
+        0x7f04028e
+        0x7f0402bc
+        0x7f0402bd
         0x7f040316
-        0x7f0403af
-        0x7f0403b9
+        0x7f040319
+        0x7f0403b2
+        0x7f0403bc
     .end array-data
 
     :array_1
     .array-data 4
         0x7f04004c
         0x7f04004e
-        0x7f0400ac
-        0x7f040156
-        0x7f040316
-        0x7f0403b9
+        0x7f0400ad
+        0x7f040158
+        0x7f040319
+        0x7f0403bc
     .end array-data
 
     :array_2
     .array-data 4
-        0x7f040118
-        0x7f0401eb
+        0x7f04011a
+        0x7f0401ed
     .end array-data
 
     :array_3
     .array-data 4
         0x10100f2
-        0x7f04007a
         0x7f04007b
-        0x7f04024e
-        0x7f04024f
-        0x7f040270
-        0x7f0402f8
-        0x7f0402f9
+        0x7f04007c
+        0x7f040251
+        0x7f040252
+        0x7f040273
+        0x7f0402fb
+        0x7f0402fc
     .end array-data
 
     :array_4
@@ -2432,39 +2432,39 @@
         0x10100d4
         0x101048f
         0x1010540
-        0x7f040112
-        0x7f040119
-        0x7f040249
+        0x7f040114
+        0x7f04011b
+        0x7f04024c
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f040306
-        0x7f040307
-        0x7f040308
         0x7f040309
+        0x7f04030a
+        0x7f04030b
+        0x7f04030c
     .end array-data
 
     :array_9
     .array-data 4
-        0x7f040243
-        0x7f040244
+        0x7f040245
+        0x7f040246
     .end array-data
 
     :array_a
     .array-data 4
         0x1010119
-        0x7f040303
-        0x7f0403ad
-        0x7f0403ae
+        0x7f040306
+        0x7f0403b0
+        0x7f0403b1
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f0403aa
-        0x7f0403ab
-        0x7f0403ac
+        0x7f0403ad
+        0x7f0403ae
+        0x7f0403af
     .end array-data
 
     :array_c
@@ -2486,11 +2486,11 @@
         0x7f040048
         0x7f040049
         0x7f04004a
-        0x7f040131
-        0x7f04013f
-        0x7f0401fd
-        0x7f04024a
-        0x7f040339
+        0x7f040133
+        0x7f040141
+        0x7f0401ff
+        0x7f04024d
+        0x7f04033c
     .end array-data
 
     :array_e
@@ -2533,17 +2533,16 @@
         0x7f04002b
         0x7f04002c
         0x7f040044
-        0x7f040065
-        0x7f040074
+        0x7f040066
         0x7f040075
         0x7f040076
         0x7f040077
         0x7f040078
-        0x7f04007d
+        0x7f040079
         0x7f04007e
-        0x7f04008c
-        0x7f040091
-        0x7f0400b2
+        0x7f04007f
+        0x7f04008d
+        0x7f040092
         0x7f0400b3
         0x7f0400b4
         0x7f0400b5
@@ -2551,95 +2550,96 @@
         0x7f0400b7
         0x7f0400b8
         0x7f0400b9
-        0x7f0400bc
-        0x7f0400c1
-        0x7f0400d4
-        0x7f040100
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c2
+        0x7f0400d5
         0x7f040101
         0x7f040102
-        0x7f040108
-        0x7f04010a
-        0x7f04010d
-        0x7f04010e
+        0x7f040103
+        0x7f040109
+        0x7f04010b
         0x7f04010f
         0x7f040110
         0x7f040111
-        0x7f040162
-        0x7f0401d2
-        0x7f04024c
-        0x7f04024d
+        0x7f040112
+        0x7f040113
+        0x7f040164
+        0x7f0401d4
+        0x7f04024f
         0x7f040250
-        0x7f040251
-        0x7f040252
         0x7f040253
         0x7f040254
         0x7f040255
         0x7f040256
-        0x7f040280
-        0x7f040281
-        0x7f040282
-        0x7f04028a
-        0x7f04028c
-        0x7f0402bf
+        0x7f040257
+        0x7f040258
+        0x7f040259
+        0x7f040283
+        0x7f040284
+        0x7f040285
+        0x7f04028d
+        0x7f04028f
         0x7f0402c2
-        0x7f0402c3
-        0x7f0402c4
-        0x7f0402eb
-        0x7f0402ed
+        0x7f0402c5
+        0x7f0402c6
+        0x7f0402c7
         0x7f0402ee
-        0x7f0402ef
-        0x7f040300
-        0x7f040301
-        0x7f04031a
-        0x7f040344
-        0x7f040345
-        0x7f040346
+        0x7f0402f0
+        0x7f0402f1
+        0x7f0402f2
+        0x7f040303
+        0x7f040304
+        0x7f04031d
         0x7f040347
+        0x7f040348
         0x7f040349
         0x7f04034a
-        0x7f04034b
         0x7f04034c
+        0x7f04034d
+        0x7f04034e
         0x7f04034f
-        0x7f040350
-        0x7f0403bb
-        0x7f0403bc
-        0x7f0403bd
+        0x7f040352
+        0x7f040353
         0x7f0403be
-        0x7f0403dc
-        0x7f0403df
-        0x7f0403e0
+        0x7f0403bf
+        0x7f0403c0
+        0x7f0403c1
         0x7f0403e1
-        0x7f0403e2
-        0x7f0403e3
         0x7f0403e4
         0x7f0403e5
         0x7f0403e6
         0x7f0403e7
         0x7f0403e8
+        0x7f0403e9
+        0x7f0403ea
+        0x7f0403eb
+        0x7f0403ec
+        0x7f0403ed
     .end array-data
 
     :array_f
     .array-data 4
         0x7f040050
-        0x7f040121
-        0x7f040122
         0x7f040123
         0x7f040124
-        0x7f04015c
+        0x7f040125
+        0x7f040126
+        0x7f04015e
     .end array-data
 
     :array_10
     .array-data 4
-        0x7f040112
-        0x7f0401ee
+        0x7f040114
         0x7f0401f0
         0x7f0401f2
-        0x7f0401f3
-        0x7f0401f7
-        0x7f0401f8
+        0x7f0401f4
+        0x7f0401f5
         0x7f0401f9
-        0x7f0401fc
-        0x7f04026f
+        0x7f0401fa
+        0x7f0401fb
+        0x7f0401fe
+        0x7f040272
     .end array-data
 
     :array_11
@@ -2654,17 +2654,17 @@
     .array-data 4
         0x101013f
         0x1010140
-        0x7f040081
         0x7f040082
         0x7f040083
         0x7f040084
         0x7f040085
         0x7f040086
-        0x7f0400ce
+        0x7f040087
         0x7f0400cf
         0x7f0400d0
         0x7f0400d1
         0x7f0400d2
+        0x7f0400d3
     .end array-data
 
     :array_13
@@ -2674,50 +2674,49 @@
         0x101011f
         0x101014f
         0x10101e5
-        0x7f04008e
         0x7f04008f
         0x7f040090
-        0x7f040092
+        0x7f040091
         0x7f040093
         0x7f040094
-        0x7f040096
+        0x7f040095
         0x7f040097
         0x7f040098
         0x7f040099
         0x7f04009a
         0x7f04009b
-        0x7f0400a0
+        0x7f04009c
         0x7f0400a1
         0x7f0400a2
-        0x7f0400a5
+        0x7f0400a3
         0x7f0400a6
         0x7f0400a7
         0x7f0400a8
         0x7f0400a9
         0x7f0400aa
         0x7f0400ab
-        0x7f04015a
-        0x7f0401c8
-        0x7f0401cc
-        0x7f0402c8
-        0x7f0402f6
-        0x7f040351
-        0x7f040353
+        0x7f0400ac
+        0x7f04015c
+        0x7f0401ca
+        0x7f0401ce
+        0x7f0402cb
+        0x7f0402f9
+        0x7f040354
+        0x7f040356
     .end array-data
 
     :array_14
     .array-data 4
-        0x7f04008d
-        0x7f04009c
+        0x7f04008e
         0x7f04009d
         0x7f04009e
-        0x7f0402fa
-        0x7f0402fb
+        0x7f04009f
+        0x7f0402fd
+        0x7f0402fe
     .end array-data
 
     :array_15
     .array-data 4
-        0x7f0400ea
         0x7f0400eb
         0x7f0400ec
         0x7f0400ed
@@ -2738,32 +2737,33 @@
         0x7f0400fc
         0x7f0400fd
         0x7f0400fe
+        0x7f0400ff
     .end array-data
 
     :array_16
     .array-data 4
-        0x7f0400af
         0x7f0400b0
-        0x7f0400d3
-        0x7f04011a
-        0x7f04011b
+        0x7f0400b1
+        0x7f0400d4
         0x7f04011c
         0x7f04011d
         0x7f04011e
         0x7f04011f
         0x7f040120
-        0x7f0402e6
-        0x7f0402e8
-        0x7f04030b
-        0x7f0403af
-        0x7f0403b0
-        0x7f0403ba
+        0x7f040121
+        0x7f040122
+        0x7f0402e9
+        0x7f0402eb
+        0x7f04030e
+        0x7f0403b2
+        0x7f0403b3
+        0x7f0403bd
     .end array-data
 
     :array_17
     .array-data 4
-        0x7f040204
-        0x7f040205
+        0x7f040206
+        0x7f040207
     .end array-data
 
     :array_18
@@ -2776,31 +2776,31 @@
     :array_19
     .array-data 4
         0x1010107
-        0x7f04007f
         0x7f040080
+        0x7f040081
     .end array-data
 
     :array_1a
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_1b
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_1c
     .array-data 4
-        0x7f040068
         0x7f040069
+        0x7f04006a
     .end array-data
 
     :array_1d
@@ -2808,75 +2808,75 @@
         0x7f04003b
         0x7f04003c
         0x7f040052
-        0x7f0400b1
-        0x7f04010b
-        0x7f04014a
-        0x7f0402ff
-        0x7f0403a6
+        0x7f0400b2
+        0x7f04010c
+        0x7f04014c
+        0x7f040302
+        0x7f0403a9
     .end array-data
 
     :array_1e
     .array-data 4
         0x7f04002d
         0x7f04002e
-        0x7f040105
         0x7f040106
         0x7f040107
-        0x7f040135
-        0x7f04013c
-        0x7f0401fa
-        0x7f0402f2
-        0x7f0402f3
-        0x7f0402f4
+        0x7f040108
+        0x7f040137
+        0x7f04013e
+        0x7f0401fc
+        0x7f0402f5
+        0x7f0402f6
+        0x7f0402f7
     .end array-data
 
     :array_1f
     .array-data 4
-        0x7f040200
-        0x7f040232
-        0x7f040233
+        0x7f040202
         0x7f040234
-        0x7f04023d
-        0x7f04023e
+        0x7f040235
+        0x7f040236
         0x7f04023f
         0x7f040240
+        0x7f040241
         0x7f040242
-        0x7f040245
+        0x7f040244
+        0x7f040247
     .end array-data
 
     :array_20
     .array-data 4
         0x7f040050
         0x7f040051
-        0x7f040064
-        0x7f040112
-        0x7f040125
-        0x7f040126
-        0x7f04015a
-        0x7f040164
-        0x7f04026c
-        0x7f04028f
-        0x7f0402c8
-        0x7f0402f6
-        0x7f0403d7
+        0x7f040065
+        0x7f040114
+        0x7f040127
+        0x7f040128
+        0x7f04015c
+        0x7f040166
+        0x7f04026f
+        0x7f040292
+        0x7f0402cb
+        0x7f0402f9
+        0x7f0403da
     .end array-data
 
     :array_21
     .array-data 4
-        0x7f040132
-        0x7f040133
-        0x7f0401f5
-        0x7f04024b
+        0x7f040134
+        0x7f040135
+        0x7f0401f7
+        0x7f04024e
     .end array-data
 
     :array_22
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_23
@@ -2886,39 +2886,36 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_24
     .array-data 4
         0x1010109
         0x1010200
-        0x7f040149
+        0x7f04014b
     .end array-data
 
     :array_25
     .array-data 4
         0x7f040027
         0x7f04004d
-        0x7f040128
-        0x7f040129
         0x7f04012a
-        0x7f040279
-        0x7f040288
-        0x7f040289
-        0x7f04028e
-        0x7f0402b6
-        0x7f0402b7
-        0x7f0402b8
-        0x7f0402c5
-        0x7f0402c6
+        0x7f04012b
+        0x7f04012c
+        0x7f04027c
+        0x7f04028b
+        0x7f04028c
+        0x7f040291
+        0x7f0402b9
+        0x7f0402ba
+        0x7f0402bb
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f0402cb
         0x7f0402cc
         0x7f0402cd
         0x7f0402ce
@@ -2930,7 +2927,10 @@
         0x7f0402d4
         0x7f0402d5
         0x7f0402d6
-        0x7f0403db
+        0x7f0402d7
+        0x7f0402d8
+        0x7f0402d9
+        0x7f0403e0
     .end array-data
 
     :array_26
@@ -2962,10 +2962,10 @@
         0x1010126
         0x1010127
         0x1010128
-        0x7f040104
-        0x7f040109
-        0x7f04026e
-        0x7f0402f5
+        0x7f040105
+        0x7f04010a
+        0x7f040271
+        0x7f0402f8
     .end array-data
 
     :array_29
@@ -2984,9 +2984,9 @@
 
     :array_2b
     .array-data 4
-        0x7f0400a4
-        0x7f0401d0
-        0x7f0401d1
+        0x7f0400a5
+        0x7f0401d2
+        0x7f0401d3
     .end array-data
 
     :array_2c
@@ -2997,47 +2997,44 @@
         0x10101ba
         0x7f040050
         0x7f040051
-        0x7f0400d6
-        0x7f0401c7
+        0x7f0400d7
         0x7f0401c9
-        0x7f0401ca
         0x7f0401cb
+        0x7f0401cc
         0x7f0401cd
-        0x7f0401ce
-        0x7f0402c8
-        0x7f04030f
-        0x7f040310
+        0x7f0401cf
+        0x7f0401d0
+        0x7f0402cb
+        0x7f040312
+        0x7f040313
     .end array-data
 
     :array_2d
     .array-data 4
-        0x7f04030f
-        0x7f040310
+        0x7f040312
+        0x7f040313
     .end array-data
 
     :array_2e
     .array-data 4
-        0x7f040068
         0x7f040069
-        0x7f040095
-        0x7f04009f
-        0x7f0400a3
-        0x7f0400b2
+        0x7f04006a
+        0x7f040096
+        0x7f0400a0
+        0x7f0400a4
         0x7f0400b3
-        0x7f0400b9
-        0x7f0400bc
-        0x7f0400c0
-        0x7f040111
-        0x7f04013d
-        0x7f040268
-        0x7f040269
-        0x7f040274
-        0x7f0402e7
-        0x7f0402fc
-        0x7f040332
-        0x7f04033a
-        0x7f04033b
-        0x7f04033c
+        0x7f0400b4
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c1
+        0x7f040113
+        0x7f04013f
+        0x7f04026b
+        0x7f04026c
+        0x7f040277
+        0x7f0402ea
+        0x7f0402ff
+        0x7f040335
         0x7f04033d
         0x7f04033e
         0x7f04033f
@@ -3045,10 +3042,13 @@
         0x7f040341
         0x7f040342
         0x7f040343
-        0x7f040348
-        0x7f04034d
-        0x7f04034e
-        0x7f040352
+        0x7f040344
+        0x7f040345
+        0x7f040346
+        0x7f04034b
+        0x7f040350
+        0x7f040351
+        0x7f040355
     .end array-data
 
     :array_2f
@@ -3080,12 +3080,12 @@
         0x7f04001f
         0x7f040020
         0x7f040031
-        0x7f0400c7
-        0x7f0401cd
-        0x7f0401ce
-        0x7f040277
-        0x7f0402f1
-        0x7f0403bf
+        0x7f0400c8
+        0x7f0401cf
+        0x7f0401d0
+        0x7f04027a
+        0x7f0402f4
+        0x7f0403c2
     .end array-data
 
     :array_31
@@ -3097,8 +3097,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04028d
-        0x7f040311
+        0x7f040290
+        0x7f040314
     .end array-data
 
     :array_32
@@ -3106,43 +3106,43 @@
         0x10100d4
         0x10100dd
         0x101011f
-        0x7f040112
-        0x7f040155
-        0x7f0401ee
-        0x7f0401ef
+        0x7f040114
+        0x7f040157
+        0x7f0401f0
         0x7f0401f1
         0x7f0401f3
-        0x7f0401f6
-        0x7f0401f9
-        0x7f04026f
+        0x7f0401f5
+        0x7f0401f8
+        0x7f0401fb
+        0x7f040272
     .end array-data
 
     :array_33
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040278
+        0x7f04027b
     .end array-data
 
     :array_34
     .array-data 4
-        0x7f04027c
         0x7f04027f
+        0x7f040282
     .end array-data
 
     :array_35
     .array-data 4
         0x10100c4
         0x10100f1
-        0x7f04012b
-        0x7f04012c
         0x7f04012d
         0x7f04012e
         0x7f04012f
-        0x7f0401ff
-        0x7f0402c7
-        0x7f0402fe
-        0x7f040304
+        0x7f040130
+        0x7f040131
+        0x7f040201
+        0x7f0402ca
+        0x7f040301
+        0x7f040307
     .end array-data
 
     :array_36
@@ -3151,26 +3151,26 @@
         0x101011f
         0x1010220
         0x1010264
-        0x7f0400a5
-        0x7f0400c2
-        0x7f0400ff
-        0x7f04014f
-        0x7f0401cf
-        0x7f0401fe
-        0x7f0402bd
-        0x7f0402be
-        0x7f0402e9
-        0x7f0402ea
-        0x7f040312
-        0x7f040317
-        0x7f0403dd
+        0x7f0400a6
+        0x7f0400c3
+        0x7f040100
+        0x7f040151
+        0x7f0401d1
+        0x7f040200
+        0x7f0402c0
+        0x7f0402c1
+        0x7f0402ec
+        0x7f0402ed
+        0x7f040315
+        0x7f04031a
+        0x7f0403e2
     .end array-data
 
     :array_37
     .array-data 4
-        0x7f04007c
-        0x7f0400bf
-        0x7f0402e5
+        0x7f04007d
+        0x7f0400c0
+        0x7f0402e8
     .end array-data
 
     :array_38
@@ -3179,21 +3179,18 @@
         0x7f040027
         0x7f040028
         0x7f04004d
-        0x7f040128
-        0x7f040129
         0x7f04012a
-        0x7f040279
-        0x7f040288
-        0x7f040289
-        0x7f04028e
-        0x7f0402b6
-        0x7f0402b7
-        0x7f0402b8
-        0x7f0402c5
-        0x7f0402c6
+        0x7f04012b
+        0x7f04012c
+        0x7f04027c
+        0x7f04028b
+        0x7f04028c
+        0x7f040291
+        0x7f0402b9
+        0x7f0402ba
+        0x7f0402bb
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f0402cb
         0x7f0402cc
         0x7f0402cd
         0x7f0402ce
@@ -3205,20 +3202,23 @@
         0x7f0402d4
         0x7f0402d5
         0x7f0402d6
-        0x7f0403db
+        0x7f0402d7
+        0x7f0402d8
+        0x7f0402d9
+        0x7f0403e0
     .end array-data
 
     :array_39
     .array-data 4
-        0x7f0402fc
-        0x7f0402fd
+        0x7f0402ff
+        0x7f040300
     .end array-data
 
     :array_3a
     .array-data 4
         0x101011f
-        0x7f040112
-        0x7f04026a
+        0x7f040114
+        0x7f04026d
     .end array-data
 
     :array_3b
@@ -3227,7 +3227,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_3c
@@ -3245,17 +3245,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f0402f7
-        0x7f040302
-        0x7f040318
-        0x7f040319
+        0x7f0402fa
+        0x7f040305
         0x7f04031b
-        0x7f0403a7
-        0x7f0403a8
-        0x7f0403a9
-        0x7f0403c0
-        0x7f0403c1
-        0x7f0403c2
+        0x7f04031c
+        0x7f04031e
+        0x7f0403aa
+        0x7f0403ab
+        0x7f0403ac
+        0x7f0403c3
+        0x7f0403c4
+        0x7f0403c5
     .end array-data
 
     :array_3e
@@ -3267,9 +3267,6 @@
 
     :array_3f
     .array-data 4
-        0x7f04031c
-        0x7f04031d
-        0x7f04031e
         0x7f04031f
         0x7f040320
         0x7f040321
@@ -3289,9 +3286,12 @@
         0x7f04032f
         0x7f040330
         0x7f040331
+        0x7f040332
         0x7f040333
         0x7f040334
-        0x7f040335
+        0x7f040336
+        0x7f040337
+        0x7f040338
     .end array-data
 
     :array_40
@@ -3307,15 +3307,14 @@
         0x1010163
         0x1010164
         0x10103ac
-        0x7f04013f
-        0x7f040339
+        0x7f040141
+        0x7f04033c
     .end array-data
 
     :array_41
     .array-data 4
         0x101009a
         0x1010150
-        0x7f04006a
         0x7f04006b
         0x7f04006c
         0x7f04006d
@@ -3324,72 +3323,73 @@
         0x7f040070
         0x7f040071
         0x7f040072
-        0x7f0400d7
+        0x7f040073
         0x7f0400d8
         0x7f0400d9
         0x7f0400da
-        0x7f040116
-        0x7f040117
-        0x7f040157
-        0x7f040158
+        0x7f0400db
+        0x7f040118
+        0x7f040119
         0x7f040159
-        0x7f04015e
+        0x7f04015a
+        0x7f04015b
         0x7f040160
-        0x7f040161
-        0x7f040283
-        0x7f040284
-        0x7f040285
+        0x7f040162
+        0x7f040163
         0x7f040286
         0x7f040287
+        0x7f040288
+        0x7f040289
+        0x7f04028a
     .end array-data
 
     :array_42
     .array-data 4
         0x1010034
-        0x7f040114
-        0x7f040115
+        0x7f040116
+        0x7f040117
     .end array-data
 
     :array_43
     .array-data 4
         0x10100af
         0x1010140
-        0x7f040079
-        0x7f0400ad
+        0x7f04007a
         0x7f0400ae
-        0x7f0400c8
+        0x7f0400af
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f040257
-        0x7f040258
-        0x7f04026b
-        0x7f040271
-        0x7f040272
-        0x7f04028b
-        0x7f040313
-        0x7f040314
-        0x7f040315
-        0x7f0403af
-        0x7f0403b1
+        0x7f0400ce
+        0x7f04025a
+        0x7f04025b
+        0x7f04026e
+        0x7f040274
+        0x7f040275
+        0x7f04028e
+        0x7f040316
+        0x7f040317
+        0x7f040318
         0x7f0403b2
-        0x7f0403b3
         0x7f0403b4
         0x7f0403b5
         0x7f0403b6
         0x7f0403b7
         0x7f0403b8
+        0x7f0403b9
+        0x7f0403ba
+        0x7f0403bb
     .end array-data
 
     :array_44
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04027d
-        0x7f04027e
-        0x7f040355
+        0x7f040280
+        0x7f040281
+        0x7f040358
     .end array-data
 
     :array_45
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$DropdownItem$a.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$DropdownItem$a.smali
index 8571c65900..435b47661c 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$DropdownItem$a.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$DropdownItem$a.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final AD:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+.field public static final AO:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;-><init>()V
 
-    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->AD:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->AO:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$DropdownItem$b.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$DropdownItem$b.smali
index 4e88a3ff89..c699bb79d3 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$DropdownItem$b.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$DropdownItem$b.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final AF:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+.field public static final AP:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;-><init>()V
 
-    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->AF:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->AP:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$HeaderImage.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$HeaderImage.smali
index 1dae123e62..f7fc231083 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$HeaderImage.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$HeaderImage.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
-.field public static final enum AG:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+.field public static final enum AQ:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
-.field public static final enum AH:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+.field public static final enum AR:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
-.field public static final enum AJ:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+.field public static final enum AS:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
-.field private static final synthetic AK:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+.field private static final synthetic AT:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
 
 # instance fields
@@ -52,13 +52,13 @@
 
     const-string v3, "MECH_WUMPUS"
 
-    const v4, 0x7f080435
+    const v4, 0x7f080450
 
     const/high16 v5, -0x40800000    # -1.0f
 
     invoke-direct {v1, v3, v2, v4, v5}, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;-><init>(Ljava/lang/String;IIF)V
 
-    sput-object v1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AG:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sput-object v1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AQ:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     aput-object v1, v0, v2
 
@@ -68,11 +68,11 @@
 
     const-string v3, "WHEEL_WUMPUS"
 
-    const v4, 0x7f080436
+    const v4, 0x7f080451
 
     invoke-direct {v1, v3, v2, v4}, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AH:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sput-object v1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AR:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     aput-object v1, v0, v2
 
@@ -82,15 +82,15 @@
 
     const-string v3, "BROKEN_WHEEL"
 
-    const v4, 0x7f080414
+    const v4, 0x7f08042e
 
     invoke-direct {v1, v3, v2, v4}, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AJ:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sput-object v1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AS:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AK:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AT:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     return-void
 .end method
@@ -139,7 +139,7 @@
 .method public static values()[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
     .locals 1
 
-    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AK:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AT:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     invoke-virtual {v0}, [Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$a.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$a.smali
index 2ff0d90906..d08c9a41e3 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$a.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$a.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final AL:Ljava/util/HashSet;
+.field private final AU:Ljava/util/HashSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashSet<",
@@ -73,109 +73,11 @@
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$a;->AL:Ljava/util/HashSet;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$a;->AU:Ljava/util/HashSet;
 
     return-void
 .end method
 
-.method private final a(ILandroid/view/View;)Landroid/view/View;
-    .locals 2
-
-    if-nez p2, :cond_0
-
-    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView$a;->context:Landroid/content/Context;
-
-    const v0, 0x7f0d001c
-
-    const/4 v1, 0x0
-
-    invoke-static {p2, v0, v1}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
-
-    move-result-object p2
-
-    :cond_0
-    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView$a;->data:Ljava/util/List;
-
-    invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem;
-
-    instance-of v0, p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$c;
-
-    const-string v1, "view"
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$c;
-
-    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1, p2}, Lcom/discord/views/ActiveSubscriptionView$a;->a(Lcom/discord/views/ActiveSubscriptionView$DropdownItem$c;Landroid/view/View;)Landroid/view/View;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_1
-    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->AD:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const p1, 0x7f1202a9
-
-    invoke-static {p2, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/CharSequence;
-
-    invoke-static {p1, p2}, Lcom/discord/views/ActiveSubscriptionView$a;->a(Ljava/lang/CharSequence;Landroid/view/View;)Landroid/view/View;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_2
-    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->AF:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_3
-
-    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const p1, 0x7f12025d
-
-    invoke-static {p2, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/CharSequence;
-
-    invoke-static {p1, p2}, Lcom/discord/views/ActiveSubscriptionView$a;->a(Ljava/lang/CharSequence;Landroid/view/View;)Landroid/view/View;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_3
-    new-instance p1, Lkotlin/k;
-
-    invoke-direct {p1}, Lkotlin/k;-><init>()V
-
-    throw p1
-.end method
-
 .method private final a(Lcom/discord/views/ActiveSubscriptionView$DropdownItem$c;Landroid/view/View;)Landroid/view/View;
     .locals 9
 
@@ -217,7 +119,7 @@
 
     iget-object v1, p0, Lcom/discord/views/ActiveSubscriptionView$a;->context:Landroid/content/Context;
 
-    const v2, 0x7f120cf2
+    const v2, 0x7f120d36
 
     const/4 v3, 0x1
 
@@ -303,6 +205,104 @@
     return-object p1
 .end method
 
+.method private final getItemView(ILandroid/view/View;)Landroid/view/View;
+    .locals 2
+
+    if-nez p2, :cond_0
+
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView$a;->context:Landroid/content/Context;
+
+    const v0, 0x7f0d001c
+
+    const/4 v1, 0x0
+
+    invoke-static {p2, v0, v1}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    move-result-object p2
+
+    :cond_0
+    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView$a;->data:Ljava/util/List;
+
+    invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem;
+
+    instance-of v0, p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$c;
+
+    const-string v1, "view"
+
+    if-eqz v0, :cond_1
+
+    check-cast p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$c;
+
+    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1, p2}, Lcom/discord/views/ActiveSubscriptionView$a;->a(Lcom/discord/views/ActiveSubscriptionView$DropdownItem$c;Landroid/view/View;)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_1
+    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->AO:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const p1, 0x7f1202ad
+
+    invoke-static {p2, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    invoke-static {p1, p2}, Lcom/discord/views/ActiveSubscriptionView$a;->a(Ljava/lang/CharSequence;Landroid/view/View;)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_2
+    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->AP:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_3
+
+    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const p1, 0x7f120260
+
+    invoke-static {p2, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    invoke-static {p1, p2}, Lcom/discord/views/ActiveSubscriptionView$a;->a(Ljava/lang/CharSequence;Landroid/view/View;)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_3
+    new-instance p1, Lkotlin/k;
+
+    invoke-direct {p1}, Lkotlin/k;-><init>()V
+
+    throw p1
+.end method
+
 
 # virtual methods
 .method public final getCount()I
@@ -324,7 +324,7 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, p1, p2}, Lcom/discord/views/ActiveSubscriptionView$a;->a(ILandroid/view/View;)Landroid/view/View;
+    invoke-direct {p0, p1, p2}, Lcom/discord/views/ActiveSubscriptionView$a;->getItemView(ILandroid/view/View;)Landroid/view/View;
 
     move-result-object p1
 
@@ -368,7 +368,7 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, p1, p2}, Lcom/discord/views/ActiveSubscriptionView$a;->a(ILandroid/view/View;)Landroid/view/View;
+    invoke-direct {p0, p1, p2}, Lcom/discord/views/ActiveSubscriptionView$a;->getItemView(ILandroid/view/View;)Landroid/view/View;
 
     move-result-object p1
 
@@ -408,7 +408,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView$a;->AL:Ljava/util/HashSet;
+    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView$a;->AU:Ljava/util/HashSet;
 
     invoke-virtual {v0, p1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
 
@@ -419,7 +419,7 @@
 .method public final unregisterDataSetObserver(Landroid/database/DataSetObserver;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView$a;->AL:Ljava/util/HashSet;
+    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView$a;->AU:Ljava/util/HashSet;
 
     check-cast v0, Ljava/util/Collection;
 
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$b.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$b.smali
index 0be3f37363..69dfd4481c 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$b.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$b.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic AM:Lkotlin/jvm/functions/Function0;
+.field final synthetic AV:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
 .method constructor <init>(Lkotlin/jvm/functions/Function0;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$b;->AM:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$b;->AV: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/views/ActiveSubscriptionView$b;->AM:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$b;->AV:Lkotlin/jvm/functions/Function0;
 
     if-eqz p1, :cond_0
 
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$c.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$c.smali
index 78d27f0da9..e44f50d9f2 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$c.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$c.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic AN:Lkotlin/jvm/functions/Function0;
+.field final synthetic AW:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
 .method constructor <init>(Lkotlin/jvm/functions/Function0;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$c;->AN:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$c;->AW: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/views/ActiveSubscriptionView$c;->AN:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$c;->AW:Lkotlin/jvm/functions/Function0;
 
     if-eqz p1, :cond_0
 
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$d.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$d.smali
index f099e064a1..f00d26bebd 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$d.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$d.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic AO:Ljava/util/List;
+.field final synthetic AX:Ljava/util/List;
 
-.field final synthetic AP:Lkotlin/jvm/functions/Function1;
+.field final synthetic AY:Lkotlin/jvm/functions/Function1;
 
 
 # direct methods
 .method constructor <init>(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$d;->AO:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$d;->AX:Ljava/util/List;
 
-    iput-object p2, p0, Lcom/discord/views/ActiveSubscriptionView$d;->AP:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/views/ActiveSubscriptionView$d;->AY:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,7 +55,7 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$d;->AO:Ljava/util/List;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$d;->AX:Ljava/util/List;
 
     invoke-interface {p1, p3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -63,7 +63,7 @@
 
     check-cast p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem;
 
-    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView$d;->AP:Lkotlin/jvm/functions/Function1;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView$d;->AY:Lkotlin/jvm/functions/Function1;
 
     if-eqz p2, :cond_1
 
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali
index 0bfe5d8024..362c3b3976 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali
@@ -14,27 +14,27 @@
 
 
 # instance fields
-.field private final AA:Landroid/widget/Button;
-
 .field private final AB:Landroid/widget/TextView;
 
-.field private final AC:Landroid/widget/TextView;
+.field private final AC:Landroid/widget/Spinner;
 
-.field private final As:Landroid/widget/TextView;
+.field private final AD:Landroid/widget/ImageView;
 
-.field private final At:Landroid/widget/Spinner;
+.field private final AF:Landroid/widget/ImageView;
 
-.field private final Au:Landroid/widget/ImageView;
+.field private final AG:Landroid/widget/ImageView;
 
-.field private final Av:Landroid/widget/ImageView;
+.field private final AH:Landroid/widget/TextView;
 
-.field private final Aw:Landroid/widget/ImageView;
+.field private final AJ:Landroid/widget/Button;
 
-.field private final Ax:Landroid/widget/TextView;
+.field private final AK:Landroid/widget/ProgressBar;
 
-.field private final Ay:Landroid/widget/Button;
+.field private final AL:Landroid/widget/Button;
 
-.field private final Az:Landroid/widget/ProgressBar;
+.field private final AM:Landroid/widget/TextView;
+
+.field private final AN:Landroid/widget/TextView;
 
 .field private final headerTv:Landroid/widget/TextView;
 
@@ -93,7 +93,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d0071
+    const p3, 0x7f0d0077
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -109,7 +109,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->As:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AB:Landroid/widget/TextView;
 
     const p1, 0x7f0a004d
 
@@ -123,7 +123,7 @@
 
     check-cast p1, Landroid/widget/Spinner;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->At:Landroid/widget/Spinner;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AC:Landroid/widget/Spinner;
 
     const p1, 0x7f0a004a
 
@@ -151,7 +151,7 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->Au:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AD:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0048
 
@@ -165,7 +165,7 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->Av:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AF:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0049
 
@@ -179,7 +179,7 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->Aw:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AG:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0044
 
@@ -193,7 +193,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->Ax:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AH:Landroid/widget/TextView;
 
     const p1, 0x7f0a004f
 
@@ -207,7 +207,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->Ay:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AJ:Landroid/widget/Button;
 
     const p1, 0x7f0a004c
 
@@ -221,7 +221,7 @@
 
     check-cast p1, Landroid/widget/ProgressBar;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->Az:Landroid/widget/ProgressBar;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AK:Landroid/widget/ProgressBar;
 
     const p1, 0x7f0a0050
 
@@ -235,7 +235,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AA:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AL:Landroid/widget/Button;
 
     const p1, 0x7f0a0046
 
@@ -249,7 +249,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AB:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AM:Landroid/widget/TextView;
 
     const p1, 0x7f0a0045
 
@@ -263,7 +263,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AC:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AN:Landroid/widget/TextView;
 
     return-void
 .end method
@@ -301,23 +301,23 @@
 
     invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView;->Au:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView;->AD:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->Av:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AF:Landroid/widget/ImageView;
 
     iget v0, p2, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->drawableRes:I
 
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->Av:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AF:Landroid/widget/ImageView;
 
     iget p2, p2, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->scaleX:F
 
     invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setScaleX(F)V
 
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->Aw:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AG:Landroid/widget/ImageView;
 
     invoke-virtual {p1, p3}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -325,17 +325,17 @@
 
     invoke-virtual {p1, p4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AB:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AM:Landroid/widget/TextView;
 
     const/4 p2, 0x0
 
     invoke-static {p1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AC:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AN:Landroid/widget/TextView;
 
     invoke-static {p1, p6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AC:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AN:Landroid/widget/TextView;
 
     invoke-static {}, Landroid/text/method/LinkMovementMethod;->getInstance()Landroid/text/method/MovementMethod;
 
@@ -343,7 +343,7 @@
 
     invoke-virtual {p1, p3}, Landroid/widget/TextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V
 
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->Ax:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AH:Landroid/widget/TextView;
 
     check-cast p1, Landroid/view/View;
 
@@ -357,23 +357,23 @@
 
     if-eqz p7, :cond_0
 
-    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->Ay:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->AJ:Landroid/widget/Button;
 
     invoke-virtual {p5, p7}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->Ay:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->AJ:Landroid/widget/Button;
 
     invoke-virtual {p5, p4}, Landroid/widget/Button;->setVisibility(I)V
 
     goto :goto_0
 
     :cond_0
-    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->Ay:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->AJ:Landroid/widget/Button;
 
     invoke-virtual {p5, p1}, Landroid/widget/Button;->setVisibility(I)V
 
     :goto_0
-    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->Ay:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->AJ:Landroid/widget/Button;
 
     new-instance p6, Lcom/discord/views/ActiveSubscriptionView$b;
 
@@ -383,7 +383,7 @@
 
     invoke-virtual {p5, p6}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->Ay:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->AJ:Landroid/widget/Button;
 
     check-cast p5, Landroid/view/View;
 
@@ -419,19 +419,19 @@
     :goto_2
     invoke-static {p5, p7, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;ZI)V
 
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->Az:Landroid/widget/ProgressBar;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AK:Landroid/widget/ProgressBar;
 
     check-cast p1, Landroid/view/View;
 
     invoke-static {p1, p9, p4, p3, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AA:Landroid/widget/Button;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AL:Landroid/widget/Button;
 
     check-cast p1, Landroid/widget/TextView;
 
     invoke-static {p1, p10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AA:Landroid/widget/Button;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AL:Landroid/widget/Button;
 
     new-instance p3, Lcom/discord/views/ActiveSubscriptionView$c;
 
@@ -469,17 +469,17 @@
 
     invoke-direct {p3, p5, p12}, Lcom/discord/views/ActiveSubscriptionView$a;-><init>(Landroid/content/Context;Ljava/util/List;)V
 
-    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->At:Landroid/widget/Spinner;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->AC:Landroid/widget/Spinner;
 
     invoke-virtual {p5, p2}, Landroid/widget/Spinner;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V
 
-    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->At:Landroid/widget/Spinner;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->AC:Landroid/widget/Spinner;
 
     check-cast p3, Landroid/widget/SpinnerAdapter;
 
     invoke-virtual {p2, p3}, Landroid/widget/Spinner;->setAdapter(Landroid/widget/SpinnerAdapter;)V
 
-    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->At:Landroid/widget/Spinner;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->AC:Landroid/widget/Spinner;
 
     new-instance p3, Lcom/discord/views/ActiveSubscriptionView$d;
 
@@ -489,28 +489,28 @@
 
     invoke-virtual {p2, p3}, Landroid/widget/Spinner;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V
 
-    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->At:Landroid/widget/Spinner;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->AC:Landroid/widget/Spinner;
 
     invoke-virtual {p2, p4}, Landroid/widget/Spinner;->setVisibility(I)V
 
-    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->As:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->AB:Landroid/widget/TextView;
 
     invoke-virtual {p2, p4}, Landroid/widget/TextView;->setVisibility(I)V
 
-    iget-object p0, p0, Lcom/discord/views/ActiveSubscriptionView;->At:Landroid/widget/Spinner;
+    iget-object p0, p0, Lcom/discord/views/ActiveSubscriptionView;->AC:Landroid/widget/Spinner;
 
     invoke-virtual {p0, p1}, Landroid/widget/Spinner;->setEnabled(Z)V
 
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->At:Landroid/widget/Spinner;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->AC:Landroid/widget/Spinner;
 
     const/16 p2, 0x8
 
     invoke-virtual {p1, p2}, Landroid/widget/Spinner;->setVisibility(I)V
 
-    iget-object p0, p0, Lcom/discord/views/ActiveSubscriptionView;->As:Landroid/widget/TextView;
+    iget-object p0, p0, Lcom/discord/views/ActiveSubscriptionView;->AB:Landroid/widget/TextView;
 
     invoke-virtual {p0, p2}, Landroid/widget/TextView;->setVisibility(I)V
 
diff --git a/com.discord/smali/com/discord/views/ApplicationNewsView$a$a.smali b/com.discord/smali/com/discord/views/ApplicationNewsView$a$a.smali
index 485e7e334e..6b378c281f 100644
--- a/com.discord/smali/com/discord/views/ApplicationNewsView$a$a.smali
+++ b/com.discord/smali/com/discord/views/ApplicationNewsView$a$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field final AY:I
+.field final Bh:I
 
-.field final AZ:I
+.field final Bi:I
 
 .field final url:Ljava/lang/String;
 
@@ -36,9 +36,9 @@
 
     iput-object p1, p0, Lcom/discord/views/ApplicationNewsView$a$a;->url:Ljava/lang/String;
 
-    iput p2, p0, Lcom/discord/views/ApplicationNewsView$a$a;->AY:I
+    iput p2, p0, Lcom/discord/views/ApplicationNewsView$a$a;->Bh:I
 
-    iput p3, p0, Lcom/discord/views/ApplicationNewsView$a$a;->AZ:I
+    iput p3, p0, Lcom/discord/views/ApplicationNewsView$a$a;->Bi:I
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/ApplicationNewsView$a$b.smali b/com.discord/smali/com/discord/views/ApplicationNewsView$a$b.smali
index 8c150eefde..7c7684b719 100644
--- a/com.discord/smali/com/discord/views/ApplicationNewsView$a$b.smali
+++ b/com.discord/smali/com/discord/views/ApplicationNewsView$a$b.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final Ba:Lcom/discord/views/ApplicationNewsView$a$b;
+.field public static final Bj:Lcom/discord/views/ApplicationNewsView$a$b;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/ApplicationNewsView$a$b;-><init>()V
 
-    sput-object v0, Lcom/discord/views/ApplicationNewsView$a$b;->Ba:Lcom/discord/views/ApplicationNewsView$a$b;
+    sput-object v0, Lcom/discord/views/ApplicationNewsView$a$b;->Bj:Lcom/discord/views/ApplicationNewsView$a$b;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/ApplicationNewsView$b.smali b/com.discord/smali/com/discord/views/ApplicationNewsView$b.smali
index 61c7ac1a26..8209b2d781 100644
--- a/com.discord/smali/com/discord/views/ApplicationNewsView$b.smali
+++ b/com.discord/smali/com/discord/views/ApplicationNewsView$b.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Bb:Lkotlin/jvm/functions/Function0;
+.field final synthetic Bk:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
 .method constructor <init>(Lkotlin/jvm/functions/Function0;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView$b;->Bb:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView$b;->Bk: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/views/ApplicationNewsView$b;->Bb:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView$b;->Bk:Lkotlin/jvm/functions/Function0;
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/views/ApplicationNewsView.smali b/com.discord/smali/com/discord/views/ApplicationNewsView.smali
index 8fcb2d4d6c..0201c8a6f6 100644
--- a/com.discord/smali/com/discord/views/ApplicationNewsView.smali
+++ b/com.discord/smali/com/discord/views/ApplicationNewsView.smali
@@ -12,23 +12,23 @@
 
 
 # instance fields
-.field public final AB:Landroid/widget/TextView;
+.field public final AM:Landroid/widget/TextView;
 
-.field public final AQ:Landroid/view/ViewGroup;
+.field public final AZ:Landroid/view/ViewGroup;
 
-.field private final AR:Landroid/widget/FrameLayout;
+.field private final Ba:Landroid/widget/FrameLayout;
 
-.field public final AS:Lcom/facebook/drawee/view/SimpleDraweeView;
+.field public final Bb:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-.field private final AT:Lcom/facebook/drawee/view/SimpleDraweeView;
+.field private final Bc:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-.field public final AU:Landroid/widget/TextView;
+.field public final Bd:Landroid/widget/TextView;
 
-.field public final AV:Landroid/widget/ImageView;
+.field public final Be:Landroid/widget/ImageView;
 
-.field public final AW:Landroid/view/ViewGroup;
+.field public final Bf:Landroid/view/ViewGroup;
 
-.field private final AX:Landroid/widget/Button;
+.field private final Bg:Landroid/widget/Button;
 
 .field public final titleTv:Landroid/widget/TextView;
 
@@ -51,7 +51,7 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d0073
+    const v1, 0x7f0d0079
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -67,7 +67,7 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AV:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Be:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0078
 
@@ -81,7 +81,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AW:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bf:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a0076
 
@@ -95,7 +95,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AQ:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AZ:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a007b
 
@@ -109,7 +109,7 @@
 
     check-cast p1, Landroid/widget/FrameLayout;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AR:Landroid/widget/FrameLayout;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ba:Landroid/widget/FrameLayout;
 
     const p1, 0x7f0a007c
 
@@ -123,7 +123,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AS:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bb:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const p1, 0x7f0a007e
 
@@ -137,7 +137,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AT:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bc:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const p1, 0x7f0a007a
 
@@ -151,7 +151,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AB:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AM:Landroid/widget/TextView;
 
     const p1, 0x7f0a007f
 
@@ -179,7 +179,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AU:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bd:Landroid/widget/TextView;
 
     const p1, 0x7f0a0079
 
@@ -193,7 +193,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AX:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bg:Landroid/widget/Button;
 
     return-void
 .end method
@@ -215,7 +215,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d0073
+    const v0, 0x7f0d0079
 
     invoke-static {p1, v0, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -231,7 +231,7 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AV:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Be:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0078
 
@@ -245,7 +245,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AW:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bf:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a0076
 
@@ -259,7 +259,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AQ:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AZ:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a007b
 
@@ -273,7 +273,7 @@
 
     check-cast p1, Landroid/widget/FrameLayout;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AR:Landroid/widget/FrameLayout;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ba:Landroid/widget/FrameLayout;
 
     const p1, 0x7f0a007c
 
@@ -287,7 +287,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AS:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bb:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const p1, 0x7f0a007e
 
@@ -301,7 +301,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AT:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bc:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const p1, 0x7f0a007a
 
@@ -315,7 +315,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AB:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AM:Landroid/widget/TextView;
 
     const p1, 0x7f0a007f
 
@@ -343,7 +343,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AU:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bd:Landroid/widget/TextView;
 
     const p1, 0x7f0a0079
 
@@ -357,7 +357,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AX:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bg:Landroid/widget/Button;
 
     return-void
 .end method
@@ -379,7 +379,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d0073
+    const p3, 0x7f0d0079
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -395,7 +395,7 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AV:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Be:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0078
 
@@ -409,7 +409,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AW:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bf:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a0076
 
@@ -423,7 +423,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AQ:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AZ:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a007b
 
@@ -437,7 +437,7 @@
 
     check-cast p1, Landroid/widget/FrameLayout;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AR:Landroid/widget/FrameLayout;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ba:Landroid/widget/FrameLayout;
 
     const p1, 0x7f0a007c
 
@@ -451,7 +451,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AS:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bb:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const p1, 0x7f0a007e
 
@@ -465,7 +465,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AT:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bc:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const p1, 0x7f0a007a
 
@@ -479,7 +479,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AB:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AM:Landroid/widget/TextView;
 
     const p1, 0x7f0a007f
 
@@ -507,7 +507,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AU:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bd:Landroid/widget/TextView;
 
     const p1, 0x7f0a0079
 
@@ -521,7 +521,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AX:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bg:Landroid/widget/Button;
 
     return-void
 .end method
@@ -572,7 +572,7 @@
 
     div-float/2addr p1, p2
 
-    iget-object p2, p0, Lcom/discord/views/ApplicationNewsView;->AR:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/discord/views/ApplicationNewsView;->Ba:Landroid/widget/FrameLayout;
 
     invoke-virtual {p2}, Landroid/widget/FrameLayout;->getWidth()I
 
@@ -620,7 +620,7 @@
 .method private final setHeaderContainerHeight(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->AR:Landroid/widget/FrameLayout;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Ba:Landroid/widget/FrameLayout;
 
     invoke-virtual {v0}, Landroid/widget/FrameLayout;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -628,7 +628,7 @@
 
     iput p1, v0, Landroid/view/ViewGroup$LayoutParams;->height:I
 
-    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AR:Landroid/widget/FrameLayout;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ba:Landroid/widget/FrameLayout;
 
     invoke-virtual {p1, v0}, Landroid/widget/FrameLayout;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
@@ -644,7 +644,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AT:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bc:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const/16 v0, 0x8
 
@@ -669,13 +669,13 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->AT:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Bc:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->AT:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Bc:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-object v1, v0
 
@@ -701,9 +701,9 @@
 
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
-    iget v0, p1, Lcom/discord/views/ApplicationNewsView$a$a;->AY:I
+    iget v0, p1, Lcom/discord/views/ApplicationNewsView$a$a;->Bh:I
 
-    iget p1, p1, Lcom/discord/views/ApplicationNewsView$a$a;->AZ:I
+    iget p1, p1, Lcom/discord/views/ApplicationNewsView$a$a;->Bi:I
 
     invoke-direct {p0, v0, p1}, Lcom/discord/views/ApplicationNewsView;->h(II)I
 
@@ -736,23 +736,23 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->AQ:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->AZ:Landroid/view/ViewGroup;
 
     const/16 v1, 0x8
 
     invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->AV:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Be:Landroid/widget/ImageView;
 
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->AW:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Bf:Landroid/view/ViewGroup;
 
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->AX:Landroid/widget/Button;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Bg:Landroid/widget/Button;
 
     new-instance v2, Lcom/discord/views/ApplicationNewsView$b;
 
@@ -762,17 +762,17 @@
 
     invoke-virtual {v0, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AS:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bb:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const/4 v0, 0x0
 
     invoke-virtual {p1, v0}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->AS:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Bb:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1, v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
 
-    sget-object p1, Lcom/discord/views/ApplicationNewsView$a$b;->Ba:Lcom/discord/views/ApplicationNewsView$a$b;
+    sget-object p1, Lcom/discord/views/ApplicationNewsView$a$b;->Bj:Lcom/discord/views/ApplicationNewsView$a$b;
 
     check-cast p1, Lcom/discord/views/ApplicationNewsView$a;
 
diff --git a/com.discord/smali/com/discord/views/BoxedButton.smali b/com.discord/smali/com/discord/views/BoxedButton.smali
index 381faa0040..f5e01648e2 100644
--- a/com.discord/smali/com/discord/views/BoxedButton.smali
+++ b/com.discord/smali/com/discord/views/BoxedButton.smali
@@ -8,9 +8,9 @@
 
 
 # instance fields
-.field private final Bc:Lkotlin/properties/ReadOnlyProperty;
+.field private final Bl:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Bd:Lkotlin/properties/ReadOnlyProperty;
+.field private final Bm:Lkotlin/properties/ReadOnlyProperty;
 
 
 # direct methods
@@ -81,21 +81,21 @@
 
     invoke-direct {p0, p1}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;)V
 
+    const p1, 0x7f0a010f
+
+    invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Bl:Lkotlin/properties/ReadOnlyProperty;
+
     const p1, 0x7f0a010e
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Bc:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a010d
-
-    invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Bd:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Bm:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
@@ -109,21 +109,21 @@
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
+    const p1, 0x7f0a010f
+
+    invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Bl:Lkotlin/properties/ReadOnlyProperty;
+
     const p1, 0x7f0a010e
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Bc:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a010d
-
-    invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Bd:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Bm:Lkotlin/properties/ReadOnlyProperty;
 
     invoke-direct {p0, p2}, Lcom/discord/views/BoxedButton;->a(Landroid/util/AttributeSet;)V
 
@@ -139,21 +139,21 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
+    const p1, 0x7f0a010f
+
+    invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Bl:Lkotlin/properties/ReadOnlyProperty;
+
     const p1, 0x7f0a010e
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Bc:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a010d
-
-    invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Bd:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Bm:Lkotlin/properties/ReadOnlyProperty;
 
     invoke-direct {p0, p2}, Lcom/discord/views/BoxedButton;->a(Landroid/util/AttributeSet;)V
 
@@ -208,7 +208,7 @@
 
     check-cast v1, Landroid/view/ViewGroup;
 
-    const v2, 0x7f0d0078
+    const v2, 0x7f0d007f
 
     invoke-static {v0, v2, v1}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -267,7 +267,7 @@
 
     invoke-virtual {v1, v0}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -290,7 +290,7 @@
 .method private final getBoxedTextView()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/BoxedButton;->Bd:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/BoxedButton;->Bm:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/BoxedButton;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -310,7 +310,7 @@
 .method private final getTextView()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/BoxedButton;->Bc:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/BoxedButton;->Bl:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/BoxedButton;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
diff --git a/com.discord/smali/com/discord/views/ChatActionItem.smali b/com.discord/smali/com/discord/views/ChatActionItem.smali
index a9882346bf..2164988c81 100644
--- a/com.discord/smali/com/discord/views/ChatActionItem.smali
+++ b/com.discord/smali/com/discord/views/ChatActionItem.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private Be:Landroid/widget/ImageView;
+.field private Bn:Landroid/widget/ImageView;
 
-.field private Bf:Lcom/discord/app/AppTextView;
+.field private Bo:Lcom/discord/app/AppTextView;
 
-.field private Bg:Lcom/discord/app/AppTextView;
+.field private Bp:Lcom/discord/app/AppTextView;
 
 
 # direct methods
@@ -92,11 +92,11 @@
 
     check-cast v1, Landroid/view/ViewGroup;
 
-    const v2, 0x7f0d007c
+    const v2, 0x7f0d0083
 
     invoke-static {v0, v2, v1}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const v0, 0x7f0a01be
+    const v0, 0x7f0a01bf
 
     invoke-virtual {p0, v0}, Lcom/discord/views/ChatActionItem;->findViewById(I)Landroid/view/View;
 
@@ -108,9 +108,9 @@
 
     check-cast v0, Lcom/discord/app/AppTextView;
 
-    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Bf:Lcom/discord/app/AppTextView;
+    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Bo:Lcom/discord/app/AppTextView;
 
-    const v0, 0x7f0a01bd
+    const v0, 0x7f0a01be
 
     invoke-virtual {p0, v0}, Lcom/discord/views/ChatActionItem;->findViewById(I)Landroid/view/View;
 
@@ -122,9 +122,9 @@
 
     check-cast v0, Lcom/discord/app/AppTextView;
 
-    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Bg:Lcom/discord/app/AppTextView;
+    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Bp:Lcom/discord/app/AppTextView;
 
-    const v0, 0x7f0a01bc
+    const v0, 0x7f0a01bd
 
     invoke-virtual {p0, v0}, Lcom/discord/views/ChatActionItem;->findViewById(I)Landroid/view/View;
 
@@ -136,7 +136,7 @@
 
     check-cast v0, Landroid/widget/ImageView;
 
-    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Be:Landroid/widget/ImageView;
+    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Bn:Landroid/widget/ImageView;
 
     invoke-virtual {p0}, Lcom/discord/views/ChatActionItem;->getContext()Landroid/content/Context;
 
@@ -150,13 +150,13 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/views/ChatActionItem;->Bf:Lcom/discord/app/AppTextView;
+    iget-object v0, p0, Lcom/discord/views/ChatActionItem;->Bo:Lcom/discord/app/AppTextView;
 
     if-nez v0, :cond_0
 
     const-string v1, "primaryText"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     const/4 v1, 0x3
@@ -169,13 +169,13 @@
 
     invoke-virtual {v0, v1, v3}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/discord/views/ChatActionItem;->Bg:Lcom/discord/app/AppTextView;
+    iget-object v0, p0, Lcom/discord/views/ChatActionItem;->Bp:Lcom/discord/app/AppTextView;
 
     if-nez v0, :cond_1
 
     const-string v1, "subtext"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     const/4 v1, 0x2
@@ -190,19 +190,19 @@
 
     const/4 v0, 0x1
 
-    const v1, 0x7f08010b
+    const v1, 0x7f080112
 
     invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getResourceId(II)I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/discord/views/ChatActionItem;->Be:Landroid/widget/ImageView;
+    iget-object v1, p0, Lcom/discord/views/ChatActionItem;->Bn:Landroid/widget/ImageView;
 
     const-string v3, "image"
 
     if-nez v1, :cond_2
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -223,11 +223,11 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v1, p0, Lcom/discord/views/ChatActionItem;->Be:Landroid/widget/ImageView;
+    iget-object v1, p0, Lcom/discord/views/ChatActionItem;->Bn:Landroid/widget/ImageView;
 
     if-nez v1, :cond_3
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setBackground(Landroid/graphics/drawable/Drawable;)V
diff --git a/com.discord/smali/com/discord/views/CheckableImageView.smali b/com.discord/smali/com/discord/views/CheckableImageView.smali
index c1f55181ec..878afe29c7 100644
--- a/com.discord/smali/com/discord/views/CheckableImageView.smali
+++ b/com.discord/smali/com/discord/views/CheckableImageView.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final Bh:[I
+.field private final Bq:[I
 
 .field private checked:Z
 
@@ -32,7 +32,7 @@
 
     aput v2, v0, v1
 
-    iput-object v0, p0, Lcom/discord/views/CheckableImageView;->Bh:[I
+    iput-object v0, p0, Lcom/discord/views/CheckableImageView;->Bq:[I
 
     if-eqz p2, :cond_0
 
@@ -99,7 +99,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/views/CheckableImageView;->Bh:[I
+    iget-object v0, p0, Lcom/discord/views/CheckableImageView;->Bq:[I
 
     invoke-static {p1, v0}, Landroidx/appcompat/widget/AppCompatImageView;->mergeDrawableStates([I[I)[I
 
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$b.smali b/com.discord/smali/com/discord/views/CheckedSetting$b.smali
index 6c771acdce..bd04fd32d6 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$b.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$b.smali
@@ -29,17 +29,17 @@
 
 
 # static fields
-.field public static final Bn:I
+.field private static final BA:[I
 
-.field public static final Bo:I
+.field public static final BB:Lcom/discord/views/CheckedSetting$b$a;
 
-.field public static final Bp:I
+.field public static final Bw:I
 
-.field private static final synthetic Bq:[I
+.field public static final Bx:I
 
-.field private static final Br:[I
+.field public static final By:I
 
-.field public static final Bs:Lcom/discord/views/CheckedSetting$b$a;
+.field private static final synthetic Bz:[I
 
 
 # direct methods
@@ -54,15 +54,15 @@
 
     const/4 v2, 0x1
 
-    sput v2, Lcom/discord/views/CheckedSetting$b;->Bn:I
+    sput v2, Lcom/discord/views/CheckedSetting$b;->Bw:I
 
     const/4 v2, 0x2
 
-    sput v2, Lcom/discord/views/CheckedSetting$b;->Bo:I
+    sput v2, Lcom/discord/views/CheckedSetting$b;->Bx:I
 
-    sput v0, Lcom/discord/views/CheckedSetting$b;->Bp:I
+    sput v0, Lcom/discord/views/CheckedSetting$b;->By:I
 
-    sput-object v1, Lcom/discord/views/CheckedSetting$b;->Bq:[I
+    sput-object v1, Lcom/discord/views/CheckedSetting$b;->Bz:[I
 
     new-instance v0, Lcom/discord/views/CheckedSetting$b$a;
 
@@ -70,13 +70,13 @@
 
     invoke-direct {v0, v1}, Lcom/discord/views/CheckedSetting$b$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/views/CheckedSetting$b;->Bs:Lcom/discord/views/CheckedSetting$b$a;
+    sput-object v0, Lcom/discord/views/CheckedSetting$b;->BB:Lcom/discord/views/CheckedSetting$b$a;
 
-    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eB()[I
+    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eF()[I
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/views/CheckedSetting$b;->Br:[I
+    sput-object v0, Lcom/discord/views/CheckedSetting$b;->BA:[I
 
     return-void
 
@@ -90,18 +90,18 @@
     .end array-data
 .end method
 
-.method public static final synthetic eA()[I
+.method public static final synthetic eE()[I
     .locals 1
 
-    sget-object v0, Lcom/discord/views/CheckedSetting$b;->Br:[I
+    sget-object v0, Lcom/discord/views/CheckedSetting$b;->BA:[I
 
     return-object v0
 .end method
 
-.method public static eB()[I
+.method public static eF()[I
     .locals 1
 
-    sget-object v0, Lcom/discord/views/CheckedSetting$b;->Bq:[I
+    sget-object v0, Lcom/discord/views/CheckedSetting$b;->Bz:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$c.smali b/com.discord/smali/com/discord/views/CheckedSetting$c.smali
index 3801117687..0e513c0038 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$c.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$c.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/CheckedSetting;->aj(Ljava/lang/String;)V
+    value = Lcom/discord/views/CheckedSetting;->af(Ljava/lang/String;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic Bt:Lcom/discord/views/CheckedSetting;
+.field final synthetic BC:Lcom/discord/views/CheckedSetting;
 
-.field final synthetic Bu:Ljava/lang/String;
+.field final synthetic BD:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/CheckedSetting;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/CheckedSetting$c;->Bt:Lcom/discord/views/CheckedSetting;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$c;->BC:Lcom/discord/views/CheckedSetting;
 
-    iput-object p2, p0, Lcom/discord/views/CheckedSetting$c;->Bu:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/views/CheckedSetting$c;->BD:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,17 +41,17 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/views/CheckedSetting$c;->Bu:Ljava/lang/String;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$c;->BD:Ljava/lang/String;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/views/CheckedSetting$c;->Bt:Lcom/discord/views/CheckedSetting;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$c;->BC:Lcom/discord/views/CheckedSetting;
 
     invoke-virtual {p1}, Lcom/discord/views/CheckedSetting;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting$c;->Bu:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting$c;->BD:Ljava/lang/String;
 
     check-cast v0, Ljava/lang/CharSequence;
 
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$d.smali b/com.discord/smali/com/discord/views/CheckedSetting$d.smali
index b2d0b22873..78bf5eedf9 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$d.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$d.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Bt:Lcom/discord/views/CheckedSetting;
+.field final synthetic BC:Lcom/discord/views/CheckedSetting;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/CheckedSetting;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/CheckedSetting$d;->Bt:Lcom/discord/views/CheckedSetting;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$d;->BC:Lcom/discord/views/CheckedSetting;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/views/CheckedSetting$d;->Bt:Lcom/discord/views/CheckedSetting;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$d;->BC:Lcom/discord/views/CheckedSetting;
 
     invoke-static {p1}, Lcom/discord/views/CheckedSetting;->b(Lcom/discord/views/CheckedSetting;)Landroid/widget/CompoundButton;
 
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$e.smali b/com.discord/smali/com/discord/views/CheckedSetting$e.smali
index 29297c7265..3d48b04484 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$e.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$e.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Bt:Lcom/discord/views/CheckedSetting;
+.field final synthetic BC:Lcom/discord/views/CheckedSetting;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/CheckedSetting;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/CheckedSetting$e;->Bt:Lcom/discord/views/CheckedSetting;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$e;->BC:Lcom/discord/views/CheckedSetting;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,13 +37,13 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/views/CheckedSetting$e;->Bt:Lcom/discord/views/CheckedSetting;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$e;->BC:Lcom/discord/views/CheckedSetting;
 
     invoke-static {p1}, Lcom/discord/views/CheckedSetting;->b(Lcom/discord/views/CheckedSetting;)Landroid/widget/CompoundButton;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting$e;->Bt:Lcom/discord/views/CheckedSetting;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting$e;->BC:Lcom/discord/views/CheckedSetting;
 
     invoke-static {v0}, Lcom/discord/views/CheckedSetting;->b(Lcom/discord/views/CheckedSetting;)Landroid/widget/CompoundButton;
 
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$f.smali b/com.discord/smali/com/discord/views/CheckedSetting$f.smali
index 23956de458..6aed2ce2f2 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$f.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$f.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Bv:Lrx/functions/Action1;
+.field final synthetic BE:Lrx/functions/Action1;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Action1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/CheckedSetting$f;->Bv:Lrx/functions/Action1;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$f;->BE:Lrx/functions/Action1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onCheckedChanged(Landroid/widget/CompoundButton;Z)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/views/CheckedSetting$f;->Bv:Lrx/functions/Action1;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$f;->BE:Lrx/functions/Action1;
 
     if-eqz p1, :cond_0
 
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$g.smali b/com.discord/smali/com/discord/views/CheckedSetting$g.smali
index bd6cfc5a2a..153aa0c375 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$g.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$g.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Bw:Lrx/functions/Action0;
+.field final synthetic BF:Lrx/functions/Action0;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Action0;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/CheckedSetting$g;->Bw:Lrx/functions/Action0;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$g;->BF:Lrx/functions/Action0;
 
     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/views/CheckedSetting$g;->Bw:Lrx/functions/Action0;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$g;->BF:Lrx/functions/Action0;
 
     invoke-interface {p1}, Lrx/functions/Action0;->call()V
 
diff --git a/com.discord/smali/com/discord/views/CheckedSetting.smali b/com.discord/smali/com/discord/views/CheckedSetting.smali
index 3728302894..1e1e2e8f37 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting.smali
@@ -16,14 +16,14 @@
 
 
 # static fields
-.field public static final Bm:Lcom/discord/views/CheckedSetting$a;
+.field public static final Bv:Lcom/discord/views/CheckedSetting$a;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
 
 # instance fields
-.field private Bi:Lrx/functions/Action1;
+.field private Br:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -33,11 +33,11 @@
     .end annotation
 .end field
 
-.field private Bj:Landroid/widget/CompoundButton;
+.field private Bs:Landroid/widget/CompoundButton;
 
-.field private Bk:Landroid/widget/TextView;
+.field private Bt:Landroid/widget/TextView;
 
-.field private Bl:Landroid/widget/TextView;
+.field private Bu:Landroid/widget/TextView;
 
 .field private container:Landroid/view/View;
 
@@ -52,7 +52,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/views/CheckedSetting$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/views/CheckedSetting;->Bm:Lcom/discord/views/CheckedSetting$a;
+    sput-object v0, Lcom/discord/views/CheckedSetting;->Bv:Lcom/discord/views/CheckedSetting$a;
 
     return-void
 .end method
@@ -108,7 +108,7 @@
 
     if-nez p2, :cond_0
 
-    sget p1, Lcom/discord/views/CheckedSetting$b;->Bn:I
+    sget p1, Lcom/discord/views/CheckedSetting$b;->Bw:I
 
     invoke-direct {p0, p1}, Lcom/discord/views/CheckedSetting;->E(I)V
 
@@ -130,7 +130,7 @@
     const/16 p2, 0xd
 
     :try_start_0
-    sget p3, Lcom/discord/views/CheckedSetting$b;->Bn:I
+    sget p3, Lcom/discord/views/CheckedSetting$b;->Bw:I
 
     const/4 v1, 0x1
 
@@ -140,9 +140,9 @@
 
     move-result p2
 
-    sget-object p3, Lcom/discord/views/CheckedSetting$b;->Bs:Lcom/discord/views/CheckedSetting$b$a;
+    sget-object p3, Lcom/discord/views/CheckedSetting$b;->BB:Lcom/discord/views/CheckedSetting$b$a;
 
-    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eA()[I
+    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eE()[I
 
     move-result-object p3
 
@@ -169,11 +169,11 @@
     if-lez v4, :cond_2
 
     :try_start_1
-    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->Bk:Landroid/widget/TextView;
+    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->Bt:Landroid/widget/TextView;
 
     if-nez v4, :cond_1
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {v4, v0, p2}, Landroid/widget/TextView;->setTextSize(IF)V
@@ -187,21 +187,21 @@
 
     if-eqz p2, :cond_4
 
-    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->Bk:Landroid/widget/TextView;
+    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->Bt:Landroid/widget/TextView;
 
     if-nez v4, :cond_3
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-virtual {v4, p2}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
 
     :cond_4
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bk:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bt:Landroid/widget/TextView;
 
     if-nez p2, :cond_5
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_5
     const/16 v4, 0x9
@@ -210,17 +210,17 @@
 
     move-result-object v4
 
-    invoke-static {v4}, Lcom/discord/views/CheckedSetting;->ak(Ljava/lang/String;)Ljava/lang/CharSequence;
+    invoke-static {v4}, Lcom/discord/views/CheckedSetting;->ag(Ljava/lang/String;)Ljava/lang/CharSequence;
 
     move-result-object v4
 
     invoke-virtual {p2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bk:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bt:Landroid/widget/TextView;
 
     if-nez p2, :cond_6
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_6
     const/4 v4, 0x3
@@ -233,11 +233,11 @@
 
     invoke-virtual {p2, v4}, Landroid/widget/TextView;->setCompoundDrawablePadding(I)V
 
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bk:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bt:Landroid/widget/TextView;
 
     if-nez p2, :cond_7
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_7
     const/4 v4, 0x2
@@ -274,11 +274,11 @@
 
     if-eq p2, v4, :cond_9
 
-    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->Bk:Landroid/widget/TextView;
+    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->Bt:Landroid/widget/TextView;
 
     if-nez v4, :cond_8
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_8
     invoke-virtual {p0}, Lcom/discord/views/CheckedSetting;->getContext()Landroid/content/Context;
@@ -298,7 +298,7 @@
 
     move-result-object p2
 
-    invoke-static {p2}, Lcom/discord/views/CheckedSetting;->ak(Ljava/lang/String;)Ljava/lang/CharSequence;
+    invoke-static {p2}, Lcom/discord/views/CheckedSetting;->ag(Ljava/lang/String;)Ljava/lang/CharSequence;
 
     move-result-object p2
 
@@ -326,11 +326,11 @@
     if-eqz v1, :cond_d
 
     :try_start_2
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bl:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bu:Landroid/widget/TextView;
 
     if-nez p2, :cond_c
 
-    invoke-static {v4}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_c
     invoke-virtual {p2, v3}, Landroid/widget/TextView;->setVisibility(I)V
@@ -338,20 +338,20 @@
     goto :goto_1
 
     :cond_d
-    iget-object v1, p0, Lcom/discord/views/CheckedSetting;->Bl:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/views/CheckedSetting;->Bu:Landroid/widget/TextView;
 
     if-nez v1, :cond_e
 
-    invoke-static {v4}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_e
     invoke-virtual {v1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bl:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bu:Landroid/widget/TextView;
 
     if-nez p2, :cond_f
 
-    invoke-static {v4}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_f
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setVisibility(I)V
@@ -365,11 +365,11 @@
 
     if-lez p3, :cond_11
 
-    iget-object p3, p0, Lcom/discord/views/CheckedSetting;->Bl:Landroid/widget/TextView;
+    iget-object p3, p0, Lcom/discord/views/CheckedSetting;->Bu:Landroid/widget/TextView;
 
     if-nez p3, :cond_10
 
-    invoke-static {v4}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_10
     invoke-virtual {p3, v0, p2}, Landroid/widget/TextView;->setTextSize(IF)V
@@ -383,11 +383,11 @@
 
     if-eqz p2, :cond_13
 
-    iget-object p3, p0, Lcom/discord/views/CheckedSetting;->Bl:Landroid/widget/TextView;
+    iget-object p3, p0, Lcom/discord/views/CheckedSetting;->Bu:Landroid/widget/TextView;
 
     if-nez p3, :cond_12
 
-    invoke-static {v4}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_12
     invoke-virtual {p3, p2}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
@@ -404,7 +404,7 @@
     goto :goto_2
 
     :cond_14
-    const p2, 0x7f0800d8
+    const p2, 0x7f0800dc
 
     invoke-virtual {p0, p2}, Lcom/discord/views/CheckedSetting;->setBackgroundResource(I)V
     :try_end_2
@@ -466,7 +466,7 @@
 
     if-ne v0, v1, :cond_0
 
-    const v0, 0x7f0d00a6
+    const v0, 0x7f0d00ae
 
     goto :goto_0
 
@@ -478,12 +478,12 @@
     throw p1
 
     :cond_1
-    const v0, 0x7f0d00a5
+    const v0, 0x7f0d00ad
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f0d00a4
+    const v0, 0x7f0d00ac
 
     :goto_0
     invoke-virtual {p0}, Lcom/discord/views/CheckedSetting;->getContext()Landroid/content/Context;
@@ -496,7 +496,7 @@
 
     invoke-static {v1, v0, v2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const v0, 0x7f0a064c
+    const v0, 0x7f0a0666
 
     invoke-virtual {p0, v0}, Lcom/discord/views/CheckedSetting;->findViewById(I)Landroid/view/View;
 
@@ -508,9 +508,9 @@
 
     check-cast v0, Landroid/widget/TextView;
 
-    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->Bk:Landroid/widget/TextView;
+    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->Bt:Landroid/widget/TextView;
 
-    const v0, 0x7f0a064d
+    const v0, 0x7f0a0667
 
     invoke-virtual {p0, v0}, Lcom/discord/views/CheckedSetting;->findViewById(I)Landroid/view/View;
 
@@ -522,9 +522,9 @@
 
     check-cast v0, Landroid/widget/TextView;
 
-    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->Bl:Landroid/widget/TextView;
+    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->Bu:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0649
+    const v0, 0x7f0a0663
 
     invoke-virtual {p0, v0}, Lcom/discord/views/CheckedSetting;->findViewById(I)Landroid/view/View;
 
@@ -536,9 +536,9 @@
 
     check-cast v0, Landroid/widget/CompoundButton;
 
-    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->Bj:Landroid/widget/CompoundButton;
+    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->Bs:Landroid/widget/CompoundButton;
 
-    const v0, 0x7f0a064a
+    const v0, 0x7f0a0664
 
     invoke-virtual {p0, v0}, Lcom/discord/views/CheckedSetting;->findViewById(I)Landroid/view/View;
 
@@ -550,7 +550,7 @@
 
     iput-object v0, p0, Lcom/discord/views/CheckedSetting;->container:Landroid/view/View;
 
-    sget v0, Lcom/discord/views/CheckedSetting$b;->Bo:I
+    sget v0, Lcom/discord/views/CheckedSetting$b;->Bx:I
 
     const-string v1, "container"
 
@@ -560,7 +560,7 @@
 
     if-nez p1, :cond_3
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     new-instance v0, Lcom/discord/views/CheckedSetting$d;
@@ -578,7 +578,7 @@
 
     if-nez p1, :cond_5
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_5
     new-instance v0, Lcom/discord/views/CheckedSetting$e;
@@ -597,7 +597,7 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, v0}, Lcom/discord/views/CheckedSetting;->aj(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/discord/views/CheckedSetting;->af(Ljava/lang/String;)V
 
     return-void
 .end method
@@ -612,7 +612,7 @@
     return-void
 .end method
 
-.method private static ak(Ljava/lang/String;)Ljava/lang/CharSequence;
+.method private static ag(Ljava/lang/String;)Ljava/lang/CharSequence;
     .locals 0
 
     if-eqz p0, :cond_0
@@ -634,13 +634,13 @@
 .method public static final synthetic b(Lcom/discord/views/CheckedSetting;)Landroid/widget/CompoundButton;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/views/CheckedSetting;->Bj:Landroid/widget/CompoundButton;
+    iget-object p0, p0, Lcom/discord/views/CheckedSetting;->Bs:Landroid/widget/CompoundButton;
 
     if-nez p0, :cond_0
 
     const-string v0, "compoundButton"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -659,7 +659,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lcom/discord/views/CheckedSetting;->aj(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/views/CheckedSetting;->af(Ljava/lang/String;)V
 
     return-void
 .end method
@@ -677,7 +677,7 @@
 
     const-string v1, "container"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0, p1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
@@ -692,24 +692,24 @@
 .method public final a(Ljava/lang/CharSequence;Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bl:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bu:Landroid/widget/TextView;
 
     const-string v1, "subLabel"
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     if-eqz p2, :cond_2
 
-    iget-object p1, p0, Lcom/discord/views/CheckedSetting;->Bl:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting;->Bu:Landroid/widget/TextView;
 
     if-nez p1, :cond_1
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-static {}, Landroid/text/method/LinkMovementMethod;->getInstance()Landroid/text/method/MovementMethod;
@@ -722,7 +722,7 @@
     return-void
 .end method
 
-.method public final aj(Ljava/lang/String;)V
+.method public final af(Ljava/lang/String;)V
     .locals 2
 
     iget-object v0, p0, Lcom/discord/views/CheckedSetting;->container:Landroid/view/View;
@@ -731,7 +731,7 @@
 
     const-string v1, "container"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v1, Lcom/discord/views/CheckedSetting$c;
@@ -756,38 +756,38 @@
 
     if-nez p2, :cond_2
 
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bj:Landroid/widget/CompoundButton;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bs:Landroid/widget/CompoundButton;
 
     if-nez p2, :cond_0
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     const/4 v1, 0x0
 
     invoke-virtual {p2, v1}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
 
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bj:Landroid/widget/CompoundButton;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bs:Landroid/widget/CompoundButton;
 
     if-nez p2, :cond_1
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {p2, p1}, Landroid/widget/CompoundButton;->setChecked(Z)V
 
-    iget-object p1, p0, Lcom/discord/views/CheckedSetting;->Bi:Lrx/functions/Action1;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting;->Br:Lrx/functions/Action1;
 
     invoke-virtual {p0, p1}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
 
     return-void
 
     :cond_2
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bj:Landroid/widget/CompoundButton;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Bs:Landroid/widget/CompoundButton;
 
     if-nez p2, :cond_3
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-virtual {p2, p1}, Landroid/widget/CompoundButton;->setChecked(Z)V
@@ -838,13 +838,13 @@
 .method public final isChecked()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bj:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bs:Landroid/widget/CompoundButton;
 
     if-nez v0, :cond_0
 
     const-string v1, "compoundButton"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Landroid/widget/CompoundButton;->isChecked()Z
@@ -865,13 +865,13 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bj:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bs:Landroid/widget/CompoundButton;
 
     if-nez v0, :cond_0
 
     const-string v1, "compoundButton"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     move-object v1, p1
@@ -942,13 +942,13 @@
 .method public final setButtonAlpha(F)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bj:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bs:Landroid/widget/CompoundButton;
 
     if-nez v0, :cond_0
 
     const-string v1, "compoundButton"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0, p1}, Landroid/widget/CompoundButton;->setAlpha(F)V
@@ -977,15 +977,15 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/views/CheckedSetting;->Bi:Lrx/functions/Action1;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting;->Br:Lrx/functions/Action1;
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bj:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bs:Landroid/widget/CompoundButton;
 
     if-nez v0, :cond_0
 
     const-string v1, "compoundButton"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v1, Lcom/discord/views/CheckedSetting$f;
@@ -1012,13 +1012,13 @@
 .method public final setSubtextColor(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bl:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bu:Landroid/widget/TextView;
 
     if-nez v0, :cond_0
 
     const-string v1, "subLabel"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setTextColor(I)V
@@ -1033,13 +1033,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bl:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bu:Landroid/widget/TextView;
 
     if-nez v0, :cond_0
 
     const-string v1, "subLabel"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v1, Lcom/discord/views/CheckedSetting$g;
@@ -1056,13 +1056,13 @@
 .method public final setText(Ljava/lang/CharSequence;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bk:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bt:Landroid/widget/TextView;
 
     if-nez v0, :cond_0
 
     const-string v1, "label"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
@@ -1073,13 +1073,13 @@
 .method public final setTextColor(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bk:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bt:Landroid/widget/TextView;
 
     if-nez v0, :cond_0
 
     const-string v1, "label"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setTextColor(I)V
@@ -1090,13 +1090,13 @@
 .method public final toggle()V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bj:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Bs:Landroid/widget/CompoundButton;
 
     if-nez v0, :cond_0
 
     const-string v1, "compoundButton"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Landroid/widget/CompoundButton;->isChecked()Z
diff --git a/com.discord/smali/com/discord/views/CustomAppBarLayout$a.smali b/com.discord/smali/com/discord/views/CustomAppBarLayout$a.smali
index 7f638eac03..d3a18255e9 100644
--- a/com.discord/smali/com/discord/views/CustomAppBarLayout$a.smali
+++ b/com.discord/smali/com/discord/views/CustomAppBarLayout$a.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final BA:Lcom/discord/views/CustomAppBarLayout$a;
+.field public static final BJ:Lcom/discord/views/CustomAppBarLayout$a;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/CustomAppBarLayout$a;-><init>()V
 
-    sput-object v0, Lcom/discord/views/CustomAppBarLayout$a;->BA:Lcom/discord/views/CustomAppBarLayout$a;
+    sput-object v0, Lcom/discord/views/CustomAppBarLayout$a;->BJ:Lcom/discord/views/CustomAppBarLayout$a;
 
     return-void
 .end method
@@ -63,7 +63,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Number;->floatValue()F
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 c61670b921..ab51415d06 100644
--- a/com.discord/smali/com/discord/views/CustomAppBarLayout$b.smali
+++ b/com.discord/smali/com/discord/views/CustomAppBarLayout$b.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic BB:Lcom/discord/views/CustomAppBarLayout;
+.field final synthetic BK:Lcom/discord/views/CustomAppBarLayout;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/CustomAppBarLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout$b;->BB:Lcom/discord/views/CustomAppBarLayout;
+    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout$b;->BK:Lcom/discord/views/CustomAppBarLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -67,7 +67,7 @@
     div-float p1, p2, p1
 
     :goto_0
-    iget-object p2, p0, Lcom/discord/views/CustomAppBarLayout$b;->BB:Lcom/discord/views/CustomAppBarLayout;
+    iget-object p2, p0, Lcom/discord/views/CustomAppBarLayout$b;->BK:Lcom/discord/views/CustomAppBarLayout;
 
     invoke-static {p2}, Lcom/discord/views/CustomAppBarLayout;->a(Lcom/discord/views/CustomAppBarLayout;)F
 
@@ -77,11 +77,11 @@
 
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Lcom/discord/views/CustomAppBarLayout$b;->BB:Lcom/discord/views/CustomAppBarLayout;
+    iget-object p2, p0, Lcom/discord/views/CustomAppBarLayout$b;->BK:Lcom/discord/views/CustomAppBarLayout;
 
     invoke-static {p2, p1}, Lcom/discord/views/CustomAppBarLayout;->a(Lcom/discord/views/CustomAppBarLayout;F)V
 
-    iget-object p2, p0, Lcom/discord/views/CustomAppBarLayout$b;->BB:Lcom/discord/views/CustomAppBarLayout;
+    iget-object p2, p0, Lcom/discord/views/CustomAppBarLayout$b;->BK:Lcom/discord/views/CustomAppBarLayout;
 
     invoke-static {p2}, Lcom/discord/views/CustomAppBarLayout;->b(Lcom/discord/views/CustomAppBarLayout;)Lkotlin/jvm/functions/Function1;
 
diff --git a/com.discord/smali/com/discord/views/CustomAppBarLayout.smali b/com.discord/smali/com/discord/views/CustomAppBarLayout.smali
index cccdcc6a2c..d72eb345c5 100644
--- a/com.discord/smali/com/discord/views/CustomAppBarLayout.smali
+++ b/com.discord/smali/com/discord/views/CustomAppBarLayout.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private Bx:F
+.field private BG:F
 
-.field private final By:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
+.field private final BH:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
 
-.field private Bz:Lkotlin/jvm/functions/Function1;
+.field private BI:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -49,13 +49,13 @@
 
     check-cast p1, Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
 
-    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->By:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
+    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->BH:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
 
-    sget-object p1, Lcom/discord/views/CustomAppBarLayout$a;->BA:Lcom/discord/views/CustomAppBarLayout$a;
+    sget-object p1, Lcom/discord/views/CustomAppBarLayout$a;->BJ:Lcom/discord/views/CustomAppBarLayout$a;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->Bz:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->BI:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -78,7 +78,7 @@
 .method public static final synthetic a(Lcom/discord/views/CustomAppBarLayout;)F
     .locals 0
 
-    iget p0, p0, Lcom/discord/views/CustomAppBarLayout;->Bx:F
+    iget p0, p0, Lcom/discord/views/CustomAppBarLayout;->BG:F
 
     return p0
 .end method
@@ -86,7 +86,7 @@
 .method public static final synthetic a(Lcom/discord/views/CustomAppBarLayout;F)V
     .locals 0
 
-    iput p1, p0, Lcom/discord/views/CustomAppBarLayout;->Bx:F
+    iput p1, p0, Lcom/discord/views/CustomAppBarLayout;->BG:F
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 .method public static final synthetic b(Lcom/discord/views/CustomAppBarLayout;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/views/CustomAppBarLayout;->Bz:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lcom/discord/views/CustomAppBarLayout;->BI:Lkotlin/jvm/functions/Function1;
 
     return-object p0
 .end method
@@ -104,7 +104,7 @@
 .method public final isCollapsed()Z
     .locals 2
 
-    iget v0, p0, Lcom/discord/views/CustomAppBarLayout;->Bx:F
+    iget v0, p0, Lcom/discord/views/CustomAppBarLayout;->BG:F
 
     const/high16 v1, 0x3f800000    # 1.0f
 
@@ -127,7 +127,7 @@
 
     invoke-super {p0}, Lcom/google/android/material/appbar/AppBarLayout;->onAttachedToWindow()V
 
-    iget-object v0, p0, Lcom/discord/views/CustomAppBarLayout;->By:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
+    iget-object v0, p0, Lcom/discord/views/CustomAppBarLayout;->BH:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
 
     invoke-virtual {p0, v0}, Lcom/discord/views/CustomAppBarLayout;->addOnOffsetChangedListener(Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;)V
 
@@ -137,7 +137,7 @@
 .method protected final onDetachedFromWindow()V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/views/CustomAppBarLayout;->By:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
+    iget-object v0, p0, Lcom/discord/views/CustomAppBarLayout;->BH:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
 
     invoke-virtual {p0, v0}, Lcom/discord/views/CustomAppBarLayout;->removeOnOffsetChangedListener(Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;)V
 
@@ -163,7 +163,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->Bz:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->BI:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView$a.smali b/com.discord/smali/com/discord/views/DigitVerificationView$a.smali
index cb4c22f124..beac517c63 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView$a.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView$a.smali
@@ -36,7 +36,7 @@
 
     if-eqz p0, :cond_0
 
-    sget-object v0, Lcom/discord/views/DigitVerificationView;->BE:Lcom/discord/views/DigitVerificationView$a;
+    sget-object v0, Lcom/discord/views/DigitVerificationView;->BN:Lcom/discord/views/DigitVerificationView$a;
 
     const/4 v0, 0x1
 
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView$b.smali b/com.discord/smali/com/discord/views/DigitVerificationView$b.smali
index 8ed579ca7e..c5be03618d 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView$b.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView$b.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final BF:Lkotlin/jvm/functions/Function0;
+.field private final BO:Lkotlin/jvm/functions/Function0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function0<",
@@ -28,9 +28,9 @@
     .end annotation
 .end field
 
-.field private final BG:Landroid/widget/EditText;
+.field private final BP:Landroid/widget/EditText;
 
-.field private final BH:Landroid/widget/EditText;
+.field private final BQ:Landroid/widget/EditText;
 
 
 # direct methods
@@ -54,11 +54,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->BF:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->BO:Lkotlin/jvm/functions/Function0;
 
-    iput-object p2, p0, Lcom/discord/views/DigitVerificationView$b;->BG:Landroid/widget/EditText;
+    iput-object p2, p0, Lcom/discord/views/DigitVerificationView$b;->BP:Landroid/widget/EditText;
 
-    iput-object p3, p0, Lcom/discord/views/DigitVerificationView$b;->BH:Landroid/widget/EditText;
+    iput-object p3, p0, Lcom/discord/views/DigitVerificationView$b;->BQ:Landroid/widget/EditText;
 
     return-void
 .end method
@@ -92,17 +92,17 @@
 
     if-lez p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->BG:Landroid/widget/EditText;
+    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->BP:Landroid/widget/EditText;
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->BH:Landroid/widget/EditText;
+    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->BQ:Landroid/widget/EditText;
 
     :goto_0
-    sget-object p2, Lcom/discord/views/DigitVerificationView;->BE:Lcom/discord/views/DigitVerificationView$a;
+    sget-object p2, Lcom/discord/views/DigitVerificationView;->BN:Lcom/discord/views/DigitVerificationView$a;
 
-    iget-object p2, p0, Lcom/discord/views/DigitVerificationView$b;->BF:Lkotlin/jvm/functions/Function0;
+    iget-object p2, p0, Lcom/discord/views/DigitVerificationView$b;->BO:Lkotlin/jvm/functions/Function0;
 
     invoke-static {p1, p2}, Lcom/discord/views/DigitVerificationView$a;->a(Landroid/widget/EditText;Lkotlin/jvm/functions/Function0;)V
 
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView$c.smali b/com.discord/smali/com/discord/views/DigitVerificationView$c.smali
index d9cc61069b..33279e1ade 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView$c.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView$c.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final BD:Ljava/util/List;
+.field private final BM:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final BF:Lkotlin/jvm/functions/Function0;
+.field private final BO:Lkotlin/jvm/functions/Function0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function0<",
@@ -76,9 +76,9 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/view/text/TextWatcher;-><init>(Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$c;->BF:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$c;->BO:Lkotlin/jvm/functions/Function0;
 
-    iput-object p2, p0, Lcom/discord/views/DigitVerificationView$c;->BD:Ljava/util/List;
+    iput-object p2, p0, Lcom/discord/views/DigitVerificationView$c;->BM:Ljava/util/List;
 
     iput p3, p0, Lcom/discord/views/DigitVerificationView$c;->index:I
 
@@ -96,7 +96,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/utilities/view/text/TextWatcher;->afterTextChanged(Landroid/text/Editable;)V
 
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView$c;->BD:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView$c;->BM:Ljava/util/List;
 
     iget v1, p0, Lcom/discord/views/DigitVerificationView$c;->index:I
 
@@ -116,7 +116,7 @@
 
     if-le v1, v2, :cond_1
 
-    iget-object v1, p0, Lcom/discord/views/DigitVerificationView$c;->BD:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/views/DigitVerificationView$c;->BM:Ljava/util/List;
 
     iget v3, p0, Lcom/discord/views/DigitVerificationView$c;->index:I
 
@@ -142,7 +142,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lcom/discord/views/DigitVerificationView;->BE:Lcom/discord/views/DigitVerificationView$a;
+    sget-object v1, Lcom/discord/views/DigitVerificationView;->BN:Lcom/discord/views/DigitVerificationView$a;
 
     invoke-static {v0, v2}, Lcom/discord/views/DigitVerificationView$a;->a(Landroid/widget/EditText;Z)V
 
@@ -186,7 +186,7 @@
 
     if-eqz v0, :cond_3
 
-    sget-object p1, Lcom/discord/views/DigitVerificationView;->BE:Lcom/discord/views/DigitVerificationView$a;
+    sget-object p1, Lcom/discord/views/DigitVerificationView;->BN:Lcom/discord/views/DigitVerificationView$a;
 
     invoke-static {v0, v1}, Lcom/discord/views/DigitVerificationView$a;->a(Landroid/widget/EditText;Z)V
 
@@ -198,9 +198,9 @@
     return-void
 
     :cond_4
-    sget-object p1, Lcom/discord/views/DigitVerificationView;->BE:Lcom/discord/views/DigitVerificationView$a;
+    sget-object p1, Lcom/discord/views/DigitVerificationView;->BN:Lcom/discord/views/DigitVerificationView$a;
 
-    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$c;->BF:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$c;->BO:Lkotlin/jvm/functions/Function0;
 
     invoke-static {v0, p1}, Lcom/discord/views/DigitVerificationView$a;->a(Landroid/widget/EditText;Lkotlin/jvm/functions/Function0;)V
 
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView$e.smali b/com.discord/smali/com/discord/views/DigitVerificationView$e.smali
index 40d2317a89..d7b30951d7 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView$e.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView$e.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/DigitVerificationView;->eC()Landroid/view/ViewGroup;
+    value = Lcom/discord/views/DigitVerificationView;->eG()Landroid/view/ViewGroup;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -87,7 +87,7 @@
     invoke-interface {v0, v1}, Lcom/discord/views/DigitVerificationView$d;->onCodeEntered(Ljava/lang/String;)V
 
     :cond_0
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView$f.smali b/com.discord/smali/com/discord/views/DigitVerificationView$f.smali
index 90d33be82b..a29751bec5 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView$f.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView$f.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic BI:Landroid/widget/EditText;
+.field final synthetic BR:Landroid/widget/EditText;
 
 
 # direct methods
 .method constructor <init>(Landroid/widget/EditText;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$f;->BI:Landroid/widget/EditText;
+    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$f;->BR:Landroid/widget/EditText;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView$f;->BI:Landroid/widget/EditText;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView$f;->BR:Landroid/widget/EditText;
 
     invoke-virtual {v0}, Landroid/widget/EditText;->getText()Landroid/text/Editable;
 
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView$g.smali b/com.discord/smali/com/discord/views/DigitVerificationView$g.smali
index 30c42ea17f..fed145add4 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView$g.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView$g.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final BJ:Lcom/discord/views/DigitVerificationView$g;
+.field public static final BS:Lcom/discord/views/DigitVerificationView$g;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/DigitVerificationView$g;-><init>()V
 
-    sput-object v0, Lcom/discord/views/DigitVerificationView$g;->BJ:Lcom/discord/views/DigitVerificationView$g;
+    sput-object v0, Lcom/discord/views/DigitVerificationView$g;->BS:Lcom/discord/views/DigitVerificationView$g;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/DigitVerificationView.smali b/com.discord/smali/com/discord/views/DigitVerificationView.smali
index ae262139c5..ce014c2afa 100644
--- a/com.discord/smali/com/discord/views/DigitVerificationView.smali
+++ b/com.discord/smali/com/discord/views/DigitVerificationView.smali
@@ -18,13 +18,13 @@
 
 
 # static fields
-.field public static final BE:Lcom/discord/views/DigitVerificationView$a;
+.field public static final BN:Lcom/discord/views/DigitVerificationView$a;
 
 
 # instance fields
-.field private BC:Lcom/discord/views/DigitVerificationView$d;
+.field private BL:Lcom/discord/views/DigitVerificationView$d;
 
-.field public BD:Ljava/util/List;
+.field public BM:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -46,7 +46,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/views/DigitVerificationView$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/views/DigitVerificationView;->BE:Lcom/discord/views/DigitVerificationView$a;
+    sput-object v0, Lcom/discord/views/DigitVerificationView;->BN:Lcom/discord/views/DigitVerificationView$a;
 
     return-void
 .end method
@@ -138,13 +138,13 @@
 .method public static final synthetic b(Lcom/discord/views/DigitVerificationView;)Ljava/util/List;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object p0, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     if-nez p0, :cond_0
 
     const-string v0, "digits"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -153,13 +153,13 @@
 .method private final getVerificationCode()Ljava/lang/String;
     .locals 10
 
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     if-nez v0, :cond_0
 
     const-string v1, "digits"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     move-object v2, v0
@@ -180,7 +180,7 @@
 
     const/4 v7, 0x0
 
-    sget-object v0, Lcom/discord/views/DigitVerificationView$g;->BJ:Lcom/discord/views/DigitVerificationView$g;
+    sget-object v0, Lcom/discord/views/DigitVerificationView$g;->BS:Lcom/discord/views/DigitVerificationView$g;
 
     move-object v8, v0
 
@@ -200,13 +200,13 @@
 .method public final clear()V
     .locals 4
 
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     const-string v1, "digits"
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast v0, Ljava/lang/Iterable;
@@ -235,11 +235,11 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     if-nez v0, :cond_2
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     invoke-static {v0}, Lkotlin/a/m;->ab(Ljava/util/List;)Ljava/lang/Object;
@@ -253,7 +253,7 @@
     return-void
 .end method
 
-.method public final eC()Landroid/view/ViewGroup;
+.method public final eG()Landroid/view/ViewGroup;
     .locals 12
 
     invoke-virtual {p0}, Lcom/discord/views/DigitVerificationView;->getInflater()Landroid/view/LayoutInflater;
@@ -266,7 +266,7 @@
 
     const/4 v2, 0x1
 
-    const v3, 0x7f0d0083
+    const v3, 0x7f0d008a
 
     invoke-virtual {v0, v3, v1, v2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
@@ -276,7 +276,7 @@
 
     new-array v3, v3, [Ljava/lang/Integer;
 
-    const v4, 0x7f0a07d0
+    const v4, 0x7f0a080d
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -286,7 +286,7 @@
 
     aput-object v4, v3, v5
 
-    const v4, 0x7f0a07d1
+    const v4, 0x7f0a080e
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -294,7 +294,7 @@
 
     aput-object v4, v3, v2
 
-    const v4, 0x7f0a07d2
+    const v4, 0x7f0a080f
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -304,7 +304,7 @@
 
     aput-object v4, v3, v6
 
-    const v4, 0x7f0a07d3
+    const v4, 0x7f0a0810
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -314,7 +314,7 @@
 
     aput-object v4, v3, v6
 
-    const v4, 0x7f0a07d4
+    const v4, 0x7f0a0811
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -324,7 +324,7 @@
 
     aput-object v4, v3, v6
 
-    const v4, 0x7f0a07d5
+    const v4, 0x7f0a0812
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -334,7 +334,7 @@
 
     aput-object v4, v3, v6
 
-    invoke-static {v3}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v3}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v3
 
@@ -386,7 +386,7 @@
     :cond_0
     check-cast v4, Ljava/util/List;
 
-    iput-object v4, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iput-object v4, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     new-instance v0, Lcom/discord/views/DigitVerificationView$e;
 
@@ -394,13 +394,13 @@
 
     check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    iget-object v3, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object v3, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     const-string v4, "digits"
 
     if-nez v3, :cond_1
 
-    invoke-static {v4}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     check-cast v3, Ljava/lang/Iterable;
@@ -426,7 +426,7 @@
 
     if-gez v6, :cond_2
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_2
     check-cast v7, Landroid/widget/EditText;
@@ -441,11 +441,11 @@
 
     new-instance v9, Lcom/discord/views/DigitVerificationView$c;
 
-    iget-object v10, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object v10, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     if-nez v10, :cond_3
 
-    invoke-static {v4}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-direct {v9, v0, v10, v6}, Lcom/discord/views/DigitVerificationView$c;-><init>(Lkotlin/jvm/functions/Function0;Ljava/util/List;I)V
@@ -456,11 +456,11 @@
 
     new-instance v9, Lcom/discord/views/DigitVerificationView$b;
 
-    iget-object v10, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object v10, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     if-nez v10, :cond_4
 
-    invoke-static {v4}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     invoke-static {v10, v8}, Lkotlin/a/m;->d(Ljava/util/List;I)Ljava/lang/Object;
@@ -469,11 +469,11 @@
 
     check-cast v10, Landroid/widget/EditText;
 
-    iget-object v11, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object v11, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     if-nez v11, :cond_5
 
-    invoke-static {v4}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_5
     add-int/lit8 v6, v6, -0x1
@@ -495,11 +495,11 @@
     goto :goto_1
 
     :cond_6
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     if-nez v0, :cond_7
 
-    invoke-static {v4}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_7
     invoke-static {v0}, Lkotlin/a/m;->ab(Ljava/util/List;)Ljava/lang/Object;
@@ -516,7 +516,7 @@
 .method public final getOnCodeEntered()Lcom/discord/views/DigitVerificationView$d;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BC:Lcom/discord/views/DigitVerificationView$d;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BL:Lcom/discord/views/DigitVerificationView$d;
 
     return-object v0
 .end method
@@ -560,13 +560,13 @@
 .method public final setInputType(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     if-nez v0, :cond_0
 
     const-string v1, "digits"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast v0, Ljava/lang/Iterable;
@@ -599,7 +599,7 @@
 .method public final setOnCodeEntered(Lcom/discord/views/DigitVerificationView$d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/DigitVerificationView;->BC:Lcom/discord/views/DigitVerificationView$d;
+    iput-object p1, p0, Lcom/discord/views/DigitVerificationView;->BL:Lcom/discord/views/DigitVerificationView$d;
 
     return-void
 .end method
@@ -615,13 +615,13 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     const-string v2, "digits"
 
     if-nez v1, :cond_0
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-interface {v1}, Ljava/util/List;->size()I
@@ -637,11 +637,11 @@
     :goto_0
     if-ge v1, v0, :cond_2
 
-    iget-object v3, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object v3, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     if-nez v3, :cond_1
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-interface {v3, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
@@ -669,22 +669,22 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     if-nez v0, :cond_3
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     if-nez v1, :cond_4
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     invoke-interface {v1}, Ljava/util/List;->size()I
diff --git a/com.discord/smali/com/discord/views/GuildView.smali b/com.discord/smali/com/discord/views/GuildView.smali
index 217da27088..b32d176fbd 100644
--- a/com.discord/smali/com/discord/views/GuildView.smali
+++ b/com.discord/smali/com/discord/views/GuildView.smali
@@ -8,7 +8,7 @@
 
 
 # instance fields
-.field public BK:I
+.field public BT:I
 
 .field private final image$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -123,7 +123,7 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p3, 0x7f0a036f
+    const p3, 0x7f0a037f
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -131,7 +131,7 @@
 
     iput-object p3, p0, Lcom/discord/views/GuildView;->text$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a036e
+    const p3, 0x7f0a037e
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -141,13 +141,13 @@
 
     const/4 p3, -0x1
 
-    iput p3, p0, Lcom/discord/views/GuildView;->BK:I
+    iput p3, p0, Lcom/discord/views/GuildView;->BT:I
 
     move-object v0, p0
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d008b
+    const v1, 0x7f0d0093
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -177,7 +177,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/discord/views/GuildView;->BK:I
+    iput p2, p0, Lcom/discord/views/GuildView;->BT:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/discord/views/LoadingButton.smali b/com.discord/smali/com/discord/views/LoadingButton.smali
index 53cf934f28..8f9b4c68d5 100644
--- a/com.discord/smali/com/discord/views/LoadingButton.smali
+++ b/com.discord/smali/com/discord/views/LoadingButton.smali
@@ -8,7 +8,9 @@
 
 
 # instance fields
-.field private final Bc:Lkotlin/properties/ReadOnlyProperty;
+.field private BU:F
+
+.field private final Bl:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final progress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -121,15 +123,15 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p3, 0x7f0a0410
+    const p3, 0x7f0a0420
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p3
 
-    iput-object p3, p0, Lcom/discord/views/LoadingButton;->Bc:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/LoadingButton;->Bl:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a040f
+    const p3, 0x7f0a041f
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -137,11 +139,15 @@
 
     iput-object p3, p0, Lcom/discord/views/LoadingButton;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+    const/high16 p3, 0x3f800000    # 1.0f
+
+    iput p3, p0, Lcom/discord/views/LoadingButton;->BU:F
+
     move-object p3, p0
 
     check-cast p3, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d0091
+    const v0, 0x7f0d0099
 
     invoke-static {p1, v0, p3}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -161,14 +167,16 @@
 
     move-result-object p1
 
+    const/4 p2, 0x2
+
     :try_start_0
-    invoke-virtual {p1, p3}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
+    invoke-virtual {p1, p2}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
 
     move-result-object p2
 
     invoke-virtual {p0, p2}, Lcom/discord/views/LoadingButton;->setText(Ljava/lang/String;)V
 
-    const/4 p2, 0x2
+    const/4 p2, 0x3
 
     invoke-virtual {p1, p2}, Landroid/content/res/TypedArray;->getColorStateList(I)Landroid/content/res/ColorStateList;
 
@@ -178,24 +186,34 @@
 
     invoke-direct {p0}, Lcom/discord/views/LoadingButton;->getTextView()Landroid/widget/TextView;
 
-    move-result-object p3
+    move-result-object v0
 
-    invoke-virtual {p3, p2}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
+    invoke-virtual {v0, p2}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
 
     :cond_0
     const p2, 0x7fffffff
 
-    invoke-virtual {p1, v1, p2}, Landroid/content/res/TypedArray;->getColor(II)I
+    invoke-virtual {p1, p3, p2}, Landroid/content/res/TypedArray;->getColor(II)I
 
     move-result p3
 
     if-eq p3, p2, :cond_1
 
     invoke-direct {p0, p3}, Lcom/discord/views/LoadingButton;->setProgressBarColor(I)V
+
+    :cond_1
+    iget p2, p0, Lcom/discord/views/LoadingButton;->BU:F
+
+    invoke-virtual {p1, v1, p2}, Landroid/content/res/TypedArray;->getFloat(IF)F
+
+    move-result p2
+
+    iput p2, p0, Lcom/discord/views/LoadingButton;->BU:F
+
+    invoke-direct {p0}, Lcom/discord/views/LoadingButton;->eH()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :cond_1
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
     return-void
@@ -233,6 +251,28 @@
     return-void
 .end method
 
+.method private final eH()V
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/views/LoadingButton;->isEnabled()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/high16 v0, 0x3f800000    # 1.0f
+
+    goto :goto_0
+
+    :cond_0
+    iget v0, p0, Lcom/discord/views/LoadingButton;->BU:F
+
+    :goto_0
+    invoke-virtual {p0, v0}, Lcom/discord/views/LoadingButton;->setAlpha(F)V
+
+    return-void
+.end method
+
 .method private final getProgress()Landroid/widget/ProgressBar;
     .locals 3
 
@@ -256,7 +296,7 @@
 .method private final getTextView()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/LoadingButton;->Bc:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/LoadingButton;->Bl:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/LoadingButton;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -337,6 +377,8 @@
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setEnabled(Z)V
 
+    invoke-direct {p0}, Lcom/discord/views/LoadingButton;->eH()V
+
     return-void
 .end method
 
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$a.smali b/com.discord/smali/com/discord/views/OverlayMenuView$a.smali
index 47435f11a8..0a375ea2df 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$a.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final Co:I
+.field final Cy:I
 
 .field final channelName:Ljava/lang/String;
 
@@ -36,7 +36,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/views/OverlayMenuView$a;->Co:I
+    iput p1, p0, Lcom/discord/views/OverlayMenuView$a;->Cy:I
 
     iput-object p2, p0, Lcom/discord/views/OverlayMenuView$a;->guildName:Ljava/lang/String;
 
@@ -62,9 +62,9 @@
 
     check-cast p1, Lcom/discord/views/OverlayMenuView$a;
 
-    iget v1, p0, Lcom/discord/views/OverlayMenuView$a;->Co:I
+    iget v1, p0, Lcom/discord/views/OverlayMenuView$a;->Cy:I
 
-    iget v3, p1, Lcom/discord/views/OverlayMenuView$a;->Co:I
+    iget v3, p1, Lcom/discord/views/OverlayMenuView$a;->Cy:I
 
     if-ne v1, v3, :cond_0
 
@@ -111,7 +111,11 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lcom/discord/views/OverlayMenuView$a;->Co:I
+    iget v0, p0, Lcom/discord/views/OverlayMenuView$a;->Cy:I
+
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
 
     mul-int/lit8 v0, v0, 0x1f
 
@@ -158,7 +162,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/discord/views/OverlayMenuView$a;->Co:I
+    iget v1, p0, Lcom/discord/views/OverlayMenuView$a;->Cy:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$b$1.smali b/com.discord/smali/com/discord/views/OverlayMenuView$b$1.smali
index b6dce8eb03..4c926926f3 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$b$1.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$b$1.smali
@@ -33,7 +33,7 @@
 
 
 # static fields
-.field public static final Cp:Lcom/discord/views/OverlayMenuView$b$1;
+.field public static final Cz:Lcom/discord/views/OverlayMenuView$b$1;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/OverlayMenuView$b$1;-><init>()V
 
-    sput-object v0, Lcom/discord/views/OverlayMenuView$b$1;->Cp:Lcom/discord/views/OverlayMenuView$b$1;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$b$1;->Cz:Lcom/discord/views/OverlayMenuView$b$1;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$b$2.smali b/com.discord/smali/com/discord/views/OverlayMenuView$b$2.smali
index f78d63de31..9e9219eb84 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$b$2.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$b$2.smali
@@ -33,7 +33,7 @@
 
 
 # static fields
-.field public static final Cq:Lcom/discord/views/OverlayMenuView$b$2;
+.field public static final CA:Lcom/discord/views/OverlayMenuView$b$2;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/OverlayMenuView$b$2;-><init>()V
 
-    sput-object v0, Lcom/discord/views/OverlayMenuView$b$2;->Cq:Lcom/discord/views/OverlayMenuView$b$2;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$b$2;->CA:Lcom/discord/views/OverlayMenuView$b$2;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$b$3.smali b/com.discord/smali/com/discord/views/OverlayMenuView$b$3.smali
index d7ccdc1519..588851d25e 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$b$3.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$b$3.smali
@@ -63,11 +63,11 @@
 
     move-result-object p1
 
-    const v0, 0x7f120991
+    const v0, 0x7f1209b1
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$b$4.smali b/com.discord/smali/com/discord/views/OverlayMenuView$b$4.smali
index e3ea323ef0..1c1db98f5f 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$b$4.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$b$4.smali
@@ -87,7 +87,7 @@
 
     check-cast p1, Ljava/lang/CharSequence;
 
-    const v1, 0x7f120a00
+    const v1, 0x7f120a23
 
     invoke-static {v0, p1, v1}, Lcom/discord/app/h;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V
 
@@ -101,7 +101,7 @@
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$b.smali b/com.discord/smali/com/discord/views/OverlayMenuView$b.smali
index 0a200ab1c2..0c5b5fd660 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$b.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$b.smali
@@ -47,7 +47,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/views/OverlayMenuView$b$1;->Cp:Lcom/discord/views/OverlayMenuView$b$1;
+    sget-object v0, Lcom/discord/views/OverlayMenuView$b$1;->Cz:Lcom/discord/views/OverlayMenuView$b$1;
 
     check-cast v0, Lrx/functions/b;
 
@@ -71,7 +71,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/views/OverlayMenuView$b$2;->Cq:Lcom/discord/views/OverlayMenuView$b$2;
+    sget-object v0, Lcom/discord/views/OverlayMenuView$b$2;->CA:Lcom/discord/views/OverlayMenuView$b$2;
 
     check-cast v0, Lrx/functions/b;
 
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$e.smali b/com.discord/smali/com/discord/views/OverlayMenuView$e.smali
index c78747b91a..fccb0fe0e3 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$e.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$e.smali
@@ -33,7 +33,7 @@
 
 
 # static fields
-.field public static final Cr:Lcom/discord/views/OverlayMenuView$e;
+.field public static final CB:Lcom/discord/views/OverlayMenuView$e;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/OverlayMenuView$e;-><init>()V
 
-    sput-object v0, Lcom/discord/views/OverlayMenuView$e;->Cr:Lcom/discord/views/OverlayMenuView$e;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$e;->CB:Lcom/discord/views/OverlayMenuView$e;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$f.smali b/com.discord/smali/com/discord/views/OverlayMenuView$f.smali
index c8a92400fc..11265d48d2 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$f.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$f.smali
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final Cs:Lcom/discord/views/OverlayMenuView$f;
+.field public static final CC:Lcom/discord/views/OverlayMenuView$f;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/OverlayMenuView$f;-><init>()V
 
-    sput-object v0, Lcom/discord/views/OverlayMenuView$f;->Cs:Lcom/discord/views/OverlayMenuView$f;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$f;->CC:Lcom/discord/views/OverlayMenuView$f;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$g.smali b/com.discord/smali/com/discord/views/OverlayMenuView$g.smali
index a20795560e..988cba7df3 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$g.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$g.smali
@@ -73,7 +73,7 @@
 
     invoke-static {v0, p1, v1, v2, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$h.smali b/com.discord/smali/com/discord/views/OverlayMenuView$h.smali
index 4d52118501..3d4c5fb848 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$h.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$h.smali
@@ -33,7 +33,7 @@
 
 
 # static fields
-.field public static final Ct:Lcom/discord/views/OverlayMenuView$h;
+.field public static final CD:Lcom/discord/views/OverlayMenuView$h;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/OverlayMenuView$h;-><init>()V
 
-    sput-object v0, Lcom/discord/views/OverlayMenuView$h;->Ct:Lcom/discord/views/OverlayMenuView$h;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$h;->CD:Lcom/discord/views/OverlayMenuView$h;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$i.smali b/com.discord/smali/com/discord/views/OverlayMenuView$i.smali
index b78ce37867..efc7c8d206 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$i.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$i.smali
@@ -59,12 +59,12 @@
 
     if-eqz p1, :cond_0
 
-    iget v1, p1, Lcom/discord/views/OverlayMenuView$a;->Co:I
+    iget v1, p1, Lcom/discord/views/OverlayMenuView$a;->Cy:I
 
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f0803aa
+    const v1, 0x7f0803c1
 
     :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -118,7 +118,7 @@
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$j.smali b/com.discord/smali/com/discord/views/OverlayMenuView$j.smali
index ddf54d076c..82b6f80c0c 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$j.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$j.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final Cu:Lcom/discord/views/OverlayMenuView$j;
+.field public static final CE:Lcom/discord/views/OverlayMenuView$j;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/OverlayMenuView$j;-><init>()V
 
-    sput-object v0, Lcom/discord/views/OverlayMenuView$j;->Cu:Lcom/discord/views/OverlayMenuView$j;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$j;->CE:Lcom/discord/views/OverlayMenuView$j;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$k.smali b/com.discord/smali/com/discord/views/OverlayMenuView$k.smali
index f8bf0ece56..8a3a635355 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$k.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$k.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final Cv:Lcom/discord/views/OverlayMenuView$k;
+.field public static final CF:Lcom/discord/views/OverlayMenuView$k;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/OverlayMenuView$k;-><init>()V
 
-    sput-object v0, Lcom/discord/views/OverlayMenuView$k;->Cv:Lcom/discord/views/OverlayMenuView$k;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$k;->CF:Lcom/discord/views/OverlayMenuView$k;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$m.smali b/com.discord/smali/com/discord/views/OverlayMenuView$m.smali
index c2433b092b..1a9d289be0 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$m.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$m.smali
@@ -33,7 +33,7 @@
 
 
 # static fields
-.field public static final Cw:Lcom/discord/views/OverlayMenuView$m;
+.field public static final CG:Lcom/discord/views/OverlayMenuView$m;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/OverlayMenuView$m;-><init>()V
 
-    sput-object v0, Lcom/discord/views/OverlayMenuView$m;->Cw:Lcom/discord/views/OverlayMenuView$m;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$m;->CG:Lcom/discord/views/OverlayMenuView$m;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$n.smali b/com.discord/smali/com/discord/views/OverlayMenuView$n.smali
index de1342a729..93945a906b 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$n.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$n.smali
@@ -100,7 +100,7 @@
     :goto_0
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setActivated(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$o.smali b/com.discord/smali/com/discord/views/OverlayMenuView$o.smali
index 3e7ef6b3a9..339aa63ae0 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$o.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$o.smali
@@ -27,7 +27,7 @@
 
 
 # static fields
-.field public static final Cx:Lcom/discord/views/OverlayMenuView$o;
+.field public static final CH:Lcom/discord/views/OverlayMenuView$o;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/OverlayMenuView$o;-><init>()V
 
-    sput-object v0, Lcom/discord/views/OverlayMenuView$o;->Cx:Lcom/discord/views/OverlayMenuView$o;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$o;->CH:Lcom/discord/views/OverlayMenuView$o;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 .method public final bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView.smali b/com.discord/smali/com/discord/views/OverlayMenuView.smali
index 23029b57d1..331f05956c 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView.smali
@@ -19,25 +19,25 @@
 
 
 # instance fields
-.field private final Ce:Lkotlin/properties/ReadOnlyProperty;
+.field private final Co:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Cf:Lkotlin/properties/ReadOnlyProperty;
+.field private final Cp:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Cg:Lkotlin/properties/ReadOnlyProperty;
+.field private final Cq:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Ch:Lkotlin/properties/ReadOnlyProperty;
+.field private final Cr:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Ci:Lkotlin/properties/ReadOnlyProperty;
+.field private final Cs:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Cj:Lkotlin/properties/ReadOnlyProperty;
+.field private final Ct:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Ck:Lkotlin/properties/ReadOnlyProperty;
+.field private final Cu:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Cl:Lkotlin/properties/ReadOnlyProperty;
+.field private final Cv:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Cm:Lkotlin/properties/ReadOnlyProperty;
+.field private final Cw:Lkotlin/properties/ReadOnlyProperty;
 
-.field private Cn:Lkotlin/jvm/functions/Function0;
+.field private Cx:Lkotlin/jvm/functions/Function0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function0<",
@@ -289,11 +289,11 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d0095
+    const v1, 0x7f0d009d
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -305,83 +305,83 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->paused:Lrx/subjects/Subject;
 
-    const p1, 0x7f0a04bc
+    const p1, 0x7f0a04d2
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ce:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Co:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b5
+    const p1, 0x7f0a04cb
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cf:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cp:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b4
+    const p1, 0x7f0a04ca
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cg:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cq:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b7
+    const p1, 0x7f0a04cd
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ch:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cr:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04be
+    const p1, 0x7f0a04d4
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ci:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cs:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04bd
+    const p1, 0x7f0a04d3
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cj:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ct:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a070a
+    const p1, 0x7f0a072a
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ck:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cu:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0478
+    const p1, 0x7f0a048b
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cl:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cv:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a027a
+    const p1, 0x7f0a0283
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cm:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cw:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->Cx:Lcom/discord/views/OverlayMenuView$o;
+    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->CH:Lcom/discord/views/OverlayMenuView$o;
 
     check-cast p1, Lkotlin/jvm/functions/Function0;
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cn:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cx:Lkotlin/jvm/functions/Function0;
 
     return-void
 .end method
@@ -403,11 +403,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d0095
+    const v0, 0x7f0d009d
 
     invoke-static {p1, v0, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -419,83 +419,83 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->paused:Lrx/subjects/Subject;
 
-    const p1, 0x7f0a04bc
+    const p1, 0x7f0a04d2
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ce:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Co:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b5
+    const p1, 0x7f0a04cb
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cf:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cp:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b4
+    const p1, 0x7f0a04ca
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cg:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cq:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b7
+    const p1, 0x7f0a04cd
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ch:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cr:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04be
+    const p1, 0x7f0a04d4
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ci:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cs:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04bd
+    const p1, 0x7f0a04d3
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cj:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ct:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a070a
+    const p1, 0x7f0a072a
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ck:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cu:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0478
+    const p1, 0x7f0a048b
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cl:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cv:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a027a
+    const p1, 0x7f0a0283
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cm:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cw:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->Cx:Lcom/discord/views/OverlayMenuView$o;
+    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->CH:Lcom/discord/views/OverlayMenuView$o;
 
     check-cast p1, Lkotlin/jvm/functions/Function0;
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cn:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cx:Lkotlin/jvm/functions/Function0;
 
     return-void
 .end method
@@ -517,11 +517,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d0095
+    const p3, 0x7f0d009d
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -533,83 +533,83 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->paused:Lrx/subjects/Subject;
 
-    const p1, 0x7f0a04bc
+    const p1, 0x7f0a04d2
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ce:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Co:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b5
+    const p1, 0x7f0a04cb
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cf:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cp:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b4
+    const p1, 0x7f0a04ca
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cg:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cq:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b7
+    const p1, 0x7f0a04cd
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ch:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cr:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04be
+    const p1, 0x7f0a04d4
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ci:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cs:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04bd
+    const p1, 0x7f0a04d3
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cj:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ct:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a070a
+    const p1, 0x7f0a072a
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Ck:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cu:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0478
+    const p1, 0x7f0a048b
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cl:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cv:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a027a
+    const p1, 0x7f0a0283
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cm:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cw:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->Cx:Lcom/discord/views/OverlayMenuView$o;
+    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->CH:Lcom/discord/views/OverlayMenuView$o;
 
     check-cast p1, Lkotlin/jvm/functions/Function0;
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cn:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cx:Lkotlin/jvm/functions/Function0;
 
     return-void
 .end method
@@ -677,7 +677,7 @@
 .method private final getChannelNameTv()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cg:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cq:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/OverlayMenuView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -697,7 +697,7 @@
 .method private final getDisconnectBtn()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cm:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cw:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/OverlayMenuView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -717,7 +717,7 @@
 .method private final getGuildNameTv()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cf:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cp:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/OverlayMenuView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -737,7 +737,7 @@
 .method private final getInviteLinkBtn()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Ch:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cr:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/OverlayMenuView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -757,7 +757,7 @@
 .method private final getMuteToggle()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cl:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cv:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/OverlayMenuView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -777,7 +777,7 @@
 .method private final getNetworkQualityIv()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Ce:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Co:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/OverlayMenuView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -797,7 +797,7 @@
 .method private final getOpenAppBtn()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cj:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Ct:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/OverlayMenuView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -817,7 +817,7 @@
 .method private final getSrcToggle()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Ck:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cu:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/OverlayMenuView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -837,7 +837,7 @@
 .method private final getSwitchChannelBtn()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Ci:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cs:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/OverlayMenuView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -867,7 +867,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cn:Lkotlin/jvm/functions/Function0;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Cx:Lkotlin/jvm/functions/Function0;
 
     return-object v0
 .end method
@@ -916,7 +916,7 @@
 
     move-result-object v0
 
-    sget-object v4, Lcom/discord/views/OverlayMenuView$h;->Ct:Lcom/discord/views/OverlayMenuView$h;
+    sget-object v4, Lcom/discord/views/OverlayMenuView$h;->CD:Lcom/discord/views/OverlayMenuView$h;
 
     check-cast v4, Lrx/functions/b;
 
@@ -932,7 +932,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -976,7 +976,7 @@
 
     move-result-object v0
 
-    sget-object v5, Lcom/discord/views/OverlayMenuView$j;->Cu:Lcom/discord/views/OverlayMenuView$j;
+    sget-object v5, Lcom/discord/views/OverlayMenuView$j;->CE:Lcom/discord/views/OverlayMenuView$j;
 
     check-cast v5, Landroid/view/View$OnClickListener;
 
@@ -986,7 +986,7 @@
 
     move-result-object v0
 
-    sget-object v5, Lcom/discord/views/OverlayMenuView$k;->Cv:Lcom/discord/views/OverlayMenuView$k;
+    sget-object v5, Lcom/discord/views/OverlayMenuView$k;->CF:Lcom/discord/views/OverlayMenuView$k;
 
     check-cast v5, Landroid/view/View$OnClickListener;
 
@@ -1024,7 +1024,7 @@
 
     move-result-object v5
 
-    sget-object v6, Lcom/discord/views/OverlayMenuView$m;->Cw:Lcom/discord/views/OverlayMenuView$m;
+    sget-object v6, Lcom/discord/views/OverlayMenuView$m;->CG:Lcom/discord/views/OverlayMenuView$m;
 
     check-cast v6, Lrx/functions/Func2;
 
@@ -1032,7 +1032,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1111,7 +1111,7 @@
 
     move-result-object v0
 
-    sget-object v4, Lcom/discord/views/OverlayMenuView$e;->Cr:Lcom/discord/views/OverlayMenuView$e;
+    sget-object v4, Lcom/discord/views/OverlayMenuView$e;->CB:Lcom/discord/views/OverlayMenuView$e;
 
     check-cast v4, Lrx/functions/b;
 
@@ -1119,7 +1119,7 @@
 
     move-result-object v0
 
-    sget-object v4, Lcom/discord/views/OverlayMenuView$f;->Cs:Lcom/discord/views/OverlayMenuView$f;
+    sget-object v4, Lcom/discord/views/OverlayMenuView$f;->CC:Lcom/discord/views/OverlayMenuView$f;
 
     check-cast v4, Lrx/functions/b;
 
@@ -1135,7 +1135,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1209,7 +1209,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cn:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Cx:Lkotlin/jvm/functions/Function0;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/RadioManager.smali b/com.discord/smali/com/discord/views/RadioManager.smali
index b0dd6977c8..9caaee7fff 100644
--- a/com.discord/smali/com/discord/views/RadioManager.smali
+++ b/com.discord/smali/com/discord/views/RadioManager.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private CF:Ljava/util/List;
+.field private CP:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -42,7 +42,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/views/RadioManager;->CF:Ljava/util/List;
+    iput-object v0, p0, Lcom/discord/views/RadioManager;->CP:Ljava/util/List;
 
     const/4 v0, 0x0
 
@@ -82,7 +82,7 @@
 
     :cond_1
     :goto_1
-    iget-object v4, p0, Lcom/discord/views/RadioManager;->CF:Ljava/util/List;
+    iget-object v4, p0, Lcom/discord/views/RadioManager;->CP:Ljava/util/List;
 
     invoke-interface {v4, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -139,7 +139,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/discord/views/RadioManager;->CF:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/views/RadioManager;->CP:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -147,7 +147,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/discord/views/RadioManager;->CF:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/views/RadioManager;->CP:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -175,7 +175,7 @@
     return-void
 .end method
 
-.method public final eI()I
+.method public final eN()I
     .locals 3
 
     const/4 v0, 0x0
@@ -183,7 +183,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/discord/views/RadioManager;->CF:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/views/RadioManager;->CP:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -191,7 +191,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/discord/views/RadioManager;->CF:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/views/RadioManager;->CP:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -216,12 +216,12 @@
     return v0
 .end method
 
-.method public final eJ()Landroid/widget/Checkable;
+.method public final eO()Landroid/widget/Checkable;
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/RadioManager;->CF:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/RadioManager;->CP:Ljava/util/List;
 
-    invoke-virtual {p0}, Lcom/discord/views/RadioManager;->eI()I
+    invoke-virtual {p0}, Lcom/discord/views/RadioManager;->eN()I
 
     move-result v1
 
diff --git a/com.discord/smali/com/discord/views/ServerFolderView$a.smali b/com.discord/smali/com/discord/views/ServerFolderView$a.smali
index 7e79f69648..31579b24c8 100644
--- a/com.discord/smali/com/discord/views/ServerFolderView$a.smali
+++ b/com.discord/smali/com/discord/views/ServerFolderView$a.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic CP:Lcom/discord/views/ServerFolderView;
+.field final synthetic CZ:Lcom/discord/views/ServerFolderView;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/views/ServerFolderView$a;->CP:Lcom/discord/views/ServerFolderView;
+    iput-object p1, p0, Lcom/discord/views/ServerFolderView$a;->CZ:Lcom/discord/views/ServerFolderView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 .method public final onAnimationEnd(Landroid/view/animation/Animation;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/views/ServerFolderView$a;->CP:Lcom/discord/views/ServerFolderView;
+    iget-object p1, p0, Lcom/discord/views/ServerFolderView$a;->CZ:Lcom/discord/views/ServerFolderView;
 
     invoke-static {p1}, Lcom/discord/views/ServerFolderView;->a(Lcom/discord/views/ServerFolderView;)V
 
diff --git a/com.discord/smali/com/discord/views/ServerFolderView.smali b/com.discord/smali/com/discord/views/ServerFolderView.smali
index 655f847ad3..04c9decb78 100644
--- a/com.discord/smali/com/discord/views/ServerFolderView.smali
+++ b/com.discord/smali/com/discord/views/ServerFolderView.smali
@@ -8,13 +8,13 @@
 
 
 # instance fields
-.field private final CL:Lkotlin/properties/ReadOnlyProperty;
+.field private final CV:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final CM:Lkotlin/properties/ReadOnlyProperty;
+.field private final CW:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final CN:Lkotlin/properties/ReadOnlyProperty;
+.field private final CX:Lkotlin/properties/ReadOnlyProperty;
 
-.field private CO:Landroid/view/animation/Animation;
+.field private CY:Landroid/view/animation/Animation;
 
 .field public folderId:Ljava/lang/Long;
 
@@ -151,21 +151,21 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p2, 0x7f0a02e6
+    const p2, 0x7f0a02ef
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/discord/views/ServerFolderView;->CL:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p2, p0, Lcom/discord/views/ServerFolderView;->CV:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0370
+    const p2, 0x7f0a0380
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/discord/views/ServerFolderView;->CM:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p2, p0, Lcom/discord/views/ServerFolderView;->CW:Lkotlin/properties/ReadOnlyProperty;
 
     const/4 p2, 0x4
 
@@ -181,7 +181,7 @@
 
     invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p3, Lkotterknife/b$d;->bpI:Lkotterknife/b$d;
+    sget-object p3, Lkotterknife/b$d;->bqc:Lkotterknife/b$d;
 
     check-cast p3, Lkotlin/jvm/functions/Function2;
 
@@ -191,13 +191,13 @@
 
     check-cast p2, Lkotlin/properties/ReadOnlyProperty;
 
-    iput-object p2, p0, Lcom/discord/views/ServerFolderView;->CN:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p2, p0, Lcom/discord/views/ServerFolderView;->CX:Lkotlin/properties/ReadOnlyProperty;
 
     move-object p2, p0
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d009d
+    const p3, 0x7f0d00a5
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -209,10 +209,10 @@
 
     :array_0
     .array-data 4
-        0x7f0a036a
-        0x7f0a036b
-        0x7f0a036c
-        0x7f0a036d
+        0x7f0a037a
+        0x7f0a037b
+        0x7f0a037c
+        0x7f0a037d
     .end array-data
 .end method
 
@@ -243,9 +243,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/views/ServerFolderView;->CO:Landroid/view/animation/Animation;
+    iput-object v0, p0, Lcom/discord/views/ServerFolderView;->CY:Landroid/view/animation/Animation;
 
-    invoke-virtual {p0}, Lcom/discord/views/ServerFolderView;->eK()V
+    invoke-virtual {p0}, Lcom/discord/views/ServerFolderView;->eP()V
 
     return-void
 .end method
@@ -253,7 +253,7 @@
 .method private final getGuildViewsContainer()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/ServerFolderView;->CM:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ServerFolderView;->CW:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/ServerFolderView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -291,7 +291,7 @@
 
     invoke-virtual {p1, v0}, Landroid/view/animation/Animation;->setAnimationListener(Landroid/view/animation/Animation$AnimationListener;)V
 
-    iput-object p1, p0, Lcom/discord/views/ServerFolderView;->CO:Landroid/view/animation/Animation;
+    iput-object p1, p0, Lcom/discord/views/ServerFolderView;->CY:Landroid/view/animation/Animation;
 
     invoke-virtual {p0}, Lcom/discord/views/ServerFolderView;->getFolderImg()Landroid/widget/ImageView;
 
@@ -316,7 +316,7 @@
     return-void
 .end method
 
-.method public final eK()V
+.method public final eP()V
     .locals 3
 
     iget-boolean v0, p0, Lcom/discord/views/ServerFolderView;->isOpen:Z
@@ -360,7 +360,7 @@
 .method public final getFolderImg()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/ServerFolderView;->CL:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ServerFolderView;->CV:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/ServerFolderView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -388,7 +388,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/views/ServerFolderView;->CN:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ServerFolderView;->CX:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/ServerFolderView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox$c.smali b/com.discord/smali/com/discord/views/TernaryCheckBox$c.smali
index 018bed476b..a0cf414dbb 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$c.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$c.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Da:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Dk:Lcom/discord/views/TernaryCheckBox;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/TernaryCheckBox;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$c;->Da:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$c;->Dk:Lcom/discord/views/TernaryCheckBox;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$c;->Da:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$c;->Dk:Lcom/discord/views/TernaryCheckBox;
 
-    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->eO()Lcom/discord/views/TernaryCheckBox$a;
+    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->eT()Lcom/discord/views/TernaryCheckBox$a;
 
     const/4 v0, 0x1
 
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox$d.smali b/com.discord/smali/com/discord/views/TernaryCheckBox$d.smali
index f4a351b35f..0717793dcb 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$d.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$d.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Da:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Dk:Lcom/discord/views/TernaryCheckBox;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/TernaryCheckBox;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$d;->Da:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$d;->Dk:Lcom/discord/views/TernaryCheckBox;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$d;->Da:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$d;->Dk:Lcom/discord/views/TernaryCheckBox;
 
-    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->eO()Lcom/discord/views/TernaryCheckBox$a;
+    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->eT()Lcom/discord/views/TernaryCheckBox$a;
 
     const/4 v0, -0x1
 
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox$e.smali b/com.discord/smali/com/discord/views/TernaryCheckBox$e.smali
index c79253cf72..ed99085428 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$e.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$e.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Da:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Dk:Lcom/discord/views/TernaryCheckBox;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/TernaryCheckBox;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$e;->Da:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$e;->Dk:Lcom/discord/views/TernaryCheckBox;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$e;->Da:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$e;->Dk:Lcom/discord/views/TernaryCheckBox;
 
-    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->eO()Lcom/discord/views/TernaryCheckBox$a;
+    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->eT()Lcom/discord/views/TernaryCheckBox$a;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox$f.smali b/com.discord/smali/com/discord/views/TernaryCheckBox$f.smali
index 71d1f61351..34ae83df4c 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$f.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$f.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic Da:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Dk:Lcom/discord/views/TernaryCheckBox;
 
-.field final synthetic Db:Ljava/lang/String;
+.field final synthetic Dl:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/TernaryCheckBox;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$f;->Da:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$f;->Dk:Lcom/discord/views/TernaryCheckBox;
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox$f;->Db:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox$f;->Dl:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,13 +41,13 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$f;->Da:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$f;->Dk:Lcom/discord/views/TernaryCheckBox;
 
     invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox$f;->Db:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox$f;->Dl:Ljava/lang/String;
 
     check-cast v0, Ljava/lang/CharSequence;
 
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox$g.smali b/com.discord/smali/com/discord/views/TernaryCheckBox$g.smali
index b91c2935b4..02e676016b 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$g.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$g.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic Da:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Dk:Lcom/discord/views/TernaryCheckBox;
 
-.field final synthetic Db:Ljava/lang/String;
+.field final synthetic Dl:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/TernaryCheckBox;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$g;->Da:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$g;->Dk:Lcom/discord/views/TernaryCheckBox;
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox$g;->Db:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox$g;->Dl:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,13 +41,13 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$g;->Da:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$g;->Dk:Lcom/discord/views/TernaryCheckBox;
 
     invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox$g;->Db:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox$g;->Dl:Ljava/lang/String;
 
     check-cast v0, Ljava/lang/CharSequence;
 
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox.smali b/com.discord/smali/com/discord/views/TernaryCheckBox.smali
index 6232cb76fa..889d182412 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox.smali
@@ -13,32 +13,32 @@
 
 
 # static fields
-.field public static final CZ:Lcom/discord/views/TernaryCheckBox$a;
+.field public static final Dj:Lcom/discord/views/TernaryCheckBox$a;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
 
 # instance fields
-.field private Bk:Landroid/widget/TextView;
+.field private Bt:Landroid/widget/TextView;
 
-.field private CQ:Lcom/discord/views/CheckableImageView;
+.field private Da:Lcom/discord/views/CheckableImageView;
 
-.field private CR:Lcom/discord/views/CheckableImageView;
+.field private Db:Lcom/discord/views/CheckableImageView;
 
-.field private CS:Lcom/discord/views/CheckableImageView;
+.field private Dc:Lcom/discord/views/CheckableImageView;
 
-.field private CT:Landroid/view/View;
+.field private Dd:Landroid/view/View;
 
-.field private CU:Landroid/view/View;
+.field private De:Landroid/view/View;
 
-.field private CV:Ljava/lang/String;
+.field private Df:Ljava/lang/String;
 
-.field private CW:Ljava/lang/String;
+.field private Dg:Ljava/lang/String;
 
-.field private CX:Lcom/discord/views/TernaryCheckBox$b;
+.field private Dh:Lcom/discord/views/TernaryCheckBox$b;
 
-.field public CY:I
+.field public Di:I
 
 .field private subtext:Landroid/widget/TextView;
 
@@ -53,7 +53,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/views/TernaryCheckBox$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/views/TernaryCheckBox;->CZ:Lcom/discord/views/TernaryCheckBox$a;
+    sput-object v0, Lcom/discord/views/TernaryCheckBox;->Dj:Lcom/discord/views/TernaryCheckBox$a;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/views/TernaryCheckBox;->CY:I
+    iput v0, p0, Lcom/discord/views/TernaryCheckBox;->Di:I
 
     const/4 v0, 0x0
 
@@ -89,7 +89,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/views/TernaryCheckBox;->CY:I
+    iput v0, p0, Lcom/discord/views/TernaryCheckBox;->Di:I
 
     invoke-direct {p0, p1, p2}, Lcom/discord/views/TernaryCheckBox;->a(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -107,7 +107,7 @@
 
     const/4 p3, -0x1
 
-    iput p3, p0, Lcom/discord/views/TernaryCheckBox;->CY:I
+    iput p3, p0, Lcom/discord/views/TernaryCheckBox;->Di:I
 
     invoke-direct {p0, p1, p2}, Lcom/discord/views/TernaryCheckBox;->a(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -136,7 +136,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/discord/views/TernaryCheckBox;->CV:Ljava/lang/String;
+    iput-object v1, p0, Lcom/discord/views/TernaryCheckBox;->Df:Ljava/lang/String;
 
     const/4 v1, 0x1
 
@@ -144,7 +144,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/discord/views/TernaryCheckBox;->CW:Ljava/lang/String;
+    iput-object v1, p0, Lcom/discord/views/TernaryCheckBox;->Dg:Ljava/lang/String;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -161,7 +161,7 @@
 
     :cond_0
     :goto_0
-    const p2, 0x7f0d00ad
+    const p2, 0x7f0d00b5
 
     move-object v1, p0
 
@@ -171,7 +171,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0a064c
+    const p2, 0x7f0a0666
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -183,18 +183,18 @@
 
     check-cast p2, Landroid/widget/TextView;
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Bk:Landroid/widget/TextView;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Bt:Landroid/widget/TextView;
 
-    iget-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Bk:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Bt:Landroid/widget/TextView;
 
     const-string v1, "label"
 
     if-nez p2, :cond_1
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
-    iget-object v2, p0, Lcom/discord/views/TernaryCheckBox;->CV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/views/TernaryCheckBox;->Df:Ljava/lang/String;
 
     const/16 v3, 0x8
 
@@ -210,20 +210,20 @@
     :goto_1
     invoke-virtual {p2, v2}, Landroid/widget/TextView;->setVisibility(I)V
 
-    iget-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Bk:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Bt:Landroid/widget/TextView;
 
     if-nez p2, :cond_3
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
-    iget-object v1, p0, Lcom/discord/views/TernaryCheckBox;->CV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/views/TernaryCheckBox;->Df:Ljava/lang/String;
 
     check-cast v1, Ljava/lang/CharSequence;
 
     invoke-virtual {p2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const p2, 0x7f0a064d
+    const p2, 0x7f0a0667
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -243,10 +243,10 @@
 
     if-nez p2, :cond_4
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
-    iget-object v2, p0, Lcom/discord/views/TernaryCheckBox;->CW:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/views/TernaryCheckBox;->Dg:Ljava/lang/String;
 
     if-eqz v2, :cond_5
 
@@ -262,16 +262,16 @@
 
     if-nez p2, :cond_6
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_6
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CW:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Dg:Ljava/lang/String;
 
     check-cast v0, Ljava/lang/CharSequence;
 
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const p2, 0x7f0a064b
+    const p2, 0x7f0a0665
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -281,9 +281,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->CT:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Dd:Landroid/view/View;
 
-    const p2, 0x7f0a04b0
+    const p2, 0x7f0a04c6
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -293,9 +293,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->CU:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->De:Landroid/view/View;
 
-    const p2, 0x7f0a073d
+    const p2, 0x7f0a0766
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -307,9 +307,9 @@
 
     check-cast p2, Lcom/discord/views/CheckableImageView;
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->CQ:Lcom/discord/views/CheckableImageView;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Da:Lcom/discord/views/CheckableImageView;
 
-    const p2, 0x7f0a073c
+    const p2, 0x7f0a0765
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -321,9 +321,9 @@
 
     check-cast p2, Lcom/discord/views/CheckableImageView;
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->CR:Lcom/discord/views/CheckableImageView;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Db:Lcom/discord/views/CheckableImageView;
 
-    const p2, 0x7f0a073b
+    const p2, 0x7f0a0764
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -335,15 +335,15 @@
 
     check-cast p1, Lcom/discord/views/CheckableImageView;
 
-    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox;->CS:Lcom/discord/views/CheckableImageView;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Dc:Lcom/discord/views/CheckableImageView;
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->CQ:Lcom/discord/views/CheckableImageView;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Da:Lcom/discord/views/CheckableImageView;
 
     if-nez p1, :cond_7
 
     const-string p2, "checkOn"
 
-    invoke-static {p2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {p2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_7
     new-instance p2, Lcom/discord/views/TernaryCheckBox$c;
@@ -354,13 +354,13 @@
 
     invoke-virtual {p1, p2}, Lcom/discord/views/CheckableImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->CR:Lcom/discord/views/CheckableImageView;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Db:Lcom/discord/views/CheckableImageView;
 
     if-nez p1, :cond_8
 
     const-string p2, "checkOff"
 
-    invoke-static {p2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {p2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_8
     new-instance p2, Lcom/discord/views/TernaryCheckBox$d;
@@ -371,13 +371,13 @@
 
     invoke-virtual {p1, p2}, Lcom/discord/views/CheckableImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->CS:Lcom/discord/views/CheckableImageView;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Dc:Lcom/discord/views/CheckableImageView;
 
     if-nez p1, :cond_9
 
     const-string p2, "checkNeutral"
 
-    invoke-static {p2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {p2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_9
     new-instance p2, Lcom/discord/views/TernaryCheckBox$e;
@@ -399,10 +399,10 @@
     return-void
 .end method
 
-.method public static final synthetic eO()Lcom/discord/views/TernaryCheckBox$a;
+.method public static final synthetic eT()Lcom/discord/views/TernaryCheckBox$a;
     .locals 1
 
-    sget-object v0, Lcom/discord/views/TernaryCheckBox;->CZ:Lcom/discord/views/TernaryCheckBox$a;
+    sget-object v0, Lcom/discord/views/TernaryCheckBox;->Dj:Lcom/discord/views/TernaryCheckBox$a;
 
     return-object v0
 .end method
@@ -410,39 +410,39 @@
 .method private final setDisabled(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CR:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Db:Lcom/discord/views/CheckableImageView;
 
     if-nez v0, :cond_0
 
     const-string v1, "checkOff"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     const/4 v1, 0x1
 
     invoke-virtual {v0, v1}, Lcom/discord/views/CheckableImageView;->setEnabled(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CU:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->De:Landroid/view/View;
 
     if-nez v0, :cond_1
 
     const-string v1, "offDisabledOverlay"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     const/16 v1, 0x8
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CT:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Dd:Landroid/view/View;
 
     const-string v1, "allDisabledOverlay"
 
     if-nez v0, :cond_2
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     new-instance v2, Lcom/discord/views/TernaryCheckBox$f;
@@ -453,11 +453,11 @@
 
     invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->CT:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Dd:Landroid/view/View;
 
     if-nez p1, :cond_3
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     const/4 v0, 0x0
@@ -470,39 +470,39 @@
 .method private final setOffDisabled(Ljava/lang/String;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CR:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Db:Lcom/discord/views/CheckableImageView;
 
     if-nez v0, :cond_0
 
     const-string v1, "checkOff"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Lcom/discord/views/CheckableImageView;->setEnabled(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CT:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Dd:Landroid/view/View;
 
     if-nez v0, :cond_1
 
     const-string v2, "allDisabledOverlay"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     const/16 v2, 0x8
 
     invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CU:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->De:Landroid/view/View;
 
     const-string v2, "offDisabledOverlay"
 
     if-nez v0, :cond_2
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     new-instance v3, Lcom/discord/views/TernaryCheckBox$g;
@@ -513,11 +513,11 @@
 
     invoke-virtual {v0, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->CU:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->De:Landroid/view/View;
 
     if-nez p1, :cond_3
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
@@ -527,10 +527,10 @@
 
 
 # virtual methods
-.method public final eL()Z
+.method public final eQ()Z
     .locals 2
 
-    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->CY:I
+    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->Di:I
 
     const/4 v1, 0x1
 
@@ -544,10 +544,10 @@
     return v0
 .end method
 
-.method public final eM()Z
+.method public final eR()Z
     .locals 2
 
-    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->CY:I
+    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->Di:I
 
     const/4 v1, -0x1
 
@@ -563,42 +563,42 @@
     return v0
 .end method
 
-.method public final eN()V
+.method public final eS()V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CR:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Db:Lcom/discord/views/CheckableImageView;
 
     if-nez v0, :cond_0
 
     const-string v1, "checkOff"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     const/4 v1, 0x1
 
     invoke-virtual {v0, v1}, Lcom/discord/views/CheckableImageView;->setEnabled(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CU:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->De:Landroid/view/View;
 
     if-nez v0, :cond_1
 
     const-string v1, "offDisabledOverlay"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     const/16 v1, 0x8
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CT:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Dd:Landroid/view/View;
 
     if-nez v0, :cond_2
 
     const-string v2, "allDisabledOverlay"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
@@ -609,7 +609,7 @@
 .method public final getOnSwitchStatusChangedListener()Lcom/discord/views/TernaryCheckBox$b;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CX:Lcom/discord/views/TernaryCheckBox$b;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Dh:Lcom/discord/views/TernaryCheckBox$b;
 
     return-object v0
 .end method
@@ -617,7 +617,7 @@
 .method public final getSwitchStatus()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->CY:I
+    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->Di:I
 
     return v0
 .end method
@@ -665,7 +665,7 @@
 .method public final setOnSwitchStatusChangedListener(Lcom/discord/views/TernaryCheckBox$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox;->CX:Lcom/discord/views/TernaryCheckBox$b;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Dh:Lcom/discord/views/TernaryCheckBox$b;
 
     return-void
 .end method
@@ -673,15 +673,15 @@
 .method public final setSwitchStatus(I)V
     .locals 4
 
-    iput p1, p0, Lcom/discord/views/TernaryCheckBox;->CY:I
+    iput p1, p0, Lcom/discord/views/TernaryCheckBox;->Di:I
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CQ:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Da:Lcom/discord/views/CheckableImageView;
 
     if-nez v0, :cond_0
 
     const-string v1, "checkOn"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     const/4 v1, 0x0
@@ -700,13 +700,13 @@
     :goto_0
     invoke-virtual {v0, v3}, Lcom/discord/views/CheckableImageView;->setChecked(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CR:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Db:Lcom/discord/views/CheckableImageView;
 
     if-nez v0, :cond_2
 
     const-string v3, "checkOff"
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     const/4 v3, -0x1
@@ -723,13 +723,13 @@
     :goto_1
     invoke-virtual {v0, v3}, Lcom/discord/views/CheckableImageView;->setChecked(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CS:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Dc:Lcom/discord/views/CheckableImageView;
 
     if-nez v0, :cond_4
 
     const-string v3, "checkNeutral"
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     if-nez p1, :cond_5
@@ -739,7 +739,7 @@
     :cond_5
     invoke-virtual {v0, v1}, Lcom/discord/views/CheckableImageView;->setChecked(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->CX:Lcom/discord/views/TernaryCheckBox$b;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Dh:Lcom/discord/views/TernaryCheckBox$b;
 
     if-eqz v0, :cond_6
 
diff --git a/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali b/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali
index 9cd5547935..441d5520df 100644
--- a/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali
+++ b/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali
@@ -8,9 +8,9 @@
 
 
 # instance fields
-.field private final Dc:Lkotlin/properties/ReadOnlyProperty;
+.field private final Dm:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Dd:Lkotlin/properties/ReadOnlyProperty;
+.field private final Dn:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final title$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -105,7 +105,7 @@
 
     invoke-direct {p0, p1}, Lcom/discord/views/b$a;-><init>(Landroid/content/Context;)V
 
-    const p1, 0x7f0a0754
+    const p1, 0x7f0a077d
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -113,21 +113,21 @@
 
     iput-object p1, p0, Lcom/discord/views/ToolbarTitleLayout;->title$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0755
+    const p1, 0x7f0a077e
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/ToolbarTitleLayout;->Dc:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/ToolbarTitleLayout;->Dm:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0753
+    const p1, 0x7f0a077c
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/ToolbarTitleLayout;->Dd:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/ToolbarTitleLayout;->Dn:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
@@ -155,7 +155,7 @@
 .method private final getTitleSubtext()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/ToolbarTitleLayout;->Dc:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ToolbarTitleLayout;->Dm:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/ToolbarTitleLayout;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -174,7 +174,7 @@
 
 
 # virtual methods
-.method public final eC()Landroid/view/ViewGroup;
+.method public final eG()Landroid/view/ViewGroup;
     .locals 4
 
     invoke-virtual {p0}, Lcom/discord/views/ToolbarTitleLayout;->getInflater()Landroid/view/LayoutInflater;
@@ -185,7 +185,7 @@
 
     check-cast v1, Landroid/view/ViewGroup;
 
-    const v2, 0x7f0d00ae
+    const v2, 0x7f0d00b6
 
     const/4 v3, 0x1
 
@@ -212,7 +212,7 @@
 .method public final getAvatarPresence()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/ToolbarTitleLayout;->Dd:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ToolbarTitleLayout;->Dn:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/ToolbarTitleLayout;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
diff --git a/com.discord/smali/com/discord/views/UploadProgressView.smali b/com.discord/smali/com/discord/views/UploadProgressView.smali
index ef5c9e5556..27c3cd685f 100644
--- a/com.discord/smali/com/discord/views/UploadProgressView.smali
+++ b/com.discord/smali/com/discord/views/UploadProgressView.smali
@@ -12,15 +12,15 @@
 
 
 # static fields
-.field public static final Dh:Lcom/discord/views/UploadProgressView$a;
+.field public static final Dr:Lcom/discord/views/UploadProgressView$a;
 
 
 # instance fields
-.field private final De:Landroid/widget/TextView;
+.field private final Do:Landroid/widget/TextView;
 
-.field private final Df:Landroid/graphics/drawable/Drawable;
+.field private final Dp:Landroid/graphics/drawable/Drawable;
 
-.field private final Dg:Landroid/graphics/drawable/Drawable;
+.field private final Dq:Landroid/graphics/drawable/Drawable;
 
 .field private final icon:Landroid/widget/ImageView;
 
@@ -39,7 +39,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/views/UploadProgressView$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/views/UploadProgressView;->Dh:Lcom/discord/views/UploadProgressView$a;
+    sput-object v0, Lcom/discord/views/UploadProgressView;->Dr:Lcom/discord/views/UploadProgressView$a;
 
     return-void
 .end method
@@ -57,11 +57,11 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d00af
+    const v1, 0x7f0d00b7
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0547
+    const p1, 0x7f0a0557
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -73,9 +73,9 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->De:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Do:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0546
+    const p1, 0x7f0a0556
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -89,7 +89,7 @@
 
     iput-object p1, p0, Lcom/discord/views/UploadProgressView;->subtext:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0540
+    const p1, 0x7f0a0550
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -103,7 +103,7 @@
 
     iput-object p1, p0, Lcom/discord/views/UploadProgressView;->progressBar:Landroid/widget/ProgressBar;
 
-    const p1, 0x7f0a0544
+    const p1, 0x7f0a0554
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -121,7 +121,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f0402bb
+    const v0, 0x7f0402be
 
     const/4 v1, 0x0
 
@@ -137,19 +137,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Dg:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Dq:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const v0, 0x7f080141
+    const v0, 0x7f080147
 
     invoke-static {p1, v0}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Df:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Dp:Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
@@ -167,11 +167,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d00af
+    const v0, 0x7f0d00b7
 
     invoke-static {p1, v0, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0547
+    const p1, 0x7f0a0557
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -183,9 +183,9 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->De:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Do:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0546
+    const p1, 0x7f0a0556
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -199,7 +199,7 @@
 
     iput-object p1, p0, Lcom/discord/views/UploadProgressView;->subtext:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0540
+    const p1, 0x7f0a0550
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -213,7 +213,7 @@
 
     iput-object p1, p0, Lcom/discord/views/UploadProgressView;->progressBar:Landroid/widget/ProgressBar;
 
-    const p1, 0x7f0a0544
+    const p1, 0x7f0a0554
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -231,7 +231,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0402bb
+    const p2, 0x7f0402be
 
     const/4 v0, 0x0
 
@@ -247,19 +247,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Dg:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Dq:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const p2, 0x7f080141
+    const p2, 0x7f080147
 
     invoke-static {p1, p2}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Df:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Dp:Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
@@ -281,11 +281,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d00af
+    const p3, 0x7f0d00b7
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0547
+    const p1, 0x7f0a0557
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -297,9 +297,9 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->De:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Do:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0546
+    const p1, 0x7f0a0556
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -313,7 +313,7 @@
 
     iput-object p1, p0, Lcom/discord/views/UploadProgressView;->subtext:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0540
+    const p1, 0x7f0a0550
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -327,7 +327,7 @@
 
     iput-object p1, p0, Lcom/discord/views/UploadProgressView;->progressBar:Landroid/widget/ProgressBar;
 
-    const p1, 0x7f0a0544
+    const p1, 0x7f0a0554
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -345,7 +345,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0402bb
+    const p2, 0x7f0402be
 
     const/4 p3, 0x0
 
@@ -361,19 +361,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Dg:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Dq:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const p2, 0x7f080141
+    const p2, 0x7f080147
 
     invoke-static {p1, p2}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Df:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Dp:Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
@@ -434,7 +434,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/views/UploadProgressView;->De:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/UploadProgressView;->Do:Landroid/widget/TextView;
 
     check-cast p1, Ljava/lang/CharSequence;
 
@@ -488,12 +488,12 @@
 
     if-ne p2, v1, :cond_2
 
-    iget-object p2, p0, Lcom/discord/views/UploadProgressView;->Df:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/discord/views/UploadProgressView;->Dp:Landroid/graphics/drawable/Drawable;
 
     goto :goto_2
 
     :cond_2
-    iget-object p2, p0, Lcom/discord/views/UploadProgressView;->Dg:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/discord/views/UploadProgressView;->Dq:Landroid/graphics/drawable/Drawable;
 
     :goto_2
     invoke-virtual {p1, p2}, Landroid/widget/ProgressBar;->setProgressDrawable(Landroid/graphics/drawable/Drawable;)V
diff --git a/com.discord/smali/com/discord/views/UserListItemView.smali b/com.discord/smali/com/discord/views/UserListItemView.smali
index 419b253763..b15f18b103 100644
--- a/com.discord/smali/com/discord/views/UserListItemView.smali
+++ b/com.discord/smali/com/discord/views/UserListItemView.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field public final Di:Landroid/widget/TextView;
+.field public final Ds:Landroid/widget/TextView;
 
-.field public final Dj:Landroid/widget/ImageView;
+.field public final Dt:Landroid/widget/ImageView;
 
-.field public final Dk:Landroid/view/View;
+.field public final Du:Landroid/view/View;
 
 .field public final userAvatar:Landroid/widget/ImageView;
 
@@ -77,13 +77,13 @@
 
     check-cast p3, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d00b1
+    const v0, 0x7f0d00b9
 
     invoke-virtual {p1, v0, p3, p2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
     move-result-object p1
 
-    const p2, 0x7f0a0784
+    const p2, 0x7f0a07ae
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -97,7 +97,7 @@
 
     iput-object p2, p0, Lcom/discord/views/UserListItemView;->userAvatar:Landroid/widget/ImageView;
 
-    const p2, 0x7f0a0785
+    const p2, 0x7f0a07af
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -111,7 +111,7 @@
 
     iput-object p2, p0, Lcom/discord/views/UserListItemView;->userName:Landroid/widget/TextView;
 
-    const p2, 0x7f0a0786
+    const p2, 0x7f0a07b0
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -123,9 +123,9 @@
 
     check-cast p2, Landroid/widget/TextView;
 
-    iput-object p2, p0, Lcom/discord/views/UserListItemView;->Di:Landroid/widget/TextView;
+    iput-object p2, p0, Lcom/discord/views/UserListItemView;->Ds:Landroid/widget/TextView;
 
-    const p2, 0x7f0a0788
+    const p2, 0x7f0a07b2
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -135,9 +135,9 @@
 
     invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p2, p0, Lcom/discord/views/UserListItemView;->Dk:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/views/UserListItemView;->Du:Landroid/view/View;
 
-    const p2, 0x7f0a0787
+    const p2, 0x7f0a07b1
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -149,7 +149,7 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/views/UserListItemView;->Dj:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/UserListItemView;->Dt:Landroid/widget/ImageView;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/VoiceUserView$a.smali b/com.discord/smali/com/discord/views/VoiceUserView$a.smali
index 21c696e4fa..a9cf2981f3 100644
--- a/com.discord/smali/com/discord/views/VoiceUserView$a.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserView$a.smali
@@ -23,17 +23,17 @@
 
 
 # static fields
-.field public static final enum Do:Lcom/discord/views/VoiceUserView$a;
+.field public static final enum DA:Lcom/discord/views/VoiceUserView$a;
 
-.field public static final enum Dp:Lcom/discord/views/VoiceUserView$a;
+.field public static final enum DB:Lcom/discord/views/VoiceUserView$a;
 
-.field public static final enum Dq:Lcom/discord/views/VoiceUserView$a;
+.field public static final enum DC:Lcom/discord/views/VoiceUserView$a;
 
-.field public static final enum Dr:Lcom/discord/views/VoiceUserView$a;
+.field private static final synthetic DD:[Lcom/discord/views/VoiceUserView$a;
 
-.field public static final enum Ds:Lcom/discord/views/VoiceUserView$a;
+.field public static final enum Dy:Lcom/discord/views/VoiceUserView$a;
 
-.field private static final synthetic Dt:[Lcom/discord/views/VoiceUserView$a;
+.field public static final enum Dz:Lcom/discord/views/VoiceUserView$a;
 
 
 # direct methods
@@ -52,7 +52,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/views/VoiceUserView$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/views/VoiceUserView$a;->Do:Lcom/discord/views/VoiceUserView$a;
+    sput-object v1, Lcom/discord/views/VoiceUserView$a;->Dy:Lcom/discord/views/VoiceUserView$a;
 
     aput-object v1, v0, v2
 
@@ -64,7 +64,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/views/VoiceUserView$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/views/VoiceUserView$a;->Dp:Lcom/discord/views/VoiceUserView$a;
+    sput-object v1, Lcom/discord/views/VoiceUserView$a;->Dz:Lcom/discord/views/VoiceUserView$a;
 
     aput-object v1, v0, v2
 
@@ -76,7 +76,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/views/VoiceUserView$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/views/VoiceUserView$a;->Dq:Lcom/discord/views/VoiceUserView$a;
+    sput-object v1, Lcom/discord/views/VoiceUserView$a;->DA:Lcom/discord/views/VoiceUserView$a;
 
     aput-object v1, v0, v2
 
@@ -88,7 +88,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/views/VoiceUserView$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/views/VoiceUserView$a;->Dr:Lcom/discord/views/VoiceUserView$a;
+    sput-object v1, Lcom/discord/views/VoiceUserView$a;->DB:Lcom/discord/views/VoiceUserView$a;
 
     aput-object v1, v0, v2
 
@@ -100,11 +100,11 @@
 
     invoke-direct {v1, v3, v2}, Lcom/discord/views/VoiceUserView$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/views/VoiceUserView$a;->Ds:Lcom/discord/views/VoiceUserView$a;
+    sput-object v1, Lcom/discord/views/VoiceUserView$a;->DC:Lcom/discord/views/VoiceUserView$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/views/VoiceUserView$a;->Dt:[Lcom/discord/views/VoiceUserView$a;
+    sput-object v0, Lcom/discord/views/VoiceUserView$a;->DD:[Lcom/discord/views/VoiceUserView$a;
 
     return-void
 .end method
@@ -139,7 +139,7 @@
 .method public static values()[Lcom/discord/views/VoiceUserView$a;
     .locals 1
 
-    sget-object v0, Lcom/discord/views/VoiceUserView$a;->Dt:[Lcom/discord/views/VoiceUserView$a;
+    sget-object v0, Lcom/discord/views/VoiceUserView$a;->DD:[Lcom/discord/views/VoiceUserView$a;
 
     invoke-virtual {v0}, [Lcom/discord/views/VoiceUserView$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/views/VoiceUserView$b.smali b/com.discord/smali/com/discord/views/VoiceUserView$b.smali
index a855b44a08..51c2ab5be1 100644
--- a/com.discord/smali/com/discord/views/VoiceUserView$b.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserView$b.smali
@@ -54,7 +54,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/views/VoiceUserView$a;->Dr:Lcom/discord/views/VoiceUserView$a;
+    sget-object v1, Lcom/discord/views/VoiceUserView$a;->DB:Lcom/discord/views/VoiceUserView$a;
 
     if-ne v0, v1, :cond_0
 
diff --git a/com.discord/smali/com/discord/views/VoiceUserView$c.smali b/com.discord/smali/com/discord/views/VoiceUserView$c.smali
index 8ac0d5127b..b79cfb5076 100644
--- a/com.discord/smali/com/discord/views/VoiceUserView$c.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserView$c.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/views/VoiceUserView$c;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/VoiceUserView.smali b/com.discord/smali/com/discord/views/VoiceUserView.smali
index 9aaae6f482..3de7f2f21e 100644
--- a/com.discord/smali/com/discord/views/VoiceUserView.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserView.smali
@@ -16,11 +16,11 @@
 
 
 # instance fields
-.field private Dl:Lcom/discord/views/VoiceUserView$a;
+.field private Dv:Lcom/discord/views/VoiceUserView$a;
 
-.field private final Dm:Lcom/discord/utilities/anim/RingAnimator;
+.field private final Dw:Lcom/discord/utilities/anim/RingAnimator;
 
-.field private Dn:Lcom/discord/models/domain/ModelVoice$User;
+.field private Dx:Lcom/discord/models/domain/ModelVoice$User;
 
 .field private final avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -135,7 +135,7 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p3, 0x7f0a0800
+    const p3, 0x7f0a083d
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -143,7 +143,7 @@
 
     iput-object p3, p0, Lcom/discord/views/VoiceUserView;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a0806
+    const p3, 0x7f0a0844
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -167,13 +167,13 @@
 
     invoke-direct {p3, v0, v1, v2, v2}, Lcom/discord/utilities/anim/RingAnimator;-><init>(Landroid/view/View;Lkotlin/jvm/functions/Function0;FF)V
 
-    iput-object p3, p0, Lcom/discord/views/VoiceUserView;->Dm:Lcom/discord/utilities/anim/RingAnimator;
+    iput-object p3, p0, Lcom/discord/views/VoiceUserView;->Dw:Lcom/discord/utilities/anim/RingAnimator;
 
     move-object p3, p0
 
     check-cast p3, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d00b4
+    const v0, 0x7f0d00bc
 
     invoke-static {p1, v0, p3}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -228,7 +228,7 @@
 .method public static final synthetic a(Lcom/discord/views/VoiceUserView;)Lcom/discord/views/VoiceUserView$a;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/views/VoiceUserView;->Dl:Lcom/discord/views/VoiceUserView$a;
+    iget-object p0, p0, Lcom/discord/views/VoiceUserView;->Dv:Lcom/discord/views/VoiceUserView$a;
 
     return-object p0
 .end method
@@ -236,7 +236,7 @@
 .method public static synthetic a(Lcom/discord/views/VoiceUserView;Lcom/discord/models/domain/ModelVoice$User;)V
     .locals 1
 
-    const v0, 0x7f07005b
+    const v0, 0x7f07005a
 
     invoke-virtual {p0, p1, v0}, Lcom/discord/views/VoiceUserView;->a(Lcom/discord/models/domain/ModelVoice$User;I)V
 
@@ -292,7 +292,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lcom/discord/views/VoiceUserView$a;->Dp:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->Dz:Lcom/discord/views/VoiceUserView$a;
 
     goto :goto_1
 
@@ -303,7 +303,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object p1, Lcom/discord/views/VoiceUserView$a;->Dr:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->DB:Lcom/discord/views/VoiceUserView$a;
 
     goto :goto_1
 
@@ -314,7 +314,7 @@
 
     if-nez v0, :cond_2
 
-    sget-object p1, Lcom/discord/views/VoiceUserView$a;->Ds:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->DC:Lcom/discord/views/VoiceUserView$a;
 
     goto :goto_1
 
@@ -337,12 +337,12 @@
     :goto_0
     if-eqz p1, :cond_4
 
-    sget-object p1, Lcom/discord/views/VoiceUserView$a;->Dq:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->DA:Lcom/discord/views/VoiceUserView$a;
 
     goto :goto_1
 
     :cond_4
-    sget-object p1, Lcom/discord/views/VoiceUserView$a;->Do:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->Dy:Lcom/discord/views/VoiceUserView$a;
 
     :goto_1
     invoke-direct {p0, p1}, Lcom/discord/views/VoiceUserView;->setVoiceState(Lcom/discord/views/VoiceUserView$a;)V
@@ -353,14 +353,14 @@
 .method private final setVoiceState(Lcom/discord/views/VoiceUserView$a;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/VoiceUserView;->Dl:Lcom/discord/views/VoiceUserView$a;
+    iget-object v0, p0, Lcom/discord/views/VoiceUserView;->Dv:Lcom/discord/views/VoiceUserView$a;
 
     if-ne p1, v0, :cond_0
 
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/discord/views/VoiceUserView;->Dl:Lcom/discord/views/VoiceUserView$a;
+    iput-object p1, p0, Lcom/discord/views/VoiceUserView;->Dv:Lcom/discord/views/VoiceUserView$a;
 
     sget-object v0, Lcom/discord/views/j;->$EnumSwitchMapping$0:[I
 
@@ -383,12 +383,12 @@
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f080187
+    const v0, 0x7f080196
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f080188
+    const v0, 0x7f080197
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/views/VoiceUserView;->setBackgroundResource(I)V
@@ -419,7 +419,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/views/VoiceUserView;->setAlpha(F)V
 
-    iget-object p1, p0, Lcom/discord/views/VoiceUserView;->Dm:Lcom/discord/utilities/anim/RingAnimator;
+    iget-object p1, p0, Lcom/discord/views/VoiceUserView;->Dw:Lcom/discord/utilities/anim/RingAnimator;
 
     invoke-virtual {p1}, Lcom/discord/utilities/anim/RingAnimator;->onUpdate()V
 
@@ -435,7 +435,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/views/VoiceUserView;->Dn:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v0, p0, Lcom/discord/views/VoiceUserView;->Dx:Lcom/discord/models/domain/ModelVoice$User;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -446,7 +446,7 @@
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/discord/views/VoiceUserView;->Dn:Lcom/discord/models/domain/ModelVoice$User;
+    iput-object p1, p0, Lcom/discord/views/VoiceUserView;->Dx:Lcom/discord/models/domain/ModelVoice$User;
 
     invoke-direct {p0}, Lcom/discord/views/VoiceUserView;->getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -563,7 +563,7 @@
 .method public final setVoiceUser(Lcom/discord/models/domain/ModelVoice$User;)V
     .locals 1
 
-    const v0, 0x7f07005b
+    const v0, 0x7f07005a
 
     invoke-virtual {p0, p1, v0}, Lcom/discord/views/VoiceUserView;->a(Lcom/discord/models/domain/ModelVoice$User;I)V
 
diff --git a/com.discord/smali/com/discord/views/a.smali b/com.discord/smali/com/discord/views/a.smali
index 6586929c60..1d9c5cacad 100644
--- a/com.discord/smali/com/discord/views/a.smali
+++ b/com.discord/smali/com/discord/views/a.smali
@@ -10,7 +10,7 @@
 .method static synthetic constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eB()[I
+    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eF()[I
 
     move-result-object v0
 
@@ -20,7 +20,7 @@
 
     sput-object v0, Lcom/discord/views/a;->$EnumSwitchMapping$0:[I
 
-    sget v1, Lcom/discord/views/CheckedSetting$b;->Bn:I
+    sget v1, Lcom/discord/views/CheckedSetting$b;->Bw:I
 
     const/4 v2, 0x1
 
@@ -30,7 +30,7 @@
 
     sget-object v0, Lcom/discord/views/a;->$EnumSwitchMapping$0:[I
 
-    sget v1, Lcom/discord/views/CheckedSetting$b;->Bo:I
+    sget v1, Lcom/discord/views/CheckedSetting$b;->Bx:I
 
     sub-int/2addr v1, v2
 
@@ -40,7 +40,7 @@
 
     sget-object v0, Lcom/discord/views/a;->$EnumSwitchMapping$0:[I
 
-    sget v1, Lcom/discord/views/CheckedSetting$b;->Bp:I
+    sget v1, Lcom/discord/views/CheckedSetting$b;->By:I
 
     sub-int/2addr v1, v2
 
diff --git a/com.discord/smali/com/discord/views/b$a$1.smali b/com.discord/smali/com/discord/views/b$a$1.smali
index 49b61ef56f..984306fb9d 100644
--- a/com.discord/smali/com/discord/views/b$a$1.smali
+++ b/com.discord/smali/com/discord/views/b$a$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic BN:Lcom/discord/views/b$a;
+.field final synthetic BX:Lcom/discord/views/b$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/b$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/b$a$1;->BN:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$1;->BX:Lcom/discord/views/b$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,7 +48,7 @@
 
     check-cast p1, Landroid/view/View;
 
-    iget-object v0, p0, Lcom/discord/views/b$a$1;->BN:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$1;->BX:Lcom/discord/views/b$a;
 
     invoke-static {v0, p1}, Lcom/discord/views/b$a;->a(Lcom/discord/views/b$a;Landroid/view/View;)V
 
diff --git a/com.discord/smali/com/discord/views/b$a$2.smali b/com.discord/smali/com/discord/views/b$a$2.smali
index 2e6a6708dd..4e3ab947e5 100644
--- a/com.discord/smali/com/discord/views/b$a$2.smali
+++ b/com.discord/smali/com/discord/views/b$a$2.smali
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic BN:Lcom/discord/views/b$a;
+.field final synthetic BX:Lcom/discord/views/b$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/b$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/b$a$2;->BN:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$2;->BX:Lcom/discord/views/b$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,7 +51,7 @@
 
     check-cast p2, Ljava/lang/Integer;
 
-    iget-object v0, p0, Lcom/discord/views/b$a$2;->BN:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$2;->BX:Lcom/discord/views/b$a;
 
     invoke-virtual {p2}, Ljava/lang/Integer;->intValue()I
 
diff --git a/com.discord/smali/com/discord/views/b$a$3.smali b/com.discord/smali/com/discord/views/b$a$3.smali
index bc1f817b3b..b1ed15a0c8 100644
--- a/com.discord/smali/com/discord/views/b$a$3.smali
+++ b/com.discord/smali/com/discord/views/b$a$3.smali
@@ -29,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic BN:Lcom/discord/views/b$a;
+.field final synthetic BX:Lcom/discord/views/b$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/b$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/b$a$3;->BN:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$3;->BX:Lcom/discord/views/b$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,7 +54,7 @@
 
     check-cast p3, Ljava/lang/Integer;
 
-    iget-object v0, p0, Lcom/discord/views/b$a$3;->BN:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$3;->BX:Lcom/discord/views/b$a;
 
     invoke-virtual {p2}, Ljava/lang/Integer;->intValue()I
 
diff --git a/com.discord/smali/com/discord/views/b$a$4.smali b/com.discord/smali/com/discord/views/b$a$4.smali
index 33d3bb039d..1df989a2d9 100644
--- a/com.discord/smali/com/discord/views/b$a$4.smali
+++ b/com.discord/smali/com/discord/views/b$a$4.smali
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic BN:Lcom/discord/views/b$a;
+.field final synthetic BX:Lcom/discord/views/b$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/b$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/b$a$4;->BN:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$4;->BX:Lcom/discord/views/b$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,7 +51,7 @@
 
     check-cast p2, Landroid/view/ViewGroup$LayoutParams;
 
-    iget-object v0, p0, Lcom/discord/views/b$a$4;->BN:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$4;->BX:Lcom/discord/views/b$a;
 
     invoke-static {v0, p1, p2}, Lcom/discord/views/b$a;->a(Lcom/discord/views/b$a;Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V
 
diff --git a/com.discord/smali/com/discord/views/b$a$5.smali b/com.discord/smali/com/discord/views/b$a$5.smali
index 8acd4e3a5f..2400c26bae 100644
--- a/com.discord/smali/com/discord/views/b$a$5.smali
+++ b/com.discord/smali/com/discord/views/b$a$5.smali
@@ -29,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic BN:Lcom/discord/views/b$a;
+.field final synthetic BX:Lcom/discord/views/b$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/b$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/b$a$5;->BN:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$5;->BX:Lcom/discord/views/b$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,7 +54,7 @@
 
     check-cast p3, Landroid/view/ViewGroup$LayoutParams;
 
-    iget-object v0, p0, Lcom/discord/views/b$a$5;->BN:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$5;->BX:Lcom/discord/views/b$a;
 
     invoke-virtual {p2}, Ljava/lang/Integer;->intValue()I
 
diff --git a/com.discord/smali/com/discord/views/b$a.smali b/com.discord/smali/com/discord/views/b$a.smali
index d7f1ec1603..3c4085544c 100644
--- a/com.discord/smali/com/discord/views/b$a.smali
+++ b/com.discord/smali/com/discord/views/b$a.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final BM:Lcom/discord/views/b;
+.field private final BW:Lcom/discord/views/b;
 
 
 # direct methods
@@ -33,9 +33,9 @@
 
     invoke-direct {p1, v0}, Lcom/discord/views/b;-><init>(B)V
 
-    iput-object p1, p0, Lcom/discord/views/b$a;->BM:Lcom/discord/views/b;
+    iput-object p1, p0, Lcom/discord/views/b$a;->BW:Lcom/discord/views/b;
 
-    iget-object p1, p0, Lcom/discord/views/b$a;->BM:Lcom/discord/views/b;
+    iget-object p1, p0, Lcom/discord/views/b$a;->BW:Lcom/discord/views/b;
 
     invoke-static {p1, p0}, Lcom/discord/views/b;->a(Lcom/discord/views/b;Lcom/discord/views/b$b;)V
 
@@ -53,9 +53,9 @@
 
     invoke-direct {p1, p2}, Lcom/discord/views/b;-><init>(B)V
 
-    iput-object p1, p0, Lcom/discord/views/b$a;->BM:Lcom/discord/views/b;
+    iput-object p1, p0, Lcom/discord/views/b$a;->BW:Lcom/discord/views/b;
 
-    iget-object p1, p0, Lcom/discord/views/b$a;->BM:Lcom/discord/views/b;
+    iget-object p1, p0, Lcom/discord/views/b$a;->BW:Lcom/discord/views/b;
 
     invoke-static {p1, p0}, Lcom/discord/views/b;->a(Lcom/discord/views/b;Lcom/discord/views/b$b;)V
 
@@ -73,9 +73,9 @@
 
     invoke-direct {p1, p2}, Lcom/discord/views/b;-><init>(B)V
 
-    iput-object p1, p0, Lcom/discord/views/b$a;->BM:Lcom/discord/views/b;
+    iput-object p1, p0, Lcom/discord/views/b$a;->BW:Lcom/discord/views/b;
 
-    iget-object p1, p0, Lcom/discord/views/b$a;->BM:Lcom/discord/views/b;
+    iget-object p1, p0, Lcom/discord/views/b$a;->BW:Lcom/discord/views/b;
 
     invoke-static {p1, p0}, Lcom/discord/views/b;->a(Lcom/discord/views/b;Lcom/discord/views/b$b;)V
 
@@ -127,7 +127,7 @@
 .method public addView(Landroid/view/View;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/b$a;->BM:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->BW:Lcom/discord/views/b;
 
     new-instance v1, Lcom/discord/views/b$a$1;
 
@@ -142,7 +142,7 @@
     return-void
 
     :cond_0
-    iget-object v0, v0, Lcom/discord/views/b;->BL:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->BV:Landroid/view/ViewGroup;
 
     invoke-virtual {v0, p1}, Landroid/view/ViewGroup;->addView(Landroid/view/View;)V
 
@@ -152,7 +152,7 @@
 .method public addView(Landroid/view/View;I)V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/b$a;->BM:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->BW:Lcom/discord/views/b;
 
     new-instance v1, Lcom/discord/views/b$a$2;
 
@@ -171,7 +171,7 @@
     return-void
 
     :cond_0
-    iget-object v0, v0, Lcom/discord/views/b;->BL:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->BV:Landroid/view/ViewGroup;
 
     invoke-virtual {v0, p1, p2}, Landroid/view/ViewGroup;->addView(Landroid/view/View;I)V
 
@@ -181,7 +181,7 @@
 .method public addView(Landroid/view/View;II)V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/b$a;->BM:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->BW:Lcom/discord/views/b;
 
     new-instance v1, Lcom/discord/views/b$a$3;
 
@@ -204,7 +204,7 @@
     return-void
 
     :cond_0
-    iget-object v0, v0, Lcom/discord/views/b;->BL:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->BV:Landroid/view/ViewGroup;
 
     invoke-virtual {v0, p1, p2, p3}, Landroid/view/ViewGroup;->addView(Landroid/view/View;II)V
 
@@ -214,7 +214,7 @@
 .method public addView(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/b$a;->BM:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->BW:Lcom/discord/views/b;
 
     new-instance v1, Lcom/discord/views/b$a$5;
 
@@ -233,7 +233,7 @@
     return-void
 
     :cond_0
-    iget-object v0, v0, Lcom/discord/views/b;->BL:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->BV:Landroid/view/ViewGroup;
 
     invoke-virtual {v0, p1, p2, p3}, Landroid/view/ViewGroup;->addView(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
 
@@ -243,7 +243,7 @@
 .method public addView(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/b$a;->BM:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->BW:Lcom/discord/views/b;
 
     new-instance v1, Lcom/discord/views/b$a$4;
 
@@ -258,7 +258,7 @@
     return-void
 
     :cond_0
-    iget-object v0, v0, Lcom/discord/views/b;->BL:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->BV:Landroid/view/ViewGroup;
 
     invoke-virtual {v0, p1, p2}, Landroid/view/ViewGroup;->addView(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V
 
diff --git a/com.discord/smali/com/discord/views/b$b.smali b/com.discord/smali/com/discord/views/b$b.smali
index 621599e515..e15f4a3cb9 100644
--- a/com.discord/smali/com/discord/views/b$b.smali
+++ b/com.discord/smali/com/discord/views/b$b.smali
@@ -15,5 +15,5 @@
 
 
 # virtual methods
-.method public abstract eC()Landroid/view/ViewGroup;
+.method public abstract eG()Landroid/view/ViewGroup;
 .end method
diff --git a/com.discord/smali/com/discord/views/b.smali b/com.discord/smali/com/discord/views/b.smali
index f1ea0208fd..e4229f9586 100644
--- a/com.discord/smali/com/discord/views/b.smali
+++ b/com.discord/smali/com/discord/views/b.smali
@@ -13,7 +13,7 @@
 
 
 # instance fields
-.field BL:Landroid/view/ViewGroup;
+.field BV:Landroid/view/ViewGroup;
 
 .field initialized:Z
 
@@ -38,11 +38,11 @@
 .method static synthetic a(Lcom/discord/views/b;Lcom/discord/views/b$b;)V
     .locals 0
 
-    invoke-interface {p1}, Lcom/discord/views/b$b;->eC()Landroid/view/ViewGroup;
+    invoke-interface {p1}, Lcom/discord/views/b$b;->eG()Landroid/view/ViewGroup;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/b;->BL:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/b;->BV:Landroid/view/ViewGroup;
 
     const/4 p1, 0x1
 
diff --git a/com.discord/smali/com/discord/views/c$a.smali b/com.discord/smali/com/discord/views/c$a.smali
index cdf87b2253..c2bfcd462c 100644
--- a/com.discord/smali/com/discord/views/c$a.smali
+++ b/com.discord/smali/com/discord/views/c$a.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field private final BP:Landroid/widget/TextView;
+.field private final BZ:Landroid/widget/TextView;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/c$a;->BP:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/c$a;->BZ:Landroid/widget/TextView;
 
     return-void
 .end method
@@ -54,9 +54,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/views/c;->BO:Lcom/discord/views/c;
+    sget-object v0, Lcom/discord/views/c;->BY:Lcom/discord/views/c;
 
-    iget-object v0, p0, Lcom/discord/views/c$a;->BP:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/c$a;->BZ:Landroid/widget/TextView;
 
     invoke-static {v0, p1}, Lcom/discord/views/c;->a(Landroid/widget/TextView;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/views/c$b.smali b/com.discord/smali/com/discord/views/c$b.smali
index 154a246451..6af7521567 100644
--- a/com.discord/smali/com/discord/views/c$b.smali
+++ b/com.discord/smali/com/discord/views/c$b.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/c;->eD()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+    value = Lcom/discord/views/c;->eI()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final BQ:Lcom/discord/views/c$b;
+.field public static final Ca:Lcom/discord/views/c$b;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/c$b;-><init>()V
 
-    sput-object v0, Lcom/discord/views/c$b;->BQ:Lcom/discord/views/c$b;
+    sput-object v0, Lcom/discord/views/c$b;->Ca:Lcom/discord/views/c$b;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d0051
+    const v0, 0x7f0d0053
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/views/c$c.smali b/com.discord/smali/com/discord/views/c$c.smali
index a9f74697ab..c7cd2fd00b 100644
--- a/com.discord/smali/com/discord/views/c$c.smali
+++ b/com.discord/smali/com/discord/views/c$c.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final BR:Lcom/discord/views/c$c;
+.field public static final Cb:Lcom/discord/views/c$c;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/c$c;-><init>()V
 
-    sput-object v0, Lcom/discord/views/c$c;->BR:Lcom/discord/views/c$c;
+    sput-object v0, Lcom/discord/views/c$c;->Cb:Lcom/discord/views/c$c;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/c$d.smali b/com.discord/smali/com/discord/views/c$d.smali
index 201ff821ab..4ef11d2f08 100644
--- a/com.discord/smali/com/discord/views/c$d.smali
+++ b/com.discord/smali/com/discord/views/c$d.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final BS:Lcom/discord/views/c$d;
+.field public static final Cc:Lcom/discord/views/c$d;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/c$d;-><init>()V
 
-    sput-object v0, Lcom/discord/views/c$d;->BS:Lcom/discord/views/c$d;
+    sput-object v0, Lcom/discord/views/c$d;->Cc:Lcom/discord/views/c$d;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/c.smali b/com.discord/smali/com/discord/views/c.smali
index 7d1eb5fdf4..ac044de0d6 100644
--- a/com.discord/smali/com/discord/views/c.smali
+++ b/com.discord/smali/com/discord/views/c.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field public static final BO:Lcom/discord/views/c;
+.field public static final BY:Lcom/discord/views/c;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/c;-><init>()V
 
-    sput-object v0, Lcom/discord/views/c;->BO:Lcom/discord/views/c;
+    sput-object v0, Lcom/discord/views/c;->BY:Lcom/discord/views/c;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f32
+    const p0, 0x7f120f69
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -89,7 +89,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f34
+    const p0, 0x7f120f6b
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -146,7 +146,7 @@
 
     const/4 v7, 0x0
 
-    sget-object p0, Lcom/discord/views/c$c;->BR:Lcom/discord/views/c$c;
+    sget-object p0, Lcom/discord/views/c$c;->Cb:Lcom/discord/views/c$c;
 
     move-object v8, p0
 
@@ -161,7 +161,7 @@
     if-nez v2, :cond_4
 
     :cond_1
-    const p0, 0x7f120f41
+    const p0, 0x7f120f78
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -178,7 +178,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f4f
+    const p0, 0x7f120f89
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -195,7 +195,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f38
+    const p0, 0x7f120f6f
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -212,7 +212,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f45
+    const p0, 0x7f120f7c
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -248,7 +248,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f50
+    const p0, 0x7f120f8a
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -265,7 +265,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f3a
+    const p0, 0x7f120f71
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -301,7 +301,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f2e
+    const p0, 0x7f120f65
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -318,7 +318,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f4c
+    const p0, 0x7f120f84
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -335,7 +335,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f52
+    const p0, 0x7f120f8c
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -352,7 +352,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f36
+    const p0, 0x7f120f6d
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -409,7 +409,7 @@
 
     const/4 v7, 0x0
 
-    sget-object p0, Lcom/discord/views/c$d;->BS:Lcom/discord/views/c$d;
+    sget-object p0, Lcom/discord/views/c$d;->Cc:Lcom/discord/views/c$d;
 
     move-object v8, p0
 
@@ -424,7 +424,7 @@
     if-nez v2, :cond_4
 
     :cond_3
-    const p0, 0x7f120f47
+    const p0, 0x7f120f7e
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -441,7 +441,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f49
+    const p0, 0x7f120f80
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -458,7 +458,24 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f30
+    const p0, 0x7f120f67
+
+    invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+
+    :sswitch_11
+    const-string p0, "relationships.read"
+
+    invoke-virtual {p2, p0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_4
+
+    const p0, 0x7f120f86
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -472,6 +489,7 @@
 
     :sswitch_data_0
     .sparse-switch
+        -0x71f43197 -> :sswitch_11
         -0x6816e562 -> :sswitch_10
         -0x5e746088 -> :sswitch_f
         -0x499abd20 -> :sswitch_e
@@ -520,7 +538,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f31
+    const v0, 0x7f120f68
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -537,7 +555,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f33
+    const v0, 0x7f120f6a
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -554,7 +572,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f40
+    const v0, 0x7f120f77
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -571,7 +589,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f4e
+    const v0, 0x7f120f88
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -588,7 +606,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f37
+    const v0, 0x7f120f6e
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -605,7 +623,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f44
+    const v0, 0x7f120f7b
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -622,7 +640,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f42
+    const v0, 0x7f120f79
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -639,7 +657,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f4d
+    const v0, 0x7f120f87
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -656,7 +674,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f39
+    const v0, 0x7f120f70
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -673,7 +691,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f4a
+    const v0, 0x7f120f82
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -690,13 +708,13 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f2d
+    const v0, 0x7f120f64
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
 
-    goto :goto_1
+    goto/16 :goto_1
 
     :sswitch_b
     const-string v0, "messages.read"
@@ -707,7 +725,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f4b
+    const v0, 0x7f120f83
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -724,7 +742,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f51
+    const v0, 0x7f120f8b
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -741,7 +759,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f35
+    const v0, 0x7f120f6c
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -758,7 +776,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f46
+    const v0, 0x7f120f7d
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -775,7 +793,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f48
+    const v0, 0x7f120f7f
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -792,7 +810,24 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f2f
+    const v0, 0x7f120f66
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    goto :goto_1
+
+    :sswitch_11
+    const-string v0, "relationships.read"
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const v0, 0x7f120f85
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -822,8 +857,11 @@
 
     return-void
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
+        -0x71f43197 -> :sswitch_11
         -0x6816e562 -> :sswitch_10
         -0x5e746088 -> :sswitch_f
         -0x499abd20 -> :sswitch_e
@@ -844,7 +882,7 @@
     .end sparse-switch
 .end method
 
-.method public static eD()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+.method public static eI()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -858,7 +896,7 @@
 
     new-instance v0, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 
-    sget-object v1, Lcom/discord/views/c$b;->BQ:Lcom/discord/views/c$b;
+    sget-object v1, Lcom/discord/views/c$b;->Ca:Lcom/discord/views/c$b;
 
     check-cast v1, Lkotlin/jvm/functions/Function2;
 
diff --git a/com.discord/smali/com/discord/views/e$1.smali b/com.discord/smali/com/discord/views/e$1.smali
index 1c09cfed0f..d5c34302c7 100644
--- a/com.discord/smali/com/discord/views/e$1.smali
+++ b/com.discord/smali/com/discord/views/e$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic BU:Lcom/discord/views/e;
+.field final synthetic Ce:Lcom/discord/views/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/e$1;->BU:Lcom/discord/views/e;
+    iput-object p1, p0, Lcom/discord/views/e$1;->Ce:Lcom/discord/views/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/views/e$1;->BU:Lcom/discord/views/e;
+    iget-object p1, p0, Lcom/discord/views/e$1;->Ce:Lcom/discord/views/e;
 
-    invoke-virtual {p1}, Lcom/discord/views/e;->eE()V
+    invoke-virtual {p1}, Lcom/discord/views/e;->eJ()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/e$a.smali b/com.discord/smali/com/discord/views/e$a.smali
index a24bb4a300..cb37f7ed33 100644
--- a/com.discord/smali/com/discord/views/e$a.smali
+++ b/com.discord/smali/com/discord/views/e$a.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/e;->eE()V
+    value = Lcom/discord/views/e;->eJ()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic BU:Lcom/discord/views/e;
+.field final synthetic Ce:Lcom/discord/views/e;
 
 
 # direct methods
 .method public constructor <init>(Lcom/discord/views/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/e$a;->BU:Lcom/discord/views/e;
+    iput-object p1, p0, Lcom/discord/views/e$a;->Ce:Lcom/discord/views/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,13 +51,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/views/e$a;->BU:Lcom/discord/views/e;
+    iget-object p1, p0, Lcom/discord/views/e$a;->Ce:Lcom/discord/views/e;
 
     invoke-virtual {p1}, Lcom/discord/views/e;->getOnDialogClosed()Lkotlin/jvm/functions/Function1;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/views/e$a;->BU:Lcom/discord/views/e;
+    iget-object v0, p0, Lcom/discord/views/e$a;->Ce:Lcom/discord/views/e;
 
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/views/e$b.smali b/com.discord/smali/com/discord/views/e$b.smali
index 79637682b3..e521e6e871 100644
--- a/com.discord/smali/com/discord/views/e$b.smali
+++ b/com.discord/smali/com/discord/views/e$b.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/e;->eE()V
+    value = Lcom/discord/views/e;->eJ()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic BV:Landroid/animation/Animator;
+.field final synthetic Cf:Landroid/animation/Animator;
 
 
 # direct methods
 .method constructor <init>(Landroid/animation/Animator;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/e$b;->BV:Landroid/animation/Animator;
+    iput-object p1, p0, Lcom/discord/views/e$b;->Cf:Landroid/animation/Animator;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,7 +43,7 @@
 .method public final onViewDetachedFromWindow(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/views/e$b;->BV:Landroid/animation/Animator;
+    iget-object p1, p0, Lcom/discord/views/e$b;->Cf:Landroid/animation/Animator;
 
     invoke-virtual {p1}, Landroid/animation/Animator;->end()V
 
diff --git a/com.discord/smali/com/discord/views/e$c.smali b/com.discord/smali/com/discord/views/e$c.smali
index 8c681fab98..8e8c399de8 100644
--- a/com.discord/smali/com/discord/views/e$c.smali
+++ b/com.discord/smali/com/discord/views/e$c.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final BW:Lcom/discord/views/e$c;
+.field public static final Cg:Lcom/discord/views/e$c;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/e$c;-><init>()V
 
-    sput-object v0, Lcom/discord/views/e$c;->BW:Lcom/discord/views/e$c;
+    sput-object v0, Lcom/discord/views/e$c;->Cg:Lcom/discord/views/e$c;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/e.smali b/com.discord/smali/com/discord/views/e.smali
index be58b9c88f..2406d4349a 100644
--- a/com.discord/smali/com/discord/views/e.smali
+++ b/com.discord/smali/com/discord/views/e.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private BT:Lkotlin/jvm/functions/Function1;
+.field private Cd:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -41,7 +41,7 @@
 
     invoke-direct {p0, p1}, Lcom/discord/overlay/views/OverlayDialog;-><init>(Landroid/content/Context;)V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -61,18 +61,18 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/views/e;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    sget-object p1, Lcom/discord/views/e$c;->BW:Lcom/discord/views/e$c;
+    sget-object p1, Lcom/discord/views/e$c;->Cg:Lcom/discord/views/e$c;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/views/e;->BT:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/views/e;->Cd:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final eE()V
+.method public final eJ()V
     .locals 2
 
     invoke-virtual {p0}, Lcom/discord/views/e;->getPaused()Lrx/subjects/Subject;
@@ -140,7 +140,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/discord/views/e;->BT:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/views/e;->Cd:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -162,7 +162,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/views/e;->BT:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/views/e;->Cd:Lkotlin/jvm/functions/Function1;
 
     return-object v0
 .end method
@@ -217,7 +217,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/views/e;->BT:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/views/e;->Cd:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/f$1.smali b/com.discord/smali/com/discord/views/f$1.smali
index 21e5dbde77..9d3b77c8fa 100644
--- a/com.discord/smali/com/discord/views/f$1.smali
+++ b/com.discord/smali/com/discord/views/f$1.smali
@@ -50,9 +50,9 @@
 
     iget-object v0, p0, Lcom/discord/views/f$1;->this$0:Lcom/discord/views/f;
 
-    invoke-virtual {v0}, Lcom/discord/views/f;->eE()V
+    invoke-virtual {v0}, Lcom/discord/views/f;->eJ()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/views/f$a.smali b/com.discord/smali/com/discord/views/f$a.smali
index 42f0a8820d..2facb09fb5 100644
--- a/com.discord/smali/com/discord/views/f$a.smali
+++ b/com.discord/smali/com/discord/views/f$a.smali
@@ -56,7 +56,7 @@
 
     iget-object v0, p0, Lcom/discord/views/f$a;->voiceUserView:Lcom/discord/views/VoiceUserView;
 
-    const v1, 0x7f070054
+    const v1, 0x7f070053
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/views/VoiceUserView;->a(Lcom/discord/models/domain/ModelVoice$User;I)V
 
diff --git a/com.discord/smali/com/discord/views/f$b.smali b/com.discord/smali/com/discord/views/f$b.smali
index bc8123d2bb..a234e176c0 100644
--- a/com.discord/smali/com/discord/views/f$b.smali
+++ b/com.discord/smali/com/discord/views/f$b.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final Ca:Lcom/discord/views/f$b;
+.field public static final Ck:Lcom/discord/views/f$b;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/f$b;-><init>()V
 
-    sput-object v0, Lcom/discord/views/f$b;->Ca:Lcom/discord/views/f$b;
+    sput-object v0, Lcom/discord/views/f$b;->Ck:Lcom/discord/views/f$b;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d0053
+    const v0, 0x7f0d0055
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/views/f$c$1.smali b/com.discord/smali/com/discord/views/f$c$1.smali
index 00864394f9..29845a6977 100644
--- a/com.discord/smali/com/discord/views/f$c$1.smali
+++ b/com.discord/smali/com/discord/views/f$c$1.smali
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final Cc:Lcom/discord/views/f$c$1;
+.field public static final Cm:Lcom/discord/views/f$c$1;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/f$c$1;-><init>()V
 
-    sput-object v0, Lcom/discord/views/f$c$1;->Cc:Lcom/discord/views/f$c$1;
+    sput-object v0, Lcom/discord/views/f$c$1;->Cm:Lcom/discord/views/f$c$1;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/f$c.smali b/com.discord/smali/com/discord/views/f$c.smali
index 5f540f61ba..a67f7df08d 100644
--- a/com.discord/smali/com/discord/views/f$c.smali
+++ b/com.discord/smali/com/discord/views/f$c.smali
@@ -33,7 +33,7 @@
 
 
 # static fields
-.field public static final Cb:Lcom/discord/views/f$c;
+.field public static final Cl:Lcom/discord/views/f$c;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/f$c;-><init>()V
 
-    sput-object v0, Lcom/discord/views/f$c;->Cb:Lcom/discord/views/f$c;
+    sput-object v0, Lcom/discord/views/f$c;->Cl:Lcom/discord/views/f$c;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     if-nez v4, :cond_1
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -109,7 +109,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/views/f$c$1;->Cc:Lcom/discord/views/f$c$1;
+    sget-object v0, Lcom/discord/views/f$c$1;->Cm:Lcom/discord/views/f$c$1;
 
     check-cast v0, Lrx/functions/b;
 
@@ -117,7 +117,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/views/f$d.smali b/com.discord/smali/com/discord/views/f$d.smali
index 7864fceff5..4de384c666 100644
--- a/com.discord/smali/com/discord/views/f$d.smali
+++ b/com.discord/smali/com/discord/views/f$d.smali
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final Cd:Lcom/discord/views/f$d;
+.field public static final Cn:Lcom/discord/views/f$d;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/f$d;-><init>()V
 
-    sput-object v0, Lcom/discord/views/f$d;->Cd:Lcom/discord/views/f$d;
+    sput-object v0, Lcom/discord/views/f$d;->Cn:Lcom/discord/views/f$d;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/f$e.smali b/com.discord/smali/com/discord/views/f$e.smali
index ecbfa3a71c..e4763fd5e3 100644
--- a/com.discord/smali/com/discord/views/f$e.smali
+++ b/com.discord/smali/com/discord/views/f$e.smali
@@ -74,7 +74,7 @@
 
     invoke-static {v1, v0, p1}, Lcom/discord/views/f;->a(Lcom/discord/views/f;Ljava/util/List;I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/f.smali b/com.discord/smali/com/discord/views/f.smali
index 14b321b73e..1f92badb20 100644
--- a/com.discord/smali/com/discord/views/f.smali
+++ b/com.discord/smali/com/discord/views/f.smali
@@ -19,11 +19,11 @@
 
 
 # instance fields
-.field private final BX:Lkotlin/properties/ReadOnlyProperty;
+.field private final Ch:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final BY:Lkotlin/properties/ReadOnlyProperty;
+.field private final Ci:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final BZ:Lkotlin/properties/ReadOnlyProperty;
+.field private final Cj:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final adapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
     .annotation system Ldalvik/annotation/Signature;
@@ -159,7 +159,7 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d0052
+    const v1, 0x7f0d0054
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -167,15 +167,15 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/views/f;->setClipChildren(Z)V
 
-    const p1, 0x7f0a04bb
+    const p1, 0x7f0a04d1
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/f;->BX:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/f;->Ch:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b6
+    const p1, 0x7f0a04cc
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -183,25 +183,25 @@
 
     iput-object p1, p0, Lcom/discord/views/f;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b9
+    const p1, 0x7f0a04cf
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/f;->BY:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/f;->Ci:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04ba
+    const p1, 0x7f0a04d0
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/f;->BZ:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/f;->Cj:Lkotlin/properties/ReadOnlyProperty;
 
     new-instance p1, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 
-    sget-object v0, Lcom/discord/views/f$b;->Ca:Lcom/discord/views/f$b;
+    sget-object v0, Lcom/discord/views/f$b;->Ck:Lcom/discord/views/f$b;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
@@ -287,7 +287,7 @@
 .method private final getMembersRv()Landroidx/recyclerview/widget/RecyclerView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/f;->BZ:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/f;->Cj:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/f;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -307,7 +307,7 @@
 .method private final getOverflowTv()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/f;->BY:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/f;->Ci:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/f;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -327,7 +327,7 @@
 .method private final getOverlayMenu()Lcom/discord/views/OverlayMenuView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/f;->BX:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/f;->Ch:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/f;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -531,7 +531,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/views/f$c;->Cb:Lcom/discord/views/f$c;
+    sget-object v2, Lcom/discord/views/f$c;->Cl:Lcom/discord/views/f$c;
 
     check-cast v2, Lrx/functions/b;
 
@@ -539,7 +539,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/views/f$d;->Cd:Lcom/discord/views/f$d;
+    sget-object v2, Lcom/discord/views/f$d;->Cn:Lcom/discord/views/f$d;
 
     check-cast v2, Lrx/functions/b;
 
diff --git a/com.discord/smali/com/discord/views/g$b$1.smali b/com.discord/smali/com/discord/views/g$b$1.smali
index 0f5e18d943..666b9ec517 100644
--- a/com.discord/smali/com/discord/views/g$b$1.smali
+++ b/com.discord/smali/com/discord/views/g$b$1.smali
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final CB:Lcom/discord/views/g$b$1;
+.field public static final CL:Lcom/discord/views/g$b$1;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/g$b$1;-><init>()V
 
-    sput-object v0, Lcom/discord/views/g$b$1;->CB:Lcom/discord/views/g$b$1;
+    sput-object v0, Lcom/discord/views/g$b$1;->CL:Lcom/discord/views/g$b$1;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/g$b.smali b/com.discord/smali/com/discord/views/g$b.smali
index f36a18b392..e455c3fb9f 100644
--- a/com.discord/smali/com/discord/views/g$b.smali
+++ b/com.discord/smali/com/discord/views/g$b.smali
@@ -33,7 +33,7 @@
 
 
 # static fields
-.field public static final CA:Lcom/discord/views/g$b;
+.field public static final CK:Lcom/discord/views/g$b;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/g$b;-><init>()V
 
-    sput-object v0, Lcom/discord/views/g$b;->CA:Lcom/discord/views/g$b;
+    sput-object v0, Lcom/discord/views/g$b;->CK:Lcom/discord/views/g$b;
 
     return-void
 .end method
@@ -107,7 +107,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/views/g$b$1;->CB:Lcom/discord/views/g$b$1;
+    sget-object v0, Lcom/discord/views/g$b$1;->CL:Lcom/discord/views/g$b$1;
 
     check-cast v0, Lrx/functions/b;
 
@@ -115,7 +115,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/views/g$c.smali b/com.discord/smali/com/discord/views/g$c.smali
index 8825c38d2d..84a96f27b3 100644
--- a/com.discord/smali/com/discord/views/g$c.smali
+++ b/com.discord/smali/com/discord/views/g$c.smali
@@ -55,7 +55,7 @@
 
     invoke-static {v0, p1}, Lcom/discord/views/g;->a(Lcom/discord/views/g;Lcom/discord/models/domain/ModelVoice$User;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/g.smali b/com.discord/smali/com/discord/views/g.smali
index 6aec1c058d..3af46beec9 100644
--- a/com.discord/smali/com/discord/views/g.smali
+++ b/com.discord/smali/com/discord/views/g.smali
@@ -17,11 +17,11 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final Cz:Lcom/discord/views/g$a;
+.field public static final CJ:Lcom/discord/views/g$a;
 
 
 # instance fields
-.field private final Cy:Lkotlin/properties/ReadOnlyProperty;
+.field private final CI:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final paused:Lrx/subjects/Subject;
     .annotation system Ldalvik/annotation/Signature;
@@ -73,7 +73,7 @@
 
     invoke-direct {v0, v2}, Lcom/discord/views/g$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/views/g;->Cz:Lcom/discord/views/g$a;
+    sput-object v0, Lcom/discord/views/g;->CJ:Lcom/discord/views/g$a;
 
     return-void
 .end method
@@ -95,11 +95,11 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d0054
+    const v1, 0x7f0d0056
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -111,13 +111,13 @@
 
     iput-object p1, p0, Lcom/discord/views/g;->paused:Lrx/subjects/Subject;
 
-    const p1, 0x7f0a04b3
+    const p1, 0x7f0a04c9
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/g;->Cy:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/g;->CI:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
@@ -127,7 +127,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/views/g;->eF()V
+    invoke-direct {p0}, Lcom/discord/views/g;->eK()V
 
     return-void
 
@@ -156,12 +156,12 @@
 
     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/views/g;->eG()V
+    invoke-direct {p0}, Lcom/discord/views/g;->eL()V
 
     return-void
 .end method
 
-.method private final eF()V
+.method private final eK()V
     .locals 3
 
     invoke-virtual {p0}, Lcom/discord/views/g;->getImageView$app_productionDiscordExternalRelease()Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -189,7 +189,7 @@
     return-void
 .end method
 
-.method private final eG()V
+.method private final eL()V
     .locals 3
 
     invoke-virtual {p0}, Lcom/discord/views/g;->getImageView$app_productionDiscordExternalRelease()Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -228,7 +228,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;->d(Landroid/view/View;)V
 
-    invoke-direct {p0}, Lcom/discord/views/g;->eG()V
+    invoke-direct {p0}, Lcom/discord/views/g;->eL()V
 
     return-void
 .end method
@@ -236,7 +236,7 @@
 .method public final getImageView$app_productionDiscordExternalRelease()Lcom/facebook/drawee/view/SimpleDraweeView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/g;->Cy:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/g;->CI:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/g;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -285,7 +285,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/views/g$b;->CA:Lcom/discord/views/g$b;
+    sget-object v1, Lcom/discord/views/g$b;->CK:Lcom/discord/views/g$b;
 
     check-cast v1, Lrx/functions/b;
 
@@ -412,12 +412,12 @@
     return-void
 .end method
 
-.method public final r(Z)V
+.method public final p(Z)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/views/g;->eF()V
+    invoke-direct {p0}, Lcom/discord/views/g;->eK()V
 
-    invoke-super {p0, p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;->r(Z)V
+    invoke-super {p0, p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;->p(Z)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/h$b.smali b/com.discord/smali/com/discord/views/h$b.smali
index 7f89d9dc92..fd405573f9 100644
--- a/com.discord/smali/com/discord/views/h$b.smali
+++ b/com.discord/smali/com/discord/views/h$b.smali
@@ -80,7 +80,7 @@
 
     if-eqz p2, :cond_1
 
-    sget-object p2, Lcom/discord/app/DiscordConnectService;->vZ:Lcom/discord/app/DiscordConnectService$a;
+    sget-object p2, Lcom/discord/app/DiscordConnectService;->vX:Lcom/discord/app/DiscordConnectService$a;
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -118,6 +118,10 @@
 
     move-result-object p2
 
+    const-string p3, "IntentUtils.RouteBuilder\u2026kage(context.packageName)"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     sget p3, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 p4, 0x1a
@@ -134,10 +138,10 @@
     :goto_0
     iget-object p1, p0, Lcom/discord/views/h$b;->this$0:Lcom/discord/views/h;
 
-    invoke-virtual {p1}, Lcom/discord/views/h;->eE()V
+    invoke-virtual {p1}, Lcom/discord/views/h;->eJ()V
 
     :cond_1
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/h$c.smali b/com.discord/smali/com/discord/views/h$c.smali
index fbd3254c56..9a90d5129e 100644
--- a/com.discord/smali/com/discord/views/h$c.smali
+++ b/com.discord/smali/com/discord/views/h$c.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/h;->eH()V
+    value = Lcom/discord/views/h;->eM()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -39,7 +39,7 @@
 
     iget-object p1, p0, Lcom/discord/views/h$c;->this$0:Lcom/discord/views/h;
 
-    invoke-virtual {p1}, Lcom/discord/views/h;->eE()V
+    invoke-virtual {p1}, Lcom/discord/views/h;->eJ()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/h$d.smali b/com.discord/smali/com/discord/views/h$d.smali
index e0d3242368..f998e7fd1b 100644
--- a/com.discord/smali/com/discord/views/h$d.smali
+++ b/com.discord/smali/com/discord/views/h$d.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/h;->eH()V
+    value = Lcom/discord/views/h;->eM()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -67,7 +67,7 @@
 
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/h$e.smali b/com.discord/smali/com/discord/views/h$e.smali
index 1029596b29..c5b9a29d54 100644
--- a/com.discord/smali/com/discord/views/h$e.smali
+++ b/com.discord/smali/com/discord/views/h$e.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/h;->eH()V
+    value = Lcom/discord/views/h;->eM()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final CE:Lcom/discord/views/h$e;
+.field public static final CO:Lcom/discord/views/h$e;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0}, Lcom/discord/views/h$e;-><init>()V
 
-    sput-object v0, Lcom/discord/views/h$e;->CE:Lcom/discord/views/h$e;
+    sput-object v0, Lcom/discord/views/h$e;->CO:Lcom/discord/views/h$e;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/h$f.smali b/com.discord/smali/com/discord/views/h$f.smali
index c8960468c7..8158a686fa 100644
--- a/com.discord/smali/com/discord/views/h$f.smali
+++ b/com.discord/smali/com/discord/views/h$f.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/h;->eH()V
+    value = Lcom/discord/views/h;->eM()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -59,7 +59,7 @@
 
     invoke-static {v0, p1}, Lcom/discord/views/h;->a(Lcom/discord/views/h;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/h.smali b/com.discord/smali/com/discord/views/h.smali
index d853e10831..d9414f8122 100644
--- a/com.discord/smali/com/discord/views/h.smali
+++ b/com.discord/smali/com/discord/views/h.smali
@@ -11,9 +11,9 @@
 
 
 # instance fields
-.field private final CC:Lkotlin/properties/ReadOnlyProperty;
+.field private final CM:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final CD:Lkotlin/properties/ReadOnlyProperty;
+.field private final CN:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final closeBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -168,11 +168,11 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d0055
+    const v1, 0x7f0d0057
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a021b
+    const p1, 0x7f0a021c
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -180,15 +180,15 @@
 
     iput-object p1, p0, Lcom/discord/views/h;->closeBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a05ab
+    const p1, 0x7f0a05c5
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/h;->CC:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/h;->CM:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a02b2
+    const p1, 0x7f0a02bb
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -196,13 +196,13 @@
 
     iput-object p1, p0, Lcom/discord/views/h;->emptyResults$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0559
+    const p1, 0x7f0a0573
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/h;->CD:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/h;->CN:Lkotlin/properties/ReadOnlyProperty;
 
     new-instance p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
 
@@ -388,7 +388,7 @@
     return-object p0
 .end method
 
-.method private final eH()V
+.method private final eM()V
     .locals 12
 
     invoke-direct {p0}, Lcom/discord/views/h;->getCloseBtn()Landroid/view/View;
@@ -463,7 +463,7 @@
 
     iget-object v1, p0, Lcom/discord/views/h;->filterPublisher:Lrx/subjects/BehaviorSubject;
 
-    sget-object v2, Lcom/discord/views/h$e;->CE:Lcom/discord/views/h$e;
+    sget-object v2, Lcom/discord/views/h$e;->CO:Lcom/discord/views/h$e;
 
     check-cast v2, Lrx/functions/b;
 
@@ -561,7 +561,7 @@
 .method private final getFilterEt()Landroid/widget/EditText;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/h;->CC:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/h;->CM:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/h;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -581,7 +581,7 @@
 .method private final getResultsRv()Landroidx/recyclerview/widget/RecyclerView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/h;->CD:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/h;->CN:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/h;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -613,7 +613,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a0255
+    const v1, 0x7f0a025e
 
     invoke-virtual {p0, v1}, Lcom/discord/views/h;->findViewById(I)Landroid/view/View;
 
@@ -633,7 +633,7 @@
 
     invoke-super {p0}, Lcom/discord/views/e;->onAttachedToWindow()V
 
-    invoke-direct {p0}, Lcom/discord/views/h;->eH()V
+    invoke-direct {p0}, Lcom/discord/views/h;->eM()V
 
     invoke-virtual {p0}, Lcom/discord/views/h;->getContext()Landroid/content/Context;
 
@@ -645,7 +645,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a0255
+    const v1, 0x7f0a025e
 
     invoke-virtual {p0, v1}, Lcom/discord/views/h;->findViewById(I)Landroid/view/View;
 
@@ -671,7 +671,7 @@
 
     invoke-virtual {p1, v0}, Lrx/subjects/Subject;->onNext(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotterknife/a;->bpH:Lkotterknife/a;
+    sget-object p1, Lkotterknife/a;->bqb:Lkotterknife/a;
 
     invoke-static {p0}, Lkotterknife/a;->reset(Ljava/lang/Object;)V
 
@@ -685,11 +685,11 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d0055
+    const v1, 0x7f0d0057
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    invoke-direct {p0}, Lcom/discord/views/h;->eH()V
+    invoke-direct {p0}, Lcom/discord/views/h;->eM()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/i.smali b/com.discord/smali/com/discord/views/i.smali
index d2ccde1c68..4770c21af9 100644
--- a/com.discord/smali/com/discord/views/i.smali
+++ b/com.discord/smali/com/discord/views/i.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field public CG:Landroid/widget/TextSwitcher;
+.field public CQ:Landroid/widget/TextSwitcher;
 
-.field private CH:Landroid/widget/TextView;
+.field private CR:Landroid/widget/TextView;
 
-.field private CI:Landroid/widget/TextView;
+.field private CS:Landroid/widget/TextView;
 
-.field public CJ:I
+.field public CT:I
 
-.field public CK:Ljava/lang/Long;
+.field public CU:Ljava/lang/Long;
 
 .field public emojiTextView:Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
 
@@ -29,13 +29,13 @@
 
     move-result-object p1
 
-    const v0, 0x7f0d005c
+    const v0, 0x7f0d005e
 
     invoke-static {p1, v0, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
     move-result-object p1
 
-    const v0, 0x7f0a0554
+    const v0, 0x7f0a0564
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -45,7 +45,7 @@
 
     iput-object v0, p0, Lcom/discord/views/i;->emojiTextView:Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
 
-    const v0, 0x7f0a0553
+    const v0, 0x7f0a0563
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -53,9 +53,9 @@
 
     check-cast v0, Landroid/widget/TextSwitcher;
 
-    iput-object v0, p0, Lcom/discord/views/i;->CG:Landroid/widget/TextSwitcher;
+    iput-object v0, p0, Lcom/discord/views/i;->CQ:Landroid/widget/TextSwitcher;
 
-    const v0, 0x7f0a0551
+    const v0, 0x7f0a0561
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -63,9 +63,9 @@
 
     check-cast v0, Landroid/widget/TextView;
 
-    iput-object v0, p0, Lcom/discord/views/i;->CH:Landroid/widget/TextView;
+    iput-object v0, p0, Lcom/discord/views/i;->CR:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0552
+    const v0, 0x7f0a0562
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -73,7 +73,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/i;->CI:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/i;->CS:Landroid/widget/TextView;
 
     return-void
 .end method
@@ -93,11 +93,11 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/views/i;->setActivated(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/i;->CH:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/i;->CR:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setActivated(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/i;->CI:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/i;->CS:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setActivated(Z)V
 
diff --git a/com.discord/smali/com/discord/views/j.smali b/com.discord/smali/com/discord/views/j.smali
index 039f8f0463..0fb2c1acd9 100644
--- a/com.discord/smali/com/discord/views/j.smali
+++ b/com.discord/smali/com/discord/views/j.smali
@@ -22,7 +22,7 @@
 
     sput-object v0, Lcom/discord/views/j;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/views/VoiceUserView$a;->Dp:Lcom/discord/views/VoiceUserView$a;
+    sget-object v1, Lcom/discord/views/VoiceUserView$a;->Dz:Lcom/discord/views/VoiceUserView$a;
 
     invoke-virtual {v1}, Lcom/discord/views/VoiceUserView$a;->ordinal()I
 
@@ -34,7 +34,7 @@
 
     sget-object v0, Lcom/discord/views/j;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/views/VoiceUserView$a;->Dq:Lcom/discord/views/VoiceUserView$a;
+    sget-object v1, Lcom/discord/views/VoiceUserView$a;->DA:Lcom/discord/views/VoiceUserView$a;
 
     invoke-virtual {v1}, Lcom/discord/views/VoiceUserView$a;->ordinal()I
 
@@ -54,7 +54,7 @@
 
     sput-object v0, Lcom/discord/views/j;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/views/VoiceUserView$a;->Ds:Lcom/discord/views/VoiceUserView$a;
+    sget-object v1, Lcom/discord/views/VoiceUserView$a;->DC:Lcom/discord/views/VoiceUserView$a;
 
     invoke-virtual {v1}, Lcom/discord/views/VoiceUserView$a;->ordinal()I
 
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 658c7fbf6f..fa91774b95 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
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final DH:Ljava/lang/Class;
+.field final DT:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -26,13 +26,13 @@
     .end annotation
 .end field
 
-.field private final DI:I
+.field private final DU:I
 
-.field private final DJ:I
+.field private final DV:I
 
-.field private final DK:I
+.field private final DW:I
 
-.field private final DL:Lkotlin/jvm/functions/Function1;
+.field private final DX:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field private final DN:Lkotlin/jvm/functions/Function1;
+.field private final DY:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -54,9 +54,9 @@
     .end annotation
 .end field
 
-.field private final DO:Z
+.field private final DZ:Z
 
-.field private final DQ:Z
+.field private final Ea:Z
 
 .field private final onCancel:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
@@ -128,35 +128,35 @@
 
     invoke-direct/range {v0 .. v9}, Lcom/discord/views/steps/StepsView$b;-><init>(IIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZB)V
 
-    iput-object v11, v10, Lcom/discord/views/steps/StepsView$b$a;->DH:Ljava/lang/Class;
+    iput-object v11, v10, Lcom/discord/views/steps/StepsView$b$a;->DT:Ljava/lang/Class;
 
     move v0, p2
 
-    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->DI:I
+    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->DU:I
 
     move v0, p3
 
-    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->DJ:I
+    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->DV:I
 
     move/from16 v0, p4
 
-    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->DK:I
+    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->DW:I
 
     const/4 v0, 0x0
 
-    iput-object v0, v10, Lcom/discord/views/steps/StepsView$b$a;->DL:Lkotlin/jvm/functions/Function1;
+    iput-object v0, v10, Lcom/discord/views/steps/StepsView$b$a;->DX:Lkotlin/jvm/functions/Function1;
 
     iput-object v0, v10, Lcom/discord/views/steps/StepsView$b$a;->onCancel:Lkotlin/jvm/functions/Function1;
 
-    iput-object v0, v10, Lcom/discord/views/steps/StepsView$b$a;->DN:Lkotlin/jvm/functions/Function1;
+    iput-object v0, v10, Lcom/discord/views/steps/StepsView$b$a;->DY:Lkotlin/jvm/functions/Function1;
 
     move/from16 v0, p8
 
-    iput-boolean v0, v10, Lcom/discord/views/steps/StepsView$b$a;->DO:Z
+    iput-boolean v0, v10, Lcom/discord/views/steps/StepsView$b$a;->DZ:Z
 
     move/from16 v0, p9
 
-    iput-boolean v0, v10, Lcom/discord/views/steps/StepsView$b$a;->DQ:Z
+    iput-boolean v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Ea:Z
 
     return-void
 .end method
@@ -170,9 +170,9 @@
 
     if-eqz v1, :cond_0
 
-    const v1, 0x7f120bae
+    const v1, 0x7f120be0
 
-    const v4, 0x7f120bae
+    const v4, 0x7f120be0
 
     goto :goto_0
 
@@ -184,9 +184,9 @@
 
     if-eqz v1, :cond_1
 
-    const v1, 0x7f120288
+    const v1, 0x7f12028c
 
-    const v5, 0x7f120288
+    const v5, 0x7f12028c
 
     goto :goto_1
 
@@ -198,9 +198,9 @@
 
     if-eqz v1, :cond_2
 
-    const v1, 0x7f120529
+    const v1, 0x7f120534
 
-    const v6, 0x7f120529
+    const v6, 0x7f120534
 
     goto :goto_2
 
@@ -266,9 +266,9 @@
 
     check-cast p1, Lcom/discord/views/steps/StepsView$b$a;
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DH:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DT:Ljava/lang/Class;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DH:Ljava/lang/Class;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DT:Ljava/lang/Class;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -276,9 +276,9 @@
 
     if-eqz v1, :cond_5
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DI:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DU:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DI:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DU:I
 
     if-ne v1, v3, :cond_0
 
@@ -292,9 +292,9 @@
     :goto_0
     if-eqz v1, :cond_5
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DJ:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DV:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DJ:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DV:I
 
     if-ne v1, v3, :cond_1
 
@@ -308,9 +308,9 @@
     :goto_1
     if-eqz v1, :cond_5
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DK:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DW:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DK:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DW:I
 
     if-ne v1, v3, :cond_2
 
@@ -324,9 +324,9 @@
     :goto_2
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DL:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DX:Lkotlin/jvm/functions/Function1;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DL:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DX:Lkotlin/jvm/functions/Function1;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -344,9 +344,9 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DN:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DY:Lkotlin/jvm/functions/Function1;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DN:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DY:Lkotlin/jvm/functions/Function1;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -354,9 +354,9 @@
 
     if-eqz v1, :cond_5
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DO:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DZ:Z
 
-    iget-boolean v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DO:Z
+    iget-boolean v3, p1, Lcom/discord/views/steps/StepsView$b$a;->DZ:Z
 
     if-ne v1, v3, :cond_3
 
@@ -370,9 +370,9 @@
     :goto_3
     if-eqz v1, :cond_5
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DQ:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Ea:Z
 
-    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b$a;->DQ:Z
+    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b$a;->Ea:Z
 
     if-ne v1, p1, :cond_4
 
@@ -399,7 +399,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/steps/StepsView$b$a;->DH:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$b$a;->DT:Ljava/lang/Class;
 
     const/4 v1, 0x0
 
@@ -417,25 +417,37 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->DI:I
+    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->DU:I
+
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
 
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->DJ:I
+    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->DV:I
+
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
 
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->DK:I
+    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->DW:I
+
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
 
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/views/steps/StepsView$b$a;->DL:Lkotlin/jvm/functions/Function1;
+    iget-object v2, p0, Lcom/discord/views/steps/StepsView$b$a;->DX:Lkotlin/jvm/functions/Function1;
 
     if-eqz v2, :cond_1
 
@@ -471,7 +483,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/views/steps/StepsView$b$a;->DN:Lkotlin/jvm/functions/Function1;
+    iget-object v2, p0, Lcom/discord/views/steps/StepsView$b$a;->DY:Lkotlin/jvm/functions/Function1;
 
     if-eqz v2, :cond_3
 
@@ -484,7 +496,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DO:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DZ:Z
 
     const/4 v2, 0x1
 
@@ -497,7 +509,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DQ:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Ea:Z
 
     if-eqz v1, :cond_5
 
@@ -518,7 +530,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DH:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DT:Ljava/lang/Class;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -526,7 +538,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DI:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DU:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -534,7 +546,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DJ:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DV:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -542,7 +554,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DK:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DW:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -550,7 +562,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DL:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DX:Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -566,7 +578,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DN:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DY:Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -574,7 +586,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DO:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DZ:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -582,7 +594,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->DQ:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Ea:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
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 8b71526a06..91eaceaa6d 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
@@ -15,13 +15,13 @@
 
 
 # instance fields
-.field private final DI:I
+.field private final DU:I
 
-.field private final DJ:I
+.field private final DV:I
 
-.field private final DK:I
+.field private final DW:I
 
-.field private final DL:Lkotlin/jvm/functions/Function1;
+.field private final DX:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final DN:Lkotlin/jvm/functions/Function1;
+.field private final DY:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -43,11 +43,11 @@
     .end annotation
 .end field
 
-.field private final DO:Z
+.field private final DZ:Z
 
-.field private final DQ:Z
+.field private final Ea:Z
 
-.field final DR:I
+.field final Eb:I
 
 .field private final onCancel:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
@@ -77,9 +77,9 @@
 
     check-cast p1, Lcom/discord/views/steps/StepsView$b$b;
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DR:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Eb:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->DR:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Eb:I
 
     if-ne v1, v3, :cond_0
 
@@ -93,9 +93,9 @@
     :goto_0
     if-eqz v1, :cond_6
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DI:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DU:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->DI:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->DU:I
 
     if-ne v1, v3, :cond_1
 
@@ -109,9 +109,9 @@
     :goto_1
     if-eqz v1, :cond_6
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DJ:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DV:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->DJ:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->DV:I
 
     if-ne v1, v3, :cond_2
 
@@ -125,9 +125,9 @@
     :goto_2
     if-eqz v1, :cond_6
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DK:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DW:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->DK:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->DW:I
 
     if-ne v1, v3, :cond_3
 
@@ -141,9 +141,9 @@
     :goto_3
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DL:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DX:Lkotlin/jvm/functions/Function1;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$b;->DL:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$b;->DX:Lkotlin/jvm/functions/Function1;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -161,9 +161,9 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DN:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DY:Lkotlin/jvm/functions/Function1;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$b;->DN:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$b;->DY:Lkotlin/jvm/functions/Function1;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -171,9 +171,9 @@
 
     if-eqz v1, :cond_6
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DO:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DZ:Z
 
-    iget-boolean v3, p1, Lcom/discord/views/steps/StepsView$b$b;->DO:Z
+    iget-boolean v3, p1, Lcom/discord/views/steps/StepsView$b$b;->DZ:Z
 
     if-ne v1, v3, :cond_4
 
@@ -187,9 +187,9 @@
     :goto_4
     if-eqz v1, :cond_6
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DQ:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Ea:Z
 
-    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b$b;->DQ:Z
+    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b$b;->Ea:Z
 
     if-ne v1, p1, :cond_5
 
@@ -216,29 +216,45 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lcom/discord/views/steps/StepsView$b$b;->DR:I
+    iget v0, p0, Lcom/discord/views/steps/StepsView$b$b;->Eb:I
+
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DI:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DU:I
+
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DJ:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DV:I
+
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DK:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DW:I
+
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DL:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DX:Lkotlin/jvm/functions/Function1;
 
     const/4 v2, 0x0
 
@@ -276,7 +292,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DN:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DY:Lkotlin/jvm/functions/Function1;
 
     if-eqz v1, :cond_2
 
@@ -289,7 +305,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DO:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DZ:Z
 
     const/4 v2, 0x1
 
@@ -302,7 +318,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DQ:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Ea:Z
 
     if-eqz v1, :cond_4
 
@@ -323,7 +339,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DR:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Eb:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -331,7 +347,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DI:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DU:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -339,7 +355,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DJ:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DV:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -347,7 +363,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DK:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DW:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -355,7 +371,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DL:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DX:Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -371,7 +387,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DN:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DY:Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -379,7 +395,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DO:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DZ:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -387,7 +403,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->DQ:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Ea:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$b.smali b/com.discord/smali/com/discord/views/steps/StepsView$b.smali
index bc367cabe6..e31eaa2b74 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$b.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$b.smali
@@ -22,11 +22,13 @@
 
 
 # instance fields
-.field final DA:I
+.field final DJ:I
 
-.field final DB:I
+.field final DK:I
 
-.field final DC:Lkotlin/jvm/functions/Function1;
+.field final DL:I
+
+.field final DN:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -37,7 +39,7 @@
     .end annotation
 .end field
 
-.field final DD:Lkotlin/jvm/functions/Function1;
+.field final DO:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -48,7 +50,7 @@
     .end annotation
 .end field
 
-.field final DE:Lkotlin/jvm/functions/Function1;
+.field final DQ:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -59,11 +61,9 @@
     .end annotation
 .end field
 
-.field final DF:Z
+.field final DR:Z
 
-.field final DG:Z
-
-.field final Dz:I
+.field final DS:Z
 
 
 # direct methods
@@ -92,21 +92,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/views/steps/StepsView$b;->Dz:I
+    iput p1, p0, Lcom/discord/views/steps/StepsView$b;->DJ:I
 
-    iput p2, p0, Lcom/discord/views/steps/StepsView$b;->DA:I
+    iput p2, p0, Lcom/discord/views/steps/StepsView$b;->DK:I
 
-    iput p3, p0, Lcom/discord/views/steps/StepsView$b;->DB:I
+    iput p3, p0, Lcom/discord/views/steps/StepsView$b;->DL:I
 
-    iput-object p4, p0, Lcom/discord/views/steps/StepsView$b;->DC:Lkotlin/jvm/functions/Function1;
+    iput-object p4, p0, Lcom/discord/views/steps/StepsView$b;->DN:Lkotlin/jvm/functions/Function1;
 
-    iput-object p5, p0, Lcom/discord/views/steps/StepsView$b;->DD:Lkotlin/jvm/functions/Function1;
+    iput-object p5, p0, Lcom/discord/views/steps/StepsView$b;->DO:Lkotlin/jvm/functions/Function1;
 
-    iput-object p6, p0, Lcom/discord/views/steps/StepsView$b;->DE:Lkotlin/jvm/functions/Function1;
+    iput-object p6, p0, Lcom/discord/views/steps/StepsView$b;->DQ:Lkotlin/jvm/functions/Function1;
 
-    iput-boolean p7, p0, Lcom/discord/views/steps/StepsView$b;->DF:Z
+    iput-boolean p7, p0, Lcom/discord/views/steps/StepsView$b;->DR:Z
 
-    iput-boolean p8, p0, Lcom/discord/views/steps/StepsView$b;->DG:Z
+    iput-boolean p8, p0, Lcom/discord/views/steps/StepsView$b;->DS:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$c.smali b/com.discord/smali/com/discord/views/steps/StepsView$c.smali
index 040232a706..cb6813f991 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$c.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$c.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private DR:I
+.field private Eb:I
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/views/steps/StepsView$c;->DR:I
+    iput v0, p0, Lcom/discord/views/steps/StepsView$c;->Eb:I
 
     return-void
 .end method
@@ -36,7 +36,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/views/steps/StepsView$c;->DR:I
+    iget v0, p0, Lcom/discord/views/steps/StepsView$c;->Eb:I
 
     return v0
 .end method
@@ -64,7 +64,7 @@
     const/4 p1, -0x1
 
     :goto_0
-    iput p1, p0, Lcom/discord/views/steps/StepsView$c;->DR:I
+    iput p1, p0, Lcom/discord/views/steps/StepsView$c;->Eb:I
 
     return-void
 .end method
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 3b671ed8c6..3fb0136356 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$d.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$d.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public DS:Ljava/util/List;
+.field public Ec:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -45,7 +45,7 @@
 .method public final getCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/views/steps/StepsView$d;->DS:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$d;->Ec:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
@@ -64,7 +64,7 @@
 .method public final getItem(I)Landroidx/fragment/app/Fragment;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/steps/StepsView$d;->DS:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$d;->Ec:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
@@ -86,16 +86,12 @@
 
     check-cast p1, Lcom/discord/views/steps/StepsView$b$a;
 
-    iget-object p1, p1, Lcom/discord/views/steps/StepsView$b$a;->DH:Ljava/lang/Class;
+    iget-object p1, p1, Lcom/discord/views/steps/StepsView$b$a;->DT:Ljava/lang/Class;
 
     invoke-virtual {p1}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
 
     move-result-object p1
 
-    const-string v0, "currentStep.fragment.newInstance()"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     check-cast p1, Landroidx/fragment/app/Fragment;
 
     return-object p1
@@ -115,7 +111,7 @@
 
     check-cast p1, Lcom/discord/views/steps/StepsView$b$b;
 
-    iget p1, p1, Lcom/discord/views/steps/StepsView$b$b;->DR:I
+    iget p1, p1, Lcom/discord/views/steps/StepsView$b$b;->Eb:I
 
     const-string v2, "EXTRA_LAYOUT_ID"
 
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$e.smali b/com.discord/smali/com/discord/views/steps/StepsView$e.smali
index 99285c3f6e..481f9d2553 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$e.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$e.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field final synthetic DT:Lcom/discord/views/steps/StepsView;
+.field final synthetic Ed:Lcom/discord/views/steps/StepsView;
 
-.field final synthetic DU:Lkotlin/jvm/functions/Function0;
+.field final synthetic Ee:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
@@ -34,9 +34,9 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/views/steps/StepsView$e;->DT:Lcom/discord/views/steps/StepsView;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$e;->Ed:Lcom/discord/views/steps/StepsView;
 
-    iput-object p2, p0, Lcom/discord/views/steps/StepsView$e;->DU:Lkotlin/jvm/functions/Function0;
+    iput-object p2, p0, Lcom/discord/views/steps/StepsView$e;->Ee:Lkotlin/jvm/functions/Function0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,9 +60,9 @@
 .method public final onPageSelected(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/steps/StepsView$e;->DT:Lcom/discord/views/steps/StepsView;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$e;->Ed:Lcom/discord/views/steps/StepsView;
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$e;->DU:Lkotlin/jvm/functions/Function0;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$e;->Ee:Lkotlin/jvm/functions/Function0;
 
     invoke-static {v0, p1, v1}, Lcom/discord/views/steps/StepsView;->a(Lcom/discord/views/steps/StepsView;ILkotlin/jvm/functions/Function0;)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 2f9fd561b0..2f3535c2b8 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$f.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$f.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic DU:Lkotlin/jvm/functions/Function0;
+.field final synthetic Ee:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
 .method constructor <init>(Lkotlin/jvm/functions/Function0;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/steps/StepsView$f;->DU:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$f;->Ee: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/views/steps/StepsView$f;->DU:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$f;->Ee:Lkotlin/jvm/functions/Function0;
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$g.smali b/com.discord/smali/com/discord/views/steps/StepsView$g.smali
index 6637e82ed7..03844d5ed9 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$g.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$g.smali
@@ -20,18 +20,18 @@
 # instance fields
 .field final synthetic $position:I
 
-.field final synthetic DT:Lcom/discord/views/steps/StepsView;
+.field final synthetic Ed:Lcom/discord/views/steps/StepsView;
 
-.field final synthetic DV:Ljava/util/List;
+.field final synthetic Ef:Ljava/util/List;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/steps/StepsView;Ljava/util/List;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/steps/StepsView$g;->DT:Lcom/discord/views/steps/StepsView;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$g;->Ed:Lcom/discord/views/steps/StepsView;
 
-    iput-object p2, p0, Lcom/discord/views/steps/StepsView$g;->DV:Ljava/util/List;
+    iput-object p2, p0, Lcom/discord/views/steps/StepsView$g;->Ef:Ljava/util/List;
 
     iput p3, p0, Lcom/discord/views/steps/StepsView$g;->$position:I
 
@@ -45,7 +45,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/steps/StepsView$g;->DV:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$g;->Ef:Ljava/util/List;
 
     iget v1, p0, Lcom/discord/views/steps/StepsView$g;->$position:I
 
@@ -55,7 +55,7 @@
 
     check-cast v0, Lcom/discord/views/steps/StepsView$b;
 
-    iget-object v0, v0, Lcom/discord/views/steps/StepsView$b;->DC:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView$b;->DN:Lkotlin/jvm/functions/Function1;
 
     if-eqz v0, :cond_0
 
@@ -68,7 +68,7 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/views/steps/StepsView$g;->DT:Lcom/discord/views/steps/StepsView;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$g;->Ed:Lcom/discord/views/steps/StepsView;
 
     invoke-static {p1}, Lcom/discord/views/steps/StepsView;->a(Lcom/discord/views/steps/StepsView;)Lcom/discord/utilities/simple_pager/SimplePager;
 
@@ -78,7 +78,7 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/discord/views/steps/StepsView$g;->DT:Lcom/discord/views/steps/StepsView;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$g;->Ed:Lcom/discord/views/steps/StepsView;
 
     invoke-static {v0}, Lcom/discord/views/steps/StepsView;->b(Lcom/discord/views/steps/StepsView;)Lcom/discord/views/steps/StepsView$d;
 
@@ -95,13 +95,13 @@
     if-eq p1, v0, :cond_2
 
     :cond_1
-    iget-object p1, p0, Lcom/discord/views/steps/StepsView$g;->DT:Lcom/discord/views/steps/StepsView;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$g;->Ed:Lcom/discord/views/steps/StepsView;
 
     invoke-static {p1}, Lcom/discord/views/steps/StepsView;->a(Lcom/discord/views/steps/StepsView;)Lcom/discord/utilities/simple_pager/SimplePager;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/views/steps/StepsView$g;->DT:Lcom/discord/views/steps/StepsView;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$g;->Ed:Lcom/discord/views/steps/StepsView;
 
     invoke-static {v0}, Lcom/discord/views/steps/StepsView;->a(Lcom/discord/views/steps/StepsView;)Lcom/discord/utilities/simple_pager/SimplePager;
 
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$h.smali b/com.discord/smali/com/discord/views/steps/StepsView$h.smali
index 7ffe22f865..bd757af6f2 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$h.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$h.smali
@@ -20,24 +20,24 @@
 # instance fields
 .field final synthetic $position:I
 
-.field final synthetic DT:Lcom/discord/views/steps/StepsView;
+.field final synthetic Ed:Lcom/discord/views/steps/StepsView;
 
-.field final synthetic DU:Lkotlin/jvm/functions/Function0;
+.field final synthetic Ee:Lkotlin/jvm/functions/Function0;
 
-.field final synthetic DV:Ljava/util/List;
+.field final synthetic Ef:Ljava/util/List;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/views/steps/StepsView;Ljava/util/List;ILkotlin/jvm/functions/Function0;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/steps/StepsView$h;->DT:Lcom/discord/views/steps/StepsView;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$h;->Ed:Lcom/discord/views/steps/StepsView;
 
-    iput-object p2, p0, Lcom/discord/views/steps/StepsView$h;->DV:Ljava/util/List;
+    iput-object p2, p0, Lcom/discord/views/steps/StepsView$h;->Ef:Ljava/util/List;
 
     iput p3, p0, Lcom/discord/views/steps/StepsView$h;->$position:I
 
-    iput-object p4, p0, Lcom/discord/views/steps/StepsView$h;->DU:Lkotlin/jvm/functions/Function0;
+    iput-object p4, p0, Lcom/discord/views/steps/StepsView$h;->Ee:Lkotlin/jvm/functions/Function0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,7 +49,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/steps/StepsView$h;->DV:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$h;->Ef:Ljava/util/List;
 
     iget v1, p0, Lcom/discord/views/steps/StepsView$h;->$position:I
 
@@ -59,7 +59,7 @@
 
     check-cast v0, Lcom/discord/views/steps/StepsView$b;
 
-    iget-object v0, v0, Lcom/discord/views/steps/StepsView$b;->DD:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView$b;->DO:Lkotlin/jvm/functions/Function1;
 
     if-eqz v0, :cond_0
 
@@ -72,7 +72,7 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/views/steps/StepsView$h;->DT:Lcom/discord/views/steps/StepsView;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$h;->Ed:Lcom/discord/views/steps/StepsView;
 
     invoke-static {p1}, Lcom/discord/views/steps/StepsView;->a(Lcom/discord/views/steps/StepsView;)Lcom/discord/utilities/simple_pager/SimplePager;
 
@@ -84,20 +84,20 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/discord/views/steps/StepsView$h;->DU:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$h;->Ee:Lkotlin/jvm/functions/Function0;
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/discord/views/steps/StepsView$h;->DT:Lcom/discord/views/steps/StepsView;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$h;->Ed:Lcom/discord/views/steps/StepsView;
 
     invoke-static {p1}, Lcom/discord/views/steps/StepsView;->a(Lcom/discord/views/steps/StepsView;)Lcom/discord/utilities/simple_pager/SimplePager;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/views/steps/StepsView$h;->DT:Lcom/discord/views/steps/StepsView;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$h;->Ed:Lcom/discord/views/steps/StepsView;
 
     invoke-static {v0}, Lcom/discord/views/steps/StepsView;->a(Lcom/discord/views/steps/StepsView;)Lcom/discord/utilities/simple_pager/SimplePager;
 
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$i.smali b/com.discord/smali/com/discord/views/steps/StepsView$i.smali
index 14b6ff5caa..48d2db6b75 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$i.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$i.smali
@@ -20,20 +20,20 @@
 # instance fields
 .field final synthetic $position:I
 
-.field final synthetic DU:Lkotlin/jvm/functions/Function0;
+.field final synthetic Ee:Lkotlin/jvm/functions/Function0;
 
-.field final synthetic DV:Ljava/util/List;
+.field final synthetic Ef:Ljava/util/List;
 
 
 # direct methods
 .method constructor <init>(Ljava/util/List;ILkotlin/jvm/functions/Function0;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/steps/StepsView$i;->DV:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$i;->Ef:Ljava/util/List;
 
     iput p2, p0, Lcom/discord/views/steps/StepsView$i;->$position:I
 
-    iput-object p3, p0, Lcom/discord/views/steps/StepsView$i;->DU:Lkotlin/jvm/functions/Function0;
+    iput-object p3, p0, Lcom/discord/views/steps/StepsView$i;->Ee:Lkotlin/jvm/functions/Function0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,7 +45,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/steps/StepsView$i;->DV:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$i;->Ef:Ljava/util/List;
 
     iget v1, p0, Lcom/discord/views/steps/StepsView$i;->$position:I
 
@@ -55,7 +55,7 @@
 
     check-cast v0, Lcom/discord/views/steps/StepsView$b;
 
-    iget-object v0, v0, Lcom/discord/views/steps/StepsView$b;->DE:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView$b;->DQ:Lkotlin/jvm/functions/Function1;
 
     if-eqz v0, :cond_0
 
@@ -68,7 +68,7 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/views/steps/StepsView$i;->DU:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$i;->Ee:Lkotlin/jvm/functions/Function0;
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()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 01d2f356bd..0376b0af58 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView.smali
@@ -15,17 +15,17 @@
 
 
 # static fields
-.field public static final Dy:Lcom/discord/views/steps/StepsView$a;
+.field public static final DI:Lcom/discord/views/steps/StepsView$a;
 
 
 # instance fields
-.field private Du:Landroid/widget/Button;
+.field private DE:Landroid/widget/Button;
 
-.field private Dv:Landroid/widget/Button;
+.field private DF:Landroid/widget/Button;
 
-.field private Dw:Landroid/widget/TextView;
+.field private DG:Landroid/widget/TextView;
 
-.field public Dx:Lcom/discord/views/steps/StepsView$d;
+.field public DH:Lcom/discord/views/steps/StepsView$d;
 
 .field private close:Landroid/view/View;
 
@@ -42,7 +42,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/views/steps/StepsView$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/views/steps/StepsView;->Dy:Lcom/discord/views/steps/StepsView$a;
+    sput-object v0, Lcom/discord/views/steps/StepsView;->DI:Lcom/discord/views/steps/StepsView$a;
 
     return-void
 .end method
@@ -96,7 +96,7 @@
 
     check-cast p1, Landroid/view/LayoutInflater;
 
-    const p2, 0x7f0d00ac
+    const p2, 0x7f0d00b4
 
     move-object p3, p0
 
@@ -106,7 +106,7 @@
 
     invoke-virtual {p1, p2, p3, v0}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
-    const p1, 0x7f0a071d
+    const p1, 0x7f0a073d
 
     invoke-virtual {p0, p1}, Lcom/discord/views/steps/StepsView;->findViewById(I)Landroid/view/View;
 
@@ -118,9 +118,9 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->Du:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->DE:Landroid/widget/Button;
 
-    const p1, 0x7f0a071c
+    const p1, 0x7f0a073c
 
     invoke-virtual {p0, p1}, Lcom/discord/views/steps/StepsView;->findViewById(I)Landroid/view/View;
 
@@ -132,7 +132,7 @@
 
     iput-object p1, p0, Lcom/discord/views/steps/StepsView;->close:Landroid/view/View;
 
-    const p1, 0x7f0a071e
+    const p1, 0x7f0a073e
 
     invoke-virtual {p0, p1}, Lcom/discord/views/steps/StepsView;->findViewById(I)Landroid/view/View;
 
@@ -144,9 +144,9 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->Dv:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->DF:Landroid/widget/Button;
 
-    const p1, 0x7f0a071b
+    const p1, 0x7f0a073b
 
     invoke-virtual {p0, p1}, Lcom/discord/views/steps/StepsView;->findViewById(I)Landroid/view/View;
 
@@ -158,9 +158,9 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->Dw:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->DG:Landroid/widget/TextView;
 
-    const p1, 0x7f0a071f
+    const p1, 0x7f0a073f
 
     invoke-virtual {p0, p1}, Lcom/discord/views/steps/StepsView;->findViewById(I)Landroid/view/View;
 
@@ -242,7 +242,7 @@
 .method public static final synthetic b(Lcom/discord/views/steps/StepsView;)Lcom/discord/views/steps/StepsView$d;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/views/steps/StepsView;->Dx:Lcom/discord/views/steps/StepsView$d;
+    iget-object p0, p0, Lcom/discord/views/steps/StepsView;->DH:Lcom/discord/views/steps/StepsView$d;
 
     return-object p0
 .end method
@@ -270,11 +270,11 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object v0, p0, Lcom/discord/views/steps/StepsView;->Dx:Lcom/discord/views/steps/StepsView$d;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView;->DH:Lcom/discord/views/steps/StepsView$d;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, v0, Lcom/discord/views/steps/StepsView$d;->DS:Ljava/util/List;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView$d;->Ec:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -289,11 +289,11 @@
 
     check-cast v2, Lcom/discord/views/steps/StepsView$b;
 
-    iget-boolean v2, v2, Lcom/discord/views/steps/StepsView$b;->DG:Z
+    iget-boolean v2, v2, Lcom/discord/views/steps/StepsView$b;->DS:Z
 
     invoke-virtual {v1, v2}, Lcom/discord/utilities/simple_pager/SimplePager;->setScrollingEnabled(Z)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->Dv:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->DF:Landroid/widget/Button;
 
     invoke-virtual {p0}, Lcom/discord/views/steps/StepsView;->getContext()Landroid/content/Context;
 
@@ -305,7 +305,7 @@
 
     check-cast v3, Lcom/discord/views/steps/StepsView$b;
 
-    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->Dz:I
+    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->DJ:I
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -315,7 +315,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->Dw:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->DG:Landroid/widget/TextView;
 
     invoke-virtual {p0}, Lcom/discord/views/steps/StepsView;->getContext()Landroid/content/Context;
 
@@ -327,7 +327,7 @@
 
     check-cast v3, Lcom/discord/views/steps/StepsView$b;
 
-    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->DA:I
+    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->DK:I
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -337,7 +337,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->Du:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->DE:Landroid/widget/Button;
 
     invoke-virtual {p0}, Lcom/discord/views/steps/StepsView;->getContext()Landroid/content/Context;
 
@@ -349,7 +349,7 @@
 
     check-cast v3, Lcom/discord/views/steps/StepsView$b;
 
-    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->DB:I
+    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->DL:I
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -359,7 +359,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->Dv:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->DF:Landroid/widget/Button;
 
     new-instance v2, Lcom/discord/views/steps/StepsView$g;
 
@@ -369,7 +369,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->Dw:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->DG:Landroid/widget/TextView;
 
     new-instance v2, Lcom/discord/views/steps/StepsView$h;
 
@@ -379,7 +379,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->Du:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->DE:Landroid/widget/Button;
 
     new-instance v2, Lcom/discord/views/steps/StepsView$i;
 
@@ -389,7 +389,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object p2, p0, Lcom/discord/views/steps/StepsView;->Dx:Lcom/discord/views/steps/StepsView$d;
+    iget-object p2, p0, Lcom/discord/views/steps/StepsView;->DH:Lcom/discord/views/steps/StepsView$d;
 
     const/4 v1, 0x1
 
@@ -413,7 +413,7 @@
     const/4 p2, 0x0
 
     :goto_0
-    iget-object v3, p0, Lcom/discord/views/steps/StepsView;->Dv:Landroid/widget/Button;
+    iget-object v3, p0, Lcom/discord/views/steps/StepsView;->DF:Landroid/widget/Button;
 
     check-cast v3, Landroid/view/View;
 
@@ -425,7 +425,7 @@
 
     check-cast p1, Lcom/discord/views/steps/StepsView$b;
 
-    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b;->DF:Z
+    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b;->DR:Z
 
     if-eqz p1, :cond_2
 
@@ -441,7 +441,7 @@
 
     invoke-static {v3, v1, v2, v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->Dw:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->DG:Landroid/widget/TextView;
 
     check-cast v1, Landroid/view/View;
 
@@ -449,7 +449,7 @@
 
     invoke-static {v1, v3, v2, v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->Du:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->DE:Landroid/widget/Button;
 
     check-cast v1, Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$1.smali b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$1.smali
similarity index 57%
rename from com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$1.smali
rename to com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$1.smali
index 45ce584cd9..e44640a8b6 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$1.smali
+++ b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/views/video/VideoCallParticipantView$b$1;
+.class final Lcom/discord/views/video/AppVideoStreamRenderer$a$1;
 .super Ljava/lang/Object;
-.source "VideoCallParticipantView.kt"
+.source "AppVideoStreamRenderer.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/video/VideoCallParticipantView$b;->a(ILco/discord/media_engine/VideoStreamRenderer;)V
+    value = Lcom/discord/views/video/AppVideoStreamRenderer$a;->invoke(I)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,14 +33,14 @@
 
 
 # instance fields
-.field final synthetic Eq:Lcom/discord/views/video/a;
+.field final synthetic En:Lcom/discord/views/video/b;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/views/video/a;)V
+.method constructor <init>(Lcom/discord/views/video/b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$b$1;->Eq:Lcom/discord/views/video/a;
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a$1;->En:Lcom/discord/views/video/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,9 +52,9 @@
 .method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$b$1;->Eq:Lcom/discord/views/video/a;
+    iget-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a$1;->En:Lcom/discord/views/video/b;
 
-    invoke-static {p1}, Lcom/discord/views/video/a;->a(Lcom/discord/views/video/a;)Lrx/Observable;
+    invoke-static {p1}, Lcom/discord/views/video/b;->a(Lcom/discord/views/video/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$2.smali b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$2.smali
new file mode 100644
index 0000000000..305f15501f
--- /dev/null
+++ b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$2.smali
@@ -0,0 +1,88 @@
+.class final Lcom/discord/views/video/AppVideoStreamRenderer$a$2;
+.super Lkotlin/jvm/internal/l;
+.source "AppVideoStreamRenderer.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/views/video/AppVideoStreamRenderer$a;->invoke(I)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Landroid/graphics/Point;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/views/video/AppVideoStreamRenderer$a;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/views/video/AppVideoStreamRenderer$a;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a$2;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer$a;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Landroid/graphics/Point;
+
+    const-string v0, "resolution"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "got frame of resolution: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "AppVideoStreamRendere"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    iget-object v0, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a$2;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer$a;
+
+    iget-object v0, v0, Lcom/discord/views/video/AppVideoStreamRenderer$a;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    invoke-virtual {v0}, Lcom/discord/views/video/AppVideoStreamRenderer;->getOnFrameRenderedListener()Lkotlin/jvm/functions/Function1;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_0
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$3.smali b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$3.smali
new file mode 100644
index 0000000000..55f176132f
--- /dev/null
+++ b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$3.smali
@@ -0,0 +1,67 @@
+.class final Lcom/discord/views/video/AppVideoStreamRenderer$a$3;
+.super Lkotlin/jvm/internal/l;
+.source "AppVideoStreamRenderer.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/views/video/AppVideoStreamRenderer$a;->invoke(I)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lrx/Subscription;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/views/video/AppVideoStreamRenderer$a;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/views/video/AppVideoStreamRenderer$a;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a$3;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer$a;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lrx/Subscription;
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a$3;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer$a;
+
+    iget-object v0, v0, Lcom/discord/views/video/AppVideoStreamRenderer$a;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    invoke-static {v0, p1}, Lcom/discord/views/video/AppVideoStreamRenderer;->a(Lcom/discord/views/video/AppVideoStreamRenderer;Lrx/Subscription;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a.smali b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a.smali
new file mode 100644
index 0000000000..21e11bd2b9
--- /dev/null
+++ b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a.smali
@@ -0,0 +1,233 @@
+.class final Lcom/discord/views/video/AppVideoStreamRenderer$a;
+.super Lkotlin/jvm/internal/l;
+.source "AppVideoStreamRenderer.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/views/video/AppVideoStreamRenderer;->a(Ljava/lang/Integer;Lorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;Z)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Integer;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/views/video/AppVideoStreamRenderer;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/views/video/AppVideoStreamRenderer;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Number;
+
+    invoke-virtual {p1}, Ljava/lang/Number;->intValue()I
+
+    move-result p1
+
+    invoke-virtual {p0, p1}, Lcom/discord/views/video/AppVideoStreamRenderer$a;->invoke(I)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(I)V
+    .locals 12
+
+    new-instance v0, Lcom/discord/views/video/b;
+
+    invoke-direct {v0}, Lcom/discord/views/video/b;-><init>()V
+
+    iget-object v1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    invoke-static {v1}, Lcom/discord/views/video/AppVideoStreamRenderer;->a(Lcom/discord/views/video/AppVideoStreamRenderer;)Lrx/Subscription;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {v1}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_0
+    iget-object v1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    invoke-static {v1}, Lcom/discord/views/video/AppVideoStreamRenderer;->b(Lcom/discord/views/video/AppVideoStreamRenderer;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/views/video/AppVideoStreamRenderer$a$1;
+
+    invoke-direct {v2, v0}, Lcom/discord/views/video/AppVideoStreamRenderer$a$1;-><init>(Lcom/discord/views/video/b;)V
+
+    check-cast v2, Lrx/functions/b;
+
+    invoke-virtual {v1, v2}, Lrx/subjects/BehaviorSubject;->c(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v1
+
+    const-string v2, "onSizeChangedSubject\n   \u2026rameResolutionSampled() }"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
+
+    check-cast v2, Lrx/functions/b;
+
+    invoke-virtual {v1, v2}, Lrx/Observable;->b(Lrx/functions/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;
+
+    check-cast v2, Lrx/functions/b;
+
+    invoke-virtual {v1, v2}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v3
+
+    const-string v1, "filter { it != null }.map { it!! }"
+
+    invoke-static {v3, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v4, 0x0
+
+    new-instance v1, Lcom/discord/views/video/AppVideoStreamRenderer$a$2;
+
+    invoke-direct {v1, p0}, Lcom/discord/views/video/AppVideoStreamRenderer$a$2;-><init>(Lcom/discord/views/video/AppVideoStreamRenderer$a;)V
+
+    move-object v7, v1
+
+    check-cast v7, Lkotlin/jvm/functions/Function1;
+
+    iget-object v1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v5
+
+    const-string v1, "javaClass.simpleName"
+
+    invoke-static {v5, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lcom/discord/views/video/AppVideoStreamRenderer$a$3;
+
+    invoke-direct {v1, p0}, Lcom/discord/views/video/AppVideoStreamRenderer$a$3;-><init>(Lcom/discord/views/video/AppVideoStreamRenderer$a;)V
+
+    move-object v6, v1
+
+    check-cast v6, Lkotlin/jvm/functions/Function1;
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/16 v10, 0x31
+
+    const/4 v11, 0x0
+
+    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
+
+    iget-object v1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    invoke-static {v1}, Lcom/discord/views/video/AppVideoStreamRenderer;->c(Lcom/discord/views/video/AppVideoStreamRenderer;)Lco/discord/media_engine/VideoStreamRenderer;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_1
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "binding native renderer to stream id: "
+
+    invoke-virtual {v3, v2}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "AppVideoStreamRendere"
+
+    invoke-static {v3, v2}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreMediaEngine;->getVoiceEngineNative()Lcom/hammerandchisel/libdiscord/Discord;
+
+    move-result-object v2
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast v0, Lorg/webrtc/RendererCommon$RendererEvents;
+
+    invoke-virtual {v1, v2, p1, v0}, Lco/discord/media_engine/VideoStreamRenderer;->attachToStream(Lcom/hammerandchisel/libdiscord/Discord;Ljava/lang/String;Lorg/webrtc/RendererCommon$RendererEvents;)V
+
+    sget p1, Lcom/discord/views/video/a;->Eo:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    sput p1, Lcom/discord/views/video/a;->Eo:I
+
+    new-instance p1, Ljava/lang/StringBuilder;
+
+    const-string v0, "bound renderer, bound count: "
+
+    invoke-direct {p1, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    sget v0, Lcom/discord/views/video/a;->Eo: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
+
+    invoke-static {v3, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    :cond_1
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer.smali b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer.smali
new file mode 100644
index 0000000000..b2f9e4824d
--- /dev/null
+++ b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer.smali
@@ -0,0 +1,468 @@
+.class public final Lcom/discord/views/video/AppVideoStreamRenderer;
+.super Landroid/widget/RelativeLayout;
+.source "AppVideoStreamRenderer.kt"
+
+
+# instance fields
+.field private Eg:Z
+
+.field private Eh:Z
+
+.field private final Ei:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private Ej:Lrx/Subscription;
+
+.field private Ek:Lco/discord/media_engine/VideoStreamRenderer;
+
+.field private El:Lorg/webrtc/RendererCommon$ScalingType;
+
+.field private Em:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Landroid/graphics/Point;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
+
+.field private streamId:Ljava/lang/Integer;
+
+
+# direct methods
+.method public constructor <init>(Landroid/content/Context;)V
+    .locals 6
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x6
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/views/video/AppVideoStreamRenderer;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+    .locals 6
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x4
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    move-object v2, p2
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/views/video/AppVideoStreamRenderer;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    invoke-static {p1}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ei:Lrx/subjects/BehaviorSubject;
+
+    sget-object p1, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
+
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->El:Lorg/webrtc/RendererCommon$ScalingType;
+
+    sget-object p1, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
+
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    and-int/lit8 p5, p4, 0x2
+
+    if-eqz p5, :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-direct {p0, p1, p2, p3}, Lcom/discord/views/video/AppVideoStreamRenderer;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+
+    return-void
+.end method
+
+.method public static final synthetic a(Lcom/discord/views/video/AppVideoStreamRenderer;)Lrx/Subscription;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ej:Lrx/Subscription;
+
+    return-object p0
+.end method
+
+.method public static final synthetic a(Lcom/discord/views/video/AppVideoStreamRenderer;Lrx/Subscription;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ej:Lrx/Subscription;
+
+    return-void
+.end method
+
+.method public static final synthetic b(Lcom/discord/views/video/AppVideoStreamRenderer;)Lrx/subjects/BehaviorSubject;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ei:Lrx/subjects/BehaviorSubject;
+
+    return-object p0
+.end method
+
+.method public static final synthetic c(Lcom/discord/views/video/AppVideoStreamRenderer;)Lco/discord/media_engine/VideoStreamRenderer;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ek:Lco/discord/media_engine/VideoStreamRenderer;
+
+    return-object p0
+.end method
+
+.method private final eU()V
+    .locals 6
+
+    iget-object v0, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ek:Lco/discord/media_engine/VideoStreamRenderer;
+
+    if-eqz v0, :cond_1
+
+    iget-object v1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ej:Lrx/Subscription;
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {v1}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_0
+    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;->getVoiceEngineNative()Lcom/hammerandchisel/libdiscord/Discord;
+
+    move-result-object v1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x4
+
+    const/4 v5, 0x0
+
+    invoke-static/range {v0 .. v5}, Lco/discord/media_engine/VideoStreamRenderer;->attachToStream$default(Lco/discord/media_engine/VideoStreamRenderer;Lcom/hammerandchisel/libdiscord/Discord;Ljava/lang/String;Lorg/webrtc/RendererCommon$RendererEvents;ILjava/lang/Object;)V
+
+    iget-object v0, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ek:Lco/discord/media_engine/VideoStreamRenderer;
+
+    check-cast v0, Landroid/view/View;
+
+    invoke-virtual {p0, v0}, Lcom/discord/views/video/AppVideoStreamRenderer;->removeView(Landroid/view/View;)V
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ek:Lco/discord/media_engine/VideoStreamRenderer;
+
+    sget v0, Lcom/discord/views/video/a;->Eo:I
+
+    add-int/lit8 v0, v0, -0x1
+
+    sput v0, Lcom/discord/views/video/a;->Eo:I
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "destroyed renderer, bound count: "
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    sget v1, Lcom/discord/views/video/a;->Eo: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
+
+    const-string v1, "AppVideoStreamRendere"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    :cond_1
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ljava/lang/Integer;Lorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;Z)V
+    .locals 5
+
+    new-instance v0, Lcom/discord/views/video/AppVideoStreamRenderer$a;
+
+    invoke-direct {v0, p0}, Lcom/discord/views/video/AppVideoStreamRenderer$a;-><init>(Lcom/discord/views/video/AppVideoStreamRenderer;)V
+
+    if-eqz p1, :cond_8
+
+    const/4 v1, 0x0
+
+    iget-object v2, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ek:Lco/discord/media_engine/VideoStreamRenderer;
+
+    const/4 v3, 0x1
+
+    if-nez v2, :cond_0
+
+    const-string v1, "AppVideoStreamRendere"
+
+    const-string v2, "created renderer"
+
+    invoke-static {v1, v2}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    new-instance v1, Lco/discord/media_engine/VideoStreamRenderer;
+
+    invoke-virtual {p0}, Lcom/discord/views/video/AppVideoStreamRenderer;->getContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    const-string v4, "context"
+
+    invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v1, v2}, Lco/discord/media_engine/VideoStreamRenderer;-><init>(Landroid/content/Context;)V
+
+    iput-object v1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ek:Lco/discord/media_engine/VideoStreamRenderer;
+
+    const/4 v1, 0x1
+
+    :cond_0
+    iget-object v2, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->streamId:Ljava/lang/Integer;
+
+    invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    xor-int/2addr v2, v3
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v2
+
+    invoke-virtual {v0, v2}, Lcom/discord/views/video/AppVideoStreamRenderer$a;->invoke(I)V
+
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->streamId:Ljava/lang/Integer;
+
+    :cond_1
+    if-eqz v1, :cond_3
+
+    iget-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ek:Lco/discord/media_engine/VideoStreamRenderer;
+
+    if-eqz p1, :cond_2
+
+    new-instance v0, Landroid/widget/RelativeLayout$LayoutParams;
+
+    const/4 v1, -0x2
+
+    invoke-direct {v0, v1, v1}, Landroid/widget/RelativeLayout$LayoutParams;-><init>(II)V
+
+    const/16 v1, 0xd
+
+    const/4 v2, -0x1
+
+    invoke-virtual {v0, v1, v2}, Landroid/widget/RelativeLayout$LayoutParams;->addRule(II)V
+
+    check-cast v0, Landroid/view/ViewGroup$LayoutParams;
+
+    invoke-virtual {p1, v0}, Lco/discord/media_engine/VideoStreamRenderer;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+
+    :cond_2
+    iget-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ek:Lco/discord/media_engine/VideoStreamRenderer;
+
+    check-cast p1, Landroid/view/View;
+
+    invoke-virtual {p0, p1}, Lcom/discord/views/video/AppVideoStreamRenderer;->addView(Landroid/view/View;)V
+
+    :cond_3
+    iget-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ek:Lco/discord/media_engine/VideoStreamRenderer;
+
+    if-eqz p1, :cond_4
+
+    invoke-virtual {p1, p2, p3}, Lco/discord/media_engine/VideoStreamRenderer;->setScalingType(Lorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;)V
+
+    invoke-virtual {p1, p4}, Lco/discord/media_engine/VideoStreamRenderer;->setMirror(Z)V
+
+    iget-boolean p4, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Eg:Z
+
+    invoke-virtual {p1, p4}, Lco/discord/media_engine/VideoStreamRenderer;->setZOrderMediaOverlay(Z)V
+
+    :cond_4
+    iget-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->El:Lorg/webrtc/RendererCommon$ScalingType;
+
+    iget-object p4, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
+
+    if-nez p2, :cond_5
+
+    sget-object v0, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
+
+    goto :goto_0
+
+    :cond_5
+    move-object v0, p2
+
+    :goto_0
+    iput-object v0, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->El:Lorg/webrtc/RendererCommon$ScalingType;
+
+    if-nez p3, :cond_6
+
+    sget-object v0, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
+
+    goto :goto_1
+
+    :cond_6
+    move-object v0, p3
+
+    :goto_1
+    iput-object v0, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
+
+    if-ne p2, p1, :cond_7
+
+    if-eq p4, p3, :cond_9
+
+    :cond_7
+    invoke-virtual {p0}, Lcom/discord/views/video/AppVideoStreamRenderer;->requestLayout()V
+
+    return-void
+
+    :cond_8
+    invoke-direct {p0}, Lcom/discord/views/video/AppVideoStreamRenderer;->eU()V
+
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->streamId:Ljava/lang/Integer;
+
+    :cond_9
+    return-void
+.end method
+
+.method public final getOnFrameRenderedListener()Lkotlin/jvm/functions/Function1;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/jvm/functions/Function1<",
+            "Landroid/graphics/Point;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Em:Lkotlin/jvm/functions/Function1;
+
+    return-object v0
+.end method
+
+.method protected final onDetachedFromWindow()V
+    .locals 1
+
+    invoke-super {p0}, Landroid/widget/RelativeLayout;->onDetachedFromWindow()V
+
+    invoke-direct {p0}, Lcom/discord/views/video/AppVideoStreamRenderer;->eU()V
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->streamId:Ljava/lang/Integer;
+
+    return-void
+.end method
+
+.method protected final onSizeChanged(IIII)V
+    .locals 0
+
+    invoke-super {p0, p1, p2, p3, p4}, Landroid/widget/RelativeLayout;->onSizeChanged(IIII)V
+
+    iget-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Ei:Lrx/subjects/BehaviorSubject;
+
+    sget-object p2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    invoke-virtual {p1, p2}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public final setIsOverlay(Z)V
+    .locals 0
+
+    iput-boolean p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Eg:Z
+
+    return-void
+.end method
+
+.method public final setMatchVideoOrientation(Z)V
+    .locals 0
+
+    iput-boolean p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Eh:Z
+
+    return-void
+.end method
+
+.method public final setOnFrameRenderedListener(Lkotlin/jvm/functions/Function1;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Landroid/graphics/Point;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Em:Lkotlin/jvm/functions/Function1;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/views/video/ApplicationStreamView$1.smali b/com.discord/smali/com/discord/views/video/ApplicationStreamView$1.smali
new file mode 100644
index 0000000000..721f238001
--- /dev/null
+++ b/com.discord/smali/com/discord/views/video/ApplicationStreamView$1.smali
@@ -0,0 +1,117 @@
+.class final synthetic Lcom/discord/views/video/ApplicationStreamView$1;
+.super Lkotlin/jvm/internal/j;
+.source "ApplicationStreamView.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/views/video/ApplicationStreamView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Landroid/graphics/Point;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/views/video/ApplicationStreamView;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getName()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "onFrameRendered"
+
+    return-object v0
+.end method
+
+.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
+    .locals 1
+
+    const-class v0, Lcom/discord/views/video/ApplicationStreamView;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final getSignature()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "onFrameRendered(Landroid/graphics/Point;)V"
+
+    return-object v0
+.end method
+
+.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Landroid/graphics/Point;
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/views/video/ApplicationStreamView$1;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/views/video/ApplicationStreamView;
+
+    const-string v1, "resolution"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "ApplicationStreamView"
+
+    const-string v1, "onFrameRendered"
+
+    invoke-static {p1, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    invoke-virtual {v0}, Lcom/discord/views/video/ApplicationStreamView;->getLoadingIndicator()Landroid/view/View;
+
+    move-result-object p1
+
+    const/16 v1, 0x8
+
+    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-virtual {v0}, Lcom/discord/views/video/ApplicationStreamView;->getStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    move-result-object p1
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p1, v1}, Lcom/discord/views/video/AppVideoStreamRenderer;->setVisibility(I)V
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, v0, Lcom/discord/views/video/ApplicationStreamView;->Et:Z
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/views/video/ApplicationStreamView$a$a.smali b/com.discord/smali/com/discord/views/video/ApplicationStreamView$a$a.smali
new file mode 100644
index 0000000000..ac4c61f6d2
--- /dev/null
+++ b/com.discord/smali/com/discord/views/video/ApplicationStreamView$a$a.smali
@@ -0,0 +1,112 @@
+.class public final Lcom/discord/views/video/ApplicationStreamView$a$a;
+.super Lcom/discord/views/video/ApplicationStreamView$a;
+.source "ApplicationStreamView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/views/video/ApplicationStreamView$a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field final streamId:Ljava/lang/Integer;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Integer;)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/views/video/ApplicationStreamView$a;-><init>(B)V
+
+    iput-object p1, p0, Lcom/discord/views/video/ApplicationStreamView$a$a;->streamId:Ljava/lang/Integer;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/views/video/ApplicationStreamView$a$a;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/views/video/ApplicationStreamView$a$a;
+
+    iget-object v0, p0, Lcom/discord/views/video/ApplicationStreamView$a$a;->streamId:Ljava/lang/Integer;
+
+    iget-object p1, p1, Lcom/discord/views/video/ApplicationStreamView$a$a;->streamId:Ljava/lang/Integer;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/views/video/ApplicationStreamView$a$a;->streamId:Ljava/lang/Integer;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "ActiveStream(streamId="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/views/video/ApplicationStreamView$a$a;->streamId:Ljava/lang/Integer;
+
+    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/views/video/ApplicationStreamView$a$b.smali b/com.discord/smali/com/discord/views/video/ApplicationStreamView$a$b.smali
new file mode 100644
index 0000000000..90841794c2
--- /dev/null
+++ b/com.discord/smali/com/discord/views/video/ApplicationStreamView$a$b.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/views/video/ApplicationStreamView$a$b;
+.super Lcom/discord/views/video/ApplicationStreamView$a;
+.source "ApplicationStreamView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/views/video/ApplicationStreamView$a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# static fields
+.field public static final Eu:Lcom/discord/views/video/ApplicationStreamView$a$b;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/views/video/ApplicationStreamView$a$b;
+
+    invoke-direct {v0}, Lcom/discord/views/video/ApplicationStreamView$a$b;-><init>()V
+
+    sput-object v0, Lcom/discord/views/video/ApplicationStreamView$a$b;->Eu:Lcom/discord/views/video/ApplicationStreamView$a$b;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/views/video/ApplicationStreamView$a;-><init>(B)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/views/video/ApplicationStreamView$a$c.smali b/com.discord/smali/com/discord/views/video/ApplicationStreamView$a$c.smali
new file mode 100644
index 0000000000..2bc2378f9a
--- /dev/null
+++ b/com.discord/smali/com/discord/views/video/ApplicationStreamView$a$c.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/views/video/ApplicationStreamView$a$c;
+.super Lcom/discord/views/video/ApplicationStreamView$a;
+.source "ApplicationStreamView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/views/video/ApplicationStreamView$a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+
+# static fields
+.field public static final Ev:Lcom/discord/views/video/ApplicationStreamView$a$c;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/views/video/ApplicationStreamView$a$c;
+
+    invoke-direct {v0}, Lcom/discord/views/video/ApplicationStreamView$a$c;-><init>()V
+
+    sput-object v0, Lcom/discord/views/video/ApplicationStreamView$a$c;->Ev:Lcom/discord/views/video/ApplicationStreamView$a$c;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/views/video/ApplicationStreamView$a;-><init>(B)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/views/video/ApplicationStreamView$a.smali b/com.discord/smali/com/discord/views/video/ApplicationStreamView$a.smali
new file mode 100644
index 0000000000..4922ca5d4e
--- /dev/null
+++ b/com.discord/smali/com/discord/views/video/ApplicationStreamView$a.smali
@@ -0,0 +1,40 @@
+.class public abstract Lcom/discord/views/video/ApplicationStreamView$a;
+.super Ljava/lang/Object;
+.source "ApplicationStreamView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/views/video/ApplicationStreamView;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/views/video/ApplicationStreamView$a$a;,
+        Lcom/discord/views/video/ApplicationStreamView$a$c;,
+        Lcom/discord/views/video/ApplicationStreamView$a$b;
+    }
+.end annotation
+
+
+# direct methods
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(B)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/views/video/ApplicationStreamView$a;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/views/video/ApplicationStreamView.smali b/com.discord/smali/com/discord/views/video/ApplicationStreamView.smali
new file mode 100644
index 0000000000..53324e3236
--- /dev/null
+++ b/com.discord/smali/com/discord/views/video/ApplicationStreamView.smali
@@ -0,0 +1,567 @@
+.class public final Lcom/discord/views/video/ApplicationStreamView;
+.super Landroid/widget/RelativeLayout;
+.source "ApplicationStreamView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/views/video/ApplicationStreamView$a;
+    }
+.end annotation
+
+
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+
+# instance fields
+.field private final Ep:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Eq:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Er:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Es:Lkotlin/properties/ReadOnlyProperty;
+
+.field Et:Z
+
+.field private streamId:Ljava/lang/Integer;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 6
+
+    const-class v0, Lcom/discord/views/video/ApplicationStreamView;
+
+    const/4 v1, 0x4
+
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "streamRenderer"
+
+    const-string v5, "getStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "loadingIndicator"
+
+    const-string v5, "getLoadingIndicator()Landroid/view/View;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x1
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "streamEnded"
+
+    const-string v5, "getStreamEnded()Landroid/view/View;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x2
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    const-string v3, "streamPaused"
+
+    const-string v4, "getStreamPaused()Landroid/view/View;"
+
+    invoke-direct {v2, v0, v3, v4}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x3
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Lcom/discord/views/video/ApplicationStreamView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;)V
+    .locals 6
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x6
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/views/video/ApplicationStreamView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+    .locals 6
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x4
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    move-object v2, p2
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/views/video/ApplicationStreamView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+
+    const p2, 0x7f0a0329
+
+    invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/discord/views/video/ApplicationStreamView;->Ep:Lkotlin/properties/ReadOnlyProperty;
+
+    const p2, 0x7f0a0327
+
+    invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/discord/views/video/ApplicationStreamView;->Eq:Lkotlin/properties/ReadOnlyProperty;
+
+    const p2, 0x7f0a0326
+
+    invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/discord/views/video/ApplicationStreamView;->Er:Lkotlin/properties/ReadOnlyProperty;
+
+    const p2, 0x7f0a0328
+
+    invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/discord/views/video/ApplicationStreamView;->Es:Lkotlin/properties/ReadOnlyProperty;
+
+    move-object p2, p0
+
+    check-cast p2, Landroid/view/ViewGroup;
+
+    const p3, 0x7f0d0091
+
+    invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    invoke-virtual {p0}, Lcom/discord/views/video/ApplicationStreamView;->getStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    move-result-object p1
+
+    new-instance p2, Lcom/discord/views/video/ApplicationStreamView$1;
+
+    move-object p3, p0
+
+    check-cast p3, Lcom/discord/views/video/ApplicationStreamView;
+
+    invoke-direct {p2, p3}, Lcom/discord/views/video/ApplicationStreamView$1;-><init>(Lcom/discord/views/video/ApplicationStreamView;)V
+
+    check-cast p2, Lkotlin/jvm/functions/Function1;
+
+    invoke-virtual {p1, p2}, Lcom/discord/views/video/AppVideoStreamRenderer;->setOnFrameRenderedListener(Lkotlin/jvm/functions/Function1;)V
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    and-int/lit8 p5, p4, 0x2
+
+    if-eqz p5, :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-direct {p0, p1, p2, p3}, Lcom/discord/views/video/ApplicationStreamView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+
+    return-void
+.end method
+
+.method private a(Ljava/lang/Integer;)V
+    .locals 3
+
+    invoke-direct {p0}, Lcom/discord/views/video/ApplicationStreamView;->getStreamEnded()Landroid/view/View;
+
+    move-result-object v0
+
+    const/16 v1, 0x8
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/views/video/ApplicationStreamView;->getStreamPaused()Landroid/view/View;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+
+    iget-boolean v0, p0, Lcom/discord/views/video/ApplicationStreamView;->Et:Z
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Lcom/discord/views/video/ApplicationStreamView;->getLoadingIndicator()Landroid/view/View;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-virtual {p0}, Lcom/discord/views/video/ApplicationStreamView;->getStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v2}, Lcom/discord/views/video/AppVideoStreamRenderer;->setVisibility(I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0}, Lcom/discord/views/video/ApplicationStreamView;->getLoadingIndicator()Landroid/view/View;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-virtual {p0}, Lcom/discord/views/video/ApplicationStreamView;->getStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v1}, Lcom/discord/views/video/AppVideoStreamRenderer;->setVisibility(I)V
+
+    :goto_0
+    iget-object v0, p0, Lcom/discord/views/video/ApplicationStreamView;->streamId:Ljava/lang/Integer;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_1
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "new stream: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "ApplicationStreamView"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    iput-object p1, p0, Lcom/discord/views/video/ApplicationStreamView;->streamId:Ljava/lang/Integer;
+
+    iput-boolean v2, p0, Lcom/discord/views/video/ApplicationStreamView;->Et:Z
+
+    invoke-virtual {p0}, Lcom/discord/views/video/ApplicationStreamView;->getStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    move-result-object v0
+
+    sget-object v1, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_FIT:Lorg/webrtc/RendererCommon$ScalingType;
+
+    invoke-virtual {v0, p1, v1, v1, v2}, Lcom/discord/views/video/AppVideoStreamRenderer;->a(Ljava/lang/Integer;Lorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;Z)V
+
+    :cond_1
+    return-void
+.end method
+
+.method private final getStreamEnded()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/views/video/ApplicationStreamView;->Er:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/views/video/ApplicationStreamView;->$$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 getStreamPaused()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/views/video/ApplicationStreamView;->Es:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/views/video/ApplicationStreamView;->$$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
+
+
+# virtual methods
+.method final getLoadingIndicator()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/views/video/ApplicationStreamView;->Eq:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/views/video/ApplicationStreamView;->$$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/view/View;
+
+    return-object v0
+.end method
+
+.method final getStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/views/video/ApplicationStreamView;->Ep:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/views/video/ApplicationStreamView;->$$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/video/AppVideoStreamRenderer;
+
+    return-object v0
+.end method
+
+.method public final set(Lcom/discord/views/video/ApplicationStreamView$a;)V
+    .locals 3
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "got state: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "ApplicationStreamView"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    if-nez p1, :cond_0
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lcom/discord/views/video/ApplicationStreamView;->a(Ljava/lang/Integer;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v0, p1, Lcom/discord/views/video/ApplicationStreamView$a$a;
+
+    if-eqz v0, :cond_1
+
+    check-cast p1, Lcom/discord/views/video/ApplicationStreamView$a$a;
+
+    iget-object p1, p1, Lcom/discord/views/video/ApplicationStreamView$a$a;->streamId:Ljava/lang/Integer;
+
+    invoke-direct {p0, p1}, Lcom/discord/views/video/ApplicationStreamView;->a(Ljava/lang/Integer;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v0, Lcom/discord/views/video/ApplicationStreamView$a$b;->Eu:Lcom/discord/views/video/ApplicationStreamView$a$b;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    const/16 v2, 0x8
+
+    if-eqz v0, :cond_2
+
+    invoke-direct {p0}, Lcom/discord/views/video/ApplicationStreamView;->getStreamEnded()Landroid/view/View;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-virtual {p0}, Lcom/discord/views/video/ApplicationStreamView;->getLoadingIndicator()Landroid/view/View;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-virtual {p0}, Lcom/discord/views/video/ApplicationStreamView;->getStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v2}, Lcom/discord/views/video/AppVideoStreamRenderer;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/views/video/ApplicationStreamView;->getStreamPaused()Landroid/view/View;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    goto :goto_0
+
+    :cond_2
+    sget-object v0, Lcom/discord/views/video/ApplicationStreamView$a$c;->Ev:Lcom/discord/views/video/ApplicationStreamView$a$c;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_3
+
+    invoke-direct {p0}, Lcom/discord/views/video/ApplicationStreamView;->getStreamEnded()Landroid/view/View;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-virtual {p0}, Lcom/discord/views/video/ApplicationStreamView;->getLoadingIndicator()Landroid/view/View;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-virtual {p0}, Lcom/discord/views/video/ApplicationStreamView;->getStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v1}, Lcom/discord/views/video/AppVideoStreamRenderer;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/views/video/ApplicationStreamView;->getStreamPaused()Landroid/view/View;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    :goto_0
+    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    return-void
+
+    :cond_3
+    new-instance p1, Lkotlin/k;
+
+    invoke-direct {p1}, Lkotlin/k;-><init>()V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$1.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$1.smali
new file mode 100644
index 0000000000..b854b55f28
--- /dev/null
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$1.smali
@@ -0,0 +1,89 @@
+.class final synthetic Lcom/discord/views/video/VideoCallParticipantView$1;
+.super Lkotlin/jvm/internal/j;
+.source "VideoCallParticipantView.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/views/video/VideoCallParticipantView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Landroid/graphics/Point;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/views/video/VideoCallParticipantView;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getName()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "onFrameReceived"
+
+    return-object v0
+.end method
+
+.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
+    .locals 1
+
+    const-class v0, Lcom/discord/views/video/VideoCallParticipantView;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final getSignature()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "onFrameReceived(Landroid/graphics/Point;)V"
+
+    return-object v0
+.end method
+
+.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Landroid/graphics/Point;
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView$1;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/views/video/VideoCallParticipantView;
+
+    invoke-static {v0, p1}, Lcom/discord/views/video/VideoCallParticipantView;->a(Lcom/discord/views/video/VideoCallParticipantView;Landroid/graphics/Point;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
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 a65a1a6d34..594a7dd760 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$ParticipantData.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$ParticipantData.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field final Ek:Lcom/discord/models/domain/ModelVoice$User;
+.field final EF:Lcom/discord/models/domain/ModelVoice$User;
 
-.field final Em:Lorg/webrtc/RendererCommon$ScalingType;
+.field final EH:Z
 
-.field final Ep:Z
+.field final El:Lorg/webrtc/RendererCommon$ScalingType;
 
 .field private final id:Ljava/lang/String;
 
@@ -39,15 +39,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Ek:Lcom/discord/models/domain/ModelVoice$User;
+    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
-    iput-boolean p2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Ep:Z
+    iput-boolean p2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->EH:Z
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Em:Lorg/webrtc/RendererCommon$ScalingType;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->El:Lorg/webrtc/RendererCommon$ScalingType;
 
     iput-object p4, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
 
-    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Ek:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
 
@@ -115,9 +115,9 @@
 
     check-cast p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
 
-    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Ek:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
-    iget-object v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Ek:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -125,9 +125,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-boolean v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Ep:Z
+    iget-boolean v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->EH:Z
 
-    iget-boolean v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Ep:Z
+    iget-boolean v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->EH:Z
 
     if-ne v1, v3, :cond_0
 
@@ -141,9 +141,9 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Em:Lorg/webrtc/RendererCommon$ScalingType;
+    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->El:Lorg/webrtc/RendererCommon$ScalingType;
 
-    iget-object v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Em:Lorg/webrtc/RendererCommon$ScalingType;
+    iget-object v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->El:Lorg/webrtc/RendererCommon$ScalingType;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -182,7 +182,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Ek:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
     const/4 v1, 0x0
 
@@ -200,7 +200,7 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Ep:Z
+    iget-boolean v2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->EH:Z
 
     if-eqz v2, :cond_1
 
@@ -211,7 +211,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Em:Lorg/webrtc/RendererCommon$ScalingType;
+    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->El:Lorg/webrtc/RendererCommon$ScalingType;
 
     if-eqz v2, :cond_2
 
@@ -252,7 +252,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Ek:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -260,7 +260,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Ep:Z
+    iget-boolean v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->EH:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -268,7 +268,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Em:Lorg/webrtc/RendererCommon$ScalingType;
+    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->El:Lorg/webrtc/RendererCommon$ScalingType;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$a.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$a.smali
index ab84adef23..cd867dddaa 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$a.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$a.smali
@@ -67,9 +67,9 @@
 
     invoke-static {v3, v2, v2, v2}, Landroid/graphics/Color;->argb(IIII)I
 
-    move-result v2
+    move-result v3
 
-    invoke-direct {v1, v2}, Ljp/wasabeef/fresco/a/b;-><init>(I)V
+    invoke-direct {v1, v3}, Ljp/wasabeef/fresco/a/b;-><init>(I)V
 
     check-cast v1, Lcom/facebook/imagepipeline/request/a;
 
@@ -79,13 +79,13 @@
 
     new-instance v1, Ljp/wasabeef/fresco/a/a;
 
-    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView$a;->this$0:Lcom/discord/views/video/VideoCallParticipantView;
+    iget-object v3, p0, Lcom/discord/views/video/VideoCallParticipantView$a;->this$0:Lcom/discord/views/video/VideoCallParticipantView;
 
-    invoke-virtual {v2}, Lcom/discord/views/video/VideoCallParticipantView;->getContext()Landroid/content/Context;
+    invoke-virtual {v3}, Lcom/discord/views/video/VideoCallParticipantView;->getContext()Landroid/content/Context;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-direct {v1, v2}, Ljp/wasabeef/fresco/a/a;-><init>(Landroid/content/Context;)V
+    invoke-direct {v1, v3}, Ljp/wasabeef/fresco/a/a;-><init>(Landroid/content/Context;)V
 
     check-cast v1, Lcom/facebook/imagepipeline/request/a;
 
@@ -93,15 +93,17 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Ljp/wasabeef/fresco/a/c$a;->DW()Ljp/wasabeef/fresco/a/c;
+    new-instance v1, Ljp/wasabeef/fresco/a/c;
 
-    move-result-object v0
+    iget-object v0, v0, Ljp/wasabeef/fresco/a/c$a;->bjR:Ljava/util/List;
 
-    check-cast v0, Lcom/facebook/imagepipeline/request/c;
+    invoke-direct {v1, v0, v2}, Ljp/wasabeef/fresco/a/c;-><init>(Ljava/util/List;B)V
 
-    invoke-virtual {p1, v0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->a(Lcom/facebook/imagepipeline/request/c;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
+    check-cast v1, Lcom/facebook/imagepipeline/request/c;
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    iput-object v1, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yb:Lcom/facebook/imagepipeline/request/c;
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$2.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$2.smali
deleted file mode 100644
index feae08a999..0000000000
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$2.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class final Lcom/discord/views/video/VideoCallParticipantView$b$2;
-.super Lkotlin/jvm/internal/l;
-.source "VideoCallParticipantView.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/video/VideoCallParticipantView$b;->a(ILco/discord/media_engine/VideoStreamRenderer;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Landroid/graphics/Point;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/views/video/VideoCallParticipantView$b;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/views/video/VideoCallParticipantView$b;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$b$2;->this$0:Lcom/discord/views/video/VideoCallParticipantView$b;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Landroid/graphics/Point;
-
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView$b$2;->this$0:Lcom/discord/views/video/VideoCallParticipantView$b;
-
-    iget-object v0, v0, Lcom/discord/views/video/VideoCallParticipantView$b;->this$0:Lcom/discord/views/video/VideoCallParticipantView;
-
-    invoke-static {v0}, Lcom/discord/views/video/VideoCallParticipantView;->c(Lcom/discord/views/video/VideoCallParticipantView;)Landroid/view/View;
-
-    move-result-object v0
-
-    const/16 v1, 0x8
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView$b$2;->this$0:Lcom/discord/views/video/VideoCallParticipantView$b;
-
-    iget-object v0, v0, Lcom/discord/views/video/VideoCallParticipantView$b;->this$0:Lcom/discord/views/video/VideoCallParticipantView;
-
-    invoke-static {v0, p1}, Lcom/discord/views/video/VideoCallParticipantView;->a(Lcom/discord/views/video/VideoCallParticipantView;Landroid/graphics/Point;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$3.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$3.smali
deleted file mode 100644
index 8ffcab7239..0000000000
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$3.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class final Lcom/discord/views/video/VideoCallParticipantView$b$3;
-.super Lkotlin/jvm/internal/l;
-.source "VideoCallParticipantView.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/video/VideoCallParticipantView$b;->a(ILco/discord/media_engine/VideoStreamRenderer;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lrx/Subscription;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/views/video/VideoCallParticipantView$b;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/views/video/VideoCallParticipantView$b;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$b$3;->this$0:Lcom/discord/views/video/VideoCallParticipantView$b;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lrx/Subscription;
-
-    const-string v0, "it"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView$b$3;->this$0:Lcom/discord/views/video/VideoCallParticipantView$b;
-
-    iget-object v0, v0, Lcom/discord/views/video/VideoCallParticipantView$b;->this$0:Lcom/discord/views/video/VideoCallParticipantView;
-
-    invoke-static {v0, p1}, Lcom/discord/views/video/VideoCallParticipantView;->a(Lcom/discord/views/video/VideoCallParticipantView;Lrx/Subscription;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b.smali
deleted file mode 100644
index 8e6fdca133..0000000000
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b.smali
+++ /dev/null
@@ -1,175 +0,0 @@
-.class final Lcom/discord/views/video/VideoCallParticipantView$b;
-.super Lkotlin/jvm/internal/l;
-.source "VideoCallParticipantView.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/views/video/VideoCallParticipantView;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Ljava/lang/Integer;",
-        "Lco/discord/media_engine/VideoStreamRenderer;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/views/video/VideoCallParticipantView;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/views/video/VideoCallParticipantView;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$b;->this$0:Lcom/discord/views/video/VideoCallParticipantView;
-
-    const/4 p1, 0x2
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(ILco/discord/media_engine/VideoStreamRenderer;)V
-    .locals 12
-
-    const-string v0, "renderer"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/views/video/a;
-
-    invoke-direct {v0}, Lcom/discord/views/video/a;-><init>()V
-
-    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$b;->this$0:Lcom/discord/views/video/VideoCallParticipantView;
-
-    invoke-static {v1}, Lcom/discord/views/video/VideoCallParticipantView;->a(Lcom/discord/views/video/VideoCallParticipantView;)Lrx/Subscription;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    invoke-interface {v1}, Lrx/Subscription;->unsubscribe()V
-
-    :cond_0
-    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$b;->this$0:Lcom/discord/views/video/VideoCallParticipantView;
-
-    invoke-static {v1}, Lcom/discord/views/video/VideoCallParticipantView;->b(Lcom/discord/views/video/VideoCallParticipantView;)Lrx/subjects/BehaviorSubject;
-
-    move-result-object v1
-
-    new-instance v2, Lcom/discord/views/video/VideoCallParticipantView$b$1;
-
-    invoke-direct {v2, v0}, Lcom/discord/views/video/VideoCallParticipantView$b$1;-><init>(Lcom/discord/views/video/a;)V
-
-    check-cast v2, Lrx/functions/b;
-
-    invoke-virtual {v1, v2}, Lrx/subjects/BehaviorSubject;->c(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object v1
-
-    const-string v2, "onSizeChangedSubject\n   \u2026rameResolutionSampled() }"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
-
-    move-result-object v3
-
-    const/4 v4, 0x0
-
-    new-instance v1, Lcom/discord/views/video/VideoCallParticipantView$b$2;
-
-    invoke-direct {v1, p0}, Lcom/discord/views/video/VideoCallParticipantView$b$2;-><init>(Lcom/discord/views/video/VideoCallParticipantView$b;)V
-
-    move-object v7, v1
-
-    check-cast v7, Lkotlin/jvm/functions/Function1;
-
-    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$b;->this$0:Lcom/discord/views/video/VideoCallParticipantView;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v5
-
-    const-string v1, "javaClass.simpleName"
-
-    invoke-static {v5, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v1, Lcom/discord/views/video/VideoCallParticipantView$b$3;
-
-    invoke-direct {v1, p0}, Lcom/discord/views/video/VideoCallParticipantView$b$3;-><init>(Lcom/discord/views/video/VideoCallParticipantView$b;)V
-
-    move-object v6, v1
-
-    check-cast v6, Lkotlin/jvm/functions/Function1;
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/16 v10, 0x31
-
-    const/4 v11, 0x0
-
-    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
-
-    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;->getVoiceEngineNative()Lcom/hammerandchisel/libdiscord/Discord;
-
-    move-result-object v1
-
-    invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    check-cast v0, Lorg/webrtc/RendererCommon$RendererEvents;
-
-    invoke-virtual {p2, v1, p1, v0}, Lco/discord/media_engine/VideoStreamRenderer;->attachToStream(Lcom/hammerandchisel/libdiscord/Discord;Ljava/lang/String;Lorg/webrtc/RendererCommon$RendererEvents;)V
-
-    return-void
-.end method
-
-.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Number;
-
-    invoke-virtual {p1}, Ljava/lang/Number;->intValue()I
-
-    move-result p1
-
-    check-cast p2, Lco/discord/media_engine/VideoStreamRenderer;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/views/video/VideoCallParticipantView$b;->a(ILco/discord/media_engine/VideoStreamRenderer;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
index fa3acd0c2d..b85430a834 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
@@ -19,51 +19,27 @@
 
 
 # instance fields
-.field private final DY:Lkotlin/properties/ReadOnlyProperty;
+.field private final EA:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final DZ:Lkotlin/properties/ReadOnlyProperty;
+.field private final EB:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Ea:Lkotlin/properties/ReadOnlyProperty;
+.field private final EC:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Eb:Lkotlin/properties/ReadOnlyProperty;
+.field private final ED:I
 
-.field private final Ec:Lkotlin/properties/ReadOnlyProperty;
+.field private final EE:I
 
-.field private final Ed:Lkotlin/properties/ReadOnlyProperty;
+.field private EF:Lcom/discord/models/domain/ModelVoice$User;
 
-.field private final Ee:I
+.field private EG:Ljava/lang/String;
 
-.field private final Ef:I
+.field private final Eh:Z
 
-.field private final Eg:Lrx/subjects/BehaviorSubject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/BehaviorSubject<",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private final Eq:Lkotlin/properties/ReadOnlyProperty;
 
-.field private Eh:Lrx/Subscription;
+.field private final Ey:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Ei:Z
-
-.field private final Ej:Z
-
-.field private Ek:Lcom/discord/models/domain/ModelVoice$User;
-
-.field private El:Lco/discord/media_engine/VideoStreamRenderer;
-
-.field private Em:Lorg/webrtc/RendererCommon$ScalingType;
-
-.field private En:Z
-
-.field private Eo:Ljava/lang/String;
-
-.field private scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
-
-.field private streamId:Ljava/lang/Integer;
+.field private final Ez:Lkotlin/properties/ReadOnlyProperty;
 
 
 # direct methods
@@ -82,28 +58,6 @@
 
     move-result-object v3
 
-    const-string v4, "contentContainer"
-
-    const-string v5, "getContentContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
-
-    move-result-object v2
-
-    check-cast v2, Lkotlin/reflect/KProperty;
-
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    new-instance v2, Lkotlin/jvm/internal/v;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v3
-
     const-string v4, "voiceUserView"
 
     const-string v5, "getVoiceUserView()Lcom/discord/views/VoiceUserView;"
@@ -116,7 +70,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
@@ -138,7 +92,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x2
+    const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
@@ -160,7 +114,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x3
+    const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
@@ -182,6 +136,28 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
+    const/4 v3, 0x3
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "letterbox"
+
+    const-string v5, "getLetterbox()Landroid/view/View;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
@@ -192,9 +168,9 @@
 
     move-result-object v0
 
-    const-string v3, "letterbox"
+    const-string v3, "videoStreamRenderer"
 
-    const-string v4, "getLetterbox()Landroid/view/View;"
+    const-string v4, "getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;"
 
     invoke-direct {v2, v0, v3, v4}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -262,65 +238,65 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p3, 0x7f0a04c7
+    const p3, 0x7f0a04e1
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p3
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->DY:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ey:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a04ca
+    const p3, 0x7f0a04db
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p3
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->DZ:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ez:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a04c5
+    const p3, 0x7f0a04e0
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p3
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ea:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->EA:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a04c9
+    const p3, 0x7f0a04de
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p3
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eb:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eq:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a04c8
+    const p3, 0x7f0a04dc
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p3
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ec:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->EB:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a04c6
+    const p3, 0x7f0a04df
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p3
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ed:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->EC:Lkotlin/properties/ReadOnlyProperty;
 
     invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getResources()Landroid/content/res/Resources;
 
     move-result-object p3
 
-    const v0, 0x7f070056
+    const v0, 0x7f070055
 
     invoke-virtual {p3, v0}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
     move-result p3
 
-    iput p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ee:I
+    iput p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->ED:I
 
     invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getResources()Landroid/content/res/Resources;
 
@@ -332,29 +308,13 @@
 
     move-result p3
 
-    iput p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ef:I
-
-    sget-object p3, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    invoke-static {p3}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
-    move-result-object p3
-
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eg:Lrx/subjects/BehaviorSubject;
-
-    sget-object p3, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
-
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Em:Lorg/webrtc/RendererCommon$ScalingType;
-
-    sget-object p3, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
-
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
+    iput p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->EE:I
 
     move-object p3, p0
 
     check-cast p3, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d00b3
+    const v0, 0x7f0d00bb
 
     invoke-static {p1, v0, p3}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -372,24 +332,53 @@
 
     move-result p2
 
-    iput-boolean p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ei:Z
+    const/4 v0, 0x1
 
-    const/4 p2, 0x1
+    invoke-virtual {p1, v0, p3}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
 
-    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+    move-result p3
 
-    move-result p2
-
-    iput-boolean p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ej:Z
+    iput-boolean p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eh:Z
 
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
-    return-void
+    goto :goto_0
 
     :cond_0
-    iput-boolean p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ei:Z
+    iput-boolean p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eh:Z
 
-    iput-boolean p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ej:Z
+    const/4 p2, 0x0
+
+    :goto_0
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    move-result-object p1
+
+    invoke-virtual {p1, p2}, Lcom/discord/views/video/AppVideoStreamRenderer;->setIsOverlay(Z)V
+
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    move-result-object p1
+
+    iget-boolean p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eh:Z
+
+    invoke-virtual {p1, p2}, Lcom/discord/views/video/AppVideoStreamRenderer;->setMatchVideoOrientation(Z)V
+
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    move-result-object p1
+
+    new-instance p2, Lcom/discord/views/video/VideoCallParticipantView$1;
+
+    move-object p3, p0
+
+    check-cast p3, Lcom/discord/views/video/VideoCallParticipantView;
+
+    invoke-direct {p2, p3}, Lcom/discord/views/video/VideoCallParticipantView$1;-><init>(Lcom/discord/views/video/VideoCallParticipantView;)V
+
+    check-cast p2, Lkotlin/jvm/functions/Function1;
+
+    invoke-virtual {p1, p2}, Lcom/discord/views/video/AppVideoStreamRenderer;->setOnFrameRenderedListener(Lkotlin/jvm/functions/Function1;)V
 
     return-void
 .end method
@@ -416,37 +405,44 @@
     return-void
 .end method
 
-.method public static final synthetic a(Lcom/discord/views/video/VideoCallParticipantView;)Lrx/Subscription;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eh:Lrx/Subscription;
-
-    return-object p0
-.end method
-
 .method public static final synthetic a(Lcom/discord/views/video/VideoCallParticipantView;Landroid/graphics/Point;)V
     .locals 4
 
-    if-nez p1, :cond_0
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
 
-    return-void
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Lcom/discord/views/video/AppVideoStreamRenderer;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLetterbox()Landroid/view/View;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLoadingIndicator()Landroid/view/View;
+
+    move-result-object v0
+
+    const/16 v2, 0x8
+
+    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
 
-    :cond_0
     iget v0, p1, Landroid/graphics/Point;->x:I
 
     iget p1, p1, Landroid/graphics/Point;->y:I
 
-    const/4 v1, 0x0
-
     const/4 v2, 0x1
 
-    if-le v0, p1, :cond_1
+    if-le v0, p1, :cond_0
 
     const/4 p1, 0x1
 
     goto :goto_0
 
-    :cond_1
+    :cond_0
     const/4 p1, 0x0
 
     :goto_0
@@ -458,215 +454,59 @@
 
     move-result v3
 
-    if-le v0, v3, :cond_2
+    if-le v0, v3, :cond_1
 
     const/4 v0, 0x1
 
     goto :goto_1
 
-    :cond_2
+    :cond_1
     const/4 v0, 0x0
 
     :goto_1
-    if-eq p1, v0, :cond_3
+    if-eq p1, v0, :cond_2
 
     const/4 v1, 0x1
 
-    :cond_3
-    iget-boolean p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ej:Z
+    :cond_2
+    iget-boolean p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eh:Z
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_3
 
-    if-eqz v1, :cond_4
-
-    invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object p1
+    if-eqz v1, :cond_3
 
     invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getHeight()I
 
-    move-result v0
+    move-result p1
+
+    invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+    move-result-object v0
 
     invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getWidth()I
 
     move-result v1
 
-    iput v1, p1, Landroid/view/ViewGroup$LayoutParams;->height:I
+    iput v1, v0, Landroid/view/ViewGroup$LayoutParams;->height:I
 
-    iput v0, p1, Landroid/view/ViewGroup$LayoutParams;->width:I
-
-    invoke-virtual {p0, p1}, Lcom/discord/views/video/VideoCallParticipantView;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
-
-    return-void
-
-    :cond_4
-    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->El:Lco/discord/media_engine/VideoStreamRenderer;
-
-    if-eqz p1, :cond_8
-
-    if-eqz v1, :cond_5
-
-    iget-object p0, p0, Lcom/discord/views/video/VideoCallParticipantView;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
-
-    goto :goto_2
-
-    :cond_5
-    iget-object p0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Em:Lorg/webrtc/RendererCommon$ScalingType;
-
-    :goto_2
-    sget-object v0, Lcom/discord/views/video/b;->$EnumSwitchMapping$0:[I
-
-    invoke-virtual {p0}, Lorg/webrtc/RendererCommon$ScalingType;->ordinal()I
-
-    move-result p0
-
-    aget p0, v0, p0
-
-    const/4 v0, -0x1
-
-    if-eq p0, v2, :cond_6
-
-    const/4 p0, -0x1
-
-    goto :goto_3
-
-    :cond_6
-    const/4 p0, -0x2
-
-    :goto_3
-    invoke-virtual {p1}, Lco/discord/media_engine/VideoStreamRenderer;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object v1
-
-    iget v1, v1, Landroid/view/ViewGroup$LayoutParams;->height:I
-
-    if-ne v1, p0, :cond_7
-
-    invoke-virtual {p1}, Lco/discord/media_engine/VideoStreamRenderer;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object v1
-
-    iget v1, v1, Landroid/view/ViewGroup$LayoutParams;->width:I
-
-    if-eq v1, p0, :cond_8
-
-    :cond_7
-    new-instance v1, Landroid/widget/RelativeLayout$LayoutParams;
-
-    invoke-direct {v1, p0, p0}, Landroid/widget/RelativeLayout$LayoutParams;-><init>(II)V
-
-    const/16 p0, 0xd
-
-    invoke-virtual {v1, p0, v0}, Landroid/widget/RelativeLayout$LayoutParams;->addRule(II)V
-
-    check-cast v1, Landroid/view/ViewGroup$LayoutParams;
-
-    invoke-virtual {p1, v1}, Lco/discord/media_engine/VideoStreamRenderer;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
-
-    :cond_8
-    return-void
-.end method
-
-.method public static final synthetic a(Lcom/discord/views/video/VideoCallParticipantView;Lrx/Subscription;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eh:Lrx/Subscription;
-
-    return-void
-.end method
-
-.method public static final synthetic b(Lcom/discord/views/video/VideoCallParticipantView;)Lrx/subjects/BehaviorSubject;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eg:Lrx/subjects/BehaviorSubject;
-
-    return-object p0
-.end method
-
-.method public static final synthetic c(Lcom/discord/views/video/VideoCallParticipantView;)Landroid/view/View;
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLoadingIndicator()Landroid/view/View;
+    invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object p0
 
-    return-object p0
-.end method
+    iput p1, p0, Landroid/view/ViewGroup$LayoutParams;->width:I
 
-.method private final eP()V
-    .locals 7
-
-    iget-object v6, p0, Lcom/discord/views/video/VideoCallParticipantView;->El:Lco/discord/media_engine/VideoStreamRenderer;
-
-    if-eqz v6, :cond_1
-
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eh:Lrx/Subscription;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    :cond_0
-    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;->getVoiceEngineNative()Lcom/hammerandchisel/libdiscord/Discord;
-
-    move-result-object v1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x4
-
-    const/4 v5, 0x0
-
-    move-object v0, v6
-
-    invoke-static/range {v0 .. v5}, Lco/discord/media_engine/VideoStreamRenderer;->attachToStream$default(Lco/discord/media_engine/VideoStreamRenderer;Lcom/hammerandchisel/libdiscord/Discord;Ljava/lang/String;Lorg/webrtc/RendererCommon$RendererEvents;ILjava/lang/Object;)V
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->El:Lco/discord/media_engine/VideoStreamRenderer;
-
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getContentContainer()Landroid/view/ViewGroup;
-
-    move-result-object v0
-
-    check-cast v6, Landroid/view/View;
-
-    invoke-virtual {v0, v6}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
-
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLoadingIndicator()Landroid/view/View;
-
-    move-result-object v0
-
-    const/16 v1, 0x8
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLetterbox()Landroid/view/View;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    :cond_1
+    :cond_3
     return-void
 .end method
 
 .method private final getBackgroundAvatar()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ea:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ez:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/video/VideoCallParticipantView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x2
+    const/4 v2, 0x1
 
     aget-object v1, v1, v2
 
@@ -679,50 +519,10 @@
     return-object v0
 .end method
 
-.method private final getContentContainer()Landroid/view/ViewGroup;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->DY:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/views/video/VideoCallParticipantView;->$$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/view/ViewGroup;
-
-    return-object v0
-.end method
-
 .method private final getLetterbox()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ed:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/views/video/VideoCallParticipantView;->$$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, Landroid/view/View;
-
-    return-object v0
-.end method
-
-.method private final getLoadingIndicator()Landroid/view/View;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ec:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->EB:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/video/VideoCallParticipantView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -739,10 +539,10 @@
     return-object v0
 .end method
 
-.method private final getVoiceStatusIndicator()Landroid/widget/ImageView;
+.method private final getLoadingIndicator()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eb:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eq:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/video/VideoCallParticipantView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -754,6 +554,46 @@
 
     move-result-object v0
 
+    check-cast v0, Landroid/view/View;
+
+    return-object v0
+.end method
+
+.method private final getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->EC:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/views/video/VideoCallParticipantView;->$$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/video/AppVideoStreamRenderer;
+
+    return-object v0
+.end method
+
+.method private final getVoiceStatusIndicator()Landroid/widget/ImageView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->EA:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/views/video/VideoCallParticipantView;->$$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
@@ -762,11 +602,11 @@
 .method private final getVoiceUserView()Lcom/discord/views/VoiceUserView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->DZ:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ey:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/video/VideoCallParticipantView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     aget-object v1, v1, v2
 
@@ -784,7 +624,7 @@
 .method public final getDataId()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ek:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
     if-eqz v0, :cond_0
 
@@ -813,7 +653,7 @@
 .method public final getParticipant()Lcom/discord/models/domain/ModelVoice$User;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ek:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
     return-object v0
 .end method
@@ -832,20 +672,6 @@
     return-void
 .end method
 
-.method protected final onDetachedFromWindow()V
-    .locals 1
-
-    invoke-super {p0}, Landroid/widget/RelativeLayout;->onDetachedFromWindow()V
-
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->eP()V
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->streamId:Ljava/lang/Integer;
-
-    return-void
-.end method
-
 .method protected final onLayout(ZIIII)V
     .locals 0
 
@@ -863,11 +689,11 @@
 
     move-result p1
 
-    iget p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ef:I
+    iget p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->EE:I
 
     sub-int/2addr p1, p2
 
-    iget p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ee:I
+    iget p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->ED:I
 
     invoke-static {p1, p2}, Ljava/lang/Math;->min(II)I
 
@@ -890,404 +716,323 @@
     return-void
 .end method
 
-.method protected final onSizeChanged(IIII)V
-    .locals 0
-
-    invoke-super {p0, p1, p2, p3, p4}, Landroid/widget/RelativeLayout;->onSizeChanged(IIII)V
-
-    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eg:Lrx/subjects/BehaviorSubject;
-
-    sget-object p2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    invoke-virtual {p1, p2}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
 .method public final set(Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;)V
-    .locals 12
+    .locals 13
 
-    const/4 v0, 0x0
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->EF:Lcom/discord/models/domain/ModelVoice$User;
+
+    const/4 v1, 0x0
 
     if-eqz p1, :cond_0
 
-    iget-object v1, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Ek:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v2, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v0
+    move-object v2, v1
 
     :goto_0
-    iput-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ek:Lcom/discord/models/domain/ModelVoice$User;
+    iput-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
-    const/4 v1, 0x0
+    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
-    if-eqz p1, :cond_1
-
-    iget-boolean v2, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Ep:Z
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_1
-    iput-boolean v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->En:Z
-
-    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->Em:Lorg/webrtc/RendererCommon$ScalingType;
-
-    iget-object v3, p0, Lcom/discord/views/video/VideoCallParticipantView;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
-
-    if-eqz p1, :cond_2
-
-    iget-object v4, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Em:Lorg/webrtc/RendererCommon$ScalingType;
-
-    if-nez v4, :cond_3
-
-    :cond_2
-    sget-object v4, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
-
-    :cond_3
-    iput-object v4, p0, Lcom/discord/views/video/VideoCallParticipantView;->Em:Lorg/webrtc/RendererCommon$ScalingType;
-
-    if-eqz p1, :cond_4
-
-    iget-object p1, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
-
-    if-nez p1, :cond_5
-
-    :cond_4
-    sget-object p1, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
-
-    :cond_5
-    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
-
-    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Em:Lorg/webrtc/RendererCommon$ScalingType;
-
-    if-ne p1, v2, :cond_6
-
-    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
-
-    if-eq v3, p1, :cond_7
-
-    :cond_6
-    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->El:Lco/discord/media_engine/VideoStreamRenderer;
-
-    if-eqz p1, :cond_7
-
-    invoke-virtual {p1}, Lco/discord/media_engine/VideoStreamRenderer;->requestLayout()V
-
-    :cond_7
-    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ek:Lcom/discord/models/domain/ModelVoice$User;
-
-    if-eqz p1, :cond_8
-
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVoiceUserView()Lcom/discord/views/VoiceUserView;
-
-    move-result-object v2
-
-    invoke-static {v2, p1}, Lcom/discord/views/VoiceUserView;->a(Lcom/discord/views/VoiceUserView;Lcom/discord/models/domain/ModelVoice$User;)V
-
-    :cond_8
-    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ek:Lcom/discord/models/domain/ModelVoice$User;
-
-    if-eqz p1, :cond_9
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
-
-    goto :goto_2
-
-    :cond_9
-    move-object p1, v0
-
-    :goto_2
-    const/4 v2, 0x2
-
-    invoke-static {p1, v1, v2, v0}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Lcom/discord/models/domain/ModelUser;ZILjava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    iget-object v3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eo:Ljava/lang/String;
-
-    invoke-static {p1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    const/4 v4, 0x1
-
-    xor-int/2addr v3, v4
-
-    if-eqz v3, :cond_b
-
-    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Eo:Ljava/lang/String;
-
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getBackgroundAvatar()Landroid/widget/ImageView;
-
-    move-result-object v5
-
-    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ek:Lcom/discord/models/domain/ModelVoice$User;
-
-    if-eqz p1, :cond_a
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
-
-    move-object v6, p1
-
-    goto :goto_3
-
-    :cond_a
-    move-object v6, v0
-
-    :goto_3
-    const/4 v7, 0x0
-
-    new-instance p1, Lcom/discord/views/video/VideoCallParticipantView$a;
-
-    invoke-direct {p1, p0}, Lcom/discord/views/video/VideoCallParticipantView$a;-><init>(Lcom/discord/views/video/VideoCallParticipantView;)V
-
-    move-object v8, p1
-
-    check-cast v8, Lkotlin/jvm/functions/Function1;
-
-    const/4 v9, 0x0
-
-    const/16 v10, 0x14
-
-    const/4 v11, 0x0
-
-    invoke-static/range {v5 .. v11}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
-
-    :cond_b
-    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ek:Lcom/discord/models/domain/ModelVoice$User;
-
-    if-eqz p1, :cond_c
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_c
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfMute()Z
-
-    move-result p1
-
-    goto :goto_4
-
-    :cond_c
-    const/4 p1, 0x0
-
-    :goto_4
-    iget-object v3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ek:Lcom/discord/models/domain/ModelVoice$User;
-
-    if-eqz v3, :cond_d
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_d
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelVoice$State;->isSelfDeaf()Z
-
-    move-result v3
-
-    goto :goto_5
-
-    :cond_d
-    const/4 v3, 0x0
-
-    :goto_5
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVoiceStatusIndicator()Landroid/widget/ImageView;
-
-    move-result-object v5
-
-    move-object v6, v5
-
-    check-cast v6, Landroid/view/View;
-
-    if-nez p1, :cond_f
-
-    if-eqz v3, :cond_e
-
-    goto :goto_6
-
-    :cond_e
-    const/4 v7, 0x0
-
-    goto :goto_7
-
-    :cond_f
-    :goto_6
-    const/4 v7, 0x1
-
-    :goto_7
-    invoke-static {v6, v7, v1, v2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    if-eqz v3, :cond_10
-
-    const p1, 0x7f0802a5
-
-    goto :goto_8
-
-    :cond_10
-    if-eqz p1, :cond_11
-
-    const p1, 0x7f0802e8
-
-    goto :goto_8
-
-    :cond_11
-    const/4 p1, 0x0
-
-    :goto_8
-    invoke-virtual {v5, p1}, Landroid/widget/ImageView;->setImageResource(I)V
-
-    new-instance p1, Lcom/discord/views/video/VideoCallParticipantView$b;
-
-    invoke-direct {p1, p0}, Lcom/discord/views/video/VideoCallParticipantView$b;-><init>(Lcom/discord/views/video/VideoCallParticipantView;)V
-
-    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ek:Lcom/discord/models/domain/ModelVoice$User;
-
-    if-eqz v2, :cond_12
+    if-eqz v2, :cond_1
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$User;->getStreamId()Ljava/lang/Integer;
 
     move-result-object v2
 
-    goto :goto_9
+    goto :goto_1
 
-    :cond_12
-    move-object v2, v0
+    :cond_1
+    move-object v2, v1
 
-    :goto_9
-    if-eqz v2, :cond_18
+    :goto_1
+    if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->El:Lco/discord/media_engine/VideoStreamRenderer;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$User;->getStreamId()Ljava/lang/Integer;
 
-    if-nez v0, :cond_13
+    move-result-object v0
 
-    new-instance v0, Lco/discord/media_engine/VideoStreamRenderer;
+    goto :goto_2
 
-    invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getContext()Landroid/content/Context;
+    :cond_2
+    move-object v0, v1
 
-    move-result-object v3
+    :goto_2
+    invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    const-string v5, "context"
+    move-result v0
 
-    invoke-static {v3, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    const/4 v2, 0x1
 
-    invoke-direct {v0, v3}, Lco/discord/media_engine/VideoStreamRenderer;-><init>(Landroid/content/Context;)V
+    xor-int/2addr v0, v2
 
-    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->El:Lco/discord/media_engine/VideoStreamRenderer;
+    const/4 v3, 0x0
 
-    const/4 v0, 0x1
+    if-eqz v0, :cond_5
 
-    goto :goto_a
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
-    :cond_13
-    const/4 v0, 0x0
+    if-eqz v0, :cond_3
 
-    :goto_a
-    iget-object v3, p0, Lcom/discord/views/video/VideoCallParticipantView;->streamId:Ljava/lang/Integer;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$User;->getStreamId()Ljava/lang/Integer;
 
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+    move-result-object v0
 
-    move-result v3
+    goto :goto_3
 
-    xor-int/2addr v3, v4
+    :cond_3
+    move-object v0, v1
 
-    if-eqz v3, :cond_15
+    :goto_3
+    const/16 v4, 0x8
 
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLoadingIndicator()Landroid/view/View;
+    if-eqz v0, :cond_4
 
-    move-result-object v3
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
 
-    invoke-virtual {v3, v1}, Landroid/view/View;->setVisibility(I)V
+    move-result-object v0
 
-    iget-object v3, p0, Lcom/discord/views/video/VideoCallParticipantView;->El:Lco/discord/media_engine/VideoStreamRenderer;
-
-    if-eqz v3, :cond_14
-
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
-
-    move-result v4
-
-    invoke-virtual {p1, v4, v3}, Lcom/discord/views/video/VideoCallParticipantView$b;->a(ILco/discord/media_engine/VideoStreamRenderer;)V
-
-    :cond_14
-    iput-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->streamId:Ljava/lang/Integer;
-
-    :cond_15
-    if-eqz v0, :cond_16
-
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getContentContainer()Landroid/view/ViewGroup;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->El:Lco/discord/media_engine/VideoStreamRenderer;
-
-    check-cast v0, Landroid/view/View;
-
-    invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->addView(Landroid/view/View;)V
+    invoke-virtual {v0, v4}, Lcom/discord/views/video/AppVideoStreamRenderer;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLetterbox()Landroid/view/View;
 
-    move-result-object p1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->El:Lco/discord/media_engine/VideoStreamRenderer;
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLoadingIndicator()Landroid/view/View;
 
-    if-eqz p1, :cond_16
+    move-result-object v0
 
-    new-instance v0, Landroid/widget/RelativeLayout$LayoutParams;
+    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
 
-    const/4 v1, -0x2
+    goto :goto_4
 
-    invoke-direct {v0, v1, v1}, Landroid/widget/RelativeLayout$LayoutParams;-><init>(II)V
+    :cond_4
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
 
-    const/16 v1, 0xd
+    move-result-object v0
 
-    const/4 v2, -0x1
+    invoke-virtual {v0, v4}, Lcom/discord/views/video/AppVideoStreamRenderer;->setVisibility(I)V
 
-    invoke-virtual {v0, v1, v2}, Landroid/widget/RelativeLayout$LayoutParams;->addRule(II)V
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLetterbox()Landroid/view/View;
 
-    check-cast v0, Landroid/view/ViewGroup$LayoutParams;
+    move-result-object v0
 
-    invoke-virtual {p1, v0}, Lco/discord/media_engine/VideoStreamRenderer;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+    invoke-virtual {v0, v4}, Landroid/view/View;->setVisibility(I)V
 
-    :cond_16
-    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->El:Lco/discord/media_engine/VideoStreamRenderer;
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLoadingIndicator()Landroid/view/View;
 
-    if-eqz p1, :cond_17
+    move-result-object v0
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Em:Lorg/webrtc/RendererCommon$ScalingType;
+    invoke-virtual {v0, v4}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
+    :cond_5
+    :goto_4
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
-    invoke-virtual {p1, v0, v1}, Lco/discord/media_engine/VideoStreamRenderer;->setScalingType(Lorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;)V
+    if-eqz v0, :cond_6
 
-    iget-boolean v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->En:Z
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVoiceUserView()Lcom/discord/views/VoiceUserView;
 
-    invoke-virtual {p1, v0}, Lco/discord/media_engine/VideoStreamRenderer;->setMirror(Z)V
+    move-result-object v4
 
-    iget-boolean v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ei:Z
+    invoke-static {v4, v0}, Lcom/discord/views/VoiceUserView;->a(Lcom/discord/views/VoiceUserView;Lcom/discord/models/domain/ModelVoice$User;)V
 
-    invoke-virtual {p1, v0}, Lco/discord/media_engine/VideoStreamRenderer;->setZOrderMediaOverlay(Z)V
+    :cond_6
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
-    :cond_17
-    return-void
+    if-eqz v0, :cond_7
 
-    :cond_18
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->eP()V
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->streamId:Ljava/lang/Integer;
+    move-result-object v0
+
+    goto :goto_5
+
+    :cond_7
+    move-object v0, v1
+
+    :goto_5
+    const/4 v4, 0x2
+
+    invoke-static {v0, v3, v4, v1}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Lcom/discord/models/domain/ModelUser;ZILjava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    iget-object v5, p0, Lcom/discord/views/video/VideoCallParticipantView;->EG:Ljava/lang/String;
+
+    invoke-static {v0, v5}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    xor-int/2addr v5, v2
+
+    if-eqz v5, :cond_9
+
+    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->EG:Ljava/lang/String;
+
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getBackgroundAvatar()Landroid/widget/ImageView;
+
+    move-result-object v6
+
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->EF:Lcom/discord/models/domain/ModelVoice$User;
+
+    if-eqz v0, :cond_8
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v0
+
+    move-object v7, v0
+
+    goto :goto_6
+
+    :cond_8
+    move-object v7, v1
+
+    :goto_6
+    const/4 v8, 0x0
+
+    new-instance v0, Lcom/discord/views/video/VideoCallParticipantView$a;
+
+    invoke-direct {v0, p0}, Lcom/discord/views/video/VideoCallParticipantView$a;-><init>(Lcom/discord/views/video/VideoCallParticipantView;)V
+
+    move-object v9, v0
+
+    check-cast v9, Lkotlin/jvm/functions/Function1;
+
+    const/4 v10, 0x0
+
+    const/16 v11, 0x14
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v6 .. v12}, 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
+
+    :cond_9
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->EF:Lcom/discord/models/domain/ModelVoice$User;
+
+    if-eqz v0, :cond_a
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_a
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$State;->isSelfMute()Z
+
+    move-result v0
+
+    goto :goto_7
+
+    :cond_a
+    const/4 v0, 0x0
+
+    :goto_7
+    iget-object v5, p0, Lcom/discord/views/video/VideoCallParticipantView;->EF:Lcom/discord/models/domain/ModelVoice$User;
+
+    if-eqz v5, :cond_b
+
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_b
+
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelVoice$State;->isSelfDeaf()Z
+
+    move-result v5
+
+    goto :goto_8
+
+    :cond_b
+    const/4 v5, 0x0
+
+    :goto_8
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVoiceStatusIndicator()Landroid/widget/ImageView;
+
+    move-result-object v6
+
+    move-object v7, v6
+
+    check-cast v7, Landroid/view/View;
+
+    if-nez v0, :cond_d
+
+    if-eqz v5, :cond_c
+
+    goto :goto_9
+
+    :cond_c
+    const/4 v2, 0x0
+
+    :cond_d
+    :goto_9
+    invoke-static {v7, v2, v3, v4, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    if-eqz v5, :cond_e
+
+    const v0, 0x7f0802b5
+
+    goto :goto_a
+
+    :cond_e
+    if-eqz v0, :cond_f
+
+    const v0, 0x7f0802f8
+
+    goto :goto_a
+
+    :cond_f
+    const/4 v0, 0x0
+
+    :goto_a
+    invoke-virtual {v6, v0}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+
+    move-result-object v0
+
+    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->EF:Lcom/discord/models/domain/ModelVoice$User;
+
+    if-eqz v2, :cond_10
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$User;->getStreamId()Ljava/lang/Integer;
+
+    move-result-object v2
+
+    goto :goto_b
+
+    :cond_10
+    move-object v2, v1
+
+    :goto_b
+    if-eqz p1, :cond_11
+
+    iget-object v4, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->El:Lorg/webrtc/RendererCommon$ScalingType;
+
+    goto :goto_c
+
+    :cond_11
+    move-object v4, v1
+
+    :goto_c
+    if-eqz p1, :cond_12
+
+    iget-object v1, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
+
+    :cond_12
+    if-eqz p1, :cond_13
+
+    iget-boolean v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->EH:Z
+
+    :cond_13
+    invoke-virtual {v0, v2, v4, v1, v3}, Lcom/discord/views/video/AppVideoStreamRenderer;->a(Ljava/lang/Integer;Lorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;Z)V
 
     return-void
 .end method
@@ -1295,7 +1040,7 @@
 .method public final setParticipant(Lcom/discord/models/domain/ModelVoice$User;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ek:Lcom/discord/models/domain/ModelVoice$User;
+    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/video/a.smali b/com.discord/smali/com/discord/views/video/a.smali
index d8fb2fea55..5c877185dd 100644
--- a/com.discord/smali/com/discord/views/video/a.smali
+++ b/com.discord/smali/com/discord/views/video/a.smali
@@ -1,100 +1,7 @@
 .class public final Lcom/discord/views/video/a;
 .super Ljava/lang/Object;
-.source "RxRendererEvents.kt"
-
-# interfaces
-.implements Lorg/webrtc/RendererCommon$RendererEvents;
+.source "AppVideoStreamRenderer.kt"
 
 
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/views/video/a$a;
-    }
-.end annotation
-
-
-# instance fields
-.field private final DW:Lrx/subjects/BehaviorSubject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/BehaviorSubject<",
-            "Lcom/discord/views/video/a$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/views/video/a;->DW:Lrx/subjects/BehaviorSubject;
-
-    return-void
-.end method
-
-.method public static synthetic a(Lcom/discord/views/video/a;)Lrx/Observable;
-    .locals 3
-
-    iget-object p0, p0, Lcom/discord/views/video/a;->DW:Lrx/subjects/BehaviorSubject;
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    const-wide/16 v1, 0x32
-
-    invoke-virtual {p0, v1, v2, v0}, Lrx/subjects/BehaviorSubject;->k(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
-
-    move-result-object p0
-
-    sget-object v0, Lcom/discord/views/video/a$b;->DX:Lcom/discord/views/video/a$b;
-
-    check-cast v0, Lrx/functions/b;
-
-    invoke-virtual {p0, v0}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Lrx/Observable;->Kd()Lrx/Observable;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Lrx/Observable;->Kb()Lrx/Observable;
-
-    move-result-object p0
-
-    const-string v0, "frameResolutionSubject\n \u2026  .distinctUntilChanged()"
-
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final onFirstFrameRendered()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final onFrameResolutionChanged(III)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/views/video/a;->DW:Lrx/subjects/BehaviorSubject;
-
-    new-instance v1, Lcom/discord/views/video/a$a;
-
-    invoke-direct {v1, p1, p2, p3}, Lcom/discord/views/video/a$a;-><init>(III)V
-
-    invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
+# static fields
+.field static Eo:I
diff --git a/com.discord/smali/com/discord/views/video/a$a.smali b/com.discord/smali/com/discord/views/video/b$a.smali
similarity index 65%
rename from com.discord/smali/com/discord/views/video/a$a.smali
rename to com.discord/smali/com/discord/views/video/b$a.smali
index 9522ae6415..fbcc39b793 100644
--- a/com.discord/smali/com/discord/views/video/a$a.smali
+++ b/com.discord/smali/com/discord/views/video/b$a.smali
@@ -1,11 +1,11 @@
-.class final Lcom/discord/views/video/a$a;
+.class final Lcom/discord/views/video/b$a;
 .super Ljava/lang/Object;
 .source "RxRendererEvents.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/views/video/a;
+    value = Lcom/discord/views/video/b;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,11 +28,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/views/video/a$a;->width:I
+    iput p1, p0, Lcom/discord/views/video/b$a;->width:I
 
-    iput p2, p0, Lcom/discord/views/video/a$a;->height:I
+    iput p2, p0, Lcom/discord/views/video/b$a;->height:I
 
-    iput p3, p0, Lcom/discord/views/video/a$a;->rotation:I
+    iput p3, p0, Lcom/discord/views/video/b$a;->rotation:I
 
     return-void
 .end method
@@ -46,17 +46,17 @@
 
     if-eq p0, p1, :cond_4
 
-    instance-of v1, p1, Lcom/discord/views/video/a$a;
+    instance-of v1, p1, Lcom/discord/views/video/b$a;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_3
 
-    check-cast p1, Lcom/discord/views/video/a$a;
+    check-cast p1, Lcom/discord/views/video/b$a;
 
-    iget v1, p0, Lcom/discord/views/video/a$a;->width:I
+    iget v1, p0, Lcom/discord/views/video/b$a;->width:I
 
-    iget v3, p1, Lcom/discord/views/video/a$a;->width:I
+    iget v3, p1, Lcom/discord/views/video/b$a;->width:I
 
     if-ne v1, v3, :cond_0
 
@@ -70,9 +70,9 @@
     :goto_0
     if-eqz v1, :cond_3
 
-    iget v1, p0, Lcom/discord/views/video/a$a;->height:I
+    iget v1, p0, Lcom/discord/views/video/b$a;->height:I
 
-    iget v3, p1, Lcom/discord/views/video/a$a;->height:I
+    iget v3, p1, Lcom/discord/views/video/b$a;->height:I
 
     if-ne v1, v3, :cond_1
 
@@ -86,9 +86,9 @@
     :goto_1
     if-eqz v1, :cond_3
 
-    iget v1, p0, Lcom/discord/views/video/a$a;->rotation:I
+    iget v1, p0, Lcom/discord/views/video/b$a;->rotation:I
 
-    iget p1, p1, Lcom/discord/views/video/a$a;->rotation:I
+    iget p1, p1, Lcom/discord/views/video/b$a;->rotation:I
 
     if-ne v1, p1, :cond_2
 
@@ -115,17 +115,29 @@
 .method public final hashCode()I
     .locals 2
 
-    iget v0, p0, Lcom/discord/views/video/a$a;->width:I
+    iget v0, p0, Lcom/discord/views/video/b$a;->width:I
+
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/views/video/a$a;->height:I
+    iget v1, p0, Lcom/discord/views/video/b$a;->height:I
+
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/views/video/a$a;->rotation:I
+    iget v1, p0, Lcom/discord/views/video/b$a;->rotation:I
+
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
 
     add-int/2addr v0, v1
 
@@ -141,7 +153,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/discord/views/video/a$a;->width:I
+    iget v1, p0, Lcom/discord/views/video/b$a;->width:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -149,7 +161,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/views/video/a$a;->height:I
+    iget v1, p0, Lcom/discord/views/video/b$a;->height:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -157,7 +169,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/views/video/a$a;->rotation:I
+    iget v1, p0, Lcom/discord/views/video/b$a;->rotation:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/views/video/a$b.smali b/com.discord/smali/com/discord/views/video/b$b.smali
similarity index 67%
rename from com.discord/smali/com/discord/views/video/a$b.smali
rename to com.discord/smali/com/discord/views/video/b$b.smali
index 5613052ba6..b9e15c5aec 100644
--- a/com.discord/smali/com/discord/views/video/a$b.smali
+++ b/com.discord/smali/com/discord/views/video/b$b.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/views/video/a$b;
+.class final Lcom/discord/views/video/b$b;
 .super Ljava/lang/Object;
 .source "RxRendererEvents.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/views/video/a;
+    value = Lcom/discord/views/video/b;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,18 +31,18 @@
 
 
 # static fields
-.field public static final DX:Lcom/discord/views/video/a$b;
+.field public static final Ex:Lcom/discord/views/video/b$b;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/views/video/a$b;
+    new-instance v0, Lcom/discord/views/video/b$b;
 
-    invoke-direct {v0}, Lcom/discord/views/video/a$b;-><init>()V
+    invoke-direct {v0}, Lcom/discord/views/video/b$b;-><init>()V
 
-    sput-object v0, Lcom/discord/views/video/a$b;->DX:Lcom/discord/views/video/a$b;
+    sput-object v0, Lcom/discord/views/video/b$b;->Ex:Lcom/discord/views/video/b$b;
 
     return-void
 .end method
@@ -60,11 +60,11 @@
 .method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
 
-    check-cast p1, Lcom/discord/views/video/a$a;
+    check-cast p1, Lcom/discord/views/video/b$a;
 
     if-eqz p1, :cond_1
 
-    iget v0, p1, Lcom/discord/views/video/a$a;->rotation:I
+    iget v0, p1, Lcom/discord/views/video/b$a;->rotation:I
 
     const/16 v1, -0xb4
 
@@ -78,9 +78,9 @@
 
     new-instance v0, Landroid/graphics/Point;
 
-    iget v1, p1, Lcom/discord/views/video/a$a;->height:I
+    iget v1, p1, Lcom/discord/views/video/b$a;->height:I
 
-    iget p1, p1, Lcom/discord/views/video/a$a;->width:I
+    iget p1, p1, Lcom/discord/views/video/b$a;->width:I
 
     invoke-direct {v0, v1, p1}, Landroid/graphics/Point;-><init>(II)V
 
@@ -89,9 +89,9 @@
     :cond_0
     new-instance v0, Landroid/graphics/Point;
 
-    iget v1, p1, Lcom/discord/views/video/a$a;->width:I
+    iget v1, p1, Lcom/discord/views/video/b$a;->width:I
 
-    iget p1, p1, Lcom/discord/views/video/a$a;->height:I
+    iget p1, p1, Lcom/discord/views/video/b$a;->height:I
 
     invoke-direct {v0, v1, p1}, Landroid/graphics/Point;-><init>(II)V
 
diff --git a/com.discord/smali/com/discord/views/video/b.smali b/com.discord/smali/com/discord/views/video/b.smali
index 38b82d98f0..af477e2482 100644
--- a/com.discord/smali/com/discord/views/video/b.smali
+++ b/com.discord/smali/com/discord/views/video/b.smali
@@ -1,34 +1,122 @@
-.class public final synthetic Lcom/discord/views/video/b;
+.class public final Lcom/discord/views/video/b;
 .super Ljava/lang/Object;
+.source "RxRendererEvents.kt"
+
+# interfaces
+.implements Lorg/webrtc/RendererCommon$RendererEvents;
 
 
-# static fields
-.field public static final synthetic $EnumSwitchMapping$0:[I
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/views/video/b$a;
+    }
+.end annotation
+
+
+# instance fields
+.field private final Ew:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Lcom/discord/views/video/b$a;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 3
+.method public constructor <init>()V
+    .locals 1
 
-    invoke-static {}, Lorg/webrtc/RendererCommon$ScalingType;->values()[Lorg/webrtc/RendererCommon$ScalingType;
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
-    array-length v0, v0
-
-    new-array v0, v0, [I
-
-    sput-object v0, Lcom/discord/views/video/b;->$EnumSwitchMapping$0:[I
-
-    sget-object v1, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_FIT:Lorg/webrtc/RendererCommon$ScalingType;
-
-    invoke-virtual {v1}, Lorg/webrtc/RendererCommon$ScalingType;->ordinal()I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    aput v2, v0, v1
+    iput-object v0, p0, Lcom/discord/views/video/b;->Ew:Lrx/subjects/BehaviorSubject;
+
+    return-void
+.end method
+
+.method public static synthetic a(Lcom/discord/views/video/b;)Lrx/Observable;
+    .locals 3
+
+    iget-object p0, p0, Lcom/discord/views/video/b;->Ew:Lrx/subjects/BehaviorSubject;
+
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    const-wide/16 v1, 0x64
+
+    invoke-virtual {p0, v1, v2, v0}, Lrx/subjects/BehaviorSubject;->k(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+
+    move-result-object p0
+
+    sget-object v0, Lcom/discord/views/video/b$b;->Ex:Lcom/discord/views/video/b$b;
+
+    check-cast v0, Lrx/functions/b;
+
+    invoke-virtual {p0, v0}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Lrx/Observable;->JR()Lrx/Observable;
+
+    move-result-object p0
+
+    const-string v0, "frameResolutionSubject\n \u2026  .onBackpressureLatest()"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final onFirstFrameRendered()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final onFrameResolutionChanged(III)V
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "onFrameResolutionChanged: "
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, 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;
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)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 v0
+
+    const-string v1, "RxRendererEvents"
+
+    invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    iget-object v0, p0, Lcom/discord/views/video/b;->Ew:Lrx/subjects/BehaviorSubject;
+
+    new-instance v1, Lcom/discord/views/video/b$a;
+
+    invoke-direct {v1, p1, p2, p3}, Lcom/discord/views/video/b$a;-><init>(III)V
+
+    invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
 .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 60662e3cd6..344d773a6a 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 7ae690d138..e51e668055 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
@@ -51,7 +51,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$1;
 
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 528e6dc1f3..7e72e657e1 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 4177a58f51..47602e1429 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha.smali
@@ -99,7 +99,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0098
+    const v0, 0x7f0a0099
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -107,7 +107,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthCaptcha;->verifyButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0097
+    const v0, 0x7f0a0098
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -163,7 +163,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00bc
+    const v0, 0x7f0d00c5
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo$onViewBoundOrOnResume$1.smali
index b5387ee03b..d161a22cdf 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthInviteInfo$onViewBoundOrOnResume$1;->invoke(Lcom/discord/models/domain/ModelInvite;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali
index 96e79df4bf..f8508a640f 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali
@@ -101,7 +101,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a009c
+    const v0, 0x7f0a009d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -109,7 +109,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthInviteInfo;->invitedText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a009a
+    const v0, 0x7f0a009b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -117,7 +117,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthInviteInfo;->guildAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a009b
+    const v0, 0x7f0a009c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -265,7 +265,7 @@
     :cond_b
     move-object v4, v2
 
-    const v5, 0x7f070057
+    const v5, 0x7f070056
 
     const/4 v6, 0x0
 
@@ -352,7 +352,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f070057
+    const v3, 0x7f070056
 
     const/4 v4, 0x0
 
@@ -510,7 +510,7 @@
 
     move-result v5
 
-    const v7, 0x7f120275
+    const v7, 0x7f120279
 
     if-eqz v5, :cond_6
 
@@ -586,7 +586,7 @@
 
     :cond_5
     :goto_3
-    const p1, 0x7f1209a9
+    const p1, 0x7f1209ca
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthInviteInfo;->getString(I)Ljava/lang/String;
 
@@ -621,7 +621,7 @@
     goto :goto_5
 
     :cond_7
-    const p1, 0x7f1209a7
+    const p1, 0x7f1209c8
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthInviteInfo;->getString(I)Ljava/lang/String;
 
@@ -660,7 +660,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00be
+    const v0, 0x7f0d00c7
 
     return v0
 .end method
@@ -684,7 +684,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali
index 7126de2f52..5b3ea0861a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali
@@ -77,7 +77,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a009f
+    const v0, 0x7f0a00a0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -85,7 +85,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLanding;->buttonLogin$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00a0
+    const v0, 0x7f0a00a1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -141,20 +141,20 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    sget-object v0, Lcom/discord/samsung/a;->zM:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->en()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eq()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f0d00c0
+    const v0, 0x7f0d00c9
 
     return v0
 
     :cond_0
-    const v0, 0x7f0d00bf
+    const v0, 0x7f0d00c8
 
     return v0
 .end method
@@ -212,5 +212,18 @@
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
+    sget-object p1, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
+
+    invoke-static {}, Lcom/discord/samsung/a;->eq()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    sget-object p1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->Companion:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->disable()V
+
+    :cond_0
     return-void
 .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 0fe882b7b8..751f3dc0ae 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthLogin$forgotPassword$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 a96edb3422..f39d088b94 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 b42208d9d1..96c30f85a9 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthLogin$login$2;->invoke(Lcom/discord/models/domain/ModelUser$Token;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 b986a3dc04..2264fdfaf3 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthLogin$login$3;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 754740a0a7..bd1e1f8f2c 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/auth/WidgetAuthLogin$onActivityResult$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 3aee1215eb..92fa3b390b 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthLogin$onActivityResult$2;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 76daf25e99..35fbbcee8c 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$1;->invoke(Lcom/discord/models/domain/ModelInvite;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 d5177a24ec..29d182262d 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$3;->invoke(Landroid/widget/TextView;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 df7cad6381..49ec476cb0 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -97,7 +97,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120cd6
+    const v0, 0x7f120d10
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali
index d37b07cbb8..6c7c6ca8e2 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
@@ -51,13 +51,13 @@
 
     invoke-direct {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v0, 0x7f120cd3
+    const v0, 0x7f120d0d
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object p1
 
-    const v0, 0x7f120cd4
+    const v0, 0x7f120d0e
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -67,7 +67,7 @@
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
-    const v1, 0x7f120cd5
+    const v1, 0x7f120d0f
 
     invoke-virtual {p1, v1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -75,7 +75,7 @@
 
     const/4 v0, 0x0
 
-    const v1, 0x7f120368
+    const v1, 0x7f12036d
 
     const/4 v2, 0x2
 
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 f17b561cc5..c8bbaaafdf 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali
@@ -66,7 +66,7 @@
 
     sget-object v5, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v6, 0x7f120556
+    const v6, 0x7f120561
 
     invoke-virtual {v5, v6}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -80,7 +80,7 @@
 
     sget-object v5, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
-    const v7, 0x7f120555
+    const v7, 0x7f120560
 
     invoke-virtual {v5, v7}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -112,7 +112,7 @@
 
     sget-object v5, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v8, 0x7f120cd8
+    const v8, 0x7f120d12
 
     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 cff6eb1472..7d47c77a61 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
@@ -245,7 +245,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a00a2
+    const v0, 0x7f0a00a3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -253,7 +253,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLogin;->email$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00a3
+    const v0, 0x7f0a00a4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -261,7 +261,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLogin;->emailWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00a5
+    const v0, 0x7f0a00a6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -269,7 +269,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLogin;->password$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00a7
+    const v0, 0x7f0a00a8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -277,7 +277,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLogin;->passwordWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00a4
+    const v0, 0x7f0a00a5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -285,7 +285,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLogin;->passwordForgotten$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00a1
+    const v0, 0x7f0a00a2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -293,7 +293,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLogin;->login$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -301,7 +301,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLogin;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00a6
+    const v0, 0x7f0a00a7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -407,7 +407,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120556
+    const v1, 0x7f120561
 
     invoke-static {v0, v1}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
@@ -976,7 +976,7 @@
 
     aput-object p1, v0, v1
 
-    const p1, 0x7f120557
+    const p1, 0x7f120562
 
     invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/auth/WidgetAuthLogin;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1008,7 +1008,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00c1
+    const v0, 0x7f0d00ca
 
     return 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 ded12ba4d5..144950ae5a 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthMfa$evaluateCode$1;->invoke(Lcom/discord/models/domain/ModelUser$Token;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 f75fd5131c..571355b957 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
@@ -82,7 +82,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0438
+    .packed-switch 0x7f0a0448
         :pswitch_1
         :pswitch_0
     .end packed-switch
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
index 85c6ef7e14..333626c9a5 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
@@ -103,7 +103,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a00a8
+    const v0, 0x7f0a00a9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -111,7 +111,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthMfa;->digitVerificationView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -183,7 +183,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const p2, 0x7f121169
+    const p2, 0x7f1211ab
 
     invoke-static {p1, p2}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -214,7 +214,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f121190
+    const v0, 0x7f1211d4
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -233,7 +233,7 @@
 
     const-string v2, "ticket"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {v0, p1, v1}, Lcom/discord/stores/StoreAuthentication;->authMFA(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
@@ -264,7 +264,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     invoke-virtual {p0}, Lcom/discord/widgets/auth/WidgetAuthMfa;->getContext()Landroid/content/Context;
 
@@ -345,7 +345,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0d00c3
+    const v1, 0x7f0d00cc
 
     const/4 v2, 0x0
 
@@ -353,7 +353,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a080d
+    const v2, 0x7f0a084b
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -361,13 +361,13 @@
 
     check-cast v2, Landroid/widget/EditText;
 
-    const v3, 0x7f0a080e
+    const v3, 0x7f0a084c
 
     invoke-virtual {v1, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v3
 
-    const v4, 0x7f0a080c
+    const v4, 0x7f0a084a
 
     invoke-virtual {v1, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -420,7 +420,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0d00c4
+    const v1, 0x7f0d00cd
 
     const/4 v2, 0x0
 
@@ -428,7 +428,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0810
+    const v2, 0x7f0a084e
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -438,7 +438,7 @@
 
     check-cast v6, Landroid/widget/TextView;
 
-    const v2, 0x7f0a080f
+    const v2, 0x7f0a084d
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -456,7 +456,7 @@
 
     move-result-object v8
 
-    const v1, 0x7f121173
+    const v1, 0x7f1211b5
 
     const/4 v2, 0x2
 
@@ -518,7 +518,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00c2
+    const v0, 0x7f0d00cb
 
     return v0
 .end method
@@ -592,7 +592,7 @@
 
     const-string v0, "ticket"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast p1, Ljava/lang/CharSequence;
@@ -668,6 +668,10 @@
     return-void
 
     :cond_3
+    const-string v2, "clipboard.primaryClip ?: return"
+
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v0}, Landroid/content/ClipData;->getItemCount()I
 
     move-result v2
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 681b26866a..bc0736c3ca 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthRegister$onActivityResult$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$$inlined$forEach$lambda$1.smali
index 7f7ba486a2..7cb4dafc61 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$$inlined$forEach$lambda$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthRegister$onViewBound$$inlined$forEach$lambda$1;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 5da0bd1e05..858bb6a83b 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthRegister$onViewBound$1;->invoke(Lcom/discord/models/domain/ModelInvite;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 0bccd46db5..8aaae6bcc2 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthRegister$onViewBound$2;->invoke(Landroid/widget/TextView;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 8acefa4f81..75ff2843bf 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthRegister$register$1;->invoke(Lcom/discord/models/domain/ModelUser$Token;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 0ee255e4a1..06f6b6e786 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthRegister$register$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 39b3015117..12c6f1d9bc 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali
@@ -102,7 +102,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f12111e
+    const v0, 0x7f121160
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
index c7355c7303..cb6d52ee08 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
@@ -68,7 +68,7 @@
 
     sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v7, 0x7f12128e
+    const v7, 0x7f1212df
 
     invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -102,7 +102,7 @@
 
     sget-object v8, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v9, 0x7f120556
+    const v9, 0x7f120561
 
     invoke-virtual {v8, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -114,7 +114,7 @@
 
     sget-object v8, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
-    const v9, 0x7f120555
+    const v9, 0x7f120560
 
     invoke-virtual {v8, v9}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -144,7 +144,7 @@
 
     sget-object v8, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v9, 0x7f120cd8
+    const v9, 0x7f120d12
 
     invoke-virtual {v8, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -156,7 +156,7 @@
 
     sget-object v7, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
-    const v8, 0x7f120cd2
+    const v8, 0x7f120d0c
 
     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 f15b1b2d23..43eae1f707 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
@@ -319,7 +319,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a00b0
+    const v0, 0x7f0a00b1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -327,7 +327,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->username$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00b1
+    const v0, 0x7f0a00b2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -335,7 +335,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->usernameWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00ac
+    const v0, 0x7f0a00ad
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -343,7 +343,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->email$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00ad
+    const v0, 0x7f0a00ae
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -351,7 +351,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->emailWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00ae
+    const v0, 0x7f0a00af
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -359,7 +359,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->password$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00af
+    const v0, 0x7f0a00b0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -367,7 +367,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->passwordWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00ab
+    const v0, 0x7f0a00ac
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -375,7 +375,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->registerButtonContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00aa
+    const v0, 0x7f0a00ab
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -383,7 +383,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->registerButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -391,7 +391,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00a9
+    const v0, 0x7f0a00aa
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -399,7 +399,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->policyLinks$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00b2
+    const v0, 0x7f0a00b3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -700,7 +700,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    const v1, 0x7f12111b
+    const v1, 0x7f12115d
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -710,7 +710,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f120e69
+    const v1, 0x7f120e9f
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1164,7 +1164,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00c5
+    const v0, 0x7f0d00ce
 
     return v0
 .end method
@@ -1312,12 +1312,12 @@
 
     if-eqz v3, :cond_1
 
-    const v3, 0x7f12111d
+    const v3, 0x7f12115f
 
     goto :goto_1
 
     :cond_1
-    const v3, 0x7f12111c
+    const v3, 0x7f12115e
 
     :goto_1
     invoke-direct {p0, v5, v3}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getFormattedTermsText(Landroid/content/Context;I)Ljava/lang/CharSequence;
@@ -1347,7 +1347,7 @@
 
     aput-object v1, v0, v6
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
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 ac1ec8d317..b841ff2544 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$Companion.smali
@@ -89,6 +89,10 @@
 
     move-result-object p2
 
+    const-string v0, "Intent().putExtra(ARG_DISABLED_KEY, disabled)"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     check-cast p1, Landroidx/fragment/app/Fragment;
 
     const-class v0, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali
index 33847efff5..37561738b5 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali
@@ -149,7 +149,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a00b5
+    const v0, 0x7f0a00b6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -157,7 +157,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;->buttonDelete$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00b4
+    const v0, 0x7f0a00b5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -165,7 +165,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;->buttonCancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00b6
+    const v0, 0x7f0a00b7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -173,7 +173,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;->textTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00b3
+    const v0, 0x7f0a00b4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -269,7 +269,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00c6
+    const v0, 0x7f0d00cf
 
     return v0
 .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 eec73b8504..a99a5bc357 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion.smali
@@ -118,9 +118,13 @@
     return-void
 
     :cond_0
+    const-string v1, "requestUri.getQueryParam\u2026er(\"client_id\") ?: return"
+
+    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    invoke-static {p2}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p2}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v2
 
@@ -138,7 +142,7 @@
     :goto_0
     invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/analytics/AnalyticsTracker;->oauth2AuthorizedViewed(J)V
 
-    sget-object v1, Lcom/discord/samsung/a;->zM:Lcom/discord/samsung/a;
+    sget-object v1, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
 
     const-string v1, "clientId"
 
@@ -152,7 +156,7 @@
 
     if-eqz p2, :cond_2
 
-    invoke-static {}, Lcom/discord/samsung/a;->en()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eq()Z
 
     move-result p2
 
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 5a7b883222..2452a5a93e 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize.smali
@@ -17,6 +17,10 @@
 # instance fields
 .field private final clientId:Ljava/lang/String;
 
+.field private final codeChallenge:Ljava/lang/String;
+
+.field private final codeChallengeMethod:Ljava/lang/String;
+
 .field private final permissions:Ljava/lang/String;
 
 .field private final prompt:Ljava/lang/String;
@@ -31,7 +35,7 @@
 
 
 # direct methods
-.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
+.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;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
     const-string v0, "clientId"
@@ -62,172 +66,255 @@
 
     iput-object p7, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->permissions:Ljava/lang/String;
 
+    iput-object p8, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallenge:Ljava/lang/String;
+
+    iput-object p9, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallengeMethod:Ljava/lang/String;
+
     return-void
 .end method
 
-.method public synthetic constructor <init>(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
-    .locals 10
+.method public synthetic constructor <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/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 13
 
-    and-int/lit8 v0, p8, 0x2
+    move/from16 v0, p10
 
-    const/4 v1, 0x0
+    and-int/lit8 v1, v0, 0x2
 
-    if-eqz v0, :cond_0
+    const/4 v2, 0x0
 
-    move-object v4, v1
+    if-eqz v1, :cond_0
+
+    move-object v5, v2
 
     goto :goto_0
 
     :cond_0
-    move-object v4, p2
+    move-object v5, p2
 
     :goto_0
-    and-int/lit8 v0, p8, 0x4
+    and-int/lit8 v1, v0, 0x4
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    move-object v5, v1
+    move-object v6, v2
 
     goto :goto_1
 
     :cond_1
-    move-object v5, p3
+    move-object/from16 v6, p3
 
     :goto_1
-    and-int/lit8 v0, p8, 0x8
+    and-int/lit8 v1, v0, 0x8
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    move-object v6, v1
+    move-object v7, v2
 
     goto :goto_2
 
     :cond_2
-    move-object v6, p4
+    move-object/from16 v7, p4
 
     :goto_2
-    and-int/lit8 v0, p8, 0x10
+    and-int/lit8 v1, v0, 0x10
 
-    if-eqz v0, :cond_3
+    if-eqz v1, :cond_3
 
-    const-string v0, "consent"
+    const-string v1, "consent"
 
-    move-object v7, v0
+    move-object v8, v1
 
     goto :goto_3
 
     :cond_3
-    move-object v7, p5
+    move-object/from16 v8, p5
 
     :goto_3
-    and-int/lit8 v0, p8, 0x40
+    and-int/lit8 v1, v0, 0x40
 
-    if-eqz v0, :cond_4
+    if-eqz v1, :cond_4
 
-    move-object v9, v1
+    move-object v10, v2
 
     goto :goto_4
 
     :cond_4
-    move-object/from16 v9, p7
+    move-object/from16 v10, p7
 
     :goto_4
-    move-object v2, p0
+    and-int/lit16 v1, v0, 0x80
 
-    move-object v3, p1
+    if-eqz v1, :cond_5
 
-    move-object/from16 v8, p6
+    move-object v11, v2
 
-    invoke-direct/range {v2 .. v9}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    goto :goto_5
+
+    :cond_5
+    move-object/from16 v11, p8
+
+    :goto_5
+    and-int/lit16 v0, v0, 0x100
+
+    if-eqz v0, :cond_6
+
+    move-object v12, v2
+
+    goto :goto_6
+
+    :cond_6
+    move-object/from16 v12, p9
+
+    :goto_6
+    move-object v3, p0
+
+    move-object v4, p1
+
+    move-object/from16 v9, p6
+
+    invoke-direct/range {v3 .. v12}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;-><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/String;)V
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;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;
-    .locals 5
+.method public static synthetic copy$default(Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;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;ILjava/lang/Object;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+    .locals 10
 
-    and-int/lit8 p9, p8, 0x1
+    move-object v0, p0
 
-    if-eqz p9, :cond_0
+    move/from16 v1, p10
 
-    iget-object p1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->clientId:Ljava/lang/String;
+    and-int/lit8 v2, v1, 0x1
+
+    if-eqz v2, :cond_0
+
+    iget-object v2, v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->clientId:Ljava/lang/String;
+
+    goto :goto_0
 
     :cond_0
-    and-int/lit8 p9, p8, 0x2
+    move-object v2, p1
 
-    if-eqz p9, :cond_1
+    :goto_0
+    and-int/lit8 v3, v1, 0x2
 
-    iget-object p2, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->state:Ljava/lang/String;
+    if-eqz v3, :cond_1
+
+    iget-object v3, v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->state:Ljava/lang/String;
+
+    goto :goto_1
 
     :cond_1
-    move-object p9, p2
+    move-object v3, p2
 
-    and-int/lit8 p2, p8, 0x4
+    :goto_1
+    and-int/lit8 v4, v1, 0x4
 
-    if-eqz p2, :cond_2
+    if-eqz v4, :cond_2
 
-    iget-object p3, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->responseType:Ljava/lang/String;
+    iget-object v4, v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->responseType:Ljava/lang/String;
+
+    goto :goto_2
 
     :cond_2
-    move-object v0, p3
+    move-object v4, p3
 
-    and-int/lit8 p2, p8, 0x8
+    :goto_2
+    and-int/lit8 v5, v1, 0x8
 
-    if-eqz p2, :cond_3
+    if-eqz v5, :cond_3
 
-    iget-object p4, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->redirectUrl:Ljava/lang/String;
+    iget-object v5, v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->redirectUrl:Ljava/lang/String;
+
+    goto :goto_3
 
     :cond_3
-    move-object v1, p4
+    move-object v5, p4
 
-    and-int/lit8 p2, p8, 0x10
+    :goto_3
+    and-int/lit8 v6, v1, 0x10
 
-    if-eqz p2, :cond_4
+    if-eqz v6, :cond_4
 
-    iget-object p5, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->prompt:Ljava/lang/String;
+    iget-object v6, v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->prompt:Ljava/lang/String;
+
+    goto :goto_4
 
     :cond_4
-    move-object v2, p5
+    move-object v6, p5
 
-    and-int/lit8 p2, p8, 0x20
+    :goto_4
+    and-int/lit8 v7, v1, 0x20
 
-    if-eqz p2, :cond_5
+    if-eqz v7, :cond_5
 
-    iget-object p6, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->scope:Ljava/lang/String;
+    iget-object v7, v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->scope:Ljava/lang/String;
+
+    goto :goto_5
 
     :cond_5
-    move-object v3, p6
+    move-object/from16 v7, p6
 
-    and-int/lit8 p2, p8, 0x40
+    :goto_5
+    and-int/lit8 v8, v1, 0x40
 
-    if-eqz p2, :cond_6
+    if-eqz v8, :cond_6
 
-    iget-object p7, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->permissions:Ljava/lang/String;
+    iget-object v8, v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->permissions:Ljava/lang/String;
+
+    goto :goto_6
 
     :cond_6
-    move-object v4, p7
+    move-object/from16 v8, p7
 
-    move-object p2, p0
+    :goto_6
+    and-int/lit16 v9, v1, 0x80
 
-    move-object p3, p1
+    if-eqz v9, :cond_7
 
-    move-object p4, p9
+    iget-object v9, v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallenge:Ljava/lang/String;
 
-    move-object p5, v0
+    goto :goto_7
 
-    move-object p6, v1
+    :cond_7
+    move-object/from16 v9, p8
 
-    move-object p7, v2
+    :goto_7
+    and-int/lit16 v1, v1, 0x100
 
-    move-object p8, v3
+    if-eqz v1, :cond_8
 
-    move-object p9, v4
+    iget-object v1, v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallengeMethod:Ljava/lang/String;
 
-    invoke-virtual/range {p2 .. p9}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->copy(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;
+    goto :goto_8
 
-    move-result-object p0
+    :cond_8
+    move-object/from16 v1, p9
 
-    return-object p0
+    :goto_8
+    move-object p1, v2
+
+    move-object p2, v3
+
+    move-object p3, v4
+
+    move-object p4, v5
+
+    move-object p5, v6
+
+    move-object/from16 p6, v7
+
+    move-object/from16 p7, v8
+
+    move-object/from16 p8, v9
+
+    move-object/from16 p9, v1
+
+    invoke-virtual/range {p0 .. p9}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->copy(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;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+
+    move-result-object v0
+
+    return-object v0
 .end method
 
 .method public static synthetic post$default(Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;Ljava/lang/String;ILjava/lang/Object;)Lrx/Observable;
@@ -305,8 +392,24 @@
     return-object v0
 .end method
 
-.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/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
-    .locals 9
+.method public final component8()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallenge:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component9()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallengeMethod:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.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;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+    .locals 11
 
     const-string v0, "clientId"
 
@@ -316,15 +419,15 @@
 
     const-string v0, "prompt"
 
-    move-object v6, p5
+    move-object/from16 v6, p5
 
-    invoke-static {p5, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "scope"
 
-    move-object v7, p6
+    move-object/from16 v7, p6
 
-    invoke-static {p6, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
 
@@ -338,7 +441,11 @@
 
     move-object/from16 v8, p7
 
-    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    move-object/from16 v9, p8
+
+    move-object/from16 v10, p9
+
+    invoke-direct/range {v1 .. v10}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;-><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/String;)V
 
     return-object v0
 .end method
@@ -416,7 +523,27 @@
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->permissions:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->permissions:Ljava/lang/String;
+    iget-object v1, p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->permissions:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallenge:Ljava/lang/String;
+
+    iget-object v1, p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallenge:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallengeMethod:Ljava/lang/String;
+
+    iget-object p1, p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallengeMethod:Ljava/lang/String;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -484,6 +611,22 @@
     return-object v0
 .end method
 
+.method public final getCodeChallenge()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallenge:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getCodeChallengeMethod()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallengeMethod:Ljava/lang/String;
+
+    return-object v0
+.end method
+
 .method public final getPermissions()Ljava/lang/String;
     .locals 1
 
@@ -649,16 +792,52 @@
 
     invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
-    move-result v1
+    move-result v2
+
+    goto :goto_6
 
     :cond_6
+    const/4 v2, 0x0
+
+    :goto_6
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallenge:Ljava/lang/String;
+
+    if-eqz v2, :cond_7
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_7
+
+    :cond_7
+    const/4 v2, 0x0
+
+    :goto_7
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallengeMethod:Ljava/lang/String;
+
+    if-eqz v2, :cond_8
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_8
     add-int/2addr v0, v1
 
     return v0
 .end method
 
 .method public final post(Ljava/lang/String;)Lrx/Observable;
-    .locals 10
+    .locals 12
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -704,7 +883,7 @@
     :goto_0
     invoke-static {v0, p1}, Lkotlin/a/ad;->a(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
 
-    move-result-object v9
+    move-result-object v11
 
     sget-object p1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
@@ -726,7 +905,11 @@
 
     iget-object v8, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->permissions:Ljava/lang/String;
 
-    invoke-virtual/range {v1 .. v9}, Lcom/discord/utilities/rest/RestAPI;->postOauth2Authorize(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;
+    iget-object v9, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallenge:Ljava/lang/String;
+
+    iget-object v10, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallengeMethod:Ljava/lang/String;
+
+    invoke-virtual/range {v1 .. v11}, Lcom/discord/utilities/rest/RestAPI;->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 p1
 
@@ -794,6 +977,22 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", codeChallenge="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallenge:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", codeChallengeMethod="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallengeMethod: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;
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 ecd77e82e9..47b80e6e6e 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel.smali
@@ -40,7 +40,7 @@
 
     const-string v1, "oauthAuthorize"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
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 b2459c5f39..467be68f9a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder.smali
@@ -100,7 +100,7 @@
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;-><init>(Landroid/view/View;)V
 
-    const p1, 0x7f0a04ae
+    const p1, 0x7f0a04c4
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -108,7 +108,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder;->nameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04ac
+    const p1, 0x7f0a04c2
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -168,7 +168,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/views/c;->BO:Lcom/discord/views/c;
+    sget-object v0, Lcom/discord/views/c;->BY:Lcom/discord/views/c;
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder;->getNameTv()Landroid/widget/TextView;
 
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 6c3e98e694..99daef4dd8 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
@@ -68,7 +68,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d0050
+    const v0, 0x7f0d0052
 
     const/4 v1, 0x0
 
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 a19ac87672..d4bbb2ca81 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$1;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 cf41c77c51..5c588a8aaf 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$2;->invoke(Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -73,7 +73,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
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 2d06d66bda..eed26d545c 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$onActivityResult$isCaptchaHandled$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 c2df9a31eb..3bf41884e0 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$1;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 3ef78df20b..d2a95dc13c 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$2;->invoke(Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 bc01dd3923..59e1adc9e1 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
@@ -60,7 +60,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {v0}, Lkotlin/text/l;->dU(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v0}, Lkotlin/text/l;->dO(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v0
 
@@ -147,7 +147,7 @@
 
     iget-object v1, v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2;->this$0:Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const v3, 0x7f120c73
+    const v3, 0x7f120cab
 
     new-array v4, v2, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali
index 48d6ec82b2..24b820bf7b 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali
@@ -24,6 +24,10 @@
 
 .field public static final QUERY_PARAM_CLIENT_ID:Ljava/lang/String; = "client_id"
 
+.field public static final QUERY_PARAM_CODE_CHALLENGE:Ljava/lang/String; = "code_challenge"
+
+.field public static final QUERY_PARAM_CODE_CHALLENGE_METHOD:Ljava/lang/String; = "code_challenge_method"
+
 .field public static final QUERY_PARAM_PERMISSIONS:Ljava/lang/String; = "permissions"
 
 .field public static final QUERY_PARAM_REDIRECT:Ljava/lang/String; = "redirect_uri"
@@ -366,7 +370,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a049e
+    const v0, 0x7f0a04b4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -374,7 +378,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->appIconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a049f
+    const v0, 0x7f0a04b5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -382,7 +386,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->appNameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a7
+    const v0, 0x7f0a04bd
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -390,7 +394,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->permissionsLabelTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a9
+    const v0, 0x7f0a04bf
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -398,7 +402,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->securityNoticeTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a8
+    const v0, 0x7f0a04be
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -406,7 +410,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->permissionsList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a3
+    const v0, 0x7f0a04b9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -414,7 +418,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->grantBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04aa
+    const v0, 0x7f0a04c0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -434,7 +438,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->denyBtns$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a4
+    const v0, 0x7f0a04ba
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -442,7 +446,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->loadingScreen$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a1
+    const v0, 0x7f0a04b7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -450,7 +454,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->contentScreen$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a6
+    const v0, 0x7f0a04bc
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -488,9 +492,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a04a2
-        0x7f0a04a5
-        0x7f0a04ab
+        0x7f0a04b8
+        0x7f0a04bb
+        0x7f0a04c1
     .end array-data
 .end method
 
@@ -531,7 +535,7 @@
 
     const-string v1, "oauth2ViewModel"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
@@ -680,19 +684,19 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f120c6e
+    const p1, 0x7f120ca6
 
     goto :goto_2
 
     :cond_2
     if-eqz p1, :cond_3
 
-    const p1, 0x7f120c6f
+    const p1, 0x7f120ca7
 
     goto :goto_2
 
     :cond_3
-    const p1, 0x7f120c75
+    const p1, 0x7f120cae
 
     :goto_2
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getString(I)Ljava/lang/String;
@@ -723,7 +727,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f060149
+    const v4, 0x7f06014b
 
     invoke-static {v3, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -1045,7 +1049,7 @@
 
     aput-object v5, v4, v1
 
-    const v5, 0x7f120c70
+    const v5, 0x7f120ca8
 
     invoke-virtual {v2, v5, v4}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
 
@@ -1109,7 +1113,7 @@
 
     const-string v2, "oauth2ViewModel"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {v0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
@@ -1167,7 +1171,7 @@
 
     new-instance v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize$PermissionModel;
 
-    sget-object v3, Lcom/discord/views/c;->BO:Lcom/discord/views/c;
+    sget-object v3, Lcom/discord/views/c;->BY:Lcom/discord/views/c;
 
     invoke-virtual {p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->requireContext()Landroid/content/Context;
 
@@ -1218,7 +1222,7 @@
 .end method
 
 .method protected createOauthAuthorize(Landroid/net/Uri;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
-    .locals 11
+    .locals 13
 
     const-string v0, "requestUrl"
 
@@ -1266,15 +1270,27 @@
 
     move-result-object v8
 
+    const-string v1, "code_challenge"
+
+    invoke-virtual {p1, v1}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v9
+
+    const-string v1, "code_challenge_method"
+
+    invoke-virtual {p1, v1}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v10
+
     const/4 v6, 0x0
 
-    const/16 v9, 0x10
+    const/16 v11, 0x10
 
-    const/4 v10, 0x0
+    const/4 v12, 0x0
 
     move-object v1, v0
 
-    invoke-direct/range {v1 .. v10}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;-><init>(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 {v1 .. v12}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;-><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/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object v0
 .end method
@@ -1282,7 +1298,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0158
+    const v0, 0x7f0d0162
 
     return v0
 .end method
@@ -1296,7 +1312,7 @@
 
     const-string v1, "oauth2ViewModel"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -1397,7 +1413,7 @@
     if-nez v2, :cond_1
 
     :try_start_1
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     const-string v4, "requestUrl"
@@ -1450,7 +1466,7 @@
 
     if-nez p1, :cond_3
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-virtual {p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
@@ -1487,7 +1503,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     invoke-virtual {v0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
@@ -1515,7 +1531,7 @@
     :catch_0
     move-exception p1
 
-    const v2, 0x7f120c74
+    const v2, 0x7f120cac
 
     new-array v3, v0, [Ljava/lang/Object;
 
@@ -1533,7 +1549,7 @@
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v3, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v3, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -1601,7 +1617,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {v0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
@@ -1730,7 +1746,7 @@
 
     if-nez v0, :cond_9
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_9
     invoke-virtual {v0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthGetResponse()Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet;
@@ -1763,7 +1779,7 @@
 
     if-nez v0, :cond_a
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_a
     invoke-virtual {v0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
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 b9b0ad32bf..ca0f3ac46b 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
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logI$1;->invoke(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 ca68b643e9..2a9292a520 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
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logW$1;->invoke(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 52b0a9da8c..3ce8e3a7ac 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion.smali
@@ -80,11 +80,11 @@
 .method private final logI(Ljava/lang/String;)V
     .locals 3
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logI$1;
 
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logI$1;-><init>(Lcom/discord/app/AppLog;)V
 
@@ -102,11 +102,11 @@
 .method private final logW(Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 2
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logW$1;
 
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logW$1;-><init>(Lcom/discord/app/AppLog;)V
 
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 cc829b0f75..9f924b0a81 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$1;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 a6d95bd710..82c57e041b 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
@@ -31,12 +31,12 @@
 .end annotation
 
 .annotation runtime Lkotlin/coroutines/jvm/internal/d;
-    Ec = "WidgetOauth2AuthorizeSamsung.kt"
-    Ed = {
+    DR = "WidgetOauth2AuthorizeSamsung.kt"
+    DS = {
         0xba
     }
-    Ee = "invokeSuspend"
-    Ef = "com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1"
+    DT = "invokeSuspend"
+    DU = "com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1"
 .end annotation
 
 
@@ -113,7 +113,7 @@
 
     check-cast p1, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1;
 
-    sget-object p2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -125,7 +125,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 5
 
-    sget-object p1, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object p1, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     iget v0, p0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1;->label:I
 
@@ -177,7 +177,7 @@
 
     :cond_2
     :goto_0
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 0005c3e75c..d52e155a66 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2;->invoke(Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -75,11 +75,11 @@
 
     invoke-static {v0, v1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$logI(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/ax;->bnh:Lkotlinx/coroutines/ax;
+    sget-object v0, Lkotlinx/coroutines/ax;->bnB:Lkotlinx/coroutines/ax;
 
     check-cast v0, Lkotlinx/coroutines/CoroutineScope;
 
-    invoke-static {}, Lkotlinx/coroutines/ap;->EY()Lkotlinx/coroutines/y;
+    invoke-static {}, Lkotlinx/coroutines/ap;->EN()Lkotlinx/coroutines/y;
 
     move-result-object v1
 
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 7006d734c9..f457674ce7 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
@@ -53,7 +53,7 @@
 
     move-result-object p1
 
-    const-string v0, "accountArr"
+    const-string v0, "manager.getAccountsByType(SA_ACCOUNT_TYPE)"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
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 e63cbbafa0..7836f0320d 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$onActivityResult$isCaptchaHandled$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -90,7 +90,7 @@
 
     invoke-static {p1, v2, v1, v0, v1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->logW$default(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     :cond_1
     return-void
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 6aeb2a1e4c..d814494a7d 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
@@ -14,14 +14,14 @@
 .end annotation
 
 .annotation runtime Lkotlin/coroutines/jvm/internal/d;
-    Ec = "WidgetOauth2AuthorizeSamsung.kt"
-    Ed = {
+    DR = "WidgetOauth2AuthorizeSamsung.kt"
+    DS = {
         0xcc,
         0xd6,
         0xd9
     }
-    Ee = "samsungCallbackHandshake"
-    Ef = "com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung"
+    DT = "samsungCallbackHandshake"
+    DU = "com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung"
 .end annotation
 
 
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 6eec16248e..82b7d25b8c 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
@@ -31,10 +31,10 @@
 .end annotation
 
 .annotation runtime Lkotlin/coroutines/jvm/internal/d;
-    Ec = "WidgetOauth2AuthorizeSamsung.kt"
-    Ed = {}
-    Ee = "invokeSuspend"
-    Ef = "com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2"
+    DR = "WidgetOauth2AuthorizeSamsung.kt"
+    DS = {}
+    DT = "invokeSuspend"
+    DU = "com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2"
 .end annotation
 
 
@@ -103,7 +103,7 @@
 
     check-cast p1, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2;
 
-    sget-object p2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -115,7 +115,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
-    sget-object p1, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object p1, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     iget p1, p0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2;->label:I
 
@@ -125,7 +125,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f12027d
+    const v0, 0x7f120281
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -139,7 +139,7 @@
 
     invoke-virtual {p1}, Lcom/discord/app/AppActivity;->finish()V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 
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 e4e8432ef7..05f03ac38c 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$1;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 20ba8fcbd3..02b0b7af5f 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$2;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 ecafff4f00..21533516d5 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali
@@ -77,7 +77,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;-><init>()V
 
-    const v0, 0x7f0a04a3
+    const v0, 0x7f0a04b9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -193,9 +193,9 @@
 .method private final checkDisclaimer()V
     .locals 2
 
-    sget-object v0, Lcom/discord/samsung/a;->zM:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->ep()Landroid/content/Intent;
+    invoke-static {}, Lcom/discord/samsung/a;->es()Landroid/content/Intent;
 
     move-result-object v0
 
@@ -229,9 +229,9 @@
 .method private final startSamsungAccountLink(Ljava/lang/String;Ljava/lang/String;)V
     .locals 12
 
-    sget-object v0, Lcom/discord/samsung/a;->zM:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
 
-    invoke-static {p1}, Lcom/discord/samsung/a;->ai(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/discord/samsung/a;->ae(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -347,7 +347,7 @@
 .end method
 
 .method protected final createOauthAuthorize(Landroid/net/Uri;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
-    .locals 11
+    .locals 13
 
     const-string v0, "requestUrl"
 
@@ -380,15 +380,19 @@
 
     const/4 v8, 0x0
 
-    const/16 v9, 0x75
+    const/4 v9, 0x0
 
     const/4 v10, 0x0
 
+    const/16 v11, 0x1f5
+
+    const/4 v12, 0x0
+
     const/4 v2, 0x0
 
     const-string v5, "https://discordapp.com/api/v6/oauth2/samsung/authorize/callback"
 
-    invoke-static/range {v1 .. v10}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->copy$default(Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;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/range {v1 .. v12}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->copy$default(Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;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;ILjava/lang/Object;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
 
     move-result-object p1
 
@@ -398,7 +402,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0158
+    const v0, 0x7f0d0162
 
     return v0
 .end method
@@ -489,7 +493,7 @@
 
     invoke-static {p1, p2, 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
 
-    sget-object p1, Lcom/discord/samsung/SamsungConnectActivity;->zQ:Lcom/discord/samsung/SamsungConnectActivity$a;
+    sget-object p1, Lcom/discord/samsung/SamsungConnectActivity;->zZ:Lcom/discord/samsung/SamsungConnectActivity$a;
 
     move-object p1, p0
 
@@ -561,7 +565,7 @@
 
     invoke-static {p1, p2}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$logI(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;)V
 
-    sget-object p1, Lcom/discord/samsung/SamsungConnectActivity;->zQ:Lcom/discord/samsung/SamsungConnectActivity$a;
+    sget-object p1, Lcom/discord/samsung/SamsungConnectActivity;->zZ:Lcom/discord/samsung/SamsungConnectActivity$a;
 
     move-object p1, p0
 
@@ -638,7 +642,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const p2, 0x7f120597
+    const p2, 0x7f1205a3
 
     invoke-static {p1, p2}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -701,7 +705,7 @@
     :goto_0
     iget-object p3, v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->result:Ljava/lang/Object;
 
-    sget-object v1, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object v1, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     iget v2, v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->label:I
 
@@ -799,11 +803,11 @@
 
     invoke-direct {p3}, Lokhttp3/t$a;-><init>()V
 
-    invoke-virtual {p3}, Lokhttp3/t$a;->GR()Lokhttp3/t$a;
+    const/4 v2, 0x0
 
-    move-result-object p3
+    iput-boolean v2, p3, Lokhttp3/t$a;->buP:Z
 
-    invoke-virtual {p3}, Lokhttp3/t$a;->GS()Lokhttp3/t;
+    invoke-virtual {p3}, Lokhttp3/t$a;->GG()Lokhttp3/t;
 
     move-result-object p3
 
@@ -813,7 +817,7 @@
 
     invoke-static {v2, v7}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$logI(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/samsung/a;->zM:Lcom/discord/samsung/a;
+    sget-object v2, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
 
     invoke-static {p3, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -857,6 +861,10 @@
 
     if-eqz v7, :cond_9
 
+    const-string v8, "getCallbackUri?.getQuery\u2026urned from GET/callback\")"
+
+    invoke-static {v7, v8}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     sget-object v8, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
 
     invoke-static {v7}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
@@ -871,7 +879,7 @@
 
     invoke-static {v8, v9}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$logI(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;)V
 
-    sget-object v8, Lcom/discord/samsung/a;->zM:Lcom/discord/samsung/a;
+    sget-object v8, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -889,7 +897,7 @@
 
     if-nez v3, :cond_6
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_6
     iput-object v6, v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$0:Ljava/lang/Object;
@@ -938,7 +946,7 @@
 
     invoke-static {v5, v8}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$logI(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;)V
 
-    invoke-static {}, Lkotlinx/coroutines/ap;->EX()Lkotlinx/coroutines/bm;
+    invoke-static {}, Lkotlinx/coroutines/ap;->EM()Lkotlinx/coroutines/bm;
 
     move-result-object v5
 
@@ -978,7 +986,7 @@
 
     :cond_8
     :goto_3
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 
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 06dbbf8273..b8be6caee6 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali
@@ -33,7 +33,7 @@
 .method public constructor <init>(Lcom/discord/widgets/channels/SimpleMembersAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0064
+    const v0, 0x7f0d0066
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -49,7 +49,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0432
+    const v0, 0x7f0a0442
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -61,7 +61,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a042f
+    const v0, 0x7f0a043f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -111,7 +111,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f07005b
+    const v0, 0x7f07005a
 
     invoke-static {p1, p2, v0}, Lcom/discord/utilities/icon/IconUtils;->setIcon(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;I)V
 
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 dcafdf0af6..cace08958a 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>(Lcom/discord/widgets/channels/SimpleRolesAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0065
+    const v0, 0x7f0d0067
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -47,7 +47,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0633
+    const v0, 0x7f0a064d
 
     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 2163bdb363..7248da636e 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
-        0x7f0a0165
-        0x7f0a06ab
+        0x7f0a0166
+        0x7f0a06c5
     .end array-data
 .end method
 
@@ -129,7 +129,7 @@
 
     iget-object p3, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->icon:Landroid/widget/ImageView;
 
-    const v0, 0x7f070053
+    const v0, 0x7f07005c
 
     invoke-static {p3, p2, v0}, Lcom/discord/utilities/icon/IconUtils;->setIcon(Landroid/widget/ImageView;Ljava/lang/String;I)V
 
@@ -209,7 +209,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f1203aa
+    const v2, 0x7f1203af
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -326,7 +326,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const p1, 0x7f120abb
+    const p1, 0x7f120adc
 
     const/4 v2, 0x1
 
@@ -344,7 +344,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f120ab8
+    const v1, 0x7f120ad9
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -358,13 +358,13 @@
 
     move-result-object p1
 
-    const p3, 0x7f040276
+    const p3, 0x7f040279
 
     invoke-virtual {p1, p3}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setDialogAttrTheme(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object p1
 
-    const p3, 0x7f120ab7
+    const p3, 0x7f120ad8
 
     new-instance v1, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$c8xwH3a5VMhyc7oYmYZ83i0PPRA;
 
@@ -374,7 +374,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f120368
+    const p2, 0x7f12036d
 
     sget-object p3, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$6abWHBMCjAm9bi5nG5ikK9esJgU;->INSTANCE:Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$6abWHBMCjAm9bi5nG5ikK9esJgU;
 
@@ -411,7 +411,7 @@
 .method private handleUpdate()V
     .locals 2
 
-    const v0, 0x7f120f2c
+    const v0, 0x7f120f63
 
     invoke-static {p0, v0}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -445,7 +445,7 @@
 
     invoke-interface {p0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    sget-object p0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p0
 .end method
@@ -453,7 +453,7 @@
 .method static synthetic lambda$confirmLeave$12(Landroid/view/View;)Lkotlin/Unit;
     .locals 0
 
-    sget-object p0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p0
 .end method
@@ -531,7 +531,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00ca
+    const v0, 0x7f0d00d3
 
     return v0
 .end method
@@ -577,7 +577,7 @@
 
     move-result p3
 
-    const v0, 0x7f0a0456
+    const v0, 0x7f0a0466
 
     if-eq p3, v0, :cond_0
 
@@ -643,7 +643,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -709,9 +709,9 @@
 .method public synthetic lambda$null$7$WidgetChannelGroupDMSettings()V
     .locals 2
 
-    const v0, 0x7f1203c4
+    const v0, 0x7f1203ca
 
-    const v1, 0x7f12119d
+    const v1, 0x7f1211e1
 
     invoke-static {p0, v0, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
 
@@ -719,15 +719,25 @@
 .end method
 
 .method public onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
-    .locals 0
+    .locals 6
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->getContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object p2
+    move-result-object v2
 
-    invoke-static {p2, p0, p1}, Lcom/discord/utilities/images/MGImages;->requestAvatarCrop(Landroid/content/Context;Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Landroid/net/Uri;)V
+    iget-object v4, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->iconEditedResult:Lrx/functions/Action1;
+
+    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->wB:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    move-object v0, p1
+
+    move-object v1, p2
+
+    move-object v3, p0
+
+    invoke-static/range {v0 .. v5}, 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
 .end method
@@ -757,7 +767,7 @@
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->setRetainInstance(Z)V
 
-    const v1, 0x7f0a0165
+    const v1, 0x7f0a0166
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -767,7 +777,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->channelSettingsName:Landroid/widget/EditText;
 
-    const v1, 0x7f0a017a
+    const v1, 0x7f0a017b
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -775,7 +785,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->saveButton:Landroid/view/View;
 
-    const v1, 0x7f0a0323
+    const v1, 0x7f0a032c
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -785,7 +795,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->scrollView:Landroidx/core/widget/NestedScrollView;
 
-    const v1, 0x7f0a0478
+    const v1, 0x7f0a048b
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -795,7 +805,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->muteToggle:Lcom/discord/views/CheckedSetting;
 
-    const v1, 0x7f0a06ac
+    const v1, 0x7f0a06c6
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -805,7 +815,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->iconLabel:Lcom/discord/app/AppTextView;
 
-    const v1, 0x7f0a06ad
+    const v1, 0x7f0a06c7
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -813,7 +823,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->iconRemove:Landroid/view/View;
 
-    const v1, 0x7f0a06ab
+    const v1, 0x7f0a06c5
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 f4d8015302..07a465b8ea 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Companion.smali
@@ -71,6 +71,10 @@
 
     move-result-object p2
 
+    const-string p3, "Intent()\n          .putE\u2026TINGS, showSystemSetting)"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-class p3, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
 
     invoke-static {p1, p3, p2}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
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 b18762ef0f..96414b8dba 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
@@ -70,7 +70,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 ca21c5571d..c94ad9e5b9 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model.smali
@@ -400,6 +400,10 @@
 
     iget v1, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;->notificationSetting:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
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 03fc9c90c8..a9c6c6993a 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1;->invoke(Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;Lcom/discord/views/CheckedSetting;I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 6ced05be19..a6dc2fc706 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$2;->invoke(Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 0b0c43b95b..82573286d6 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
@@ -148,7 +148,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a016c
+    const v0, 0x7f0a016d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -156,7 +156,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->channelSettingsNotificationsMuteToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a016b
+    const v0, 0x7f0a016c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -176,7 +176,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->notificationSettingsRadios$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a013f
+    const v0, 0x7f0a0140
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -190,9 +190,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a0168
         0x7f0a0169
         0x7f0a016a
+        0x7f0a016b
     .end array-data
 .end method
 
@@ -223,7 +223,7 @@
 
     const-string v0, "notificationSettingsRadioManager"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -378,7 +378,7 @@
 
     if-eqz v1, :cond_0
 
-    const v1, 0x7f120b82
+    const v1, 0x7f120bb3
 
     const/4 v3, 0x1
 
@@ -421,7 +421,7 @@
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f120b81
+    const v1, 0x7f120bb2
 
     invoke-virtual {p0, v1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->getString(I)Ljava/lang/String;
 
@@ -534,7 +534,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00cf
+    const v0, 0x7f0d00d8
 
     return v0
 .end method
@@ -560,7 +560,7 @@
 
     invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v1, 0x7f120c30
+    const v1, 0x7f120c64
 
     invoke-virtual {p0, v1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->setActionBarTitle(I)Lkotlin/Unit;
 
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 ce96b5d131..09b306e62a 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
@@ -85,7 +85,7 @@
 
     iput p3, p0, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;->noChannelStringId:I
 
-    const p1, 0x7f0a015e
+    const p1, 0x7f0a015f
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -226,7 +226,7 @@
 
     if-ne v3, v2, :cond_3
 
-    const p2, 0x7f0401c6
+    const p2, 0x7f0401c8
 
     goto :goto_4
 
@@ -243,7 +243,7 @@
 
     if-nez p2, :cond_5
 
-    const p2, 0x7f04017e
+    const p2, 0x7f040180
 
     goto :goto_4
 
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 3b99702873..d6f2953e9c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter.smali
@@ -88,7 +88,7 @@
 
     iget p2, p0, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter;->noChannelStringId:I
 
-    const v0, 0x7f0d00d4
+    const v0, 0x7f0d00dd
 
     invoke-direct {p1, v0, p0, p2}, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;-><init>(ILcom/discord/widgets/channels/WidgetChannelSelector$Adapter;I)V
 
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 41a30a792c..a2d1b8a56f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
@@ -123,9 +123,9 @@
 
     if-eqz p5, :cond_1
 
-    const p6, 0x7f120be7
+    const p6, 0x7f120c1a
 
-    const v6, 0x7f120be7
+    const v6, 0x7f120c1a
 
     goto :goto_1
 
@@ -167,9 +167,9 @@
 
     if-eqz p5, :cond_1
 
-    const p6, 0x7f120be7
+    const p6, 0x7f120c1a
 
-    const v6, 0x7f120be7
+    const v6, 0x7f120c1a
 
     goto :goto_1
 
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 6d52edebf2..7e22e03c2e 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
@@ -92,7 +92,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v0, Ljava/util/List;
 
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 1138af534f..6e1757a83e 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
@@ -77,7 +77,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 c8cdcfa4b2..2caec8eb30 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 12b76de891..9d98d5b6fa 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali
@@ -91,7 +91,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a015f
+    const v0, 0x7f0a0160
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -111,7 +111,7 @@
 
     const-string v0, "adapter"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -276,7 +276,7 @@
 
     const-string v2, "adapter"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast v1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
@@ -317,7 +317,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00d3
+    const v0, 0x7f0d00dc
 
     return v0
 .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 a16a6eda9a..733e03d35f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$BaseModel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$BaseModel.smali
@@ -132,7 +132,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
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 658ad18a93..abbdce78da 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali
@@ -254,7 +254,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
@@ -315,7 +315,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p0
 
@@ -777,7 +777,7 @@
     return-void
 
     :cond_0
-    iget v0, p1, Lcom/discord/views/TernaryCheckBox;->CY:I
+    iget v0, p1, Lcom/discord/views/TernaryCheckBox;->Di:I
 
     if-nez v0, :cond_1
 
@@ -789,7 +789,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    const v1, 0x7f12036b
+    const v1, 0x7f120370
 
     if-eqz v0, :cond_4
 
@@ -807,7 +807,7 @@
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eN()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eS()V
 
     return-void
 
@@ -817,25 +817,25 @@
     return-void
 
     :cond_3
-    const p2, 0x7f120369
+    const p2, 0x7f12036e
 
     invoke-virtual {p1, p2}, Lcom/discord/views/TernaryCheckBox;->setOffDisabled(I)V
 
     return-void
 
     :cond_4
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eM()Z
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eR()Z
 
     move-result v0
 
     if-eqz v0, :cond_5
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eN()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eS()V
 
     return-void
 
     :cond_5
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eL()Z
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eQ()Z
 
     move-result v0
 
@@ -869,7 +869,7 @@
 
     if-eqz p2, :cond_8
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eN()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eS()V
 
     :cond_8
     return-void
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 e5ba5450ce..9bd07c9c0b 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali
@@ -93,7 +93,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
@@ -341,7 +341,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser;->user:Lcom/discord/models/domain/ModelUser;
 
-    const v1, 0x7f07005b
+    const v1, 0x7f07005a
 
     invoke-static {p1, v0, v1}, Lcom/discord/utilities/icon/IconUtils;->setIcon(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;I)V
 
@@ -369,11 +369,11 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eL()Z
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eQ()Z
 
     move-result p2
 
-    const v0, 0x7f12036a
+    const v0, 0x7f12036f
 
     if-eqz p2, :cond_0
 
@@ -395,12 +395,12 @@
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eN()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->eS()V
 
     return-void
 
     :cond_2
-    const p2, 0x7f120369
+    const p2, 0x7f12036e
 
     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 e1497372c4..06cde05531 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, 0x7f12037b
+    const v0, 0x7f120380
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1203aa
+    const v0, 0x7f1203af
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->setActionBarTitle(I)Lkotlin/Unit;
@@ -576,7 +576,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0143
+    .packed-switch 0x7f0a0144
         :pswitch_13
         :pswitch_12
         :pswitch_11
@@ -627,7 +627,7 @@
 
     check-cast v3, Lcom/discord/views/TernaryCheckBox;
 
-    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->eL()Z
+    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->eQ()Z
 
     move-result v4
 
@@ -646,7 +646,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->eM()Z
+    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->eR()Z
 
     move-result v4
 
@@ -836,7 +836,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00d6
+    const v0, 0x7f0d00df
 
     return v0
 .end method
@@ -848,7 +848,7 @@
 
     move-result p4
 
-    const p5, 0x7f0a044e
+    const p5, 0x7f0a045e
 
     if-eq p4, p5, :cond_0
 
@@ -867,7 +867,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -932,7 +932,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -1007,7 +1007,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0157
+    const v0, 0x7f0a0158
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1017,7 +1017,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->userAvatar:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a015a
+    const v0, 0x7f0a015b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1027,7 +1027,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->targetName:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0158
+    const v0, 0x7f0a0159
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1037,7 +1037,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->channelName:Landroid/widget/TextView;
 
-    const v0, 0x7f0a015b
+    const v0, 0x7f0a015c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1045,7 +1045,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->textPermissionsContainer:Landroid/view/View;
 
-    const v0, 0x7f0a015c
+    const v0, 0x7f0a015d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1053,7 +1053,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->voicePermissionsContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0159
+    const v0, 0x7f0a015a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1067,7 +1067,7 @@
 
     new-array v0, v0, [Lcom/discord/views/TernaryCheckBox;
 
-    const v1, 0x7f0a0143
+    const v1, 0x7f0a0144
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1079,7 +1079,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0144
+    const v1, 0x7f0a0145
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1091,7 +1091,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0145
+    const v1, 0x7f0a0146
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1103,7 +1103,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0146
+    const v1, 0x7f0a0147
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1115,7 +1115,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0148
+    const v1, 0x7f0a0149
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1127,7 +1127,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0149
+    const v1, 0x7f0a014a
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1139,7 +1139,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a014a
+    const v1, 0x7f0a014b
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1151,7 +1151,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a014b
+    const v1, 0x7f0a014c
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1163,7 +1163,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a014c
+    const v1, 0x7f0a014d
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1175,7 +1175,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a014d
+    const v1, 0x7f0a014e
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1187,7 +1187,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a014e
+    const v1, 0x7f0a014f
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1199,7 +1199,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a014f
+    const v1, 0x7f0a0150
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1211,7 +1211,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0150
+    const v1, 0x7f0a0151
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1223,7 +1223,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0147
+    const v1, 0x7f0a0148
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1235,7 +1235,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0151
+    const v1, 0x7f0a0152
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1247,7 +1247,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0152
+    const v1, 0x7f0a0153
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1259,7 +1259,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0153
+    const v1, 0x7f0a0154
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1271,7 +1271,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0154
+    const v1, 0x7f0a0155
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1283,7 +1283,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0155
+    const v1, 0x7f0a0156
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1295,7 +1295,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0156
+    const v1, 0x7f0a0157
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 d34df52bab..20204501c7 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember$Model.smali
@@ -309,7 +309,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p0
 
@@ -321,7 +321,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
@@ -570,7 +570,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JV()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 e71bce8eb6..61395901c6 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
@@ -62,7 +62,7 @@
 .method private configureToolbar(Lcom/discord/models/domain/ModelChannel;)V
     .locals 1
 
-    const v0, 0x7f120088
+    const v0, 0x7f120089
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -209,7 +209,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00d7
+    const v0, 0x7f0d00e0
 
     return v0
 .end method
@@ -255,7 +255,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0170
+    const v0, 0x7f0a0171
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -265,7 +265,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember;->membersRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a016f
+    const v0, 0x7f0a0170
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -275,7 +275,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember;->searchBox:Landroid/widget/EditText;
 
-    const v0, 0x7f0a0171
+    const v0, 0x7f0a0172
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 dfafedb6b8..737cd50a10 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole$Model.smali
@@ -164,7 +164,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
@@ -324,7 +324,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JV()Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
index f53be813c5..551d127b1a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
@@ -33,7 +33,7 @@
 .method private configureToolbar(Lcom/discord/models/domain/ModelChannel;)V
     .locals 1
 
-    const v0, 0x7f12008a
+    const v0, 0x7f12008b
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -143,7 +143,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00d8
+    const v0, 0x7f0d00e1
 
     return v0
 .end method
@@ -191,7 +191,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f0a0172
+    const v0, 0x7f0a0173
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 4547bf726e..a2d13e2502 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model.smali
@@ -330,7 +330,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
@@ -555,7 +555,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JV()Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
index a936a9302f..7701bc05b8 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
@@ -137,12 +137,12 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f12037b
+    const v0, 0x7f120380
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1203aa
+    const v0, 0x7f1203af
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->setActionBarTitle(I)Lkotlin/Unit;
@@ -257,7 +257,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00d9
+    const v0, 0x7f0d00e2
 
     return v0
 .end method
@@ -352,7 +352,7 @@
     return-void
 
     :cond_0
-    const p1, 0x7f120cc3
+    const p1, 0x7f120cfd
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -392,7 +392,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0174
+    const v0, 0x7f0a0175
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -400,7 +400,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->addRole:Landroid/view/View;
 
-    const v0, 0x7f0a0173
+    const v0, 0x7f0a0174
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -408,7 +408,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->addMember:Landroid/view/View;
 
-    const v0, 0x7f0a0176
+    const v0, 0x7f0a0177
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -416,7 +416,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->rolesContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0175
+    const v0, 0x7f0a0176
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -424,7 +424,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->membersContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0814
+    const v0, 0x7f0a0852
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -434,7 +434,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->rolesRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a0813
+    const v0, 0x7f0a0851
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2$renderContext$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2$renderContext$1.smali
index 7fd25e6782..6573c9baab 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2$renderContext$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2$renderContext$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2$renderContext$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2$renderContext$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2$renderContext$2.smali
index 228286052d..2a00545471 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2$renderContext$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2$renderContext$2.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2$renderContext$2;->invoke(Lcom/discord/utilities/textprocessing/node/SpoilerNode;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali
index 2c188eafb6..2bcb2baa7a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali
@@ -113,7 +113,7 @@
     goto :goto_1
 
     :cond_2
-    sget-object v0, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast v0, Ljava/util/Set;
 
@@ -161,7 +161,7 @@
     :goto_1
     new-instance p2, Lcom/discord/widgets/channels/WidgetChannelTopic$Model;
 
-    const p3, 0x7f1203b2
+    const p3, 0x7f1203b7
 
     invoke-virtual {p1, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -253,7 +253,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 84c0439e6f..f644860d11 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/channels/WidgetChannelTopic$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
index 7e484c8de5..2c77e30c5a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
@@ -61,7 +61,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0185
+    const v0, 0x7f0a0186
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -165,7 +165,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00da
+    const v0, 0x7f0d00e3
 
     return v0
 .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 7e5070b24d..3ee577938c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$Model.smali
@@ -221,7 +221,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
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 0d60fb60ec..ccb0ad7115 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
@@ -32,13 +32,13 @@
 .method public constructor <init>(Lcom/discord/widgets/channels/WidgetCreateChannel$RolesAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d007f
+    const v0, 0x7f0d0086
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a056d
+    const v0, 0x7f0a0587
 
     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 8c197dd09a..d4e6c5aef9 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
@@ -87,12 +87,12 @@
 
     if-ne v0, v1, :cond_1
 
-    const v0, 0x7f12045d
+    const v0, 0x7f120466
 
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f12045e
+    const v0, 0x7f120467
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetCreateChannel;->setActionBarTitle(I)Lkotlin/Unit;
@@ -155,7 +155,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -473,7 +473,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0115
+    const v0, 0x7f0d011e
 
     return v0
 .end method
@@ -485,7 +485,7 @@
 
     move-result p1
 
-    const p2, 0x7f0a0466
+    const p2, 0x7f0a0477
 
     if-eq p1, p2, :cond_0
 
@@ -592,7 +592,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0238
+    const v0, 0x7f0a0239
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -602,7 +602,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->channelName:Landroidx/appcompat/widget/AppCompatEditText;
 
-    const v0, 0x7f0a0239
+    const v0, 0x7f0a023a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -612,7 +612,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->channelNameLayout:Lcom/google/android/material/textfield/TextInputLayout;
 
-    const v0, 0x7f0a023e
+    const v0, 0x7f0a023f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -622,7 +622,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->rolesRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a0241
+    const v0, 0x7f0a0242
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -632,7 +632,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->textRadio:Landroid/widget/RadioButton;
 
-    const v0, 0x7f0a0244
+    const v0, 0x7f0a0245
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -642,7 +642,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->voiceRadio:Landroid/widget/RadioButton;
 
-    const v0, 0x7f0a023c
+    const v0, 0x7f0a023d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -652,7 +652,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateSwitch:Landroid/widget/Switch;
 
-    const v0, 0x7f0a023d
+    const v0, 0x7f0a023e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -662,7 +662,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateTitle:Landroid/widget/TextView;
 
-    const v0, 0x7f0a023b
+    const v0, 0x7f0a023c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -672,7 +672,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateInfo:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0240
+    const v0, 0x7f0a0241
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -680,7 +680,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->textChannelContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0243
+    const v0, 0x7f0a0244
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -688,7 +688,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->voiceChannelContainer:Landroid/view/View;
 
-    const v0, 0x7f0a023a
+    const v0, 0x7f0a023b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -696,7 +696,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateChannelContainer:Landroid/view/View;
 
-    const v0, 0x7f0a023f
+    const v0, 0x7f0a0240
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -706,7 +706,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->roleHeader:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0242
+    const v0, 0x7f0a0243
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -939,12 +939,12 @@
 
     if-ne v1, v2, :cond_4
 
-    const v1, 0x7f120e6b
+    const v1, 0x7f120ea1
 
     goto :goto_1
 
     :cond_4
-    const v1, 0x7f120e6d
+    const v1, 0x7f120ea3
 
     :goto_1
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -955,12 +955,12 @@
 
     if-ne v1, v2, :cond_5
 
-    const v1, 0x7f120e6c
+    const v1, 0x7f120ea2
 
     goto :goto_2
 
     :cond_5
-    const v1, 0x7f120e6e
+    const v1, 0x7f120ea4
 
     :goto_2
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -971,12 +971,12 @@
 
     if-ne v1, v2, :cond_6
 
-    const v1, 0x7f1205f3
+    const v1, 0x7f1205ff
 
     goto :goto_3
 
     :cond_6
-    const v1, 0x7f1205f6
+    const v1, 0x7f120602
 
     :goto_3
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -987,12 +987,12 @@
 
     if-ne v1, v2, :cond_7
 
-    const v1, 0x7f12037a
+    const v1, 0x7f12037f
 
     goto :goto_4
 
     :cond_7
-    const v1, 0x7f1205f4
+    const v1, 0x7f120600
 
     :goto_4
     invoke-virtual {p0, v1}, Lcom/discord/widgets/channels/WidgetCreateChannel;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3.smali
index 74e8a4ff51..6e59856315 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
@@ -124,7 +124,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming;->get()Lrx/Observable;
+    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming;->getStreams()Lrx/Observable;
 
     move-result-object v2
 
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 013b4024db..9e3418b78d 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
@@ -86,7 +86,7 @@
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v1, Ljava/util/List;
 
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 ed52b7cb11..598dfefd24 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
@@ -101,7 +101,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v0, Ljava/util/List;
 
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 5e10fd358f..158589bf8e 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
@@ -86,7 +86,7 @@
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v1, Ljava/util/List;
 
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 9bcc323713..0f8177862c 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
@@ -93,7 +93,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v0, Ljava/util/List;
 
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 dc114d117b..5ef958e970 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
@@ -93,7 +93,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JV()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 dffc4531d9..f0db7cd7e3 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
@@ -66,7 +66,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -87,7 +87,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JV()Lrx/Observable;
 
     move-result-object p1
 
@@ -301,7 +301,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object 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 13262fba38..246c6f3721 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model.smali
@@ -573,6 +573,10 @@
 
     iget v1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;->mode:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return 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 23e0f24804..a5c652a9c2 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali
@@ -82,7 +82,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const p2, 0x7f1207b7
+    const p2, 0x7f1207d3
 
     invoke-static {p1, p2}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)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 afc11882c1..6b5edaab5c 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
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$onViewBoundOrOnResume$3;->invoke(Ljava/util/Collection;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 216b069fa2..893befd529 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$onViewBoundOrOnResume$4;->invoke(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 efe5f08ed6..1d7a60d916 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, 0x7f1207b7
+    const v0, 0x7f1207d3
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
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 6c24993a00..f983c65084 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$1;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
index 162af1bbc5..cdb7dedbf3 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
@@ -215,7 +215,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0326
+    const v0, 0x7f0a032f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -223,7 +223,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0329
+    const v0, 0x7f0a0332
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -231,7 +231,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0327
+    const v0, 0x7f0a0330
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -239,7 +239,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->sendFab$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0324
+    const v0, 0x7f0a032d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -247,7 +247,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->chipsView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0325
+    const v0, 0x7f0a032e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -607,7 +607,7 @@
 
     if-nez p1, :cond_0
 
-    const p1, 0x7f1207b0
+    const p1, 0x7f1207cc
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String;
 
@@ -822,7 +822,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f1207c3
+    const v2, 0x7f1207df
 
     invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -856,7 +856,7 @@
 
     if-lt v1, v2, :cond_0
 
-    const p1, 0x7f1207b6
+    const p1, 0x7f1207d2
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String;
 
@@ -915,7 +915,7 @@
     :cond_1
     if-nez v2, :cond_2
 
-    const p1, 0x7f1207c2
+    const p1, 0x7f1207de
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String;
 
@@ -1033,7 +1033,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0127
+    const v0, 0x7f0d012f
 
     return v0
 .end method
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 4977fd2e11..3548fcb67b 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem.smali
@@ -49,7 +49,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a030a
+    const p2, 0x7f0a030f
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -61,7 +61,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a030b
+    const p2, 0x7f0a0310
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -73,7 +73,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a02fc
+    const p2, 0x7f0a0301
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -85,7 +85,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a02f3
+    const p2, 0x7f0a02f8
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -97,7 +97,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a02e8
+    const p2, 0x7f0a02f1
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -107,7 +107,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a07ac
+    const p2, 0x7f0a07db
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -195,7 +195,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem;->itemAvatar:Landroid/widget/ImageView;
 
-    const v1, 0x7f07005b
+    const v1, 0x7f07005a
 
     invoke-static {v0, p1, v1}, Lcom/discord/utilities/icon/IconUtils;->setIcon(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.smali
index 7f2f609876..383ec52dd4 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.smali
@@ -110,7 +110,7 @@
 
     new-instance p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem;
 
-    const p2, 0x7f0d0128
+    const p2, 0x7f0d0130
 
     invoke-direct {p1, p0, p2, p0}, Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem;-><init>(Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter;ILcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter;)V
 
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 e668624e78..5a9571ae6f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Companion.smali
@@ -50,6 +50,10 @@
 
     move-result-object p1
 
+    const-string p2, "Intent()\n          .putE\u2026RA_CHANNEL_ID, channelId)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-class p2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
     invoke-static {p3, p2, p1}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
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 2aa3183ee9..417b9bc06b 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
@@ -72,7 +72,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 9cd63a1302..d7ebe02ef0 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
@@ -102,7 +102,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a043c
+    .packed-switch 0x7f0a044c
         :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 e178a76b23..0ceee4c32f 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, 0x7f0a043c
+    const v0, 0x7f0a044c
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
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 fc89b30b23..f468784e95 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
@@ -55,7 +55,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120d3f
+    const v0, 0x7f120d85
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
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 104209a17c..4a28c3c4c1 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 p2
 
-    const p3, 0x7f0a017f
+    const p3, 0x7f0a0180
 
     invoke-static {p1}, 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 250672baf9..cbaa5f6d2c 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 195943779c..e4b057291e 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -77,12 +77,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f12037c
+    const p1, 0x7f120381
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1203ab
+    const p1, 0x7f1203b0
 
     :goto_0
     invoke-static {v0, p1}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
index e31c796f2e..e0189d1c90 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
@@ -558,7 +558,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
@@ -572,7 +572,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0160
+    const v0, 0x7f0a0161
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -580,7 +580,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelNameText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0178
+    const v0, 0x7f0a0179
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -588,7 +588,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPinnedMessagesContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0177
+    const v0, 0x7f0a0178
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -596,7 +596,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPinnedMessages$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0179
+    const v0, 0x7f0a017a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -604,7 +604,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPinnedMessagesDisabledOverlay$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a017d
+    const v0, 0x7f0a017e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -612,7 +612,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->userManagementContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0181
+    const v0, 0x7f0a0182
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -620,7 +620,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsTopicWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a016e
+    const v0, 0x7f0a016f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -628,7 +628,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPermissions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a017b
+    const v0, 0x7f0a017c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -636,7 +636,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPrivacySafetyContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0167
+    const v0, 0x7f0a0168
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -644,7 +644,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0165
+    const v0, 0x7f0a0166
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -652,7 +652,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0166
+    const v0, 0x7f0a0167
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -660,7 +660,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsTopic$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a017a
+    const v0, 0x7f0a017b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -668,7 +668,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsSave$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a016d
+    const v0, 0x7f0a016e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -676,7 +676,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsNsfw$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a017c
+    const v0, 0x7f0a017d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -684,7 +684,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsSlowModeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a017e
+    const v0, 0x7f0a017f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -692,7 +692,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsSlowModeLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a017f
+    const v0, 0x7f0a0180
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -718,9 +718,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a0165
         0x7f0a0166
-        0x7f0a017f
+        0x7f0a0167
+        0x7f0a0180
     .end array-data
 .end method
 
@@ -849,12 +849,12 @@
 
     if-eqz v0, :cond_2
 
-    const v0, 0x7f1203aa
+    const v0, 0x7f1203af
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f12037b
+    const v0, 0x7f120380
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->setActionBarTitle(I)Lkotlin/Unit;
@@ -889,7 +889,7 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f0e0018
+    const v0, 0x7f0e0019
 
     goto :goto_1
 
@@ -923,18 +923,18 @@
 
     move-result v3
 
-    const v4, 0x7f1205f4
+    const v4, 0x7f120600
 
-    const v5, 0x7f12037a
+    const v5, 0x7f12037f
 
     if-eqz v3, :cond_4
 
-    const v3, 0x7f1205f4
+    const v3, 0x7f120600
 
     goto :goto_2
 
     :cond_4
-    const v3, 0x7f12037a
+    const v3, 0x7f12037f
 
     :goto_2
     invoke-virtual {v0, v3}, Landroid/widget/TextView;->setText(I)V
@@ -986,7 +986,7 @@
     goto :goto_3
 
     :cond_5
-    const v4, 0x7f12037a
+    const v4, 0x7f12037f
 
     :goto_3
     invoke-virtual {v0, v4}, Landroid/widget/EditText;->setHint(I)V
@@ -1064,7 +1064,7 @@
 
     invoke-virtual {v0, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
@@ -1288,7 +1288,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    const v1, 0x7f0a017f
+    const v1, 0x7f0a0180
 
     invoke-virtual {p1}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -1386,7 +1386,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d00d5
+    const v1, 0x7f0d00de
 
     const/4 v2, 0x0
 
@@ -1414,7 +1414,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0164
+    const v2, 0x7f0a0165
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1422,7 +1422,7 @@
 
     check-cast v2, Landroid/widget/TextView;
 
-    const v3, 0x7f0a0161
+    const v3, 0x7f0a0162
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1430,7 +1430,7 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    const v4, 0x7f0a0162
+    const v4, 0x7f0a0163
 
     invoke-virtual {v0, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1438,7 +1438,7 @@
 
     check-cast v4, Landroid/widget/TextView;
 
-    const v5, 0x7f0a0163
+    const v5, 0x7f0a0164
 
     invoke-virtual {v0, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1452,12 +1452,12 @@
 
     if-eqz v5, :cond_0
 
-    const v5, 0x7f1204cd
+    const v5, 0x7f1204d8
 
     goto :goto_0
 
     :cond_0
-    const v5, 0x7f1204cc
+    const v5, 0x7f1204d7
 
     :goto_0
     invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V
@@ -1482,7 +1482,7 @@
 
     invoke-static {v3, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f1204ce
+    const v0, 0x7f1204d9
 
     const/4 v2, 0x1
 
@@ -1892,7 +1892,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     invoke-virtual {p0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->getContext()Landroid/content/Context;
 
@@ -1984,7 +1984,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f12065a
+    const v0, 0x7f120668
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->getString(I)Ljava/lang/String;
 
@@ -2067,7 +2067,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01bb
+    const v0, 0x7f0d01cb
 
     return v0
 .end method
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 c3f12901c3..128b1a5ad1 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
@@ -333,7 +333,7 @@
 
     const-wide/16 v7, 0x0
 
-    const v2, 0x7f1204f5
+    const v2, 0x7f120500
 
     const/4 v4, 0x0
 
@@ -376,7 +376,7 @@
 
     aput-object v1, v2, v5
 
-    invoke-static {v2}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v2}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
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 b6c72accb6..d57cf99a6c 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
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali
index 16b2794f28..ec6d583857 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
@@ -704,7 +704,7 @@
 
     if-nez v0, :cond_d
 
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v0, Ljava/util/List;
 
@@ -797,7 +797,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -885,7 +885,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming;->get()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming;->getStreams()Lrx/Observable;
 
     move-result-object v7
 
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 6f02b6ad30..afa634a0e4 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
@@ -245,7 +245,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming;->getForGuild(J)Lrx/Observable;
+    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming;->getStreamsForGuild(J)Lrx/Observable;
 
     move-result-object v1
 
@@ -315,7 +315,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 76dee954c0..35ecf59321 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
@@ -46,11 +46,11 @@
         }
     .end annotation
 
-    iget v0, p2, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v0, p2, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget v1, p2, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v1, p2, Lkotlin/ranges/IntProgression;->bll:I
 
-    iget p2, p2, Lkotlin/ranges/IntProgression;->bkS:I
+    iget p2, p2, Lkotlin/ranges/IntProgression;->blm:I
 
     const/4 v2, 0x0
 
@@ -189,16 +189,16 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
     goto :goto_0
 
     :cond_0
-    iget v0, p2, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v0, p2, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget p2, p2, Lkotlin/ranges/IntProgression;->bkR:I
+    iget p2, p2, Lkotlin/ranges/IntProgression;->bll:I
 
     add-int/2addr p2, v1
 
@@ -329,9 +329,9 @@
     const/4 v2, 0x0
 
     :goto_0
-    iget v3, p1, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v3, p1, Lkotlin/ranges/IntProgression;->blk:I
 
-    invoke-static {v1, v3}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v1, v3}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object v1
 
@@ -349,11 +349,11 @@
 
     move-result v3
 
-    iget p1, p1, Lkotlin/ranges/IntProgression;->bkR:I
+    iget p1, p1, Lkotlin/ranges/IntProgression;->bll:I
 
     add-int/2addr p1, v0
 
-    invoke-static {v3, p1}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntProgression;
+    invoke-static {v3, p1}, Lkotlin/ranges/c;->W(II)Lkotlin/ranges/IntProgression;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator.smali
index 1b3a3172e9..4ac0f73a29 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator.smali
@@ -163,10 +163,18 @@
 
     iget v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;->type:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;->index:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
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 f2b207cf4e..20190c0bd6 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
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$onDatasetChanged$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 8f0f9eaea7..6bb54ef5e4 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
@@ -54,7 +54,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a01b8
+    const v1, 0x7f0a01b9
 
     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 25aeb31dff..a457a1ef9b 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
@@ -54,7 +54,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a01b9
+    const v1, 0x7f0a01ba
 
     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 48734cfe1a..8d7b6e3c66 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
@@ -236,7 +236,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->unreadsTextBackground$delegate:Lkotlin/Lazy;
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -276,9 +276,9 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f120b9c
+    const v0, 0x7f120bce
 
-    const v6, 0x7f120b9c
+    const v6, 0x7f120bce
 
     goto :goto_1
 
@@ -290,9 +290,9 @@
 
     if-eqz v0, :cond_2
 
-    const v0, 0x7f120ba8
+    const v0, 0x7f120bda
 
-    const v7, 0x7f120ba8
+    const v7, 0x7f120bda
 
     goto :goto_2
 
@@ -370,12 +370,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f0800ed
+    const p1, 0x7f0800f1
 
     return p1
 
     :cond_0
-    const p1, 0x7f0800f2
+    const p1, 0x7f0800f9
 
     return p1
 .end method
@@ -710,16 +710,16 @@
 
     if-eqz p3, :cond_0
 
-    const p1, 0x7f0801d5
+    const p1, 0x7f0801e4
 
-    const v3, 0x7f0801d5
+    const v3, 0x7f0801e4
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f0801d3
+    const p1, 0x7f0801e2
 
-    const v3, 0x7f0801d3
+    const v3, 0x7f0801e2
 
     :goto_0
     const/4 v4, 0x0
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 e961175d67..1648686f8d 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
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->invoke(F)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 bffa89cb01..e730ace31d 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$1;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 1fc360e651..aa3d3820e8 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 118a668abb..756f25e451 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 eabb7fd6dc..dbb0ee8268 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
@@ -70,7 +70,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4;->invoke(Lcom/discord/models/domain/ModelChannel;Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 13752014a3..d16359c6e5 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1;->invoke(Lcom/discord/models/domain/ModelInvite;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -95,7 +95,7 @@
 
     check-cast p1, Ljava/lang/CharSequence;
 
-    const v1, 0x7f120a00
+    const v1, 0x7f120a23
 
     invoke-static {v0, p1, v1}, Lcom/discord/app/h;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V
 
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 c68409c7a9..b9e9072cbd 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,7 +87,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     iget-object v2, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
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 c4ecfead5b..87575691bd 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6;->invoke(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 d9294d7a98..c68bcbf809 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/channels/list/WidgetChannelListModel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
index 701829140a..a0938861e0 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
@@ -229,7 +229,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a021d
+    const v0, 0x7f0a021e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -245,7 +245,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->appBarLayout$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a019f
+    const v0, 0x7f0a01a0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -253,7 +253,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0195
+    const v0, 0x7f0a0196
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -261,7 +261,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a019e
+    const v0, 0x7f0a019f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -269,7 +269,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsBanner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01b6
+    const v0, 0x7f0a01b7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -277,7 +277,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsSearch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01b7
+    const v0, 0x7f0a01b8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -285,7 +285,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsSearchToolbar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ba
+    const v0, 0x7f0a01bb
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -321,7 +321,7 @@
 
     const-string v0, "adapter"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -408,16 +408,16 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f08039b
+    const p1, 0x7f0803b2
 
-    const v1, 0x7f08039b
+    const v1, 0x7f0803b2
 
     goto/16 :goto_0
 
     :cond_0
-    const p1, 0x7f08039c
+    const p1, 0x7f0803b3
 
-    const v1, 0x7f08039c
+    const v1, 0x7f0803b3
 
     goto/16 :goto_0
 
@@ -438,16 +438,16 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f080315
+    const p1, 0x7f080326
 
-    const v1, 0x7f080315
+    const v1, 0x7f080326
 
     goto/16 :goto_0
 
     :cond_2
-    const p1, 0x7f080316
+    const p1, 0x7f080327
 
-    const v1, 0x7f080316
+    const v1, 0x7f080327
 
     goto/16 :goto_0
 
@@ -470,7 +470,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_4
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
@@ -489,16 +489,16 @@
 
     if-eqz p1, :cond_5
 
-    const p1, 0x7f08029d
+    const p1, 0x7f0802ad
 
-    const v1, 0x7f08029d
+    const v1, 0x7f0802ad
 
     goto :goto_0
 
     :cond_5
-    const p1, 0x7f08029e
+    const p1, 0x7f0802ae
 
-    const v1, 0x7f08029e
+    const v1, 0x7f0802ae
 
     goto :goto_0
 
@@ -521,16 +521,16 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f080294
+    const p1, 0x7f0802a4
 
-    const v1, 0x7f080294
+    const v1, 0x7f0802a4
 
     goto :goto_0
 
     :cond_7
-    const p1, 0x7f080295
+    const p1, 0x7f0802a5
 
-    const v1, 0x7f080295
+    const v1, 0x7f0802a5
 
     goto :goto_0
 
@@ -553,16 +553,16 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f080296
+    const p1, 0x7f0802a6
 
-    const v1, 0x7f080296
+    const v1, 0x7f0802a6
 
     goto :goto_0
 
     :cond_9
-    const p1, 0x7f080297
+    const p1, 0x7f0802a7
 
-    const v1, 0x7f080297
+    const v1, 0x7f0802a7
 
     goto :goto_0
 
@@ -585,16 +585,16 @@
 
     if-eqz p1, :cond_b
 
-    const p1, 0x7f080298
+    const p1, 0x7f0802a8
 
-    const v1, 0x7f080298
+    const v1, 0x7f0802a8
 
     goto :goto_0
 
     :cond_b
-    const p1, 0x7f080299
+    const p1, 0x7f0802a9
 
-    const v1, 0x7f080299
+    const v1, 0x7f0802a9
 
     goto :goto_0
 
@@ -610,7 +610,7 @@
 
     const/4 v2, 0x0
 
-    const v3, 0x7f0803dc
+    const v3, 0x7f0803f4
 
     const/4 v4, 0x0
 
@@ -714,7 +714,7 @@
 
     const-string v5, "adapter"
 
-    invoke-static {v5}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v5}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_5
     invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->getItems()Ljava/util/List;
@@ -814,7 +814,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f070108
+    const v3, 0x7f07010a
 
     invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -1022,7 +1022,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00db
+    const v0, 0x7f0d00e4
 
     return v0
 .end method
@@ -1062,7 +1062,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     sget-object v2, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$1;->INSTANCE:Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$1;
@@ -1075,7 +1075,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     new-instance v2, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2;
@@ -1090,7 +1090,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     new-instance v2, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3;
@@ -1105,7 +1105,7 @@
 
     if-nez p1, :cond_3
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     sget-object v0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4;->INSTANCE:Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4;
@@ -1118,7 +1118,7 @@
 
     if-nez p1, :cond_4
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5;
@@ -1133,7 +1133,7 @@
 
     if-nez p1, :cond_5
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_5
     new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6;
@@ -1210,7 +1210,7 @@
 
     if-nez p1, :cond_6
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_6
     new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$9;
@@ -1245,7 +1245,7 @@
 
     const-string v3, "adapter"
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast v2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
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 4c27bb7b7a..7784208af4 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
@@ -113,12 +113,12 @@
     if-eq p2, p3, :cond_1
 
     :goto_0
-    const p2, 0x7f080133
+    const p2, 0x7f080139
 
     goto :goto_1
 
     :cond_1
-    const p2, 0x7f080131
+    const p2, 0x7f080137
 
     :goto_1
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
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 053aeeb46f..9fc74d302e 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
@@ -124,7 +124,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f08022a
+    const p1, 0x7f08023a
 
     return p1
 
@@ -141,7 +141,7 @@
 
     if-nez v0, :cond_1
 
-    const p1, 0x7f080227
+    const p1, 0x7f080236
 
     return p1
 
@@ -158,7 +158,7 @@
 
     if-eqz v0, :cond_2
 
-    const p1, 0x7f08022b
+    const p1, 0x7f08023b
 
     return p1
 
@@ -175,7 +175,7 @@
 
     if-nez p1, :cond_3
 
-    const p1, 0x7f080228
+    const p1, 0x7f080237
 
     return p1
 
@@ -194,12 +194,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f0600c9
+    const p1, 0x7f0600cc
 
     return p1
 
     :cond_0
-    const p1, 0x7f0600c4
+    const p1, 0x7f0600c7
 
     return p1
 .end method
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 a59f638330..1d7a917de2 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
@@ -154,7 +154,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a0188
+    const p1, 0x7f0a0189
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -162,7 +162,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;->nameTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0187
+    const p1, 0x7f0a0188
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -170,7 +170,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;->arrow$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0186
+    const p1, 0x7f0a0187
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -268,7 +268,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f080131
+    const v1, 0x7f080137
 
     invoke-static {v0, v1}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
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 692c94c3aa..55ee282648 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
@@ -188,7 +188,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a01a6
+    const p1, 0x7f0a01a7
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -196,7 +196,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01aa
+    const p1, 0x7f0a01ab
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -204,7 +204,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemPresence$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0134
+    const p1, 0x7f0a0135
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -212,7 +212,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemPresenceBg$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01a9
+    const p1, 0x7f0a01aa
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -220,7 +220,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01a7
+    const p1, 0x7f0a01a8
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -228,7 +228,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemDesc$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01a8
+    const p1, 0x7f0a01a9
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -372,12 +372,16 @@
 
     add-int/lit8 p1, p1, 0x1
 
-    const v0, 0x7f120b39
+    const v0, 0x7f120b6a
 
     invoke-virtual {p2, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p2
 
+    const-string v0, "context.getString(R.string.members)"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Ljava/lang/StringBuilder;
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
@@ -410,12 +414,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f080167
+    const p1, 0x7f080176
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f08016c
+    const p1, 0x7f08017b
 
     :goto_0
     invoke-static {v0, p1}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
@@ -512,7 +516,7 @@
 
     move-result-object v0
 
-    const v2, 0x7f070058
+    const v2, 0x7f070057
 
     const/4 v3, 0x0
 
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 98d1b373f1..8e541bbcbf 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
@@ -140,7 +140,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a0189
+    const p1, 0x7f0a018a
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -148,7 +148,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->itemHash$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a018b
+    const p1, 0x7f0a018c
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -156,7 +156,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a018a
+    const p1, 0x7f0a018b
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -164,7 +164,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->itemMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a018c
+    const p1, 0x7f0a018d
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -188,7 +188,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f080216
+    const p1, 0x7f080225
 
     return p1
 
@@ -199,7 +199,7 @@
 
     if-eqz v0, :cond_1
 
-    const p1, 0x7f080214
+    const p1, 0x7f080223
 
     return p1
 
@@ -210,12 +210,12 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f080215
+    const p1, 0x7f080224
 
     return p1
 
     :cond_2
-    const p1, 0x7f080210
+    const p1, 0x7f08021f
 
     return p1
 .end method
@@ -303,7 +303,7 @@
 .method private final getTextColor(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;Z)I
     .locals 1
 
-    const v0, 0x7f0600b9
+    const v0, 0x7f0600bc
 
     if-eqz p2, :cond_0
 
@@ -316,7 +316,7 @@
 
     if-eqz p2, :cond_1
 
-    const p1, 0x7f0600c9
+    const p1, 0x7f0600cc
 
     return p1
 
@@ -330,7 +330,7 @@
     return v0
 
     :cond_2
-    const p1, 0x7f0600c4
+    const p1, 0x7f0600c7
 
     return p1
 .end method
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 908c8e9e5a..51de086324 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
@@ -116,7 +116,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a018d
+    const p1, 0x7f0a018e
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -124,7 +124,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a018f
+    const p1, 0x7f0a0190
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -132,7 +132,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->userCount$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a018e
+    const p1, 0x7f0a018f
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -268,26 +268,26 @@
 
     if-eqz p2, :cond_0
 
-    const p2, 0x7f0803a6
+    const p2, 0x7f0803bd
 
     goto :goto_0
 
     :cond_0
     if-nez v1, :cond_1
 
-    const p2, 0x7f08020e
+    const p2, 0x7f08021d
 
     goto :goto_0
 
     :cond_1
     if-eqz v3, :cond_2
 
-    const p2, 0x7f08021b
+    const p2, 0x7f08022a
 
     goto :goto_0
 
     :cond_2
-    const p2, 0x7f080218
+    const p2, 0x7f080227
 
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getSpeakerIcon()Landroid/widget/ImageView;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends.smali
index 2cc900990e..1e278a83b1 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends.smali
@@ -68,7 +68,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a01a1
+    const p1, 0x7f0a01a2
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
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 cdc6e5c6fb..092321a6f2 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
@@ -92,7 +92,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a01a2
+    const p1, 0x7f0a01a3
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -100,7 +100,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->itemHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01b5
+    const p1, 0x7f0a01b6
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -182,17 +182,17 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f120c86
+    const v0, 0x7f120cc1
 
     if-eq p1, v0, :cond_2
 
-    const p2, 0x7f121124
+    const p2, 0x7f121166
 
     const/4 v0, 0x0
 
     if-eq p1, p2, :cond_1
 
-    const p2, 0x7f1212dd
+    const p2, 0x7f12132e
 
     if-eq p1, p2, :cond_0
 
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 81c4eefb7e..c8feec10f1 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
@@ -68,7 +68,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a01a3
+    const p1, 0x7f0a01a4
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
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 aa299e3184..2eb36dfc85 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
@@ -79,7 +79,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a01a5
+    const p1, 0x7f0a01a6
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -113,13 +113,13 @@
 .method private final getLearnMoreFormattedString(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/CharSequence;
     .locals 6
 
-    const v0, 0x7f121180
+    const v0, 0x7f1211c2
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v0
 
-    const-string v1, "learnMoreWarning"
+    const-string v1, "getString(R.string.two_fa_guild_mfa_warning)"
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -163,9 +163,9 @@
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
-    sget-object p1, Lcom/discord/app/e;->uy:Lcom/discord/app/e;
+    sget-object p1, Lcom/discord/app/e;->ux:Lcom/discord/app/e;
 
-    sget-wide p1, Lcom/discord/app/e;->ur:J
+    sget-wide p1, Lcom/discord/app/e;->uq:J
 
     invoke-static {p1, p2}, Lcom/discord/app/e;->k(J)Ljava/lang/String;
 
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 479bb42e5c..402a958ec7 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
@@ -164,7 +164,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a0190
+    const p1, 0x7f0a0191
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -172,7 +172,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->voiceUserAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0194
+    const p1, 0x7f0a0195
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -180,7 +180,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->voiceUserName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0191
+    const p1, 0x7f0a0192
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -188,7 +188,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->voiceHeadphones$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0193
+    const p1, 0x7f0a0194
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -196,7 +196,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->voiceMicrophone$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0192
+    const p1, 0x7f0a0193
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -344,7 +344,7 @@
 
     move-result-object v1
 
-    const v3, 0x7f07005a
+    const v3, 0x7f070059
 
     const/4 v4, 0x0
 
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 aba7fb4d5d..26d0246caa 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onCallChannel$1;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 fb4c5c40b0..acbdfa7db2 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
@@ -70,7 +70,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onCollapseCategory$1;->invoke(Lcom/discord/models/domain/ModelChannel;Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 99f599b41b..922403affd 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannel$1;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 5d92f1a47e..e427f29db1 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannelOptions$1;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 e213a4a1cf..981e4002f0 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectInvite$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 17f8dd5e7d..f55b9cd8d0 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
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectUserOptions$1;->invoke(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 49a2e3b52c..a3e81b8a23 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali
@@ -305,7 +305,7 @@
     :pswitch_1
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite;
 
-    const p2, 0x7f0d00e4
+    const p2, 0x7f0d00ed
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
@@ -316,7 +316,7 @@
     :pswitch_2
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;
 
-    const p2, 0x7f0d00de
+    const p2, 0x7f0d00e7
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
@@ -327,7 +327,7 @@
     :pswitch_3
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA;
 
-    const p2, 0x7f0d00e5
+    const p2, 0x7f0d00ee
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
@@ -338,7 +338,7 @@
     :pswitch_4
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;
 
-    const p2, 0x7f0d00e3
+    const p2, 0x7f0d00ec
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
@@ -349,7 +349,7 @@
     :pswitch_5
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends;
 
-    const p2, 0x7f0d00e2
+    const p2, 0x7f0d00eb
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
@@ -360,7 +360,7 @@
     :pswitch_6
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;
 
-    const p2, 0x7f0d00e0
+    const p2, 0x7f0d00e9
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
@@ -371,7 +371,7 @@
     :pswitch_7
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;
 
-    const p2, 0x7f0d00e7
+    const p2, 0x7f0d00f0
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
@@ -382,7 +382,7 @@
     :pswitch_8
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;
 
-    const p2, 0x7f0d00e1
+    const p2, 0x7f0d00ea
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
@@ -393,7 +393,7 @@
     :pswitch_9
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;
 
-    const p2, 0x7f0d00df
+    const p2, 0x7f0d00e8
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
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 cf694df631..662c583cc0 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
@@ -100,7 +100,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 c3719d9777..d39eebf26e 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
@@ -329,7 +329,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f1211b0
+    const v0, 0x7f1211f4
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -340,7 +340,7 @@
     return-object p1
 
     :cond_0
-    const v0, 0x7f120b82
+    const v0, 0x7f120bb3
 
     const/4 v1, 0x1
 
@@ -386,12 +386,12 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f04017d
+    const v0, 0x7f04017f
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f04017c
+    const v0, 0x7f04017e
 
     :goto_0
     const/4 v1, 0x0
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 6cb0da966b..742a72ddfd 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$bindSubscriptions$1;->invoke(Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 25a778b577..5c72840204 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
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -97,7 +97,7 @@
 
     move-result-wide v0
 
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
 
     return-void
 .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 5a1ec73e95..2a2fcabc58 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
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 3119238d67..238b861049 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
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 e35c9a3811..a5692edbd1 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
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 578aa1f197..0f35441c0a 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$6;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 74b589066b..23a9825ebf 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 1b1969206a..ba7a71faf0 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
@@ -290,7 +290,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a01af
+    const v0, 0x7f0a01b0
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -298,7 +298,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01b4
+    const v0, 0x7f0a01b5
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -306,7 +306,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->title$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01b3
+    const v0, 0x7f0a01b4
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -314,7 +314,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->profile$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01b2
+    const v0, 0x7f0a01b3
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -322,7 +322,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->muteChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ac
+    const v0, 0x7f0a01ad
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -330,7 +330,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->channelSettings$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ab
+    const v0, 0x7f0a01ac
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -338,7 +338,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->channelNotifSettings$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01b0
+    const v0, 0x7f0a01b1
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -346,7 +346,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->instantInvite$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01b1
+    const v0, 0x7f0a01b2
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -354,7 +354,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->markAsRead$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ae
+    const v0, 0x7f0a01af
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -362,7 +362,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->developerDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ad
+    const v0, 0x7f0a01ae
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -898,7 +898,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f120544
+    const p1, 0x7f12054f
 
     goto :goto_0
 
@@ -911,7 +911,7 @@
 
     if-nez p2, :cond_1
 
-    const p1, 0x7f1203aa
+    const p1, 0x7f1203af
 
     goto :goto_0
 
@@ -922,12 +922,12 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f120543
+    const p1, 0x7f12054e
 
     goto :goto_0
 
     :cond_2
-    const p1, 0x7f120f0d
+    const p1, 0x7f120f44
 
     :goto_0
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->getString(I)Ljava/lang/String;
@@ -1044,7 +1044,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00e6
+    const v0, 0x7f0d00ef
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion$show$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion$show$2.smali
index 15007cc447..8fb2e3f499 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion$show$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion$show$2.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Companion$show$2;->invoke(Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model$Companion.smali
index 0c1f741ffe..8e9bac1163 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model$Companion.smali
@@ -112,7 +112,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$bindSubscriptions$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$bindSubscriptions$1.smali
index 73901f3cd0..69f6624f6c 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$bindSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$bindSubscriptions$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$bindSubscriptions$1;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$bindSubscriptions$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$bindSubscriptions$2.smali
index fb5968fd94..bcc774bbf2 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$bindSubscriptions$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$bindSubscriptions$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$bindSubscriptions$2;->invoke(Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1$1.smali
index 62ed5ef0f1..5b56c031bd 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/discord/stores/StoreVoiceChannelSelected;->set(J)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1$1;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$2.smali
index 676e1ce11b..b0e81e7de6 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$2.smali
@@ -49,7 +49,7 @@
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceChannelSelected;->clear()V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$6.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$6.smali
index 6f1e3d1bc9..fff57862ba 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$6.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$6.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$6;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions.smali
index 627c426088..a14131cdf4 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions.smali
@@ -268,7 +268,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a07e4
+    const v0, 0x7f0a0821
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -276,7 +276,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e0
+    const v0, 0x7f0a081d
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -284,7 +284,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->connect$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e2
+    const v0, 0x7f0a081f
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -292,7 +292,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->disconnect$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e5
+    const v0, 0x7f0a0822
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -300,7 +300,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->settings$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e6
+    const v0, 0x7f0a0823
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -308,7 +308,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->settingsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e3
+    const v0, 0x7f0a0820
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -316,7 +316,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e7
+    const v0, 0x7f0a0824
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -324,7 +324,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->usercount$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e8
+    const v0, 0x7f0a0825
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -332,7 +332,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->recyclerview$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e1
+    const v0, 0x7f0a081e
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -612,7 +612,7 @@
     :goto_4
     invoke-static {v2, v7, v4, v6, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    sget-object v2, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object v2, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
     new-array v2, v6, [Ljava/lang/Object;
 
@@ -759,7 +759,7 @@
 
     const-string v0, "adapter"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_a
     invoke-virtual {p1, v1}, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;->setData(Ljava/util/List;)V
@@ -1040,7 +1040,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d7
+    const v0, 0x7f0d01e5
 
     return 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 e54d509309..3d60be8136 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
@@ -103,7 +103,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a081d
+    const p1, 0x7f0a085b
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -111,7 +111,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a081c
+    const p1, 0x7f0a085a
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -205,7 +205,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f080122
+    const p2, 0x7f080129
 
     const/4 v0, 0x4
 
@@ -238,7 +238,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f070058
+    const v3, 0x7f070057
 
     const/4 v4, 0x0
 
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 72ddb843bd..9a5f33d470 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.smali
@@ -95,7 +95,7 @@
 
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem;
 
-    const p2, 0x7f0d0113
+    const p2, 0x7f0d011c
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem;-><init>(ILcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;)V
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemFriends.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemFriends.smali
index 1a34b1bdc7..3d67921285 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemFriends.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemFriends.smali
@@ -182,6 +182,10 @@
 
     iget v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemFriends;->mentionCount:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemHeader.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemHeader.smali
index 42bfb26ffc..c5f2b98d65 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemHeader.smali
@@ -297,48 +297,46 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;->id:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v3
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
+    iget v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;->textResId:I
 
-    mul-int/lit8 v1, v1, 0x1f
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
-    iget v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;->textResId:I
+    move-result v1
 
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;->ableToManageChannel:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;->ableToManageChannel:Z
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-wide v3, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;->selectedGuildId:J
+    iget-wide v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;->selectedGuildId:J
 
-    ushr-long v5, v3, v2
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    xor-long/2addr v3, v5
+    move-result v1
 
-    long-to-int v0, v3
+    add-int/2addr v0, v1
 
-    add-int/2addr v1, v0
-
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
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 60e699e80b..e320d512ee 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
@@ -395,6 +395,10 @@
 
     move-result v1
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
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 0b16e33658..b9f7079b45 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
@@ -435,6 +435,10 @@
 
     move-result v1
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
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 c11e9d8d1c..53bc8e09d4 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
@@ -425,6 +425,10 @@
 
     iget v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;->numUsersConnected:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
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 e2930b41f0..7fefac7c5d 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
@@ -355,6 +355,10 @@
 
     iget v1, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali
index ebe6ada948..d76309b120 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali
@@ -383,7 +383,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v0
 
@@ -409,7 +409,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/Observable;->JV()Lrx/Observable;
 
     move-result-object p2
 
@@ -431,7 +431,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    const v1, 0x7f120b39
+    const v1, 0x7f120b6a
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -521,7 +521,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming;->get()Lrx/Observable;
+    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming;->getStreams()Lrx/Observable;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Model.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Model.smali
index 8bae4d8071..52c160babb 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$Model.smali
@@ -261,7 +261,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 6
+    .locals 4
 
     iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$Model;->memberList:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$MemberList;
 
@@ -294,15 +294,11 @@
 
     iget-wide v2, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$Model;->channelId:J
 
-    const/16 v4, 0x20
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v4, v2, v4
+    move-result v2
 
-    xor-long/2addr v2, v4
-
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
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 67f2d07b65..6f18417912 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
@@ -32,7 +32,7 @@
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -76,7 +76,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$RxOnScrollListener;->scrollYSubject:Lrx/subjects/PublishSubject;
 
-    sget-object p2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureUI$1.smali
index 7570c5cc25..d23d704e03 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureUI$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureUI$1;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 2866f4fa1b..abcbff3f03 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$1;->invoke(Lkotlin/Unit;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 f50eeb94b8..b21b28cc80 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$2;->invoke(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 316ffcc92a..10994b5bf8 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.smali
@@ -208,7 +208,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v3, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureUI$1;
@@ -223,7 +223,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {p1}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$Model;->getMemberList()Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$MemberList;
@@ -348,7 +348,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -356,7 +356,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kd()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JR()Lrx/Observable;
 
     move-result-object v0
 
@@ -478,7 +478,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00cb
+    const v0, 0x7f0d00d4
 
     return v0
 .end method
@@ -506,7 +506,7 @@
 
     const-string v1, "adapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter;->dispose()V
@@ -565,7 +565,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast v1, Lcom/discord/utilities/views/StickyHeaderItemDecoration$StickyHeaderAdapter;
@@ -584,7 +584,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     check-cast v0, Landroidx/recyclerview/widget/RecyclerView$Adapter;
@@ -629,7 +629,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v4
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$4.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$4.smali
index 810bce7709..4e05f651ef 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$4.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$4.smali
@@ -59,7 +59,7 @@
 .method public final call(Ljava/lang/Throwable;)V
     .locals 6
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
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 a20093a753..107bcbb788 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
@@ -523,137 +523,133 @@
 
     iget-wide v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->userId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v2, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v2
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->name:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->name:Ljava/lang/String;
 
     const/4 v2, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->isBot:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->isBot:Z
 
     const/4 v3, 0x1
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_1
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->presence:Lcom/discord/models/domain/ModelPresence;
+    iget-object v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_1
 
     :cond_2
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_1
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->color:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->color:Ljava/lang/Integer;
 
-    if-eqz v0, :cond_3
+    if-eqz v1, :cond_3
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_2
 
     :cond_3
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_2
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->avatarUrl:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->avatarUrl:Ljava/lang/String;
 
-    if-eqz v0, :cond_4
+    if-eqz v1, :cond_4
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_3
 
     :cond_4
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_3
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->showOwnerIndicator:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->showOwnerIndicator:Z
 
-    if-eqz v0, :cond_5
+    if-eqz v1, :cond_5
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_5
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->premiumSince:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->premiumSince:Ljava/lang/String;
 
-    if-eqz v0, :cond_6
+    if-eqz v1, :cond_6
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v2
 
     :cond_6
-    add-int/2addr v1, v2
+    add-int/2addr v0, v2
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->isApplicationStreaming:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->isApplicationStreaming:Z
 
-    if-eqz v0, :cond_7
+    if-eqz v1, :cond_7
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_7
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final isApplicationStreaming()Z
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 9e3af5555e..a4a7b3b5af 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 37de80534b..91ab671bf6 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
@@ -63,7 +63,7 @@
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -101,7 +101,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter;->updatesSubject:Lrx/subjects/PublishSubject;
 
-    invoke-virtual {v1}, Lrx/subjects/PublishSubject;->Kd()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/subjects/PublishSubject;->JR()Lrx/Observable;
 
     move-result-object v1
 
@@ -113,11 +113,11 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kf()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JT()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -125,7 +125,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -218,7 +218,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     if-eqz p1, :cond_2
@@ -234,7 +234,7 @@
 
     if-nez p1, :cond_1
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {p1}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;->getView()Landroid/view/View;
@@ -263,7 +263,7 @@
 
     :catch_0
     :try_start_2
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-string v3, "Failed to cast header"
 
@@ -283,7 +283,7 @@
 
     if-nez p1, :cond_3
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-virtual {p1}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;->getView()Landroid/view/View;
@@ -297,7 +297,7 @@
 
     if-nez p1, :cond_4
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     invoke-virtual {p1}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;->getView()Landroid/view/View;
@@ -310,7 +310,7 @@
 .method public final getHeaderLayout(I)I
     .locals 0
 
-    const p1, 0x7f0d00cc
+    const p1, 0x7f0d00d5
 
     return p1
 .end method
@@ -407,7 +407,7 @@
 
     check-cast v1, Landroid/view/ViewGroup;
 
-    const v2, 0x7f0d00cc
+    const v2, 0x7f0d00d5
 
     const/4 v3, 0x0
 
@@ -560,7 +560,7 @@
 
     new-instance p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading;
 
-    const p2, 0x7f0d00cd
+    const p2, 0x7f0d00d6
 
     invoke-virtual {v0, p2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1;->invoke(I)Landroid/view/View;
 
@@ -582,7 +582,7 @@
     :cond_1
     new-instance p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;
 
-    const p2, 0x7f0d00ce
+    const p2, 0x7f0d00d7
 
     invoke-virtual {v0, p2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1;->invoke(I)Landroid/view/View;
 
@@ -597,7 +597,7 @@
     :cond_2
     new-instance p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;
 
-    const p2, 0x7f0d00cc
+    const p2, 0x7f0d00d5
 
     invoke-virtual {v0, p2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1;->invoke(I)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 6353096d45..373d39a3f9 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
@@ -25,7 +25,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;->view:Landroid/view/View;
 
-    const v0, 0x7f0a013b
+    const v0, 0x7f0a013c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -37,7 +37,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;->view:Landroid/view/View;
 
-    const v0, 0x7f0a013a
+    const v0, 0x7f0a013b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)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 3cea143c1e..040873f543 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
@@ -220,7 +220,7 @@
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
-    const v0, 0x7f0a07cf
+    const v0, 0x7f0a080c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -254,7 +254,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     check-cast p1, Ljava/lang/Number;
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 8d88228263..debdc3cbed 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
@@ -75,7 +75,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f120df2
+    const v2, 0x7f120e2b
 
     const/4 v3, 0x1
 
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 730847541c..e40db9ade6 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
@@ -37,7 +37,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a0135
+    const v0, 0x7f0a0136
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -49,7 +49,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a013c
+    const v0, 0x7f0a013d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -61,7 +61,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a0138
+    const v0, 0x7f0a0139
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -73,7 +73,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a013d
+    const v0, 0x7f0a013e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -85,7 +85,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a0137
+    const v0, 0x7f0a0138
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -95,7 +95,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a013e
+    const v0, 0x7f0a013f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -107,7 +107,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a0139
+    const v0, 0x7f0a013a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -117,7 +117,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a0136
+    const v0, 0x7f0a0137
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -191,7 +191,7 @@
 
     check-cast v0, Landroid/view/View;
 
-    const v1, 0x7f040291
+    const v1, 0x7f040294
 
     invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -391,7 +391,7 @@
 
     move-result-object v7
 
-    const v8, 0x7f07005b
+    const v8, 0x7f07005a
 
     const/4 v9, 0x0
 
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 10277cf127..912289c161 100644
--- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$Companion.smali
@@ -110,7 +110,7 @@
 
     aput-object v2, v0, v3
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v7
 
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 87c12fb389..3242526ddd 100644
--- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali
@@ -55,7 +55,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/chat/WidgetUrlActions$onViewCreated$3;->this$0:Lcom/discord/widgets/chat/WidgetUrlActions;
 
-    const v2, 0x7f12064d
+    const v2, 0x7f12065b
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/chat/WidgetUrlActions;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions.smali b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions.smali
index a8f1e6495b..ddbff0dcb9 100644
--- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions.smali
@@ -169,7 +169,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a026d
+    const v0, 0x7f0a0276
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -177,7 +177,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/WidgetUrlActions;->urlTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026a
+    const v0, 0x7f0a0273
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -185,7 +185,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/WidgetUrlActions;->copyBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026b
+    const v0, 0x7f0a0274
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -193,7 +193,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/WidgetUrlActions;->openBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026c
+    const v0, 0x7f0a0275
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -355,7 +355,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01be
+    const v0, 0x7f0d01ce
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion$get$1.smali
index bf5503b85c..412331fdd8 100644
--- a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion$get$1.smali
@@ -168,7 +168,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion.smali
index e0d78b18e5..e556dcc6b6 100644
--- a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion.smali
@@ -54,7 +54,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -66,7 +66,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model.smali b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model.smali
index e6ec86230c..e6336c45eb 100644
--- a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model.smali
@@ -177,30 +177,26 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 2
 
     iget-wide v0, p0, Lcom/discord/widgets/chat/detached/WidgetChatDetached$Model;->channelId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v2, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v2
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
+    iget-boolean v1, p0, Lcom/discord/widgets/chat/detached/WidgetChatDetached$Model;->isViewingOldMessages:Z
 
-    mul-int/lit8 v1, v1, 0x1f
+    if-eqz v1, :cond_0
 
-    iget-boolean v0, p0, Lcom/discord/widgets/chat/detached/WidgetChatDetached$Model;->isViewingOldMessages:Z
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final isViewingOldMessages()Z
diff --git a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$onViewBoundOrOnResume$1.smali
index aaad3bfcf5..8d0296d00c 100644
--- a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/detached/WidgetChatDetached$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/chat/detached/WidgetChatDetached$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached.smali b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached.smali
index 59dae585b4..ef2eb0dfe5 100644
--- a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached.smali
+++ b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached.smali
@@ -71,7 +71,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00e9
+    const v0, 0x7f0d00f2
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$chatInput$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$chatInput$2.smali
index e516b382ac..e763311efb 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$chatInput$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$chatInput$2.smali
@@ -66,7 +66,7 @@
 
     const/4 v2, 0x0
 
-    const v3, 0x7f0d00eb
+    const v3, 0x7f0d00f4
 
     invoke-virtual {v0, v3, v1, v2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
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 43b24ed41d..c279f2286f 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/chat/input/WidgetChatInputModel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 2ef355ad65..6e47ac063f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
@@ -226,7 +226,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a01d1
+    const v0, 0x7f0a01d2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -234,7 +234,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ca
+    const v0, 0x7f0a01cb
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -242,7 +242,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputMentionsRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01bf
+    const v0, 0x7f0a01c0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -250,7 +250,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputEdit$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01c1
+    const v0, 0x7f0a01c2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -258,7 +258,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputEditCancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01cd
+    const v0, 0x7f0a01ce
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -266,7 +266,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatVerification$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01cf
+    const v0, 0x7f0a01d0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -274,7 +274,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatVerificationText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ce
+    const v0, 0x7f0a01cf
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -381,7 +381,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120b0a
+    const v1, 0x7f120b38
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -389,7 +389,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120b09
+    const v1, 0x7f120b37
 
     invoke-virtual {p0, v1}, Lcom/discord/widgets/chat/input/WidgetChatInput;->getString(I)Ljava/lang/String;
 
@@ -641,7 +641,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00ea
+    const v0, 0x7f0d00f3
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali
index c97dd182c0..0c4d6ffd4b 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali
@@ -46,7 +46,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d00ee
+    const v1, 0x7f0d00f7
 
     const/4 v2, 0x1
 
@@ -54,7 +54,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f0a04fd
+    const v0, 0x7f0a0514
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -66,7 +66,7 @@
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    const v2, 0x7f121111
+    const v2, 0x7f121153
 
     invoke-virtual {v0, v2, v1}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordFilesFragment.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordFilesFragment.smali
index e99dba0681..4a07f357f7 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
@@ -34,7 +34,7 @@
 
     new-instance v0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter;
 
-    const v1, 0x7f0d00ee
+    const v1, 0x7f0d00f7
 
     const v2, 0x7f0a0038
 
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 364ca72451..fff7ba0577 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
@@ -34,7 +34,7 @@
 
     new-instance v0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter;
 
-    const v1, 0x7f0d00ee
+    const v1, 0x7f0d00f7
 
     const v2, 0x7f0a0038
 
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 318023d324..23871da284 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
@@ -54,7 +54,7 @@
 
     iget-object p2, p1, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a04fd
+    const v0, 0x7f0a0514
 
     invoke-virtual {p2, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -66,7 +66,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    const v1, 0x7f121112
+    const v1, 0x7f121154
 
     invoke-virtual {p2, v1, v0}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali
index c066db6b39..4da365d7fa 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1;->invoke(Landroidx/core/view/inputmethod/InputContentInfoCompat;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 e5e9426dba..400288ec1c 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
@@ -107,7 +107,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cc()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-virtual {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->BR()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object v1
 
@@ -140,7 +140,7 @@
     :catchall_0
     move-exception p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-string v1, "Analytic error on attachment update"
 
@@ -167,7 +167,7 @@
 
     invoke-super {p0, p1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinatorInternal(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbl:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iget-object v0, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbD:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
     new-instance v1, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1;
 
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 df2a02d190..bb9a4c70fd 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali
@@ -138,7 +138,7 @@
 
     if-eqz v1, :cond_1
 
-    const v2, 0x7f12025f
+    const v2, 0x7f120263
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -150,6 +150,10 @@
     const-string v1, "?"
 
     :cond_2
+    const-string v2, "context?.getString(R.str\u2026_filename_unknown) ?: \"?\""
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     sget-object v2, Lcom/lytefast/flexinput/model/Attachment;->Companion:Lcom/lytefast/flexinput/model/Attachment$Companion;
 
     const/4 v2, 0x1
@@ -179,7 +183,7 @@
 
 # virtual methods
 .method public final configureFlexInputFragment(Lcom/discord/app/AppFragment;Lcom/discord/widgets/chat/input/WidgetChatInputEditText;)V
-    .locals 9
+    .locals 10
 
     const-string v0, "fragment"
 
@@ -204,7 +208,7 @@
     invoke-virtual {p2, v1}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->setInputContentHandler(Lkotlin/jvm/functions/Function1;)V
 
     :cond_0
-    const v1, 0x7f0a01d0
+    const v1, 0x7f0a01d1
 
     invoke-virtual {v0, v1}, Landroidx/fragment/app/FragmentManager;->findFragmentById(I)Landroidx/fragment/app/Fragment;
 
@@ -235,9 +239,9 @@
 
     new-instance v5, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1;
 
-    const v6, 0x7f0802bc
+    const v6, 0x7f0802cc
 
-    const v7, 0x7f120262
+    const v7, 0x7f120266
 
     invoke-direct {v5, v6, v7}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1;-><init>(II)V
 
@@ -245,33 +249,33 @@
 
     aput-object v5, v4, v2
 
-    const/4 v5, 0x1
+    new-instance v5, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2;
 
-    new-instance v6, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2;
+    const v6, 0x7f08027d
 
-    const v7, 0x7f08026d
+    const v7, 0x7f120264
 
-    const v8, 0x7f120260
+    invoke-direct {v5, v6, v7}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2;-><init>(II)V
 
-    invoke-direct {v6, v7, v8}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2;-><init>(II)V
+    check-cast v5, Lcom/lytefast/flexinput/adapters/a$b;
 
-    check-cast v6, Lcom/lytefast/flexinput/adapters/a$b;
+    const/4 v6, 0x1
 
-    aput-object v6, v4, v5
+    aput-object v5, v4, v6
 
     const/4 v5, 0x2
 
-    new-instance v6, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3;
+    new-instance v7, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3;
 
-    const v7, 0x7f0801c3
+    const v8, 0x7f0801d2
 
-    const v8, 0x7f12025e
+    const v9, 0x7f120261
 
-    invoke-direct {v6, v7, v8}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3;-><init>(II)V
+    invoke-direct {v7, v8, v9}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3;-><init>(II)V
 
-    check-cast v6, Lcom/lytefast/flexinput/adapters/a$b;
+    check-cast v7, Lcom/lytefast/flexinput/adapters/a$b;
 
-    aput-object v6, v4, v5
+    aput-object v7, v4, v5
 
     invoke-virtual {v1, v4}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a([Lcom/lytefast/flexinput/adapters/a$b;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
@@ -279,7 +283,21 @@
 
     check-cast v4, Landroidx/appcompat/widget/AppCompatEditText;
 
-    invoke-virtual {v1, v4}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->b(Landroidx/appcompat/widget/AppCompatEditText;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    sget v5, Lcom/lytefast/flexinput/R$e;->text_input:I
+
+    invoke-virtual {v4, v5}, Landroidx/appcompat/widget/AppCompatEditText;->setId(I)V
+
+    invoke-virtual {v4, v6}, Landroidx/appcompat/widget/AppCompatEditText;->setFocusable(Z)V
+
+    invoke-virtual {v4, v6}, Landroidx/appcompat/widget/AppCompatEditText;->setFocusableInTouchMode(Z)V
+
+    iget-object v5, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baY:Landroid/widget/LinearLayout;
+
+    new-instance v6, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;
+
+    invoke-direct {v6, v1, v4}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;-><init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Landroidx/appcompat/widget/AppCompatEditText;)V
+
+    invoke-virtual {v5, v6}, Landroid/widget/LinearLayout;->post(Ljava/lang/Runnable;)Z
 
     invoke-virtual {p1}, Lcom/discord/app/AppFragment;->getFileManager()Lcom/lytefast/flexinput/managers/FileManager;
 
@@ -293,7 +311,7 @@
 
     check-cast v4, Lcom/lytefast/flexinput/managers/a;
 
-    invoke-virtual {v1, v4}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Lcom/lytefast/flexinput/managers/a;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object v4, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbg:Lcom/lytefast/flexinput/managers/a;
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;->getContentResolver()Landroid/content/ContentResolver;
 
@@ -308,7 +326,7 @@
     invoke-virtual {v1, v4}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     :cond_2
-    const v4, 0x7f0a02aa
+    const v4, 0x7f0a02b3
 
     invoke-virtual {v0, v4}, Landroidx/fragment/app/FragmentManager;->findFragmentById(I)Landroidx/fragment/app/Fragment;
 
@@ -336,7 +354,25 @@
 
     check-cast v4, Landroidx/fragment/app/Fragment;
 
-    invoke-virtual {v1, v4}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Landroidx/fragment/app/Fragment;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    invoke-virtual {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Landroidx/fragment/app/FragmentManager;->beginTransaction()Landroidx/fragment/app/FragmentTransaction;
+
+    move-result-object v5
+
+    sget v6, Lcom/lytefast/flexinput/R$e;->emoji_container:I
+
+    invoke-virtual {v5, v6, v4}, Landroidx/fragment/app/FragmentTransaction;->replace(ILandroidx/fragment/app/Fragment;)Landroidx/fragment/app/FragmentTransaction;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Landroidx/fragment/app/FragmentTransaction;->commit()I
+
+    iget-object v1, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbc:Landroidx/appcompat/widget/AppCompatImageButton;
+
+    invoke-virtual {v1, v2}, Landroidx/appcompat/widget/AppCompatImageButton;->setVisibility(I)V
 
     :cond_4
     if-eqz v3, :cond_5
@@ -379,9 +415,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->isEnabled()Z
-
-    move-result v0
+    iget-boolean v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->isEnabled:Z
 
     return v0
 
@@ -408,7 +442,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cm()Z
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cb()Z
 
     move-result v0
 
@@ -421,15 +455,49 @@
 .end method
 
 .method public final setEnabled(Z)V
-    .locals 1
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;->flexInputFragment:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
-    invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->X(Z)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-boolean p1, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->isEnabled:Z
+
+    const/4 v1, 0x0
+
+    :goto_0
+    iget-object v2, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baY:Landroid/widget/LinearLayout;
+
+    invoke-virtual {v2}, Landroid/widget/LinearLayout;->getChildCount()I
+
+    move-result v2
+
+    if-ge v1, v2, :cond_0
+
+    iget-object v2, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baY:Landroid/widget/LinearLayout;
+
+    invoke-virtual {v2, v1}, Landroid/widget/LinearLayout;->getChildAt(I)Landroid/view/View;
+
+    move-result-object v2
+
+    invoke-virtual {v2, p1}, Landroid/view/View;->setEnabled(Z)V
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
 
     :cond_0
+    if-eqz p1, :cond_1
+
+    iget-object p1, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
+
+    invoke-virtual {p1}, Landroidx/appcompat/widget/AppCompatEditText;->getText()Landroid/text/Editable;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Landroid/text/Editable;)V
+
+    :cond_1
     return-void
 .end method
 
@@ -444,7 +512,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Lcom/lytefast/flexinput/InputListener;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbh:Lcom/lytefast/flexinput/InputListener;
 
     :cond_0
     return-void
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 06540b764a..6879e919f7 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
@@ -47,7 +47,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a01c3
+    const v0, 0x7f0a01c4
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -59,7 +59,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a01c8
+    const v0, 0x7f0a01c9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -71,7 +71,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a01c9
+    const v0, 0x7f0a01ca
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -81,18 +81,6 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a01c6
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemName:Landroid/widget/TextView;
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemView:Landroid/view/View;
-
     const v0, 0x7f0a01c7
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -101,11 +89,23 @@
 
     check-cast p1, Landroid/widget/TextView;
 
+    iput-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemName:Landroid/widget/TextView;
+
+    iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemView:Landroid/view/View;
+
+    const v0, 0x7f0a01c8
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/TextView;
+
     iput-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemNameRight:Landroid/widget/TextView;
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a01c4
+    const v0, 0x7f0a01c5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -211,7 +211,7 @@
 
     move-result p1
 
-    const v0, 0x7f07005a
+    const v0, 0x7f070059
 
     const/4 v1, 0x0
 
@@ -242,7 +242,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemName:Landroid/widget/TextView;
 
-    const v3, 0x7f060110
+    const v3, 0x7f060112
 
     invoke-static {v2, v3}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter.smali
index c90724fed7..366cf9bcbb 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter.smali
@@ -79,7 +79,7 @@
 
     new-instance p1, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;
 
-    const p2, 0x7f0d00ed
+    const p2, 0x7f0d00f6
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;-><init>(ILcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter;)V
 
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 1d8561aff4..a95be93946 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel.smali
@@ -800,7 +800,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p0
 
@@ -880,7 +880,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JV()Lrx/Observable;
 
     move-result-object v0
 
@@ -892,7 +892,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p0
 
@@ -935,7 +935,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v2
 
@@ -1031,7 +1031,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p0
 
@@ -1136,7 +1136,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object v0
 
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 c188631937..cdf25add07 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText.smali
@@ -377,7 +377,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
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 9933c5fe1b..57bfc035f0 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions.smali
@@ -916,7 +916,7 @@
 
     invoke-direct {v0, p0, p1}, Lcom/discord/widgets/chat/input/-$$Lambda$WidgetChatInputMentions$Z1KCx1L9dCr8Sx_UQh_6p3GxU7I;-><init>(Lcom/discord/widgets/chat/input/WidgetChatInputMentions;Ljava/lang/String;)V
 
-    sget p1, Lrx/Emitter$a;->bIB:I
+    sget p1, Lrx/Emitter$a;->bIV:I
 
     invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;I)Lrx/Observable;
 
@@ -929,7 +929,7 @@
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     :cond_0
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -937,7 +937,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
 
     move-result-object v0
 
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 3926382485..18fb1c56d1 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
@@ -95,7 +95,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -111,7 +111,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f120528
+    const p1, 0x7f120533
 
     invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -122,7 +122,7 @@
     :cond_0
     if-nez p3, :cond_1
 
-    const p1, 0x7f120bdf
+    const p1, 0x7f120c11
 
     invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -135,7 +135,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f121127
+    const p2, 0x7f121169
 
     invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -229,7 +229,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p0
 
@@ -375,7 +375,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v9
 
@@ -391,7 +391,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v10
 
@@ -829,7 +829,7 @@
     return-object p1
 
     :cond_0
-    const v0, 0x7f1212bd
+    const v0, 0x7f12130e
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -838,7 +838,7 @@
     return-object p1
 
     :cond_1
-    const v0, 0x7f1212b3
+    const v0, 0x7f121304
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -875,7 +875,7 @@
     return-object p1
 
     :cond_0
-    const v0, 0x7f1208d3
+    const v0, 0x7f1208f3
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -884,7 +884,7 @@
     return-object p1
 
     :cond_1
-    const v0, 0x7f1208d1
+    const v0, 0x7f1208f1
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -899,7 +899,7 @@
     return-object p1
 
     :cond_2
-    const v0, 0x7f1208d0
+    const v0, 0x7f1208f0
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -914,7 +914,7 @@
     return-object p1
 
     :cond_3
-    const v0, 0x7f1208d2
+    const v0, 0x7f1208f2
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1.smali
index 41be76d2b0..cced6d1032 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -88,20 +88,10 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isPremium()Z
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getMaxFileSizeMB()I
 
     move-result v1
 
-    if-eqz v1, :cond_1
-
-    const/16 v1, 0x32
-
-    goto :goto_1
-
-    :cond_1
-    const/16 v1, 0x8
-
-    :goto_1
     invoke-static {v0, v1}, Ljava/lang/Math;->max(II)I
 
     move-result v0
@@ -118,11 +108,11 @@
 
     check-cast v1, Lcom/discord/widgets/chat/input/WidgetChatInputSend$Listener;
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_1
 
-    sget-object v3, Lkotlin/jvm/internal/h;->bkD:Lkotlin/jvm/internal/h;
+    sget-object v3, Lkotlin/jvm/internal/h;->bkX:Lkotlin/jvm/internal/h;
 
-    invoke-static {}, Lkotlin/jvm/internal/h;->El()F
+    invoke-static {}, Lkotlin/jvm/internal/h;->Ea()F
 
     move-result v3
 
@@ -142,6 +132,6 @@
 
     invoke-interface {v1, v0, v3, v2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$Listener;->onFilesTooLarge(IFZ)V
 
-    :cond_2
+    :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2.smali
index 1caf4cddc4..a0b110d11b 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2;->invoke(Lkotlin/Pair;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 69d7859efd..a2e870da86 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
@@ -77,7 +77,7 @@
 
     invoke-static {v0, p1}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     const/4 p1, 0x0
 
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 cfab3d7145..fd34a0076c 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, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v1, Ljava/util/List;
 
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 4d2c81983f..2cd3247805 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
@@ -71,7 +71,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, 0x7f1203b1
+    const p2, 0x7f1203b6
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z
 
@@ -106,7 +106,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;
 
-    const p2, 0x7f12054e
+    const p2, 0x7f120559
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z
 
@@ -134,7 +134,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, 0x7f120bdf
+    const p2, 0x7f120c11
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder.smali
index 80ec639c86..3328e9545e 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder.smali
@@ -37,7 +37,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder;->itemView:Landroid/view/View;
 
-    const v1, 0x7f0a02ab
+    const v1, 0x7f0a02b4
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali
index 0550f0688e..49f53c9397 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali
@@ -93,57 +93,57 @@
 
     packed-switch p1, :pswitch_data_0
 
-    const p1, 0x7f121077
+    const p1, 0x7f1210b4
 
     return p1
 
     :pswitch_0
-    const p1, 0x7f120562
+    const p1, 0x7f12056d
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f12055c
+    const p1, 0x7f120567
 
     return p1
 
     :pswitch_2
-    const p1, 0x7f12055d
+    const p1, 0x7f120568
 
     return p1
 
     :pswitch_3
-    const p1, 0x7f120563
+    const p1, 0x7f12056e
 
     return p1
 
     :pswitch_4
-    const p1, 0x7f120560
+    const p1, 0x7f12056b
 
     return p1
 
     :pswitch_5
-    const p1, 0x7f120564
+    const p1, 0x7f12056f
 
     return p1
 
     :pswitch_6
-    const p1, 0x7f12055b
+    const p1, 0x7f120566
 
     return p1
 
     :pswitch_7
-    const p1, 0x7f12055e
+    const p1, 0x7f120569
 
     return p1
 
     :pswitch_8
-    const p1, 0x7f12055f
+    const p1, 0x7f12056a
 
     return p1
 
     :pswitch_9
-    const p1, 0x7f120561
+    const p1, 0x7f12056c
 
     return p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder.smali
index 86df7658da..bdc7360162 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder.smali
@@ -37,7 +37,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0381
+    const v0, 0x7f0a0391
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter.smali
index 0a4b7190f1..1208093bc3 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter.smali
@@ -172,7 +172,7 @@
 
     invoke-direct {v0, p0}, Lcom/discord/widgets/chat/input/emoji/-$$Lambda$WidgetChatInputEmojiAdapter$A6taHeYwkO3i7nA60SAn8D4ZzZ4;-><init>(Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter;)V
 
-    sget v1, Lrx/Emitter$a;->bID:I
+    sget v1, Lrx/Emitter$a;->bIX:I
 
     invoke-static {v0, v1}, Lrx/Observable;->a(Lrx/functions/Action1;I)Lrx/Observable;
 
@@ -190,7 +190,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dy()Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Model.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Model.smali
index f0ebdc139c..d8fdba40dd 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker$Model.smali
@@ -534,7 +534,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali
index 1a27bf9b13..b84bfbbd87 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali
@@ -206,55 +206,55 @@
 
     packed-switch p0, :pswitch_data_0
 
-    const p0, 0x7f040375
-
-    return p0
-
-    :pswitch_0
-    const p0, 0x7f04037b
-
-    return p0
-
-    :pswitch_1
-    const p0, 0x7f040376
-
-    return p0
-
-    :pswitch_2
-    const p0, 0x7f04037c
-
-    return p0
-
-    :pswitch_3
-    const p0, 0x7f040379
-
-    return p0
-
-    :pswitch_4
-    const p0, 0x7f04037d
-
-    return p0
-
-    :pswitch_5
-    const p0, 0x7f040374
-
-    return p0
-
-    :pswitch_6
-    const p0, 0x7f040377
-
-    return p0
-
-    :pswitch_7
     const p0, 0x7f040378
 
     return p0
 
-    :pswitch_8
+    :pswitch_0
+    const p0, 0x7f04037e
+
+    return p0
+
+    :pswitch_1
+    const p0, 0x7f040379
+
+    return p0
+
+    :pswitch_2
+    const p0, 0x7f04037f
+
+    return p0
+
+    :pswitch_3
+    const p0, 0x7f04037c
+
+    return p0
+
+    :pswitch_4
+    const p0, 0x7f040380
+
+    return p0
+
+    :pswitch_5
+    const p0, 0x7f040377
+
+    return p0
+
+    :pswitch_6
     const p0, 0x7f04037a
 
     return p0
 
+    :pswitch_7
+    const p0, 0x7f04037b
+
+    return p0
+
+    :pswitch_8
+    const p0, 0x7f04037d
+
+    return p0
+
     nop
 
     :pswitch_data_0
@@ -284,7 +284,7 @@
 
     sget-object v0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->state:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -818,7 +818,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00ec
+    const v0, 0x7f0d00f5
 
     return v0
 .end method
@@ -1033,12 +1033,12 @@
     :cond_1
     if-eqz v1, :cond_2
 
-    const v0, 0x7f120e50
+    const v0, 0x7f120e87
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f120e56
+    const v0, 0x7f120e8d
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->getString(I)Ljava/lang/String;
@@ -1047,12 +1047,12 @@
 
     if-eqz v1, :cond_3
 
-    const v1, 0x7f120e51
+    const v1, 0x7f120e88
 
     goto :goto_1
 
     :cond_3
-    const v1, 0x7f120e57
+    const v1, 0x7f120e8e
 
     :goto_1
     invoke-virtual {p0, v1}, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->getString(I)Ljava/lang/String;
@@ -1061,7 +1061,7 @@
 
     const-string v3, "Emoji Picker Popout"
 
-    invoke-static {p1, v2, v0, v1, v3}, Lcom/discord/a/a;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {p1, v2, v0, v1, v3}, Lcom/discord/dialogs/c;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
 
@@ -1076,7 +1076,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120565
+    const v0, 0x7f120570
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->d(Landroid/content/Context;I)V
 
@@ -1140,7 +1140,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a01c2
+    const v0, 0x7f0a01c3
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1150,7 +1150,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->emojisRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a02b0
+    const v0, 0x7f0a02b9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1160,7 +1160,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->tabLayout:Lcom/google/android/material/tabs/TabLayout;
 
-    const v0, 0x7f0a02af
+    const v0, 0x7f0a02b8
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1170,7 +1170,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->searchButton:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a02ad
+    const v0, 0x7f0a02b6
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1180,7 +1180,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->backspaceButton:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a02b1
+    const v0, 0x7f0a02ba
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1188,7 +1188,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->emojiSearchBar:Landroid/view/View;
 
-    const v0, 0x7f0a05ab
+    const v0, 0x7f0a05c5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1198,7 +1198,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->searchInput:Landroid/widget/EditText;
 
-    const v0, 0x7f0a05a1
+    const v0, 0x7f0a05bb
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1206,7 +1206,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->searchBackButton:Landroid/view/View;
 
-    const v0, 0x7f0a05a5
+    const v0, 0x7f0a05bf
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 c6621bfcea..d0cac9448f 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, 0x7f120532
+    const v0, 0x7f12053d
 
     const/4 v1, 0x1
 
@@ -64,7 +64,7 @@
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroid/content/Context;Ljava/lang/CharSequence;)V
 
     :cond_0
-    sget-object p0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p0
 .end method
@@ -98,7 +98,7 @@
 
     check-cast p0, Landroid/content/Context;
 
-    const v0, 0x7f120531
+    const v0, 0x7f12053c
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -107,7 +107,7 @@
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroid/content/Context;Ljava/lang/CharSequence;)V
 
     :cond_0
-    sget-object p0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p0
 .end method
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 f8b7f2b2c4..100994aa0a 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
@@ -67,7 +67,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -85,7 +85,7 @@
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -143,7 +143,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -394,7 +394,7 @@
     :goto_1
     invoke-interface {v1, v13}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v1
 
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 9184ef8085..83ee14eb27 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList.smali
@@ -142,7 +142,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00f1
+    const v0, 0x7f0d00fa
 
     return v0
 .end method
@@ -245,7 +245,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0206
+    const v0, 0x7f0a0207
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 612ee04add..2d2deac256 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
@@ -76,13 +76,13 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData;->channelNames:Ljava/util/Map;
 
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v0, Ljava/util/List;
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData;->list:Ljava/util/List;
 
-    sget-object v0, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast v0, Ljava/util/Set;
 
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 bdb2b2b85b..04f6a9c812 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
@@ -88,7 +88,7 @@
 .method private final animateHighlight(Landroid/view/View;)V
     .locals 4
 
-    const v0, 0x7f0800c6
+    const v0, 0x7f0800c9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -270,7 +270,7 @@
     move-result v1
 
     :cond_7
-    invoke-static {v1, v5}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntProgression;
+    invoke-static {v1, v5}, Lkotlin/ranges/c;->W(II)Lkotlin/ranges/IntProgression;
 
     move-result-object v0
 
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 f6a8d47d22..da11e43169 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$scrollToMessageId$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 56e11f552d..3015db5e3a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter.smali
@@ -446,7 +446,7 @@
     :pswitch_8
     new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;
 
-    const p2, 0x7f0d00fa
+    const p2, 0x7f0d0103
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -457,7 +457,7 @@
     :pswitch_9
     new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;
 
-    const p2, 0x7f0d010b
+    const p2, 0x7f0d0114
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -495,7 +495,7 @@
     :pswitch_d
     new-instance p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
-    const p2, 0x7f0d00f6
+    const p2, 0x7f0d00ff
 
     move-object v0, p0
 
@@ -508,7 +508,7 @@
     :pswitch_e
     new-instance p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
-    const p2, 0x7f0d0107
+    const p2, 0x7f0d0110
 
     move-object v0, p0
 
@@ -521,7 +521,7 @@
     :pswitch_f
     new-instance p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
-    const p2, 0x7f0d0106
+    const p2, 0x7f0d010f
 
     move-object v0, p0
 
@@ -534,7 +534,7 @@
     :pswitch_10
     new-instance p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
-    const p2, 0x7f0d0108
+    const p2, 0x7f0d0111
 
     move-object v0, p0
 
@@ -583,7 +583,7 @@
     :pswitch_15
     new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListItem;
 
-    const p2, 0x7f0d0109
+    const p2, 0x7f0d0112
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -630,7 +630,7 @@
     :pswitch_1a
     new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListItem;
 
-    const p2, 0x7f0d0100
+    const p2, 0x7f0d0109
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -641,7 +641,7 @@
     :pswitch_1b
     new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;
 
-    const p2, 0x7f0d0103
+    const p2, 0x7f0d010c
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -652,7 +652,7 @@
     :pswitch_1c
     new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;
 
-    const p2, 0x7f0d010c
+    const p2, 0x7f0d0115
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$configureUI$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$configureUI$3.smali
index 42881a0d09..cb4fe6c6a9 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$configureUI$3.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$configureUI$3;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$onConfigure$1.smali
index 542c1165d5..7baf7198a1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$onConfigure$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$onConfigure$1;->invoke(Lcom/discord/stores/StoreApplicationNews$NewsItemState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$onConfigure$2.smali
index 1683502f91..e13395ab80 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$onConfigure$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews$onConfigure$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews.smali
index 9a4058d3f1..4fe005be94 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemApplicationNews.smali
@@ -15,7 +15,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00f3
+    const v0, 0x7f0d00fc
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -104,7 +104,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v7, Lcom/discord/views/ApplicationNewsView$a$b;->Ba:Lcom/discord/views/ApplicationNewsView$a$b;
+    sget-object v7, Lcom/discord/views/ApplicationNewsView$a$b;->Bj:Lcom/discord/views/ApplicationNewsView$a$b;
 
     move-object v8, v7
 
@@ -192,15 +192,15 @@
 
     invoke-static {v8, v9}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->AQ:Landroid/view/ViewGroup;
+    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->AZ:Landroid/view/ViewGroup;
 
     invoke-virtual {v9, v5}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->AV:Landroid/widget/ImageView;
+    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->Be:Landroid/widget/ImageView;
 
     invoke-virtual {v9, v6}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->AW:Landroid/view/ViewGroup;
+    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->Bf:Landroid/view/ViewGroup;
 
     invoke-virtual {v9, v6}, Landroid/view/ViewGroup;->setVisibility(I)V
 
@@ -210,13 +210,13 @@
 
     invoke-virtual {v6, v10}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v6, v2, Lcom/discord/views/ApplicationNewsView;->AB:Landroid/widget/TextView;
+    iget-object v6, v2, Lcom/discord/views/ApplicationNewsView;->AM:Landroid/widget/TextView;
 
     check-cast v7, Ljava/lang/CharSequence;
 
     invoke-virtual {v6, v7}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v6, v2, Lcom/discord/views/ApplicationNewsView;->AS:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v6, v2, Lcom/discord/views/ApplicationNewsView;->Bb:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-object v11, v6
 
@@ -240,7 +240,7 @@
 
     invoke-static/range {v11 .. v19}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
-    iget-object v6, v2, Lcom/discord/views/ApplicationNewsView;->AS:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v6, v2, Lcom/discord/views/ApplicationNewsView;->Bb:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     check-cast v6, Landroid/view/View;
 
@@ -255,7 +255,7 @@
 
     invoke-virtual {v2, v8}, Lcom/discord/views/ApplicationNewsView;->a(Lcom/discord/views/ApplicationNewsView$a;)V
 
-    iget-object v4, v2, Lcom/discord/views/ApplicationNewsView;->AU:Landroid/widget/TextView;
+    iget-object v4, v2, Lcom/discord/views/ApplicationNewsView;->Bd:Landroid/widget/TextView;
 
     check-cast v3, Ljava/lang/CharSequence;
 
@@ -276,27 +276,27 @@
 
     if-eqz v3, :cond_4
 
-    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->AQ:Landroid/view/ViewGroup;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->AZ:Landroid/view/ViewGroup;
 
     invoke-virtual {v1, v6}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->AV:Landroid/widget/ImageView;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Be:Landroid/widget/ImageView;
 
     invoke-virtual {v1, v5}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->AW:Landroid/view/ViewGroup;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Bf:Landroid/view/ViewGroup;
 
     invoke-virtual {v1, v6}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->AS:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Bb:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {v1, v4}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
 
-    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->AS:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Bb:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {v1, v5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
 
-    sget-object v1, Lcom/discord/views/ApplicationNewsView$a$b;->Ba:Lcom/discord/views/ApplicationNewsView$a$b;
+    sget-object v1, Lcom/discord/views/ApplicationNewsView$a$b;->Bj:Lcom/discord/views/ApplicationNewsView$a$b;
 
     check-cast v1, Lcom/discord/views/ApplicationNewsView$a;
 
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 efbd98f924..3ebe7b34c9 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model$createRenderContext$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 1214812a67..2830be6569 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
@@ -627,7 +627,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->attachmentEntry:Lcom/discord/widgets/chat/list/entries/AttachmentEntry;
 
@@ -698,15 +698,11 @@
 
     iget-wide v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->myId:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
 .end method
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 dca58866a8..817f0b7236 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$1;->invoke(Landroid/view/ViewPropertyAnimator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 83f9f9d11c..9c9f4c1ed9 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$2;->invoke(Landroid/view/ViewPropertyAnimator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 607792d7f6..8a7b861918 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment.smali
@@ -248,41 +248,17 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00f4
+    const v0, 0x7f0d00fd
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a01e6
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->imagePreview$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a01e7
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->imageOverlay$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a01e2
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->card$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a01e5
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->fileIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->imagePreview$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a01e8
 
@@ -290,7 +266,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->fileName$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->imageOverlay$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a01e3
 
@@ -298,7 +274,23 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->fileDescription$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->card$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a01e6
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->fileIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a01e9
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->fileName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a01e4
 
@@ -306,9 +298,17 @@
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->fileDescription$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a01e5
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->fileDownload$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01e9
+    const p1, 0x7f0a01ea
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
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 79d034f7d0..884be446c8 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali
@@ -55,11 +55,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00f5
+    const v0, 0x7f0d00fe
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const v0, 0x7f0a01d2
+    const v0, 0x7f0a01d3
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -111,14 +111,14 @@
 
     move-result-object v0
 
+    const-string v1, "getQuantityString(quantityResId, blockedCount)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v1, 0x1
 
     new-array v2, v1, [Ljava/lang/Object;
 
-    const-string v3, "quantityResString"
-
-    invoke-static {v0, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     new-array v3, v1, [Ljava/lang/Object;
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -143,7 +143,7 @@
 
     aput-object p2, v2, v4
 
-    const p2, 0x7f12031a
+    const p2, 0x7f12031f
 
     invoke-virtual {p1, p2, v2}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
index 20625795a0..dd4411e786 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
@@ -27,7 +27,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a01d6
+    const p2, 0x7f0a01d7
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -39,7 +39,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a01d7
+    const p2, 0x7f0a01d8
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -51,7 +51,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a01d8
+    const p2, 0x7f0a01d9
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -201,7 +201,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->statusIcon:Landroid/widget/ImageView;
 
-    const v2, 0x7f080205
+    const v2, 0x7f080214
 
     invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -210,7 +210,7 @@
     :cond_1
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->statusIcon:Landroid/widget/ImageView;
 
-    const v2, 0x7f080207
+    const v2, 0x7f080216
 
     invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -256,7 +256,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f1210da
+    const v3, 0x7f12111c
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -277,7 +277,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f1210d9
+    const v3, 0x7f12111b
 
     new-array v2, v2, [Ljava/lang/Object;
 
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 9b5af4b658..804d5e1519 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1;->invoke(Landroid/widget/TextView;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 94fe31f229..720ea1d622 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
@@ -213,7 +213,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
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 e6bccd1d97..d71ec3e3da 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
@@ -422,7 +422,7 @@
 
     move-result v3
 
-    invoke-static {v2, v3}, Lkotlin/ranges/c;->aa(II)I
+    invoke-static {v2, v3}, Lkotlin/ranges/c;->Z(II)I
 
     move-result v2
 
@@ -434,7 +434,7 @@
 
     invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lkotlin/text/l;->dU(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v0}, Lkotlin/text/l;->dO(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v0
 
@@ -566,7 +566,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-static {}, Lrx/Observable;->Ka()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->JN()Lrx/Observable;
 
     move-result-object p1
 
@@ -685,7 +685,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object 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 1c0d6a043d..9dcba0921f 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$createRenderContext$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 acc2caa7ba..a3fb79849b 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
@@ -292,7 +292,7 @@
 
     check-cast p4, Lcom/discord/simpleast/core/b/b;
 
-    invoke-static {p5, p4}, Lcom/discord/simpleast/core/b/a;->b(Ljava/util/Collection;Lcom/discord/simpleast/core/b/b;)V
+    invoke-static {p5, p4}, Lcom/discord/simpleast/core/b/a;->a(Ljava/util/Collection;Lcom/discord/simpleast/core/b/b;)V
     :try_end_0
     .catch Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$MatchFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1113,7 +1113,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->embedEntry:Lcom/discord/widgets/chat/list/entries/EmbedEntry;
 
@@ -1220,15 +1220,11 @@
 
     iget-wide v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->myId:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
 .end method
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 3e91930e17..ad824a0bb8 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
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedDescription$1;->invoke(Lcom/discord/utilities/textprocessing/node/SpoilerNode;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 55ee59307b..5cde9adf5c 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
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1$1;->invoke(Lcom/discord/utilities/textprocessing/node/SpoilerNode;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 0d3bd3d278..1fb434f781 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
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1;->invoke(Lcom/discord/utilities/textprocessing/node/SpoilerNode;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 e062594296..1cb40a10bd 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$1;->invoke(Landroid/view/ViewPropertyAnimator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 4fe555722e..c5cd70c8b5 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$2;->invoke(Landroid/view/ViewPropertyAnimator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 c394082358..33d81daec6 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 89b7a61ca1..c9b2d2285c 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$3;->invoke(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 9393ef46b2..9b93701987 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed.smali
@@ -458,11 +458,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00f7
+    const v0, 0x7f0d0100
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a01fc
+    const p1, 0x7f0a01fd
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -470,7 +470,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedProvider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01fe
+    const p1, 0x7f0a01ff
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -478,7 +478,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01ed
+    const p1, 0x7f0a01ee
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -486,7 +486,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedAuthorIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01ee
+    const p1, 0x7f0a01ef
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -494,7 +494,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedAuthorText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01f2
+    const p1, 0x7f0a01f3
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -502,7 +502,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedDescription$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01f6
+    const p1, 0x7f0a01f7
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -510,7 +510,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedFields$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a02a8
+    const p1, 0x7f0a02b1
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -518,7 +518,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedImageContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01f9
+    const p1, 0x7f0a01fa
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -526,7 +526,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01fa
+    const p1, 0x7f0a01fb
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -534,7 +534,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedImageIcons$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01fb
+    const p1, 0x7f0a01fc
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -542,7 +542,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedImageThumbnail$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01f3
+    const p1, 0x7f0a01f4
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -550,7 +550,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01f7
+    const p1, 0x7f0a01f8
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -558,7 +558,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedFooterIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01f8
+    const p1, 0x7f0a01f9
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -566,7 +566,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedFooterText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01fd
+    const p1, 0x7f0a01fe
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -628,7 +628,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f0700b5
+    const v1, 0x7f0700b6
 
     invoke-virtual {p1, v1}, Landroid/content/res/Resources;->getDimension(I)F
 
@@ -646,7 +646,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f0700b4
+    const v1, 0x7f0700b5
 
     invoke-virtual {p1, v1}, Landroid/content/res/Resources;->getDimension(I)F
 
@@ -1052,7 +1052,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f04035d
+    const v1, 0x7f040360
 
     invoke-static {p1, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -1188,7 +1188,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f0d00f8
+    const v5, 0x7f0d0101
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->getEmbedFields()Landroid/view/ViewGroup;
 
@@ -1219,7 +1219,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f0a01f4
+    const v7, 0x7f0a01f5
 
     invoke-virtual {v4, v7}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1253,7 +1253,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f0a01f5
+    const v7, 0x7f0a01f6
 
     invoke-virtual {v4, v7}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1747,7 +1747,7 @@
 
     check-cast v3, Landroid/view/View;
 
-    const v4, 0x7f06008a
+    const v4, 0x7f06008d
 
     invoke-static {v3, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
@@ -1762,7 +1762,7 @@
 
     check-cast v3, Landroid/view/View;
 
-    const v4, 0x7f040292
+    const v4, 0x7f040295
 
     invoke-static {v3, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -2243,7 +2243,7 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     move-object v4, p1
 
@@ -2819,7 +2819,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object p1
 
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 54b02b8f75..8f43f1b068 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins.smali
@@ -11,13 +11,13 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d00f9
+    const v0, 0x7f0d0102
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a01e0
+    const v0, 0x7f0a01e1
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion.smali
index 9d1e2e1eb4..619044c4c6 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion.smali
@@ -148,7 +148,7 @@
 
     move-result v4
 
-    invoke-static {p2, v4}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {p2, v4}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object p2
 
@@ -284,7 +284,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2.smali
index 9d1f1cad67..d7d6a52592 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2;->invoke(Lcom/facebook/imagepipeline/request/ImageRequestBuilder;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -81,7 +81,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/request/c;
 
-    invoke-virtual {p1, v0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->a(Lcom/facebook/imagepipeline/request/c;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     return-void
 .end method
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 4311a1518d..f3239e5f33 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->invoke(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 89230685b6..58bd310cac 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 58cb0c4715..8a33f6aac6 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
@@ -98,13 +98,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00fb
+    const v0, 0x7f0d0104
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a03cd
+    const v0, 0x7f0a03dd
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -120,7 +120,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a03cf
+    const v0, 0x7f0a03df
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -136,7 +136,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a03cb
+    const v0, 0x7f0a03db
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -152,7 +152,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a03cc
+    const v0, 0x7f0a03dc
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -168,7 +168,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a03ce
+    const v0, 0x7f0a03de
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -426,7 +426,7 @@
 
     if-eqz v1, :cond_4
 
-    const v6, 0x7f1209d9
+    const v6, 0x7f1209fc
 
     goto :goto_3
 
@@ -445,19 +445,19 @@
 
     if-ne v9, v8, :cond_5
 
-    const v6, 0x7f1209ea
+    const v6, 0x7f120a0d
 
     goto :goto_3
 
     :cond_5
     if-eqz v6, :cond_6
 
-    const v6, 0x7f1209d7
+    const v6, 0x7f1209fa
 
     goto :goto_3
 
     :cond_6
-    const v6, 0x7f1209e2
+    const v6, 0x7f120a05
 
     :goto_3
     invoke-virtual {v7, v6}, Landroid/widget/TextView;->setText(I)V
@@ -691,12 +691,12 @@
 
     if-eq v0, v1, :cond_0
 
-    const v0, 0x7f1209de
+    const v0, 0x7f120a01
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1209e0
+    const v0, 0x7f120a03
 
     :goto_0
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)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 983b1d966d..24b004da6f 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
@@ -157,7 +157,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid;->gifterUserId:Ljava/lang/Long;
 
@@ -177,15 +177,11 @@
 
     iget-wide v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid;->meId:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
 .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 1e90da5139..19e9e20f95 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
@@ -118,7 +118,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
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 dd5239839b..314dd1ae5e 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1;->invoke(Lcom/facebook/imagepipeline/request/ImageRequestBuilder;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -81,7 +81,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/request/c;
 
-    invoke-virtual {p1, v0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->a(Lcom/facebook/imagepipeline/request/c;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     return-void
 .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 bb43b6cbf1..a3e0d9a968 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
@@ -47,7 +47,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
     const-string v1, "it"
 
@@ -65,7 +65,7 @@
 
     const/4 v2, 0x2
 
-    invoke-static {v0, p1, v1, v2, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;->launch$default(Lcom/discord/widgets/settings/nitro/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
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$1.smali
index f33875f8c8..b255fb56c5 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$1.smali
@@ -41,7 +41,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    sget-object p1, Lcom/discord/a/c;->wH:Lcom/discord/a/c$a;
+    sget-object p1, Lcom/discord/dialogs/e;->wR:Lcom/discord/dialogs/e$a;
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$1;->$model:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;
 
@@ -65,7 +65,7 @@
 
     const-string v2, "Embed"
 
-    invoke-static {p1, v2, v0, v1}, Lcom/discord/a/c$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
+    invoke-static {p1, v2, v0, v1}, Lcom/discord/dialogs/e$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
 
     return-void
 .end method
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 d8b692cd4b..9ae6629f9d 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$1;->invoke(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 4b99cf7323..7e2793e357 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 da553f954d..ded4f3f5c9 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$3;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 656e28e0d0..85d5c46b95 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
@@ -327,11 +327,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00fc
+    const v0, 0x7f0d0105
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a03d4
+    const p1, 0x7f0a03e4
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -339,7 +339,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03d8
+    const p1, 0x7f0a03e8
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -347,7 +347,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->nameText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03d5
+    const p1, 0x7f0a03e5
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -355,7 +355,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03d6
+    const p1, 0x7f0a03e6
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -363,7 +363,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->imageBackground$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03d3
+    const p1, 0x7f0a03e3
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -371,7 +371,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->expiresText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03d9
+    const p1, 0x7f0a03e9
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -379,7 +379,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->subText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03d0
+    const p1, 0x7f0a03e0
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -387,7 +387,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->acceptButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03da
+    const p1, 0x7f0a03ea
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -395,7 +395,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->verifyButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03d1
+    const p1, 0x7f0a03e1
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -403,7 +403,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->cannotClaimButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03d7
+    const p1, 0x7f0a03e7
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -471,7 +471,7 @@
 
     const-string v0, "item"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -590,7 +590,7 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f12077f
+    const p1, 0x7f12079a
 
     invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -601,7 +601,7 @@
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f12077e
+    const p1, 0x7f120799
 
     invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -616,7 +616,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f12077b
+    const v2, 0x7f120796
 
     invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(I)V
 
@@ -624,7 +624,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f06011b
+    const v2, 0x7f06011d
 
     invoke-static {v0, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -644,9 +644,9 @@
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p1, 0x7f0401e3
+    const p1, 0x7f0401e5
 
-    const v2, 0x7f080425
+    const v2, 0x7f080440
 
     invoke-static {v0, p1, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I
 
@@ -714,7 +714,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120780
+    const v2, 0x7f12079b
 
     invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V
 
@@ -730,7 +730,7 @@
 
     move-result-object v1
 
-    const v3, 0x7f040292
+    const v3, 0x7f040295
 
     invoke-static {v0, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -742,7 +742,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f08010f
+    const v1, 0x7f080116
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setBackgroundResource(I)V
 
@@ -898,7 +898,7 @@
 
     if-eqz v9, :cond_2
 
-    sget-object v9, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+    sget-object v9, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getMeUser()Lcom/discord/models/domain/ModelUser;
 
@@ -908,7 +908,7 @@
 
     move-result-object v11
 
-    invoke-virtual {v9, v10, v11}, Lcom/discord/utilities/nitro/NitroUtils;->isAcceptableNitroGift(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGift;)Z
+    invoke-virtual {v9, v10, v11}, Lcom/discord/utilities/premium/PremiumUtils;->isAcceptableNitroGift(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGift;)Z
 
     move-result v9
 
@@ -1054,9 +1054,9 @@
 
     invoke-static {v2, v11}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f04014e
+    const v3, 0x7f040150
 
-    const v12, 0x7f080417
+    const v12, 0x7f080431
 
     invoke-static {v2, v3, v12}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I
 
@@ -1129,7 +1129,7 @@
 
     if-eqz v4, :cond_8
 
-    const v4, 0x7f120783
+    const v4, 0x7f12079e
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1140,7 +1140,7 @@
     goto :goto_7
 
     :cond_8
-    const v4, 0x7f120782
+    const v4, 0x7f12079d
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1189,7 +1189,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f040292
+    const v4, 0x7f040295
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -1279,7 +1279,7 @@
 
     aput-object v4, v13, v6
 
-    const v4, 0x7f120776
+    const v4, 0x7f120791
 
     invoke-virtual {v2, v4, v13}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1306,13 +1306,13 @@
 
     check-cast v3, Landroid/widget/ImageView;
 
-    sget-object v4, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+    sget-object v4, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
 
     move-result-object v5
 
-    invoke-virtual {v4, v5}, Lcom/discord/utilities/nitro/NitroUtils;->getNitroGiftIcon(Lcom/discord/models/domain/ModelGift;)I
+    invoke-virtual {v4, v5}, Lcom/discord/utilities/premium/PremiumUtils;->getNitroGiftIcon(Lcom/discord/models/domain/ModelGift;)I
 
     move-result v4
 
@@ -1420,7 +1420,7 @@
 
     if-nez v3, :cond_f
 
-    const v3, 0x7f12072d
+    const v3, 0x7f120748
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1449,7 +1449,7 @@
     :cond_f
     if-eqz v7, :cond_10
 
-    const v3, 0x7f12075e
+    const v3, 0x7f120779
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1460,7 +1460,7 @@
     :cond_10
     if-eqz v9, :cond_11
 
-    const v3, 0x7f12073a
+    const v3, 0x7f120756
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1475,7 +1475,7 @@
 
     if-eqz v3, :cond_12
 
-    const v3, 0x7f12072c
+    const v3, 0x7f120747
 
     const/4 v8, 0x1
 
@@ -1510,7 +1510,7 @@
     :cond_12
     if-eqz v8, :cond_13
 
-    const v3, 0x7f12072b
+    const v3, 0x7f120746
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1580,7 +1580,7 @@
 
     if-eqz v9, :cond_16
 
-    const v4, 0x7f120771
+    const v4, 0x7f12078c
 
     goto :goto_e
 
@@ -1591,7 +1591,7 @@
 
     if-eqz v4, :cond_17
 
-    const v4, 0x7f120773
+    const v4, 0x7f12078e
 
     goto :goto_e
 
@@ -1604,12 +1604,12 @@
 
     if-eqz v4, :cond_18
 
-    const v4, 0x7f120774
+    const v4, 0x7f12078f
 
     goto :goto_e
 
     :cond_18
-    const v4, 0x7f120772
+    const v4, 0x7f12078d
 
     :goto_e
     invoke-virtual {v3, v4}, Landroid/widget/Button;->setText(I)V
@@ -1986,7 +1986,7 @@
 
     const-string v0, "item"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider;->get(Lcom/discord/widgets/chat/list/entries/GiftEntry;)Lrx/Observable;
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 bc604f386c..3822e5ce7a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
@@ -127,11 +127,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00fd
+    const v0, 0x7f0d0106
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a03dc
+    const p1, 0x7f0a03ec
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -139,7 +139,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03dd
+    const p1, 0x7f0a03ed
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -147,7 +147,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;->subheader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0809
+    const p1, 0x7f0a0847
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -155,7 +155,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;->addIconOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0808
+    const p1, 0x7f0a0846
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -306,7 +306,7 @@
 
     check-cast v3, Landroid/view/View;
 
-    const v6, 0x7f12130e
+    const v6, 0x7f121361
 
     new-array v7, v4, [Ljava/lang/Object;
 
@@ -327,7 +327,7 @@
 
     check-cast v3, Landroid/view/View;
 
-    const v6, 0x7f121313
+    const v6, 0x7f121366
 
     new-array v7, v4, [Ljava/lang/Object;
 
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 842c719a91..0a593376a0 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
@@ -194,7 +194,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 6
+    .locals 4
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid;->authorUser:Lcom/discord/models/domain/ModelUser;
 
@@ -216,15 +216,11 @@
 
     iget-wide v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid;->meId:J
 
-    const/16 v4, 0x20
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v4, v2, v4
+    move-result v2
 
-    xor-long/2addr v2, v4
-
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
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 e940117af3..292d7418fe 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
@@ -306,7 +306,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 6
+    .locals 4
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;->invite:Lcom/discord/models/domain/ModelInvite;
 
@@ -328,15 +328,11 @@
 
     iget-wide v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;->meId:J
 
-    const/16 v4, 0x20
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v4, v2, v4
+    move-result v2
 
-    xor-long/2addr v2, v4
-
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
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 d58e6e4fbd..7aa5c8ce6a 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
@@ -185,7 +185,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v1
 
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 4a8b3d4046..4182cd8192 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1$1;->invoke(Lcom/discord/models/domain/ModelInvite;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 a7c579874b..ca60126130 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, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1;->$context:Landroid/content/Context;
 
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 d6ff1360ae..61d47f2f94 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$1;->invoke(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 3bbb4df71f..c4cc78d599 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 b1ce70126d..8d7b0dd553 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$3;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 553e3e982d..5d83b80449 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
@@ -356,11 +356,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00fe
+    const v0, 0x7f0d0107
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a03e2
+    const p1, 0x7f0a03f2
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -368,7 +368,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->headerText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03ea
+    const p1, 0x7f0a03fa
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -376,7 +376,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->nameText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03e3
+    const p1, 0x7f0a03f3
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -384,7 +384,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03e4
+    const p1, 0x7f0a03f4
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -392,7 +392,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->imageText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03ec
+    const p1, 0x7f0a03fc
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -400,7 +400,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->onlineMemberText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03ee
+    const p1, 0x7f0a03fe
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -408,7 +408,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->totalMemberText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03e5
+    const p1, 0x7f0a03f5
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -416,7 +416,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->joinButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03e6
+    const p1, 0x7f0a03f6
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -424,7 +424,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->joinedButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03e9
+    const p1, 0x7f0a03f9
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -432,7 +432,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->mentionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03e7
+    const p1, 0x7f0a03f7
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -440,7 +440,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->loadingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03e8
+    const p1, 0x7f0a03f8
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -448,7 +448,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->memberContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03eb
+    const p1, 0x7f0a03fb
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -456,7 +456,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->onlineDot$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03ed
+    const p1, 0x7f0a03fd
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -492,7 +492,7 @@
 
     const-string v0, "item"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -593,7 +593,7 @@
 
     if-eqz v2, :cond_2
 
-    const v4, 0x7f1209d1
+    const v4, 0x7f1209f3
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -604,7 +604,7 @@
     goto :goto_2
 
     :cond_2
-    const v4, 0x7f1209cd
+    const v4, 0x7f1209ee
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -619,7 +619,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f1209c1
+    const v4, 0x7f1209e2
 
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(I)V
 
@@ -627,7 +627,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f06011b
+    const v4, 0x7f06011d
 
     invoke-static {v0, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -647,7 +647,7 @@
 
     move-result-object v3
 
-    const v5, 0x7f080431
+    const v5, 0x7f08044c
 
     invoke-virtual {v3, v5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setActualImageResource(I)V
 
@@ -675,7 +675,7 @@
     :goto_3
     if-eqz v3, :cond_4
 
-    const v3, 0x7f12098b
+    const v3, 0x7f1209ab
 
     const/4 v6, 0x1
 
@@ -714,7 +714,7 @@
     :goto_4
     if-nez v3, :cond_6
 
-    const v3, 0x7f12098a
+    const v3, 0x7f1209aa
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -725,7 +725,7 @@
     :cond_6
     if-eqz v2, :cond_7
 
-    const v3, 0x7f1209c2
+    const v3, 0x7f1209e3
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -775,7 +775,7 @@
 
     if-eqz v2, :cond_8
 
-    const v3, 0x7f120460
+    const v3, 0x7f12046a
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -786,7 +786,7 @@
     goto :goto_6
 
     :cond_8
-    const v3, 0x7f120b3d
+    const v3, 0x7f120b6e
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -853,7 +853,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f1209a4
+    const v2, 0x7f1209c5
 
     invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V
 
@@ -869,7 +869,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f040292
+    const v2, 0x7f040295
 
     invoke-static {v0, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -881,7 +881,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f08010f
+    const v1, 0x7f080116
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setBackgroundResource(I)V
 
@@ -1061,7 +1061,7 @@
 
     if-eqz v2, :cond_4
 
-    const v2, 0x7f1209d0
+    const v2, 0x7f1209f2
 
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1072,7 +1072,7 @@
     :cond_4
     if-eqz v2, :cond_5
 
-    const v2, 0x7f1209cf
+    const v2, 0x7f1209f1
 
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1085,7 +1085,7 @@
 
     if-nez v2, :cond_6
 
-    const v2, 0x7f1209cc
+    const v2, 0x7f1209ed
 
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1102,7 +1102,7 @@
 
     if-eqz v2, :cond_8
 
-    const v2, 0x7f1209a8
+    const v2, 0x7f1209c9
 
     new-array v3, v8, [Ljava/lang/Object;
 
@@ -1131,13 +1131,17 @@
     goto :goto_5
 
     :cond_8
-    const v2, 0x7f1209cb
+    const v2, 0x7f1209ec
 
     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    }"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->getHeaderText()Lcom/discord/app/AppTextView;
 
     move-result-object v3
@@ -1189,7 +1193,7 @@
 
     move-result-object v2
 
-    const v11, 0x7f040292
+    const v11, 0x7f040295
 
     invoke-static {v7, v11}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -1223,7 +1227,7 @@
 
     move-result-object v13
 
-    const v14, 0x7f070057
+    const v14, 0x7f070056
 
     const/4 v15, 0x0
 
@@ -1264,7 +1268,7 @@
 
     move-result-object v13
 
-    const v14, 0x7f070057
+    const v14, 0x7f070056
 
     const/4 v15, 0x0
 
@@ -1380,7 +1384,7 @@
 
     move-result-object v11
 
-    const v12, 0x7f120997
+    const v12, 0x7f1209b7
 
     new-array v13, v8, [Ljava/lang/Object;
 
@@ -1952,7 +1956,7 @@
 
     const-string v0, "item"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider;->get(Lcom/discord/widgets/chat/list/entries/InviteEntry;)Lrx/Observable;
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 8ef19542d0..abf396efb0 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 v4
 
-    invoke-static {p2, v4}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {p2, v4}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object p2
 
@@ -284,7 +284,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 d00135f2ed..01be64df01 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$1;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 5e29202c38..50076d7496 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$2;->invoke(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 06cbb88504..6e26d2b3b9 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali
@@ -250,11 +250,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00ff
+    const v0, 0x7f0d0108
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a03f2
+    const p1, 0x7f0a0402
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -262,7 +262,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->inviteText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03f6
+    const p1, 0x7f0a0406
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -270,7 +270,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->trackText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03f0
+    const p1, 0x7f0a0400
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -278,7 +278,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->artistText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03ef
+    const p1, 0x7f0a03ff
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -286,7 +286,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->albumImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03f5
+    const p1, 0x7f0a0405
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -294,7 +294,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->endedText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03f4
+    const p1, 0x7f0a0404
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -302,7 +302,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->recyclerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03f1
+    const p1, 0x7f0a0401
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -404,7 +404,7 @@
 
     aput-object v5, v4, v6
 
-    const v5, 0x7f1209df
+    const v5, 0x7f120a02
 
     invoke-virtual {v2, v5, v4}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -544,7 +544,7 @@
 
     move-result-object v5
 
-    const v7, 0x7f12120f
+    const v7, 0x7f121255
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -706,12 +706,16 @@
     return-object v0
 
     :cond_0
-    const p2, 0x7f1205ff
+    const p2, 0x7f12060b
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
+    const-string p2, "context.getString(R.stri\u2026.form_label_desktop_only)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-object p1
 .end method
 
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 8995b2a985..b0a82d6962 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter.smali
@@ -13,13 +13,13 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0101
+    const v0, 0x7f0d010a
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a01ff
+    const v0, 0x7f0a0200
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -29,7 +29,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a074d
+    const v0, 0x7f0a0776
 
     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 313839dea0..145580a5e4 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
@@ -77,7 +77,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a01d9
+    const v0, 0x7f0a01da
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -89,7 +89,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a01da
+    const v0, 0x7f0a01db
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -101,7 +101,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a01dd
+    const v0, 0x7f0a01de
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -113,7 +113,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a01db
+    const v0, 0x7f0a01dc
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -123,7 +123,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a01d3
+    const v0, 0x7f0a01d4
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -133,7 +133,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a01de
+    const v0, 0x7f0a01df
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -232,7 +232,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f04036c
+    const v1, 0x7f04036f
 
     invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -303,7 +303,7 @@
 
     invoke-virtual {v0, v1, v2, p0}, Lcom/discord/stores/StoreMessageState;->revealSpoiler(JI)V
 
-    sget-object p0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p0
 .end method
@@ -387,7 +387,7 @@
 
     invoke-static {p0, p1}, Lcom/discord/utilities/uri/UriHandler;->handle(Landroid/content/Context;Ljava/lang/String;)V
 
-    sget-object p0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p0
 .end method
@@ -488,7 +488,7 @@
 
     invoke-interface {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;->onUrlLongClicked(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -622,7 +622,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f07005b
+    const v0, 0x7f07005a
 
     invoke-static {p2, p1, v0}, Lcom/discord/utilities/icon/IconUtils;->setIcon(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;I)V
 
@@ -731,7 +731,7 @@
 
     new-instance v3, Landroid/text/style/ForegroundColorSpan;
 
-    const v4, 0x7f040373
+    const v4, 0x7f040376
 
     invoke-static {v15, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -824,7 +824,7 @@
 
     move-result-object v9
 
-    const v16, 0x7f06008a
+    const v16, 0x7f06008d
 
     sget-object v17, Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$60jxcMRoqFWr9QV1VXHiEYdL9tA;->INSTANCE:Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$60jxcMRoqFWr9QV1VXHiEYdL9tA;
 
@@ -832,13 +832,13 @@
 
     invoke-direct {v3, v0}, Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$lARKCYE9aP17zPkRmIJzvvjOQYQ;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;)V
 
-    const v2, 0x7f04036f
+    const v2, 0x7f040372
 
     invoke-static {v15, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
     move-result v18
 
-    const v2, 0x7f040370
+    const v2, 0x7f040373
 
     invoke-static {v15, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -1016,7 +1016,7 @@
     :cond_8
     if-eqz v2, :cond_9
 
-    const v2, 0x7f04036b
+    const v2, 0x7f04036e
 
     move-object/from16 v3, v23
 
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 efe344e11d..5c2214285d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader.smali
@@ -17,13 +17,13 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0102
+    const v0, 0x7f0d010b
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0204
+    const v0, 0x7f0a0205
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -33,7 +33,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0202
+    const v0, 0x7f0a0203
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -43,7 +43,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0201
+    const v0, 0x7f0a0202
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -55,7 +55,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0203
+    const v0, 0x7f0a0204
 
     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 8245e2dd5d..b0fb700df3 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
@@ -103,25 +103,17 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d010d
+    const v0, 0x7f0d0116
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a01ea
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages;->dividerLeft$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a01eb
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages;->dividerRight$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages;->dividerLeft$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a01ec
 
@@ -129,6 +121,14 @@
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages;->dividerRight$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a01ed
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages;->text$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages;->getDividerLeft()Landroid/view/View;
@@ -139,7 +139,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f06011b
+    const v1, 0x7f06011d
 
     invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
@@ -189,7 +189,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120b9e
+    const v1, 0x7f120bd0
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 0bd98a0ecd..1dcbb71da0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions.smali
@@ -17,13 +17,13 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0104
+    const v0, 0x7f0d010d
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemReactions;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0205
+    const v0, 0x7f0a0206
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -51,7 +51,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d005b
+    const v1, 0x7f0d005d
 
     const/4 v2, 0x0
 
@@ -175,13 +175,13 @@
 
     invoke-virtual {v5, v6}, Lcom/discord/views/i;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object v6, v5, Lcom/discord/views/i;->CK:Ljava/lang/Long;
+    iget-object v6, v5, Lcom/discord/views/i;->CU:Ljava/lang/Long;
 
     const/4 v7, 0x1
 
     if-eqz v6, :cond_4
 
-    iget-object v6, v5, Lcom/discord/views/i;->CK:Ljava/lang/Long;
+    iget-object v6, v5, Lcom/discord/views/i;->CU:Ljava/lang/Long;
 
     invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
 
@@ -207,13 +207,13 @@
 
     move-result v8
 
-    iget v9, v5, Lcom/discord/views/i;->CJ:I
+    iget v9, v5, Lcom/discord/views/i;->CT:I
 
     if-eq v8, v9, :cond_7
 
     if-eqz v6, :cond_5
 
-    iget-object v6, v5, Lcom/discord/views/i;->CG:Landroid/widget/TextSwitcher;
+    iget-object v6, v5, Lcom/discord/views/i;->CQ:Landroid/widget/TextSwitcher;
 
     invoke-static {v8}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
@@ -224,23 +224,23 @@
     goto :goto_6
 
     :cond_5
-    iget-object v6, v5, Lcom/discord/views/i;->CG:Landroid/widget/TextSwitcher;
+    iget-object v6, v5, Lcom/discord/views/i;->CQ:Landroid/widget/TextSwitcher;
 
     invoke-virtual {v6}, Landroid/widget/TextSwitcher;->getContext()Landroid/content/Context;
 
     move-result-object v6
 
-    iget v9, v5, Lcom/discord/views/i;->CJ:I
+    iget v9, v5, Lcom/discord/views/i;->CT:I
 
     if-le v8, v9, :cond_6
 
-    iget-object v9, v5, Lcom/discord/views/i;->CG:Landroid/widget/TextSwitcher;
+    iget-object v9, v5, Lcom/discord/views/i;->CQ:Landroid/widget/TextSwitcher;
 
     const v10, 0x7f01002a
 
     invoke-virtual {v9, v6, v10}, Landroid/widget/TextSwitcher;->setInAnimation(Landroid/content/Context;I)V
 
-    iget-object v9, v5, Lcom/discord/views/i;->CG:Landroid/widget/TextSwitcher;
+    iget-object v9, v5, Lcom/discord/views/i;->CQ:Landroid/widget/TextSwitcher;
 
     const v10, 0x7f01002c
 
@@ -249,20 +249,20 @@
     goto :goto_5
 
     :cond_6
-    iget-object v9, v5, Lcom/discord/views/i;->CG:Landroid/widget/TextSwitcher;
+    iget-object v9, v5, Lcom/discord/views/i;->CQ:Landroid/widget/TextSwitcher;
 
     const v10, 0x7f010029
 
     invoke-virtual {v9, v6, v10}, Landroid/widget/TextSwitcher;->setInAnimation(Landroid/content/Context;I)V
 
-    iget-object v9, v5, Lcom/discord/views/i;->CG:Landroid/widget/TextSwitcher;
+    iget-object v9, v5, Lcom/discord/views/i;->CQ:Landroid/widget/TextSwitcher;
 
     const v10, 0x7f01002b
 
     invoke-virtual {v9, v6, v10}, Landroid/widget/TextSwitcher;->setOutAnimation(Landroid/content/Context;I)V
 
     :goto_5
-    iget-object v6, v5, Lcom/discord/views/i;->CG:Landroid/widget/TextSwitcher;
+    iget-object v6, v5, Lcom/discord/views/i;->CQ:Landroid/widget/TextSwitcher;
 
     invoke-static {v8}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
@@ -271,7 +271,7 @@
     invoke-virtual {v6, v9}, Landroid/widget/TextSwitcher;->setText(Ljava/lang/CharSequence;)V
 
     :goto_6
-    iput v8, v5, Lcom/discord/views/i;->CJ:I
+    iput v8, v5, Lcom/discord/views/i;->CT:I
 
     :cond_7
     iget-object v6, v5, Lcom/discord/views/i;->reaction:Lcom/discord/models/domain/ModelMessageReaction;
@@ -316,7 +316,7 @@
 
     move-result-object v4
 
-    iput-object v4, v5, Lcom/discord/views/i;->CK:Ljava/lang/Long;
+    iput-object v4, v5, Lcom/discord/views/i;->CU:Ljava/lang/Long;
 
     goto/16 :goto_1
 
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 c7718797a8..a55485e5da 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount.smali
@@ -11,13 +11,13 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0105
+    const v0, 0x7f0d010e
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0558
+    const v0, 0x7f0a0572
 
     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 e2e1f08405..e8fd9179e0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
@@ -55,11 +55,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d010a
+    const v0, 0x7f0d0113
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a01d4
+    const p1, 0x7f0a01d5
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -87,22 +87,22 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f12029d
-
-    return p1
-
-    :cond_0
-    const p1, 0x7f12029e
-
-    return p1
-
-    :cond_1
     const p1, 0x7f1202a1
 
     return p1
 
+    :cond_0
+    const p1, 0x7f1202a2
+
+    return p1
+
+    :cond_1
+    const p1, 0x7f1202a5
+
+    return p1
+
     :cond_2
-    const p1, 0x7f1202a0
+    const p1, 0x7f1202a4
 
     return p1
 .end method
@@ -168,7 +168,7 @@
 
     move-result-object p2
 
-    const-string v0, "startOfChatText"
+    const-string v0, "context.getString(getSta\u2026, canReadMessageHistory))"
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -195,12 +195,16 @@
 
     move-result-object p1
 
-    const v3, 0x7f1211b2
+    const v3, 0x7f1211f6
 
     invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
+    const-string v3, "context.getString(R.string.unnamed)"
+
+    invoke-static {p1, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     :goto_0
     const/4 v3, 0x0
 
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 55ec32da7d..8b7c9852b6 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
@@ -93,7 +93,7 @@
 
     const/4 v1, 0x3
 
-    const v2, 0x7f121107
+    const v2, 0x7f121149
 
     const/4 v3, 0x2
 
@@ -106,10 +106,10 @@
     :pswitch_0
     const-string p1, ""
 
-    return-object p1
+    goto/16 :goto_1
 
     :pswitch_1
-    const v0, 0x7f1210db
+    const v0, 0x7f12111d
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -129,7 +129,7 @@
 
     move-result-object p1
 
-    return-object p1
+    goto/16 :goto_1
 
     :pswitch_2
     new-array v0, v1, [Ljava/lang/Object;
@@ -142,7 +142,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f120df5
+    const v1, 0x7f120e2e
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -154,7 +154,7 @@
 
     move-result-object p1
 
-    return-object p1
+    goto/16 :goto_1
 
     :pswitch_3
     new-array v0, v1, [Ljava/lang/Object;
@@ -167,7 +167,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f120df4
+    const v1, 0x7f120e2d
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -179,7 +179,7 @@
 
     move-result-object p1
 
-    return-object p1
+    goto/16 :goto_1
 
     :pswitch_4
     new-array v0, v1, [Ljava/lang/Object;
@@ -192,7 +192,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f120df3
+    const v1, 0x7f120e2c
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -204,10 +204,10 @@
 
     move-result-object p1
 
-    return-object p1
+    goto/16 :goto_1
 
     :pswitch_5
-    const v0, 0x7f121106
+    const v0, 0x7f121148
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -219,7 +219,7 @@
 
     move-result-object p1
 
-    return-object p1
+    goto/16 :goto_1
 
     :pswitch_6
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$context:Landroid/content/Context;
@@ -244,10 +244,10 @@
 
     move-result-object p1
 
-    return-object p1
+    goto/16 :goto_1
 
     :pswitch_7
-    const v0, 0x7f12110a
+    const v0, 0x7f12114c
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -259,10 +259,10 @@
 
     move-result-object p1
 
-    return-object p1
+    goto/16 :goto_1
 
     :pswitch_8
-    const v0, 0x7f1210dc
+    const v0, 0x7f12111e
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -274,10 +274,10 @@
 
     move-result-object p1
 
-    return-object p1
+    goto :goto_1
 
     :pswitch_9
-    const v0, 0x7f1210dd
+    const v0, 0x7f12111f
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -297,7 +297,7 @@
 
     move-result-object p1
 
-    return-object p1
+    goto :goto_1
 
     :pswitch_a
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$otherUserId:Ljava/lang/Long;
@@ -329,7 +329,7 @@
 
     if-nez v0, :cond_1
 
-    const v0, 0x7f12110f
+    const v0, 0x7f121151
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -341,11 +341,11 @@
 
     move-result-object p1
 
-    return-object p1
+    goto :goto_1
 
     :cond_1
     :goto_0
-    const v0, 0x7f12110e
+    const v0, 0x7f121150
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -361,10 +361,10 @@
 
     move-result-object p1
 
-    return-object p1
+    goto :goto_1
 
     :pswitch_b
-    const v0, 0x7f12110d
+    const v0, 0x7f12114f
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -380,9 +380,12 @@
 
     move-result-object p1
 
-    return-object p1
+    :goto_1
+    const-string v0, "when (type) {\n      Mode\u2026t)\n      else -> \"\"\n    }"
 
-    nop
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
 
     :pswitch_data_0
     .packed-switch 0x1
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 90019e5726..cd152d72dc 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
@@ -103,25 +103,17 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d010b
+    const v0, 0x7f0d0114
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const v0, 0x7f0a01d6
-
-    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->statusIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const v0, 0x7f0a01d7
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->itemText$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->statusIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a01d8
 
@@ -129,6 +121,14 @@
 
     move-result-object v0
 
+    iput-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->itemText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a01d9
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
     iput-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->itemTimestamp$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$1;
@@ -173,11 +173,11 @@
 
     move-result p1
 
-    const v0, 0x7f080291
+    const v0, 0x7f0802a1
 
-    const v1, 0x7f080292
+    const v1, 0x7f0802a2
 
-    const v2, 0x7f08039a
+    const v2, 0x7f0803ac
 
     packed-switch p1, :pswitch_data_0
 
@@ -194,7 +194,7 @@
     return v1
 
     :pswitch_4
-    const p1, 0x7f08020f
+    const p1, 0x7f08021e
 
     return p1
 
@@ -202,7 +202,7 @@
     return v0
 
     :pswitch_6
-    const p1, 0x7f080293
+    const p1, 0x7f0802a3
 
     return p1
 
@@ -381,10 +381,6 @@
 
     move-result-object p1
 
-    const-string p2, "context.getString()"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     return-object p1
 .end method
 
@@ -469,7 +465,7 @@
 
     move-result-object p2
 
-    const v1, 0x7f04036c
+    const v1, 0x7f04036f
 
     invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -533,9 +529,9 @@
 
     invoke-direct {v1, v2, v3, v6}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sget-object v2, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eq()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eu()Ljava/util/regex/Pattern;
 
     move-result-object v2
 
@@ -557,9 +553,9 @@
 
     move-result-object p2
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ag:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Ap:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->et()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->ex()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
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 2e675a6e34..c0a3b540ef 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp.smali
@@ -103,25 +103,17 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d010d
+    const v0, 0x7f0d0116
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a01ea
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp;->dividerLeft$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a01eb
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp;->dividerRight$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp;->dividerLeft$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a01ec
 
@@ -129,6 +121,14 @@
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp;->dividerRight$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a01ed
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp;->text$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp;->getDividerLeft()Landroid/view/View;
@@ -139,7 +139,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f04035c
+    const v1, 0x7f04035f
 
     invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many.smali
index 49341ffaf0..0a86d4a401 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many.smali
@@ -206,28 +206,32 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many;->numFiles:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many;->sizeBytes:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many;->progress:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
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 9036c166f2..a4908f5e8d 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
@@ -196,6 +196,10 @@
 
     iget v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing;->numFiles:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing;->displayName:Ljava/lang/String;
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 d408ae0d04..aaaa9376d0 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
@@ -279,7 +279,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;->name:Ljava/lang/String;
 
@@ -314,20 +314,20 @@
 
     iget-wide v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;->sizeBytes:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;->progress:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
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 df5d77d8a3..06cc49961f 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
@@ -316,7 +316,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p2
 
@@ -361,7 +361,7 @@
     return p1
 
     :cond_0
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/Exception;
 
@@ -458,7 +458,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p2
 
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 af2d28b0e6..13abed3360 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$1;->invoke(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 535c530f9a..2577f76194 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 b260058847..7d1cffca82 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 67c3d797e3..aa228d5d8f 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali
@@ -55,13 +55,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d010e
+    const v0, 0x7f0d0117
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0773
+    const v0, 0x7f0a079c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -77,7 +77,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0774
+    const v0, 0x7f0a079d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -93,7 +93,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0775
+    const v0, 0x7f0a079e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -109,7 +109,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0542
+    const v0, 0x7f0a0552
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -123,7 +123,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0541
+    const v0, 0x7f0a0551
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -461,7 +461,7 @@
 
     move-result v1
 
-    sget-object v4, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object v4, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
     const/4 v4, 0x2
 
@@ -523,7 +523,7 @@
 
     if-eqz v1, :cond_0
 
-    const p2, 0x7f0401c1
+    const p2, 0x7f0401c3
 
     goto :goto_0
 
@@ -536,12 +536,12 @@
 
     if-eqz p2, :cond_1
 
-    const p2, 0x7f0401c2
+    const p2, 0x7f0401c4
 
     goto :goto_0
 
     :cond_1
-    const p2, 0x7f0401bf
+    const p2, 0x7f0401c1
 
     :goto_0
     const/4 v1, 0x2
@@ -601,7 +601,7 @@
 
     const/4 v2, 0x2
 
-    const v3, 0x7f0401c0
+    const v3, 0x7f0401c2
 
     const-string v4, "context"
 
@@ -613,7 +613,7 @@
 
     check-cast p2, Landroid/view/View;
 
-    const v0, 0x7f1211dc
+    const v0, 0x7f121221
 
     invoke-static {p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -638,11 +638,11 @@
     :cond_0
     instance-of v0, p2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing;
 
-    const/4 v6, 0x1
+    const-string v6, "resources.getQuantityStr\u2026es, uploadState.numFiles)"
 
-    const v7, 0x7f1000b1
+    const/4 v7, 0x1
 
-    const-string v8, "title"
+    const v8, 0x7f1000b1
 
     const/4 v9, -0x1
 
@@ -664,7 +664,7 @@
 
     move-result v10
 
-    new-array v6, v6, [Ljava/lang/Object;
+    new-array v7, v7, [Ljava/lang/Object;
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing;->getNumFiles()I
 
@@ -674,15 +674,15 @@
 
     move-result-object v11
 
-    aput-object v11, v6, v5
+    aput-object v11, v7, v5
 
-    invoke-virtual {v0, v7, v10, v6}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v0, v8, v10, v7}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
-    :cond_1
-    invoke-static {v0, v8}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
+    :cond_1
     invoke-static {p1, v0, v9}, Lcom/discord/views/UploadProgressView;->a(Lcom/discord/views/UploadProgressView;Ljava/lang/String;I)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing;->getMimeType()Ljava/lang/String;
@@ -792,7 +792,7 @@
 
     move-result v10
 
-    new-array v6, v6, [Ljava/lang/Object;
+    new-array v7, v7, [Ljava/lang/Object;
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many;->getNumFiles()I
 
@@ -802,12 +802,14 @@
 
     move-result-object v11
 
-    aput-object v11, v6, v5
+    aput-object v11, v7, v5
 
-    invoke-virtual {v0, v7, v10, v6}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v0, v8, v10, v7}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
+    invoke-static {v0, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many;->getProgress()I
 
     move-result v6
@@ -830,8 +832,6 @@
 
     move-result-object p2
 
-    invoke-static {v0, v8}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-virtual {p1, v0, v9, p2}, Lcom/discord/views/UploadProgressView;->a(Ljava/lang/String;ILjava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
@@ -885,7 +885,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kd()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JR()Lrx/Observable;
 
     move-result-object p1
 
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 1a4b0b2b0a..b60ad09937 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem.smali
@@ -50,7 +50,7 @@
 
     invoke-static {v0, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p2, 0x7f040358
+    const p2, 0x7f04035b
 
     invoke-static {v0, p2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
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 f6546ef617..e91e311e12 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 dccb4259d3..32eab26d49 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -71,12 +71,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f120b54
+    const p1, 0x7f120b85
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120b4b
+    const p1, 0x7f120b7c
 
     :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;
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 1697ba0308..2dc3d18afc 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
@@ -69,7 +69,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -121,7 +121,7 @@
     move-result-object v0
 
     :goto_0
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v1
 
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 b3a3a65165..764efcd1f9 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
@@ -64,7 +64,7 @@
 
     sget-object v4, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const v3, 0x7f1204d0
+    const v3, 0x7f1204db
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -74,7 +74,7 @@
 
     invoke-static {v6, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f1204d1
+    const v3, 0x7f1204dc
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -84,19 +84,19 @@
 
     invoke-static {v7, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f1204c4
+    const v3, 0x7f1204cf
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v8
 
-    const v3, 0x7f120368
+    const v3, 0x7f12036d
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v9
 
-    const v0, 0x7f0a0493
+    const v0, 0x7f0a04a8
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -114,7 +114,7 @@
 
     move-result-object v10
 
-    const v0, 0x7f040276
+    const v0, 0x7f040279
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -188,12 +188,12 @@
 
     if-eqz v2, :cond_0
 
-    const v0, 0x7f1211ba
+    const v0, 0x7f1211fe
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f120d36
+    const v0, 0x7f120d7c
 
     :goto_0
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -206,12 +206,12 @@
 
     if-eqz v2, :cond_1
 
-    const v0, 0x7f1211b6
+    const v0, 0x7f1211fa
 
     goto :goto_1
 
     :cond_1
-    const v0, 0x7f120d34
+    const v0, 0x7f120d7a
 
     :goto_1
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -224,25 +224,25 @@
 
     if-eqz v2, :cond_2
 
-    const v0, 0x7f1211b3
+    const v0, 0x7f1211f7
 
     goto :goto_2
 
     :cond_2
-    const v0, 0x7f120d30
+    const v0, 0x7f120d76
 
     :goto_2
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v9
 
-    const v0, 0x7f120368
+    const v0, 0x7f12036d
 
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v10
 
-    const v0, 0x7f0a0493
+    const v0, 0x7f0a04a8
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$EmojiViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$EmojiViewHolder.smali
index 03e676bbae..4ca67ae3c9 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$EmojiViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$EmojiViewHolder.smali
@@ -104,7 +104,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$EmojiViewHolder;->onClick:Lkotlin/jvm/functions/Function1;
 
-    const p1, 0x7f0a02ac
+    const p1, 0x7f0a02b5
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
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 8d692cc53d..b9a0df0428 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
@@ -220,7 +220,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v3}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v11
 
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 3eb87b37d4..e107b2925b 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
@@ -562,7 +562,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 6
+    .locals 4
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->message:Lcom/discord/models/domain/ModelMessage;
 
@@ -584,15 +584,11 @@
 
     iget-wide v2, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->guildId:J
 
-    const/16 v4, 0x20
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v4, v2, v4
+    move-result v2
 
-    xor-long/2addr v2, v4
-
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
@@ -652,6 +648,10 @@
 
     iget v2, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->type:I
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$adapter$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$adapter$1$1.smali
index 834882515f..f14fe169fa 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$adapter$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$adapter$1$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$adapter$1$1;->invoke(Lcom/discord/models/domain/emoji/Emoji;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$adapter$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$adapter$1.smali
index 20aa3f0ffd..8270d70c37 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$adapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$adapter$1.smali
@@ -58,7 +58,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d007d
+    const v0, 0x7f0d0084
 
     const/4 v1, 0x0
 
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 090cfb31af..ac394f130a 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$addReaction$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 cc73017e4c..b6c2ffc861 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
@@ -63,7 +63,7 @@
 
     move-result-wide v0
 
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12.smali
index 386f8277aa..9b27541505 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12.smali
@@ -63,7 +63,7 @@
 
     move-result-wide v0
 
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
 
     return-void
 .end method
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 e8cdeb2667..1ed8092817 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, 0x7f121023
+    const v2, 0x7f121060
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->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 bc4898124a..fa61b73071 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
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$deleteMessage$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 d1c854986e..810e2f1190 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2;->invoke(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 b1020b6c32..8c9f10e6ed 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$onResume$1;->invoke(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 dbd967e9f2..37b4e6582f 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 6b52326a8f..73fec8a9cf 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 65eebc62fd..ad96fb7ba1 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
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$toggleMessagePin$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali
index 8bad8e3cee..ed3323781e 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
@@ -462,7 +462,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a0257
+    const v0, 0x7f0a0260
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -470,7 +470,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsAddReaction$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0258
+    const v0, 0x7f0a0261
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -478,7 +478,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsAddReactionEmojisList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a025e
+    const v0, 0x7f0a0267
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -486,7 +486,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsManageReactions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0261
+    const v0, 0x7f0a026a
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -494,7 +494,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsRemoveReactions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a025d
+    const v0, 0x7f0a0266
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -502,7 +502,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsEdit$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0262
+    const v0, 0x7f0a026b
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -510,7 +510,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsResend$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a025a
+    const v0, 0x7f0a0263
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -518,7 +518,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsCopy$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a025b
+    const v0, 0x7f0a0264
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -526,7 +526,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsCopyId$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0263
+    const v0, 0x7f0a026c
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -534,7 +534,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsShare$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a025c
+    const v0, 0x7f0a0265
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -542,7 +542,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsDelete$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a025f
+    const v0, 0x7f0a0268
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -550,7 +550,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsPin$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0265
+    const v0, 0x7f0a026e
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -558,7 +558,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0264
+    const v0, 0x7f0a026d
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -566,7 +566,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsSubtitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0259
+    const v0, 0x7f0a0262
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -574,7 +574,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0260
+    const v0, 0x7f0a0269
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -582,7 +582,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsProfile$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0256
+    const v0, 0x7f0a025f
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1100,12 +1100,12 @@
 
     if-eqz v1, :cond_6
 
-    const v1, 0x7f1211b3
+    const v1, 0x7f1211f7
 
     goto :goto_4
 
     :cond_6
-    const v1, 0x7f120d30
+    const v1, 0x7f120d76
 
     :goto_4
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -1311,7 +1311,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2;
 
@@ -1671,7 +1671,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120ec4
+    const v3, 0x7f120efb
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getString(I)Ljava/lang/String;
 
@@ -1681,7 +1681,7 @@
 
     invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120ec3
+    const v4, 0x7f120efa
 
     invoke-virtual {v0, v4}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getString(I)Ljava/lang/String;
 
@@ -1691,19 +1691,19 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f121323
+    const v5, 0x7f121376
 
     invoke-virtual {v0, v5}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getString(I)Ljava/lang/String;
 
     move-result-object v5
 
-    const v6, 0x7f120be1
+    const v6, 0x7f120c13
 
     invoke-virtual {v0, v6}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    const v7, 0x7f0a0493
+    const v7, 0x7f0a04a8
 
     invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1825,7 +1825,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00f2
+    const v0, 0x7f0d00fb
 
     return v0
 .end method
@@ -1899,7 +1899,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/ApplicationNewsEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/ApplicationNewsEntry.smali
index 466f689527..6c3f2e1354 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/ApplicationNewsEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/ApplicationNewsEntry.smali
@@ -183,30 +183,26 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 2
 
     iget-wide v0, p0, Lcom/discord/widgets/chat/list/entries/ApplicationNewsEntry;->applicationNewsId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v2, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v2
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
+    iget-boolean v1, p0, Lcom/discord/widgets/chat/list/entries/ApplicationNewsEntry;->isBlockedExpanded:Z
 
-    mul-int/lit8 v1, v1, 0x1f
+    if-eqz v1, :cond_0
 
-    iget-boolean v0, p0, Lcom/discord/widgets/chat/list/entries/ApplicationNewsEntry;->isBlockedExpanded:Z
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final isInExpandedBlockedMessageChunk()Z
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 d6a48aacce..5cb2cabb09 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
@@ -467,23 +467,23 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget v0, p0, Lcom/discord/widgets/chat/list/entries/AttachmentEntry;->embedIndex:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v1, p0, Lcom/discord/widgets/chat/list/entries/AttachmentEntry;->guildId:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
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 3217b00a4b..deacdb8cb6 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
@@ -230,6 +230,10 @@
 
     iget v1, p0, Lcom/discord/widgets/chat/list/entries/BlockedMessagesEntry;->blockedCount:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
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 20a6c67a2e..17786bc875 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
@@ -467,23 +467,23 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget v0, p0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->embedIndex:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v1, p0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->guildId:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
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 60788f96a0..0c7b4f4b2b 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
@@ -293,64 +293,58 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->userId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v3
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
+    iget-wide v1, p0, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->messageId:J
 
-    mul-int/lit8 v1, v1, 0x1f
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    iget-wide v3, p0, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->messageId:J
+    move-result v1
 
-    ushr-long v5, v3, v2
+    add-int/2addr v0, v1
 
-    xor-long/2addr v3, v5
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v0, v3
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->activity:Lcom/discord/models/domain/ModelMessage$Activity;
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->activity:Lcom/discord/models/domain/ModelMessage$Activity;
 
     const/4 v2, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->application:Lcom/discord/models/domain/ModelMessage$Application;
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->application:Lcom/discord/models/domain/ModelMessage$Application;
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v2
 
     :cond_1
-    add-int/2addr v1, v2
+    add-int/2addr v0, v2
 
-    return v1
+    return v0
 .end method
 
 .method public final isInExpandedBlockedMessageChunk()Z
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 25fb4bb560..c3f6b22250 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
@@ -321,61 +321,53 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->userId:J
 
-    const/16 v2, 0x20
-
-    ushr-long v3, v0, v2
-
-    xor-long/2addr v0, v3
-
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-wide v3, p0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->messageId:J
-
-    ushr-long v5, v3, v2
-
-    xor-long/2addr v3, v5
-
-    long-to-int v0, v3
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-wide v3, p0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->channelId:J
-
-    ushr-long v5, v3, v2
-
-    xor-long/2addr v3, v5
-
-    long-to-int v0, v3
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->giftCode:Ljava/lang/String;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
     move-result v0
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-wide v1, p0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->messageId:J
+
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-wide v1, p0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->channelId:J
+
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->giftCode:Ljava/lang/String;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final isInExpandedBlockedMessageChunk()Z
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 211773e8b0..a7666ff38c 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
@@ -346,7 +346,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;->username:Ljava/lang/String;
 
@@ -401,15 +401,11 @@
 
     iget-wide v1, p0, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;->guildId:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
 .end method
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 613f00bf88..0587a82167 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
@@ -321,61 +321,53 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->userId:J
 
-    const/16 v2, 0x20
-
-    ushr-long v3, v0, v2
-
-    xor-long/2addr v0, v3
-
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-wide v3, p0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->messageId:J
-
-    ushr-long v5, v3, v2
-
-    xor-long/2addr v3, v5
-
-    long-to-int v0, v3
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->inviteCode:Ljava/lang/String;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
     move-result v0
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-wide v1, p0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->messageId:J
+
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->inviteCode:Ljava/lang/String;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-wide v3, p0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->guildId:J
+    iget-wide v1, p0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->guildId:J
 
-    ushr-long v5, v3, v2
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    xor-long/2addr v3, v5
+    move-result v1
 
-    long-to-int v0, v3
+    add-int/2addr v0, v1
 
-    add-int/2addr v1, v0
-
-    return v1
+    return v0
 .end method
 
 .method public final isInExpandedBlockedMessageChunk()Z
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 ea18a197fd..ae581f5b91 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
@@ -244,49 +244,43 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;->userId:J
 
-    const/16 v2, 0x20
-
-    ushr-long v3, v0, v2
-
-    xor-long/2addr v0, v3
-
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-wide v3, p0, Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;->messageId:J
-
-    ushr-long v5, v3, v2
-
-    xor-long/2addr v3, v5
-
-    long-to-int v0, v3
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;->activity:Lcom/discord/models/domain/ModelMessage$Activity;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
     move-result v0
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-wide v1, p0, Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;->messageId:J
+
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;->activity:Lcom/discord/models/domain/ModelMessage$Activity;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final isInExpandedBlockedMessageChunk()Z
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/NewMessagesEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/NewMessagesEntry.smali
index c887d4c39d..e2d29ba310 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/NewMessagesEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/NewMessagesEntry.smali
@@ -187,31 +187,25 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;->channelId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v3
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
+    iget-wide v1, p0, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;->messageId:J
 
-    mul-int/lit8 v1, v1, 0x1f
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    iget-wide v3, p0, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;->messageId:J
+    move-result v1
 
-    ushr-long v5, v3, v2
+    add-int/2addr v0, v1
 
-    xor-long/2addr v3, v5
-
-    long-to-int v0, v3
-
-    add-int/2addr v1, v0
-
-    return v1
+    return v0
 .end method
 
 .method public final isInExpandedBlockedMessageChunk()Z
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/SpacerEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/SpacerEntry.smali
index 06e9066367..9a345b1c0c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/SpacerEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/SpacerEntry.smali
@@ -134,19 +134,15 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 2
 
     iget-wide v0, p0, Lcom/discord/widgets/chat/list/entries/SpacerEntry;->channelId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v2, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v2
-
-    long-to-int v1, v0
-
-    return v1
+    return v0
 .end method
 
 .method public final isInExpandedBlockedMessageChunk()Z
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 5c650f79aa..cefdcf8b97 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
@@ -299,54 +299,54 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 2
 
     iget-wide v0, p0, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;->channelId:J
 
-    const/16 v2, 0x20
-
-    ushr-long v2, v0, v2
-
-    xor-long/2addr v0, v2
-
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;->channelName:Ljava/lang/String;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
     move-result v0
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;->channelName:Ljava/lang/String;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget v0, p0, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;->channelType:I
+    iget v1, p0, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;->channelType:I
 
-    add-int/2addr v1, v0
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
-    mul-int/lit8 v1, v1, 0x1f
+    move-result v1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;->canReadMessageHistory:Z
+    add-int/2addr v0, v1
 
-    if-eqz v0, :cond_1
+    mul-int/lit8 v0, v0, 0x1f
 
-    const/4 v0, 0x1
+    iget-boolean v1, p0, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;->canReadMessageHistory:Z
+
+    if-eqz v1, :cond_1
+
+    const/4 v1, 0x1
 
     :cond_1
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final isInExpandedBlockedMessageChunk()Z
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/TimestampEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/TimestampEntry.smali
index b43648f1d2..a6aca939db 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/TimestampEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/TimestampEntry.smali
@@ -187,31 +187,25 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/widgets/chat/list/entries/TimestampEntry;->messageId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v3
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
+    iget-wide v1, p0, Lcom/discord/widgets/chat/list/entries/TimestampEntry;->timestamp:J
 
-    mul-int/lit8 v1, v1, 0x1f
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    iget-wide v3, p0, Lcom/discord/widgets/chat/list/entries/TimestampEntry;->timestamp:J
+    move-result v1
 
-    ushr-long v5, v3, v2
+    add-int/2addr v0, v1
 
-    xor-long/2addr v3, v5
-
-    long-to-int v0, v3
-
-    add-int/2addr v1, v0
-
-    return v1
+    return v0
 .end method
 
 .method public final isInExpandedBlockedMessageChunk()Z
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 acdf0def4c..5924be5c8f 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
@@ -197,7 +197,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/entries/UploadProgressEntry;->messageNonce:Ljava/lang/String;
 
@@ -217,15 +217,11 @@
 
     iget-wide v1, p0, Lcom/discord/widgets/chat/list/entries/UploadProgressEntry;->channelId:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$R1aq8M_rzBX5Ek7Sz91kzqnMdCo.smali b/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$R1aq8M_rzBX5Ek7Sz91kzqnMdCo.smali
new file mode 100644
index 0000000000..24ef3dbae9
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$R1aq8M_rzBX5Ek7Sz91kzqnMdCo.smali
@@ -0,0 +1,46 @@
+.class public final synthetic Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$R1aq8M_rzBX5Ek7Sz91kzqnMdCo;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# static fields
+.field public static final synthetic INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$R1aq8M_rzBX5Ek7Sz91kzqnMdCo;
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$R1aq8M_rzBX5Ek7Sz91kzqnMdCo;
+
+    invoke-direct {v0}, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$R1aq8M_rzBX5Ek7Sz91kzqnMdCo;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$R1aq8M_rzBX5Ek7Sz91kzqnMdCo;->INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$R1aq8M_rzBX5Ek7Sz91kzqnMdCo;
+
+    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;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/application/Unread;
+
+    invoke-static {p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->lambda$get$1(Lcom/discord/models/application/Unread;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$kFM-dWYfi6soqHI9WIpsHZR9iQg.smali b/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$ynyuxIsP6rdKwjvkHELOzEFyXlk.smali
similarity index 76%
rename from com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$kFM-dWYfi6soqHI9WIpsHZR9iQg.smali
rename to com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$ynyuxIsP6rdKwjvkHELOzEFyXlk.smali
index 18c6ef3b1a..2fc282c1d1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$kFM-dWYfi6soqHI9WIpsHZR9iQg.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$ynyuxIsP6rdKwjvkHELOzEFyXlk.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$kFM-dWYfi6soqHI9WIpsHZR9iQg;
+.class public final synthetic Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$ynyuxIsP6rdKwjvkHELOzEFyXlk;
 .super Ljava/lang/Object;
 .source "lambda"
 
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$kFM-dWYfi6soqHI9WIpsHZR9iQg;->f$0:Lcom/discord/models/domain/ModelChannel;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$ynyuxIsP6rdKwjvkHELOzEFyXlk;->f$0:Lcom/discord/models/domain/ModelChannel;
 
     return-void
 .end method
@@ -28,7 +28,7 @@
 
     move-object v0, p0
 
-    iget-object v1, v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$kFM-dWYfi6soqHI9WIpsHZR9iQg;->f$0:Lcom/discord/models/domain/ModelChannel;
+    iget-object v1, v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$ynyuxIsP6rdKwjvkHELOzEFyXlk;->f$0:Lcom/discord/models/domain/ModelChannel;
 
     move-object v2, p1
 
@@ -52,7 +52,7 @@
 
     move-object/from16 v7, p6
 
-    check-cast v7, Lcom/discord/models/application/Unread;
+    check-cast v7, Ljava/lang/Long;
 
     move-object/from16 v8, p7
 
@@ -66,7 +66,7 @@
 
     check-cast v10, Ljava/lang/Boolean;
 
-    invoke-static/range {v1 .. v10}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->lambda$get$1(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/application/Unread;Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;
+    invoke-static/range {v1 .. v10}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->lambda$get$2(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Long;Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel$Messages.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel$Messages.smali
index 3540cc6d31..965e1bddfc 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
@@ -52,7 +52,7 @@
 
 
 # direct methods
-.method private constructor <init>(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/application/Unread;Ljava/util/Map;ZZ)V
+.method private constructor <init>(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;JLjava/util/Map;ZZ)V
     .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -75,8 +75,7 @@
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/models/domain/ModelGuildMember$Computed;",
-            ">;",
-            "Lcom/discord/models/application/Unread;",
+            ">;J",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/models/domain/ModelGuildRole;",
@@ -158,44 +157,24 @@
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage;->getId()J
 
-    move-result-wide v0
-
-    goto :goto_2
-
-    :cond_2
-    move-wide v0, v2
-
-    :goto_2
-    iput-wide v0, v9, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->newestKnownMessageId:J
-
-    invoke-virtual/range {p7 .. p7}, Lcom/discord/models/application/Unread;->getMarker()Lcom/discord/models/application/Unread$Marker;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/application/Unread$Marker;->getMessageId()Ljava/lang/Long;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_3
-
-    invoke-virtual/range {p7 .. p7}, Lcom/discord/models/application/Unread;->getMarker()Lcom/discord/models/application/Unread$Marker;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/application/Unread$Marker;->getMessageId()Ljava/lang/Long;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
     move-result-wide v2
 
-    :cond_3
-    iput-wide v2, v9, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->newMessagesMarkerMessageId:J
+    :cond_2
+    iput-wide v2, v9, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->newestKnownMessageId:J
+
+    move-wide/from16 v0, p7
+
+    iput-wide v0, v9, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->newMessagesMarkerMessageId:J
 
     new-instance v0, Ljava/util/ArrayList;
 
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+    invoke-interface {p4}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    add-int/lit8 v1, v1, 0xa
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
 
     iput-object v0, v9, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->items:Ljava/util/List;
 
@@ -211,11 +190,11 @@
 
     move-object v5, p5
 
-    move-object/from16 v6, p8
+    move-object/from16 v6, p9
 
-    move/from16 v7, p9
+    move/from16 v7, p10
 
-    move/from16 v8, p10
+    move/from16 v8, p11
 
     invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->computeItems(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;ZZ)V
 
@@ -741,7 +720,7 @@
 
     invoke-interface {v0, v1, p0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object p0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object p0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-string v1, "unable to construct application news embed"
 
@@ -991,6 +970,26 @@
 
     invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
 
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/utilities/rx/LeadingEdgeThrottle;
+
+    sget-object v6, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+
+    const-wide/16 v7, 0x1
+
+    invoke-direct {v1, v7, v8, v6}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;)V
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
     move-result-object v6
 
     invoke-static {}, Lcom/discord/stores/StoreStream;->getReadStates()Lcom/discord/stores/StoreReadStates;
@@ -1003,6 +1002,20 @@
 
     invoke-virtual {v0, v7, v8}, Lcom/discord/stores/StoreReadStates;->getUnreadMarker(J)Lrx/Observable;
 
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$R1aq8M_rzBX5Ek7Sz91kzqnMdCo;->INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$R1aq8M_rzBX5Ek7Sz91kzqnMdCo;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
     move-result-object v7
 
     invoke-static {}, Lcom/discord/stores/StoreStream;->getGuilds()Lcom/discord/stores/StoreGuilds;
@@ -1033,9 +1046,9 @@
 
     move-result-object v10
 
-    new-instance v11, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$kFM-dWYfi6soqHI9WIpsHZR9iQg;
+    new-instance v11, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$ynyuxIsP6rdKwjvkHELOzEFyXlk;
 
-    invoke-direct {v11, p0}, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$kFM-dWYfi6soqHI9WIpsHZR9iQg;-><init>(Lcom/discord/models/domain/ModelChannel;)V
+    invoke-direct {v11, p0}, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$ynyuxIsP6rdKwjvkHELOzEFyXlk;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
     invoke-static/range {v2 .. v11}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func9;)Lrx/Observable;
 
@@ -1135,7 +1148,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sget-object v2, Lcom/discord/app/a/a;->wk:Lkotlin/text/Regex;
+    sget-object v2, Lcom/discord/app/a/a;->wi:Lkotlin/text/Regex;
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
 
@@ -1163,7 +1176,7 @@
 
     check-cast v3, Lkotlin/text/MatchResult;
 
-    invoke-interface {v3}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {v3}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object v3
 
@@ -1272,7 +1285,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sget-object v2, Lcom/discord/app/a/a;->wj:Lkotlin/text/Regex;
+    sget-object v2, Lcom/discord/app/a/a;->wh:Lkotlin/text/Regex;
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
 
@@ -1300,7 +1313,7 @@
 
     check-cast v3, Lkotlin/text/MatchResult;
 
-    invoke-interface {v3}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {v3}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object v3
 
@@ -1667,20 +1680,62 @@
     return-object p0
 .end method
 
-.method static synthetic lambda$get$1(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/application/Unread;Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;
-    .locals 12
+.method static synthetic lambda$get$1(Lcom/discord/models/application/Unread;)Ljava/lang/Long;
+    .locals 2
 
-    new-instance v11, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;
+    invoke-virtual {p0}, Lcom/discord/models/application/Unread;->getMarker()Lcom/discord/models/application/Unread$Marker;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/application/Unread$Marker;->getMessageId()Ljava/lang/Long;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Lcom/discord/models/application/Unread;->getMarker()Lcom/discord/models/application/Unread$Marker;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Lcom/discord/models/application/Unread$Marker;->getMessageId()Ljava/lang/Long;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    goto :goto_0
+
+    :cond_0
+    const-wide/16 v0, 0x0
+
+    :goto_0
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method static synthetic lambda$get$2(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Long;Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;
+    .locals 13
+
+    new-instance v12, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;
+
+    invoke-virtual/range {p6 .. p6}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v7
 
     invoke-virtual/range {p8 .. p8}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v9
+    move-result v10
 
     invoke-virtual/range {p9 .. p9}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v10
+    move-result v11
 
-    move-object v0, v11
+    move-object v0, v12
 
     move-object v1, p0
 
@@ -1688,19 +1743,17 @@
 
     move-object v3, p2
 
-    move-object v4, p3
+    move-object/from16 v4, p3
 
     move-object/from16 v5, p4
 
     move-object/from16 v6, p5
 
-    move-object/from16 v7, p6
+    move-object/from16 v9, p7
 
-    move-object/from16 v8, p7
+    invoke-direct/range {v0 .. v11}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;-><init>(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;JLjava/util/Map;ZZ)V
 
-    invoke-direct/range {v0 .. v10}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;-><init>(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/application/Unread;Ljava/util/Map;ZZ)V
-
-    return-object v11
+    return-object v12
 .end method
 
 .method private shouldConcatMessage(ILcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelMessage;)Z
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali
index 722b9c533b..e08ed3d929 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
@@ -341,7 +341,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -451,7 +451,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v3}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v3
 
@@ -543,7 +543,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p0
 
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 34fb65e0aa..a4c7ccb1bc 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
@@ -124,7 +124,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v2}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v2
 
@@ -188,7 +188,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 9d7e78c3b7..6b88959600 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
@@ -75,13 +75,13 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d014d
+    const v0, 0x7f0d0156
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0422
+    const v0, 0x7f0a0432
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -97,7 +97,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0421
+    const v0, 0x7f0a0431
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -113,7 +113,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0423
+    const v0, 0x7f0a0433
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 694f3f0003..1aa5c3a771 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
@@ -115,7 +115,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/subjects/SerializedSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/subjects/SerializedSubject;->JO()Lrx/Observable;
 
     move-result-object v1
 
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 fa3ac85eaa..09eb823bb4 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.smali
@@ -437,7 +437,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
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 e6c83c2983..f7042d0b88 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
@@ -37,13 +37,13 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d014e
+    const v0, 0x7f0d0157
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0425
+    const v0, 0x7f0a0435
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 33c3268a55..8624ddbe3e 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
@@ -33,7 +33,7 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d014f
+    const v0, 0x7f0d0158
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
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 1309795465..7a3579b088 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
@@ -355,7 +355,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 4
 
     iget-object v0, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem;->user:Lcom/discord/models/domain/ModelUser;
 
@@ -377,27 +377,21 @@
 
     iget-wide v2, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem;->channelId:J
 
-    const/16 v4, 0x20
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v5, v2, v4
+    move-result v2
 
-    xor-long/2addr v2, v5
-
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v2, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem;->messageId:J
 
-    ushr-long v4, v2, v4
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    xor-long/2addr v2, v4
+    move-result v2
 
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
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 e579082db7..67218b52b3 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
@@ -41,13 +41,13 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0150
+    const v0, 0x7f0d0159
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0429
+    const v0, 0x7f0a0439
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -63,7 +63,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0428
+    const v0, 0x7f0a0438
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -79,7 +79,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0427
+    const v0, 0x7f0a0437
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -140,7 +140,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f07005b
+    const v3, 0x7f07005a
 
     const/4 v4, 0x0
 
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 095e9a85f3..c26100488c 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
@@ -56,6 +56,10 @@
 
     move-result-object p1
 
+    const-string p2, "Intent()\n          .putE\u2026RA_MESSAGE_ID, messageId)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-class p2, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;
 
     invoke-static {p5, p2, p1}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
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 c7742ecd12..c22725c042 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$2;->invoke(Lcom/discord/models/domain/ModelMessageReaction$Emoji;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 5c1ac6a1a4..0b14eacab5 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 092abc749b..ef621ea415 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali
@@ -101,7 +101,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0424
+    const v0, 0x7f0a0434
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -109,7 +109,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;->emojisRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a042a
+    const v0, 0x7f0a043a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -137,7 +137,7 @@
 
     const-string v0, "modelProvider"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -174,7 +174,7 @@
 
     const-string v1, "emojisAdapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     invoke-virtual {p1}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;->getReactionItems()Ljava/util/List;
@@ -189,7 +189,7 @@
 
     const-string v1, "resultsAdapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-virtual {p1}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;->getUserItems()Ljava/util/List;
@@ -262,7 +262,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d014c
+    const v0, 0x7f0d0155
 
     return v0
 .end method
@@ -280,7 +280,7 @@
 
     invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f120ea7
+    const p1, 0x7f120edd
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -379,7 +379,7 @@
 
     const-string v0, "emojisAdapter"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     new-instance v0, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$2;
@@ -390,7 +390,7 @@
 
     const-string v2, "modelProvider"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     invoke-direct {v0, v1}, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$2;-><init>(Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;)V
@@ -413,7 +413,7 @@
 
     const-string v1, "modelProvider"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;->get()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 e7bbb38a10..71835c8f61 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
@@ -180,12 +180,12 @@
 
     if-eqz v1, :cond_3
 
-    const v1, 0x7f120bd9
+    const v1, 0x7f120c0b
 
     goto :goto_1
 
     :cond_3
-    const v1, 0x7f120bd8
+    const v1, 0x7f120c0a
 
     :goto_1
     invoke-virtual {p0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
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 287b949c53..57c1d89c1b 100644
--- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali
+++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali
@@ -124,7 +124,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00d0
+    const v0, 0x7f0d00d9
 
     return v0
 .end method
@@ -164,7 +164,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a015d
+    const v0, 0x7f0a015e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -176,7 +176,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f120d3a
+    const p1, 0x7f120d80
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion.smali b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion.smali
index 6ddd6ff972..c7be406822 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Companion.smali
@@ -127,7 +127,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -167,7 +167,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Typing.smali b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Typing.smali
index 378ad6be9b..d7ae280ae4 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Typing.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/ChatTypingModel$Typing.smali
@@ -267,12 +267,20 @@
 
     iget v1, p0, Lcom/discord/widgets/chat/typing/ChatTypingModel$Typing;->channelRateLimit:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget v1, p0, Lcom/discord/widgets/chat/typing/ChatTypingModel$Typing;->cooldownSecs:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers$onViewBoundOrOnResume$1.smali
index 53cf21a2f1..9f04940b87 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers$onViewBoundOrOnResume$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/typing/WidgetChatTypingUsers$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/chat/typing/ChatTypingModel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali
index b696cea52d..cbf9ef5688 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali
@@ -111,7 +111,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a020f
+    const v0, 0x7f0a0210
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -119,7 +119,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/typing/WidgetChatTypingUsers;->typingTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a020d
+    const v0, 0x7f0a020e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -127,7 +127,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/typing/WidgetChatTypingUsers;->slowmodeTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a020e
+    const v0, 0x7f0a020f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -226,10 +226,6 @@
 
     move-result v3
 
-    const-string v4, "typingText"
-
-    invoke-static {v0, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     check-cast v0, Ljava/lang/CharSequence;
 
     invoke-static {v0}, Lkotlin/text/l;->j(Ljava/lang/CharSequence;)Z
@@ -370,7 +366,7 @@
 
     if-nez p3, :cond_1
 
-    const p1, 0x7f1203b1
+    const p1, 0x7f1203b6
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/typing/WidgetChatTypingUsers;->getString(I)Ljava/lang/String;
 
@@ -447,18 +443,22 @@
 
     if-eq v0, v5, :cond_0
 
-    const p2, 0x7f12101d
+    const p2, 0x7f12105a
 
     invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
+    const-string p2, "resources.getString(R.string.several_users_typing)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-object p1
 
     :cond_0
-    sget-object v0, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
-    const v0, 0x7f121131
+    const v0, 0x7f121173
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -501,9 +501,9 @@
     return-object p1
 
     :cond_1
-    sget-object v0, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
-    const v0, 0x7f121194
+    const v0, 0x7f1211d8
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -540,9 +540,9 @@
     return-object p1
 
     :cond_2
-    sget-object v0, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
-    const v0, 0x7f120c78
+    const v0, 0x7f120cb1
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -603,7 +603,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0110
+    const v0, 0x7f0d0119
 
     return v0
 .end method
@@ -617,7 +617,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f070162
+    const v1, 0x7f070164
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -652,7 +652,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali b/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali
index 5a9c5e7f5d..a802b5b909 100644
--- a/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali
+++ b/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali
@@ -51,7 +51,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0112
+    const v0, 0x7f0d011b
 
     return v0
 .end method
@@ -61,7 +61,7 @@
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
-    const p2, 0x7f0a0218
+    const p2, 0x7f0a0219
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 eaabe527e4..392d37ae0a 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
@@ -79,7 +79,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a024a
+    const p1, 0x7f0a0253
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -131,7 +131,7 @@
 
     if-eq p2, v0, :cond_0
 
-    const p2, 0x7f040292
+    const p2, 0x7f040295
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -140,7 +140,7 @@
     return p1
 
     :cond_0
-    const p2, 0x7f06011b
+    const p2, 0x7f06011d
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -149,7 +149,7 @@
     return p1
 
     :cond_1
-    const p2, 0x7f060126
+    const p2, 0x7f060128
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -158,7 +158,7 @@
     return p1
 
     :cond_2
-    const p2, 0x7f060105
+    const p2, 0x7f060107
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -167,7 +167,7 @@
     return p1
 
     :cond_3
-    const p2, 0x7f040298
+    const p2, 0x7f04029b
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
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 2fb540440f..d9bcf783e8 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter.smali
@@ -85,7 +85,7 @@
 
     new-instance p1, Lcom/discord/widgets/debugging/WidgetDebugging$Adapter$Item;
 
-    const p2, 0x7f0d0117
+    const p2, 0x7f0d0120
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/debugging/WidgetDebugging$Adapter$Item;-><init>(ILcom/discord/widgets/debugging/WidgetDebugging$Adapter;)V
 
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 5fabb9b470..1f6c22bee9 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
@@ -112,7 +112,7 @@
     return-void
 
     :pswitch_data_0
-    .packed-switch 0x7f0a044c
+    .packed-switch 0x7f0a045c
         :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 7ceaa52977..fba02d2a09 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, 0x7f0a044c
+    const v0, 0x7f0a045c
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
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 aa1a46c984..51752d4df9 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$3;->invoke(Lcom/discord/widgets/debugging/WidgetDebugging$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
index 9c1f183063..0b349a34d1 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
@@ -87,7 +87,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a024b
+    const v0, 0x7f0a0254
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -190,7 +190,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0116
+    const v0, 0x7f0d011f
 
     return v0
 .end method
@@ -250,7 +250,7 @@
 
     invoke-static {p0, p1, v1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f1204bf
+    const p1, 0x7f1204c9
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/debugging/WidgetDebugging;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -271,7 +271,7 @@
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
 
-    invoke-static {}, Lcom/discord/app/AppLog;->dr()Lrx/Observable;
+    invoke-static {}, Lcom/discord/app/AppLog;->dq()Lrx/Observable;
 
     move-result-object v0
 
@@ -317,7 +317,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/debugging/WidgetDebugging;->filterSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v1}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v1
 
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 61efe20c1e..5f8966216a 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash$Companion.smali
@@ -114,7 +114,7 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const-class v0, Lcom/discord/widgets/debugging/WidgetFatalCrash;
 
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
index 0035c8ef0d..1298eb8437 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -195,7 +195,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a02d5
+    const v0, 0x7f0a02de
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -203,7 +203,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/debugging/WidgetFatalCrash;->inviteText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d4
+    const v0, 0x7f0a02dd
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -211,7 +211,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/debugging/WidgetFatalCrash;->crashSourceText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d6
+    const v0, 0x7f0a02df
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -219,7 +219,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/debugging/WidgetFatalCrash;->crashTimeText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d0
+    const v0, 0x7f0a02d9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -227,7 +227,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/debugging/WidgetFatalCrash;->appVersionText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d3
+    const v0, 0x7f0a02dc
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -235,7 +235,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/debugging/WidgetFatalCrash;->osVersionText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d2
+    const v0, 0x7f0a02db
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -381,7 +381,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d011c
+    const v0, 0x7f0d0125
 
     return v0
 .end method
@@ -409,7 +409,7 @@
 
     aput-object v3, v1, v2
 
-    const v3, 0x7f120459
+    const v3, 0x7f120462
 
     invoke-virtual {p0, v3, v1}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -437,7 +437,7 @@
 
     if-eqz p1, :cond_0
 
-    const v5, 0x7f121077
+    const v5, 0x7f1210b4
 
     invoke-virtual {p0, v5}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I)Ljava/lang/String;
 
@@ -457,7 +457,7 @@
     :goto_0
     aput-object v5, v3, v2
 
-    const v5, 0x7f120458
+    const v5, 0x7f120461
 
     invoke-virtual {p0, v5, v3}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -471,7 +471,7 @@
 
     move-result-object v1
 
-    const v3, 0x7f12045a
+    const v3, 0x7f120463
 
     new-array v5, v0, [Ljava/lang/Object;
 
@@ -498,11 +498,11 @@
 
     move-result-object p1
 
-    const v1, 0x7f120452
+    const v1, 0x7f12045b
 
     new-array v3, v0, [Ljava/lang/Object;
 
-    const-string v4, "9.5.0"
+    const-string v4, "9.6.3"
 
     aput-object v4, v3, v2
 
@@ -518,7 +518,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f120456
+    const v1, 0x7f12045f
 
     new-array v3, v0, [Ljava/lang/Object;
 
@@ -542,7 +542,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f120455
+    const v1, 0x7f12045e
 
     new-array v0, v0, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Disconnected.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Disconnected.smali
index fbd0ce5dc0..f26447ab5a 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Disconnected.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Disconnected.smali
@@ -122,6 +122,10 @@
 
     iget v0, p0, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Disconnected;->code:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     return v0
 .end method
 
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali
index 0388e41c56..380e425350 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali
@@ -132,7 +132,7 @@
 .end method
 
 .method private final buildClient(Landroidx/fragment/app/FragmentActivity;)V
-    .locals 1
+    .locals 3
 
     check-cast p1, Landroid/app/Activity;
 
@@ -140,11 +140,13 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/b$a;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/b$a;->zP()Lcom/google/android/gms/nearby/messages/b;
+    new-instance v1, Lcom/google/android/gms/nearby/messages/b;
 
-    move-result-object v0
+    const/4 v2, 0x0
 
-    invoke-static {p1, v0}, Lcom/google/android/gms/nearby/a;->a(Landroid/app/Activity;Lcom/google/android/gms/nearby/messages/b;)Lcom/google/android/gms/nearby/messages/MessagesClient;
+    invoke-direct {v1, v0, v2}, Lcom/google/android/gms/nearby/messages/b;-><init>(Lcom/google/android/gms/nearby/messages/b$a;B)V
+
+    invoke-static {p1, v1}, Lcom/google/android/gms/nearby/a;->a(Landroid/app/Activity;Lcom/google/android/gms/nearby/messages/b;)Lcom/google/android/gms/nearby/messages/MessagesClient;
 
     move-result-object p1
 
@@ -260,9 +262,7 @@
 .method private final parseUserId(Lcom/google/android/gms/nearby/messages/Message;)Ljava/lang/Long;
     .locals 4
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/Message;->zO()[B
-
-    move-result-object p1
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/Message;->content:[B
 
     const-string v0, "message.content"
 
@@ -325,11 +325,15 @@
 
     check-cast v1, Lcom/google/android/gms/nearby/messages/c;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->a(Lcom/google/android/gms/nearby/messages/c;)Lcom/google/android/gms/nearby/messages/PublishOptions$a;
+    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->zQ()Lcom/google/android/gms/nearby/messages/PublishOptions;
+    check-cast v1, Lcom/google/android/gms/nearby/messages/c;
+
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aNh:Lcom/google/android/gms/nearby/messages/c;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->zM()Lcom/google/android/gms/nearby/messages/PublishOptions;
 
     move-result-object v0
 
@@ -390,13 +394,11 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;-><init>()V
 
-    sget-object v1, Lcom/google/android/gms/nearby/messages/Strategy;->aMR:Lcom/google/android/gms/nearby/messages/Strategy;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/Strategy;->aNj:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->a(Lcom/google/android/gms/nearby/messages/Strategy;)Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->zS()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->zO()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
     move-result-object v0
 
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 84b3e07b44..d8ed62ef88 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion.smali
@@ -60,7 +60,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {v0}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object v1
 
@@ -80,7 +80,7 @@
 
     new-instance p1, Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion$UserNameDiscriminator;
 
-    invoke-interface {v0}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {v0}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object v1
 
@@ -90,7 +90,7 @@
 
     check-cast v1, Ljava/lang/String;
 
-    invoke-interface {v0}, Lkotlin/text/MatchResult;->Ew()Ljava/util/List;
+    invoke-interface {v0}, Lkotlin/text/MatchResult;->El()Ljava/util/List;
 
     move-result-object v0
 
@@ -102,7 +102,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    invoke-static {v0}, Lkotlin/text/l;->dU(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v0}, Lkotlin/text/l;->dO(Ljava/lang/String;)Ljava/lang/Integer;
 
     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 5417e04bfd..f966f5bd73 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -128,7 +128,7 @@
     return-void
 
     :catch_0
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/Exception;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$1.smali
index 58c6e94b5e..33ea7beb7a 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$1.smali
@@ -81,7 +81,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f120095
+    const v2, 0x7f120097
 
     invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/friends/WidgetFriendsAdd;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2.smali
index 898466b8d7..ac3db5dbc1 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2.smali
@@ -71,7 +71,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f130194
+    const v0, 0x7f130195
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/textfield/TextInputLayout;->setErrorTextAppearance(I)V
 
@@ -83,7 +83,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2;->this$0:Lcom/discord/widgets/friends/WidgetFriendsAdd;
 
-    const v1, 0x7f12009a
+    const v1, 0x7f12009c
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/friends/WidgetFriendsAdd;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
index 3ec4bda3df..7047fd3882 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
@@ -131,7 +131,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a02f1
+    const v0, 0x7f0a02f6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -139,7 +139,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAdd;->inputEditText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02f2
+    const v0, 0x7f0a02f7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -147,7 +147,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAdd;->inputEditTextWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02f0
+    const v0, 0x7f0a02f5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -258,7 +258,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f130194
+    const v2, 0x7f130195
 
     invoke-virtual {v1, v2}, Lcom/google/android/material/textfield/TextInputLayout;->setErrorTextAppearance(I)V
 
@@ -266,7 +266,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f12009c
+    const v2, 0x7f12009e
 
     const/4 v3, 0x1
 
@@ -434,7 +434,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d011e
+    const v0, 0x7f0d0126
 
     return v0
 .end method
@@ -456,7 +456,7 @@
 
     invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v1, 0x7f120696
+    const v1, 0x7f1206ad
 
     invoke-virtual {p0, v1}, Lcom/discord/widgets/friends/WidgetFriendsAdd;->setActionBarTitle(I)Lkotlin/Unit;
 
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 d1eb4e4453..68012bca36 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
@@ -53,7 +53,7 @@
 
     iget-wide v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$3;->$userId:J
 
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
 
     return-void
 .end method
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 65fa704e6e..29022d15ac 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
@@ -51,7 +51,7 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d00ba
+    const v0, 0x7f0d00c3
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -454,7 +454,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f12009e
+    const p2, 0x7f1200a0
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -473,7 +473,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1209fa
+    const p2, 0x7f120a1d
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -492,7 +492,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f120b33
+    const p2, 0x7f120b64
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 a229a2c852..893e11fe70 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
@@ -136,7 +136,7 @@
 
     invoke-static {v1, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v4, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v4, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v4, Ljava/util/List;
 
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 7aec74b775..71b8b5e107 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1;->invoke(Ljava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2$1.smali
index a356c2e814..05ac3235ea 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -83,7 +83,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f120095
+    const v1, 0x7f120097
 
     const/4 v2, 0x1
 
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 ab38b5bafe..679955bfff 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
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2;->invoke(Ljava/lang/String;I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -96,7 +96,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     iget-object v1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3$1.smali
index 6cbe66632e..4da287e44c 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 47561cd1a1..761f07de63 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -89,7 +89,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
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 698796fdd4..aa68e419b5 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
@@ -59,9 +59,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/e;->uy:Lcom/discord/app/e;
+    sget-object v0, Lcom/discord/app/e;->ux:Lcom/discord/app/e;
 
-    sget-wide v0, Lcom/discord/app/e;->uv:J
+    sget-wide v0, Lcom/discord/app/e;->uu:J
 
     invoke-static {v0, v1}, Lcom/discord/app/e;->k(J)Ljava/lang/String;
 
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 ab7a5b66df..e24f75dfe6 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$1;->invoke(LWidgetFriendsAddUserRequestsModel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 1327c4d76b..a40b48cb44 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$2;->invoke(Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali
index a3ad87465c..482c2106b7 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali
@@ -285,7 +285,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0481
+    const v0, 0x7f0a0494
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -293,7 +293,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a047f
+    const v0, 0x7f0a0492
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -301,7 +301,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a047b
+    const v0, 0x7f0a048e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -309,7 +309,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->buttonFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a047e
+    const v0, 0x7f0a0491
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -317,7 +317,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->errorView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a047d
+    const v0, 0x7f0a0490
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -325,7 +325,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->enableButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a047c
+    const v0, 0x7f0a048f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -333,7 +333,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->disableButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0482
+    const v0, 0x7f0a0495
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -341,7 +341,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->searchingText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0483
+    const v0, 0x7f0a0496
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -349,7 +349,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->searchingLottie$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0480
+    const v0, 0x7f0a0493
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -407,7 +407,7 @@
 
     const-string v0, "resultsAdapter"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -468,7 +468,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1200a9
+    const v0, 0x7f1200ab
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getString(I)Ljava/lang/String;
 
@@ -558,7 +558,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1200ab
+    const v0, 0x7f1200ad
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getString(I)Ljava/lang/String;
 
@@ -599,7 +599,7 @@
 
     const-string v1, "resultsAdapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     check-cast p1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers;
@@ -704,7 +704,7 @@
 
     if-eqz p1, :cond_1
 
-    const v0, 0x7f1200a3
+    const v0, 0x7f1200a5
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -736,7 +736,7 @@
 
     if-eqz p1, :cond_4
 
-    const v0, 0x7f1200ac
+    const v0, 0x7f1200ae
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -755,7 +755,7 @@
 
     if-eqz p1, :cond_6
 
-    const v0, 0x7f1200a8
+    const v0, 0x7f1200aa
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -892,7 +892,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0122
+    const v0, 0x7f0d012a
 
     return v0
 .end method
@@ -955,7 +955,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object p1
 
@@ -975,7 +975,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1;
 
@@ -1027,7 +1027,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2;
@@ -1042,7 +1042,7 @@
 
     if-nez p1, :cond_1
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3;
@@ -1164,7 +1164,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1184,7 +1184,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     invoke-virtual {p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getContext()Landroid/content/Context;
 
@@ -1220,7 +1220,7 @@
 
     const-string v3, "resultsAdapter"
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     check-cast v2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1.smali
index 6aadd3e65d..df274ef45f 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetFriendsList.kt"
 
 # interfaces
-.implements Lrx/functions/Func6;
+.implements Lrx/functions/b;
 
 
 # annotations
@@ -18,37 +18,37 @@
 
 .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;",
-        "T6:",
+        "<T:",
         "Ljava/lang/Object;",
         "R:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lrx/functions/Func6<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;"
+        "Lrx/functions/b<",
+        "TT;TR;>;"
     }
 .end annotation
 
 
-# instance fields
-.field final synthetic $index:Ljava/lang/Integer;
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;
 
 
 # direct methods
-.method constructor <init>(Ljava/lang/Integer;)V
-    .locals 0
+.method static constructor <clinit>()V
+    .locals 1
 
-    iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;->$index:Ljava/lang/Integer;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,209 +57,33 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/Map;Ljava/util/Map;Ljava/util/LinkedHashMap;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/friends/WidgetFriendsList$Model;
-    .locals 12
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Map<",
-            "Ljava/lang/Long;",
-            "+",
-            "Lcom/discord/models/domain/ModelPresence;",
-            ">;",
-            "Ljava/util/Map<",
-            "Ljava/lang/Long;",
-            "Lcom/discord/models/domain/ModelUser;",
-            ">;",
-            "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/lang/Integer;",
-            ">;",
-            "Ljava/util/Map<",
-            "Ljava/lang/Long;",
-            "Lcom/discord/models/domain/ModelApplicationStream;",
-            ">;)",
-            "Lcom/discord/widgets/friends/WidgetFriendsList$Model;"
-        }
-    .end annotation
-
-    move-object v0, p0
-
-    move-object v1, p3
-
-    const-string v2, "relationships"
-
-    move-object/from16 v4, p5
-
-    invoke-static {v4, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-interface/range {p5 .. p5}, Ljava/util/Map;->isEmpty()Z
-
-    move-result v2
-
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_0
-
-    const/4 v2, 0x0
-
-    goto :goto_1
-
-    :cond_0
-    invoke-interface/range {p5 .. p5}, Ljava/util/Map;->entrySet()Ljava/util/Set;
-
-    move-result-object v2
-
-    invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
-    move-result-object v2
-
-    :cond_1
-    :goto_0
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_2
-
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/util/Map$Entry;
-
-    invoke-interface {v5}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/lang/Integer;
-
-    const/4 v6, 0x3
-
-    invoke-static {v5, v6}, Lcom/discord/models/domain/ModelUserRelationship;->isType(Ljava/lang/Integer;I)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_1
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    move v2, v3
-
-    :goto_1
-    sget-object v3, Lcom/discord/widgets/friends/WidgetFriendsList$Model;->Companion:Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion;
-
-    iget-object v5, v0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;->$index:Ljava/lang/Integer;
-
-    const-string v11, "index"
-
-    invoke-static {v5, v11}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
-
-    move-result v5
-
-    const-string v6, "users"
-
-    move-object v7, p2
-
-    invoke-static {p2, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v6, "presences"
-
-    move-object v8, p1
-
-    invoke-static {p1, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v6, "guilds"
-
-    invoke-static {p3, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v1, Ljava/util/Map;
-
-    const-string v6, "members"
-
-    move-object/from16 v9, p4
-
-    invoke-static {v9, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v6, "applicationStreams"
-
-    move-object/from16 v10, p6
-
-    invoke-static {v10, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object/from16 v4, p5
-
-    move-object v6, p2
-
-    move-object v7, p1
-
-    move-object v8, v1
-
-    invoke-static/range {v3 .. v10}, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion;->access$toSortedList(Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion;Ljava/util/Map;ILjava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Ljava/util/List;
-
-    move-result-object v1
-
-    invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_3
-
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty;
-
-    iget-object v3, v0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;->$index:Ljava/lang/Integer;
-
-    invoke-static {v3, v11}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
-
-    move-result v3
-
-    invoke-direct {v1, v3}, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty;-><init>(I)V
-
-    invoke-static {v1}, Lkotlin/a/m;->ba(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v1
-
-    :cond_3
-    new-instance v3, Lcom/discord/widgets/friends/WidgetFriendsList$Model;
-
-    invoke-direct {v3, v1, v2}, Lcom/discord/widgets/friends/WidgetFriendsList$Model;-><init>(Ljava/util/List;I)V
-
-    return-object v3
-.end method
-
-.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Ljava/util/Map;
+    check-cast p1, Lcom/discord/stores/StoreApplicationStreaming$State;
 
-    check-cast p2, Ljava/util/Map;
-
-    check-cast p3, Ljava/util/LinkedHashMap;
-
-    check-cast p4, Ljava/util/Map;
-
-    check-cast p5, Ljava/util/Map;
-
-    check-cast p6, Ljava/util/Map;
-
-    invoke-virtual/range {p0 .. p6}, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;->call(Ljava/util/Map;Ljava/util/Map;Ljava/util/LinkedHashMap;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/friends/WidgetFriendsList$Model;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;->call(Lcom/discord/stores/StoreApplicationStreaming$State;)Ljava/util/Map;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lcom/discord/stores/StoreApplicationStreaming$State;)Ljava/util/Map;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/stores/StoreApplicationStreaming$State;",
+            ")",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelApplicationStream;",
+            ">;"
+        }
+    .end annotation
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreaming$State;->getStreamsByUser()Ljava/util/Map;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$2.smali
new file mode 100644
index 0000000000..58474c5f6b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$2.smali
@@ -0,0 +1,267 @@
+.class final Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$2;
+.super Ljava/lang/Object;
+.source "WidgetFriendsList.kt"
+
+# interfaces
+.implements Lrx/functions/Func6;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1;->call(Ljava/lang/Integer;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    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;",
+        "T6:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func6<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $index:Ljava/lang/Integer;
+
+
+# direct methods
+.method constructor <init>(Ljava/lang/Integer;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$2;->$index:Ljava/lang/Integer;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/util/Map;Ljava/util/Map;Ljava/util/LinkedHashMap;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/friends/WidgetFriendsList$Model;
+    .locals 12
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelPresence;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;",
+            "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/lang/Integer;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelApplicationStream;",
+            ">;)",
+            "Lcom/discord/widgets/friends/WidgetFriendsList$Model;"
+        }
+    .end annotation
+
+    move-object v0, p0
+
+    move-object v1, p3
+
+    const-string v2, "relationships"
+
+    move-object/from16 v4, p5
+
+    invoke-static {v4, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface/range {p5 .. p5}, Ljava/util/Map;->isEmpty()Z
+
+    move-result v2
+
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_0
+
+    const/4 v2, 0x0
+
+    goto :goto_1
+
+    :cond_0
+    invoke-interface/range {p5 .. p5}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+
+    move-result-object v2
+
+    invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+    move-result-object v2
+
+    :cond_1
+    :goto_0
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_2
+
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Ljava/util/Map$Entry;
+
+    invoke-interface {v5}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Ljava/lang/Integer;
+
+    const/4 v6, 0x3
+
+    invoke-static {v5, v6}, Lcom/discord/models/domain/ModelUserRelationship;->isType(Ljava/lang/Integer;I)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_1
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    move v2, v3
+
+    :goto_1
+    sget-object v3, Lcom/discord/widgets/friends/WidgetFriendsList$Model;->Companion:Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion;
+
+    iget-object v5, v0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$2;->$index:Ljava/lang/Integer;
+
+    const-string v11, "index"
+
+    invoke-static {v5, v11}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
+
+    move-result v5
+
+    const-string v6, "users"
+
+    move-object v7, p2
+
+    invoke-static {p2, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "presences"
+
+    move-object v8, p1
+
+    invoke-static {p1, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "guilds"
+
+    invoke-static {p3, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v1, Ljava/util/Map;
+
+    const-string v6, "members"
+
+    move-object/from16 v9, p4
+
+    invoke-static {v9, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "applicationStreams"
+
+    move-object/from16 v10, p6
+
+    invoke-static {v10, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object/from16 v4, p5
+
+    move-object v6, p2
+
+    move-object v7, p1
+
+    move-object v8, v1
+
+    invoke-static/range {v3 .. v10}, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion;->access$toSortedList(Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion;Ljava/util/Map;ILjava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_3
+
+    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty;
+
+    iget-object v3, v0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$2;->$index:Ljava/lang/Integer;
+
+    invoke-static {v3, v11}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
+
+    move-result v3
+
+    invoke-direct {v1, v3}, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty;-><init>(I)V
+
+    invoke-static {v1}, Lkotlin/a/m;->ba(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v1
+
+    :cond_3
+    new-instance v3, Lcom/discord/widgets/friends/WidgetFriendsList$Model;
+
+    invoke-direct {v3, v1, v2}, Lcom/discord/widgets/friends/WidgetFriendsList$Model;-><init>(Ljava/util/List;I)V
+
+    return-object v3
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    check-cast p2, Ljava/util/Map;
+
+    check-cast p3, Ljava/util/LinkedHashMap;
+
+    check-cast p4, Ljava/util/Map;
+
+    check-cast p5, Ljava/util/Map;
+
+    check-cast p6, Ljava/util/Map;
+
+    invoke-virtual/range {p0 .. p6}, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$2;->call(Ljava/util/Map;Ljava/util/Map;Ljava/util/LinkedHashMap;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/friends/WidgetFriendsList$Model;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1.smali
index b91369a400..b8bfe94d4e 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1.smali
@@ -140,13 +140,21 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming;->get()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming;->getState()Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v6, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;
+
+    check-cast v6, Lrx/functions/b;
+
+    invoke-virtual {v0, v6}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
 
     move-result-object v6
 
-    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$2;
 
-    invoke-direct {v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;-><init>(Ljava/lang/Integer;)V
+    invoke-direct {v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$2;-><init>(Ljava/lang/Integer;)V
 
     move-object v7, v0
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion.smali
index 3a88a99d20..8349905f62 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion.smali
@@ -298,7 +298,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty.smali
index da7c9d097c..6d7c2fa3dc 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty.smali
@@ -136,6 +136,10 @@
 
     iget v0, p0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item$Empty;->position:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     return v0
 .end method
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Relationship.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Relationship.smali
index b29a7ca314..da1c11d17e 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Relationship.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Item$Relationship.smali
@@ -98,7 +98,7 @@
 
     if-eqz p4, :cond_1
 
-    sget-object p4, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p4, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     move-object p5, p4
 
@@ -485,6 +485,10 @@
 
     iget v2, p0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Item$Relationship;->relationshipType:I
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model.smali
index 041fc3bd92..ca94f60d7f 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model.smali
@@ -257,6 +257,10 @@
 
     iget v1, p0, Lcom/discord/widgets/friends/WidgetFriendsList$Model;->pendingCount:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$addTab$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$addTab$1.smali
index 920f11015b..d0b216793c 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$addTab$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$addTab$1.smali
@@ -70,7 +70,7 @@
 
     check-cast v1, Landroid/view/ViewGroup;
 
-    const v2, 0x7f0d010f
+    const v2, 0x7f0d0118
 
     const/4 v3, 0x0
 
@@ -82,7 +82,7 @@
 
     invoke-virtual {v1, v0}, Lcom/google/android/material/tabs/TabLayout$Tab;->setCustomView(Landroid/view/View;)Lcom/google/android/material/tabs/TabLayout$Tab;
 
-    const v1, 0x7f0a020c
+    const v1, 0x7f0a020d
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -90,7 +90,7 @@
 
     check-cast v1, Landroid/widget/TextView;
 
-    const v2, 0x7f0a020b
+    const v2, 0x7f0a020c
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$3.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$3.smali
index fb0a43565b..fc984398b5 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$3.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsList$configure$3;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$4.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$4.smali
index b78be651fb..094f6d4791 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$4.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$4.smali
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/friends/WidgetFriendsList$configure$4;->invoke(Landroid/view/View;Lcom/discord/models/domain/ModelUser;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -90,7 +90,7 @@
 
     move-result-wide v0
 
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5$1.smali
index c57bf24ef0..2a484d4a71 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5$1.smali
@@ -81,7 +81,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f120095
+    const v1, 0x7f120097
 
     invoke-virtual {p1, v1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5.smali
index d670504b68..ad8b408ab4 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsList$configure$5;->invoke(Lcom/discord/models/domain/ModelUser;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$1.smali
index 89bb64ee87..6466f8bf80 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$1;->invoke(Lcom/google/android/material/tabs/TabLayout;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 b7b67184c8..5ff4b89bd7 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/friends/WidgetFriendsList$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 fac165783c..12ebc6f8cd 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
@@ -40,7 +40,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -90,7 +90,7 @@
 
     invoke-direct {v1, p0, p1, v0, p2}, Lcom/discord/widgets/friends/WidgetFriendsList$addTab$1;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;Lcom/google/android/material/tabs/TabLayout;Lcom/google/android/material/tabs/TabLayout$Tab;I)V
 
-    const v2, 0x7f120699
+    const v2, 0x7f1206b0
 
     if-eq p2, v2, :cond_0
 
@@ -145,19 +145,19 @@
 
     invoke-static {v0, v1, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    const v0, 0x7f120697
+    const v0, 0x7f1206ae
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
 
-    const v0, 0x7f120698
+    const v0, 0x7f1206af
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
 
-    const v0, 0x7f120699
+    const v0, 0x7f1206b0
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
 
-    const v0, 0x7f120319
+    const v0, 0x7f12031e
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
 
@@ -354,7 +354,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d011f
+    const v0, 0x7f0d0127
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemEmpty.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemEmpty.smali
index c615dbfa7c..5aa0dbc24c 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemEmpty.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemEmpty.smali
@@ -66,11 +66,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d0121
+    const v0, 0x7f0d0129
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;-><init>(ILcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
 
-    const v0, 0x7f0a02f5
+    const v0, 0x7f0a02fa
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
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 cae36ae86a..d4781a1ecc 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali
@@ -258,11 +258,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d0120
+    const v0, 0x7f0d0128
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;-><init>(ILcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
 
-    const v0, 0x7f0a02f3
+    const v0, 0x7f0a02f8
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -270,7 +270,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->itemAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a030a
+    const v0, 0x7f0a030f
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -278,7 +278,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02fc
+    const v0, 0x7f0a0301
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -286,7 +286,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->itemGame$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a030b
+    const v0, 0x7f0a0310
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -294,7 +294,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->itemPresence$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0306
+    const v0, 0x7f0a030b
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -302,7 +302,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->itemGuildOverflow$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0308
+    const v0, 0x7f0a030d
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -360,23 +360,23 @@
 
     :array_0
     .array-data 4
-        0x7f0a02fd
-        0x7f0a0300
-        0x7f0a0303
+        0x7f0a0302
+        0x7f0a0305
+        0x7f0a0308
     .end array-data
 
     :array_1
     .array-data 4
-        0x7f0a02fe
-        0x7f0a0301
-        0x7f0a0304
+        0x7f0a0303
+        0x7f0a0306
+        0x7f0a0309
     .end array-data
 
     :array_2
     .array-data 4
-        0x7f0a02ff
-        0x7f0a0302
-        0x7f0a0305
+        0x7f0a0304
+        0x7f0a0307
+        0x7f0a030a
     .end array-data
 .end method
 
@@ -726,7 +726,7 @@
 
     move-result-object v1
 
-    const v4, 0x7f120c8a
+    const v4, 0x7f120cc5
 
     invoke-virtual {v1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -751,7 +751,7 @@
 
     move-result-object v1
 
-    const v4, 0x7f120977
+    const v4, 0x7f120997
 
     invoke-virtual {v1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -770,7 +770,7 @@
 
     move-result-object v7
 
-    const v8, 0x7f07005b
+    const v8, 0x7f07005a
 
     const/4 v9, 0x0
 
@@ -893,7 +893,7 @@
 
     check-cast v6, Landroid/widget/ImageView;
 
-    const v8, 0x7f07005b
+    const v8, 0x7f07005a
 
     const/4 v9, 0x0
 
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 b902ff1229..db8d901bc0 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$onClickAcceptFriend$1;->invoke(Lcom/discord/models/domain/ModelUser;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickAddFriends$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickAddFriends$1.smali
index 3f54992359..127282fb46 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickAddFriends$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickAddFriends$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$onClickAddFriends$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 1b32ef3ad0..f0b3f1338e 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
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$onClickUserProfile$1;->invoke(Landroid/view/View;Lcom/discord/models/domain/ModelUser;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 7cee2f2dda..de994c6a95 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd.smali
@@ -95,7 +95,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a032e
+    const v0, 0x7f0a0337
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -103,7 +103,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsAdd;->joinGuild$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a032c
+    const v0, 0x7f0a0335
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -169,7 +169,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0129
+    const v0, 0x7f0d0131
 
     return v0
 .end method
@@ -210,7 +210,7 @@
 
     check-cast v0, Landroidx/fragment/app/Fragment;
 
-    const v1, 0x7f060136
+    const v1, 0x7f060138
 
     invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion.smali
index 0fe459399a..ea498303c5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion.smali
@@ -152,7 +152,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$bindSubscriptions$1.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$bindSubscriptions$1.smali
index bf47980f09..55a078e2a6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$bindSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$bindSubscriptions$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$bindSubscriptions$1;->invoke(Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$bindSubscriptions$2.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$bindSubscriptions$2.smali
index d27089b20b..27170a0f03 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$bindSubscriptions$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$bindSubscriptions$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$bindSubscriptions$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$1.smali
index 26fc67f115..891920bb53 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$1.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$2.smali
index 5173d78c2a..2465797dc1 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$2.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$2;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$4.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$4.smali
index 80c78731ac..c928a25f27 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$4.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$4;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$5.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$5.smali
index 975c061615..34cd7f145b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$5.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$5.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$5;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$7.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$7.smali
index 644568c2c9..d105633f12 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$7.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$7.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$7;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$8.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$8.smali
index 2108173a7c..c46739a865 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$8.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$8.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$$inlined$apply$lambda$8;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -69,7 +69,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -89,7 +89,7 @@
 
     move-result-wide v1
 
-    invoke-virtual {v0, p1, v1, v2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;->create(Landroid/content/Context;J)V
+    invoke-virtual {v0, p1, v1, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;->create(Landroid/content/Context;J)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$1.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$1.smali
index 894e8150d3..cea6c6b388 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$8.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$8.smali
index 76293e702b..bd9709a57e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$8.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$8.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$configureUI$8;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$2$1.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$2$1.smali
index 7d7fb31142..ffdb9c7c2c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$2$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showChangeNicknameDialog$2$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2.smali
index aa24acbfe6..37a35340ba 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$showLeaveServerDialog$2.smali
@@ -53,7 +53,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali
index 6b63564bde..952ff3ceeb 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali
@@ -416,7 +416,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a0338
+    const v0, 0x7f0a0341
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -424,7 +424,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->headerName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0336
+    const v0, 0x7f0a033f
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -432,7 +432,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->headerIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0337
+    const v0, 0x7f0a0340
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -440,7 +440,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->headerIconName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0334
+    const v0, 0x7f0a033d
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -448,7 +448,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->createCategory$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0335
+    const v0, 0x7f0a033e
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -456,7 +456,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->createChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0330
+    const v0, 0x7f0a0339
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -464,7 +464,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->channelsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0333
+    const v0, 0x7f0a033c
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -472,7 +472,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->copyId$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0339
+    const v0, 0x7f0a0342
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -480,7 +480,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->leave$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a033b
+    const v0, 0x7f0a0344
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -488,7 +488,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->notifications$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a033d
+    const v0, 0x7f0a0346
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -496,7 +496,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->settings$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0332
+    const v0, 0x7f0a033b
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -504,7 +504,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->changeNickname$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a033c
+    const v0, 0x7f0a0345
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -512,7 +512,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->privacy$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a033e
+    const v0, 0x7f0a0347
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -520,7 +520,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->showHideMutedChannels$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a033a
+    const v0, 0x7f0a0343
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -528,7 +528,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->markAsRead$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0331
+    const v0, 0x7f0a033a
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -922,12 +922,12 @@
 
     if-eqz v1, :cond_2
 
-    const v1, 0x7f12102c
+    const v1, 0x7f121069
 
     goto :goto_2
 
     :cond_2
-    const v1, 0x7f1208e5
+    const v1, 0x7f120905
 
     :goto_2
     invoke-virtual {p0, v1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->getString(I)Ljava/lang/String;
@@ -964,7 +964,7 @@
 
     invoke-virtual {v0}, Landroidx/appcompat/app/AlertDialog;->dismiss()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     goto :goto_0
 
@@ -1165,14 +1165,14 @@
 
     if-ne p1, v0, :cond_0
 
-    const p1, 0x7f0401c3
+    const p1, 0x7f0401c5
 
     goto :goto_0
 
     :cond_0
     if-nez p1, :cond_1
 
-    const p1, 0x7f0401c4
+    const p1, 0x7f0401c6
 
     :goto_0
     const/4 v0, 0x0
@@ -1354,31 +1354,31 @@
 
     const/4 v1, 0x0
 
-    const v2, 0x7f0d00dc
+    const v2, 0x7f0d00e5
 
     invoke-static {v0, v2, v1}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
     move-result-object v0
 
-    const v2, 0x7f0a0196
+    const v2, 0x7f0a0197
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v2
 
-    const v3, 0x7f0a0199
+    const v3, 0x7f0a019a
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v3
 
-    const v4, 0x7f0a0198
+    const v4, 0x7f0a0199
 
     invoke-virtual {v0, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v4
 
-    const v5, 0x7f0a0197
+    const v5, 0x7f0a0198
 
     invoke-virtual {v0, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1498,7 +1498,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d00dd
+    const v1, 0x7f0d00e6
 
     const/4 v2, 0x0
 
@@ -1506,7 +1506,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a019c
+    const v1, 0x7f0a019d
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1514,7 +1514,7 @@
 
     check-cast v1, Lcom/discord/app/AppTextView;
 
-    const v2, 0x7f0a019d
+    const v2, 0x7f0a019e
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1522,7 +1522,7 @@
 
     check-cast v2, Lcom/discord/app/AppTextView;
 
-    const v3, 0x7f0a019a
+    const v3, 0x7f0a019b
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1530,7 +1530,7 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    const v4, 0x7f0a019b
+    const v4, 0x7f0a019c
 
     invoke-virtual {v0, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1666,7 +1666,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$bindSubscriptions$1;
 
@@ -1714,7 +1714,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d012a
+    const v0, 0x7f0d0132
 
     return v0
 .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 1ae29aa76b..1a86a69330 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
@@ -134,7 +134,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->inflater:Landroid/view/LayoutInflater;
 
-    const v3, 0x7f0d012d
+    const v3, 0x7f0d0135
 
     iget-object v4, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->serverRegionsView:Landroid/view/ViewGroup;
 
@@ -256,7 +256,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eJ()Landroid/widget/Checkable;
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eO()Landroid/widget/Checkable;
 
     move-result-object v0
 
@@ -279,7 +279,7 @@
 .method private getCommunityGuidelines()Ljava/lang/CharSequence;
     .locals 4
 
-    const v0, 0x7f12046c
+    const v0, 0x7f120476
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->getString(I)Ljava/lang/String;
 
@@ -313,7 +313,7 @@
 .method private handleGuildCreate(Landroid/view/Menu;)V
     .locals 1
 
-    const v0, 0x7f0a0454
+    const v0, 0x7f0a0464
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -399,7 +399,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d012c
+    const v0, 0x7f0d0134
 
     return v0
 .end method
@@ -461,7 +461,7 @@
 
     if-eqz v1, :cond_0
 
-    const p1, 0x7f120fdf
+    const p1, 0x7f12101a
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -474,7 +474,7 @@
 
     if-eqz v1, :cond_1
 
-    const p1, 0x7f1211ad
+    const p1, 0x7f1211f1
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -495,7 +495,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -539,9 +539,9 @@
 .method public synthetic lambda$null$3$WidgetGuildCreate()V
     .locals 2
 
-    const v0, 0x7f1203c4
+    const v0, 0x7f1203ca
 
-    const v1, 0x7f12119d
+    const v1, 0x7f1211e1
 
     invoke-static {p0, v0, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
 
@@ -611,7 +611,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->guildCreateIcon:Landroid/widget/ImageView;
 
-    const v1, 0x7f070056
+    const v1, 0x7f070055
 
     invoke-static {v0, p1, v1}, Lcom/discord/utilities/icon/IconUtils;->setIcon(Landroid/widget/ImageView;Ljava/lang/String;I)V
 
@@ -643,7 +643,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f120467
+    const p1, 0x7f120471
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -661,15 +661,25 @@
 .end method
 
 .method public onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
-    .locals 0
+    .locals 6
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->getContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object p2
+    move-result-object v2
 
-    invoke-static {p2, p0, p1}, Lcom/discord/utilities/images/MGImages;->requestAvatarCrop(Landroid/content/Context;Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Landroid/net/Uri;)V
+    iget-object v4, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->guildCreateIconSelectedResult:Lrx/functions/Action1;
+
+    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->wB:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+    move-object v0, p1
+
+    move-object v1, p2
+
+    move-object v3, p0
+
+    invoke-static/range {v0 .. v5}, 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
 .end method
@@ -695,7 +705,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -705,7 +715,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->dimmer:Lcom/discord/utilities/dimmer/DimmerView;
 
-    const v0, 0x7f0a0346
+    const v0, 0x7f0a034f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -715,7 +725,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->serverNameView:Landroid/widget/EditText;
 
-    const v0, 0x7f0a0347
+    const v0, 0x7f0a0350
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -725,7 +735,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->serverRegionsView:Landroid/view/ViewGroup;
 
-    const v0, 0x7f0a0345
+    const v0, 0x7f0a034e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -733,7 +743,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->guildCreateWrap:Landroid/view/View;
 
-    const v0, 0x7f0a0343
+    const v0, 0x7f0a034c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -743,7 +753,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->guildCreateIcon:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a0344
+    const v0, 0x7f0a034d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -753,7 +763,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->guildCreateIconPlaceholder:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a0342
+    const v0, 0x7f0a034b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -801,7 +811,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali b/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali
new file mode 100644
index 0000000000..023093cce3
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali
@@ -0,0 +1,147 @@
+.class public final Lcom/discord/widgets/guilds/invite/GuildInviteUiHelperKt;
+.super Ljava/lang/Object;
+.source "GuildInviteUiHelper.kt"
+
+
+# direct methods
+.method public static final copyLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;Landroid/content/Intent;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mostRecentIntent"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "com.discord.intent.ORIGIN_SOURCE"
+
+    invoke-virtual {p2, v0}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
+    if-nez p2, :cond_0
+
+    const-string p2, ""
+
+    :cond_0
+    invoke-static {p1, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteCopied(Lcom/discord/models/domain/ModelInvite;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object p2
+
+    const-string v0, "context.resources"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(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
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    const p2, 0x7f120a23
+
+    invoke-static {p0, p1, p2}, Lcom/discord/app/h;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V
+
+    return-void
+.end method
+
+.method private static final getInviteLink(Lcom/discord/models/domain/ModelInvite;Landroid/content/res/Resources;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "https://discord.gg"
+
+    if-nez p0, :cond_0
+
+    return-object v0
+
+    :cond_0
+    invoke-virtual {p0, p1, v0}, Lcom/discord/models/domain/ModelInvite;->toLink(Landroid/content/res/Resources;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "inviteModel.toLink(resou\u2026 BuildConfig.HOST_INVITE)"
+
+    invoke-static {p0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public static final shareLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;Z)V
+    .locals 2
+
+    const-string v0, "invite"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteShareClicked(Lcom/discord/models/domain/ModelInvite;)V
+
+    if-eqz p0, :cond_1
+
+    invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v0
+
+    const-string v1, "context.resources"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(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;
+
+    move-result-object p1
+
+    if-eqz p2, :cond_0
+
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v0
+
+    const v1, 0x7f1209be
+
+    invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, "\n"
+
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    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
+
+    :cond_0
+    const-string p2, "if (isInTreatment)\n     \u2026    else\n      inviteLink"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object p2
+
+    const v0, 0x7f12117e
+
+    invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+
+    move-result-object p2
+
+    const-string v0, "context.resources.getStr\u2026ip_instant_invite_title3)"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1, p2}, Lcom/discord/utilities/intent/IntentUtils;->performChooserSendIntent(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
+
+    :cond_1
+    return-void
+.end method
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 73651efb24..34e0ed6424 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/InviteGenerator$generate$1;->invoke(Lcom/discord/models/domain/ModelInvite;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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
new file mode 100644
index 0000000000..719dabc404
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1;
+.super Lkotlin/jvm/internal/l;
+.source "InviteGenerator.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/InviteGenerator;->generateForAppComponent(Lcom/discord/app/AppComponent;J)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/models/domain/ModelInvite;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/InviteGenerator;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/InviteGenerator;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1;->this$0:Lcom/discord/widgets/guilds/invite/InviteGenerator;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelInvite;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1;->invoke(Lcom/discord/models/domain/ModelInvite;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/models/domain/ModelInvite;)V
+    .locals 1
+
+    const-string v0, "invite"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.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 718c24b64f..21ee435fac 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator.smali
@@ -60,7 +60,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generationStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -210,7 +210,7 @@
 
     move-result-object p2
 
-    sget-object p3, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object p3, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     invoke-virtual {p1}, Lcom/discord/app/AppFragment;->getContext()Landroid/content/Context;
 
@@ -241,6 +241,94 @@
     return-void
 .end method
 
+.method public final generateForAppComponent(Lcom/discord/app/AppComponent;J)V
+    .locals 15
+
+    move-object v0, p0
+
+    move-object/from16 v1, p1
+
+    const-string v2, "appComponent"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, v0, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generationStateSubject:Lrx/subjects/BehaviorSubject;
+
+    const-string v3, "generationStateSubject"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Lrx/subjects/BehaviorSubject;->getValue()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;
+
+    iget-object v3, v0, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generationStateSubject:Lrx/subjects/BehaviorSubject;
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    invoke-static {v2, v5, v4, v4, v5}, 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 v2
+
+    invoke-virtual {v3, v2}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getInviteSettings()Lcom/discord/stores/StoreInviteSettings;
+
+    move-result-object v6
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x2
+
+    const/4 v11, 0x0
+
+    move-wide/from16 v7, p2
+
+    invoke-static/range {v6 .. v11}, Lcom/discord/stores/StoreInviteSettings;->generateInvite$default(Lcom/discord/stores/StoreInviteSettings;JLcom/discord/models/domain/ModelInvite$Settings;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v2
+
+    invoke-static {v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object v2
+
+    const/4 v3, 0x2
+
+    invoke-static {v2, v1, 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;
+
+    move-result-object v6
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v7
+
+    new-instance v1, Lcom/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1;-><init>(Lcom/discord/widgets/guilds/invite/InviteGenerator;)V
+
+    move-object v12, v1
+
+    check-cast v12, Lkotlin/jvm/functions/Function1;
+
+    const/4 v8, 0x0
+
+    const/4 v10, 0x0
+
+    const/16 v13, 0x1e
+
+    const/4 v14, 0x0
+
+    invoke-static/range {v6 .. v14}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+
+    return-void
+.end method
+
 .method public final getGenerationState()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
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
new file mode 100644
index 0000000000..2c5a91c6f7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion$Channel.smali
@@ -0,0 +1,163 @@
+.class public final Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
+.super Lcom/discord/widgets/guilds/invite/InviteSuggestion;
+.source "InviteSuggestion.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/guilds/invite/InviteSuggestion;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Channel"
+.end annotation
+
+
+# instance fields
+.field private final channel:Lcom/discord/models/domain/ModelChannel;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/models/domain/ModelChannel;)V
+    .locals 1
+
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.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;
+    .locals 0
+
+    and-int/lit8 p2, p2, 0x1
+
+    if-eqz p2, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->channel:Lcom/discord/models/domain/ModelChannel;
+
+    :cond_0
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->copy(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/models/domain/ModelChannel;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->channel:Lcom/discord/models/domain/ModelChannel;
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
+    .locals 1
+
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->channel:Lcom/discord/models/domain/ModelChannel;
+
+    iget-object p1, p1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->channel:Lcom/discord/models/domain/ModelChannel;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getChannel()Lcom/discord/models/domain/ModelChannel;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->channel:Lcom/discord/models/domain/ModelChannel;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->channel:Lcom/discord/models/domain/ModelChannel;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "Channel(channel="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->channel:Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion$User.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion$User.smali
new file mode 100644
index 0000000000..be519f4132
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion$User.smali
@@ -0,0 +1,163 @@
+.class public final Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;
+.super Lcom/discord/widgets/guilds/invite/InviteSuggestion;
+.source "InviteSuggestion.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/guilds/invite/InviteSuggestion;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "User"
+.end annotation
+
+
+# instance fields
+.field private final user:Lcom/discord/models/domain/ModelUser;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;)V
+    .locals 1
+
+    const-string v0, "user"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.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;
+    .locals 0
+
+    and-int/lit8 p2, p2, 0x1
+
+    if-eqz p2, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->user:Lcom/discord/models/domain/ModelUser;
+
+    :cond_0
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->copy(Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;
+    .locals 1
+
+    const-string v0, "user"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->user:Lcom/discord/models/domain/ModelUser;
+
+    iget-object p1, p1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getUser()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->user:Lcom/discord/models/domain/ModelUser;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "User(user="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion.smali
new file mode 100644
index 0000000000..03d9f749db
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion.smali
@@ -0,0 +1,30 @@
+.class public abstract Lcom/discord/widgets/guilds/invite/InviteSuggestion;
+.super Ljava/lang/Object;
+.source "InviteSuggestion.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;,
+        Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
+    }
+.end annotation
+
+
+# direct methods
+.method private 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/guilds/invite/InviteSuggestion;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$Companion.smali
new file mode 100644
index 0000000000..b9388c7e91
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$Companion.smali
@@ -0,0 +1,56 @@
+.class public final Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;
+.super Ljava/lang/Object;
+.source "InviteSuggestionsService.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/guilds/invite/InviteSuggestionsService$Companion;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final create()Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;
+    .locals 3
+
+    new-instance v0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;
+
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getMessagesMostRecent()Lcom/discord/stores/StoreMessagesMostRecent;
+
+    move-result-object v2
+
+    invoke-direct {v0, v1, v2}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;-><init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreMessagesMostRecent;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1.smali
similarity index 55%
rename from com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1.smali
rename to com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1.smali
index 64829148d6..259f12c61c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1;
+.class final Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;
 .super Ljava/lang/Object;
-.source "WidgetGuildInviteShare.kt"
+.source "InviteSuggestionsService.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;->getSuggestions()Lrx/Observable;
+    value = Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->observeInviteSuggestions()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,18 +33,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1;
+.field public static final INSTANCE:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1;
+    new-instance v0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1;
+    sput-object v0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     check-cast p2, Ljava/util/Map;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1;->call(Ljava/util/Map;Ljava/util/Map;)Ljava/util/List;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;->call(Ljava/util/Map;Ljava/util/Map;)Ljava/util/List;
 
     move-result-object p1
 
@@ -88,7 +88,7 @@
             "Ljava/lang/Long;",
             ">;)",
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelChannel;",
+            "Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;",
             ">;"
         }
     .end annotation
@@ -113,5 +113,47 @@
 
     move-result-object p1
 
-    return-object p1
+    check-cast p1, Ljava/lang/Iterable;
+
+    new-instance p2, Ljava/util/ArrayList;
+
+    const/16 v0, 0xa
+
+    invoke-static {p1, v0}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
+
+    move-result v0
+
+    invoke-direct {p2, v0}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast p2, Ljava/util/Collection;
+
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result 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/models/domain/ModelChannel;
+
+    new-instance v1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
+
+    invoke-direct {v1, v0}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;-><init>(Lcom/discord/models/domain/ModelChannel;)V
+
+    invoke-interface {p2, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    check-cast p2, Ljava/util/List;
+
+    return-object p2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali
new file mode 100644
index 0000000000..93e79262a5
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali
@@ -0,0 +1,118 @@
+.class public final Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;
+.super Ljava/lang/Object;
+.source "InviteSuggestionsService.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;
+
+
+# instance fields
+.field private final storeChannels:Lcom/discord/stores/StoreChannels;
+
+.field private final storeMessagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->Companion:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreMessagesMostRecent;)V
+    .locals 1
+
+    const-string v0, "storeChannels"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeMessagesMostRecent"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeChannels:Lcom/discord/stores/StoreChannels;
+
+    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeMessagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getStoreChannels()Lcom/discord/stores/StoreChannels;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeChannels:Lcom/discord/stores/StoreChannels;
+
+    return-object v0
+.end method
+
+.method public final getStoreMessagesMostRecent()Lcom/discord/stores/StoreMessagesMostRecent;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeMessagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent;
+
+    return-object v0
+.end method
+
+.method public final observeInviteSuggestions()Lrx/Observable;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Ljava/util/List<",
+            "Lcom/discord/widgets/guilds/invite/InviteSuggestion;",
+            ">;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeChannels:Lcom/discord/stores/StoreChannels;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreChannels;->getPrivate()Lrx/Observable;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeMessagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMessagesMostRecent;->get()Lrx/Observable;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lrx/Observable;->JU()Lrx/Observable;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;
+
+    check-cast v2, Lrx/functions/Func2;
+
+    invoke-static {v0, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "Observable.combineLatest\u2026gestion.Channel(it) }\n  }"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
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 b622971fd4..7303cbc363 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
@@ -52,12 +52,12 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f0a0182
+    const v0, 0x7f0a0183
 
     return v0
 
     :cond_0
-    const v0, 0x7f0a0183
+    const v0, 0x7f0a0184
 
     return v0
 .end method
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 5ae02bcb84..878de156bd 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
@@ -108,7 +108,7 @@
 
     invoke-static {p1, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p3, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object p3, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
     const/4 p3, 0x1
 
@@ -166,7 +166,7 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p3, 0x7f0d0090
+    const p3, 0x7f0d0098
 
     const/4 v0, 0x1
 
@@ -204,7 +204,7 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p3, 0x7f0d008f
+    const p3, 0x7f0d0097
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10.smali
index d58b485031..985f057d24 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10.smali
@@ -39,17 +39,63 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 1
+    .locals 2
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getOnGenerateLinkListener()Lkotlin/jvm/functions/Function1;
+    invoke-static {p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->access$getPendingInviteSettings$p(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)Lcom/discord/models/domain/ModelInvite$Settings;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10;->$data:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+    if-eqz p1, :cond_0
 
-    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getViewModel()Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->updateInviteSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V
+
+    :cond_0
+    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10;->$data:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getTargetChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Number;
+
+    invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
+
+    move-result-wide v0
+
+    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getViewModel()Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->generateInviteLink(J)V
+
+    :cond_1
+    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getOnGenerateLinkListener()Lkotlin/jvm/functions/Function0;
+
+    move-result-object p1
+
+    invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4.smali
index ccee6d22d4..4ed3853539 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4.smali
@@ -18,19 +18,15 @@
 
 
 # instance fields
-.field final synthetic $settings:Lcom/discord/models/domain/ModelInvite$Settings;
-
 .field final synthetic this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;Lcom/discord/models/domain/ModelInvite$Settings;)V
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4;->$settings:Lcom/discord/models/domain/ModelInvite$Settings;
-
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -43,21 +39,23 @@
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getUpdateSettings()Lkotlin/jvm/functions/Function1;
+    invoke-static {p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->access$getPendingInviteSettings$p(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)Lcom/discord/models/domain/ModelInvite$Settings;
 
-    move-result-object p1
+    move-result-object v0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4;->$settings:Lcom/discord/models/domain/ModelInvite$Settings;
+    if-eqz v0, :cond_0
 
     invoke-virtual {v0, p2}, Lcom/discord/models/domain/ModelInvite$Settings;->mergeMaxAge(I)Lcom/discord/models/domain/ModelInvite$Settings;
 
     move-result-object p2
 
-    const-string v0, "settings.mergeMaxAge(checkedId)"
+    goto :goto_0
 
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    :cond_0
+    const/4 p2, 0x0
 
-    invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    :goto_0
+    invoke-static {p1, p2}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->access$setPendingInviteSettings$p(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;Lcom/discord/models/domain/ModelInvite$Settings;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8.smali
index 626738d5ad..3c6b077873 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8.smali
@@ -18,19 +18,15 @@
 
 
 # instance fields
-.field final synthetic $settings:Lcom/discord/models/domain/ModelInvite$Settings;
-
 .field final synthetic this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;Lcom/discord/models/domain/ModelInvite$Settings;)V
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8;->$settings:Lcom/discord/models/domain/ModelInvite$Settings;
-
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -43,21 +39,23 @@
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getUpdateSettings()Lkotlin/jvm/functions/Function1;
+    invoke-static {p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->access$getPendingInviteSettings$p(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)Lcom/discord/models/domain/ModelInvite$Settings;
 
-    move-result-object p1
+    move-result-object v0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8;->$settings:Lcom/discord/models/domain/ModelInvite$Settings;
+    if-eqz v0, :cond_0
 
     invoke-virtual {v0, p2}, Lcom/discord/models/domain/ModelInvite$Settings;->mergeMaxUses(I)Lcom/discord/models/domain/ModelInvite$Settings;
 
     move-result-object p2
 
-    const-string v0, "settings.mergeMaxUses(checkedId)"
+    goto :goto_0
 
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    :cond_0
+    const/4 p2, 0x0
 
-    invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    :goto_0
+    invoke-static {p1, p2}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->access$setPendingInviteSettings$p(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;Lcom/discord/models/domain/ModelInvite$Settings;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9.smali
index 757e21e37a..d5e54097f9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9.smali
@@ -18,19 +18,15 @@
 
 
 # instance fields
-.field final synthetic $settings:Lcom/discord/models/domain/ModelInvite$Settings;
-
 .field final synthetic this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;Lcom/discord/models/domain/ModelInvite$Settings;)V
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9;->$settings:Lcom/discord/models/domain/ModelInvite$Settings;
-
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -51,11 +47,11 @@
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getUpdateSettings()Lkotlin/jvm/functions/Function1;
+    invoke-static {p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->access$getPendingInviteSettings$p(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)Lcom/discord/models/domain/ModelInvite$Settings;
 
-    move-result-object p1
+    move-result-object v0
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9;->$settings:Lcom/discord/models/domain/ModelInvite$Settings;
+    if-eqz v0, :cond_0
 
     iget-object v1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
@@ -71,11 +67,13 @@
 
     move-result-object v0
 
-    const-string v1, "settings.mergeTemporary(\u2026mbershipSwitch.isChecked)"
+    goto :goto_0
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    :cond_0
+    const/4 v0, 0x0
 
-    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    :goto_0
+    invoke-static {p1, v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->access$setPendingInviteSettings$p(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;Lcom/discord/models/domain/ModelInvite$Settings;)V
 
     return-void
 .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 db84d833c7..fad1427e1d 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
@@ -3,7 +3,7 @@
 .source "ViewInviteSettingsSheet.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lkotlin/jvm/functions/Function0;
 
 
 # annotations
@@ -19,8 +19,7 @@
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
+        "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -47,7 +46,7 @@
 .method constructor <init>()V
     .locals 1
 
-    const/4 v0, 0x1
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
 
@@ -56,24 +55,18 @@
 
 
 # virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1;->invoke(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V
+.method public final bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    const-string v0, "it"
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1;->invoke()V
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 0
 
     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 c4627eef4a..9b2554775c 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
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setOnItemSelected(Lkotlin/jvm/functions/Function2;)V
+    value = Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setOnItemSelected()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,26 +18,20 @@
 
 
 # instance fields
-.field final synthetic $listener:Lkotlin/jvm/functions/Function2;
-
 .field final synthetic this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;Lkotlin/jvm/functions/Function2;)V
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(",
-            "Lkotlin/jvm/functions/Function2;",
-            ")V"
+            "()V"
         }
     .end annotation
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1;->$listener:Lkotlin/jvm/functions/Function2;
-
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -77,9 +71,17 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p3, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1;->$listener:Lkotlin/jvm/functions/Function2;
+    iget-object p2, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    invoke-interface {p3, p1, p2}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {p2}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getViewModel()Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    move-result-object p2
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide p3
+
+    invoke-virtual {p2, p3, p4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectChannel(J)V
 
     :cond_0
     return-void
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 06889624e0..39424f185d 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$updateSettings$1;->invoke(Lcom/discord/models/domain/ModelInvite$Settings;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 c549dec806..13ce09f8a6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
@@ -26,18 +26,18 @@
 
 .field private final maxUsesRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private onGenerateLinkListener:Lkotlin/jvm/functions/Function1;
+.field private onGenerateLinkListener:Lkotlin/jvm/functions/Function0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
+            "Lkotlin/jvm/functions/Function0<",
             "Lkotlin/Unit;",
             ">;"
         }
     .end annotation
 .end field
 
+.field private pendingInviteSettings:Lcom/discord/models/domain/ModelInvite$Settings;
+
 .field private final temporaryMembershipSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private updateSettings:Lkotlin/jvm/functions/Function1;
@@ -52,6 +52,8 @@
     .end annotation
 .end field
 
+.field public viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -187,7 +189,7 @@
 
     invoke-direct {p0, p1}, Landroidx/core/widget/NestedScrollView;-><init>(Landroid/content/Context;)V
 
-    const p1, 0x7f0a034b
+    const p1, 0x7f0a0354
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -195,7 +197,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a034d
+    const p1, 0x7f0a035b
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -203,7 +205,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->expiresAfterRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0351
+    const p1, 0x7f0a0361
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -211,7 +213,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->maxUsesRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0358
+    const p1, 0x7f0a0368
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -219,7 +221,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->temporaryMembershipSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a034e
+    const p1, 0x7f0a035e
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -237,7 +239,7 @@
 
     invoke-static {v1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0d008f
+    const v2, 0x7f0d0097
 
     const/4 v3, 0x0
 
@@ -259,9 +261,9 @@
 
     sget-object p1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1;
 
-    check-cast p1, Lkotlin/jvm/functions/Function1;
+    check-cast p1, Lkotlin/jvm/functions/Function0;
 
-    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->onGenerateLinkListener:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->onGenerateLinkListener:Lkotlin/jvm/functions/Function0;
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getContext()Landroid/content/Context;
 
@@ -271,7 +273,7 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d008c
+    const v1, 0x7f0d0094
 
     invoke-static {p1, v1, v0}, Landroidx/core/widget/NestedScrollView;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -325,6 +327,8 @@
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->createHorizontalCheckableButtons(Landroid/widget/RadioGroup;[ILkotlin/jvm/functions/Function1;)V
 
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setOnItemSelected()V
+
     return-void
 .end method
 
@@ -341,7 +345,7 @@
 
     invoke-direct {p0, p1, p2}, Landroidx/core/widget/NestedScrollView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p1, 0x7f0a034b
+    const p1, 0x7f0a0354
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -349,7 +353,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a034d
+    const p1, 0x7f0a035b
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -357,7 +361,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->expiresAfterRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0351
+    const p1, 0x7f0a0361
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -365,7 +369,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->maxUsesRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0358
+    const p1, 0x7f0a0368
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -373,7 +377,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->temporaryMembershipSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a034e
+    const p1, 0x7f0a035e
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -391,7 +395,7 @@
 
     invoke-static {v1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0d008f
+    const v2, 0x7f0d0097
 
     const/4 v3, 0x0
 
@@ -413,9 +417,9 @@
 
     sget-object p1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1;
 
-    check-cast p1, Lkotlin/jvm/functions/Function1;
+    check-cast p1, Lkotlin/jvm/functions/Function0;
 
-    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->onGenerateLinkListener:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->onGenerateLinkListener:Lkotlin/jvm/functions/Function0;
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getContext()Landroid/content/Context;
 
@@ -425,7 +429,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d008c
+    const v0, 0x7f0d0094
 
     invoke-static {p1, v0, p2}, Landroidx/core/widget/NestedScrollView;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -479,6 +483,8 @@
 
     invoke-direct {p0, p1, p2, v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->createHorizontalCheckableButtons(Landroid/widget/RadioGroup;[ILkotlin/jvm/functions/Function1;)V
 
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setOnItemSelected()V
+
     return-void
 .end method
 
@@ -495,7 +501,7 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/core/widget/NestedScrollView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p1, 0x7f0a034b
+    const p1, 0x7f0a0354
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -503,7 +509,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a034d
+    const p1, 0x7f0a035b
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -511,7 +517,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->expiresAfterRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0351
+    const p1, 0x7f0a0361
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -519,7 +525,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->maxUsesRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0358
+    const p1, 0x7f0a0368
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -527,7 +533,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->temporaryMembershipSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a034e
+    const p1, 0x7f0a035e
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -545,7 +551,7 @@
 
     invoke-static {v1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0d008f
+    const v2, 0x7f0d0097
 
     const/4 v3, 0x0
 
@@ -567,9 +573,9 @@
 
     sget-object p1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1;
 
-    check-cast p1, Lkotlin/jvm/functions/Function1;
+    check-cast p1, Lkotlin/jvm/functions/Function0;
 
-    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->onGenerateLinkListener:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->onGenerateLinkListener:Lkotlin/jvm/functions/Function0;
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getContext()Landroid/content/Context;
 
@@ -579,7 +585,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d008c
+    const p3, 0x7f0d0094
 
     invoke-static {p1, p3, p2}, Landroidx/core/widget/NestedScrollView;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -633,6 +639,8 @@
 
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->createHorizontalCheckableButtons(Landroid/widget/RadioGroup;[ILkotlin/jvm/functions/Function1;)V
 
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setOnItemSelected()V
+
     return-void
 .end method
 
@@ -664,6 +672,14 @@
     return-object p0
 .end method
 
+.method public static final synthetic access$getPendingInviteSettings$p(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)Lcom/discord/models/domain/ModelInvite$Settings;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->pendingInviteSettings:Lcom/discord/models/domain/ModelInvite$Settings;
+
+    return-object p0
+.end method
+
 .method public static final synthetic access$getTemporaryMembershipSwitch$p(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)Lcom/discord/views/CheckedSetting;
     .locals 0
 
@@ -674,6 +690,14 @@
     return-object p0
 .end method
 
+.method public static final synthetic access$setPendingInviteSettings$p(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;Lcom/discord/models/domain/ModelInvite$Settings;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->pendingInviteSettings:Lcom/discord/models/domain/ModelInvite$Settings;
+
+    return-void
+.end method
+
 .method private final createHorizontalCheckableButtons(Landroid/widget/RadioGroup;[ILkotlin/jvm/functions/Function1;)V
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
@@ -719,7 +743,7 @@
 
     move-result-object v5
 
-    const v6, 0x7f0d009a
+    const v6, 0x7f0d00a2
 
     move-object v7, p1
 
@@ -879,6 +903,10 @@
 
     move-result-object p1
 
+    const-string v0, "resources.getQuantityStr\u2026duration_days_days, 1, 1)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-object p1
 
     :cond_1
@@ -900,6 +928,10 @@
 
     move-result-object p1
 
+    const-string v0, "resources.getQuantityStr\u2026tion_hours_hours, 12, 12)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-object p1
 
     :cond_2
@@ -921,6 +953,10 @@
 
     move-result-object p1
 
+    const-string v0, "resources.getQuantityStr\u2026ration_hours_hours, 6, 6)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-object p1
 
     :cond_3
@@ -940,6 +976,10 @@
 
     move-result-object p1
 
+    const-string v0, "resources.getQuantityStr\u2026ration_hours_hours, 1, 1)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-object p1
 
     :cond_4
@@ -963,10 +1003,14 @@
 
     move-result-object p1
 
+    const-string v0, "resources.getQuantityStr\u2026ration_mins_mins, 30, 30)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-object p1
 
     :cond_5
-    const p1, 0x7f120be3
+    const p1, 0x7f120c15
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -1072,10 +1116,28 @@
     return-object v0
 .end method
 
+.method private final setOnItemSelected()V
+    .locals 2
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getChannelSpinner()Landroid/widget/Spinner;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1;-><init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
+
+    check-cast v1, Landroid/widget/AdapterView$OnItemSelectedListener;
+
+    invoke-virtual {v0, v1}, Landroid/widget/Spinner;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V
+
+    return-void
+.end method
+
 
 # virtual methods
 .method public final configureUi(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V
-    .locals 10
+    .locals 9
 
     const-string v0, "data"
 
@@ -1089,7 +1151,7 @@
 
     check-cast v1, Ljava/util/Collection;
 
-    if-eqz v1, :cond_11
+    if-eqz v1, :cond_12
 
     const/4 v2, 0x0
 
@@ -1099,7 +1161,7 @@
 
     move-result-object v1
 
-    if-eqz v1, :cond_10
+    if-eqz v1, :cond_11
 
     check-cast v1, [Lcom/discord/models/domain/ModelChannel;
 
@@ -1188,183 +1250,48 @@
     return-void
 
     :cond_3
+    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 {v2, v1}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v2, v0}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Ljava/lang/Iterable;
+    check-cast v0, Ljava/lang/Iterable;
 
-    new-instance v3, Ljava/util/ArrayList;
+    new-instance v1, Ljava/util/ArrayList;
 
-    const/16 v5, 0xa
+    const/16 v3, 0xa
 
-    invoke-static {v1, v5}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
+    invoke-static {v0, v3}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
 
-    move-result v6
+    move-result v5
 
-    invoke-direct {v3, v6}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v1, v5}, Ljava/util/ArrayList;-><init>(I)V
 
-    check-cast v3, Ljava/util/Collection;
+    check-cast v1, Ljava/util/Collection;
 
-    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
-
-    move-result v6
-
-    const-string v7, "null cannot be cast to non-null type android.widget.RadioButton"
-
-    if-eqz v6, :cond_5
-
-    move-object v6, v1
-
-    check-cast v6, Lkotlin/a/ab;
-
-    invoke-virtual {v6}, Lkotlin/a/ab;->nextInt()I
-
-    move-result v6
-
-    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getExpiresAfterRadioGroup()Landroid/widget/RadioGroup;
-
-    move-result-object v8
-
-    invoke-virtual {v8, v6}, Landroid/widget/RadioGroup;->getChildAt(I)Landroid/view/View;
-
-    move-result-object v6
-
-    if-eqz v6, :cond_4
-
-    check-cast v6, Landroid/widget/RadioButton;
-
-    invoke-interface {v3, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_3
-
-    :cond_4
-    new-instance p1, Lkotlin/r;
-
-    invoke-direct {p1, v7}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_5
-    check-cast v3, Ljava/util/List;
-
-    check-cast v3, Ljava/lang/Iterable;
-
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :cond_6
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    const/4 v6, 0x0
-
-    if-eqz v3, :cond_8
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    move-object v8, v3
-
-    check-cast v8, Landroid/widget/RadioButton;
-
-    invoke-virtual {v8}, Landroid/widget/RadioButton;->getId()I
-
-    move-result v8
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxAge()I
-
-    move-result v9
-
-    if-ne v8, v9, :cond_7
-
-    const/4 v8, 0x1
-
-    goto :goto_4
-
-    :cond_7
-    const/4 v8, 0x0
-
-    :goto_4
-    if-eqz v8, :cond_6
-
-    goto :goto_5
-
-    :cond_8
-    move-object v3, v6
-
-    :goto_5
-    check-cast v3, Landroid/widget/RadioButton;
-
-    if-eqz v3, :cond_9
-
-    invoke-virtual {v3, v4}, Landroid/widget/RadioButton;->setChecked(Z)V
-
-    :cond_9
-    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getExpiresAfterRadioGroup()Landroid/widget/RadioGroup;
-
-    move-result-object v1
-
-    new-instance v3, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4;
-
-    invoke-direct {v3, p0, v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4;-><init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;Lcom/discord/models/domain/ModelInvite$Settings;)V
-
-    check-cast v3, Landroid/widget/RadioGroup$OnCheckedChangeListener;
-
-    invoke-virtual {v1, v3}, 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
-
-    invoke-virtual {v1}, Landroid/widget/RadioGroup;->getChildCount()I
-
-    move-result v1
-
-    invoke-static {v2, v1}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/Iterable;
-
-    new-instance v3, Ljava/util/ArrayList;
-
-    invoke-static {v1, v5}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v5
 
-    invoke-direct {v3, v5}, Ljava/util/ArrayList;-><init>(I)V
+    const-string v6, "null cannot be cast to non-null type android.widget.RadioButton"
 
-    check-cast v3, Ljava/util/Collection;
+    if-eqz v5, :cond_5
 
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :goto_6
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_b
-
-    move-object v5, v1
+    move-object v5, v0
 
     check-cast v5, Lkotlin/a/ab;
 
@@ -1372,119 +1299,269 @@
 
     move-result v5
 
-    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getMaxUsesRadioGroup()Landroid/widget/RadioGroup;
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getExpiresAfterRadioGroup()Landroid/widget/RadioGroup;
 
-    move-result-object v8
+    move-result-object v7
 
-    invoke-virtual {v8, v5}, Landroid/widget/RadioGroup;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {v7, v5}, Landroid/widget/RadioGroup;->getChildAt(I)Landroid/view/View;
 
     move-result-object v5
 
-    if-eqz v5, :cond_a
+    if-eqz v5, :cond_4
 
     check-cast v5, Landroid/widget/RadioButton;
 
-    invoke-interface {v3, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v1, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_3
+
+    :cond_4
+    new-instance p1, Lkotlin/r;
+
+    invoke-direct {p1, v6}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_5
+    check-cast v1, Ljava/util/List;
+
+    check-cast v1, Ljava/lang/Iterable;
+
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_6
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    const/4 v5, 0x0
+
+    if-eqz v1, :cond_8
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    move-object v7, v1
+
+    check-cast v7, Landroid/widget/RadioButton;
+
+    invoke-virtual {v7}, Landroid/widget/RadioButton;->getId()I
+
+    move-result v7
+
+    iget-object v8, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->pendingInviteSettings:Lcom/discord/models/domain/ModelInvite$Settings;
+
+    if-eqz v8, :cond_7
+
+    invoke-virtual {v8}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxAge()I
+
+    move-result v8
+
+    if-ne v7, v8, :cond_7
+
+    const/4 v7, 0x1
+
+    goto :goto_4
+
+    :cond_7
+    const/4 v7, 0x0
+
+    :goto_4
+    if-eqz v7, :cond_6
+
+    goto :goto_5
+
+    :cond_8
+    move-object v1, v5
+
+    :goto_5
+    check-cast v1, Landroid/widget/RadioButton;
+
+    if-eqz v1, :cond_9
+
+    invoke-virtual {v1, v4}, Landroid/widget/RadioButton;->setChecked(Z)V
+
+    :cond_9
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getExpiresAfterRadioGroup()Landroid/widget/RadioGroup;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4;-><init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
+
+    check-cast v1, Landroid/widget/RadioGroup$OnCheckedChangeListener;
+
+    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 v0
+
+    invoke-virtual {v0}, Landroid/widget/RadioGroup;->getChildCount()I
+
+    move-result v0
+
+    invoke-static {v2, v0}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Iterable;
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-static {v0, v3}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
+
+    move-result v3
+
+    invoke-direct {v1, v3}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast v1, Ljava/util/Collection;
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_6
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_b
+
+    move-object v3, v0
+
+    check-cast v3, Lkotlin/a/ab;
+
+    invoke-virtual {v3}, Lkotlin/a/ab;->nextInt()I
+
+    move-result v3
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getMaxUsesRadioGroup()Landroid/widget/RadioGroup;
+
+    move-result-object v7
+
+    invoke-virtual {v7, v3}, Landroid/widget/RadioGroup;->getChildAt(I)Landroid/view/View;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_a
+
+    check-cast v3, Landroid/widget/RadioButton;
+
+    invoke-interface {v1, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_6
 
     :cond_a
     new-instance p1, Lkotlin/r;
 
-    invoke-direct {p1, v7}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v6}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_b
-    check-cast v3, Ljava/util/List;
+    check-cast v1, Ljava/util/List;
 
-    check-cast v3, Ljava/lang/Iterable;
+    check-cast v1, Ljava/lang/Iterable;
 
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_c
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_e
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v1
 
-    :cond_c
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    move-object v3, v1
+
+    check-cast v3, Landroid/widget/RadioButton;
+
+    invoke-virtual {v3}, Landroid/widget/RadioButton;->getId()I
 
     move-result v3
 
-    if-eqz v3, :cond_e
+    iget-object v6, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->pendingInviteSettings:Lcom/discord/models/domain/ModelInvite$Settings;
 
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    if-eqz v6, :cond_d
 
-    move-result-object v3
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxUses()I
 
-    move-object v5, v3
+    move-result v6
 
-    check-cast v5, Landroid/widget/RadioButton;
+    if-ne v3, v6, :cond_d
 
-    invoke-virtual {v5}, Landroid/widget/RadioButton;->getId()I
-
-    move-result v5
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxUses()I
-
-    move-result v7
-
-    if-ne v5, v7, :cond_d
-
-    const/4 v5, 0x1
+    const/4 v3, 0x1
 
     goto :goto_7
 
     :cond_d
-    const/4 v5, 0x0
+    const/4 v3, 0x0
 
     :goto_7
-    if-eqz v5, :cond_c
+    if-eqz v3, :cond_c
 
     goto :goto_8
 
     :cond_e
-    move-object v3, v6
+    move-object v1, v5
 
     :goto_8
-    check-cast v3, Landroid/widget/RadioButton;
+    check-cast v1, Landroid/widget/RadioButton;
 
-    if-eqz v3, :cond_f
+    if-eqz v1, :cond_f
 
-    invoke-virtual {v3, v4}, Landroid/widget/RadioButton;->setChecked(Z)V
+    invoke-virtual {v1, v4}, Landroid/widget/RadioButton;->setChecked(Z)V
 
     :cond_f
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getMaxUsesRadioGroup()Landroid/widget/RadioGroup;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8;
+    new-instance v1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8;
 
-    invoke-direct {v2, p0, v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8;-><init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;Lcom/discord/models/domain/ModelInvite$Settings;)V
+    invoke-direct {v1, p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$8;-><init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
 
-    check-cast v2, Landroid/widget/RadioGroup$OnCheckedChangeListener;
+    check-cast v1, Landroid/widget/RadioGroup$OnCheckedChangeListener;
 
-    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;->getTemporaryMembershipSwitch()Lcom/discord/views/CheckedSetting;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelInvite$Settings;->isTemporary()Z
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->pendingInviteSettings:Lcom/discord/models/domain/ModelInvite$Settings;
+
+    if-eqz v1, :cond_10
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelInvite$Settings;->isTemporary()Z
 
     move-result v2
 
-    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+    :cond_10
+    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;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9;
+    new-instance v1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9;
 
-    invoke-direct {v2, p0, v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9;-><init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;Lcom/discord/models/domain/ModelInvite$Settings;)V
+    invoke-direct {v1, p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$9;-><init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
 
-    check-cast v2, Landroid/view/View$OnClickListener;
+    check-cast v1, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->a(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, v1}, Lcom/discord/views/CheckedSetting;->a(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getGenerateLinkButton()Landroid/widget/Button;
 
@@ -1500,7 +1577,7 @@
 
     return-void
 
-    :cond_10
+    :cond_11
     new-instance p1, Lkotlin/r;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
@@ -1509,7 +1586,7 @@
 
     throw p1
 
-    :cond_11
+    :cond_12
     new-instance p1, Lkotlin/r;
 
     const-string v0, "null cannot be cast to non-null type java.util.Collection<T>"
@@ -1525,19 +1602,18 @@
     goto :goto_9
 .end method
 
-.method public final getOnGenerateLinkListener()Lkotlin/jvm/functions/Function1;
+.method public final getOnGenerateLinkListener()Lkotlin/jvm/functions/Function0;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
-            "Lkotlin/jvm/functions/Function1<",
-            "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
+            "Lkotlin/jvm/functions/Function0<",
             "Lkotlin/Unit;",
             ">;"
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->onGenerateLinkListener:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->onGenerateLinkListener:Lkotlin/jvm/functions/Function0;
 
     return-object v0
 .end method
@@ -1559,14 +1635,27 @@
     return-object v0
 .end method
 
-.method public final setOnGenerateLinkListener(Lkotlin/jvm/functions/Function1;)V
+.method public final getViewModel()Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "viewModel"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    return-object v0
+.end method
+
+.method public final setOnGenerateLinkListener(Lkotlin/jvm/functions/Function0;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
+            "Lkotlin/jvm/functions/Function0<",
             "Lkotlin/Unit;",
             ">;)V"
         }
@@ -1576,41 +1665,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->onGenerateLinkListener:Lkotlin/jvm/functions/Function1;
-
-    return-void
-.end method
-
-.method public final setOnItemSelected(Lkotlin/jvm/functions/Function2;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/jvm/functions/Function2<",
-            "-",
-            "Lcom/discord/models/domain/ModelChannel;",
-            "-",
-            "Landroid/view/View;",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-
-    const-string v0, "listener"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getChannelSpinner()Landroid/widget/Spinner;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1;
-
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1;-><init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;Lkotlin/jvm/functions/Function2;)V
-
-    check-cast v1, Landroid/widget/AdapterView$OnItemSelectedListener;
-
-    invoke-virtual {v0, v1}, Landroid/widget/Spinner;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->onGenerateLinkListener:Lkotlin/jvm/functions/Function0;
 
     return-void
 .end method
@@ -1636,3 +1691,15 @@
 
     return-void
 .end method
+
+.method public final setViewModel(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
+    .locals 1
+
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.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 00de7af095..eca9d0fae0 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1$1;->invoke(Lcom/discord/models/domain/ModelInvite;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 bb937f692b..daf37a5c02 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
@@ -75,7 +75,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
 
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 5925506a93..2ea2188ab7 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$1;->invoke(Lcom/discord/stores/StoreInstantInvites$InviteState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -74,7 +74,7 @@
     return-void
 
     :cond_0
-    sget-object p1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
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 f5980d7a27..e830e32ae5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali
@@ -155,7 +155,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a034f
+    const v0, 0x7f0a035f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -163,7 +163,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;->guildInviteInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0348
+    const v0, 0x7f0a0351
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -171,7 +171,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;->guildInviteAcceptButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a034a
+    const v0, 0x7f0a0353
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -179,7 +179,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;->guildInviteButtonCancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0355
+    const v0, 0x7f0a0365
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -655,7 +655,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d012e
+    const v0, 0x7f0d0136
 
     return v0
 .end method
@@ -759,7 +759,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;->getContext()Landroid/content/Context;
 
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
new file mode 100644
index 0000000000..4e41cfc2bf
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1.smali
@@ -0,0 +1,93 @@
+.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetGuildInviteShare.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;->launch(Landroid/content/Context;ZLjava/lang/Long;Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/error/Error;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $arguments:Landroid/content/Intent;
+
+.field final synthetic $context:Landroid/content/Context;
+
+.field final synthetic $source:Ljava/lang/String;
+
+
+# direct methods
+.method constructor <init>(Ljava/lang/String;Landroid/content/Context;Landroid/content/Intent;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1;->$source:Ljava/lang/String;
+
+    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1;->$context:Landroid/content/Context;
+
+    iput-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1;->$arguments:Landroid/content/Intent;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/error/Error;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1;->invoke(Lcom/discord/utilities/error/Error;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/utilities/error/Error;)V
+    .locals 2
+
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1;->$source:Ljava/lang/String;
+
+    const-string v1, "Instant Invite Modal"
+
+    invoke-virtual {p1, v1, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1;->$context:Landroid/content/Context;
+
+    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1;->$arguments:Landroid/content/Intent;
+
+    invoke-static {p1, v0, v1}, Lcom/discord/app/f;->a(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$launch$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2.smali
new file mode 100644
index 0000000000..ceab521e2a
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2.smali
@@ -0,0 +1,118 @@
+.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetGuildInviteShare.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;->launch(Landroid/content/Context;ZLjava/lang/Long;Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/guilds/invite/InviteSuggestion;",
+        ">;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $arguments:Landroid/content/Intent;
+
+.field final synthetic $context:Landroid/content/Context;
+
+.field final synthetic $source:Ljava/lang/String;
+
+
+# direct methods
+.method constructor <init>(Ljava/lang/String;Landroid/content/Context;Landroid/content/Intent;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->$source:Ljava/lang/String;
+
+    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->$context:Landroid/content/Context;
+
+    iput-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->$arguments:Landroid/content/Intent;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/List;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->invoke(Ljava/util/List;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/util/List;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/widgets/guilds/invite/InviteSuggestion;",
+            ">;)V"
+        }
+    .end annotation
+
+    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->$source:Ljava/lang/String;
+
+    const-string v2, "Instant Invite Modal"
+
+    invoke-virtual {v0, v2, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->$context:Landroid/content/Context;
+
+    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->$arguments:Landroid/content/Intent;
+
+    invoke-static {p1, v0, v1}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+
+    return-void
+
+    :cond_0
+    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->$context:Landroid/content/Context;
+
+    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->$arguments:Landroid/content/Intent;
+
+    invoke-static {p1, v0, v1}, Lcom/discord/app/f;->a(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 bfe99b09bd..838c7d03a4 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
@@ -31,63 +31,6 @@
     return-void
 .end method
 
-.method public static final synthetic access$getSuggestions(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;)Lrx/Observable;
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;->getSuggestions()Lrx/Observable;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method private final getSuggestions()Lrx/Observable;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelChannel;",
-            ">;>;"
-        }
-    .end annotation
-
-    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 v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreChannels;->getPrivate()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;->getMessagesMostRecent()Lcom/discord/stores/StoreMessagesMostRecent;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMessagesMostRecent;->get()Lrx/Observable;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lrx/Observable;->Kg()Lrx/Observable;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$getSuggestions$1;
-
-    check-cast v2, Lrx/functions/Func2;
-
-    invoke-static {v0, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
 .method public static synthetic launch$default(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;Landroid/content/Context;ZLjava/lang/Long;Ljava/lang/String;ILjava/lang/Object;)V
     .locals 0
 
@@ -113,53 +56,107 @@
 
 # virtual methods
 .method public final launch(Landroid/content/Context;ZLjava/lang/Long;Ljava/lang/String;)V
-    .locals 2
+    .locals 16
 
-    const-string v0, "context"
+    move-object/from16 v0, p1
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object/from16 v1, p4
 
-    const-string v0, "source"
+    const-string v2, "context"
 
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Landroid/content/Intent;
+    const-string v2, "source"
 
-    invoke-direct {v0}, Landroid/content/Intent;-><init>()V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "INTENT_IS_NUX_FLOW"
+    new-instance v2, Landroid/content/Intent;
 
-    invoke-virtual {v0, v1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
+    invoke-direct {v2}, Landroid/content/Intent;-><init>()V
+
+    const-string v3, "INTENT_IS_NUX_FLOW"
+
+    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 {p3}, Ljava/lang/Long;->longValue()J
+    invoke-virtual/range {p3 .. p3}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide p2
+    move-result-wide v3
 
     goto :goto_0
 
     :cond_0
-    const-wide/16 p2, 0x0
+    const-wide/16 v3, 0x0
 
     :goto_0
-    const-string v1, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+    const-string v5, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    invoke-virtual {v0, v1, p2, p3}, 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 p2, "com.discord.intent.ORIGIN_SOURCE"
+    const-string v3, "com.discord.intent.ORIGIN_SOURCE"
 
-    invoke-virtual {v0, p2, p4}, 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 p2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+    sget-object v3, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->Companion:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;
 
-    const-string p3, "Instant Invite Modal"
+    invoke-virtual {v3}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;->create()Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;
 
-    invoke-virtual {p2, p3, p4}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
+    move-result-object v3
 
-    const-class p2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    invoke-virtual {v3}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->observeInviteSuggestions()Lrx/Observable;
 
-    invoke-static {p1, p2, v0}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    move-result-object v3
+
+    invoke-static {v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object v3
+
+    const-wide/16 v4, 0x32
+
+    const/4 v6, 0x0
+
+    invoke-static {v3, v4, v5, v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout(Lrx/Observable;JZ)Lrx/Observable;
+
+    move-result-object v7
+
+    move-object/from16 v3, p0
+
+    check-cast v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;
+
+    invoke-virtual {v3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v8
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1;
+
+    invoke-direct {v3, v1, v0, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1;-><init>(Ljava/lang/String;Landroid/content/Context;Landroid/content/Intent;)V
+
+    move-object v11, v3
+
+    check-cast v11, Lkotlin/jvm/functions/Function1;
+
+    const/4 v12, 0x0
+
+    new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;
+
+    invoke-direct {v3, v1, v0, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;-><init>(Ljava/lang/String;Landroid/content/Context;Landroid/content/Intent;)V
+
+    move-object v13, v3
+
+    check-cast v13, Lkotlin/jvm/functions/Function1;
+
+    const/16 v14, 0x16
+
+    const/4 v15, 0x0
+
+    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
 .end method
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 4c6529bd30..0d282a9710 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
@@ -149,11 +149,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0131
+    const v0, 0x7f0d013a
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a03e0
+    const p1, 0x7f0a03f0
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -161,7 +161,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03f8
+    const p1, 0x7f0a0408
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -169,7 +169,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03e1
+    const p1, 0x7f0a03f1
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -177,7 +177,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->invite$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03f9
+    const p1, 0x7f0a0409
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
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 594ecc7b36..c7121572cc 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2.smali
index b2680e8aa7..a284b7e70b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->configureUI(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;)V
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -30,18 +30,18 @@
 # instance fields
 .field final synthetic $invite:Lcom/discord/models/domain/ModelInvite;
 
-.field final synthetic $widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+.field final synthetic $viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
 
 .field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Lcom/discord/models/domain/ModelInvite;)V
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;Lcom/discord/models/domain/ModelInvite;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->$widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
 
     iput-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->$invite:Lcom/discord/models/domain/ModelInvite;
 
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -75,15 +75,11 @@
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->$widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getMe()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v1
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
 
     iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->$invite:Lcom/discord/models/domain/ModelInvite;
 
-    invoke-static {v0, p1, v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$sendInvite(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelInvite;)V
+    invoke-static {v0, p1, v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$sendInvite(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;Lcom/discord/models/domain/ModelInvite;)V
 
     return-void
 .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 6951cf902a..f08439e38c 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
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->configureUI(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;)V
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -41,23 +41,27 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    const-string v0, "it"
 
-    const-string v1, "it"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(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"
+    const-string v0, "it.context"
 
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->$invite:Lcom/discord/models/domain/ModelInvite;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->$invite:Lcom/discord/models/domain/ModelInvite;
 
-    invoke-static {v0, p1, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$copyLinkClick(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;)V
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+
+    invoke-static {v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getMostRecentIntent$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Landroid/content/Intent;
+
+    move-result-object v1
+
+    invoke-static {p1, v0, v1}, Lcom/discord/widgets/guilds/invite/GuildInviteUiHelperKt;->copyLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;Landroid/content/Intent;)V
 
     return-void
 .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 e5ee77a3d6..4a85873a90 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
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->configureUI(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;)V
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -39,7 +39,7 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 3
+    .locals 2
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
@@ -59,7 +59,13 @@
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getNeverExpireSwitch$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/views/CheckedSetting;
+    invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getViewModel$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+
+    invoke-static {v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getNeverExpireSwitch$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/views/CheckedSetting;
 
     move-result-object v1
 
@@ -85,7 +91,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$updateSettings(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite$Settings;)V
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->updateInviteSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V
 
     :cond_1
     iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->$widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
@@ -112,15 +118,11 @@
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    invoke-static {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getInviteGenerator$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/widgets/guilds/invite/InviteGenerator;
+    invoke-static {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getViewModel$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    check-cast v2, Lcom/discord/app/AppFragment;
-
-    invoke-virtual {p1, v2, v0, v1}, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generate(Lcom/discord/app/AppFragment;J)V
+    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->generateInviteLink(J)V
 
     :cond_2
     return-void
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 ed4691edaa..f7f748dad0 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
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->configureUI(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;)V
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -20,17 +20,21 @@
 # instance fields
 .field final synthetic $invite:Lcom/discord/models/domain/ModelInvite;
 
+.field final synthetic $viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
 .field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->$invite:Lcom/discord/models/domain/ModelInvite;
 
+    iput-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -39,7 +43,7 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 1
+    .locals 2
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->$invite:Lcom/discord/models/domain/ModelInvite;
 
@@ -47,7 +51,17 @@
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    invoke-static {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$shareLinkClick(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->isInInstantInviteTextTreatment()Z
+
+    move-result v1
+
+    invoke-static {v0, p1, v1}, Lcom/discord/widgets/guilds/invite/GuildInviteUiHelperKt;->shareLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;Z)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2.smali
deleted file mode 100644
index 2ad09755bc..0000000000
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2.smali
+++ /dev/null
@@ -1,92 +0,0 @@
-.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetGuildInviteShare.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->init(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Lcom/discord/models/domain/ModelChannel;",
-        "Landroid/view/View;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    const/4 p1, 0x2
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelChannel;
-
-    check-cast p2, Landroid/view/View;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2;->invoke(Lcom/discord/models/domain/ModelChannel;Landroid/view/View;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/models/domain/ModelChannel;Landroid/view/View;)V
-    .locals 2
-
-    const-string v0, "modelChannel"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "<anonymous parameter 1>"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    invoke-static {p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getSelectedChannelSubject$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lrx/subjects/BehaviorSubject;
-
-    move-result-object p2
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object p1
-
-    invoke-virtual {p2, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3.smali
deleted file mode 100644
index f1e1c0d5f2..0000000000
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3.smali
+++ /dev/null
@@ -1,112 +0,0 @@
-.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetGuildInviteShare.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->init(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3;->invoke(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V
-    .locals 3
-
-    const-string v0, "inviteModel"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getTargetChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Number;
-
-    invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v0
-
-    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    invoke-static {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getInviteGenerator$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/widgets/guilds/invite/InviteGenerator;
-
-    move-result-object p1
-
-    iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    check-cast v2, Lcom/discord/app/AppFragment;
-
-    invoke-virtual {p1, v2, v0, v1}, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generate(Lcom/discord/app/AppFragment;J)V
-
-    :cond_0
-    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    invoke-static {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getBottomSheetBehavior$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
-
-    move-result-object p1
-
-    const/4 v0, 0x5
-
-    invoke-virtual {p1, v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setState(I)V
-
-    return-void
-.end method
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
new file mode 100644
index 0000000000..c51dddeb10
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1.smali
@@ -0,0 +1,72 @@
+.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetGuildInviteShare.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->initBottomSheet(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+
+    invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getBottomSheetBehavior$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    move-result-object v0
+
+    const/4 v1, 0x5
+
+    invoke-virtual {v0, v1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setState(I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$4.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheetBehavior$1.smali
similarity index 58%
rename from com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$4.smali
rename to com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheetBehavior$1.smali
index dde58f0494..7238b0f898 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheetBehavior$1.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$4;
+.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheetBehavior$1;
 .super Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;
 .source "WidgetGuildInviteShare.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->init(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)V
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->initBottomSheetBehavior(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,7 +27,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheetBehavior$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
     invoke-direct {p0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;-><init>()V
 
@@ -47,41 +47,52 @@
 .end method
 
 .method public final onStateChanged(Landroid/view/View;I)V
-    .locals 6
+    .locals 7
 
     const-string v0, "bottomSheet"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    const/4 p1, 0x5
 
-    invoke-static {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getBackgroundTint$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Landroid/view/View;
+    if-ne p2, p1, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheetBehavior$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+
+    invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getViewModel$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
     move-result-object v0
 
-    const/4 p1, 0x5
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->refreshUi()V
 
-    if-eq p2, p1, :cond_0
+    :cond_0
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheetBehavior$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+
+    invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getBackgroundTint$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Landroid/view/View;
+
+    move-result-object v1
+
+    if-eq p2, p1, :cond_1
 
     const/4 p1, 0x1
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
     goto :goto_0
 
-    :cond_0
+    :cond_1
     const/4 p1, 0x0
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    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
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy$default(Landroid/view/View;ZJILjava/lang/Object;)V
+    invoke-static/range {v1 .. v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy$default(Landroid/view/View;ZJILjava/lang/Object;)V
 
     return-void
 .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 8c2c080938..9564b71ceb 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -67,7 +67,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getFilterPublisher$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lrx/subjects/BehaviorSubject;
+    invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getViewModel$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
     move-result-object v0
 
@@ -75,7 +75,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->updateSearchQuery(Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
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 38a8ac5eea..1e1e9fa13f 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,9 +1,9 @@
-.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;
-.super Ljava/lang/Object;
+.class final synthetic Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;
+.super Lkotlin/jvm/internal/j;
 .source "WidgetGuildInviteShare.kt"
 
 # interfaces
-.implements Lrx/functions/Func4;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
@@ -12,326 +12,86 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
+    accessFlags = 0x1018
     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;>;"
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;",
+        "Lkotlin/Unit;",
+        ">;"
     }
 .end annotation
 
 
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-
 # direct methods
 .method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
-    .locals 0
+    .locals 1
 
-    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    const/4 v0, 0x1
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final getName()Ljava/lang/String;
+    .locals 1
 
-    check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+    const-string v0, "configureUI"
 
-    check-cast p2, Ljava/util/List;
-
-    check-cast p3, Ljava/lang/String;
-
-    check-cast p4, Ljava/util/Map;
-
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;->call(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;)Lkotlin/Pair;
-
-    move-result-object p1
-
-    return-object p1
+    return-object v0
 .end method
 
-.method public final call(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;)Lkotlin/Pair;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
-            "Ljava/util/List<",
-            "+",
-            "Lcom/discord/models/domain/ModelChannel;",
-            ">;",
-            "Ljava/lang/String;",
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "+",
-            "Ljava/util/Set<",
-            "Ljava/lang/Long;",
-            ">;>;)",
-            "Lkotlin/Pair<",
-            "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
-            "Ljava/util/List<",
-            "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;",
-            ">;>;"
-        }
-    .end annotation
+.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
+    .locals 1
 
-    const-string v0, "sentInvites"
+    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvite()Lcom/discord/models/domain/ModelInvite;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getInviteLink$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
     move-result-object v0
 
-    const-string v1, "widgetInviteModel.invite.inviteLink"
+    return-object v0
+.end method
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+.method public final getSignature()Ljava/lang/String;
+    .locals 1
 
-    invoke-interface {p4, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    const-string v0, "configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V"
 
-    move-result-object p4
+    return-object v0
+.end method
 
-    if-nez p4, :cond_0
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    sget-object p4, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
 
-    check-cast p4, Ljava/util/Set;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
 
-    :cond_0
-    check-cast p4, Ljava/util/Set;
-
-    check-cast p3, Ljava/lang/CharSequence;
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    if-eqz p3, :cond_2
-
-    invoke-static {p3}, Lkotlin/text/l;->j(Ljava/lang/CharSequence;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v2, 0x0
-
-    goto :goto_1
-
-    :cond_2
-    :goto_0
-    const/4 v2, 0x1
-
-    :goto_1
-    if-eqz v2, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    const-string v2, "suggestions"
-
-    invoke-static {p2, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p2, Ljava/lang/Iterable;
-
-    new-instance v2, Ljava/util/ArrayList;
-
-    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
-
-    check-cast v2, Ljava/util/Collection;
-
-    invoke-interface {p2}, 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 v3
-
-    if-eqz v3, :cond_5
-
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    move-object v4, v3
-
-    check-cast v4, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v5, "channel.name"
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v4, Ljava/lang/CharSequence;
-
-    invoke-static {v4, p3, v1}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_4
-
-    invoke-interface {v2, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_5
-    move-object p2, v2
-
-    check-cast p2, Ljava/util/List;
-
-    :goto_3
-    const-string v2, "filteredSuggestions"
-
-    invoke-static {p2, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p2, Ljava/lang/Iterable;
-
-    new-instance v2, Ljava/util/ArrayList;
-
-    const/16 v3, 0xa
-
-    invoke-static {p2, v3}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
-
-    move-result v3
-
-    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(I)V
-
-    check-cast v2, Ljava/util/Collection;
-
-    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p2
-
-    :goto_4
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_6
-
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lcom/discord/models/domain/ModelChannel;
-
-    new-instance v4, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
-    move-result-wide v5
-
-    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v5
-
-    invoke-interface {p4, v5}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
-
-    move-result v5
-
-    invoke-direct {v4, v3, v5}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;-><init>(Lcom/discord/models/domain/ModelChannel;Z)V
-
-    invoke-interface {v2, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_4
-
-    :cond_6
-    check-cast v2, Ljava/util/List;
-
-    move-object p2, v2
-
-    check-cast p2, Ljava/util/Collection;
-
-    invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result p2
-
-    xor-int/2addr p2, v1
-
-    if-nez p2, :cond_9
-
-    if-eqz p3, :cond_8
-
-    invoke-static {p3}, Lkotlin/text/l;->j(Ljava/lang/CharSequence;)Z
-
-    move-result p2
-
-    if-eqz p2, :cond_7
-
-    goto :goto_5
-
-    :cond_7
-    const/4 p2, 0x0
-
-    goto :goto_6
-
-    :cond_8
-    :goto_5
-    const/4 p2, 0x1
-
-    :goto_6
-    if-eqz p2, :cond_a
-
-    :cond_9
-    const/4 v0, 0x1
-
-    :cond_a
-    if-eqz v0, :cond_b
-
-    goto :goto_7
-
-    :cond_b
-    const/4 v2, 0x0
-
-    :goto_7
-    if-nez v2, :cond_c
-
-    sget-object p2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem;
-
-    invoke-static {p2}, Lkotlin/a/m;->ba(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v2
-
-    :cond_c
-    invoke-static {p1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
-
-    move-result-object p1
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
+
+.method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;->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;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2.smali
deleted file mode 100644
index e668eb8c1c..0000000000
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2.smali
+++ /dev/null
@@ -1,100 +0,0 @@
-.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetGuildInviteShare.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->onViewBoundOrOnResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lkotlin/Pair<",
-        "+",
-        "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
-        "+",
-        "Ljava/util/List<",
-        "+",
-        "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;",
-        ">;>;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lkotlin/Pair;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2;->invoke(Lkotlin/Pair;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lkotlin/Pair;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/Pair<",
-            "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
-            "+",
-            "Ljava/util/List<",
-            "+",
-            "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;",
-            ">;>;)V"
-        }
-    .end annotation
-
-    iget-object v0, p1, Lkotlin/Pair;->first:Ljava/lang/Object;
-
-    check-cast v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
-
-    iget-object p1, p1, Lkotlin/Pair;->second:Ljava/lang/Object;
-
-    check-cast p1, Ljava/util/List;
-
-    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    const-string v2, "inviteModel"
-
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v1, v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1.smali
index 816656e620..e45acd8046 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->sendInvite(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelInvite;)V
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->sendInvite(Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;Lcom/discord/models/domain/ModelInvite;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1;->invoke(Lcom/discord/utilities/messagesend/MessageResult;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 e23511163d..dda20801ca 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
@@ -41,20 +41,8 @@
 
 .field private final emptyResults$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final filterPublisher:Lrx/subjects/BehaviorSubject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/BehaviorSubject<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private hasTrackedSuggestionsViewed:Z
 
-.field private final inviteGenerator:Lcom/discord/widgets/guilds/invite/InviteGenerator;
-
 .field private final inviteLinkTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final inviteSettingsBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -67,35 +55,14 @@
 
 .field private final searchInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final selectedChannelSubject:Lrx/subjects/BehaviorSubject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/BehaviorSubject<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private final sentInvitesSubject:Lrx/subjects/BehaviorSubject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/BehaviorSubject<",
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/util/Set<",
-            "Ljava/lang/Long;",
-            ">;>;>;"
-        }
-    .end annotation
-.end field
-
 .field private final shareBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final suggestionRv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final suggestionsFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field private viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -389,7 +356,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a05a1
+    const v0, 0x7f0a05bb
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -397,7 +364,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->searchBack$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05ab
+    const v0, 0x7f0a05c5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -405,7 +372,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->searchInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05a5
+    const v0, 0x7f0a05bf
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -413,7 +380,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->searchClear$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0357
+    const v0, 0x7f0a0367
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -421,7 +388,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->suggestionsFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0356
+    const v0, 0x7f0a0366
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -429,7 +396,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->suggestionRv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a034c
+    const v0, 0x7f0a0355
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -437,7 +404,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->emptyResults$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0354
+    const v0, 0x7f0a0364
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -445,7 +412,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->shareBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0352
+    const v0, 0x7f0a0362
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -453,7 +420,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->neverExpireSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0350
+    const v0, 0x7f0a0360
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -461,7 +428,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->inviteLinkTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0353
+    const v0, 0x7f0a0363
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -469,7 +436,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->inviteSettingsBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0106
+    const v0, 0x7f0a0107
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -477,7 +444,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->backgroundTint$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03c1
+    const v0, 0x7f0a03d1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -485,53 +452,13 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->bottomSheet$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const-string v0, ""
-
-    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->filterPublisher:Lrx/subjects/BehaviorSubject;
-
-    const/4 v0, 0x0
-
-    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->selectedChannelSubject:Lrx/subjects/BehaviorSubject;
-
-    new-instance v0, Lcom/discord/widgets/guilds/invite/InviteGenerator;
-
-    invoke-direct {v0}, Lcom/discord/widgets/guilds/invite/InviteGenerator;-><init>()V
-
-    iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->inviteGenerator:Lcom/discord/widgets/guilds/invite/InviteGenerator;
-
-    invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->sentInvitesSubject:Lrx/subjects/BehaviorSubject;
-
     return-void
 .end method
 
-.method public static final synthetic access$configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;)V
+.method public static final synthetic access$configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
     .locals 0
 
-    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->configureUI(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;)V
-
-    return-void
-.end method
-
-.method public static final synthetic access$copyLinkClick(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;)V
-    .locals 0
-
-    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->copyLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
 
     return-void
 .end method
@@ -555,32 +482,16 @@
 
     const-string v0, "bottomSheetBehavior"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
 .end method
 
-.method public static final synthetic access$getFilterPublisher$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lrx/subjects/BehaviorSubject;
+.method public static final synthetic access$getMostRecentIntent$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Landroid/content/Intent;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->filterPublisher:Lrx/subjects/BehaviorSubject;
-
-    return-object p0
-.end method
-
-.method public static final synthetic access$getInviteGenerator$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/widgets/guilds/invite/InviteGenerator;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->inviteGenerator:Lcom/discord/widgets/guilds/invite/InviteGenerator;
-
-    return-object p0
-.end method
-
-.method public static final synthetic access$getInviteLink$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getMostRecentIntent()Landroid/content/Intent;
 
     move-result-object p0
 
@@ -617,18 +528,25 @@
     return-object p0
 .end method
 
-.method public static final synthetic access$getSelectedChannelSubject$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lrx/subjects/BehaviorSubject;
-    .locals 0
+.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+    .locals 1
 
-    iget-object p0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->selectedChannelSubject:Lrx/subjects/BehaviorSubject;
+    iget-object p0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
+    if-nez p0, :cond_0
+
+    const-string v0, "viewModel"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
     return-object p0
 .end method
 
-.method public static final synthetic access$sendInvite(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelInvite;)V
+.method public static final synthetic access$sendInvite(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;Lcom/discord/models/domain/ModelInvite;)V
     .locals 0
 
-    invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->sendInvite(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelInvite;)V
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->sendInvite(Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;Lcom/discord/models/domain/ModelInvite;)V
 
     return-void
 .end method
@@ -641,435 +559,357 @@
     return-void
 .end method
 
-.method public static final synthetic access$shareLinkClick(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V
+.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->shareLinkClick(Lcom/discord/models/domain/ModelInvite;)V
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
     return-void
 .end method
 
-.method public static final synthetic access$updateSettings(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite$Settings;)V
-    .locals 0
+.method private final configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+    .locals 13
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->updateSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V
-
-    return-void
-.end method
-
-.method private final configureUI(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;)V
-    .locals 11
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
-            "Ljava/util/List<",
-            "+",
-            "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvite()Lcom/discord/models/domain/ModelInvite;
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->getWidgetInviteModel()Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
 
     move-result-object v0
 
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->getInviteSuggestionItems()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvite()Lcom/discord/models/domain/ModelInvite;
+
+    move-result-object v2
+
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getSuggestionsFlipper()Lcom/discord/app/AppViewFlipper;
 
-    move-result-object v1
+    move-result-object v3
 
-    invoke-interface {p2}, Ljava/util/List;->isEmpty()Z
+    invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
 
-    move-result v2
+    move-result v4
+
+    const/4 v5, 0x1
+
+    xor-int/2addr v4, v5
+
+    invoke-virtual {v3, v4}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v3
+
+    const/4 v4, 0x0
+
+    if-ne v3, v5, :cond_0
+
+    invoke-static {v1}, Lkotlin/a/m;->ac(Ljava/util/List;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    instance-of v3, v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem;
+
+    if-eqz v3, :cond_0
 
     const/4 v3, 0x1
 
-    xor-int/2addr v2, v3
-
-    invoke-virtual {v1, v2}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
-
-    invoke-interface {p2}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    if-ne v1, v3, :cond_0
-
-    invoke-static {p2}, Lkotlin/a/m;->ac(Ljava/util/List;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v1, v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem;
-
-    if-eqz v1, :cond_0
-
-    const/4 v1, 0x1
-
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 v3, 0x0
 
     :goto_0
-    const/4 v4, 0x0
+    const/4 v6, 0x0
 
-    if-nez v1, :cond_1
+    if-nez v3, :cond_1
 
     goto :goto_1
 
     :cond_1
-    move-object p2, v4
+    move-object v1, v6
 
     :goto_1
-    const/16 v1, 0xa
+    const/16 v3, 0xa
 
-    if-eqz p2, :cond_4
+    if-eqz v1, :cond_4
 
-    check-cast p2, Ljava/lang/Iterable;
+    check-cast v1, Ljava/lang/Iterable;
 
-    new-instance v5, Ljava/util/ArrayList;
+    new-instance v7, Ljava/util/ArrayList;
 
-    invoke-static {p2, v1}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
+    invoke-static {v1, v3}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
 
-    move-result v6
+    move-result v8
 
-    invoke-direct {v5, v6}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v7, v8}, Ljava/util/ArrayList;-><init>(I)V
 
-    check-cast v5, Ljava/util/Collection;
+    check-cast v7, Ljava/util/Collection;
 
-    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object p2
+    move-result-object v1
 
     :goto_2
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v6
+    move-result v8
 
-    if-eqz v6, :cond_3
+    if-eqz v8, :cond_3
 
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v6
+    move-result-object v8
 
-    check-cast v6, Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
+    check-cast v8, Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
 
-    if-eqz v6, :cond_2
+    if-eqz v8, :cond_2
 
-    check-cast v6, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;
+    check-cast v8, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;
 
-    invoke-interface {v5, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v7, v8}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_2
 
     :cond_2
     new-instance p1, Lkotlin/r;
 
-    const-string p2, "null cannot be cast to non-null type com.discord.widgets.guilds.invite.WidgetGuildInviteShare.ChannelItem"
+    const-string v0, "null cannot be cast to non-null type com.discord.widgets.guilds.invite.WidgetGuildInviteShare.ChannelItem"
 
-    invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_3
-    check-cast v5, Ljava/util/List;
+    check-cast v7, Ljava/util/List;
 
     goto :goto_3
 
     :cond_4
-    sget-object p2, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
-    move-object v5, p2
+    move-object v7, v1
 
-    check-cast v5, Ljava/util/List;
+    check-cast v7, Ljava/util/List;
 
     :goto_3
-    move-object p2, v5
+    move-object v1, v7
 
-    check-cast p2, Ljava/util/Collection;
+    check-cast v1, Ljava/util/Collection;
 
-    invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
+    invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
 
-    move-result v6
+    move-result v8
 
-    xor-int/2addr v6, v3
+    xor-int/2addr v8, v5
 
-    if-eqz v6, :cond_7
+    if-eqz v8, :cond_7
 
-    iget-boolean v6, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->hasTrackedSuggestionsViewed:Z
+    iget-boolean v8, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->hasTrackedSuggestionsViewed:Z
 
-    if-nez v6, :cond_7
+    if-nez v8, :cond_7
 
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvite()Lcom/discord/models/domain/ModelInvite;
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvite()Lcom/discord/models/domain/ModelInvite;
 
-    move-result-object v6
+    move-result-object v8
 
-    if-eqz v6, :cond_5
+    if-eqz v8, :cond_5
 
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelInvite;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {v8}, Lcom/discord/models/domain/ModelInvite;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v6
+    move-result-object v8
 
-    if-eqz v6, :cond_5
+    if-eqz v8, :cond_5
 
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelGuild;->getId()J
+    invoke-virtual {v8}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    move-result-wide v6
+    move-result-wide v8
 
     goto :goto_4
 
     :cond_5
-    const-wide/16 v6, 0x0
+    const-wide/16 v8, 0x0
 
     :goto_4
-    sget-object v8, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+    sget-object v10, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    move-object v9, v5
+    move-object v11, v7
 
-    check-cast v9, Ljava/lang/Iterable;
+    check-cast v11, Ljava/lang/Iterable;
 
-    new-instance v10, Ljava/util/ArrayList;
+    new-instance v12, Ljava/util/ArrayList;
 
-    invoke-static {v9, v1}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
+    invoke-static {v11, v3}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
 
-    move-result v1
+    move-result v3
 
-    invoke-direct {v10, v1}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v12, v3}, Ljava/util/ArrayList;-><init>(I)V
 
-    check-cast v10, Ljava/util/Collection;
+    check-cast v12, Ljava/util/Collection;
 
-    invoke-interface {v9}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v11}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v1
+    move-result-object v3
 
     :goto_5
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v9
+    move-result v11
 
-    if-eqz v9, :cond_6
+    if-eqz v11, :cond_6
 
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v9
+    move-result-object v11
 
-    check-cast v9, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;
+    check-cast v11, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;
 
-    invoke-virtual {v9}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->getChannel()Lcom/discord/models/domain/ModelChannel;
+    invoke-virtual {v11}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v9
+    move-result-object v11
 
-    invoke-interface {v10, v9}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v12, v11}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_5
 
     :cond_6
-    check-cast v10, Ljava/util/List;
+    check-cast v12, Ljava/util/List;
 
-    invoke-virtual {v8, v6, v7, v10}, Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteSuggestionOpened(JLjava/util/List;)V
+    invoke-virtual {v10, v8, v9, v12}, Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteSuggestionOpened(JLjava/util/List;)V
 
-    iput-boolean v3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->hasTrackedSuggestionsViewed:Z
+    iput-boolean v5, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->hasTrackedSuggestionsViewed:Z
 
     :cond_7
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getEmptyResults()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v3
 
-    invoke-interface {v5}, Ljava/util/List;->isEmpty()Z
+    invoke-interface {v7}, Ljava/util/List;->isEmpty()Z
 
-    move-result v6
+    move-result v8
 
-    const/4 v7, 0x2
+    const/4 v9, 0x2
 
-    invoke-static {v1, v6, v2, v7, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v3, v8, v4, v9, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getSuggestionRv()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v1
+    move-result-object v3
 
-    check-cast v1, Landroid/view/View;
+    check-cast v3, Landroid/view/View;
 
-    invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
+    invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
 
-    move-result p2
+    move-result v1
 
-    xor-int/2addr p2, v3
+    xor-int/2addr v1, v5
 
-    invoke-static {v1, p2, v2, v7, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v3, v1, v4, v9, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    iget-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->adapter:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->adapter:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;
 
-    const-string v1, "adapter"
+    const-string v3, "adapter"
 
-    if-nez p2, :cond_8
+    if-nez v1, :cond_8
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_8
-    invoke-virtual {p2, v5}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;->setData(Ljava/util/List;)V
+    invoke-virtual {v1, v7}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;->setData(Ljava/util/List;)V
 
-    iget-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->adapter:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->adapter:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;
 
-    if-nez p2, :cond_9
+    if-nez v1, :cond_9
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_9
-    new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;
+    new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;
 
-    invoke-direct {v1, p0, p1, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Lcom/discord/models/domain/ModelInvite;)V
+    invoke-direct {v3, p0, p1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;Lcom/discord/models/domain/ModelInvite;)V
 
-    check-cast v1, Lkotlin/jvm/functions/Function1;
+    check-cast v3, Lkotlin/jvm/functions/Function1;
 
-    invoke-virtual {p2, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;->setOnClick(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v1, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;->setOnClick(Lkotlin/jvm/functions/Function1;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    move-result-object p2
+    move-result-object v1
 
-    invoke-virtual {p2, p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->configureUi(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->getWidgetInviteModel()Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->configureUi(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLinkTv()Landroid/widget/TextView;
 
-    move-result-object p2
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
-
     move-result-object v1
 
-    check-cast v1, Ljava/lang/CharSequence;
+    invoke-direct {p0, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
 
-    invoke-virtual {p2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/CharSequence;
+
+    invoke-virtual {v1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLinkTv()Landroid/widget/TextView;
 
-    move-result-object p2
+    move-result-object v1
 
-    new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;
+    new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;
 
-    invoke-direct {v1, p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V
+    invoke-direct {v3, p0, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V
 
-    check-cast v1, Landroid/view/View$OnClickListener;
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {p2, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getSettings()Lcom/discord/models/domain/ModelInvite$Settings;
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getSettings()Lcom/discord/models/domain/ModelInvite$Settings;
 
-    move-result-object p2
+    move-result-object v1
 
-    if-eqz p2, :cond_a
+    if-eqz v1, :cond_a
 
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxAge()I
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxAge()I
 
-    move-result p2
+    move-result v1
 
-    if-nez p2, :cond_a
+    if-nez v1, :cond_a
 
-    const/4 v2, 0x1
+    const/4 v4, 0x1
 
     :cond_a
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getNeverExpireSwitch()Lcom/discord/views/CheckedSetting;
 
-    move-result-object p2
+    move-result-object v1
 
-    invoke-virtual {p2, v2}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+    invoke-virtual {v1, v4}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getNeverExpireSwitch()Lcom/discord/views/CheckedSetting;
 
-    move-result-object p2
+    move-result-object v1
 
-    new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;
+    new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V
+    invoke-direct {v3, p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V
 
-    check-cast v1, Landroid/view/View$OnClickListener;
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {p2, v1}, Lcom/discord/views/CheckedSetting;->a(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v3}, Lcom/discord/views/CheckedSetting;->a(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getShareBtn()Landroid/widget/Button;
 
-    move-result-object p2
+    move-result-object v0
 
     new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;
 
-    invoke-direct {v1, p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V
+    invoke-direct {v1, p0, v2, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
 
     check-cast v1, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {p2, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->isValidInvite()Z
-
-    move-result p2
-
-    if-nez p2, :cond_b
-
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->isGeneratingInvite()Z
-
-    move-result p2
-
-    if-nez p2, :cond_b
-
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getTargetChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p2
-
-    if-eqz p2, :cond_b
-
-    iget-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->inviteGenerator:Lcom/discord/widgets/guilds/invite/InviteGenerator;
-
-    move-object v0, p0
-
-    check-cast v0, Lcom/discord/app/AppFragment;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getTargetChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
-    move-result-wide v1
-
-    invoke-virtual {p2, v0, v1, v2}, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generate(Lcom/discord/app/AppFragment;J)V
-
-    :cond_b
-    return-void
-.end method
-
-.method private final copyLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;)V
-    .locals 2
-
-    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getMostRecentIntent()Landroid/content/Intent;
-
-    move-result-object v0
-
-    const-string v1, "com.discord.intent.ORIGIN_SOURCE"
-
-    invoke-virtual {v0, v1}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    const-string v0, ""
-
-    :cond_0
-    invoke-static {p2, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteCopied(Lcom/discord/models/domain/ModelInvite;Ljava/lang/String;)V
-
-    invoke-direct {p0, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
-
-    move-result-object p2
-
-    const-string v0, "invite.inviteLink"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p2, Ljava/lang/CharSequence;
-
-    const v0, 0x7f120a00
-
-    invoke-static {p1, p2, v0}, Lcom/discord/app/h;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V
+    invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
 .end method
@@ -1335,41 +1175,32 @@
     return-object v0
 .end method
 
-.method private final init(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
+.method private final initBottomSheet(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
     .locals 2
 
-    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$1;
+    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1;
 
-    move-object v1, p0
+    invoke-direct {v0, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
 
-    check-cast v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setOnGenerateLinkListener(Lkotlin/jvm/functions/Function0;)V
 
-    check-cast v0, Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setUpdateSettings(Lkotlin/jvm/functions/Function1;)V
+    if-nez v0, :cond_0
 
-    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2;
+    const-string v1, "viewModel"
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$2;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
-    check-cast v0, Lkotlin/jvm/functions/Function2;
-
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setOnItemSelected(Lkotlin/jvm/functions/Function2;)V
-
-    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3;
-
-    invoke-direct {v0, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$3;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
-
-    check-cast v0, Lkotlin/jvm/functions/Function1;
-
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setOnGenerateLinkListener(Lkotlin/jvm/functions/Function1;)V
+    :cond_0
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setViewModel(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
 
     return-void
 .end method
 
-.method private final init(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)V
+.method private final initBottomSheetBehavior(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1384,9 +1215,9 @@
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setState(I)V
 
-    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$4;
+    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheetBehavior$1;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$4;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheetBehavior$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
 
     check-cast v0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;
 
@@ -1405,7 +1236,7 @@
     return-void
 .end method
 
-.method private final sendInvite(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelInvite;)V
+.method private final sendInvite(Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;Lcom/discord/models/domain/ModelInvite;)V
     .locals 8
 
     invoke-direct {p0, p3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
@@ -1422,79 +1253,73 @@
 
     move-result-wide v1
 
-    const-string v3, "inviteLink"
+    invoke-virtual {p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->getWidgetInviteModel()Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
 
-    invoke-static {v7, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v3
+
+    invoke-virtual {v3}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getMe()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v3
+
+    const-string v4, "inviteLink"
+
+    invoke-static {v7, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
     const/4 v6, 0x0
 
-    move-object v3, p2
-
     move-object v4, v7
 
     invoke-virtual/range {v0 .. v6}, Lcom/discord/stores/StoreMessages;->sendMessage(JLcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/util/List;Ljava/util/List;)Lrx/Observable;
 
-    move-result-object p2
-
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
-
     move-result-object v0
 
-    invoke-virtual {p2, v0}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object p2
-
-    const-string v0, "StoreStream\n        .get\u2026ormers.restSubscribeOn())"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
-
-    move-result-object p2
-
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
-
-    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getContext()Landroid/content/Context;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1;
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
 
-    invoke-direct {v2, p3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1;-><init>(Lcom/discord/models/domain/ModelInvite;)V
+    move-result-object v0
 
-    check-cast v2, Lkotlin/jvm/functions/Function1;
+    const-string v1, "StoreStream\n        .get\u2026ormers.restSubscribeOn())"
 
-    invoke-static {v0, v1, v2}, Lcom/discord/app/i;->a(Lcom/discord/app/i;Landroid/content/Context;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(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 v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1;
+
+    invoke-direct {v3, p3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1;-><init>(Lcom/discord/models/domain/ModelInvite;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    invoke-static {v1, v2, v3}, Lcom/discord/app/i;->a(Lcom/discord/app/i;Landroid/content/Context;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
 
     move-result-object p3
 
-    invoke-virtual {p2, p3}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+    invoke-virtual {v0, p3}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
 
-    iget-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->sentInvitesSubject:Lrx/subjects/BehaviorSubject;
-
-    const-string p3, "sentInvitesSubject"
-
-    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Lrx/subjects/BehaviorSubject;->getValue()Ljava/lang/Object;
+    invoke-virtual {p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->getSentInvites()Ljava/util/Map;
 
     move-result-object p2
 
-    check-cast p2, Ljava/util/Map;
-
-    const-string p3, "prevSentInvitesMaps"
-
-    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-interface {p2, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p3
 
     if-nez p3, :cond_0
 
-    sget-object p3, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p3, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast p3, Ljava/util/Set;
 
@@ -1525,62 +1350,16 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->sentInvitesSubject:Lrx/subjects/BehaviorSubject;
+    iget-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    invoke-virtual {p2, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+    if-nez p2, :cond_1
 
-    return-void
-.end method
+    const-string p3, "viewModel"
 
-.method private final shareLinkClick(Lcom/discord/models/domain/ModelInvite;)V
-    .locals 3
+    invoke-static {p3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
-    invoke-static {p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteShareClicked(Lcom/discord/models/domain/ModelInvite;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    const-string v1, "it"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v1, "invite.inviteLink"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v1, 0x7f12113c
-
-    invoke-virtual {p0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getString(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v2, "getString(R.string.tip_instant_invite_title3)"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v0, p1, v1}, Lcom/discord/utilities/intent/IntentUtils;->performChooserSendIntent(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method private final updateSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V
-    .locals 1
-
-    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 v0
-
-    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreInviteSettings;->setInviteSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V
+    :cond_1
+    invoke-virtual {p2, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->updateSentInvites(Ljava/util/Map;)V
 
     return-void
 .end method
@@ -1590,7 +1369,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0130
+    const v0, 0x7f0d0138
 
     return v0
 .end method
@@ -1624,6 +1403,42 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->adapter:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;
 
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    const-string v2, "resources"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;-><init>(Landroid/content/res/Resources;)V
+
+    check-cast v0, Landroidx/lifecycle/ViewModelProvider$Factory;
+
+    invoke-static {p1, v0}, Landroidx/lifecycle/ViewModelProviders;->of(Landroidx/fragment/app/FragmentActivity;Landroidx/lifecycle/ViewModelProvider$Factory;)Landroidx/lifecycle/ViewModelProvider;
+
+    move-result-object p1
+
+    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    invoke-virtual {p1, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+
+    move-result-object p1
+
+    const-string v0, "ViewModelProviders.of(\n \u2026areViewModel::class.java)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getMostRecentIntent()Landroid/content/Intent;
 
     move-result-object p1
@@ -1650,17 +1465,20 @@
 
     cmp-long v1, v4, v2
 
-    if-eqz v1, :cond_0
+    if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->selectedChannelSubject:Lrx/subjects/BehaviorSubject;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    if-nez v1, :cond_0
 
-    move-result-object v2
+    const-string v2, "viewModel"
 
-    invoke-virtual {v1, v2}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
+    invoke-virtual {v1, v4, v5}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectChannel(J)V
+
+    :cond_1
     const-string v1, "requireContext()"
 
     const/4 v2, 0x1
@@ -1669,7 +1487,7 @@
 
     const/4 v4, 0x0
 
-    if-eqz p1, :cond_1
+    if-eqz p1, :cond_2
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->requireContext()Landroid/content/Context;
 
@@ -1677,7 +1495,7 @@
 
     invoke-static {v5, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f040181
+    const v6, 0x7f040183
 
     invoke-static {v5, v6, v0, v3, v4}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
@@ -1689,10 +1507,10 @@
 
     invoke-virtual {p0, v2, v5}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
 
-    :cond_1
+    :cond_2
     invoke-static {p0, v2, v4, v3, v4}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v2, 0x7f120a10
+    const v2, 0x7f120a33
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -1700,19 +1518,19 @@
 
     move-result-object v2
 
-    if-eqz v2, :cond_2
+    if-eqz v2, :cond_3
 
     invoke-virtual {v2}, Lcom/discord/app/AppActivity;->getWindow()Landroid/view/Window;
 
     move-result-object v2
 
-    if-eqz v2, :cond_2
+    if-eqz v2, :cond_3
 
     const/16 v5, 0x20
 
     invoke-virtual {v2, v5}, Landroid/view/Window;->setSoftInputMode(I)V
 
-    :cond_2
+    :cond_3
     new-instance v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1;
 
     invoke-direct {v2, p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Z)V
@@ -1731,7 +1549,7 @@
 
     invoke-static {v2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f040396
+    const v1, 0x7f040399
 
     invoke-static {v2, v1, v0, v3, v4}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
@@ -1787,20 +1605,20 @@
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-    if-nez p1, :cond_3
+    if-nez p1, :cond_4
 
     const-string v0, "bottomSheetBehavior"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
-    :cond_3
-    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->init(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)V
+    :cond_4
+    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->initBottomSheetBehavior(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
     move-result-object p1
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->init(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->initBottomSheet(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteSettingsBtn()Landroid/view/View;
 
@@ -1834,58 +1652,19 @@
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
 
-    sget-object v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->Companion:Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->inviteGenerator:Lcom/discord/widgets/guilds/invite/InviteGenerator;
+    if-nez v0, :cond_0
 
-    invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/InviteGenerator;->getGenerationState()Lrx/Observable;
+    const-string v1, "viewModel"
 
-    move-result-object v1
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->selectedChannelSubject:Lrx/subjects/BehaviorSubject;
-
-    const-string v3, "selectedChannelSubject"
-
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v2, Lrx/Observable;
-
-    invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion;->get(Lrx/Observable;Lrx/Observable;)Lrx/Observable;
+    :cond_0
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->Companion:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;
-
-    invoke-static {v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;->access$getSuggestions(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;)Lrx/Observable;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->filterPublisher:Lrx/subjects/BehaviorSubject;
-
-    check-cast v2, Lrx/Observable;
-
-    iget-object v3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->sentInvitesSubject:Lrx/subjects/BehaviorSubject;
-
-    check-cast v3, Lrx/Observable;
-
-    new-instance v4, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;
-
-    invoke-direct {v4, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
-
-    check-cast v4, Lrx/functions/Func4;
-
-    invoke-static {v0, v1, v2, v3, v4}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
-
-    move-result-object v0
-
-    const-string v1, "Observable.combineLatest\u2026  .distinctUntilChanged()"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
     move-result-object v0
@@ -1896,13 +1675,13 @@
 
     iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->adapter:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;
 
-    if-nez v2, :cond_0
+    if-nez v2, :cond_1
 
     const-string v3, "adapter"
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
-    :cond_0
+    :cond_1
     check-cast v2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
 
     invoke-static {v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)Lrx/Observable;
@@ -1921,9 +1700,13 @@
 
     const/4 v8, 0x0
 
-    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2;
+    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$2;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
+    move-object v1, p0
+
+    check-cast v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
 
     move-object v9, v0
 
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
new file mode 100644
index 0000000000..ffd7ba4092
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1.smali
@@ -0,0 +1,72 @@
+.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetGuildInviteShareEmptySuggestions.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->initBottomSheet(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->access$getBottomSheetBehavior$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    move-result-object v0
+
+    const/4 v1, 0x5
+
+    invoke-virtual {v0, v1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setState(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
new file mode 100644
index 0000000000..6ea0405e81
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheetBehavior$1.smali
@@ -0,0 +1,98 @@
+.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheetBehavior$1;
+.super Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;
+.source "WidgetGuildInviteShareEmptySuggestions.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->initBottomSheetBehavior(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheetBehavior$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    invoke-direct {p0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onSlide(Landroid/view/View;F)V
+    .locals 0
+
+    const-string p2, "bottomSheet"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public final onStateChanged(Landroid/view/View;I)V
+    .locals 7
+
+    const-string v0, "bottomSheet"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x5
+
+    if-ne p2, p1, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheetBehavior$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->access$getViewModel$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->refreshUi()V
+
+    :cond_0
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheetBehavior$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->access$getBackgroundTint$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)Landroid/view/View;
+
+    move-result-object v1
+
+    if-eq p2, p1, :cond_1
+
+    const/4 p1, 0x1
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p1, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    const-wide/16 v3, 0x0
+
+    const/4 v5, 0x2
+
+    const/4 v6, 0x0
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy$default(Landroid/view/View;ZJILjava/lang/Object;)V
+
+    return-void
+.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
new file mode 100644
index 0000000000..a5d5626e63
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1.smali
@@ -0,0 +1,96 @@
+.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1;
+.super Ljava/lang/Object;
+.source "WidgetGuildInviteShareEmptySuggestions.kt"
+
+# interfaces
+.implements Lrx/functions/Func0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func0<",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final 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
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->access$getBottomSheetBehavior$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->getState()I
+
+    move-result v0
+
+    const/4 v1, 0x5
+
+    if-eq v0, v1, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->access$getBottomSheetBehavior$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setState(I)V
+
+    const/4 v0, 0x1
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$2.smali
new file mode 100644
index 0000000000..2bc667527a
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$2.smali
@@ -0,0 +1,51 @@
+.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$2;
+.super Ljava/lang/Object;
+.source "WidgetGuildInviteShareEmptySuggestions.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    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/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    invoke-static {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->access$getBottomSheetBehavior$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    move-result-object p1
+
+    const/4 v0, 0x5
+
+    invoke-virtual {p1, v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setState(I)V
+
+    return-void
+.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
new file mode 100644
index 0000000000..6f17b77296
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetGuildInviteShareEmptySuggestions.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->onViewBoundOrOnResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+    .locals 1
+
+    const-string v0, "viewState"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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;)V
+
+    return-void
+.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
new file mode 100644
index 0000000000..1d0bb6be7f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$1.smali
@@ -0,0 +1,67 @@
+.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$1;
+.super Ljava/lang/Object;
+.source "WidgetGuildInviteShareEmptySuggestions.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->updateUi(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $invite:Lcom/discord/models/domain/ModelInvite;
+
+.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;Lcom/discord/models/domain/ModelInvite;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$1;->$invite:Lcom/discord/models/domain/ModelInvite;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 2
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const-string v0, "it.context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$1;->$invite:Lcom/discord/models/domain/ModelInvite;
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    invoke-static {v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->access$getMostRecentIntent$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)Landroid/content/Intent;
+
+    move-result-object v1
+
+    invoke-static {p1, v0, v1}, Lcom/discord/widgets/guilds/invite/GuildInviteUiHelperKt;->copyLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;Landroid/content/Intent;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$2.smali
new file mode 100644
index 0000000000..a9ee064564
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$2.smali
@@ -0,0 +1,68 @@
+.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$2;
+.super Ljava/lang/Object;
+.source "WidgetGuildInviteShareEmptySuggestions.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->updateUi(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $invite:Lcom/discord/models/domain/ModelInvite;
+
+.field final synthetic $viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
+.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;Lcom/discord/models/domain/ModelInvite;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$2;->$invite:Lcom/discord/models/domain/ModelInvite;
+
+    iput-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$2;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 2
+
+    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$2;->$invite:Lcom/discord/models/domain/ModelInvite;
+
+    if-eqz p1, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$2;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->isInInstantInviteTextTreatment()Z
+
+    move-result v1
+
+    invoke-static {v0, p1, v1}, Lcom/discord/widgets/guilds/invite/GuildInviteUiHelperKt;->shareLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;Z)V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$3.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$3.smali
new file mode 100644
index 0000000000..732675b145
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$3.smali
@@ -0,0 +1,51 @@
+.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$3;
+.super Ljava/lang/Object;
+.source "WidgetGuildInviteShareEmptySuggestions.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->updateUi(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$3;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    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/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$3;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    invoke-static {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->access$getBottomSheetBehavior$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    move-result-object p1
+
+    const/4 v0, 0x3
+
+    invoke-virtual {p1, v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setState(I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali
new file mode 100644
index 0000000000..9cad7bd8b3
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali
@@ -0,0 +1,1132 @@
+.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+.super Lcom/discord/app/AppFragment;
+.source "WidgetGuildInviteShareEmptySuggestions.kt"
+
+
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+
+# instance fields
+.field private final backgroundTint$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final bottomSheet$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/material/bottomsheet/BottomSheetBehavior<",
+            "Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final emptySuggestionsInviteLinkTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final emptySuggestionsInviteSettingsBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final emptySuggestionsSettingsInviteSubtext$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final emptySuggestionsShareBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 6
+
+    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+
+    const/4 v1, 0x6
+
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "emptySuggestionsShareBtn"
+
+    const-string v5, "getEmptySuggestionsShareBtn()Landroid/widget/Button;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "emptySuggestionsInviteSettingsBtn"
+
+    const-string v5, "getEmptySuggestionsInviteSettingsBtn()Landroid/view/View;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x1
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "emptySuggestionsInviteLinkTextView"
+
+    const-string v5, "getEmptySuggestionsInviteLinkTextView()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x2
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "emptySuggestionsSettingsInviteSubtext"
+
+    const-string v5, "getEmptySuggestionsSettingsInviteSubtext()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x3
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "backgroundTint"
+
+    const-string v5, "getBackgroundTint()Landroid/view/View;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x4
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    const-string v3, "bottomSheet"
+
+    const-string v4, "getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;"
+
+    invoke-direct {v2, v0, v3, v4}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x5
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
+
+    const v0, 0x7f0a0358
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsShareBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0359
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsInviteSettingsBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0357
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsInviteLinkTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a035a
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsSettingsInviteSubtext$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0107
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->backgroundTint$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a03d1
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->bottomSheet$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method public static final synthetic access$getBackgroundTint$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)Landroid/view/View;
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getBackgroundTint()Landroid/view/View;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getBottomSheetBehavior$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    .locals 1
+
+    iget-object p0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    if-nez p0, :cond_0
+
+    const-string v0, "bottomSheetBehavior"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static final synthetic access$getMostRecentIntent$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)Landroid/content/Intent;
+    .locals 0
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+    .locals 1
+
+    iget-object p0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    if-nez p0, :cond_0
+
+    const-string v0, "viewModel"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static final synthetic access$setBottomSheetBehavior$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    return-void
+.end method
+
+.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    return-void
+.end method
+
+.method public static final synthetic access$updateUi(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->updateUi(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+
+    return-void
+.end method
+
+.method private final getBackgroundTint()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->backgroundTint$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->$$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 getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->bottomSheet$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->$$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/widgets/guilds/invite/ViewInviteSettingsSheet;
+
+    return-object v0
+.end method
+
+.method private final getEmptySuggestionsInviteLinkTextView()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsInviteLinkTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->$$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/TextView;
+
+    return-object v0
+.end method
+
+.method private final getEmptySuggestionsInviteSettingsBtn()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsInviteSettingsBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->$$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/view/View;
+
+    return-object v0
+.end method
+
+.method private final getEmptySuggestionsSettingsInviteSubtext()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsSettingsInviteSubtext$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->$$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 private final getEmptySuggestionsShareBtn()Landroid/widget/Button;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsShareBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->$$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/Button;
+
+    return-object v0
+.end method
+
+.method private final getHoursExpirationString(ILjava/lang/String;)Ljava/lang/String;
+    .locals 5
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    new-array v2, v1, [Ljava/lang/Object;
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    aput-object v3, v2, v4
+
+    const v3, 0x7f100023
+
+    invoke-virtual {v0, v3, p1, v2}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "resources.getQuantityStr\u2026ours_hours, hours, hours)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v0
+
+    const/4 v2, 0x2
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    aput-object p1, v2, v4
+
+    aput-object p2, v2, v1
+
+    const p1, 0x7f120a37
+
+    invoke-virtual {v0, p1, v2}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string p2, "resources.getString(R.st\u2026on, hoursString, maxUses)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method private final getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "https://discord.gg"
+
+    if-nez p1, :cond_0
+
+    return-object v0
+
+    :cond_0
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    invoke-virtual {p1, v1, v0}, Lcom/discord/models/domain/ModelInvite;->toLink(Landroid/content/res/Resources;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method private final initBottomSheet(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)V
+
+    check-cast v0, Lkotlin/jvm/functions/Function0;
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setOnGenerateLinkListener(Lkotlin/jvm/functions/Function0;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "viewModel"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setViewModel(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
+
+    return-void
+.end method
+
+.method private final initBottomSheetBehavior(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/google/android/material/bottomsheet/BottomSheetBehavior<",
+            "Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;",
+            ">;)V"
+        }
+    .end annotation
+
+    const/4 v0, 0x5
+
+    invoke-virtual {p1, v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setState(I)V
+
+    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheetBehavior$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheetBehavior$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)V
+
+    check-cast v0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;
+
+    invoke-virtual {p1, v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setBottomSheetCallback(Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;)V
+
+    return-void
+.end method
+
+.method private final updateUi(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+    .locals 9
+
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->getWidgetInviteModel()Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+    move-result-object v0
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->configureUi(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V
+
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvite()Lcom/discord/models/domain/ModelInvite;
+
+    move-result-object v1
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getEmptySuggestionsInviteLinkTextView()Landroid/widget/TextView;
+
+    move-result-object v2
+
+    invoke-direct {p0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/CharSequence;
+
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getEmptySuggestionsInviteLinkTextView()Landroid/widget/TextView;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$1;
+
+    invoke-direct {v3, p0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;Lcom/discord/models/domain/ModelInvite;)V
+
+    check-cast v3, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getEmptySuggestionsShareBtn()Landroid/widget/Button;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$2;
+
+    invoke-direct {v3, p0, v1, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$2;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;Lcom/discord/models/domain/ModelInvite;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+
+    check-cast v3, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v2, v3}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getEmptySuggestionsInviteSettingsBtn()Landroid/view/View;
+
+    move-result-object p1
+
+    new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$3;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$3;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getSettings()Lcom/discord/models/domain/ModelInvite$Settings;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_7
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxUses()I
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-nez v1, :cond_0
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getResources()Landroid/content/res/Resources;
+
+    move-result-object p1
+
+    const v1, 0x7f120b63
+
+    invoke-virtual {p1, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    const v4, 0x7f100080
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxUses()I
+
+    move-result v5
+
+    new-array v6, v3, [Ljava/lang/Object;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxUses()I
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    aput-object p1, v6, v2
+
+    invoke-virtual {v1, v4, v5, v6}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    :goto_0
+    const-string v1, "if (inviteSettings.maxUs\u2026  inviteSettings.maxUses)"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getSettings()Lcom/discord/models/domain/ModelInvite$Settings;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxAge()I
+
+    move-result v0
+
+    if-eqz v0, :cond_6
+
+    const/16 v1, 0x708
+
+    const/4 v4, 0x2
+
+    const v5, 0x7f120a37
+
+    if-eq v0, v1, :cond_5
+
+    const/16 v1, 0xe10
+
+    if-eq v0, v1, :cond_4
+
+    const/16 v1, 0x5460
+
+    if-eq v0, v1, :cond_3
+
+    const v1, 0xa8c0
+
+    if-eq v0, v1, :cond_2
+
+    const v1, 0x15180
+
+    if-eq v0, v1, :cond_1
+
+    goto/16 :goto_1
+
+    :cond_1
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v0
+
+    const v1, 0x7f100022
+
+    invoke-virtual {v0, v1, v3}, Landroid/content/res/Resources;->getQuantityString(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "resources.getQuantityStr\u2026ls.duration_days_days, 1)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getEmptySuggestionsSettingsInviteSubtext()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v6
+
+    new-array v4, v4, [Ljava/lang/Object;
+
+    aput-object v0, v4, v2
+
+    aput-object p1, v4, v3
+
+    invoke-virtual {v6, v5, v4}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v1, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    return-void
+
+    :cond_2
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getEmptySuggestionsSettingsInviteSubtext()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    const/16 v1, 0xc
+
+    invoke-direct {p0, v1, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getHoursExpirationString(ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    return-void
+
+    :cond_3
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getEmptySuggestionsSettingsInviteSubtext()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    const/4 v1, 0x6
+
+    invoke-direct {p0, v1, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getHoursExpirationString(ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    return-void
+
+    :cond_4
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getEmptySuggestionsSettingsInviteSubtext()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    invoke-direct {p0, v3, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getHoursExpirationString(ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    return-void
+
+    :cond_5
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v0
+
+    const v1, 0x7f100026
+
+    new-array v6, v3, [Ljava/lang/Object;
+
+    const/16 v7, 0x1e
+
+    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v8
+
+    aput-object v8, v6, v2
+
+    invoke-virtual {v0, v1, v7, v6}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "resources.getQuantityStr\u2026_minutes_minutes, 30, 30)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getEmptySuggestionsSettingsInviteSubtext()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v6
+
+    new-array v4, v4, [Ljava/lang/Object;
+
+    aput-object v0, v4, v2
+
+    aput-object p1, v4, v3
+
+    invoke-virtual {v6, v5, v4}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v1, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    goto :goto_1
+
+    :cond_6
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    const v2, 0x7f120b5f
+
+    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getString(I)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, 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()\n        \u2026              .toString()"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getEmptySuggestionsSettingsInviteSubtext()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    :cond_7
+    :goto_1
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d0139
+
+    return v0
+.end method
+
+.method public final onViewBound(Landroid/view/View;)V
+    .locals 4
+
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    const-string v2, "resources"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;-><init>(Landroid/content/res/Resources;)V
+
+    check-cast v0, Landroidx/lifecycle/ViewModelProvider$Factory;
+
+    invoke-static {p1, v0}, Landroidx/lifecycle/ViewModelProviders;->of(Landroidx/fragment/app/FragmentActivity;Landroidx/lifecycle/ViewModelProvider$Factory;)Landroidx/lifecycle/ViewModelProvider;
+
+    move-result-object p1
+
+    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    invoke-virtual {p1, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+
+    move-result-object p1
+
+    const-string v0, "ViewModelProviders.of(\n \u2026areViewModel::class.java)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object p1
+
+    const-wide/16 v0, 0x0
+
+    const-string v2, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+
+    invoke-virtual {p1, v2, v0, v1}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+
+    move-result-wide v2
+
+    cmp-long p1, v2, v0
+
+    if-eqz p1, :cond_1
+
+    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    if-nez p1, :cond_0
+
+    const-string v0, "viewModel"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    invoke-virtual {p1, v2, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectChannel(J)V
+
+    :cond_1
+    new-instance p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)V
+
+    check-cast p1, Lrx/functions/Func0;
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x2
+
+    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
+
+    const/4 p1, 0x1
+
+    invoke-static {p0, p1, v2, v1, v2}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+
+    const p1, 0x7f120a33
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->setActionBarTitle(I)Lkotlin/Unit;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getAppActivity()Lcom/discord/app/AppActivity;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_2
+
+    invoke-virtual {p1}, Lcom/discord/app/AppActivity;->getWindow()Landroid/view/Window;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_2
+
+    const/16 v0, 0x20
+
+    invoke-virtual {p1, v0}, Landroid/view/Window;->setSoftInputMode(I)V
+
+    :cond_2
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/view/View;
+
+    invoke-static {p1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->from(Landroid/view/View;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    move-result-object p1
+
+    const-string v0, "BottomSheetBehavior.from(bottomSheet)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+
+    if-nez p1, :cond_3
+
+    const-string v0, "bottomSheetBehavior"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_3
+    invoke-direct {p0, p1}, 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;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->initBottomSheet(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getBackgroundTint()Landroid/view/View;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$2;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$2;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)V
+
+    check-cast v0, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
+
+.method public final onViewBoundOrOnResume()V
+    .locals 13
+
+    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "viewModel"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->observeViewState()Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object v0
+
+    move-object v1, p0
+
+    check-cast v1, 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
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v5
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;)V
+
+    move-object v10, v0
+
+    check-cast v10, Lkotlin/jvm/functions/Function1;
+
+    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
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
new file mode 100644
index 0000000000..37fb804fd6
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1.smali
@@ -0,0 +1,71 @@
+.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1;
+.super Ljava/lang/Object;
+.source "WidgetGuildInviteShareViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;-><init>(Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreExperiments;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    const-string v1, "viewState"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(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;)V
+
+    return-void
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1;->call(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali
similarity index 55%
rename from com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$1.smali
rename to com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali
index c562378183..44253194c4 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali
@@ -1,6 +1,6 @@
-.class final synthetic Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$1;
+.class final synthetic Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2;
 .super Lkotlin/jvm/internal/j;
-.source "WidgetGuildInviteShare.kt"
+.source "WidgetGuildInviteShareViewModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->init(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;-><init>(Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreExperiments;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/models/domain/ModelInvite$Settings;",
+        "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -28,7 +28,7 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
+.method constructor <init>(Lrx/subjects/BehaviorSubject;)V
     .locals 1
 
     const/4 v0, 0x1
@@ -43,7 +43,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "updateSettings"
+    const-string v0, "onNext"
 
     return-object v0
 .end method
@@ -51,7 +51,7 @@
 .method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
     .locals 1
 
-    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    const-class v0, Lrx/subjects/BehaviorSubject;
 
     invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "updateSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V"
+    const-string v0, "onNext(Ljava/lang/Object;)V"
 
     return-object v0
 .end method
@@ -71,27 +71,23 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelInvite$Settings;
+    check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$1;->invoke(Lcom/discord/models/domain/ModelInvite$Settings;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2;->invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/ModelInvite$Settings;)V
+.method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
     .locals 1
 
-    const-string v0, "p1"
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2;->receiver:Ljava/lang/Object;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    check-cast v0, Lrx/subjects/BehaviorSubject;
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$init$1;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$updateSettings(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite$Settings;)V
+    invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState.smali
new file mode 100644
index 0000000000..a8a5ec7e04
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState.smali
@@ -0,0 +1,582 @@
+.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+.super Ljava/lang/Object;
+.source "WidgetGuildInviteShareViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ViewState"
+.end annotation
+
+
+# instance fields
+.field private final inviteSuggestionItems:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final isInInstantInviteTextTreatment:Z
+
+.field private final searchQuery:Ljava/lang/String;
+
+.field private final sentInvites:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/util/Set<",
+            "Ljava/lang/Long;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+.field private final widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;Z)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;",
+            ">;",
+            "Ljava/lang/String;",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "+",
+            "Ljava/util/Set<",
+            "Ljava/lang/Long;",
+            ">;>;Z)V"
+        }
+    .end annotation
+
+    const-string v0, "widgetInviteModel"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "inviteSuggestionItems"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "searchQuery"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "sentInvites"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->inviteSuggestionItems:Ljava/util/List;
+
+    iput-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->searchQuery:Ljava/lang/String;
+
+    iput-object p4, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->sentInvites:Ljava/util/Map;
+
+    iput-boolean p5, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->isInInstantInviteTextTreatment:Z
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 6
+
+    and-int/lit8 p6, p6, 0x4
+
+    if-eqz p6, :cond_0
+
+    const-string p3, ""
+
+    :cond_0
+    move-object v3, p3
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    move-object v2, p2
+
+    move-object v4, p4
+
+    move v5, p5
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;-><init>(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;Z)V
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;ZILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+    .locals 3
+
+    and-int/lit8 p7, p6, 0x1
+
+    if-eqz p7, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+    :cond_0
+    and-int/lit8 p7, p6, 0x2
+
+    if-eqz p7, :cond_1
+
+    iget-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->inviteSuggestionItems:Ljava/util/List;
+
+    :cond_1
+    move-object p7, p2
+
+    and-int/lit8 p2, p6, 0x4
+
+    if-eqz p2, :cond_2
+
+    iget-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->searchQuery:Ljava/lang/String;
+
+    :cond_2
+    move-object v0, p3
+
+    and-int/lit8 p2, p6, 0x8
+
+    if-eqz p2, :cond_3
+
+    iget-object p4, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->sentInvites:Ljava/util/Map;
+
+    :cond_3
+    move-object v1, p4
+
+    and-int/lit8 p2, p6, 0x10
+
+    if-eqz p2, :cond_4
+
+    iget-boolean p5, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->isInInstantInviteTextTreatment:Z
+
+    :cond_4
+    move v2, p5
+
+    move-object p2, p0
+
+    move-object p3, p1
+
+    move-object p4, p7
+
+    move-object p5, v0
+
+    move-object p6, v1
+
+    move p7, v2
+
+    invoke-virtual/range {p2 .. p7}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->copy(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;Z)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->inviteSuggestionItems:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final component3()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->searchQuery:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component4()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/util/Set<",
+            "Ljava/lang/Long;",
+            ">;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->sentInvites:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final component5()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->isInInstantInviteTextTreatment:Z
+
+    return v0
+.end method
+
+.method public final copy(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;Z)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;",
+            ">;",
+            "Ljava/lang/String;",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "+",
+            "Ljava/util/Set<",
+            "Ljava/lang/Long;",
+            ">;>;Z)",
+            "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;"
+        }
+    .end annotation
+
+    const-string v0, "widgetInviteModel"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "inviteSuggestionItems"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "searchQuery"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "sentInvites"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
+    move-object v1, v0
+
+    move-object v2, p1
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    move v6, p5
+
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;-><init>(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;Z)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+    iget-object v3, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->inviteSuggestionItems:Ljava/util/List;
+
+    iget-object v3, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->inviteSuggestionItems:Ljava/util/List;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->searchQuery:Ljava/lang/String;
+
+    iget-object v3, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->searchQuery:Ljava/lang/String;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->sentInvites:Ljava/util/Map;
+
+    iget-object v3, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->sentInvites:Ljava/util/Map;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-boolean v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->isInInstantInviteTextTreatment:Z
+
+    iget-boolean p1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->isInInstantInviteTextTreatment:Z
+
+    if-ne v1, 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 final getInviteSuggestionItems()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->inviteSuggestionItems:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final getSearchQuery()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->searchQuery:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getSentInvites()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/util/Set<",
+            "Ljava/lang/Long;",
+            ">;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->sentInvites:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final getWidgetInviteModel()Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->inviteSuggestionItems:Ljava/util/List;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->searchQuery:Ljava/lang/String;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    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/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->sentInvites:Ljava/util/Map;
+
+    if-eqz v2, :cond_3
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_3
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->isInInstantInviteTextTreatment:Z
+
+    if-eqz v1, :cond_4
+
+    const/4 v1, 0x1
+
+    :cond_4
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final isInInstantInviteTextTreatment()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->isInInstantInviteTextTreatment:Z
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "ViewState(widgetInviteModel="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", inviteSuggestionItems="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->inviteSuggestionItems:Ljava/util/List;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", searchQuery="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->searchQuery:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", sentInvites="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->sentInvites:Ljava/util/Map;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", isInInstantInviteTextTreatment="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->isInInstantInviteTextTreatment:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.smali
new file mode 100644
index 0000000000..b1563998d5
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.smali
@@ -0,0 +1,442 @@
+.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1;
+.super Ljava/lang/Object;
+.source "WidgetGuildInviteShareViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Func6;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->observeViewStateFromStores$app_productionDiscordExternalRelease()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    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;",
+        "T6:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func6<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;Lkotlin/Unit;Lcom/discord/models/domain/ModelExperiment;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "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/models/domain/ModelExperiment;",
+            ")",
+            "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;"
+        }
+    .end annotation
+
+    const-string p5, "sentInvites"
+
+    invoke-static {p4, p5}, Lkotlin/jvm/internal/k;->g(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;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvite()Lcom/discord/models/domain/ModelInvite;
+
+    move-result-object v0
+
+    invoke-static {p5, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->access$getInviteLink$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
+
+    move-result-object p5
+
+    const-string v0, "widgetInviteModel.invite.inviteLink"
+
+    invoke-static {p5, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p4, p5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p5
+
+    if-nez p5, :cond_0
+
+    sget-object p5, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
+
+    check-cast p5, Ljava/util/Set;
+
+    :cond_0
+    check-cast p5, Ljava/util/Set;
+
+    move-object v0, p3
+
+    check-cast v0, Ljava/lang/CharSequence;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_2
+
+    invoke-static {v0}, Lkotlin/text/l;->j(Ljava/lang/CharSequence;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v3, 0x0
+
+    goto :goto_1
+
+    :cond_2
+    :goto_0
+    const/4 v3, 0x1
+
+    :goto_1
+    const-string v4, "inviteSuggestions"
+
+    if-eqz v3, :cond_3
+
+    invoke-static {p2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_4
+
+    :cond_3
+    invoke-static {p2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p2, Ljava/lang/Iterable;
+
+    new-instance v3, Ljava/util/ArrayList;
+
+    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
+
+    check-cast v3, Ljava/util/Collection;
+
+    invoke-interface {p2}, 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 v4
+
+    if-eqz v4, :cond_7
+
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    move-object v5, v4
+
+    check-cast v5, Lcom/discord/widgets/guilds/invite/InviteSuggestion;
+
+    instance-of v6, v5, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
+
+    if-eqz v6, :cond_5
+
+    check-cast v5, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
+
+    invoke-virtual {v5}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
+
+    move-result-object v5
+
+    const-string v6, "inviteSuggestion.channel.name"
+
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v5, Ljava/lang/CharSequence;
+
+    invoke-static {v5, v0, v2}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+
+    move-result v5
+
+    goto :goto_3
+
+    :cond_5
+    instance-of v5, v5, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;
+
+    if-eqz v5, :cond_6
+
+    const/4 v5, 0x0
+
+    :goto_3
+    if-eqz v5, :cond_4
+
+    invoke-interface {v3, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_6
+    new-instance p1, Lkotlin/k;
+
+    invoke-direct {p1}, Lkotlin/k;-><init>()V
+
+    throw p1
+
+    :cond_7
+    move-object p2, v3
+
+    check-cast p2, Ljava/util/List;
+
+    :goto_4
+    move-object v3, p2
+
+    check-cast v3, Ljava/util/Collection;
+
+    invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v3
+
+    xor-int/2addr v3, v2
+
+    if-nez v3, :cond_b
+
+    if-eqz v0, :cond_9
+
+    invoke-static {v0}, Lkotlin/text/l;->j(Ljava/lang/CharSequence;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_8
+
+    goto :goto_5
+
+    :cond_8
+    const/4 v0, 0x0
+
+    goto :goto_6
+
+    :cond_9
+    :goto_5
+    const/4 v0, 0x1
+
+    :goto_6
+    if-eqz v0, :cond_a
+
+    goto :goto_7
+
+    :cond_a
+    sget-object p2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem;
+
+    invoke-static {p2}, Lkotlin/a/m;->ba(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p2
+
+    goto :goto_9
+
+    :cond_b
+    :goto_7
+    check-cast p2, Ljava/lang/Iterable;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    const/16 v3, 0xa
+
+    invoke-static {p2, v3}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
+
+    move-result v3
+
+    invoke-direct {v0, v3}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p2
+
+    :goto_8
+    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_e
+
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/discord/widgets/guilds/invite/InviteSuggestion;
+
+    instance-of v4, v3, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
+
+    if-eqz v4, :cond_c
+
+    new-instance v4, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;
+
+    check-cast v3, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
+
+    invoke-virtual {v3}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v5
+
+    invoke-virtual {v3}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v6
+
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
+
+    invoke-interface {p5, v3}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+
+    move-result v3
+
+    invoke-direct {v4, v5, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;-><init>(Lcom/discord/models/domain/ModelChannel;Z)V
+
+    invoke-interface {v0, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_8
+
+    :cond_c
+    instance-of p1, v3, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;
+
+    if-eqz p1, :cond_d
+
+    new-instance p1, Lkotlin/l;
+
+    const-string p2, "unsupported suggestion type"
+
+    const-string p3, "An operation is not implemented: "
+
+    invoke-virtual {p3, p2}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Lkotlin/l;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+
+    :cond_d
+    new-instance p1, Lkotlin/k;
+
+    invoke-direct {p1}, Lkotlin/k;-><init>()V
+
+    throw p1
+
+    :cond_e
+    move-object p2, v0
+
+    check-cast p2, Ljava/util/List;
+
+    :goto_9
+    move-object v5, p2
+
+    if-eqz p6, :cond_f
+
+    invoke-virtual {p6}, Lcom/discord/models/domain/ModelExperiment;->getBucket()I
+
+    move-result p2
+
+    if-ne p2, v2, :cond_f
+
+    const/4 v8, 0x1
+
+    goto :goto_a
+
+    :cond_f
+    const/4 v8, 0x0
+
+    :goto_a
+    new-instance p2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
+    const-string p5, "widgetInviteModel"
+
+    invoke-static {p1, p5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p5, "filter"
+
+    invoke-static {p3, p5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v3, p2
+
+    move-object v4, p1
+
+    move-object v6, p3
+
+    move-object v7, p4
+
+    invoke-direct/range {v3 .. v8}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;-><init>(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;Z)V
+
+    return-object p2
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+    check-cast p2, Ljava/util/List;
+
+    check-cast p3, Ljava/lang/String;
+
+    check-cast p4, Ljava/util/Map;
+
+    check-cast p5, Lkotlin/Unit;
+
+    check-cast p6, Lcom/discord/models/domain/ModelExperiment;
+
+    invoke-virtual/range {p0 .. p6}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1;->call(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;Lkotlin/Unit;Lcom/discord/models/domain/ModelExperiment;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1.smali
similarity index 70%
rename from com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1.smali
rename to com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1.smali
index 269e5f85c3..83c652b39c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1;
+.class final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1;
 .super Ljava/lang/Object;
-.source "WidgetInviteModel.kt"
+.source "WidgetGuildInviteShareViewModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func5;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion;->get(Lrx/Observable;Lrx/Observable;)Lrx/Observable;
+    value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->observeWidgetInviteViewModel()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -39,18 +39,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1;
+.field public static final INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1;
+    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1;
+    sput-object v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1;
 
     return-void
 .end method
@@ -112,7 +112,7 @@
 
     move-object v5, p5
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion;->access$create(Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion;Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+    invoke-virtual/range {v0 .. v5}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion;->create(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
 
     move-result-object p1
 
@@ -132,7 +132,7 @@
 
     check-cast p5, Lcom/discord/models/domain/ModelUser;
 
-    invoke-virtual/range {p0 .. p5}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1;->call(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+    invoke-virtual/range {p0 .. p5}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1;->call(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali
new file mode 100644
index 0000000000..c078b8a9d4
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali
@@ -0,0 +1,651 @@
+.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+.super Lcom/discord/app/k;
+.source "WidgetGuildInviteShareViewModel.kt"
+
+# interfaces
+.implements Lcom/discord/app/AppComponent;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;
+    }
+.end annotation
+
+
+# instance fields
+.field private final filterPublisher:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final inviteGenerator:Lcom/discord/widgets/guilds/invite/InviteGenerator;
+
+.field private final inviteSuggestionsService:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;
+
+.field private final refreshUiSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final resources:Landroid/content/res/Resources;
+
+.field private final selectedChannelSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final sentInvitesSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/util/Set<",
+            "Ljava/lang/Long;",
+            ">;>;>;"
+        }
+    .end annotation
+.end field
+
+.field private final storeExperiments:Lcom/discord/stores/StoreExperiments;
+
+.field private final storeInviteSettings:Lcom/discord/stores/StoreInviteSettings;
+
+.field private final storeUser:Lcom/discord/stores/StoreUser;
+
+.field private final subscribeOnInit:Z
+
+.field private final viewStateSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreExperiments;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V
+    .locals 14
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    move-object/from16 v2, p2
+
+    move-object/from16 v3, p3
+
+    move-object/from16 v4, p4
+
+    move-object/from16 v5, p5
+
+    move-object/from16 v6, p6
+
+    const-string v7, "storeInviteSettings"
+
+    invoke-static {p1, v7}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "storeUser"
+
+    invoke-static {v2, v7}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "storeExperiments"
+
+    invoke-static {v3, v7}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "inviteGenerator"
+
+    invoke-static {v4, v7}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "inviteSuggestionsService"
+
+    invoke-static {v5, v7}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "resources"
+
+    invoke-static {v6, v7}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lcom/discord/app/k;-><init>()V
+
+    iput-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeInviteSettings:Lcom/discord/stores/StoreInviteSettings;
+
+    iput-object v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeUser:Lcom/discord/stores/StoreUser;
+
+    iput-object v3, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeExperiments:Lcom/discord/stores/StoreExperiments;
+
+    iput-object v4, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->inviteGenerator:Lcom/discord/widgets/guilds/invite/InviteGenerator;
+
+    iput-object v5, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->inviteSuggestionsService:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;
+
+    iput-object v6, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->resources:Landroid/content/res/Resources;
+
+    move/from16 v1, p7
+
+    iput-boolean v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->subscribeOnInit:Z
+
+    invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
+
+    move-result-object v1
+
+    invoke-static {v1}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object v1
+
+    const-string v2, "BehaviorSubject.create(emptyMap())"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->sentInvitesSubject:Lrx/subjects/BehaviorSubject;
+
+    const-string v1, ""
+
+    invoke-static {v1}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->filterPublisher:Lrx/subjects/BehaviorSubject;
+
+    const/4 v1, 0x0
+
+    invoke-static {v1}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object v2
+
+    const-string v3, "BehaviorSubject.create(null as ChannelId?)"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectedChannelSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
+
+    move-result-object v2
+
+    iput-object v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    sget-object v2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    invoke-static {v2}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object v2
+
+    const-string v3, "BehaviorSubject.create(Unit)"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->refreshUiSubject:Lrx/subjects/BehaviorSubject;
+
+    iget-boolean v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->subscribeOnInit:Z
+
+    if-eqz v2, :cond_0
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->observeViewStateFromStores$app_productionDiscordExternalRelease()Lrx/Observable;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1;
+
+    invoke-direct {v3, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
+
+    check-cast v3, Lrx/functions/Action1;
+
+    invoke-virtual {v2, v3}, Lrx/Observable;->a(Lrx/functions/Action1;)Lrx/Observable;
+
+    move-result-object v2
+
+    const-string v3, "observeViewStateFromStor\u2026romViewState(viewState) }"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object v2
+
+    move-object v3, v0
+
+    check-cast v3, Lcom/discord/app/AppComponent;
+
+    const/4 v4, 0x2
+
+    invoke-static {v2, v3, v1, v4, 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
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v6
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2;
+
+    iget-object v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-direct {v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2;-><init>(Lrx/subjects/BehaviorSubject;)V
+
+    move-object v11, v1
+
+    check-cast v11, Lkotlin/jvm/functions/Function1;
+
+    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
+
+    :cond_0
+    return-void
+.end method
+
+.method public static final synthetic access$generateInviteLinkFromViewState(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->generateInviteLinkFromViewState(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$getInviteLink$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method private final generateInviteLinkFromViewState(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
+    .locals 4
+
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;->getWidgetInviteModel()Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->isValidInvite()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->isGeneratingInvite()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getTargetChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->inviteGenerator:Lcom/discord/widgets/guilds/invite/InviteGenerator;
+
+    move-object v1, p0
+
+    check-cast v1, Lcom/discord/app/AppComponent;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getTargetChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v2
+
+    invoke-virtual {v0, v1, v2, v3}, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generateForAppComponent(Lcom/discord/app/AppComponent;J)V
+
+    :cond_0
+    return-void
+.end method
+
+.method private final getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "https://discord.gg"
+
+    if-nez p1, :cond_0
+
+    return-object v0
+
+    :cond_0
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->resources:Landroid/content/res/Resources;
+
+    invoke-virtual {p1, v1, v0}, Lcom/discord/models/domain/ModelInvite;->toLink(Landroid/content/res/Resources;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method private final observeWidgetInviteViewModel()Lrx/Observable;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeInviteSettings:Lcom/discord/stores/StoreInviteSettings;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreInviteSettings;->getInviteSettings()Lrx/Observable;
+
+    move-result-object v1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeInviteSettings:Lcom/discord/stores/StoreInviteSettings;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreInviteSettings;->getInvitableChannels()Lrx/Observable;
+
+    move-result-object v2
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->inviteGenerator:Lcom/discord/widgets/guilds/invite/InviteGenerator;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/InviteGenerator;->getGenerationState()Lrx/Observable;
+
+    move-result-object v3
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectedChannelSubject:Lrx/subjects/BehaviorSubject;
+
+    move-object v4, v0
+
+    check-cast v4, Lrx/Observable;
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeUser:Lcom/discord/stores/StoreUser;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lrx/Observable;
+
+    move-result-object v5
+
+    sget-object v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1;
+
+    move-object v6, v0
+
+    check-cast v6, Lrx/functions/Func5;
+
+    invoke-static/range {v1 .. v6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "Observable\n        .comb\u2026dChannelId, me)\n        }"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "Observable\n        .comb\u2026  .distinctUntilChanged()"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public final generateInviteLink(J)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->inviteGenerator:Lcom/discord/widgets/guilds/invite/InviteGenerator;
+
+    move-object v1, p0
+
+    check-cast v1, Lcom/discord/app/AppComponent;
+
+    invoke-virtual {v0, v1, p1, p2}, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generateForAppComponent(Lcom/discord/app/AppComponent;J)V
+
+    return-void
+.end method
+
+.method public final getInviteGenerator()Lcom/discord/widgets/guilds/invite/InviteGenerator;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->inviteGenerator:Lcom/discord/widgets/guilds/invite/InviteGenerator;
+
+    return-object v0
+.end method
+
+.method public final getInviteSuggestionsService()Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->inviteSuggestionsService:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;
+
+    return-object v0
+.end method
+
+.method public final getResources()Landroid/content/res/Resources;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->resources:Landroid/content/res/Resources;
+
+    return-object v0
+.end method
+
+.method public final getStoreExperiments()Lcom/discord/stores/StoreExperiments;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeExperiments:Lcom/discord/stores/StoreExperiments;
+
+    return-object v0
+.end method
+
+.method public final getStoreInviteSettings()Lcom/discord/stores/StoreInviteSettings;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeInviteSettings:Lcom/discord/stores/StoreInviteSettings;
+
+    return-object v0
+.end method
+
+.method public final getStoreUser()Lcom/discord/stores/StoreUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeUser:Lcom/discord/stores/StoreUser;
+
+    return-object v0
+.end method
+
+.method public final getSubscribeOnInit()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->subscribeOnInit:Z
+
+    return v0
+.end method
+
+.method public final observeViewState()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    const-string v1, "viewStateSubject"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lrx/Observable;
+
+    return-object v0
+.end method
+
+.method public final observeViewStateFromStores$app_productionDiscordExternalRelease()Lrx/Observable;
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;",
+            ">;"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->observeWidgetInviteViewModel()Lrx/Observable;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->inviteSuggestionsService:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->observeInviteSuggestions()Lrx/Observable;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->filterPublisher:Lrx/subjects/BehaviorSubject;
+
+    check-cast v2, Lrx/Observable;
+
+    iget-object v3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->sentInvitesSubject:Lrx/subjects/BehaviorSubject;
+
+    check-cast v3, Lrx/Observable;
+
+    iget-object v4, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->refreshUiSubject:Lrx/subjects/BehaviorSubject;
+
+    check-cast v4, Lrx/Observable;
+
+    iget-object v5, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeExperiments:Lcom/discord/stores/StoreExperiments;
+
+    const/4 v6, 0x0
+
+    const-string v7, "2019-09_android_instant_invite_share_text"
+
+    const/4 v8, 0x2
+
+    invoke-static {v5, v7, v6, v8, 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 v5
+
+    new-instance v6, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
+
+    check-cast v6, Lrx/functions/Func6;
+
+    invoke-static/range {v0 .. v6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func6;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "Observable.combineLatest\u2026nviteTextTreatment)\n    }"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public final refreshUi()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->refreshUiSubject:Lrx/subjects/BehaviorSubject;
+
+    sget-object v1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public final selectChannel(J)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectedChannelSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public final updateInviteSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V
+    .locals 1
+
+    const-string v0, "settings"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public final updateSearchQuery(Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "searchQuery"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public final updateSentInvites(Ljava/util/Map;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "+",
+            "Ljava/util/Set<",
+            "Ljava/lang/Long;",
+            ">;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "sentInvites"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.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
new file mode 100644
index 0000000000..f5e8791578
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory.smali
@@ -0,0 +1,95 @@
+.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;
+.super Ljava/lang/Object;
+.source "WidgetGuildInviteShareViewModelFactory.kt"
+
+# interfaces
+.implements Landroidx/lifecycle/ViewModelProvider$Factory;
+
+
+# instance fields
+.field private final resources:Landroid/content/res/Resources;
+
+
+# direct methods
+.method public constructor <init>(Landroid/content/res/Resources;)V
+    .locals 1
+
+    const-string v0, "resources"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+
+# virtual methods
+.method public final create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Landroidx/lifecycle/ViewModel;",
+            ">(",
+            "Ljava/lang/Class<",
+            "TT;>;)TT;"
+        }
+    .end annotation
+
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    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
+
+    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
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
+
+    move-result-object v4
+
+    new-instance v5, Lcom/discord/widgets/guilds/invite/InviteGenerator;
+
+    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 v6
+
+    iget-object v7, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;->resources:Landroid/content/res/Resources;
+
+    const/4 v8, 0x1
+
+    move-object v1, p1
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;-><init>(Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreExperiments;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V
+
+    check-cast p1, Landroidx/lifecycle/ViewModel;
+
+    return-object p1
+.end method
+
+.method public final getResources()Landroid/content/res/Resources;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;->resources:Landroid/content/res/Resources;
+
+    return-object v0
+.end method
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 7327b1a7d5..5f8be09d7c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
@@ -361,7 +361,7 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/appcompat/widget/LinearLayoutCompat;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p1, 0x7f0a03bf
+    const p1, 0x7f0a03cf
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -369,7 +369,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->inviteMessage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03c3
+    const p1, 0x7f0a03d3
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -377,7 +377,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->title$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03be
+    const p1, 0x7f0a03ce
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -385,7 +385,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->membersWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03bb
+    const p1, 0x7f0a03cb
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -393,7 +393,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->membersOnlineWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03ba
+    const p1, 0x7f0a03ca
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -401,7 +401,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->membersOnlineTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03bc
+    const p1, 0x7f0a03cc
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -409,7 +409,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->membersTotalTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03bd
+    const p1, 0x7f0a03cd
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -417,7 +417,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->membersTotalWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03ad
+    const p1, 0x7f0a03bd
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -425,7 +425,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->avatarBig$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03b0
+    const p1, 0x7f0a03c0
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -433,7 +433,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->avatarBigWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03ae
+    const p1, 0x7f0a03be
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -441,7 +441,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->avatarSmall$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03af
+    const p1, 0x7f0a03bf
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -449,7 +449,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->avatarSmallWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03b7
+    const p1, 0x7f0a03c7
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -465,7 +465,7 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d012f
+    const v1, 0x7f0d0137
 
     invoke-static {p1, v1, v0}, Landroidx/appcompat/widget/LinearLayoutCompat;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -537,7 +537,7 @@
 
     check-cast v0, Landroid/widget/ImageView;
 
-    const v2, 0x7f070056
+    const v2, 0x7f070055
 
     const/4 v3, 0x0
 
@@ -646,7 +646,7 @@
 
     check-cast v8, Landroid/widget/ImageView;
 
-    const v10, 0x7f070058
+    const v10, 0x7f070057
 
     const/4 v11, 0x0
 
@@ -753,7 +753,7 @@
 
     move-result-object v8
 
-    const v9, 0x7f070056
+    const v9, 0x7f070055
 
     const/4 v10, 0x0
 
@@ -781,7 +781,7 @@
 
     move-result-object v8
 
-    const v9, 0x7f070058
+    const v9, 0x7f070057
 
     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
 
@@ -804,7 +804,7 @@
 
     move-result-object v8
 
-    const v9, 0x7f070056
+    const v9, 0x7f070055
 
     const/4 v10, 0x0
 
@@ -898,7 +898,7 @@
 
     move-result-object v9
 
-    const v10, 0x7f08039b
+    const v10, 0x7f0803b2
 
     const/4 v11, 0x0
 
@@ -931,7 +931,7 @@
 
     move-result-object v9
 
-    const v10, 0x7f080315
+    const v10, 0x7f080326
 
     const/4 v11, 0x0
 
@@ -1100,7 +1100,7 @@
 
     if-nez p1, :cond_0
 
-    const p1, 0x7f1209a7
+    const p1, 0x7f1209c8
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -1117,7 +1117,7 @@
     return-object p1
 
     :cond_0
-    const v0, 0x7f120275
+    const v0, 0x7f120279
 
     const/4 v1, 0x1
 
@@ -1147,7 +1147,7 @@
 
     if-eqz p2, :cond_0
 
-    const p2, 0x7f120275
+    const p2, 0x7f120279
 
     const/4 v0, 0x1
 
@@ -1172,7 +1172,7 @@
     return-object p1
 
     :cond_0
-    const p1, 0x7f1209a9
+    const p1, 0x7f1209ca
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -1242,7 +1242,7 @@
 
     aput-object p1, v1, v4
 
-    const p1, 0x7f120998
+    const p1, 0x7f1209b8
 
     invoke-static {p0, p1, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1274,7 +1274,7 @@
 
     aput-object p1, v0, v1
 
-    const p1, 0x7f120997
+    const p1, 0x7f1209b7
 
     invoke-static {p0, p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1539,7 +1539,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f12098f
+    const v1, 0x7f1209af
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -1547,7 +1547,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1209bf
+    const v1, 0x7f1209e0
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
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 01cccea687..92c8e2daed 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
@@ -31,17 +31,9 @@
     return-void
 .end method
 
-.method public static final synthetic access$create(Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion;Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
-    .locals 0
 
-    invoke-direct/range {p0 .. p5}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion;->create(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method private final create(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+# virtual methods
+.method public final create(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
     .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -60,9 +52,25 @@
         }
     .end annotation
 
+    const-string v0, "settings"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "invitableChannels"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "inviteGenerationState"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "me"
+
+    invoke-static {p5, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p3}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->getLastGeneratedInvite()Lcom/discord/models/domain/ModelInvite;
 
-    move-result-object v3
+    move-result-object v4
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -72,17 +80,15 @@
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    move-object v6, v0
+    move-object v7, v0
 
-    check-cast v6, Ljava/util/List;
+    check-cast v7, Ljava/util/List;
 
     invoke-static {}, Lcom/discord/models/domain/ModelChannel;->getSortByNameAndType()Ljava/util/Comparator;
 
     move-result-object v1
 
-    invoke-static {v6, v1}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V
-
-    if-eqz p2, :cond_3
+    invoke-static {v7, v1}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V
 
     invoke-interface {p2, p4}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -98,10 +104,7 @@
 
     check-cast p2, Lcom/discord/models/domain/ModelChannel;
 
-    :goto_0
-    move-object v1, p2
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {v0}, Ljava/util/ArrayList;->isEmpty()Z
@@ -121,161 +124,62 @@
     :cond_1
     const/4 p2, 0x0
 
-    goto :goto_0
-
-    :goto_1
-    if-eqz v3, :cond_2
-
-    if-eqz v1, :cond_2
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p2
+    :goto_0
+    if-eqz v4, :cond_2
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel;
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object p2
+    move-result-object p4
 
-    const-string p4, "generatedInvite.channel"
+    if-eqz p4, :cond_2
 
-    invoke-static {p2, p4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object p4
+
+    const-string v0, "generatedInvite.channel"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p4}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v0
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v4
+    move-result-wide v5
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    cmp-long p4, v0, v5
 
-    move-result-wide v7
+    if-nez p4, :cond_2
 
-    cmp-long p2, v4, v7
+    const/4 p4, 0x1
 
-    if-nez p2, :cond_2
+    const/4 v6, 0x1
 
-    const/4 p2, 0x1
-
-    const/4 v5, 0x1
-
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    :goto_2
-    new-instance p2, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+    :goto_1
+    new-instance p4, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
 
     invoke-virtual {p3}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->isGenerating()Z
 
-    move-result v4
+    move-result v5
 
-    move-object v0, p2
+    move-object v1, p4
 
-    move-object v2, p1
-
-    move-object v7, p5
-
-    invoke-direct/range {v0 .. v7}, 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;)V
-
-    return-object p2
-
-    :cond_3
-    new-instance p1, Lkotlin/r;
-
-    const-string p2, "null cannot be cast to non-null type kotlin.collections.Map<K, *>"
-
-    invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    goto :goto_4
-
-    :goto_3
-    throw p1
-
-    :goto_4
-    goto :goto_3
-.end method
-
-
-# virtual methods
-.method public final get(Lrx/Observable;Lrx/Observable;)Lrx/Observable;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;",
-            ">;",
-            "Lrx/Observable<",
-            "Ljava/lang/Long;",
-            ">;)",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
-            ">;"
-        }
-    .end annotation
-
-    const-string v0, "inviteGenerationStateObs"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "selectedChannelIdObs"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(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;->getInviteSettings()Lcom/discord/stores/StoreInviteSettings;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreInviteSettings;->getInviteSettings()Lrx/Observable;
-
-    move-result-object v1
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreInviteSettings;->getInvitableChannels()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;->getUsers()Lcom/discord/stores/StoreUser;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lrx/Observable;
-
-    move-result-object v5
-
-    sget-object v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion$get$1;
-
-    move-object v6, v0
-
-    check-cast v6, Lrx/functions/Func5;
+    move-object v2, p2
 
     move-object v3, p1
 
-    move-object v4, p2
+    move-object v8, p5
 
-    invoke-static/range {v1 .. v6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;)Lrx/Observable;
+    invoke-direct/range {v1 .. v8}, 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;)V
 
-    move-result-object p1
-
-    const-string p2, "Observable\n          .co\u2026hannelId, me)\n          }"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(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;->Kb()Lrx/Observable;
-
-    move-result-object p1
-
-    const-string p2, "Observable\n          .co\u2026  .distinctUntilChanged()"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p1
+    return-object p4
 .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 4d0dc24fcc..bc002b6be4 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali
@@ -232,32 +232,6 @@
     return-object p0
 .end method
 
-.method public static final get(Lrx/Observable;Lrx/Observable;)Lrx/Observable;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;",
-            ">;",
-            "Lrx/Observable<",
-            "Ljava/lang/Long;",
-            ">;)",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
-            ">;"
-        }
-    .end annotation
-
-    sget-object v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->Companion:Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion;
-
-    invoke-virtual {v0, p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion;->get(Lrx/Observable;Lrx/Observable;)Lrx/Observable;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
 
 # virtual methods
 .method public final component1()Lcom/discord/models/domain/ModelChannel;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory.smali
new file mode 100644
index 0000000000..e4a8f61b00
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory.smali
@@ -0,0 +1,119 @@
+.class public final Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModelFactory.kt"
+
+# interfaces
+.implements Landroidx/lifecycle/ViewModelProvider$Factory;
+
+
+# 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 create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    .locals 14
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Landroidx/lifecycle/ViewModel;",
+            ">(",
+            "Ljava/lang/Class<",
+            "TT;>;)TT;"
+        }
+    .end annotation
+
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    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 v2
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getVoiceStates()Lcom/discord/stores/StoreVoiceStates;
+
+    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;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+
+    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;->getPresences()Lcom/discord/stores/StoreUserPresence;
+
+    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;->getPermissions()Lcom/discord/stores/StorePermissions;
+
+    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;->getApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
+
+    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;->getUsers()Lcom/discord/stores/StoreUser;
+
+    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;->getChannels()Lcom/discord/stores/StoreChannels;
+
+    move-result-object v9
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserProfile()Lcom/discord/stores/StoreUserProfile;
+
+    move-result-object v10
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserRelationships()Lcom/discord/stores/StoreUserRelationships;
+
+    move-result-object v11
+
+    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 v12
+
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
+
+    move-result-object v13
+
+    const-string v0, "Schedulers.computation()"
+
+    invoke-static {v13, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v1, p1
+
+    invoke-direct/range {v1 .. v13}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;-><init>(Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/utilities/rest/RestAPI;Lrx/Scheduler;)V
+
+    check-cast p1, Landroidx/lifecycle/ViewModel;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali
index d56710a4d9..b63c2e9703 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali
@@ -40,7 +40,7 @@
 
     invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f120a50
+    const v0, 0x7f120a6f
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1.smali
index 4b1fab3d40..dc4a7a7ff0 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1;->invoke(Landroid/widget/TextView;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 45016f90a8..54c11d422a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin.smali
@@ -72,7 +72,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a035b
+    const v0, 0x7f0a036b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -88,7 +88,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0132
+    const v0, 0x7f0d013b
 
     return v0
 .end method
@@ -120,7 +120,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0a0455
+    const v0, 0x7f0a0465
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
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 ab4420e713..9ac05a6fb3 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
@@ -669,133 +669,133 @@
 
     iget-wide v0, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->folderId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v2, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v2
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->color:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->color:Ljava/lang/Integer;
 
     const/4 v2, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->name:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->name:Ljava/lang/String;
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()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 v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->isOpen:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->isOpen:Z
 
     const/4 v3, 0x1
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_2
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->guilds:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->guilds:Ljava/util/List;
 
-    if-eqz v0, :cond_3
+    if-eqz v1, :cond_3
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v2
 
     :cond_3
-    add-int/2addr v1, v2
+    add-int/2addr v0, v2
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->isAnyGuildSelected:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->isAnyGuildSelected:Z
 
-    if-eqz v0, :cond_4
+    if-eqz v1, :cond_4
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_4
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->isAnyGuildConnectedToVoice:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->isAnyGuildConnectedToVoice:Z
 
-    if-eqz v0, :cond_5
+    if-eqz v1, :cond_5
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_5
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->getMentionCount()I
 
-    move-result v0
+    move-result v1
 
-    add-int/2addr v1, v0
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
-    mul-int/lit8 v1, v1, 0x1f
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->isUnread()Z
 
-    move-result v0
+    move-result v1
 
-    if-eqz v0, :cond_6
+    if-eqz v1, :cond_6
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_6
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->isTargetedForFolderAddition:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->isTargetedForFolderAddition:Z
 
-    if-eqz v0, :cond_7
+    if-eqz v1, :cond_7
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_7
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final isAnyGuildConnectedToVoice()Z
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 baaca1f1f9..b7274388fa 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
@@ -602,6 +602,10 @@
 
     move-result v2
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
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 85df994983..b9489dd4bf 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
@@ -202,6 +202,10 @@
 
     move-result v1
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$UnavailableItem.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$UnavailableItem.smali
index 983aee006c..2cb8a86e6d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$UnavailableItem.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$UnavailableItem.smali
@@ -124,6 +124,10 @@
 
     iget v0, p0, Lcom/discord/widgets/guilds/list/GuildListItem$UnavailableItem;->unavailableGuildCount:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     return v0
 .end method
 
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 6b5e4fbef6..318b1ba843 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
@@ -81,7 +81,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->onClicked:Lkotlin/jvm/functions/Function1;
 
-    const p2, 0x7f0a0377
+    const p2, 0x7f0a0387
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -93,7 +93,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemFolderContainer:Landroid/view/View;
 
-    const p2, 0x7f0a0376
+    const p2, 0x7f0a0386
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -107,7 +107,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemFolder:Lcom/discord/views/ServerFolderView;
 
-    const p2, 0x7f0a037d
+    const p2, 0x7f0a038d
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -119,7 +119,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemSelected:Landroid/view/View;
 
-    const p2, 0x7f0a037e
+    const p2, 0x7f0a038e
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -131,7 +131,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemUnread:Landroid/view/View;
 
-    const p2, 0x7f0a037a
+    const p2, 0x7f0a038a
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -145,7 +145,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemMentions:Landroid/widget/TextView;
 
-    const p2, 0x7f0a037f
+    const p2, 0x7f0a038f
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -157,7 +157,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemVoice:Landroid/view/View;
 
-    const p2, 0x7f0a0379
+    const p2, 0x7f0a0389
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -370,7 +370,7 @@
     goto :goto_4
 
     :cond_4
-    invoke-virtual {v2}, Lcom/discord/views/ServerFolderView;->eK()V
+    invoke-virtual {v2}, Lcom/discord/views/ServerFolderView;->eP()V
 
     :goto_4
     if-eqz v11, :cond_5
@@ -386,7 +386,7 @@
 
     move-result-object v7
 
-    const v8, 0x7f06002c
+    const v8, 0x7f06002d
 
     invoke-static {v7, v8}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 
@@ -423,7 +423,7 @@
     goto :goto_6
 
     :cond_7
-    invoke-virtual {v2}, Lcom/discord/views/ServerFolderView;->eK()V
+    invoke-virtual {v2}, Lcom/discord/views/ServerFolderView;->eP()V
 
     :goto_6
     invoke-virtual {v2}, Lcom/discord/views/ServerFolderView;->getGuildViews()Ljava/util/List;
@@ -453,7 +453,7 @@
 
     if-gez v3, :cond_8
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_8
     check-cast v4, Lcom/discord/views/GuildView;
@@ -544,13 +544,13 @@
     const/4 v11, 0x0
 
     :goto_a
-    iget v12, v4, Lcom/discord/views/GuildView;->BK:I
+    iget v12, v4, Lcom/discord/views/GuildView;->BT:I
 
     const/4 v14, -0x1
 
     if-eq v12, v14, :cond_c
 
-    iget v12, v4, Lcom/discord/views/GuildView;->BK:I
+    iget v12, v4, Lcom/discord/views/GuildView;->BT:I
 
     goto :goto_b
 
@@ -803,7 +803,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f080151
+    const v2, 0x7f080159
 
     invoke-static {v1, v2}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
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 3cac2950b6..d738b7450d 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
@@ -60,7 +60,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder;->onClicked:Lkotlin/jvm/functions/Function1;
 
-    const p2, 0x7f0a037b
+    const p2, 0x7f0a038b
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -72,7 +72,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder;->itemAvatar:Landroid/view/View;
 
-    const p2, 0x7f0a037c
+    const p2, 0x7f0a038c
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -136,12 +136,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f080150
+    const p1, 0x7f080158
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f080103
+    const p1, 0x7f08010a
 
     :goto_0
     invoke-virtual {v0, p1}, Landroid/view/View;->setBackgroundResource(I)V
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 be72494f09..428a32021e 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
@@ -144,7 +144,7 @@
 
     iput-object p5, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->onLongPressed:Lkotlin/jvm/functions/Function1;
 
-    const p2, 0x7f0a0373
+    const p2, 0x7f0a0383
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -158,7 +158,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup;
 
-    const p2, 0x7f0a0371
+    const p2, 0x7f0a0381
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -172,7 +172,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    const p2, 0x7f0a0372
+    const p2, 0x7f0a0382
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -186,7 +186,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarText:Landroid/widget/TextView;
 
-    const p2, 0x7f0a037a
+    const p2, 0x7f0a038a
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -200,7 +200,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemMentions:Landroid/widget/TextView;
 
-    const p2, 0x7f0a037f
+    const p2, 0x7f0a038f
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -212,7 +212,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemVoice:Landroid/view/View;
 
-    const p2, 0x7f0a037e
+    const p2, 0x7f0a038e
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -224,7 +224,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemUnread:Landroid/view/View;
 
-    const p2, 0x7f0a037d
+    const p2, 0x7f0a038d
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -240,7 +240,7 @@
 
     move-result-object p2
 
-    const p3, 0x7f070057
+    const p3, 0x7f070056
 
     invoke-virtual {p2, p3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -252,7 +252,7 @@
 
     move-result-object p2
 
-    const p3, 0x7f0700bf
+    const p3, 0x7f0700c1
 
     invoke-virtual {p2, p3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -264,7 +264,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0700be
+    const p2, 0x7f0700c0
 
     invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -392,7 +392,7 @@
 
     const/4 v4, 0x0
 
-    invoke-virtual {v1, v4}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->h(Landroid/graphics/drawable/Drawable;)V
+    invoke-virtual {v1, v4}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->g(Landroid/graphics/drawable/Drawable;)V
 
     iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -417,7 +417,7 @@
 
     check-cast v1, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
-    const v3, 0x7f080070
+    const v3, 0x7f080071
 
     invoke-virtual {v1, v3}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->V(I)V
 
@@ -622,7 +622,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f070120
+    const v1, 0x7f070122
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -656,12 +656,12 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080152
+    const p1, 0x7f08015a
 
     goto :goto_1
 
     :cond_1
-    const p1, 0x7f08010a
+    const p1, 0x7f080111
 
     :goto_1
     invoke-virtual {p2, p1}, Landroid/view/ViewGroup;->setBackgroundResource(I)V
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 4fdad745d9..fb55fde26a 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
@@ -82,7 +82,7 @@
 
     iput-object p3, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$PrivateChannelViewHolder;->onLongPressed:Lkotlin/jvm/functions/Function1;
 
-    const p2, 0x7f0a0374
+    const p2, 0x7f0a0384
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -96,7 +96,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$PrivateChannelViewHolder;->itemIcon:Landroid/widget/ImageView;
 
-    const p2, 0x7f0a0375
+    const p2, 0x7f0a0385
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -152,7 +152,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f070057
+    const v4, 0x7f070056
 
     const/4 v5, 0x0
 
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 1c253b90e5..60150c8970 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali
@@ -70,7 +70,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120b47
+    const v2, 0x7f120b78
 
     const/4 v3, 0x1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove.smali
index d64e9def95..7fbd472b59 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove.smali
@@ -165,10 +165,18 @@
 
     iget v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove;->fromPosition:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove;->targetPosition:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow.smali
index 1577cf1ffe..7bf9968805 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow.smali
@@ -165,10 +165,18 @@
 
     iget v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow;->fromPosition:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow;->targetPosition:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation.smali
index 4735da5cec..6c399e9117 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation.smali
@@ -165,10 +165,18 @@
 
     iget v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation;->fromPosition:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation;->targetPosition:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
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 e275afca2b..366df356c0 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$2;->invoke(Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 b9dcb5e42b..ebf58191bf 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$3;->invoke(Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 9dd539d799..4010eaad55 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$4;->invoke(Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 852f4ac239..9270911a5a 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$5;->invoke(Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 3eedbf7489..7199ec5d5d 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$6;->invoke(Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 f79f56a446..33214e410a 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$7;->invoke(Lcom/discord/widgets/guilds/list/GuildListItem$FriendsItem;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 212673b657..bba59a9d02 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter.smali
@@ -91,7 +91,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->interactionListener:Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$InteractionListener;
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -510,7 +510,7 @@
     throw p1
 
     :pswitch_0
-    const p1, 0x7f0d013b
+    const p1, 0x7f0d0144
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1;->invoke(I)Landroid/view/View;
 
@@ -531,7 +531,7 @@
     return-object p2
 
     :pswitch_1
-    const p1, 0x7f0d013d
+    const p1, 0x7f0d0146
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1;->invoke(I)Landroid/view/View;
 
@@ -546,7 +546,7 @@
     return-object p2
 
     :pswitch_2
-    const p1, 0x7f0d013e
+    const p1, 0x7f0d0147
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1;->invoke(I)Landroid/view/View;
 
@@ -561,7 +561,7 @@
     return-object p2
 
     :pswitch_3
-    const p2, 0x7f0d013f
+    const p2, 0x7f0d0148
 
     invoke-virtual {v0, p2}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1;->invoke(I)Landroid/view/View;
 
@@ -571,7 +571,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f06007e
+    const v0, 0x7f060081
 
     invoke-static {p2, v0}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 
@@ -581,7 +581,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0600cb
+    const p2, 0x7f0600ce
 
     invoke-static {p1, p2}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 
@@ -614,7 +614,7 @@
     return-object p1
 
     :pswitch_4
-    const p1, 0x7f0d013a
+    const p1, 0x7f0d0143
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1;->invoke(I)Landroid/view/View;
 
@@ -641,7 +641,7 @@
     return-object p2
 
     :pswitch_5
-    const p1, 0x7f0d0138
+    const p1, 0x7f0d0141
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1;->invoke(I)Landroid/view/View;
 
@@ -656,7 +656,7 @@
     return-object p2
 
     :pswitch_6
-    const p1, 0x7f0d0140
+    const p1, 0x7f0d0149
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1;->invoke(I)Landroid/view/View;
 
@@ -799,7 +799,7 @@
 
     if-gez v10, :cond_0
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_0
     check-cast v12, Lcom/discord/widgets/guilds/list/GuildListItem;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch$configureUI$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch$configureUI$1.smali
index cecc3d92e0..c7b083eef5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch$configureUI$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/guilds/list/WidgetGuildSearch$configureUI$1;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch$onResume$4.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch$onResume$4.smali
index a478f19d48..e1e3a31e2a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch$onResume$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch$onResume$4.smali
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildSearch$onResume$4;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch$onViewBound$3.smali
index 7667c11029..8612435962 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch$onViewBound$3.smali
@@ -74,7 +74,7 @@
 
     invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/guilds/list/WidgetGuildSearch$onViewBound$3;->invoke(Ljava/lang/CharSequence;III)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch.smali
index e3a625f09e..e2be5e42e3 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearch.smali
@@ -159,7 +159,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a05ab
+    const v0, 0x7f0a05c5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -167,7 +167,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildSearch;->search$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05a5
+    const v0, 0x7f0a05bf
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -175,7 +175,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildSearch;->searchClear$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05a1
+    const v0, 0x7f0a05bb
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -183,7 +183,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildSearch;->searchClose$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0364
+    const v0, 0x7f0a0374
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -255,7 +255,7 @@
 
     const-string v1, "adapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v1, Lcom/discord/widgets/guilds/list/WidgetGuildSearch$configureUI$1;
@@ -354,7 +354,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0134
+    const v0, 0x7f0d013d
 
     return v0
 .end method
@@ -408,7 +408,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -478,7 +478,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120ddd
+    const v0, 0x7f120e16
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/guilds/list/WidgetGuildSearch;->getString(I)Ljava/lang/String;
 
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 09ea390e32..bfdf568d09 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
@@ -101,11 +101,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0135
+    const v0, 0x7f0d013e
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0362
+    const p1, 0x7f0a0372
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -113,7 +113,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildListItem;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0363
+    const p1, 0x7f0a0373
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
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 9957868cde..246adf62c2 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
@@ -67,7 +67,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$guildClickListener$1;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 2e90ff2782..8249933673 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onResume$1;->invoke(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 532eac6ba2..f60c3e4b13 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onResume$2;->invoke(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 96e6349425..0bf79a970a 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onResume$3;->invoke(Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 a01ad2268a..6cb3b41e9c 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onResume$4;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 f68bb6acea..15540a2f44 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 c59285e910..4a33e15d64 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList.smali
@@ -96,7 +96,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a035c
+    const v0, 0x7f0a036c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -104,7 +104,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->recyclerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a035e
+    const v0, 0x7f0a036e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -148,7 +148,7 @@
 
     const-string v0, "adapter"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -247,7 +247,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState;->getItems()Ljava/util/List;
@@ -266,7 +266,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState;->getCanCreateFolders()Z
@@ -492,7 +492,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v1, v2}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->setHasStableIds(Z)V
@@ -521,7 +521,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     check-cast v1, Landroidx/recyclerview/widget/RecyclerView$Adapter;
@@ -536,7 +536,7 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     check-cast v2, Lcom/discord/widgets/guilds/list/GuildsDragAndDropCallback$Controller;
@@ -563,7 +563,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f080151
+    const v3, 0x7f080159
 
     invoke-static {v2, v3}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -571,7 +571,7 @@
 
     if-nez v2, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     const-string v3, "ContextCompat.getDrawabl\u2026e_squircle_primary_600)!!"
@@ -582,7 +582,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f080153
+    const v4, 0x7f08015b
 
     invoke-static {v3, v4}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -590,7 +590,7 @@
 
     if-nez v3, :cond_4
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_4
     const-string v4, "ContextCompat.getDrawabl\u2026quircle_white_alpha_20)!!"
@@ -601,7 +601,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f08012d
+    const v5, 0x7f080133
 
     invoke-static {v4, v5}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -609,7 +609,7 @@
 
     if-nez v4, :cond_5
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_5
     const-string v5, "ContextCompat.getDrawabl\u2026e.drawable_open_folder)!!"
@@ -628,7 +628,7 @@
 
     move-result-object v5
 
-    const v6, 0x7f070057
+    const v6, 0x7f070056
 
     invoke-virtual {v5, v6}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -698,20 +698,20 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f10008e
+    const v2, 0x7f10008d
 
     invoke-virtual {v0, v2, p1, v1}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
+    const-string v0, "resources.getQuantityStr\u2026   unavailableGuildCount)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
-    const-string v1, "unavailableString"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     check-cast p1, Ljava/lang/CharSequence;
 
     invoke-static {p1}, Lcom/discord/utilities/textprocessing/Parsers;->parseBoldMarkdown(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
@@ -728,7 +728,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0137
+    const v0, 0x7f0d0140
 
     return v0
 .end method
@@ -742,7 +742,7 @@
 
     const-string v1, "viewModel"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->onDrop()Z
@@ -769,7 +769,7 @@
 
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {p1, p2}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->onItemClicked(Lcom/discord/widgets/guilds/list/GuildListItem;)V
@@ -794,7 +794,7 @@
 
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {p1, p2}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->onItemLongPressed(Lcom/discord/widgets/guilds/list/GuildListItem;)V
@@ -819,7 +819,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast p1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove;
@@ -845,7 +845,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     check-cast p1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow;
@@ -871,7 +871,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     check-cast p1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation;
@@ -923,7 +923,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->observeViewState()Lrx/Observable;
@@ -972,7 +972,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {v0}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->listenForEvents()Lrx/Observable;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$2.smali
index 65996d8616..ed6fc2aa9a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$2.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$2;->invoke(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowChannelActions.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowChannelActions.smali
index 2091799141..6bce9b6ca1 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowChannelActions.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowChannelActions.smali
@@ -120,19 +120,15 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 2
 
     iget-wide v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowChannelActions;->channelId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v2, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v2
-
-    long-to-int v1, v0
-
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowUnavailableGuilds.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowUnavailableGuilds.smali
index 98e7eb0f66..77311ebf37 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowUnavailableGuilds.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowUnavailableGuilds.smali
@@ -122,6 +122,10 @@
 
     iget v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowUnavailableGuilds;->unavailableGuildCount:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     return v0
 .end method
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk.smali
index 575015ecce..eab0cf2a9d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk.smali
@@ -817,154 +817,148 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->selectedGuildId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v3
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
+    iget-wide v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->selectedVoiceChannelId:J
 
-    mul-int/lit8 v1, v1, 0x1f
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    iget-wide v3, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->selectedVoiceChannelId:J
+    move-result v1
 
-    ushr-long v5, v3, v2
+    add-int/2addr v0, v1
 
-    xor-long/2addr v3, v5
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v0, v3
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->guildSettings:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->guildSettings:Ljava/util/Map;
 
     const/4 v2, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->unreadGuildIds:Ljava/util/Set;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->unreadGuildIds:Ljava/util/Set;
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()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 v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->mentionCounts:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->mentionCounts:Ljava/util/Map;
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_2
 
     :cond_2
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_2
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->channelIds:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->channelIds:Ljava/util/Map;
 
-    if-eqz v0, :cond_3
+    if-eqz v1, :cond_3
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_3
 
     :cond_3
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_3
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->unavailableGuilds:Ljava/util/Set;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->unavailableGuilds:Ljava/util/Set;
 
-    if-eqz v0, :cond_4
+    if-eqz v1, :cond_4
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_4
 
     :cond_4
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_4
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->privateChannels:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->privateChannels:Ljava/util/Map;
 
-    if-eqz v0, :cond_5
+    if-eqz v1, :cond_5
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_5
 
     :cond_5
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_5
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->sortedGuilds:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData$Chunk;->sortedGuilds:Ljava/util/List;
 
-    if-eqz v0, :cond_6
+    if-eqz v1, :cond_6
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v2
 
     :cond_6
-    add-int/2addr v1, v2
+    add-int/2addr v0, v2
 
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData.smali
index 34285c6984..571cc6dc08 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData.smali
@@ -1035,201 +1035,195 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->selectedGuildId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v3
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
+    iget-wide v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->selectedVoiceChannelId:J
 
-    mul-int/lit8 v1, v1, 0x1f
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    iget-wide v3, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->selectedVoiceChannelId:J
+    move-result v1
 
-    ushr-long v5, v3, v2
+    add-int/2addr v0, v1
 
-    xor-long/2addr v3, v5
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v0, v3
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->guildSettings:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->guildSettings:Ljava/util/Map;
 
     const/4 v2, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->unreadGuildIds:Ljava/util/Set;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->unreadGuildIds:Ljava/util/Set;
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()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 v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->mentionCounts:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->mentionCounts:Ljava/util/Map;
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_2
 
     :cond_2
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_2
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->channelIds:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->channelIds:Ljava/util/Map;
 
-    if-eqz v0, :cond_3
+    if-eqz v1, :cond_3
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_3
 
     :cond_3
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_3
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->unavailableGuilds:Ljava/util/Set;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->unavailableGuilds:Ljava/util/Set;
 
-    if-eqz v0, :cond_4
+    if-eqz v1, :cond_4
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_4
 
     :cond_4
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_4
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->privateChannels:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->privateChannels:Ljava/util/Map;
 
-    if-eqz v0, :cond_5
+    if-eqz v1, :cond_5
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_5
 
     :cond_5
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_5
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->sortedGuilds:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->sortedGuilds:Ljava/util/List;
 
-    if-eqz v0, :cond_6
+    if-eqz v1, :cond_6
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_6
 
     :cond_6
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_6
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->lurkingGuildIds:Ljava/util/Set;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->lurkingGuildIds:Ljava/util/Set;
 
-    if-eqz v0, :cond_7
+    if-eqz v1, :cond_7
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_7
 
     :cond_7
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_7
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->openFolderIds:Ljava/util/Set;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->openFolderIds:Ljava/util/Set;
 
-    if-eqz v0, :cond_8
+    if-eqz v1, :cond_8
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v2
 
     :cond_8
-    add-int/2addr v1, v2
+    add-int/2addr v0, v2
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->isUserStaff:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreData;->isUserStaff:Z
 
-    if-eqz v0, :cond_9
+    if-eqz v1, :cond_9
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_9
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final isUserStaff()Z
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$observeStores$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$observeStores$1.smali
index d822e94657..8b84281284 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$observeStores$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$observeStores$1.smali
@@ -135,7 +135,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v5
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$observeStores$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$observeStores$2.smali
index 4e294944d3..0788663f6f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$observeStores$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$observeStores$2.smali
@@ -100,7 +100,7 @@
 
     array-length v1, p1
 
-    invoke-static {v1}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v1}, Lkotlin/a/ad;->dj(I)I
 
     move-result v1
 
@@ -132,7 +132,7 @@
     return-object p1
 
     :cond_1
-    sget-object p1, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p1, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast p1, Ljava/util/Set;
 
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 8ee7f052eb..a7ac70f0d6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.smali
@@ -47,13 +47,13 @@
 
     invoke-direct {p0}, Landroidx/lifecycle/ViewModel;-><init>()V
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -91,11 +91,11 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -891,7 +891,7 @@
 
     if-gez v0, :cond_11
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_11
     check-cast v1, Lcom/discord/models/domain/ModelGuild;
@@ -1616,7 +1616,7 @@
 
     aput-object v13, v1, v17
 
-    invoke-static {v1}, Lkotlin/a/m;->o([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lkotlin/a/m;->n([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v1
 
@@ -1801,9 +1801,9 @@
 
     new-instance v4, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
 
-    sget-object v7, Lkotlin/f/c;->bkN:Lkotlin/f/c$b;
+    sget-object v7, Lkotlin/f/c;->blh:Lkotlin/f/c$b;
 
-    invoke-static {}, Lkotlin/f/c;->Es()Lkotlin/f/c;
+    invoke-static {}, Lkotlin/f/c;->Eh()Lkotlin/f/c;
 
     move-result-object v7
 
@@ -1837,7 +1837,7 @@
 
     aput-object v8, v7, v5
 
-    invoke-static {v7}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v7}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v14
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$1.smali
index a48a0dae82..1d407ade2b 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/main/WidgetMain$configureFirstOpen$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$2.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$2.smali
index e78a1afe62..a705f09992 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$2.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$2.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/main/WidgetMain$configureFirstOpen$2;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$3.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$3.smali
index 6c8db6d778..f46a7dacf3 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$3.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureFirstOpen$3.smali
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$configureFirstOpen$3;->invoke(Lkotlin/jvm/functions/Function0;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureNavigationDrawerAction$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureNavigationDrawerAction$1.smali
index bcb6c996a1..3bf9484eb3 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureNavigationDrawerAction$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureNavigationDrawerAction$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$configureNavigationDrawerAction$1;->invoke(Lcom/discord/stores/StoreNavigation$DrawerAction;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureOpenDrawerAction$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureOpenDrawerAction$1.smali
index 01c016a658..0a678bc163 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$configureOpenDrawerAction$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$configureOpenDrawerAction$1.smali
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$configureOpenDrawerAction$1;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -116,7 +116,7 @@
     return-void
 
     :cond_1
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$onGuildListAddHintCreate$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$onGuildListAddHintCreate$1.smali
index c76ddecbd1..78f56ef587 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$onGuildListAddHintCreate$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$onGuildListAddHintCreate$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$onGuildListAddHintCreate$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$onTabsLayoutCreate$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$onTabsLayoutCreate$1.smali
index 20797c9d81..6822835e8f 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$onTabsLayoutCreate$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$onTabsLayoutCreate$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$onTabsLayoutCreate$1;->invoke(Lcom/google/android/material/tabs/TabLayout;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$1.smali
index 52f0fbef5f..5676fc9c67 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/main/WidgetMainModel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2.smali
index 8cd18da400..d05e7a38d6 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2.smali
@@ -1,9 +1,9 @@
-.class final synthetic Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;
-.super Lkotlin/jvm/internal/j;
+.class final Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;
+.super Ljava/lang/Object;
 .source "WidgetMain.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lrx/functions/b;
 
 
 # annotations
@@ -12,86 +12,79 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1018
+    accessFlags = 0x18
     name = null
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lkotlin/jvm/internal/j;",
-        "Lkotlin/jvm/functions/Function1<",
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
         "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
-        "Lkotlin/Unit;",
+        "Ljava/lang/Boolean;",
         ">;"
     }
 .end annotation
 
 
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;
+
+
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/main/WidgetMain;)V
+.method static constructor <clinit>()V
     .locals 1
 
-    const/4 v0, 0x1
+    new-instance v0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;
 
-    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v0}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;->INSTANCE:Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()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/main/WidgetMain;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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 final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;->invoke(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;->call(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)Z
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    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 invoke(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)V
+.method public final call(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)Z
     .locals 1
 
-    const-string v0, "p1"
+    sget-object v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;->receiver:Ljava/lang/Object;
+    move-result p1
 
-    check-cast v0, Lcom/discord/widgets/main/WidgetMain;
+    xor-int/lit8 p1, p1, 0x1
 
-    invoke-static {v0, p1}, Lcom/discord/widgets/main/WidgetMain;->access$showSurvey(Lcom/discord/widgets/main/WidgetMain;Lcom/discord/utilities/surveys/SurveyUtils$Survey;)V
-
-    return-void
+    return p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3.smali
index 2721fd8df9..6aa3ba1860 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3.smali
@@ -1,9 +1,9 @@
-.class final Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;
-.super Ljava/lang/Object;
+.class final synthetic Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;
+.super Lkotlin/jvm/internal/j;
 .source "WidgetMain.kt"
 
 # interfaces
-.implements Lrx/functions/b;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
@@ -12,75 +12,86 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
+    accessFlags = 0x1018
     name = null
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/b<",
-        "Lcom/discord/stores/StoreNux$NuxState;",
-        "Ljava/lang/Boolean;",
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
+        "Lkotlin/Unit;",
         ">;"
     }
 .end annotation
 
 
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;
-
-
 # direct methods
-.method static constructor <clinit>()V
+.method constructor <init>(Lcom/discord/widgets/main/WidgetMain;)V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;
+    const/4 v0, 0x1
 
-    invoke-direct {v0}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;->INSTANCE:Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;
-
-    return-void
-.end method
-
-.method constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.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/main/WidgetMain;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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 final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/stores/StoreNux$NuxState;
+    check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;->call(Lcom/discord/stores/StoreNux$NuxState;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;->invoke(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)V
 
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/stores/StoreNux$NuxState;)Z
-    .locals 0
+.method public final invoke(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)V
+    .locals 1
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreNux$NuxState;->getFirstOpen()Z
+    const-string v0, "p1"
 
-    move-result p1
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return p1
+    iget-object v0, p0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/main/WidgetMain;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/main/WidgetMain;->access$showSurvey(Lcom/discord/widgets/main/WidgetMain;Lcom/discord/utilities/surveys/SurveyUtils$Survey;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4.smali
index f6b29541a1..cdc8f100a5 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4.smali
@@ -1,9 +1,9 @@
 .class final Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;
-.super Lkotlin/jvm/internal/l;
+.super Ljava/lang/Object;
 .source "WidgetMain.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lrx/functions/b;
 
 
 # annotations
@@ -18,52 +18,69 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
         "Lcom/discord/stores/StoreNux$NuxState;",
-        "Lkotlin/Unit;",
+        "Ljava/lang/Boolean;",
         ">;"
     }
 .end annotation
 
 
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/main/WidgetMain;
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/main/WidgetMain;)V
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;
+
+    invoke-direct {v0}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;->INSTANCE:Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;
+
+    return-void
+.end method
+
+.method constructor <init>()V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;->this$0:Lcom/discord/widgets/main/WidgetMain;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Lcom/discord/stores/StoreNux$NuxState;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;->invoke(Lcom/discord/stores/StoreNux$NuxState;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;->call(Lcom/discord/stores/StoreNux$NuxState;)Z
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    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 invoke(Lcom/discord/stores/StoreNux$NuxState;)V
+.method public final call(Lcom/discord/stores/StoreNux$NuxState;)Z
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;->this$0:Lcom/discord/widgets/main/WidgetMain;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreNux$NuxState;->getFirstOpen()Z
 
-    invoke-static {p1}, Lcom/discord/widgets/main/WidgetMain;->access$configureFirstOpen(Lcom/discord/widgets/main/WidgetMain;)V
+    move-result p1
 
-    return-void
+    return p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$5.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$5.smali
new file mode 100644
index 0000000000..f6b5b887a4
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$5.smali
@@ -0,0 +1,69 @@
+.class final Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$5;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetMain.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/main/WidgetMain;->onViewBoundOrOnResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/stores/StoreNux$NuxState;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/main/WidgetMain;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/main/WidgetMain;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$5;->this$0:Lcom/discord/widgets/main/WidgetMain;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreNux$NuxState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$5;->invoke(Lcom/discord/stores/StoreNux$NuxState;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/stores/StoreNux$NuxState;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$5;->this$0:Lcom/discord/widgets/main/WidgetMain;
+
+    invoke-static {p1}, Lcom/discord/widgets/main/WidgetMain;->access$configureFirstOpen(Lcom/discord/widgets/main/WidgetMain;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$showSurvey$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$showSurvey$1.smali
index ccf6e9f168..e06c15cffa 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$showSurvey$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$showSurvey$1.smali
@@ -87,7 +87,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f120c17
+    const v4, 0x7f120c4b
 
     invoke-virtual {p1, v4}, Landroidx/fragment/app/FragmentActivity;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain.smali
index d6deb43313..f7b9d29dd7 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain.smali
@@ -197,7 +197,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/main/WidgetMain;->tabs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a035d
+    const v0, 0x7f0a036d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -205,7 +205,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/main/WidgetMain;->guildListAddHint$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0412
+    const v0, 0x7f0a0422
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -213,7 +213,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/main/WidgetMain;->drawerLayout$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a041f
+    const v0, 0x7f0a042f
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -221,7 +221,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/main/WidgetMain;->unreadCountView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -678,7 +678,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0143
+    const v0, 0x7f0d014c
 
     return v0
 .end method
@@ -850,6 +850,19 @@
 
     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 p1, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
+
+    invoke-static {}, Lcom/discord/samsung/a;->eq()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    sget-object p1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->Companion:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->enqueue()V
+
+    :cond_1
     return-void
 .end method
 
@@ -955,9 +968,21 @@
 
     invoke-virtual {v0, v4}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
 
+    move-result-object v0
+
+    const-string v4, "filter { it != null }.map { it!! }"
+
+    invoke-static {v0, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v4, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;->INSTANCE:Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;
+
+    check-cast v4, Lrx/functions/b;
+
+    invoke-virtual {v0, v4}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable;
+
     move-result-object v5
 
-    const-string v0, "filter { it != null }.map { it!! }"
+    const-string v0, "SurveyUtils\n        .get\u2026SurveyUtils.Survey.None }"
 
     invoke-static {v5, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -971,13 +996,13 @@
 
     const/4 v10, 0x0
 
-    new-instance v0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;
+    new-instance v0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;
 
     move-object v4, p0
 
     check-cast v4, Lcom/discord/widgets/main/WidgetMain;
 
-    invoke-direct {v0, v4}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$2;-><init>(Lcom/discord/widgets/main/WidgetMain;)V
+    invoke-direct {v0, v4}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;-><init>(Lcom/discord/widgets/main/WidgetMain;)V
 
     move-object v11, v0
 
@@ -999,7 +1024,7 @@
 
     move-result-object v0
 
-    sget-object v4, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;->INSTANCE:Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;
+    sget-object v4, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;->INSTANCE:Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;
 
     check-cast v4, Lrx/functions/b;
 
@@ -1037,9 +1062,9 @@
 
     const/4 v9, 0x0
 
-    new-instance v0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;
+    new-instance v0, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$5;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$4;-><init>(Lcom/discord/widgets/main/WidgetMain;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$5;-><init>(Lcom/discord/widgets/main/WidgetMain;)V
 
     move-object v10, v0
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle.smali
index 850d7cc9a7..a6a0f99ad1 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle.smali
@@ -367,13 +367,13 @@
 
     move-result p1
 
-    const v0, 0x7f0a041c
+    const v0, 0x7f0a042c
 
     const/4 v2, 0x0
 
     if-eq p1, v0, :cond_2
 
-    const v0, 0x7f0a041e
+    const v0, 0x7f0a042e
 
     if-eq p1, v0, :cond_1
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout.smali
index c7667e9919..341bc84b36 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainDrawerLayout.smali
@@ -199,7 +199,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle;->syncState()V
@@ -214,7 +214,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     const/4 v2, 0x0
@@ -246,7 +246,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     check-cast v0, Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;
@@ -255,7 +255,7 @@
 
     check-cast p1, Landroid/content/Context;
 
-    const v0, 0x7f0400bc
+    const v0, 0x7f0400bd
 
     invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1.smali
index 0953549efe..00c20a8211 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1.smali
@@ -90,7 +90,7 @@
     const-wide/16 v0, 0x0
 
     :goto_0
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
 
     return-void
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$getOnConfigureAction$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$getOnConfigureAction$1.smali
index b73cdd481e..05a82a0d2b 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$getOnConfigureAction$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$getOnConfigureAction$1.smali
@@ -57,7 +57,7 @@
 
     const-string v1, "menu.findItem(R.id.menu_chat_start_group)"
 
-    const v2, 0x7f0a0447
+    const v2, 0x7f0a0457
 
     const/4 v3, 0x1
 
@@ -65,7 +65,7 @@
 
     if-ne v0, v4, :cond_0
 
-    const v0, 0x7f0a043e
+    const v0, 0x7f0a044e
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -108,7 +108,7 @@
 
     if-nez v0, :cond_1
 
-    const v0, 0x7f0a0443
+    const v0, 0x7f0a0453
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -130,7 +130,7 @@
 
     const-string v4, "menu.findItem(R.id.menu_chat_search)"
 
-    const v5, 0x7f0a0444
+    const v5, 0x7f0a0454
 
     const/16 v6, 0x8
 
@@ -147,7 +147,7 @@
     goto :goto_1
 
     :cond_2
-    const v0, 0x7f0a0441
+    const v0, 0x7f0a0451
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -159,7 +159,7 @@
 
     invoke-interface {v0, v3}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    const v0, 0x7f0a0442
+    const v0, 0x7f0a0452
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -174,7 +174,7 @@
     goto :goto_1
 
     :cond_3
-    const v0, 0x7f0a0440
+    const v0, 0x7f0a0450
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -186,7 +186,7 @@
 
     invoke-interface {v0, v3}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    const v0, 0x7f0a043f
+    const v0, 0x7f0a044f
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -209,7 +209,7 @@
     goto :goto_1
 
     :cond_4
-    const v0, 0x7f0a043b
+    const v0, 0x7f0a044b
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -221,7 +221,7 @@
 
     invoke-interface {v0, v3}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    const v0, 0x7f0a043a
+    const v0, 0x7f0a044a
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -233,7 +233,7 @@
 
     invoke-interface {v0, v3}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    const v0, 0x7f0a0445
+    const v0, 0x7f0a0455
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -331,7 +331,7 @@
     const/4 v0, 0x0
 
     :goto_2
-    const v2, 0x7f0a0446
+    const v2, 0x7f0a0456
 
     invoke-interface {p1, v2}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -361,7 +361,7 @@
     :goto_3
     invoke-interface {v2, v4}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    const v2, 0x7f0a0448
+    const v2, 0x7f0a0458
 
     invoke-interface {p1, v2}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -394,7 +394,7 @@
     :cond_a
     invoke-interface {v2, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    const v0, 0x7f0a0449
+    const v0, 0x7f0a0459
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1.smali
index 556fd5f745..a1ebe52f46 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1.smali
@@ -36,14 +36,14 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/main/WidgetMainModel;Lcom/discord/widgets/main/WidgetMainDrawerLayout;Lcom/discord/app/AppFragment;)V
+.method constructor <init>(Lcom/discord/widgets/main/WidgetMainModel;Lcom/discord/app/AppFragment;Lcom/discord/widgets/main/WidgetMainDrawerLayout;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
 
-    iput-object p2, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$drawerLayout:Lcom/discord/widgets/main/WidgetMainDrawerLayout;
+    iput-object p2, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$appFragment:Lcom/discord/app/AppFragment;
 
-    iput-object p3, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$appFragment:Lcom/discord/app/AppFragment;
+    iput-object p3, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$drawerLayout:Lcom/discord/widgets/main/WidgetMainDrawerLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -173,12 +173,32 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
+    new-instance v0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;
+
+    iget-object v1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$appFragment:Lcom/discord/app/AppFragment;
+
+    move-object v2, v1
+
+    check-cast v2, Lcom/discord/app/AppPermissions$Requests;
+
+    move-object v3, v1
+
+    check-cast v3, Lcom/discord/app/AppComponent;
+
+    invoke-virtual {v1}, Lcom/discord/app/AppFragment;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v1
+
+    const-string v4, "appFragment.requireFragmentManager()"
+
+    invoke-static {v1, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v0, v2, v3, p2, 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
+
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
     move-result p1
 
-    const/4 v0, 0x0
-
     const/4 v1, 0x0
 
     packed-switch p1, :pswitch_data_0
@@ -198,19 +218,13 @@
     goto/16 :goto_1
 
     :pswitch_2
-    sget-object p1, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->Companion:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;
+    iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
 
-    iget-object p2, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
+    invoke-virtual {p1}, Lcom/discord/widgets/main/WidgetMainModel;->getChannelId()J
 
-    invoke-virtual {p2}, Lcom/discord/widgets/main/WidgetMainModel;->getChannelId()J
+    move-result-wide p1
 
-    move-result-wide v2
-
-    const/4 p2, 0x1
-
-    iget-object v4, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$appFragment:Lcom/discord/app/AppFragment;
-
-    invoke-virtual {p1, v2, v3, p2, v4}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppFragment;)V
+    invoke-virtual {v0, p1, p2}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->launchVideoCall(J)V
 
     goto/16 :goto_1
 
@@ -220,17 +234,13 @@
     goto/16 :goto_1
 
     :pswitch_4
-    sget-object p1, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->Companion:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;
+    iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
 
-    iget-object p2, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
+    invoke-virtual {p1}, Lcom/discord/widgets/main/WidgetMainModel;->getChannelId()J
 
-    invoke-virtual {p2}, Lcom/discord/widgets/main/WidgetMainModel;->getChannelId()J
+    move-result-wide p1
 
-    move-result-wide v2
-
-    iget-object p2, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$appFragment:Lcom/discord/app/AppFragment;
-
-    invoke-virtual {p1, v2, v3, v0, p2}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppFragment;)V
+    invoke-virtual {v0, p1, p2}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->launchVoiceCall(J)V
 
     goto/16 :goto_1
 
@@ -273,9 +283,9 @@
     :pswitch_9
     sget-object p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->Companion:Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Companion;
 
-    iget-object v2, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
+    iget-object v0, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
 
-    invoke-virtual {v2}, Lcom/discord/widgets/main/WidgetMainModel;->getChannelId()J
+    invoke-virtual {v0}, Lcom/discord/widgets/main/WidgetMainModel;->getChannelId()J
 
     move-result-wide v2
 
@@ -308,7 +318,7 @@
     const-wide/16 v2, 0x0
 
     :goto_0
-    invoke-static {p2, v2, v3}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    invoke-static {p2, v2, v3}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
 
     goto :goto_1
 
@@ -319,9 +329,9 @@
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
+    iget-object v0, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
 
-    invoke-virtual {v2}, Lcom/discord/widgets/main/WidgetMainModel;->getChannelId()J
+    invoke-virtual {v0}, Lcom/discord/widgets/main/WidgetMainModel;->getChannelId()J
 
     move-result-wide v2
 
@@ -332,18 +342,18 @@
     :pswitch_c
     sget-object p1, Lcom/discord/widgets/friends/WidgetFriendsAdd;->Companion:Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;
 
-    const/4 v2, 0x2
+    const/4 v0, 0x2
 
-    invoke-static {p1, p2, v1, v2, v1}, Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;->show$default(Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;Landroid/content/Context;Ljava/lang/String;ILjava/lang/Object;)V
+    invoke-static {p1, p2, v1, v0, v1}, Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;->show$default(Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;Landroid/content/Context;Ljava/lang/String;ILjava/lang/Object;)V
 
     goto :goto_1
 
     :pswitch_d
     sget-object p1, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->Companion:Lcom/discord/widgets/channels/WidgetTextChannelSettings$Companion;
 
-    iget-object v2, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
+    iget-object v0, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
 
-    invoke-virtual {v2}, Lcom/discord/widgets/main/WidgetMainModel;->getChannelId()J
+    invoke-virtual {v0}, Lcom/discord/widgets/main/WidgetMainModel;->getChannelId()J
 
     move-result-wide v2
 
@@ -379,16 +389,16 @@
 
     check-cast p1, Landroid/app/Activity;
 
-    const/4 p2, 0x4
+    const/4 p2, 0x0
 
-    invoke-static {p1, v0, v1, p2, v1}, Lcom/discord/utilities/keyboard/Keyboard;->setKeyboardOpen$default(Landroid/app/Activity;ZLandroid/view/View;ILjava/lang/Object;)V
+    const/4 v0, 0x4
+
+    invoke-static {p1, p2, v1, v0, v1}, Lcom/discord/utilities/keyboard/Keyboard;->setKeyboardOpen$default(Landroid/app/Activity;ZLandroid/view/View;ILjava/lang/Object;)V
 
     return-void
 
-    nop
-
     :pswitch_data_0
-    .packed-switch 0x7f0a043a
+    .packed-switch 0x7f0a044a
         :pswitch_e
         :pswitch_d
         :pswitch_0
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali
index d3d199d900..21dc64e9bf 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali
@@ -33,7 +33,7 @@
 
     new-instance v0, Landroid/text/style/ForegroundColorSpan;
 
-    const v1, 0x7f04029b
+    const v1, 0x7f04029e
 
     invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -178,7 +178,7 @@
     return-object v2
 
     :cond_4
-    const p1, 0x7f1203b7
+    const p1, 0x7f1203bc
 
     invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -187,7 +187,7 @@
     goto :goto_0
 
     :cond_5
-    const p1, 0x7f12068a
+    const p1, 0x7f120698
 
     invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -227,7 +227,7 @@
 
     new-instance v0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;
 
-    invoke-direct {v0, p1, p3, p2}, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;-><init>(Lcom/discord/widgets/main/WidgetMainModel;Lcom/discord/widgets/main/WidgetMainDrawerLayout;Lcom/discord/app/AppFragment;)V
+    invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;-><init>(Lcom/discord/widgets/main/WidgetMainModel;Lcom/discord/app/AppFragment;Lcom/discord/widgets/main/WidgetMainDrawerLayout;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainModel$Companion.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainModel$Companion.smali
index fae709197a..5474b50b56 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainModel$Companion.smali
@@ -136,7 +136,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainModel.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainModel.smali
index fc5b24a66f..27e4e8ed81 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainModel.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainModel.smali
@@ -424,6 +424,10 @@
 
     iget v0, p0, Lcom/discord/widgets/main/WidgetMainModel;->type:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget-object v1, p0, Lcom/discord/widgets/main/WidgetMainModel;->channel:Lcom/discord/models/domain/ModelChannel;
@@ -461,6 +465,10 @@
 
     iget v1, p0, Lcom/discord/widgets/main/WidgetMainModel;->unreadCount:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading$configure$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading$configure$1.smali
index 8b42bc197c..bfeaa15a68 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading$configure$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading$configure$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMainPanelLoading$configure$1;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading.smali
index c4677356d5..b81e266516 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelLoading.smali
@@ -53,7 +53,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->view:Landroid/view/View;
 
-    const v0, 0x7f0a041d
+    const v0, 0x7f0a042d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -63,7 +63,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainPanelLoading;->view:Landroid/view/View;
 
-    const v0, 0x7f0a0414
+    const v0, 0x7f0a0424
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali
index b3b77f9dd3..6b5cf0df69 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali
@@ -23,7 +23,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    const v0, 0x7f0a0415
+    const v0, 0x7f0a0425
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -79,7 +79,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/main/WidgetMainPanelNoChannels;->channelLessContainerView:Landroid/view/View;
 
-    const v0, 0x7f0a0417
+    const v0, 0x7f0a0427
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -89,7 +89,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/main/WidgetMainPanelNoChannels;->channelLessTitle:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0416
+    const v0, 0x7f0a0426
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -108,7 +108,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1203b7
+    const v1, 0x7f1203bc
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -127,7 +127,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1203b6
+    const v1, 0x7f1203bb
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw.smali
index ade4480eca..76a4d4a102 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw.smali
@@ -88,7 +88,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/main/WidgetMainPanelNsfw;->guildsNsfwStore:Lcom/discord/stores/StoreGuildsNsfw;
 
-    const p2, 0x7f0a0418
+    const p2, 0x7f0a0428
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -151,7 +151,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a0819
+    const v1, 0x7f0a0857
 
     invoke-virtual {v0, v1}, Landroidx/fragment/app/FragmentManager;->findFragmentById(I)Landroidx/fragment/app/Fragment;
 
@@ -270,7 +270,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/main/WidgetMainPanelNsfw;->guildsNsfwContainerView:Landroid/view/View;
 
-    const v0, 0x7f0a041a
+    const v0, 0x7f0a042a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -278,7 +278,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/main/WidgetMainPanelNsfw;->guildsNsfwAcceptView:Landroid/view/View;
 
-    const v0, 0x7f0a041b
+    const v0, 0x7f0a042b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali
index a946d57da1..76a78ea303 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali
@@ -77,7 +77,7 @@
 
     if-nez p4, :cond_0
 
-    const p2, 0x7f120c19
+    const p2, 0x7f120c4d
 
     invoke-virtual {v0, p2}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali
index 3e26cff3f4..e6a3e4df29 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali
@@ -149,7 +149,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a07d8
+    const v0, 0x7f0a0815
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -157,7 +157,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d9
+    const v0, 0x7f0a0816
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -165,7 +165,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d7
+    const v0, 0x7f0a0814
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -173,7 +173,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->buttonConfirm$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d6
+    const v0, 0x7f0a0813
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -269,7 +269,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0082
+    const v0, 0x7f0d0089
 
     return v0
 .end method
@@ -389,7 +389,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120c18
+    const v3, 0x7f120c4c
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String;
 
@@ -411,7 +411,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120be2
+    const v2, 0x7f120c14
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String;
 
@@ -437,7 +437,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120c77
+    const v2, 0x7f120cb0
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String;
 
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 b3461e1f97..67f1d72aa4 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$Companion.smali
@@ -132,6 +132,10 @@
 
     move-result-object p2
 
+    const-string p3, "Intent()\n          .putE\u2026ENT_HEIGHT, image.height)"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-class p3, Lcom/discord/widgets/media/WidgetMedia;
 
     invoke-static {p1, p3, p2}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
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 3057fbf77b..3b9de2e681 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -91,7 +91,7 @@
 
     iget-object v1, v1, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia;
 
-    const v2, 0x7f120532
+    const v2, 0x7f12053d
 
     const/4 v3, 0x1
 
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali
index 6d05d2b524..9a11d8d227 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -91,7 +91,7 @@
 
     iget-object v0, v0, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia;
 
-    const v1, 0x7f120531
+    const v1, 0x7f12053c
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/media/WidgetMedia;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.smali
index d628b6f8e7..0c2c367794 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
@@ -129,7 +129,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0458
+    .packed-switch 0x7f0a0468
         :pswitch_2
         :pswitch_1
         :pswitch_0
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$startVideo$2.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$startVideo$2.smali
index 22da95fde0..b66106bea9 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$startVideo$2.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$startVideo$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/media/WidgetMedia$startVideo$2;->invoke(Ljava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 b633bad908..483bfc9da0 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
@@ -109,7 +109,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a042d
+    const v0, 0x7f0a043d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -117,7 +117,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->mediaImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a042e
+    const v0, 0x7f0a043e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -147,7 +147,7 @@
 
     const-string v0, "proxyUri"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -409,7 +409,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0151
+    const v0, 0x7f0d015a
 
     return v0
 .end method
@@ -529,7 +529,7 @@
 
     invoke-static {p0, v3, v5, v4, v5}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v4, 0x7f1212cf
+    const v4, 0x7f121320
 
     invoke-virtual {p0, v4}, Lcom/discord/widgets/media/WidgetMedia;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -587,7 +587,7 @@
 
     check-cast v0, Landroid/widget/ImageView;
 
-    sget-object v1, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MH:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v1, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MZ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     const-string v2, "ScalingUtils.ScaleType.FIT_CENTER"
 
@@ -621,7 +621,7 @@
 
     const-string v3, "proxyUri"
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-direct {p0, v0, v2}, Lcom/discord/widgets/media/WidgetMedia;->getFormattedUrl(Landroid/content/Context;Landroid/net/Uri;)Ljava/lang/String;
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 2d2da32100..8a251c3844 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$onCancel$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 d392028a63..8b368073cb 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$onConfirm$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 e729a1d225..7666cb947b 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 05bca1c17b..a7105a6800 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$2;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 0e433e4443..e9e606c042 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 e7e2f67269..a941dd4f99 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$2;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 a805d25138..2369708dbd 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder.smali
@@ -426,7 +426,7 @@
 
     new-array v1, v1, [Lkotlin/Pair;
 
-    const v8, 0x7f0a0493
+    const v8, 0x7f0a04a8
 
     invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -442,7 +442,7 @@
 
     aput-object v8, v1, v9
 
-    const v8, 0x7f0a0490
+    const v8, 0x7f0a04a3
 
     invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
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 b079573bc7..4bf93f56a9 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -75,7 +75,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0a07da
+    const v2, 0x7f0a0817
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 a11f61365d..044ee8f5d9 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$2;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 f003e17ffa..2e77c3c8a5 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0a07da
+    const v0, 0x7f0a0817
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 a23681e129..89408f0707 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali
@@ -410,7 +410,7 @@
 
     check-cast v11, Ljava/util/Map;
 
-    const v4, 0x7f0a0493
+    const v4, 0x7f0a04a8
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -424,7 +424,7 @@
 
     if-eqz v3, :cond_0
 
-    const v2, 0x7f0a0490
+    const v2, 0x7f0a04a3
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -458,13 +458,13 @@
 
     move-result-object v6
 
-    const v1, 0x7f0d008e
+    const v1, 0x7f0d0096
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v14
 
-    const v1, 0x7f12040c
+    const v1, 0x7f120413
 
     invoke-virtual {v0, v1}, Lcom/discord/app/AppActivity;->getString(I)Ljava/lang/String;
 
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 a233c90c90..1a024957c5 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 54d0dfc4a7..05578cc399 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog.smali
@@ -34,11 +34,11 @@
 
 .field private static final ARG_THEME_ID:Ljava/lang/String; = "theme_id"
 
-.field public static final CANCEL_BUTTON:I = 0x7f0a0490
+.field public static final CANCEL_BUTTON:I = 0x7f0a04a3
 
 .field public static final Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-.field public static final OK_BUTTON:I = 0x7f0a0493
+.field public static final OK_BUTTON:I = 0x7f0a04a8
 
 .field public static final ON_SHOW:I
 
@@ -232,7 +232,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0492
+    const v0, 0x7f0a04a6
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -240,7 +240,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog;->headerContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0491
+    const v0, 0x7f0a04a5
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -248,7 +248,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a048f
+    const v0, 0x7f0a04a2
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -256,7 +256,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0493
+    const v0, 0x7f0a04a8
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -264,7 +264,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog;->ok$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0490
+    const v0, 0x7f0a04a3
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -272,7 +272,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a048e
+    const v0, 0x7f0a04a1
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -563,7 +563,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0153
+    const v0, 0x7f0d015c
 
     return v0
 .end method
@@ -614,7 +614,7 @@
 
     if-eqz v2, :cond_0
 
-    const v4, 0x7f040102
+    const v4, 0x7f040103
 
     const-string v5, "theme_id"
 
@@ -638,7 +638,7 @@
 .end method
 
 .method public final onViewBound(Landroid/view/View;)V
-    .locals 11
+    .locals 12
 
     const-string v0, "view"
 
@@ -650,62 +650,66 @@
 
     move-result-object v0
 
+    const-string v1, "it"
+
     if-eqz v0, :cond_0
 
-    const-string v1, "notice_type"
+    const-string v2, "notice_type"
 
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v2}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getNotices()Lcom/discord/stores/StoreNotices;
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getNotices()Lcom/discord/stores/StoreNotices;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1, v0}, Lcom/discord/stores/StoreNotices;->markDialogSeen(Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2, v0}, Lcom/discord/stores/StoreNotices;->markDialogSeen(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getArguments()Landroid/os/Bundle;
 
     move-result-object v0
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
     if-eqz v0, :cond_1
 
-    const-string v2, "header_text"
+    const-string v3, "header_text"
 
-    invoke-virtual {v0, v2}, 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 v0
 
     goto :goto_0
 
     :cond_1
-    move-object v0, v1
+    move-object v0, v2
 
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getHeader()Landroid/widget/TextView;
 
-    move-result-object v2
+    move-result-object v3
 
     check-cast v0, Ljava/lang/CharSequence;
 
-    invoke-virtual {v2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v3, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getHeaderContainer()Landroid/view/ViewGroup;
 
-    move-result-object v2
+    move-result-object v3
 
-    check-cast v2, Landroid/view/View;
+    check-cast v3, Landroid/view/View;
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    const/4 v4, 0x1
+    const/4 v5, 0x1
 
     if-eqz v0, :cond_3
 
@@ -727,11 +731,11 @@
     const/4 v0, 0x1
 
     :goto_2
-    xor-int/2addr v0, v4
+    xor-int/2addr v0, v5
 
-    const/4 v5, 0x2
+    const/4 v6, 0x2
 
-    invoke-static {v2, v0, v3, v5, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v3, v0, v4, v6, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getBody()Landroid/widget/TextView;
 
@@ -739,67 +743,69 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getArguments()Landroid/os/Bundle;
 
-    move-result-object v2
+    move-result-object v3
 
-    if-eqz v2, :cond_4
+    if-eqz v3, :cond_4
 
-    const-string v5, "body_text"
+    const-string v6, "body_text"
 
-    invoke-virtual {v2, v5}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v3, v6}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v3
 
-    if-eqz v2, :cond_4
+    if-eqz v3, :cond_4
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v5
+    move-result-object v6
 
-    const-string v6, "view.context"
+    const-string v7, "view.context"
 
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v6, v2
+    invoke-static {v3, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v6, Ljava/lang/CharSequence;
+    move-object v7, v3
 
-    const/4 v7, 0x0
+    check-cast v7, Ljava/lang/CharSequence;
 
     const/4 v8, 0x0
 
-    const/16 v9, 0xc
+    const/4 v9, 0x0
 
-    const/4 v10, 0x0
+    const/16 v10, 0xc
 
-    invoke-static/range {v5 .. v10}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/CharSequence;
+    const/4 v11, 0x0
 
-    move-result-object v2
+    invoke-static/range {v6 .. v11}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/CharSequence;
+
+    move-result-object v1
 
     goto :goto_3
 
     :cond_4
-    move-object v2, v1
+    move-object v1, v2
 
     :goto_3
-    invoke-virtual {v0, 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/notice/WidgetNoticeDialog;->getBody()Landroid/widget/TextView;
 
     move-result-object v0
 
-    new-instance v2, Lcom/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod;
+    new-instance v1, Lcom/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod;
 
-    new-instance v5, Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3;
+    new-instance v3, Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3;
 
-    invoke-direct {v5, p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3;-><init>(Lcom/discord/widgets/notice/WidgetNoticeDialog;)V
+    invoke-direct {v3, p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3;-><init>(Lcom/discord/widgets/notice/WidgetNoticeDialog;)V
 
-    check-cast v5, Lkotlin/jvm/functions/Function0;
+    check-cast v3, Lkotlin/jvm/functions/Function0;
 
-    invoke-direct {v2, v5}, Lcom/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod;-><init>(Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v1, v3}, Lcom/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    check-cast v2, Landroid/text/method/MovementMethod;
+    check-cast v1, Landroid/text/method/MovementMethod;
 
-    invoke-virtual {v0, v2}, Landroid/widget/TextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getOk()Landroid/widget/TextView;
 
@@ -807,20 +813,20 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getArguments()Landroid/os/Bundle;
 
-    move-result-object v2
-
-    if-eqz v2, :cond_5
-
-    const-string v1, "ok_text"
-
-    invoke-virtual {v2, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
     move-result-object v1
 
-    :cond_5
-    check-cast v1, Ljava/lang/CharSequence;
+    if-eqz v1, :cond_5
 
-    invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    const-string v2, "ok_text"
+
+    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    :cond_5
+    check-cast v2, Ljava/lang/CharSequence;
+
+    invoke-static {v0, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getArguments()Landroid/os/Bundle;
 
@@ -853,7 +859,7 @@
 
     const-string v1, "above_layout_id"
 
-    invoke-direct {p0, v0, v1, v3}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->insertLayoutInBundle(Landroid/os/Bundle;Ljava/lang/String;I)Ljava/lang/Integer;
+    invoke-direct {p0, v0, v1, v4}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->insertLayoutInBundle(Landroid/os/Bundle;Ljava/lang/String;I)Ljava/lang/Integer;
 
     :cond_7
     invoke-virtual {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getArguments()Landroid/os/Bundle;
@@ -907,12 +913,12 @@
 
     const-string v1, "cancelable"
 
-    invoke-virtual {v0, v1, v4}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;Z)Z
+    invoke-virtual {v0, v1, v5}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;Z)Z
 
-    move-result v4
+    move-result v5
 
     :cond_9
-    invoke-virtual {p0, v4}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->setCancelable(Z)V
+    invoke-virtual {p0, v5}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->setCancelable(Z)V
 
     iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog;->listenerMap:Ljava/util/Map;
 
@@ -956,13 +962,13 @@
 
     if-eqz v2, :cond_a
 
-    new-instance v4, Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$$inlined$forEach$lambda$1;
+    new-instance v3, Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$$inlined$forEach$lambda$1;
 
-    invoke-direct {v4, v1, p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$$inlined$forEach$lambda$1;-><init>(Ljava/util/Map$Entry;Lcom/discord/widgets/notice/WidgetNoticeDialog;Landroid/view/View;)V
+    invoke-direct {v3, v1, p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$$inlined$forEach$lambda$1;-><init>(Ljava/util/Map$Entry;Lcom/discord/widgets/notice/WidgetNoticeDialog;Landroid/view/View;)V
 
-    check-cast v4, Landroid/view/View$OnClickListener;
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v2, v4}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     goto :goto_4
 
@@ -977,7 +983,7 @@
 
     if-eqz v0, :cond_c
 
-    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 v1
 
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 ff2761d8b5..7489149a33 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
@@ -51,7 +51,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a06ec
+    const v1, 0x7f0a0706
 
     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 1126c6bc19..7ce036ebd1 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay.smali
@@ -97,7 +97,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a02b3
+    const v0, 0x7f0a02bc
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -105,7 +105,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxOverlay;->ok$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0118
+    const v0, 0x7f0a0119
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -161,7 +161,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0154
+    const v0, 0x7f0d015d
 
     return v0
 .end method
@@ -185,7 +185,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f060136
+    const v1, 0x7f060138
 
     invoke-virtual {v0, v1}, Landroid/view/Window;->setBackgroundDrawableResource(I)V
 
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
new file mode 100644
index 0000000000..24ce8ce9c2
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1.smali
@@ -0,0 +1,88 @@
+.class final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;
+.super Ljava/lang/Object;
+.source "WidgetNoticeNuxSamsungLink.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->enqueue()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;->call(Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;)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$ExperimentAndStaff;)Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p1, v0}, Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;->isEnabled(I)Z
+
+    move-result p1
+
+    return 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
new file mode 100644
index 0000000000..759d890bf6
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.smali
@@ -0,0 +1,79 @@
+.class final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetNoticeNuxSamsungLink.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->enqueue()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;
+
+    invoke-direct {v0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->invoke(Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;)V
+    .locals 0
+
+    sget-object p1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->Companion:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;
+
+    invoke-static {p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->access$internalEnqueue(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;)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
new file mode 100644
index 0000000000..4b6b7121cb
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1.smali
@@ -0,0 +1,113 @@
+.class final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetNoticeNuxSamsungLink.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->internalEnqueue()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Landroidx/fragment/app/FragmentActivity;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroidx/fragment/app/FragmentActivity;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1;->invoke(Landroidx/fragment/app/FragmentActivity;)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 invoke(Landroidx/fragment/app/FragmentActivity;)Z
+    .locals 3
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+    invoke-direct {v0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;-><init>()V
+
+    invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object p1
+
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+    invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "WidgetNoticeNuxSamsungLink::class.java.name"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+
+    sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+
+    const-string v0, "Mobile Samsung Link Upsell"
+
+    const-string v1, ""
+
+    invoke-virtual {p1, v0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/4 p1, 0x1
+
+    return 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
new file mode 100644
index 0000000000..534ebb290b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion.smali
@@ -0,0 +1,178 @@
+.class public final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;
+.super Ljava/lang/Object;
+.source "WidgetNoticeNuxSamsungLink.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/notice/WidgetNoticeNuxSamsungLink$Companion;-><init>()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$internalEnqueue(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;->internalEnqueue()V
+
+    return-void
+.end method
+
+.method private final internalEnqueue()V
+    .locals 16
+
+    new-instance v15, Lcom/discord/stores/StoreNotices$Notice;
+
+    sget-object v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1;
+
+    move-object v12, v0
+
+    check-cast v12, Lkotlin/jvm/functions/Function1;
+
+    const-string v1, "NUX/SamsungLink"
+
+    const-wide/16 v2, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x1
+
+    const/4 v6, 0x1
+
+    const/4 v7, 0x0
+
+    const-wide/16 v8, 0x0
+
+    const-wide/16 v10, 0x0
+
+    const/16 v13, 0xe2
+
+    const/4 v14, 0x0
+
+    move-object v0, v15
+
+    invoke-direct/range {v0 .. v14}, Lcom/discord/stores/StoreNotices$Notice;-><init>(Ljava/lang/String;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;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getNotices()Lcom/discord/stores/StoreNotices;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v15}, Lcom/discord/stores/StoreNotices;->requestToShow(Lcom/discord/stores/StoreNotices$Notice;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final disable()V
+    .locals 7
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getNotices()Lcom/discord/stores/StoreNotices;
+
+    move-result-object v1
+
+    const-string v2, "NUX/SamsungLink"
+
+    const-wide/16 v3, 0x0
+
+    const/4 v5, 0x2
+
+    const/4 v6, 0x0
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/stores/StoreNotices;->markSeen$default(Lcom/discord/stores/StoreNotices;Ljava/lang/String;JILjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public final enqueue()V
+    .locals 11
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    const-string v2, "2019-09_samsung_connect_upsell"
+
+    const/4 v3, 0x2
+
+    invoke-static {v0, v2, v1, v3, v1}, Lcom/discord/stores/StoreExperiments;->getExperimentAndStaff$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v4
+
+    const-wide/16 v5, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x3
+
+    const/4 v9, 0x0
+
+    invoke-static/range {v4 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v2
+
+    const-string v0, "StoreStream\n          .g\u2026ilter { it.isEnabled(1) }"
+
+    invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class v3, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+    sget-object v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;
+
+    move-object v8, v0
+
+    check-cast v8, Lkotlin/jvm/functions/Function1;
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 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
+
+    return-void
+.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
new file mode 100644
index 0000000000..8d48104f9a
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1.smali
@@ -0,0 +1,55 @@
+.class final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;
+.super Ljava/lang/Object;
+.source "WidgetNoticeNuxSamsungLink.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+    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/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+    sget-object v0, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
+
+    invoke-static {}, Lcom/discord/samsung/a;->et()Landroid/content/Intent;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->startActivity(Landroid/content/Intent;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->dismiss()V
+
+    return-void
+.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
new file mode 100644
index 0000000000..caa5a36480
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2.smali
@@ -0,0 +1,55 @@
+.class final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;
+.super Ljava/lang/Object;
+.source "WidgetNoticeNuxSamsungLink.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 1
+
+    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
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1, v0}, Lcom/discord/stores/StoreUserSettings;->setMobileOverlay(Z)V
+
+    iget-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;->this$0:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->dismiss()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
new file mode 100644
index 0000000000..75d9c828f6
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.smali
@@ -0,0 +1,240 @@
+.class public final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+.super Lcom/discord/app/AppDialog;
+.source "WidgetNoticeNuxSamsungLink.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+.field public static final Companion:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;
+
+.field private static final NOTICE_NAME:Ljava/lang/String; = "NUX/SamsungLink"
+
+
+# instance fields
+.field private final cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final ok$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 6
+
+    const-class v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+
+    const/4 v1, 0x2
+
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "ok"
+
+    const-string v5, "getOk()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    const-string v3, "cancel"
+
+    const-string v4, "getCancel()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v0, v3, v4}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x1
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->Companion:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
+
+    const v0, 0x7f0a02bc
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->ok$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0119
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method private final getCancel()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->$$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 getOk()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->ok$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->$$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
+
+
+# virtual methods
+.method public final getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d015e
+
+    return v0
+.end method
+
+.method public final onStart()V
+    .locals 2
+
+    invoke-super {p0}, Lcom/discord/app/AppDialog;->onStart()V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->getDialog()Landroid/app/Dialog;
+
+    move-result-object v0
+
+    const-string v1, "dialog"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Landroid/app/Dialog;->getWindow()Landroid/view/Window;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    const v1, 0x7f060138
+
+    invoke-virtual {v0, v1}, Landroid/view/Window;->setBackgroundDrawableResource(I)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public final onViewBound(Landroid/view/View;)V
+    .locals 1
+
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->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;->getNotices()Lcom/discord/stores/StoreNotices;
+
+    move-result-object p1
+
+    const-string v0, "NUX/SamsungLink"
+
+    invoke-virtual {p1, v0}, Lcom/discord/stores/StoreNotices;->markDialogSeen(Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->getOk()Landroid/widget/TextView;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;-><init>(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
+
+    check-cast v0, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->getCancel()Landroid/widget/TextView;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;-><init>(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
+
+    check-cast v0, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.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 6f34e4c3ef..724e9f7f06 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 2f27191093..da908d7c00 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticePopup$onClick$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup.smali
index ed3b3f5e90..ddcdc99989 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup.smali
@@ -215,7 +215,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0508
+    const v0, 0x7f0a051f
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -223,7 +223,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup;->titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0503
+    const v0, 0x7f0a051a
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -231,7 +231,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup;->bodyTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0506
+    const v0, 0x7f0a051d
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -239,7 +239,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup;->iconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0505
+    const v0, 0x7f0a051c
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -247,7 +247,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup;->countdownProgress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0504
+    const v0, 0x7f0a051b
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -273,11 +273,25 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup;->onClick:Lkotlin/jvm/functions/Function1;
 
-    const/4 v0, 0x1
+    sget-object v0, Lcom/discord/utilities/device/DeviceUtils;->INSTANCE:Lcom/discord/utilities/device/DeviceUtils;
 
-    const v1, 0x7f13001d
+    invoke-virtual {v0}, Lcom/discord/utilities/device/DeviceUtils;->isMeizuAndroid7Device()Z
 
-    invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/notice/WidgetNoticePopup;->setStyle(II)V
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const v0, 0x7f13001d
+
+    goto :goto_0
+
+    :cond_0
+    const v0, 0x7f13001e
+
+    :goto_0
+    const/4 v1, 0x1
+
+    invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/notice/WidgetNoticePopup;->setStyle(II)V
 
     return-void
 .end method
@@ -313,7 +327,7 @@
 
     invoke-virtual {v0}, Landroid/animation/ValueAnimator;->end()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 
@@ -485,7 +499,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0155
+    const v0, 0x7f0d015f
 
     return v0
 .end method
@@ -658,13 +672,13 @@
 
     move-result-object v1
 
-    const v2, 0x7f0700ae
+    const v2, 0x7f0700af
 
     invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getDimension(I)F
 
     move-result v1
 
-    invoke-static {v1}, Lkotlin/e/a;->D(F)I
+    invoke-static {v1}, Lkotlin/e/a;->C(F)I
 
     move-result v1
 
@@ -723,7 +737,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f07011c
+    const v2, 0x7f07011e
 
     invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -870,6 +884,10 @@
 
     check-cast v2, Landroid/widget/ImageView;
 
+    const-string v0, "it"
+
+    invoke-static {v3, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v4, 0x0
 
     const/4 v5, 0x4
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 552b1cd463..869ac8c2da 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$2;->invoke(Lcom/discord/widgets/notice/WidgetNoticePopupChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 b5cdc0f4b1..1bdaef1243 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 4094774230..b23c03bffb 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
@@ -126,7 +126,7 @@
 
     iget-object v1, v0, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1;->$context:Landroid/content/Context;
 
-    const v5, 0x7f040371
+    const v5, 0x7f040374
 
     invoke-static {v1, v5}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
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 60d32ece4d..4c8a27ac35 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$2;->invoke(Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali
index 84291b1cf4..8edc2cf5a2 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali
@@ -98,7 +98,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticePopup;-><init>()V
 
-    const v0, 0x7f0a0507
+    const v0, 0x7f0a051e
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -106,7 +106,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;->subtitleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0502
+    const v0, 0x7f0a0519
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -314,7 +314,7 @@
 
     check-cast v1, Landroid/view/View;
 
-    const v5, 0x7f040371
+    const v5, 0x7f040374
 
     invoke-static {v1, v5, v4, v3, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
@@ -356,19 +356,31 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;->getAttachmentIv()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v1
+    move-result-object v5
 
-    check-cast v1, Landroid/view/View;
+    check-cast v5, Landroid/view/View;
 
-    const v5, 0x7f0403a2
+    const v6, 0x7f0403a5
 
-    invoke-static {v1, v5, v4, v3, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    invoke-static {v5, v6, v4, v3, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
-    move-result v1
+    move-result v5
 
-    sget-object v5, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MK:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v6, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Nc:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    invoke-virtual {v0, v1, v5}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->a(ILcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
+    iget-object v7, v0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
+
+    invoke-virtual {v7, v5}, Landroid/content/res/Resources;->getDrawable(I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v5
+
+    invoke-virtual {v0, v5}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->g(Landroid/graphics/drawable/Drawable;)V
+
+    invoke-virtual {v0, v1}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->T(I)Lcom/facebook/drawee/drawable/p;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v6}, Lcom/facebook/drawee/drawable/p;->a(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
 
     goto :goto_2
 
@@ -431,12 +443,12 @@
 
     if-eqz v1, :cond_8
 
-    const v1, 0x7f040181
+    const v1, 0x7f040183
 
     goto :goto_3
 
     :cond_8
-    const v1, 0x7f0401ab
+    const v1, 0x7f0401ad
 
     :goto_3
     invoke-static {v0, v1, v4, v3, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
@@ -500,7 +512,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f040291
+    const v1, 0x7f040294
 
     invoke-static {p1, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -526,7 +538,7 @@
 
     aput-object v2, v1, v3
 
-    invoke-static {v1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v1
 
@@ -945,7 +957,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0156
+    const v0, 0x7f0d0160
 
     return v0
 .end method
@@ -963,7 +975,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -1022,7 +1034,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v3}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v8
 
@@ -1102,7 +1114,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v0
 
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 7cc7adbd23..f5a286e2c8 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -81,12 +81,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f120c6b
+    const p1, 0x7f120c9f
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120a4b
+    const p1, 0x7f120a6a
 
     :goto_0
     invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatButton;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali
index d0fef29ba6..fb560e2ec4 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali
@@ -77,7 +77,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/join/WidgetGuildJoin;-><init>()V
 
-    const v0, 0x7f0a0359
+    const v0, 0x7f0a0369
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -147,7 +147,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0157
+    const v0, 0x7f0d0161
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/roles/RolesAdapter.smali b/com.discord/smali/com/discord/widgets/roles/RolesAdapter.smali
index d4723e2695..09bd7f45c1 100644
--- a/com.discord/smali/com/discord/widgets/roles/RolesAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/roles/RolesAdapter.smali
@@ -61,7 +61,7 @@
 
     iput p1, p0, Lcom/discord/widgets/roles/RolesAdapter;->roleDefaultColor:I
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -173,7 +173,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f0d009c
+    const v0, 0x7f0d00a4
 
     const/4 v1, 0x0
 
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 11212f7d5d..928995e64d 100644
--- a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
+++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
@@ -127,7 +127,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
 
     move-result-object p1
 
@@ -238,7 +238,7 @@
 
     aput-object p1, v0, v1
 
-    const p1, 0x7f120fa0
+    const p1, 0x7f120fda
 
     invoke-virtual {p0, p1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -277,7 +277,7 @@
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120fa0
+    const p1, 0x7f120fda
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -290,7 +290,7 @@
     return-object p0
 
     :cond_1
-    const p1, 0x7f120f82
+    const p1, 0x7f120fbc
 
     new-array v2, v2, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/search/WidgetSearch.smali b/com.discord/smali/com/discord/widgets/search/WidgetSearch.smali
index eb80deece4..4b8de6c927 100644
--- a/com.discord/smali/com/discord/widgets/search/WidgetSearch.smali
+++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch.smali
@@ -387,7 +387,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d015f
+    const v0, 0x7f0d0169
 
     return v0
 .end method
@@ -519,7 +519,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a05ab
+    const v0, 0x7f0a05c5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -529,7 +529,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/search/WidgetSearch;->searchInput:Landroid/widget/EditText;
 
-    const v0, 0x7f0a05af
+    const v0, 0x7f0a05c9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -537,7 +537,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/search/WidgetSearch;->sendQueryFab:Landroid/view/View;
 
-    const v0, 0x7f0a05a1
+    const v0, 0x7f0a05bb
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -547,7 +547,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/search/WidgetSearch;->backButton:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a05a5
+    const v0, 0x7f0a05bf
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -557,7 +557,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/search/WidgetSearch;->searchClear:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a0823
+    const v0, 0x7f0a0861
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -565,7 +565,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/search/WidgetSearch;->searchSuggestions:Landroid/view/View;
 
-    const v0, 0x7f0a0822
+    const v0, 0x7f0a0860
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 5adc3929f7..b3ba142101 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
@@ -619,7 +619,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v0
 
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 4680f38ab1..e71f6d2113 100644
--- a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults.smali
+++ b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults.smali
@@ -58,7 +58,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0160
+    const v0, 0x7f0d016a
 
     return v0
 .end method
@@ -98,7 +98,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a05ae
+    const v0, 0x7f0a05c8
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 cfd006e14c..d7b61204c9 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
@@ -252,7 +252,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v0
 
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 01d978311b..a78058346c 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.smali
@@ -74,7 +74,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0163
+    const v0, 0x7f0d016d
 
     return v0
 .end method
@@ -84,7 +84,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a05bb
+    const v0, 0x7f0a05d5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 4ea2aea783..554eae6451 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,13 +37,13 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0167
+    const v0, 0x7f0d0171
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0727
+    const v0, 0x7f0a0750
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -53,7 +53,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0729
+    const v0, 0x7f0a0752
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -65,7 +65,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0728
+    const v0, 0x7f0a0751
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -77,7 +77,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0726
+    const v0, 0x7f0a074f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -117,27 +117,27 @@
 
     if-eq p1, v0, :cond_0
 
-    const p1, 0x7f120f0d
+    const p1, 0x7f120f44
 
     return p1
 
     :cond_0
-    const p1, 0x7f120f78
+    const p1, 0x7f120fb2
 
     return p1
 
     :cond_1
-    const p1, 0x7f120f71
+    const p1, 0x7f120fab
 
     return p1
 
     :cond_2
-    const p1, 0x7f120f7a
+    const p1, 0x7f120fb4
 
     return p1
 
     :cond_3
-    const p1, 0x7f120f70
+    const p1, 0x7f120faa
 
     return p1
 .end method
@@ -169,27 +169,27 @@
 
     if-eq p1, v0, :cond_0
 
-    const p1, 0x7f120f0d
+    const p1, 0x7f120f44
 
     return p1
 
     :cond_0
-    const p1, 0x7f120f8b
+    const p1, 0x7f120fc5
 
     return p1
 
     :cond_1
-    const p1, 0x7f120f8a
+    const p1, 0x7f120fc4
 
     return p1
 
     :cond_2
-    const p1, 0x7f120f8d
+    const p1, 0x7f120fc7
 
     return p1
 
     :cond_3
-    const p1, 0x7f120f89
+    const p1, 0x7f120fc3
 
     return p1
 .end method
@@ -226,22 +226,22 @@
     return p1
 
     :cond_0
-    const p1, 0x7f040399
+    const p1, 0x7f04039c
 
     return p1
 
     :cond_1
-    const p1, 0x7f040398
+    const p1, 0x7f04039b
 
     return p1
 
     :cond_2
-    const p1, 0x7f04039f
+    const p1, 0x7f0403a2
 
     return p1
 
     :cond_3
-    const p1, 0x7f0403a0
+    const p1, 0x7f0403a3
 
     return p1
 .end method
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 64af8ecf38..3c4f482592 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
@@ -37,13 +37,13 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0165
+    const v0, 0x7f0d016f
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05b2
+    const v0, 0x7f0a05cc
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -53,7 +53,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05b7
+    const v0, 0x7f0a05d1
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -65,7 +65,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05b8
+    const v0, 0x7f0a05d2
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -121,32 +121,32 @@
 
     if-eq p0, v0, :cond_0
 
-    const p0, 0x7f04039e
-
-    return p0
-
-    :cond_0
-    const p0, 0x7f04039b
-
-    return p0
-
-    :cond_1
     const p0, 0x7f0403a1
 
     return p0
 
+    :cond_0
+    const p0, 0x7f04039e
+
+    return p0
+
+    :cond_1
+    const p0, 0x7f0403a4
+
+    return p0
+
     :cond_2
-    const p0, 0x7f04039d
+    const p0, 0x7f0403a0
 
     return p0
 
     :cond_3
-    const p0, 0x7f0403a2
+    const p0, 0x7f0403a5
 
     return p0
 
     :cond_4
-    const p0, 0x7f040398
+    const p0, 0x7f04039b
 
     return p0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali
index 1f8d0ff9c1..97a5393db7 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,13 +31,13 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0161
+    const v0, 0x7f0d016b
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a072a
+    const v0, 0x7f0a0753
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -80,32 +80,32 @@
     throw v0
 
     :pswitch_0
-    const p1, 0x7f120f94
+    const p1, 0x7f120fce
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f120f95
+    const p1, 0x7f120fcf
 
     return p1
 
     :pswitch_2
-    const p1, 0x7f120f99
+    const p1, 0x7f120fd3
 
     return p1
 
     :pswitch_3
-    const p1, 0x7f120f98
+    const p1, 0x7f120fd2
 
     return p1
 
     :pswitch_4
-    const p1, 0x7f120f9c
+    const p1, 0x7f120fd6
 
     return p1
 
     :pswitch_5
-    const p1, 0x7f120f9d
+    const p1, 0x7f120fd7
 
     return p1
 
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 72efe9e06f..8d54e61010 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,13 +31,13 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0162
+    const v0, 0x7f0d016c
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a072b
+    const v0, 0x7f0a0754
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 7e3d9207fa..03f9286262 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,13 +33,13 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0164
+    const v0, 0x7f0d016e
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05b1
+    const v0, 0x7f0a05cb
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -49,7 +49,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05b6
+    const v0, 0x7f0a05d0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 1baa8d8cdc..cc1b587d46 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,13 +33,13 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0166
+    const v0, 0x7f0d0170
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05b3
+    const v0, 0x7f0a05cd
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -49,7 +49,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05ba
+    const v0, 0x7f0a05d4
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 1b2483d0d0..fefbab6e35 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,13 +31,13 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0168
+    const v0, 0x7f0d0172
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05b4
+    const v0, 0x7f0a05ce
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -127,7 +127,7 @@
 
     invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v0, p2, Lcom/discord/views/UserListItemView;->Di:Landroid/widget/TextView;
+    iget-object v0, p2, Lcom/discord/views/UserListItemView;->Ds:Landroid/widget/TextView;
 
     const-string v1, ""
 
@@ -142,7 +142,7 @@
 
     invoke-virtual {v3, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p2, Lcom/discord/views/UserListItemView;->Di:Landroid/widget/TextView;
+    iget-object v1, p2, Lcom/discord/views/UserListItemView;->Ds:Landroid/widget/TextView;
 
     check-cast v0, Ljava/lang/CharSequence;
 
@@ -151,7 +151,7 @@
     :goto_2
     iget-object v1, p2, Lcom/discord/views/UserListItemView;->userAvatar:Landroid/widget/ImageView;
 
-    const v3, 0x7f07005b
+    const v3, 0x7f07005a
 
     const/4 v4, 0x0
 
@@ -163,7 +163,7 @@
 
     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
 
-    iget-object p2, p2, Lcom/discord/views/UserListItemView;->Dk:Landroid/view/View;
+    iget-object p2, p2, Lcom/discord/views/UserListItemView;->Du:Landroid/view/View;
 
     const/16 v0, 0x8
 
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 2a10620feb..d3efd905a0 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
@@ -49,7 +49,7 @@
 
     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, 0x7f0a0120
+    const p2, 0x7f0a0121
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -63,7 +63,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder;->nameTv:Landroid/widget/TextView;
 
-    const p2, 0x7f0a0121
+    const p2, 0x7f0a0122
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -115,7 +115,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f12062d
+    const p1, 0x7f12063b
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali
index f7c1f3eabe..41c8f29bb7 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
@@ -51,7 +51,7 @@
 
     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, 0x7f0a0141
+    const p2, 0x7f0a0142
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -65,7 +65,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder;->nameTv:Landroid/widget/TextView;
 
-    const p2, 0x7f0a0140
+    const p2, 0x7f0a0141
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -79,7 +79,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder;->categoryTv:Landroid/widget/TextView;
 
-    const p2, 0x7f0a0142
+    const p2, 0x7f0a0143
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -153,7 +153,7 @@
 
     if-eqz v0, :cond_1
 
-    const p1, 0x7f12062d
+    const p1, 0x7f12063b
 
     goto :goto_1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali
index edf5c4e123..717c5a36c8 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali
@@ -94,7 +94,7 @@
 
     if-ne p1, v0, :cond_0
 
-    const p1, 0x7f1205e2
+    const p1, 0x7f1205ee
 
     return p1
 
@@ -103,7 +103,7 @@
 
     if-ne p1, v0, :cond_1
 
-    const p1, 0x7f120637
+    const p1, 0x7f120645
 
     return p1
 
@@ -112,7 +112,7 @@
 
     if-ne p1, v0, :cond_2
 
-    const p1, 0x7f120631
+    const p1, 0x7f12063f
 
     return p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali
index f9c5b54332..dd0a0fb6ae 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali
@@ -69,7 +69,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter;->onClick:Lkotlin/jvm/functions/Function2;
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -217,7 +217,7 @@
 
     new-instance p2, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder;
 
-    const v3, 0x7f0d007a
+    const v3, 0x7f0d0081
 
     invoke-virtual {v0, v3, p1, v2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
@@ -271,7 +271,7 @@
     :cond_1
     new-instance p2, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder;
 
-    const v3, 0x7f0d007b
+    const v3, 0x7f0d0082
 
     invoke-virtual {v0, v3, p1, v2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
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 e29a4f9e9a..6d3b039eea 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem.smali
@@ -394,7 +394,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem;->name:Ljava/lang/String;
 
@@ -414,20 +414,20 @@
 
     iget-wide v1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem;->id:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget v1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem;->pos:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
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 cf8a46d6db..c940bd2be6 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
@@ -45,13 +45,13 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0062
+    const v0, 0x7f0d0064
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a068e
+    const v0, 0x7f0a06a8
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a068d
+    const v0, 0x7f0a06a7
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -172,7 +172,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1211a4
+    const v0, 0x7f1211e8
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 ad167d171e..ae41161d15 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem.smali
@@ -320,7 +320,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 5
 
     iget-object v0, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;->channel:Lcom/discord/models/domain/ModelChannel;
 
@@ -353,13 +353,9 @@
 
     iget-wide v3, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;->parentId:J
 
-    const/16 v1, 0x20
+    invoke-static {v3, v4}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v5, v3, v1
-
-    xor-long/2addr v3, v5
-
-    long-to-int v1, v3
+    move-result v1
 
     add-int/2addr v0, v1
 
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 48382c515b..3593f84e3d 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem.smali
@@ -49,13 +49,13 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0063
+    const v0, 0x7f0d0065
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0690
+    const v0, 0x7f0a06aa
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -71,7 +71,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0691
+    const v0, 0x7f0a06ab
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -87,7 +87,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0692
+    const v0, 0x7f0a06ac
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -101,7 +101,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a068f
+    const v0, 0x7f0a06a9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -205,12 +205,12 @@
 
     if-eqz v1, :cond_1
 
-    const v1, 0x7f080210
+    const v1, 0x7f08021f
 
     goto :goto_0
 
     :cond_1
-    const v1, 0x7f080218
+    const v1, 0x7f080227
 
     :goto_0
     invoke-virtual {p2, v1}, Landroid/widget/ImageView;->setImageResource(I)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 870d7e7339..99a1daa42c 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition.smali
@@ -157,6 +157,10 @@
 
     iget v0, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition;->position:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget-object v1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition;->parentId:Ljava/lang/Long;
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 ea1943638d..febc2348b1 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
@@ -73,7 +73,7 @@
 
     if-eq v0, v1, :cond_0
 
-    sget-object v2, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
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 5da9d0e74e..a60338e815 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/SettingsChannelListAdapter$setPositionUpdateListener$1;->invoke(Ljava/util/Map;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 1d3634c215..72b6fbd698 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter.smali
@@ -279,7 +279,7 @@
 
     if-gez v4, :cond_0
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_0
     check-cast v6, Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;
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 0d6480dc55..fe971f1f65 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
@@ -91,7 +91,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 b35f6bf845..076495f139 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerDeleteDialog$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog.smali
index 187c25e414..7e4f90eacc 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog.smali
@@ -194,7 +194,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a05e0
+    const v0, 0x7f0a05fa
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -202,7 +202,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05e3
+    const v0, 0x7f0a05fd
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -210,7 +210,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05de
+    const v0, 0x7f0a05f8
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -218,7 +218,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05df
+    const v0, 0x7f0a05f9
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -226,7 +226,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;->save$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05e2
+    const v0, 0x7f0a05fc
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -234,7 +234,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;->mfaWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05e1
+    const v0, 0x7f0a05fb
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -533,7 +533,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d016b
+    const v0, 0x7f0d0175
 
     return v0
 .end method
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 e01d34fb4d..710a5afd08 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
@@ -181,13 +181,13 @@
 
     move-result p1
 
-    invoke-static {p1}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {p1}, Lkotlin/a/ad;->dj(I)I
 
     move-result p1
 
     const/16 v1, 0x10
 
-    invoke-static {p1, v1}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {p1, v1}, Lkotlin/ranges/c;->Y(II)I
 
     move-result p1
 
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 f2ffcece62..6b0eebeb58 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion.smali
@@ -125,6 +125,10 @@
 
     move-result-object p1
 
+    const-string p2, "Intent()\n          .putE\u2026.EXTRA_GUILD_ID, guildId)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-class p2, Lcom/discord/widgets/servers/WidgetServerNotifications;
 
     invoke-static {p3, p2, p1}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
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 aab7ffecac..3ffa3dd31f 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
@@ -80,7 +80,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 f33fef0dfc..727a9a0694 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
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBound$1;->invoke(Landroid/view/View;Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 d4aa386935..152310aa2d 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/servers/WidgetServerNotifications$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 9838e62598..0b3c954bab 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$2;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
index d4ea597616..91e857fcc8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
@@ -268,7 +268,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a05c8
+    const v0, 0x7f0a05e2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -276,7 +276,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->muteServerCheck$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05c7
+    const v0, 0x7f0a05e1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -284,7 +284,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->frequencyWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05c4
+    const v0, 0x7f0a05de
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -292,7 +292,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->frequencyRadioAll$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05c5
+    const v0, 0x7f0a05df
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -300,7 +300,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->frequencyRadioMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05c6
+    const v0, 0x7f0a05e0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -308,7 +308,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->frequencyRadioNothing$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05c3
+    const v0, 0x7f0a05dd
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -316,7 +316,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->notificationsSwitchEveryone$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05c9
+    const v0, 0x7f0a05e3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -324,7 +324,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->notificationsSwitchPush$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a035f
+    const v0, 0x7f0a036f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -332,7 +332,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->addOverride$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0361
+    const v0, 0x7f0a0371
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -390,7 +390,7 @@
 
     const-string v0, "overrideAdapter"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -419,7 +419,7 @@
 
     const-string v1, "notificationSettingsRadioManager"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     move-object v1, p1
@@ -468,7 +468,7 @@
 
     invoke-static {p0, v2, v1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f120c30
+    const v0, 0x7f120c64
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerNotifications;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -522,7 +522,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f12062b
+    const v3, 0x7f120639
 
     new-array v6, v4, [Ljava/lang/Object;
 
@@ -596,7 +596,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f12065e
+    const v3, 0x7f12066c
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getString(I)Ljava/lang/String;
 
@@ -664,7 +664,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120637
+    const v1, 0x7f120645
 
     invoke-virtual {p0, v1}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getString(I)Ljava/lang/String;
 
@@ -720,7 +720,7 @@
 
     check-cast v1, Landroidx/fragment/app/Fragment;
 
-    const v2, 0x7f06011b
+    const v2, 0x7f06011d
 
     invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
 
@@ -730,7 +730,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f080245
+    const v3, 0x7f080255
 
     invoke-static {v2, v3}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -740,7 +740,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f070157
+    const v4, 0x7f070159
 
     invoke-virtual {v3, v4}, Landroid/content/res/Resources;->getDimension(I)F
 
@@ -948,7 +948,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d016d
+    const v0, 0x7f0d0177
 
     return v0
 .end method
@@ -992,7 +992,7 @@
 
     aput-object v1, v0, v3
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
@@ -1026,7 +1026,7 @@
 
     const-string v1, "overrideAdapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast v0, Landroidx/recyclerview/widget/RecyclerView$Adapter;
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 488b57c73f..d918bbbc1a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion.smali
@@ -106,7 +106,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -132,6 +132,10 @@
 
     move-result-object p2
 
+    const-string p3, "Intent()\n          .putE\u2026.EXTRA_GUILD_ID, guildId)"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-class p3, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;
 
     invoke-static {p1, p3, p2}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
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 1d58540564..12cea00253 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$1;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 fff751cfc9..5326e17e0e 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 d3f597601a..3d1482ac71 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBoundOrOnResume$1;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
index 926aed4b0b..baf70dbcdc 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
@@ -107,7 +107,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a05ab
+    const v0, 0x7f0a05c5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -115,7 +115,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->searchInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0360
+    const v0, 0x7f0a0370
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -143,7 +143,7 @@
 
     const-string v0, "channelsAdapter"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -210,7 +210,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d016c
+    const v0, 0x7f0d0176
 
     return v0
 .end method
@@ -232,11 +232,11 @@
 
     invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f120c2b
+    const p1, 0x7f120c5f
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarTitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120fb7
+    const p1, 0x7f120ff1
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarSubtitle(I)Lkotlin/Unit;
 
@@ -244,7 +244,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f120f6b
+    const v1, 0x7f120fa5
 
     invoke-virtual {p1, v1}, Landroid/widget/EditText;->setHint(I)V
 
@@ -292,7 +292,7 @@
 
     const-string v1, "channelsAdapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v1, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2;
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 8e354ea54f..c11194a098 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
@@ -62,7 +62,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 dbf3a76571..1e5e464f18 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
@@ -92,7 +92,7 @@
 
     invoke-direct {p0, p2, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0618
+    const p1, 0x7f0a0632
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -174,9 +174,9 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f080225
+    const p1, 0x7f080234
 
-    const v3, 0x7f080225
+    const v3, 0x7f080234
 
     goto :goto_0
 
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 751e879fb8..488f2ac6e9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter.smali
@@ -115,7 +115,7 @@
 
     new-instance p1, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion;
 
-    const p2, 0x7f0d018f
+    const p2, 0x7f0d0199
 
     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
 
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 bdd3c32ed0..10a6d140fd 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$2;->invoke(Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 b53a88d2f3..4582182e77 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$3;->invoke(Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 60ba319259..a0a8732484 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog.smali
@@ -116,7 +116,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0619
+    const v0, 0x7f0a0633
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -124,7 +124,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;->list$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0118
+    const v0, 0x7f0a0119
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -167,7 +167,7 @@
 
     const-string v1, "adapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {p1}, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model;->getVoiceRegions()Ljava/util/List;
@@ -236,7 +236,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d018e
+    const v0, 0x7f0d0198
 
     return v0
 .end method
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 2a5b64688d..534b2012c3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Companion.smali
@@ -64,12 +64,6 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p1}, Lcom/discord/utilities/permissions/ManageGuildContext;->getCanManageMembers()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
     invoke-virtual {p1}, Lcom/discord/utilities/permissions/ManageGuildContext;->getCanViewAuditLogs()Z
 
     move-result v0
@@ -78,6 +72,12 @@
 
     invoke-virtual {p1}, Lcom/discord/utilities/permissions/ManageGuildContext;->getCanManageEmojis()Z
 
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    invoke-virtual {p1}, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwnerWithRequiredMFALevel()Z
+
     move-result p1
 
     if-eqz p1, :cond_0
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 fc106f1450..e753be1c72 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
@@ -112,7 +112,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object 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 fa899580c6..1d590e2fb9 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
@@ -64,7 +64,7 @@
 
     move-result p1
 
-    const p2, 0x7f0a0461
+    const p2, 0x7f0a0472
 
     if-eq p1, p2, :cond_0
 
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 952be8110b..1f652fe6cf 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettings$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/servers/WidgetServerSettings$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
index 383754d687..2f3ccb70ba 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
@@ -484,7 +484,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a063e
+    const v0, 0x7f0a0658
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -492,7 +492,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->serverIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a063f
+    const v0, 0x7f0a0659
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -500,7 +500,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->iconText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0640
+    const v0, 0x7f0a065a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -508,7 +508,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->serverName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0636
+    const v0, 0x7f0a0650
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -516,7 +516,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->generalSettingsSection$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0602
+    const v0, 0x7f0a061c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -524,7 +524,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->overviewOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0601
+    const v0, 0x7f0a061b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -532,7 +532,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->moderationOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05fe
+    const v0, 0x7f0a0618
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -540,7 +540,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->auditLogOptions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05ff
+    const v0, 0x7f0a0619
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -548,7 +548,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->channelsOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0600
+    const v0, 0x7f0a061a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -556,7 +556,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->integrationsOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0603
+    const v0, 0x7f0a061d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -564,7 +564,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->securityOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0604
+    const v0, 0x7f0a061e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -572,7 +572,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->vanityUrlOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0637
+    const v0, 0x7f0a0651
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -580,7 +580,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->userManagementSection$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0638
+    const v0, 0x7f0a0652
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -588,7 +588,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->userManagementDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05f2
+    const v0, 0x7f0a060c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -596,7 +596,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->membersOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0634
+    const v0, 0x7f0a064e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -604,7 +604,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->rolesOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05ed
+    const v0, 0x7f0a0607
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -612,7 +612,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->instantInvitesOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05d1
+    const v0, 0x7f0a05eb
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -620,7 +620,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->bansOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05e9
+    const v0, 0x7f0a0603
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -702,7 +702,7 @@
 
     aput-object v1, v0, v7
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
@@ -732,7 +732,7 @@
 
     aput-object v6, v1, v5
 
-    invoke-static {v1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v1
 
@@ -960,7 +960,7 @@
 
     move-result-object v4
 
-    const v6, 0x7f070057
+    const v6, 0x7f070056
 
     const/4 v7, 0x0
 
@@ -1008,7 +1008,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwner()Z
+    invoke-virtual {p1}, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwnerWithRequiredMFALevel()Z
 
     move-result p1
 
@@ -1171,7 +1171,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwner()Z
+    invoke-virtual {v0}, Lcom/discord/utilities/permissions/ManageGuildContext;->getCanManageServer()Z
 
     move-result v2
 
@@ -1257,16 +1257,6 @@
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/discord/utilities/permissions/ManageGuildContext;->getCanManageMembers()Z
-
-    move-result v2
-
-    invoke-static {v1, v2, v5, v4, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettings;->getMembersOption()Landroid/view/View;
-
-    move-result-object v1
-
     new-instance v2, Lcom/discord/widgets/servers/WidgetServerSettings$configureUI$8;
 
     invoke-direct {v2, p1}, Lcom/discord/widgets/servers/WidgetServerSettings$configureUI$8;-><init>(Lcom/discord/widgets/servers/WidgetServerSettings$Model;)V
@@ -1746,7 +1736,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d016f
+    const v0, 0x7f0d0179
 
     return v0
 .end method
@@ -1768,7 +1758,7 @@
 
     invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f120fe4
+    const p1, 0x7f121020
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettings;->setActionBarTitle(I)Lkotlin/Unit;
 
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 22a3375886..e70e7eb8bb 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
@@ -136,11 +136,11 @@
 
     check-cast p2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const p1, 0x7f0d0175
+    const p1, 0x7f0d017f
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a00bb
+    const p1, 0x7f0a00bc
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -148,7 +148,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem;->containerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a00bd
+    const p1, 0x7f0a00be
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -156,7 +156,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem;->userName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a00bc
+    const p1, 0x7f0a00bd
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -280,7 +280,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f07005b
+    const v3, 0x7f07005a
 
     const/4 v4, 0x0
 
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 aaca99314e..34c7747999 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Companion.smali
@@ -60,6 +60,10 @@
 
     move-result-object p2
 
+    const-string p3, "Intent().putExtra(INTENT_EXTRA_GUILD_ID, guildId)"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-class p3, Lcom/discord/widgets/servers/WidgetServerSettingsBans;
 
     invoke-static {p1, p3, p2}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
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 23a582ec79..686dce5706 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
@@ -132,7 +132,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -200,7 +200,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 c15d1d04e0..1052d91789 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model.smali
@@ -398,10 +398,14 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 5
 
     iget v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;->totalBannedUsers:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;->filteredBannedUsers:Ljava/util/List;
@@ -426,13 +430,9 @@
 
     iget-wide v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;->guildId:J
 
-    const/16 v1, 0x20
+    invoke-static {v3, v4}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v5, v3, v1
-
-    xor-long/2addr v3, v5
-
-    long-to-int v1, v3
+    move-result v1
 
     add-int/2addr v0, v1
 
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 8de8d0f167..43990ff78f 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$configureUI$1;->invoke(Lcom/discord/models/domain/ModelUser;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 25a1089a77..4085a5f752 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$onResume$1;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 ee8496192b..f2df11935a 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$onResume$2;->invoke(Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 1584bc0c47..ce0b647482 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 52ffe0d957..bc8cd0b51e 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
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 1fd738d729..047b7cbe04 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
@@ -147,7 +147,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a05d3
+    const v0, 0x7f0a05ed
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -155,7 +155,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->searchBox$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05d4
+    const v0, 0x7f0a05ee
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -163,7 +163,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05d2
+    const v0, 0x7f0a05ec
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -209,7 +209,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120296
+    const v0, 0x7f12029a
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -447,7 +447,7 @@
 
     aput-object v4, v3, v5
 
-    const v4, 0x7f1211a0
+    const v4, 0x7f1211e4
 
     invoke-virtual {v1, v4, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -473,7 +473,7 @@
 
     aput-object v3, v2, v5
 
-    const v3, 0x7f12119f
+    const v3, 0x7f1211e3
 
     invoke-virtual {v1, v3, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -489,7 +489,7 @@
 
     const/4 v1, 0x0
 
-    const v2, 0x7f120368
+    const v2, 0x7f12036d
 
     const/4 v3, 0x2
 
@@ -503,7 +503,7 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const p1, 0x7f12119e
+    const p1, 0x7f1211e2
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -527,7 +527,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0176
+    const v0, 0x7f0d0180
 
     return v0
 .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 e833e70558..d16049a54d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels$Model.smali
@@ -730,7 +730,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v4
 
@@ -762,7 +762,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
@@ -888,7 +888,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JV()Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
index 29a0b86051..02764cfd7c 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, 0x7f1203b5
+    const v0, 0x7f1203ba
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f121036
+    const v0, 0x7f121073
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;->setActionBarTitle(I)Lkotlin/Unit;
@@ -259,7 +259,7 @@
 .method static synthetic lambda$configureToolbar$4(ZLandroid/view/Menu;)V
     .locals 2
 
-    const v0, 0x7f0a0466
+    const v0, 0x7f0a0477
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -269,7 +269,7 @@
 
     invoke-interface {v0, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    const v0, 0x7f0a0467
+    const v0, 0x7f0a0478
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -305,7 +305,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -422,7 +422,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0177
+    const v0, 0x7f0d0181
 
     return v0
 .end method
@@ -472,7 +472,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0466
+    .packed-switch 0x7f0a0477
         :pswitch_1
         :pswitch_0
     .end packed-switch
@@ -525,7 +525,7 @@
 .method public synthetic lambda$reorderChannels$5$WidgetServerSettingsChannels(Ljava/lang/Void;)V
     .locals 0
 
-    const p1, 0x7f1203a7
+    const p1, 0x7f1203ac
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -545,7 +545,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a05d9
+    const v0, 0x7f0a05f3
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -555,7 +555,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;->textChannelsRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a05d5
+    const v0, 0x7f0a05ef
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -565,7 +565,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;->createFab:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.smali
index 0bcacf870b..0605af193d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.smali
@@ -97,7 +97,7 @@
 
     const-string p1, "fab menu"
 
-    const p2, 0x7f0a0824
+    const p2, 0x7f0a0862
 
     invoke-virtual {p0, p2, v0, p1}, Landroidx/fragment/app/FragmentTransaction;->add(ILandroidx/fragment/app/Fragment;Ljava/lang/String;)Landroidx/fragment/app/FragmentTransaction;
 
@@ -130,7 +130,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    const v1, 0x7f0a02ca
+    const v1, 0x7f0a02d3
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -146,7 +146,7 @@
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    const v1, 0x7f0a02cc
+    const v1, 0x7f0a02d5
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -162,7 +162,7 @@
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    const v1, 0x7f0a02cb
+    const v1, 0x7f0a02d4
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -178,7 +178,7 @@
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    const v1, 0x7f0a02cd
+    const v1, 0x7f0a02d6
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -297,7 +297,7 @@
 .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
     .locals 2
 
-    const p3, 0x7f0d0179
+    const p3, 0x7f0d0183
 
     const/4 v0, 0x0
 
@@ -332,7 +332,7 @@
 
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const p3, 0x7f0a02cf
+    const p3, 0x7f0a02d8
 
     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 d3d04c342b..92938c4eca 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
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion$show$$inlined$apply$lambda$1;->invoke(I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 9240b5826e..110b9dd4b7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.smali
@@ -131,7 +131,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a05d6
+    const v0, 0x7f0a05f0
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -139,7 +139,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;->categories$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05d8
+    const v0, 0x7f0a05f2
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -147,7 +147,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;->voiceChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05d7
+    const v0, 0x7f0a05f1
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -284,7 +284,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0178
+    const v0, 0x7f0d0182
 
     return v0
 .end method
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 e2a75efe51..ba9a68fdf0 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
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali
index 84d20d4560..0afff6bd54 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 private static final INTENT_EXTRA_INTEGRATION_ID:Ljava/lang/String; = "INTENT_EXTRA_INTEGRATION_ID"
 
-.field private static final STATE_KEY_ENABLE_TWITCH_EMOTES:I = 0x7f0a0285
+.field private static final STATE_KEY_ENABLE_TWITCH_EMOTES:I = 0x7f0a028e
 
-.field private static final STATE_KEY_EXPIRE_BEHAVIOR:I = 0x7f0a0288
+.field private static final STATE_KEY_EXPIRE_BEHAVIOR:I = 0x7f0a0291
 
-.field private static final STATE_KEY_GRACE_PERIOD:I = 0x7f0a0289
+.field private static final STATE_KEY_GRACE_PERIOD:I = 0x7f0a0292
 
 .field private static final gracePeriodDays:[I
 
@@ -126,9 +126,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a0285
-        0x7f0a0288
-        0x7f0a0289
+        0x7f0a028e
+        0x7f0a0291
+        0x7f0a0292
     .end array-data
 .end method
 
@@ -144,7 +144,7 @@
     goto/16 :goto_4
 
     :cond_0
-    const v0, 0x7f1209ab
+    const v0, 0x7f1209cc
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -204,12 +204,12 @@
 
     if-eqz v0, :cond_3
 
-    const v2, 0x7f08006b
+    const v2, 0x7f08006c
 
     goto :goto_0
 
     :cond_3
-    const v2, 0x7f08006c
+    const v2, 0x7f08006d
 
     :goto_0
     invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -328,7 +328,7 @@
 
     iget-object v2, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;->role:Lcom/discord/models/domain/ModelGuildRole;
 
-    const v3, 0x7f0600c1
+    const v3, 0x7f0600c4
 
     invoke-static {p0, v3}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
 
@@ -347,7 +347,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    const v2, 0x7f0a0288
+    const v2, 0x7f0a0291
 
     iget-object v3, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;->integration:Lcom/discord/models/domain/ModelGuildIntegration;
 
@@ -394,7 +394,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    const v3, 0x7f0a0289
+    const v3, 0x7f0a0292
 
     invoke-direct {p0, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->getGracePeriodPosition(I)I
 
@@ -567,12 +567,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f10008a
+    const p1, 0x7f100089
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f100089
+    const p1, 0x7f100088
 
     :goto_0
     iget-object p2, p2, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;->integration:Lcom/discord/models/domain/ModelGuildIntegration;
@@ -668,7 +668,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f100084
+    const v4, 0x7f100083
 
     const/4 v5, 0x1
 
@@ -768,7 +768,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d017b
+    const v0, 0x7f0d0185
 
     return v0
 .end method
@@ -796,7 +796,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -854,7 +854,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->expiryBehaviorRadioManager:Lcom/discord/views/RadioManager;
 
-    invoke-virtual {p2}, Lcom/discord/views/RadioManager;->eI()I
+    invoke-virtual {p2}, Lcom/discord/views/RadioManager;->eN()I
 
     move-result p2
 
@@ -862,7 +862,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->gracePeriodRadioManager:Lcom/discord/views/RadioManager;
 
-    invoke-virtual {v1}, Lcom/discord/views/RadioManager;->eI()I
+    invoke-virtual {v1}, Lcom/discord/views/RadioManager;->eN()I
 
     move-result v1
 
@@ -898,7 +898,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -956,7 +956,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a0285
+    const v1, 0x7f0a028e
 
     invoke-virtual {p1, v1, v0}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
 
@@ -1072,7 +1072,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0291
+    const v0, 0x7f0a029a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1082,7 +1082,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->integrationName:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0293
+    const v0, 0x7f0a029c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1092,7 +1092,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->integrationOwnerName:Landroid/widget/TextView;
 
-    const v0, 0x7f0a028f
+    const v0, 0x7f0a0298
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1102,7 +1102,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->integrationIcon:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a0297
+    const v0, 0x7f0a02a0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1110,7 +1110,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->syncContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0296
+    const v0, 0x7f0a029f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1120,7 +1120,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->subscriberCount:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0299
+    const v0, 0x7f0a02a2
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1128,7 +1128,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->syncedRoleContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0298
+    const v0, 0x7f0a02a1
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1138,7 +1138,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->syncedRole:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0290
+    const v0, 0x7f0a0299
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1148,7 +1148,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->lastSyncTime:Landroid/widget/TextView;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1158,7 +1158,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->dimmer:Lcom/discord/utilities/dimmer/DimmerView;
 
-    const v0, 0x7f0a0294
+    const v0, 0x7f0a029d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1172,7 +1172,7 @@
 
     new-array v1, v0, [Lcom/discord/views/CheckedSetting;
 
-    const v2, 0x7f0a0287
+    const v2, 0x7f0a0290
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1184,7 +1184,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f0a0286
+    const v2, 0x7f0a028f
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1206,7 +1206,7 @@
 
     new-array v1, v1, [Lcom/discord/views/CheckedSetting;
 
-    const v2, 0x7f0a028b
+    const v2, 0x7f0a0294
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1216,7 +1216,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f0a028d
+    const v2, 0x7f0a0296
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1226,7 +1226,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a028e
+    const v2, 0x7f0a0297
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1236,7 +1236,7 @@
 
     aput-object v2, v1, v0
 
-    const v0, 0x7f0a028a
+    const v0, 0x7f0a0293
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1248,7 +1248,7 @@
 
     aput-object v0, v1, v2
 
-    const v0, 0x7f0a028c
+    const v0, 0x7f0a0295
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1266,7 +1266,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->gracePeriodRadios:Ljava/util/List;
 
-    const v0, 0x7f0a0284
+    const v0, 0x7f0a028d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1274,7 +1274,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->customEmotesContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0285
+    const v0, 0x7f0a028e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1296,7 +1296,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->expiryBehaviorRadios:Ljava/util/List;
 
-    const v0, 0x7f0a0288
+    const v0, 0x7f0a0291
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->setupRadioManager(Ljava/util/List;I)Lcom/discord/views/RadioManager;
 
@@ -1306,7 +1306,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->gracePeriodRadios:Ljava/util/List;
 
-    const v0, 0x7f0a0289
+    const v0, 0x7f0a0292
 
     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 d6d17505e4..90f05ccf67 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$Model.smali
@@ -425,7 +425,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v5
 
@@ -443,7 +443,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
index bff3187d94..1573941fe0 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
@@ -55,7 +55,7 @@
 
     const/4 v2, 0x0
 
-    const v3, 0x7f0a029d
+    const v3, 0x7f0a02a6
 
     aput v3, v1, v2
 
@@ -99,7 +99,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -152,7 +152,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -242,7 +242,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->kickButton:Landroid/widget/TextView;
 
-    const v6, 0x7f120aa6
+    const v6, 0x7f120ac7
 
     new-array v7, v2, [Ljava/lang/Object;
 
@@ -289,7 +289,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->banButton:Landroid/widget/TextView;
 
-    const v6, 0x7f120295
+    const v6, 0x7f120299
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -449,7 +449,7 @@
 
     if-nez v0, :cond_0
 
-    const v0, 0x7f120bb0
+    const v0, 0x7f120be2
 
     const/4 v1, 0x1
 
@@ -466,7 +466,7 @@
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120bb1
+    const p1, 0x7f120be3
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->getString(I)Ljava/lang/String;
 
@@ -505,7 +505,7 @@
 
     aput-object p1, v1, v2
 
-    const p1, 0x7f1207dc
+    const p1, 0x7f1207f8
 
     invoke-virtual {p0, p1, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -678,7 +678,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d017c
+    const v0, 0x7f0d0186
 
     return v0
 .end method
@@ -884,7 +884,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -908,7 +908,7 @@
 
     invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -922,7 +922,7 @@
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->setRetainInstance(Z)V
 
-    const v1, 0x7f0a029d
+    const v1, 0x7f0a02a6
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -932,7 +932,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->nicknameText:Landroid/widget/EditText;
 
-    const v1, 0x7f0a029e
+    const v1, 0x7f0a02a7
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -942,7 +942,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->nicknameLockIndicator:Landroid/widget/ImageView;
 
-    const v1, 0x7f0a02a1
+    const v1, 0x7f0a02aa
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -952,7 +952,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->saveFab:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    const v1, 0x7f0a02a0
+    const v1, 0x7f0a02a9
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -962,7 +962,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->rolesRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v1, 0x7f0a029f
+    const v1, 0x7f0a02a8
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -970,7 +970,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->rolesContainer:Landroid/view/View;
 
-    const v1, 0x7f0a029a
+    const v1, 0x7f0a02a3
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -978,7 +978,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->administrativeContainer:Landroid/view/View;
 
-    const v1, 0x7f0a029c
+    const v1, 0x7f0a02a5
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -988,7 +988,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->kickButton:Landroid/widget/TextView;
 
-    const v1, 0x7f0a029b
+    const v1, 0x7f0a02a4
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -998,7 +998,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->banButton:Landroid/widget/TextView;
 
-    const v1, 0x7f0a02a2
+    const v1, 0x7f0a02ab
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 5a66dd76a2..25f1bfe5f4 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali
@@ -77,11 +77,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d007e
+    const v0, 0x7f0d0085
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a056d
+    const p1, 0x7f0a0587
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -222,7 +222,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f120b24
+    const p2, 0x7f120b54
 
     invoke-virtual {p1, p2}, Lcom/discord/views/CheckedSetting;->D(I)V
 
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 21cadd2b70..91c4d9c390 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$Model.smali
@@ -476,7 +476,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JO()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 c3671e1a5c..017402eb96 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, 0x7f0a02a4
+    const v3, 0x7f0a02ad
 
     aput v3, v1, v2
 
@@ -291,7 +291,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f120600
+    const p1, 0x7f12060c
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
 
@@ -333,7 +333,7 @@
     return-object p1
 
     :cond_1
-    const p1, 0x7f121181
+    const p1, 0x7f1211c3
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
 
@@ -342,7 +342,7 @@
     return-object p1
 
     :cond_2
-    const p1, 0x7f1208df
+    const p1, 0x7f1208ff
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
 
@@ -351,7 +351,7 @@
     return-object p1
 
     :cond_3
-    const p1, 0x7f1208de
+    const p1, 0x7f1208fe
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
 
@@ -360,7 +360,7 @@
     return-object p1
 
     :cond_4
-    const p1, 0x7f1208dc
+    const p1, 0x7f1208fc
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
 
@@ -522,7 +522,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a056e
+    .packed-switch 0x7f0a0588
         :pswitch_1c
         :pswitch_1b
         :pswitch_1a
@@ -650,7 +650,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -706,7 +706,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0600f0
+    const v2, 0x7f0600f3
 
     invoke-static {v0, v1, v2}, Lcom/discord/utilities/guilds/RoleUtils;->getRoleColor(Lcom/discord/models/domain/ModelGuildRole;Landroid/content/Context;I)I
 
@@ -722,7 +722,7 @@
 
     if-eqz v1, :cond_0
 
-    const v1, 0x7f0600f2
+    const v1, 0x7f0600f5
 
     invoke-static {p0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
 
@@ -752,12 +752,12 @@
 
     if-eqz v2, :cond_1
 
-    const v0, 0x7f0600b9
+    const v0, 0x7f0600bc
 
     goto :goto_1
 
     :cond_1
-    const v0, 0x7f0600c7
+    const v0, 0x7f0600ca
 
     :goto_1
     new-instance v1, Landroid/text/style/ForegroundColorSpan;
@@ -774,7 +774,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const v2, 0x7f120649
+    const v2, 0x7f120657
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
 
@@ -870,7 +870,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f08010b
+    const v1, 0x7f080112
 
     invoke-static {v0, v1}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -1017,11 +1017,11 @@
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->hoistCheckedSetting:Lcom/discord/views/CheckedSetting;
 
-    invoke-virtual {v0, p1}, Lcom/discord/views/CheckedSetting;->aj(Ljava/lang/String;)V
+    invoke-virtual {v0, p1}, Lcom/discord/views/CheckedSetting;->af(Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->mentionableCheckedSetting:Lcom/discord/views/CheckedSetting;
 
-    invoke-virtual {v0, p1}, Lcom/discord/views/CheckedSetting;->aj(Ljava/lang/String;)V
+    invoke-virtual {v0, p1}, Lcom/discord/views/CheckedSetting;->af(Ljava/lang/String;)V
 
     return-void
 .end method
@@ -1145,7 +1145,7 @@
 
     const/4 v6, 0x1
 
-    const v7, 0x7f1208e0
+    const v7, 0x7f120900
 
     if-eq v5, v6, :cond_2
 
@@ -1159,7 +1159,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->aj(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->af(Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -1208,7 +1208,7 @@
     :cond_4
     if-nez v4, :cond_5
 
-    const v2, 0x7f1208dd
+    const v2, 0x7f1208fd
 
     invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->D(I)V
 
@@ -1299,7 +1299,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0119
+    const v0, 0x7f0d0122
 
     return v0
 .end method
@@ -1346,7 +1346,7 @@
     return-void
 
     :cond_0
-    const p1, 0x7f120647
+    const p1, 0x7f120655
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -1561,7 +1561,7 @@
 
     move-result p2
 
-    const p3, 0x7f0a044f
+    const p3, 0x7f0a045f
 
     if-eq p2, p3, :cond_0
 
@@ -1588,7 +1588,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -1645,7 +1645,7 @@
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->setRetainInstance(Z)V
 
-    const v1, 0x7f0a0577
+    const v1, 0x7f0a0591
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1653,7 +1653,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->editNameDisabledOverlay:Landroid/view/View;
 
-    const v1, 0x7f0a0573
+    const v1, 0x7f0a058d
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1661,7 +1661,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->changeColorDisabledOverlay:Landroid/view/View;
 
-    const v1, 0x7f0a02a4
+    const v1, 0x7f0a02ad
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1671,7 +1671,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->roleName:Lcom/discord/app/AppEditText;
 
-    const v1, 0x7f0a0574
+    const v1, 0x7f0a058e
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1679,7 +1679,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->pickColorButton:Landroid/view/View;
 
-    const v1, 0x7f0a0576
+    const v1, 0x7f0a0590
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1687,7 +1687,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->currentColorDisplay:Landroid/view/View;
 
-    const v1, 0x7f0a02a5
+    const v1, 0x7f0a02ae
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1695,7 +1695,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->saveFab:Landroid/view/View;
 
-    const v1, 0x7f0a0579
+    const v1, 0x7f0a0593
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1705,7 +1705,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->hoistCheckedSetting:Lcom/discord/views/CheckedSetting;
 
-    const v1, 0x7f0a0583
+    const v1, 0x7f0a059d
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1719,7 +1719,7 @@
 
     new-array v1, v1, [Lcom/discord/views/CheckedSetting;
 
-    const v2, 0x7f0a056f
+    const v2, 0x7f0a0589
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1731,7 +1731,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f0a0570
+    const v2, 0x7f0a058a
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1741,7 +1741,7 @@
 
     aput-object v2, v1, v0
 
-    const v2, 0x7f0a0571
+    const v2, 0x7f0a058b
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1753,7 +1753,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0572
+    const v2, 0x7f0a058c
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1765,7 +1765,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0575
+    const v2, 0x7f0a058f
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1777,7 +1777,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0578
+    const v2, 0x7f0a0592
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1789,7 +1789,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a057a
+    const v2, 0x7f0a0594
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1801,7 +1801,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a057b
+    const v2, 0x7f0a0595
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1813,7 +1813,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a057d
+    const v2, 0x7f0a0597
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1825,7 +1825,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a057e
+    const v2, 0x7f0a0598
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1837,7 +1837,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a057c
+    const v2, 0x7f0a0596
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1849,7 +1849,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a057f
+    const v2, 0x7f0a0599
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1861,7 +1861,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0580
+    const v2, 0x7f0a059a
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1873,7 +1873,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0581
+    const v2, 0x7f0a059b
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1885,7 +1885,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0582
+    const v2, 0x7f0a059c
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1897,7 +1897,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0585
+    const v2, 0x7f0a059f
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1909,7 +1909,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0586
+    const v2, 0x7f0a05a0
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1921,7 +1921,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0587
+    const v2, 0x7f0a05a1
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1933,7 +1933,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0588
+    const v2, 0x7f0a05a2
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1945,7 +1945,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0589
+    const v2, 0x7f0a05a3
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1957,7 +1957,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a056e
+    const v2, 0x7f0a0588
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1969,7 +1969,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a058a
+    const v2, 0x7f0a05a4
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1981,7 +1981,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a058b
+    const v2, 0x7f0a05a5
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1993,7 +1993,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a058f
+    const v2, 0x7f0a05a9
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2005,7 +2005,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a058e
+    const v2, 0x7f0a05a8
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2017,7 +2017,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a058c
+    const v2, 0x7f0a05a6
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2029,7 +2029,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a058d
+    const v2, 0x7f0a05a7
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2041,7 +2041,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0590
+    const v2, 0x7f0a05aa
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker.smali
index dccbdc3ce0..663c38cf48 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker.smali
@@ -61,7 +61,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d017d
+    const v0, 0x7f0d0187
 
     return v0
 .end method
@@ -109,7 +109,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a021f
+    const v0, 0x7f0a0220
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -119,7 +119,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker;->colorsGridView:Landroid/widget/GridView;
 
-    const v0, 0x7f0a0220
+    const v0, 0x7f0a0221
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -129,7 +129,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker;->reset:Landroid/widget/TextView;
 
-    const v0, 0x7f0a021e
+    const v0, 0x7f0a021f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -177,21 +177,21 @@
 
     const/high16 v3, 0x42340000    # 45.0f
 
-    iput v3, v2, Lcom/angarron/colorpicker/b$a;->oE:F
+    iput v3, v2, Lcom/angarron/colorpicker/b$a;->oD:F
 
-    iput v1, v2, Lcom/angarron/colorpicker/b$a;->oC:I
+    iput v1, v2, Lcom/angarron/colorpicker/b$a;->oB:I
 
-    iput-object v0, v2, Lcom/angarron/colorpicker/b$a;->oB:[I
+    iput-object v0, v2, Lcom/angarron/colorpicker/b$a;->oA:[I
 
     new-instance v0, Lcom/angarron/colorpicker/b;
 
     iget-object v5, v2, Lcom/angarron/colorpicker/b$a;->context:Landroid/content/Context;
 
-    iget-object v6, v2, Lcom/angarron/colorpicker/b$a;->oB:[I
+    iget-object v6, v2, Lcom/angarron/colorpicker/b$a;->oA:[I
 
-    iget v7, v2, Lcom/angarron/colorpicker/b$a;->oC:I
+    iget v7, v2, Lcom/angarron/colorpicker/b$a;->oB:I
 
-    iget v8, v2, Lcom/angarron/colorpicker/b$a;->oE:F
+    iget v8, v2, Lcom/angarron/colorpicker/b$a;->oD:F
 
     const/4 v9, 0x0
 
@@ -205,7 +205,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRoleColorPicker;->colorsGridView:Landroid/widget/GridView;
 
-    iget v2, v0, Lcom/angarron/colorpicker/b;->oA:F
+    iget v2, v0, Lcom/angarron/colorpicker/b;->oz:F
 
     invoke-virtual {v0, v2}, Lcom/angarron/colorpicker/b;->g(F)I
 
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 9ae3ae2dee..57286d0a45 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
@@ -33,7 +33,7 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0180
+    const v0, 0x7f0d018a
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)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 85caf0d2b5..316a06a96a 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
@@ -101,11 +101,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0181
+    const v0, 0x7f0d018b
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0828
+    const p1, 0x7f0a0866
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -113,7 +113,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder;->uploadDescription$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0827
+    const p1, 0x7f0a0865
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -219,7 +219,7 @@
 
     aput-object v2, v1, p2
 
-    const p2, 0x7f12087f
+    const p2, 0x7f12089c
 
     invoke-virtual {v0, p2, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
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 70a8b3fb20..03e897c41f 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
@@ -173,11 +173,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0182
+    const v0, 0x7f0d018c
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a05e5
+    const p1, 0x7f0a05ff
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -185,7 +185,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder;->containerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a05eb
+    const p1, 0x7f0a0605
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -193,7 +193,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder;->userName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a05e8
+    const p1, 0x7f0a0602
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -201,7 +201,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder;->emojiName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a05e4
+    const p1, 0x7f0a05fe
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -209,7 +209,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder;->emojiAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a05ec
+    const p1, 0x7f0a0606
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -393,7 +393,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f07005b
+    const v4, 0x7f07005a
 
     const/4 v5, 0x0
 
@@ -431,9 +431,9 @@
 
     move-result-object v4
 
-    const v6, 0x7f07005b
+    const v6, 0x7f0700b8
 
-    const v7, 0x7f07005b
+    const v7, 0x7f0700b8
 
     const/4 v8, 0x1
 
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 f93f351742..24af283411 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
@@ -77,11 +77,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0183
+    const v0, 0x7f0d018d
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0826
+    const p1, 0x7f0a0864
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -169,16 +169,24 @@
 
     move-result-object v0
 
+    const-string v1, "context.resources.getQua\u2026nt, slotsLeft, slotsLeft)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-array v1, v2, [Ljava/lang/Object;
 
     aput-object v0, v1, v5
 
-    const v0, 0x7f12056a
+    const v0, 0x7f120575
 
     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}, Lkotlin/jvm/internal/k;->g(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
@@ -199,7 +207,7 @@
 
     aput-object v0, v3, v2
 
-    const p2, 0x7f120569
+    const p2, 0x7f120574
 
     invoke-virtual {p1, p2, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onEmojiItemClicked$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onEmojiItemClicked$1.smali
index 4f649a85e1..084c347898 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
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onEmojiItemClicked$1;->invoke(Landroid/view/View;Lcom/discord/models/domain/emoji/ModelEmojiGuild;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 f72cb3c15f..95f12b2539 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
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onUploadEmoji$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiHeader.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiHeader.smali
index 0d2cb4860e..faff4471fa 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiHeader.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiHeader.smali
@@ -138,6 +138,10 @@
 
     iget v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiHeader;->emojiMax:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     return v0
 .end method
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection.smali
index 76ec98b1b3..b85d2df5bb 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection.smali
@@ -228,16 +228,28 @@
 
     iget v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection;->emojiMax:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection;->emojiLength:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection;->titleId:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
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 bbda4cd5c8..f1e3bc10ce 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
@@ -327,7 +327,7 @@
 
     move-result v5
 
-    const v6, 0x7f12055a
+    const v6, 0x7f120565
 
     invoke-direct {v4, v0, v5, v6}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection;-><init>(III)V
 
@@ -337,7 +337,7 @@
 
     move-result v6
 
-    const v7, 0x7f1200ce
+    const v7, 0x7f1200d1
 
     invoke-direct {v5, v0, v6, v7}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection;-><init>(III)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 06654bf6ee..fc21185bd8 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$2;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 4495b0b0f8..3d1ca796ff 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$3;->invoke(Landroid/view/View;Lcom/discord/models/domain/emoji/ModelEmojiGuild;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 0fa6b1db25..c850694591 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 94cc0401e0..d2c507b5b2 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali
@@ -41,9 +41,9 @@
 
     check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
 
-    const v1, 0x7f1203c4
+    const v1, 0x7f1203ca
 
-    const v2, 0x7f12119d
+    const v2, 0x7f1211e1
 
     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 a0adbe09bc..dd6712cd60 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali
@@ -118,7 +118,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0829
+    const v0, 0x7f0a0867
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -126,7 +126,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0825
+    const v0, 0x7f0a0863
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -176,7 +176,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f12055a
+    const v0, 0x7f120565
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -290,7 +290,7 @@
 
     if-nez v0, :cond_6
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_6
     invoke-virtual {p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model;->getItems()Ljava/util/List;
@@ -303,7 +303,7 @@
 
     if-nez p1, :cond_7
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_7
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$2;
@@ -318,7 +318,7 @@
 
     if-nez p1, :cond_8
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_8
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$3;
@@ -486,7 +486,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d017e
+    const v0, 0x7f0d0188
 
     return v0
 .end method
@@ -508,7 +508,7 @@
 .end method
 
 .method public final onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
-    .locals 2
+    .locals 7
 
     const-string v0, "uri"
 
@@ -520,46 +520,27 @@
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
 
-    invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result v0
+    move-result-object v3
 
-    const v1, -0x34688ef0    # -1.984976E7f
+    const-string v0, "requireFragmentManager()"
 
-    if-eq v0, v1, :cond_0
+    invoke-static {v3, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    goto :goto_0
+    move-object v4, p0
 
-    :cond_0
-    const-string v0, "image/gif"
+    check-cast v4, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
 
-    invoke-virtual {p2, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    iget-object v5, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->uploadEmojiAction:Lrx/functions/Action1;
 
-    move-result v0
+    sget-object v6, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->wz:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
-    if-eqz v0, :cond_1
+    move-object v1, p1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->getContext()Landroid/content/Context;
+    move-object v2, p2
 
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->uploadEmojiAction:Lrx/functions/Action1;
-
-    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_1
-    :goto_0
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->getContext()Landroid/content/Context;
-
-    move-result-object p2
-
-    move-object v0, p0
-
-    check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
-
-    invoke-static {p2, v0, p1}, Lcom/discord/utilities/images/MGImages;->requestAvatarCrop(Landroid/content/Context;Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Landroid/net/Uri;)V
+    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
 .end method
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 20f8fbc033..de1c3bcd0e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$Companion.smali
@@ -66,6 +66,10 @@
 
     move-result-object p2
 
+    const-string p3, "Intent()\n          .putE\u2026EXTRA_EMOJI_ALIAS, alias)"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-class p3, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;
 
     invoke-static {p1, p3, p2}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
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 7e8d5f9bb8..4ed9555152 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
@@ -60,7 +60,7 @@
 
     move-result p1
 
-    const p2, 0x7f0a0462
+    const p2, 0x7f0a0473
 
     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 00f8fb34c7..55ac9da5ee 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali
@@ -119,7 +119,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a05e6
+    const v0, 0x7f0a0600
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -127,7 +127,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;->editAlias$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a05e7
+    const v1, 0x7f0a0601
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -257,7 +257,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f12055a
+    const v0, 0x7f120565
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -523,7 +523,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f120f2a
+    const v0, 0x7f120f61
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;->getString(I)Ljava/lang/String;
 
@@ -609,7 +609,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d017f
+    const v0, 0x7f0d0189
 
     return v0
 .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 64ad501a02..d446a20d98 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model.smali
@@ -146,7 +146,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p0
 
@@ -193,11 +193,11 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kj()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JX()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JV()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 b550f170d5..1ab8953f01 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, 0x7f1209aa
+    const v0, 0x7f1209cb
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -186,7 +186,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0186
+    const v0, 0x7f0d0190
 
     return v0
 .end method
@@ -254,7 +254,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a05ef
+    const v0, 0x7f0a0609
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -264,7 +264,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites;->viewFlipper:Landroid/widget/ViewFlipper;
 
-    const v0, 0x7f0a05ee
+    const v0, 0x7f0a0608
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 2d0d05f85b..2b6b1698b3 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1$1;->invoke(Lcom/discord/models/domain/ModelInvite;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 43734ddb0e..bb2cc79809 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali
@@ -65,7 +65,7 @@
 
     aput-object v0, v2, v3
 
-    const v3, 0x7f121021
+    const v3, 0x7f12105e
 
     invoke-virtual {v1, v3, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.smali
index 367d56d606..5f7c62bf9c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.smali
@@ -145,7 +145,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a03ac
+    const v0, 0x7f0a03bc
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -153,7 +153,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;->title$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03aa
+    const v0, 0x7f0a03ba
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -161,7 +161,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;->revoke$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03a9
+    const v0, 0x7f0a03b9
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -169,7 +169,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;->copy$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03ab
+    const v0, 0x7f0a03bb
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -307,7 +307,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0184
+    const v0, 0x7f0d018e
 
     return v0
 .end method
@@ -362,7 +362,7 @@
     return-void
 
     :cond_2
-    sget-object v4, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object v4, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
     const/4 v4, 0x2
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
index 3aaf3c8058..14f56c9568 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
@@ -38,13 +38,13 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites$Adapter;)V
     .locals 1
 
-    const v0, 0x7f0d0185
+    const v0, 0x7f0d018f
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a03b3
+    const v0, 0x7f0a03c3
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -54,7 +54,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a03b2
+    const v0, 0x7f0a03c2
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -66,7 +66,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a03b1
+    const v0, 0x7f0a03c1
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -78,7 +78,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a03c4
+    const v0, 0x7f0a03d4
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -90,7 +90,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a03b9
+    const v0, 0x7f0a03c9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -102,7 +102,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a03c5
+    const v0, 0x7f0a03d5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -114,7 +114,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a03b6
+    const v0, 0x7f0a03c6
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -274,7 +274,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteExpirationTime:Landroid/widget/TextView;
 
-    const p2, 0x7f060107
+    const p2, 0x7f060109
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
@@ -303,13 +303,13 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteExpirationTime:Landroid/widget/TextView;
 
-    const v0, 0x7f120b2e
+    const v0, 0x7f120b5e
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteExpirationTime:Landroid/widget/TextView;
 
-    const v0, 0x7f060073
+    const v0, 0x7f060076
 
     invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
@@ -479,7 +479,7 @@
     goto :goto_0
 
     :cond_3
-    const v1, 0x7f120995
+    const v1, 0x7f1209b5
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -502,7 +502,7 @@
 
     if-eqz v0, :cond_7
 
-    const v1, 0x7f07005a
+    const v1, 0x7f070059
 
     invoke-static {v0, p1, v1}, Lcom/discord/utilities/icon/IconUtils;->setIcon(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;I)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 4ba0cbfa16..7d586effd6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Companion.smali
@@ -60,6 +60,10 @@
 
     move-result-object p2
 
+    const-string p3, "Intent()\n          .putE\u2026_EXTRA_GUILD_ID, guildId)"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-class p3, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;
 
     invoke-static {p1, p3, p2}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
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 b5d1cca2a1..1f33b626d8 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
@@ -172,7 +172,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
@@ -357,7 +357,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 6d86d333f9..0ef457fb53 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
@@ -220,7 +220,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem;->integration:Lcom/discord/models/domain/ModelGuildIntegration;
 
@@ -240,15 +240,11 @@
 
     iget-wide v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem;->guildId:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
 .end method
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 94c22111ad..63f2bf0bad 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model.smali
@@ -276,52 +276,48 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;->guildId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v2, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v2
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;->guildName:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;->guildName:Ljava/lang/String;
 
     const/4 v2, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;->integrations:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;->integrations:Ljava/util/List;
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
     move-result v2
 
     :cond_1
-    add-int/2addr v1, v2
+    add-int/2addr v0, v2
 
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
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 4ceb19d4d2..0af6174022 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
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$configureUI$1;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .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 2e1db3761c..8cb8aff5af 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$onResume$1;->invoke(Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali
index 8c7eaf9fad..7aa8cff96d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali
@@ -105,7 +105,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a03a7
+    const v0, 0x7f0a03b7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -113,7 +113,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03a6
+    const v0, 0x7f0a03b6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -135,7 +135,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f1209ac
+    const v0, 0x7f1209cd
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -246,7 +246,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0188
+    const v0, 0x7f0d0192
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
index dc032a1295..5ddaeb6f7e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
@@ -236,11 +236,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0187
+    const v0, 0x7f0d0191
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a039c
+    const p1, 0x7f0a03ac
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -248,7 +248,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->headerDisabledOverlay$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a039b
+    const p1, 0x7f0a03ab
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -256,7 +256,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->headerContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03a0
+    const p1, 0x7f0a03b0
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -264,7 +264,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->ownerName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a039e
+    const p1, 0x7f0a03ae
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -272,7 +272,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->integrationName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a039d
+    const p1, 0x7f0a03ad
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -280,7 +280,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->integrationIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03a1
+    const p1, 0x7f0a03b1
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -288,7 +288,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->settingsIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03a3
+    const p1, 0x7f0a03b3
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -296,7 +296,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->syncingProgressIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03a2
+    const p1, 0x7f0a03b2
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -508,7 +508,7 @@
 
     move-object/from16 v6, p6
 
-    const v0, 0x7f0d017a
+    const v0, 0x7f0d0184
 
     const/4 v1, 0x0
 
@@ -516,19 +516,19 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a05dc
+    const v1, 0x7f0a05f6
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v7
 
-    const v1, 0x7f0a05db
+    const v1, 0x7f0a05f5
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v1
 
-    const v2, 0x7f0a05da
+    const v2, 0x7f0a05f4
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -586,12 +586,12 @@
 
     if-eqz p5, :cond_2
 
-    const v0, 0x7f1204fe
+    const v0, 0x7f120509
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f1204ff
+    const v0, 0x7f12050a
 
     :goto_0
     invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V
@@ -818,12 +818,12 @@
 
     if-eqz v7, :cond_7
 
-    const v4, 0x7f08006b
+    const v4, 0x7f08006c
 
     goto :goto_7
 
     :cond_7
-    const v4, 0x7f08006c
+    const v4, 0x7f08006d
 
     :goto_7
     invoke-virtual {v3, v4}, Landroid/widget/ImageView;->setImageResource(I)V
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 65cf0ce13f..390b9c0c37 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model.smali
@@ -514,7 +514,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
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 5588daa254..220a2a5ab0 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, 0x7f0a0591
+    const p2, 0x7f0a05ab
 
     invoke-virtual {p3, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -103,7 +103,7 @@
 .method public getDropDownView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
     .locals 0
 
-    const p3, 0x7f0d0061
+    const p3, 0x7f0d0063
 
     invoke-direct {p0, p1, p3, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter;->getItemView(IILandroid/view/View;)Landroid/view/View;
 
@@ -143,7 +143,7 @@
 .method public getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
     .locals 0
 
-    const p3, 0x7f0d0060
+    const p3, 0x7f0d0062
 
     invoke-direct {p0, p1, p3, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter;->getItemView(IILandroid/view/View;)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 32afe093a4..e67a3d8d4e 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, 0x7f120b37
+    const v0, 0x7f120b68
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -415,7 +415,7 @@
 
     move-result-object p2
 
-    const v1, 0x7f0d0060
+    const v1, 0x7f0d0062
 
     invoke-direct {p1, p2, v1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter;-><init>(Landroid/content/Context;I[Lcom/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter$RoleSpinnerItem;)V
 
@@ -439,7 +439,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d018a
+    const v0, 0x7f0d0194
 
     return v0
 .end method
@@ -451,7 +451,7 @@
 
     move-result p2
 
-    const p3, 0x7f0a0463
+    const p3, 0x7f0a0474
 
     if-eq p2, p3, :cond_0
 
@@ -515,7 +515,7 @@
 
     if-nez v0, :cond_1
 
-    const p1, 0x7f12036d
+    const p1, 0x7f120372
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -555,14 +555,14 @@
 
     if-eqz p1, :cond_3
 
-    const p1, 0x7f12036e
+    const p1, 0x7f120373
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
     return-void
 
     :cond_3
-    const p1, 0x7f12036c
+    const p1, 0x7f120371
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -728,7 +728,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a05f1
+    const v0, 0x7f0a060b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -738,7 +738,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->searchBox:Landroid/widget/EditText;
 
-    const v0, 0x7f0a05f3
+    const v0, 0x7f0a060d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -748,7 +748,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->recycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a05f4
+    const v0, 0x7f0a060e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -758,7 +758,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->rolesSpinner:Landroid/widget/Spinner;
 
-    const v0, 0x7f0a05f5
+    const v0, 0x7f0a060f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 45b9eabe4b..4fc2de6a91 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem.smali
@@ -43,13 +43,13 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0189
+    const v0, 0x7f0d0193
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0430
+    const v0, 0x7f0a0440
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -59,7 +59,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0432
+    const v0, 0x7f0a0442
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -71,7 +71,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a042f
+    const v0, 0x7f0a043f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -83,7 +83,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0434
+    const v0, 0x7f0a0444
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -95,7 +95,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0431
+    const v0, 0x7f0a0441
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -107,7 +107,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0433
+    const v0, 0x7f0a0443
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -119,7 +119,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem;->rolesRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f060110
+    const v0, 0x7f060112
 
     invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
@@ -300,7 +300,7 @@
 
     iget-object v0, p2, Lcom/discord/widgets/servers/WidgetServerSettingsMembers$Model$MemberItem;->avatarUrl:Ljava/lang/String;
 
-    const v1, 0x7f07005b
+    const v1, 0x7f07005a
 
     invoke-static {p1, v0, v1}, Lcom/discord/utilities/icon/IconUtils;->setIcon(Landroid/widget/ImageView;Ljava/lang/String;I)V
 
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 f69e922cd6..f6b358713d 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
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
index 4f05f76ad1..aea1e496d5 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
@@ -289,7 +289,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -323,7 +323,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d018b
+    const v0, 0x7f0d0195
 
     return v0
 .end method
@@ -367,7 +367,7 @@
 .method public synthetic lambda$updateGuild$2$WidgetServerSettingsModeration(Lcom/discord/models/domain/ModelGuild;)V
     .locals 0
 
-    const p1, 0x7f120fe5
+    const p1, 0x7f121021
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -381,7 +381,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f120b77
+    const v0, 0x7f120ba8
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -389,7 +389,7 @@
 
     new-array v0, v0, [Lcom/discord/views/CheckedSetting;
 
-    const v1, 0x7f0a05f9
+    const v1, 0x7f0a0613
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -401,7 +401,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a05fa
+    const v1, 0x7f0a0614
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -413,7 +413,7 @@
 
     aput-object v1, v0, v3
 
-    const v1, 0x7f0a05fb
+    const v1, 0x7f0a0615
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -425,7 +425,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f0a05fc
+    const v1, 0x7f0a0616
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -437,7 +437,7 @@
 
     aput-object v1, v0, v5
 
-    const v1, 0x7f0a05fd
+    const v1, 0x7f0a0617
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -457,7 +457,7 @@
 
     new-array v0, v5, [Lcom/discord/views/CheckedSetting;
 
-    const v1, 0x7f0a05f6
+    const v1, 0x7f0a0610
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -467,7 +467,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a05f7
+    const v1, 0x7f0a0611
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -477,7 +477,7 @@
 
     aput-object v1, v0, v3
 
-    const v1, 0x7f0a05f8
+    const v1, 0x7f0a0612
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -523,7 +523,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f1212a8
+    const v1, 0x7f1212f9
 
     invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -545,7 +545,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f1212a4
+    const v1, 0x7f1212f5
 
     invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet.smali
index 9e14d37721..bfb1f0c6af 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet.smali
@@ -80,11 +80,11 @@
 
     :array_0
     .array-data 4
-        0x7f0a0608
-        0x7f0a0609
-        0x7f0a060a
-        0x7f0a060b
-        0x7f0a060c
+        0x7f0a0622
+        0x7f0a0623
+        0x7f0a0624
+        0x7f0a0625
+        0x7f0a0626
     .end array-data
 .end method
 
@@ -121,7 +121,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d018d
+    const v0, 0x7f0d0197
 
     return 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 ce5b723332..d97746257e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Companion.smali
@@ -81,6 +81,10 @@
 
     move-result-object p2
 
+    const-string p3, "Intent()\n          .putE\u2026SIZE_ICON, emphasizeIcon)"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-class p3, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
     invoke-static {p1, p3, p2}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
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 b3cd9ad057..e34231f071 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
@@ -72,7 +72,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object 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 53b42c2aa8..bc1949f1ab 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model.smali
@@ -278,7 +278,7 @@
 
     check-cast p1, Ljava/lang/Iterable;
 
-    sget-object p2, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object p2, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
     const-string p3, "$this$CASE_INSENSITIVE_ORDER"
 
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 9afaaf9671..59caa672ae 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
@@ -43,9 +43,9 @@
 
     check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
 
-    const v1, 0x7f1203c4
+    const v1, 0x7f1203ca
 
-    const v2, 0x7f12119d
+    const v2, 0x7f1211e1
 
     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 c52e074b8a..d5e301ca60 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerSection$1;->invoke(Landroid/content/Context;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -72,7 +72,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;
+    sget-object p2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerSection$1;->$guild:Lcom/discord/models/domain/ModelGuild;
 
@@ -80,7 +80,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p2, p1, v0, v1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;->create(Landroid/content/Context;J)V
+    invoke-virtual {p2, p1, v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;->create(Landroid/content/Context;J)V
 
     return-void
 .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 d59191b2e2..4ebfb97420 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
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
 
     const-string v1, "it"
 
@@ -57,7 +57,7 @@
 
     move-result-wide v1
 
-    invoke-virtual {v0, p1, v1, v2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;->create(Landroid/content/Context;J)V
+    invoke-virtual {v0, p1, v1, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;->create(Landroid/content/Context;J)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali
index b802035912..c7a611071c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali
@@ -43,9 +43,9 @@
 
     check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
 
-    const v1, 0x7f1203c4
+    const v1, 0x7f1203ca
 
-    const v2, 0x7f12119d
+    const v2, 0x7f1211e1
 
     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$configureSplashImage$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1$2.smali
index 283a87975d..36577882d9 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
@@ -43,9 +43,9 @@
 
     check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
 
-    const v1, 0x7f1203c4
+    const v1, 0x7f1203ca
 
-    const v2, 0x7f12119d
+    const v2, 0x7f1211e1
 
     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 16202943b7..8bdc53cc21 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
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashSection$1;->invoke(Landroid/content/Context;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -72,7 +72,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;
+    sget-object p2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashSection$1;->$guild:Lcom/discord/models/domain/ModelGuild;
 
@@ -80,7 +80,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p2, p1, v0, v1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;->create(Landroid/content/Context;J)V
+    invoke-virtual {p2, p1, v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;->create(Landroid/content/Context;J)V
 
     return-void
 .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 27cdb80bf9..91b53ab6b3 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
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
 
     const-string v1, "it"
 
@@ -57,7 +57,7 @@
 
     move-result-wide v1
 
-    invoke-virtual {v0, p1, v1, v2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;->create(Landroid/content/Context;J)V
+    invoke-virtual {v0, p1, v1, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;->create(Landroid/content/Context;J)V
 
     return-void
 .end method
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 bc7d4994c0..dd3a690047 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
@@ -63,7 +63,7 @@
 
     const/4 v5, 0x1
 
-    const v6, 0x7f120bb4
+    const v6, 0x7f120be6
 
     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$4.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.smali
index 49de5babd9..860bdc3ea9 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
@@ -63,7 +63,7 @@
 
     const/4 v5, 0x1
 
-    const v6, 0x7f120be0
+    const v6, 0x7f120c12
 
     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.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.smali
index 45e45a8510..b80d8ac8ea 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
@@ -538,7 +538,7 @@
 
     move-result-object v2
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v3
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$1.smali
index cd7d4a002c..bf12a39f4c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$2.smali
index 68a9f1895e..5bc008e5db 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$2.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$2;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$3.smali
index 5cc79f013d..059c6f4006 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$3.smali
@@ -66,7 +66,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$3;->invoke(Lkotlin/jvm/functions/Function0;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 b96d5640e2..107e435a5e 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1$1;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -86,7 +86,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a061d
+    const v1, 0x7f0a0637
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
 
@@ -128,7 +128,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a0605
+    const v1, 0x7f0a061f
 
     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 975b2cf87c..f59d5892c2 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
@@ -67,7 +67,7 @@
 
     invoke-virtual {p0, v0, v1, p2, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1;->invoke(JLjava/lang/String;I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -105,7 +105,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 3041263eb1..4d6f6fc704 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 c34b3222bf..02dd9a8356 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1;->invoke(Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -85,7 +85,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f0a0616
+    const v3, 0x7f0a0630
 
     invoke-virtual {v1, v3, v2}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
 
@@ -99,7 +99,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f0a0617
+    const v3, 0x7f0a0631
 
     invoke-virtual {v1, v3, v2}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
 
@@ -113,7 +113,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f0a061a
+    const v3, 0x7f0a0634
 
     invoke-virtual {v1, v3, v2}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
index 2769e301c3..6d4554dbdd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
@@ -909,7 +909,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a061c
+    const v0, 0x7f0a0636
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -917,7 +917,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->scroll$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0610
+    const v0, 0x7f0a062a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -925,7 +925,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->iconAndNameContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0611
+    const v0, 0x7f0a062b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -933,7 +933,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->iconRemove$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a060f
+    const v0, 0x7f0a0629
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -941,7 +941,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->iconLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0612
+    const v0, 0x7f0a062c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -949,7 +949,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->iconText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a060e
+    const v0, 0x7f0a0628
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -957,7 +957,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0613
+    const v0, 0x7f0a062d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -965,7 +965,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0616
+    const v0, 0x7f0a0630
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -973,7 +973,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->region$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0617
+    const v0, 0x7f0a0631
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -981,7 +981,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->regionFlag$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a061a
+    const v0, 0x7f0a0634
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -989,7 +989,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->regionWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0606
+    const v0, 0x7f0a0620
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -997,7 +997,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->afkChannelWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0605
+    const v0, 0x7f0a061f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1005,7 +1005,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->afkChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a060d
+    const v0, 0x7f0a0627
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1013,7 +1013,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->afkTimeoutWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0607
+    const v0, 0x7f0a0621
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1021,7 +1021,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->afkTimeout$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0620
+    const v0, 0x7f0a063a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1029,7 +1029,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->systemChannelWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a061d
+    const v0, 0x7f0a0637
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1037,7 +1037,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->systemChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a061f
+    const v0, 0x7f0a0639
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1045,7 +1045,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->systemChannelJoinMessage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a061e
+    const v0, 0x7f0a0638
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1053,7 +1053,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->systemChannelBoostMessage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0629
+    const v0, 0x7f0a0643
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1061,7 +1061,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplashContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0628
+    const v0, 0x7f0a0642
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1069,7 +1069,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplash$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a062d
+    const v0, 0x7f0a0647
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1077,7 +1077,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplashRemove$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a062b
+    const v0, 0x7f0a0645
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1085,7 +1085,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplashLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a062c
+    const v0, 0x7f0a0646
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1093,7 +1093,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplashTierInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a062a
+    const v0, 0x7f0a0644
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1101,7 +1101,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplashFAB$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a062e
+    const v0, 0x7f0a0648
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1109,7 +1109,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplashUnlock$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0622
+    const v0, 0x7f0a063c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1117,7 +1117,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadBannerContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0621
+    const v0, 0x7f0a063b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1125,7 +1125,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadBanner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0626
+    const v0, 0x7f0a0640
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1133,7 +1133,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadBannerRemove$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0624
+    const v0, 0x7f0a063e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1141,7 +1141,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadBannerLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0625
+    const v0, 0x7f0a063f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1149,7 +1149,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadBannerTierInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0623
+    const v0, 0x7f0a063d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1157,7 +1157,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadBannerFAB$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0627
+    const v0, 0x7f0a0641
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1177,7 +1177,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->notificationsCs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a061b
+    const v0, 0x7f0a0635
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1203,25 +1203,25 @@
 
     :array_0
     .array-data 4
-        0x7f0a0614
-        0x7f0a0615
+        0x7f0a062e
+        0x7f0a062f
     .end array-data
 
     :array_1
     .array-data 4
-        0x7f0a060e
-        0x7f0a0613
-        0x7f0a0616
-        0x7f0a0617
-        0x7f0a061a
-        0x7f0a0605
-        0x7f0a0607
-        0x7f0a060d
-        0x7f0a061d
         0x7f0a0628
-        0x7f0a0621
+        0x7f0a062d
+        0x7f0a0630
+        0x7f0a0631
+        0x7f0a0634
         0x7f0a061f
-        0x7f0a061e
+        0x7f0a0621
+        0x7f0a0627
+        0x7f0a0637
+        0x7f0a0642
+        0x7f0a063b
+        0x7f0a0639
+        0x7f0a0638
         0x15f91
     .end array-data
 .end method
@@ -1479,9 +1479,9 @@
 
     move-result-object v0
 
-    const v1, 0x7f120bb4
+    const v1, 0x7f120be6
 
-    const v2, 0x7f080219
+    const v2, 0x7f080228
 
     invoke-direct {p0, v0, p1, v1, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->configureChannel(Landroid/widget/TextView;Lcom/discord/models/domain/ModelChannel;II)V
 
@@ -1663,7 +1663,7 @@
 
     move-result-object v0
 
-    const v6, 0x7f0800bd
+    const v6, 0x7f0800c0
 
     invoke-virtual {v0, v6}, Lcom/facebook/drawee/view/SimpleDraweeView;->setBackgroundResource(I)V
 
@@ -1671,7 +1671,7 @@
 
     move-result-object v0
 
-    const v6, 0x7f1208c0
+    const v6, 0x7f1208dd
 
     new-array v7, v4, [Ljava/lang/Object;
 
@@ -1691,7 +1691,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f08031a
+    const v8, 0x7f08032b
 
     const/4 v9, 0x0
 
@@ -1711,7 +1711,7 @@
 
     move-result-object v1
 
-    const v6, 0x7f060149
+    const v6, 0x7f06014b
 
     invoke-static {v1, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -1785,7 +1785,7 @@
     return-void
 
     :cond_3
-    const v0, 0x7f1208c2
+    const v0, 0x7f1208df
 
     new-array v6, v2, [Ljava/lang/Object;
 
@@ -1889,11 +1889,15 @@
 
     move-result-object v0
 
+    const-string v1, "resources.getQuantityStr\u2026r, boostsNeededForBanner)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getUploadBannerUnlock()Landroid/widget/TextView;
 
     move-result-object v1
 
-    const v2, 0x7f1208bf
+    const v2, 0x7f1208dc
 
     new-array v3, v4, [Ljava/lang/Object;
 
@@ -1913,7 +1917,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f080319
+    const v4, 0x7f08032a
 
     const/4 v5, 0x0
 
@@ -1933,7 +1937,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f040298
+    const v2, 0x7f04029b
 
     invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -1949,7 +1953,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0402a6
+    const v2, 0x7f0402a9
 
     invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -2130,7 +2134,7 @@
 
     move-result-object v3
 
-    const v5, 0x7f070054
+    const v5, 0x7f070053
 
     const/4 v6, 0x0
 
@@ -2265,7 +2269,7 @@
 
     if-gez v1, :cond_1
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_1
     check-cast v2, Lcom/discord/views/CheckedSetting;
@@ -2483,7 +2487,7 @@
 
     move-result-object v0
 
-    const v6, 0x7f0800bd
+    const v6, 0x7f0800c0
 
     invoke-virtual {v0, v6}, Lcom/facebook/drawee/view/SimpleDraweeView;->setBackgroundResource(I)V
 
@@ -2491,7 +2495,7 @@
 
     move-result-object v0
 
-    const v6, 0x7f1208c0
+    const v6, 0x7f1208dd
 
     new-array v7, v4, [Ljava/lang/Object;
 
@@ -2511,7 +2515,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f08031a
+    const v8, 0x7f08032b
 
     const/4 v9, 0x0
 
@@ -2531,7 +2535,7 @@
 
     move-result-object v1
 
-    const v6, 0x7f060149
+    const v6, 0x7f06014b
 
     invoke-static {v1, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -2605,7 +2609,7 @@
     return-void
 
     :cond_3
-    const v0, 0x7f1208c2
+    const v0, 0x7f1208df
 
     new-array v6, v3, [Ljava/lang/Object;
 
@@ -2709,11 +2713,15 @@
 
     move-result-object v0
 
+    const-string v1, "resources.getQuantityStr\u2026h, boostsNeededForSplash)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getUploadSplashUnlock()Landroid/widget/TextView;
 
     move-result-object v1
 
-    const v2, 0x7f1208bf
+    const v2, 0x7f1208dc
 
     new-array v3, v4, [Ljava/lang/Object;
 
@@ -2733,7 +2741,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f080319
+    const v4, 0x7f08032a
 
     const/4 v5, 0x0
 
@@ -2753,7 +2761,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f040298
+    const v2, 0x7f04029b
 
     invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -2769,7 +2777,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0402a6
+    const v2, 0x7f0402a9
 
     invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -2799,9 +2807,9 @@
 
     move-result-object v0
 
-    const v1, 0x7f120be0
+    const v1, 0x7f120c12
 
-    const v2, 0x7f080211
+    const v2, 0x7f080220
 
     invoke-direct {p0, v0, p1, v1, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->configureChannel(Landroid/widget/TextView;Lcom/discord/models/domain/ModelChannel;II)V
 
@@ -2953,7 +2961,7 @@
     goto :goto_0
 
     :cond_1
-    const v2, 0x7f120fe3
+    const v2, 0x7f12101f
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getString(I)Ljava/lang/String;
 
@@ -3459,7 +3467,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f120fe5
+    const v0, 0x7f121021
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -4325,7 +4333,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d018c
+    const v0, 0x7f0d0196
 
     return v0
 .end method
@@ -4363,7 +4371,7 @@
 .end method
 
 .method public final onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
-    .locals 2
+    .locals 7
 
     const-string v0, "uri"
 
@@ -4375,46 +4383,27 @@
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
 
-    invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result v0
+    move-result-object v3
 
-    const v1, -0x34688ef0    # -1.984976E7f
+    const-string v0, "requireFragmentManager()"
 
-    if-eq v0, v1, :cond_0
+    invoke-static {v3, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    goto :goto_0
+    move-object v4, p0
 
-    :cond_0
-    const-string v0, "image/gif"
+    check-cast v4, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
 
-    invoke-virtual {p2, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    iget-object v5, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->imageSelectedResult:Lrx/functions/Action1;
 
-    move-result v0
+    sget-object v6, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->wB:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
-    if-eqz v0, :cond_1
+    move-object v1, p1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getContext()Landroid/content/Context;
+    move-object v2, p2
 
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->imageSelectedResult:Lrx/functions/Action1;
-
-    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_1
-    :goto_0
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getContext()Landroid/content/Context;
-
-    move-result-object p2
-
-    move-object v0, p0
-
-    check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
-
-    invoke-static {p2, v0, p1}, Lcom/discord/utilities/images/MGImages;->requestAvatarCrop(Landroid/content/Context;Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Landroid/net/Uri;)V
+    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
 .end method
@@ -4548,9 +4537,9 @@
 
     new-array v1, v0, [Ljava/lang/Object;
 
-    sget-object v2, Lcom/discord/app/e;->uy:Lcom/discord/app/e;
+    sget-object v2, Lcom/discord/app/e;->ux:Lcom/discord/app/e;
 
-    sget-wide v2, Lcom/discord/app/e;->uw:J
+    sget-wide v2, Lcom/discord/app/e;->uv:J
 
     invoke-static {v2, v3}, Lcom/discord/app/e;->k(J)Ljava/lang/String;
 
@@ -4558,7 +4547,7 @@
 
     aput-object v2, v1, v6
 
-    const v2, 0x7f1208cc
+    const v2, 0x7f1208e9
 
     invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -4600,9 +4589,9 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    sget-object v1, Lcom/discord/app/e;->uy:Lcom/discord/app/e;
+    sget-object v1, Lcom/discord/app/e;->ux:Lcom/discord/app/e;
 
-    sget-wide v7, Lcom/discord/app/e;->uw:J
+    sget-wide v7, Lcom/discord/app/e;->uv:J
 
     invoke-static {v7, v8}, Lcom/discord/app/e;->k(J)Ljava/lang/String;
 
@@ -4610,7 +4599,7 @@
 
     aput-object v1, v0, v6
 
-    const v1, 0x7f12087a
+    const v1, 0x7f120897
 
     invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -4660,7 +4649,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->initChannelSelectedHandler()V
 
-    const v0, 0x7f120cc0
+    const v0, 0x7f120cfa
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->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 2b9712875c..606bd86a98 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model.smali
@@ -301,7 +301,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JO()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 fe34571163..0f8c44aa4d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
@@ -86,7 +86,7 @@
 .method private configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120eef
+    const v0, 0x7f120f26
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -228,7 +228,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -244,7 +244,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dE()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -437,7 +437,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -489,7 +489,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0192
+    const v0, 0x7f0d019c
 
     return v0
 .end method
@@ -549,7 +549,7 @@
 .method public synthetic lambda$processRoleDrop$3$WidgetServerSettingsRolesList(Ljava/lang/Void;)V
     .locals 0
 
-    const p1, 0x7f120eee
+    const p1, 0x7f120f25
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -615,7 +615,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0592
+    const v0, 0x7f0a05ac
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -625,7 +625,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->addRoleFab:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    const v0, 0x7f0a0635
+    const v0, 0x7f0a064f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -635,7 +635,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->recycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 29a236fc63..637cff1d66 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali
@@ -41,13 +41,13 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0191
+    const v0, 0x7f0d019b
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0633
+    const v0, 0x7f0a064d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -59,7 +59,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0631
+    const v0, 0x7f0a064b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -69,7 +69,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0632
+    const v0, 0x7f0a064c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -87,7 +87,7 @@
 
     move-result-object p0
 
-    const v0, 0x7f120600
+    const v0, 0x7f12060c
 
     invoke-static {p0, v0}, Lcom/discord/app/h;->d(Landroid/content/Context;I)V
 
@@ -103,7 +103,7 @@
 
     move-result-object p0
 
-    const v0, 0x7f1208dc
+    const v0, 0x7f1208fc
 
     invoke-static {p0, v0}, Lcom/discord/app/h;->d(Landroid/content/Context;I)V
 
@@ -119,7 +119,7 @@
 
     move-result-object p0
 
-    const v0, 0x7f121181
+    const v0, 0x7f1211c3
 
     invoke-static {p0, v0}, Lcom/discord/app/h;->d(Landroid/content/Context;I)V
 
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 bcf42c4bd7..16a2ddccb6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$Model.smali
@@ -149,7 +149,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
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 5eaf969cce..e5f0f6b528 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, 0x7f1204f6
+    const v1, 0x7f120501
 
     goto :goto_0
 
     :cond_1
-    const v1, 0x7f12056e
+    const v1, 0x7f120579
 
     :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -75,12 +75,12 @@
 
     if-eqz p3, :cond_2
 
-    const v1, 0x7f0800f2
+    const v1, 0x7f0800f9
 
     goto :goto_1
 
     :cond_2
-    const v1, 0x7f0800e9
+    const v1, 0x7f0800ed
 
     :goto_1
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setBackgroundResource(I)V
@@ -135,7 +135,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0194
+    const v0, 0x7f0d019e
 
     return v0
 .end method
@@ -167,7 +167,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -227,7 +227,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a063c
+    const v0, 0x7f0a0656
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -237,7 +237,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog;->codeEditText:Landroid/widget/EditText;
 
-    const v0, 0x7f0a0639
+    const v0, 0x7f0a0653
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -247,7 +247,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog;->cancelButton:Landroid/widget/TextView;
 
-    const v0, 0x7f0a063a
+    const v0, 0x7f0a0654
 
     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 2ac4c47ef4..8359d3976b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
@@ -38,7 +38,7 @@
 .method private configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120fb5
+    const v0, 0x7f120fef
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -69,13 +69,13 @@
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->mfaToggleButton:Landroid/widget/Button;
 
-    const v1, 0x7f1207eb
+    const v1, 0x7f120807
 
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(I)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->mfaToggleButton:Landroid/widget/Button;
 
-    const v1, 0x7f0800f2
+    const v1, 0x7f0800f9
 
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setBackgroundResource(I)V
 
@@ -84,13 +84,13 @@
     :cond_1
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->mfaToggleButton:Landroid/widget/Button;
 
-    const v1, 0x7f1207ec
+    const v1, 0x7f120808
 
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(I)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->mfaToggleButton:Landroid/widget/Button;
 
-    const v1, 0x7f0800e9
+    const v1, 0x7f0800ed
 
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setBackgroundResource(I)V
 
@@ -185,7 +185,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0193
+    const v0, 0x7f0d019d
 
     return v0
 .end method
@@ -286,7 +286,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a063d
+    const v0, 0x7f0a0657
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -296,7 +296,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->mfaToggleButton:Landroid/widget/Button;
 
-    const v0, 0x7f0a0470
+    const v0, 0x7f0a0483
 
     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 5e4f8447ee..3dc7bdd5be 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
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
index ac19c9ffd0..dde1b742ba 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, 0x7f121157
+    const v2, 0x7f121199
 
     const/4 v3, 0x1
 
@@ -257,7 +257,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0136
+    const v0, 0x7f0d013f
 
     return v0
 .end method
@@ -317,7 +317,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -359,7 +359,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0367
+    const v0, 0x7f0a0377
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -367,7 +367,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->confirm:Landroid/view/View;
 
-    const v0, 0x7f0a0366
+    const v0, 0x7f0a0376
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -375,7 +375,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->cancel:Landroid/view/View;
 
-    const v0, 0x7f0a0369
+    const v0, 0x7f0a0379
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -383,7 +383,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->mfaWrap:Landroid/view/View;
 
-    const v0, 0x7f0a0368
+    const v0, 0x7f0a0378
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -393,7 +393,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->mfaInput:Landroid/widget/EditText;
 
-    const v0, 0x7f0a0365
+    const v0, 0x7f0a0375
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$Model.smali
index 23dfd10053..7f14d23e50 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$Model.smali
@@ -71,21 +71,13 @@
 
     invoke-virtual {p2, v1, v2}, Lcom/discord/models/domain/ModelGuild;->isOwner(J)Z
 
-    move-result v1
-
-    if-nez v1, :cond_2
-
-    const/16 v1, 0x20
-
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
-
     move-result p0
 
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->getMfaLevel()I
+    if-nez p0, :cond_2
 
-    move-result p2
+    const/16 p0, 0x20
 
-    invoke-static {v1, p1, p0, p2}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z
+    invoke-static {p0, p1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
 
     move-result p0
 
@@ -148,7 +140,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
@@ -212,7 +204,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v2
 
@@ -234,7 +226,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
index 49c5c41a20..b742342958 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, 0x7f0a0641
+    const v3, 0x7f0a065b
 
     aput v3, v1, v2
 
@@ -114,7 +114,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView;
 
-    const v4, 0x7f121296
+    const v4, 0x7f1212e7
 
     const/4 v5, 0x1
 
@@ -162,7 +162,7 @@
 .method private configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f12101c
+    const v0, 0x7f121059
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -439,7 +439,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -481,7 +481,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0195
+    const v0, 0x7f0d019f
 
     return v0
 .end method
@@ -632,7 +632,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0641
+    const v0, 0x7f0a065b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -642,7 +642,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->vanityInput:Lcom/discord/app/AppEditText;
 
-    const v0, 0x7f0a0644
+    const v0, 0x7f0a065e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -650,7 +650,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->vanityInputContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0645
+    const v0, 0x7f0a065f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -660,7 +660,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->loadingIndicator:Landroid/widget/ProgressBar;
 
-    const v0, 0x7f0a0646
+    const v0, 0x7f0a0660
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -670,7 +670,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->urlPrefix:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0643
+    const v0, 0x7f0a065d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -680,7 +680,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->errorText:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0642
+    const v0, 0x7f0a065c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -690,7 +690,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView;
 
-    const v0, 0x7f0a0647
+    const v0, 0x7f0a0661
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -700,7 +700,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->remove:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0648
+    const v0, 0x7f0a0662
 
     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 38c85d4ae1..232c305a96 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
@@ -70,6 +70,10 @@
 
     move-result-object p2
 
+    const-string p3, "Intent()\n          .putE\u2026RA_GUILD_NAME, guildName)"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-class p3, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
 
     invoke-static {p1, p3, p2}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
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 5958e1b1e6..67d263c912 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
@@ -919,12 +919,16 @@
     :cond_1a
     iget-object v1, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
 
-    const v2, 0x7f120886
+    const v2, 0x7f1208a3
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v1
 
+    const-string v2, "context.getString(R.stri\u2026ettings_filter_all_users)"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     :cond_1b
     iget-object v2, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
 
@@ -946,18 +950,14 @@
 
     move-result-object v2
 
+    const-string v4, "context.getString(AuditL\u2026ate.filter.actionFilter))"
+
+    invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v4, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded;
 
     check-cast v3, Ljava/util/List;
 
-    const-string v5, "usernameFilter"
-
-    invoke-static {v1, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v5, "actionFilter"
-
-    invoke-static {v2, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-direct {v4, v3, v1, v2}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded;-><init>(Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)V
 
     check-cast v4, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model;
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 0c36556237..72d65b1c32 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
@@ -140,7 +140,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 fe3079a41d..6c41c365b5 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
@@ -101,7 +101,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0436
+    .packed-switch 0x7f0a0446
         :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 64ed8c1e47..b0dabc08e5 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
@@ -64,7 +64,7 @@
 
     move-result p1
 
-    const v0, 0x7f0a0450
+    const v0, 0x7f0a0460
 
     if-eq p1, v0, :cond_0
 
@@ -73,7 +73,7 @@
     :cond_0
     new-instance p1, Landroid/view/ContextThemeWrapper;
 
-    const v1, 0x7f130026
+    const v1, 0x7f130027
 
     invoke-direct {p1, p2, v1}, Landroid/view/ContextThemeWrapper;-><init>(Landroid/content/Context;I)V
 
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 e964522172..c0544b3c8d 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 4b4abd6066..4fe65569d2 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali
@@ -188,7 +188,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a05cf
+    const v0, 0x7f0a05e9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -196,7 +196,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05d0
+    const v0, 0x7f0a05ea
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -204,7 +204,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->resultsFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05cc
+    const v0, 0x7f0a05e6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -212,7 +212,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05cd
+    const v0, 0x7f0a05e7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -220,7 +220,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->userFilter$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05ca
+    const v0, 0x7f0a05e4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -477,7 +477,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0170
+    const v0, 0x7f0d017a
 
     return v0
 .end method
@@ -562,7 +562,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f12045b
+    const v1, 0x7f120464
 
     invoke-static {v0, v1}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
@@ -575,7 +575,7 @@
     invoke-virtual {v0}, Lcom/discord/app/AppActivity;->finish()V
 
     :cond_0
-    const v0, 0x7f1208b7
+    const v0, 0x7f1208d4
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder.smali
index 74d6410fea..2e15d9ae3b 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
@@ -245,57 +245,17 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0173
+    const v0, 0x7f0d017d
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a008e
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->actionTypeImage$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0094
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->targetTypeImage$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0090
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0093
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->headerText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0092
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->dateText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a008f
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->arrow$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->actionTypeImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a0095
 
@@ -303,7 +263,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->topContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->targetTypeImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a0091
 
@@ -311,6 +271,46 @@
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0094
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->headerText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0093
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->dateText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0090
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->arrow$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0096
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->topContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0092
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->changeText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
@@ -663,7 +663,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f080228
+    const v0, 0x7f080237
 
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -675,7 +675,7 @@
 
     invoke-static {v0, v8}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0402ad
+    const v1, 0x7f0402b0
 
     invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -690,7 +690,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f08022b
+    const v0, 0x7f08023b
 
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -702,7 +702,7 @@
 
     invoke-static {v0, v8}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0402a6
+    const v1, 0x7f0402a9
 
     invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
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 ae7f664ecb..33b736d4ca 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
@@ -33,7 +33,7 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0174
+    const v0, 0x7f0d017e
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
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 04f5336a9b..5816b9126b 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
@@ -125,11 +125,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0171
+    const v0, 0x7f0d017b
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0089
+    const p1, 0x7f0a008a
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -137,7 +137,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder;->targetImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0087
+    const p1, 0x7f0a0088
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -145,7 +145,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder;->actionImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0085
+    const p1, 0x7f0a0086
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
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 220eb3d5b4..70d42c50d3 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
@@ -125,11 +125,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0172
+    const v0, 0x7f0d017c
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0084
+    const p1, 0x7f0a0085
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -137,7 +137,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0086
+    const p1, 0x7f0a0087
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -145,7 +145,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0085
+    const p1, 0x7f0a0086
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -362,7 +362,7 @@
 
     invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f040199
+    const v2, 0x7f04019b
 
     invoke-static {v0, v2, v5, v6, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
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 dc9d849eca..e0da9ced82 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
@@ -56,6 +56,10 @@
 
     move-result-object p2
 
+    const-string p3, "Intent()\n          .putE\u2026_FILTER_TYPE, filterType)"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-class p3, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;
 
     invoke-static {p1, p3, p2}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
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 e0d97bb006..58bedf4281 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
@@ -100,7 +100,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2;->$context:Landroid/content/Context;
 
-    const v1, 0x7f120886
+    const v1, 0x7f1208a3
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -157,7 +157,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object p3, Lkotlin/sequences/e;->blj:Lkotlin/sequences/e;
+    sget-object p3, Lkotlin/sequences/e;->blD:Lkotlin/sequences/e;
 
     check-cast p3, Lkotlin/sequences/Sequence;
 
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 d068df238a..bdcf261be8 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
@@ -103,7 +103,7 @@
 
     move-result-object p5
 
-    invoke-virtual {p5}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p5}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p5
 
@@ -125,7 +125,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
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 7df115e201..04cbd84b74 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onFilterSelectedCallback$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .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 d8756fcabc..8596e075bd 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$1;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 b520e54fa1..a7915d3655 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$2;->invoke(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 20cb14feeb..191262553f 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewCreated$1;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object 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 7405d9a7e6..986a6f74aa 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali
@@ -126,7 +126,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a008a
+    const v0, 0x7f0a008b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -134,7 +134,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->input$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a008b
+    const v0, 0x7f0a008c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -257,7 +257,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00bb
+    const v0, 0x7f0d00c4
 
     return v0
 .end method
@@ -465,7 +465,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->adapter:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter;
 
-    const p1, 0x7f1208b7
+    const p1, 0x7f1208d4
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -482,13 +482,13 @@
 
     if-nez p1, :cond_1
 
-    const p1, 0x7f120887
+    const p1, 0x7f1208a4
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    const p1, 0x7f120883
+    const p1, 0x7f1208a0
 
     :goto_1
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->setActionBarSubtitle(I)Lkotlin/Unit;
@@ -510,13 +510,13 @@
 
     if-nez p2, :cond_3
 
-    const p2, 0x7f120fa1
+    const p2, 0x7f120fdb
 
     goto :goto_3
 
     :cond_3
     :goto_2
-    const p2, 0x7f120f6c
+    const p2, 0x7f120fa6
 
     :goto_3
     invoke-virtual {p1, p2}, Landroid/widget/EditText;->setHint(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState.smali b/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState.smali
deleted file mode 100644
index 33cb4964c8..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState.smali
+++ /dev/null
@@ -1,137 +0,0 @@
-.class public final enum Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-.super Ljava/lang/Enum;
-.source "BoostInProgressViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x4019
-    name = "BoostState"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field private static final synthetic $VALUES:[Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-.field public static final enum CALL_IN_PROGRESS:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-.field public static final enum COMPLETED:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-.field public static final enum ERROR:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-.field public static final enum NOT_IN_PROGRESS:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 4
-
-    const/4 v0, 0x4
-
-    new-array v0, v0, [Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    new-instance v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    const/4 v2, 0x0
-
-    const-string v3, "NOT_IN_PROGRESS"
-
-    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->NOT_IN_PROGRESS:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    const/4 v2, 0x1
-
-    const-string v3, "CALL_IN_PROGRESS"
-
-    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->CALL_IN_PROGRESS:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    const/4 v2, 0x2
-
-    const-string v3, "COMPLETED"
-
-    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->COMPLETED:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    const/4 v2, 0x3
-
-    const-string v3, "ERROR"
-
-    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ERROR:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    aput-object v1, v0, v2
-
-    sput-object v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->$VALUES:[Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    return-void
-.end method
-
-.method private 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/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    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/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    return-object p0
-.end method
-
-.method public static values()[Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-    .locals 1
-
-    sget-object v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->$VALUES:[Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    invoke-virtual {v0}, [Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded.smali b/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded.smali
deleted file mode 100644
index 123abc4dbe..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded.smali
+++ /dev/null
@@ -1,236 +0,0 @@
-.class public final Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-.super Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-.source "BoostInProgressViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Loaded"
-.end annotation
-
-
-# instance fields
-.field private final boostState:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-.field private final guild:Lcom/discord/models/domain/ModelGuild;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;Lcom/discord/models/domain/ModelGuild;)V
-    .locals 1
-
-    const-string v0, "boostState"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->boostState:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    iput-object p2, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    return-void
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;Lcom/discord/models/domain/ModelGuild;ILjava/lang/Object;)Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-    .locals 0
-
-    and-int/lit8 p4, p3, 0x1
-
-    if-eqz p4, :cond_0
-
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object p1
-
-    :cond_0
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_1
-
-    iget-object p2, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    :cond_1
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->copy(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final component1()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final component2()Lcom/discord/models/domain/ModelGuild;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    return-object v0
-.end method
-
-.method public final copy(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-    .locals 1
-
-    const-string v0, "boostState"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;Lcom/discord/models/domain/ModelGuild;)V
-
-    return-object v0
-.end method
-
-.method public final equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    if-eq p0, p1, :cond_1
-
-    instance-of v0, p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object v0
-
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    iget-object p1, p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->boostState:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    return-object v0
-.end method
-
-.method public final getGuild()Lcom/discord/models/domain/ModelGuild;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    return-object v0
-.end method
-
-.method public final hashCode()I
-    .locals 3
-
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    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 final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "Loaded(boostState="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", guild="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ")"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized.smali b/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized.smali
deleted file mode 100644
index 1666568ca6..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized.smali
+++ /dev/null
@@ -1,175 +0,0 @@
-.class public final Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-.super Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-.source "BoostInProgressViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Uninitialized"
-.end annotation
-
-
-# instance fields
-.field private final boostState:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;)V
-    .locals 1
-
-    const-string v0, "boostState"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;->boostState:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    return-void
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;ILjava/lang/Object;)Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-    .locals 0
-
-    and-int/lit8 p2, p2, 0x1
-
-    if-eqz p2, :cond_0
-
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object p1
-
-    :cond_0
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;->copy(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;)Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final component1()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final copy(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;)Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-    .locals 1
-
-    const-string v0, "boostState"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-
-    invoke-direct {v0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;)V
-
-    return-object v0
-.end method
-
-.method public final equals(Ljava/lang/Object;)Z
-    .locals 1
-
-    if-eq p0, p1, :cond_1
-
-    instance-of v0, p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object v0
-
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object p1
-
-    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;->boostState:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    return-object v0
-.end method
-
-.method public final hashCode()I
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "Uninitialized(boostState="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    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/widgets/servers/boosting/BoostInProgressViewModel$State.smali b/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$State.smali
deleted file mode 100644
index 92203cbbed..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$State.smali
+++ /dev/null
@@ -1,55 +0,0 @@
-.class public abstract Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-.super Ljava/lang/Object;
-.source "BoostInProgressViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "State"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;,
-        Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-    }
-.end annotation
-
-
-# instance fields
-.field private final boostState:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-
-# direct methods
-.method private constructor <init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;->boostState:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    return-void
-.end method
-
-.method public synthetic constructor <init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;->boostState:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$1.smali b/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$1.smali
deleted file mode 100644
index 5f39421ccc..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$1.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$1;
-.super Lkotlin/jvm/internal/l;
-.source "BoostInProgressViewModel.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->boostServer(J)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lrx/Subscription;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$1;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lrx/Subscription;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$1;->invoke(Lrx/Subscription;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lrx/Subscription;)V
-    .locals 1
-
-    const-string v0, "it"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$1;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->access$setBoostSubscription$p(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;Lrx/Subscription;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$2.smali b/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$2.smali
deleted file mode 100644
index c088321b9a..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$2.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$2;
-.super Lkotlin/jvm/internal/l;
-.source "BoostInProgressViewModel.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->boostServer(J)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/utilities/error/Error;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$2;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/utilities/error/Error;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$2;->invoke(Lcom/discord/utilities/error/Error;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF: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}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$2;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    invoke-static {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->access$handleBoostError(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$1.smali b/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$1.smali
deleted file mode 100644
index 46d897af1c..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$1.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$1;
-.super Lkotlin/jvm/internal/l;
-.source "BoostInProgressViewModel.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->removeBoostServer(JJ)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lrx/Subscription;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$1;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lrx/Subscription;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$1;->invoke(Lrx/Subscription;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lrx/Subscription;)V
-    .locals 1
-
-    const-string v0, "it"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$1;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->access$setBoostSubscription$p(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;Lrx/Subscription;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$2.smali b/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$2.smali
deleted file mode 100644
index a81ad2472d..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$2.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$2;
-.super Lkotlin/jvm/internal/l;
-.source "BoostInProgressViewModel.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->removeBoostServer(JJ)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/utilities/error/Error;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$2;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/utilities/error/Error;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$2;->invoke(Lcom/discord/utilities/error/Error;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF: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}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$2;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    invoke-static {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->access$handleBoostError(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$3.smali b/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$3.smali
deleted file mode 100644
index 297d8c3f4f..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$3.smali
+++ /dev/null
@@ -1,79 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$3;
-.super Lkotlin/jvm/internal/l;
-.source "BoostInProgressViewModel.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->removeBoostServer(JJ)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Void;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic $subscriptionId:J
-
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;J)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$3;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    iput-wide p2, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$3;->$subscriptionId:J
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Void;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$3;->invoke(Ljava/lang/Void;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Ljava/lang/Void;)V
-    .locals 2
-
-    sget-object p1, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions;
-
-    iget-wide v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$3;->$subscriptionId:J
-
-    invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->removeNewPremiumGuildSubscription(J)V
-
-    iget-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$3;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    invoke-static {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->access$handleBoostCompleted(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$1.smali b/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$1.smali
deleted file mode 100644
index b986572471..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$1.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$1;
-.super Lkotlin/jvm/internal/l;
-.source "BoostInProgressViewModel.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->setGuildId(J)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lrx/Subscription;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$1;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lrx/Subscription;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$1;->invoke(Lrx/Subscription;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lrx/Subscription;)V
-    .locals 1
-
-    const-string v0, "it"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$1;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->access$setStoreSubscription$p(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;Lrx/Subscription;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel.smali b/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel.smali
deleted file mode 100644
index 1847fe3d44..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel.smali
+++ /dev/null
@@ -1,584 +0,0 @@
-.class public final Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-.super Landroidx/lifecycle/ViewModel;
-.source "BoostInProgressViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;,
-        Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-    }
-.end annotation
-
-
-# instance fields
-.field private final boostStateSubject:Lrx/subjects/BehaviorSubject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/BehaviorSubject<",
-            "Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private boostSubscription:Lrx/Subscription;
-
-.field private state:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-.field private storeSubscription:Lrx/Subscription;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 2
-
-    invoke-direct {p0}, Landroidx/lifecycle/ViewModel;-><init>()V
-
-    new-instance v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-
-    sget-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->NOT_IN_PROGRESS:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;)V
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->state:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->state:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
-    move-result-object v0
-
-    const-string v1, "BehaviorSubject.create(state)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->boostStateSubject:Lrx/subjects/BehaviorSubject;
-
-    return-void
-.end method
-
-.method public static final synthetic access$getBoostSubscription$p(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)Lrx/Subscription;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->boostSubscription:Lrx/Subscription;
-
-    return-object p0
-.end method
-
-.method public static final synthetic access$getStoreSubscription$p(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)Lrx/Subscription;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->storeSubscription:Lrx/Subscription;
-
-    return-object p0
-.end method
-
-.method public static final synthetic access$handleBoostCompleted(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->handleBoostCompleted()V
-
-    return-void
-.end method
-
-.method public static final synthetic access$handleBoostError(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->handleBoostError()V
-
-    return-void
-.end method
-
-.method public static final synthetic access$handleGetGuild(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;Lcom/discord/models/domain/ModelGuild;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->handleGetGuild(Lcom/discord/models/domain/ModelGuild;)V
-
-    return-void
-.end method
-
-.method public static final synthetic access$setBoostSubscription$p(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;Lrx/Subscription;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->boostSubscription:Lrx/Subscription;
-
-    return-void
-.end method
-
-.method public static final synthetic access$setStoreSubscription$p(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;Lrx/Subscription;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->storeSubscription:Lrx/Subscription;
-
-    return-void
-.end method
-
-.method private final handleBoostCompleted()V
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->state:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    instance-of v1, v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-
-    if-eqz v1, :cond_0
-
-    new-instance v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-
-    sget-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->COMPLETED:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;)V
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v1, v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    if-eqz v1, :cond_1
-
-    new-instance v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    sget-object v2, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->COMPLETED:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
-
-    move-result-object v0
-
-    invoke-direct {v1, v2, v0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;Lcom/discord/models/domain/ModelGuild;)V
-
-    move-object v0, v1
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    :goto_0
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->state:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->publishState()V
-
-    return-void
-
-    :cond_1
-    new-instance v0, Lkotlin/k;
-
-    invoke-direct {v0}, Lkotlin/k;-><init>()V
-
-    throw v0
-.end method
-
-.method private final handleBoostError()V
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->state:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    instance-of v1, v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-
-    if-eqz v1, :cond_0
-
-    new-instance v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-
-    sget-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ERROR:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;)V
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v1, v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    if-eqz v1, :cond_1
-
-    new-instance v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    sget-object v2, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ERROR:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
-
-    move-result-object v0
-
-    invoke-direct {v1, v2, v0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;Lcom/discord/models/domain/ModelGuild;)V
-
-    move-object v0, v1
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    :goto_0
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->state:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->publishState()V
-
-    return-void
-
-    :cond_1
-    new-instance v0, Lkotlin/k;
-
-    invoke-direct {v0}, Lkotlin/k;-><init>()V
-
-    throw v0
-.end method
-
-.method private final handleBoostStarted()V
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->state:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    instance-of v1, v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-
-    if-eqz v1, :cond_0
-
-    new-instance v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
-
-    sget-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->CALL_IN_PROGRESS:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;)V
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v1, v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    if-eqz v1, :cond_1
-
-    new-instance v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    sget-object v2, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->CALL_IN_PROGRESS:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
-
-    move-result-object v0
-
-    invoke-direct {v1, v2, v0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;Lcom/discord/models/domain/ModelGuild;)V
-
-    move-object v0, v1
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    :goto_0
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->state:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->publishState()V
-
-    return-void
-
-    :cond_1
-    new-instance v0, Lkotlin/k;
-
-    invoke-direct {v0}, Lkotlin/k;-><init>()V
-
-    throw v0
-.end method
-
-.method private final handleGetGuild(Lcom/discord/models/domain/ModelGuild;)V
-    .locals 2
-
-    new-instance v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
-
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->state:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;Lcom/discord/models/domain/ModelGuild;)V
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->state:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->publishState()V
-
-    return-void
-.end method
-
-.method private final publishState()V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->boostStateSubject:Lrx/subjects/BehaviorSubject;
-
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->state:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final boostServer(J)V
-    .locals 9
-
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->handleBoostStarted()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 {v0, p1, p2}, Lcom/discord/utilities/rest/RestAPI;->subscribeToGuild(J)Lrx/Observable;
-
-    move-result-object p1
-
-    const/4 p2, 0x0
-
-    const/4 v0, 0x1
-
-    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
-
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
-
-    move-result-object v0
-
-    const-string p1, "RestAPI\n        .api\n   \u2026dSchedulers.mainThread())"
-
-    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-class v1, Lcom/discord/stores/StorePremiumGuildSubscription;
-
-    new-instance p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$1;
-
-    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$1;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-
-    move-object v3, p1
-
-    check-cast v3, Lkotlin/jvm/functions/Function1;
-
-    new-instance p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$2;
-
-    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$2;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-
-    move-object v4, p1
-
-    check-cast v4, Lkotlin/jvm/functions/Function1;
-
-    new-instance p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$3;
-
-    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$3;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-
-    move-object v6, p1
-
-    check-cast v6, Lkotlin/jvm/functions/Function1;
-
-    const/4 v2, 0x0
-
-    const/4 v5, 0x0
-
-    const/16 v7, 0x12
-
-    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
-.end method
-
-.method public final getState()Lrx/Observable;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->boostStateSubject:Lrx/subjects/BehaviorSubject;
-
-    check-cast v0, Lrx/Observable;
-
-    return-object v0
-.end method
-
-.method public final onCleared()V
-    .locals 1
-
-    invoke-super {p0}, Landroidx/lifecycle/ViewModel;->onCleared()V
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->storeSubscription:Lrx/Subscription;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    :cond_0
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->boostSubscription:Lrx/Subscription;
-
-    if-eqz v0, :cond_1
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    :cond_1
-    return-void
-.end method
-
-.method public final removeBoostServer(JJ)V
-    .locals 9
-
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->handleBoostStarted()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 {v0, p1, p2, p3, p4}, Lcom/discord/utilities/rest/RestAPI;->unsubscribeToGuild(JJ)Lrx/Observable;
-
-    move-result-object p1
-
-    const/4 p2, 0x0
-
-    const/4 v0, 0x1
-
-    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
-
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
-
-    move-result-object v0
-
-    const-string p1, "RestAPI\n        .api\n   \u2026dSchedulers.mainThread())"
-
-    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-class v1, Lcom/discord/stores/StorePremiumGuildSubscription;
-
-    new-instance p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$1;
-
-    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$1;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-
-    move-object v3, p1
-
-    check-cast v3, Lkotlin/jvm/functions/Function1;
-
-    new-instance p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$2;
-
-    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$2;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-
-    move-object v4, p1
-
-    check-cast v4, Lkotlin/jvm/functions/Function1;
-
-    new-instance p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$3;
-
-    invoke-direct {p1, p0, p3, p4}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$removeBoostServer$3;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;J)V
-
-    move-object v6, p1
-
-    check-cast v6, Lkotlin/jvm/functions/Function1;
-
-    const/4 v2, 0x0
-
-    const/4 v5, 0x0
-
-    const/16 v7, 0x12
-
-    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
-.end method
-
-.method public final setGuildId(J)V
-    .locals 9
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->storeSubscription:Lrx/Subscription;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    :cond_0
-    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
-
-    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Lrx/Observable;->b(Lrx/Scheduler;)Lrx/Observable;
-
-    move-result-object v0
-
-    const-string p1, "StoreStream\n        .get\u2026dSchedulers.mainThread())"
-
-    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-class v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    const/4 v2, 0x0
-
-    new-instance p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$1;
-
-    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$1;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-
-    move-object v3, p1
-
-    check-cast v3, Lkotlin/jvm/functions/Function1;
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    new-instance p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$2;
-
-    move-object p2, p0
-
-    check-cast p2, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    invoke-direct {p1, p2}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$2;-><init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
-
-    move-object v6, p1
-
-    check-cast v6, Lkotlin/jvm/functions/Function1;
-
-    const/16 v7, 0x1a
-
-    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
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkView.smali b/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkView.smali
deleted file mode 100644
index 737f7f37f0..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkView.smali
+++ /dev/null
@@ -1,1031 +0,0 @@
-.class public final Lcom/discord/widgets/servers/boosting/BoostPerkView;
-.super Landroid/widget/RelativeLayout;
-.source "BoostPerkView.kt"
-
-
-# instance fields
-.field private adapter:Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;
-
-.field private container:Landroid/widget/LinearLayout;
-
-.field private contentRecycler:Landroidx/recyclerview/widget/RecyclerView;
-
-.field private contentText:Landroid/widget/TextView;
-
-.field private header:Landroid/view/View;
-
-.field private headerBoostText:Landroid/widget/TextView;
-
-.field private headerText:Landroid/widget/TextView;
-
-.field private headerUnlocked:Landroid/view/View;
-
-
-# direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;)V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
-
-    invoke-direct {p0, p1, p2}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/BoostPerkView;->initialize()V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 1
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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/boosting/BoostPerkView;->initialize()V
-
-    return-void
-.end method
-
-.method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    and-int/lit8 p5, p4, 0x2
-
-    if-eqz p5, :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-direct {p0, p1, p2, p3}, Lcom/discord/widgets/servers/boosting/BoostPerkView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    return-void
-.end method
-
-.method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/servers/boosting/BoostPerkView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    return-void
-.end method
-
-.method private final initialize()V
-    .locals 4
-
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/BoostPerkView;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    move-object v1, p0
-
-    check-cast v1, Landroid/view/ViewGroup;
-
-    const v2, 0x7f0d0092
-
-    invoke-static {v0, v2, v1}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
-
-    const v0, 0x7f0a04f9
-
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/boosting/BoostPerkView;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    const-string v1, "findViewById(R.id.perks_level_header)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->header:Landroid/view/View;
-
-    const v0, 0x7f0a04fb
-
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/boosting/BoostPerkView;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    const-string v1, "findViewById(R.id.perks_level_header_text)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, Landroid/widget/TextView;
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->headerText:Landroid/widget/TextView;
-
-    const v0, 0x7f0a04fa
-
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/boosting/BoostPerkView;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    const-string v1, "findViewById(R.id.perks_level_header_boosts)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, Landroid/widget/TextView;
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->headerBoostText:Landroid/widget/TextView;
-
-    const v0, 0x7f0a04fc
-
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/boosting/BoostPerkView;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    const-string v1, "findViewById(R.id.perks_level_header_unlocked)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->headerUnlocked:Landroid/view/View;
-
-    const v0, 0x7f0a04f7
-
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/boosting/BoostPerkView;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    const-string v1, "findViewById(R.id.perks_level_contents_header)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, Landroid/widget/TextView;
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->contentText:Landroid/widget/TextView;
-
-    const v0, 0x7f0a04f8
-
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/boosting/BoostPerkView;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    const-string v1, "findViewById(R.id.perks_level_contents_recycler)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, Landroidx/recyclerview/widget/RecyclerView;
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->contentRecycler:Landroidx/recyclerview/widget/RecyclerView;
-
-    const v0, 0x7f0a0231
-
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/boosting/BoostPerkView;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    const-string v1, "findViewById(R.id.container)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, Landroid/widget/LinearLayout;
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->container:Landroid/widget/LinearLayout;
-
-    sget-object v0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
-
-    new-instance v1, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;
-
-    iget-object v2, p0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->contentRecycler:Landroidx/recyclerview/widget/RecyclerView;
-
-    const-string v3, "contentRecycler"
-
-    if-nez v2, :cond_0
-
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_0
-    invoke-direct {v1, v2}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
-
-    check-cast v1, 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 v0
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->adapter:Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->contentRecycler:Landroidx/recyclerview/widget/RecyclerView;
-
-    if-nez v0, :cond_1
-
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_1
-    new-instance v1, Lcom/discord/widgets/servers/boosting/BoostPerkView$initialize$1;
-
-    invoke-direct {v1}, Lcom/discord/widgets/servers/boosting/BoostPerkView$initialize$1;-><init>()V
-
-    check-cast v1, Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;
-
-    invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView;->addOnItemTouchListener(Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final configure(II)V
-    .locals 19
-
-    move-object/from16 v0, p0
-
-    move/from16 v1, p1
-
-    sget-object v2, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->INSTANCE:Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;
-
-    const/4 v3, 0x1
-
-    const/4 v4, 0x0
-
-    move/from16 v5, p2
-
-    if-lt v5, v1, :cond_0
-
-    const/4 v5, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v5, 0x0
-
-    :goto_0
-    const-string v6, "header"
-
-    if-eqz v5, :cond_2
-
-    iget-object v7, v0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->header:Landroid/view/View;
-
-    if-nez v7, :cond_1
-
-    invoke-static {v6}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_1
-    const v6, 0x7f0800bd
-
-    invoke-virtual {v7, v6}, Landroid/view/View;->setBackgroundResource(I)V
-
-    goto :goto_1
-
-    :cond_2
-    iget-object v7, v0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->header:Landroid/view/View;
-
-    if-nez v7, :cond_3
-
-    invoke-static {v6}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_3
-    move-object v6, v0
-
-    check-cast v6, Landroid/view/View;
-
-    const v8, 0x7f0402ac
-
-    invoke-static {v6, v8}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
-
-    move-result v6
-
-    invoke-virtual {v7, v6}, Landroid/view/View;->setBackgroundColor(I)V
-
-    :goto_1
-    const/16 v6, 0x32
-
-    const/4 v7, 0x3
-
-    const/4 v8, 0x2
-
-    if-eq v1, v3, :cond_6
-
-    if-eq v1, v8, :cond_5
-
-    if-eq v1, v7, :cond_4
-
-    const/4 v9, 0x0
-
-    goto :goto_2
-
-    :cond_4
-    const/16 v9, 0x32
-
-    goto :goto_2
-
-    :cond_5
-    const/16 v9, 0xa
-
-    goto :goto_2
-
-    :cond_6
-    const/4 v9, 0x2
-
-    :goto_2
-    iget-object v10, v0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->headerText:Landroid/widget/TextView;
-
-    const-string v11, "headerText"
-
-    if-nez v10, :cond_7
-
-    invoke-static {v11}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_7
-    if-eq v1, v3, :cond_a
-
-    if-eq v1, v8, :cond_9
-
-    if-eq v1, v7, :cond_8
-
-    const/4 v12, 0x0
-
-    goto :goto_3
-
-    :cond_8
-    const v12, 0x7f1208b5
-
-    goto :goto_3
-
-    :cond_9
-    const v12, 0x7f1208b4
-
-    goto :goto_3
-
-    :cond_a
-    const v12, 0x7f1208b3
-
-    :goto_3
-    invoke-static {v0, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
-
-    move-result-object v12
-
-    check-cast v12, Ljava/lang/CharSequence;
-
-    invoke-virtual {v10, v12}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    if-eq v1, v3, :cond_f
-
-    if-eq v1, v8, :cond_d
-
-    if-eq v1, v7, :cond_b
-
-    const/4 v13, 0x0
-
-    goto :goto_4
-
-    :cond_b
-    if-eqz v5, :cond_c
-
-    const v10, 0x7f08031e
-
-    const v13, 0x7f08031e
-
-    goto :goto_4
-
-    :cond_c
-    const v10, 0x7f08031f
-
-    const v13, 0x7f08031f
-
-    goto :goto_4
-
-    :cond_d
-    if-eqz v5, :cond_e
-
-    const v10, 0x7f08031c
-
-    const v13, 0x7f08031c
-
-    goto :goto_4
-
-    :cond_e
-    const v10, 0x7f08031d
-
-    const v13, 0x7f08031d
-
-    goto :goto_4
-
-    :cond_f
-    if-eqz v5, :cond_10
-
-    const v10, 0x7f08031a
-
-    const v13, 0x7f08031a
-
-    goto :goto_4
-
-    :cond_10
-    const v10, 0x7f08031b
-
-    const v13, 0x7f08031b
-
-    :goto_4
-    iget-object v12, v0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->headerText:Landroid/widget/TextView;
-
-    if-nez v12, :cond_11
-
-    invoke-static {v11}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_11
-    const/4 v14, 0x0
-
-    const/4 v15, 0x0
-
-    const/16 v16, 0x0
-
-    const/16 v17, 0xe
-
-    const/16 v18, 0x0
-
-    invoke-static/range {v12 .. v18}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
-
-    iget-object v10, v0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->headerText:Landroid/widget/TextView;
-
-    if-nez v10, :cond_12
-
-    invoke-static {v11}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_12
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/BoostPerkView;->getContext()Landroid/content/Context;
-
-    move-result-object v11
-
-    if-eqz v5, :cond_13
-
-    const v12, 0x7f060149
-
-    invoke-static {v11, v12}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
-
-    move-result v11
-
-    goto :goto_5
-
-    :cond_13
-    const v12, 0x7f040298
-
-    invoke-static {v11, v12}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
-
-    move-result v11
-
-    :goto_5
-    invoke-virtual {v10, v11}, Landroid/widget/TextView;->setTextColor(I)V
-
-    iget-object v10, v0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->headerBoostText:Landroid/widget/TextView;
-
-    const-string v11, "headerBoostText"
-
-    if-nez v10, :cond_14
-
-    invoke-static {v11}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_14
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/BoostPerkView;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v12
-
-    const v13, 0x7f10006d
-
-    new-array v14, v3, [Ljava/lang/Object;
-
-    invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v15
-
-    aput-object v15, v14, v4
-
-    invoke-virtual {v12, v13, v9, v14}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/lang/CharSequence;
-
-    invoke-virtual {v10, v9}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    iget-object v9, v0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->headerBoostText:Landroid/widget/TextView;
-
-    if-nez v9, :cond_15
-
-    invoke-static {v11}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_15
-    check-cast v9, Landroid/view/View;
-
-    xor-int/lit8 v10, v5, 0x1
-
-    const/4 v11, 0x0
-
-    invoke-static {v9, v10, v4, v8, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    iget-object v9, v0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->headerUnlocked:Landroid/view/View;
-
-    if-nez v9, :cond_16
-
-    const-string v10, "headerUnlocked"
-
-    invoke-static {v10}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_16
-    invoke-static {v9, v5, v4, v8, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    iget-object v9, v0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->contentText:Landroid/widget/TextView;
-
-    if-nez v9, :cond_17
-
-    const-string v10, "contentText"
-
-    invoke-static {v10}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_17
-    if-eq v1, v3, :cond_18
-
-    const v10, 0x7f1208b1
-
-    invoke-static {v0, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
-
-    move-result-object v10
-
-    check-cast v10, Ljava/lang/CharSequence;
-
-    goto :goto_6
-
-    :cond_18
-    const v10, 0x7f1208af
-
-    invoke-static {v0, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
-
-    move-result-object v10
-
-    check-cast v10, Ljava/lang/CharSequence;
-
-    :goto_6
-    invoke-virtual {v9, v10}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    const/4 v9, 0x5
-
-    const/4 v10, 0x4
-
-    const v11, 0x7f1208ac
-
-    const v12, 0x7f0802a1
-
-    const v13, 0x7f1208ad
-
-    const v14, 0x7f080362
-
-    if-eq v1, v3, :cond_1b
-
-    if-eq v1, v8, :cond_1a
-
-    if-eq v1, v7, :cond_19
-
-    sget-object v1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
-
-    check-cast v1, Ljava/util/List;
-
-    goto/16 :goto_7
-
-    :cond_19
-    new-array v1, v10, [Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    new-instance v6, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    invoke-virtual {v2, v14, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v9
-
-    new-array v10, v8, [Ljava/lang/Object;
-
-    const/16 v14, 0x64
-
-    invoke-static {v14}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v14
-
-    aput-object v14, v10, v4
-
-    invoke-static {v7, v4}, Lcom/discord/models/domain/ModelGuild;->getEmojiMaxCount(IZ)I
-
-    move-result v14
-
-    invoke-static {v14}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v14
-
-    aput-object v14, v10, v3
-
-    invoke-static {v0, v13, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v10
-
-    invoke-direct {v6, v9, v10}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v6, v1, v4
-
-    new-instance v6, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    invoke-virtual {v2, v12, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v9
-
-    new-array v10, v3, [Ljava/lang/Object;
-
-    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v12
-
-    sget-object v13, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    invoke-static {v12, v13}, Lcom/discord/models/domain/ModelGuild;->getMaxVoiceBitrateKbps(Ljava/lang/Integer;Ljava/lang/Boolean;)I
-
-    move-result v12
-
-    invoke-static {v12}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v12
-
-    aput-object v12, v10, v4
-
-    invoke-static {v0, v11, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v10
-
-    invoke-direct {v6, v9, v10}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v6, v1, v3
-
-    new-instance v6, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    const v9, 0x7f08038f
-
-    invoke-virtual {v2, v9, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v9
-
-    const v10, 0x7f1208ae
-
-    new-array v11, v3, [Ljava/lang/Object;
-
-    const v12, 0x7f12059d
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v13
-
-    invoke-static {v13}, Lcom/discord/models/domain/ModelGuild;->getMaxFileSizeMB(Ljava/lang/Integer;)I
-
-    move-result v13
-
-    invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v13
-
-    aput-object v13, v3, v4
-
-    invoke-static {v0, v12, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v3
-
-    aput-object v3, v11, v4
-
-    invoke-static {v0, v10, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-direct {v6, v9, v3}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v6, v1, v8
-
-    new-instance v3, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    const v4, 0x7f080368
-
-    invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v2
-
-    const v4, 0x7f1208ab
-
-    invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-direct {v3, v2, v4}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v3, v1, v7
-
-    invoke-static {v1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v1
-
-    goto/16 :goto_7
-
-    :cond_1a
-    new-array v1, v9, [Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    new-instance v9, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    invoke-virtual {v2, v14, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v14
-
-    new-array v15, v8, [Ljava/lang/Object;
-
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v6
-
-    aput-object v6, v15, v4
-
-    invoke-static {v8, v4}, Lcom/discord/models/domain/ModelGuild;->getEmojiMaxCount(IZ)I
-
-    move-result v6
-
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v6
-
-    aput-object v6, v15, v3
-
-    invoke-static {v0, v13, v15}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-direct {v9, v14, v6}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v9, v1, v4
-
-    new-instance v6, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    invoke-virtual {v2, v12, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v9
-
-    new-array v12, v3, [Ljava/lang/Object;
-
-    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v13
-
-    sget-object v14, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    invoke-static {v13, v14}, Lcom/discord/models/domain/ModelGuild;->getMaxVoiceBitrateKbps(Ljava/lang/Integer;Ljava/lang/Boolean;)I
-
-    move-result v13
-
-    invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v13
-
-    aput-object v13, v12, v4
-
-    invoke-static {v0, v11, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-direct {v6, v9, v11}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v6, v1, v3
-
-    new-instance v6, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    const v9, 0x7f08038f
-
-    invoke-virtual {v2, v9, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v9
-
-    const v11, 0x7f1208ae
-
-    new-array v12, v3, [Ljava/lang/Object;
-
-    const v13, 0x7f12059d
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v14
-
-    invoke-static {v14}, Lcom/discord/models/domain/ModelGuild;->getMaxFileSizeMB(Ljava/lang/Integer;)I
-
-    move-result v14
-
-    invoke-static {v14}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v14
-
-    aput-object v14, v3, v4
-
-    invoke-static {v0, v13, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v3
-
-    aput-object v3, v12, v4
-
-    invoke-static {v0, v11, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-direct {v6, v9, v3}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v6, v1, v8
-
-    new-instance v3, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    const v4, 0x7f0802bd
-
-    invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v4
-
-    const v6, 0x7f1208a9
-
-    invoke-static {v0, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-direct {v3, v4, v6}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v3, v1, v7
-
-    new-instance v3, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    const v4, 0x7f08029c
-
-    invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v2
-
-    const v4, 0x7f1208aa
-
-    invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-direct {v3, v2, v4}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v3, v1, v10
-
-    invoke-static {v1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v1
-
-    goto/16 :goto_7
-
-    :cond_1b
-    new-array v1, v9, [Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    new-instance v9, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    invoke-virtual {v2, v14, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v14
-
-    new-array v15, v8, [Ljava/lang/Object;
-
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v6
-
-    aput-object v6, v15, v4
-
-    invoke-static {v3, v4}, Lcom/discord/models/domain/ModelGuild;->getEmojiMaxCount(IZ)I
-
-    move-result v6
-
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v6
-
-    aput-object v6, v15, v3
-
-    invoke-static {v0, v13, v15}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-direct {v9, v14, v6}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v9, v1, v4
-
-    new-instance v6, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    invoke-virtual {v2, v12, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v9
-
-    new-array v12, v3, [Ljava/lang/Object;
-
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v13
-
-    sget-object v14, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    invoke-static {v13, v14}, Lcom/discord/models/domain/ModelGuild;->getMaxVoiceBitrateKbps(Ljava/lang/Integer;Ljava/lang/Boolean;)I
-
-    move-result v13
-
-    invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v13
-
-    aput-object v13, v12, v4
-
-    invoke-static {v0, v11, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-direct {v6, v9, v4}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v6, v1, v3
-
-    new-instance v3, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    const v4, 0x7f0802f9
-
-    invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v4
-
-    const v6, 0x7f1208a6
-
-    invoke-static {v0, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-direct {v3, v4, v6}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v3, v1, v8
-
-    new-instance v3, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    const v4, 0x7f0802bd
-
-    invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v4
-
-    const v6, 0x7f1208a7
-
-    invoke-static {v0, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-direct {v3, v4, v6}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v3, v1, v7
-
-    new-instance v3, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    const v4, 0x7f08029c
-
-    invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
-
-    move-result v2
-
-    const v4, 0x7f1208a8
-
-    invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-direct {v3, v2, v4}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    aput-object v3, v1, v10
-
-    invoke-static {v1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v1
-
-    :goto_7
-    iget-object v2, v0, Lcom/discord/widgets/servers/boosting/BoostPerkView;->adapter:Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;
-
-    if-nez v2, :cond_1c
-
-    const-string v3, "adapter"
-
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_1c
-    invoke-virtual {v2, v1}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;->configure(Ljava/util/List;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem.smali b/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem.smali
deleted file mode 100644
index 42c25db16d..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem.smali
+++ /dev/null
@@ -1,264 +0,0 @@
-.class public final Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-.super Ljava/lang/Object;
-.source "BoostPerkViewAdapter.kt"
-
-# interfaces
-.implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "BoostPerkViewListItem"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem$Companion;
-    }
-.end annotation
-
-
-# static fields
-.field public static final Companion:Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem$Companion;
-
-.field public static final TYPE_LIST_ITEM:I = 0x1
-
-
-# instance fields
-.field private final iconResId:I
-
-.field private final text:Ljava/lang/String;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->Companion:Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem$Companion;
-
-    return-void
-.end method
-
-.method public constructor <init>(ILjava/lang/String;)V
-    .locals 1
-
-    const-string v0, "text"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->iconResId:I
-
-    iput-object p2, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->text:Ljava/lang/String;
-
-    return-void
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;ILjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-    .locals 0
-
-    and-int/lit8 p4, p3, 0x1
-
-    if-eqz p4, :cond_0
-
-    iget p1, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->iconResId:I
-
-    :cond_0
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_1
-
-    iget-object p2, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->text:Ljava/lang/String;
-
-    :cond_1
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->copy(ILjava/lang/String;)Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final component1()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->iconResId:I
-
-    return v0
-.end method
-
-.method public final component2()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->text:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final copy(ILjava/lang/String;)Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-    .locals 1
-
-    const-string v0, "text"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;-><init>(ILjava/lang/String;)V
-
-    return-object v0
-.end method
-
-.method public final equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x1
-
-    if-eq p0, p1, :cond_2
-
-    instance-of v1, p1, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
-
-    check-cast p1, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
-
-    iget v1, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->iconResId:I
-
-    iget v3, p1, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->iconResId:I
-
-    if-ne v1, v3, :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, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->text:Ljava/lang/String;
-
-    iget-object p1, p1, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->text:Ljava/lang/String;
-
-    invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    return v2
-
-    :cond_2
-    :goto_1
-    return v0
-.end method
-
-.method public final getIconResId()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->iconResId:I
-
-    return v0
-.end method
-
-.method public final getKey()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->text:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final getText()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->text:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final getType()I
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public final hashCode()I
-    .locals 2
-
-    iget v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->iconResId:I
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->text:Ljava/lang/String;
-
-    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
-
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "BoostPerkViewListItem(iconResId="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget v1, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->iconResId:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v1, ", text="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->text: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;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$WhenMappings.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$WhenMappings.smali
deleted file mode 100644
index d75f903275..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$WhenMappings.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$WhenMappings;
-.super Ljava/lang/Object;
-
-
-# static fields
-.field public static final synthetic $EnumSwitchMapping$0:[I
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 3
-
-    invoke-static {}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->values()[Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object v0
-
-    array-length v0, v0
-
-    new-array v0, v0, [I
-
-    sput-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
-
-    sget-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->NOT_IN_PROGRESS:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ordinal()I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    aput v2, v0, v1
-
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
-
-    sget-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->CALL_IN_PROGRESS:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ordinal()I
-
-    move-result v1
-
-    const/4 v2, 0x2
-
-    aput v2, v0, v1
-
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
-
-    sget-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ERROR:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ordinal()I
-
-    move-result v1
-
-    const/4 v2, 0x3
-
-    aput v2, v0, v1
-
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
-
-    sget-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->COMPLETED:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ordinal()I
-
-    move-result v1
-
-    const/4 v2, 0x4
-
-    aput v2, v0, v1
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onResume$1.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onResume$1.smali
deleted file mode 100644
index 3047323518..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onResume$1.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.class final synthetic Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onResume$1;
-.super Lkotlin/jvm/internal/j;
-.source "WidgetServerBoostConfirmation.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->onResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1018
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/j;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;)V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><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/servers/boosting/WidgetServerBoostConfirmation;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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/boosting/BoostInProgressViewModel$State;)V"
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onResume$1;->invoke(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;)V
-    .locals 1
-
-    const-string v0, "p1"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onResume$1;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->access$configureUI(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$1.smali
deleted file mode 100644
index f23f613432..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$1.smali
+++ /dev/null
@@ -1,55 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$1;
-.super Ljava/lang/Object;
-.source "WidgetServerBoostConfirmation.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 2
-
-    iget-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
-
-    invoke-static {p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->access$getViewModel$p(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;)Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
-
-    invoke-static {v0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->access$getGuildId$p(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;)J
-
-    move-result-wide v0
-
-    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->boostServer(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$2.smali
deleted file mode 100644
index d0acd9bf49..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$2.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$2;
-.super Ljava/lang/Object;
-.source "WidgetServerBoostConfirmation.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$2;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
-
-    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/servers/boosting/WidgetServerBoostConfirmation$onViewBound$2;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->onBackPressed()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$3.smali
deleted file mode 100644
index acc79cdea0..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$3.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$3;
-.super Ljava/lang/Object;
-.source "WidgetServerBoostConfirmation.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$3;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
-
-    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/servers/boosting/WidgetServerBoostConfirmation$onViewBound$3;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->onBackPressed()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model.smali
deleted file mode 100644
index d150a70178..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model.smali
+++ /dev/null
@@ -1,388 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;
-.super Ljava/lang/Object;
-.source "WidgetServerBoostStatus.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = "Model"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion;
-    }
-.end annotation
-
-
-# static fields
-.field public static final Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion;
-
-
-# instance fields
-.field private final guild:Lcom/discord/models/domain/ModelGuild;
-
-.field private final meUser:Lcom/discord/models/domain/ModelUser;
-
-.field private final premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-.field private final premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
-    .locals 1
-
-    const-string v0, "meUser"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "premiumGuildSubscriptionState"
-
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "premiumSubscriptionState"
-
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    iput-object p2, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    iput-object p3, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    iput-object p4, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
-
-    return-void
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;ILjava/lang/Object;)Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;
-    .locals 0
-
-    and-int/lit8 p6, p5, 0x1
-
-    if-eqz p6, :cond_0
-
-    iget-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    :cond_0
-    and-int/lit8 p6, p5, 0x2
-
-    if-eqz p6, :cond_1
-
-    iget-object p2, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    :cond_1
-    and-int/lit8 p6, p5, 0x4
-
-    if-eqz p6, :cond_2
-
-    iget-object p3, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    :cond_2
-    and-int/lit8 p5, p5, 0x8
-
-    if-eqz p5, :cond_3
-
-    iget-object p4, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
-
-    :cond_3
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final component1()Lcom/discord/models/domain/ModelUser;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    return-object v0
-.end method
-
-.method public final component2()Lcom/discord/models/domain/ModelGuild;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    return-object v0
-.end method
-
-.method public final component3()Lcom/discord/stores/StorePremiumGuildSubscription$State;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    return-object v0
-.end method
-
-.method public final component4()Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
-
-    return-object v0
-.end method
-
-.method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;
-    .locals 1
-
-    const-string v0, "meUser"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "premiumGuildSubscriptionState"
-
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "premiumSubscriptionState"
-
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;
-
-    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
-
-    return-object v0
-.end method
-
-.method public final equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    if-eq p0, p1, :cond_1
-
-    instance-of v0, p1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    iget-object v1, p1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    iget-object v1, p1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    iget-object v1, p1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
-
-    iget-object p1, p1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
-
-    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getGuild()Lcom/discord/models/domain/ModelGuild;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    return-object v0
-.end method
-
-.method public final getMeUser()Lcom/discord/models/domain/ModelUser;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    return-object v0
-.end method
-
-.method public final getPremiumGuildSubscriptionState()Lcom/discord/stores/StorePremiumGuildSubscription$State;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    return-object v0
-.end method
-
-.method public final getPremiumSubscriptionState()Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
-
-    return-object v0
-.end method
-
-.method public final hashCode()I
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v2
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_1
-    add-int/2addr v0, v2
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    if-eqz v2, :cond_2
-
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    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/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
-
-    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 final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "Model(meUser="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", guild="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", premiumGuildSubscriptionState="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", premiumSubscriptionState="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ")"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$1.smali
deleted file mode 100644
index 8b4a5b2f98..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$1.smali
+++ /dev/null
@@ -1,45 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$1;
-.super Ljava/lang/Object;
-.source "WidgetServerBoostStatus.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->configureUI(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$1;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-    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/servers/boosting/WidgetServerBoostStatus$configureUI$1;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-    invoke-static {p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->access$fetchData(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$3.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$3.smali
deleted file mode 100644
index 185ab5d233..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$3.smali
+++ /dev/null
@@ -1,74 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$3;
-.super Ljava/lang/Object;
-.source "WidgetServerBoostStatus.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->configureUI(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $hasAppleSubscription:Z
-
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;Z)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$3;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-    iput-boolean p2, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$3;->$hasAppleSubscription:Z
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 3
-
-    iget-boolean p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$3;->$hasAppleSubscription:Z
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$3;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->requireContext()Landroid/content/Context;
-
-    move-result-object p1
-
-    const-string v0, "requireContext()"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$3;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-    const v1, 0x7f1200de
-
-    invoke-virtual {v0, v1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getString(I)Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v1, 0x4
-
-    const/4 v2, 0x0
-
-    invoke-static {p1, v0, v2, v1, v2}, Lcom/discord/utilities/uri/UriHandler;->handle$default(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$4.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$4.smali
deleted file mode 100644
index 6e3046b6f9..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$4.smali
+++ /dev/null
@@ -1,63 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$4;
-.super Ljava/lang/Object;
-.source "WidgetServerBoostStatus.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->configureUI(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$4;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 3
-
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion;
-
-    const-string v1, "it"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(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}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$4;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-    invoke-static {v1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->access$getGuildId$p(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)J
-
-    move-result-wide v1
-
-    invoke-virtual {v0, p1, v1, v2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion;->create(Landroid/content/Context;J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$5.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$5.smali
deleted file mode 100644
index aaaac7f48c..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$5.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$5;
-.super Ljava/lang/Object;
-.source "WidgetServerBoostStatus.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->configureUI(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$5;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$5;
-
-    invoke-direct {v0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$5;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$5;->INSTANCE:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$5;
-
-    return-void
-.end method
-
-.method 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/widgets/settings/nitro/WidgetSettingsBoost;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion;
-
-    const-string v1, "it"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(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}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion;->launch(Landroid/content/Context;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$onActivityCreated$1.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$onActivityCreated$1.smali
deleted file mode 100644
index 7def6e6c37..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$onActivityCreated$1.smali
+++ /dev/null
@@ -1,62 +0,0 @@
-.class public final Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$onActivityCreated$1;
-.super Ljava/lang/Object;
-.source "WidgetServerBoostStatus.kt"
-
-# interfaces
-.implements Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->onActivityCreated(Landroid/os/Bundle;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$onActivityCreated$1;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onPageScrollStateChanged(I)V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final onPageScrolled(IFI)V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final onPageSelected(I)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$onActivityCreated$1;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->access$configureLevelBubbles(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;I)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$onViewBoundOrOnResume$1.smali
deleted file mode 100644
index 617dc5516c..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$onViewBoundOrOnResume$1.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.class final synthetic Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$onViewBoundOrOnResume$1;
-.super Lkotlin/jvm/internal/j;
-.source "WidgetServerBoostStatus.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->onViewBoundOrOnResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1018
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/j;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><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/servers/boosting/WidgetServerBoostStatus;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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/boosting/WidgetServerBoostStatus$Model;)V"
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;)V
-    .locals 1
-
-    const-string v0, "p1"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$onViewBoundOrOnResume$1;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->access$configureUI(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$WhenMappings.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$WhenMappings.smali
deleted file mode 100644
index 53f111918f..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$WhenMappings.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$WhenMappings;
-.super Ljava/lang/Object;
-
-
-# static fields
-.field public static final synthetic $EnumSwitchMapping$0:[I
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 3
-
-    invoke-static {}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->values()[Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    move-result-object v0
-
-    array-length v0, v0
-
-    new-array v0, v0, [I
-
-    sput-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
-
-    sget-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->NOT_IN_PROGRESS:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ordinal()I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    aput v2, v0, v1
-
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
-
-    sget-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->CALL_IN_PROGRESS:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ordinal()I
-
-    move-result v1
-
-    const/4 v2, 0x2
-
-    aput v2, v0, v1
-
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
-
-    sget-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ERROR:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ordinal()I
-
-    move-result v1
-
-    const/4 v2, 0x3
-
-    aput v2, v0, v1
-
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
-
-    sget-object v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->COMPLETED:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ordinal()I
-
-    move-result v1
-
-    const/4 v2, 0x4
-
-    aput v2, v0, v1
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onResume$1.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onResume$1.smali
deleted file mode 100644
index d534dfe8c9..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onResume$1.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onResume$1;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetServerRemoveBoostConfirmation.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->onResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onResume$1;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onResume$1;->invoke(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onResume$1;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
-
-    const-string v1, "it"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->access$configureUI(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$1.smali
deleted file mode 100644
index 655680054f..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$1.smali
+++ /dev/null
@@ -1,61 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$1;
-.super Ljava/lang/Object;
-.source "WidgetServerRemoveBoostConfirmation.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 4
-
-    iget-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
-
-    invoke-static {p1}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->access$getViewModel$p(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;)Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
-
-    invoke-static {v0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->access$getGuildId$p(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;)J
-
-    move-result-wide v0
-
-    iget-object v2, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
-
-    invoke-static {v2}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->access$getSubscriptionId$p(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;)J
-
-    move-result-wide v2
-
-    invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->removeBoostServer(JJ)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$2.smali
deleted file mode 100644
index 1dd39b5ff4..0000000000
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$2.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$2;
-.super Ljava/lang/Object;
-.source "WidgetServerRemoveBoostConfirmation.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$2;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
-
-    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/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$2;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->onBackPressed()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState.smali
new file mode 100644
index 0000000000..c63ff2956e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState.smali
@@ -0,0 +1,137 @@
+.class public final enum Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+.super Ljava/lang/Enum;
+.source "PremiumGuildSubscriptionInProgressViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "PremiumGuildSubscriptionState"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final synthetic $VALUES:[Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+.field public static final enum CALL_IN_PROGRESS:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+.field public static final enum COMPLETED:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+.field public static final enum ERROR:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+.field public static final enum NOT_IN_PROGRESS:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x4
+
+    new-array v0, v0, [Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    new-instance v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    const/4 v2, 0x0
+
+    const-string v3, "NOT_IN_PROGRESS"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->NOT_IN_PROGRESS:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    const/4 v2, 0x1
+
+    const-string v3, "CALL_IN_PROGRESS"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->CALL_IN_PROGRESS:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    const/4 v2, 0x2
+
+    const-string v3, "COMPLETED"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->COMPLETED:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    const/4 v2, 0x3
+
+    const-string v3, "ERROR"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ERROR:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->$VALUES:[Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    return-void
+.end method
+
+.method private 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/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+    .locals 1
+
+    const-class v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    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/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+    .locals 1
+
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->$VALUES:[Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    invoke-virtual {v0}, [Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded.smali
new file mode 100644
index 0000000000..8a69575f0e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded.smali
@@ -0,0 +1,236 @@
+.class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+.super Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+.source "PremiumGuildSubscriptionInProgressViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Loaded"
+.end annotation
+
+
+# instance fields
+.field private final guild:Lcom/discord/models/domain/ModelGuild;
+
+.field private final premiumGuildSubscriptionState:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;)V
+    .locals 1
+
+    const-string v0, "premiumGuildSubscriptionState"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->premiumGuildSubscriptionState:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    iput-object p2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;ILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+    .locals 0
+
+    and-int/lit8 p4, p3, 0x1
+
+    if-eqz p4, :cond_0
+
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object p1
+
+    :cond_0
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_1
+
+    iget-object p2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    :cond_1
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->copy(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final component2()Lcom/discord/models/domain/ModelGuild;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+    .locals 1
+
+    const-string v0, "premiumGuildSubscriptionState"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    iget-object p1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getGuild()Lcom/discord/models/domain/ModelGuild;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    return-object v0
+.end method
+
+.method public final getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->premiumGuildSubscriptionState:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    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 final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "Loaded(premiumGuildSubscriptionState="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", guild="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized.smali
new file mode 100644
index 0000000000..6ee5de9023
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized.smali
@@ -0,0 +1,175 @@
+.class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+.super Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+.source "PremiumGuildSubscriptionInProgressViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Uninitialized"
+.end annotation
+
+
+# instance fields
+.field private final premiumGuildSubscriptionState:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)V
+    .locals 1
+
+    const-string v0, "premiumGuildSubscriptionState"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;->premiumGuildSubscriptionState:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;ILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+    .locals 0
+
+    and-int/lit8 p2, p2, 0x1
+
+    if-eqz p2, :cond_0
+
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object p1
+
+    :cond_0
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;->copy(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+    .locals 1
+
+    const-string v0, "premiumGuildSubscriptionState"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+
+    invoke-direct {v0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object p1
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;->premiumGuildSubscriptionState:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "Uninitialized(premiumGuildSubscriptionState="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    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/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State.smali
new file mode 100644
index 0000000000..b95cce35d1
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State.smali
@@ -0,0 +1,55 @@
+.class public abstract Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+.super Ljava/lang/Object;
+.source "PremiumGuildSubscriptionInProgressViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "State"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;,
+        Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+    }
+.end annotation
+
+
+# instance fields
+.field private final premiumGuildSubscriptionState:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+
+# direct methods
+.method private constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;->premiumGuildSubscriptionState:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;->premiumGuildSubscriptionState:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$1.smali
new file mode 100644
index 0000000000..2e87ddd0f6
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$1.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$1;
+.super Lkotlin/jvm/internal/l;
+.source "PremiumGuildSubscriptionInProgressViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->removePremiumGuildSubscription(JJ)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lrx/Subscription;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$1;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lrx/Subscription;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$1;->invoke(Lrx/Subscription;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lrx/Subscription;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$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
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$2.smali
new file mode 100644
index 0000000000..d8f6c61024
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$2.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$2;
+.super Lkotlin/jvm/internal/l;
+.source "PremiumGuildSubscriptionInProgressViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->removePremiumGuildSubscription(JJ)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/error/Error;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$2;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/error/Error;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$2;->invoke(Lcom/discord/utilities/error/Error;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ: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}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$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
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3.smali
new file mode 100644
index 0000000000..dcac4d1bfa
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3.smali
@@ -0,0 +1,79 @@
+.class final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;
+.super Lkotlin/jvm/internal/l;
+.source "PremiumGuildSubscriptionInProgressViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->removePremiumGuildSubscription(JJ)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Void;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $subscriptionId:J
+
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;J)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+    iput-wide p2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;->$subscriptionId:J
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Void;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;->invoke(Ljava/lang/Void;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/Void;)V
+    .locals 2
+
+    sget-object p1, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions;
+
+    iget-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;->$subscriptionId:J
+
+    invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->removeNewPremiumGuildSubscription(J)V
+
+    iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$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
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$1.smali
new file mode 100644
index 0000000000..32c76ff153
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$1.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$1;
+.super Lkotlin/jvm/internal/l;
+.source "PremiumGuildSubscriptionInProgressViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->setGuildId(J)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lrx/Subscription;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$1;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lrx/Subscription;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$1;->invoke(Lrx/Subscription;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lrx/Subscription;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$1;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->access$setStoreSubscription$p(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;Lrx/Subscription;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$2.smali
similarity index 57%
rename from com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$2.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$2.smali
index f54dd1fb57..c8f8df9d1a 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$2.smali
@@ -1,6 +1,6 @@
-.class final synthetic Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$2;
+.class final synthetic Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$2;
 .super Lkotlin/jvm/internal/j;
-.source "BoostInProgressViewModel.kt"
+.source "PremiumGuildSubscriptionInProgressViewModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->setGuildId(J)V
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->setGuildId(J)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
     .locals 1
 
     const/4 v0, 0x1
@@ -51,7 +51,7 @@
 .method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
     .locals 1
 
-    const-class v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    const-class v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -73,9 +73,9 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelGuild;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$2;->invoke(Lcom/discord/models/domain/ModelGuild;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$2;->invoke(Lcom/discord/models/domain/ModelGuild;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,11 +87,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$setGuildId$2;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$2;->receiver:Ljava/lang/Object;
 
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
-    invoke-static {v0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->access$handleGetGuild(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;Lcom/discord/models/domain/ModelGuild;)V
+    invoke-static {v0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->access$handleGetGuild(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;Lcom/discord/models/domain/ModelGuild;)V
 
     return-void
 .end method
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
new file mode 100644
index 0000000000..c5a2be4653
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1;
+.super Lkotlin/jvm/internal/l;
+.source "PremiumGuildSubscriptionInProgressViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(J)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lrx/Subscription;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lrx/Subscription;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1;->invoke(Lrx/Subscription;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lrx/Subscription;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.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
new file mode 100644
index 0000000000..7d09879cd1
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2;
+.super Lkotlin/jvm/internal/l;
+.source "PremiumGuildSubscriptionInProgressViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(J)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/error/Error;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/error/Error;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2;->invoke(Lcom/discord/utilities/error/Error;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ: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}, Lkotlin/jvm/internal/k;->h(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
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$3.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3.smali
similarity index 50%
rename from com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$3.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3.smali
index 6d3b745a66..f97fc4b987 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$3;
+.class final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3;
 .super Lkotlin/jvm/internal/l;
-.source "BoostInProgressViewModel.kt"
+.source "PremiumGuildSubscriptionInProgressViewModel.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->boostServer(J)V
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(J)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$3;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     const/4 p1, 0x1
 
@@ -51,9 +51,9 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$3;->invoke(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3;->invoke(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -69,9 +69,9 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->appendNewPremiumGuildSubscription(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$boostServer$3;->this$0:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    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/boosting/BoostInProgressViewModel;->access$handleBoostCompleted(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
+    invoke-static {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->access$handlePremiumGuildSubscriptionCompleted(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
 
     return-void
 .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
new file mode 100644
index 0000000000..4722025019
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel.smali
@@ -0,0 +1,584 @@
+.class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+.super Landroidx/lifecycle/ViewModel;
+.source "PremiumGuildSubscriptionInProgressViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;,
+        Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+    }
+.end annotation
+
+
+# instance fields
+.field private premiumGuildSubscribingSubscription:Lrx/Subscription;
+
+.field private final premiumGuildSubscriptionStateSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private state:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+.field private storeSubscription:Lrx/Subscription;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Landroidx/lifecycle/ViewModel;-><init>()V
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->NOT_IN_PROGRESS:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)V
+
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->state:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->state:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object v0
+
+    const-string v1, "BehaviorSubject.create(state)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->premiumGuildSubscriptionStateSubject:Lrx/subjects/BehaviorSubject;
+
+    return-void
+.end method
+
+.method public static final synthetic access$getPremiumGuildSubscribingSubscription$p(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)Lrx/Subscription;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->premiumGuildSubscribingSubscription:Lrx/Subscription;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getStoreSubscription$p(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)Lrx/Subscription;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->storeSubscription:Lrx/Subscription;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$handleGetGuild(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;Lcom/discord/models/domain/ModelGuild;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->handleGetGuild(Lcom/discord/models/domain/ModelGuild;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$handlePremiumGuildSubscriptionCompleted(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->handlePremiumGuildSubscriptionCompleted()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$handlePremiumGuildSubscriptionError(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->handlePremiumGuildSubscriptionError()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$setPremiumGuildSubscribingSubscription$p(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;Lrx/Subscription;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->premiumGuildSubscribingSubscription:Lrx/Subscription;
+
+    return-void
+.end method
+
+.method public static final synthetic access$setStoreSubscription$p(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;Lrx/Subscription;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->storeSubscription:Lrx/Subscription;
+
+    return-void
+.end method
+
+.method private final handleGetGuild(Lcom/discord/models/domain/ModelGuild;)V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->state:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;)V
+
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->state:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->publishState()V
+
+    return-void
+.end method
+
+.method private final handlePremiumGuildSubscriptionCompleted()V
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->state:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    instance-of v1, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+
+    if-eqz v1, :cond_0
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->COMPLETED:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)V
+
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v1, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    if-eqz v1, :cond_1
+
+    new-instance v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    sget-object v2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->COMPLETED:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+    move-result-object v0
+
+    invoke-direct {v1, v2, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;)V
+
+    move-object v0, v1
+
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    :goto_0
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->state:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->publishState()V
+
+    return-void
+
+    :cond_1
+    new-instance v0, Lkotlin/k;
+
+    invoke-direct {v0}, Lkotlin/k;-><init>()V
+
+    throw v0
+.end method
+
+.method private final handlePremiumGuildSubscriptionError()V
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->state:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    instance-of v1, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+
+    if-eqz v1, :cond_0
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ERROR:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)V
+
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v1, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    if-eqz v1, :cond_1
+
+    new-instance v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    sget-object v2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ERROR:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+    move-result-object v0
+
+    invoke-direct {v1, v2, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;)V
+
+    move-object v0, v1
+
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    :goto_0
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->state:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->publishState()V
+
+    return-void
+
+    :cond_1
+    new-instance v0, Lkotlin/k;
+
+    invoke-direct {v0}, Lkotlin/k;-><init>()V
+
+    throw v0
+.end method
+
+.method private final handlePremiumGuildSubscriptionStarted()V
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->state:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    instance-of v1, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+
+    if-eqz v1, :cond_0
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
+
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->CALL_IN_PROGRESS:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)V
+
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v1, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    if-eqz v1, :cond_1
+
+    new-instance v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    sget-object v2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->CALL_IN_PROGRESS:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+    move-result-object v0
+
+    invoke-direct {v1, v2, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;)V
+
+    move-object v0, v1
+
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    :goto_0
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->state:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->publishState()V
+
+    return-void
+
+    :cond_1
+    new-instance v0, Lkotlin/k;
+
+    invoke-direct {v0}, Lkotlin/k;-><init>()V
+
+    throw v0
+.end method
+
+.method private final publishState()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->premiumGuildSubscriptionStateSubject:Lrx/subjects/BehaviorSubject;
+
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->state:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getState()Lrx/Observable;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->premiumGuildSubscriptionStateSubject:Lrx/subjects/BehaviorSubject;
+
+    check-cast v0, Lrx/Observable;
+
+    return-object v0
+.end method
+
+.method public final onCleared()V
+    .locals 1
+
+    invoke-super {p0}, Landroidx/lifecycle/ViewModel;->onCleared()V
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->storeSubscription:Lrx/Subscription;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_0
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->premiumGuildSubscribingSubscription:Lrx/Subscription;
+
+    if-eqz v0, :cond_1
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_1
+    return-void
+.end method
+
+.method public final removePremiumGuildSubscription(JJ)V
+    .locals 9
+
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->handlePremiumGuildSubscriptionStarted()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 {v0, p1, p2, p3, p4}, Lcom/discord/utilities/rest/RestAPI;->unsubscribeToGuild(JJ)Lrx/Observable;
+
+    move-result-object p1
+
+    const/4 p2, 0x0
+
+    const/4 v0, 0x1
+
+    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
+
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string p1, "RestAPI\n        .api\n   \u2026dSchedulers.mainThread())"
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class v1, Lcom/discord/stores/StorePremiumGuildSubscription;
+
+    new-instance p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$1;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$1;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+
+    move-object v3, p1
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    new-instance p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$2;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$2;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+
+    move-object v4, p1
+
+    check-cast v4, Lkotlin/jvm/functions/Function1;
+
+    new-instance p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;
+
+    invoke-direct {p1, p0, p3, p4}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;J)V
+
+    move-object v6, p1
+
+    check-cast v6, Lkotlin/jvm/functions/Function1;
+
+    const/4 v2, 0x0
+
+    const/4 v5, 0x0
+
+    const/16 v7, 0x12
+
+    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
+.end method
+
+.method public final setGuildId(J)V
+    .locals 9
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->storeSubscription:Lrx/Subscription;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_0
+    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
+
+    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Lrx/Observable;->b(Lrx/Scheduler;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string p1, "StoreStream\n        .get\u2026dSchedulers.mainThread())"
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+    const/4 v2, 0x0
+
+    new-instance p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$1;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$1;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+
+    move-object v3, p1
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    new-instance p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$2;
+
+    move-object p2, p0
+
+    check-cast p2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+    invoke-direct {p1, p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$2;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+
+    move-object v6, p1
+
+    check-cast v6, Lkotlin/jvm/functions/Function1;
+
+    const/16 v7, 0x1a
+
+    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
+.end method
+
+.method public final subscribeToPremiumGuild(J)V
+    .locals 9
+
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->handlePremiumGuildSubscriptionStarted()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 {v0, p1, p2}, Lcom/discord/utilities/rest/RestAPI;->subscribeToGuild(J)Lrx/Observable;
+
+    move-result-object p1
+
+    const/4 p2, 0x0
+
+    const/4 v0, 0x1
+
+    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
+
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string p1, "RestAPI\n        .api\n   \u2026dSchedulers.mainThread())"
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class v1, Lcom/discord/stores/StorePremiumGuildSubscription;
+
+    new-instance p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+
+    move-object v3, p1
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    new-instance p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+
+    move-object v4, p1
+
+    check-cast v4, Lkotlin/jvm/functions/Function1;
+
+    new-instance p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+
+    move-object v6, p1
+
+    check-cast v6, Lkotlin/jvm/functions/Function1;
+
+    const/4 v2, 0x0
+
+    const/4 v5, 0x0
+
+    const/16 v7, 0x12
+
+    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
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkView$configure$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.smali
similarity index 63%
rename from com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkView$configure$1.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.smali
index 98c65b255d..8fee4ad7ad 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkView$configure$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;
+.class final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;
 .super Lkotlin/jvm/internal/l;
-.source "BoostPerkView.kt"
+.source "PremiumGuildSubscriptionPerkView.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/BoostPerkView;->configure(II)V
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->configure(II)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,18 +29,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;
+.field public static final INSTANCE:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->INSTANCE:Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f080224
+    const p1, 0x7f080233
 
     :cond_0
     return p1
@@ -83,7 +83,7 @@
 
     move-result p2
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/boosting/BoostPerkView$configure$1;->invoke(IZ)I
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkView$initialize$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1.smali
similarity index 85%
rename from com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkView$initialize$1.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1.smali
index 89e5cbfcd1..9c46d6ca6b 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkView$initialize$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1.smali
@@ -1,6 +1,6 @@
-.class public final Lcom/discord/widgets/servers/boosting/BoostPerkView$initialize$1;
+.class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1;
 .super Ljava/lang/Object;
-.source "BoostPerkView.kt"
+.source "PremiumGuildSubscriptionPerkView.kt"
 
 # interfaces
 .implements Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/BoostPerkView;->initialize()V
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->initialize()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
new file mode 100644
index 0000000000..9444874293
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
@@ -0,0 +1,1031 @@
+.class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;
+.super Landroid/widget/RelativeLayout;
+.source "PremiumGuildSubscriptionPerkView.kt"
+
+
+# instance fields
+.field private adapter:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;
+
+.field private container:Landroid/widget/LinearLayout;
+
+.field private contentRecycler:Landroidx/recyclerview/widget/RecyclerView;
+
+.field private contentText:Landroid/widget/TextView;
+
+.field private header:Landroid/view/View;
+
+.field private headerBoostText:Landroid/widget/TextView;
+
+.field private headerText:Landroid/widget/TextView;
+
+.field private headerUnlocked:Landroid/view/View;
+
+
+# direct methods
+.method public constructor <init>(Landroid/content/Context;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+    .locals 0
+
+    invoke-direct {p0, p1, p2}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->initialize()V
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    and-int/lit8 p5, p4, 0x2
+
+    if-eqz p5, :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-direct {p0, p1, p2, p3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+
+    return-void
+.end method
+
+.method private final initialize()V
+    .locals 4
+
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    move-object v1, p0
+
+    check-cast v1, Landroid/view/ViewGroup;
+
+    const v2, 0x7f0d009a
+
+    invoke-static {v0, v2, v1}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    const v0, 0x7f0a0510
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    const-string v1, "findViewById(R.id.perks_level_header)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->header:Landroid/view/View;
+
+    const v0, 0x7f0a0512
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    const-string v1, "findViewById(R.id.perks_level_header_text)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(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, 0x7f0a0511
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    const-string v1, "findViewById(R.id.perks_level_header_boosts)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(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, 0x7f0a0513
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    const-string v1, "findViewById(R.id.perks_level_header_unlocked)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerUnlocked:Landroid/view/View;
+
+    const v0, 0x7f0a050e
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    const-string v1, "findViewById(R.id.perks_level_contents_header)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(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, 0x7f0a050f
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    const-string v1, "findViewById(R.id.perks_level_contents_recycler)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(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, 0x7f0a0232
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    const-string v1, "findViewById(R.id.container)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Landroid/widget/LinearLayout;
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->container:Landroid/widget/LinearLayout;
+
+    sget-object v0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
+
+    new-instance v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;
+
+    iget-object v2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->contentRecycler:Landroidx/recyclerview/widget/RecyclerView;
+
+    const-string v3, "contentRecycler"
+
+    if-nez v2, :cond_0
+
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    invoke-direct {v1, v2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+
+    check-cast v1, 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 v0
+
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->adapter:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->contentRecycler:Landroidx/recyclerview/widget/RecyclerView;
+
+    if-nez v0, :cond_1
+
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_1
+    new-instance v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1;
+
+    invoke-direct {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1;-><init>()V
+
+    check-cast v1, Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;
+
+    invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView;->addOnItemTouchListener(Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final configure(II)V
+    .locals 18
+
+    move-object/from16 v0, p0
+
+    move/from16 v1, p1
+
+    sget-object v2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x0
+
+    move/from16 v5, p2
+
+    if-lt v5, v1, :cond_0
+
+    const/4 v5, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v5, 0x0
+
+    :goto_0
+    const-string v6, "header"
+
+    if-eqz v5, :cond_2
+
+    iget-object v7, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->header:Landroid/view/View;
+
+    if-nez v7, :cond_1
+
+    invoke-static {v6}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_1
+    const v6, 0x7f0800c0
+
+    invoke-virtual {v7, v6}, Landroid/view/View;->setBackgroundResource(I)V
+
+    goto :goto_1
+
+    :cond_2
+    iget-object v7, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->header:Landroid/view/View;
+
+    if-nez v7, :cond_3
+
+    invoke-static {v6}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_3
+    move-object v6, v0
+
+    check-cast v6, Landroid/view/View;
+
+    const v8, 0x7f0402af
+
+    invoke-static {v6, v8}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+
+    move-result v6
+
+    invoke-virtual {v7, v6}, Landroid/view/View;->setBackgroundColor(I)V
+
+    :goto_1
+    const/4 v6, 0x3
+
+    const/4 v7, 0x2
+
+    if-eq v1, v3, :cond_6
+
+    if-eq v1, v7, :cond_5
+
+    if-eq v1, v6, :cond_4
+
+    const/4 v8, 0x0
+
+    goto :goto_2
+
+    :cond_4
+    const/16 v8, 0x14
+
+    goto :goto_2
+
+    :cond_5
+    const/16 v8, 0xa
+
+    goto :goto_2
+
+    :cond_6
+    const/4 v8, 0x2
+
+    :goto_2
+    iget-object v9, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerText:Landroid/widget/TextView;
+
+    const-string v10, "headerText"
+
+    if-nez v9, :cond_7
+
+    invoke-static {v10}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_7
+    if-eq v1, v3, :cond_a
+
+    if-eq v1, v7, :cond_9
+
+    if-eq v1, v6, :cond_8
+
+    const/4 v11, 0x0
+
+    goto :goto_3
+
+    :cond_8
+    const v11, 0x7f1208d2
+
+    goto :goto_3
+
+    :cond_9
+    const v11, 0x7f1208d1
+
+    goto :goto_3
+
+    :cond_a
+    const v11, 0x7f1208d0
+
+    :goto_3
+    invoke-static {v0, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
+
+    move-result-object v11
+
+    check-cast v11, Ljava/lang/CharSequence;
+
+    invoke-virtual {v9, v11}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    if-eq v1, v3, :cond_f
+
+    if-eq v1, v7, :cond_d
+
+    if-eq v1, v6, :cond_b
+
+    const/4 v12, 0x0
+
+    goto :goto_4
+
+    :cond_b
+    if-eqz v5, :cond_c
+
+    const v9, 0x7f08032f
+
+    const v12, 0x7f08032f
+
+    goto :goto_4
+
+    :cond_c
+    const v9, 0x7f080330
+
+    const v12, 0x7f080330
+
+    goto :goto_4
+
+    :cond_d
+    if-eqz v5, :cond_e
+
+    const v9, 0x7f08032d
+
+    const v12, 0x7f08032d
+
+    goto :goto_4
+
+    :cond_e
+    const v9, 0x7f08032e
+
+    const v12, 0x7f08032e
+
+    goto :goto_4
+
+    :cond_f
+    if-eqz v5, :cond_10
+
+    const v9, 0x7f08032b
+
+    const v12, 0x7f08032b
+
+    goto :goto_4
+
+    :cond_10
+    const v9, 0x7f08032c
+
+    const v12, 0x7f08032c
+
+    :goto_4
+    iget-object v11, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerText:Landroid/widget/TextView;
+
+    if-nez v11, :cond_11
+
+    invoke-static {v10}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_11
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/4 v15, 0x0
+
+    const/16 v16, 0xe
+
+    const/16 v17, 0x0
+
+    invoke-static/range {v11 .. v17}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+
+    iget-object v9, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerText:Landroid/widget/TextView;
+
+    if-nez v9, :cond_12
+
+    invoke-static {v10}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_12
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->getContext()Landroid/content/Context;
+
+    move-result-object v10
+
+    if-eqz v5, :cond_13
+
+    const v11, 0x7f06014b
+
+    invoke-static {v10, v11}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+
+    move-result v10
+
+    goto :goto_5
+
+    :cond_13
+    const v11, 0x7f04029b
+
+    invoke-static {v10, v11}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+
+    move-result v10
+
+    :goto_5
+    invoke-virtual {v9, v10}, Landroid/widget/TextView;->setTextColor(I)V
+
+    iget-object v9, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerBoostText:Landroid/widget/TextView;
+
+    const-string v10, "headerBoostText"
+
+    if-nez v9, :cond_14
+
+    invoke-static {v10}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_14
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v11
+
+    const v12, 0x7f10006d
+
+    new-array v13, v3, [Ljava/lang/Object;
+
+    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v14
+
+    aput-object v14, v13, v4
+
+    invoke-virtual {v11, v12, v8, v13}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v8
+
+    check-cast v8, Ljava/lang/CharSequence;
+
+    invoke-virtual {v9, v8}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    iget-object v8, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerBoostText:Landroid/widget/TextView;
+
+    if-nez v8, :cond_15
+
+    invoke-static {v10}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_15
+    check-cast v8, Landroid/view/View;
+
+    xor-int/lit8 v9, v5, 0x1
+
+    const/4 v10, 0x0
+
+    invoke-static {v8, v9, v4, v7, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    iget-object v8, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerUnlocked:Landroid/view/View;
+
+    if-nez v8, :cond_16
+
+    const-string v9, "headerUnlocked"
+
+    invoke-static {v9}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_16
+    invoke-static {v8, v5, v4, v7, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    iget-object v8, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->contentText:Landroid/widget/TextView;
+
+    if-nez v8, :cond_17
+
+    const-string v9, "contentText"
+
+    invoke-static {v9}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_17
+    if-eq v1, v3, :cond_18
+
+    const v9, 0x7f1208ce
+
+    invoke-static {v0, v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/lang/CharSequence;
+
+    goto :goto_6
+
+    :cond_18
+    const v9, 0x7f1208cc
+
+    invoke-static {v0, v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/lang/CharSequence;
+
+    :goto_6
+    invoke-virtual {v8, v9}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    const/16 v8, 0x32
+
+    const/4 v9, 0x5
+
+    const/4 v10, 0x4
+
+    const v11, 0x7f1208c9
+
+    const v12, 0x7f0802b1
+
+    const v13, 0x7f1208ca
+
+    const v14, 0x7f080373
+
+    if-eq v1, v3, :cond_1b
+
+    if-eq v1, v7, :cond_1a
+
+    if-eq v1, v6, :cond_19
+
+    sget-object v1, Lkotlin/a/y;->bko:Lkotlin/a/y;
+
+    check-cast v1, Ljava/util/List;
+
+    goto/16 :goto_7
+
+    :cond_19
+    new-array v1, v10, [Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    new-instance v8, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    invoke-virtual {v2, v14, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v9
+
+    new-array v10, v7, [Ljava/lang/Object;
+
+    const/16 v14, 0x64
+
+    invoke-static {v14}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v14
+
+    aput-object v14, v10, v4
+
+    invoke-static {v6, v4}, Lcom/discord/models/domain/ModelGuild;->getEmojiMaxCount(IZ)I
+
+    move-result v14
+
+    invoke-static {v14}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v14
+
+    aput-object v14, v10, v3
+
+    invoke-static {v0, v13, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-direct {v8, v9, v10}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v8, v1, v4
+
+    new-instance v8, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    invoke-virtual {v2, v12, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v9
+
+    new-array v10, v3, [Ljava/lang/Object;
+
+    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v12
+
+    sget-object v13, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    invoke-static {v12, v13}, Lcom/discord/models/domain/ModelGuild;->getMaxVoiceBitrateKbps(Ljava/lang/Integer;Ljava/lang/Boolean;)I
+
+    move-result v12
+
+    invoke-static {v12}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v12
+
+    aput-object v12, v10, v4
+
+    invoke-static {v0, v11, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-direct {v8, v9, v10}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v8, v1, v3
+
+    new-instance v8, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    const v9, 0x7f0803a1
+
+    invoke-virtual {v2, v9, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v9
+
+    const v10, 0x7f1208cb
+
+    new-array v11, v3, [Ljava/lang/Object;
+
+    const v12, 0x7f1205a9
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v13
+
+    invoke-static {v13}, Lcom/discord/models/domain/ModelGuild;->getMaxFileSizeMB(Ljava/lang/Integer;)I
+
+    move-result v13
+
+    invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v13
+
+    aput-object v13, v3, v4
+
+    invoke-static {v0, v12, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
+
+    aput-object v3, v11, v4
+
+    invoke-static {v0, v10, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-direct {v8, v9, v3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v8, v1, v7
+
+    new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    const v4, 0x7f080379
+
+    invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v2
+
+    const v4, 0x7f1208c8
+
+    invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-direct {v3, v2, v4}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v3, v1, v6
+
+    invoke-static {v1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v1
+
+    goto/16 :goto_7
+
+    :cond_1a
+    new-array v1, v9, [Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    new-instance v9, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    invoke-virtual {v2, v14, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v14
+
+    new-array v15, v7, [Ljava/lang/Object;
+
+    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v8
+
+    aput-object v8, v15, v4
+
+    invoke-static {v7, v4}, Lcom/discord/models/domain/ModelGuild;->getEmojiMaxCount(IZ)I
+
+    move-result v8
+
+    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v8
+
+    aput-object v8, v15, v3
+
+    invoke-static {v0, v13, v15}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v8
+
+    invoke-direct {v9, v14, v8}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v9, v1, v4
+
+    new-instance v8, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    invoke-virtual {v2, v12, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v9
+
+    new-array v12, v3, [Ljava/lang/Object;
+
+    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v13
+
+    sget-object v14, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    invoke-static {v13, v14}, Lcom/discord/models/domain/ModelGuild;->getMaxVoiceBitrateKbps(Ljava/lang/Integer;Ljava/lang/Boolean;)I
+
+    move-result v13
+
+    invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v13
+
+    aput-object v13, v12, v4
+
+    invoke-static {v0, v11, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v11
+
+    invoke-direct {v8, v9, v11}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v8, v1, v3
+
+    new-instance v8, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    const v9, 0x7f0803a1
+
+    invoke-virtual {v2, v9, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v9
+
+    const v11, 0x7f1208cb
+
+    new-array v12, v3, [Ljava/lang/Object;
+
+    const v13, 0x7f1205a9
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v14
+
+    invoke-static {v14}, Lcom/discord/models/domain/ModelGuild;->getMaxFileSizeMB(Ljava/lang/Integer;)I
+
+    move-result v14
+
+    invoke-static {v14}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v14
+
+    aput-object v14, v3, v4
+
+    invoke-static {v0, v13, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
+
+    aput-object v3, v12, v4
+
+    invoke-static {v0, v11, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-direct {v8, v9, v3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v8, v1, v7
+
+    new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    const v4, 0x7f0802cd
+
+    invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v4
+
+    const v7, 0x7f1208c6
+
+    invoke-static {v0, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-direct {v3, v4, v7}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v3, v1, v6
+
+    new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    const v4, 0x7f0802ac
+
+    invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v2
+
+    const v4, 0x7f1208c7
+
+    invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-direct {v3, v2, v4}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v3, v1, v10
+
+    invoke-static {v1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v1
+
+    goto/16 :goto_7
+
+    :cond_1b
+    new-array v1, v9, [Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    new-instance v9, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    invoke-virtual {v2, v14, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v14
+
+    new-array v15, v7, [Ljava/lang/Object;
+
+    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v8
+
+    aput-object v8, v15, v4
+
+    invoke-static {v3, v4}, Lcom/discord/models/domain/ModelGuild;->getEmojiMaxCount(IZ)I
+
+    move-result v8
+
+    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v8
+
+    aput-object v8, v15, v3
+
+    invoke-static {v0, v13, v15}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v8
+
+    invoke-direct {v9, v14, v8}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v9, v1, v4
+
+    new-instance v8, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    invoke-virtual {v2, v12, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v9
+
+    new-array v12, v3, [Ljava/lang/Object;
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v13
+
+    sget-object v14, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    invoke-static {v13, v14}, Lcom/discord/models/domain/ModelGuild;->getMaxVoiceBitrateKbps(Ljava/lang/Integer;Ljava/lang/Boolean;)I
+
+    move-result v13
+
+    invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v13
+
+    aput-object v13, v12, v4
+
+    invoke-static {v0, v11, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-direct {v8, v9, v4}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v8, v1, v3
+
+    new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    const v4, 0x7f080309
+
+    invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v4
+
+    const v8, 0x7f1208c3
+
+    invoke-static {v0, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
+
+    move-result-object v8
+
+    invoke-direct {v3, v4, v8}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v3, v1, v7
+
+    new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    const v4, 0x7f0802cd
+
+    invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v4
+
+    const v7, 0x7f1208c4
+
+    invoke-static {v0, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-direct {v3, v4, v7}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v3, v1, v6
+
+    new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    const v4, 0x7f0802ac
+
+    invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
+
+    move-result v2
+
+    const v4, 0x7f1208c5
+
+    invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-direct {v3, v2, v4}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
+
+    aput-object v3, v1, v10
+
+    invoke-static {v1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v1
+
+    :goto_7
+    iget-object v2, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->adapter:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;
+
+    if-nez v2, :cond_1c
+
+    const-string v3, "adapter"
+
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_1c
+    invoke-virtual {v2, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;->configure(Ljava/util/List;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder.smali
similarity index 56%
rename from com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder.smali
index 9823b21dc3..b5da17035d 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;
+.class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-.source "BoostPerkViewAdapter.kt"
+.source "PremiumGuildSubscriptionPerkViewAdapter.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -16,8 +16,8 @@
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
-        "Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;",
-        "Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;",
+        "Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;",
+        "Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;",
         ">;"
     }
 .end annotation
@@ -41,7 +41,7 @@
 
     new-instance v1, Lkotlin/jvm/internal/v;
 
-    const-class v2, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;
+    const-class v2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;
 
     invoke-static {v2}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -63,12 +63,12 @@
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     return-void
 .end method
 
-.method public constructor <init>(Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;)V
+.method public constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;)V
     .locals 1
 
     const-string v0, "adapter"
@@ -77,17 +77,17 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0093
+    const v0, 0x7f0d009b
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a04f6
+    const p1, 0x7f0a050d
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;->textViewListItem$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;->textViewListItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
@@ -95,9 +95,9 @@
 .method private final getTextViewListItem()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;->textViewListItem$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;->textViewListItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -114,7 +114,7 @@
 
 
 # virtual methods
-.method protected final onConfigure(ILcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;)V
+.method protected final onConfigure(ILcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;)V
     .locals 8
 
     const-string v0, "data"
@@ -123,11 +123,11 @@
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;->getTextViewListItem()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;->getTextViewListItem()Landroid/widget/TextView;
 
     move-result-object p1
 
-    invoke-virtual {p2}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->getText()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->getText()Ljava/lang/String;
 
     move-result-object v0
 
@@ -135,11 +135,11 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;->getTextViewListItem()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;->getTextViewListItem()Landroid/widget/TextView;
 
     move-result-object v1
 
-    invoke-virtual {p2}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;->getIconResId()I
+    invoke-virtual {p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->getIconResId()I
 
     move-result v2
 
@@ -161,9 +161,9 @@
 .method public final bridge synthetic onConfigure(ILjava/lang/Object;)V
     .locals 0
 
-    check-cast p2, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
+    check-cast p2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;->onConfigure(ILcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;->onConfigure(ILcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem$Companion.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem$Companion.smali
new file mode 100644
index 0000000000..a5a996200d
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem$Companion.smali
@@ -0,0 +1,32 @@
+.class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem$Companion;
+.super Ljava/lang/Object;
+.source "PremiumGuildSubscriptionPerkViewAdapter.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem$Companion;-><init>()V
+
+    return-void
+.end method
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
new file mode 100644
index 0000000000..fea0b3a9eb
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem.smali
@@ -0,0 +1,268 @@
+.class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+.super Ljava/lang/Object;
+.source "PremiumGuildSubscriptionPerkViewAdapter.kt"
+
+# interfaces
+.implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "PremiumGuildSubscriptionPerkViewListItem"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem$Companion;
+
+.field public static final TYPE_LIST_ITEM:I = 0x1
+
+
+# instance fields
+.field private final iconResId:I
+
+.field private final text:Ljava/lang/String;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->Companion:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>(ILjava/lang/String;)V
+    .locals 1
+
+    const-string v0, "text"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->iconResId:I
+
+    iput-object p2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->text:Ljava/lang/String;
+
+    return-void
+.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;
+    .locals 0
+
+    and-int/lit8 p4, p3, 0x1
+
+    if-eqz p4, :cond_0
+
+    iget p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->iconResId:I
+
+    :cond_0
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_1
+
+    iget-object p2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->text:Ljava/lang/String;
+
+    :cond_1
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->copy(ILjava/lang/String;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->iconResId:I
+
+    return v0
+.end method
+
+.method public final component2()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->text:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final copy(ILjava/lang/String;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+    .locals 1
+
+    const-string v0, "text"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
+
+    iget v1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->iconResId:I
+
+    iget v3, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->iconResId:I
+
+    if-ne v1, v3, :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, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->text:Ljava/lang/String;
+
+    iget-object p1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->text:Ljava/lang/String;
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    return v2
+
+    :cond_2
+    :goto_1
+    return v0
+.end method
+
+.method public final getIconResId()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->iconResId:I
+
+    return v0
+.end method
+
+.method public final getKey()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->text:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getText()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->text:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getType()I
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public final hashCode()I
+    .locals 2
+
+    iget v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->iconResId:I
+
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->text:Ljava/lang/String;
+
+    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
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "PremiumGuildSubscriptionPerkViewListItem(iconResId="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget v1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->iconResId:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v1, ", text="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->text: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;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkViewAdapter.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter.smali
similarity index 52%
rename from com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkViewAdapter.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter.smali
index 5686b2a30c..ae673c229a 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/BoostPerkViewAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter.smali
@@ -1,20 +1,20 @@
-.class public final Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;
+.class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
-.source "BoostPerkViewAdapter.kt"
+.source "PremiumGuildSubscriptionPerkViewAdapter.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;,
-        Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;
+        Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;,
+        Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
     }
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple<",
-        "Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;",
+        "Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;",
         ">;"
     }
 .end annotation
@@ -41,7 +41,7 @@
         value = {
             "(",
             "Ljava/util/List<",
-            "Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$BoostPerkViewListItem;",
+            "Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;",
             ">;)V"
         }
     .end annotation
@@ -50,7 +50,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;->setData(Ljava/util/List;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;->setData(Ljava/util/List;)V
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 .method public final bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
     .locals 0
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;
 
     move-result-object p1
 
@@ -67,7 +67,7 @@
     return-object p1
 .end method
 
-.method public final onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;
+.method public final onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;
     .locals 1
 
     const-string v0, "parent"
@@ -78,14 +78,14 @@
 
     if-ne p2, p1, :cond_0
 
-    new-instance p1, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;
+    new-instance p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;
 
-    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter$PerkViewHolder;-><init>(Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;)V
+    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;)V
 
     return-object p1
 
     :cond_0
-    invoke-virtual {p0, p2}, Lcom/discord/widgets/servers/boosting/BoostPerkViewAdapter;->invalidViewTypeException(I)Ljava/lang/IllegalArgumentException;
+    invoke-virtual {p0, p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;->invalidViewTypeException(I)Ljava/lang/IllegalArgumentException;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion.smali
similarity index 65%
rename from com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion.smali
index b53d408114..25f614c5c6 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion;
+.class public final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
 .super Ljava/lang/Object;
-.source "WidgetServerBoostConfirmation.kt"
+.source "WidgetPremiumGuildSubscription.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;-><init>()V
 
     return-void
 .end method
@@ -50,7 +50,11 @@
 
     move-result-object p2
 
-    const-class p3, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
+    const-string p3, "Intent().putExtra(INTENT_EXTRA_GUILD_ID, guildId)"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class p3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
     invoke-static {p1, p3, p2}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1.smali
similarity index 58%
rename from com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion$get$1.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1.smali
index 1ca966f6f3..25ae9d7e68 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion$get$1;
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1;
 .super Ljava/lang/Object;
-.source "WidgetServerBoostStatus.kt"
+.source "WidgetPremiumGuildSubscription.kt"
 
 # interfaces
 .implements Lrx/functions/Func4;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion;->get(J)Lrx/Observable;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion;->get(J)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -37,18 +37,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion$get$1;
+.field public static final INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion$get$1;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion$get$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion$get$1;
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1;
 
     return-void
 .end method
@@ -63,10 +63,10 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;
+.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
     .locals 2
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
 
     const-string v1, "me"
 
@@ -80,7 +80,7 @@
 
     invoke-static {p4, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
+    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
 
     return-object v0
 .end method
@@ -96,7 +96,7 @@
 
     check-cast p4, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion$get$1;->call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1;->call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion.smali
similarity index 64%
rename from com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion.smali
index b46e28e6d5..ffc6e1c063 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion;
+.class public final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion;
 .super Ljava/lang/Object;
-.source "WidgetServerBoostStatus.kt"
+.source "WidgetPremiumGuildSubscription.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion;-><init>()V
 
     return-void
 .end method
@@ -39,7 +39,7 @@
         value = {
             "(J)",
             "Lrx/Observable<",
-            "Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;",
+            "Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;",
             ">;"
         }
     .end annotation
@@ -62,41 +62,41 @@
 
     invoke-virtual {v1, p1, p2}, Lcom/discord/stores/StoreGuilds;->get(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;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
-
-    move-result-object v2
-
-    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object p1
-
-    invoke-virtual {v2, p1}, Lcom/discord/stores/StorePremiumGuildSubscription;->getPremiumGuildSubscriptionsState(Ljava/lang/Long;)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
-
     move-result-object p1
 
     sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
+    invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/discord/stores/StoreSubscriptions;->getSubscriptions()Lrx/Observable;
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    invoke-static {p2, v1, v2, v1}, Lcom/discord/stores/StorePremiumGuildSubscription;->getPremiumGuildSubscriptionsState$default(Lcom/discord/stores/StorePremiumGuildSubscription;Ljava/lang/Long;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p2
 
-    sget-object v2, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion$get$1;
+    invoke-static {p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object p2
+
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreSubscriptions;->getSubscriptions()Lrx/Observable;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1;
 
     check-cast v2, Lrx/functions/Func4;
 
-    invoke-static {v0, v1, p1, p2, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
+    invoke-static {v0, p1, p2, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model.smali
new file mode 100644
index 0000000000..fc6d7950f5
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model.smali
@@ -0,0 +1,388 @@
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+.super Ljava/lang/Object;
+.source "WidgetPremiumGuildSubscription.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = "Model"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion;
+
+
+# instance fields
+.field private final guild:Lcom/discord/models/domain/ModelGuild;
+
+.field private final meUser:Lcom/discord/models/domain/ModelUser;
+
+.field private final premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
+
+.field private final premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
+    .locals 1
+
+    const-string v0, "meUser"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "premiumGuildSubscriptionState"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "premiumSubscriptionState"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    iput-object p3, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
+
+    iput-object p4, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;ILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+    .locals 0
+
+    and-int/lit8 p6, p5, 0x1
+
+    if-eqz p6, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    :cond_0
+    and-int/lit8 p6, p5, 0x2
+
+    if-eqz p6, :cond_1
+
+    iget-object p2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    :cond_1
+    and-int/lit8 p6, p5, 0x4
+
+    if-eqz p6, :cond_2
+
+    iget-object p3, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
+
+    :cond_2
+    and-int/lit8 p5, p5, 0x8
+
+    if-eqz p5, :cond_3
+
+    iget-object p4, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+
+    :cond_3
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final component2()Lcom/discord/models/domain/ModelGuild;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    return-object v0
+.end method
+
+.method public final component3()Lcom/discord/stores/StorePremiumGuildSubscription$State;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
+
+    return-object v0
+.end method
+
+.method public final component4()Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+    .locals 1
+
+    const-string v0, "meUser"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "premiumGuildSubscriptionState"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "premiumSubscriptionState"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+
+    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
+
+    iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+
+    iget-object p1, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getGuild()Lcom/discord/models/domain/ModelGuild;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    return-object v0
+.end method
+
+.method public final getMeUser()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final getPremiumGuildSubscriptionState()Lcom/discord/stores/StorePremiumGuildSubscription$State;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
+
+    return-object v0
+.end method
+
+.method public final getPremiumSubscriptionState()Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    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/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+
+    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 final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "Model(meUser="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", guild="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", premiumGuildSubscriptionState="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", premiumSubscriptionState="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter$Companion.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter$Companion.smali
new file mode 100644
index 0000000000..419bec4d5f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter$Companion.smali
@@ -0,0 +1,32 @@
+.class public final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter$Companion;
+.super Ljava/lang/Object;
+.source "WidgetPremiumGuildSubscription.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter$Companion;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter.smali
similarity index 52%
rename from com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter.smali
index 23b0bf2559..ca4157346e 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter.smali
@@ -1,11 +1,11 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
 .super Landroidx/viewpager/widget/PagerAdapter;
-.source "WidgetServerBoostStatus.kt"
+.source "WidgetPremiumGuildSubscription.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -13,6 +13,18 @@
     name = "PerksPagerAdapter"
 .end annotation
 
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter$Companion;
+
+.field public static final NO_BOOSTS_POSITION:I
+
 
 # instance fields
 .field private premiumTier:I
@@ -32,6 +44,20 @@
 
 
 # direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter$Companion;
+
+    return-void
+.end method
+
 .method public constructor <init>()V
     .locals 1
 
@@ -41,7 +67,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->views:Ljava/util/HashMap;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->views:Ljava/util/HashMap;
 
     return-void
 .end method
@@ -49,16 +75,16 @@
 
 # virtual methods
 .method public final configureViews()V
-    .locals 3
+    .locals 4
 
     const/4 v0, 0x0
 
     :goto_0
     const/4 v1, 0x3
 
-    if-gt v0, v1, :cond_1
+    if-gt v0, v1, :cond_4
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->views:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->views:Ljava/util/HashMap;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -70,22 +96,72 @@
 
     check-cast v1, Landroid/view/View;
 
-    instance-of v2, v1, Lcom/discord/widgets/servers/boosting/BoostPerkView;
+    if-nez v0, :cond_2
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_3
 
-    check-cast v1, Lcom/discord/widgets/servers/boosting/BoostPerkView;
+    const v2, 0x7f0a05dc
 
-    iget v2, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->premiumTier:I
+    invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    invoke-virtual {v1, v0, v2}, Lcom/discord/widgets/servers/boosting/BoostPerkView;->configure(II)V
+    move-result-object v2
+
+    check-cast v2, Landroid/widget/TextView;
+
+    if-eqz v2, :cond_3
+
+    invoke-virtual {v1}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_1
+
+    iget v3, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->subscriptionCount:I
+
+    if-nez v3, :cond_0
+
+    const v3, 0x7f120e07
+
+    goto :goto_1
 
     :cond_0
+    const v3, 0x7f120e09
+
+    :goto_1
+    invoke-virtual {v1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    goto :goto_2
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_2
+    check-cast v1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    goto :goto_3
+
+    :cond_2
+    instance-of v2, v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;
+
+    if-eqz v2, :cond_3
+
+    check-cast v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;
+
+    iget v2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->premiumTier:I
+
+    invoke-virtual {v1, v0, v2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->configure(II)V
+
+    :cond_3
+    :goto_3
     add-int/lit8 v0, v0, 0x1
 
     goto :goto_0
 
-    :cond_1
+    :cond_4
     return-void
 .end method
 
@@ -118,7 +194,7 @@
 .method public final getPremiumTier()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->premiumTier:I
+    iget v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->premiumTier:I
 
     return v0
 .end method
@@ -126,7 +202,7 @@
 .method public final getSubscriptionCount()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->subscriptionCount:I
+    iget v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->subscriptionCount:I
 
     return v0
 .end method
@@ -140,7 +216,7 @@
 
     if-eqz p2, :cond_0
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/BoostPerkView;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -160,11 +236,11 @@
 
     move-object v1, v0
 
-    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/servers/boosting/BoostPerkView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iget v1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->premiumTier:I
+    iget v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->premiumTier:I
 
-    invoke-virtual {v0, p2, v1}, Lcom/discord/widgets/servers/boosting/BoostPerkView;->configure(II)V
+    invoke-virtual {v0, p2, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->configure(II)V
 
     check-cast v0, Landroid/view/View;
 
@@ -179,7 +255,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d0076
+    const v1, 0x7f0d007d
 
     const/4 v2, 0x0
 
@@ -188,59 +264,20 @@
     move-result-object v0
 
     :goto_0
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->views:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->views:Ljava/util/HashMap;
 
     check-cast v1, Ljava/util/Map;
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v2
-
-    const-string v3, "view"
-
-    invoke-static {v0, v3}, Lkotlin/jvm/internal/k;->g(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;
-
-    if-nez p2, :cond_2
-
-    const p2, 0x7f0a05c2
-
-    invoke-virtual {v0, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
     move-result-object p2
 
-    const-string v1, "view.findViewById<TextVi\u2026_boost_status_empty_text)"
+    const-string v2, "view"
 
-    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast p2, Landroid/widget/TextView;
+    invoke-interface {v1, p2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    iget v2, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->subscriptionCount:I
-
-    if-nez v2, :cond_1
-
-    const v2, 0x7f120dce
-
-    goto :goto_1
-
-    :cond_1
-    const v2, 0x7f120dd0
-
-    :goto_1
-    invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/CharSequence;
-
-    invoke-virtual {p2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    :cond_2
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->addView(Landroid/view/View;)V
 
     return-object v0
@@ -249,7 +286,7 @@
 .method public final bridge synthetic instantiateItem(Landroid/view/ViewGroup;I)Ljava/lang/Object;
     .locals 0
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->instantiateItem(Landroid/view/ViewGroup;I)Landroid/view/View;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->instantiateItem(Landroid/view/ViewGroup;I)Landroid/view/View;
 
     move-result-object p1
 
@@ -277,7 +314,7 @@
 .method public final setPremiumTier(I)V
     .locals 0
 
-    iput p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->premiumTier:I
+    iput p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->premiumTier:I
 
     return-void
 .end method
@@ -285,7 +322,7 @@
 .method public final setSubscriptionCount(I)V
     .locals 0
 
-    iput p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->subscriptionCount:I
+    iput p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->subscriptionCount:I
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$1.smali
new file mode 100644
index 0000000000..d4bb71e248
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$1.smali
@@ -0,0 +1,45 @@
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$1;
+.super Ljava/lang/Object;
+.source "WidgetPremiumGuildSubscription.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+    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/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+    invoke-static {p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->access$fetchData(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2.smali
similarity index 51%
rename from com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$2.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2.smali
index d8274a28f5..c5fb27d209 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$2;
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
 .super Ljava/lang/Object;
-.source "WidgetServerBoostStatus.kt"
+.source "WidgetPremiumGuildSubscription.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->configureUI(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;)V
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$2;
+.field public static final INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$2;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
 
-    invoke-direct {v0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$2;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$2;->INSTANCE:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$2;
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
 
     return-void
 .end method
@@ -47,7 +47,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
     const-string v1, "it"
 
@@ -67,7 +67,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
+    invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3.smali
new file mode 100644
index 0000000000..dcd0b8bb2d
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3.smali
@@ -0,0 +1,74 @@
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;
+.super Ljava/lang/Object;
+.source "WidgetPremiumGuildSubscription.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $hasAppleSubscription:Z
+
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Z)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+    iput-boolean p2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;->$hasAppleSubscription:Z
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 3
+
+    iget-boolean p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;->$hasAppleSubscription:Z
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->requireContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const-string v0, "requireContext()"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+    const v1, 0x7f1200e1
+
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v1, 0x4
+
+    const/4 v2, 0x0
+
+    invoke-static {p1, v0, v2, v1, v2}, Lcom/discord/utilities/uri/UriHandler;->handle$default(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4.smali
new file mode 100644
index 0000000000..9215b649bd
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4.smali
@@ -0,0 +1,63 @@
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;
+.super Ljava/lang/Object;
+.source "WidgetPremiumGuildSubscription.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 3
+
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
+
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(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}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+    invoke-static {v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->access$getGuildId$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)J
+
+    move-result-wide v1
+
+    invoke-virtual {v0, p1, v1, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$5.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$5.smali
new file mode 100644
index 0000000000..f677dc70a2
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$5.smali
@@ -0,0 +1,67 @@
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$5;
+.super Ljava/lang/Object;
+.source "WidgetPremiumGuildSubscription.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$5;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$5;
+
+    invoke-direct {v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$5;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$5;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$5;
+
+    return-void
+.end method
+
+.method 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/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion;
+
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(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}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion;->launch(Landroid/content/Context;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$guildId$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2.smali
similarity index 50%
rename from com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$guildId$2.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2.smali
index 3569b68cd6..570b9c225a 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$guildId$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$guildId$2;
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2;
 .super Lkotlin/jvm/internal/l;
-.source "WidgetServerBoostStatus.kt"
+.source "WidgetPremiumGuildSubscription.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;-><init>()V
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;-><init>()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)V
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$guildId$2;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
     const/4 p1, 0x0
 
@@ -48,9 +48,9 @@
 .method public final invoke()J
     .locals 4
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$guildId$2;->this$0:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    invoke-static {v0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->access$getMostRecentIntent$p(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)Landroid/content/Intent;
+    invoke-static {v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->access$getMostRecentIntent$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)Landroid/content/Intent;
 
     move-result-object v0
 
@@ -68,7 +68,7 @@
 .method public final synthetic invoke()Ljava/lang/Object;
     .locals 2
 
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$guildId$2;->invoke()J
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2;->invoke()J
 
     move-result-wide v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onActivityCreated$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onActivityCreated$1.smali
new file mode 100644
index 0000000000..113e868f2c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onActivityCreated$1.smali
@@ -0,0 +1,62 @@
+.class public final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onActivityCreated$1;
+.super Ljava/lang/Object;
+.source "WidgetPremiumGuildSubscription.kt"
+
+# interfaces
+.implements Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->onActivityCreated(Landroid/os/Bundle;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onActivityCreated$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onPageScrollStateChanged(I)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final onPageScrolled(IFI)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final onPageSelected(I)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onActivityCreated$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->access$configureLevelBubbles(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;I)V
+
+    return-void
+.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
new file mode 100644
index 0000000000..c2159b4102
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1.smali
@@ -0,0 +1,97 @@
+.class final synthetic Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1;
+.super Lkotlin/jvm/internal/j;
+.source "WidgetPremiumGuildSubscription.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->onViewBoundOrOnResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><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/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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/WidgetPremiumGuildSubscription$Model;)V"
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1;->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/WidgetPremiumGuildSubscription$Model;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
similarity index 66%
rename from com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
index 20e3c6cad1..7c935e92f7 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
@@ -1,14 +1,14 @@
-.class public final Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
+.class public final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 .super Lcom/discord/app/AppFragment;
-.source "WidgetServerBoostStatus.kt"
+.source "WidgetPremiumGuildSubscription.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;,
-        Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;,
-        Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;
+        Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;,
+        Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;,
+        Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
     }
 .end annotation
 
@@ -16,7 +16,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;
+.field public static final Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
 
 .field private static final INTENT_EXTRA_GUILD_ID:Ljava/lang/String; = "GUILD_ID"
 
@@ -88,7 +88,7 @@
 
 .field private final manageButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private pagerAdapter:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;
+.field private pagerAdapter:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
 
 .field private final retry$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -103,7 +103,7 @@
 .method static constructor <clinit>()V
     .locals 6
 
-    const-class v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
+    const-class v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
     const/16 v1, 0x13
 
@@ -527,15 +527,15 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
 
     const/4 v1, 0x0
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
 
     return-void
 .end method
@@ -545,45 +545,37 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
+    const v0, 0x7f0a00fa
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostNumber$delegate:Lkotlin/properties/ReadOnlyProperty;
+
     const v0, 0x7f0a00f9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostNumber$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00f8
+    const v0, 0x7f0a00d2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostProgressBar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00d1
+    const v0, 0x7f0a00d4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostProgressBar$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a00d3
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier0Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a00d5
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier1Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier0Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a00d6
 
@@ -591,15 +583,15 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier1Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier1Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00d8
+    const v0, 0x7f0a00d7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier2Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier1Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a00d9
 
@@ -607,15 +599,15 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier2Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier2Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00db
+    const v0, 0x7f0a00da
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier3Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier2Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a00dc
 
@@ -623,63 +615,23 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier3Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier3Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00f7
+    const v0, 0x7f0a00dd
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier3Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00fa
+    const v0, 0x7f0a00f8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a00f3
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->buttonFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a00f1
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a00f6
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->upgradeButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a00f5
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->manageButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a00f4
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->buttonInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a00fb
 
@@ -687,17 +639,65 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;
+    const v0, 0x7f0a00f4
 
-    invoke-direct {v0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;-><init>()V
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->pagerAdapter:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;
+    move-result-object v0
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$guildId$2;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->buttonFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$guildId$2;-><init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)V
+    const v0, 0x7f0a00f2
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a00f7
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->upgradeButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a00f6
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->manageButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a00f5
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->buttonInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a00fc
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
+
+    invoke-direct {v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;-><init>()V
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->pagerAdapter:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function0;
 
@@ -705,49 +705,49 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->guildId$delegate:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->guildId$delegate:Lkotlin/Lazy;
 
     return-void
 .end method
 
-.method public static final synthetic access$configureLevelBubbles(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;I)V
+.method public static final synthetic access$configureLevelBubbles(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;I)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->configureLevelBubbles(I)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureLevelBubbles(I)V
 
     return-void
 .end method
 
-.method public static final synthetic access$configureUI(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;)V
+.method public static final synthetic access$configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->configureUI(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$fetchData(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)V
+.method public static final synthetic access$fetchData(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->fetchData()V
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->fetchData()V
 
     return-void
 .end method
 
-.method public static final synthetic access$getGuildId$p(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)J
+.method public static final synthetic access$getGuildId$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)J
     .locals 2
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getGuildId()J
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getGuildId()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static final synthetic access$getMostRecentIntent$p(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)Landroid/content/Intent;
+.method public static final synthetic access$getMostRecentIntent$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)Landroid/content/Intent;
     .locals 0
 
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getMostRecentIntent()Landroid/content/Intent;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getMostRecentIntent()Landroid/content/Intent;
 
     move-result-object p0
 
@@ -764,13 +764,13 @@
 
     if-gt v0, v1, :cond_6
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->levelBackgrounds:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->levelBackgrounds:Ljava/util/List;
 
     if-nez v1, :cond_0
 
     const-string v2, "levelBackgrounds"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
@@ -819,13 +819,13 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->levelText:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->levelText:Ljava/util/List;
 
     if-nez v1, :cond_3
 
     const-string v2, "levelText"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
@@ -842,7 +842,7 @@
 
     check-cast v2, Landroid/view/View;
 
-    const v3, 0x7f040291
+    const v3, 0x7f040294
 
     invoke-static {v2, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -855,7 +855,7 @@
 
     check-cast v2, Landroid/view/View;
 
-    const v3, 0x7f04029b
+    const v3, 0x7f04029e
 
     invoke-static {v2, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -876,19 +876,19 @@
 .method private final configureProgressBar(II)V
     .locals 6
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostProgressBar()Landroid/widget/ProgressBar;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostProgressBar()Landroid/widget/ProgressBar;
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/utilities/nitro/BoostUtils;->INSTANCE:Lcom/discord/utilities/nitro/BoostUtils;
+    sget-object v1, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
-    invoke-virtual {v1, p1, p2}, Lcom/discord/utilities/nitro/BoostUtils;->calculateTotalProgress(II)I
+    invoke-virtual {v1, p1, p2}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculateTotalProgress(II)I
 
     move-result v1
 
     invoke-virtual {v0, v1}, Landroid/widget/ProgressBar;->setProgress(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostProgressBar()Landroid/widget/ProgressBar;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostProgressBar()Landroid/widget/ProgressBar;
 
     move-result-object v0
 
@@ -913,25 +913,25 @@
     goto :goto_0
 
     :cond_0
-    const v5, 0x7f120df5
+    const v5, 0x7f120e2e
 
     goto :goto_0
 
     :cond_1
-    const v5, 0x7f120df4
+    const v5, 0x7f120e2d
 
     goto :goto_0
 
     :cond_2
-    const v5, 0x7f120df3
+    const v5, 0x7f120e2c
 
     goto :goto_0
 
     :cond_3
-    const v5, 0x7f120dbf
+    const v5, 0x7f120df8
 
     :goto_0
-    invoke-virtual {p0, v5}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v5}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I)Ljava/lang/String;
 
     move-result-object v5
 
@@ -939,7 +939,7 @@
 
     invoke-virtual {v0, v5}, Landroid/widget/ProgressBar;->setContentDescription(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostTier0Iv()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier0Iv()Landroid/widget/ImageView;
 
     move-result-object v0
 
@@ -955,7 +955,7 @@
     :goto_1
     invoke-virtual {v0, p2}, Landroid/widget/ImageView;->setEnabled(Z)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostTier1Iv()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier1Iv()Landroid/widget/ImageView;
 
     move-result-object p2
 
@@ -971,7 +971,7 @@
     :goto_2
     invoke-virtual {p2, v0}, Landroid/widget/ImageView;->setEnabled(Z)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostTier2Iv()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier2Iv()Landroid/widget/ImageView;
 
     move-result-object p2
 
@@ -987,7 +987,7 @@
     :goto_3
     invoke-virtual {p2, v0}, Landroid/widget/ImageView;->setEnabled(Z)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostTier3Iv()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier3Iv()Landroid/widget/ImageView;
 
     move-result-object p2
 
@@ -1004,41 +1004,41 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120dca
+    const v0, 0x7f120e03
 
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->setActionBarTitle(I)Lkotlin/Unit;
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->setActionBarTitle(I)Lkotlin/Unit;
 
     check-cast p1, Ljava/lang/CharSequence;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->setActionBarSubtitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->setActionBarSubtitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
 
     return-void
 .end method
 
-.method private final configureUI(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;)V
+.method private final configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;)V
     .locals 26
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->component1()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->component1()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v1
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->component2()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->component2()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v2
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->component3()Lcom/discord/stores/StorePremiumGuildSubscription$State;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->component3()Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
     move-result-object v3
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->component4()Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->component4()Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
     move-result-object v4
 
     if-nez v2, :cond_1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getAppActivity()Lcom/discord/app/AppActivity;
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getAppActivity()Lcom/discord/app/AppActivity;
 
     move-result-object v1
 
@@ -1102,7 +1102,7 @@
 
     if-eqz v5, :cond_4
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v5
 
@@ -1293,9 +1293,9 @@
     const/4 v12, 0x0
 
     :goto_5
-    sget-object v13, Lcom/discord/utilities/nitro/BoostUtils;->INSTANCE:Lcom/discord/utilities/nitro/BoostUtils;
+    sget-object v13, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
-    invoke-virtual {v13, v1, v4}, Lcom/discord/utilities/nitro/BoostUtils;->calculateTotalBoostCount(Lcom/discord/models/domain/ModelUser;Ljava/util/List;)I
+    invoke-virtual {v13, v4}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculateTotalBoostCount(Ljava/util/List;)I
 
     move-result v4
 
@@ -1321,21 +1321,21 @@
 
     move-result-object v2
 
-    invoke-direct {v0, v2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->configureToolbar(Ljava/lang/String;)V
+    invoke-direct {v0, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureToolbar(Ljava/lang/String;)V
 
-    invoke-direct {v0, v9, v10}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->configureProgressBar(II)V
+    invoke-direct {v0, v9, v10}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureProgressBar(II)V
 
-    invoke-direct {v0, v9, v10}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->configureViewpager(II)V
+    invoke-direct {v0, v9, v10}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureViewpager(II)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostNumber()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostNumber()Landroid/widget/TextView;
 
     move-result-object v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getResources()Landroid/content/res/Resources;
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getResources()Landroid/content/res/Resources;
 
     move-result-object v5
 
-    const v9, 0x7f100090
+    const v9, 0x7f10008f
 
     new-array v13, v7, [Ljava/lang/Object;
 
@@ -1357,7 +1357,7 @@
 
     move-result v2
 
-    const v5, 0x7f0600c1
+    const v5, 0x7f0600c4
 
     if-eqz v2, :cond_14
 
@@ -1372,25 +1372,25 @@
 
     if-nez v3, :cond_11
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getButtonFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v1
 
     invoke-virtual {v1, v6}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostButton()Landroid/widget/Button;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostButton()Landroid/widget/Button;
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$4;
+    new-instance v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;
 
-    invoke-direct {v2, v0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$4;-><init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)V
+    invoke-direct {v2, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getButtonInfo()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v1
 
@@ -1401,27 +1401,27 @@
     return-void
 
     :cond_11
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getButtonFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v1
 
     invoke-virtual {v1, v8}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getManageButton()Landroid/widget/Button;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getManageButton()Landroid/widget/Button;
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$5;->INSTANCE:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$5;
+    sget-object v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$5;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$5;
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getButtonInfo()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v1
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getButtonInfo()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v2
 
@@ -1433,11 +1433,11 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setTextColor(I)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getButtonInfo()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v4
 
-    const v5, 0x7f0801cd
+    const v5, 0x7f0801dc
 
     const/4 v6, 0x0
 
@@ -1451,28 +1451,28 @@
 
     invoke-static/range {v4 .. v10}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getButtonInfo()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v1
 
     if-eqz v3, :cond_12
 
-    const v2, 0x7f120dd3
+    const v2, 0x7f120e0c
 
     goto :goto_7
 
     :cond_12
     if-eqz v11, :cond_13
 
-    const v2, 0x7f120dd1
+    const v2, 0x7f120e0a
 
     goto :goto_7
 
     :cond_13
-    const v2, 0x7f120dd2
+    const v2, 0x7f120e0b
 
     :goto_7
-    invoke-virtual {v0, v2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getString(I)Ljava/lang/String;
+    invoke-virtual {v0, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
@@ -1484,13 +1484,13 @@
     return-void
 
     :cond_14
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getButtonFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v2
 
     invoke-virtual {v2, v7}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getUpgradeButton()Landroid/widget/Button;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getUpgradeButton()Landroid/widget/Button;
 
     move-result-object v2
 
@@ -1500,17 +1500,17 @@
 
     if-nez v1, :cond_15
 
-    const v1, 0x7f120dc5
+    const v1, 0x7f120dfe
 
     goto :goto_9
 
     :cond_15
-    const v1, 0x7f120dc7
+    const v1, 0x7f120e00
 
     :goto_9
     invoke-virtual {v2, v1}, Landroid/widget/Button;->setText(I)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getUpgradeButton()Landroid/widget/Button;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getUpgradeButton()Landroid/widget/Button;
 
     move-result-object v1
 
@@ -1524,21 +1524,21 @@
 
     invoke-static {v1, v2, v3, v8, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getUpgradeButton()Landroid/widget/Button;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getUpgradeButton()Landroid/widget/Button;
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$2;->INSTANCE:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$2;
+    sget-object v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getButtonInfo()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v1
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getButtonInfo()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v2
 
@@ -1546,7 +1546,7 @@
 
     if-eqz v12, :cond_16
 
-    const v3, 0x7f060126
+    const v3, 0x7f060128
 
     invoke-static {v2, v3}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
@@ -1562,15 +1562,15 @@
     :goto_a
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setTextColor(I)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getButtonInfo()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v13
 
     if-eqz v12, :cond_17
 
-    const v1, 0x7f0801ce
+    const v1, 0x7f0801dd
 
-    const v14, 0x7f0801ce
+    const v14, 0x7f0801dd
 
     goto :goto_b
 
@@ -1592,7 +1592,7 @@
 
     if-eqz v12, :cond_18
 
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->requireContext()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->requireContext()Landroid/content/Context;
 
     move-result-object v1
 
@@ -1600,7 +1600,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f120dc8
+    const v2, 0x7f120e01
 
     new-array v3, v7, [Ljava/lang/Object;
 
@@ -1608,7 +1608,7 @@
 
     aput-object v4, v3, v6
 
-    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -1635,19 +1635,19 @@
     move-result-object v4
 
     :cond_18
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getButtonInfo()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v1
 
     invoke-static {v1, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getButtonInfo()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$3;
+    new-instance v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;
 
-    invoke-direct {v2, v0, v12}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$3;-><init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;Z)V
+    invoke-direct {v2, v0, v12}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Z)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
@@ -1675,19 +1675,19 @@
 
     :cond_1b
     :goto_c
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v1
 
     invoke-virtual {v1, v7}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getRetry()Landroid/widget/Button;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getRetry()Landroid/widget/Button;
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$1;
+    new-instance v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$1;
 
-    invoke-direct {v2, v0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$configureUI$1;-><init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)V
+    invoke-direct {v2, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$1;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
@@ -1697,7 +1697,7 @@
 
     :cond_1c
     :goto_d
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v1
 
@@ -1709,23 +1709,23 @@
 .method private final configureViewpager(II)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->pagerAdapter:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->pagerAdapter:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
 
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->setPremiumTier(I)V
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->setPremiumTier(I)V
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->pagerAdapter:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->pagerAdapter:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
 
-    invoke-virtual {v0, p2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->setSubscriptionCount(I)V
+    invoke-virtual {v0, p2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->setSubscriptionCount(I)V
 
-    iget-object p2, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->pagerAdapter:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;
+    iget-object p2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->pagerAdapter:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
 
-    invoke-virtual {p2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;->configureViews()V
+    invoke-virtual {p2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->configureViews()V
 
-    iget-boolean p2, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->wasPagerPageSet:Z
+    iget-boolean p2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->wasPagerPageSet:Z
 
     if-nez p2, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
 
     move-result-object p2
 
@@ -1733,11 +1733,11 @@
 
     invoke-virtual {p2, p1, v0}, Lcom/discord/utilities/simple_pager/SimplePager;->setCurrentItem(IZ)V
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->configureLevelBubbles(I)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureLevelBubbles(I)V
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->wasPagerPageSet:Z
+    iput-boolean p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->wasPagerPageSet:Z
 
     :cond_0
     return-void
@@ -1746,9 +1746,9 @@
 .method public static final create(Landroid/content/Context;J)V
     .locals 1
 
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
 
-    invoke-virtual {v0, p0, p1, p2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;->create(Landroid/content/Context;J)V
+    invoke-virtual {v0, p0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;->create(Landroid/content/Context;J)V
 
     return-void
 .end method
@@ -1768,9 +1768,9 @@
 .method private final getBoostButton()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0xd
 
@@ -1788,9 +1788,9 @@
 .method private final getBoostInfo()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -1808,9 +1808,9 @@
 .method private final getBoostNumber()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostNumber$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostNumber$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -1828,9 +1828,9 @@
 .method private final getBoostProgressBar()Landroid/widget/ProgressBar;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostProgressBar$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostProgressBar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -1848,9 +1848,9 @@
 .method private final getBoostTier0Iv()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier0Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier0Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x3
 
@@ -1868,9 +1868,9 @@
 .method private final getBoostTier1Iv()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier1Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier1Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x4
 
@@ -1888,9 +1888,9 @@
 .method private final getBoostTier1Tv()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier1Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier1Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x5
 
@@ -1908,9 +1908,9 @@
 .method private final getBoostTier2Iv()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier2Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier2Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x6
 
@@ -1928,9 +1928,9 @@
 .method private final getBoostTier2Tv()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier2Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier2Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x7
 
@@ -1948,9 +1948,9 @@
 .method private final getBoostTier3Iv()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier3Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier3Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0x8
 
@@ -1968,9 +1968,9 @@
 .method private final getBoostTier3Tv()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->boostTier3Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier3Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0x9
 
@@ -1988,9 +1988,9 @@
 .method private final getButtonFlipper()Lcom/discord/app/AppViewFlipper;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->buttonFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->buttonFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0xc
 
@@ -2008,9 +2008,9 @@
 .method private final getButtonInfo()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->buttonInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->buttonInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0x10
 
@@ -2028,9 +2028,9 @@
 .method private final getFlipper()Lcom/discord/app/AppViewFlipper;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0xa
 
@@ -2048,7 +2048,7 @@
 .method private final getGuildId()J
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->guildId$delegate:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->guildId$delegate:Lkotlin/Lazy;
 
     invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
 
@@ -2066,9 +2066,9 @@
 .method private final getManageButton()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->manageButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->manageButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0xf
 
@@ -2086,9 +2086,9 @@
 .method private final getRetry()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0xb
 
@@ -2106,9 +2106,9 @@
 .method private final getUpgradeButton()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->upgradeButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->upgradeButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0xe
 
@@ -2126,9 +2126,9 @@
 .method private final getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0x11
 
@@ -2148,7 +2148,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d016a
+    const v0, 0x7f0d0174
 
     return v0
 .end method
@@ -2166,7 +2166,7 @@
 
     invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
 
     move-result-object p1
 
@@ -2174,23 +2174,23 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/simple_pager/SimplePager;->setWrapHeight(Z)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->pagerAdapter:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$PerksPagerAdapter;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->pagerAdapter:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
 
     check-cast v0, Landroidx/viewpager/widget/PagerAdapter;
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/simple_pager/SimplePager;->setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$onActivityCreated$1;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onActivityCreated$1;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$onActivityCreated$1;-><init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onActivityCreated$1;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
 
     check-cast v0, Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
 
@@ -2212,9 +2212,9 @@
 
     new-array v1, v0, [Ljava/lang/Object;
 
-    sget-object v2, Lcom/discord/app/e;->uy:Lcom/discord/app/e;
+    sget-object v2, Lcom/discord/app/e;->ux:Lcom/discord/app/e;
 
-    sget-wide v2, Lcom/discord/app/e;->ux:J
+    sget-wide v2, Lcom/discord/app/e;->uw:J
 
     invoke-static {v2, v3}, Lcom/discord/app/e;->k(J)Ljava/lang/String;
 
@@ -2224,9 +2224,9 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f120dc2
+    const v2, 0x7f120dfb
 
-    invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -2234,7 +2234,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostInfo()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostInfo()Landroid/widget/TextView;
 
     move-result-object v2
 
@@ -2268,19 +2268,19 @@
 
     new-array v1, p1, [Landroid/widget/ImageView;
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostTier0Iv()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier0Iv()Landroid/widget/ImageView;
 
     move-result-object v2
 
     aput-object v2, v1, v3
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostTier1Iv()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier1Iv()Landroid/widget/ImageView;
 
     move-result-object v2
 
     aput-object v2, v1, v0
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostTier2Iv()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier2Iv()Landroid/widget/ImageView;
 
     move-result-object v2
 
@@ -2288,7 +2288,7 @@
 
     aput-object v2, v1, v4
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostTier3Iv()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier3Iv()Landroid/widget/ImageView;
 
     move-result-object v2
 
@@ -2296,11 +2296,11 @@
 
     aput-object v2, v1, v5
 
-    invoke-static {v1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->levelBackgrounds:Ljava/util/List;
+    iput-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->levelBackgrounds:Ljava/util/List;
 
     new-array p1, p1, [Landroid/widget/TextView;
 
@@ -2308,31 +2308,31 @@
 
     aput-object v1, p1, v3
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostTier1Tv()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier1Tv()Landroid/widget/TextView;
 
     move-result-object v1
 
     aput-object v1, p1, v0
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostTier2Tv()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier2Tv()Landroid/widget/TextView;
 
     move-result-object v0
 
     aput-object v0, p1, v4
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getBoostTier3Tv()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier3Tv()Landroid/widget/TextView;
 
     move-result-object v0
 
     aput-object v0, p1, v5
 
-    invoke-static {p1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {p1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->levelText:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->levelText:Ljava/util/List;
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->fetchData()V
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->fetchData()V
 
     return-void
 .end method
@@ -2342,7 +2342,7 @@
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getGuildId()J
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getGuildId()J
 
     move-result-wide v0
 
@@ -2352,7 +2352,7 @@
 
     if-eqz v4, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getGuildId()J
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getGuildId()J
 
     move-result-wide v0
 
@@ -2363,7 +2363,7 @@
     if-nez v4, :cond_1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getAppActivity()Lcom/discord/app/AppActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getAppActivity()Lcom/discord/app/AppActivity;
 
     move-result-object v0
 
@@ -2372,17 +2372,17 @@
     invoke-virtual {v0}, Lcom/discord/app/AppActivity;->finish()V
 
     :cond_1
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion;
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion;
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->getGuildId()J
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getGuildId()J
 
     move-result-wide v1
 
-    invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Model$Companion;->get(J)Lrx/Observable;
+    invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion;->get(J)Lrx/Observable;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -2406,7 +2406,7 @@
 
     move-result-object v5
 
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->requireContext()Landroid/content/Context;
 
     move-result-object v6
 
@@ -2416,13 +2416,13 @@
 
     const/4 v9, 0x0
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$onViewBoundOrOnResume$1;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1;
 
     move-object v1, p0
 
-    check-cast v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
+    check-cast v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
 
     move-object v10, v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion.smali
similarity index 63%
rename from com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion.smali
index 1c8c66d5cd..8bca106604 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;
+.class public final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
 .super Ljava/lang/Object;
-.source "WidgetServerBoostStatus.kt"
+.source "WidgetPremiumGuildSubscriptionConfirmation.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;-><init>()V
 
     return-void
 .end method
@@ -50,7 +50,11 @@
 
     move-result-object p2
 
-    const-class p3, Lcom/discord/widgets/servers/boosting/WidgetServerBoostStatus;
+    const-string p3, "Intent().putExtra(INTENT_EXTRA_GUILD_ID, guildId)"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class p3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
     invoke-static {p1, p3, p2}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$WhenMappings.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$WhenMappings.smali
new file mode 100644
index 0000000000..3636fe70e3
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$WhenMappings.smali
@@ -0,0 +1,70 @@
+.class public final synthetic Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$WhenMappings;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field public static final synthetic $EnumSwitchMapping$0:[I
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 3
+
+    invoke-static {}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->values()[Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->NOT_IN_PROGRESS:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->CALL_IN_PROGRESS:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x2
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ERROR:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x3
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->COMPLETED:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x4
+
+    aput v2, v0, v1
+
+    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
new file mode 100644
index 0000000000..693872a476
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1.smali
@@ -0,0 +1,97 @@
+.class final synthetic Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1;
+.super Lkotlin/jvm/internal/j;
+.source "WidgetPremiumGuildSubscriptionConfirmation.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><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/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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$State;)V"
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1;->invoke(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1;->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$State;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1.smali
new file mode 100644
index 0000000000..8a114024cd
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1.smali
@@ -0,0 +1,55 @@
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1;
+.super Ljava/lang/Object;
+.source "WidgetPremiumGuildSubscriptionConfirmation.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 2
+
+    iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+
+    invoke-static {p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->access$getViewModel$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+
+    invoke-static {v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->access$getGuildId$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)J
+
+    move-result-wide v0
+
+    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$2.smali
new file mode 100644
index 0000000000..85993f55d1
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$2.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$2;
+.super Ljava/lang/Object;
+.source "WidgetPremiumGuildSubscriptionConfirmation.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$2;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+
+    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/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$2;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->onBackPressed()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$3.smali
new file mode 100644
index 0000000000..e3e8e3b1fd
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$3.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$3;
+.super Ljava/lang/Object;
+.source "WidgetPremiumGuildSubscriptionConfirmation.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$3;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+
+    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/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$3;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->onBackPressed()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali
similarity index 59%
rename from com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali
index 73cb9a9812..e45b2c8e04 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerBoostConfirmation.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali
@@ -1,12 +1,12 @@
-.class public final Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
+.class public final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 .super Lcom/discord/app/AppFragment;
-.source "WidgetServerBoostConfirmation.kt"
+.source "WidgetPremiumGuildSubscriptionConfirmation.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion;
+        Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
     }
 .end annotation
 
@@ -16,7 +16,7 @@
 
 .field private static final COOLDOWN_DAYS:I = 0x7
 
-.field public static final Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion;
+.field public static final Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
 
 .field private static final INTENT_EXTRA_GUILD_ID:Ljava/lang/String; = "GUILD_ID"
 
@@ -46,7 +46,7 @@
 
 .field private final select$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private viewModel:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+.field private viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
 .field private final warning$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -55,7 +55,7 @@
 .method static constructor <clinit>()V
     .locals 6
 
-    const-class v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
+    const-class v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
     const/16 v1, 0xa
 
@@ -281,15 +281,15 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
 
     const/4 v1, 0x0
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion;
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
 
     return-void
 .end method
@@ -299,37 +299,29 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a00e2
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a00e7
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->warning$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a00dd
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const v0, 0x7f0a00e3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a00e8
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->warning$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a00de
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a00e4
 
@@ -337,23 +329,23 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->level$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00e6
+    const v0, 0x7f0a00e5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->select$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->level$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00df
+    const v0, 0x7f0a00e7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->select$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a00e0
 
@@ -361,7 +353,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a00e1
 
@@ -369,66 +361,74 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->error$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a00e2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->error$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0278
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->guildId:J
+    iput-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->guildId:J
 
     return-void
 .end method
 
-.method public static final synthetic access$configureUI(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;)V
+.method public static final synthetic access$configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->configureUI(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->configureUI(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$getGuildId$p(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;)J
+.method public static final synthetic access$getGuildId$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)J
     .locals 2
 
-    iget-wide v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->guildId:J
+    iget-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->guildId:J
 
     return-wide v0
 .end method
 
-.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;)Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->viewModel:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    iget-object p0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     if-nez p0, :cond_0
 
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
 .end method
 
-.method public static final synthetic access$setGuildId$p(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;J)V
+.method public static final synthetic access$setGuildId$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;J)V
     .locals 0
 
-    iput-wide p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->guildId:J
+    iput-wide p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->guildId:J
 
     return-void
 .end method
 
-.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
+.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->viewModel:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     return-void
 .end method
@@ -438,7 +438,7 @@
 
     move-object/from16 v0, p0
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object v1
 
@@ -470,7 +470,7 @@
 
     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-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getName()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getName()Landroid/widget/TextView;
 
     move-result-object v2
 
@@ -505,13 +505,13 @@
     goto :goto_0
 
     :cond_0
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getLevel()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
 
     move-result-object v2
 
-    const v3, 0x7f120df5
+    const v3, 0x7f120e2e
 
-    invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getString(I)Ljava/lang/String;
+    invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
@@ -519,11 +519,102 @@
 
     invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getLevel()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
 
     move-result-object v10
 
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->requireContext()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->requireContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v3, 0x7f040155
+
+    invoke-static {v2, v3, v1, v5, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+
+    move-result v11
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/16 v15, 0xe
+
+    const/16 v16, 0x0
+
+    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+
+    :goto_0
+    return-void
+
+    :cond_1
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
+
+    move-result-object v2
+
+    const v3, 0x7f120e2d
+
+    invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/CharSequence;
+
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
+
+    move-result-object v10
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->requireContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v3, 0x7f040154
+
+    invoke-static {v2, v3, v1, v5, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+
+    move-result v11
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/16 v15, 0xe
+
+    const/16 v16, 0x0
+
+    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+
+    return-void
+
+    :cond_2
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
+
+    move-result-object v2
+
+    const v3, 0x7f120e2c
+
+    invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/CharSequence;
+
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
+
+    move-result-object v10
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->requireContext()Landroid/content/Context;
 
     move-result-object v2
 
@@ -547,107 +638,16 @@
 
     invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
-    :goto_0
-    return-void
-
-    :cond_1
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getLevel()Landroid/widget/TextView;
-
-    move-result-object v2
-
-    const v3, 0x7f120df4
-
-    invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getString(I)Ljava/lang/String;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/CharSequence;
-
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getLevel()Landroid/widget/TextView;
-
-    move-result-object v10
-
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->requireContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v3, 0x7f040152
-
-    invoke-static {v2, v3, v1, v5, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
-
-    move-result v11
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x0
-
-    const/4 v14, 0x0
-
-    const/16 v15, 0xe
-
-    const/16 v16, 0x0
-
-    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
-
-    return-void
-
-    :cond_2
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getLevel()Landroid/widget/TextView;
-
-    move-result-object v2
-
-    const v3, 0x7f120df3
-
-    invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getString(I)Ljava/lang/String;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/CharSequence;
-
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getLevel()Landroid/widget/TextView;
-
-    move-result-object v10
-
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->requireContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v3, 0x7f040151
-
-    invoke-static {v2, v3, v1, v5, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
-
-    move-result v11
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x0
-
-    const/4 v14, 0x0
-
-    const/16 v15, 0xe
-
-    const/16 v16, 0x0
-
-    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
-
     return-void
 
     :cond_3
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getLevel()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
 
     move-result-object v1
 
-    const v2, 0x7f120dbf
+    const v2, 0x7f120df8
 
-    invoke-virtual {v0, v2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getString(I)Ljava/lang/String;
+    invoke-virtual {v0, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
@@ -655,11 +655,11 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getLevel()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
 
     move-result-object v3
 
-    const v4, 0x7f08029e
+    const v4, 0x7f0802ae
 
     const/4 v5, 0x0
 
@@ -679,21 +679,21 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120dca
+    const v0, 0x7f120e03
 
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->setActionBarTitle(I)Lkotlin/Unit;
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->setActionBarTitle(I)Lkotlin/Unit;
 
     check-cast p1, Ljava/lang/CharSequence;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->setActionBarSubtitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->setActionBarSubtitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
 
     return-void
 .end method
 
-.method private final configureUI(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;)V
+.method private final configureUI(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;)V
     .locals 13
 
-    instance-of v0, p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
+    instance-of v0, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
 
     if-eqz v0, :cond_0
 
@@ -702,15 +702,15 @@
     :cond_0
     if-eqz p1, :cond_6
 
-    check-cast p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
+    check-cast p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v0
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object p1
 
@@ -719,7 +719,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v0
 
@@ -731,19 +731,19 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->configureToolbar(Ljava/lang/String;)V
+    invoke-direct {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->configureToolbar(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v0
 
-    invoke-direct {p0, v0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->configureGuildCard(Lcom/discord/models/domain/ModelGuild;)V
+    invoke-direct {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->configureGuildCard(Lcom/discord/models/domain/ModelGuild;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
 
-    const v1, 0x7f100094
+    const v1, 0x7f100093
 
     const/4 v2, 0x1
 
@@ -763,13 +763,17 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getWarning()Landroid/widget/TextView;
+    const-string v1, "resources.getQuantityStr\u2026DOWN_DAYS, COOLDOWN_DAYS)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getWarning()Landroid/widget/TextView;
 
     move-result-object v1
 
     sget-object v7, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
 
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->requireContext()Landroid/content/Context;
 
     move-result-object v8
 
@@ -777,13 +781,13 @@
 
     invoke-static {v8, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f120ddb
+    const v3, 0x7f120e14
 
     new-array v4, v2, [Ljava/lang/Object;
 
     aput-object v0, v4, v6
 
-    invoke-virtual {p0, v3, v4}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v3, v4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -807,13 +811,13 @@
 
     invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ordinal()I
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ordinal()I
 
     move-result p1
 
@@ -838,19 +842,19 @@
     goto :goto_0
 
     :cond_2
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object p1
 
     invoke-virtual {p1, v2}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
 
     move-result-object p1
 
     invoke-static {p1, v6, v6, v3, v0}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getError()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
@@ -860,19 +864,19 @@
     return-void
 
     :cond_3
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object p1
 
     invoke-virtual {p1, v6}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
 
     move-result-object p1
 
     invoke-static {p1, v6, v6, v3, v0}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getError()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
@@ -881,19 +885,19 @@
     return-void
 
     :cond_4
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object p1
 
     invoke-virtual {p1, v6}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
 
     move-result-object p1
 
     invoke-static {p1, v2, v6, v3, v0}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getError()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
@@ -902,19 +906,19 @@
     return-void
 
     :cond_5
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object p1
 
     invoke-virtual {p1, v6}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
 
     move-result-object p1
 
     invoke-static {p1, v6, v6, v3, v0}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getError()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
@@ -925,7 +929,7 @@
     :cond_6
     new-instance p1, Lkotlin/r;
 
-    const-string v0, "null cannot be cast to non-null type com.discord.widgets.servers.boosting.BoostInProgressViewModel.State.Loaded"
+    const-string v0, "null cannot be cast to non-null type com.discord.widgets.servers.premiumguild.PremiumGuildSubscriptionInProgressViewModel.State.Loaded"
 
     invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
@@ -935,9 +939,9 @@
 .method public static final create(Landroid/content/Context;J)V
     .locals 1
 
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion;
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
 
-    invoke-virtual {v0, p0, p1, p2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion;->create(Landroid/content/Context;J)V
+    invoke-virtual {v0, p0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;J)V
 
     return-void
 .end method
@@ -945,9 +949,9 @@
 .method private final getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -965,9 +969,9 @@
 .method private final getCancel()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x6
 
@@ -985,9 +989,9 @@
 .method private final getClose()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x7
 
@@ -1005,9 +1009,9 @@
 .method private final getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0x9
 
@@ -1025,9 +1029,9 @@
 .method private final getError()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->error$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->error$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0x8
 
@@ -1045,9 +1049,9 @@
 .method private final getFlipper()Lcom/discord/app/AppViewFlipper;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -1065,9 +1069,9 @@
 .method private final getLevel()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->level$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->level$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x4
 
@@ -1085,9 +1089,9 @@
 .method private final getName()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x3
 
@@ -1105,9 +1109,9 @@
 .method private final getSelect()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->select$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->select$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x5
 
@@ -1125,9 +1129,9 @@
 .method private final getWarning()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->warning$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->warning$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -1147,7 +1151,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0169
+    const v0, 0x7f0d0173
 
     return v0
 .end method
@@ -1173,7 +1177,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onCreate(Landroid/os/Bundle;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getMostRecentIntent()Landroid/content/Intent;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getMostRecentIntent()Landroid/content/Intent;
 
     move-result-object p1
 
@@ -1185,7 +1189,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->guildId:J
+    iput-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->guildId:J
 
     return-void
 .end method
@@ -1195,7 +1199,7 @@
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onResume()V
 
-    iget-wide v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->guildId:J
+    iget-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->guildId:J
 
     const-wide/16 v2, 0x0
 
@@ -1210,7 +1214,7 @@
     if-nez v4, :cond_1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getAppActivity()Lcom/discord/app/AppActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getAppActivity()Lcom/discord/app/AppActivity;
 
     move-result-object v0
 
@@ -1219,7 +1223,7 @@
     invoke-virtual {v0}, Lcom/discord/app/AppActivity;->finish()V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object v0
 
@@ -1227,7 +1231,7 @@
 
     move-result-object v0
 
-    const-class v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
@@ -1237,31 +1241,31 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->viewModel:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->viewModel:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     const-string v1, "viewModel"
 
     if-nez v0, :cond_2
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
-    iget-wide v2, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->guildId:J
+    iget-wide v2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->guildId:J
 
-    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->setGuildId(J)V
+    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->setGuildId(J)V
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->viewModel:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     if-nez v0, :cond_3
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
-    invoke-virtual {v0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->getState()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->getState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1277,7 +1281,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v1
 
@@ -1285,7 +1289,7 @@
 
     invoke-static {v1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v2, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
+    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
     const/4 v4, 0x0
 
@@ -1293,13 +1297,13 @@
 
     const/4 v6, 0x0
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onResume$1;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1;
 
     move-object v7, p0
 
-    check-cast v7, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;
+    check-cast v7, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
-    invoke-direct {v0, v7}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onResume$1;-><init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;)V
+    invoke-direct {v0, v7}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)V
 
     move-object v7, v0
 
@@ -1323,37 +1327,37 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getSelect()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getSelect()Landroid/view/View;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$1;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$1;-><init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getCancel()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getCancel()Landroid/view/View;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$2;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$2;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$2;-><init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$2;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->getClose()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getClose()Landroid/view/View;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$3;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$3;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$onViewBound$3;-><init>(Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$3;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion.smali
similarity index 65%
rename from com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion.smali
index 620085bc61..97be79a306 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion;
+.class public final Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion;
 .super Ljava/lang/Object;
-.source "WidgetServerRemoveBoostConfirmation.kt"
+.source "WidgetRemovePremiumGuildSubscriptionConfirmation.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion;-><init>()V
 
     return-void
 .end method
@@ -56,7 +56,11 @@
 
     move-result-object p2
 
-    const-class p3, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
+    const-string p3, "Intent()\n          .putE\u2026PTION_ID, subscriptionId)"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class p3, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
 
     invoke-static {p1, p3, p2}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$WhenMappings.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$WhenMappings.smali
new file mode 100644
index 0000000000..16ed53471e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$WhenMappings.smali
@@ -0,0 +1,70 @@
+.class public final synthetic Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$WhenMappings;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field public static final synthetic $EnumSwitchMapping$0:[I
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 3
+
+    invoke-static {}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->values()[Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->NOT_IN_PROGRESS:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->CALL_IN_PROGRESS:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x2
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ERROR:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x3
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->COMPLETED:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x4
+
+    aput v2, v0, v1
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onResume$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onResume$1.smali
new file mode 100644
index 0000000000..50d0514e35
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onResume$1.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onResume$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetRemovePremiumGuildSubscriptionConfirmation.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onResume$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onResume$1;->invoke(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onResume$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
+
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->access$configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$1.smali
new file mode 100644
index 0000000000..6618818f88
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$1.smali
@@ -0,0 +1,61 @@
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$1;
+.super Ljava/lang/Object;
+.source "WidgetRemovePremiumGuildSubscriptionConfirmation.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 4
+
+    iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
+
+    invoke-static {p1}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->access$getViewModel$p(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
+
+    invoke-static {v0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->access$getGuildId$p(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;)J
+
+    move-result-wide v0
+
+    iget-object v2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
+
+    invoke-static {v2}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->access$getSubscriptionId$p(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;)J
+
+    move-result-wide v2
+
+    invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->removePremiumGuildSubscription(JJ)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$2.smali
new file mode 100644
index 0000000000..5165380ebb
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$2.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$2;
+.super Ljava/lang/Object;
+.source "WidgetRemovePremiumGuildSubscriptionConfirmation.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$2;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
+
+    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/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$2;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->onBackPressed()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation.smali
similarity index 57%
rename from com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation.smali
rename to com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation.smali
index dd21961de2..1352d234d3 100644
--- a/com.discord/smali/com/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation.smali
@@ -1,12 +1,12 @@
-.class public final Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
+.class public final Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
 .super Lcom/discord/app/AppFragment;
-.source "WidgetServerRemoveBoostConfirmation.kt"
+.source "WidgetRemovePremiumGuildSubscriptionConfirmation.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion;
+        Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion;
     }
 .end annotation
 
@@ -14,7 +14,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final Companion:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion;
+.field public static final Companion:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion;
 
 .field private static final INTENT_EXTRA_GUILD_ID:Ljava/lang/String; = "GUILD_ID"
 
@@ -40,14 +40,14 @@
 
 .field private subscriptionId:J
 
-.field private viewModel:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+.field private viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 6
 
-    const-class v0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;
+    const-class v0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;
 
     const/4 v1, 0x7
 
@@ -207,15 +207,15 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion;
 
     const/4 v1, 0x0
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion;
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion;
 
     return-void
 .end method
@@ -225,21 +225,13 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a00ea
+    const v0, 0x7f0a00eb
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a00ee
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a00ef
 
@@ -247,7 +239,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->level$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a00f0
 
@@ -255,15 +247,15 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->select$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->level$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00ec
+    const v0, 0x7f0a00f1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->select$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a00ed
 
@@ -271,84 +263,92 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->error$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a00ee
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->error$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0278
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->guildId:J
+    iput-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->guildId:J
 
-    iput-wide v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->subscriptionId:J
+    iput-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->subscriptionId:J
 
     return-void
 .end method
 
-.method public static final synthetic access$configureUI(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;)V
+.method public static final synthetic access$configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->configureUI(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->configureUI(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$getGuildId$p(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;)J
+.method public static final synthetic access$getGuildId$p(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;)J
     .locals 2
 
-    iget-wide v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->guildId:J
+    iget-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->guildId:J
 
     return-wide v0
 .end method
 
-.method public static final synthetic access$getSubscriptionId$p(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;)J
+.method public static final synthetic access$getSubscriptionId$p(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;)J
     .locals 2
 
-    iget-wide v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->subscriptionId:J
+    iget-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->subscriptionId:J
 
     return-wide v0
 .end method
 
-.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;)Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->viewModel:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    iget-object p0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     if-nez p0, :cond_0
 
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
 .end method
 
-.method public static final synthetic access$setGuildId$p(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;J)V
+.method public static final synthetic access$setGuildId$p(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;J)V
     .locals 0
 
-    iput-wide p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->guildId:J
+    iput-wide p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->guildId:J
 
     return-void
 .end method
 
-.method public static final synthetic access$setSubscriptionId$p(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;J)V
+.method public static final synthetic access$setSubscriptionId$p(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;J)V
     .locals 0
 
-    iput-wide p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->subscriptionId:J
+    iput-wide p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->subscriptionId:J
 
     return-void
 .end method
 
-.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;)V
+.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->viewModel:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     return-void
 .end method
@@ -358,7 +358,7 @@
 
     move-object/from16 v0, p0
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object v1
 
@@ -390,7 +390,7 @@
 
     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-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getName()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getName()Landroid/widget/TextView;
 
     move-result-object v2
 
@@ -425,13 +425,13 @@
     goto :goto_0
 
     :cond_0
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getLevel()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
 
     move-result-object v2
 
-    const v3, 0x7f120df5
+    const v3, 0x7f120e2e
 
-    invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getString(I)Ljava/lang/String;
+    invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
@@ -439,11 +439,102 @@
 
     invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getLevel()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
 
     move-result-object v10
 
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->requireContext()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->requireContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v3, 0x7f040155
+
+    invoke-static {v2, v3, v1, v5, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+
+    move-result v11
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/16 v15, 0xe
+
+    const/16 v16, 0x0
+
+    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+
+    :goto_0
+    return-void
+
+    :cond_1
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
+
+    move-result-object v2
+
+    const v3, 0x7f120e2d
+
+    invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/CharSequence;
+
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
+
+    move-result-object v10
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->requireContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v3, 0x7f040154
+
+    invoke-static {v2, v3, v1, v5, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+
+    move-result v11
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/16 v15, 0xe
+
+    const/16 v16, 0x0
+
+    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+
+    return-void
+
+    :cond_2
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
+
+    move-result-object v2
+
+    const v3, 0x7f120e2c
+
+    invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/CharSequence;
+
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
+
+    move-result-object v10
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->requireContext()Landroid/content/Context;
 
     move-result-object v2
 
@@ -467,107 +558,16 @@
 
     invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
-    :goto_0
-    return-void
-
-    :cond_1
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getLevel()Landroid/widget/TextView;
-
-    move-result-object v2
-
-    const v3, 0x7f120df4
-
-    invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getString(I)Ljava/lang/String;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/CharSequence;
-
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getLevel()Landroid/widget/TextView;
-
-    move-result-object v10
-
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->requireContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v3, 0x7f040152
-
-    invoke-static {v2, v3, v1, v5, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
-
-    move-result v11
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x0
-
-    const/4 v14, 0x0
-
-    const/16 v15, 0xe
-
-    const/16 v16, 0x0
-
-    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
-
-    return-void
-
-    :cond_2
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getLevel()Landroid/widget/TextView;
-
-    move-result-object v2
-
-    const v3, 0x7f120df3
-
-    invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getString(I)Ljava/lang/String;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/CharSequence;
-
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getLevel()Landroid/widget/TextView;
-
-    move-result-object v10
-
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->requireContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v3, 0x7f040151
-
-    invoke-static {v2, v3, v1, v5, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
-
-    move-result v11
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x0
-
-    const/4 v14, 0x0
-
-    const/16 v15, 0xe
-
-    const/16 v16, 0x0
-
-    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
-
     return-void
 
     :cond_3
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getLevel()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
 
     move-result-object v1
 
-    const v2, 0x7f120dbf
+    const v2, 0x7f120df8
 
-    invoke-virtual {v0, v2}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getString(I)Ljava/lang/String;
+    invoke-virtual {v0, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
@@ -575,11 +575,11 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getLevel()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getLevel()Landroid/widget/TextView;
 
     move-result-object v3
 
-    const v4, 0x7f08029e
+    const v4, 0x7f0802ae
 
     const/4 v5, 0x0
 
@@ -599,21 +599,21 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120dca
+    const v0, 0x7f120e03
 
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->setActionBarTitle(I)Lkotlin/Unit;
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->setActionBarTitle(I)Lkotlin/Unit;
 
     check-cast p1, Ljava/lang/CharSequence;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->setActionBarSubtitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->setActionBarSubtitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
 
     return-void
 .end method
 
-.method private final configureUI(Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State;)V
+.method private final configureUI(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;)V
     .locals 5
 
-    instance-of v0, p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Uninitialized;
+    instance-of v0, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
 
     if-eqz v0, :cond_0
 
@@ -622,15 +622,15 @@
     :cond_0
     if-eqz p1, :cond_6
 
-    check-cast p1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;
+    check-cast p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v0
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object p1
 
@@ -639,7 +639,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v0
 
@@ -651,21 +651,21 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->configureToolbar(Ljava/lang/String;)V
+    invoke-direct {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->configureToolbar(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v0
 
-    invoke-direct {p0, v0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->configureGuildCard(Lcom/discord/models/domain/ModelGuild;)V
+    invoke-direct {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->configureGuildCard(Lcom/discord/models/domain/ModelGuild;)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$State$Loaded;->getBoostState()Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel$BoostState;->ordinal()I
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->ordinal()I
 
     move-result p1
 
@@ -694,7 +694,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object p1
 
@@ -704,13 +704,13 @@
     return-void
 
     :cond_3
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
 
     move-result-object p1
 
     invoke-static {p1, v4, v4, v3, v1}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getError()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
@@ -719,13 +719,13 @@
     return-void
 
     :cond_4
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
 
     move-result-object p1
 
     invoke-static {p1, v0, v4, v3, v1}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getError()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
@@ -734,13 +734,13 @@
     return-void
 
     :cond_5
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
 
     move-result-object p1
 
     invoke-static {p1, v4, v4, v3, v1}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getError()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
@@ -751,7 +751,7 @@
     :cond_6
     new-instance p1, Lkotlin/r;
 
-    const-string v0, "null cannot be cast to non-null type com.discord.widgets.servers.boosting.BoostInProgressViewModel.State.Loaded"
+    const-string v0, "null cannot be cast to non-null type com.discord.widgets.servers.premiumguild.PremiumGuildSubscriptionInProgressViewModel.State.Loaded"
 
     invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
 
@@ -761,7 +761,7 @@
 .method public static final create(Landroid/content/Context;JJ)V
     .locals 6
 
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion;
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion;
 
     move-object v1, p0
 
@@ -769,7 +769,7 @@
 
     move-wide v4, p3
 
-    invoke-virtual/range {v0 .. v5}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion;->create(Landroid/content/Context;JJ)V
+    invoke-virtual/range {v0 .. v5}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;JJ)V
 
     return-void
 .end method
@@ -777,9 +777,9 @@
 .method private final getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -797,9 +797,9 @@
 .method private final getCancel()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x4
 
@@ -817,9 +817,9 @@
 .method private final getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x6
 
@@ -837,9 +837,9 @@
 .method private final getError()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->error$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->error$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x5
 
@@ -857,9 +857,9 @@
 .method private final getLevel()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->level$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->level$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -877,9 +877,9 @@
 .method private final getName()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -897,9 +897,9 @@
 .method private final getSelect()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->select$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->select$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x3
 
@@ -919,7 +919,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d016e
+    const v0, 0x7f0d0178
 
     return v0
 .end method
@@ -945,7 +945,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onCreate(Landroid/os/Bundle;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getMostRecentIntent()Landroid/content/Intent;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getMostRecentIntent()Landroid/content/Intent;
 
     move-result-object p1
 
@@ -957,9 +957,9 @@
 
     move-result-wide v2
 
-    iput-wide v2, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->guildId:J
+    iput-wide v2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->guildId:J
 
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getMostRecentIntent()Landroid/content/Intent;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getMostRecentIntent()Landroid/content/Intent;
 
     move-result-object p1
 
@@ -969,7 +969,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->subscriptionId:J
+    iput-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->subscriptionId:J
 
     return-void
 .end method
@@ -979,7 +979,7 @@
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onResume()V
 
-    iget-wide v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->guildId:J
+    iget-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->guildId:J
 
     const-wide/16 v2, 0x0
 
@@ -994,7 +994,7 @@
     if-nez v4, :cond_1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getAppActivity()Lcom/discord/app/AppActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getAppActivity()Lcom/discord/app/AppActivity;
 
     move-result-object v0
 
@@ -1003,7 +1003,7 @@
     invoke-virtual {v0}, Lcom/discord/app/AppActivity;->finish()V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object v0
 
@@ -1011,7 +1011,7 @@
 
     move-result-object v0
 
-    const-class v1, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
@@ -1021,31 +1021,31 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->viewModel:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->viewModel:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     const-string v1, "viewModel"
 
     if-nez v0, :cond_2
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
-    iget-wide v2, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->guildId:J
+    iget-wide v2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->guildId:J
 
-    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->setGuildId(J)V
+    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->setGuildId(J)V
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->viewModel:Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     if-nez v0, :cond_3
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
-    invoke-virtual {v0}, Lcom/discord/widgets/servers/boosting/BoostInProgressViewModel;->getState()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->getState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1061,7 +1061,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v1
 
@@ -1079,9 +1079,9 @@
 
     const/4 v6, 0x0
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onResume$1;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onResume$1;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onResume$1;-><init>(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onResume$1;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;)V
 
     move-object v7, v0
 
@@ -1105,25 +1105,25 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getSelect()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getSelect()Landroid/view/View;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$1;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$1;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$1;-><init>(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$1;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->getCancel()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getCancel()Landroid/view/View;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$2;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$2;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$onViewBound$2;-><init>(Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$onViewBound$2;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$hideVideoOverlay$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$hideVideoOverlay$1.smali
index d2d38ce76a..94cb1d573c 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$hideVideoOverlay$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$hideVideoOverlay$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog$hideVideoOverlay$1;->invoke(Landroid/view/ViewPropertyAnimator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$1.smali
index bf52efd047..484c91e10b 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$2.smali
index fe8629fdf0..d8508fabee 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$2;->invoke(Landroid/view/ViewPropertyAnimator;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1$onFinalImageSet$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1$onFinalImageSet$1.smali
index 371d902b4a..251056321d 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1$onFinalImageSet$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1$onFinalImageSet$1.smali
@@ -57,7 +57,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p1}, Lcom/facebook/drawee/d/a;->gD()Landroid/graphics/drawable/Animatable;
+    invoke-interface {p1}, Lcom/facebook/drawee/d/a;->gH()Landroid/graphics/drawable/Animatable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1.smali
index d2da5dad47..2c95565f63 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1.smali
@@ -95,7 +95,7 @@
     :catch_0
     move-exception p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     move-object v2, p1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
index bade7244fd..24ccde256f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
@@ -156,7 +156,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0129
+    const v0, 0x7f0a012a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -164,7 +164,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetChangeLog;->bodyTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a012c
+    const v0, 0x7f0a012d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -172,7 +172,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetChangeLog;->thumbnailIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a012e
+    const v0, 0x7f0a012f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -180,7 +180,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetChangeLog;->videoVw$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a012f
+    const v0, 0x7f0a0130
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -252,7 +252,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f0a012d
+    const v1, 0x7f0a012e
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -268,7 +268,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/ImageButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const v1, 0x7f0a012a
+    const v1, 0x7f0a012b
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -284,7 +284,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/ImageButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const v1, 0x7f0a012b
+    const v1, 0x7f0a012c
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -345,7 +345,7 @@
 
     invoke-static {v1, v2, v0, v4, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gi()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gm()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v1
 
@@ -363,13 +363,11 @@
 
     check-cast v1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {v1, p1}, Lcom/facebook/drawee/backends/pipeline/e;->aw(Ljava/lang/String;)Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-virtual {v1, p1}, Lcom/facebook/drawee/backends/pipeline/e;->ar(Ljava/lang/String;)Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object p1
 
-    invoke-virtual {p1, v0}, Lcom/facebook/drawee/backends/pipeline/e;->w(Z)Lcom/facebook/drawee/controller/a;
-
-    move-result-object p1
+    iput-boolean v0, p1, Lcom/facebook/drawee/controller/a;->KW:Z
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
 
@@ -377,13 +375,11 @@
 
     check-cast v0, Lcom/facebook/drawee/controller/ControllerListener;
 
-    invoke-virtual {p1, v0}, Lcom/facebook/drawee/backends/pipeline/e;->c(Lcom/facebook/drawee/controller/ControllerListener;)Lcom/facebook/drawee/controller/a;
-
-    move-result-object p1
+    iput-object v0, p1, Lcom/facebook/drawee/controller/a;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gF()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gJ()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
@@ -476,7 +472,7 @@
 .method private final getDateString(Landroid/content/Context;)Ljava/lang/CharSequence;
     .locals 3
 
-    const v0, 0x7f12038e
+    const v0, 0x7f120393
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetChangeLog;->getString(I)Ljava/lang/String;
 
@@ -637,7 +633,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00c9
+    const v0, 0x7f0d00d2
 
     return v0
 .end method
@@ -727,7 +723,7 @@
 
     invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f121315
+    const p1, 0x7f121368
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -757,7 +753,7 @@
 
     invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f12038d
+    const v0, 0x7f120392
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetChangeLog;->getString(I)Ljava/lang/String;
 
@@ -793,7 +789,7 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V
 
-    const p1, 0x7f120391
+    const p1, 0x7f120396
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$1.smali
index 040b8ac78e..17a51e8371 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$1.smali
@@ -88,7 +88,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0464
+    .packed-switch 0x7f0a0475
         :pswitch_1
         :pswitch_0
     .end packed-switch
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali
index 988e759c6f..6092b6f4b0 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali
@@ -59,7 +59,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/e;->un:Ljava/lang/String;
+    sget-object v0, Lcom/discord/app/e;->um:Ljava/lang/String;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
index d77003538f..10757dc518 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
@@ -59,7 +59,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/e;->uq:Ljava/lang/String;
+    sget-object v0, Lcom/discord/app/e;->uo:Ljava/lang/String;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$3.smali
index 9087d5634a..b43aa6505c 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$3.smali
@@ -47,7 +47,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
     const-string v1, "it"
 
@@ -65,7 +65,7 @@
 
     const/4 v2, 0x2
 
-    invoke-static {v0, p1, v1, v2, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;->launch$default(Lcom/discord/widgets/settings/nitro/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
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali
index c3cd140982..9e074d57f8 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali
@@ -47,7 +47,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion;
 
     const-string v1, "it"
 
@@ -61,7 +61,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion;->launch(Landroid/content/Context;)V
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion;->launch(Landroid/content/Context;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali
index 0bcfea04b5..64a8e00786 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali
@@ -47,7 +47,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$Companion;
 
     const-string v1, "it"
 
@@ -61,7 +61,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion;->launch(Landroid/content/Context;)V
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$Companion;->launch(Landroid/content/Context;)V
 
     return-void
 .end method
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
index d8b1927f5b..77dca8d07f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/WidgetSettings$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$showLogoutDialog$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$showLogoutDialog$1.smali
index 34b68ddd79..173f876884 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$showLogoutDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$showLogoutDialog$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings$showLogoutDialog$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
index 7fd202d863..182e5dfc15 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
@@ -65,6 +65,8 @@
 
 .field private final settingsVoice$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field private final userProfileHeaderView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -72,7 +74,7 @@
 
     const-class v0, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const/16 v1, 0x17
+    const/16 v1, 0x18
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
@@ -104,6 +106,28 @@
 
     move-result-object v3
 
+    const-string v4, "userProfileHeaderView"
+
+    const-string v5, "getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x1
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
     const-string v4, "settingsNitro"
 
     const-string v5, "getSettingsNitro()Landroid/widget/TextView;"
@@ -116,7 +140,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x1
+    const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
@@ -138,7 +162,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x2
+    const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
@@ -160,7 +184,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x3
+    const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
@@ -182,7 +206,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x4
+    const/4 v3, 0x5
 
     aput-object v2, v1, v3
 
@@ -204,7 +228,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x5
+    const/4 v3, 0x6
 
     aput-object v2, v1, v3
 
@@ -226,7 +250,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x6
+    const/4 v3, 0x7
 
     aput-object v2, v1, v3
 
@@ -248,7 +272,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x7
+    const/16 v3, 0x8
 
     aput-object v2, v1, v3
 
@@ -270,7 +294,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x8
+    const/16 v3, 0x9
 
     aput-object v2, v1, v3
 
@@ -292,7 +316,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x9
+    const/16 v3, 0xa
 
     aput-object v2, v1, v3
 
@@ -314,7 +338,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0xa
+    const/16 v3, 0xb
 
     aput-object v2, v1, v3
 
@@ -336,7 +360,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0xb
+    const/16 v3, 0xc
 
     aput-object v2, v1, v3
 
@@ -358,7 +382,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0xc
+    const/16 v3, 0xd
 
     aput-object v2, v1, v3
 
@@ -380,7 +404,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0xd
+    const/16 v3, 0xe
 
     aput-object v2, v1, v3
 
@@ -402,7 +426,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0xe
+    const/16 v3, 0xf
 
     aput-object v2, v1, v3
 
@@ -424,7 +448,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0xf
+    const/16 v3, 0x10
 
     aput-object v2, v1, v3
 
@@ -446,7 +470,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x10
+    const/16 v3, 0x11
 
     aput-object v2, v1, v3
 
@@ -468,7 +492,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x11
+    const/16 v3, 0x12
 
     aput-object v2, v1, v3
 
@@ -490,7 +514,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x12
+    const/16 v3, 0x13
 
     aput-object v2, v1, v3
 
@@ -512,7 +536,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x13
+    const/16 v3, 0x14
 
     aput-object v2, v1, v3
 
@@ -534,7 +558,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x14
+    const/16 v3, 0x15
 
     aput-object v2, v1, v3
 
@@ -556,7 +580,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x15
+    const/16 v3, 0x16
 
     aput-object v2, v1, v3
 
@@ -578,7 +602,7 @@
 
     check-cast v0, Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x16
+    const/16 v2, 0x17
 
     aput-object v0, v1, v2
 
@@ -600,7 +624,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a066c
+    const v0, 0x7f0a0686
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -608,7 +632,15 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->appInfoTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06b7
+    const v0, 0x7f0a07dd
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->userProfileHeaderView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a06d1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -616,7 +648,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsNitro$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06b8
+    const v0, 0x7f0a06d2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -624,7 +656,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsNitroBoosting$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06b9
+    const v0, 0x7f0a06d3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -632,7 +664,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsNitroGifting$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0681
+    const v0, 0x7f0a069b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -640,7 +672,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsBilling$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a064e
+    const v0, 0x7f0a0668
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -648,7 +680,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsAccount$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06c5
+    const v0, 0x7f0a06df
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -656,7 +688,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsPrivacy$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0678
+    const v0, 0x7f0a0692
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -664,7 +696,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsAuthorizedApp$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0693
+    const v0, 0x7f0a06ad
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -672,7 +704,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsConnections$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a066d
+    const v0, 0x7f0a0687
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -680,7 +712,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsAppearance$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a067c
+    const v0, 0x7f0a0696
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -688,7 +720,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsBehavior$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06af
+    const v0, 0x7f0a06c9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -696,7 +728,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsLanguage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06be
+    const v0, 0x7f0a06d8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -704,7 +736,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsNotifications$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0697
+    const v0, 0x7f0a06b1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -712,7 +744,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsGameActivity$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d6
+    const v0, 0x7f0a06f0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -720,7 +752,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsTextImages$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06dd
+    const v0, 0x7f0a06f7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -728,7 +760,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsVoice$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0695
+    const v0, 0x7f0a06af
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -736,7 +768,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsDeveloperDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0696
+    const v0, 0x7f0a06b0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -744,7 +776,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsDeveloperHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0694
+    const v0, 0x7f0a06ae
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -752,7 +784,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsDeveloper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d5
+    const v0, 0x7f0a06ef
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -760,7 +792,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsSupport$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a066b
+    const v0, 0x7f0a0685
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -768,7 +800,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsAcknowledgements$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a068c
+    const v0, 0x7f0a06a6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -776,7 +808,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsChangelog$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ba
+    const v0, 0x7f0a06d4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -906,12 +938,12 @@
 
     if-ne p1, v0, :cond_3
 
-    const p1, 0x7f120e27
+    const p1, 0x7f120e5e
 
     goto :goto_3
 
     :cond_3
-    const p1, 0x7f120e26
+    const p1, 0x7f120e5d
 
     :goto_3
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings;->getString(I)Ljava/lang/String;
@@ -952,7 +984,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x5
+    const/4 v2, 0x6
 
     aget-object v1, v1, v2
 
@@ -972,7 +1004,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x14
+    const/16 v2, 0x15
 
     aget-object v1, v1, v2
 
@@ -992,7 +1024,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x9
+    const/16 v2, 0xa
 
     aget-object v1, v1, v2
 
@@ -1012,7 +1044,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x7
+    const/16 v2, 0x8
 
     aget-object v1, v1, v2
 
@@ -1032,7 +1064,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xa
+    const/16 v2, 0xb
 
     aget-object v1, v1, v2
 
@@ -1052,7 +1084,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x4
+    const/4 v2, 0x5
 
     aget-object v1, v1, v2
 
@@ -1072,7 +1104,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x15
+    const/16 v2, 0x16
 
     aget-object v1, v1, v2
 
@@ -1092,7 +1124,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x8
+    const/16 v2, 0x9
 
     aget-object v1, v1, v2
 
@@ -1112,7 +1144,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x12
+    const/16 v2, 0x13
 
     aget-object v1, v1, v2
 
@@ -1132,7 +1164,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x10
+    const/16 v2, 0x11
 
     aget-object v1, v1, v2
 
@@ -1152,7 +1184,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x11
+    const/16 v2, 0x12
 
     aget-object v1, v1, v2
 
@@ -1172,7 +1204,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xd
+    const/16 v2, 0xe
 
     aget-object v1, v1, v2
 
@@ -1192,7 +1224,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xb
+    const/16 v2, 0xc
 
     aget-object v1, v1, v2
 
@@ -1212,7 +1244,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x1
+    const/4 v2, 0x2
 
     aget-object v1, v1, v2
 
@@ -1232,7 +1264,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x2
+    const/4 v2, 0x3
 
     aget-object v1, v1, v2
 
@@ -1252,7 +1284,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x16
+    const/16 v2, 0x17
 
     aget-object v1, v1, v2
 
@@ -1272,7 +1304,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x3
+    const/4 v2, 0x4
 
     aget-object v1, v1, v2
 
@@ -1292,7 +1324,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xc
+    const/16 v2, 0xd
 
     aget-object v1, v1, v2
 
@@ -1312,7 +1344,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x6
+    const/4 v2, 0x7
 
     aget-object v1, v1, v2
 
@@ -1332,7 +1364,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x13
+    const/16 v2, 0x14
 
     aget-object v1, v1, v2
 
@@ -1352,7 +1384,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xe
+    const/16 v2, 0xf
 
     aget-object v1, v1, v2
 
@@ -1372,7 +1404,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xf
+    const/16 v2, 0x10
 
     aget-object v1, v1, v2
 
@@ -1385,6 +1417,26 @@
     return-object v0
 .end method
 
+.method private final getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->userProfileHeaderView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$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/widgets/user/profile/UserProfileHeaderView;
+
+    return-object v0
+.end method
+
 .method public static final launch(Landroid/content/Context;)V
     .locals 1
 
@@ -1415,19 +1467,19 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const p1, 0x7f120b06
+    const p1, 0x7f120b34
 
     invoke-virtual {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f12124d
+    const v2, 0x7f12129e
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f040276
+    const v2, 0x7f040279
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setDialogAttrTheme(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -1441,7 +1493,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f120368
+    const v1, 0x7f12036d
 
     const/4 v2, 0x2
 
@@ -1461,7 +1513,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0196
+    const v0, 0x7f0d01a0
 
     return v0
 .end method
@@ -1475,7 +1527,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f121231
+    const p1, 0x7f12127e
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -1507,11 +1559,39 @@
 
     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;
 
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettings;->getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/widgets/user/Badge;->Companion:Lcom/discord/widgets/user/Badge$Companion;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/WidgetSettings;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v1
+
+    const-string v2, "requireFragmentManager()"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/WidgetSettings;->requireContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    const-string v3, "requireContext()"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(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;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->setOnBadgeClick(Lkotlin/jvm/functions/Function1;)V
+
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettings;->getAppInfoTextView()Landroid/widget/TextView;
 
     move-result-object p1
 
-    const v0, 0x7f1200d1
+    const v0, 0x7f1200d4
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettings;->getString(I)Ljava/lang/String;
 
@@ -1523,7 +1603,7 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v0, " - 9.5.0 (950)"
+    const-string v0, " - 9.6.3 (963)"
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1721,9 +1801,31 @@
 .end method
 
 .method public final onViewBoundOrOnResume()V
-    .locals 13
+    .locals 17
 
-    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
+    invoke-super/range {p0 .. p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
+
+    sget-object v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->Companion:Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettings;->getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    move-result-object v1
+
+    move-object/from16 v2, p0
+
+    check-cast v2, Landroidx/fragment/app/Fragment;
+
+    move-object/from16 v7, p0
+
+    check-cast v7, Lcom/discord/app/AppComponent;
+
+    const-wide/16 v4, -0x1
+
+    const/4 v6, 0x0
+
+    move-object v3, v7
+
+    invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;->bind(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Landroidx/fragment/app/Fragment;Lcom/discord/app/AppComponent;JLjava/lang/Long;)V
 
     sget-object v0, Lcom/discord/widgets/settings/WidgetSettings$Model;->Companion:Lcom/discord/widgets/settings/WidgetSettings$Model$Companion;
 
@@ -1731,47 +1833,43 @@
 
     move-result-object v0
 
-    move-object v1, p0
+    const/4 v1, 0x0
 
-    check-cast v1, Lcom/discord/app/AppComponent;
+    const/4 v2, 0x2
 
-    const/4 v2, 0x0
+    invoke-static {v0, v7, 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;
 
-    const/4 v3, 0x2
+    move-result-object v8
 
-    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;
+    invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    move-result-object v4
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v5
+    move-result-object v9
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1;
 
-    move-object v1, p0
+    move-object/from16 v1, p0
 
     check-cast v1, Lcom/discord/widgets/settings/WidgetSettings;
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/settings/WidgetSettings;)V
 
-    move-object v10, v0
+    move-object v14, v0
 
-    check-cast v10, Lkotlin/jvm/functions/Function1;
+    check-cast v14, Lkotlin/jvm/functions/Function1;
 
-    const/4 v6, 0x0
+    const/4 v10, 0x0
 
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    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
+    const/4 v13, 0x0
+
+    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
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model.smali
index 115fdd7784..5104c658cc 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model.smali
@@ -375,6 +375,10 @@
 
     iget v2, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;->fontScale:I
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
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
index 8b8f843f98..f3369b75fc 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$2.smali
index 665e207302..1e3f14a893 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$2;->invoke(Ljava/lang/Integer;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
index dc5d30df34..9446d7d306 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
@@ -346,7 +346,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0676
+    const v0, 0x7f0a0690
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -354,7 +354,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->themeLightCs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0675
+    const v0, 0x7f0a068f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -362,7 +362,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->themDarkCs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0677
+    const v0, 0x7f0a0691
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -370,7 +370,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->themePureEvilCs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0674
+    const v0, 0x7f0a068e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -378,7 +378,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->syncSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0671
+    const v0, 0x7f0a068b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -386,7 +386,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->fontScalingSeekbar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0670
+    const v0, 0x7f0a068a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -394,7 +394,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->fontScalingReset$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a066e
+    const v0, 0x7f0a0688
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -402,7 +402,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->fontScalingText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01da
+    const v0, 0x7f0a01db
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -410,7 +410,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->messageAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01dd
+    const v0, 0x7f0a01de
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -418,7 +418,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->messageUsername$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01db
+    const v0, 0x7f0a01dc
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -426,7 +426,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->messageBot$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01de
+    const v0, 0x7f0a01df
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -434,7 +434,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->messageTimestamp$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01d9
+    const v0, 0x7f0a01da
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -442,7 +442,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->messageText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -1002,7 +1002,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f07005b
+    const v3, 0x7f07005a
 
     const/4 v4, 0x0
 
@@ -1068,7 +1068,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f121242
+    const v0, 0x7f12128f
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->getString(I)Ljava/lang/String;
 
@@ -1086,7 +1086,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d019b
+    const v0, 0x7f0d01a5
 
     return v0
 .end method
@@ -1096,11 +1096,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f1200dd
+    const p1, 0x7f1200e0
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->setActionBarTitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f121231
+    const p1, 0x7f12127e
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->setActionBarSubtitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder.smali
index 737ab50ab7..041050983e 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder.smali
@@ -235,7 +235,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->onDeauthorizeClick:Lkotlin/jvm/functions/Function1;
 
-    const p1, 0x7f0a049c
+    const p1, 0x7f0a04b2
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -243,7 +243,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->nameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a049b
+    const p1, 0x7f0a04b1
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -251,7 +251,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->iconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0499
+    const p1, 0x7f0a04af
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -259,7 +259,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->descriptionLabelTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a049a
+    const p1, 0x7f0a04b0
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -267,7 +267,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->descriptionTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a049d
+    const p1, 0x7f0a04b3
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -275,7 +275,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->permissionsRv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0498
+    const p1, 0x7f0a04ae
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -283,9 +283,9 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->deauthorizeBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object p1, Lcom/discord/views/c;->BO:Lcom/discord/views/c;
+    sget-object p1, Lcom/discord/views/c;->BY:Lcom/discord/views/c;
 
-    invoke-static {}, Lcom/discord/views/c;->eD()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+    invoke-static {}, Lcom/discord/views/c;->eI()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1.smali
index 5ce6e8362a..ef4f3d28bf 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1;->invoke(Lcom/discord/models/domain/ModelOAuth2Token;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.smali
index c6e9712574..f526518d98 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.smali
@@ -58,7 +58,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d019d
+    const v0, 0x7f0d01a7
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1.smali
index 37bc7bc0ab..a27f1c6bdb 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1.smali
index 4a3c724904..1f9e8d2aa9 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$loadAuthorizedApps$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$loadAuthorizedApps$1.smali
index d2ded66d4d..724d1ab500 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$loadAuthorizedApps$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$loadAuthorizedApps$1.smali
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$loadAuthorizedApps$1;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali
index 47475a011e..6f278bc3f8 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali
@@ -83,7 +83,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a00b7
+    const v0, 0x7f0a00b8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -225,13 +225,13 @@
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v1, 0x7f1204bd
+    const v1, 0x7f1204c7
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f1204cb
+    const v1, 0x7f1204d6
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -239,7 +239,7 @@
 
     const/4 v1, 0x0
 
-    const v2, 0x7f120368
+    const v2, 0x7f12036d
 
     const/4 v3, 0x2
 
@@ -253,7 +253,7 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const p1, 0x7f1204bc
+    const p1, 0x7f1204c6
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -275,7 +275,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d019c
+    const v0, 0x7f0d01a6
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
index ae583b42cc..066764d4c8 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
@@ -145,7 +145,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a067d
+    const v0, 0x7f0a0697
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -153,7 +153,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->backButtonCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0680
+    const v0, 0x7f0a069a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -161,7 +161,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->shiftSendCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a067f
+    const v0, 0x7f0a0699
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -169,7 +169,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->devModeCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a067e
+    const v0, 0x7f0a0698
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -275,7 +275,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d019e
+    const v0, 0x7f0d01a8
 
     return v0
 .end method
@@ -285,11 +285,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f121231
+    const p1, 0x7f12127e
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120619
+    const p1, 0x7f120625
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -383,7 +383,7 @@
 
     aput-object v4, v1, v3
 
-    const v3, 0x7f1204ef
+    const v3, 0x7f1204fa
 
     invoke-virtual {p0, v3, v1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
index ad9e09cc53..e34842e45d 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
@@ -17,7 +17,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a3
+    const v0, 0x7f0d01ad
 
     return v0
 .end method
@@ -39,7 +39,7 @@
 
     invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f1204f0
+    const p1, 0x7f1204fb
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion.smali
index 1685788d1d..555bad5e36 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion.smali
@@ -109,7 +109,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/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
index 5fab9b4576..5e6b3502bf 100644
--- a/com.discord/smali/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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/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
index 28937024f7..212425a1d6 100644
--- a/com.discord/smali/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
@@ -77,7 +77,7 @@
 
     iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const v5, 0x7f1211df
+    const v5, 0x7f121226
 
     invoke-virtual {v1, v5}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->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 v6, 0x7f1206c0
+    const v6, 0x7f1206db
 
     invoke-virtual {v1, v6}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->getString(I)Ljava/lang/String;
 
@@ -101,7 +101,7 @@
 
     iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const v7, 0x7f1206c1
+    const v7, 0x7f1206dc
 
     invoke-virtual {v1, v7}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->getString(I)Ljava/lang/String;
 
@@ -109,7 +109,7 @@
 
     const/4 v8, 0x0
 
-    const v1, 0x7f0a0493
+    const v1, 0x7f0a04a8
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -131,7 +131,7 @@
 
     const/4 v11, 0x0
 
-    const v1, 0x7f0d01bf
+    const v1, 0x7f0d01cf
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$onViewBoundOrOnResume$1.smali
index dd4884274b..4b24be0642 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity.smali
index 2b83477bd0..231722f595 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity.smali
@@ -215,7 +215,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a069d
+    const v0, 0x7f0a06b7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -223,7 +223,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->statusCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a069e
+    const v0, 0x7f0a06b8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -231,7 +231,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->trackCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a069c
+    const v0, 0x7f0a06b6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -239,7 +239,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->playingTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a069b
+    const v0, 0x7f0a06b5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -247,7 +247,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->playingSubtitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0699
+    const v0, 0x7f0a06b3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -255,7 +255,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->playingContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a069a
+    const v0, 0x7f0a06b4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -263,7 +263,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->playingIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0698
+    const v0, 0x7f0a06b2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -313,7 +313,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0800e9
+    const v1, 0x7f0800ed
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -337,7 +337,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f121005
+    const v1, 0x7f121041
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -362,7 +362,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0800ed
+    const v1, 0x7f0800f1
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -370,7 +370,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f121000
+    const v1, 0x7f12103c
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -378,7 +378,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f121002
+    const v1, 0x7f12103e
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -663,7 +663,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120d29
+    const v1, 0x7f120d6f
 
     const/4 v2, 0x1
 
@@ -678,7 +678,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a8
+    const v0, 0x7f0d01b2
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
index 8705deb051..f531e7a5d3 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
@@ -1058,139 +1058,139 @@
     const/4 p0, -0x1
 
     :goto_1
-    const v0, 0x7f0803be
+    const v0, 0x7f0803d6
 
     packed-switch p0, :pswitch_data_0
 
     return v0
 
     :pswitch_0
-    const p0, 0x7f0803c5
+    const p0, 0x7f0803dd
 
     return p0
 
     :pswitch_1
-    const p0, 0x7f0803d3
+    const p0, 0x7f0803eb
 
     return p0
 
     :pswitch_2
-    const p0, 0x7f0803d7
+    const p0, 0x7f0803ef
 
     return p0
 
     :pswitch_3
-    const p0, 0x7f0803d8
+    const p0, 0x7f0803f0
 
     return p0
 
     :pswitch_4
-    const p0, 0x7f0803cf
+    const p0, 0x7f0803e7
 
     return p0
 
     :pswitch_5
-    const p0, 0x7f0803c6
+    const p0, 0x7f0803de
 
     return p0
 
     :pswitch_6
-    const p0, 0x7f0803ca
+    const p0, 0x7f0803e2
 
     return p0
 
     :pswitch_7
-    const p0, 0x7f0803bc
-
-    return p0
-
-    :pswitch_8
-    const p0, 0x7f0803cc
-
-    return p0
-
-    :pswitch_9
-    const p0, 0x7f0803c1
-
-    return p0
-
-    :pswitch_a
-    const p0, 0x7f0803c9
-
-    return p0
-
-    :pswitch_b
-    const p0, 0x7f0803d9
-
-    return p0
-
-    :pswitch_c
-    const p0, 0x7f0803c8
-
-    return p0
-
-    :pswitch_d
-    const p0, 0x7f0803d5
-
-    return p0
-
-    :pswitch_e
-    const p0, 0x7f0803d0
-
-    return p0
-
-    :pswitch_f
-    const p0, 0x7f0803b8
-
-    return p0
-
-    :pswitch_10
-    const p0, 0x7f0803b9
-
-    return p0
-
-    :pswitch_11
     const p0, 0x7f0803d4
 
     return p0
 
+    :pswitch_8
+    const p0, 0x7f0803e4
+
+    return p0
+
+    :pswitch_9
+    const p0, 0x7f0803d9
+
+    return p0
+
+    :pswitch_a
+    const p0, 0x7f0803e1
+
+    return p0
+
+    :pswitch_b
+    const p0, 0x7f0803f1
+
+    return p0
+
+    :pswitch_c
+    const p0, 0x7f0803e0
+
+    return p0
+
+    :pswitch_d
+    const p0, 0x7f0803ed
+
+    return p0
+
+    :pswitch_e
+    const p0, 0x7f0803e8
+
+    return p0
+
+    :pswitch_f
+    const p0, 0x7f0803d0
+
+    return p0
+
+    :pswitch_10
+    const p0, 0x7f0803d1
+
+    return p0
+
+    :pswitch_11
+    const p0, 0x7f0803ec
+
+    return p0
+
     :pswitch_12
-    const p0, 0x7f0803d2
+    const p0, 0x7f0803ea
 
     return p0
 
     :pswitch_13
-    const p0, 0x7f0803ce
+    const p0, 0x7f0803e6
 
     return p0
 
     :pswitch_14
-    const p0, 0x7f0803cd
+    const p0, 0x7f0803e5
 
     return p0
 
     :pswitch_15
-    const p0, 0x7f0803cb
+    const p0, 0x7f0803e3
 
     return p0
 
     :pswitch_16
-    const p0, 0x7f0803c7
+    const p0, 0x7f0803df
 
     return p0
 
     :pswitch_17
-    const p0, 0x7f0803c2
+    const p0, 0x7f0803da
 
     return p0
 
     :pswitch_18
-    const p0, 0x7f0803bf
+    const p0, 0x7f0803d7
 
     return p0
 
     :pswitch_19
-    const p0, 0x7f0803bd
+    const p0, 0x7f0803d5
 
     return p0
 
@@ -1198,12 +1198,12 @@
     return v0
 
     :pswitch_1b
-    const p0, 0x7f0803bb
+    const p0, 0x7f0803d3
 
     return p0
 
     :pswitch_1c
-    const p0, 0x7f0803ba
+    const p0, 0x7f0803d2
 
     return p0
 
@@ -1667,139 +1667,139 @@
     const/4 p0, -0x1
 
     :goto_1
-    const v0, 0x7f12056d
+    const v0, 0x7f120578
 
     packed-switch p0, :pswitch_data_0
 
     return v0
 
     :pswitch_0
-    const p0, 0x7f121128
+    const p0, 0x7f12116a
 
     return p0
 
     :pswitch_1
-    const p0, 0x7f1212c0
+    const p0, 0x7f121311
 
     return p0
 
     :pswitch_2
-    const p0, 0x7f121328
+    const p0, 0x7f12137b
 
     return p0
 
     :pswitch_3
-    const p0, 0x7f120eed
+    const p0, 0x7f120f24
 
     return p0
 
     :pswitch_4
-    const p0, 0x7f1208ec
+    const p0, 0x7f12090c
 
     return p0
 
     :pswitch_5
-    const p0, 0x7f120b07
+    const p0, 0x7f120b35
 
     return p0
 
     :pswitch_6
-    const p0, 0x7f12054f
+    const p0, 0x7f12055a
 
     return p0
 
     :pswitch_7
-    const p0, 0x7f120bb3
+    const p0, 0x7f120be5
 
     return p0
 
     :pswitch_8
-    const p0, 0x7f120599
+    const p0, 0x7f1205a5
 
     return p0
 
     :pswitch_9
-    const p0, 0x7f1208eb
+    const p0, 0x7f12090b
 
     return p0
 
     :pswitch_a
-    const p0, 0x7f120aa7
+    const p0, 0x7f120ac8
 
     return p0
 
     :pswitch_b
-    const p0, 0x7f121329
+    const p0, 0x7f12137c
 
     return p0
 
     :pswitch_c
-    const p0, 0x7f120a4a
+    const p0, 0x7f120a69
 
     return p0
 
     :pswitch_d
-    const p0, 0x7f12119a
+    const p0, 0x7f1211de
 
     return p0
 
     :pswitch_e
-    const p0, 0x7f120f03
+    const p0, 0x7f120f3a
 
     return p0
 
     :pswitch_f
-    const p0, 0x7f1202a4
+    const p0, 0x7f1202a8
 
     return p0
 
     :pswitch_10
-    const p0, 0x7f120488
+    const p0, 0x7f120493
 
     return p0
 
     :pswitch_11
-    const p0, 0x7f121154
+    const p0, 0x7f121196
 
     return p0
 
     :pswitch_12
-    const p0, 0x7f1210c2
+    const p0, 0x7f121103
 
     return p0
 
     :pswitch_13
-    const p0, 0x7f120e73
+    const p0, 0x7f120ea9
 
     return p0
 
     :pswitch_14
-    const p0, 0x7f120d40
+    const p0, 0x7f120d86
 
     return p0
 
     :pswitch_15
-    const p0, 0x7f120bb2
+    const p0, 0x7f120be4
 
     return p0
 
     :pswitch_16
-    const p0, 0x7f120a49
+    const p0, 0x7f120a68
 
     return p0
 
     :pswitch_17
-    const p0, 0x7f120678
+    const p0, 0x7f120686
 
     return p0
 
     :pswitch_18
-    const p0, 0x7f12057f
+    const p0, 0x7f12058a
 
     return p0
 
     :pswitch_19
-    const p0, 0x7f12056c
+    const p0, 0x7f120577
 
     return p0
 
@@ -1807,12 +1807,12 @@
     return v0
 
     :pswitch_1b
-    const p0, 0x7f1204b9
+    const p0, 0x7f1204c3
 
     return p0
 
     :pswitch_1c
-    const p0, 0x7f12049b
+    const p0, 0x7f1204a5
 
     return p0
 
@@ -1906,7 +1906,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01ae
+    const v0, 0x7f0d01b8
 
     return v0
 .end method
@@ -1928,17 +1928,17 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f121231
+    const v0, 0x7f12127e
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const v0, 0x7f120aa9
+    const v0, 0x7f120aca
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->setActionBarTitle(I)Lkotlin/Unit;
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f0a06b0
+    const v0, 0x7f0a06ca
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1946,7 +1946,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->language:Landroid/view/View;
 
-    const v0, 0x7f0a06b2
+    const v0, 0x7f0a06cc
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1956,7 +1956,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->languageText:Landroid/widget/TextView;
 
-    const v0, 0x7f0a06b1
+    const v0, 0x7f0a06cb
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1966,7 +1966,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->languageFlag:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a06b6
+    const v0, 0x7f0a06d0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale.smali
index 46e3c01118..32f52ee3e9 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale.smali
@@ -105,7 +105,7 @@
 
     invoke-direct {p0, p1, v0}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a06b3
+    const p1, 0x7f0a06cd
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -113,7 +113,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a06b4
+    const p1, 0x7f0a06ce
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter.smali
index c827cc4bdd..fbb503fdd7 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter.smali
@@ -82,7 +82,7 @@
 
     new-instance p1, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale;
 
-    const p2, 0x7f0d01b0
+    const p2, 0x7f0d01ba
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale;-><init>(ILcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter;)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali
index f3c5b5e7f2..9656584622 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali
@@ -236,7 +236,7 @@
 
     aput-object v3, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali
index bcccdaa7e1..79edafe472 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali
@@ -75,7 +75,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a06b5
+    const v0, 0x7f0a06cf
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -121,7 +121,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01af
+    const v0, 0x7f0d01b9
 
     return v0
 .end method
@@ -161,7 +161,7 @@
 
     const-string v1, "adapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Model;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Model;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5.smali
index a8f7a62ee7..6770f3b9d5 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
index fd5a47e723..9219f6ebf3 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
@@ -169,7 +169,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a06d8
+    const v0, 0x7f0a06f2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -177,7 +177,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->attachmentsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d9
+    const v0, 0x7f0a06f3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -185,7 +185,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->embedsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06da
+    const v0, 0x7f0a06f4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -193,7 +193,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->linksCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06db
+    const v0, 0x7f0a06f5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -201,7 +201,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->syncCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d7
+    const v0, 0x7f0a06f1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -231,7 +231,7 @@
 
     const-string v0, "userSettings"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -360,7 +360,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01b1
+    const v0, 0x7f0d01bb
 
     return v0
 .end method
@@ -370,11 +370,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f121231
+    const p1, 0x7f12127e
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f121122
+    const p1, 0x7f121164
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -416,7 +416,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getInlineAttachmentMedia()Z
@@ -429,9 +429,9 @@
 
     move-result-object p1
 
-    sget-object v0, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
-    const v0, 0x7f12097d
+    const v0, 0x7f12099d
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getString(I)Ljava/lang/String;
 
@@ -487,7 +487,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getInlineEmbedMedia()Z
@@ -516,7 +516,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getRenderEmbeds()Z
@@ -545,7 +545,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getSyncTextAndImages()Z
@@ -570,7 +570,7 @@
 
     if-nez p1, :cond_4
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     invoke-virtual {p1}, Lcom/discord/stores/StoreUserSettings;->getAllowAnimatedEmojisObservable()Lrx/Observable;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali
index 20cf6e9cf1..a45e6e7fb2 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
index 16a1e60e29..cf16039dc6 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
@@ -217,7 +217,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a06c0
+    const v0, 0x7f0a06da
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -225,7 +225,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->enabledToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ae
+    const v0, 0x7f0a06c8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -233,7 +233,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->enabledInAppToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06c3
+    const v0, 0x7f0a06dd
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -241,7 +241,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->wakeLockToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06bf
+    const v0, 0x7f0a06d9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -249,7 +249,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->blinkToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06c2
+    const v0, 0x7f0a06dc
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -257,7 +257,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->vibrateToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06c1
+    const v0, 0x7f0a06db
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -265,7 +265,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->soundsToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06c4
+    const v0, 0x7f0a06de
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -509,7 +509,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01b3
+    const v0, 0x7f0d01bd
 
     return v0
 .end method
@@ -523,11 +523,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f121231
+    const p1, 0x7f12127e
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120c36
+    const p1, 0x7f120c6a
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -643,7 +643,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali
index 00b2b2ccc9..4ea294639e 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali
index c6affbaac6..def24a2053 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali
@@ -119,7 +119,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a06bd
+    const v0, 0x7f0a06d7
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -127,7 +127,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs;->notificationsSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ae
+    const v0, 0x7f0a06c8
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -135,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs;->notificationsInAppSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06bb
+    const v0, 0x7f0a06d5
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -241,7 +241,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01b2
+    const v0, 0x7f0d01bc
 
     return v0
 .end method
@@ -273,7 +273,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$LocalState.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$LocalState.smali
index 175a0ca7ed..54b7202d7f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$LocalState.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$LocalState.smali
@@ -263,6 +263,10 @@
 
     iget v2, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;->explicitContentFilter:I
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
diff --git a/com.discord/smali/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
index f7190c9fa6..b209b7b622 100644
--- a/com.discord/smali/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
@@ -96,7 +96,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/d/a;->LG()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lu()Lrx/Scheduler;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion.smali
index 4fd5004f1a..7557b7a88a 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion.smali
@@ -119,7 +119,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali
index 25ab89f717..3e870815ff 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali
@@ -407,6 +407,10 @@
 
     iget v2, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;->explicitContentFilter:I
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
index 3d33ba6391..d29163b48d 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
@@ -81,7 +81,7 @@
 
     invoke-virtual/range {v0 .. v5}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1;->invoke(Landroidx/appcompat/app/AlertDialog;Landroid/widget/TextView;Landroid/widget/TextView;Landroid/widget/TextView;Landroid/widget/TextView;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -109,15 +109,15 @@
 
     invoke-static {p5, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f1211e3
+    const v0, 0x7f12122a
 
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f1211e0
+    const p2, 0x7f121227
 
     invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f1211e1
+    const p2, 0x7f121228
 
     invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V
 
@@ -129,7 +129,7 @@
 
     invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const p2, 0x7f1211e2
+    const p2, 0x7f121229
 
     invoke-virtual {p5, p2}, Landroid/widget/TextView;->setText(I)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali
index 874a8e82ce..945bbea3b8 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali
@@ -81,7 +81,7 @@
 
     invoke-virtual/range {v0 .. v5}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1;->invoke(Landroidx/appcompat/app/AlertDialog;Landroid/widget/TextView;Landroid/widget/TextView;Landroid/widget/TextView;Landroid/widget/TextView;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -109,15 +109,15 @@
 
     invoke-static {p5, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f120d2d
+    const v0, 0x7f120d73
 
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f120d2a
+    const p2, 0x7f120d70
 
     invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f120d2b
+    const p2, 0x7f120d71
 
     invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V
 
@@ -129,7 +129,7 @@
 
     invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const p2, 0x7f120d2c
+    const p2, 0x7f120d72
 
     invoke-virtual {p5, p2}, Landroid/widget/TextView;->setText(I)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
index 71b7189885..84eaabde3a 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
@@ -79,7 +79,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f1204b3
+    const v0, 0x7f1204bd
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali
index c0a0857e4e..3c795efa3c 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali
@@ -102,7 +102,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali
index 834af6e90e..0cd8c08420 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali
@@ -102,7 +102,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
index 9fd147bfbb..a4377212e1 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1;->invoke(Lcom/discord/models/domain/Harvest;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -75,13 +75,13 @@
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v1, 0x7f1204b2
+    const v1, 0x7f1204bc
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f1204b1
+    const v1, 0x7f1204bb
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -89,7 +89,7 @@
 
     const/4 v1, 0x0
 
-    const v2, 0x7f120c77
+    const v2, 0x7f120cb0
 
     const/4 v3, 0x2
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
index be28a57e88..2be274002d 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -86,7 +86,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v1, 0x7f1204a9
+    const v1, 0x7f1204b3
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -96,7 +96,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2;->$context:Landroid/content/Context;
 
-    const v1, 0x7f1204a8
+    const v1, 0x7f1204b2
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -111,7 +111,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120c77
+    const v0, 0x7f120cb0
 
     const/4 v1, 0x2
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1.smali
index 159c2a8026..1044b191ac 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$2.smali
index 7114d02f25..f8e782fc19 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$2;->invoke(Lcom/discord/models/domain/Harvest;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -82,7 +82,7 @@
 
     invoke-static {p1, v1, v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2;->invoke$default(Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2;Ljava/lang/String;ILjava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     :cond_1
     return-void
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3.smali
index 65d44f50a2..2747a7f851 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3.smali
@@ -62,7 +62,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1.smali
index e31399bc86..e8e9a0bde4 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
index fcd9680b1d..e8c7b4766f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -72,13 +72,13 @@
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v1, 0x7f1204a7
+    const v1, 0x7f1204b1
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f1204ac
+    const v1, 0x7f1204b6
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -90,7 +90,7 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const v2, 0x7f120c77
+    const v2, 0x7f120cb0
 
     invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -98,7 +98,7 @@
 
     const/4 v1, 0x0
 
-    const v2, 0x7f120368
+    const v2, 0x7f12036d
 
     const/4 v3, 0x2
 
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
index 0754f196f6..a49a415d49 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$1.smali
index 268e97ecb1..31774c18f1 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2.smali
index aabfe36cb0..2162822fd9 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2;->invoke(Ljava/util/Set;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
index 0e9e279e21..8f8f2fed02 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
@@ -437,7 +437,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a06cb
+    const v0, 0x7f0a06e5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -445,7 +445,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->explicitContentRadio0$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06cc
+    const v0, 0x7f0a06e6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -453,7 +453,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->explicitContentRadio1$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06cd
+    const v0, 0x7f0a06e7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -473,7 +473,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->explicitContentRadios$delegate:Lkotlin/Lazy;
 
-    const v0, 0x7f0a06ce
+    const v0, 0x7f0a06e8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -481,7 +481,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->privacyFriendSource0$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06cf
+    const v0, 0x7f0a06e9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -489,7 +489,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->privacyFriendSource1$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d0
+    const v0, 0x7f0a06ea
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -509,7 +509,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->friendSourceRadios$delegate:Lkotlin/Lazy;
 
-    const v0, 0x7f0a06c8
+    const v0, 0x7f0a06e2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -517,7 +517,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->defaultGuildsRestrictedView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06c7
+    const v0, 0x7f0a06e1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -525,7 +525,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->dataPrivacyControls$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d4
+    const v0, 0x7f0a06ee
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -533,7 +533,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->dataStatistics$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d1
+    const v0, 0x7f0a06eb
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -541,7 +541,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->dataPersonalization$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06c6
+    const v0, 0x7f0a06e0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -549,7 +549,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->dataBasicService$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d2
+    const v0, 0x7f0a06ec
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -557,7 +557,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->dataRequest$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d3
+    const v0, 0x7f0a06ed
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -565,7 +565,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->dataRequestLink$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1168,7 +1168,7 @@
         }
     .end annotation
 
-    const v0, 0x7f0d0082
+    const v0, 0x7f0d0089
 
     const/4 v1, 0x0
 
@@ -1198,7 +1198,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a07d8
+    const v1, 0x7f0a0815
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1208,7 +1208,7 @@
 
     invoke-static {v3, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a07d9
+    const v1, 0x7f0a0816
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1218,7 +1218,7 @@
 
     invoke-static {v4, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a07d6
+    const v1, 0x7f0a0813
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1228,7 +1228,7 @@
 
     invoke-static {v5, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a07d7
+    const v1, 0x7f0a0814
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1655,7 +1655,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d01b7
+    const v1, 0x7f0d01c1
 
     const/4 v2, 0x0
 
@@ -1663,7 +1663,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a06c9
+    const v1, 0x7f0a06e3
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1679,7 +1679,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const v1, 0x7f0a06ca
+    const v1, 0x7f0a06e4
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1762,7 +1762,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1204a0
+    const p2, 0x7f1204aa
 
     const/4 v1, 0x1
 
@@ -1776,25 +1776,25 @@
 
     move-result-object p1
 
+    const-string p2, "context.getString(R.stri\u2026ted_status_note, dateStr)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance p2, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     invoke-direct {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v0, 0x7f1204b6
+    const v0, 0x7f1204c0
 
     invoke-virtual {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object p2
 
-    const-string v0, "message"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-virtual {p2, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(Ljava/lang/String;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object p1
 
-    const p2, 0x7f120c77
+    const p2, 0x7f120cb0
 
     const/4 v0, 0x2
 
@@ -1857,7 +1857,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getContext()Landroid/content/Context;
 
@@ -1900,7 +1900,7 @@
     :cond_0
     if-nez p1, :cond_1
 
-    sget-object p2, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p2, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast p2, Ljava/util/Set;
 
@@ -1930,7 +1930,7 @@
     move-result-object p2
 
     :goto_0
-    invoke-virtual {p2}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object p2
 
@@ -1948,7 +1948,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2;
 
@@ -2084,7 +2084,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01b6
+    const v0, 0x7f0d01c0
 
     return v0
 .end method
@@ -2125,11 +2125,11 @@
 
     invoke-static {v0, v3, v1, v4, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v1, 0x7f121231
+    const v1, 0x7f12127e
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const v1, 0x7f120e67
+    const v1, 0x7f120e9d
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -2143,9 +2143,9 @@
 
     iput-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->radioManagerExplicit:Lcom/discord/views/RadioManager;
 
-    sget-object v1, Lcom/discord/app/e;->uy:Lcom/discord/app/e;
+    sget-object v1, Lcom/discord/app/e;->ux:Lcom/discord/app/e;
 
-    sget-wide v4, Lcom/discord/app/e;->uu:J
+    sget-wide v4, Lcom/discord/app/e;->ut:J
 
     invoke-static {v4, v5}, Lcom/discord/app/e;->k(J)Ljava/lang/String;
 
@@ -2157,7 +2157,7 @@
 
     aput-object v1, v5, v3
 
-    const v1, 0x7f1204a5
+    const v1, 0x7f1204af
 
     invoke-virtual {v0, v1, v5}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -2197,15 +2197,15 @@
 
     invoke-virtual {v5, v1, v4}, Lcom/discord/views/CheckedSetting;->a(Ljava/lang/CharSequence;Z)V
 
-    sget-object v1, Lcom/discord/app/e;->uy:Lcom/discord/app/e;
+    sget-object v1, Lcom/discord/app/e;->ux:Lcom/discord/app/e;
 
-    sget-wide v5, Lcom/discord/app/e;->us:J
+    sget-wide v5, Lcom/discord/app/e;->ur:J
 
     invoke-static {v5, v6}, Lcom/discord/app/e;->k(J)Ljava/lang/String;
 
     move-result-object v1
 
-    const v5, 0x7f1204a2
+    const v5, 0x7f1204ac
 
     invoke-virtual {v0, v5}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I)Ljava/lang/String;
 
@@ -2241,7 +2241,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f0a0649
+    const v7, 0x7f0a0663
 
     invoke-virtual {v6, v7}, Lcom/discord/views/CheckedSetting;->findViewById(I)Landroid/view/View;
 
@@ -2292,9 +2292,9 @@
 
     invoke-virtual {v5, v6}, Lcom/discord/views/CheckedSetting;->a(Landroid/view/View$OnClickListener;)V
 
-    sget-object v5, Lcom/discord/app/e;->uy:Lcom/discord/app/e;
+    sget-object v5, Lcom/discord/app/e;->ux:Lcom/discord/app/e;
 
-    sget-wide v5, Lcom/discord/app/e;->ut:J
+    sget-wide v5, Lcom/discord/app/e;->us:J
 
     invoke-static {v5, v6}, Lcom/discord/app/e;->k(J)Ljava/lang/String;
 
@@ -2316,7 +2316,7 @@
 
     invoke-direct {v7, v8}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    const v8, 0x7f120c1d
+    const v8, 0x7f120c51
 
     invoke-virtual {v0, v8}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I)Ljava/lang/String;
 
@@ -2358,13 +2358,13 @@
 
     invoke-virtual {v1, v6}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const v1, 0x7f1204b4
+    const v1, 0x7f1204be
 
     new-array v5, v4, [Ljava/lang/Object;
 
-    sget-object v6, Lcom/discord/app/e;->uy:Lcom/discord/app/e;
+    sget-object v6, Lcom/discord/app/e;->ux:Lcom/discord/app/e;
 
-    sget-wide v6, Lcom/discord/app/e;->uu:J
+    sget-wide v6, Lcom/discord/app/e;->ut:J
 
     invoke-static {v6, v7}, Lcom/discord/app/e;->k(J)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
index 5f996fa65a..e9406c43b8 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
@@ -234,7 +234,7 @@
 
     invoke-direct {p0, p2, p3}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0228
+    const p1, 0x7f0a0229
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -242,7 +242,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->platformImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a022a
+    const p1, 0x7f0a022b
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -250,7 +250,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->platformUserName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0223
+    const p1, 0x7f0a0224
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -258,7 +258,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->disconnect$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0225
+    const p1, 0x7f0a0226
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -266,7 +266,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->displaySwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a022b
+    const p1, 0x7f0a022c
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -274,7 +274,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->syncFriendsSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0224
+    const p1, 0x7f0a0225
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -282,7 +282,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->showActivitySwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0227
+    const p1, 0x7f0a0228
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -737,7 +737,7 @@
 
     move-result-object v1
 
-    const v5, 0x7f12051e
+    const v5, 0x7f120529
 
     new-array v6, v3, [Ljava/lang/Object;
 
@@ -922,7 +922,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f121055
+    const v1, 0x7f121092
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter.smali
index ebb6bfce26..3ee2136621 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter.smali
@@ -93,7 +93,7 @@
 
     new-instance p1, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;
 
-    const p2, 0x7f0d01ad
+    const p2, 0x7f0d01b7
 
     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
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBound$2.smali
index d885dfc050..6c2addcd76 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBound$2.smali
@@ -60,7 +60,7 @@
 
     move-result p1
 
-    const p2, 0x7f0a0435
+    const p2, 0x7f0a0445
 
     if-eq p1, p2, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1.smali
index f34789dbe2..646e8a6c5c 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1.smali
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
index 6e52d768de..ce61b932fa 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
@@ -105,7 +105,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a022d
+    const v0, 0x7f0a022e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -113,7 +113,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->emptyView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a022e
+    const v0, 0x7f0a022f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -317,7 +317,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a1
+    const v0, 0x7f0d01ab
 
     return v0
 .end method
@@ -378,11 +378,11 @@
 
     invoke-static {p0, p1, v1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f121231
+    const p1, 0x7f12127e
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f12043c
+    const p1, 0x7f120445
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter.smali
index e9834a8718..78e9008bd7 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter.smali
@@ -120,7 +120,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter;->dialogDismissCallback:Lkotlin/jvm/functions/Function0;
 
-    const v0, 0x7f0d01aa
+    const v0, 0x7f0d01b4
 
     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
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$onViewCreated$1.smali
index 0b4f9933be..0ce59a6301 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$onViewCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$onViewCreated$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$onViewCreated$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali
index 7b8b9bd5b9..0d59dd791e 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali
@@ -75,7 +75,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a022e
+    const v0, 0x7f0a022f
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -121,7 +121,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a2
+    const v0, 0x7f0d01ac
 
     return v0
 .end method
@@ -139,7 +139,7 @@
 
     invoke-virtual {v0}, Landroid/app/Dialog;->dismiss()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     :cond_0
     invoke-virtual {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd;->getView()Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
index 0a50ff0136..523b77d5f2 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
@@ -119,7 +119,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a022f
+    const v0, 0x7f0a0230
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -127,7 +127,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->digits$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0230
+    const v0, 0x7f0a0231
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -135,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->login$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -249,7 +249,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f12042c
+    const v1, 0x7f120435
 
     invoke-static {v0, v1}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
@@ -333,7 +333,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0114
+    const v0, 0x7f0d011d
 
     return v0
 .end method
@@ -355,11 +355,11 @@
 
     invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f121231
+    const p1, 0x7f12127e
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f12043c
+    const p1, 0x7f120445
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->setActionBarTitle(I)Lkotlin/Unit;
 
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
index 1f635f1bc3..7ab4c53222 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion.smali
@@ -156,7 +156,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model.smali
index 73affbc3d4..35a4f876ea 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model.smali
@@ -106,7 +106,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yG:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     if-ne p1, p2, :cond_1
 
@@ -126,7 +126,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yF:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     if-ne p1, p2, :cond_2
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$WhenMappings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$WhenMappings.smali
index f6b6fee5aa..e2b5181794 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$WhenMappings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$WhenMappings.smali
@@ -20,7 +20,7 @@
 
     sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yo:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yy:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->ordinal()I
 
@@ -32,7 +32,7 @@
 
     sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yp:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yz:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->ordinal()I
 
@@ -44,7 +44,7 @@
 
     sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yq:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yA:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->ordinal()I
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$1.smali
index 64d53d849e..eb3736e040 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$1.smali
@@ -65,7 +65,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yF:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     invoke-virtual {p1, v0}, Lcom/discord/stores/StoreMediaSettings;->setVoiceInputMode(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$2.smali
index 60e04860e0..69d0604546 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$2.smali
@@ -65,7 +65,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yG:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     invoke-virtual {p1, v0}, Lcom/discord/stores/StoreMediaSettings;->setVoiceInputMode(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1.smali
index 68e6430679..dc7842d280 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1.smali
@@ -78,7 +78,7 @@
 .method public final call(Lcom/discord/rtcconnection/RtcConnection$State;)Z
     .locals 1
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yf:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3.smali
index 790369660c..770e94cb77 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3;->invoke(Lkotlin/Pair;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1.smali
index 8dcec37d80..5b34aafbfa 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3.smali
index 72616303a0..4c980f6fc7 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3;->invoke(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     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
index a2365e9766..449846e691 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
@@ -658,7 +658,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->requestListenForSensitivitySubject:Lrx/subjects/BehaviorSubject;
 
-    const v0, 0x7f0a06ed
+    const v0, 0x7f0a0707
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -666,7 +666,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->overlayWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ec
+    const v0, 0x7f0a0706
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -674,7 +674,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->overlayCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e4
+    const v0, 0x7f0a06fe
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -682,7 +682,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceActivityCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e5
+    const v0, 0x7f0a06ff
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -690,7 +690,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->pushTTCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06df
+    const v0, 0x7f0a06f9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -698,7 +698,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeCommunication$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06de
+    const v0, 0x7f0a06f8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -706,7 +706,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeCall$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e7
+    const v0, 0x7f0a0701
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -714,7 +714,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESDefault$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e9
+    const v0, 0x7f0a0703
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -722,7 +722,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESForceEnabled$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e8
+    const v0, 0x7f0a0702
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -730,7 +730,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESForceDisabled$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e0
+    const v0, 0x7f0a06fa
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -738,7 +738,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->autoVADCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e1
+    const v0, 0x7f0a06fb
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -746,7 +746,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->echoCancellationCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e6
+    const v0, 0x7f0a0700
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -754,7 +754,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->noiseSuppressionCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e3
+    const v0, 0x7f0a06fd
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -762,7 +762,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->gainControlCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ea
+    const v0, 0x7f0a0704
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -770,7 +770,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceOutputVolume$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f5
+    const v0, 0x7f0a070f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -778,7 +778,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->useSpeakerCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f1
+    const v0, 0x7f0a070b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -786,7 +786,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityManual$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ee
+    const v0, 0x7f0a0708
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -794,7 +794,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityAutomatic$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f4
+    const v0, 0x7f0a070e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -802,7 +802,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f0
+    const v0, 0x7f0a070a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -810,7 +810,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f3
+    const v0, 0x7f0a070d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -818,7 +818,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityTestingContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f2
+    const v0, 0x7f0a070c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -826,7 +826,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityTestingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f6
+    const v0, 0x7f0a0710
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -834,7 +834,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->videoSettingsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e2
+    const v0, 0x7f0a06fc
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -862,7 +862,7 @@
 
     const-string v0, "audioModeRadioManager"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -885,7 +885,7 @@
 
     const-string v0, "openSLESConfigRadioManager"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -1030,7 +1030,7 @@
 
     const-string v1, "audioModeRadioManager"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getAudioMode()I
@@ -1074,7 +1074,7 @@
 
     const-string v1, "audioModeRadioButtons"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     check-cast v0, Ljava/lang/Iterable;
@@ -1113,7 +1113,7 @@
 
     const-string v1, "openSLESConfigRadioManager"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_5
     invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getOpenSLESConfig()Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
@@ -1172,7 +1172,7 @@
 
     const-string v1, "openSLESConfigRadioButtons"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_9
     check-cast v0, Ljava/lang/Iterable;
@@ -1479,12 +1479,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f080186
+    const p1, 0x7f080195
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f080185
+    const p1, 0x7f080194
 
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityAutomatic()Landroid/view/View;
@@ -1532,7 +1532,7 @@
 
     move-result-object v1
 
-    iget v1, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->yn:F
+    iget v1, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->yx:F
 
     const/high16 v2, 0x42c80000    # 100.0f
 
@@ -2042,10 +2042,10 @@
 
     const-string v1, "audioModeRadioManager"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eJ()Landroid/widget/Checkable;
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eO()Landroid/widget/Checkable;
 
     move-result-object v0
 
@@ -2123,10 +2123,10 @@
 
     const-string v1, "openSLESConfigRadioManager"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eJ()Landroid/widget/Checkable;
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eO()Landroid/widget/Checkable;
 
     move-result-object v0
 
@@ -2140,7 +2140,7 @@
 
     if-eqz v1, :cond_1
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yp:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yz:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     goto :goto_0
 
@@ -2155,7 +2155,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yq:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->yA:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     goto :goto_0
 
@@ -2178,7 +2178,7 @@
 
     check-cast v0, Landroidx/fragment/app/Fragment;
 
-    const v1, 0x7f121273
+    const v1, 0x7f1212c4
 
     invoke-static {v0, v1}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -2331,7 +2331,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01b8
+    const v0, 0x7f0d01c2
 
     return v0
 .end method
@@ -2414,7 +2414,7 @@
 
     aput-object v4, v3, v6
 
-    invoke-static {v3}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v3}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v3
 
@@ -2428,7 +2428,7 @@
 
     const-string v7, "audioModeRadioButtons"
 
-    invoke-static {v7}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v7}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-direct {v3, v4}, Lcom/discord/views/RadioManager;-><init>(Ljava/util/List;)V
@@ -2457,7 +2457,7 @@
 
     aput-object v4, v3, v2
 
-    invoke-static {v3}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v3}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v3
 
@@ -2471,16 +2471,16 @@
 
     const-string v7, "openSLESConfigRadioButtons"
 
-    invoke-static {v7}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v7}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-direct {v3, v4}, Lcom/discord/views/RadioManager;-><init>(Ljava/util/List;)V
 
     iput-object v3, v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
 
-    sget-object v3, Lcom/discord/samsung/a;->zM:Lcom/discord/samsung/a;
+    sget-object v3, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eo()Lrx/Observable;
+    invoke-static {}, Lcom/discord/samsung/a;->er()Lrx/Observable;
 
     move-result-object v3
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali
index 0a0992ed2c..cf16697ef8 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali
@@ -52,11 +52,11 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f1204f7
+    const v4, 0x7f120502
 
-    const v5, 0x7f1204f8
+    const v5, 0x7f120503
 
-    const v6, 0x7f1204f6
+    const v6, 0x7f120501
 
     move-object v1, v7
 
@@ -74,11 +74,11 @@
 
     const/4 v10, 0x1
 
-    const v11, 0x7f1204c5
+    const v11, 0x7f1204d0
 
-    const v12, 0x7f1204c6
+    const v12, 0x7f1204d1
 
-    const v13, 0x7f1204c4
+    const v13, 0x7f1204cf
 
     move-object v8, v1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1.smali
index 576fd76dce..c4ec894c63 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$2.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$2.smali
index 0f3c7a2b55..8e309711a5 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$2;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onResume$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onResume$1.smali
index 64de4834ae..062e04c39f 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onResume$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onResume$1;->invoke(Lcom/discord/models/domain/ModelUser;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$2.smali
index 40543fef2a..534217be73 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$2;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$3.smali
index 7794bf9ef2..bb6500d6c6 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$3;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.smali
index 0b5ff8d609..d90105cd68 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.smali
@@ -242,7 +242,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0277
+    const v0, 0x7f0a0280
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -250,7 +250,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0272
+    const v0, 0x7f0a027b
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -258,7 +258,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->bodyTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0273
+    const v0, 0x7f0a027c
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -266,7 +266,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0276
+    const v0, 0x7f0a027f
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -274,7 +274,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0278
+    const v0, 0x7f0a0281
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -282,7 +282,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->password$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0279
+    const v0, 0x7f0a0282
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -290,7 +290,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->passwordWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0274
+    const v0, 0x7f0a027d
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -298,7 +298,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->code$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0275
+    const v0, 0x7f0a027e
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -693,7 +693,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0118
+    const v0, 0x7f0d0121
 
     return v0
 .end method
@@ -801,7 +801,7 @@
     :goto_0
     if-nez v0, :cond_1
 
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$1.smali
index 64d50e7dec..4717b7b0cb 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$1;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$2.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$2.smali
index ce6aec9c77..19fa5df347 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$2;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
index 9fdfe3798d..56cc8ea4ab 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
@@ -193,7 +193,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a02bb
+    const v0, 0x7f0a02c4
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -201,7 +201,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02b8
+    const v0, 0x7f0a02c1
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -209,7 +209,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02bd
+    const v0, 0x7f0a02c6
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -217,7 +217,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;->passwordWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02bc
+    const v0, 0x7f0a02c5
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -225,7 +225,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;->password$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02b9
+    const v0, 0x7f0a02c2
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -233,7 +233,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ba
+    const v0, 0x7f0a02c3
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -507,7 +507,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d011b
+    const v0, 0x7f0d0124
 
     return v0
 .end method
@@ -582,7 +582,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120b67
+    const v3, 0x7f120b98
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -600,7 +600,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120b63
+    const v3, 0x7f120b94
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -618,7 +618,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f12056e
+    const v3, 0x7f120579
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -637,7 +637,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120b6c
+    const v3, 0x7f120b9d
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -655,7 +655,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120b65
+    const v3, 0x7f120b96
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -673,7 +673,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f1204f6
+    const v3, 0x7f120501
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.smali
index 5c2ae536d9..91093f5913 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.smali
@@ -85,7 +85,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lcom/discord/a/a;->ww:Lcom/discord/a/a$a;
+    sget-object p1, Lcom/discord/dialogs/c;->wG:Lcom/discord/dialogs/c$a;
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
@@ -101,7 +101,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const v2, 0x7f120e4d
+    const v2, 0x7f120e84
 
     invoke-virtual {p1, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I)Ljava/lang/String;
 
@@ -117,7 +117,7 @@
 
     const-string v4, "My Account"
 
-    invoke-static/range {v0 .. v7}, Lcom/discord/a/a$a;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
+    invoke-static/range {v0 .. v7}, Lcom/discord/dialogs/c$a;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 
@@ -140,5 +140,27 @@
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
 
+    iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->access$getState$p(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;)Lcom/discord/utilities/stateful/StatefulViews;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+
+    invoke-static {v0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->access$getAccountSave$p(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;)Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/stateful/StatefulViews;->configureSaveActionView(Landroid/view/View;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;->$user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->access$setIcon(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/models/domain/ModelUser;)V
+
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali
index 21ff4e7cfb..52acfc30c6 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali
@@ -101,7 +101,7 @@
 
     move-result-object v9
 
-    const v11, 0x7f070056
+    const v11, 0x7f070055
 
     const/4 v12, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali
index 8304f074c3..ae4ac2898a 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali
@@ -43,9 +43,9 @@
 
     check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
 
-    const v1, 0x7f1203c4
+    const v1, 0x7f1203ca
 
-    const v2, 0x7f12119d
+    const v2, 0x7f1211e1
 
     invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBoundOrOnResume$1.smali
index a68416e281..9884cc4bd5 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali
index 946caa1bef..8b19ea6faf 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1;->invoke(Lcom/discord/models/domain/ModelUser$Token;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -77,7 +77,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f121268
+    const v2, 0x7f1212b9
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.smali
index a23827d9b2..4c5d6e2270 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.smali
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1;->invoke(Landroid/content/Context;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
index f68c2b8047..781df17fea 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
@@ -695,7 +695,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0664
+    const v0, 0x7f0a067e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -703,7 +703,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountScrollView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0663
+    const v0, 0x7f0a067d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -711,7 +711,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountSave$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0653
+    const v0, 0x7f0a066d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -719,7 +719,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountChangePassword$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0667
+    const v0, 0x7f0a0681
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -727,7 +727,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountTag$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0655
+    const v0, 0x7f0a066f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -735,7 +735,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountEmail$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0654
+    const v0, 0x7f0a066e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -743,7 +743,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountEdit$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a064f
+    const v0, 0x7f0a0669
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -751,7 +751,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0668
+    const v1, 0x7f0a0682
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -759,7 +759,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountVerification$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0669
+    const v1, 0x7f0a0683
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -767,7 +767,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountVerificationResend$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0650
+    const v1, 0x7f0a066a
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -775,7 +775,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountAvatarContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0661
+    const v1, 0x7f0a067b
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -783,7 +783,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->removeAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a065a
+    const v1, 0x7f0a0674
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -791,7 +791,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFAHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a066a
+    const v1, 0x7f0a0684
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -799,7 +799,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountBackupCodes$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0662
+    const v1, 0x7f0a067c
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -807,7 +807,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountRemove2fa$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0665
+    const v1, 0x7f0a067f
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -815,7 +815,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountSMSBackup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0666
+    const v1, 0x7f0a0680
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -823,7 +823,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountSMSPhone$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a065b
+    const v1, 0x7f0a0675
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -831,7 +831,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFAFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a065c
+    const v1, 0x7f0a0676
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -839,7 +839,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFALottie$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a065d
+    const v1, 0x7f0a0677
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -847,7 +847,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFASalesPitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0658
+    const v1, 0x7f0a0672
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -855,7 +855,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFAEnable$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0659
+    const v1, 0x7f0a0673
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -863,7 +863,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFAEnabledContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0657
+    const v1, 0x7f0a0671
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -871,7 +871,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFADisabledContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0660
+    const v1, 0x7f0a067a
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -879,7 +879,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountDataWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a065f
+    const v1, 0x7f0a0679
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -887,7 +887,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountDataDisable$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a065e
+    const v1, 0x7f0a0678
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -895,7 +895,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountDataDelete$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a026f
+    const v1, 0x7f0a0278
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1024,6 +1024,14 @@
     return-object p0
 .end method
 
+.method public static final synthetic access$setIcon(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/models/domain/ModelUser;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->setIcon(Lcom/discord/models/domain/ModelUser;)V
+
+    return-void
+.end method
+
 .method public static final synthetic access$showOwnsGuildModal(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;)V
     .locals 0
 
@@ -1133,452 +1141,382 @@
 .end method
 
 .method private final configureUI(Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;)V
-    .locals 17
+    .locals 10
 
-    move-object/from16 v0, p0
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;->component1()Lcom/discord/models/domain/ModelUser;
 
-    move-object/from16 v1, p1
+    move-result-object v0
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;->component1()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;->component2()Lcom/discord/stores/StoreMFA$State;
+
+    move-result-object v1
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountVerification()Landroid/view/View;
 
     move-result-object v2
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;->component2()Lcom/discord/stores/StoreMFA$State;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isVerified()Z
+
+    move-result v3
+
+    const/4 v4, 0x1
+
+    xor-int/2addr v3, v4
+
+    const/4 v5, 0x2
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    invoke-static {v2, v3, v7, v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountVerificationResend()Landroid/view/View;
+
+    move-result-object v2
+
+    sget-object v3, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$1;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$1;
+
+    check-cast v3, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountTag()Landroid/widget/TextView;
+
+    move-result-object v2
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountTag()Landroid/widget/TextView;
 
     move-result-object v3
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountVerification()Landroid/view/View;
+    invoke-virtual {v3}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->isVerified()Z
+    const v8, 0x7f04029e
 
-    move-result v5
+    invoke-static {v3, v8}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
-    const/4 v6, 0x1
+    move-result v3
 
-    xor-int/2addr v5, v6
+    invoke-virtual {v0, v3}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator(I)Ljava/lang/CharSequence;
 
-    const/4 v7, 0x2
+    move-result-object v3
 
-    const/4 v8, 0x0
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const/4 v9, 0x0
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getEmail()Ljava/lang/String;
 
-    invoke-static {v4, v5, v9, v7, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    move-result-object v2
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountVerificationResend()Landroid/view/View;
+    check-cast v2, Ljava/lang/CharSequence;
 
-    move-result-object v4
+    if-eqz v2, :cond_1
 
-    sget-object v5, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$1;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$1;
+    invoke-interface {v2}, Ljava/lang/CharSequence;->length()I
 
-    check-cast v5, Landroid/view/View$OnClickListener;
+    move-result v2
 
-    invoke-virtual {v4, v5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountTag()Landroid/widget/TextView;
-
-    move-result-object v4
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountTag()Landroid/widget/TextView;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
-
-    move-result-object v5
-
-    const v10, 0x7f04029b
-
-    invoke-static {v5, v10}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
-
-    move-result v5
-
-    invoke-virtual {v2, v5}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator(I)Ljava/lang/CharSequence;
-
-    move-result-object v5
-
-    invoke-virtual {v4, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getEmail()Ljava/lang/String;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/lang/CharSequence;
-
-    if-eqz v4, :cond_1
-
-    invoke-interface {v4}, Ljava/lang/CharSequence;->length()I
-
-    move-result v4
-
-    if-nez v4, :cond_0
+    if-nez v2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const/4 v4, 0x0
+    const/4 v2, 0x0
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    const/4 v4, 0x1
+    const/4 v2, 0x1
 
     :goto_1
-    if-nez v4, :cond_2
+    if-nez v2, :cond_2
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountEmail()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountEmail()Landroid/widget/TextView;
 
-    move-result-object v4
+    move-result-object v2
 
-    iget-object v5, v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->state:Lcom/discord/utilities/stateful/StatefulViews;
+    iget-object v3, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountEmail()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountEmail()Landroid/widget/TextView;
 
-    move-result-object v10
+    move-result-object v8
 
-    invoke-virtual {v10}, Landroid/widget/TextView;->getId()I
+    invoke-virtual {v8}, Landroid/widget/TextView;->getId()I
 
-    move-result v10
+    move-result v8
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getEmail()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getEmail()Ljava/lang/String;
 
-    move-result-object v11
+    move-result-object v9
 
-    invoke-virtual {v5, v10, v11}, Lcom/discord/utilities/stateful/StatefulViews;->get(ILjava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v3, v8, v9}, Lcom/discord/utilities/stateful/StatefulViews;->get(ILjava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v3
 
-    check-cast v5, Ljava/lang/CharSequence;
+    check-cast v3, Ljava/lang/CharSequence;
 
-    invoke-virtual {v4, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_2
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountChangePassword()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountChangePassword()Landroid/widget/TextView;
 
-    move-result-object v4
+    move-result-object v2
 
-    new-instance v5, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2;
+    new-instance v3, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2;
 
-    invoke-direct {v5, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;)V
+    invoke-direct {v3, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;)V
 
-    check-cast v5, Landroid/view/View$OnClickListener;
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v4, v5}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    new-instance v4, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;
+    new-instance v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;
 
-    invoke-direct {v4, v0, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/models/domain/ModelUser;)V
+    invoke-direct {v2, p0, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/models/domain/ModelUser;)V
 
-    check-cast v4, Lrx/functions/Action1;
+    check-cast v2, Lrx/functions/Action1;
 
-    iput-object v4, v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountAvatarSelectedResult:Lrx/functions/Action1;
+    iput-object v2, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountAvatarSelectedResult:Lrx/functions/Action1;
 
-    iget-object v4, v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->state:Lcom/discord/utilities/stateful/StatefulViews;
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->setIcon(Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountAvatar()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getRemoveAvatar()Landroid/view/View;
 
-    move-result-object v5
+    move-result-object v2
 
-    invoke-virtual {v5}, Landroid/widget/ImageView;->getId()I
+    new-instance v3, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4;
 
-    move-result v5
+    invoke-direct {v3, p0, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    move-result-wide v10
+    invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountAvatarContainer()Landroid/view/View;
 
-    move-result-object v10
+    move-result-object v2
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getAvatar()Ljava/lang/String;
+    new-instance v3, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5;
 
-    move-result-object v11
+    invoke-direct {v3, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;)V
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getDiscriminator()I
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    move-result v12
+    invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-static {v12}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountEdit()Landroid/view/View;
 
-    move-result-object v12
+    move-result-object v2
 
-    invoke-static {v10, v11, v12, v6}, Lcom/discord/utilities/icon/IconUtils;->getForUser(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;Z)Ljava/lang/String;
+    sget-object v3, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6;
 
-    move-result-object v10
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v4, v5, v10}, Lcom/discord/utilities/stateful/StatefulViews;->get(ILjava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    move-result-object v4
+    iget-object v2, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    check-cast v4, Ljava/lang/String;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountAvatar()Landroid/widget/ImageView;
+    move-result-object v3
 
-    move-result-object v10
+    check-cast v3, Landroid/view/View;
 
-    const v12, 0x7f070056
+    invoke-virtual {v2, v3}, Lcom/discord/utilities/stateful/StatefulViews;->configureSaveActionView(Landroid/view/View;)V
 
-    const/4 v13, 0x0
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    const/4 v14, 0x0
+    move-result-object v2
 
-    const/16 v15, 0x18
+    new-instance v3, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$7;
 
-    const/16 v16, 0x0
+    invoke-direct {v3, p0, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$7;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/models/domain/ModelUser;)V
 
-    move-object v11, v4
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    invoke-static/range {v10 .. v16}, 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-virtual {v2, v3}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getRemoveAvatar()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountMFAHeader()Landroid/view/View;
 
-    move-result-object v5
+    move-result-object v2
 
-    if-eqz v4, :cond_4
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
 
-    check-cast v4, Ljava/lang/CharSequence;
+    move-result v3
 
-    const-string v10, "asset://asset/images/default_avatar"
+    invoke-static {v2, v3, v7, v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    check-cast v10, Ljava/lang/CharSequence;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountMFAFlipper()Lcom/discord/app/AppViewFlipper;
 
-    invoke-static {v4, v10, v9}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    move-result-object v2
 
-    move-result v4
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
 
-    if-eq v4, v6, :cond_3
+    move-result v3
+
+    xor-int/2addr v3, v4
+
+    invoke-virtual {v2, v3}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountMFALottie()Landroid/view/View;
+
+    move-result-object v2
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
+
+    move-result v3
+
+    xor-int/2addr v3, v4
+
+    invoke-static {v2, v3, v7, v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountMFASalesPitch()Landroid/view/View;
+
+    move-result-object v2
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
+
+    move-result v3
+
+    xor-int/2addr v3, v4
+
+    invoke-static {v2, v3, v7, v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountMFAEnable()Landroid/view/View;
+
+    move-result-object v2
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
+
+    move-result v3
+
+    xor-int/2addr v3, v4
+
+    invoke-static {v2, v3, v7, v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMFA$State;->getActivationState()Lcom/discord/stores/StoreMFA$MFAActivationState;
+
+    move-result-object v2
+
+    sget-object v3, Lcom/discord/stores/StoreMFA$MFAActivationState;->NONE:Lcom/discord/stores/StoreMFA$MFAActivationState;
+
+    if-eq v2, v3, :cond_4
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMFA$State;->getActivationState()Lcom/discord/stores/StoreMFA$MFAActivationState;
+
+    move-result-object v2
+
+    sget-object v3, Lcom/discord/stores/StoreMFA$MFAActivationState;->PENDING_ENABLED:Lcom/discord/stores/StoreMFA$MFAActivationState;
+
+    if-ne v2, v3, :cond_3
+
+    const/4 v2, 0x1
 
     goto :goto_2
 
     :cond_3
-    const/4 v4, 0x4
+    const/4 v2, 0x0
+
+    :goto_2
+    invoke-direct {p0, v2, v4}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->configureMFA(ZZ)V
 
     goto :goto_3
 
     :cond_4
-    :goto_2
-    const/4 v4, 0x0
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
+
+    move-result v2
+
+    invoke-direct {p0, v2, v7}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->configureMFA(ZZ)V
 
     :goto_3
-    invoke-virtual {v5, v4}, Landroid/view/View;->setVisibility(I)V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountMFAEnable()Landroid/view/View;
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getRemoveAvatar()Landroid/view/View;
+    move-result-object v2
 
-    move-result-object v4
+    sget-object v3, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$8;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$8;
 
-    new-instance v5, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4;
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    invoke-direct {v5, v0, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/models/domain/ModelUser;)V
+    invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    check-cast v5, Landroid/view/View$OnClickListener;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountBackupCodes()Landroid/view/View;
 
-    invoke-virtual {v4, v5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    move-result-object v2
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountAvatarContainer()Landroid/view/View;
+    sget-object v3, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$9;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$9;
 
-    move-result-object v4
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    new-instance v5, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5;
+    invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {v5, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;)V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountRemove2fa()Landroid/view/View;
 
-    check-cast v5, Landroid/view/View$OnClickListener;
+    move-result-object v2
 
-    invoke-virtual {v4, v5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    new-instance v3, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$10;
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountEdit()Landroid/view/View;
+    invoke-direct {v3, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$10;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;)V
 
-    move-result-object v4
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    sget-object v5, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6;
+    invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    check-cast v5, Landroid/view/View$OnClickListener;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountDataDisable()Landroid/widget/TextView;
 
-    invoke-virtual {v4, v5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    move-result-object v2
 
-    iget-object v4, v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->state:Lcom/discord/utilities/stateful/StatefulViews;
+    new-instance v3, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$11;
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    invoke-direct {v3, p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$11;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;)V
 
-    move-result-object v5
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    check-cast v5, Landroid/view/View;
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-virtual {v4, v5}, Lcom/discord/utilities/stateful/StatefulViews;->configureSaveActionView(Landroid/view/View;)V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountDataDelete()Landroid/widget/TextView;
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    move-result-object v2
 
-    move-result-object v4
+    new-instance v3, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$12;
 
-    new-instance v5, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$7;
+    invoke-direct {v3, p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$12;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;)V
 
-    invoke-direct {v5, v0, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$7;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/models/domain/ModelUser;)V
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    check-cast v5, Landroid/view/View$OnClickListener;
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-virtual {v4, v5}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isPartner()Z
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountMFAHeader()Landroid/view/View;
+    move-result p1
 
-    move-result-object v4
+    if-nez p1, :cond_6
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
 
-    move-result v5
+    move-result p1
 
-    invoke-static {v4, v5, v9, v7, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountMFAFlipper()Lcom/discord/app/AppViewFlipper;
-
-    move-result-object v4
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
-
-    move-result v5
-
-    xor-int/2addr v5, v6
-
-    invoke-virtual {v4, v5}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountMFALottie()Landroid/view/View;
-
-    move-result-object v4
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
-
-    move-result v5
-
-    xor-int/2addr v5, v6
-
-    invoke-static {v4, v5, v9, v7, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountMFASalesPitch()Landroid/view/View;
-
-    move-result-object v4
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
-
-    move-result v5
-
-    xor-int/2addr v5, v6
-
-    invoke-static {v4, v5, v9, v7, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountMFAEnable()Landroid/view/View;
-
-    move-result-object v4
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
-
-    move-result v5
-
-    xor-int/2addr v5, v6
-
-    invoke-static {v4, v5, v9, v7, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    invoke-virtual {v3}, Lcom/discord/stores/StoreMFA$State;->getActivationState()Lcom/discord/stores/StoreMFA$MFAActivationState;
-
-    move-result-object v4
-
-    sget-object v5, Lcom/discord/stores/StoreMFA$MFAActivationState;->NONE:Lcom/discord/stores/StoreMFA$MFAActivationState;
-
-    if-eq v4, v5, :cond_6
-
-    invoke-virtual {v3}, Lcom/discord/stores/StoreMFA$State;->getActivationState()Lcom/discord/stores/StoreMFA$MFAActivationState;
-
-    move-result-object v4
-
-    sget-object v5, Lcom/discord/stores/StoreMFA$MFAActivationState;->PENDING_ENABLED:Lcom/discord/stores/StoreMFA$MFAActivationState;
-
-    if-ne v4, v5, :cond_5
-
-    const/4 v4, 0x1
+    if-eqz p1, :cond_5
 
     goto :goto_4
 
     :cond_5
-    const/4 v4, 0x0
-
-    :goto_4
-    invoke-direct {v0, v4, v6}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->configureMFA(ZZ)V
+    const/4 p1, 0x0
 
     goto :goto_5
 
     :cond_6
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
-
-    move-result v4
-
-    invoke-direct {v0, v4, v9}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->configureMFA(ZZ)V
+    :goto_4
+    const/4 p1, 0x1
 
     :goto_5
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountMFAEnable()Landroid/view/View;
+    const/4 v2, 0x0
 
-    move-result-object v4
+    if-nez p1, :cond_8
 
-    sget-object v5, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$8;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$8;
-
-    check-cast v5, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v4, v5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountBackupCodes()Landroid/view/View;
-
-    move-result-object v4
-
-    sget-object v5, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$9;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$9;
-
-    check-cast v5, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v4, v5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountRemove2fa()Landroid/view/View;
-
-    move-result-object v4
-
-    new-instance v5, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$10;
-
-    invoke-direct {v5, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$10;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;)V
-
-    check-cast v5, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v4, v5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountDataDisable()Landroid/widget/TextView;
-
-    move-result-object v4
-
-    new-instance v5, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$11;
-
-    invoke-direct {v5, v0, v1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$11;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;)V
-
-    check-cast v5, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v4, v5}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountDataDelete()Landroid/widget/TextView;
-
-    move-result-object v4
-
-    new-instance v5, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$12;
-
-    invoke-direct {v5, v0, v1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$12;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;)V
-
-    check-cast v5, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v4, v5}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->isPartner()Z
-
-    move-result v1
-
-    if-nez v1, :cond_8
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMFA$State;->isTogglingSMSBackup()Z
 
     move-result v1
 
@@ -1587,187 +1525,165 @@
     goto :goto_6
 
     :cond_7
-    const/4 v1, 0x0
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSPhone()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    check-cast v1, Landroid/view/View;
+
+    invoke-static {v1, v4, v2, v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSBackup()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$13;
+
+    invoke-direct {v2, p0, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$13;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/models/domain/ModelUser;)V
+
+    check-cast v2, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->a(Landroid/view/View$OnClickListener;)V
 
     goto :goto_7
 
     :cond_8
     :goto_6
-    const/4 v1, 0x1
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSBackup()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-static {v1}, Lcom/discord/views/CheckedSetting;->a(Lcom/discord/views/CheckedSetting;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSPhone()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    check-cast v1, Landroid/view/View;
+
+    invoke-static {v1, v7, v2, v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
 
     :goto_7
-    const/4 v4, 0x0
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSPhone()Landroid/widget/TextView;
 
-    if-nez v1, :cond_a
+    move-result-object v1
 
-    invoke-virtual {v3}, Lcom/discord/stores/StoreMFA$State;->isTogglingSMSBackup()Z
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getPhone()Ljava/lang/String;
 
-    move-result v3
+    move-result-object v2
 
-    if-eqz v3, :cond_9
+    check-cast v2, Ljava/lang/CharSequence;
+
+    if-eqz v2, :cond_a
+
+    invoke-interface {v2}, Ljava/lang/CharSequence;->length()I
+
+    move-result v2
+
+    if-nez v2, :cond_9
 
     goto :goto_8
 
     :cond_9
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSPhone()Landroid/widget/TextView;
-
-    move-result-object v3
-
-    check-cast v3, Landroid/view/View;
-
-    invoke-static {v3, v6, v4, v7, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSBackup()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v3
-
-    new-instance v4, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$13;
-
-    invoke-direct {v4, v0, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$13;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/models/domain/ModelUser;)V
-
-    check-cast v4, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v3, v4}, Lcom/discord/views/CheckedSetting;->a(Landroid/view/View$OnClickListener;)V
+    const/4 v2, 0x0
 
     goto :goto_9
 
     :cond_a
     :goto_8
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSBackup()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v3
-
-    invoke-static {v3}, Lcom/discord/views/CheckedSetting;->a(Lcom/discord/views/CheckedSetting;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSPhone()Landroid/widget/TextView;
-
-    move-result-object v3
-
-    check-cast v3, Landroid/view/View;
-
-    invoke-static {v3, v9, v4, v7, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
+    const/4 v2, 0x1
 
     :goto_9
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSPhone()Landroid/widget/TextView;
+    if-nez v2, :cond_b
 
-    move-result-object v3
+    const v2, 0x7f120b93
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getPhone()Ljava/lang/String;
+    new-array v3, v4, [Ljava/lang/Object;
 
-    move-result-object v4
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getPhone()Ljava/lang/String;
 
-    check-cast v4, Ljava/lang/CharSequence;
+    move-result-object v5
 
-    if-eqz v4, :cond_c
+    aput-object v5, v3, v7
 
-    invoke-interface {v4}, Ljava/lang/CharSequence;->length()I
+    invoke-virtual {p0, v2, v3}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result v4
+    move-result-object v6
 
-    if-nez v4, :cond_b
+    :cond_b
+    check-cast v6, Ljava/lang/CharSequence;
+
+    invoke-static {v1, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSBackup()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isMfaSMSEnabled()Z
+
+    move-result v0
+
+    invoke-virtual {v1, v0}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSBackup()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v0
+
+    if-eqz p1, :cond_c
+
+    const p1, 0x7f120b97
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
 
     goto :goto_a
 
-    :cond_b
-    const/4 v4, 0x0
-
-    goto :goto_b
-
     :cond_c
+    const p1, 0x7f120b94
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
     :goto_a
-    const/4 v4, 0x1
+    check-cast p1, Ljava/lang/CharSequence;
 
-    :goto_b
-    if-nez v4, :cond_d
+    invoke-static {v0, p1}, Lcom/discord/views/CheckedSetting;->a(Lcom/discord/views/CheckedSetting;Ljava/lang/CharSequence;)V
 
-    const v4, 0x7f120b62
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getMostRecentIntent()Landroid/content/Intent;
 
-    new-array v5, v6, [Ljava/lang/Object;
+    move-result-object p1
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getPhone()Ljava/lang/String;
+    const-string v0, "extra_redirect"
 
-    move-result-object v7
+    invoke-virtual {p1, v0}, Landroid/content/Intent;->getSerializableExtra(Ljava/lang/String;)Ljava/io/Serializable;
 
-    aput-object v7, v5, v9
+    move-result-object p1
 
-    invoke-virtual {v0, v4, v5}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    sget-object v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Redirect;->SMS_BACKUP:Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Redirect;
 
-    move-result-object v8
+    if-ne p1, v1, :cond_d
+
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v0}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
+
+    sget-object p1, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;->Companion:Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$Companion;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v0
+
+    const-string v1, "requireFragmentManager()"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(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
 
     :cond_d
-    check-cast v8, Ljava/lang/CharSequence;
-
-    invoke-static {v3, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSBackup()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v3
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->isMfaSMSEnabled()Z
-
-    move-result v2
-
-    invoke-virtual {v3, v2}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSMSBackup()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v2
-
-    if-eqz v1, :cond_e
-
-    const v1, 0x7f120b66
-
-    invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_c
-
-    :cond_e
-    const v1, 0x7f120b63
-
-    invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    :goto_c
-    check-cast v1, Ljava/lang/CharSequence;
-
-    invoke-static {v2, v1}, Lcom/discord/views/CheckedSetting;->a(Lcom/discord/views/CheckedSetting;Ljava/lang/CharSequence;)V
-
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getMostRecentIntent()Landroid/content/Intent;
-
-    move-result-object v1
-
-    const-string v2, "extra_redirect"
-
-    invoke-virtual {v1, v2}, Landroid/content/Intent;->getSerializableExtra(Ljava/lang/String;)Ljava/io/Serializable;
-
-    move-result-object v1
-
-    sget-object v3, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Redirect;->SMS_BACKUP:Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Redirect;
-
-    if-ne v1, v3, :cond_f
-
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getMostRecentIntent()Landroid/content/Intent;
-
-    move-result-object v1
-
-    invoke-virtual {v1, v2}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
-
-    sget-object v1, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;->Companion:Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$Companion;
-
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
-
-    move-result-object v2
-
-    const-string v3, "requireFragmentManager()"
-
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1, v2, v6}, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$Companion;->show(Landroidx/fragment/app/FragmentManager;Z)V
-
-    :cond_f
     return-void
 .end method
 
@@ -1778,7 +1694,7 @@
 
     check-cast v0, Landroidx/fragment/app/Fragment;
 
-    const v1, 0x7f120f2c
+    const v1, 0x7f120f63
 
     invoke-static {v0, v1}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -2387,6 +2303,105 @@
     return-void
 .end method
 
+.method private final setIcon(Lcom/discord/models/domain/ModelUser;)V
+    .locals 12
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->state:Lcom/discord/utilities/stateful/StatefulViews;
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountAvatar()Landroid/widget/ImageView;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroid/widget/ImageView;->getId()I
+
+    move-result v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v2
+
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getAvatar()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminator()I
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    const/4 v4, 0x1
+
+    invoke-static {v2, v3, p1, v4}, Lcom/discord/utilities/icon/IconUtils;->getForUser(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;Z)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/stateful/StatefulViews;->get(ILjava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountAvatar()Landroid/widget/ImageView;
+
+    move-result-object v5
+
+    const v7, 0x7f070055
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/16 v10, 0x18
+
+    const/4 v11, 0x0
+
+    move-object v6, p1
+
+    invoke-static/range {v5 .. v11}, 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/settings/account/WidgetSettingsAccount;->getRemoveAvatar()Landroid/view/View;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-eqz p1, :cond_1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    const-string v2, "asset://asset/images/default_avatar"
+
+    check-cast v2, Ljava/lang/CharSequence;
+
+    invoke-static {p1, v2, v1}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+
+    move-result p1
+
+    if-eq p1, v4, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v4, 0x0
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x2
+
+    const/4 v2, 0x0
+
+    invoke-static {v0, v4, v1, p1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    return-void
+.end method
+
 .method private final showOwnsGuildModal()V
     .locals 4
 
@@ -2402,13 +2417,13 @@
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v1, 0x7f1204c8
+    const v1, 0x7f1204d3
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f1204c9
+    const v1, 0x7f1204d4
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -2416,7 +2431,7 @@
 
     const/4 v1, 0x0
 
-    const v2, 0x7f120c77
+    const v2, 0x7f120cb0
 
     const/4 v3, 0x2
 
@@ -2455,7 +2470,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f12118b
+    const v3, 0x7f1211cf
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2469,7 +2484,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f121265
+    const v4, 0x7f1212b6
 
     invoke-virtual {v3, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2483,7 +2498,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f121167
+    const v5, 0x7f1211a9
 
     invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2513,13 +2528,13 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0197
+    const v0, 0x7f0d01a1
 
     return v0
 .end method
 
 .method public final onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
-    .locals 2
+    .locals 7
 
     const-string v0, "uri"
 
@@ -2531,46 +2546,27 @@
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
 
-    invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result v0
+    move-result-object v3
 
-    const v1, -0x34688ef0    # -1.984976E7f
+    const-string v0, "requireFragmentManager()"
 
-    if-eq v0, v1, :cond_0
+    invoke-static {v3, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    goto :goto_0
+    move-object v4, p0
 
-    :cond_0
-    const-string v0, "image/gif"
+    check-cast v4, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
 
-    invoke-virtual {p2, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    iget-object v5, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountAvatarSelectedResult:Lrx/functions/Action1;
 
-    move-result v0
+    sget-object v6, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->wA:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
-    if-eqz v0, :cond_1
+    move-object v1, p1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getContext()Landroid/content/Context;
+    move-object v2, p2
 
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountAvatarSelectedResult:Lrx/functions/Action1;
-
-    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_1
-    :goto_0
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getContext()Landroid/content/Context;
-
-    move-result-object p2
-
-    move-object v0, p0
-
-    check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
-
-    invoke-static {p2, v0, p1}, Lcom/discord/utilities/images/MGImages;->requestAvatarCrop(Landroid/content/Context;Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Landroid/net/Uri;)V
+    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
 .end method
@@ -2608,11 +2604,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f121231
+    const p1, 0x7f12127e
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f12126b
+    const p1, 0x7f1212bc
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder.smali
index bd2363a13d..7891425366 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder.smali
@@ -79,7 +79,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a03de
+    const p1, 0x7f0a03ee
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali
index 033c6280ce..f4ed149edc 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali
@@ -84,7 +84,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120444
+    const v0, 0x7f12044d
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali
index 9fd709d22f..065203ecc2 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali
@@ -79,7 +79,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a03c8
+    const p1, 0x7f0a03d8
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -185,7 +185,7 @@
 
     invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f12028c
+    const v4, 0x7f120290
 
     const/4 v5, 0x1
 
@@ -213,7 +213,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f080221
+    const p2, 0x7f080230
 
     invoke-virtual {p1, v6, v6, p2, v6}, Landroid/widget/TextView;->setCompoundDrawablesWithIntrinsicBounds(IIII)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter.smali
index b1b9519930..25d648934d 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter.smali
@@ -95,7 +95,7 @@
     :cond_0
     new-instance p1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder;
 
-    const p2, 0x7f0d01ab
+    const p2, 0x7f0d01b5
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder;-><init>(ILcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter;)V
 
@@ -106,7 +106,7 @@
     :cond_1
     new-instance p1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder;
 
-    const p2, 0x7f0d01ac
+    const p2, 0x7f0d01b6
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder;-><init>(ILcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter;)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
index 104768b361..1183d9402d 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1;->invoke(Lcom/discord/models/domain/ModelBackupCodes;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -179,7 +179,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f12124b
+    const v5, 0x7f121298
 
     invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -258,7 +258,7 @@
 
     move-result-object v2
 
-    const v4, 0x7f12127b
+    const v4, 0x7f1212cc
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1.smali
index 8d13fd7dea..d41e524ac4 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1.smali
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1;->invoke(Landroid/content/Context;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2.smali
index bcc2f17b29..32bdc30fc8 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali
index 0b7e22c931..8744e00f87 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali
@@ -150,7 +150,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a067a
+    const v0, 0x7f0a0694
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -158,7 +158,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->infoTV$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a067b
+    const v0, 0x7f0a0695
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -166,7 +166,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->backupCodesRV$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0679
+    const v0, 0x7f0a0693
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -174,7 +174,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->generateCodes$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -247,7 +247,7 @@
 
     const-string v1, "backupCodesAdapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter;->setData(Ljava/util/List;)V
@@ -312,7 +312,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->getContext()Landroid/content/Context;
 
@@ -442,7 +442,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f121251
+    const v3, 0x7f1212a2
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -456,7 +456,7 @@
 
     move-result-object v2
 
-    const v4, 0x7f12116d
+    const v4, 0x7f1211af
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -501,7 +501,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0198
+    const v0, 0x7f0d01a2
 
     return v0
 .end method
@@ -511,11 +511,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f121231
+    const p1, 0x7f12127e
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f12116d
+    const p1, 0x7f1211af
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -547,7 +547,7 @@
 
     new-array p2, p2, [Ljava/lang/Object;
 
-    const v0, 0x7f12116c
+    const v0, 0x7f1211ae
 
     invoke-virtual {p1, v0, p2}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$1.smali
index f0bf92a7ed..eaa24803c7 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$1;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.smali
index 5d35ab3987..8c1c9f2996 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$3.smali
index 06e7364988..9a30bd7b9b 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$3;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBoundOrOnResume$1.smali
index 5531b53312..ebafba7c97 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBoundOrOnResume$1;->invoke(Lcom/discord/models/domain/ModelUser;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.smali
index 15e1ad2d74..f40a99210b 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.smali
@@ -53,7 +53,7 @@
 
     check-cast v0, Landroidx/fragment/app/Fragment;
 
-    const v1, 0x7f120f2c
+    const v1, 0x7f120f63
 
     invoke-static {v0, v1}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
index 35904ddf71..81dbab6509 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
@@ -169,7 +169,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0130
+    const v0, 0x7f0a0131
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -177,7 +177,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->currentPassword$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0131
+    const v0, 0x7f0a0132
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -185,7 +185,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->newPassword$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0133
+    const v1, 0x7f0a0134
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -193,7 +193,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->twoFA$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a026f
+    const v1, 0x7f0a0278
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -201,7 +201,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->dimmerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0132
+    const v1, 0x7f0a0133
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -507,7 +507,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120cd8
+    const v3, 0x7f120d12
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -546,7 +546,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120cd2
+    const v3, 0x7f120d0c
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -609,7 +609,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f121190
+    const v3, 0x7f1211d4
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -720,7 +720,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0199
+    const v0, 0x7f0d01a3
 
     return v0
 .end method
@@ -734,11 +734,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f121231
+    const p1, 0x7f12127e
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120395
+    const p1, 0x7f12039a
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali
index 5b52cb1a4f..913069adb5 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p1, p2}, Landroidx/appcompat/widget/AppCompatEditText;->post(Ljava/lang/Runnable;)Z
 
-    sget-object p1, Lcom/discord/a/a;->ww:Lcom/discord/a/a$a;
+    sget-object p1, Lcom/discord/dialogs/c;->wG:Lcom/discord/dialogs/c$a;
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
 
@@ -69,7 +69,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
 
-    const p2, 0x7f120e59
+    const p2, 0x7f120e90
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getString(I)Ljava/lang/String;
 
@@ -85,7 +85,7 @@
 
     const-string v4, "Edit Account"
 
-    invoke-static/range {v0 .. v7}, Lcom/discord/a/a$a;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
+    invoke-static/range {v0 .. v7}, Lcom/discord/dialogs/c$a;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1$1.smali
index 26521a008e..15d6804800 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1$1.smali
@@ -74,7 +74,7 @@
 
     invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1$1;->invoke(Ljava/lang/CharSequence;III)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1.smali
index 8ccf4aa3ff..8d07d32c06 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1;->invoke(Lcom/google/android/material/textfield/TextInputLayout;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$2.smali
index 09e2484b06..ac9130d195 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$2.smali
@@ -74,7 +74,7 @@
 
     invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$2;->invoke(Ljava/lang/CharSequence;III)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBoundOrOnResume$1.smali
index f38db1d270..66adb1123f 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBoundOrOnResume$1;->invoke(Lcom/discord/models/domain/ModelUser;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1.smali
index ae57d2549b..ca3606f625 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1.smali
@@ -67,7 +67,7 @@
 
     check-cast v0, Landroidx/fragment/app/Fragment;
 
-    const v1, 0x7f120f2c
+    const v1, 0x7f120f63
 
     invoke-static {v0, v1}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
index 7452cae830..76d673e808 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
@@ -68,7 +68,7 @@
 
     sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v7, 0x7f12128e
+    const v7, 0x7f1212df
 
     invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -102,9 +102,9 @@
 
     sget-object v6, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
-    const v8, 0x7f120d68
+    const v8, 0x7f120daa
 
-    const v9, 0x7f120d6d
+    const v9, 0x7f120daf
 
     invoke-virtual {v6, v8, v9}, Lcom/discord/utilities/auth/AuthUtils;->createDiscriminatorInputValidator(II)Lcom/discord/utilities/view/validators/InputValidator;
 
@@ -134,7 +134,7 @@
 
     sget-object v8, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v9, 0x7f120556
+    const v9, 0x7f120561
 
     invoke-virtual {v8, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -146,7 +146,7 @@
 
     sget-object v8, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
-    const v9, 0x7f120555
+    const v9, 0x7f120560
 
     invoke-virtual {v8, v9}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -176,7 +176,7 @@
 
     sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v8, 0x7f120cd8
+    const v8, 0x7f120d12
 
     invoke-virtual {v6, v8}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -188,7 +188,7 @@
 
     sget-object v6, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
-    const v7, 0x7f120cd2
+    const v7, 0x7f120d0c
 
     invoke-virtual {v6, v7}, Lcom/discord/utilities/auth/AuthUtils;->createPasswordInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali
index 7918c35ee7..594e13c5aa 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali
@@ -289,7 +289,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0283
+    const v0, 0x7f0a028c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -297,7 +297,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->usernameWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0282
+    const v0, 0x7f0a028b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -305,7 +305,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->username$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a027b
+    const v0, 0x7f0a0284
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -313,7 +313,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->discriminator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a027d
+    const v0, 0x7f0a0286
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -321,7 +321,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->email$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a027e
+    const v0, 0x7f0a0287
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -329,7 +329,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->emailWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0280
+    const v0, 0x7f0a0289
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -337,7 +337,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->passwordWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a027f
+    const v0, 0x7f0a0288
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -345,7 +345,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->password$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0663
+    const v0, 0x7f0a067d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -353,7 +353,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->accountSave$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -391,9 +391,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a0282
-        0x7f0a027b
-        0x7f0a027d
+        0x7f0a028b
+        0x7f0a0284
+        0x7f0a0286
     .end array-data
 .end method
 
@@ -524,7 +524,7 @@
 
     move-result v4
 
-    sget-object v5, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sget-object v5, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
     new-array v5, v1, [Ljava/lang/Object;
 
@@ -1058,7 +1058,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d019a
+    const v0, 0x7f0d01a4
 
     return v0
 .end method
@@ -1072,11 +1072,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f121231
+    const p1, 0x7f12127e
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f12124e
+    const p1, 0x7f12129f
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali
index 46e00beb4d..8fd2da6945 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali
@@ -53,7 +53,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0471
+    const v0, 0x7f0a0484
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -89,7 +89,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a4
+    const v0, 0x7f0d01ae
 
     return v0
 .end method
@@ -119,7 +119,7 @@
 
     aput-object v2, v0, v1
 
-    const v1, 0x7f121173
+    const v1, 0x7f1211b5
 
     invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFADownload;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.smali
index 141d76ebe5..43df37b024 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.smali
@@ -53,7 +53,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a07ad
+    const v0, 0x7f0a07dc
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -89,7 +89,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a5
+    const v0, 0x7f0d01af
 
     return v0
 .end method
@@ -167,6 +167,10 @@
     return-void
 
     :cond_3
+    const-string v0, "clipboard.primaryClip ?: return"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p1}, Landroid/content/ClipData;->getItemCount()I
 
     move-result v0
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
index 75a00560ea..11b606e866 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
@@ -119,7 +119,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a02b4
+    const v0, 0x7f0a02bd
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -127,7 +127,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->key$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02b5
+    const v0, 0x7f0a02be
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -135,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->launchAuthy$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02b6
+    const v0, 0x7f0a02bf
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -198,7 +198,7 @@
     invoke-virtual {v1, v0}, Landroid/content/ClipboardManager;->setPrimaryClip(Landroid/content/ClipData;)V
 
     :cond_0
-    const v0, 0x7f120444
+    const v0, 0x7f12044d
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
@@ -293,7 +293,7 @@
 
     const/4 v2, 0x1
 
-    const v3, 0x7f120ab4
+    const v3, 0x7f120ad5
 
     const/4 v4, 0x0
 
@@ -305,7 +305,7 @@
 
     new-array v5, v2, [Ljava/lang/Object;
 
-    const v6, 0x7f121165
+    const v6, 0x7f1211a7
 
     invoke-virtual {p0, v6}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->getString(I)Ljava/lang/String;
 
@@ -356,7 +356,7 @@
 
     new-array v2, v2, [Ljava/lang/Object;
 
-    const v5, 0x7f121166
+    const v5, 0x7f1211a8
 
     invoke-virtual {p0, v5}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->getString(I)Ljava/lang/String;
 
@@ -400,7 +400,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a6
+    const v0, 0x7f0d01b0
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1.smali
index 0b6206b110..572ab99adc 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.smali
index 6339d6d8f3..6243a3880f 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$EnableMFAState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -99,7 +99,7 @@
 
     if-ltz p1, :cond_1
 
-    iget-object v1, v0, Lcom/discord/views/steps/StepsView;->Dx:Lcom/discord/views/steps/StepsView$d;
+    iget-object v1, v0, Lcom/discord/views/steps/StepsView;->DH:Lcom/discord/views/steps/StepsView$d;
 
     if-eqz v1, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali
index d2fbf8b2f5..8448fe9ebe 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali
@@ -101,7 +101,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a02b7
+    const v0, 0x7f0a02c0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -109,7 +109,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;->stepsView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -185,7 +185,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d011a
+    const v0, 0x7f0d0123
 
     return v0
 .end method
@@ -251,7 +251,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f120368
+    const v4, 0x7f12036d
 
     const/4 v5, 0x0
 
@@ -327,7 +327,7 @@
 
     aput-object v2, v0, v3
 
-    invoke-static {v0}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
@@ -343,7 +343,7 @@
 
     invoke-direct {v2, v3}, Lcom/discord/views/steps/StepsView$d;-><init>(Landroidx/fragment/app/FragmentManager;)V
 
-    iput-object v0, v2, Lcom/discord/views/steps/StepsView$d;->DS:Ljava/util/List;
+    iput-object v0, v2, Lcom/discord/views/steps/StepsView$d;->Ec:Ljava/util/List;
 
     invoke-virtual {v2}, Lcom/discord/views/steps/StepsView$d;->notifyDataSetChanged()V
 
@@ -367,11 +367,11 @@
 
     invoke-static {v3, v5}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v2, v0, Lcom/discord/views/steps/StepsView;->Dx:Lcom/discord/views/steps/StepsView$d;
+    iput-object v2, v0, Lcom/discord/views/steps/StepsView;->DH:Lcom/discord/views/steps/StepsView$d;
 
     iget-object v2, v0, Lcom/discord/views/steps/StepsView;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
 
-    iget-object v5, v0, Lcom/discord/views/steps/StepsView;->Dx:Lcom/discord/views/steps/StepsView$d;
+    iget-object v5, v0, Lcom/discord/views/steps/StepsView;->DH:Lcom/discord/views/steps/StepsView$d;
 
     check-cast v5, Landroidx/viewpager/widget/PagerAdapter;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.smali
index ee2b0273ad..ee779aa30c 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.smali
@@ -53,7 +53,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0472
+    const v0, 0x7f0a0485
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -89,7 +89,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a7
+    const v0, 0x7f0d01b1
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$1.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$1.smali
index 66cc2c058b..941237a416 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$1;->invoke(Lcom/discord/models/domain/ModelUser$Token;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$2.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$2.smali
index ac90dc56f8..33e898a7e5 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$3.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$3.smali
index a9c6e39ecb..33f16170f8 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$3;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel.smali
index a9356f6e69..fba9514d4a 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel.smali
@@ -55,7 +55,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;->enableMFAState:Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$EnableMFAState;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -238,7 +238,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceAddViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceAddViewHolder.smali
index 581daa992a..624777ca76 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceAddViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceAddViewHolder.smali
@@ -33,7 +33,7 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0056
+    const v0, 0x7f0d0058
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali
index 6f60df7fe4..01cf4d0ffa 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali
@@ -33,7 +33,7 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0057
+    const v0, 0x7f0d0059
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -77,7 +77,7 @@
 
     if-ne p2, v0, :cond_0
 
-    const p2, 0x7f120c84
+    const p2, 0x7f120cbf
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItemViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItemViewHolder.smali
index 5adb053187..1dd600feea 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItemViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItemViewHolder.smali
@@ -39,13 +39,13 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0058
+    const v0, 0x7f0d005a
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItemViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a04db
+    const v0, 0x7f0a04f2
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -61,7 +61,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItemViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a04d9
+    const v0, 0x7f0a04f0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali
index 5157881ad2..f3ae67787a 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali
@@ -69,11 +69,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d0059
+    const p3, 0x7f0d005b
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a04ef
+    const p1, 0x7f0a0506
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/PaymentSourceView;->findViewById(I)Landroid/view/View;
 
@@ -87,7 +87,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->icon:Landroid/widget/ImageView;
 
-    const p1, 0x7f0a04f4
+    const p1, 0x7f0a050b
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/PaymentSourceView;->findViewById(I)Landroid/view/View;
 
@@ -101,7 +101,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->title:Landroid/widget/TextView;
 
-    const p1, 0x7f0a04f3
+    const p1, 0x7f0a050a
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/PaymentSourceView;->findViewById(I)Landroid/view/View;
 
@@ -115,7 +115,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->subtext:Landroid/widget/TextView;
 
-    const p1, 0x7f0a04f2
+    const p1, 0x7f0a0509
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/PaymentSourceView;->findViewById(I)Landroid/view/View;
 
@@ -127,7 +127,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->premiumIndicator:Landroid/view/View;
 
-    const p1, 0x7f0a04f1
+    const p1, 0x7f0a0508
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/PaymentSourceView;->findViewById(I)Landroid/view/View;
 
@@ -187,7 +187,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f120cf1
+    const v2, 0x7f120d35
 
     invoke-static {p0, v2, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -241,7 +241,7 @@
 
     aput-object p1, v0, v4
 
-    const p1, 0x7f120cf3
+    const p1, 0x7f120d37
 
     invoke-static {p0, p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -259,7 +259,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->title:Landroid/widget/TextView;
 
-    const v1, 0x7f120d0f
+    const v1, 0x7f120d53
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/SettingsBillingViewModel$2.smali b/com.discord/smali/com/discord/widgets/settings/billing/SettingsBillingViewModel$2.smali
index 79dedb4827..9a6385eead 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/SettingsBillingViewModel$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/SettingsBillingViewModel$2.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$2;->invoke(Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/SettingsBillingViewModel$3.smali b/com.discord/smali/com/discord/widgets/settings/billing/SettingsBillingViewModel$3.smali
index 434c6c924b..82c1f359a4 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/SettingsBillingViewModel$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/SettingsBillingViewModel$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$3;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/SettingsBillingViewModel.smali b/com.discord/smali/com/discord/widgets/settings/billing/SettingsBillingViewModel.smali
index 646ce2f726..65a47c8d14 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/SettingsBillingViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/SettingsBillingViewModel.smali
@@ -31,7 +31,7 @@
 
     invoke-direct {p0}, Landroidx/lifecycle/ViewModel;-><init>()V
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -127,7 +127,7 @@
 
     const-string v0, "subscription"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -314,7 +314,7 @@
 
     if-gez v3, :cond_0
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_0
     check-cast v4, Lcom/discord/models/domain/ModelPaymentSource;
@@ -450,7 +450,7 @@
 
     const-string v1, "subscription"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali
index 4e7e23b1c7..2db2dd6089 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f120cf9
+    const v0, 0x7f120d3d
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$2.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$2.smali
index 7a6aba925c..17b447a03e 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$3.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$3.smali
index 531fc79b42..0f17906471 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$3.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$3;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali
index 0917573412..a2fb5acbec 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali
@@ -49,7 +49,7 @@
 
     iget-object v3, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const v4, 0x7f120cf7
+    const v4, 0x7f120d3b
 
     invoke-virtual {v3, v4}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->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, 0x7f120cf8
+    const v5, 0x7f120d3c
 
     invoke-virtual {v4, v5}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String;
 
@@ -73,7 +73,7 @@
 
     iget-object v5, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const v6, 0x7f120c77
+    const v6, 0x7f120cb0
 
     invoke-virtual {v5, v6}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$paymentSourceId$2.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$paymentSourceId$2.smali
index bb477ed696..f9f280192c 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$paymentSourceId$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$paymentSourceId$2.smali
@@ -64,16 +64,19 @@
 
     move-result-object v0
 
-    if-nez v0, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
-
-    :cond_0
     const-string v1, "ARG_PAYMENT_SOURCE_ID"
 
     invoke-virtual {v0, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
+    if-nez v0, :cond_1
+
+    :cond_0
+    const-string v0, ""
+
+    :cond_1
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$selectState$2.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$selectState$2.smali
index fd0a792599..186c08f619 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$selectState$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$selectState$2.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$selectState$2;->invoke(I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali
index 2e62cd2dab..b6736cd4cf 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f120cfc
+    const v0, 0x7f120d40
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$2.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$2.smali
index 436d8267ed..02f8e2b881 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$3.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$3.smali
index d8f55c12f8..84fecbfa4b 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$3.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$3;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali
index e5596d122d..df23f38c92 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali
@@ -462,7 +462,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a04ee
+    const v0, 0x7f0a0505
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -470,7 +470,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->paymentSourceView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04ea
+    const v0, 0x7f0a0501
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -478,7 +478,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->helpText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04e9
+    const v0, 0x7f0a0500
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -486,7 +486,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->errorText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04eb
+    const v0, 0x7f0a0502
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -494,7 +494,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->nameInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04e4
+    const v0, 0x7f0a04fb
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -502,7 +502,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->addressInput1$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04e5
+    const v0, 0x7f0a04fc
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -510,7 +510,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->addressInput2$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04e6
+    const v0, 0x7f0a04fd
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -518,7 +518,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->cityInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04ed
+    const v0, 0x7f0a0504
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -526,7 +526,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->stateInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04ec
+    const v0, 0x7f0a0503
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -534,7 +534,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->postalCodeInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04e7
+    const v0, 0x7f0a04fe
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -542,7 +542,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->countryInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04e8
+    const v0, 0x7f0a04ff
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -558,7 +558,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->toolbar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0267
+    const v0, 0x7f0a0270
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -566,7 +566,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->saveBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0266
+    const v0, 0x7f0a026f
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1186,7 +1186,7 @@
 
     if-eqz v3, :cond_0
 
-    const v3, 0x7f120cfb
+    const v3, 0x7f120d3f
 
     new-array v4, v9, [Ljava/lang/Object;
 
@@ -1201,7 +1201,7 @@
     goto :goto_0
 
     :cond_0
-    const v3, 0x7f120cfa
+    const v3, 0x7f120d3e
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String;
 
@@ -1505,7 +1505,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1202ba
+    const v0, 0x7f1202be
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String;
 
@@ -1519,7 +1519,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1202b7
+    const v0, 0x7f1202bb
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String;
 
@@ -1636,7 +1636,7 @@
 
     sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v7, 0x7f1202b6
+    const v7, 0x7f1202ba
 
     invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -1666,7 +1666,7 @@
 
     sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v8, 0x7f1202ae
+    const v8, 0x7f1202b2
 
     invoke-virtual {v6, v8}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -1694,7 +1694,7 @@
 
     sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v8, 0x7f1202b1
+    const v8, 0x7f1202b5
 
     invoke-virtual {v6, v8}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -1740,12 +1740,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f1202bb
+    const p1, 0x7f1202bf
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1202be
+    const p1, 0x7f1202c2
 
     :goto_0
     invoke-virtual {v6, p1}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -1778,7 +1778,7 @@
 
     sget-object v5, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v6, 0x7f1202b9
+    const v6, 0x7f1202bd
 
     invoke-virtual {v5, v6}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -1806,7 +1806,7 @@
 .method private final selectState([Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;)V
     .locals 7
 
-    sget-object v0, Lcom/discord/a/b;->wD:Lcom/discord/a/b$a;
+    sget-object v0, Lcom/discord/dialogs/d;->wN:Lcom/discord/dialogs/d$a;
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
@@ -1817,7 +1817,7 @@
     return-void
 
     :cond_0
-    const v1, 0x7f120cfd
+    const v1, 0x7f120d41
 
     invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String;
 
@@ -1877,7 +1877,7 @@
 
     check-cast v3, Lkotlin/jvm/functions/Function1;
 
-    invoke-static {v0, v1, v2, v3}, Lcom/discord/a/b$a;->a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;[Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Lcom/discord/a/b;
+    invoke-static {v0, v1, v2, v3}, Lcom/discord/dialogs/d$a;->a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;[Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Lcom/discord/dialogs/d;
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getPostalCodeInput()Lcom/google/android/material/textfield/TextInputLayout;
 
@@ -1986,7 +1986,7 @@
 
     const-string v2, "validationManager"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     const/4 v2, 0x1
@@ -2166,7 +2166,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0159
+    const v0, 0x7f0d0163
 
     return v0
 .end method
@@ -2204,7 +2204,7 @@
 
     const-string v1, "validationManager"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
@@ -2290,7 +2290,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f130230
+    const v2, 0x7f130231
 
     iput v2, v1, Landroid/view/WindowManager$LayoutParams;->windowAnimations:I
 
@@ -2353,7 +2353,7 @@
 
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;->getViewState()Lrx/Observable;
@@ -2406,7 +2406,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali
index eb79851ab5..45a8ab45b3 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali
@@ -71,7 +71,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0682
+    const v0, 0x7f0a069c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -107,7 +107,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d019f
+    const v0, 0x7f0d01a9
 
     return v0
 .end method
@@ -117,11 +117,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f1202a5
+    const p1, 0x7f1202a9
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->setActionBarTitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f121231
+    const p1, 0x7f12127e
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->setActionBarSubtitle(I)Lkotlin/Unit;
 
@@ -165,7 +165,7 @@
 
     new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
 
-    const v4, 0x7f1202e8
+    const v4, 0x7f1202ec
 
     invoke-virtual {p0, v4}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->getString(I)Ljava/lang/String;
 
@@ -187,7 +187,7 @@
 
     new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
 
-    const v4, 0x7f1202e3
+    const v4, 0x7f1202e7
 
     invoke-virtual {p0, v4}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2.smali
index ae115bb827..f479a2d667 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2;->invoke(Landroid/net/Uri;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory.smali
index 9fc92a5f5d..7da06fc743 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory.smali
@@ -73,7 +73,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0807
+    const v0, 0x7f0a0845
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -119,7 +119,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01db
+    const v0, 0x7f0d01e9
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$1.smali
index a4e2a11d6f..c846065d06 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$1.smali
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$2.smali
index f3f302fc96..efb9697c05 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$2.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$2;->invoke(Lcom/discord/models/domain/ModelPaymentSource;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods.smali
index 70de2a9f6d..f5d13dee4e 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods.smali
@@ -155,7 +155,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a04e3
+    const v0, 0x7f0a04fa
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -163,7 +163,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04e1
+    const v0, 0x7f0a04f8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -171,7 +171,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04e2
+    const v0, 0x7f0a04f9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -179,7 +179,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;->retryButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04dc
+    const v0, 0x7f0a04f3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -199,7 +199,7 @@
 
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -336,7 +336,7 @@
 .method private final onAddClick()V
     .locals 3
 
-    sget-object v0, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+    sget-object v0, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
     move-object v1, p0
 
@@ -348,7 +348,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/nitro/NitroUtils;->openWebAddPaymentSource(Lcom/discord/app/AppFragment;Landroid/net/Uri;)V
+    invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/premium/PremiumUtils;->openWebAddPaymentSource(Lcom/discord/app/AppFragment;Landroid/net/Uri;)V
 
     return-void
 .end method
@@ -447,7 +447,7 @@
 
     const-string v1, "recyclerAdapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded;->getPaymentSourceItems()Ljava/util/List;
@@ -475,7 +475,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01b4
+    const v0, 0x7f0d01be
 
     return v0
 .end method
@@ -513,7 +513,7 @@
 
     const-string v1, "viewModel"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;->getViewState()Lrx/Observable;
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$1$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$1$1.smali
deleted file mode 100644
index 6e21451504..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$1$1.smali
+++ /dev/null
@@ -1,86 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1$1;
-.super Ljava/lang/Object;
-.source "SettingsPremiumViewModel.kt"
-
-# interfaces
-.implements Lrx/functions/Func2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1;->call(Ljava/lang/Long;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T1:",
-        "Ljava/lang/Object;",
-        "T2:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1$1;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1$1;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1;
-
-    iget-object v0, v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    const-string v1, "paymentSources"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v1, "subscriptions"
-
-    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v0, p1, p2}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->access$buildViewState(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;
-
-    check-cast p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1$1;->call(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium.smali
deleted file mode 100644
index 4a1bde0862..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium;
-.super Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-.source "SettingsPremiumViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "DowngradePremium"
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium;->INSTANCE:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium;
-
-    return-void
-.end method
-
-.method private constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium.smali
deleted file mode 100644
index 4b5e59976f..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium.smali
+++ /dev/null
@@ -1,233 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
-.super Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-.source "SettingsPremiumViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "UpgradePremium"
-.end annotation
-
-
-# instance fields
-.field private final hasError:Z
-
-.field private final targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    iput-boolean p2, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
-
-    return-void
-.end method
-
-.method public synthetic constructor <init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;-><init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)V
-
-    return-void
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;ZILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
-    .locals 0
-
-    and-int/lit8 p4, p3, 0x1
-
-    if-eqz p4, :cond_0
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    :cond_0
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_1
-
-    iget-boolean p2, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
-
-    :cond_1
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->copy(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final component1()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    return-object v0
-.end method
-
-.method public final component2()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
-
-    return v0
-.end method
-
-.method public final copy(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
-
-    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;-><init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)V
-
-    return-object v0
-.end method
-
-.method public final equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x1
-
-    if-eq p0, p1, :cond_2
-
-    instance-of v1, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
-
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    iget-boolean v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
-
-    iget-boolean p1, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
-
-    if-ne v1, 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 final getHasError()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
-
-    return v0
-.end method
-
-.method public final getTargetPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    return-object v0
-.end method
-
-.method public final hashCode()I
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    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-boolean v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
-
-    if-eqz v1, :cond_1
-
-    const/4 v1, 0x1
-
-    :cond_1
-    add-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "UpgradePremium(targetPlanType="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", hasError="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const-string v1, ")"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError.smali
deleted file mode 100644
index 92817b7f1c..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError.smali
+++ /dev/null
@@ -1,95 +0,0 @@
-.class public final enum Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-.super Ljava/lang/Enum;
-.source "SettingsPremiumViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x4019
-    name = "SubscriptionError"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field private static final synthetic $VALUES:[Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-.field public static final enum GENERIC:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 4
-
-    const/4 v0, 0x1
-
-    new-array v0, v0, [Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    new-instance v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    const/4 v2, 0x0
-
-    const-string v3, "GENERIC"
-
-    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;->GENERIC:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    aput-object v1, v0, v2
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;->$VALUES:[Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    return-void
-.end method
-
-.method private 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/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    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/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    return-object p0
-.end method
-
-.method public static values()[Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-    .locals 1
-
-    sget-object v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;->$VALUES:[Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    invoke-virtual {v0}, [Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Failure.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Failure.smali
deleted file mode 100644
index 6977cad723..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Failure.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Failure;
-.super Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-.source "SettingsPremiumViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Failure"
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Failure;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Failure;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Failure;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Failure;->INSTANCE:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Failure;
-
-    return-void
-.end method
-
-.method private constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded.smali
deleted file mode 100644
index 1ec26f647c..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded.smali
+++ /dev/null
@@ -1,495 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-.super Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-.source "SettingsPremiumViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Loaded"
-.end annotation
-
-
-# instance fields
-.field private final dialog:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-.field private final isBusy:Z
-
-.field private final paymentSources:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPaymentSource;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private final premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
-
-.field private final subscriptionError:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/models/domain/ModelSubscription;",
-            "Ljava/util/List<",
-            "+",
-            "Lcom/discord/models/domain/ModelPaymentSource;",
-            ">;Z",
-            "Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;",
-            "Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;",
-            ")V"
-        }
-    .end annotation
-
-    const-string v0, "paymentSources"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
-
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
-
-    iput-boolean p3, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
-
-    iput-object p4, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    iput-object p5, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    return-void
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-    .locals 3
-
-    and-int/lit8 p7, p6, 0x1
-
-    if-eqz p7, :cond_0
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
-
-    :cond_0
-    and-int/lit8 p7, p6, 0x2
-
-    if-eqz p7, :cond_1
-
-    iget-object p2, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
-
-    :cond_1
-    move-object p7, p2
-
-    and-int/lit8 p2, p6, 0x4
-
-    if-eqz p2, :cond_2
-
-    iget-boolean p3, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
-
-    :cond_2
-    move v0, p3
-
-    and-int/lit8 p2, p6, 0x8
-
-    if-eqz p2, :cond_3
-
-    iget-object p4, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    :cond_3
-    move-object v1, p4
-
-    and-int/lit8 p2, p6, 0x10
-
-    if-eqz p2, :cond_4
-
-    iget-object p5, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    :cond_4
-    move-object v2, p5
-
-    move-object p2, p0
-
-    move-object p3, p1
-
-    move-object p4, p7
-
-    move p5, v0
-
-    move-object p6, v1
-
-    move-object p7, v2
-
-    invoke-virtual/range {p2 .. p7}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->copy(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final component1()Lcom/discord/models/domain/ModelSubscription;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
-
-    return-object v0
-.end method
-
-.method public final component2()Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPaymentSource;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
-
-    return-object v0
-.end method
-
-.method public final component3()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
-
-    return v0
-.end method
-
-.method public final component4()Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    return-object v0
-.end method
-
-.method public final component5()Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    return-object v0
-.end method
-
-.method public final copy(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/models/domain/ModelSubscription;",
-            "Ljava/util/List<",
-            "+",
-            "Lcom/discord/models/domain/ModelPaymentSource;",
-            ">;Z",
-            "Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;",
-            "Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;",
-            ")",
-            "Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;"
-        }
-    .end annotation
-
-    const-string v0, "paymentSources"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    move-object v1, v0
-
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move v4, p3
-
-    move-object v5, p4
-
-    move-object v6, p5
-
-    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)V
-
-    return-object v0
-.end method
-
-.method public final equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x1
-
-    if-eq p0, p1, :cond_2
-
-    instance-of v1, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
-
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
-
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
-
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    iget-boolean v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
-
-    iget-boolean v3, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
-
-    if-ne v1, v3, :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, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    iget-object p1, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    return v2
-
-    :cond_2
-    :goto_1
-    return v0
-.end method
-
-.method public final getDialog()Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    return-object v0
-.end method
-
-.method public final getPaymentSources()Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPaymentSource;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
-
-    return-object v0
-.end method
-
-.method public final getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
-
-    return-object v0
-.end method
-
-.method public final getSubscriptionError()Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    return-object v0
-.end method
-
-.method public final hashCode()I
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
-
-    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/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
-
-    if-eqz v2, :cond_2
-
-    const/4 v2, 0x1
-
-    :cond_2
-    add-int/2addr v0, v2
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    if-eqz v2, :cond_3
-
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v2
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v2, 0x0
-
-    :goto_2
-    add-int/2addr v0, v2
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    if-eqz v2, :cond_4
-
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    :cond_4
-    add-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public final isBusy()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
-
-    return v0
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "Loaded(premiumSubscription="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", paymentSources="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", isBusy="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const-string v1, ", subscriptionError="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", dialog="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ")"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading.smali
deleted file mode 100644
index 31ebaccae5..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading;
-.super Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-.source "SettingsPremiumViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Loading"
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading;
-
-    return-void
-.end method
-
-.method private constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$1.smali
deleted file mode 100644
index 9dab237081..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$1.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$1;
-.super Ljava/lang/Object;
-.source "SettingsPremiumViewModel.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->cancelSubscription()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Void;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$1;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/lang/Void;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$1;->call(Ljava/lang/Void;)V
-
-    return-void
-.end method
-
-.method public final call(Ljava/lang/Void;)V
-    .locals 0
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$1;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->access$fetchData(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$2.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$2.smali
deleted file mode 100644
index 31ee8decac..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$2.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$2;
-.super Ljava/lang/Object;
-.source "SettingsPremiumViewModel.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->cancelSubscription()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Throwable;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$2;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$2;->call(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public final call(Ljava/lang/Throwable;)V
-    .locals 0
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$2;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->access$onCancelError(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$1.smali
deleted file mode 100644
index cab48ec17c..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$1.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$1;
-.super Ljava/lang/Object;
-.source "SettingsPremiumViewModel.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->changePaymentSource(Lcom/discord/models/domain/ModelPaymentSource;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Void;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$1;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/lang/Void;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$1;->call(Ljava/lang/Void;)V
-
-    return-void
-.end method
-
-.method public final call(Ljava/lang/Void;)V
-    .locals 0
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$1;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->access$fetchData(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$2.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$2.smali
deleted file mode 100644
index 24df0b0b66..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$2.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$2;
-.super Ljava/lang/Object;
-.source "SettingsPremiumViewModel.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->changePaymentSource(Lcom/discord/models/domain/ModelPaymentSource;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Throwable;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$2;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$2;->call(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public final call(Ljava/lang/Throwable;)V
-    .locals 0
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$2;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->access$onChangePaymentSourceError(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$1.smali
deleted file mode 100644
index 897aec6639..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$1.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$1;
-.super Ljava/lang/Object;
-.source "SettingsPremiumViewModel.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->resubscribe()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Void;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$1;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/lang/Void;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$1;->call(Ljava/lang/Void;)V
-
-    return-void
-.end method
-
-.method public final call(Ljava/lang/Void;)V
-    .locals 0
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$1;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->access$fetchData(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$2.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$2.smali
deleted file mode 100644
index 4ca68ea721..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$2.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$2;
-.super Ljava/lang/Object;
-.source "SettingsPremiumViewModel.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->resubscribe()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Throwable;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$2;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$2;->call(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public final call(Ljava/lang/Throwable;)V
-    .locals 0
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$2;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->access$onResubscribeError(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$1.smali
deleted file mode 100644
index 33573604e2..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$1.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$1;
-.super Ljava/lang/Object;
-.source "SettingsPremiumViewModel.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->upgradeSubscription(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Void;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$1;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/lang/Void;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$1;->call(Ljava/lang/Void;)V
-
-    return-void
-.end method
-
-.method public final call(Ljava/lang/Void;)V
-    .locals 0
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$1;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->access$fetchData(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$2.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$2.smali
deleted file mode 100644
index 1dd5d8cfe0..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$2.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$2;
-.super Ljava/lang/Object;
-.source "SettingsPremiumViewModel.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->upgradeSubscription(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Throwable;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$2;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$2;->call(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public final call(Ljava/lang/Throwable;)V
-    .locals 0
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$2;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->access$onUpgradeError(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel.smali b/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel.smali
deleted file mode 100644
index 79554d32e8..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel.smali
+++ /dev/null
@@ -1,1405 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-.super Landroidx/lifecycle/ViewModel;
-.source "SettingsPremiumViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;,
-        Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;,
-        Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-    }
-.end annotation
-
-
-# instance fields
-.field private launchPremiumTabStartTimeMs:J
-
-.field private final requestBuyPlanSubject:Lrx/subjects/PublishSubject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/PublishSubject<",
-            "Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private subscription:Lrx/Subscription;
-
-.field private viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-.field private final viewStateSubject:Lrx/subjects/BehaviorSubject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/BehaviorSubject<",
-            "Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 11
-
-    invoke-direct {p0}, Landroidx/lifecycle/ViewModel;-><init>()V
-
-    sget-object v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading;
-
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
-
-    invoke-static {}, Lrx/subjects/PublishSubject;->LJ()Lrx/subjects/PublishSubject;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->requestBuyPlanSubject:Lrx/subjects/PublishSubject;
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->fetchData()V
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    const-wide/16 v1, 0x32
-
-    invoke-static {v1, v2, v0}, Lrx/Observable;->g(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1;-><init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    check-cast v1, Lrx/functions/b;
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object v2
-
-    const-string v0, "Observable.timer(\n      \u2026, subscriptions) }\n\n    }"
-
-    invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-class v3, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$2;
-
-    move-object v1, p0
-
-    check-cast v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$2;-><init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    move-object v8, v0
-
-    check-cast v8, Lkotlin/jvm/functions/Function1;
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$3;
-
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$3;-><init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    move-object v5, v0
-
-    check-cast v5, Lkotlin/jvm/functions/Function1;
-
-    const/4 v4, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/16 v9, 0x1a
-
-    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
-
-    return-void
-.end method
-
-.method public static final synthetic access$buildViewState(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-    .locals 0
-
-    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->buildViewState(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final synthetic access$fetchData(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->fetchData()V
-
-    return-void
-.end method
-
-.method public static final synthetic access$getSubscription$p(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)Lrx/Subscription;
-    .locals 1
-
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->subscription:Lrx/Subscription;
-
-    if-nez p0, :cond_0
-
-    const-string v0, "subscription"
-
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_0
-    return-object p0
-.end method
-
-.method public static final synthetic access$onCancelError(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onCancelError()V
-
-    return-void
-.end method
-
-.method public static final synthetic access$onChangePaymentSourceError(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onChangePaymentSourceError()V
-
-    return-void
-.end method
-
-.method public static final synthetic access$onResubscribeError(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onResubscribeError()V
-
-    return-void
-.end method
-
-.method public static final synthetic access$onUpgradeError(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onUpgradeError()V
-
-    return-void
-.end method
-
-.method public static final synthetic access$publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-
-    return-void
-.end method
-
-.method public static final synthetic access$setSubscription$p(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;Lrx/Subscription;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->subscription:Lrx/Subscription;
-
-    return-void
-.end method
-
-.method private final buildViewState(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-    .locals 7
-
-    instance-of v0, p1, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded;
-
-    if-eqz v0, :cond_3
-
-    instance-of v0, p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
-
-    if-eqz v0, :cond_3
-
-    check-cast p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;->getSubscriptions()Ljava/util/List;
-
-    move-result-object p2
-
-    check-cast p2, Ljava/lang/Iterable;
-
-    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p2
-
-    :cond_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
-
-    move-object v1, v0
-
-    check-cast v1, Lcom/discord/models/domain/ModelSubscription;
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->getType()Lcom/discord/models/domain/ModelSubscription$Type;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/models/domain/ModelSubscription$Type;->PREMIUM:Lcom/discord/models/domain/ModelSubscription$Type;
-
-    if-ne v1, v2, :cond_1
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_0
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_1
-    move-object v2, v0
-
-    check-cast v2, Lcom/discord/models/domain/ModelSubscription;
-
-    new-instance p2, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    check-cast p1, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded;->getPaymentSources()Ljava/util/List;
-
-    move-result-object v3
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    move-object v1, p2
-
-    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)V
-
-    check-cast p2, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    return-object p2
-
-    :cond_3
-    instance-of p1, p1, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Failure;
-
-    if-nez p1, :cond_5
-
-    instance-of p1, p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Failure;
-
-    if-eqz p1, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    sget-object p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading;
-
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    return-object p1
-
-    :cond_5
-    :goto_2
-    sget-object p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Failure;->INSTANCE:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Failure;
-
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    return-object p1
-.end method
-
-.method private final fetchData()V
-    .locals 0
-
-    invoke-static {}, Lcom/discord/stores/StorePaymentSources$Actions;->fetchPaymentSources()V
-
-    invoke-static {}, Lcom/discord/stores/StoreSubscriptions$Actions;->fetchSubscriptions()V
-
-    return-void
-.end method
-
-.method private final markBusy()V
-    .locals 9
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v1, :cond_0
-
-    const/4 v0, 0x0
-
-    :cond_0
-    move-object v1, v0
-
-    check-cast v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v1, :cond_1
-
-    return-void
-
-    :cond_1
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/16 v7, 0x13
-
-    const/4 v8, 0x0
-
-    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->copy$default(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-
-    return-void
-.end method
-
-.method private final onCancelError()V
-    .locals 9
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v1, :cond_0
-
-    const/4 v0, 0x0
-
-    :cond_0
-    move-object v1, v0
-
-    check-cast v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v1, :cond_1
-
-    return-void
-
-    :cond_1
-    invoke-virtual {v1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    move-result-object v0
-
-    instance-of v0, v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
-
-    if-nez v0, :cond_2
-
-    return-void
-
-    :cond_2
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
-
-    const/4 v6, 0x1
-
-    invoke-direct {v0, v6}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;-><init>(Z)V
-
-    move-object v6, v0
-
-    check-cast v6, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    const/16 v7, 0xb
-
-    const/4 v8, 0x0
-
-    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->copy$default(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-
-    return-void
-.end method
-
-.method private final onChangePaymentSourceError()V
-    .locals 9
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v1, :cond_0
-
-    const/4 v0, 0x0
-
-    :cond_0
-    move-object v1, v0
-
-    check-cast v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v1, :cond_1
-
-    return-void
-
-    :cond_1
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    sget-object v5, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;->GENERIC:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    const/4 v6, 0x0
-
-    const/16 v7, 0x13
-
-    const/4 v8, 0x0
-
-    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->copy$default(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-
-    return-void
-.end method
-
-.method private final onDowngradeClicked()V
-    .locals 9
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v1, :cond_0
-
-    const/4 v0, 0x0
-
-    :cond_0
-    move-object v1, v0
-
-    check-cast v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v1, :cond_1
-
-    return-void
-
-    :cond_1
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    sget-object v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium;->INSTANCE:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium;
-
-    move-object v6, v0
-
-    check-cast v6, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    const/16 v7, 0xf
-
-    const/4 v8, 0x0
-
-    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->copy$default(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-
-    return-void
-.end method
-
-.method private final onResubscribeError()V
-    .locals 9
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v1, :cond_0
-
-    const/4 v0, 0x0
-
-    :cond_0
-    move-object v1, v0
-
-    check-cast v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v1, :cond_1
-
-    return-void
-
-    :cond_1
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    sget-object v5, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;->GENERIC:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
-
-    const/4 v6, 0x0
-
-    const/16 v7, 0x13
-
-    const/4 v8, 0x0
-
-    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->copy$default(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-
-    return-void
-.end method
-
-.method private final onUpgradeClicked(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-    .locals 11
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_0
-
-    move-object v0, v2
-
-    :cond_0
-    move-object v3, v0
-
-    check-cast v3, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v3, :cond_1
-
-    return-void
-
-    :cond_1
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
-
-    const/4 v1, 0x0
-
-    const/4 v8, 0x2
-
-    invoke-direct {v0, p1, v1, v8, v2}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;-><init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    move-object v8, v0
-
-    check-cast v8, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    const/16 v9, 0xf
-
-    const/4 v10, 0x0
-
-    invoke-static/range {v3 .. v10}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->copy$default(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-
-    return-void
-.end method
-
-.method private final onUpgradeError()V
-    .locals 11
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_0
-
-    move-object v0, v2
-
-    :cond_0
-    move-object v3, v0
-
-    check-cast v3, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v3, :cond_1
-
-    return-void
-
-    :cond_1
-    invoke-virtual {v3}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    move-result-object v0
-
-    instance-of v0, v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
-
-    if-nez v0, :cond_2
-
-    return-void
-
-    :cond_2
-    invoke-virtual {v3}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
-
-    const/4 v1, 0x1
-
-    invoke-static {v0, v2, v1, v1, v2}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->copy$default(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;ZILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
-
-    move-result-object v0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    move-object v8, v0
-
-    check-cast v8, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    const/16 v9, 0xb
-
-    const/4 v10, 0x0
-
-    invoke-static/range {v3 .. v10}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->copy$default(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-
-    return-void
-.end method
-
-.method private final publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-    .locals 1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
-
-    invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final cancelSubscription()V
-    .locals 4
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/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/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v0, :cond_1
-
-    return-void
-
-    :cond_1
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
-
-    move-result-object v0
-
-    if-nez v0, :cond_2
-
-    return-void
-
-    :cond_2
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->markBusy()V
-
-    sget-object v1, 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 v1
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getId()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v1, v0}, Lcom/discord/utilities/rest/RestAPI;->deleteSubscription(Ljava/lang/String;)Lrx/Observable;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    const/4 v3, 0x1
-
-    invoke-static {v0, v1, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v0
-
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$1;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$1;-><init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    check-cast v1, Lrx/functions/Action1;
-
-    new-instance v2, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$2;
-
-    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$cancelSubscription$2;-><init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    check-cast v2, Lrx/functions/Action1;
-
-    invoke-virtual {v0, v1, v2}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
-
-    return-void
-.end method
-
-.method public final changePaymentSource(Lcom/discord/models/domain/ModelPaymentSource;)V
-    .locals 10
-
-    const-string v0, "paymentSource"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/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/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v0, :cond_1
-
-    return-void
-
-    :cond_1
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
-
-    move-result-object v0
-
-    if-nez v0, :cond_2
-
-    return-void
-
-    :cond_2
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->markBusy()V
-
-    sget-object v1, 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 v1
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getId()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v9, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPaymentSource;->getId()Ljava/lang/String;
-
-    move-result-object v6
-
-    const/4 v7, 0x3
-
-    const/4 v8, 0x0
-
-    move-object v3, v9
-
-    invoke-direct/range {v3 .. v8}, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;-><init>(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v1, v0, v9}, Lcom/discord/utilities/rest/RestAPI;->updateSubscription(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$UpdateSubscription;)Lrx/Observable;
-
-    move-result-object p1
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    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 {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$1;
-
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$1;-><init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    check-cast v0, Lrx/functions/Action1;
-
-    new-instance v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$2;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$changePaymentSource$2;-><init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    check-cast v1, Lrx/functions/Action1;
-
-    invoke-virtual {p1, v0, v1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
-
-    return-void
-.end method
-
-.method public final getLaunchPremiumTabStartTimeMs()J
-    .locals 2
-
-    iget-wide v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->launchPremiumTabStartTimeMs:J
-
-    return-wide v0
-.end method
-
-.method public final getRequestBuyPlanSubject()Lrx/Observable;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->requestBuyPlanSubject:Lrx/subjects/PublishSubject;
-
-    const-string v1, "requestBuyPlanSubject"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, Lrx/Observable;
-
-    return-object v0
-.end method
-
-.method public final getViewState()Lrx/Observable;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
-
-    const-string v1, "viewStateSubject"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, Lrx/Observable;
-
-    return-object v0
-.end method
-
-.method public final onCancelClicked()V
-    .locals 11
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_0
-
-    move-object v0, v2
-
-    :cond_0
-    move-object v3, v0
-
-    check-cast v3, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v3, :cond_1
-
-    return-void
-
-    :cond_1
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
-
-    const/4 v1, 0x0
-
-    const/4 v8, 0x1
-
-    invoke-direct {v0, v1, v8, v2}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    move-object v8, v0
-
-    check-cast v8, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
-
-    const/16 v9, 0xf
-
-    const/4 v10, 0x0
-
-    invoke-static/range {v3 .. v10}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->copy$default(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-
-    return-void
-.end method
-
-.method public final onCleared()V
-    .locals 2
-
-    invoke-super {p0}, Landroidx/lifecycle/ViewModel;->onCleared()V
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->subscription:Lrx/Subscription;
-
-    if-nez v0, :cond_0
-
-    const-string v1, "subscription"
-
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
-
-    :cond_0
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    return-void
-.end method
-
-.method public final onDialogDismissClicked()V
-    .locals 9
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v1, :cond_0
-
-    const/4 v0, 0x0
-
-    :cond_0
-    move-object v1, v0
-
-    check-cast v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v1, :cond_1
-
-    return-void
-
-    :cond_1
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/16 v7, 0xf
-
-    const/4 v8, 0x0
-
-    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->copy$default(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-
-    return-void
-.end method
-
-.method public final onPlanRequested(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-    .locals 3
-
-    const-string v0, "requestedPlanType"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/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/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v0, :cond_1
-
-    return-void
-
-    :cond_1
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    move-result-object v2
-
-    :cond_2
-    if-nez v2, :cond_3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->requestBuyPlanSubject:Lrx/subjects/PublishSubject;
-
-    invoke-virtual {v0, p1}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
-
-    return-void
-
-    :cond_3
-    if-eq p1, v2, :cond_5
-
-    invoke-static {}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getUPGRADE_ELIGIBILITY()Ljava/util/Map;
-
-    move-result-object v0
-
-    invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/util/Set;
-
-    if-eqz v0, :cond_4
-
-    invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_4
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onUpgradeClicked(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-
-    return-void
-
-    :cond_4
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onDowngradeClicked()V
-
-    :cond_5
-    return-void
-.end method
-
-.method public final onRetryClicked()V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->fetchData()V
-
-    return-void
-.end method
-
-.method public final resubscribe()V
-    .locals 10
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/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/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v0, :cond_1
-
-    return-void
-
-    :cond_1
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
-
-    move-result-object v0
-
-    if-nez v0, :cond_2
-
-    return-void
-
-    :cond_2
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getStatus()Lcom/discord/models/domain/ModelSubscription$Status;
-
-    move-result-object v1
-
-    sget-object v3, Lcom/discord/models/domain/ModelSubscription$Status;->CANCELED:Lcom/discord/models/domain/ModelSubscription$Status;
-
-    if-eq v1, v3, :cond_3
-
-    return-void
-
-    :cond_3
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->markBusy()V
-
-    sget-object v1, 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 v1
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getId()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v9, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;
-
-    sget-object v3, Lcom/discord/models/domain/ModelSubscription$Status;->ACTIVE:Lcom/discord/models/domain/ModelSubscription$Status;
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelSubscription$Status;->getIntRepresentation()I
-
-    move-result v3
-
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v4
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x6
-
-    const/4 v8, 0x0
-
-    move-object v3, v9
-
-    invoke-direct/range {v3 .. v8}, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;-><init>(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v1, v0, v9}, Lcom/discord/utilities/rest/RestAPI;->updateSubscription(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$UpdateSubscription;)Lrx/Observable;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    const/4 v3, 0x1
-
-    invoke-static {v0, v1, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v0
-
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$1;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$1;-><init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    check-cast v1, Lrx/functions/Action1;
-
-    new-instance v2, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$2;
-
-    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$resubscribe$2;-><init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    check-cast v2, Lrx/functions/Action1;
-
-    invoke-virtual {v0, v1, v2}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
-
-    return-void
-.end method
-
-.method public final setLaunchPremiumTabStartTimeMs(J)V
-    .locals 0
-
-    iput-wide p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->launchPremiumTabStartTimeMs:J
-
-    return-void
-.end method
-
-.method public final upgradeSubscription(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-    .locals 10
-
-    const-string v0, "targetPlanType"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/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/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v0, :cond_1
-
-    return-void
-
-    :cond_1
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
-
-    move-result-object v0
-
-    if-nez v0, :cond_2
-
-    return-void
-
-    :cond_2
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->markBusy()V
-
-    sget-object v1, 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 v1
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getId()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v9, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;
-
-    sget-object v3, Lcom/discord/models/domain/ModelSubscription$Status;->ACTIVE:Lcom/discord/models/domain/ModelSubscription$Status;
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelSubscription$Status;->getIntRepresentation()I
-
-    move-result v3
-
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v4
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPlanTypeString()Ljava/lang/String;
-
-    move-result-object v5
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x4
-
-    const/4 v8, 0x0
-
-    move-object v3, v9
-
-    invoke-direct/range {v3 .. v8}, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;-><init>(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v1, v0, v9}, Lcom/discord/utilities/rest/RestAPI;->updateSubscription(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$UpdateSubscription;)Lrx/Observable;
-
-    move-result-object p1
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    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 {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$1;
-
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$1;-><init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    check-cast v0, Lrx/functions/Action1;
-
-    new-instance v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$2;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$upgradeSubscription$2;-><init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
-
-    check-cast v1, Lrx/functions/Action1;
-
-    invoke-virtual {p1, v0, v1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$1.smali
deleted file mode 100644
index a83bcd076e..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$1.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$1;
-.super Ljava/lang/Object;
-.source "WidgetCancelPremiumDialog.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->configureUI(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;
-
-    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/settings/nitro/WidgetCancelPremiumDialog$configureUI$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onDialogDismissClicked()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$2.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$2.smali
deleted file mode 100644
index 426c34dc0c..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$2.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$2;
-.super Ljava/lang/Object;
-.source "WidgetCancelPremiumDialog.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->configureUI(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;
-
-    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/settings/nitro/WidgetCancelPremiumDialog$configureUI$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->cancelSubscription()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure.smali
deleted file mode 100644
index 005fc22864..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure;
-.super Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
-.source "WidgetSettingsBoost.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Failure"
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure;
-
-    return-void
-.end method
-
-.method private constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loaded.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loaded.smali
deleted file mode 100644
index a60a2d50d3..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loaded.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loaded;
-.super Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
-.source "WidgetSettingsBoost.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Loaded"
-.end annotation
-
-
-# instance fields
-.field private final boostItems:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;",
-            ">;"
-        }
-    .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<",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;",
-            ">;)V"
-        }
-    .end annotation
-
-    const-string v0, "boostItems"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loaded;->boostItems:Ljava/util/List;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getBoostItems()Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loaded;->boostItems:Ljava/util/List;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$LoadedNoNitro.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$LoadedNoNitro.smali
deleted file mode 100644
index f40b2c3c9d..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$LoadedNoNitro.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$LoadedNoNitro;
-.super Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
-.source "WidgetSettingsBoost.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "LoadedNoNitro"
-.end annotation
-
-
-# instance fields
-.field private final isNitroClassic:Z
-
-
-# direct methods
-.method public constructor <init>(Z)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    iput-boolean p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$LoadedNoNitro;->isNitroClassic:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final isNitroClassic()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$LoadedNoNitro;->isNitroClassic:Z
-
-    return v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loading.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loading.smali
deleted file mode 100644
index 9f5de4822f..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loading.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loading;
-.super Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
-.source "WidgetSettingsBoost.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Loading"
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loading;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loading;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loading;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loading;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loading;
-
-    return-void
-.end method
-
-.method private constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model.smali
deleted file mode 100644
index 9feedec8fd..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model.smali
+++ /dev/null
@@ -1,60 +0,0 @@
-.class abstract Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
-.super Ljava/lang/Object;
-.source "WidgetSettingsBoost.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x408
-    name = "Model"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loading;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loaded;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$LoadedNoNitro;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;
-    }
-.end annotation
-
-
-# static fields
-.field public static final Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;
-
-    return-void
-.end method
-
-.method private 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/nitro/WidgetSettingsBoost$Model;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$2.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$2.smali
deleted file mode 100644
index 4583e24a76..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$2.smali
+++ /dev/null
@@ -1,94 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$2;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsBoost.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Ljava/lang/Long;",
-        "Ljava/lang/Long;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
-
-    const/4 p1, 0x2
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Ljava/lang/Number;
-
-    invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v0
-
-    check-cast p2, Ljava/lang/Number;
-
-    invoke-virtual {p2}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide p1
-
-    invoke-virtual {p0, v0, v1, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$2;->invoke(JJ)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(JJ)V
-    .locals 6
-
-    sget-object v0, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion;
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->requireContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    const-string v2, "requireContext()"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-wide v2, p1
-
-    move-wide v4, p3
-
-    invoke-virtual/range {v0 .. v5}, Lcom/discord/widgets/servers/boosting/WidgetServerRemoveBoostConfirmation$Companion;->create(Landroid/content/Context;JJ)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$2.smali
deleted file mode 100644
index aca70a41a7..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$2.smali
+++ /dev/null
@@ -1,45 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$2;
-.super Ljava/lang/Object;
-.source "WidgetSettingsBoost.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
-
-    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/settings/nitro/WidgetSettingsBoost$onViewBound$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->access$fetchData(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$3.smali
deleted file mode 100644
index d849379518..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$3.smali
+++ /dev/null
@@ -1,61 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$3;
-.super Ljava/lang/Object;
-.source "WidgetSettingsBoost.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$3;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
-
-    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 p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$3;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->requireContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    const-string v1, "requireContext()"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v1, 0x1
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBoundOrOnResume$1.smali
deleted file mode 100644
index bebe531a60..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBoundOrOnResume$1.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBoundOrOnResume$1;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsBoost.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->onViewBoundOrOnResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;)V
-    .locals 1
-
-    const-string v0, "it"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->access$configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem$onConfigure$1.smali
deleted file mode 100644
index de18764cad..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem$onConfigure$1.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem$onConfigure$1;
-.super Ljava/lang/Object;
-.source "WidgetSettingsBoostAdapter.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;->onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem$onConfigure$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;
-
-    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/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem$onConfigure$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;->access$getAdapter$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->access$getBoostClickListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;)Lkotlin/jvm/functions/Function0;
-
-    move-result-object p1
-
-    invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem.smali
deleted file mode 100644
index 8df2f07c38..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem.smali
+++ /dev/null
@@ -1,190 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;
-.super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-.source "WidgetSettingsBoostAdapter.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "AvailableBoostListItem"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-
-# instance fields
-.field private final boost$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 5
-
-    const/4 v0, 0x1
-
-    new-array v0, v0, [Lkotlin/reflect/KProperty;
-
-    new-instance v1, Lkotlin/jvm/internal/v;
-
-    const-class v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;
-
-    invoke-static {v2}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v2
-
-    const-string v3, "boost"
-
-    const-string v4, "getBoost()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
-
-    move-result-object v1
-
-    check-cast v1, Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;)V
-    .locals 1
-
-    const-string v0, "adapter"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
-
-    const v0, 0x7f0d00a7
-
-    invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
-
-    const p1, 0x7f0a00d0
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;->boost$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    return-void
-.end method
-
-.method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
-
-    check-cast p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
-
-    return-object p0
-.end method
-
-.method private final getBoost()Landroid/view/View;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;->boost$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;->$$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/view/View;
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method protected final onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;)V
-    .locals 4
-
-    const-string v0, "data"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(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/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;->getBoost()Landroid/view/View;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getEnabled()Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x2
-
-    invoke-static {p1, v0, v2, v3, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
-
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getEnabled()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;->getBoost()Landroid/view/View;
-
-    move-result-object p1
-
-    new-instance p2, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem$onConfigure$1;
-
-    invoke-direct {p2, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem$onConfigure$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;)V
-
-    check-cast p2, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-
-    :cond_0
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;->getBoost()Landroid/view/View;
-
-    move-result-object p1
-
-    invoke-virtual {p1, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-.end method
-
-.method public final bridge synthetic onConfigure(ILjava/lang/Object;)V
-    .locals 0
-
-    check-cast p2, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;->onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion.smali
deleted file mode 100644
index 56484eb816..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion.smali
+++ /dev/null
@@ -1,124 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;
-.super Ljava/lang/Object;
-.source "WidgetSettingsBoostAdapter.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Companion"
-.end annotation
-
-
-# direct methods
-.method private 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/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final createAvailableBoostItem(Z)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-    .locals 10
-
-    new-instance v9, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v6, 0x1
-
-    const/16 v7, 0xf
-
-    const/4 v8, 0x0
-
-    move-object v0, v9
-
-    move v5, p1
-
-    invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-object v9
-.end method
-
-.method public final createBoostInfoItem(Ljava/lang/Long;I)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-    .locals 10
-
-    new-instance v9, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/16 v7, 0x1c
-
-    const/4 v8, 0x0
-
-    move-object v0, v9
-
-    move-object v1, p1
-
-    invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-object v9
-.end method
-
-.method public final createBoostedGuildItem(Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-    .locals 10
-
-    const-string v0, "premiumGuildSubscription"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x2
-
-    const/16 v8, 0x13
-
-    const/4 v9, 0x0
-
-    move-object v1, v0
-
-    move-object v4, p1
-
-    move-object v5, p2
-
-    invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem.smali
deleted file mode 100644
index b1e641772a..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem.smali
+++ /dev/null
@@ -1,655 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-.super Ljava/lang/Object;
-.source "WidgetSettingsBoostAdapter.kt"
-
-# interfaces
-.implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "BoostItem"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;
-    }
-.end annotation
-
-
-# static fields
-.field public static final Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;
-
-.field public static final TYPE_AVAILABLE_BOOST:I = 0x1
-
-.field public static final TYPE_BOOSTED_SERVER:I = 0x2
-
-.field public static final TYPE_BOOST_INFO:I
-
-
-# instance fields
-.field private final boostsRemaining:Ljava/lang/Integer;
-
-.field private final cooldownEndsAt:Ljava/lang/Long;
-
-.field private final enabled:Z
-
-.field private final guild:Lcom/discord/models/domain/ModelGuild;
-
-.field private final premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-.field private final typeInt:I
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->cooldownEndsAt:Ljava/lang/Long;
-
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->boostsRemaining:Ljava/lang/Integer;
-
-    iput-object p3, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    iput-object p4, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    iput-boolean p5, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->enabled:Z
-
-    iput p6, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->typeInt:I
-
-    return-void
-.end method
-
-.method public synthetic constructor <init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 9
-
-    and-int/lit8 v0, p7, 0x1
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    move-object v3, v1
-
-    goto :goto_0
-
-    :cond_0
-    move-object v3, p1
-
-    :goto_0
-    and-int/lit8 v0, p7, 0x2
-
-    if-eqz v0, :cond_1
-
-    move-object v4, v1
-
-    goto :goto_1
-
-    :cond_1
-    move-object v4, p2
-
-    :goto_1
-    and-int/lit8 v0, p7, 0x4
-
-    if-eqz v0, :cond_2
-
-    move-object v5, v1
-
-    goto :goto_2
-
-    :cond_2
-    move-object v5, p3
-
-    :goto_2
-    and-int/lit8 v0, p7, 0x8
-
-    if-eqz v0, :cond_3
-
-    move-object v6, v1
-
-    goto :goto_3
-
-    :cond_3
-    move-object v6, p4
-
-    :goto_3
-    and-int/lit8 v0, p7, 0x10
-
-    if-eqz v0, :cond_4
-
-    const/4 v0, 0x1
-
-    const/4 v7, 0x1
-
-    goto :goto_4
-
-    :cond_4
-    move v7, p5
-
-    :goto_4
-    move-object v2, p0
-
-    move v8, p6
-
-    invoke-direct/range {v2 .. v8}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)V
-
-    return-void
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-    .locals 4
-
-    and-int/lit8 p8, p7, 0x1
-
-    if-eqz p8, :cond_0
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->cooldownEndsAt:Ljava/lang/Long;
-
-    :cond_0
-    and-int/lit8 p8, p7, 0x2
-
-    if-eqz p8, :cond_1
-
-    iget-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->boostsRemaining:Ljava/lang/Integer;
-
-    :cond_1
-    move-object p8, p2
-
-    and-int/lit8 p2, p7, 0x4
-
-    if-eqz p2, :cond_2
-
-    iget-object p3, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    :cond_2
-    move-object v0, p3
-
-    and-int/lit8 p2, p7, 0x8
-
-    if-eqz p2, :cond_3
-
-    iget-object p4, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    :cond_3
-    move-object v1, p4
-
-    and-int/lit8 p2, p7, 0x10
-
-    if-eqz p2, :cond_4
-
-    iget-boolean p5, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->enabled:Z
-
-    :cond_4
-    move v2, p5
-
-    and-int/lit8 p2, p7, 0x20
-
-    if-eqz p2, :cond_5
-
-    iget p6, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->typeInt:I
-
-    :cond_5
-    move v3, p6
-
-    move-object p2, p0
-
-    move-object p3, p1
-
-    move-object p4, p8
-
-    move-object p5, v0
-
-    move-object p6, v1
-
-    move p7, v2
-
-    move p8, v3
-
-    invoke-virtual/range {p2 .. p8}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->copy(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final component1()Ljava/lang/Long;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->cooldownEndsAt:Ljava/lang/Long;
-
-    return-object v0
-.end method
-
-.method public final component2()Ljava/lang/Integer;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->boostsRemaining:Ljava/lang/Integer;
-
-    return-object v0
-.end method
-
-.method public final component3()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    return-object v0
-.end method
-
-.method public final component4()Lcom/discord/models/domain/ModelGuild;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    return-object v0
-.end method
-
-.method public final component5()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->enabled:Z
-
-    return v0
-.end method
-
-.method public final component6()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->typeInt:I
-
-    return v0
-.end method
-
-.method public final copy(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-    .locals 8
-
-    new-instance v7, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-
-    move-object v0, v7
-
-    move-object v1, p1
-
-    move-object v2, p2
-
-    move-object v3, p3
-
-    move-object v4, p4
-
-    move v5, p5
-
-    move v6, p6
-
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)V
-
-    return-object v7
-.end method
-
-.method public final equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x1
-
-    if-eq p0, p1, :cond_3
-
-    instance-of v1, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_2
-
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->cooldownEndsAt:Ljava/lang/Long;
-
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->cooldownEndsAt:Ljava/lang/Long;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->boostsRemaining:Ljava/lang/Integer;
-
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->boostsRemaining:Ljava/lang/Integer;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    iget-boolean v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->enabled:Z
-
-    iget-boolean v3, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->enabled:Z
-
-    if-ne v1, v3, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_2
-
-    iget v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->typeInt:I
-
-    iget p1, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->typeInt:I
-
-    if-ne v1, p1, :cond_1
-
-    const/4 p1, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p1, 0x0
-
-    :goto_1
-    if-eqz p1, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    return v2
-
-    :cond_3
-    :goto_2
-    return v0
-.end method
-
-.method public final getBoostsRemaining()Ljava/lang/Integer;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->boostsRemaining:Ljava/lang/Integer;
-
-    return-object v0
-.end method
-
-.method public final getCooldownEndsAt()Ljava/lang/Long;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->cooldownEndsAt:Ljava/lang/Long;
-
-    return-object v0
-.end method
-
-.method public final getEnabled()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->enabled:Z
-
-    return v0
-.end method
-
-.method public final getGuild()Lcom/discord/models/domain/ModelGuild;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    return-object v0
-.end method
-
-.method public final getKey()Ljava/lang/String;
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->cooldownEndsAt:Ljava/lang/Long;
-
-    if-nez v0, :cond_3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->boostsRemaining:Ljava/lang/Integer;
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getId()J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-nez v0, :cond_2
-
-    :cond_1
-    const-string v0, "unused"
-
-    :cond_2
-    return-object v0
-
-    :cond_3
-    :goto_0
-    const-string v0, "cooldown"
-
-    return-object v0
-.end method
-
-.method public final getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    return-object v0
-.end method
-
-.method public final getType()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->typeInt:I
-
-    return v0
-.end method
-
-.method public final getTypeInt()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->typeInt:I
-
-    return v0
-.end method
-
-.method public final hashCode()I
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->cooldownEndsAt:Ljava/lang/Long;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->boostsRemaining:Ljava/lang/Integer;
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v2
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_1
-    add-int/2addr v0, v2
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    if-eqz v2, :cond_2
-
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    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/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    if-eqz v2, :cond_3
-
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    :cond_3
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-boolean v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->enabled:Z
-
-    if-eqz v1, :cond_4
-
-    const/4 v1, 0x1
-
-    :cond_4
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->typeInt:I
-
-    add-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "BoostItem(cooldownEndsAt="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->cooldownEndsAt:Ljava/lang/Long;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", boostsRemaining="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->boostsRemaining:Ljava/lang/Integer;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", premiumGuildSubscription="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", guild="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->guild:Lcom/discord/models/domain/ModelGuild;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", enabled="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->enabled:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const-string v1, ", typeInt="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->typeInt: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;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem$onConfigure$1.smali
deleted file mode 100644
index 80422d2eb8..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem$onConfigure$1.smali
+++ /dev/null
@@ -1,85 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem$onConfigure$1;
-.super Ljava/lang/Object;
-.source "WidgetSettingsBoostAdapter.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $data:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem$onConfigure$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;
-
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem$onConfigure$1;->$data:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 3
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem$onConfigure$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->access$getAdapter$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->access$getRemoveClickListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;)Lkotlin/jvm/functions/Function2;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem$onConfigure$1;->$data:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem$onConfigure$1;->$data:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getId()J
-
-    move-result-wide v1
-
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v1
-
-    invoke-interface {p1, v0, v1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$boostClickListener$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$boostClickListener$1.smali
deleted file mode 100644
index 580614a230..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$boostClickListener$1.smali
+++ /dev/null
@@ -1,72 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$boostClickListener$1;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsBoostAdapter.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$boostClickListener$1;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$boostClickListener$1;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$boostClickListener$1;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$boostClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$boostClickListener$1;
-
-    return-void
-.end method
-
-.method constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$boostClickListener$1;->invoke()V
-
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object v0
-.end method
-
-.method public final invoke()V
-    .locals 0
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter.smali
deleted file mode 100644
index 87445236f4..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter.smali
+++ /dev/null
@@ -1,226 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
-.super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
-.source "WidgetSettingsBoostAdapter.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple<",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field private boostClickListener:Lkotlin/jvm/functions/Function0;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function0<",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private removeClickListener:Lkotlin/jvm/functions/Function2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function2<",
-            "-",
-            "Ljava/lang/Long;",
-            "-",
-            "Ljava/lang/Long;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 1
-
-    const-string v0, "recycler"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
-
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$removeClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$removeClickListener$1;
-
-    check-cast p1, Lkotlin/jvm/functions/Function2;
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->removeClickListener:Lkotlin/jvm/functions/Function2;
-
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$boostClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$boostClickListener$1;
-
-    check-cast p1, Lkotlin/jvm/functions/Function0;
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->boostClickListener:Lkotlin/jvm/functions/Function0;
-
-    return-void
-.end method
-
-.method public static final synthetic access$getBoostClickListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;)Lkotlin/jvm/functions/Function0;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->boostClickListener:Lkotlin/jvm/functions/Function0;
-
-    return-object p0
-.end method
-
-.method public static final synthetic access$getRemoveClickListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;)Lkotlin/jvm/functions/Function2;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->removeClickListener:Lkotlin/jvm/functions/Function2;
-
-    return-object p0
-.end method
-
-.method public static final synthetic access$setBoostClickListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;Lkotlin/jvm/functions/Function0;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->boostClickListener:Lkotlin/jvm/functions/Function0;
-
-    return-void
-.end method
-
-.method public static final synthetic access$setRemoveClickListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;Lkotlin/jvm/functions/Function2;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->removeClickListener:Lkotlin/jvm/functions/Function2;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final configure(Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;",
-            ">;",
-            "Lkotlin/jvm/functions/Function2<",
-            "-",
-            "Ljava/lang/Long;",
-            "-",
-            "Ljava/lang/Long;",
-            "Lkotlin/Unit;",
-            ">;",
-            "Lkotlin/jvm/functions/Function0<",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-
-    const-string v0, "boostItems"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "removeClickListener"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "boostClickListener"
-
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->setData(Ljava/util/List;)V
-
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->removeClickListener:Lkotlin/jvm/functions/Function2;
-
-    iput-object p3, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->boostClickListener:Lkotlin/jvm/functions/Function0;
-
-    return-void
-.end method
-
-.method public final bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
-    .locals 0
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-
-    move-result-object p1
-
-    check-cast p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
-
-    return-object p1
-.end method
-
-.method public final onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Landroid/view/ViewGroup;",
-            "I)",
-            "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;",
-            ">;"
-        }
-    .end annotation
-
-    const-string v0, "parent"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    if-eqz p2, :cond_2
-
-    const/4 p1, 0x1
-
-    if-eq p2, p1, :cond_1
-
-    const/4 p1, 0x2
-
-    if-ne p2, p1, :cond_0
-
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;
-
-    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;)V
-
-    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-
-    return-object p1
-
-    :cond_0
-    invoke-virtual {p0, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->invalidViewTypeException(I)Ljava/lang/IllegalArgumentException;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    throw p1
-
-    :cond_1
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;
-
-    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$AvailableBoostListItem;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;)V
-
-    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-
-    return-object p1
-
-    :cond_2
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;
-
-    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;)V
-
-    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$3.smali
deleted file mode 100644
index 0189445a55..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$3.smali
+++ /dev/null
@@ -1,47 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$3;
-.super Ljava/lang/Object;
-.source "WidgetSettingsGifting.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$3;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-    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/settings/nitro/WidgetSettingsGifting$onViewBound$3;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-static {p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->access$openWebBilling(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$4.smali
deleted file mode 100644
index e11a402d67..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$4.smali
+++ /dev/null
@@ -1,47 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$4;
-.super Ljava/lang/Object;
-.source "WidgetSettingsGifting.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$4;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-    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/settings/nitro/WidgetSettingsGifting$onViewBound$4;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-static {p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->access$openWebBilling(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$5.smali
deleted file mode 100644
index f6c3cd241c..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$5.smali
+++ /dev/null
@@ -1,47 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$5;
-.super Ljava/lang/Object;
-.source "WidgetSettingsGifting.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$5;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-    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/settings/nitro/WidgetSettingsGifting$onViewBound$5;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-static {p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->access$openWebBilling(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$6.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$6.smali
deleted file mode 100644
index e832d1d359..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$6.smali
+++ /dev/null
@@ -1,47 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$6;
-.super Ljava/lang/Object;
-.source "WidgetSettingsGifting.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$6;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-    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/settings/nitro/WidgetSettingsGifting$onViewBound$6;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-static {p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->access$openWebBilling(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$1.smali
deleted file mode 100644
index 3f23007e7e..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$1.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$1;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsGifting.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->onViewBoundOrOnResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
-
-    const-string v1, "it"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->access$configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3.smali
deleted file mode 100644
index 2f29077fef..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;
-.super Ljava/lang/Object;
-.source "WidgetSettingsGiftingAdapter.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;
-
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;->$data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-    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/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->access$getAdapter$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->access$getOnClickCopyListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function1;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;->$data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getGift()Lcom/discord/models/domain/ModelGift;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGift;->getCode()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4.smali
deleted file mode 100644
index f74cc77b52..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4.smali
+++ /dev/null
@@ -1,98 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsGiftingAdapter.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Landroid/content/Context;",
-        "Ljava/lang/String;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic $data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;
-
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;->$data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-    const/4 p1, 0x2
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Landroid/content/Context;
-
-    check-cast p2, Ljava/lang/String;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;->invoke(Landroid/content/Context;Ljava/lang/String;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Landroid/content/Context;Ljava/lang/String;)V
-    .locals 1
-
-    const-string v0, "<anonymous parameter 0>"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p2, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->access$getAdapter$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->access$getOnRevokeClickListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function1;
-
-    move-result-object p1
-
-    iget-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;->$data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getGift()Lcom/discord/models/domain/ModelGift;
-
-    move-result-object p2
-
-    invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5.smali
deleted file mode 100644
index 26ec1ef855..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;
-.super Ljava/lang/Object;
-.source "WidgetSettingsGiftingAdapter.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;
-
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;->$data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 3
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->access$getAdapter$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->access$getOnGenerateClickListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function2;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;->$data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getEntitlement()Lcom/discord/models/domain/ModelEntitlement;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelEntitlement;->getSkuId()J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;->$data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getEntitlement()Lcom/discord/models/domain/ModelEntitlement;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelEntitlement;->getSubscriptionPlan()Lcom/discord/models/domain/ModelSubscriptionPlan;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getId()J
-
-    move-result-wide v1
-
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    invoke-interface {p1, v0, v1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1.smali
deleted file mode 100644
index 7a254c0ecc..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1.smali
+++ /dev/null
@@ -1,77 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;
-.super Ljava/lang/Object;
-.source "WidgetSettingsGiftingAdapter.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;
-
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;->$data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 2
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->access$getAdapter$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->access$getOnClickSkuListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function2;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;->$data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSku;->getId()J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;->$data:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getPlanId()Ljava/lang/Long;
-
-    move-result-object v1
-
-    invoke-interface {p1, v0, v1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$2.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$2.smali
deleted file mode 100644
index 10c30c0141..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$2.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$2;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsGiftingViewModel.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;-><init>()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$2;->invoke(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
-
-    const-string v1, "it"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->access$handleStoreData(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error.smali
deleted file mode 100644
index 4eda52e136..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;
-.super Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
-.source "WidgetSettingsGiftingViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Error"
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;
-
-    return-void
-.end method
-
-.method private constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving.smali
deleted file mode 100644
index 2b266225f6..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
-.super Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
-.source "WidgetSettingsGiftingViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "NotResolving"
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
-
-    return-void
-.end method
-
-.method private constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving.smali
deleted file mode 100644
index df8ce4be90..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
-.super Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
-.source "WidgetSettingsGiftingViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Resolving"
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
-
-    return-void
-.end method
-
-.method private constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Failure.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Failure.smali
deleted file mode 100644
index 019fdeb7bf..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Failure.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Failure;
-.super Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
-.source "WidgetSettingsGiftingViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Failure"
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Failure;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Failure;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Failure;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Failure;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Failure;
-
-    return-void
-.end method
-
-.method private constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading.smali
deleted file mode 100644
index 3efc426198..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;
-.super Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
-.source "WidgetSettingsGiftingViewModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Loading"
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;
-
-    return-void
-.end method
-
-.method private constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1.smali
deleted file mode 100644
index 64357b0c3b..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1.smali
+++ /dev/null
@@ -1,76 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureActiveSubscriptionView(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1;->invoke()V
-
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object v0
-.end method
-
-.method public final invoke()V
-    .locals 3
-
-    sget-object v0, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    const-string v2, "requireContext()"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/nitro/NitroUtils;->openAppleBilling(Landroid/content/Context;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2.smali
deleted file mode 100644
index 71c5fcc937..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2.smali
+++ /dev/null
@@ -1,66 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureActiveSubscriptionView(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2;->invoke()V
-
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object v0
-.end method
-
-.method public final invoke()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    invoke-static {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$launchAddPaymentMethodFlow(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1.smali
deleted file mode 100644
index b32673e308..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureActiveSubscriptionView(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1;->invoke()V
-
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object v0
-.end method
-
-.method public final invoke()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    invoke-static {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onCancelClicked()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3.smali
deleted file mode 100644
index 2bb20dbd27..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureActiveSubscriptionView(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3;->invoke()V
-
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object v0
-.end method
-
-.method public final invoke()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    invoke-static {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->resubscribe()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1.smali
deleted file mode 100644
index 8176e8d867..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1.smali
+++ /dev/null
@@ -1,55 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1;
-.super Ljava/lang/Object;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureButtons(Lcom/discord/models/domain/ModelSubscription;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    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 p1, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    const-string v1, "requireContext()"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/nitro/NitroUtils;->openAppleBilling(Landroid/content/Context;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$2.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$2.smali
deleted file mode 100644
index c050174dcb..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$2.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$2;
-.super Ljava/lang/Object;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureButtons(Lcom/discord/models/domain/ModelSubscription;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    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/settings/nitro/WidgetSettingsPremium$configureButtons$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    move-result-object p1
-
-    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onPlanRequested(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$3.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$3.smali
deleted file mode 100644
index ec212c140f..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$3.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$3;
-.super Ljava/lang/Object;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureButtons(Lcom/discord/models/domain/ModelSubscription;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$3;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    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/settings/nitro/WidgetSettingsPremium$configureButtons$3;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    move-result-object p1
-
-    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onPlanRequested(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$4.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$4.smali
deleted file mode 100644
index a6d46a048b..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$4.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$4;
-.super Ljava/lang/Object;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureButtons(Lcom/discord/models/domain/ModelSubscription;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$4;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    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/settings/nitro/WidgetSettingsPremium$configureButtons$4;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    move-result-object p1
-
-    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onPlanRequested(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$5.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$5.smali
deleted file mode 100644
index 292df751f7..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$5.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$5;
-.super Ljava/lang/Object;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureButtons(Lcom/discord/models/domain/ModelSubscription;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$5;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    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/settings/nitro/WidgetSettingsPremium$configureButtons$5;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    move-result-object p1
-
-    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onPlanRequested(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$1.smali
deleted file mode 100644
index 0836ae86f7..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$1.smali
+++ /dev/null
@@ -1,59 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$1;
-.super Ljava/lang/Object;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureGiftingButtons()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $locationTrait:Lcom/discord/utilities/analytics/Traits$Location;
-
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/utilities/analytics/Traits$Location;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$1;->$locationTrait:Lcom/discord/utilities/analytics/Traits$Location;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 4
-
-    sget-object p1, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    check-cast v0, Lcom/discord/app/AppFragment;
-
-    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$1;->$locationTrait:Lcom/discord/utilities/analytics/Traits$Location;
-
-    const/4 v3, 0x1
-
-    invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/utilities/nitro/NitroUtils;->openWebPurchasePremium(Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;Z)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$2.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$2.smali
deleted file mode 100644
index 7cbe7622b8..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$2.smali
+++ /dev/null
@@ -1,59 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$2;
-.super Ljava/lang/Object;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureGiftingButtons()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $locationTrait:Lcom/discord/utilities/analytics/Traits$Location;
-
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/utilities/analytics/Traits$Location;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$2;->$locationTrait:Lcom/discord/utilities/analytics/Traits$Location;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 4
-
-    sget-object p1, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    check-cast v0, Lcom/discord/app/AppFragment;
-
-    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$2;->$locationTrait:Lcom/discord/utilities/analytics/Traits$Location;
-
-    const/4 v3, 0x1
-
-    invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/utilities/nitro/NitroUtils;->openWebPurchasePremium(Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;Z)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$1.smali
deleted file mode 100644
index 14f37d1a75..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$1.smali
+++ /dev/null
@@ -1,98 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$1;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->onResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$1;->invoke(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-    .locals 1
-
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$showContent(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;)V
-
-    return-void
-
-    :cond_0
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading;
-
-    if-eqz v0, :cond_1
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$showLoadingUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-
-    return-void
-
-    :cond_1
-    instance-of p1, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Failure;
-
-    if-eqz p1, :cond_2
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$showFailureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-
-    :cond_2
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$showContent$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$showContent$1.smali
deleted file mode 100644
index c91a3fea44..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$showContent$1.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showContent$1;
-.super Ljava/lang/Object;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->showContent(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Long;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic $scrollTargetSection:Ljava/lang/Integer;
-
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Ljava/lang/Integer;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showContent$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showContent$1;->$scrollTargetSection:Ljava/lang/Integer;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Long;)V
-    .locals 1
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showContent$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showContent$1;->$scrollTargetSection:Ljava/lang/Integer;
-
-    invoke-static {p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$scrollToSection(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Ljava/lang/Integer;)V
-
-    return-void
-.end method
-
-.method public final bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/lang/Long;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showContent$1;->call(Ljava/lang/Long;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$showDowngradeModal$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$showDowngradeModal$1.smali
deleted file mode 100644
index db773bfc95..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$showDowngradeModal$1.smali
+++ /dev/null
@@ -1,77 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showDowngradeModal$1;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->showDowngradeModal()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Landroid/view/View;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showDowngradeModal$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Landroid/view/View;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showDowngradeModal$1;->invoke(Landroid/view/View;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Landroid/view/View;)V
-    .locals 1
-
-    const-string v0, "it"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showDowngradeModal$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onDialogDismissClicked()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$showFailureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$showFailureUI$1.smali
deleted file mode 100644
index 8ecc26747b..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$showFailureUI$1.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showFailureUI$1;
-.super Ljava/lang/Object;
-.source "WidgetSettingsPremium.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->showFailureUI()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showFailureUI$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    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/settings/nitro/WidgetSettingsPremium$showFailureUI$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onRetryClicked()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$1.smali
deleted file mode 100644
index e978b71164..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$1.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$1;
-.super Ljava/lang/Object;
-.source "WidgetUpgradePremiumDialog.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->configureUI(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;
-
-    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/settings/nitro/WidgetUpgradePremiumDialog$configureUI$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->onDialogDismissClicked()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$2.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$2.smali
deleted file mode 100644
index 0ba9242c2d..0000000000
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$2.smali
+++ /dev/null
@@ -1,55 +0,0 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$2;
-.super Ljava/lang/Object;
-.source "WidgetUpgradePremiumDialog.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->configureUI(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;
-
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$2;->$targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    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/settings/nitro/WidgetUpgradePremiumDialog$configureUI$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$2;->$targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->upgradeSubscription(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/AccountCreditView.smali b/com.discord/smali/com/discord/widgets/settings/premium/AccountCreditView.smali
new file mode 100644
index 0000000000..fe2b41e0f7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/AccountCreditView.smali
@@ -0,0 +1,407 @@
+.class public final Lcom/discord/widgets/settings/premium/AccountCreditView;
+.super Landroidx/constraintlayout/widget/ConstraintLayout;
+.source "AccountCreditView.kt"
+
+
+# instance fields
+.field private final header:Landroid/widget/TextView;
+
+.field private final icon:Landroid/widget/ImageView;
+
+.field private final infoText:Landroid/widget/TextView;
+
+.field private final timeText:Landroid/widget/TextView;
+
+
+# direct methods
+.method public constructor <init>(Landroid/content/Context;)V
+    .locals 6
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x6
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/settings/premium/AccountCreditView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+    .locals 6
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x4
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    move-object v2, p2
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/settings/premium/AccountCreditView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+
+    move-object p2, p0
+
+    check-cast p2, Landroid/view/ViewGroup;
+
+    const p3, 0x7f0d0076
+
+    invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    const p1, 0x7f0a0247
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/AccountCreditView;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/ImageView;
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/AccountCreditView;->icon:Landroid/widget/ImageView;
+
+    const p1, 0x7f0a0246
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/AccountCreditView;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/AccountCreditView;->header:Landroid/widget/TextView;
+
+    const p1, 0x7f0a0248
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/AccountCreditView;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/AccountCreditView;->infoText:Landroid/widget/TextView;
+
+    const p1, 0x7f0a024d
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/AccountCreditView;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/AccountCreditView;->timeText:Landroid/widget/TextView;
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    and-int/lit8 p5, p4, 0x2
+
+    if-eqz p5, :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-direct {p0, p1, p2, p3}, Lcom/discord/widgets/settings/premium/AccountCreditView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final configure(JILcom/discord/models/domain/ModelSubscription;)V
+    .locals 17
+
+    move-object/from16 v0, p0
+
+    move/from16 v1, p3
+
+    move-object v2, v0
+
+    check-cast v2, Landroid/view/View;
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x0
+
+    if-lez v1, :cond_0
+
+    const/4 v5, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v5, 0x0
+
+    :goto_0
+    const/4 v6, 0x2
+
+    const/4 v7, 0x0
+
+    invoke-static {v2, v5, v4, v6, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    if-gtz v1, :cond_1
+
+    return-void
+
+    :cond_1
+    sget-object v2, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPlanId()J
+
+    move-result-wide v5
+
+    const v2, 0x7f120e5f
+
+    const-string v7, "header"
+
+    cmp-long v8, p1, v5
+
+    if-nez v8, :cond_2
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/AccountCreditView;->getContext()Landroid/content/Context;
+
+    move-result-object v5
+
+    const v6, 0x7f120e67
+
+    invoke-virtual {v5, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v5
+
+    const-string v6, "context.getString(R.string.premium_tier_1)"
+
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v6, v0, Lcom/discord/widgets/settings/premium/AccountCreditView;->icon:Landroid/widget/ImageView;
+
+    const v8, 0x7f08012d
+
+    invoke-virtual {v6, v8}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    iget-object v6, v0, Lcom/discord/widgets/settings/premium/AccountCreditView;->header:Landroid/widget/TextView;
+
+    invoke-static {v6, v7}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/AccountCreditView;->getContext()Landroid/content/Context;
+
+    move-result-object v7
+
+    new-array v8, v3, [Ljava/lang/Object;
+
+    aput-object v5, v8, v4
+
+    invoke-virtual {v7, v2, v8}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/CharSequence;
+
+    invoke-virtual {v6, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    goto :goto_1
+
+    :cond_2
+    sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPlanId()J
+
+    move-result-wide v5
+
+    cmp-long v8, p1, v5
+
+    if-nez v8, :cond_3
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/AccountCreditView;->getContext()Landroid/content/Context;
+
+    move-result-object v5
+
+    const v6, 0x7f120e68
+
+    invoke-virtual {v5, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v5
+
+    const-string v6, "context.getString(R.string.premium_tier_2)"
+
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v6, v0, Lcom/discord/widgets/settings/premium/AccountCreditView;->icon:Landroid/widget/ImageView;
+
+    const v8, 0x7f08012c
+
+    invoke-virtual {v6, v8}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    iget-object v6, v0, Lcom/discord/widgets/settings/premium/AccountCreditView;->header:Landroid/widget/TextView;
+
+    invoke-static {v6, v7}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/AccountCreditView;->getContext()Landroid/content/Context;
+
+    move-result-object v7
+
+    new-array v8, v3, [Ljava/lang/Object;
+
+    aput-object v5, v8, v4
+
+    invoke-virtual {v7, v2, v8}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/CharSequence;
+
+    invoke-virtual {v6, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    goto :goto_1
+
+    :cond_3
+    const-string v5, ""
+
+    :goto_1
+    const-string v2, "infoText"
+
+    if-eqz p4, :cond_4
+
+    invoke-virtual/range {p4 .. p4}, Lcom/discord/models/domain/ModelSubscription;->getPlanId()J
+
+    move-result-wide v6
+
+    cmp-long v8, p1, v6
+
+    if-nez v8, :cond_4
+
+    sget-object v9, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
+
+    invoke-virtual/range {p4 .. p4}, Lcom/discord/models/domain/ModelSubscription;->getCurrentPeriodEnd()Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/AccountCreditView;->getContext()Landroid/content/Context;
+
+    move-result-object v11
+
+    const-string v5, "context"
+
+    invoke-static {v11, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/16 v15, 0x1c
+
+    const/16 v16, 0x0
+
+    invoke-static/range {v9 .. v16}, 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
+
+    iget-object v6, v0, Lcom/discord/widgets/settings/premium/AccountCreditView;->infoText:Landroid/widget/TextView;
+
+    invoke-static {v6, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/AccountCreditView;->getContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    const v7, 0x7f120e61
+
+    new-array v8, v3, [Ljava/lang/Object;
+
+    aput-object v5, v8, v4
+
+    invoke-virtual {v2, v7, v8}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/CharSequence;
+
+    invoke-virtual {v6, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    goto :goto_2
+
+    :cond_4
+    iget-object v6, v0, Lcom/discord/widgets/settings/premium/AccountCreditView;->infoText:Landroid/widget/TextView;
+
+    invoke-static {v6, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/AccountCreditView;->getContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    const v7, 0x7f120e60
+
+    new-array v8, v3, [Ljava/lang/Object;
+
+    aput-object v5, v8, v4
+
+    invoke-virtual {v2, v7, v8}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/CharSequence;
+
+    invoke-virtual {v6, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    :goto_2
+    iget-object v2, v0, Lcom/discord/widgets/settings/premium/AccountCreditView;->timeText:Landroid/widget/TextView;
+
+    const-string v5, "timeText"
+
+    invoke-static {v2, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/AccountCreditView;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v5
+
+    const v6, 0x7f1000a3
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-static/range {p3 .. p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v7
+
+    aput-object v7, v3, v4
+
+    invoke-virtual {v5, v6, v1, v3}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$1$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$1$1.smali
new file mode 100644
index 0000000000..e77ccc037c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$1$1.smali
@@ -0,0 +1,94 @@
+.class final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1$1;
+.super Ljava/lang/Object;
+.source "SettingsPremiumViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Func3;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;->call(Ljava/lang/Long;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T1:",
+        "Ljava/lang/Object;",
+        "T2:",
+        "Ljava/lang/Object;",
+        "T3:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func3<",
+        "TT1;TT2;TT3;TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1$1;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/stores/StoreEntitlements$State;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1$1;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;
+
+    iget-object v0, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    const-string v1, "paymentSources"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "subscriptions"
+
+    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "entitlementState"
+
+    invoke-static {p3, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, p1, p2, p3}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->access$buildViewState(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/stores/StoreEntitlements$State;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;
+
+    check-cast p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+
+    check-cast p3, Lcom/discord/stores/StoreEntitlements$State;
+
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1$1;->call(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/stores/StoreEntitlements$State;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$1.smali
similarity index 56%
rename from com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$1.smali
index 88d376f645..b9e59fa361 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1;
+.class final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;
 .super Ljava/lang/Object;
 .source "SettingsPremiumViewModel.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;-><init>()V
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;-><init>()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,14 +33,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,7 +54,7 @@
 
     check-cast p1, Ljava/lang/Long;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1;->call(Ljava/lang/Long;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;->call(Ljava/lang/Long;)Lrx/Observable;
 
     move-result-object p1
 
@@ -62,14 +62,14 @@
 .end method
 
 .method public final call(Ljava/lang/Long;)Lrx/Observable;
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
-            "Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;",
+            "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;",
             ">;"
         }
     .end annotation
@@ -94,13 +94,23 @@
 
     move-result-object v0
 
-    new-instance v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1$1;
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1$1;-><init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$1;)V
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getEntitlements()Lcom/discord/stores/StoreEntitlements;
 
-    check-cast v1, Lrx/functions/Func2;
+    move-result-object v1
 
-    invoke-static {p1, v0, v1}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreEntitlements;->getEntitlementState()Lrx/Observable;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1$1;
+
+    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1$1;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;)V
+
+    check-cast v2, Lrx/functions/Func3;
+
+    invoke-static {p1, v0, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$2.smali
similarity index 51%
rename from com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$2.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$2.smali
index c351cccbd0..c069f4acee 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$2.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$2;
+.class final synthetic Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$2;
 .super Lkotlin/jvm/internal/j;
 .source "SettingsPremiumViewModel.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;-><init>()V
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;-><init>()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;",
+        "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -28,7 +28,7 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
     .locals 1
 
     const/4 v0, 0x1
@@ -51,7 +51,7 @@
 .method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
     .locals 1
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    const-class v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V"
+    const-string v0, "publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V"
 
     return-object v0
 .end method
@@ -71,27 +71,27 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$2;->invoke(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$2;->invoke(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+.method public final invoke(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
     .locals 1
 
     const-string v0, "p1"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$2;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$2;->receiver:Ljava/lang/Object;
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->access$publish(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+    invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->access$publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$3.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$3.smali
similarity index 51%
rename from com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$3.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$3.smali
index 804f8ba81d..00f9027007 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$3.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$3;
+.class final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$3;
 .super Lkotlin/jvm/internal/l;
 .source "SettingsPremiumViewModel.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;-><init>()V
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;-><init>()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$3;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$3;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     const/4 p1, 0x1
 
@@ -51,9 +51,9 @@
 
     check-cast p1, Lrx/Subscription;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$3;->invoke(Lrx/Subscription;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$3;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,9 +65,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$3;->this$0:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$3;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->access$setSubscription$p(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;Lrx/Subscription;)V
+    invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->access$setSubscription$p(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;Lrx/Subscription;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium.smali
similarity index 50%
rename from com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium.smali
index 7d7ddb2b6e..2c5e95e93a 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
-.super Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
+.class public final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
+.super Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
 .source "SettingsPremiumViewModel.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
     const/4 v2, 0x0
 
-    invoke-direct {p0, v0, v1, v2}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, v0, v1, v2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-void
 .end method
@@ -38,9 +38,9 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iput-boolean p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
+    iput-boolean p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
 
     return-void
 .end method
@@ -55,22 +55,22 @@
     const/4 p1, 0x0
 
     :cond_0
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;-><init>(Z)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;-><init>(Z)V
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;ZILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
+.method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;ZILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
     .locals 0
 
     and-int/lit8 p2, p2, 0x1
 
     if-eqz p2, :cond_0
 
-    iget-boolean p1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
+    iget-boolean p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
 
     :cond_0
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;->copy(Z)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;->copy(Z)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
 
     move-result-object p0
 
@@ -82,17 +82,17 @@
 .method public final component1()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
 
     return v0
 .end method
 
-.method public final copy(Z)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
+.method public final copy(Z)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
+    new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
 
-    invoke-direct {v0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;-><init>(Z)V
+    invoke-direct {v0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;-><init>(Z)V
 
     return-object v0
 .end method
@@ -104,17 +104,17 @@
 
     if-eq p0, p1, :cond_2
 
-    instance-of v1, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
+    instance-of v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_1
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
 
-    iget-boolean v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
 
-    iget-boolean p1, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
+    iget-boolean p1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
 
     if-ne v1, p1, :cond_0
 
@@ -141,7 +141,7 @@
 .method public final getHasError()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
 
     return v0
 .end method
@@ -149,7 +149,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
 
     if-eqz v0, :cond_0
 
@@ -168,7 +168,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-boolean v1, p0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;->hasError:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium.smali
new file mode 100644
index 0000000000..01eb6c3cf7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium;
+.super Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+.source "SettingsPremiumViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "DowngradePremium"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium;->INSTANCE:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium.smali
new file mode 100644
index 0000000000..2616412a5c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium.smali
@@ -0,0 +1,233 @@
+.class public final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
+.super Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+.source "SettingsPremiumViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "UpgradePremium"
+.end annotation
+
+
+# instance fields
+.field private final hasError:Z
+
+.field private final targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    iput-boolean p2, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;-><init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)V
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;ZILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
+    .locals 0
+
+    and-int/lit8 p4, p3, 0x1
+
+    if-eqz p4, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    :cond_0
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_1
+
+    iget-boolean p2, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
+
+    :cond_1
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->copy(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    return-object v0
+.end method
+
+.method public final component2()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
+
+    return v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
+
+    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;-><init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
+
+    iget-boolean p1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
+
+    if-ne v1, 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 final getHasError()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
+
+    return v0
+.end method
+
+.method public final getTargetPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    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-boolean v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
+
+    if-eqz v1, :cond_1
+
+    const/4 v1, 0x1
+
+    :cond_1
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "UpgradePremium(targetPlanType="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", hasError="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->hasError:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog.smali
similarity index 53%
rename from com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog.smali
index 9ce58d69b0..fa3945d593 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog.smali
@@ -1,11 +1,11 @@
-.class public abstract Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
+.class public abstract Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
 .super Ljava/lang/Object;
 .source "SettingsPremiumViewModel.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,9 +15,9 @@
 
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;,
-        Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium;,
-        Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
+        Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;,
+        Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium;,
+        Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
     }
 .end annotation
 
@@ -34,7 +34,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError.smali
new file mode 100644
index 0000000000..6a9fae5c49
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError.smali
@@ -0,0 +1,95 @@
+.class public final enum Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+.super Ljava/lang/Enum;
+.source "SettingsPremiumViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "SubscriptionError"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final synthetic $VALUES:[Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+.field public static final enum GENERIC:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x1
+
+    new-array v0, v0, [Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    new-instance v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    const/4 v2, 0x0
+
+    const-string v3, "GENERIC"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;->GENERIC:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;->$VALUES:[Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    return-void
+.end method
+
+.method private 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/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+    .locals 1
+
+    const-class v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    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/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+    .locals 1
+
+    sget-object v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;->$VALUES:[Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    invoke-virtual {v0}, [Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Failure.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Failure.smali
new file mode 100644
index 0000000000..f9248ec15e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Failure.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Failure;
+.super Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+.source "SettingsPremiumViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Failure"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Failure;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Failure;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Failure;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Failure;->INSTANCE:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Failure;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded.smali
new file mode 100644
index 0000000000..6d94a97cc8
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded.smali
@@ -0,0 +1,600 @@
+.class public final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+.super Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+.source "SettingsPremiumViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Loaded"
+.end annotation
+
+
+# instance fields
+.field private final dialog:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+.field private final entitlements:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final isBusy:Z
+
+.field private final paymentSources:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPaymentSource;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
+
+.field private final subscriptionError:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelSubscription;",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/ModelPaymentSource;",
+            ">;Z",
+            "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;",
+            "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "paymentSources"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "entitlements"
+
+    invoke-static {p6, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    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;
+
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
+
+    iput-boolean p3, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
+
+    iput-object p4, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    iput-object p5, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    iput-object p6, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->entitlements:Ljava/util/List;
+
+    return-void
+.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;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+    .locals 4
+
+    and-int/lit8 p8, p7, 0x1
+
+    if-eqz p8, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
+
+    :cond_0
+    and-int/lit8 p8, p7, 0x2
+
+    if-eqz p8, :cond_1
+
+    iget-object p2, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
+
+    :cond_1
+    move-object p8, p2
+
+    and-int/lit8 p2, p7, 0x4
+
+    if-eqz p2, :cond_2
+
+    iget-boolean p3, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
+
+    :cond_2
+    move v0, p3
+
+    and-int/lit8 p2, p7, 0x8
+
+    if-eqz p2, :cond_3
+
+    iget-object p4, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    :cond_3
+    move-object v1, p4
+
+    and-int/lit8 p2, p7, 0x10
+
+    if-eqz p2, :cond_4
+
+    iget-object p5, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    :cond_4
+    move-object v2, p5
+
+    and-int/lit8 p2, p7, 0x20
+
+    if-eqz p2, :cond_5
+
+    iget-object p6, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->entitlements:Ljava/util/List;
+
+    :cond_5
+    move-object v3, p6
+
+    move-object p2, p0
+
+    move-object p3, p1
+
+    move-object p4, p8
+
+    move p5, v0
+
+    move-object p6, v1
+
+    move-object p7, v2
+
+    move-object p8, v3
+
+    invoke-virtual/range {p2 .. p8}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->copy(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/models/domain/ModelSubscription;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPaymentSource;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final component3()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
+
+    return v0
+.end method
+
+.method public final component4()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    return-object v0
+.end method
+
+.method public final component5()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    return-object v0
+.end method
+
+.method public final component6()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->entitlements:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelSubscription;",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/ModelPaymentSource;",
+            ">;Z",
+            "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;",
+            "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;)",
+            "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;"
+        }
+    .end annotation
+
+    const-string v0, "paymentSources"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "entitlements"
+
+    invoke-static {p6, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    move-object v1, v0
+
+    move-object v2, p1
+
+    move-object v3, p2
+
+    move v4, p3
+
+    move-object v5, p4
+
+    move-object v6, p5
+
+    move-object v7, p6
+
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
+
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
+
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
+
+    iget-boolean v3, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
+
+    if-ne v1, v3, :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, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->entitlements:Ljava/util/List;
+
+    iget-object p1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->entitlements:Ljava/util/List;
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    return v2
+
+    :cond_2
+    :goto_1
+    return v0
+.end method
+
+.method public final getDialog()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    return-object v0
+.end method
+
+.method public final getEntitlements()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->entitlements:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final getPaymentSources()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPaymentSource;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
+
+    return-object v0
+.end method
+
+.method public final getSubscriptionError()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
+
+    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/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
+
+    if-eqz v2, :cond_2
+
+    const/4 v2, 0x1
+
+    :cond_2
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    if-eqz v2, :cond_3
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v2, 0x0
+
+    :goto_2
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    if-eqz v2, :cond_4
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_3
+
+    :cond_4
+    const/4 v2, 0x0
+
+    :goto_3
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->entitlements:Ljava/util/List;
+
+    if-eqz v2, :cond_5
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_5
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final isBusy()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "Loaded(premiumSubscription="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", paymentSources="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", isBusy="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", subscriptionError="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", dialog="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->dialog:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", entitlements="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->entitlements:Ljava/util/List;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading.smali
new file mode 100644
index 0000000000..40699ec9f3
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;
+.super Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+.source "SettingsPremiumViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Loading"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState.smali
similarity index 53%
rename from com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState.smali
index 4ccdf7a24b..fd00528692 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState.smali
@@ -1,11 +1,11 @@
-.class public abstract Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
+.class public abstract Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
 .super Ljava/lang/Object;
 .source "SettingsPremiumViewModel.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,9 +15,9 @@
 
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;,
-        Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loading;,
-        Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Failure;
+        Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;,
+        Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;,
+        Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Failure;
     }
 .end annotation
 
@@ -34,7 +34,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$1.smali
new file mode 100644
index 0000000000..8c91c75fa2
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$1.smali
@@ -0,0 +1,67 @@
+.class final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$1;
+.super Ljava/lang/Object;
+.source "SettingsPremiumViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->cancelSubscription()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Void;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$1;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/Void;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$1;->call(Ljava/lang/Void;)V
+
+    return-void
+.end method
+
+.method public final call(Ljava/lang/Void;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$1;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->access$fetchData(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$2.smali
new file mode 100644
index 0000000000..d4127f3bed
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$2.smali
@@ -0,0 +1,67 @@
+.class final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$2;
+.super Ljava/lang/Object;
+.source "SettingsPremiumViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->cancelSubscription()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Throwable;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$2;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$2;->call(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public final call(Ljava/lang/Throwable;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$2;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->access$onCancelError(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$1.smali
new file mode 100644
index 0000000000..ae8f037e0d
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$1.smali
@@ -0,0 +1,67 @@
+.class final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$1;
+.super Ljava/lang/Object;
+.source "SettingsPremiumViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->changePaymentSource(Lcom/discord/models/domain/ModelPaymentSource;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Void;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$1;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/Void;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$1;->call(Ljava/lang/Void;)V
+
+    return-void
+.end method
+
+.method public final call(Ljava/lang/Void;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$1;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->access$fetchData(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$2.smali
new file mode 100644
index 0000000000..215779430e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$2.smali
@@ -0,0 +1,67 @@
+.class final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$2;
+.super Ljava/lang/Object;
+.source "SettingsPremiumViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->changePaymentSource(Lcom/discord/models/domain/ModelPaymentSource;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Throwable;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$2;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$2;->call(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public final call(Ljava/lang/Throwable;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$2;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->access$onChangePaymentSourceError(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$1.smali
new file mode 100644
index 0000000000..569cae7373
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$1.smali
@@ -0,0 +1,67 @@
+.class final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$1;
+.super Ljava/lang/Object;
+.source "SettingsPremiumViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->resubscribe()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Void;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$1;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/Void;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$1;->call(Ljava/lang/Void;)V
+
+    return-void
+.end method
+
+.method public final call(Ljava/lang/Void;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$1;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->access$fetchData(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$2.smali
new file mode 100644
index 0000000000..299db47b9c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$2.smali
@@ -0,0 +1,67 @@
+.class final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$2;
+.super Ljava/lang/Object;
+.source "SettingsPremiumViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->resubscribe()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Throwable;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$2;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$2;->call(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public final call(Ljava/lang/Throwable;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$2;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->access$onResubscribeError(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$1.smali
new file mode 100644
index 0000000000..79161900e9
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$1.smali
@@ -0,0 +1,67 @@
+.class final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$1;
+.super Ljava/lang/Object;
+.source "SettingsPremiumViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->upgradeSubscription(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Void;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$1;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/Void;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$1;->call(Ljava/lang/Void;)V
+
+    return-void
+.end method
+
+.method public final call(Ljava/lang/Void;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$1;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->access$fetchData(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$2.smali
new file mode 100644
index 0000000000..cf3efc9e9b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$2.smali
@@ -0,0 +1,67 @@
+.class final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$2;
+.super Ljava/lang/Object;
+.source "SettingsPremiumViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->upgradeSubscription(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Throwable;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$2;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$2;->call(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public final call(Ljava/lang/Throwable;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$2;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->access$onUpgradeError(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel.smali
new file mode 100644
index 0000000000..5ea1335aac
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel.smali
@@ -0,0 +1,1460 @@
+.class public final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+.super Landroidx/lifecycle/ViewModel;
+.source "SettingsPremiumViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;,
+        Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;,
+        Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+    }
+.end annotation
+
+
+# instance fields
+.field private launchPremiumTabStartTimeMs:J
+
+.field private final requestBuyPlanSubject:Lrx/subjects/PublishSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/PublishSubject<",
+            "Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private subscription:Lrx/Subscription;
+
+.field private viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+.field private final viewStateSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 11
+
+    invoke-direct {p0}, Landroidx/lifecycle/ViewModel;-><init>()V
+
+    sget-object v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;
+
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->requestBuyPlanSubject:Lrx/subjects/PublishSubject;
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->fetchData()V
+
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    const-wide/16 v1, 0x32
+
+    invoke-static {v1, v2, v0}, Lrx/Observable;->g(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v2
+
+    const-string v0, "Observable.timer(\n      \u2026ntitlementState) }\n\n    }"
+
+    invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class v3, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$2;
+
+    move-object v1, p0
+
+    check-cast v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$2;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    move-object v8, v0
+
+    check-cast v8, Lkotlin/jvm/functions/Function1;
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$3;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$3;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    move-object v5, v0
+
+    check-cast v5, Lkotlin/jvm/functions/Function1;
+
+    const/4 v4, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/16 v9, 0x1a
+
+    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
+
+    return-void
+.end method
+
+.method public static final synthetic access$buildViewState(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/stores/StoreEntitlements$State;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+    .locals 0
+
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->buildViewState(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/stores/StoreEntitlements$State;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$fetchData(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->fetchData()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$getSubscription$p(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)Lrx/Subscription;
+    .locals 1
+
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->subscription:Lrx/Subscription;
+
+    if-nez p0, :cond_0
+
+    const-string v0, "subscription"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static final synthetic access$onCancelError(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onCancelError()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$onChangePaymentSourceError(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onChangePaymentSourceError()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$onResubscribeError(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onResubscribeError()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$onUpgradeError(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onUpgradeError()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$setSubscription$p(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;Lrx/Subscription;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->subscription:Lrx/Subscription;
+
+    return-void
+.end method
+
+.method private final buildViewState(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/stores/StoreEntitlements$State;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+    .locals 8
+
+    instance-of v0, p1, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded;
+
+    if-eqz v0, :cond_4
+
+    instance-of v0, p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
+
+    if-eqz v0, :cond_4
+
+    instance-of v0, p3, Lcom/discord/stores/StoreEntitlements$State$Loaded;
+
+    if-eqz v0, :cond_4
+
+    check-cast p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
+
+    invoke-virtual {p2}, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;->getSubscriptions()Ljava/util/List;
+
+    move-result-object p2
+
+    check-cast p2, Ljava/lang/Iterable;
+
+    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p2
+
+    :cond_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
+
+    move-object v1, v0
+
+    check-cast v1, Lcom/discord/models/domain/ModelSubscription;
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->getType()Lcom/discord/models/domain/ModelSubscription$Type;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/models/domain/ModelSubscription$Type;->PREMIUM:Lcom/discord/models/domain/ModelSubscription$Type;
+
+    if-ne v1, v2, :cond_1
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_0
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_1
+    move-object v2, v0
+
+    check-cast v2, Lcom/discord/models/domain/ModelSubscription;
+
+    new-instance p2, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    check-cast p1, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded;->getPaymentSources()Ljava/util/List;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    check-cast p3, Lcom/discord/stores/StoreEntitlements$State$Loaded;
+
+    invoke-virtual {p3}, Lcom/discord/stores/StoreEntitlements$State$Loaded;->getOwnedEntitlements()Ljava/util/Map;
+
+    move-result-object p1
+
+    const-wide v0, 0x73df54a4a020016L
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p3
+
+    invoke-interface {p1, p3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/util/List;
+
+    if-nez p1, :cond_3
+
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
+
+    check-cast p1, Ljava/util/List;
+
+    :cond_3
+    move-object v7, p1
+
+    move-object v1, p2
+
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;)V
+
+    check-cast p2, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    return-object p2
+
+    :cond_4
+    instance-of p1, p1, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Failure;
+
+    if-nez p1, :cond_6
+
+    instance-of p1, p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Failure;
+
+    if-eqz p1, :cond_5
+
+    goto :goto_2
+
+    :cond_5
+    sget-object p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;
+
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    return-object p1
+
+    :cond_6
+    :goto_2
+    sget-object p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Failure;->INSTANCE:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Failure;
+
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    return-object p1
+.end method
+
+.method private final fetchData()V
+    .locals 3
+
+    invoke-static {}, Lcom/discord/stores/StorePaymentSources$Actions;->fetchPaymentSources()V
+
+    invoke-static {}, Lcom/discord/stores/StoreSubscriptions$Actions;->fetchSubscriptions()V
+
+    sget-object v0, Lcom/discord/stores/StoreEntitlements$Actions;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions;
+
+    const-wide v1, 0x73df54a4a020016L
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/stores/StoreEntitlements$Actions;->fetchMyEntitlementsForApplication(J)V
+
+    return-void
+.end method
+
+.method private final markBusy()V
+    .locals 10
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    move-object v1, v0
+
+    check-cast v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_1
+
+    return-void
+
+    :cond_1
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/16 v8, 0x33
+
+    const/4 v9, 0x0
+
+    invoke-static/range {v1 .. v9}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->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;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+
+    return-void
+.end method
+
+.method private final onCancelError()V
+    .locals 10
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    move-object v1, v0
+
+    check-cast v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_1
+
+    return-void
+
+    :cond_1
+    invoke-virtual {v1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    move-result-object v0
+
+    instance-of v0, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
+
+    if-nez v0, :cond_2
+
+    return-void
+
+    :cond_2
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
+
+    const/4 v6, 0x1
+
+    invoke-direct {v0, v6}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;-><init>(Z)V
+
+    move-object v6, v0
+
+    check-cast v6, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    const/4 v7, 0x0
+
+    const/16 v8, 0x2b
+
+    const/4 v9, 0x0
+
+    invoke-static/range {v1 .. v9}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->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;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+
+    return-void
+.end method
+
+.method private final onChangePaymentSourceError()V
+    .locals 10
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    move-object v1, v0
+
+    check-cast v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_1
+
+    return-void
+
+    :cond_1
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    sget-object v5, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;->GENERIC:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/16 v8, 0x33
+
+    const/4 v9, 0x0
+
+    invoke-static/range {v1 .. v9}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->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;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+
+    return-void
+.end method
+
+.method private final onDowngradeClicked()V
+    .locals 10
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    move-object v1, v0
+
+    check-cast v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_1
+
+    return-void
+
+    :cond_1
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    sget-object v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium;->INSTANCE:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium;
+
+    move-object v6, v0
+
+    check-cast v6, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    const/4 v7, 0x0
+
+    const/16 v8, 0x2f
+
+    const/4 v9, 0x0
+
+    invoke-static/range {v1 .. v9}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->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;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+
+    return-void
+.end method
+
+.method private final onResubscribeError()V
+    .locals 10
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    move-object v1, v0
+
+    check-cast v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_1
+
+    return-void
+
+    :cond_1
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    sget-object v5, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;->GENERIC:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/16 v8, 0x33
+
+    const/4 v9, 0x0
+
+    invoke-static/range {v1 .. v9}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->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;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+
+    return-void
+.end method
+
+.method private final onUpgradeClicked(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+    .locals 12
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    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
+    move-object v3, v0
+
+    check-cast v3, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v3, :cond_1
+
+    return-void
+
+    :cond_1
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
+
+    const/4 v1, 0x0
+
+    const/4 v8, 0x2
+
+    invoke-direct {v0, p1, v1, v8, v2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;-><init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    move-object v8, v0
+
+    check-cast v8, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    const/4 v9, 0x0
+
+    const/16 v10, 0x2f
+
+    const/4 v11, 0x0
+
+    invoke-static/range {v3 .. v11}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->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;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+
+    return-void
+.end method
+
+.method private final onUpgradeError()V
+    .locals 12
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    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
+    move-object v3, v0
+
+    check-cast v3, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v3, :cond_1
+
+    return-void
+
+    :cond_1
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    move-result-object v0
+
+    instance-of v0, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
+
+    if-nez v0, :cond_2
+
+    return-void
+
+    :cond_2
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
+
+    const/4 v1, 0x1
+
+    invoke-static {v0, v2, v1, v1, v2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->copy$default(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;ZILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
+
+    move-result-object v0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    move-object v8, v0
+
+    check-cast v8, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    const/4 v9, 0x0
+
+    const/16 v10, 0x2b
+
+    const/4 v11, 0x0
+
+    invoke-static/range {v3 .. v11}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->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;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+
+    return-void
+.end method
+
+.method private final publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+    .locals 1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final cancelSubscription()V
+    .locals 4
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    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-nez v0, :cond_1
+
+    return-void
+
+    :cond_1
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+
+    move-result-object v0
+
+    if-nez v0, :cond_2
+
+    return-void
+
+    :cond_2
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->markBusy()V
+
+    sget-object v1, 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 v1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getId()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v1, v0}, Lcom/discord/utilities/rest/RestAPI;->deleteSubscription(Ljava/lang/String;)Lrx/Observable;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    const/4 v3, 0x1
+
+    invoke-static {v0, v1, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$1;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    check-cast v1, Lrx/functions/Action1;
+
+    new-instance v2, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$2;
+
+    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$cancelSubscription$2;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    check-cast v2, Lrx/functions/Action1;
+
+    invoke-virtual {v0, v1, v2}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
+
+    return-void
+.end method
+
+.method public final changePaymentSource(Lcom/discord/models/domain/ModelPaymentSource;)V
+    .locals 10
+
+    const-string v0, "paymentSource"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    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-nez v0, :cond_1
+
+    return-void
+
+    :cond_1
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+
+    move-result-object v0
+
+    if-nez v0, :cond_2
+
+    return-void
+
+    :cond_2
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->markBusy()V
+
+    sget-object v1, 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 v1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getId()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v9, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPaymentSource;->getId()Ljava/lang/String;
+
+    move-result-object v6
+
+    const/4 v7, 0x3
+
+    const/4 v8, 0x0
+
+    move-object v3, v9
+
+    invoke-direct/range {v3 .. v8}, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;-><init>(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v1, v0, v9}, Lcom/discord/utilities/rest/RestAPI;->updateSubscription(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$UpdateSubscription;)Lrx/Observable;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    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 {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$1;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    check-cast v0, Lrx/functions/Action1;
+
+    new-instance v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$2;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$changePaymentSource$2;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    check-cast v1, Lrx/functions/Action1;
+
+    invoke-virtual {p1, v0, v1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
+
+    return-void
+.end method
+
+.method public final getLaunchPremiumTabStartTimeMs()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->launchPremiumTabStartTimeMs:J
+
+    return-wide v0
+.end method
+
+.method public final getRequestBuyPlanSubject()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->requestBuyPlanSubject:Lrx/subjects/PublishSubject;
+
+    const-string v1, "requestBuyPlanSubject"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lrx/Observable;
+
+    return-object v0
+.end method
+
+.method public final getViewState()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    const-string v1, "viewStateSubject"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lrx/Observable;
+
+    return-object v0
+.end method
+
+.method public final onCancelClicked()V
+    .locals 12
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    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
+    move-object v3, v0
+
+    check-cast v3, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v3, :cond_1
+
+    return-void
+
+    :cond_1
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
+
+    const/4 v1, 0x0
+
+    const/4 v8, 0x1
+
+    invoke-direct {v0, v1, v8, v2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    move-object v8, v0
+
+    check-cast v8, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
+
+    const/4 v9, 0x0
+
+    const/16 v10, 0x2f
+
+    const/4 v11, 0x0
+
+    invoke-static/range {v3 .. v11}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->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;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+
+    return-void
+.end method
+
+.method public final onCleared()V
+    .locals 2
+
+    invoke-super {p0}, Landroidx/lifecycle/ViewModel;->onCleared()V
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->subscription:Lrx/Subscription;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "subscription"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    return-void
+.end method
+
+.method public final onDialogDismissClicked()V
+    .locals 10
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    move-object v1, v0
+
+    check-cast v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_1
+
+    return-void
+
+    :cond_1
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/16 v8, 0x2f
+
+    const/4 v9, 0x0
+
+    invoke-static/range {v1 .. v9}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->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;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->publish(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+
+    return-void
+.end method
+
+.method public final onPlanRequested(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+    .locals 3
+
+    const-string v0, "requestedPlanType"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    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-nez v0, :cond_1
+
+    return-void
+
+    :cond_1
+    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_2
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    move-result-object v2
+
+    :cond_2
+    if-nez v2, :cond_3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->requestBuyPlanSubject:Lrx/subjects/PublishSubject;
+
+    invoke-virtual {v0, p1}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+
+    :cond_3
+    if-eq p1, v2, :cond_5
+
+    invoke-static {}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getUPGRADE_ELIGIBILITY()Ljava/util/Map;
+
+    move-result-object v0
+
+    invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/util/Set;
+
+    if-eqz v0, :cond_4
+
+    invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_4
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onUpgradeClicked(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+
+    return-void
+
+    :cond_4
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onDowngradeClicked()V
+
+    :cond_5
+    return-void
+.end method
+
+.method public final onRetryClicked()V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->fetchData()V
+
+    return-void
+.end method
+
+.method public final resubscribe()V
+    .locals 10
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    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-nez v0, :cond_1
+
+    return-void
+
+    :cond_1
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+
+    move-result-object v0
+
+    if-nez v0, :cond_2
+
+    return-void
+
+    :cond_2
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getStatus()Lcom/discord/models/domain/ModelSubscription$Status;
+
+    move-result-object v1
+
+    sget-object v3, Lcom/discord/models/domain/ModelSubscription$Status;->CANCELED:Lcom/discord/models/domain/ModelSubscription$Status;
+
+    if-eq v1, v3, :cond_3
+
+    return-void
+
+    :cond_3
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->markBusy()V
+
+    sget-object v1, 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 v1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getId()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v9, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;
+
+    sget-object v3, Lcom/discord/models/domain/ModelSubscription$Status;->ACTIVE:Lcom/discord/models/domain/ModelSubscription$Status;
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelSubscription$Status;->getIntRepresentation()I
+
+    move-result v3
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v4
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x6
+
+    const/4 v8, 0x0
+
+    move-object v3, v9
+
+    invoke-direct/range {v3 .. v8}, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;-><init>(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v1, v0, v9}, Lcom/discord/utilities/rest/RestAPI;->updateSubscription(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$UpdateSubscription;)Lrx/Observable;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    const/4 v3, 0x1
+
+    invoke-static {v0, v1, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$1;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    check-cast v1, Lrx/functions/Action1;
+
+    new-instance v2, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$2;
+
+    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$resubscribe$2;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    check-cast v2, Lrx/functions/Action1;
+
+    invoke-virtual {v0, v1, v2}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
+
+    return-void
+.end method
+
+.method public final setLaunchPremiumTabStartTimeMs(J)V
+    .locals 0
+
+    iput-wide p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->launchPremiumTabStartTimeMs:J
+
+    return-void
+.end method
+
+.method public final upgradeSubscription(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+    .locals 10
+
+    const-string v0, "targetPlanType"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewState:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    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-nez v0, :cond_1
+
+    return-void
+
+    :cond_1
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+
+    move-result-object v0
+
+    if-nez v0, :cond_2
+
+    return-void
+
+    :cond_2
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->markBusy()V
+
+    sget-object v1, 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 v1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getId()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v9, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;
+
+    sget-object v3, Lcom/discord/models/domain/ModelSubscription$Status;->ACTIVE:Lcom/discord/models/domain/ModelSubscription$Status;
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelSubscription$Status;->getIntRepresentation()I
+
+    move-result v3
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v4
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPlanTypeString()Ljava/lang/String;
+
+    move-result-object v5
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x4
+
+    const/4 v8, 0x0
+
+    move-object v3, v9
+
+    invoke-direct/range {v3 .. v8}, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;-><init>(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v1, v0, v9}, Lcom/discord/utilities/rest/RestAPI;->updateSubscription(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$UpdateSubscription;)Lrx/Observable;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    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 {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$1;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    check-cast v0, Lrx/functions/Action1;
+
+    new-instance v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$2;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$upgradeSubscription$2;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+
+    check-cast v1, Lrx/functions/Action1;
+
+    invoke-virtual {p1, v0, v1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$WhenMappings.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$WhenMappings.smali
similarity index 75%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$WhenMappings.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$WhenMappings.smali
index b3a572bc04..6ba974ff1c 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$WhenMappings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$WhenMappings.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$WhenMappings;
+.class public final synthetic Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$WhenMappings;
 .super Ljava/lang/Object;
 
 
@@ -18,7 +18,7 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -30,7 +30,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -42,7 +42,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -54,7 +54,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -66,7 +66,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -78,7 +78,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$1.smali
new file mode 100644
index 0000000000..a1d8597fa0
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$1.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$1;
+.super Ljava/lang/Object;
+.source "WidgetCancelPremiumDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->configureUI(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;
+
+    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/settings/premium/WidgetCancelPremiumDialog$configureUI$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onDialogDismissClicked()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$2.smali
new file mode 100644
index 0000000000..ee4fc1fb0e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$2.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$2;
+.super Ljava/lang/Object;
+.source "WidgetCancelPremiumDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->configureUI(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;
+
+    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/settings/premium/WidgetCancelPremiumDialog$configureUI$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->cancelSubscription()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$onResume$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$onResume$1.smali
similarity index 50%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$onResume$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$onResume$1.smali
index 0a8f1a5325..2bd4f5f2bb 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$onResume$1.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$onResume$1;
+.class final synthetic Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$onResume$1;
 .super Lkotlin/jvm/internal/j;
 .source "WidgetCancelPremiumDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->onResume()V
+    value = Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->onResume()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;",
+        "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -28,7 +28,7 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;)V
     .locals 1
 
     const/4 v0, 0x1
@@ -51,7 +51,7 @@
 .method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
     .locals 1
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;
 
     invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "configureUI(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V"
+    const-string v0, "configureUI(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V"
 
     return-object v0
 .end method
@@ -71,23 +71,23 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$onResume$1;->invoke(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$onResume$1;->invoke(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+.method public final invoke(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$onResume$1;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$onResume$1;->receiver:Ljava/lang/Object;
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;
 
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->access$configureUI(Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+    invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->access$configureUI(Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog.smali
similarity index 64%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog.smali
index 37a5699988..6746fa0749 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;
+.class public final Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;
 .super Lcom/discord/app/AppDialog;
 .source "WidgetCancelPremiumDialog.kt"
 
@@ -24,14 +24,14 @@
 
 .field private final headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+.field private viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 6
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;
 
     const/16 v1, 0x8
 
@@ -213,7 +213,7 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     return-void
 .end method
@@ -223,29 +223,21 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
+    const v0, 0x7f0a0120
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+
     const v0, 0x7f0a011f
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a011e
-
-    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->grandfatheredIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0119
-
-    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->bodyPart1Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->grandfatheredIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a011a
 
@@ -253,7 +245,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->bodyPart2Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->bodyPart1Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a011b
 
@@ -261,7 +253,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->bodyPart2Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a011c
 
@@ -269,7 +261,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a011d
 
@@ -277,54 +269,62 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->errorTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02c2
+    const v0, 0x7f0a011e
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->errorDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->errorTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a02cb
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->errorDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
 
-.method public static final synthetic access$configureUI(Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+.method public static final synthetic access$configureUI(Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->configureUI(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->configureUI(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     if-nez p0, :cond_0
 
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
 .end method
 
-.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
+.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     return-void
 .end method
 
-.method private final configureUI(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+.method private final configureUI(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
     .locals 11
 
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
 
     const/4 v1, 0x0
 
@@ -338,11 +338,11 @@
     move-object v0, p1
 
     :goto_0
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_5
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/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 v0
 
@@ -355,7 +355,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v3, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->ordinal()I
 
@@ -376,9 +376,9 @@
     goto :goto_1
 
     :pswitch_0
-    const v2, 0x7f120e2d
+    const v2, 0x7f120e67
 
-    invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
@@ -386,16 +386,16 @@
 
     invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120d5d
+    const v4, 0x7f120d9f
 
-    const v5, 0x7f120d5e
+    const v5, 0x7f120da0
 
     goto :goto_1
 
     :pswitch_1
-    const v2, 0x7f120e2e
+    const v2, 0x7f120e68
 
-    invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
@@ -403,16 +403,16 @@
 
     invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120d60
+    const v4, 0x7f120da2
 
-    const v5, 0x7f120d61
+    const v5, 0x7f120da3
 
     :goto_1
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getHeaderTv()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getHeaderTv()Landroid/widget/TextView;
 
     move-result-object v6
 
-    const v7, 0x7f120d64
+    const v7, 0x7f120da6
 
     const/4 v8, 0x1
 
@@ -420,7 +420,7 @@
 
     aput-object v2, v9, v3
 
-    invoke-virtual {p0, v7, v9}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v7, v9}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -428,7 +428,7 @@
 
     invoke-virtual {v6, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->requireContext()Landroid/content/Context;
 
     move-result-object v2
 
@@ -466,7 +466,7 @@
 
     move-result-object v2
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getBodyPart1Tv()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getBodyPart1Tv()Landroid/widget/TextView;
 
     move-result-object v6
 
@@ -474,7 +474,7 @@
 
     aput-object v2, v7, v3
 
-    invoke-virtual {p0, v4, v7}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v4, v7}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -492,11 +492,11 @@
 
     invoke-virtual {v6, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getBodyPart2Tv()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getBodyPart2Tv()Landroid/widget/TextView;
 
     move-result-object v2
 
-    invoke-virtual {p0, v5}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v5}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String;
 
     move-result-object v4
 
@@ -514,7 +514,7 @@
 
     invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getGrandfatheredIndicator()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getGrandfatheredIndicator()Landroid/view/View;
 
     move-result-object v2
 
@@ -530,27 +530,27 @@
 
     invoke-static {v2, v0, v3, v4, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->isBusy()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getCancelBtn()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getCancelBtn()Landroid/widget/Button;
 
     move-result-object v0
 
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
 
     move-result-object v0
 
     invoke-virtual {v0, v1}, Lcom/discord/views/LoadingButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
 
     move-result-object v0
 
@@ -559,72 +559,72 @@
     goto :goto_2
 
     :cond_2
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getCancelBtn()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getCancelBtn()Landroid/widget/Button;
 
     move-result-object v0
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$1;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$1;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;)V
+    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {v0, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
 
     move-result-object v0
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$2;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$2;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$configureUI$2;-><init>(Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;)V
+    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$configureUI$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {v0, v2}, Lcom/discord/views/LoadingButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
 
     move-result-object v0
 
     invoke-virtual {v0, v3}, Lcom/discord/views/LoadingButton;->setIsLoading(Z)V
 
     :goto_2
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
 
     move-result-object p1
 
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
 
     if-nez v0, :cond_3
 
     move-object p1, v1
 
     :cond_3
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
 
     if-nez p1, :cond_4
 
     return-void
 
     :cond_4
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getErrorTv()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getErrorTv()Landroid/widget/TextView;
 
     move-result-object v0
 
     check-cast v0, Landroid/view/View;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;->getHasError()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;->getHasError()Z
 
     move-result v2
 
     invoke-static {v0, v2, v3, v4, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getErrorDivider()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getErrorDivider()Landroid/view/View;
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;->getHasError()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;->getHasError()Z
 
     move-result p1
 
@@ -648,9 +648,9 @@
 .method private final getBodyPart1Tv()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->bodyPart1Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->bodyPart1Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -668,9 +668,9 @@
 .method private final getBodyPart2Tv()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->bodyPart2Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->bodyPart2Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x3
 
@@ -688,9 +688,9 @@
 .method private final getCancelBtn()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x4
 
@@ -708,9 +708,9 @@
 .method private final getConfirmBtn()Lcom/discord/views/LoadingButton;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x5
 
@@ -728,9 +728,9 @@
 .method private final getErrorDivider()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->errorDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->errorDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x7
 
@@ -748,9 +748,9 @@
 .method private final getErrorTv()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->errorTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->errorTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x6
 
@@ -768,9 +768,9 @@
 .method private final getGrandfatheredIndicator()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->grandfatheredIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->grandfatheredIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -788,9 +788,9 @@
 .method private final getHeaderTv()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -810,7 +810,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00c8
+    const v0, 0x7f0d00d1
 
     return v0
 .end method
@@ -822,9 +822,9 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->setCancelable(Z)V
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->setCancelable(Z)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object v0
 
@@ -832,7 +832,7 @@
 
     move-result-object v0
 
-    const-class v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    const-class v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
@@ -842,20 +842,20 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     if-nez v0, :cond_0
 
     const-string v1, "viewModel"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->getViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->getViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -871,7 +871,7 @@
 
     move-result-object v4
 
-    const-class v5, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;
+    const-class v5, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;
 
     const/4 v6, 0x0
 
@@ -881,13 +881,13 @@
 
     const/4 v9, 0x0
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$onResume$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$onResume$1;
 
     move-object v1, p0
 
-    check-cast v1, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;
+    check-cast v1, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog$onResume$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog$onResume$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;)V
 
     move-object v10, v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$Companion.smali
similarity index 71%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$Companion.smali
index 74a3d9b549..31043de289 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$Companion;
 .super Ljava/lang/Object;
 .source "WidgetSettingsGifting.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$Companion;-><init>()V
 
     return-void
 .end method
@@ -40,7 +40,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
     invoke-static {p1, v0}, Lcom/discord/app/f;->b(Landroid/content/Context;Ljava/lang/Class;)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1.smali
similarity index 51%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1.smali
index 9c08069d41..32aaa4852b 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGifting.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
     const/4 p1, 0x2
 
@@ -58,9 +58,9 @@
 
     check-cast p2, Ljava/lang/Long;
 
-    invoke-virtual {p0, v0, v1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$1;->invoke(JLjava/lang/Long;)V
+    invoke-virtual {p0, v0, v1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1;->invoke(JLjava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -68,13 +68,13 @@
 .method public final invoke(JLjava/lang/Long;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    invoke-static {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    invoke-static {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
     move-result-object v0
 
-    invoke-virtual {v0, p1, p2, p3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->handleSkuClicked(JLjava/lang/Long;)V
+    invoke-virtual {v0, p1, p2, p3}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->handleSkuClicked(JLjava/lang/Long;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2.smali
similarity index 59%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$2.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2.smali
index 38b7e50782..0bb1184d03 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$2;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGifting.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
     const/4 p1, 0x1
 
@@ -51,9 +51,9 @@
 
     check-cast p1, Ljava/lang/String;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$2;->invoke(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,9 +65,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
@@ -117,13 +117,13 @@
     invoke-virtual {v0, v1}, Landroid/content/ClipboardManager;->setPrimaryClip(Landroid/content/ClipData;)V
 
     :cond_2
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    invoke-static {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    invoke-static {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
     move-result-object v0
 
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->handleCopyClicked(Ljava/lang/String;)V
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->handleCopyClicked(Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$3.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3.smali
similarity index 65%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$3.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3.smali
index fc430767e2..b435a721bc 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$3;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGifting.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,18 +28,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$3;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$3;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$3;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$3;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$3;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3;
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelGift;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$3;->invoke(Lcom/discord/models/domain/ModelGift;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3;->invoke(Lcom/discord/models/domain/ModelGift;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$4.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4.smali
similarity index 68%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$4.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4.smali
index 5bb2f86b1b..42298f7984 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$4;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGifting.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,18 +29,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$4;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$4;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$4;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$4;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$4;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4;
 
     return-void
 .end method
@@ -68,9 +68,9 @@
 
     check-cast p2, Ljava/lang/Long;
 
-    invoke-virtual {p0, v0, v1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$4;->invoke(JLjava/lang/Long;)V
+    invoke-virtual {p0, v0, v1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4;->invoke(JLjava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$1.smali
similarity index 60%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$1.smali
index c3d5df00fd..8318b6d7ce 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$1;
 .super Ljava/lang/Object;
 .source "WidgetSettingsGifting.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$1;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$1;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$1;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2.smali
similarity index 50%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$2.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2.smali
index 3736605089..33cd9c5c4c 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$2;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGifting.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
     const/4 p1, 0x1
 
@@ -51,9 +51,9 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$2;->invoke(Landroid/widget/TextView;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2;->invoke(Landroid/widget/TextView;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,9 +65,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->access$getCodeInput$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)Landroidx/appcompat/widget/AppCompatEditText;
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->access$getCodeInput$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)Landroidx/appcompat/widget/AppCompatEditText;
 
     move-result-object p1
 
@@ -89,13 +89,13 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    invoke-static {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    invoke-static {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
     move-result-object v0
 
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->redeemGiftCode(Ljava/lang/String;)V
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->redeemGiftCode(Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$3.smali
new file mode 100644
index 0000000000..0405aa455e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$3.smali
@@ -0,0 +1,47 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$3;
+.super Ljava/lang/Object;
+.source "WidgetSettingsGifting.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$3;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+    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/settings/premium/WidgetSettingsGifting$onViewBound$3;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->access$openWebBilling(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$4.smali
new file mode 100644
index 0000000000..97dc5b99be
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$4.smali
@@ -0,0 +1,47 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$4;
+.super Ljava/lang/Object;
+.source "WidgetSettingsGifting.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$4;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+    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/settings/premium/WidgetSettingsGifting$onViewBound$4;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->access$openWebBilling(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$5.smali
new file mode 100644
index 0000000000..6fe2998149
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$5.smali
@@ -0,0 +1,47 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$5;
+.super Ljava/lang/Object;
+.source "WidgetSettingsGifting.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$5;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+    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/settings/premium/WidgetSettingsGifting$onViewBound$5;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->access$openWebBilling(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$6.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$6.smali
new file mode 100644
index 0000000000..b45d6b431f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$6.smali
@@ -0,0 +1,47 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$6;
+.super Ljava/lang/Object;
+.source "WidgetSettingsGifting.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$6;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+    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/settings/premium/WidgetSettingsGifting$onViewBound$6;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->access$openWebBilling(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$7.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7.smali
similarity index 59%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$7.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7.smali
index 07ca6c9124..3b553d64b8 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$7.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$7;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGifting.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,18 +29,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$7;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$7;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$7;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$7;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$7;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7;
 
     return-void
 .end method
@@ -64,9 +64,9 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$7;->invoke(Landroid/content/Context;Ljava/lang/String;)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7;->invoke(Landroid/content/Context;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -82,7 +82,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+    sget-object p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
     const/4 v0, 0x1
 
@@ -90,7 +90,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p2, p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
+    invoke-virtual {p2, p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$8.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8.smali
similarity index 59%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$8.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8.smali
index bd35315d00..cfe3179e39 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$8.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$8;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGifting.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,18 +29,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$8;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$8;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$8;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$8;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$8;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8;
 
     return-void
 .end method
@@ -64,9 +64,9 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$8;->invoke(Landroid/content/Context;Ljava/lang/String;)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8;->invoke(Landroid/content/Context;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -82,7 +82,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+    sget-object p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
     const/4 v0, 0x0
 
@@ -90,7 +90,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p2, p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
+    invoke-virtual {p2, p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1.smali
new file mode 100644
index 0000000000..0fcf77111b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSettingsGifting.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->onViewBoundOrOnResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(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
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali
similarity index 56%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali
index 9b35c51e9e..e9b24ccbc7 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$2;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGifting.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->onViewBoundOrOnResume()V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->onViewBoundOrOnResume()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,18 +28,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$2;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$2;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$2;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$2;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$2;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2;
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 
     check-cast p1, Ljava/lang/String;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$2;->invoke(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -75,13 +75,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/a/c;->wH:Lcom/discord/a/c$a;
+    sget-object v0, Lcom/discord/dialogs/e;->wR:Lcom/discord/dialogs/e$a;
 
     const-string v0, "Settings - Gifting"
 
     const-wide/16 v1, 0x0
 
-    invoke-static {p1, v0, v1, v2}, Lcom/discord/a/c$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/dialogs/e$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali
similarity index 62%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali
index 9a3fd35b1b..ee8a97b12a 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGifting.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 .super Lcom/discord/app/AppFragment;
 .source "WidgetSettingsGifting.kt"
 
@@ -6,7 +6,7 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion;
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$Companion;
     }
 .end annotation
 
@@ -14,7 +14,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion;
+.field public static final Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$Companion;
 
 .field public static final VIEW_INDEX_FAILURE:I = 0x1
 
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private adapter:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+.field private adapter:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 
 .field private final buyNitroClassicMonthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -52,14 +52,14 @@
 
 .field private final retry$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private viewModel:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+.field private viewModel:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 6
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
     const/16 v1, 0xc
 
@@ -329,15 +329,15 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$Companion;
 
     const/4 v1, 0x0
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$Companion;
 
     return-void
 .end method
@@ -347,164 +347,164 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a06a9
+    const v0, 0x7f0a06c3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a069f
+    const v0, 0x7f0a06b9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06aa
+    const v0, 0x7f0a06c4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->recyclerView$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->recyclerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a0
+    const v0, 0x7f0a06ba
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->codeInput$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->codeInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a2
+    const v0, 0x7f0a06bc
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->codeInputWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->codeInputWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a1
+    const v0, 0x7f0a06bb
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->codeInputProgress$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->codeInputProgress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a8
+    const v0, 0x7f0a06c2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->buyNitroYearly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroYearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a7
+    const v0, 0x7f0a06c1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->buyNitroMonthly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroMonthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a6
+    const v0, 0x7f0a06c0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->nitroLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->nitroLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a5
+    const v0, 0x7f0a06bf
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->buyNitroClassicYearly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroClassicYearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a4
+    const v0, 0x7f0a06be
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->buyNitroClassicMonthly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroClassicMonthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a3
+    const v0, 0x7f0a06bd
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->nitroClassicLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->nitroClassicLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
 
-.method public static final synthetic access$configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
+.method public static final synthetic access$configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$getCodeInput$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)Landroidx/appcompat/widget/AppCompatEditText;
+.method public static final synthetic access$getCodeInput$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)Landroidx/appcompat/widget/AppCompatEditText;
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getCodeInput()Landroidx/appcompat/widget/AppCompatEditText;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getCodeInput()Landroidx/appcompat/widget/AppCompatEditText;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->viewModel:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->viewModel:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
     if-nez p0, :cond_0
 
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
 .end method
 
-.method public static final synthetic access$openWebBilling(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+.method public static final synthetic access$openWebBilling(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->openWebBilling(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->openWebBilling(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;)V
+.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->viewModel:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->viewModel:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
     return-void
 .end method
 
-.method private final configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
+.method private final configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
     .locals 10
 
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object p1
 
@@ -513,11 +513,11 @@
     return-void
 
     :cond_0
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Failure;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Failure;
 
     if-eqz v0, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object p1
 
@@ -528,40 +528,40 @@
     return-void
 
     :cond_1
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     const/4 v2, 0x2
 
     if-eqz v0, :cond_2
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v0
 
     invoke-virtual {v0, v2}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
     :cond_2
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getResolvingGiftState()Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getResolvingGiftState()Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
     move-result-object v0
 
-    instance-of v0, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
+    instance-of v0, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getResolvingGiftState()Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getResolvingGiftState()Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
     move-result-object v3
 
-    instance-of v3, v3, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;
+    instance-of v3, v3, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;
 
     const/4 v4, 0x0
 
     if-eqz v3, :cond_3
 
-    const v3, 0x7f1200f6
+    const v3, 0x7f1200f9
 
-    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
@@ -571,13 +571,13 @@
     move-object v3, v4
 
     :goto_0
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getCodeInputProgress()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getCodeInputProgress()Landroid/view/View;
 
     move-result-object v5
 
     invoke-static {v5, v0, v1, v2, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getCodeInput()Landroidx/appcompat/widget/AppCompatEditText;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getCodeInput()Landroidx/appcompat/widget/AppCompatEditText;
 
     move-result-object v5
 
@@ -589,7 +589,7 @@
 
     invoke-static {v5, v6, v7, v2, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getCodeInput()Landroidx/appcompat/widget/AppCompatEditText;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getCodeInput()Landroidx/appcompat/widget/AppCompatEditText;
 
     move-result-object v2
 
@@ -603,7 +603,7 @@
     :goto_1
     invoke-virtual {v2, v1}, Landroidx/appcompat/widget/AppCompatEditText;->setInputType(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getCodeInputWrap()Lcom/google/android/material/textfield/TextInputLayout;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getCodeInputWrap()Lcom/google/android/material/textfield/TextInputLayout;
 
     move-result-object v0
 
@@ -611,61 +611,61 @@
 
     invoke-virtual {v0, v3}, Lcom/google/android/material/textfield/TextInputLayout;->setError(Ljava/lang/CharSequence;)V
 
-    iget-object v4, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->adapter:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+    iget-object v4, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->adapter:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 
     if-nez v4, :cond_5
 
     const-string v0, "adapter"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_5
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->generateListItems(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;)Ljava/util/List;
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->generateListItems(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;)Ljava/util/List;
 
     move-result-object v5
 
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$1;
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1;
 
-    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
+    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
 
     move-object v6, p1
 
     check-cast v6, Lkotlin/jvm/functions/Function2;
 
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$2;
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2;
 
-    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$2;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
+    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
 
     move-object v7, p1
 
     check-cast v7, Lkotlin/jvm/functions/Function1;
 
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$3;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$3;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3;
 
     move-object v8, p1
 
     check-cast v8, Lkotlin/jvm/functions/Function1;
 
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$4;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$configureUI$4;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4;
 
     move-object v9, p1
 
     check-cast v9, Lkotlin/jvm/functions/Function2;
 
-    invoke-virtual/range {v4 .. v9}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->configure(Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)V
+    invoke-virtual/range {v4 .. v9}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->configure(Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)V
 
     return-void
 .end method
 
-.method private final generateListItems(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;)Ljava/util/List;
+.method private final generateListItems(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;)Ljava/util/List;
     .locals 31
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;",
             ")",
             "Ljava/util/List<",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;",
             ">;"
         }
     .end annotation
@@ -676,7 +676,7 @@
 
     check-cast v0, Ljava/util/List;
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyEntitlements()Ljava/util/Map;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyEntitlements()Ljava/util/Map;
 
     move-result-object v1
 
@@ -686,7 +686,7 @@
 
     if-eqz v1, :cond_0
 
-    new-instance v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+    new-instance v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
 
     const/4 v3, 0x0
 
@@ -712,14 +712,14 @@
 
     move-object v2, v1
 
-    invoke-direct/range {v2 .. v13}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;-><init>(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v2 .. v13}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;-><init>(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     goto/16 :goto_b
 
     :cond_0
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyEntitlements()Ljava/util/Map;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyEntitlements()Ljava/util/Map;
 
     move-result-object v1
 
@@ -750,7 +750,7 @@
 
     move-result-wide v2
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyEntitlements()Ljava/util/Map;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyEntitlements()Ljava/util/Map;
 
     move-result-object v4
 
@@ -786,7 +786,7 @@
     const/4 v10, 0x0
 
     :goto_0
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getExpandedSkuIds()Ljava/util/Set;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getExpandedSkuIds()Ljava/util/Set;
 
     move-result-object v4
 
@@ -812,7 +812,7 @@
 
     move-result v4
 
-    new-instance v15, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+    new-instance v15, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
 
     const/4 v6, 0x1
 
@@ -864,7 +864,7 @@
 
     move-object/from16 v16, v18
 
-    invoke-direct/range {v5 .. v16}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;-><init>(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v5 .. v16}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;-><init>(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     invoke-interface {v0, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -897,14 +897,14 @@
 
     if-gez v5, :cond_5
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_5
     move-object/from16 v22, v7
 
     check-cast v22, Lcom/discord/models/domain/ModelEntitlement;
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyGifts()Ljava/util/Map;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyGifts()Ljava/util/Map;
 
     move-result-object v7
 
@@ -969,7 +969,7 @@
 
     :cond_a
     :goto_7
-    new-instance v7, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+    new-instance v7, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
 
     const/16 v20, 0x2
 
@@ -1027,7 +1027,7 @@
 
     move-result-object v5
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getLastCopiedCode()Ljava/lang/String;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getLastCopiedCode()Ljava/lang/String;
 
     move-result-object v9
 
@@ -1057,7 +1057,7 @@
 
     move-object/from16 v19, v7
 
-    invoke-direct/range {v19 .. v30}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;-><init>(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v19 .. v30}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;-><init>(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     invoke-interface {v0, v7}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -1071,9 +1071,9 @@
 .method private final getBuyNitroClassicMonthly()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->buyNitroClassicMonthly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroClassicMonthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0xa
 
@@ -1091,9 +1091,9 @@
 .method private final getBuyNitroClassicYearly()Lcom/discord/views/BoxedButton;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->buyNitroClassicYearly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroClassicYearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0x9
 
@@ -1111,9 +1111,9 @@
 .method private final getBuyNitroMonthly()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->buyNitroMonthly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroMonthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x7
 
@@ -1131,9 +1131,9 @@
 .method private final getBuyNitroYearly()Lcom/discord/views/BoxedButton;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->buyNitroYearly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroYearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x6
 
@@ -1151,9 +1151,9 @@
 .method private final getCodeInput()Landroidx/appcompat/widget/AppCompatEditText;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->codeInput$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->codeInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x3
 
@@ -1171,9 +1171,9 @@
 .method private final getCodeInputProgress()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->codeInputProgress$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->codeInputProgress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x5
 
@@ -1191,9 +1191,9 @@
 .method private final getCodeInputWrap()Lcom/google/android/material/textfield/TextInputLayout;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->codeInputWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->codeInputWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x4
 
@@ -1211,9 +1211,9 @@
 .method private final getFlipper()Lcom/discord/app/AppViewFlipper;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -1231,9 +1231,9 @@
 .method private final getNitroClassicLearnMore()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->nitroClassicLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->nitroClassicLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0xb
 
@@ -1251,9 +1251,9 @@
 .method private final getNitroLearnMore()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->nitroLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->nitroLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0x8
 
@@ -1271,9 +1271,9 @@
 .method private final getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->recyclerView$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->recyclerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -1291,9 +1291,9 @@
 .method private final getRetry()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -1311,9 +1311,9 @@
 .method public static final launch(Landroid/content/Context;)V
     .locals 1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$Companion;
 
-    invoke-virtual {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$Companion;->launch(Landroid/content/Context;)V
+    invoke-virtual {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$Companion;->launch(Landroid/content/Context;)V
 
     return-void
 .end method
@@ -1341,7 +1341,7 @@
 
     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/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+    sget-object v0, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
     move-object v1, p0
 
@@ -1349,7 +1349,7 @@
 
     const/4 v2, 0x1
 
-    invoke-virtual {v0, v1, p1, v8, v2}, Lcom/discord/utilities/nitro/NitroUtils;->openWebPurchasePremium(Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;Z)V
+    invoke-virtual {v0, v1, p1, v8, v2}, Lcom/discord/utilities/premium/PremiumUtils;->openWebPurchasePremium(Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;Z)V
 
     return-void
 .end method
@@ -1359,7 +1359,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a9
+    const v0, 0x7f0d01b3
 
     return v0
 .end method
@@ -1367,11 +1367,11 @@
 .method public final onPause()V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->connection:Landroid/content/ServiceConnection;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->connection:Landroid/content/ServiceConnection;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
 
     move-result-object v1
 
@@ -1380,7 +1380,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->connection:Landroid/content/ServiceConnection;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->connection:Landroid/content/ServiceConnection;
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onPause()V
 
@@ -1392,9 +1392,9 @@
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onResume()V
 
-    sget-object v0, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+    sget-object v0, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
 
     move-result-object v1
 
@@ -1402,13 +1402,13 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/nitro/NitroUtils;->warmupBillingTabs(Landroid/content/Context;)Landroidx/browser/customtabs/CustomTabsServiceConnection;
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/premium/PremiumUtils;->warmupBillingTabs(Landroid/content/Context;)Landroidx/browser/customtabs/CustomTabsServiceConnection;
 
     move-result-object v0
 
     check-cast v0, Landroid/content/ServiceConnection;
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->connection:Landroid/content/ServiceConnection;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->connection:Landroid/content/ServiceConnection;
 
     return-void
 .end method
@@ -1430,25 +1430,25 @@
 
     invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getRetry()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getRetry()Landroid/view/View;
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$1;
+    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$1;
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {v1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getCodeInput()Landroidx/appcompat/widget/AppCompatEditText;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getCodeInput()Landroidx/appcompat/widget/AppCompatEditText;
 
     move-result-object v1
 
     check-cast v1, Landroid/widget/EditText;
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$2;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$2;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
+    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
 
     check-cast v2, Lkotlin/jvm/functions/Function1;
 
@@ -1456,15 +1456,15 @@
 
     invoke-static {v1, v0, v2, v3, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnImeActionDone$default(Landroid/widget/EditText;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getCodeInputWrap()Lcom/google/android/material/textfield/TextInputLayout;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getCodeInputWrap()Lcom/google/android/material/textfield/TextInputLayout;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
 
     move-result-object v2
 
-    const v4, 0x7f06011b
+    const v4, 0x7f06011d
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -1476,7 +1476,7 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/material/textfield/TextInputLayout;->setErrorTextColor(Landroid/content/res/ColorStateList;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getBuyNitroYearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getBuyNitroYearly()Lcom/discord/views/BoxedButton;
 
     move-result-object v1
 
@@ -1488,7 +1488,7 @@
 
     move-result v4
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
 
     move-result-object v5
 
@@ -1502,27 +1502,27 @@
 
     aput-object v4, v2, v0
 
-    const v4, 0x7f1202f0
+    const v4, 0x7f1202f4
 
-    invoke-virtual {p0, v4, v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v4, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
     invoke-virtual {v1, v2}, Lcom/discord/views/BoxedButton;->setText(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getBuyNitroYearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getBuyNitroYearly()Lcom/discord/views/BoxedButton;
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$3;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$3;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$3;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
+    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$3;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {v1, v2}, Lcom/discord/views/BoxedButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getBuyNitroMonthly()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getBuyNitroMonthly()Landroid/widget/Button;
 
     move-result-object v1
 
@@ -1534,7 +1534,7 @@
 
     move-result v5
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
 
     move-result-object v7
 
@@ -1546,9 +1546,9 @@
 
     aput-object v5, v2, v0
 
-    const v5, 0x7f1202ee
+    const v5, 0x7f1202f2
 
-    invoke-virtual {p0, v5, v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v5, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -1556,19 +1556,19 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getBuyNitroMonthly()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getBuyNitroMonthly()Landroid/widget/Button;
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$4;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$4;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$4;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
+    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$4;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getBuyNitroClassicYearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getBuyNitroClassicYearly()Lcom/discord/views/BoxedButton;
 
     move-result-object v1
 
@@ -1580,7 +1580,7 @@
 
     move-result v7
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
 
     move-result-object v8
 
@@ -1592,25 +1592,25 @@
 
     aput-object v7, v2, v0
 
-    invoke-virtual {p0, v4, v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v4, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
     invoke-virtual {v1, v2}, Lcom/discord/views/BoxedButton;->setText(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getBuyNitroClassicYearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getBuyNitroClassicYearly()Lcom/discord/views/BoxedButton;
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$5;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$5;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$5;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
+    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$5;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {v1, v2}, Lcom/discord/views/BoxedButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getBuyNitroClassicMonthly()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getBuyNitroClassicMonthly()Landroid/widget/Button;
 
     move-result-object v1
 
@@ -1622,7 +1622,7 @@
 
     move-result v3
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
 
     move-result-object v4
 
@@ -1634,7 +1634,7 @@
 
     aput-object v3, v2, v0
 
-    invoke-virtual {p0, v5, v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v5, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -1642,31 +1642,31 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getBuyNitroClassicMonthly()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getBuyNitroClassicMonthly()Landroid/widget/Button;
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$6;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$6;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$6;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
+    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$6;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getNitroLearnMore()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getNitroLearnMore()Landroid/widget/TextView;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
 
     move-result-object v2
 
     invoke-static {v2, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f120e0d
+    const v3, 0x7f120e44
 
-    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
@@ -1684,7 +1684,7 @@
 
     check-cast v3, Ljava/lang/CharSequence;
 
-    sget-object v8, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$7;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$7;
+    sget-object v8, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7;
 
     check-cast v8, Lkotlin/jvm/functions/Function2;
 
@@ -1694,19 +1694,19 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getNitroClassicLearnMore()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getNitroClassicLearnMore()Landroid/widget/TextView;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->requireContext()Landroid/content/Context;
 
     move-result-object v2
 
     invoke-static {v2, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f120d86
+    const v3, 0x7f120dc6
 
-    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
@@ -1718,7 +1718,7 @@
 
     check-cast v3, Ljava/lang/CharSequence;
 
-    sget-object v4, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$8;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBound$8;
+    sget-object v4, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8;
 
     check-cast v4, Lkotlin/jvm/functions/Function2;
 
@@ -1730,13 +1730,13 @@
 
     sget-object v1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object v3
 
-    invoke-direct {v2, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    invoke-direct {v2, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     check-cast v2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
@@ -1744,17 +1744,17 @@
 
     move-result-object v1
 
-    check-cast v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+    check-cast v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 
-    iput-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->adapter:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+    iput-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->adapter:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object v1
 
     invoke-virtual {v1, p1}, Landroidx/recyclerview/widget/RecyclerView;->setItemAnimator(Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object p1
 
@@ -1768,7 +1768,7 @@
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object v0
 
@@ -1776,7 +1776,7 @@
 
     move-result-object v0
 
-    const-class v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
     invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
@@ -1786,24 +1786,24 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->viewModel:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->viewModel:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->viewModel:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->viewModel:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
     const-string v1, "viewModel"
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->getViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->getViewState()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -1835,9 +1835,9 @@
 
     const/4 v10, 0x0
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
 
     move-object v11, v0
 
@@ -1849,18 +1849,18 @@
 
     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
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting;->viewModel:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->viewModel:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
     if-nez v0, :cond_1
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$2;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGifting$onViewBoundOrOnResume$2;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2;
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->setOnGiftCodeResolved(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->setOnGiftCodeResolved(Lkotlin/jvm/functions/Function1;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion.smali
similarity index 61%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion.smali
index 5afba010af..4278ae423f 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;
 .super Ljava/lang/Object;
 .source "WidgetSettingsGiftingAdapter.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3.smali
new file mode 100644
index 0000000000..56f4e6365f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3.smali
@@ -0,0 +1,67 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;
+.super Ljava/lang/Object;
+.source "WidgetSettingsGiftingAdapter.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
+
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;->$data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+    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/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->access$getAdapter$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->access$getOnClickCopyListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function1;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;->$data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getGift()Lcom/discord/models/domain/ModelGift;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGift;->getCode()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4.smali
new file mode 100644
index 0000000000..c379c3a52b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4.smali
@@ -0,0 +1,98 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSettingsGiftingAdapter.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Landroid/content/Context;",
+        "Ljava/lang/String;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
+
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;->$data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+    const/4 p1, 0x2
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroid/content/Context;
+
+    check-cast p2, Ljava/lang/String;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;->invoke(Landroid/content/Context;Ljava/lang/String;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Landroid/content/Context;Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "<anonymous parameter 1>"
+
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/k;->h(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;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->access$getAdapter$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->access$getOnRevokeClickListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function1;
+
+    move-result-object p1
+
+    iget-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;->$data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getGift()Lcom/discord/models/domain/ModelGift;
+
+    move-result-object p2
+
+    invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5.smali
new file mode 100644
index 0000000000..e2134a8257
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5.smali
@@ -0,0 +1,97 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;
+.super Ljava/lang/Object;
+.source "WidgetSettingsGiftingAdapter.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
+
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;->$data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 3
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->access$getAdapter$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->access$getOnGenerateClickListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function2;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;->$data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getEntitlement()Lcom/discord/models/domain/ModelEntitlement;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelEntitlement;->getSkuId()J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;->$data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getEntitlement()Lcom/discord/models/domain/ModelEntitlement;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelEntitlement;->getSubscriptionPlan()Lcom/discord/models/domain/ModelSubscriptionPlan;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getId()J
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    invoke-interface {p1, v0, v1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
similarity index 63%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
index 08b5c0e906..c1d2510939 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 .source "WidgetSettingsGiftingAdapter.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,15 +15,15 @@
 
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;
     }
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;",
         ">;"
     }
 .end annotation
@@ -32,7 +32,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;
+.field public static final Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;
 
 .field private static final VIEW_INDEX_CODE:I = 0x0
 
@@ -61,7 +61,7 @@
 .method static constructor <clinit>()V
     .locals 6
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
 
     const/16 v1, 0x8
 
@@ -243,20 +243,20 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;
 
     const/4 v1, 0x0
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$Companion;
 
     return-void
 .end method
 
-.method public constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)V
+.method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)V
     .locals 1
 
     const-string v0, "adapter"
@@ -265,49 +265,17 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0087
+    const v0, 0x7f0d008e
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0315
+    const p1, 0x7f0a031a
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0312
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0310
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->code$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0311
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->codeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0313
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->copy$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a0317
 
@@ -315,7 +283,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->revokeText$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0315
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->code$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a0316
 
@@ -323,25 +299,49 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->generate$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->codeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0314
+    const p1, 0x7f0a0318
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->divider$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->copy$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a031c
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->revokeText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a031b
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->generate$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0319
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->divider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
 
-.method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+.method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    check-cast p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+    check-cast p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 
     return-object p0
 .end method
@@ -349,9 +349,9 @@
 .method private final getCode()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->code$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->code$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -369,9 +369,9 @@
 .method private final getCodeContainer()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->codeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->codeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x3
 
@@ -389,9 +389,9 @@
 .method private final getContainer()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -409,9 +409,9 @@
 .method private final getCopy()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->copy$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->copy$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x4
 
@@ -429,9 +429,9 @@
 .method private final getDivider()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->divider$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->divider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x7
 
@@ -449,9 +449,9 @@
 .method private final getFlipper()Lcom/discord/app/AppViewFlipper;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -469,9 +469,9 @@
 .method private final getGenerate()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->generate$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->generate$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x6
 
@@ -489,9 +489,9 @@
 .method private final getRevokeText()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->revokeText$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->revokeText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x5
 
@@ -508,7 +508,7 @@
 
 
 # virtual methods
-.method protected final onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
+.method protected final onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
     .locals 12
 
     const-string v0, "data"
@@ -517,7 +517,7 @@
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getExpanded()Ljava/lang/Boolean;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getExpanded()Ljava/lang/Boolean;
 
     move-result-object p1
 
@@ -533,11 +533,11 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
+    iget-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
 
     invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -552,11 +552,11 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
 
     invoke-static {v2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -570,7 +570,7 @@
 
     invoke-virtual {p1, v2}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -578,13 +578,13 @@
 
     move-result-object v2
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getEntitlement()Lcom/discord/models/domain/ModelEntitlement;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getEntitlement()Lcom/discord/models/domain/ModelEntitlement;
 
     move-result-object p1
 
     if-eqz p1, :cond_7
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem()Ljava/lang/Boolean;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem()Ljava/lang/Boolean;
 
     move-result-object p1
 
@@ -593,7 +593,7 @@
     goto/16 :goto_4
 
     :cond_1
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getGift()Lcom/discord/models/domain/ModelGift;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getGift()Lcom/discord/models/domain/ModelGift;
 
     move-result-object p1
 
@@ -605,13 +605,13 @@
 
     if-eqz p1, :cond_5
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object p1
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getWasCopied()Ljava/lang/Boolean;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getWasCopied()Ljava/lang/Boolean;
 
     move-result-object p1
 
@@ -621,27 +621,27 @@
 
     move-result p1
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCopy()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCopy()Landroid/widget/TextView;
 
     move-result-object v3
 
     if-eqz p1, :cond_2
 
-    const v4, 0x7f080099
+    const v4, 0x7f08009c
 
     goto :goto_0
 
     :cond_2
-    const v4, 0x7f080098
+    const v4, 0x7f08009b
 
     :goto_0
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setBackgroundResource(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCopy()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCopy()Landroid/widget/TextView;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
+    iget-object v4, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
 
     invoke-static {v4, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -651,12 +651,12 @@
 
     if-eqz p1, :cond_3
 
-    const v5, 0x7f120443
+    const v5, 0x7f12044c
 
     goto :goto_1
 
     :cond_3
-    const v5, 0x7f120445
+    const v5, 0x7f12044e
 
     :goto_1
     invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -667,7 +667,7 @@
 
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCodeContainer()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCodeContainer()Landroid/view/View;
 
     move-result-object v3
 
@@ -677,7 +677,7 @@
 
     invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p1, 0x7f04014b
+    const p1, 0x7f04014d
 
     invoke-static {v2, p1, v0, v10, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
@@ -688,7 +688,7 @@
     :cond_4
     invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p1, 0x7f0402ab
+    const p1, 0x7f0402ae
 
     invoke-static {v2, p1, v0, v10, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
@@ -697,13 +697,13 @@
     :goto_2
     invoke-virtual {v3, p1}, Landroid/view/View;->setBackgroundResource(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCopy()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCopy()Landroid/widget/TextView;
 
     move-result-object p1
 
-    new-instance v3, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;
+    new-instance v3, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;
 
-    invoke-direct {v3, p0, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/nitro/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
 
     check-cast v3, Landroid/view/View$OnClickListener;
 
@@ -711,7 +711,7 @@
 
     sget-object p1, Lcom/discord/utilities/gifting/GiftingUtils;->INSTANCE:Lcom/discord/utilities/gifting/GiftingUtils;
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getGift()Lcom/discord/models/domain/ModelGift;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getGift()Lcom/discord/models/domain/ModelGift;
 
     move-result-object v3
 
@@ -735,7 +735,7 @@
 
     move-result-object p1
 
-    iget-object v3, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
+    iget-object v3, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
 
     invoke-static {v3, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -743,7 +743,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f12078a
+    const v4, 0x7f1207a5
 
     new-array v5, v8, [Ljava/lang/Object;
 
@@ -773,7 +773,7 @@
 
     move-result-object p1
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->getRevokeText()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getRevokeText()Landroid/widget/TextView;
 
     move-result-object v11
 
@@ -781,9 +781,9 @@
 
     check-cast v3, Ljava/lang/CharSequence;
 
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;
 
-    invoke-direct {p1, p0, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
+    invoke-direct {p1, 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
 
     move-object v4, p1
 
@@ -801,13 +801,13 @@
 
     invoke-virtual {v11, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCode()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCode()Landroid/widget/TextView;
 
     move-result-object p1
 
     sget-object v2, Lcom/discord/utilities/gifting/GiftingUtils;->INSTANCE:Lcom/discord/utilities/gifting/GiftingUtils;
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getGift()Lcom/discord/models/domain/ModelGift;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getGift()Lcom/discord/models/domain/ModelGift;
 
     move-result-object v3
 
@@ -826,30 +826,30 @@
     goto :goto_3
 
     :cond_5
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object p1
 
     invoke-virtual {p1, v8}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->getGenerate()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getGenerate()Landroid/view/View;
 
     move-result-object p1
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;
 
-    invoke-direct {v2, p0, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/nitro/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
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :goto_3
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->getDivider()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getDivider()Landroid/view/View;
 
     move-result-object p1
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem()Ljava/lang/Boolean;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem()Ljava/lang/Boolean;
 
     move-result-object v2
 
@@ -861,7 +861,7 @@
 
     invoke-static {p1, v2, v0, v10, v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem()Ljava/lang/Boolean;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem()Ljava/lang/Boolean;
 
     move-result-object p1
 
@@ -871,11 +871,11 @@
 
     if-eqz p1, :cond_6
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->getContainer()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getContainer()Landroid/view/View;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
+    iget-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
 
     invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -887,7 +887,7 @@
 
     invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0402a8
+    const v1, 0x7f0402ab
 
     invoke-static {p2, v1, v0, v10, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
@@ -898,11 +898,11 @@
     return-void
 
     :cond_6
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->getContainer()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getContainer()Landroid/view/View;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
+    iget-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->itemView:Landroid/view/View;
 
     invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -910,7 +910,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f0402a6
+    const v0, 0x7f0402a9
 
     invoke-static {p2, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -926,9 +926,9 @@
 .method public final bridge synthetic onConfigure(ILjava/lang/Object;)V
     .locals 0
 
-    check-cast p2, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+    check-cast p2, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;->onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem$Companion.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem$Companion.smali
similarity index 63%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem$Companion.smali
index c1672ea4df..b24cd67928 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem$Companion;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem$Companion;
 .super Ljava/lang/Object;
 .source "WidgetSettingsGiftingAdapter.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem$Companion;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem.smali
similarity index 56%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem.smali
index d3ef000327..7cb9085985 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
 .super Ljava/lang/Object;
 .source "WidgetSettingsGiftingAdapter.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,13 +18,13 @@
 
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem$Companion;
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem$Companion;
     }
 .end annotation
 
 
 # static fields
-.field public static final Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem$Companion;
+.field public static final Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem$Companion;
 
 .field public static final TYPE_GIFT:I = 0x2
 
@@ -57,13 +57,13 @@
 .method static constructor <clinit>()V
     .locals 2
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem$Companion;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem$Companion;
 
     const/4 v1, 0x0
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem$Companion;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem$Companion;
 
     return-void
 .end method
@@ -73,23 +73,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
+    iput p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
 
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
 
-    iput-object p3, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
+    iput-object p3, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
 
-    iput-object p4, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
+    iput-object p4, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
 
-    iput-object p5, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
+    iput-object p5, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
 
-    iput-object p6, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
+    iput-object p6, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
 
-    iput-object p7, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
+    iput-object p7, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
 
-    iput-object p8, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
+    iput-object p8, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
 
-    iput-object p9, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
+    iput-object p9, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
 
     return-void
 .end method
@@ -215,12 +215,12 @@
 
     move-object/from16 p11, v2
 
-    invoke-direct/range {p2 .. p11}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;-><init>(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;)V
+    invoke-direct/range {p2 .. p11}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;-><init>(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;)V
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+.method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
     .locals 10
 
     move-object v0, p0
@@ -231,7 +231,7 @@
 
     if-eqz v2, :cond_0
 
-    iget v2, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
+    iget v2, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
 
     goto :goto_0
 
@@ -243,7 +243,7 @@
 
     if-eqz v3, :cond_1
 
-    iget-object v3, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
+    iget-object v3, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
 
     goto :goto_1
 
@@ -255,7 +255,7 @@
 
     if-eqz v4, :cond_2
 
-    iget-object v4, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
+    iget-object v4, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
 
     goto :goto_2
 
@@ -267,7 +267,7 @@
 
     if-eqz v5, :cond_3
 
-    iget-object v5, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
+    iget-object v5, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
 
     goto :goto_3
 
@@ -279,7 +279,7 @@
 
     if-eqz v6, :cond_4
 
-    iget-object v6, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
+    iget-object v6, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
 
     goto :goto_4
 
@@ -291,7 +291,7 @@
 
     if-eqz v7, :cond_5
 
-    iget-object v7, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
+    iget-object v7, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
 
     goto :goto_5
 
@@ -303,7 +303,7 @@
 
     if-eqz v8, :cond_6
 
-    iget-object v8, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
+    iget-object v8, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
 
     goto :goto_6
 
@@ -315,7 +315,7 @@
 
     if-eqz v9, :cond_7
 
-    iget-object v9, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
+    iget-object v9, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
 
     goto :goto_7
 
@@ -327,7 +327,7 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v1, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
+    iget-object v1, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
 
     goto :goto_8
 
@@ -353,7 +353,7 @@
 
     move-object/from16 p9, v1
 
-    invoke-virtual/range {p0 .. p9}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->copy(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+    invoke-virtual/range {p0 .. p9}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->copy(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
 
     move-result-object v0
 
@@ -365,7 +365,7 @@
 .method public final component1()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
+    iget v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
 
     return v0
 .end method
@@ -373,7 +373,7 @@
 .method public final component2()Lcom/discord/models/domain/ModelGift;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
 
     return-object v0
 .end method
@@ -381,7 +381,7 @@
 .method public final component3()Lcom/discord/models/domain/ModelEntitlement;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
 
     return-object v0
 .end method
@@ -389,7 +389,7 @@
 .method public final component4()Ljava/lang/Boolean;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
 
     return-object v0
 .end method
@@ -397,7 +397,7 @@
 .method public final component5()Lcom/discord/models/domain/ModelSku;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
 
     return-object v0
 .end method
@@ -405,7 +405,7 @@
 .method public final component6()Ljava/lang/Integer;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
 
     return-object v0
 .end method
@@ -413,7 +413,7 @@
 .method public final component7()Ljava/lang/Long;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
 
     return-object v0
 .end method
@@ -421,7 +421,7 @@
 .method public final component8()Ljava/lang/Boolean;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
 
     return-object v0
 .end method
@@ -429,15 +429,15 @@
 .method public final component9()Ljava/lang/Boolean;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
 
     return-object v0
 .end method
 
-.method public final copy(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+.method public final copy(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
     .locals 11
 
-    new-instance v10, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+    new-instance v10, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
 
     move-object v0, v10
 
@@ -459,7 +459,7 @@
 
     move-object/from16 v9, p9
 
-    invoke-direct/range {v0 .. v9}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;-><init>(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;)V
+    invoke-direct/range {v0 .. v9}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;-><init>(ILcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelEntitlement;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelSku;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;)V
 
     return-object v10
 .end method
@@ -471,17 +471,17 @@
 
     if-eq p0, p1, :cond_2
 
-    instance-of v1, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+    instance-of v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_1
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
 
-    iget v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
+    iget v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
 
-    iget v3, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
+    iget v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
 
     if-ne v1, v3, :cond_0
 
@@ -495,9 +495,9 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
 
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -505,9 +505,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
 
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -515,9 +515,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
 
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -525,9 +525,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
 
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -535,9 +535,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
 
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -545,9 +545,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
 
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -555,9 +555,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
 
-    iget-object v3, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -565,9 +565,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
 
-    iget-object p1, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
+    iget-object p1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -588,7 +588,7 @@
 .method public final getCopies()Ljava/lang/Integer;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
 
     return-object v0
 .end method
@@ -596,7 +596,7 @@
 .method public final getEntitlement()Lcom/discord/models/domain/ModelEntitlement;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
 
     return-object v0
 .end method
@@ -604,7 +604,7 @@
 .method public final getExpanded()Ljava/lang/Boolean;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
 
     return-object v0
 .end method
@@ -612,7 +612,7 @@
 .method public final getGift()Lcom/discord/models/domain/ModelGift;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
 
     return-object v0
 .end method
@@ -620,7 +620,7 @@
 .method public final getKey()Ljava/lang/String;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getType()I
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getType()I
 
     move-result v0
 
@@ -641,7 +641,7 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
 
     if-eqz v0, :cond_1
 
@@ -661,7 +661,7 @@
     return-object v0
 
     :cond_2
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
 
     if-eqz v0, :cond_3
 
@@ -687,7 +687,7 @@
 .method public final getPlanId()Ljava/lang/Long;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
 
     return-object v0
 .end method
@@ -695,7 +695,7 @@
 .method public final getSku()Lcom/discord/models/domain/ModelSku;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
 
     return-object v0
 .end method
@@ -703,7 +703,7 @@
 .method public final getType()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
+    iget v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
 
     return v0
 .end method
@@ -711,7 +711,7 @@
 .method public final getTypeInt()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
+    iget v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
 
     return v0
 .end method
@@ -719,7 +719,7 @@
 .method public final getWasCopied()Ljava/lang/Boolean;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
 
     return-object v0
 .end method
@@ -727,11 +727,15 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
+    iget v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
+
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
 
     const/4 v2, 0x0
 
@@ -751,7 +755,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
 
     if-eqz v1, :cond_1
 
@@ -769,7 +773,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_2
 
@@ -787,7 +791,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
 
     if-eqz v1, :cond_3
 
@@ -805,7 +809,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
 
     if-eqz v1, :cond_4
 
@@ -823,7 +827,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
 
     if-eqz v1, :cond_5
 
@@ -841,7 +845,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_6
 
@@ -859,7 +863,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_7
 
@@ -876,7 +880,7 @@
 .method public final isLastItem()Ljava/lang/Boolean;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
 
     return-object v0
 .end method
@@ -890,7 +894,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
+    iget v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->typeInt:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -898,7 +902,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -906,7 +910,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -914,7 +918,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -922,7 +926,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -930,7 +934,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -938,7 +942,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -946,7 +950,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -954,7 +958,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali
similarity index 69%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali
index 00a8b283f0..fa02b99e47 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$NoGiftsListItem;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 .source "WidgetSettingsGiftingAdapter.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -16,15 +16,15 @@
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;",
         ">;"
     }
 .end annotation
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)V
+.method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)V
     .locals 1
 
     const-string v0, "adapter"
@@ -33,7 +33,7 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0094
+    const v0, 0x7f0d009c
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1.smali
new file mode 100644
index 0000000000..22f0d43044
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1.smali
@@ -0,0 +1,77 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;
+.super Ljava/lang/Object;
+.source "WidgetSettingsGiftingAdapter.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;
+
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;->$data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 2
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->access$getAdapter$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->access$getOnClickSkuListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function2;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;->$data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSku;->getId()J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;->$data:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getPlanId()Ljava/lang/Long;
+
+    move-result-object v1
+
+    invoke-interface {p1, v0, v1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem.smali
similarity index 60%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem.smali
index 3fd29bec10..59f439137f 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 .source "WidgetSettingsGiftingAdapter.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -16,8 +16,8 @@
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;",
         ">;"
     }
 .end annotation
@@ -41,7 +41,7 @@
 .method static constructor <clinit>()V
     .locals 6
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;
 
     const/4 v1, 0x4
 
@@ -135,12 +135,12 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     return-void
 .end method
 
-.method public constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)V
+.method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)V
     .locals 1
 
     const-string v0, "adapter"
@@ -149,51 +149,51 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0088
+    const v0, 0x7f0d008f
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a031a
+    const p1, 0x7f0a031f
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a031b
+    const p1, 0x7f0a0320
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0319
+    const p1, 0x7f0a031e
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->copies$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->copies$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0318
+    const p1, 0x7f0a031d
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->arrow$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->arrow$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
 
-.method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+.method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    check-cast p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+    check-cast p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 
     return-object p0
 .end method
@@ -201,9 +201,9 @@
 .method private final getArrow()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->arrow$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->arrow$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x3
 
@@ -221,9 +221,9 @@
 .method private final getCopies()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->copies$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->copies$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -241,9 +241,9 @@
 .method private final getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -261,9 +261,9 @@
 .method private final getName()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -280,7 +280,7 @@
 
 
 # virtual methods
-.method protected final onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
+.method protected final onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
     .locals 7
 
     const-string v0, "data"
@@ -289,19 +289,19 @@
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
 
     move-result-object p1
 
     if-eqz p1, :cond_4
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getCopies()Ljava/lang/Integer;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getCopies()Ljava/lang/Integer;
 
     move-result-object p1
 
     if-eqz p1, :cond_4
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getExpanded()Ljava/lang/Boolean;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getExpanded()Ljava/lang/Boolean;
 
     move-result-object p1
 
@@ -310,11 +310,11 @@
     goto/16 :goto_3
 
     :cond_0
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->getName()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->getName()Landroid/widget/TextView;
 
     move-result-object p1
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
 
     move-result-object v0
 
@@ -326,11 +326,11 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->getCopies()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->getCopies()Landroid/widget/TextView;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->itemView:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->itemView:Landroid/view/View;
 
     const-string v1, "itemView"
 
@@ -350,7 +350,7 @@
 
     const v1, 0x7f100056
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getCopies()Ljava/lang/Integer;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getCopies()Ljava/lang/Integer;
 
     move-result-object v2
 
@@ -364,7 +364,7 @@
 
     const/4 v4, 0x0
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getCopies()Ljava/lang/Integer;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getCopies()Ljava/lang/Integer;
 
     move-result-object v5
 
@@ -378,11 +378,11 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->getArrow()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->getArrow()Landroid/widget/ImageView;
 
     move-result-object p1
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getExpanded()Ljava/lang/Boolean;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getExpanded()Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -392,39 +392,39 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f080229
+    const v0, 0x7f080238
 
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f08022d
+    const v0, 0x7f08023d
 
     :goto_0
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    sget-object p1, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+    sget-object p1, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
 
     move-result-object v0
 
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/nitro/NitroUtils;->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
 
     if-eqz p1, :cond_2
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+    sget-object v0, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/nitro/NitroUtils;->getNitroGiftIcon(Lcom/discord/models/domain/ModelSku;)I
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/premium/PremiumUtils;->getNitroGiftIcon(Lcom/discord/models/domain/ModelSku;)I
 
     move-result v0
 
@@ -433,7 +433,7 @@
     goto :goto_2
 
     :cond_2
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
 
     move-result-object p1
 
@@ -451,7 +451,7 @@
 
     sget-object v0, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
 
     move-result-object p1
 
@@ -475,18 +475,18 @@
     const/4 p1, 0x0
 
     :goto_1
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;
+    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, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->itemView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->itemView:Landroid/view/View;
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;
 
-    invoke-direct {v0, p0, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
+    invoke-direct {v0, p0, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
@@ -500,9 +500,9 @@
 .method public final bridge synthetic onConfigure(ILjava/lang/Object;)V
     .locals 0
 
-    check-cast p2, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+    check-cast p2, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;->onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali
similarity index 58%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali
index dcba26e01e..112dc04ff0 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickCopyListener$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGiftingAdapter.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,18 +28,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickCopyListener$1;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickCopyListener$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickCopyListener$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickCopyListener$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickCopyListener$1;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1;
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 
     check-cast p1, Ljava/lang/String;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickCopyListener$1;->invoke(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali
similarity index 61%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali
index 5bec86736c..fd2370ea6b 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickSkuListener$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGiftingAdapter.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,18 +29,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickSkuListener$1;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickSkuListener$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickSkuListener$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickSkuListener$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickSkuListener$1;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1;
 
     return-void
 .end method
@@ -68,9 +68,9 @@
 
     check-cast p2, Ljava/lang/Long;
 
-    invoke-virtual {p0, v0, v1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickSkuListener$1;->invoke(JLjava/lang/Long;)V
+    invoke-virtual {p0, v0, v1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1;->invoke(JLjava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali
similarity index 60%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali
index 546f3def22..39d83429e3 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGiftingAdapter.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,18 +29,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;
 
     return-void
 .end method
@@ -68,9 +68,9 @@
 
     check-cast p2, Ljava/lang/Long;
 
-    invoke-virtual {p0, v0, v1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;->invoke(JLjava/lang/Long;)V
+    invoke-virtual {p0, v0, v1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;->invoke(JLjava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali
similarity index 58%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali
index 56fbfbb2b3..be0fbe8327 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGiftingAdapter.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,18 +28,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelGift;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;->invoke(Lcom/discord/models/domain/ModelGift;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;->invoke(Lcom/discord/models/domain/ModelGift;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.smali
similarity index 52%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.smali
index e1948f17ba..a178889a02 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
 .source "WidgetSettingsGiftingAdapter.kt"
 
@@ -6,17 +6,17 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$NoGiftsListItem;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;
     }
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple<",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;",
         ">;"
     }
 .end annotation
@@ -86,93 +86,93 @@
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickSkuListener$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickSkuListener$1;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1;
 
     check-cast p1, Lkotlin/jvm/functions/Function2;
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onClickSkuListener:Lkotlin/jvm/functions/Function2;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onClickSkuListener:Lkotlin/jvm/functions/Function2;
 
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickCopyListener$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onClickCopyListener$1;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onClickCopyListener:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onClickCopyListener:Lkotlin/jvm/functions/Function1;
 
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onRevokeClickListener:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onRevokeClickListener:Lkotlin/jvm/functions/Function1;
 
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;
 
     check-cast p1, Lkotlin/jvm/functions/Function2;
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onGenerateClickListener:Lkotlin/jvm/functions/Function2;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onGenerateClickListener:Lkotlin/jvm/functions/Function2;
 
     return-void
 .end method
 
-.method public static final synthetic access$getOnClickCopyListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function1;
+.method public static final synthetic access$getOnClickCopyListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onClickCopyListener:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onClickCopyListener:Lkotlin/jvm/functions/Function1;
 
     return-object p0
 .end method
 
-.method public static final synthetic access$getOnClickSkuListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function2;
+.method public static final synthetic access$getOnClickSkuListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function2;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onClickSkuListener:Lkotlin/jvm/functions/Function2;
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onClickSkuListener:Lkotlin/jvm/functions/Function2;
 
     return-object p0
 .end method
 
-.method public static final synthetic access$getOnGenerateClickListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function2;
+.method public static final synthetic access$getOnGenerateClickListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function2;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onGenerateClickListener:Lkotlin/jvm/functions/Function2;
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onGenerateClickListener:Lkotlin/jvm/functions/Function2;
 
     return-object p0
 .end method
 
-.method public static final synthetic access$getOnRevokeClickListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function1;
+.method public static final synthetic access$getOnRevokeClickListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onRevokeClickListener:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onRevokeClickListener:Lkotlin/jvm/functions/Function1;
 
     return-object p0
 .end method
 
-.method public static final synthetic access$setOnClickCopyListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;Lkotlin/jvm/functions/Function1;)V
+.method public static final synthetic access$setOnClickCopyListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onClickCopyListener:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onClickCopyListener:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
 
-.method public static final synthetic access$setOnClickSkuListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;Lkotlin/jvm/functions/Function2;)V
+.method public static final synthetic access$setOnClickSkuListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;Lkotlin/jvm/functions/Function2;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onClickSkuListener:Lkotlin/jvm/functions/Function2;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onClickSkuListener:Lkotlin/jvm/functions/Function2;
 
     return-void
 .end method
 
-.method public static final synthetic access$setOnGenerateClickListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;Lkotlin/jvm/functions/Function2;)V
+.method public static final synthetic access$setOnGenerateClickListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;Lkotlin/jvm/functions/Function2;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onGenerateClickListener:Lkotlin/jvm/functions/Function2;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onGenerateClickListener:Lkotlin/jvm/functions/Function2;
 
     return-void
 .end method
 
-.method public static final synthetic access$setOnRevokeClickListener$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;Lkotlin/jvm/functions/Function1;)V
+.method public static final synthetic access$setOnRevokeClickListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onRevokeClickListener:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onRevokeClickListener:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -185,7 +185,7 @@
         value = {
             "(",
             "Ljava/util/List<",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;",
             ">;",
             "Lkotlin/jvm/functions/Function2<",
             "-",
@@ -234,15 +234,15 @@
 
     invoke-static {p5, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->setData(Ljava/util/List;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->setData(Ljava/util/List;)V
 
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onClickSkuListener:Lkotlin/jvm/functions/Function2;
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onClickSkuListener:Lkotlin/jvm/functions/Function2;
 
-    iput-object p3, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onClickCopyListener:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onClickCopyListener:Lkotlin/jvm/functions/Function1;
 
-    iput-object p4, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onRevokeClickListener:Lkotlin/jvm/functions/Function1;
+    iput-object p4, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onRevokeClickListener:Lkotlin/jvm/functions/Function1;
 
-    iput-object p5, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onGenerateClickListener:Lkotlin/jvm/functions/Function2;
+    iput-object p5, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onGenerateClickListener:Lkotlin/jvm/functions/Function2;
 
     return-void
 .end method
@@ -250,7 +250,7 @@
 .method public final bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
     .locals 0
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
     move-result-object p1
 
@@ -267,8 +267,8 @@
             "Landroid/view/ViewGroup;",
             "I)",
             "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$GiftItem;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;",
             ">;"
         }
     .end annotation
@@ -287,16 +287,16 @@
 
     if-ne p2, p1, :cond_0
 
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
 
-    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$EntitlementListItem;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)V
+    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)V
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
     return-object p1
 
     :cond_0
-    invoke-virtual {p0, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;->invalidViewTypeException(I)Ljava/lang/IllegalArgumentException;
+    invoke-virtual {p0, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->invalidViewTypeException(I)Ljava/lang/IllegalArgumentException;
 
     move-result-object p1
 
@@ -305,18 +305,18 @@
     throw p1
 
     :cond_1
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;
 
-    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$SkuListItem;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)V
+    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)V
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
     return-object p1
 
     :cond_2
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$NoGiftsListItem;
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem;
 
-    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter$NoGiftsListItem;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingAdapter;)V
+    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)V
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1.smali
similarity index 52%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1.smali
index 120c2cb488..cea6404060 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGiftingViewModel.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;-><init>()V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;-><init>()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
     const/4 p1, 0x1
 
@@ -51,9 +51,9 @@
 
     check-cast p1, Lrx/Subscription;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$1;->invoke(Lrx/Subscription;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,9 +65,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
-    invoke-static {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->access$getSubscriptions$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;)Lrx/subscriptions/CompositeSubscription;
+    invoke-static {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->access$getSubscriptions$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)Lrx/subscriptions/CompositeSubscription;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$2.smali
new file mode 100644
index 0000000000..e45497f644
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$2.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$2;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSettingsGiftingViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;-><init>()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$2;->invoke(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
+
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->access$handleStoreData(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error.smali
new file mode 100644
index 0000000000..ce241e451c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;
+.super Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+.source "WidgetSettingsGiftingViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Error"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving.smali
new file mode 100644
index 0000000000..8b3b9528fb
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
+.super Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+.source "WidgetSettingsGiftingViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "NotResolving"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving.smali
new file mode 100644
index 0000000000..59927494c9
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
+.super Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+.source "WidgetSettingsGiftingViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Resolving"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState.smali
similarity index 50%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState.smali
index c745676b8b..50b2a8fe1a 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState.smali
@@ -1,11 +1,11 @@
-.class public abstract Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+.class public abstract Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 .super Ljava/lang/Object;
 .source "WidgetSettingsGiftingViewModel.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,9 +15,9 @@
 
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
     }
 .end annotation
 
@@ -34,7 +34,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData.smali
similarity index 58%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData.smali
index 14a68b5b2e..062b31b676 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData.smali
@@ -1,11 +1,11 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;
 .super Ljava/lang/Object;
 .source "WidgetSettingsGiftingViewModel.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -51,31 +51,31 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
 
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;
+.method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;
     .locals 0
 
     and-int/lit8 p4, p3, 0x1
 
     if-eqz p4, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
 
     :cond_0
     and-int/lit8 p3, p3, 0x2
 
     if-eqz p3, :cond_1
 
-    iget-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
+    iget-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
 
     :cond_1
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->copy(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->copy(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;
 
     move-result-object p0
 
@@ -87,7 +87,7 @@
 .method public final component1()Lcom/discord/stores/StoreEntitlements$State;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
 
     return-object v0
 .end method
@@ -103,12 +103,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
 
     return-object v0
 .end method
 
-.method public final copy(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;
+.method public final copy(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -117,7 +117,7 @@
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelGift;",
             ">;)",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;"
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;"
         }
     .end annotation
 
@@ -129,9 +129,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;
 
-    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;-><init>(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)V
+    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;-><init>(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)V
 
     return-object v0
 .end method
@@ -141,15 +141,15 @@
 
     if-eq p0, p1, :cond_1
 
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;
 
     if-eqz v0, :cond_0
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
 
-    iget-object v1, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
+    iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -157,9 +157,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -184,7 +184,7 @@
 .method public final getEntitlementState()Lcom/discord/stores/StoreEntitlements$State;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
 
     return-object v0
 .end method
@@ -200,7 +200,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
 
     return-object v0
 .end method
@@ -208,7 +208,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
 
     const/4 v1, 0x0
 
@@ -226,7 +226,7 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
 
     if-eqz v2, :cond_1
 
@@ -249,7 +249,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -257,7 +257,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->myResolvedGifts:Ljava/util/List;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Failure.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Failure.smali
new file mode 100644
index 0000000000..81ba322f09
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Failure.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Failure;
+.super Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
+.source "WidgetSettingsGiftingViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Failure"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Failure;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Failure;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Failure;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Failure;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Failure;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded.smali
similarity index 56%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded.smali
index d7b130dedc..e680fe6b35 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
-.super Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+.super Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 .source "WidgetSettingsGiftingViewModel.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -51,11 +51,11 @@
     .end annotation
 .end field
 
-.field private final resolvingGiftState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+.field private final resolvingGiftState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
 
 # direct methods
-.method public constructor <init>(Ljava/util/Map;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Set;Ljava/util/Map;Ljava/lang/String;)V
+.method public constructor <init>(Ljava/util/Map;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Set;Ljava/util/Map;Ljava/lang/String;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -66,7 +66,7 @@
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelEntitlement;",
             ">;>;",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;",
             "Ljava/util/Set<",
             "Ljava/lang/Long;",
             ">;",
@@ -99,36 +99,36 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    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/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
 
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
-    iput-object p3, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
+    iput-object p3, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
 
-    iput-object p4, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
+    iput-object p4, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
 
-    iput-object p5, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
+    iput-object p5, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;Ljava/util/Map;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Set;Ljava/util/Map;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+.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;
     .locals 3
 
     and-int/lit8 p7, p6, 0x1
 
     if-eqz p7, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
 
     :cond_0
     and-int/lit8 p7, p6, 0x2
 
     if-eqz p7, :cond_1
 
-    iget-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    iget-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
     :cond_1
     move-object p7, p2
@@ -137,7 +137,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-object p3, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
+    iget-object p3, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
 
     :cond_2
     move-object v0, p3
@@ -146,7 +146,7 @@
 
     if-eqz p2, :cond_3
 
-    iget-object p4, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
+    iget-object p4, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
 
     :cond_3
     move-object v1, p4
@@ -155,7 +155,7 @@
 
     if-eqz p2, :cond_4
 
-    iget-object p5, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
+    iget-object p5, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
 
     :cond_4
     move-object v2, p5
@@ -172,7 +172,7 @@
 
     move-object p7, v2
 
-    invoke-virtual/range {p2 .. p7}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->copy(Ljava/util/Map;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Set;Ljava/util/Map;Ljava/lang/String;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    invoke-virtual/range {p2 .. p7}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->copy(Ljava/util/Map;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Set;Ljava/util/Map;Ljava/lang/String;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     move-result-object p0
 
@@ -194,15 +194,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
 
     return-object v0
 .end method
 
-.method public final component2()Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+.method public final component2()Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
     return-object v0
 .end method
@@ -218,7 +218,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
 
     return-object v0
 .end method
@@ -236,7 +236,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
 
     return-object v0
 .end method
@@ -244,12 +244,12 @@
 .method public final component5()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final copy(Ljava/util/Map;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Set;Ljava/util/Map;Ljava/lang/String;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+.method public final copy(Ljava/util/Map;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Set;Ljava/util/Map;Ljava/lang/String;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -260,7 +260,7 @@
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelEntitlement;",
             ">;>;",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;",
             "Ljava/util/Set<",
             "Ljava/lang/Long;",
             ">;",
@@ -272,7 +272,7 @@
             ">;>;",
             "Ljava/lang/String;",
             ")",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;"
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;"
         }
     .end annotation
 
@@ -292,7 +292,7 @@
 
     invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     move-object v1, v0
 
@@ -306,7 +306,7 @@
 
     move-object v6, p5
 
-    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;-><init>(Ljava/util/Map;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Set;Ljava/util/Map;Ljava/lang/String;)V
+    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
 .end method
@@ -316,15 +316,15 @@
 
     if-eq p0, p1, :cond_1
 
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_0
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
+    iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -332,9 +332,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
-    iget-object v1, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -342,9 +342,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
+    iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -352,9 +352,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
+    iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -362,9 +362,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
+    iget-object p1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -397,7 +397,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
 
     return-object v0
 .end method
@@ -405,7 +405,7 @@
 .method public final getLastCopiedCode()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -423,7 +423,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
 
     return-object v0
 .end method
@@ -441,15 +441,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
 
     return-object v0
 .end method
 
-.method public final getResolvingGiftState()Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+.method public final getResolvingGiftState()Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
     return-object v0
 .end method
@@ -457,7 +457,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
 
     const/4 v1, 0x0
 
@@ -475,7 +475,7 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
     if-eqz v2, :cond_1
 
@@ -493,7 +493,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
 
     if-eqz v2, :cond_2
 
@@ -511,7 +511,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
 
     if-eqz v2, :cond_3
 
@@ -529,7 +529,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
 
     if-eqz v2, :cond_4
 
@@ -552,7 +552,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -560,7 +560,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -568,7 +568,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -576,7 +576,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -584,7 +584,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading.smali
new file mode 100644
index 0000000000..18b1b28325
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;
+.super Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
+.source "WidgetSettingsGiftingViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Loading"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState.smali
similarity index 52%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState.smali
index d7b1b39ac9..d5ffc5c5de 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState.smali
@@ -1,11 +1,11 @@
-.class public abstract Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+.class public abstract Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 .super Ljava/lang/Object;
 .source "WidgetSettingsGiftingViewModel.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,9 +15,9 @@
 
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Failure;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Failure;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
     }
 .end annotation
 
@@ -34,7 +34,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$1.smali
similarity index 71%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$1.smali
index 2fd6013a3d..b7f5aa34df 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$1;
 .super Ljava/lang/Object;
 .source "WidgetSettingsGiftingViewModel.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->getStoreData()Lrx/Observable;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->getStoreData()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,18 +33,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$1;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$1;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$1;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Ljava/lang/Long;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$1;->call(Ljava/lang/Long;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$1;->call(Ljava/lang/Long;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$2.smali
similarity index 58%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$2.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$2.smali
index d9259f6e25..e9bbaba102 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$2.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$2;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$2;
 .super Ljava/lang/Object;
 .source "WidgetSettingsGiftingViewModel.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->getStoreData()Lrx/Observable;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->getStoreData()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,18 +33,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$2;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$2;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$2;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$2;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$2;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$2;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$2;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$2;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$2;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$2;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;
+.method public final call(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -68,11 +68,11 @@
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelGift;",
             ">;)",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;"
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;"
         }
     .end annotation
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;
 
     const-string v1, "entitlementState"
 
@@ -82,7 +82,7 @@
 
     invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;-><init>(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)V
+    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;-><init>(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)V
 
     return-object v0
 .end method
@@ -94,7 +94,7 @@
 
     check-cast p2, Ljava/util/List;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$2;->call(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$2;->call(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali
similarity index 59%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali
index 1907375099..eb14d7ae36 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGiftingViewModel.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;-><init>()V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;-><init>()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,18 +28,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 
     check-cast p1, Ljava/lang/String;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;->invoke(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali
similarity index 50%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali
index 40a8e28a6d..c9e5ef47eb 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsGiftingViewModel.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->redeemGiftCode(Ljava/lang/String;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->redeemGiftCode(Ljava/lang/String;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
     const/4 p1, 0x1
 
@@ -51,9 +51,9 @@
 
     check-cast p1, Lrx/Subscription;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$1;->invoke(Lrx/Subscription;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,9 +65,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
-    invoke-static {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->access$getSubscriptions$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;)Lrx/subscriptions/CompositeSubscription;
+    invoke-static {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->access$getSubscriptions$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)Lrx/subscriptions/CompositeSubscription;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali
similarity index 63%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali
index fb56a144f5..97a779ab37 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$2;
+.class final synthetic Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2;
 .super Lkotlin/jvm/internal/j;
 .source "WidgetSettingsGiftingViewModel.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->redeemGiftCode(Ljava/lang/String;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->redeemGiftCode(Ljava/lang/String;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)V
     .locals 1
 
     const/4 v0, 0x1
@@ -51,7 +51,7 @@
 .method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
     .locals 1
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
     invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -73,9 +73,9 @@
 
     check-cast p1, Lcom/discord/stores/StoreGifting$GiftState;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$2;->invoke(Lcom/discord/stores/StoreGifting$GiftState;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2;->invoke(Lcom/discord/stores/StoreGifting$GiftState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,11 +87,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$2;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2;->receiver:Ljava/lang/Object;
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->access$onHandleGiftCode(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;Lcom/discord/stores/StoreGifting$GiftState;)V
+    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
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.smali
similarity index 53%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.smali
index fd32062bf7..a4fc1f49ca 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 .super Landroidx/lifecycle/ViewModel;
 .source "WidgetSettingsGiftingViewModel.kt"
 
@@ -6,9 +6,9 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;
     }
 .end annotation
 
@@ -28,13 +28,13 @@
 
 .field private final subscriptions:Lrx/subscriptions/CompositeSubscription;
 
-.field private viewState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+.field private viewState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
 .field private final viewStateSubject:Lrx/subjects/BehaviorSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/BehaviorSubject<",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;",
             ">;"
         }
     .end annotation
@@ -47,41 +47,41 @@
 
     invoke-direct {p0}, Landroidx/lifecycle/ViewModel;-><init>()V
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->onGiftCodeResolved:Lkotlin/jvm/functions/Function1;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->onGiftCodeResolved:Lkotlin/jvm/functions/Function1;
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;
 
     invoke-static {v0}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
 
     new-instance v0, Lrx/subscriptions/CompositeSubscription;
 
     invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->subscriptions:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->subscriptions:Lrx/subscriptions/CompositeSubscription;
 
     sget-object v0, Lcom/discord/stores/StoreEntitlements$Actions;->INSTANCE:Lcom/discord/stores/StoreEntitlements$Actions;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreEntitlements$Actions;->fetchMyGiftEntitlements()V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->getStoreData()Lrx/Observable;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->getStoreData()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -89,7 +89,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v1
 
@@ -101,17 +101,17 @@
 
     move-result-object v2
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)V
 
     move-object v4, v0
 
     check-cast v4, Lkotlin/jvm/functions/Function1;
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$2;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$2;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$2;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)V
 
     move-object v7, v0
 
@@ -132,44 +132,44 @@
     return-void
 .end method
 
-.method public static final synthetic access$getSubscriptions$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;)Lrx/subscriptions/CompositeSubscription;
+.method public static final synthetic access$getSubscriptions$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)Lrx/subscriptions/CompositeSubscription;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->subscriptions:Lrx/subscriptions/CompositeSubscription;
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->subscriptions:Lrx/subscriptions/CompositeSubscription;
 
     return-object p0
 .end method
 
-.method public static final synthetic access$handleStoreData(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;)V
+.method public static final synthetic access$handleStoreData(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->handleStoreData(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->handleStoreData(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$onHandleGiftCode(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;Lcom/discord/stores/StoreGifting$GiftState;)V
+.method public static final synthetic access$onHandleGiftCode(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;Lcom/discord/stores/StoreGifting$GiftState;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->onHandleGiftCode(Lcom/discord/stores/StoreGifting$GiftState;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->onHandleGiftCode(Lcom/discord/stores/StoreGifting$GiftState;)V
 
     return-void
 .end method
 
-.method private final buildViewState(Lcom/discord/stores/StoreEntitlements$State;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Map;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+.method private final buildViewState(Lcom/discord/stores/StoreEntitlements$State;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Map;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
     .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Lcom/discord/stores/StoreEntitlements$State;",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "+",
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelGift;",
             ">;>;)",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;"
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;"
         }
     .end annotation
 
@@ -177,9 +177,9 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loading;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
     return-object p1
 
@@ -188,9 +188,9 @@
 
     if-eqz v0, :cond_1
 
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Failure;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Failure;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Failure;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Failure;
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
     return-object p1
 
@@ -199,9 +199,9 @@
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     const/4 v2, 0x0
 
@@ -210,49 +210,49 @@
     move-object v0, v2
 
     :cond_2
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getExpandedSkuIds()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getExpandedSkuIds()Ljava/util/Set;
 
     move-result-object v0
 
     if-nez v0, :cond_4
 
     :cond_3
-    sget-object v0, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast v0, Ljava/util/Set;
 
     :cond_4
     move-object v6, v0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     if-nez v1, :cond_5
 
     move-object v0, v2
 
     :cond_5
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_6
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getLastCopiedCode()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getLastCopiedCode()Ljava/lang/String;
 
     move-result-object v2
 
     :cond_6
     move-object v8, v2
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     check-cast p1, Lcom/discord/stores/StoreEntitlements$State$Loaded;
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreEntitlements$State$Loaded;->getGiftEntitlementMap()Ljava/util/Map;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreEntitlements$State$Loaded;->getGiftableEntitlements()Ljava/util/Map;
 
     move-result-object v4
 
@@ -262,9 +262,9 @@
 
     move-object v7, p3
 
-    invoke-direct/range {v3 .. v8}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;-><init>(Ljava/util/Map;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Set;Ljava/util/Map;Ljava/lang/String;)V
+    invoke-direct/range {v3 .. v8}, 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
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
     return-object v0
 
@@ -282,7 +282,7 @@
         value = {
             "()",
             "Lrx/Observable<",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;",
             ">;"
         }
     .end annotation
@@ -307,7 +307,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$1;
+    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$1;
 
     check-cast v2, Lrx/functions/b;
 
@@ -315,7 +315,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$2;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$getStoreData$2;
+    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$2;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$getStoreData$2;
 
     check-cast v2, Lrx/functions/Func2;
 
@@ -330,12 +330,12 @@
     return-object v0
 .end method
 
-.method private final handleStoreData(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;)V
+.method private final handleStoreData(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;)V
     .locals 11
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     const/4 v2, 0x0
 
@@ -344,23 +344,23 @@
     move-object v0, v2
 
     :cond_0
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getResolvingGiftState()Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getResolvingGiftState()Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
     move-result-object v0
 
     if-nez v0, :cond_2
 
     :cond_1
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
     :cond_2
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->getEntitlementState()Lcom/discord/stores/StoreEntitlements$State;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->getEntitlementState()Lcom/discord/stores/StoreEntitlements$State;
 
     move-result-object v1
 
@@ -387,7 +387,7 @@
 
     check-cast v4, Lcom/discord/stores/StoreEntitlements$State$Loaded;
 
-    invoke-virtual {v4}, Lcom/discord/stores/StoreEntitlements$State$Loaded;->getGiftEntitlementMap()Ljava/util/Map;
+    invoke-virtual {v4}, Lcom/discord/stores/StoreEntitlements$State$Loaded;->getGiftableEntitlements()Ljava/util/Map;
 
     move-result-object v4
 
@@ -474,7 +474,7 @@
 
     invoke-direct {v2}, Ljava/util/HashMap;-><init>()V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$StoreData;->getMyResolvedGifts()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreData;->getMyResolvedGifts()Ljava/util/List;
 
     move-result-object p1
 
@@ -556,7 +556,7 @@
     :cond_9
     check-cast v2, Ljava/util/Map;
 
-    invoke-direct {p0, v1, v0, v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->buildViewState(Lcom/discord/stores/StoreEntitlements$State;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Map;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    invoke-direct {p0, v1, v0, v2}, 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;
 
     move-result-object p1
 
@@ -575,12 +575,12 @@
 
     move-result-object p1
 
-    invoke-direct {p0, v1, v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->buildViewState(Lcom/discord/stores/StoreEntitlements$State;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Map;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    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;
 
     move-result-object p1
 
     :goto_4
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->publish(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->publish(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
 
     return-void
 .end method
@@ -588,9 +588,9 @@
 .method private final onHandleGiftCode(Lcom/discord/stores/StoreGifting$GiftState;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     const/4 v2, 0x0
 
@@ -599,7 +599,7 @@
     move-object v0, v2
 
     :cond_0
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     if-nez v0, :cond_1
 
@@ -608,11 +608,15 @@
     :cond_1
     new-instance v1, Lcom/discord/stores/StoreEntitlements$State$Loaded;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyEntitlements()Ljava/util/Map;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyEntitlements()Ljava/util/Map;
 
     move-result-object v3
 
-    invoke-direct {v1, v3}, Lcom/discord/stores/StoreEntitlements$State$Loaded;-><init>(Ljava/util/Map;)V
+    invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
+
+    move-result-object v4
+
+    invoke-direct {v1, v3, v4}, Lcom/discord/stores/StoreEntitlements$State$Loaded;-><init>(Ljava/util/Map;Ljava/util/Map;)V
 
     instance-of v3, p1, Lcom/discord/stores/StoreGifting$GiftState$Loading;
 
@@ -718,22 +722,22 @@
 
     check-cast v1, Lcom/discord/stores/StoreEntitlements$State;
 
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyGifts()Ljava/util/Map;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyGifts()Ljava/util/Map;
 
     move-result-object v0
 
-    invoke-direct {p0, v1, p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->buildViewState(Lcom/discord/stores/StoreEntitlements$State;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Map;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    invoke-direct {p0, v1, p1, v0}, 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;
 
     move-result-object p1
 
     goto :goto_6
 
     :cond_c
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->onGiftCodeResolved:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->onGiftCodeResolved:Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGift;->getCode()Ljava/lang/String;
 
@@ -743,15 +747,15 @@
 
     check-cast v1, Lcom/discord/stores/StoreEntitlements$State;
 
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$NotResolving;
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyGifts()Ljava/util/Map;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyGifts()Ljava/util/Map;
 
     move-result-object v0
 
-    invoke-direct {p0, v1, p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->buildViewState(Lcom/discord/stores/StoreEntitlements$State;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Map;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    invoke-direct {p0, v1, p1, v0}, 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;
 
     move-result-object p1
 
@@ -761,15 +765,15 @@
     :goto_4
     check-cast v1, Lcom/discord/stores/StoreEntitlements$State;
 
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Error;
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyGifts()Ljava/util/Map;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyGifts()Ljava/util/Map;
 
     move-result-object v0
 
-    invoke-direct {p0, v1, p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->buildViewState(Lcom/discord/stores/StoreEntitlements$State;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Map;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    invoke-direct {p0, v1, p1, v0}, 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;
 
     move-result-object p1
 
@@ -779,32 +783,32 @@
     :goto_5
     check-cast v1, Lcom/discord/stores/StoreEntitlements$State;
 
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState$Resolving;
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyGifts()Ljava/util/Map;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getMyGifts()Ljava/util/Map;
 
     move-result-object v0
 
-    invoke-direct {p0, v1, p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->buildViewState(Lcom/discord/stores/StoreEntitlements$State;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Map;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    invoke-direct {p0, v1, p1, v0}, 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;
 
     move-result-object p1
 
     :goto_6
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->publish(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->publish(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
 
     return-void
 .end method
 
-.method private final publish(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
+.method private final publish(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
     invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
@@ -819,12 +823,12 @@
         value = {
             "()",
             "Lrx/Observable<",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;",
             ">;"
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
 
     const-string v1, "viewStateSubject"
 
@@ -842,9 +846,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     if-nez v1, :cond_0
 
@@ -853,7 +857,7 @@
     :cond_0
     move-object v1, v0
 
-    check-cast v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    check-cast v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     if-nez v1, :cond_1
 
@@ -874,13 +878,13 @@
 
     move-object v6, p1
 
-    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->copy$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;Ljava/util/Map;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Set;Ljava/util/Map;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->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;
 
     move-result-object p1
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->publish(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->publish(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
 
     return-void
 .end method
@@ -888,9 +892,9 @@
 .method public final handleSkuClicked(JLjava/lang/Long;)V
     .locals 9
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
-    instance-of v1, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     if-nez v1, :cond_0
 
@@ -899,14 +903,14 @@
     :cond_0
     move-object v1, v0
 
-    check-cast v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    check-cast v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     if-nez v1, :cond_1
 
     return-void
 
     :cond_1
-    invoke-virtual {v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getExpandedSkuIds()Ljava/util/Set;
+    invoke-virtual {v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->getExpandedSkuIds()Ljava/util/Set;
 
     move-result-object v0
 
@@ -962,13 +966,13 @@
 
     const/4 v8, 0x0
 
-    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;->copy$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;Ljava/util/Map;Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Set;Ljava/util/Map;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->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;
 
     move-result-object p1
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->publish(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->publish(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
 
     return-void
 .end method
@@ -978,7 +982,7 @@
 
     invoke-super {p0}, Landroidx/lifecycle/ViewModel;->onCleared()V
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->subscriptions:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->subscriptions:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->clear()V
 
@@ -992,9 +996,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->viewState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
-    instance-of v0, v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+    instance-of v0, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_0
 
@@ -1008,7 +1012,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -1026,9 +1030,9 @@
 
     const/4 v3, 0x0
 
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$1;
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1;
 
-    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;)V
+    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)V
 
     move-object v4, p1
 
@@ -1038,13 +1042,13 @@
 
     const/4 v6, 0x0
 
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$2;
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2;
 
     move-object v0, p0
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
-    invoke-direct {p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel$redeemGiftCode$2;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;)V
+    invoke-direct {p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)V
 
     move-object v7, p1
 
@@ -1077,7 +1081,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsGiftingViewModel;->onGiftCodeResolved:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->onGiftCodeResolved:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion.smali
similarity index 51%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion.smali
index 77f66c11b7..e2f01f3023 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion;
 .super Ljava/lang/Object;
 .source "WidgetSettingsPremium.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,17 +26,17 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getNONE()Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+.method public final getNONE()Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
     .locals 1
 
-    invoke-static {}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->access$getNONE$cp()Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    invoke-static {}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->access$getNONE$cp()Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig.smali
similarity index 50%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig.smali
index 5f48a9ffbb..875d694a37 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig.smali
@@ -1,11 +1,11 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 .super Ljava/lang/Object;
 .source "WidgetSettingsPremium.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,15 +15,15 @@
 
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion;
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion;
     }
 .end annotation
 
 
 # static fields
-.field public static final Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion;
+.field public static final Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion;
 
-.field private static final NONE:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+.field private static final NONE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
 
 # instance fields
@@ -44,19 +44,19 @@
 .method static constructor <clinit>()V
     .locals 2
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion;
 
     const/4 v1, 0x0
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion;
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    invoke-direct {v0, v1, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;-><init>(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v0, v1, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;-><init>(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->NONE:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->NONE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
     return-void
 .end method
@@ -75,39 +75,39 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
 
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
 
     return-void
 .end method
 
-.method public static final synthetic access$getNONE$cp()Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+.method public static final synthetic access$getNONE$cp()Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
     .locals 1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->NONE:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->NONE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
     return-object v0
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+.method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
     .locals 0
 
     and-int/lit8 p4, p3, 0x1
 
     if-eqz p4, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
 
     :cond_0
     and-int/lit8 p3, p3, 0x2
 
     if-eqz p3, :cond_1
 
-    iget-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
+    iget-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
 
     :cond_1
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->copy(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->copy(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
     move-result-object p0
 
@@ -119,7 +119,7 @@
 .method public final component1()Ljava/lang/CharSequence;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
 
     return-object v0
 .end method
@@ -135,12 +135,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
 
     return-object v0
 .end method
 
-.method public final copy(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+.method public final copy(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -149,13 +149,13 @@
             "Lkotlin/jvm/functions/Function0<",
             "Lkotlin/Unit;",
             ">;)",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;"
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;"
         }
     .end annotation
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;-><init>(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;-><init>(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)V
 
     return-object v0
 .end method
@@ -165,15 +165,15 @@
 
     if-eq p0, p1, :cond_1
 
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
     if-eqz v0, :cond_0
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
 
-    iget-object v1, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
+    iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -181,9 +181,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
 
-    iget-object p1, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -216,7 +216,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
 
     return-object v0
 .end method
@@ -224,7 +224,7 @@
 .method public final getText()Ljava/lang/CharSequence;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
 
     return-object v0
 .end method
@@ -232,7 +232,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
 
     const/4 v1, 0x0
 
@@ -250,7 +250,7 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
 
     if-eqz v2, :cond_1
 
@@ -273,7 +273,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->text:Ljava/lang/CharSequence;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/StringBuilder;
 
@@ -281,7 +281,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->onClick:Lkotlin/jvm/functions/Function0;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$Companion.smali
similarity index 65%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$Companion.smali
index 28253ed615..9c98eb14c4 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 .super Ljava/lang/Object;
 .source "WidgetSettingsPremium.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,25 +26,25 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;-><init>()V
 
     return-void
 .end method
 
-.method public static final synthetic access$getTag(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)Ljava/lang/String;
+.method public static final synthetic access$getTag(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;)Ljava/lang/String;
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;->getTag(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)Ljava/lang/String;
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->getTag(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;)Ljava/lang/String;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method private final getTag(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)Ljava/lang/String;
+.method private final getTag(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;)Ljava/lang/String;
     .locals 1
 
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
 
     if-eqz v0, :cond_0
 
@@ -53,7 +53,7 @@
     return-object p1
 
     :cond_0
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium;
 
     if-eqz v0, :cond_1
 
@@ -62,7 +62,7 @@
     return-object p1
 
     :cond_1
-    instance-of p1, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
+    instance-of p1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
 
     if-eqz p1, :cond_2
 
@@ -78,7 +78,7 @@
     throw p1
 .end method
 
-.method public static synthetic launch$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;Landroid/content/Context;Ljava/lang/Integer;ILjava/lang/Object;)V
+.method public static synthetic launch$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;Landroid/content/Context;Ljava/lang/Integer;ILjava/lang/Object;)V
     .locals 0
 
     and-int/lit8 p3, p3, 0x2
@@ -88,7 +88,7 @@
     const/4 p2, 0x0
 
     :cond_0
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
 
     return-void
 .end method
@@ -112,7 +112,7 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreAnalytics;->onUserSettingsPaneViewed(Ljava/lang/String;)V
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
     new-instance v1, Landroid/content/Intent;
 
@@ -142,7 +142,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -162,9 +162,9 @@
 
     move-object p2, p0
 
-    check-cast p2, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+    check-cast p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
-    invoke-static {p2, p1, v2, v1, v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;->launch$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;Landroid/content/Context;Ljava/lang/Integer;ILjava/lang/Object;)V
+    invoke-static {p2, p1, v2, v1, v2}, 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
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings.smali
similarity index 74%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings.smali
index f54e3beb51..4282999e47 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;
+.class public final synthetic Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;
 .super Ljava/lang/Object;
 
 
@@ -32,7 +32,7 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$0:[I
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->YEARLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
@@ -44,7 +44,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->MONTHLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
@@ -64,7 +64,7 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -74,7 +74,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -84,7 +84,7 @@
 
     aput v3, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -96,7 +96,7 @@
 
     aput v4, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -108,7 +108,7 @@
 
     aput v5, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -120,7 +120,7 @@
 
     aput v6, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -140,7 +140,7 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$2:[I
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$2:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -150,7 +150,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$2:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$2:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -160,7 +160,7 @@
 
     aput v3, v0, v1
 
-    invoke-static {}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;->values()[Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
+    invoke-static {}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;->values()[Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
 
     move-result-object v0
 
@@ -168,11 +168,11 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$3:[I
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$3:[I
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;->GENERIC:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
+    sget-object v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;->GENERIC:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
 
-    invoke-virtual {v1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;->ordinal()I
+    invoke-virtual {v1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;->ordinal()I
 
     move-result v1
 
@@ -186,7 +186,7 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -196,7 +196,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -206,7 +206,7 @@
 
     aput v3, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -216,7 +216,7 @@
 
     aput v4, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -226,7 +226,7 @@
 
     aput v5, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -236,7 +236,7 @@
 
     aput v6, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -254,7 +254,7 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -264,7 +264,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -274,7 +274,7 @@
 
     aput v3, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -284,7 +284,7 @@
 
     aput v4, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -294,7 +294,7 @@
 
     aput v5, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -304,7 +304,7 @@
 
     aput v6, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -322,7 +322,7 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$6:[I
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$6:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -332,7 +332,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$6:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$6:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -342,7 +342,7 @@
 
     aput v3, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$6:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$6:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -352,7 +352,7 @@
 
     aput v4, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$6:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$6:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -370,7 +370,7 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$7:[I
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$7:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->MONTHLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
@@ -380,7 +380,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$7:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$7:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->YEARLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali
similarity index 60%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali
index b917317cbe..0c50369ece 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$1;
+.class final synthetic Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;
 .super Lkotlin/jvm/internal/j;
 .source "WidgetSettingsPremium.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureActiveSubscriptionView(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureActiveSubscriptionView(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
     .locals 1
 
     const/4 v0, 0x1
@@ -51,7 +51,7 @@
 .method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
     .locals 1
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
     invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -73,9 +73,9 @@
 
     check-cast p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$1;->invoke(Lcom/discord/views/ActiveSubscriptionView$DropdownItem;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;->invoke(Lcom/discord/views/ActiveSubscriptionView$DropdownItem;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,11 +87,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$1;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;->receiver:Ljava/lang/Object;
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$onDropdownItemSelected(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/views/ActiveSubscriptionView$DropdownItem;)V
+    invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$onDropdownItemSelected(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/views/ActiveSubscriptionView$DropdownItem;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1.smali
new file mode 100644
index 0000000000..7e006e1ac2
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1.smali
@@ -0,0 +1,76 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureActiveSubscriptionView(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 3
+
+    sget-object v0, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    const-string v2, "requireContext()"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/premium/PremiumUtils;->openAppleBilling(Landroid/content/Context;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2.smali
new file mode 100644
index 0000000000..d755f169f3
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2.smali
@@ -0,0 +1,66 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureActiveSubscriptionView(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-static {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$launchAddPaymentMethodFlow(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1.smali
new file mode 100644
index 0000000000..078c0bba7b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1.smali
@@ -0,0 +1,70 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureActiveSubscriptionView(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-static {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onCancelClicked()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3.smali
new file mode 100644
index 0000000000..397d713bdd
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3.smali
@@ -0,0 +1,70 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureActiveSubscriptionView(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-static {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->resubscribe()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1.smali
new file mode 100644
index 0000000000..80dc5faa1f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1.smali
@@ -0,0 +1,55 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureButtons(Lcom/discord/models/domain/ModelSubscription;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    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 p1, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    const-string v1, "requireContext()"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/premium/PremiumUtils;->openAppleBilling(Landroid/content/Context;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$2.smali
new file mode 100644
index 0000000000..317f72f64e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$2.smali
@@ -0,0 +1,51 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$2;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureButtons(Lcom/discord/models/domain/ModelSubscription;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    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/settings/premium/WidgetSettingsPremium$configureButtons$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onPlanRequested(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$3.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$3.smali
new file mode 100644
index 0000000000..0acbcf105c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$3.smali
@@ -0,0 +1,51 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$3;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureButtons(Lcom/discord/models/domain/ModelSubscription;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$3;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    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/settings/premium/WidgetSettingsPremium$configureButtons$3;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onPlanRequested(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$4.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$4.smali
new file mode 100644
index 0000000000..f0c68b5441
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$4.smali
@@ -0,0 +1,51 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$4;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureButtons(Lcom/discord/models/domain/ModelSubscription;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$4;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    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/settings/premium/WidgetSettingsPremium$configureButtons$4;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onPlanRequested(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$5.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$5.smali
new file mode 100644
index 0000000000..f84edd071f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$5.smali
@@ -0,0 +1,51 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$5;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureButtons(Lcom/discord/models/domain/ModelSubscription;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$5;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    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/settings/premium/WidgetSettingsPremium$configureButtons$5;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onPlanRequested(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$1.smali
new file mode 100644
index 0000000000..9004f11e14
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$1.smali
@@ -0,0 +1,59 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$1;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureGiftingButtons()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $locationTrait:Lcom/discord/utilities/analytics/Traits$Location;
+
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/utilities/analytics/Traits$Location;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$1;->$locationTrait:Lcom/discord/utilities/analytics/Traits$Location;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 4
+
+    sget-object p1, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    check-cast v0, Lcom/discord/app/AppFragment;
+
+    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$1;->$locationTrait:Lcom/discord/utilities/analytics/Traits$Location;
+
+    const/4 v3, 0x1
+
+    invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/utilities/premium/PremiumUtils;->openWebPurchasePremium(Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;Z)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$2.smali
new file mode 100644
index 0000000000..13ab4db26b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$2.smali
@@ -0,0 +1,59 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$2;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureGiftingButtons()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $locationTrait:Lcom/discord/utilities/analytics/Traits$Location;
+
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/utilities/analytics/Traits$Location;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$2;->$locationTrait:Lcom/discord/utilities/analytics/Traits$Location;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 4
+
+    sget-object p1, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    check-cast v0, Lcom/discord/app/AppFragment;
+
+    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$2;->$locationTrait:Lcom/discord/utilities/analytics/Traits$Location;
+
+    const/4 v3, 0x1
+
+    invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/utilities/premium/PremiumUtils;->openWebPurchasePremium(Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;Z)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1.smali
similarity index 73%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1.smali
index 1244ca89ad..a61ecdf027 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1;
 .super Ljava/lang/Object;
 .source "Comparisons.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getDropdownItems(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;)Ljava/util/List;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getDropdownItems(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;)Ljava/util/List;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -36,7 +36,7 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelSubscription;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1;->$premiumSubscription$inlined:Lcom/discord/models/domain/ModelSubscription;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1;->$premiumSubscription$inlined:Lcom/discord/models/domain/ModelSubscription;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,7 +55,7 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelPaymentSource;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1;->$premiumSubscription$inlined:Lcom/discord/models/domain/ModelSubscription;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1;->$premiumSubscription$inlined:Lcom/discord/models/domain/ModelSubscription;
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getPaymentSourceId()Ljava/lang/String;
 
@@ -79,7 +79,7 @@
 
     check-cast p2, Lcom/discord/models/domain/ModelPaymentSource;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1;->$premiumSubscription$inlined:Lcom/discord/models/domain/ModelSubscription;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1;->$premiumSubscription$inlined:Lcom/discord/models/domain/ModelSubscription;
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getPaymentSourceId()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$getHeaderText$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1.smali
similarity index 64%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$getHeaderText$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1.smali
index a1644d64e1..7a5ff99176 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$getHeaderText$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$getHeaderText$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsPremium.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getHeaderText(Lcom/discord/models/domain/ModelSubscription;)Ljava/lang/CharSequence;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getHeaderText(Lcom/discord/models/domain/ModelSubscription;)Ljava/lang/CharSequence;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -34,7 +34,7 @@
 .method constructor <init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$getHeaderText$1;->$interval:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1;->$interval:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
     const/4 p1, 0x0
 
@@ -48,9 +48,9 @@
 .method public final invoke()I
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$getHeaderText$1;->$interval:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1;->$interval:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$7:[I
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$7:[I
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
 
@@ -66,7 +66,7 @@
 
     if-ne v0, v1, :cond_0
 
-    const v0, 0x7f120dff
+    const v0, 0x7f120e38
 
     return v0
 
@@ -78,7 +78,7 @@
     throw v0
 
     :cond_1
-    const v0, 0x7f120dfe
+    const v0, 0x7f120e37
 
     return v0
 .end method
@@ -86,7 +86,7 @@
 .method public final synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$getHeaderText$1;->invoke()I
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1;->invoke()I
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$1.smali
new file mode 100644
index 0000000000..9de724de38
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$1.smali
@@ -0,0 +1,98 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$1;->invoke(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+    .locals 1
+
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$showContent(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;)V
+
+    return-void
+
+    :cond_0
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;
+
+    if-eqz v0, :cond_1
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$showLoadingUI(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+
+    return-void
+
+    :cond_1
+    instance-of p1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Failure;
+
+    if-eqz p1, :cond_2
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$showFailureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+
+    :cond_2
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2.smali
similarity index 52%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$2.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2.smali
index 8b90de0312..3534589b78 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$2;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2;
 .super Lkotlin/jvm/internal/l;
 .source "WidgetSettingsPremium.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->onResume()V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->onResume()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
     const/4 p1, 0x1
 
@@ -51,9 +51,9 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$2;->invoke(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2;->invoke(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -85,9 +85,9 @@
 
     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/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+    sget-object v1, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
-    iget-object v2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
     check-cast v2, Lcom/discord/app/AppFragment;
 
@@ -101,11 +101,11 @@
 
     move-object v4, v0
 
-    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/nitro/NitroUtils;->openWebPurchasePremium$default(Lcom/discord/utilities/nitro/NitroUtils;Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;ZILjava/lang/Object;)V
+    invoke-static/range {v1 .. 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;ZILjava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$2;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    invoke-static {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     move-result-object p1
 
@@ -113,7 +113,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->setLaunchPremiumTabStartTimeMs(J)V
+    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->setLaunchPremiumTabStartTimeMs(J)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$showContent$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$showContent$1.smali
new file mode 100644
index 0000000000..4f6d4e18f7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$showContent$1.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showContent$1;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->showContent(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Long;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $scrollTargetSection:Ljava/lang/Integer;
+
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Ljava/lang/Integer;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showContent$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showContent$1;->$scrollTargetSection:Ljava/lang/Integer;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Long;)V
+    .locals 1
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showContent$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showContent$1;->$scrollTargetSection:Ljava/lang/Integer;
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$scrollToSection(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Ljava/lang/Integer;)V
+
+    return-void
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showContent$1;->call(Ljava/lang/Long;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$showDowngradeModal$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$showDowngradeModal$1.smali
new file mode 100644
index 0000000000..b3873f6415
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$showDowngradeModal$1.smali
@@ -0,0 +1,77 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showDowngradeModal$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->showDowngradeModal()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Landroid/view/View;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showDowngradeModal$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroid/view/View;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showDowngradeModal$1;->invoke(Landroid/view/View;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Landroid/view/View;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showDowngradeModal$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onDialogDismissClicked()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$showFailureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$showFailureUI$1.smali
new file mode 100644
index 0000000000..d174d07099
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$showFailureUI$1.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showFailureUI$1;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremium.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->showFailureUI()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showFailureUI$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    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/settings/premium/WidgetSettingsPremium$showFailureUI$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onRetryClicked()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
similarity index 59%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
index ff862b933c..568002bf53 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 .super Lcom/discord/app/AppFragment;
 .source "WidgetSettingsPremium.kt"
 
@@ -6,8 +6,8 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
     }
 .end annotation
 
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field public static final Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+.field public static final Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
 .field private static final DIALOG_TAG_CANCEL_PREMIUM:Ljava/lang/String; = "CancelPremium"
 
@@ -67,6 +67,14 @@
 
 .field private connection:Landroid/content/ServiceConnection;
 
+.field private final creditContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final creditDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final creditNitro$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final creditNitroClassic$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 .field private final grandfathered$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final legalese$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -79,16 +87,16 @@
 
 .field private final viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+.field private viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 10
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const/16 v1, 0xf
+    const/16 v1, 0x13
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
@@ -404,11 +412,99 @@
 
     invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
+    move-result-object v7
+
+    const-string v8, "scrollView"
+
+    const-string v9, "getScrollView()Landroid/widget/ScrollView;"
+
+    invoke-direct {v2, v7, v8, v9}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v7, 0xe
+
+    aput-object v2, v1, v7
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v7
+
+    const-string v8, "creditContainer"
+
+    const-string v9, "getCreditContainer()Landroid/view/View;"
+
+    invoke-direct {v2, v7, v8, v9}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v7, 0xf
+
+    aput-object v2, v1, v7
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v7
+
+    const-string v8, "creditNitro"
+
+    const-string v9, "getCreditNitro()Lcom/discord/widgets/settings/premium/AccountCreditView;"
+
+    invoke-direct {v2, v7, v8, v9}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v7, 0x10
+
+    aput-object v2, v1, v7
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v7
+
+    const-string v8, "creditNitroClassic"
+
+    const-string v9, "getCreditNitroClassic()Lcom/discord/widgets/settings/premium/AccountCreditView;"
+
+    invoke-direct {v2, v7, v8, v9}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v7, 0x11
+
+    aput-object v2, v1, v7
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
     move-result-object v0
 
-    const-string v7, "scrollView"
+    const-string v7, "creditDivider"
 
-    const-string v8, "getScrollView()Landroid/widget/ScrollView;"
+    const-string v8, "getCreditDivider()Landroid/view/View;"
 
     invoke-direct {v2, v0, v7, v8}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -418,19 +514,19 @@
 
     check-cast v0, Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xe
+    const/16 v2, 0x12
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
     const/4 v1, 0x0
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
     new-array v0, v6, [Ljava/lang/String;
 
@@ -446,11 +542,11 @@
 
     aput-object v1, v0, v5
 
-    invoke-static {v0}, Lkotlin/a/ak;->p([Ljava/lang/Object;)Ljava/util/Set;
+    invoke-static {v0}, Lkotlin/a/ak;->o([Ljava/lang/Object;)Ljava/util/Set;
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->ALL_DIALOG_TAGS:Ljava/util/Set;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->ALL_DIALOG_TAGS:Ljava/util/Set;
 
     return-void
 .end method
@@ -460,216 +556,428 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0509
+    const v0, 0x7f0a0520
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->uploadPerks$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->uploadPerks$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0516
+    const v0, 0x7f0a052e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier2Yearly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier2Yearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0515
+    const v0, 0x7f0a052d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier2Monthly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier2Monthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0514
+    const v0, 0x7f0a052c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier2Gift$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier2Gift$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0513
+    const v0, 0x7f0a052b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier1Yearly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier1Yearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0512
+    const v0, 0x7f0a052a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier1Monthly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier1Monthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0511
+    const v0, 0x7f0a0529
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier1Gift$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier1Gift$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0519
+    const v0, 0x7f0a0531
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier1Container$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier1Container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a051a
+    const v0, 0x7f0a0532
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier2Container$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier2Container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a051b
+    const v0, 0x7f0a0533
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a050a
+    const v0, 0x7f0a0521
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->activeSubscriptionView$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->activeSubscriptionView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0517
+    const v0, 0x7f0a052f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->retryButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->retryButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a050c
+    const v0, 0x7f0a0524
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->legalese$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->legalese$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a050b
+    const v0, 0x7f0a0523
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->grandfathered$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->grandfathered$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0518
+    const v0, 0x7f0a0530
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->scrollView$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->scrollView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0522
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->creditContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a024a
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->creditNitro$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a024b
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->creditNitroClassic$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a024c
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->creditDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
 
-.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     if-nez p0, :cond_0
 
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
 .end method
 
-.method public static final synthetic access$launchAddPaymentMethodFlow(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+.method public static final synthetic access$launchAddPaymentMethodFlow(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->launchAddPaymentMethodFlow()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->launchAddPaymentMethodFlow()V
 
     return-void
 .end method
 
-.method public static final synthetic access$onDropdownItemSelected(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/views/ActiveSubscriptionView$DropdownItem;)V
+.method public static final synthetic access$onDropdownItemSelected(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/views/ActiveSubscriptionView$DropdownItem;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->onDropdownItemSelected(Lcom/discord/views/ActiveSubscriptionView$DropdownItem;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->onDropdownItemSelected(Lcom/discord/views/ActiveSubscriptionView$DropdownItem;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$scrollToSection(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Ljava/lang/Integer;)V
+.method public static final synthetic access$scrollToSection(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Ljava/lang/Integer;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->scrollToSection(Ljava/lang/Integer;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->scrollToSection(Ljava/lang/Integer;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
+.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     return-void
 .end method
 
-.method public static final synthetic access$showContent(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;)V
+.method public static final synthetic access$showContent(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->showContent(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->showContent(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$showFailureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+.method public static final synthetic access$showFailureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->showFailureUI()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->showFailureUI()V
 
     return-void
 .end method
 
-.method public static final synthetic access$showLoadingUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+.method public static final synthetic access$showLoadingUI(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->showLoadingUI()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->showLoadingUI()V
 
     return-void
 .end method
 
-.method private final configureActiveSubscriptionView(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;)V
+.method private final configureAccountCredit(Ljava/util/List;Lcom/discord/models/domain/ModelSubscription;)V
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelEntitlement;",
+            ">;",
+            "Lcom/discord/models/domain/ModelSubscription;",
+            ")V"
+        }
+    .end annotation
+
+    check-cast p1, Ljava/lang/Iterable;
+
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :cond_0
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    const/4 v4, 0x0
+
+    if-eqz v3, :cond_5
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/discord/models/domain/ModelEntitlement;
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelEntitlement;->getParentId()Ljava/lang/Long;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_0
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelEntitlement;->getSubscriptionPlan()Lcom/discord/models/domain/ModelSubscriptionPlan;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_1
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getId()J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
+    :cond_1
+    sget-object v3, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPlanId()J
+
+    move-result-wide v5
+
+    if-nez v4, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v7
+
+    cmp-long v3, v7, v5
+
+    if-nez v3, :cond_3
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    :goto_1
+    sget-object v3, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPlanId()J
+
+    move-result-wide v5
+
+    if-nez v4, :cond_4
+
+    goto :goto_0
+
+    :cond_4
+    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v3
+
+    cmp-long v7, v3, v5
+
+    if-nez v7, :cond_0
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_5
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getCreditContainer()Landroid/view/View;
+
+    move-result-object p1
+
+    const/4 v3, 0x1
+
+    if-gtz v1, :cond_7
+
+    if-lez v2, :cond_6
+
+    goto :goto_2
+
+    :cond_6
+    const/4 v5, 0x0
+
+    goto :goto_3
+
+    :cond_7
+    :goto_2
+    const/4 v5, 0x1
+
+    :goto_3
+    const/4 v6, 0x2
+
+    invoke-static {p1, v5, v0, v6, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getCreditDivider()Landroid/view/View;
+
+    move-result-object p1
+
+    if-lez v1, :cond_8
+
+    if-lez v2, :cond_8
+
+    goto :goto_4
+
+    :cond_8
+    const/4 v3, 0x0
+
+    :goto_4
+    invoke-static {p1, v3, v0, v6, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getCreditNitroClassic()Lcom/discord/widgets/settings/premium/AccountCreditView;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPlanId()J
+
+    move-result-wide v3
+
+    invoke-virtual {p1, v3, v4, v1, p2}, Lcom/discord/widgets/settings/premium/AccountCreditView;->configure(JILcom/discord/models/domain/ModelSubscription;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getCreditNitro()Lcom/discord/widgets/settings/premium/AccountCreditView;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPlanId()J
+
+    move-result-wide v0
+
+    invoke-virtual {p1, v0, v1, v2, p2}, Lcom/discord/widgets/settings/premium/AccountCreditView;->configure(JILcom/discord/models/domain/ModelSubscription;)V
+
+    return-void
+.end method
+
+.method private final configureActiveSubscriptionView(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;)V
     .locals 17
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
 
     move-result-object v1
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getPaymentSources()Ljava/util/List;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPaymentSources()Ljava/util/List;
 
     move-result-object v2
 
     if-nez v1, :cond_0
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getActiveSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getActiveSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;
 
     move-result-object v1
 
@@ -680,7 +988,7 @@
     return-void
 
     :cond_0
-    invoke-direct {v0, v1, v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getDropdownItems(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;)Ljava/util/List;
+    invoke-direct {v0, v1, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getDropdownItems(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;)Ljava/util/List;
 
     move-result-object v15
 
@@ -700,23 +1008,23 @@
 
     if-ne v3, v5, :cond_1
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    const v3, 0x7f120368
+    const v3, 0x7f12036d
 
-    invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
+    invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
     check-cast v3, Ljava/lang/CharSequence;
 
-    new-instance v5, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1;
+    new-instance v5, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1;
 
-    invoke-direct {v5, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v5, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     check-cast v5, Lkotlin/jvm/functions/Function0;
 
-    invoke-direct {v2, v3, v5}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;-><init>(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v2, v3, v5}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;-><init>(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)V
 
     goto :goto_1
 
@@ -787,39 +1095,39 @@
     :goto_0
     if-eqz v2, :cond_5
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    const v3, 0x7f120ee6
+    const v3, 0x7f120f1d
 
-    invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
+    invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
     check-cast v3, Ljava/lang/CharSequence;
 
-    new-instance v5, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3;
+    new-instance v5, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3;
 
-    invoke-direct {v5, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v5, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     check-cast v5, Lkotlin/jvm/functions/Function0;
 
-    invoke-direct {v2, v3, v5}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;-><init>(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v2, v3, v5}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;-><init>(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)V
 
     goto :goto_1
 
     :cond_5
-    sget-object v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion;
+    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion;
 
-    invoke-virtual {v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion;->getNONE()Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    invoke-virtual {v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion;->getNONE()Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
     move-result-object v2
 
     goto :goto_1
 
     :cond_6
-    sget-object v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion;
+    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion;
 
-    invoke-virtual {v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion;->getNONE()Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    invoke-virtual {v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion;->getNONE()Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
     move-result-object v2
 
@@ -830,23 +1138,23 @@
 
     if-eqz v3, :cond_7
 
-    new-instance v3, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    new-instance v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    const v5, 0x7f1202da
+    const v5, 0x7f1202de
 
-    invoke-virtual {v0, v5}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
+    invoke-virtual {v0, v5}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
     move-result-object v5
 
     check-cast v5, Ljava/lang/CharSequence;
 
-    new-instance v6, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1;
+    new-instance v6, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1;
 
-    invoke-direct {v6, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v6, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     check-cast v6, Lkotlin/jvm/functions/Function0;
 
-    invoke-direct {v3, v5, v6}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;-><init>(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v3, v5, v6}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;-><init>(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)V
 
     goto :goto_2
 
@@ -857,57 +1165,57 @@
 
     if-eqz v3, :cond_8
 
-    new-instance v3, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    new-instance v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    const v5, 0x7f1202a9
+    const v5, 0x7f1202ad
 
-    invoke-virtual {v0, v5}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
+    invoke-virtual {v0, v5}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
     move-result-object v5
 
     check-cast v5, Ljava/lang/CharSequence;
 
-    new-instance v6, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2;
+    new-instance v6, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2;
 
-    invoke-direct {v6, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v6, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     check-cast v6, Lkotlin/jvm/functions/Function0;
 
-    invoke-direct {v3, v5, v6}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;-><init>(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v3, v5, v6}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;-><init>(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;)V
 
     goto :goto_2
 
     :cond_8
-    sget-object v3, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion;
+    sget-object v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion;
 
-    invoke-virtual {v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig$Companion;->getNONE()Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig$Companion;->getNONE()Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
     move-result-object v3
 
     :goto_2
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getActiveSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getActiveSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;
 
     move-result-object v5
 
     invoke-virtual {v5, v4}, Lcom/discord/views/ActiveSubscriptionView;->setVisibility(I)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getActiveSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getActiveSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;
 
     move-result-object v4
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getHeaderBackground(Lcom/discord/models/domain/ModelSubscription;)I
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getHeaderBackground(Lcom/discord/models/domain/ModelSubscription;)I
 
     move-result v5
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getHeaderImage(Lcom/discord/models/domain/ModelSubscription;)Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getHeaderImage(Lcom/discord/models/domain/ModelSubscription;)Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     move-result-object v6
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getHeaderLogo(Lcom/discord/models/domain/ModelSubscription;)I
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getHeaderLogo(Lcom/discord/models/domain/ModelSubscription;)I
 
     move-result v7
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getHeaderText(Lcom/discord/models/domain/ModelSubscription;)Ljava/lang/CharSequence;
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getHeaderText(Lcom/discord/models/domain/ModelSubscription;)Ljava/lang/CharSequence;
 
     move-result-object v8
 
@@ -915,41 +1223,41 @@
 
     move-result v1
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getSubscriptionError()Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getSubscriptionError()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
 
     move-result-object v9
 
-    invoke-direct {v0, v9}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getSubscriptionErrorText(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;)Ljava/lang/CharSequence;
+    invoke-direct {v0, v9}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getSubscriptionErrorText(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;)Ljava/lang/CharSequence;
 
     move-result-object v9
 
-    invoke-virtual {v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->getText()Ljava/lang/CharSequence;
+    invoke-virtual {v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->getText()Ljava/lang/CharSequence;
 
     move-result-object v10
 
-    invoke-virtual {v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->getOnClick()Lkotlin/jvm/functions/Function0;
+    invoke-virtual {v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->getOnClick()Lkotlin/jvm/functions/Function0;
 
     move-result-object v11
 
-    invoke-virtual {v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->getText()Ljava/lang/CharSequence;
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->getText()Ljava/lang/CharSequence;
 
     move-result-object v13
 
-    invoke-virtual {v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;->getOnClick()Lkotlin/jvm/functions/Function0;
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->getOnClick()Lkotlin/jvm/functions/Function0;
 
     move-result-object v14
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->isBusy()Z
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy()Z
 
     move-result v12
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$1;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;
 
     move-object v3, v0
 
-    check-cast v3, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+    check-cast v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    invoke-direct {v2, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureActiveSubscriptionView$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v2, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     move-object/from16 v16, v2
 
@@ -975,7 +1283,7 @@
 .method private final configureButtonText(Lcom/discord/models/domain/ModelSubscription;)V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getView()Landroid/view/View;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getView()Landroid/view/View;
 
     move-result-object v0
 
@@ -990,7 +1298,7 @@
     goto/16 :goto_7
 
     :cond_0
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier2Yearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier2Yearly()Lcom/discord/views/BoxedButton;
 
     move-result-object v1
 
@@ -1026,13 +1334,13 @@
     const/4 v4, 0x0
 
     :goto_1
-    invoke-direct {p0, v0, v2, v4}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getPriceText(Landroid/content/Context;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Ljava/lang/String;
+    invoke-direct {p0, v0, v2, v4}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getPriceText(Landroid/content/Context;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Ljava/lang/String;
 
     move-result-object v2
 
     invoke-virtual {v1, v2}, Lcom/discord/views/BoxedButton;->setText(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier2Yearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier2Yearly()Lcom/discord/views/BoxedButton;
 
     move-result-object v1
 
@@ -1040,7 +1348,7 @@
 
     invoke-virtual {v1, v2}, Lcom/discord/views/BoxedButton;->setBoxedText(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier2Monthly()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier2Monthly()Landroid/widget/Button;
 
     move-result-object v1
 
@@ -1070,7 +1378,7 @@
     const/4 v5, 0x0
 
     :goto_3
-    invoke-direct {p0, v0, v4, v5}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getPriceText(Landroid/content/Context;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Ljava/lang/String;
+    invoke-direct {p0, v0, v4, v5}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getPriceText(Landroid/content/Context;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Ljava/lang/String;
 
     move-result-object v4
 
@@ -1078,7 +1386,7 @@
 
     invoke-virtual {v1, v4}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier1Yearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier1Yearly()Lcom/discord/views/BoxedButton;
 
     move-result-object v1
 
@@ -1108,19 +1416,19 @@
     const/4 v5, 0x0
 
     :goto_5
-    invoke-direct {p0, v0, v4, v5}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getPriceText(Landroid/content/Context;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Ljava/lang/String;
+    invoke-direct {p0, v0, v4, v5}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getPriceText(Landroid/content/Context;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Ljava/lang/String;
 
     move-result-object v4
 
     invoke-virtual {v1, v4}, Lcom/discord/views/BoxedButton;->setText(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier1Yearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier1Yearly()Lcom/discord/views/BoxedButton;
 
     move-result-object v1
 
     invoke-virtual {v1, v2}, Lcom/discord/views/BoxedButton;->setBoxedText(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier1Monthly()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier1Monthly()Landroid/widget/Button;
 
     move-result-object v1
 
@@ -1143,7 +1451,7 @@
     const/4 v6, 0x0
 
     :goto_6
-    invoke-direct {p0, v0, v2, v6}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getPriceText(Landroid/content/Context;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Ljava/lang/String;
+    invoke-direct {p0, v0, v2, v6}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getPriceText(Landroid/content/Context;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Ljava/lang/String;
 
     move-result-object p1
 
@@ -1156,7 +1464,7 @@
     return-void
 .end method
 
-.method static synthetic configureButtonText$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/models/domain/ModelSubscription;ILjava/lang/Object;)V
+.method static synthetic configureButtonText$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/models/domain/ModelSubscription;ILjava/lang/Object;)V
     .locals 0
 
     and-int/lit8 p2, p2, 0x1
@@ -1166,7 +1474,7 @@
     const/4 p1, 0x0
 
     :cond_0
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureButtonText(Lcom/discord/models/domain/ModelSubscription;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureButtonText(Lcom/discord/models/domain/ModelSubscription;)V
 
     return-void
 .end method
@@ -1174,7 +1482,7 @@
 .method private final configureButtons(Lcom/discord/models/domain/ModelSubscription;)V
     .locals 6
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureButtonText(Lcom/discord/models/domain/ModelSubscription;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureButtonText(Lcom/discord/models/domain/ModelSubscription;)V
 
     const/4 v0, 0x0
 
@@ -1198,7 +1506,7 @@
 
     const/4 v3, 0x0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier1Monthly()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier1Monthly()Landroid/widget/Button;
 
     move-result-object v5
 
@@ -1206,7 +1514,7 @@
 
     aput-object v5, p1, v3
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier1Yearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier1Yearly()Lcom/discord/views/BoxedButton;
 
     move-result-object v3
 
@@ -1214,7 +1522,7 @@
 
     aput-object v3, p1, v4
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier2Monthly()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier2Monthly()Landroid/widget/Button;
 
     move-result-object v3
 
@@ -1224,7 +1532,7 @@
 
     const/4 v3, 0x3
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier2Yearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier2Yearly()Lcom/discord/views/BoxedButton;
 
     move-result-object v5
 
@@ -1232,7 +1540,7 @@
 
     aput-object v5, p1, v3
 
-    invoke-static {p1}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {p1}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p1
 
@@ -1257,9 +1565,9 @@
 
     invoke-static {v3, v4, v0, v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
 
-    new-instance v5, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1;
+    new-instance v5, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1;
 
-    invoke-direct {v5, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v5, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     check-cast v5, Landroid/view/View$OnClickListener;
 
@@ -1295,12 +1603,12 @@
 
     if-nez p1, :cond_3
 
-    sget-object p1, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p1, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast p1, Ljava/util/Set;
 
     :cond_3
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier1Monthly()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier1Monthly()Landroid/widget/Button;
 
     move-result-object v3
 
@@ -1314,7 +1622,7 @@
 
     invoke-static {v3, v4, v0, v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier1Yearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier1Yearly()Lcom/discord/views/BoxedButton;
 
     move-result-object v3
 
@@ -1328,7 +1636,7 @@
 
     invoke-static {v3, v4, v0, v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier2Monthly()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier2Monthly()Landroid/widget/Button;
 
     move-result-object v3
 
@@ -1342,7 +1650,7 @@
 
     invoke-static {v3, v4, v0, v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier2Yearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier2Yearly()Lcom/discord/views/BoxedButton;
 
     move-result-object v3
 
@@ -1356,49 +1664,49 @@
 
     invoke-static {v3, p1, v0, v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier1Monthly()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier1Monthly()Landroid/widget/Button;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$2;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$2;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$2;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier1Yearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier1Yearly()Lcom/discord/views/BoxedButton;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$3;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$3;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$3;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$3;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v0}, Lcom/discord/views/BoxedButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier2Monthly()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier2Monthly()Landroid/widget/Button;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$4;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$4;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$4;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$4;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier2Yearly()Lcom/discord/views/BoxedButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier2Yearly()Lcom/discord/views/BoxedButton;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$5;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$5;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureButtons$5;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$5;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
@@ -1430,25 +1738,25 @@
 
     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
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier1Gift()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier1Gift()Landroid/view/View;
 
     move-result-object v0
 
-    new-instance v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$1;
+    new-instance v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$1;
 
-    invoke-direct {v1, p0, v8}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/utilities/analytics/Traits$Location;)V
+    invoke-direct {v1, p0, v8}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/utilities/analytics/Traits$Location;)V
 
     check-cast v1, Landroid/view/View$OnClickListener;
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier2Gift()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier2Gift()Landroid/view/View;
 
     move-result-object v0
 
-    new-instance v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$2;
+    new-instance v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$2;
 
-    invoke-direct {v1, p0, v8}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$configureGiftingButtons$2;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/utilities/analytics/Traits$Location;)V
+    invoke-direct {v1, p0, v8}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureGiftingButtons$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/utilities/analytics/Traits$Location;)V
 
     check-cast v1, Landroid/view/View$OnClickListener;
 
@@ -1485,7 +1793,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object v4, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$2:[I
+    sget-object v4, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$2:[I
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->ordinal()I
 
@@ -1503,11 +1811,11 @@
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f120d56
+    const p1, 0x7f120de2
 
     new-array v4, v3, [Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
 
     move-result-object v5
 
@@ -1525,18 +1833,18 @@
 
     aput-object v5, v4, v2
 
-    invoke-virtual {p0, p1, v4}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, p1, v4}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
     goto :goto_2
 
     :cond_3
-    const p1, 0x7f120d55
+    const p1, 0x7f120ddd
 
     new-array v4, v3, [Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
 
     move-result-object v5
 
@@ -1554,14 +1862,14 @@
 
     aput-object v5, v4, v2
 
-    invoke-virtual {p0, p1, v4}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, p1, v4}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
     :goto_2
     if-eqz p1, :cond_4
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getGrandfathered()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getGrandfathered()Landroid/widget/TextView;
 
     move-result-object v4
 
@@ -1578,7 +1886,7 @@
     invoke-virtual {v4, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_4
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getGrandfathered()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getGrandfathered()Landroid/widget/TextView;
 
     move-result-object v4
 
@@ -1602,7 +1910,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getLegalese()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getLegalese()Landroid/widget/TextView;
 
     move-result-object p1
 
@@ -1621,7 +1929,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$0:[I
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
 
@@ -1637,7 +1945,7 @@
 
     if-ne v0, v1, :cond_1
 
-    const v0, 0x7f1202e5
+    const v0, 0x7f1202e9
 
     goto :goto_0
 
@@ -1649,14 +1957,14 @@
     throw p1
 
     :cond_2
-    const v0, 0x7f1202e6
+    const v0, 0x7f1202ea
 
     :goto_0
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     move-result-object v3
 
-    sget-object v4, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
+    sget-object v4, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$1:[I
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->ordinal()I
 
@@ -1671,18 +1979,18 @@
     goto :goto_1
 
     :pswitch_0
-    const v3, 0x7f120e2e
+    const v3, 0x7f120e68
 
-    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
     goto :goto_1
 
     :pswitch_1
-    const v3, 0x7f120e2d
+    const v3, 0x7f120e67
 
-    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
@@ -1699,7 +2007,7 @@
 
     move-result p1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
 
     move-result-object v4
 
@@ -1711,7 +2019,7 @@
 
     move-result-object p1
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getLegalese()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getLegalese()Landroid/widget/TextView;
 
     move-result-object v4
 
@@ -1719,11 +2027,11 @@
 
     invoke-virtual {v4, v6}, Landroid/widget/TextView;->setVisibility(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getLegalese()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getLegalese()Landroid/widget/TextView;
 
     move-result-object v4
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
 
     move-result-object v7
 
@@ -1735,9 +2043,9 @@
 
     aput-object v3, v5, v6
 
-    const v3, 0x7f12111b
+    const v3, 0x7f12115d
 
-    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
@@ -1745,7 +2053,7 @@
 
     aput-object p1, v5, v1
 
-    invoke-virtual {p0, v0, v5}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v0, v5}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -1771,7 +2079,7 @@
 
     invoke-virtual {v4, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getLegalese()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getLegalese()Landroid/widget/TextView;
 
     move-result-object p1
 
@@ -1796,10 +2104,10 @@
     .end packed-switch
 .end method
 
-.method private final dismissAllDialogs(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)V
+.method private final dismissAllDialogs(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;)V
     .locals 5
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->ALL_DIALOG_TAGS:Ljava/util/Set;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->ALL_DIALOG_TAGS:Ljava/util/Set;
 
     check-cast v0, Ljava/lang/Iterable;
 
@@ -1831,9 +2139,9 @@
 
     if-eqz p1, :cond_1
 
-    sget-object v4, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+    sget-object v4, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
-    invoke-static {v4, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;->access$getTag(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)Ljava/lang/String;
+    invoke-static {v4, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->access$getTag(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -1877,9 +2185,9 @@
 
     move-object v1, p0
 
-    check-cast v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+    check-cast v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    invoke-direct {v1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->dismissDialog(Ljava/lang/String;)V
+    invoke-direct {v1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->dismissDialog(Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -1887,7 +2195,7 @@
     return-void
 .end method
 
-.method static synthetic dismissAllDialogs$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)V
+.method static synthetic dismissAllDialogs$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)V
     .locals 0
 
     and-int/lit8 p2, p2, 0x1
@@ -1897,7 +2205,7 @@
     const/4 p1, 0x0
 
     :cond_0
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->dismissAllDialogs(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->dismissAllDialogs(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;)V
 
     return-void
 .end method
@@ -1905,7 +2213,7 @@
 .method private final dismissDialog(Ljava/lang/String;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
 
@@ -1932,9 +2240,9 @@
 .method private final getActiveSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->activeSubscriptionView$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->activeSubscriptionView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0xa
 
@@ -1952,9 +2260,9 @@
 .method private final getBuyTier1Container()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier1Container$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier1Container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x7
 
@@ -1972,9 +2280,9 @@
 .method private final getBuyTier1Gift()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier1Gift$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier1Gift$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x6
 
@@ -1992,9 +2300,9 @@
 .method private final getBuyTier1Monthly()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier1Monthly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier1Monthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x5
 
@@ -2012,9 +2320,9 @@
 .method private final getBuyTier1Yearly()Lcom/discord/views/BoxedButton;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier1Yearly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier1Yearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x4
 
@@ -2032,9 +2340,9 @@
 .method private final getBuyTier2Container()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier2Container$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier2Container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0x8
 
@@ -2052,9 +2360,9 @@
 .method private final getBuyTier2Gift()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier2Gift$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier2Gift$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x3
 
@@ -2072,9 +2380,9 @@
 .method private final getBuyTier2Monthly()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier2Monthly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier2Monthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -2092,9 +2400,9 @@
 .method private final getBuyTier2Yearly()Lcom/discord/views/BoxedButton;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->buyTier2Yearly$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier2Yearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -2109,6 +2417,86 @@
     return-object v0
 .end method
 
+.method private final getCreditContainer()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->creditContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$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 getCreditDivider()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->creditDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$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 getCreditNitro()Lcom/discord/widgets/settings/premium/AccountCreditView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->creditNitro$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$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/discord/widgets/settings/premium/AccountCreditView;
+
+    return-object v0
+.end method
+
+.method private final getCreditNitroClassic()Lcom/discord/widgets/settings/premium/AccountCreditView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->creditNitroClassic$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$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, Lcom/discord/widgets/settings/premium/AccountCreditView;
+
+    return-object v0
+.end method
+
 .method private final getDropdownItems(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;)Ljava/util/List;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
@@ -2131,7 +2519,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -2170,16 +2558,16 @@
 
     if-nez v1, :cond_2
 
-    sget-object v1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->AF:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+    sget-object v1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->AP:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
 
     invoke-virtual {v2, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_2
     check-cast p2, Ljava/lang/Iterable;
 
-    new-instance v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1;
+    new-instance v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1;
 
-    invoke-direct {v1, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1;-><init>(Lcom/discord/models/domain/ModelSubscription;)V
+    invoke-direct {v1, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1;-><init>(Lcom/discord/models/domain/ModelSubscription;)V
 
     check-cast v1, Ljava/util/Comparator;
 
@@ -2259,7 +2647,7 @@
     :cond_4
     if-eqz v0, :cond_5
 
-    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->AD:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->AO:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
 
     invoke-virtual {v2, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -2272,9 +2660,9 @@
 .method private final getGrandfathered()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->grandfathered$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->grandfathered$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0xd
 
@@ -2300,7 +2688,7 @@
 
     if-ne v0, v1, :cond_0
 
-    const p1, 0x7f08008f
+    const p1, 0x7f080090
 
     return p1
 
@@ -2309,7 +2697,7 @@
 
     if-ne v0, v1, :cond_1
 
-    const p1, 0x7f080091
+    const p1, 0x7f080092
 
     return p1
 
@@ -2318,7 +2706,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$4:[I
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->ordinal()I
 
@@ -2353,12 +2741,12 @@
     throw v0
 
     :pswitch_0
-    const p1, 0x7f08008e
+    const p1, 0x7f08008f
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f080090
+    const p1, 0x7f080091
 
     return p1
 
@@ -2397,7 +2785,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$5:[I
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->ordinal()I
 
@@ -2432,18 +2820,18 @@
     throw v0
 
     :pswitch_0
-    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AG:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AQ:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     return-object p1
 
     :pswitch_1
-    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AH:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AR:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     return-object p1
 
     :cond_1
     :goto_0
-    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AJ:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->AS:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     return-object p1
 
@@ -2467,7 +2855,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$6:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$6:[I
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->ordinal()I
 
@@ -2491,12 +2879,12 @@
 
     if-eq p1, v0, :cond_0
 
-    const p1, 0x7f08040e
+    const p1, 0x7f080428
 
     return p1
 
     :cond_0
-    const p1, 0x7f08040b
+    const p1, 0x7f080425
 
     return p1
 .end method
@@ -2534,7 +2922,7 @@
 
     move-result-object v9
 
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
 
     move-result-object v10
 
@@ -2554,13 +2942,13 @@
 
     move-result-object v1
 
-    const v2, 0x7f120e05
+    const v2, 0x7f120e3e
 
     new-array v3, v6, [Ljava/lang/Object;
 
     aput-object v1, v3, v5
 
-    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -2585,7 +2973,7 @@
 
     move-result-object v9
 
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
 
     move-result-object v10
 
@@ -2624,15 +3012,15 @@
     goto :goto_0
 
     :cond_1
-    new-instance v3, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$getHeaderText$1;
+    new-instance v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1;
 
-    invoke-direct {v3, v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$getHeaderText$1;-><init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;)V
+    invoke-direct {v3, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1;-><init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPrice()I
 
     move-result v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
 
     move-result-object v2
 
@@ -2642,7 +3030,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$getHeaderText$1;->invoke()I
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1;->invoke()I
 
     move-result v2
 
@@ -2654,7 +3042,7 @@
 
     aput-object v4, v3, v6
 
-    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -2668,13 +3056,13 @@
 
     :cond_2
     :goto_0
-    const v1, 0x7f120d66
+    const v1, 0x7f120da8
 
     new-array v2, v6, [Ljava/lang/Object;
 
     aput-object v4, v2, v5
 
-    invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -2690,9 +3078,9 @@
 .method private final getLegalese()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->legalese$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->legalese$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0xc
 
@@ -2722,7 +3110,7 @@
 
     if-ne v1, v2, :cond_0
 
-    const p3, 0x7f1202f5
+    const p3, 0x7f1202f9
 
     goto :goto_0
 
@@ -2737,7 +3125,7 @@
 
     if-ne p3, v1, :cond_1
 
-    const p3, 0x7f1202fa
+    const p3, 0x7f1202fe
 
     goto :goto_0
 
@@ -2750,7 +3138,7 @@
 
     if-ne p3, v1, :cond_2
 
-    const p3, 0x7f1202f4
+    const p3, 0x7f1202f8
 
     goto :goto_0
 
@@ -2763,7 +3151,7 @@
 
     if-ne p3, v1, :cond_3
 
-    const p3, 0x7f1202f9
+    const p3, 0x7f1202fd
 
     goto :goto_0
 
@@ -2796,7 +3184,7 @@
     return-object p1
 .end method
 
-.method static synthetic getPriceText$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Landroid/content/Context;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;ZILjava/lang/Object;)Ljava/lang/String;
+.method static synthetic getPriceText$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Landroid/content/Context;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;ZILjava/lang/Object;)Ljava/lang/String;
     .locals 0
 
     and-int/lit8 p4, p4, 0x4
@@ -2806,7 +3194,7 @@
     const/4 p3, 0x0
 
     :cond_0
-    invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getPriceText(Landroid/content/Context;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Ljava/lang/String;
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getPriceText(Landroid/content/Context;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Z)Ljava/lang/String;
 
     move-result-object p0
 
@@ -2816,9 +3204,9 @@
 .method private final getRetryButton()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->retryButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->retryButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0xb
 
@@ -2836,9 +3224,9 @@
 .method private final getScrollView()Landroid/widget/ScrollView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->scrollView$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->scrollView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0xe
 
@@ -2853,7 +3241,7 @@
     return-object v0
 .end method
 
-.method private final getSubscriptionErrorText(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;)Ljava/lang/CharSequence;
+.method private final getSubscriptionErrorText(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;)Ljava/lang/CharSequence;
     .locals 7
 
     if-nez p1, :cond_0
@@ -2863,9 +3251,9 @@
     return-object p1
 
     :cond_0
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$3:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$WhenMappings;->$EnumSwitchMapping$3:[I
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$SubscriptionError;->ordinal()I
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;->ordinal()I
 
     move-result p1
 
@@ -2875,17 +3263,17 @@
 
     if-ne p1, v0, :cond_1
 
-    const p1, 0x7f1205bf
+    const p1, 0x7f1205cb
 
     new-array v0, v0, [Ljava/lang/Object;
 
     const/4 v1, 0x0
 
-    sget-object v2, Lcom/discord/app/e;->um:Ljava/lang/String;
+    sget-object v2, Lcom/discord/app/e;->ul:Ljava/lang/String;
 
     aput-object v2, v0, v1
 
-    invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -2893,7 +3281,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
 
     move-result-object v1
 
@@ -2930,9 +3318,9 @@
 .method private final getUploadPerks()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->uploadPerks$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->uploadPerks$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -2950,9 +3338,9 @@
 .method private final getViewFlipper()Landroid/widget/ViewFlipper;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0x9
 
@@ -2970,7 +3358,7 @@
 .method private final launchAddPaymentMethodFlow()V
     .locals 3
 
-    sget-object v0, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+    sget-object v0, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
     move-object v1, p0
 
@@ -2982,7 +3370,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/nitro/NitroUtils;->openWebAddPaymentSource(Lcom/discord/app/AppFragment;Landroid/net/Uri;)V
+    invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/premium/PremiumUtils;->openWebAddPaymentSource(Lcom/discord/app/AppFragment;Landroid/net/Uri;)V
 
     return-void
 .end method
@@ -2994,25 +3382,25 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     if-nez v0, :cond_0
 
     const-string v1, "viewModel"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$c;
 
     iget-object p1, p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$c;->paymentSource:Lcom/discord/models/domain/ModelPaymentSource;
 
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->changePaymentSource(Lcom/discord/models/domain/ModelPaymentSource;)V
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->changePaymentSource(Lcom/discord/models/domain/ModelPaymentSource;)V
 
     return-void
 
     :cond_1
-    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->AD:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->AO:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -3020,12 +3408,12 @@
 
     if-eqz v0, :cond_2
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->launchAddPaymentMethodFlow()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->launchAddPaymentMethodFlow()V
 
     return-void
 
     :cond_2
-    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->AF:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->AP:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -3059,7 +3447,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier1Container()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier1Container()Landroid/view/View;
 
     move-result-object p1
 
@@ -3067,7 +3455,7 @@
 
     move-result p1
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getScrollView()Landroid/widget/ScrollView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getScrollView()Landroid/widget/ScrollView;
 
     move-result-object v1
 
@@ -3094,7 +3482,7 @@
 
     if-ne p1, v1, :cond_3
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getBuyTier2Container()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier2Container()Landroid/view/View;
 
     move-result-object p1
 
@@ -3109,7 +3497,7 @@
     const/4 p1, 0x0
 
     :goto_2
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getScrollView()Landroid/widget/ScrollView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getScrollView()Landroid/widget/ScrollView;
 
     move-result-object v1
 
@@ -3121,7 +3509,7 @@
 .method private final scrollToTop()V
     .locals 2
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getScrollView()Landroid/widget/ScrollView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getScrollView()Landroid/widget/ScrollView;
 
     move-result-object v0
 
@@ -3132,10 +3520,10 @@
     return-void
 .end method
 
-.method private final showContent(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;)V
+.method private final showContent(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;)V
     .locals 10
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getViewFlipper()Landroid/widget/ViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getViewFlipper()Landroid/widget/ViewFlipper;
 
     move-result-object v0
 
@@ -3143,7 +3531,7 @@
 
     invoke-virtual {v0, v1}, Landroid/widget/ViewFlipper;->setDisplayedChild(I)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
 
     move-result-object v0
 
@@ -3161,7 +3549,7 @@
 
     if-nez v0, :cond_1
 
-    sget-object v1, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -3169,7 +3557,7 @@
 
     invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
 
     move-result-object p1
 
@@ -3193,7 +3581,7 @@
 
     invoke-static/range {v1 .. v6}, 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-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object p1
 
@@ -3205,27 +3593,37 @@
     return-void
 
     :cond_1
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureActiveSubscriptionView(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureActiveSubscriptionView(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
 
     move-result-object v0
 
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureGrandfatheredHeader(Lcom/discord/models/domain/ModelSubscription;)V
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureGrandfatheredHeader(Lcom/discord/models/domain/ModelSubscription;)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
 
     move-result-object v0
 
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureLegalese(Lcom/discord/models/domain/ModelSubscription;)V
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureLegalese(Lcom/discord/models/domain/ModelSubscription;)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
 
     move-result-object v0
 
-    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureButtons(Lcom/discord/models/domain/ModelSubscription;)V
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureButtons(Lcom/discord/models/domain/ModelSubscription;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getMostRecentIntent()Landroid/content/Intent;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getEntitlements()Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+
+    move-result-object v1
+
+    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureAccountCredit(Ljava/util/List;Lcom/discord/models/domain/ModelSubscription;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getMostRecentIntent()Landroid/content/Intent;
 
     move-result-object v0
 
@@ -3290,9 +3688,9 @@
 
     move-result-object v1
 
-    new-instance v4, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showContent$1;
+    new-instance v4, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showContent$1;
 
-    invoke-direct {v4, p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showContent$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Ljava/lang/Integer;)V
+    invoke-direct {v4, p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showContent$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Ljava/lang/Integer;)V
 
     check-cast v4, Lrx/functions/Action1;
 
@@ -3305,7 +3703,7 @@
     :catch_0
     move-exception v0
 
-    sget-object v4, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     move-object v6, v0
 
@@ -3322,41 +3720,41 @@
     invoke-static/range {v4 .. v9}, 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
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getMostRecentIntent()Landroid/content/Intent;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getMostRecentIntent()Landroid/content/Intent;
 
     move-result-object v0
 
     invoke-virtual {v0, v2}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
 
     :cond_4
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
 
     move-result-object v0
 
     if-eqz v0, :cond_5
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
 
     move-result-object p1
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->showDialog(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->showDialog(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;)V
 
     return-void
 
     :cond_5
     const/4 p1, 0x1
 
-    invoke-static {p0, v3, p1, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->dismissAllDialogs$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)V
+    invoke-static {p0, v3, p1, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->dismissAllDialogs$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)V
 
     return-void
 .end method
 
-.method private final showDialog(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)V
+.method private final showDialog(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;)V
     .locals 3
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->dismissAllDialogs(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->dismissAllDialogs(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
 
@@ -3364,9 +3762,9 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
-    invoke-static {v1, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;->access$getTag(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$Companion;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;)Ljava/lang/String;
+    invoke-static {v1, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->access$getTag(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -3385,37 +3783,37 @@
     if-nez v2, :cond_3
 
     :cond_0
-    instance-of v2, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$CancelPremium;
+    instance-of v2, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$CancelPremium;
 
     if-eqz v2, :cond_1
 
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;
 
-    invoke-direct {p1}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;-><init>()V
+    invoke-direct {p1}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;-><init>()V
 
-    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
 
     :cond_1
-    instance-of v2, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$DowngradePremium;
+    instance-of v2, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$DowngradePremium;
 
     if-eqz v2, :cond_2
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->showDowngradeModal()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->showDowngradeModal()V
 
     return-void
 
     :cond_2
-    instance-of p1, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
+    instance-of p1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
 
     if-eqz p1, :cond_3
 
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;
 
-    invoke-direct {p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;-><init>()V
+    invoke-direct {p1}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;-><init>()V
 
-    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     :cond_3
     return-void
@@ -3426,7 +3824,7 @@
 
     new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
 
     move-result-object v1
 
@@ -3436,7 +3834,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v1, 0x7f120e44
+    const v1, 0x7f120e7d
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -3448,19 +3846,19 @@
 
     move-result-object v0
 
-    const v1, 0x7f120e43
+    const v1, 0x7f120e7c
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    new-instance v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showDowngradeModal$1;
+    new-instance v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showDowngradeModal$1;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showDowngradeModal$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showDowngradeModal$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const v2, 0x7f120c77
+    const v2, 0x7f120cb0
 
     invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -3472,7 +3870,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v1
 
@@ -3488,7 +3886,7 @@
 .method private final showFailureUI()V
     .locals 2
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getViewFlipper()Landroid/widget/ViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getViewFlipper()Landroid/widget/ViewFlipper;
 
     move-result-object v0
 
@@ -3496,13 +3894,13 @@
 
     invoke-virtual {v0, v1}, Landroid/widget/ViewFlipper;->setDisplayedChild(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getRetryButton()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getRetryButton()Landroid/widget/Button;
 
     move-result-object v0
 
-    new-instance v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showFailureUI$1;
+    new-instance v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showFailureUI$1;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$showFailureUI$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showFailureUI$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     check-cast v1, Landroid/view/View$OnClickListener;
 
@@ -3512,7 +3910,7 @@
 
     const/4 v1, 0x1
 
-    invoke-static {p0, v0, v1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->dismissAllDialogs$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)V
+    invoke-static {p0, v0, v1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->dismissAllDialogs$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)V
 
     return-void
 .end method
@@ -3520,7 +3918,7 @@
 .method private final showLoadingUI()V
     .locals 2
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getViewFlipper()Landroid/widget/ViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getViewFlipper()Landroid/widget/ViewFlipper;
 
     move-result-object v0
 
@@ -3528,11 +3926,11 @@
 
     invoke-virtual {v0, v1}, Landroid/widget/ViewFlipper;->setDisplayedChild(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->scrollToTop()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->scrollToTop()V
 
     const/4 v0, 0x0
 
-    invoke-static {p0, v0, v1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->dismissAllDialogs$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)V
+    invoke-static {p0, v0, v1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->dismissAllDialogs$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)V
 
     return-void
 .end method
@@ -3542,7 +3940,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01b5
+    const v0, 0x7f0d01bf
 
     return v0
 .end method
@@ -3556,7 +3954,7 @@
 
     if-ne p1, p2, :cond_1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object p1
 
@@ -3564,7 +3962,7 @@
 
     move-result-object p1
 
-    const-class p2, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    const-class p2, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     invoke-virtual {p1, p2}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
@@ -3574,9 +3972,9 @@
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->getLaunchPremiumTabStartTimeMs()J
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->getLaunchPremiumTabStartTimeMs()J
 
     move-result-wide p2
 
@@ -3590,7 +3988,7 @@
 
     move-result-wide p2
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->getLaunchPremiumTabStartTimeMs()J
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->getLaunchPremiumTabStartTimeMs()J
 
     move-result-wide v0
 
@@ -3610,11 +4008,11 @@
 .method public final onPause()V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->connection:Landroid/content/ServiceConnection;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->connection:Landroid/content/ServiceConnection;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
 
     move-result-object v1
 
@@ -3623,7 +4021,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->connection:Landroid/content/ServiceConnection;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->connection:Landroid/content/ServiceConnection;
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onPause()V
 
@@ -3635,7 +4033,7 @@
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onResume()V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object v0
 
@@ -3643,7 +4041,7 @@
 
     move-result-object v0
 
-    const-class v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    const-class v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
@@ -3653,20 +4051,20 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     const-string v1, "viewModel"
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->getViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->getViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -3678,7 +4076,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -3698,15 +4096,15 @@
 
     move-result-object v5
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$1;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     move-object v11, v0
 
     check-cast v11, Lkotlin/jvm/functions/Function1;
 
-    const-class v6, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;
+    const-class v6, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
     const/4 v7, 0x0
 
@@ -3722,14 +4120,14 @@
 
     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
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     if-nez v0, :cond_1
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->getRequestBuyPlanSubject()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->getRequestBuyPlanSubject()Lrx/Observable;
 
     move-result-object v0
 
@@ -3749,9 +4147,9 @@
 
     const/4 v10, 0x0
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$2;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$onResume$2;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
     move-object v11, v0
 
@@ -3763,9 +4161,9 @@
 
     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
 
-    sget-object v0, Lcom/discord/utilities/nitro/NitroUtils;->INSTANCE:Lcom/discord/utilities/nitro/NitroUtils;
+    sget-object v0, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->requireContext()Landroid/content/Context;
 
     move-result-object v1
 
@@ -3773,19 +4171,19 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/nitro/NitroUtils;->warmupBillingTabs(Landroid/content/Context;)Landroidx/browser/customtabs/CustomTabsServiceConnection;
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/premium/PremiumUtils;->warmupBillingTabs(Landroid/content/Context;)Landroidx/browser/customtabs/CustomTabsServiceConnection;
 
     move-result-object v0
 
     check-cast v0, Landroid/content/ServiceConnection;
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->connection:Landroid/content/ServiceConnection;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->connection:Landroid/content/ServiceConnection;
 
     return-void
 .end method
 
 .method public final onViewBound(Landroid/view/View;)V
-    .locals 4
+    .locals 5
 
     const-string v0, "view"
 
@@ -3793,61 +4191,69 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f121231
+    const p1, 0x7f12127e
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->setActionBarSubtitle(I)Lkotlin/Unit;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120e31
+    const p1, 0x7f120e6b
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->setActionBarTitle(I)Lkotlin/Unit;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->setActionBarTitle(I)Lkotlin/Unit;
 
-    const/4 p1, 0x0
+    const/4 p1, 0x3
 
     const/4 v0, 0x0
 
-    const/4 v1, 0x3
+    const/4 v1, 0x0
 
-    invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    invoke-static {p0, v0, v1, p1, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getUploadPerks()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getUploadPerks()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v2
 
-    const/4 v2, 0x2
+    new-array p1, p1, [Ljava/lang/Object;
 
-    new-array v2, v2, [Ljava/lang/Object;
+    const v3, 0x7f1205ac
 
-    const v3, 0x7f1205a0
-
-    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    aput-object v3, v2, p1
+    aput-object v3, p1, v0
 
-    const p1, 0x7f12059e
+    const v0, 0x7f1205ab
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
-    move-result-object p1
+    move-result-object v0
 
     const/4 v3, 0x1
 
-    aput-object p1, v2, v3
+    aput-object v0, p1, v3
 
-    const p1, 0x7f120d85
+    const v0, 0x7f1205aa
 
-    invoke-virtual {p0, p1, v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v4, 0x2
+
+    aput-object v0, p1, v4
+
+    const v0, 0x7f120db8
+
+    invoke-virtual {p0, v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
     check-cast p1, Ljava/lang/CharSequence;
 
-    invoke-virtual {v1, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-static {p0, v0, v3, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->configureButtonText$default(Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;Lcom/discord/models/domain/ModelSubscription;ILjava/lang/Object;)V
+    invoke-static {p0, v1, v3, 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/nitro/WidgetSettingsPremium;->configureGiftingButtons()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureGiftingButtons()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion.smali
similarity index 64%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion.smali
index b18e0d8a4a..c798990f25 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion;
 .super Ljava/lang/Object;
-.source "WidgetSettingsBoost.kt"
+.source "WidgetSettingsPremiumGuildSubscription.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion;-><init>()V
 
     return-void
 .end method
@@ -40,7 +40,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
 
     invoke-static {p1, v0}, Lcom/discord/app/f;->b(Landroid/content/Context;Ljava/lang/Class;)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1$1.smali
similarity index 71%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1$1.smali
index 16cd56196d..981a6bff4a 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1$1;
 .super Ljava/lang/Object;
-.source "WidgetSettingsBoost.kt"
+.source "WidgetSettingsPremiumGuildSubscription.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1;->call(Lcom/discord/stores/StorePremiumGuildSubscription$State;)Lrx/Observable;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;->call(Lcom/discord/stores/StorePremiumGuildSubscription$State;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -40,9 +40,9 @@
 .method constructor <init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Ljava/util/Set;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1$1;->$premiumGuildSubState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1$1;->$premiumGuildSubState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
-    iput-object p2, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1$1;->$subscribedGuildIds:Ljava/util/Set;
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1$1;->$subscribedGuildIds:Ljava/util/Set;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,7 +56,7 @@
 
     check-cast p1, Ljava/util/Map;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1$1;->call(Ljava/util/Map;)Lkotlin/Pair;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1$1;->call(Ljava/util/Map;)Lkotlin/Pair;
 
     move-result-object p1
 
@@ -81,7 +81,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1$1;->$premiumGuildSubState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1$1;->$premiumGuildSubState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
     const-string v1, "guilds"
 
@@ -115,7 +115,7 @@
 
     check-cast v2, Ljava/util/Map$Entry;
 
-    iget-object v3, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1$1;->$subscribedGuildIds:Ljava/util/Set;
+    iget-object v3, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1$1;->$subscribedGuildIds:Ljava/util/Set;
 
     invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1.smali
similarity index 75%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1.smali
index 197118d8c3..36a1b58888 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;
 .super Ljava/lang/Object;
-.source "WidgetSettingsBoost.kt"
+.source "WidgetSettingsPremiumGuildSubscription.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;->get()Lrx/Observable;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;->get()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,18 +33,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1;->call(Lcom/discord/stores/StorePremiumGuildSubscription$State;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;->call(Lcom/discord/stores/StorePremiumGuildSubscription$State;)Lrx/Observable;
 
     move-result-object p1
 
@@ -163,9 +163,9 @@
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1$1;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1$1;
 
-    invoke-direct {v2, p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1$1;-><init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Ljava/util/Set;)V
+    invoke-direct {v2, p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1$1;-><init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Ljava/util/Set;)V
 
     check-cast v2, Lrx/functions/b;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2.smali
similarity index 53%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$2.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2.smali
index 8183f999c6..05701e2277 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2.smali
@@ -1,14 +1,14 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$2;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;
 .super Ljava/lang/Object;
-.source "WidgetSettingsBoost.kt"
+.source "WidgetSettingsPremiumGuildSubscription.kt"
 
 # interfaces
-.implements Lrx/functions/Func3;
+.implements Lrx/functions/Func2;
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;->get()Lrx/Observable;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;->get()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -22,31 +22,29 @@
         "Ljava/lang/Object;",
         "T2:",
         "Ljava/lang/Object;",
-        "T3:",
-        "Ljava/lang/Object;",
         "R:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lrx/functions/Func2<",
+        "TT1;TT2;TR;>;"
     }
 .end annotation
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$2;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$2;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$2;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$2;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$2;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;
 
     return-void
 .end method
@@ -61,8 +59,8 @@
 
 
 # virtual methods
-.method public final call(Lkotlin/Pair;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
-    .locals 3
+.method public final call(Lkotlin/Pair;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -76,9 +74,8 @@
             "Lcom/discord/models/domain/ModelGuild;",
             ">;>;",
             "Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;",
-            "Lcom/discord/models/domain/ModelUser;",
             ")",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;"
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;"
         }
     .end annotation
 
@@ -120,11 +117,7 @@
 
     if-eqz v1, :cond_8
 
-    sget-object v1, Lcom/discord/utilities/nitro/BoostUtils;->INSTANCE:Lcom/discord/utilities/nitro/BoostUtils;
-
-    const-string v2, "meUser"
-
-    invoke-static {p3, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    sget-object v1, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
     check-cast p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
 
@@ -132,25 +125,25 @@
 
     move-result-object v2
 
-    invoke-virtual {v1, p3, v2}, Lcom/discord/utilities/nitro/BoostUtils;->calculateTotalBoostCount(Lcom/discord/models/domain/ModelUser;Ljava/util/List;)I
+    invoke-virtual {v1, v2}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculateTotalBoostCount(Ljava/util/List;)I
 
     move-result v1
 
     if-lez v1, :cond_2
 
-    new-instance v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loaded;
+    new-instance v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;
 
-    sget-object v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;
+    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;
 
     check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    invoke-static {v2, v0, p2, p1, p3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;->access$createBoostItems(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Ljava/util/List;
+    invoke-static {v2, v0, p2, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;->access$createBoostItems(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;Ljava/util/Map;)Ljava/util/List;
 
     move-result-object p1
 
-    invoke-direct {v1, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loaded;-><init>(Ljava/util/List;)V
+    invoke-direct {v1, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;-><init>(Ljava/util/List;)V
 
-    check-cast v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
+    check-cast v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 
     return-object v1
 
@@ -163,9 +156,9 @@
 
     instance-of p2, p1, Ljava/util/Collection;
 
-    const/4 p3, 0x1
+    const/4 v0, 0x1
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     if-eqz p2, :cond_3
 
@@ -199,19 +192,19 @@
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    move-result-object v1
+    move-result-object v2
 
-    sget-object v2, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sget-object v3, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    if-eq v1, v2, :cond_6
+    if-eq v2, v3, :cond_6
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     move-result-object p2
 
-    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sget-object v2, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    if-ne p2, v1, :cond_5
+    if-ne p2, v2, :cond_5
 
     goto :goto_0
 
@@ -230,51 +223,49 @@
     goto :goto_2
 
     :cond_7
-    const/4 p3, 0x0
+    const/4 v0, 0x0
 
     :goto_2
-    new-instance p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$LoadedNoNitro;
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;
 
-    invoke-direct {p1, p3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$LoadedNoNitro;-><init>(Z)V
+    invoke-direct {p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;-><init>(Z)V
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 
     return-object p1
 
     :cond_8
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 
     return-object p1
 
     :cond_9
     :goto_3
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 
     return-object p1
 
     :cond_a
     :goto_4
-    sget-object p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loading;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loading;
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loading;
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 
     return-object p1
 .end method
 
-.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Lkotlin/Pair;
 
     check-cast p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    check-cast p3, Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$2;->call(Lkotlin/Pair;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;->call(Lkotlin/Pair;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion.smali
similarity index 52%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion.smali
index c874a22c34..bf3497c61b 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;
 .super Ljava/lang/Object;
-.source "WidgetSettingsBoost.kt"
+.source "WidgetSettingsPremiumGuildSubscription.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,23 +26,23 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;-><init>()V
 
     return-void
 .end method
 
-.method public static final synthetic access$createBoostItems(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Ljava/util/List;
+.method public static final synthetic access$createBoostItems(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;Ljava/util/Map;)Ljava/util/List;
     .locals 0
 
-    invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;->createBoostItems(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Ljava/util/List;
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;->createBoostItems(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;Ljava/util/Map;)Ljava/util/List;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method private final createBoostItems(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Ljava/util/List;
-    .locals 4
+.method private final createBoostItems(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;Ljava/util/Map;)Ljava/util/List;
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -52,11 +52,9 @@
             "Ljava/lang/Long;",
             "+",
             "Lcom/discord/models/domain/ModelGuild;",
-            ">;",
-            "Lcom/discord/models/domain/ModelUser;",
-            ")",
+            ">;)",
             "Ljava/util/List<",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;",
             ">;"
         }
     .end annotation
@@ -77,9 +75,9 @@
 
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    sget-object v2, Lcom/discord/utilities/nitro/BoostUtils;->INSTANCE:Lcom/discord/utilities/nitro/BoostUtils;
+    sget-object v2, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
-    invoke-virtual {v2, p4, p2}, Lcom/discord/utilities/nitro/BoostUtils;->calculateTotalBoostCount(Lcom/discord/models/domain/ModelUser;Ljava/util/List;)I
+    invoke-virtual {v2, p2}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculateTotalBoostCount(Ljava/util/List;)I
 
     move-result p2
 
@@ -92,15 +90,15 @@
     goto :goto_0
 
     :cond_0
-    move-object p4, p1
+    move-object v2, p1
 
-    check-cast p4, Ljava/util/Collection;
+    check-cast v2, Ljava/util/Collection;
 
-    invoke-interface {p4}, Ljava/util/Collection;->size()I
+    invoke-interface {v2}, Ljava/util/Collection;->size()I
 
-    move-result p4
+    move-result v2
 
-    sub-int/2addr p2, p4
+    sub-int/2addr p2, v2
 
     :goto_0
     if-nez v0, :cond_1
@@ -108,15 +106,15 @@
     if-lez p2, :cond_3
 
     :cond_1
-    sget-object p4, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;
+    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
 
     if-eqz v0, :cond_2
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->getExpiresAtTimestamp()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 v0
 
@@ -126,20 +124,20 @@
     const/4 v0, 0x0
 
     :goto_1
-    invoke-virtual {p4, v0, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;->createBoostInfoItem(Ljava/lang/Long;I)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
+    invoke-virtual {v2, v0, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;->createBoostInfoItem(Ljava/lang/Long;I)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
-    move-result-object p4
+    move-result-object v0
 
-    invoke-virtual {v1, p4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_3
     if-lez p2, :cond_4
 
-    sget-object p2, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;
+    sget-object p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
 
-    const/4 p4, 0x1
+    const/4 v0, 0x1
 
-    invoke-virtual {p2, p4}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;->createAvailableBoostItem(Z)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
+    invoke-virtual {p2, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;->createAvailableBoostItem(Z)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
     move-result-object p2
 
@@ -154,11 +152,11 @@
 
     if-eqz p2, :cond_5
 
-    sget-object p2, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;
+    sget-object p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
 
-    const/4 p4, 0x0
+    const/4 v0, 0x0
 
-    invoke-virtual {p2, p4}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;->createAvailableBoostItem(Z)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
+    invoke-virtual {p2, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;->createAvailableBoostItem(Z)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
     move-result-object p2
 
@@ -185,7 +183,7 @@
 
     check-cast p2, Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
-    sget-object p4, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
 
@@ -193,15 +191,15 @@
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object v2
 
-    invoke-interface {p3, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p3, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v2
 
-    check-cast v0, Lcom/discord/models/domain/ModelGuild;
+    check-cast v2, Lcom/discord/models/domain/ModelGuild;
 
-    invoke-virtual {p4, p2, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem$Companion;->createBoostedGuildItem(Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
+    invoke-virtual {v0, p2, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;->createBoostedGuildItem(Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
     move-result-object p2
 
@@ -218,12 +216,12 @@
 
 # virtual methods
 .method public final get()Lrx/Observable;
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
             "Lrx/Observable<",
-            "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;",
             ">;"
         }
     .end annotation
@@ -242,7 +240,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$1;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;
 
     check-cast v1, Lrx/functions/b;
 
@@ -258,7 +256,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -272,21 +270,11 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
+    check-cast v2, Lrx/functions/Func2;
 
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/discord/stores/StoreUser;->getMe()Lrx/Observable;
-
-    move-result-object v2
-
-    sget-object v3, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$2;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion$get$2;
-
-    check-cast v3, Lrx/functions/Func3;
-
-    invoke-static {v0, v1, v2, v3}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
+    invoke-static {v0, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure.smali
new file mode 100644
index 0000000000..3b403e839d
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;
+.super Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+.source "WidgetSettingsPremiumGuildSubscription.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Failure"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded.smali
new file mode 100644
index 0000000000..6758209f65
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded.smali
@@ -0,0 +1,70 @@
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;
+.super Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+.source "WidgetSettingsPremiumGuildSubscription.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Loaded"
+.end annotation
+
+
+# instance fields
+.field private final premiumGuildSubscriptionItems:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;",
+            ">;"
+        }
+    .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<",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "premiumGuildSubscriptionItems"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;->premiumGuildSubscriptionItems:Ljava/util/List;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getPremiumGuildSubscriptionItems()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;->premiumGuildSubscriptionItems:Ljava/util/List;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2.smali
new file mode 100644
index 0000000000..a2e8a7c923
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;
+.super Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+.source "WidgetSettingsPremiumGuildSubscription.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "LoadedNotPremiumTier2"
+.end annotation
+
+
+# instance fields
+.field private final isNitroClassic:Z
+
+
+# direct methods
+.method public constructor <init>(Z)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-boolean p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;->isNitroClassic:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final isNitroClassic()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;->isNitroClassic:Z
+
+    return v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loading.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loading.smali
new file mode 100644
index 0000000000..1e4e7b4022
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loading.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loading;
+.super Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+.source "WidgetSettingsPremiumGuildSubscription.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Loading"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loading;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loading;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loading;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loading;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model.smali
new file mode 100644
index 0000000000..7810ddb8e3
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model.smali
@@ -0,0 +1,60 @@
+.class abstract Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremiumGuildSubscription.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x408
+    name = "Model"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loading;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;
+
+    return-void
+.end method
+
+.method private 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/premium/WidgetSettingsPremiumGuildSubscription$Model;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1.smali
similarity index 51%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1.smali
index fdb05efd99..e92bb61972 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1;
 .super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsBoost.kt"
+.source "WidgetSettingsPremiumGuildSubscription.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function0;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
 
     const/4 p1, 0x0
 
@@ -48,9 +48,9 @@
 .method public final bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$1;->invoke()V
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -60,7 +60,7 @@
 
     sget-object v0, Lcom/discord/widgets/guilds/list/WidgetGuildSearch;->Companion:Lcom/discord/widgets/guilds/list/WidgetGuildSearch$Companion;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$1;->this$0:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
 
     check-cast v1, Landroidx/fragment/app/Fragment;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$2.smali
new file mode 100644
index 0000000000..66ba9836a8
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$2.smali
@@ -0,0 +1,94 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$2;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSettingsPremiumGuildSubscription.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Long;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
+
+    const/4 p1, 0x2
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Ljava/lang/Number;
+
+    invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
+
+    move-result-wide v0
+
+    check-cast p2, Ljava/lang/Number;
+
+    invoke-virtual {p2}, Ljava/lang/Number;->longValue()J
+
+    move-result-wide p1
+
+    invoke-virtual {p0, v0, v1, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$2;->invoke(JJ)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(JJ)V
+    .locals 6
+
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion;
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->requireContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    const-string v2, "requireContext()"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-wide v2, p1
+
+    move-wide v4, p3
+
+    invoke-virtual/range {v0 .. v5}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;JJ)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1.smali
similarity index 60%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1.smali
index 8acf705117..80d18d7ee5 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1;
 .super Ljava/lang/Object;
-.source "WidgetSettingsBoost.kt"
+.source "WidgetSettingsPremiumGuildSubscription.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$1;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$1;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1;
 
     return-void
 .end method
@@ -59,9 +59,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/e;->uy:Lcom/discord/app/e;
+    sget-object v0, Lcom/discord/app/e;->ux:Lcom/discord/app/e;
 
-    sget-wide v0, Lcom/discord/app/e;->ux:J
+    sget-wide v0, Lcom/discord/app/e;->uw:J
 
     invoke-static {v0, v1}, Lcom/discord/app/e;->k(J)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$2.smali
new file mode 100644
index 0000000000..a940160d4a
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$2.smali
@@ -0,0 +1,45 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$2;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremiumGuildSubscription.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
+
+    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/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->access$fetchData(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$3.smali
new file mode 100644
index 0000000000..ab3888a588
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$3.smali
@@ -0,0 +1,61 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$3;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremiumGuildSubscription.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$3;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
+
+    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 p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$3;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->requireContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    const-string v1, "requireContext()"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v1, 0x1
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1.smali
new file mode 100644
index 0000000000..73edf518fb
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSettingsPremiumGuildSubscription.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->onViewBoundOrOnResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->access$configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription.smali
similarity index 57%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription.smali
index 868935c5eb..e00b2eff7a 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoost.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription.smali
@@ -1,13 +1,13 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
 .super Lcom/discord/app/AppFragment;
-.source "WidgetSettingsBoost.kt"
+.source "WidgetSettingsPremiumGuildSubscription.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;,
-        Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion;
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion;
     }
 .end annotation
 
@@ -15,7 +15,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion;
+.field public static final Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion;
 
 .field public static final VIEW_INDEX_FAILURE:I = 0x1
 
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field private adapter:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
+.field private adapter:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
 
 .field private final flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -46,7 +46,7 @@
 .method static constructor <clinit>()V
     .locals 6
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;
 
     const/4 v1, 0x6
 
@@ -184,15 +184,15 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion;
 
     const/4 v1, 0x0
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion;
 
     return-void
 .end method
@@ -202,83 +202,83 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a068b
+    const v0, 0x7f0a06a5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->subtext$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->subtext$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a068a
+    const v0, 0x7f0a06a4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0689
+    const v0, 0x7f0a06a3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0684
+    const v0, 0x7f0a069e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0685
+    const v0, 0x7f0a069f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->noNitroBanner$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->noNitroBanner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0686
+    const v0, 0x7f0a06a0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->noNitroLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->noNitroLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
 
-.method public static final synthetic access$configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;)V
+.method public static final synthetic access$configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$fetchData(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;)V
+.method public static final synthetic access$fetchData(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->fetchData()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->fetchData()V
 
     return-void
 .end method
 
-.method private final configureUI(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;)V
+.method private final configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;)V
     .locals 7
 
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loading;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loading;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object p1
 
@@ -287,13 +287,13 @@
     return-void
 
     :cond_0
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Failure;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;
 
     const/4 v2, 0x1
 
     if-eqz v0, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object p1
 
@@ -302,11 +302,11 @@
     return-void
 
     :cond_1
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loaded;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;
 
     if-eqz v0, :cond_3
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v0
 
@@ -314,43 +314,43 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->adapter:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->adapter:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
 
     if-nez v0, :cond_2
 
     const-string v1, "adapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loaded;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Loaded;->getBoostItems()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;->getPremiumGuildSubscriptionItems()Ljava/util/List;
 
     move-result-object p1
 
-    new-instance v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$1;
+    new-instance v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;)V
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function0;
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$2;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$2;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$configureUI$2;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;)V
+    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;)V
 
     check-cast v2, Lkotlin/jvm/functions/Function2;
 
-    invoke-virtual {v0, p1, v2, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;->configure(Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;)V
+    invoke-virtual {v0, p1, v2, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->configure(Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;)V
 
     return-void
 
     :cond_3
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$LoadedNoNitro;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;
 
     if-eqz v0, :cond_5
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->getFlipper()Lcom/discord/app/AppViewFlipper;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v0
 
@@ -358,27 +358,27 @@
 
     invoke-virtual {v0, v3}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$LoadedNoNitro;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$LoadedNoNitro;->isNitroClassic()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;->isNitroClassic()Z
 
     move-result p1
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f120dbd
+    const p1, 0x7f120df6
 
     goto :goto_0
 
     :cond_4
-    const p1, 0x7f120dbc
+    const p1, 0x7f120df5
 
     :goto_0
     new-array v0, v2, [Ljava/lang/Object;
 
-    sget-object v2, Lcom/discord/app/e;->uy:Lcom/discord/app/e;
+    sget-object v2, Lcom/discord/app/e;->ux:Lcom/discord/app/e;
 
-    sget-wide v2, Lcom/discord/app/e;->ux:J
+    sget-wide v2, Lcom/discord/app/e;->uw:J
 
     invoke-static {v2, v3}, Lcom/discord/app/e;->k(J)Ljava/lang/String;
 
@@ -386,7 +386,7 @@
 
     aput-object v2, v0, v1
 
-    invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -394,11 +394,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->getNoNitroBanner()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->getNoNitroBanner()Landroid/widget/TextView;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->requireContext()Landroid/content/Context;
 
     move-result-object v1
 
@@ -443,9 +443,9 @@
 .method private final getFlipper()Lcom/discord/app/AppViewFlipper;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x3
 
@@ -463,9 +463,9 @@
 .method private final getNoNitroBanner()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->noNitroBanner$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->noNitroBanner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x4
 
@@ -483,9 +483,9 @@
 .method private final getNoNitroLearnMore()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->noNitroLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->noNitroLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x5
 
@@ -503,9 +503,9 @@
 .method private final getRecycler()Landroidx/recyclerview/widget/RecyclerView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -523,9 +523,9 @@
 .method private final getRetry()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -543,9 +543,9 @@
 .method private final getSubtext()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->subtext$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->subtext$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -563,9 +563,9 @@
 .method public static final launch(Landroid/content/Context;)V
     .locals 1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion;
 
-    invoke-virtual {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Companion;->launch(Landroid/content/Context;)V
+    invoke-virtual {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Companion;->launch(Landroid/content/Context;)V
 
     return-void
 .end method
@@ -575,7 +575,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a0
+    const v0, 0x7f0d01aa
 
     return v0
 .end method
@@ -619,9 +619,9 @@
 
     move-result-wide p1
 
-    sget-object p3, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation;->Companion:Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion;
+    sget-object p3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->requireContext()Landroid/content/Context;
 
     move-result-object v0
 
@@ -629,7 +629,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p3, v0, p1, p2}, Lcom/discord/widgets/servers/boosting/WidgetServerBoostConfirmation$Companion;->create(Landroid/content/Context;J)V
+    invoke-virtual {p3, v0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;J)V
 
     goto :goto_1
 
@@ -664,23 +664,23 @@
 
     invoke-static {p0, v1, v0, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f121231
+    const v0, 0x7f12127e
 
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->setActionBarSubtitle(I)Lkotlin/Unit;
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const v0, 0x7f120df1
+    const v0, 0x7f120e2a
 
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->setActionBarTitle(I)Lkotlin/Unit;
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->setActionBarTitle(I)Lkotlin/Unit;
 
     sget-object v0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object v3
 
-    invoke-direct {v2, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    invoke-direct {v2, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     check-cast v2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
@@ -688,11 +688,11 @@
 
     move-result-object v0
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->adapter:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->adapter:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->getSubtext()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->getSubtext()Landroid/widget/TextView;
 
     move-result-object v0
 
@@ -708,9 +708,9 @@
 
     new-array p1, p1, [Ljava/lang/Object;
 
-    sget-object v3, Lcom/discord/app/e;->uy:Lcom/discord/app/e;
+    sget-object v3, Lcom/discord/app/e;->ux:Lcom/discord/app/e;
 
-    sget-wide v3, Lcom/discord/app/e;->ux:J
+    sget-wide v3, Lcom/discord/app/e;->uw:J
 
     invoke-static {v3, v4}, Lcom/discord/app/e;->k(J)Ljava/lang/String;
 
@@ -718,9 +718,9 @@
 
     aput-object v3, p1, v1
 
-    const v1, 0x7f120dee
+    const v1, 0x7f120e27
 
-    invoke-virtual {p0, v1, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v1, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -746,41 +746,41 @@
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->getSubtext()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->getSubtext()Landroid/widget/TextView;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$1;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1;
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->getRetry()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->getRetry()Landroid/view/View;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$2;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$2;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$2;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->getNoNitroLearnMore()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->getNoNitroLearnMore()Landroid/view/View;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$3;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$3;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBound$3;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$3;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->fetchData()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->fetchData()V
 
     return-void
 .end method
@@ -790,11 +790,11 @@
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;->fetchData()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->fetchData()V
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model;->Companion:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$Model$Companion;->get()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;->get()Lrx/Observable;
 
     move-result-object v0
 
@@ -818,9 +818,9 @@
 
     move-result-object v5
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBoundOrOnResume$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoost;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;)V
 
     move-object v10, v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem$onConfigure$1.smali
new file mode 100644
index 0000000000..69bb78bed0
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem$onConfigure$1.smali
@@ -0,0 +1,53 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem$onConfigure$1;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremiumGuildSubscriptionAdapter.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;->onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem$onConfigure$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;
+
+    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/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem$onConfigure$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;->access$getAdapter$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->access$getBoostClickListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;)Lkotlin/jvm/functions/Function0;
+
+    move-result-object p1
+
+    invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem.smali
new file mode 100644
index 0000000000..555d8a1b5d
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem.smali
@@ -0,0 +1,190 @@
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;
+.super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetSettingsPremiumGuildSubscriptionAdapter.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "AvailablePremiumGuildSubscriptionListItem"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+
+# instance fields
+.field private final boost$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 5
+
+    const/4 v0, 0x1
+
+    new-array v0, v0, [Lkotlin/reflect/KProperty;
+
+    new-instance v1, Lkotlin/jvm/internal/v;
+
+    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v2
+
+    const-string v3, "boost"
+
+    const-string v4, "getBoost()Landroid/view/View;"
+
+    invoke-direct {v1, v2, v3, v4}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v1}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v1
+
+    check-cast v1, Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x0
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;)V
+    .locals 1
+
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+
+    const v0, 0x7f0d00af
+
+    invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
+
+    const p1, 0x7f0a00d1
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;->boost$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+
+    check-cast p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
+
+    return-object p0
+.end method
+
+.method private final getBoost()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;->boost$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;->$$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/view/View;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method protected final onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;)V
+    .locals 4
+
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(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/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;->getBoost()Landroid/view/View;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getEnabled()Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x2
+
+    invoke-static {p1, v0, v2, v3, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
+
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getEnabled()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;->getBoost()Landroid/view/View;
+
+    move-result-object p1
+
+    new-instance p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem$onConfigure$1;
+
+    invoke-direct {p2, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem$onConfigure$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;)V
+
+    check-cast p2, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+
+    :cond_0
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;->getBoost()Landroid/view/View;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
+
+.method public final bridge synthetic onConfigure(ILjava/lang/Object;)V
+    .locals 0
+
+    check-cast p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;->onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem$onConfigure$1.smali
new file mode 100644
index 0000000000..074940193b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem$onConfigure$1.smali
@@ -0,0 +1,85 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem$onConfigure$1;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremiumGuildSubscriptionAdapter.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $data:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem$onConfigure$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;
+
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem$onConfigure$1;->$data:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 3
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem$onConfigure$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->access$getAdapter$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->access$getRemoveClickListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;)Lkotlin/jvm/functions/Function2;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem$onConfigure$1;->$data:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem$onConfigure$1;->$data:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getId()J
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    invoke-interface {p1, v0, v1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem.smali
similarity index 61%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem.smali
index 8455df324a..e4498d1659 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem.smali
@@ -1,23 +1,23 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-.source "WidgetSettingsBoostAdapter.kt"
+.source "WidgetSettingsPremiumGuildSubscriptionAdapter.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
     accessFlags = 0x19
-    name = "BoostedServerListItem"
+    name = "PremiumGuildListItem"
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;",
         ">;"
     }
 .end annotation
@@ -51,7 +51,7 @@
 .method static constructor <clinit>()V
     .locals 6
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;
 
     const/16 v1, 0x9
 
@@ -255,12 +255,12 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     return-void
 .end method
 
-.method public constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;)V
+.method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;)V
     .locals 1
 
     const-string v0, "adapter"
@@ -269,73 +269,25 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d00a9
+    const v0, 0x7f0d00b1
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a00fc
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->banner$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a00fe
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->gradient$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0101
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a00ff
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0104
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->boostedTime$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0103
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->remove$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a00fd
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->gemIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->banner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0100
+    const p1, 0x7f0a00ff
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->levelText$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->gradient$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a0102
 
@@ -343,17 +295,65 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0100
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0105
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->boostedTime$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0104
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->remove$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a00fe
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->gemIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0101
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->levelText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0103
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
 
-.method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;)Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
+.method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    check-cast p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
+    check-cast p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
 
     return-object p0
 .end method
@@ -361,9 +361,9 @@
 .method private final getBanner()Lcom/facebook/drawee/view/SimpleDraweeView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->banner$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->banner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -381,9 +381,9 @@
 .method private final getBoostedTime()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->boostedTime$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->boostedTime$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x4
 
@@ -401,9 +401,9 @@
 .method private final getGemIcon()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->gemIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->gemIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x6
 
@@ -421,9 +421,9 @@
 .method private final getGradient()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->gradient$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->gradient$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -441,9 +441,9 @@
 .method private final getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x3
 
@@ -461,9 +461,9 @@
 .method private final getLevelText()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->levelText$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->levelText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x7
 
@@ -481,9 +481,9 @@
 .method private final getName()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -501,9 +501,9 @@
 .method private final getProgress()Landroid/widget/ProgressBar;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/16 v2, 0x8
 
@@ -521,9 +521,9 @@
 .method private final getRemove()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->remove$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->remove$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x5
 
@@ -540,7 +540,7 @@
 
 
 # virtual methods
-.method protected final onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;)V
+.method protected final onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;)V
     .locals 12
 
     const-string v0, "data"
@@ -549,13 +549,13 @@
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object p1
 
     if-eqz p1, :cond_b
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
     move-result-object p1
 
@@ -564,7 +564,7 @@
     goto/16 :goto_3
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->itemView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->itemView:Landroid/view/View;
 
     const-string v0, "itemView"
 
@@ -574,7 +574,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v0
 
@@ -592,13 +592,13 @@
 
     if-eqz v0, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->getBanner()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->getBanner()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object v0
 
     sget-object v5, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v6
 
@@ -608,7 +608,7 @@
 
     invoke-virtual {v0, v5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->getGradient()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->getGradient()Landroid/view/View;
 
     move-result-object v0
 
@@ -617,7 +617,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->getBanner()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->getBanner()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object v0
 
@@ -631,7 +631,7 @@
 
     invoke-virtual {v0, v5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageResource(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->getGradient()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->getGradient()Landroid/view/View;
 
     move-result-object v0
 
@@ -640,7 +640,7 @@
     invoke-virtual {v0, v5}, Landroid/view/View;->setVisibility(I)V
 
     :goto_0
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object v0
 
@@ -648,7 +648,7 @@
 
     check-cast v5, Landroid/widget/ImageView;
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v0
 
@@ -670,11 +670,11 @@
 
     invoke-static/range {v5 .. v11}, 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/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->getName()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->getName()Landroid/widget/TextView;
 
     move-result-object v0
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v5
 
@@ -686,7 +686,7 @@
 
     invoke-virtual {v0, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
     move-result-object v0
 
@@ -714,7 +714,7 @@
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->getBoostedTime()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->getBoostedTime()Landroid/widget/TextView;
 
     move-result-object v5
 
@@ -724,7 +724,7 @@
 
     move-result-object v1
 
-    const v6, 0x7f100096
+    const v6, 0x7f100095
 
     const/4 v7, 0x1
 
@@ -744,11 +744,11 @@
 
     invoke-virtual {v5, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->getGemIcon()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->getGemIcon()Landroid/widget/ImageView;
 
     move-result-object v0
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v1
 
@@ -771,22 +771,22 @@
     goto :goto_1
 
     :cond_2
-    const v1, 0x7f080200
+    const v1, 0x7f08020f
 
     goto :goto_1
 
     :cond_3
-    const v1, 0x7f0801ff
+    const v1, 0x7f08020e
 
     goto :goto_1
 
     :cond_4
-    const v1, 0x7f0801fe
+    const v1, 0x7f08020d
 
     goto :goto_1
 
     :cond_5
-    const v1, 0x7f040063
+    const v1, 0x7f040064
 
     invoke-static {p1, v1, v4, v2, v3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
@@ -795,11 +795,11 @@
     :goto_1
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->getLevelText()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->getLevelText()Landroid/widget/TextView;
 
     move-result-object v0
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v1
 
@@ -820,22 +820,22 @@
     goto :goto_2
 
     :cond_6
-    const v1, 0x7f120df5
+    const v1, 0x7f120e2e
 
     goto :goto_2
 
     :cond_7
-    const v1, 0x7f120df4
+    const v1, 0x7f120e2d
 
     goto :goto_2
 
     :cond_8
-    const v1, 0x7f120df3
+    const v1, 0x7f120e2c
 
     goto :goto_2
 
     :cond_9
-    const v1, 0x7f120dbf
+    const v1, 0x7f120df8
 
     :goto_2
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -846,13 +846,13 @@
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->getProgress()Landroid/widget/ProgressBar;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->getProgress()Landroid/widget/ProgressBar;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/utilities/nitro/BoostUtils;->INSTANCE:Lcom/discord/utilities/nitro/BoostUtils;
+    sget-object v0, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v1
 
@@ -860,7 +860,7 @@
 
     move-result v1
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v2
 
@@ -875,19 +875,19 @@
     move-result v4
 
     :cond_a
-    invoke-virtual {v0, v1, v4}, Lcom/discord/utilities/nitro/BoostUtils;->calculatePercentToNextTier(II)I
+    invoke-virtual {v0, v1, v4}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculatePercentToNextTier(II)I
 
     move-result v0
 
     invoke-virtual {p1, v0}, Landroid/widget/ProgressBar;->setProgress(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->getRemove()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->getRemove()Landroid/view/View;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem$onConfigure$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem$onConfigure$1;
 
-    invoke-direct {v0, p0, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem$onConfigure$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;)V
+    invoke-direct {v0, p0, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem$onConfigure$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
@@ -901,9 +901,9 @@
 .method public final bridge synthetic onConfigure(ILjava/lang/Object;)V
     .locals 0
 
-    check-cast p2, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
+    check-cast p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostedServerListItem;->onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;->onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem.smali
similarity index 64%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem.smali
index cdfe2c121e..3c01cc188a 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem.smali
@@ -1,23 +1,23 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-.source "WidgetSettingsBoostAdapter.kt"
+.source "WidgetSettingsPremiumGuildSubscriptionAdapter.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
     accessFlags = 0x19
-    name = "BoostInfoListItem"
+    name = "PremiumGuildSubscriptionInfoListItem"
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;",
-        "Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;",
         ">;"
     }
 .end annotation
@@ -37,7 +37,7 @@
 .method static constructor <clinit>()V
     .locals 6
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;
 
     const/4 v1, 0x2
 
@@ -87,12 +87,12 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     return-void
 .end method
 
-.method public constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;)V
+.method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;)V
     .locals 1
 
     const-string v0, "adapter"
@@ -101,25 +101,25 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d00a8
+    const v0, 0x7f0d00b0
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
+    const p1, 0x7f0a00ea
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->text$delegate:Lkotlin/properties/ReadOnlyProperty;
+
     const p1, 0x7f0a00e9
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->text$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a00e8
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
@@ -127,9 +127,9 @@
 .method private final getContainer()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -147,9 +147,9 @@
 .method private final getText()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->text$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->text$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -166,7 +166,7 @@
 
 
 # virtual methods
-.method protected final onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;)V
+.method protected final onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;)V
     .locals 13
 
     const-string v0, "data"
@@ -175,7 +175,7 @@
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->itemView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->itemView:Landroid/view/View;
 
     const-string v0, "itemView"
 
@@ -185,7 +185,7 @@
 
     move-result-object v2
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getBoostsRemaining()Ljava/lang/Integer;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getBoostsRemaining()Ljava/lang/Integer;
 
     move-result-object p1
 
@@ -197,7 +197,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getBoostsRemaining()Ljava/lang/Integer;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getBoostsRemaining()Ljava/lang/Integer;
 
     move-result-object p1
 
@@ -207,11 +207,11 @@
 
     if-lez p1, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->getContainer()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->getContainer()Landroid/view/View;
 
     move-result-object p1
 
-    const v4, 0x7f0800be
+    const v4, 0x7f0800c1
 
     invoke-virtual {p1, v4}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -221,9 +221,9 @@
 
     move-result-object p1
 
-    const v0, 0x7f100095
+    const v0, 0x7f100094
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getBoostsRemaining()Ljava/lang/Integer;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getBoostsRemaining()Ljava/lang/Integer;
 
     move-result-object v4
 
@@ -233,7 +233,7 @@
 
     new-array v5, v1, [Ljava/lang/Object;
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getBoostsRemaining()Ljava/lang/Integer;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getBoostsRemaining()Ljava/lang/Integer;
 
     move-result-object p2
 
@@ -243,13 +243,17 @@
 
     move-result-object p1
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->getText()Landroid/widget/TextView;
+    const-string p2, "context.resources.getQua\u2026ng, data.boostsRemaining)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->getText()Landroid/widget/TextView;
 
     move-result-object p2
 
     sget-object v0, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
 
-    const v4, 0x7f120de0
+    const v4, 0x7f120e19
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -284,15 +288,15 @@
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->getContainer()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->getContainer()Landroid/view/View;
 
     move-result-object p1
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->getContainer()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->getContainer()Landroid/view/View;
 
     move-result-object v4
 
-    const v5, 0x7f0402b0
+    const v5, 0x7f0402b3
 
     const/4 v6, 0x0
 
@@ -304,7 +308,7 @@
 
     invoke-virtual {p1, v4}, Landroid/view/View;->setBackgroundResource(I)V
 
-    invoke-virtual {p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;->getCooldownEndsAt()Ljava/lang/Long;
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getCooldownEndsAt()Ljava/lang/Long;
 
     move-result-object p1
 
@@ -352,7 +356,7 @@
 
     div-long/2addr p1, v4
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->getText()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->getText()Landroid/widget/TextView;
 
     move-result-object v12
 
@@ -360,7 +364,7 @@
 
     invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f120daa
+    const v0, 0x7f120de3
 
     const/4 v5, 0x3
 
@@ -418,9 +422,9 @@
 .method public final bridge synthetic onConfigure(ILjava/lang/Object;)V
     .locals 0
 
-    check-cast p2, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;
+    check-cast p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostInfoListItem;->onConfigure(ILcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$BoostItem;)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;->onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion.smali
new file mode 100644
index 0000000000..e802bd01fa
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion.smali
@@ -0,0 +1,124 @@
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremiumGuildSubscriptionAdapter.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final createAvailableBoostItem(Z)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    .locals 10
+
+    new-instance v9, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v6, 0x1
+
+    const/16 v7, 0xf
+
+    const/4 v8, 0x0
+
+    move-object v0, v9
+
+    move v5, p1
+
+    invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-object v9
+.end method
+
+.method public final createBoostInfoItem(Ljava/lang/Long;I)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    .locals 10
+
+    new-instance v9, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v2
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x1c
+
+    const/4 v8, 0x0
+
+    move-object v0, v9
+
+    move-object v1, p1
+
+    invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-object v9
+.end method
+
+.method public final createBoostedGuildItem(Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    .locals 10
+
+    const-string v0, "premiumGuildSubscription"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x2
+
+    const/16 v8, 0x13
+
+    const/4 v9, 0x0
+
+    move-object v1, v0
+
+    move-object v4, p1
+
+    move-object v5, p2
+
+    invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem.smali
new file mode 100644
index 0000000000..6e2a24ac04
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem.smali
@@ -0,0 +1,659 @@
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+.super Ljava/lang/Object;
+.source "WidgetSettingsPremiumGuildSubscriptionAdapter.kt"
+
+# interfaces
+.implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "PremiumGuildSubscriptionItem"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
+
+.field public static final TYPE_AVAILABLE_BOOST:I = 0x1
+
+.field public static final TYPE_BOOSTED_SERVER:I = 0x2
+
+.field public static final TYPE_BOOST_INFO:I
+
+
+# instance fields
+.field private final boostsRemaining:Ljava/lang/Integer;
+
+.field private final cooldownEndsAt:Ljava/lang/Long;
+
+.field private final enabled:Z
+
+.field private final guild:Lcom/discord/models/domain/ModelGuild;
+
+.field private final premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+.field private final typeInt:I
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->cooldownEndsAt:Ljava/lang/Long;
+
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->boostsRemaining:Ljava/lang/Integer;
+
+    iput-object p3, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    iput-object p4, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    iput-boolean p5, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->enabled:Z
+
+    iput p6, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 9
+
+    and-int/lit8 v0, p7, 0x1
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    move-object v3, v1
+
+    goto :goto_0
+
+    :cond_0
+    move-object v3, p1
+
+    :goto_0
+    and-int/lit8 v0, p7, 0x2
+
+    if-eqz v0, :cond_1
+
+    move-object v4, v1
+
+    goto :goto_1
+
+    :cond_1
+    move-object v4, p2
+
+    :goto_1
+    and-int/lit8 v0, p7, 0x4
+
+    if-eqz v0, :cond_2
+
+    move-object v5, v1
+
+    goto :goto_2
+
+    :cond_2
+    move-object v5, p3
+
+    :goto_2
+    and-int/lit8 v0, p7, 0x8
+
+    if-eqz v0, :cond_3
+
+    move-object v6, v1
+
+    goto :goto_3
+
+    :cond_3
+    move-object v6, p4
+
+    :goto_3
+    and-int/lit8 v0, p7, 0x10
+
+    if-eqz v0, :cond_4
+
+    const/4 v0, 0x1
+
+    const/4 v7, 0x1
+
+    goto :goto_4
+
+    :cond_4
+    move v7, p5
+
+    :goto_4
+    move-object v2, p0
+
+    move v8, p6
+
+    invoke-direct/range {v2 .. v8}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)V
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILjava/lang/Object;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    .locals 4
+
+    and-int/lit8 p8, p7, 0x1
+
+    if-eqz p8, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->cooldownEndsAt:Ljava/lang/Long;
+
+    :cond_0
+    and-int/lit8 p8, p7, 0x2
+
+    if-eqz p8, :cond_1
+
+    iget-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->boostsRemaining:Ljava/lang/Integer;
+
+    :cond_1
+    move-object p8, p2
+
+    and-int/lit8 p2, p7, 0x4
+
+    if-eqz p2, :cond_2
+
+    iget-object p3, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    :cond_2
+    move-object v0, p3
+
+    and-int/lit8 p2, p7, 0x8
+
+    if-eqz p2, :cond_3
+
+    iget-object p4, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    :cond_3
+    move-object v1, p4
+
+    and-int/lit8 p2, p7, 0x10
+
+    if-eqz p2, :cond_4
+
+    iget-boolean p5, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->enabled:Z
+
+    :cond_4
+    move v2, p5
+
+    and-int/lit8 p2, p7, 0x20
+
+    if-eqz p2, :cond_5
+
+    iget p6, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
+
+    :cond_5
+    move v3, p6
+
+    move-object p2, p0
+
+    move-object p3, p1
+
+    move-object p4, p8
+
+    move-object p5, v0
+
+    move-object p6, v1
+
+    move p7, v2
+
+    move p8, v3
+
+    invoke-virtual/range {p2 .. p8}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->copy(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->cooldownEndsAt:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/lang/Integer;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->boostsRemaining:Ljava/lang/Integer;
+
+    return-object v0
+.end method
+
+.method public final component3()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    return-object v0
+.end method
+
+.method public final component4()Lcom/discord/models/domain/ModelGuild;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    return-object v0
+.end method
+
+.method public final component5()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->enabled:Z
+
+    return v0
+.end method
+
+.method public final component6()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
+
+    return v0
+.end method
+
+.method public final copy(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    .locals 8
+
+    new-instance v7, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    move-object v0, v7
+
+    move-object v1, p1
+
+    move-object v2, p2
+
+    move-object v3, p3
+
+    move-object v4, p4
+
+    move v5, p5
+
+    move v6, p6
+
+    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)V
+
+    return-object v7
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_3
+
+    instance-of v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->cooldownEndsAt:Ljava/lang/Long;
+
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->cooldownEndsAt:Ljava/lang/Long;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->boostsRemaining:Ljava/lang/Integer;
+
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->boostsRemaining:Ljava/lang/Integer;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    iget-object v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->enabled:Z
+
+    iget-boolean v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->enabled:Z
+
+    if-ne v1, v3, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_2
+
+    iget v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
+
+    iget p1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
+
+    if-ne v1, p1, :cond_1
+
+    const/4 p1, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    :goto_1
+    if-eqz p1, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    return v2
+
+    :cond_3
+    :goto_2
+    return v0
+.end method
+
+.method public final getBoostsRemaining()Ljava/lang/Integer;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->boostsRemaining:Ljava/lang/Integer;
+
+    return-object v0
+.end method
+
+.method public final getCooldownEndsAt()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->cooldownEndsAt:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
+.method public final getEnabled()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->enabled:Z
+
+    return v0
+.end method
+
+.method public final getGuild()Lcom/discord/models/domain/ModelGuild;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    return-object v0
+.end method
+
+.method public final getKey()Ljava/lang/String;
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->cooldownEndsAt:Ljava/lang/Long;
+
+    if-nez v0, :cond_3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->boostsRemaining:Ljava/lang/Integer;
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getId()J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-nez v0, :cond_2
+
+    :cond_1
+    const-string v0, "unused"
+
+    :cond_2
+    return-object v0
+
+    :cond_3
+    :goto_0
+    const-string v0, "cooldown"
+
+    return-object v0
+.end method
+
+.method public final getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    return-object v0
+.end method
+
+.method public final getType()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
+
+    return v0
+.end method
+
+.method public final getTypeInt()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
+
+    return v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->cooldownEndsAt:Ljava/lang/Long;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->boostsRemaining:Ljava/lang/Integer;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    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/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    if-eqz v2, :cond_3
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_3
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->enabled:Z
+
+    if-eqz v1, :cond_4
+
+    const/4 v1, 0x1
+
+    :cond_4
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
+
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "PremiumGuildSubscriptionItem(cooldownEndsAt="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->cooldownEndsAt:Ljava/lang/Long;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", boostsRemaining="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->boostsRemaining:Ljava/lang/Integer;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", premiumGuildSubscription="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", guild="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", enabled="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->enabled:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", typeInt="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt: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;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$boostClickListener$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$boostClickListener$1.smali
new file mode 100644
index 0000000000..0df0c55044
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$boostClickListener$1.smali
@@ -0,0 +1,72 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$boostClickListener$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSettingsPremiumGuildSubscriptionAdapter.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$boostClickListener$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$boostClickListener$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$boostClickListener$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$boostClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$boostClickListener$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$boostClickListener$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$removeClickListener$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1.smali
similarity index 57%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$removeClickListener$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1.smali
index 94800f4969..e861d470f4 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$removeClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$removeClickListener$1;
+.class final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1;
 .super Lkotlin/jvm/internal/l;
-.source "WidgetSettingsBoostAdapter.kt"
+.source "WidgetSettingsPremiumGuildSubscriptionAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function2;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    value = Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,18 +29,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$removeClickListener$1;
+.field public static final INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$removeClickListener$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$removeClickListener$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$removeClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$removeClickListener$1;
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1;
 
     return-void
 .end method
@@ -72,9 +72,9 @@
 
     move-result-wide p1
 
-    invoke-virtual {p0, v0, v1, p1, p2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsBoostAdapter$removeClickListener$1;->invoke(JJ)V
+    invoke-virtual {p0, v0, v1, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1;->invoke(JJ)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter.smali
new file mode 100644
index 0000000000..5242bd4a06
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter.smali
@@ -0,0 +1,226 @@
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;
+.super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "WidgetSettingsPremiumGuildSubscriptionAdapter.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple<",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field private boostClickListener:Lkotlin/jvm/functions/Function0;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private removeClickListener:Lkotlin/jvm/functions/Function2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function2<",
+            "-",
+            "Ljava/lang/Long;",
+            "-",
+            "Ljava/lang/Long;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    .locals 1
+
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1;
+
+    check-cast p1, Lkotlin/jvm/functions/Function2;
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->removeClickListener:Lkotlin/jvm/functions/Function2;
+
+    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$boostClickListener$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$boostClickListener$1;
+
+    check-cast p1, Lkotlin/jvm/functions/Function0;
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->boostClickListener:Lkotlin/jvm/functions/Function0;
+
+    return-void
+.end method
+
+.method public static final synthetic access$getBoostClickListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;)Lkotlin/jvm/functions/Function0;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->boostClickListener:Lkotlin/jvm/functions/Function0;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getRemoveClickListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;)Lkotlin/jvm/functions/Function2;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->removeClickListener:Lkotlin/jvm/functions/Function2;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$setBoostClickListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;Lkotlin/jvm/functions/Function0;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->boostClickListener:Lkotlin/jvm/functions/Function0;
+
+    return-void
+.end method
+
+.method public static final synthetic access$setRemoveClickListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;Lkotlin/jvm/functions/Function2;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->removeClickListener:Lkotlin/jvm/functions/Function2;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final configure(Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;",
+            ">;",
+            "Lkotlin/jvm/functions/Function2<",
+            "-",
+            "Ljava/lang/Long;",
+            "-",
+            "Ljava/lang/Long;",
+            "Lkotlin/Unit;",
+            ">;",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "premiumGuildSubscriptionItems"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "removeClickListener"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "boostClickListener"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->setData(Ljava/util/List;)V
+
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->removeClickListener:Lkotlin/jvm/functions/Function2;
+
+    iput-object p3, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->boostClickListener:Lkotlin/jvm/functions/Function0;
+
+    return-void
+.end method
+
+.method public final bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+    .locals 0
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    move-result-object p1
+
+    check-cast p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+
+    return-object p1
+.end method
+
+.method public final onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/view/ViewGroup;",
+            "I)",
+            "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;",
+            "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p2, :cond_2
+
+    const/4 p1, 0x1
+
+    if-eq p2, p1, :cond_1
+
+    const/4 p1, 0x2
+
+    if-ne p2, p1, :cond_0
+
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;)V
+
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
+
+    :cond_0
+    invoke-virtual {p0, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;->invalidViewTypeException(I)Ljava/lang/IllegalArgumentException;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    throw p1
+
+    :cond_1
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;)V
+
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
+
+    :cond_2
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter;)V
+
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$WhenMappings.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$WhenMappings.smali
similarity index 75%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$WhenMappings.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$WhenMappings.smali
index 7dcc79465b..22dca42dd3 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$WhenMappings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$WhenMappings.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$WhenMappings;
+.class public final synthetic Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$WhenMappings;
 .super Ljava/lang/Object;
 
 
@@ -18,7 +18,7 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sput-object v0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -30,7 +30,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -42,7 +42,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -54,7 +54,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -66,7 +66,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -78,7 +78,7 @@
 
     aput v2, v0, v1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$1.smali
new file mode 100644
index 0000000000..b215a2a620
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$1.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$1;
+.super Ljava/lang/Object;
+.source "WidgetUpgradePremiumDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->configureUI(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;
+
+    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/settings/premium/WidgetUpgradePremiumDialog$configureUI$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->onDialogDismissClicked()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$2.smali
new file mode 100644
index 0000000000..3e5408a797
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$2.smali
@@ -0,0 +1,55 @@
+.class final Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$2;
+.super Ljava/lang/Object;
+.source "WidgetUpgradePremiumDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->configureUI(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+.field final synthetic this$0:Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;
+
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$2;->$targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    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/settings/premium/WidgetUpgradePremiumDialog$configureUI$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;
+
+    invoke-static {p1}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$2;->$targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->upgradeSubscription(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$onResume$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$onResume$1.smali
similarity index 50%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$onResume$1.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$onResume$1.smali
index 1fcf105303..3765fdeec7 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$onResume$1.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$onResume$1;
+.class final synthetic Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$onResume$1;
 .super Lkotlin/jvm/internal/j;
 .source "WidgetUpgradePremiumDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->onResume()V
+    value = Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->onResume()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;",
+        "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -28,7 +28,7 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;)V
+.method constructor <init>(Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;)V
     .locals 1
 
     const/4 v0, 0x1
@@ -51,7 +51,7 @@
 .method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
     .locals 1
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;
 
     invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "configureUI(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V"
+    const-string v0, "configureUI(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V"
 
     return-object v0
 .end method
@@ -71,23 +71,23 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$onResume$1;->invoke(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$onResume$1;->invoke(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+.method public final invoke(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$onResume$1;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$onResume$1;->receiver:Ljava/lang/Object;
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;
+    check-cast v0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;
 
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->access$configureUI(Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+    invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->access$configureUI(Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog.smali
similarity index 63%
rename from com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog.smali
index 7aea3dd2e2..5b0f3127f1 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;
+.class public final Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;
 .super Lcom/discord/app/AppDialog;
 .source "WidgetUpgradePremiumDialog.kt"
 
@@ -20,14 +20,14 @@
 
 .field private final headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+.field private viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 6
 
-    const-class v0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;
 
     const/4 v1, 0x6
 
@@ -165,7 +165,7 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     return-void
 .end method
@@ -175,92 +175,92 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0772
+    const v0, 0x7f0a079b
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a076e
+    const v0, 0x7f0a0797
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->bodyTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->bodyTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a076f
+    const v0, 0x7f0a0798
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0770
+    const v0, 0x7f0a0799
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02c2
+    const v0, 0x7f0a02cb
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->errorDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->errorDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0771
+    const v0, 0x7f0a079a
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->errorText$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->errorText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
 
-.method public static final synthetic access$configureUI(Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+.method public static final synthetic access$configureUI(Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->configureUI(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->configureUI(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;)Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iget-object p0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     if-nez p0, :cond_0
 
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
 .end method
 
-.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;)V
+.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     return-void
 .end method
 
-.method private final configureUI(Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState;)V
+.method private final configureUI(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;)V
     .locals 11
 
-    instance-of v0, p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
 
     const/4 v1, 0x0
 
@@ -274,11 +274,11 @@
     move-object v2, p1
 
     :goto_0
-    check-cast v2, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
+    check-cast v2, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
 
     if-eqz v2, :cond_c
 
-    invoke-virtual {v2}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+    invoke-virtual {v2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
 
     move-result-object v2
 
@@ -297,11 +297,11 @@
     move-object v0, p1
 
     :goto_1
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_c
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
 
     move-result-object v0
 
@@ -310,7 +310,7 @@
     goto/16 :goto_5
 
     :cond_3
-    instance-of v3, v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
+    instance-of v3, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
 
     if-nez v3, :cond_4
 
@@ -322,11 +322,11 @@
     move-object v3, v0
 
     :goto_2
-    check-cast v3, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
+    check-cast v3, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
 
     if-eqz v3, :cond_c
 
-    invoke-virtual {v3}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->getTargetPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->getTargetPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     move-result-object v3
 
@@ -341,7 +341,7 @@
 
     if-nez v4, :cond_7
 
-    sget-object v5, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v5, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/StringBuilder;
 
@@ -369,7 +369,7 @@
 
     invoke-static/range {v5 .. v10}, 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-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object p1
 
@@ -381,17 +381,17 @@
     return-void
 
     :cond_7
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getHeaderTv()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getHeaderTv()Landroid/widget/TextView;
 
     move-result-object v4
 
-    const v5, 0x7f120e3f
+    const v5, 0x7f120e78
 
     const/4 v6, 0x1
 
     new-array v7, v6, [Ljava/lang/Object;
 
-    invoke-direct {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getPlanName(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)Ljava/lang/String;
+    invoke-direct {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getPlanName(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)Ljava/lang/String;
 
     move-result-object v8
 
@@ -399,7 +399,7 @@
 
     aput-object v8, v7, v9
 
-    invoke-virtual {p0, v5, v7}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v5, v7}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v5
 
@@ -423,7 +423,7 @@
 
     if-ne v4, v8, :cond_8
 
-    const v4, 0x7f120e39
+    const v4, 0x7f120e72
 
     new-array v8, v7, [Ljava/lang/Object;
 
@@ -431,7 +431,7 @@
 
     move-result-object v2
 
-    invoke-direct {p0, v2}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getPlanName(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)Ljava/lang/String;
+    invoke-direct {p0, v2}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getPlanName(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -441,7 +441,7 @@
 
     move-result v2
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->requireContext()Landroid/content/Context;
 
     move-result-object v10
 
@@ -453,7 +453,7 @@
 
     aput-object v2, v8, v6
 
-    invoke-virtual {p0, v4, v8}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v4, v8}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -472,7 +472,7 @@
 
     if-ne v4, v8, :cond_9
 
-    const v4, 0x7f120e3b
+    const v4, 0x7f120e74
 
     new-array v8, v7, [Ljava/lang/Object;
 
@@ -480,7 +480,7 @@
 
     move-result-object v2
 
-    invoke-direct {p0, v2}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getPlanName(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)Ljava/lang/String;
+    invoke-direct {p0, v2}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getPlanName(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -490,7 +490,7 @@
 
     move-result v2
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->requireContext()Landroid/content/Context;
 
     move-result-object v10
 
@@ -502,7 +502,7 @@
 
     aput-object v2, v8, v6
 
-    invoke-virtual {p0, v4, v8}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v4, v8}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -521,7 +521,7 @@
 
     if-ne v4, v8, :cond_a
 
-    const v4, 0x7f120e37
+    const v4, 0x7f120e70
 
     new-array v8, v7, [Ljava/lang/Object;
 
@@ -529,7 +529,7 @@
 
     move-result-object v2
 
-    invoke-direct {p0, v2}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getPlanName(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)Ljava/lang/String;
+    invoke-direct {p0, v2}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getPlanName(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -539,7 +539,7 @@
 
     move-result v2
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->requireContext()Landroid/content/Context;
 
     move-result-object v10
 
@@ -551,14 +551,14 @@
 
     aput-object v2, v8, v6
 
-    invoke-virtual {p0, v4, v8}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v4, v8}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
     goto :goto_3
 
     :cond_a
-    const v2, 0x7f120e35
+    const v2, 0x7f120e6e
 
     new-array v4, v6, [Ljava/lang/Object;
 
@@ -566,7 +566,7 @@
 
     move-result v8
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->requireContext()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->requireContext()Landroid/content/Context;
 
     move-result-object v10
 
@@ -578,7 +578,7 @@
 
     aput-object v5, v4, v9
 
-    invoke-virtual {p0, v2, v4}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v2, v4}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -587,7 +587,7 @@
 
     invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getBodyTv()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getBodyTv()Landroid/widget/TextView;
 
     move-result-object v4
 
@@ -601,27 +601,27 @@
 
     invoke-virtual {v4, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    check-cast p1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;
+    check-cast p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$ViewState$Loaded;->isBusy()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy()Z
 
     move-result p1
 
     if-eqz p1, :cond_b
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getCancelBtn()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getCancelBtn()Landroid/widget/Button;
 
     move-result-object p1
 
     invoke-virtual {p1, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
 
     move-result-object p1
 
     invoke-virtual {p1, v1}, Lcom/discord/views/LoadingButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
 
     move-result-object p1
 
@@ -630,56 +630,56 @@
     goto :goto_4
 
     :cond_b
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getCancelBtn()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getCancelBtn()Landroid/widget/Button;
 
     move-result-object p1
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$1;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$1;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;)V
+    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
 
     move-result-object p1
 
-    new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$2;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$2;
 
-    invoke-direct {v2, p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$configureUI$2;-><init>(Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
+    invoke-direct {v2, p0, v3}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$configureUI$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v2}, Lcom/discord/views/LoadingButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getConfirmBtn()Lcom/discord/views/LoadingButton;
 
     move-result-object p1
 
     invoke-virtual {p1, v9}, Lcom/discord/views/LoadingButton;->setIsLoading(Z)V
 
     :goto_4
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getErrorDivider()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getErrorDivider()Landroid/view/View;
 
     move-result-object p1
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->getHasError()Z
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->getHasError()Z
 
     move-result v2
 
     invoke-static {p1, v2, v9, v7, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getErrorText()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getErrorText()Landroid/widget/TextView;
 
     move-result-object p1
 
     check-cast p1, Landroid/view/View;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel$Dialog$UpgradePremium;->getHasError()Z
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog$UpgradePremium;->getHasError()Z
 
     move-result v0
 
@@ -693,9 +693,9 @@
 .method private final getBodyTv()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->bodyTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->bodyTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -713,9 +713,9 @@
 .method private final getCancelBtn()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -733,9 +733,9 @@
 .method private final getConfirmBtn()Lcom/discord/views/LoadingButton;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x3
 
@@ -753,9 +753,9 @@
 .method private final getErrorDivider()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->errorDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->errorDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x4
 
@@ -773,9 +773,9 @@
 .method private final getErrorText()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->errorText$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->errorText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x5
 
@@ -793,9 +793,9 @@
 .method private final getHeaderTv()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -813,7 +813,7 @@
 .method private final getPlanName(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$WhenMappings;->$EnumSwitchMapping$0:[I
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->ordinal()I
 
@@ -828,18 +828,18 @@
     goto :goto_0
 
     :pswitch_0
-    const p1, 0x7f120e2d
+    const p1, 0x7f120e67
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
     goto :goto_0
 
     :pswitch_1
-    const p1, 0x7f120e2e
+    const p1, 0x7f120e68
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -868,7 +868,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01bd
+    const v0, 0x7f0d01cd
 
     return v0
 .end method
@@ -880,9 +880,9 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->setCancelable(Z)V
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->setCancelable(Z)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object v0
 
@@ -890,7 +890,7 @@
 
     move-result-object v0
 
-    const-class v1, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    const-class v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
@@ -900,20 +900,20 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
-    iput-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->viewModel:Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->viewModel:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     if-nez v0, :cond_0
 
     const-string v1, "viewModel"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/discord/widgets/settings/nitro/SettingsPremiumViewModel;->getViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->getViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -929,7 +929,7 @@
 
     move-result-object v4
 
-    const-class v5, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;
+    const-class v5, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;
 
     const/4 v6, 0x0
 
@@ -939,13 +939,13 @@
 
     const/4 v9, 0x0
 
-    new-instance v0, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$onResume$1;
+    new-instance v0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$onResume$1;
 
     move-object v1, p0
 
-    check-cast v1, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;
+    check-cast v1, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog$onResume$1;-><init>(Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$onResume$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;)V
 
     move-object v10, v0
 
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter$1.smali
index acbdbcbd3f..e9a573d258 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter$1;->invoke(Landroid/net/Uri;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter.smali
index 9ea58ee0bd..32579cc9a5 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Adapter.smali
@@ -207,7 +207,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f0d008d
+    const v0, 0x7f0d0095
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion.smali
index 0047fba82a..eb909e2a7b 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion.smali
@@ -176,7 +176,7 @@
 
     aput-object p1, v1, v2
 
-    invoke-static {v1}, Lkotlin/a/m;->n([Ljava/lang/Object;)Ljava/util/ArrayList;
+    invoke-static {v1}, Lkotlin/a/m;->m([Ljava/lang/Object;)Ljava/util/ArrayList;
 
     move-result-object v5
 
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2.smali
index a6d63a9988..24009b8379 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2.smali
@@ -74,7 +74,7 @@
 
     invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2;->invoke(Landroid/view/View;ILcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -112,7 +112,7 @@
 
     move-result-wide v0
 
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
 
     :cond_0
     instance-of p1, p3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.smali
index 29b6958632..64403a503c 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.smali
@@ -64,7 +64,7 @@
 
     move-result p1
 
-    const v0, 0x7f0a0460
+    const v0, 0x7f0a0471
 
     if-eq p1, v0, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$4.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$4.smali
index fc68537bdc..2057273689 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$4.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$4.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$4;->invoke(Landroid/net/Uri;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.smali
index 472425871c..baac82259b 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.smali
@@ -189,7 +189,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
@@ -217,7 +217,7 @@
     if-nez p1, :cond_3
 
     :cond_2
-    invoke-static {}, Lrx/Observable;->JZ()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->JM()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali
index 0249473a07..f565e71299 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -119,20 +119,10 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isPremium()Z
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getMaxFileSizeMB()I
 
     move-result v1
 
-    if-eqz v1, :cond_2
-
-    const/16 v1, 0x32
-
-    goto :goto_1
-
-    :cond_2
-    const/16 v1, 0x8
-
-    :goto_1
     invoke-static {v0, v1}, Ljava/lang/Math;->max(II)I
 
     move-result v7
@@ -163,9 +153,9 @@
 
     move-result v8
 
-    sget-object v0, Lkotlin/jvm/internal/h;->bkD:Lkotlin/jvm/internal/h;
+    sget-object v0, Lkotlin/jvm/internal/h;->bkX:Lkotlin/jvm/internal/h;
 
-    invoke-static {}, Lkotlin/jvm/internal/h;->El()F
+    invoke-static {}, Lkotlin/jvm/internal/h;->Ea()F
 
     move-result v6
 
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.smali
index e0e2838bbc..96ef964471 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.smali
@@ -70,7 +70,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;->invoke(Lkotlin/Pair;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -143,7 +143,7 @@
 
     const/4 v0, 0x1
 
-    invoke-static {p1, v0}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {p1, v0}, Lkotlin/ranges/c;->Y(II)I
 
     move-result p1
 
@@ -169,6 +169,10 @@
 
     move-result-object p1
 
+    const-string v0, "context.resources.getQua\u2026owmodeSecs, slowmodeSecs)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;->$context:Landroid/content/Context;
 
     check-cast p1, Ljava/lang/CharSequence;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$1.smali
index 330d53bf42..662931fb6a 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$1;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$2.smali
index 535453c305..ddf4cf3787 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$2;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$5.smali
index f5a1350c11..30607bb727 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBound$5.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$5;->invoke(Landroid/content/Intent;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2.smali
index f9c5c9d621..0c99d21896 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2.smali
@@ -56,114 +56,96 @@
 
 # virtual methods
 .method public final call(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Ljava/lang/String;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/share/WidgetIncomingShare$Model;
-    .locals 12
+    .locals 10
 
-    move-object v0, p0
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;->$receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
-    iget-object v1, v0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;->$receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+    instance-of v1, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
 
-    instance-of v2, v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
+    if-eqz v1, :cond_0
 
-    if-eqz v2, :cond_0
+    check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
 
-    check-cast v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
+    invoke-virtual {v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    invoke-virtual {v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    move-result-object v0
 
-    move-result-object v1
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getMaxFileSizeMB()I
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getMaxFileSizeMB()I
-
-    move-result v1
+    move-result v0
 
     goto :goto_0
 
     :cond_0
-    instance-of v2, v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
-
-    if-eqz v2, :cond_1
-
-    check-cast v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getGuild()Lcom/discord/models/domain/ModelGuild;
-
-    move-result-object v1
+    instance-of v1, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getMaxFileSizeMB()I
+    check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
 
-    move-result v1
+    invoke-virtual {v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getMaxFileSizeMB()I
+
+    move-result v0
 
     goto :goto_0
 
     :cond_1
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    const-string v2, "meUser"
+    const-string v1, "contentModel"
 
-    move-object/from16 v3, p5
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v3, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v1, "searchModel"
 
-    invoke-virtual/range {p5 .. p5}, Lcom/discord/models/domain/ModelUser;->isPremium()Z
+    invoke-static {p3, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result v2
+    iget-object v6, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;->$receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
-    if-eqz v2, :cond_2
+    const-string v1, "isOnCooldown"
 
-    const/16 v2, 0x32
+    invoke-static {p4, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    goto :goto_1
+    invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z
 
-    :cond_2
-    const/16 v2, 0x8
+    move-result v7
 
-    :goto_1
-    new-instance v11, Lcom/discord/widgets/share/WidgetIncomingShare$Model;
+    const-string p4, "meUser"
 
-    const-string v4, "contentModel"
+    invoke-static {p5, p4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v5, p1
+    invoke-virtual {p5}, Lcom/discord/models/domain/ModelUser;->getMaxFileSizeMB()I
 
-    invoke-static {p1, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result p4
 
-    const-string v4, "searchModel"
-
-    move-object v6, p3
-
-    invoke-static {p3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v7, v0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;->$receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
-
-    const-string v4, "isOnCooldown"
-
-    move-object/from16 v8, p4
-
-    invoke-static {v8, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual/range {p4 .. p4}, Ljava/lang/Boolean;->booleanValue()Z
+    invoke-static {v0, p4}, Ljava/lang/Math;->max(II)I
 
     move-result v8
 
-    invoke-static {v1, v2}, Ljava/lang/Math;->max(II)I
+    invoke-virtual {p5}, Lcom/discord/models/domain/ModelUser;->isPremium()Z
 
     move-result v9
 
-    invoke-virtual/range {p5 .. p5}, Lcom/discord/models/domain/ModelUser;->isPremium()Z
+    new-instance p4, Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 
-    move-result v10
+    move-object v2, p4
 
-    move-object v3, v11
+    move-object v3, p1
 
-    move-object v4, p1
+    move-object v4, p2
 
-    move-object v5, p2
+    move-object v5, p3
 
-    invoke-direct/range {v3 .. v10}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Ljava/lang/String;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;ZIZ)V
+    invoke-direct/range {v2 .. v9}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Ljava/lang/String;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;ZIZ)V
 
-    return-object v11
+    return-object p4
 .end method
 
 .method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.smali
index 407ec02703..3a2f91de6f 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.smali
@@ -161,7 +161,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v4
 
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$2.smali
index 41bd479ab4..c56b4a4e7d 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$2;->invoke(Lcom/discord/widgets/share/WidgetIncomingShare$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
index bfaa578551..1b75a4bf9e 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
@@ -316,7 +316,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -324,7 +324,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02c6
+    const v0, 0x7f0a02cf
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -332,7 +332,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->commentTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02c7
+    const v0, 0x7f0a02d0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -340,7 +340,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->previewList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a059f
+    const v0, 0x7f0a05b9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -348,7 +348,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->scrollView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05a9
+    const v0, 0x7f0a05c3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -356,7 +356,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02c8
+    const v0, 0x7f0a02d1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -364,7 +364,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchEt$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02c9
+    const v0, 0x7f0a02d2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -372,7 +372,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchResultsRv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0811
+    const v0, 0x7f0a084f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -380,7 +380,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->selectedReceiver$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0812
+    const v0, 0x7f0a0850
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -388,7 +388,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->selectedReceiverRemoveIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -408,7 +408,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchQueryPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -580,9 +580,9 @@
 
     invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f070157
+    const v2, 0x7f070159
 
-    const v3, 0x7f070156
+    const v3, 0x7f070158
 
     invoke-direct {v1, v0, p1, v2, v3}, Lcom/discord/utilities/view/recycler/PaddedItemDecorator;-><init>(ILandroid/content/res/Resources;II)V
 
@@ -602,7 +602,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     new-instance v2, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$4;
@@ -617,7 +617,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {v0}, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;->notifyDataSetChanged()V
@@ -664,12 +664,12 @@
 
     if-eqz p1, :cond_3
 
-    const p1, 0x7f120087
+    const p1, 0x7f120088
 
     goto :goto_1
 
     :cond_3
-    const p1, 0x7f1211ce
+    const p1, 0x7f121212
 
     :goto_1
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setHint(I)V
@@ -905,7 +905,7 @@
 
     const-string v2, "resultsAdapter"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_9
     new-instance v2, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1;
@@ -1239,7 +1239,7 @@
 
     if-gez v0, :cond_0
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_0
     check-cast v1, Landroid/net/Uri;
@@ -1296,7 +1296,7 @@
 
     if-eqz p4, :cond_0
 
-    const p2, 0x7f1203b1
+    const p2, 0x7f1203b6
 
     invoke-static {p1, p2}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
@@ -1573,7 +1573,7 @@
 
     move-result-object p4
 
-    invoke-virtual {p4}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {p4}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object p4
 
@@ -1601,7 +1601,7 @@
 
     const-string v0, "resultsAdapter"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_6
     check-cast p6, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
@@ -1715,7 +1715,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0141
+    const v0, 0x7f0d014a
 
     return v0
 .end method
@@ -1740,7 +1740,7 @@
     return-void
 
     :cond_0
-    const v0, 0x7f12101e
+    const v0, 0x7f12105b
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/share/WidgetIncomingShare;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -1780,7 +1780,7 @@
 
     const-string v2, "previewAdapter"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-direct {p0, v0, v1}, Lcom/discord/widgets/share/WidgetIncomingShare;->configure(Landroidx/recyclerview/widget/RecyclerView;Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;)V
@@ -1961,7 +1961,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->selectedReceiverPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v1}, Lrx/subjects/BehaviorSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/subjects/BehaviorSubject;->JO()Lrx/Observable;
 
     move-result-object v1
 
@@ -1989,7 +1989,7 @@
 
     const-string v3, "resultsAdapter"
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast v2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$Companion.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$Companion.smali
new file mode 100644
index 0000000000..bab159b9a4
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$Companion.smali
@@ -0,0 +1,115 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectate$Companion;
+.super Ljava/lang/Object;
+.source "WidgetSpectate.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/spectate/WidgetSpectate$Companion;-><init>()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$getTag(Lcom/discord/widgets/spectate/WidgetSpectate$Companion;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)Ljava/lang/String;
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate$Companion;->getTag(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method private final getTag(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const-string p1, "StreamFull"
+
+    return-object p1
+
+    :cond_0
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    const-string p1, "ReportProblem"
+
+    return-object p1
+
+    :cond_1
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    const-string p1, "StreamFeedback"
+
+    return-object p1
+
+    :cond_2
+    new-instance p1, Lkotlin/k;
+
+    invoke-direct {p1}, Lkotlin/k;-><init>()V
+
+    throw p1
+.end method
+
+
+# virtual methods
+.method public final launch(Landroid/content/Context;J)V
+    .locals 2
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Landroid/content/Intent;
+
+    invoke-direct {v0}, Landroid/content/Intent;-><init>()V
+
+    const-string v1, "com.discord.intent.extra.EXTRA_USER_ID"
+
+    invoke-virtual {v0, v1, p2, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
+
+    const-class p2, Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    invoke-static {p1, p2, v0}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$WhenMappings.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$WhenMappings.smali
new file mode 100644
index 0000000000..b5653d1952
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$WhenMappings.smali
@@ -0,0 +1,106 @@
+.class public final synthetic Lcom/discord/widgets/spectate/WidgetSpectate$WhenMappings;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field public static final synthetic $EnumSwitchMapping$0:[I
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 3
+
+    invoke-static {}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->values()[Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectate$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->CONNECTING:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectate$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->RECONNECTING:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x2
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectate$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ACTIVE:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x3
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectate$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ENDED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x4
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectate$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->PAUSED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x5
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectate$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->EJECTED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x6
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectate$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->DENIED_FULL:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x7
+
+    aput v2, v0, v1
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureActionBar$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureActionBar$1.smali
new file mode 100644
index 0000000000..2ba45ac67d
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureActionBar$1.smali
@@ -0,0 +1,125 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectate$configureActionBar$1;
+.super Ljava/lang/Object;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Lrx/functions/Action2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate;->configureActionBar(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T1:",
+        "Ljava/lang/Object;",
+        "T2:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action2<",
+        "Landroid/view/MenuItem;",
+        "Landroid/content/Context;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $viewState:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectate;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectate$configureActionBar$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    iput-object p2, p0, Lcom/discord/widgets/spectate/WidgetSpectate$configureActionBar$1;->$viewState:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Landroid/view/MenuItem;Landroid/content/Context;)V
+    .locals 2
+
+    const-string v0, "menuItem"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
+
+    move-result p1
+
+    packed-switch p1, :pswitch_data_0
+
+    goto :goto_0
+
+    :pswitch_0
+    sget-object p1, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->Companion:Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$Companion;
+
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate$configureActionBar$1;->$viewState:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v0
+
+    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;->getChannelId()J
+
+    move-result-wide v0
+
+    invoke-virtual {p1, p2, v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$Companion;->launch(Landroid/content/Context;J)V
+
+    return-void
+
+    :pswitch_1
+    iget-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectate$configureActionBar$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    invoke-static {p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectate;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->onReportProblemPressed()V
+
+    :goto_0
+    return-void
+
+    :pswitch_data_0
+    .packed-switch 0x7f0a0479
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Landroid/view/MenuItem;
+
+    check-cast p2, Landroid/content/Context;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/spectate/WidgetSpectate$configureActionBar$1;->call(Landroid/view/MenuItem;Landroid/content/Context;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$1.smali
new file mode 100644
index 0000000000..c06a38a696
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$1.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$1;
+.super Ljava/lang/Object;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate;->configureUI(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectate;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    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/spectate/WidgetSpectate$configureUI$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    invoke-static {p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectate;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->onUiInteractedWith()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$2.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$2.smali
new file mode 100644
index 0000000000..f8431c1c34
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$2.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$2;
+.super Ljava/lang/Object;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate;->configureUI(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectate;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$2;->this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    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/spectate/WidgetSpectate$configureUI$2;->this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    invoke-static {p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectate;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->onDisconnectStreamPressed()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$3.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$3.smali
new file mode 100644
index 0000000000..034a523bae
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$3.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$3;
+.super Ljava/lang/Object;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate;->configureUI(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectate;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$3;->this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    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/spectate/WidgetSpectate$configureUI$3;->this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    invoke-static {p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectate;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->onDisconnectVoicePressed()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$4.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$4.smali
new file mode 100644
index 0000000000..8869e96bca
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$4.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$4;
+.super Ljava/lang/Object;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate;->configureUI(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectate;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$4;->this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    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/spectate/WidgetSpectate$configureUI$4;->this$0:Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    invoke-static {p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectate;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->onMuteTogglePressed()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$5.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$5.smali
new file mode 100644
index 0000000000..0fbf9ae1e3
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$5.smali
@@ -0,0 +1,97 @@
+.class final synthetic Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$5;
+.super Lkotlin/jvm/internal/j;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate;->configureUI(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Boolean;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)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/spectate/WidgetSpectateViewModel;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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 final 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/spectate/WidgetSpectate$configureUI$5;->invoke(Z)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Z)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$5;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->onPushToTalkPressed(Z)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1.smali
new file mode 100644
index 0000000000..d18a147620
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1.smali
@@ -0,0 +1,221 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate;->initializeSystemUiListeners(Landroid/view/ViewGroup;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lkotlin/jvm/functions/Function1<",
+        "-",
+        "Landroid/view/View;",
+        "+",
+        "Lkotlin/Unit;",
+        ">;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $fullscreenChildren:Ljava/util/List;
+
+.field final synthetic $viewGroup:Landroid/view/ViewGroup;
+
+
+# direct methods
+.method constructor <init>(Landroid/view/ViewGroup;Ljava/util/List;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;->$viewGroup:Landroid/view/ViewGroup;
+
+    iput-object p2, p0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;->$fullscreenChildren:Ljava/util/List;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lkotlin/jvm/functions/Function1;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;->invoke(Lkotlin/jvm/functions/Function1;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lkotlin/jvm/functions/Function1;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Landroid/view/View;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;->$viewGroup:Landroid/view/ViewGroup;
+
+    invoke-virtual {v0}, Landroid/view/ViewGroup;->getChildCount()I
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    invoke-static {v1, v0}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Iterable;
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    const/16 v2, 0xa
+
+    invoke-static {v0, v2}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
+
+    move-result v2
+
+    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast v1, Ljava/util/Collection;
+
+    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
+
+    move-object v2, v0
+
+    check-cast v2, Lkotlin/a/ab;
+
+    invoke-virtual {v2}, Lkotlin/a/ab;->nextInt()I
+
+    move-result v2
+
+    iget-object v3, p0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;->$viewGroup:Landroid/view/ViewGroup;
+
+    invoke-virtual {v3, v2}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
+
+    move-result-object v2
+
+    invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    check-cast v1, Ljava/util/List;
+
+    check-cast v1, Ljava/lang/Iterable;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :cond_1
+    :goto_1
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    move-object v3, v2
+
+    check-cast v3, Landroid/view/View;
+
+    iget-object v4, p0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;->$fullscreenChildren:Ljava/util/List;
+
+    check-cast v4, Ljava/lang/Iterable;
+
+    invoke-static {v4, v3}, Lkotlin/a/m;->a(Ljava/lang/Iterable;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    xor-int/lit8 v3, v3, 0x1
+
+    if-eqz v3, :cond_1
+
+    invoke-interface {v0, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_2
+    check-cast v0, Ljava/util/List;
+
+    check-cast v0, Ljava/lang/Iterable;
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->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, Landroid/view/View;
+
+    const-string v2, "it"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_2
+
+    :cond_3
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2$1.smali
new file mode 100644
index 0000000000..010c8f606f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2$1.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2$1;
+.super Ljava/lang/Object;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Landroid/view/View$OnApplyWindowInsetsListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2;->invoke(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2$1;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onApplyWindowInsets(Landroid/view/View;Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
+    .locals 4
+
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/view/WindowInsets;->getSystemWindowInsetLeft()I
+
+    move-result v0
+
+    invoke-virtual {p2}, Landroid/view/WindowInsets;->getSystemWindowInsetTop()I
+
+    move-result v1
+
+    invoke-virtual {p2}, Landroid/view/WindowInsets;->getSystemWindowInsetRight()I
+
+    move-result v2
+
+    invoke-virtual {p2}, Landroid/view/WindowInsets;->getSystemWindowInsetBottom()I
+
+    move-result v3
+
+    invoke-virtual {p1, v0, v1, v2, v3}, Landroid/view/View;->setPadding(IIII)V
+
+    return-object p2
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2.smali
new file mode 100644
index 0000000000..532051c863
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2.smali
@@ -0,0 +1,85 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate;->initializeSystemUiListeners(Landroid/view/ViewGroup;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Landroid/view/View;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2;
+
+    invoke-direct {v0}, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroid/view/View;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2;->invoke(Landroid/view/View;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Landroid/view/View;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2$1;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2$1;
+
+    check-cast v0, Landroid/view/View$OnApplyWindowInsetsListener;
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->setOnApplyWindowInsetsListener(Landroid/view/View$OnApplyWindowInsetsListener;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3$1.smali
new file mode 100644
index 0000000000..be84df3028
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3$1.smali
@@ -0,0 +1,77 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3;->onApplyWindowInsets(Landroid/view/View;Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Landroid/view/View;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $insets:Landroid/view/WindowInsets;
+
+
+# direct methods
+.method constructor <init>(Landroid/view/WindowInsets;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3$1;->$insets:Landroid/view/WindowInsets;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroid/view/View;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3$1;->invoke(Landroid/view/View;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Landroid/view/View;)V
+    .locals 2
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Landroid/view/WindowInsets;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3$1;->$insets:Landroid/view/WindowInsets;
+
+    invoke-direct {v0, v1}, Landroid/view/WindowInsets;-><init>(Landroid/view/WindowInsets;)V
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->dispatchApplyWindowInsets(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3.smali
new file mode 100644
index 0000000000..cdc8a85cdd
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3.smali
@@ -0,0 +1,51 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3;
+.super Ljava/lang/Object;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Landroid/view/View$OnApplyWindowInsetsListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate;->initializeSystemUiListeners(Landroid/view/ViewGroup;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $forEachAdjustableChild$1:Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3;->$forEachAdjustableChild$1:Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onApplyWindowInsets(Landroid/view/View;Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
+    .locals 1
+
+    iget-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3;->$forEachAdjustableChild$1:Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3$1;
+
+    invoke-direct {v0, p2}, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3$1;-><init>(Landroid/view/WindowInsets;)V
+
+    check-cast v0, Lkotlin/jvm/functions/Function1;
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;->invoke(Lkotlin/jvm/functions/Function1;)V
+
+    return-object p2
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$1.smali
new file mode 100644
index 0000000000..c4cfdd72da
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$1.smali
@@ -0,0 +1,87 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$1;
+.super Ljava/lang/Object;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate;->onViewBoundOrOnResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$1;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$1;
+
+    return-void
+.end method
+
+.method 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/spectate/WidgetSpectateViewModel$State;)V
+    .locals 1
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "rendering state: "
+
+    invoke-virtual {v0, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "WidgetSpectate"
+
+    invoke-static {v0, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$1;->call(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$2.smali
new file mode 100644
index 0000000000..b22acee1f2
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$2.smali
@@ -0,0 +1,97 @@
+.class final synthetic Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$2;
+.super Lkotlin/jvm/internal/j;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate;->onViewBoundOrOnResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectate;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getName()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "renderViewState"
+
+    return-object v0
+.end method
+
+.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
+    .locals 1
+
+    const-class v0, Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final getSignature()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "renderViewState(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;)V"
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$2;->invoke(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$2;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->access$renderViewState(Lcom/discord/widgets/spectate/WidgetSpectate;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$3.smali
new file mode 100644
index 0000000000..4128e3646c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$3.smali
@@ -0,0 +1,97 @@
+.class final synthetic Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$3;
+.super Lkotlin/jvm/internal/j;
+.source "WidgetSpectate.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectate;->onViewBoundOrOnResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectate;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><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/spectate/WidgetSpectate;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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/spectate/WidgetSpectateViewModel$Event;)V"
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$3;->invoke(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$3;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->access$handleEvent(Lcom/discord/widgets/spectate/WidgetSpectate;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate.smali
new file mode 100644
index 0000000000..f8915d278b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate.smali
@@ -0,0 +1,1437 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectate;
+.super Lcom/discord/app/AppFragment;
+.source "WidgetSpectate.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/spectate/WidgetSpectate$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+.field private static final ALL_DIALOG_TAGS:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final Companion:Lcom/discord/widgets/spectate/WidgetSpectate$Companion;
+
+.field private static final DIALOG_TAG_REPORT_PROBLEM:Ljava/lang/String; = "ReportProblem"
+
+.field private static final DIALOG_TAG_STREAM_FEEDBACK:Ljava/lang/String; = "StreamFeedback"
+
+.field private static final DIALOG_TAG_STREAM_FULL:Ljava/lang/String; = "StreamFull"
+
+
+# instance fields
+.field private final actionBar$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final controls$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final controlsDisconnectStream$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final controlsDisconnectVoice$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final controlsMute$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final pushToTalk$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final videoRenderer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 10
+
+    const-class v0, Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    const/4 v1, 0x7
+
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "actionBar"
+
+    const-string v5, "getActionBar()Landroid/view/View;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v4
+
+    const-string v5, "controls"
+
+    const-string v6, "getControls()Landroid/view/View;"
+
+    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v4, 0x1
+
+    aput-object v2, v1, v4
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v5
+
+    const-string v6, "videoRenderer"
+
+    const-string v7, "getVideoRenderer()Lcom/discord/views/video/ApplicationStreamView;"
+
+    invoke-direct {v2, v5, v6, v7}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v5, 0x2
+
+    aput-object v2, v1, v5
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v6
+
+    const-string v7, "controlsDisconnectStream"
+
+    const-string v8, "getControlsDisconnectStream()Landroid/view/View;"
+
+    invoke-direct {v2, v6, v7, v8}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v6, 0x3
+
+    aput-object v2, v1, v6
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v7
+
+    const-string v8, "controlsDisconnectVoice"
+
+    const-string v9, "getControlsDisconnectVoice()Landroid/view/View;"
+
+    invoke-direct {v2, v7, v8, v9}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v7, 0x4
+
+    aput-object v2, v1, v7
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v7
+
+    const-string v8, "controlsMute"
+
+    const-string v9, "getControlsMute()Landroid/widget/ImageView;"
+
+    invoke-direct {v2, v7, v8, v9}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v7, 0x5
+
+    aput-object v2, v1, v7
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    const-string v7, "pushToTalk"
+
+    const-string v8, "getPushToTalk()Landroid/view/View;"
+
+    invoke-direct {v2, v0, v7, v8}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x6
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetSpectate;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectate$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/spectate/WidgetSpectate$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectate;->Companion:Lcom/discord/widgets/spectate/WidgetSpectate$Companion;
+
+    new-array v0, v6, [Ljava/lang/String;
+
+    const-string v1, "StreamFull"
+
+    aput-object v1, v0, v3
+
+    const-string v1, "ReportProblem"
+
+    aput-object v1, v0, v4
+
+    const-string v1, "StreamFeedback"
+
+    aput-object v1, v0, v5
+
+    invoke-static {v0}, Lkotlin/a/ak;->o([Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectate;->ALL_DIALOG_TAGS:Ljava/util/Set;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
+
+    const v0, 0x7f0a0037
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->actionBar$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a071e
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->controls$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0080
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->videoRenderer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a071f
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->controlsDisconnectStream$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0720
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->controlsDisconnectVoice$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0721
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->controlsMute$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0722
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->pushToTalk$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectate;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+    .locals 1
+
+    iget-object p0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    if-nez p0, :cond_0
+
+    const-string v0, "viewModel"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static final synthetic access$handleEvent(Lcom/discord/widgets/spectate/WidgetSpectate;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->handleEvent(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$renderViewState(Lcom/discord/widgets/spectate/WidgetSpectate;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->renderViewState(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectate;Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    return-void
+.end method
+
+.method private final configureActionBar(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+    .locals 8
+
+    const v0, 0x7f080239
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/spectate/WidgetSpectate;->setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getActionBar()Landroid/view/View;
+
+    move-result-object v0
+
+    const v1, 0x7f0800e1
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundResource(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getActionBar()Landroid/view/View;
+
+    move-result-object v2
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getShowChrome()Z
+
+    move-result v3
+
+    const-wide/16 v4, 0x0
+
+    const/4 v6, 0x2
+
+    const/4 v7, 0x0
+
+    invoke-static/range {v2 .. v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy$default(Landroid/view/View;ZJILjava/lang/Object;)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getNickname()Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_0
+    check-cast v0, Ljava/lang/CharSequence;
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/spectate/WidgetSpectate;->setActionBarTitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
+
+    const v2, 0x7f0e0018
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectate$configureActionBar$1;
+
+    invoke-direct {v0, p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate$configureActionBar$1;-><init>(Lcom/discord/widgets/spectate/WidgetSpectate;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+
+    move-object v3, v0
+
+    check-cast v3, Lrx/functions/Action2;
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x4
+
+    const/4 v6, 0x0
+
+    move-object v1, p0
+
+    invoke-static/range {v1 .. v6}, 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
+.end method
+
+.method private final configureChrome(Z)V
+    .locals 6
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getControls()Landroid/view/View;
+
+    move-result-object v0
+
+    const-wide/16 v2, 0x0
+
+    const/4 v4, 0x2
+
+    const/4 v5, 0x0
+
+    move v1, p1
+
+    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy$default(Landroid/view/View;ZJILjava/lang/Object;)V
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x15
+
+    if-ge v0, v1, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Landroidx/fragment/app/FragmentActivity;->getWindow()Landroid/view/Window;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Landroid/view/Window;->getDecorView()Landroid/view/View;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_2
+
+    if-nez p1, :cond_1
+
+    const/16 p1, 0xe06
+
+    goto :goto_0
+
+    :cond_1
+    const/16 p1, 0x600
+
+    :goto_0
+    invoke-virtual {v0, p1}, Landroid/view/View;->setSystemUiVisibility(I)V
+
+    :cond_2
+    return-void
+.end method
+
+.method private final configureUI(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+    .locals 8
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectate$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ordinal()I
+
+    move-result v0
+
+    aget v0, v1, v0
+
+    const/4 v1, 0x0
+
+    packed-switch v0, :pswitch_data_0
+
+    new-instance p1, Lkotlin/k;
+
+    invoke-direct {p1}, Lkotlin/k;-><init>()V
+
+    throw p1
+
+    :pswitch_0
+    move-object v0, v1
+
+    goto :goto_0
+
+    :pswitch_1
+    sget-object v0, Lcom/discord/views/video/ApplicationStreamView$a$c;->Ev:Lcom/discord/views/video/ApplicationStreamView$a$c;
+
+    check-cast v0, Lcom/discord/views/video/ApplicationStreamView$a;
+
+    goto :goto_0
+
+    :pswitch_2
+    sget-object v0, Lcom/discord/views/video/ApplicationStreamView$a$b;->Eu:Lcom/discord/views/video/ApplicationStreamView$a$b;
+
+    check-cast v0, Lcom/discord/views/video/ApplicationStreamView$a;
+
+    goto :goto_0
+
+    :pswitch_3
+    new-instance v0, Lcom/discord/views/video/ApplicationStreamView$a$a;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getVideoStreamId()Ljava/lang/Integer;
+
+    move-result-object v2
+
+    invoke-direct {v0, v2}, Lcom/discord/views/video/ApplicationStreamView$a$a;-><init>(Ljava/lang/Integer;)V
+
+    check-cast v0, Lcom/discord/views/video/ApplicationStreamView$a;
+
+    :goto_0
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getVideoRenderer()Lcom/discord/views/video/ApplicationStreamView;
+
+    move-result-object v2
+
+    invoke-virtual {v2, v0}, Lcom/discord/views/video/ApplicationStreamView;->set(Lcom/discord/views/video/ApplicationStreamView$a;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getVideoRenderer()Lcom/discord/views/video/ApplicationStreamView;
+
+    move-result-object v0
+
+    new-instance v2, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$1;
+
+    invoke-direct {v2, p0}, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$1;-><init>(Lcom/discord/widgets/spectate/WidgetSpectate;)V
+
+    check-cast v2, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v2}, Lcom/discord/views/video/ApplicationStreamView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getControlsDisconnectStream()Landroid/view/View;
+
+    move-result-object v0
+
+    new-instance v2, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$2;
+
+    invoke-direct {v2, p0}, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$2;-><init>(Lcom/discord/widgets/spectate/WidgetSpectate;)V
+
+    check-cast v2, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getControlsDisconnectVoice()Landroid/view/View;
+
+    move-result-object v0
+
+    new-instance v2, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$3;
+
+    invoke-direct {v2, p0}, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$3;-><init>(Lcom/discord/widgets/spectate/WidgetSpectate;)V
+
+    check-cast v2, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getControlsMute()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->isMuted()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    const v2, 0x7f0802f8
+
+    goto :goto_1
+
+    :cond_0
+    const v2, 0x7f0802fd
+
+    :goto_1
+    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getControlsMute()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    new-instance v2, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$4;
+
+    invoke-direct {v2, p0}, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$4;-><init>(Lcom/discord/widgets/spectate/WidgetSpectate;)V
+
+    check-cast v2, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getPushToTalk()Landroid/view/View;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    move-result-object v2
+
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    if-ne v2, v3, :cond_1
+
+    const/4 v2, 0x1
+
+    goto :goto_2
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_2
+    const/4 v3, 0x2
+
+    invoke-static {v0, v2, v5, v3, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getPushToTalk()Landroid/view/View;
+
+    move-result-object v0
+
+    new-instance v2, Lcom/discord/utilities/press/OnPressListener;
+
+    new-instance v3, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$5;
+
+    iget-object v6, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    if-nez v6, :cond_2
+
+    const-string v7, "viewModel"
+
+    invoke-static {v7}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_2
+    invoke-direct {v3, v6}, Lcom/discord/widgets/spectate/WidgetSpectate$configureUI$5;-><init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    invoke-direct {v2, v3}, Lcom/discord/utilities/press/OnPressListener;-><init>(Lkotlin/jvm/functions/Function1;)V
+
+    check-cast v2, Landroid/view/View$OnTouchListener;
+
+    invoke-virtual {v0, v2}, Landroid/view/View;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getDialog()Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getDialog()Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    move-result-object v0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/spectate/WidgetSpectate;->showDialog(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)V
+
+    goto :goto_3
+
+    :cond_3
+    invoke-static {p0, v1, v4, v1}, Lcom/discord/widgets/spectate/WidgetSpectate;->dismissAllDialogs$default(Lcom/discord/widgets/spectate/WidgetSpectate;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;ILjava/lang/Object;)V
+
+    :goto_3
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->EJECTED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    if-ne p1, v0, :cond_4
+
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->requireContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const-string v0, "Ejected from stream"
+
+    check-cast v0, Ljava/lang/CharSequence;
+
+    invoke-static {p1, v0, v5}, Landroid/widget/Toast;->makeText(Landroid/content/Context;Ljava/lang/CharSequence;I)Landroid/widget/Toast;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroid/widget/Toast;->show()V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getAppActivity()Lcom/discord/app/AppActivity;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_4
+
+    invoke-virtual {p1}, Lcom/discord/app/AppActivity;->finish()V
+
+    :cond_4
+    return-void
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x1
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method private final dismissAllDialogs(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)V
+    .locals 5
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectate;->ALL_DIALOG_TAGS:Ljava/util/Set;
+
+    check-cast v0, Ljava/lang/Iterable;
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+
+    check-cast v1, Ljava/util/Collection;
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_0
+    :goto_0
+    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
+
+    move-object v3, v2
+
+    check-cast v3, Ljava/lang/String;
+
+    if-eqz p1, :cond_1
+
+    sget-object v4, Lcom/discord/widgets/spectate/WidgetSpectate;->Companion:Lcom/discord/widgets/spectate/WidgetSpectate$Companion;
+
+    invoke-static {v4, p1}, Lcom/discord/widgets/spectate/WidgetSpectate$Companion;->access$getTag(Lcom/discord/widgets/spectate/WidgetSpectate$Companion;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)Ljava/lang/String;
+
+    move-result-object v4
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v4, 0x0
+
+    :goto_1
+    invoke-static {v4, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    if-nez v3, :cond_0
+
+    invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_2
+    check-cast v1, Ljava/util/List;
+
+    check-cast v1, Ljava/lang/Iterable;
+
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_2
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+
+    move-object v1, p0
+
+    check-cast v1, Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    invoke-direct {v1, v0}, Lcom/discord/widgets/spectate/WidgetSpectate;->dismissDialog(Ljava/lang/String;)V
+
+    goto :goto_2
+
+    :cond_3
+    return-void
+.end method
+
+.method static synthetic dismissAllDialogs$default(Lcom/discord/widgets/spectate/WidgetSpectate;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;ILjava/lang/Object;)V
+    .locals 0
+
+    and-int/lit8 p2, p2, 0x1
+
+    if-eqz p2, :cond_0
+
+    const/4 p1, 0x0
+
+    :cond_0
+    invoke-direct {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->dismissAllDialogs(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)V
+
+    return-void
+.end method
+
+.method private final dismissDialog(Ljava/lang/String;)V
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1}, Landroidx/fragment/app/FragmentManager;->findFragmentByTag(Ljava/lang/String;)Landroidx/fragment/app/Fragment;
+
+    move-result-object p1
+
+    check-cast p1, Landroidx/fragment/app/DialogFragment;
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p1}, Landroidx/fragment/app/DialogFragment;->isVisible()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p1}, Landroidx/fragment/app/DialogFragment;->dismiss()V
+
+    :cond_0
+    return-void
+.end method
+
+.method private final getActionBar()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->actionBar$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectate;->$$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/view/View;
+
+    return-object v0
+.end method
+
+.method private final getControls()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->controls$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectate;->$$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/view/View;
+
+    return-object v0
+.end method
+
+.method private final getControlsDisconnectStream()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->controlsDisconnectStream$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectate;->$$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 getControlsDisconnectVoice()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->controlsDisconnectVoice$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectate;->$$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 getControlsMute()Landroid/widget/ImageView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->controlsMute$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectate;->$$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, Landroid/widget/ImageView;
+
+    return-object v0
+.end method
+
+.method private final getPushToTalk()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->pushToTalk$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectate;->$$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, Landroid/view/View;
+
+    return-object v0
+.end method
+
+.method private final getVideoRenderer()Lcom/discord/views/video/ApplicationStreamView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectate;->videoRenderer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectate;->$$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/video/ApplicationStreamView;
+
+    return-object v0
+.end method
+
+.method private final handleEvent(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;)V
+    .locals 1
+
+    instance-of v0, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;->getStringResId()I
+
+    move-result p1
+
+    invoke-static {v0, p1}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
+
+    :cond_0
+    return-void
+.end method
+
+.method private final initializeSystemUiListeners(Landroid/view/ViewGroup;)V
+    .locals 2
+
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x15
+
+    if-ge v0, v1, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getVideoRenderer()Lcom/discord/views/video/ApplicationStreamView;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lkotlin/a/m;->ba(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;
+
+    invoke-direct {v1, p1, v0}, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;-><init>(Landroid/view/ViewGroup;Ljava/util/List;)V
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2;
+
+    check-cast v0, Lkotlin/jvm/functions/Function1;
+
+    invoke-virtual {v1, v0}, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;->invoke(Lkotlin/jvm/functions/Function1;)V
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3;
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3;-><init>(Lcom/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1;)V
+
+    check-cast v0, Landroid/view/View$OnApplyWindowInsetsListener;
+
+    invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->setOnApplyWindowInsetsListener(Landroid/view/View$OnApplyWindowInsetsListener;)V
+
+    return-void
+.end method
+
+.method private final renderViewState(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;)V
+    .locals 1
+
+    instance-of v0, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->configureUI(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getShowChrome()Z
+
+    move-result v0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/spectate/WidgetSpectate;->configureChrome(Z)V
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->configureActionBar(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+
+    return-void
+
+    :cond_0
+    instance-of p1, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->finish()V
+
+    :cond_1
+    return-void
+.end method
+
+.method private final showDialog(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)V
+    .locals 3
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->dismissAllDialogs(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v0
+
+    const-string v1, "requireFragmentManager()"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectate;->Companion:Lcom/discord/widgets/spectate/WidgetSpectate$Companion;
+
+    invoke-static {v1, p1}, Lcom/discord/widgets/spectate/WidgetSpectate$Companion;->access$getTag(Lcom/discord/widgets/spectate/WidgetSpectate$Companion;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroidx/fragment/app/FragmentManager;->findFragmentByTag(Ljava/lang/String;)Landroidx/fragment/app/Fragment;
+
+    move-result-object v2
+
+    check-cast v2, Landroidx/fragment/app/DialogFragment;
+
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v2}, Landroidx/fragment/app/DialogFragment;->isVisible()Z
+
+    move-result v2
+
+    if-nez v2, :cond_3
+
+    :cond_0
+    sget-object v2, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull;
+
+    invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    new-instance p1, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;
+
+    invoke-direct {p1}, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;-><init>()V
+
+    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v2, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;
+
+    invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    sget-object p1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->Companion:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$Companion;
+
+    const/4 v2, 0x1
+
+    invoke-virtual {p1, v2}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$Companion;->newInstance(Z)Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    goto :goto_0
+
+    :cond_2
+    sget-object v2, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;
+
+    invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    new-instance p1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    invoke-direct {p1}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;-><init>()V
+
+    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    :goto_0
+    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    :cond_3
+    return-void
+
+    :cond_4
+    new-instance p1, Lkotlin/k;
+
+    invoke-direct {p1}, Lkotlin/k;-><init>()V
+
+    throw p1
+.end method
+
+
+# virtual methods
+.method public final getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d01c3
+
+    return v0
+.end method
+
+.method public final onViewBound(Landroid/view/View;)V
+    .locals 1
+
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
+
+    check-cast p1, Landroid/view/ViewGroup;
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectate;->initializeSystemUiListeners(Landroid/view/ViewGroup;)V
+
+    return-void
+.end method
+
+.method public final onViewBoundOrOnResume()V
+    .locals 18
+
+    move-object/from16 v0, p0
+
+    invoke-super/range {p0 .. p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object v1
+
+    const-wide/16 v2, 0x0
+
+    const-string v4, "com.discord.intent.extra.EXTRA_USER_ID"
+
+    invoke-virtual {v1, v4, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+
+    move-result-wide v4
+
+    cmp-long v1, v4, v2
+
+    if-lez v1, :cond_3
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/spectate/WidgetSpectate;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object v1
+
+    invoke-static {v1}, Landroidx/lifecycle/ViewModelProviders;->of(Landroidx/fragment/app/FragmentActivity;)Landroidx/lifecycle/ViewModelProvider;
+
+    move-result-object v1
+
+    const-class v2, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-virtual {v1, v2}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+
+    move-result-object v1
+
+    const-string v2, "ViewModelProviders.of(re\u2026ateViewModel::class.java)"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    iput-object v1, v0, Lcom/discord/widgets/spectate/WidgetSpectate;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    iget-object v1, v0, Lcom/discord/widgets/spectate/WidgetSpectate;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    const-string v2, "viewModel"
+
+    if-nez v1, :cond_0
+
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->observeViewState()Lrx/Observable;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lrx/Observable;->JO()Lrx/Observable;
+
+    move-result-object v1
+
+    const-string v3, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v3, v0
+
+    check-cast v3, Lcom/discord/app/AppComponent;
+
+    const/4 v6, 0x2
+
+    const/4 v7, 0x0
+
+    invoke-static {v1, v3, v7, v6, 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 v1
+
+    sget-object v8, Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$1;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$1;
+
+    check-cast v8, Lrx/functions/Action1;
+
+    invoke-virtual {v1, v8}, Lrx/Observable;->a(Lrx/functions/Action1;)Lrx/Observable;
+
+    move-result-object v9
+
+    const-string v1, "viewModel\n        .obser\u2026\"rendering state: $it\") }"
+
+    invoke-static {v9, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$2;
+
+    move-object v8, v0
+
+    check-cast v8, Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    invoke-direct {v1, v8}, Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$2;-><init>(Lcom/discord/widgets/spectate/WidgetSpectate;)V
+
+    move-object v15, v1
+
+    check-cast v15, Lkotlin/jvm/functions/Function1;
+
+    const-class v10, Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    const/4 v11, 0x0
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/16 v16, 0x1e
+
+    const/16 v17, 0x0
+
+    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 v1, v0, Lcom/discord/widgets/spectate/WidgetSpectate;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    if-nez v1, :cond_1
+
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_1
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->observeEvents()Lrx/Observable;
+
+    move-result-object v1
+
+    invoke-static {v1, v3, v7, v6, 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 v9
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$3;
+
+    invoke-direct {v1, v8}, Lcom/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$3;-><init>(Lcom/discord/widgets/spectate/WidgetSpectate;)V
+
+    move-object v15, v1
+
+    check-cast v15, Lkotlin/jvm/functions/Function1;
+
+    const-class v10, Lcom/discord/widgets/spectate/WidgetSpectate;
+
+    const/4 v11, 0x0
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/16 v16, 0x1e
+
+    const/16 v17, 0x0
+
+    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 v1, v0, Lcom/discord/widgets/spectate/WidgetSpectate;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    if-nez v1, :cond_2
+
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_2
+    invoke-virtual {v1, v4, v5}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->setUserId(J)V
+
+    return-void
+
+    :cond_3
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    const-string v2, "needs user id"
+
+    invoke-direct {v1, v2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    check-cast v1, Ljava/lang/Throwable;
+
+    throw v1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateKt.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateKt.smali
new file mode 100644
index 0000000000..294b8685c0
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateKt.smali
@@ -0,0 +1,7 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateKt;
+.super Ljava/lang/Object;
+.source "WidgetSpectate.kt"
+
+
+# static fields
+.field private static final TAG:Ljava/lang/String; = "WidgetSpectate"
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$Companion.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$Companion.smali
new file mode 100644
index 0000000000..e60894d581
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$Companion.smali
@@ -0,0 +1,54 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$Companion;
+.super Ljava/lang/Object;
+.source "WidgetSpectateReportProblemDialog.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/spectate/WidgetSpectateReportProblemDialog$Companion;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final newInstance(Z)Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+    .locals 3
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+    invoke-direct {v0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;-><init>()V
+
+    new-instance v1, Landroid/os/Bundle;
+
+    invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
+
+    const-string v2, "ARG_IS_STREAM_ENDED"
+
+    invoke-virtual {v1, v2, p1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->setArguments(Landroid/os/Bundle;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$1.smali
new file mode 100644
index 0000000000..13c8d17f8e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$1.smali
@@ -0,0 +1,82 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$1;
+.super Ljava/lang/Object;
+.source "ObservableExtensions.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->onResume()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;",
+        "Lrx/functions/b<",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$1;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$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 synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$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
+
+    instance-of p1, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    return p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$2.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$2.smali
new file mode 100644
index 0000000000..2c4b504c52
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$2.smali
@@ -0,0 +1,84 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$2;
+.super Ljava/lang/Object;
+.source "ObservableExtensions.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->onResume()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;",
+        "Lrx/functions/b<",
+        "TT;TR;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$2;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$2;
+
+    invoke-direct {v0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$2;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$2;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$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(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Object;",
+            ")TT;"
+        }
+    .end annotation
+
+    if-eqz p1, :cond_0
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Lkotlin/r;
+
+    const-string v0, "null cannot be cast to non-null type com.discord.widgets.spectate.WidgetSpectateViewModel.State.SpectatingActive"
+
+    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$1.smali
new file mode 100644
index 0000000000..3628b71895
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$1.smali
@@ -0,0 +1,93 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSpectateReportProblemDialog.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$1;->invoke(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;)V
+    .locals 1
+
+    const-string v0, "viewState"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ENDED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    if-ne p1, v0, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->access$configureUI(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;Z)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$2.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$2.smali
new file mode 100644
index 0000000000..ed331a01fd
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$2.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$2;
+.super Ljava/lang/Object;
+.source "WidgetSpectateReportProblemDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$2;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+    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/spectate/WidgetSpectateReportProblemDialog$onResume$2;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+    invoke-static {p1}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->onReportProblemCanceled()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$3.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$3.smali
new file mode 100644
index 0000000000..a5d09cb850
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$3.smali
@@ -0,0 +1,141 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$3;
+.super Ljava/lang/Object;
+.source "WidgetSpectateReportProblemDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$3;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 2
+
+    iget-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$3;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+    invoke-static {p1}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->access$getRadioGroup$p(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;)Landroid/widget/RadioGroup;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroid/widget/RadioGroup;->getCheckedRadioButtonId()I
+
+    move-result p1
+
+    const/4 v0, -0x1
+
+    if-ne p1, v0, :cond_0
+
+    return-void
+
+    :cond_0
+    packed-switch p1, :pswitch_data_0
+
+    :pswitch_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v1, "invalid option selected: "
+
+    invoke-virtual {v1, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    throw v0
+
+    :pswitch_1
+    sget-object p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->BLACK_SCREEN:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    goto :goto_0
+
+    :pswitch_2
+    sget-object p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->OUT_OF_SYNC:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    goto :goto_0
+
+    :pswitch_3
+    sget-object p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->LAGGING:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    goto :goto_0
+
+    :pswitch_4
+    sget-object p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->BLURRY:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    goto :goto_0
+
+    :pswitch_5
+    sget-object p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->AUDIO_POOR:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    goto :goto_0
+
+    :pswitch_6
+    sget-object p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->AUDIO_MISSING:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    :goto_0
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$3;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+    invoke-static {v0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->reportProblem(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;Z)V
+
+    iget-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$3;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const v0, 0x7f1210f0
+
+    invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
+
+    return-void
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x7f0a0567
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_0
+        :pswitch_1
+    .end packed-switch
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog.smali
new file mode 100644
index 0000000000..7da4e8a7d7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog.smali
@@ -0,0 +1,801 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+.super Lcom/discord/app/AppDialog;
+.source "WidgetSpectateReportProblemDialog.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+.field private static final ARG_IS_STREAM_ENDED:Ljava/lang/String; = "ARG_IS_STREAM_ENDED"
+
+.field public static final Companion:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$Companion;
+
+
+# instance fields
+.field private final cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final choiceStreamAudioAbsent$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final choiceStreamAudioPoor$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final choiceStreamBlack$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final choiceStreamBlurry$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final choiceStreamLagging$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final choiceStreamOutOfSync$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final radioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final submitBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 6
+
+    const-class v0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;
+
+    const/16 v1, 0x9
+
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "submitBtn"
+
+    const-string v5, "getSubmitBtn()Landroid/widget/Button;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "cancelBtn"
+
+    const-string v5, "getCancelBtn()Landroid/widget/Button;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x1
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "radioGroup"
+
+    const-string v5, "getRadioGroup()Landroid/widget/RadioGroup;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x2
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "choiceStreamBlack"
+
+    const-string v5, "getChoiceStreamBlack()Landroid/widget/RadioButton;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x3
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "choiceStreamBlurry"
+
+    const-string v5, "getChoiceStreamBlurry()Landroid/widget/RadioButton;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x4
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "choiceStreamLagging"
+
+    const-string v5, "getChoiceStreamLagging()Landroid/widget/RadioButton;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x5
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "choiceStreamOutOfSync"
+
+    const-string v5, "getChoiceStreamOutOfSync()Landroid/widget/RadioButton;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x6
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "choiceStreamAudioAbsent"
+
+    const-string v5, "getChoiceStreamAudioAbsent()Landroid/widget/RadioButton;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x7
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    const-string v3, "choiceStreamAudioPoor"
+
+    const-string v4, "getChoiceStreamAudioPoor()Landroid/widget/RadioButton;"
+
+    invoke-direct {v2, v0, v3, v4}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0x8
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->Companion:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
+
+    const v0, 0x7f0a0570
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->submitBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a056e
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a056c
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->radioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a056d
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->choiceStreamBlack$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0569
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->choiceStreamBlurry$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a056a
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->choiceStreamLagging$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a056b
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->choiceStreamOutOfSync$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0567
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->choiceStreamAudioAbsent$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0568
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->choiceStreamAudioPoor$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method public static final synthetic access$configureUI(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;Z)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->configureUI(Z)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$getRadioGroup$p(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;)Landroid/widget/RadioGroup;
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->getRadioGroup()Landroid/widget/RadioGroup;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+    .locals 1
+
+    iget-object p0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    if-nez p0, :cond_0
+
+    const-string v0, "viewModel"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    return-void
+.end method
+
+.method private final configureUI(Z)V
+    .locals 2
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->getChoiceStreamBlack()Landroid/widget/RadioButton;
+
+    move-result-object v0
+
+    if-eqz p1, :cond_0
+
+    const v1, 0x7f1210df
+
+    goto :goto_0
+
+    :cond_0
+    const v1, 0x7f1210db
+
+    :goto_0
+    invoke-virtual {v0, v1}, Landroid/widget/RadioButton;->setText(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->getChoiceStreamBlurry()Landroid/widget/RadioButton;
+
+    move-result-object v0
+
+    if-eqz p1, :cond_1
+
+    const v1, 0x7f1210e0
+
+    goto :goto_1
+
+    :cond_1
+    const v1, 0x7f1210dc
+
+    :goto_1
+    invoke-virtual {v0, v1}, Landroid/widget/RadioButton;->setText(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->getChoiceStreamLagging()Landroid/widget/RadioButton;
+
+    move-result-object v0
+
+    if-eqz p1, :cond_2
+
+    const v1, 0x7f1210e1
+
+    goto :goto_2
+
+    :cond_2
+    const v1, 0x7f1210e5
+
+    :goto_2
+    invoke-virtual {v0, v1}, Landroid/widget/RadioButton;->setText(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->getChoiceStreamOutOfSync()Landroid/widget/RadioButton;
+
+    move-result-object v0
+
+    if-eqz p1, :cond_3
+
+    const v1, 0x7f1210e2
+
+    goto :goto_3
+
+    :cond_3
+    const v1, 0x7f1210e7
+
+    :goto_3
+    invoke-virtual {v0, v1}, Landroid/widget/RadioButton;->setText(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->getChoiceStreamAudioAbsent()Landroid/widget/RadioButton;
+
+    move-result-object v0
+
+    if-eqz p1, :cond_4
+
+    const v1, 0x7f1210dd
+
+    goto :goto_4
+
+    :cond_4
+    const v1, 0x7f1210d9
+
+    :goto_4
+    invoke-virtual {v0, v1}, Landroid/widget/RadioButton;->setText(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->getChoiceStreamAudioPoor()Landroid/widget/RadioButton;
+
+    move-result-object v0
+
+    if-eqz p1, :cond_5
+
+    const p1, 0x7f1210de
+
+    goto :goto_5
+
+    :cond_5
+    const p1, 0x7f1210da
+
+    :goto_5
+    invoke-virtual {v0, p1}, Landroid/widget/RadioButton;->setText(I)V
+
+    return-void
+.end method
+
+.method private final getCancelBtn()Landroid/widget/Button;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->$$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/Button;
+
+    return-object v0
+.end method
+
+.method private final getChoiceStreamAudioAbsent()Landroid/widget/RadioButton;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->choiceStreamAudioAbsent$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->$$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, Landroid/widget/RadioButton;
+
+    return-object v0
+.end method
+
+.method private final getChoiceStreamAudioPoor()Landroid/widget/RadioButton;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->choiceStreamAudioPoor$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->$$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, Landroid/widget/RadioButton;
+
+    return-object v0
+.end method
+
+.method private final getChoiceStreamBlack()Landroid/widget/RadioButton;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->choiceStreamBlack$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->$$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/RadioButton;
+
+    return-object v0
+.end method
+
+.method private final getChoiceStreamBlurry()Landroid/widget/RadioButton;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->choiceStreamBlurry$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->$$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/widget/RadioButton;
+
+    return-object v0
+.end method
+
+.method private final getChoiceStreamLagging()Landroid/widget/RadioButton;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->choiceStreamLagging$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->$$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, Landroid/widget/RadioButton;
+
+    return-object v0
+.end method
+
+.method private final getChoiceStreamOutOfSync()Landroid/widget/RadioButton;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->choiceStreamOutOfSync$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->$$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, Landroid/widget/RadioButton;
+
+    return-object v0
+.end method
+
+.method private final getRadioGroup()Landroid/widget/RadioGroup;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->radioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->$$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/RadioGroup;
+
+    return-object v0
+.end method
+
+.method private final getSubmitBtn()Landroid/widget/Button;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->submitBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->$$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/Button;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public final getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d01c5
+
+    return v0
+.end method
+
+.method public final onResume()V
+    .locals 11
+
+    invoke-super {p0}, Lcom/discord/app/AppDialog;->onResume()V
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->setCancelable(Z)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object v0
+
+    invoke-static {v0}, Landroidx/lifecycle/ViewModelProviders;->of(Landroidx/fragment/app/FragmentActivity;)Landroidx/lifecycle/ViewModelProvider;
+
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+
+    move-result-object v0
+
+    const-string v1, "ViewModelProviders.of(re\u2026ateViewModel::class.java)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "viewModel"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    invoke-virtual {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->observeViewState()Lrx/Observable;
+
+    move-result-object v0
+
+    move-object v1, p0
+
+    check-cast v1, Lcom/discord/app/AppComponent;
+
+    invoke-static {v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeUntilComponentFinished(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$1;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$1;
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$2;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$2;
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v2
+
+    const-string v0, "filter { it is T }.map { it as T }"
+
+    invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$1;-><init>(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;)V
+
+    move-object v8, v0
+
+    check-cast v8, Lkotlin/jvm/functions/Function1;
+
+    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-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->getCancelBtn()Landroid/widget/Button;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$2;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$2;-><init>(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;->getSubmitBtn()Landroid/widget/Button;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$3;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$3;-><init>(Lcom/discord/widgets/spectate/WidgetSpectateReportProblemDialog;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateStreamFullDialog$onResume$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateStreamFullDialog$onResume$1.smali
new file mode 100644
index 0000000000..580065a3a9
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateStreamFullDialog$onResume$1.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog$onResume$1;
+.super Ljava/lang/Object;
+.source "WidgetSpectateStreamFullDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog$onResume$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;
+
+    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/spectate/WidgetSpectateStreamFullDialog$onResume$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;
+
+    invoke-static {p1}, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;->access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->onStreamFullDismissed()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateStreamFullDialog.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateStreamFullDialog.smali
new file mode 100644
index 0000000000..16a6cf433c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateStreamFullDialog.smali
@@ -0,0 +1,166 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;
+.super Lcom/discord/app/AppDialog;
+.source "WidgetSpectateStreamFullDialog.kt"
+
+
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+
+# instance fields
+.field private final confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 5
+
+    const/4 v0, 0x1
+
+    new-array v0, v0, [Lkotlin/reflect/KProperty;
+
+    new-instance v1, Lkotlin/jvm/internal/v;
+
+    const-class v2, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v2
+
+    const-string v3, "confirmBtn"
+
+    const-string v4, "getConfirmBtn()Landroid/widget/Button;"
+
+    invoke-direct {v1, v2, v3, v4}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v1}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v1
+
+    check-cast v1, Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x0
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
+
+    const v0, 0x7f0a0748
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+    .locals 1
+
+    iget-object p0, p0, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    if-nez p0, :cond_0
+
+    const-string v0, "viewModel"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    return-void
+.end method
+
+.method private final getConfirmBtn()Landroid/widget/Button;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;->$$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/Button;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public final getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d01c6
+
+    return v0
+.end method
+
+.method public final onResume()V
+    .locals 2
+
+    invoke-super {p0}, Lcom/discord/app/AppDialog;->onResume()V
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;->setCancelable(Z)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object v0
+
+    invoke-static {v0}, Landroidx/lifecycle/ViewModelProviders;->of(Landroidx/fragment/app/FragmentActivity;)Landroidx/lifecycle/ViewModelProvider;
+
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+
+    move-result-object v0
+
+    const-string v1, "ViewModelProviders.of(re\u2026ateViewModel::class.java)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;->getConfirmBtn()Landroid/widget/Button;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog$onResume$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog$onResume$1;-><init>(Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem.smali
new file mode 100644
index 0000000000..198d9157ec
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;
+.super Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+.source "WidgetSpectateViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ReportProblem"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;
+
+    invoke-direct {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback.smali
new file mode 100644
index 0000000000..8c13e07c29
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;
+.super Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+.source "WidgetSpectateViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "StreamFeedback"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;
+
+    invoke-direct {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull.smali
new file mode 100644
index 0000000000..c6778938cc
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull;
+.super Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+.source "WidgetSpectateViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "StreamFull"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull;
+
+    invoke-direct {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog.smali
new file mode 100644
index 0000000000..b4d9e129d7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog.smali
@@ -0,0 +1,40 @@
+.class public abstract Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+.super Ljava/lang/Object;
+.source "WidgetSpectateViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "Dialog"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull;,
+        Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;,
+        Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;
+    }
+.end annotation
+
+
+# direct methods
+.method private 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/spectate/WidgetSpectateViewModel$Dialog;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast.smali
new file mode 100644
index 0000000000..41649011dd
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast.smali
@@ -0,0 +1,154 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;
+.super Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;
+.source "WidgetSpectateViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ShowToast"
+.end annotation
+
+
+# instance fields
+.field private final stringResId:I
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;->stringResId:I
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;IILjava/lang/Object;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;
+    .locals 0
+
+    and-int/lit8 p2, p2, 0x1
+
+    if-eqz p2, :cond_0
+
+    iget p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;->stringResId:I
+
+    :cond_0
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;->copy(I)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;->stringResId:I
+
+    return v0
+.end method
+
+.method public final copy(I)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;
+
+    invoke-direct {v0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;-><init>(I)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 3
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;
+
+    iget v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;->stringResId:I
+
+    iget p1, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;->stringResId:I
+
+    if-ne v1, 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 final getStringResId()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;->stringResId:I
+
+    return v0
+.end method
+
+.method public final hashCode()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;->stringResId:I
+
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "ShowToast(stringResId="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;->stringResId: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;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Event.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Event.smali
new file mode 100644
index 0000000000..152ac2cd2f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Event.smali
@@ -0,0 +1,38 @@
+.class public abstract Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;
+.super Ljava/lang/Object;
+.source "WidgetSpectateViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "Event"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;
+    }
+.end annotation
+
+
+# direct methods
+.method private 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/spectate/WidgetSpectateViewModel$Event;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Problem.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Problem.smali
new file mode 100644
index 0000000000..dfb577dc6e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Problem.smali
@@ -0,0 +1,179 @@
+.class public final enum Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+.super Ljava/lang/Enum;
+.source "WidgetSpectateViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "Problem"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final synthetic $VALUES:[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+.field public static final enum AUDIO_MISSING:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+.field public static final enum AUDIO_POOR:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+.field public static final enum BLACK_SCREEN:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+.field public static final enum BLURRY:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+.field public static final enum LAGGING:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+.field public static final enum NONE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+.field public static final enum OUT_OF_SYNC:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x7
+
+    new-array v0, v0, [Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    const/4 v2, 0x0
+
+    const-string v3, "NONE"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->NONE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    const/4 v2, 0x1
+
+    const-string v3, "BLACK_SCREEN"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->BLACK_SCREEN:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    const/4 v2, 0x2
+
+    const-string v3, "BLURRY"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->BLURRY:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    const/4 v2, 0x3
+
+    const-string v3, "LAGGING"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->LAGGING:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    const/4 v2, 0x4
+
+    const-string v3, "OUT_OF_SYNC"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->OUT_OF_SYNC:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    const/4 v2, 0x5
+
+    const-string v3, "AUDIO_MISSING"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->AUDIO_MISSING:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    const/4 v2, 0x6
+
+    const-string v3, "AUDIO_POOR"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->AUDIO_POOR:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->$VALUES:[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    return-void
+.end method
+
+.method private 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/widgets/spectate/WidgetSpectateViewModel$Problem;
+    .locals 1
+
+    const-class v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    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/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+    .locals 1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->$VALUES:[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v0}, [Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$RawData.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$RawData.smali
new file mode 100644
index 0000000000..d0cd2fb459
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$RawData.smali
@@ -0,0 +1,580 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;
+.super Ljava/lang/Object;
+.source "WidgetSpectateViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = "RawData"
+.end annotation
+
+
+# instance fields
+.field private final inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+.field private final isMuted:Z
+
+.field private final member:Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+.field private final stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+.field private final streamState:Lcom/discord/stores/StoreApplicationStreaming$State;
+
+.field private final user:Lcom/discord/models/domain/ModelUser;
+
+.field private final videoStreamId:Ljava/lang/Integer;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Ljava/lang/Integer;ZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreApplicationStreaming$State;)V
+    .locals 1
+
+    const-string v0, "inputMode"
+
+    invoke-static {p6, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->user:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p2, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->member:Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    iput-object p3, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    iput-object p4, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->videoStreamId:Ljava/lang/Integer;
+
+    iput-boolean p5, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->isMuted:Z
+
+    iput-object p6, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    iput-object p7, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->streamState:Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Ljava/lang/Integer;ZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreApplicationStreaming$State;ILjava/lang/Object;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;
+    .locals 5
+
+    and-int/lit8 p9, p8, 0x1
+
+    if-eqz p9, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->user:Lcom/discord/models/domain/ModelUser;
+
+    :cond_0
+    and-int/lit8 p9, p8, 0x2
+
+    if-eqz p9, :cond_1
+
+    iget-object p2, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->member:Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    :cond_1
+    move-object p9, p2
+
+    and-int/lit8 p2, p8, 0x4
+
+    if-eqz p2, :cond_2
+
+    iget-object p3, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    :cond_2
+    move-object v0, p3
+
+    and-int/lit8 p2, p8, 0x8
+
+    if-eqz p2, :cond_3
+
+    iget-object p4, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->videoStreamId:Ljava/lang/Integer;
+
+    :cond_3
+    move-object v1, p4
+
+    and-int/lit8 p2, p8, 0x10
+
+    if-eqz p2, :cond_4
+
+    iget-boolean p5, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->isMuted:Z
+
+    :cond_4
+    move v2, p5
+
+    and-int/lit8 p2, p8, 0x20
+
+    if-eqz p2, :cond_5
+
+    iget-object p6, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    :cond_5
+    move-object v3, p6
+
+    and-int/lit8 p2, p8, 0x40
+
+    if-eqz p2, :cond_6
+
+    iget-object p7, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->streamState:Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    :cond_6
+    move-object v4, p7
+
+    move-object p2, p0
+
+    move-object p3, p1
+
+    move-object p4, p9
+
+    move-object p5, v0
+
+    move-object p6, v1
+
+    move p7, v2
+
+    move-object p8, v3
+
+    move-object p9, v4
+
+    invoke-virtual/range {p2 .. p9}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Ljava/lang/Integer;ZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreApplicationStreaming$State;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final component2()Lcom/discord/models/domain/ModelGuildMember$Computed;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->member:Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    return-object v0
+.end method
+
+.method public final component3()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    return-object v0
+.end method
+
+.method public final component4()Ljava/lang/Integer;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->videoStreamId:Ljava/lang/Integer;
+
+    return-object v0
+.end method
+
+.method public final component5()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->isMuted:Z
+
+    return v0
+.end method
+
+.method public final component6()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    return-object v0
+.end method
+
+.method public final component7()Lcom/discord/stores/StoreApplicationStreaming$State;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->streamState:Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Ljava/lang/Integer;ZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreApplicationStreaming$State;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;
+    .locals 9
+
+    const-string v0, "inputMode"
+
+    move-object v7, p6
+
+    invoke-static {p6, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;
+
+    move-object v1, v0
+
+    move-object v2, p1
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    move v6, p5
+
+    move-object/from16 v8, p7
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Ljava/lang/Integer;ZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreApplicationStreaming$State;)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->user:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->member:Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    iget-object v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->member:Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    iget-object v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->videoStreamId:Ljava/lang/Integer;
+
+    iget-object v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->videoStreamId:Ljava/lang/Integer;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-boolean v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->isMuted:Z
+
+    iget-boolean v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->isMuted:Z
+
+    if-ne v1, v3, :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, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    iget-object v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->streamState:Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    iget-object p1, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->streamState:Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    return v2
+
+    :cond_2
+    :goto_1
+    return v0
+.end method
+
+.method public final getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    return-object v0
+.end method
+
+.method public final getMember()Lcom/discord/models/domain/ModelGuildMember$Computed;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->member:Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    return-object v0
+.end method
+
+.method public final getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    return-object v0
+.end method
+
+.method public final getStreamState()Lcom/discord/stores/StoreApplicationStreaming$State;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->streamState:Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    return-object v0
+.end method
+
+.method public final getUser()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final getVideoStreamId()Ljava/lang/Integer;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->videoStreamId:Ljava/lang/Integer;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->user:Lcom/discord/models/domain/ModelUser;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->member:Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    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/widgets/spectate/WidgetSpectateViewModel$RawData;->videoStreamId:Ljava/lang/Integer;
+
+    if-eqz v2, :cond_3
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    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-boolean v2, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->isMuted:Z
+
+    if-eqz v2, :cond_4
+
+    const/4 v2, 0x1
+
+    :cond_4
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    if-eqz v2, :cond_5
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_4
+
+    :cond_5
+    const/4 v2, 0x0
+
+    :goto_4
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->streamState:Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    if-eqz v2, :cond_6
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_6
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final isMuted()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->isMuted:Z
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "RawData(user="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", member="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->member:Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", stream="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", videoStreamId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->videoStreamId:Ljava/lang/Integer;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", isMuted="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->isMuted:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", inputMode="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", streamState="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->streamState:Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish.smali
new file mode 100644
index 0000000000..0dff322629
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;
+.super Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+.source "WidgetSpectateViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Finish"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;
+
+    invoke-direct {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive.smali
new file mode 100644
index 0000000000..14ca183201
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive.smali
@@ -0,0 +1,766 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+.super Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+.source "WidgetSpectateViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "SpectatingActive"
+.end annotation
+
+
+# instance fields
+.field private final dialog:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+.field private final inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+.field private final isMuted:Z
+
+.field private final nickname:Ljava/lang/String;
+
+.field private final showChrome:Z
+
+.field private final spectatorCount:I
+
+.field private final stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+.field private final user:Lcom/discord/models/domain/ModelUser;
+
+.field private final videoStreamId:Ljava/lang/Integer;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;ZZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;ILcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)V
+    .locals 1
+
+    const-string v0, "user"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "stream"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "inputMode"
+
+    invoke-static {p7, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->user:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p2, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->nickname:Ljava/lang/String;
+
+    iput-object p3, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->videoStreamId:Ljava/lang/Integer;
+
+    iput-object p4, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    iput-boolean p5, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->showChrome:Z
+
+    iput-boolean p6, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->isMuted:Z
+
+    iput-object p7, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    iput p8, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->spectatorCount:I
+
+    iput-object p9, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->dialog:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;ZZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;ILcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+    .locals 10
+
+    move-object v0, p0
+
+    move/from16 v1, p10
+
+    and-int/lit8 v2, v1, 0x1
+
+    if-eqz v2, :cond_0
+
+    iget-object v2, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->user:Lcom/discord/models/domain/ModelUser;
+
+    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/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->nickname: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-object v4, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->videoStreamId:Ljava/lang/Integer;
+
+    goto :goto_2
+
+    :cond_2
+    move-object v4, p3
+
+    :goto_2
+    and-int/lit8 v5, v1, 0x8
+
+    if-eqz v5, :cond_3
+
+    iget-object v5, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    goto :goto_3
+
+    :cond_3
+    move-object v5, p4
+
+    :goto_3
+    and-int/lit8 v6, v1, 0x10
+
+    if-eqz v6, :cond_4
+
+    iget-boolean v6, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->showChrome:Z
+
+    goto :goto_4
+
+    :cond_4
+    move v6, p5
+
+    :goto_4
+    and-int/lit8 v7, v1, 0x20
+
+    if-eqz v7, :cond_5
+
+    iget-boolean v7, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->isMuted:Z
+
+    goto :goto_5
+
+    :cond_5
+    move/from16 v7, p6
+
+    :goto_5
+    and-int/lit8 v8, v1, 0x40
+
+    if-eqz v8, :cond_6
+
+    iget-object v8, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    goto :goto_6
+
+    :cond_6
+    move-object/from16 v8, p7
+
+    :goto_6
+    and-int/lit16 v9, v1, 0x80
+
+    if-eqz v9, :cond_7
+
+    iget v9, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->spectatorCount:I
+
+    goto :goto_7
+
+    :cond_7
+    move/from16 v9, p8
+
+    :goto_7
+    and-int/lit16 v1, v1, 0x100
+
+    if-eqz v1, :cond_8
+
+    iget-object v1, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->dialog:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    goto :goto_8
+
+    :cond_8
+    move-object/from16 v1, p9
+
+    :goto_8
+    move-object p1, v2
+
+    move-object p2, v3
+
+    move-object p3, v4
+
+    move-object p4, v5
+
+    move p5, v6
+
+    move/from16 p6, v7
+
+    move-object/from16 p7, v8
+
+    move/from16 p8, v9
+
+    move-object/from16 p9, v1
+
+    invoke-virtual/range {p0 .. p9}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->copy(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;ZZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;ILcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->nickname:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component3()Ljava/lang/Integer;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->videoStreamId:Ljava/lang/Integer;
+
+    return-object v0
+.end method
+
+.method public final component4()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    return-object v0
+.end method
+
+.method public final component5()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->showChrome:Z
+
+    return v0
+.end method
+
+.method public final component6()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->isMuted:Z
+
+    return v0
+.end method
+
+.method public final component7()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    return-object v0
+.end method
+
+.method public final component8()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->spectatorCount:I
+
+    return v0
+.end method
+
+.method public final component9()Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->dialog:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;ZZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;ILcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+    .locals 11
+
+    const-string v0, "user"
+
+    move-object v2, p1
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "stream"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "inputMode"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    move-object v1, v0
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move/from16 v6, p5
+
+    move/from16 v7, p6
+
+    move/from16 v9, p8
+
+    move-object/from16 v10, p9
+
+    invoke-direct/range {v1 .. v10}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;ZZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;ILcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_4
+
+    instance-of v1, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_3
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->user:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->nickname:Ljava/lang/String;
+
+    iget-object v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->nickname:Ljava/lang/String;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->videoStreamId:Ljava/lang/Integer;
+
+    iget-object v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->videoStreamId:Ljava/lang/Integer;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    iget-object v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    iget-boolean v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->showChrome:Z
+
+    iget-boolean v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->showChrome:Z
+
+    if-ne v1, v3, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_3
+
+    iget-boolean v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->isMuted:Z
+
+    iget-boolean v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->isMuted:Z
+
+    if-ne v1, v3, :cond_1
+
+    const/4 v1, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_1
+    if-eqz v1, :cond_3
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    iget-object v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    iget v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->spectatorCount:I
+
+    iget v3, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->spectatorCount:I
+
+    if-ne v1, v3, :cond_2
+
+    const/4 v1, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :goto_2
+    if-eqz v1, :cond_3
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->dialog:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    iget-object p1, p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->dialog:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    return v2
+
+    :cond_4
+    :goto_3
+    return v0
+.end method
+
+.method public final getDialog()Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->dialog:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    return-object v0
+.end method
+
+.method public final getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    return-object v0
+.end method
+
+.method public final getNickname()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->nickname:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getShowChrome()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->showChrome:Z
+
+    return v0
+.end method
+
+.method public final getSpectatorCount()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->spectatorCount:I
+
+    return v0
+.end method
+
+.method public final getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    return-object v0
+.end method
+
+.method public final getUser()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final getVideoStreamId()Ljava/lang/Integer;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->videoStreamId:Ljava/lang/Integer;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 4
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->user:Lcom/discord/models/domain/ModelUser;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->nickname: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/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->videoStreamId:Ljava/lang/Integer;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    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/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    if-eqz v2, :cond_3
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    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-boolean v2, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->showChrome:Z
+
+    const/4 v3, 0x1
+
+    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/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->isMuted:Z
+
+    if-eqz v2, :cond_5
+
+    const/4 v2, 0x1
+
+    :cond_5
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    if-eqz v2, :cond_6
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_4
+
+    :cond_6
+    const/4 v2, 0x0
+
+    :goto_4
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget v2, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->spectatorCount:I
+
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->dialog:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    if-eqz v2, :cond_7
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_7
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final isMuted()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->isMuted:Z
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "SpectatingActive(user="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", nickname="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->nickname:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", videoStreamId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->videoStreamId:Ljava/lang/Integer;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", stream="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", showChrome="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->showChrome:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", isMuted="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->isMuted:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", inputMode="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", spectatorCount="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->spectatorCount:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v1, ", dialog="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->dialog:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State$Uninitialized.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State$Uninitialized.smali
new file mode 100644
index 0000000000..26e02e682f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State$Uninitialized.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Uninitialized;
+.super Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+.source "WidgetSpectateViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Uninitialized"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Uninitialized;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Uninitialized;
+
+    invoke-direct {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Uninitialized;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Uninitialized;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Uninitialized;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State.smali
new file mode 100644
index 0000000000..7a15e44cec
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State.smali
@@ -0,0 +1,40 @@
+.class public abstract Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+.super Ljava/lang/Object;
+.source "WidgetSpectateViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "State"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Uninitialized;,
+        Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;,
+        Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;
+    }
+.end annotation
+
+
+# direct methods
+.method private 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/spectate/WidgetSpectateViewModel$State;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$beginHideChromeTimeout$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$beginHideChromeTimeout$1.smali
new file mode 100644
index 0000000000..f123f457e2
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$beginHideChromeTimeout$1.smali
@@ -0,0 +1,67 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$beginHideChromeTimeout$1;
+.super Ljava/lang/Object;
+.source "WidgetSpectateViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->beginHideChromeTimeout()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Long;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$beginHideChromeTimeout$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Long;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$beginHideChromeTimeout$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->handleHideChrome()V
+
+    return-void
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$beginHideChromeTimeout$1;->call(Ljava/lang/Long;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$1.smali
new file mode 100644
index 0000000000..98ecedf77e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$1.smali
@@ -0,0 +1,90 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$1;
+.super Ljava/lang/Object;
+.source "WidgetSpectateViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;->call(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/util/Map;)Lcom/discord/models/domain/ModelUser;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;)",
+            "Lcom/discord/models/domain/ModelUser;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;
+
+    iget-object v0, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-static {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->access$getUserId$p(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)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
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    return-object p1
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$1;->call(Ljava/util/Map;)Lcom/discord/models/domain/ModelUser;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$2.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$2.smali
new file mode 100644
index 0000000000..132e1a2841
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$2.smali
@@ -0,0 +1,90 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$2;
+.super Ljava/lang/Object;
+.source "WidgetSpectateViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;->call(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$2;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/util/Map;)Lcom/discord/models/domain/ModelGuildMember$Computed;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;)",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$2;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;
+
+    iget-object v0, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-static {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->access$getUserId$p(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)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
+
+    check-cast p1, Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    return-object p1
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$2;->call(Ljava/util/Map;)Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$3.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$3.smali
new file mode 100644
index 0000000000..e444511841
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$3.smali
@@ -0,0 +1,94 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$3;
+.super Ljava/lang/Object;
+.source "WidgetSpectateViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;->call(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$3;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/util/Map;)Ljava/lang/Integer;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
+            ">;)",
+            "Ljava/lang/Integer;"
+        }
+    .end annotation
+
+    const-string v0, "allVideoStreams"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$3;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;
+
+    iget-object v0, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-static {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->access$getUserId$p(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)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
+
+    check-cast p1, Ljava/lang/Integer;
+
+    return-object p1
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$3;->call(Ljava/util/Map;)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$4.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$4.smali
new file mode 100644
index 0000000000..da19c5ded6
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$4.smali
@@ -0,0 +1,116 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$4;
+.super Ljava/lang/Object;
+.source "WidgetSpectateViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Func6;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;->call(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    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;",
+        "T6:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func6<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$4;->$stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/lang/Integer;Ljava/lang/Boolean;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreApplicationStreaming$State;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;
+    .locals 9
+
+    new-instance v8, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;
+
+    iget-object v3, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$4;->$stream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    const-string v0, "isMuted"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v5
+
+    const-string p4, "inputMode"
+
+    invoke-static {p5, p4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, v8
+
+    move-object v1, p1
+
+    move-object v2, p2
+
+    move-object v4, p3
+
+    move-object v6, p5
+
+    move-object v7, p6
+
+    invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Ljava/lang/Integer;ZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreApplicationStreaming$State;)V
+
+    return-object v8
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    check-cast p2, Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    check-cast p3, Ljava/lang/Integer;
+
+    check-cast p4, Ljava/lang/Boolean;
+
+    check-cast p5, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    check-cast p6, Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    invoke-virtual/range {p0 .. p6}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$4;->call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/lang/Integer;Ljava/lang/Boolean;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreApplicationStreaming$State;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1.smali
new file mode 100644
index 0000000000..47949677b2
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1.smali
@@ -0,0 +1,229 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;
+.super Ljava/lang/Object;
+.source "WidgetSpectateViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->fetchData()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TR;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;->call(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)Lrx/Observable;
+    .locals 10
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;",
+            ")",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;",
+            ">;"
+        }
+    .end annotation
+
+    if-nez p1, :cond_0
+
+    new-instance p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    sget-object v6, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    const/4 v7, 0x0
+
+    move-object v0, p1
+
+    invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Ljava/lang/Integer;ZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreApplicationStreaming$State;)V
+
+    invoke-static {p1}, Lrx/Observable;->bI(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getGuildId()J
+
+    move-result-wide v0
+
+    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreUser;->getAll()Lrx/Observable;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$1;
+
+    invoke-direct {v3, p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$1;-><init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;)V
+
+    check-cast v3, Lrx/functions/b;
+
+    invoke-virtual {v2, v3}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lrx/Observable;->JO()Lrx/Observable;
+
+    move-result-object v3
+
+    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;
+
+    move-result-object v2
+
+    invoke-virtual {v2, v0, v1}, Lcom/discord/stores/StoreGuilds;->getComputed(J)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$2;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$2;-><init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
+
+    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;->getVideoStreams()Lcom/discord/stores/StoreVideoStreams;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreVideoStreams;->getVideoStreams()Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$3;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$3;-><init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
+
+    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;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->isSelfMuted()Lrx/Observable;
+
+    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;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->getInputMode()Lrx/Observable;
+
+    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;->getApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming;->getState()Lrx/Observable;
+
+    move-result-object v8
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$4;
+
+    invoke-direct {v0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$4;-><init>(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)V
+
+    move-object v9, v0
+
+    check-cast v9, Lrx/functions/Func6;
+
+    invoke-static/range {v3 .. v9}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func6;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$2.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$2.smali
new file mode 100644
index 0000000000..6dbc0d2b4f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$2.smali
@@ -0,0 +1,97 @@
+.class final synthetic Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$2;
+.super Lkotlin/jvm/internal/j;
+.source "WidgetSpectateViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->fetchData()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getName()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "handleRawData"
+
+    return-object v0
+.end method
+
+.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
+    .locals 1
+
+    const-class v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final getSignature()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "handleRawData(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;)V"
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$2;->invoke(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$2;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->access$handleRawData(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$3.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$3.smali
new file mode 100644
index 0000000000..578c8a1ff8
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$3.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$3;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSpectateViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->fetchData()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lrx/Subscription;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$3;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lrx/Subscription;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$3;->invoke(Lrx/Subscription;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lrx/Subscription;)V
+    .locals 1
+
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$3;->this$0:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->access$setDataSubscription$p(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;Lrx/Subscription;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel.smali
new file mode 100644
index 0000000000..89301d4e5b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel.smali
@@ -0,0 +1,1148 @@
+.class public final Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+.super Landroidx/lifecycle/ViewModel;
+.source "WidgetSpectateViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;,
+        Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;,
+        Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;,
+        Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;,
+        Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+    }
+.end annotation
+
+
+# instance fields
+.field private dataSubscription:Lrx/Subscription;
+
+.field private final eventSubject:Lrx/subjects/PublishSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/PublishSubject<",
+            "Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private hideChromeSubscription:Lrx/Subscription;
+
+.field private reportProblemSubscription:Lrx/Subscription;
+
+.field private state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+.field private final stateSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private userId:Ljava/lang/Long;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Landroidx/lifecycle/ViewModel;-><init>()V
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Uninitialized;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Uninitialized;
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->stateSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->beginHideChromeTimeout()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$getDataSubscription$p(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)Lrx/Subscription;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->dataSubscription:Lrx/Subscription;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getUserId$p(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)Ljava/lang/Long;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->userId:Ljava/lang/Long;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$handleRawData(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->handleRawData(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$setDataSubscription$p(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;Lrx/Subscription;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->dataSubscription:Lrx/Subscription;
+
+    return-void
+.end method
+
+.method public static final synthetic access$setUserId$p(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;Ljava/lang/Long;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->userId:Ljava/lang/Long;
+
+    return-void
+.end method
+
+.method private final beginHideChromeTimeout()V
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->hideChromeSubscription:Lrx/Subscription;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_0
+    const-wide/16 v0, 0x5
+
+    sget-object v2, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-static {v0, v1, v2}, Lrx/Observable;->g(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$beginHideChromeTimeout$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$beginHideChromeTimeout$1;-><init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+
+    check-cast v1, Lrx/functions/Action1;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->b(Lrx/functions/Action1;)Lrx/Subscription;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->hideChromeSubscription:Lrx/Subscription;
+
+    return-void
+.end method
+
+.method private final fetchData()V
+    .locals 11
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->dataSubscription:Lrx/Subscription;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    :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
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming;->getActiveStream()Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1;-><init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-static {}, Lrx/android/b/a;->Kc()Lrx/Scheduler;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Scheduler;)Lrx/Observable;
+
+    move-result-object v2
+
+    const-string v0, "StoreStream\n        .get\u2026dSchedulers.mainThread())"
+
+    invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class v3, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    const/4 v4, 0x0
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$2;
+
+    move-object v1, p0
+
+    check-cast v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$2;-><init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+
+    move-object v8, v0
+
+    check-cast v8, Lkotlin/jvm/functions/Function1;
+
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$3;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$3;-><init>(Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+
+    move-object v5, v0
+
+    check-cast v5, Lkotlin/jvm/functions/Function1;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/16 v9, 0x1a
+
+    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
+
+    return-void
+.end method
+
+.method private final handleRawData(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;)V
+    .locals 11
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_6
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_6
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->DENIED_FULL:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    if-ne v1, v2, :cond_0
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull;
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    :goto_0
+    move-object v10, v0
+
+    goto :goto_1
+
+    :cond_0
+    instance-of v1, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-eqz v1, :cond_1
+
+    move-object v2, v0
+
+    check-cast v2, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    invoke-virtual {v2}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    move-result-object v2
+
+    sget-object v3, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ACTIVE:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    if-ne v2, v3, :cond_1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    move-result-object v2
+
+    sget-object v3, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ENDED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    if-eq v2, v3, :cond_2
+
+    :cond_1
+    if-eqz v1, :cond_2
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getDialog()Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_2
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    goto :goto_0
+
+    :goto_1
+    sget-object v0, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->encodeStreamKey(Lcom/discord/models/domain/ModelApplicationStream;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getStreamState()Lcom/discord/stores/StoreApplicationStreaming$State;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_3
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$State;->getRtcStreams()Ljava/util/Map;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_3
+
+    invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$RtcStream;->getViewerIds()Ljava/util/List;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_3
+
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    move v9, v0
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v0, 0x0
+
+    const/4 v9, 0x0
+
+    :goto_2
+    new-instance v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v2
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getMember()Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_4
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getNick()Ljava/lang/String;
+
+    move-result-object v1
+
+    goto :goto_3
+
+    :cond_4
+    const/4 v1, 0x0
+
+    :goto_3
+    move-object v3, v1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getVideoStreamId()Ljava/lang/Integer;
+
+    move-result-object v4
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v5
+
+    const/4 v6, 0x1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->isMuted()Z
+
+    move-result v7
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    move-result-object v8
+
+    move-object v1, v0
+
+    invoke-direct/range {v1 .. v10}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;ZZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;ILcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;)V
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ACTIVE:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    if-ne p1, v0, :cond_5
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->beginHideChromeTimeout()V
+
+    :cond_5
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->publishState()V
+
+    :cond_6
+    return-void
+.end method
+
+.method private final publishState()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->stateSubject:Lrx/subjects/BehaviorSubject;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final handleHideChrome()V
+    .locals 13
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    instance-of v1, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v0, :cond_1
+
+    return-void
+
+    :cond_1
+    invoke-virtual {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ACTIVE:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    if-ne v0, v1, :cond_3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    if-eqz v0, :cond_2
+
+    move-object v1, v0
+
+    check-cast v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    const/4 v2, 0x0
+
+    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
+
+    const/4 v10, 0x0
+
+    const/16 v11, 0x1ef
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v1 .. v12}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->copy$default(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;ZZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;ILcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->publishState()V
+
+    goto :goto_0
+
+    :cond_2
+    new-instance v0, Lkotlin/r;
+
+    const-string v1, "null cannot be cast to non-null type com.discord.widgets.spectate.WidgetSpectateViewModel.State.SpectatingActive"
+
+    invoke-direct {v0, v1}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_3
+    :goto_0
+    return-void
+.end method
+
+.method public final observeEvents()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+
+    const-string v1, "eventSubject"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lrx/Observable;
+
+    return-object v0
+.end method
+
+.method public final observeViewState()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->stateSubject:Lrx/subjects/BehaviorSubject;
+
+    const-string v1, "stateSubject"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lrx/Observable;
+
+    return-object v0
+.end method
+
+.method public final onCleared()V
+    .locals 2
+
+    invoke-super {p0}, Landroidx/lifecycle/ViewModel;->onCleared()V
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    instance-of v1, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-eqz v0, :cond_1
+
+    sget-object v1, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    invoke-virtual {v1, v0}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->encodeStreamKey(Lcom/discord/models/domain/ModelApplicationStream;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lcom/discord/stores/StoreApplicationStreaming$Actions;->stopWatchingStream(Ljava/lang/String;)V
+
+    :cond_1
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->dataSubscription:Lrx/Subscription;
+
+    if-eqz v0, :cond_2
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_2
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->hideChromeSubscription:Lrx/Subscription;
+
+    if-eqz v0, :cond_3
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_3
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->reportProblemSubscription:Lrx/Subscription;
+
+    if-eqz v0, :cond_4
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_4
+    return-void
+.end method
+
+.method public final onDisconnectStreamPressed()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    instance-of v1, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v0, :cond_1
+
+    return-void
+
+    :cond_1
+    sget-object v1, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    invoke-virtual {v1, v0}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->encodeStreamKey(Lcom/discord/models/domain/ModelApplicationStream;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lcom/discord/stores/StoreApplicationStreaming$Actions;->stopWatchingStream(Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->publishState()V
+
+    return-void
+.end method
+
+.method public final onDisconnectVoicePressed()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    instance-of v0, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getVoiceChannelSelected()Lcom/discord/stores/StoreVoiceChannelSelected;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreVoiceChannelSelected;->clear()V
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->publishState()V
+
+    return-void
+.end method
+
+.method public final onMuteTogglePressed()V
+    .locals 1
+
+    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;->toggleSelfMuted()Z
+
+    return-void
+.end method
+
+.method public final onPushToTalkPressed(Z)V
+    .locals 1
+
+    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, p1}, Lcom/discord/stores/StoreMediaEngine;->setPttActive(Z)V
+
+    return-void
+.end method
+
+.method public final onReportProblemCanceled()V
+    .locals 13
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    instance-of v1, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    move-object v1, v0
+
+    check-cast v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v1, :cond_1
+
+    return-void
+
+    :cond_1
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getDialog()Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    move-result-object v0
+
+    instance-of v0, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;
+
+    if-nez v0, :cond_2
+
+    return-void
+
+    :cond_2
+    const/4 v2, 0x0
+
+    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
+
+    const/4 v10, 0x0
+
+    const/16 v11, 0xff
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v1 .. v12}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->copy$default(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;ZZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;ILcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->publishState()V
+
+    return-void
+.end method
+
+.method public final onReportProblemPressed()V
+    .locals 13
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    instance-of v1, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    move-object v1, v0
+
+    check-cast v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v1, :cond_1
+
+    return-void
+
+    :cond_1
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getDialog()Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_2
+
+    return-void
+
+    :cond_2
+    const/4 v2, 0x0
+
+    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
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;
+
+    move-object v10, v0
+
+    check-cast v10, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    const/16 v11, 0xff
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v1 .. v12}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->copy$default(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;ZZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;ILcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->publishState()V
+
+    return-void
+.end method
+
+.method public final onStreamFeedbackDismissed()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    instance-of v0, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->publishState()V
+
+    return-void
+.end method
+
+.method public final onStreamFullDismissed()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    instance-of v0, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->publishState()V
+
+    return-void
+.end method
+
+.method public final onUiInteractedWith()V
+    .locals 14
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    instance-of v1, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-eqz v1, :cond_1
+
+    if-eqz v0, :cond_0
+
+    move-object v2, v0
+
+    check-cast v2, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x1
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    const/16 v12, 0x1ef
+
+    const/4 v13, 0x0
+
+    invoke-static/range {v2 .. v13}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->copy$default(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;ZZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;ILcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Lkotlin/r;
+
+    const-string v1, "null cannot be cast to non-null type com.discord.widgets.spectate.WidgetSpectateViewModel.State.SpectatingActive"
+
+    invoke-direct {v0, v1}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_1
+    :goto_0
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->beginHideChromeTimeout()V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->publishState()V
+
+    return-void
+.end method
+
+.method public final reportProblem(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;Z)V
+    .locals 13
+
+    const-string v0, "problem"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    instance-of v1, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    move-object v1, v0
+
+    check-cast v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    if-nez v1, :cond_1
+
+    return-void
+
+    :cond_1
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getDialog()Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    move-result-object v0
+
+    instance-of v0, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem;
+
+    if-nez v0, :cond_2
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->getDialog()Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;
+
+    move-result-object v0
+
+    instance-of v0, v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback;
+
+    if-nez v0, :cond_2
+
+    return-void
+
+    :cond_2
+    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, p1}, Lcom/discord/stores/StoreAnalytics;->reportStreamProblem(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;)V
+
+    if-eqz p2, :cond_3
+
+    iget-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+
+    new-instance p2, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;
+
+    const v0, 0x7f1210f0
+
+    invoke-direct {p2, v0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast;-><init>(I)V
+
+    invoke-virtual {p1, p2}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
+
+    sget-object p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;->INSTANCE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish;
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    goto :goto_0
+
+    :cond_3
+    const/4 v2, 0x0
+
+    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
+
+    const/4 v10, 0x0
+
+    const/16 v11, 0xff
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v1 .. v12}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;->copy$default(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;ZZLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;ILcom/discord/widgets/spectate/WidgetSpectateViewModel$Dialog;ILjava/lang/Object;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    :goto_0
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->state:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$State;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->publishState()V
+
+    return-void
+.end method
+
+.method public final setUserId(J)V
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->userId:Ljava/lang/Long;
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    cmp-long v2, p1, v0
+
+    if-eqz v2, :cond_1
+
+    :goto_0
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->userId:Ljava/lang/Long;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->fetchData()V
+
+    :cond_1
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face.smali
new file mode 100644
index 0000000000..b58530ded9
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face.smali
@@ -0,0 +1,137 @@
+.class final enum Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+.super Ljava/lang/Enum;
+.source "WidgetStreamFeedbackDialog.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4018
+    name = "Face"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final synthetic $VALUES:[Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+.field public static final enum HAPPY:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+.field public static final enum NEUTRAL:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+.field public static final enum NONE:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+.field public static final enum SAD:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x4
+
+    new-array v0, v0, [Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    const/4 v2, 0x0
+
+    const-string v3, "NONE"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->NONE:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    const/4 v2, 0x1
+
+    const-string v3, "SAD"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->SAD:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    const/4 v2, 0x2
+
+    const-string v3, "NEUTRAL"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->NEUTRAL:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    const/4 v2, 0x3
+
+    const-string v3, "HAPPY"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->HAPPY:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->$VALUES:[Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    return-void
+.end method
+
+.method private 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/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+    .locals 1
+
+    const-class v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    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/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+    .locals 1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->$VALUES:[Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    invoke-virtual {v0}, [Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter$WhenMappings.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter$WhenMappings.smali
new file mode 100644
index 0000000000..c7bf9a1a25
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter$WhenMappings.smali
@@ -0,0 +1,106 @@
+.class public final synthetic Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter$WhenMappings;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field public static final synthetic $EnumSwitchMapping$0:[I
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 3
+
+    invoke-static {}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->values()[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->BLACK_SCREEN:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->BLURRY:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x2
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->LAGGING:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x3
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->OUT_OF_SYNC:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x4
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->AUDIO_MISSING:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x5
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->AUDIO_POOR:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x6
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->NONE:Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x7
+
+    aput v2, v0, v1
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter.smali
new file mode 100644
index 0000000000..82371289c2
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter.smali
@@ -0,0 +1,293 @@
+.class final Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;
+.super Landroid/widget/ArrayAdapter;
+.source "WidgetStreamFeedbackDialog.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = "SpinnerAdapter"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Landroid/widget/ArrayAdapter<",
+        "Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field private final values:[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+
+# direct methods
+.method public constructor <init>(Landroid/content/Context;[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "values"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f0d0068
+
+    invoke-direct {p0, p1, v0, p2}, Landroid/widget/ArrayAdapter;-><init>(Landroid/content/Context;I[Ljava/lang/Object;)V
+
+    iput-object p2, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->values:[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    return-void
+.end method
+
+.method private final getItemView(ILandroid/view/View;)Landroid/view/View;
+    .locals 2
+
+    if-nez p2, :cond_0
+
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->getContext()Landroid/content/Context;
+
+    move-result-object p2
+
+    const v0, 0x7f0d0068
+
+    const/4 v1, 0x0
+
+    invoke-static {p2, v0, v1}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    move-result-object p2
+
+    :cond_0
+    if-nez p2, :cond_1
+
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
+
+    :cond_1
+    const v0, 0x7f0a0746
+
+    invoke-virtual {p2, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/TextView;
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->values:[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    aget-object p1, v1, p1
+
+    const-string v1, "label"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->ordinal()I
+
+    move-result p1
+
+    aget p1, v1, p1
+
+    packed-switch p1, :pswitch_data_0
+
+    new-instance p1, Lkotlin/k;
+
+    invoke-direct {p1}, Lkotlin/k;-><init>()V
+
+    throw p1
+
+    :pswitch_0
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const v1, 0x7f1210e6
+
+    invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    goto :goto_0
+
+    :pswitch_1
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const v1, 0x7f1210de
+
+    invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    goto :goto_0
+
+    :pswitch_2
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const v1, 0x7f1210dd
+
+    invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    goto :goto_0
+
+    :pswitch_3
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const v1, 0x7f1210e2
+
+    invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    goto :goto_0
+
+    :pswitch_4
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const v1, 0x7f1210e1
+
+    invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    goto :goto_0
+
+    :pswitch_5
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const v1, 0x7f1210e0
+
+    invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    goto :goto_0
+
+    :pswitch_6
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const v1, 0x7f1210df
+
+    invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    :goto_0
+    invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    return-object p2
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x1
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+
+# virtual methods
+.method public final getCount()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->values:[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    array-length v0, v0
+
+    return v0
+.end method
+
+.method public final getDropDownView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
+    .locals 1
+
+    const-string v0, "parent"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->getItemView(ILandroid/view/View;)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final getItem(I)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->values:[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    aget-object p1, v0, p1
+
+    return-object p1
+.end method
+
+.method public final bridge synthetic getItem(I)Ljava/lang/Object;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->getItem(I)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final getItemId(I)J
+    .locals 2
+
+    int-to-long v0, p1
+
+    return-wide v0
+.end method
+
+.method public final getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
+    .locals 1
+
+    const-string v0, "parent"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->getItemView(ILandroid/view/View;)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$1.smali
new file mode 100644
index 0000000000..8ebed95f23
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$1.smali
@@ -0,0 +1,88 @@
+.class final Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$1;
+.super Ljava/lang/Object;
+.source "WidgetStreamFeedbackDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$1;->this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 2
+
+    iget-object p1, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$1;->this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    invoke-static {p1}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->access$getReasonSpinner$p(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)Landroid/widget/Spinner;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroid/widget/Spinner;->getAdapter()Landroid/widget/SpinnerAdapter;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    check-cast p1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$1;->this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    invoke-static {v0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->access$getReasonSpinner$p(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)Landroid/widget/Spinner;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Landroid/widget/Spinner;->getSelectedItemPosition()I
+
+    move-result v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;->getItem(I)Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$1;->this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    invoke-static {v0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->reportProblem(Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;Z)V
+
+    return-void
+
+    :cond_0
+    new-instance p1, Lkotlin/r;
+
+    const-string v0, "null cannot be cast to non-null type com.discord.widgets.spectate.WidgetStreamFeedbackDialog.SpinnerAdapter"
+
+    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$2.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$2.smali
new file mode 100644
index 0000000000..7f58ab3bbb
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$2.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$2;
+.super Ljava/lang/Object;
+.source "WidgetStreamFeedbackDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$2;->this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    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/spectate/WidgetStreamFeedbackDialog$onResume$2;->this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    invoke-static {p1}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->onStreamFeedbackDismissed()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$3.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$3.smali
new file mode 100644
index 0000000000..eaf308a791
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$3.smali
@@ -0,0 +1,47 @@
+.class final Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$3;
+.super Ljava/lang/Object;
+.source "WidgetStreamFeedbackDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$3;->this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    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/spectate/WidgetStreamFeedbackDialog$onResume$3;->this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->SAD:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->access$selectFace(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$4.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$4.smali
new file mode 100644
index 0000000000..f699e8d09f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$4.smali
@@ -0,0 +1,47 @@
+.class final Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$4;
+.super Ljava/lang/Object;
+.source "WidgetStreamFeedbackDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$4;->this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    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/spectate/WidgetStreamFeedbackDialog$onResume$4;->this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->NEUTRAL:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->access$selectFace(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$5.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$5.smali
new file mode 100644
index 0000000000..58d2cb8ae3
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$5.smali
@@ -0,0 +1,47 @@
+.class final Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$5;
+.super Ljava/lang/Object;
+.source "WidgetStreamFeedbackDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$5;->this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    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/spectate/WidgetStreamFeedbackDialog$onResume$5;->this$0:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->HAPPY:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->access$selectFace(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog.smali
new file mode 100644
index 0000000000..d66e37e230
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog.smali
@@ -0,0 +1,867 @@
+.class public final Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+.super Lcom/discord/app/AppDialog;
+.source "WidgetStreamFeedbackDialog.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;,
+        Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;
+    }
+.end annotation
+
+
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+
+# instance fields
+.field private final cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final happyFace$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final neutralFace$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final reasonHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final reasonSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final sadFace$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private selectedFace:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+.field private final submitBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 6
+
+    const-class v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;
+
+    const/4 v1, 0x7
+
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "submitBtn"
+
+    const-string v5, "getSubmitBtn()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "cancelBtn"
+
+    const-string v5, "getCancelBtn()Landroid/widget/Button;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x1
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "sadFace"
+
+    const-string v5, "getSadFace()Landroid/widget/ImageView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x2
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "neutralFace"
+
+    const-string v5, "getNeutralFace()Landroid/widget/ImageView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x3
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "happyFace"
+
+    const-string v5, "getHappyFace()Landroid/widget/ImageView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x4
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "reasonHeader"
+
+    const-string v5, "getReasonHeader()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x5
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    const-string v3, "reasonSpinner"
+
+    const-string v4, "getReasonSpinner()Landroid/widget/Spinner;"
+
+    invoke-direct {v2, v0, v3, v4}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x6
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
+
+    const v0, 0x7f0a0747
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->submitBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0740
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0745
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->sadFace$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0742
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->neutralFace$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0741
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->happyFace$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0743
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->reasonHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0744
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->reasonSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->NONE:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->selectedFace:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    return-void
+.end method
+
+.method public static final synthetic access$getReasonSpinner$p(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)Landroid/widget/Spinner;
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getReasonSpinner()Landroid/widget/Spinner;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+    .locals 1
+
+    iget-object p0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    if-nez p0, :cond_0
+
+    const-string v0, "viewModel"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static final synthetic access$selectFace(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->selectFace(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;Lcom/discord/widgets/spectate/WidgetSpectateViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    return-void
+.end method
+
+.method private final getCancelBtn()Landroid/widget/Button;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->$$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/Button;
+
+    return-object v0
+.end method
+
+.method private final getHappyFace()Landroid/widget/ImageView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->happyFace$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->$$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/widget/ImageView;
+
+    return-object v0
+.end method
+
+.method private final getNeutralFace()Landroid/widget/ImageView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->neutralFace$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->$$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/ImageView;
+
+    return-object v0
+.end method
+
+.method private final getReasonHeader()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->reasonHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->$$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, Landroid/widget/TextView;
+
+    return-object v0
+.end method
+
+.method private final getReasonSpinner()Landroid/widget/Spinner;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->reasonSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->$$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, Landroid/widget/Spinner;
+
+    return-object v0
+.end method
+
+.method private final getSadFace()Landroid/widget/ImageView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->sadFace$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->$$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 getSubmitBtn()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->submitBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->$$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 render()V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->renderFaces()V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->renderReasons()V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->renderSubmitButton()V
+
+    return-void
+.end method
+
+.method private final renderFaces()V
+    .locals 4
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->selectedFace:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->SAD:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    const v2, 0x3f99999a    # 1.2f
+
+    const/high16 v3, 0x3f800000    # 1.0f
+
+    if-ne v0, v1, :cond_0
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getSadFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    const v1, 0x7f080161
+
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getSadFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setScaleX(F)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getSadFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setScaleY(F)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getSadFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    const v1, 0x7f080162
+
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getSadFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3}, Landroid/widget/ImageView;->setScaleX(F)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getSadFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3}, Landroid/widget/ImageView;->setScaleY(F)V
+
+    :goto_0
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->selectedFace:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->NEUTRAL:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    if-ne v0, v1, :cond_1
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getNeutralFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    const v1, 0x7f08015f
+
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getNeutralFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setScaleX(F)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getNeutralFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setScaleY(F)V
+
+    goto :goto_1
+
+    :cond_1
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getNeutralFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    const v1, 0x7f080160
+
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getNeutralFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3}, Landroid/widget/ImageView;->setScaleX(F)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getNeutralFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3}, Landroid/widget/ImageView;->setScaleY(F)V
+
+    :goto_1
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->selectedFace:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->HAPPY:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    if-ne v0, v1, :cond_2
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getHappyFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    const v1, 0x7f08015d
+
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getHappyFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setScaleX(F)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getHappyFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setScaleY(F)V
+
+    return-void
+
+    :cond_2
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getHappyFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    const v1, 0x7f08015e
+
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getHappyFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3}, Landroid/widget/ImageView;->setScaleX(F)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getHappyFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3}, Landroid/widget/ImageView;->setScaleY(F)V
+
+    return-void
+.end method
+
+.method private final renderReasons()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->selectedFace:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->NONE:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    if-eq v0, v1, :cond_1
+
+    iget-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->selectedFace:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    sget-object v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->HAPPY:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    if-ne v0, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getReasonHeader()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getReasonSpinner()Landroid/widget/Spinner;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v1}, Landroid/widget/Spinner;->setVisibility(I)V
+
+    return-void
+
+    :cond_1
+    :goto_0
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getReasonHeader()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    const/16 v1, 0x8
+
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getReasonSpinner()Landroid/widget/Spinner;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v1}, Landroid/widget/Spinner;->setVisibility(I)V
+
+    return-void
+.end method
+
+.method private final renderSubmitButton()V
+    .locals 5
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getSubmitBtn()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->selectedFace:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    sget-object v2, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;->NONE:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    if-eq v1, v2, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setEnabled(Z)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getSubmitBtn()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getSubmitBtn()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroid/widget/TextView;->isEnabled()Z
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x2
+
+    const/4 v4, 0x0
+
+    invoke-static {v0, v1, v2, v3, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method private final selectFace(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->selectedFace:Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->render()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d01c9
+
+    return v0
+.end method
+
+.method public final onResume()V
+    .locals 4
+
+    invoke-super {p0}, Lcom/discord/app/AppDialog;->onResume()V
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->setCancelable(Z)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object v0
+
+    invoke-static {v0}, Landroidx/lifecycle/ViewModelProviders;->of(Landroidx/fragment/app/FragmentActivity;)Landroidx/lifecycle/ViewModelProvider;
+
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+
+    move-result-object v0
+
+    const-string v1, "ViewModelProviders.of(re\u2026ateViewModel::class.java)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    iput-object v0, p0, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->viewModel:Lcom/discord/widgets/spectate/WidgetSpectateViewModel;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getSubmitBtn()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$1;-><init>(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getCancelBtn()Landroid/widget/Button;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$2;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$2;-><init>(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getSadFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$3;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$3;-><init>(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getNeutralFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$4;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$4;-><init>(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getHappyFace()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$5;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$5;-><init>(Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getReasonSpinner()Landroid/widget/Spinner;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->requireContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    const-string v3, "requireContext()"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;->values()[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;
+
+    move-result-object v3
+
+    invoke-direct {v1, v2, v3}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter;-><init>(Landroid/content/Context;[Lcom/discord/widgets/spectate/WidgetSpectateViewModel$Problem;)V
+
+    check-cast v1, Landroid/widget/SpinnerAdapter;
+
+    invoke-virtual {v0, v1}, Landroid/widget/Spinner;->setAdapter(Landroid/widget/SpinnerAdapter;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->render()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1.smali
index 72736c87dc..a9ca444104 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1.smali
@@ -130,7 +130,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion.smali
index ce7544bb1f..8dfb3d59ad 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion.smali
@@ -219,7 +219,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -231,7 +231,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v2
 
@@ -297,7 +297,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model.smali
index c63f051a0a..d82b64a640 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model.smali
@@ -461,7 +461,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 4
 
     iget-boolean v0, p0, Lcom/discord/widgets/status/WidgetStatus$Model;->offline:Z
 
@@ -487,38 +487,40 @@
 
     iget v2, p0, Lcom/discord/widgets/status/WidgetStatus$Model;->visibility:I
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v2, p0, Lcom/discord/widgets/status/WidgetStatus$Model;->unreadMessageId:J
 
-    const/16 v4, 0x20
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v5, v2, v4
+    move-result v2
 
-    xor-long/2addr v2, v5
-
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v2, p0, Lcom/discord/widgets/status/WidgetStatus$Model;->unreadChannelId:J
 
-    ushr-long v4, v2, v4
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    xor-long/2addr v2, v4
+    move-result v2
 
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget v2, p0, Lcom/discord/widgets/status/WidgetStatus$Model;->unreadCount:I
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$onViewBoundOrOnResume$1.smali
index 7a04658853..2174055ee0 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/status/WidgetStatus$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/status/WidgetStatus$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
index c42cdca058..134b23cc07 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
@@ -205,7 +205,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0711
+    const v0, 0x7f0a0731
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -213,7 +213,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusConnectivity$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0715
+    const v0, 0x7f0a0735
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -221,7 +221,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusConnectivityText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0714
+    const v0, 0x7f0a0734
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -229,7 +229,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusConnectivitySpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0713
+    const v0, 0x7f0a0733
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -237,7 +237,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusConnectivityLimited$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0716
+    const v0, 0x7f0a0736
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -245,7 +245,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusUnreadMessages$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0718
+    const v0, 0x7f0a0738
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -253,7 +253,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusUnreadMessagesText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0717
+    const v0, 0x7f0a0737
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -480,7 +480,7 @@
 
     invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
 
-    const v0, 0x7f120429
+    const v0, 0x7f120432
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -505,7 +505,7 @@
 
     if-eqz p2, :cond_1
 
-    const p2, 0x7f120b97
+    const p2, 0x7f120bc9
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -698,7 +698,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f120b9f
+    const v2, 0x7f120bd1
 
     new-array p4, p4, [Ljava/lang/Object;
 
@@ -725,7 +725,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f100085
+    const v2, 0x7f100084
 
     new-array v3, v1, [Ljava/lang/Object;
 
@@ -739,11 +739,15 @@
 
     move-result-object p1
 
+    const-string p2, "resources.getQuantityStr\u2026ages_count, count, count)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p0}, Lcom/discord/widgets/status/WidgetStatus;->getResources()Landroid/content/res/Resources;
 
     move-result-object p2
 
-    const v2, 0x7f120b9d
+    const v2, 0x7f120bcf
 
     new-array p4, p4, [Ljava/lang/Object;
 
@@ -767,7 +771,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01b9
+    const v0, 0x7f0d01c8
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$configureUI$2$1.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$configureUI$2$1.smali
index 8e59f810f5..fb2bccf9f5 100644
--- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$configureUI$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$configureUI$2$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/tos/WidgetTosAccept$configureUI$2$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$configureUI$2.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$configureUI$2.smali
index 685e668c8d..91aedd44a5 100644
--- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$configureUI$2.smali
@@ -71,7 +71,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     iget-object v1, p0, Lcom/discord/widgets/tos/WidgetTosAccept$configureUI$2;->this$0:Lcom/discord/widgets/tos/WidgetTosAccept;
 
diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.smali
index de96eaa2e9..ad91bc5b5f 100644
--- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.smali
@@ -70,7 +70,7 @@
 
     move-result p1
 
-    const p2, 0x7f0a0465
+    const p2, 0x7f0a0476
 
     if-eq p1, p2, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$onViewBoundOrOnResume$1.smali
index a881ff132f..43d0c946ec 100644
--- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept$onViewBoundOrOnResume$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/tos/WidgetTosAccept$onViewBoundOrOnResume$1;->invoke(Lcom/discord/models/domain/ModelUser$RequiredAction;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali
index 63625170f7..5d633b6e25 100644
--- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali
+++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali
@@ -218,7 +218,7 @@
 
     if-eqz v0, :cond_1
 
-    const v2, 0x7f12111b
+    const v2, 0x7f12115d
 
     invoke-direct {p0, v0, v2}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence;
 
@@ -242,7 +242,7 @@
 
     if-eqz v0, :cond_2
 
-    const v1, 0x7f120e69
+    const v1, 0x7f120e9f
 
     invoke-direct {p0, v0, v1}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence;
 
@@ -409,7 +409,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01bc
+    const v0, 0x7f0d01cc
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$1JbdN-tTlPBAZVuz3yNLg1RlM2s.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$1JbdN-tTlPBAZVuz3yNLg1RlM2s.smali
deleted file mode 100644
index b87209542d..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$1JbdN-tTlPBAZVuz3yNLg1RlM2s.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$1JbdN-tTlPBAZVuz3yNLg1RlM2s;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserProfileInfo;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserProfileInfo;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$1JbdN-tTlPBAZVuz3yNLg1RlM2s;->f$0:Lcom/discord/widgets/user/WidgetUserProfileInfo;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$1JbdN-tTlPBAZVuz3yNLg1RlM2s;->f$0:Lcom/discord/widgets/user/WidgetUserProfileInfo;
-
-    check-cast p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
-
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo;->configureUI(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$GGHkkpA44h-rGxuFMr2sE_vkDlY.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$GGHkkpA44h-rGxuFMr2sE_vkDlY.smali
deleted file mode 100644
index 09253d0901..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$GGHkkpA44h-rGxuFMr2sE_vkDlY.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$GGHkkpA44h-rGxuFMr2sE_vkDlY;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/-$$Lambda$GGHkkpA44h-rGxuFMr2sE_vkDlY;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$GGHkkpA44h-rGxuFMr2sE_vkDlY;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/-$$Lambda$GGHkkpA44h-rGxuFMr2sE_vkDlY;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/-$$Lambda$GGHkkpA44h-rGxuFMr2sE_vkDlY;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$GGHkkpA44h-rGxuFMr2sE_vkDlY;
-
-    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 invoke()Ljava/lang/Object;
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserProfileInfo;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/WidgetUserProfileInfo;-><init>()V
-
-    check-cast v0, Landroidx/fragment/app/Fragment;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$4aubuu0PlHcm5xY7zim34ZCS9Rc.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$4aubuu0PlHcm5xY7zim34ZCS9Rc.smali
deleted file mode 100644
index 4a17ab0390..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$4aubuu0PlHcm5xY7zim34ZCS9Rc.smali
+++ /dev/null
@@ -1,44 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$4aubuu0PlHcm5xY7zim34ZCS9Rc;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action2;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-.field private final synthetic f$1:Lcom/discord/widgets/user/WidgetUserProfile$Model;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserProfile;Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$4aubuu0PlHcm5xY7zim34ZCS9Rc;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$4aubuu0PlHcm5xY7zim34ZCS9Rc;->f$1:Lcom/discord/widgets/user/WidgetUserProfile$Model;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;Ljava/lang/Object;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$4aubuu0PlHcm5xY7zim34ZCS9Rc;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$4aubuu0PlHcm5xY7zim34ZCS9Rc;->f$1:Lcom/discord/widgets/user/WidgetUserProfile$Model;
-
-    check-cast p1, Landroid/view/MenuItem;
-
-    check-cast p2, Landroid/content/Context;
-
-    invoke-virtual {v0, v1, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfile;->lambda$configureUI$1$WidgetUserProfile(Lcom/discord/widgets/user/WidgetUserProfile$Model;Landroid/view/MenuItem;Landroid/content/Context;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$BU06_c_Ypaul1l4jmK2Y2q9pD3Q.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$BU06_c_Ypaul1l4jmK2Y2q9pD3Q.smali
deleted file mode 100644
index 61c374360a..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$BU06_c_Ypaul1l4jmK2Y2q9pD3Q.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$BU06_c_Ypaul1l4jmK2Y2q9pD3Q;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-.field private final synthetic f$1:I
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserProfile;I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$BU06_c_Ypaul1l4jmK2Y2q9pD3Q;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    iput p2, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$BU06_c_Ypaul1l4jmK2Y2q9pD3Q;->f$1:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$BU06_c_Ypaul1l4jmK2Y2q9pD3Q;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    iget v1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$BU06_c_Ypaul1l4jmK2Y2q9pD3Q;->f$1:I
-
-    check-cast p1, Ljava/lang/Void;
-
-    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->lambda$addRelationship$5$WidgetUserProfile(ILjava/lang/Void;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$DN_wURtqFY8f-rfZC_Nq5hiiz9c.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$DN_wURtqFY8f-rfZC_Nq5hiiz9c.smali
deleted file mode 100644
index d5d2cd2659..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$DN_wURtqFY8f-rfZC_Nq5hiiz9c.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$DN_wURtqFY8f-rfZC_Nq5hiiz9c;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserProfile;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$DN_wURtqFY8f-rfZC_Nq5hiiz9c;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$DN_wURtqFY8f-rfZC_Nq5hiiz9c;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->lambda$configureActionButtons$9$WidgetUserProfile(Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$HXRkbvqAAkLwoWX3pFGP7GV-hZ8.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$HXRkbvqAAkLwoWX3pFGP7GV-hZ8.smali
deleted file mode 100644
index deb1cf0666..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$HXRkbvqAAkLwoWX3pFGP7GV-hZ8.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$HXRkbvqAAkLwoWX3pFGP7GV-hZ8;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# instance fields
-.field private final synthetic f$0:Landroidx/appcompat/app/AlertDialog;
-
-
-# direct methods
-.method public synthetic constructor <init>(Landroidx/appcompat/app/AlertDialog;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$HXRkbvqAAkLwoWX3pFGP7GV-hZ8;->f$0:Landroidx/appcompat/app/AlertDialog;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$HXRkbvqAAkLwoWX3pFGP7GV-hZ8;->f$0:Landroidx/appcompat/app/AlertDialog;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->lambda$showFriendRequestDeleteConfirmationDialog$11(Landroidx/appcompat/app/AlertDialog;Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$HrPwiAQVtsYNapd4r9mE-IoY5pA.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$HrPwiAQVtsYNapd4r9mE-IoY5pA.smali
deleted file mode 100644
index febc166787..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$HrPwiAQVtsYNapd4r9mE-IoY5pA.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$HrPwiAQVtsYNapd4r9mE-IoY5pA;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-.field private final synthetic f$1:I
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserProfile;I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$HrPwiAQVtsYNapd4r9mE-IoY5pA;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    iput p2, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$HrPwiAQVtsYNapd4r9mE-IoY5pA;->f$1:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$HrPwiAQVtsYNapd4r9mE-IoY5pA;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    iget v1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$HrPwiAQVtsYNapd4r9mE-IoY5pA;->f$1:I
-
-    check-cast p1, Ljava/lang/Void;
-
-    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->lambda$removeRelationship$4$WidgetUserProfile(ILjava/lang/Void;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$IH8kwxdpxinJ58ico-LEdybaKv0.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$IH8kwxdpxinJ58ico-LEdybaKv0.smali
deleted file mode 100644
index 642778bdcf..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$IH8kwxdpxinJ58ico-LEdybaKv0.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$IH8kwxdpxinJ58ico-LEdybaKv0;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-.field private final synthetic f$1:Lcom/discord/widgets/user/WidgetUserProfile$Model;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserProfile;Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$IH8kwxdpxinJ58ico-LEdybaKv0;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$IH8kwxdpxinJ58ico-LEdybaKv0;->f$1:Lcom/discord/widgets/user/WidgetUserProfile$Model;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$IH8kwxdpxinJ58ico-LEdybaKv0;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$IH8kwxdpxinJ58ico-LEdybaKv0;->f$1:Lcom/discord/widgets/user/WidgetUserProfile$Model;
-
-    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->lambda$configureActionButtons$7$WidgetUserProfile(Lcom/discord/widgets/user/WidgetUserProfile$Model;Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$Model$VjK8Z7ynTLrPUKIvgSas0GLs8hA.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$Model$VjK8Z7ynTLrPUKIvgSas0GLs8hA.smali
deleted file mode 100644
index 53116c48c8..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$Model$VjK8Z7ynTLrPUKIvgSas0GLs8hA.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$Model$VjK8Z7ynTLrPUKIvgSas0GLs8hA;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$Model$VjK8Z7ynTLrPUKIvgSas0GLs8hA;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$Model$VjK8Z7ynTLrPUKIvgSas0GLs8hA;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$Model$VjK8Z7ynTLrPUKIvgSas0GLs8hA;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$Model$VjK8Z7ynTLrPUKIvgSas0GLs8hA;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$Model$VjK8Z7ynTLrPUKIvgSas0GLs8hA;
-
-    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 invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/user/WidgetUserProfile$Model;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfile$Model;->lambda$get$0(Lcom/discord/widgets/user/WidgetUserProfile$Model;)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$XVSv-upShbk6Qfx9qmjCxZ9TRhc.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$XVSv-upShbk6Qfx9qmjCxZ9TRhc.smali
deleted file mode 100644
index fb5eedc95a..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$XVSv-upShbk6Qfx9qmjCxZ9TRhc.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$XVSv-upShbk6Qfx9qmjCxZ9TRhc;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserProfile;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$XVSv-upShbk6Qfx9qmjCxZ9TRhc;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$XVSv-upShbk6Qfx9qmjCxZ9TRhc;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    check-cast p1, Lcom/discord/widgets/user/WidgetUserProfile$Model;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->lambda$XVSv-upShbk6Qfx9qmjCxZ9TRhc(Lcom/discord/widgets/user/WidgetUserProfile;Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$fjan-QAmdQ6BqxJW1eWAx3oLMZM.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$fjan-QAmdQ6BqxJW1eWAx3oLMZM.smali
deleted file mode 100644
index 2b50db532b..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$fjan-QAmdQ6BqxJW1eWAx3oLMZM.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$fjan-QAmdQ6BqxJW1eWAx3oLMZM;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserProfile;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$fjan-QAmdQ6BqxJW1eWAx3oLMZM;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$fjan-QAmdQ6BqxJW1eWAx3oLMZM;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    check-cast p1, Landroid/view/Menu;
-
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->lambda$configureUI$2$WidgetUserProfile(Landroid/view/Menu;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$oihzzpGBelVgH6JTZ948MiGwWE8.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$oihzzpGBelVgH6JTZ948MiGwWE8.smali
deleted file mode 100644
index bf25c2df78..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$oihzzpGBelVgH6JTZ948MiGwWE8.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$oihzzpGBelVgH6JTZ948MiGwWE8;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserProfile;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$oihzzpGBelVgH6JTZ948MiGwWE8;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$oihzzpGBelVgH6JTZ948MiGwWE8;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->lambda$configureActionButtons$6$WidgetUserProfile(Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$pTcsxMHJ6vNo1TnxG_0yZkgkG8g.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$pTcsxMHJ6vNo1TnxG_0yZkgkG8g.smali
deleted file mode 100644
index 6f1b7034bb..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$pTcsxMHJ6vNo1TnxG_0yZkgkG8g.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pTcsxMHJ6vNo1TnxG_0yZkgkG8g;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-.field private final synthetic f$1:Landroidx/appcompat/app/AlertDialog;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserProfile;Landroidx/appcompat/app/AlertDialog;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pTcsxMHJ6vNo1TnxG_0yZkgkG8g;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pTcsxMHJ6vNo1TnxG_0yZkgkG8g;->f$1:Landroidx/appcompat/app/AlertDialog;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pTcsxMHJ6vNo1TnxG_0yZkgkG8g;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pTcsxMHJ6vNo1TnxG_0yZkgkG8g;->f$1:Landroidx/appcompat/app/AlertDialog;
-
-    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->lambda$showFriendRequestDeleteConfirmationDialog$10$WidgetUserProfile(Landroidx/appcompat/app/AlertDialog;Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$pbSylbhAbdhsXobagQlJftqkIbs.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$pbSylbhAbdhsXobagQlJftqkIbs.smali
deleted file mode 100644
index 759fdbf901..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$pbSylbhAbdhsXobagQlJftqkIbs.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pbSylbhAbdhsXobagQlJftqkIbs;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-.field private final synthetic f$1:Lcom/discord/widgets/user/WidgetUserProfile$Model;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserProfile;Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pbSylbhAbdhsXobagQlJftqkIbs;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pbSylbhAbdhsXobagQlJftqkIbs;->f$1:Lcom/discord/widgets/user/WidgetUserProfile$Model;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pbSylbhAbdhsXobagQlJftqkIbs;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pbSylbhAbdhsXobagQlJftqkIbs;->f$1:Lcom/discord/widgets/user/WidgetUserProfile$Model;
-
-    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->lambda$configureUI$3$WidgetUserProfile(Lcom/discord/widgets/user/WidgetUserProfile$Model;Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$q79NbGnrUXia_rHK0TUt2jMuoV4.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$q79NbGnrUXia_rHK0TUt2jMuoV4.smali
deleted file mode 100644
index e46adb0e4e..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$q79NbGnrUXia_rHK0TUt2jMuoV4.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$q79NbGnrUXia_rHK0TUt2jMuoV4;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action2;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$q79NbGnrUXia_rHK0TUt2jMuoV4;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$q79NbGnrUXia_rHK0TUt2jMuoV4;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$q79NbGnrUXia_rHK0TUt2jMuoV4;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$q79NbGnrUXia_rHK0TUt2jMuoV4;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$q79NbGnrUXia_rHK0TUt2jMuoV4;
-
-    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;Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Landroid/view/MenuItem;
-
-    check-cast p2, Landroid/content/Context;
-
-    invoke-static {p1, p2}, Lcom/discord/widgets/user/WidgetUserProfile;->lambda$onViewBound$0(Landroid/view/MenuItem;Landroid/content/Context;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$uz8uCgVxIIyyq9oR-t-Jg8rBqKw.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$uz8uCgVxIIyyq9oR-t-Jg8rBqKw.smali
deleted file mode 100644
index 4d6580189c..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfile$uz8uCgVxIIyyq9oR-t-Jg8rBqKw.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$uz8uCgVxIIyyq9oR-t-Jg8rBqKw;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserProfile;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$uz8uCgVxIIyyq9oR-t-Jg8rBqKw;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$uz8uCgVxIIyyq9oR-t-Jg8rBqKw;->f$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->lambda$configureActionButtons$8$WidgetUserProfile(Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$9I5TnBbtHG9Wv_eN2MD9u1bTUOU.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$9I5TnBbtHG9Wv_eN2MD9u1bTUOU.smali
deleted file mode 100644
index e5a71b45ba..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$9I5TnBbtHG9Wv_eN2MD9u1bTUOU.smali
+++ /dev/null
@@ -1,48 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$9I5TnBbtHG9Wv_eN2MD9u1bTUOU;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action3;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$9I5TnBbtHG9Wv_eN2MD9u1bTUOU;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$9I5TnBbtHG9Wv_eN2MD9u1bTUOU;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$9I5TnBbtHG9Wv_eN2MD9u1bTUOU;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$9I5TnBbtHG9Wv_eN2MD9u1bTUOU;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$9I5TnBbtHG9Wv_eN2MD9u1bTUOU;
-
-    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;Ljava/lang/Object;Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Landroid/view/View;
-
-    check-cast p2, Ljava/lang/Integer;
-
-    check-cast p3, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;
-
-    invoke-static {p1, p2, p3}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;->lambda$new$0(Landroid/view/View;Ljava/lang/Integer;Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$BD0II2tj5H0VwHOAoiOUycejMPA.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$BD0II2tj5H0VwHOAoiOUycejMPA.smali
deleted file mode 100644
index 10096a0a93..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$BD0II2tj5H0VwHOAoiOUycejMPA.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$BD0II2tj5H0VwHOAoiOUycejMPA;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnFocusChangeListener;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserProfileInfo;
-
-.field private final synthetic f$1:Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserProfileInfo;Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$BD0II2tj5H0VwHOAoiOUycejMPA;->f$0:Lcom/discord/widgets/user/WidgetUserProfileInfo;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$BD0II2tj5H0VwHOAoiOUycejMPA;->f$1:Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onFocusChange(Landroid/view/View;Z)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$BD0II2tj5H0VwHOAoiOUycejMPA;->f$0:Lcom/discord/widgets/user/WidgetUserProfileInfo;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$BD0II2tj5H0VwHOAoiOUycejMPA;->f$1:Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
-
-    invoke-virtual {v0, v1, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfileInfo;->lambda$configureUI$0$WidgetUserProfileInfo(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;Landroid/view/View;Z)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.smali b/com.discord/smali/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.smali
new file mode 100644
index 0000000000..57dda920a2
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.smali
@@ -0,0 +1,134 @@
+.class final Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;
+.super Lkotlin/jvm/internal/l;
+.source "Badge.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/Badge$Companion;->onBadgeClick(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;)Lkotlin/jvm/functions/Function1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/user/Badge;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $context:Landroid/content/Context;
+
+.field final synthetic $fragmentManager:Landroidx/fragment/app/FragmentManager;
+
+
+# direct methods
+.method constructor <init>(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->$fragmentManager:Landroidx/fragment/app/FragmentManager;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->$context:Landroid/content/Context;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/user/Badge;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->invoke(Lcom/discord/widgets/user/Badge;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/user/Badge;)V
+    .locals 9
+
+    const-string v0, "badge"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/Badge;->getShowPremiumUpSell()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    sget-object v0, Lcom/discord/dialogs/c;->wG:Lcom/discord/dialogs/c$a;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->$fragmentManager:Landroidx/fragment/app/FragmentManager;
+
+    const/4 v2, 0x5
+
+    iget-object v0, p0, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->$context:Landroid/content/Context;
+
+    const v3, 0x7f120e8a
+
+    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/Badge;->getObjectType()Ljava/lang/String;
+
+    move-result-object v7
+
+    const/16 v8, 0x18
+
+    const-string v5, "Profile Modal"
+
+    const-string v6, "Badge"
+
+    invoke-static/range {v1 .. v8}, Lcom/discord/dialogs/c$a;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+
+    :cond_0
+    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 v1
+
+    if-eqz v1, :cond_1
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p1}, Lcom/discord/widgets/user/Badge;->getText()Ljava/lang/String;
+
+    move-result-object p1
+
+    move-object v1, p1
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    :goto_0
+    invoke-static {v0, v1}, Lcom/discord/app/h;->a(Landroid/content/Context;Ljava/lang/CharSequence;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali b/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali
new file mode 100644
index 0000000000..a41c5cb4c9
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali
@@ -0,0 +1,734 @@
+.class public final Lcom/discord/widgets/user/Badge$Companion;
+.super Ljava/lang/Object;
+.source "Badge.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/Badge;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/user/Badge$Companion;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getBadgesForUser(Lcom/discord/models/domain/ModelUserProfile;IZLandroid/content/Context;)Ljava/util/List;
+    .locals 18
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelUserProfile;",
+            "IZ",
+            "Landroid/content/Context;",
+            ")",
+            "Ljava/util/List<",
+            "Lcom/discord/widgets/user/Badge;",
+            ">;"
+        }
+    .end annotation
+
+    move-object/from16 v0, p1
+
+    move/from16 v1, p2
+
+    move-object/from16 v2, p4
+
+    const-string v3, "profile"
+
+    invoke-static {v0, v3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "context"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v3, Ljava/util/ArrayList;
+
+    const/16 v4, 0x8
+
+    invoke-direct {v3, v4}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v4
+
+    const-string v5, "profile.user"
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_0
+
+    new-instance v4, Lcom/discord/widgets/user/Badge;
+
+    const v7, 0x7f080351
+
+    const v6, 0x7f06002d
+
+    invoke-static {v2, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+
+    move-result v8
+
+    const v6, 0x7f1210a1
+
+    invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v9
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    const/4 v12, 0x0
+
+    const/16 v13, 0x38
+
+    const/4 v14, 0x0
+
+    move-object v6, v4
+
+    invoke-direct/range {v6 .. v14}, Lcom/discord/widgets/user/Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v3, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_0
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v4
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isPartner()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_1
+
+    new-instance v4, Lcom/discord/widgets/user/Badge;
+
+    const v7, 0x7f08034b
+
+    const v6, 0x7f06008d
+
+    invoke-static {v2, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+
+    move-result v8
+
+    const v6, 0x7f120d07
+
+    invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v9
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    const/4 v12, 0x0
+
+    const/16 v13, 0x38
+
+    const/4 v14, 0x0
+
+    move-object v6, v4
+
+    invoke-direct/range {v6 .. v14}, Lcom/discord/widgets/user/Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v3, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_1
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v4
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isHypeSquad()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_2
+
+    new-instance v4, Lcom/discord/widgets/user/Badge;
+
+    const v7, 0x7f080349
+
+    const v6, 0x7f060128
+
+    invoke-static {v2, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+
+    move-result v8
+
+    const v6, 0x7f12090e
+
+    invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v9
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    const/4 v12, 0x0
+
+    const/16 v13, 0x38
+
+    const/4 v14, 0x0
+
+    move-object v6, v4
+
+    invoke-direct/range {v6 .. v14}, Lcom/discord/widgets/user/Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v3, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_2
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v4
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isHypesquadHouse1()Z
+
+    move-result v4
+
+    const v6, 0x7f12091f
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x1
+
+    if-eqz v4, :cond_5
+
+    if-ne v1, v8, :cond_3
+
+    const/4 v4, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    const/4 v4, 0x0
+
+    :goto_0
+    new-instance v15, Lcom/discord/widgets/user/Badge;
+
+    if-eqz v4, :cond_4
+
+    const v4, 0x7f0802c7
+
+    const v10, 0x7f0802c7
+
+    goto :goto_1
+
+    :cond_4
+    const v4, 0x7f0802c6
+
+    const v10, 0x7f0802c6
+
+    :goto_1
+    const v4, 0x7f060085
+
+    invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+
+    move-result v11
+
+    const v4, 0x7f120916
+
+    invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v12
+
+    new-array v9, v8, [Ljava/lang/Object;
+
+    invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    aput-object v4, v9, v7
+
+    invoke-virtual {v2, v6, v9}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v13
+
+    const/4 v14, 0x0
+
+    const/4 v4, 0x0
+
+    const/16 v16, 0x30
+
+    const/16 v17, 0x0
+
+    move-object v9, v15
+
+    move-object v6, v15
+
+    move-object v15, v4
+
+    invoke-direct/range {v9 .. v17}, Lcom/discord/widgets/user/Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v3, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_5
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v4
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isHypesquadHouse2()Z
+
+    move-result v4
+
+    const/4 v6, 0x2
+
+    if-eqz v4, :cond_8
+
+    if-ne v1, v6, :cond_6
+
+    const/4 v4, 0x1
+
+    goto :goto_2
+
+    :cond_6
+    const/4 v4, 0x0
+
+    :goto_2
+    new-instance v15, Lcom/discord/widgets/user/Badge;
+
+    if-eqz v4, :cond_7
+
+    const v4, 0x7f0802c9
+
+    const v10, 0x7f0802c9
+
+    goto :goto_3
+
+    :cond_7
+    const v4, 0x7f0802c8
+
+    const v10, 0x7f0802c8
+
+    :goto_3
+    const v4, 0x7f060086
+
+    invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+
+    move-result v11
+
+    const v4, 0x7f120917
+
+    invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v12
+
+    new-array v9, v8, [Ljava/lang/Object;
+
+    invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    aput-object v4, v9, v7
+
+    const v4, 0x7f12091f
+
+    invoke-virtual {v2, v4, v9}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v13
+
+    const/4 v14, 0x0
+
+    const/4 v4, 0x0
+
+    const/16 v16, 0x30
+
+    const/16 v17, 0x0
+
+    move-object v9, v15
+
+    move-object v6, v15
+
+    move-object v15, v4
+
+    invoke-direct/range {v9 .. v17}, Lcom/discord/widgets/user/Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v3, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_8
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v4
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isHypesquadHouse3()Z
+
+    move-result v4
+
+    const/4 v6, 0x3
+
+    if-eqz v4, :cond_b
+
+    if-ne v1, v6, :cond_9
+
+    const/4 v1, 0x1
+
+    goto :goto_4
+
+    :cond_9
+    const/4 v1, 0x0
+
+    :goto_4
+    new-instance v4, Lcom/discord/widgets/user/Badge;
+
+    if-eqz v1, :cond_a
+
+    const v1, 0x7f0802cb
+
+    const v10, 0x7f0802cb
+
+    goto :goto_5
+
+    :cond_a
+    const v1, 0x7f0802ca
+
+    const v10, 0x7f0802ca
+
+    :goto_5
+    const v1, 0x7f060087
+
+    invoke-static {v2, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+
+    move-result v11
+
+    const v1, 0x7f120918
+
+    invoke-virtual {v2, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v12
+
+    new-array v9, v8, [Ljava/lang/Object;
+
+    invoke-virtual {v2, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    aput-object v1, v9, v7
+
+    const v1, 0x7f12091f
+
+    invoke-virtual {v2, v1, v9}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v13
+
+    const/4 v14, 0x0
+
+    const/4 v15, 0x0
+
+    const/16 v16, 0x30
+
+    const/16 v17, 0x0
+
+    move-object v9, v4
+
+    invoke-direct/range {v9 .. v17}, Lcom/discord/widgets/user/Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v3, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_b
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v1
+
+    invoke-static {v1, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isBugHunter()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_c
+
+    new-instance v1, Lcom/discord/widgets/user/Badge;
+
+    const v10, 0x7f080348
+
+    const v4, 0x7f060107
+
+    invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+
+    move-result v11
+
+    const v4, 0x7f120348
+
+    invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v12
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/4 v15, 0x0
+
+    const/16 v16, 0x38
+
+    const/16 v17, 0x0
+
+    move-object v9, v1
+
+    invoke-direct/range {v9 .. v17}, Lcom/discord/widgets/user/Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_c
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v1
+
+    invoke-static {v1, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isPremiumEarlySupporter()Z
+
+    move-result v1
+
+    const v4, 0x7f04029e
+
+    if-eqz v1, :cond_d
+
+    new-instance v1, Lcom/discord/widgets/user/Badge;
+
+    const v10, 0x7f08034c
+
+    invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+
+    move-result v11
+
+    const v5, 0x7f12054b
+
+    invoke-virtual {v2, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v12
+
+    const/4 v13, 0x0
+
+    xor-int/lit8 v14, p3, 0x1
+
+    const/16 v16, 0x8
+
+    const/16 v17, 0x0
+
+    const-string v15, "PREMIUM_EARLY_SUPPORTER"
+
+    move-object v9, v1
+
+    invoke-direct/range {v9 .. v17}, Lcom/discord/widgets/user/Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_d
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->isPremium()Z
+
+    move-result v1
+
+    const v5, 0x7f120e6b
+
+    if-eqz v1, :cond_e
+
+    new-instance v1, Lcom/discord/widgets/user/Badge;
+
+    const v10, 0x7f08034a
+
+    invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+
+    move-result v11
+
+    invoke-virtual {v2, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v12
+
+    const v9, 0x7f120d9b
+
+    new-array v13, v8, [Ljava/lang/Object;
+
+    invoke-virtual {v0, v2}, Lcom/discord/models/domain/ModelUserProfile;->getPremiumSince(Landroid/content/Context;)Ljava/lang/String;
+
+    move-result-object v14
+
+    aput-object v14, v13, v7
+
+    invoke-virtual {v2, v9, v13}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v13
+
+    xor-int/lit8 v14, p3, 0x1
+
+    const-string v15, "PREMIUM"
+
+    move-object v9, v1
+
+    invoke-direct/range {v9 .. v15}, Lcom/discord/widgets/user/Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
+
+    invoke-virtual {v3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_e
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->isPremiumGuildSubscriber()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_12
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getPremiumGuildMonthsSubscribed()Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v9
+
+    invoke-static {v9, v8}, Lkotlin/jvm/internal/k;->compare(II)I
+
+    move-result v9
+
+    if-gez v9, :cond_f
+
+    const v1, 0x7f08034d
+
+    const v10, 0x7f08034d
+
+    goto :goto_6
+
+    :cond_f
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v9
+
+    const/4 v10, 0x2
+
+    invoke-static {v9, v10}, Lkotlin/jvm/internal/k;->compare(II)I
+
+    move-result v9
+
+    if-gez v9, :cond_10
+
+    const v1, 0x7f08034e
+
+    const v10, 0x7f08034e
+
+    goto :goto_6
+
+    :cond_10
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v1
+
+    invoke-static {v1, v6}, Lkotlin/jvm/internal/k;->compare(II)I
+
+    move-result v1
+
+    if-gez v1, :cond_11
+
+    const v1, 0x7f08034f
+
+    const v10, 0x7f08034f
+
+    goto :goto_6
+
+    :cond_11
+    const v1, 0x7f080350
+
+    const v10, 0x7f080350
+
+    :goto_6
+    new-instance v1, Lcom/discord/widgets/user/Badge;
+
+    invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+
+    move-result v11
+
+    invoke-virtual {v2, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v12
+
+    const v4, 0x7f120e2b
+
+    new-array v5, v8, [Ljava/lang/Object;
+
+    invoke-virtual {v0, v2}, Lcom/discord/models/domain/ModelUserProfile;->getPremiumGuildSince(Landroid/content/Context;)Ljava/lang/String;
+
+    move-result-object v0
+
+    aput-object v0, v5, v7
+
+    invoke-virtual {v2, v4, v5}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v13
+
+    xor-int/lit8 v14, p3, 0x1
+
+    const-string v15, "PREMIUM_GUILD"
+
+    move-object v9, v1
+
+    invoke-direct/range {v9 .. v15}, Lcom/discord/widgets/user/Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
+
+    invoke-virtual {v3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_12
+    check-cast v3, Ljava/util/List;
+
+    return-object v3
+.end method
+
+.method public final onBadgeClick(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;)Lkotlin/jvm/functions/Function1;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroidx/fragment/app/FragmentManager;",
+            "Landroid/content/Context;",
+            ")",
+            "Lkotlin/jvm/functions/Function1<",
+            "Lcom/discord/widgets/user/Badge;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(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
+
+    check-cast v0, Lkotlin/jvm/functions/Function1;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge.smali b/com.discord/smali/com/discord/widgets/user/Badge.smali
similarity index 52%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge.smali
rename to com.discord/smali/com/discord/widgets/user/Badge.smali
index 9cf9f1d64d..c8d079791d 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge.smali
+++ b/com.discord/smali/com/discord/widgets/user/Badge.smali
@@ -1,17 +1,18 @@
-.class public final Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
+.class public final Lcom/discord/widgets/user/Badge;
 .super Ljava/lang/Object;
-.source "WidgetUserProfileHeader.kt"
+.source "Badge.kt"
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/user/Badge$Companion;
+    }
 .end annotation
 
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Badge"
-.end annotation
+
+# static fields
+.field public static final Companion:Lcom/discord/widgets/user/Badge$Companion;
 
 
 # instance fields
@@ -29,6 +30,20 @@
 
 
 # direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/user/Badge$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/user/Badge$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/user/Badge;->Companion:Lcom/discord/widgets/user/Badge$Companion;
+
+    return-void
+.end method
+
 .method public constructor <init>()V
     .locals 9
 
@@ -50,7 +65,7 @@
 
     move-object v0, p0
 
-    invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/user/Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-void
 .end method
@@ -60,17 +75,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->icon:I
+    iput p1, p0, Lcom/discord/widgets/user/Badge;->icon:I
 
-    iput p2, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->textColor:I
+    iput p2, p0, Lcom/discord/widgets/user/Badge;->textColor:I
 
-    iput-object p3, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->text:Ljava/lang/String;
+    iput-object p3, p0, Lcom/discord/widgets/user/Badge;->text:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->tooltip:Ljava/lang/String;
+    iput-object p4, p0, Lcom/discord/widgets/user/Badge;->tooltip:Ljava/lang/String;
 
-    iput-boolean p5, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->showPremiumUpSell:Z
+    iput-boolean p5, p0, Lcom/discord/widgets/user/Badge;->showPremiumUpSell:Z
 
-    iput-object p6, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->objectType:Ljava/lang/String;
+    iput-object p6, p0, Lcom/discord/widgets/user/Badge;->objectType:Ljava/lang/String;
 
     return-void
 .end method
@@ -164,26 +179,26 @@
 
     move p6, v0
 
-    invoke-direct/range {p1 .. p7}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
+    invoke-direct/range {p1 .. p7}, Lcom/discord/widgets/user/Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
+.method public static synthetic copy$default(Lcom/discord/widgets/user/Badge;IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/user/Badge;
     .locals 4
 
     and-int/lit8 p8, p7, 0x1
 
     if-eqz p8, :cond_0
 
-    iget p1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->icon:I
+    iget p1, p0, Lcom/discord/widgets/user/Badge;->icon:I
 
     :cond_0
     and-int/lit8 p8, p7, 0x2
 
     if-eqz p8, :cond_1
 
-    iget p2, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->textColor:I
+    iget p2, p0, Lcom/discord/widgets/user/Badge;->textColor:I
 
     :cond_1
     move p8, p2
@@ -192,7 +207,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-object p3, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->text:Ljava/lang/String;
+    iget-object p3, p0, Lcom/discord/widgets/user/Badge;->text:Ljava/lang/String;
 
     :cond_2
     move-object v0, p3
@@ -201,7 +216,7 @@
 
     if-eqz p2, :cond_3
 
-    iget-object p4, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->tooltip:Ljava/lang/String;
+    iget-object p4, p0, Lcom/discord/widgets/user/Badge;->tooltip:Ljava/lang/String;
 
     :cond_3
     move-object v1, p4
@@ -210,7 +225,7 @@
 
     if-eqz p2, :cond_4
 
-    iget-boolean p5, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->showPremiumUpSell:Z
+    iget-boolean p5, p0, Lcom/discord/widgets/user/Badge;->showPremiumUpSell:Z
 
     :cond_4
     move v2, p5
@@ -219,7 +234,7 @@
 
     if-eqz p2, :cond_5
 
-    iget-object p6, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->objectType:Ljava/lang/String;
+    iget-object p6, p0, Lcom/discord/widgets/user/Badge;->objectType:Ljava/lang/String;
 
     :cond_5
     move-object v3, p6
@@ -238,7 +253,31 @@
 
     move-object p8, v3
 
-    invoke-virtual/range {p2 .. p8}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->copy(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
+    invoke-virtual/range {p2 .. p8}, Lcom/discord/widgets/user/Badge;->copy(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Lcom/discord/widgets/user/Badge;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final onBadgeClick(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;)Lkotlin/jvm/functions/Function1;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroidx/fragment/app/FragmentManager;",
+            "Landroid/content/Context;",
+            ")",
+            "Lkotlin/jvm/functions/Function1<",
+            "Lcom/discord/widgets/user/Badge;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+
+    sget-object v0, Lcom/discord/widgets/user/Badge;->Companion:Lcom/discord/widgets/user/Badge$Companion;
+
+    invoke-virtual {v0, p0, p1}, Lcom/discord/widgets/user/Badge$Companion;->onBadgeClick(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;)Lkotlin/jvm/functions/Function1;
 
     move-result-object p0
 
@@ -250,7 +289,7 @@
 .method public final component1()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->icon:I
+    iget v0, p0, Lcom/discord/widgets/user/Badge;->icon:I
 
     return v0
 .end method
@@ -258,7 +297,7 @@
 .method public final component2()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->textColor:I
+    iget v0, p0, Lcom/discord/widgets/user/Badge;->textColor:I
 
     return v0
 .end method
@@ -266,7 +305,7 @@
 .method public final component3()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->text:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/widgets/user/Badge;->text:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -274,7 +313,7 @@
 .method public final component4()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->tooltip:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/widgets/user/Badge;->tooltip:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -282,7 +321,7 @@
 .method public final component5()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->showPremiumUpSell:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/user/Badge;->showPremiumUpSell:Z
 
     return v0
 .end method
@@ -290,15 +329,15 @@
 .method public final component6()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->objectType:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/widgets/user/Badge;->objectType:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final copy(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
+.method public final copy(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Lcom/discord/widgets/user/Badge;
     .locals 8
 
-    new-instance v7, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
+    new-instance v7, Lcom/discord/widgets/user/Badge;
 
     move-object v0, v7
 
@@ -314,7 +353,7 @@
 
     move-object v6, p6
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
+    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/user/Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
 
     return-object v7
 .end method
@@ -326,17 +365,17 @@
 
     if-eq p0, p1, :cond_4
 
-    instance-of v1, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
+    instance-of v1, p1, Lcom/discord/widgets/user/Badge;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_3
 
-    check-cast p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
+    check-cast p1, Lcom/discord/widgets/user/Badge;
 
-    iget v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->icon:I
+    iget v1, p0, Lcom/discord/widgets/user/Badge;->icon:I
 
-    iget v3, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->icon:I
+    iget v3, p1, Lcom/discord/widgets/user/Badge;->icon:I
 
     if-ne v1, v3, :cond_0
 
@@ -350,9 +389,9 @@
     :goto_0
     if-eqz v1, :cond_3
 
-    iget v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->textColor:I
+    iget v1, p0, Lcom/discord/widgets/user/Badge;->textColor:I
 
-    iget v3, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->textColor:I
+    iget v3, p1, Lcom/discord/widgets/user/Badge;->textColor:I
 
     if-ne v1, v3, :cond_1
 
@@ -366,9 +405,9 @@
     :goto_1
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->text:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/user/Badge;->text:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->text:Ljava/lang/String;
+    iget-object v3, p1, Lcom/discord/widgets/user/Badge;->text:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -376,9 +415,9 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->tooltip:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/user/Badge;->tooltip:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->tooltip:Ljava/lang/String;
+    iget-object v3, p1, Lcom/discord/widgets/user/Badge;->tooltip:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -386,9 +425,9 @@
 
     if-eqz v1, :cond_3
 
-    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->showPremiumUpSell:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/Badge;->showPremiumUpSell:Z
 
-    iget-boolean v3, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->showPremiumUpSell:Z
+    iget-boolean v3, p1, Lcom/discord/widgets/user/Badge;->showPremiumUpSell:Z
 
     if-ne v1, v3, :cond_2
 
@@ -402,9 +441,9 @@
     :goto_2
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->objectType:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/user/Badge;->objectType:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->objectType:Ljava/lang/String;
+    iget-object p1, p1, Lcom/discord/widgets/user/Badge;->objectType:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -422,26 +461,10 @@
     return v0
 .end method
 
-.method public final getBadgeClickListener(Lcom/discord/app/AppFragment;)Landroid/view/View$OnClickListener;
-    .locals 1
-
-    const-string v0, "fragment"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;
-
-    invoke-direct {v0, p0, p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;-><init>(Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;Lcom/discord/app/AppFragment;)V
-
-    check-cast v0, Landroid/view/View$OnClickListener;
-
-    return-object v0
-.end method
-
 .method public final getIcon()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->icon:I
+    iget v0, p0, Lcom/discord/widgets/user/Badge;->icon:I
 
     return v0
 .end method
@@ -449,7 +472,7 @@
 .method public final getObjectType()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->objectType:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/widgets/user/Badge;->objectType:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -457,7 +480,7 @@
 .method public final getShowPremiumUpSell()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->showPremiumUpSell:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/user/Badge;->showPremiumUpSell:Z
 
     return v0
 .end method
@@ -465,7 +488,7 @@
 .method public final getText()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->text:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/widgets/user/Badge;->text:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -473,7 +496,7 @@
 .method public final getTextColor()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->textColor:I
+    iget v0, p0, Lcom/discord/widgets/user/Badge;->textColor:I
 
     return v0
 .end method
@@ -481,7 +504,7 @@
 .method public final getTooltip()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->tooltip:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/widgets/user/Badge;->tooltip:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -489,17 +512,25 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->icon:I
+    iget v0, p0, Lcom/discord/widgets/user/Badge;->icon:I
+
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->textColor:I
+    iget v1, p0, Lcom/discord/widgets/user/Badge;->textColor:I
+
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->text:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/user/Badge;->text:Ljava/lang/String;
 
     const/4 v2, 0x0
 
@@ -519,7 +550,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->tooltip:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/user/Badge;->tooltip:Ljava/lang/String;
 
     if-eqz v1, :cond_1
 
@@ -537,7 +568,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->showPremiumUpSell:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/Badge;->showPremiumUpSell:Z
 
     if-eqz v1, :cond_2
 
@@ -548,7 +579,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->objectType:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/user/Badge;->objectType:Ljava/lang/String;
 
     if-eqz v1, :cond_3
 
@@ -571,7 +602,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->icon:I
+    iget v1, p0, Lcom/discord/widgets/user/Badge;->icon:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -579,7 +610,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->textColor:I
+    iget v1, p0, Lcom/discord/widgets/user/Badge;->textColor:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -587,7 +618,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->text:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/user/Badge;->text:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -595,7 +626,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->tooltip:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/user/Badge;->tooltip:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -603,7 +634,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->showPremiumUpSell:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/Badge;->showPremiumUpSell:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -611,7 +642,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->objectType:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/user/Badge;->objectType:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/user/ModelRichPresence$Companion.smali b/com.discord/smali/com/discord/widgets/user/ModelRichPresence$Companion.smali
deleted file mode 100644
index e05a19f308..0000000000
--- a/com.discord/smali/com/discord/widgets/user/ModelRichPresence$Companion.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public final Lcom/discord/widgets/user/ModelRichPresence$Companion;
-.super Ljava/lang/Object;
-.source "ModelRichPresence.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/ModelRichPresence;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Companion"
-.end annotation
-
-
-# direct methods
-.method private 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/user/ModelRichPresence$Companion;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final get(J)Lrx/Observable;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(J)",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/user/ModelRichPresence;",
-            ">;"
-        }
-    .end annotation
-
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPresences()Lcom/discord/stores/StoreUserPresence;
-
-    move-result-object v0
-
-    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreUserPresence;->getForUserId(J)Lrx/Observable;
-
-    move-result-object p1
-
-    sget-object p2, Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1;->INSTANCE:Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1;
-
-    check-cast p2, Lrx/functions/b;
-
-    invoke-virtual {p1, p2}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object p1
-
-    const-string p2, "StoreStream\n            \u2026          }\n            }"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali
deleted file mode 100644
index 7e72c562bc..0000000000
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali
+++ /dev/null
@@ -1,579 +0,0 @@
-.class public final Lcom/discord/widgets/user/ViewHolderMusicRichPresence;
-.super Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-.source "ViewHolderMusicRichPresence.kt"
-
-
-# instance fields
-.field private final containerView:Landroid/view/View;
-
-.field private final musicDuration:Landroid/widget/TextView;
-
-.field private final musicElapsed:Landroid/widget/TextView;
-
-.field private final musicSuperBar:Lcom/miguelgaeta/super_bar/SuperBar;
-
-.field private final playButton:Landroid/view/View;
-
-.field private final playButtonText:Landroid/widget/TextView;
-
-
-# direct methods
-.method public constructor <init>(Landroid/view/View;)V
-    .locals 1
-
-    const-string v0, "containerView"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v0, 0x2
-
-    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;-><init>(Landroid/view/View;I)V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
-
-    const v0, 0x7f0a0563
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->playButton:Landroid/view/View;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
-
-    const v0, 0x7f0a0564
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
-
-    const v0, 0x7f0a0566
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->musicSuperBar:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
-
-    const v0, 0x7f0a0562
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->musicElapsed:Landroid/widget/TextView;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
-
-    const v0, 0x7f0a0561
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->musicDuration:Landroid/widget/TextView;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
-    .locals 10
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->disposeTimer()V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
-
-    invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    move-object p1, v1
-
-    :goto_0
-    if-eqz p1, :cond_7
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->isRichPresence()Z
-
-    move-result v2
-
-    if-nez v2, :cond_1
-
-    goto/16 :goto_4
-
-    :cond_1
-    iget-object v2, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    const-string v4, "spotify"
-
-    invoke-static {v2, v4}, Lkotlin/text/l;->af(Ljava/lang/String;Ljava/lang/String;)Z
-
-    move-result v2
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getState()Ljava/lang/String;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_2
-
-    const/16 v5, 0x3b
-
-    const/16 v6, 0x2c
-
-    invoke-static {v4, v5, v6, v3}, Lkotlin/text/l;->a(Ljava/lang/String;CCZ)Ljava/lang/String;
-
-    move-result-object v4
-
-    goto :goto_1
-
-    :cond_2
-    move-object v4, v1
-
-    :goto_1
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->getHeaderTv()Landroid/widget/TextView;
-
-    move-result-object v5
-
-    const-string v6, "headerTv"
-
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->getHeaderTv()Landroid/widget/TextView;
-
-    move-result-object v7
-
-    invoke-static {v7, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v7}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
-
-    move-result-object v6
-
-    const-string v7, "headerTv.context"
-
-    invoke-static {v6, v7}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v6, p1}, Lcom/discord/utilities/presence/PresenceUtils;->getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/lang/CharSequence;
-
-    move-result-object v6
-
-    invoke-virtual {v5, v6}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->getSmallIv()Landroid/widget/ImageView;
-
-    move-result-object v5
-
-    const-string v6, "smallIv"
-
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v5, Landroid/view/View;
-
-    const/4 v6, 0x2
-
-    invoke-static {v5, v3, v3, v6, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->getTitleTv()Landroid/widget/TextView;
-
-    move-result-object v5
-
-    const-string v7, "titleTv"
-
-    invoke-static {v5, v7}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getDetails()Ljava/lang/String;
-
-    move-result-object v7
-
-    check-cast v7, Ljava/lang/CharSequence;
-
-    invoke-virtual {v5, v7}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->getDetailsTv()Landroid/widget/TextView;
-
-    move-result-object v5
-
-    const-string v7, "detailsTv"
-
-    invoke-static {v5, v7}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v7, 0x7f12120f
-
-    const/4 v8, 0x1
-
-    new-array v9, v8, [Ljava/lang/Object;
-
-    aput-object v4, v9, v3
-
-    invoke-virtual {v0, v7, v9}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/lang/CharSequence;
-
-    invoke-static {v5, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->getTimeTv()Landroid/widget/TextView;
-
-    move-result-object v4
-
-    const-string v5, "timeTv"
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v5, 0x7f12120e
-
-    new-array v7, v8, [Ljava/lang/Object;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getAssets()Lcom/discord/models/domain/ModelPresence$Assets;
-
-    move-result-object v9
-
-    if-eqz v9, :cond_3
-
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeText()Ljava/lang/String;
-
-    move-result-object v9
-
-    goto :goto_2
-
-    :cond_3
-    move-object v9, v1
-
-    :goto_2
-    aput-object v9, v7, v3
-
-    invoke-virtual {v0, v5, v7}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/lang/CharSequence;
-
-    invoke-static {v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->getTextContainer()Landroid/view/View;
-
-    move-result-object v4
-
-    const-string v5, "textContainer"
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v4, v8}, Landroid/view/View;->setSelected(Z)V
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->configureAssetUi(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;)V
-
-    iget-object p2, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->playButton:Landroid/view/View;
-
-    const-string v4, "playButton"
-
-    invoke-static {p2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p2, v2, v3, v6, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    iget-object p2, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->musicSuperBar:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    const-string v5, "musicSuperBar"
-
-    invoke-static {p2, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p2, Landroid/view/View;
-
-    invoke-static {p2, v2, v3, v6, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    iget-object p2, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->musicDuration:Landroid/widget/TextView;
-
-    const-string v5, "musicDuration"
-
-    invoke-static {p2, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p2, Landroid/view/View;
-
-    invoke-static {p2, v2, v3, v6, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    iget-object p2, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->musicElapsed:Landroid/widget/TextView;
-
-    const-string v5, "musicElapsed"
-
-    invoke-static {p2, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p2, Landroid/view/View;
-
-    invoke-static {p2, v2, v3, v6, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    const-string p2, "playButtonText"
-
-    if-eqz p3, :cond_4
-
-    iget-object v1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
-
-    invoke-static {v1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const p2, 0x7f1211f4
-
-    invoke-virtual {v0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object p2
-
-    check-cast p2, Ljava/lang/CharSequence;
-
-    invoke-virtual {v1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    iget-object p2, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->playButton:Landroid/view/View;
-
-    invoke-static {p2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p2, v3}, Landroid/view/View;->setEnabled(Z)V
-
-    goto :goto_3
-
-    :cond_4
-    iget-object v1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
-
-    invoke-static {v1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const p2, 0x7f121212
-
-    new-array v2, v8, [Ljava/lang/Object;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
-
-    move-result-object v5
-
-    if-nez v5, :cond_5
-
-    const/16 v5, 0x3f
-
-    invoke-static {v5}, Ljava/lang/Character;->valueOf(C)Ljava/lang/Character;
-
-    move-result-object v5
-
-    :cond_5
-    aput-object v5, v2, v3
-
-    invoke-virtual {v0, p2, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p2
-
-    check-cast p2, Ljava/lang/CharSequence;
-
-    invoke-virtual {v1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    iget-object p2, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->playButton:Landroid/view/View;
-
-    invoke-static {p2, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p2, v8}, Landroid/view/View;->setEnabled(Z)V
-
-    :goto_3
-    sget-object p2, Lcom/discord/utilities/integrations/SpotifyHelper;->INSTANCE:Lcom/discord/utilities/integrations/SpotifyHelper;
-
-    const-string v1, "context"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p2, v0}, Lcom/discord/utilities/integrations/SpotifyHelper;->isSpotifyInstalled(Landroid/content/Context;)Z
-
-    move-result p2
-
-    if-eqz p2, :cond_6
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->getTitleTv()Landroid/widget/TextView;
-
-    move-result-object p2
-
-    new-instance v0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$1;
-
-    invoke-direct {v0, p1}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$1;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
-
-    check-cast v0, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p2, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    iget-object p2, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->playButton:Landroid/view/View;
-
-    new-instance v0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$2;
-
-    invoke-direct {v0, p1}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$2;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
-
-    check-cast v0, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    move-result-object p2
-
-    new-instance v0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3;
-
-    invoke-direct {v0, p1, p4, p3}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/models/domain/ModelUser;Z)V
-
-    check-cast v0, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p2, v0}, Lcom/facebook/drawee/view/SimpleDraweeView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-
-    :cond_6
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->playButton:Landroid/view/View;
-
-    sget-object p2, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4;->INSTANCE:Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4;
-
-    check-cast p2, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-
-    :cond_7
-    :goto_4
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
-
-    const/16 p2, 0x8
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V
-
-    return-void
-.end method
-
-.method protected final setTimeTextViews(Lcom/discord/models/domain/ModelPresence$Timestamps;)V
-    .locals 8
-
-    if-eqz p1, :cond_1
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v0
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Timestamps;->getEndMs()J
-
-    move-result-wide v2
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Timestamps;->getStartMs()J
-
-    move-result-wide v4
-
-    sub-long/2addr v2, v4
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Timestamps;->getEndMs()J
-
-    move-result-wide v4
-
-    cmp-long v6, v0, v4
-
-    if-ltz v6, :cond_0
-
-    move-wide v0, v2
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Timestamps;->getStartMs()J
-
-    move-result-wide v4
-
-    sub-long/2addr v0, v4
-
-    :goto_0
-    long-to-double v4, v0
-
-    long-to-double v6, v2
-
-    invoke-static {v4, v5}, Ljava/lang/Double;->isNaN(D)Z
-
-    invoke-static {v6, v7}, Ljava/lang/Double;->isNaN(D)Z
-
-    div-double/2addr v4, v6
-
-    const-wide/high16 v6, 0x4059000000000000L    # 100.0
-
-    mul-double v4, v4, v6
-
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->musicSuperBar:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    const-string v6, "musicSuperBar"
-
-    invoke-static {p1, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/miguelgaeta/super_bar/SuperBar;->getConfig()Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    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
-
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->musicElapsed:Landroid/widget/TextView;
-
-    const-string v4, "musicElapsed"
-
-    invoke-static {p1, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v4, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
-
-    const/4 v5, 0x0
-
-    invoke-virtual {v4, v0, v1, v5}, Lcom/discord/utilities/time/TimeUtils;->toFriendlyStringSimple(JLjava/lang/String;)Ljava/lang/CharSequence;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->musicDuration:Landroid/widget/TextView;
-
-    const-string v0, "musicDuration"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v0, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
-
-    invoke-virtual {v0, v2, v3, v5}, Lcom/discord/utilities/time/TimeUtils;->toFriendlyStringSimple(JLjava/lang/String;)Ljava/lang/CharSequence;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    :cond_1
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali
deleted file mode 100644
index dfb639c76b..0000000000
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali
+++ /dev/null
@@ -1,537 +0,0 @@
-.class public final Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;
-.super Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-.source "ViewHolderPlatformRichPresence.kt"
-
-
-# instance fields
-.field private final connectButton:Landroid/view/View;
-
-.field private final connectButtonText:Landroid/widget/TextView;
-
-.field private final containerView:Landroid/view/View;
-
-.field private final subscriptions:Lrx/subscriptions/CompositeSubscription;
-
-
-# direct methods
-.method public constructor <init>(Landroid/view/View;)V
-    .locals 1
-
-    const-string v0, "containerView"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v0, 0x3
-
-    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;-><init>(Landroid/view/View;I)V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
-
-    const v0, 0x7f0a0563
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->connectButton:Landroid/view/View;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
-
-    const v0, 0x7f0a0564
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->connectButtonText:Landroid/widget/TextView;
-
-    new-instance p1, Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {p1}, Lrx/subscriptions/CompositeSubscription;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->subscriptions:Lrx/subscriptions/CompositeSubscription;
-
-    return-void
-.end method
-
-.method public static final synthetic access$getConnectButton$p(Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;)Landroid/view/View;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->connectButton:Landroid/view/View;
-
-    return-object p0
-.end method
-
-.method private final configureImages(Lcom/discord/utilities/platform/Platform;Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;)V
-    .locals 12
-
-    sget-object v0, Lcom/discord/utilities/platform/Platform;->NONE:Lcom/discord/utilities/platform/Platform;
-
-    if-eq p1, v0, :cond_0
-
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->connectButton:Landroid/view/View;
-
-    invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getColorResId()I
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundResource(I)V
-
-    iget-object v2, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->connectButtonText:Landroid/widget/TextView;
-
-    const-string v0, "connectButtonText"
-
-    invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getWhitePlatformImage()I
-
-    move-result v3
-
-    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/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
-
-    :cond_0
-    sget-object v0, Lcom/discord/utilities/platform/Platform;->XBOX:Lcom/discord/utilities/platform/Platform;
-
-    const/4 v1, 0x0
-
-    const-string v2, "largeIv"
-
-    if-ne p1, v0, :cond_1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    move-result-object p2
-
-    invoke-static {p2, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p2, Landroid/widget/ImageView;
-
-    invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getPlatformImage()I
-
-    move-result p1
-
-    const/4 p3, 0x4
-
-    invoke-static {p2, p1, v1, p3, v1}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
-
-    return-void
-
-    :cond_1
-    if-eqz p2, :cond_2
-
-    invoke-virtual {p2}, Lcom/discord/widgets/user/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_2
-    move-object p1, v1
-
-    :goto_0
-    invoke-super {p0, p1, p3}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureAssetUi(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    move-result-object p1
-
-    invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getVisibility()I
-
-    move-result p1
-
-    if-eqz p1, :cond_5
-
-    if-eqz p2, :cond_4
-
-    invoke-virtual {p2}, Lcom/discord/widgets/user/ModelRichPresence;->getPrimaryApplication()Lcom/discord/models/domain/ModelApplication;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_4
-
-    sget-object v3, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplication;->getId()J
-
-    move-result-wide v4
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplication;->getIcon()Ljava/lang/String;
-
-    move-result-object p1
-
-    if-nez p1, :cond_3
-
-    const-string p1, ""
-
-    :cond_3
-    move-object v6, p1
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x4
-
-    const/4 v9, 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;
-
-    move-result-object v1
-
-    :cond_4
-    move-object v4, v1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    move-result-object p1
-
-    invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 p2, 0x0
-
-    invoke-virtual {p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    move-result-object p1
-
-    invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v3, p1
-
-    check-cast v3, Landroid/widget/ImageView;
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/16 v10, 0x7c
-
-    const/4 v11, 0x0
-
-    invoke-static/range {v3 .. v11}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
-
-    :cond_5
-    return-void
-.end method
-
-
-# virtual methods
-.method public final configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
-    .locals 10
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->disposeSubscriptions()V
-
-    const/4 p3, 0x0
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object p4
-
-    goto :goto_0
-
-    :cond_0
-    move-object p4, p3
-
-    :goto_0
-    if-eqz p4, :cond_6
-
-    invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->isGamePlatform()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    goto/16 :goto_3
-
-    :cond_1
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->isXboxActivity()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    sget-object v0, Lcom/discord/utilities/platform/Platform;->XBOX:Lcom/discord/utilities/platform/Platform;
-
-    goto :goto_1
-
-    :cond_2
-    sget-object v0, Lcom/discord/utilities/platform/Platform;->Companion:Lcom/discord/utilities/platform/Platform$Companion;
-
-    invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->getPlatform()Ljava/lang/String;
-
-    move-result-object v2
-
-    if-nez v2, :cond_3
-
-    const-string v2, ""
-
-    :cond_3
-    invoke-virtual {v0, v2}, Lcom/discord/utilities/platform/Platform$Companion;->from(Ljava/lang/String;)Lcom/discord/utilities/platform/Platform;
-
-    move-result-object v0
-
-    :goto_1
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->getHeaderTv()Landroid/widget/TextView;
-
-    move-result-object v2
-
-    const-string v3, "headerTv"
-
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->getHeaderTv()Landroid/widget/TextView;
-
-    move-result-object v4
-
-    invoke-static {v4, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v4}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
-
-    move-result-object v3
-
-    const-string v4, "headerTv.context"
-
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v3, p4}, Lcom/discord/utilities/presence/PresenceUtils;->getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/lang/CharSequence;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->getTitleTv()Landroid/widget/TextView;
-
-    move-result-object v2
-
-    const-string v3, "titleTv"
-
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/CharSequence;
-
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->getTimeTv()Landroid/widget/TextView;
-
-    move-result-object v2
-
-    const-string v3, "timeTv"
-
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->getTimestamps()Lcom/discord/models/domain/ModelPresence$Timestamps;
-
-    move-result-object p4
-
-    if-eqz p4, :cond_4
-
-    invoke-virtual {p0, p4}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
-
-    move-result-object p4
-
-    goto :goto_2
-
-    :cond_4
-    move-object p4, p3
-
-    :goto_2
-    invoke-static {v2, p4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->getTextContainer()Landroid/view/View;
-
-    move-result-object p4
-
-    const-string v2, "textContainer"
-
-    invoke-static {p4, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v2, 0x1
-
-    invoke-virtual {p4, v2}, Landroid/view/View;->setSelected(Z)V
-
-    iget-object p4, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->connectButton:Landroid/view/View;
-
-    const-string v3, "connectButton"
-
-    invoke-static {p4, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0}, Lcom/discord/utilities/platform/Platform;->getEnabled()Z
-
-    move-result v3
-
-    const/4 v4, 0x2
-
-    invoke-static {p4, v3, v1, v4, p3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    iget-object p3, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->connectButtonText:Landroid/widget/TextView;
-
-    const-string p4, "connectButtonText"
-
-    invoke-static {p3, p4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object p4, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
-
-    invoke-virtual {p4}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object p4
-
-    const v3, 0x7f1211f8
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    invoke-virtual {v0}, Lcom/discord/utilities/platform/Platform;->getProperName()Ljava/lang/String;
-
-    move-result-object v4
-
-    aput-object v4, v2, v1
-
-    invoke-virtual {p4, v3, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p4
-
-    check-cast p4, Ljava/lang/CharSequence;
-
-    invoke-virtual {p3, p4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-virtual {v0}, Lcom/discord/utilities/platform/Platform;->getEnabled()Z
-
-    move-result p3
-
-    if-eqz p3, :cond_5
-
-    sget-object p3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {p3}, Lcom/discord/stores/StoreStream$Companion;->getUserConnections()Lcom/discord/stores/StoreUserConnections;
-
-    move-result-object p3
-
-    invoke-virtual {p3}, Lcom/discord/stores/StoreUserConnections;->getConnectedAccounts()Lrx/Observable;
-
-    move-result-object p3
-
-    new-instance p4, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1;
-
-    invoke-direct {p4, v0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1;-><init>(Lcom/discord/utilities/platform/Platform;)V
-
-    check-cast p4, Lrx/functions/b;
-
-    invoke-virtual {p3, p4}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object p3
-
-    invoke-virtual {p3}, Lrx/Observable;->Kb()Lrx/Observable;
-
-    move-result-object p3
-
-    const-string p4, "StoreStream\n          .g\u2026  .distinctUntilChanged()"
-
-    invoke-static {p3, p4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
-
-    move-result-object v1
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v2
-
-    const/4 v3, 0x0
-
-    new-instance p3, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$2;
-
-    iget-object p4, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->subscriptions:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {p3, p4}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$2;-><init>(Lrx/subscriptions/CompositeSubscription;)V
-
-    move-object v4, p3
-
-    check-cast v4, Lkotlin/jvm/functions/Function1;
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    new-instance p3, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3;
-
-    invoke-direct {p3, p0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3;-><init>(Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;)V
-
-    move-object v7, p3
-
-    check-cast v7, Lkotlin/jvm/functions/Function1;
-
-    const/16 v8, 0x1a
-
-    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
-
-    iget-object p3, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->connectButton:Landroid/view/View;
-
-    new-instance p4, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$4;
-
-    invoke-direct {p4, v0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$4;-><init>(Lcom/discord/utilities/platform/Platform;)V
-
-    check-cast p4, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p3, p4}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    :cond_5
-    invoke-direct {p0, v0, p1, p2}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->configureImages(Lcom/discord/utilities/platform/Platform;Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;)V
-
-    return-void
-
-    :cond_6
-    :goto_3
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
-
-    const/16 p2, 0x8
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V
-
-    return-void
-.end method
-
-.method public final disposeSubscriptions()V
-    .locals 1
-
-    invoke-super {p0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->disposeSubscriptions()V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->subscriptions:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->clear()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1.smali
deleted file mode 100644
index a007b05f75..0000000000
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class final Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1;
-.super Lkotlin/jvm/internal/l;
-.source "ViewHolderUserRichPresence.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureUiTimestamp(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/app/AppComponent;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lrx/Subscription;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/user/ViewHolderUserRichPresence;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1;->this$0:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lrx/Subscription;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1;->invoke(Lrx/Subscription;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lrx/Subscription;)V
-    .locals 1
-
-    const-string v0, "it"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1;->this$0:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->access$setPerSecondTimerSubscription$p(Lcom/discord/widgets/user/ViewHolderUserRichPresence;Lrx/Subscription;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2.smali
deleted file mode 100644
index a1b5d01c4d..0000000000
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2.smali
+++ /dev/null
@@ -1,79 +0,0 @@
-.class final Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2;
-.super Lkotlin/jvm/internal/l;
-.source "ViewHolderUserRichPresence.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureUiTimestamp(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/app/AppComponent;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Long;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic $model:Lcom/discord/models/domain/ModelPresence$Activity;
-
-.field final synthetic this$0:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/user/ViewHolderUserRichPresence;Lcom/discord/models/domain/ModelPresence$Activity;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2;->this$0:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2;->$model:Lcom/discord/models/domain/ModelPresence$Activity;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Long;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2;->invoke(Ljava/lang/Long;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Ljava/lang/Long;)V
-    .locals 1
-
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2;->this$0:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2;->$model:Lcom/discord/models/domain/ModelPresence$Activity;
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$Activity;->getTimestamps()Lcom/discord/models/domain/ModelPresence$Timestamps;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->setTimeTextViews(Lcom/discord/models/domain/ModelPresence$Timestamps;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali
index 81acbb88ae..6fa4dd5538 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali
@@ -81,7 +81,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f120293
+    const v2, 0x7f120297
 
     invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/user/WidgetBanUser;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3.smali
index 9057f26fe3..d32b20ed13 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3.smali
@@ -65,7 +65,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eI()I
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eN()I
 
     move-result v0
 
@@ -190,7 +190,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a00c2
+    .packed-switch 0x7f0a00c3
         :pswitch_2
         :pswitch_1
         :pswitch_0
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetBanUser.smali b/com.discord/smali/com/discord/widgets/user/WidgetBanUser.smali
index da6cb69282..e8a92aa9f0 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetBanUser.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetBanUser.smali
@@ -193,7 +193,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a00c6
+    const v0, 0x7f0a00c7
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -201,7 +201,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetBanUser;->titleTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00be
+    const v0, 0x7f0a00bf
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -209,7 +209,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetBanUser;->bodyTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00c1
+    const v0, 0x7f0a00c2
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -217,7 +217,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetBanUser;->confirmButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00c0
+    const v0, 0x7f0a00c1
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -225,7 +225,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetBanUser;->cancelButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00c5
+    const v0, 0x7f0a00c6
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -251,9 +251,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a00c4
-        0x7f0a00c2
+        0x7f0a00c5
         0x7f0a00c3
+        0x7f0a00c4
     .end array-data
 .end method
 
@@ -444,7 +444,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00c7
+    const v0, 0x7f0d00d0
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali
index 8f9da6efe6..3bebef7e39 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali
@@ -81,7 +81,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f120aa4
+    const v2, 0x7f120ac5
 
     invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/user/WidgetKickUser;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetKickUser.smali b/com.discord/smali/com/discord/widgets/user/WidgetKickUser.smali
index 270b95be5f..c25cabdfba 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetKickUser.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetKickUser.smali
@@ -167,7 +167,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0400
+    const v0, 0x7f0a0410
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -175,7 +175,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetKickUser;->titleTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03fc
+    const v0, 0x7f0a040c
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -183,7 +183,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetKickUser;->bodyTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03fe
+    const v0, 0x7f0a040e
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -191,7 +191,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetKickUser;->confirmButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03fd
+    const v0, 0x7f0a040d
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -199,7 +199,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetKickUser;->cancelButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03ff
+    const v0, 0x7f0a040f
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -343,7 +343,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0142
+    const v0, 0x7f0d014b
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers$Model.smali
index ffd1185aea..e88ec75090 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers$Model.smali
@@ -150,7 +150,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali
index e6fa81d1f4..b97c67897d 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali
@@ -135,7 +135,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    const v1, 0x7f120e72
+    const v1, 0x7f120ea8
 
     invoke-virtual {p0, v1}, Lcom/discord/widgets/user/WidgetPruneUsers;->getString(I)Ljava/lang/String;
 
@@ -275,7 +275,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->estimateText:Lcom/discord/app/AppTextView;
 
-    const v5, 0x7f1205ce
+    const v5, 0x7f1205da
 
     const/4 v6, 0x2
 
@@ -328,7 +328,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->radioManager:Lcom/discord/views/RadioManager;
 
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eI()I
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->eN()I
 
     move-result v0
 
@@ -399,7 +399,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -419,11 +419,11 @@
 
     invoke-direct {p2, p0}, Lcom/discord/widgets/user/-$$Lambda$WidgetPruneUsers$D0vI_rJ0GsvW5rI2X5bfrrECdZY;-><init>(Lcom/discord/widgets/user/WidgetPruneUsers;)V
 
-    invoke-static {}, Lrx/functions/a;->Kq()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Ke()Lrx/functions/a$b;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/functions/a;->Kq()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Ke()Lrx/functions/a$b;
 
     move-result-object v1
 
@@ -461,7 +461,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d015e
+    const v0, 0x7f0d0168
 
     return v0
 .end method
@@ -505,7 +505,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -555,7 +555,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0549
+    const v0, 0x7f0a0559
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -565,7 +565,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->header:Landroid/widget/TextView;
 
-    const v0, 0x7f0a054b
+    const v0, 0x7f0a055b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -575,7 +575,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->estimateText:Lcom/discord/app/AppTextView;
 
-    const v0, 0x7f0a054f
+    const v0, 0x7f0a055f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -585,7 +585,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->progressBar:Landroid/widget/ProgressBar;
 
-    const v0, 0x7f0a054a
+    const v0, 0x7f0a055a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -593,7 +593,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->prune:Landroid/view/View;
 
-    const v0, 0x7f0a0548
+    const v0, 0x7f0a0558
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -605,7 +605,7 @@
 
     new-array v0, v0, [Lcom/discord/views/CheckedSetting;
 
-    const v1, 0x7f0a054c
+    const v1, 0x7f0a055c
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -617,7 +617,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a054d
+    const v1, 0x7f0a055d
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -629,7 +629,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a054e
+    const v1, 0x7f0a055e
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali
index fe83683ba6..f6982df355 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali
@@ -162,7 +162,7 @@
 
     invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(I)V
 
-    sget-object v5, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object v5, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     move-object/from16 v18, v5
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion.smali
index 9bb8213753..6bcbc62c86 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion.smali
@@ -160,7 +160,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters.smali
index d7a46bf77f..3cfe7f174f 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters.smali
@@ -346,54 +346,50 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 3
 
     iget-wide v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->guildId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v2, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v2
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->allGuilds:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->allGuilds:Z
 
     const/4 v2, 0x1
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->includeEveryone:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->includeEveryone:Z
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_1
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->includeRoles:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->includeRoles:Z
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_2
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState.smali
index 27381f0a1d..414fa6d89c 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState.smali
@@ -101,7 +101,7 @@
 
     if-eqz p4, :cond_2
 
-    sget-object p3, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p3, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p3, Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali
index f8cd9d0e27..6ca1632d49 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali
@@ -1003,198 +1003,186 @@
 .end method
 
 .method public final hashCode()I
-    .locals 8
+    .locals 5
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getUserId()J
 
     move-result-wide v0
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v3
-
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getChannelId()J
 
-    move-result-wide v3
+    move-result-wide v1
 
-    ushr-long v5, v3, v2
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    xor-long/2addr v3, v5
+    move-result v1
 
-    long-to-int v0, v3
+    add-int/2addr v0, v1
 
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v0
+    move-result-object v1
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    ushr-long v6, v4, v2
+    invoke-static {v3, v4}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    xor-long/2addr v4, v6
+    move-result v1
 
-    long-to-int v0, v4
+    add-int/2addr v0, v1
 
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getChannelNames()Ljava/util/Map;
 
-    move-result-object v0
+    move-result-object v1
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()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 v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getOldestMessageId()J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    ushr-long v6, v4, v2
+    invoke-static {v3, v4}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    xor-long/2addr v4, v6
+    move-result v1
 
-    long-to-int v0, v4
+    add-int/2addr v0, v1
 
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getList()Ljava/util/List;
 
-    move-result-object v0
+    move-result-object v1
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_2
 
     :cond_2
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_2
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getMyRoleIds()Ljava/util/Set;
 
-    move-result-object v0
+    move-result-object v1
 
-    if-eqz v0, :cond_3
+    if-eqz v1, :cond_3
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_3
 
     :cond_3
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_3
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getNewMessagesMarkerMessageId()J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    ushr-long v6, v4, v2
+    invoke-static {v3, v4}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    xor-long/2addr v4, v6
+    move-result v1
 
-    long-to-int v0, v4
+    add-int/2addr v0, v1
 
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->isSpoilerClickAllowed()Z
 
-    move-result v0
+    move-result v1
 
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
-    if-eqz v0, :cond_4
+    if-eqz v1, :cond_4
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_4
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z
 
-    if-eqz v0, :cond_5
+    if-eqz v1, :cond_5
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     :cond_5
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    mul-int/lit8 v1, v1, 0x1f
+    mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
 
-    if-eqz v0, :cond_6
+    if-eqz v1, :cond_6
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v3
+    move-result v2
 
     :cond_6
-    add-int/2addr v1, v3
+    add-int/2addr v0, v2
 
-    return v1
+    return v0
 .end method
 
 .method public final isSpoilerClickAllowed()Z
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1.smali
index 38c2a6edd8..26c024eaa2 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1.smali
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
index 08b0bda9b7..fde823d0b3 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
@@ -144,7 +144,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a078b
+    const v0, 0x7f0a07b5
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -152,7 +152,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->filterSelectedGuildCs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0789
+    const v0, 0x7f0a07b3
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -160,7 +160,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->filterIncludeEveryoneCs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a078a
+    const v0, 0x7f0a07b4
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -218,7 +218,7 @@
 
     const-string v0, "filters"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -241,7 +241,7 @@
 
     const-string v0, "onFiltersUpdated"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -380,7 +380,7 @@
 
     const-string v1, "onFiltersUpdated"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -393,7 +393,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c7
+    const v0, 0x7f0d01d7
 
     return v0
 .end method
@@ -423,7 +423,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->getAllGuilds()Z
@@ -474,7 +474,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f121130
+    const v4, 0x7f121172
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -522,7 +522,7 @@
 
     if-nez v1, :cond_4
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     invoke-virtual {v1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->getIncludeEveryone()Z
@@ -551,7 +551,7 @@
 
     if-nez v1, :cond_5
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_5
     invoke-virtual {v1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->getIncludeRoles()Z
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$configureUI$1$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$configureUI$1$1.smali
index 4ff2305c96..e50e446177 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$configureUI$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$configureUI$1$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$configureUI$1$1;->invoke(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$configureUI$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$configureUI$1.smali
index 8eaae1796d..c3f7f2e09e 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$configureUI$1.smali
@@ -64,7 +64,7 @@
 
     move-result p1
 
-    const p2, 0x7f0a0468
+    const p2, 0x7f0a047b
 
     if-ne p1, p2, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$onViewBound$1.smali
index 4ac29aa360..64ba96de13 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$onViewBound$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$onViewBound$1;->invoke(Lcom/discord/stores/StoreChat$InteractionState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$onViewBoundOrOnResume$1.smali
index 7cd53d6ba4..6050b908a0 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/user/WidgetUserMentions$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali
index f6f410446d..613bbbee9b 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali
@@ -66,7 +66,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a078c
+    const v0, 0x7f0a07b6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -185,7 +185,7 @@
 
     if-eqz v0, :cond_2
 
-    const v0, 0x7f1200c5
+    const v0, 0x7f1200c8
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/user/WidgetUserMentions;->setActionBarSubtitle(I)Lkotlin/Unit;
 
@@ -201,7 +201,7 @@
     invoke-virtual {p0, v0}, Lcom/discord/widgets/user/WidgetUserMentions;->setActionBarSubtitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
 
     :goto_1
-    const v2, 0x7f0e0019
+    const v2, 0x7f0e001a
 
     new-instance v0, Lcom/discord/widgets/user/WidgetUserMentions$configureUI$1;
 
@@ -280,7 +280,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c6
+    const v0, 0x7f0d01d6
 
     return v0
 .end method
@@ -332,7 +332,7 @@
 
     invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f120eae
+    const p1, 0x7f120ee4
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali
index 5063d45033..9b91cce0d0 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali
@@ -236,7 +236,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object p1
 
@@ -256,7 +256,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
@@ -280,7 +280,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->JV()Lrx/Observable;
 
     move-result-object p0
 
@@ -326,7 +326,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming;->get()Lrx/Observable;
+    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming;->getStreams()Lrx/Observable;
 
     move-result-object v5
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder.smali
index 3f24c5f661..cfa0c38d27 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder.smali
@@ -43,7 +43,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a0798
+    const p2, 0x7f0a07c2
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -55,7 +55,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a079e
+    const p2, 0x7f0a07c8
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a079d
+    const p2, 0x7f0a07c7
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -79,7 +79,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a079c
+    const p2, 0x7f0a07c6
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -91,7 +91,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a0799
+    const p2, 0x7f0a07c3
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -125,7 +125,7 @@
 
     move-result-wide p1
 
-    invoke-static {p0, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    invoke-static {p0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
 
     return-void
 .end method
@@ -163,7 +163,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemAvatar:Landroid/widget/ImageView;
 
-    const v1, 0x7f07005b
+    const v1, 0x7f07005a
 
     invoke-static {v0, p1, v1}, Lcom/discord/utilities/icon/IconUtils;->setIcon(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;I)V
 
@@ -182,7 +182,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a079b
+    const v2, 0x7f0a07c5
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -190,7 +190,7 @@
 
     check-cast v2, Landroid/widget/TextView;
 
-    const v3, 0x7f0a079a
+    const v3, 0x7f0a07c4
 
     invoke-virtual {v1, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
index a3afd602b1..f8bfb04ae4 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
@@ -71,7 +71,7 @@
 
     new-instance p1, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;
 
-    const p2, 0x7f0d01ce
+    const p2, 0x7f0d01de
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;-><init>(ILcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;)V
 
@@ -85,15 +85,15 @@
     throw p1
 
     :cond_1
-    new-instance p1, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;
+    new-instance p1, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;
 
-    const p2, 0x7f0d01cd
+    const p2, 0x7f0d01dd
 
-    const v0, 0x7f0401e1
+    const v0, 0x7f0401e3
 
-    const v1, 0x7f120bd3
+    const v1, 0x7f120c05
 
-    invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V
+    invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
index 48f7939cca..32914d5d55 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
@@ -64,7 +64,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c8
+    const v0, 0x7f0d01d8
 
     return v0
 .end method
@@ -74,7 +74,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a078d
+    const v0, 0x7f0a07b7
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder.smali
index 3ef4adb1f7..cbd2efde49 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder.smali
@@ -41,7 +41,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a079f
+    const v0, 0x7f0a07c9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -53,7 +53,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07a2
+    const v0, 0x7f0a07cc
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -65,7 +65,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07a0
+    const v0, 0x7f0a07ca
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -77,7 +77,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07a1
+    const v0, 0x7f0a07cb
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
index 517773fff4..bf518725e4 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
@@ -85,7 +85,7 @@
 
     new-instance p1, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder;
 
-    const p2, 0x7f0d01d0
+    const p2, 0x7f0d01e0
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder;-><init>(ILcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter;)V
 
@@ -99,15 +99,15 @@
     throw p1
 
     :cond_1
-    new-instance p1, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;
+    new-instance p1, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;
 
-    const p2, 0x7f0d01cd
+    const p2, 0x7f0d01dd
 
-    const v0, 0x7f0401e2
+    const v0, 0x7f0401e4
 
-    const v1, 0x7f120bd4
+    const v1, 0x7f120c06
 
-    invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V
+    invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Model.smali
index d758577092..dfe9ce0ddb 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Model.smali
@@ -186,7 +186,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
index a03fdeca4d..d18b393bd8 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
@@ -64,7 +64,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c9
+    const v0, 0x7f0d01d9
 
     return v0
 .end method
@@ -74,7 +74,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a078e
+    const v0, 0x7f0a07b8
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile$1.smali
deleted file mode 100644
index 053a873db8..0000000000
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile$1.smali
+++ /dev/null
@@ -1,61 +0,0 @@
-.class Lcom/discord/widgets/user/WidgetUserProfile$1;
-.super Ljava/lang/Object;
-.source "WidgetUserProfile.java"
-
-# interfaces
-.implements Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/WidgetUserProfile;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x0
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/user/WidgetUserProfile;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfile$1;->this$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onPageScrollStateChanged(I)V
-    .locals 0
-
-    return-void
-.end method
-
-.method public onPageScrolled(IFI)V
-    .locals 0
-
-    return-void
-.end method
-
-.method public onPageSelected(I)V
-    .locals 1
-
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfile$1;->this$0:Lcom/discord/widgets/user/WidgetUserProfile;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfile;->access$000(Lcom/discord/widgets/user/WidgetUserProfile;)Lcom/discord/utilities/simple_pager/SimplePager;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/user/WidgetUserProfile;->hideKeyboard(Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali
deleted file mode 100644
index bc6af49499..0000000000
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali
+++ /dev/null
@@ -1,1061 +0,0 @@
-.class public Lcom/discord/widgets/user/WidgetUserProfile;
-.super Lcom/discord/app/AppFragment;
-.source "WidgetUserProfile.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/user/WidgetUserProfile$Model;
-    }
-.end annotation
-
-
-# instance fields
-.field private friendRequestAcceptBtn:Landroid/view/View;
-
-.field private friendRequestBtn:Landroid/view/View;
-
-.field private friendRequestIgnoreBtn:Landroid/view/View;
-
-.field private friendRequestIncomingContainer:Landroid/view/View;
-
-.field private friendRequestSentBtn:Landroid/view/View;
-
-.field private sendMessageFab:Landroid/view/View;
-
-.field private tabs:Lcom/google/android/material/tabs/TabLayout;
-
-.field private viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
-
-    return-void
-.end method
-
-.method static synthetic access$000(Lcom/discord/widgets/user/WidgetUserProfile;)Lcom/discord/utilities/simple_pager/SimplePager;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
-
-    return-object p0
-.end method
-
-.method private addRelationship(Ljava/lang/Integer;I)V
-    .locals 4
-
-    invoke-static {}, Lcom/discord/utilities/rest/RestAPI;->getApi()Lcom/discord/utilities/rest/RestAPI;
-
-    move-result-object v0
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getUserId()J
-
-    move-result-wide v1
-
-    const-string v3, "User Profile"
-
-    invoke-virtual {v0, v3, v1, v2, p1}, Lcom/discord/utilities/rest/RestAPI;->addRelationship(Ljava/lang/String;JLjava/lang/Integer;)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-static {p0}, Lcom/discord/app/i;->b(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$BU06_c_Ypaul1l4jmK2Y2q9pD3Q;
-
-    invoke-direct {v0, p0, p2}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$BU06_c_Ypaul1l4jmK2Y2q9pD3Q;-><init>(Lcom/discord/widgets/user/WidgetUserProfile;I)V
-
-    invoke-static {v0, p0}, Lcom/discord/app/i;->a(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    return-void
-.end method
-
-.method private configureActionButtons(Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-    .locals 4
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfile$Model;->access$300(Lcom/discord/widgets/user/WidgetUserProfile$Model;)Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfile$Model;->access$200(Lcom/discord/widgets/user/WidgetUserProfile$Model;)Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isBot()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfile$Model;->access$100(Lcom/discord/widgets/user/WidgetUserProfile$Model;)I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    iget-object v2, p0, Lcom/discord/widgets/user/WidgetUserProfile;->friendRequestBtn:Landroid/view/View;
-
-    const/16 v3, 0x8
-
-    if-eqz v0, :cond_1
-
-    const/4 v0, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    const/16 v0, 0x8
-
-    :goto_1
-    invoke-virtual {v2, v0}, Landroid/view/View;->setVisibility(I)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->friendRequestBtn:Landroid/view/View;
-
-    new-instance v2, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$oihzzpGBelVgH6JTZ948MiGwWE8;
-
-    invoke-direct {v2, p0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$oihzzpGBelVgH6JTZ948MiGwWE8;-><init>(Lcom/discord/widgets/user/WidgetUserProfile;)V
-
-    invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->friendRequestSentBtn:Landroid/view/View;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfile$Model;->canCancel()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    const/4 v2, 0x0
-
-    goto :goto_2
-
-    :cond_2
-    const/16 v2, 0x8
-
-    :goto_2
-    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->friendRequestSentBtn:Landroid/view/View;
-
-    new-instance v2, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$IH8kwxdpxinJ58ico-LEdybaKv0;
-
-    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$IH8kwxdpxinJ58ico-LEdybaKv0;-><init>(Lcom/discord/widgets/user/WidgetUserProfile;Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-
-    invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->friendRequestIncomingContainer:Landroid/view/View;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfile$Model;->canAccept()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    const/16 v1, 0x8
-
-    :goto_3
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfile;->friendRequestAcceptBtn:Landroid/view/View;
-
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$uz8uCgVxIIyyq9oR-t-Jg8rBqKw;
-
-    invoke-direct {v0, p0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$uz8uCgVxIIyyq9oR-t-Jg8rBqKw;-><init>(Lcom/discord/widgets/user/WidgetUserProfile;)V
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfile;->friendRequestIgnoreBtn:Landroid/view/View;
-
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$DN_wURtqFY8f-rfZC_Nq5hiiz9c;
-
-    invoke-direct {v0, p0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$DN_wURtqFY8f-rfZC_Nq5hiiz9c;-><init>(Lcom/discord/widgets/user/WidgetUserProfile;)V
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-.end method
-
-.method private configureUI(Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-    .locals 3
-
-    if-nez p1, :cond_1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getAppActivity()Lcom/discord/app/AppActivity;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getAppActivity()Lcom/discord/app/AppActivity;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/app/AppActivity;->onBackPressed()V
-
-    :cond_0
-    return-void
-
-    :cond_1
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfile$Model;->access$100(Lcom/discord/widgets/user/WidgetUserProfile$Model;)I
-
-    move-result v0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/user/WidgetUserProfile;->getMenuResId(I)I
-
-    move-result v0
-
-    new-instance v1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$4aubuu0PlHcm5xY7zim34ZCS9Rc;
-
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$4aubuu0PlHcm5xY7zim34ZCS9Rc;-><init>(Lcom/discord/widgets/user/WidgetUserProfile;Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-
-    new-instance v2, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$fjan-QAmdQ6BqxJW1eWAx3oLMZM;
-
-    invoke-direct {v2, p0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$fjan-QAmdQ6BqxJW1eWAx3oLMZM;-><init>(Lcom/discord/widgets/user/WidgetUserProfile;)V
-
-    invoke-virtual {p0, v0, v1, v2}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarOptionsMenu(ILrx/functions/Action2;Lrx/functions/Action1;)Landroidx/appcompat/widget/Toolbar;
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->configureActionButtons(Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->sendMessageFab:Landroid/view/View;
-
-    new-instance v1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pbSylbhAbdhsXobagQlJftqkIbs;
-
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pbSylbhAbdhsXobagQlJftqkIbs;-><init>(Lcom/discord/widgets/user/WidgetUserProfile;Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-.end method
-
-.method private findAndSetDirectMessage(Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-    .locals 4
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfile$Model;->access$200(Lcom/discord/widgets/user/WidgetUserProfile$Model;)Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v2
-
-    invoke-virtual {v0, v1, v2, v3}, Lcom/discord/stores/StoreChannelsSelected;->findAndSetDirectMessage(Landroid/content/Context;J)V
-
-    return-void
-.end method
-
-.method private getGuildId()J
-    .locals 4
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getMostRecentIntent()Landroid/content/Intent;
-
-    move-result-object v0
-
-    const-string v1, "com.discord.intent.extra.EXTRA_GUILD_ID"
-
-    const-wide/16 v2, 0x0
-
-    invoke-virtual {v0, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method private getMenuResId(I)I
-    .locals 1
-
-    const/4 v0, 0x1
-
-    if-eq p1, v0, :cond_3
-
-    const/4 v0, 0x2
-
-    if-eq p1, v0, :cond_2
-
-    const/4 v0, 0x3
-
-    if-eq p1, v0, :cond_1
-
-    const/4 v0, 0x4
-
-    if-eq p1, v0, :cond_0
-
-    const p1, 0x7f0e001a
-
-    return p1
-
-    :cond_0
-    const p1, 0x7f0e001e
-
-    return p1
-
-    :cond_1
-    const p1, 0x7f0e001d
-
-    return p1
-
-    :cond_2
-    const p1, 0x7f0e001b
-
-    return p1
-
-    :cond_3
-    const p1, 0x7f0e001c
-
-    return p1
-.end method
-
-.method private getUserId()J
-    .locals 4
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getMostRecentIntent()Landroid/content/Intent;
-
-    move-result-object v0
-
-    const-string v1, "com.discord.intent.extra.EXTRA_USER_ID"
-
-    const-wide/16 v2, 0x0
-
-    invoke-virtual {v0, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public static synthetic lambda$XVSv-upShbk6Qfx9qmjCxZ9TRhc(Lcom/discord/widgets/user/WidgetUserProfile;Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->configureUI(Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-
-    return-void
-.end method
-
-.method static synthetic lambda$onViewBound$0(Landroid/view/MenuItem;Landroid/content/Context;)V
-    .locals 0
-
-    invoke-interface {p0}, Landroid/view/MenuItem;->getItemId()I
-
-    return-void
-.end method
-
-.method static synthetic lambda$showFriendRequestDeleteConfirmationDialog$11(Landroidx/appcompat/app/AlertDialog;Landroid/view/View;)V
-    .locals 0
-
-    invoke-virtual {p0}, Landroidx/appcompat/app/AlertDialog;->cancel()V
-
-    return-void
-.end method
-
-.method public static launch(Landroid/content/Context;J)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-static {p0, p1, p2, v0}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;JLjava/lang/Long;)V
-
-    return-void
-.end method
-
-.method public static launch(Landroid/content/Context;JLjava/lang/Long;)V
-    .locals 2
-
-    new-instance v0, Landroid/content/Intent;
-
-    invoke-direct {v0}, Landroid/content/Intent;-><init>()V
-
-    const-string v1, "com.discord.intent.extra.EXTRA_USER_ID"
-
-    invoke-virtual {v0, v1, p1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
-
-    move-result-object p1
-
-    const-string p2, "com.discord.intent.extra.EXTRA_GUILD_ID"
-
-    invoke-virtual {p1, p2, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
-
-    move-result-object p1
-
-    const-class p2, Lcom/discord/widgets/user/WidgetUserProfile;
-
-    invoke-static {p0, p2, p1}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
-
-    return-void
-.end method
-
-.method private removeRelationship(I)V
-    .locals 4
-
-    invoke-static {}, Lcom/discord/utilities/rest/RestAPI;->getApi()Lcom/discord/utilities/rest/RestAPI;
-
-    move-result-object v0
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getUserId()J
-
-    move-result-wide v1
-
-    const-string v3, "User Profile"
-
-    invoke-virtual {v0, v3, v1, v2}, Lcom/discord/utilities/rest/RestAPI;->removeRelationship(Ljava/lang/String;J)Lrx/Observable;
-
-    move-result-object v0
-
-    invoke-static {p0}, Lcom/discord/app/i;->b(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$HrPwiAQVtsYNapd4r9mE-IoY5pA;
-
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$HrPwiAQVtsYNapd4r9mE-IoY5pA;-><init>(Lcom/discord/widgets/user/WidgetUserProfile;I)V
-
-    invoke-static {v1, p0}, Lcom/discord/app/i;->a(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
-
-    move-result-object p1
-
-    invoke-virtual {v0, p1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    return-void
-.end method
-
-.method private showFriendRequestDeleteConfirmationDialog(Lcom/discord/models/domain/ModelUser;)V
-    .locals 5
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    const v1, 0x7f0d011d
-
-    const/4 v2, 0x0
-
-    invoke-static {v0, v1, v2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
-
-    move-result-object v0
-
-    new-instance v1, Landroidx/appcompat/app/AlertDialog$Builder;
-
-    invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    invoke-direct {v1, v2}, Landroidx/appcompat/app/AlertDialog$Builder;-><init>(Landroid/content/Context;)V
-
-    invoke-virtual {v1, v0}, Landroidx/appcompat/app/AlertDialog$Builder;->setView(Landroid/view/View;)Landroidx/appcompat/app/AlertDialog$Builder;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Landroidx/appcompat/app/AlertDialog$Builder;->create()Landroidx/appcompat/app/AlertDialog;
-
-    move-result-object v1
-
-    invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    const/4 v3, 0x1
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
-
-    move-result-object p1
-
-    const/4 v4, 0x0
-
-    aput-object p1, v3, v4
-
-    const p1, 0x7f120c8b
-
-    invoke-virtual {v2, p1, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lcom/discord/utilities/textprocessing/Parsers;->parseBoldMarkdown(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-
-    move-result-object p1
-
-    const v2, 0x7f0a02e9
-
-    invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v2
-
-    check-cast v2, Landroid/widget/TextView;
-
-    invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    const p1, 0x7f0a02eb
-
-    invoke-virtual {v0, p1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    new-instance v2, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pTcsxMHJ6vNo1TnxG_0yZkgkG8g;
-
-    invoke-direct {v2, p0, v1}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$pTcsxMHJ6vNo1TnxG_0yZkgkG8g;-><init>(Lcom/discord/widgets/user/WidgetUserProfile;Landroidx/appcompat/app/AlertDialog;)V
-
-    invoke-virtual {p1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    const p1, 0x7f0a02ea
-
-    invoke-virtual {v0, p1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$HXRkbvqAAkLwoWX3pFGP7GV-hZ8;
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$HXRkbvqAAkLwoWX3pFGP7GV-hZ8;-><init>(Landroidx/appcompat/app/AlertDialog;)V
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-virtual {v1}, Landroidx/appcompat/app/AlertDialog;->show()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getContentViewResId()I
-    .locals 1
-
-    const v0, 0x7f0d01cc
-
-    return v0
-.end method
-
-.method public synthetic lambda$addRelationship$5$WidgetUserProfile(ILjava/lang/Void;)V
-    .locals 0
-
-    invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
-
-    return-void
-.end method
-
-.method public synthetic lambda$configureActionButtons$6$WidgetUserProfile(Landroid/view/View;)V
-    .locals 1
-
-    const/4 p1, 0x0
-
-    const v0, 0x7f120689
-
-    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V
-
-    return-void
-.end method
-
-.method public synthetic lambda$configureActionButtons$7$WidgetUserProfile(Lcom/discord/widgets/user/WidgetUserProfile$Model;Landroid/view/View;)V
-    .locals 0
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfile$Model;->access$200(Lcom/discord/widgets/user/WidgetUserProfile$Model;)Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->showFriendRequestDeleteConfirmationDialog(Lcom/discord/models/domain/ModelUser;)V
-
-    return-void
-.end method
-
-.method public synthetic lambda$configureActionButtons$8$WidgetUserProfile(Landroid/view/View;)V
-    .locals 1
-
-    const/4 p1, 0x0
-
-    const v0, 0x7f12002e
-
-    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V
-
-    return-void
-.end method
-
-.method public synthetic lambda$configureActionButtons$9$WidgetUserProfile(Landroid/view/View;)V
-    .locals 0
-
-    const p1, 0x7f120682
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V
-
-    return-void
-.end method
-
-.method public synthetic lambda$configureUI$1$WidgetUserProfile(Lcom/discord/widgets/user/WidgetUserProfile$Model;Landroid/view/MenuItem;Landroid/content/Context;)V
-    .locals 0
-
-    invoke-interface {p2}, Landroid/view/MenuItem;->getItemId()I
-
-    move-result p2
-
-    const p3, 0x7f0a044a
-
-    if-eq p2, p3, :cond_0
-
-    packed-switch p2, :pswitch_data_0
-
-    goto :goto_0
-
-    :pswitch_0
-    const p1, 0x7f12122b
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V
-
-    return-void
-
-    :pswitch_1
-    const p1, 0x7f120679
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V
-
-    return-void
-
-    :pswitch_2
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->findAndSetDirectMessage(Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-
-    return-void
-
-    :pswitch_3
-    const p1, 0x7f120682
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V
-
-    return-void
-
-    :pswitch_4
-    const p1, 0x7f120680
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V
-
-    return-void
-
-    :pswitch_5
-    const/4 p1, 0x2
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    const p2, 0x7f12122a
-
-    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V
-
-    return-void
-
-    :cond_0
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getContext()Landroid/content/Context;
-
-    move-result-object p1
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getUserId()J
-
-    move-result-wide p2
-
-    invoke-static {p2, p3}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-static {p1, p2}, Lcom/discord/app/h;->d(Landroid/content/Context;Ljava/lang/CharSequence;)V
-
-    :goto_0
-    return-void
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x7f0a0469
-        :pswitch_5
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method public synthetic lambda$configureUI$2$WidgetUserProfile(Landroid/view/Menu;)V
-    .locals 4
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getDeveloperMode()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x0
-
-    const v1, 0x7f0a044a
-
-    const v2, 0xffff
-
-    const v3, 0x7f120448
-
-    invoke-interface {p1, v0, v1, v2, v3}, Landroid/view/Menu;->add(IIII)Landroid/view/MenuItem;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    const v1, 0x7f040182
-
-    invoke-static {v0, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;I)I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v0, -0x1
-
-    :goto_0
-    invoke-interface {p1, v0}, Landroid/view/MenuItem;->setIcon(I)Landroid/view/MenuItem;
-
-    return-void
-.end method
-
-.method public synthetic lambda$configureUI$3$WidgetUserProfile(Lcom/discord/widgets/user/WidgetUserProfile$Model;Landroid/view/View;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->findAndSetDirectMessage(Lcom/discord/widgets/user/WidgetUserProfile$Model;)V
-
-    return-void
-.end method
-
-.method public synthetic lambda$removeRelationship$4$WidgetUserProfile(ILjava/lang/Void;)V
-    .locals 0
-
-    invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
-
-    return-void
-.end method
-
-.method public synthetic lambda$showFriendRequestDeleteConfirmationDialog$10$WidgetUserProfile(Landroidx/appcompat/app/AlertDialog;Landroid/view/View;)V
-    .locals 0
-
-    invoke-virtual {p1}, Landroidx/appcompat/app/AlertDialog;->dismiss()V
-
-    const p1, 0x7f120680
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V
-
-    return-void
-.end method
-
-.method public onPause()V
-    .locals 7
-
-    invoke-super {p0}, Lcom/discord/app/AppFragment;->onPause()V
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getUserId()J
-
-    move-result-wide v0
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getGuildId()J
-
-    move-result-wide v2
-
-    const-wide/16 v4, 0x0
-
-    cmp-long v6, v0, v4
-
-    if-lez v6, :cond_0
-
-    cmp-long v6, v2, v4
-
-    if-lez v6, :cond_0
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getGuildSubscriptions()Lcom/discord/stores/StoreGuildSubscriptions;
-
-    move-result-object v4
-
-    invoke-virtual {v4, v2, v3, v0, v1}, Lcom/discord/stores/StoreGuildSubscriptions;->unsubscribeUser(JJ)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onViewBound(Landroid/view/View;)V
-    .locals 6
-
-    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
-
-    const v0, 0x7f0a07ab
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/utilities/simple_pager/SimplePager;
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
-
-    new-instance v1, Lcom/discord/widgets/user/WidgetUserProfile$1;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/user/WidgetUserProfile$1;-><init>(Lcom/discord/widgets/user/WidgetUserProfile;)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/simple_pager/SimplePager;->addOnPageChangeListener(Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;)V
-
-    const v0, 0x7f0a07a7
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->friendRequestIncomingContainer:Landroid/view/View;
-
-    const v0, 0x7f0a07a8
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->friendRequestSentBtn:Landroid/view/View;
-
-    const v0, 0x7f0a07a4
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->friendRequestBtn:Landroid/view/View;
-
-    const v0, 0x7f0a07a5
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->friendRequestAcceptBtn:Landroid/view/View;
-
-    const v0, 0x7f0a07a6
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->friendRequestIgnoreBtn:Landroid/view/View;
-
-    const v0, 0x7f0a07aa
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->sendMessageFab:Landroid/view/View;
-
-    const v0, 0x7f0a0034
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/google/android/material/tabs/TabLayout;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfile;->tabs:Lcom/google/android/material/tabs/TabLayout;
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
-
-    const p1, 0x7f120e6f
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarTitle(I)Lkotlin/Unit;
-
-    sget-object p1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$q79NbGnrUXia_rHK0TUt2jMuoV4;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$q79NbGnrUXia_rHK0TUt2jMuoV4;
-
-    const v0, 0x7f0e001c
-
-    invoke-virtual {p0, v0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarOptionsMenu(ILrx/functions/Action2;)Landroidx/appcompat/widget/Toolbar;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
-
-    new-instance v0, Lcom/discord/utilities/simple_pager/SimplePager$Adapter;
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
-
-    move-result-object v1
-
-    const/4 v2, 0x3
-
-    new-array v2, v2, [Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
-
-    new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
-
-    const v4, 0x7f12122c
-
-    invoke-virtual {p0, v4}, Lcom/discord/widgets/user/WidgetUserProfile;->getString(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    sget-object v5, Lcom/discord/widgets/user/-$$Lambda$GGHkkpA44h-rGxuFMr2sE_vkDlY;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$GGHkkpA44h-rGxuFMr2sE_vkDlY;
-
-    invoke-direct {v3, v4, v5}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-
-    const/4 v4, 0x0
-
-    aput-object v3, v2, v4
-
-    new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
-
-    const v4, 0x7f120b89
-
-    invoke-virtual {p0, v4}, Lcom/discord/widgets/user/WidgetUserProfile;->getString(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    sget-object v5, Lcom/discord/widgets/user/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
-
-    invoke-direct {v3, v4, v5}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-
-    const/4 v4, 0x1
-
-    aput-object v3, v2, v4
-
-    new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
-
-    const v4, 0x7f120b88
-
-    invoke-virtual {p0, v4}, Lcom/discord/widgets/user/WidgetUserProfile;->getString(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    sget-object v5, Lcom/discord/widgets/user/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
-
-    invoke-direct {v3, v4, v5}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-
-    const/4 v4, 0x2
-
-    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
-
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfile;->tabs:Lcom/google/android/material/tabs/TabLayout;
-
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/simple_pager/SimplePager;->setTabLayout(Lcom/google/android/material/tabs/TabLayout;)V
-
-    return-void
-.end method
-
-.method public onViewBoundOrOnResume()V
-    .locals 7
-
-    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getUserId()J
-
-    move-result-wide v0
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->getGuildId()J
-
-    move-result-wide v2
-
-    const-wide/16 v4, 0x0
-
-    cmp-long v6, v0, v4
-
-    if-lez v6, :cond_0
-
-    cmp-long v6, v2, v4
-
-    if-lez v6, :cond_0
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getGuildSubscriptions()Lcom/discord/stores/StoreGuildSubscriptions;
-
-    move-result-object v4
-
-    invoke-virtual {v4, v2, v3, v0, v1}, Lcom/discord/stores/StoreGuildSubscriptions;->subscribeUser(JJ)V
-
-    :cond_0
-    invoke-static {v0, v1}, Lcom/discord/widgets/user/WidgetUserProfile$Model;->get(J)Lrx/Observable;
-
-    move-result-object v0
-
-    invoke-static {p0}, Lcom/discord/app/i;->b(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$XVSv-upShbk6Qfx9qmjCxZ9TRhc;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$XVSv-upShbk6Qfx9qmjCxZ9TRhc;-><init>(Lcom/discord/widgets/user/WidgetUserProfile;)V
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v2
-
-    invoke-static {v1, v2}, Lcom/discord/app/i;->a(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali
deleted file mode 100644
index c3a5b33c86..0000000000
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali
+++ /dev/null
@@ -1,124 +0,0 @@
-.class final Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;
-.super Ljava/lang/Object;
-.source "WidgetUserProfileHeader.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getBadgeClickListener(Lcom/discord/app/AppFragment;)Landroid/view/View$OnClickListener;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $fragment:Lcom/discord/app/AppFragment;
-
-.field final synthetic this$0:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;Lcom/discord/app/AppFragment;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;->this$0:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;->$fragment:Lcom/discord/app/AppFragment;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 8
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;->this$0:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getShowPremiumUpSell()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    sget-object p1, Lcom/discord/a/a;->ww:Lcom/discord/a/a$a;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;->$fragment:Lcom/discord/app/AppFragment;
-
-    invoke-virtual {p1}, Lcom/discord/app/AppFragment;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
-
-    move-result-object v0
-
-    const-string p1, "fragment.requireFragmentManager()"
-
-    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v1, 0x5
-
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;->$fragment:Lcom/discord/app/AppFragment;
-
-    const v2, 0x7f120e53
-
-    invoke-virtual {p1, v2}, Lcom/discord/app/AppFragment;->getString(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    const/4 v3, 0x0
-
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;->this$0:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getObjectType()Ljava/lang/String;
-
-    move-result-object v6
-
-    const/16 v7, 0x18
-
-    const-string v4, "Profile Modal"
-
-    const-string v5, "Badge"
-
-    invoke-static/range {v0 .. v7}, Lcom/discord/a/a$a;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
-
-    return-void
-
-    :cond_0
-    const-string v0, "it"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;->this$0:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getTooltip()Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;->this$0:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getText()Ljava/lang/String;
-
-    move-result-object v0
-
-    :goto_0
-    check-cast v0, Ljava/lang/CharSequence;
-
-    invoke-static {p1, v0}, Lcom/discord/app/h;->a(Landroid/content/Context;Ljava/lang/CharSequence;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1.smali
deleted file mode 100644
index f623d135f0..0000000000
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1.smali
+++ /dev/null
@@ -1,165 +0,0 @@
-.class final Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1;
-.super Ljava/lang/Object;
-.source "WidgetUserProfileHeader.kt"
-
-# interfaces
-.implements Lrx/functions/Func7;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;->get(J)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    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;",
-        "T6:",
-        "Ljava/lang/Object;",
-        "T7:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Func7<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TR;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1;
-
-    return-void
-.end method
-
-.method 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/models/domain/ModelUser;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelExperiment;Lcom/discord/models/domain/ModelUserProfile;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelApplicationStream;)Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
-    .locals 10
-
-    const/4 v0, 0x0
-
-    if-eqz p4, :cond_0
-
-    invoke-virtual {p4}, Lcom/discord/models/domain/ModelExperiment;->getBucket()I
-
-    move-result v1
-
-    move v7, v1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v7, 0x0
-
-    :goto_0
-    if-eqz p1, :cond_2
-
-    invoke-static {p2}, Lcom/discord/models/domain/ModelUserRelationship;->getType(Ljava/lang/Integer;)I
-
-    move-result v4
-
-    if-eqz p7, :cond_1
-
-    const/4 v0, 0x1
-
-    const/4 v9, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v9, 0x0
-
-    :goto_1
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
-
-    const-string v1, "profile"
-
-    move-object v6, p5
-
-    invoke-static {p5, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v1, "meUser"
-
-    move-object/from16 v2, p6
-
-    invoke-static {v2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual/range {p6 .. p6}, Lcom/discord/models/domain/ModelUser;->isPremium()Z
-
-    move-result v8
-
-    move-object v2, v0
-
-    move-object v3, p1
-
-    move-object v5, p3
-
-    invoke-direct/range {v2 .. v9}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;-><init>(Lcom/discord/models/domain/ModelUser;ILcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUserProfile;IZZ)V
-
-    return-object v0
-
-    :cond_2
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
-
-    check-cast p2, Ljava/lang/Integer;
-
-    check-cast p3, Lcom/discord/models/domain/ModelPresence;
-
-    check-cast p4, Lcom/discord/models/domain/ModelExperiment;
-
-    check-cast p5, Lcom/discord/models/domain/ModelUserProfile;
-
-    check-cast p6, Lcom/discord/models/domain/ModelUser;
-
-    check-cast p7, Lcom/discord/models/domain/ModelApplicationStream;
-
-    invoke-virtual/range {p0 .. p7}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1;->call(Lcom/discord/models/domain/ModelUser;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelExperiment;Lcom/discord/models/domain/ModelUserProfile;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelApplicationStream;)Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$getMe$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$getMe$1.smali
deleted file mode 100644
index 7f852e7375..0000000000
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$getMe$1.smali
+++ /dev/null
@@ -1,108 +0,0 @@
-.class final synthetic Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$getMe$1;
-.super Lkotlin/jvm/internal/j;
-.source "WidgetUserProfileHeader.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;->getMe()Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1018
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/j;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Long;",
-        "Lrx/Observable<",
-        "Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;",
-        ">;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;)V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)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/widgets/user/WidgetUserProfileHeader$Model$Companion;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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 final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Ljava/lang/Number;
-
-    invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v0
-
-    invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$getMe$1;->invoke(J)Lrx/Observable;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final invoke(J)Lrx/Observable;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(J)",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$getMe$1;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;
-
-    invoke-virtual {v0, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;->get(J)Lrx/Observable;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion.smali
deleted file mode 100644
index 6756061c07..0000000000
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Companion.smali
+++ /dev/null
@@ -1,202 +0,0 @@
-.class public final Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;
-.super Ljava/lang/Object;
-.source "WidgetUserProfileHeader.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Companion"
-.end annotation
-
-
-# direct methods
-.method private 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/user/WidgetUserProfileHeader$Model$Companion;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final get(J)Lrx/Observable;
-    .locals 9
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(J)",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;",
-            ">;"
-        }
-    .end annotation
-
-    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
-
-    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreUser;->getUser(J)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;->getUserRelationships()Lcom/discord/stores/StoreUserRelationships;
-
-    move-result-object v0
-
-    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreUserRelationships;->get(J)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;->getPresences()Lcom/discord/stores/StoreUserPresence;
-
-    move-result-object v0
-
-    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreUserPresence;->getForUserId(J)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;->getExperiments()Lcom/discord/stores/StoreExperiments;
-
-    move-result-object v0
-
-    const/4 v4, 0x0
-
-    const-string v5, "2019-hypesquad_winner_badges"
-
-    const/4 v6, 0x2
-
-    invoke-static {v0, v5, v4, v6, v4}, 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
-
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserProfile()Lcom/discord/stores/StoreUserProfile;
-
-    move-result-object v0
-
-    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreUserProfile;->get(J)Lrx/Observable;
-
-    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;->getUsers()Lcom/discord/stores/StoreUser;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lrx/Observable;
-
-    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;->getApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
-
-    move-result-object v0
-
-    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming;->getForUser(J)Lrx/Observable;
-
-    move-result-object v7
-
-    sget-object p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$get$1;
-
-    move-object v8, p1
-
-    check-cast v8, Lrx/functions/Func7;
-
-    invoke-static/range {v1 .. v8}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func7;)Lrx/Observable;
-
-    move-result-object p1
-
-    const-string p2, "Observable\n          .co\u2026            }\n          }"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p1
-.end method
-
-.method public final getMe()Lrx/Observable;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;",
-            ">;"
-        }
-    .end annotation
-
-    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
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeId()Lrx/Observable;
-
-    move-result-object v1
-
-    const-string v0, "StoreStream\n          .getUsers()\n          .meId"
-
-    invoke-static {v1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-wide/16 v2, 0x1388
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x2
-
-    const/4 v6, 0x0
-
-    invoke-static/range {v1 .. v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$getMe$1;
-
-    move-object v2, p0
-
-    check-cast v2, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;
-
-    invoke-direct {v1, v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion$getMe$1;-><init>(Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    new-instance v2, Lcom/discord/widgets/user/WidgetUserProfileHeader$sam$rx_functions_Func1$0;
-
-    invoke-direct {v2, v1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$sam$rx_functions_Func1$0;-><init>(Lkotlin/jvm/functions/Function1;)V
-
-    check-cast v2, Lrx/functions/b;
-
-    invoke-virtual {v0, v2}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object v0
-
-    const-string v1, "StoreStream\n          .g\u2026        .switchMap(::get)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model.smali
deleted file mode 100644
index 7dc93d2b5b..0000000000
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model.smali
+++ /dev/null
@@ -1,602 +0,0 @@
-.class final Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
-.super Ljava/lang/Object;
-.source "WidgetUserProfileHeader.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/WidgetUserProfileHeader;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = "Model"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;,
-        Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;
-    }
-.end annotation
-
-
-# static fields
-.field public static final Companion:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;
-
-
-# instance fields
-.field private final hypeSquadEventWinner:I
-
-.field private final isApplicationStreaming:Z
-
-.field private final isMeUserPremium:Z
-
-.field private final presence:Lcom/discord/models/domain/ModelPresence;
-
-.field private final profile:Lcom/discord/models/domain/ModelUserProfile;
-
-.field private final relationshipType:I
-
-.field private final user:Lcom/discord/models/domain/ModelUser;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->Companion:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lcom/discord/models/domain/ModelUser;ILcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUserProfile;IZZ)V
-    .locals 1
-
-    const-string v0, "user"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "profile"
-
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    iput p2, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->relationshipType:I
-
-    iput-object p3, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    iput-object p4, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->profile:Lcom/discord/models/domain/ModelUserProfile;
-
-    iput p5, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->hypeSquadEventWinner:I
-
-    iput-boolean p6, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isMeUserPremium:Z
-
-    iput-boolean p7, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isApplicationStreaming:Z
-
-    return-void
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;Lcom/discord/models/domain/ModelUser;ILcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUserProfile;IZZILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
-    .locals 5
-
-    and-int/lit8 p9, p8, 0x1
-
-    if-eqz p9, :cond_0
-
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    :cond_0
-    and-int/lit8 p9, p8, 0x2
-
-    if-eqz p9, :cond_1
-
-    iget p2, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->relationshipType:I
-
-    :cond_1
-    move p9, p2
-
-    and-int/lit8 p2, p8, 0x4
-
-    if-eqz p2, :cond_2
-
-    iget-object p3, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    :cond_2
-    move-object v0, p3
-
-    and-int/lit8 p2, p8, 0x8
-
-    if-eqz p2, :cond_3
-
-    iget-object p4, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->profile:Lcom/discord/models/domain/ModelUserProfile;
-
-    :cond_3
-    move-object v1, p4
-
-    and-int/lit8 p2, p8, 0x10
-
-    if-eqz p2, :cond_4
-
-    iget p5, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->hypeSquadEventWinner:I
-
-    :cond_4
-    move v2, p5
-
-    and-int/lit8 p2, p8, 0x20
-
-    if-eqz p2, :cond_5
-
-    iget-boolean p6, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isMeUserPremium:Z
-
-    :cond_5
-    move v3, p6
-
-    and-int/lit8 p2, p8, 0x40
-
-    if-eqz p2, :cond_6
-
-    iget-boolean p7, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isApplicationStreaming:Z
-
-    :cond_6
-    move v4, p7
-
-    move-object p2, p0
-
-    move-object p3, p1
-
-    move p4, p9
-
-    move-object p5, v0
-
-    move-object p6, v1
-
-    move p7, v2
-
-    move p8, v3
-
-    move p9, v4
-
-    invoke-virtual/range {p2 .. p9}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->copy(Lcom/discord/models/domain/ModelUser;ILcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUserProfile;IZZ)Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final component1()Lcom/discord/models/domain/ModelUser;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    return-object v0
-.end method
-
-.method public final component2()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->relationshipType:I
-
-    return v0
-.end method
-
-.method public final component3()Lcom/discord/models/domain/ModelPresence;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    return-object v0
-.end method
-
-.method public final component4()Lcom/discord/models/domain/ModelUserProfile;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->profile:Lcom/discord/models/domain/ModelUserProfile;
-
-    return-object v0
-.end method
-
-.method public final component5()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->hypeSquadEventWinner:I
-
-    return v0
-.end method
-
-.method public final component6()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isMeUserPremium:Z
-
-    return v0
-.end method
-
-.method public final component7()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isApplicationStreaming:Z
-
-    return v0
-.end method
-
-.method public final copy(Lcom/discord/models/domain/ModelUser;ILcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUserProfile;IZZ)Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
-    .locals 9
-
-    const-string v0, "user"
-
-    move-object v2, p1
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "profile"
-
-    move-object v5, p4
-
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
-
-    move-object v1, v0
-
-    move v3, p2
-
-    move-object v4, p3
-
-    move v6, p5
-
-    move v7, p6
-
-    move/from16 v8, p7
-
-    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;-><init>(Lcom/discord/models/domain/ModelUser;ILcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUserProfile;IZZ)V
-
-    return-object v0
-.end method
-
-.method public final equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x1
-
-    if-eq p0, p1, :cond_5
-
-    instance-of v1, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_4
-
-    check-cast p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    iget-object v3, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_4
-
-    iget v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->relationshipType:I
-
-    iget v3, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->relationshipType:I
-
-    if-ne v1, v3, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_4
-
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    iget-object v3, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_4
-
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->profile:Lcom/discord/models/domain/ModelUserProfile;
-
-    iget-object v3, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->profile:Lcom/discord/models/domain/ModelUserProfile;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_4
-
-    iget v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->hypeSquadEventWinner:I
-
-    iget v3, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->hypeSquadEventWinner:I
-
-    if-ne v1, v3, :cond_1
-
-    const/4 v1, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_1
-    if-eqz v1, :cond_4
-
-    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isMeUserPremium:Z
-
-    iget-boolean v3, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isMeUserPremium:Z
-
-    if-ne v1, v3, :cond_2
-
-    const/4 v1, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v1, 0x0
-
-    :goto_2
-    if-eqz v1, :cond_4
-
-    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isApplicationStreaming:Z
-
-    iget-boolean p1, p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isApplicationStreaming:Z
-
-    if-ne v1, p1, :cond_3
-
-    const/4 p1, 0x1
-
-    goto :goto_3
-
-    :cond_3
-    const/4 p1, 0x0
-
-    :goto_3
-    if-eqz p1, :cond_4
-
-    goto :goto_4
-
-    :cond_4
-    return v2
-
-    :cond_5
-    :goto_4
-    return v0
-.end method
-
-.method public final getHypeSquadEventWinner()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->hypeSquadEventWinner:I
-
-    return v0
-.end method
-
-.method public final getPresence()Lcom/discord/models/domain/ModelPresence;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    return-object v0
-.end method
-
-.method public final getProfile()Lcom/discord/models/domain/ModelUserProfile;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->profile:Lcom/discord/models/domain/ModelUserProfile;
-
-    return-object v0
-.end method
-
-.method public final getRelationshipType()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->relationshipType:I
-
-    return v0
-.end method
-
-.method public final getUser()Lcom/discord/models/domain/ModelUser;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    return-object v0
-.end method
-
-.method public final hashCode()I
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    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 v2, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->relationshipType:I
-
-    add-int/2addr v0, v2
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v2
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_1
-    add-int/2addr v0, v2
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->profile:Lcom/discord/models/domain/ModelUserProfile;
-
-    if-eqz v2, :cond_2
-
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    :cond_2
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->hypeSquadEventWinner:I
-
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isMeUserPremium:Z
-
-    const/4 v2, 0x1
-
-    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/widgets/user/WidgetUserProfileHeader$Model;->isApplicationStreaming:Z
-
-    if-eqz v1, :cond_4
-
-    const/4 v1, 0x1
-
-    :cond_4
-    add-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public final isApplicationStreaming()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isApplicationStreaming:Z
-
-    return v0
-.end method
-
-.method public final isMeUserPremium()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isMeUserPremium:Z
-
-    return v0
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "Model(user="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", relationshipType="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->relationshipType:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v1, ", presence="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", profile="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->profile:Lcom/discord/models/domain/ModelUserProfile;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", hypeSquadEventWinner="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->hypeSquadEventWinner:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v1, ", isMeUserPremium="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isMeUserPremium:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const-string v1, ", isApplicationStreaming="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isApplicationStreaming:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const-string v1, ")"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1.smali
deleted file mode 100644
index 9b447c0396..0000000000
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1.smali
+++ /dev/null
@@ -1,69 +0,0 @@
-.class final Lcom/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetUserProfileHeader.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/WidgetUserProfileHeader;->onViewBoundOrOnResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/user/WidgetUserProfileHeader;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/user/WidgetUserProfileHeader;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/user/WidgetUserProfileHeader;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;)V
-
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/user/WidgetUserProfileHeader;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->access$configureUI(Lcom/discord/widgets/user/WidgetUserProfileHeader;Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$sam$rx_functions_Func1$0.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$sam$rx_functions_Func1$0.smali
deleted file mode 100644
index 95a17e1062..0000000000
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$sam$rx_functions_Func1$0.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class final Lcom/discord/widgets/user/WidgetUserProfileHeader$sam$rx_functions_Func1$0;
-.super Ljava/lang/Object;
-.source "WidgetUserProfileHeader.kt"
-
-# interfaces
-.implements Lrx/functions/b;
-
-
-# instance fields
-.field private final synthetic function:Lkotlin/jvm/functions/Function1;
-
-
-# direct methods
-.method constructor <init>(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$sam$rx_functions_Func1$0;->function:Lkotlin/jvm/functions/Function1;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$sam$rx_functions_Func1$0;->function:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali
deleted file mode 100644
index 7f9b691293..0000000000
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali
+++ /dev/null
@@ -1,1644 +0,0 @@
-.class public final Lcom/discord/widgets/user/WidgetUserProfileHeader;
-.super Lcom/discord/app/AppFragment;
-.source "WidgetUserProfileHeader.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;
-    }
-.end annotation
-
-
-# static fields
-.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-
-# instance fields
-.field private final imagesChangeDetector:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
-
-.field private final userAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final userBadgeText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final userBadgeWrapOuter$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final userBadgesWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final userName$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final userPresenceView$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final userStatusView$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 6
-
-    const-class v0, Lcom/discord/widgets/user/WidgetUserProfileHeader;
-
-    const/4 v1, 0x7
-
-    new-array v1, v1, [Lkotlin/reflect/KProperty;
-
-    new-instance v2, Lkotlin/jvm/internal/v;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v3
-
-    const-string v4, "userAvatar"
-
-    const-string v5, "getUserAvatar()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
-
-    move-result-object v2
-
-    check-cast v2, Lkotlin/reflect/KProperty;
-
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    new-instance v2, Lkotlin/jvm/internal/v;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v3
-
-    const-string v4, "userPresenceView"
-
-    const-string v5, "getUserPresenceView()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
-
-    move-result-object v2
-
-    check-cast v2, Lkotlin/reflect/KProperty;
-
-    const/4 v3, 0x1
-
-    aput-object v2, v1, v3
-
-    new-instance v2, Lkotlin/jvm/internal/v;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v3
-
-    const-string v4, "userStatusView"
-
-    const-string v5, "getUserStatusView()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
-
-    move-result-object v2
-
-    check-cast v2, Lkotlin/reflect/KProperty;
-
-    const/4 v3, 0x2
-
-    aput-object v2, v1, v3
-
-    new-instance v2, Lkotlin/jvm/internal/v;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v3
-
-    const-string v4, "userName"
-
-    const-string v5, "getUserName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
-
-    move-result-object v2
-
-    check-cast v2, Lkotlin/reflect/KProperty;
-
-    const/4 v3, 0x3
-
-    aput-object v2, v1, v3
-
-    new-instance v2, Lkotlin/jvm/internal/v;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v3
-
-    const-string v4, "userBadgeWrapOuter"
-
-    const-string v5, "getUserBadgeWrapOuter()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
-
-    move-result-object v2
-
-    check-cast v2, Lkotlin/reflect/KProperty;
-
-    const/4 v3, 0x4
-
-    aput-object v2, v1, v3
-
-    new-instance v2, Lkotlin/jvm/internal/v;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v3
-
-    const-string v4, "userBadgesWrap"
-
-    const-string v5, "getUserBadgesWrap()Landroid/view/ViewGroup;"
-
-    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
-
-    move-result-object v2
-
-    check-cast v2, Lkotlin/reflect/KProperty;
-
-    const/4 v3, 0x5
-
-    aput-object v2, v1, v3
-
-    new-instance v2, Lkotlin/jvm/internal/v;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v0
-
-    const-string v3, "userBadgeText"
-
-    const-string v4, "getUserBadgeText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x6
-
-    aput-object v0, v1, v2
-
-    sput-object v1, Lcom/discord/widgets/user/WidgetUserProfileHeader;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
-
-    const v0, 0x7f0a0531
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0536
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userPresenceView$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0530
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userStatusView$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0537
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userName$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0535
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userBadgeWrapOuter$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a07a9
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userBadgesWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0533
-
-    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userBadgeText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    new-instance v0, Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
-
-    invoke-direct {v0}, Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;-><init>()V
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->imagesChangeDetector:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
-
-    return-void
-.end method
-
-.method public static final synthetic access$configureUI(Lcom/discord/widgets/user/WidgetUserProfileHeader;Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->configureUI(Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;)V
-
-    return-void
-.end method
-
-.method private final configureUI(Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;)V
-    .locals 20
-
-    move-object/from16 v0, p0
-
-    if-nez p1, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserAvatar()Landroid/widget/ImageView;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v2
-
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v2
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v3
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getAvatar()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v4
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getDiscriminator()I
-
-    move-result v4
-
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v4
-
-    const/4 v8, 0x1
-
-    invoke-static {v2, v3, v4, v8}, Lcom/discord/utilities/icon/IconUtils;->getForUser(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;Z)Ljava/lang/String;
-
-    move-result-object v2
-
-    const v3, 0x7f070056
-
-    const/4 v4, 0x0
-
-    iget-object v5, v0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->imagesChangeDetector:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
-
-    check-cast v5, Lcom/discord/utilities/images/MGImages$ChangeDetector;
-
-    const/16 v6, 0x8
-
-    const/4 v7, 0x0
-
-    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-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->getProfile()Lcom/discord/models/domain/ModelUserProfile;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->getHypeSquadEventWinner()I
-
-    move-result v2
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isMeUserPremium()Z
-
-    move-result v3
-
-    invoke-direct {v0, v1, v2, v3}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeInfo(Lcom/discord/models/domain/ModelUserProfile;IZ)Ljava/util/List;
-
-    move-result-object v1
-
-    invoke-static {v1}, Lkotlin/a/m;->ac(Ljava/util/List;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    if-nez v2, :cond_1
-
-    new-instance v2, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    const/4 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, 0x3f
-
-    const/16 v17, 0x0
-
-    move-object v9, v2
-
-    invoke-direct/range {v9 .. v17}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    :cond_1
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserName()Landroid/widget/TextView;
-
-    move-result-object v3
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v4
-
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getContext()Landroid/content/Context;
-
-    move-result-object v5
-
-    const v6, 0x7f040292
-
-    invoke-static {v5, v6}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
-
-    move-result v5
-
-    invoke-virtual {v4, v5}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator(I)Ljava/lang/CharSequence;
-
-    move-result-object v4
-
-    invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeText()Landroid/widget/TextView;
-
-    move-result-object v3
-
-    invoke-virtual {v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getText()Ljava/lang/String;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/lang/CharSequence;
-
-    invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeText()Landroid/widget/TextView;
-
-    move-result-object v3
-
-    invoke-virtual {v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getTextColor()I
-
-    move-result v4
-
-    invoke-virtual {v3, v4}, Landroid/widget/TextView;->setTextColor(I)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeText()Landroid/widget/TextView;
-
-    move-result-object v3
-
-    check-cast v3, Landroid/view/View;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v4
-
-    const/4 v5, 0x0
-
-    if-ne v4, v8, :cond_2
-
-    const/4 v4, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v4, 0x0
-
-    :goto_0
-    const/4 v6, 0x2
-
-    const/4 v7, 0x0
-
-    invoke-static {v3, v4, v5, v6, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeWrapOuter()Landroid/view/View;
-
-    move-result-object v3
-
-    move-object v4, v1
-
-    check-cast v4, Ljava/util/Collection;
-
-    invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v4
-
-    xor-int/2addr v4, v8
-
-    invoke-static {v3, v4, v5, v6, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgeWrapOuter()Landroid/view/View;
-
-    move-result-object v3
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v4
-
-    if-ne v4, v8, :cond_3
-
-    move-object v4, v0
-
-    check-cast v4, Lcom/discord/app/AppFragment;
-
-    invoke-virtual {v2, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getBadgeClickListener(Lcom/discord/app/AppFragment;)Landroid/view/View$OnClickListener;
-
-    move-result-object v2
-
-    goto :goto_1
-
-    :cond_3
-    move-object v2, v7
-
-    :goto_1
-    invoke-virtual {v3, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserBadgesWrap()Landroid/view/ViewGroup;
-
-    move-result-object v2
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v3
-
-    invoke-virtual {v2}, Landroid/view/ViewGroup;->getChildCount()I
-
-    move-result v4
-
-    sub-int/2addr v3, v4
-
-    invoke-static {v5, v3}, Ljava/lang/Math;->max(II)I
-
-    move-result v3
-
-    invoke-static {v5, v3}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/Iterable;
-
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    :goto_2
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_4
-
-    move-object v4, v3
-
-    check-cast v4, Lkotlin/a/ab;
-
-    invoke-virtual {v4}, Lkotlin/a/ab;->nextInt()I
-
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getLayoutInflater()Landroid/view/LayoutInflater;
-
-    move-result-object v4
-
-    const v9, 0x7f0d01d2
-
-    invoke-virtual {v4, v9, v2, v8}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
-
-    goto :goto_2
-
-    :cond_4
-    invoke-virtual {v2}, Landroid/view/ViewGroup;->getChildCount()I
-
-    move-result v3
-
-    invoke-static {v5, v3}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/Iterable;
-
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    :goto_3
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_8
-
-    move-object v4, v3
-
-    check-cast v4, Lkotlin/a/ab;
-
-    invoke-virtual {v4}, Lkotlin/a/ab;->nextInt()I
-
-    move-result v4
-
-    invoke-virtual {v2, v4}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
-
-    move-result-object v9
-
-    if-eqz v9, :cond_7
-
-    check-cast v9, Landroid/widget/ImageView;
-
-    if-ltz v4, :cond_5
-
-    invoke-static {v1}, Lkotlin/a/m;->Y(Ljava/util/List;)I
-
-    move-result v10
-
-    if-gt v4, v10, :cond_5
-
-    invoke-interface {v1, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v10
-
-    goto :goto_4
-
-    :cond_5
-    new-instance v10, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x0
-
-    const/4 v14, 0x0
-
-    const/4 v15, 0x0
-
-    const/16 v16, 0x0
-
-    const/16 v17, 0x0
-
-    const/16 v18, 0x3f
-
-    const/16 v19, 0x0
-
-    move-object v11, v10
-
-    invoke-direct/range {v11 .. v19}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    :goto_4
-    check-cast v10, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    move-object v11, v9
-
-    check-cast v11, Landroid/view/View;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v12
-
-    if-le v12, v4, :cond_6
-
-    const/4 v4, 0x1
-
-    goto :goto_5
-
-    :cond_6
-    const/4 v4, 0x0
-
-    :goto_5
-    invoke-static {v11, v4, v5, v6, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    invoke-virtual {v10}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getIcon()I
-
-    move-result v4
-
-    invoke-virtual {v9, v4}, Landroid/widget/ImageView;->setImageResource(I)V
-
-    move-object v4, v0
-
-    check-cast v4, Lcom/discord/app/AppFragment;
-
-    invoke-virtual {v10, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;->getBadgeClickListener(Lcom/discord/app/AppFragment;)Landroid/view/View$OnClickListener;
-
-    move-result-object v4
-
-    invoke-virtual {v9, v4}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    goto :goto_3
-
-    :cond_7
-    new-instance v1, Lkotlin/r;
-
-    const-string v2, "null cannot be cast to non-null type android.widget.ImageView"
-
-    invoke-direct {v1, v2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_8
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->isApplicationStreaming()Z
-
-    move-result v2
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserPresenceView()Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    move-result-object v3
-
-    check-cast v3, Landroid/widget/ImageView;
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getUserStatusView()Landroid/widget/TextView;
-
-    move-result-object v4
-
-    invoke-static {v1, v2, v3, v4}, Lcom/discord/utilities/presence/PresenceUtils;->setPresence(Lcom/discord/models/domain/ModelPresence;ZLandroid/widget/ImageView;Landroid/widget/TextView;)V
-
-    return-void
-.end method
-
-.method private final getUserAvatar()Landroid/widget/ImageView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileHeader;->$$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/ImageView;
-
-    return-object v0
-.end method
-
-.method private final getUserBadgeInfo(Lcom/discord/models/domain/ModelUserProfile;IZ)Ljava/util/List;
-    .locals 18
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/models/domain/ModelUserProfile;",
-            "IZ)",
-            "Ljava/util/List<",
-            "Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;",
-            ">;"
-        }
-    .end annotation
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    move/from16 v2, p2
-
-    new-instance v3, Ljava/util/ArrayList;
-
-    const/16 v4, 0x8
-
-    invoke-direct {v3, v4}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v4
-
-    const-string v5, "profile.user"
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    new-instance v4, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    const v7, 0x7f080340
-
-    move-object v6, v0
-
-    check-cast v6, Landroidx/fragment/app/Fragment;
-
-    const v8, 0x7f06002c
-
-    invoke-static {v6, v8}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
-
-    move-result v8
-
-    const v6, 0x7f121064
-
-    invoke-virtual {v0, v6}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
-
-    move-result-object v9
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x0
-
-    const/4 v12, 0x0
-
-    const/16 v13, 0x38
-
-    const/4 v14, 0x0
-
-    move-object v6, v4
-
-    invoke-direct/range {v6 .. v14}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v3, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_0
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v4
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isPartner()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_1
-
-    new-instance v4, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    const v7, 0x7f08033a
-
-    move-object v6, v0
-
-    check-cast v6, Landroidx/fragment/app/Fragment;
-
-    const v8, 0x7f06008a
-
-    invoke-static {v6, v8}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
-
-    move-result v8
-
-    const v6, 0x7f120ccd
-
-    invoke-virtual {v0, v6}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
-
-    move-result-object v9
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x0
-
-    const/4 v12, 0x0
-
-    const/16 v13, 0x38
-
-    const/4 v14, 0x0
-
-    move-object v6, v4
-
-    invoke-direct/range {v6 .. v14}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v3, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_1
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v4
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isHypeSquad()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_2
-
-    new-instance v4, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    const v7, 0x7f080338
-
-    move-object v6, v0
-
-    check-cast v6, Landroidx/fragment/app/Fragment;
-
-    const v8, 0x7f060126
-
-    invoke-static {v6, v8}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
-
-    move-result v8
-
-    const v6, 0x7f1208ee
-
-    invoke-virtual {v0, v6}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
-
-    move-result-object v9
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x0
-
-    const/4 v12, 0x0
-
-    const/16 v13, 0x38
-
-    const/4 v14, 0x0
-
-    move-object v6, v4
-
-    invoke-direct/range {v6 .. v14}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v3, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_2
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v4
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isHypesquadHouse1()Z
-
-    move-result v4
-
-    const v6, 0x7f1208ff
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x1
-
-    if-eqz v4, :cond_5
-
-    if-ne v2, v8, :cond_3
-
-    const/4 v4, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    const/4 v4, 0x0
-
-    :goto_0
-    new-instance v15, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    if-eqz v4, :cond_4
-
-    const v4, 0x7f0802b7
-
-    const v10, 0x7f0802b7
-
-    goto :goto_1
-
-    :cond_4
-    const v4, 0x7f0802b6
-
-    const v10, 0x7f0802b6
-
-    :goto_1
-    move-object v4, v0
-
-    check-cast v4, Landroidx/fragment/app/Fragment;
-
-    const v9, 0x7f060082
-
-    invoke-static {v4, v9}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
-
-    move-result v11
-
-    const v4, 0x7f1208f6
-
-    invoke-virtual {v0, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
-
-    move-result-object v12
-
-    new-array v9, v8, [Ljava/lang/Object;
-
-    invoke-virtual {v0, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    aput-object v4, v9, v7
-
-    invoke-virtual {v0, v6, v9}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v13
-
-    const/4 v14, 0x0
-
-    const/4 v4, 0x0
-
-    const/16 v16, 0x30
-
-    const/16 v17, 0x0
-
-    move-object v9, v15
-
-    move-object v6, v15
-
-    move-object v15, v4
-
-    invoke-direct/range {v9 .. v17}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v3, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_5
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v4
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isHypesquadHouse2()Z
-
-    move-result v4
-
-    const/4 v6, 0x2
-
-    if-eqz v4, :cond_8
-
-    if-ne v2, v6, :cond_6
-
-    const/4 v4, 0x1
-
-    goto :goto_2
-
-    :cond_6
-    const/4 v4, 0x0
-
-    :goto_2
-    new-instance v15, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    if-eqz v4, :cond_7
-
-    const v4, 0x7f0802b9
-
-    const v10, 0x7f0802b9
-
-    goto :goto_3
-
-    :cond_7
-    const v4, 0x7f0802b8
-
-    const v10, 0x7f0802b8
-
-    :goto_3
-    move-object v4, v0
-
-    check-cast v4, Landroidx/fragment/app/Fragment;
-
-    const v9, 0x7f060083
-
-    invoke-static {v4, v9}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
-
-    move-result v11
-
-    const v4, 0x7f1208f7
-
-    invoke-virtual {v0, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
-
-    move-result-object v12
-
-    new-array v9, v8, [Ljava/lang/Object;
-
-    invoke-virtual {v0, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    aput-object v4, v9, v7
-
-    const v4, 0x7f1208ff
-
-    invoke-virtual {v0, v4, v9}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v13
-
-    const/4 v14, 0x0
-
-    const/4 v4, 0x0
-
-    const/16 v16, 0x30
-
-    const/16 v17, 0x0
-
-    move-object v9, v15
-
-    move-object v6, v15
-
-    move-object v15, v4
-
-    invoke-direct/range {v9 .. v17}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v3, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_8
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v4
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isHypesquadHouse3()Z
-
-    move-result v4
-
-    const/4 v6, 0x3
-
-    if-eqz v4, :cond_b
-
-    if-ne v2, v6, :cond_9
-
-    const/4 v2, 0x1
-
-    goto :goto_4
-
-    :cond_9
-    const/4 v2, 0x0
-
-    :goto_4
-    new-instance v4, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    if-eqz v2, :cond_a
-
-    const v2, 0x7f0802bb
-
-    const v10, 0x7f0802bb
-
-    goto :goto_5
-
-    :cond_a
-    const v2, 0x7f0802ba
-
-    const v10, 0x7f0802ba
-
-    :goto_5
-    move-object v2, v0
-
-    check-cast v2, Landroidx/fragment/app/Fragment;
-
-    const v9, 0x7f060084
-
-    invoke-static {v2, v9}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
-
-    move-result v11
-
-    const v2, 0x7f1208f8
-
-    invoke-virtual {v0, v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
-
-    move-result-object v12
-
-    new-array v9, v8, [Ljava/lang/Object;
-
-    invoke-virtual {v0, v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    aput-object v2, v9, v7
-
-    const v2, 0x7f1208ff
-
-    invoke-virtual {v0, v2, v9}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v13
-
-    const/4 v14, 0x0
-
-    const/4 v15, 0x0
-
-    const/16 v16, 0x30
-
-    const/16 v17, 0x0
-
-    move-object v9, v4
-
-    invoke-direct/range {v9 .. v17}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v3, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_b
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v2
-
-    invoke-static {v2, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->isBugHunter()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_c
-
-    new-instance v2, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    const v10, 0x7f080337
-
-    move-object v4, v0
-
-    check-cast v4, Landroidx/fragment/app/Fragment;
-
-    const v9, 0x7f060105
-
-    invoke-static {v4, v9}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
-
-    move-result v11
-
-    const v4, 0x7f120343
-
-    invoke-virtual {v0, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
-
-    move-result-object v12
-
-    const/4 v13, 0x0
-
-    const/4 v14, 0x0
-
-    const/4 v15, 0x0
-
-    const/16 v16, 0x38
-
-    const/16 v17, 0x0
-
-    move-object v9, v2
-
-    invoke-direct/range {v9 .. v17}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_c
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v2
-
-    invoke-static {v2, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->isPremiumEarlySupporter()Z
-
-    move-result v2
-
-    const v4, 0x7f04029b
-
-    if-eqz v2, :cond_d
-
-    new-instance v2, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    const v10, 0x7f08033b
-
-    move-object v5, v0
-
-    check-cast v5, Landroidx/fragment/app/Fragment;
-
-    invoke-static {v5, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroidx/fragment/app/Fragment;I)I
-
-    move-result v11
-
-    const v5, 0x7f120540
-
-    invoke-virtual {v0, v5}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
-
-    move-result-object v12
-
-    const/4 v13, 0x0
-
-    xor-int/lit8 v14, p3, 0x1
-
-    const/16 v16, 0x8
-
-    const/16 v17, 0x0
-
-    const-string v15, "PREMIUM_EARLY_SUPPORTER"
-
-    move-object v9, v2
-
-    invoke-direct/range {v9 .. v17}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_d
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->isPremium()Z
-
-    move-result v2
-
-    const v5, 0x7f120e31
-
-    if-eqz v2, :cond_e
-
-    new-instance v2, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    const v10, 0x7f080339
-
-    move-object v9, v0
-
-    check-cast v9, Landroidx/fragment/app/Fragment;
-
-    invoke-static {v9, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroidx/fragment/app/Fragment;I)I
-
-    move-result v11
-
-    invoke-virtual {v0, v5}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
-
-    move-result-object v12
-
-    const v9, 0x7f120d59
-
-    new-array v13, v8, [Ljava/lang/Object;
-
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->requireContext()Landroid/content/Context;
-
-    move-result-object v14
-
-    invoke-virtual {v1, v14}, Lcom/discord/models/domain/ModelUserProfile;->getPremiumSince(Landroid/content/Context;)Ljava/lang/String;
-
-    move-result-object v14
-
-    aput-object v14, v13, v7
-
-    invoke-virtual {v0, v9, v13}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v13
-
-    xor-int/lit8 v14, p3, 0x1
-
-    const-string v15, "PREMIUM"
-
-    move-object v9, v2
-
-    invoke-direct/range {v9 .. v15}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
-
-    invoke-virtual {v3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_e
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->isPremiumGuildSubscriber()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_12
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getPremiumGuildMonthsSubscribed()Ljava/lang/Integer;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
-
-    move-result v9
-
-    invoke-static {v9, v8}, Lkotlin/jvm/internal/k;->compare(II)I
-
-    move-result v9
-
-    if-gez v9, :cond_f
-
-    const v2, 0x7f08033c
-
-    const v10, 0x7f08033c
-
-    goto :goto_6
-
-    :cond_f
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
-
-    move-result v9
-
-    const/4 v10, 0x2
-
-    invoke-static {v9, v10}, Lkotlin/jvm/internal/k;->compare(II)I
-
-    move-result v9
-
-    if-gez v9, :cond_10
-
-    const v2, 0x7f08033d
-
-    const v10, 0x7f08033d
-
-    goto :goto_6
-
-    :cond_10
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
-
-    move-result v2
-
-    invoke-static {v2, v6}, Lkotlin/jvm/internal/k;->compare(II)I
-
-    move-result v2
-
-    if-gez v2, :cond_11
-
-    const v2, 0x7f08033e
-
-    const v10, 0x7f08033e
-
-    goto :goto_6
-
-    :cond_11
-    const v2, 0x7f08033f
-
-    const v10, 0x7f08033f
-
-    :goto_6
-    new-instance v2, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
-
-    move-object v6, v0
-
-    check-cast v6, Landroidx/fragment/app/Fragment;
-
-    invoke-static {v6, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroidx/fragment/app/Fragment;I)I
-
-    move-result v11
-
-    invoke-virtual {v0, v5}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
-
-    move-result-object v12
-
-    const v4, 0x7f120df2
-
-    new-array v5, v8, [Ljava/lang/Object;
-
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->requireContext()Landroid/content/Context;
-
-    move-result-object v6
-
-    invoke-virtual {v1, v6}, Lcom/discord/models/domain/ModelUserProfile;->getPremiumGuildSince(Landroid/content/Context;)Ljava/lang/String;
-
-    move-result-object v1
-
-    aput-object v1, v5, v7
-
-    invoke-virtual {v0, v4, v5}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v13
-
-    xor-int/lit8 v14, p3, 0x1
-
-    const-string v15, "PREMIUM_GUILD"
-
-    move-object v9, v2
-
-    invoke-direct/range {v9 .. v15}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;-><init>(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
-
-    invoke-virtual {v3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_12
-    check-cast v3, Ljava/util/List;
-
-    return-object v3
-.end method
-
-.method private final getUserBadgeText()Landroid/widget/TextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userBadgeText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileHeader;->$$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, Landroid/widget/TextView;
-
-    return-object v0
-.end method
-
-.method private final getUserBadgeWrapOuter()Landroid/view/View;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userBadgeWrapOuter$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileHeader;->$$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 getUserBadgesWrap()Landroid/view/ViewGroup;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userBadgesWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileHeader;->$$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, Landroid/view/ViewGroup;
-
-    return-object v0
-.end method
-
-.method private final getUserName()Landroid/widget/TextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userName$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileHeader;->$$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 private final getUserPresenceView()Lcom/facebook/drawee/view/SimpleDraweeView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userPresenceView$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileHeader;->$$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/facebook/drawee/view/SimpleDraweeView;
-
-    return-object v0
-.end method
-
-.method private final getUserStatusView()Landroid/widget/TextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader;->userStatusView$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileHeader;->$$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/TextView;
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public final getContentViewResId()I
-    .locals 1
-
-    const v0, 0x7f0d01d1
-
-    return v0
-.end method
-
-.method public final onViewBoundOrOnResume()V
-    .locals 13
-
-    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getMostRecentIntent()Landroid/content/Intent;
-
-    move-result-object v0
-
-    const-wide/16 v1, 0x0
-
-    const-string v3, "com.discord.intent.extra.EXTRA_USER_ID"
-
-    invoke-virtual {v0, v3, v1, v2}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
-
-    move-result-wide v3
-
-    cmp-long v0, v3, v1
-
-    if-lez v0, :cond_0
-
-    sget-object v0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->Companion:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;
-
-    invoke-virtual {v0, v3, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;->get(J)Lrx/Observable;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model;->Companion:Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Companion;->getMe()Lrx/Observable;
-
-    move-result-object v0
-
-    :goto_0
-    move-object v1, p0
-
-    check-cast v1, 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
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v5
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1;
-
-    invoke-direct {v0, p0}, Lcom/discord/widgets/user/WidgetUserProfileHeader$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/user/WidgetUserProfileHeader;)V
-
-    move-object v10, v0
-
-    check-cast v10, Lkotlin/jvm/functions/Function1;
-
-    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
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder.smali
deleted file mode 100644
index 55bc31d37e..0000000000
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder.smali
+++ /dev/null
@@ -1,197 +0,0 @@
-.class Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;
-.super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-.source "WidgetUserProfileInfo.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x0
-    name = "ViewHolder"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
-        "Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;",
-        "Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field private linkImage:Landroid/widget/ImageView;
-
-.field private platformImage:Landroid/widget/ImageView;
-
-.field private platformUserName:Landroid/widget/TextView;
-
-.field final synthetic this$0:Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;ILcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;->this$0:Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;
-
-    invoke-direct {p0, p2, p3}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;->itemView:Landroid/view/View;
-
-    const p2, 0x7f0a0228
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/widget/ImageView;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;->platformImage:Landroid/widget/ImageView;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;->itemView:Landroid/view/View;
-
-    const p2, 0x7f0a022a
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;->platformUserName:Landroid/widget/TextView;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;->itemView:Landroid/view/View;
-
-    const p2, 0x7f0a0229
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/widget/ImageView;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;->linkImage:Landroid/widget/ImageView;
-
-    sget-object p1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$9I5TnBbtHG9Wv_eN2MD9u1bTUOU;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$9I5TnBbtHG9Wv_eN2MD9u1bTUOU;
-
-    const/4 p2, 0x0
-
-    new-array p2, p2, [Landroid/view/View;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
-
-    return-void
-.end method
-
-.method static synthetic lambda$new$0(Landroid/view/View;Ljava/lang/Integer;Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;)V
-    .locals 1
-
-    invoke-static {p2}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lcom/discord/utilities/platform/Platform;->from(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/utilities/platform/Platform;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->connectedAccountViewed(Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object p0
-
-    invoke-static {p2}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Lcom/discord/utilities/platform/Platform;->getProfileUrl(Lcom/discord/models/domain/ModelConnectedAccount;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p0, p1}, Lcom/discord/utilities/uri/UriHandler;->handle(Landroid/content/Context;Ljava/lang/String;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method protected onConfigure(ILcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;)V
-    .locals 2
-
-    invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
-
-    invoke-static {p2}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lcom/discord/utilities/platform/Platform;->from(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/utilities/platform/Platform;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getPlatformImage()I
-
-    move-result v0
-
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;->platformImage:Landroid/widget/ImageView;
-
-    invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
-
-    invoke-static {p2}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/platform/Platform;->getProfileUrl(Lcom/discord/models/domain/ModelConnectedAccount;)Ljava/lang/String;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;->platformUserName:Landroid/widget/TextView;
-
-    invoke-static {p2}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
-
-    move-result-object p2
-
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelConnectedAccount;->getUsername()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-virtual {v0, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    iget-object p2, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;->linkImage:Landroid/widget/ImageView;
-
-    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/16 p1, 0x8
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {p2, p1}, Landroid/widget/ImageView;->setVisibility(I)V
-
-    return-void
-.end method
-
-.method public bridge synthetic onConfigure(ILjava/lang/Object;)V
-    .locals 0
-
-    check-cast p2, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;->onConfigure(ILcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo.smali
deleted file mode 100644
index d01dde50c7..0000000000
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo.smali
+++ /dev/null
@@ -1,454 +0,0 @@
-.class public Lcom/discord/widgets/user/WidgetUserProfileInfo;
-.super Lcom/discord/app/AppFragment;
-.source "WidgetUserProfileInfo.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;,
-        Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
-    }
-.end annotation
-
-
-# instance fields
-.field private activityContainer:Landroid/widget/FrameLayout;
-
-.field private activityDivider:Landroid/view/View;
-
-.field private activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-.field private adapter:Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;
-
-.field private identitiesDivider:Landroid/view/View;
-
-.field private identitiesHeader:Landroid/view/View;
-
-.field private notes:Landroid/widget/EditText;
-
-.field private recycler:Landroidx/recyclerview/widget/RecyclerView;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
-
-    return-void
-.end method
-
-.method private getUserId()J
-    .locals 4
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfileInfo;->getMostRecentIntent()Landroid/content/Intent;
-
-    move-result-object v0
-
-    const-string v1, "com.discord.intent.extra.EXTRA_USER_ID"
-
-    const-wide/16 v2, 0x0
-
-    invoke-virtual {v0, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method private static isTextEquivalent(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
-    .locals 1
-
-    invoke-static {p0, p1}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_0
-
-    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    return p0
-
-    :cond_1
-    :goto_0
-    const/4 p0, 0x1
-
-    return p0
-.end method
-
-
-# virtual methods
-.method public configureUI(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)V
-    .locals 6
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->adapter:Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->access$000(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Ljava/util/List;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;->setData(Ljava/util/List;)V
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->access$100(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Ljava/lang/CharSequence;
-
-    move-result-object v0
-
-    invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->notes:Landroid/widget/EditText;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->access$100(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Ljava/lang/CharSequence;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V
-
-    :cond_0
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->notes:Landroid/widget/EditText;
-
-    new-instance v1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$BD0II2tj5H0VwHOAoiOUycejMPA;
-
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfileInfo$BD0II2tj5H0VwHOAoiOUycejMPA;-><init>(Lcom/discord/widgets/user/WidgetUserProfileInfo;Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)V
-
-    invoke-virtual {v0, v1}, Landroid/widget/EditText;->setOnFocusChangeListener(Landroid/view/View$OnFocusChangeListener;)V
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->access$200(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Lcom/discord/widgets/user/ModelRichPresence;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1
-
-    const/4 v0, 0x0
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->access$200(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Lcom/discord/widgets/user/ModelRichPresence;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/widgets/user/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v0
-
-    :goto_0
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->activityContainer:Landroid/widget/FrameLayout;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->access$300(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Lcom/discord/utilities/streams/StreamContext;
-
-    move-result-object v2
-
-    iget-object v3, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    invoke-static {v1, v0, v2, v3}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    move-result-object v1
-
-    iput-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->access$200(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Lcom/discord/widgets/user/ModelRichPresence;
-
-    move-result-object v2
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->access$300(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Lcom/discord/utilities/streams/StreamContext;
-
-    move-result-object v3
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->access$400(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Z
-
-    move-result v4
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->access$500(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v5
-
-    invoke-virtual {v1, v2, v3, v4, v5}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    invoke-virtual {v1, v0, p0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureUiTimestamp(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/app/AppComponent;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->activityDivider:Landroid/view/View;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->activityContainer:Landroid/widget/FrameLayout;
-
-    invoke-virtual {v1}, Landroid/widget/FrameLayout;->getVisibility()I
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->identitiesDivider:Landroid/view/View;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->access$000(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Ljava/util/List;
-
-    move-result-object v1
-
-    invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
-
-    move-result v1
-
-    const/16 v2, 0x8
-
-    const/4 v3, 0x0
-
-    if-eqz v1, :cond_2
-
-    const/16 v1, 0x8
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v1, 0x0
-
-    :goto_1
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->identitiesHeader:Landroid/view/View;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->access$000(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v2, 0x0
-
-    :goto_2
-    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
-
-    return-void
-.end method
-
-.method public getContentViewResId()I
-    .locals 1
-
-    const v0, 0x7f0d01c4
-
-    return v0
-.end method
-
-.method public synthetic lambda$configureUI$0$WidgetUserProfileInfo(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;Landroid/view/View;Z)V
-    .locals 2
-
-    check-cast p2, Landroid/widget/EditText;
-
-    invoke-virtual {p2}, Landroid/widget/EditText;->getText()Landroid/text/Editable;
-
-    move-result-object p2
-
-    if-nez p3, :cond_0
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->access$100(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Ljava/lang/CharSequence;
-
-    move-result-object p1
-
-    invoke-static {p1, p2}, Lcom/discord/widgets/user/WidgetUserProfileInfo;->isTextEquivalent(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_0
-
-    invoke-static {}, Lcom/discord/utilities/rest/RestAPI;->getApi()Lcom/discord/utilities/rest/RestAPI;
-
-    move-result-object p1
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileInfo;->getUserId()J
-
-    move-result-wide v0
-
-    new-instance p3, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p3, p2}, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p1, v0, v1, p3}, Lcom/discord/utilities/rest/RestAPI;->updateUserNotes(JLcom/discord/restapi/RestAPIParams$UserNoteUpdate;)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object p1
-
-    const-string p2, "updateNote"
-
-    invoke-static {p2}, Lcom/discord/app/i;->ad(Ljava/lang/String;)Lrx/Observable$c;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    :cond_0
-    return-void
-.end method
-
-.method public onPause()V
-    .locals 1
-
-    invoke-super {p0}, Lcom/discord/app/AppFragment;->onPause()V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->disposeSubscriptions()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onViewBound(Landroid/view/View;)V
-    .locals 1
-
-    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
-
-    const v0, 0x7f0a0781
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/EditText;
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->notes:Landroid/widget/EditText;
-
-    const v0, 0x7f0a0501
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    check-cast v0, Landroidx/recyclerview/widget/RecyclerView;
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->recycler:Landroidx/recyclerview/widget/RecyclerView;
-
-    const v0, 0x7f0a0782
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/FrameLayout;
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->activityContainer:Landroid/widget/FrameLayout;
-
-    const v0, 0x7f0a077e
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->activityDivider:Landroid/view/View;
-
-    const v0, 0x7f0a077f
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->identitiesDivider:Landroid/view/View;
-
-    const v0, 0x7f0a0780
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->identitiesHeader:Landroid/view/View;
-
-    new-instance p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->recycler:Landroidx/recyclerview/widget/RecyclerView;
-
-    invoke-direct {p1, v0}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
-
-    invoke-static {p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->adapter:Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo;->recycler:Landroidx/recyclerview/widget/RecyclerView;
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
-
-    return-void
-.end method
-
-.method public onViewBoundOrOnResume()V
-    .locals 3
-
-    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileInfo;->getUserId()J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->get(J)Lrx/Observable;
-
-    move-result-object v0
-
-    invoke-static {p0}, Lcom/discord/app/i;->b(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/user/-$$Lambda$1JbdN-tTlPBAZVuz3yNLg1RlM2s;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/user/-$$Lambda$1JbdN-tTlPBAZVuz3yNLg1RlM2s;-><init>(Lcom/discord/widgets/user/WidgetUserProfileInfo;)V
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v2
-
-    invoke-static {v1, v2}, Lcom/discord/app/i;->a(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model.smali
deleted file mode 100644
index d258c8f830..0000000000
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model.smali
+++ /dev/null
@@ -1,80 +0,0 @@
-.class public final Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;
-.super Ljava/lang/Object;
-.source "WidgetUserProfileStrip.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/WidgetUserProfileStrip;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Model"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion;
-    }
-.end annotation
-
-
-# static fields
-.field public static final Companion:Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion;
-
-
-# instance fields
-.field private final presence:Lcom/discord/models/domain/ModelPresence;
-
-.field private final user:Lcom/discord/models/domain/ModelUser;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->Companion:Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;)V
-    .locals 1
-
-    const-string v0, "presence"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getPresence()Lcom/discord/models/domain/ModelPresence;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    return-object v0
-.end method
-
-.method public final getUser()Lcom/discord/models/domain/ModelUser;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$updateStateAndDismiss$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$updateStateAndDismiss$1.smali
index 9a48dd21bd..e36e0b417a 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$updateStateAndDismiss$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet$updateStateAndDismiss$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserStatusSheet$updateStateAndDismiss$1;->invoke(Lcom/discord/models/domain/ModelUserSettings;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali
index ec5d42af10..b4a6e9acc3 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali
@@ -143,7 +143,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a07ce
+    const v0, 0x7f0a080b
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -151,7 +151,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserStatusSheet;->online$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07cc
+    const v0, 0x7f0a0809
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -159,7 +159,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserStatusSheet;->idle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07cb
+    const v0, 0x7f0a0808
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -167,7 +167,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserStatusSheet;->dnd$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07cd
+    const v0, 0x7f0a080a
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -269,7 +269,7 @@
 .method private final setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V
     .locals 1
 
-    const v0, 0x7f0a07c8
+    const v0, 0x7f0a0805
 
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -279,7 +279,7 @@
 
     invoke-virtual {v0, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    const p2, 0x7f0a07ca
+    const p2, 0x7f0a0807
 
     invoke-virtual {p1, p2}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -289,7 +289,7 @@
 
     invoke-virtual {p2, p3}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f0a07c9
+    const p2, 0x7f0a0806
 
     if-eqz p4, :cond_0
 
@@ -357,7 +357,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dz()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -405,7 +405,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d6
+    const v0, 0x7f0d01e4
 
     return v0
 .end method
@@ -433,9 +433,9 @@
 
     move-result-object v2
 
-    const v3, 0x7f08036c
+    const v3, 0x7f08037d
 
-    const v4, 0x7f121073
+    const v4, 0x7f1210b0
 
     const/4 v5, 0x0
 
@@ -463,9 +463,9 @@
 
     move-result-object v1
 
-    const v2, 0x7f08036a
+    const v2, 0x7f08037b
 
-    const v3, 0x7f12106f
+    const v3, 0x7f1210ac
 
     const/4 v4, 0x0
 
@@ -493,15 +493,15 @@
 
     move-result-object p1
 
-    const p2, 0x7f12106e
+    const p2, 0x7f1210ab
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p2
 
-    const v0, 0x7f080369
+    const v0, 0x7f08037a
 
-    const v1, 0x7f12106d
+    const v1, 0x7f1210aa
 
     invoke-direct {p0, p1, v0, v1, p2}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V
 
@@ -521,15 +521,15 @@
 
     move-result-object p1
 
-    const p2, 0x7f121071
+    const p2, 0x7f1210ae
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p2
 
-    const v0, 0x7f08036b
+    const v0, 0x7f08037c
 
-    const v1, 0x7f121070
+    const v1, 0x7f1210ad
 
     invoke-direct {p0, p1, v0, v1, p2}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
index 59f78be8fd..f1a96be9fd 100644
--- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
+++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
@@ -27,7 +27,7 @@
 .method private getBodyText(Landroid/content/Context;)Ljava/lang/CharSequence;
     .locals 1
 
-    const v0, 0x7f12129b
+    const v0, 0x7f1212ec
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -43,7 +43,7 @@
 .method private static getFormattedSupportUrl(Landroid/content/Context;)Ljava/lang/CharSequence;
     .locals 3
 
-    invoke-static {}, Lcom/discord/app/e;->dq()Ljava/lang/String;
+    invoke-static {}, Lcom/discord/app/e;->dp()Ljava/lang/String;
 
     move-result-object v0
 
@@ -55,7 +55,7 @@
 
     aput-object v0, v1, v2
 
-    const v0, 0x7f1212a3
+    const v0, 0x7f1212f4
 
     invoke-virtual {p0, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -132,7 +132,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c0
+    const v0, 0x7f0d01d0
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$onViewBoundOrOnResume$1.smali
index a2a357d727..7979d1ef3c 100644
--- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$onViewBoundOrOnResume$1.smali
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$onViewBoundOrOnResume$1;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.smali b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.smali
index 85799670a4..0ea26c4fea 100644
--- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.smali
@@ -70,7 +70,7 @@
 
     move-result p1
 
-    const p2, 0x7f0a0465
+    const p2, 0x7f0a0476
 
     if-eq p1, p2, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.smali b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.smali
index 480a8860a9..0ef84786e1 100644
--- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.smali
+++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.smali
@@ -92,7 +92,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     sget-object v2, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;->UNFORCED:Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;
@@ -105,7 +105,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     sget-object v1, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;->NO_HISTORY_FROM_USER_SETTINGS:Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;
@@ -213,7 +213,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -263,7 +263,7 @@
 
     const-string v1, "mode"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     sget-object v1, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;->FORCED:Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;
@@ -312,7 +312,7 @@
 
     const-string v1, "mode"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -343,7 +343,7 @@
 
     const-string v1, "mode"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     sget-object v1, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;->FORCED:Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;
@@ -468,7 +468,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/user/calls/PrivateCallLauncher.smali b/com.discord/smali/com/discord/widgets/user/calls/PrivateCallLauncher.smali
new file mode 100644
index 0000000000..4f7da85ee9
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/calls/PrivateCallLauncher.smali
@@ -0,0 +1,125 @@
+.class public final Lcom/discord/widgets/user/calls/PrivateCallLauncher;
+.super Ljava/lang/Object;
+.source "PrivateCallLauncher.kt"
+
+
+# instance fields
+.field private final appComponent:Lcom/discord/app/AppComponent;
+
+.field private final appPermissionsRequests:Lcom/discord/app/AppPermissions$Requests;
+
+.field private final context:Landroid/content/Context;
+
+.field private final fragmentManager:Landroidx/fragment/app/FragmentManager;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/app/AppPermissions$Requests;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;)V
+    .locals 1
+
+    const-string v0, "appPermissionsRequests"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "appComponent"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "context"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "fragmentManager"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->appPermissionsRequests:Lcom/discord/app/AppPermissions$Requests;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->appComponent:Lcom/discord/app/AppComponent;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->context:Landroid/content/Context;
+
+    iput-object p4, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->fragmentManager:Landroidx/fragment/app/FragmentManager;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getAppComponent()Lcom/discord/app/AppComponent;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->appComponent:Lcom/discord/app/AppComponent;
+
+    return-object v0
+.end method
+
+.method public final getAppPermissionsRequests()Lcom/discord/app/AppPermissions$Requests;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->appPermissionsRequests:Lcom/discord/app/AppPermissions$Requests;
+
+    return-object v0
+.end method
+
+.method public final getContext()Landroid/content/Context;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->context:Landroid/content/Context;
+
+    return-object v0
+.end method
+
+.method public final getFragmentManager()Landroidx/fragment/app/FragmentManager;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->fragmentManager:Landroidx/fragment/app/FragmentManager;
+
+    return-object v0
+.end method
+
+.method public final launchVideoCall(J)V
+    .locals 8
+
+    sget-object v0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->Companion:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;
+
+    iget-object v4, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->appPermissionsRequests:Lcom/discord/app/AppPermissions$Requests;
+
+    iget-object v6, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->appComponent:Lcom/discord/app/AppComponent;
+
+    iget-object v5, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->context:Landroid/content/Context;
+
+    iget-object v7, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->fragmentManager:Landroidx/fragment/app/FragmentManager;
+
+    const/4 v3, 0x1
+
+    move-wide v1, p1
+
+    invoke-virtual/range {v0 .. v7}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppPermissions$Requests;Landroid/content/Context;Lcom/discord/app/AppComponent;Landroidx/fragment/app/FragmentManager;)V
+
+    return-void
+.end method
+
+.method public final launchVoiceCall(J)V
+    .locals 8
+
+    sget-object v0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->Companion:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;
+
+    iget-object v4, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->appPermissionsRequests:Lcom/discord/app/AppPermissions$Requests;
+
+    iget-object v6, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->appComponent:Lcom/discord/app/AppComponent;
+
+    iget-object v5, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->context:Landroid/content/Context;
+
+    iget-object v7, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->fragmentManager:Landroidx/fragment/app/FragmentManager;
+
+    const/4 v3, 0x0
+
+    move-wide v1, p1
+
+    invoke-virtual/range {v0 .. v7}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppPermissions$Requests;Landroid/content/Context;Lcom/discord/app/AppComponent;Landroidx/fragment/app/FragmentManager;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2.smali b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2.smali
index 0b177d2cba..e56a51bf14 100644
--- a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$3.smali b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$3.smali
index 42d839428e..f16991ae9f 100644
--- a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$3;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify.smali b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify.smali
index c868276eba..f4fdcb4fdb 100644
--- a/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify.smali
+++ b/com.discord/smali/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify.smali
@@ -143,7 +143,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;-><init>()V
 
-    const v0, 0x7f0a077b
+    const v0, 0x7f0a07a5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -151,7 +151,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;->verifyButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a077d
+    const v0, 0x7f0a07a7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -159,7 +159,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;->cancelButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a077a
+    const v0, 0x7f0a07a4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -167,7 +167,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;->help$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -283,7 +283,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c1
+    const v0, 0x7f0d01d1
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$1.smali
index c7a206a721..b5f331ebba 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$1;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$2.smali
index 6a27d270a1..3f653a90a6 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$2;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali
index 9f35dbe2f3..2d09bbd24a 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali
@@ -167,7 +167,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;->emailChangeButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -383,7 +383,7 @@
 
     invoke-virtual {v0}, Lcom/discord/app/AppActivity;->onBackPressed()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 
@@ -398,7 +398,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c2
+    const v0, 0x7f0d01d2
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify$Model.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify$Model.smali
index f365de1750..99b1ebc767 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify$Model.smali
@@ -102,7 +102,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
index 8b7a68facc..291910c773 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
@@ -138,7 +138,7 @@
 
     aput-object p1, v0, v1
 
-    const p1, 0x7f12129d
+    const p1, 0x7f1212ee
 
     invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/user/email/WidgetUserEmailVerify;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -158,7 +158,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c3
+    const v0, 0x7f0d01d3
 
     return v0
 .end method
@@ -194,7 +194,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneAdd.smali b/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneAdd.smali
index 8ae4738aa8..5b338fe2a4 100644
--- a/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneAdd.smali
+++ b/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneAdd.smali
@@ -377,7 +377,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01ca
+    const v0, 0x7f0d01da
 
     return v0
 .end method
@@ -417,7 +417,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -511,7 +511,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0793
+    const v0, 0x7f0a07bd
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -521,7 +521,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->userPhoneAddWrap:Landroid/widget/ScrollView;
 
-    const v0, 0x7f0a0790
+    const v0, 0x7f0a07ba
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -531,7 +531,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->userPhoneAddCountryCode:Landroid/widget/EditText;
 
-    const v0, 0x7f0a0792
+    const v0, 0x7f0a07bc
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -541,7 +541,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->userPhoneAddNumber:Landroid/widget/EditText;
 
-    const v0, 0x7f0a0791
+    const v0, 0x7f0a07bb
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -549,7 +549,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->userPhoneNext:Landroid/view/View;
 
-    const v0, 0x7f0a021b
+    const v0, 0x7f0a021c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -557,7 +557,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->close:Landroid/view/View;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneVerify.smali b/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneVerify.smali
index a24bc02878..f69ac45b7c 100644
--- a/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneVerify.smali
+++ b/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneVerify.smali
@@ -37,7 +37,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/discord/app/i;->dB()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -189,7 +189,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01cb
+    const v0, 0x7f0d01db
 
     return v0
 .end method
@@ -263,7 +263,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0795
+    const v0, 0x7f0a07bf
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -273,7 +273,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;->verifyWrap:Landroid/widget/ScrollView;
 
-    const v0, 0x7f0a0794
+    const v0, 0x7f0a07be
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -283,7 +283,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;->digitVerificationView:Lcom/discord/views/DigitVerificationView;
 
-    const v0, 0x7f0a026f
+    const v0, 0x7f0a0278
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -293,7 +293,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;->dimmerView:Lcom/discord/utilities/dimmer/DimmerView;
 
-    const v0, 0x7f0a021b
+    const v0, 0x7f0a021c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -303,13 +303,13 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;->digitVerificationView:Lcom/discord/views/DigitVerificationView;
 
-    iget-object p1, p1, Lcom/discord/views/DigitVerificationView;->BD:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/views/DigitVerificationView;->BM:Ljava/util/List;
 
     if-nez p1, :cond_0
 
     const-string v0, "digits"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast p1, Ljava/lang/Iterable;
diff --git a/com.discord/smali/com/discord/widgets/user/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1.smali
similarity index 50%
rename from com.discord/smali/com/discord/widgets/user/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1.smali
index 94b9b9361e..66e71d3553 100644
--- a/com.discord/smali/com/discord/widgets/user/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1;
+.class final Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1;
 .super Ljava/lang/Object;
 .source "ModelRichPresence.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1;->call(Lcom/discord/models/domain/ModelPresence;)Lrx/Observable;
+    value = Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1;->call(Lcom/discord/models/domain/ModelPresence;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -38,7 +38,7 @@
 .method constructor <init>(Lcom/discord/models/domain/ModelPresence;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1;->$presence$inlined:Lcom/discord/models/domain/ModelPresence;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1;->$presence$inlined:Lcom/discord/models/domain/ModelPresence;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,14 +47,14 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelApplication;)Lcom/discord/widgets/user/ModelRichPresence;
+.method public final call(Lcom/discord/models/domain/ModelApplication;)Lcom/discord/widgets/user/presence/ModelRichPresence;
     .locals 2
 
-    new-instance v0, Lcom/discord/widgets/user/ModelRichPresence;
+    new-instance v0, Lcom/discord/widgets/user/presence/ModelRichPresence;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1;->$presence$inlined:Lcom/discord/models/domain/ModelPresence;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1;->$presence$inlined:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-direct {v0, v1, p1}, Lcom/discord/widgets/user/ModelRichPresence;-><init>(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;)V
+    invoke-direct {v0, v1, p1}, Lcom/discord/widgets/user/presence/ModelRichPresence;-><init>(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;)V
 
     return-object v0
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelApplication;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1;->call(Lcom/discord/models/domain/ModelApplication;)Lcom/discord/widgets/user/ModelRichPresence;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1;->call(Lcom/discord/models/domain/ModelApplication;)Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/ModelRichPresence$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.smali
similarity index 66%
rename from com.discord/smali/com/discord/widgets/user/ModelRichPresence$Companion$get$1.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.smali
index 9dd15e4147..ee95e094d5 100644
--- a/com.discord/smali/com/discord/widgets/user/ModelRichPresence$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1;
+.class final Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1;
 .super Ljava/lang/Object;
 .source "ModelRichPresence.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/ModelRichPresence$Companion;->get(J)Lrx/Observable;
+    value = Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;->get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,18 +33,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1;
+.field public static final INSTANCE:Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1;
+    new-instance v0, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1;->INSTANCE:Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1;
+    sput-object v0, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1;->INSTANCE:Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelPresence;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1;->call(Lcom/discord/models/domain/ModelPresence;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1;->call(Lcom/discord/models/domain/ModelPresence;)Lrx/Observable;
 
     move-result-object p1
 
@@ -80,7 +80,7 @@
             ")",
             "Lrx/Observable<",
             "+",
-            "Lcom/discord/widgets/user/ModelRichPresence;",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
             ">;"
         }
     .end annotation
@@ -120,9 +120,9 @@
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1;
+    new-instance v2, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1;
 
-    invoke-direct {v2, p1}, Lcom/discord/widgets/user/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1;-><init>(Lcom/discord/models/domain/ModelPresence;)V
+    invoke-direct {v2, p1}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1;-><init>(Lcom/discord/models/domain/ModelPresence;)V
 
     check-cast v2, Lrx/functions/b;
 
@@ -133,11 +133,11 @@
     if-nez v1, :cond_2
 
     :cond_1
-    new-instance v1, Lcom/discord/widgets/user/ModelRichPresence;
+    new-instance v1, Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     const/4 v2, 0x2
 
-    invoke-direct {v1, p1, v0, v2, v0}, Lcom/discord/widgets/user/ModelRichPresence;-><init>(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    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
 
     invoke-static {v1}, Lrx/Observable;->bI(Ljava/lang/Object;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ModelRichPresence$Companion.smali b/com.discord/smali/com/discord/widgets/user/presence/ModelRichPresence$Companion.smali
new file mode 100644
index 0000000000..48deda778d
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/presence/ModelRichPresence$Companion.smali
@@ -0,0 +1,91 @@
+.class public final Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;
+.super Ljava/lang/Object;
+.source "ModelRichPresence.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/presence/ModelRichPresence;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/user/presence/ModelRichPresence$Companion;-><init>()V
+
+    return-void
+.end method
+
+.method public static synthetic get$default(Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;JLcom/discord/stores/StoreUserPresence;ILjava/lang/Object;)Lrx/Observable;
+    .locals 0
+
+    and-int/lit8 p4, p4, 0x2
+
+    if-eqz p4, :cond_0
+
+    sget-object p3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p3}, Lcom/discord/stores/StoreStream$Companion;->getPresences()Lcom/discord/stores/StoreUserPresence;
+
+    move-result-object p3
+
+    :cond_0
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;->get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(J",
+            "Lcom/discord/stores/StoreUserPresence;",
+            ")",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "storeUserPresence"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p3, p1, p2}, Lcom/discord/stores/StoreUserPresence;->getForUserId(J)Lrx/Observable;
+
+    move-result-object p1
+
+    sget-object p2, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1;->INSTANCE:Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1;
+
+    check-cast p2, Lrx/functions/b;
+
+    invoke-virtual {p1, p2}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string p2, "storeUserPresence\n      \u2026          }\n            }"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/ModelRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ModelRichPresence.smali
similarity index 50%
rename from com.discord/smali/com/discord/widgets/user/ModelRichPresence.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ModelRichPresence.smali
index 104d2e29e5..882f42c230 100644
--- a/com.discord/smali/com/discord/widgets/user/ModelRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ModelRichPresence.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/user/ModelRichPresence;
+.class public final Lcom/discord/widgets/user/presence/ModelRichPresence;
 .super Ljava/lang/Object;
 .source "ModelRichPresence.kt"
 
@@ -6,13 +6,13 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/user/ModelRichPresence$Companion;
+        Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;
     }
 .end annotation
 
 
 # static fields
-.field public static final Companion:Lcom/discord/widgets/user/ModelRichPresence$Companion;
+.field public static final Companion:Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;
 
 
 # instance fields
@@ -25,13 +25,13 @@
 .method static constructor <clinit>()V
     .locals 2
 
-    new-instance v0, Lcom/discord/widgets/user/ModelRichPresence$Companion;
+    new-instance v0, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;
 
     const/4 v1, 0x0
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/user/ModelRichPresence$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lcom/discord/widgets/user/ModelRichPresence;->Companion:Lcom/discord/widgets/user/ModelRichPresence$Companion;
+    sput-object v0, Lcom/discord/widgets/user/presence/ModelRichPresence;->Companion:Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;
 
     return-void
 .end method
@@ -45,9 +45,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    iput-object p2, p0, Lcom/discord/widgets/user/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
+    iput-object p2, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
 
     return-void
 .end method
@@ -62,49 +62,51 @@
     const/4 p2, 0x0
 
     :cond_0
-    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/ModelRichPresence;-><init>(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;)V
+    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/presence/ModelRichPresence;-><init>(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;)V
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;ILjava/lang/Object;)Lcom/discord/widgets/user/ModelRichPresence;
+.method public static synthetic copy$default(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;ILjava/lang/Object;)Lcom/discord/widgets/user/presence/ModelRichPresence;
     .locals 0
 
     and-int/lit8 p4, p3, 0x1
 
     if-eqz p4, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
 
     :cond_0
     and-int/lit8 p3, p3, 0x2
 
     if-eqz p3, :cond_1
 
-    iget-object p2, p0, Lcom/discord/widgets/user/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
 
     :cond_1
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/ModelRichPresence;->copy(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;)Lcom/discord/widgets/user/ModelRichPresence;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/presence/ModelRichPresence;->copy(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;)Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static final get(J)Lrx/Observable;
+.method public static final get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(J)",
+            "(J",
+            "Lcom/discord/stores/StoreUserPresence;",
+            ")",
             "Lrx/Observable<",
-            "Lcom/discord/widgets/user/ModelRichPresence;",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
             ">;"
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/widgets/user/ModelRichPresence;->Companion:Lcom/discord/widgets/user/ModelRichPresence$Companion;
+    sget-object v0, Lcom/discord/widgets/user/presence/ModelRichPresence;->Companion:Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;
 
-    invoke-virtual {v0, p0, p1}, Lcom/discord/widgets/user/ModelRichPresence$Companion;->get(J)Lrx/Observable;
+    invoke-virtual {v0, p0, p1, p2}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;->get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
 
     move-result-object p0
 
@@ -116,7 +118,7 @@
 .method public final component1()Lcom/discord/models/domain/ModelPresence;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
 
     return-object v0
 .end method
@@ -124,21 +126,21 @@
 .method public final component2()Lcom/discord/models/domain/ModelApplication;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
 
     return-object v0
 .end method
 
-.method public final copy(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;)Lcom/discord/widgets/user/ModelRichPresence;
+.method public final copy(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;)Lcom/discord/widgets/user/presence/ModelRichPresence;
     .locals 1
 
     const-string v0, "presence"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/widgets/user/ModelRichPresence;
+    new-instance v0, Lcom/discord/widgets/user/presence/ModelRichPresence;
 
-    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/user/ModelRichPresence;-><init>(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;)V
+    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
 .end method
@@ -148,15 +150,15 @@
 
     if-eq p0, p1, :cond_1
 
-    instance-of v0, p1, Lcom/discord/widgets/user/ModelRichPresence;
+    instance-of v0, p1, Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     if-eqz v0, :cond_0
 
-    check-cast p1, Lcom/discord/widgets/user/ModelRichPresence;
+    check-cast p1, Lcom/discord/widgets/user/presence/ModelRichPresence;
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    iget-object v1, p1, Lcom/discord/widgets/user/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
+    iget-object v1, p1, Lcom/discord/widgets/user/presence/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -164,9 +166,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
 
-    iget-object p1, p1, Lcom/discord/widgets/user/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
+    iget-object p1, p1, Lcom/discord/widgets/user/presence/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -191,7 +193,7 @@
 .method public final getPresence()Lcom/discord/models/domain/ModelPresence;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
 
     return-object v0
 .end method
@@ -199,7 +201,7 @@
 .method public final getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
@@ -211,7 +213,7 @@
 .method public final getPrimaryApplication()Lcom/discord/models/domain/ModelApplication;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
 
     return-object v0
 .end method
@@ -219,7 +221,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
 
     const/4 v1, 0x0
 
@@ -237,7 +239,7 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/user/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
+    iget-object v2, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
 
     if-eqz v2, :cond_1
 
@@ -260,7 +262,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/user/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -268,7 +270,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali
similarity index 70%
rename from com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali
index 841f1ba291..81688677d0 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali
@@ -1,5 +1,5 @@
-.class public final Lcom/discord/widgets/user/ViewHolderGameRichPresence;
-.super Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+.class public final Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;
+.super Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 .source "ViewHolderGameRichPresence.kt"
 
 
@@ -17,9 +17,9 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;-><init>(Landroid/view/View;I)V
+    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;-><init>(Landroid/view/View;I)V
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->containerView:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->containerView:Landroid/view/View;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p0, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->containerView:Landroid/view/View;
+    iget-object v2, p0, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->containerView:Landroid/view/View;
 
     invoke-virtual {v2}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     if-eqz v2, :cond_0
 
-    const v3, 0x7f121215
+    const v3, 0x7f12125b
 
     const/4 v4, 0x2
 
@@ -105,6 +105,10 @@
     const-string v1, ""
 
     :cond_2
+    const-string v2, "model.party?.run {\n     \u2026)\n        }\n      } ?: \"\""
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v2, Ljava/lang/StringBuilder;
 
     invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
@@ -148,7 +152,7 @@
     move-object p2, v0
 
     :goto_1
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->getHeaderTv()Landroid/widget/TextView;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->getHeaderTv()Landroid/widget/TextView;
 
     move-result-object v1
 
@@ -156,7 +160,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->getHeaderTv()Landroid/widget/TextView;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->getHeaderTv()Landroid/widget/TextView;
 
     move-result-object v3
 
@@ -176,7 +180,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->getTitleTv()Landroid/widget/TextView;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->getTitleTv()Landroid/widget/TextView;
 
     move-result-object v1
 
@@ -192,7 +196,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->getDetailsTv()Landroid/widget/TextView;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->getDetailsTv()Landroid/widget/TextView;
 
     move-result-object v1
 
@@ -208,7 +212,7 @@
 
     invoke-static {v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->getStateTv()Landroid/widget/TextView;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->getStateTv()Landroid/widget/TextView;
 
     move-result-object v1
 
@@ -220,7 +224,7 @@
 
     invoke-static {v1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->getTimeTv()Landroid/widget/TextView;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->getTimeTv()Landroid/widget/TextView;
 
     move-result-object p2
 
@@ -234,7 +238,7 @@
 
     if-eqz p1, :cond_5
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
 
     move-result-object v0
 
@@ -255,12 +259,29 @@
     throw p1
 .end method
 
-.method public final configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+.method public final configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
     .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+            "Lcom/discord/utilities/streams/StreamContext;",
+            "Z",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/app/AppPermissions;",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
 
-    invoke-super {p0, p1, p2, p3, p4}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    const-string v0, "appPermissions"
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-static {p5, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super/range {p0 .. p6}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object p2
 
@@ -276,7 +297,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/ModelRichPresence;->getPrimaryApplication()Lcom/discord/models/domain/ModelApplication;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPrimaryApplication()Lcom/discord/models/domain/ModelApplication;
 
     move-result-object p1
 
@@ -317,7 +338,7 @@
     :goto_0
     move-object v1, p1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object p1
 
@@ -327,7 +348,7 @@
 
     invoke-virtual {p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderGameRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$1.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1.smali
similarity index 66%
rename from com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$1.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1.smali
index d402fc930d..5f3578d729 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$1;
+.class final Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1;
 .super Ljava/lang/Object;
 .source "ViewHolderMusicRichPresence.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    value = Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -25,7 +25,7 @@
 .method constructor <init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$1;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,7 +51,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$1;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/utilities/integrations/SpotifyHelper;->launchTrack(Landroid/content/Context;Lcom/discord/models/domain/ModelPresence$Activity;)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$2.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2.smali
similarity index 66%
rename from com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$2.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2.smali
index 8acf8d21b0..1d6d7a4c72 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$2;
+.class final Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2;
 .super Ljava/lang/Object;
 .source "ViewHolderMusicRichPresence.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    value = Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -25,7 +25,7 @@
 .method constructor <init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$2;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,7 +51,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$2;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/utilities/integrations/SpotifyHelper;->launchTrack(Landroid/content/Context;Lcom/discord/models/domain/ModelPresence$Activity;)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3.smali
similarity index 58%
rename from com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3.smali
index 93debf3848..928ca5f92b 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3;
+.class final Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;
 .super Ljava/lang/Object;
 .source "ViewHolderMusicRichPresence.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    value = Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,11 +29,11 @@
 .method constructor <init>(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/models/domain/ModelUser;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
 
-    iput-object p2, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3;->$user:Lcom/discord/models/domain/ModelUser;
+    iput-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;->$user:Lcom/discord/models/domain/ModelUser;
 
-    iput-boolean p3, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3;->$isMe:Z
+    iput-boolean p3, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;->$isMe:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,9 +59,9 @@
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
+    iget-object v2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;->$activity:Lcom/discord/models/domain/ModelPresence$Activity;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3;->$user:Lcom/discord/models/domain/ModelUser;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;->$user:Lcom/discord/models/domain/ModelUser;
 
     if-eqz p1, :cond_0
 
@@ -75,7 +75,7 @@
     const-wide/16 v3, 0x0
 
     :goto_0
-    iget-boolean v5, p0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$3;->$isMe:Z
+    iget-boolean v5, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;->$isMe:Z
 
     invoke-virtual/range {v0 .. v5}, Lcom/discord/utilities/integrations/SpotifyHelper;->launchAlbum(Landroid/content/Context;Lcom/discord/models/domain/ModelPresence$Activity;JZ)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4.smali
similarity index 59%
rename from com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4.smali
index 6dd909ccad..886f7ae3d6 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4;
+.class final Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4;
 .super Ljava/lang/Object;
 .source "ViewHolderMusicRichPresence.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/ViewHolderMusicRichPresence;->configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    value = Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4;
+.field public static final INSTANCE:Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4;
+    new-instance v0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4;
 
-    invoke-direct {v0}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4;->INSTANCE:Lcom/discord/widgets/user/ViewHolderMusicRichPresence$configureUi$4;
+    sput-object v0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4;->INSTANCE:Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali
new file mode 100644
index 0000000000..dab61b3ddb
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali
@@ -0,0 +1,596 @@
+.class public final Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;
+.super Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+.source "ViewHolderMusicRichPresence.kt"
+
+
+# instance fields
+.field private final containerView:Landroid/view/View;
+
+.field private final musicDuration:Landroid/widget/TextView;
+
+.field private final musicElapsed:Landroid/widget/TextView;
+
+.field private final musicSuperBar:Lcom/miguelgaeta/super_bar/SuperBar;
+
+.field private final playButton:Landroid/view/View;
+
+.field private final playButtonText:Landroid/widget/TextView;
+
+
+# direct methods
+.method public constructor <init>(Landroid/view/View;)V
+    .locals 1
+
+    const-string v0, "containerView"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;-><init>(Landroid/view/View;I)V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
+
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
+
+    const v0, 0x7f0a057d
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButton:Landroid/view/View;
+
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
+
+    const v0, 0x7f0a057e
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
+
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
+
+    const v0, 0x7f0a0580
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/miguelgaeta/super_bar/SuperBar;
+
+    iput-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;->containerView:Landroid/view/View;
+
+    const v0, 0x7f0a057c
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicElapsed:Landroid/widget/TextView;
+
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
+
+    const v0, 0x7f0a057b
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicDuration:Landroid/widget/TextView;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+            "Lcom/discord/utilities/streams/StreamContext;",
+            "Z",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/app/AppPermissions;",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string p6, "appPermissions"
+
+    invoke-static {p5, p6}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->disposeTimer()V
+
+    iget-object p5, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
+
+    invoke-virtual {p5}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object p5
+
+    const/4 p6, 0x0
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    move-object p1, p6
+
+    :goto_0
+    if-eqz p1, :cond_7
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->isRichPresence()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    goto/16 :goto_4
+
+    :cond_1
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v2, "spotify"
+
+    invoke-static {v0, v2}, Lkotlin/text/l;->af(Ljava/lang/String;Ljava/lang/String;)Z
+
+    move-result v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getState()Ljava/lang/String;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_2
+
+    const/16 v3, 0x3b
+
+    const/16 v4, 0x2c
+
+    invoke-static {v2, v3, v4, v1}, Lkotlin/text/l;->a(Ljava/lang/String;CCZ)Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_1
+
+    :cond_2
+    move-object v2, p6
+
+    :goto_1
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getHeaderTv()Landroid/widget/TextView;
+
+    move-result-object v3
+
+    const-string v4, "headerTv"
+
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getHeaderTv()Landroid/widget/TextView;
+
+    move-result-object v5
+
+    invoke-static {v5, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+
+    move-result-object v4
+
+    const-string v5, "headerTv.context"
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v4, p1}, Lcom/discord/utilities/presence/PresenceUtils;->getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/lang/CharSequence;
+
+    move-result-object v4
+
+    invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getSmallIv()Landroid/widget/ImageView;
+
+    move-result-object v3
+
+    const-string v4, "smallIv"
+
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v3, Landroid/view/View;
+
+    const/4 v4, 0x2
+
+    invoke-static {v3, v1, v1, v4, p6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getTitleTv()Landroid/widget/TextView;
+
+    move-result-object v3
+
+    const-string v5, "titleTv"
+
+    invoke-static {v3, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getDetails()Ljava/lang/String;
+
+    move-result-object v5
+
+    check-cast v5, Ljava/lang/CharSequence;
+
+    invoke-virtual {v3, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getDetailsTv()Landroid/widget/TextView;
+
+    move-result-object v3
+
+    const-string v5, "detailsTv"
+
+    invoke-static {v3, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v5, 0x7f121255
+
+    const/4 v6, 0x1
+
+    new-array v7, v6, [Ljava/lang/Object;
+
+    aput-object v2, v7, v1
+
+    invoke-virtual {p5, v5, v7}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/CharSequence;
+
+    invoke-static {v3, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getTimeTv()Landroid/widget/TextView;
+
+    move-result-object v2
+
+    const-string v3, "timeTv"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v3, 0x7f121254
+
+    new-array v5, v6, [Ljava/lang/Object;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getAssets()Lcom/discord/models/domain/ModelPresence$Assets;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_3
+
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeText()Ljava/lang/String;
+
+    move-result-object v7
+
+    goto :goto_2
+
+    :cond_3
+    move-object v7, p6
+
+    :goto_2
+    aput-object v7, v5, v1
+
+    invoke-virtual {p5, v3, v5}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/CharSequence;
+
+    invoke-static {v2, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getTextContainer()Landroid/view/View;
+
+    move-result-object v2
+
+    const-string v3, "textContainer"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2, v6}, Landroid/view/View;->setSelected(Z)V
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->configureAssetUi(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;)V
+
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButton:Landroid/view/View;
+
+    const-string v2, "playButton"
+
+    invoke-static {p2, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, v0, v1, v4, p6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicSuperBar:Lcom/miguelgaeta/super_bar/SuperBar;
+
+    const-string v3, "musicSuperBar"
+
+    invoke-static {p2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p2, Landroid/view/View;
+
+    invoke-static {p2, v0, v1, v4, p6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicDuration:Landroid/widget/TextView;
+
+    const-string v3, "musicDuration"
+
+    invoke-static {p2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p2, Landroid/view/View;
+
+    invoke-static {p2, v0, v1, v4, p6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicElapsed:Landroid/widget/TextView;
+
+    const-string v3, "musicElapsed"
+
+    invoke-static {p2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p2, Landroid/view/View;
+
+    invoke-static {p2, v0, v1, v4, p6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    const-string p2, "playButtonText"
+
+    if-eqz p3, :cond_4
+
+    iget-object p6, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
+
+    invoke-static {p6, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const p2, 0x7f12123b
+
+    invoke-virtual {p5, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p2
+
+    check-cast p2, Ljava/lang/CharSequence;
+
+    invoke-virtual {p6, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButton:Landroid/view/View;
+
+    invoke-static {p2, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p2, v1}, Landroid/view/View;->setEnabled(Z)V
+
+    goto :goto_3
+
+    :cond_4
+    iget-object p6, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
+
+    invoke-static {p6, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const p2, 0x7f121258
+
+    new-array v0, v6, [Ljava/lang/Object;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
+
+    move-result-object v3
+
+    if-nez v3, :cond_5
+
+    const/16 v3, 0x3f
+
+    invoke-static {v3}, Ljava/lang/Character;->valueOf(C)Ljava/lang/Character;
+
+    move-result-object v3
+
+    :cond_5
+    aput-object v3, v0, v1
+
+    invoke-virtual {p5, p2, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p2
+
+    check-cast p2, Ljava/lang/CharSequence;
+
+    invoke-virtual {p6, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButton:Landroid/view/View;
+
+    invoke-static {p2, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p2, v6}, Landroid/view/View;->setEnabled(Z)V
+
+    :goto_3
+    sget-object p2, Lcom/discord/utilities/integrations/SpotifyHelper;->INSTANCE:Lcom/discord/utilities/integrations/SpotifyHelper;
+
+    const-string p6, "context"
+
+    invoke-static {p5, p6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p2, p5}, Lcom/discord/utilities/integrations/SpotifyHelper;->isSpotifyInstalled(Landroid/content/Context;)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_6
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getTitleTv()Landroid/widget/TextView;
+
+    move-result-object p2
+
+    new-instance p5, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1;
+
+    invoke-direct {p5, p1}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
+
+    check-cast p5, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p2, p5}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButton:Landroid/view/View;
+
+    new-instance p5, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2;
+
+    invoke-direct {p5, p1}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
+
+    check-cast p5, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p2, p5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object p2
+
+    new-instance p5, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;
+
+    invoke-direct {p5, p1, p4, p3}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/models/domain/ModelUser;Z)V
+
+    check-cast p5, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p2, p5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+
+    :cond_6
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButton:Landroid/view/View;
+
+    sget-object p2, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4;->INSTANCE:Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4;
+
+    check-cast p2, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+
+    :cond_7
+    :goto_4
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
+
+    const/16 p2, 0x8
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V
+
+    return-void
+.end method
+
+.method protected final setTimeTextViews(Lcom/discord/models/domain/ModelPresence$Timestamps;)V
+    .locals 8
+
+    if-eqz p1, :cond_1
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Timestamps;->getEndMs()J
+
+    move-result-wide v2
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Timestamps;->getStartMs()J
+
+    move-result-wide v4
+
+    sub-long/2addr v2, v4
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Timestamps;->getEndMs()J
+
+    move-result-wide v4
+
+    cmp-long v6, v0, v4
+
+    if-ltz v6, :cond_0
+
+    move-wide v0, v2
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Timestamps;->getStartMs()J
+
+    move-result-wide v4
+
+    sub-long/2addr v0, v4
+
+    :goto_0
+    long-to-double v4, v0
+
+    long-to-double v6, v2
+
+    invoke-static {v4, v5}, Ljava/lang/Double;->isNaN(D)Z
+
+    invoke-static {v6, v7}, Ljava/lang/Double;->isNaN(D)Z
+
+    div-double/2addr v4, v6
+
+    const-wide/high16 v6, 0x4059000000000000L    # 100.0
+
+    mul-double v4, v4, v6
+
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicSuperBar:Lcom/miguelgaeta/super_bar/SuperBar;
+
+    const-string v6, "musicSuperBar"
+
+    invoke-static {p1, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/miguelgaeta/super_bar/SuperBar;->getConfig()Lcom/miguelgaeta/super_bar/SuperBarConfig;
+
+    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
+
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicElapsed:Landroid/widget/TextView;
+
+    const-string v4, "musicElapsed"
+
+    invoke-static {p1, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v4, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
+
+    const/4 v5, 0x0
+
+    invoke-virtual {v4, v0, v1, v5}, Lcom/discord/utilities/time/TimeUtils;->toFriendlyStringSimple(JLjava/lang/String;)Ljava/lang/CharSequence;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicDuration:Landroid/widget/TextView;
+
+    const-string v0, "musicDuration"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
+
+    invoke-virtual {v0, v2, v3, v5}, Lcom/discord/utilities/time/TimeUtils;->toFriendlyStringSimple(JLjava/lang/String;)Ljava/lang/CharSequence;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    :cond_1
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1.smali
similarity index 80%
rename from com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1.smali
index 9d71431dc7..bab5af4cfd 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1;
+.class final Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;
 .super Ljava/lang/Object;
 .source "ViewHolderPlatformRichPresence.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    value = Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -38,7 +38,7 @@
 .method constructor <init>(Lcom/discord/utilities/platform/Platform;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1;->$platform:Lcom/discord/utilities/platform/Platform;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;->$platform:Lcom/discord/utilities/platform/Platform;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,7 +52,7 @@
 
     check-cast p1, Ljava/util/List;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1;->call(Ljava/util/List;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;->call(Ljava/util/List;)Z
 
     move-result p1
 
@@ -116,7 +116,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$1;->$platform:Lcom/discord/utilities/platform/Platform;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;->$platform:Lcom/discord/utilities/platform/Platform;
 
     invoke-virtual {v1}, Lcom/discord/utilities/platform/Platform;->name()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$2.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2.smali
similarity index 71%
rename from com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$2.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2.smali
index b29007ec7a..d853cbf149 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$2;
+.class final synthetic Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2;
 .super Lkotlin/jvm/internal/j;
 .source "ViewHolderPlatformRichPresence.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    value = Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -73,9 +73,9 @@
 
     check-cast p1, Lrx/Subscription;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$2;->invoke(Lrx/Subscription;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -83,7 +83,7 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$2;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lrx/subscriptions/CompositeSubscription;
 
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3.smali
similarity index 53%
rename from com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3.smali
index 0d22a66a69..9b783fb716 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3;
+.class final Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3;
 .super Lkotlin/jvm/internal/l;
 .source "ViewHolderPlatformRichPresence.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    value = Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;
+.field final synthetic this$0:Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;)V
+.method constructor <init>(Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3;->this$0:Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3;->this$0:Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;
 
     const/4 p1, 0x1
 
@@ -51,9 +51,9 @@
 
     check-cast p1, Ljava/lang/Boolean;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3;->invoke(Ljava/lang/Boolean;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -61,9 +61,9 @@
 .method public final invoke(Ljava/lang/Boolean;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$3;->this$0:Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3;->this$0:Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;
 
-    invoke-static {v0}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->access$getConnectButton$p(Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;)Landroid/view/View;
+    invoke-static {v0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->access$getConnectButton$p(Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;)Landroid/view/View;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$4.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4.smali
similarity index 69%
rename from com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$4.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4.smali
index 7add9216ca..ccc65eab98 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$4;
+.class final Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4;
 .super Ljava/lang/Object;
 .source "ViewHolderPlatformRichPresence.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;->configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    value = Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -25,7 +25,7 @@
 .method constructor <init>(Lcom/discord/utilities/platform/Platform;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$4;->$platform:Lcom/discord/utilities/platform/Platform;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4;->$platform:Lcom/discord/utilities/platform/Platform;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,7 +43,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence$configureUi$4;->$platform:Lcom/discord/utilities/platform/Platform;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4;->$platform:Lcom/discord/utilities/platform/Platform;
 
     invoke-virtual {v1}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali
new file mode 100644
index 0000000000..3ff419563e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali
@@ -0,0 +1,554 @@
+.class public final Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;
+.super Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+.source "ViewHolderPlatformRichPresence.kt"
+
+
+# instance fields
+.field private final connectButton:Landroid/view/View;
+
+.field private final connectButtonText:Landroid/widget/TextView;
+
+.field private final containerView:Landroid/view/View;
+
+.field private final subscriptions:Lrx/subscriptions/CompositeSubscription;
+
+
+# direct methods
+.method public constructor <init>(Landroid/view/View;)V
+    .locals 1
+
+    const-string v0, "containerView"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x3
+
+    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;-><init>(Landroid/view/View;I)V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
+
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
+
+    const v0, 0x7f0a057d
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->connectButton:Landroid/view/View;
+
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
+
+    const v0, 0x7f0a057e
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->connectButtonText:Landroid/widget/TextView;
+
+    new-instance p1, Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {p1}, Lrx/subscriptions/CompositeSubscription;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->subscriptions:Lrx/subscriptions/CompositeSubscription;
+
+    return-void
+.end method
+
+.method public static final synthetic access$getConnectButton$p(Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;)Landroid/view/View;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->connectButton:Landroid/view/View;
+
+    return-object p0
+.end method
+
+.method private final configureImages(Lcom/discord/utilities/platform/Platform;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;)V
+    .locals 12
+
+    sget-object v0, Lcom/discord/utilities/platform/Platform;->NONE:Lcom/discord/utilities/platform/Platform;
+
+    if-eq p1, v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->connectButton:Landroid/view/View;
+
+    invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getColorResId()I
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundResource(I)V
+
+    iget-object v2, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->connectButtonText:Landroid/widget/TextView;
+
+    const-string v0, "connectButtonText"
+
+    invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getWhitePlatformImage()I
+
+    move-result v3
+
+    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/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+
+    :cond_0
+    sget-object v0, Lcom/discord/utilities/platform/Platform;->XBOX:Lcom/discord/utilities/platform/Platform;
+
+    const/4 v1, 0x0
+
+    const-string v2, "largeIv"
+
+    if-ne p1, v0, :cond_1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object p2
+
+    invoke-static {p2, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p2, Landroid/widget/ImageView;
+
+    invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getPlatformImage()I
+
+    move-result p1
+
+    const/4 p3, 0x4
+
+    invoke-static {p2, p1, v1, p3, v1}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+
+    return-void
+
+    :cond_1
+    if-eqz p2, :cond_2
+
+    invoke-virtual {p2}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_2
+    move-object p1, v1
+
+    :goto_0
+    invoke-super {p0, p1, p3}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureAssetUi(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object p1
+
+    invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getVisibility()I
+
+    move-result p1
+
+    if-eqz p1, :cond_5
+
+    if-eqz p2, :cond_4
+
+    invoke-virtual {p2}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPrimaryApplication()Lcom/discord/models/domain/ModelApplication;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_4
+
+    sget-object v3, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplication;->getId()J
+
+    move-result-wide v4
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplication;->getIcon()Ljava/lang/String;
+
+    move-result-object p1
+
+    if-nez p1, :cond_3
+
+    const-string p1, ""
+
+    :cond_3
+    move-object v6, p1
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x4
+
+    const/4 v9, 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;
+
+    move-result-object v1
+
+    :cond_4
+    move-object v4, v1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object p1
+
+    invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p2, 0x0
+
+    invoke-virtual {p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object p1
+
+    invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v3, p1
+
+    check-cast v3, Landroid/widget/ImageView;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/16 v10, 0x7c
+
+    const/4 v11, 0x0
+
+    invoke-static/range {v3 .. v11}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+
+    :cond_5
+    return-void
+.end method
+
+
+# virtual methods
+.method public final configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+            "Lcom/discord/utilities/streams/StreamContext;",
+            "Z",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/app/AppPermissions;",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string p3, "appPermissions"
+
+    invoke-static {p5, p3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->disposeSubscriptions()V
+
+    const/4 p3, 0x0
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object p4
+
+    goto :goto_0
+
+    :cond_0
+    move-object p4, p3
+
+    :goto_0
+    if-eqz p4, :cond_6
+
+    invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->isGamePlatform()Z
+
+    move-result p5
+
+    if-nez p5, :cond_1
+
+    goto/16 :goto_3
+
+    :cond_1
+    iget-object p5, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
+
+    const/4 p6, 0x0
+
+    invoke-virtual {p5, p6}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->isXboxActivity()Z
+
+    move-result p5
+
+    if-eqz p5, :cond_2
+
+    sget-object p5, Lcom/discord/utilities/platform/Platform;->XBOX:Lcom/discord/utilities/platform/Platform;
+
+    goto :goto_1
+
+    :cond_2
+    sget-object p5, Lcom/discord/utilities/platform/Platform;->Companion:Lcom/discord/utilities/platform/Platform$Companion;
+
+    invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->getPlatform()Ljava/lang/String;
+
+    move-result-object v0
+
+    if-nez v0, :cond_3
+
+    const-string v0, ""
+
+    :cond_3
+    invoke-virtual {p5, v0}, Lcom/discord/utilities/platform/Platform$Companion;->from(Ljava/lang/String;)Lcom/discord/utilities/platform/Platform;
+
+    move-result-object p5
+
+    :goto_1
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getHeaderTv()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    const-string v1, "headerTv"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getHeaderTv()Landroid/widget/TextView;
+
+    move-result-object v2
+
+    invoke-static {v2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    const-string v2, "headerTv.context"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1, p4}, Lcom/discord/utilities/presence/PresenceUtils;->getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/lang/CharSequence;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getTitleTv()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    const-string v1, "titleTv"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getTimeTv()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    const-string v1, "timeTv"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->getTimestamps()Lcom/discord/models/domain/ModelPresence$Timestamps;
+
+    move-result-object p4
+
+    if-eqz p4, :cond_4
+
+    invoke-virtual {p0, p4}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
+
+    move-result-object p4
+
+    goto :goto_2
+
+    :cond_4
+    move-object p4, p3
+
+    :goto_2
+    invoke-static {v0, p4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getTextContainer()Landroid/view/View;
+
+    move-result-object p4
+
+    const-string v0, "textContainer"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p4, v0}, Landroid/view/View;->setSelected(Z)V
+
+    iget-object p4, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->connectButton:Landroid/view/View;
+
+    const-string v1, "connectButton"
+
+    invoke-static {p4, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p5}, Lcom/discord/utilities/platform/Platform;->getEnabled()Z
+
+    move-result v1
+
+    const/4 v2, 0x2
+
+    invoke-static {p4, v1, p6, v2, p3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    iget-object p3, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->connectButtonText:Landroid/widget/TextView;
+
+    const-string p4, "connectButtonText"
+
+    invoke-static {p3, p4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p4, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
+
+    invoke-virtual {p4}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object p4
+
+    const v1, 0x7f12123f
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    invoke-virtual {p5}, Lcom/discord/utilities/platform/Platform;->getProperName()Ljava/lang/String;
+
+    move-result-object v2
+
+    aput-object v2, v0, p6
+
+    invoke-virtual {p4, v1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p4
+
+    check-cast p4, Ljava/lang/CharSequence;
+
+    invoke-virtual {p3, p4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-virtual {p5}, Lcom/discord/utilities/platform/Platform;->getEnabled()Z
+
+    move-result p3
+
+    if-eqz p3, :cond_5
+
+    sget-object p3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p3}, Lcom/discord/stores/StoreStream$Companion;->getUserConnections()Lcom/discord/stores/StoreUserConnections;
+
+    move-result-object p3
+
+    invoke-virtual {p3}, Lcom/discord/stores/StoreUserConnections;->getConnectedAccounts()Lrx/Observable;
+
+    move-result-object p3
+
+    new-instance p4, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;
+
+    invoke-direct {p4, p5}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;-><init>(Lcom/discord/utilities/platform/Platform;)V
+
+    check-cast p4, Lrx/functions/b;
+
+    invoke-virtual {p3, p4}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p3
+
+    invoke-virtual {p3}, Lrx/Observable;->JO()Lrx/Observable;
+
+    move-result-object p3
+
+    const-string p4, "StoreStream\n          .g\u2026  .distinctUntilChanged()"
+
+    invoke-static {p3, p4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    const/4 v2, 0x0
+
+    new-instance p3, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2;
+
+    iget-object p4, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->subscriptions:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {p3, p4}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2;-><init>(Lrx/subscriptions/CompositeSubscription;)V
+
+    move-object v3, p3
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    new-instance p3, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3;
+
+    invoke-direct {p3, p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3;-><init>(Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;)V
+
+    move-object v6, p3
+
+    check-cast v6, Lkotlin/jvm/functions/Function1;
+
+    const/16 v7, 0x1a
+
+    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
+
+    iget-object p3, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->connectButton:Landroid/view/View;
+
+    new-instance p4, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4;
+
+    invoke-direct {p4, p5}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4;-><init>(Lcom/discord/utilities/platform/Platform;)V
+
+    check-cast p4, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p3, p4}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    :cond_5
+    invoke-direct {p0, p5, p1, p2}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->configureImages(Lcom/discord/utilities/platform/Platform;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;)V
+
+    return-void
+
+    :cond_6
+    :goto_3
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
+
+    const/16 p2, 0x8
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V
+
+    return-void
+.end method
+
+.method public final disposeSubscriptions()V
+    .locals 1
+
+    invoke-super {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->disposeSubscriptions()V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->subscriptions:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->clear()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1$1.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1$1.smali
new file mode 100644
index 0000000000..cf9fec9cb5
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1$1.smali
@@ -0,0 +1,112 @@
+.class final Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1$1;
+.super Ljava/lang/Object;
+.source "ViewHolderStreamRichPresence.kt"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;->onClick(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call()V
+    .locals 4
+
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;
+
+    iget-object v0, v0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;->$streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/streams/StreamContext;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lcom/discord/stores/StoreApplicationStreaming$Actions;->targetStream(Lcom/discord/models/domain/ModelApplicationStream;)V
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getVoiceChannelSelected()Lcom/discord/stores/StoreVoiceChannelSelected;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;
+
+    iget-object v1, v1, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;->$streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-virtual {v1}, Lcom/discord/utilities/streams/StreamContext;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+
+    move-result-wide v1
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/stores/StoreVoiceChannelSelected;->set(J)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;
+
+    iget-object v0, v0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;->$onCompleted:Lkotlin/jvm/functions/Function0;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+
+    :cond_0
+    sget-object v0, Lcom/discord/widgets/spectate/WidgetSpectate;->Companion:Lcom/discord/widgets/spectate/WidgetSpectate$Companion;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;
+
+    iget-object v1, v1, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;
+
+    invoke-static {v1}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->access$getContainerView$p(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;)Landroid/view/View;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    const-string v2, "this.containerView.context"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;
+
+    iget-object v2, v2, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;->$streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-virtual {v2}, Lcom/discord/utilities/streams/StreamContext;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelApplicationStream;->getOwnerId()J
+
+    move-result-wide v2
+
+    invoke-virtual {v0, v1, v2, v3}, Lcom/discord/widgets/spectate/WidgetSpectate$Companion;->launch(Landroid/content/Context;J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1.smali
new file mode 100644
index 0000000000..a3b86f9391
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1.smali
@@ -0,0 +1,69 @@
+.class final Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;
+.super Ljava/lang/Object;
+.source "ViewHolderStreamRichPresence.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->configureWatchButton(Lcom/discord/utilities/streams/StreamContext;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $appPermissions:Lcom/discord/app/AppPermissions;
+
+.field final synthetic $onCompleted:Lkotlin/jvm/functions/Function0;
+
+.field final synthetic $streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+.field final synthetic this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;Lcom/discord/app/AppPermissions;Lcom/discord/utilities/streams/StreamContext;Lkotlin/jvm/functions/Function0;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;->$appPermissions:Lcom/discord/app/AppPermissions;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;->$streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    iput-object p4, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;->$onCompleted: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 1
+
+    const-string p1, "findme"
+
+    const-string v0, "c2"
+
+    invoke-static {p1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;->$appPermissions:Lcom/discord/app/AppPermissions;
+
+    new-instance v0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1$1;-><init>(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;)V
+
+    check-cast v0, Lrx/functions/Action0;
+
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppPermissions;->requestMicrophone(Lrx/functions/Action0;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderStreamRichPresence$streamPreviewControllerListener$1.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1.smali
similarity index 51%
rename from com.discord/smali/com/discord/widgets/user/ViewHolderStreamRichPresence$streamPreviewControllerListener$1.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1.smali
index a8510da0c9..5320411354 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderStreamRichPresence$streamPreviewControllerListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/user/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;
+.class public final Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;
 .super Lcom/facebook/drawee/controller/b;
 .source "ViewHolderStreamRichPresence.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/ViewHolderStreamRichPresence;-><init>(Landroid/view/View;)V
+    value = Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;-><init>(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -23,11 +23,11 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/user/ViewHolderStreamRichPresence;
+.field final synthetic this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/ViewHolderStreamRichPresence;)V
+.method constructor <init>(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -35,7 +35,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;->this$0:Lcom/discord/widgets/user/ViewHolderStreamRichPresence;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;
 
     invoke-direct {p0}, Lcom/facebook/drawee/controller/b;-><init>()V
 
@@ -48,9 +48,9 @@
     .locals 1
 
     :try_start_0
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;->this$0:Lcom/discord/widgets/user/ViewHolderStreamRichPresence;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;
 
-    invoke-static {p1}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->access$getStreamPreviewPlaceholderTv$p(Lcom/discord/widgets/user/ViewHolderStreamRichPresence;)Landroid/widget/TextView;
+    invoke-static {p1}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->access$getStreamPreviewPlaceholderTv$p(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;)Landroid/widget/TextView;
 
     move-result-object p1
 
@@ -58,11 +58,11 @@
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p2, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;->this$0:Lcom/discord/widgets/user/ViewHolderStreamRichPresence;
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;
 
-    const v0, 0x7f121090
+    const v0, 0x7f1210cf
 
-    invoke-virtual {p2, v0}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->getString(I)Ljava/lang/String;
+    invoke-virtual {p2, v0}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getString(I)Ljava/lang/String;
 
     move-result-object p2
 
@@ -80,9 +80,9 @@
     .locals 6
 
     :try_start_0
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;->this$0:Lcom/discord/widgets/user/ViewHolderStreamRichPresence;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;
 
-    invoke-static {p1}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->access$getStreamPreviewPlaceholder$p(Lcom/discord/widgets/user/ViewHolderStreamRichPresence;)Landroid/view/View;
+    invoke-static {p1}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->access$getStreamPreviewPlaceholder$p(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;)Landroid/view/View;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderStreamRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
similarity index 56%
rename from com.discord/smali/com/discord/widgets/user/ViewHolderStreamRichPresence.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
index 45cc0f2d5f..059ceb6edc 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderStreamRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
@@ -1,12 +1,12 @@
-.class public final Lcom/discord/widgets/user/ViewHolderStreamRichPresence;
-.super Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+.class public final Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;
+.super Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 .source "ViewHolderStreamRichPresence.kt"
 
 
 # instance fields
 .field private final containerView:Landroid/view/View;
 
-.field private final streamPreviewControllerListener:Lcom/discord/widgets/user/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;
+.field private final streamPreviewControllerListener:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;
 
 .field private streamPreviewDraweeController:Lcom/facebook/drawee/controller/AbstractDraweeController;
     .annotation system Ldalvik/annotation/Signature;
@@ -25,6 +25,8 @@
 
 .field private final streamPreviewPlaceholderTv:Landroid/widget/TextView;
 
+.field private final watchStreamButton:Landroid/view/View;
+
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
@@ -36,23 +38,23 @@
 
     const/4 v0, 0x4
 
-    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;-><init>(Landroid/view/View;I)V
+    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;-><init>(Landroid/view/View;I)V
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0721
+    const v0, 0x7f0a074a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->streamPreviewPlaceholder:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewPlaceholder:Landroid/view/View;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0722
+    const v0, 0x7f0a074b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -60,11 +62,11 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->streamPreviewPlaceholderTv:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewPlaceholderTv:Landroid/widget/TextView;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0720
+    const v0, 0x7f0a0749
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -72,29 +74,51 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->streamPreviewIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewIv:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    new-instance p1, Lcom/discord/widgets/user/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
-    invoke-direct {p1, p0}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;-><init>(Lcom/discord/widgets/user/ViewHolderStreamRichPresence;)V
+    const v0, 0x7f0a0583
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->streamPreviewControllerListener:Lcom/discord/widgets/user/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string v0, "containerView.findViewBy\u2026ch_presence_watch_button)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->watchStreamButton:Landroid/view/View;
+
+    new-instance p1, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;-><init>(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;)V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewControllerListener:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;
 
     return-void
 .end method
 
-.method public static final synthetic access$getStreamPreviewPlaceholder$p(Lcom/discord/widgets/user/ViewHolderStreamRichPresence;)Landroid/view/View;
+.method public static final synthetic access$getContainerView$p(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;)Landroid/view/View;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->streamPreviewPlaceholder:Landroid/view/View;
+    iget-object p0, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
     return-object p0
 .end method
 
-.method public static final synthetic access$getStreamPreviewPlaceholderTv$p(Lcom/discord/widgets/user/ViewHolderStreamRichPresence;)Landroid/widget/TextView;
+.method public static final synthetic access$getStreamPreviewPlaceholder$p(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;)Landroid/view/View;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->streamPreviewPlaceholderTv:Landroid/widget/TextView;
+    iget-object p0, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewPlaceholder:Landroid/view/View;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getStreamPreviewPlaceholderTv$p(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;)Landroid/widget/TextView;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewPlaceholderTv:Landroid/widget/TextView;
 
     return-object p0
 .end method
@@ -117,7 +141,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
     invoke-virtual {v1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -125,7 +149,7 @@
 
     if-eqz v1, :cond_1
 
-    const v0, 0x7f121215
+    const v0, 0x7f12125b
 
     const/4 v2, 0x2
 
@@ -166,6 +190,10 @@
     const-string v0, ""
 
     :cond_3
+    const-string p2, "party?.run {\n      when \u2026ng())\n      }\n    } ?: \"\""
+
+    invoke-static {v0, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance p2, Ljava/lang/StringBuilder;
 
     invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
@@ -211,7 +239,7 @@
 .method protected final configureAssetUi(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;)V
     .locals 2
 
-    invoke-super {p0, p1, p2}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureAssetUi(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;)V
+    invoke-super {p0, p1, p2}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureAssetUi(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;)V
 
     if-eqz p2, :cond_4
 
@@ -227,13 +255,13 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->streamPreviewPlaceholderTv:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewPlaceholderTv:Landroid/widget/TextView;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p2, 0x7f121092
+    const p2, 0x7f1210d1
 
-    invoke-virtual {p0, p2}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, p2}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getString(I)Ljava/lang/String;
 
     move-result-object p2
 
@@ -241,7 +269,7 @@
 
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     goto :goto_0
 
@@ -258,11 +286,11 @@
 
     if-eqz p2, :cond_1
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gi()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gm()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->streamPreviewIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewIv:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const-string v1, "streamPreviewIv"
 
@@ -282,48 +310,46 @@
 
     move-result-object p1
 
-    invoke-virtual {p2, p1}, Lcom/facebook/drawee/backends/pipeline/e;->aw(Ljava/lang/String;)Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-virtual {p2, p1}, Lcom/facebook/drawee/backends/pipeline/e;->ar(Ljava/lang/String;)Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->streamPreviewControllerListener:Lcom/discord/widgets/user/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewControllerListener:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;
 
     check-cast p2, Lcom/facebook/drawee/controller/ControllerListener;
 
-    invoke-virtual {p1, p2}, Lcom/facebook/drawee/backends/pipeline/e;->c(Lcom/facebook/drawee/controller/ControllerListener;)Lcom/facebook/drawee/controller/a;
-
-    move-result-object p1
+    iput-object p2, p1, Lcom/facebook/drawee/controller/a;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gF()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gJ()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->streamPreviewDraweeController:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewDraweeController:Lcom/facebook/drawee/controller/AbstractDraweeController;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->streamPreviewIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewIv:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p2, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->streamPreviewDraweeController:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewDraweeController:Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     check-cast p2, Lcom/facebook/drawee/d/a;
 
     invoke-virtual {p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->setController(Lcom/facebook/drawee/d/a;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->streamPreviewPlaceholderTv:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewPlaceholderTv:Landroid/widget/TextView;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p2, 0x7f121090
+    const p2, 0x7f1210cf
 
-    invoke-virtual {p0, p2}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, p2}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getString(I)Ljava/lang/String;
 
     move-result-object p2
 
@@ -331,7 +357,7 @@
 
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     :goto_0
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
@@ -373,7 +399,7 @@
 
     if-eqz p2, :cond_3
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->getHeaderTv()Landroid/widget/TextView;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getHeaderTv()Landroid/widget/TextView;
 
     move-result-object v0
 
@@ -381,7 +407,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
     invoke-virtual {v1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -395,7 +421,7 @@
 
     if-eqz v1, :cond_0
 
-    const v5, 0x7f121203
+    const v5, 0x7f12124a
 
     new-array v6, v3, [Ljava/lang/Object;
 
@@ -441,11 +467,11 @@
 
     move-result-object v1
 
-    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->getRichPresenceStateText(Ljava/lang/String;Lcom/discord/models/domain/ModelPresence$Party;)Ljava/lang/String;
+    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getRichPresenceStateText(Ljava/lang/String;Lcom/discord/models/domain/ModelPresence$Party;)Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->getTextContainer()Landroid/view/View;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getTextContainer()Landroid/view/View;
 
     move-result-object v1
 
@@ -453,7 +479,7 @@
 
     invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->getTitleTv()Landroid/widget/TextView;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getTitleTv()Landroid/widget/TextView;
 
     move-result-object p2
 
@@ -469,7 +495,7 @@
 
     invoke-virtual {p2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->getDetailsTv()Landroid/widget/TextView;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getDetailsTv()Landroid/widget/TextView;
 
     move-result-object p2
 
@@ -485,7 +511,7 @@
 
     invoke-static {p2, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->getStateTv()Landroid/widget/TextView;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getStateTv()Landroid/widget/TextView;
 
     move-result-object p2
 
@@ -497,7 +523,7 @@
 
     invoke-static {p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->getTimeTv()Landroid/widget/TextView;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getTimeTv()Landroid/widget/TextView;
 
     move-result-object p2
 
@@ -511,7 +537,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
 
     move-result-object v4
 
@@ -521,7 +547,7 @@
     return-void
 
     :cond_2
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;->getTextContainer()Landroid/view/View;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getTextContainer()Landroid/view/View;
 
     move-result-object p1
 
@@ -544,3 +570,52 @@
 
     throw p1
 .end method
+
+.method protected final configureWatchButton(Lcom/discord/utilities/streams/StreamContext;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/utilities/streams/StreamContext;",
+            "Lcom/discord/app/AppPermissions;",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "appPermissions"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super {p0, p1, p2, p3}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureWatchButton(Lcom/discord/utilities/streams/StreamContext;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
+
+    if-nez p1, :cond_0
+
+    return-void
+
+    :cond_0
+    const-string v0, "findme"
+
+    const-string v1, "c1"
+
+    invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->watchStreamButton:Landroid/view/View;
+
+    new-instance v1, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;
+
+    invoke-direct {v1, p0, p2, p1, p3}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;-><init>(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;Lcom/discord/app/AppPermissions;Lcom/discord/utilities/streams/StreamContext;Lkotlin/jvm/functions/Function0;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->watchStreamButton:Landroid/view/View;
+
+    const/4 p2, 0x0
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$Companion.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion.smali
similarity index 60%
rename from com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$Companion.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion.smali
index 239328393c..eb24d426b8 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;
+.class public final Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;
 .super Ljava/lang/Object;
 .source "ViewHolderUserRichPresence.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+    value = Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,12 +26,12 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;-><init>()V
 
     return-void
 .end method
 
-.method private final getRPViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+.method private final createRPView(Landroid/view/ViewGroup;I)Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
     .locals 5
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
@@ -46,7 +46,7 @@
 
     const-string v2, "inflater.inflate(R.layou\u2026er_rich_presence, parent)"
 
-    const v3, 0x7f0d01d4
+    const v3, 0x7f0d01e2
 
     if-eq p2, v1, :cond_3
 
@@ -62,7 +62,7 @@
 
     if-eq p2, v4, :cond_0
 
-    new-instance p2, Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+    new-instance p2, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 
     invoke-virtual {v0, v3, p1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -74,14 +74,14 @@
 
     const/4 v2, 0x0
 
-    invoke-direct {p2, p1, v0, v1, v2}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;-><init>(Landroid/view/View;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p2, p1, v0, v1, v2}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;-><init>(Landroid/view/View;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p2
 
     :cond_0
-    new-instance p2, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;
+    new-instance p2, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;
 
-    const v1, 0x7f0d01ba
+    const v1, 0x7f0d01ca
 
     invoke-virtual {v0, v1, p1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -91,16 +91,16 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p2, p1}, Lcom/discord/widgets/user/ViewHolderStreamRichPresence;-><init>(Landroid/view/View;)V
+    invoke-direct {p2, p1}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;-><init>(Landroid/view/View;)V
 
-    check-cast p2, Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+    check-cast p2, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 
     return-object p2
 
     :cond_1
-    new-instance p2, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;
+    new-instance p2, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;
 
-    const v1, 0x7f0d015a
+    const v1, 0x7f0d0164
 
     invoke-virtual {v0, v1, p1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -110,16 +110,16 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p2, p1}, Lcom/discord/widgets/user/ViewHolderPlatformRichPresence;-><init>(Landroid/view/View;)V
+    invoke-direct {p2, p1}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;-><init>(Landroid/view/View;)V
 
-    check-cast p2, Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+    check-cast p2, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 
     return-object p2
 
     :cond_2
-    new-instance p2, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;
+    new-instance p2, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;
 
-    const v1, 0x7f0d0152
+    const v1, 0x7f0d015b
 
     invoke-virtual {v0, v1, p1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -129,14 +129,14 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p2, p1}, Lcom/discord/widgets/user/ViewHolderMusicRichPresence;-><init>(Landroid/view/View;)V
+    invoke-direct {p2, p1}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;-><init>(Landroid/view/View;)V
 
-    check-cast p2, Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+    check-cast p2, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 
     return-object p2
 
     :cond_3
-    new-instance p2, Lcom/discord/widgets/user/ViewHolderGameRichPresence;
+    new-instance p2, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;
 
     invoke-virtual {v0, v3, p1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -144,9 +144,9 @@
 
     invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p2, p1}, Lcom/discord/widgets/user/ViewHolderGameRichPresence;-><init>(Landroid/view/View;)V
+    invoke-direct {p2, p1}, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;-><init>(Landroid/view/View;)V
 
-    check-cast p2, Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+    check-cast p2, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 
     return-object p2
 .end method
@@ -219,7 +219,7 @@
 
 
 # virtual methods
-.method public final setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+.method public final setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
     .locals 1
 
     const-string v0, "parent"
@@ -228,15 +228,15 @@
 
     move-object v0, p0
 
-    check-cast v0, Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;
+    check-cast v0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;
 
-    invoke-direct {v0, p2, p3}, Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;->getRPViewHolderType(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;)I
+    invoke-direct {v0, p2, p3}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;->getRPViewHolderType(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;)I
 
     move-result p2
 
     if-eqz p4, :cond_1
 
-    invoke-virtual {p4}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->getRichPresenceType()I
+    invoke-virtual {p4}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getRichPresenceType()I
 
     move-result p3
 
@@ -249,23 +249,11 @@
 
     :cond_1
     :goto_0
-    if-eqz p4, :cond_2
+    invoke-virtual {p1}, Landroid/view/ViewGroup;->removeAllViews()V
 
-    invoke-static {p4}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->access$getContainerView$p(Lcom/discord/widgets/user/ViewHolderUserRichPresence;)Landroid/view/View;
+    sget-object p3, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->Companion:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;
 
-    move-result-object p3
-
-    goto :goto_1
-
-    :cond_2
-    const/4 p3, 0x0
-
-    :goto_1
-    invoke-virtual {p1, p3}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
-
-    sget-object p3, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->Companion:Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;
-
-    invoke-direct {p3, p1, p2}, Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;->getRPViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+    invoke-direct {p3, p1, p2}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;->createRPView(Landroid/view/ViewGroup;I)Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1.smali
new file mode 100644
index 0000000000..7005ab21b7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1;
+.super Lkotlin/jvm/internal/l;
+.source "ViewHolderUserRichPresence.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUiTimestamp(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/app/AppComponent;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lrx/Subscription;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lrx/Subscription;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1;->invoke(Lrx/Subscription;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lrx/Subscription;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2.smali
new file mode 100644
index 0000000000..867de06471
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2.smali
@@ -0,0 +1,79 @@
+.class final Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;
+.super Lkotlin/jvm/internal/l;
+.source "ViewHolderUserRichPresence.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUiTimestamp(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/app/AppComponent;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Long;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $model:Lcom/discord/models/domain/ModelPresence$Activity;
+
+.field final synthetic this$0:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;Lcom/discord/models/domain/ModelPresence$Activity;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;->this$0:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;->$model:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;->invoke(Ljava/lang/Long;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/Long;)V
+    .locals 1
+
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;->this$0:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;->$model:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$Activity;->getTimestamps()Lcom/discord/models/domain/ModelPresence$Timestamps;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->setTimeTextViews(Lcom/discord/models/domain/ModelPresence$Timestamps;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali
similarity index 58%
rename from com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali
rename to com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali
index 86210b669d..072bd61078 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali
@@ -1,4 +1,4 @@
-.class public Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+.class public Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 .super Ljava/lang/Object;
 .source "ViewHolderUserRichPresence.kt"
 
@@ -6,7 +6,7 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;
+        Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;
     }
 .end annotation
 
@@ -14,7 +14,7 @@
 # static fields
 .field public static final BASE_RP_TYPE:I = 0x0
 
-.field public static final Companion:Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;
+.field public static final Companion:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;
 
 .field public static final GAME_RP_TYPE:I = 0x1
 
@@ -53,13 +53,13 @@
 .method static constructor <clinit>()V
     .locals 2
 
-    new-instance v0, Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;
+    new-instance v0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;
 
     const/4 v1, 0x0
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->Companion:Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;
+    sput-object v0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->Companion:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;
 
     return-void
 .end method
@@ -73,13 +73,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    iput p2, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->richPresenceType:I
+    iput p2, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->richPresenceType:I
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a055f
+    const p2, 0x7f0a0579
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -87,11 +87,11 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->largeIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->largeIv:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a0560
+    const p2, 0x7f0a057a
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -99,11 +99,11 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a055e
+    const p2, 0x7f0a0578
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -111,11 +111,11 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->headerTv:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->headerTv:Landroid/widget/TextView;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a0568
+    const p2, 0x7f0a0582
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -123,11 +123,11 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->titleTv:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->titleTv:Landroid/widget/TextView;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a055d
+    const p2, 0x7f0a0577
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -135,11 +135,11 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->detailsTv:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->detailsTv:Landroid/widget/TextView;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a0567
+    const p2, 0x7f0a0581
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -147,11 +147,11 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->timeTv:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->timeTv:Landroid/widget/TextView;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a0565
+    const p2, 0x7f0a057f
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -159,17 +159,17 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->stateTv:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->stateTv:Landroid/widget/TextView;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a055c
+    const p2, 0x7f0a0576
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->textContainer:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->textContainer:Landroid/view/View;
 
     return-void
 .end method
@@ -184,36 +184,68 @@
     const/4 p2, 0x0
 
     :cond_0
-    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;-><init>(Landroid/view/View;I)V
+    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;-><init>(Landroid/view/View;I)V
 
     return-void
 .end method
 
-.method public static final synthetic access$getContainerView$p(Lcom/discord/widgets/user/ViewHolderUserRichPresence;)Landroid/view/View;
+.method public static final synthetic access$getPerSecondTimerSubscription$p(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)Lrx/Subscription;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object p0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->perSecondTimerSubscription:Lrx/Subscription;
 
     return-object p0
 .end method
 
-.method public static final synthetic access$getPerSecondTimerSubscription$p(Lcom/discord/widgets/user/ViewHolderUserRichPresence;)Lrx/Subscription;
+.method public static final synthetic access$setPerSecondTimerSubscription$p(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;Lrx/Subscription;)V
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->perSecondTimerSubscription:Lrx/Subscription;
-
-    return-object p0
-.end method
-
-.method public static final synthetic access$setPerSecondTimerSubscription$p(Lcom/discord/widgets/user/ViewHolderUserRichPresence;Lrx/Subscription;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->perSecondTimerSubscription:Lrx/Subscription;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->perSecondTimerSubscription:Lrx/Subscription;
 
     return-void
 .end method
 
-.method public static synthetic setImageAndVisibilityBy$default(Lcom/discord/widgets/user/ViewHolderUserRichPresence;Landroid/widget/ImageView;Ljava/lang/String;ZILjava/lang/Object;)V
+.method public static synthetic configureUi$default(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+    .locals 7
+
+    if-nez p8, :cond_1
+
+    and-int/lit8 p7, p7, 0x20
+
+    if-eqz p7, :cond_0
+
+    const/4 p6, 0x0
+
+    :cond_0
+    move-object v6, p6
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    move-object v2, p2
+
+    move v3, p3
+
+    move-object v4, p4
+
+    move-object v5, p5
+
+    invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
+
+    return-void
+
+    :cond_1
+    new-instance p0, Ljava/lang/UnsupportedOperationException;
+
+    const-string p1, "Super calls with default arguments not supported in this target, function: configureUi"
+
+    invoke-direct {p0, p1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static synthetic setImageAndVisibilityBy$default(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;Landroid/widget/ImageView;Ljava/lang/String;ZILjava/lang/Object;)V
     .locals 0
 
     if-nez p5, :cond_1
@@ -225,7 +257,7 @@
     const/4 p3, 0x0
 
     :cond_0
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->setImageAndVisibilityBy(Landroid/widget/ImageView;Ljava/lang/String;Z)V
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->setImageAndVisibilityBy(Landroid/widget/ImageView;Ljava/lang/String;Z)V
 
     return-void
 
@@ -239,12 +271,12 @@
     throw p0
 .end method
 
-.method public static final setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+.method public static final setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
     .locals 1
 
-    sget-object v0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->Companion:Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;
+    sget-object v0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->Companion:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;
 
-    invoke-virtual {v0, p0, p1, p2, p3}, Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;->setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+    invoke-virtual {v0, p0, p1, p2, p3}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;->setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 
     move-result-object p0
 
@@ -276,7 +308,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->largeIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->largeIv:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -284,7 +316,7 @@
 
     invoke-virtual {p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -348,7 +380,7 @@
     move-result-object p2
 
     :cond_3
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->largeIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->largeIv:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -368,9 +400,9 @@
 
     move-object v9, p1
 
-    invoke-static/range {v4 .. v9}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->setImageAndVisibilityBy$default(Lcom/discord/widgets/user/ViewHolderUserRichPresence;Landroid/widget/ImageView;Ljava/lang/String;ZILjava/lang/Object;)V
+    invoke-static/range {v4 .. v9}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->setImageAndVisibilityBy$default(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;Landroid/widget/ImageView;Ljava/lang/String;ZILjava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->largeIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->largeIv:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-static {p1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -382,15 +414,15 @@
 
     invoke-virtual {p1, v2}, Lcom/facebook/drawee/view/SimpleDraweeView;->setContentDescription(Ljava/lang/CharSequence;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
-    invoke-virtual {p0, p1, p2, v2}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->setImageAndVisibilityBy(Landroid/widget/ImageView;Ljava/lang/String;Z)V
+    invoke-virtual {p0, p1, p2, v2}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->setImageAndVisibilityBy(Landroid/widget/ImageView;Ljava/lang/String;Z)V
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -433,7 +465,7 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object v2, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
     invoke-virtual {v2}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -441,7 +473,7 @@
 
     if-eqz v2, :cond_1
 
-    const v3, 0x7f121215
+    const v3, 0x7f12125b
 
     const/4 v4, 0x2
 
@@ -487,6 +519,10 @@
     const-string v1, ""
 
     :cond_3
+    const-string v2, "model.party?.run {\n     \u2026)\n        }\n      } ?: \"\""
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v2, Ljava/lang/StringBuilder;
 
     invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
@@ -530,13 +566,13 @@
     move-object p2, v0
 
     :goto_1
-    iget-object v1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->headerTv:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->headerTv:Landroid/widget/TextView;
 
     const-string v2, "headerTv"
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v3, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->headerTv:Landroid/widget/TextView;
+    iget-object v3, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->headerTv:Landroid/widget/TextView;
 
     invoke-static {v3, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -554,7 +590,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->titleTv:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->titleTv:Landroid/widget/TextView;
 
     const-string v2, "titleTv"
 
@@ -568,7 +604,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->detailsTv:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->detailsTv:Landroid/widget/TextView;
 
     const-string v2, "detailsTv"
 
@@ -578,7 +614,7 @@
 
     invoke-static {v1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
-    iget-object p2, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->stateTv:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->stateTv:Landroid/widget/TextView;
 
     const-string v1, "stateTv"
 
@@ -604,7 +640,7 @@
 
     invoke-static {p2, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
-    iget-object p2, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->timeTv:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->timeTv:Landroid/widget/TextView;
 
     const-string v1, "timeTv"
 
@@ -616,7 +652,7 @@
 
     if-eqz p1, :cond_7
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
 
     move-result-object v0
 
@@ -626,14 +662,57 @@
     return-void
 .end method
 
-.method public configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
-    .locals 0
+.method public configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;)V
+    .locals 9
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->disposeTimer()V
+    const/4 v6, 0x0
+
+    const/16 v7, 0x20
+
+    const/4 v8, 0x0
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    move-object v2, p2
+
+    move v3, p3
+
+    move-object v4, p4
+
+    move-object v5, p5
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUi$default(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+            "Lcom/discord/utilities/streams/StreamContext;",
+            "Z",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/app/AppPermissions;",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string p3, "appPermissions"
+
+    invoke-static {p5, p3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->disposeTimer()V
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object p1
 
@@ -647,7 +726,7 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
     const/16 p2, 0x8
 
@@ -656,15 +735,15 @@
     return-void
 
     :cond_1
-    iget-object p3, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object p3, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
     const/4 p4, 0x0
 
     invoke-virtual {p3, p4}, Landroid/view/View;->setVisibility(I)V
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureTextUi(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureTextUi(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;)V
 
-    iget-object p3, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->textContainer:Landroid/view/View;
+    iget-object p3, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->textContainer:Landroid/view/View;
 
     const-string p4, "textContainer"
 
@@ -674,7 +753,9 @@
 
     invoke-virtual {p3, p4}, Landroid/view/View;->setSelected(Z)V
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureAssetUi(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;)V
+    invoke-virtual {p0, p2, p5, p6}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureWatchButton(Lcom/discord/utilities/streams/StreamContext;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureAssetUi(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;)V
 
     return-void
 .end method
@@ -688,7 +769,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
     invoke-virtual {v0}, Landroid/view/View;->getVisibility()I
 
@@ -702,7 +783,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0, v0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
 
     move-result-object v0
 
@@ -717,7 +798,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->perSecondTimerSubscription:Lrx/Subscription;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->perSecondTimerSubscription:Lrx/Subscription;
 
     if-nez v0, :cond_2
 
@@ -747,9 +828,9 @@
 
     const/4 v3, 0x0
 
-    new-instance p2, Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1;
+    new-instance p2, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1;
 
-    invoke-direct {p2, p0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$1;-><init>(Lcom/discord/widgets/user/ViewHolderUserRichPresence;)V
+    invoke-direct {p2, p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1;-><init>(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)V
 
     move-object v4, p2
 
@@ -759,9 +840,9 @@
 
     const/4 v6, 0x0
 
-    new-instance p2, Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2;
+    new-instance p2, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;
 
-    invoke-direct {p2, p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence$configureUiTimestamp$2;-><init>(Lcom/discord/widgets/user/ViewHolderUserRichPresence;Lcom/discord/models/domain/ModelPresence$Activity;)V
+    invoke-direct {p2, p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;-><init>(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;Lcom/discord/models/domain/ModelPresence$Activity;)V
 
     move-object v7, p2
 
@@ -778,7 +859,27 @@
 
     :cond_3
     :goto_1
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->disposeTimer()V
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->disposeTimer()V
+
+    return-void
+.end method
+
+.method protected configureWatchButton(Lcom/discord/utilities/streams/StreamContext;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/utilities/streams/StreamContext;",
+            "Lcom/discord/app/AppPermissions;",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string p1, "appPermissions"
+
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
@@ -786,7 +887,7 @@
 .method public disposeSubscriptions()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->disposeTimer()V
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->disposeTimer()V
 
     return-void
 .end method
@@ -794,7 +895,7 @@
 .method protected final disposeTimer()V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->perSecondTimerSubscription:Lrx/Subscription;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->perSecondTimerSubscription:Lrx/Subscription;
 
     if-eqz v0, :cond_0
 
@@ -803,7 +904,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->perSecondTimerSubscription:Lrx/Subscription;
+    iput-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->perSecondTimerSubscription:Lrx/Subscription;
 
     return-void
 .end method
@@ -835,9 +936,9 @@
 
     move-result-wide v8
 
-    const p1, 0x7f121217
+    const p1, 0x7f12125d
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
 
     move-result-object v10
 
@@ -866,9 +967,9 @@
 
     move-result-wide v8
 
-    const p1, 0x7f121219
+    const p1, 0x7f12125f
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
 
     move-result-object v10
 
@@ -887,7 +988,7 @@
 .method protected final getDetailsTv()Landroid/widget/TextView;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->detailsTv:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->detailsTv:Landroid/widget/TextView;
 
     return-object v0
 .end method
@@ -895,7 +996,7 @@
 .method protected final getHeaderTv()Landroid/widget/TextView;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->headerTv:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->headerTv:Landroid/widget/TextView;
 
     return-object v0
 .end method
@@ -903,7 +1004,7 @@
 .method protected final getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->largeIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->largeIv:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     return-object v0
 .end method
@@ -911,7 +1012,7 @@
 .method protected final getRichPresenceType()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->richPresenceType:I
+    iget v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->richPresenceType:I
 
     return v0
 .end method
@@ -919,7 +1020,7 @@
 .method protected final getSmallIv()Landroid/widget/ImageView;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
 
     return-object v0
 .end method
@@ -927,7 +1028,7 @@
 .method protected final getStateTv()Landroid/widget/TextView;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->stateTv:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->stateTv:Landroid/widget/TextView;
 
     return-object v0
 .end method
@@ -935,7 +1036,7 @@
 .method protected final getString(I)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
     invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -958,7 +1059,7 @@
 .method protected final getTextContainer()Landroid/view/View;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->textContainer:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->textContainer:Landroid/view/View;
 
     return-object v0
 .end method
@@ -966,7 +1067,7 @@
 .method protected final getTimeTv()Landroid/widget/TextView;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->timeTv:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->timeTv:Landroid/widget/TextView;
 
     return-object v0
 .end method
@@ -974,7 +1075,7 @@
 .method protected final getTitleTv()Landroid/widget/TextView;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->titleTv:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->titleTv:Landroid/widget/TextView;
 
     return-object v0
 .end method
@@ -1048,7 +1149,7 @@
 .method protected setTimeTextViews(Lcom/discord/models/domain/ModelPresence$Timestamps;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->timeTv:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->timeTv:Landroid/widget/TextView;
 
     const-string v1, "timeTv"
 
@@ -1056,7 +1157,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->friendlyTime(Lcom/discord/models/domain/ModelPresence$Timestamps;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI.smali
new file mode 100644
index 0000000000..f3f0907254
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Object;)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
+
+    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$NWAoDG9wGZB3UxPiTN1z6Brd-YA.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY.smali
similarity index 52%
rename from com.discord/smali/com/discord/widgets/user/-$$Lambda$NWAoDG9wGZB3UxPiTN1z6Brd-YA.smali
rename to com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY.smali
index ba11fcecf9..b58e5e9005 100644
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$NWAoDG9wGZB3UxPiTN1z6Brd-YA.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$NWAoDG9wGZB3UxPiTN1z6Brd-YA;
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;
 .super Ljava/lang/Object;
 .source "lambda"
 
@@ -7,18 +7,18 @@
 
 
 # static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/-$$Lambda$NWAoDG9wGZB3UxPiTN1z6Brd-YA;
+.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;
 
 
 # direct methods
 .method static synthetic constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$NWAoDG9wGZB3UxPiTN1z6Brd-YA;
+    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;
 
-    invoke-direct {v0}, Lcom/discord/widgets/user/-$$Lambda$NWAoDG9wGZB3UxPiTN1z6Brd-YA;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/user/-$$Lambda$NWAoDG9wGZB3UxPiTN1z6Brd-YA;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$NWAoDG9wGZB3UxPiTN1z6Brd-YA;
+    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;
 
     return-void
 .end method
@@ -46,7 +46,7 @@
 
     move-result p3
 
-    invoke-static {p1, p2, p3}, Lcom/discord/widgets/user/WidgetUserProfile$Model;->create(Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;I)Lcom/discord/widgets/user/WidgetUserProfile$Model;
+    invoke-static {p1, p2, p3}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->create(Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;I)Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4.smali
similarity index 60%
rename from com.discord/smali/com/discord/widgets/user/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4.smali
rename to com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4.smali
index ec64547a0f..45c2fd924e 100644
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
 .super Ljava/lang/Object;
 .source "lambda"
 
@@ -7,18 +7,18 @@
 
 
 # static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
+.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
 
 
 # direct methods
 .method static synthetic constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
+    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
 
-    invoke-direct {v0}, Lcom/discord/widgets/user/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/user/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
+    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4.smali
similarity index 59%
rename from com.discord/smali/com/discord/widgets/user/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4.smali
rename to com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4.smali
index 555235e548..1a301b4162 100644
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
 .super Ljava/lang/Object;
 .source "lambda"
 
@@ -7,18 +7,18 @@
 
 
 # static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
+.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
 
 
 # direct methods
 .method static synthetic constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
+    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
 
-    invoke-direct {v0}, Lcom/discord/widgets/user/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/user/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
+    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$OShgKJUNgkGAmZbvdNybwxrNxhs.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY.smali
similarity index 52%
rename from com.discord/smali/com/discord/widgets/user/-$$Lambda$OShgKJUNgkGAmZbvdNybwxrNxhs.smali
rename to com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY.smali
index d2ce13c172..2e1037a0a0 100644
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$OShgKJUNgkGAmZbvdNybwxrNxhs.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$OShgKJUNgkGAmZbvdNybwxrNxhs;
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;
 .super Ljava/lang/Object;
 .source "lambda"
 
@@ -7,18 +7,18 @@
 
 
 # static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/-$$Lambda$OShgKJUNgkGAmZbvdNybwxrNxhs;
+.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;
 
 
 # direct methods
 .method static synthetic constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$OShgKJUNgkGAmZbvdNybwxrNxhs;
+    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;
 
-    invoke-direct {v0}, Lcom/discord/widgets/user/-$$Lambda$OShgKJUNgkGAmZbvdNybwxrNxhs;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/user/-$$Lambda$OShgKJUNgkGAmZbvdNybwxrNxhs;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$OShgKJUNgkGAmZbvdNybwxrNxhs;
+    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;
 
     return-void
 .end method
@@ -46,7 +46,7 @@
 
     move-object v2, p3
 
-    check-cast v2, Lcom/discord/widgets/user/ModelRichPresence;
+    check-cast v2, Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     check-cast p4, Ljava/lang/Long;
 
@@ -58,7 +58,7 @@
 
     check-cast v5, Lcom/discord/utilities/streams/StreamContext;
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->create(Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/String;Lcom/discord/widgets/user/ModelRichPresence;JLcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
+    invoke-static/range {v0 .. v5}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->create(Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/String;Lcom/discord/widgets/user/presence/ModelRichPresence;JLcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w.smali
new file mode 100644
index 0000000000..d4aca46c75
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+.field private final synthetic f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
+
+    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureActionButtons$8$WidgetUserProfile(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;Landroid/view/View;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8.smali
new file mode 100644
index 0000000000..427ca9ac38
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+.field private final synthetic f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
+
+    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureUI$3$WidgetUserProfile(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;Landroid/view/View;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0.smali
new file mode 100644
index 0000000000..308c7953d4
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureActionButtons$6$WidgetUserProfile(Landroid/view/View;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI.smali
new file mode 100644
index 0000000000..a768d1ce3a
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI.smali
@@ -0,0 +1,46 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lrx/functions/Action2;
+
+
+# static fields
+.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;
+
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;
+
+    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;Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Landroid/view/MenuItem;
+
+    check-cast p2, Landroid/content/Context;
+
+    invoke-static {p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$onViewBound$0(Landroid/view/MenuItem;Landroid/content/Context;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8.smali
new file mode 100644
index 0000000000..ff4bcb7d0c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureActionButtons$10$WidgetUserProfile(Landroid/view/View;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ.smali
new file mode 100644
index 0000000000..64427a5778
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ.smali
@@ -0,0 +1,46 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# static fields
+.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;
+
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;
+
+    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 invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->lambda$get$0(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI.smali
new file mode 100644
index 0000000000..c0880612cd
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureActionButtons$9$WidgetUserProfile(Landroid/view/View;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ.smali
new file mode 100644
index 0000000000..deddc827c7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Object;)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    check-cast p1, Landroid/view/Menu;
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureUI$2$WidgetUserProfile(Landroid/view/Menu;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU.smali
new file mode 100644
index 0000000000..b707447aa0
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU.smali
@@ -0,0 +1,42 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+.field private final synthetic f$1:I
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;I)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    iput p2, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;->f$1:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Object;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    iget v1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;->f$1:I
+
+    check-cast p1, Ljava/lang/Void;
+
+    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$addRelationship$5$WidgetUserProfile(ILjava/lang/Void;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg.smali
new file mode 100644
index 0000000000..e2d767f64d
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Object;)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$hHhsPA-4_vC3fndRZ6imlHYxghg(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI.smali
new file mode 100644
index 0000000000..5f86d19aee
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI.smali
@@ -0,0 +1,42 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+.field private final synthetic f$1:I
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;I)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    iput p2, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;->f$1:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Object;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    iget v1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;->f$1:I
+
+    check-cast p1, Ljava/lang/Void;
+
+    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$removeRelationship$4$WidgetUserProfile(ILjava/lang/Void;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc.smali
new file mode 100644
index 0000000000..54bf75cd1a
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc.smali
@@ -0,0 +1,44 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lrx/functions/Action2;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+.field private final synthetic f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Object;Ljava/lang/Object;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
+
+    check-cast p1, Landroid/view/MenuItem;
+
+    check-cast p2, Landroid/content/Context;
+
+    invoke-virtual {v0, v1, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureUI$1$WidgetUserProfile(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;Landroid/view/MenuItem;Landroid/content/Context;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8.smali
new file mode 100644
index 0000000000..c1e0e022bb
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8.smali
@@ -0,0 +1,38 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    check-cast p1, Ljava/lang/Integer;
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$null$7$WidgetUserProfile(Ljava/lang/Integer;)Lkotlin/Unit;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno.smali
new file mode 100644
index 0000000000..9f83835f6f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Landroid/view/View$OnFocusChangeListener;
+
+
+# instance fields
+.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
+
+.field private final synthetic f$1:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onFocusChange(Landroid/view/View;Z)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
+
+    invoke-virtual {v0, v1, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->lambda$configureUI$0$WidgetUserProfileInfo(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;Landroid/view/View;Z)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI.smali
new file mode 100644
index 0000000000..728fd8cdbc
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI.smali
@@ -0,0 +1,48 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lrx/functions/Action3;
+
+
+# static fields
+.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;
+
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;
+
+    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;Ljava/lang/Object;Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Landroid/view/View;
+
+    check-cast p2, Ljava/lang/Integer;
+
+    check-cast p3, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
+
+    invoke-static {p1, p2, p3}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->lambda$new$0(Landroid/view/View;Ljava/lang/Integer;Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI.smali
new file mode 100644
index 0000000000..9f61e8724c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI.smali
@@ -0,0 +1,46 @@
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# static fields
+.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;
+
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;
+
+    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 invoke()Ljava/lang/Object;
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
+
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;-><init>()V
+
+    check-cast v0, Landroidx/fragment/app/Fragment;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg.smali
similarity index 59%
rename from com.discord/smali/com/discord/widgets/user/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg.smali
rename to com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg.smali
index 0602fe3091..0e67b1cb9f 100644
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
+.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
 .super Ljava/lang/Object;
 .source "lambda"
 
@@ -7,18 +7,18 @@
 
 
 # static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
+.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
 
 
 # direct methods
 .method static synthetic constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
+    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
 
-    invoke-direct {v0}, Lcom/discord/widgets/user/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/user/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
+    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/RightToLeftGridLayoutManager.smali b/com.discord/smali/com/discord/widgets/user/profile/RightToLeftGridLayoutManager.smali
new file mode 100644
index 0000000000..9e245db3a7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/RightToLeftGridLayoutManager.smali
@@ -0,0 +1,55 @@
+.class public final Lcom/discord/widgets/user/profile/RightToLeftGridLayoutManager;
+.super Landroidx/recyclerview/widget/GridLayoutManager;
+.source "RightToLeftGridLayoutManager.kt"
+
+
+# direct methods
+.method public constructor <init>(Landroid/content/Context;I)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1, p2}, Landroidx/recyclerview/widget/GridLayoutManager;-><init>(Landroid/content/Context;I)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;IIZ)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(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
+.end method
+
+
+# virtual methods
+.method public final isLayoutRTL()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView$ViewState.smali b/com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView$ViewState.smali
new file mode 100644
index 0000000000..33464f895a
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView$ViewState.smali
@@ -0,0 +1,285 @@
+.class public final Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;
+.super Ljava/lang/Object;
+.source "UserAvatarPresenceView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/profile/UserAvatarPresenceView;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ViewState"
+.end annotation
+
+
+# instance fields
+.field private final presence:Lcom/discord/models/domain/ModelPresence;
+
+.field private final streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+.field private final user:Lcom/discord/models/domain/ModelUser;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;)V
+    .locals 1
+
+    const-string v0, "user"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;ILjava/lang/Object;)Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;
+    .locals 0
+
+    and-int/lit8 p5, p4, 0x1
+
+    if-eqz p5, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    :cond_0
+    and-int/lit8 p5, p4, 0x2
+
+    if-eqz p5, :cond_1
+
+    iget-object p2, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    :cond_1
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_2
+
+    iget-object p3, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    :cond_2
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final component2()Lcom/discord/models/domain/ModelPresence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    return-object v0
+.end method
+
+.method public final component3()Lcom/discord/utilities/streams/StreamContext;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;
+    .locals 1
+
+    const-string v0, "user"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;
+
+    invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v1, p1, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    iget-object v1, p1, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    iget-object p1, p1, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getPresence()Lcom/discord/models/domain/ModelPresence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    return-object v0
+.end method
+
+.method public final getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    return-object v0
+.end method
+
+.method public final getUser()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    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 final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "ViewState(user="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", presence="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", streamContext="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView.smali b/com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView.smali
new file mode 100644
index 0000000000..29bdb54734
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView.smali
@@ -0,0 +1,419 @@
+.class public final Lcom/discord/widgets/user/profile/UserAvatarPresenceView;
+.super Landroid/widget/RelativeLayout;
+.source "UserAvatarPresenceView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;
+    }
+.end annotation
+
+
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+
+# instance fields
+.field private final avatarSimpleDraweeView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final imagesChangeDetector:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
+
+.field private final presenceIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final presencePadding$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 6
+
+    const-class v0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;
+
+    const/4 v1, 0x3
+
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "avatarSimpleDraweeView"
+
+    const-string v5, "getAvatarSimpleDraweeView()Lcom/facebook/drawee/view/SimpleDraweeView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "presencePadding"
+
+    const-string v5, "getPresencePadding()Lcom/facebook/drawee/view/SimpleDraweeView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x1
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    const-string v3, "presenceIndicator"
+
+    const-string v4, "getPresenceIndicator()Landroid/widget/ImageView;"
+
+    invoke-direct {v2, v0, v3, v4}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x2
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+    .locals 2
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(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, 0x7f0a07a0
+
+    invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->avatarSimpleDraweeView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07a3
+
+    invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->presencePadding$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07a2
+
+    invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->presenceIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    new-instance v0, Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
+
+    invoke-direct {v0}, Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;-><init>()V
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->imagesChangeDetector:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
+
+    move-object v0, p0
+
+    check-cast v0, Landroid/view/ViewGroup;
+
+    const v1, 0x7f0d00b8
+
+    invoke-static {p1, v1, v0}, Landroid/widget/RelativeLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    sget-object v0, Lcom/discord/R$a;->UserAvatarPresenceView:[I
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[I)Landroid/content/res/TypedArray;
+
+    move-result-object p1
+
+    move-object p2, p0
+
+    check-cast p2, Landroid/view/View;
+
+    const v0, 0x7f0402af
+
+    invoke-static {p2, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+
+    move-result p2
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1, v0, p2}, Landroid/content/res/TypedArray;->getColor(II)I
+
+    move-result p2
+
+    invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
+
+    invoke-virtual {p0, p2}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->setAvatarBackgroundColor(I)V
+
+    return-void
+.end method
+
+.method private final getAvatarSimpleDraweeView()Lcom/facebook/drawee/view/SimpleDraweeView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->avatarSimpleDraweeView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->$$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/facebook/drawee/view/SimpleDraweeView;
+
+    return-object v0
+.end method
+
+.method private final getPresenceIndicator()Landroid/widget/ImageView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->presenceIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->$$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 getPresencePadding()Lcom/facebook/drawee/view/SimpleDraweeView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->presencePadding$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->$$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/facebook/drawee/view/SimpleDraweeView;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public final setAvatarBackgroundColor(I)V
+    .locals 3
+
+    invoke-static {}, Lcom/facebook/drawee/generic/d;->hd()Lcom/facebook/drawee/generic/d;
+
+    move-result-object v0
+
+    const-string v1, "roundingParams"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lcom/facebook/drawee/generic/d$a;->NI:Lcom/facebook/drawee/generic/d$a;
+
+    iput-object v1, v0, Lcom/facebook/drawee/generic/d;->NF:Lcom/facebook/drawee/generic/d$a;
+
+    invoke-virtual {v0, p1}, Lcom/facebook/drawee/generic/d;->W(I)Lcom/facebook/drawee/generic/d;
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->getAvatarSimpleDraweeView()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getHierarchy()Lcom/facebook/drawee/d/b;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+
+    const-string v2, "avatarSimpleDraweeView.hierarchy"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->a(Lcom/facebook/drawee/generic/d;)V
+
+    new-instance v0, Landroid/graphics/drawable/ShapeDrawable;
+
+    new-instance v1, Landroid/graphics/drawable/shapes/OvalShape;
+
+    invoke-direct {v1}, Landroid/graphics/drawable/shapes/OvalShape;-><init>()V
+
+    check-cast v1, Landroid/graphics/drawable/shapes/Shape;
+
+    invoke-direct {v0, v1}, Landroid/graphics/drawable/ShapeDrawable;-><init>(Landroid/graphics/drawable/shapes/Shape;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->getPresencePadding()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getHeight()I
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Landroid/graphics/drawable/ShapeDrawable;->setIntrinsicHeight(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->getPresencePadding()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getWidth()I
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Landroid/graphics/drawable/ShapeDrawable;->setIntrinsicWidth(I)V
+
+    invoke-virtual {v0}, Landroid/graphics/drawable/ShapeDrawable;->getPaint()Landroid/graphics/Paint;
+
+    move-result-object v1
+
+    const-string v2, "oval.paint"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1, p1}, Landroid/graphics/Paint;->setColor(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->getPresencePadding()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getHierarchy()Lcom/facebook/drawee/d/b;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+
+    check-cast v0, Landroid/graphics/drawable/Drawable;
+
+    invoke-virtual {p1, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->g(Landroid/graphics/drawable/Drawable;)V
+
+    return-void
+.end method
+
+.method public final updateViewState(Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;)V
+    .locals 16
+
+    const-string v0, "viewState"
+
+    move-object/from16 v1, p1
+
+    invoke-static {v1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->getAvatarSimpleDraweeView()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object v0
+
+    move-object v2, v0
+
+    check-cast v2, Landroid/widget/ImageView;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v0
+
+    const/4 v9, 0x1
+
+    invoke-static {v0, v9}, Lcom/discord/utilities/icon/IconUtils;->getForUser(Lcom/discord/models/domain/ModelUser;Z)Ljava/lang/String;
+
+    move-result-object v3
+
+    move-object/from16 v0, p0
+
+    iget-object v4, v0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->imagesChangeDetector:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
+
+    move-object v6, v4
+
+    check-cast v6, Lcom/discord/utilities/images/MGImages$ChangeDetector;
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/16 v7, 0xc
+
+    const/4 v8, 0x0
+
+    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-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->getPresence()Lcom/discord/models/domain/ModelPresence;
+
+    move-result-object v10
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    const/4 v11, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v9, 0x0
+
+    const/4 v11, 0x0
+
+    :goto_0
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->getPresenceIndicator()Landroid/widget/ImageView;
+
+    move-result-object v12
+
+    const/4 v13, 0x0
+
+    const/16 v14, 0x8
+
+    const/4 v15, 0x0
+
+    invoke-static/range {v10 .. v15}, Lcom/discord/utilities/presence/PresenceUtils;->setPresence$default(Lcom/discord/models/domain/ModelPresence;ZLandroid/widget/ImageView;Landroid/widget/TextView;ILjava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$1.smali
new file mode 100644
index 0000000000..ee9f0754cf
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$1.smali
@@ -0,0 +1,94 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileHeaderView$1;
+.super Lkotlin/jvm/internal/l;
+.source "UserProfileHeaderView.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Landroid/view/LayoutInflater;",
+        "Landroid/view/ViewGroup;",
+        "Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    const/4 p1, 0x2
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final invoke(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;)Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;
+    .locals 2
+
+    const-string v0, "inflater"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "parent"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f0d0074
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p1, v0, p2, v1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
+
+    move-result-object p1
+
+    new-instance p2, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    const-string v1, "itemView"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(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
+.end method
+
+.method public final bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroid/view/LayoutInflater;
+
+    check-cast p2, Landroid/view/ViewGroup;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$1;->invoke(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;)Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder$bind$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder$bind$1.smali
new file mode 100644
index 0000000000..e7a4afd7db
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder$bind$1.smali
@@ -0,0 +1,57 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder$bind$1;
+.super Ljava/lang/Object;
+.source "UserProfileHeaderView.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;->bind(Lcom/discord/widgets/user/Badge;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $badge:Lcom/discord/widgets/user/Badge;
+
+.field final synthetic this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;Lcom/discord/widgets/user/Badge;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder$bind$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder$bind$1;->$badge:Lcom/discord/widgets/user/Badge;
+
+    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/user/profile/UserProfileHeaderView$BadgeViewHolder$bind$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;
+
+    iget-object p1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getOnBadgeClick()Lkotlin/jvm/functions/Function1;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder$bind$1;->$badge:Lcom/discord/widgets/user/Badge;
+
+    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder.smali
new file mode 100644
index 0000000000..98df14a764
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder.smali
@@ -0,0 +1,112 @@
+.class public final Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;
+.super Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;
+.source "UserProfileHeaderView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "BadgeViewHolder"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder<",
+        "Lcom/discord/widgets/user/Badge;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field private final badgeImage:Landroid/widget/ImageView;
+
+.field final synthetic this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Landroid/view/View;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/view/View;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "itemView"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(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, 0x7f0a07e6
+
+    invoke-virtual {p2, p1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    check-cast p1, Landroid/widget/ImageView;
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;->badgeImage:Landroid/widget/ImageView;
+
+    return-void
+
+    :cond_0
+    new-instance p1, Lkotlin/r;
+
+    const-string p2, "null cannot be cast to non-null type android.widget.ImageView"
+
+    invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+
+# virtual methods
+.method public final bind(Lcom/discord/widgets/user/Badge;)V
+    .locals 2
+
+    const-string v0, "badge"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;->badgeImage:Landroid/widget/ImageView;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/Badge;->getIcon()I
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;->badgeImage:Landroid/widget/ImageView;
+
+    new-instance v1, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder$bind$1;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder$bind$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;Lcom/discord/widgets/user/Badge;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
+
+.method public final bridge synthetic bind(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/user/Badge;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;->bind(Lcom/discord/widgets/user/Badge;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1.smali
new file mode 100644
index 0000000000..216d2bb0d4
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1.smali
@@ -0,0 +1,97 @@
+.class final synthetic Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1;
+.super Lkotlin/jvm/internal/j;
+.source "UserProfileHeaderView.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;->bind(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Landroidx/fragment/app/Fragment;Lcom/discord/app/AppComponent;JLjava/lang/Long;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)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}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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;)V"
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1;->invoke(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1;->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;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$Companion.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$Companion.smali
new file mode 100644
index 0000000000..79456e20e6
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$Companion.smali
@@ -0,0 +1,112 @@
+.class public final Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;
+.super Ljava/lang/Object;
+.source "UserProfileHeaderView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/user/profile/UserProfileHeaderView$Companion;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.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-string v0, "$this$bind"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "host"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "appComponent"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;
+
+    invoke-direct {v0, p4, p5, p6}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;-><init>(JLjava/lang/Long;)V
+
+    check-cast v0, Landroidx/lifecycle/ViewModelProvider$Factory;
+
+    invoke-static {p2, v0}, Landroidx/lifecycle/ViewModelProviders;->of(Landroidx/fragment/app/Fragment;Landroidx/lifecycle/ViewModelProvider$Factory;)Landroidx/lifecycle/ViewModelProvider;
+
+    move-result-object p4
+
+    const-class p5, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-virtual {p4, p5}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+
+    move-result-object p4
+
+    const-string p5, "ViewModelProviders.of(\n \u2026derViewModel::class.java)"
+
+    invoke-static {p4, p5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p4, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-virtual {p4}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->observeViewState()Lrx/Observable;
+
+    move-result-object p4
+
+    const/4 p5, 0x0
+
+    const/4 p6, 0x2
+
+    invoke-static {p4, p3, p5, p6, p5}, 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
+
+    invoke-virtual {p2}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    new-instance p2, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1;
+
+    invoke-direct {p2, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;)V
+
+    move-object v6, p2
+
+    check-cast v6, Lkotlin/jvm/functions/Function1;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/16 v7, 0x1e
+
+    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
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1.smali
new file mode 100644
index 0000000000..bbded8936c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1.smali
@@ -0,0 +1,79 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;
+.super Lkotlin/jvm/internal/l;
+.source "UserProfileHeaderView.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Long;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Ljava/lang/Number;
+
+    invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
+
+    move-result-wide v0
+
+    invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;->invoke(J)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(J)V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1.smali
new file mode 100644
index 0000000000..c6a031c390
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1.smali
@@ -0,0 +1,79 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;
+.super Lkotlin/jvm/internal/l;
+.source "UserProfileHeaderView.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/user/Badge;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/user/Badge;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;->invoke(Lcom/discord/widgets/user/Badge;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/user/Badge;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1.smali
new file mode 100644
index 0000000000..56c05f89aa
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1.smali
@@ -0,0 +1,63 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;
+.super Ljava/lang/Object;
+.source "UserProfileHeaderView.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderView;->updateViewState(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
+
+.field final synthetic this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Lcom/discord/models/domain/ModelUser;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;->$user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 2
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getOnAvatarClick()Lkotlin/jvm/functions/Function1;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;->$user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView.smali
new file mode 100644
index 0000000000..17da0c644c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView.smali
@@ -0,0 +1,796 @@
+.class public final Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+.super Landroidx/constraintlayout/widget/ConstraintLayout;
+.source "UserProfileHeaderView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;,
+        Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+.field public static final Companion:Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;
+
+
+# instance fields
+.field private final badgesAdapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/discord/utilities/views/SimpleRecyclerAdapter<",
+            "Lcom/discord/widgets/user/Badge;",
+            "Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final badgesRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private onAvatarClick:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Long;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private onBadgeClick:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Lcom/discord/widgets/user/Badge;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final primaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final secondaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final userAvatarPresenceView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private userProfileHeaderBackgroundColor:I
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 6
+
+    const-class v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    const/4 v1, 0x4
+
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "primaryName"
+
+    const-string v5, "getPrimaryName()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "secondaryName"
+
+    const-string v5, "getSecondaryName()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x1
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "userAvatarPresenceView"
+
+    const-string v5, "getUserAvatarPresenceView()Lcom/discord/widgets/user/profile/UserAvatarPresenceView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x2
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    const-string v3, "badgesRecycler"
+
+    const-string v4, "getBadgesRecycler()Landroidx/recyclerview/widget/RecyclerView;"
+
+    invoke-direct {v2, v0, v3, v4}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x3
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    new-instance v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->Companion:Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+    .locals 4
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(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 v0, 0x7f0a07d6
+
+    invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->primaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07d7
+
+    invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->secondaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07ce
+
+    invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->userAvatarPresenceView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07d4
+
+    invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->badgesRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;
+
+    check-cast v0, Lkotlin/jvm/functions/Function1;
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->onBadgeClick:Lkotlin/jvm/functions/Function1;
+
+    sget-object v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;
+
+    check-cast v0, Lkotlin/jvm/functions/Function1;
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->onAvatarClick:Lkotlin/jvm/functions/Function1;
+
+    move-object v0, p0
+
+    check-cast v0, Landroid/view/ViewGroup;
+
+    const v1, 0x7f0d0075
+
+    invoke-static {p1, v1, v0}, Landroidx/constraintlayout/widget/ConstraintLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    new-instance v0, Lcom/discord/widgets/user/profile/RightToLeftGridLayoutManager;
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x3
+
+    invoke-direct {v0, p1, v2, v1, v1}, 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 v2
+
+    check-cast v0, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
+
+    invoke-virtual {v2, v0}, Landroidx/recyclerview/widget/RecyclerView;->setLayoutManager(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+
+    new-instance v0, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+
+    new-instance v2, 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
+
+    check-cast v2, Lkotlin/jvm/functions/Function2;
+
+    const/4 v3, 0x0
+
+    invoke-direct {v0, v3, v2, v1, 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;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->badgesAdapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+
+    check-cast v1, Landroidx/recyclerview/widget/RecyclerView$Adapter;
+
+    invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+
+    sget-object v0, Lcom/discord/R$a;->UserProfileHeaderView:[I
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[I)Landroid/content/res/TypedArray;
+
+    move-result-object p1
+
+    move-object p2, p0
+
+    check-cast p2, Landroid/view/View;
+
+    const v0, 0x7f0402af
+
+    invoke-static {p2, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+
+    move-result p2
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1, v0, p2}, Landroid/content/res/TypedArray;->getColor(II)I
+
+    move-result p2
+
+    iput p2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->userProfileHeaderBackgroundColor:I
+
+    invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
+
+    return-void
+.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
+    .locals 7
+
+    sget-object v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->Companion:Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;
+
+    move-object v1, p0
+
+    move-object v2, p1
+
+    move-object v3, p2
+
+    move-wide v4, p3
+
+    move-object v6, p5
+
+    invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;->bind(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Landroidx/fragment/app/Fragment;Lcom/discord/app/AppComponent;JLjava/lang/Long;)V
+
+    return-void
+.end method
+
+.method private final getBadgesRecycler()Landroidx/recyclerview/widget/RecyclerView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->badgesRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->$$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, Landroidx/recyclerview/widget/RecyclerView;
+
+    return-object v0
+.end method
+
+.method private final getPrimaryName()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->primaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->$$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 getPrimaryNameTextForUser(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)Landroid/text/SpannableStringBuilder;
+    .locals 7
+
+    const/4 v0, 0x2
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    new-instance v1, Landroid/text/style/AbsoluteSizeSpan;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v2
+
+    const v3, 0x7f0b0013
+
+    invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getInteger(I)I
+
+    move-result v2
+
+    const/4 v3, 0x1
+
+    invoke-direct {v1, v2, v3}, Landroid/text/style/AbsoluteSizeSpan;-><init>(IZ)V
+
+    const/4 v2, 0x0
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Landroid/text/style/ForegroundColorSpan;
+
+    move-object v4, p0
+
+    check-cast v4, Landroid/view/View;
+
+    const v5, 0x7f040295
+
+    invoke-static {v4, v5}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+
+    move-result v4
+
+    invoke-direct {v1, v4}, Landroid/text/style/ForegroundColorSpan;-><init>(I)V
+
+    aput-object v1, v0, v3
+
+    invoke-static {v0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    const/16 v1, 0x21
+
+    if-eqz p2, :cond_1
+
+    invoke-virtual {p2}, Ljava/lang/String;->length()I
+
+    move-result p1
+
+    new-instance v3, Landroid/text/SpannableStringBuilder;
+
+    check-cast p2, Ljava/lang/CharSequence;
+
+    invoke-direct {v3, p2}, Landroid/text/SpannableStringBuilder;-><init>(Ljava/lang/CharSequence;)V
+
+    check-cast v0, Ljava/lang/Iterable;
+
+    invoke-interface {v0}, 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_0
+
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-virtual {v3, v0, v2, p1, v1}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+
+    goto :goto_0
+
+    :cond_0
+    return-object v3
+
+    :cond_1
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator()Ljava/lang/String;
+
+    move-result-object p2
+
+    new-instance v4, Landroid/text/SpannableStringBuilder;
+
+    move-object v5, p2
+
+    check-cast v5, Ljava/lang/CharSequence;
+
+    invoke-direct {v4, v5}, Landroid/text/SpannableStringBuilder;-><init>(Ljava/lang/CharSequence;)V
+
+    check-cast v0, Ljava/lang/Iterable;
+
+    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
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+
+    move-result-object v6
+
+    invoke-virtual {v6}, Ljava/lang/String;->length()I
+
+    move-result v6
+
+    invoke-virtual {v4, v5, v2, v6, v1}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+
+    goto :goto_1
+
+    :cond_2
+    new-instance v0, Landroid/text/style/AbsoluteSizeSpan;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v2
+
+    const v5, 0x7f0b0012
+
+    invoke-virtual {v2, v5}, Landroid/content/res/Resources;->getInteger(I)I
+
+    move-result v2
+
+    invoke-direct {v0, v2, v3}, Landroid/text/style/AbsoluteSizeSpan;-><init>(IZ)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result p1
+
+    invoke-virtual {p2}, Ljava/lang/String;->length()I
+
+    move-result p2
+
+    invoke-virtual {v4, v0, p1, p2, v1}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+
+    return-object v4
+.end method
+
+.method private final getSecondaryName()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->secondaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->$$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 getSecondaryNameTextForUser(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)Ljava/lang/String;
+    .locals 0
+
+    if-eqz p2, :cond_0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
+
+.method private final getUserAvatarPresenceView()Lcom/discord/widgets/user/profile/UserAvatarPresenceView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->userAvatarPresenceView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->$$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/widgets/user/profile/UserAvatarPresenceView;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public final getOnAvatarClick()Lkotlin/jvm/functions/Function1;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/jvm/functions/Function1<",
+            "Ljava/lang/Long;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->onAvatarClick:Lkotlin/jvm/functions/Function1;
+
+    return-object v0
+.end method
+
+.method public final getOnBadgeClick()Lkotlin/jvm/functions/Function1;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/jvm/functions/Function1<",
+            "Lcom/discord/widgets/user/Badge;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->onBadgeClick:Lkotlin/jvm/functions/Function1;
+
+    return-object v0
+.end method
+
+.method protected final onFinishInflate()V
+    .locals 2
+
+    invoke-super {p0}, Landroidx/constraintlayout/widget/ConstraintLayout;->onFinishInflate()V
+
+    iget v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->userProfileHeaderBackgroundColor:I
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->setBackgroundColor(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getUserAvatarPresenceView()Lcom/discord/widgets/user/profile/UserAvatarPresenceView;
+
+    move-result-object v0
+
+    iget v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->userProfileHeaderBackgroundColor:I
+
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->setAvatarBackgroundColor(I)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public final setOnAvatarClick(Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Long;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->onAvatarClick:Lkotlin/jvm/functions/Function1;
+
+    return-void
+.end method
+
+.method public final setOnBadgeClick(Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Lcom/discord/widgets/user/Badge;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->onBadgeClick:Lkotlin/jvm/functions/Function1;
+
+    return-void
+.end method
+
+.method public final updateViewState(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;)V
+    .locals 7
+
+    const-string v0, "viewState"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->getUserNickname()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getUserAvatarPresenceView()Lcom/discord/widgets/user/profile/UserAvatarPresenceView;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;
+
+    invoke-direct {v3, p0, v0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Lcom/discord/models/domain/ModelUser;)V
+
+    check-cast v3, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v2, v3}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getUserAvatarPresenceView()Lcom/discord/widgets/user/profile/UserAvatarPresenceView;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v4
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->getPresence()Lcom/discord/models/domain/ModelPresence;
+
+    move-result-object v5
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+
+    move-result-object v6
+
+    invoke-direct {v3, v4, v5, v6}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;)V
+
+    invoke-virtual {v2, v3}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->updateViewState(Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getPrimaryName()Landroid/widget/TextView;
+
+    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
+
+    check-cast v3, Ljava/lang/CharSequence;
+
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getSecondaryName()Landroid/widget/TextView;
+
+    move-result-object v2
+
+    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
+
+    check-cast v0, Ljava/lang/CharSequence;
+
+    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;->getUserProfile()Lcom/discord/models/domain/ModelUserProfile;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->getSnowsGivingHypeSquadEventWinner()I
+
+    move-result v2
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->isMeUserPremium()Z
+
+    move-result p1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getContext()Landroid/content/Context;
+
+    move-result-object v3
+
+    const-string v4, "context"
+
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v1, v2, p1, v3}, Lcom/discord/widgets/user/Badge$Companion;->getBadgesForUser(Lcom/discord/models/domain/ModelUserProfile;IZLandroid/content/Context;)Ljava/util/List;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->badgesAdapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+
+    invoke-virtual {v0, p1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->setData(Ljava/util/List;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$1.smali
new file mode 100644
index 0000000000..2a158a5f72
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$1.smali
@@ -0,0 +1,97 @@
+.class final synthetic Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$1;
+.super Lkotlin/jvm/internal/j;
+.source "UserProfileHeaderViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;-><init>(JLjava/lang/Long;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreExperiments;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)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/user/profile/UserProfileHeaderViewModel;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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/user/profile/UserProfileHeaderViewModel$StoreState;)V"
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$1;->invoke(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$1;->receiver:Ljava/lang/Object;
+
+    check-cast v0, 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
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion.smali
new file mode 100644
index 0000000000..386523043f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion.smali
@@ -0,0 +1,32 @@
+.class public final Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion;
+.super Ljava/lang/Object;
+.source "UserProfileHeaderViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/user/profile/UserProfileHeaderViewModel$Companion;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory.smali
new file mode 100644
index 0000000000..8c3616f778
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory.smali
@@ -0,0 +1,128 @@
+.class public final Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;
+.super Ljava/lang/Object;
+.source "UserProfileHeaderViewModel.kt"
+
+# interfaces
+.implements Landroidx/lifecycle/ViewModelProvider$Factory;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Factory"
+.end annotation
+
+
+# instance fields
+.field private final channelId:Ljava/lang/Long;
+
+.field private final userId:J
+
+
+# direct methods
+.method public constructor <init>(JLjava/lang/Long;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;->userId:J
+
+    iput-object p3, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;->channelId:Ljava/lang/Long;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    .locals 12
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Landroidx/lifecycle/ViewModel;",
+            ">(",
+            "Ljava/lang/Class<",
+            "TT;>;)TT;"
+        }
+    .end annotation
+
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    iget-wide v2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;->userId:J
+
+    iget-object v4, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;->channelId:Ljava/lang/Long;
+
+    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 v5
+
+    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
+
+    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 v7
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPresences()Lcom/discord/stores/StoreUserPresence;
+
+    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;->getApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
+
+    move-result-object v9
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserProfile()Lcom/discord/stores/StoreUserProfile;
+
+    move-result-object v10
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
+
+    move-result-object v11
+
+    move-object v1, p1
+
+    invoke-direct/range {v1 .. v11}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;-><init>(JLjava/lang/Long;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreExperiments;)V
+
+    check-cast p1, Landroidx/lifecycle/ViewModel;
+
+    return-object p1
+.end method
+
+.method public final getChannelId()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;->channelId:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
+.method public final getUserId()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;->userId:J
+
+    return-wide v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState.smali
new file mode 100644
index 0000000000..168508915f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState.smali
@@ -0,0 +1,667 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;
+.super Ljava/lang/Object;
+.source "UserProfileHeaderViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = "StoreState"
+.end annotation
+
+
+# instance fields
+.field private final computedMembers:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final me:Lcom/discord/models/domain/ModelUser;
+
+.field private final richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+.field private final streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+.field private final user:Lcom/discord/models/domain/ModelUser;
+
+.field private final userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+.field private final winnerBadgeExperiment:Lcom/discord/models/domain/ModelExperiment;
+
+
+# direct methods
+.method public constructor <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/models/domain/ModelExperiment;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/models/domain/ModelUser;",
+            "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/models/domain/ModelExperiment;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "me"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "user"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "computedMembers"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userProfile"
+
+    invoke-static {p6, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->me:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->user:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    iput-object p4, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    iput-object p5, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    iput-object p6, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    iput-object p7, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->winnerBadgeExperiment:Lcom/discord/models/domain/ModelExperiment;
+
+    return-void
+.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/models/domain/ModelExperiment;ILjava/lang/Object;)Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;
+    .locals 5
+
+    and-int/lit8 p9, p8, 0x1
+
+    if-eqz p9, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->me:Lcom/discord/models/domain/ModelUser;
+
+    :cond_0
+    and-int/lit8 p9, p8, 0x2
+
+    if-eqz p9, :cond_1
+
+    iget-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->user:Lcom/discord/models/domain/ModelUser;
+
+    :cond_1
+    move-object p9, p2
+
+    and-int/lit8 p2, p8, 0x4
+
+    if-eqz p2, :cond_2
+
+    iget-object p3, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    :cond_2
+    move-object v0, p3
+
+    and-int/lit8 p2, p8, 0x8
+
+    if-eqz p2, :cond_3
+
+    iget-object p4, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    :cond_3
+    move-object v1, p4
+
+    and-int/lit8 p2, p8, 0x10
+
+    if-eqz p2, :cond_4
+
+    iget-object p5, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    :cond_4
+    move-object v2, p5
+
+    and-int/lit8 p2, p8, 0x20
+
+    if-eqz p2, :cond_5
+
+    iget-object p6, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    :cond_5
+    move-object v3, p6
+
+    and-int/lit8 p2, p8, 0x40
+
+    if-eqz p2, :cond_6
+
+    iget-object p7, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->winnerBadgeExperiment:Lcom/discord/models/domain/ModelExperiment;
+
+    :cond_6
+    move-object v4, p7
+
+    move-object p2, p0
+
+    move-object p3, p1
+
+    move-object p4, p9
+
+    move-object p5, v0
+
+    move-object p6, v1
+
+    move-object p7, v2
+
+    move-object p8, v3
+
+    move-object p9, v4
+
+    invoke-virtual/range {p2 .. p9}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->copy(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/models/domain/ModelExperiment;)Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->me:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final component2()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final component3()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final component4()Lcom/discord/widgets/user/presence/ModelRichPresence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    return-object v0
+.end method
+
+.method public final component5()Lcom/discord/utilities/streams/StreamContext;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    return-object v0
+.end method
+
+.method public final component6()Lcom/discord/models/domain/ModelUserProfile;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    return-object v0
+.end method
+
+.method public final component7()Lcom/discord/models/domain/ModelExperiment;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->winnerBadgeExperiment:Lcom/discord/models/domain/ModelExperiment;
+
+    return-object v0
+.end method
+
+.method public final copy(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/models/domain/ModelExperiment;)Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/models/domain/ModelUser;",
+            "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/models/domain/ModelExperiment;",
+            ")",
+            "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;"
+        }
+    .end annotation
+
+    const-string v0, "me"
+
+    move-object v2, p1
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "user"
+
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "computedMembers"
+
+    move-object v4, p3
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userProfile"
+
+    move-object v7, p6
+
+    invoke-static {p6, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;
+
+    move-object v1, v0
+
+    move-object v5, p4
+
+    move-object v6, p5
+
+    move-object/from16 v8, p7
+
+    invoke-direct/range {v1 .. v8}, 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/models/domain/ModelExperiment;)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->me:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->me:Lcom/discord/models/domain/ModelUser;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->user:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->winnerBadgeExperiment:Lcom/discord/models/domain/ModelExperiment;
+
+    iget-object p1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->winnerBadgeExperiment:Lcom/discord/models/domain/ModelExperiment;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(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 getComputedMembers()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final getMe()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->me:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final getRichPresence()Lcom/discord/widgets/user/presence/ModelRichPresence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    return-object v0
+.end method
+
+.method public final getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    return-object v0
+.end method
+
+.method public final getUser()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final getUserProfile()Lcom/discord/models/domain/ModelUserProfile;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    return-object v0
+.end method
+
+.method public final getWinnerBadgeExperiment()Lcom/discord/models/domain/ModelExperiment;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->winnerBadgeExperiment:Lcom/discord/models/domain/ModelExperiment;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->me:Lcom/discord/models/domain/ModelUser;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->user:Lcom/discord/models/domain/ModelUser;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    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/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    if-eqz v2, :cond_3
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_3
+
+    :cond_3
+    const/4 v2, 0x0
+
+    :goto_3
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    if-eqz v2, :cond_4
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_4
+
+    :cond_4
+    const/4 v2, 0x0
+
+    :goto_4
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    if-eqz v2, :cond_5
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_5
+
+    :cond_5
+    const/4 v2, 0x0
+
+    :goto_5
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->winnerBadgeExperiment:Lcom/discord/models/domain/ModelExperiment;
+
+    if-eqz v2, :cond_6
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_6
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "StoreState(me="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->me:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", user="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", computedMembers="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", richPresence="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", streamContext="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", userProfile="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", winnerBadgeExperiment="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->winnerBadgeExperiment:Lcom/discord/models/domain/ModelExperiment;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState.smali
new file mode 100644
index 0000000000..71d5206ecf
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState.smali
@@ -0,0 +1,586 @@
+.class public final Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;
+.super Ljava/lang/Object;
+.source "UserProfileHeaderViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ViewState"
+.end annotation
+
+
+# instance fields
+.field private final isMeUserPremium:Z
+
+.field private final presence:Lcom/discord/models/domain/ModelPresence;
+
+.field private final snowsGivingHypeSquadEventWinner:I
+
+.field private final streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+.field private final user:Lcom/discord/models/domain/ModelUser;
+
+.field private final userNickname:Ljava/lang/String;
+
+.field private final userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+
+# direct methods
+.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;ZI)V
+    .locals 1
+
+    const-string v0, "user"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userProfile"
+
+    invoke-static {p5, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userNickname:Ljava/lang/String;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    iput-object p4, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    iput-object p5, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    iput-boolean p6, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->isMeUserPremium:Z
+
+    iput p7, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->snowsGivingHypeSquadEventWinner:I
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;ZIILjava/lang/Object;)Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;
+    .locals 5
+
+    and-int/lit8 p9, p8, 0x1
+
+    if-eqz p9, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    :cond_0
+    and-int/lit8 p9, p8, 0x2
+
+    if-eqz p9, :cond_1
+
+    iget-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userNickname:Ljava/lang/String;
+
+    :cond_1
+    move-object p9, p2
+
+    and-int/lit8 p2, p8, 0x4
+
+    if-eqz p2, :cond_2
+
+    iget-object p3, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    :cond_2
+    move-object v0, p3
+
+    and-int/lit8 p2, p8, 0x8
+
+    if-eqz p2, :cond_3
+
+    iget-object p4, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    :cond_3
+    move-object v1, p4
+
+    and-int/lit8 p2, p8, 0x10
+
+    if-eqz p2, :cond_4
+
+    iget-object p5, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    :cond_4
+    move-object v2, p5
+
+    and-int/lit8 p2, p8, 0x20
+
+    if-eqz p2, :cond_5
+
+    iget-boolean p6, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->isMeUserPremium:Z
+
+    :cond_5
+    move v3, p6
+
+    and-int/lit8 p2, p8, 0x40
+
+    if-eqz p2, :cond_6
+
+    iget p7, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->snowsGivingHypeSquadEventWinner:I
+
+    :cond_6
+    move v4, p7
+
+    move-object p2, p0
+
+    move-object p3, p1
+
+    move-object p4, p9
+
+    move-object p5, v0
+
+    move-object p6, v1
+
+    move-object p7, v2
+
+    move p8, v3
+
+    move p9, v4
+
+    invoke-virtual/range {p2 .. p9}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->copy(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;ZI)Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userNickname:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component3()Lcom/discord/models/domain/ModelPresence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    return-object v0
+.end method
+
+.method public final component4()Lcom/discord/utilities/streams/StreamContext;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    return-object v0
+.end method
+
+.method public final component5()Lcom/discord/models/domain/ModelUserProfile;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    return-object v0
+.end method
+
+.method public final component6()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->isMeUserPremium:Z
+
+    return v0
+.end method
+
+.method public final component7()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->snowsGivingHypeSquadEventWinner:I
+
+    return v0
+.end method
+
+.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;ZI)Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;
+    .locals 9
+
+    const-string v0, "user"
+
+    move-object v2, p1
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userProfile"
+
+    move-object v6, p5
+
+    invoke-static {p5, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;
+
+    move-object v1, v0
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    move v7, p6
+
+    move/from16 v8, p7
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;ZI)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_3
+
+    instance-of v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    check-cast p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userNickname:Ljava/lang/String;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userNickname:Ljava/lang/String;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->isMeUserPremium:Z
+
+    iget-boolean v3, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->isMeUserPremium:Z
+
+    if-ne v1, v3, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_2
+
+    iget v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->snowsGivingHypeSquadEventWinner:I
+
+    iget p1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->snowsGivingHypeSquadEventWinner:I
+
+    if-ne v1, p1, :cond_1
+
+    const/4 p1, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    :goto_1
+    if-eqz p1, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    return v2
+
+    :cond_3
+    :goto_2
+    return v0
+.end method
+
+.method public final getPresence()Lcom/discord/models/domain/ModelPresence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    return-object v0
+.end method
+
+.method public final getSnowsGivingHypeSquadEventWinner()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->snowsGivingHypeSquadEventWinner:I
+
+    return v0
+.end method
+
+.method public final getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    return-object v0
+.end method
+
+.method public final getUser()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final getUserNickname()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userNickname:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getUserProfile()Lcom/discord/models/domain/ModelUserProfile;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userNickname: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/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    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/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    if-eqz v2, :cond_3
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_3
+
+    :cond_3
+    const/4 v2, 0x0
+
+    :goto_3
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    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
+
+    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->isMeUserPremium:Z
+
+    if-eqz v1, :cond_5
+
+    const/4 v1, 0x1
+
+    :cond_5
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->snowsGivingHypeSquadEventWinner:I
+
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final isMeUserPremium()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->isMeUserPremium:Z
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "ViewState(user="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", userNickname="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userNickname:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", presence="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", streamContext="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", userProfile="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", isMeUserPremium="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->isMeUserPremium:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", snowsGivingHypeSquadEventWinner="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->snowsGivingHypeSquadEventWinner: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;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeComputedMembers$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeComputedMembers$1.smali
new file mode 100644
index 0000000000..a2eabe35ff
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeComputedMembers$1.smali
@@ -0,0 +1,122 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeComputedMembers$1;
+.super Ljava/lang/Object;
+.source "UserProfileHeaderViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->observeComputedMembers(Ljava/util/Collection;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TR;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $users:Ljava/util/Collection;
+
+.field final synthetic this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;Ljava/util/Collection;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeComputedMembers$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeComputedMembers$1;->$users:Ljava/util/Collection;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeComputedMembers$1;->call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelChannel;",
+            ")",
+            "Lrx/Observable<",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;>;"
+        }
+    .end annotation
+
+    if-eqz p1, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeComputedMembers$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->getStoreGuilds()Lcom/discord/stores/StoreGuilds;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object p1
+
+    const-string v1, "channel.guildId"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v1
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeComputedMembers$1;->$users:Ljava/util/Collection;
+
+    invoke-virtual {v0, v1, v2, p1}, Lcom/discord/stores/StoreGuilds;->getComputed(JLjava/util/Collection;)Lrx/Observable;
+
+    move-result-object p1
+
+    if-nez p1, :cond_1
+
+    :cond_0
+    invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lrx/Observable;->bI(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object p1
+
+    :cond_1
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1$1.smali
new file mode 100644
index 0000000000..9419971200
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1$1.smali
@@ -0,0 +1,83 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1$1;
+.super Ljava/lang/Object;
+.source "UserProfileHeaderViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1;->call(Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $meUser:Lcom/discord/models/domain/ModelUser;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/models/domain/ModelUser;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1$1;->$meUser:Lcom/discord/models/domain/ModelUser;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1$1;->call(Lcom/discord/models/domain/ModelUser;)Lkotlin/Pair;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lcom/discord/models/domain/ModelUser;)Lkotlin/Pair;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelUser;",
+            ")",
+            "Lkotlin/Pair<",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;"
+        }
+    .end annotation
+
+    new-instance v0, Lkotlin/Pair;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1$1;->$meUser:Lcom/discord/models/domain/ModelUser;
+
+    invoke-direct {v0, v1, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1.smali
new file mode 100644
index 0000000000..3adeca6816
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1.smali
@@ -0,0 +1,129 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1;
+.super Ljava/lang/Object;
+.source "UserProfileHeaderViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->observeStoreState()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TR;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1;->call(Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelUser;",
+            ")",
+            "Lrx/Observable<",
+            "Lkotlin/Pair<",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->getUserId()J
+
+    move-result-wide v0
+
+    const-wide/16 v2, -0x1
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    new-instance v0, Lkotlin/Pair;
+
+    invoke-direct {v0, p1, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    invoke-static {v0}, Lrx/Observable;->bI(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->getStoreUser()Lcom/discord/stores/StoreUser;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->getUserId()J
+
+    move-result-wide v1
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/stores/StoreUser;->getUser(J)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1$1;
+
+    invoke-direct {v1, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1$1;-><init>(Lcom/discord/models/domain/ModelUser;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2$1.smali
new file mode 100644
index 0000000000..11822893a2
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2$1.smali
@@ -0,0 +1,130 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2$1;
+.super Ljava/lang/Object;
+.source "UserProfileHeaderViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Func5;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2;->call(Lkotlin/Pair;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    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<",
+        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $meUser:Lcom/discord/models/domain/ModelUser;
+
+.field final synthetic $targetUser:Lcom/discord/models/domain/ModelUser;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2$1;->$meUser:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2$1;->$targetUser:Lcom/discord/models/domain/ModelUser;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/util/Map;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Lcom/discord/models/domain/ModelExperiment;)Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "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/models/domain/ModelExperiment;",
+            ")",
+            "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;"
+        }
+    .end annotation
+
+    new-instance v8, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2$1;->$meUser:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2$1;->$targetUser:Lcom/discord/models/domain/ModelUser;
+
+    const-string v0, "computedMembers"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userProfile"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, v8
+
+    move-object v3, p1
+
+    move-object v4, p2
+
+    move-object v5, p3
+
+    move-object v6, p4
+
+    move-object v7, p5
+
+    invoke-direct/range {v0 .. v7}, 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/models/domain/ModelExperiment;)V
+
+    return-object v8
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    check-cast p2, Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    check-cast p3, Lcom/discord/utilities/streams/StreamContext;
+
+    check-cast p4, Lcom/discord/models/domain/ModelUserProfile;
+
+    check-cast p5, Lcom/discord/models/domain/ModelExperiment;
+
+    invoke-virtual/range {p0 .. p5}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2$1;->call(Ljava/util/Map;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Lcom/discord/models/domain/ModelExperiment;)Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2.smali
new file mode 100644
index 0000000000..7695ac2acb
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2.smali
@@ -0,0 +1,217 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2;
+.super Ljava/lang/Object;
+.source "UserProfileHeaderViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->observeStoreState()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TR;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lkotlin/Pair;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2;->call(Lkotlin/Pair;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lkotlin/Pair;)Lrx/Observable;
+    .locals 12
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/Pair<",
+            "+",
+            "Lcom/discord/models/domain/ModelUser;",
+            "+",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;)",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p1, Lkotlin/Pair;->first:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/models/domain/ModelUser;
+
+    iget-object p1, p1, Lkotlin/Pair;->second:Ljava/lang/Object;
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    if-eqz v0, :cond_1
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    const/4 v2, 0x2
+
+    new-array v3, v2, [Ljava/lang/Long;
+
+    const/4 v4, 0x0
+
+    invoke-virtual {v0}, 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
+
+    aput-object v5, v3, v4
+
+    invoke-virtual {p1}, 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
+
+    const/4 v5, 0x1
+
+    aput-object v4, v3, v5
+
+    invoke-static {v3}, Lkotlin/a/ak;->o([Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/Collection;
+
+    invoke-static {v1, v3}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->access$observeComputedMembers(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;Ljava/util/Collection;)Lrx/Observable;
+
+    move-result-object v6
+
+    sget-object v1, Lcom/discord/widgets/user/presence/ModelRichPresence;->Companion:Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v3
+
+    iget-object v7, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-virtual {v7}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->getStoreUserPresence()Lcom/discord/stores/StoreUserPresence;
+
+    move-result-object v7
+
+    invoke-virtual {v1, v3, v4, v7}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;->get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
+
+    move-result-object v7
+
+    sget-object v1, Lcom/discord/utilities/streams/StreamContext;->Companion:Lcom/discord/utilities/streams/StreamContext$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v3
+
+    iget-object v8, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-virtual {v8}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->getStoreApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
+
+    move-result-object v8
+
+    invoke-virtual {v1, v3, v4, v5, v8}, Lcom/discord/utilities/streams/StreamContext$Companion;->get(JZLcom/discord/stores/StoreApplicationStreaming;)Lrx/Observable;
+
+    move-result-object v8
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->getStoreUserProfile()Lcom/discord/stores/StoreUserProfile;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v3
+
+    invoke-virtual {v1, v3, v4}, Lcom/discord/stores/StoreUserProfile;->get(J)Lrx/Observable;
+
+    move-result-object v9
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->getStoreExperiments()Lcom/discord/stores/StoreExperiments;
+
+    move-result-object v1
+
+    const/4 v3, 0x0
+
+    const-string v4, "2019-hypesquad_winner_badges"
+
+    invoke-static {v1, v4, v3, v2, 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 v10
+
+    new-instance v1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2$1;
+
+    invoke-direct {v1, v0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2$1;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)V
+
+    move-object v11, v1
+
+    check-cast v11, Lrx/functions/Func5;
+
+    invoke-static/range {v6 .. v11}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_1
+    :goto_0
+    invoke-static {}, Lrx/Observable;->JM()Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel.smali
new file mode 100644
index 0000000000..2803fdf34a
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel.smali
@@ -0,0 +1,543 @@
+.class public final Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+.super Lcom/discord/app/k;
+.source "UserProfileHeaderViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;,
+        Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;,
+        Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;,
+        Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion;
+
+.field public static final ME:J = -0x1L
+
+
+# instance fields
+.field private final channelId:Ljava/lang/Long;
+
+.field private final storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+.field private final storeChannels:Lcom/discord/stores/StoreChannels;
+
+.field private final storeExperiments:Lcom/discord/stores/StoreExperiments;
+
+.field private final storeGuilds:Lcom/discord/stores/StoreGuilds;
+
+.field private final storeUser:Lcom/discord/stores/StoreUser;
+
+.field private final storeUserPresence:Lcom/discord/stores/StoreUserPresence;
+
+.field private final storeUserProfile:Lcom/discord/stores/StoreUserProfile;
+
+.field private final userId:J
+
+.field private final viewStateSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->Companion:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>(JLjava/lang/Long;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreExperiments;)V
+    .locals 10
+
+    move-object v0, p0
+
+    move-object v1, p4
+
+    move-object v2, p5
+
+    move-object/from16 v3, p6
+
+    move-object/from16 v4, p7
+
+    move-object/from16 v5, p8
+
+    move-object/from16 v6, p9
+
+    move-object/from16 v7, p10
+
+    const-string v8, "storeUser"
+
+    invoke-static {p4, v8}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "storeChannels"
+
+    invoke-static {p5, v8}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "storeGuilds"
+
+    invoke-static {v3, v8}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "storeUserPresence"
+
+    invoke-static {v4, v8}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "storeApplicationStreaming"
+
+    invoke-static {v5, v8}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "storeUserProfile"
+
+    invoke-static {v6, v8}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "storeExperiments"
+
+    invoke-static {v7, v8}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lcom/discord/app/k;-><init>()V
+
+    move-wide v8, p1
+
+    iput-wide v8, v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->userId:J
+
+    move-object v8, p3
+
+    iput-object v8, v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->channelId:Ljava/lang/Long;
+
+    iput-object v1, v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeUser:Lcom/discord/stores/StoreUser;
+
+    iput-object v2, v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeChannels:Lcom/discord/stores/StoreChannels;
+
+    iput-object v3, v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeGuilds:Lcom/discord/stores/StoreGuilds;
+
+    iput-object v4, v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeUserPresence:Lcom/discord/stores/StoreUserPresence;
+
+    iput-object v5, v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    iput-object v6, v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeUserProfile:Lcom/discord/stores/StoreUserProfile;
+
+    iput-object v7, v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeExperiments:Lcom/discord/stores/StoreExperiments;
+
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->observeStoreState()Lrx/Observable;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lrx/Observable;->JO()Lrx/Observable;
+
+    move-result-object v1
+
+    const-string v2, "observeStoreState()\n    \u2026  .distinctUntilChanged()"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v2, v0
+
+    check-cast v2, Lcom/discord/app/AppComponent;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x2
+
+    invoke-static {v1, v2, v3, v4, 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 v1
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$1;
+
+    move-object v4, v0
+
+    check-cast v4, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-direct {v3, v4}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/16 v8, 0x1e
+
+    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
+.end method
+
+.method public static final synthetic access$handleStoreState(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->handleStoreState(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$observeComputedMembers(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;Ljava/util/Collection;)Lrx/Observable;
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->observeComputedMembers(Ljava/util/Collection;)Lrx/Observable;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method private final handleStoreState(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;)V
+    .locals 10
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->getComputedMembers()Ljava/util/Map;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getNick()Ljava/lang/String;
+
+    move-result-object v0
+
+    move-object v4, v0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v4, v1
+
+    :goto_0
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->getWinnerBadgeExperiment()Lcom/discord/models/domain/ModelExperiment;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelExperiment;->getBucket()I
+
+    move-result v0
+
+    move v9, v0
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v0, 0x0
+
+    const/4 v9, 0x0
+
+    :goto_1
+    new-instance v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v3
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->getRichPresence()Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPresence()Lcom/discord/models/domain/ModelPresence;
+
+    move-result-object v1
+
+    :cond_2
+    move-object v5, v1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+
+    move-result-object v6
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->getUserProfile()Lcom/discord/models/domain/ModelUserProfile;
+
+    move-result-object v7
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->getMe()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isPremium()Z
+
+    move-result v8
+
+    move-object v2, v0
+
+    invoke-direct/range {v2 .. v9}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;ZI)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method private final observeComputedMembers(Ljava/util/Collection;)Lrx/Observable;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "Ljava/lang/Long;",
+            ">;)",
+            "Lrx/Observable<",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->channelId:Ljava/lang/Long;
+
+    if-eqz v0, :cond_0
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeChannels:Lcom/discord/stores/StoreChannels;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v2
+
+    invoke-virtual {v1, v2, v3}, Lcom/discord/stores/StoreChannels;->get(J)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeComputedMembers$1;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeComputedMembers$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;Ljava/util/Collection;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string v0, "storeChannels\n          \u2026t(emptyMap())\n          }"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+
+    :cond_0
+    invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lrx/Observable;->bI(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string v0, "Observable.just(emptyMap())"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method private final observeStoreState()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeUser:Lcom/discord/stores/StoreUser;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$observeStoreState$2;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "storeUser.me\n        .sw\u2026              }\n        }"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public final getChannelId()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->channelId:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
+.method public final getStoreApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    return-object v0
+.end method
+
+.method public final getStoreChannels()Lcom/discord/stores/StoreChannels;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeChannels:Lcom/discord/stores/StoreChannels;
+
+    return-object v0
+.end method
+
+.method public final getStoreExperiments()Lcom/discord/stores/StoreExperiments;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeExperiments:Lcom/discord/stores/StoreExperiments;
+
+    return-object v0
+.end method
+
+.method public final getStoreGuilds()Lcom/discord/stores/StoreGuilds;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeGuilds:Lcom/discord/stores/StoreGuilds;
+
+    return-object v0
+.end method
+
+.method public final getStoreUser()Lcom/discord/stores/StoreUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeUser:Lcom/discord/stores/StoreUser;
+
+    return-object v0
+.end method
+
+.method public final getStoreUserPresence()Lcom/discord/stores/StoreUserPresence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeUserPresence:Lcom/discord/stores/StoreUserPresence;
+
+    return-object v0
+.end method
+
+.method public final getStoreUserProfile()Lcom/discord/stores/StoreUserProfile;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->storeUserProfile:Lcom/discord/stores/StoreUserProfile;
+
+    return-object v0
+.end method
+
+.method public final getUserId()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->userId:J
+
+    return-wide v0
+.end method
+
+.method public final observeViewState()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    const-string v1, "viewStateSubject"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lrx/Observable;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile$1.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile$1.smali
new file mode 100644
index 0000000000..cc71e30d6b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile$1.smali
@@ -0,0 +1,61 @@
+.class Lcom/discord/widgets/user/profile/WidgetUserProfile$1;
+.super Ljava/lang/Object;
+.source "WidgetUserProfile.java"
+
+# interfaces
+.implements Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfile;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x0
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$1;->this$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onPageScrollStateChanged(I)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public onPageScrolled(IFI)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public onPageSelected(I)V
+    .locals 1
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$1;->this$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->access$000(Lcom/discord/widgets/user/profile/WidgetUserProfile;)Lcom/discord/utilities/simple_pager/SimplePager;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->hideKeyboard(Landroid/view/View;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile$Model.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile$Model.smali
similarity index 60%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfile$Model.smali
rename to com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile$Model.smali
index 4d9542b22e..53867adcb2 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile$Model.smali
@@ -1,11 +1,11 @@
-.class Lcom/discord/widgets/user/WidgetUserProfile$Model;
+.class Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
 .super Ljava/lang/Object;
 .source "WidgetUserProfile.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/WidgetUserProfile;
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfile;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,40 +28,40 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->isMe:Z
+    iput-boolean p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->isMe:Z
 
-    iput-object p2, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
 
-    iput p3, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->relationshipType:I
+    iput p3, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
 
     return-void
 .end method
 
-.method static synthetic access$100(Lcom/discord/widgets/user/WidgetUserProfile$Model;)I
+.method static synthetic access$100(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)I
     .locals 0
 
-    iget p0, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->relationshipType:I
+    iget p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
 
     return p0
 .end method
 
-.method static synthetic access$200(Lcom/discord/widgets/user/WidgetUserProfile$Model;)Lcom/discord/models/domain/ModelUser;
+.method static synthetic access$200(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Lcom/discord/models/domain/ModelUser;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
 
     return-object p0
 .end method
 
-.method static synthetic access$300(Lcom/discord/widgets/user/WidgetUserProfile$Model;)Z
+.method static synthetic access$300(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->isMe:Z
+    iget-boolean p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->isMe:Z
 
     return p0
 .end method
 
-.method public static create(Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;I)Lcom/discord/widgets/user/WidgetUserProfile$Model;
+.method public static create(Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;I)Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
     .locals 5
 
     if-nez p1, :cond_0
@@ -71,7 +71,7 @@
     return-object p0
 
     :cond_0
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserProfile$Model;
+    new-instance v0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
 
     invoke-virtual {p0}, Ljava/lang/Long;->longValue()J
 
@@ -93,7 +93,7 @@
     const/4 p0, 0x0
 
     :goto_0
-    invoke-direct {v0, p0, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfile$Model;-><init>(ZLcom/discord/models/domain/ModelUser;I)V
+    invoke-direct {v0, p0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;-><init>(ZLcom/discord/models/domain/ModelUser;I)V
 
     return-object v0
 .end method
@@ -104,7 +104,7 @@
         value = {
             "(J)",
             "Lrx/Observable<",
-            "Lcom/discord/widgets/user/WidgetUserProfile$Model;",
+            "Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;",
             ">;"
         }
     .end annotation
@@ -133,19 +133,19 @@
 
     move-result-object p0
 
-    sget-object p1, Lcom/discord/widgets/user/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
+    sget-object p1, Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
 
     move-result-object p0
 
-    sget-object p1, Lcom/discord/widgets/user/-$$Lambda$NWAoDG9wGZB3UxPiTN1z6Brd-YA;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$NWAoDG9wGZB3UxPiTN1z6Brd-YA;
+    sget-object p1, Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;
 
     invoke-static {v0, v1, p0, p1}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
 
     move-result-object p0
 
-    sget-object p1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$Model$VjK8Z7ynTLrPUKIvgSas0GLs8hA;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserProfile$Model$VjK8Z7ynTLrPUKIvgSas0GLs8hA;
+    sget-object p1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -161,7 +161,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
@@ -172,7 +172,7 @@
     return-object p0
 .end method
 
-.method static synthetic lambda$get$0(Lcom/discord/widgets/user/WidgetUserProfile$Model;)Ljava/lang/Boolean;
+.method static synthetic lambda$get$0(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Ljava/lang/Boolean;
     .locals 0
 
     if-eqz p0, :cond_0
@@ -197,7 +197,7 @@
 .method canAccept()Z
     .locals 2
 
-    iget v0, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->relationshipType:I
+    iget v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
 
     const/4 v1, 0x3
 
@@ -216,7 +216,7 @@
 .method canCancel()Z
     .locals 2
 
-    iget v0, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->relationshipType:I
+    iget v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
 
     const/4 v1, 0x4
 
@@ -235,7 +235,7 @@
 .method protected canEqual(Ljava/lang/Object;)Z
     .locals 0
 
-    instance-of p1, p1, Lcom/discord/widgets/user/WidgetUserProfile$Model;
+    instance-of p1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
 
     return p1
 .end method
@@ -250,7 +250,7 @@
     return v0
 
     :cond_0
-    instance-of v1, p1, Lcom/discord/widgets/user/WidgetUserProfile$Model;
+    instance-of v1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
 
     const/4 v2, 0x0
 
@@ -259,9 +259,9 @@
     return v2
 
     :cond_1
-    check-cast p1, Lcom/discord/widgets/user/WidgetUserProfile$Model;
+    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
 
-    invoke-virtual {p1, p0}, Lcom/discord/widgets/user/WidgetUserProfile$Model;->canEqual(Ljava/lang/Object;)Z
+    invoke-virtual {p1, p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->canEqual(Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -270,18 +270,18 @@
     return v2
 
     :cond_2
-    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->isMe:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->isMe:Z
 
-    iget-boolean v3, p1, Lcom/discord/widgets/user/WidgetUserProfile$Model;->isMe:Z
+    iget-boolean v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->isMe:Z
 
     if-eq v1, v3, :cond_3
 
     return v2
 
     :cond_3
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
 
     if-nez v1, :cond_4
 
@@ -300,9 +300,9 @@
     return v2
 
     :cond_5
-    iget v1, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->relationshipType:I
+    iget v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
 
-    iget p1, p1, Lcom/discord/widgets/user/WidgetUserProfile$Model;->relationshipType:I
+    iget p1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
 
     if-eq v1, p1, :cond_6
 
@@ -315,7 +315,7 @@
 .method public hashCode()I
     .locals 2
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->isMe:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->isMe:Z
 
     if-eqz v0, :cond_0
 
@@ -329,7 +329,7 @@
     :goto_0
     add-int/lit8 v0, v0, 0x3b
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
 
     mul-int/lit8 v0, v0, 0x3b
 
@@ -349,7 +349,7 @@
 
     mul-int/lit8 v0, v0, 0x3b
 
-    iget v1, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->relationshipType:I
+    iget v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
 
     add-int/2addr v0, v1
 
@@ -365,7 +365,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->isMe:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->isMe:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -373,7 +373,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -381,7 +381,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/widgets/user/WidgetUserProfile$Model;->relationshipType:I
+    iget v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile.smali
new file mode 100644
index 0000000000..2e9a517117
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile.smali
@@ -0,0 +1,1047 @@
+.class public Lcom/discord/widgets/user/profile/WidgetUserProfile;
+.super Lcom/discord/app/AppFragment;
+.source "WidgetUserProfile.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
+    }
+.end annotation
+
+
+# instance fields
+.field private friendRequestAcceptBtn:Landroid/view/View;
+
+.field private friendRequestBtn:Landroid/view/View;
+
+.field private friendRequestIgnoreBtn:Landroid/view/View;
+
+.field private friendRequestIncomingContainer:Landroid/view/View;
+
+.field private friendRequestSentBtn:Landroid/view/View;
+
+.field private sendMessageFab:Landroid/view/View;
+
+.field private tabs:Lcom/google/android/material/tabs/TabLayout;
+
+.field private userProfileHeaderView:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+.field private userProfileHeaderViewModel:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+.field private viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
+
+    return-void
+.end method
+
+.method static synthetic access$000(Lcom/discord/widgets/user/profile/WidgetUserProfile;)Lcom/discord/utilities/simple_pager/SimplePager;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
+
+    return-object p0
+.end method
+
+.method private addRelationship(Ljava/lang/Integer;I)V
+    .locals 4
+
+    invoke-static {}, Lcom/discord/utilities/rest/RestAPI;->getApi()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object v0
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getUserId()J
+
+    move-result-wide v1
+
+    const-string v3, "User Profile"
+
+    invoke-virtual {v0, v3, v1, v2, p1}, Lcom/discord/utilities/rest/RestAPI;->addRelationship(Ljava/lang/String;JLjava/lang/Integer;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-static {p0}, Lcom/discord/app/i;->b(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;
+
+    invoke-direct {v0, p0, p2}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;I)V
+
+    invoke-static {v0, p0}, Lcom/discord/app/i;->a(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
+    return-void
+.end method
+
+.method private configureActionButtons(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+    .locals 4
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->access$300(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->access$200(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isBot()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->access$100(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestBtn:Landroid/view/View;
+
+    const/16 v3, 0x8
+
+    if-eqz v0, :cond_1
+
+    const/4 v0, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    const/16 v0, 0x8
+
+    :goto_1
+    invoke-virtual {v2, v0}, Landroid/view/View;->setVisibility(I)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestBtn:Landroid/view/View;
+
+    new-instance v2, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0;
+
+    invoke-direct {v2, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+
+    invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestSentBtn:Landroid/view/View;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->canCancel()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    const/4 v2, 0x0
+
+    goto :goto_2
+
+    :cond_2
+    const/16 v2, 0x8
+
+    :goto_2
+    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestSentBtn:Landroid/view/View;
+
+    new-instance v2, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;
+
+    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+
+    invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestIncomingContainer:Landroid/view/View;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->canAccept()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    const/16 v1, 0x8
+
+    :goto_3
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestAcceptBtn:Landroid/view/View;
+
+    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestIgnoreBtn:Landroid/view/View;
+
+    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
+
+.method private configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+    .locals 3
+
+    if-nez p1, :cond_1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getAppActivity()Lcom/discord/app/AppActivity;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getAppActivity()Lcom/discord/app/AppActivity;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/app/AppActivity;->onBackPressed()V
+
+    :cond_0
+    return-void
+
+    :cond_1
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->access$100(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)I
+
+    move-result v0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getMenuResId(I)I
+
+    move-result v0
+
+    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+
+    new-instance v2, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ;
+
+    invoke-direct {v2, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+
+    invoke-virtual {p0, v0, v1, v2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->setActionBarOptionsMenu(ILrx/functions/Action2;Lrx/functions/Action1;)Landroidx/appcompat/widget/Toolbar;
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->configureActionButtons(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->sendMessageFab:Landroid/view/View;
+
+    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
+
+.method private findAndSetDirectMessage(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+    .locals 4
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-static {}, Lcom/discord/stores/StoreStream;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->access$200(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Lcom/discord/models/domain/ModelUser;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v2
+
+    invoke-virtual {v0, v1, v2, v3}, Lcom/discord/stores/StoreChannelsSelected;->findAndSetDirectMessage(Landroid/content/Context;J)V
+
+    return-void
+.end method
+
+.method private getGuildId()J
+    .locals 4
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object v0
+
+    const-string v1, "com.discord.intent.extra.EXTRA_GUILD_ID"
+
+    const-wide/16 v2, 0x0
+
+    invoke-virtual {v0, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method private getMenuResId(I)I
+    .locals 1
+
+    const/4 v0, 0x1
+
+    if-eq p1, v0, :cond_3
+
+    const/4 v0, 0x2
+
+    if-eq p1, v0, :cond_2
+
+    const/4 v0, 0x3
+
+    if-eq p1, v0, :cond_1
+
+    const/4 v0, 0x4
+
+    if-eq p1, v0, :cond_0
+
+    const p1, 0x7f0e001b
+
+    return p1
+
+    :cond_0
+    const p1, 0x7f0e001f
+
+    return p1
+
+    :cond_1
+    const p1, 0x7f0e001e
+
+    return p1
+
+    :cond_2
+    const p1, 0x7f0e001c
+
+    return p1
+
+    :cond_3
+    const p1, 0x7f0e001d
+
+    return p1
+.end method
+
+.method private getUserId()J
+    .locals 4
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object v0
+
+    const-string v1, "com.discord.intent.extra.EXTRA_USER_ID"
+
+    const-wide/16 v2, 0x0
+
+    invoke-virtual {v0, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public static synthetic lambda$hHhsPA-4_vC3fndRZ6imlHYxghg(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+
+    return-void
+.end method
+
+.method static synthetic lambda$onViewBound$0(Landroid/view/MenuItem;Landroid/content/Context;)V
+    .locals 0
+
+    invoke-interface {p0}, Landroid/view/MenuItem;->getItemId()I
+
+    return-void
+.end method
+
+.method public static launch(Landroid/content/Context;J)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-static {p0, p1, p2, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;JLjava/lang/Long;)V
+
+    return-void
+.end method
+
+.method public static launch(Landroid/content/Context;JLjava/lang/Long;)V
+    .locals 2
+
+    new-instance v0, Landroid/content/Intent;
+
+    invoke-direct {v0}, Landroid/content/Intent;-><init>()V
+
+    const-string v1, "com.discord.intent.extra.EXTRA_USER_ID"
+
+    invoke-virtual {v0, v1, p1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
+
+    move-result-object p1
+
+    const-string p2, "com.discord.intent.extra.EXTRA_GUILD_ID"
+
+    invoke-virtual {p1, p2, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
+
+    move-result-object p1
+
+    const-class p2, Lcom/discord/widgets/user/profile/WidgetUserProfile;
+
+    invoke-static {p0, p2, p1}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+
+    return-void
+.end method
+
+.method private removeRelationship(I)V
+    .locals 4
+
+    invoke-static {}, Lcom/discord/utilities/rest/RestAPI;->getApi()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object v0
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getUserId()J
+
+    move-result-wide v1
+
+    const-string v3, "User Profile"
+
+    invoke-virtual {v0, v3, v1, v2}, Lcom/discord/utilities/rest/RestAPI;->removeRelationship(Ljava/lang/String;J)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-static {p0}, Lcom/discord/app/i;->b(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;I)V
+
+    invoke-static {v1, p0}, Lcom/discord/app/i;->a(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d01dc
+
+    return v0
+.end method
+
+.method public synthetic lambda$addRelationship$5$WidgetUserProfile(ILjava/lang/Void;)V
+    .locals 0
+
+    invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
+
+    return-void
+.end method
+
+.method public synthetic lambda$configureActionButtons$10$WidgetUserProfile(Landroid/view/View;)V
+    .locals 0
+
+    const p1, 0x7f120690
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
+
+    return-void
+.end method
+
+.method public synthetic lambda$configureActionButtons$6$WidgetUserProfile(Landroid/view/View;)V
+    .locals 1
+
+    const/4 p1, 0x0
+
+    const v0, 0x7f120697
+
+    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V
+
+    return-void
+.end method
+
+.method public synthetic lambda$configureActionButtons$8$WidgetUserProfile(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;Landroid/view/View;)V
+    .locals 2
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->access$200(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Lcom/discord/models/domain/ModelUser;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object p2
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+
+    invoke-static {p1, p2, v0, v1}, Lcom/discord/dialogs/a;->a(Lcom/discord/models/domain/ModelUser;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;Lkotlin/jvm/functions/Function1;)V
+
+    return-void
+.end method
+
+.method public synthetic lambda$configureActionButtons$9$WidgetUserProfile(Landroid/view/View;)V
+    .locals 1
+
+    const/4 p1, 0x0
+
+    const v0, 0x7f12002e
+
+    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V
+
+    return-void
+.end method
+
+.method public synthetic lambda$configureUI$1$WidgetUserProfile(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;Landroid/view/MenuItem;Landroid/content/Context;)V
+    .locals 0
+
+    invoke-interface {p2}, Landroid/view/MenuItem;->getItemId()I
+
+    move-result p2
+
+    const p3, 0x7f0a045a
+
+    if-eq p2, p3, :cond_0
+
+    packed-switch p2, :pswitch_data_0
+
+    goto :goto_0
+
+    :pswitch_0
+    const p1, 0x7f121271
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
+
+    return-void
+
+    :pswitch_1
+    const p1, 0x7f120687
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
+
+    return-void
+
+    :pswitch_2
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->findAndSetDirectMessage(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+
+    return-void
+
+    :pswitch_3
+    const p1, 0x7f120690
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
+
+    return-void
+
+    :pswitch_4
+    const p1, 0x7f12068e
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
+
+    return-void
+
+    :pswitch_5
+    const/4 p1, 0x2
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    const p2, 0x7f121270
+
+    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V
+
+    return-void
+
+    :cond_0
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getUserId()J
+
+    move-result-wide p2
+
+    invoke-static {p2, p3}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-static {p1, p2}, Lcom/discord/app/h;->d(Landroid/content/Context;Ljava/lang/CharSequence;)V
+
+    :goto_0
+    return-void
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x7f0a047c
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method public synthetic lambda$configureUI$2$WidgetUserProfile(Landroid/view/Menu;)V
+    .locals 4
+
+    invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getDeveloperMode()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x0
+
+    const v1, 0x7f0a045a
+
+    const v2, 0xffff
+
+    const v3, 0x7f120451
+
+    invoke-interface {p1, v0, v1, v2, v3}, Landroid/view/Menu;->add(IIII)Landroid/view/MenuItem;
+
+    move-result-object p1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    const v1, 0x7f040184
+
+    invoke-static {v0, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;I)I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, -0x1
+
+    :goto_0
+    invoke-interface {p1, v0}, Landroid/view/MenuItem;->setIcon(I)Landroid/view/MenuItem;
+
+    return-void
+.end method
+
+.method public synthetic lambda$configureUI$3$WidgetUserProfile(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;Landroid/view/View;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->findAndSetDirectMessage(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
+
+    return-void
+.end method
+
+.method public synthetic lambda$null$7$WidgetUserProfile(Ljava/lang/Integer;)Lkotlin/Unit;
+    .locals 0
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public synthetic lambda$removeRelationship$4$WidgetUserProfile(ILjava/lang/Void;)V
+    .locals 0
+
+    invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
+
+    return-void
+.end method
+
+.method public onCreate(Landroid/os/Bundle;)V
+    .locals 3
+
+    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onCreate(Landroid/os/Bundle;)V
+
+    new-instance p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getUserId()J
+
+    move-result-wide v0
+
+    const/4 v2, 0x0
+
+    invoke-direct {p1, v0, v1, v2}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;-><init>(JLjava/lang/Long;)V
+
+    invoke-static {p0, p1}, Landroidx/lifecycle/ViewModelProviders;->of(Landroidx/fragment/app/Fragment;Landroidx/lifecycle/ViewModelProvider$Factory;)Landroidx/lifecycle/ViewModelProvider;
+
+    move-result-object p1
+
+    const-class v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    invoke-virtual {p1, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->userProfileHeaderViewModel:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
+
+    return-void
+.end method
+
+.method public onPause()V
+    .locals 7
+
+    invoke-super {p0}, Lcom/discord/app/AppFragment;->onPause()V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getUserId()J
+
+    move-result-wide v0
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getGuildId()J
+
+    move-result-wide v2
+
+    const-wide/16 v4, 0x0
+
+    cmp-long v6, v0, v4
+
+    if-lez v6, :cond_0
+
+    cmp-long v6, v2, v4
+
+    if-lez v6, :cond_0
+
+    invoke-static {}, Lcom/discord/stores/StoreStream;->getGuildSubscriptions()Lcom/discord/stores/StoreGuildSubscriptions;
+
+    move-result-object v4
+
+    invoke-virtual {v4, v2, v3, v0, v1}, Lcom/discord/stores/StoreGuildSubscriptions;->unsubscribeUser(JJ)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onViewBound(Landroid/view/View;)V
+    .locals 6
+
+    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
+
+    const v0, 0x7f0a07da
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/utilities/simple_pager/SimplePager;
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
+
+    new-instance v1, Lcom/discord/widgets/user/profile/WidgetUserProfile$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile$1;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/simple_pager/SimplePager;->addOnPageChangeListener(Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;)V
+
+    const v0, 0x7f0a07d8
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->userProfileHeaderView:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    const v0, 0x7f0a07d2
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestIncomingContainer:Landroid/view/View;
+
+    const v0, 0x7f0a07d3
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestSentBtn:Landroid/view/View;
+
+    const v0, 0x7f0a07cf
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestBtn:Landroid/view/View;
+
+    const v0, 0x7f0a07d0
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestAcceptBtn:Landroid/view/View;
+
+    const v0, 0x7f0a07d1
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestIgnoreBtn:Landroid/view/View;
+
+    const v0, 0x7f0a07d9
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->sendMessageFab:Landroid/view/View;
+
+    const v0, 0x7f0a0034
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/google/android/material/tabs/TabLayout;
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->tabs:Lcom/google/android/material/tabs/TabLayout;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
+
+    const p1, 0x7f120ea5
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->setActionBarTitle(I)Lkotlin/Unit;
+
+    sget-object p1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;
+
+    const v0, 0x7f0e001d
+
+    invoke-virtual {p0, v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->setActionBarOptionsMenu(ILrx/functions/Action2;)Landroidx/appcompat/widget/Toolbar;
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->userProfileHeaderView:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->requireContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Lcom/discord/widgets/user/Badge;->onBadgeClick(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;)Lkotlin/jvm/functions/Function1;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->setOnBadgeClick(Lkotlin/jvm/functions/Function1;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
+
+    new-instance v0, Lcom/discord/utilities/simple_pager/SimplePager$Adapter;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v1
+
+    const/4 v2, 0x3
+
+    new-array v2, v2, [Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
+
+    new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
+
+    const v4, 0x7f121272
+
+    invoke-virtual {p0, v4}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getString(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    sget-object v5, Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;
+
+    invoke-direct {v3, v4, v5}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+
+    const/4 v4, 0x0
+
+    aput-object v3, v2, v4
+
+    new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
+
+    const v4, 0x7f120bba
+
+    invoke-virtual {p0, v4}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getString(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    sget-object v5, Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
+
+    invoke-direct {v3, v4, v5}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+
+    const/4 v4, 0x1
+
+    aput-object v3, v2, v4
+
+    new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
+
+    const v4, 0x7f120bb9
+
+    invoke-virtual {p0, v4}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getString(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    sget-object v5, Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
+
+    invoke-direct {v3, v4, v5}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+
+    const/4 v4, 0x2
+
+    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
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->tabs:Lcom/google/android/material/tabs/TabLayout;
+
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/simple_pager/SimplePager;->setTabLayout(Lcom/google/android/material/tabs/TabLayout;)V
+
+    return-void
+.end method
+
+.method public onViewBoundOrOnResume()V
+    .locals 11
+
+    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getUserId()J
+
+    move-result-wide v0
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getGuildId()J
+
+    move-result-wide v2
+
+    const-wide/16 v4, 0x0
+
+    cmp-long v6, v0, v4
+
+    if-lez v6, :cond_0
+
+    cmp-long v6, v2, v4
+
+    if-lez v6, :cond_0
+
+    invoke-static {}, Lcom/discord/stores/StoreStream;->getGuildSubscriptions()Lcom/discord/stores/StoreGuildSubscriptions;
+
+    move-result-object v4
+
+    invoke-virtual {v4, v2, v3, v0, v1}, Lcom/discord/stores/StoreGuildSubscriptions;->subscribeUser(JJ)V
+
+    :cond_0
+    iget-object v5, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->userProfileHeaderView:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getUserId()J
+
+    move-result-wide v8
+
+    const/4 v10, 0x0
+
+    move-object v6, p0
+
+    move-object v7, p0
+
+    invoke-static/range {v5 .. v10}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->bind(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Landroidx/fragment/app/Fragment;Lcom/discord/app/AppComponent;JLjava/lang/Long;)V
+
+    invoke-static {v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->get(J)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-static {p0}, Lcom/discord/app/i;->b(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    invoke-static {v1, v2}, Lcom/discord/app/i;->a(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileEmptyListItem.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.smali
similarity index 65%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfileEmptyListItem.smali
rename to com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.smali
index 06af3f1ff1..b16f0ff5f6 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileEmptyListItem.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.smali
@@ -1,4 +1,4 @@
-.class Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;
+.class public Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 .source "WidgetUserProfileEmptyListItem.java"
 
@@ -34,19 +34,19 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;->itemView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a0796
+    const p2, 0x7f0a07c0
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;->empty:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;->empty:Landroid/view/View;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;->itemView:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a0797
+    const p2, 0x7f0a07c1
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -54,9 +54,9 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;->emptyText:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;->emptyText:Landroid/widget/TextView;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;->empty:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;->empty:Landroid/view/View;
 
     if-eqz p1, :cond_0
 
@@ -67,7 +67,7 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setBackgroundResource(I)V
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;->emptyText:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;->emptyText:Landroid/widget/TextView;
 
     if-eqz p1, :cond_1
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder.smali
new file mode 100644
index 0000000000..558417ecca
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder.smali
@@ -0,0 +1,197 @@
+.class Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;
+.super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "WidgetUserProfileInfo.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x0
+    name = "ViewHolder"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
+        "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;",
+        "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field private linkImage:Landroid/widget/ImageView;
+
+.field private platformImage:Landroid/widget/ImageView;
+
+.field private platformUserName:Landroid/widget/TextView;
+
+.field final synthetic this$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;ILcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->this$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
+
+    invoke-direct {p0, p2, p3}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->itemView:Landroid/view/View;
+
+    const p2, 0x7f0a0229
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/ImageView;
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->platformImage:Landroid/widget/ImageView;
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->itemView:Landroid/view/View;
+
+    const p2, 0x7f0a022b
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->platformUserName:Landroid/widget/TextView;
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->itemView:Landroid/view/View;
+
+    const p2, 0x7f0a022a
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/ImageView;
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->linkImage:Landroid/widget/ImageView;
+
+    sget-object p1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;
+
+    const/4 p2, 0x0
+
+    new-array p2, p2, [Landroid/view/View;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
+
+    return-void
+.end method
+
+.method static synthetic lambda$new$0(Landroid/view/View;Ljava/lang/Integer;Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)V
+    .locals 1
+
+    invoke-static {p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lcom/discord/utilities/platform/Platform;->from(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/utilities/platform/Platform;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->connectedAccountViewed(Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object p0
+
+    invoke-static {p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Lcom/discord/utilities/platform/Platform;->getProfileUrl(Lcom/discord/models/domain/ModelConnectedAccount;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p0, p1}, Lcom/discord/utilities/uri/UriHandler;->handle(Landroid/content/Context;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method protected onConfigure(ILcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)V
+    .locals 2
+
+    invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
+
+    invoke-static {p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lcom/discord/utilities/platform/Platform;->from(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/utilities/platform/Platform;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getPlatformImage()I
+
+    move-result v0
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->platformImage:Landroid/widget/ImageView;
+
+    invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    invoke-static {p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/platform/Platform;->getProfileUrl(Lcom/discord/models/domain/ModelConnectedAccount;)Ljava/lang/String;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->platformUserName:Landroid/widget/TextView;
+
+    invoke-static {p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
+
+    move-result-object p2
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelConnectedAccount;->getUsername()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {v0, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    iget-object p2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->linkImage:Landroid/widget/ImageView;
+
+    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/16 p1, 0x8
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {p2, p1}, Landroid/widget/ImageView;->setVisibility(I)V
+
+    return-void
+.end method
+
+.method public bridge synthetic onConfigure(ILjava/lang/Object;)V
+    .locals 0
+
+    check-cast p2, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->onConfigure(ILcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter.smali
similarity index 59%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter.smali
rename to com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter.smali
index a82c7de58f..6a26aa2427 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter.smali
@@ -1,11 +1,11 @@
-.class Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;
+.class Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
 .super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
 .source "WidgetUserProfileInfo.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/WidgetUserProfileInfo;
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;
+        Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;
     }
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple<",
-        "Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;",
+        "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;",
         ">;"
     }
 .end annotation
@@ -42,7 +42,7 @@
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
     .locals 0
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
     move-result-object p1
 
@@ -57,17 +57,17 @@
             "Landroid/view/ViewGroup;",
             "I)",
             "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
-            "Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;",
-            "Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;",
+            "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;",
+            "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;",
             ">;"
         }
     .end annotation
 
-    new-instance p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;
+    new-instance p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;
 
-    const p2, 0x7f0d01c5
+    const p2, 0x7f0d01d5
 
-    invoke-direct {p1, p0, p2, p0}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter$ViewHolder;-><init>(Lcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;ILcom/discord/widgets/user/WidgetUserProfileInfo$Adapter;)V
+    invoke-direct {p1, p0, p2, p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;ILcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model$Item.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item.smali
similarity index 59%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model$Item.smali
rename to com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item.smali
index 69fbd3f8a4..fa30570567 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model$Item.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item.smali
@@ -1,4 +1,4 @@
-.class public Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;
+.class public Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
 .super Ljava/lang/Object;
 .source "WidgetUserProfileInfo.java"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,15 +27,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
 
     return-void
 .end method
 
-.method static synthetic access$600(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
+.method static synthetic access$600(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
 
     return-object p0
 .end method
@@ -45,7 +45,7 @@
 .method protected canEqual(Ljava/lang/Object;)Z
     .locals 0
 
-    instance-of p1, p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;
+    instance-of p1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
 
     return p1
 .end method
@@ -60,7 +60,7 @@
     return v0
 
     :cond_0
-    instance-of v1, p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;
+    instance-of v1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
 
     const/4 v2, 0x0
 
@@ -69,9 +69,9 @@
     return v2
 
     :cond_1
-    check-cast p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;
+    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
 
-    invoke-virtual {p1, p0}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;->canEqual(Ljava/lang/Object;)Z
+    invoke-virtual {p1, p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->canEqual(Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -80,9 +80,9 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
 
-    iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+    iget-object p1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
 
     if-nez v1, :cond_3
 
@@ -107,7 +107,7 @@
 .method public getKey()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelConnectedAccount;->getId()Ljava/lang/String;
 
@@ -131,7 +131,7 @@
 .method public hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
 
     if-nez v0, :cond_0
 
@@ -159,7 +159,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Model.smali
similarity index 55%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model.smali
rename to com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Model.smali
index 6a77c7908d..a0e2db6360 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileInfo$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Model.smali
@@ -1,11 +1,11 @@
-.class Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
+.class Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
 .super Ljava/lang/Object;
 .source "WidgetUserProfileInfo.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/WidgetUserProfileInfo;
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;
+        Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
     }
 .end annotation
 
@@ -25,7 +25,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
-            "Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;",
+            "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;",
             ">;"
         }
     .end annotation
@@ -35,7 +35,7 @@
 
 .field private final notes:Ljava/lang/CharSequence;
 
-.field private final richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+.field private final richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
 .field private final streamContext:Lcom/discord/utilities/streams/StreamContext;
 
@@ -43,16 +43,16 @@
 
 
 # direct methods
-.method public constructor <init>(Ljava/util/List;Ljava/lang/CharSequence;Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/models/domain/ModelUser;ZLcom/discord/utilities/streams/StreamContext;)V
+.method public constructor <init>(Ljava/util/List;Ljava/lang/CharSequence;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelUser;ZLcom/discord/utilities/streams/StreamContext;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/List<",
-            "Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;",
+            "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;",
             ">;",
             "Ljava/lang/CharSequence;",
-            "Lcom/discord/widgets/user/ModelRichPresence;",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
             "Lcom/discord/models/domain/ModelUser;",
             "Z",
             "Lcom/discord/utilities/streams/StreamContext;",
@@ -62,70 +62,70 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
 
-    iput-object p2, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
 
-    iput-object p3, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iput-object p3, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
-    iput-object p4, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
+    iput-object p4, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
 
-    iput-boolean p5, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->isMe:Z
+    iput-boolean p5, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->isMe:Z
 
-    iput-object p6, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iput-object p6, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     return-void
 .end method
 
-.method static synthetic access$000(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Ljava/util/List;
+.method static synthetic access$000(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/util/List;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
+    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
 
     return-object p0
 .end method
 
-.method static synthetic access$100(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Ljava/lang/CharSequence;
+.method static synthetic access$100(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/lang/CharSequence;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
+    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
 
     return-object p0
 .end method
 
-.method static synthetic access$200(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Lcom/discord/widgets/user/ModelRichPresence;
+.method static synthetic access$200(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/widgets/user/presence/ModelRichPresence;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     return-object p0
 .end method
 
-.method static synthetic access$300(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Lcom/discord/utilities/streams/StreamContext;
+.method static synthetic access$300(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/utilities/streams/StreamContext;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     return-object p0
 .end method
 
-.method static synthetic access$400(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Z
+.method static synthetic access$400(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->isMe:Z
+    iget-boolean p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->isMe:Z
 
     return p0
 .end method
 
-.method static synthetic access$500(Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;)Lcom/discord/models/domain/ModelUser;
+.method static synthetic access$500(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/models/domain/ModelUser;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
 
     return-object p0
 .end method
 
-.method public static create(Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/String;Lcom/discord/widgets/user/ModelRichPresence;JLcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
+.method public static create(Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/String;Lcom/discord/widgets/user/presence/ModelRichPresence;JLcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
     .locals 8
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserProfile;->getConnectedAccounts()Ljava/util/List;
@@ -157,16 +157,16 @@
 
     check-cast v1, Lcom/discord/models/domain/ModelConnectedAccount;
 
-    new-instance v3, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;
+    new-instance v3, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
 
-    invoke-direct {v3, v1}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model$Item;-><init>(Lcom/discord/models/domain/ModelConnectedAccount;)V
+    invoke-direct {v3, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;-><init>(Lcom/discord/models/domain/ModelConnectedAccount;)V
 
     invoke-interface {v2, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_0
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
+    new-instance v0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
 
@@ -204,7 +204,7 @@
 
     move-object v7, p5
 
-    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;-><init>(Ljava/util/List;Ljava/lang/CharSequence;Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/models/domain/ModelUser;ZLcom/discord/utilities/streams/StreamContext;)V
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;-><init>(Ljava/util/List;Ljava/lang/CharSequence;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelUser;ZLcom/discord/utilities/streams/StreamContext;)V
 
     return-object v0
 .end method
@@ -215,7 +215,7 @@
         value = {
             "(J)",
             "Lrx/Observable<",
-            "Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;",
+            "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;",
             ">;"
         }
     .end annotation
@@ -236,7 +236,11 @@
 
     move-result-object v2
 
-    invoke-static {p0, p1}, Lcom/discord/widgets/user/ModelRichPresence;->get(J)Lrx/Observable;
+    invoke-static {}, Lcom/discord/stores/StoreStream;->getPresences()Lcom/discord/stores/StoreUserPresence;
+
+    move-result-object v0
+
+    invoke-static {p0, p1, v0}, Lcom/discord/widgets/user/presence/ModelRichPresence;->get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
 
     move-result-object v3
 
@@ -256,13 +260,13 @@
 
     move-result-object v5
 
-    sget-object v6, Lcom/discord/widgets/user/-$$Lambda$OShgKJUNgkGAmZbvdNybwxrNxhs;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$OShgKJUNgkGAmZbvdNybwxrNxhs;
+    sget-object v6, Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;
 
     invoke-static/range {v1 .. v6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;)Lrx/Observable;
 
     move-result-object p0
 
-    invoke-static {}, Lcom/discord/app/i;->dD()Lrx/Observable$c;
+    invoke-static {}, Lcom/discord/app/i;->dC()Lrx/Observable$c;
 
     move-result-object p1
 
@@ -278,7 +282,7 @@
 .method protected canEqual(Ljava/lang/Object;)Z
     .locals 0
 
-    instance-of p1, p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
+    instance-of p1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
 
     return p1
 .end method
@@ -293,7 +297,7 @@
     return v0
 
     :cond_0
-    instance-of v1, p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
+    instance-of v1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
 
     const/4 v2, 0x0
 
@@ -302,9 +306,9 @@
     return v2
 
     :cond_1
-    check-cast p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;
+    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
 
-    invoke-virtual {p1, p0}, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->canEqual(Ljava/lang/Object;)Z
+    invoke-virtual {p1, p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->canEqual(Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -313,9 +317,9 @@
     return v2
 
     :cond_2
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
+    iget-object v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
 
     if-nez v1, :cond_3
 
@@ -334,9 +338,9 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
+    iget-object v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
 
     if-nez v1, :cond_5
 
@@ -355,9 +359,9 @@
     return v2
 
     :cond_6
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iget-object v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     if-nez v1, :cond_7
 
@@ -376,9 +380,9 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
 
     if-nez v1, :cond_9
 
@@ -397,18 +401,18 @@
     return v2
 
     :cond_a
-    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->isMe:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->isMe:Z
 
-    iget-boolean v3, p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->isMe:Z
+    iget-boolean v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->isMe:Z
 
     if-eq v1, v3, :cond_b
 
     return v2
 
     :cond_b
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
-    iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iget-object p1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     if-nez v1, :cond_c
 
@@ -433,7 +437,7 @@
 .method public hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
 
     const/16 v1, 0x2b
 
@@ -451,7 +455,7 @@
     :goto_0
     add-int/lit8 v0, v0, 0x3b
 
-    iget-object v2, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
 
     mul-int/lit8 v0, v0, 0x3b
 
@@ -469,7 +473,7 @@
     :goto_1
     add-int/2addr v0, v2
 
-    iget-object v2, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     mul-int/lit8 v0, v0, 0x3b
 
@@ -487,7 +491,7 @@
     :goto_2
     add-int/2addr v0, v2
 
-    iget-object v2, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
 
     mul-int/lit8 v0, v0, 0x3b
 
@@ -507,7 +511,7 @@
 
     mul-int/lit8 v0, v0, 0x3b
 
-    iget-boolean v2, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->isMe:Z
+    iget-boolean v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->isMe:Z
 
     if-eqz v2, :cond_4
 
@@ -521,7 +525,7 @@
     :goto_4
     add-int/2addr v0, v2
 
-    iget-object v2, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     mul-int/lit8 v0, v0, 0x3b
 
@@ -549,7 +553,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -557,7 +561,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -565,7 +569,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -573,7 +577,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -581,7 +585,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->isMe:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->isMe:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -589,7 +593,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo.smali
new file mode 100644
index 0000000000..1ca9e503b1
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo.smali
@@ -0,0 +1,458 @@
+.class public Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
+.super Lcom/discord/app/AppFragment;
+.source "WidgetUserProfileInfo.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;,
+        Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
+    }
+.end annotation
+
+
+# instance fields
+.field private activityContainer:Landroid/widget/FrameLayout;
+
+.field private activityDivider:Landroid/view/View;
+
+.field private activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+.field private adapter:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
+
+.field private identitiesDivider:Landroid/view/View;
+
+.field private identitiesHeader:Landroid/view/View;
+
+.field private notes:Landroid/widget/EditText;
+
+.field private recycler:Landroidx/recyclerview/widget/RecyclerView;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
+
+    return-void
+.end method
+
+.method private getUserId()J
+    .locals 4
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object v0
+
+    const-string v1, "com.discord.intent.extra.EXTRA_USER_ID"
+
+    const-wide/16 v2, 0x0
+
+    invoke-virtual {v0, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method private static isTextEquivalent(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
+    .locals 1
+
+    invoke-static {p0, p1}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_0
+
+    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    return p0
+
+    :cond_1
+    :goto_0
+    const/4 p0, 0x1
+
+    return p0
+.end method
+
+
+# virtual methods
+.method public configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)V
+    .locals 8
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->adapter:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$000(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;->setData(Ljava/util/List;)V
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$100(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/lang/CharSequence;
+
+    move-result-object v0
+
+    invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->notes:Landroid/widget/EditText;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$100(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/lang/CharSequence;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V
+
+    :cond_0
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->notes:Landroid/widget/EditText;
+
+    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)V
+
+    invoke-virtual {v0, v1}, Landroid/widget/EditText;->setOnFocusChangeListener(Landroid/view/View$OnFocusChangeListener;)V
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$200(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    move-result-object v0
+
+    if-nez v0, :cond_1
+
+    const/4 v0, 0x0
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$200(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object v0
+
+    :goto_0
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityContainer:Landroid/widget/FrameLayout;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$300(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/utilities/streams/StreamContext;
+
+    move-result-object v2
+
+    iget-object v3, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+    invoke-static {v1, v0, v2, v3}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+    move-result-object v1
+
+    iput-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$200(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    move-result-object v3
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$300(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/utilities/streams/StreamContext;
+
+    move-result-object v4
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$400(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Z
+
+    move-result v5
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$500(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v6
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->getAppPermissions()Lcom/discord/app/AppPermissions;
+
+    move-result-object v7
+
+    invoke-virtual/range {v2 .. v7}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+    invoke-virtual {v1, v0, p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUiTimestamp(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/app/AppComponent;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityDivider:Landroid/view/View;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityContainer:Landroid/widget/FrameLayout;
+
+    invoke-virtual {v1}, Landroid/widget/FrameLayout;->getVisibility()I
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->identitiesDivider:Landroid/view/View;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$000(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
+
+    move-result v1
+
+    const/16 v2, 0x8
+
+    const/4 v3, 0x0
+
+    if-eqz v1, :cond_2
+
+    const/16 v1, 0x8
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :goto_1
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->identitiesHeader:Landroid/view/View;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$000(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v2, 0x0
+
+    :goto_2
+    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
+
+    return-void
+.end method
+
+.method public getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d01d4
+
+    return v0
+.end method
+
+.method public synthetic lambda$configureUI$0$WidgetUserProfileInfo(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;Landroid/view/View;Z)V
+    .locals 2
+
+    check-cast p2, Landroid/widget/EditText;
+
+    invoke-virtual {p2}, Landroid/widget/EditText;->getText()Landroid/text/Editable;
+
+    move-result-object p2
+
+    if-nez p3, :cond_0
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$100(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/lang/CharSequence;
+
+    move-result-object p1
+
+    invoke-static {p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->isTextEquivalent(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_0
+
+    invoke-static {}, Lcom/discord/utilities/rest/RestAPI;->getApi()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object p1
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->getUserId()J
+
+    move-result-wide v0
+
+    new-instance p3, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p3, p2}, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p1, v0, v1, p3}, Lcom/discord/utilities/rest/RestAPI;->updateUserNotes(JLcom/discord/restapi/RestAPIParams$UserNoteUpdate;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-static {}, Lcom/discord/app/i;->dA()Lrx/Observable$c;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string p2, "updateNote"
+
+    invoke-static {p2}, Lcom/discord/app/i;->Z(Ljava/lang/String;)Lrx/Observable$c;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
+    :cond_0
+    return-void
+.end method
+
+.method public onPause()V
+    .locals 1
+
+    invoke-super {p0}, Lcom/discord/app/AppFragment;->onPause()V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->disposeSubscriptions()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onViewBound(Landroid/view/View;)V
+    .locals 1
+
+    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
+
+    const v0, 0x7f0a07ab
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/EditText;
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->notes:Landroid/widget/EditText;
+
+    const v0, 0x7f0a0518
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    check-cast v0, Landroidx/recyclerview/widget/RecyclerView;
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->recycler:Landroidx/recyclerview/widget/RecyclerView;
+
+    const v0, 0x7f0a07ac
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/FrameLayout;
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityContainer:Landroid/widget/FrameLayout;
+
+    const v0, 0x7f0a07a8
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityDivider:Landroid/view/View;
+
+    const v0, 0x7f0a07a9
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->identitiesDivider:Landroid/view/View;
+
+    const v0, 0x7f0a07aa
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->identitiesHeader:Landroid/view/View;
+
+    new-instance p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->recycler:Landroidx/recyclerview/widget/RecyclerView;
+
+    invoke-direct {p1, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+
+    invoke-static {p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->adapter:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->recycler:Landroidx/recyclerview/widget/RecyclerView;
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
+
+    return-void
+.end method
+
+.method public onViewBoundOrOnResume()V
+    .locals 3
+
+    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->getUserId()J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->get(J)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-static {p0}, Lcom/discord/app/i;->b(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;)V
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    invoke-static {v1, v2}, Lcom/discord/app/i;->a(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1.smali
similarity index 61%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1.smali
rename to com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1.smali
index 2899b9dd08..456c5167ba 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1;
+.class final Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1;
 .super Ljava/lang/Object;
 .source "WidgetUserProfileStrip.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion;->get()Lrx/Observable;
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion;->get()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -35,18 +35,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1;
+.field public static final INSTANCE:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1;
+    new-instance v0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1;
+    sput-object v0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUser;Ljava/lang/Integer;)Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;
+.method public final call(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUser;Ljava/lang/Integer;)Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;
     .locals 1
 
     if-nez p3, :cond_0
@@ -94,9 +94,9 @@
     invoke-direct {p1, p3, v0, v0}, Lcom/discord/models/domain/ModelPresence;-><init>(ILjava/util/List;Lcom/discord/models/domain/ModelUser;)V
 
     :goto_1
-    new-instance p3, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;
+    new-instance p3, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;
 
-    invoke-direct {p3, p2, p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;)V
+    invoke-direct {p3, p2, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;)V
 
     return-object p3
 .end method
@@ -110,7 +110,7 @@
 
     check-cast p3, Ljava/lang/Integer;
 
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1;->call(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUser;Ljava/lang/Integer;)Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1;->call(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelUser;Ljava/lang/Integer;)Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion.smali
similarity index 81%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion.smali
rename to com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion.smali
index 9cbaf52fbd..3fbdf3ec97 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion;
+.class public final Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion;
 .super Ljava/lang/Object;
 .source "WidgetUserProfileStrip.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 .method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion;-><init>()V
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion;-><init>()V
 
     return-void
 .end method
@@ -39,7 +39,7 @@
         value = {
             "()",
             "Lrx/Observable<",
-            "Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;",
+            "Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;",
             ">;"
         }
     .end annotation
@@ -76,7 +76,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion$get$1;
+    sget-object v3, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion$get$1;
 
     check-cast v3, Lrx/functions/Func3;
 
@@ -92,7 +92,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model.smali
new file mode 100644
index 0000000000..19094140af
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model.smali
@@ -0,0 +1,80 @@
+.class public final Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;
+.super Ljava/lang/Object;
+.source "WidgetUserProfileStrip.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Model"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion;
+
+
+# instance fields
+.field private final presence:Lcom/discord/models/domain/ModelPresence;
+
+.field private final user:Lcom/discord/models/domain/ModelUser;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->Companion:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;)V
+    .locals 1
+
+    const-string v0, "presence"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->user:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getPresence()Lcom/discord/models/domain/ModelPresence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    return-object v0
+.end method
+
+.method public final getUser()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$1.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$1.smali
similarity index 54%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$1.smali
rename to com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$1.smali
index 4408c29608..1cfbc7b925 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$1;
+.class final Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$1;
 .super Ljava/lang/Object;
 .source "WidgetUserProfileStrip.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/WidgetUserProfileStrip;->configureUI(Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;)V
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/user/WidgetUserProfileStrip;
+.field final synthetic this$0:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/WidgetUserProfileStrip;)V
+.method constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$1;->this$0:Lcom/discord/widgets/user/WidgetUserProfileStrip;
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$1;->this$0:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,7 +39,7 @@
 
     sget-object p1, Lcom/discord/widgets/user/WidgetUserStatusSheet;->Companion:Lcom/discord/widgets/user/WidgetUserStatusSheet$Companion;
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$1;->this$0:Lcom/discord/widgets/user/WidgetUserProfileStrip;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$1;->this$0:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 
     check-cast v0, Landroidx/fragment/app/Fragment;
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$2.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$2.smali
similarity index 59%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$2.smali
rename to com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$2.smali
index f76a1f0e07..03f08cea9b 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$2.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$2;
+.class final Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$2;
 .super Ljava/lang/Object;
 .source "WidgetUserProfileStrip.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/WidgetUserProfileStrip;->configureUI(Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;)V
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/user/WidgetUserProfileStrip;
+.field final synthetic this$0:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/WidgetUserProfileStrip;)V
+.method constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$2;->this$0:Lcom/discord/widgets/user/WidgetUserProfileStrip;
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$2;->this$0:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,7 +39,7 @@
 
     sget-object p1, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearch$Companion;
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$2;->this$0:Lcom/discord/widgets/user/WidgetUserProfileStrip;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$2;->this$0:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 
     check-cast v0, Lcom/discord/app/AppFragment;
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$3.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$3.smali
similarity index 80%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$3.smali
rename to com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$3.smali
index e32e0d93c7..1ae5ed5dd1 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$3.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$3;
+.class final Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$3;
 .super Ljava/lang/Object;
 .source "WidgetUserProfileStrip.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/WidgetUserProfileStrip;->configureUI(Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;)V
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -25,7 +25,7 @@
 .method constructor <init>(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$3;->$hasUser:Z
+    iput-boolean p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$3;->$hasUser:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$3;->$hasUser:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$3;->$hasUser:Z
 
     const-string v1, "v.context"
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$4.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$4.smali
similarity index 51%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$4.smali
rename to com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$4.smali
index a2edb6c609..a1a64b0cd3 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$4.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$4;
+.class final Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$4;
 .super Ljava/lang/Object;
 .source "WidgetUserProfileStrip.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/WidgetUserProfileStrip;->configureUI(Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;)V
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/widgets/user/WidgetUserProfileStrip;
+.field final synthetic this$0:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/WidgetUserProfileStrip;)V
+.method constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$4;->this$0:Lcom/discord/widgets/user/WidgetUserProfileStrip;
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$4;->this$0:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$4;->this$0:Lcom/discord/widgets/user/WidgetUserProfileStrip;
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$4;->this$0:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->requireContext()Landroid/content/Context;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->requireContext()Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali
similarity index 51%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali
rename to com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali
index 7c4cc3334e..f25d0a6bd7 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali
@@ -1,4 +1,4 @@
-.class final synthetic Lcom/discord/widgets/user/WidgetUserProfileStrip$onViewBoundOrOnResume$1;
+.class final synthetic Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$onViewBoundOrOnResume$1;
 .super Lkotlin/jvm/internal/j;
 .source "WidgetUserProfileStrip.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/WidgetUserProfileStrip;->onViewBoundOrOnResume()V
+    value = Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->onViewBoundOrOnResume()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;",
+        "Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -28,7 +28,7 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/WidgetUserProfileStrip;)V
+.method constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;)V
     .locals 1
 
     const/4 v0, 0x1
@@ -51,7 +51,7 @@
 .method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
     .locals 1
 
-    const-class v0, Lcom/discord/widgets/user/WidgetUserProfileStrip;
+    const-class v0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 
     invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "configureUI(Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;)V"
+    const-string v0, "configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;)V"
 
     return-object v0
 .end method
@@ -71,27 +71,27 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;
+    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;)V
+.method public final invoke(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;)V
     .locals 1
 
     const-string v0, "p1"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip$onViewBoundOrOnResume$1;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$onViewBoundOrOnResume$1;->receiver:Ljava/lang/Object;
 
-    check-cast v0, Lcom/discord/widgets/user/WidgetUserProfileStrip;
+    check-cast v0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 
-    invoke-static {v0, p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->access$configureUI(Lcom/discord/widgets/user/WidgetUserProfileStrip;Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;)V
+    invoke-static {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->access$configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali
similarity index 64%
rename from com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali
rename to com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali
index a662d5cde0..6d9eeb4e2a 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/user/WidgetUserProfileStrip;
+.class public final Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 .super Lcom/discord/app/AppFragment;
 .source "WidgetUserProfileStrip.kt"
 
@@ -6,7 +6,7 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;
+        Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;
     }
 .end annotation
 
@@ -37,7 +37,7 @@
 .method static constructor <clinit>()V
     .locals 6
 
-    const-class v0, Lcom/discord/widgets/user/WidgetUserProfileStrip;
+    const-class v0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 
     const/16 v1, 0x8
 
@@ -219,7 +219,7 @@
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lcom/discord/widgets/user/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sput-object v1, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     return-void
 .end method
@@ -229,85 +229,85 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0538
+    const v0, 0x7f0a0548
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileAvatarWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileAvatarWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0539
+    const v0, 0x7f0a0549
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a053f
+    const v0, 0x7f0a054f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileOnlineStatus$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileOnlineStatus$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a053c
+    const v0, 0x7f0a054c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileStripName$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileStripName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a053a
+    const v0, 0x7f0a054a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileStripDiscriminator$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileStripDiscriminator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a053d
+    const v0, 0x7f0a054d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileStripSearch$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileStripSearch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a053e
+    const v0, 0x7f0a054e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileStripSettings$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileStripSettings$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a053b
+    const v0, 0x7f0a054b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileStripMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileStripMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
 
-.method public static final synthetic access$configureUI(Lcom/discord/widgets/user/WidgetUserProfileStrip;Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;)V
+.method public static final synthetic access$configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->configureUI(Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;)V
 
     return-void
 .end method
 
-.method private final configureUI(Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;)V
+.method private final configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;)V
     .locals 12
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v0
 
@@ -323,13 +323,13 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
 
     move-result-object v2
 
     const/4 v3, 0x0
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->getProfileOnlineStatus()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->getProfileOnlineStatus()Landroid/widget/ImageView;
 
     move-result-object v4
 
@@ -341,7 +341,7 @@
 
     invoke-static/range {v2 .. v7}, Lcom/discord/utilities/presence/PresenceUtils;->setPresence$default(Lcom/discord/models/domain/ModelPresence;ZLandroid/widget/ImageView;Landroid/widget/TextView;ILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->getProfileAvatarWrap()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->getProfileAvatarWrap()Landroid/view/View;
 
     move-result-object v2
 
@@ -359,25 +359,25 @@
     :goto_1
     invoke-virtual {v2, v4}, Landroid/view/View;->setVisibility(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->getProfileAvatarWrap()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->getProfileAvatarWrap()Landroid/view/View;
 
     move-result-object v2
 
-    new-instance v4, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$1;
+    new-instance v4, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$1;
 
-    invoke-direct {v4, p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$1;-><init>(Lcom/discord/widgets/user/WidgetUserProfileStrip;)V
+    invoke-direct {v4, p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$1;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;)V
 
     check-cast v4, Landroid/view/View$OnClickListener;
 
     invoke-virtual {v2, v4}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v2
 
@@ -385,15 +385,15 @@
 
     if-eq v2, v4, :cond_2
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->getProfileAvatar()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->getProfileAvatar()Landroid/widget/ImageView;
 
     move-result-object v5
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v6
 
-    const v7, 0x7f07005b
+    const v7, 0x7f07005a
 
     const/4 v8, 0x0
 
@@ -405,11 +405,11 @@
 
     invoke-static/range {v5 .. v11}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->getProfileStripName()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->getProfileStripName()Landroid/widget/TextView;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v4
 
@@ -421,11 +421,11 @@
 
     invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->getProfileStripDiscriminator()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->getProfileStripDiscriminator()Landroid/widget/TextView;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object p1
 
@@ -438,47 +438,47 @@
     invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_2
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->getProfileStripSearch()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->getProfileStripSearch()Landroid/widget/ImageView;
 
     move-result-object p1
 
-    new-instance v2, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$2;
+    new-instance v2, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$2;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$2;-><init>(Lcom/discord/widgets/user/WidgetUserProfileStrip;)V
+    invoke-direct {v2, p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$2;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->getProfileStripSettings()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->getProfileStripSettings()Landroid/widget/ImageView;
 
     move-result-object p1
 
     if-eqz v0, :cond_3
 
-    const v2, 0x7f08035a
+    const v2, 0x7f08036b
 
     goto :goto_2
 
     :cond_3
-    const v2, 0x7f0802b2
+    const v2, 0x7f0802c2
 
     :goto_2
     invoke-virtual {p1, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->getProfileStripSettings()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->getProfileStripSettings()Landroid/widget/ImageView;
 
     move-result-object p1
 
-    new-instance v2, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$3;
+    new-instance v2, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$3;
 
-    invoke-direct {v2, v0}, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$3;-><init>(Z)V
+    invoke-direct {v2, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$3;-><init>(Z)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p1, v2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->getProfileStripMentions()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->getProfileStripMentions()Landroid/widget/ImageView;
 
     move-result-object p1
 
@@ -492,13 +492,13 @@
     :goto_3
     invoke-virtual {p1, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip;->getProfileStripMentions()Landroid/widget/ImageView;
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->getProfileStripMentions()Landroid/widget/ImageView;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$4;
+    new-instance v0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$4;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/user/WidgetUserProfileStrip$configureUI$4;-><init>(Lcom/discord/widgets/user/WidgetUserProfileStrip;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$configureUI$4;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;)V
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
@@ -510,9 +510,9 @@
 .method private final getProfileAvatar()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
@@ -530,9 +530,9 @@
 .method private final getProfileAvatarWrap()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileAvatarWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileAvatarWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
@@ -550,9 +550,9 @@
 .method private final getProfileOnlineStatus()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileOnlineStatus$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileOnlineStatus$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x2
 
@@ -570,9 +570,9 @@
 .method private final getProfileStripDiscriminator()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileStripDiscriminator$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileStripDiscriminator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x4
 
@@ -590,9 +590,9 @@
 .method private final getProfileStripMentions()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileStripMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileStripMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x7
 
@@ -610,9 +610,9 @@
 .method private final getProfileStripName()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileStripName$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileStripName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x3
 
@@ -630,9 +630,9 @@
 .method private final getProfileStripSearch()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileStripSearch$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileStripSearch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x5
 
@@ -650,9 +650,9 @@
 .method private final getProfileStripSettings()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileStrip;->profileStripSettings$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->profileStripSettings$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+    sget-object v1, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x6
 
@@ -672,7 +672,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d3
+    const v0, 0x7f0d01e1
 
     return v0
 .end method
@@ -682,9 +682,9 @@
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
 
-    sget-object v0, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->Companion:Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion;
+    sget-object v0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->Companion:Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model$Companion;->get()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion;->get()Lrx/Observable;
 
     move-result-object v0
 
@@ -704,13 +704,13 @@
 
     move-result-object v5
 
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserProfileStrip$onViewBoundOrOnResume$1;
+    new-instance v0, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$onViewBoundOrOnResume$1;
 
     move-object v1, p0
 
-    check-cast v1, Lcom/discord/widgets/user/WidgetUserProfileStrip;
+    check-cast v1, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/user/WidgetUserProfileStrip;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfileStrip;)V
 
     move-object v10, v0
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
index 2bd147e71e..a41b8a6c7e 100644
--- a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
@@ -217,7 +217,7 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p1, 0x7f0a03e0
+    const p1, 0x7f0a03f0
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -225,7 +225,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->iconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03f8
+    const p1, 0x7f0a0408
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -233,7 +233,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->nameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03ca
+    const p1, 0x7f0a03da
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -241,7 +241,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->descriptionTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03db
+    const p1, 0x7f0a03eb
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -249,7 +249,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->groupTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03f7
+    const p1, 0x7f0a0407
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -257,7 +257,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->mentionsTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03fb
+    const p1, 0x7f0a040b
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -273,7 +273,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d0089
+    const p3, 0x7f0d0090
 
     invoke-static {p1, p3, p2}, Landroidx/constraintlayout/widget/ConstraintLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -618,7 +618,7 @@
 
     check-cast v2, Landroid/widget/ImageView;
 
-    const v9, 0x7f080212
+    const v9, 0x7f080221
 
     invoke-static {v2, v9, v3, v8, v3}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
@@ -631,7 +631,7 @@
 
     check-cast v2, Landroid/widget/ImageView;
 
-    const v9, 0x7f08021a
+    const v9, 0x7f080229
 
     invoke-static {v2, v9, v3, v8, v3}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
@@ -650,7 +650,7 @@
 
     move-result-object v9
 
-    const v10, 0x7f07005b
+    const v10, 0x7f07005a
 
     const/4 v11, 0x0
 
@@ -740,7 +740,7 @@
 
     check-cast v2, Landroid/view/View;
 
-    const v4, 0x7f060154
+    const v4, 0x7f060156
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
@@ -1025,7 +1025,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f12068a
+    const v1, 0x7f120698
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali
index 808d37b8c5..c4ad331fab 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali
@@ -67,7 +67,7 @@
 
     new-array v0, v0, [Lkotlin/Pair;
 
-    const v1, 0x7f12128f
+    const v1, 0x7f1212e0
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -87,7 +87,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f121124
+    const v1, 0x7f121166
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -107,7 +107,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f1212dd
+    const v1, 0x7f12132e
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -127,7 +127,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f120fec
+    const v1, 0x7f121028
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -251,7 +251,7 @@
 
     move-result-object v8
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     move-object v5, p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$2.smali
index c6a2cde445..aa402eb876 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$2.smali
@@ -74,7 +74,7 @@
 
     invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$2;->invoke(Landroid/view/View;ILcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.smali
index 83be3c1098..bdfb85e533 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.smali
@@ -67,7 +67,7 @@
 
     invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1;->invoke(IILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$2.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$2.smali
index 71b3adb162..6964341ce8 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$2.smali
@@ -71,7 +71,7 @@
 
     invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$2;->invoke(IILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$1.smali
index c1346ad675..9020f7d7a4 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$1;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$1.smali
index a0bfd0f557..0b3bcb8fde 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$2.smali
index 11b21d7716..d744183e3a 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$2;->invoke(Ljava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$1.smali
index f810f3bee3..cd8714531d 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$1;->invoke(I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali
index 25481a4712..b126476da6 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali
@@ -287,7 +287,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a031f
+    const v0, 0x7f0a0324
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -295,7 +295,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->resultsList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a031d
+    const v0, 0x7f0a0322
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -303,7 +303,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->guildList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0320
+    const v0, 0x7f0a0325
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -311,7 +311,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a031c
+    const v0, 0x7f0a0321
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -319,7 +319,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->addAFriendBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a031e
+    const v0, 0x7f0a0323
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -327,7 +327,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->joinGuildBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05a1
+    const v0, 0x7f0a05bb
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -335,7 +335,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->searchBack$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05ab
+    const v0, 0x7f0a05c5
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -343,7 +343,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->searchInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05a5
+    const v0, 0x7f0a05bf
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -351,7 +351,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->searchClear$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05a8
+    const v0, 0x7f0a05c2
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -455,7 +455,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->getGuildsList()Ljava/util/List;
@@ -464,7 +464,7 @@
 
     if-nez v2, :cond_1
 
-    sget-object v2, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v2, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v2, Ljava/util/List;
 
@@ -475,7 +475,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1;
@@ -490,7 +490,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     new-instance v1, Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$2;
@@ -541,7 +541,7 @@
 
     const-string v1, "resultsAdapter"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_5
     new-instance v1, Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$1;
@@ -832,7 +832,7 @@
 
     move-result-wide v0
 
-    invoke-static {p2, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    invoke-static {p2, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
 
     goto :goto_0
 
@@ -1184,9 +1184,9 @@
 
     check-cast v1, [Ljava/lang/String;
 
-    sget-object v2, Lcom/discord/a/b;->wD:Lcom/discord/a/b$a;
+    sget-object v2, Lcom/discord/dialogs/d;->wN:Lcom/discord/dialogs/d$a;
 
-    const v2, 0x7f1205a4
+    const v2, 0x7f1205b0
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String;
 
@@ -1204,7 +1204,7 @@
 
     check-cast v3, Lkotlin/jvm/functions/Function1;
 
-    invoke-static {v0, v2, v1, v3}, Lcom/discord/a/b$a;->a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;[Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Lcom/discord/a/b;
+    invoke-static {v0, v2, v1, v3}, Lcom/discord/dialogs/d$a;->a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;[Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Lcom/discord/dialogs/d;
 
     return-void
 
@@ -1253,7 +1253,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0123
+    const v0, 0x7f0d012b
 
     return v0
 .end method
@@ -1281,7 +1281,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f130260
+    const v2, 0x7f130262
 
     iput v2, v1, Landroid/view/WindowManager$LayoutParams;->windowAnimations:I
 
@@ -1344,7 +1344,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f0402a6
+    const v3, 0x7f0402a9
 
     invoke-static {p1, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -1366,7 +1366,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120e8e
+    const v0, 0x7f120ec4
 
     invoke-virtual {p1, v0}, Landroid/widget/EditText;->setHint(I)V
 
@@ -1529,7 +1529,7 @@
 
     const-string v3, "resultsAdapter"
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     check-cast v2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
@@ -1582,11 +1582,11 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kf()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JT()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder.smali
index 5991f6ddcd..32e7a4280a 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder.smali
@@ -66,11 +66,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00d2
+    const v0, 0x7f0d00db
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item;-><init>(ILcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
 
-    const p1, 0x7f0a03df
+    const p1, 0x7f0a03ef
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder.smali
index 83660cc288..21c130830d 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder.smali
@@ -26,7 +26,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00d1
+    const v0, 0x7f0d00da
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item;-><init>(ILcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$onSelectedListener$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$onSelectedListener$1.smali
index b3c846cda6..e7b20ace38 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$onSelectedListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$onSelectedListener$1.smali
@@ -80,7 +80,7 @@
 
     invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$onSelectedListener$1;->invoke(Landroid/view/View;ILcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali
index b84eb12a12..76dea6c015 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali
@@ -110,7 +110,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f070120
+    const v1, 0x7f070122
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
@@ -175,7 +175,7 @@
 
     if-eqz p2, :cond_2
 
-    const p3, 0x7f1208e9
+    const p3, 0x7f120909
 
     invoke-virtual {p2, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -228,7 +228,7 @@
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f04027b
+    const v3, 0x7f04027e
 
     const/4 v4, 0x2
 
@@ -238,7 +238,7 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setBackgroundResource(I)V
 
-    const v0, 0x7f120b47
+    const v0, 0x7f120b78
 
     const/4 v3, 0x1
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage.smali
index de5f8b215c..b47d6db3ee 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage.smali
@@ -92,7 +92,7 @@
 
     invoke-direct {p0, p2, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item;-><init>(ILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter;)V
 
-    const p1, 0x7f0a0374
+    const p1, 0x7f0a0384
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -100,7 +100,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage;->itemIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0375
+    const p1, 0x7f0a0385
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -180,7 +180,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f070057
+    const v3, 0x7f070056
 
     const/4 v4, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild.smali
index 8ad628afe4..3d349a76b0 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild.smali
@@ -192,7 +192,7 @@
 
     iput p3, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->overlayColor:I
 
-    const p1, 0x7f0a0371
+    const p1, 0x7f0a0381
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -200,7 +200,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->itemAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0372
+    const p1, 0x7f0a0382
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -208,7 +208,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->itemAvatarText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a037a
+    const p1, 0x7f0a038a
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -216,7 +216,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->itemMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a037f
+    const p1, 0x7f0a038f
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -224,7 +224,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->itemVoice$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a037e
+    const p1, 0x7f0a038e
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -232,7 +232,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->itemUnread$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a037d
+    const p1, 0x7f0a038d
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onClickListener$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onClickListener$1.smali
index e81f2fd5ca..3e1bbd5c95 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onClickListener$1.smali
@@ -77,7 +77,7 @@
 
     invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onClickListener$1;->invoke(IILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onLongClickListener$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onLongClickListener$1.smali
index 1c4693c7e4..ad19ea1e07 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onLongClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onLongClickListener$1.smali
@@ -77,7 +77,7 @@
 
     invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onLongClickListener$1;->invoke(IILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.smali
index bf92a663e5..ee4ca81620 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.smali
@@ -169,7 +169,7 @@
 
     new-instance p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;
 
-    const p2, 0x7f0d0126
+    const p2, 0x7f0d012e
 
     iget v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter;->overlayColor:I
 
@@ -191,7 +191,7 @@
     :cond_1
     new-instance p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage;
 
-    const p2, 0x7f0d0125
+    const p2, 0x7f0d012d
 
     invoke-direct {p1, p0, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter;I)V
 
@@ -202,7 +202,7 @@
     :cond_2
     new-instance p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDivider;
 
-    const p2, 0x7f0d0124
+    const p2, 0x7f0d012c
 
     invoke-direct {p1, p0, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDivider;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion.smali
index 6739b8363e..ddc2f262fe 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion.smali
@@ -364,14 +364,14 @@
 
     aput-object v4, v1, v3
 
-    invoke-static {v1}, Lkotlin/sequences/i;->r([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    invoke-static {v1}, Lkotlin/sequences/i;->q([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
 
     move-result-object v1
 
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lkotlin/sequences/e;->blj:Lkotlin/sequences/e;
+    sget-object v1, Lkotlin/sequences/e;->blD:Lkotlin/sequences/e;
 
     check-cast v1, Lkotlin/sequences/Sequence;
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item.smali
index aa5bd002a9..33cf25ab7f 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item.smali
@@ -756,23 +756,23 @@
 .end method
 
 .method public final hashCode()I
-    .locals 5
+    .locals 3
 
     iget v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->_type:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->id:J
 
-    const/16 v3, 0x20
+    invoke-static {v1, v2}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v3, v1, v3
+    move-result v1
 
-    xor-long/2addr v1, v3
-
-    long-to-int v2, v1
-
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
@@ -811,6 +811,10 @@
 
     iget v1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->mentionCount:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
@@ -852,6 +856,10 @@
 
     iget v1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->unavailableGuildCount:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali
index 303b46f5a8..19b174ee6f 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali
@@ -206,7 +206,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v2
 
@@ -226,7 +226,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -303,7 +303,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v2}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v2
 
@@ -420,7 +420,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v2}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v2
 
@@ -468,7 +468,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v2}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v2
 
@@ -522,7 +522,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -637,7 +637,7 @@
 
     aput-object p1, v0, p4
 
-    invoke-static {v0}, Lkotlin/sequences/i;->r([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    invoke-static {v0}, Lkotlin/sequences/i;->q([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
@@ -882,7 +882,7 @@
     if-nez v2, :cond_1
 
     :cond_0
-    sget-object v2, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object v2, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast v2, Ljava/util/Set;
 
@@ -1348,7 +1348,7 @@
 
     new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    const v6, 0x7f1210bb
+    const v6, 0x7f1210fc
 
     const/4 v7, 0x0
 
@@ -1364,7 +1364,7 @@
 
     aput-object v2, v0, v4
 
-    invoke-static {v0}, Lkotlin/sequences/i;->r([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    invoke-static {v0}, Lkotlin/sequences/i;->q([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
 
     move-result-object v0
 
@@ -1383,7 +1383,7 @@
 
     new-instance v12, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    const v7, 0x7f120e8b
+    const v7, 0x7f120ec1
 
     const/4 v8, 0x0
 
@@ -1403,7 +1403,7 @@
 
     aput-object v2, v5, v3
 
-    invoke-static {v5}, Lkotlin/sequences/i;->r([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    invoke-static {v5}, Lkotlin/sequences/i;->q([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
 
     move-result-object v2
 
@@ -1411,7 +1411,7 @@
 
     new-instance v11, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    const v6, 0x7f1210bb
+    const v6, 0x7f1210fc
 
     const/4 v7, 0x0
 
@@ -1425,7 +1425,7 @@
 
     aput-object v11, v3, v4
 
-    invoke-static {v3}, Lkotlin/sequences/i;->r([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    invoke-static {v3}, Lkotlin/sequences/i;->q([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
 
     move-result-object v3
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel.smali
index 19b9076c51..7b083f63de 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel.smali
@@ -543,6 +543,10 @@
 
     move-result v1
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild.smali
index a3e5250104..2888a5c0cb 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild.smali
@@ -485,6 +485,10 @@
 
     move-result v1
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader.smali
index 6ca2b84aba..ff3fa6ddd7 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader.smali
@@ -311,12 +311,20 @@
 
     iget v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;->name:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;->getMentions()I
 
     move-result v1
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser.smali
index ff6ff74818..4f23957e4d 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser.smali
@@ -773,6 +773,10 @@
 
     move-result v1
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult.smali
index 3a04ec871a..64309d822e 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult.smali
@@ -224,12 +224,20 @@
 
     iget v1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;->firstMatchIndex:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget v1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;->filterLength:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext.smali
index ec81ee5580..43e21e7fc3 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext.smali
@@ -826,7 +826,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 4
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->filter:Ljava/lang/String;
 
@@ -866,39 +866,31 @@
 
     iget-wide v2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->selectedChannelId:J
 
-    const/16 v4, 0x20
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v5, v2, v4
+    move-result v2
 
-    xor-long/2addr v2, v5
-
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->prevSelectedChannelId:J
 
-    ushr-long v5, v2, v4
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    xor-long/2addr v2, v5
+    move-result v2
 
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->selectedVoiceChannelId:J
 
-    ushr-long v4, v2, v4
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    xor-long/2addr v2, v4
+    move-result v2
 
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel.smali
index cebdfc9cfa..334b0fc27e 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel.smali
@@ -454,6 +454,10 @@
 
     iget v2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->searchType:I
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
index 622b3e77b4..937e0f95de 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;",
+        "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -63,7 +63,7 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V"
+    const-string v0, "configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V"
 
     return-object v0
 .end method
@@ -71,23 +71,23 @@
 .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1;->invoke(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1;->invoke(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method public final invoke(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
     .locals 1
 
     iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1;->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/WidgetUserSheetModel;)V
+    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
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
index e890876f2b..20ee71c3fa 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
@@ -1,5 +1,5 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2;
-.super Lkotlin/jvm/internal/l;
+.class final synthetic Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2;
+.super Lkotlin/jvm/internal/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -12,62 +12,86 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
+    accessFlags = 0x1018
     name = null
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/internal/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lrx/Subscription;",
+        "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;",
         "Lkotlin/Unit;",
         ">;"
     }
 .end annotation
 
 
-# instance fields
-.field final synthetic $compositeSubscription:Lrx/subscriptions/CompositeSubscription;
-
-
 # direct methods
-.method constructor <init>(Lrx/subscriptions/CompositeSubscription;)V
-    .locals 0
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    .locals 1
 
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2;->$compositeSubscription:Lrx/subscriptions/CompositeSubscription;
+    const/4 v0, 0x1
 
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><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/user/usersheet/WidgetUserSheet;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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 final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lrx/Subscription;
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2;->invoke(Lrx/Subscription;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2;->invoke(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lrx/Subscription;)V
+.method public final invoke(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;)V
     .locals 1
 
-    const-string v0, "it"
+    const-string v0, "p1"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2;->$compositeSubscription:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2;->receiver:Ljava/lang/Object;
 
-    invoke-virtual {v0, p1}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
+    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
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2.smali
index 90aebaeaae..f8d65f0488 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,22 @@
 
 
 # instance fields
-.field final synthetic $this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+.field final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
+
+.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
 
 .field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2;->$user:Lcom/discord/models/domain/ModelUser;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,11 +45,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 4
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p1
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2;->$channel:Lcom/discord/models/domain/ModelChannel;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -59,11 +59,7 @@
 
     move-result-wide v0
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2;->$user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3$1.smali
index a8195e5b6d..1cb0726ff6 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3.smali
index 154634aefa..276b5dad86 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,22 @@
 
 
 # instance fields
-.field final synthetic $this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+.field final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
+
+.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
 
 .field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;->$user:Lcom/discord/models/domain/ModelUser;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,21 +53,13 @@
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v2
+    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;->$channel:Lcom/discord/models/domain/ModelChannel;
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
     move-result-wide v2
 
-    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {v4}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v4
+    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;->$user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4.smali
index 6d56bac883..3ff3b58a44 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,22 @@
 
 
 # instance fields
-.field final synthetic $this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+.field final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
+
+.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
 
 .field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;->$user:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;->$channel:Lcom/discord/models/domain/ModelChannel;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,11 +47,7 @@
 
     sget-object v0, Lcom/discord/widgets/user/WidgetKickUser;->Companion:Lcom/discord/widgets/user/WidgetKickUser$Companion;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;->$user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
@@ -57,11 +57,7 @@
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p1
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;->$channel:Lcom/discord/models/domain/ModelChannel;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -75,11 +71,7 @@
 
     move-result-wide v2
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;->$user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5.smali
index a5bee9fd11..7d4e0f2cc5 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,22 @@
 
 
 # instance fields
-.field final synthetic $this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+.field final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
+
+.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
 
 .field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;->$user:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;->$channel:Lcom/discord/models/domain/ModelChannel;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,11 +47,7 @@
 
     sget-object v0, Lcom/discord/widgets/user/WidgetBanUser;->Companion:Lcom/discord/widgets/user/WidgetBanUser$Companion;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;->$user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
@@ -57,11 +57,7 @@
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p1
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;->$channel:Lcom/discord/models/domain/ModelChannel;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -75,11 +71,7 @@
 
     move-result-wide v2
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;->$user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6.smali
index b1d505a224..9892bc68b2 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,26 @@
 
 
 # instance fields
-.field final synthetic $this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+.field final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
+
+.field final synthetic $isServerMuted:Z
+
+.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
 
 .field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;Z)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;->$user:Lcom/discord/models/domain/ModelUser;
+
+    iput-boolean p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;->$isServerMuted:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,11 +55,7 @@
 
     move-result-object v0
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p1
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;->$channel:Lcom/discord/models/domain/ModelChannel;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -65,11 +69,7 @@
 
     move-result-wide v1
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;->$user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -77,11 +77,7 @@
 
     sget-object p1, Lcom/discord/restapi/RestAPIParams$GuildMember;->Companion:Lcom/discord/restapi/RestAPIParams$GuildMember$Companion;
 
-    iget-object v5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isServerMuted()Z
-
-    move-result v5
+    iget-boolean v5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;->$isServerMuted:Z
 
     const/4 v6, 0x1
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7.smali
index 9523916e31..555cbc952d 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,26 @@
 
 
 # instance fields
-.field final synthetic $this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+.field final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
+
+.field final synthetic $isServerDeafened:Z
+
+.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
 
 .field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;Z)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;->$user:Lcom/discord/models/domain/ModelUser;
+
+    iput-boolean p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;->$isServerDeafened:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,11 +55,7 @@
 
     move-result-object v0
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p1
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;->$channel:Lcom/discord/models/domain/ModelChannel;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -65,11 +69,7 @@
 
     move-result-wide v1
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;->$user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -77,11 +77,7 @@
 
     sget-object p1, Lcom/discord/restapi/RestAPIParams$GuildMember;->Companion:Lcom/discord/restapi/RestAPIParams$GuildMember$Companion;
 
-    iget-object v5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isServerDeafened()Z
-
-    move-result v5
+    iget-boolean v5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;->$isServerDeafened:Z
 
     const/4 v6, 0x1
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8.smali
index 8ac2bd6fde..1e1df10c08 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic $this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+.field final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
 
 .field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelChannel;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8;->$channel:Lcom/discord/models/domain/ModelChannel;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,11 +49,7 @@
 
     check-cast v1, Landroidx/fragment/app/Fragment;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p1
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8;->$channel:Lcom/discord/models/domain/ModelChannel;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali
index abf3d8345c..88ac63624a 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali
@@ -67,7 +67,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120b7e
+    const v0, 0x7f120baf
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9.smali
index f9e8822727..809723c99f 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -30,18 +30,22 @@
 
 
 # instance fields
-.field final synthetic $this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+.field final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
+
+.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
 
 .field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;->$user:Lcom/discord/models/domain/ModelUser;
 
     const/4 p1, 0x3
 
@@ -71,7 +75,7 @@
 
     invoke-virtual {p0, v0, v1, p2, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;->invoke(JLjava/lang/String;I)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -89,11 +93,7 @@
 
     move-result-object v0
 
-    iget-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p3
+    iget-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;->$channel:Lcom/discord/models/domain/ModelChannel;
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -107,11 +107,7 @@
 
     move-result-wide v1
 
-    iget-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;->$this_configureAdministrativeSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {p3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p3
+    iget-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;->$user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
index 03c836335a..f12f6384a3 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureDeveloperSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureDeveloperSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -20,20 +20,20 @@
 # instance fields
 .field final synthetic $this_apply:Landroid/view/View;
 
-.field final synthetic $this_configureDeveloperSection$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+.field final synthetic $viewState$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
 .field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
 
 # direct methods
-.method constructor <init>(Landroid/view/View;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method constructor <init>(Landroid/view/View;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1;->$this_apply:Landroid/view/View;
 
     iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1;->$this_configureDeveloperSection$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1;->$viewState$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,9 +55,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1;->$this_configureDeveloperSection$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1;->$viewState$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali
new file mode 100644
index 0000000000..d80fbac7a5
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali
@@ -0,0 +1,45 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1;
+.super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureIncomingFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    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/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$acceptFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2.smali
new file mode 100644
index 0000000000..4c0056ae71
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2.smali
@@ -0,0 +1,45 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2;
+.super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureIncomingFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    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/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$ignoreFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali
new file mode 100644
index 0000000000..21201661f8
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali
@@ -0,0 +1,77 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1;
+.super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureProfileActionButtons(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $viewState:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1;->$viewState:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 3
+
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->requireContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    const-string v1, "this@WidgetUserSheet.requireContext()"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(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;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v1
+
+    invoke-virtual {p1, v0, v1, v2}, Lcom/discord/stores/StoreChannelsSelected;->findAndSetDirectMessage(Landroid/content/Context;J)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2.smali
new file mode 100644
index 0000000000..ced2bef8e6
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2;
+.super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureProfileActionButtons(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    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/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$getViewModel$p(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->launchVoiceCall()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3.smali
new file mode 100644
index 0000000000..da4b7519c8
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3.smali
@@ -0,0 +1,49 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3;
+.super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureProfileActionButtons(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    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/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$getViewModel$p(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->launchVideoCall()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali
new file mode 100644
index 0000000000..cbf416afd6
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali
@@ -0,0 +1,45 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4;
+.super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureProfileActionButtons(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    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/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$addFriend(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
new file mode 100644
index 0000000000..2b4838b37d
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
@@ -0,0 +1,97 @@
+.class final synthetic Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1;
+.super Lkotlin/jvm/internal/j;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->onClick(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Integer;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)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}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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 final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Number;
+
+    invoke-virtual {p1}, Ljava/lang/Number;->intValue()I
+
+    move-result p1
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1;->invoke(I)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(I)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->removeRelationship(I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
new file mode 100644
index 0000000000..db781a0bc7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
@@ -0,0 +1,90 @@
+.class final synthetic Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2;
+.super Lkotlin/jvm/internal/j;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->onClick(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getName()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "acceptFriendRequest"
+
+    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}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final getSignature()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "acceptFriendRequest()V"
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-static {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$acceptFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
new file mode 100644
index 0000000000..dc8d9d8c9a
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
@@ -0,0 +1,90 @@
+.class final synthetic Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3;
+.super Lkotlin/jvm/internal/j;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->onClick(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getName()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "ignoreFriendRequest"
+
+    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}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final getSignature()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "ignoreFriendRequest()V"
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-static {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$ignoreFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
new file mode 100644
index 0000000000..2db116297b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
@@ -0,0 +1,136 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;
+.super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureProfileActionButtons(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $userRelationshipType:I
+
+.field final synthetic $viewState:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ILcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    iput p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->$userRelationshipType:I
+
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->$viewState:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 4
+
+    iget p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->$userRelationshipType:I
+
+    const/4 v0, 0x3
+
+    const-string v1, "requireContext()"
+
+    if-eq p1, v0, :cond_1
+
+    const/4 v0, 0x4
+
+    if-eq p1, v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->$viewState:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->requireContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1;
+
+    iget-object v3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-static {v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$getViewModel$p(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    move-result-object v3
+
+    invoke-direct {v2, v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+
+    check-cast v2, Lkotlin/jvm/functions/Function1;
+
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/dialogs/a;->a(Lcom/discord/models/domain/ModelUser;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;Lkotlin/jvm/functions/Function1;)V
+
+    return-void
+
+    :cond_1
+    sget-object p1, Lcom/discord/dialogs/a;->ws:Lcom/discord/dialogs/a;
+
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->requireContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2;
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-direct {v1, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    check-cast v1, Lkotlin/jvm/functions/Function0;
+
+    new-instance v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3;
+
+    iget-object v3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-direct {v2, v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    check-cast v2, Lkotlin/jvm/functions/Function0;
+
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/dialogs/a;->a(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali
index 0761f1c1a7..c4c6b92ded 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali
@@ -1,14 +1,14 @@
 .class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;
-.super Ljava/lang/Object;
+.super Lkotlin/jvm/internal/l;
 .source "WidgetUserSheet.kt"
 
 # interfaces
-.implements Landroid/view/View$OnClickListener;
+.implements Lkotlin/jvm/functions/Function0;
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -16,60 +16,59 @@
     name = null
 .end annotation
 
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
 
 # instance fields
-.field final synthetic $isMe$inlined:Z
+.field final synthetic $activity$inlined:Lcom/discord/models/domain/ModelPresence$Activity;
 
-.field final synthetic $model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-.field final synthetic $this_apply:Landroid/widget/TextView;
-
-.field final synthetic $user$inlined:Lcom/discord/models/domain/ModelUser;
+.field final synthetic $model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
 .field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
 
 # direct methods
-.method constructor <init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;Lcom/discord/models/domain/ModelPresence$Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->$this_apply:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
-    iput-boolean p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->$isMe$inlined:Z
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->$activity$inlined:Lcom/discord/models/domain/ModelPresence$Activity;
 
-    iput-object p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->$user$inlined:Lcom/discord/models/domain/ModelUser;
+    const/4 p1, 0x0
 
-    iput-object p5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 2
+.method public final bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
 
-    sget-object p1, Lcom/discord/widgets/settings/WidgetSettings;->Companion:Lcom/discord/widgets/settings/WidgetSettings$Companion;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->invoke()V
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->$this_apply:Landroid/widget/TextView;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
-    invoke-virtual {v0}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+    return-object v0
+.end method
 
-    move-result-object v0
+.method public final invoke()V
+    .locals 1
 
-    const-string v1, "context"
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/WidgetSettings$Companion;->launch(Landroid/content/Context;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali
index 9456e3129f..cdc2c75961 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -20,7 +20,7 @@
 # instance fields
 .field final synthetic $isMe$inlined:Z
 
-.field final synthetic $model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+.field final synthetic $model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
 .field final synthetic $this_apply:Landroid/widget/TextView;
 
@@ -30,7 +30,7 @@
 
 
 # direct methods
-.method constructor <init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method constructor <init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->$this_apply:Landroid/widget/TextView;
@@ -41,7 +41,7 @@
 
     iput-object p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->$user$inlined:Lcom/discord/models/domain/ModelUser;
 
-    iput-object p5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iput-object p5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,31 +51,21 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 3
+    .locals 2
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->$this_apply:Landroid/widget/TextView;
+    sget-object p1, Lcom/discord/widgets/settings/WidgetSettings;->Companion:Lcom/discord/widgets/settings/WidgetSettings$Companion;
 
-    invoke-virtual {p1}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->$this_apply:Landroid/widget/TextView;
 
-    move-result-object p1
+    invoke-virtual {v0}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->$user$inlined:Lcom/discord/models/domain/ModelUser;
+    move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+    const-string v1, "context"
 
-    move-result-wide v0
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    invoke-virtual {v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v2
-
-    invoke-static {p1, v0, v1, v2}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;JLjava/lang/Long;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/WidgetSettings$Companion;->launch(Landroid/content/Context;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali
index a02d4df3bb..8312b66234 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -20,9 +20,9 @@
 # instance fields
 .field final synthetic $isMe$inlined:Z
 
-.field final synthetic $model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+.field final synthetic $model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
-.field final synthetic $this_apply:Landroid/view/View;
+.field final synthetic $this_apply:Landroid/widget/TextView;
 
 .field final synthetic $user$inlined:Lcom/discord/models/domain/ModelUser;
 
@@ -30,18 +30,18 @@
 
 
 # direct methods
-.method constructor <init>(Landroid/view/View;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/widgets/user/usersheet/WidgetUserSheetModel;Lcom/discord/models/domain/ModelUser;)V
+.method constructor <init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$this_apply:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$this_apply:Landroid/widget/TextView;
 
     iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
     iput-boolean p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$isMe$inlined:Z
 
-    iput-object p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iput-object p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$user$inlined:Lcom/discord/models/domain/ModelUser;
 
-    iput-object p5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$user$inlined:Lcom/discord/models/domain/ModelUser;
+    iput-object p5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,29 +53,29 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$this_apply:Landroid/widget/TextView;
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
+    invoke-virtual {p1}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$this_apply:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$user$inlined:Lcom/discord/models/domain/ModelUser;
 
-    invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-object v0
+    move-result-wide v0
 
-    const-string v1, "context"
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$user$inlined:Lcom/discord/models/domain/ModelUser;
+    move-result-object v2
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    move-result-wide v1
+    move-result-object v2
 
-    invoke-virtual {p1, v0, v1, v2}, Lcom/discord/stores/StoreChannelsSelected;->findAndSetDirectMessage(Landroid/content/Context;J)V
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;JLjava/lang/Long;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3.smali
deleted file mode 100644
index c5e095e6c8..0000000000
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3.smali
+++ /dev/null
@@ -1,63 +0,0 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3;
-.super Ljava/lang/Object;
-.source "WidgetUserSheet.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
-
-.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelUser;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3;->$user:Lcom/discord/models/domain/ModelUser;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 2
-
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getContext()Landroid/content/Context;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3;->$user:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v0
-
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfile;->launch(Landroid/content/Context;J)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1.smali
index b1a9de91b9..2ac47a3aee 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureVoiceSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureVoiceSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic $this_configureVoiceSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+.field final synthetic $viewState:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1;->$this_configureVoiceSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1;->$viewState:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onCheckedChanged(Landroid/widget/CompoundButton;Z)V
     .locals 2
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1;->$this_configureVoiceSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1;->$viewState:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isUserMuted()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isUserMuted()Z
 
     move-result p1
 
@@ -51,9 +51,9 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1;->$this_configureVoiceSection:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    iget-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1;->$viewState:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
-    invoke-virtual {p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
new file mode 100644
index 0000000000..d7cad099fe
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
@@ -0,0 +1,81 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Long;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Ljava/lang/Number;
+
+    invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
+
+    move-result-wide v0
+
+    invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1;->invoke(J)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(J)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    invoke-static {v0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
index 6ccee5f199..c897222b47 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
@@ -28,9 +28,13 @@
 # instance fields
 .field private final actionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field private final actionsHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 .field private final activityDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+.field private activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+.field private final addFriendActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final administrativeDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -40,10 +44,10 @@
 
 .field private final audioSettingsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
-
 .field private final banButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field private final callActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 .field private final copyIdButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final developerDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -52,12 +56,24 @@
 
 .field private final editMemberButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final header$delegate:Lkotlin/properties/ReadOnlyProperty;
+.field private final friendRequestAcceptButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final imagesChangeDetector:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
+.field private final friendRequestIgnoreButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final guildContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final guildHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final incomingFriendRequestContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final incomingFriendRequestDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final incomingFriendRequestHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final kickButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field private final messageActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 .field private onMoveChannelSelected:Lkotlin/jvm/functions/Function3;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -74,9 +90,13 @@
     .end annotation
 .end field
 
-.field private final presenceIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
+.field private final pendingFriendRequestActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final primaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
+.field private privateCallLauncher:Lcom/discord/widgets/user/calls/PrivateCallLauncher;
+
+.field private final profileActionsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final profileActionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final richPresenceContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -84,10 +104,6 @@
 
 .field private final rolesRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final secondaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final sendMessageButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
 .field private final serverDeafenButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final serverMoveUserButton$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -96,8 +112,14 @@
 
 .field private final userMutedCheck$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field private final userProfileHeaderView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 .field private final userVolumeSeekbar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field private final videoActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
 .field private final viewProfileButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 
@@ -107,7 +129,7 @@
 
     const-class v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const/16 v1, 0x1a
+    const/16 v1, 0x24
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
@@ -117,9 +139,9 @@
 
     move-result-object v3
 
-    const-string v4, "header"
+    const-string v4, "userProfileHeaderView"
 
-    const-string v5, "getHeader()Landroid/view/View;"
+    const-string v5, "getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;"
 
     invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -139,9 +161,9 @@
 
     move-result-object v3
 
-    const-string v4, "primaryName"
+    const-string v4, "profileActionsDivider"
 
-    const-string v5, "getPrimaryName()Landroid/widget/TextView;"
+    const-string v5, "getProfileActionsDivider()Landroid/view/View;"
 
     invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -161,9 +183,9 @@
 
     move-result-object v3
 
-    const-string v4, "secondaryName"
+    const-string v4, "profileActionsContainer"
 
-    const-string v5, "getSecondaryName()Landroid/widget/TextView;"
+    const-string v5, "getProfileActionsContainer()Landroid/view/ViewGroup;"
 
     invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -183,9 +205,9 @@
 
     move-result-object v3
 
-    const-string v4, "presenceIndicator"
+    const-string v4, "messageActionButton"
 
-    const-string v5, "getPresenceIndicator()Landroid/widget/ImageView;"
+    const-string v5, "getMessageActionButton()Landroid/widget/Button;"
 
     invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -205,9 +227,9 @@
 
     move-result-object v3
 
-    const-string v4, "avatar"
+    const-string v4, "callActionButton"
 
-    const-string v5, "getAvatar()Landroid/widget/ImageView;"
+    const-string v5, "getCallActionButton()Landroid/widget/Button;"
 
     invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -227,6 +249,182 @@
 
     move-result-object v3
 
+    const-string v4, "videoActionButton"
+
+    const-string v5, "getVideoActionButton()Landroid/widget/Button;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x5
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "addFriendActionButton"
+
+    const-string v5, "getAddFriendActionButton()Landroid/widget/Button;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x6
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "pendingFriendRequestActionButton"
+
+    const-string v5, "getPendingFriendRequestActionButton()Landroid/widget/Button;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x7
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "incomingFriendRequestDivider"
+
+    const-string v5, "getIncomingFriendRequestDivider()Landroid/view/View;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v3, 0x8
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "incomingFriendRequestHeader"
+
+    const-string v5, "getIncomingFriendRequestHeader()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v3, 0x9
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "incomingFriendRequestContainer"
+
+    const-string v5, "getIncomingFriendRequestContainer()Landroid/view/ViewGroup;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v3, 0xa
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "friendRequestIgnoreButton"
+
+    const-string v5, "getFriendRequestIgnoreButton()Landroid/widget/Button;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v3, 0xb
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "friendRequestAcceptButton"
+
+    const-string v5, "getFriendRequestAcceptButton()Landroid/widget/Button;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v3, 0xc
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
     const-string v4, "richPresenceContainer"
 
     const-string v5, "getRichPresenceContainer()Landroid/widget/FrameLayout;"
@@ -239,7 +437,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x5
+    const/16 v3, 0xd
 
     aput-object v2, v1, v3
 
@@ -261,7 +459,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x6
+    const/16 v3, 0xe
 
     aput-object v2, v1, v3
 
@@ -283,7 +481,51 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x7
+    const/16 v3, 0xf
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "guildContainer"
+
+    const-string v5, "getGuildContainer()Landroid/view/ViewGroup;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v3, 0x10
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "guildHeader"
+
+    const-string v5, "getGuildHeader()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v3, 0x11
 
     aput-object v2, v1, v3
 
@@ -305,7 +547,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x8
+    const/16 v3, 0x12
 
     aput-object v2, v1, v3
 
@@ -327,7 +569,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x9
+    const/16 v3, 0x13
 
     aput-object v2, v1, v3
 
@@ -349,7 +591,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0xa
+    const/16 v3, 0x14
 
     aput-object v2, v1, v3
 
@@ -371,7 +613,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0xb
+    const/16 v3, 0x15
 
     aput-object v2, v1, v3
 
@@ -393,7 +635,29 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0xc
+    const/16 v3, 0x16
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/v;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "actionsHeader"
+
+    const-string v5, "getActionsHeader()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v3, 0x17
 
     aput-object v2, v1, v3
 
@@ -415,29 +679,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0xd
-
-    aput-object v2, v1, v3
-
-    new-instance v2, Lkotlin/jvm/internal/v;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v3
-
-    const-string v4, "sendMessageButton"
-
-    const-string v5, "getSendMessageButton()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
-
-    move-result-object v2
-
-    check-cast v2, Lkotlin/reflect/KProperty;
-
-    const/16 v3, 0xe
+    const/16 v3, 0x18
 
     aput-object v2, v1, v3
 
@@ -459,7 +701,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0xf
+    const/16 v3, 0x19
 
     aput-object v2, v1, v3
 
@@ -481,7 +723,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x10
+    const/16 v3, 0x1a
 
     aput-object v2, v1, v3
 
@@ -503,7 +745,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x11
+    const/16 v3, 0x1b
 
     aput-object v2, v1, v3
 
@@ -525,7 +767,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x12
+    const/16 v3, 0x1c
 
     aput-object v2, v1, v3
 
@@ -547,7 +789,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x13
+    const/16 v3, 0x1d
 
     aput-object v2, v1, v3
 
@@ -569,7 +811,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x14
+    const/16 v3, 0x1e
 
     aput-object v2, v1, v3
 
@@ -591,7 +833,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x15
+    const/16 v3, 0x1f
 
     aput-object v2, v1, v3
 
@@ -613,7 +855,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x16
+    const/16 v3, 0x20
 
     aput-object v2, v1, v3
 
@@ -635,7 +877,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x17
+    const/16 v3, 0x21
 
     aput-object v2, v1, v3
 
@@ -657,7 +899,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x18
+    const/16 v3, 0x22
 
     aput-object v2, v1, v3
 
@@ -679,7 +921,7 @@
 
     check-cast v0, Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x19
+    const/16 v2, 0x23
 
     aput-object v0, v1, v2
 
@@ -701,47 +943,111 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a07b9
+    const v0, 0x7f0a07fc
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileHeaderView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07be
+    const v0, 0x7f0a07fb
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->primaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->profileActionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c1
+    const v0, 0x7f0a07fa
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->secondaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->profileActionsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0779
+    const v0, 0x7f0a07f6
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->presenceIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->messageActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0777
+    const v0, 0x7f0a07e8
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->callActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a055b
+    const v0, 0x7f0a0802
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->videoActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07e1
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->addFriendActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07f8
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->pendingFriendRequestActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07f3
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07f4
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07ee
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07ed
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->friendRequestIgnoreButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07ec
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->friendRequestAcceptButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0575
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -749,7 +1055,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->richPresenceContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07af
+    const v0, 0x7f0a07e0
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -757,7 +1063,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c0
+    const v0, 0x7f0a07fd
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -765,7 +1071,23 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->rolesRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07b3
+    const v0, 0x7f0a07ef
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->guildContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07f1
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->guildHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07e5
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -773,7 +1095,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->audioSettingsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07b2
+    const v0, 0x7f0a07e4
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -781,7 +1103,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->audioSettingsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07bc
+    const v0, 0x7f0a07f7
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -789,7 +1111,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userMutedCheck$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c6
+    const v0, 0x7f0a0803
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -797,7 +1119,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userVolumeSeekbar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ae
+    const v0, 0x7f0a07de
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -805,7 +1127,15 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->actionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07bf
+    const v0, 0x7f0a07df
+
+    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->actionsHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07f9
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -813,15 +1143,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewProfileButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07bb
-
-    invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->sendMessageButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a07b1
+    const v0, 0x7f0a07e3
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -829,7 +1151,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->administrativeHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07b0
+    const v0, 0x7f0a07e2
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -837,7 +1159,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->administrativeDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c3
+    const v0, 0x7f0a07ff
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -845,7 +1167,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->editMemberButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ba
+    const v0, 0x7f0a07f5
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -853,7 +1175,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->kickButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07b5
+    const v0, 0x7f0a07e7
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -861,7 +1183,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->banButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c5
+    const v0, 0x7f0a0801
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -869,7 +1191,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->serverMuteButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c2
+    const v0, 0x7f0a07fe
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -877,7 +1199,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->serverDeafenButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c4
+    const v0, 0x7f0a0800
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -885,7 +1207,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->serverMoveUserButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07b8
+    const v0, 0x7f0a07eb
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -893,7 +1215,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->developerHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07b7
+    const v0, 0x7f0a07ea
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -901,7 +1223,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->developerDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07b6
+    const v0, 0x7f0a07e9
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -909,452 +1231,513 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->copyIdButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    new-instance v0, Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
+    return-void
+.end method
 
-    invoke-direct {v0}, Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;-><init>()V
+.method private final acceptFriendRequest()V
+    .locals 3
 
-    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->imagesChangeDetector:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "viewModel"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    const/4 v1, 0x0
+
+    const v2, 0x7f12002e
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->addRelationship(Ljava/lang/Integer;I)V
 
     return-void
 .end method
 
-.method public static final synthetic access$configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method public static final synthetic access$acceptFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->acceptFriendRequest()V
 
     return-void
 .end method
 
-.method private final configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
-    .locals 13
+.method public static final synthetic access$addFriend(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    .locals 0
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getEditMemberButton()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->addFriend()V
 
-    move-result-object v0
+    return-void
+.end method
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getManageUserContext()Lcom/discord/utilities/permissions/ManageUserContext;
+.method public static final synthetic access$configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+    .locals 1
+
+    iget-object p0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    if-nez p0, :cond_0
+
+    const-string v0, "viewModel"
+
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static final synthetic access$handleEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->handleEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$ignoreFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->ignoreFriendRequest()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    return-void
+.end method
+
+.method private final addFriend()V
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "viewModel"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    const/4 v1, 0x0
+
+    const v2, 0x7f120697
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->addRelationship(Ljava/lang/Integer;I)V
+
+    return-void
+.end method
+
+.method private final configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+    .locals 20
+
+    move-object/from16 v0, p0
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getManageUserContext()Lcom/discord/utilities/permissions/ManageUserContext;
 
     move-result-object v1
 
-    const/4 v2, 0x1
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    const/4 v3, 0x0
+    move-result-object v2
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v3
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isServerMuted()Z
+
+    move-result v4
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
+
+    move-result-object v5
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isServerDeafened()Z
+
+    move-result v6
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getEditMemberButton()Landroid/view/View;
+
+    move-result-object v7
+
+    const/4 v8, 0x1
+
+    const/4 v9, 0x0
 
     if-eqz v1, :cond_1
 
     invoke-virtual {v1}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanChangeNickname()Z
 
-    move-result v4
+    move-result v10
 
-    if-nez v4, :cond_0
+    if-nez v10, :cond_0
 
     invoke-virtual {v1}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanManageRoles()Z
 
-    move-result v1
+    move-result v10
 
-    if-eqz v1, :cond_1
+    if-eqz v10, :cond_1
 
     :cond_0
-    const/4 v1, 0x1
+    const/4 v10, 0x1
 
     goto :goto_0
 
     :cond_1
-    const/4 v1, 0x0
+    const/4 v10, 0x0
 
     :goto_0
-    const/4 v4, 0x0
+    const/4 v11, 0x0
 
-    const/4 v5, 0x2
+    const/4 v12, 0x2
 
-    invoke-static {v0, v1, v3, v5, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v7, v10, v9, v12, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getEditMemberButton()Landroid/view/View;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getEditMemberButton()Landroid/view/View;
 
-    move-result-object v0
+    move-result-object v7
 
-    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2;
+    new-instance v10, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2;
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    invoke-direct {v10, v0, v2, v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;)V
 
-    check-cast v1, Landroid/view/View$OnClickListener;
+    check-cast v10, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v7, v10}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v0
+    move-result-object v7
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
 
-    move-result v0
+    move-result v7
 
-    if-eqz v0, :cond_3
+    if-eqz v7, :cond_3
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v7
 
-    check-cast v0, Landroid/view/View;
+    check-cast v7, Landroid/view/View;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->isManaged()Z
 
-    move-result-object v1
+    move-result v10
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->isManaged()Z
+    if-nez v10, :cond_2
 
-    move-result v1
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isChannelOwner()Z
 
-    if-nez v1, :cond_2
+    move-result v10
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isChannelOwner()Z
+    if-eqz v10, :cond_2
 
-    move-result v1
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe()Z
 
-    if-eqz v1, :cond_2
+    move-result v10
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe()Z
+    if-nez v10, :cond_2
 
-    move-result v1
-
-    if-nez v1, :cond_2
-
-    const/4 v1, 0x1
+    const/4 v10, 0x1
 
     goto :goto_1
 
     :cond_2
-    const/4 v1, 0x0
+    const/4 v10, 0x0
 
     :goto_1
-    invoke-static {v0, v1, v3, v5, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v7, v10, v9, v12, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v7
 
-    const v1, 0x7f120ec8
+    const v10, 0x7f120eff
 
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
+    invoke-virtual {v7, v10}, Landroid/widget/TextView;->setText(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v7
 
-    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;
+    new-instance v10, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    invoke-direct {v10, v0, v2, v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;)V
 
-    check-cast v1, Landroid/view/View$OnClickListener;
+    check-cast v10, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v7, v10}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     goto :goto_3
 
     :cond_3
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v7
 
-    check-cast v0, Landroid/view/View;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getManageUserContext()Lcom/discord/utilities/permissions/ManageUserContext;
-
-    move-result-object v1
+    check-cast v7, Landroid/view/View;
 
     if-eqz v1, :cond_4
 
     invoke-virtual {v1}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanKick()Z
 
-    move-result v1
+    move-result v10
 
-    if-ne v1, v2, :cond_4
+    if-ne v10, v8, :cond_4
 
-    const/4 v1, 0x1
+    const/4 v10, 0x1
 
     goto :goto_2
 
     :cond_4
-    const/4 v1, 0x0
+    const/4 v10, 0x0
 
     :goto_2
-    invoke-static {v0, v1, v3, v5, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v7, v10, v9, v12, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v7
 
-    const v1, 0x7f120a9f
+    const v10, 0x7f120ac0
 
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
+    invoke-virtual {v7, v10}, Landroid/widget/TextView;->setText(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v7
 
-    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;
+    new-instance v10, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    invoke-direct {v10, v0, v3, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$4;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
 
-    check-cast v1, Landroid/view/View$OnClickListener;
+    check-cast v10, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v7, v10}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :goto_3
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getBanButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getBanButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v7
 
-    check-cast v0, Landroid/view/View;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getManageUserContext()Lcom/discord/utilities/permissions/ManageUserContext;
-
-    move-result-object v1
+    check-cast v7, Landroid/view/View;
 
     if-eqz v1, :cond_5
 
     invoke-virtual {v1}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanBan()Z
 
-    move-result v1
+    move-result v10
 
-    if-ne v1, v2, :cond_5
+    if-ne v10, v8, :cond_5
 
-    const/4 v1, 0x1
+    const/4 v10, 0x1
 
     goto :goto_4
 
     :cond_5
-    const/4 v1, 0x0
+    const/4 v10, 0x0
 
     :goto_4
-    invoke-static {v0, v1, v3, v5, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v7, v10, v9, v12, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getBanButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getBanButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v7
 
-    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;
+    new-instance v10, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    invoke-direct {v10, v0, v3, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$5;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
 
-    check-cast v1, Landroid/view/View$OnClickListener;
+    check-cast v10, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v7, v10}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMuteButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMuteButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v7
 
-    check-cast v0, Landroid/view/View;
+    check-cast v7, Landroid/view/View;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_6
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getManageUserContext()Lcom/discord/utilities/permissions/ManageUserContext;
-
-    move-result-object v1
+    if-eqz v5, :cond_6
 
     if-eqz v1, :cond_6
 
     invoke-virtual {v1}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanMute()Z
 
-    move-result v1
+    move-result v10
 
-    if-ne v1, v2, :cond_6
+    if-ne v10, v8, :cond_6
 
-    const/4 v1, 0x1
+    const/4 v10, 0x1
 
     goto :goto_5
 
     :cond_6
-    const/4 v1, 0x0
+    const/4 v10, 0x0
 
     :goto_5
-    invoke-static {v0, v1, v3, v5, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v7, v10, v9, v12, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMuteButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMuteButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v7
 
-    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;
+    new-instance v10, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    invoke-direct {v10, v0, v2, v3, v4}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$6;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;Z)V
 
-    check-cast v1, Landroid/view/View$OnClickListener;
+    check-cast v10, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v7, v10}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMuteButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMuteButton()Landroid/widget/TextView;
 
-    move-result-object v6
+    move-result-object v13
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isServerMuted()Z
+    if-eqz v4, :cond_7
 
-    move-result v0
+    const v7, 0x7f0802f7
 
-    if-eqz v0, :cond_7
-
-    const v0, 0x7f0802e7
-
-    const v7, 0x7f0802e7
+    const v14, 0x7f0802f7
 
     goto :goto_6
 
     :cond_7
-    const v0, 0x7f0802ea
+    const v7, 0x7f0802fa
 
-    const v7, 0x7f0802ea
+    const v14, 0x7f0802fa
 
     :goto_6
-    const/4 v8, 0x0
+    const/4 v15, 0x0
 
-    const/4 v9, 0x0
+    const/16 v16, 0x0
 
-    const/4 v10, 0x0
+    const/16 v17, 0x0
 
-    const/16 v11, 0xe
+    const/16 v18, 0xe
 
-    const/4 v12, 0x0
+    const/16 v19, 0x0
 
-    invoke-static/range {v6 .. v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+    invoke-static/range {v13 .. v19}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMuteButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMuteButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v7
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isServerMuted()Z
+    if-eqz v4, :cond_8
 
-    move-result v1
-
-    if-eqz v1, :cond_8
-
-    const v1, 0x7f120fe9
+    const v4, 0x7f121025
 
     goto :goto_7
 
     :cond_8
-    const v1, 0x7f120fdc
+    const v4, 0x7f121017
 
     :goto_7
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
+    invoke-virtual {v7, v4}, Landroid/widget/TextView;->setText(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerDeafenButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerDeafenButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v4
 
-    check-cast v0, Landroid/view/View;
+    check-cast v4, Landroid/view/View;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_9
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getManageUserContext()Lcom/discord/utilities/permissions/ManageUserContext;
-
-    move-result-object v1
+    if-eqz v5, :cond_9
 
     if-eqz v1, :cond_9
 
     invoke-virtual {v1}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanDeafen()Z
 
-    move-result v1
+    move-result v7
 
-    if-ne v1, v2, :cond_9
+    if-ne v7, v8, :cond_9
 
-    const/4 v1, 0x1
+    const/4 v7, 0x1
 
     goto :goto_8
 
     :cond_9
-    const/4 v1, 0x0
+    const/4 v7, 0x0
 
     :goto_8
-    invoke-static {v0, v1, v3, v5, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v4, v7, v9, v12, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerDeafenButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerDeafenButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v4
 
-    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;
+    new-instance v7, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    invoke-direct {v7, v0, v2, v3, v6}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$7;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;Z)V
 
-    check-cast v1, Landroid/view/View$OnClickListener;
+    check-cast v7, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v4, v7}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerDeafenButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerDeafenButton()Landroid/widget/TextView;
 
-    move-result-object v6
+    move-result-object v13
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isServerDeafened()Z
+    if-eqz v6, :cond_a
 
-    move-result v0
+    const v4, 0x7f0802b4
 
-    if-eqz v0, :cond_a
-
-    const v0, 0x7f0802a4
-
-    const v7, 0x7f0802a4
+    const v14, 0x7f0802b4
 
     goto :goto_9
 
     :cond_a
-    const v0, 0x7f0802aa
+    const v4, 0x7f0802ba
 
-    const v7, 0x7f0802aa
+    const v14, 0x7f0802ba
 
     :goto_9
-    const/4 v8, 0x0
+    const/4 v15, 0x0
 
-    const/4 v9, 0x0
+    const/16 v16, 0x0
 
-    const/4 v10, 0x0
+    const/16 v17, 0x0
 
-    const/16 v11, 0xe
+    const/16 v18, 0xe
 
-    const/4 v12, 0x0
+    const/16 v19, 0x0
 
-    invoke-static/range {v6 .. v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+    invoke-static/range {v13 .. v19}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerDeafenButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerDeafenButton()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v4
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isServerDeafened()Z
+    if-eqz v6, :cond_b
 
-    move-result v1
-
-    if-eqz v1, :cond_b
-
-    const v1, 0x7f120fe8
+    const v6, 0x7f121024
 
     goto :goto_a
 
     :cond_b
-    const v1, 0x7f120fd2
+    const v6, 0x7f12100c
 
     :goto_a
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
+    invoke-virtual {v4, v6}, Landroid/widget/TextView;->setText(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMoveUserButton()Landroid/view/View;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMoveUserButton()Landroid/view/View;
 
-    move-result-object v0
+    move-result-object v4
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_c
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getManageUserContext()Lcom/discord/utilities/permissions/ManageUserContext;
-
-    move-result-object v1
+    if-eqz v5, :cond_c
 
     if-eqz v1, :cond_c
 
@@ -1362,7 +1745,7 @@
 
     move-result v1
 
-    if-ne v1, v2, :cond_c
+    if-ne v1, v8, :cond_c
 
     const/4 v1, 0x1
 
@@ -1372,124 +1755,124 @@
     const/4 v1, 0x0
 
     :goto_b
-    invoke-static {v0, v1, v3, v5, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v4, v1, v9, v12, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMoveUserButton()Landroid/view/View;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8;
-
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
-
-    check-cast v1, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;
-
-    invoke-direct {v0, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
-
-    check-cast v0, Lkotlin/jvm/functions/Function3;
-
-    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->onMoveChannelSelected:Lkotlin/jvm/functions/Function3;
-
-    const/4 p1, 0x5
-
-    new-array v0, p1, [Landroid/view/View;
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMoveUserButton()Landroid/view/View;
 
     move-result-object v1
 
-    check-cast v1, Landroid/view/View;
+    new-instance v4, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8;
 
-    aput-object v1, v0, v3
+    invoke-direct {v4, v0, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$8;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getBanButton()Landroid/widget/TextView;
+    check-cast v4, Landroid/view/View$OnClickListener;
 
-    move-result-object v1
+    invoke-virtual {v1, v4}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    check-cast v1, Landroid/view/View;
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;
 
-    aput-object v1, v0, v2
+    invoke-direct {v1, v0, v2, v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMuteButton()Landroid/widget/TextView;
+    check-cast v1, Lkotlin/jvm/functions/Function3;
 
-    move-result-object v1
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->onMoveChannelSelected:Lkotlin/jvm/functions/Function3;
 
-    check-cast v1, Landroid/view/View;
+    const/4 v1, 0x5
 
-    aput-object v1, v0, v5
+    new-array v2, v1, [Landroid/view/View;
 
-    const/4 v1, 0x3
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getKickButton()Landroid/widget/TextView;
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerDeafenButton()Landroid/widget/TextView;
+    move-result-object v3
 
-    move-result-object v6
+    check-cast v3, Landroid/view/View;
 
-    check-cast v6, Landroid/view/View;
+    aput-object v3, v2, v9
 
-    aput-object v6, v0, v1
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getBanButton()Landroid/widget/TextView;
 
-    const/4 v1, 0x4
+    move-result-object v3
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMoveUserButton()Landroid/view/View;
+    check-cast v3, Landroid/view/View;
 
-    move-result-object v6
+    aput-object v3, v2, v8
 
-    aput-object v6, v0, v1
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMuteButton()Landroid/widget/TextView;
 
-    const/4 v1, 0x0
+    move-result-object v3
+
+    check-cast v3, Landroid/view/View;
+
+    aput-object v3, v2, v12
+
+    const/4 v3, 0x3
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerDeafenButton()Landroid/widget/TextView;
+
+    move-result-object v4
+
+    check-cast v4, Landroid/view/View;
+
+    aput-object v4, v2, v3
+
+    const/4 v3, 0x4
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getServerMoveUserButton()Landroid/view/View;
+
+    move-result-object v4
+
+    aput-object v4, v2, v3
+
+    const/4 v3, 0x0
 
     :goto_c
-    if-ge v1, p1, :cond_f
+    if-ge v3, v1, :cond_f
 
-    aget-object v6, v0, v1
+    aget-object v4, v2, v3
 
-    invoke-virtual {v6}, Landroid/view/View;->getVisibility()I
+    invoke-virtual {v4}, Landroid/view/View;->getVisibility()I
 
-    move-result v6
+    move-result v4
 
-    if-nez v6, :cond_d
+    if-nez v4, :cond_d
 
-    const/4 v6, 0x1
+    const/4 v4, 0x1
 
     goto :goto_d
 
     :cond_d
-    const/4 v6, 0x0
+    const/4 v4, 0x0
 
     :goto_d
-    if-eqz v6, :cond_e
+    if-eqz v4, :cond_e
 
     goto :goto_e
 
     :cond_e
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v3, v3, 0x1
 
     goto :goto_c
 
     :cond_f
-    const/4 v2, 0x0
+    const/4 v8, 0x0
 
     :goto_e
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAdministrativeHeader()Landroid/view/View;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAdministrativeHeader()Landroid/view/View;
 
-    move-result-object p1
+    move-result-object v1
 
-    invoke-static {p1, v2, v3, v5, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v1, v8, v9, v12, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAdministrativeDivider()Landroid/view/View;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAdministrativeDivider()Landroid/view/View;
 
-    move-result-object p1
+    move-result-object v1
 
-    invoke-static {p1, v2, v3, v5, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v1, v8, v9, v12, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
     return-void
 .end method
 
-.method private final configureDeveloperSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method private final configureDeveloperSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
     .locals 5
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getCopyIdButton()Landroid/view/View;
@@ -1516,7 +1899,7 @@
 
     new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1;
 
-    invoke-direct {v1, v0, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1;-><init>(Landroid/view/View;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    invoke-direct {v1, v0, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1;-><init>(Landroid/view/View;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 
     check-cast v1, Landroid/view/View$OnClickListener;
 
@@ -1555,492 +1938,646 @@
     return-void
 .end method
 
-.method private final configureRoles(Ljava/util/List;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Lcom/discord/models/domain/ModelGuildRole;",
-            ">;)V"
-        }
-    .end annotation
+.method private final configureIncomingFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+    .locals 4
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getRolesRecycler()Landroidx/recyclerview/widget/RecyclerView;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getUserRelationshipType()I
 
-    move-result-object v0
+    move-result p1
 
-    check-cast v0, Landroid/view/View;
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-object v1, p1
+    move-result-object p1
 
-    check-cast v1, Ljava/util/Collection;
+    invoke-static {p1}, Lcom/discord/models/domain/ModelUserRelationship;->getType(Ljava/lang/Integer;)I
 
-    invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
+    move-result p1
 
-    move-result v1
+    const/4 v0, 0x0
 
-    xor-int/lit8 v1, v1, 0x1
+    const/4 v1, 0x3
+
+    if-ne p1, v1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getIncomingFriendRequestDivider()Landroid/view/View;
+
+    move-result-object v1
 
     const/4 v2, 0x0
 
     const/4 v3, 0x2
 
-    const/4 v4, 0x0
+    invoke-static {v1, p1, v0, v3, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-static {v0, v1, v2, v3, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getIncomingFriendRequestHeader()Landroid/widget/TextView;
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->rolesAdapter:Lcom/discord/widgets/roles/RolesAdapter;
+    move-result-object v1
 
-    if-eqz v0, :cond_0
+    check-cast v1, Landroid/view/View;
 
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/roles/RolesAdapter;->setData(Ljava/util/List;)V
+    invoke-static {v1, p1, v0, v3, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getIncomingFriendRequestContainer()Landroid/view/ViewGroup;
+
+    move-result-object v1
+
+    check-cast v1, Landroid/view/View;
+
+    invoke-static {v1, p1, v0, v3, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getFriendRequestAcceptButton()Landroid/widget/Button;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    check-cast v0, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getFriendRequestIgnoreButton()Landroid/widget/Button;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    check-cast v0, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    :cond_0
     return-void
 .end method
 
-.method private final configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
-    .locals 21
+.method private final configureProfileActionButtons(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+    .locals 9
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe()Z
+
+    move-result v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isBot()Z
+
+    move-result v1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getUserRelationshipType()I
+
+    move-result v2
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe()Z
+
+    move-result v3
+
+    const/4 v4, 0x1
+
+    xor-int/2addr v3, v4
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getProfileActionsDivider()Landroid/view/View;
+
+    move-result-object v5
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x2
+
+    const/4 v8, 0x0
+
+    invoke-static {v5, v3, v8, v7, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getProfileActionsContainer()Landroid/view/ViewGroup;
+
+    move-result-object v5
+
+    check-cast v5, Landroid/view/View;
+
+    invoke-static {v5, v3, v8, v7, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    if-nez v3, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getMessageActionButton()Landroid/widget/Button;
+
+    move-result-object v3
+
+    check-cast v3, Landroid/view/View;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getType()I
+
+    move-result v5
+
+    if-eq v5, v4, :cond_1
+
+    const/4 v5, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v5, 0x0
+
+    :goto_0
+    invoke-static {v3, v5, v8, v7, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getMessageActionButton()Landroid/widget/Button;
+
+    move-result-object v3
+
+    new-instance v5, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1;
+
+    invoke-direct {v5, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+
+    check-cast v5, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v3, v5}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getCallActionButton()Landroid/widget/Button;
+
+    move-result-object v3
+
+    new-instance v5, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2;
+
+    invoke-direct {v5, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    check-cast v5, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v3, v5}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getVideoActionButton()Landroid/widget/Button;
+
+    move-result-object v3
+
+    new-instance v5, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3;
+
+    invoke-direct {v5, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    check-cast v5, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v3, v5}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    const/16 v3, 0x8
+
+    if-eqz v2, :cond_3
+
+    const/4 v5, 0x3
+
+    if-eq v2, v5, :cond_2
+
+    const/4 v5, 0x4
+
+    if-eq v2, v5, :cond_2
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAddFriendActionButton()Landroid/widget/Button;
+
+    move-result-object v5
+
+    invoke-virtual {v5, v3}, Landroid/widget/Button;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getPendingFriendRequestActionButton()Landroid/widget/Button;
+
+    move-result-object v5
+
+    invoke-virtual {v5, v3}, Landroid/widget/Button;->setVisibility(I)V
+
+    goto :goto_1
+
+    :cond_2
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAddFriendActionButton()Landroid/widget/Button;
+
+    move-result-object v5
+
+    invoke-virtual {v5, v3}, Landroid/widget/Button;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getPendingFriendRequestActionButton()Landroid/widget/Button;
+
+    move-result-object v3
+
+    invoke-virtual {v3, v8}, Landroid/widget/Button;->setVisibility(I)V
+
+    goto :goto_1
+
+    :cond_3
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAddFriendActionButton()Landroid/widget/Button;
+
+    move-result-object v5
+
+    invoke-virtual {v5, v8}, Landroid/widget/Button;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getPendingFriendRequestActionButton()Landroid/widget/Button;
+
+    move-result-object v5
+
+    invoke-virtual {v5, v3}, Landroid/widget/Button;->setVisibility(I)V
+
+    :goto_1
+    if-nez v0, :cond_4
+
+    if-nez v1, :cond_4
+
+    if-nez v2, :cond_4
+
+    goto :goto_2
+
+    :cond_4
+    const/4 v4, 0x0
+
+    :goto_2
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAddFriendActionButton()Landroid/widget/Button;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    invoke-static {v0, v4, v8, v7, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAddFriendActionButton()Landroid/widget/Button;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getPendingFriendRequestActionButton()Landroid/widget/Button;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;
+
+    invoke-direct {v1, p0, v2, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ILcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
+
+.method private final configureRoles(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+    .locals 6
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getRoleItems()Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getGuildContainer()Landroid/view/ViewGroup;
+
+    move-result-object v1
+
+    check-cast v1, Landroid/view/View;
+
+    move-object v2, v0
+
+    check-cast v2, Ljava/util/Collection;
+
+    invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v2
+
+    xor-int/lit8 v2, v2, 0x1
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x2
+
+    const/4 v5, 0x0
+
+    invoke-static {v1, v2, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->rolesAdapter:Lcom/discord/widgets/roles/RolesAdapter;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1, v0}, Lcom/discord/widgets/roles/RolesAdapter;->setData(Ljava/util/List;)V
+
+    :cond_0
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getGuildName()Ljava/lang/String;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getGuildHeader()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    :cond_1
+    return-void
+.end method
+
+.method private final configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+    .locals 17
 
     move-object/from16 v6, p0
 
-    if-nez p1, :cond_0
+    move-object/from16 v7, p1
+
+    if-nez v7, :cond_0
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
 
     return-void
 
     :cond_0
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getPresence()Lcom/discord/models/domain/ModelPresence;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getPresence()Lcom/discord/models/domain/ModelPresence;
 
     move-result-object v0
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
-
-    move-result-object v1
-
-    const/4 v7, 0x1
-
     const/4 v8, 0x0
 
-    if-eqz v1, :cond_1
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_0
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getPresenceIndicator()Landroid/widget/ImageView;
-
-    move-result-object v2
-
-    const/4 v3, 0x0
-
-    const/16 v4, 0x8
-
-    const/4 v5, 0x0
-
-    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/presence/PresenceUtils;->setPresence$default(Lcom/discord/models/domain/ModelPresence;ZLandroid/widget/ImageView;Landroid/widget/TextView;ILjava/lang/Object;)V
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getPresence()Lcom/discord/models/domain/ModelPresence;
-
-    move-result-object v0
-
-    const/4 v9, 0x0
-
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
 
     move-result-object v0
 
-    move-object v10, v0
+    move-object v9, v0
+
+    goto :goto_0
+
+    :cond_1
+    move-object v9, v8
+
+    :goto_0
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v4
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe()Z
+
+    move-result v3
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getActivityDivider()Landroid/view/View;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-eqz v9, :cond_2
+
+    const/4 v2, 0x1
 
     goto :goto_1
 
     :cond_2
-    move-object v10, v9
-
-    :goto_1
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v11
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUserNickname()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe()Z
-
-    move-result v12
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getActivityDivider()Landroid/view/View;
-
-    move-result-object v1
-
-    if-nez v10, :cond_3
-
-    if-nez v12, :cond_3
-
-    const/4 v2, 0x1
-
-    goto :goto_2
-
-    :cond_3
     const/4 v2, 0x0
 
-    :goto_2
-    const/4 v13, 0x2
+    :goto_1
+    const/4 v5, 0x2
 
-    invoke-static {v1, v2, v8, v13, v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    if-nez v12, :cond_4
+    invoke-static {v0, v2, v1, v5, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getActionsDivider()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v6, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->setPeekHeightBottomView(Landroid/view/View;)V
+    xor-int/lit8 v2, v3, 0x1
 
-    :cond_4
-    sget-object v1, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->Companion:Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;
+    invoke-static {v0, v2, v1, v5, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getRichPresenceContainer()Landroid/widget/FrameLayout;
-
-    move-result-object v2
-
-    check-cast v2, Landroid/view/ViewGroup;
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
-
-    move-result-object v3
-
-    iget-object v4, v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    invoke-virtual {v1, v2, v10, v3, v4}, Lcom/discord/widgets/user/ViewHolderUserRichPresence$Companion;->setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getRichPresence()Lcom/discord/widgets/user/ModelRichPresence;
-
-    move-result-object v2
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
-
-    move-result-object v3
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe()Z
-
-    move-result v4
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v5
-
-    invoke-virtual {v1, v2, v3, v4, v5}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureUi(Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
-
-    move-object v2, v6
-
-    check-cast v2, Lcom/discord/app/AppComponent;
-
-    invoke-virtual {v1, v10, v2}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->configureUiTimestamp(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/app/AppComponent;)V
-
-    iput-object v1, v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v11}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()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
-
-    if-eqz v0, :cond_5
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getPrimaryName()Landroid/widget/TextView;
-
-    move-result-object v2
-
-    check-cast v0, Ljava/lang/CharSequence;
-
-    invoke-virtual {v2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getSecondaryName()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getActionsHeader()Landroid/widget/TextView;
 
     move-result-object v0
 
-    check-cast v1, Ljava/lang/CharSequence;
+    check-cast v0, Landroid/view/View;
 
-    invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    xor-int/lit8 v2, v3, 0x1
+
+    invoke-static {v0, v2, v1, v5, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    if-nez v3, :cond_3
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getActionsDivider()Landroid/view/View;
+
+    move-result-object v0
+
+    invoke-virtual {v6, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->setPeekHeightBottomView(Landroid/view/View;)V
+
+    :cond_3
+    sget-object v0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->Companion:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getRichPresenceContainer()Landroid/widget/FrameLayout;
+
+    move-result-object v1
+
+    check-cast v1, Landroid/view/ViewGroup;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+
+    move-result-object v2
+
+    iget-object v5, v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+    invoke-virtual {v0, v1, v9, v2, v5}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;->setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+    move-result-object v0
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getRichPresence()Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    move-result-object v11
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+
+    move-result-object v12
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe()Z
+
+    move-result v13
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v14
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
+
+    move-result-object v15
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;
+
+    invoke-direct {v1, v6, v7, v9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;Lcom/discord/models/domain/ModelPresence$Activity;)V
+
+    move-object/from16 v16, v1
+
+    check-cast v16, Lkotlin/jvm/functions/Function0;
+
+    move-object v10, v0
+
+    invoke-virtual/range {v10 .. v16}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
+
+    move-object v1, v6
+
+    check-cast v1, Lcom/discord/app/AppComponent;
+
+    invoke-virtual {v0, v9, v1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUiTimestamp(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/app/AppComponent;)V
+
+    iput-object v0, v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+
+    invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureProfileActionButtons(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+
+    invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureIncomingFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+
+    invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureRoles(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getViewProfileButton()Landroid/widget/TextView;
+
+    move-result-object v10
+
+    const v11, 0x7f0401b4
+
+    const v12, 0x7f040167
+
+    if-eqz v3, :cond_4
+
+    const v0, 0x7f12102f
+
+    invoke-virtual {v10, v0}, Landroid/widget/TextView;->setText(I)V
+
+    new-instance v13, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;
+
+    move-object v0, v13
+
+    move-object v1, v10
+
+    move-object/from16 v2, p0
+
+    move-object/from16 v5, p1
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;-><init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+
+    check-cast v13, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v10, v13}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    move-object v0, v10
+
+    check-cast v0, Landroid/view/View;
+
+    invoke-static {v0, v11, v12}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+
+    move-result v11
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/16 v15, 0xe
+
+    const/16 v16, 0x0
+
+    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+
+    goto :goto_2
+
+    :cond_4
+    const v0, 0x7f120ea5
+
+    invoke-virtual {v10, v0}, Landroid/widget/TextView;->setText(I)V
+
+    new-instance v13, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;
+
+    move-object v0, v13
+
+    move-object v1, v10
+
+    move-object/from16 v2, p0
+
+    move-object/from16 v5, p1
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;-><init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+
+    check-cast v13, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v10, v13}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    move-object v0, v10
+
+    check-cast v0, Landroid/view/View;
+
+    invoke-static {v0, v12, v11}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+
+    move-result v11
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/16 v15, 0xe
+
+    const/16 v16, 0x0
+
+    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+
+    :goto_2
+    invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureVoiceSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+
+    invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+
+    invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureDeveloperSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+
+    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+
+    if-eqz v9, :cond_5
+
+    invoke-virtual {v9}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
+
+    move-result-object v1
 
     goto :goto_3
 
     :cond_5
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getPrimaryName()Landroid/widget/TextView;
-
-    move-result-object v0
-
-    check-cast v1, Ljava/lang/CharSequence;
-
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getSecondaryName()Landroid/widget/TextView;
-
-    move-result-object v0
-
-    invoke-static {v0, v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    move-object v1, v8
 
     :goto_3
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAvatar()Landroid/widget/ImageView;
+    if-eqz v9, :cond_6
 
-    move-result-object v14
-
-    invoke-static {v11, v7}, Lcom/discord/utilities/icon/IconUtils;->getForUser(Lcom/discord/models/domain/ModelUser;Z)Ljava/lang/String;
-
-    move-result-object v15
-
-    const/16 v16, 0x0
-
-    const/16 v17, 0x0
-
-    iget-object v0, v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->imagesChangeDetector:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
-
-    move-object/from16 v18, v0
-
-    check-cast v18, Lcom/discord/utilities/images/MGImages$ChangeDetector;
-
-    const/16 v19, 0xc
-
-    const/16 v20, 0x0
-
-    invoke-static/range {v14 .. v20}, 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-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getRoleItems()Ljava/util/List;
-
-    move-result-object v0
-
-    invoke-direct {v6, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureRoles(Ljava/util/List;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getViewProfileButton()Landroid/widget/TextView;
-
-    move-result-object v14
-
-    const v15, 0x7f0401b2
-
-    const v5, 0x7f040165
-
-    if-eqz v12, :cond_6
-
-    const v0, 0x7f120ff3
-
-    invoke-virtual {v14, v0}, Landroid/widget/TextView;->setText(I)V
-
-    new-instance v16, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;
-
-    move-object/from16 v0, v16
-
-    move-object v1, v14
-
-    move-object/from16 v2, p0
-
-    move v3, v12
-
-    move-object v4, v11
-
-    const v8, 0x7f040165
-
-    move-object/from16 v5, p1
-
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;-><init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
-
-    move-object/from16 v0, v16
-
-    check-cast v0, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v14, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    move-object v0, v14
-
-    check-cast v0, Landroid/view/View;
-
-    invoke-static {v0, v15, v8}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
-
-    move-result v15
-
-    const/16 v16, 0x0
-
-    const/16 v17, 0x0
-
-    const/16 v18, 0x0
-
-    const/16 v19, 0xe
-
-    const/16 v20, 0x0
-
-    invoke-static/range {v14 .. v20}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
-
-    goto :goto_4
-
-    :cond_6
-    const v8, 0x7f040165
-
-    const v0, 0x7f120e6f
-
-    invoke-virtual {v14, v0}, Landroid/widget/TextView;->setText(I)V
-
-    new-instance v16, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;
-
-    move-object/from16 v0, v16
-
-    move-object v1, v14
-
-    move-object/from16 v2, p0
-
-    move v3, v12
-
-    move-object v4, v11
-
-    move-object/from16 v5, p1
-
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;-><init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
-
-    move-object/from16 v0, v16
-
-    check-cast v0, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v14, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    move-object v0, v14
-
-    check-cast v0, Landroid/view/View;
-
-    invoke-static {v0, v8, v15}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
-
-    move-result v15
-
-    const/16 v16, 0x0
-
-    const/16 v17, 0x0
-
-    const/16 v18, 0x0
-
-    const/16 v19, 0xe
-
-    const/16 v20, 0x0
-
-    invoke-static/range {v14 .. v20}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
-
-    :goto_4
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getHeader()Landroid/view/View;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3;
-
-    invoke-direct {v1, v6, v11}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelUser;)V
-
-    check-cast v1, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getSendMessageButton()Landroid/view/View;
+    invoke-virtual {v9}, Lcom/discord/models/domain/ModelPresence$Activity;->getGamePlatform()Ljava/lang/String;
 
     move-result-object v8
 
-    if-nez v12, :cond_7
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getType()I
-
-    move-result v0
-
-    if-eq v0, v7, :cond_7
-
-    const/4 v0, 0x0
-
-    goto :goto_5
-
-    :cond_7
-    const/4 v0, 0x0
-
-    const/4 v7, 0x0
-
-    :goto_5
-    invoke-static {v8, v7, v0, v13, v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    new-instance v7, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;
-
-    move-object v0, v7
-
-    move-object v1, v8
-
-    move-object/from16 v2, p0
-
-    move v3, v12
-
-    move-object/from16 v4, p1
-
-    move-object v5, v11
-
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;-><init>(Landroid/view/View;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/widgets/user/usersheet/WidgetUserSheetModel;Lcom/discord/models/domain/ModelUser;)V
-
-    check-cast v7, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v8, v7}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureVoiceSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
-
-    invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureAdministrativeSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
-
-    invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureDeveloperSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
-
-    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
-
-    if-eqz v10, :cond_8
-
-    invoke-virtual {v10}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_6
-
-    :cond_8
-    move-object v1, v9
-
-    :goto_6
-    if-eqz v10, :cond_9
-
-    invoke-virtual {v10}, Lcom/discord/models/domain/ModelPresence$Activity;->getGamePlatform()Ljava/lang/String;
-
-    move-result-object v9
-
-    :cond_9
-    invoke-virtual {v0, v1, v9}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openUserSheet(Ljava/lang/String;Ljava/lang/String;)V
+    :cond_6
+    invoke-virtual {v0, v1, v8}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openUserSheet(Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
 .end method
 
-.method private final configureVoiceSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+.method private final configureVoiceSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
     .locals 6
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserVolumeSeekbar()Landroid/widget/SeekBar;
@@ -2049,7 +2586,7 @@
 
     check-cast v0, Landroid/view/View;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe()Z
 
     move-result v1
 
@@ -2069,7 +2606,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->getOutputVolume()I
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->getOutputVolume()I
 
     move-result v1
 
@@ -2081,7 +2618,7 @@
 
     check-cast v0, Landroid/view/View;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe()Z
 
     move-result v1
 
@@ -2093,7 +2630,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isUserMuted()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isUserMuted()Z
 
     move-result v1
 
@@ -2105,7 +2642,7 @@
 
     new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1;
 
-    invoke-direct {v1, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;)V
+    invoke-direct {v1, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureVoiceSection$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 
     check-cast v1, Landroid/widget/CompoundButton$OnCheckedChangeListener;
 
@@ -2117,7 +2654,7 @@
 
     check-cast v0, Landroid/view/View;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe()Z
 
     move-result p1
 
@@ -2178,7 +2715,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xc
+    const/16 v2, 0x16
 
     aget-object v1, v1, v2
 
@@ -2191,6 +2728,26 @@
     return-object v0
 .end method
 
+.method private final getActionsHeader()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->actionsHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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, Landroid/widget/TextView;
+
+    return-object v0
+.end method
+
 .method private final getActivityDivider()Landroid/view/View;
     .locals 3
 
@@ -2198,7 +2755,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x6
+    const/16 v2, 0xe
 
     aget-object v1, v1, v2
 
@@ -2211,6 +2768,26 @@
     return-object v0
 .end method
 
+.method private final getAddFriendActionButton()Landroid/widget/Button;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->addFriendActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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, Landroid/widget/Button;
+
+    return-object v0
+.end method
+
 .method private final getAdministrativeDivider()Landroid/view/View;
     .locals 3
 
@@ -2218,7 +2795,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x10
+    const/16 v2, 0x1a
 
     aget-object v1, v1, v2
 
@@ -2238,7 +2815,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xf
+    const/16 v2, 0x19
 
     aget-object v1, v1, v2
 
@@ -2258,7 +2835,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x9
+    const/16 v2, 0x13
 
     aget-object v1, v1, v2
 
@@ -2278,7 +2855,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x8
+    const/16 v2, 0x12
 
     aget-object v1, v1, v2
 
@@ -2291,26 +2868,6 @@
     return-object v0
 .end method
 
-.method private final getAvatar()Landroid/widget/ImageView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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/widget/ImageView;
-
-    return-object v0
-.end method
-
 .method private final getBanButton()Landroid/widget/TextView;
     .locals 3
 
@@ -2318,7 +2875,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x13
+    const/16 v2, 0x1d
 
     aget-object v1, v1, v2
 
@@ -2331,6 +2888,26 @@
     return-object v0
 .end method
 
+.method private final getCallActionButton()Landroid/widget/Button;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->callActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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/widget/Button;
+
+    return-object v0
+.end method
+
 .method private final getCopyIdButton()Landroid/view/View;
     .locals 3
 
@@ -2338,7 +2915,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x19
+    const/16 v2, 0x23
 
     aget-object v1, v1, v2
 
@@ -2358,7 +2935,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x18
+    const/16 v2, 0x22
 
     aget-object v1, v1, v2
 
@@ -2378,7 +2955,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x17
+    const/16 v2, 0x21
 
     aget-object v1, v1, v2
 
@@ -2398,7 +2975,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x11
+    const/16 v2, 0x1b
 
     aget-object v1, v1, v2
 
@@ -2411,14 +2988,114 @@
     return-object v0
 .end method
 
-.method private final getHeader()Landroid/view/View;
+.method private final getFriendRequestAcceptButton()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->friendRequestAcceptButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x0
+    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 getFriendRequestIgnoreButton()Landroid/widget/Button;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->friendRequestIgnoreButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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/widget/Button;
+
+    return-object v0
+.end method
+
+.method private final getGuildContainer()Landroid/view/ViewGroup;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->guildContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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/ViewGroup;
+
+    return-object v0
+.end method
+
+.method private final getGuildHeader()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->guildHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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 getIncomingFriendRequestContainer()Landroid/view/ViewGroup;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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, Landroid/view/ViewGroup;
+
+    return-object v0
+.end method
+
+.method private final getIncomingFriendRequestDivider()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0x8
 
     aget-object v1, v1, v2
 
@@ -2431,6 +3108,26 @@
     return-object v0
 .end method
 
+.method private final getIncomingFriendRequestHeader()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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, Landroid/widget/TextView;
+
+    return-object v0
+.end method
+
 .method private final getKickButton()Landroid/widget/TextView;
     .locals 3
 
@@ -2438,7 +3135,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x12
+    const/16 v2, 0x1c
 
     aget-object v1, v1, v2
 
@@ -2451,10 +3148,10 @@
     return-object v0
 .end method
 
-.method private final getPresenceIndicator()Landroid/widget/ImageView;
+.method private final getMessageActionButton()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->presenceIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->messageActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -2466,15 +3163,55 @@
 
     move-result-object v0
 
-    check-cast v0, Landroid/widget/ImageView;
+    check-cast v0, Landroid/widget/Button;
 
     return-object v0
 .end method
 
-.method private final getPrimaryName()Landroid/widget/TextView;
+.method private final getPendingFriendRequestActionButton()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->primaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->pendingFriendRequestActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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, Landroid/widget/Button;
+
+    return-object v0
+.end method
+
+.method private final getProfileActionsContainer()Landroid/view/ViewGroup;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->profileActionsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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/ViewGroup;
+
+    return-object v0
+.end method
+
+.method private final getProfileActionsDivider()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->profileActionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -2486,7 +3223,7 @@
 
     move-result-object v0
 
-    check-cast v0, Landroid/widget/TextView;
+    check-cast v0, Landroid/view/View;
 
     return-object v0
 .end method
@@ -2498,7 +3235,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x5
+    const/16 v2, 0xd
 
     aget-object v1, v1, v2
 
@@ -2518,7 +3255,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x7
+    const/16 v2, 0xf
 
     aget-object v1, v1, v2
 
@@ -2531,46 +3268,6 @@
     return-object v0
 .end method
 
-.method private final getSecondaryName()Landroid/widget/TextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->secondaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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/TextView;
-
-    return-object v0
-.end method
-
-.method private final getSendMessageButton()Landroid/view/View;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->sendMessageButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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/view/View;
-
-    return-object v0
-.end method
-
 .method private final getServerDeafenButton()Landroid/widget/TextView;
     .locals 3
 
@@ -2578,7 +3275,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x15
+    const/16 v2, 0x1f
 
     aget-object v1, v1, v2
 
@@ -2598,7 +3295,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x16
+    const/16 v2, 0x20
 
     aget-object v1, v1, v2
 
@@ -2618,7 +3315,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x14
+    const/16 v2, 0x1e
 
     aget-object v1, v1, v2
 
@@ -2638,7 +3335,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xa
+    const/16 v2, 0x14
 
     aget-object v1, v1, v2
 
@@ -2651,6 +3348,26 @@
     return-object v0
 .end method
 
+.method private final getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileHeaderView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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/widgets/user/profile/UserProfileHeaderView;
+
+    return-object v0
+.end method
+
 .method private final getUserVolumeSeekbar()Landroid/widget/SeekBar;
     .locals 3
 
@@ -2658,7 +3375,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xb
+    const/16 v2, 0x15
 
     aget-object v1, v1, v2
 
@@ -2671,6 +3388,26 @@
     return-object v0
 .end method
 
+.method private final getVideoActionButton()Landroid/widget/Button;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->videoActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$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, Landroid/widget/Button;
+
+    return-object v0
+.end method
+
 .method private final getViewProfileButton()Landroid/widget/TextView;
     .locals 3
 
@@ -2678,7 +3415,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xd
+    const/16 v2, 0x18
 
     aget-object v1, v1, v2
 
@@ -2691,6 +3428,120 @@
     return-object v0
 .end method
 
+.method private final handleEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;)V
+    .locals 1
+
+    instance-of v0, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->handleShowToast(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;)V
+
+    return-void
+
+    :cond_0
+    instance-of v0, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;
+
+    if-eqz v0, :cond_1
+
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->handleLaunchVoiceCall(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;)V
+
+    return-void
+
+    :cond_1
+    instance-of v0, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;
+
+    if-eqz v0, :cond_2
+
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->handleLaunchVideoCall(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;)V
+
+    :cond_2
+    return-void
+.end method
+
+.method private final handleLaunchVideoCall(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;)V
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->privateCallLauncher:Lcom/discord/widgets/user/calls/PrivateCallLauncher;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "privateCallLauncher"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;->getChannelId()J
+
+    move-result-wide v1
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->launchVideoCall(J)V
+
+    return-void
+.end method
+
+.method private final handleLaunchVoiceCall(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;)V
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->privateCallLauncher:Lcom/discord/widgets/user/calls/PrivateCallLauncher;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "privateCallLauncher"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;->getChannelId()J
+
+    move-result-wide v1
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->launchVoiceCall(J)V
+
+    return-void
+.end method
+
+.method private final handleShowToast(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;)V
+    .locals 1
+
+    move-object v0, p0
+
+    check-cast v0, Landroidx/fragment/app/Fragment;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;->getStringRes()I
+
+    move-result p1
+
+    invoke-static {v0, p1}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
+
+    return-void
+.end method
+
+.method private final ignoreFriendRequest()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "viewModel"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_0
+    const v1, 0x7f120690
+
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->removeRelationship(I)V
+
+    return-void
+.end method
+
 .method public static final show(JJLandroidx/fragment/app/FragmentManager;)V
     .locals 9
 
@@ -2734,85 +3585,167 @@
 
 # virtual methods
 .method public final bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
-    .locals 13
+    .locals 19
 
-    const-string v0, "compositeSubscription"
+    move-object/from16 v0, p0
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v1, "compositeSubscription"
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
+    move-object/from16 v2, p1
 
-    move-result-object v0
+    invoke-static {v2, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "ARG_USER_ID"
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
+    move-result-object v1
 
-    move-result-wide v0
+    const-string v2, "ARG_USER_ID"
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
+    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
-    move-result-object v2
+    move-result-wide v7
 
-    const-string v3, "ARG_CHANNEL_ID"
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    invoke-virtual {v2, v3}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
+    move-result-object v1
 
-    move-result-wide v2
+    const-string v2, "ARG_CHANNEL_ID"
 
-    sget-object v4, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion;
+    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
-    invoke-virtual {v4, v0, v1, v2, v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion;->get(JJ)Lrx/Observable;
+    move-result-wide v1
 
-    move-result-object v0
+    iget-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    move-object v1, p0
+    const-string v4, "viewModel"
 
-    check-cast v1, Lcom/discord/app/AppComponent;
+    if-nez v3, :cond_0
 
-    const/4 v2, 0x0
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
-    const/4 v3, 0x2
+    :cond_0
+    invoke-virtual {v3, v7, v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->updateUserId(J)V
 
-    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;
+    iget-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    move-result-object v4
+    if-nez v3, :cond_1
 
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
-    move-result-object v5
+    :cond_1
+    invoke-virtual {v3, v1, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->updateChannelId(J)V
 
-    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1;
+    iget-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    move-object v1, p0
+    if-nez v3, :cond_2
 
-    check-cast v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    :cond_2
+    invoke-virtual {v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->observeViewState()Lrx/Observable;
 
-    move-object v10, v0
+    move-result-object v3
 
-    check-cast v10, Lkotlin/jvm/functions/Function1;
+    move-object v6, v0
 
-    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2;
+    check-cast v6, Lcom/discord/app/AppComponent;
 
-    invoke-direct {v0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2;-><init>(Lrx/subscriptions/CompositeSubscription;)V
-
-    move-object v7, v0
-
-    check-cast v7, Lkotlin/jvm/functions/Function1;
-
-    const/4 v6, 0x0
-
-    const/4 v8, 0x0
+    const/4 v5, 0x2
 
     const/4 v9, 0x0
 
-    const/16 v11, 0x1a
+    invoke-static {v3, v6, v9, v5, v9}, 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 v10
+
+    invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v11
 
     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 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/4 v15, 0x0
+
+    new-instance v3, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1;
+
+    move-object v5, v0
+
+    check-cast v5, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-direct {v3, v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    move-object/from16 v16, v3
+
+    check-cast v16, Lkotlin/jvm/functions/Function1;
+
+    const/16 v17, 0x1e
+
+    const/16 v18, 0x0
+
+    invoke-static/range {v10 .. v18}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+
+    iget-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    if-nez v3, :cond_3
+
+    invoke-static {v4}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_3
+    invoke-virtual {v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->observeEvents()Lrx/Observable;
+
+    move-result-object v3
+
+    const/4 v4, 0x2
+
+    invoke-static {v3, v6, v9, v4, v9}, 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 v10
+
+    invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v11
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/4 v15, 0x0
+
+    new-instance v3, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2;
+
+    invoke-direct {v3, v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    move-object/from16 v16, v3
+
+    check-cast v16, Lkotlin/jvm/functions/Function1;
+
+    const/16 v17, 0x1e
+
+    const/16 v18, 0x0
+
+    invoke-static/range {v10 .. v18}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+
+    sget-object v3, 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 v4
+
+    move-object v5, v0
+
+    check-cast v5, Landroidx/fragment/app/Fragment;
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v9
+
+    invoke-virtual/range {v3 .. v9}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;->bind(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Landroidx/fragment/app/Fragment;Lcom/discord/app/AppComponent;JLjava/lang/Long;)V
 
     return-void
 .end method
@@ -2820,7 +3753,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d5
+    const v0, 0x7f0d01e3
 
     return v0
 .end method
@@ -2849,14 +3782,86 @@
     return-void
 .end method
 
+.method public final onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
+    .locals 6
+
+    const-string v0, "inflater"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    check-cast v0, Landroidx/fragment/app/Fragment;
+
+    new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;
+
+    invoke-direct {v1}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;-><init>()V
+
+    check-cast v1, Landroidx/lifecycle/ViewModelProvider$Factory;
+
+    invoke-static {v0, v1}, Landroidx/lifecycle/ViewModelProviders;->of(Landroidx/fragment/app/Fragment;Landroidx/lifecycle/ViewModelProvider$Factory;)Landroidx/lifecycle/ViewModelProvider;
+
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+
+    move-result-object v0
+
+    const-string v1, "ViewModelProviders.of(\n \u2026eetViewModel::class.java)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    new-instance v0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;
+
+    move-object v1, p0
+
+    check-cast v1, Lcom/discord/app/AppPermissions$Requests;
+
+    move-object v2, p0
+
+    check-cast v2, Lcom/discord/app/AppComponent;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->requireContext()Landroid/content/Context;
+
+    move-result-object v3
+
+    const-string v4, "requireContext()"
+
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v4
+
+    const-string v5, "requireFragmentManager()"
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;-><init>(Lcom/discord/app/AppPermissions$Requests;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;)V
+
+    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->privateCallLauncher:Lcom/discord/widgets/user/calls/PrivateCallLauncher;
+
+    invoke-super {p0, p1, p2, p3}, Lcom/discord/app/AppBottomSheet;->onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
 .method public final onPause()V
     .locals 7
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityViewHolder:Lcom/discord/widgets/user/ViewHolderUserRichPresence;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->disposeSubscriptions()V
+    invoke-virtual {v0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->disposeSubscriptions()V
 
     :cond_0
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
@@ -2963,7 +3968,7 @@
 .end method
 
 .method public final onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
-    .locals 2
+    .locals 3
 
     const-string v0, "view"
 
@@ -2985,7 +3990,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f040298
+    const v1, 0x7f04029b
 
     invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -2997,5 +4002,45 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->rolesAdapter:Lcom/discord/widgets/roles/RolesAdapter;
 
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    move-result-object p1
+
+    new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1;
+
+    invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    check-cast p2, Lkotlin/jvm/functions/Function1;
+
+    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->setOnAvatarClick(Lkotlin/jvm/functions/Function1;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+
+    move-result-object p1
+
+    sget-object p2, Lcom/discord/widgets/user/Badge;->Companion:Lcom/discord/widgets/user/Badge$Companion;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v0
+
+    const-string v1, "requireFragmentManager()"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->requireContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    const-string v2, "requireContext()"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    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
+
+    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->setOnBadgeClick(Lkotlin/jvm/functions/Function1;)V
+
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1.smali
deleted file mode 100644
index acdb82ae7a..0000000000
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1.smali
+++ /dev/null
@@ -1,433 +0,0 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;
-.super Ljava/lang/Object;
-.source "WidgetUserSheetModel.kt"
-
-# interfaces
-.implements Lrx/functions/Func9;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;->invoke(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    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;",
-        "T6:",
-        "Ljava/lang/Object;",
-        "T7:",
-        "Ljava/lang/Object;",
-        "T8:",
-        "Ljava/lang/Object;",
-        "T9:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Func9<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
-
-.field final synthetic $me:Lcom/discord/models/domain/ModelUser;
-
-.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
-
-.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$me:Lcom/discord/models/domain/ModelUser;
-
-    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$user:Lcom/discord/models/domain/ModelUser;
-
-    iput-object p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$channel:Lcom/discord/models/domain/ModelChannel;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Integer;Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-    .locals 24
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Map<",
-            "Ljava/lang/Long;",
-            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
-            ">;",
-            "Ljava/util/Map<",
-            "Ljava/lang/Long;",
-            "Lcom/discord/models/domain/ModelGuildRole;",
-            ">;",
-            "Ljava/util/Map<",
-            "Ljava/lang/Long;",
-            "+",
-            "Lcom/discord/models/domain/ModelVoice$State;",
-            ">;",
-            "Ljava/lang/Boolean;",
-            "Ljava/lang/Integer;",
-            "Lcom/discord/widgets/user/ModelRichPresence;",
-            "Lcom/discord/models/domain/ModelGuild;",
-            "Ljava/lang/Integer;",
-            "Lcom/discord/utilities/streams/StreamContext;",
-            ")",
-            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;"
-        }
-    .end annotation
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    move-object/from16 v8, p2
-
-    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$me:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v2
-
-    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$user:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v4
-
-    const/4 v9, 0x1
-
-    const/4 v10, 0x0
-
-    cmp-long v6, v2, v4
-
-    if-nez v6, :cond_0
-
-    const/4 v13, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v13, 0x0
-
-    :goto_0
-    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$user:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()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 v2
-
-    check-cast v2, Lcom/discord/models/domain/ModelGuildMember$Computed;
-
-    iget-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$me:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v3
-
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v3
-
-    invoke-interface {v1, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/models/domain/ModelGuildMember$Computed;
-
-    if-eqz v2, :cond_3
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_3
-
-    check-cast v3, Ljava/lang/Iterable;
-
-    new-instance v4, Ljava/util/ArrayList;
-
-    invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
-
-    check-cast v4, Ljava/util/Collection;
-
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    :cond_1
-    :goto_1
-    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
-
-    check-cast v5, Ljava/lang/Long;
-
-    invoke-interface {v8, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Lcom/discord/models/domain/ModelGuildRole;
-
-    if-eqz v5, :cond_1
-
-    invoke-interface {v4, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_1
-
-    :cond_2
-    check-cast v4, Ljava/util/List;
-
-    check-cast v4, Ljava/lang/Iterable;
-
-    invoke-static {v4}, Lkotlin/a/m;->p(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object v3
-
-    if-nez v3, :cond_4
-
-    :cond_3
-    sget-object v3, Lkotlin/a/y;->bjU:Lkotlin/a/y;
-
-    check-cast v3, Ljava/util/List;
-
-    :cond_4
-    move-object/from16 v19, v3
-
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_5
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getNick()Ljava/lang/String;
-
-    move-result-object v4
-
-    move-object/from16 v20, v4
-
-    goto :goto_2
-
-    :cond_5
-    move-object/from16 v20, v3
-
-    :goto_2
-    if-eqz v2, :cond_7
-
-    if-eqz v1, :cond_7
-
-    if-nez p7, :cond_6
-
-    goto :goto_3
-
-    :cond_6
-    sget-object v3, Lcom/discord/utilities/permissions/ManageUserContext;->Companion:Lcom/discord/utilities/permissions/ManageUserContext$Companion;
-
-    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$me:Lcom/discord/models/domain/ModelUser;
-
-    iget-object v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$user:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
-
-    move-result-object v1
-
-    const-string v6, "memberMe.roles"
-
-    invoke-static {v1, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v6, v1
-
-    check-cast v6, Ljava/util/Collection;
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
-
-    move-result-object v1
-
-    const-string v2, "member.roles"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v7, v1
-
-    check-cast v7, Ljava/util/Collection;
-
-    const-string v1, "guildRoles"
-
-    invoke-static {v8, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v1, v3
-
-    move-object/from16 v2, p7
-
-    move-object v3, v4
-
-    move-object v4, v5
-
-    move-object v5, v6
-
-    move-object v6, v7
-
-    move-object/from16 v7, p8
-
-    move-object/from16 v8, p2
-
-    invoke-virtual/range {v1 .. v8}, Lcom/discord/utilities/permissions/ManageUserContext$Companion;->from(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;Ljava/util/Collection;Ljava/lang/Integer;Ljava/util/Map;)Lcom/discord/utilities/permissions/ManageUserContext;
-
-    move-result-object v1
-
-    move-object/from16 v22, v1
-
-    goto :goto_4
-
-    :cond_7
-    :goto_3
-    move-object/from16 v22, v3
-
-    :goto_4
-    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;
-
-    iget-wide v1, v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;->$userId:J
-
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v1
-
-    move-object/from16 v2, p3
-
-    invoke-interface {v2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    move-object/from16 v17, v1
-
-    check-cast v17, Lcom/discord/models/domain/ModelVoice$State;
-
-    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$channel:Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getOwnerId()J
-
-    move-result-wide v1
-
-    iget-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$me:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v3
-
-    cmp-long v5, v1, v3
-
-    if-nez v5, :cond_8
-
-    const/4 v14, 0x1
-
-    goto :goto_5
-
-    :cond_8
-    const/4 v14, 0x0
-
-    :goto_5
-    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    iget-object v12, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$user:Lcom/discord/models/domain/ModelUser;
-
-    const-string v2, "muted"
-
-    move-object/from16 v3, p4
-
-    invoke-static {v3, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual/range {p4 .. p4}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v15
-
-    const-string v2, "outputVolume"
-
-    move-object/from16 v3, p5
-
-    invoke-static {v3, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual/range {p5 .. p5}, Ljava/lang/Integer;->intValue()I
-
-    move-result v16
-
-    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->$channel:Lcom/discord/models/domain/ModelChannel;
-
-    move-object v11, v1
-
-    move-object/from16 v18, p6
-
-    move-object/from16 v21, v2
-
-    move-object/from16 v23, p9
-
-    invoke-direct/range {v11 .. v23}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;-><init>(Lcom/discord/models/domain/ModelUser;ZZZILcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/ModelRichPresence;Ljava/util/List;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/permissions/ManageUserContext;Lcom/discord/utilities/streams/StreamContext;)V
-
-    return-object v1
-.end method
-
-.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/Map;
-
-    check-cast p2, Ljava/util/Map;
-
-    check-cast p3, Ljava/util/Map;
-
-    check-cast p4, Ljava/lang/Boolean;
-
-    check-cast p5, Ljava/lang/Integer;
-
-    check-cast p6, Lcom/discord/widgets/user/ModelRichPresence;
-
-    check-cast p7, Lcom/discord/models/domain/ModelGuild;
-
-    check-cast p8, Ljava/lang/Integer;
-
-    check-cast p9, Lcom/discord/utilities/streams/StreamContext;
-
-    invoke-virtual/range {p0 .. p9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;->call(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Integer;Lcom/discord/widgets/user/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1.smali
deleted file mode 100644
index a5505228b2..0000000000
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1.smali
+++ /dev/null
@@ -1,310 +0,0 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;
-.super Lkotlin/jvm/internal/l;
-.source "WidgetUserSheetModel.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function3;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion;->get(JJ)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/l;",
-        "Lkotlin/jvm/functions/Function3<",
-        "Lcom/discord/models/domain/ModelUser;",
-        "Lcom/discord/models/domain/ModelUser;",
-        "Lcom/discord/models/domain/ModelChannel;",
-        "Lrx/Observable<",
-        "Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;",
-        ">;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic $userId:J
-
-
-# direct methods
-.method constructor <init>(J)V
-    .locals 0
-
-    iput-wide p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;->$userId:J
-
-    const/4 p1, 0x3
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;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/ModelUser;
-
-    check-cast p3, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;->invoke(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
-    .locals 24
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/models/domain/ModelUser;",
-            "Lcom/discord/models/domain/ModelUser;",
-            "Lcom/discord/models/domain/ModelChannel;",
-            ")",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;",
-            ">;"
-        }
-    .end annotation
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    move-object/from16 v2, p2
-
-    move-object/from16 v3, p3
-
-    const-string v4, "user"
-
-    invoke-static {v1, v4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v4, "me"
-
-    invoke-static {v2, v4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v4, "channel"
-
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
-
-    move-result-object v4
-
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v5
-
-    const-string v6, "channel.guildId"
-
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v7
-
-    const/4 v5, 0x2
-
-    new-array v5, v5, [Ljava/lang/Long;
-
-    invoke-virtual/range {p1 .. p1}, 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 v9
-
-    const/4 v10, 0x0
-
-    aput-object v9, v5, v10
-
-    invoke-virtual/range {p2 .. p2}, 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 v9
-
-    const/4 v10, 0x1
-
-    aput-object v9, v5, v10
-
-    invoke-static {v5}, Lkotlin/a/m;->l([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/util/Collection;
-
-    invoke-virtual {v4, v7, v8, v5}, Lcom/discord/stores/StoreGuilds;->getComputed(JLjava/util/Collection;)Lrx/Observable;
-
-    move-result-object v11
-
-    sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
-
-    move-result-object v4
-
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v5
-
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v7
-
-    invoke-virtual {v4, v7, v8}, Lcom/discord/stores/StoreGuilds;->getRoles(J)Lrx/Observable;
-
-    move-result-object v12
-
-    sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getVoiceStates()Lcom/discord/stores/StoreVoiceStates;
-
-    move-result-object v4
-
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v5
-
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v7
-
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
-    move-result-wide v13
-
-    invoke-virtual {v4, v7, v8, v13, v14}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable;
-
-    move-result-object v13
-
-    sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object v4
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v7
-
-    invoke-virtual {v4, v7, v8}, Lcom/discord/stores/StoreMediaSettings;->getUserMuted(J)Lrx/Observable;
-
-    move-result-object v14
-
-    sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object v4
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v7
-
-    invoke-virtual {v4, v7, v8}, Lcom/discord/stores/StoreMediaSettings;->getUserOutputVolume(J)Lrx/Observable;
-
-    move-result-object v15
-
-    sget-object v4, Lcom/discord/widgets/user/ModelRichPresence;->Companion:Lcom/discord/widgets/user/ModelRichPresence$Companion;
-
-    iget-wide v7, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;->$userId:J
-
-    invoke-virtual {v4, v7, v8}, Lcom/discord/widgets/user/ModelRichPresence$Companion;->get(J)Lrx/Observable;
-
-    move-result-object v16
-
-    sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
-
-    move-result-object v4
-
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v5
-
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v7
-
-    invoke-virtual {v4, v7, v8}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable;
-
-    move-result-object v17
-
-    sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getPermissions()Lcom/discord/stores/StorePermissions;
-
-    move-result-object v4
-
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v5
-
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v5
-
-    invoke-virtual {v4, v5, v6}, Lcom/discord/stores/StorePermissions;->getForGuild(J)Lrx/Observable;
-
-    move-result-object v18
-
-    sget-object v4, Lcom/discord/utilities/streams/StreamContext;->Companion:Lcom/discord/utilities/streams/StreamContext$Companion;
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v5
-
-    invoke-virtual {v4, v5, v6, v10}, Lcom/discord/utilities/streams/StreamContext$Companion;->get(JZ)Lrx/Observable;
-
-    move-result-object v19
-
-    new-instance v4, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;
-
-    invoke-direct {v4, v0, v2, v1, v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
-
-    move-object/from16 v20, v4
-
-    check-cast v20, Lrx/functions/Func9;
-
-    sget-object v23, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    const-wide/16 v21, 0xfa
-
-    invoke-static/range {v11 .. v23}, 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 v1
-
-    const-string v2, "ObservableWithLeadingEdg\u20260, TimeUnit.MILLISECONDS)"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3.smali
deleted file mode 100644
index 2edb9bf862..0000000000
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3.smali
+++ /dev/null
@@ -1,126 +0,0 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;
-.super Ljava/lang/Object;
-.source "WidgetUserSheetModel.kt"
-
-# interfaces
-.implements Lrx/functions/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion;->get(JJ)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/b<",
-        "TT;",
-        "Lrx/Observable<",
-        "+TR;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic $channelId:J
-
-.field final synthetic $get$1:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;
-
-
-# direct methods
-.method constructor <init>(JLcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;)V
-    .locals 0
-
-    iput-wide p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;->$channelId:J
-
-    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;->$get$1:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lkotlin/Pair;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;->call(Lkotlin/Pair;)Lrx/Observable;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lkotlin/Pair;)Lrx/Observable;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/Pair<",
-            "+",
-            "Lcom/discord/models/domain/ModelUser;",
-            "+",
-            "Lcom/discord/models/domain/ModelUser;",
-            ">;)",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p1, Lkotlin/Pair;->first:Ljava/lang/Object;
-
-    check-cast v0, Lcom/discord/models/domain/ModelUser;
-
-    iget-object p1, p1, Lkotlin/Pair;->second:Ljava/lang/Object;
-
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
-
-    if-eqz v0, :cond_0
-
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels;
-
-    move-result-object v1
-
-    iget-wide v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;->$channelId:J
-
-    invoke-virtual {v1, v2, v3}, Lcom/discord/stores/StoreChannels;->get(J)Lrx/Observable;
-
-    move-result-object v1
-
-    new-instance v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1;
-
-    invoke-direct {v2, p0, v0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)V
-
-    check-cast v2, Lrx/functions/b;
-
-    invoke-virtual {v1, v2}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object p1
-
-    if-nez p1, :cond_1
-
-    :cond_0
-    invoke-static {}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->access$getEMPTY$cp()Lrx/Observable;
-
-    move-result-object p1
-
-    :cond_1
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion.smali
deleted file mode 100644
index 6734ebed7a..0000000000
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion.smali
+++ /dev/null
@@ -1,106 +0,0 @@
-.class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion;
-.super Ljava/lang/Object;
-.source "WidgetUserSheetModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Companion"
-.end annotation
-
-
-# direct methods
-.method private 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/user/usersheet/WidgetUserSheetModel$Companion;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final get(JJ)Lrx/Observable;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(JJ)",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;",
-            ">;"
-        }
-    .end annotation
-
-    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;
-
-    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;-><init>(J)V
-
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
-
-    move-result-object v1
-
-    invoke-virtual {v1, p1, p2}, Lcom/discord/stores/StoreUser;->getUser(J)Lrx/Observable;
-
-    move-result-object p1
-
-    sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
-
-    move-result-object p2
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreUser;->getMe()Lrx/Observable;
-
-    move-result-object p2
-
-    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2;
-
-    check-cast v1, Lrx/functions/Func2;
-
-    invoke-static {p1, p2, v1}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;
-
-    invoke-direct {p2, p3, p4, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;-><init>(JLcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;)V
-
-    check-cast p2, Lrx/functions/b;
-
-    invoke-virtual {p1, p2}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object p1
-
-    const-string p2, "Observable\n          .co\u2026   } ?: EMPTY\n          }"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(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;->Kb()Lrx/Observable;
-
-    move-result-object p1
-
-    const-string p2, "Observable\n          .co\u2026  .distinctUntilChanged()"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
new file mode 100644
index 0000000000..3f67954810
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
@@ -0,0 +1,93 @@
+.class final synthetic Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;
+.super Lkotlin/jvm/internal/j;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;-><init>(Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/utilities/rest/RestAPI;Lrx/Scheduler;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1018
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lrx/subjects/BehaviorSubject;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)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}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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 final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;->invoke(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;->receiver:Ljava/lang/Object;
+
+    check-cast v0, 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/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion.smali
new file mode 100644
index 0000000000..6395768197
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion.smali
@@ -0,0 +1,32 @@
+.class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/user/usersheet/WidgetUserSheetViewModel$Companion;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall.smali
new file mode 100644
index 0000000000..eb597dc5b0
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall.smali
@@ -0,0 +1,156 @@
+.class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;
+.super Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;
+.source "WidgetUserSheetViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "LaunchVideoCall"
+.end annotation
+
+
+# instance fields
+.field private final channelId:J
+
+
+# direct methods
+.method public constructor <init>(J)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-wide p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;->channelId:J
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;JILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;
+    .locals 0
+
+    and-int/lit8 p3, p3, 0x1
+
+    if-eqz p3, :cond_0
+
+    iget-wide p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;->channelId:J
+
+    :cond_0
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;->copy(J)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;->channelId:J
+
+    return-wide v0
+.end method
+
+.method public final copy(J)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;
+
+    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;-><init>(J)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 7
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;
+
+    iget-wide v3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;->channelId:J
+
+    iget-wide v5, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;->channelId: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 final getChannelId()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;->channelId:J
+
+    return-wide v0
+.end method
+
+.method public final hashCode()I
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;->channelId:J
+
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 3
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "LaunchVideoCall(channelId="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-wide v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;->channelId: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;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall.smali
new file mode 100644
index 0000000000..b2d20bb90a
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall.smali
@@ -0,0 +1,156 @@
+.class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;
+.super Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;
+.source "WidgetUserSheetViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "LaunchVoiceCall"
+.end annotation
+
+
+# instance fields
+.field private final channelId:J
+
+
+# direct methods
+.method public constructor <init>(J)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-wide p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;->channelId:J
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;JILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;
+    .locals 0
+
+    and-int/lit8 p3, p3, 0x1
+
+    if-eqz p3, :cond_0
+
+    iget-wide p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;->channelId:J
+
+    :cond_0
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;->copy(J)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;->channelId:J
+
+    return-wide v0
+.end method
+
+.method public final copy(J)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;
+
+    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;-><init>(J)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 7
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;
+
+    iget-wide v3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;->channelId:J
+
+    iget-wide v5, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;->channelId: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 final getChannelId()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;->channelId:J
+
+    return-wide v0
+.end method
+
+.method public final hashCode()I
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;->channelId:J
+
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 3
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "LaunchVoiceCall(channelId="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-wide v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;->channelId: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;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast.smali
new file mode 100644
index 0000000000..5923a32a04
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast.smali
@@ -0,0 +1,154 @@
+.class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;
+.super Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;
+.source "WidgetUserSheetViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ShowToast"
+.end annotation
+
+
+# instance fields
+.field private final stringRes:I
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;->stringRes:I
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;IILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;
+    .locals 0
+
+    and-int/lit8 p2, p2, 0x1
+
+    if-eqz p2, :cond_0
+
+    iget p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;->stringRes:I
+
+    :cond_0
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;->copy(I)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;->stringRes:I
+
+    return v0
+.end method
+
+.method public final copy(I)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;
+
+    invoke-direct {v0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;-><init>(I)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 3
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;
+
+    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;->stringRes:I
+
+    iget p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;->stringRes:I
+
+    if-ne v1, 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 final getStringRes()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;->stringRes:I
+
+    return v0
+.end method
+
+.method public final hashCode()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;->stringRes:I
+
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "ShowToast(stringRes="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;->stringRes: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;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event.smali
new file mode 100644
index 0000000000..ea0a044c89
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event.smali
@@ -0,0 +1,40 @@
+.class public abstract Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "Event"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;,
+        Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;,
+        Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;
+    }
+.end annotation
+
+
+# direct methods
+.method private 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/user/usersheet/WidgetUserSheetViewModel$Event;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk.smali
new file mode 100644
index 0000000000..610a376789
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk.smali
@@ -0,0 +1,895 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = "StoreChunk"
+.end annotation
+
+
+# instance fields
+.field private final computedMembers:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final guild:Lcom/discord/models/domain/ModelGuild;
+
+.field private final guildRoles:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildRole;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final muted:Z
+
+.field private final outputVolume:I
+
+.field private final permissions:Ljava/lang/Integer;
+
+.field private final richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+.field private final streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+.field private final voiceStates:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelVoice$State;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZILcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelGuildRole;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelVoice$State;",
+            ">;ZI",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+            "Lcom/discord/models/domain/ModelGuild;",
+            "Ljava/lang/Integer;",
+            "Lcom/discord/utilities/streams/StreamContext;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "computedMembers"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildRoles"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "voiceStates"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->computedMembers:Ljava/util/Map;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guildRoles:Ljava/util/Map;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->voiceStates:Ljava/util/Map;
+
+    iput-boolean p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->muted:Z
+
+    iput p5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->outputVolume:I
+
+    iput-object p6, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    iput-object p7, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    iput-object p8, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->permissions:Ljava/lang/Integer;
+
+    iput-object p9, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZILcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;ILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;
+    .locals 10
+
+    move-object v0, p0
+
+    move/from16 v1, p10
+
+    and-int/lit8 v2, v1, 0x1
+
+    if-eqz v2, :cond_0
+
+    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->computedMembers:Ljava/util/Map;
+
+    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/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guildRoles:Ljava/util/Map;
+
+    goto :goto_1
+
+    :cond_1
+    move-object v3, p2
+
+    :goto_1
+    and-int/lit8 v4, v1, 0x4
+
+    if-eqz v4, :cond_2
+
+    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->voiceStates:Ljava/util/Map;
+
+    goto :goto_2
+
+    :cond_2
+    move-object v4, p3
+
+    :goto_2
+    and-int/lit8 v5, v1, 0x8
+
+    if-eqz v5, :cond_3
+
+    iget-boolean v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->muted:Z
+
+    goto :goto_3
+
+    :cond_3
+    move v5, p4
+
+    :goto_3
+    and-int/lit8 v6, v1, 0x10
+
+    if-eqz v6, :cond_4
+
+    iget v6, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->outputVolume:I
+
+    goto :goto_4
+
+    :cond_4
+    move v6, p5
+
+    :goto_4
+    and-int/lit8 v7, v1, 0x20
+
+    if-eqz v7, :cond_5
+
+    iget-object v7, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    goto :goto_5
+
+    :cond_5
+    move-object/from16 v7, p6
+
+    :goto_5
+    and-int/lit8 v8, v1, 0x40
+
+    if-eqz v8, :cond_6
+
+    iget-object v8, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    goto :goto_6
+
+    :cond_6
+    move-object/from16 v8, p7
+
+    :goto_6
+    and-int/lit16 v9, v1, 0x80
+
+    if-eqz v9, :cond_7
+
+    iget-object v9, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->permissions:Ljava/lang/Integer;
+
+    goto :goto_7
+
+    :cond_7
+    move-object/from16 v9, p8
+
+    :goto_7
+    and-int/lit16 v1, v1, 0x100
+
+    if-eqz v1, :cond_8
+
+    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    goto :goto_8
+
+    :cond_8
+    move-object/from16 v1, p9
+
+    :goto_8
+    move-object p1, v2
+
+    move-object p2, v3
+
+    move-object p3, v4
+
+    move p4, v5
+
+    move p5, v6
+
+    move-object/from16 p6, v7
+
+    move-object/from16 p7, v8
+
+    move-object/from16 p8, v9
+
+    move-object/from16 p9, v1
+
+    invoke-virtual/range {p0 .. p9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->copy(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZILcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public final component1()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->computedMembers:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildRole;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guildRoles:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final component3()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelVoice$State;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->voiceStates:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final component4()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->muted:Z
+
+    return v0
+.end method
+
+.method public final component5()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->outputVolume:I
+
+    return v0
+.end method
+
+.method public final component6()Lcom/discord/widgets/user/presence/ModelRichPresence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    return-object v0
+.end method
+
+.method public final component7()Lcom/discord/models/domain/ModelGuild;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    return-object v0
+.end method
+
+.method public final component8()Ljava/lang/Integer;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->permissions:Ljava/lang/Integer;
+
+    return-object v0
+.end method
+
+.method public final component9()Lcom/discord/utilities/streams/StreamContext;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZILcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;
+    .locals 11
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelGuildRole;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelVoice$State;",
+            ">;ZI",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+            "Lcom/discord/models/domain/ModelGuild;",
+            "Ljava/lang/Integer;",
+            "Lcom/discord/utilities/streams/StreamContext;",
+            ")",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;"
+        }
+    .end annotation
+
+    const-string v0, "computedMembers"
+
+    move-object v2, p1
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildRoles"
+
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "voiceStates"
+
+    move-object v4, p3
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;
+
+    move-object v1, v0
+
+    move 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
+
+    invoke-direct/range {v1 .. v10}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZILcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_3
+
+    instance-of v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->computedMembers:Ljava/util/Map;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->computedMembers:Ljava/util/Map;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guildRoles:Ljava/util/Map;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guildRoles:Ljava/util/Map;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->voiceStates:Ljava/util/Map;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->voiceStates:Ljava/util/Map;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->muted:Z
+
+    iget-boolean v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->muted:Z
+
+    if-ne v1, v3, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_2
+
+    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->outputVolume:I
+
+    iget v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->outputVolume:I
+
+    if-ne v1, v3, :cond_1
+
+    const/4 v1, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_1
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->permissions:Ljava/lang/Integer;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->permissions:Ljava/lang/Integer;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    iget-object p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    return v2
+
+    :cond_3
+    :goto_2
+    return v0
+.end method
+
+.method public final getComputedMembers()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->computedMembers:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final getGuild()Lcom/discord/models/domain/ModelGuild;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    return-object v0
+.end method
+
+.method public final getGuildRoles()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildRole;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guildRoles:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final getMuted()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->muted:Z
+
+    return v0
+.end method
+
+.method public final getOutputVolume()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->outputVolume:I
+
+    return v0
+.end method
+
+.method public final getPermissions()Ljava/lang/Integer;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->permissions:Ljava/lang/Integer;
+
+    return-object v0
+.end method
+
+.method public final getRichPresence()Lcom/discord/widgets/user/presence/ModelRichPresence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    return-object v0
+.end method
+
+.method public final getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    return-object v0
+.end method
+
+.method public final getVoiceStates()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelVoice$State;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->voiceStates:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->computedMembers:Ljava/util/Map;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guildRoles:Ljava/util/Map;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->voiceStates:Ljava/util/Map;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    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-boolean v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->muted:Z
+
+    if-eqz v2, :cond_3
+
+    const/4 v2, 0x1
+
+    :cond_3
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->outputVolume:I
+
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    if-eqz v2, :cond_4
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_3
+
+    :cond_4
+    const/4 v2, 0x0
+
+    :goto_3
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    if-eqz v2, :cond_5
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_4
+
+    :cond_5
+    const/4 v2, 0x0
+
+    :goto_4
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->permissions:Ljava/lang/Integer;
+
+    if-eqz v2, :cond_6
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_5
+
+    :cond_6
+    const/4 v2, 0x0
+
+    :goto_5
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    if-eqz v2, :cond_7
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_7
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "StoreChunk(computedMembers="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->computedMembers:Ljava/util/Map;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", guildRoles="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guildRoles:Ljava/util/Map;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", voiceStates="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->voiceStates:Ljava/util/Map;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", muted="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->muted:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", outputVolume="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->outputVolume:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v1, ", richPresence="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", guild="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", permissions="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->permissions:Ljava/lang/Integer;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", streamContext="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
new file mode 100644
index 0000000000..dfa3e3d02b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
@@ -0,0 +1,1051 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = "StoreState"
+.end annotation
+
+
+# instance fields
+.field private final computedMembers:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final guild:Lcom/discord/models/domain/ModelGuild;
+
+.field private final guildRoles:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildRole;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final muted:Z
+
+.field private final outputVolume:I
+
+.field private final permissions:Ljava/lang/Integer;
+
+.field private final richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+.field private final streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+.field private final userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+.field private final userRelationshipType:Ljava/lang/Integer;
+
+.field private final voiceStates:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelVoice$State;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZILcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelGuildRole;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelVoice$State;",
+            ">;ZI",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+            "Lcom/discord/models/domain/ModelGuild;",
+            "Ljava/lang/Integer;",
+            "Lcom/discord/utilities/streams/StreamContext;",
+            "Lcom/discord/models/domain/ModelUserProfile;",
+            "Ljava/lang/Integer;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "computedMembers"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildRoles"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "voiceStates"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userProfile"
+
+    invoke-static {p10, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guildRoles:Ljava/util/Map;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->voiceStates:Ljava/util/Map;
+
+    iput-boolean p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->muted:Z
+
+    iput p5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->outputVolume:I
+
+    iput-object p6, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    iput-object p7, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    iput-object p8, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->permissions:Ljava/lang/Integer;
+
+    iput-object p9, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    iput-object p10, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    iput-object p11, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userRelationshipType:Ljava/lang/Integer;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZILcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;ILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+    .locals 12
+
+    move-object v0, p0
+
+    move/from16 v1, p12
+
+    and-int/lit8 v2, v1, 0x1
+
+    if-eqz v2, :cond_0
+
+    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    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/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guildRoles:Ljava/util/Map;
+
+    goto :goto_1
+
+    :cond_1
+    move-object v3, p2
+
+    :goto_1
+    and-int/lit8 v4, v1, 0x4
+
+    if-eqz v4, :cond_2
+
+    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->voiceStates:Ljava/util/Map;
+
+    goto :goto_2
+
+    :cond_2
+    move-object v4, p3
+
+    :goto_2
+    and-int/lit8 v5, v1, 0x8
+
+    if-eqz v5, :cond_3
+
+    iget-boolean v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->muted:Z
+
+    goto :goto_3
+
+    :cond_3
+    move/from16 v5, p4
+
+    :goto_3
+    and-int/lit8 v6, v1, 0x10
+
+    if-eqz v6, :cond_4
+
+    iget v6, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->outputVolume:I
+
+    goto :goto_4
+
+    :cond_4
+    move/from16 v6, p5
+
+    :goto_4
+    and-int/lit8 v7, v1, 0x20
+
+    if-eqz v7, :cond_5
+
+    iget-object v7, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    goto :goto_5
+
+    :cond_5
+    move-object/from16 v7, p6
+
+    :goto_5
+    and-int/lit8 v8, v1, 0x40
+
+    if-eqz v8, :cond_6
+
+    iget-object v8, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    goto :goto_6
+
+    :cond_6
+    move-object/from16 v8, p7
+
+    :goto_6
+    and-int/lit16 v9, v1, 0x80
+
+    if-eqz v9, :cond_7
+
+    iget-object v9, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->permissions:Ljava/lang/Integer;
+
+    goto :goto_7
+
+    :cond_7
+    move-object/from16 v9, p8
+
+    :goto_7
+    and-int/lit16 v10, v1, 0x100
+
+    if-eqz v10, :cond_8
+
+    iget-object v10, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    goto :goto_8
+
+    :cond_8
+    move-object/from16 v10, p9
+
+    :goto_8
+    and-int/lit16 v11, v1, 0x200
+
+    if-eqz v11, :cond_9
+
+    iget-object v11, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    goto :goto_9
+
+    :cond_9
+    move-object/from16 v11, p10
+
+    :goto_9
+    and-int/lit16 v1, v1, 0x400
+
+    if-eqz v1, :cond_a
+
+    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userRelationshipType:Ljava/lang/Integer;
+
+    goto :goto_a
+
+    :cond_a
+    move-object/from16 v1, p11
+
+    :goto_a
+    move-object p1, v2
+
+    move-object p2, v3
+
+    move-object p3, v4
+
+    move/from16 p4, v5
+
+    move/from16 p5, v6
+
+    move-object/from16 p6, v7
+
+    move-object/from16 p7, v8
+
+    move-object/from16 p8, v9
+
+    move-object/from16 p9, v10
+
+    move-object/from16 p10, v11
+
+    move-object/from16 p11, v1
+
+    invoke-virtual/range {p0 .. p11}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->copy(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZILcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public final component1()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final component10()Lcom/discord/models/domain/ModelUserProfile;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    return-object v0
+.end method
+
+.method public final component11()Ljava/lang/Integer;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userRelationshipType:Ljava/lang/Integer;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildRole;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guildRoles:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final component3()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelVoice$State;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->voiceStates:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final component4()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->muted:Z
+
+    return v0
+.end method
+
+.method public final component5()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->outputVolume:I
+
+    return v0
+.end method
+
+.method public final component6()Lcom/discord/widgets/user/presence/ModelRichPresence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    return-object v0
+.end method
+
+.method public final component7()Lcom/discord/models/domain/ModelGuild;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    return-object v0
+.end method
+
+.method public final component8()Ljava/lang/Integer;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->permissions:Ljava/lang/Integer;
+
+    return-object v0
+.end method
+
+.method public final component9()Lcom/discord/utilities/streams/StreamContext;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZILcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+    .locals 13
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelGuildRole;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelVoice$State;",
+            ">;ZI",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+            "Lcom/discord/models/domain/ModelGuild;",
+            "Ljava/lang/Integer;",
+            "Lcom/discord/utilities/streams/StreamContext;",
+            "Lcom/discord/models/domain/ModelUserProfile;",
+            "Ljava/lang/Integer;",
+            ")",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;"
+        }
+    .end annotation
+
+    const-string v0, "computedMembers"
+
+    move-object v2, p1
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildRoles"
+
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "voiceStates"
+
+    move-object/from16 v4, p3
+
+    invoke-static {v4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userProfile"
+
+    move-object/from16 v11, p10
+
+    invoke-static {v11, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+
+    move-object v1, v0
+
+    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-object/from16 v12, p11
+
+    invoke-direct/range {v1 .. v12}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZILcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;)V
+
+    return-object v0
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_3
+
+    instance-of v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guildRoles:Ljava/util/Map;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guildRoles:Ljava/util/Map;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->voiceStates:Ljava/util/Map;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->voiceStates:Ljava/util/Map;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->muted:Z
+
+    iget-boolean v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->muted:Z
+
+    if-ne v1, v3, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_2
+
+    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->outputVolume:I
+
+    iget v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->outputVolume:I
+
+    if-ne v1, v3, :cond_1
+
+    const/4 v1, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_1
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->permissions:Ljava/lang/Integer;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->permissions:Ljava/lang/Integer;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userRelationshipType:Ljava/lang/Integer;
+
+    iget-object p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userRelationshipType:Ljava/lang/Integer;
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    return v2
+
+    :cond_3
+    :goto_2
+    return v0
+.end method
+
+.method public final getComputedMembers()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final getGuild()Lcom/discord/models/domain/ModelGuild;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    return-object v0
+.end method
+
+.method public final getGuildRoles()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildRole;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guildRoles:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final getMuted()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->muted:Z
+
+    return v0
+.end method
+
+.method public final getOutputVolume()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->outputVolume:I
+
+    return v0
+.end method
+
+.method public final getPermissions()Ljava/lang/Integer;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->permissions:Ljava/lang/Integer;
+
+    return-object v0
+.end method
+
+.method public final getRichPresence()Lcom/discord/widgets/user/presence/ModelRichPresence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    return-object v0
+.end method
+
+.method public final getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    return-object v0
+.end method
+
+.method public final getUserProfile()Lcom/discord/models/domain/ModelUserProfile;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    return-object v0
+.end method
+
+.method public final getUserRelationshipType()Ljava/lang/Integer;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userRelationshipType:Ljava/lang/Integer;
+
+    return-object v0
+.end method
+
+.method public final getVoiceStates()Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelVoice$State;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->voiceStates:Ljava/util/Map;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guildRoles:Ljava/util/Map;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->voiceStates:Ljava/util/Map;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    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-boolean v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->muted:Z
+
+    if-eqz v2, :cond_3
+
+    const/4 v2, 0x1
+
+    :cond_3
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->outputVolume:I
+
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    if-eqz v2, :cond_4
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_3
+
+    :cond_4
+    const/4 v2, 0x0
+
+    :goto_3
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    if-eqz v2, :cond_5
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_4
+
+    :cond_5
+    const/4 v2, 0x0
+
+    :goto_4
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->permissions:Ljava/lang/Integer;
+
+    if-eqz v2, :cond_6
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_5
+
+    :cond_6
+    const/4 v2, 0x0
+
+    :goto_5
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    if-eqz v2, :cond_7
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_6
+
+    :cond_7
+    const/4 v2, 0x0
+
+    :goto_6
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    if-eqz v2, :cond_8
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_7
+
+    :cond_8
+    const/4 v2, 0x0
+
+    :goto_7
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userRelationshipType:Ljava/lang/Integer;
+
+    if-eqz v2, :cond_9
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_9
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "StoreState(computedMembers="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->computedMembers:Ljava/util/Map;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", guildRoles="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guildRoles:Ljava/util/Map;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", voiceStates="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->voiceStates:Ljava/util/Map;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", muted="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->muted:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", outputVolume="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->outputVolume:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v1, ", richPresence="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", guild="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", permissions="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->permissions:Ljava/lang/Integer;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", streamContext="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", userProfile="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", userRelationshipType="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userRelationshipType:Ljava/lang/Integer;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState.smali
similarity index 62%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState.smali
index a835f2485b..55c53956ea 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState.smali
@@ -1,33 +1,24 @@
-.class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+.class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 .super Ljava/lang/Object;
-.source "WidgetUserSheetModel.kt"
+.source "WidgetUserSheetViewModel.kt"
 
 
 # annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion;
-    }
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 .end annotation
 
-
-# static fields
-.field public static final Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion;
-
-.field private static final EMPTY:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;",
-            ">;"
-        }
-    .end annotation
-.end field
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ViewState"
+.end annotation
 
 
 # instance fields
 .field private final channel:Lcom/discord/models/domain/ModelChannel;
 
+.field private final guildName:Ljava/lang/String;
+
 .field private final isChannelOwner:Z
 
 .field private final isMe:Z
@@ -42,7 +33,7 @@
 
 .field private final outputVolume:I
 
-.field private final richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+.field private final richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
 .field private final roleItems:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
@@ -58,33 +49,13 @@
 
 .field private final user:Lcom/discord/models/domain/ModelUser;
 
-.field private final userNickname:Ljava/lang/String;
+.field private final userRelationshipType:I
 
 .field private final voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion;
-
-    invoke-static {v1}, Lrx/Observable;->bI(Ljava/lang/Object;)Lrx/Observable;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->EMPTY:Lrx/Observable;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lcom/discord/models/domain/ModelUser;ZZZILcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/ModelRichPresence;Ljava/util/List;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/permissions/ManageUserContext;Lcom/discord/utilities/streams/StreamContext;)V
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;ZZZILcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/util/List;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/permissions/ManageUserContext;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;I)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -92,16 +63,16 @@
             "Lcom/discord/models/domain/ModelUser;",
             "ZZZI",
             "Lcom/discord/models/domain/ModelVoice$State;",
-            "Lcom/discord/widgets/user/ModelRichPresence;",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
             "Ljava/util/List<",
             "+",
             "Lcom/discord/models/domain/ModelGuildRole;",
             ">;",
-            "Ljava/lang/String;",
             "Lcom/discord/models/domain/ModelChannel;",
             "Lcom/discord/utilities/permissions/ManageUserContext;",
             "Lcom/discord/utilities/streams/StreamContext;",
-            ")V"
+            "Ljava/lang/String;",
+            "I)V"
         }
     .end annotation
 
@@ -115,35 +86,37 @@
 
     const-string v0, "channel"
 
-    invoke-static {p10, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p9, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->user:Lcom/discord/models/domain/ModelUser;
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
 
-    iput-boolean p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe:Z
+    iput-boolean p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe:Z
 
-    iput-boolean p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isChannelOwner:Z
+    iput-boolean p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isChannelOwner:Z
 
-    iput-boolean p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isUserMuted:Z
+    iput-boolean p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isUserMuted:Z
 
-    iput p5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->outputVolume:I
+    iput p5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->outputVolume:I
 
-    iput-object p6, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
+    iput-object p6, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
-    iput-object p7, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iput-object p7, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
-    iput-object p8, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->roleItems:Ljava/util/List;
+    iput-object p8, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->roleItems:Ljava/util/List;
 
-    iput-object p9, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->userNickname:Ljava/lang/String;
+    iput-object p9, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    iput-object p10, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->channel:Lcom/discord/models/domain/ModelChannel;
+    iput-object p10, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
 
-    iput-object p11, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
+    iput-object p11, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
-    iput-object p12, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iput-object p12, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->guildName:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
+    iput p13, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->userRelationshipType:I
+
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
     const/4 p2, 0x0
 
@@ -165,9 +138,9 @@
     const/4 p1, 0x0
 
     :goto_0
-    iput-boolean p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isServerMuted:Z
+    iput-boolean p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isServerMuted:Z
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
     if-eqz p1, :cond_1
 
@@ -180,31 +153,23 @@
     const/4 p2, 0x1
 
     :cond_1
-    iput-boolean p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isServerDeafened:Z
+    iput-boolean p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isServerDeafened:Z
 
     return-void
 .end method
 
-.method public static final synthetic access$getEMPTY$cp()Lrx/Observable;
-    .locals 1
-
-    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->EMPTY:Lrx/Observable;
-
-    return-object v0
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;Lcom/discord/models/domain/ModelUser;ZZZILcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/ModelRichPresence;Ljava/util/List;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/permissions/ManageUserContext;Lcom/discord/utilities/streams/StreamContext;ILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-    .locals 13
+.method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;Lcom/discord/models/domain/ModelUser;ZZZILcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/util/List;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/permissions/ManageUserContext;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;IILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+    .locals 14
 
     move-object v0, p0
 
-    move/from16 v1, p13
+    move/from16 v1, p14
 
     and-int/lit8 v2, v1, 0x1
 
     if-eqz v2, :cond_0
 
-    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
 
     goto :goto_0
 
@@ -216,19 +181,19 @@
 
     if-eqz v3, :cond_1
 
-    iget-boolean v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe:Z
+    iget-boolean v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe:Z
 
     goto :goto_1
 
     :cond_1
-    move v3, p2
+    move/from16 v3, p2
 
     :goto_1
     and-int/lit8 v4, v1, 0x4
 
     if-eqz v4, :cond_2
 
-    iget-boolean v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isChannelOwner:Z
+    iget-boolean v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isChannelOwner:Z
 
     goto :goto_2
 
@@ -240,7 +205,7 @@
 
     if-eqz v5, :cond_3
 
-    iget-boolean v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isUserMuted:Z
+    iget-boolean v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isUserMuted:Z
 
     goto :goto_3
 
@@ -252,7 +217,7 @@
 
     if-eqz v6, :cond_4
 
-    iget v6, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->outputVolume:I
+    iget v6, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->outputVolume:I
 
     goto :goto_4
 
@@ -264,7 +229,7 @@
 
     if-eqz v7, :cond_5
 
-    iget-object v7, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
+    iget-object v7, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
     goto :goto_5
 
@@ -276,7 +241,7 @@
 
     if-eqz v8, :cond_6
 
-    iget-object v8, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iget-object v8, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     goto :goto_6
 
@@ -288,7 +253,7 @@
 
     if-eqz v9, :cond_7
 
-    iget-object v9, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->roleItems:Ljava/util/List;
+    iget-object v9, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->roleItems:Ljava/util/List;
 
     goto :goto_7
 
@@ -300,7 +265,7 @@
 
     if-eqz v10, :cond_8
 
-    iget-object v10, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->userNickname:Ljava/lang/String;
+    iget-object v10, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->channel:Lcom/discord/models/domain/ModelChannel;
 
     goto :goto_8
 
@@ -312,7 +277,7 @@
 
     if-eqz v11, :cond_9
 
-    iget-object v11, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->channel:Lcom/discord/models/domain/ModelChannel;
+    iget-object v11, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
 
     goto :goto_9
 
@@ -324,7 +289,7 @@
 
     if-eqz v12, :cond_a
 
-    iget-object v12, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
+    iget-object v12, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     goto :goto_a
 
@@ -332,21 +297,33 @@
     move-object/from16 v12, p11
 
     :goto_a
-    and-int/lit16 v1, v1, 0x800
+    and-int/lit16 v13, v1, 0x800
 
-    if-eqz v1, :cond_b
+    if-eqz v13, :cond_b
 
-    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iget-object v13, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->guildName:Ljava/lang/String;
 
     goto :goto_b
 
     :cond_b
-    move-object/from16 v1, p12
+    move-object/from16 v13, p12
 
     :goto_b
+    and-int/lit16 v1, v1, 0x1000
+
+    if-eqz v1, :cond_c
+
+    iget v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->userRelationshipType:I
+
+    goto :goto_c
+
+    :cond_c
+    move/from16 v1, p13
+
+    :goto_c
     move-object p1, v2
 
-    move p2, v3
+    move/from16 p2, v3
 
     move/from16 p3, v4
 
@@ -366,9 +343,11 @@
 
     move-object/from16 p11, v12
 
-    move-object/from16 p12, v1
+    move-object/from16 p12, v13
 
-    invoke-virtual/range {p0 .. p12}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->copy(Lcom/discord/models/domain/ModelUser;ZZZILcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/ModelRichPresence;Ljava/util/List;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/permissions/ManageUserContext;Lcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    move/from16 p13, v1
+
+    invoke-virtual/range {p0 .. p13}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->copy(Lcom/discord/models/domain/ModelUser;ZZZILcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/util/List;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/permissions/ManageUserContext;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;I)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
     move-result-object v0
 
@@ -380,39 +359,47 @@
 .method public final component1()Lcom/discord/models/domain/ModelUser;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
 
     return-object v0
 .end method
 
-.method public final component10()Lcom/discord/models/domain/ModelChannel;
+.method public final component10()Lcom/discord/utilities/permissions/ManageUserContext;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->channel:Lcom/discord/models/domain/ModelChannel;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
 
     return-object v0
 .end method
 
-.method public final component11()Lcom/discord/utilities/permissions/ManageUserContext;
+.method public final component11()Lcom/discord/utilities/streams/StreamContext;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     return-object v0
 .end method
 
-.method public final component12()Lcom/discord/utilities/streams/StreamContext;
+.method public final component12()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->guildName:Ljava/lang/String;
 
     return-object v0
 .end method
 
+.method public final component13()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->userRelationshipType:I
+
+    return v0
+.end method
+
 .method public final component2()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe:Z
 
     return v0
 .end method
@@ -420,7 +407,7 @@
 .method public final component3()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isChannelOwner:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isChannelOwner:Z
 
     return v0
 .end method
@@ -428,7 +415,7 @@
 .method public final component4()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isUserMuted:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isUserMuted:Z
 
     return v0
 .end method
@@ -436,7 +423,7 @@
 .method public final component5()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->outputVolume:I
+    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->outputVolume:I
 
     return v0
 .end method
@@ -444,15 +431,15 @@
 .method public final component6()Lcom/discord/models/domain/ModelVoice$State;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
     return-object v0
 .end method
 
-.method public final component7()Lcom/discord/widgets/user/ModelRichPresence;
+.method public final component7()Lcom/discord/widgets/user/presence/ModelRichPresence;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     return-object v0
 .end method
@@ -468,46 +455,46 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->roleItems:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->roleItems:Ljava/util/List;
 
     return-object v0
 .end method
 
-.method public final component9()Ljava/lang/String;
+.method public final component9()Lcom/discord/models/domain/ModelChannel;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->userNickname:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->channel:Lcom/discord/models/domain/ModelChannel;
 
     return-object v0
 .end method
 
-.method public final copy(Lcom/discord/models/domain/ModelUser;ZZZILcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/ModelRichPresence;Ljava/util/List;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/permissions/ManageUserContext;Lcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
-    .locals 14
+.method public final copy(Lcom/discord/models/domain/ModelUser;ZZZILcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/util/List;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/permissions/ManageUserContext;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;I)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+    .locals 15
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Lcom/discord/models/domain/ModelUser;",
             "ZZZI",
             "Lcom/discord/models/domain/ModelVoice$State;",
-            "Lcom/discord/widgets/user/ModelRichPresence;",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
             "Ljava/util/List<",
             "+",
             "Lcom/discord/models/domain/ModelGuildRole;",
             ">;",
-            "Ljava/lang/String;",
             "Lcom/discord/models/domain/ModelChannel;",
             "Lcom/discord/utilities/permissions/ManageUserContext;",
             "Lcom/discord/utilities/streams/StreamContext;",
-            ")",
-            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;"
+            "Ljava/lang/String;",
+            "I)",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;"
         }
     .end annotation
 
     const-string v0, "user"
 
-    move-object v2, p1
+    move-object/from16 v2, p1
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "roleItems"
 
@@ -517,11 +504,11 @@
 
     const-string v0, "channel"
 
-    move-object/from16 v11, p10
+    move-object/from16 v10, p9
 
-    invoke-static {v11, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
     move-object v1, v0
 
@@ -537,13 +524,15 @@
 
     move-object/from16 v8, p7
 
-    move-object/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/widgets/user/usersheet/WidgetUserSheetModel;-><init>(Lcom/discord/models/domain/ModelUser;ZZZILcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/ModelRichPresence;Ljava/util/List;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/permissions/ManageUserContext;Lcom/discord/utilities/streams/StreamContext;)V
+    move/from16 v14, p13
+
+    invoke-direct/range {v1 .. v14}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;-><init>(Lcom/discord/models/domain/ModelUser;ZZZILcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/util/List;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/permissions/ManageUserContext;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;I)V
 
     return-object v0
 .end method
@@ -553,29 +542,29 @@
 
     const/4 v0, 0x1
 
-    if-eq p0, p1, :cond_5
+    if-eq p0, p1, :cond_6
 
-    instance-of v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    instance-of v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
     const/4 v2, 0x0
 
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_5
 
-    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_5
 
-    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe:Z
 
-    iget-boolean v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe:Z
+    iget-boolean v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe:Z
 
     if-ne v1, v3, :cond_0
 
@@ -587,11 +576,11 @@
     const/4 v1, 0x0
 
     :goto_0
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_5
 
-    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isChannelOwner:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isChannelOwner:Z
 
-    iget-boolean v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isChannelOwner:Z
+    iget-boolean v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isChannelOwner:Z
 
     if-ne v1, v3, :cond_1
 
@@ -603,11 +592,11 @@
     const/4 v1, 0x0
 
     :goto_1
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_5
 
-    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isUserMuted:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isUserMuted:Z
 
-    iget-boolean v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isUserMuted:Z
+    iget-boolean v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isUserMuted:Z
 
     if-ne v1, v3, :cond_2
 
@@ -619,11 +608,11 @@
     const/4 v1, 0x0
 
     :goto_2
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_5
 
-    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->outputVolume:I
+    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->outputVolume:I
 
-    iget v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->outputVolume:I
+    iget v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->outputVolume:I
 
     if-ne v1, v3, :cond_3
 
@@ -635,92 +624,116 @@
     const/4 v1, 0x0
 
     :goto_3
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->roleItems:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->roleItems:Ljava/util/List;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->roleItems:Ljava/util/List;
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->roleItems:Ljava/util/List;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->userNickname:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->userNickname:Ljava/lang/String;
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->channel:Lcom/discord/models/domain/ModelChannel;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->channel:Lcom/discord/models/domain/ModelChannel;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->channel:Lcom/discord/models/domain/ModelChannel;
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
-    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->guildName:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->guildName:Ljava/lang/String;
 
-    invoke-static {v1, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result p1
+    move-result v1
 
-    if-eqz p1, :cond_4
+    if-eqz v1, :cond_5
+
+    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->userRelationshipType:I
+
+    iget p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->userRelationshipType:I
+
+    if-ne v1, p1, :cond_4
+
+    const/4 p1, 0x1
 
     goto :goto_4
 
     :cond_4
-    return v2
+    const/4 p1, 0x0
+
+    :goto_4
+    if-eqz p1, :cond_5
+
+    goto :goto_5
 
     :cond_5
-    :goto_4
+    return v2
+
+    :cond_6
+    :goto_5
     return v0
 .end method
 
 .method public final getChannel()Lcom/discord/models/domain/ModelChannel;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->channel:Lcom/discord/models/domain/ModelChannel;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->channel:Lcom/discord/models/domain/ModelChannel;
+
+    return-object v0
+.end method
+
+.method public final getGuildName()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->guildName:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -728,7 +741,7 @@
 .method public final getManageUserContext()Lcom/discord/utilities/permissions/ManageUserContext;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
 
     return-object v0
 .end method
@@ -736,7 +749,7 @@
 .method public final getOutputVolume()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->outputVolume:I
+    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->outputVolume:I
 
     return v0
 .end method
@@ -744,11 +757,11 @@
 .method public final getPresence()Lcom/discord/models/domain/ModelPresence;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/discord/widgets/user/ModelRichPresence;->getPresence()Lcom/discord/models/domain/ModelPresence;
+    invoke-virtual {v0}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPresence()Lcom/discord/models/domain/ModelPresence;
 
     move-result-object v0
 
@@ -760,10 +773,10 @@
     return-object v0
 .end method
 
-.method public final getRichPresence()Lcom/discord/widgets/user/ModelRichPresence;
+.method public final getRichPresence()Lcom/discord/widgets/user/presence/ModelRichPresence;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     return-object v0
 .end method
@@ -779,7 +792,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->roleItems:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->roleItems:Ljava/util/List;
 
     return-object v0
 .end method
@@ -787,7 +800,7 @@
 .method public final getStreamContext()Lcom/discord/utilities/streams/StreamContext;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     return-object v0
 .end method
@@ -795,23 +808,23 @@
 .method public final getUser()Lcom/discord/models/domain/ModelUser;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
 
     return-object v0
 .end method
 
-.method public final getUserNickname()Ljava/lang/String;
+.method public final getUserRelationshipType()I
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->userNickname:Ljava/lang/String;
+    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->userRelationshipType:I
 
-    return-object v0
+    return v0
 .end method
 
 .method public final getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
     return-object v0
 .end method
@@ -819,7 +832,7 @@
 .method public final hashCode()I
     .locals 4
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
 
     const/4 v1, 0x0
 
@@ -837,7 +850,7 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe:Z
+    iget-boolean v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe:Z
 
     const/4 v3, 0x1
 
@@ -850,7 +863,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isChannelOwner:Z
+    iget-boolean v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isChannelOwner:Z
 
     if-eqz v2, :cond_2
 
@@ -861,7 +874,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isUserMuted:Z
+    iget-boolean v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isUserMuted:Z
 
     if-eqz v2, :cond_3
 
@@ -872,13 +885,17 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->outputVolume:I
+    iget v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->outputVolume:I
+
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
 
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
     if-eqz v2, :cond_4
 
@@ -896,7 +913,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     if-eqz v2, :cond_5
 
@@ -914,7 +931,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->roleItems:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->roleItems:Ljava/util/List;
 
     if-eqz v2, :cond_6
 
@@ -932,7 +949,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->userNickname:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->channel:Lcom/discord/models/domain/ModelChannel;
 
     if-eqz v2, :cond_7
 
@@ -950,7 +967,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->channel:Lcom/discord/models/domain/ModelChannel;
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
 
     if-eqz v2, :cond_8
 
@@ -968,7 +985,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     if-eqz v2, :cond_9
 
@@ -986,7 +1003,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->guildName:Ljava/lang/String;
 
     if-eqz v2, :cond_a
 
@@ -997,13 +1014,23 @@
     :cond_a
     add-int/2addr v0, v1
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->userRelationshipType:I
+
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
     return v0
 .end method
 
 .method public final isChannelOwner()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isChannelOwner:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isChannelOwner:Z
 
     return v0
 .end method
@@ -1011,7 +1038,7 @@
 .method public final isMe()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe:Z
 
     return v0
 .end method
@@ -1019,7 +1046,7 @@
 .method public final isServerDeafened()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isServerDeafened:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isServerDeafened:Z
 
     return v0
 .end method
@@ -1027,7 +1054,7 @@
 .method public final isServerMuted()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isServerMuted:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isServerMuted:Z
 
     return v0
 .end method
@@ -1035,7 +1062,7 @@
 .method public final isUserMuted()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isUserMuted:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isUserMuted:Z
 
     return v0
 .end method
@@ -1045,11 +1072,11 @@
 
     new-instance v0, Ljava/lang/StringBuilder;
 
-    const-string v1, "WidgetUserSheetModel(user="
+    const-string v1, "ViewState(user="
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1057,7 +1084,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isMe:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isMe:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -1065,7 +1092,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isChannelOwner:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isChannelOwner:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -1073,7 +1100,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->isUserMuted:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->isUserMuted:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -1081,7 +1108,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->outputVolume:I
+    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->outputVolume:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -1089,7 +1116,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1097,7 +1124,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->richPresence:Lcom/discord/widgets/user/ModelRichPresence;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1105,23 +1132,15 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->roleItems:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->roleItems:Ljava/util/List;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    const-string v1, ", userNickname="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->userNickname:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
     const-string v1, ", channel="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->channel:Lcom/discord/models/domain/ModelChannel;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->channel:Lcom/discord/models/domain/ModelChannel;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1129,7 +1148,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->manageUserContext:Lcom/discord/utilities/permissions/ManageUserContext;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1137,10 +1156,26 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", guildName="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->guildName:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", userRelationshipType="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;->userRelationshipType: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;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
new file mode 100644
index 0000000000..2318b66fac
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
@@ -0,0 +1,104 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->addRelationship(Ljava/lang/Integer;I)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TR;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $type:Ljava/lang/Integer;
+
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;Ljava/lang/Integer;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;->$type:Ljava/lang/Integer;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;->call(Ljava/lang/Long;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Ljava/lang/Long;)Lrx/Observable;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Long;",
+            ")",
+            "Lrx/Observable<",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->getRestAPI()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object v0
+
+    const-string v1, "userId"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v1
+
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;->$type:Ljava/lang/Integer;
+
+    const-string v3, "User Profile"
+
+    invoke-virtual {v0, v3, v1, v2, p1}, Lcom/discord/utilities/rest/RestAPI;->addRelationship(Ljava/lang/String;JLjava/lang/Integer;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
new file mode 100644
index 0000000000..b575c50f7f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
@@ -0,0 +1,75 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->addRelationship(Ljava/lang/Integer;I)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Void;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $successMessageStringRes:I
+
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    iput p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;->$successMessageStringRes:I
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Void;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;->invoke(Ljava/lang/Void;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/Void;)V
+    .locals 1
+
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;->$successMessageStringRes:I
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$3.smali
new file mode 100644
index 0000000000..c2166e324b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$3.smali
@@ -0,0 +1,75 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$3;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->addRelationship(Ljava/lang/Integer;I)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/error/Error;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/error/Error;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$3;->invoke(Lcom/discord/utilities/error/Error;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ: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}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const v0, 0x7f1204cc
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
new file mode 100644
index 0000000000..884f5a86a7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
@@ -0,0 +1,92 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->launchVideoCall()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TR;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1;->call(Ljava/lang/Long;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Ljava/lang/Long;)Lrx/Observable;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Long;",
+            ")",
+            "Lrx/Observable<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const-string v1, "userId"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v1
+
+    invoke-static {v0, v1, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$createPrivateChannelWithUser(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;J)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
new file mode 100644
index 0000000000..6ec9db6033
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
@@ -0,0 +1,77 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->launchVideoCall()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Long;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2;->invoke(Ljava/lang/Long;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/Long;)V
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const-string v1, "channelId"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v1
+
+    invoke-static {v0, v1, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitLaunchVideoCallEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$3.smali
new file mode 100644
index 0000000000..8f10ebafba
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$3.smali
@@ -0,0 +1,75 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$3;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->launchVideoCall()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/error/Error;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/error/Error;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$3;->invoke(Lcom/discord/utilities/error/Error;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ: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}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const v0, 0x7f1204cc
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
new file mode 100644
index 0000000000..0a9e7a3fda
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
@@ -0,0 +1,92 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->launchVoiceCall()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TR;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1;->call(Ljava/lang/Long;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Ljava/lang/Long;)Lrx/Observable;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Long;",
+            ")",
+            "Lrx/Observable<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const-string v1, "userId"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v1
+
+    invoke-static {v0, v1, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$createPrivateChannelWithUser(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;J)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
new file mode 100644
index 0000000000..1cac9a4b56
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
@@ -0,0 +1,77 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->launchVoiceCall()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Long;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2;->invoke(Ljava/lang/Long;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/Long;)V
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const-string v1, "channelId"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v1
+
+    invoke-static {v0, v1, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitLaunchVoiceCallEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$3.smali
new file mode 100644
index 0000000000..79d8c0eda6
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$3.smali
@@ -0,0 +1,75 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$3;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->launchVoiceCall()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/error/Error;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/error/Error;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$3;->invoke(Lcom/discord/utilities/error/Error;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ: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}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const v0, 0x7f1204cc
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreChunk$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreChunk$1.smali
new file mode 100644
index 0000000000..380421f4c7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreChunk$1.smali
@@ -0,0 +1,186 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreChunk$1;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Func9;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->observeStoreChunk(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    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;",
+        "T6:",
+        "Ljava/lang/Object;",
+        "T7:",
+        "Ljava/lang/Object;",
+        "T8:",
+        "Ljava/lang/Object;",
+        "T9:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func9<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;TR;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreChunk$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreChunk$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreChunk$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreChunk$1;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreChunk$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Integer;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;
+    .locals 11
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildRole;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelVoice$State;",
+            ">;",
+            "Ljava/lang/Boolean;",
+            "Ljava/lang/Integer;",
+            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+            "Lcom/discord/models/domain/ModelGuild;",
+            "Ljava/lang/Integer;",
+            "Lcom/discord/utilities/streams/StreamContext;",
+            ")",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;"
+        }
+    .end annotation
+
+    new-instance v10, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;
+
+    const-string v0, "computedMembers"
+
+    move-object v1, p1
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildRoles"
+
+    move-object v2, p2
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "voiceStates"
+
+    move-object v3, p3
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "muted"
+
+    move-object v4, p4
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v4
+
+    const-string v0, "outputVolume"
+
+    move-object/from16 v5, p5
+
+    invoke-static {v5, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p5 .. p5}, Ljava/lang/Integer;->intValue()I
+
+    move-result v5
+
+    move-object v0, v10
+
+    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/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZILcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;)V
+
+    return-object v10
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    check-cast p2, Ljava/util/Map;
+
+    check-cast p3, Ljava/util/Map;
+
+    check-cast p4, Ljava/lang/Boolean;
+
+    check-cast p5, Ljava/lang/Integer;
+
+    check-cast p6, Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    check-cast p7, Lcom/discord/models/domain/ModelGuild;
+
+    check-cast p8, Ljava/lang/Integer;
+
+    check-cast p9, Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-virtual/range {p0 .. p9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreChunk$1;->call(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Integer;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreState$1.smali
new file mode 100644
index 0000000000..b141a51f03
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreState$1.smali
@@ -0,0 +1,134 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreState$1;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Func3;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->observeStoreState(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    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<",
+        "TT1;TT2;TT3;TR;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreState$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreState$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreState$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreState$1;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreState$1;
+
+    return-void
+.end method
+
+.method 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/user/usersheet/WidgetUserSheetViewModel$StoreChunk;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+    .locals 13
+
+    new-instance v12, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->getComputedMembers()Ljava/util/Map;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->getGuildRoles()Ljava/util/Map;
+
+    move-result-object v2
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->getVoiceStates()Ljava/util/Map;
+
+    move-result-object v3
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->getMuted()Z
+
+    move-result v4
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->getOutputVolume()I
+
+    move-result v5
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->getRichPresence()Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    move-result-object v6
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+    move-result-object v7
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->getPermissions()Ljava/lang/Integer;
+
+    move-result-object v8
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+
+    move-result-object v9
+
+    const-string v0, "userProfile"
+
+    move-object v10, p2
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, v12
+
+    move-object/from16 v11, p3
+
+    invoke-direct/range {v0 .. v11}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZILcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;)V
+
+    return-object v12
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;
+
+    check-cast p2, Lcom/discord/models/domain/ModelUserProfile;
+
+    check-cast p3, Ljava/lang/Integer;
+
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreState$1;->call(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$1.smali
new file mode 100644
index 0000000000..3920b42107
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$1.smali
@@ -0,0 +1,96 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$1;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Func2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->observeViewStateFromStores()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    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/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$1;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final 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/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$1;->call(Ljava/lang/Long;Ljava/lang/Long;)Lkotlin/Pair;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Ljava/lang/Long;Ljava/lang/Long;)Lkotlin/Pair;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Long;",
+            "Ljava/lang/Long;",
+            ")",
+            "Lkotlin/Pair<",
+            "Ljava/lang/Long;",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .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/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$1.smali
similarity index 75%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$1.smali
index 112ea791fa..e1314ae79a 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2;
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$1;
 .super Ljava/lang/Object;
-.source "WidgetUserSheetModel.kt"
+.source "WidgetUserSheetViewModel.kt"
 
 # interfaces
 .implements Lrx/functions/Func2;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion;->get(JJ)Lrx/Observable;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;->call(Lkotlin/Pair;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,18 +33,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2;
+.field public static final INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2;
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2;
+    sput-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$1;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$1;
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     check-cast p2, Lcom/discord/models/domain/ModelUser;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$2;->call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)Lkotlin/Pair;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$1;->call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)Lkotlin/Pair;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2$$special$$inlined$let$lambda$1.smali
similarity index 52%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2$$special$$inlined$let$lambda$1.smali
index 23242dda5d..f9677d8b97 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2$$special$$inlined$let$lambda$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1;
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2$$special$$inlined$let$lambda$1;
 .super Ljava/lang/Object;
-.source "WidgetUserSheetModel.kt"
+.source "WidgetUserSheetViewModel.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;->call(Lkotlin/Pair;)Lrx/Observable;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;->call(Lkotlin/Pair;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -37,18 +37,18 @@
 
 .field final synthetic $user$inlined:Lcom/discord/models/domain/ModelUser;
 
-.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)V
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2$$special$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;
 
-    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1;->$user$inlined:Lcom/discord/models/domain/ModelUser;
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2$$special$$inlined$let$lambda$1;->$user$inlined:Lcom/discord/models/domain/ModelUser;
 
-    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1;->$me$inlined:Lcom/discord/models/domain/ModelUser;
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2$$special$$inlined$let$lambda$1;->$me$inlined:Lcom/discord/models/domain/ModelUser;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -62,7 +62,7 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1;->call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2$$special$$inlined$let$lambda$1;->call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
 
     move-result-object p1
 
@@ -77,36 +77,42 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ")",
             "Lrx/Observable<",
-            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;",
             ">;"
         }
     .end annotation
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2$$special$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;
 
-    iget-object v0, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3;->$get$1:Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;
+    iget-object v0, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1;->$user$inlined:Lcom/discord/models/domain/ModelUser;
+    iget-object v0, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$3$$special$$inlined$let$lambda$1;->$me$inlined:Lcom/discord/models/domain/ModelUser;
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2$$special$$inlined$let$lambda$1;->$user$inlined:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2$$special$$inlined$let$lambda$1;->$me$inlined:Lcom/discord/models/domain/ModelUser;
 
     const-string v3, "me"
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1, v2, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel$Companion$get$1;->invoke(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+    invoke-static {v0, v1, v2, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$observeViewStateFromUsersAndChannel(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
 
     move-result-object p1
 
     if-nez p1, :cond_1
 
     :cond_0
-    invoke-static {}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetModel;->access$getEMPTY$cp()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->JM()Lrx/Observable;
 
     move-result-object p1
 
+    const-string v0, "Observable.empty()"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     :cond_1
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2.smali
new file mode 100644
index 0000000000..806a661853
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2.smali
@@ -0,0 +1,140 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;->call(Lkotlin/Pair;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TR;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $channelId:Ljava/lang/Long;
+
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;Ljava/lang/Long;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;->$channelId:Ljava/lang/Long;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lkotlin/Pair;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;->call(Lkotlin/Pair;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lkotlin/Pair;)Lrx/Observable;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/Pair<",
+            "+",
+            "Lcom/discord/models/domain/ModelUser;",
+            "+",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;)",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p1, Lkotlin/Pair;->first:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/models/domain/ModelUser;
+
+    iget-object p1, p1, Lkotlin/Pair;->second:Ljava/lang/Object;
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    if-eqz v0, :cond_0
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;
+
+    iget-object v1, v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->getStoreChannels()Lcom/discord/stores/StoreChannels;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;->$channelId:Ljava/lang/Long;
+
+    const-string v3, "channelId"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v2
+
+    invoke-virtual {v1, v2, v3}, Lcom/discord/stores/StoreChannels;->get(J)Lrx/Observable;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2$$special$$inlined$let$lambda$1;
+
+    invoke-direct {v2, p0, v0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2$$special$$inlined$let$lambda$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)V
+
+    check-cast v2, Lrx/functions/b;
+
+    invoke-virtual {v1, v2}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    if-nez p1, :cond_1
+
+    :cond_0
+    invoke-static {}, Lrx/Observable;->JM()Lrx/Observable;
+
+    move-result-object p1
+
+    const-string v0, "Observable.empty()"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_1
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2.smali
new file mode 100644
index 0000000000..e46e93c17b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2.smali
@@ -0,0 +1,134 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->observeViewStateFromStores()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TR;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lkotlin/Pair;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;->call(Lkotlin/Pair;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lkotlin/Pair;)Lrx/Observable;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/Pair<",
+            "Ljava/lang/Long;",
+            "Ljava/lang/Long;",
+            ">;)",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p1, Lkotlin/Pair;->first:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/Long;
+
+    iget-object p1, p1, Lkotlin/Pair;->second:Ljava/lang/Object;
+
+    check-cast p1, Ljava/lang/Long;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->getStoreUser()Lcom/discord/stores/StoreUser;
+
+    move-result-object v1
+
+    const-string v2, "userId"
+
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v2
+
+    invoke-virtual {v1, v2, v3}, Lcom/discord/stores/StoreUser;->getUser(J)Lrx/Observable;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->getStoreUser()Lcom/discord/stores/StoreUser;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMe()Lrx/Observable;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$1;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$1;
+
+    check-cast v2, Lrx/functions/Func2;
+
+    invoke-static {v0, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;Ljava/lang/Long;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1.smali
new file mode 100644
index 0000000000..f7961b1aa7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1.smali
@@ -0,0 +1,371 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->observeViewStateFromUsersAndChannel(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
+
+.field final synthetic $me:Lcom/discord/models/domain/ModelUser;
+
+.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$me:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$user:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+    .locals 27
+
+    move-object/from16 v0, p0
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getComputedMembers()Ljava/util/Map;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getGuildRoles()Ljava/util/Map;
+
+    move-result-object v9
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+    move-result-object v10
+
+    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$me:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v2
+
+    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v4
+
+    const/4 v11, 0x1
+
+    const/4 v12, 0x0
+
+    cmp-long v6, v2, v4
+
+    if-nez v6, :cond_0
+
+    const/4 v15, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v15, 0x0
+
+    :goto_0
+    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()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 v2
+
+    check-cast v2, Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    iget-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$me:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
+
+    invoke-interface {v1, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    if-eqz v2, :cond_3
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_3
+
+    check-cast v3, Ljava/lang/Iterable;
+
+    new-instance v4, Ljava/util/ArrayList;
+
+    invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
+
+    check-cast v4, Ljava/util/Collection;
+
+    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
+
+    :cond_1
+    :goto_1
+    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
+
+    check-cast v5, Ljava/lang/Long;
+
+    invoke-interface {v9, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Lcom/discord/models/domain/ModelGuildRole;
+
+    if-eqz v5, :cond_1
+
+    invoke-interface {v4, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_2
+    check-cast v4, Ljava/util/List;
+
+    check-cast v4, Ljava/lang/Iterable;
+
+    invoke-static {v4}, Lkotlin/a/m;->p(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object v3
+
+    if-nez v3, :cond_4
+
+    :cond_3
+    sget-object v3, Lkotlin/a/y;->bko:Lkotlin/a/y;
+
+    check-cast v3, Ljava/util/List;
+
+    :cond_4
+    move-object/from16 v21, v3
+
+    const/4 v13, 0x0
+
+    if-eqz v2, :cond_6
+
+    if-eqz v1, :cond_6
+
+    if-nez v10, :cond_5
+
+    goto :goto_2
+
+    :cond_5
+    sget-object v3, Lcom/discord/utilities/permissions/ManageUserContext;->Companion:Lcom/discord/utilities/permissions/ManageUserContext$Companion;
+
+    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$me:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
+
+    move-result-object v1
+
+    const-string v6, "memberMe.roles"
+
+    invoke-static {v1, v6}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v6, v1
+
+    check-cast v6, Ljava/util/Collection;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
+
+    move-result-object v1
+
+    const-string v2, "member.roles"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v7, v1
+
+    check-cast v7, Ljava/util/Collection;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getPermissions()Ljava/lang/Integer;
+
+    move-result-object v8
+
+    move-object v2, v3
+
+    move-object v3, v10
+
+    invoke-virtual/range {v2 .. v9}, Lcom/discord/utilities/permissions/ManageUserContext$Companion;->from(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;Ljava/util/Collection;Ljava/lang/Integer;Ljava/util/Map;)Lcom/discord/utilities/permissions/ManageUserContext;
+
+    move-result-object v1
+
+    move-object/from16 v23, v1
+
+    goto :goto_3
+
+    :cond_6
+    :goto_2
+    move-object/from16 v23, v13
+
+    :goto_3
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getVoiceStates()Ljava/util/Map;
+
+    move-result-object v1
+
+    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()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
+
+    move-object/from16 v19, v1
+
+    check-cast v19, Lcom/discord/models/domain/ModelVoice$State;
+
+    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getOwnerId()J
+
+    move-result-wide v1
+
+    iget-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$me:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v3
+
+    cmp-long v5, v1, v3
+
+    if-nez v5, :cond_7
+
+    const/16 v16, 0x1
+
+    goto :goto_4
+
+    :cond_7
+    const/16 v16, 0x0
+
+    :goto_4
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getUserRelationshipType()Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-static {v1}, Lcom/discord/models/domain/ModelUserRelationship;->getType(Ljava/lang/Integer;)I
+
+    move-result v26
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+
+    iget-object v14, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getMuted()Z
+
+    move-result v17
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getOutputVolume()I
+
+    move-result v18
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getRichPresence()Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    move-result-object v20
+
+    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+
+    move-result-object v24
+
+    if-eqz v10, :cond_8
+
+    invoke-virtual {v10}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
+
+    move-result-object v3
+
+    move-object/from16 v25, v3
+
+    goto :goto_5
+
+    :cond_8
+    move-object/from16 v25, v13
+
+    :goto_5
+    move-object v13, v1
+
+    move-object/from16 v22, v2
+
+    invoke-direct/range {v13 .. v26}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;-><init>(Lcom/discord/models/domain/ModelUser;ZZZILcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/util/List;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/permissions/ManageUserContext;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;I)V
+
+    return-object v1
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;->call(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
new file mode 100644
index 0000000000..b722d7af5d
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
@@ -0,0 +1,98 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1;
+.super Ljava/lang/Object;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->removeRelationship(I)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TR;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1;->call(Ljava/lang/Long;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Ljava/lang/Long;)Lrx/Observable;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Long;",
+            ")",
+            "Lrx/Observable<",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->getRestAPI()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object v0
+
+    const-string v1, "userId"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v1
+
+    const-string p1, "User Profile"
+
+    invoke-virtual {v0, p1, v1, v2}, Lcom/discord/utilities/rest/RestAPI;->removeRelationship(Ljava/lang/String;J)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
new file mode 100644
index 0000000000..6a57a3f7e3
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
@@ -0,0 +1,75 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->removeRelationship(I)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Void;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $successMessageStringRes:I
+
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    iput p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2;->$successMessageStringRes:I
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Void;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2;->invoke(Ljava/lang/Void;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/Void;)V
+    .locals 1
+
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2;->$successMessageStringRes:I
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$3.smali
new file mode 100644
index 0000000000..28980f0ec0
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$3.smali
@@ -0,0 +1,75 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$3;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->removeRelationship(I)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/error/Error;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/error/Error;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$3;->invoke(Lcom/discord/utilities/error/Error;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ: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}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    const v0, 0x7f1204cc
+
+    invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
new file mode 100644
index 0000000000..b3e9799301
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
@@ -0,0 +1,1249 @@
+.class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+.super Lcom/discord/app/k;
+.source "WidgetUserSheetViewModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;,
+        Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;,
+        Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;,
+        Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;,
+        Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion;
+
+.field public static final LOCATION:Ljava/lang/String; = "User Profile"
+
+
+# instance fields
+.field private final channelIdSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final eventSubject:Lrx/subjects/PublishSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/PublishSubject<",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final restAPI:Lcom/discord/utilities/rest/RestAPI;
+
+.field private final storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+.field private final storeChannels:Lcom/discord/stores/StoreChannels;
+
+.field private final storeGuilds:Lcom/discord/stores/StoreGuilds;
+
+.field private final storeMediaSettings:Lcom/discord/stores/StoreMediaSettings;
+
+.field private final storePermissions:Lcom/discord/stores/StorePermissions;
+
+.field private final storeStateRxScheduler:Lrx/Scheduler;
+
+.field private final storeUser:Lcom/discord/stores/StoreUser;
+
+.field private final storeUserPresence:Lcom/discord/stores/StoreUserPresence;
+
+.field private final storeUserProfile:Lcom/discord/stores/StoreUserProfile;
+
+.field private final storeUserRelationships:Lcom/discord/stores/StoreUserRelationships;
+
+.field private final storeVoiceStates:Lcom/discord/stores/StoreVoiceStates;
+
+.field private final userIdSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final viewStateSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/utilities/rest/RestAPI;Lrx/Scheduler;)V
+    .locals 14
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    move-object/from16 v2, p2
+
+    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
+
+    move-object/from16 v12, p12
+
+    const-string v13, "storeGuilds"
+
+    invoke-static {p1, v13}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v13, "storeVoiceStates"
+
+    invoke-static {v2, v13}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v13, "storeMediaSettings"
+
+    invoke-static {v3, v13}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v13, "storeUserPresence"
+
+    invoke-static {v4, v13}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v13, "storePermissions"
+
+    invoke-static {v5, v13}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v13, "storeApplicationStreaming"
+
+    invoke-static {v6, v13}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v13, "storeUser"
+
+    invoke-static {v7, v13}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v13, "storeChannels"
+
+    invoke-static {v8, v13}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v13, "storeUserProfile"
+
+    invoke-static {v9, v13}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v13, "storeUserRelationships"
+
+    invoke-static {v10, v13}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v13, "restAPI"
+
+    invoke-static {v11, v13}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v13, "storeStateRxScheduler"
+
+    invoke-static {v12, v13}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lcom/discord/app/k;-><init>()V
+
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeGuilds:Lcom/discord/stores/StoreGuilds;
+
+    iput-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeVoiceStates:Lcom/discord/stores/StoreVoiceStates;
+
+    iput-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeMediaSettings:Lcom/discord/stores/StoreMediaSettings;
+
+    iput-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeUserPresence:Lcom/discord/stores/StoreUserPresence;
+
+    iput-object v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storePermissions:Lcom/discord/stores/StorePermissions;
+
+    iput-object v6, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    iput-object v7, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeUser:Lcom/discord/stores/StoreUser;
+
+    iput-object v8, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeChannels:Lcom/discord/stores/StoreChannels;
+
+    iput-object v9, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeUserProfile:Lcom/discord/stores/StoreUserProfile;
+
+    iput-object v10, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeUserRelationships:Lcom/discord/stores/StoreUserRelationships;
+
+    iput-object v11, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+
+    iput-object v12, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeStateRxScheduler:Lrx/Scheduler;
+
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->userIdSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->channelIdSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-static {}, Lrx/subjects/PublishSubject;->Lx()Lrx/subjects/PublishSubject;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->observeViewStateFromStores()Lrx/Observable;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lrx/Observable;->JO()Lrx/Observable;
+
+    move-result-object v1
+
+    const-string v2, "observeViewStateFromStor\u2026  .distinctUntilChanged()"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v2, v0
+
+    check-cast v2, Lcom/discord/app/AppComponent;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x2
+
+    invoke-static {v1, v2, v3, v4, 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 v1
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;
+
+    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-direct {v3, v4}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;-><init>(Lrx/subjects/BehaviorSubject;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/16 v8, 0x1e
+
+    const/4 v9, 0x0
+
+    move-object p1, v1
+
+    move-object/from16 p2, v2
+
+    move-object/from16 p3, v4
+
+    move-object/from16 p4, v5
+
+    move-object/from16 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
+.end method
+
+.method public static final synthetic access$createPrivateChannelWithUser(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;J)Lrx/Observable;
+    .locals 0
+
+    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->createPrivateChannelWithUser(J)Lrx/Observable;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$emitLaunchVideoCallEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;J)V
+    .locals 0
+
+    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->emitLaunchVideoCallEvent(J)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$emitLaunchVoiceCallEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;J)V
+    .locals 0
+
+    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->emitLaunchVoiceCallEvent(J)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->emitShowToastEvent(I)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$observeViewStateFromUsersAndChannel(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+    .locals 0
+
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->observeViewStateFromUsersAndChannel(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method private final createPrivateChannelWithUser(J)Lrx/Observable;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(J)",
+            "Lrx/Observable<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeChannels:Lcom/discord/stores/StoreChannels;
+
+    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreChannels;->createPrivateChannel(J)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method private final emitLaunchVideoCallEvent(J)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;
+
+    invoke-direct {v1, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall;-><init>(J)V
+
+    invoke-virtual {v0, v1}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method private final emitLaunchVoiceCallEvent(J)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;
+
+    invoke-direct {v1, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall;-><init>(J)V
+
+    invoke-virtual {v0, v1}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method private final emitShowToastEvent(I)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;
+
+    invoke-direct {v1, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast;-><init>(I)V
+
+    invoke-virtual {v0, v1}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method private final observeStoreChunk(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+    .locals 18
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/models/domain/ModelChannel;",
+            ")",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreChunk;",
+            ">;"
+        }
+    .end annotation
+
+    move-object/from16 v0, p0
+
+    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeGuilds:Lcom/discord/stores/StoreGuilds;
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v2
+
+    const-string v3, "channel.guildId"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v4
+
+    const/4 v2, 0x2
+
+    new-array v2, v2, [Ljava/lang/Long;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v6
+
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v6
+
+    const/4 v7, 0x0
+
+    aput-object v6, v2, v7
+
+    invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v6
+
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v6
+
+    const/4 v7, 0x1
+
+    aput-object v6, v2, v7
+
+    invoke-static {v2}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/util/Collection;
+
+    invoke-virtual {v1, v4, v5, v2}, Lcom/discord/stores/StoreGuilds;->getComputed(JLjava/util/Collection;)Lrx/Observable;
+
+    move-result-object v8
+
+    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeGuilds:Lcom/discord/stores/StoreGuilds;
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v4
+
+    invoke-virtual {v1, v4, v5}, Lcom/discord/stores/StoreGuilds;->getRoles(J)Lrx/Observable;
+
+    move-result-object v9
+
+    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeVoiceStates:Lcom/discord/stores/StoreVoiceStates;
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v4
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v10
+
+    invoke-virtual {v1, v4, v5, v10, v11}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable;
+
+    move-result-object v10
+
+    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeMediaSettings:Lcom/discord/stores/StoreMediaSettings;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v4
+
+    invoke-virtual {v1, v4, v5}, Lcom/discord/stores/StoreMediaSettings;->getUserMuted(J)Lrx/Observable;
+
+    move-result-object v11
+
+    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeMediaSettings:Lcom/discord/stores/StoreMediaSettings;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v4
+
+    invoke-virtual {v1, v4, v5}, Lcom/discord/stores/StoreMediaSettings;->getUserOutputVolume(J)Lrx/Observable;
+
+    move-result-object v12
+
+    sget-object v1, Lcom/discord/widgets/user/presence/ModelRichPresence;->Companion:Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v4
+
+    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeUserPresence:Lcom/discord/stores/StoreUserPresence;
+
+    invoke-virtual {v1, v4, v5, v2}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;->get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
+
+    move-result-object v13
+
+    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeGuilds:Lcom/discord/stores/StoreGuilds;
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v4
+
+    invoke-virtual {v1, v4, v5}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable;
+
+    move-result-object v14
+
+    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storePermissions:Lcom/discord/stores/StorePermissions;
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v2
+
+    invoke-virtual {v1, v2, v3}, Lcom/discord/stores/StorePermissions;->getForGuild(J)Lrx/Observable;
+
+    move-result-object v15
+
+    sget-object v1, Lcom/discord/utilities/streams/StreamContext;->Companion:Lcom/discord/utilities/streams/StreamContext$Companion;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v2
+
+    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-virtual {v1, v2, v3, v7, v4}, Lcom/discord/utilities/streams/StreamContext$Companion;->get(JZLcom/discord/stores/StoreApplicationStreaming;)Lrx/Observable;
+
+    move-result-object v16
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreChunk$1;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreChunk$1;
+
+    move-object/from16 v17, v1
+
+    check-cast v17, Lrx/functions/Func9;
+
+    invoke-static/range {v8 .. v17}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func9;)Lrx/Observable;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/utilities/rx/LeadingEdgeThrottle;
+
+    sget-object v3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeStateRxScheduler:Lrx/Scheduler;
+
+    const-wide/16 v5, 0xfa
+
+    invoke-direct {v2, v5, v6, v3, v4}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
+
+    check-cast v2, Lrx/Observable$b;
+
+    invoke-virtual {v1, v2}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
+
+    move-result-object v1
+
+    const-string v2, "Observable.combineLatest\u2026, storeStateRxScheduler))"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v1
+.end method
+
+.method private final observeStoreState(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/models/domain/ModelChannel;",
+            ")",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;",
+            ">;"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->observeStoreChunk(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+
+    move-result-object p2
+
+    iget-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeUserProfile:Lcom/discord/stores/StoreUserProfile;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v0
+
+    invoke-virtual {p3, v0, v1}, Lcom/discord/stores/StoreUserProfile;->get(J)Lrx/Observable;
+
+    move-result-object p3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeUserRelationships:Lcom/discord/stores/StoreUserRelationships;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v1
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/stores/StoreUserRelationships;->get(J)Lrx/Observable;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreState$1;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeStoreState$1;
+
+    check-cast v0, Lrx/functions/Func3;
+
+    invoke-static {p2, p3, p1, v0}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string p2, "Observable\n        .comb\u2026lationshipType)\n        }"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method private final observeViewStateFromStores()Lrx/Observable;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->userIdSubject:Lrx/subjects/BehaviorSubject;
+
+    check-cast v0, Lrx/Observable;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->channelIdSubject:Lrx/subjects/BehaviorSubject;
+
+    check-cast v1, Lrx/Observable;
+
+    sget-object v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$1;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$1;
+
+    check-cast v2, Lrx/functions/Func2;
+
+    invoke-static {v0, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromStores$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "Observable.combineLatest\u2026              }\n        }"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "Observable.combineLatest\u2026  .distinctUntilChanged()"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method private final observeViewStateFromUsersAndChannel(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/models/domain/ModelChannel;",
+            ")",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;",
+            ">;"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->observeStoreState(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;
+
+    invoke-direct {v1, p2, p1, p3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$observeViewStateFromUsersAndChannel$1;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string p2, "observeStoreState(user, \u2026lationshipType)\n        }"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+
+# virtual methods
+.method public final addRelationship(Ljava/lang/Integer;I)V
+    .locals 12
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->userIdSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JP()Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;Ljava/lang/Integer;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->c(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string v0, "userIdSubject.first().fl\u2026TION, userId, type)\n    }"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    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;
+
+    move-result-object p1
+
+    move-object v1, p0
+
+    check-cast v1, Lcom/discord/app/AppComponent;
+
+    const/4 v2, 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;
+
+    move-result-object v3
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v4
+
+    new-instance p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;
+
+    invoke-direct {p1, p0, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
+
+    move-object v9, p1
+
+    check-cast v9, Lkotlin/jvm/functions/Function1;
+
+    new-instance p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$3;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+
+    move-object v7, p1
+
+    check-cast v7, Lkotlin/jvm/functions/Function1;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v8, 0x0
+
+    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
+
+    return-void
+.end method
+
+.method public final getRestAPI()Lcom/discord/utilities/rest/RestAPI;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+
+    return-object v0
+.end method
+
+.method public final getStoreApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    return-object v0
+.end method
+
+.method public final getStoreChannels()Lcom/discord/stores/StoreChannels;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeChannels:Lcom/discord/stores/StoreChannels;
+
+    return-object v0
+.end method
+
+.method public final getStoreGuilds()Lcom/discord/stores/StoreGuilds;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeGuilds:Lcom/discord/stores/StoreGuilds;
+
+    return-object v0
+.end method
+
+.method public final getStoreMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeMediaSettings:Lcom/discord/stores/StoreMediaSettings;
+
+    return-object v0
+.end method
+
+.method public final getStorePermissions()Lcom/discord/stores/StorePermissions;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storePermissions:Lcom/discord/stores/StorePermissions;
+
+    return-object v0
+.end method
+
+.method public final getStoreStateRxScheduler()Lrx/Scheduler;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeStateRxScheduler:Lrx/Scheduler;
+
+    return-object v0
+.end method
+
+.method public final getStoreUser()Lcom/discord/stores/StoreUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeUser:Lcom/discord/stores/StoreUser;
+
+    return-object v0
+.end method
+
+.method public final getStoreUserPresence()Lcom/discord/stores/StoreUserPresence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeUserPresence:Lcom/discord/stores/StoreUserPresence;
+
+    return-object v0
+.end method
+
+.method public final getStoreUserProfile()Lcom/discord/stores/StoreUserProfile;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeUserProfile:Lcom/discord/stores/StoreUserProfile;
+
+    return-object v0
+.end method
+
+.method public final getStoreUserRelationships()Lcom/discord/stores/StoreUserRelationships;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeUserRelationships:Lcom/discord/stores/StoreUserRelationships;
+
+    return-object v0
+.end method
+
+.method public final getStoreVoiceStates()Lcom/discord/stores/StoreVoiceStates;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeVoiceStates:Lcom/discord/stores/StoreVoiceStates;
+
+    return-object v0
+.end method
+
+.method public final launchVideoCall()V
+    .locals 13
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->userIdSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JP()Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->c(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "userIdSubject.first().fl\u2026nelWithUser(userId)\n    }"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v1, 0x0
+
+    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
+
+    move-object v2, p0
+
+    check-cast v2, Lcom/discord/app/AppComponent;
+
+    const/4 v3, 0x2
+
+    invoke-static {v0, v2, 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
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v5
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+
+    move-object v10, v0
+
+    check-cast v10, Lkotlin/jvm/functions/Function1;
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$3;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+
+    move-object v8, v0
+
+    check-cast v8, Lkotlin/jvm/functions/Function1;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v9, 0x0
+
+    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
+
+    return-void
+.end method
+
+.method public final launchVoiceCall()V
+    .locals 13
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->userIdSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JP()Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->c(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "userIdSubject.first().fl\u2026nelWithUser(userId)\n    }"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v1, 0x0
+
+    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
+
+    move-object v2, p0
+
+    check-cast v2, Lcom/discord/app/AppComponent;
+
+    const/4 v3, 0x2
+
+    invoke-static {v0, v2, 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
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v5
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+
+    move-object v10, v0
+
+    check-cast v10, Lkotlin/jvm/functions/Function1;
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$3;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+
+    move-object v8, v0
+
+    check-cast v8, Lkotlin/jvm/functions/Function1;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v9, 0x0
+
+    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
+
+    return-void
+.end method
+
+.method public final observeEvents()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+
+    const-string v1, "eventSubject"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lrx/Observable;
+
+    return-object v0
+.end method
+
+.method public final observeViewState()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    const-string v1, "viewStateSubject"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lrx/Observable;
+
+    return-object v0
+.end method
+
+.method public final removeRelationship(I)V
+    .locals 13
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->userIdSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->JP()Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->c(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "userIdSubject.first().fl\u2026p(LOCATION, userId)\n    }"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v1, 0x0
+
+    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
+
+    move-object v2, p0
+
+    check-cast v2, Lcom/discord/app/AppComponent;
+
+    const/4 v3, 0x2
+
+    invoke-static {v0, v2, 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
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v5
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2;
+
+    invoke-direct {v0, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
+
+    move-object v10, v0
+
+    check-cast v10, Lkotlin/jvm/functions/Function1;
+
+    new-instance p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$3;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+
+    move-object v8, p1
+
+    check-cast v8, Lkotlin/jvm/functions/Function1;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v9, 0x0
+
+    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
+
+    return-void
+.end method
+
+.method public final updateChannelId(J)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->channelIdSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public final updateUserId(J)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->userIdSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2.smali
deleted file mode 100644
index 3804a2cda0..0000000000
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2.smali
+++ /dev/null
@@ -1,175 +0,0 @@
-.class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2;
-.super Ljava/lang/Object;
-.source "WidgetPrivateCall.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/call/WidgetPrivateCall;->configureActionBar(Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Landroid/view/Menu;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic $callModel:Lcom/discord/widgets/voice/model/CallModel;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/voice/model/CallModel;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Landroid/view/Menu;)V
-    .locals 4
-
-    const v0, 0x7f0a045d
-
-    invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
-
-    move-result-object v0
-
-    const-string v1, "it.findItem(R.id.menu_private_call_select_camera)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->getSelectedVideoDevice()Lco/discord/media_engine/VideoInputDeviceDescription;
-
-    move-result-object v1
-
-    const/4 v2, 0x1
-
-    if-eqz v1, :cond_0
-
-    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->getVideoDevices()Ljava/util/List;
-
-    move-result-object v1
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    const/4 v3, 0x2
-
-    if-lt v1, v3, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    invoke-interface {v0, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
-
-    const v0, 0x7f0a045e
-
-    invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
-
-    move-result-object v0
-
-    const-string v1, "it.findItem(R.id.menu_private_call_user_settings)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
-
-    move-result v1
-
-    xor-int/2addr v1, v2
-
-    invoke-interface {v0, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
-
-    const v0, 0x7f0a045c
-
-    invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
-
-    move-result-object v0
-
-    const-string v1, "it.findItem(R.id.menu_private_call_participants)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
-
-    move-result v1
-
-    invoke-interface {v0, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
-
-    const v0, 0x7f0a045b
-
-    invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
-
-    move-result-object p1
-
-    const-string v0, "it.findItem(R.id.menu_private_call_group_settings)"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
-
-    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;->isMultiUserDM()Z
-
-    move-result v0
-
-    invoke-interface {p1, v0}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
-
-    return-void
-.end method
-
-.method public final bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Landroid/view/Menu;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2;->call(Landroid/view/Menu;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali
deleted file mode 100644
index 0d9e0e13f2..0000000000
--- a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali
+++ /dev/null
@@ -1,214 +0,0 @@
-.class final synthetic Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;
-.super Lkotlin/jvm/internal/j;
-.source "CallModel.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function9;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;->call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1018
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/j;",
-        "Lkotlin/jvm/functions/Function9<",
-        "Lcom/discord/models/domain/ModelChannel;",
-        "Ljava/lang/Long;",
-        "Ljava/lang/Long;",
-        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
-        "Ljava/util/Map<",
-        "Ljava/lang/Long;",
-        "+",
-        "Lcom/discord/models/domain/ModelVoice$User;",
-        ">;",
-        "Ljava/lang/Integer;",
-        "Ljava/util/List<",
-        "+",
-        "Lco/discord/media_engine/VideoInputDeviceDescription;",
-        ">;",
-        "Lco/discord/media_engine/VideoInputDeviceDescription;",
-        "Ljava/lang/Boolean;",
-        "Lcom/discord/widgets/voice/model/CallModel;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/voice/model/CallModel$Companion;)V
-    .locals 1
-
-    const/16 v0, 0x9
-
-    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)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/voice/model/CallModel$Companion;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/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/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Z)Lcom/discord/widgets/voice/model/CallModel;"
-
-    return-object v0
-.end method
-
-.method public final invoke(Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Z)Lcom/discord/widgets/voice/model/CallModel;
-    .locals 13
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/models/domain/ModelChannel;",
-            "JJ",
-            "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
-            "Ljava/util/Map<",
-            "Ljava/lang/Long;",
-            "+",
-            "Lcom/discord/models/domain/ModelVoice$User;",
-            ">;",
-            "Ljava/lang/Integer;",
-            "Ljava/util/List<",
-            "Lco/discord/media_engine/VideoInputDeviceDescription;",
-            ">;",
-            "Lco/discord/media_engine/VideoInputDeviceDescription;",
-            "Z)",
-            "Lcom/discord/widgets/voice/model/CallModel;"
-        }
-    .end annotation
-
-    const-string v0, "p1"
-
-    move-object v2, p1
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p4"
-
-    move-object/from16 v7, p6
-
-    invoke-static {v7, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p5"
-
-    move-object/from16 v8, p7
-
-    invoke-static {v8, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p7"
-
-    move-object/from16 v10, p9
-
-    invoke-static {v10, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v0, p0
-
-    iget-object v1, v0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;->receiver:Ljava/lang/Object;
-
-    check-cast v1, Lcom/discord/widgets/voice/model/CallModel$Companion;
-
-    move-wide v3, p2
-
-    move-wide/from16 v5, p4
-
-    move-object/from16 v9, p8
-
-    move-object/from16 v11, p10
-
-    move/from16 v12, p11
-
-    invoke-static/range {v1 .. v12}, Lcom/discord/widgets/voice/model/CallModel$Companion;->access$create(Lcom/discord/widgets/voice/model/CallModel$Companion;Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Z)Lcom/discord/widgets/voice/model/CallModel;
-
-    move-result-object v1
-
-    return-object v1
-.end method
-
-.method public final 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;
-    .locals 12
-
-    move-object v1, p1
-
-    check-cast v1, Lcom/discord/models/domain/ModelChannel;
-
-    move-object v0, p2
-
-    check-cast v0, Ljava/lang/Number;
-
-    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v2
-
-    move-object v0, p3
-
-    check-cast v0, Ljava/lang/Number;
-
-    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v4
-
-    move-object/from16 v6, p4
-
-    check-cast v6, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    move-object/from16 v7, p5
-
-    check-cast v7, Ljava/util/Map;
-
-    move-object/from16 v8, p6
-
-    check-cast v8, Ljava/lang/Integer;
-
-    move-object/from16 v9, p7
-
-    check-cast v9, Ljava/util/List;
-
-    move-object/from16 v10, p8
-
-    check-cast v10, Lco/discord/media_engine/VideoInputDeviceDescription;
-
-    move-object/from16 v0, p9
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v11
-
-    move-object v0, p0
-
-    invoke-virtual/range {v0 .. v11}, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;->invoke(Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Z)Lcom/discord/widgets/voice/model/CallModel;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali b/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali
deleted file mode 100644
index 17c00c77a4..0000000000
--- a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali
+++ /dev/null
@@ -1,403 +0,0 @@
-.class public final Lcom/discord/widgets/voice/model/CallModel$Companion;
-.super Ljava/lang/Object;
-.source "CallModel.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/voice/model/CallModel;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Companion"
-.end annotation
-
-
-# direct methods
-.method private 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/voice/model/CallModel$Companion;-><init>()V
-
-    return-void
-.end method
-
-.method public static final synthetic access$create(Lcom/discord/widgets/voice/model/CallModel$Companion;Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Z)Lcom/discord/widgets/voice/model/CallModel;
-    .locals 0
-
-    invoke-direct/range {p0 .. p11}, Lcom/discord/widgets/voice/model/CallModel$Companion;->create(Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Z)Lcom/discord/widgets/voice/model/CallModel;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method private final create(Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Z)Lcom/discord/widgets/voice/model/CallModel;
-    .locals 17
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/models/domain/ModelChannel;",
-            "JJ",
-            "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
-            "Ljava/util/Map<",
-            "Ljava/lang/Long;",
-            "+",
-            "Lcom/discord/models/domain/ModelVoice$User;",
-            ">;",
-            "Ljava/lang/Integer;",
-            "Ljava/util/List<",
-            "Lco/discord/media_engine/VideoInputDeviceDescription;",
-            ">;",
-            "Lco/discord/media_engine/VideoInputDeviceDescription;",
-            "Z)",
-            "Lcom/discord/widgets/voice/model/CallModel;"
-        }
-    .end annotation
-
-    invoke-interface/range {p7 .. p7}, Ljava/util/Map;->isEmpty()Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    const/4 v15, 0x0
-
-    goto :goto_1
-
-    :cond_0
-    invoke-interface/range {p7 .. p7}, Ljava/util/Map;->entrySet()Ljava/util/Set;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :cond_1
-    :goto_0
-    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/util/Map$Entry;
-
-    invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lcom/discord/models/domain/ModelVoice$User;
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    move v15, v1
-
-    :goto_1
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    new-instance v2, Ljava/util/ArrayList;
-
-    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
-
-    move-result v3
-
-    const/4 v4, 0x1
-
-    if-eq v3, v4, :cond_7
-
-    invoke-interface/range {p7 .. p7}, Ljava/util/Map;->values()Ljava/util/Collection;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/Iterable;
-
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    :goto_2
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_4
-
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Lcom/discord/models/domain/ModelVoice$User;
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_3
-
-    invoke-virtual {v0, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_3
-    invoke-virtual {v1, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_4
-    move-object v3, v0
-
-    check-cast v3, Ljava/util/Collection;
-
-    invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v3
-
-    xor-int/2addr v3, v4
-
-    if-eqz v3, :cond_5
-
-    new-instance v3, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;
-
-    const v4, 0x7f120972
-
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v4
-
-    invoke-direct {v3, v4}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;-><init>(Ljava/lang/Integer;)V
-
-    invoke-virtual {v2, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    move-object v3, v0
-
-    check-cast v3, Ljava/lang/Iterable;
-
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    :goto_3
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_5
-
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    move-object v5, v2
-
-    check-cast v5, Ljava/util/Collection;
-
-    check-cast v4, Lcom/discord/models/domain/ModelVoice$User;
-
-    new-instance v6, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
-
-    invoke-direct {v6, v4}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;-><init>(Lcom/discord/models/domain/ModelVoice$User;)V
-
-    invoke-interface {v5, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_3
-
-    :cond_5
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
-
-    move-result v3
-
-    const/4 v4, 0x2
-
-    if-eq v3, v4, :cond_7
-
-    invoke-virtual {v1}, Ljava/util/ArrayList;->isEmpty()Z
-
-    move-result v3
-
-    if-nez v3, :cond_6
-
-    invoke-virtual {v0}, Ljava/util/ArrayList;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_6
-
-    new-instance v0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider;
-
-    invoke-direct {v0}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider;-><init>()V
-
-    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_6
-    invoke-virtual {v1}, Ljava/util/ArrayList;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_7
-
-    new-instance v0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;
-
-    const v3, 0x7f120bea
-
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v3
-
-    invoke-direct {v0, v3}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;-><init>(Ljava/lang/Integer;)V
-
-    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    check-cast v1, Ljava/lang/Iterable;
-
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_4
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_7
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    move-object v3, v2
-
-    check-cast v3, Ljava/util/Collection;
-
-    check-cast v1, Lcom/discord/models/domain/ModelVoice$User;
-
-    new-instance v4, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
-
-    invoke-direct {v4, v1}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;-><init>(Lcom/discord/models/domain/ModelVoice$User;)V
-
-    invoke-interface {v3, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_4
-
-    :cond_7
-    new-instance v0, Lcom/discord/widgets/voice/model/CallModel;
-
-    move-object v3, v2
-
-    check-cast v3, Ljava/util/List;
-
-    invoke-virtual/range {p6 .. p6}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
-
-    move-result-object v13
-
-    invoke-virtual/range {p6 .. p6}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getOutputMode()Lcom/discord/models/domain/ModelVoice$OutputMode;
-
-    move-result-object v14
-
-    move-object v2, v0
-
-    move-object/from16 v4, p7
-
-    move-wide/from16 v5, p2
-
-    move-wide/from16 v7, p4
-
-    move-object/from16 v9, p9
-
-    move-object/from16 v10, p10
-
-    move/from16 v11, p11
-
-    move-object/from16 v12, p1
-
-    move-object/from16 v16, p8
-
-    invoke-direct/range {v2 .. v16}, Lcom/discord/widgets/voice/model/CallModel;-><init>(Ljava/util/List;Ljava/util/Map;JJLjava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;ZLcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;ILjava/lang/Integer;)V
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public final get(J)Lrx/Observable;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(J)",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/voice/model/CallModel;",
-            ">;"
-        }
-    .end annotation
-
-    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 v0
-
-    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreChannels;->get(J)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;
-
-    invoke-direct {v1, p1, p2}, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;-><init>(J)V
-
-    check-cast v1, Lrx/functions/b;
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object p1
-
-    const-string p2, "StoreStream\n          .g\u2026            }\n          }"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(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;->Kb()Lrx/Observable;
-
-    move-result-object p1
-
-    const-string p2, "StoreStream\n          .g\u2026  .distinctUntilChanged()"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0.smali b/com.discord/smali/com/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0.smali
deleted file mode 100644
index d5505a68a1..0000000000
--- a/com.discord/smali/com/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0.smali
+++ /dev/null
@@ -1,56 +0,0 @@
-.class final Lcom/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0;
-.super Ljava/lang/Object;
-.source "CallModel.kt"
-
-# interfaces
-.implements Lrx/functions/Func9;
-
-
-# instance fields
-.field private final synthetic function:Lkotlin/jvm/functions/Function9;
-
-
-# direct methods
-.method constructor <init>(Lkotlin/jvm/functions/Function9;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0;->function:Lkotlin/jvm/functions/Function9;
-
-    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;)Ljava/lang/Object;
-    .locals 11
-
-    move-object v0, p0
-
-    iget-object v1, v0, Lcom/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0;->function:Lkotlin/jvm/functions/Function9;
-
-    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-interface/range {v1 .. v10}, Lkotlin/jvm/functions/Function9;->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;
-
-    move-result-object v1
-
-    return-object v1
-.end method
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Kryo.smali b/com.discord/smali/com/esotericsoftware/kryo/Kryo.smali
index 2bb8f495e0..b644c11686 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/Kryo.smali
+++ b/com.discord/smali/com/esotericsoftware/kryo/Kryo.smali
@@ -911,7 +911,7 @@
     invoke-virtual {p0, p1}, Lcom/esotericsoftware/kryo/Kryo;->reference(Ljava/lang/Object;)V
 
     :cond_7
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez v0, :cond_8
 
@@ -1064,7 +1064,7 @@
     invoke-virtual {p0, p1}, Lcom/esotericsoftware/kryo/Kryo;->reference(Ljava/lang/Object;)V
 
     :cond_7
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez p2, :cond_8
 
@@ -1222,7 +1222,7 @@
     invoke-virtual {p0, p1}, Lcom/esotericsoftware/kryo/Kryo;->reference(Ljava/lang/Object;)V
 
     :cond_6
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez v2, :cond_7
 
@@ -1378,7 +1378,7 @@
     invoke-virtual {p0, p1}, Lcom/esotericsoftware/kryo/Kryo;->reference(Ljava/lang/Object;)V
 
     :cond_6
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez p2, :cond_7
 
@@ -1829,7 +1829,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/esotericsoftware/a/a;->al(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/esotericsoftware/a/a;->ah(Ljava/lang/String;)V
 
     :cond_4
     iget-object v0, p0, Lcom/esotericsoftware/kryo/Kryo;->classResolver:Lcom/esotericsoftware/kryo/ClassResolver;
@@ -2221,7 +2221,7 @@
 
     :cond_5
     :goto_0
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez v1, :cond_6
 
@@ -2384,7 +2384,7 @@
 
     :cond_3
     :goto_0
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez p2, :cond_4
 
@@ -2544,7 +2544,7 @@
 
     :cond_3
     :goto_0
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez p2, :cond_4
 
@@ -2734,7 +2734,7 @@
 
     if-nez v3, :cond_6
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->EN:Z
 
     const/4 p2, 0x0
 
@@ -2779,7 +2779,7 @@
 
     :cond_7
     :goto_0
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez p2, :cond_8
 
@@ -2946,7 +2946,7 @@
 
     if-nez v1, :cond_6
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->EN:Z
 
     const/4 p2, 0x0
 
@@ -2991,7 +2991,7 @@
 
     :cond_7
     :goto_0
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez p2, :cond_8
 
@@ -3108,7 +3108,7 @@
 
     if-nez p1, :cond_3
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->EN:Z
 
     const/4 p2, 0x0
 
@@ -3176,7 +3176,7 @@
 
     move-result p1
 
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v1, :cond_7
 
@@ -3561,7 +3561,7 @@
     invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/util/IdentityMap;->clear(I)V
 
     :cond_2
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_3
 
@@ -3711,7 +3711,7 @@
 
     iput-object p1, p0, Lcom/esotericsoftware/kryo/Kryo;->referenceResolver:Lcom/esotericsoftware/kryo/ReferenceResolver;
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -3777,7 +3777,7 @@
     iput-object v0, p0, Lcom/esotericsoftware/kryo/Kryo;->referenceResolver:Lcom/esotericsoftware/kryo/ReferenceResolver;
 
     :cond_1
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_2
 
@@ -3813,7 +3813,7 @@
 
     iput-boolean p1, p0, Lcom/esotericsoftware/kryo/Kryo;->registrationRequired:Z
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -3848,7 +3848,7 @@
 
     iput-boolean p1, p0, Lcom/esotericsoftware/kryo/Kryo;->warnUnregisteredClasses:Z
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -4043,7 +4043,7 @@
 
     :cond_3
     :try_start_2
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez v0, :cond_4
 
@@ -4177,7 +4177,7 @@
 
     :cond_1
     :try_start_1
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez v1, :cond_2
 
@@ -4318,7 +4318,7 @@
 
     :cond_1
     :try_start_1
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez v1, :cond_2
 
@@ -4465,7 +4465,7 @@
 
     if-nez p2, :cond_5
 
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez p2, :cond_2
 
@@ -4509,7 +4509,7 @@
     invoke-virtual {p1, v0}, Lcom/esotericsoftware/kryo/io/Output;->writeByte(B)V
 
     :cond_6
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez v1, :cond_7
 
@@ -4651,7 +4651,7 @@
 
     if-nez p2, :cond_5
 
-    sget-boolean p3, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez p3, :cond_2
 
@@ -4695,7 +4695,7 @@
     invoke-virtual {p1, v0}, Lcom/esotericsoftware/kryo/io/Output;->writeByte(B)V
 
     :cond_6
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez v1, :cond_7
 
@@ -4771,7 +4771,7 @@
 
     if-nez p2, :cond_2
 
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-nez p2, :cond_0
 
@@ -4872,7 +4872,7 @@
 
     invoke-virtual {p1, v1, v1}, Lcom/esotericsoftware/kryo/io/Output;->writeVarInt(IZ)I
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz p1, :cond_7
 
diff --git a/com.discord/smali/com/facebook/b/a.smali b/com.discord/smali/com/facebook/b/a.smali
index cb60e84927..8bb65fc0e9 100644
--- a/com.discord/smali/com/facebook/b/a.smali
+++ b/com.discord/smali/com/facebook/b/a.smali
@@ -26,9 +26,11 @@
 
 
 # instance fields
-.field private HR:I
+.field private Hs:Z
 
-.field private HS:Ljava/lang/Object;
+.field private Ii:I
+
+.field private Ij:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -39,9 +41,9 @@
     .end annotation
 .end field
 
-.field private HT:Ljava/lang/Throwable;
+.field private Ik:Ljava/lang/Throwable;
 
-.field private final HU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field private final Il:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -54,8 +56,6 @@
     .end annotation
 .end field
 
-.field private Hb:Z
-
 .field private mProgress:F
 
 
@@ -67,9 +67,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/b/a;->HS:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/facebook/b/a;->Ij:Ljava/lang/Object;
 
-    iput-object v0, p0, Lcom/facebook/b/a;->HT:Ljava/lang/Throwable;
+    iput-object v0, p0, Lcom/facebook/b/a;->Ik:Ljava/lang/Throwable;
 
     const/4 v0, 0x0
 
@@ -77,17 +77,17 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/b/a;->Hb:Z
+    iput-boolean v0, p0, Lcom/facebook/b/a;->Hs:Z
 
-    sget v0, Lcom/facebook/b/a$a;->Ia:I
+    sget v0, Lcom/facebook/b/a$a;->Ir:I
 
-    iput v0, p0, Lcom/facebook/b/a;->HR:I
+    iput v0, p0, Lcom/facebook/b/a;->Ii:I
 
     new-instance v0, Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/b/a;->HU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object v0, p0, Lcom/facebook/b/a;->Il:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     return-void
 .end method
@@ -133,13 +133,13 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
     :try_start_1
-    iget-boolean v1, p0, Lcom/facebook/b/a;->Hb:Z
+    iget-boolean v1, p0, Lcom/facebook/b/a;->Hs:Z
 
     if-nez v1, :cond_4
 
-    iget v1, p0, Lcom/facebook/b/a;->HR:I
+    iget v1, p0, Lcom/facebook/b/a;->Ii:I
 
-    sget v2, Lcom/facebook/b/a$a;->Ia:I
+    sget v2, Lcom/facebook/b/a$a;->Ir:I
 
     if-eq v1, v2, :cond_0
 
@@ -148,25 +148,25 @@
     :cond_0
     if-eqz p2, :cond_1
 
-    sget p2, Lcom/facebook/b/a$a;->Ib:I
+    sget p2, Lcom/facebook/b/a$a;->Is:I
 
-    iput p2, p0, Lcom/facebook/b/a;->HR:I
+    iput p2, p0, Lcom/facebook/b/a;->Ii:I
 
     const/high16 p2, 0x3f800000    # 1.0f
 
     iput p2, p0, Lcom/facebook/b/a;->mProgress:F
 
     :cond_1
-    iget-object p2, p0, Lcom/facebook/b/a;->HS:Ljava/lang/Object;
+    iget-object p2, p0, Lcom/facebook/b/a;->Ij:Ljava/lang/Object;
 
     if-eq p2, p1, :cond_2
 
-    iget-object p2, p0, Lcom/facebook/b/a;->HS:Ljava/lang/Object;
+    iget-object p2, p0, Lcom/facebook/b/a;->Ij:Ljava/lang/Object;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_2
 
     :try_start_2
-    iput-object p1, p0, Lcom/facebook/b/a;->HS:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/b/a;->Ij:Ljava/lang/Object;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -255,24 +255,24 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/b/a;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/b/a;->Hs:Z
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/b/a;->HR:I
+    iget v0, p0, Lcom/facebook/b/a;->Ii:I
 
-    sget v1, Lcom/facebook/b/a$a;->Ia:I
+    sget v1, Lcom/facebook/b/a$a;->Ir:I
 
     if-eq v0, v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    sget v0, Lcom/facebook/b/a$a;->Ic:I
+    sget v0, Lcom/facebook/b/a$a;->It:I
 
-    iput v0, p0, Lcom/facebook/b/a;->HR:I
+    iput v0, p0, Lcom/facebook/b/a;->Ii:I
 
-    iput-object p1, p0, Lcom/facebook/b/a;->HT:Ljava/lang/Throwable;
+    iput-object p1, p0, Lcom/facebook/b/a;->Ik:Ljava/lang/Throwable;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -298,15 +298,15 @@
     throw p1
 .end method
 
-.method private declared-synchronized fV()Z
+.method private declared-synchronized fZ()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/b/a;->HR:I
+    iget v0, p0, Lcom/facebook/b/a;->Ii:I
 
-    sget v1, Lcom/facebook/b/a$a;->Ic:I
+    sget v1, Lcom/facebook/b/a$a;->It:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -338,18 +338,18 @@
     goto :goto_1
 .end method
 
-.method private fY()V
+.method private gd()V
     .locals 5
 
-    invoke-direct {p0}, Lcom/facebook/b/a;->fV()Z
-
-    move-result v0
-
     invoke-direct {p0}, Lcom/facebook/b/a;->fZ()Z
 
+    move-result v0
+
+    invoke-direct {p0}, Lcom/facebook/b/a;->ge()Z
+
     move-result v1
 
-    iget-object v2, p0, Lcom/facebook/b/a;->HU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v2, p0, Lcom/facebook/b/a;->Il:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v2}, Ljava/util/concurrent/ConcurrentLinkedQueue;->iterator()Ljava/util/Iterator;
 
@@ -384,7 +384,7 @@
     return-void
 .end method
 
-.method private declared-synchronized fZ()Z
+.method private declared-synchronized ge()Z
     .locals 1
 
     monitor-enter p0
@@ -436,15 +436,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/b/a;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/b/a;->Hs:Z
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_2
 
-    iget v0, p0, Lcom/facebook/b/a;->HR:I
+    iget v0, p0, Lcom/facebook/b/a;->Ii:I
 
-    sget v2, Lcom/facebook/b/a$a;->Ia:I
+    sget v2, Lcom/facebook/b/a$a;->Ir:I
 
     if-eq v0, v2, :cond_0
 
@@ -525,7 +525,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/b/a;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/b/a;->Hs:Z
 
     if-eqz v0, :cond_0
 
@@ -534,13 +534,13 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/facebook/b/a;->HR:I
+    iget v0, p0, Lcom/facebook/b/a;->Ii:I
 
-    sget v1, Lcom/facebook/b/a$a;->Ia:I
+    sget v1, Lcom/facebook/b/a$a;->Ir:I
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/b/a;->HU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lcom/facebook/b/a;->Il:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-static {p1, p2}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair;
 
@@ -549,7 +549,7 @@
     invoke-virtual {v0, v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->add(Ljava/lang/Object;)Z
 
     :cond_1
-    invoke-virtual {p0}, Lcom/facebook/b/a;->fU()Z
+    invoke-virtual {p0}, Lcom/facebook/b/a;->fY()Z
 
     move-result v0
 
@@ -561,7 +561,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-direct {p0}, Lcom/facebook/b/a;->fZ()Z
+    invoke-direct {p0}, Lcom/facebook/b/a;->ge()Z
 
     move-result v0
 
@@ -585,11 +585,11 @@
 
     if-eqz v0, :cond_4
 
-    invoke-direct {p0}, Lcom/facebook/b/a;->fV()Z
+    invoke-direct {p0}, Lcom/facebook/b/a;->fZ()Z
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/facebook/b/a;->fZ()Z
+    invoke-direct {p0}, Lcom/facebook/b/a;->ge()Z
 
     move-result v1
 
@@ -627,7 +627,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/b/a;->fY()V
+    invoke-direct {p0}, Lcom/facebook/b/a;->gd()V
 
     :cond_0
     return p1
@@ -642,19 +642,19 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/b/a;->fY()V
+    invoke-direct {p0}, Lcom/facebook/b/a;->gd()V
 
     :cond_0
     return p1
 .end method
 
-.method public declared-synchronized fU()Z
+.method public declared-synchronized fY()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/b/a;->HS:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/b/a;->Ij:Ljava/lang/Object;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -686,7 +686,7 @@
     goto :goto_1
 .end method
 
-.method public final declared-synchronized fW()Ljava/lang/Throwable;
+.method public final declared-synchronized ga()Ljava/lang/Throwable;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -694,7 +694,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/b/a;->HT:Ljava/lang/Throwable;
+    iget-object v0, p0, Lcom/facebook/b/a;->Ik:Ljava/lang/Throwable;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -710,13 +710,13 @@
     throw v0
 .end method
 
-.method public fX()Z
+.method public gb()Z
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/b/a;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/b/a;->Hs:Z
 
     if-eqz v0, :cond_0
 
@@ -729,13 +729,13 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/b/a;->Hb:Z
+    iput-boolean v0, p0, Lcom/facebook/b/a;->Hs:Z
 
-    iget-object v1, p0, Lcom/facebook/b/a;->HS:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/b/a;->Ij:Ljava/lang/Object;
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lcom/facebook/b/a;->HS:Ljava/lang/Object;
+    iput-object v2, p0, Lcom/facebook/b/a;->Ij:Ljava/lang/Object;
 
     monitor-exit p0
     :try_end_0
@@ -752,13 +752,13 @@
 
     if-nez v1, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/b/a;->fY()V
+    invoke-direct {p0}, Lcom/facebook/b/a;->gd()V
 
     :cond_2
     monitor-enter p0
 
     :try_start_1
-    iget-object v1, p0, Lcom/facebook/b/a;->HU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, p0, Lcom/facebook/b/a;->Il:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
 
@@ -822,7 +822,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/b/a;->HS:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/b/a;->Ij:Ljava/lang/Object;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -847,7 +847,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/b/a;->HU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lcom/facebook/b/a;->Il:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->iterator()Ljava/util/Iterator;
 
@@ -892,7 +892,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/b/a;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/b/a;->Hs:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -914,9 +914,9 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/b/a;->HR:I
+    iget v0, p0, Lcom/facebook/b/a;->Ii:I
 
-    sget v1, Lcom/facebook/b/a$a;->Ia:I
+    sget v1, Lcom/facebook/b/a$a;->Ir:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/b/c.smali b/com.discord/smali/com/facebook/b/c.smali
index f6e560f711..f02d589a41 100644
--- a/com.discord/smali/com/facebook/b/c.smali
+++ b/com.discord/smali/com/facebook/b/c.smali
@@ -27,15 +27,15 @@
     .end annotation
 .end method
 
-.method public abstract fU()Z
+.method public abstract fY()Z
 .end method
 
-.method public abstract fW()Ljava/lang/Throwable;
+.method public abstract ga()Ljava/lang/Throwable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end method
 
-.method public abstract fX()Z
+.method public abstract gb()Z
 .end method
 
 .method public abstract getProgress()F
diff --git a/com.discord/smali/com/facebook/b/d$a.smali b/com.discord/smali/com/facebook/b/d$a.smali
index 78ab8cc31c..f9af61705e 100644
--- a/com.discord/smali/com/facebook/b/d$a.smali
+++ b/com.discord/smali/com/facebook/b/d$a.smali
@@ -1,4 +1,4 @@
-.class final Lcom/facebook/b/d$a;
+.class public final Lcom/facebook/b/d$a;
 .super Ljava/lang/Object;
 .source "DataSources.java"
 
@@ -9,7 +9,7 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x8
+    accessFlags = 0x9
     name = "a"
 .end annotation
 
@@ -49,7 +49,7 @@
     return-void
 .end method
 
-.method synthetic constructor <init>(B)V
+.method public synthetic constructor <init>(B)V
     .locals 0
 
     invoke-direct {p0}, Lcom/facebook/b/d$a;-><init>()V
diff --git a/com.discord/smali/com/facebook/b/d.smali b/com.discord/smali/com/facebook/b/d.smali
deleted file mode 100644
index 8880117fbb..0000000000
--- a/com.discord/smali/com/facebook/b/d.smali
+++ /dev/null
@@ -1,101 +0,0 @@
-.class public final Lcom/facebook/b/d;
-.super Ljava/lang/Object;
-.source "DataSources.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/facebook/b/d$a;
-    }
-.end annotation
-
-
-# direct methods
-.method public static f(Lcom/facebook/b/c;)Ljava/lang/Object;
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lcom/facebook/b/c<",
-            "TT;>;)TT;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Throwable;
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-
-    new-instance v0, Ljava/util/concurrent/CountDownLatch;
-
-    const/4 v1, 0x1
-
-    invoke-direct {v0, v1}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
-
-    new-instance v1, Lcom/facebook/b/d$a;
-
-    const/4 v2, 0x0
-
-    invoke-direct {v1, v2}, Lcom/facebook/b/d$a;-><init>(B)V
-
-    new-instance v3, Lcom/facebook/b/d$a;
-
-    invoke-direct {v3, v2}, Lcom/facebook/b/d$a;-><init>(B)V
-
-    new-instance v2, Lcom/facebook/b/d$2;
-
-    invoke-direct {v2, v1, v0, v3}, Lcom/facebook/b/d$2;-><init>(Lcom/facebook/b/d$a;Ljava/util/concurrent/CountDownLatch;Lcom/facebook/b/d$a;)V
-
-    new-instance v4, Lcom/facebook/b/d$3;
-
-    invoke-direct {v4}, Lcom/facebook/b/d$3;-><init>()V
-
-    invoke-interface {p0, v2, v4}, Lcom/facebook/b/c;->a(Lcom/facebook/b/e;Ljava/util/concurrent/Executor;)V
-
-    invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->await()V
-
-    iget-object p0, v3, Lcom/facebook/b/d$a;->value:Ljava/lang/Object;
-
-    if-nez p0, :cond_0
-
-    iget-object p0, v1, Lcom/facebook/b/d$a;->value:Ljava/lang/Object;
-
-    return-object p0
-
-    :cond_0
-    iget-object p0, v3, Lcom/facebook/b/d$a;->value:Ljava/lang/Object;
-
-    check-cast p0, Ljava/lang/Throwable;
-
-    throw p0
-.end method
-
-.method public static g(Ljava/lang/Throwable;)Lcom/facebook/b/c;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Throwable;",
-            ")",
-            "Lcom/facebook/b/c<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lcom/facebook/b/h;
-
-    invoke-direct {v0}, Lcom/facebook/b/h;-><init>()V
-
-    invoke-virtual {v0, p0}, Lcom/facebook/b/h;->e(Ljava/lang/Throwable;)Z
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/facebook/b/f$a.smali b/com.discord/smali/com/facebook/b/f$a.smali
index 5bf49f98b1..f0337c3768 100644
--- a/com.discord/smali/com/facebook/b/f$a.smali
+++ b/com.discord/smali/com/facebook/b/f$a.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field private Ii:Lcom/facebook/b/c;
+.field private IA:Lcom/facebook/b/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/b/c<",
@@ -37,7 +37,9 @@
     .end annotation
 .end field
 
-.field private Ij:Lcom/facebook/b/c;
+.field final synthetic IB:Lcom/facebook/b/f;
+
+.field private Iz:Lcom/facebook/b/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/b/c<",
@@ -46,8 +48,6 @@
     .end annotation
 .end field
 
-.field final synthetic Ik:Lcom/facebook/b/f;
-
 .field private mIndex:I
 
 
@@ -55,7 +55,7 @@
 .method public constructor <init>(Lcom/facebook/b/f;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/facebook/b/f$a;->Ik:Lcom/facebook/b/f;
+    iput-object p1, p0, Lcom/facebook/b/f$a;->IB:Lcom/facebook/b/f;
 
     invoke-direct {p0}, Lcom/facebook/b/a;-><init>()V
 
@@ -65,11 +65,11 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/b/f$a;->Ii:Lcom/facebook/b/c;
+    iput-object p1, p0, Lcom/facebook/b/f$a;->Iz:Lcom/facebook/b/c;
 
-    iput-object p1, p0, Lcom/facebook/b/f$a;->Ij:Lcom/facebook/b/c;
+    iput-object p1, p0, Lcom/facebook/b/f$a;->IA:Lcom/facebook/b/c;
 
-    invoke-direct {p0}, Lcom/facebook/b/f$a;->gb()Z
+    invoke-direct {p0}, Lcom/facebook/b/f$a;->gg()Z
 
     move-result p1
 
@@ -90,28 +90,28 @@
 .method static synthetic a(Lcom/facebook/b/f$a;Lcom/facebook/b/c;)V
     .locals 1
 
-    invoke-direct {p0, p1}, Lcom/facebook/b/f$a;->h(Lcom/facebook/b/c;)Z
+    invoke-direct {p0, p1}, Lcom/facebook/b/f$a;->g(Lcom/facebook/b/c;)Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    invoke-direct {p0}, Lcom/facebook/b/f$a;->ge()Lcom/facebook/b/c;
+    invoke-direct {p0}, Lcom/facebook/b/f$a;->gi()Lcom/facebook/b/c;
 
     move-result-object v0
 
     if-eq p1, v0, :cond_0
 
-    invoke-static {p1}, Lcom/facebook/b/f$a;->i(Lcom/facebook/b/c;)V
+    invoke-static {p1}, Lcom/facebook/b/f$a;->h(Lcom/facebook/b/c;)V
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/b/f$a;->gb()Z
+    invoke-direct {p0}, Lcom/facebook/b/f$a;->gg()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    invoke-interface {p1}, Lcom/facebook/b/c;->fW()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lcom/facebook/b/c;->ga()Ljava/lang/Throwable;
 
     move-result-object p1
 
@@ -131,20 +131,20 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/b/f$a;->Ii:Lcom/facebook/b/c;
+    iget-object v1, p0, Lcom/facebook/b/f$a;->Iz:Lcom/facebook/b/c;
 
     const/4 v2, 0x0
 
     if-ne p1, v1, :cond_3
 
-    iget-object v1, p0, Lcom/facebook/b/f$a;->Ij:Lcom/facebook/b/c;
+    iget-object v1, p0, Lcom/facebook/b/f$a;->IA:Lcom/facebook/b/c;
 
     if-ne p1, v1, :cond_0
 
     goto :goto_2
 
     :cond_0
-    iget-object v1, p0, Lcom/facebook/b/f$a;->Ij:Lcom/facebook/b/c;
+    iget-object v1, p0, Lcom/facebook/b/f$a;->IA:Lcom/facebook/b/c;
 
     if-eqz v1, :cond_2
 
@@ -159,16 +159,16 @@
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lcom/facebook/b/f$a;->Ij:Lcom/facebook/b/c;
+    iget-object v0, p0, Lcom/facebook/b/f$a;->IA:Lcom/facebook/b/c;
 
-    iput-object p1, p0, Lcom/facebook/b/f$a;->Ij:Lcom/facebook/b/c;
+    iput-object p1, p0, Lcom/facebook/b/f$a;->IA:Lcom/facebook/b/c;
 
     :goto_1
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {v0}, Lcom/facebook/b/f$a;->i(Lcom/facebook/b/c;)V
+    invoke-static {v0}, Lcom/facebook/b/f$a;->h(Lcom/facebook/b/c;)V
 
     goto :goto_3
 
@@ -180,7 +180,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_3
-    invoke-direct {p0}, Lcom/facebook/b/f$a;->ge()Lcom/facebook/b/c;
+    invoke-direct {p0}, Lcom/facebook/b/f$a;->gi()Lcom/facebook/b/c;
 
     move-result-object v0
 
@@ -206,7 +206,7 @@
     throw p1
 .end method
 
-.method private declared-synchronized g(Lcom/facebook/b/c;)Z
+.method private declared-synchronized f(Lcom/facebook/b/c;)Z
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -235,7 +235,7 @@
 
     :cond_0
     :try_start_1
-    iput-object p1, p0, Lcom/facebook/b/f$a;->Ii:Lcom/facebook/b/c;
+    iput-object p1, p0, Lcom/facebook/b/f$a;->Iz:Lcom/facebook/b/c;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -253,10 +253,64 @@
     throw p1
 .end method
 
-.method private gb()Z
+.method private declared-synchronized g(Lcom/facebook/b/c;)Z
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/facebook/b/c<",
+            "TT;>;)Z"
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    invoke-virtual {p0}, Lcom/facebook/b/f$a;->isClosed()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    iget-object v0, p0, Lcom/facebook/b/f$a;->Iz:Lcom/facebook/b/c;
+
+    if-eq p1, v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lcom/facebook/b/f$a;->Iz:Lcom/facebook/b/c;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 p1, 0x1
+
+    monitor-exit p0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x0
+
+    monitor-exit p0
+
+    return p1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method private gg()Z
     .locals 3
 
-    invoke-direct {p0}, Lcom/facebook/b/f$a;->gd()Lcom/facebook/common/d/k;
+    invoke-direct {p0}, Lcom/facebook/b/f$a;->gh()Lcom/facebook/common/d/k;
 
     move-result-object v0
 
@@ -274,7 +328,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-direct {p0, v0}, Lcom/facebook/b/f$a;->g(Lcom/facebook/b/c;)Z
+    invoke-direct {p0, v0}, Lcom/facebook/b/f$a;->f(Lcom/facebook/b/c;)Z
 
     move-result v1
 
@@ -288,7 +342,7 @@
 
     invoke-direct {v1, p0, v2}, Lcom/facebook/b/f$a$a;-><init>(Lcom/facebook/b/f$a;B)V
 
-    invoke-static {}, Lcom/facebook/common/b/a;->fw()Lcom/facebook/common/b/a;
+    invoke-static {}, Lcom/facebook/common/b/a;->fA()Lcom/facebook/common/b/a;
 
     move-result-object v2
 
@@ -299,12 +353,12 @@
     return v0
 
     :cond_1
-    invoke-static {v0}, Lcom/facebook/b/f$a;->i(Lcom/facebook/b/c;)V
+    invoke-static {v0}, Lcom/facebook/b/f$a;->h(Lcom/facebook/b/c;)V
 
     return v2
 .end method
 
-.method private declared-synchronized gd()Lcom/facebook/common/d/k;
+.method private declared-synchronized gh()Lcom/facebook/common/d/k;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -329,9 +383,9 @@
 
     iget v0, p0, Lcom/facebook/b/f$a;->mIndex:I
 
-    iget-object v1, p0, Lcom/facebook/b/f$a;->Ik:Lcom/facebook/b/f;
+    iget-object v1, p0, Lcom/facebook/b/f$a;->IB:Lcom/facebook/b/f;
 
-    iget-object v1, v1, Lcom/facebook/b/f;->Ih:Ljava/util/List;
+    iget-object v1, v1, Lcom/facebook/b/f;->Iy:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -339,9 +393,9 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/b/f$a;->Ik:Lcom/facebook/b/f;
+    iget-object v0, p0, Lcom/facebook/b/f$a;->IB:Lcom/facebook/b/f;
 
-    iget-object v0, v0, Lcom/facebook/b/f;->Ih:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/b/f;->Iy:Ljava/util/List;
 
     iget v1, p0, Lcom/facebook/b/f$a;->mIndex:I
 
@@ -376,7 +430,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized ge()Lcom/facebook/b/c;
+.method private declared-synchronized gi()Lcom/facebook/b/c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -392,7 +446,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/b/f$a;->Ij:Lcom/facebook/b/c;
+    iget-object v0, p0, Lcom/facebook/b/f$a;->IA:Lcom/facebook/b/c;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -408,61 +462,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized h(Lcom/facebook/b/c;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/facebook/b/c<",
-            "TT;>;)Z"
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    invoke-virtual {p0}, Lcom/facebook/b/f$a;->isClosed()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    iget-object v0, p0, Lcom/facebook/b/f$a;->Ii:Lcom/facebook/b/c;
-
-    if-eq p1, v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    iput-object p1, p0, Lcom/facebook/b/f$a;->Ii:Lcom/facebook/b/c;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 p1, 0x1
-
-    monitor-exit p0
-
-    return p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x0
-
-    monitor-exit p0
-
-    return p1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method private static i(Lcom/facebook/b/c;)V
+.method private static h(Lcom/facebook/b/c;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -474,7 +474,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-interface {p0}, Lcom/facebook/b/c;->fX()Z
+    invoke-interface {p0}, Lcom/facebook/b/c;->gb()Z
 
     :cond_0
     return-void
@@ -482,19 +482,19 @@
 
 
 # virtual methods
-.method public final declared-synchronized fU()Z
+.method public final declared-synchronized fY()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/b/f$a;->ge()Lcom/facebook/b/c;
+    invoke-direct {p0}, Lcom/facebook/b/f$a;->gi()Lcom/facebook/b/c;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/facebook/b/c;->fU()Z
+    invoke-interface {v0}, Lcom/facebook/b/c;->fY()Z
 
     move-result v0
     :try_end_0
@@ -528,13 +528,13 @@
     goto :goto_1
 .end method
 
-.method public final fX()Z
+.method public final gb()Z
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    invoke-super {p0}, Lcom/facebook/b/a;->fX()Z
+    invoke-super {p0}, Lcom/facebook/b/a;->gb()Z
 
     move-result v0
 
@@ -547,23 +547,23 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/b/f$a;->Ii:Lcom/facebook/b/c;
+    iget-object v0, p0, Lcom/facebook/b/f$a;->Iz:Lcom/facebook/b/c;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/b/f$a;->Ii:Lcom/facebook/b/c;
+    iput-object v1, p0, Lcom/facebook/b/f$a;->Iz:Lcom/facebook/b/c;
 
-    iget-object v2, p0, Lcom/facebook/b/f$a;->Ij:Lcom/facebook/b/c;
+    iget-object v2, p0, Lcom/facebook/b/f$a;->IA:Lcom/facebook/b/c;
 
-    iput-object v1, p0, Lcom/facebook/b/f$a;->Ij:Lcom/facebook/b/c;
+    iput-object v1, p0, Lcom/facebook/b/f$a;->IA:Lcom/facebook/b/c;
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {v2}, Lcom/facebook/b/f$a;->i(Lcom/facebook/b/c;)V
+    invoke-static {v2}, Lcom/facebook/b/f$a;->h(Lcom/facebook/b/c;)V
 
-    invoke-static {v0}, Lcom/facebook/b/f$a;->i(Lcom/facebook/b/c;)V
+    invoke-static {v0}, Lcom/facebook/b/f$a;->h(Lcom/facebook/b/c;)V
 
     const/4 v0, 0x1
 
@@ -594,7 +594,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/b/f$a;->ge()Lcom/facebook/b/c;
+    invoke-direct {p0}, Lcom/facebook/b/f$a;->gi()Lcom/facebook/b/c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/b/g$a.smali b/com.discord/smali/com/facebook/b/g$a.smali
index dfcdbdb3cb..e7fe06bc93 100644
--- a/com.discord/smali/com/facebook/b/g$a.smali
+++ b/com.discord/smali/com/facebook/b/g$a.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field private In:Ljava/util/ArrayList;
+.field private IE:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -41,33 +41,33 @@
     .end annotation
 .end field
 
-.field private Io:I
+.field private IF:I
 
-.field private Ip:I
+.field private IG:I
 
-.field private Iq:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private IH:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field private Ir:Ljava/lang/Throwable;
+.field private II:Ljava/lang/Throwable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final synthetic Is:Lcom/facebook/b/g;
+.field final synthetic IJ:Lcom/facebook/b/g;
 
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/b/g;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/b/g$a;->Is:Lcom/facebook/b/g;
+    iput-object p1, p0, Lcom/facebook/b/g$a;->IJ:Lcom/facebook/b/g;
 
     invoke-direct {p0}, Lcom/facebook/b/a;-><init>()V
 
-    iget-boolean p1, p1, Lcom/facebook/b/g;->Im:Z
+    iget-boolean p1, p1, Lcom/facebook/b/g;->ID:Z
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/b/g$a;->gf()V
+    invoke-direct {p0}, Lcom/facebook/b/g$a;->gj()V
 
     :cond_0
     return-void
@@ -89,11 +89,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/b/g$a;->In:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IE:Ljava/util/ArrayList;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/b/g$a;->In:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IE:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
@@ -101,7 +101,7 @@
 
     if-ge p1, v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/b/g$a;->In:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IE:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -146,13 +146,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/b/g$a;->In:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IE:Ljava/util/ArrayList;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/b/g$a;->In:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IE:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
@@ -160,7 +160,7 @@
 
     if-ge p1, v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/b/g$a;->In:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IE:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1, v1}, Ljava/util/ArrayList;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -205,7 +205,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/b/g$a;->ge()Lcom/facebook/b/c;
+    invoke-direct {p0}, Lcom/facebook/b/g$a;->gi()Lcom/facebook/b/c;
 
     move-result-object v0
     :try_end_0
@@ -260,9 +260,9 @@
     monitor-enter p0
 
     :try_start_0
-    iget v1, p0, Lcom/facebook/b/g$a;->Io:I
+    iget v1, p0, Lcom/facebook/b/g$a;->IF:I
 
-    iget v2, p0, Lcom/facebook/b/g$a;->Io:I
+    iget v2, p0, Lcom/facebook/b/g$a;->IF:I
 
     invoke-direct {p0, p1}, Lcom/facebook/b/g$a;->M(I)Lcom/facebook/b/c;
 
@@ -270,14 +270,14 @@
 
     if-ne p2, v3, :cond_3
 
-    iget v3, p0, Lcom/facebook/b/g$a;->Io:I
+    iget v3, p0, Lcom/facebook/b/g$a;->IF:I
 
     if-ne p1, v3, :cond_0
 
     goto :goto_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/b/g$a;->ge()Lcom/facebook/b/c;
+    invoke-direct {p0}, Lcom/facebook/b/g$a;->gi()Lcom/facebook/b/c;
 
     move-result-object v3
 
@@ -285,12 +285,12 @@
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lcom/facebook/b/g$a;->Io:I
+    iget v0, p0, Lcom/facebook/b/g$a;->IF:I
 
     if-ge p1, v0, :cond_2
 
     :cond_1
-    iput p1, p0, Lcom/facebook/b/g$a;->Io:I
+    iput p1, p0, Lcom/facebook/b/g$a;->IF:I
 
     move v2, p1
 
@@ -306,7 +306,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/facebook/b/g$a;->i(Lcom/facebook/b/c;)V
+    invoke-static {v0}, Lcom/facebook/b/g$a;->h(Lcom/facebook/b/c;)V
 
     add-int/lit8 v1, v1, -0x1
 
@@ -320,7 +320,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :cond_4
-    invoke-direct {p0}, Lcom/facebook/b/g$a;->ge()Lcom/facebook/b/c;
+    invoke-direct {p0}, Lcom/facebook/b/g$a;->gi()Lcom/facebook/b/c;
 
     move-result-object v0
 
@@ -347,7 +347,7 @@
     invoke-virtual {p0, v0, p1}, Lcom/facebook/b/g$a;->a(Ljava/lang/Object;Z)Z
 
     :cond_6
-    invoke-direct {p0}, Lcom/facebook/b/g$a;->gg()V
+    invoke-direct {p0}, Lcom/facebook/b/g$a;->gk()V
 
     return-void
 
@@ -375,23 +375,23 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/facebook/b/g$a;->i(Lcom/facebook/b/c;)V
+    invoke-static {v0}, Lcom/facebook/b/g$a;->h(Lcom/facebook/b/c;)V
 
     if-nez p1, :cond_0
 
-    invoke-interface {p2}, Lcom/facebook/b/c;->fW()Ljava/lang/Throwable;
+    invoke-interface {p2}, Lcom/facebook/b/c;->ga()Ljava/lang/Throwable;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/b/g$a;->Ir:Ljava/lang/Throwable;
+    iput-object p1, p0, Lcom/facebook/b/g$a;->II:Ljava/lang/Throwable;
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/b/g$a;->gg()V
+    invoke-direct {p0}, Lcom/facebook/b/g$a;->gk()V
 
     return-void
 .end method
 
-.method private declared-synchronized ge()Lcom/facebook/b/c;
+.method private declared-synchronized gi()Lcom/facebook/b/c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -407,7 +407,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/b/g$a;->Io:I
+    iget v0, p0, Lcom/facebook/b/g$a;->IF:I
 
     invoke-direct {p0, v0}, Lcom/facebook/b/g$a;->M(I)Lcom/facebook/b/c;
 
@@ -427,10 +427,10 @@
     throw v0
 .end method
 
-.method private gf()V
+.method private gj()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/b/g$a;->Iq:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IH:Ljava/util/concurrent/atomic/AtomicInteger;
 
     if-eqz v0, :cond_0
 
@@ -440,7 +440,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/b/g$a;->Iq:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IH:Ljava/util/concurrent/atomic/AtomicInteger;
 
     if-nez v0, :cond_1
 
@@ -450,32 +450,32 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object v0, p0, Lcom/facebook/b/g$a;->Iq:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/facebook/b/g$a;->IH:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    iget-object v0, p0, Lcom/facebook/b/g$a;->Is:Lcom/facebook/b/g;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IJ:Lcom/facebook/b/g;
 
-    iget-object v0, v0, Lcom/facebook/b/g;->Ih:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/b/g;->Iy:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/b/g$a;->Ip:I
+    iput v0, p0, Lcom/facebook/b/g$a;->IG:I
 
-    iput v0, p0, Lcom/facebook/b/g$a;->Io:I
+    iput v0, p0, Lcom/facebook/b/g$a;->IF:I
 
     new-instance v2, Ljava/util/ArrayList;
 
     invoke-direct {v2, v0}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object v2, p0, Lcom/facebook/b/g$a;->In:Ljava/util/ArrayList;
+    iput-object v2, p0, Lcom/facebook/b/g$a;->IE:Ljava/util/ArrayList;
 
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/b/g$a;->Is:Lcom/facebook/b/g;
+    iget-object v2, p0, Lcom/facebook/b/g$a;->IJ:Lcom/facebook/b/g;
 
-    iget-object v2, v2, Lcom/facebook/b/g;->Ih:Ljava/util/List;
+    iget-object v2, v2, Lcom/facebook/b/g;->Iy:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -489,7 +489,7 @@
 
     check-cast v2, Lcom/facebook/b/c;
 
-    iget-object v3, p0, Lcom/facebook/b/g$a;->In:Ljava/util/ArrayList;
+    iget-object v3, p0, Lcom/facebook/b/g$a;->IE:Ljava/util/ArrayList;
 
     invoke-virtual {v3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -497,13 +497,13 @@
 
     invoke-direct {v3, p0, v1}, Lcom/facebook/b/g$a$a;-><init>(Lcom/facebook/b/g$a;I)V
 
-    invoke-static {}, Lcom/facebook/common/b/a;->fw()Lcom/facebook/common/b/a;
+    invoke-static {}, Lcom/facebook/common/b/a;->fA()Lcom/facebook/common/b/a;
 
     move-result-object v4
 
     invoke-interface {v2, v3, v4}, Lcom/facebook/b/c;->a(Lcom/facebook/b/e;Ljava/util/concurrent/Executor;)V
 
-    invoke-interface {v2}, Lcom/facebook/b/c;->fU()Z
+    invoke-interface {v2}, Lcom/facebook/b/c;->fY()Z
 
     move-result v2
 
@@ -534,20 +534,20 @@
     goto :goto_1
 .end method
 
-.method private gg()V
+.method private gk()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/b/g$a;->Iq:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IH:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
     move-result v0
 
-    iget v1, p0, Lcom/facebook/b/g$a;->Ip:I
+    iget v1, p0, Lcom/facebook/b/g$a;->IG:I
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/b/g$a;->Ir:Ljava/lang/Throwable;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->II:Ljava/lang/Throwable;
 
     if-eqz v0, :cond_0
 
@@ -557,7 +557,7 @@
     return-void
 .end method
 
-.method private static i(Lcom/facebook/b/c;)V
+.method private static h(Lcom/facebook/b/c;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -569,7 +569,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-interface {p0}, Lcom/facebook/b/c;->fX()Z
+    invoke-interface {p0}, Lcom/facebook/b/c;->gb()Z
 
     :cond_0
     return-void
@@ -577,28 +577,28 @@
 
 
 # virtual methods
-.method public final declared-synchronized fU()Z
+.method public final declared-synchronized fY()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/b/g$a;->Is:Lcom/facebook/b/g;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IJ:Lcom/facebook/b/g;
 
-    iget-boolean v0, v0, Lcom/facebook/b/g;->Im:Z
+    iget-boolean v0, v0, Lcom/facebook/b/g;->ID:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/b/g$a;->gf()V
+    invoke-direct {p0}, Lcom/facebook/b/g$a;->gj()V
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/b/g$a;->ge()Lcom/facebook/b/c;
+    invoke-direct {p0}, Lcom/facebook/b/g$a;->gi()Lcom/facebook/b/c;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    invoke-interface {v0}, Lcom/facebook/b/c;->fU()Z
+    invoke-interface {v0}, Lcom/facebook/b/c;->fY()Z
 
     move-result v0
     :try_end_0
@@ -632,22 +632,22 @@
     goto :goto_1
 .end method
 
-.method public final fX()Z
+.method public final gb()Z
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/b/g$a;->Is:Lcom/facebook/b/g;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IJ:Lcom/facebook/b/g;
 
-    iget-boolean v0, v0, Lcom/facebook/b/g;->Im:Z
+    iget-boolean v0, v0, Lcom/facebook/b/g;->ID:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/b/g$a;->gf()V
+    invoke-direct {p0}, Lcom/facebook/b/g$a;->gj()V
 
     :cond_0
     monitor-enter p0
 
     :try_start_0
-    invoke-super {p0}, Lcom/facebook/b/a;->fX()Z
+    invoke-super {p0}, Lcom/facebook/b/a;->gb()Z
 
     move-result v0
 
@@ -660,11 +660,11 @@
     return v1
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/b/g$a;->In:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IE:Ljava/util/ArrayList;
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lcom/facebook/b/g$a;->In:Ljava/util/ArrayList;
+    iput-object v2, p0, Lcom/facebook/b/g$a;->IE:Ljava/util/ArrayList;
 
     monitor-exit p0
     :try_end_0
@@ -685,7 +685,7 @@
 
     check-cast v2, Lcom/facebook/b/c;
 
-    invoke-static {v2}, Lcom/facebook/b/g$a;->i(Lcom/facebook/b/c;)V
+    invoke-static {v2}, Lcom/facebook/b/g$a;->h(Lcom/facebook/b/c;)V
 
     add-int/lit8 v1, v1, 0x1
 
@@ -727,16 +727,16 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/b/g$a;->Is:Lcom/facebook/b/g;
+    iget-object v0, p0, Lcom/facebook/b/g$a;->IJ:Lcom/facebook/b/g;
 
-    iget-boolean v0, v0, Lcom/facebook/b/g;->Im:Z
+    iget-boolean v0, v0, Lcom/facebook/b/g;->ID:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/b/g$a;->gf()V
+    invoke-direct {p0}, Lcom/facebook/b/g$a;->gj()V
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/b/g$a;->ge()Lcom/facebook/b/c;
+    invoke-direct {p0}, Lcom/facebook/b/g$a;->gi()Lcom/facebook/b/c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/c/a/a.smali b/com.discord/smali/com/facebook/c/a/a.smali
index 09fb1db592..d97d1b89d1 100644
--- a/com.discord/smali/com/facebook/c/a/a.smali
+++ b/com.discord/smali/com/facebook/c/a/a.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract gh()V
+.method public abstract gl()V
 .end method
diff --git a/com.discord/smali/com/facebook/cache/common/e.smali b/com.discord/smali/com/facebook/cache/common/e.smali
index 90231f323f..b008c142bd 100644
--- a/com.discord/smali/com/facebook/cache/common/e.smali
+++ b/com.discord/smali/com/facebook/cache/common/e.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static Fj:Lcom/facebook/cache/common/e;
+.field private static FA:Lcom/facebook/cache/common/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -28,7 +28,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized fh()Lcom/facebook/cache/common/e;
+.method public static declared-synchronized fm()Lcom/facebook/cache/common/e;
     .locals 2
 
     const-class v0, Lcom/facebook/cache/common/e;
@@ -36,7 +36,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/cache/common/e;->Fj:Lcom/facebook/cache/common/e;
+    sget-object v1, Lcom/facebook/cache/common/e;->FA:Lcom/facebook/cache/common/e;
 
     if-nez v1, :cond_0
 
@@ -44,10 +44,10 @@
 
     invoke-direct {v1}, Lcom/facebook/cache/common/e;-><init>()V
 
-    sput-object v1, Lcom/facebook/cache/common/e;->Fj:Lcom/facebook/cache/common/e;
+    sput-object v1, Lcom/facebook/cache/common/e;->FA:Lcom/facebook/cache/common/e;
 
     :cond_0
-    sget-object v1, Lcom/facebook/cache/common/e;->Fj:Lcom/facebook/cache/common/e;
+    sget-object v1, Lcom/facebook/cache/common/e;->FA:Lcom/facebook/cache/common/e;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/cache/common/f.smali b/com.discord/smali/com/facebook/cache/common/f.smali
index 54e037b79c..8c0bd240a7 100644
--- a/com.discord/smali/com/facebook/cache/common/f.smali
+++ b/com.discord/smali/com/facebook/cache/common/f.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static Fk:Lcom/facebook/cache/common/f;
+.field private static FB:Lcom/facebook/cache/common/f;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -28,7 +28,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized fi()Lcom/facebook/cache/common/f;
+.method public static declared-synchronized fn()Lcom/facebook/cache/common/f;
     .locals 2
 
     const-class v0, Lcom/facebook/cache/common/f;
@@ -36,7 +36,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/cache/common/f;->Fk:Lcom/facebook/cache/common/f;
+    sget-object v1, Lcom/facebook/cache/common/f;->FB:Lcom/facebook/cache/common/f;
 
     if-nez v1, :cond_0
 
@@ -44,10 +44,10 @@
 
     invoke-direct {v1}, Lcom/facebook/cache/common/f;-><init>()V
 
-    sput-object v1, Lcom/facebook/cache/common/f;->Fk:Lcom/facebook/cache/common/f;
+    sput-object v1, Lcom/facebook/cache/common/f;->FB:Lcom/facebook/cache/common/f;
 
     :cond_0
-    sget-object v1, Lcom/facebook/cache/common/f;->Fk:Lcom/facebook/cache/common/f;
+    sget-object v1, Lcom/facebook/cache/common/f;->FB:Lcom/facebook/cache/common/f;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig$a.smali b/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig$a.smali
index e152677e9d..19fc0a0f11 100644
--- a/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig$a.smali
+++ b/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig$a.smali
@@ -15,9 +15,11 @@
 
 
 # instance fields
-.field FA:Ljava/lang/String;
+.field FH:Lcom/facebook/cache/common/a;
 
-.field FB:Lcom/facebook/common/d/k;
+.field public FR:Ljava/lang/String;
+
+.field public FS:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -27,21 +29,19 @@
     .end annotation
 .end field
 
-.field FF:Lcom/facebook/cache/disk/g;
+.field FW:Lcom/facebook/cache/disk/g;
 
-.field FG:Lcom/facebook/cache/common/b;
+.field FX:Lcom/facebook/cache/common/b;
 
-.field FH:Lcom/facebook/common/a/a;
+.field FY:Lcom/facebook/common/a/a;
 
-.field FI:Z
+.field FZ:Z
 
-.field FJ:J
+.field public Ga:J
 
-.field FK:J
+.field Gb:J
 
-.field FL:J
-
-.field Fq:Lcom/facebook/cache/common/a;
+.field Gc:J
 
 .field final mContext:Landroid/content/Context;
     .annotation runtime Ljavax/annotation/Nullable;
@@ -67,25 +67,25 @@
 
     const-string v0, "image_cache"
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FA:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FR:Ljava/lang/String;
 
     const-wide/32 v0, 0x2800000
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FJ:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Ga:J
 
     const-wide/32 v0, 0xa00000
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FK:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Gb:J
 
     const-wide/32 v0, 0x200000
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FL:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Gc:J
 
     new-instance v0, Lcom/facebook/cache/disk/b;
 
     invoke-direct {v0}, Lcom/facebook/cache/disk/b;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FF:Lcom/facebook/cache/disk/g;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FW:Lcom/facebook/cache/disk/g;
 
     iput-object p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->mContext:Landroid/content/Context;
 
@@ -102,28 +102,10 @@
 
 
 # virtual methods
-.method public final ar(Ljava/lang/String;)Lcom/facebook/cache/disk/DiskCacheConfig$a;
-    .locals 0
-
-    iput-object p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FA:Ljava/lang/String;
-
-    return-object p0
-.end method
-
-.method public final fp()Lcom/facebook/cache/disk/DiskCacheConfig$a;
-    .locals 2
-
-    const-wide/32 v0, 0x2800000
-
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FJ:J
-
-    return-object p0
-.end method
-
-.method public final fq()Lcom/facebook/cache/disk/DiskCacheConfig;
+.method public final fu()Lcom/facebook/cache/disk/DiskCacheConfig;
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FB:Lcom/facebook/common/d/k;
+    iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FS:Lcom/facebook/common/d/k;
 
     const/4 v1, 0x0
 
@@ -149,7 +131,7 @@
 
     invoke-static {v0, v2}, Lcom/facebook/common/d/i;->a(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FB:Lcom/facebook/common/d/k;
+    iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FS:Lcom/facebook/common/d/k;
 
     if-nez v0, :cond_2
 
@@ -161,7 +143,7 @@
 
     invoke-direct {v0, p0}, Lcom/facebook/cache/disk/DiskCacheConfig$a$1;-><init>(Lcom/facebook/cache/disk/DiskCacheConfig$a;)V
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FB:Lcom/facebook/common/d/k;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FS:Lcom/facebook/common/d/k;
 
     :cond_2
     new-instance v0, Lcom/facebook/cache/disk/DiskCacheConfig;
@@ -170,15 +152,3 @@
 
     return-object v0
 .end method
-
-.method public final m(Ljava/io/File;)Lcom/facebook/cache/disk/DiskCacheConfig$a;
-    .locals 0
-
-    invoke-static {p1}, Lcom/facebook/common/d/l;->y(Ljava/lang/Object;)Lcom/facebook/common/d/k;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FB:Lcom/facebook/common/d/k;
-
-    return-object p0
-.end method
diff --git a/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig.smali b/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig.smali
index cfbcfdafba..abd24bba20 100644
--- a/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig.smali
+++ b/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig.smali
@@ -12,9 +12,11 @@
 
 
 # instance fields
-.field public final FA:Ljava/lang/String;
+.field public final FH:Lcom/facebook/cache/common/a;
 
-.field public final FB:Lcom/facebook/common/d/k;
+.field public final FR:Ljava/lang/String;
+
+.field public final FS:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -24,21 +26,19 @@
     .end annotation
 .end field
 
-.field public final FC:J
+.field public final FT:J
 
-.field public final FD:J
+.field public final FU:J
 
-.field public final FE:J
+.field public final FV:J
 
-.field public final FF:Lcom/facebook/cache/disk/g;
+.field public final FW:Lcom/facebook/cache/disk/g;
 
-.field public final FG:Lcom/facebook/cache/common/b;
+.field public final FX:Lcom/facebook/cache/common/b;
 
-.field public final FH:Lcom/facebook/common/a/a;
+.field public final FY:Lcom/facebook/common/a/a;
 
-.field public final FI:Z
-
-.field public final Fq:Lcom/facebook/cache/common/a;
+.field public final FZ:Z
 
 .field private final mContext:Landroid/content/Context;
 
@@ -55,7 +55,7 @@
 
     iput v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->mVersion:I
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FA:Ljava/lang/String;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FR:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -63,9 +63,9 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FA:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FR:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FB:Lcom/facebook/common/d/k;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FS:Lcom/facebook/common/d/k;
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -73,21 +73,21 @@
 
     check-cast v0, Lcom/facebook/common/d/k;
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FB:Lcom/facebook/common/d/k;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FS:Lcom/facebook/common/d/k;
 
-    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FJ:J
+    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Ga:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FC:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FT:J
 
-    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FK:J
+    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Gb:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FD:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FU:J
 
-    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FL:J
+    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Gc:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FE:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FV:J
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FF:Lcom/facebook/cache/disk/g;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FW:Lcom/facebook/cache/disk/g;
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -95,63 +95,63 @@
 
     check-cast v0, Lcom/facebook/cache/disk/g;
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FF:Lcom/facebook/cache/disk/g;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FW:Lcom/facebook/cache/disk/g;
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Fq:Lcom/facebook/cache/common/a;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FH:Lcom/facebook/cache/common/a;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/cache/common/e;->fh()Lcom/facebook/cache/common/e;
+    invoke-static {}, Lcom/facebook/cache/common/e;->fm()Lcom/facebook/cache/common/e;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Fq:Lcom/facebook/cache/common/a;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FH:Lcom/facebook/cache/common/a;
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Fq:Lcom/facebook/cache/common/a;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FH:Lcom/facebook/cache/common/a;
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FG:Lcom/facebook/cache/common/b;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FX:Lcom/facebook/cache/common/b;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/facebook/cache/common/f;->fi()Lcom/facebook/cache/common/f;
+    invoke-static {}, Lcom/facebook/cache/common/f;->fn()Lcom/facebook/cache/common/f;
 
     move-result-object v0
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FG:Lcom/facebook/cache/common/b;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FX:Lcom/facebook/cache/common/b;
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FG:Lcom/facebook/cache/common/b;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FX:Lcom/facebook/cache/common/b;
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FH:Lcom/facebook/common/a/a;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FY:Lcom/facebook/common/a/a;
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/facebook/common/a/b;->fv()Lcom/facebook/common/a/b;
+    invoke-static {}, Lcom/facebook/common/a/b;->fz()Lcom/facebook/common/a/b;
 
     move-result-object v0
 
     goto :goto_2
 
     :cond_2
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FH:Lcom/facebook/common/a/a;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FY:Lcom/facebook/common/a/a;
 
     :goto_2
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FH:Lcom/facebook/common/a/a;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FY:Lcom/facebook/common/a/a;
 
     iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->mContext:Landroid/content/Context;
 
     iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->mContext:Landroid/content/Context;
 
-    iget-boolean p1, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FI:Z
+    iget-boolean p1, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->FZ:Z
 
-    iput-boolean p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FI:Z
+    iput-boolean p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->FZ:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/cache/disk/a.smali b/com.discord/smali/com/facebook/cache/disk/a.smali
index eed16917e3..ea959ec863 100644
--- a/com.discord/smali/com/facebook/cache/disk/a.smali
+++ b/com.discord/smali/com/facebook/cache/disk/a.smali
@@ -20,7 +20,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -29,19 +29,19 @@
     .end annotation
 .end field
 
-.field static final Fm:J
+.field static final FD:J
 
 
 # instance fields
-.field private final Fn:Ljava/io/File;
+.field private final FE:Ljava/io/File;
 
-.field private final Fo:Z
+.field private final FF:Z
 
-.field private final Fp:Ljava/io/File;
+.field private final FG:Ljava/io/File;
 
-.field private final Fq:Lcom/facebook/cache/common/a;
+.field private final FH:Lcom/facebook/cache/common/a;
 
-.field private final Fr:Lcom/facebook/common/time/a;
+.field private final FI:Lcom/facebook/common/time/a;
 
 
 # direct methods
@@ -50,7 +50,7 @@
 
     const-class v0, Lcom/facebook/cache/disk/a;
 
-    sput-object v0, Lcom/facebook/cache/disk/a;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/cache/disk/a;->FC:Ljava/lang/Class;
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->MINUTES:Ljava/util/concurrent/TimeUnit;
 
@@ -60,7 +60,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lcom/facebook/cache/disk/a;->Fm:J
+    sput-wide v0, Lcom/facebook/cache/disk/a;->FD:J
 
     return-void
 .end method
@@ -72,17 +72,17 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/a;->Fn:Ljava/io/File;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a;->FE:Ljava/io/File;
 
     invoke-static {p1}, Lcom/facebook/cache/disk/a;->h(Ljava/io/File;)Z
 
     move-result p1
 
-    iput-boolean p1, p0, Lcom/facebook/cache/disk/a;->Fo:Z
+    iput-boolean p1, p0, Lcom/facebook/cache/disk/a;->FF:Z
 
     new-instance p1, Ljava/io/File;
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a;->Fn:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a;->FE:Ljava/io/File;
 
     const/4 v1, 0x3
 
@@ -122,11 +122,11 @@
 
     invoke-direct {p1, v0, p2}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/a;->Fp:Ljava/io/File;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a;->FG:Ljava/io/File;
 
-    iput-object p3, p0, Lcom/facebook/cache/disk/a;->Fq:Lcom/facebook/cache/common/a;
+    iput-object p3, p0, Lcom/facebook/cache/disk/a;->FH:Lcom/facebook/cache/common/a;
 
-    iget-object p1, p0, Lcom/facebook/cache/disk/a;->Fn:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a;->FE:Ljava/io/File;
 
     invoke-virtual {p1}, Ljava/io/File;->exists()Z
 
@@ -137,7 +137,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/cache/disk/a;->Fp:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a;->FG:Ljava/io/File;
 
     invoke-virtual {p1}, Ljava/io/File;->exists()Z
 
@@ -145,9 +145,9 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/cache/disk/a;->Fn:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a;->FE:Ljava/io/File;
 
-    invoke-static {p1}, Lcom/facebook/common/c/a;->n(Ljava/io/File;)Z
+    invoke-static {p1}, Lcom/facebook/common/c/a;->m(Ljava/io/File;)Z
 
     goto :goto_0
 
@@ -158,16 +158,16 @@
     if-eqz v4, :cond_2
 
     :try_start_0
-    iget-object p1, p0, Lcom/facebook/cache/disk/a;->Fp:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a;->FG:Ljava/io/File;
 
-    invoke-static {p1}, Lcom/facebook/common/c/c;->o(Ljava/io/File;)V
+    invoke-static {p1}, Lcom/facebook/common/c/c;->n(Ljava/io/File;)V
     :try_end_0
     .catch Lcom/facebook/common/c/c$a; {:try_start_0 .. :try_end_0} :catch_0
 
     goto :goto_1
 
     :catch_0
-    sget p1, Lcom/facebook/cache/common/a$a;->EV:I
+    sget p1, Lcom/facebook/cache/common/a$a;->Fm:I
 
     new-instance p1, Ljava/lang/StringBuilder;
 
@@ -175,17 +175,17 @@
 
     invoke-direct {p1, p2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object p2, p0, Lcom/facebook/cache/disk/a;->Fp:Ljava/io/File;
+    iget-object p2, p0, Lcom/facebook/cache/disk/a;->FG:Ljava/io/File;
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     :cond_2
     :goto_1
-    invoke-static {}, Lcom/facebook/common/time/c;->fS()Lcom/facebook/common/time/c;
+    invoke-static {}, Lcom/facebook/common/time/c;->fW()Lcom/facebook/common/time/c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/a;->Fr:Lcom/facebook/common/time/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a;->FI:Lcom/facebook/common/time/a;
 
     return-void
 .end method
@@ -282,9 +282,9 @@
     :goto_2
     if-eqz v1, :cond_6
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/a$c;->Fv:Ljava/lang/String;
+    iget-object v0, v1, Lcom/facebook/cache/disk/a$c;->FM:Ljava/lang/String;
 
-    invoke-direct {p0, v0}, Lcom/facebook/cache/disk/a;->ap(Ljava/lang/String;)Ljava/io/File;
+    invoke-direct {p0, v0}, Lcom/facebook/cache/disk/a;->al(Ljava/lang/String;)Ljava/io/File;
 
     move-result-object p0
 
@@ -307,12 +307,12 @@
 .method static synthetic a(Lcom/facebook/cache/disk/a;)Ljava/io/File;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/cache/disk/a;->Fp:Ljava/io/File;
+    iget-object p0, p0, Lcom/facebook/cache/disk/a;->FG:Ljava/io/File;
 
     return-object p0
 .end method
 
-.method private ao(Ljava/lang/String;)Ljava/lang/String;
+.method private ak(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
@@ -333,7 +333,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/a;->Fp:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a;->FG:Ljava/io/File;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -350,12 +350,12 @@
     return-object p1
 .end method
 
-.method private ap(Ljava/lang/String;)Ljava/io/File;
+.method private al(Ljava/lang/String;)Ljava/io/File;
     .locals 1
 
     new-instance v0, Ljava/io/File;
 
-    invoke-direct {p0, p1}, Lcom/facebook/cache/disk/a;->ao(Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {p0, p1}, Lcom/facebook/cache/disk/a;->ak(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -367,7 +367,7 @@
 .method static synthetic b(Lcom/facebook/cache/disk/a;)Ljava/io/File;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/cache/disk/a;->Fn:Ljava/io/File;
+    iget-object p0, p0, Lcom/facebook/cache/disk/a;->FE:Ljava/io/File;
 
     return-object p0
 .end method
@@ -375,7 +375,7 @@
 .method static synthetic c(Lcom/facebook/cache/disk/a;)Lcom/facebook/common/time/a;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/cache/disk/a;->Fr:Lcom/facebook/common/time/a;
+    iget-object p0, p0, Lcom/facebook/cache/disk/a;->FI:Lcom/facebook/common/time/a;
 
     return-object p0
 .end method
@@ -383,15 +383,15 @@
 .method static synthetic d(Lcom/facebook/cache/disk/a;)Lcom/facebook/cache/common/a;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/cache/disk/a;->Fq:Lcom/facebook/cache/common/a;
+    iget-object p0, p0, Lcom/facebook/cache/disk/a;->FH:Lcom/facebook/cache/common/a;
 
     return-object p0
 .end method
 
-.method static synthetic fl()Ljava/lang/Class;
+.method static synthetic fq()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/cache/disk/a;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/cache/disk/a;->FC:Ljava/lang/Class;
 
     return-object v0
 .end method
@@ -428,14 +428,14 @@
 
     :catch_0
     :try_start_2
-    sget p0, Lcom/facebook/cache/common/a$a;->Fb:I
+    sget p0, Lcom/facebook/cache/common/a$a;->Fs:I
     :try_end_2
     .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_1
 
     goto :goto_0
 
     :catch_1
-    sget p0, Lcom/facebook/cache/common/a$a;->Fb:I
+    sget p0, Lcom/facebook/cache/common/a$a;->Fs:I
 
     :cond_0
     :goto_0
@@ -484,7 +484,7 @@
 
     check-cast p1, Lcom/facebook/cache/disk/a$b;
 
-    iget-object p1, p1, Lcom/facebook/cache/disk/a$b;->Fu:Lcom/facebook/a/b;
+    iget-object p1, p1, Lcom/facebook/cache/disk/a$b;->FL:Lcom/facebook/a/b;
 
     iget-object p1, p1, Lcom/facebook/a/b;->mFile:Ljava/io/File;
 
@@ -495,7 +495,7 @@
     return-wide v0
 .end method
 
-.method final an(Ljava/lang/String;)Ljava/io/File;
+.method final aj(Ljava/lang/String;)Ljava/io/File;
     .locals 4
 
     new-instance v0, Ljava/io/File;
@@ -508,9 +508,9 @@
 
     invoke-direct {v1, v2, p1, v3}, Lcom/facebook/cache/disk/a$c;-><init>(Ljava/lang/String;Ljava/lang/String;B)V
 
-    iget-object p1, v1, Lcom/facebook/cache/disk/a$c;->Fv:Ljava/lang/String;
+    iget-object p1, v1, Lcom/facebook/cache/disk/a$c;->FM:Ljava/lang/String;
 
-    invoke-direct {p0, p1}, Lcom/facebook/cache/disk/a;->ao(Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {p0, p1}, Lcom/facebook/cache/disk/a;->ak(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -524,7 +524,7 @@
 
     invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p1, v1, Lcom/facebook/cache/disk/a$c;->Fv:Ljava/lang/String;
+    iget-object p1, v1, Lcom/facebook/cache/disk/a$c;->FM:Ljava/lang/String;
 
     invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -541,10 +541,10 @@
     return-object v0
 .end method
 
-.method public final aq(Ljava/lang/String;)J
+.method public final am(Ljava/lang/String;)J
     .locals 2
 
-    invoke-virtual {p0, p1}, Lcom/facebook/cache/disk/a;->an(Ljava/lang/String;)Ljava/io/File;
+    invoke-virtual {p0, p1}, Lcom/facebook/cache/disk/a;->aj(Ljava/lang/String;)Ljava/io/File;
 
     move-result-object p1
 
@@ -571,9 +571,9 @@
 
     invoke-direct {p2, v0, p1, v1}, Lcom/facebook/cache/disk/a$c;-><init>(Ljava/lang/String;Ljava/lang/String;B)V
 
-    iget-object v1, p2, Lcom/facebook/cache/disk/a$c;->Fv:Ljava/lang/String;
+    iget-object v1, p2, Lcom/facebook/cache/disk/a$c;->FM:Ljava/lang/String;
 
-    invoke-direct {p0, v1}, Lcom/facebook/cache/disk/a;->ap(Ljava/lang/String;)Ljava/io/File;
+    invoke-direct {p0, v1}, Lcom/facebook/cache/disk/a;->al(Ljava/lang/String;)Ljava/io/File;
 
     move-result-object v1
 
@@ -584,7 +584,7 @@
     if-nez v2, :cond_0
 
     :try_start_0
-    invoke-static {v1}, Lcom/facebook/common/c/c;->o(Ljava/io/File;)V
+    invoke-static {v1}, Lcom/facebook/common/c/c;->n(Ljava/io/File;)V
     :try_end_0
     .catch Lcom/facebook/common/c/c$a; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -593,7 +593,7 @@
     :catch_0
     move-exception p1
 
-    sget p2, Lcom/facebook/cache/common/a$a;->EV:I
+    sget p2, Lcom/facebook/cache/common/a$a;->Fm:I
 
     throw p1
 
@@ -604,7 +604,7 @@
 
     invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object p2, p2, Lcom/facebook/cache/disk/a$c;->Fv:Ljava/lang/String;
+    iget-object p2, p2, Lcom/facebook/cache/disk/a$c;->FM:Ljava/lang/String;
 
     invoke-virtual {v2, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -631,7 +631,7 @@
     :catch_1
     move-exception p1
 
-    sget p2, Lcom/facebook/cache/common/a$a;->EP:I
+    sget p2, Lcom/facebook/cache/common/a$a;->Fh:I
 
     throw p1
 .end method
@@ -641,7 +641,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-virtual {p0, p1}, Lcom/facebook/cache/disk/a;->an(Ljava/lang/String;)Ljava/io/File;
+    invoke-virtual {p0, p1}, Lcom/facebook/cache/disk/a;->aj(Ljava/lang/String;)Ljava/io/File;
 
     move-result-object p1
 
@@ -651,7 +651,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/cache/disk/a;->Fr:Lcom/facebook/common/time/a;
+    iget-object p2, p0, Lcom/facebook/cache/disk/a;->FI:Lcom/facebook/common/time/a;
 
     invoke-interface {p2}, Lcom/facebook/common/time/a;->now()J
 
@@ -671,10 +671,10 @@
     return-object p1
 .end method
 
-.method public final fj()V
+.method public final fo()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a;->Fn:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a;->FE:Ljava/io/File;
 
     new-instance v1, Lcom/facebook/cache/disk/a$f;
 
@@ -687,7 +687,7 @@
     return-void
 .end method
 
-.method public final synthetic fk()Ljava/util/Collection;
+.method public final synthetic fp()Ljava/util/Collection;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -701,11 +701,11 @@
 
     invoke-direct {v0, p0, v1}, Lcom/facebook/cache/disk/a$a;-><init>(Lcom/facebook/cache/disk/a;B)V
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/a;->Fp:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a;->FG:Ljava/io/File;
 
     invoke-static {v1, v0}, Lcom/facebook/common/c/a;->a(Ljava/io/File;Lcom/facebook/common/c/b;)V
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/a$a;->Fs:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/cache/disk/a$a;->FJ:Ljava/util/List;
 
     invoke-static {v0}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
 
@@ -717,7 +717,7 @@
 .method public final isExternal()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/cache/disk/a;->Fo:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a;->FF:Z
 
     return v0
 .end method
diff --git a/com.discord/smali/com/facebook/cache/disk/c.smali b/com.discord/smali/com/facebook/cache/disk/c.smali
index 698186e11c..45a483950d 100644
--- a/com.discord/smali/com/facebook/cache/disk/c.smali
+++ b/com.discord/smali/com/facebook/cache/disk/c.smali
@@ -21,7 +21,7 @@
     .end annotation
 .end method
 
-.method public abstract aq(Ljava/lang/String;)J
+.method public abstract am(Ljava/lang/String;)J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -45,10 +45,10 @@
     .end annotation
 .end method
 
-.method public abstract fj()V
+.method public abstract fo()V
 .end method
 
-.method public abstract fk()Ljava/util/Collection;
+.method public abstract fp()Ljava/util/Collection;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali/com/facebook/cache/disk/d.smali b/com.discord/smali/com/facebook/cache/disk/d.smali
index cb4a87e6ad..b99d0460d4 100644
--- a/com.discord/smali/com/facebook/cache/disk/d.smali
+++ b/com.discord/smali/com/facebook/cache/disk/d.smali
@@ -16,11 +16,7 @@
 
 
 # static fields
-.field private static final FN:J
-
-.field private static final FO:J
-
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -29,23 +25,31 @@
     .end annotation
 .end field
 
+.field private static final Ge:J
+
+.field private static final Gf:J
+
 
 # instance fields
-.field private final FF:Lcom/facebook/cache/disk/g;
+.field private final FH:Lcom/facebook/cache/common/a;
 
-.field private final FG:Lcom/facebook/cache/common/b;
+.field private final FI:Lcom/facebook/common/time/a;
 
-.field private final FI:Z
+.field private final FW:Lcom/facebook/cache/disk/g;
 
-.field private final FP:J
+.field private final FX:Lcom/facebook/cache/common/b;
 
-.field private final FQ:J
+.field private final FZ:Z
 
-.field private final FR:Ljava/util/concurrent/CountDownLatch;
+.field private final Gg:J
 
-.field private FS:J
+.field private final Gh:J
 
-.field final FT:Ljava/util/Set;
+.field private final Gi:Ljava/util/concurrent/CountDownLatch;
+
+.field private Gj:J
+
+.field final Gk:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -55,21 +59,17 @@
     .end annotation
 .end field
 
-.field private FU:J
+.field private Gl:J
 
-.field private final FV:J
+.field private final Gm:J
 
-.field private final FW:Lcom/facebook/common/h/a;
+.field private final Gn:Lcom/facebook/common/h/a;
 
-.field private final FX:Lcom/facebook/cache/disk/c;
+.field private final Go:Lcom/facebook/cache/disk/c;
 
-.field private final FY:Lcom/facebook/cache/disk/d$a;
+.field private final Gp:Lcom/facebook/cache/disk/d$a;
 
-.field private FZ:Z
-
-.field private final Fq:Lcom/facebook/cache/common/a;
-
-.field private final Fr:Lcom/facebook/common/time/a;
+.field private Gq:Z
 
 .field private final mLock:Ljava/lang/Object;
 
@@ -80,7 +80,7 @@
 
     const-class v0, Lcom/facebook/cache/disk/d;
 
-    sput-object v0, Lcom/facebook/cache/disk/d;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/cache/disk/d;->FC:Ljava/lang/Class;
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->HOURS:Ljava/util/concurrent/TimeUnit;
 
@@ -90,7 +90,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lcom/facebook/cache/disk/d;->FN:J
+    sput-wide v0, Lcom/facebook/cache/disk/d;->Ge:J
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->MINUTES:Ljava/util/concurrent/TimeUnit;
 
@@ -100,7 +100,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lcom/facebook/cache/disk/d;->FO:J
+    sput-wide v0, Lcom/facebook/cache/disk/d;->Gf:J
 
     return-void
 .end method
@@ -116,61 +116,61 @@
 
     iput-object v0, p0, Lcom/facebook/cache/disk/d;->mLock:Ljava/lang/Object;
 
-    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->FP:J
+    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->Gg:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->FP:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Gg:J
 
-    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->FQ:J
+    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->Gh:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->FQ:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Gh:J
 
-    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->FQ:J
+    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->Gh:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->FS:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Gj:J
 
-    invoke-static {}, Lcom/facebook/common/h/a;->fO()Lcom/facebook/common/h/a;
+    invoke-static {}, Lcom/facebook/common/h/a;->fS()Lcom/facebook/common/h/a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/d;->FW:Lcom/facebook/common/h/a;
+    iput-object v0, p0, Lcom/facebook/cache/disk/d;->Gn:Lcom/facebook/common/h/a;
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/d;->FX:Lcom/facebook/cache/disk/c;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Go:Lcom/facebook/cache/disk/c;
 
-    iput-object p2, p0, Lcom/facebook/cache/disk/d;->FF:Lcom/facebook/cache/disk/g;
+    iput-object p2, p0, Lcom/facebook/cache/disk/d;->FW:Lcom/facebook/cache/disk/g;
 
     const-wide/16 p1, -0x1
 
-    iput-wide p1, p0, Lcom/facebook/cache/disk/d;->FU:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d;->Gl:J
 
-    iput-object p4, p0, Lcom/facebook/cache/disk/d;->FG:Lcom/facebook/cache/common/b;
+    iput-object p4, p0, Lcom/facebook/cache/disk/d;->FX:Lcom/facebook/cache/common/b;
 
-    iget-wide p1, p3, Lcom/facebook/cache/disk/d$b;->FV:J
+    iget-wide p1, p3, Lcom/facebook/cache/disk/d$b;->Gm:J
 
-    iput-wide p1, p0, Lcom/facebook/cache/disk/d;->FV:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d;->Gm:J
 
-    iput-object p5, p0, Lcom/facebook/cache/disk/d;->Fq:Lcom/facebook/cache/common/a;
+    iput-object p5, p0, Lcom/facebook/cache/disk/d;->FH:Lcom/facebook/cache/common/a;
 
     new-instance p1, Lcom/facebook/cache/disk/d$a;
 
     invoke-direct {p1}, Lcom/facebook/cache/disk/d$a;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/d;->FY:Lcom/facebook/cache/disk/d$a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Gp:Lcom/facebook/cache/disk/d$a;
 
-    invoke-static {}, Lcom/facebook/common/time/c;->fS()Lcom/facebook/common/time/c;
+    invoke-static {}, Lcom/facebook/common/time/c;->fW()Lcom/facebook/common/time/c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Fr:Lcom/facebook/common/time/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->FI:Lcom/facebook/common/time/a;
 
-    iput-boolean p7, p0, Lcom/facebook/cache/disk/d;->FI:Z
+    iput-boolean p7, p0, Lcom/facebook/cache/disk/d;->FZ:Z
 
     new-instance p1, Ljava/util/HashSet;
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/d;->FT:Ljava/util/Set;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Gk:Ljava/util/Set;
 
-    iget-boolean p1, p0, Lcom/facebook/cache/disk/d;->FI:Z
+    iget-boolean p1, p0, Lcom/facebook/cache/disk/d;->FZ:Z
 
     if-eqz p1, :cond_0
 
@@ -180,7 +180,7 @@
 
     invoke-direct {p1, p2}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/d;->FR:Ljava/util/concurrent/CountDownLatch;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Gi:Ljava/util/concurrent/CountDownLatch;
 
     new-instance p1, Lcom/facebook/cache/disk/d$1;
 
@@ -197,7 +197,7 @@
 
     invoke-direct {p1, p2}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/d;->FR:Ljava/util/concurrent/CountDownLatch;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Gi:Ljava/util/concurrent/CountDownLatch;
 
     return-void
 .end method
@@ -215,15 +215,15 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->fm()Lcom/facebook/a/a;
+    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->fr()Lcom/facebook/a/a;
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/d;->FT:Ljava/util/Set;
+    iget-object v1, p0, Lcom/facebook/cache/disk/d;->Gk:Ljava/util/Set;
 
     invoke-interface {v1, p2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    iget-object p2, p0, Lcom/facebook/cache/disk/d;->FY:Lcom/facebook/cache/disk/d$a;
+    iget-object p2, p0, Lcom/facebook/cache/disk/d;->Gp:Lcom/facebook/cache/disk/d$a;
 
     invoke-interface {p1}, Lcom/facebook/a/a;->size()J
 
@@ -262,11 +262,11 @@
     monitor-enter v2
 
     :try_start_0
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/cache/disk/d;->fr()Z
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/cache/disk/d;->fv()Z
 
     move-result v0
 
-    iget-object v3, v1, Lcom/facebook/cache/disk/d;->FX:Lcom/facebook/cache/disk/c;
+    iget-object v3, v1, Lcom/facebook/cache/disk/d;->Go:Lcom/facebook/cache/disk/c;
 
     invoke-interface {v3}, Lcom/facebook/cache/disk/c;->isExternal()Z
 
@@ -274,19 +274,19 @@
 
     if-eqz v3, :cond_0
 
-    sget v3, Lcom/facebook/common/h/a$a;->Hs:I
+    sget v3, Lcom/facebook/common/h/a$a;->HJ:I
 
     goto :goto_0
 
     :cond_0
-    sget v3, Lcom/facebook/common/h/a$a;->Hr:I
+    sget v3, Lcom/facebook/common/h/a$a;->HI:I
 
     :goto_0
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->FW:Lcom/facebook/common/h/a;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Gn:Lcom/facebook/common/h/a;
 
-    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->FQ:J
+    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Gh:J
 
-    iget-object v7, v1, Lcom/facebook/cache/disk/d;->FY:Lcom/facebook/cache/disk/d$a;
+    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Gp:Lcom/facebook/cache/disk/d$a;
 
     invoke-virtual {v7}, Lcom/facebook/cache/disk/d$a;->getSize()J
 
@@ -294,11 +294,11 @@
 
     sub-long/2addr v5, v7
 
-    invoke-virtual {v4}, Lcom/facebook/common/h/a;->fP()V
+    invoke-virtual {v4}, Lcom/facebook/common/h/a;->fT()V
 
-    invoke-virtual {v4}, Lcom/facebook/common/h/a;->fP()V
+    invoke-virtual {v4}, Lcom/facebook/common/h/a;->fT()V
 
-    iget-object v7, v4, Lcom/facebook/common/h/a;->Hq:Ljava/util/concurrent/locks/Lock;
+    iget-object v7, v4, Lcom/facebook/common/h/a;->HH:Ljava/util/concurrent/locks/Lock;
 
     invoke-interface {v7}, Ljava/util/concurrent/locks/Lock;->tryLock()Z
 
@@ -313,23 +313,23 @@
 
     move-result-wide v7
 
-    iget-wide v9, v4, Lcom/facebook/common/h/a;->Hp:J
+    iget-wide v9, v4, Lcom/facebook/common/h/a;->HG:J
 
     sub-long/2addr v7, v9
 
-    sget-wide v9, Lcom/facebook/common/h/a;->Hk:J
+    sget-wide v9, Lcom/facebook/common/h/a;->HB:J
 
     cmp-long v11, v7, v9
 
     if-lez v11, :cond_1
 
-    invoke-virtual {v4}, Lcom/facebook/common/h/a;->fQ()V
+    invoke-virtual {v4}, Lcom/facebook/common/h/a;->fU()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :cond_1
     :try_start_2
-    iget-object v7, v4, Lcom/facebook/common/h/a;->Hq:Ljava/util/concurrent/locks/Lock;
+    iget-object v7, v4, Lcom/facebook/common/h/a;->HH:Ljava/util/concurrent/locks/Lock;
 
     invoke-interface {v7}, Ljava/util/concurrent/locks/Lock;->unlock()V
 
@@ -338,7 +338,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v3, v4, Lcom/facebook/common/h/a;->Hq:Ljava/util/concurrent/locks/Lock;
+    iget-object v3, v4, Lcom/facebook/common/h/a;->HH:Ljava/util/concurrent/locks/Lock;
 
     invoke-interface {v3}, Ljava/util/concurrent/locks/Lock;->unlock()V
 
@@ -346,16 +346,16 @@
 
     :cond_2
     :goto_1
-    sget v7, Lcom/facebook/common/h/a$a;->Hr:I
+    sget v7, Lcom/facebook/common/h/a$a;->HI:I
 
     if-ne v3, v7, :cond_3
 
-    iget-object v3, v4, Lcom/facebook/common/h/a;->Hl:Landroid/os/StatFs;
+    iget-object v3, v4, Lcom/facebook/common/h/a;->HC:Landroid/os/StatFs;
 
     goto :goto_2
 
     :cond_3
-    iget-object v3, v4, Lcom/facebook/common/h/a;->Hn:Landroid/os/StatFs;
+    iget-object v3, v4, Lcom/facebook/common/h/a;->HE:Landroid/os/StatFs;
 
     :goto_2
     const-wide/16 v7, 0x0
@@ -420,25 +420,25 @@
     :goto_5
     if-eqz v3, :cond_7
 
-    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->FP:J
+    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->Gg:J
 
-    iput-wide v3, v1, Lcom/facebook/cache/disk/d;->FS:J
+    iput-wide v3, v1, Lcom/facebook/cache/disk/d;->Gj:J
 
     goto :goto_6
 
     :cond_7
-    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->FQ:J
+    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->Gh:J
 
-    iput-wide v3, v1, Lcom/facebook/cache/disk/d;->FS:J
+    iput-wide v3, v1, Lcom/facebook/cache/disk/d;->Gj:J
 
     :goto_6
-    iget-object v3, v1, Lcom/facebook/cache/disk/d;->FY:Lcom/facebook/cache/disk/d$a;
+    iget-object v3, v1, Lcom/facebook/cache/disk/d;->Gp:Lcom/facebook/cache/disk/d$a;
 
     invoke-virtual {v3}, Lcom/facebook/cache/disk/d$a;->getSize()J
 
     move-result-wide v3
 
-    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->FS:J
+    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Gj:J
 
     cmp-long v10, v3, v5
 
@@ -446,20 +446,20 @@
 
     if-nez v0, :cond_8
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->FY:Lcom/facebook/cache/disk/d$a;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Gp:Lcom/facebook/cache/disk/d$a;
 
     invoke-virtual {v0}, Lcom/facebook/cache/disk/d$a;->reset()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/cache/disk/d;->fr()Z
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/cache/disk/d;->fv()Z
 
     :cond_8
-    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->FS:J
+    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Gj:J
 
     cmp-long v0, v3, v5
 
     if-lez v0, :cond_d
 
-    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->FS:J
+    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->Gj:J
 
     const-wide/16 v5, 0x9
 
@@ -469,24 +469,24 @@
 
     div-long/2addr v3, v5
 
-    sget v0, Lcom/facebook/cache/common/b$a;->Fd:I
+    sget v0, Lcom/facebook/cache/common/b$a;->Fu:I
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
-    iget-object v5, v1, Lcom/facebook/cache/disk/d;->FX:Lcom/facebook/cache/disk/c;
+    iget-object v5, v1, Lcom/facebook/cache/disk/d;->Go:Lcom/facebook/cache/disk/c;
 
-    invoke-interface {v5}, Lcom/facebook/cache/disk/c;->fk()Ljava/util/Collection;
+    invoke-interface {v5}, Lcom/facebook/cache/disk/c;->fp()Ljava/util/Collection;
 
     move-result-object v5
 
-    iget-object v6, v1, Lcom/facebook/cache/disk/d;->Fr:Lcom/facebook/common/time/a;
+    iget-object v6, v1, Lcom/facebook/cache/disk/d;->FI:Lcom/facebook/common/time/a;
 
     invoke-interface {v6}, Lcom/facebook/common/time/a;->now()J
 
     move-result-wide v10
 
-    sget-wide v12, Lcom/facebook/cache/disk/d;->FN:J
+    sget-wide v12, Lcom/facebook/cache/disk/d;->Ge:J
 
     add-long/2addr v10, v12
 
@@ -541,9 +541,9 @@
     goto :goto_7
 
     :cond_a
-    iget-object v5, v1, Lcom/facebook/cache/disk/d;->FF:Lcom/facebook/cache/disk/g;
+    iget-object v5, v1, Lcom/facebook/cache/disk/d;->FW:Lcom/facebook/cache/disk/g;
 
-    invoke-interface {v5}, Lcom/facebook/cache/disk/g;->fo()Lcom/facebook/cache/disk/f;
+    invoke-interface {v5}, Lcom/facebook/cache/disk/g;->ft()Lcom/facebook/cache/disk/f;
 
     move-result-object v5
 
@@ -555,7 +555,7 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     :try_start_4
-    iget-object v5, v1, Lcom/facebook/cache/disk/d;->FY:Lcom/facebook/cache/disk/d$a;
+    iget-object v5, v1, Lcom/facebook/cache/disk/d;->Gp:Lcom/facebook/cache/disk/d$a;
 
     invoke-virtual {v5}, Lcom/facebook/cache/disk/d$a;->getSize()J
 
@@ -586,7 +586,7 @@
 
     if-gtz v16, :cond_c
 
-    iget-object v7, v1, Lcom/facebook/cache/disk/d;->FX:Lcom/facebook/cache/disk/c;
+    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Go:Lcom/facebook/cache/disk/c;
 
     invoke-interface {v7, v6}, Lcom/facebook/cache/disk/c;->a(Lcom/facebook/cache/disk/c$a;)J
 
@@ -594,7 +594,7 @@
 
     move-object/from16 v17, v5
 
-    iget-object v5, v1, Lcom/facebook/cache/disk/d;->FT:Ljava/util/Set;
+    iget-object v5, v1, Lcom/facebook/cache/disk/d;->Gk:Ljava/util/Set;
 
     move-wide/from16 v18, v12
 
@@ -614,7 +614,7 @@
 
     add-long/2addr v14, v7
 
-    invoke-static {}, Lcom/facebook/cache/disk/i;->fu()Lcom/facebook/cache/disk/i;
+    invoke-static {}, Lcom/facebook/cache/disk/i;->fy()Lcom/facebook/cache/disk/i;
 
     move-result-object v5
 
@@ -622,17 +622,17 @@
 
     move-result-object v6
 
-    iput-object v6, v5, Lcom/facebook/cache/disk/i;->Fw:Ljava/lang/String;
+    iput-object v6, v5, Lcom/facebook/cache/disk/i;->FN:Ljava/lang/String;
 
-    iput v0, v5, Lcom/facebook/cache/disk/i;->Go:I
+    iput v0, v5, Lcom/facebook/cache/disk/i;->GF:I
 
-    iput-wide v7, v5, Lcom/facebook/cache/disk/i;->Gk:J
+    iput-wide v7, v5, Lcom/facebook/cache/disk/i;->GB:J
 
     sub-long v6, v10, v14
 
-    iput-wide v6, v5, Lcom/facebook/cache/disk/i;->Gm:J
+    iput-wide v6, v5, Lcom/facebook/cache/disk/i;->GD:J
 
-    iput-wide v3, v5, Lcom/facebook/cache/disk/i;->Gl:J
+    iput-wide v3, v5, Lcom/facebook/cache/disk/i;->GC:J
 
     invoke-virtual {v5}, Lcom/facebook/cache/disk/i;->recycle()V
 
@@ -646,7 +646,7 @@
     goto :goto_8
 
     :cond_c
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->FY:Lcom/facebook/cache/disk/d$a;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Gp:Lcom/facebook/cache/disk/d$a;
 
     neg-long v3, v14
 
@@ -656,16 +656,16 @@
 
     invoke-virtual {v0, v3, v4, v5, v6}, Lcom/facebook/cache/disk/d$a;->b(JJ)V
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->FX:Lcom/facebook/cache/disk/c;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Go:Lcom/facebook/cache/disk/c;
 
-    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fj()V
+    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fo()V
 
     goto :goto_9
 
     :catch_0
     move-exception v0
 
-    sget v3, Lcom/facebook/cache/common/a$a;->EZ:I
+    sget v3, Lcom/facebook/cache/common/a$a;->Fq:I
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -687,7 +687,7 @@
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->FX:Lcom/facebook/cache/disk/c;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Go:Lcom/facebook/cache/disk/c;
 
     move-object/from16 v2, p1
 
@@ -727,7 +727,7 @@
 .method static synthetic b(Lcom/facebook/cache/disk/d;)Z
     .locals 0
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/d;->fr()Z
+    invoke-direct {p0}, Lcom/facebook/cache/disk/d;->fv()Z
 
     move-result p0
 
@@ -739,7 +739,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/cache/disk/d;->FZ:Z
+    iput-boolean v0, p0, Lcom/facebook/cache/disk/d;->Gq:Z
 
     return v0
 .end method
@@ -747,21 +747,21 @@
 .method static synthetic d(Lcom/facebook/cache/disk/d;)Ljava/util/concurrent/CountDownLatch;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/cache/disk/d;->FR:Ljava/util/concurrent/CountDownLatch;
+    iget-object p0, p0, Lcom/facebook/cache/disk/d;->Gi:Ljava/util/concurrent/CountDownLatch;
 
     return-object p0
 .end method
 
-.method private fr()Z
+.method private fv()Z
     .locals 7
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/d;->Fr:Lcom/facebook/common/time/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/d;->FI:Lcom/facebook/common/time/a;
 
     invoke-interface {v0}, Lcom/facebook/common/time/a;->now()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/facebook/cache/disk/d;->FY:Lcom/facebook/cache/disk/d$a;
+    iget-object v2, p0, Lcom/facebook/cache/disk/d;->Gp:Lcom/facebook/cache/disk/d$a;
 
     invoke-virtual {v2}, Lcom/facebook/cache/disk/d$a;->isInitialized()Z
 
@@ -769,7 +769,7 @@
 
     if-eqz v2, :cond_1
 
-    iget-wide v2, p0, Lcom/facebook/cache/disk/d;->FU:J
+    iget-wide v2, p0, Lcom/facebook/cache/disk/d;->Gl:J
 
     const-wide/16 v4, -0x1
 
@@ -779,7 +779,7 @@
 
     sub-long/2addr v0, v2
 
-    sget-wide v2, Lcom/facebook/cache/disk/d;->FO:J
+    sget-wide v2, Lcom/facebook/cache/disk/d;->Gf:J
 
     cmp-long v4, v0, v2
 
@@ -794,33 +794,33 @@
 
     :cond_1
     :goto_0
-    invoke-direct {p0}, Lcom/facebook/cache/disk/d;->fs()Z
+    invoke-direct {p0}, Lcom/facebook/cache/disk/d;->fw()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method private fs()Z
+.method private fw()Z
     .locals 23
 
     move-object/from16 v1, p0
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Fr:Lcom/facebook/common/time/a;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->FI:Lcom/facebook/common/time/a;
 
     invoke-interface {v0}, Lcom/facebook/common/time/a;->now()J
 
     move-result-wide v2
 
-    sget-wide v4, Lcom/facebook/cache/disk/d;->FN:J
+    sget-wide v4, Lcom/facebook/cache/disk/d;->Ge:J
 
     add-long/2addr v4, v2
 
-    iget-boolean v0, v1, Lcom/facebook/cache/disk/d;->FI:Z
+    iget-boolean v0, v1, Lcom/facebook/cache/disk/d;->FZ:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->FT:Ljava/util/Set;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Gk:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->isEmpty()Z
 
@@ -828,12 +828,12 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->FT:Ljava/util/Set;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Gk:Ljava/util/Set;
 
     goto :goto_0
 
     :cond_0
-    iget-boolean v0, v1, Lcom/facebook/cache/disk/d;->FI:Z
+    iget-boolean v0, v1, Lcom/facebook/cache/disk/d;->FZ:Z
 
     if-eqz v0, :cond_1
 
@@ -848,9 +848,9 @@
 
     :goto_0
     :try_start_0
-    iget-object v7, v1, Lcom/facebook/cache/disk/d;->FX:Lcom/facebook/cache/disk/c;
+    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Go:Lcom/facebook/cache/disk/c;
 
-    invoke-interface {v7}, Lcom/facebook/cache/disk/c;->fk()Ljava/util/Collection;
+    invoke-interface {v7}, Lcom/facebook/cache/disk/c;->fp()Ljava/util/Collection;
 
     move-result-object v7
 
@@ -938,7 +938,7 @@
     :cond_2
     move-object/from16 v18, v7
 
-    iget-boolean v6, v1, Lcom/facebook/cache/disk/d;->FI:Z
+    iget-boolean v6, v1, Lcom/facebook/cache/disk/d;->FZ:Z
 
     if-eqz v6, :cond_3
 
@@ -956,7 +956,7 @@
     :cond_4
     if-eqz v15, :cond_5
 
-    sget v4, Lcom/facebook/cache/common/a$a;->EN:I
+    sget v4, Lcom/facebook/cache/common/a$a;->Ff:I
 
     new-instance v4, Ljava/lang/StringBuilder;
 
@@ -983,7 +983,7 @@
     invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_5
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->FY:Lcom/facebook/cache/disk/d$a;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Gp:Lcom/facebook/cache/disk/d$a;
 
     invoke-virtual {v4}, Lcom/facebook/cache/disk/d$a;->getCount()J
 
@@ -995,7 +995,7 @@
 
     if-nez v8, :cond_6
 
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->FY:Lcom/facebook/cache/disk/d$a;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Gp:Lcom/facebook/cache/disk/d$a;
 
     invoke-virtual {v4}, Lcom/facebook/cache/disk/d$a;->getSize()J
 
@@ -1006,31 +1006,31 @@
     if-eqz v8, :cond_8
 
     :cond_6
-    iget-boolean v4, v1, Lcom/facebook/cache/disk/d;->FI:Z
+    iget-boolean v4, v1, Lcom/facebook/cache/disk/d;->FZ:Z
 
     if-eqz v4, :cond_7
 
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->FT:Ljava/util/Set;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Gk:Ljava/util/Set;
 
     if-eq v4, v0, :cond_7
 
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->FT:Ljava/util/Set;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Gk:Ljava/util/Set;
 
     invoke-interface {v4}, Ljava/util/Set;->clear()V
 
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->FT:Ljava/util/Set;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Gk:Ljava/util/Set;
 
     invoke-interface {v4, v0}, Ljava/util/Set;->addAll(Ljava/util/Collection;)Z
 
     :cond_7
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->FY:Lcom/facebook/cache/disk/d$a;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Gp:Lcom/facebook/cache/disk/d$a;
 
     invoke-virtual {v0, v11, v12, v6, v7}, Lcom/facebook/cache/disk/d$a;->set(JJ)V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :cond_8
-    iput-wide v2, v1, Lcom/facebook/cache/disk/d;->FU:J
+    iput-wide v2, v1, Lcom/facebook/cache/disk/d;->Gl:J
 
     const/4 v0, 0x1
 
@@ -1039,7 +1039,7 @@
     :catch_0
     move-exception v0
 
-    sget v2, Lcom/facebook/cache/common/a$a;->Fa:I
+    sget v2, Lcom/facebook/cache/common/a$a;->Fr:I
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -1068,11 +1068,11 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/cache/disk/i;->fu()Lcom/facebook/cache/disk/i;
+    invoke-static {}, Lcom/facebook/cache/disk/i;->fy()Lcom/facebook/cache/disk/i;
 
     move-result-object v0
 
-    iput-object p1, v0, Lcom/facebook/cache/disk/i;->Gj:Lcom/facebook/cache/common/CacheKey;
+    iput-object p1, v0, Lcom/facebook/cache/disk/i;->GA:Lcom/facebook/cache/common/CacheKey;
 
     iget-object v1, p0, Lcom/facebook/cache/disk/d;->mLock:Ljava/lang/Object;
 
@@ -1087,7 +1087,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
-    iput-object v2, v0, Lcom/facebook/cache/disk/i;->Fw:Ljava/lang/String;
+    iput-object v2, v0, Lcom/facebook/cache/disk/i;->FN:Ljava/lang/String;
 
     :try_start_1
     invoke-direct {p0, v2, p1}, Lcom/facebook/cache/disk/d;->a(Ljava/lang/String;Lcom/facebook/cache/common/CacheKey;)Lcom/facebook/cache/disk/c$b;
@@ -1108,26 +1108,26 @@
 
     move-result-wide v1
 
-    iput-wide v1, v0, Lcom/facebook/cache/disk/i;->Gk:J
+    iput-wide v1, v0, Lcom/facebook/cache/disk/i;->GB:J
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/d;->FY:Lcom/facebook/cache/disk/d$a;
+    iget-object v1, p0, Lcom/facebook/cache/disk/d;->Gp:Lcom/facebook/cache/disk/d$a;
 
     invoke-virtual {v1}, Lcom/facebook/cache/disk/d$a;->getSize()J
 
     move-result-wide v1
 
-    iput-wide v1, v0, Lcom/facebook/cache/disk/i;->Gm:J
+    iput-wide v1, v0, Lcom/facebook/cache/disk/i;->GD:J
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->fn()Z
+    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->fs()Z
 
     move-result p1
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/facebook/cache/disk/d;->Fl:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/cache/disk/d;->FC:Ljava/lang/Class;
 
     const-string v1, "Failed to delete temp file"
 
@@ -1145,13 +1145,13 @@
     move-exception p2
 
     :try_start_4
-    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->fn()Z
+    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->fs()Z
 
     move-result p1
 
     if-nez p1, :cond_1
 
-    sget-object p1, Lcom/facebook/cache/disk/d;->Fl:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/cache/disk/d;->FC:Ljava/lang/Class;
 
     const-string v1, "Failed to delete temp file"
 
@@ -1172,9 +1172,9 @@
     move-exception p1
 
     :try_start_5
-    iput-object p1, v0, Lcom/facebook/cache/disk/i;->Gn:Ljava/io/IOException;
+    iput-object p1, v0, Lcom/facebook/cache/disk/i;->GE:Ljava/io/IOException;
 
-    sget-object p2, Lcom/facebook/cache/disk/d;->Fl:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/cache/disk/d;->FC:Ljava/lang/Class;
 
     const-string v1, "Failed inserting a file into the cache"
 
@@ -1205,11 +1205,11 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-static {}, Lcom/facebook/cache/disk/i;->fu()Lcom/facebook/cache/disk/i;
+    invoke-static {}, Lcom/facebook/cache/disk/i;->fy()Lcom/facebook/cache/disk/i;
 
     move-result-object v0
 
-    iput-object p1, v0, Lcom/facebook/cache/disk/i;->Gj:Lcom/facebook/cache/common/CacheKey;
+    iput-object p1, v0, Lcom/facebook/cache/disk/i;->GA:Lcom/facebook/cache/common/CacheKey;
 
     const/4 v1, 0x0
 
@@ -1245,9 +1245,9 @@
 
     check-cast v5, Ljava/lang/String;
 
-    iput-object v5, v0, Lcom/facebook/cache/disk/i;->Fw:Ljava/lang/String;
+    iput-object v5, v0, Lcom/facebook/cache/disk/i;->FN:Ljava/lang/String;
 
-    iget-object v6, p0, Lcom/facebook/cache/disk/d;->FX:Lcom/facebook/cache/disk/c;
+    iget-object v6, p0, Lcom/facebook/cache/disk/d;->Go:Lcom/facebook/cache/disk/c;
 
     invoke-interface {v6, v5, p1}, Lcom/facebook/cache/disk/c;->c(Ljava/lang/String;Ljava/lang/Object;)Lcom/facebook/a/a;
 
@@ -1262,14 +1262,14 @@
     :cond_0
     if-nez v6, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/cache/disk/d;->FT:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/cache/disk/d;->Gk:Ljava/util/Set;
 
     invoke-interface {p1, v5}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
     goto :goto_1
 
     :cond_1
-    iget-object p1, p0, Lcom/facebook/cache/disk/d;->FT:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/cache/disk/d;->Gk:Ljava/util/Set;
 
     invoke-interface {p1, v5}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -1305,9 +1305,9 @@
     move-exception p1
 
     :try_start_4
-    sget v2, Lcom/facebook/cache/common/a$a;->Fa:I
+    sget v2, Lcom/facebook/cache/common/a$a;->Fr:I
 
-    iput-object p1, v0, Lcom/facebook/cache/disk/i;->Gn:Ljava/io/IOException;
+    iput-object p1, v0, Lcom/facebook/cache/disk/i;->GE:Ljava/io/IOException;
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
@@ -1354,11 +1354,11 @@
 
     check-cast v2, Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/facebook/cache/disk/d;->FX:Lcom/facebook/cache/disk/c;
+    iget-object v3, p0, Lcom/facebook/cache/disk/d;->Go:Lcom/facebook/cache/disk/c;
 
-    invoke-interface {v3, v2}, Lcom/facebook/cache/disk/c;->aq(Ljava/lang/String;)J
+    invoke-interface {v3, v2}, Lcom/facebook/cache/disk/c;->am(Ljava/lang/String;)J
 
-    iget-object v3, p0, Lcom/facebook/cache/disk/d;->FT:Ljava/util/Set;
+    iget-object v3, p0, Lcom/facebook/cache/disk/d;->Gk:Ljava/util/Set;
 
     invoke-interface {v3, v2}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
     :try_end_0
@@ -1378,7 +1378,7 @@
     move-exception p1
 
     :try_start_1
-    sget v1, Lcom/facebook/cache/common/a$a;->EY:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fp:I
 
     new-instance v1, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/facebook/cache/disk/e$a.smali b/com.discord/smali/com/facebook/cache/disk/e$a.smali
index 8136cd55ab..8d68d67a3d 100644
--- a/com.discord/smali/com/facebook/cache/disk/e$a.smali
+++ b/com.discord/smali/com/facebook/cache/disk/e$a.smali
@@ -15,12 +15,12 @@
 
 
 # instance fields
-.field public final Ge:Lcom/facebook/cache/disk/c;
+.field public final Gv:Lcom/facebook/cache/disk/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Gf:Ljava/io/File;
+.field public final Gw:Ljava/io/File;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -40,9 +40,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/facebook/cache/disk/e$a;->Ge:Lcom/facebook/cache/disk/c;
+    iput-object p2, p0, Lcom/facebook/cache/disk/e$a;->Gv:Lcom/facebook/cache/disk/c;
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/e$a;->Gf:Ljava/io/File;
+    iput-object p1, p0, Lcom/facebook/cache/disk/e$a;->Gw:Ljava/io/File;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/common/a/b.smali b/com.discord/smali/com/facebook/common/a/b.smali
index 46a154b671..5f978ed6ac 100644
--- a/com.discord/smali/com/facebook/common/a/b.smali
+++ b/com.discord/smali/com/facebook/common/a/b.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static Gq:Lcom/facebook/common/a/b;
+.field private static GH:Lcom/facebook/common/a/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -28,7 +28,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized fv()Lcom/facebook/common/a/b;
+.method public static declared-synchronized fz()Lcom/facebook/common/a/b;
     .locals 2
 
     const-class v0, Lcom/facebook/common/a/b;
@@ -36,7 +36,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/common/a/b;->Gq:Lcom/facebook/common/a/b;
+    sget-object v1, Lcom/facebook/common/a/b;->GH:Lcom/facebook/common/a/b;
 
     if-nez v1, :cond_0
 
@@ -44,10 +44,10 @@
 
     invoke-direct {v1}, Lcom/facebook/common/a/b;-><init>()V
 
-    sput-object v1, Lcom/facebook/common/a/b;->Gq:Lcom/facebook/common/a/b;
+    sput-object v1, Lcom/facebook/common/a/b;->GH:Lcom/facebook/common/a/b;
 
     :cond_0
-    sget-object v1, Lcom/facebook/common/a/b;->Gq:Lcom/facebook/common/a/b;
+    sget-object v1, Lcom/facebook/common/a/b;->GH:Lcom/facebook/common/a/b;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/common/b/f.smali b/com.discord/smali/com/facebook/common/b/f.smali
index af8aca06c4..4fa52aad7e 100644
--- a/com.discord/smali/com/facebook/common/b/f.smali
+++ b/com.discord/smali/com/facebook/common/b/f.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field private final Gy:Ljava/util/concurrent/FutureTask;
+.field private final GP:Ljava/util/concurrent/FutureTask;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/FutureTask<",
@@ -59,7 +59,7 @@
 
     invoke-direct {p1, p2, p3}, Ljava/util/concurrent/FutureTask;-><init>(Ljava/lang/Runnable;Ljava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/facebook/common/b/f;->Gy:Ljava/util/concurrent/FutureTask;
+    iput-object p1, p0, Lcom/facebook/common/b/f;->GP:Ljava/util/concurrent/FutureTask;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     invoke-direct {p1, p2}, Ljava/util/concurrent/FutureTask;-><init>(Ljava/util/concurrent/Callable;)V
 
-    iput-object p1, p0, Lcom/facebook/common/b/f;->Gy:Ljava/util/concurrent/FutureTask;
+    iput-object p1, p0, Lcom/facebook/common/b/f;->GP:Ljava/util/concurrent/FutureTask;
 
     return-void
 .end method
@@ -93,7 +93,7 @@
 .method public final cancel(Z)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/common/b/f;->Gy:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->GP:Ljava/util/concurrent/FutureTask;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/FutureTask;->cancel(Z)Z
 
@@ -127,7 +127,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/common/b/f;->Gy:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->GP:Ljava/util/concurrent/FutureTask;
 
     invoke-virtual {v0}, Ljava/util/concurrent/FutureTask;->get()Ljava/lang/Object;
 
@@ -154,7 +154,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/common/b/f;->Gy:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->GP:Ljava/util/concurrent/FutureTask;
 
     invoke-virtual {v0, p1, p2, p3}, Ljava/util/concurrent/FutureTask;->get(JLjava/util/concurrent/TimeUnit;)Ljava/lang/Object;
 
@@ -176,7 +176,7 @@
 .method public final isCancelled()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/common/b/f;->Gy:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->GP:Ljava/util/concurrent/FutureTask;
 
     invoke-virtual {v0}, Ljava/util/concurrent/FutureTask;->isCancelled()Z
 
@@ -188,7 +188,7 @@
 .method public final isDone()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/common/b/f;->Gy:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->GP:Ljava/util/concurrent/FutureTask;
 
     invoke-virtual {v0}, Ljava/util/concurrent/FutureTask;->isDone()Z
 
@@ -200,7 +200,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/common/b/f;->Gy:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->GP:Ljava/util/concurrent/FutureTask;
 
     invoke-virtual {v0}, Ljava/util/concurrent/FutureTask;->run()V
 
diff --git a/com.discord/smali/com/facebook/common/b/h.smali b/com.discord/smali/com/facebook/common/b/h.smali
index 0dd0a71e52..ad58e4a513 100644
--- a/com.discord/smali/com/facebook/common/b/h.smali
+++ b/com.discord/smali/com/facebook/common/b/h.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field protected final Gz:Ljava/util/concurrent/atomic/AtomicInteger;
+.field protected final GQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
 
 # direct methods
@@ -34,7 +34,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object v0, p0, Lcom/facebook/common/b/h;->Gz:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/facebook/common/b/h;->GQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 .method public final cancel()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/common/b/h;->Gz:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/h;->GQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/4 v1, 0x0
 
@@ -56,13 +56,13 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/common/b/h;->fz()V
+    invoke-virtual {p0}, Lcom/facebook/common/b/h;->fD()V
 
     :cond_0
     return-void
 .end method
 
-.method protected fz()V
+.method protected fD()V
     .locals 0
 
     return-void
@@ -102,7 +102,7 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/common/b/h;->Gz:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/h;->GQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/4 v1, 0x0
 
@@ -124,7 +124,7 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object v1, p0, Lcom/facebook/common/b/h;->Gz:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/facebook/common/b/h;->GQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/4 v2, 0x3
 
@@ -149,7 +149,7 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/facebook/common/b/h;->Gz:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/facebook/common/b/h;->GQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/4 v2, 0x4
 
diff --git a/com.discord/smali/com/facebook/common/b/i.smali b/com.discord/smali/com/facebook/common/b/i.smali
index 66a8694036..3d861f4269 100644
--- a/com.discord/smali/com/facebook/common/b/i.smali
+++ b/com.discord/smali/com/facebook/common/b/i.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static GA:Lcom/facebook/common/b/i;
+.field private static GR:Lcom/facebook/common/b/i;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -33,10 +33,10 @@
     return-void
 .end method
 
-.method public static fA()Lcom/facebook/common/b/i;
+.method public static fE()Lcom/facebook/common/b/i;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/b/i;->GA:Lcom/facebook/common/b/i;
+    sget-object v0, Lcom/facebook/common/b/i;->GR:Lcom/facebook/common/b/i;
 
     if-nez v0, :cond_0
 
@@ -44,10 +44,10 @@
 
     invoke-direct {v0}, Lcom/facebook/common/b/i;-><init>()V
 
-    sput-object v0, Lcom/facebook/common/b/i;->GA:Lcom/facebook/common/b/i;
+    sput-object v0, Lcom/facebook/common/b/i;->GR:Lcom/facebook/common/b/i;
 
     :cond_0
-    sget-object v0, Lcom/facebook/common/b/i;->GA:Lcom/facebook/common/b/i;
+    sget-object v0, Lcom/facebook/common/b/i;->GR:Lcom/facebook/common/b/i;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/facebook/common/d/h$a$a.smali b/com.discord/smali/com/facebook/common/d/h$a$a.smali
index 6c48b09469..6a4ff0ede3 100644
--- a/com.discord/smali/com/facebook/common/d/h$a$a.smali
+++ b/com.discord/smali/com/facebook/common/d/h$a$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field GE:Lcom/facebook/common/d/h$a$a;
+.field GW:Lcom/facebook/common/d/h$a$a;
 
 .field name:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
diff --git a/com.discord/smali/com/facebook/common/d/h$a.smali b/com.discord/smali/com/facebook/common/d/h$a.smali
index 4431d7e059..b1555776aa 100644
--- a/com.discord/smali/com/facebook/common/d/h$a.smali
+++ b/com.discord/smali/com/facebook/common/d/h$a.smali
@@ -21,11 +21,11 @@
 
 
 # instance fields
-.field private GB:Lcom/facebook/common/d/h$a$a;
+.field private GS:Lcom/facebook/common/d/h$a$a;
 
-.field private GC:Lcom/facebook/common/d/h$a$a;
+.field private GU:Lcom/facebook/common/d/h$a$a;
 
-.field private GD:Z
+.field private GV:Z
 
 .field private final className:Ljava/lang/String;
 
@@ -42,13 +42,13 @@
 
     invoke-direct {v0, v1}, Lcom/facebook/common/d/h$a$a;-><init>(B)V
 
-    iput-object v0, p0, Lcom/facebook/common/d/h$a;->GB:Lcom/facebook/common/d/h$a$a;
+    iput-object v0, p0, Lcom/facebook/common/d/h$a;->GS:Lcom/facebook/common/d/h$a$a;
 
-    iget-object v0, p0, Lcom/facebook/common/d/h$a;->GB:Lcom/facebook/common/d/h$a$a;
+    iget-object v0, p0, Lcom/facebook/common/d/h$a;->GS:Lcom/facebook/common/d/h$a$a;
 
-    iput-object v0, p0, Lcom/facebook/common/d/h$a;->GC:Lcom/facebook/common/d/h$a$a;
+    iput-object v0, p0, Lcom/facebook/common/d/h$a;->GU:Lcom/facebook/common/d/h$a$a;
 
-    iput-boolean v1, p0, Lcom/facebook/common/d/h$a;->GD:Z
+    iput-boolean v1, p0, Lcom/facebook/common/d/h$a;->GV:Z
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -69,7 +69,7 @@
     return-void
 .end method
 
-.method private fB()Lcom/facebook/common/d/h$a$a;
+.method private fF()Lcom/facebook/common/d/h$a$a;
     .locals 2
 
     new-instance v0, Lcom/facebook/common/d/h$a$a;
@@ -78,11 +78,11 @@
 
     invoke-direct {v0, v1}, Lcom/facebook/common/d/h$a$a;-><init>(B)V
 
-    iget-object v1, p0, Lcom/facebook/common/d/h$a;->GC:Lcom/facebook/common/d/h$a$a;
+    iget-object v1, p0, Lcom/facebook/common/d/h$a;->GU:Lcom/facebook/common/d/h$a$a;
 
-    iput-object v0, v1, Lcom/facebook/common/d/h$a$a;->GE:Lcom/facebook/common/d/h$a$a;
+    iput-object v0, v1, Lcom/facebook/common/d/h$a$a;->GW:Lcom/facebook/common/d/h$a$a;
 
-    iput-object v0, p0, Lcom/facebook/common/d/h$a;->GC:Lcom/facebook/common/d/h$a$a;
+    iput-object v0, p0, Lcom/facebook/common/d/h$a;->GU:Lcom/facebook/common/d/h$a$a;
 
     return-object v0
 .end method
@@ -110,7 +110,7 @@
         .end annotation
     .end param
 
-    invoke-direct {p0}, Lcom/facebook/common/d/h$a;->fB()Lcom/facebook/common/d/h$a$a;
+    invoke-direct {p0}, Lcom/facebook/common/d/h$a;->fF()Lcom/facebook/common/d/h$a$a;
 
     move-result-object v0
 
@@ -144,7 +144,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 5
 
-    iget-boolean v0, p0, Lcom/facebook/common/d/h$a;->GD:Z
+    iget-boolean v0, p0, Lcom/facebook/common/d/h$a;->GV:Z
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -160,9 +160,9 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lcom/facebook/common/d/h$a;->GB:Lcom/facebook/common/d/h$a$a;
+    iget-object v2, p0, Lcom/facebook/common/d/h$a;->GS:Lcom/facebook/common/d/h$a$a;
 
-    iget-object v2, v2, Lcom/facebook/common/d/h$a$a;->GE:Lcom/facebook/common/d/h$a$a;
+    iget-object v2, v2, Lcom/facebook/common/d/h$a$a;->GW:Lcom/facebook/common/d/h$a$a;
 
     const-string v3, ""
 
@@ -198,7 +198,7 @@
     const-string v3, ", "
 
     :cond_2
-    iget-object v2, v2, Lcom/facebook/common/d/h$a$a;->GE:Lcom/facebook/common/d/h$a$a;
+    iget-object v2, v2, Lcom/facebook/common/d/h$a$a;->GW:Lcom/facebook/common/d/h$a$a;
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/facebook/common/f/a.smali b/com.discord/smali/com/facebook/common/f/a.smali
index 1c16edc010..1a03d852c4 100644
--- a/com.discord/smali/com/facebook/common/f/a.smali
+++ b/com.discord/smali/com/facebook/common/f/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final GM:Ljava/util/Map;
+.field public static final He:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -32,12 +32,12 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/f/a;->GM:Ljava/util/Map;
+    sput-object v0, Lcom/facebook/common/f/a;->He:Ljava/util/Map;
 
     return-void
 .end method
 
-.method public static at(Ljava/lang/String;)Z
+.method public static ao(Ljava/lang/String;)Z
     .locals 1
     .param p0    # Ljava/lang/String;
         .annotation runtime Ljavax/annotation/Nullable;
@@ -64,7 +64,7 @@
     return p0
 .end method
 
-.method public static au(Ljava/lang/String;)Ljava/lang/String;
+.method public static ap(Ljava/lang/String;)Ljava/lang/String;
     .locals 3
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -120,7 +120,7 @@
 
     if-nez v0, :cond_3
 
-    sget-object v0, Lcom/facebook/common/f/a;->GM:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/common/f/a;->He:Ljava/util/Map;
 
     invoke-interface {v0, p0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/facebook/common/g/f.smali b/com.discord/smali/com/facebook/common/g/f.smali
index 29e75d4fbd..8f6448453a 100644
--- a/com.discord/smali/com/facebook/common/g/f.smali
+++ b/com.discord/smali/com/facebook/common/g/f.smali
@@ -21,7 +21,7 @@
 .method public abstract a(I[BII)I
 .end method
 
-.method public abstract fG()J
+.method public abstract fK()J
 .end method
 
 .method public abstract getByteBuffer()Ljava/nio/ByteBuffer;
diff --git a/com.discord/smali/com/facebook/common/h/a.smali b/com.discord/smali/com/facebook/common/h/a.smali
index 4fa17c3d20..97ca3185b3 100644
--- a/com.discord/smali/com/facebook/common/h/a.smali
+++ b/com.discord/smali/com/facebook/common/h/a.smali
@@ -12,29 +12,29 @@
 
 
 # static fields
-.field private static Hj:Lcom/facebook/common/h/a;
+.field private static HA:Lcom/facebook/common/h/a;
 
-.field public static final Hk:J
+.field public static final HB:J
 
 
 # instance fields
-.field public volatile Hl:Landroid/os/StatFs;
+.field public volatile HC:Landroid/os/StatFs;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private volatile Hm:Ljava/io/File;
+.field private volatile HD:Ljava/io/File;
 
-.field public volatile Hn:Landroid/os/StatFs;
+.field public volatile HE:Landroid/os/StatFs;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private volatile Ho:Ljava/io/File;
+.field private volatile HF:Ljava/io/File;
 
-.field public Hp:J
+.field public HG:J
 
-.field public final Hq:Ljava/util/concurrent/locks/Lock;
+.field public final HH:Ljava/util/concurrent/locks/Lock;
 
 .field private volatile mInitialized:Z
 
@@ -51,7 +51,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lcom/facebook/common/h/a;->Hk:J
+    sput-wide v0, Lcom/facebook/common/h/a;->HB:J
 
     return-void
 .end method
@@ -63,9 +63,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/common/h/a;->Hl:Landroid/os/StatFs;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->HC:Landroid/os/StatFs;
 
-    iput-object v0, p0, Lcom/facebook/common/h/a;->Hn:Landroid/os/StatFs;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->HE:Landroid/os/StatFs;
 
     const/4 v0, 0x0
 
@@ -75,7 +75,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/locks/ReentrantLock;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/common/h/a;->Hq:Ljava/util/concurrent/locks/Lock;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->HH:Ljava/util/concurrent/locks/Lock;
 
     return-void
 .end method
@@ -153,7 +153,7 @@
     return-object v0
 .end method
 
-.method public static declared-synchronized fO()Lcom/facebook/common/h/a;
+.method public static declared-synchronized fS()Lcom/facebook/common/h/a;
     .locals 2
 
     const-class v0, Lcom/facebook/common/h/a;
@@ -161,7 +161,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/common/h/a;->Hj:Lcom/facebook/common/h/a;
+    sget-object v1, Lcom/facebook/common/h/a;->HA:Lcom/facebook/common/h/a;
 
     if-nez v1, :cond_0
 
@@ -169,10 +169,10 @@
 
     invoke-direct {v1}, Lcom/facebook/common/h/a;-><init>()V
 
-    sput-object v1, Lcom/facebook/common/h/a;->Hj:Lcom/facebook/common/h/a;
+    sput-object v1, Lcom/facebook/common/h/a;->HA:Lcom/facebook/common/h/a;
 
     :cond_0
-    sget-object v1, Lcom/facebook/common/h/a;->Hj:Lcom/facebook/common/h/a;
+    sget-object v1, Lcom/facebook/common/h/a;->HA:Lcom/facebook/common/h/a;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -190,14 +190,14 @@
 
 
 # virtual methods
-.method public final fP()V
+.method public final fT()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/facebook/common/h/a;->mInitialized:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/common/h/a;->Hq:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/facebook/common/h/a;->HH:Ljava/util/concurrent/locks/Lock;
 
     invoke-interface {v0}, Ljava/util/concurrent/locks/Lock;->lock()V
 
@@ -210,15 +210,15 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/common/h/a;->Hm:Ljava/io/File;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->HD:Ljava/io/File;
 
     invoke-static {}, Landroid/os/Environment;->getExternalStorageDirectory()Ljava/io/File;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/common/h/a;->Ho:Ljava/io/File;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->HF:Ljava/io/File;
 
-    invoke-virtual {p0}, Lcom/facebook/common/h/a;->fQ()V
+    invoke-virtual {p0}, Lcom/facebook/common/h/a;->fU()V
 
     const/4 v0, 0x1
 
@@ -227,7 +227,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/common/h/a;->Hq:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/facebook/common/h/a;->HH:Ljava/util/concurrent/locks/Lock;
 
     invoke-interface {v0}, Ljava/util/concurrent/locks/Lock;->unlock()V
 
@@ -236,7 +236,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/facebook/common/h/a;->Hq:Ljava/util/concurrent/locks/Lock;
+    iget-object v1, p0, Lcom/facebook/common/h/a;->HH:Ljava/util/concurrent/locks/Lock;
 
     invoke-interface {v1}, Ljava/util/concurrent/locks/Lock;->unlock()V
 
@@ -246,34 +246,34 @@
     return-void
 .end method
 
-.method public fQ()V
+.method public fU()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/common/h/a;->Hl:Landroid/os/StatFs;
+    iget-object v0, p0, Lcom/facebook/common/h/a;->HC:Landroid/os/StatFs;
 
-    iget-object v1, p0, Lcom/facebook/common/h/a;->Hm:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/common/h/a;->HD:Ljava/io/File;
 
     invoke-static {v0, v1}, Lcom/facebook/common/h/a;->a(Landroid/os/StatFs;Ljava/io/File;)Landroid/os/StatFs;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/common/h/a;->Hl:Landroid/os/StatFs;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->HC:Landroid/os/StatFs;
 
-    iget-object v0, p0, Lcom/facebook/common/h/a;->Hn:Landroid/os/StatFs;
+    iget-object v0, p0, Lcom/facebook/common/h/a;->HE:Landroid/os/StatFs;
 
-    iget-object v1, p0, Lcom/facebook/common/h/a;->Ho:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/common/h/a;->HF:Ljava/io/File;
 
     invoke-static {v0, v1}, Lcom/facebook/common/h/a;->a(Landroid/os/StatFs;Ljava/io/File;)Landroid/os/StatFs;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/common/h/a;->Hn:Landroid/os/StatFs;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->HE:Landroid/os/StatFs;
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/facebook/common/h/a;->Hp:J
+    iput-wide v0, p0, Lcom/facebook/common/h/a;->HG:J
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/common/j/f.smali b/com.discord/smali/com/facebook/common/j/f.smali
index bff842bea5..1b0b5a9875 100644
--- a/com.discord/smali/com/facebook/common/j/f.smali
+++ b/com.discord/smali/com/facebook/common/j/f.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final HG:Landroid/net/Uri;
+.field private static final HX:Landroid/net/Uri;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/j/f;->HG:Landroid/net/Uri;
+    sput-object v0, Lcom/facebook/common/j/f;->HX:Landroid/net/Uri;
 
     return-void
 .end method
@@ -300,7 +300,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/facebook/common/j/f;->HG:Landroid/net/Uri;
+    sget-object v0, Lcom/facebook/common/j/f;->HX:Landroid/net/Uri;
 
     invoke-virtual {v0}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/facebook/common/k/c.smali b/com.discord/smali/com/facebook/common/k/c.smali
index 7be9aef3aa..a3dfe01215 100644
--- a/com.discord/smali/com/facebook/common/k/c.smali
+++ b/com.discord/smali/com/facebook/common/k/c.smali
@@ -4,28 +4,28 @@
 
 
 # static fields
-.field public static final HH:Z
+.field public static final HY:Z
 
-.field public static final HI:Z
+.field public static final HZ:Z
 
-.field public static final HJ:Z
+.field public static final Ia:Z
 
-.field public static HK:Lcom/facebook/common/k/b;
+.field public static Ib:Lcom/facebook/common/k/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static HL:Z
+.field private static Ic:Z
 
-.field private static final HM:[B
+.field private static final Id:[B
 
-.field private static final HN:[B
+.field private static final Ie:[B
 
-.field private static final HO:[B
+.field private static final If:[B
 
-.field private static final HP:[B
+.field private static final Ig:[B
 
-.field private static final HQ:[B
+.field private static final Ih:[B
 
 
 # direct methods
@@ -50,7 +50,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lcom/facebook/common/k/c;->HH:Z
+    sput-boolean v0, Lcom/facebook/common/k/c;->HY:Z
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -66,7 +66,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    sput-boolean v0, Lcom/facebook/common/k/c;->HI:Z
+    sput-boolean v0, Lcom/facebook/common/k/c;->HZ:Z
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -111,53 +111,53 @@
 
     :cond_4
     :goto_3
-    sput-boolean v2, Lcom/facebook/common/k/c;->HJ:Z
+    sput-boolean v2, Lcom/facebook/common/k/c;->Ia:Z
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/facebook/common/k/c;->HK:Lcom/facebook/common/k/b;
+    sput-object v0, Lcom/facebook/common/k/c;->Ib:Lcom/facebook/common/k/b;
 
-    sput-boolean v3, Lcom/facebook/common/k/c;->HL:Z
+    sput-boolean v3, Lcom/facebook/common/k/c;->Ic:Z
 
     const-string v0, "RIFF"
 
-    invoke-static {v0}, Lcom/facebook/common/k/c;->av(Ljava/lang/String;)[B
+    invoke-static {v0}, Lcom/facebook/common/k/c;->aq(Ljava/lang/String;)[B
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->HM:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Id:[B
 
     const-string v0, "WEBP"
 
-    invoke-static {v0}, Lcom/facebook/common/k/c;->av(Ljava/lang/String;)[B
+    invoke-static {v0}, Lcom/facebook/common/k/c;->aq(Ljava/lang/String;)[B
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->HN:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Ie:[B
 
     const-string v0, "VP8 "
 
-    invoke-static {v0}, Lcom/facebook/common/k/c;->av(Ljava/lang/String;)[B
+    invoke-static {v0}, Lcom/facebook/common/k/c;->aq(Ljava/lang/String;)[B
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->HO:[B
+    sput-object v0, Lcom/facebook/common/k/c;->If:[B
 
     const-string v0, "VP8L"
 
-    invoke-static {v0}, Lcom/facebook/common/k/c;->av(Ljava/lang/String;)[B
+    invoke-static {v0}, Lcom/facebook/common/k/c;->aq(Ljava/lang/String;)[B
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->HP:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Ig:[B
 
     const-string v0, "VP8X"
 
-    invoke-static {v0}, Lcom/facebook/common/k/c;->av(Ljava/lang/String;)[B
+    invoke-static {v0}, Lcom/facebook/common/k/c;->aq(Ljava/lang/String;)[B
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->HQ:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Ih:[B
 
     return-void
 .end method
@@ -169,7 +169,7 @@
 
     if-lt p2, v0, :cond_0
 
-    sget-object p2, Lcom/facebook/common/k/c;->HM:[B
+    sget-object p2, Lcom/facebook/common/k/c;->Id:[B
 
     invoke-static {p0, p1, p2}, Lcom/facebook/common/k/c;->a([BI[B)Z
 
@@ -179,7 +179,7 @@
 
     add-int/lit8 p1, p1, 0x8
 
-    sget-object p2, Lcom/facebook/common/k/c;->HN:[B
+    sget-object p2, Lcom/facebook/common/k/c;->Ie:[B
 
     invoke-static {p0, p1, p2}, Lcom/facebook/common/k/c;->a([BI[B)Z
 
@@ -252,7 +252,7 @@
     return v0
 .end method
 
-.method private static av(Ljava/lang/String;)[B
+.method private static aq(Ljava/lang/String;)[B
     .locals 2
 
     :try_start_0
@@ -287,7 +287,7 @@
 
     const/16 p1, 0xc
 
-    sget-object v0, Lcom/facebook/common/k/c;->HQ:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Ih:[B
 
     invoke-static {p0, p1, v0}, Lcom/facebook/common/k/c;->a([BI[B)Z
 
@@ -308,7 +308,7 @@
 .method public static c([B)Z
     .locals 4
 
-    sget-object v0, Lcom/facebook/common/k/c;->HQ:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Ih:[B
 
     const/16 v1, 0xc
 
@@ -351,7 +351,7 @@
 .method public static d([B)Z
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/k/c;->HO:[B
+    sget-object v0, Lcom/facebook/common/k/c;->If:[B
 
     const/16 v1, 0xc
 
@@ -365,7 +365,7 @@
 .method public static e([B)Z
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/k/c;->HP:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Ig:[B
 
     const/16 v1, 0xc
 
@@ -379,7 +379,7 @@
 .method public static f([B)Z
     .locals 4
 
-    sget-object v0, Lcom/facebook/common/k/c;->HQ:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Ih:[B
 
     const/16 v1, 0xc
 
@@ -419,16 +419,16 @@
     return v3
 .end method
 
-.method public static fT()Lcom/facebook/common/k/b;
+.method public static fX()Lcom/facebook/common/k/b;
     .locals 2
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-boolean v0, Lcom/facebook/common/k/c;->HL:Z
+    sget-boolean v0, Lcom/facebook/common/k/c;->Ic:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/k/c;->HK:Lcom/facebook/common/k/b;
+    sget-object v0, Lcom/facebook/common/k/c;->Ib:Lcom/facebook/common/k/b;
 
     return-object v0
 
@@ -455,7 +455,7 @@
     :catchall_0
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/facebook/common/k/c;->HL:Z
+    sput-boolean v1, Lcom/facebook/common/k/c;->Ic:Z
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/facebook/common/references/CloseableReference.smali b/com.discord/smali/com/facebook/common/references/CloseableReference.smali
index 9740b6c269..22af239fbe 100644
--- a/com.discord/smali/com/facebook/common/references/CloseableReference.smali
+++ b/com.discord/smali/com/facebook/common/references/CloseableReference.smali
@@ -21,7 +21,7 @@
 
 
 # static fields
-.field private static Fl:Ljava/lang/Class;
+.field private static FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field private static final Hd:Lcom/facebook/common/references/b;
+.field private static final Hu:Lcom/facebook/common/references/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/b<",
@@ -43,9 +43,9 @@
 
 
 # instance fields
-.field private Hb:Z
+.field private Hs:Z
 
-.field public final Hc:Lcom/facebook/common/references/c;
+.field public final Ht:Lcom/facebook/common/references/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/c<",
@@ -61,13 +61,13 @@
 
     const-class v0, Lcom/facebook/common/references/CloseableReference;
 
-    sput-object v0, Lcom/facebook/common/references/CloseableReference;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/common/references/CloseableReference;->FC:Ljava/lang/Class;
 
     new-instance v0, Lcom/facebook/common/references/CloseableReference$1;
 
     invoke-direct {v0}, Lcom/facebook/common/references/CloseableReference$1;-><init>()V
 
-    sput-object v0, Lcom/facebook/common/references/CloseableReference;->Hd:Lcom/facebook/common/references/b;
+    sput-object v0, Lcom/facebook/common/references/CloseableReference;->Hu:Lcom/facebook/common/references/b;
 
     return-void
 .end method
@@ -86,7 +86,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hb:Z
+    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hs:Z
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -94,9 +94,9 @@
 
     check-cast v0, Lcom/facebook/common/references/c;
 
-    iput-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Hc:Lcom/facebook/common/references/c;
+    iput-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Ht:Lcom/facebook/common/references/c;
 
-    invoke-virtual {p1}, Lcom/facebook/common/references/c;->fL()V
+    invoke-virtual {p1}, Lcom/facebook/common/references/c;->fP()V
 
     return-void
 .end method
@@ -115,13 +115,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hb:Z
+    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hs:Z
 
     new-instance v0, Lcom/facebook/common/references/c;
 
     invoke-direct {v0, p1, p2}, Lcom/facebook/common/references/c;-><init>(Ljava/lang/Object;Lcom/facebook/common/references/b;)V
 
-    iput-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Hc:Lcom/facebook/common/references/c;
+    iput-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Ht:Lcom/facebook/common/references/c;
 
     return-void
 .end method
@@ -252,7 +252,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->fK()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->fO()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p0
 
@@ -285,7 +285,7 @@
     :cond_0
     new-instance v0, Lcom/facebook/common/references/CloseableReference;
 
-    sget-object v1, Lcom/facebook/common/references/CloseableReference;->Hd:Lcom/facebook/common/references/b;
+    sget-object v1, Lcom/facebook/common/references/CloseableReference;->Hu:Lcom/facebook/common/references/b;
 
     invoke-direct {v0, p0, v1}, Lcom/facebook/common/references/CloseableReference;-><init>(Ljava/lang/Object;Lcom/facebook/common/references/b;)V
 
@@ -384,7 +384,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->fJ()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->fN()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
 
@@ -397,7 +397,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hs:Z
 
     if-eqz v0, :cond_0
 
@@ -408,15 +408,15 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hb:Z
+    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hs:Z
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Hc:Lcom/facebook/common/references/c;
+    iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Ht:Lcom/facebook/common/references/c;
 
-    invoke-virtual {v0}, Lcom/facebook/common/references/c;->fM()I
+    invoke-virtual {v0}, Lcom/facebook/common/references/c;->fQ()I
 
     move-result v1
 
@@ -435,7 +435,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    iget-object v0, v0, Lcom/facebook/common/references/c;->GU:Lcom/facebook/common/references/b;
+    iget-object v0, v0, Lcom/facebook/common/references/c;->Hl:Lcom/facebook/common/references/b;
 
     invoke-interface {v0, v1}, Lcom/facebook/common/references/b;->z(Ljava/lang/Object;)V
 
@@ -468,7 +468,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized fJ()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized fN()Lcom/facebook/common/references/CloseableReference;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -489,7 +489,7 @@
 
     new-instance v0, Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v1, p0, Lcom/facebook/common/references/CloseableReference;->Hc:Lcom/facebook/common/references/c;
+    iget-object v1, p0, Lcom/facebook/common/references/CloseableReference;->Ht:Lcom/facebook/common/references/c;
 
     invoke-direct {v0, v1}, Lcom/facebook/common/references/CloseableReference;-><init>(Lcom/facebook/common/references/c;)V
     :try_end_0
@@ -507,7 +507,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized fK()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized fO()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -529,7 +529,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->fJ()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->fN()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
     :try_end_0
@@ -568,7 +568,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hs:Z
 
     if-eqz v0, :cond_0
 
@@ -587,7 +587,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    sget-object v0, Lcom/facebook/common/references/CloseableReference;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/references/CloseableReference;->FC:Ljava/lang/Class;
 
     const-string v1, "Finalized without closing: %x %x (type = %s)"
 
@@ -609,7 +609,7 @@
 
     const/4 v3, 0x1
 
-    iget-object v4, p0, Lcom/facebook/common/references/CloseableReference;->Hc:Lcom/facebook/common/references/c;
+    iget-object v4, p0, Lcom/facebook/common/references/CloseableReference;->Ht:Lcom/facebook/common/references/c;
 
     invoke-static {v4}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -623,7 +623,7 @@
 
     const/4 v3, 0x2
 
-    iget-object v4, p0, Lcom/facebook/common/references/CloseableReference;->Hc:Lcom/facebook/common/references/c;
+    iget-object v4, p0, Lcom/facebook/common/references/CloseableReference;->Ht:Lcom/facebook/common/references/c;
 
     invoke-virtual {v4}, Lcom/facebook/common/references/c;->get()Ljava/lang/Object;
 
@@ -681,7 +681,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hs:Z
 
     if-nez v0, :cond_0
 
@@ -695,7 +695,7 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Hc:Lcom/facebook/common/references/c;
+    iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Ht:Lcom/facebook/common/references/c;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/c;->get()Ljava/lang/Object;
 
@@ -721,7 +721,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Hs:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/d/a.smali b/com.discord/smali/com/facebook/d/a.smali
index 6c471d0f46..d2bafb0b16 100644
--- a/com.discord/smali/com/facebook/d/a.smali
+++ b/com.discord/smali/com/facebook/d/a.smali
@@ -7,33 +7,33 @@
 
 
 # static fields
-.field private static final Pg:[B
+.field private static final PA:[B
 
-.field private static final Ph:I
+.field private static final PB:I
 
-.field private static final Pi:[B
+.field private static final PC:[B
 
-.field private static final Pj:I
+.field private static final PD:[B
 
-.field private static final Pk:[B
+.field private static final PE:[B
 
-.field private static final Pl:[B
+.field private static final PF:I
 
-.field private static final Pm:[B
+.field private static final PG:[B
 
-.field private static final Pn:I
+.field private static final PH:I
 
-.field private static final Po:[B
+.field private static final PI:[Ljava/lang/String;
 
-.field private static final Pp:I
+.field private static final PJ:I
 
-.field private static final Pq:[Ljava/lang/String;
+.field private static final Py:[B
 
-.field private static final Pr:I
+.field private static final Pz:I
 
 
 # instance fields
-.field final Pf:I
+.field final Px:I
 
 
 # direct methods
@@ -46,9 +46,9 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lcom/facebook/d/a;->Pg:[B
+    sput-object v1, Lcom/facebook/d/a;->Py:[B
 
-    sput v0, Lcom/facebook/d/a;->Ph:I
+    sput v0, Lcom/facebook/d/a;->Pz:I
 
     const/16 v1, 0x8
 
@@ -56,37 +56,37 @@
 
     fill-array-data v2, :array_1
 
-    sput-object v2, Lcom/facebook/d/a;->Pi:[B
+    sput-object v2, Lcom/facebook/d/a;->PA:[B
 
-    sput v1, Lcom/facebook/d/a;->Pj:I
+    sput v1, Lcom/facebook/d/a;->PB:I
 
     const-string v1, "GIF87a"
 
-    invoke-static {v1}, Lcom/facebook/d/e;->av(Ljava/lang/String;)[B
+    invoke-static {v1}, Lcom/facebook/d/e;->aq(Ljava/lang/String;)[B
 
     move-result-object v1
 
-    sput-object v1, Lcom/facebook/d/a;->Pk:[B
+    sput-object v1, Lcom/facebook/d/a;->PC:[B
 
     const-string v1, "GIF89a"
 
-    invoke-static {v1}, Lcom/facebook/d/e;->av(Ljava/lang/String;)[B
+    invoke-static {v1}, Lcom/facebook/d/e;->aq(Ljava/lang/String;)[B
 
     move-result-object v1
 
-    sput-object v1, Lcom/facebook/d/a;->Pl:[B
+    sput-object v1, Lcom/facebook/d/a;->PD:[B
 
     const-string v1, "BM"
 
-    invoke-static {v1}, Lcom/facebook/d/e;->av(Ljava/lang/String;)[B
+    invoke-static {v1}, Lcom/facebook/d/e;->aq(Ljava/lang/String;)[B
 
     move-result-object v1
 
-    sput-object v1, Lcom/facebook/d/a;->Pm:[B
+    sput-object v1, Lcom/facebook/d/a;->PE:[B
 
     array-length v1, v1
 
-    sput v1, Lcom/facebook/d/a;->Pn:I
+    sput v1, Lcom/facebook/d/a;->PF:I
 
     const/4 v1, 0x4
 
@@ -94,9 +94,9 @@
 
     fill-array-data v2, :array_2
 
-    sput-object v2, Lcom/facebook/d/a;->Po:[B
+    sput-object v2, Lcom/facebook/d/a;->PG:[B
 
-    sput v1, Lcom/facebook/d/a;->Pp:I
+    sput v1, Lcom/facebook/d/a;->PH:I
 
     const/4 v2, 0x6
 
@@ -134,7 +134,7 @@
 
     aput-object v1, v2, v0
 
-    sput-object v2, Lcom/facebook/d/a;->Pq:[Ljava/lang/String;
+    sput-object v2, Lcom/facebook/d/a;->PI:[Ljava/lang/String;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -142,7 +142,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    sget-object v1, Lcom/facebook/d/a;->Pq:[Ljava/lang/String;
+    sget-object v1, Lcom/facebook/d/a;->PI:[Ljava/lang/String;
 
     aget-object v1, v1, v3
 
@@ -152,13 +152,13 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/facebook/d/e;->av(Ljava/lang/String;)[B
+    invoke-static {v0}, Lcom/facebook/d/e;->aq(Ljava/lang/String;)[B
 
     move-result-object v0
 
     array-length v0, v0
 
-    sput v0, Lcom/facebook/d/a;->Pr:I
+    sput v0, Lcom/facebook/d/a;->PJ:I
 
     return-void
 
@@ -213,13 +213,13 @@
 
     aput v2, v0, v1
 
-    sget v1, Lcom/facebook/d/a;->Ph:I
+    sget v1, Lcom/facebook/d/a;->Pz:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/d/a;->Pj:I
+    sget v1, Lcom/facebook/d/a;->PB:I
 
     const/4 v2, 0x3
 
@@ -231,17 +231,17 @@
 
     aput v1, v0, v2
 
-    sget v2, Lcom/facebook/d/a;->Pn:I
+    sget v2, Lcom/facebook/d/a;->PF:I
 
     const/4 v3, 0x5
 
     aput v2, v0, v3
 
-    sget v2, Lcom/facebook/d/a;->Pp:I
+    sget v2, Lcom/facebook/d/a;->PH:I
 
     aput v2, v0, v1
 
-    sget v1, Lcom/facebook/d/a;->Pr:I
+    sget v1, Lcom/facebook/d/a;->PJ:I
 
     const/4 v2, 0x7
 
@@ -251,7 +251,7 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/d/a;->Pf:I
+    iput v0, p0, Lcom/facebook/d/a;->Px:I
 
     return-void
 .end method
@@ -285,7 +285,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lcom/facebook/d/b;->Px:Lcom/facebook/d/c;
+    sget-object p1, Lcom/facebook/d/b;->PP:Lcom/facebook/d/c;
 
     return-object p1
 
@@ -296,7 +296,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object p1, Lcom/facebook/d/b;->Py:Lcom/facebook/d/c;
+    sget-object p1, Lcom/facebook/d/b;->PQ:Lcom/facebook/d/c;
 
     return-object p1
 
@@ -313,7 +313,7 @@
 
     if-eqz p2, :cond_2
 
-    sget-object p1, Lcom/facebook/d/b;->PB:Lcom/facebook/d/c;
+    sget-object p1, Lcom/facebook/d/b;->PT:Lcom/facebook/d/c;
 
     return-object p1
 
@@ -324,22 +324,22 @@
 
     if-eqz p1, :cond_3
 
-    sget-object p1, Lcom/facebook/d/b;->PA:Lcom/facebook/d/c;
+    sget-object p1, Lcom/facebook/d/b;->PS:Lcom/facebook/d/c;
 
     return-object p1
 
     :cond_3
-    sget-object p1, Lcom/facebook/d/b;->Pz:Lcom/facebook/d/c;
+    sget-object p1, Lcom/facebook/d/b;->PR:Lcom/facebook/d/c;
 
     return-object p1
 
     :cond_4
-    sget-object p1, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object p1, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
     return-object p1
 
     :cond_5
-    sget-object v1, Lcom/facebook/d/a;->Pg:[B
+    sget-object v1, Lcom/facebook/d/a;->Py:[B
 
     array-length v2, v1
 
@@ -363,12 +363,12 @@
     :goto_0
     if-eqz v1, :cond_7
 
-    sget-object p1, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object p1, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
     return-object p1
 
     :cond_7
-    sget-object v1, Lcom/facebook/d/a;->Pi:[B
+    sget-object v1, Lcom/facebook/d/a;->PA:[B
 
     array-length v2, v1
 
@@ -390,7 +390,7 @@
     :goto_1
     if-eqz v1, :cond_9
 
-    sget-object p1, Lcom/facebook/d/b;->Pt:Lcom/facebook/d/c;
+    sget-object p1, Lcom/facebook/d/b;->PL:Lcom/facebook/d/c;
 
     return-object p1
 
@@ -399,7 +399,7 @@
 
     if-lt p2, v1, :cond_b
 
-    sget-object v1, Lcom/facebook/d/a;->Pk:[B
+    sget-object v1, Lcom/facebook/d/a;->PC:[B
 
     invoke-static {p1, v1}, Lcom/facebook/d/e;->a([B[B)Z
 
@@ -407,7 +407,7 @@
 
     if-nez v1, :cond_a
 
-    sget-object v1, Lcom/facebook/d/a;->Pl:[B
+    sget-object v1, Lcom/facebook/d/a;->PD:[B
 
     invoke-static {p1, v1}, Lcom/facebook/d/e;->a([B[B)Z
 
@@ -426,12 +426,12 @@
     :goto_2
     if-eqz v1, :cond_c
 
-    sget-object p1, Lcom/facebook/d/b;->Pu:Lcom/facebook/d/c;
+    sget-object p1, Lcom/facebook/d/b;->PM:Lcom/facebook/d/c;
 
     return-object p1
 
     :cond_c
-    sget-object v1, Lcom/facebook/d/a;->Pm:[B
+    sget-object v1, Lcom/facebook/d/a;->PE:[B
 
     array-length v2, v1
 
@@ -449,12 +449,12 @@
     :goto_3
     if-eqz v1, :cond_e
 
-    sget-object p1, Lcom/facebook/d/b;->Pv:Lcom/facebook/d/c;
+    sget-object p1, Lcom/facebook/d/b;->PN:Lcom/facebook/d/c;
 
     return-object p1
 
     :cond_e
-    sget-object v1, Lcom/facebook/d/a;->Po:[B
+    sget-object v1, Lcom/facebook/d/a;->PG:[B
 
     array-length v2, v1
 
@@ -472,12 +472,12 @@
     :goto_4
     if-eqz v1, :cond_10
 
-    sget-object p1, Lcom/facebook/d/b;->Pw:Lcom/facebook/d/c;
+    sget-object p1, Lcom/facebook/d/b;->PO:Lcom/facebook/d/c;
 
     return-object p1
 
     :cond_10
-    sget v1, Lcom/facebook/d/a;->Pr:I
+    sget v1, Lcom/facebook/d/a;->PJ:I
 
     if-lt p2, v1, :cond_12
 
@@ -489,7 +489,7 @@
 
     if-lt p2, v1, :cond_12
 
-    sget-object p2, Lcom/facebook/d/a;->Pq:[Ljava/lang/String;
+    sget-object p2, Lcom/facebook/d/a;->PI:[Ljava/lang/String;
 
     array-length v1, p2
 
@@ -512,11 +512,11 @@
 
     move-result-object v4
 
-    invoke-static {v4}, Lcom/facebook/d/e;->av(Ljava/lang/String;)[B
+    invoke-static {v4}, Lcom/facebook/d/e;->aq(Ljava/lang/String;)[B
 
     move-result-object v4
 
-    sget v6, Lcom/facebook/d/a;->Pr:I
+    sget v6, Lcom/facebook/d/a;->PJ:I
 
     invoke-static {p1, v5, v4, v6}, Lcom/facebook/d/e;->a([BI[BI)I
 
@@ -537,20 +537,20 @@
     :goto_6
     if-eqz v0, :cond_13
 
-    sget-object p1, Lcom/facebook/d/b;->PC:Lcom/facebook/d/c;
+    sget-object p1, Lcom/facebook/d/b;->PU:Lcom/facebook/d/c;
 
     return-object p1
 
     :cond_13
-    sget-object p1, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object p1, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
     return-object p1
 .end method
 
-.method public final hp()I
+.method public final hs()I
     .locals 1
 
-    iget v0, p0, Lcom/facebook/d/a;->Pf:I
+    iget v0, p0, Lcom/facebook/d/a;->Px:I
 
     return v0
 .end method
diff --git a/com.discord/smali/com/facebook/d/c$a.smali b/com.discord/smali/com/facebook/d/c$a.smali
index 705722c998..7941e2348d 100644
--- a/com.discord/smali/com/facebook/d/c$a.smali
+++ b/com.discord/smali/com/facebook/d/c$a.smali
@@ -20,5 +20,5 @@
     .end annotation
 .end method
 
-.method public abstract hp()I
+.method public abstract hs()I
 .end method
diff --git a/com.discord/smali/com/facebook/d/c.smali b/com.discord/smali/com/facebook/d/c.smali
index 18163870eb..24ab014abe 100644
--- a/com.discord/smali/com/facebook/d/c.smali
+++ b/com.discord/smali/com/facebook/d/c.smali
@@ -12,11 +12,11 @@
 
 
 # static fields
-.field public static final PD:Lcom/facebook/d/c;
+.field public static final PV:Lcom/facebook/d/c;
 
 
 # instance fields
-.field private final PE:Ljava/lang/String;
+.field private final PW:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -36,7 +36,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/d/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sput-object v0, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 
     iput-object p1, p0, Lcom/facebook/d/c;->mName:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/facebook/d/c;->PE:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/d/c;->PW:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/d/d.smali b/com.discord/smali/com/facebook/d/d.smali
index 310d79bdc0..fd740853b1 100644
--- a/com.discord/smali/com/facebook/d/d.smali
+++ b/com.discord/smali/com/facebook/d/d.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static PF:Lcom/facebook/d/d;
+.field private static PY:Lcom/facebook/d/d;
 
 
 # instance fields
-.field private PG:I
+.field private PZ:I
 
-.field public PH:Ljava/util/List;
+.field public Qa:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final PI:Lcom/facebook/d/c$a;
+.field private final Qb:Lcom/facebook/d/c$a;
 
 
 # direct methods
@@ -36,9 +36,9 @@
 
     invoke-direct {v0}, Lcom/facebook/d/a;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/d/d;->PI:Lcom/facebook/d/c$a;
+    iput-object v0, p0, Lcom/facebook/d/d;->Qb:Lcom/facebook/d/c$a;
 
-    invoke-virtual {p0}, Lcom/facebook/d/d;->hq()V
+    invoke-virtual {p0}, Lcom/facebook/d/d;->ht()V
 
     return-void
 .end method
@@ -107,23 +107,23 @@
     .locals 4
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/d/d;->hr()Lcom/facebook/d/d;
+    invoke-static {}, Lcom/facebook/d/d;->hu()Lcom/facebook/d/d;
 
     move-result-object v0
 
     invoke-static {p0}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v1, v0, Lcom/facebook/d/d;->PG:I
+    iget v1, v0, Lcom/facebook/d/d;->PZ:I
 
     new-array v1, v1, [B
 
-    iget v2, v0, Lcom/facebook/d/d;->PG:I
+    iget v2, v0, Lcom/facebook/d/d;->PZ:I
 
     invoke-static {v2, p0, v1}, Lcom/facebook/d/d;->a(ILjava/io/InputStream;[B)I
 
     move-result p0
 
-    iget-object v2, v0, Lcom/facebook/d/d;->PI:Lcom/facebook/d/c$a;
+    iget-object v2, v0, Lcom/facebook/d/d;->Qb:Lcom/facebook/d/c$a;
 
     invoke-interface {v2, v1, p0}, Lcom/facebook/d/c$a;->c([BI)Lcom/facebook/d/c;
 
@@ -131,18 +131,18 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v3, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object v3, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
     if-eq v2, v3, :cond_0
 
     return-object v2
 
     :cond_0
-    iget-object v2, v0, Lcom/facebook/d/d;->PH:Ljava/util/List;
+    iget-object v2, v0, Lcom/facebook/d/d;->Qa:Ljava/util/List;
 
     if-eqz v2, :cond_2
 
-    iget-object v0, v0, Lcom/facebook/d/d;->PH:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/d/d;->Qa:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -167,14 +167,14 @@
 
     if-eqz v2, :cond_1
 
-    sget-object v3, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object v3, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
     if-eq v2, v3, :cond_1
 
     return-object v2
 
     :cond_2
-    sget-object p0, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object p0, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -196,7 +196,7 @@
     goto :goto_0
 .end method
 
-.method public static declared-synchronized hr()Lcom/facebook/d/d;
+.method public static declared-synchronized hu()Lcom/facebook/d/d;
     .locals 2
 
     const-class v0, Lcom/facebook/d/d;
@@ -204,7 +204,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/d/d;->PF:Lcom/facebook/d/d;
+    sget-object v1, Lcom/facebook/d/d;->PY:Lcom/facebook/d/d;
 
     if-nez v1, :cond_0
 
@@ -212,10 +212,10 @@
 
     invoke-direct {v1}, Lcom/facebook/d/d;-><init>()V
 
-    sput-object v1, Lcom/facebook/d/d;->PF:Lcom/facebook/d/d;
+    sput-object v1, Lcom/facebook/d/d;->PY:Lcom/facebook/d/d;
 
     :cond_0
-    sget-object v1, Lcom/facebook/d/d;->PF:Lcom/facebook/d/d;
+    sget-object v1, Lcom/facebook/d/d;->PY:Lcom/facebook/d/d;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -233,18 +233,18 @@
 
 
 # virtual methods
-.method public final hq()V
+.method public final ht()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/d/d;->PI:Lcom/facebook/d/c$a;
+    iget-object v0, p0, Lcom/facebook/d/d;->Qb:Lcom/facebook/d/c$a;
 
-    invoke-interface {v0}, Lcom/facebook/d/c$a;->hp()I
+    invoke-interface {v0}, Lcom/facebook/d/c$a;->hs()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/d/d;->PG:I
+    iput v0, p0, Lcom/facebook/d/d;->PZ:I
 
-    iget-object v0, p0, Lcom/facebook/d/d;->PH:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/d/d;->Qa:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
@@ -265,9 +265,9 @@
 
     check-cast v1, Lcom/facebook/d/c$a;
 
-    iget v2, p0, Lcom/facebook/d/d;->PG:I
+    iget v2, p0, Lcom/facebook/d/d;->PZ:I
 
-    invoke-interface {v1}, Lcom/facebook/d/c$a;->hp()I
+    invoke-interface {v1}, Lcom/facebook/d/c$a;->hs()I
 
     move-result v1
 
@@ -275,7 +275,7 @@
 
     move-result v1
 
-    iput v1, p0, Lcom/facebook/d/d;->PG:I
+    iput v1, p0, Lcom/facebook/d/d;->PZ:I
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/facebook/drawee/a/a.smali b/com.discord/smali/com/facebook/drawee/a/a.smali
index ef237e4490..b45fa5a49f 100644
--- a/com.discord/smali/com/facebook/drawee/a/a.smali
+++ b/com.discord/smali/com/facebook/drawee/a/a.smali
@@ -12,16 +12,14 @@
 
 
 # static fields
-.field private static Jx:Lcom/facebook/drawee/a/a;
+.field private static JO:Lcom/facebook/drawee/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
 
 # instance fields
-.field public final JA:Ljava/lang/Runnable;
-
-.field public final Jy:Ljava/util/Set;
+.field public final JP:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -31,7 +29,9 @@
     .end annotation
 .end field
 
-.field public final Jz:Landroid/os/Handler;
+.field public final JQ:Landroid/os/Handler;
+
+.field public final JR:Ljava/lang/Runnable;
 
 
 # direct methods
@@ -50,13 +50,13 @@
 
     invoke-direct {v0, p0}, Lcom/facebook/drawee/a/a$1;-><init>(Lcom/facebook/drawee/a/a;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/a/a;->JA:Ljava/lang/Runnable;
+    iput-object v0, p0, Lcom/facebook/drawee/a/a;->JR:Ljava/lang/Runnable;
 
     new-instance v0, Ljava/util/HashSet;
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/a/a;->Jy:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/drawee/a/a;->JP:Ljava/util/Set;
 
     new-instance v0, Landroid/os/Handler;
 
@@ -66,7 +66,7 @@
 
     invoke-direct {v0, v1}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/a/a;->Jz:Landroid/os/Handler;
+    iput-object v0, p0, Lcom/facebook/drawee/a/a;->JQ:Landroid/os/Handler;
 
     return-void
 .end method
@@ -74,12 +74,12 @@
 .method static synthetic a(Lcom/facebook/drawee/a/a;)Ljava/util/Set;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/drawee/a/a;->Jy:Ljava/util/Set;
+    iget-object p0, p0, Lcom/facebook/drawee/a/a;->JP:Ljava/util/Set;
 
     return-object p0
 .end method
 
-.method public static declared-synchronized gt()Lcom/facebook/drawee/a/a;
+.method public static declared-synchronized gx()Lcom/facebook/drawee/a/a;
     .locals 2
 
     const-class v0, Lcom/facebook/drawee/a/a;
@@ -87,7 +87,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/drawee/a/a;->Jx:Lcom/facebook/drawee/a/a;
+    sget-object v1, Lcom/facebook/drawee/a/a;->JO:Lcom/facebook/drawee/a/a;
 
     if-nez v1, :cond_0
 
@@ -95,10 +95,10 @@
 
     invoke-direct {v1}, Lcom/facebook/drawee/a/a;-><init>()V
 
-    sput-object v1, Lcom/facebook/drawee/a/a;->Jx:Lcom/facebook/drawee/a/a;
+    sput-object v1, Lcom/facebook/drawee/a/a;->JO:Lcom/facebook/drawee/a/a;
 
     :cond_0
-    sget-object v1, Lcom/facebook/drawee/a/a;->Jx:Lcom/facebook/drawee/a/a;
+    sget-object v1, Lcom/facebook/drawee/a/a;->JO:Lcom/facebook/drawee/a/a;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -114,7 +114,7 @@
     throw v1
 .end method
 
-.method public static gu()V
+.method public static gy()V
     .locals 2
 
     invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
@@ -144,10 +144,10 @@
     return-void
 .end method
 
-.method static synthetic gv()V
+.method static synthetic gz()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/drawee/a/a;->gu()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->gy()V
 
     return-void
 .end method
@@ -157,9 +157,9 @@
 .method public final a(Lcom/facebook/drawee/a/a$a;)V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/drawee/a/a;->gu()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->gy()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/a/a;->Jy:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/a/a;->JP:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/facebook/drawee/b/a.smali b/com.discord/smali/com/facebook/drawee/b/a.smali
index de930b32f7..1fb6a3cf19 100644
--- a/com.discord/smali/com/facebook/drawee/b/a.smali
+++ b/com.discord/smali/com/facebook/drawee/b/a.smali
@@ -7,39 +7,39 @@
 
 
 # instance fields
-.field private IT:Ljava/lang/String;
+.field private Jk:Ljava/lang/String;
 
-.field private KS:Ljava/lang/String;
+.field private Lj:Ljava/lang/String;
 
-.field private KT:I
+.field private Lk:I
 
-.field private KU:I
+.field private Ll:I
 
-.field public KV:I
+.field public Lm:I
 
-.field private KW:Ljava/lang/String;
+.field private Ln:Ljava/lang/String;
 
-.field public KX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public Lo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field private KY:I
+.field private Lp:I
 
-.field private KZ:I
+.field private Lq:I
 
-.field private La:I
+.field private Lr:I
 
-.field private final Lb:Landroid/graphics/RectF;
+.field private final Ls:Landroid/graphics/RectF;
 
-.field private Lc:I
+.field private Lt:I
 
-.field private Ld:I
+.field private Lu:I
 
-.field private Le:I
+.field private Lv:I
 
-.field private Lf:I
+.field private Lw:I
 
-.field private Lg:I
+.field private Lx:I
 
-.field private Lh:J
+.field private Ly:J
 
 .field private final mMatrix:Landroid/graphics/Matrix;
 
@@ -58,7 +58,7 @@
 
     const/16 v0, 0x50
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->La:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Lr:I
 
     new-instance v0, Landroid/graphics/Paint;
 
@@ -84,7 +84,7 @@
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/b/a;->Lb:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/drawee/b/a;->Ls:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/b/a;->reset()V
 
@@ -102,11 +102,11 @@
 
     move-result-object p2
 
-    iget p3, p0, Lcom/facebook/drawee/b/a;->Lf:I
+    iget p3, p0, Lcom/facebook/drawee/b/a;->Lw:I
 
     int-to-float p3, p3
 
-    iget v0, p0, Lcom/facebook/drawee/b/a;->Lg:I
+    iget v0, p0, Lcom/facebook/drawee/b/a;->Lx:I
 
     int-to-float v0, v0
 
@@ -114,20 +114,20 @@
 
     invoke-virtual {p1, p2, p3, v0, v1}, Landroid/graphics/Canvas;->drawText(Ljava/lang/String;FFLandroid/graphics/Paint;)V
 
-    iget p1, p0, Lcom/facebook/drawee/b/a;->Lg:I
+    iget p1, p0, Lcom/facebook/drawee/b/a;->Lx:I
 
-    iget p2, p0, Lcom/facebook/drawee/b/a;->Le:I
+    iget p2, p0, Lcom/facebook/drawee/b/a;->Lv:I
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lcom/facebook/drawee/b/a;->Lg:I
+    iput p1, p0, Lcom/facebook/drawee/b/a;->Lx:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final ay(Ljava/lang/String;)V
+.method public final at(Ljava/lang/String;)V
     .locals 0
     .param p1    # Ljava/lang/String;
         .annotation runtime Ljavax/annotation/Nullable;
@@ -142,14 +142,14 @@
     const-string p1, "none"
 
     :goto_0
-    iput-object p1, p0, Lcom/facebook/drawee/b/a;->IT:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/drawee/b/a;->Jk:Ljava/lang/String;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/b/a;->invalidateSelf()V
 
     return-void
 .end method
 
-.method public final az(Ljava/lang/String;)V
+.method public final au(Ljava/lang/String;)V
     .locals 0
 
     iput-object p1, p0, Lcom/facebook/drawee/b/a;->mOrigin:Ljava/lang/String;
@@ -218,11 +218,11 @@
 
     iget-object v1, v0, Lcom/facebook/drawee/b/a;->mPaint:Landroid/graphics/Paint;
 
-    iget v2, v0, Lcom/facebook/drawee/b/a;->KT:I
+    iget v2, v0, Lcom/facebook/drawee/b/a;->Lk:I
 
-    iget v3, v0, Lcom/facebook/drawee/b/a;->KU:I
+    iget v3, v0, Lcom/facebook/drawee/b/a;->Ll:I
 
-    iget-object v9, v0, Lcom/facebook/drawee/b/a;->KX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v9, v0, Lcom/facebook/drawee/b/a;->Lo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     invoke-virtual/range {p0 .. p0}, Lcom/facebook/drawee/b/a;->getBounds()Landroid/graphics/Rect;
 
@@ -291,7 +291,7 @@
 
     invoke-interface/range {v9 .. v15}, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->a(Landroid/graphics/Matrix;Landroid/graphics/Rect;IIFF)Landroid/graphics/Matrix;
 
-    iget-object v9, v0, Lcom/facebook/drawee/b/a;->Lb:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/facebook/drawee/b/a;->Ls:Landroid/graphics/RectF;
 
     iput v6, v9, Landroid/graphics/RectF;->top:F
 
@@ -309,7 +309,7 @@
 
     invoke-virtual {v10, v9}, Landroid/graphics/Matrix;->mapRect(Landroid/graphics/RectF;)Z
 
-    iget-object v9, v0, Lcom/facebook/drawee/b/a;->Lb:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/facebook/drawee/b/a;->Ls:Landroid/graphics/RectF;
 
     invoke-virtual {v9}, Landroid/graphics/RectF;->width()F
 
@@ -317,7 +317,7 @@
 
     float-to-int v9, v9
 
-    iget-object v10, v0, Lcom/facebook/drawee/b/a;->Lb:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/facebook/drawee/b/a;->Ls:Landroid/graphics/RectF;
 
     invoke-virtual {v10}, Landroid/graphics/RectF;->height()F
 
@@ -454,15 +454,15 @@
 
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget v1, v0, Lcom/facebook/drawee/b/a;->Lc:I
+    iget v1, v0, Lcom/facebook/drawee/b/a;->Lt:I
 
-    iput v1, v0, Lcom/facebook/drawee/b/a;->Lf:I
+    iput v1, v0, Lcom/facebook/drawee/b/a;->Lw:I
 
-    iget v1, v0, Lcom/facebook/drawee/b/a;->Ld:I
+    iget v1, v0, Lcom/facebook/drawee/b/a;->Lu:I
 
-    iput v1, v0, Lcom/facebook/drawee/b/a;->Lg:I
+    iput v1, v0, Lcom/facebook/drawee/b/a;->Lx:I
 
-    iget-object v1, v0, Lcom/facebook/drawee/b/a;->KS:Ljava/lang/String;
+    iget-object v1, v0, Lcom/facebook/drawee/b/a;->Lj:Ljava/lang/String;
 
     const/4 v2, 0x2
 
@@ -472,7 +472,7 @@
 
     new-array v4, v2, [Ljava/lang/Object;
 
-    iget-object v5, v0, Lcom/facebook/drawee/b/a;->IT:Ljava/lang/String;
+    iget-object v5, v0, Lcom/facebook/drawee/b/a;->Jk:Ljava/lang/String;
 
     aput-object v5, v4, v18
 
@@ -487,7 +487,7 @@
     :cond_5
     new-array v1, v3, [Ljava/lang/Object;
 
-    iget-object v4, v0, Lcom/facebook/drawee/b/a;->IT:Ljava/lang/String;
+    iget-object v4, v0, Lcom/facebook/drawee/b/a;->Jk:Ljava/lang/String;
 
     aput-object v4, v1, v18
 
@@ -524,7 +524,7 @@
 
     new-array v1, v2, [Ljava/lang/Object;
 
-    iget v4, v0, Lcom/facebook/drawee/b/a;->KT:I
+    iget v4, v0, Lcom/facebook/drawee/b/a;->Lk:I
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -532,7 +532,7 @@
 
     aput-object v4, v1, v18
 
-    iget v4, v0, Lcom/facebook/drawee/b/a;->KU:I
+    iget v4, v0, Lcom/facebook/drawee/b/a;->Ll:I
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -546,7 +546,7 @@
 
     new-array v1, v3, [Ljava/lang/Object;
 
-    iget v4, v0, Lcom/facebook/drawee/b/a;->KV:I
+    iget v4, v0, Lcom/facebook/drawee/b/a;->Lm:I
 
     div-int/lit16 v4, v4, 0x400
 
@@ -560,7 +560,7 @@
 
     invoke-direct {v0, v7, v4, v1}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iget-object v1, v0, Lcom/facebook/drawee/b/a;->KW:Ljava/lang/String;
+    iget-object v1, v0, Lcom/facebook/drawee/b/a;->Ln:Ljava/lang/String;
 
     if-eqz v1, :cond_6
 
@@ -573,7 +573,7 @@
     invoke-direct {v0, v7, v1, v4}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
 
     :cond_6
-    iget v1, v0, Lcom/facebook/drawee/b/a;->KY:I
+    iget v1, v0, Lcom/facebook/drawee/b/a;->Lp:I
 
     if-lez v1, :cond_7
 
@@ -585,7 +585,7 @@
 
     aput-object v1, v2, v18
 
-    iget v1, v0, Lcom/facebook/drawee/b/a;->KZ:I
+    iget v1, v0, Lcom/facebook/drawee/b/a;->Lq:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -598,7 +598,7 @@
     invoke-direct {v0, v7, v1, v2}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
 
     :cond_7
-    iget-object v1, v0, Lcom/facebook/drawee/b/a;->KX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v1, v0, Lcom/facebook/drawee/b/a;->Lo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     if-eqz v1, :cond_8
 
@@ -611,7 +611,7 @@
     invoke-direct {v0, v7, v1, v2}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
 
     :cond_8
-    iget-wide v1, v0, Lcom/facebook/drawee/b/a;->Lh:J
+    iget-wide v1, v0, Lcom/facebook/drawee/b/a;->Ly:J
 
     const-wide/16 v4, 0x0
 
@@ -659,9 +659,9 @@
 .method public final i(II)V
     .locals 0
 
-    iput p1, p0, Lcom/facebook/drawee/b/a;->KT:I
+    iput p1, p0, Lcom/facebook/drawee/b/a;->Lk:I
 
-    iput p2, p0, Lcom/facebook/drawee/b/a;->KU:I
+    iput p2, p0, Lcom/facebook/drawee/b/a;->Ll:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/b/a;->invalidateSelf()V
 
@@ -671,7 +671,7 @@
 .method public final n(J)V
     .locals 0
 
-    iput-wide p1, p0, Lcom/facebook/drawee/b/a;->Lh:J
+    iput-wide p1, p0, Lcom/facebook/drawee/b/a;->Ly:J
 
     invoke-virtual {p0}, Lcom/facebook/drawee/b/a;->invalidateSelf()V
 
@@ -719,28 +719,28 @@
 
     add-int/lit8 v0, v0, 0x8
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->Le:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Lv:I
 
-    iget v0, p0, Lcom/facebook/drawee/b/a;->La:I
+    iget v0, p0, Lcom/facebook/drawee/b/a;->Lr:I
 
     const/16 v2, 0x50
 
     if-ne v0, v2, :cond_0
 
-    iget v0, p0, Lcom/facebook/drawee/b/a;->Le:I
+    iget v0, p0, Lcom/facebook/drawee/b/a;->Lv:I
 
     mul-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->Le:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Lv:I
 
     :cond_0
     iget v0, p1, Landroid/graphics/Rect;->left:I
 
     add-int/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->Lc:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Lt:I
 
-    iget v0, p0, Lcom/facebook/drawee/b/a;->La:I
+    iget v0, p0, Lcom/facebook/drawee/b/a;->Lr:I
 
     if-ne v0, v2, :cond_1
 
@@ -758,7 +758,7 @@
     add-int/2addr p1, v1
 
     :goto_0
-    iput p1, p0, Lcom/facebook/drawee/b/a;->Ld:I
+    iput p1, p0, Lcom/facebook/drawee/b/a;->Lu:I
 
     return-void
 .end method
@@ -768,25 +768,25 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->KT:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Lk:I
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->KU:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Ll:I
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->KV:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Lm:I
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->KY:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Lp:I
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->KZ:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Lq:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/b/a;->KW:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/drawee/b/a;->Ln:Ljava/lang/String;
 
-    invoke-virtual {p0, v0}, Lcom/facebook/drawee/b/a;->ay(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/facebook/drawee/b/a;->at(Ljava/lang/String;)V
 
     const-wide/16 v1, -0x1
 
-    iput-wide v1, p0, Lcom/facebook/drawee/b/a;->Lh:J
+    iput-wide v1, p0, Lcom/facebook/drawee/b/a;->Ly:J
 
     iput-object v0, p0, Lcom/facebook/drawee/b/a;->mOrigin:Ljava/lang/String;
 
diff --git a/com.discord/smali/com/facebook/drawee/b/a/a.smali b/com.discord/smali/com/facebook/drawee/b/a/a.smali
index b0203d8fe4..ce8f471521 100644
--- a/com.discord/smali/com/facebook/drawee/b/a/a.smali
+++ b/com.discord/smali/com/facebook/drawee/b/a/a.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field private Li:J
+.field private LA:J
 
-.field private Lj:J
-
-.field private Lk:Lcom/facebook/drawee/b/a/b;
+.field private LB:Lcom/facebook/drawee/b/a/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
+.field private Lz:J
+
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/drawee/b/a/b;)V
@@ -26,11 +26,11 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/drawee/b/a/a;->Li:J
+    iput-wide v0, p0, Lcom/facebook/drawee/b/a/a;->Lz:J
 
-    iput-wide v0, p0, Lcom/facebook/drawee/b/a/a;->Lj:J
+    iput-wide v0, p0, Lcom/facebook/drawee/b/a/a;->LA:J
 
-    iput-object p1, p0, Lcom/facebook/drawee/b/a/a;->Lk:Lcom/facebook/drawee/b/a/b;
+    iput-object p1, p0, Lcom/facebook/drawee/b/a/a;->LB:Lcom/facebook/drawee/b/a/b;
 
     return-void
 .end method
@@ -52,15 +52,15 @@
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lcom/facebook/drawee/b/a/a;->Lj:J
+    iput-wide p1, p0, Lcom/facebook/drawee/b/a/a;->LA:J
 
-    iget-object p1, p0, Lcom/facebook/drawee/b/a/a;->Lk:Lcom/facebook/drawee/b/a/b;
+    iget-object p1, p0, Lcom/facebook/drawee/b/a/a;->LB:Lcom/facebook/drawee/b/a/b;
 
     if-eqz p1, :cond_0
 
-    iget-wide p2, p0, Lcom/facebook/drawee/b/a/a;->Lj:J
+    iget-wide p2, p0, Lcom/facebook/drawee/b/a/a;->LA:J
 
-    iget-wide v0, p0, Lcom/facebook/drawee/b/a/a;->Li:J
+    iget-wide v0, p0, Lcom/facebook/drawee/b/a/a;->Lz:J
 
     sub-long/2addr p2, v0
 
@@ -77,7 +77,7 @@
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lcom/facebook/drawee/b/a/a;->Li:J
+    iput-wide p1, p0, Lcom/facebook/drawee/b/a/a;->Lz:J
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/a.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/a.smali
index 29e1830d55..8c786ab142 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/a.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/a.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final Iu:Lcom/facebook/imagepipeline/e/a;
+.field private final IL:Lcom/facebook/imagepipeline/e/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -27,7 +27,7 @@
 
     iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/a;->mResources:Landroid/content/res/Resources;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/a;->Iu:Lcom/facebook/imagepipeline/e/a;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/a;->IL:Lcom/facebook/imagepipeline/e/a;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     invoke-direct {v0, v1, v2}, Landroid/graphics/drawable/BitmapDrawable;-><init>(Landroid/content/res/Resources;Landroid/graphics/Bitmap;)V
 
-    iget v1, p1, Lcom/facebook/imagepipeline/f/d;->LP:I
+    iget v1, p1, Lcom/facebook/imagepipeline/f/d;->Mh:I
 
     const/4 v2, 0x0
 
@@ -72,7 +72,7 @@
 
     if-eqz v1, :cond_0
 
-    iget v1, p1, Lcom/facebook/imagepipeline/f/d;->LP:I
+    iget v1, p1, Lcom/facebook/imagepipeline/f/d;->Mh:I
 
     const/4 v4, -0x1
 
@@ -88,11 +88,11 @@
     :goto_0
     if-nez v1, :cond_2
 
-    iget v1, p1, Lcom/facebook/imagepipeline/f/d;->LQ:I
+    iget v1, p1, Lcom/facebook/imagepipeline/f/d;->Mi:I
 
     if-eq v1, v3, :cond_1
 
-    iget v1, p1, Lcom/facebook/imagepipeline/f/d;->LQ:I
+    iget v1, p1, Lcom/facebook/imagepipeline/f/d;->Mi:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -111,9 +111,9 @@
     :try_start_1
     new-instance v1, Lcom/facebook/drawee/drawable/i;
 
-    iget v2, p1, Lcom/facebook/imagepipeline/f/d;->LP:I
+    iget v2, p1, Lcom/facebook/imagepipeline/f/d;->Mh:I
 
-    iget p1, p1, Lcom/facebook/imagepipeline/f/d;->LQ:I
+    iget p1, p1, Lcom/facebook/imagepipeline/f/d;->Mi:I
 
     invoke-direct {v1, v0, v2, p1}, Lcom/facebook/drawee/drawable/i;-><init>(Landroid/graphics/drawable/Drawable;II)V
     :try_end_1
@@ -125,11 +125,11 @@
 
     :cond_3
     :try_start_2
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->Iu:Lcom/facebook/imagepipeline/e/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->IL:Lcom/facebook/imagepipeline/e/a;
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->Iu:Lcom/facebook/imagepipeline/e/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->IL:Lcom/facebook/imagepipeline/e/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/e/a;->a(Lcom/facebook/imagepipeline/f/c;)Z
 
@@ -137,7 +137,7 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->Iu:Lcom/facebook/imagepipeline/e/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->IL:Lcom/facebook/imagepipeline/e/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/e/a;->b(Lcom/facebook/imagepipeline/f/c;)Landroid/graphics/drawable/Drawable;
 
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/b.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/b.smali
index f1a7196b1a..c328753b63 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/b.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/b.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final Iv:Lcom/facebook/common/d/e;
+.field final IM:Lcom/facebook/common/d/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/e<",
@@ -17,12 +17,12 @@
     .end annotation
 .end field
 
-.field final Iw:Lcom/facebook/drawee/backends/pipeline/g;
+.field final IO:Lcom/facebook/drawee/backends/pipeline/g;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final Ix:Lcom/facebook/common/d/k;
+.field final IP:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a/a.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a/a.smali
index 77847c194d..d8da182d8a 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a/a.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/a/a.smali
@@ -14,11 +14,11 @@
 
 
 # instance fields
-.field private final IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+.field private final IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
-.field private final Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+.field private final JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-.field private final Jw:Lcom/facebook/common/time/b;
+.field private final JN:Lcom/facebook/common/time/b;
 
 
 # direct methods
@@ -27,11 +27,11 @@
 
     invoke-direct {p0}, Lcom/facebook/drawee/controller/b;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jw:Lcom/facebook/common/time/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JN:Lcom/facebook/common/time/b;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     return-void
 .end method
@@ -39,17 +39,17 @@
 .method private m(J)V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/backends/pipeline/b/h;->setVisible(Z)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jl:J
+    iput-wide p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->JC:J
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     invoke-virtual {p1, v0}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;)V
 
@@ -61,19 +61,19 @@
 .method public final onFailure(Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 3
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jw:Lcom/facebook/common/time/b;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JN:Lcom/facebook/common/time/b;
 
     invoke-interface {p2}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v0
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->Jc:J
+    iput-wide v0, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->Jt:J
 
-    iput-object p1, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->IT:Ljava/lang/String;
+    iput-object p1, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->Jk:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     const/4 v2, 0x5
 
@@ -97,23 +97,23 @@
 
     check-cast p2, Lcom/facebook/imagepipeline/f/f;
 
-    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jw:Lcom/facebook/common/time/b;
+    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JN:Lcom/facebook/common/time/b;
 
     invoke-interface {p3}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v0
 
-    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Jb:J
+    iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Js:J
 
-    iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Jf:J
+    iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Jw:J
 
-    iput-object p1, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->IT:Ljava/lang/String;
+    iput-object p1, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Jk:Ljava/lang/String;
 
-    iput-object p2, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->IY:Lcom/facebook/imagepipeline/f/f;
+    iput-object p2, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Jp:Lcom/facebook/imagepipeline/f/f;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     const/4 p2, 0x3
 
@@ -131,21 +131,21 @@
 
     check-cast p2, Lcom/facebook/imagepipeline/f/f;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jw:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JN:Lcom/facebook/common/time/b;
 
     invoke-interface {v0}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Ja:J
+    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Jr:J
 
-    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->IT:Ljava/lang/String;
+    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Jk:Ljava/lang/String;
 
-    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->IY:Lcom/facebook/imagepipeline/f/f;
+    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Jp:Lcom/facebook/imagepipeline/f/f;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     const/4 p2, 0x2
 
@@ -159,15 +159,15 @@
 
     invoke-super {p0, p1}, Lcom/facebook/drawee/controller/b;->onRelease(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jw:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JN:Lcom/facebook/common/time/b;
 
     invoke-interface {v0}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget v2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Jv:I
+    iget v2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->JM:I
 
     const/4 v3, 0x3
 
@@ -177,13 +177,13 @@
 
     if-eq v2, v3, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Jd:J
+    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Ju:J
 
-    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->IT:Ljava/lang/String;
+    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Jk:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     const/4 v3, 0x4
 
@@ -198,37 +198,37 @@
 .method public final onSubmit(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jw:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JN:Lcom/facebook/common/time/b;
 
     invoke-interface {v0}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->IZ:J
+    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Jq:J
 
-    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->IT:Ljava/lang/String;
+    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Jk:Ljava/lang/String;
 
-    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->IW:Ljava/lang/Object;
+    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Jn:Ljava/lang/Object;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     const/4 p2, 0x0
 
     invoke-virtual {p1, v2, p2}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;I)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     const/4 p2, 0x1
 
     invoke-virtual {p1, p2}, Lcom/facebook/drawee/backends/pipeline/b/h;->setVisible(Z)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Jk:J
+    iput-wide v0, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->JB:J
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     invoke-virtual {p2, p1}, Lcom/facebook/drawee/backends/pipeline/b/g;->a(Lcom/facebook/drawee/backends/pipeline/b/h;)V
 
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/c.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/c.smali
index 83d297d855..ff9b021834 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/c.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/c.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field IT:Ljava/lang/String;
+.field Jk:Ljava/lang/String;
 
-.field private final IU:Lcom/facebook/drawee/backends/pipeline/b/b;
+.field private final Jl:Lcom/facebook/drawee/backends/pipeline/b/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -22,9 +22,9 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/g/a;-><init>()V
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->IU:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Jl:Lcom/facebook/drawee/backends/pipeline/b/b;
 
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->IT:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Jk:Ljava/lang/String;
 
     return-void
 .end method
@@ -34,11 +34,11 @@
 .method public final a(Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 9
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->IU:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Jl:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->IT:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Jk:Ljava/lang/String;
 
     const/4 v1, -0x1
 
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/e.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/e.smali
index 5725a54b85..9f00b30b31 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/e.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/e.smali
@@ -4,64 +4,64 @@
 
 
 # instance fields
-.field private final IR:I
+.field private final JA:I
 
-.field private final IT:Ljava/lang/String;
+.field private final JB:J
+
+.field private final JC:J
+
+.field private final JD:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final IV:Ljava/lang/String;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private final IW:Ljava/lang/Object;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private final IX:Lcom/facebook/imagepipeline/request/b;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private final IY:Lcom/facebook/imagepipeline/f/f;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private final IZ:J
-
-.field private final Ja:J
-
-.field private final Jb:J
-
-.field private final Jc:J
-
-.field private final Jd:J
-
-.field private final Je:J
-
-.field private final Jf:J
-
-.field private final Jg:Z
-
-.field private final Jh:I
-
 .field private final Ji:I
 
-.field private final Jj:I
-
-.field private final Jk:J
-
-.field private final Jl:J
+.field private final Jk:Ljava/lang/String;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
 .field private final Jm:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
+.field private final Jn:Ljava/lang/Object;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private final Jo:Lcom/facebook/imagepipeline/request/b;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private final Jp:Lcom/facebook/imagepipeline/f/f;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private final Jq:J
+
+.field private final Jr:J
+
+.field private final Js:J
+
+.field private final Jt:J
+
+.field private final Ju:J
+
+.field private final Jv:J
+
+.field private final Jw:J
+
+.field private final Jx:Z
+
+.field private final Jy:I
+
+.field private final Jz:I
+
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Lcom/facebook/imagepipeline/request/b;Ljava/lang/Object;Lcom/facebook/imagepipeline/f/f;JJJJJJJIZIIIJJLjava/lang/String;)V
@@ -97,83 +97,83 @@
 
     move-object v1, p1
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->IT:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jk:Ljava/lang/String;
 
     move-object v1, p2
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->IV:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jm:Ljava/lang/String;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->IX:Lcom/facebook/imagepipeline/request/b;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jo:Lcom/facebook/imagepipeline/request/b;
 
     move-object v1, p4
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->IW:Ljava/lang/Object;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jn:Ljava/lang/Object;
 
     move-object v1, p5
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->IY:Lcom/facebook/imagepipeline/f/f;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jp:Lcom/facebook/imagepipeline/f/f;
 
     move-wide v1, p6
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->IZ:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jq:J
 
     move-wide v1, p8
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Ja:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jr:J
 
     move-wide v1, p10
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jb:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Js:J
 
     move-wide v1, p12
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jc:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jt:J
 
     move-wide/from16 v1, p14
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jd:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Ju:J
 
     move-wide/from16 v1, p16
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Je:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jv:J
 
     move-wide/from16 v1, p18
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jf:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jw:J
 
     move/from16 v1, p20
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->IR:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Ji:I
 
     move/from16 v1, p21
 
-    iput-boolean v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jg:Z
+    iput-boolean v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jx:Z
 
     move/from16 v1, p22
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jh:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jy:I
 
     move/from16 v1, p23
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Ji:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jz:I
 
     move/from16 v1, p24
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jj:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->JA:I
 
     move-wide/from16 v1, p25
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jk:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->JB:J
 
     move-wide/from16 v1, p27
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jl:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->JC:J
 
     move-object/from16 v1, p29
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Jm:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->JD:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/g.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/g.smali
index fa63a2a1ee..94dbc4f9a2 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/g.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/g.smali
@@ -4,38 +4,38 @@
 
 
 # instance fields
-.field private IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+.field private IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Jn:Lcom/facebook/drawee/backends/pipeline/d;
+.field private final JE:Lcom/facebook/drawee/backends/pipeline/d;
 
-.field private final Jo:Lcom/facebook/common/time/b;
+.field private final JF:Lcom/facebook/common/time/b;
 
-.field public final Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+.field public final JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-.field private Jq:Lcom/facebook/drawee/backends/pipeline/b/c;
+.field private JH:Lcom/facebook/drawee/backends/pipeline/b/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Jr:Lcom/facebook/drawee/backends/pipeline/b/a/c;
+.field private JI:Lcom/facebook/drawee/backends/pipeline/b/a/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Js:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+.field private JJ:Lcom/facebook/drawee/backends/pipeline/b/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Jt:Lcom/facebook/imagepipeline/g/b;
+.field private JK:Lcom/facebook/imagepipeline/g/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Ju:Ljava/util/List;
+.field public JL:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -57,92 +57,92 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jo:Lcom/facebook/common/time/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JF:Lcom/facebook/common/time/b;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jn:Lcom/facebook/drawee/backends/pipeline/d;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JE:Lcom/facebook/drawee/backends/pipeline/d;
 
     new-instance p1, Lcom/facebook/drawee/backends/pipeline/b/h;
 
     invoke-direct {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     return-void
 .end method
 
-.method private gr()V
+.method private gv()V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Js:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JJ:Lcom/facebook/drawee/backends/pipeline/b/a/a;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/facebook/drawee/backends/pipeline/b/a/a;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jo:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JF:Lcom/facebook/common/time/b;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     invoke-direct {v0, v1, v2, p0}, Lcom/facebook/drawee/backends/pipeline/b/a/a;-><init>(Lcom/facebook/common/time/b;Lcom/facebook/drawee/backends/pipeline/b/h;Lcom/facebook/drawee/backends/pipeline/b/g;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Js:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JJ:Lcom/facebook/drawee/backends/pipeline/b/a/a;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jr:Lcom/facebook/drawee/backends/pipeline/b/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JI:Lcom/facebook/drawee/backends/pipeline/b/a/c;
 
     if-nez v0, :cond_1
 
     new-instance v0, Lcom/facebook/drawee/backends/pipeline/b/a/c;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jo:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JF:Lcom/facebook/common/time/b;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/drawee/backends/pipeline/b/a/c;-><init>(Lcom/facebook/common/time/b;Lcom/facebook/drawee/backends/pipeline/b/h;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jr:Lcom/facebook/drawee/backends/pipeline/b/a/c;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JI:Lcom/facebook/drawee/backends/pipeline/b/a/c;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-nez v0, :cond_2
 
     new-instance v0, Lcom/facebook/drawee/backends/pipeline/b/a/b;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     invoke-direct {v0, v1, p0}, Lcom/facebook/drawee/backends/pipeline/b/a/b;-><init>(Lcom/facebook/drawee/backends/pipeline/b/h;Lcom/facebook/drawee/backends/pipeline/b/g;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jq:Lcom/facebook/drawee/backends/pipeline/b/c;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JH:Lcom/facebook/drawee/backends/pipeline/b/c;
 
     if-nez v0, :cond_3
 
     new-instance v0, Lcom/facebook/drawee/backends/pipeline/b/c;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jn:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JE:Lcom/facebook/drawee/backends/pipeline/d;
 
     iget-object v1, v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/drawee/backends/pipeline/b/c;-><init>(Ljava/lang/String;Lcom/facebook/drawee/backends/pipeline/b/b;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jq:Lcom/facebook/drawee/backends/pipeline/b/c;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JH:Lcom/facebook/drawee/backends/pipeline/b/c;
 
     goto :goto_0
 
     :cond_3
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jn:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JE:Lcom/facebook/drawee/backends/pipeline/d;
 
     iget-object v1, v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/c;->IT:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/c;->Jk:Ljava/lang/String;
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jt:Lcom/facebook/imagepipeline/g/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JK:Lcom/facebook/imagepipeline/g/b;
 
     if-nez v0, :cond_4
 
@@ -154,19 +154,19 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jr:Lcom/facebook/drawee/backends/pipeline/b/a/c;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JI:Lcom/facebook/drawee/backends/pipeline/b/a/c;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x1
 
-    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jq:Lcom/facebook/drawee/backends/pipeline/b/c;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JH:Lcom/facebook/drawee/backends/pipeline/b/c;
 
     aput-object v3, v1, v2
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/g/b;-><init>([Lcom/facebook/imagepipeline/g/c;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jt:Lcom/facebook/imagepipeline/g/b;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JK:Lcom/facebook/imagepipeline/g/b;
 
     :cond_4
     return-void
@@ -181,7 +181,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Ju:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JL:Ljava/util/List;
 
     if-eqz v0, :cond_1
 
@@ -194,9 +194,9 @@
     goto :goto_1
 
     :cond_0
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->gs()Lcom/facebook/drawee/backends/pipeline/b/e;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->gw()Lcom/facebook/drawee/backends/pipeline/b/e;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Ju:Ljava/util/List;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JL:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -221,13 +221,13 @@
 .method public final a(Lcom/facebook/drawee/backends/pipeline/b/h;I)V
     .locals 2
 
-    iput p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Jv:I
+    iput p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->JM:I
 
     iget-boolean v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->mEnabled:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Ju:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JL:Ljava/util/List;
 
     if-eqz v0, :cond_2
 
@@ -244,9 +244,9 @@
 
     if-ne p2, v0, :cond_1
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jn:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JE:Lcom/facebook/drawee/backends/pipeline/d;
 
-    iget-object p2, p2, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object p2, p2, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     if-eqz p2, :cond_1
 
@@ -264,26 +264,26 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     invoke-virtual {p2}, Landroid/graphics/Rect;->width()I
 
     move-result v1
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jh:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jy:I
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     invoke-virtual {p2}, Landroid/graphics/Rect;->height()I
 
     move-result p2
 
-    iput p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ji:I
+    iput p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jz:I
 
     :cond_1
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->gs()Lcom/facebook/drawee/backends/pipeline/b/e;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->gw()Lcom/facebook/drawee/backends/pipeline/b/e;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Ju:Ljava/util/List;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JL:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -312,60 +312,60 @@
 
     if-eqz p1, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/b/g;->gr()V
+    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/b/g;->gv()V
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jn:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JE:Lcom/facebook/drawee/backends/pipeline/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/drawee/backends/pipeline/b/b;)V
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Js:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JJ:Lcom/facebook/drawee/backends/pipeline/b/a/a;
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jn:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JE:Lcom/facebook/drawee/backends/pipeline/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/drawee/controller/ControllerListener;)V
 
     :cond_1
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jt:Lcom/facebook/imagepipeline/g/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JK:Lcom/facebook/imagepipeline/g/b;
 
     if-eqz p1, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jn:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JE:Lcom/facebook/drawee/backends/pipeline/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/imagepipeline/g/c;)V
 
     return-void
 
     :cond_2
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz p1, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jn:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JE:Lcom/facebook/drawee/backends/pipeline/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->b(Lcom/facebook/drawee/backends/pipeline/b/b;)V
 
     :cond_3
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Js:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JJ:Lcom/facebook/drawee/backends/pipeline/b/a/a;
 
     if-eqz p1, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jn:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JE:Lcom/facebook/drawee/backends/pipeline/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->b(Lcom/facebook/drawee/controller/ControllerListener;)V
 
     :cond_4
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jt:Lcom/facebook/imagepipeline/g/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JK:Lcom/facebook/imagepipeline/g/b;
 
     if-eqz p1, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jn:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->JE:Lcom/facebook/drawee/backends/pipeline/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->b(Lcom/facebook/imagepipeline/g/c;)V
 
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/h.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/h.smali
index 6f7abc0b46..1a8c0fd2ee 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/b/h.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/b/h.smali
@@ -4,65 +4,65 @@
 
 
 # instance fields
-.field public IR:I
+.field public JA:I
 
-.field public IT:Ljava/lang/String;
+.field public JB:J
+
+.field public JC:J
+
+.field public JD:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public IV:Ljava/lang/String;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field public IW:Ljava/lang/Object;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field public IX:Lcom/facebook/imagepipeline/request/b;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field public IY:Lcom/facebook/imagepipeline/f/f;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field public IZ:J
-
-.field public Ja:J
-
-.field public Jb:J
-
-.field public Jc:J
-
-.field public Jd:J
-
-.field public Je:J
-
-.field public Jf:J
-
-.field public Jg:Z
-
-.field public Jh:I
+.field public JM:I
 
 .field public Ji:I
 
-.field public Jj:I
-
-.field public Jk:J
-
-.field public Jl:J
+.field public Jk:Ljava/lang/String;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
 .field public Jm:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Jv:I
+.field public Jn:Ljava/lang/Object;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field public Jo:Lcom/facebook/imagepipeline/request/b;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field public Jp:Lcom/facebook/imagepipeline/f/f;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field public Jq:J
+
+.field public Jr:J
+
+.field public Js:J
+
+.field public Jt:J
+
+.field public Ju:J
+
+.field public Jv:J
+
+.field public Jw:J
+
+.field public Jx:Z
+
+.field public Jy:I
+
+.field public Jz:I
 
 
 # direct methods
@@ -73,42 +73,42 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->IZ:J
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jq:J
 
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ja:J
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jr:J
 
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jb:J
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Js:J
 
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jc:J
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jt:J
 
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jd:J
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ju:J
 
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Je:J
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jv:J
 
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jf:J
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jw:J
 
     const/4 v2, -0x1
 
-    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->IR:I
-
-    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jh:I
-
     iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ji:I
 
-    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jv:I
+    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jy:I
 
-    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jj:I
+    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jz:I
 
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jk:J
+    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->JM:I
 
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jl:J
+    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->JA:I
+
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->JB:J
+
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->JC:J
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final gs()Lcom/facebook/drawee/backends/pipeline/b/e;
+.method public final gw()Lcom/facebook/drawee/backends/pipeline/b/e;
     .locals 34
 
     move-object/from16 v0, p0
@@ -117,69 +117,69 @@
 
     move-object/from16 v1, v31
 
-    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IT:Ljava/lang/String;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jk:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IV:Ljava/lang/String;
+    iget-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jm:Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IX:Lcom/facebook/imagepipeline/request/b;
+    iget-object v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jo:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v5, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IW:Ljava/lang/Object;
+    iget-object v5, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jn:Ljava/lang/Object;
 
-    iget-object v6, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IY:Lcom/facebook/imagepipeline/f/f;
+    iget-object v6, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jp:Lcom/facebook/imagepipeline/f/f;
 
-    iget-wide v7, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IZ:J
+    iget-wide v7, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jq:J
 
-    iget-wide v9, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ja:J
+    iget-wide v9, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jr:J
 
-    iget-wide v11, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jb:J
+    iget-wide v11, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Js:J
 
-    iget-wide v13, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jc:J
+    iget-wide v13, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jt:J
 
     move-object/from16 v32, v1
 
     move-object/from16 v33, v2
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jd:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ju:J
 
     move-wide v15, v1
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Je:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jv:J
 
     move-wide/from16 v17, v1
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jf:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jw:J
 
     move-wide/from16 v19, v1
 
-    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IR:I
+    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ji:I
 
     move/from16 v21, v1
 
-    iget-boolean v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jg:Z
+    iget-boolean v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jx:Z
 
     move/from16 v22, v1
 
-    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jh:I
+    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jy:I
 
     move/from16 v23, v1
 
-    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ji:I
+    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jz:I
 
     move/from16 v24, v1
 
-    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jj:I
+    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->JA:I
 
     move/from16 v25, v1
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jk:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->JB:J
 
     move-wide/from16 v26, v1
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jl:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->JC:J
 
     move-wide/from16 v28, v1
 
-    iget-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jm:Ljava/lang/String;
+    iget-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->JD:Ljava/lang/String;
 
     move-object/from16 v30, v1
 
@@ -205,7 +205,7 @@
     const/4 p1, 0x2
 
     :goto_0
-    iput p1, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jj:I
+    iput p1, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->JA:I
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/c.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/c.smali
index a7c1aac5cf..a88dee22f8 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/c.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/c.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,9 +13,9 @@
     .end annotation
 .end field
 
-.field private static Iy:Lcom/facebook/drawee/backends/pipeline/f; = null
+.field private static IQ:Lcom/facebook/drawee/backends/pipeline/f; = null
 
-.field private static volatile Iz:Z = false
+.field private static volatile IR:Z = false
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     const-class v0, Lcom/facebook/drawee/backends/pipeline/c;
 
-    sput-object v0, Lcom/facebook/drawee/backends/pipeline/c;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/drawee/backends/pipeline/c;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -46,11 +46,11 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    sget-boolean v0, Lcom/facebook/drawee/backends/pipeline/c;->Iz:Z
+    sget-boolean v0, Lcom/facebook/drawee/backends/pipeline/c;->IR:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/c;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/c;->FC:Ljava/lang/Class;
 
     const-string v1, "Fresco has already been initialized! `Fresco.initialize(...)` should only be called 1 single time to avoid memory leaks!"
 
@@ -61,7 +61,7 @@
     :cond_0
     const/4 v0, 0x1
 
-    sput-boolean v0, Lcom/facebook/drawee/backends/pipeline/c;->Iz:Z
+    sput-boolean v0, Lcom/facebook/drawee/backends/pipeline/c;->IR:Z
 
     :goto_0
     :try_start_0
@@ -95,7 +95,7 @@
 
     invoke-direct {p1, p0, v0}, Lcom/facebook/drawee/backends/pipeline/f;-><init>(Landroid/content/Context;Lcom/facebook/drawee/backends/pipeline/b;)V
 
-    sput-object p1, Lcom/facebook/drawee/backends/pipeline/c;->Iy:Lcom/facebook/drawee/backends/pipeline/f;
+    sput-object p1, Lcom/facebook/drawee/backends/pipeline/c;->IQ:Lcom/facebook/drawee/backends/pipeline/f;
 
     invoke-static {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->a(Lcom/facebook/common/d/k;)V
 
@@ -119,26 +119,26 @@
     throw p1
 .end method
 
-.method public static gi()Lcom/facebook/drawee/backends/pipeline/e;
+.method public static gm()Lcom/facebook/drawee/backends/pipeline/e;
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/c;->Iy:Lcom/facebook/drawee/backends/pipeline/f;
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/c;->IQ:Lcom/facebook/drawee/backends/pipeline/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/f;->gq()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/f;->gu()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static gj()Lcom/facebook/imagepipeline/b/g;
+.method public static gn()Lcom/facebook/imagepipeline/b/g;
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/b/j;->ia()Lcom/facebook/imagepipeline/b/j;
+    invoke-static {}, Lcom/facebook/imagepipeline/b/j;->hZ()Lcom/facebook/imagepipeline/b/j;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/j;->gj()Lcom/facebook/imagepipeline/b/g;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/j;->gn()Lcom/facebook/imagepipeline/b/g;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/d.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/d.smali
index 678dd55a5d..ca200831dd 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/d.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/d.smali
@@ -17,7 +17,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -28,11 +28,9 @@
 
 
 # instance fields
-.field private Gj:Lcom/facebook/cache/common/CacheKey;
+.field private GA:Lcom/facebook/cache/common/CacheKey;
 
-.field private final IA:Lcom/facebook/imagepipeline/e/a;
-
-.field private final IB:Lcom/facebook/common/d/e;
+.field private IM:Lcom/facebook/common/d/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/e<",
@@ -45,7 +43,22 @@
     .end annotation
 .end field
 
-.field private final IC:Lcom/facebook/imagepipeline/cache/o;
+.field private final IS:Lcom/facebook/imagepipeline/e/a;
+
+.field private final IT:Lcom/facebook/common/d/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/e<",
+            "Lcom/facebook/imagepipeline/e/a;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private final IU:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -59,7 +72,7 @@
     .end annotation
 .end field
 
-.field private ID:Lcom/facebook/common/d/k;
+.field private IV:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -71,14 +84,14 @@
     .end annotation
 .end field
 
-.field IE:Z
+.field IW:Z
 
-.field private IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+.field private IX:Lcom/facebook/drawee/backends/pipeline/b/g;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private IG:Ljava/util/Set;
+.field private IY:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -91,25 +104,12 @@
     .end annotation
 .end field
 
-.field private IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+.field private IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private II:Lcom/facebook/drawee/backends/pipeline/a/a;
-
-.field private Iv:Lcom/facebook/common/d/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/e<",
-            "Lcom/facebook/imagepipeline/e/a;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field private Ja:Lcom/facebook/drawee/backends/pipeline/a/a;
 
 .field private final mResources:Landroid/content/res/Resources;
 
@@ -120,7 +120,7 @@
 
     const-class v0, Lcom/facebook/drawee/backends/pipeline/d;
 
-    sput-object v0, Lcom/facebook/drawee/backends/pipeline/d;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/drawee/backends/pipeline/d;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -160,11 +160,11 @@
 
     invoke-direct {p2, p1, p3}, Lcom/facebook/drawee/backends/pipeline/a;-><init>(Landroid/content/res/Resources;Lcom/facebook/imagepipeline/e/a;)V
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->IA:Lcom/facebook/imagepipeline/e/a;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->IS:Lcom/facebook/imagepipeline/e/a;
 
-    iput-object p6, p0, Lcom/facebook/drawee/backends/pipeline/d;->IB:Lcom/facebook/common/d/e;
+    iput-object p6, p0, Lcom/facebook/drawee/backends/pipeline/d;->IT:Lcom/facebook/common/d/e;
 
-    iput-object p5, p0, Lcom/facebook/drawee/backends/pipeline/d;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p5, p0, Lcom/facebook/drawee/backends/pipeline/d;->IU:Lcom/facebook/imagepipeline/cache/o;
 
     return-void
 .end method
@@ -239,14 +239,14 @@
         .end annotation
     .end param
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IE:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IW:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ko:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KF:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_1
 
@@ -262,37 +262,37 @@
 
     invoke-direct {v2}, Lcom/facebook/drawee/backends/pipeline/a/a;-><init>()V
 
-    iput-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->II:Lcom/facebook/drawee/backends/pipeline/a/a;
+    iput-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ja:Lcom/facebook/drawee/backends/pipeline/a/a;
 
     invoke-virtual {p0, v1}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/drawee/controller/ControllerListener;)V
 
     invoke-virtual {p0, v0}, Lcom/facebook/drawee/backends/pipeline/d;->b(Landroid/graphics/drawable/Drawable;)V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->II:Lcom/facebook/drawee/backends/pipeline/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ja:Lcom/facebook/drawee/backends/pipeline/a/a;
 
     invoke-virtual {p0, v0}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/drawee/backends/pipeline/b/b;)V
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ko:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KF:Landroid/graphics/drawable/Drawable;
 
     instance-of v0, v0, Lcom/facebook/drawee/b/a;
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ko:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KF:Landroid/graphics/drawable/Drawable;
 
     check-cast v0, Lcom/facebook/drawee/b/a;
 
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/facebook/drawee/b/a;->ay(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/facebook/drawee/b/a;->at(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     const/4 v2, 0x0
 
@@ -308,22 +308,22 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v1, Lcom/facebook/drawee/drawable/p;->KX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v1, v1, Lcom/facebook/drawee/drawable/p;->Lo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     move-object v2, v1
 
     :cond_3
-    iput-object v2, v0, Lcom/facebook/drawee/b/a;->KX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v2, v0, Lcom/facebook/drawee/b/a;->Lo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->II:Lcom/facebook/drawee/backends/pipeline/a/a;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ja:Lcom/facebook/drawee/backends/pipeline/a/a;
 
-    iget v1, v1, Lcom/facebook/drawee/backends/pipeline/a/a;->IR:I
+    iget v1, v1, Lcom/facebook/drawee/backends/pipeline/a/a;->Ji:I
 
     invoke-static {v1}, Lcom/facebook/drawee/backends/pipeline/b/d;->toString(I)Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lcom/facebook/drawee/b/a;->az(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/facebook/drawee/b/a;->au(Ljava/lang/String;)V
 
     if-eqz p1, :cond_4
 
@@ -337,11 +337,11 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/facebook/drawee/b/a;->i(II)V
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/c;->fg()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/c;->fl()I
 
     move-result p1
 
-    iput p1, v0, Lcom/facebook/drawee/b/a;->KV:I
+    iput p1, v0, Lcom/facebook/drawee/b/a;->Lm:I
 
     return-void
 
@@ -381,7 +381,7 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->c(Lcom/facebook/imagepipeline/f/c;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Iv:Lcom/facebook/common/d/e;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IM:Lcom/facebook/common/d/e;
 
     invoke-static {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/common/d/e;Lcom/facebook/imagepipeline/f/c;)Landroid/graphics/drawable/Drawable;
 
@@ -397,7 +397,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IB:Lcom/facebook/common/d/e;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IT:Lcom/facebook/common/d/e;
 
     invoke-static {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/common/d/e;Lcom/facebook/imagepipeline/f/c;)Landroid/graphics/drawable/Drawable;
 
@@ -413,7 +413,7 @@
 
     :cond_1
     :try_start_2
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IA:Lcom/facebook/imagepipeline/e/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IS:Lcom/facebook/imagepipeline/e/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/e/a;->b(Lcom/facebook/imagepipeline/f/c;)Landroid/graphics/drawable/Drawable;
 
@@ -455,7 +455,7 @@
     throw p1
 .end method
 
-.method private gm()Lcom/facebook/common/references/CloseableReference;
+.method private gq()Lcom/facebook/common/references/CloseableReference;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -472,22 +472,22 @@
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IU:Lcom/facebook/imagepipeline/cache/o;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Gj:Lcom/facebook/cache/common/CacheKey;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->GA:Lcom/facebook/cache/common/CacheKey;
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IU:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Gj:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->GA:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v0, v2}, Lcom/facebook/imagepipeline/cache/o;->M(Ljava/lang/Object;)Lcom/facebook/common/references/CloseableReference;
 
@@ -501,11 +501,11 @@
 
     check-cast v2, Lcom/facebook/imagepipeline/f/c;
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/f/c;->iC()Lcom/facebook/imagepipeline/f/h;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/f/c;->iB()Lcom/facebook/imagepipeline/f/h;
 
     move-result-object v2
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/f/h;->iP()Z
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/f/h;->iO()Z
 
     move-result v2
 
@@ -573,7 +573,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object p1, p1, Lcom/facebook/common/references/CloseableReference;->Hc:Lcom/facebook/common/references/c;
+    iget-object p1, p1, Lcom/facebook/common/references/CloseableReference;->Ht:Lcom/facebook/common/references/c;
 
     invoke-virtual {p1}, Lcom/facebook/common/references/c;->get()Ljava/lang/Object;
 
@@ -634,7 +634,7 @@
 
     check-cast p1, Lcom/facebook/c/a/a;
 
-    invoke-interface {p1}, Lcom/facebook/c/a/a;->gh()V
+    invoke-interface {p1}, Lcom/facebook/c/a/a;->gl()V
 
     :cond_0
     return-void
@@ -675,22 +675,22 @@
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kw:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KN:Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->ID:Lcom/facebook/common/d/k;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IV:Lcom/facebook/common/d/k;
 
     const/4 p1, 0x0
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->c(Lcom/facebook/imagepipeline/f/c;)V
 
-    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/d;->Gj:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/d;->GA:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p5, p0, Lcom/facebook/drawee/backends/pipeline/d;->Iv:Lcom/facebook/common/d/e;
+    iput-object p5, p0, Lcom/facebook/drawee/backends/pipeline/d;->IM:Lcom/facebook/common/d/e;
 
     monitor-enter p0
 
     :try_start_0
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     monitor-exit p0
     :try_end_0
@@ -721,13 +721,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     instance-of v0, v0, Lcom/facebook/drawee/backends/pipeline/b/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     check-cast v0, Lcom/facebook/drawee/backends/pipeline/b/a;
 
@@ -741,7 +741,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz v0, :cond_1
 
@@ -753,7 +753,7 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     aput-object v3, v1, v2
 
@@ -763,7 +763,7 @@
 
     invoke-direct {v0, v1}, Lcom/facebook/drawee/backends/pipeline/b/a;-><init>([Lcom/facebook/drawee/backends/pipeline/b/b;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -773,7 +773,7 @@
 
     :cond_1
     :try_start_2
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -799,19 +799,19 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
-    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->Ju:Ljava/util/List;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->JL:Ljava/util/List;
 
     if-eqz v2, :cond_0
 
-    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->Ju:Ljava/util/List;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->JL:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->clear()V
 
@@ -820,56 +820,56 @@
 
     invoke-virtual {v0, v2}, Lcom/facebook/drawee/backends/pipeline/b/g;->setEnabled(Z)V
 
-    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     const/4 v3, 0x0
 
-    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IV:Ljava/lang/String;
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jm:Ljava/lang/String;
 
-    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IX:Lcom/facebook/imagepipeline/request/b;
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jo:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IW:Ljava/lang/Object;
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jn:Ljava/lang/Object;
 
-    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IY:Lcom/facebook/imagepipeline/f/f;
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jp:Lcom/facebook/imagepipeline/f/f;
 
     const-wide/16 v4, -0x1
 
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IZ:J
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jq:J
 
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jb:J
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Js:J
 
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jc:J
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jt:J
 
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jd:J
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ju:J
 
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Je:J
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jv:J
 
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jf:J
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jw:J
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IR:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ji:I
 
-    iput-boolean v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jg:Z
+    iput-boolean v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jx:Z
 
     const/4 v2, -0x1
 
-    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jh:I
+    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jy:I
 
-    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ji:I
+    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jz:I
 
-    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jv:I
+    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->JM:I
 
-    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jj:I
+    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->JA:I
 
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jk:J
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->JB:J
 
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jl:J
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->JC:J
 
-    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jm:Ljava/lang/String;
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->JD:Ljava/lang/String;
 
     :cond_1
     if-eqz p1, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     if-nez v0, :cond_2
 
@@ -881,14 +881,14 @@
 
     invoke-direct {v0, v2, p0}, Lcom/facebook/drawee/backends/pipeline/b/g;-><init>(Lcom/facebook/common/time/b;Lcom/facebook/drawee/backends/pipeline/d;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     if-eqz p1, :cond_4
 
-    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->Ju:Ljava/util/List;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->JL:Ljava/util/List;
 
     if-nez v2, :cond_3
 
@@ -896,15 +896,15 @@
 
     invoke-direct {v2}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->Ju:Ljava/util/List;
+    iput-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->JL:Ljava/util/List;
 
     :cond_3
-    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->Ju:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->JL:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_4
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     invoke-virtual {p1, v1}, Lcom/facebook/drawee/backends/pipeline/b/g;->setEnabled(Z)V
     :try_end_0
@@ -929,7 +929,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IG:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IY:Ljava/util/Set;
 
     if-nez v0, :cond_0
 
@@ -937,10 +937,10 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IG:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IY:Ljava/util/Set;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IG:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IY:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -964,13 +964,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     instance-of v0, v0, Lcom/facebook/drawee/backends/pipeline/b/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     check-cast v0, Lcom/facebook/drawee/backends/pipeline/b/a;
 
@@ -984,7 +984,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz v0, :cond_1
 
@@ -996,7 +996,7 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     aput-object v3, v1, v2
 
@@ -1006,7 +1006,7 @@
 
     invoke-direct {v0, v1}, Lcom/facebook/drawee/backends/pipeline/b/a;-><init>([Lcom/facebook/drawee/backends/pipeline/b/b;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -1016,7 +1016,7 @@
 
     :cond_1
     :try_start_2
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -1038,7 +1038,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IG:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IY:Ljava/util/Set;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1050,7 +1050,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IG:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IY:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
     :try_end_1
@@ -1078,11 +1078,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     const/4 v0, 0x5
 
@@ -1105,7 +1105,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized gk()Lcom/facebook/imagepipeline/g/c;
+.method public final declared-synchronized go()Lcom/facebook/imagepipeline/g/c;
     .locals 3
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -1115,7 +1115,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz v1, :cond_0
 
@@ -1123,24 +1123,24 @@
 
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/drawee/backends/pipeline/b/c;-><init>(Ljava/lang/String;Lcom/facebook/drawee/backends/pipeline/b/b;)V
 
     :cond_0
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IG:Ljava/util/Set;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IY:Ljava/util/Set;
 
     if-eqz v1, :cond_2
 
     new-instance v1, Lcom/facebook/imagepipeline/g/b;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->IG:Ljava/util/Set;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->IY:Ljava/util/Set;
 
     invoke-direct {v1, v2}, Lcom/facebook/imagepipeline/g/b;-><init>(Ljava/util/Set;)V
 
     if-eqz v0, :cond_1
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -1164,7 +1164,7 @@
     throw v0
 .end method
 
-.method public final gl()Lcom/facebook/b/c;
+.method public final gp()Lcom/facebook/b/c;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1186,7 +1186,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/d;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/d;->FC:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1201,7 +1201,7 @@
     invoke-static {v0, v2, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->ID:Lcom/facebook/common/d/k;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->IV:Lcom/facebook/common/d/k;
 
     invoke-interface {v0}, Lcom/facebook/common/d/k;->get()Ljava/lang/Object;
 
@@ -1214,12 +1214,12 @@
     return-object v0
 .end method
 
-.method public final synthetic gn()Ljava/lang/Object;
+.method public final synthetic gr()Ljava/lang/Object;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/d;->gm()Lcom/facebook/common/references/CloseableReference;
+    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/d;->gq()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
 
@@ -1259,7 +1259,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->ID:Lcom/facebook/common/d/k;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->IV:Lcom/facebook/common/d/k;
 
     const-string v2, "dataSourceSupplier"
 
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/e.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/e.smali
index 860fb6acf3..e906ee457d 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/e.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/e.smali
@@ -19,19 +19,7 @@
 
 
 # instance fields
-.field private IH:Lcom/facebook/drawee/backends/pipeline/b/b;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private final IJ:Lcom/facebook/imagepipeline/b/g;
-
-.field private IK:Lcom/facebook/drawee/backends/pipeline/b/f;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private Iv:Lcom/facebook/common/d/e;
+.field private IM:Lcom/facebook/common/d/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/e<",
@@ -44,7 +32,19 @@
     .end annotation
 .end field
 
-.field private final Iw:Lcom/facebook/drawee/backends/pipeline/g;
+.field private final IO:Lcom/facebook/drawee/backends/pipeline/g;
+
+.field private IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private final Jb:Lcom/facebook/imagepipeline/b/g;
+
+.field private Jc:Lcom/facebook/drawee/backends/pipeline/b/f;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
 
 # direct methods
@@ -64,22 +64,22 @@
 
     invoke-direct {p0, p1, p4}, Lcom/facebook/drawee/controller/a;-><init>(Landroid/content/Context;Ljava/util/Set;)V
 
-    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/e;->IJ:Lcom/facebook/imagepipeline/b/g;
+    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/e;->Jb:Lcom/facebook/imagepipeline/b/g;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/e;->Iw:Lcom/facebook/drawee/backends/pipeline/g;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/e;->IO:Lcom/facebook/drawee/backends/pipeline/g;
 
     return-void
 .end method
 
-.method private go()Lcom/facebook/drawee/backends/pipeline/d;
+.method private gs()Lcom/facebook/drawee/backends/pipeline/d;
     .locals 13
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KG:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KX:Lcom/facebook/drawee/d/a;
 
-    sget-object v1, Lcom/facebook/drawee/controller/a;->KH:Ljava/util/concurrent/atomic/AtomicLong;
+    sget-object v1, Lcom/facebook/drawee/controller/a;->KY:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
 
@@ -98,19 +98,19 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/e;->Iw:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/e;->IO:Lcom/facebook/drawee/backends/pipeline/g;
 
     iget-object v7, v0, Lcom/facebook/drawee/backends/pipeline/g;->mResources:Landroid/content/res/Resources;
 
-    iget-object v8, v0, Lcom/facebook/drawee/backends/pipeline/g;->IO:Lcom/facebook/drawee/a/a;
+    iget-object v8, v0, Lcom/facebook/drawee/backends/pipeline/g;->Jf:Lcom/facebook/drawee/a/a;
 
-    iget-object v9, v0, Lcom/facebook/drawee/backends/pipeline/g;->Iu:Lcom/facebook/imagepipeline/e/a;
+    iget-object v9, v0, Lcom/facebook/drawee/backends/pipeline/g;->IL:Lcom/facebook/imagepipeline/e/a;
 
-    iget-object v10, v0, Lcom/facebook/drawee/backends/pipeline/g;->IP:Ljava/util/concurrent/Executor;
+    iget-object v10, v0, Lcom/facebook/drawee/backends/pipeline/g;->Jg:Ljava/util/concurrent/Executor;
 
-    iget-object v11, v0, Lcom/facebook/drawee/backends/pipeline/g;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v11, v0, Lcom/facebook/drawee/backends/pipeline/g;->IU:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v12, v0, Lcom/facebook/drawee/backends/pipeline/g;->IQ:Lcom/facebook/common/d/e;
+    iget-object v12, v0, Lcom/facebook/drawee/backends/pipeline/g;->Jh:Lcom/facebook/common/d/e;
 
     new-instance v1, Lcom/facebook/drawee/backends/pipeline/d;
 
@@ -118,11 +118,11 @@
 
     invoke-direct/range {v6 .. v12}, Lcom/facebook/drawee/backends/pipeline/d;-><init>(Landroid/content/res/Resources;Lcom/facebook/drawee/a/a;Lcom/facebook/imagepipeline/e/a;Ljava/util/concurrent/Executor;Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/common/d/e;)V
 
-    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/g;->Ix:Lcom/facebook/common/d/k;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/g;->IP:Lcom/facebook/common/d/k;
 
     if-eqz v2, :cond_1
 
-    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/g;->Ix:Lcom/facebook/common/d/k;
+    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/g;->IP:Lcom/facebook/common/d/k;
 
     invoke-interface {v0}, Lcom/facebook/common/d/k;->get()Ljava/lang/Object;
 
@@ -134,7 +134,7 @@
 
     move-result v0
 
-    iput-boolean v0, v1, Lcom/facebook/drawee/backends/pipeline/d;->IE:Z
+    iput-boolean v0, v1, Lcom/facebook/drawee/backends/pipeline/d;->IW:Z
 
     :cond_1
     move-object v0, v1
@@ -144,13 +144,13 @@
 
     move-result-object v4
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->KB:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->KS:Ljava/lang/Object;
 
     check-cast v1, Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/e;->IJ:Lcom/facebook/imagepipeline/b/g;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/e;->Jb:Lcom/facebook/imagepipeline/b/g;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/b/g;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/b/g;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     const/4 v3, 0x0
 
@@ -158,11 +158,11 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v3, v1, Lcom/facebook/imagepipeline/request/b;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object v3, v1, Lcom/facebook/imagepipeline/request/b;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     if-eqz v3, :cond_2
 
-    iget-object v3, p0, Lcom/facebook/drawee/controller/a;->IW:Ljava/lang/Object;
+    iget-object v3, p0, Lcom/facebook/drawee/controller/a;->Jn:Ljava/lang/Object;
 
     invoke-interface {v2, v1, v3}, Lcom/facebook/imagepipeline/cache/f;->b(Lcom/facebook/imagepipeline/request/b;Ljava/lang/Object;)Lcom/facebook/cache/common/CacheKey;
 
@@ -171,7 +171,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v3, p0, Lcom/facebook/drawee/controller/a;->IW:Ljava/lang/Object;
+    iget-object v3, p0, Lcom/facebook/drawee/controller/a;->Jn:Ljava/lang/Object;
 
     invoke-interface {v2, v1, v3}, Lcom/facebook/imagepipeline/cache/f;->a(Lcom/facebook/imagepipeline/request/b;Ljava/lang/Object;)Lcom/facebook/cache/common/CacheKey;
 
@@ -186,17 +186,17 @@
     move-object v6, v3
 
     :goto_2
-    iget-object v7, p0, Lcom/facebook/drawee/controller/a;->IW:Ljava/lang/Object;
+    iget-object v7, p0, Lcom/facebook/drawee/controller/a;->Jn:Ljava/lang/Object;
 
-    iget-object v8, p0, Lcom/facebook/drawee/backends/pipeline/e;->Iv:Lcom/facebook/common/d/e;
+    iget-object v8, p0, Lcom/facebook/drawee/backends/pipeline/e;->IM:Lcom/facebook/common/d/e;
 
-    iget-object v9, p0, Lcom/facebook/drawee/backends/pipeline/e;->IH:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v9, p0, Lcom/facebook/drawee/backends/pipeline/e;->IZ:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     move-object v3, v0
 
     invoke-virtual/range {v3 .. v9}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/common/d/k;Ljava/lang/String;Lcom/facebook/cache/common/CacheKey;Ljava/lang/Object;Lcom/facebook/common/d/e;Lcom/facebook/drawee/backends/pipeline/b/b;)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/e;->IK:Lcom/facebook/drawee/backends/pipeline/b/f;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/e;->Jc:Lcom/facebook/drawee/backends/pipeline/b/f;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/drawee/backends/pipeline/b/f;)V
     :try_end_0
@@ -221,9 +221,9 @@
 
     check-cast p2, Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/e;->IJ:Lcom/facebook/imagepipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/e;->Jb:Lcom/facebook/imagepipeline/b/g;
 
-    sget-object v1, Lcom/facebook/drawee/backends/pipeline/e$1;->IL:[I
+    sget-object v1, Lcom/facebook/drawee/backends/pipeline/e$1;->Jd:[I
 
     invoke-virtual {p4}, Lcom/facebook/drawee/controller/a$a;->ordinal()I
 
@@ -243,7 +243,7 @@
 
     if-ne v1, v2, :cond_0
 
-    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->YD:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->YV:Lcom/facebook/imagepipeline/request/b$b;
 
     goto :goto_0
 
@@ -271,12 +271,12 @@
     throw p1
 
     :cond_1
-    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->YB:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->YT:Lcom/facebook/imagepipeline/request/b$b;
 
     goto :goto_0
 
     :cond_2
-    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->YA:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->YS:Lcom/facebook/imagepipeline/request/b$b;
 
     :goto_0
     instance-of v1, p1, Lcom/facebook/drawee/backends/pipeline/d;
@@ -285,7 +285,7 @@
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/d;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/d;->gk()Lcom/facebook/imagepipeline/g/c;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/d;->go()Lcom/facebook/imagepipeline/g/c;
 
     move-result-object p1
 
@@ -302,7 +302,7 @@
     return-object p1
 .end method
 
-.method public final aw(Ljava/lang/String;)Lcom/facebook/drawee/backends/pipeline/e;
+.method public final ar(Ljava/lang/String;)Lcom/facebook/drawee/backends/pipeline/e;
     .locals 2
     .param p1    # Ljava/lang/String;
         .annotation runtime Ljavax/annotation/Nullable;
@@ -358,7 +358,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jS()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
@@ -373,10 +373,10 @@
     return-object p1
 .end method
 
-.method public final synthetic gp()Lcom/facebook/drawee/controller/AbstractDraweeController;
+.method public final synthetic gt()Lcom/facebook/drawee/controller/AbstractDraweeController;
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/e;->go()Lcom/facebook/drawee/backends/pipeline/d;
+    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/e;->gs()Lcom/facebook/drawee/backends/pipeline/d;
 
     move-result-object v0
 
@@ -407,13 +407,13 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hL()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hO()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object v0
 
-    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QO:Lcom/facebook/imagepipeline/a/f;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jS()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/f.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/f.smali
index 2c072ac79c..9de2e007f8 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/f.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/f.smali
@@ -18,9 +18,11 @@
 
 
 # instance fields
-.field private final IJ:Lcom/facebook/imagepipeline/b/g;
+.field private final IO:Lcom/facebook/drawee/backends/pipeline/g;
 
-.field private final IM:Ljava/util/Set;
+.field private final Jb:Lcom/facebook/imagepipeline/b/g;
+
+.field private final Je:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -30,8 +32,6 @@
     .end annotation
 .end field
 
-.field private final Iw:Lcom/facebook/drawee/backends/pipeline/g;
-
 .field private final mContext:Landroid/content/Context;
 
 
@@ -43,7 +43,7 @@
         .end annotation
     .end param
 
-    invoke-static {}, Lcom/facebook/imagepipeline/b/j;->ia()Lcom/facebook/imagepipeline/b/j;
+    invoke-static {}, Lcom/facebook/imagepipeline/b/j;->hZ()Lcom/facebook/imagepipeline/b/j;
 
     move-result-object p2
 
@@ -88,21 +88,21 @@
 
     iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/f;->mContext:Landroid/content/Context;
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/j;->gj()Lcom/facebook/imagepipeline/b/g;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/j;->gn()Lcom/facebook/imagepipeline/b/g;
 
     move-result-object p4
 
-    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->IJ:Lcom/facebook/imagepipeline/b/g;
+    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Jb:Lcom/facebook/imagepipeline/b/g;
 
     if-eqz p3, :cond_0
 
-    iget-object p4, p3, Lcom/facebook/drawee/backends/pipeline/b;->Iw:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object p4, p3, Lcom/facebook/drawee/backends/pipeline/b;->IO:Lcom/facebook/drawee/backends/pipeline/g;
 
     if-eqz p4, :cond_0
 
-    iget-object p4, p3, Lcom/facebook/drawee/backends/pipeline/b;->Iw:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object p4, p3, Lcom/facebook/drawee/backends/pipeline/b;->IO:Lcom/facebook/drawee/backends/pipeline/g;
 
-    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Iw:Lcom/facebook/drawee/backends/pipeline/g;
+    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->IO:Lcom/facebook/drawee/backends/pipeline/g;
 
     goto :goto_0
 
@@ -111,20 +111,20 @@
 
     invoke-direct {p4}, Lcom/facebook/drawee/backends/pipeline/g;-><init>()V
 
-    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Iw:Lcom/facebook/drawee/backends/pipeline/g;
+    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->IO:Lcom/facebook/drawee/backends/pipeline/g;
 
     :goto_0
-    iget-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Iw:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->IO:Lcom/facebook/drawee/backends/pipeline/g;
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/facebook/drawee/a/a;->gt()Lcom/facebook/drawee/a/a;
+    invoke-static {}, Lcom/facebook/drawee/a/a;->gx()Lcom/facebook/drawee/a/a;
 
     move-result-object v0
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/j;->ib()Lcom/facebook/imagepipeline/animated/b/a;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/j;->ia()Lcom/facebook/imagepipeline/animated/b/a;
 
     move-result-object p2
 
@@ -137,22 +137,22 @@
     goto :goto_1
 
     :cond_1
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/b/a;->hm()Lcom/facebook/imagepipeline/e/a;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/b/a;->hp()Lcom/facebook/imagepipeline/e/a;
 
     move-result-object p2
 
     :goto_1
-    invoke-static {}, Lcom/facebook/common/b/i;->fA()Lcom/facebook/common/b/i;
+    invoke-static {}, Lcom/facebook/common/b/i;->fE()Lcom/facebook/common/b/i;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/f;->IJ:Lcom/facebook/imagepipeline/b/g;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/f;->Jb:Lcom/facebook/imagepipeline/b/g;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/b/g;->St:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/b/g;->SL:Lcom/facebook/imagepipeline/cache/o;
 
     if-eqz p3, :cond_2
 
-    iget-object v4, p3, Lcom/facebook/drawee/backends/pipeline/b;->Iv:Lcom/facebook/common/d/e;
+    iget-object v4, p3, Lcom/facebook/drawee/backends/pipeline/b;->IM:Lcom/facebook/common/d/e;
 
     goto :goto_2
 
@@ -162,7 +162,7 @@
     :goto_2
     if-eqz p3, :cond_3
 
-    iget-object p3, p3, Lcom/facebook/drawee/backends/pipeline/b;->Ix:Lcom/facebook/common/d/k;
+    iget-object p3, p3, Lcom/facebook/drawee/backends/pipeline/b;->IP:Lcom/facebook/common/d/k;
 
     goto :goto_3
 
@@ -172,19 +172,19 @@
     :goto_3
     iput-object p1, p4, Lcom/facebook/drawee/backends/pipeline/g;->mResources:Landroid/content/res/Resources;
 
-    iput-object v0, p4, Lcom/facebook/drawee/backends/pipeline/g;->IO:Lcom/facebook/drawee/a/a;
+    iput-object v0, p4, Lcom/facebook/drawee/backends/pipeline/g;->Jf:Lcom/facebook/drawee/a/a;
 
-    iput-object p2, p4, Lcom/facebook/drawee/backends/pipeline/g;->Iu:Lcom/facebook/imagepipeline/e/a;
+    iput-object p2, p4, Lcom/facebook/drawee/backends/pipeline/g;->IL:Lcom/facebook/imagepipeline/e/a;
 
-    iput-object v2, p4, Lcom/facebook/drawee/backends/pipeline/g;->IP:Ljava/util/concurrent/Executor;
+    iput-object v2, p4, Lcom/facebook/drawee/backends/pipeline/g;->Jg:Ljava/util/concurrent/Executor;
 
-    iput-object v3, p4, Lcom/facebook/drawee/backends/pipeline/g;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iput-object v3, p4, Lcom/facebook/drawee/backends/pipeline/g;->IU:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object v4, p4, Lcom/facebook/drawee/backends/pipeline/g;->IQ:Lcom/facebook/common/d/e;
+    iput-object v4, p4, Lcom/facebook/drawee/backends/pipeline/g;->Jh:Lcom/facebook/common/d/e;
 
-    iput-object p3, p4, Lcom/facebook/drawee/backends/pipeline/g;->Ix:Lcom/facebook/common/d/k;
+    iput-object p3, p4, Lcom/facebook/drawee/backends/pipeline/g;->IP:Lcom/facebook/common/d/k;
 
-    iput-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->IM:Ljava/util/Set;
+    iput-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->Je:Ljava/util/Set;
 
     return-void
 .end method
@@ -194,25 +194,25 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/f;->gq()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/f;->gu()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final gq()Lcom/facebook/drawee/backends/pipeline/e;
+.method public final gu()Lcom/facebook/drawee/backends/pipeline/e;
     .locals 5
 
     new-instance v0, Lcom/facebook/drawee/backends/pipeline/e;
 
     iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->mContext:Landroid/content/Context;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/f;->Iw:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/f;->IO:Lcom/facebook/drawee/backends/pipeline/g;
 
-    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/f;->IJ:Lcom/facebook/imagepipeline/b/g;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/f;->Jb:Lcom/facebook/imagepipeline/b/g;
 
-    iget-object v4, p0, Lcom/facebook/drawee/backends/pipeline/f;->IM:Ljava/util/Set;
+    iget-object v4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Je:Ljava/util/Set;
 
     invoke-direct {v0, v1, v2, v3, v4}, Lcom/facebook/drawee/backends/pipeline/e;-><init>(Landroid/content/Context;Lcom/facebook/drawee/backends/pipeline/g;Lcom/facebook/imagepipeline/b/g;Ljava/util/Set;)V
 
diff --git a/com.discord/smali/com/facebook/drawee/backends/pipeline/g.smali b/com.discord/smali/com/facebook/drawee/backends/pipeline/g.smali
index 08d73269c4..11ce269953 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/g.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/g.smali
@@ -4,7 +4,22 @@
 
 
 # instance fields
-.field IC:Lcom/facebook/imagepipeline/cache/o;
+.field IL:Lcom/facebook/imagepipeline/e/a;
+
+.field IP:Lcom/facebook/common/d/k;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/k<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field IU:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -15,11 +30,11 @@
     .end annotation
 .end field
 
-.field IO:Lcom/facebook/drawee/a/a;
+.field Jf:Lcom/facebook/drawee/a/a;
 
-.field IP:Ljava/util/concurrent/Executor;
+.field Jg:Ljava/util/concurrent/Executor;
 
-.field IQ:Lcom/facebook/common/d/e;
+.field Jh:Lcom/facebook/common/d/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/e<",
@@ -32,21 +47,6 @@
     .end annotation
 .end field
 
-.field Iu:Lcom/facebook/imagepipeline/e/a;
-
-.field Ix:Lcom/facebook/common/d/k;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/k<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
 .field mResources:Landroid/content/res/Resources;
 
 
diff --git a/com.discord/smali/com/facebook/drawee/c/a$a.smali b/com.discord/smali/com/facebook/drawee/c/a$a.smali
index 0adef2046e..4a95bf648f 100644
--- a/com.discord/smali/com/facebook/drawee/c/a$a.smali
+++ b/com.discord/smali/com/facebook/drawee/c/a$a.smali
@@ -15,5 +15,5 @@
 
 
 # virtual methods
-.method public abstract gB()Z
+.method public abstract gF()Z
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/c/a.smali b/com.discord/smali/com/facebook/drawee/c/a.smali
index 0a8edef6fc..a7e53885fc 100644
--- a/com.discord/smali/com/facebook/drawee/c/a.smali
+++ b/com.discord/smali/com/facebook/drawee/c/a.smali
@@ -12,22 +12,22 @@
 
 
 # instance fields
-.field public NA:F
-
-.field public Nu:Lcom/facebook/drawee/c/a$a;
+.field public NN:Lcom/facebook/drawee/c/a$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Nv:F
+.field public final NO:F
 
-.field public Nw:Z
+.field public NP:Z
 
-.field public Nx:Z
+.field public NQ:Z
 
-.field public Ny:J
+.field public NR:J
 
-.field public Nz:F
+.field public NS:F
+
+.field public NT:F
 
 
 # direct methods
@@ -46,7 +46,7 @@
 
     int-to-float p1, p1
 
-    iput p1, p0, Lcom/facebook/drawee/c/a;->Nv:F
+    iput p1, p0, Lcom/facebook/drawee/c/a;->NO:F
 
     invoke-virtual {p0}, Lcom/facebook/drawee/c/a;->init()V
 
@@ -60,7 +60,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/c/a;->Nu:Lcom/facebook/drawee/c/a$a;
+    iput-object v0, p0, Lcom/facebook/drawee/c/a;->NN:Lcom/facebook/drawee/c/a$a;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/c/a;->reset()V
 
@@ -72,9 +72,9 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/c/a;->Nw:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/c/a;->NP:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/c/a;->Nx:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/c/a;->NQ:Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController.smali b/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController.smali
index ee67a027d3..a54bb33098 100644
--- a/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController.smali
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -42,30 +42,26 @@
 
 
 # instance fields
-.field private final IO:Lcom/facebook/drawee/a/a;
+.field private final Jf:Lcom/facebook/drawee/a/a;
 
-.field private IW:Ljava/lang/Object;
+.field private Jn:Ljava/lang/Object;
 
-.field private final Kh:Lcom/facebook/drawee/a/b;
-
-.field private final Ki:Ljava/util/concurrent/Executor;
-
-.field Kj:Lcom/facebook/drawee/a/c;
+.field KA:Lcom/facebook/drawee/a/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Kk:Lcom/facebook/drawee/c/a;
+.field KB:Lcom/facebook/drawee/c/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Kl:Lcom/facebook/drawee/controller/c;
+.field KC:Lcom/facebook/drawee/controller/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field protected Km:Lcom/facebook/drawee/controller/ControllerListener;
+.field protected KD:Lcom/facebook/drawee/controller/ControllerListener;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/drawee/controller/ControllerListener<",
@@ -77,30 +73,30 @@
     .end annotation
 .end field
 
-.field public Kn:Lcom/facebook/drawee/d/c;
+.field public KE:Lcom/facebook/drawee/d/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field protected Ko:Landroid/graphics/drawable/Drawable;
+.field protected KF:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Kp:Z
+.field private KG:Z
 
-.field private Kq:Z
+.field private KH:Z
 
-.field private Kr:Z
+.field private KI:Z
 
-.field Ks:Z
+.field KJ:Z
 
-.field Kt:Ljava/lang/String;
+.field KK:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Ku:Lcom/facebook/b/c;
+.field private KL:Lcom/facebook/b/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/b/c<",
@@ -112,7 +108,7 @@
     .end annotation
 .end field
 
-.field private Kv:Ljava/lang/Object;
+.field private KM:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -123,7 +119,11 @@
     .end annotation
 .end field
 
-.field protected Kw:Z
+.field protected KN:Z
+
+.field private final Ky:Lcom/facebook/drawee/a/b;
+
+.field private final Kz:Ljava/util/concurrent/Executor;
 
 .field private mDrawable:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
@@ -141,7 +141,7 @@
 
     const-class v0, Lcom/facebook/drawee/controller/AbstractDraweeController;
 
-    sput-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -151,19 +151,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/facebook/drawee/a/b;->gw()Lcom/facebook/drawee/a/b;
+    invoke-static {}, Lcom/facebook/drawee/a/b;->gA()Lcom/facebook/drawee/a/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/b;
+    iput-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky:Lcom/facebook/drawee/a/b;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kw:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KN:Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->IO:Lcom/facebook/drawee/a/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Jf:Lcom/facebook/drawee/a/a;
 
-    iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ki:Ljava/util/concurrent/Executor;
+    iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kz:Ljava/util/concurrent/Executor;
 
     const/4 p1, 0x0
 
@@ -218,14 +218,14 @@
 
     invoke-direct {p0, p3, p1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->e(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-interface {p2}, Lcom/facebook/b/c;->fX()Z
+    invoke-interface {p2}, Lcom/facebook/b/c;->gb()Z
 
     return-void
 
     :cond_0
     if-nez p4, :cond_1
 
-    iget-object p0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object p0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     const/4 p1, 0x0
 
@@ -299,7 +299,7 @@
 
     invoke-virtual {p0, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->C(Ljava/lang/Object;)V
 
-    invoke-interface {p2}, Lcom/facebook/b/c;->fX()Z
+    invoke-interface {p2}, Lcom/facebook/b/c;->gb()Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
@@ -309,16 +309,16 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky:Lcom/facebook/drawee/a/b;
 
     if-eqz p5, :cond_1
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JP:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kg:Lcom/facebook/drawee/a/b$a;
 
     goto :goto_0
 
     :cond_1
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JQ:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kh:Lcom/facebook/drawee/a/b$a;
 
     :goto_0
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
@@ -334,11 +334,11 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kv:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KM:Ljava/lang/Object;
 
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
 
-    iput-object p3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kv:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KM:Ljava/lang/Object;
 
     iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
     :try_end_3
@@ -357,13 +357,13 @@
 
     const/4 p4, 0x0
 
-    iput-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku:Lcom/facebook/b/c;
+    iput-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KL:Lcom/facebook/b/c;
 
-    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     invoke-interface {p4, p2, v3, p6}, Lcom/facebook/drawee/d/c;->a(Landroid/graphics/drawable/Drawable;FZ)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gz()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gD()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p4
 
@@ -371,7 +371,7 @@
 
     move-result-object p5
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gD()Landroid/graphics/drawable/Animatable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gH()Landroid/graphics/drawable/Animatable;
 
     move-result-object p6
 
@@ -391,11 +391,11 @@
 
     invoke-direct {p0, p4, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->g(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     invoke-interface {p4, p2, v3, p6}, Lcom/facebook/drawee/d/c;->a(Landroid/graphics/drawable/Drawable;FZ)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gz()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gD()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p4
 
@@ -403,7 +403,7 @@
 
     move-result-object p5
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gD()Landroid/graphics/drawable/Animatable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gH()Landroid/graphics/drawable/Animatable;
 
     move-result-object p6
 
@@ -416,11 +416,11 @@
 
     invoke-direct {p0, p5, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->g(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object p5, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object p5, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     invoke-interface {p5, p2, p4, p6}, Lcom/facebook/drawee/d/c;->a(Landroid/graphics/drawable/Drawable;FZ)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gz()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gD()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p4
 
@@ -526,23 +526,23 @@
 
     invoke-direct {p0, p1, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->e(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-interface {p2}, Lcom/facebook/b/c;->fX()Z
+    invoke-interface {p2}, Lcom/facebook/b/c;->gb()Z
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky:Lcom/facebook/drawee/a/b;
 
     if-eqz p4, :cond_1
 
-    sget-object p2, Lcom/facebook/drawee/a/b$a;->JR:Lcom/facebook/drawee/a/b$a;
+    sget-object p2, Lcom/facebook/drawee/a/b$a;->Ki:Lcom/facebook/drawee/a/b$a;
 
     goto :goto_0
 
     :cond_1
-    sget-object p2, Lcom/facebook/drawee/a/b$a;->JS:Lcom/facebook/drawee/a/b$a;
+    sget-object p2, Lcom/facebook/drawee/a/b$a;->Kj:Lcom/facebook/drawee/a/b$a;
 
     :goto_0
     invoke-virtual {p1, p2}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
@@ -555,13 +555,13 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku:Lcom/facebook/b/c;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KL:Lcom/facebook/b/c;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kr:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KI:Z
 
-    iget-boolean p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ks:Z
+    iget-boolean p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KJ:Z
 
     if-eqz p2, :cond_2
 
@@ -569,7 +569,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     const/high16 v0, 0x3f800000    # 1.0f
 
@@ -578,25 +578,25 @@
     goto :goto_1
 
     :cond_2
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gx()Z
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gB()Z
 
     move-result p1
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
-    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->gW()V
+    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->ha()V
 
     goto :goto_1
 
     :cond_3
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
-    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->gV()V
+    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->gZ()V
 
     :goto_1
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gz()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gD()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p1
 
@@ -611,7 +611,7 @@
 
     invoke-direct {p0, p1, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->e(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gz()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gD()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p1
 
@@ -640,7 +640,7 @@
 
     if-nez p2, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku:Lcom/facebook/b/c;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KL:Lcom/facebook/b/c;
 
     if-nez v1, :cond_0
 
@@ -655,11 +655,11 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku:Lcom/facebook/b/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KL:Lcom/facebook/b/c;
 
     if-ne p2, p1, :cond_1
 
-    iget-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kp:Z
+    iget-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KG:Z
 
     if-eqz p1, :cond_1
 
@@ -682,7 +682,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->Fl:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->FC:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -724,7 +724,7 @@
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->Fl:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->FC:Ljava/lang/Class;
 
     const/4 v2, 0x5
 
@@ -778,12 +778,128 @@
     return-void
 .end method
 
+.method private gB()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KI:Z
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KA:Lcom/facebook/drawee/a/c;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/facebook/drawee/a/c;->gB()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
 .method private gC()V
+    .locals 4
+
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KG:Z
+
+    const/4 v1, 0x0
+
+    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KG:Z
+
+    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KI:Z
+
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KL:Lcom/facebook/b/c;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {v1}, Lcom/facebook/b/c;->gb()Z
+
+    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KL:Lcom/facebook/b/c;
+
+    :cond_0
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Landroid/graphics/drawable/Drawable;)V
+
+    :cond_1
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KK:Ljava/lang/String;
+
+    if-eqz v1, :cond_2
+
+    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KK:Ljava/lang/String;
+
+    :cond_2
+    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
+
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KM:Ljava/lang/Object;
+
+    if-eqz v1, :cond_3
+
+    const-string v3, "release"
+
+    invoke-direct {p0, v3, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->g(Ljava/lang/String;Ljava/lang/Object;)V
+
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KM:Ljava/lang/Object;
+
+    invoke-virtual {p0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->C(Ljava/lang/Object;)V
+
+    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KM:Ljava/lang/Object;
+
+    :cond_3
+    if-eqz v0, :cond_4
+
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gD()Lcom/facebook/drawee/controller/ControllerListener;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
+
+    invoke-interface {v0, v1}, Lcom/facebook/drawee/controller/ControllerListener;->onRelease(Ljava/lang/String;)V
+
+    :cond_4
+    return-void
+.end method
+
+.method private gD()Lcom/facebook/drawee/controller/ControllerListener;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lcom/facebook/drawee/controller/ControllerListener<",
+            "TINFO;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KD:Lcom/facebook/drawee/controller/ControllerListener;
+
+    if-nez v0, :cond_0
+
+    invoke-static {}, Lcom/facebook/drawee/controller/b;->getNoOpListener()Lcom/facebook/drawee/controller/ControllerListener;
+
+    move-result-object v0
+
+    :cond_0
+    return-object v0
+.end method
+
+.method private gG()V
     .locals 8
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gn()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gr()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -797,25 +913,25 @@
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku:Lcom/facebook/b/c;
+    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KL:Lcom/facebook/b/c;
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kp:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KG:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kr:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KI:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kc:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kt:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gz()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gD()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object v0
 
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->IW:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Jn:Ljava/lang/Object;
 
     invoke-interface {v0, v1, v2}, Lcom/facebook/drawee/controller/ControllerListener;->onSubmit(Ljava/lang/String;Ljava/lang/Object;)V
 
@@ -825,7 +941,7 @@
 
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku:Lcom/facebook/b/c;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KL:Lcom/facebook/b/c;
 
     const/high16 v4, 0x3f800000    # 1.0f
 
@@ -846,37 +962,37 @@
     return-void
 
     :cond_0
-    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v3, Lcom/facebook/drawee/a/b$a;->JO:Lcom/facebook/drawee/a/b$a;
+    sget-object v3, Lcom/facebook/drawee/a/b$a;->Kf:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v2, v3}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gz()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gD()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object v2
 
     iget-object v3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->IW:Ljava/lang/Object;
+    iget-object v4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Jn:Ljava/lang/Object;
 
     invoke-interface {v2, v3, v4}, Lcom/facebook/drawee/controller/ControllerListener;->onSubmit(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     const/4 v3, 0x0
 
     invoke-interface {v2, v3, v1}, Lcom/facebook/drawee/d/c;->a(FZ)V
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kp:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KG:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kr:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KI:Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gl()Lcom/facebook/b/c;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gp()Lcom/facebook/b/c;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku:Lcom/facebook/b/c;
+    iput-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KL:Lcom/facebook/b/c;
 
     const/4 v0, 0x2
 
@@ -886,7 +1002,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->FC:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -898,7 +1014,7 @@
 
     iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku:Lcom/facebook/b/c;
+    iget-object v3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KL:Lcom/facebook/b/c;
 
     invoke-static {v3}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -915,9 +1031,9 @@
     :cond_1
     iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku:Lcom/facebook/b/c;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KL:Lcom/facebook/b/c;
 
-    invoke-interface {v1}, Lcom/facebook/b/c;->fU()Z
+    invoke-interface {v1}, Lcom/facebook/b/c;->fY()Z
 
     move-result v1
 
@@ -925,9 +1041,9 @@
 
     invoke-direct {v2, p0, v0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController$1;-><init>(Lcom/facebook/drawee/controller/AbstractDraweeController;Ljava/lang/String;Z)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku:Lcom/facebook/b/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KL:Lcom/facebook/b/c;
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ki:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kz:Ljava/util/concurrent/Executor;
 
     invoke-interface {v0, v2, v1}, Lcom/facebook/b/c;->a(Lcom/facebook/b/e;Ljava/util/concurrent/Executor;)V
 
@@ -936,122 +1052,6 @@
     return-void
 .end method
 
-.method private gx()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kr:Z
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kj:Lcom/facebook/drawee/a/c;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/facebook/drawee/a/c;->gx()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method private gy()V
-    .locals 4
-
-    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kp:Z
-
-    const/4 v1, 0x0
-
-    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kp:Z
-
-    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kr:Z
-
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku:Lcom/facebook/b/c;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_0
-
-    invoke-interface {v1}, Lcom/facebook/b/c;->fX()Z
-
-    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku:Lcom/facebook/b/c;
-
-    :cond_0
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {p0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Landroid/graphics/drawable/Drawable;)V
-
-    :cond_1
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kt:Ljava/lang/String;
-
-    if-eqz v1, :cond_2
-
-    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kt:Ljava/lang/String;
-
-    :cond_2
-    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
-
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kv:Ljava/lang/Object;
-
-    if-eqz v1, :cond_3
-
-    const-string v3, "release"
-
-    invoke-direct {p0, v3, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->g(Ljava/lang/String;Ljava/lang/Object;)V
-
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kv:Ljava/lang/Object;
-
-    invoke-virtual {p0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->C(Ljava/lang/Object;)V
-
-    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kv:Ljava/lang/Object;
-
-    :cond_3
-    if-eqz v0, :cond_4
-
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gz()Lcom/facebook/drawee/controller/ControllerListener;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
-
-    invoke-interface {v0, v1}, Lcom/facebook/drawee/controller/ControllerListener;->onRelease(Ljava/lang/String;)V
-
-    :cond_4
-    return-void
-.end method
-
-.method private gz()Lcom/facebook/drawee/controller/ControllerListener;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lcom/facebook/drawee/controller/ControllerListener<",
-            "TINFO;>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km:Lcom/facebook/drawee/controller/ControllerListener;
-
-    if-nez v0, :cond_0
-
-    invoke-static {}, Lcom/facebook/drawee/controller/b;->getNoOpListener()Lcom/facebook/drawee/controller/ControllerListener;
-
-    move-result-object v0
-
-    :cond_0
-    return-object v0
-.end method
-
 
 # virtual methods
 .method protected abstract C(Ljava/lang/Object;)V
@@ -1124,7 +1124,7 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     instance-of v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
@@ -1132,7 +1132,7 @@
 
     check-cast v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
-    invoke-virtual {v0, p1}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->d(Lcom/facebook/drawee/controller/ControllerListener;)V
+    invoke-virtual {v0, p1}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->c(Lcom/facebook/drawee/controller/ControllerListener;)V
 
     return-void
 
@@ -1143,12 +1143,12 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     return-void
 
     :cond_1
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     return-void
 .end method
@@ -1160,13 +1160,13 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ko:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KF:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ko:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KF:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p1, v0}, Lcom/facebook/drawee/d/c;->b(Landroid/graphics/drawable/Drawable;)V
 
@@ -1186,7 +1186,7 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     instance-of v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
@@ -1194,7 +1194,7 @@
 
     check-cast v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
-    invoke-virtual {v0, p1}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->e(Lcom/facebook/drawee/controller/ControllerListener;)V
+    invoke-virtual {v0, p1}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->d(Lcom/facebook/drawee/controller/ControllerListener;)V
 
     return-void
 
@@ -1203,7 +1203,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     :cond_1
     return-void
@@ -1230,21 +1230,21 @@
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JK:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kb:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kw:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KN:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->IO:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Jf:Lcom/facebook/drawee/a/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->IO:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Jf:Lcom/facebook/drawee/a/a;
 
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/a/a;->a(Lcom/facebook/drawee/a/a$a;)V
 
@@ -1253,35 +1253,35 @@
 
     iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mIsAttached:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kq:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KH:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gy()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gC()V
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ks:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KJ:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kj:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KA:Lcom/facebook/drawee/a/c;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kj:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KA:Lcom/facebook/drawee/a/c;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/a/c;->init()V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kk:Lcom/facebook/drawee/c/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KB:Lcom/facebook/drawee/c/a;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kk:Lcom/facebook/drawee/c/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KB:Lcom/facebook/drawee/c/a;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/c/a;->init()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kk:Lcom/facebook/drawee/c/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KB:Lcom/facebook/drawee/c/a;
 
-    iput-object p0, v0, Lcom/facebook/drawee/c/a;->Nu:Lcom/facebook/drawee/c/a$a;
+    iput-object p0, v0, Lcom/facebook/drawee/c/a;->NN:Lcom/facebook/drawee/c/a$a;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     instance-of v0, v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
@@ -1289,36 +1289,36 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     check-cast v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->gH()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->gL()V
 
     goto :goto_0
 
     :cond_3
-    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     :goto_0
-    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kl:Lcom/facebook/drawee/controller/c;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KC:Lcom/facebook/drawee/controller/c;
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     invoke-interface {v0}, Lcom/facebook/drawee/d/c;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     invoke-interface {v0, v1}, Lcom/facebook/drawee/d/c;->b(Landroid/graphics/drawable/Drawable;)V
 
-    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     :cond_4
-    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ko:Landroid/graphics/drawable/Drawable;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KF:Landroid/graphics/drawable/Drawable;
 
     const/4 v0, 0x2
 
@@ -1328,7 +1328,7 @@
 
     if-eqz v0, :cond_5
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->FC:Ljava/lang/Class;
 
     const-string v1, "controller %x %s -> %s: initialize"
 
@@ -1347,7 +1347,7 @@
     :cond_5
     iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->IW:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Jn:Ljava/lang/Object;
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
     :try_end_0
@@ -1365,7 +1365,7 @@
     throw p1
 .end method
 
-.method public final gA()V
+.method public final gE()V
     .locals 5
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
@@ -1378,7 +1378,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->FC:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1390,7 +1390,7 @@
 
     iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kp:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KG:Z
 
     if-eqz v3, :cond_0
 
@@ -1407,17 +1407,17 @@
     invoke-static {v0, v4, v1, v2, v3}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JL:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kc:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->IO:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Jf:Lcom/facebook/drawee/a/a;
 
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/a/a;->a(Lcom/facebook/drawee/a/a$a;)V
 
@@ -1425,11 +1425,11 @@
 
     iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mIsAttached:Z
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kp:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KG:Z
 
     if-nez v0, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gC()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gG()V
 
     :cond_2
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
@@ -1437,7 +1437,7 @@
     return-void
 .end method
 
-.method public final gB()Z
+.method public final gF()Z
     .locals 4
 
     const/4 v0, 0x2
@@ -1448,7 +1448,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->FC:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1465,27 +1465,27 @@
     invoke-static {v0, v3, v1, v2}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gx()Z
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gB()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kj:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KA:Lcom/facebook/drawee/a/c;
 
-    iget v1, v0, Lcom/facebook/drawee/a/c;->Kg:I
+    iget v1, v0, Lcom/facebook/drawee/a/c;->Kx:I
 
     const/4 v2, 0x1
 
     add-int/2addr v1, v2
 
-    iput v1, v0, Lcom/facebook/drawee/a/c;->Kg:I
+    iput v1, v0, Lcom/facebook/drawee/a/c;->Kx:I
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     invoke-interface {v0}, Lcom/facebook/drawee/d/c;->reset()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gC()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gG()V
 
     return v2
 
@@ -1495,7 +1495,7 @@
     return v0
 .end method
 
-.method public final gD()Landroid/graphics/drawable/Animatable;
+.method public final gH()Landroid/graphics/drawable/Animatable;
     .locals 2
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -1521,12 +1521,12 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     return-object v0
 .end method
 
-.method protected abstract gl()Lcom/facebook/b/c;
+.method protected abstract gp()Lcom/facebook/b/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -1536,7 +1536,7 @@
     .end annotation
 .end method
 
-.method protected gn()Ljava/lang/Object;
+.method protected gr()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1565,7 +1565,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->FC:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1582,9 +1582,9 @@
     invoke-static {v0, v3, v1, v2}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JM:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kd:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
@@ -1592,11 +1592,11 @@
 
     iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mIsAttached:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->IO:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Jf:Lcom/facebook/drawee/a/a;
 
-    invoke-static {}, Lcom/facebook/drawee/a/a;->gu()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->gy()V
 
-    iget-object v1, v0, Lcom/facebook/drawee/a/a;->Jy:Ljava/util/Set;
+    iget-object v1, v0, Lcom/facebook/drawee/a/a;->JP:Ljava/util/Set;
 
     invoke-interface {v1, p0}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -1604,7 +1604,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/drawee/a/a;->Jy:Ljava/util/Set;
+    iget-object v1, v0, Lcom/facebook/drawee/a/a;->JP:Ljava/util/Set;
 
     invoke-interface {v1}, Ljava/util/Set;->size()I
 
@@ -1614,9 +1614,9 @@
 
     if-ne v1, v2, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/drawee/a/a;->Jz:Landroid/os/Handler;
+    iget-object v1, v0, Lcom/facebook/drawee/a/a;->JQ:Landroid/os/Handler;
 
-    iget-object v0, v0, Lcom/facebook/drawee/a/a;->JA:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/facebook/drawee/a/a;->JR:Ljava/lang/Runnable;
 
     invoke-virtual {v1, v0}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
@@ -1637,7 +1637,7 @@
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->Fl:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->FC:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1654,7 +1654,7 @@
     invoke-static {v1, v4, v2, v3, p1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_0
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kk:Lcom/facebook/drawee/c/a;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KB:Lcom/facebook/drawee/c/a;
 
     const/4 v2, 0x0
 
@@ -1663,11 +1663,11 @@
     return v2
 
     :cond_1
-    iget-boolean v1, v1, Lcom/facebook/drawee/c/a;->Nw:Z
+    iget-boolean v1, v1, Lcom/facebook/drawee/c/a;->NP:Z
 
     if-nez v1, :cond_3
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gx()Z
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gB()Z
 
     move-result v1
 
@@ -1680,7 +1680,7 @@
 
     :cond_3
     :goto_0
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kk:Lcom/facebook/drawee/c/a;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KB:Lcom/facebook/drawee/c/a;
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getAction()I
 
@@ -1701,7 +1701,7 @@
     goto/16 :goto_2
 
     :cond_4
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Nw:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->NP:Z
 
     goto :goto_1
 
@@ -1710,7 +1710,7 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->Nz:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->NS:F
 
     sub-float/2addr v0, v3
 
@@ -1718,7 +1718,7 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->Nv:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->NO:F
 
     cmpl-float v0, v0, v3
 
@@ -1728,7 +1728,7 @@
 
     move-result p1
 
-    iget v0, v1, Lcom/facebook/drawee/c/a;->NA:F
+    iget v0, v1, Lcom/facebook/drawee/c/a;->NT:F
 
     sub-float/2addr p1, v0
 
@@ -1736,25 +1736,25 @@
 
     move-result p1
 
-    iget v0, v1, Lcom/facebook/drawee/c/a;->Nv:F
+    iget v0, v1, Lcom/facebook/drawee/c/a;->NO:F
 
     cmpl-float p1, p1, v0
 
     if-lez p1, :cond_c
 
     :cond_6
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Nx:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->NQ:Z
 
     goto :goto_2
 
     :cond_7
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Nw:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->NP:Z
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->Nz:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->NS:F
 
     sub-float/2addr v0, v3
 
@@ -1762,7 +1762,7 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->Nv:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->NO:F
 
     cmpl-float v0, v0, v3
 
@@ -1772,7 +1772,7 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->NA:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->NT:F
 
     sub-float/2addr v0, v3
 
@@ -1780,17 +1780,17 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->Nv:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->NO:F
 
     cmpl-float v0, v0, v3
 
     if-lez v0, :cond_9
 
     :cond_8
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Nx:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->NQ:Z
 
     :cond_9
-    iget-boolean v0, v1, Lcom/facebook/drawee/c/a;->Nx:Z
+    iget-boolean v0, v1, Lcom/facebook/drawee/c/a;->NQ:Z
 
     if-eqz v0, :cond_a
 
@@ -1798,7 +1798,7 @@
 
     move-result-wide v5
 
-    iget-wide v7, v1, Lcom/facebook/drawee/c/a;->Ny:J
+    iget-wide v7, v1, Lcom/facebook/drawee/c/a;->NR:J
 
     sub-long/2addr v5, v7
 
@@ -1812,42 +1812,42 @@
 
     if-gtz p1, :cond_a
 
-    iget-object p1, v1, Lcom/facebook/drawee/c/a;->Nu:Lcom/facebook/drawee/c/a$a;
+    iget-object p1, v1, Lcom/facebook/drawee/c/a;->NN:Lcom/facebook/drawee/c/a$a;
 
     if-eqz p1, :cond_a
 
-    iget-object p1, v1, Lcom/facebook/drawee/c/a;->Nu:Lcom/facebook/drawee/c/a$a;
+    iget-object p1, v1, Lcom/facebook/drawee/c/a;->NN:Lcom/facebook/drawee/c/a$a;
 
-    invoke-interface {p1}, Lcom/facebook/drawee/c/a$a;->gB()Z
+    invoke-interface {p1}, Lcom/facebook/drawee/c/a$a;->gF()Z
 
     :cond_a
     :goto_1
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Nx:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->NQ:Z
 
     goto :goto_2
 
     :cond_b
-    iput-boolean v4, v1, Lcom/facebook/drawee/c/a;->Nw:Z
+    iput-boolean v4, v1, Lcom/facebook/drawee/c/a;->NP:Z
 
-    iput-boolean v4, v1, Lcom/facebook/drawee/c/a;->Nx:Z
+    iput-boolean v4, v1, Lcom/facebook/drawee/c/a;->NQ:Z
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getEventTime()J
 
     move-result-wide v2
 
-    iput-wide v2, v1, Lcom/facebook/drawee/c/a;->Ny:J
+    iput-wide v2, v1, Lcom/facebook/drawee/c/a;->NR:J
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
 
     move-result v0
 
-    iput v0, v1, Lcom/facebook/drawee/c/a;->Nz:F
+    iput v0, v1, Lcom/facebook/drawee/c/a;->NS:F
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getY()F
 
     move-result p1
 
-    iput p1, v1, Lcom/facebook/drawee/c/a;->NA:F
+    iput p1, v1, Lcom/facebook/drawee/c/a;->NT:F
 
     :cond_c
     :goto_2
@@ -1857,36 +1857,36 @@
 .method public final release()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JN:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ke:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kj:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KA:Lcom/facebook/drawee/a/c;
 
     if-eqz v0, :cond_0
 
     const/4 v1, 0x0
 
-    iput v1, v0, Lcom/facebook/drawee/a/c;->Kg:I
+    iput v1, v0, Lcom/facebook/drawee/a/c;->Kx:I
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kk:Lcom/facebook/drawee/c/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KB:Lcom/facebook/drawee/c/a;
 
     if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Lcom/facebook/drawee/c/a;->reset()V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     if-eqz v0, :cond_2
 
     invoke-interface {v0}, Lcom/facebook/drawee/d/c;->reset()V
 
     :cond_2
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gy()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gC()V
 
     return-void
 .end method
@@ -1906,7 +1906,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->FC:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1923,32 +1923,32 @@
     invoke-static {v0, v3, v1, v2, p1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky:Lcom/facebook/drawee/a/b;
 
     if-eqz p1, :cond_1
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JF:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->JW:Lcom/facebook/drawee/a/b$a;
 
     goto :goto_0
 
     :cond_1
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JG:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->JX:Lcom/facebook/drawee/a/b$a;
 
     :goto_0
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kp:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KG:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->IO:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Jf:Lcom/facebook/drawee/a/a;
 
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/a/a;->a(Lcom/facebook/drawee/a/a$a;)V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->release()V
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     if-eqz v0, :cond_3
 
@@ -1956,7 +1956,7 @@
 
     invoke-interface {v0, v1}, Lcom/facebook/drawee/d/c;->b(Landroid/graphics/drawable/Drawable;)V
 
-    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
     :cond_3
     if-eqz p1, :cond_4
@@ -1967,11 +1967,11 @@
 
     check-cast p1, Lcom/facebook/drawee/d/c;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kn:Lcom/facebook/drawee/d/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KE:Lcom/facebook/drawee/d/c;
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ko:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KF:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p1, v0}, Lcom/facebook/drawee/d/c;->b(Landroid/graphics/drawable/Drawable;)V
 
@@ -1994,7 +1994,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kp:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KG:Z
 
     const-string v2, "isRequestSubmitted"
 
@@ -2002,7 +2002,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kr:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KI:Z
 
     const-string v2, "hasFetchFailed"
 
@@ -2010,7 +2010,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kv:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KM:Ljava/lang/Object;
 
     invoke-virtual {p0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->D(Ljava/lang/Object;)I
 
@@ -2022,7 +2022,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky:Lcom/facebook/drawee/a/b;
 
     invoke-virtual {v1}, Lcom/facebook/drawee/a/b;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/facebook/drawee/controller/a.smali b/com.discord/smali/com/facebook/drawee/controller/a.smali
index f8070d3367..7449ba5916 100644
--- a/com.discord/smali/com/facebook/drawee/controller/a.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/a.smali
@@ -33,11 +33,7 @@
 
 
 # static fields
-.field private static final KA:Ljava/lang/NullPointerException;
-
-.field protected static final KH:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field private static final Kz:Lcom/facebook/drawee/controller/ControllerListener;
+.field private static final KQ:Lcom/facebook/drawee/controller/ControllerListener;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/drawee/controller/ControllerListener<",
@@ -47,9 +43,13 @@
     .end annotation
 .end field
 
+.field private static final KR:Ljava/lang/NullPointerException;
+
+.field protected static final KY:Ljava/util/concurrent/atomic/AtomicLong;
+
 
 # instance fields
-.field private ID:Lcom/facebook/common/d/k;
+.field private IV:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -62,7 +62,7 @@
     .end annotation
 .end field
 
-.field private final IM:Ljava/util/Set;
+.field private final Je:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -72,61 +72,17 @@
     .end annotation
 .end field
 
-.field protected IW:Ljava/lang/Object;
+.field protected Jn:Ljava/lang/Object;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field protected KB:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TREQUEST;"
-        }
-    .end annotation
-
+.field private KC:Lcom/facebook/drawee/controller/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private KC:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TREQUEST;"
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private KD:[Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[TREQUEST;"
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private KE:Z
-
-.field public KF:Z
-
-.field protected KG:Lcom/facebook/drawee/d/a;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private Ke:Z
-
-.field private Kl:Lcom/facebook/drawee/controller/c;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private Km:Lcom/facebook/drawee/controller/ControllerListener;
+.field public KD:Lcom/facebook/drawee/controller/ControllerListener;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/drawee/controller/ControllerListener<",
@@ -138,9 +94,53 @@
     .end annotation
 .end field
 
-.field private Ks:Z
+.field private KJ:Z
 
-.field private Kt:Ljava/lang/String;
+.field private KK:Ljava/lang/String;
+
+.field protected KS:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TREQUEST;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private KT:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TREQUEST;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field public KU:[Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[TREQUEST;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field public KV:Z
+
+.field public KW:Z
+
+.field protected KX:Lcom/facebook/drawee/d/a;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private Kv:Z
 
 .field private final mContext:Landroid/content/Context;
 
@@ -153,7 +153,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/controller/a$1;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/controller/a;->Kz:Lcom/facebook/drawee/controller/ControllerListener;
+    sput-object v0, Lcom/facebook/drawee/controller/a;->KQ:Lcom/facebook/drawee/controller/ControllerListener;
 
     new-instance v0, Ljava/lang/NullPointerException;
 
@@ -161,13 +161,13 @@
 
     invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/drawee/controller/a;->KA:Ljava/lang/NullPointerException;
+    sput-object v0, Lcom/facebook/drawee/controller/a;->KR:Ljava/lang/NullPointerException;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/controller/a;->KH:Ljava/util/concurrent/atomic/AtomicLong;
+    sput-object v0, Lcom/facebook/drawee/controller/a;->KY:Ljava/util/concurrent/atomic/AtomicLong;
 
     return-void
 .end method
@@ -188,35 +188,35 @@
 
     iput-object p1, p0, Lcom/facebook/drawee/controller/a;->mContext:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/facebook/drawee/controller/a;->IM:Ljava/util/Set;
+    iput-object p2, p0, Lcom/facebook/drawee/controller/a;->Je:Ljava/util/Set;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->IW:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Jn:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KB:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KS:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KC:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KT:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KD:[Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KU:[Ljava/lang/Object;
 
     const/4 p2, 0x1
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->KE:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->KV:Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Kl:Lcom/facebook/drawee/controller/c;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KC:Lcom/facebook/drawee/controller/c;
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->Ke:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->Kv:Z
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->KF:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->KW:Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KG:Lcom/facebook/drawee/d/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KX:Lcom/facebook/drawee/d/a;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Kt:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KK:Ljava/lang/String;
 
     return-void
 .end method
@@ -235,7 +235,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/drawee/controller/a$a;->KO:Lcom/facebook/drawee/controller/a$a;
+    sget-object v0, Lcom/facebook/drawee/controller/a$a;->Lf:Lcom/facebook/drawee/controller/a$a;
 
     invoke-direct {p0, p1, p2, p3, v0}, Lcom/facebook/drawee/controller/a;->a(Lcom/facebook/drawee/d/a;Ljava/lang/String;Ljava/lang/Object;Lcom/facebook/drawee/controller/a$a;)Lcom/facebook/common/d/k;
 
@@ -260,7 +260,7 @@
         }
     .end annotation
 
-    iget-object v5, p0, Lcom/facebook/drawee/controller/a;->IW:Ljava/lang/Object;
+    iget-object v5, p0, Lcom/facebook/drawee/controller/a;->Jn:Ljava/lang/Object;
 
     new-instance v7, Lcom/facebook/drawee/controller/a$2;
 
@@ -294,7 +294,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->IW:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Jn:Ljava/lang/Object;
 
     return-object p0
 .end method
@@ -308,7 +308,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KB:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KS:Ljava/lang/Object;
 
     return-object p0
 .end method
@@ -342,7 +342,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->ID:Lcom/facebook/common/d/k;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->IV:Lcom/facebook/common/d/k;
 
     if-eqz v0, :cond_0
 
@@ -351,7 +351,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->KB:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->KS:Ljava/lang/Object;
 
     const/4 v2, 0x2
 
@@ -366,11 +366,11 @@
     goto :goto_2
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->KD:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->KU:[Ljava/lang/Object;
 
     if-eqz v1, :cond_4
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/controller/a;->KE:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/a;->KV:Z
 
     new-instance v4, Ljava/util/ArrayList;
 
@@ -391,7 +391,7 @@
 
     aget-object v5, v1, v0
 
-    sget-object v6, Lcom/facebook/drawee/controller/a$a;->KQ:Lcom/facebook/drawee/controller/a$a;
+    sget-object v6, Lcom/facebook/drawee/controller/a$a;->Lh:Lcom/facebook/drawee/controller/a$a;
 
     invoke-direct {p0, p1, p2, v5, v6}, Lcom/facebook/drawee/controller/a;->a(Lcom/facebook/drawee/d/a;Ljava/lang/String;Ljava/lang/Object;Lcom/facebook/drawee/controller/a$a;)Lcom/facebook/common/d/k;
 
@@ -432,7 +432,7 @@
     :goto_2
     if-eqz v0, :cond_5
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->KC:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->KT:Ljava/lang/Object;
 
     if-eqz v1, :cond_5
 
@@ -442,7 +442,7 @@
 
     invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KC:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KT:Ljava/lang/Object;
 
     invoke-direct {p0, p1, p2, v0}, Lcom/facebook/drawee/controller/a;->a(Lcom/facebook/drawee/d/a;Ljava/lang/String;Ljava/lang/Object;)Lcom/facebook/common/d/k;
 
@@ -457,7 +457,7 @@
     :cond_5
     if-nez v0, :cond_6
 
-    sget-object p1, Lcom/facebook/drawee/controller/a;->KA:Ljava/lang/NullPointerException;
+    sget-object p1, Lcom/facebook/drawee/controller/a;->KR:Ljava/lang/NullPointerException;
 
     new-instance v0, Lcom/facebook/b/d$1;
 
@@ -482,7 +482,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KG:Lcom/facebook/drawee/d/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KX:Lcom/facebook/drawee/d/a;
 
     return-object p0
 .end method
@@ -494,72 +494,12 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KG:Lcom/facebook/drawee/d/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KX:Lcom/facebook/drawee/d/a;
 
     return-object p0
 .end method
 
-.method public final c(Lcom/facebook/drawee/controller/ControllerListener;)Lcom/facebook/drawee/controller/a;
-    .locals 0
-    .param p1    # Lcom/facebook/drawee/controller/ControllerListener;
-        .annotation runtime Ljavax/annotation/Nullable;
-        .end annotation
-    .end param
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/facebook/drawee/controller/ControllerListener<",
-            "-TINFO;>;)TBUI",
-            "LDER;"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Km:Lcom/facebook/drawee/controller/ControllerListener;
-
-    return-object p0
-.end method
-
-.method public final c([Ljava/lang/Object;)Lcom/facebook/drawee/controller/a;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([TREQUEST;)TBUI",
-            "LDER;"
-        }
-    .end annotation
-
-    const/4 v0, 0x1
-
-    if-eqz p1, :cond_1
-
-    array-length v1, p1
-
-    if-lez v1, :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-string v2, "No requests specified!"
-
-    invoke-static {v1, v2}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
-
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->KD:[Ljava/lang/Object;
-
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/a;->KE:Z
-
-    return-object p0
-.end method
-
-.method public final gE()Lcom/facebook/drawee/controller/a;
+.method public final gI()Lcom/facebook/drawee/controller/a;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -570,15 +510,15 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/a;->Ke:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/a;->Kv:Z
 
     return-object p0
 .end method
 
-.method public final gF()Lcom/facebook/drawee/controller/AbstractDraweeController;
+.method public final gJ()Lcom/facebook/drawee/controller/AbstractDraweeController;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KD:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KU:[Ljava/lang/Object;
 
     const/4 v1, 0x0
 
@@ -586,7 +526,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KB:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KS:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
@@ -606,19 +546,19 @@
 
     invoke-static {v0, v3}, Lcom/facebook/common/d/i;->a(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->ID:Lcom/facebook/common/d/k;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->IV:Lcom/facebook/common/d/k;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KD:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KU:[Ljava/lang/Object;
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KB:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KS:Ljava/lang/Object;
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KC:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KT:Ljava/lang/Object;
 
     if-nez v0, :cond_3
 
@@ -630,48 +570,48 @@
 
     invoke-static {v1, v0}, Lcom/facebook/common/d/i;->a(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KB:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KS:Ljava/lang/Object;
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KD:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KU:[Ljava/lang/Object;
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KC:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->KT:Ljava/lang/Object;
 
     if-eqz v0, :cond_4
 
-    iput-object v0, p0, Lcom/facebook/drawee/controller/a;->KB:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/facebook/drawee/controller/a;->KS:Ljava/lang/Object;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/controller/a;->KC:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/facebook/drawee/controller/a;->KT:Ljava/lang/Object;
 
     :cond_4
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->gp()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->gt()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->Ks:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->KJ:Z
 
-    iput-boolean v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ks:Z
+    iput-boolean v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KJ:Z
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Kt:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->KK:Ljava/lang/String;
 
-    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kt:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KK:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Kl:Lcom/facebook/drawee/controller/c;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->KC:Lcom/facebook/drawee/controller/c;
 
-    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kl:Lcom/facebook/drawee/controller/c;
+    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KC:Lcom/facebook/drawee/controller/c;
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->Ke:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->Kv:Z
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kj:Lcom/facebook/drawee/a/c;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KA:Lcom/facebook/drawee/a/c;
 
     if-nez v1, :cond_5
 
@@ -679,16 +619,16 @@
 
     invoke-direct {v1}, Lcom/facebook/drawee/a/c;-><init>()V
 
-    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kj:Lcom/facebook/drawee/a/c;
+    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KA:Lcom/facebook/drawee/a/c;
 
     :cond_5
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kj:Lcom/facebook/drawee/a/c;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KA:Lcom/facebook/drawee/a/c;
 
-    iget-boolean v2, p0, Lcom/facebook/drawee/controller/a;->Ke:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/controller/a;->Kv:Z
 
-    iput-boolean v2, v1, Lcom/facebook/drawee/a/c;->Ke:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/a/c;->Kv:Z
 
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kk:Lcom/facebook/drawee/c/a;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KB:Lcom/facebook/drawee/c/a;
 
     if-nez v1, :cond_6
 
@@ -698,18 +638,18 @@
 
     invoke-direct {v2, v1}, Lcom/facebook/drawee/c/a;-><init>(Landroid/content/Context;)V
 
-    iput-object v2, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kk:Lcom/facebook/drawee/c/a;
+    iput-object v2, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KB:Lcom/facebook/drawee/c/a;
 
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kk:Lcom/facebook/drawee/c/a;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KB:Lcom/facebook/drawee/c/a;
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kk:Lcom/facebook/drawee/c/a;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->KB:Lcom/facebook/drawee/c/a;
 
-    iput-object v0, v1, Lcom/facebook/drawee/c/a;->Nu:Lcom/facebook/drawee/c/a$a;
+    iput-object v0, v1, Lcom/facebook/drawee/c/a;->NN:Lcom/facebook/drawee/c/a$a;
 
     :cond_6
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->IM:Ljava/util/Set;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Je:Ljava/util/Set;
 
     if-eqz v1, :cond_7
 
@@ -735,18 +675,18 @@
     goto :goto_2
 
     :cond_7
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     if-eqz v1, :cond_8
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Lcom/facebook/drawee/controller/ControllerListener;)V
 
     :cond_8
-    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->KF:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->KW:Z
 
     if-eqz v1, :cond_9
 
-    sget-object v1, Lcom/facebook/drawee/controller/a;->Kz:Lcom/facebook/drawee/controller/ControllerListener;
+    sget-object v1, Lcom/facebook/drawee/controller/a;->KQ:Lcom/facebook/drawee/controller/ControllerListener;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Lcom/facebook/drawee/controller/ControllerListener;)V
 
@@ -756,20 +696,20 @@
     return-object v0
 .end method
 
-.method public final synthetic gG()Lcom/facebook/drawee/d/a;
+.method public final synthetic gK()Lcom/facebook/drawee/d/a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->gF()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->gJ()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected abstract gp()Lcom/facebook/drawee/controller/AbstractDraweeController;
+.method protected abstract gt()Lcom/facebook/drawee/controller/AbstractDraweeController;
 .end method
 
-.method public final w(Z)Lcom/facebook/drawee/controller/a;
+.method public final u(Z)Lcom/facebook/drawee/controller/a;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -778,7 +718,7 @@
         }
     .end annotation
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/controller/a;->KF:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/controller/a;->KW:Z
 
     return-object p0
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/controller/d.smali b/com.discord/smali/com/facebook/drawee/controller/d.smali
index 14b01dc7d7..375e909a2a 100644
--- a/com.discord/smali/com/facebook/drawee/controller/d.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/d.smali
@@ -74,7 +74,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized d(Lcom/facebook/drawee/controller/ControllerListener;)V
+.method public final declared-synchronized c(Lcom/facebook/drawee/controller/ControllerListener;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -105,7 +105,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized e(Lcom/facebook/drawee/controller/ControllerListener;)V
+.method public final declared-synchronized d(Lcom/facebook/drawee/controller/ControllerListener;)V
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -149,7 +149,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized gH()V
+.method public final declared-synchronized gL()V
     .locals 1
 
     monitor-enter p0
diff --git a/com.discord/smali/com/facebook/drawee/d/a.smali b/com.discord/smali/com/facebook/drawee/d/a.smali
index 2d68f92b43..c429ab2a32 100644
--- a/com.discord/smali/com/facebook/drawee/d/a.smali
+++ b/com.discord/smali/com/facebook/drawee/d/a.smali
@@ -4,10 +4,10 @@
 
 
 # virtual methods
-.method public abstract gA()V
+.method public abstract gE()V
 .end method
 
-.method public abstract gD()Landroid/graphics/drawable/Animatable;
+.method public abstract gH()Landroid/graphics/drawable/Animatable;
 .end method
 
 .method public abstract getHierarchy()Lcom/facebook/drawee/d/b;
diff --git a/com.discord/smali/com/facebook/drawee/d/c.smali b/com.discord/smali/com/facebook/drawee/d/c.smali
index 4d416e08f8..0f73edafba 100644
--- a/com.discord/smali/com/facebook/drawee/d/c.smali
+++ b/com.discord/smali/com/facebook/drawee/d/c.smali
@@ -16,10 +16,10 @@
 .method public abstract b(Landroid/graphics/drawable/Drawable;)V
 .end method
 
-.method public abstract gV()V
+.method public abstract gZ()V
 .end method
 
-.method public abstract gW()V
+.method public abstract ha()V
 .end method
 
 .method public abstract reset()V
diff --git a/com.discord/smali/com/facebook/drawee/d/d.smali b/com.discord/smali/com/facebook/drawee/d/d.smali
index c32d1c9868..13c178d2f7 100644
--- a/com.discord/smali/com/facebook/drawee/d/d.smali
+++ b/com.discord/smali/com/facebook/drawee/d/d.smali
@@ -11,7 +11,7 @@
     .end param
 .end method
 
-.method public abstract gG()Lcom/facebook/drawee/d/a;
+.method public abstract gK()Lcom/facebook/drawee/d/a;
 .end method
 
 .method public abstract n(Landroid/net/Uri;)Lcom/facebook/drawee/d/d;
diff --git a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils.smali b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils.smali
index 3f16d968cf..72b874d3c2 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils.smali
@@ -68,7 +68,7 @@
 
     check-cast p0, Lcom/facebook/drawee/drawable/a;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v1, v1
 
diff --git a/com.discord/smali/com/facebook/drawee/drawable/a.smali b/com.discord/smali/com/facebook/drawee/drawable/a.smali
index f8033271ac..c6b91438ff 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/a.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/a.smali
@@ -9,19 +9,19 @@
 
 
 # instance fields
-.field private Ll:Lcom/facebook/drawee/drawable/r;
+.field private LC:Lcom/facebook/drawee/drawable/r;
 
-.field private final Lm:Lcom/facebook/drawee/drawable/d;
+.field private final LD:Lcom/facebook/drawee/drawable/d;
 
-.field public final Ln:[Landroid/graphics/drawable/Drawable;
+.field public final LE:[Landroid/graphics/drawable/Drawable;
 
-.field public final Lo:[Lcom/facebook/drawee/drawable/c;
+.field public final LF:[Lcom/facebook/drawee/drawable/c;
 
-.field private Lp:Z
+.field private LG:Z
 
-.field private Lq:Z
+.field private LH:Z
 
-.field private Lr:Z
+.field private LI:Z
 
 .field private final mTmpRect:Landroid/graphics/Rect;
 
@@ -36,7 +36,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/drawable/d;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/a;->Lm:Lcom/facebook/drawee/drawable/d;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/a;->LD:Lcom/facebook/drawee/drawable/d;
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -46,18 +46,18 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->Lp:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->LG:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->Lq:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->LH:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->Lr:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->LI:Z
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     :goto_0
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v1, p1
 
@@ -76,7 +76,7 @@
 
     new-array p1, p1, [Lcom/facebook/drawee/drawable/c;
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/a;->Lo:[Lcom/facebook/drawee/drawable/c;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/a;->LF:[Lcom/facebook/drawee/drawable/c;
 
     return-void
 .end method
@@ -108,7 +108,7 @@
     :goto_0
     invoke-static {v2}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v2, v2
 
@@ -122,7 +122,7 @@
     :goto_1
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     aget-object v0, v0, p1
 
@@ -130,14 +130,14 @@
 
     if-eqz p2, :cond_2
 
-    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/a;->Lr:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/a;->LI:Z
 
     if-eqz v2, :cond_2
 
     invoke-virtual {p2}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable;
 
     :cond_2
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     aget-object v2, v2, p1
 
@@ -147,7 +147,7 @@
 
     invoke-static {p2, v3, v3}, Lcom/facebook/drawee/drawable/e;->a(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lcom/facebook/drawee/drawable/r;)V
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->LD:Lcom/facebook/drawee/drawable/d;
 
     invoke-static {p2, v2}, Lcom/facebook/drawee/drawable/e;->a(Landroid/graphics/drawable/Drawable;Lcom/facebook/drawee/drawable/d;)V
 
@@ -155,9 +155,9 @@
 
     invoke-static {p2, p0, p0}, Lcom/facebook/drawee/drawable/e;->a(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lcom/facebook/drawee/drawable/r;)V
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/a;->Lq:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/a;->LH:Z
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     aput-object p2, v1, p1
 
@@ -170,7 +170,7 @@
 .method public final a(Landroid/graphics/RectF;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Ll:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->LC:Lcom/facebook/drawee/drawable/r;
 
     if-eqz v0, :cond_0
 
@@ -191,7 +191,7 @@
 .method public final a(Lcom/facebook/drawee/drawable/r;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/a;->Ll:Lcom/facebook/drawee/drawable/r;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/a;->LC:Lcom/facebook/drawee/drawable/r;
 
     return-void
 .end method
@@ -199,7 +199,7 @@
 .method public final c(Landroid/graphics/Matrix;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Ll:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->LC:Lcom/facebook/drawee/drawable/r;
 
     if-eqz v0, :cond_0
 
@@ -219,7 +219,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v2, v1
 
@@ -261,7 +261,7 @@
     :goto_0
     invoke-static {v2}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v2, v2
 
@@ -275,7 +275,7 @@
     :goto_1
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     aget-object p1, v0, p1
 
@@ -292,7 +292,7 @@
     const/4 v2, -0x1
 
     :goto_0
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v4, v3
 
@@ -334,7 +334,7 @@
     const/4 v2, -0x1
 
     :goto_0
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v4, v3
 
@@ -369,7 +369,7 @@
 .method public getOpacity()I
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v0, v0
 
@@ -385,7 +385,7 @@
     const/4 v1, 0x1
 
     :goto_0
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v3, v2
 
@@ -428,7 +428,7 @@
     iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->mTmpRect:Landroid/graphics/Rect;
 
     :goto_0
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v3, v2
 
@@ -502,18 +502,18 @@
 .method public isStateful()Z
     .locals 5
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->Lq:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->LH:Z
 
     if-nez v0, :cond_2
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->Lp:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->LG:Z
 
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v3, v2
 
@@ -523,7 +523,7 @@
 
     aget-object v2, v2, v1
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/a;->Lp:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/a;->LG:Z
 
     if-eqz v2, :cond_0
 
@@ -541,17 +541,17 @@
     :goto_1
     or-int v2, v3, v4
 
-    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/a;->Lp:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/a;->LG:Z
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_1
-    iput-boolean v4, p0, Lcom/facebook/drawee/drawable/a;->Lq:Z
+    iput-boolean v4, p0, Lcom/facebook/drawee/drawable/a;->LH:Z
 
     :cond_2
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->Lp:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->LG:Z
 
     return v0
 .end method
@@ -562,7 +562,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v2, v1
 
@@ -582,7 +582,7 @@
     :cond_1
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->Lr:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->LI:Z
 
     return-object p0
 .end method
@@ -593,7 +593,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v2, v1
 
@@ -622,7 +622,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v3, v2
 
@@ -657,7 +657,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v3, v2
 
@@ -695,14 +695,14 @@
 .method public setAlpha(I)V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->LD:Lcom/facebook/drawee/drawable/d;
 
     iput p1, v0, Lcom/facebook/drawee/drawable/d;->mAlpha:I
 
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v2, v1
 
@@ -726,14 +726,14 @@
 .method public setColorFilter(Landroid/graphics/ColorFilter;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->LD:Lcom/facebook/drawee/drawable/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/d;->setColorFilter(Landroid/graphics/ColorFilter;)V
 
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v2, v1
 
@@ -757,14 +757,14 @@
 .method public setDither(Z)V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->LD:Lcom/facebook/drawee/drawable/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/d;->setDither(Z)V
 
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v2, v1
 
@@ -788,14 +788,14 @@
 .method public setFilterBitmap(Z)V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->LD:Lcom/facebook/drawee/drawable/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/d;->setFilterBitmap(Z)V
 
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v2, v1
 
@@ -822,7 +822,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v2, v1
 
@@ -853,7 +853,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v3, v2
 
diff --git a/com.discord/smali/com/facebook/drawee/drawable/g.smali b/com.discord/smali/com/facebook/drawee/drawable/g.smali
index 75e5129b0f..9fd6e5a5c3 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/g.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/g.smali
@@ -10,19 +10,19 @@
 
 
 # static fields
-.field private static final LK:Landroid/graphics/Matrix;
+.field private static final Mc:Landroid/graphics/Matrix;
 
 
 # instance fields
-.field private LJ:Landroid/graphics/drawable/Drawable;
+.field protected LC:Lcom/facebook/drawee/drawable/r;
+
+.field private final LD:Lcom/facebook/drawee/drawable/d;
+
+.field private Mb:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field protected Ll:Lcom/facebook/drawee/drawable/r;
-
-.field private final Lm:Lcom/facebook/drawee/drawable/d;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -32,7 +32,7 @@
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/drawable/g;->LK:Landroid/graphics/Matrix;
+    sput-object v0, Lcom/facebook/drawee/drawable/g;->Mc:Landroid/graphics/Matrix;
 
     return-void
 .end method
@@ -50,11 +50,11 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/drawable/d;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/g;->Lm:Lcom/facebook/drawee/drawable/d;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/g;->LD:Lcom/facebook/drawee/drawable/d;
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     invoke-static {p1, p0, p0}, Lcom/facebook/drawee/drawable/e;->a(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lcom/facebook/drawee/drawable/r;)V
 
@@ -66,7 +66,7 @@
 .method public final a(Landroid/graphics/RectF;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Ll:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LC:Lcom/facebook/drawee/drawable/r;
 
     if-eqz v0, :cond_0
 
@@ -87,7 +87,7 @@
 .method public final a(Lcom/facebook/drawee/drawable/r;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->Ll:Lcom/facebook/drawee/drawable/r;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->LC:Lcom/facebook/drawee/drawable/r;
 
     return-void
 .end method
@@ -95,7 +95,7 @@
 .method public final b(Landroid/graphics/RectF;)V
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/drawable/g;->LK:Landroid/graphics/Matrix;
+    sget-object v0, Lcom/facebook/drawee/drawable/g;->Mc:Landroid/graphics/Matrix;
 
     invoke-virtual {p0, v0}, Lcom/facebook/drawee/drawable/g;->d(Landroid/graphics/Matrix;)V
 
@@ -105,7 +105,7 @@
 
     invoke-virtual {p1, v0}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V
 
-    sget-object v0, Lcom/facebook/drawee/drawable/g;->LK:Landroid/graphics/Matrix;
+    sget-object v0, Lcom/facebook/drawee/drawable/g;->Mc:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->mapRect(Landroid/graphics/RectF;)Z
 
@@ -137,7 +137,7 @@
 .method protected final d(Landroid/graphics/Matrix;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Ll:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LC:Lcom/facebook/drawee/drawable/r;
 
     if-eqz v0, :cond_0
 
@@ -154,7 +154,7 @@
 .method public draw(Landroid/graphics/Canvas;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_0
 
@@ -173,7 +173,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     const/4 v1, 0x0
 
@@ -181,7 +181,7 @@
 
     invoke-static {p1, v1, v1}, Lcom/facebook/drawee/drawable/e;->a(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lcom/facebook/drawee/drawable/r;)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/g;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/g;->LD:Lcom/facebook/drawee/drawable/d;
 
     invoke-static {p1, v1}, Lcom/facebook/drawee/drawable/e;->a(Landroid/graphics/drawable/Drawable;Lcom/facebook/drawee/drawable/d;)V
 
@@ -189,7 +189,7 @@
 
     invoke-static {p1, p0, p0}, Lcom/facebook/drawee/drawable/e;->a(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lcom/facebook/drawee/drawable/r;)V
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/g;->invalidateSelf()V
 
@@ -201,7 +201,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -224,7 +224,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     return-object v0
 .end method
@@ -244,7 +244,7 @@
 .method public getIntrinsicHeight()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -265,7 +265,7 @@
 .method public getIntrinsicWidth()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -286,7 +286,7 @@
 .method public getOpacity()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -305,7 +305,7 @@
 .method public getPadding(Landroid/graphics/Rect;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -334,7 +334,7 @@
 .method public isStateful()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -353,7 +353,7 @@
 .method public mutate()Landroid/graphics/drawable/Drawable;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_0
 
@@ -366,7 +366,7 @@
 .method protected onBoundsChange(Landroid/graphics/Rect;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_0
 
@@ -379,7 +379,7 @@
 .method protected onLevelChange(I)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -400,7 +400,7 @@
 .method protected onStateChange([I)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -429,11 +429,11 @@
 .method public setAlpha(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LD:Lcom/facebook/drawee/drawable/d;
 
     iput p1, v0, Lcom/facebook/drawee/drawable/d;->mAlpha:I
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_0
 
@@ -446,11 +446,11 @@
 .method public setColorFilter(Landroid/graphics/ColorFilter;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LD:Lcom/facebook/drawee/drawable/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/d;->setColorFilter(Landroid/graphics/ColorFilter;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_0
 
@@ -463,11 +463,11 @@
 .method public setDither(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LD:Lcom/facebook/drawee/drawable/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/d;->setDither(Z)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_0
 
@@ -480,11 +480,11 @@
 .method public setFilterBitmap(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LD:Lcom/facebook/drawee/drawable/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/d;->setFilterBitmap(Z)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_0
 
@@ -497,7 +497,7 @@
 .method public setHotspot(FF)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_0
 
@@ -514,7 +514,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/g;->LJ:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/g;->Mb:Landroid/graphics/drawable/Drawable;
 
     if-nez v1, :cond_0
 
diff --git a/com.discord/smali/com/facebook/drawee/drawable/j.smali b/com.discord/smali/com/facebook/drawee/drawable/j.smali
index b683434211..5dbb13d7ff 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/j.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/j.smali
@@ -10,14 +10,14 @@
 .method public abstract a([F)V
 .end method
 
-.method public abstract gN()V
+.method public abstract gR()V
 .end method
 
 .method public abstract k(F)V
 .end method
 
-.method public abstract x(Z)V
+.method public abstract v(Z)V
 .end method
 
-.method public abstract y(Z)V
+.method public abstract w(Z)V
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/drawable/k.smali b/com.discord/smali/com/facebook/drawee/drawable/k.smali
index 88eedc730c..c53f2576d4 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/k.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/k.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final LR:Landroid/graphics/Paint;
+.field private final Mj:Landroid/graphics/Paint;
 
-.field private LS:Ljava/lang/ref/WeakReference;
+.field private Mk:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -54,7 +54,7 @@
 
     invoke-direct {p1, v0}, Landroid/graphics/Paint;-><init>(I)V
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/k;->LR:Landroid/graphics/Paint;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/k;->Mj:Landroid/graphics/Paint;
 
     iput-object p2, p0, Lcom/facebook/drawee/drawable/k;->mBitmap:Landroid/graphics/Bitmap;
 
@@ -69,7 +69,7 @@
 
     invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setFlags(I)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/k;->LR:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/k;->Mj:Landroid/graphics/Paint;
 
     sget-object p2, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style;
 
@@ -85,7 +85,7 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->gO()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->gS()Z
 
     move-result v0
 
@@ -98,11 +98,11 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->gR()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->gV()V
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->gP()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->gT()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/k;->LS:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/k;->Mk:Ljava/lang/ref/WeakReference;
 
     if-eqz v0, :cond_1
 
@@ -121,7 +121,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/k;->LS:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/k;->Mk:Ljava/lang/ref/WeakReference;
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/k;->mPaint:Landroid/graphics/Paint;
 
@@ -137,10 +137,10 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->Mp:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->MH:Z
 
     :cond_2
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->Mp:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->MH:Z
 
     if-eqz v0, :cond_3
 
@@ -150,20 +150,20 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->MB:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->MT:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v1}, Landroid/graphics/Shader;->setLocalMatrix(Landroid/graphics/Matrix;)V
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->Mp:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->MH:Z
 
     :cond_3
     invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Mz:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->MR:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->concat(Landroid/graphics/Matrix;)V
 
@@ -173,7 +173,7 @@
 
     invoke-virtual {p1, v1, v2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/k;->LY:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/k;->Mp:F
 
     const/4 v2, 0x0
 
@@ -181,15 +181,15 @@
 
     if-lez v1, :cond_4
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->LR:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Mj:Landroid/graphics/Paint;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/k;->LY:F
+    iget v2, p0, Lcom/facebook/drawee/drawable/k;->Mp:F
 
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->LR:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Mj:Landroid/graphics/Paint;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/k;->LZ:I
+    iget v2, p0, Lcom/facebook/drawee/drawable/k;->Mq:I
 
     iget-object v3, p0, Lcom/facebook/drawee/drawable/k;->mPaint:Landroid/graphics/Paint;
 
@@ -203,9 +203,9 @@
 
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Mb:Landroid/graphics/Path;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Ms:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/k;->LR:Landroid/graphics/Paint;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/k;->Mj:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v1, v2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
@@ -217,10 +217,10 @@
     return-void
 .end method
 
-.method final gO()Z
+.method final gS()Z
     .locals 1
 
-    invoke-super {p0}, Lcom/facebook/drawee/drawable/n;->gO()Z
+    invoke-super {p0}, Lcom/facebook/drawee/drawable/n;->gS()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/facebook/drawee/drawable/l.smali b/com.discord/smali/com/facebook/drawee/drawable/l.smali
index 10228b7b79..b7390c8ace 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/l.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/l.smali
@@ -7,26 +7,26 @@
 
 
 # instance fields
-.field private final LU:[F
+.field private final Ml:[F
 
-.field final LV:[F
+.field final Mm:[F
 
-.field LW:[F
+.field Mn:[F
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private LX:Z
+.field private Mo:Z
 
-.field private LY:F
+.field private Mp:F
 
-.field private LZ:I
+.field private Mq:I
 
-.field private Ma:Z
+.field private Mr:Z
 
-.field final Mb:Landroid/graphics/Path;
+.field final Ms:Landroid/graphics/Path;
 
-.field private final Mc:Landroid/graphics/RectF;
+.field private final Mt:Landroid/graphics/RectF;
 
 .field private mAlpha:I
 
@@ -49,11 +49,11 @@
 
     new-array v1, v0, [F
 
-    iput-object v1, p0, Lcom/facebook/drawee/drawable/l;->LU:[F
+    iput-object v1, p0, Lcom/facebook/drawee/drawable/l;->Ml:[F
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/l;->LV:[F
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mm:[F
 
     new-instance v0, Landroid/graphics/Paint;
 
@@ -65,17 +65,17 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->LX:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Mo:Z
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/drawee/drawable/l;->LY:F
+    iput v1, p0, Lcom/facebook/drawee/drawable/l;->Mp:F
 
     iput v1, p0, Lcom/facebook/drawee/drawable/l;->mPadding:F
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/l;->LZ:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/l;->Mq:I
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Ma:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Mr:Z
 
     new-instance v1, Landroid/graphics/Path;
 
@@ -87,7 +87,7 @@
 
     invoke-direct {v1}, Landroid/graphics/Path;-><init>()V
 
-    iput-object v1, p0, Lcom/facebook/drawee/drawable/l;->Mb:Landroid/graphics/Path;
+    iput-object v1, p0, Lcom/facebook/drawee/drawable/l;->Ms:Landroid/graphics/Path;
 
     iput v0, p0, Lcom/facebook/drawee/drawable/l;->mColor:I
 
@@ -95,7 +95,7 @@
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     const/16 v0, 0xff
 
@@ -127,18 +127,18 @@
     return-object v0
 .end method
 
-.method private gP()V
+.method private gT()V
     .locals 7
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->mPath:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mb:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Ms:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->getBounds()Landroid/graphics/Rect;
 
@@ -146,9 +146,9 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/l;->LY:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/l;->Mp:F
 
     const/high16 v2, 0x40000000    # 2.0f
 
@@ -158,19 +158,19 @@
 
     invoke-virtual {v0, v3, v1}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->LX:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Mo:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
@@ -182,15 +182,15 @@
 
     div-float/2addr v0, v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Mb:Landroid/graphics/Path;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Ms:Landroid/graphics/Path;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->centerX()F
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->centerY()F
 
@@ -206,13 +206,13 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->LV:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Mm:[F
 
     array-length v4, v3
 
     if-ge v0, v4, :cond_1
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->LU:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Ml:[F
 
     aget v4, v4, v0
 
@@ -220,7 +220,7 @@
 
     add-float/2addr v4, v5
 
-    iget v5, p0, Lcom/facebook/drawee/drawable/l;->LY:F
+    iget v5, p0, Lcom/facebook/drawee/drawable/l;->Mp:F
 
     div-float/2addr v5, v2
 
@@ -233,18 +233,18 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mb:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Ms:Landroid/graphics/Path;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     sget-object v5, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
     invoke-virtual {v0, v4, v3, v5}, Landroid/graphics/Path;->addRoundRect(Landroid/graphics/RectF;[FLandroid/graphics/Path$Direction;)V
 
     :goto_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/l;->LY:F
+    iget v3, p0, Lcom/facebook/drawee/drawable/l;->Mp:F
 
     neg-float v4, v3
 
@@ -258,11 +258,11 @@
 
     iget v0, p0, Lcom/facebook/drawee/drawable/l;->mPadding:F
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/l;->Ma:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/l;->Mr:Z
 
     if-eqz v3, :cond_2
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/l;->LY:F
+    iget v3, p0, Lcom/facebook/drawee/drawable/l;->Mp:F
 
     goto :goto_2
 
@@ -272,21 +272,21 @@
     :goto_2
     add-float/2addr v0, v3
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     invoke-virtual {v3, v0, v0}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/l;->LX:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/l;->Mo:Z
 
     if-eqz v3, :cond_3
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->width()F
 
     move-result v1
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
@@ -300,13 +300,13 @@
 
     iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->mPath:Landroid/graphics/Path;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->centerX()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->centerY()F
 
@@ -319,11 +319,11 @@
     goto :goto_4
 
     :cond_3
-    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/l;->Ma:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/l;->Mr:Z
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->LW:[F
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->Mn:[F
 
     if-nez v2, :cond_4
 
@@ -331,21 +331,21 @@
 
     new-array v2, v2, [F
 
-    iput-object v2, p0, Lcom/facebook/drawee/drawable/l;->LW:[F
+    iput-object v2, p0, Lcom/facebook/drawee/drawable/l;->Mn:[F
 
     :cond_4
     :goto_3
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->LW:[F
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->Mn:[F
 
     array-length v3, v2
 
     if-ge v1, v3, :cond_5
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->LU:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Ml:[F
 
     aget v3, v3, v1
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/l;->LY:F
+    iget v4, p0, Lcom/facebook/drawee/drawable/l;->Mp:F
 
     sub-float/2addr v3, v4
 
@@ -358,7 +358,7 @@
     :cond_5
     iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->mPath:Landroid/graphics/Path;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     sget-object v4, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
@@ -369,16 +369,16 @@
     :cond_6
     iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->mPath:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->LU:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Ml:[F
 
     sget-object v4, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
     invoke-virtual {v1, v2, v3, v4}, Landroid/graphics/Path;->addRoundRect(Landroid/graphics/RectF;[FLandroid/graphics/Path$Direction;)V
 
     :goto_4
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->Mc:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->Mt:Landroid/graphics/RectF;
 
     neg-float v0, v0
 
@@ -392,24 +392,24 @@
 .method public final a(IF)V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/l;->LZ:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/l;->Mq:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/l;->LZ:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/l;->Mq:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
     :cond_0
-    iget p1, p0, Lcom/facebook/drawee/drawable/l;->LY:F
+    iget p1, p0, Lcom/facebook/drawee/drawable/l;->Mp:F
 
     cmpl-float p1, p1, p2
 
     if-eqz p1, :cond_1
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/l;->LY:F
+    iput p2, p0, Lcom/facebook/drawee/drawable/l;->Mp:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gT()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -422,7 +422,7 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/l;->LU:[F
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/l;->Ml:[F
 
     const/4 v0, 0x0
 
@@ -451,12 +451,12 @@
 
     invoke-static {v0, v3}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->LU:[F
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Ml:[F
 
     invoke-static {p1, v2, v0, v2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :goto_1
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gT()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -490,7 +490,7 @@
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/l;->LY:F
+    iget v0, p0, Lcom/facebook/drawee/drawable/l;->Mp:F
 
     const/4 v1, 0x0
 
@@ -500,7 +500,7 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->mPaint:Landroid/graphics/Paint;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/l;->LZ:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/l;->Mq:I
 
     iget v2, p0, Lcom/facebook/drawee/drawable/l;->mAlpha:I
 
@@ -518,11 +518,11 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->mPaint:Landroid/graphics/Paint;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/l;->LY:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/l;->Mp:F
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Mb:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Ms:Landroid/graphics/Path;
 
     iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->mPaint:Landroid/graphics/Paint;
 
@@ -532,7 +532,7 @@
     return-void
 .end method
 
-.method public final gN()V
+.method public final gR()V
     .locals 2
 
     const/4 v0, 0x1
@@ -541,13 +541,13 @@
 
     invoke-static {v0, v1}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->LU:[F
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Ml:[F
 
     const/4 v1, 0x0
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([FF)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gT()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -607,7 +607,7 @@
 
     iput p1, p0, Lcom/facebook/drawee/drawable/l;->mPadding:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gT()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -620,7 +620,7 @@
 
     invoke-super {p0, p1}, Landroid/graphics/drawable/Drawable;->onBoundsChange(Landroid/graphics/Rect;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gT()V
 
     return-void
 .end method
@@ -646,28 +646,28 @@
     return-void
 .end method
 
-.method public final x(Z)V
+.method public final v(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->LX:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->Mo:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gT()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
     return-void
 .end method
 
-.method public final y(Z)V
+.method public final w(Z)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Ma:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Mr:Z
 
     if-eq v0, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->Ma:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->Mr:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->gT()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
diff --git a/com.discord/smali/com/facebook/drawee/drawable/m.smali b/com.discord/smali/com/facebook/drawee/drawable/m.smali
index b23a457eda..c96b256d8a 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/m.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/m.smali
@@ -15,37 +15,37 @@
 
 
 # instance fields
-.field private final LU:[F
+.field private final Ml:[F
 
-.field final LV:[F
+.field final Mm:[F
 
-.field private LX:Z
+.field private Mo:Z
 
-.field private LY:F
+.field private Mp:F
 
-.field private LZ:I
+.field private Mq:I
 
-.field private Ma:Z
+.field private Mr:Z
 
-.field private final Mb:Landroid/graphics/Path;
+.field private final Ms:Landroid/graphics/Path;
 
-.field Md:I
+.field Mu:I
 
-.field private final Me:Landroid/graphics/RectF;
+.field private final Mv:Landroid/graphics/RectF;
 
-.field private Mf:Landroid/graphics/RectF;
+.field private Mw:Landroid/graphics/RectF;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Mg:Landroid/graphics/Matrix;
+.field private Mx:Landroid/graphics/Matrix;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Mh:I
+.field private My:I
 
-.field private final Mi:Landroid/graphics/RectF;
+.field private final Mz:Landroid/graphics/RectF;
 
 .field private mPadding:F
 
@@ -66,25 +66,25 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/drawable/g;-><init>(Landroid/graphics/drawable/Drawable;)V
 
-    sget p1, Lcom/facebook/drawee/drawable/m$a;->Mk:I
+    sget p1, Lcom/facebook/drawee/drawable/m$a;->MB:I
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/m;->Md:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->Mu:I
 
     new-instance p1, Landroid/graphics/RectF;
 
     invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     const/16 p1, 0x8
 
     new-array v0, p1, [F
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->LU:[F
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->Ml:[F
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->LV:[F
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->Mm:[F
 
     new-instance p1, Landroid/graphics/Paint;
 
@@ -96,19 +96,19 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->LX:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Mo:Z
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/m;->LY:F
+    iput v0, p0, Lcom/facebook/drawee/drawable/m;->Mp:F
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/m;->LZ:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->Mq:I
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/m;->Mh:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->My:I
 
     iput v0, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Ma:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Mr:Z
 
     new-instance p1, Landroid/graphics/Path;
 
@@ -120,29 +120,29 @@
 
     invoke-direct {p1}, Landroid/graphics/Path;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->Mb:Landroid/graphics/Path;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->Ms:Landroid/graphics/Path;
 
     new-instance p1, Landroid/graphics/RectF;
 
     invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     return-void
 .end method
 
-.method private gP()V
+.method private gT()V
     .locals 6
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPath:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mb:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Ms:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->getBounds()Landroid/graphics/Rect;
 
@@ -150,7 +150,7 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     iget v1, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
 
@@ -158,13 +158,13 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPath:Landroid/graphics/Path;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     sget-object v2, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
     invoke-virtual {v0, v1, v2}, Landroid/graphics/Path;->addRect(Landroid/graphics/RectF;Landroid/graphics/Path$Direction;)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->LX:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->Mo:Z
 
     const/high16 v1, 0x40000000    # 2.0f
 
@@ -172,25 +172,25 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPath:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->centerX()F
 
     move-result v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->centerY()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->width()F
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->height()F
 
@@ -211,16 +211,16 @@
     :cond_0
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPath:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->LU:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Ml:[F
 
     sget-object v4, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
     invoke-virtual {v0, v2, v3, v4}, Landroid/graphics/Path;->addRoundRect(Landroid/graphics/RectF;[FLandroid/graphics/Path$Direction;)V
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     iget v2, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
 
@@ -230,9 +230,9 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/m;->LY:F
+    iget v2, p0, Lcom/facebook/drawee/drawable/m;->Mp:F
 
     div-float v3, v2, v1
 
@@ -240,17 +240,17 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->LX:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->Mo:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->height()F
 
@@ -262,15 +262,15 @@
 
     div-float/2addr v0, v1
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mb:Landroid/graphics/Path;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Ms:Landroid/graphics/Path;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->centerX()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->centerY()F
 
@@ -286,13 +286,13 @@
     const/4 v0, 0x0
 
     :goto_1
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->LV:[F
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mm:[F
 
     array-length v3, v2
 
     if-ge v0, v3, :cond_2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->LU:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Ml:[F
 
     aget v3, v3, v0
 
@@ -300,7 +300,7 @@
 
     add-float/2addr v3, v4
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/m;->LY:F
+    iget v4, p0, Lcom/facebook/drawee/drawable/m;->Mp:F
 
     div-float/2addr v4, v1
 
@@ -313,18 +313,18 @@
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mb:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Ms:Landroid/graphics/Path;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
     sget-object v4, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
     invoke-virtual {v0, v3, v2, v4}, Landroid/graphics/Path;->addRoundRect(Landroid/graphics/RectF;[FLandroid/graphics/Path$Direction;)V
 
     :goto_2
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mz:Landroid/graphics/RectF;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/m;->LY:F
+    iget v2, p0, Lcom/facebook/drawee/drawable/m;->Mp:F
 
     neg-float v3, v2
 
@@ -344,7 +344,7 @@
 .method public final R(I)V
     .locals 0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/m;->Mh:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->My:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -354,11 +354,11 @@
 .method public final a(IF)V
     .locals 0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/m;->LZ:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->Mq:I
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/m;->LY:F
+    iput p2, p0, Lcom/facebook/drawee/drawable/m;->Mp:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gT()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -370,7 +370,7 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/m;->LU:[F
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/m;->Ml:[F
 
     const/4 v0, 0x0
 
@@ -399,12 +399,12 @@
 
     invoke-static {v0, v3}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->LU:[F
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Ml:[F
 
     invoke-static {p1, v2, v0, v2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :goto_1
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gT()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -414,7 +414,7 @@
 .method public final draw(Landroid/graphics/Canvas;)V
     .locals 10
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->getBounds()Landroid/graphics/Rect;
 
@@ -422,9 +422,9 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V
 
-    sget-object v0, Lcom/facebook/drawee/drawable/m$1;->Mj:[I
+    sget-object v0, Lcom/facebook/drawee/drawable/m$1;->MA:[I
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/m;->Md:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->Mu:I
 
     const/4 v2, 0x1
 
@@ -441,47 +441,47 @@
     goto/16 :goto_2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->Ma:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->Mr:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mf:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mw:Landroid/graphics/RectF;
 
     if-nez v0, :cond_1
 
     new-instance v0, Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     invoke-direct {v0, v1}, Landroid/graphics/RectF;-><init>(Landroid/graphics/RectF;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mf:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mw:Landroid/graphics/RectF;
 
     new-instance v0, Landroid/graphics/Matrix;
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mg:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mx:Landroid/graphics/Matrix;
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mf:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mw:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/m;->LY:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->Mp:F
 
     invoke-virtual {v0, v1, v1}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mg:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mx:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mf:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mw:Landroid/graphics/RectF;
 
     sget-object v3, Landroid/graphics/Matrix$ScaleToFit;->FILL:Landroid/graphics/Matrix$ScaleToFit;
 
@@ -491,11 +491,11 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->clipRect(Landroid/graphics/RectF;)Z
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->Mg:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->Mx:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->concat(Landroid/graphics/Matrix;)V
 
@@ -517,7 +517,7 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPaint:Landroid/graphics/Paint;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/m;->Mh:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->My:I
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setColor(I)V
 
@@ -539,17 +539,17 @@
 
     invoke-virtual {p1, v0, v2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->LX:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->Mo:Z
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->height()F
 
@@ -557,7 +557,7 @@
 
     sub-float/2addr v0, v2
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/m;->LY:F
+    iget v2, p0, Lcom/facebook/drawee/drawable/m;->Mp:F
 
     add-float/2addr v0, v2
 
@@ -565,13 +565,13 @@
 
     div-float/2addr v0, v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->width()F
 
@@ -579,7 +579,7 @@
 
     sub-float/2addr v3, v4
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/m;->LY:F
+    iget v4, p0, Lcom/facebook/drawee/drawable/m;->Mp:F
 
     add-float/2addr v3, v4
 
@@ -589,21 +589,21 @@
 
     if-lez v2, :cond_3
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v5, v2, Landroid/graphics/RectF;->left:F
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v6, v2, Landroid/graphics/RectF;->top:F
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v2, v2, Landroid/graphics/RectF;->left:F
 
     add-float v7, v2, v0
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v8, v2, Landroid/graphics/RectF;->bottom:F
 
@@ -613,21 +613,21 @@
 
     invoke-virtual/range {v4 .. v9}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v2, v2, Landroid/graphics/RectF;->right:F
 
     sub-float v5, v2, v0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v6, v0, Landroid/graphics/RectF;->top:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v7, v0, Landroid/graphics/RectF;->right:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v8, v0, Landroid/graphics/RectF;->bottom:F
 
@@ -640,19 +640,19 @@
 
     if-lez v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v5, v0, Landroid/graphics/RectF;->left:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v6, v0, Landroid/graphics/RectF;->top:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v7, v0, Landroid/graphics/RectF;->right:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->top:F
 
@@ -664,21 +664,21 @@
 
     invoke-virtual/range {v4 .. v9}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v5, v0, Landroid/graphics/RectF;->left:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->bottom:F
 
     sub-float v6, v0, v3
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v7, v0, Landroid/graphics/RectF;->right:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Me:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mv:Landroid/graphics/RectF;
 
     iget v8, v0, Landroid/graphics/RectF;->bottom:F
 
@@ -709,7 +709,7 @@
 
     :cond_5
     :goto_2
-    iget v0, p0, Lcom/facebook/drawee/drawable/m;->LZ:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/m;->Mq:I
 
     if-eqz v0, :cond_6
 
@@ -721,13 +721,13 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPaint:Landroid/graphics/Paint;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/m;->LZ:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->Mq:I
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setColor(I)V
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPaint:Landroid/graphics/Paint;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/m;->LY:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->Mp:F
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
@@ -737,7 +737,7 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/Path;->setFillType(Landroid/graphics/Path$FillType;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Mb:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Ms:Landroid/graphics/Path;
 
     iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->mPaint:Landroid/graphics/Paint;
 
@@ -747,16 +747,16 @@
     return-void
 .end method
 
-.method public final gN()V
+.method public final gR()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->LU:[F
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Ml:[F
 
     const/4 v1, 0x0
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([FF)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gT()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -768,7 +768,7 @@
 
     iput p1, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gT()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -780,29 +780,29 @@
 
     invoke-super {p0, p1}, Lcom/facebook/drawee/drawable/g;->onBoundsChange(Landroid/graphics/Rect;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gT()V
 
     return-void
 .end method
 
-.method public final x(Z)V
+.method public final v(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->LX:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Mo:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gT()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
     return-void
 .end method
 
-.method public final y(Z)V
+.method public final w(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Ma:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Mr:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->gT()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
diff --git a/com.discord/smali/com/facebook/drawee/drawable/n.smali b/com.discord/smali/com/facebook/drawee/drawable/n.smali
index 61ce1f8c7b..3cbdb0d866 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/n.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/n.smali
@@ -8,57 +8,57 @@
 
 
 # instance fields
-.field final LV:[F
+.field private LC:Lcom/facebook/drawee/drawable/r;
 
-.field LW:[F
+.field private final MF:Landroid/graphics/drawable/Drawable;
 
-.field protected LX:Z
+.field protected MG:Z
 
-.field protected LY:F
+.field protected MH:Z
 
-.field protected LZ:I
+.field private final MI:[F
 
-.field private Ll:Lcom/facebook/drawee/drawable/r;
+.field final MJ:Landroid/graphics/RectF;
 
-.field MA:Landroid/graphics/Matrix;
+.field final MK:Landroid/graphics/RectF;
 
-.field final MB:Landroid/graphics/Matrix;
+.field final ML:Landroid/graphics/RectF;
 
-.field private MC:Z
+.field final MM:Landroid/graphics/RectF;
 
-.field private Ma:Z
+.field final MN:Landroid/graphics/Matrix;
 
-.field protected final Mb:Landroid/graphics/Path;
+.field final MO:Landroid/graphics/Matrix;
 
-.field Mf:Landroid/graphics/RectF;
+.field final MP:Landroid/graphics/Matrix;
 
-.field Mg:Landroid/graphics/Matrix;
+.field final MQ:Landroid/graphics/Matrix;
 
-.field private final Mn:Landroid/graphics/drawable/Drawable;
+.field final MR:Landroid/graphics/Matrix;
+
+.field MS:Landroid/graphics/Matrix;
+
+.field final MT:Landroid/graphics/Matrix;
+
+.field private MU:Z
+
+.field final Mm:[F
+
+.field Mn:[F
 
 .field protected Mo:Z
 
-.field protected Mp:Z
+.field protected Mp:F
 
-.field private final Mq:[F
+.field protected Mq:I
 
-.field final Mr:Landroid/graphics/RectF;
+.field private Mr:Z
 
-.field final Ms:Landroid/graphics/RectF;
+.field protected final Ms:Landroid/graphics/Path;
 
-.field final Mt:Landroid/graphics/RectF;
+.field Mw:Landroid/graphics/RectF;
 
-.field final Mu:Landroid/graphics/RectF;
-
-.field final Mv:Landroid/graphics/Matrix;
-
-.field final Mw:Landroid/graphics/Matrix;
-
-.field final Mx:Landroid/graphics/Matrix;
-
-.field final My:Landroid/graphics/Matrix;
-
-.field final Mz:Landroid/graphics/Matrix;
+.field Mx:Landroid/graphics/Matrix;
 
 .field private mPadding:F
 
@@ -73,13 +73,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->LX:Z
-
     iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Mo:Z
 
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->MG:Z
+
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/drawee/drawable/n;->LY:F
+    iput v1, p0, Lcom/facebook/drawee/drawable/n;->Mp:F
 
     new-instance v2, Landroid/graphics/Path;
 
@@ -89,93 +89,93 @@
 
     const/4 v2, 0x1
 
-    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->Mp:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->MH:Z
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/n;->LZ:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/n;->Mq:I
 
     new-instance v3, Landroid/graphics/Path;
 
     invoke-direct {v3}, Landroid/graphics/Path;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mb:Landroid/graphics/Path;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Ms:Landroid/graphics/Path;
 
     const/16 v3, 0x8
 
     new-array v4, v3, [F
 
-    iput-object v4, p0, Lcom/facebook/drawee/drawable/n;->Mq:[F
+    iput-object v4, p0, Lcom/facebook/drawee/drawable/n;->MI:[F
 
     new-array v3, v3, [F
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->LV:[F
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mm:[F
 
     new-instance v3, Landroid/graphics/RectF;
 
     invoke-direct {v3}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     new-instance v3, Landroid/graphics/RectF;
 
     invoke-direct {v3}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Ms:Landroid/graphics/RectF;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->MK:Landroid/graphics/RectF;
 
     new-instance v3, Landroid/graphics/RectF;
 
     invoke-direct {v3}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mt:Landroid/graphics/RectF;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->ML:Landroid/graphics/RectF;
 
     new-instance v3, Landroid/graphics/RectF;
 
     invoke-direct {v3}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mu:Landroid/graphics/RectF;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->MM:Landroid/graphics/RectF;
 
     new-instance v3, Landroid/graphics/Matrix;
 
     invoke-direct {v3}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mv:Landroid/graphics/Matrix;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->MN:Landroid/graphics/Matrix;
 
     new-instance v3, Landroid/graphics/Matrix;
 
     invoke-direct {v3}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mw:Landroid/graphics/Matrix;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->MO:Landroid/graphics/Matrix;
 
     new-instance v3, Landroid/graphics/Matrix;
 
     invoke-direct {v3}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->MP:Landroid/graphics/Matrix;
 
     new-instance v3, Landroid/graphics/Matrix;
 
     invoke-direct {v3}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->My:Landroid/graphics/Matrix;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->MQ:Landroid/graphics/Matrix;
 
     new-instance v3, Landroid/graphics/Matrix;
 
     invoke-direct {v3}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mz:Landroid/graphics/Matrix;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->MR:Landroid/graphics/Matrix;
 
     new-instance v3, Landroid/graphics/Matrix;
 
     invoke-direct {v3}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->MB:Landroid/graphics/Matrix;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->MT:Landroid/graphics/Matrix;
 
     iput v1, p0, Lcom/facebook/drawee/drawable/n;->mPadding:F
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Ma:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Mr:Z
 
-    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->MC:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->MU:Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/n;->Mn:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/n;->MF:Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
@@ -185,24 +185,24 @@
 .method public final a(IF)V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/n;->LZ:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/n;->Mq:I
 
     if-ne v0, p1, :cond_0
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/n;->LY:F
+    iget v0, p0, Lcom/facebook/drawee/drawable/n;->Mp:F
 
     cmpl-float v0, v0, p2
 
     if-eqz v0, :cond_1
 
     :cond_0
-    iput p1, p0, Lcom/facebook/drawee/drawable/n;->LZ:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/n;->Mq:I
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/n;->LY:F
+    iput p2, p0, Lcom/facebook/drawee/drawable/n;->Mp:F
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->MC:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->MU:Z
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
 
@@ -213,7 +213,7 @@
 .method public final a(Lcom/facebook/drawee/drawable/r;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/n;->Ll:Lcom/facebook/drawee/drawable/r;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/n;->LC:Lcom/facebook/drawee/drawable/r;
 
     return-void
 .end method
@@ -229,11 +229,11 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/n;->Mq:[F
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/n;->MI:[F
 
     invoke-static {p1, v0}, Ljava/util/Arrays;->fill([FF)V
 
-    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->Mo:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->MG:Z
 
     goto :goto_3
 
@@ -256,18 +256,18 @@
 
     invoke-static {v3, v5}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mq:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->MI:[F
 
     invoke-static {p1, v2, v3, v2, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->Mo:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->MG:Z
 
     const/4 v3, 0x0
 
     :goto_1
     if-ge v3, v4, :cond_3
 
-    iget-boolean v5, p0, Lcom/facebook/drawee/drawable/n;->Mo:Z
+    iget-boolean v5, p0, Lcom/facebook/drawee/drawable/n;->MG:Z
 
     aget v6, p1, v3
 
@@ -285,7 +285,7 @@
     :goto_2
     or-int/2addr v5, v6
 
-    iput-boolean v5, p0, Lcom/facebook/drawee/drawable/n;->Mo:Z
+    iput-boolean v5, p0, Lcom/facebook/drawee/drawable/n;->MG:Z
 
     add-int/lit8 v3, v3, 0x1
 
@@ -293,7 +293,7 @@
 
     :cond_3
     :goto_3
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->MC:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->MU:Z
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
 
@@ -303,7 +303,7 @@
 .method public clearColorFilter()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mn:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->clearColorFilter()V
 
@@ -315,7 +315,7 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mn:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
@@ -324,14 +324,14 @@
     return-void
 .end method
 
-.method public final gN()V
+.method public final gR()V
     .locals 3
 
     const/4 v0, 0x1
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Mq:[F
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->MI:[F
 
     const/4 v2, 0x0
 
@@ -339,27 +339,27 @@
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->Mo:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->MG:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->MC:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->MU:Z
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
 
     return-void
 .end method
 
-.method gO()Z
+.method gS()Z
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->LX:Z
-
-    if-nez v0, :cond_1
-
     iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Mo:Z
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/n;->LY:F
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->MG:Z
+
+    if-nez v0, :cond_1
+
+    iget v0, p0, Lcom/facebook/drawee/drawable/n;->Mp:F
 
     const/4 v1, 0x0
 
@@ -381,20 +381,20 @@
     return v0
 .end method
 
-.method protected final gP()V
+.method protected final gT()V
     .locals 8
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->MC:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->MU:Z
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mb:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ms:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/n;->LY:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/n;->Mp:F
 
     const/high16 v2, 0x40000000    # 2.0f
 
@@ -404,19 +404,19 @@
 
     invoke-virtual {v0, v3, v1}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->LX:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Mo:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
@@ -428,15 +428,15 @@
 
     div-float/2addr v0, v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mb:Landroid/graphics/Path;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Ms:Landroid/graphics/Path;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->centerX()F
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->centerY()F
 
@@ -452,13 +452,13 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->LV:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mm:[F
 
     array-length v4, v3
 
     if-ge v0, v4, :cond_1
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->Mq:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->MI:[F
 
     aget v4, v4, v0
 
@@ -466,7 +466,7 @@
 
     add-float/2addr v4, v5
 
-    iget v5, p0, Lcom/facebook/drawee/drawable/n;->LY:F
+    iget v5, p0, Lcom/facebook/drawee/drawable/n;->Mp:F
 
     div-float/2addr v5, v2
 
@@ -479,18 +479,18 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mb:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ms:Landroid/graphics/Path;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     sget-object v5, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
     invoke-virtual {v0, v4, v3, v5}, Landroid/graphics/Path;->addRoundRect(Landroid/graphics/RectF;[FLandroid/graphics/Path$Direction;)V
 
     :goto_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/n;->LY:F
+    iget v3, p0, Lcom/facebook/drawee/drawable/n;->Mp:F
 
     neg-float v4, v3
 
@@ -508,11 +508,11 @@
 
     iget v0, p0, Lcom/facebook/drawee/drawable/n;->mPadding:F
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/n;->Ma:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/n;->Mr:Z
 
     if-eqz v3, :cond_2
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/n;->LY:F
+    iget v3, p0, Lcom/facebook/drawee/drawable/n;->Mp:F
 
     goto :goto_2
 
@@ -522,35 +522,35 @@
     :goto_2
     add-float/2addr v0, v3
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-virtual {v3, v0, v0}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/n;->LX:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/n;->Mo:Z
 
     if-eqz v3, :cond_3
 
     iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->mPath:Landroid/graphics/Path;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->centerX()F
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->centerY()F
 
     move-result v5
 
-    iget-object v6, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-virtual {v6}, Landroid/graphics/RectF;->width()F
 
     move-result v6
 
-    iget-object v7, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v7, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-virtual {v7}, Landroid/graphics/RectF;->height()F
 
@@ -569,11 +569,11 @@
     goto :goto_4
 
     :cond_3
-    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->Ma:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->Mr:Z
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->LW:[F
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mn:[F
 
     if-nez v2, :cond_4
 
@@ -581,25 +581,25 @@
 
     new-array v2, v2, [F
 
-    iput-object v2, p0, Lcom/facebook/drawee/drawable/n;->LW:[F
+    iput-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mn:[F
 
     :cond_4
     const/4 v2, 0x0
 
     :goto_3
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->LV:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mm:[F
 
     array-length v3, v3
 
     if-ge v2, v3, :cond_5
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->LW:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mn:[F
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->Mq:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->MI:[F
 
     aget v4, v4, v2
 
-    iget v5, p0, Lcom/facebook/drawee/drawable/n;->LY:F
+    iget v5, p0, Lcom/facebook/drawee/drawable/n;->Mp:F
 
     sub-float/2addr v4, v5
 
@@ -612,9 +612,9 @@
     :cond_5
     iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->mPath:Landroid/graphics/Path;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->LW:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->Mn:[F
 
     sget-object v5, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
@@ -625,16 +625,16 @@
     :cond_6
     iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->mPath:Landroid/graphics/Path;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->Mq:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->MI:[F
 
     sget-object v5, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
     invoke-virtual {v2, v3, v4, v5}, Landroid/graphics/Path;->addRoundRect(Landroid/graphics/RectF;[FLandroid/graphics/Path$Direction;)V
 
     :goto_4
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     neg-float v0, v0
 
@@ -646,37 +646,37 @@
 
     invoke-virtual {v0, v2}, Landroid/graphics/Path;->setFillType(Landroid/graphics/Path$FillType;)V
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->MC:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->MU:Z
 
     :cond_7
     return-void
 .end method
 
-.method protected final gR()V
+.method protected final gV()V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ll:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->LC:Lcom/facebook/drawee/drawable/r;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->MP:Landroid/graphics/Matrix;
 
     invoke-interface {v0, v1}, Lcom/facebook/drawee/drawable/r;->c(Landroid/graphics/Matrix;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ll:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->LC:Lcom/facebook/drawee/drawable/r;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-interface {v0, v1}, Lcom/facebook/drawee/drawable/r;->a(Landroid/graphics/RectF;)V
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MP:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->getBounds()Landroid/graphics/Rect;
 
@@ -685,7 +685,7 @@
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mt:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->ML:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->getIntrinsicWidth()I
 
@@ -703,9 +703,9 @@
 
     invoke-virtual {v0, v3, v3, v1, v2}, Landroid/graphics/RectF;->set(FFFF)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mu:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MM:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Mn:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->MF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v1}, Landroid/graphics/drawable/Drawable;->getBounds()Landroid/graphics/Rect;
 
@@ -713,47 +713,47 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mv:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MN:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Mt:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->ML:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mu:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->MM:Landroid/graphics/RectF;
 
     sget-object v3, Landroid/graphics/Matrix$ScaleToFit;->FILL:Landroid/graphics/Matrix$ScaleToFit;
 
     invoke-virtual {v0, v1, v2, v3}, Landroid/graphics/Matrix;->setRectToRect(Landroid/graphics/RectF;Landroid/graphics/RectF;Landroid/graphics/Matrix$ScaleToFit;)Z
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Ma:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Mr:Z
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mf:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mw:Landroid/graphics/RectF;
 
     if-nez v0, :cond_1
 
     new-instance v0, Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-direct {v0, v1}, Landroid/graphics/RectF;-><init>(Landroid/graphics/RectF;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mf:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mw:Landroid/graphics/RectF;
 
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
     :goto_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mf:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mw:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/n;->LY:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/n;->Mp:F
 
     invoke-virtual {v0, v1, v1}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mg:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
 
     if-nez v0, :cond_2
 
@@ -761,14 +761,14 @@
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mg:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mg:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mf:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mw:Landroid/graphics/RectF;
 
     sget-object v3, Landroid/graphics/Matrix$ScaleToFit;->FILL:Landroid/graphics/Matrix$ScaleToFit;
 
@@ -777,7 +777,7 @@
     goto :goto_2
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mg:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_4
 
@@ -785,9 +785,9 @@
 
     :cond_4
     :goto_2
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MP:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->My:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->MQ:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v1}, Landroid/graphics/Matrix;->equals(Ljava/lang/Object;)Z
 
@@ -797,9 +797,9 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mv:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MN:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mw:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->MO:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->equals(Ljava/lang/Object;)Z
 
@@ -807,11 +807,11 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mg:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_9
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->MA:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->MS:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->equals(Ljava/lang/Object;)Z
 
@@ -820,76 +820,76 @@
     if-nez v0, :cond_9
 
     :cond_5
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->Mp:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->MH:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MP:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mz:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->MR:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->invert(Landroid/graphics/Matrix;)Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MB:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MT:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->MP:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Ma:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Mr:Z
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MB:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MT:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mg:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->postConcat(Landroid/graphics/Matrix;)Z
 
     :cond_6
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MB:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MT:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mv:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->MN:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->My:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MQ:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->MP:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mw:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MO:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mv:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->MN:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Ma:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Mr:Z
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MA:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MS:Landroid/graphics/Matrix;
 
     if-nez v0, :cond_7
 
     new-instance v0, Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mg:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
 
     invoke-direct {v0, v2}, Landroid/graphics/Matrix;-><init>(Landroid/graphics/Matrix;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->MA:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->MS:Landroid/graphics/Matrix;
 
     goto :goto_3
 
     :cond_7
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mg:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Mx:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
     goto :goto_3
 
     :cond_8
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MA:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MS:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_9
 
@@ -897,9 +897,9 @@
 
     :cond_9
     :goto_3
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Ms:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->MK:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v2}, Landroid/graphics/RectF;->equals(Ljava/lang/Object;)Z
 
@@ -907,11 +907,11 @@
 
     if-nez v0, :cond_a
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->MC:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->MU:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ms:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MK:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Mr:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->MJ:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
@@ -922,7 +922,7 @@
 .method public getAlpha()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mn:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getAlpha()I
 
@@ -934,7 +934,7 @@
 .method public getColorFilter()Landroid/graphics/ColorFilter;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mn:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getColorFilter()Landroid/graphics/ColorFilter;
 
@@ -946,7 +946,7 @@
 .method public getIntrinsicHeight()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mn:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
 
@@ -958,7 +958,7 @@
 .method public getIntrinsicWidth()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mn:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicWidth()I
 
@@ -970,7 +970,7 @@
 .method public getOpacity()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mn:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getOpacity()I
 
@@ -992,7 +992,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->MC:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->MU:Z
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
 
@@ -1003,7 +1003,7 @@
 .method protected onBoundsChange(Landroid/graphics/Rect;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mn:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
 
@@ -1013,7 +1013,7 @@
 .method public setAlpha(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mn:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setAlpha(I)V
 
@@ -1023,7 +1023,7 @@
 .method public setColorFilter(ILandroid/graphics/PorterDuff$Mode;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mn:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1, p2}, Landroid/graphics/drawable/Drawable;->setColorFilter(ILandroid/graphics/PorterDuff$Mode;)V
 
@@ -1033,39 +1033,39 @@
 .method public setColorFilter(Landroid/graphics/ColorFilter;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Mn:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setColorFilter(Landroid/graphics/ColorFilter;)V
 
     return-void
 .end method
 
-.method public final x(Z)V
+.method public final v(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->LX:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Mo:Z
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->MC:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->MU:Z
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
 
     return-void
 .end method
 
-.method public final y(Z)V
+.method public final w(Z)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Ma:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Mr:Z
 
     if-eq v0, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Ma:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Mr:Z
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->MC:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->MU:Z
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
 
diff --git a/com.discord/smali/com/facebook/drawee/drawable/p.smali b/com.discord/smali/com/facebook/drawee/drawable/p.smali
index 2918c89762..881d76abf8 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/p.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/p.smali
@@ -4,21 +4,21 @@
 
 
 # instance fields
-.field public KX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public Lo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field LL:Landroid/graphics/Matrix;
+.field MV:Ljava/lang/Object;
 
-.field LM:I
-
-.field LN:I
-
-.field MD:Ljava/lang/Object;
-
-.field ME:Landroid/graphics/PointF;
+.field MW:Landroid/graphics/PointF;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
+.field Md:Landroid/graphics/Matrix;
+
+.field Me:I
+
+.field Mf:I
+
 .field private mTempMatrix:Landroid/graphics/Matrix;
 
 
@@ -36,13 +36,13 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->ME:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->MW:Landroid/graphics/PointF;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/p;->LM:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/p;->Me:I
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/p;->LN:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/p;->Mf:I
 
     new-instance p1, Landroid/graphics/Matrix;
 
@@ -50,12 +50,12 @@
 
     iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->mTempMatrix:Landroid/graphics/Matrix;
 
-    iput-object p2, p0, Lcom/facebook/drawee/drawable/p;->KX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object p2, p0, Lcom/facebook/drawee/drawable/p;->Lo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
 
-.method private gM()V
+.method private gQ()V
     .locals 8
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->getCurrent()Landroid/graphics/drawable/Drawable;
@@ -78,13 +78,13 @@
 
     move-result v4
 
-    iput v4, p0, Lcom/facebook/drawee/drawable/p;->LM:I
+    iput v4, p0, Lcom/facebook/drawee/drawable/p;->Me:I
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
 
     move-result v5
 
-    iput v5, p0, Lcom/facebook/drawee/drawable/p;->LN:I
+    iput v5, p0, Lcom/facebook/drawee/drawable/p;->Mf:I
 
     const/4 v6, 0x0
 
@@ -101,20 +101,20 @@
 
     invoke-virtual {v0, v3}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
 
-    iput-object v6, p0, Lcom/facebook/drawee/drawable/p;->LL:Landroid/graphics/Matrix;
+    iput-object v6, p0, Lcom/facebook/drawee/drawable/p;->Md:Landroid/graphics/Matrix;
 
     return-void
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->KX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->Lo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v2, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MF:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v2, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     if-ne v1, v2, :cond_2
 
     invoke-virtual {v0, v3}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
 
-    iput-object v6, p0, Lcom/facebook/drawee/drawable/p;->LL:Landroid/graphics/Matrix;
+    iput-object v6, p0, Lcom/facebook/drawee/drawable/p;->Md:Landroid/graphics/Matrix;
 
     return-void
 
@@ -123,11 +123,11 @@
 
     invoke-virtual {v0, v1, v1, v4, v5}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->KX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->Lo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     iget-object v2, p0, Lcom/facebook/drawee/drawable/p;->mTempMatrix:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->ME:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->MW:Landroid/graphics/PointF;
 
     const/high16 v6, 0x3f000000    # 0.5f
 
@@ -141,7 +141,7 @@
     const/high16 v0, 0x3f000000    # 0.5f
 
     :goto_0
-    iget-object v7, p0, Lcom/facebook/drawee/drawable/p;->ME:Landroid/graphics/PointF;
+    iget-object v7, p0, Lcom/facebook/drawee/drawable/p;->MW:Landroid/graphics/PointF;
 
     if-eqz v7, :cond_4
 
@@ -161,7 +161,7 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->mTempMatrix:Landroid/graphics/Matrix;
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->LL:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->Md:Landroid/graphics/Matrix;
 
     return-void
 
@@ -169,15 +169,15 @@
     :goto_2
     invoke-virtual {v0, v3}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
 
-    iput-object v6, p0, Lcom/facebook/drawee/drawable/p;->LL:Landroid/graphics/Matrix;
+    iput-object v6, p0, Lcom/facebook/drawee/drawable/p;->Md:Landroid/graphics/Matrix;
 
     return-void
 .end method
 
-.method private gS()V
+.method private gW()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->KX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Lo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     instance-of v1, v0, Lcom/facebook/drawee/drawable/ScalingUtils$k;
 
@@ -195,7 +195,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->MD:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->MV:Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -215,7 +215,7 @@
     const/4 v1, 0x1
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->MD:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->MV:Ljava/lang/Object;
 
     goto :goto_2
 
@@ -223,7 +223,7 @@
     const/4 v1, 0x0
 
     :goto_2
-    iget v0, p0, Lcom/facebook/drawee/drawable/p;->LM:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/p;->Me:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->getCurrent()Landroid/graphics/drawable/Drawable;
 
@@ -235,7 +235,7 @@
 
     if-ne v0, v4, :cond_4
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/p;->LN:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/p;->Mf:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->getCurrent()Landroid/graphics/drawable/Drawable;
 
@@ -259,7 +259,7 @@
     if-eqz v1, :cond_6
 
     :cond_5
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gQ()V
 
     :cond_6
     return-void
@@ -270,7 +270,7 @@
 .method public final a(Landroid/graphics/PointF;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->ME:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->MW:Landroid/graphics/PointF;
 
     invoke-static {v0, p1}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -281,7 +281,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->ME:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->MW:Landroid/graphics/PointF;
 
     if-nez v0, :cond_1
 
@@ -289,14 +289,14 @@
 
     invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->ME:Landroid/graphics/PointF;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->MW:Landroid/graphics/PointF;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->ME:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->MW:Landroid/graphics/PointF;
 
     invoke-virtual {v0, p1}, Landroid/graphics/PointF;->set(Landroid/graphics/PointF;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gQ()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->invalidateSelf()V
 
@@ -306,7 +306,7 @@
 .method public final a(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->KX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Lo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     invoke-static {v0, p1}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -317,13 +317,13 @@
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->KX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->Lo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->MD:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->MV:Ljava/lang/Object;
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gQ()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->invalidateSelf()V
 
@@ -335,9 +335,9 @@
 
     invoke-virtual {p0, p1}, Lcom/facebook/drawee/drawable/p;->d(Landroid/graphics/Matrix;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gS()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gW()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->LL:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Md:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_0
 
@@ -350,9 +350,9 @@
 .method public final draw(Landroid/graphics/Canvas;)V
     .locals 2
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gS()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gW()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->LL:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Md:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_0
 
@@ -366,7 +366,7 @@
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->clipRect(Landroid/graphics/Rect;)Z
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->LL:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->Md:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->concat(Landroid/graphics/Matrix;)V
 
@@ -389,7 +389,7 @@
 
     move-result-object p1
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gQ()V
 
     return-object p1
 .end method
@@ -397,7 +397,7 @@
 .method protected final onBoundsChange(Landroid/graphics/Rect;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->gQ()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/drawable/t.smali b/com.discord/smali/com/facebook/drawee/drawable/t.smali
index e4b62f15db..7e9919c347 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/t.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/t.smali
@@ -7,5 +7,5 @@
 .method public abstract onDraw()V
 .end method
 
-.method public abstract z(Z)V
+.method public abstract x(Z)V
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/generic/GenericDraweeHierarchy.smali b/com.discord/smali/com/facebook/drawee/generic/GenericDraweeHierarchy.smali
index 8b8d6b6c6c..f7d098f9be 100644
--- a/com.discord/smali/com/facebook/drawee/generic/GenericDraweeHierarchy.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/GenericDraweeHierarchy.smali
@@ -7,20 +7,20 @@
 
 
 # instance fields
-.field private final MP:Landroid/graphics/drawable/Drawable;
+.field private final Nh:Landroid/graphics/drawable/Drawable;
 
-.field private MQ:Lcom/facebook/drawee/generic/d;
+.field private Ni:Lcom/facebook/drawee/generic/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final MR:Lcom/facebook/drawee/generic/c;
+.field private final Nj:Lcom/facebook/drawee/generic/c;
 
-.field private final MS:Lcom/facebook/drawee/drawable/f;
+.field private final Nk:Lcom/facebook/drawee/drawable/f;
 
-.field public final MT:Lcom/facebook/drawee/drawable/g;
+.field public final Nl:Lcom/facebook/drawee/drawable/g;
 
-.field private final mResources:Landroid/content/res/Resources;
+.field public final mResources:Landroid/content/res/Resources;
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     invoke-direct {v0, v1}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MP:Landroid/graphics/drawable/Drawable;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nh:Landroid/graphics/drawable/Drawable;
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
@@ -43,25 +43,25 @@
 
     iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->MQ:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->Ni:Lcom/facebook/drawee/generic/d;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MQ:Lcom/facebook/drawee/generic/d;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ni:Lcom/facebook/drawee/generic/d;
 
     new-instance v0, Lcom/facebook/drawee/drawable/g;
 
-    iget-object v2, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MP:Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nh:Landroid/graphics/drawable/Drawable;
 
     invoke-direct {v0, v2}, Lcom/facebook/drawee/drawable/g;-><init>(Landroid/graphics/drawable/Drawable;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MT:Lcom/facebook/drawee/drawable/g;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nl:Lcom/facebook/drawee/drawable/g;
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->Nk:Ljava/util/List;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->NC:Ljava/util/List;
 
     const/4 v2, 0x1
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->Nk:Ljava/util/List;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->NC:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -73,7 +73,7 @@
     const/4 v0, 0x1
 
     :goto_0
-    iget-object v3, p1, Lcom/facebook/drawee/generic/a;->Nl:Landroid/graphics/drawable/Drawable;
+    iget-object v3, p1, Lcom/facebook/drawee/generic/a;->ND:Landroid/graphics/drawable/Drawable;
 
     if-eqz v3, :cond_1
 
@@ -101,9 +101,9 @@
 
     aput-object v4, v3, v1
 
-    iget-object v4, p1, Lcom/facebook/drawee/generic/a;->MY:Landroid/graphics/drawable/Drawable;
+    iget-object v4, p1, Lcom/facebook/drawee/generic/a;->Nq:Landroid/graphics/drawable/Drawable;
 
-    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->MZ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->Nr:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     invoke-direct {p0, v4, v6}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->a(Landroid/graphics/drawable/Drawable;Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Landroid/graphics/drawable/Drawable;
 
@@ -113,13 +113,13 @@
 
     const/4 v4, 0x2
 
-    iget-object v6, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MT:Lcom/facebook/drawee/drawable/g;
+    iget-object v6, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nl:Lcom/facebook/drawee/drawable/g;
 
-    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->Ny:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iget-object v8, p1, Lcom/facebook/drawee/generic/a;->Ni:Landroid/graphics/PointF;
+    iget-object v8, p1, Lcom/facebook/drawee/generic/a;->NA:Landroid/graphics/PointF;
 
-    iget-object v9, p1, Lcom/facebook/drawee/generic/a;->Nj:Landroid/graphics/ColorFilter;
+    iget-object v9, p1, Lcom/facebook/drawee/generic/a;->NB:Landroid/graphics/ColorFilter;
 
     invoke-virtual {v6, v9}, Landroid/graphics/drawable/Drawable;->setColorFilter(Landroid/graphics/ColorFilter;)V
 
@@ -131,9 +131,9 @@
 
     const/4 v4, 0x3
 
-    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->Ne:Landroid/graphics/drawable/Drawable;
+    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->Nw:Landroid/graphics/drawable/Drawable;
 
-    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->Nf:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->Nx:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     invoke-direct {p0, v6, v7}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->a(Landroid/graphics/drawable/Drawable;Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Landroid/graphics/drawable/Drawable;
 
@@ -143,9 +143,9 @@
 
     const/4 v4, 0x4
 
-    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->Na:Landroid/graphics/drawable/Drawable;
+    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->Ns:Landroid/graphics/drawable/Drawable;
 
-    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->Nb:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->Nt:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     invoke-direct {p0, v6, v7}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->a(Landroid/graphics/drawable/Drawable;Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Landroid/graphics/drawable/Drawable;
 
@@ -155,9 +155,9 @@
 
     const/4 v4, 0x5
 
-    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->Nc:Landroid/graphics/drawable/Drawable;
+    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->Nu:Landroid/graphics/drawable/Drawable;
 
-    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->Nd:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->Nv:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     invoke-direct {p0, v6, v7}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->a(Landroid/graphics/drawable/Drawable;Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Landroid/graphics/drawable/Drawable;
 
@@ -167,11 +167,11 @@
 
     if-lez v0, :cond_3
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->Nk:Ljava/util/List;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->NC:Ljava/util/List;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->Nk:Ljava/util/List;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->NC:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -207,13 +207,13 @@
     goto :goto_2
 
     :cond_2
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->Nl:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->ND:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_3
 
     add-int/lit8 v2, v2, 0x6
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->Nl:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->ND:Landroid/graphics/drawable/Drawable;
 
     invoke-direct {p0, v0, v5}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->a(Landroid/graphics/drawable/Drawable;Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Landroid/graphics/drawable/Drawable;
 
@@ -226,17 +226,17 @@
 
     invoke-direct {v0, v3}, Lcom/facebook/drawee/drawable/f;-><init>([Landroid/graphics/drawable/Drawable;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    iget p1, p1, Lcom/facebook/drawee/generic/a;->MW:I
+    iget p1, p1, Lcom/facebook/drawee/generic/a;->No:I
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/f;->O(I)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MQ:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ni:Lcom/facebook/drawee/generic/d;
 
     invoke-static {p1, v0}, Lcom/facebook/drawee/generic/e;->a(Landroid/graphics/drawable/Drawable;Lcom/facebook/drawee/generic/d;)Landroid/graphics/drawable/Drawable;
 
@@ -246,13 +246,13 @@
 
     invoke-direct {v0, p1}, Lcom/facebook/drawee/generic/c;-><init>(Landroid/graphics/drawable/Drawable;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MR:Lcom/facebook/drawee/generic/c;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nj:Lcom/facebook/drawee/generic/c;
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MR:Lcom/facebook/drawee/generic/c;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nj:Lcom/facebook/drawee/generic/c;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/generic/c;->mutate()Landroid/graphics/drawable/Drawable;
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gT()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gX()V
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
@@ -264,7 +264,7 @@
 
     if-ltz p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/f;->P(I)V
 
@@ -277,7 +277,7 @@
 
     if-ltz p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/f;->Q(I)V
 
@@ -288,7 +288,7 @@
 .method private S(I)Lcom/facebook/drawee/drawable/c;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
     const/4 v1, 0x1
 
@@ -306,7 +306,7 @@
     :goto_0
     invoke-static {v3}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v3, v0, Lcom/facebook/drawee/drawable/a;->Lo:[Lcom/facebook/drawee/drawable/c;
+    iget-object v3, v0, Lcom/facebook/drawee/drawable/a;->LF:[Lcom/facebook/drawee/drawable/c;
 
     array-length v3, v3
 
@@ -320,13 +320,13 @@
     :goto_1
     invoke-static {v1}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v1, v0, Lcom/facebook/drawee/drawable/a;->Lo:[Lcom/facebook/drawee/drawable/c;
+    iget-object v1, v0, Lcom/facebook/drawee/drawable/a;->LF:[Lcom/facebook/drawee/drawable/c;
 
     aget-object v1, v1, p1
 
     if-nez v1, :cond_2
 
-    iget-object v1, v0, Lcom/facebook/drawee/drawable/a;->Lo:[Lcom/facebook/drawee/drawable/c;
+    iget-object v1, v0, Lcom/facebook/drawee/drawable/a;->LF:[Lcom/facebook/drawee/drawable/c;
 
     new-instance v2, Lcom/facebook/drawee/drawable/a$1;
 
@@ -335,7 +335,7 @@
     aput-object v2, v1, p1
 
     :cond_2
-    iget-object v0, v0, Lcom/facebook/drawee/drawable/a;->Lo:[Lcom/facebook/drawee/drawable/c;
+    iget-object v0, v0, Lcom/facebook/drawee/drawable/a;->LF:[Lcom/facebook/drawee/drawable/c;
 
     aget-object p1, v0, p1
 
@@ -372,31 +372,6 @@
     return-object p1
 .end method
 
-.method private T(I)Lcom/facebook/drawee/drawable/p;
-    .locals 1
-
-    invoke-direct {p0, p1}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->S(I)Lcom/facebook/drawee/drawable/c;
-
-    move-result-object p1
-
-    instance-of v0, p1, Lcom/facebook/drawee/drawable/p;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Lcom/facebook/drawee/drawable/p;
-
-    return-object p1
-
-    :cond_0
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MF:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    invoke-static {p1, v0}, Lcom/facebook/drawee/generic/e;->a(Lcom/facebook/drawee/drawable/c;Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/drawable/p;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
 .method private a(Landroid/graphics/drawable/Drawable;Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Landroid/graphics/drawable/Drawable;
     .locals 2
     .param p1    # Landroid/graphics/drawable/Drawable;
@@ -410,7 +385,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MQ:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ni:Lcom/facebook/drawee/generic/d;
 
     iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
 
@@ -425,75 +400,38 @@
     return-object p1
 .end method
 
-.method private g(Landroid/graphics/drawable/Drawable;)V
-    .locals 3
-    .param p1    # Landroid/graphics/drawable/Drawable;
-        .annotation runtime Ljavax/annotation/Nullable;
-        .end annotation
-    .end param
-
-    const/4 v0, 0x1
-
-    if-nez p1, :cond_0
-
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {p1, v0, v1}, Lcom/facebook/drawee/drawable/f;->a(ILandroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
-
-    return-void
-
-    :cond_0
-    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MQ:Lcom/facebook/drawee/generic/d;
-
-    iget-object v2, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
-
-    invoke-static {p1, v1, v2}, Lcom/facebook/drawee/generic/e;->a(Landroid/graphics/drawable/Drawable;Lcom/facebook/drawee/generic/d;Landroid/content/res/Resources;)Landroid/graphics/drawable/Drawable;
-
-    move-result-object p1
-
-    invoke-direct {p0, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->S(I)Lcom/facebook/drawee/drawable/c;
-
-    move-result-object v0
-
-    invoke-interface {v0, p1}, Lcom/facebook/drawee/drawable/c;->c(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
-
-    return-void
-.end method
-
-.method private gT()V
+.method private gX()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gI()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gM()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gK()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gO()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gU()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gY()V
 
     const/4 v0, 0x1
 
     invoke-direct {p0, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->P(I)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gL()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gP()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gJ()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gN()V
 
     :cond_0
     return-void
 .end method
 
-.method private gU()V
+.method private gY()V
     .locals 1
 
     const/4 v0, 0x1
@@ -522,7 +460,7 @@
 .method private setProgress(F)V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
     const/4 v1, 0x3
 
@@ -586,10 +524,35 @@
 
 
 # virtual methods
+.method public final T(I)Lcom/facebook/drawee/drawable/p;
+    .locals 1
+
+    invoke-direct {p0, p1}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->S(I)Lcom/facebook/drawee/drawable/c;
+
+    move-result-object p1
+
+    instance-of v0, p1, Lcom/facebook/drawee/drawable/p;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/facebook/drawee/drawable/p;
+
+    return-object p1
+
+    :cond_0
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    invoke-static {p1, v0}, Lcom/facebook/drawee/generic/e;->a(Lcom/facebook/drawee/drawable/c;Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/drawable/p;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
 .method public final U(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/f;->O(I)V
 
@@ -605,7 +568,7 @@
 
     move-result-object p1
 
-    invoke-direct {p0, p1}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->g(Landroid/graphics/drawable/Drawable;)V
+    invoke-virtual {p0, p1}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->g(Landroid/graphics/drawable/Drawable;)V
 
     return-void
 .end method
@@ -613,7 +576,7 @@
 .method public final a(FZ)V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
     const/4 v1, 0x3
 
@@ -626,44 +589,22 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gI()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gM()V
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->setProgress(F)V
 
     if-eqz p2, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gL()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gP()V
 
     :cond_1
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gJ()V
-
-    return-void
-.end method
-
-.method public final a(ILcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
-
-    invoke-virtual {v0, p1}, Landroid/content/res/Resources;->getDrawable(I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->g(Landroid/graphics/drawable/Drawable;)V
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->T(I)Lcom/facebook/drawee/drawable/p;
-
-    move-result-object p1
-
-    invoke-virtual {p1, p2}, Lcom/facebook/drawee/drawable/p;->a(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gN()V
 
     return-void
 .end method
@@ -671,7 +612,7 @@
 .method public final a(Landroid/graphics/drawable/Drawable;FZ)V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MQ:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ni:Lcom/facebook/drawee/generic/d;
 
     iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
 
@@ -681,15 +622,15 @@
 
     invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable;
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MT:Lcom/facebook/drawee/drawable/g;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nl:Lcom/facebook/drawee/drawable/g;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/g;->e(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gI()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gM()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gU()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gY()V
 
     const/4 p1, 0x2
 
@@ -699,14 +640,14 @@
 
     if-eqz p3, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gL()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gP()V
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gJ()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->gN()V
 
     return-void
 .end method
@@ -718,20 +659,20 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MQ:Lcom/facebook/drawee/generic/d;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ni:Lcom/facebook/drawee/generic/d;
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MR:Lcom/facebook/drawee/generic/c;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nj:Lcom/facebook/drawee/generic/c;
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MQ:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ni:Lcom/facebook/drawee/generic/d;
 
     invoke-static {p1, v0}, Lcom/facebook/drawee/generic/e;->a(Lcom/facebook/drawee/drawable/c;Lcom/facebook/drawee/generic/d;)V
 
     const/4 p1, 0x0
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    iget-object v0, v0, Lcom/facebook/drawee/drawable/a;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v0, v0, Lcom/facebook/drawee/drawable/a;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v0, v0
 
@@ -741,7 +682,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MQ:Lcom/facebook/drawee/generic/d;
+    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ni:Lcom/facebook/drawee/generic/d;
 
     iget-object v2, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
 
@@ -762,41 +703,62 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MR:Lcom/facebook/drawee/generic/c;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nj:Lcom/facebook/drawee/generic/c;
 
-    iput-object p1, v0, Lcom/facebook/drawee/generic/c;->Ko:Landroid/graphics/drawable/Drawable;
+    iput-object p1, v0, Lcom/facebook/drawee/generic/c;->KF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/generic/c;->invalidateSelf()V
 
     return-void
 .end method
 
-.method public final b(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
-    .locals 1
+.method public final g(Landroid/graphics/drawable/Drawable;)V
+    .locals 3
+    .param p1    # Landroid/graphics/drawable/Drawable;
+        .annotation runtime Ljavax/annotation/Nullable;
+        .end annotation
+    .end param
 
-    invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
+    const/4 v0, 0x1
 
-    const/4 v0, 0x2
+    if-nez p1, :cond_0
 
-    invoke-direct {p0, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->T(I)Lcom/facebook/drawee/drawable/p;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p1, v0, v1}, Lcom/facebook/drawee/drawable/f;->a(ILandroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    return-void
+
+    :cond_0
+    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ni:Lcom/facebook/drawee/generic/d;
+
+    iget-object v2, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
+
+    invoke-static {p1, v1, v2}, Lcom/facebook/drawee/generic/e;->a(Landroid/graphics/drawable/Drawable;Lcom/facebook/drawee/generic/d;Landroid/content/res/Resources;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p1
+
+    invoke-direct {p0, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->S(I)Lcom/facebook/drawee/drawable/c;
 
     move-result-object v0
 
-    invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/p;->a(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
+    invoke-interface {v0, p1}, Lcom/facebook/drawee/drawable/c;->c(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
 
-.method public final gV()V
+.method public final gZ()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gI()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gM()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gU()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gY()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
     const/4 v1, 0x5
 
@@ -816,23 +778,43 @@
     invoke-direct {p0, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->P(I)V
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gJ()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gN()V
 
     return-void
 .end method
 
-.method public final gW()V
+.method public final getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nj:Lcom/facebook/drawee/generic/c;
+
+    return-object v0
+.end method
+
+.method public final h(Landroid/graphics/drawable/Drawable;)V
+    .locals 0
+    .param p1    # Landroid/graphics/drawable/Drawable;
+        .annotation runtime Ljavax/annotation/Nullable;
+        .end annotation
+    .end param
+
+    invoke-virtual {p0, p1}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->g(Landroid/graphics/drawable/Drawable;)V
+
+    return-void
+.end method
+
+.method public final ha()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gI()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gM()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gU()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gY()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
     const/4 v1, 0x4
 
@@ -852,29 +834,9 @@
     invoke-direct {p0, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->P(I)V
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MS:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nk:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gJ()V
-
-    return-void
-.end method
-
-.method public final getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MR:Lcom/facebook/drawee/generic/c;
-
-    return-object v0
-.end method
-
-.method public final h(Landroid/graphics/drawable/Drawable;)V
-    .locals 0
-    .param p1    # Landroid/graphics/drawable/Drawable;
-        .annotation runtime Ljavax/annotation/Nullable;
-        .end annotation
-    .end param
-
-    invoke-direct {p0, p1}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->g(Landroid/graphics/drawable/Drawable;)V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->gN()V
 
     return-void
 .end method
@@ -882,13 +844,13 @@
 .method public final reset()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MT:Lcom/facebook/drawee/drawable/g;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nl:Lcom/facebook/drawee/drawable/g;
 
-    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MP:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nh:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/drawable/g;->e(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gT()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->gX()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/generic/a.smali b/com.discord/smali/com/facebook/drawee/generic/a.smali
index 9e6843f617..4d28efaffd 100644
--- a/com.discord/smali/com/facebook/drawee/generic/a.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/a.smali
@@ -4,46 +4,17 @@
 
 
 # static fields
-.field public static final MU:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Nm:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final MV:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Nn:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # instance fields
-.field MQ:Lcom/facebook/drawee/generic/d;
+.field NA:Landroid/graphics/PointF;
 
-.field MW:I
+.field NB:Landroid/graphics/ColorFilter;
 
-.field public MX:F
-
-.field MY:Landroid/graphics/drawable/Drawable;
-
-.field MZ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field Na:Landroid/graphics/drawable/Drawable;
-
-.field Nb:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-.field Nc:Landroid/graphics/drawable/Drawable;
-
-.field Nd:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-.field Ne:Landroid/graphics/drawable/Drawable;
-
-.field Nf:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-.field Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-.field private Nh:Landroid/graphics/Matrix;
-
-.field Ni:Landroid/graphics/PointF;
-
-.field Nj:Landroid/graphics/ColorFilter;
-
-.field Nk:Ljava/util/List;
+.field NC:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -53,7 +24,36 @@
     .end annotation
 .end field
 
-.field Nl:Landroid/graphics/drawable/Drawable;
+.field ND:Landroid/graphics/drawable/Drawable;
+
+.field Ni:Lcom/facebook/drawee/generic/d;
+
+.field No:I
+
+.field public Np:F
+
+.field public Nq:Landroid/graphics/drawable/Drawable;
+
+.field Nr:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field Ns:Landroid/graphics/drawable/Drawable;
+
+.field Nt:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+.field Nu:Landroid/graphics/drawable/Drawable;
+
+.field Nv:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+.field Nw:Landroid/graphics/drawable/Drawable;
+
+.field Nx:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+.field Ny:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+.field private Nz:Landroid/graphics/Matrix;
 
 .field mBackground:Landroid/graphics/drawable/Drawable;
 
@@ -64,13 +64,13 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MK:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Nc:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/generic/a;->MU:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/generic/a;->Nm:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->ML:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Nd:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/generic/a;->MV:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/generic/a;->Nn:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
@@ -84,49 +84,49 @@
 
     const/16 p1, 0x12c
 
-    iput p1, p0, Lcom/facebook/drawee/generic/a;->MW:I
+    iput p1, p0, Lcom/facebook/drawee/generic/a;->No:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/drawee/generic/a;->MX:F
+    iput p1, p0, Lcom/facebook/drawee/generic/a;->Np:F
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->MY:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Nq:Landroid/graphics/drawable/Drawable;
 
-    sget-object v0, Lcom/facebook/drawee/generic/a;->MU:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/generic/a;->Nm:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->MZ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Nr:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Na:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Ns:Landroid/graphics/drawable/Drawable;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Nb:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Nt:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Nc:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Nu:Landroid/graphics/drawable/Drawable;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Nd:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Nv:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Ne:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Nw:Landroid/graphics/drawable/Drawable;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Nf:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Nx:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/generic/a;->MV:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/generic/a;->Nn:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Ny:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Nh:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Nz:Landroid/graphics/Matrix;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Ni:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->NA:Landroid/graphics/PointF;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Nj:Landroid/graphics/ColorFilter;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->NB:Landroid/graphics/ColorFilter;
 
     iput-object p1, p0, Lcom/facebook/drawee/generic/a;->mBackground:Landroid/graphics/drawable/Drawable;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Nk:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->NC:Ljava/util/List;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Nl:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->ND:Landroid/graphics/drawable/Drawable;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->MQ:Lcom/facebook/drawee/generic/d;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Ni:Lcom/facebook/drawee/generic/d;
 
     return-void
 .end method
@@ -141,28 +141,10 @@
     return-object v0
 .end method
 
-
-# virtual methods
-.method public final c(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/generic/a;
-    .locals 0
-    .param p1    # Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-        .annotation runtime Ljavax/annotation/Nullable;
-        .end annotation
-    .end param
-
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    const/4 p1, 0x0
-
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Nh:Landroid/graphics/Matrix;
-
-    return-object p0
-.end method
-
-.method public final gX()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+.method private validate()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/a;->Nk:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/a;->NC:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
@@ -188,6 +170,32 @@
     goto :goto_0
 
     :cond_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public final b(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/generic/a;
+    .locals 0
+    .param p1    # Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+        .annotation runtime Ljavax/annotation/Nullable;
+        .end annotation
+    .end param
+
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Ny:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Nz:Landroid/graphics/Matrix;
+
+    return-object p0
+.end method
+
+.method public final hb()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    .locals 1
+
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/a;->validate()V
+
     new-instance v0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
     invoke-direct {v0, p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;-><init>(Lcom/facebook/drawee/generic/a;)V
@@ -196,18 +204,6 @@
 .end method
 
 .method public final i(Landroid/graphics/drawable/Drawable;)Lcom/facebook/drawee/generic/a;
-    .locals 0
-    .param p1    # Landroid/graphics/drawable/Drawable;
-        .annotation runtime Ljavax/annotation/Nullable;
-        .end annotation
-    .end param
-
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->MY:Landroid/graphics/drawable/Drawable;
-
-    return-object p0
-.end method
-
-.method public final j(Landroid/graphics/drawable/Drawable;)Lcom/facebook/drawee/generic/a;
     .locals 2
     .param p1    # Landroid/graphics/drawable/Drawable;
         .annotation runtime Ljavax/annotation/Nullable;
@@ -218,7 +214,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Nk:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->NC:Ljava/util/List;
 
     goto :goto_0
 
@@ -235,7 +231,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Nk:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->NC:Ljava/util/List;
 
     :goto_0
     return-object p0
diff --git a/com.discord/smali/com/facebook/drawee/generic/b.smali b/com.discord/smali/com/facebook/drawee/generic/b.smali
index a251213583..17d274f8cd 100644
--- a/com.discord/smali/com/facebook/drawee/generic/b.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/b.smali
@@ -26,47 +26,47 @@
     throw p0
 
     :pswitch_0
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MN:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Nf:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_1
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MM:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ne:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_2
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->ML:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Nd:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_3
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MK:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Nc:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_4
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MJ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Nb:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_5
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MI:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Na:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_6
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MH:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MZ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_7
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MG:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MY:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_8
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MF:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
@@ -157,7 +157,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v0, v3}, Lcom/facebook/drawee/generic/a;->c(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/generic/a;
+    invoke-virtual {v0, v3}, Lcom/facebook/drawee/generic/a;->b(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/generic/a;
 
     :goto_1
     move/from16 v20, v7
@@ -178,7 +178,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->MY:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Nq:Landroid/graphics/drawable/Drawable;
 
     goto :goto_1
 
@@ -195,7 +195,7 @@
 
     const/4 v3, 0x0
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Nl:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->ND:Landroid/graphics/drawable/Drawable;
 
     goto :goto_1
 
@@ -216,7 +216,7 @@
 
     invoke-virtual {v4, v7, v3}, Landroid/graphics/drawable/StateListDrawable;->addState([ILandroid/graphics/drawable/Drawable;)V
 
-    iput-object v4, v0, Lcom/facebook/drawee/generic/a;->Nl:Landroid/graphics/drawable/Drawable;
+    iput-object v4, v0, Lcom/facebook/drawee/generic/a;->ND:Landroid/graphics/drawable/Drawable;
 
     goto :goto_2
 
@@ -231,7 +231,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Ne:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Nw:Landroid/graphics/drawable/Drawable;
 
     goto :goto_2
 
@@ -246,7 +246,7 @@
 
     move-result v3
 
-    iput v3, v0, Lcom/facebook/drawee/generic/a;->MW:I
+    iput v3, v0, Lcom/facebook/drawee/generic/a;->No:I
 
     goto :goto_2
 
@@ -261,7 +261,7 @@
 
     move-result v3
 
-    iput v3, v0, Lcom/facebook/drawee/generic/a;->MX:F
+    iput v3, v0, Lcom/facebook/drawee/generic/a;->Np:F
 
     goto :goto_2
 
@@ -274,7 +274,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->MZ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Nr:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     goto :goto_2
 
@@ -287,7 +287,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Na:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Ns:Landroid/graphics/drawable/Drawable;
 
     goto :goto_2
 
@@ -300,7 +300,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Nb:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Nt:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     goto :goto_2
 
@@ -313,7 +313,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Nc:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Nu:Landroid/graphics/drawable/Drawable;
 
     goto/16 :goto_2
 
@@ -326,7 +326,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Nd:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Nv:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     goto/16 :goto_2
 
@@ -339,7 +339,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Nf:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Nx:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     goto/16 :goto_2
 
@@ -388,7 +388,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v0, v3}, Lcom/facebook/drawee/generic/a;->j(Landroid/graphics/drawable/Drawable;)Lcom/facebook/drawee/generic/a;
+    invoke-virtual {v0, v3}, Lcom/facebook/drawee/generic/a;->i(Landroid/graphics/drawable/Drawable;)Lcom/facebook/drawee/generic/a;
 
     goto :goto_3
 
@@ -407,7 +407,7 @@
 
     move-result v3
 
-    iput-boolean v3, v7, Lcom/facebook/drawee/generic/d;->No:Z
+    iput-boolean v3, v7, Lcom/facebook/drawee/generic/d;->NG:Z
 
     goto :goto_3
 
@@ -590,7 +590,7 @@
 
     invoke-static {v7, v4}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    iput v3, v1, Lcom/facebook/drawee/generic/d;->LY:F
+    iput v3, v1, Lcom/facebook/drawee/generic/d;->Mp:F
 
     goto :goto_7
 
@@ -611,7 +611,7 @@
 
     move-result v3
 
-    iput v3, v1, Lcom/facebook/drawee/generic/d;->LZ:I
+    iput v3, v1, Lcom/facebook/drawee/generic/d;->Mq:I
 
     goto :goto_7
 
@@ -845,7 +845,7 @@
     const/4 v6, 0x1
 
     :goto_12
-    iget-object v7, v0, Lcom/facebook/drawee/generic/a;->Ne:Landroid/graphics/drawable/Drawable;
+    iget-object v7, v0, Lcom/facebook/drawee/generic/a;->Nw:Landroid/graphics/drawable/Drawable;
 
     if-eqz v7, :cond_2b
 
@@ -853,11 +853,11 @@
 
     new-instance v7, Lcom/facebook/drawee/drawable/b;
 
-    iget-object v8, v0, Lcom/facebook/drawee/generic/a;->Ne:Landroid/graphics/drawable/Drawable;
+    iget-object v8, v0, Lcom/facebook/drawee/generic/a;->Nw:Landroid/graphics/drawable/Drawable;
 
     invoke-direct {v7, v8, v1}, Lcom/facebook/drawee/drawable/b;-><init>(Landroid/graphics/drawable/Drawable;I)V
 
-    iput-object v7, v0, Lcom/facebook/drawee/generic/a;->Ne:Landroid/graphics/drawable/Drawable;
+    iput-object v7, v0, Lcom/facebook/drawee/generic/a;->Nw:Landroid/graphics/drawable/Drawable;
 
     :cond_2b
     if-lez v5, :cond_30
@@ -908,7 +908,7 @@
     const/16 v18, 0x0
 
     :goto_16
-    invoke-virtual {v1}, Lcom/facebook/drawee/generic/d;->gY()[F
+    invoke-virtual {v1}, Lcom/facebook/drawee/generic/d;->hc()[F
 
     move-result-object v1
 
@@ -951,7 +951,7 @@
 .method private static a(Lcom/facebook/drawee/generic/a;)Lcom/facebook/drawee/generic/d;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/a;->MQ:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/a;->Ni:Lcom/facebook/drawee/generic/d;
 
     if-nez v0, :cond_0
 
@@ -959,10 +959,10 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/generic/d;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->MQ:Lcom/facebook/drawee/generic/d;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Ni:Lcom/facebook/drawee/generic/d;
 
     :cond_0
-    iget-object p0, p0, Lcom/facebook/drawee/generic/a;->MQ:Lcom/facebook/drawee/generic/d;
+    iget-object p0, p0, Lcom/facebook/drawee/generic/a;->Ni:Lcom/facebook/drawee/generic/d;
 
     return-object p0
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/generic/c.smali b/com.discord/smali/com/facebook/drawee/generic/c.smali
index b4f6274d92..bf112240d0 100644
--- a/com.discord/smali/com/facebook/drawee/generic/c.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/c.smali
@@ -7,12 +7,12 @@
 
 
 # instance fields
-.field Ko:Landroid/graphics/drawable/Drawable;
+.field KF:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Nm:Lcom/facebook/drawee/drawable/t;
+.field private NE:Lcom/facebook/drawee/drawable/t;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -26,7 +26,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/c;->Ko:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/c;->KF:Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
@@ -40,7 +40,7 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/c;->Nm:Lcom/facebook/drawee/drawable/t;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/c;->NE:Lcom/facebook/drawee/drawable/t;
 
     return-void
 .end method
@@ -57,7 +57,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->Nm:Lcom/facebook/drawee/drawable/t;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->NE:Lcom/facebook/drawee/drawable/t;
 
     if-eqz v0, :cond_1
 
@@ -66,7 +66,7 @@
     :cond_1
     invoke-super {p0, p1}, Lcom/facebook/drawee/drawable/g;->draw(Landroid/graphics/Canvas;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->Ko:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->KF:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_2
 
@@ -76,7 +76,7 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->Ko:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->KF:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
@@ -103,11 +103,11 @@
 .method public final setVisible(ZZ)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->Nm:Lcom/facebook/drawee/drawable/t;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->NE:Lcom/facebook/drawee/drawable/t;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0, p1}, Lcom/facebook/drawee/drawable/t;->z(Z)V
+    invoke-interface {v0, p1}, Lcom/facebook/drawee/drawable/t;->x(Z)V
 
     :cond_0
     invoke-super {p0, p1, p2}, Lcom/facebook/drawee/drawable/g;->setVisible(ZZ)Z
diff --git a/com.discord/smali/com/facebook/drawee/generic/d.smali b/com.discord/smali/com/facebook/drawee/generic/d.smali
index c9633dc7d3..87a9533d4a 100644
--- a/com.discord/smali/com/facebook/drawee/generic/d.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/d.smali
@@ -12,19 +12,19 @@
 
 
 # instance fields
-.field LY:F
+.field Mp:F
 
-.field LZ:I
+.field Mq:I
 
-.field Ma:Z
+.field Mr:Z
 
-.field Mh:I
+.field My:I
 
-.field Nn:Lcom/facebook/drawee/generic/d$a;
+.field public NF:Lcom/facebook/drawee/generic/d$a;
 
-.field No:Z
+.field NG:Z
 
-.field Np:[F
+.field NH:[F
 
 .field mPadding:F
 
@@ -35,34 +35,34 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lcom/facebook/drawee/generic/d$a;->Nr:Lcom/facebook/drawee/generic/d$a;
+    sget-object v0, Lcom/facebook/drawee/generic/d$a;->NJ:Lcom/facebook/drawee/generic/d$a;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/d;->Nn:Lcom/facebook/drawee/generic/d$a;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/d;->NF:Lcom/facebook/drawee/generic/d$a;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->No:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->NG:Z
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/drawee/generic/d;->Np:[F
+    iput-object v1, p0, Lcom/facebook/drawee/generic/d;->NH:[F
 
-    iput v0, p0, Lcom/facebook/drawee/generic/d;->Mh:I
+    iput v0, p0, Lcom/facebook/drawee/generic/d;->My:I
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/drawee/generic/d;->LY:F
+    iput v1, p0, Lcom/facebook/drawee/generic/d;->Mp:F
 
-    iput v0, p0, Lcom/facebook/drawee/generic/d;->LZ:I
+    iput v0, p0, Lcom/facebook/drawee/generic/d;->Mq:I
 
     iput v1, p0, Lcom/facebook/drawee/generic/d;->mPadding:F
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->Ma:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->Mr:Z
 
     return-void
 .end method
 
-.method public static gZ()Lcom/facebook/drawee/generic/d;
+.method public static hd()Lcom/facebook/drawee/generic/d;
     .locals 2
 
     new-instance v0, Lcom/facebook/drawee/generic/d;
@@ -71,23 +71,7 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/facebook/drawee/generic/d;->No:Z
-
-    return-object v0
-.end method
-
-.method public static l(F)Lcom/facebook/drawee/generic/d;
-    .locals 2
-
-    new-instance v0, Lcom/facebook/drawee/generic/d;
-
-    invoke-direct {v0}, Lcom/facebook/drawee/generic/d;-><init>()V
-
-    invoke-virtual {v0}, Lcom/facebook/drawee/generic/d;->gY()[F
-
-    move-result-object v1
-
-    invoke-static {v1, p0}, Ljava/util/Arrays;->fill([FF)V
+    iput-boolean v1, v0, Lcom/facebook/drawee/generic/d;->NG:Z
 
     return-object v0
 .end method
@@ -97,19 +81,11 @@
 .method public final W(I)Lcom/facebook/drawee/generic/d;
     .locals 0
 
-    iput p1, p0, Lcom/facebook/drawee/generic/d;->Mh:I
+    iput p1, p0, Lcom/facebook/drawee/generic/d;->My:I
 
-    sget-object p1, Lcom/facebook/drawee/generic/d$a;->Nq:Lcom/facebook/drawee/generic/d$a;
+    sget-object p1, Lcom/facebook/drawee/generic/d$a;->NI:Lcom/facebook/drawee/generic/d$a;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/d;->Nn:Lcom/facebook/drawee/generic/d$a;
-
-    return-object p0
-.end method
-
-.method public final a(Lcom/facebook/drawee/generic/d$a;)Lcom/facebook/drawee/generic/d;
-    .locals 0
-
-    iput-object p1, p0, Lcom/facebook/drawee/generic/d;->Nn:Lcom/facebook/drawee/generic/d$a;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/d;->NF:Lcom/facebook/drawee/generic/d$a;
 
     return-object p0
 .end method
@@ -147,27 +123,27 @@
     :cond_1
     check-cast p1, Lcom/facebook/drawee/generic/d;
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->No:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->NG:Z
 
-    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->No:Z
+    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->NG:Z
 
     if-eq v1, v2, :cond_2
 
     return v0
 
     :cond_2
-    iget v1, p0, Lcom/facebook/drawee/generic/d;->Mh:I
+    iget v1, p0, Lcom/facebook/drawee/generic/d;->My:I
 
-    iget v2, p1, Lcom/facebook/drawee/generic/d;->Mh:I
+    iget v2, p1, Lcom/facebook/drawee/generic/d;->My:I
 
     if-eq v1, v2, :cond_3
 
     return v0
 
     :cond_3
-    iget v1, p1, Lcom/facebook/drawee/generic/d;->LY:F
+    iget v1, p1, Lcom/facebook/drawee/generic/d;->Mp:F
 
-    iget v2, p0, Lcom/facebook/drawee/generic/d;->LY:F
+    iget v2, p0, Lcom/facebook/drawee/generic/d;->Mp:F
 
     invoke-static {v1, v2}, Ljava/lang/Float;->compare(FF)I
 
@@ -178,9 +154,9 @@
     return v0
 
     :cond_4
-    iget v1, p0, Lcom/facebook/drawee/generic/d;->LZ:I
+    iget v1, p0, Lcom/facebook/drawee/generic/d;->Mq:I
 
-    iget v2, p1, Lcom/facebook/drawee/generic/d;->LZ:I
+    iget v2, p1, Lcom/facebook/drawee/generic/d;->Mq:I
 
     if-eq v1, v2, :cond_5
 
@@ -200,27 +176,27 @@
     return v0
 
     :cond_6
-    iget-object v1, p0, Lcom/facebook/drawee/generic/d;->Nn:Lcom/facebook/drawee/generic/d$a;
+    iget-object v1, p0, Lcom/facebook/drawee/generic/d;->NF:Lcom/facebook/drawee/generic/d$a;
 
-    iget-object v2, p1, Lcom/facebook/drawee/generic/d;->Nn:Lcom/facebook/drawee/generic/d$a;
+    iget-object v2, p1, Lcom/facebook/drawee/generic/d;->NF:Lcom/facebook/drawee/generic/d$a;
 
     if-eq v1, v2, :cond_7
 
     return v0
 
     :cond_7
-    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->Ma:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->Mr:Z
 
-    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->Ma:Z
+    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->Mr:Z
 
     if-eq v1, v2, :cond_8
 
     return v0
 
     :cond_8
-    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->Np:[F
+    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->NH:[F
 
-    iget-object p1, p1, Lcom/facebook/drawee/generic/d;->Np:[F
+    iget-object p1, p1, Lcom/facebook/drawee/generic/d;->NH:[F
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->equals([F[F)Z
 
@@ -233,29 +209,10 @@
     return v0
 .end method
 
-.method final gY()[F
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->Np:[F
-
-    if-nez v0, :cond_0
-
-    const/16 v0, 0x8
-
-    new-array v0, v0, [F
-
-    iput-object v0, p0, Lcom/facebook/drawee/generic/d;->Np:[F
-
-    :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->Np:[F
-
-    return-object v0
-.end method
-
 .method public final hashCode()I
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->Nn:Lcom/facebook/drawee/generic/d$a;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->NF:Lcom/facebook/drawee/generic/d$a;
 
     const/4 v1, 0x0
 
@@ -273,13 +230,13 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v2, p0, Lcom/facebook/drawee/generic/d;->No:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/generic/d;->NG:Z
 
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/facebook/drawee/generic/d;->Np:[F
+    iget-object v2, p0, Lcom/facebook/drawee/generic/d;->NH:[F
 
     if-eqz v2, :cond_1
 
@@ -297,13 +254,13 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/facebook/drawee/generic/d;->Mh:I
+    iget v2, p0, Lcom/facebook/drawee/generic/d;->My:I
 
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/facebook/drawee/generic/d;->LY:F
+    iget v2, p0, Lcom/facebook/drawee/generic/d;->Mp:F
 
     const/4 v3, 0x0
 
@@ -325,7 +282,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/facebook/drawee/generic/d;->LZ:I
+    iget v2, p0, Lcom/facebook/drawee/generic/d;->Mq:I
 
     add-int/2addr v0, v2
 
@@ -346,9 +303,28 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->Ma:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->Mr:Z
 
     add-int/2addr v0, v1
 
     return v0
 .end method
+
+.method public final hc()[F
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->NH:[F
+
+    if-nez v0, :cond_0
+
+    const/16 v0, 0x8
+
+    new-array v0, v0, [F
+
+    iput-object v0, p0, Lcom/facebook/drawee/generic/d;->NH:[F
+
+    :cond_0
+    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->NH:[F
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/facebook/drawee/generic/e.smali b/com.discord/smali/com/facebook/drawee/generic/e.smali
index fd1536a635..5273d52ac5 100644
--- a/com.discord/smali/com/facebook/drawee/generic/e.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/e.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final Nt:Landroid/graphics/drawable/Drawable;
+.field private static final NM:Landroid/graphics/drawable/Drawable;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0, v1}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
 
-    sput-object v0, Lcom/facebook/drawee/generic/e;->Nt:Landroid/graphics/drawable/Drawable;
+    sput-object v0, Lcom/facebook/drawee/generic/e;->NM:Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
@@ -86,9 +86,9 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->Nn:Lcom/facebook/drawee/generic/d$a;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->NF:Lcom/facebook/drawee/generic/d$a;
 
-    sget-object v1, Lcom/facebook/drawee/generic/d$a;->Nq:Lcom/facebook/drawee/generic/d$a;
+    sget-object v1, Lcom/facebook/drawee/generic/d$a;->NI:Lcom/facebook/drawee/generic/d$a;
 
     if-eq v0, v1, :cond_0
 
@@ -101,7 +101,7 @@
 
     invoke-static {v0, p1}, Lcom/facebook/drawee/generic/e;->a(Lcom/facebook/drawee/drawable/j;Lcom/facebook/drawee/generic/d;)V
 
-    iget p0, p1, Lcom/facebook/drawee/generic/d;->Mh:I
+    iget p0, p1, Lcom/facebook/drawee/generic/d;->My:I
 
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/drawable/m;->R(I)V
     :try_end_0
@@ -143,9 +143,9 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->Nn:Lcom/facebook/drawee/generic/d$a;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->NF:Lcom/facebook/drawee/generic/d$a;
 
-    sget-object v1, Lcom/facebook/drawee/generic/d$a;->Nr:Lcom/facebook/drawee/generic/d$a;
+    sget-object v1, Lcom/facebook/drawee/generic/d$a;->NJ:Lcom/facebook/drawee/generic/d$a;
 
     if-eq v0, v1, :cond_0
 
@@ -164,7 +164,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/drawee/generic/e;->Nt:Landroid/graphics/drawable/Drawable;
+    sget-object v1, Lcom/facebook/drawee/generic/e;->NM:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {v0, v1}, Lcom/facebook/drawee/drawable/c;->c(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
@@ -235,7 +235,7 @@
 .method static a(Lcom/facebook/drawee/drawable/c;Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/drawable/p;
     .locals 2
 
-    sget-object v0, Lcom/facebook/drawee/generic/e;->Nt:Landroid/graphics/drawable/Drawable;
+    sget-object v0, Lcom/facebook/drawee/generic/e;->NM:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/c;->c(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
@@ -271,9 +271,9 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v1, p1, Lcom/facebook/drawee/generic/d;->Nn:Lcom/facebook/drawee/generic/d$a;
+    iget-object v1, p1, Lcom/facebook/drawee/generic/d;->NF:Lcom/facebook/drawee/generic/d$a;
 
-    sget-object v2, Lcom/facebook/drawee/generic/d$a;->Nq:Lcom/facebook/drawee/generic/d$a;
+    sget-object v2, Lcom/facebook/drawee/generic/d$a;->NI:Lcom/facebook/drawee/generic/d$a;
 
     if-ne v1, v2, :cond_1
 
@@ -285,14 +285,14 @@
 
     invoke-static {v0, p1}, Lcom/facebook/drawee/generic/e;->a(Lcom/facebook/drawee/drawable/j;Lcom/facebook/drawee/generic/d;)V
 
-    iget p0, p1, Lcom/facebook/drawee/generic/d;->Mh:I
+    iget p0, p1, Lcom/facebook/drawee/generic/d;->My:I
 
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/drawable/m;->R(I)V
 
     return-void
 
     :cond_0
-    sget-object v0, Lcom/facebook/drawee/generic/e;->Nt:Landroid/graphics/drawable/Drawable;
+    sget-object v0, Lcom/facebook/drawee/generic/e;->NM:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/c;->c(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
@@ -313,7 +313,7 @@
 
     check-cast v0, Lcom/facebook/drawee/drawable/m;
 
-    sget-object p1, Lcom/facebook/drawee/generic/e;->Nt:Landroid/graphics/drawable/Drawable;
+    sget-object p1, Lcom/facebook/drawee/generic/e;->NM:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/m;->e(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
@@ -321,7 +321,7 @@
 
     invoke-interface {p0, p1}, Lcom/facebook/drawee/drawable/c;->c(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
-    sget-object p0, Lcom/facebook/drawee/generic/e;->Nt:Landroid/graphics/drawable/Drawable;
+    sget-object p0, Lcom/facebook/drawee/generic/e;->NM:Landroid/graphics/drawable/Drawable;
 
     const/4 p1, 0x0
 
@@ -348,9 +348,9 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v1, p1, Lcom/facebook/drawee/generic/d;->Nn:Lcom/facebook/drawee/generic/d$a;
+    iget-object v1, p1, Lcom/facebook/drawee/generic/d;->NF:Lcom/facebook/drawee/generic/d$a;
 
-    sget-object v2, Lcom/facebook/drawee/generic/d$a;->Nr:Lcom/facebook/drawee/generic/d$a;
+    sget-object v2, Lcom/facebook/drawee/generic/d$a;->NJ:Lcom/facebook/drawee/generic/d$a;
 
     if-ne v1, v2, :cond_1
 
@@ -367,7 +367,7 @@
     :cond_0
     if-eqz v0, :cond_2
 
-    sget-object v1, Lcom/facebook/drawee/generic/e;->Nt:Landroid/graphics/drawable/Drawable;
+    sget-object v1, Lcom/facebook/drawee/generic/e;->NM:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p0, v1}, Lcom/facebook/drawee/drawable/c;->c(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
@@ -388,9 +388,9 @@
 
     const/4 p0, 0x0
 
-    invoke-interface {v0, p0}, Lcom/facebook/drawee/drawable/j;->x(Z)V
+    invoke-interface {v0, p0}, Lcom/facebook/drawee/drawable/j;->v(Z)V
 
-    invoke-interface {v0}, Lcom/facebook/drawee/drawable/j;->gN()V
+    invoke-interface {v0}, Lcom/facebook/drawee/drawable/j;->gR()V
 
     const/4 p1, 0x0
 
@@ -398,7 +398,7 @@
 
     invoke-interface {v0, p1}, Lcom/facebook/drawee/drawable/j;->k(F)V
 
-    invoke-interface {v0, p0}, Lcom/facebook/drawee/drawable/j;->y(Z)V
+    invoke-interface {v0, p0}, Lcom/facebook/drawee/drawable/j;->w(Z)V
 
     :cond_2
     return-void
@@ -407,17 +407,17 @@
 .method private static a(Lcom/facebook/drawee/drawable/j;Lcom/facebook/drawee/generic/d;)V
     .locals 2
 
-    iget-boolean v0, p1, Lcom/facebook/drawee/generic/d;->No:Z
+    iget-boolean v0, p1, Lcom/facebook/drawee/generic/d;->NG:Z
 
-    invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/j;->x(Z)V
+    invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/j;->v(Z)V
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->Np:[F
+    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->NH:[F
 
     invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/j;->a([F)V
 
-    iget v0, p1, Lcom/facebook/drawee/generic/d;->LZ:I
+    iget v0, p1, Lcom/facebook/drawee/generic/d;->Mq:I
 
-    iget v1, p1, Lcom/facebook/drawee/generic/d;->LY:F
+    iget v1, p1, Lcom/facebook/drawee/generic/d;->Mp:F
 
     invoke-interface {p0, v0, v1}, Lcom/facebook/drawee/drawable/j;->a(IF)V
 
@@ -425,9 +425,9 @@
 
     invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/j;->k(F)V
 
-    iget-boolean p1, p1, Lcom/facebook/drawee/generic/d;->Ma:Z
+    iget-boolean p1, p1, Lcom/facebook/drawee/generic/d;->Mr:Z
 
-    invoke-interface {p0, p1}, Lcom/facebook/drawee/drawable/j;->y(Z)V
+    invoke-interface {p0, p1}, Lcom/facebook/drawee/drawable/j;->w(Z)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/view/DraweeView.smali b/com.discord/smali/com/facebook/drawee/view/DraweeView.smali
index 27e3347cee..f8ed8b4cf0 100644
--- a/com.discord/smali/com/facebook/drawee/view/DraweeView.smali
+++ b/com.discord/smali/com/facebook/drawee/view/DraweeView.smali
@@ -15,11 +15,11 @@
 
 
 # static fields
-.field private static NV:Z = false
+.field private static On:Z = false
 
 
 # instance fields
-.field private NB:Lcom/facebook/drawee/view/b;
+.field public NU:Lcom/facebook/drawee/view/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/drawee/view/b<",
@@ -28,13 +28,13 @@
     .end annotation
 .end field
 
-.field private final NR:Lcom/facebook/drawee/view/a$a;
+.field private final Oj:Lcom/facebook/drawee/view/a$a;
 
-.field private NS:F
+.field private Ok:F
 
-.field private NT:Z
+.field private Ol:Z
 
-.field private NU:Z
+.field private Om:Z
 
 
 # direct methods
@@ -53,17 +53,17 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/view/a$a;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NR:Lcom/facebook/drawee/view/a$a;
+    iput-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Oj:Lcom/facebook/drawee/view/a$a;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/drawee/view/DraweeView;->NS:F
+    iput v0, p0, Lcom/facebook/drawee/view/DraweeView;->Ok:F
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->NT:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Ol:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Om:Z
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/view/DraweeView;->init(Landroid/content/Context;)V
 
@@ -79,17 +79,17 @@
 
     invoke-direct {p2}, Lcom/facebook/drawee/view/a$a;-><init>()V
 
-    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->NR:Lcom/facebook/drawee/view/a$a;
+    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->Oj:Lcom/facebook/drawee/view/a$a;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->NS:F
+    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->Ok:F
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->NT:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Ol:Z
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Om:Z
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/view/DraweeView;->init(Landroid/content/Context;)V
 
@@ -105,17 +105,17 @@
 
     invoke-direct {p2}, Lcom/facebook/drawee/view/a$a;-><init>()V
 
-    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->NR:Lcom/facebook/drawee/view/a$a;
+    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->Oj:Lcom/facebook/drawee/view/a$a;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->NS:F
+    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->Ok:F
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->NT:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Ol:Z
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Om:Z
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/view/DraweeView;->init(Landroid/content/Context;)V
 
@@ -131,27 +131,27 @@
 
     invoke-direct {p2}, Lcom/facebook/drawee/view/a$a;-><init>()V
 
-    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->NR:Lcom/facebook/drawee/view/a$a;
+    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->Oj:Lcom/facebook/drawee/view/a$a;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->NS:F
+    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->Ok:F
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->NT:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Ol:Z
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Om:Z
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/view/DraweeView;->init(Landroid/content/Context;)V
 
     return-void
 .end method
 
-.method private hf()V
+.method private hi()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Om:Z
 
     if-eqz v0, :cond_1
 
@@ -189,7 +189,7 @@
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->NT:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Ol:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -203,7 +203,7 @@
     const/4 v0, 0x1
 
     :try_start_1
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->NT:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Ol:Z
 
     const/4 v1, 0x0
 
@@ -211,7 +211,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iput-object v1, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
     sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -240,7 +240,7 @@
     invoke-virtual {p0, v1}, Lcom/facebook/drawee/view/DraweeView;->setColorFilter(I)V
 
     :cond_2
-    sget-boolean v1, Lcom/facebook/drawee/view/DraweeView;->NV:Z
+    sget-boolean v1, Lcom/facebook/drawee/view/DraweeView;->On:Z
 
     if-eqz v1, :cond_3
 
@@ -260,7 +260,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Om:Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -279,7 +279,7 @@
 .method public static setGlobalLegacyVisibilityHandlingEnabled(Z)V
     .locals 0
 
-    sput-boolean p0, Lcom/facebook/drawee/view/DraweeView;->NV:Z
+    sput-boolean p0, Lcom/facebook/drawee/view/DraweeView;->On:Z
 
     return-void
 .end method
@@ -289,7 +289,7 @@
 .method public getAspectRatio()F
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/view/DraweeView;->NS:F
+    iget v0, p0, Lcom/facebook/drawee/view/DraweeView;->Ok:F
 
     return v0
 .end method
@@ -299,9 +299,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
-    iget-object v0, v0, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
+    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
 
     return-object v0
 .end method
@@ -314,9 +314,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
-    iget-object v0, v0, Lcom/facebook/drawee/view/b;->NP:Lcom/facebook/drawee/d/b;
+    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Oh:Lcom/facebook/drawee/d/b;
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -332,7 +332,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -341,35 +341,16 @@
     return-object v0
 .end method
 
-.method public final he()Z
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
-
-    iget-object v0, v0, Lcom/facebook/drawee/view/b;->NP:Lcom/facebook/drawee/d/b;
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
 .method protected onAttachedToWindow()V
     .locals 1
 
     invoke-super {p0}, Landroid/widget/ImageView;->onAttachedToWindow()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hf()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hi()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gA()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gE()V
 
     return-void
 .end method
@@ -379,9 +360,9 @@
 
     invoke-super {p0}, Landroid/widget/ImageView;->onDetachedFromWindow()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hf()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hi()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->onDetach()V
 
@@ -393,11 +374,11 @@
 
     invoke-super {p0}, Landroid/widget/ImageView;->onFinishTemporaryDetach()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hf()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hi()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gA()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gE()V
 
     return-void
 .end method
@@ -405,13 +386,13 @@
 .method protected onMeasure(II)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NR:Lcom/facebook/drawee/view/a$a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Oj:Lcom/facebook/drawee/view/a$a;
 
     iput p1, v0, Lcom/facebook/drawee/view/a$a;->width:I
 
     iput p2, v0, Lcom/facebook/drawee/view/a$a;->height:I
 
-    iget p1, p0, Lcom/facebook/drawee/view/DraweeView;->NS:F
+    iget p1, p0, Lcom/facebook/drawee/view/DraweeView;->Ok:F
 
     invoke-virtual {p0}, Lcom/facebook/drawee/view/DraweeView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -531,11 +512,11 @@
 
     :cond_2
     :goto_0
-    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->NR:Lcom/facebook/drawee/view/a$a;
+    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->Oj:Lcom/facebook/drawee/view/a$a;
 
     iget p1, p1, Lcom/facebook/drawee/view/a$a;->width:I
 
-    iget-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->NR:Lcom/facebook/drawee/view/a$a;
+    iget-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->Oj:Lcom/facebook/drawee/view/a$a;
 
     iget p2, p2, Lcom/facebook/drawee/view/a$a;->height:I
 
@@ -549,9 +530,9 @@
 
     invoke-super {p0}, Landroid/widget/ImageView;->onStartTemporaryDetach()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hf()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hi()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->onDetach()V
 
@@ -561,9 +542,9 @@
 .method public onTouchEvent(Landroid/view/MotionEvent;)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->ha()Z
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->he()Z
 
     move-result v1
 
@@ -574,7 +555,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, v0, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
+    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/drawee/d/a;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
@@ -600,7 +581,7 @@
 
     invoke-super {p0, p1, p2}, Landroid/widget/ImageView;->onVisibilityChanged(Landroid/view/View;I)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hf()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hi()V
 
     return-void
 .end method
@@ -608,7 +589,7 @@
 .method public setAspectRatio(F)V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/view/DraweeView;->NS:F
+    iget v0, p0, Lcom/facebook/drawee/view/DraweeView;->Ok:F
 
     cmpl-float v0, p1, v0
 
@@ -617,7 +598,7 @@
     return-void
 
     :cond_0
-    iput p1, p0, Lcom/facebook/drawee/view/DraweeView;->NS:F
+    iput p1, p0, Lcom/facebook/drawee/view/DraweeView;->Ok:F
 
     invoke-virtual {p0}, Lcom/facebook/drawee/view/DraweeView;->requestLayout()V
 
@@ -631,11 +612,11 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/view/b;->setController(Lcom/facebook/drawee/d/a;)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/b;->getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -654,11 +635,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/view/b;->setHierarchy(Lcom/facebook/drawee/d/b;)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/b;->getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -680,7 +661,7 @@
 
     invoke-direct {p0, v0}, Lcom/facebook/drawee/view/DraweeView;->init(Landroid/content/Context;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
     const/4 v1, 0x0
 
@@ -702,7 +683,7 @@
 
     invoke-direct {p0, v0}, Lcom/facebook/drawee/view/DraweeView;->init(Landroid/content/Context;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
     const/4 v1, 0x0
 
@@ -724,7 +705,7 @@
 
     invoke-direct {p0, v0}, Lcom/facebook/drawee/view/DraweeView;->init(Landroid/content/Context;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
     const/4 v1, 0x0
 
@@ -746,7 +727,7 @@
 
     invoke-direct {p0, v0}, Lcom/facebook/drawee/view/DraweeView;->init(Landroid/content/Context;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
     const/4 v1, 0x0
 
@@ -760,7 +741,7 @@
 .method public setLegacyVisibilityHandlingEnabled(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/view/DraweeView;->Om:Z
 
     return-void
 .end method
@@ -772,7 +753,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/DraweeView;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/DraweeView;->NU:Lcom/facebook/drawee/view/b;
 
     if-eqz v1, :cond_0
 
diff --git a/com.discord/smali/com/facebook/drawee/view/SimpleDraweeView.smali b/com.discord/smali/com/facebook/drawee/view/SimpleDraweeView.smali
index 2a48225b3a..eb3ae76598 100644
--- a/com.discord/smali/com/facebook/drawee/view/SimpleDraweeView.smali
+++ b/com.discord/smali/com/facebook/drawee/view/SimpleDraweeView.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static NW:Lcom/facebook/common/d/k;
+.field private static Oo:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field private NX:Lcom/facebook/drawee/controller/a;
+.field private Op:Lcom/facebook/drawee/controller/a;
 
 
 # direct methods
@@ -82,7 +82,7 @@
         .end annotation
     .end param
 
-    iget-object p2, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->NX:Lcom/facebook/drawee/controller/a;
+    iget-object p2, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Op:Lcom/facebook/drawee/controller/a;
 
     const/4 v0, 0x0
 
@@ -102,7 +102,7 @@
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/facebook/drawee/d/d;->gG()Lcom/facebook/drawee/d/a;
+    invoke-interface {p1}, Lcom/facebook/drawee/d/d;->gK()Lcom/facebook/drawee/d/a;
 
     move-result-object p1
 
@@ -123,7 +123,7 @@
         }
     .end annotation
 
-    sput-object p0, Lcom/facebook/drawee/view/SimpleDraweeView;->NW:Lcom/facebook/common/d/k;
+    sput-object p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Oo:Lcom/facebook/common/d/k;
 
     return-void
 .end method
@@ -163,13 +163,13 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lcom/facebook/drawee/view/SimpleDraweeView;->NW:Lcom/facebook/common/d/k;
+    sget-object v0, Lcom/facebook/drawee/view/SimpleDraweeView;->Oo:Lcom/facebook/common/d/k;
 
     const-string v1, "SimpleDraweeView was not initialized!"
 
     invoke-static {v0, v1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/facebook/drawee/view/SimpleDraweeView;->NW:Lcom/facebook/common/d/k;
+    sget-object v0, Lcom/facebook/drawee/view/SimpleDraweeView;->Oo:Lcom/facebook/common/d/k;
 
     invoke-interface {v0}, Lcom/facebook/common/d/k;->get()Ljava/lang/Object;
 
@@ -177,7 +177,7 @@
 
     check-cast v0, Lcom/facebook/drawee/controller/a;
 
-    iput-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->NX:Lcom/facebook/drawee/controller/a;
+    iput-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Op:Lcom/facebook/drawee/controller/a;
 
     :goto_0
     if-eqz p2, :cond_4
@@ -284,7 +284,7 @@
 .method protected getControllerBuilder()Lcom/facebook/drawee/controller/a;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->NX:Lcom/facebook/drawee/controller/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Op:Lcom/facebook/drawee/controller/a;
 
     return-object v0
 .end method
@@ -306,7 +306,7 @@
 .method public setImageRequest(Lcom/facebook/imagepipeline/request/b;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->NX:Lcom/facebook/drawee/controller/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Op:Lcom/facebook/drawee/controller/a;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/controller/a;->I(Ljava/lang/Object;)Lcom/facebook/drawee/controller/a;
 
@@ -320,7 +320,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/controller/a;->gF()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p1}, Lcom/facebook/drawee/controller/a;->gJ()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/facebook/drawee/view/b.smali b/com.discord/smali/com/facebook/drawee/view/b.smali
index cd581b86db..ec9536c733 100644
--- a/com.discord/smali/com/facebook/drawee/view/b.smali
+++ b/com.discord/smali/com/facebook/drawee/view/b.smali
@@ -19,15 +19,15 @@
 
 
 # instance fields
-.field private final Kh:Lcom/facebook/drawee/a/b;
+.field private final Ky:Lcom/facebook/drawee/a/b;
 
-.field private NM:Z
+.field private Oe:Z
 
-.field private NN:Z
+.field private Of:Z
 
-.field private NO:Z
+.field private Og:Z
 
-.field NP:Lcom/facebook/drawee/d/b;
+.field public Oh:Lcom/facebook/drawee/d/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TDH;"
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field public NQ:Lcom/facebook/drawee/d/a;
+.field public Oi:Lcom/facebook/drawee/d/a;
 
 
 # direct methods
@@ -55,23 +55,23 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->NM:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Oe:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->NN:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Of:Z
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->NO:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Og:Z
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
+    iput-object v0, p0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
 
-    invoke-static {}, Lcom/facebook/drawee/a/b;->gw()Lcom/facebook/drawee/a/b;
+    invoke-static {}, Lcom/facebook/drawee/a/b;->gA()Lcom/facebook/drawee/a/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/drawee/view/b;->Kh:Lcom/facebook/drawee/a/b;
+    iput-object v0, p0, Lcom/facebook/drawee/view/b;->Ky:Lcom/facebook/drawee/a/b;
 
     if-eqz p1, :cond_0
 
@@ -127,27 +127,27 @@
     return-void
 .end method
 
-.method private hb()V
+.method private hf()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->NM:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Oe:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JL:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kc:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->NM:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Oe:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
 
     if-eqz v0, :cond_1
 
@@ -157,41 +157,41 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
 
-    invoke-interface {v0}, Lcom/facebook/drawee/d/a;->gA()V
+    invoke-interface {v0}, Lcom/facebook/drawee/d/a;->gE()V
 
     :cond_1
     return-void
 .end method
 
-.method private hc()V
+.method private hg()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->NM:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Oe:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JM:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kd:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->NM:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Oe:Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->ha()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->he()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
 
     invoke-interface {v0}, Lcom/facebook/drawee/d/a;->onDetach()V
 
@@ -199,43 +199,43 @@
     return-void
 .end method
 
-.method private hd()V
+.method private hh()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->NN:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Of:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->NO:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Og:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hb()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hf()V
 
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hc()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hg()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final gA()V
+.method public final gE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JT:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kk:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->NN:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Of:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hd()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hh()V
 
     return-void
 .end method
@@ -245,7 +245,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->NP:Lcom/facebook/drawee/d/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Oh:Lcom/facebook/drawee/d/b;
 
     if-nez v0, :cond_0
 
@@ -261,10 +261,10 @@
     return-object v0
 .end method
 
-.method public final ha()Z
+.method public final he()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
 
     if-eqz v0, :cond_0
 
@@ -272,7 +272,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->NP:Lcom/facebook/drawee/d/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Oh:Lcom/facebook/drawee/d/b;
 
     if-ne v0, v1, :cond_0
 
@@ -289,17 +289,17 @@
 .method public final onDetach()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JU:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kl:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->NN:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Of:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hd()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hh()V
 
     return-void
 .end method
@@ -307,7 +307,7 @@
 .method public final onDraw()V
     .locals 5
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->NM:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Oe:Z
 
     if-eqz v0, :cond_0
 
@@ -332,7 +332,7 @@
 
     aput-object v3, v1, v2
 
-    iget-object v2, p0, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
+    iget-object v2, p0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
 
     invoke-static {v2}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -358,11 +358,11 @@
 
     invoke-static {v0, v2, v1}, Lcom/facebook/common/e/a;->b(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iput-boolean v3, p0, Lcom/facebook/drawee/view/b;->NN:Z
+    iput-boolean v3, p0, Lcom/facebook/drawee/view/b;->Of:Z
 
-    iput-boolean v3, p0, Lcom/facebook/drawee/view/b;->NO:Z
+    iput-boolean v3, p0, Lcom/facebook/drawee/view/b;->Og:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hd()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hh()V
 
     return-void
 .end method
@@ -374,63 +374,63 @@
         .end annotation
     .end param
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->NM:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Oe:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hc()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hg()V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->ha()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->he()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v2, Lcom/facebook/drawee/a/b$a;->JI:Lcom/facebook/drawee/a/b$a;
+    sget-object v2, Lcom/facebook/drawee/a/b$a;->JZ:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v1, v2}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
 
     const/4 v2, 0x0
 
     invoke-interface {v1, v2}, Lcom/facebook/drawee/d/a;->setHierarchy(Lcom/facebook/drawee/d/b;)V
 
     :cond_1
-    iput-object p1, p0, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
+    iput-object p1, p0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
 
-    iget-object p1, p0, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
+    iget-object p1, p0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/facebook/drawee/view/b;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object p1, p0, Lcom/facebook/drawee/view/b;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JH:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->JY:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {p1, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
+    iget-object p1, p0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->NP:Lcom/facebook/drawee/d/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Oh:Lcom/facebook/drawee/d/b;
 
     invoke-interface {p1, v1}, Lcom/facebook/drawee/d/a;->setHierarchy(Lcom/facebook/drawee/d/b;)V
 
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/facebook/drawee/view/b;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object p1, p0, Lcom/facebook/drawee/view/b;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JJ:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ka:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {p1, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
     :goto_0
     if-eqz v0, :cond_3
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hb()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hf()V
 
     :cond_3
     return-void
@@ -444,13 +444,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Ky:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JF:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->JW:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->ha()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->he()Z
 
     move-result v0
 
@@ -464,9 +464,9 @@
 
     check-cast v1, Lcom/facebook/drawee/d/b;
 
-    iput-object v1, p0, Lcom/facebook/drawee/view/b;->NP:Lcom/facebook/drawee/d/b;
+    iput-object v1, p0, Lcom/facebook/drawee/view/b;->Oh:Lcom/facebook/drawee/d/b;
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->NP:Lcom/facebook/drawee/d/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Oh:Lcom/facebook/drawee/d/b;
 
     invoke-interface {v1}, Lcom/facebook/drawee/d/b;->getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -492,13 +492,13 @@
     const/4 v1, 0x1
 
     :goto_1
-    invoke-virtual {p0, v1}, Lcom/facebook/drawee/view/b;->z(Z)V
+    invoke-virtual {p0, v1}, Lcom/facebook/drawee/view/b;->x(Z)V
 
     invoke-direct {p0, p0}, Lcom/facebook/drawee/view/b;->a(Lcom/facebook/drawee/drawable/t;)V
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Oi:Lcom/facebook/drawee/d/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/drawee/d/a;->setHierarchy(Lcom/facebook/drawee/d/b;)V
 
@@ -513,7 +513,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->NM:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->Oe:Z
 
     const-string v2, "controllerAttached"
 
@@ -521,7 +521,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->NN:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->Of:Z
 
     const-string v2, "holderAttached"
 
@@ -529,7 +529,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->NO:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->Og:Z
 
     const-string v2, "drawableVisible"
 
@@ -537,7 +537,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Ky:Lcom/facebook/drawee/a/b;
 
     invoke-virtual {v1}, Lcom/facebook/drawee/a/b;->toString()Ljava/lang/String;
 
@@ -556,33 +556,33 @@
     return-object v0
 .end method
 
-.method public final z(Z)V
+.method public final x(Z)V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->NO:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Og:Z
 
     if-ne v0, p1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Kh:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Ky:Lcom/facebook/drawee/a/b;
 
     if-eqz p1, :cond_1
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JV:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Km:Lcom/facebook/drawee/a/b$a;
 
     goto :goto_0
 
     :cond_1
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JW:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kn:Lcom/facebook/drawee/a/b$a;
 
     :goto_0
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/view/b;->NO:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/view/b;->Og:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hd()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hh()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/view/c.smali b/com.discord/smali/com/facebook/drawee/view/c.smali
index 2805118407..1e3d056b66 100644
--- a/com.discord/smali/com/facebook/drawee/view/c.smali
+++ b/com.discord/smali/com/facebook/drawee/view/c.smali
@@ -79,11 +79,11 @@
 
     move-result-object p1
 
-    iget p2, p1, Lcom/facebook/drawee/generic/a;->MX:F
+    iget p2, p1, Lcom/facebook/drawee/generic/a;->Np:F
 
     invoke-virtual {p0, p2}, Lcom/facebook/drawee/view/c;->setAspectRatio(F)V
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/generic/a;->gX()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {p1}, Lcom/facebook/drawee/generic/a;->hb()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/facebook/fresco/animation/a/b.smali b/com.discord/smali/com/facebook/fresco/animation/a/b.smali
index 6a719b1014..004fc528ab 100644
--- a/com.discord/smali/com/facebook/fresco/animation/a/b.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/a/b.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field private NY:Lcom/facebook/fresco/animation/a/a;
+.field private Oq:Lcom/facebook/fresco/animation/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -62,7 +62,7 @@
 
     iput v0, p0, Lcom/facebook/fresco/animation/a/b;->mAlpha:I
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/a/b;->NY:Lcom/facebook/fresco/animation/a/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/a/b;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 .method public final Y(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -91,7 +91,7 @@
 .method public a(Landroid/graphics/drawable/Drawable;Landroid/graphics/Canvas;I)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_0
 
@@ -114,7 +114,7 @@
 .method public final clear()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_0
 
@@ -124,10 +124,10 @@
     return-void
 .end method
 
-.method public final fe()I
+.method public final fj()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -136,7 +136,7 @@
     return v0
 
     :cond_0
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fe()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fj()I
 
     move-result v0
 
@@ -146,7 +146,7 @@
 .method public final getFrameCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -165,7 +165,7 @@
 .method public final getIntrinsicHeight()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -184,7 +184,7 @@
 .method public final getIntrinsicWidth()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -203,7 +203,7 @@
 .method public final setAlpha(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_0
 
@@ -222,7 +222,7 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_0
 
@@ -237,7 +237,7 @@
 .method public final setColorFilter(Landroid/graphics/ColorFilter;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali/com/facebook/fresco/animation/a/c.smali b/com.discord/smali/com/facebook/fresco/animation/a/c.smali
index 5c6ab611cd..05448082ea 100644
--- a/com.discord/smali/com/facebook/fresco/animation/a/c.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/a/c.smali
@@ -22,24 +22,24 @@
 
 
 # instance fields
-.field final Jo:Lcom/facebook/common/time/b;
+.field final JF:Lcom/facebook/common/time/b;
 
-.field private final NZ:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final Or:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field Oa:Z
+.field Os:Z
 
-.field Ob:J
+.field Ot:J
 
-.field Oc:J
+.field Ou:J
 
-.field private Od:J
+.field private Ov:J
 
-.field Oe:Lcom/facebook/fresco/animation/a/c$a;
+.field Ow:Lcom/facebook/fresco/animation/a/c$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Of:Ljava/lang/Runnable;
+.field private final Ox:Ljava/lang/Runnable;
 
 
 # direct methods
@@ -67,27 +67,27 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/fresco/animation/a/c;->Oa:Z
+    iput-boolean p1, p0, Lcom/facebook/fresco/animation/a/c;->Os:Z
 
     const-wide/16 v0, 0x7d0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->Oc:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->Ou:J
 
     const-wide/16 v0, 0x3e8
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->Od:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->Ov:J
 
     new-instance p1, Lcom/facebook/fresco/animation/a/c$1;
 
     invoke-direct {p1, p0}, Lcom/facebook/fresco/animation/a/c$1;-><init>(Lcom/facebook/fresco/animation/a/c;)V
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/a/c;->Of:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/a/c;->Ox:Ljava/lang/Runnable;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/a/c;->Oe:Lcom/facebook/fresco/animation/a/c$a;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/a/c;->Ow:Lcom/facebook/fresco/animation/a/c$a;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/a/c;->Jo:Lcom/facebook/common/time/b;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/a/c;->JF:Lcom/facebook/common/time/b;
 
-    iput-object p4, p0, Lcom/facebook/fresco/animation/a/c;->NZ:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p4, p0, Lcom/facebook/fresco/animation/a/c;->Or:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-void
 .end method
@@ -97,42 +97,42 @@
 .method public final a(Landroid/graphics/drawable/Drawable;Landroid/graphics/Canvas;I)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c;->Jo:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c;->JF:Lcom/facebook/common/time/b;
 
     invoke-interface {v0}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->Ob:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->Ot:J
 
     invoke-super {p0, p1, p2, p3}, Lcom/facebook/fresco/animation/a/b;->a(Landroid/graphics/drawable/Drawable;Landroid/graphics/Canvas;I)Z
 
     move-result p1
 
-    invoke-virtual {p0}, Lcom/facebook/fresco/animation/a/c;->hg()V
+    invoke-virtual {p0}, Lcom/facebook/fresco/animation/a/c;->hj()V
 
     return p1
 .end method
 
-.method final declared-synchronized hg()V
+.method final declared-synchronized hj()V
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/fresco/animation/a/c;->Oa:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/a/c;->Os:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/fresco/animation/a/c;->Oa:Z
+    iput-boolean v0, p0, Lcom/facebook/fresco/animation/a/c;->Os:Z
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c;->NZ:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c;->Or:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c;->Of:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c;->Ox:Ljava/lang/Runnable;
 
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/a/c;->Od:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/a/c;->Ov:J
 
     sget-object v4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
diff --git a/com.discord/smali/com/facebook/fresco/animation/a/d.smali b/com.discord/smali/com/facebook/fresco/animation/a/d.smali
index 8ff0864cc9..fe9c3c5838 100644
--- a/com.discord/smali/com/facebook/fresco/animation/a/d.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/a/d.smali
@@ -7,7 +7,7 @@
 .method public abstract Y(I)I
 .end method
 
-.method public abstract fe()I
+.method public abstract fj()I
 .end method
 
 .method public abstract getFrameCount()I
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/a.smali b/com.discord/smali/com/facebook/fresco/animation/b/a.smali
index 449099f398..6f9b034d1c 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/a.smali
@@ -8,7 +8,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -19,25 +19,25 @@
 
 
 # instance fields
-.field private final Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final OA:Lcom/facebook/fresco/animation/b/b;
 
-.field private final Oi:Lcom/facebook/fresco/animation/b/b;
+.field private final OB:Lcom/facebook/fresco/animation/a/d;
 
-.field private final Oj:Lcom/facebook/fresco/animation/a/d;
+.field private final OC:Lcom/facebook/fresco/animation/b/c;
 
-.field private final Ok:Lcom/facebook/fresco/animation/b/c;
-
-.field private final Ol:Lcom/facebook/fresco/animation/b/b/a;
+.field private final OD:Lcom/facebook/fresco/animation/b/b/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Om:Lcom/facebook/fresco/animation/b/b/b;
+.field private final OE:Lcom/facebook/fresco/animation/b/b/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private On:Landroid/graphics/Bitmap$Config;
+.field private OF:Landroid/graphics/Bitmap$Config;
+
+.field private final Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
 .field private mBitmapHeight:I
 
@@ -57,7 +57,7 @@
 
     const-class v0, Lcom/facebook/fresco/animation/b/a;
 
-    sput-object v0, Lcom/facebook/fresco/animation/b/a;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/a;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -77,19 +77,19 @@
 
     sget-object v0, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/b/a;->On:Landroid/graphics/Bitmap$Config;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/b/a;->OF:Landroid/graphics/Bitmap$Config;
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/b/a;->Oi:Lcom/facebook/fresco/animation/b/b;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/a;->OA:Lcom/facebook/fresco/animation/b/b;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/b/a;->Oj:Lcom/facebook/fresco/animation/a/d;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/b/a;->OB:Lcom/facebook/fresco/animation/a/d;
 
-    iput-object p4, p0, Lcom/facebook/fresco/animation/b/a;->Ok:Lcom/facebook/fresco/animation/b/c;
+    iput-object p4, p0, Lcom/facebook/fresco/animation/b/a;->OC:Lcom/facebook/fresco/animation/b/c;
 
-    iput-object p5, p0, Lcom/facebook/fresco/animation/b/a;->Ol:Lcom/facebook/fresco/animation/b/b/a;
+    iput-object p5, p0, Lcom/facebook/fresco/animation/b/a;->OD:Lcom/facebook/fresco/animation/b/b/a;
 
-    iput-object p6, p0, Lcom/facebook/fresco/animation/b/a;->Om:Lcom/facebook/fresco/animation/b/b/b;
+    iput-object p6, p0, Lcom/facebook/fresco/animation/b/a;->OE:Lcom/facebook/fresco/animation/b/b/b;
 
     new-instance p1, Landroid/graphics/Paint;
 
@@ -99,7 +99,7 @@
 
     iput-object p1, p0, Lcom/facebook/fresco/animation/b/a;->mPaint:Landroid/graphics/Paint;
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a;->hh()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a;->hk()V
 
     return-void
 .end method
@@ -130,7 +130,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->Ok:Lcom/facebook/fresco/animation/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->OC:Lcom/facebook/fresco/animation/b/c;
 
     invoke-virtual {p2}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -216,7 +216,7 @@
 
     if-eq p4, p3, :cond_2
 
-    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->Oi:Lcom/facebook/fresco/animation/b/b;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->OA:Lcom/facebook/fresco/animation/b/b;
 
     invoke-interface {p3, p1, p2}, Lcom/facebook/fresco/animation/b/b;->b(ILcom/facebook/common/references/CloseableReference;)V
 
@@ -256,9 +256,9 @@
 
     :cond_0
     :try_start_0
-    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->Oi:Lcom/facebook/fresco/animation/b/b;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->OA:Lcom/facebook/fresco/animation/b/b;
 
-    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->hi()Lcom/facebook/common/references/CloseableReference;
+    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->hl()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v3
 
@@ -274,13 +274,13 @@
 
     :cond_1
     :try_start_1
-    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     iget v6, p0, Lcom/facebook/fresco/animation/b/a;->mBitmapWidth:I
 
     iget v7, p0, Lcom/facebook/fresco/animation/b/a;->mBitmapHeight:I
 
-    iget-object v8, p0, Lcom/facebook/fresco/animation/b/a;->On:Landroid/graphics/Bitmap$Config;
+    iget-object v8, p0, Lcom/facebook/fresco/animation/b/a;->OF:Landroid/graphics/Bitmap$Config;
 
     invoke-virtual {p3, v6, v7, v8}, Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;->c(IILandroid/graphics/Bitmap$Config;)Lcom/facebook/common/references/CloseableReference;
 
@@ -314,7 +314,7 @@
     :catch_0
     move-exception p1
 
-    sget-object p2, Lcom/facebook/fresco/animation/b/a;->Fl:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/fresco/animation/b/a;->FC:Ljava/lang/Class;
 
     const-string p3, "Failed to create frame bitmap"
 
@@ -328,9 +328,9 @@
 
     :cond_3
     :try_start_3
-    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->Oi:Lcom/facebook/fresco/animation/b/b;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->OA:Lcom/facebook/fresco/animation/b/b;
 
-    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->hj()Lcom/facebook/common/references/CloseableReference;
+    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->hm()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v3
 
@@ -359,7 +359,7 @@
     goto :goto_2
 
     :cond_5
-    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->Oi:Lcom/facebook/fresco/animation/b/b;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->OA:Lcom/facebook/fresco/animation/b/b;
 
     invoke-interface {p3, p2}, Lcom/facebook/fresco/animation/b/b;->Z(I)Lcom/facebook/common/references/CloseableReference;
 
@@ -405,10 +405,10 @@
     goto :goto_4
 .end method
 
-.method private hh()V
+.method private hk()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->Ok:Lcom/facebook/fresco/animation/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->OC:Lcom/facebook/fresco/animation/b/c;
 
     invoke-interface {v0}, Lcom/facebook/fresco/animation/b/c;->getIntrinsicWidth()I
 
@@ -439,7 +439,7 @@
     iput v0, p0, Lcom/facebook/fresco/animation/b/a;->mBitmapWidth:I
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->Ok:Lcom/facebook/fresco/animation/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->OC:Lcom/facebook/fresco/animation/b/c;
 
     invoke-interface {v0}, Lcom/facebook/fresco/animation/b/c;->getIntrinsicHeight()I
 
@@ -474,7 +474,7 @@
 .method public final Y(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->Oj:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->OB:Lcom/facebook/fresco/animation/a/d;
 
     invoke-interface {v0, p1}, Lcom/facebook/fresco/animation/a/d;->Y(I)I
 
@@ -492,15 +492,15 @@
 
     move-result p1
 
-    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a;->Ol:Lcom/facebook/fresco/animation/b/b/a;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a;->OD:Lcom/facebook/fresco/animation/b/b/a;
 
     if-eqz p2, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->Om:Lcom/facebook/fresco/animation/b/b/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->OE:Lcom/facebook/fresco/animation/b/b/b;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a;->Oi:Lcom/facebook/fresco/animation/b/b;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a;->OA:Lcom/facebook/fresco/animation/b/b;
 
     invoke-interface {p2, v0, v1, p0, p3}, Lcom/facebook/fresco/animation/b/b/a;->a(Lcom/facebook/fresco/animation/b/b/b;Lcom/facebook/fresco/animation/b/b;Lcom/facebook/fresco/animation/a/a;I)V
 
@@ -511,19 +511,19 @@
 .method public final clear()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->Oi:Lcom/facebook/fresco/animation/b/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->OA:Lcom/facebook/fresco/animation/b/b;
 
     invoke-interface {v0}, Lcom/facebook/fresco/animation/b/b;->clear()V
 
     return-void
 .end method
 
-.method public final fe()I
+.method public final fj()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->Oj:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->OB:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fe()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fj()I
 
     move-result v0
 
@@ -533,7 +533,7 @@
 .method public final getFrameCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->Oj:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->OB:Lcom/facebook/fresco/animation/a/d;
 
     invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->getFrameCount()I
 
@@ -585,11 +585,11 @@
 
     iput-object p1, p0, Lcom/facebook/fresco/animation/b/a;->mBounds:Landroid/graphics/Rect;
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->Ok:Lcom/facebook/fresco/animation/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->OC:Lcom/facebook/fresco/animation/b/c;
 
     invoke-interface {v0, p1}, Lcom/facebook/fresco/animation/b/c;->setBounds(Landroid/graphics/Rect;)V
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a;->hh()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a;->hk()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/a/a.smali b/com.discord/smali/com/facebook/fresco/animation/b/a/a.smali
index e174211dbf..470d645419 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/a/a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/a/a.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field private final Oo:Lcom/facebook/imagepipeline/animated/c/c;
+.field private final OG:Lcom/facebook/imagepipeline/animated/c/c;
 
-.field private final Op:Z
+.field private final OH:Z
 
-.field private final Oq:Landroid/util/SparseArray;
+.field private final OI:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private Or:Lcom/facebook/common/references/CloseableReference;
+.field private OJ:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -53,7 +53,7 @@
 
     const-class v0, Lcom/facebook/fresco/animation/b/a/a;
 
-    sput-object v0, Lcom/facebook/fresco/animation/b/a/a;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/a/a;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -63,15 +63,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a/a;->Oo:Lcom/facebook/imagepipeline/animated/c/c;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a/a;->OG:Lcom/facebook/imagepipeline/animated/c/c;
 
-    iput-boolean p2, p0, Lcom/facebook/fresco/animation/b/a/a;->Op:Z
+    iput-boolean p2, p0, Lcom/facebook/fresco/animation/b/a/a;->OH:Z
 
     new-instance p1, Landroid/util/SparseArray;
 
     invoke-direct {p1}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a/a;->Oq:Landroid/util/SparseArray;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a/a;->OI:Landroid/util/SparseArray;
 
     return-void
 .end method
@@ -82,7 +82,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->Oq:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->OI:Landroid/util/SparseArray;
 
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -92,13 +92,13 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->Oq:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->OI:Landroid/util/SparseArray;
 
     invoke-virtual {v1, p1}, Landroid/util/SparseArray;->delete(I)V
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
-    sget-object v0, Lcom/facebook/fresco/animation/b/a/a;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/fresco/animation/b/a/a;->FC:Ljava/lang/Class;
 
     const-string v1, "removePreparedReference(%d) removed. Pending frames: %s"
 
@@ -106,7 +106,7 @@
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/b/a/a;->Oq:Landroid/util/SparseArray;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/b/a/a;->OI:Landroid/util/SparseArray;
 
     invoke-static {v0, v1, p1, v2}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
     :try_end_0
@@ -169,7 +169,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/f/d;->iE()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/f/d;->iD()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
     :try_end_0
@@ -213,7 +213,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/f/d;
 
-    sget-object v1, Lcom/facebook/imagepipeline/f/g;->Ux:Lcom/facebook/imagepipeline/f/h;
+    sget-object v1, Lcom/facebook/imagepipeline/f/g;->UQ:Lcom/facebook/imagepipeline/f/h;
 
     invoke-direct {v0, p0, v1}, Lcom/facebook/imagepipeline/f/d;-><init>(Lcom/facebook/common/references/CloseableReference;Lcom/facebook/imagepipeline/f/h;)V
 
@@ -243,9 +243,9 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->Oo:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->OG:Lcom/facebook/imagepipeline/animated/c/c;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/animated/c/c;->OT:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/animated/c/c;->Pl:Lcom/facebook/imagepipeline/cache/h;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/animated/c/c;->ad(I)Lcom/facebook/imagepipeline/animated/c/c$a;
 
@@ -302,17 +302,17 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->Or:Lcom/facebook/common/references/CloseableReference;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->OJ:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {p2}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
-    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->Oo:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->OG:Lcom/facebook/imagepipeline/animated/c/c;
 
     invoke-virtual {p2, p1, v0}, Lcom/facebook/imagepipeline/animated/c/c;->e(ILcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a/a;->Or:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a/a;->OJ:Lcom/facebook/common/references/CloseableReference;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -384,7 +384,7 @@
 
     :cond_0
     :try_start_3
-    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->Oo:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->OG:Lcom/facebook/imagepipeline/animated/c/c;
 
     invoke-virtual {p2, p1, v0}, Lcom/facebook/imagepipeline/animated/c/c;->e(ILcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -396,7 +396,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->Oq:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->OI:Landroid/util/SparseArray;
 
     invoke-virtual {v1, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -406,11 +406,11 @@
 
     invoke-static {v1}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->Oq:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->OI:Landroid/util/SparseArray;
 
     invoke-virtual {v1, p1, p2}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
 
-    sget-object p2, Lcom/facebook/fresco/animation/b/a/a;->Fl:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/fresco/animation/b/a/a;->FC:Ljava/lang/Class;
 
     const-string v1, "cachePreparedFrame(%d) cached. Pending frames: %s"
 
@@ -418,7 +418,7 @@
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/b/a/a;->Oq:Landroid/util/SparseArray;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/b/a/a;->OI:Landroid/util/SparseArray;
 
     invoke-static {p2, v1, p1, v2}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
     :try_end_3
@@ -458,18 +458,18 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->Or:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->OJ:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->Or:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->OJ:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->Oq:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->OI:Landroid/util/SparseArray;
 
     invoke-virtual {v1}, Landroid/util/SparseArray;->size()I
 
@@ -477,7 +477,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->Oq:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->OI:Landroid/util/SparseArray;
 
     invoke-virtual {v1, v0}, Landroid/util/SparseArray;->valueAt(I)Ljava/lang/Object;
 
@@ -492,7 +492,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->Oq:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->OI:Landroid/util/SparseArray;
 
     invoke-virtual {v0}, Landroid/util/SparseArray;->clear()V
     :try_end_0
@@ -522,9 +522,9 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->Oo:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->OG:Lcom/facebook/imagepipeline/animated/c/c;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/animated/c/c;->OT:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/animated/c/c;->Pl:Lcom/facebook/imagepipeline/cache/h;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/animated/c/c;->ad(I)Lcom/facebook/imagepipeline/animated/c/c$a;
 
@@ -548,7 +548,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized hi()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized hl()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -565,7 +565,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->Or:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->OJ:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -589,7 +589,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized hj()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized hm()Lcom/facebook/common/references/CloseableReference;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -606,7 +606,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/fresco/animation/b/a/a;->Op:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/b/a/a;->OH:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -620,10 +620,10 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->Oo:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->OG:Lcom/facebook/imagepipeline/animated/c/c;
 
     :cond_1
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/animated/c/c;->hw()Lcom/facebook/cache/common/CacheKey;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/animated/c/c;->hz()Lcom/facebook/cache/common/CacheKey;
 
     move-result-object v2
 
@@ -632,7 +632,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v3, v0, Lcom/facebook/imagepipeline/animated/c/c;->OT:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/animated/c/c;->Pl:Lcom/facebook/imagepipeline/cache/h;
 
     invoke-virtual {v3, v2}, Lcom/facebook/imagepipeline/cache/h;->N(Ljava/lang/Object;)Lcom/facebook/common/references/CloseableReference;
 
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/a/b.smali b/com.discord/smali/com/facebook/fresco/animation/b/a/b.smali
index 2eac652425..6d0aaa9adc 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/a/b.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/a/b.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private Os:I
+.field private OL:I
 
-.field private Ot:Lcom/facebook/common/references/CloseableReference;
+.field private OM:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -31,28 +31,28 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Os:I
+    iput v0, p0, Lcom/facebook/fresco/animation/b/a/b;->OL:I
 
     return-void
 .end method
 
-.method private declared-synchronized hk()V
+.method private declared-synchronized hn()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Ot:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->OM:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Ot:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->OM:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Os:I
+    iput v0, p0, Lcom/facebook/fresco/animation/b/a/b;->OL:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -87,11 +87,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Os:I
+    iget v0, p0, Lcom/facebook/fresco/animation/b/a/b;->OL:I
 
     if-ne v0, p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/b/a/b;->Ot:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/a/b;->OM:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -134,7 +134,7 @@
     if-eqz p2, :cond_0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Ot:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->OM:Lcom/facebook/common/references/CloseableReference;
 
     if-eqz v0, :cond_0
 
@@ -144,7 +144,7 @@
 
     check-cast v0, Landroid/graphics/Bitmap;
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/b;->Ot:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/b;->OM:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v1}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -164,7 +164,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Ot:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->OM:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
@@ -172,9 +172,9 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/b/a/b;->Ot:Lcom/facebook/common/references/CloseableReference;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/a/b;->OM:Lcom/facebook/common/references/CloseableReference;
 
-    iput p1, p0, Lcom/facebook/fresco/animation/b/a/b;->Os:I
+    iput p1, p0, Lcom/facebook/fresco/animation/b/a/b;->OL:I
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -210,7 +210,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->hk()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->hn()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -232,11 +232,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Os:I
+    iget v0, p0, Lcom/facebook/fresco/animation/b/a/b;->OL:I
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/b/a/b;->Ot:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/a/b;->OM:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
 
@@ -272,7 +272,7 @@
     goto :goto_1
 .end method
 
-.method public final declared-synchronized hi()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized hl()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -289,7 +289,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Ot:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->OM:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -309,7 +309,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized hj()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized hm()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -323,7 +323,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Ot:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->OM:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -332,7 +332,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->hk()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->hn()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
@@ -344,7 +344,7 @@
     move-exception v0
 
     :try_start_2
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->hk()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->hn()V
 
     throw v0
     :try_end_2
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/a/c.smali b/com.discord/smali/com/facebook/fresco/animation/b/a/c.smali
index 0051c9d474..228deba57b 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/a/c.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/a/c.smali
@@ -78,7 +78,7 @@
     return p1
 .end method
 
-.method public final hi()Lcom/facebook/common/references/CloseableReference;
+.method public final hl()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -97,7 +97,7 @@
     return-object v0
 .end method
 
-.method public final hj()Lcom/facebook/common/references/CloseableReference;
+.method public final hm()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/b.smali b/com.discord/smali/com/facebook/fresco/animation/b/b.smali
index b4e087d1eb..3569f4cd4d 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/b.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/b.smali
@@ -46,7 +46,7 @@
 .method public abstract contains(I)Z
 .end method
 
-.method public abstract hi()Lcom/facebook/common/references/CloseableReference;
+.method public abstract hl()Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -60,7 +60,7 @@
     .end annotation
 .end method
 
-.method public abstract hj()Lcom/facebook/common/references/CloseableReference;
+.method public abstract hm()Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/c/b$1.smali b/com.discord/smali/com/facebook/fresco/animation/b/c/b$1.smali
index 05fc067750..569911bd79 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/c/b$1.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/c/b$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic OD:Lcom/facebook/fresco/animation/b/c/b;
+.field final synthetic OW:Lcom/facebook/fresco/animation/b/c/b;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/fresco/animation/b/c/b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b$1;->OD:Lcom/facebook/fresco/animation/b/c/b;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b$1;->OW:Lcom/facebook/fresco/animation/b/c/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,7 +48,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b$1;->OD:Lcom/facebook/fresco/animation/b/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b$1;->OW:Lcom/facebook/fresco/animation/b/c/b;
 
     invoke-static {v0}, Lcom/facebook/fresco/animation/b/c/b;->a(Lcom/facebook/fresco/animation/b/c/b;)Lcom/facebook/fresco/animation/b/b;
 
diff --git a/com.discord/smali/com/facebook/fresco/animation/b/c/b.smali b/com.discord/smali/com/facebook/fresco/animation/b/c/b.smali
index 1838cef5ba..b50177d982 100644
--- a/com.discord/smali/com/facebook/fresco/animation/b/c/b.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/b/c/b.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -18,13 +18,13 @@
 
 
 # instance fields
-.field private OA:Lcom/facebook/imagepipeline/animated/a/a;
+.field private final OA:Lcom/facebook/fresco/animation/b/b;
 
-.field private OB:Lcom/facebook/imagepipeline/animated/c/d;
+.field private OT:Lcom/facebook/imagepipeline/animated/a/a;
 
-.field private final OC:Lcom/facebook/imagepipeline/animated/c/d$a;
+.field private OU:Lcom/facebook/imagepipeline/animated/c/d;
 
-.field private final Oi:Lcom/facebook/fresco/animation/b/b;
+.field private final OV:Lcom/facebook/imagepipeline/animated/c/d$a;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     const-class v0, Lcom/facebook/fresco/animation/b/c/b;
 
-    sput-object v0, Lcom/facebook/fresco/animation/b/c/b;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/c/b;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -47,21 +47,21 @@
 
     invoke-direct {v0, p0}, Lcom/facebook/fresco/animation/b/c/b$1;-><init>(Lcom/facebook/fresco/animation/b/c/b;)V
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OC:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OV:Lcom/facebook/imagepipeline/animated/c/d$a;
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->Oi:Lcom/facebook/fresco/animation/b/b;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->OA:Lcom/facebook/fresco/animation/b/b;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/b/c/b;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/c/b;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     new-instance p1, Lcom/facebook/imagepipeline/animated/c/d;
 
-    iget-object p2, p0, Lcom/facebook/fresco/animation/b/c/b;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/c/b;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OC:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OV:Lcom/facebook/imagepipeline/animated/c/d$a;
 
     invoke-direct {p1, p2, v0}, Lcom/facebook/imagepipeline/animated/c/d;-><init>(Lcom/facebook/imagepipeline/animated/a/a;Lcom/facebook/imagepipeline/animated/c/d$a;)V
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->OB:Lcom/facebook/imagepipeline/animated/c/d;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->OU:Lcom/facebook/imagepipeline/animated/c/d;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 .method static synthetic a(Lcom/facebook/fresco/animation/b/c/b;)Lcom/facebook/fresco/animation/b/b;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/fresco/animation/b/c/b;->Oi:Lcom/facebook/fresco/animation/b/b;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/c/b;->OA:Lcom/facebook/fresco/animation/b/b;
 
     return-object p0
 .end method
@@ -82,7 +82,7 @@
     const/4 v0, 0x1
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/c/b;->OB:Lcom/facebook/imagepipeline/animated/c/d;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/c/b;->OU:Lcom/facebook/imagepipeline/animated/c/d;
 
     invoke-virtual {v1, p1, p2}, Lcom/facebook/imagepipeline/animated/c/d;->b(ILandroid/graphics/Bitmap;)V
     :try_end_0
@@ -93,7 +93,7 @@
     :catch_0
     move-exception p2
 
-    sget-object v1, Lcom/facebook/fresco/animation/b/c/b;->Fl:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/fresco/animation/b/c/b;->FC:Ljava/lang/Class;
 
     new-array v0, v0, [Ljava/lang/Object;
 
@@ -115,7 +115,7 @@
 .method public final getIntrinsicHeight()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->getHeight()I
 
@@ -127,7 +127,7 @@
 .method public final getIntrinsicWidth()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->getWidth()I
 
@@ -143,27 +143,27 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/animated/a/a;->b(Landroid/graphics/Rect;)Lcom/facebook/imagepipeline/animated/a/a;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     if-eq p1, v0, :cond_0
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     new-instance p1, Lcom/facebook/imagepipeline/animated/c/d;
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/c/b;->OC:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/c/b;->OV:Lcom/facebook/imagepipeline/animated/c/d$a;
 
     invoke-direct {p1, v0, v1}, Lcom/facebook/imagepipeline/animated/c/d;-><init>(Lcom/facebook/imagepipeline/animated/a/a;Lcom/facebook/imagepipeline/animated/c/d$a;)V
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->OB:Lcom/facebook/imagepipeline/animated/c/d;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->OU:Lcom/facebook/imagepipeline/animated/c/d;
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/facebook/fresco/animation/c/a.smali b/com.discord/smali/com/facebook/fresco/animation/c/a.smali
index 2391f6c66e..c9dd494504 100644
--- a/com.discord/smali/com/facebook/fresco/animation/c/a.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/c/a.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,49 +25,49 @@
     .end annotation
 .end field
 
-.field private static final OE:Lcom/facebook/fresco/animation/c/b;
+.field private static final OX:Lcom/facebook/fresco/animation/c/b;
 
 
 # instance fields
-.field private LE:J
-
-.field private Lm:Lcom/facebook/drawee/drawable/d;
+.field private LD:Lcom/facebook/drawee/drawable/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private NY:Lcom/facebook/fresco/animation/a/a;
+.field private LW:J
+
+.field private OY:Lcom/facebook/fresco/animation/d/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private OF:Lcom/facebook/fresco/animation/d/b;
+.field private volatile OZ:Z
+
+.field private Oq:Lcom/facebook/fresco/animation/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private volatile OG:Z
+.field private Pa:J
 
-.field private OH:J
+.field private Pb:J
 
-.field private OI:J
+.field private Pc:I
 
-.field private OJ:I
+.field private Pd:J
 
-.field private OL:J
+.field private Pe:J
 
-.field private OM:J
+.field private Pf:I
 
-.field private ON:I
+.field private volatile Pg:Lcom/facebook/fresco/animation/c/b;
 
-.field private volatile OO:Lcom/facebook/fresco/animation/c/b;
-
-.field private volatile OP:Lcom/facebook/fresco/animation/c/a$a;
+.field private volatile Ph:Lcom/facebook/fresco/animation/c/a$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final OQ:Ljava/lang/Runnable;
+.field private final Pi:Ljava/lang/Runnable;
 
 
 # direct methods
@@ -76,13 +76,13 @@
 
     const-class v0, Lcom/facebook/fresco/animation/c/a;
 
-    sput-object v0, Lcom/facebook/fresco/animation/c/a;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/c/a;->FC:Ljava/lang/Class;
 
     new-instance v0, Lcom/facebook/fresco/animation/c/c;
 
     invoke-direct {v0}, Lcom/facebook/fresco/animation/c/c;-><init>()V
 
-    sput-object v0, Lcom/facebook/fresco/animation/c/a;->OE:Lcom/facebook/fresco/animation/c/b;
+    sput-object v0, Lcom/facebook/fresco/animation/c/a;->OX:Lcom/facebook/fresco/animation/c/b;
 
     return-void
 .end method
@@ -108,29 +108,29 @@
 
     const-wide/16 v0, 0x8
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->OL:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Pd:J
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->OM:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Pe:J
 
-    sget-object v0, Lcom/facebook/fresco/animation/c/a;->OE:Lcom/facebook/fresco/animation/c/b;
+    sget-object v0, Lcom/facebook/fresco/animation/c/a;->OX:Lcom/facebook/fresco/animation/c/b;
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->OO:Lcom/facebook/fresco/animation/c/b;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Pg:Lcom/facebook/fresco/animation/c/b;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->OP:Lcom/facebook/fresco/animation/c/a$a;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Ph:Lcom/facebook/fresco/animation/c/a$a;
 
     new-instance v1, Lcom/facebook/fresco/animation/c/a$1;
 
     invoke-direct {v1, p0}, Lcom/facebook/fresco/animation/c/a$1;-><init>(Lcom/facebook/fresco/animation/c/a;)V
 
-    iput-object v1, p0, Lcom/facebook/fresco/animation/c/a;->OQ:Ljava/lang/Runnable;
+    iput-object v1, p0, Lcom/facebook/fresco/animation/c/a;->Pi:Ljava/lang/Runnable;
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/c/a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-nez p1, :cond_0
 
@@ -142,7 +142,7 @@
     invoke-direct {v0, p1}, Lcom/facebook/fresco/animation/d/a;-><init>(Lcom/facebook/fresco/animation/a/d;)V
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->OF:Lcom/facebook/fresco/animation/d/b;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->OY:Lcom/facebook/fresco/animation/d/b;
 
     return-void
 .end method
@@ -150,7 +150,7 @@
 .method static synthetic a(Lcom/facebook/fresco/animation/c/a;)Ljava/lang/Runnable;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/fresco/animation/c/a;->OQ:Ljava/lang/Runnable;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/c/a;->Pi:Ljava/lang/Runnable;
 
     return-object p0
 .end method
@@ -160,11 +160,11 @@
 .method public draw(Landroid/graphics/Canvas;)V
     .locals 8
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->OF:Lcom/facebook/fresco/animation/d/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->OY:Lcom/facebook/fresco/animation/d/b;
 
     if-nez v0, :cond_0
 
@@ -175,22 +175,22 @@
 
     move-result-wide v0
 
-    iget-boolean v2, p0, Lcom/facebook/fresco/animation/c/a;->OG:Z
+    iget-boolean v2, p0, Lcom/facebook/fresco/animation/c/a;->OZ:Z
 
     if-eqz v2, :cond_1
 
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->LE:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->LW:J
 
     sub-long v2, v0, v2
 
-    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->OM:J
+    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Pe:J
 
     add-long/2addr v2, v4
 
     goto :goto_0
 
     :cond_1
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->OH:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Pa:J
 
     const-wide/16 v4, 0x0
 
@@ -199,7 +199,7 @@
     move-result-wide v2
 
     :goto_0
-    iget-object v4, p0, Lcom/facebook/fresco/animation/c/a;->OF:Lcom/facebook/fresco/animation/d/b;
+    iget-object v4, p0, Lcom/facebook/fresco/animation/c/a;->OY:Lcom/facebook/fresco/animation/d/b;
 
     invoke-interface {v4, v2, v3}, Lcom/facebook/fresco/animation/d/b;->o(J)I
 
@@ -209,7 +209,7 @@
 
     if-ne v4, v5, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->getFrameCount()I
 
@@ -217,32 +217,32 @@
 
     add-int/lit8 v4, v0, -0x1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->OO:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Pg:Lcom/facebook/fresco/animation/c/b;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->OG:Z
+    iput-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->OZ:Z
 
     goto :goto_1
 
     :cond_2
     if-nez v4, :cond_3
 
-    iget v6, p0, Lcom/facebook/fresco/animation/c/a;->OJ:I
+    iget v6, p0, Lcom/facebook/fresco/animation/c/a;->Pc:I
 
     if-eq v6, v5, :cond_3
 
-    iget-wide v5, p0, Lcom/facebook/fresco/animation/c/a;->OI:J
+    iget-wide v5, p0, Lcom/facebook/fresco/animation/c/a;->Pb:J
 
     cmp-long v7, v0, v5
 
     if-ltz v7, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->OO:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Pg:Lcom/facebook/fresco/animation/c/b;
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     invoke-interface {v0, p0, p1, v4}, Lcom/facebook/fresco/animation/a/a;->a(Landroid/graphics/drawable/Drawable;Landroid/graphics/Canvas;I)Z
 
@@ -250,18 +250,18 @@
 
     if-eqz p1, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->OO:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Pg:Lcom/facebook/fresco/animation/c/b;
 
-    iput v4, p0, Lcom/facebook/fresco/animation/c/a;->OJ:I
+    iput v4, p0, Lcom/facebook/fresco/animation/c/a;->Pc:I
 
     :cond_4
     if-nez p1, :cond_5
 
-    iget p1, p0, Lcom/facebook/fresco/animation/c/a;->ON:I
+    iget p1, p0, Lcom/facebook/fresco/animation/c/a;->Pf:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lcom/facebook/fresco/animation/c/a;->ON:I
+    iput p1, p0, Lcom/facebook/fresco/animation/c/a;->Pf:I
 
     const/4 p1, 0x2
 
@@ -271,9 +271,9 @@
 
     if-eqz p1, :cond_5
 
-    sget-object p1, Lcom/facebook/fresco/animation/c/a;->Fl:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/fresco/animation/c/a;->FC:Ljava/lang/Class;
 
-    iget v0, p0, Lcom/facebook/fresco/animation/c/a;->ON:I
+    iget v0, p0, Lcom/facebook/fresco/animation/c/a;->Pf:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -288,13 +288,13 @@
 
     move-result-wide v0
 
-    iget-boolean p1, p0, Lcom/facebook/fresco/animation/c/a;->OG:Z
+    iget-boolean p1, p0, Lcom/facebook/fresco/animation/c/a;->OZ:Z
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->OF:Lcom/facebook/fresco/animation/d/b;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->OY:Lcom/facebook/fresco/animation/d/b;
 
-    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->LE:J
+    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->LW:J
 
     sub-long/2addr v0, v4
 
@@ -308,31 +308,31 @@
 
     if-eqz p1, :cond_6
 
-    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->OL:J
+    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Pd:J
 
     add-long/2addr v0, v4
 
-    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->LE:J
+    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->LW:J
 
     add-long/2addr v4, v0
 
-    iput-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->OI:J
+    iput-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Pb:J
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->OQ:Ljava/lang/Runnable;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Pi:Ljava/lang/Runnable;
 
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->OI:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Pb:J
 
     invoke-virtual {p0, p1, v0, v1}, Lcom/facebook/fresco/animation/c/a;->scheduleSelf(Ljava/lang/Runnable;J)V
 
     :cond_6
-    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->OP:Lcom/facebook/fresco/animation/c/a$a;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Ph:Lcom/facebook/fresco/animation/c/a$a;
 
     if-eqz p1, :cond_7
 
-    iget-boolean p1, p0, Lcom/facebook/fresco/animation/c/a;->OG:Z
+    iget-boolean p1, p0, Lcom/facebook/fresco/animation/c/a;->OZ:Z
 
     :cond_7
-    iput-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->OH:J
+    iput-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Pa:J
 
     :cond_8
     :goto_2
@@ -342,7 +342,7 @@
 .method public getIntrinsicHeight()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -363,7 +363,7 @@
 .method public getIntrinsicWidth()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -389,10 +389,10 @@
     return v0
 .end method
 
-.method public final gh()V
+.method public final gl()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_0
 
@@ -405,7 +405,7 @@
 .method public isRunning()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->OG:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->OZ:Z
 
     return v0
 .end method
@@ -415,7 +415,7 @@
 
     invoke-super {p0, p1}, Landroid/graphics/drawable/Drawable;->onBoundsChange(Landroid/graphics/Rect;)V
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_0
 
@@ -428,7 +428,7 @@
 .method protected onLevelChange(I)Z
     .locals 6
 
-    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->OG:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->OZ:Z
 
     const/4 v1, 0x0
 
@@ -437,7 +437,7 @@
     return v1
 
     :cond_0
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->OH:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Pa:J
 
     int-to-long v4, p1
 
@@ -445,7 +445,7 @@
 
     if-eqz p1, :cond_1
 
-    iput-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->OH:J
+    iput-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Pa:J
 
     invoke-virtual {p0}, Lcom/facebook/fresco/animation/c/a;->invalidateSelf()V
 
@@ -460,7 +460,7 @@
 .method public setAlpha(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->LD:Lcom/facebook/drawee/drawable/d;
 
     if-nez v0, :cond_0
 
@@ -468,14 +468,14 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/drawable/d;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Lm:Lcom/facebook/drawee/drawable/d;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->LD:Lcom/facebook/drawee/drawable/d;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->LD:Lcom/facebook/drawee/drawable/d;
 
     iput p1, v0, Lcom/facebook/drawee/drawable/d;->mAlpha:I
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_1
 
@@ -488,7 +488,7 @@
 .method public setColorFilter(Landroid/graphics/ColorFilter;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->LD:Lcom/facebook/drawee/drawable/d;
 
     if-nez v0, :cond_0
 
@@ -496,14 +496,14 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/drawable/d;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Lm:Lcom/facebook/drawee/drawable/d;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->LD:Lcom/facebook/drawee/drawable/d;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Lm:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->LD:Lcom/facebook/drawee/drawable/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/d;->setColorFilter(Landroid/graphics/ColorFilter;)V
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_1
 
@@ -516,11 +516,11 @@
 .method public start()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->OG:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->OZ:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_1
 
@@ -535,29 +535,29 @@
     goto :goto_0
 
     :cond_0
-    iput-boolean v1, p0, Lcom/facebook/fresco/animation/c/a;->OG:Z
+    iput-boolean v1, p0, Lcom/facebook/fresco/animation/c/a;->OZ:Z
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->LE:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->LW:J
 
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->LE:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->LW:J
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->OI:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Pb:J
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->OH:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Pa:J
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/fresco/animation/c/a;->OJ:I
+    iput v0, p0, Lcom/facebook/fresco/animation/c/a;->Pc:I
 
     invoke-virtual {p0}, Lcom/facebook/fresco/animation/c/a;->invalidateSelf()V
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->OO:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Pg:Lcom/facebook/fresco/animation/c/b;
 
     :cond_1
     :goto_0
@@ -567,7 +567,7 @@
 .method public stop()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->OG:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->OZ:Z
 
     if-nez v0, :cond_0
 
@@ -576,29 +576,29 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->OG:Z
+    iput-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->OZ:Z
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->LE:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->LW:J
 
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->LE:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->LW:J
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->OI:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Pb:J
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->OH:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Pa:J
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/fresco/animation/c/a;->OJ:I
+    iput v0, p0, Lcom/facebook/fresco/animation/c/a;->Pc:I
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->OQ:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Pi:Ljava/lang/Runnable;
 
     invoke-virtual {p0, v0}, Lcom/facebook/fresco/animation/c/a;->unscheduleSelf(Ljava/lang/Runnable;)V
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->OO:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Pg:Lcom/facebook/fresco/animation/c/b;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.smali b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.smali
index 760962185a..588747430a 100644
--- a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.smali
@@ -7,14 +7,16 @@
 
 
 # instance fields
-.field private Iu:Lcom/facebook/imagepipeline/e/a;
+.field private IL:Lcom/facebook/imagepipeline/e/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final OS:Lcom/facebook/imagepipeline/b/e;
+.field private final Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final OT:Lcom/facebook/imagepipeline/cache/h;
+.field private final Pk:Lcom/facebook/imagepipeline/b/e;
+
+.field private final Pl:Lcom/facebook/imagepipeline/cache/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h<",
@@ -25,25 +27,23 @@
     .end annotation
 .end field
 
-.field private final OU:Z
+.field private final Pm:Z
 
-.field private OV:Lcom/facebook/imagepipeline/animated/b/d;
+.field private Pn:Lcom/facebook/imagepipeline/animated/b/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private OW:Lcom/facebook/imagepipeline/animated/c/b;
+.field private Po:Lcom/facebook/imagepipeline/animated/c/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private OX:Lcom/facebook/imagepipeline/animated/d/a;
+.field private Pp:Lcom/facebook/imagepipeline/animated/d/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
-
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;Lcom/facebook/imagepipeline/b/e;Lcom/facebook/imagepipeline/cache/h;Z)V
@@ -62,13 +62,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OS:Lcom/facebook/imagepipeline/b/e;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OT:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Pl:Lcom/facebook/imagepipeline/cache/h;
 
-    iput-boolean p4, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OU:Z
+    iput-boolean p4, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Pm:Z
 
     return-void
 .end method
@@ -76,7 +76,7 @@
 .method static synthetic a(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)Lcom/facebook/imagepipeline/animated/b/d;
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OV:Lcom/facebook/imagepipeline/animated/b/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Pn:Lcom/facebook/imagepipeline/animated/b/d;
 
     if-nez v0, :cond_0
 
@@ -86,14 +86,14 @@
 
     new-instance v1, Lcom/facebook/imagepipeline/animated/b/e;
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     invoke-direct {v1, v0, v2}, Lcom/facebook/imagepipeline/animated/b/e;-><init>(Lcom/facebook/imagepipeline/animated/c/b;Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;)V
 
-    iput-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OV:Lcom/facebook/imagepipeline/animated/b/d;
+    iput-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Pn:Lcom/facebook/imagepipeline/animated/b/d;
 
     :cond_0
-    iget-object p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OV:Lcom/facebook/imagepipeline/animated/b/d;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Pn:Lcom/facebook/imagepipeline/animated/b/d;
 
     return-object p0
 .end method
@@ -101,7 +101,7 @@
 .method static synthetic b(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)Lcom/facebook/imagepipeline/animated/d/a;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OX:Lcom/facebook/imagepipeline/animated/d/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Pp:Lcom/facebook/imagepipeline/animated/d/a;
 
     if-nez v0, :cond_0
 
@@ -109,10 +109,10 @@
 
     invoke-direct {v0}, Lcom/facebook/imagepipeline/animated/d/a;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OX:Lcom/facebook/imagepipeline/animated/d/a;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Pp:Lcom/facebook/imagepipeline/animated/d/a;
 
     :cond_0
-    iget-object p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OX:Lcom/facebook/imagepipeline/animated/d/a;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Pp:Lcom/facebook/imagepipeline/animated/d/a;
 
     return-object p0
 .end method
@@ -120,7 +120,7 @@
 .method static synthetic c(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OU:Z
+    iget-boolean p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Pm:Z
 
     return p0
 .end method
@@ -147,12 +147,12 @@
     return-object v0
 .end method
 
-.method public final hm()Lcom/facebook/imagepipeline/e/a;
+.method public final hp()Lcom/facebook/imagepipeline/e/a;
     .locals 10
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Iu:Lcom/facebook/imagepipeline/e/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->IL:Lcom/facebook/imagepipeline/e/a;
 
     if-nez v0, :cond_1
 
@@ -162,9 +162,9 @@
 
     new-instance v4, Lcom/facebook/common/b/c;
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hR()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hU()Ljava/util/concurrent/Executor;
 
     move-result-object v0
 
@@ -176,7 +176,7 @@
 
     new-instance v0, Lcom/facebook/fresco/animation/factory/a;
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OW:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Po:Lcom/facebook/imagepipeline/animated/c/b;
 
     if-nez v1, :cond_0
 
@@ -184,12 +184,12 @@
 
     invoke-direct {v1, p0}, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;-><init>(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)V
 
-    iput-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OW:Lcom/facebook/imagepipeline/animated/c/b;
+    iput-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Po:Lcom/facebook/imagepipeline/animated/c/b;
 
     :cond_0
-    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OW:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Po:Lcom/facebook/imagepipeline/animated/c/b;
 
-    invoke-static {}, Lcom/facebook/common/b/i;->fA()Lcom/facebook/common/b/i;
+    invoke-static {}, Lcom/facebook/common/b/i;->fE()Lcom/facebook/common/b/i;
 
     move-result-object v3
 
@@ -197,18 +197,18 @@
 
     move-result-object v5
 
-    iget-object v6, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v6, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iget-object v7, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->OT:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v7, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Pl:Lcom/facebook/imagepipeline/cache/h;
 
     move-object v1, v0
 
     invoke-direct/range {v1 .. v9}, Lcom/facebook/fresco/animation/factory/a;-><init>(Lcom/facebook/imagepipeline/animated/c/b;Ljava/util/concurrent/ScheduledExecutorService;Ljava/util/concurrent/ExecutorService;Lcom/facebook/common/time/b;Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;Lcom/facebook/imagepipeline/cache/h;Lcom/facebook/common/d/k;Lcom/facebook/common/d/k;)V
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Iu:Lcom/facebook/imagepipeline/e/a;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->IL:Lcom/facebook/imagepipeline/e/a;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Iu:Lcom/facebook/imagepipeline/e/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->IL:Lcom/facebook/imagepipeline/e/a;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/a/b.smali b/com.discord/smali/com/facebook/imagepipeline/a/b.smali
index 55c0584976..616518310d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/a/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/a/b.smali
@@ -4,30 +4,30 @@
 
 
 # static fields
-.field private static final RI:Lcom/facebook/imagepipeline/a/b;
+.field private static final Sa:Lcom/facebook/imagepipeline/a/b;
 
 
 # instance fields
-.field public final RJ:I
+.field public final Sb:I
 
-.field public final RK:Z
+.field public final Sc:Z
 
-.field public final RL:Z
+.field public final Sd:Z
 
-.field public final RM:Z
+.field public final Se:Z
 
-.field public final RN:Z
+.field public final Sf:Z
 
-.field public final RO:Z
+.field public final Sg:Z
 
-.field public final RP:Landroid/graphics/Bitmap$Config;
+.field public final Sh:Landroid/graphics/Bitmap$Config;
 
-.field public final RQ:Lcom/facebook/imagepipeline/d/c;
+.field public final Si:Lcom/facebook/imagepipeline/d/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final RR:Lcom/facebook/imagepipeline/k/a;
+.field public final Sj:Lcom/facebook/imagepipeline/k/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -45,7 +45,7 @@
 
     invoke-direct {v1, v0}, Lcom/facebook/imagepipeline/a/b;-><init>(Lcom/facebook/imagepipeline/a/c;)V
 
-    sput-object v1, Lcom/facebook/imagepipeline/a/b;->RI:Lcom/facebook/imagepipeline/a/b;
+    sput-object v1, Lcom/facebook/imagepipeline/a/b;->Sa:Lcom/facebook/imagepipeline/a/b;
 
     return-void
 .end method
@@ -55,49 +55,49 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget v0, p1, Lcom/facebook/imagepipeline/a/c;->RS:I
+    iget v0, p1, Lcom/facebook/imagepipeline/a/c;->Sk:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/a/b;->RJ:I
+    iput v0, p0, Lcom/facebook/imagepipeline/a/b;->Sb:I
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->RT:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->Sl:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->RK:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Sc:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->RU:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->Sm:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->RL:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Sd:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->RV:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->Sn:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->RM:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Se:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->RW:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->So:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->RN:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Sf:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->On:Landroid/graphics/Bitmap$Config;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->OF:Landroid/graphics/Bitmap$Config;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->RP:Landroid/graphics/Bitmap$Config;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->Sh:Landroid/graphics/Bitmap$Config;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->RY:Lcom/facebook/imagepipeline/d/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->Sq:Lcom/facebook/imagepipeline/d/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->RQ:Lcom/facebook/imagepipeline/d/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->Si:Lcom/facebook/imagepipeline/d/c;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->RX:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->Sp:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->RO:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Sg:Z
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/a/c;->RZ:Lcom/facebook/imagepipeline/k/a;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/a/c;->Sr:Lcom/facebook/imagepipeline/k/a;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/a/b;->RR:Lcom/facebook/imagepipeline/k/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/a/b;->Sj:Lcom/facebook/imagepipeline/k/a;
 
     return-void
 .end method
 
-.method public static hJ()Lcom/facebook/imagepipeline/a/b;
+.method public static hM()Lcom/facebook/imagepipeline/a/b;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/a/b;->RI:Lcom/facebook/imagepipeline/a/b;
+    sget-object v0, Lcom/facebook/imagepipeline/a/b;->Sa:Lcom/facebook/imagepipeline/a/b;
 
     return-object v0
 .end method
@@ -133,72 +133,72 @@
     :cond_1
     check-cast p1, Lcom/facebook/imagepipeline/a/b;
 
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->RK:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Sc:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->RK:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Sc:Z
 
     if-eq v2, v3, :cond_2
 
     return v1
 
     :cond_2
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->RL:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Sd:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->RL:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Sd:Z
 
     if-eq v2, v3, :cond_3
 
     return v1
 
     :cond_3
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->RM:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Se:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->RM:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Se:Z
 
     if-eq v2, v3, :cond_4
 
     return v1
 
     :cond_4
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->RN:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Sf:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->RN:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Sf:Z
 
     if-eq v2, v3, :cond_5
 
     return v1
 
     :cond_5
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->RO:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Sg:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->RO:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Sg:Z
 
     if-eq v2, v3, :cond_6
 
     return v1
 
     :cond_6
-    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->RP:Landroid/graphics/Bitmap$Config;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Sh:Landroid/graphics/Bitmap$Config;
 
-    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->RP:Landroid/graphics/Bitmap$Config;
+    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->Sh:Landroid/graphics/Bitmap$Config;
 
     if-eq v2, v3, :cond_7
 
     return v1
 
     :cond_7
-    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->RQ:Lcom/facebook/imagepipeline/d/c;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Si:Lcom/facebook/imagepipeline/d/c;
 
-    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->RQ:Lcom/facebook/imagepipeline/d/c;
+    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->Si:Lcom/facebook/imagepipeline/d/c;
 
     if-eq v2, v3, :cond_8
 
     return v1
 
     :cond_8
-    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->RR:Lcom/facebook/imagepipeline/k/a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Sj:Lcom/facebook/imagepipeline/k/a;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/a/b;->RR:Lcom/facebook/imagepipeline/k/a;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/a/b;->Sj:Lcom/facebook/imagepipeline/k/a;
 
     if-eq v2, p1, :cond_9
 
@@ -215,41 +215,41 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lcom/facebook/imagepipeline/a/b;->RJ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/b;->Sb:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->RK:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Sc:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->RL:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Sd:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->RM:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Se:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->RN:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Sf:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->RO:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Sg:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->RP:Landroid/graphics/Bitmap$Config;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Sh:Landroid/graphics/Bitmap$Config;
 
     invoke-virtual {v1}, Landroid/graphics/Bitmap$Config;->ordinal()I
 
@@ -259,7 +259,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->RQ:Lcom/facebook/imagepipeline/d/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Si:Lcom/facebook/imagepipeline/d/c;
 
     const/4 v2, 0x0
 
@@ -279,7 +279,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->RR:Lcom/facebook/imagepipeline/k/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Sj:Lcom/facebook/imagepipeline/k/a;
 
     if-eqz v1, :cond_1
 
@@ -300,7 +300,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/b;->RJ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/b;->Sb:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -310,7 +310,7 @@
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->RK:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Sc:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -320,7 +320,7 @@
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->RL:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Sd:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -330,7 +330,7 @@
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->RM:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Se:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -340,7 +340,7 @@
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->RN:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Sf:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -350,7 +350,7 @@
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->RO:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Sg:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -360,7 +360,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->RP:Landroid/graphics/Bitmap$Config;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Sh:Landroid/graphics/Bitmap$Config;
 
     invoke-virtual {v1}, Landroid/graphics/Bitmap$Config;->name()Ljava/lang/String;
 
@@ -370,13 +370,13 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->RQ:Lcom/facebook/imagepipeline/d/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Si:Lcom/facebook/imagepipeline/d/c;
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->RR:Lcom/facebook/imagepipeline/k/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Sj:Lcom/facebook/imagepipeline/k/a;
 
     const/16 v2, 0x8
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/a/c.smali b/com.discord/smali/com/facebook/imagepipeline/a/c.smali
index 0ae5dd0bcd..88edccb83c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/a/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/a/c.smali
@@ -4,26 +4,26 @@
 
 
 # instance fields
-.field On:Landroid/graphics/Bitmap$Config;
+.field OF:Landroid/graphics/Bitmap$Config;
 
-.field RS:I
+.field Sk:I
 
-.field RT:Z
+.field Sl:Z
 
-.field RU:Z
+.field Sm:Z
 
-.field RV:Z
+.field Sn:Z
 
-.field RW:Z
+.field So:Z
 
-.field RX:Z
+.field Sp:Z
 
-.field RY:Lcom/facebook/imagepipeline/d/c;
+.field Sq:Lcom/facebook/imagepipeline/d/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field RZ:Lcom/facebook/imagepipeline/k/a;
+.field Sr:Lcom/facebook/imagepipeline/k/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -37,11 +37,11 @@
 
     const/16 v0, 0x64
 
-    iput v0, p0, Lcom/facebook/imagepipeline/a/c;->RS:I
+    iput v0, p0, Lcom/facebook/imagepipeline/a/c;->Sk:I
 
     sget-object v0, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/a/c;->On:Landroid/graphics/Bitmap$Config;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/a/c;->OF:Landroid/graphics/Bitmap$Config;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/a/d.smali b/com.discord/smali/com/facebook/imagepipeline/a/d.smali
index b8e479b599..93b1d8cdab 100644
--- a/com.discord/smali/com/facebook/imagepipeline/a/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/a/d.smali
@@ -14,13 +14,13 @@
 
 
 # static fields
-.field public static final enum Sa:Lcom/facebook/imagepipeline/a/d;
+.field public static final enum Ss:Lcom/facebook/imagepipeline/a/d;
 
-.field public static final enum Sb:Lcom/facebook/imagepipeline/a/d;
+.field public static final enum St:Lcom/facebook/imagepipeline/a/d;
 
-.field public static final enum Sc:Lcom/facebook/imagepipeline/a/d;
+.field public static final enum Su:Lcom/facebook/imagepipeline/a/d;
 
-.field private static final synthetic Sd:[Lcom/facebook/imagepipeline/a/d;
+.field private static final synthetic Sv:[Lcom/facebook/imagepipeline/a/d;
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/imagepipeline/a/d;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/a/d;->Sa:Lcom/facebook/imagepipeline/a/d;
+    sput-object v0, Lcom/facebook/imagepipeline/a/d;->Ss:Lcom/facebook/imagepipeline/a/d;
 
     new-instance v0, Lcom/facebook/imagepipeline/a/d;
 
@@ -45,7 +45,7 @@
 
     invoke-direct {v0, v3, v2}, Lcom/facebook/imagepipeline/a/d;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/a/d;->Sb:Lcom/facebook/imagepipeline/a/d;
+    sput-object v0, Lcom/facebook/imagepipeline/a/d;->St:Lcom/facebook/imagepipeline/a/d;
 
     new-instance v0, Lcom/facebook/imagepipeline/a/d;
 
@@ -55,25 +55,25 @@
 
     invoke-direct {v0, v4, v3}, Lcom/facebook/imagepipeline/a/d;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/a/d;->Sc:Lcom/facebook/imagepipeline/a/d;
+    sput-object v0, Lcom/facebook/imagepipeline/a/d;->Su:Lcom/facebook/imagepipeline/a/d;
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lcom/facebook/imagepipeline/a/d;
 
-    sget-object v4, Lcom/facebook/imagepipeline/a/d;->Sa:Lcom/facebook/imagepipeline/a/d;
+    sget-object v4, Lcom/facebook/imagepipeline/a/d;->Ss:Lcom/facebook/imagepipeline/a/d;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/facebook/imagepipeline/a/d;->Sb:Lcom/facebook/imagepipeline/a/d;
+    sget-object v1, Lcom/facebook/imagepipeline/a/d;->St:Lcom/facebook/imagepipeline/a/d;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/imagepipeline/a/d;->Sc:Lcom/facebook/imagepipeline/a/d;
+    sget-object v1, Lcom/facebook/imagepipeline/a/d;->Su:Lcom/facebook/imagepipeline/a/d;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/facebook/imagepipeline/a/d;->Sd:[Lcom/facebook/imagepipeline/a/d;
+    sput-object v0, Lcom/facebook/imagepipeline/a/d;->Sv:[Lcom/facebook/imagepipeline/a/d;
 
     return-void
 .end method
@@ -145,7 +145,7 @@
 .method public static values()[Lcom/facebook/imagepipeline/a/d;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/a/d;->Sd:[Lcom/facebook/imagepipeline/a/d;
+    sget-object v0, Lcom/facebook/imagepipeline/a/d;->Sv:[Lcom/facebook/imagepipeline/a/d;
 
     invoke-virtual {v0}, [Lcom/facebook/imagepipeline/a/d;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/a/a.smali b/com.discord/smali/com/facebook/imagepipeline/animated/a/a.smali
index 1aa615d6e9..b54177289c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/a/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/a/a.smali
@@ -16,7 +16,7 @@
 .method public abstract b(Landroid/graphics/Rect;)Lcom/facebook/imagepipeline/animated/a/a;
 .end method
 
-.method public abstract fe()I
+.method public abstract fj()I
 .end method
 
 .method public abstract getFrameCount()I
@@ -28,8 +28,8 @@
 .method public abstract getWidth()I
 .end method
 
-.method public abstract hs()I
+.method public abstract hv()I
 .end method
 
-.method public abstract ht()I
+.method public abstract hw()I
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/a/e.smali b/com.discord/smali/com/facebook/imagepipeline/animated/a/e.smali
index 769c952bea..d9aa08e7fe 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/a/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/a/e.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field public final PV:Lcom/facebook/imagepipeline/animated/a/c;
+.field public final Qo:Lcom/facebook/imagepipeline/animated/a/c;
 
-.field private final PW:I
+.field private final Qp:I
 
-.field private PY:Lcom/facebook/common/references/CloseableReference;
+.field private Qq:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -21,7 +21,7 @@
     .end annotation
 .end field
 
-.field private PZ:Ljava/util/List;
+.field private Qr:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -48,11 +48,11 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/animated/a/c;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->PV:Lcom/facebook/imagepipeline/animated/a/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->Qo:Lcom/facebook/imagepipeline/animated/a/c;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->PW:I
+    iput p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->Qp:I
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->PV:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->Qo:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -70,27 +70,27 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/animated/a/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->PV:Lcom/facebook/imagepipeline/animated/a/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->Qo:Lcom/facebook/imagepipeline/animated/a/c;
 
-    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->PW:I
+    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->Qp:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->PW:I
+    iput v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->Qp:I
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->PY:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->Qq:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->PY:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->Qq:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/animated/a/f;->PZ:Ljava/util/List;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/animated/a/f;->Qr:Ljava/util/List;
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->b(Ljava/util/Collection;)Ljava/util/List;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->PZ:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->Qr:Ljava/util/List;
 
     return-void
 .end method
@@ -113,19 +113,19 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->PY:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->Qq:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->PY:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->Qq:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/a/e;->PZ:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/a/e;->Qr:Ljava/util/List;
 
     invoke-static {v1}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Iterable;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->PZ:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->Qr:Ljava/util/List;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/b/a.smali b/com.discord/smali/com/facebook/imagepipeline/animated/b/a.smali
index 6ab9af5aaa..6600bc0d96 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/b/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/b/a.smali
@@ -14,7 +14,7 @@
     .end annotation
 .end method
 
-.method public abstract hm()Lcom/facebook/imagepipeline/e/a;
+.method public abstract hp()Lcom/facebook/imagepipeline/e/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/b/e$1.smali b/com.discord/smali/com/facebook/imagepipeline/animated/b/e$1.smali
index 188a9d5212..1989ad1434 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/b/e$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/b/e$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Qf:Lcom/facebook/imagepipeline/animated/b/e;
+.field final synthetic Qx:Lcom/facebook/imagepipeline/animated/b/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/animated/b/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/b/e$1;->Qf:Lcom/facebook/imagepipeline/animated/b/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/b/e$1;->Qx:Lcom/facebook/imagepipeline/animated/b/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/b/e.smali b/com.discord/smali/com/facebook/imagepipeline/animated/b/e.smali
index 49f24fb363..0a7aae3b8e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/b/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/b/e.smali
@@ -7,15 +7,15 @@
 
 
 # static fields
-.field static Qd:Lcom/facebook/imagepipeline/animated/b/c;
+.field static Qv:Lcom/facebook/imagepipeline/animated/b/c;
 
-.field static Qe:Lcom/facebook/imagepipeline/animated/b/c;
+.field static Qw:Lcom/facebook/imagepipeline/animated/b/c;
 
 
 # instance fields
-.field private final OW:Lcom/facebook/imagepipeline/animated/c/b;
+.field private final Po:Lcom/facebook/imagepipeline/animated/c/b;
 
-.field private final Qc:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final Qu:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
 
 # direct methods
@@ -24,19 +24,19 @@
 
     const-string v0, "com.facebook.animated.gif.GifImage"
 
-    invoke-static {v0}, Lcom/facebook/imagepipeline/animated/b/e;->aA(Ljava/lang/String;)Lcom/facebook/imagepipeline/animated/b/c;
+    invoke-static {v0}, Lcom/facebook/imagepipeline/animated/b/e;->av(Ljava/lang/String;)Lcom/facebook/imagepipeline/animated/b/c;
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/b/e;->Qd:Lcom/facebook/imagepipeline/animated/b/c;
+    sput-object v0, Lcom/facebook/imagepipeline/animated/b/e;->Qv:Lcom/facebook/imagepipeline/animated/b/c;
 
     const-string v0, "com.facebook.animated.webp.WebPImage"
 
-    invoke-static {v0}, Lcom/facebook/imagepipeline/animated/b/e;->aA(Ljava/lang/String;)Lcom/facebook/imagepipeline/animated/b/c;
+    invoke-static {v0}, Lcom/facebook/imagepipeline/animated/b/e;->av(Ljava/lang/String;)Lcom/facebook/imagepipeline/animated/b/c;
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/b/e;->Qe:Lcom/facebook/imagepipeline/animated/b/c;
+    sput-object v0, Lcom/facebook/imagepipeline/animated/b/e;->Qw:Lcom/facebook/imagepipeline/animated/b/c;
 
     return-void
 .end method
@@ -46,9 +46,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/b/e;->OW:Lcom/facebook/imagepipeline/animated/c/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/b/e;->Po:Lcom/facebook/imagepipeline/animated/c/b;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/b/e;->Qc:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/b/e;->Qu:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/b/e;->OW:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/b/e;->Po:Lcom/facebook/imagepipeline/animated/c/b;
 
     const/4 v1, 0x0
 
@@ -116,7 +116,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-boolean v1, p1, Lcom/facebook/imagepipeline/a/b;->RL:Z
+    iget-boolean v1, p1, Lcom/facebook/imagepipeline/a/b;->Sd:Z
 
     const/4 v2, 0x0
 
@@ -134,7 +134,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->RN:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Sf:Z
 
     if-eqz v3, :cond_1
 
@@ -144,7 +144,7 @@
 
     move-result-object p2
 
-    sget-object p3, Lcom/facebook/imagepipeline/f/g;->Ux:Lcom/facebook/imagepipeline/f/h;
+    sget-object p3, Lcom/facebook/imagepipeline/f/g;->UQ:Lcom/facebook/imagepipeline/f/h;
 
     invoke-direct {p1, p2, p3}, Lcom/facebook/imagepipeline/f/d;-><init>(Lcom/facebook/common/references/CloseableReference;Lcom/facebook/imagepipeline/f/h;)V
     :try_end_0
@@ -158,7 +158,7 @@
 
     :cond_1
     :try_start_1
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->RM:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Se:Z
 
     if-eqz v3, :cond_3
 
@@ -166,7 +166,7 @@
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/animated/b/e;->OW:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/animated/b/e;->Po:Lcom/facebook/imagepipeline/animated/c/b;
 
     invoke-interface {v4, v3, v0}, Lcom/facebook/imagepipeline/animated/c/b;->a(Lcom/facebook/imagepipeline/animated/a/e;Landroid/graphics/Rect;)Lcom/facebook/imagepipeline/animated/a/a;
 
@@ -241,7 +241,7 @@
     move-object v4, v0
 
     :goto_2
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/a/b;->RK:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/a/b;->Sc:Z
 
     if-eqz p1, :cond_4
 
@@ -262,17 +262,17 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lcom/facebook/imagepipeline/animated/a/f;->PY:Lcom/facebook/common/references/CloseableReference;
+    iput-object p2, p1, Lcom/facebook/imagepipeline/animated/a/f;->Qq:Lcom/facebook/common/references/CloseableReference;
 
-    iput v1, p1, Lcom/facebook/imagepipeline/animated/a/f;->PW:I
+    iput v1, p1, Lcom/facebook/imagepipeline/animated/a/f;->Qp:I
 
     invoke-static {v4}, Lcom/facebook/common/references/CloseableReference;->b(Ljava/util/Collection;)Ljava/util/List;
 
     move-result-object p2
 
-    iput-object p2, p1, Lcom/facebook/imagepipeline/animated/a/f;->PZ:Ljava/util/List;
+    iput-object p2, p1, Lcom/facebook/imagepipeline/animated/a/f;->Qr:Ljava/util/List;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/animated/a/f;->hu()Lcom/facebook/imagepipeline/animated/a/e;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/animated/a/f;->hx()Lcom/facebook/imagepipeline/animated/a/e;
 
     move-result-object p1
 
@@ -312,7 +312,7 @@
     goto :goto_4
 .end method
 
-.method private static aA(Ljava/lang/String;)Lcom/facebook/imagepipeline/animated/b/c;
+.method private static av(Ljava/lang/String;)Lcom/facebook/imagepipeline/animated/b/c;
     .locals 0
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -351,7 +351,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/b/e;->Qc:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/b/e;->Qu:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;->c(IILandroid/graphics/Bitmap$Config;)Lcom/facebook/common/references/CloseableReference;
 
@@ -392,11 +392,11 @@
 .method public final a(Lcom/facebook/imagepipeline/f/e;Lcom/facebook/imagepipeline/a/b;Landroid/graphics/Bitmap$Config;)Lcom/facebook/imagepipeline/f/c;
     .locals 4
 
-    sget-object v0, Lcom/facebook/imagepipeline/animated/b/e;->Qd:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v0, Lcom/facebook/imagepipeline/animated/b/e;->Qv:Lcom/facebook/imagepipeline/animated/b/c;
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -417,7 +417,7 @@
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->Qd:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->Qv:Lcom/facebook/imagepipeline/animated/b/c;
 
     invoke-interface {v0}, Lcom/facebook/common/g/f;->getByteBuffer()Ljava/nio/ByteBuffer;
 
@@ -430,9 +430,9 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->Qd:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->Qv:Lcom/facebook/imagepipeline/animated/b/c;
 
-    invoke-interface {v0}, Lcom/facebook/common/g/f;->fG()J
+    invoke-interface {v0}, Lcom/facebook/common/g/f;->fK()J
 
     move-result-wide v2
 
@@ -475,11 +475,11 @@
 .method public final b(Lcom/facebook/imagepipeline/f/e;Lcom/facebook/imagepipeline/a/b;Landroid/graphics/Bitmap$Config;)Lcom/facebook/imagepipeline/f/c;
     .locals 4
 
-    sget-object v0, Lcom/facebook/imagepipeline/animated/b/e;->Qe:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v0, Lcom/facebook/imagepipeline/animated/b/e;->Qw:Lcom/facebook/imagepipeline/animated/b/c;
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -500,7 +500,7 @@
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->Qe:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->Qw:Lcom/facebook/imagepipeline/animated/b/c;
 
     invoke-interface {v0}, Lcom/facebook/common/g/f;->getByteBuffer()Ljava/nio/ByteBuffer;
 
@@ -513,9 +513,9 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->Qe:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->Qw:Lcom/facebook/imagepipeline/animated/b/c;
 
-    invoke-interface {v0}, Lcom/facebook/common/g/f;->fG()J
+    invoke-interface {v0}, Lcom/facebook/common/g/f;->fK()J
 
     move-result-wide v2
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/c/a.smali b/com.discord/smali/com/facebook/imagepipeline/animated/c/a.smali
index 30b35e7dfc..f46a73c5ec 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/c/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/c/a.smali
@@ -7,33 +7,33 @@
 
 
 # instance fields
-.field private final LD:I
+.field private final LV:I
 
-.field private final OU:Z
+.field private final Pm:Z
 
-.field private final OX:Lcom/facebook/imagepipeline/animated/d/a;
+.field private final Pp:Lcom/facebook/imagepipeline/animated/d/a;
 
-.field private final Qh:Lcom/facebook/imagepipeline/animated/a/e;
+.field private final QA:Lcom/facebook/imagepipeline/animated/a/c;
 
-.field private final Qi:Lcom/facebook/imagepipeline/animated/a/c;
+.field private final QB:Landroid/graphics/Rect;
 
-.field private final Qj:Landroid/graphics/Rect;
+.field private final QC:[I
 
-.field private final Qk:[I
+.field private final QD:[I
 
-.field private final Ql:[I
+.field private final QE:[Lcom/facebook/imagepipeline/animated/a/b;
 
-.field private final Qm:[Lcom/facebook/imagepipeline/animated/a/b;
+.field private final QF:Landroid/graphics/Rect;
 
-.field private final Qn:Landroid/graphics/Rect;
+.field private final QG:Landroid/graphics/Rect;
 
-.field private final Qo:Landroid/graphics/Rect;
-
-.field private Qp:Landroid/graphics/Bitmap;
+.field private QH:Landroid/graphics/Bitmap;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
+.field private final Qz:Lcom/facebook/imagepipeline/animated/a/e;
+
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/imagepipeline/animated/d/a;Lcom/facebook/imagepipeline/animated/a/e;Landroid/graphics/Rect;Z)V
@@ -45,61 +45,61 @@
 
     invoke-direct {v0}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qn:Landroid/graphics/Rect;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QF:Landroid/graphics/Rect;
 
     new-instance v0, Landroid/graphics/Rect;
 
     invoke-direct {v0}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qo:Landroid/graphics/Rect;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QG:Landroid/graphics/Rect;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->OX:Lcom/facebook/imagepipeline/animated/d/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Pp:Lcom/facebook/imagepipeline/animated/d/a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qh:Lcom/facebook/imagepipeline/animated/a/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qz:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-object p1, p2, Lcom/facebook/imagepipeline/animated/a/e;->PV:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p1, p2, Lcom/facebook/imagepipeline/animated/a/e;->Qo:Lcom/facebook/imagepipeline/animated/a/c;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/c;->fd()[I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/c;->fi()[I
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qk:[I
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QC:[I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qk:[I
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QC:[I
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/animated/d/a;->d([I)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qk:[I
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QC:[I
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/animated/d/a;->e([I)I
 
     move-result p1
 
-    iput p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->LD:I
+    iput p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->LV:I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qk:[I
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QC:[I
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/animated/d/a;->f([I)[I
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Ql:[I
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QD:[I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-static {p1, p3}, Lcom/facebook/imagepipeline/animated/c/a;->a(Lcom/facebook/imagepipeline/animated/a/c;Landroid/graphics/Rect;)Landroid/graphics/Rect;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qj:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QB:Landroid/graphics/Rect;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/animated/c/a;->OU:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/animated/c/a;->Pm:Z
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/c;->getFrameCount()I
 
@@ -107,12 +107,12 @@
 
     new-array p1, p1, [Lcom/facebook/imagepipeline/animated/a/b;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qm:[Lcom/facebook/imagepipeline/animated/a/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QE:[Lcom/facebook/imagepipeline/animated/a/b;
 
     const/4 p1, 0x0
 
     :goto_0
-    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/a/c;->getFrameCount()I
 
@@ -120,9 +120,9 @@
 
     if-ge p1, p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qm:[Lcom/facebook/imagepipeline/animated/a/b;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->QE:[Lcom/facebook/imagepipeline/animated/a/b;
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {p3, p1}, Lcom/facebook/imagepipeline/animated/a/c;->G(I)Lcom/facebook/imagepipeline/animated/a/b;
 
@@ -191,23 +191,23 @@
     return-object v1
 .end method
 
-.method private declared-synchronized hv()V
+.method private declared-synchronized hy()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qp:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QH:Landroid/graphics/Bitmap;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qp:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QH:Landroid/graphics/Bitmap;
 
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->recycle()V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qp:Landroid/graphics/Bitmap;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QH:Landroid/graphics/Bitmap;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -230,11 +230,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qp:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QH:Landroid/graphics/Bitmap;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qp:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QH:Landroid/graphics/Bitmap;
 
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->getWidth()I
 
@@ -242,7 +242,7 @@
 
     if-lt v0, p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qp:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QH:Landroid/graphics/Bitmap;
 
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->getHeight()I
 
@@ -251,10 +251,10 @@
     if-ge v0, p2, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/animated/c/a;->hv()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/animated/c/a;->hy()V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qp:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QH:Landroid/graphics/Bitmap;
 
     if-nez v0, :cond_2
 
@@ -264,10 +264,10 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qp:Landroid/graphics/Bitmap;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QH:Landroid/graphics/Bitmap;
 
     :cond_2
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qp:Landroid/graphics/Bitmap;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QH:Landroid/graphics/Bitmap;
 
     const/4 p2, 0x0
 
@@ -292,7 +292,7 @@
 .method public final G(I)Lcom/facebook/imagepipeline/animated/a/b;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qm:[Lcom/facebook/imagepipeline/animated/a/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QE:[Lcom/facebook/imagepipeline/animated/a/b;
 
     aget-object p1, v0, p1
 
@@ -302,16 +302,16 @@
 .method public final a(ILandroid/graphics/Canvas;)V
     .locals 10
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/animated/a/c;->H(I)Lcom/facebook/imagepipeline/animated/a/d;
 
     move-result-object p1
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->ff()Z
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fk()Z
 
     move-result v0
 
@@ -319,7 +319,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qj:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QB:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
@@ -327,7 +327,7 @@
 
     int-to-double v2, v0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->getWidth()I
 
@@ -344,7 +344,7 @@
     div-double/2addr v2, v4
 
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qj:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QB:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->height()I
 
@@ -352,7 +352,7 @@
 
     int-to-double v4, v0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->getHeight()I
 
@@ -442,13 +442,13 @@
     .catchall {:try_start_6 .. :try_end_6} :catchall_2
 
     :try_start_7
-    iget-object v4, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qj:Landroid/graphics/Rect;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/animated/c/a;->QB:Landroid/graphics/Rect;
 
     invoke-virtual {v4}, Landroid/graphics/Rect;->width()I
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qj:Landroid/graphics/Rect;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/animated/c/a;->QB:Landroid/graphics/Rect;
 
     invoke-virtual {v5}, Landroid/graphics/Rect;->height()I
 
@@ -456,17 +456,17 @@
 
     invoke-direct {p0, v4, v5}, Lcom/facebook/imagepipeline/animated/c/a;->l(II)V
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qp:Landroid/graphics/Bitmap;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/animated/c/a;->QH:Landroid/graphics/Bitmap;
 
     invoke-interface {p1, v0, v7, v6}, Lcom/facebook/imagepipeline/animated/a/d;->a(IILandroid/graphics/Bitmap;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qn:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QF:Landroid/graphics/Rect;
 
     const/4 v6, 0x0
 
     invoke-virtual {v0, v6, v6, v4, v5}, Landroid/graphics/Rect;->set(IIII)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qo:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QG:Landroid/graphics/Rect;
 
     add-int/2addr v4, v2
 
@@ -474,11 +474,11 @@
 
     invoke-virtual {v0, v2, v3, v4, v5}, Landroid/graphics/Rect;->set(IIII)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qp:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QH:Landroid/graphics/Bitmap;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qn:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/a;->QF:Landroid/graphics/Rect;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qo:Landroid/graphics/Rect;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/animated/c/a;->QG:Landroid/graphics/Rect;
 
     invoke-virtual {p2, v0, v2, v3, v1}, Landroid/graphics/Canvas;->drawBitmap(Landroid/graphics/Bitmap;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Paint;)V
 
@@ -497,7 +497,7 @@
     throw p2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->OU:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Pm:Z
 
     if-eqz v0, :cond_1
 
@@ -616,7 +616,7 @@
     :try_start_9
     invoke-direct {p0, v2, v3}, Lcom/facebook/imagepipeline/animated/c/a;->l(II)V
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qp:Landroid/graphics/Bitmap;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/animated/c/a;->QH:Landroid/graphics/Bitmap;
 
     invoke-interface {p1, v2, v3, v5}, Lcom/facebook/imagepipeline/animated/a/d;->a(IILandroid/graphics/Bitmap;)V
 
@@ -628,7 +628,7 @@
 
     invoke-virtual {p2, v2, v0}, Landroid/graphics/Canvas;->translate(FF)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qp:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QH:Landroid/graphics/Bitmap;
 
     const/4 v2, 0x0
 
@@ -669,7 +669,7 @@
 .method public final ac(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qk:[I
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QC:[I
 
     aget p1, v0, p1
 
@@ -679,13 +679,13 @@
 .method public final b(Landroid/graphics/Rect;)Lcom/facebook/imagepipeline/animated/a/a;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-static {v0, p1}, Lcom/facebook/imagepipeline/animated/c/a;->a(Lcom/facebook/imagepipeline/animated/a/c;Landroid/graphics/Rect;)Landroid/graphics/Rect;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qj:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QB:Landroid/graphics/Rect;
 
     invoke-virtual {v0, v1}, Landroid/graphics/Rect;->equals(Ljava/lang/Object;)Z
 
@@ -698,23 +698,23 @@
     :cond_0
     new-instance v0, Lcom/facebook/imagepipeline/animated/c/a;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/a;->OX:Lcom/facebook/imagepipeline/animated/d/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Pp:Lcom/facebook/imagepipeline/animated/d/a;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qh:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qz:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-boolean v3, p0, Lcom/facebook/imagepipeline/animated/c/a;->OU:Z
+    iget-boolean v3, p0, Lcom/facebook/imagepipeline/animated/c/a;->Pm:Z
 
     invoke-direct {v0, v1, v2, p1, v3}, Lcom/facebook/imagepipeline/animated/c/a;-><init>(Lcom/facebook/imagepipeline/animated/d/a;Lcom/facebook/imagepipeline/animated/a/e;Landroid/graphics/Rect;Z)V
 
     return-object v0
 .end method
 
-.method public final fe()I
+.method public final fj()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fe()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fj()I
 
     move-result v0
 
@@ -724,7 +724,7 @@
 .method public final getFrameCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->getFrameCount()I
 
@@ -736,7 +736,7 @@
 .method public final getHeight()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->getHeight()I
 
@@ -748,7 +748,7 @@
 .method public final getWidth()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qi:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->getWidth()I
 
@@ -757,10 +757,10 @@
     return v0
 .end method
 
-.method public final hs()I
+.method public final hv()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qj:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QB:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
@@ -769,10 +769,10 @@
     return v0
 .end method
 
-.method public final ht()I
+.method public final hw()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qj:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QB:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->height()I
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/c/c$a.smali b/com.discord/smali/com/facebook/imagepipeline/animated/c/c$a.smali
index 233f233cf0..690efbf3ad 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/c/c$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/c/c$a.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field private final Qq:Lcom/facebook/cache/common/CacheKey;
+.field private final QI:Lcom/facebook/cache/common/CacheKey;
 
-.field private final Qu:I
+.field private final QM:I
 
 
 # direct methods
@@ -29,9 +29,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->Qq:Lcom/facebook/cache/common/CacheKey;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->QI:Lcom/facebook/cache/common/CacheKey;
 
-    iput p2, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->Qu:I
+    iput p2, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->QM:I
 
     return-void
 .end method
@@ -56,15 +56,15 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/animated/c/c$a;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->Qu:I
+    iget v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->QM:I
 
-    iget v3, p1, Lcom/facebook/imagepipeline/animated/c/c$a;->Qu:I
+    iget v3, p1, Lcom/facebook/imagepipeline/animated/c/c$a;->QM:I
 
     if-ne v1, v3, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->Qq:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->QI:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/animated/c/c$a;->Qq:Lcom/facebook/cache/common/CacheKey;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/animated/c/c$a;->QI:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v1, p1}, Lcom/facebook/cache/common/CacheKey;->equals(Ljava/lang/Object;)Z
 
@@ -91,7 +91,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->Qq:Lcom/facebook/cache/common/CacheKey;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->QI:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v0}, Lcom/facebook/cache/common/CacheKey;->hashCode()I
 
@@ -99,7 +99,7 @@
 
     mul-int/lit16 v0, v0, 0x3f5
 
-    iget v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->Qu:I
+    iget v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->QM:I
 
     add-int/2addr v0, v1
 
@@ -113,7 +113,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->Qq:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->QI:Lcom/facebook/cache/common/CacheKey;
 
     const-string v2, "imageCacheKey"
 
@@ -121,7 +121,7 @@
 
     move-result-object v0
 
-    iget v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->Qu:I
+    iget v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->QM:I
 
     const-string v2, "frameIndex"
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/animated/c/c.smali b/com.discord/smali/com/facebook/imagepipeline/animated/c/c.smali
index 980d782049..b744c3f717 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/c/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/c/c.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field public final OT:Lcom/facebook/imagepipeline/cache/h;
+.field public final Pl:Lcom/facebook/imagepipeline/cache/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h<",
@@ -23,9 +23,9 @@
     .end annotation
 .end field
 
-.field private final Qq:Lcom/facebook/cache/common/CacheKey;
+.field private final QI:Lcom/facebook/cache/common/CacheKey;
 
-.field private final Qr:Lcom/facebook/imagepipeline/cache/h$c;
+.field private final QJ:Lcom/facebook/imagepipeline/cache/h$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h$c<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final Qs:Ljava/util/LinkedHashSet;
+.field private final QK:Ljava/util/LinkedHashSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedHashSet<",
@@ -62,21 +62,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qq:Lcom/facebook/cache/common/CacheKey;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c;->QI:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->OT:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->Pl:Lcom/facebook/imagepipeline/cache/h;
 
     new-instance p1, Ljava/util/LinkedHashSet;
 
     invoke-direct {p1}, Ljava/util/LinkedHashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qs:Ljava/util/LinkedHashSet;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c;->QK:Ljava/util/LinkedHashSet;
 
     new-instance p1, Lcom/facebook/imagepipeline/animated/c/c$1;
 
     invoke-direct {p1, p0}, Lcom/facebook/imagepipeline/animated/c/c$1;-><init>(Lcom/facebook/imagepipeline/animated/c/c;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qr:Lcom/facebook/imagepipeline/cache/h$c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c;->QJ:Lcom/facebook/imagepipeline/cache/h$c;
 
     return-void
 .end method
@@ -91,7 +91,7 @@
     if-eqz p2, :cond_0
 
     :try_start_0
-    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qs:Ljava/util/LinkedHashSet;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->QK:Ljava/util/LinkedHashSet;
 
     invoke-virtual {p2, p1}, Ljava/util/LinkedHashSet;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -103,7 +103,7 @@
 
     :cond_0
     :try_start_1
-    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qs:Ljava/util/LinkedHashSet;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->QK:Ljava/util/LinkedHashSet;
 
     invoke-virtual {p2, p1}, Ljava/util/LinkedHashSet;->remove(Ljava/lang/Object;)Z
     :try_end_1
@@ -126,7 +126,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/animated/c/c$a;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qq:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->QI:Lcom/facebook/cache/common/CacheKey;
 
     invoke-direct {v0, v1, p1}, Lcom/facebook/imagepipeline/animated/c/c$a;-><init>(Lcom/facebook/cache/common/CacheKey;I)V
 
@@ -150,13 +150,13 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c;->OT:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c;->Pl:Lcom/facebook/imagepipeline/cache/h;
 
     invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/animated/c/c;->ad(I)Lcom/facebook/imagepipeline/animated/c/c$a;
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qr:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->QJ:Lcom/facebook/imagepipeline/cache/h$c;
 
     invoke-virtual {v0, p1, p2, v1}, Lcom/facebook/imagepipeline/cache/h;->a(Ljava/lang/Object;Lcom/facebook/common/references/CloseableReference;Lcom/facebook/imagepipeline/cache/h$c;)Lcom/facebook/common/references/CloseableReference;
 
@@ -165,7 +165,7 @@
     return-object p1
 .end method
 
-.method public final declared-synchronized hw()Lcom/facebook/cache/common/CacheKey;
+.method public final declared-synchronized hz()Lcom/facebook/cache/common/CacheKey;
     .locals 3
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -175,7 +175,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qs:Ljava/util/LinkedHashSet;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->QK:Ljava/util/LinkedHashSet;
 
     invoke-virtual {v1}, Ljava/util/LinkedHashSet;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/g.smali b/com.discord/smali/com/facebook/imagepipeline/b/g.smali
index e9ceb3b8d6..581d521df4 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/g.smali
@@ -4,13 +4,15 @@
 
 
 # static fields
-.field private static final Sp:Ljava/util/concurrent/CancellationException;
+.field private static final SH:Ljava/util/concurrent/CancellationException;
 
 
 # instance fields
-.field private SA:Ljava/util/concurrent/atomic/AtomicLong;
+.field private final SI:Lcom/facebook/imagepipeline/b/m;
 
-.field private final SB:Lcom/facebook/common/d/k;
+.field private final SJ:Lcom/facebook/imagepipeline/g/c;
+
+.field private final SK:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -20,21 +22,7 @@
     .end annotation
 .end field
 
-.field private final Sq:Lcom/facebook/imagepipeline/b/m;
-
-.field private final Sr:Lcom/facebook/imagepipeline/g/c;
-
-.field private final Ss:Lcom/facebook/common/d/k;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/k<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final St:Lcom/facebook/imagepipeline/cache/o;
+.field public final SL:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -45,7 +33,7 @@
     .end annotation
 .end field
 
-.field private final Su:Lcom/facebook/imagepipeline/cache/o;
+.field public final SM:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -56,15 +44,27 @@
     .end annotation
 .end field
 
-.field private final Sv:Lcom/facebook/imagepipeline/cache/e;
+.field private final SN:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Sw:Lcom/facebook/imagepipeline/cache/e;
+.field private final SO:Lcom/facebook/imagepipeline/cache/e;
 
-.field public final Sx:Lcom/facebook/imagepipeline/cache/f;
+.field public final SQ:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Sy:Lcom/facebook/imagepipeline/h/as;
+.field private final SR:Lcom/facebook/imagepipeline/h/as;
 
-.field private final Sz:Lcom/facebook/common/d/k;
+.field private final SS:Lcom/facebook/common/d/k;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/k<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private ST:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field private final SU:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -85,7 +85,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/CancellationException;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/b/g;->Sp:Ljava/util/concurrent/CancellationException;
+    sput-object v0, Lcom/facebook/imagepipeline/b/g;->SH:Ljava/util/concurrent/CancellationException;
 
     return-void
 .end method
@@ -129,33 +129,33 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/g;->SA:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/g;->ST:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/g;->Sq:Lcom/facebook/imagepipeline/b/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/g;->SI:Lcom/facebook/imagepipeline/b/m;
 
     new-instance p1, Lcom/facebook/imagepipeline/g/b;
 
     invoke-direct {p1, p2}, Lcom/facebook/imagepipeline/g/b;-><init>(Ljava/util/Set;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/g;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/g;->SJ:Lcom/facebook/imagepipeline/g/c;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/b/g;->Ss:Lcom/facebook/common/d/k;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/b/g;->SK:Lcom/facebook/common/d/k;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/b/g;->St:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/b/g;->SL:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/b/g;->Su:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/b/g;->SM:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/b/g;->Sv:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/b/g;->SN:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/b/g;->Sw:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/b/g;->SO:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/b/g;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/b/g;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p9, p0, Lcom/facebook/imagepipeline/b/g;->Sy:Lcom/facebook/imagepipeline/h/as;
+    iput-object p9, p0, Lcom/facebook/imagepipeline/b/g;->SR:Lcom/facebook/imagepipeline/h/as;
 
-    iput-object p10, p0, Lcom/facebook/imagepipeline/b/g;->Sz:Lcom/facebook/common/d/k;
+    iput-object p10, p0, Lcom/facebook/imagepipeline/b/g;->SS:Lcom/facebook/common/d/k;
 
-    iput-object p11, p0, Lcom/facebook/imagepipeline/b/g;->SB:Lcom/facebook/common/d/k;
+    iput-object p11, p0, Lcom/facebook/imagepipeline/b/g;->SU:Lcom/facebook/common/d/k;
 
     return-void
 .end method
@@ -199,11 +199,11 @@
 
     if-nez p5, :cond_1
 
-    iget-object v5, v0, Lcom/facebook/imagepipeline/request/b;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/request/b;->SJ:Lcom/facebook/imagepipeline/g/c;
 
     if-nez v5, :cond_0
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/b/g;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/b/g;->SJ:Lcom/facebook/imagepipeline/g/c;
 
     move-object v11, v2
 
@@ -214,11 +214,11 @@
 
     new-array v2, v2, [Lcom/facebook/imagepipeline/g/c;
 
-    iget-object v6, v1, Lcom/facebook/imagepipeline/b/g;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/b/g;->SJ:Lcom/facebook/imagepipeline/g/c;
 
     aput-object v6, v2, v4
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/request/b;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/request/b;->SJ:Lcom/facebook/imagepipeline/g/c;
 
     aput-object v6, v2, v3
 
@@ -227,7 +227,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v5, v0, Lcom/facebook/imagepipeline/request/b;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/request/b;->SJ:Lcom/facebook/imagepipeline/g/c;
 
     if-nez v5, :cond_2
 
@@ -235,7 +235,7 @@
 
     new-array v2, v2, [Lcom/facebook/imagepipeline/g/c;
 
-    iget-object v6, v1, Lcom/facebook/imagepipeline/b/g;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/b/g;->SJ:Lcom/facebook/imagepipeline/g/c;
 
     aput-object v6, v2, v4
 
@@ -252,13 +252,13 @@
 
     new-array v6, v6, [Lcom/facebook/imagepipeline/g/c;
 
-    iget-object v7, v1, Lcom/facebook/imagepipeline/b/g;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object v7, v1, Lcom/facebook/imagepipeline/b/g;->SJ:Lcom/facebook/imagepipeline/g/c;
 
     aput-object v7, v6, v4
 
     aput-object p5, v6, v3
 
-    iget-object v7, v0, Lcom/facebook/imagepipeline/request/b;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object v7, v0, Lcom/facebook/imagepipeline/request/b;->SJ:Lcom/facebook/imagepipeline/g/c;
 
     aput-object v7, v6, v2
 
@@ -269,7 +269,7 @@
 
     :goto_1
     :try_start_0
-    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->We:Lcom/facebook/imagepipeline/request/b$b;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->Ww:Lcom/facebook/imagepipeline/request/b$b;
 
     move-object/from16 v5, p3
 
@@ -279,7 +279,7 @@
 
     new-instance v12, Lcom/facebook/imagepipeline/h/ap;
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/b/g;->SA:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/b/g;->ST:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
 
@@ -291,11 +291,11 @@
 
     const/4 v8, 0x0
 
-    iget-boolean v2, v0, Lcom/facebook/imagepipeline/request/b;->Td:Z
+    iget-boolean v2, v0, Lcom/facebook/imagepipeline/request/b;->Tv:Z
 
     if-nez v2, :cond_4
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-static {v2}, Lcom/facebook/common/j/f;->c(Landroid/net/Uri;)Z
 
@@ -315,7 +315,7 @@
     const/4 v9, 0x1
 
     :goto_3
-    iget-object v10, v0, Lcom/facebook/imagepipeline/request/b;->Yt:Lcom/facebook/imagepipeline/a/d;
+    iget-object v10, v0, Lcom/facebook/imagepipeline/request/b;->YL:Lcom/facebook/imagepipeline/a/d;
 
     move-object v2, v12
 
@@ -395,15 +395,15 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/g;->Sq:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/g;->SI:Lcom/facebook/imagepipeline/b/m;
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->c(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/h/aj;
+    invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->b(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     if-eqz v2, :cond_0
 
@@ -412,7 +412,7 @@
     move-result-object v1
 
     :cond_0
-    iget-boolean v2, v0, Lcom/facebook/imagepipeline/b/m;->Tj:Z
+    iget-boolean v2, v0, Lcom/facebook/imagepipeline/b/m;->TB:Z
 
     if-eqz v2, :cond_1
 
@@ -450,46 +450,3 @@
 
     return-object p1
 .end method
-
-.method public final b(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/b/c;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/facebook/imagepipeline/request/b;",
-            ")",
-            "Lcom/facebook/b/c<",
-            "Lcom/facebook/common/references/CloseableReference<",
-            "Lcom/facebook/imagepipeline/f/c;",
-            ">;>;"
-        }
-    .end annotation
-
-    sget-object v0, Lcom/facebook/imagepipeline/request/b$b;->YA:Lcom/facebook/imagepipeline/request/b$b;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {p0, p1, v1, v0, v1}, Lcom/facebook/imagepipeline/b/g;->a(Lcom/facebook/imagepipeline/request/b;Ljava/lang/Object;Lcom/facebook/imagepipeline/request/b$b;Lcom/facebook/imagepipeline/g/c;)Lcom/facebook/b/c;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final hU()V
-    .locals 2
-
-    new-instance v0, Lcom/facebook/imagepipeline/b/g$1;
-
-    invoke-direct {v0, p0}, Lcom/facebook/imagepipeline/b/g$1;-><init>(Lcom/facebook/imagepipeline/b/g;)V
-
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/g;->St:Lcom/facebook/imagepipeline/cache/o;
-
-    invoke-interface {v1, v0}, Lcom/facebook/imagepipeline/cache/o;->b(Lcom/facebook/common/d/j;)I
-
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/g;->Su:Lcom/facebook/imagepipeline/cache/o;
-
-    invoke-interface {v1, v0}, Lcom/facebook/imagepipeline/cache/o;->b(Lcom/facebook/common/d/j;)I
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/h$a.smali b/com.discord/smali/com/facebook/imagepipeline/b/h$a.smali
index 9757af3a76..f2ac3232ef 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/h$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/h$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field IG:Ljava/util/Set;
+.field IY:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -25,68 +25,15 @@
     .end annotation
 .end field
 
-.field OS:Lcom/facebook/imagepipeline/b/e;
+.field OF:Landroid/graphics/Bitmap$Config;
 
-.field Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field On:Landroid/graphics/Bitmap$Config;
+.field Pk:Lcom/facebook/imagepipeline/b/e;
 
-.field QZ:Lcom/facebook/imagepipeline/cache/m;
+.field Rr:Lcom/facebook/imagepipeline/cache/m;
 
-.field SD:Lcom/facebook/common/d/k;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/k<",
-            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field SE:Lcom/facebook/imagepipeline/cache/h$a;
-
-.field SF:Z
-
-.field SG:Lcom/facebook/imagepipeline/b/f;
-
-.field SH:Lcom/facebook/common/d/k;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/k<",
-            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field SI:Lcom/facebook/imagepipeline/d/c;
-
-.field SJ:Lcom/facebook/imagepipeline/j/d;
-
-.field SK:Ljava/lang/Integer;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field SL:Lcom/facebook/cache/disk/DiskCacheConfig;
-
-.field SM:Lcom/facebook/common/g/b;
-
-.field SO:Lcom/facebook/imagepipeline/h/af;
-
-.field SR:Lcom/facebook/imagepipeline/memory/ac;
-
-.field SS:Lcom/facebook/imagepipeline/d/e;
-
-.field ST:Z
-
-.field SU:Lcom/facebook/cache/disk/DiskCacheConfig;
-
-.field SV:Lcom/facebook/imagepipeline/d/d;
-
-.field SX:Z
-
-.field Ss:Lcom/facebook/common/d/k;
+.field SK:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -96,16 +43,69 @@
     .end annotation
 .end field
 
-.field Sx:Lcom/facebook/imagepipeline/cache/f;
+.field SQ:Lcom/facebook/imagepipeline/cache/f;
 
-.field Ta:Ljava/lang/Integer;
+.field public SW:Lcom/facebook/common/d/k;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/k<",
+            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field SX:Lcom/facebook/imagepipeline/cache/h$a;
+
+.field public SY:Z
+
+.field SZ:Lcom/facebook/imagepipeline/b/f;
+
+.field Ta:Lcom/facebook/common/d/k;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/k<",
+            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field Tb:Lcom/facebook/imagepipeline/d/c;
+
+.field Tc:Lcom/facebook/imagepipeline/j/d;
+
+.field Td:Ljava/lang/Integer;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Tb:I
+.field public Te:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-.field final Tc:Lcom/facebook/imagepipeline/b/i$a;
+.field Tf:Lcom/facebook/common/g/b;
+
+.field Th:Lcom/facebook/imagepipeline/h/af;
+
+.field Tj:Lcom/facebook/imagepipeline/memory/ac;
+
+.field Tk:Lcom/facebook/imagepipeline/d/e;
+
+.field Tl:Z
+
+.field public Tm:Lcom/facebook/cache/disk/DiskCacheConfig;
+
+.field Tn:Lcom/facebook/imagepipeline/d/d;
+
+.field Tp:Z
+
+.field Ts:Ljava/lang/Integer;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field Tt:I
+
+.field public final Tu:Lcom/facebook/imagepipeline/b/i$a;
 
 .field final mContext:Landroid/content/Context;
 
@@ -118,29 +118,29 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/h$a;->SF:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/h$a;->SY:Z
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h$a;->SK:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h$a;->Td:Ljava/lang/Integer;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h$a;->Ta:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h$a;->Ts:Ljava/lang/Integer;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/h$a;->ST:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/h$a;->Tl:Z
 
     const/4 v1, -0x1
 
-    iput v1, p0, Lcom/facebook/imagepipeline/b/h$a;->Tb:I
+    iput v1, p0, Lcom/facebook/imagepipeline/b/h$a;->Tt:I
 
     new-instance v1, Lcom/facebook/imagepipeline/b/i$a;
 
     invoke-direct {v1, p0}, Lcom/facebook/imagepipeline/b/i$a;-><init>(Lcom/facebook/imagepipeline/b/h$a;)V
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/b/h$a;->Tc:Lcom/facebook/imagepipeline/b/i$a;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/h$a;->Tu:Lcom/facebook/imagepipeline/b/i$a;
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/h$a;->SX:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/h$a;->Tp:Z
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -163,63 +163,6 @@
 
 
 # virtual methods
-.method public final b(Lcom/facebook/common/d/k;)Lcom/facebook/imagepipeline/b/h$a;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/facebook/common/d/k<",
-            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
-            ">;)",
-            "Lcom/facebook/imagepipeline/b/h$a;"
-        }
-    .end annotation
-
-    invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/facebook/common/d/k;
-
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h$a;->SD:Lcom/facebook/common/d/k;
-
-    return-object p0
-.end method
-
-.method public final c(Lcom/facebook/cache/disk/DiskCacheConfig;)Lcom/facebook/imagepipeline/b/h$a;
-    .locals 0
-
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h$a;->SL:Lcom/facebook/cache/disk/DiskCacheConfig;
-
-    return-object p0
-.end method
-
-.method public final d(Lcom/facebook/cache/disk/DiskCacheConfig;)Lcom/facebook/imagepipeline/b/h$a;
-    .locals 0
-
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h$a;->SU:Lcom/facebook/cache/disk/DiskCacheConfig;
-
-    return-object p0
-.end method
-
-.method public final hW()Lcom/facebook/imagepipeline/b/h$a;
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/h$a;->SF:Z
-
-    return-object p0
-.end method
-
-.method public final hX()Lcom/facebook/imagepipeline/b/i$a;
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/h$a;->Tc:Lcom/facebook/imagepipeline/b/i$a;
-
-    return-object v0
-.end method
-
 .method public final hY()Lcom/facebook/imagepipeline/b/h;
     .locals 2
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/h.smali b/com.discord/smali/com/facebook/imagepipeline/b/h.smali
index f1591f80aa..9ce646bc53 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/h.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/h.smali
@@ -13,11 +13,11 @@
 
 
 # static fields
-.field private static SY:Lcom/facebook/imagepipeline/b/h$b;
+.field private static Tq:Lcom/facebook/imagepipeline/b/h$b;
 
 
 # instance fields
-.field final IG:Ljava/util/Set;
+.field final IY:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -27,86 +27,18 @@
     .end annotation
 .end field
 
-.field final OS:Lcom/facebook/imagepipeline/b/e;
+.field final OF:Landroid/graphics/Bitmap$Config;
 
-.field private final Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final On:Landroid/graphics/Bitmap$Config;
+.field final Pk:Lcom/facebook/imagepipeline/b/e;
 
-.field final QZ:Lcom/facebook/imagepipeline/cache/m;
+.field final Rr:Lcom/facebook/imagepipeline/cache/m;
 
-.field final SD:Lcom/facebook/common/d/k;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/k<",
-            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field final SE:Lcom/facebook/imagepipeline/cache/h$a;
-
-.field final SF:Z
-
-.field final SG:Lcom/facebook/imagepipeline/b/f;
-
-.field final SH:Lcom/facebook/common/d/k;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/k<",
-            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field final SI:Lcom/facebook/imagepipeline/d/c;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field final SJ:Lcom/facebook/imagepipeline/j/d;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field final SK:Ljava/lang/Integer;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field final SL:Lcom/facebook/cache/disk/DiskCacheConfig;
-
-.field final SM:Lcom/facebook/common/g/b;
-
-.field final SN:I
-
-.field final SO:Lcom/facebook/imagepipeline/h/af;
-
-.field private final SQ:I
-
-.field final SR:Lcom/facebook/imagepipeline/memory/ac;
-
-.field final SS:Lcom/facebook/imagepipeline/d/e;
-
-.field final ST:Z
-
-.field final SU:Lcom/facebook/cache/disk/DiskCacheConfig;
-
-.field final SV:Lcom/facebook/imagepipeline/d/d;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field final SW:Lcom/facebook/imagepipeline/b/i;
-
-.field final SX:Z
-
-.field final Ss:Lcom/facebook/common/d/k;
+.field final SK:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -116,7 +48,75 @@
     .end annotation
 .end field
 
-.field final Sx:Lcom/facebook/imagepipeline/cache/f;
+.field final SQ:Lcom/facebook/imagepipeline/cache/f;
+
+.field final SW:Lcom/facebook/common/d/k;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/k<",
+            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field final SX:Lcom/facebook/imagepipeline/cache/h$a;
+
+.field final SY:Z
+
+.field final SZ:Lcom/facebook/imagepipeline/b/f;
+
+.field final Ta:Lcom/facebook/common/d/k;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/k<",
+            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field final Tb:Lcom/facebook/imagepipeline/d/c;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field final Tc:Lcom/facebook/imagepipeline/j/d;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field final Td:Ljava/lang/Integer;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field final Te:Lcom/facebook/cache/disk/DiskCacheConfig;
+
+.field final Tf:Lcom/facebook/common/g/b;
+
+.field final Tg:I
+
+.field final Th:Lcom/facebook/imagepipeline/h/af;
+
+.field private final Ti:I
+
+.field final Tj:Lcom/facebook/imagepipeline/memory/ac;
+
+.field final Tk:Lcom/facebook/imagepipeline/d/e;
+
+.field final Tl:Z
+
+.field final Tm:Lcom/facebook/cache/disk/DiskCacheConfig;
+
+.field final Tn:Lcom/facebook/imagepipeline/d/d;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field final To:Lcom/facebook/imagepipeline/b/i;
+
+.field final Tp:Z
 
 .field final mContext:Landroid/content/Context;
 
@@ -131,7 +131,7 @@
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/b/h$b;-><init>(B)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/b/h;->SY:Lcom/facebook/imagepipeline/b/h$b;
+    sput-object v0, Lcom/facebook/imagepipeline/b/h;->Tq:Lcom/facebook/imagepipeline/b/h$b;
 
     return-void
 .end method
@@ -143,7 +143,7 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tc:Lcom/facebook/imagepipeline/b/i$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tu:Lcom/facebook/imagepipeline/b/i$a;
 
     new-instance v1, Lcom/facebook/imagepipeline/b/i;
 
@@ -151,9 +151,9 @@
 
     invoke-direct {v1, v0, v2}, Lcom/facebook/imagepipeline/b/i;-><init>(Lcom/facebook/imagepipeline/b/i$a;B)V
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SD:Lcom/facebook/common/d/k;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SW:Lcom/facebook/common/d/k;
 
     if-nez v0, :cond_0
 
@@ -174,12 +174,12 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SD:Lcom/facebook/common/d/k;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SW:Lcom/facebook/common/d/k;
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SD:Lcom/facebook/common/d/k;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/common/d/k;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SE:Lcom/facebook/imagepipeline/cache/h$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SX:Lcom/facebook/imagepipeline/cache/h$a;
 
     if-nez v0, :cond_1
 
@@ -190,12 +190,12 @@
     goto :goto_1
 
     :cond_1
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SE:Lcom/facebook/imagepipeline/cache/h$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SX:Lcom/facebook/imagepipeline/cache/h$a;
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SE:Lcom/facebook/imagepipeline/cache/h$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SX:Lcom/facebook/imagepipeline/cache/h$a;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->On:Landroid/graphics/Bitmap$Config;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->OF:Landroid/graphics/Bitmap$Config;
 
     if-nez v0, :cond_2
 
@@ -204,26 +204,26 @@
     goto :goto_2
 
     :cond_2
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->On:Landroid/graphics/Bitmap$Config;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->OF:Landroid/graphics/Bitmap$Config;
 
     :goto_2
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->On:Landroid/graphics/Bitmap$Config;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->OF:Landroid/graphics/Bitmap$Config;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/i;->hF()Lcom/facebook/imagepipeline/cache/i;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/i;->hI()Lcom/facebook/imagepipeline/cache/i;
 
     move-result-object v0
 
     goto :goto_3
 
     :cond_3
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     :goto_3
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->mContext:Landroid/content/Context;
 
@@ -235,7 +235,7 @@
 
     iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->mContext:Landroid/content/Context;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SG:Lcom/facebook/imagepipeline/b/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SZ:Lcom/facebook/imagepipeline/b/f;
 
     if-nez v0, :cond_4
 
@@ -250,16 +250,16 @@
     goto :goto_4
 
     :cond_4
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SG:Lcom/facebook/imagepipeline/b/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SZ:Lcom/facebook/imagepipeline/b/f;
 
     :goto_4
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SG:Lcom/facebook/imagepipeline/b/f;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SZ:Lcom/facebook/imagepipeline/b/f;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SF:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SY:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/h;->SF:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/h;->SY:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SH:Lcom/facebook/common/d/k;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Ta:Lcom/facebook/common/d/k;
 
     if-nez v0, :cond_5
 
@@ -270,36 +270,36 @@
     goto :goto_5
 
     :cond_5
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SH:Lcom/facebook/common/d/k;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Ta:Lcom/facebook/common/d/k;
 
     :goto_5
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SH:Lcom/facebook/common/d/k;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Ta:Lcom/facebook/common/d/k;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->QZ:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Rr:Lcom/facebook/imagepipeline/cache/m;
 
     if-nez v0, :cond_6
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/r;->hG()Lcom/facebook/imagepipeline/cache/r;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/r;->hJ()Lcom/facebook/imagepipeline/cache/r;
 
     move-result-object v0
 
     goto :goto_6
 
     :cond_6
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->QZ:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Rr:Lcom/facebook/imagepipeline/cache/m;
 
     :goto_6
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->QZ:Lcom/facebook/imagepipeline/cache/m;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Rr:Lcom/facebook/imagepipeline/cache/m;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SI:Lcom/facebook/imagepipeline/d/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tb:Lcom/facebook/imagepipeline/d/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SI:Lcom/facebook/imagepipeline/d/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Tb:Lcom/facebook/imagepipeline/d/c;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SK:Ljava/lang/Integer;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Td:Ljava/lang/Integer;
 
     if-nez v0, :cond_7
 
@@ -316,11 +316,11 @@
 
     :cond_8
     :goto_7
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     goto :goto_8
 
@@ -328,13 +328,13 @@
     const/4 v0, 0x0
 
     :goto_8
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Tc:Lcom/facebook/imagepipeline/j/d;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SK:Ljava/lang/Integer;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Td:Ljava/lang/Integer;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SK:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Td:Ljava/lang/Integer;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Ss:Lcom/facebook/common/d/k;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SK:Lcom/facebook/common/d/k;
 
     if-nez v0, :cond_a
 
@@ -345,12 +345,12 @@
     goto :goto_9
 
     :cond_a
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Ss:Lcom/facebook/common/d/k;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SK:Lcom/facebook/common/d/k;
 
     :goto_9
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Ss:Lcom/facebook/common/d/k;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SK:Lcom/facebook/common/d/k;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SL:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Te:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     if-nez v0, :cond_b
 
@@ -363,34 +363,34 @@
     goto :goto_a
 
     :cond_b
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SL:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Te:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     :goto_a
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SL:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Te:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SM:Lcom/facebook/common/g/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tf:Lcom/facebook/common/g/b;
 
     if-nez v0, :cond_c
 
-    invoke-static {}, Lcom/facebook/common/g/c;->fD()Lcom/facebook/common/g/c;
+    invoke-static {}, Lcom/facebook/common/g/c;->fH()Lcom/facebook/common/g/c;
 
     move-result-object v0
 
     goto :goto_b
 
     :cond_c
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SM:Lcom/facebook/common/g/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tf:Lcom/facebook/common/g/b;
 
     :goto_b
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SM:Lcom/facebook/common/g/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Tf:Lcom/facebook/common/g/b;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/b/h$a;->Ta:Ljava/lang/Integer;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/h$a;->Ts:Ljava/lang/Integer;
 
     if-eqz v1, :cond_d
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Ta:Ljava/lang/Integer;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Ts:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -399,7 +399,7 @@
     goto :goto_c
 
     :cond_d
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/i;->To:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/i;->TG:Z
 
     if-eqz v0, :cond_e
 
@@ -411,9 +411,9 @@
     const/4 v0, 0x0
 
     :goto_c
-    iput v0, p0, Lcom/facebook/imagepipeline/b/h;->SN:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/h;->Tg:I
 
-    iget v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tb:I
+    iget v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tt:I
 
     if-gez v0, :cond_f
 
@@ -422,38 +422,38 @@
     goto :goto_d
 
     :cond_f
-    iget v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tb:I
+    iget v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tt:I
 
     :goto_d
-    iput v0, p0, Lcom/facebook/imagepipeline/b/h;->SQ:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/h;->Ti:I
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SO:Lcom/facebook/imagepipeline/h/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Th:Lcom/facebook/imagepipeline/h/af;
 
     if-nez v0, :cond_10
 
     new-instance v0, Lcom/facebook/imagepipeline/h/t;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/b/h;->SQ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/b/h;->Ti:I
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/h/t;-><init>(I)V
 
     goto :goto_e
 
     :cond_10
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SO:Lcom/facebook/imagepipeline/h/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Th:Lcom/facebook/imagepipeline/h/af;
 
     :goto_e
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SO:Lcom/facebook/imagepipeline/h/af;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Th:Lcom/facebook/imagepipeline/h/af;
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
     if-nez v0, :cond_11
 
@@ -472,12 +472,12 @@
     goto :goto_f
 
     :cond_11
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
     :goto_f
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SS:Lcom/facebook/imagepipeline/d/e;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tk:Lcom/facebook/imagepipeline/d/e;
 
     if-nez v0, :cond_12
 
@@ -488,12 +488,12 @@
     goto :goto_10
 
     :cond_12
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SS:Lcom/facebook/imagepipeline/d/e;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tk:Lcom/facebook/imagepipeline/d/e;
 
     :goto_10
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SS:Lcom/facebook/imagepipeline/d/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Tk:Lcom/facebook/imagepipeline/d/e;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->IG:Ljava/util/Set;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->IY:Ljava/util/Set;
 
     if-nez v0, :cond_13
 
@@ -504,40 +504,40 @@
     goto :goto_11
 
     :cond_13
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->IG:Ljava/util/Set;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->IY:Ljava/util/Set;
 
     :goto_11
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->IG:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->IY:Ljava/util/Set;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/h$a;->ST:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tl:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/h;->ST:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/h;->Tl:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SU:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tm:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     if-nez v0, :cond_14
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SL:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Te:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     goto :goto_12
 
     :cond_14
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SU:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tm:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     :goto_12
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SU:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Tm:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->SV:Lcom/facebook/imagepipeline/d/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/h$a;->Tn:Lcom/facebook/imagepipeline/d/d;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SV:Lcom/facebook/imagepipeline/d/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Tn:Lcom/facebook/imagepipeline/d/d;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/h;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/ac;->jf()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/ac;->jd()I
 
     move-result v0
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/b/h$a;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/h$a;->Pk:Lcom/facebook/imagepipeline/b/e;
 
     if-nez v1, :cond_15
 
@@ -548,45 +548,45 @@
     goto :goto_13
 
     :cond_15
-    iget-object v1, p1, Lcom/facebook/imagepipeline/b/h$a;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/h$a;->Pk:Lcom/facebook/imagepipeline/b/e;
 
     :goto_13
-    iput-object v1, p0, Lcom/facebook/imagepipeline/b/h;->OS:Lcom/facebook/imagepipeline/b/e;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/h;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/h$a;->SX:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/h$a;->Tp:Z
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/b/h;->SX:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/b/h;->Tp:Z
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/b/i;->Th:Lcom/facebook/common/k/b;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/i;->Tz:Lcom/facebook/common/k/b;
 
     if-eqz p1, :cond_16
 
     new-instance v0, Lcom/facebook/imagepipeline/bitmaps/d;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/h;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/h;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/bitmaps/d;-><init>(Lcom/facebook/imagepipeline/memory/ac;)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
     invoke-static {p1, v1, v0}, Lcom/facebook/imagepipeline/b/h;->a(Lcom/facebook/common/k/b;Lcom/facebook/imagepipeline/b/i;Lcom/facebook/common/k/a;)V
 
     goto :goto_14
 
     :cond_16
-    iget-object p1, p0, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/i;->Te:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/i;->Tw:Z
 
     if-eqz p1, :cond_17
 
-    sget-boolean p1, Lcom/facebook/common/k/c;->HH:Z
+    sget-boolean p1, Lcom/facebook/common/k/c;->HY:Z
 
     if-eqz p1, :cond_17
 
-    invoke-static {}, Lcom/facebook/common/k/c;->fT()Lcom/facebook/common/k/b;
+    invoke-static {}, Lcom/facebook/common/k/c;->fX()Lcom/facebook/common/k/b;
 
     move-result-object p1
 
@@ -594,11 +594,11 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/bitmaps/d;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/h;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/h;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/bitmaps/d;-><init>(Lcom/facebook/imagepipeline/memory/ac;)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
     invoke-static {p1, v1, v0}, Lcom/facebook/imagepipeline/b/h;->a(Lcom/facebook/common/k/b;Lcom/facebook/imagepipeline/b/i;Lcom/facebook/common/k/a;)V
 
@@ -620,9 +620,9 @@
 .method private static a(Lcom/facebook/common/k/b;Lcom/facebook/imagepipeline/b/i;Lcom/facebook/common/k/a;)V
     .locals 0
 
-    sput-object p0, Lcom/facebook/common/k/c;->HK:Lcom/facebook/common/k/b;
+    sput-object p0, Lcom/facebook/common/k/c;->Ib:Lcom/facebook/common/k/b;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/b/i;->Tf:Lcom/facebook/common/k/b$a;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/i;->Tx:Lcom/facebook/common/k/b$a;
 
     if-eqz p1, :cond_0
 
@@ -634,10 +634,10 @@
     return-void
 .end method
 
-.method public static hV()Lcom/facebook/imagepipeline/b/h$b;
+.method public static hX()Lcom/facebook/imagepipeline/b/h$b;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/b/h;->SY:Lcom/facebook/imagepipeline/b/h$b;
+    sget-object v0, Lcom/facebook/imagepipeline/b/h;->Tq:Lcom/facebook/imagepipeline/b/h$b;
 
     return-object v0
 .end method
@@ -652,7 +652,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->fq()Lcom/facebook/cache/disk/DiskCacheConfig;
+    invoke-virtual {p0}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->fu()Lcom/facebook/cache/disk/DiskCacheConfig;
 
     move-result-object p0
     :try_end_0
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/j.smali b/com.discord/smali/com/facebook/imagepipeline/b/j.smali
index 24aacd4766..2e09e17017 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/j.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/j.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,37 +13,25 @@
     .end annotation
 .end field
 
-.field private static Tt:Lcom/facebook/imagepipeline/b/j;
+.field private static TL:Lcom/facebook/imagepipeline/b/j;
 
 
 # instance fields
-.field private IJ:Lcom/facebook/imagepipeline/b/g;
+.field private Jb:Lcom/facebook/imagepipeline/b/g;
 
-.field private Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private SI:Lcom/facebook/imagepipeline/d/c;
+.field private SI:Lcom/facebook/imagepipeline/b/m;
 
-.field private SJ:Lcom/facebook/imagepipeline/j/d;
+.field private SN:Lcom/facebook/imagepipeline/cache/e;
 
-.field private Sq:Lcom/facebook/imagepipeline/b/m;
+.field private SO:Lcom/facebook/imagepipeline/cache/e;
 
-.field private Sv:Lcom/facebook/imagepipeline/cache/e;
+.field private final SR:Lcom/facebook/imagepipeline/h/as;
 
-.field private Sw:Lcom/facebook/imagepipeline/cache/e;
+.field private final TM:Lcom/facebook/imagepipeline/b/h;
 
-.field private final Sy:Lcom/facebook/imagepipeline/h/as;
-
-.field private TA:Lcom/facebook/imagepipeline/b/l;
-
-.field private TB:Lcom/facebook/cache/disk/h;
-
-.field private TC:Lcom/facebook/imagepipeline/platform/f;
-
-.field private TD:Lcom/facebook/imagepipeline/animated/b/a;
-
-.field private final Tu:Lcom/facebook/imagepipeline/b/h;
-
-.field private Tv:Lcom/facebook/imagepipeline/cache/h;
+.field private TN:Lcom/facebook/imagepipeline/cache/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h<",
@@ -54,7 +42,7 @@
     .end annotation
 .end field
 
-.field private Tw:Lcom/facebook/imagepipeline/cache/n;
+.field private TO:Lcom/facebook/imagepipeline/cache/n;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/n<",
@@ -65,7 +53,7 @@
     .end annotation
 .end field
 
-.field private Tx:Lcom/facebook/imagepipeline/cache/h;
+.field private TP:Lcom/facebook/imagepipeline/cache/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h<",
@@ -76,7 +64,7 @@
     .end annotation
 .end field
 
-.field private Ty:Lcom/facebook/imagepipeline/cache/n;
+.field private TQ:Lcom/facebook/imagepipeline/cache/n;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/n<",
@@ -87,7 +75,19 @@
     .end annotation
 .end field
 
-.field private Tz:Lcom/facebook/cache/disk/h;
+.field private TR:Lcom/facebook/cache/disk/h;
+
+.field private TS:Lcom/facebook/imagepipeline/b/l;
+
+.field private TT:Lcom/facebook/cache/disk/h;
+
+.field private TU:Lcom/facebook/imagepipeline/platform/f;
+
+.field private TV:Lcom/facebook/imagepipeline/animated/b/a;
+
+.field private Tb:Lcom/facebook/imagepipeline/d/c;
+
+.field private Tc:Lcom/facebook/imagepipeline/j/d;
 
 
 # direct methods
@@ -96,7 +96,7 @@
 
     const-class v0, Lcom/facebook/imagepipeline/b/j;
 
-    sput-object v0, Lcom/facebook/imagepipeline/b/j;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/b/j;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -114,19 +114,19 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/b/h;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
     new-instance v0, Lcom/facebook/imagepipeline/h/as;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/b/h;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/h;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/b/e;->hT()Ljava/util/concurrent/Executor;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/b/e;->hW()Ljava/util/concurrent/Executor;
 
     move-result-object p1
 
     invoke-direct {v0, p1}, Lcom/facebook/imagepipeline/h/as;-><init>(Ljava/util/concurrent/Executor;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Sy:Lcom/facebook/imagepipeline/h/as;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SR:Lcom/facebook/imagepipeline/h/as;
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
@@ -141,11 +141,11 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/b/j;->Tt:Lcom/facebook/imagepipeline/b/j;
+    sget-object v1, Lcom/facebook/imagepipeline/b/j;->TL:Lcom/facebook/imagepipeline/b/j;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/imagepipeline/b/j;->Fl:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/b/j;->FC:Ljava/lang/Class;
 
     const-string v2, "ImagePipelineFactory has already been initialized! `ImagePipelineFactory.initialize(...)` should only be called once to avoid unexpected behavior."
 
@@ -156,7 +156,7 @@
 
     invoke-direct {v1, p0}, Lcom/facebook/imagepipeline/b/j;-><init>(Lcom/facebook/imagepipeline/b/h;)V
 
-    sput-object v1, Lcom/facebook/imagepipeline/b/j;->Tt:Lcom/facebook/imagepipeline/b/j;
+    sput-object v1, Lcom/facebook/imagepipeline/b/j;->TL:Lcom/facebook/imagepipeline/b/j;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -172,10 +172,10 @@
     throw p0
 .end method
 
-.method public static ia()Lcom/facebook/imagepipeline/b/j;
+.method public static hZ()Lcom/facebook/imagepipeline/b/j;
     .locals 2
 
-    sget-object v0, Lcom/facebook/imagepipeline/b/j;->Tt:Lcom/facebook/imagepipeline/b/j;
+    sget-object v0, Lcom/facebook/imagepipeline/b/j;->TL:Lcom/facebook/imagepipeline/b/j;
 
     const-string v1, "ImagePipelineFactory was not initialized!"
 
@@ -188,7 +188,7 @@
     return-object v0
 .end method
 
-.method private ic()Lcom/facebook/imagepipeline/cache/h;
+.method private ib()Lcom/facebook/imagepipeline/cache/h;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -200,31 +200,31 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tv:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TN:Lcom/facebook/imagepipeline/cache/h;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->SD:Lcom/facebook/common/d/k;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/common/d/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SE:Lcom/facebook/imagepipeline/cache/h$a;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SX:Lcom/facebook/imagepipeline/cache/h$a;
 
     invoke-static {v0, v1}, Lcom/facebook/imagepipeline/cache/a;->a(Lcom/facebook/common/d/k;Lcom/facebook/imagepipeline/cache/h$a;)Lcom/facebook/imagepipeline/cache/h;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tv:Lcom/facebook/imagepipeline/cache/h;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TN:Lcom/facebook/imagepipeline/cache/h;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tv:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TN:Lcom/facebook/imagepipeline/cache/h;
 
     return-object v0
 .end method
 
-.method private ie()Lcom/facebook/imagepipeline/cache/n;
+.method private ic()Lcom/facebook/imagepipeline/cache/n;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -236,17 +236,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tw:Lcom/facebook/imagepipeline/cache/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TO:Lcom/facebook/imagepipeline/cache/n;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ic()Lcom/facebook/imagepipeline/cache/h;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ib()Lcom/facebook/imagepipeline/cache/h;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->QZ:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Rr:Lcom/facebook/imagepipeline/cache/m;
 
     new-instance v2, Lcom/facebook/imagepipeline/cache/b$1;
 
@@ -256,15 +256,15 @@
 
     invoke-direct {v1, v0, v2}, Lcom/facebook/imagepipeline/cache/n;-><init>(Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/imagepipeline/cache/p;)V
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tw:Lcom/facebook/imagepipeline/cache/n;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TO:Lcom/facebook/imagepipeline/cache/n;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tw:Lcom/facebook/imagepipeline/cache/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TO:Lcom/facebook/imagepipeline/cache/n;
 
     return-object v0
 .end method
 
-.method private if()Lcom/facebook/imagepipeline/cache/n;
+.method private ie()Lcom/facebook/imagepipeline/cache/n;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -276,17 +276,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Ty:Lcom/facebook/imagepipeline/cache/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TQ:Lcom/facebook/imagepipeline/cache/n;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tx:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TP:Lcom/facebook/imagepipeline/cache/h;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->SH:Lcom/facebook/common/d/k;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->Ta:Lcom/facebook/common/d/k;
 
     new-instance v1, Lcom/facebook/imagepipeline/cache/k$1;
 
@@ -300,14 +300,14 @@
 
     invoke-direct {v3, v1, v2, v0}, Lcom/facebook/imagepipeline/cache/h;-><init>(Lcom/facebook/imagepipeline/cache/t;Lcom/facebook/imagepipeline/cache/h$a;Lcom/facebook/common/d/k;)V
 
-    iput-object v3, p0, Lcom/facebook/imagepipeline/b/j;->Tx:Lcom/facebook/imagepipeline/cache/h;
+    iput-object v3, p0, Lcom/facebook/imagepipeline/b/j;->TP:Lcom/facebook/imagepipeline/cache/h;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tx:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TP:Lcom/facebook/imagepipeline/cache/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->QZ:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Rr:Lcom/facebook/imagepipeline/cache/m;
 
     new-instance v2, Lcom/facebook/imagepipeline/cache/l$1;
 
@@ -317,108 +317,108 @@
 
     invoke-direct {v1, v0, v2}, Lcom/facebook/imagepipeline/cache/n;-><init>(Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/imagepipeline/cache/p;)V
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Ty:Lcom/facebook/imagepipeline/cache/n;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TQ:Lcom/facebook/imagepipeline/cache/n;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Ty:Lcom/facebook/imagepipeline/cache/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TQ:Lcom/facebook/imagepipeline/cache/n;
 
     return-object v0
 .end method
 
-.method private ig()Lcom/facebook/imagepipeline/cache/e;
+.method private if()Lcom/facebook/imagepipeline/cache/e;
     .locals 8
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Sv:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SN:Lcom/facebook/imagepipeline/cache/e;
 
     if-nez v0, :cond_1
 
     new-instance v0, Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tz:Lcom/facebook/cache/disk/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TR:Lcom/facebook/cache/disk/h;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SL:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Te:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/b/h;->SG:Lcom/facebook/imagepipeline/b/f;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/b/h;->SZ:Lcom/facebook/imagepipeline/b/f;
 
     invoke-interface {v2, v1}, Lcom/facebook/imagepipeline/b/f;->a(Lcom/facebook/cache/disk/DiskCacheConfig;)Lcom/facebook/cache/disk/h;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tz:Lcom/facebook/cache/disk/h;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TR:Lcom/facebook/cache/disk/h;
 
     :cond_0
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/j;->Tz:Lcom/facebook/cache/disk/h;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/j;->TR:Lcom/facebook/cache/disk/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/b/h;->SN:I
+    iget v3, v3, Lcom/facebook/imagepipeline/b/h;->Tg:I
 
     invoke-virtual {v1, v3}, Lcom/facebook/imagepipeline/memory/ac;->aA(I)Lcom/facebook/common/g/g;
 
     move-result-object v3
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ac;->jh()Lcom/facebook/common/g/j;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ac;->jf()Lcom/facebook/common/g/j;
 
     move-result-object v4
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hP()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hS()Ljava/util/concurrent/Executor;
 
     move-result-object v5
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hQ()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hT()Ljava/util/concurrent/Executor;
 
     move-result-object v6
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v7, v1, Lcom/facebook/imagepipeline/b/h;->QZ:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v7, v1, Lcom/facebook/imagepipeline/b/h;->Rr:Lcom/facebook/imagepipeline/cache/m;
 
     move-object v1, v0
 
     invoke-direct/range {v1 .. v7}, Lcom/facebook/imagepipeline/cache/e;-><init>(Lcom/facebook/cache/disk/h;Lcom/facebook/common/g/g;Lcom/facebook/common/g/j;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Lcom/facebook/imagepipeline/cache/m;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Sv:Lcom/facebook/imagepipeline/cache/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SN:Lcom/facebook/imagepipeline/cache/e;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Sv:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SN:Lcom/facebook/imagepipeline/cache/e;
 
     return-object v0
 .end method
 
-.method private ih()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.method private ig()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ii()Lcom/facebook/imagepipeline/platform/f;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ih()Lcom/facebook/imagepipeline/platform/f;
 
     move-result-object v1
 
@@ -426,90 +426,90 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     return-object v0
 .end method
 
-.method private ii()Lcom/facebook/imagepipeline/platform/f;
+.method private ih()Lcom/facebook/imagepipeline/platform/f;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TC:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TU:Lcom/facebook/imagepipeline/platform/f;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/i;->Tr:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/i;->TJ:Z
 
     invoke-static {v0, v1}, Lcom/facebook/imagepipeline/platform/g;->a(Lcom/facebook/imagepipeline/memory/ac;Z)Lcom/facebook/imagepipeline/platform/f;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TC:Lcom/facebook/imagepipeline/platform/f;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TU:Lcom/facebook/imagepipeline/platform/f;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TC:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TU:Lcom/facebook/imagepipeline/platform/f;
 
     return-object v0
 .end method
 
-.method private ij()Lcom/facebook/imagepipeline/b/l;
+.method private ii()Lcom/facebook/imagepipeline/b/l;
     .locals 22
 
     move-object/from16 v0, p0
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TS:Lcom/facebook/imagepipeline/b/l;
 
     if-nez v1, :cond_4
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/b/i;->Tq:Lcom/facebook/imagepipeline/b/i$c;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/b/i;->TI:Lcom/facebook/imagepipeline/b/i$c;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
     iget-object v3, v1, Lcom/facebook/imagepipeline/b/h;->mContext:Landroid/content/Context;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ac;->ji()Lcom/facebook/common/g/a;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ac;->jg()Lcom/facebook/common/g/a;
 
     move-result-object v4
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->SI:Lcom/facebook/imagepipeline/d/c;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tb:Lcom/facebook/imagepipeline/d/c;
 
     if-nez v1, :cond_3
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SI:Lcom/facebook/imagepipeline/d/c;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Tb:Lcom/facebook/imagepipeline/d/c;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SI:Lcom/facebook/imagepipeline/d/c;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Tb:Lcom/facebook/imagepipeline/d/c;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/j;->SI:Lcom/facebook/imagepipeline/d/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tb:Lcom/facebook/imagepipeline/d/c;
 
     goto :goto_1
 
     :cond_0
-    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->ib()Lcom/facebook/imagepipeline/animated/b/a;
+    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->ia()Lcom/facebook/imagepipeline/animated/b/a;
 
     move-result-object v1
 
@@ -517,17 +517,17 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v5, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v5, v5, Lcom/facebook/imagepipeline/b/h;->On:Landroid/graphics/Bitmap$Config;
+    iget-object v5, v5, Lcom/facebook/imagepipeline/b/h;->OF:Landroid/graphics/Bitmap$Config;
 
     invoke-interface {v1, v5}, Lcom/facebook/imagepipeline/animated/b/a;->a(Landroid/graphics/Bitmap$Config;)Lcom/facebook/imagepipeline/d/c;
 
     move-result-object v5
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v6, v6, Lcom/facebook/imagepipeline/b/h;->On:Landroid/graphics/Bitmap$Config;
+    iget-object v6, v6, Lcom/facebook/imagepipeline/b/h;->OF:Landroid/graphics/Bitmap$Config;
 
     invoke-interface {v1, v6}, Lcom/facebook/imagepipeline/animated/b/a;->b(Landroid/graphics/Bitmap$Config;)Lcom/facebook/imagepipeline/d/c;
 
@@ -539,148 +539,148 @@
     move-object v1, v5
 
     :goto_0
-    iget-object v6, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v6, v6, Lcom/facebook/imagepipeline/b/h;->SV:Lcom/facebook/imagepipeline/d/d;
+    iget-object v6, v6, Lcom/facebook/imagepipeline/b/h;->Tn:Lcom/facebook/imagepipeline/d/d;
 
     if-nez v6, :cond_2
 
     new-instance v6, Lcom/facebook/imagepipeline/d/b;
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->ii()Lcom/facebook/imagepipeline/platform/f;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->ih()Lcom/facebook/imagepipeline/platform/f;
 
     move-result-object v7
 
     invoke-direct {v6, v5, v1, v7}, Lcom/facebook/imagepipeline/d/b;-><init>(Lcom/facebook/imagepipeline/d/c;Lcom/facebook/imagepipeline/d/c;Lcom/facebook/imagepipeline/platform/f;)V
 
-    iput-object v6, v0, Lcom/facebook/imagepipeline/b/j;->SI:Lcom/facebook/imagepipeline/d/c;
+    iput-object v6, v0, Lcom/facebook/imagepipeline/b/j;->Tb:Lcom/facebook/imagepipeline/d/c;
 
     goto :goto_1
 
     :cond_2
     new-instance v6, Lcom/facebook/imagepipeline/d/b;
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->ii()Lcom/facebook/imagepipeline/platform/f;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->ih()Lcom/facebook/imagepipeline/platform/f;
 
     move-result-object v7
 
-    iget-object v8, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v8, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v8, v8, Lcom/facebook/imagepipeline/b/h;->SV:Lcom/facebook/imagepipeline/d/d;
+    iget-object v8, v8, Lcom/facebook/imagepipeline/b/h;->Tn:Lcom/facebook/imagepipeline/d/d;
 
-    iget-object v8, v8, Lcom/facebook/imagepipeline/d/d;->Ud:Ljava/util/Map;
+    iget-object v8, v8, Lcom/facebook/imagepipeline/d/d;->Uv:Ljava/util/Map;
 
     invoke-direct {v6, v5, v1, v7, v8}, Lcom/facebook/imagepipeline/d/b;-><init>(Lcom/facebook/imagepipeline/d/c;Lcom/facebook/imagepipeline/d/c;Lcom/facebook/imagepipeline/platform/f;Ljava/util/Map;)V
 
-    iput-object v6, v0, Lcom/facebook/imagepipeline/b/j;->SI:Lcom/facebook/imagepipeline/d/c;
+    iput-object v6, v0, Lcom/facebook/imagepipeline/b/j;->Tb:Lcom/facebook/imagepipeline/d/c;
 
-    invoke-static {}, Lcom/facebook/d/d;->hr()Lcom/facebook/d/d;
+    invoke-static {}, Lcom/facebook/d/d;->hu()Lcom/facebook/d/d;
 
     move-result-object v1
 
-    iget-object v5, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v5, v5, Lcom/facebook/imagepipeline/b/h;->SV:Lcom/facebook/imagepipeline/d/d;
+    iget-object v5, v5, Lcom/facebook/imagepipeline/b/h;->Tn:Lcom/facebook/imagepipeline/d/d;
 
-    iget-object v5, v5, Lcom/facebook/imagepipeline/d/d;->Ue:Ljava/util/List;
+    iget-object v5, v5, Lcom/facebook/imagepipeline/d/d;->Uw:Ljava/util/List;
 
-    iput-object v5, v1, Lcom/facebook/d/d;->PH:Ljava/util/List;
+    iput-object v5, v1, Lcom/facebook/d/d;->Qa:Ljava/util/List;
 
-    invoke-virtual {v1}, Lcom/facebook/d/d;->hq()V
+    invoke-virtual {v1}, Lcom/facebook/d/d;->ht()V
 
     :cond_3
     :goto_1
-    iget-object v5, v0, Lcom/facebook/imagepipeline/b/j;->SI:Lcom/facebook/imagepipeline/d/c;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/b/j;->Tb:Lcom/facebook/imagepipeline/d/c;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v6, v1, Lcom/facebook/imagepipeline/b/h;->SS:Lcom/facebook/imagepipeline/d/e;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/b/h;->Tk:Lcom/facebook/imagepipeline/d/e;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-boolean v7, v1, Lcom/facebook/imagepipeline/b/h;->SF:Z
+    iget-boolean v7, v1, Lcom/facebook/imagepipeline/b/h;->SY:Z
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-boolean v8, v1, Lcom/facebook/imagepipeline/b/h;->ST:Z
+    iget-boolean v8, v1, Lcom/facebook/imagepipeline/b/h;->Tl:Z
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v9, v1, Lcom/facebook/imagepipeline/b/i;->Tg:Z
+    iget-boolean v9, v1, Lcom/facebook/imagepipeline/b/i;->Ty:Z
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v10, v1, Lcom/facebook/imagepipeline/b/h;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v10, v1, Lcom/facebook/imagepipeline/b/h;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v11, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v11, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget v11, v11, Lcom/facebook/imagepipeline/b/h;->SN:I
+    iget v11, v11, Lcom/facebook/imagepipeline/b/h;->Tg:I
 
     invoke-virtual {v1, v11}, Lcom/facebook/imagepipeline/memory/ac;->aA(I)Lcom/facebook/common/g/g;
 
     move-result-object v11
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->ie()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->ic()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v12
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->if()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->ie()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v13
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->ig()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->if()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v14
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->im()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->il()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v15
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     move-object/from16 v16, v1
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->ih()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/j;->ig()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     move-result-object v17
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/i;->Tk:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/i;->TC:I
 
     move/from16 v18, v1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/i;->Tl:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/i;->TD:I
 
     move/from16 v19, v1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/i;->Tm:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/i;->TE:Z
 
     move/from16 v20, v1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/i;->Tn:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/i;->TF:I
 
     move/from16 v21, v1
 
@@ -688,15 +688,15 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TA:Lcom/facebook/imagepipeline/b/l;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TS:Lcom/facebook/imagepipeline/b/l;
 
     :cond_4
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/j;->TS:Lcom/facebook/imagepipeline/b/l;
 
     return-object v1
 .end method
 
-.method private ik()Lcom/facebook/imagepipeline/b/m;
+.method private ij()Lcom/facebook/imagepipeline/b/m;
     .locals 13
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -705,11 +705,11 @@
 
     if-lt v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/i;->Tj:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/i;->TB:Z
 
     if-eqz v0, :cond_0
 
@@ -725,13 +725,13 @@
     const/4 v9, 0x0
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Sq:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SI:Lcom/facebook/imagepipeline/b/m;
 
     if-nez v0, :cond_1
 
     new-instance v0, Lcom/facebook/imagepipeline/b/m;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
     iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->mContext:Landroid/content/Context;
 
@@ -743,41 +743,41 @@
 
     move-result-object v2
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ij()Lcom/facebook/imagepipeline/b/l;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ii()Lcom/facebook/imagepipeline/b/l;
 
     move-result-object v3
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/b/h;->SO:Lcom/facebook/imagepipeline/h/af;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/b/h;->Th:Lcom/facebook/imagepipeline/h/af;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-boolean v5, v1, Lcom/facebook/imagepipeline/b/h;->ST:Z
+    iget-boolean v5, v1, Lcom/facebook/imagepipeline/b/h;->Tl:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v6, v1, Lcom/facebook/imagepipeline/b/i;->Te:Z
+    iget-boolean v6, v1, Lcom/facebook/imagepipeline/b/i;->Tw:Z
 
-    iget-object v7, p0, Lcom/facebook/imagepipeline/b/j;->Sy:Lcom/facebook/imagepipeline/h/as;
+    iget-object v7, p0, Lcom/facebook/imagepipeline/b/j;->SR:Lcom/facebook/imagepipeline/h/as;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-boolean v8, v1, Lcom/facebook/imagepipeline/b/h;->SF:Z
+    iget-boolean v8, v1, Lcom/facebook/imagepipeline/b/h;->SY:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v10, v1, Lcom/facebook/imagepipeline/b/i;->Tp:Z
+    iget-boolean v10, v1, Lcom/facebook/imagepipeline/b/i;->TH:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-boolean v11, v1, Lcom/facebook/imagepipeline/b/h;->SX:Z
+    iget-boolean v11, v1, Lcom/facebook/imagepipeline/b/h;->Tp:Z
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->in()Lcom/facebook/imagepipeline/j/d;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->im()Lcom/facebook/imagepipeline/j/d;
 
     move-result-object v12
 
@@ -785,177 +785,177 @@
 
     invoke-direct/range {v1 .. v12}, Lcom/facebook/imagepipeline/b/m;-><init>(Landroid/content/ContentResolver;Lcom/facebook/imagepipeline/b/l;Lcom/facebook/imagepipeline/h/af;ZZLcom/facebook/imagepipeline/h/as;ZZZZLcom/facebook/imagepipeline/j/d;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Sq:Lcom/facebook/imagepipeline/b/m;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SI:Lcom/facebook/imagepipeline/b/m;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Sq:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SI:Lcom/facebook/imagepipeline/b/m;
 
     return-object v0
 .end method
 
-.method private il()Lcom/facebook/cache/disk/h;
+.method private ik()Lcom/facebook/cache/disk/h;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TB:Lcom/facebook/cache/disk/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TT:Lcom/facebook/cache/disk/h;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->SU:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->Tm:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SG:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SZ:Lcom/facebook/imagepipeline/b/f;
 
     invoke-interface {v1, v0}, Lcom/facebook/imagepipeline/b/f;->a(Lcom/facebook/cache/disk/DiskCacheConfig;)Lcom/facebook/cache/disk/h;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TB:Lcom/facebook/cache/disk/h;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TT:Lcom/facebook/cache/disk/h;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TB:Lcom/facebook/cache/disk/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TT:Lcom/facebook/cache/disk/h;
 
     return-object v0
 .end method
 
-.method private im()Lcom/facebook/imagepipeline/cache/e;
+.method private il()Lcom/facebook/imagepipeline/cache/e;
     .locals 8
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Sw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SO:Lcom/facebook/imagepipeline/cache/e;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/facebook/imagepipeline/cache/e;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->il()Lcom/facebook/cache/disk/h;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ik()Lcom/facebook/cache/disk/h;
 
     move-result-object v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/b/h;->SN:I
+    iget v3, v3, Lcom/facebook/imagepipeline/b/h;->Tg:I
 
     invoke-virtual {v1, v3}, Lcom/facebook/imagepipeline/memory/ac;->aA(I)Lcom/facebook/common/g/g;
 
     move-result-object v3
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SR:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Tj:Lcom/facebook/imagepipeline/memory/ac;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ac;->jh()Lcom/facebook/common/g/j;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ac;->jf()Lcom/facebook/common/g/j;
 
     move-result-object v4
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hP()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hS()Ljava/util/concurrent/Executor;
 
     move-result-object v5
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hQ()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hT()Ljava/util/concurrent/Executor;
 
     move-result-object v6
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v7, v1, Lcom/facebook/imagepipeline/b/h;->QZ:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v7, v1, Lcom/facebook/imagepipeline/b/h;->Rr:Lcom/facebook/imagepipeline/cache/m;
 
     move-object v1, v0
 
     invoke-direct/range {v1 .. v7}, Lcom/facebook/imagepipeline/cache/e;-><init>(Lcom/facebook/cache/disk/h;Lcom/facebook/common/g/g;Lcom/facebook/common/g/j;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Lcom/facebook/imagepipeline/cache/m;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Sw:Lcom/facebook/imagepipeline/cache/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SO:Lcom/facebook/imagepipeline/cache/e;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Sw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SO:Lcom/facebook/imagepipeline/cache/e;
 
     return-object v0
 .end method
 
-.method private in()Lcom/facebook/imagepipeline/j/d;
+.method private im()Lcom/facebook/imagepipeline/j/d;
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->SK:Ljava/lang/Integer;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->Td:Ljava/lang/Integer;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/i;->To:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/i;->TG:Z
 
     if-eqz v0, :cond_0
 
     new-instance v0, Lcom/facebook/imagepipeline/j/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/i;->Tn:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/i;->TF:I
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/j/h;-><init>(I)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     goto :goto_0
 
     :cond_0
     new-instance v0, Lcom/facebook/imagepipeline/j/f;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/i;->Tn:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/i;->TF:I
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v2, v2, Lcom/facebook/imagepipeline/b/i;->Ti:Z
+    iget-boolean v2, v2, Lcom/facebook/imagepipeline/b/i;->TA:Z
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/b/h;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/b/h;->Tc:Lcom/facebook/imagepipeline/j/d;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v4, v4, Lcom/facebook/imagepipeline/b/h;->SK:Ljava/lang/Integer;
+    iget-object v4, v4, Lcom/facebook/imagepipeline/b/h;->Td:Ljava/lang/Integer;
 
     invoke-direct {v0, v1, v2, v3, v4}, Lcom/facebook/imagepipeline/j/f;-><init>(IZLcom/facebook/imagepipeline/j/d;Ljava/lang/Integer;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     return-object v0
 .end method
@@ -998,52 +998,52 @@
 
 
 # virtual methods
-.method public final gj()Lcom/facebook/imagepipeline/b/g;
+.method public final gn()Lcom/facebook/imagepipeline/b/g;
     .locals 13
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->IJ:Lcom/facebook/imagepipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Jb:Lcom/facebook/imagepipeline/b/g;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/facebook/imagepipeline/b/g;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ik()Lcom/facebook/imagepipeline/b/m;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ij()Lcom/facebook/imagepipeline/b/m;
 
     move-result-object v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->IG:Ljava/util/Set;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->IY:Ljava/util/Set;
 
     invoke-static {v1}, Ljava/util/Collections;->unmodifiableSet(Ljava/util/Set;)Ljava/util/Set;
 
     move-result-object v3
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/b/h;->Ss:Lcom/facebook/common/d/k;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/b/h;->SK:Lcom/facebook/common/d/k;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ie()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ic()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v5
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->if()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ie()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v6
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ig()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->if()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v7
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->im()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->il()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v8
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v9, v1, Lcom/facebook/imagepipeline/b/h;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v9, v1, Lcom/facebook/imagepipeline/b/h;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
-    iget-object v10, p0, Lcom/facebook/imagepipeline/b/j;->Sy:Lcom/facebook/imagepipeline/h/as;
+    iget-object v10, p0, Lcom/facebook/imagepipeline/b/j;->SR:Lcom/facebook/imagepipeline/h/as;
 
     sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
@@ -1051,59 +1051,59 @@
 
     move-result-object v11
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v12, v1, Lcom/facebook/imagepipeline/b/i;->SB:Lcom/facebook/common/d/k;
+    iget-object v12, v1, Lcom/facebook/imagepipeline/b/i;->SU:Lcom/facebook/common/d/k;
 
     move-object v1, v0
 
     invoke-direct/range {v1 .. v12}, Lcom/facebook/imagepipeline/b/g;-><init>(Lcom/facebook/imagepipeline/b/m;Ljava/util/Set;Lcom/facebook/common/d/k;Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/h/as;Lcom/facebook/common/d/k;Lcom/facebook/common/d/k;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->IJ:Lcom/facebook/imagepipeline/b/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Jb:Lcom/facebook/imagepipeline/b/g;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->IJ:Lcom/facebook/imagepipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Jb:Lcom/facebook/imagepipeline/b/g;
 
     return-object v0
 .end method
 
-.method public final ib()Lcom/facebook/imagepipeline/animated/b/a;
+.method public final ia()Lcom/facebook/imagepipeline/animated/b/a;
     .locals 4
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TD:Lcom/facebook/imagepipeline/animated/b/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TV:Lcom/facebook/imagepipeline/animated/b/a;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ih()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ig()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/h;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ic()Lcom/facebook/imagepipeline/cache/h;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/j;->ib()Lcom/facebook/imagepipeline/cache/h;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/j;->Tu:Lcom/facebook/imagepipeline/b/h;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/j;->TM:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/b/h;->SW:Lcom/facebook/imagepipeline/b/i;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/b/h;->To:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v3, v3, Lcom/facebook/imagepipeline/b/i;->OU:Z
+    iget-boolean v3, v3, Lcom/facebook/imagepipeline/b/i;->Pm:Z
 
     invoke-static {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/animated/b/b;->a(Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;Lcom/facebook/imagepipeline/b/e;Lcom/facebook/imagepipeline/cache/h;Z)Lcom/facebook/imagepipeline/animated/b/a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TD:Lcom/facebook/imagepipeline/animated/b/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TV:Lcom/facebook/imagepipeline/animated/b/a;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TD:Lcom/facebook/imagepipeline/animated/b/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/j;->TV:Lcom/facebook/imagepipeline/animated/b/a;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/c/a$1.smali b/com.discord/smali/com/facebook/imagepipeline/c/a$1.smali
index 3461ab8ff2..d723d64fa0 100644
--- a/com.discord/smali/com/facebook/imagepipeline/c/a$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/c/a$1.smali
@@ -22,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic TX:Lcom/facebook/imagepipeline/c/a;
+.field final synthetic Up:Lcom/facebook/imagepipeline/c/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/c/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/c/a$1;->TX:Lcom/facebook/imagepipeline/c/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/c/a$1;->Up:Lcom/facebook/imagepipeline/c/a;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/b;-><init>()V
 
@@ -50,7 +50,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->TX:Lcom/facebook/imagepipeline/c/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->Up:Lcom/facebook/imagepipeline/c/a;
 
     invoke-virtual {v0, p1, p2}, Lcom/facebook/imagepipeline/c/a;->a(Ljava/lang/Object;I)V
 
@@ -60,27 +60,27 @@
 .method public final h(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->TX:Lcom/facebook/imagepipeline/c/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->Up:Lcom/facebook/imagepipeline/c/a;
 
     invoke-static {v0, p1}, Lcom/facebook/imagepipeline/c/a;->a(Lcom/facebook/imagepipeline/c/a;Ljava/lang/Throwable;)V
 
     return-void
 .end method
 
-.method public final iy()V
+.method public final ix()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->TX:Lcom/facebook/imagepipeline/c/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->Up:Lcom/facebook/imagepipeline/c/a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/c/a;->iy()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/c/a;->ix()V
 
     return-void
 .end method
 
-.method public final m(F)V
+.method public final l(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->TX:Lcom/facebook/imagepipeline/c/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->Up:Lcom/facebook/imagepipeline/c/a;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/c/a;->h(F)Z
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/c/a.smali b/com.discord/smali/com/facebook/imagepipeline/c/a.smali
index 8b394ffd2e..1d09795baa 100644
--- a/com.discord/smali/com/facebook/imagepipeline/c/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/c/a.smali
@@ -16,9 +16,9 @@
 
 
 # instance fields
-.field private final Sr:Lcom/facebook/imagepipeline/g/c;
+.field private final SJ:Lcom/facebook/imagepipeline/g/c;
 
-.field private final TW:Lcom/facebook/imagepipeline/h/ap;
+.field private final Uo:Lcom/facebook/imagepipeline/h/ap;
 
 
 # direct methods
@@ -39,25 +39,25 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/c/a;->TW:Lcom/facebook/imagepipeline/h/ap;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/c/a;->Uo:Lcom/facebook/imagepipeline/h/ap;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/c/a;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/c/a;->SJ:Lcom/facebook/imagepipeline/g/c;
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/c/a;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/c/a;->SJ:Lcom/facebook/imagepipeline/g/c;
 
-    iget-object v0, p2, Lcom/facebook/imagepipeline/h/d;->IX:Lcom/facebook/imagepipeline/request/b;
+    iget-object v0, p2, Lcom/facebook/imagepipeline/h/d;->Jo:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->TW:Lcom/facebook/imagepipeline/h/ap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->Uo:Lcom/facebook/imagepipeline/h/ap;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/h/d;->IW:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/h/d;->Jn:Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/c/a;->TW:Lcom/facebook/imagepipeline/h/ap;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/c/a;->Uo:Lcom/facebook/imagepipeline/h/ap;
 
     iget-object v2, v2, Lcom/facebook/imagepipeline/h/d;->mId:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/c/a;->TW:Lcom/facebook/imagepipeline/h/ap;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/c/a;->Uo:Lcom/facebook/imagepipeline/h/ap;
 
     invoke-virtual {v3}, Lcom/facebook/imagepipeline/h/ap;->isPrefetch()Z
 
@@ -91,17 +91,17 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->SJ:Lcom/facebook/imagepipeline/g/c;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->TW:Lcom/facebook/imagepipeline/h/ap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->Uo:Lcom/facebook/imagepipeline/h/ap;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/h/d;->IX:Lcom/facebook/imagepipeline/request/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/h/d;->Jo:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/c/a;->TW:Lcom/facebook/imagepipeline/h/ap;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/c/a;->Uo:Lcom/facebook/imagepipeline/h/ap;
 
     iget-object v2, v2, Lcom/facebook/imagepipeline/h/d;->mId:Ljava/lang/String;
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/c/a;->TW:Lcom/facebook/imagepipeline/h/ap;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/c/a;->Uo:Lcom/facebook/imagepipeline/h/ap;
 
     invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ap;->isPrefetch()Z
 
@@ -139,17 +139,17 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/c/a;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/c/a;->SJ:Lcom/facebook/imagepipeline/g/c;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/c/a;->TW:Lcom/facebook/imagepipeline/h/ap;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/c/a;->Uo:Lcom/facebook/imagepipeline/h/ap;
 
-    iget-object p2, p2, Lcom/facebook/imagepipeline/h/d;->IX:Lcom/facebook/imagepipeline/request/b;
+    iget-object p2, p2, Lcom/facebook/imagepipeline/h/d;->Jo:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->TW:Lcom/facebook/imagepipeline/h/ap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->Uo:Lcom/facebook/imagepipeline/h/ap;
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/h/d;->mId:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->TW:Lcom/facebook/imagepipeline/h/ap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->Uo:Lcom/facebook/imagepipeline/h/ap;
 
     invoke-virtual {v1}, Lcom/facebook/imagepipeline/h/ap;->isPrefetch()Z
 
@@ -161,10 +161,10 @@
     return-void
 .end method
 
-.method public final fX()Z
+.method public final gb()Z
     .locals 2
 
-    invoke-super {p0}, Lcom/facebook/b/a;->fX()Z
+    invoke-super {p0}, Lcom/facebook/b/a;->gb()Z
 
     move-result v0
 
@@ -181,17 +181,17 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->SJ:Lcom/facebook/imagepipeline/g/c;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->TW:Lcom/facebook/imagepipeline/h/ap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->Uo:Lcom/facebook/imagepipeline/h/ap;
 
     iget-object v1, v1, Lcom/facebook/imagepipeline/h/d;->mId:Ljava/lang/String;
 
-    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/g/c;->ax(Ljava/lang/String;)V
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/g/c;->as(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->TW:Lcom/facebook/imagepipeline/h/ap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->Uo:Lcom/facebook/imagepipeline/h/ap;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/d;->js()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/d;->jq()Ljava/util/List;
 
     move-result-object v0
 
@@ -203,7 +203,7 @@
     return v0
 .end method
 
-.method final declared-synchronized iy()V
+.method final declared-synchronized ix()V
     .locals 1
 
     monitor-enter p0
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/c.smali b/com.discord/smali/com/facebook/imagepipeline/cache/c.smali
index 861ef93578..8f874ec0f4 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/c.smali
@@ -7,32 +7,32 @@
 
 
 # instance fields
-.field private final IW:Ljava/lang/Object;
+.field private final Jn:Ljava/lang/Object;
 
-.field private final QM:Ljava/lang/String;
+.field private final Re:Ljava/lang/String;
 
-.field private final QN:Lcom/facebook/imagepipeline/a/e;
+.field private final Rf:Lcom/facebook/imagepipeline/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final QO:Lcom/facebook/imagepipeline/a/f;
+.field private final Rg:Lcom/facebook/imagepipeline/a/f;
 
-.field private final QP:Lcom/facebook/imagepipeline/a/b;
+.field private final Rh:Lcom/facebook/imagepipeline/a/b;
 
-.field private final QQ:Lcom/facebook/cache/common/CacheKey;
+.field private final Ri:Lcom/facebook/cache/common/CacheKey;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final QR:Ljava/lang/String;
+.field private final Rj:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final QS:I
+.field private final Rk:I
 
-.field private final QT:J
+.field private final Rl:J
 
 
 # direct methods
@@ -59,17 +59,17 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->QM:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Re:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/c;->QN:Lcom/facebook/imagepipeline/a/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/c;->Rf:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/c;->QO:Lcom/facebook/imagepipeline/a/f;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/c;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/cache/c;->QP:Lcom/facebook/imagepipeline/a/b;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/cache/c;->Rh:Lcom/facebook/imagepipeline/a/b;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/cache/c;->QQ:Lcom/facebook/cache/common/CacheKey;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/cache/c;->Ri:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/cache/c;->QR:Ljava/lang/String;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/cache/c;->Rj:Ljava/lang/String;
 
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
@@ -105,9 +105,9 @@
 
     move-result-object p3
 
-    iget-object p5, p0, Lcom/facebook/imagepipeline/cache/c;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object p5, p0, Lcom/facebook/imagepipeline/cache/c;->Rh:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->QQ:Lcom/facebook/cache/common/CacheKey;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Ri:Lcom/facebook/cache/common/CacheKey;
 
     if-nez p1, :cond_1
 
@@ -201,9 +201,9 @@
 
     add-int/2addr p1, p4
 
-    iput p1, p0, Lcom/facebook/imagepipeline/cache/c;->QS:I
+    iput p1, p0, Lcom/facebook/imagepipeline/cache/c;->Rk:I
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/cache/c;->IW:Ljava/lang/Object;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/cache/c;->Jn:Ljava/lang/Object;
 
     invoke-static {}, Lcom/facebook/common/time/RealtimeSinceBootClock;->get()Lcom/facebook/common/time/RealtimeSinceBootClock;
 
@@ -213,7 +213,7 @@
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lcom/facebook/imagepipeline/cache/c;->QT:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/cache/c;->Rl:J
 
     return-void
 .end method
@@ -234,15 +234,15 @@
     :cond_0
     check-cast p1, Lcom/facebook/imagepipeline/cache/c;
 
-    iget v0, p0, Lcom/facebook/imagepipeline/cache/c;->QS:I
+    iget v0, p0, Lcom/facebook/imagepipeline/cache/c;->Rk:I
 
-    iget v2, p1, Lcom/facebook/imagepipeline/cache/c;->QS:I
+    iget v2, p1, Lcom/facebook/imagepipeline/cache/c;->Rk:I
 
     if-ne v0, v2, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->QM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Re:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->QM:Ljava/lang/String;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Re:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -250,9 +250,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Rf:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     invoke-static {v0, v2}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -260,9 +260,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Rg:Lcom/facebook/imagepipeline/a/f;
 
     invoke-static {v0, v2}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -270,9 +270,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Rh:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Rh:Lcom/facebook/imagepipeline/a/b;
 
     invoke-static {v0, v2}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -280,9 +280,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->QQ:Lcom/facebook/cache/common/CacheKey;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Ri:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->QQ:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Ri:Lcom/facebook/cache/common/CacheKey;
 
     invoke-static {v0, v2}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -290,9 +290,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->QR:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Rj:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/c;->QR:Ljava/lang/String;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/c;->Rj:Ljava/lang/String;
 
     invoke-static {v0, p1}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -311,7 +311,7 @@
 .method public final getUriString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->QM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Re:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -319,7 +319,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/cache/c;->QS:I
+    iget v0, p0, Lcom/facebook/imagepipeline/cache/c;->Rk:I
 
     return v0
 .end method
@@ -331,43 +331,43 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->QM:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Re:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Rg:Lcom/facebook/imagepipeline/a/f;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Rh:Lcom/facebook/imagepipeline/a/b;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->QQ:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Ri:Lcom/facebook/cache/common/CacheKey;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->QR:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Rj:Ljava/lang/String;
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/facebook/imagepipeline/cache/c;->QS:I
+    iget v1, p0, Lcom/facebook/imagepipeline/cache/c;->Rk:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/e$1.smali b/com.discord/smali/com/facebook/imagepipeline/cache/e$1.smali
index 8cedde48ad..a7bffd7ae5 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/e$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/e$1.smali
@@ -27,29 +27,29 @@
 
 
 # instance fields
-.field final synthetic Ra:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic Rs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic Rb:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic Rt:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic Rc:Lcom/facebook/imagepipeline/cache/e;
+.field final synthetic Ru:Lcom/facebook/imagepipeline/cache/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/cache/e;Ljava/util/concurrent/atomic/AtomicBoolean;Lcom/facebook/cache/common/CacheKey;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$1;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$1;->Ra:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rb:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rt:Lcom/facebook/cache/common/CacheKey;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
-.method private hz()Lcom/facebook/imagepipeline/f/e;
+.method private hC()Lcom/facebook/imagepipeline/f/e;
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -63,7 +63,7 @@
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->Ra:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -71,13 +71,13 @@
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/imagepipeline/cache/e;)Lcom/facebook/imagepipeline/cache/s;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rb:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rt:Lcom/facebook/cache/common/CacheKey;
 
     invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/cache/s;->i(Lcom/facebook/cache/common/CacheKey;)Lcom/facebook/imagepipeline/f/e;
 
@@ -85,13 +85,13 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->fy()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->fC()Ljava/lang/Class;
 
     move-result-object v1
 
     const-string v2, "Found image for %s in staging area"
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rb:Lcom/facebook/cache/common/CacheKey;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rt:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v3}, Lcom/facebook/cache/common/CacheKey;->getUriString()Ljava/lang/String;
 
@@ -99,20 +99,20 @@
 
     invoke-static {v1, v2, v3}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$1;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
     invoke-static {v1}, Lcom/facebook/imagepipeline/cache/e;->b(Lcom/facebook/imagepipeline/cache/e;)Lcom/facebook/imagepipeline/cache/m;
 
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->fy()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->fC()Ljava/lang/Class;
 
     move-result-object v0
 
     const-string v1, "Did not find image for %s in staging area"
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rb:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rt:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v2}, Lcom/facebook/cache/common/CacheKey;->getUriString()Ljava/lang/String;
 
@@ -120,7 +120,7 @@
 
     invoke-static {v0, v1, v2}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/cache/e;->b(Lcom/facebook/imagepipeline/cache/e;)Lcom/facebook/imagepipeline/cache/m;
     :try_end_0
@@ -129,9 +129,9 @@
     const/4 v0, 0x0
 
     :try_start_1
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$1;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rb:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$1;->Rt:Lcom/facebook/cache/common/CacheKey;
 
     invoke-static {v1, v2}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/cache/common/CacheKey;)Lcom/facebook/common/g/f;
 
@@ -178,7 +178,7 @@
 
     if-eqz v1, :cond_3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->fy()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->fC()Ljava/lang/Class;
 
     move-result-object v1
 
@@ -251,7 +251,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/e$1;->hz()Lcom/facebook/imagepipeline/f/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/e$1;->hC()Lcom/facebook/imagepipeline/f/e;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/e.smali b/com.discord/smali/com/facebook/imagepipeline/cache/e.smali
index 0fc220b8c8..a0c912b702 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/e.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -15,19 +15,19 @@
 
 
 # instance fields
-.field private final QF:Lcom/facebook/common/g/g;
+.field private final QX:Lcom/facebook/common/g/g;
 
-.field private final QU:Lcom/facebook/cache/disk/h;
+.field private final Rm:Lcom/facebook/cache/disk/h;
 
-.field private final QV:Lcom/facebook/common/g/j;
+.field private final Rn:Lcom/facebook/common/g/j;
 
-.field private final QW:Ljava/util/concurrent/Executor;
+.field private final Ro:Ljava/util/concurrent/Executor;
 
-.field private final QX:Ljava/util/concurrent/Executor;
+.field private final Rp:Ljava/util/concurrent/Executor;
 
-.field private final QY:Lcom/facebook/imagepipeline/cache/s;
+.field private final Rq:Lcom/facebook/imagepipeline/cache/s;
 
-.field private final QZ:Lcom/facebook/imagepipeline/cache/m;
+.field private final Rr:Lcom/facebook/imagepipeline/cache/m;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     const-class v0, Lcom/facebook/imagepipeline/cache/e;
 
-    sput-object v0, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -46,23 +46,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e;->QU:Lcom/facebook/cache/disk/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e;->Rm:Lcom/facebook/cache/disk/h;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e;->QF:Lcom/facebook/common/g/g;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e;->QX:Lcom/facebook/common/g/g;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e;->QV:Lcom/facebook/common/g/j;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e;->Rn:Lcom/facebook/common/g/j;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/cache/e;->QW:Ljava/util/concurrent/Executor;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/cache/e;->Ro:Ljava/util/concurrent/Executor;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/cache/e;->QX:Ljava/util/concurrent/Executor;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/cache/e;->Rp:Ljava/util/concurrent/Executor;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/cache/e;->QZ:Lcom/facebook/imagepipeline/cache/m;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/cache/e;->Rr:Lcom/facebook/imagepipeline/cache/m;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/s;->hH()Lcom/facebook/imagepipeline/cache/s;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/s;->hK()Lcom/facebook/imagepipeline/cache/s;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e;->QY:Lcom/facebook/imagepipeline/cache/s;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e;->Rq:Lcom/facebook/imagepipeline/cache/s;
 
     return-void
 .end method
@@ -85,7 +85,7 @@
 .method static synthetic a(Lcom/facebook/imagepipeline/cache/e;)Lcom/facebook/imagepipeline/cache/s;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->QY:Lcom/facebook/imagepipeline/cache/s;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->Rq:Lcom/facebook/imagepipeline/cache/s;
 
     return-object p0
 .end method
@@ -93,7 +93,7 @@
 .method static synthetic a(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)V
     .locals 3
 
-    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->getUriString()Ljava/lang/String;
 
@@ -104,7 +104,7 @@
     invoke-static {v0, v2, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->QU:Lcom/facebook/cache/disk/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->Rm:Lcom/facebook/cache/disk/h;
 
     new-instance v1, Lcom/facebook/imagepipeline/cache/e$4;
 
@@ -112,7 +112,7 @@
 
     invoke-interface {v0, p1, v1}, Lcom/facebook/cache/disk/h;->a(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/cache/common/h;)Lcom/facebook/a/a;
 
-    sget-object p0, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sget-object p0, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     const-string p2, "Successful disk-cache write for key %s"
 
@@ -129,7 +129,7 @@
     :catch_0
     move-exception p0
 
-    sget-object p2, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     const/4 v0, 0x1
 
@@ -169,7 +169,7 @@
 
     invoke-direct {v0, p0, p2, p1}, Lcom/facebook/imagepipeline/cache/e$1;-><init>(Lcom/facebook/imagepipeline/cache/e;Ljava/util/concurrent/atomic/AtomicBoolean;Lcom/facebook/cache/common/CacheKey;)V
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/cache/e;->QW:Ljava/util/concurrent/Executor;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/cache/e;->Ro:Ljava/util/concurrent/Executor;
 
     invoke-static {v0, p2}, La/h;->a(Ljava/util/concurrent/Callable;Ljava/util/concurrent/Executor;)La/h;
 
@@ -182,7 +182,7 @@
     :catch_0
     move-exception p2
 
-    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     const/4 v1, 0x1
 
@@ -210,7 +210,7 @@
 .method static synthetic b(Lcom/facebook/imagepipeline/cache/e;)Lcom/facebook/imagepipeline/cache/m;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->QZ:Lcom/facebook/imagepipeline/cache/m;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->Rr:Lcom/facebook/imagepipeline/cache/m;
 
     return-object p0
 .end method
@@ -218,7 +218,7 @@
 .method static synthetic c(Lcom/facebook/imagepipeline/cache/e;)Lcom/facebook/cache/disk/h;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->QU:Lcom/facebook/cache/disk/h;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->Rm:Lcom/facebook/cache/disk/h;
 
     return-object p0
 .end method
@@ -226,15 +226,15 @@
 .method static synthetic d(Lcom/facebook/imagepipeline/cache/e;)Lcom/facebook/common/g/j;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->QV:Lcom/facebook/common/g/j;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->Rn:Lcom/facebook/common/g/j;
 
     return-object p0
 .end method
 
-.method static synthetic fy()Ljava/lang/Class;
+.method static synthetic fC()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     return-object v0
 .end method
@@ -251,7 +251,7 @@
     .end annotation
 
     :try_start_0
-    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     const-string v1, "Disk cache read for %s"
 
@@ -261,7 +261,7 @@
 
     invoke-static {v0, v1, v2}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->QU:Lcom/facebook/cache/disk/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->Rm:Lcom/facebook/cache/disk/h;
 
     invoke-interface {v0, p1}, Lcom/facebook/cache/disk/h;->d(Lcom/facebook/cache/common/CacheKey;)Lcom/facebook/a/a;
 
@@ -269,7 +269,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     const-string v1, "Disk cache miss for %s"
 
@@ -284,7 +284,7 @@
     return-object p1
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     const-string v2, "Found entry in disk cache for %s"
 
@@ -301,7 +301,7 @@
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e;->QF:Lcom/facebook/common/g/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e;->QX:Lcom/facebook/common/g/g;
 
     invoke-interface {v0}, Lcom/facebook/a/a;->size()J
 
@@ -318,7 +318,7 @@
     :try_start_2
     invoke-virtual {v1}, Ljava/io/InputStream;->close()V
 
-    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     const-string v2, "Successful read from disk cache for %s"
 
@@ -342,7 +342,7 @@
     :catch_0
     move-exception v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     const/4 v2, 0x1
 
@@ -382,7 +382,7 @@
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->QY:Lcom/facebook/imagepipeline/cache/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->Rq:Lcom/facebook/imagepipeline/cache/s;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/cache/s;->i(Lcom/facebook/cache/common/CacheKey;)Lcom/facebook/imagepipeline/f/e;
 
@@ -390,7 +390,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p2, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     const-string v1, "Found image for %s in staging area"
 
@@ -444,7 +444,7 @@
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->QY:Lcom/facebook/imagepipeline/cache/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->Rq:Lcom/facebook/imagepipeline/cache/s;
 
     invoke-virtual {v0, p1, p2}, Lcom/facebook/imagepipeline/cache/s;->a(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)V
 
@@ -455,7 +455,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e;->QX:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e;->Rp:Ljava/util/concurrent/Executor;
 
     new-instance v2, Lcom/facebook/imagepipeline/cache/e$2;
 
@@ -472,7 +472,7 @@
     move-exception v1
 
     :try_start_2
-    sget-object v2, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sget-object v2, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     const-string v3, "Failed to schedule disk-cache write for %s"
 
@@ -490,7 +490,7 @@
 
     invoke-static {v2, v1, v3, v4}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e;->QY:Lcom/facebook/imagepipeline/cache/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e;->Rq:Lcom/facebook/imagepipeline/cache/s;
 
     invoke-virtual {v1, p1, p2}, Lcom/facebook/imagepipeline/cache/s;->b(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)Z
 
@@ -526,7 +526,7 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->QY:Lcom/facebook/imagepipeline/cache/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->Rq:Lcom/facebook/imagepipeline/cache/s;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/cache/s;->h(Lcom/facebook/cache/common/CacheKey;)Z
 
@@ -535,7 +535,7 @@
 
     invoke-direct {v0, p0, p1}, Lcom/facebook/imagepipeline/cache/e$3;-><init>(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/cache/common/CacheKey;)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e;->QX:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e;->Rp:Ljava/util/concurrent/Executor;
 
     invoke-static {v0, v1}, La/h;->a(Ljava/util/concurrent/Callable;Ljava/util/concurrent/Executor;)La/h;
 
@@ -548,7 +548,7 @@
     :catch_0
     move-exception v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->Fl:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->FC:Ljava/lang/Class;
 
     const/4 v2, 0x1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/g.smali b/com.discord/smali/com/facebook/imagepipeline/cache/g.smali
index cdc5dc8465..1bd12755d1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/g.smali
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field private final Rf:Lcom/facebook/imagepipeline/cache/t;
+.field private final Rx:Lcom/facebook/imagepipeline/cache/t;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/t<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final Rg:Ljava/util/LinkedHashMap;
+.field private final Ry:Ljava/util/LinkedHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedHashMap<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private Rh:I
+.field private Rz:I
 
 
 # direct methods
@@ -55,13 +55,13 @@
 
     invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rg:Ljava/util/LinkedHashMap;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Ry:Ljava/util/LinkedHashMap;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rh:I
+    iput v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rz:I
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/g;->Rf:Lcom/facebook/imagepipeline/cache/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/g;->Rx:Lcom/facebook/imagepipeline/cache/t;
 
     return-void
 .end method
@@ -81,7 +81,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rf:Lcom/facebook/imagepipeline/cache/t;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rx:Lcom/facebook/imagepipeline/cache/t;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/cache/t;->J(Ljava/lang/Object;)I
 
@@ -115,7 +115,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/g;->Rg:Ljava/util/LinkedHashMap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/g;->Ry:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v1}, Ljava/util/LinkedHashMap;->entrySet()Ljava/util/Set;
 
@@ -149,7 +149,7 @@
 
     invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    iget v3, p0, Lcom/facebook/imagepipeline/cache/g;->Rh:I
+    iget v3, p0, Lcom/facebook/imagepipeline/cache/g;->Rz:I
 
     invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
@@ -161,7 +161,7 @@
 
     sub-int/2addr v3, v2
 
-    iput v3, p0, Lcom/facebook/imagepipeline/cache/g;->Rh:I
+    iput v3, p0, Lcom/facebook/imagepipeline/cache/g;->Rz:I
 
     invoke-interface {v1}, Ljava/util/Iterator;->remove()V
     :try_end_0
@@ -199,7 +199,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rg:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Ry:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0, p1}, Ljava/util/LinkedHashMap;->containsKey(Ljava/lang/Object;)Z
 
@@ -219,13 +219,13 @@
     throw p1
 .end method
 
-.method public final declared-synchronized fg()I
+.method public final declared-synchronized fl()I
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rh:I
+    iget v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rz:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -255,7 +255,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rg:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Ry:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0, p1}, Ljava/util/LinkedHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -281,7 +281,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rg:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Ry:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0}, Ljava/util/LinkedHashMap;->size()I
 
@@ -301,7 +301,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized hA()Ljava/lang/Object;
+.method public final declared-synchronized hD()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -315,7 +315,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rg:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Ry:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0}, Ljava/util/LinkedHashMap;->isEmpty()Z
 
@@ -333,7 +333,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rg:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Ry:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0}, Ljava/util/LinkedHashMap;->keySet()Ljava/util/Set;
 
@@ -375,13 +375,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rg:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Ry:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0, p1}, Ljava/util/LinkedHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
-    iget v1, p0, Lcom/facebook/imagepipeline/cache/g;->Rh:I
+    iget v1, p0, Lcom/facebook/imagepipeline/cache/g;->Rz:I
 
     invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/cache/g;->K(Ljava/lang/Object;)I
 
@@ -389,13 +389,13 @@
 
     sub-int/2addr v1, v2
 
-    iput v1, p0, Lcom/facebook/imagepipeline/cache/g;->Rh:I
+    iput v1, p0, Lcom/facebook/imagepipeline/cache/g;->Rz:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/g;->Rg:Ljava/util/LinkedHashMap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/g;->Ry:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v1, p1, p2}, Ljava/util/LinkedHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget p1, p0, Lcom/facebook/imagepipeline/cache/g;->Rh:I
+    iget p1, p0, Lcom/facebook/imagepipeline/cache/g;->Rz:I
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/cache/g;->K(Ljava/lang/Object;)I
 
@@ -403,7 +403,7 @@
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lcom/facebook/imagepipeline/cache/g;->Rh:I
+    iput p1, p0, Lcom/facebook/imagepipeline/cache/g;->Rz:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -433,13 +433,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rg:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->Ry:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0, p1}, Ljava/util/LinkedHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rh:I
+    iget v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rz:I
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/cache/g;->K(Ljava/lang/Object;)I
 
@@ -447,7 +447,7 @@
 
     sub-int/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rh:I
+    iput v0, p0, Lcom/facebook/imagepipeline/cache/g;->Rz:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/h$b.smali b/com.discord/smali/com/facebook/imagepipeline/cache/h$b.smali
index d7335bf6c5..daebec9fe7 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/h$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/h$b.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field public final Rt:Lcom/facebook/common/references/CloseableReference;
+.field public final RL:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -35,9 +35,9 @@
     .end annotation
 .end field
 
-.field public Ru:Z
+.field public RM:Z
 
-.field public final Rv:Lcom/facebook/imagepipeline/cache/h$c;
+.field public final RN:Lcom/facebook/imagepipeline/cache/h$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h$c<",
@@ -95,15 +95,15 @@
 
     check-cast p1, Lcom/facebook/common/references/CloseableReference;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->Rt:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->RL:Lcom/facebook/common/references/CloseableReference;
 
     const/4 p1, 0x0
 
     iput p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->clientCount:I
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->Ru:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->RM:Z
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/h$b;->Rv:Lcom/facebook/imagepipeline/cache/h$c;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/h$b;->RN:Lcom/facebook/imagepipeline/cache/h$c;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/h.smali b/com.discord/smali/com/facebook/imagepipeline/cache/h.smali
index 10f67dfc6b..9cff063917 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/h.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/h.smali
@@ -30,20 +30,11 @@
 
 
 # static fields
-.field static final Ri:J
+.field static final RA:J
 
 
 # instance fields
-.field private final Rf:Lcom/facebook/imagepipeline/cache/t;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/imagepipeline/cache/t<",
-            "TV;>;"
-        }
-    .end annotation
-.end field
-
-.field final Rj:Lcom/facebook/imagepipeline/cache/g;
+.field final RB:Lcom/facebook/imagepipeline/cache/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/g<",
@@ -54,7 +45,7 @@
     .end annotation
 .end field
 
-.field final Rk:Lcom/facebook/imagepipeline/cache/g;
+.field final RC:Lcom/facebook/imagepipeline/cache/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/g<",
@@ -65,7 +56,7 @@
     .end annotation
 .end field
 
-.field final Rl:Ljava/util/Map;
+.field final RD:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -76,9 +67,9 @@
     .end annotation
 .end field
 
-.field private final Rm:Lcom/facebook/imagepipeline/cache/h$a;
+.field private final RE:Lcom/facebook/imagepipeline/cache/h$a;
 
-.field private final Rn:Lcom/facebook/common/d/k;
+.field private final RF:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -88,9 +79,18 @@
     .end annotation
 .end field
 
-.field protected Ro:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+.field protected RG:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-.field private Rp:J
+.field private RH:J
+
+.field private final Rx:Lcom/facebook/imagepipeline/cache/t;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/imagepipeline/cache/t<",
+            "TV;>;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
@@ -105,7 +105,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lcom/facebook/imagepipeline/cache/h;->Ri:J
+    sput-wide v0, Lcom/facebook/imagepipeline/cache/h;->RA:J
 
     return-void
 .end method
@@ -130,9 +130,9 @@
 
     invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rl:Ljava/util/Map;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RD:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->Rf:Lcom/facebook/imagepipeline/cache/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->Rx:Lcom/facebook/imagepipeline/cache/t;
 
     new-instance v0, Lcom/facebook/imagepipeline/cache/g;
 
@@ -142,7 +142,7 @@
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/cache/g;-><init>(Lcom/facebook/imagepipeline/cache/t;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
     new-instance v0, Lcom/facebook/imagepipeline/cache/g;
 
@@ -152,13 +152,13 @@
 
     invoke-direct {v0, p1}, Lcom/facebook/imagepipeline/cache/g;-><init>(Lcom/facebook/imagepipeline/cache/t;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rk:Lcom/facebook/imagepipeline/cache/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RC:Lcom/facebook/imagepipeline/cache/g;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h;->Rm:Lcom/facebook/imagepipeline/cache/h$a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h;->RE:Lcom/facebook/imagepipeline/cache/h$a;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/h;->Rn:Lcom/facebook/common/d/k;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/h;->RF:Lcom/facebook/common/d/k;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->Rn:Lcom/facebook/common/d/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->RF:Lcom/facebook/common/d/k;
 
     invoke-interface {p1}, Lcom/facebook/common/d/k;->get()Ljava/lang/Object;
 
@@ -166,13 +166,13 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->Ro:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->RG:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lcom/facebook/imagepipeline/cache/h;->Rp:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/cache/h;->RH:J
 
     return-void
 .end method
@@ -188,25 +188,25 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rf:Lcom/facebook/imagepipeline/cache/t;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rx:Lcom/facebook/imagepipeline/cache/t;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/cache/t;->J(Ljava/lang/Object;)I
 
     move-result p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Ro:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RG:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RD:I
+    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RV:I
 
     if-gt p1, v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hD()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hG()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Ro:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->RG:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RA:I
+    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RS:I
 
     const/4 v2, 0x1
 
@@ -214,13 +214,13 @@
 
     if-gt v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hE()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hH()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Ro:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->RG:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Rz:I
+    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RR:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -264,7 +264,7 @@
     :try_start_0
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/cache/h;->e(Lcom/facebook/imagepipeline/cache/h$b;)V
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Rt:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->RL:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -346,11 +346,11 @@
     :goto_0
     if-eqz p1, :cond_1
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Rv:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->RN:Lcom/facebook/imagepipeline/cache/h$c;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Rv:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->RN:Lcom/facebook/imagepipeline/cache/h$c;
 
     iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->key:Ljava/lang/Object;
 
@@ -359,9 +359,9 @@
     invoke-interface {v0, p1, v1}, Lcom/facebook/imagepipeline/cache/h$c;->c(Ljava/lang/Object;Z)V
 
     :cond_1
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hB()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hE()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hC()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hF()V
 
     return-void
 
@@ -477,7 +477,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ru:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->RM:Z
 
     if-nez v0, :cond_0
 
@@ -485,7 +485,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
     iget-object v1, p1, Lcom/facebook/imagepipeline/cache/h$b;->key:Ljava/lang/Object;
 
@@ -534,11 +534,11 @@
 
     if-eqz p0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$b;->Rv:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$b;->RN:Lcom/facebook/imagepipeline/cache/h$c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$b;->Rv:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$b;->RN:Lcom/facebook/imagepipeline/cache/h$c;
 
     iget-object p0, p0, Lcom/facebook/imagepipeline/cache/h$b;->key:Ljava/lang/Object;
 
@@ -621,7 +621,7 @@
     :try_start_0
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ru:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->RM:Z
 
     const/4 v1, 0x1
 
@@ -637,7 +637,7 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iput-boolean v1, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ru:Z
+    iput-boolean v1, p1, Lcom/facebook/imagepipeline/cache/h$b;->RM:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -668,7 +668,7 @@
     :try_start_0
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ru:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->RM:Z
 
     const/4 v1, 0x1
 
@@ -775,7 +775,7 @@
     :try_start_0
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ru:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->RM:Z
 
     if-eqz v0, :cond_0
 
@@ -783,7 +783,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->Rt:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->RL:Lcom/facebook/common/references/CloseableReference;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -806,15 +806,15 @@
     throw p1
 .end method
 
-.method private declared-synchronized hB()V
+.method private declared-synchronized hE()V
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rp:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/cache/h;->RH:J
 
-    sget-wide v2, Lcom/facebook/imagepipeline/cache/h;->Ri:J
+    sget-wide v2, Lcom/facebook/imagepipeline/cache/h;->RA:J
 
     add-long/2addr v0, v2
 
@@ -838,9 +838,9 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rp:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/cache/h;->RH:J
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rn:Lcom/facebook/common/d/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RF:Lcom/facebook/common/d/k;
 
     invoke-interface {v0}, Lcom/facebook/common/d/k;->get()Ljava/lang/Object;
 
@@ -848,7 +848,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Ro:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RG:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -864,21 +864,21 @@
     throw v0
 .end method
 
-.method private hC()V
+.method private hF()V
     .locals 4
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Ro:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RG:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RC:I
+    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RU:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Ro:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->RG:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RA:I
+    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RS:I
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hD()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hG()I
 
     move-result v2
 
@@ -888,15 +888,15 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Ro:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->RG:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RB:I
+    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RT:I
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->Ro:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->RG:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v2, v2, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Rz:I
+    iget v2, v2, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RR:I
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hE()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hH()I
 
     move-result v3
 
@@ -906,7 +906,7 @@
 
     move-result v1
 
-    invoke-direct {p0, v0, v1}, Lcom/facebook/imagepipeline/cache/h;->n(II)Ljava/util/ArrayList;
+    invoke-direct {p0, v0, v1}, Lcom/facebook/imagepipeline/cache/h;->m(II)Ljava/util/ArrayList;
 
     move-result-object v0
 
@@ -933,19 +933,19 @@
     throw v0
 .end method
 
-.method private declared-synchronized hD()I
+.method private declared-synchronized hG()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rk:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RC:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->getCount()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->getCount()I
 
@@ -967,21 +967,21 @@
     throw v0
 .end method
 
-.method private declared-synchronized hE()I
+.method private declared-synchronized hH()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rk:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RC:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->fg()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->fl()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->fg()I
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->fl()I
 
     move-result v1
     :try_end_0
@@ -1001,7 +1001,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized n(II)Ljava/util/ArrayList;
+.method private declared-synchronized m(II)Ljava/util/ArrayList;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1028,7 +1028,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->getCount()I
 
@@ -1036,9 +1036,9 @@
 
     if-gt v0, p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->fg()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->fl()I
 
     move-result v0
     :try_end_0
@@ -1059,7 +1059,7 @@
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->getCount()I
 
@@ -1067,9 +1067,9 @@
 
     if-gt v1, p1, :cond_2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->fg()I
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->fl()I
 
     move-result v1
     :try_end_1
@@ -1087,17 +1087,17 @@
     :cond_2
     :goto_1
     :try_start_2
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->hA()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->hD()Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v2, v1}, Lcom/facebook/imagepipeline/cache/g;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->Rk:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->RC:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v2, v1}, Lcom/facebook/imagepipeline/cache/g;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1143,7 +1143,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/cache/g;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1151,7 +1151,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/cache/h$b;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Rk:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->RC:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v1, p1}, Lcom/facebook/imagepipeline/cache/g;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1177,9 +1177,9 @@
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/cache/h;->c(Lcom/facebook/imagepipeline/cache/h$b;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hB()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hE()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hC()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hF()V
 
     return-object p1
 
@@ -1212,7 +1212,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/cache/g;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1226,7 +1226,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/h;->Rk:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/h;->RC:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v3, p1}, Lcom/facebook/imagepipeline/cache/g;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1245,7 +1245,7 @@
     :cond_0
     invoke-static {v2}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->Rt:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->RL:Lcom/facebook/common/references/CloseableReference;
 
     goto :goto_0
 
@@ -1319,12 +1319,12 @@
 
     invoke-static {p2}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hB()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hE()V
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/cache/g;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1332,7 +1332,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/cache/h$b;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Rk:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->RC:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v1, p1}, Lcom/facebook/imagepipeline/cache/g;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1370,7 +1370,7 @@
 
     invoke-direct {v2, p1, p2, p3}, Lcom/facebook/imagepipeline/cache/h$b;-><init>(Ljava/lang/Object;Lcom/facebook/common/references/CloseableReference;Lcom/facebook/imagepipeline/cache/h$c;)V
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/cache/h;->Rk:Lcom/facebook/imagepipeline/cache/g;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/cache/h;->RC:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {p2, p1, v2}, Lcom/facebook/imagepipeline/cache/g;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1387,7 +1387,7 @@
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/cache/h;->c(Lcom/facebook/imagepipeline/cache/h$b;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hC()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hF()V
 
     return-object v2
 
@@ -1415,13 +1415,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rj:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RB:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/cache/g;->a(Lcom/facebook/common/d/j;)Ljava/util/ArrayList;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->Rk:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->RC:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v1, p1}, Lcom/facebook/imagepipeline/cache/g;->a(Lcom/facebook/common/d/j;)Ljava/util/ArrayList;
 
@@ -1437,9 +1437,9 @@
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/cache/h;->b(Ljava/util/ArrayList;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hB()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hE()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hC()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->hF()V
 
     invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
 
@@ -1469,7 +1469,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->Rk:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->RC:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/cache/g;->contains(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/s.smali b/com.discord/smali/com/facebook/imagepipeline/cache/s.smali
index 08b437afda..901521cf15 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/s.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/s.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private RF:Ljava/util/Map;
+.field private RX:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -33,7 +33,7 @@
 
     const-class v0, Lcom/facebook/imagepipeline/cache/s;
 
-    sput-object v0, Lcom/facebook/imagepipeline/cache/s;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/cache/s;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -47,12 +47,12 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->RF:Ljava/util/Map;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->RX:Ljava/util/Map;
 
     return-void
 .end method
 
-.method public static hH()Lcom/facebook/imagepipeline/cache/s;
+.method public static hK()Lcom/facebook/imagepipeline/cache/s;
     .locals 1
 
     new-instance v0, Lcom/facebook/imagepipeline/cache/s;
@@ -62,17 +62,17 @@
     return-object v0
 .end method
 
-.method private declared-synchronized hI()V
+.method private declared-synchronized hL()V
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/facebook/imagepipeline/cache/s;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/s;->FC:Ljava/lang/Class;
 
     const-string v1, "Count = %d"
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/s;->RF:Ljava/util/Map;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/s;->RX:Ljava/util/Map;
 
     invoke-interface {v2}, Ljava/util/Map;->size()I
 
@@ -114,7 +114,7 @@
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->RF:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->RX:Ljava/util/Map;
 
     invoke-static {p2}, Lcom/facebook/imagepipeline/f/e;->b(Lcom/facebook/imagepipeline/f/e;)Lcom/facebook/imagepipeline/f/e;
 
@@ -128,7 +128,7 @@
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->hI()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->hL()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -160,7 +160,7 @@
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->RF:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->RX:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -180,13 +180,13 @@
 
     :cond_0
     :try_start_1
-    iget-object v2, v0, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v2}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v2
 
-    iget-object p2, p2, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object p2, p2, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {p2}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -212,7 +212,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/s;->RF:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/s;->RX:Ljava/util/Map;
 
     invoke-interface {v1, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_2
@@ -225,7 +225,7 @@
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->hI()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->hL()V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
@@ -277,7 +277,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->RF:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->RX:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -335,7 +335,7 @@
     :try_start_0
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->RF:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->RX:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -356,11 +356,11 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/s;->RF:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/s;->RX:Ljava/util/Map;
 
     invoke-interface {v1, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v1, Lcom/facebook/imagepipeline/cache/s;->Fl:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/s;->FC:Ljava/lang/Class;
 
     const-string v2, "Found closed reference %d for key %s (%d)"
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/d/b.smali b/com.discord/smali/com/facebook/imagepipeline/d/b.smali
index 870cc0438e..4f590189f6 100644
--- a/com.discord/smali/com/facebook/imagepipeline/d/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/d/b.smali
@@ -7,15 +7,15 @@
 
 
 # instance fields
-.field private final TC:Lcom/facebook/imagepipeline/platform/f;
+.field private final TU:Lcom/facebook/imagepipeline/platform/f;
 
-.field final TY:Lcom/facebook/imagepipeline/d/c;
+.field final Uq:Lcom/facebook/imagepipeline/d/c;
 
-.field final TZ:Lcom/facebook/imagepipeline/d/c;
+.field final Ur:Lcom/facebook/imagepipeline/d/c;
 
-.field private final Ua:Lcom/facebook/imagepipeline/d/c;
+.field private final Us:Lcom/facebook/imagepipeline/d/c;
 
-.field private final Ub:Ljava/util/Map;
+.field private final Ut:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -66,15 +66,15 @@
 
     invoke-direct {v0, p0}, Lcom/facebook/imagepipeline/d/b$1;-><init>(Lcom/facebook/imagepipeline/d/b;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/d/b;->Ua:Lcom/facebook/imagepipeline/d/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/d/b;->Us:Lcom/facebook/imagepipeline/d/c;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/d/b;->TY:Lcom/facebook/imagepipeline/d/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/d/b;->Uq:Lcom/facebook/imagepipeline/d/c;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/d/b;->TZ:Lcom/facebook/imagepipeline/d/c;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/d/b;->Ur:Lcom/facebook/imagepipeline/d/c;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/d/b;->TC:Lcom/facebook/imagepipeline/platform/f;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/d/b;->TU:Lcom/facebook/imagepipeline/platform/f;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/d/b;->Ub:Ljava/util/Map;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/d/b;->Ut:Ljava/util/Map;
 
     return-void
 .end method
@@ -112,7 +112,7 @@
 
     if-lt v0, v1, :cond_1
 
-    invoke-interface {p0}, Lcom/facebook/imagepipeline/k/a;->jU()Z
+    invoke-interface {p0}, Lcom/facebook/imagepipeline/k/a;->jS()Z
 
     move-result p0
 
@@ -131,11 +131,11 @@
 .method public final a(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/c;
     .locals 2
 
-    iget-object v0, p4, Lcom/facebook/imagepipeline/a/b;->RQ:Lcom/facebook/imagepipeline/d/c;
+    iget-object v0, p4, Lcom/facebook/imagepipeline/a/b;->Si:Lcom/facebook/imagepipeline/d/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p4, Lcom/facebook/imagepipeline/a/b;->RQ:Lcom/facebook/imagepipeline/d/c;
+    iget-object v0, p4, Lcom/facebook/imagepipeline/a/b;->Si:Lcom/facebook/imagepipeline/d/c;
 
     invoke-interface {v0, p1, p2, p3, p4}, Lcom/facebook/imagepipeline/d/c;->a(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/c;
 
@@ -144,13 +144,13 @@
     return-object p1
 
     :cond_0
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    sget-object v1, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object v1, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
     if-ne v0, v1, :cond_2
 
@@ -163,10 +163,10 @@
 
     move-result-object v0
 
-    iput-object v0, p1, Lcom/facebook/imagepipeline/f/e;->Us:Lcom/facebook/d/c;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/f/e;->UK:Lcom/facebook/d/c;
 
     :cond_2
-    iget-object v1, p0, Lcom/facebook/imagepipeline/d/b;->Ub:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/d/b;->Ut:Ljava/util/Map;
 
     if-eqz v1, :cond_3
 
@@ -185,7 +185,7 @@
     return-object p1
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/imagepipeline/d/b;->Ua:Lcom/facebook/imagepipeline/d/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/d/b;->Us:Lcom/facebook/imagepipeline/d/c;
 
     invoke-interface {v0, p1, p2, p3, p4}, Lcom/facebook/imagepipeline/d/c;->a(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/c;
 
@@ -197,11 +197,11 @@
 .method public final a(Lcom/facebook/imagepipeline/f/e;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/d;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/d/b;->TC:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/d/b;->TU:Lcom/facebook/imagepipeline/platform/f;
 
-    iget-object v1, p2, Lcom/facebook/imagepipeline/a/b;->RP:Landroid/graphics/Bitmap$Config;
+    iget-object v1, p2, Lcom/facebook/imagepipeline/a/b;->Sh:Landroid/graphics/Bitmap$Config;
 
-    iget-boolean v2, p2, Lcom/facebook/imagepipeline/a/b;->RO:Z
+    iget-boolean v2, p2, Lcom/facebook/imagepipeline/a/b;->Sg:Z
 
     const/4 v3, 0x0
 
@@ -210,19 +210,19 @@
     move-result-object v0
 
     :try_start_0
-    iget-object p2, p2, Lcom/facebook/imagepipeline/a/b;->RR:Lcom/facebook/imagepipeline/k/a;
+    iget-object p2, p2, Lcom/facebook/imagepipeline/a/b;->Sj:Lcom/facebook/imagepipeline/k/a;
 
     invoke-static {p2, v0}, Lcom/facebook/imagepipeline/d/b;->a(Lcom/facebook/imagepipeline/k/a;Lcom/facebook/common/references/CloseableReference;)V
 
     new-instance p2, Lcom/facebook/imagepipeline/f/d;
 
-    sget-object v1, Lcom/facebook/imagepipeline/f/g;->Ux:Lcom/facebook/imagepipeline/f/h;
+    sget-object v1, Lcom/facebook/imagepipeline/f/g;->UQ:Lcom/facebook/imagepipeline/f/h;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iH()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()I
 
     move-result v2
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iI()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iH()I
 
     move-result p1
 
@@ -245,11 +245,11 @@
 .method public final b(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/d;
     .locals 6
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/d/b;->TC:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/d/b;->TU:Lcom/facebook/imagepipeline/platform/f;
 
-    iget-object v2, p4, Lcom/facebook/imagepipeline/a/b;->RP:Landroid/graphics/Bitmap$Config;
+    iget-object v2, p4, Lcom/facebook/imagepipeline/a/b;->Sh:Landroid/graphics/Bitmap$Config;
 
-    iget-boolean v5, p4, Lcom/facebook/imagepipeline/a/b;->RO:Z
+    iget-boolean v5, p4, Lcom/facebook/imagepipeline/a/b;->Sg:Z
 
     const/4 v3, 0x0
 
@@ -262,17 +262,17 @@
     move-result-object p2
 
     :try_start_0
-    iget-object p4, p4, Lcom/facebook/imagepipeline/a/b;->RR:Lcom/facebook/imagepipeline/k/a;
+    iget-object p4, p4, Lcom/facebook/imagepipeline/a/b;->Sj:Lcom/facebook/imagepipeline/k/a;
 
     invoke-static {p4, p2}, Lcom/facebook/imagepipeline/d/b;->a(Lcom/facebook/imagepipeline/k/a;Lcom/facebook/common/references/CloseableReference;)V
 
     new-instance p4, Lcom/facebook/imagepipeline/f/d;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iH()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()I
 
     move-result v0
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iI()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iH()I
 
     move-result p1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/f/b.smali b/com.discord/smali/com/facebook/imagepipeline/f/b.smali
index 2351261ab1..65f2ecfb81 100644
--- a/com.discord/smali/com/facebook/imagepipeline/f/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/f/b.smali
@@ -14,5 +14,5 @@
 
 
 # virtual methods
-.method public abstract iB()Landroid/graphics/Bitmap;
+.method public abstract iA()Landroid/graphics/Bitmap;
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/f/c.smali b/com.discord/smali/com/facebook/imagepipeline/f/c.smali
index 2ccc2c0880..d58ebdf1da 100644
--- a/com.discord/smali/com/facebook/imagepipeline/f/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/f/c.smali
@@ -21,9 +21,6 @@
 .method public abstract close()V
 .end method
 
-.method public abstract fg()I
-.end method
-
 .method protected finalize()V
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
@@ -92,10 +89,13 @@
     throw v0
 .end method
 
-.method public iC()Lcom/facebook/imagepipeline/f/h;
+.method public abstract fl()I
+.end method
+
+.method public iB()Lcom/facebook/imagepipeline/f/h;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/f/g;->Ux:Lcom/facebook/imagepipeline/f/h;
+    sget-object v0, Lcom/facebook/imagepipeline/f/g;->UQ:Lcom/facebook/imagepipeline/f/h;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/f/d.smali b/com.discord/smali/com/facebook/imagepipeline/f/d.smali
index 188ffe203c..f01cd86207 100644
--- a/com.discord/smali/com/facebook/imagepipeline/f/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/f/d.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field public final LP:I
+.field public final Mh:I
 
-.field public final LQ:I
+.field public final Mi:I
 
-.field private Uo:Lcom/facebook/common/references/CloseableReference;
+.field private UG:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -18,7 +18,7 @@
     .end annotation
 .end field
 
-.field private final Up:Lcom/facebook/imagepipeline/f/h;
+.field private final UH:Lcom/facebook/imagepipeline/f/h;
 
 .field public volatile mBitmap:Landroid/graphics/Bitmap;
 
@@ -81,15 +81,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/f/d;->Uo:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/f/d;->UG:Lcom/facebook/common/references/CloseableReference;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/f/d;->Up:Lcom/facebook/imagepipeline/f/h;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/f/d;->UH:Lcom/facebook/imagepipeline/f/h;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/f/d;->LP:I
+    iput p1, p0, Lcom/facebook/imagepipeline/f/d;->Mh:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/f/d;->LQ:I
+    iput p1, p0, Lcom/facebook/imagepipeline/f/d;->Mi:I
 
     return-void
 .end method
@@ -129,7 +129,7 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/f/b;-><init>()V
 
-    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->fK()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->fO()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
@@ -139,9 +139,9 @@
 
     check-cast p1, Lcom/facebook/common/references/CloseableReference;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/f/d;->Uo:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/f/d;->UG:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/f/d;->Uo:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/f/d;->UG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -151,11 +151,11 @@
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/f/d;->mBitmap:Landroid/graphics/Bitmap;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/f/d;->Up:Lcom/facebook/imagepipeline/f/h;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/f/d;->UH:Lcom/facebook/imagepipeline/f/h;
 
-    iput p3, p0, Lcom/facebook/imagepipeline/f/d;->LP:I
+    iput p3, p0, Lcom/facebook/imagepipeline/f/d;->Mh:I
 
-    iput p4, p0, Lcom/facebook/imagepipeline/f/d;->LQ:I
+    iput p4, p0, Lcom/facebook/imagepipeline/f/d;->Mi:I
 
     return-void
 .end method
@@ -202,7 +202,7 @@
     return p0
 .end method
 
-.method private declared-synchronized iD()Lcom/facebook/common/references/CloseableReference;
+.method private declared-synchronized iC()Lcom/facebook/common/references/CloseableReference;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -216,11 +216,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/d;->Uo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/d;->UG:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/f/d;->Uo:Lcom/facebook/common/references/CloseableReference;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/f/d;->UG:Lcom/facebook/common/references/CloseableReference;
 
     iput-object v1, p0, Lcom/facebook/imagepipeline/f/d;->mBitmap:Landroid/graphics/Bitmap;
     :try_end_0
@@ -243,7 +243,7 @@
 .method public final close()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/d;->iD()Lcom/facebook/common/references/CloseableReference;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/d;->iC()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
 
@@ -255,7 +255,7 @@
     return-void
 .end method
 
-.method public final fg()I
+.method public final fl()I
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/f/d;->mBitmap:Landroid/graphics/Bitmap;
@@ -270,13 +270,13 @@
 .method public final getHeight()I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/f/d;->LP:I
+    iget v0, p0, Lcom/facebook/imagepipeline/f/d;->Mh:I
 
     rem-int/lit16 v0, v0, 0xb4
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/f/d;->LQ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/f/d;->Mi:I
 
     const/4 v1, 0x5
 
@@ -311,13 +311,13 @@
 .method public final getWidth()I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/f/d;->LP:I
+    iget v0, p0, Lcom/facebook/imagepipeline/f/d;->Mh:I
 
     rem-int/lit16 v0, v0, 0xb4
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/f/d;->LQ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/f/d;->Mi:I
 
     const/4 v1, 0x5
 
@@ -349,7 +349,7 @@
     return v0
 .end method
 
-.method public final iB()Landroid/graphics/Bitmap;
+.method public final iA()Landroid/graphics/Bitmap;
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/f/d;->mBitmap:Landroid/graphics/Bitmap;
@@ -357,15 +357,15 @@
     return-object v0
 .end method
 
-.method public final iC()Lcom/facebook/imagepipeline/f/h;
+.method public final iB()Lcom/facebook/imagepipeline/f/h;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/d;->Up:Lcom/facebook/imagepipeline/f/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/d;->UH:Lcom/facebook/imagepipeline/f/h;
 
     return-object v0
 .end method
 
-.method public final declared-synchronized iE()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized iD()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -382,7 +382,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/d;->Uo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/d;->UG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -408,7 +408,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/d;->Uo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/d;->UG:Lcom/facebook/common/references/CloseableReference;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/f/e.smali b/com.discord/smali/com/facebook/imagepipeline/f/e.smali
index eb05448e9a..797548e569 100644
--- a/com.discord/smali/com/facebook/imagepipeline/f/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/f/e.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field public LP:I
+.field public Mh:I
 
-.field public LQ:I
+.field public Mi:I
 
-.field public final Uq:Lcom/facebook/common/references/CloseableReference;
+.field public final UI:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field public final Ur:Lcom/facebook/common/d/k;
+.field public final UJ:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -37,18 +37,18 @@
     .end annotation
 .end field
 
-.field public Us:Lcom/facebook/d/c;
+.field public UK:Lcom/facebook/d/c;
 
-.field public Ut:I
+.field public UL:I
 
-.field private Uu:I
+.field private UM:I
 
-.field public Uv:Lcom/facebook/imagepipeline/a/a;
+.field public UN:Lcom/facebook/imagepipeline/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Uw:Landroid/graphics/ColorSpace;
+.field private UO:Landroid/graphics/ColorSpace;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -72,17 +72,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Us:Lcom/facebook/d/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UK:Lcom/facebook/d/c;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->LP:I
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->Mh:I
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/imagepipeline/f/e;->LQ:I
+    iput v1, p0, Lcom/facebook/imagepipeline/f/e;->Mi:I
 
     iput v0, p0, Lcom/facebook/imagepipeline/f/e;->mWidth:I
 
@@ -90,17 +90,17 @@
 
     const/4 v1, 0x1
 
-    iput v1, p0, Lcom/facebook/imagepipeline/f/e;->Ut:I
+    iput v1, p0, Lcom/facebook/imagepipeline/f/e;->UL:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->Uu:I
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->UM:I
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/f/e;->Ur:Lcom/facebook/common/d/k;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/f/e;->UJ:Lcom/facebook/common/d/k;
 
     return-void
 .end method
@@ -118,7 +118,7 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/f/e;-><init>(Lcom/facebook/common/d/k;)V
 
-    iput p2, p0, Lcom/facebook/imagepipeline/f/e;->Uu:I
+    iput p2, p0, Lcom/facebook/imagepipeline/f/e;->UM:I
 
     return-void
 .end method
@@ -136,17 +136,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Us:Lcom/facebook/d/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UK:Lcom/facebook/d/c;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->LP:I
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->Mh:I
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/imagepipeline/f/e;->LQ:I
+    iput v1, p0, Lcom/facebook/imagepipeline/f/e;->Mi:I
 
     iput v0, p0, Lcom/facebook/imagepipeline/f/e;->mWidth:I
 
@@ -154,9 +154,9 @@
 
     const/4 v1, 0x1
 
-    iput v1, p0, Lcom/facebook/imagepipeline/f/e;->Ut:I
+    iput v1, p0, Lcom/facebook/imagepipeline/f/e;->UL:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->Uu:I
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->UM:I
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
 
@@ -164,15 +164,15 @@
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->fJ()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->fN()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/f/e;->Ur:Lcom/facebook/common/d/k;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/f/e;->UJ:Lcom/facebook/common/d/k;
 
     return-void
 .end method
@@ -184,7 +184,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/imagepipeline/f/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iE()Lcom/facebook/imagepipeline/f/e;
 
     move-result-object p0
 
@@ -199,7 +199,7 @@
 .method public static d(Lcom/facebook/imagepipeline/f/e;)Z
     .locals 1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->LP:I
+    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->Mh:I
 
     if-ltz v0, :cond_0
 
@@ -266,32 +266,32 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iK()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iJ()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Uw:Landroid/graphics/ColorSpace;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UO:Landroid/graphics/ColorSpace;
 
     return-object v0
 .end method
 
-.method private iF()Lcom/facebook/imagepipeline/f/e;
+.method private iE()Lcom/facebook/imagepipeline/f/e;
     .locals 3
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Ur:Lcom/facebook/common/d/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UJ:Lcom/facebook/common/d/k;
 
     if-eqz v0, :cond_0
 
     new-instance v1, Lcom/facebook/imagepipeline/f/e;
 
-    iget v2, p0, Lcom/facebook/imagepipeline/f/e;->Uu:I
+    iget v2, p0, Lcom/facebook/imagepipeline/f/e;->UM:I
 
     invoke-direct {v1, v0, v2}, Lcom/facebook/imagepipeline/f/e;-><init>(Lcom/facebook/common/d/k;I)V
 
     goto :goto_1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -330,7 +330,7 @@
     throw v1
 .end method
 
-.method private iK()V
+.method private iJ()V
     .locals 1
 
     iget v0, p0, Lcom/facebook/imagepipeline/f/e;->mWidth:I
@@ -342,13 +342,13 @@
     if-gez v0, :cond_1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->iL()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->iK()V
 
     :cond_1
     return-void
 .end method
 
-.method private iM()Landroid/util/Pair;
+.method private iL()Landroid/util/Pair;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -394,7 +394,7 @@
     return-object v0
 .end method
 
-.method private iN()Lcom/facebook/imageutils/b;
+.method private iM()Lcom/facebook/imageutils/b;
     .locals 4
 
     :try_start_0
@@ -409,11 +409,11 @@
 
     move-result-object v1
 
-    iget-object v2, v1, Lcom/facebook/imageutils/b;->Uw:Landroid/graphics/ColorSpace;
+    iget-object v2, v1, Lcom/facebook/imageutils/b;->UO:Landroid/graphics/ColorSpace;
 
-    iput-object v2, p0, Lcom/facebook/imagepipeline/f/e;->Uw:Landroid/graphics/ColorSpace;
+    iput-object v2, p0, Lcom/facebook/imagepipeline/f/e;->UO:Landroid/graphics/ColorSpace;
 
-    iget-object v2, v1, Lcom/facebook/imageutils/b;->YN:Landroid/util/Pair;
+    iget-object v2, v1, Lcom/facebook/imageutils/b;->Zf:Landroid/util/Pair;
 
     if-eqz v2, :cond_0
 
@@ -479,11 +479,11 @@
 .method public final c(Lcom/facebook/imagepipeline/f/e;)V
     .locals 1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Us:Lcom/facebook/d/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UK:Lcom/facebook/d/c;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->getWidth()I
 
@@ -497,37 +497,37 @@
 
     iput v0, p0, Lcom/facebook/imagepipeline/f/e;->mHeight:I
 
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()I
+
+    move-result v0
+
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->Mh:I
+
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iH()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->LP:I
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->Mi:I
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iI()I
+    iget v0, p1, Lcom/facebook/imagepipeline/f/e;->UL:I
 
-    move-result v0
-
-    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->LQ:I
-
-    iget v0, p1, Lcom/facebook/imagepipeline/f/e;->Ut:I
-
-    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->Ut:I
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->UL:I
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->getSize()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->Uu:I
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->UM:I
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/f/e;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/f/e;->UN:Lcom/facebook/imagepipeline/a/a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UN:Lcom/facebook/imagepipeline/a/a;
 
     invoke-direct {p1}, Lcom/facebook/imagepipeline/f/e;->getColorSpace()Landroid/graphics/ColorSpace;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/f/e;->Uw:Landroid/graphics/ColorSpace;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/f/e;->UO:Landroid/graphics/ColorSpace;
 
     return-void
 .end method
@@ -535,7 +535,7 @@
 .method public final close()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
@@ -545,7 +545,7 @@
 .method public final getHeight()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iK()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iJ()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/f/e;->mHeight:I
 
@@ -557,7 +557,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Ur:Lcom/facebook/common/d/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UJ:Lcom/facebook/common/d/k;
 
     if-eqz v0, :cond_0
 
@@ -570,7 +570,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -611,7 +611,7 @@
 .method public final getSize()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     if-eqz v0, :cond_0
 
@@ -621,7 +621,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -636,7 +636,7 @@
     return v0
 
     :cond_0
-    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->Uu:I
+    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->UM:I
 
     return v0
 .end method
@@ -644,47 +644,47 @@
 .method public final getWidth()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iK()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iJ()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/f/e;->mWidth:I
 
     return v0
 .end method
 
-.method public final iG()Lcom/facebook/d/c;
+.method public final iF()Lcom/facebook/d/c;
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iK()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iJ()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Us:Lcom/facebook/d/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UK:Lcom/facebook/d/c;
 
     return-object v0
 .end method
 
+.method public final iG()I
+    .locals 1
+
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iJ()V
+
+    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->Mh:I
+
+    return v0
+.end method
+
 .method public final iH()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iK()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iJ()V
 
-    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->LP:I
+    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->Mi:I
 
     return v0
 .end method
 
-.method public final iI()I
-    .locals 1
-
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iK()V
-
-    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->LQ:I
-
-    return v0
-.end method
-
-.method public final iJ()Ljava/lang/String;
+.method public final iI()Ljava/lang/String;
     .locals 7
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -790,7 +790,7 @@
     goto :goto_1
 .end method
 
-.method public final iL()V
+.method public final iK()V
     .locals 4
 
     invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->getInputStream()Ljava/io/InputStream;
@@ -801,7 +801,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Us:Lcom/facebook/d/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UK:Lcom/facebook/d/c;
 
     invoke-static {v0}, Lcom/facebook/d/b;->a(Lcom/facebook/d/c;)Z
 
@@ -809,27 +809,27 @@
 
     if-eqz v1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iM()Landroid/util/Pair;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iL()Landroid/util/Pair;
 
     move-result-object v1
 
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iN()Lcom/facebook/imageutils/b;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/f/e;->iM()Lcom/facebook/imageutils/b;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/facebook/imageutils/b;->YN:Landroid/util/Pair;
+    iget-object v1, v1, Lcom/facebook/imageutils/b;->Zf:Landroid/util/Pair;
 
     :goto_0
-    sget-object v2, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v2, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
     const/4 v3, -0x1
 
     if-ne v0, v2, :cond_1
 
-    iget v2, p0, Lcom/facebook/imagepipeline/f/e;->LP:I
+    iget v2, p0, Lcom/facebook/imagepipeline/f/e;->Mh:I
 
     if-ne v2, v3, :cond_1
 
@@ -843,24 +843,24 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->LQ:I
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->Mi:I
 
-    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->LQ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->Mi:I
 
     invoke-static {v0}, Lcom/facebook/imageutils/e;->aI(I)I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->LP:I
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->Mh:I
 
     return-void
 
     :cond_1
-    sget-object v1, Lcom/facebook/d/b;->PC:Lcom/facebook/d/c;
+    sget-object v1, Lcom/facebook/d/b;->PU:Lcom/facebook/d/c;
 
     if-ne v0, v1, :cond_2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->LP:I
+    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->Mh:I
 
     if-ne v0, v3, :cond_2
 
@@ -872,22 +872,22 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->LQ:I
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->Mi:I
 
-    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->LQ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/f/e;->Mi:I
 
     invoke-static {v0}, Lcom/facebook/imageutils/e;->aI(I)I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->LP:I
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->Mh:I
 
     return-void
 
     :cond_2
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->LP:I
+    iput v0, p0, Lcom/facebook/imagepipeline/f/e;->Mh:I
 
     :cond_3
     return-void
@@ -899,7 +899,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
 
@@ -907,7 +907,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->Ur:Lcom/facebook/common/d/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/e;->UJ:Lcom/facebook/common/d/k;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/g/a.smali b/com.discord/smali/com/facebook/imagepipeline/g/a.smali
index bee2d2d00c..0c20605bab 100644
--- a/com.discord/smali/com/facebook/imagepipeline/g/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/g/a.smali
@@ -84,7 +84,13 @@
     return-void
 .end method
 
-.method public final aB(Ljava/lang/String;)Z
+.method public as(Ljava/lang/String;)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final aw(Ljava/lang/String;)Z
     .locals 0
 
     const/4 p1, 0x0
@@ -92,12 +98,6 @@
     return p1
 .end method
 
-.method public ax(Ljava/lang/String;)V
-    .locals 0
-
-    return-void
-.end method
-
 .method public final b(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/g/b.smali b/com.discord/smali/com/facebook/imagepipeline/g/b.smali
index 80a11d806c..e0e5228564 100644
--- a/com.discord/smali/com/facebook/imagepipeline/g/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/g/b.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field public final UB:Ljava/util/List;
+.field public final UU:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -62,7 +62,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -83,7 +83,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     array-length v0, p1
 
@@ -96,7 +96,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v3, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -114,7 +114,7 @@
 .method public final a(Lcom/facebook/imagepipeline/request/b;Ljava/lang/Object;Ljava/lang/String;Z)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -125,7 +125,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -161,7 +161,7 @@
 .method public final a(Lcom/facebook/imagepipeline/request/b;Ljava/lang/String;Ljava/lang/Throwable;Z)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -172,7 +172,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -208,7 +208,7 @@
 .method public final a(Lcom/facebook/imagepipeline/request/b;Ljava/lang/String;Z)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -219,7 +219,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -271,7 +271,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -282,7 +282,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -333,7 +333,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -344,7 +344,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -380,7 +380,7 @@
 .method public final a(Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -391,7 +391,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -424,53 +424,10 @@
     return-void
 .end method
 
-.method public final aB(Ljava/lang/String;)Z
-    .locals 4
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, v0, :cond_1
-
-    iget-object v3, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
-
-    invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lcom/facebook/imagepipeline/g/c;
-
-    invoke-interface {v3, p1}, Lcom/facebook/imagepipeline/g/c;->aB(Ljava/lang/String;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_0
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    return v1
-.end method
-
-.method public final ax(Ljava/lang/String;)V
+.method public final as(Ljava/lang/String;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -481,7 +438,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -490,7 +447,7 @@
     check-cast v2, Lcom/facebook/imagepipeline/g/c;
 
     :try_start_0
-    invoke-interface {v2, p1}, Lcom/facebook/imagepipeline/g/c;->ax(Ljava/lang/String;)V
+    invoke-interface {v2, p1}, Lcom/facebook/imagepipeline/g/c;->as(Ljava/lang/String;)V
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -514,10 +471,53 @@
     return-void
 .end method
 
+.method public final aw(Ljava/lang/String;)Z
+    .locals 4
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, v0, :cond_1
+
+    iget-object v3, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
+
+    invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/facebook/imagepipeline/g/c;
+
+    invoke-interface {v3, p1}, Lcom/facebook/imagepipeline/g/c;->aw(Ljava/lang/String;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_0
+
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_0
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    return v1
+.end method
+
 .method public final b(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -528,7 +528,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -579,7 +579,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -590,7 +590,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -626,7 +626,7 @@
 .method public final u(Ljava/lang/String;Ljava/lang/String;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -637,7 +637,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UB:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/g/b;->UU:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/g/c.smali b/com.discord/smali/com/facebook/imagepipeline/g/c.smali
index 02828c7cf5..f6131fd815 100644
--- a/com.discord/smali/com/facebook/imagepipeline/g/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/g/c.smali
@@ -16,5 +16,5 @@
 .method public abstract a(Lcom/facebook/imagepipeline/request/b;Ljava/lang/String;Z)V
 .end method
 
-.method public abstract ax(Ljava/lang/String;)V
+.method public abstract as(Ljava/lang/String;)V
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/ac$1.smali b/com.discord/smali/com/facebook/imagepipeline/h/ac$1.smali
index e971aa1169..2da39d471a 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/ac$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/ac$1.smali
@@ -24,26 +24,26 @@
 
 
 # instance fields
-.field final synthetic WD:Lcom/facebook/imagepipeline/h/am;
+.field final synthetic WW:Lcom/facebook/imagepipeline/h/am;
 
-.field final synthetic WE:Ljava/lang/String;
+.field final synthetic WX:Ljava/lang/String;
 
-.field final synthetic Xm:Lcom/facebook/imagepipeline/request/b;
+.field final synthetic XE:Lcom/facebook/imagepipeline/request/b;
 
-.field final synthetic Xq:Lcom/facebook/imagepipeline/h/ac;
+.field final synthetic XI:Lcom/facebook/imagepipeline/h/ac;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ac;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Lcom/facebook/imagepipeline/request/b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ac$1;->Xq:Lcom/facebook/imagepipeline/h/ac;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ac$1;->XI:Lcom/facebook/imagepipeline/h/ac;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/h/ac$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/h/ac$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/h/ac$1;->WE:Ljava/lang/String;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/h/ac$1;->WX:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/h/ac$1;->Xm:Lcom/facebook/imagepipeline/request/b;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/h/ac$1;->XE:Lcom/facebook/imagepipeline/request/b;
 
     invoke-direct {p0, p2, p3, p4, p5}, Lcom/facebook/imagepipeline/h/aq;-><init>(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -91,11 +91,11 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ac$1;->Xq:Lcom/facebook/imagepipeline/h/ac;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ac$1;->XI:Lcom/facebook/imagepipeline/h/ac;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ac$1;->Xm:Lcom/facebook/imagepipeline/request/b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ac$1;->XE:Lcom/facebook/imagepipeline/request/b;
 
-    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/h/ac;->h(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
+    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/h/ac;->g(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -106,15 +106,15 @@
     return-object v1
 
     :cond_0
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ac$1;->Xm:Lcom/facebook/imagepipeline/request/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ac$1;->XE:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     const/16 v4, 0x800
 
     if-eqz v3, :cond_1
 
-    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     iget v3, v3, Lcom/facebook/imagepipeline/a/e;->width:I
 
@@ -128,11 +128,11 @@
 
     if-gt v3, v5, :cond_4
 
-    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     if-eqz v3, :cond_2
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     iget v4, v2, Lcom/facebook/imagepipeline/a/e;->height:I
 
@@ -162,11 +162,11 @@
     :cond_5
     new-instance v1, Lcom/facebook/imagepipeline/f/d;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->hy()Lcom/facebook/imagepipeline/bitmaps/g;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->hB()Lcom/facebook/imagepipeline/bitmaps/g;
 
     move-result-object v2
 
-    sget-object v3, Lcom/facebook/imagepipeline/f/g;->Ux:Lcom/facebook/imagepipeline/f/h;
+    sget-object v3, Lcom/facebook/imagepipeline/f/g;->UQ:Lcom/facebook/imagepipeline/f/h;
 
     invoke-direct {v1, v0, v2, v3}, Lcom/facebook/imagepipeline/f/d;-><init>(Landroid/graphics/Bitmap;Lcom/facebook/common/references/b;Lcom/facebook/imagepipeline/f/h;)V
 
@@ -182,9 +182,9 @@
 
     invoke-super {p0, p1}, Lcom/facebook/imagepipeline/h/aq;->onFailure(Ljava/lang/Exception;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ac$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ac$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ac$1;->WE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ac$1;->WX:Ljava/lang/String;
 
     const-string v1, "VideoThumbnailProducer"
 
@@ -202,9 +202,9 @@
 
     invoke-super {p0, p1}, Lcom/facebook/imagepipeline/h/aq;->onSuccess(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ac$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ac$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ac$1;->WE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ac$1;->WX:Ljava/lang/String;
 
     if-eqz p1, :cond_0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/ac.smali b/com.discord/smali/com/facebook/imagepipeline/h/ac.smali
index e2f8d1f735..8bd29f31ac 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/ac.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/ac.smali
@@ -53,7 +53,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v6
 
@@ -61,7 +61,7 @@
 
     move-result-object v7
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v8
 
@@ -94,12 +94,12 @@
     return-void
 .end method
 
-.method final h(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
+.method final g(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
     .locals 11
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-static {v0}, Lcom/facebook/common/j/f;->d(Landroid/net/Uri;)Z
 
@@ -107,7 +107,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->jR()Ljava/io/File;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->jP()Ljava/io/File;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/ad$a.smali b/com.discord/smali/com/facebook/imagepipeline/h/ad$a.smali
index ac1edbb0a5..128b4d5944 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/ad$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/ad$a.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field final Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+.field final XK:Ljava/util/concurrent/CopyOnWriteArraySet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/CopyOnWriteArraySet<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field Xt:Ljava/io/Closeable;
+.field XL:Ljava/io/Closeable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -45,16 +45,16 @@
     .end annotation
 .end field
 
-.field Xu:F
+.field XM:F
 
-.field private Xv:I
+.field private XN:I
 
-.field Xw:Lcom/facebook/imagepipeline/h/d;
+.field XO:Lcom/facebook/imagepipeline/h/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Xx:Lcom/facebook/imagepipeline/h/ad$a$a;
+.field XP:Lcom/facebook/imagepipeline/h/ad$a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/ad<",
@@ -66,7 +66,7 @@
     .end annotation
 .end field
 
-.field final synthetic Xy:Lcom/facebook/imagepipeline/h/ad;
+.field final synthetic XQ:Lcom/facebook/imagepipeline/h/ad;
 
 .field final mKey:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -86,7 +86,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xy:Lcom/facebook/imagepipeline/h/ad;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a;->XQ:Lcom/facebook/imagepipeline/h/ad;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -94,7 +94,7 @@
 
     invoke-direct {p1}, Ljava/util/concurrent/CopyOnWriteArraySet;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     iput-object p2, p0, Lcom/facebook/imagepipeline/h/ad$a;->mKey:Ljava/lang/Object;
 
@@ -127,13 +127,13 @@
     return-void
 .end method
 
-.method private declared-synchronized jH()Z
+.method private declared-synchronized jF()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
 
@@ -191,13 +191,13 @@
     goto :goto_0
 .end method
 
-.method private declared-synchronized jJ()Z
+.method private declared-synchronized jH()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
 
@@ -220,7 +220,7 @@
 
     check-cast v1, Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/h/ak;->jr()Z
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/h/ak;->jp()Z
 
     move-result v1
     :try_end_0
@@ -255,15 +255,15 @@
     goto :goto_0
 .end method
 
-.method private declared-synchronized jL()Lcom/facebook/imagepipeline/a/d;
+.method private declared-synchronized jJ()Lcom/facebook/imagepipeline/a/d;
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/facebook/imagepipeline/a/d;->Sa:Lcom/facebook/imagepipeline/a/d;
+    sget-object v0, Lcom/facebook/imagepipeline/a/d;->Ss:Lcom/facebook/imagepipeline/a/d;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v1}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
 
@@ -286,7 +286,7 @@
 
     check-cast v2, Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/h/ak;->jq()Lcom/facebook/imagepipeline/a/d;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/h/ak;->jo()Lcom/facebook/imagepipeline/a/d;
 
     move-result-object v2
 
@@ -332,7 +332,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xx:Lcom/facebook/imagepipeline/h/ad$a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XP:Lcom/facebook/imagepipeline/h/ad$a$a;
 
     if-eq v0, p1, :cond_0
 
@@ -341,15 +341,15 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xt:Ljava/io/Closeable;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a;->XL:Ljava/io/Closeable;
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/h/ad$a;->d(Ljava/io/Closeable;)V
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xt:Ljava/io/Closeable;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a;->XL:Ljava/io/Closeable;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {p1}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
 
@@ -361,24 +361,24 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xy:Lcom/facebook/imagepipeline/h/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XQ:Lcom/facebook/imagepipeline/h/ad;
 
     invoke-virtual {v0, p2}, Lcom/facebook/imagepipeline/h/ad;->c(Ljava/io/Closeable;)Ljava/io/Closeable;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xt:Ljava/io/Closeable;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XL:Ljava/io/Closeable;
 
-    iput p3, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xv:I
+    iput p3, p0, Lcom/facebook/imagepipeline/h/ad$a;->XN:I
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->clear()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xy:Lcom/facebook/imagepipeline/h/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XQ:Lcom/facebook/imagepipeline/h/ad;
 
     iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->mKey:Ljava/lang/Object;
 
@@ -463,7 +463,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xy:Lcom/facebook/imagepipeline/h/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->XQ:Lcom/facebook/imagepipeline/h/ad;
 
     iget-object v2, p0, Lcom/facebook/imagepipeline/h/ad$a;->mKey:Ljava/lang/Object;
 
@@ -480,27 +480,27 @@
     return p1
 
     :cond_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v1, v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jG()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jE()Ljava/util/List;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jK()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jI()Ljava/util/List;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jI()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jG()Ljava/util/List;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xt:Ljava/io/Closeable;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ad$a;->XL:Ljava/io/Closeable;
 
-    iget v5, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xu:F
+    iget v5, p0, Lcom/facebook/imagepipeline/h/ad$a;->XM:F
 
-    iget v6, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xv:I
+    iget v6, p0, Lcom/facebook/imagepipeline/h/ad$a;->XN:I
 
     monitor-exit p0
     :try_end_0
@@ -520,7 +520,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xt:Ljava/io/Closeable;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->XL:Ljava/io/Closeable;
 
     if-eq v4, v1, :cond_1
 
@@ -531,7 +531,7 @@
     :cond_1
     if-eqz v4, :cond_2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xy:Lcom/facebook/imagepipeline/h/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->XQ:Lcom/facebook/imagepipeline/h/ad;
 
     invoke-virtual {v1, v4}, Lcom/facebook/imagepipeline/h/ad;->c(Ljava/io/Closeable;)Ljava/io/Closeable;
 
@@ -552,7 +552,7 @@
     if-lez v1, :cond_3
 
     :try_start_3
-    invoke-interface {p1, v5}, Lcom/facebook/imagepipeline/h/k;->n(F)V
+    invoke-interface {p1, v5}, Lcom/facebook/imagepipeline/h/k;->m(F)V
 
     :cond_3
     invoke-interface {p1, v4, v6}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
@@ -605,13 +605,13 @@
     throw p1
 .end method
 
-.method final jF()V
+.method final jD()V
     .locals 12
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xw:Lcom/facebook/imagepipeline/h/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XO:Lcom/facebook/imagepipeline/h/d;
 
     const/4 v1, 0x1
 
@@ -629,7 +629,7 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xx:Lcom/facebook/imagepipeline/h/ad$a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XP:Lcom/facebook/imagepipeline/h/ad$a$a;
 
     if-nez v0, :cond_1
 
@@ -641,7 +641,7 @@
     :goto_1
     invoke-static {v1}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->isEmpty()Z
 
@@ -649,7 +649,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xy:Lcom/facebook/imagepipeline/h/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XQ:Lcom/facebook/imagepipeline/h/ad;
 
     iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->mKey:Ljava/lang/Object;
 
@@ -660,7 +660,7 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
 
@@ -678,7 +678,7 @@
 
     new-instance v1, Lcom/facebook/imagepipeline/h/d;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v4
 
@@ -686,27 +686,27 @@
 
     move-result-object v5
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v6
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jo()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jm()Ljava/lang/Object;
 
     move-result-object v7
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jp()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v8
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jH()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jF()Z
 
     move-result v9
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jJ()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jH()Z
 
     move-result v10
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jL()Lcom/facebook/imagepipeline/a/d;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jJ()Lcom/facebook/imagepipeline/a/d;
 
     move-result-object v11
 
@@ -714,25 +714,25 @@
 
     invoke-direct/range {v3 .. v11}, Lcom/facebook/imagepipeline/h/d;-><init>(Lcom/facebook/imagepipeline/request/b;Ljava/lang/String;Lcom/facebook/imagepipeline/h/am;Ljava/lang/Object;Lcom/facebook/imagepipeline/request/b$b;ZZLcom/facebook/imagepipeline/a/d;)V
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xw:Lcom/facebook/imagepipeline/h/d;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->XO:Lcom/facebook/imagepipeline/h/d;
 
     new-instance v0, Lcom/facebook/imagepipeline/h/ad$a$a;
 
     invoke-direct {v0, p0, v2}, Lcom/facebook/imagepipeline/h/ad$a$a;-><init>(Lcom/facebook/imagepipeline/h/ad$a;B)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xx:Lcom/facebook/imagepipeline/h/ad$a$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XP:Lcom/facebook/imagepipeline/h/ad$a$a;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xw:Lcom/facebook/imagepipeline/h/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XO:Lcom/facebook/imagepipeline/h/d;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xx:Lcom/facebook/imagepipeline/h/ad$a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a;->XP:Lcom/facebook/imagepipeline/h/ad$a$a;
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xy:Lcom/facebook/imagepipeline/h/ad;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ad$a;->XQ:Lcom/facebook/imagepipeline/h/ad;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/h/ad;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/h/ad;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-interface {v2, v1, v0}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
@@ -749,6 +749,61 @@
     throw v0
 .end method
 
+.method final declared-synchronized jE()Ljava/util/List;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/facebook/imagepipeline/h/al;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XO:Lcom/facebook/imagepipeline/h/d;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    monitor-exit p0
+
+    return-object v0
+
+    :cond_0
+    :try_start_1
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XO:Lcom/facebook/imagepipeline/h/d;
+
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jF()Z
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/h/d;->y(Z)Ljava/util/List;
+
+    move-result-object v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit p0
+
+    return-object v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
 .method final declared-synchronized jG()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
@@ -766,7 +821,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xw:Lcom/facebook/imagepipeline/h/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XO:Lcom/facebook/imagepipeline/h/d;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -780,13 +835,13 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xw:Lcom/facebook/imagepipeline/h/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XO:Lcom/facebook/imagepipeline/h/d;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jH()Z
 
     move-result v1
 
-    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/h/d;->A(Z)Ljava/util/List;
+    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/h/d;->z(Z)Ljava/util/List;
 
     move-result-object v0
     :try_end_1
@@ -821,7 +876,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xw:Lcom/facebook/imagepipeline/h/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XO:Lcom/facebook/imagepipeline/h/d;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -835,64 +890,9 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xw:Lcom/facebook/imagepipeline/h/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->XO:Lcom/facebook/imagepipeline/h/d;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jJ()Z
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/h/d;->B(Z)Ljava/util/List;
-
-    move-result-object v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit p0
-
-    return-object v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method final declared-synchronized jK()Ljava/util/List;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Lcom/facebook/imagepipeline/h/al;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xw:Lcom/facebook/imagepipeline/h/d;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    monitor-exit p0
-
-    return-object v0
-
-    :cond_0
-    :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a;->Xw:Lcom/facebook/imagepipeline/h/d;
-
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jL()Lcom/facebook/imagepipeline/a/d;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ad$a;->jJ()Lcom/facebook/imagepipeline/a/d;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/ae.smali b/com.discord/smali/com/facebook/imagepipeline/h/ae.smali
index 7f98a8f3e0..7ffab54d2c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/ae.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/ae.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field final Ha:Lcom/facebook/common/g/a;
+.field final Hr:Lcom/facebook/common/g/a;
 
-.field final QF:Lcom/facebook/common/g/g;
+.field final QX:Lcom/facebook/common/g/g;
 
-.field private final SO:Lcom/facebook/imagepipeline/h/af;
+.field private final Th:Lcom/facebook/imagepipeline/h/af;
 
 
 # direct methods
@@ -31,11 +31,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ae;->QF:Lcom/facebook/common/g/g;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ae;->QX:Lcom/facebook/common/g/g;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ae;->Ha:Lcom/facebook/common/g/a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ae;->Hr:Lcom/facebook/common/g/a;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ae;->SO:Lcom/facebook/imagepipeline/h/af;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ae;->Th:Lcom/facebook/imagepipeline/h/af;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/facebook/common/g/i;->fI()Lcom/facebook/common/g/f;
+    invoke-virtual {p0}, Lcom/facebook/common/g/i;->fM()Lcom/facebook/common/g/f;
 
     move-result-object p0
 
@@ -76,9 +76,9 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iput-object p2, v1, Lcom/facebook/imagepipeline/f/e;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iput-object p2, v1, Lcom/facebook/imagepipeline/f/e;->UN:Lcom/facebook/imagepipeline/a/a;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->iL()V
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->iK()V
 
     invoke-interface {p3, v1, p1}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
     :try_end_1
@@ -123,7 +123,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v0
 
@@ -135,13 +135,13 @@
 
     invoke-interface {v0, v1, v2}, Lcom/facebook/imagepipeline/h/am;->u(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ae;->SO:Lcom/facebook/imagepipeline/h/af;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ae;->Th:Lcom/facebook/imagepipeline/h/af;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/af;->b(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)Lcom/facebook/imagepipeline/h/s;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ae;->SO:Lcom/facebook/imagepipeline/h/af;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ae;->Th:Lcom/facebook/imagepipeline/h/af;
 
     new-instance v0, Lcom/facebook/imagepipeline/h/ae$1;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/ag$a.smali b/com.discord/smali/com/facebook/imagepipeline/h/ag$a.smali
index 13417213b4..aaf0b832aa 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/ag$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/ag$a.smali
@@ -24,15 +24,15 @@
 
 
 # instance fields
-.field private final Ha:Lcom/facebook/common/g/a;
+.field private final Hr:Lcom/facebook/common/g/a;
 
-.field private final QF:Lcom/facebook/common/g/g;
+.field private final QX:Lcom/facebook/common/g/g;
 
-.field private final TJ:Lcom/facebook/imagepipeline/cache/e;
+.field private final Ub:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final XE:Lcom/facebook/cache/common/CacheKey;
+.field private final XW:Lcom/facebook/cache/common/CacheKey;
 
-.field private final XF:Lcom/facebook/imagepipeline/f/e;
+.field private final XX:Lcom/facebook/imagepipeline/f/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -62,15 +62,15 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ag$a;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ag$a;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ag$a;->XE:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ag$a;->XW:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/h/ag$a;->QF:Lcom/facebook/common/g/g;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/h/ag$a;->QX:Lcom/facebook/common/g/g;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/h/ag$a;->Ha:Lcom/facebook/common/g/a;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/h/ag$a;->Hr:Lcom/facebook/common/g/a;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/h/ag$a;->XF:Lcom/facebook/imagepipeline/f/e;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/h/ag$a;->XX:Lcom/facebook/imagepipeline/f/e;
 
     return-void
 .end method
@@ -91,7 +91,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$a;->Ha:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$a;->Hr:Lcom/facebook/common/g/a;
 
     const/16 v1, 0x4000
 
@@ -133,14 +133,14 @@
     :catchall_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ag$a;->Ha:Lcom/facebook/common/g/a;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ag$a;->Hr:Lcom/facebook/common/g/a;
 
     invoke-interface {p2, v0}, Lcom/facebook/common/g/a;->z(Ljava/lang/Object;)V
 
     throw p1
 
     :cond_1
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$a;->Ha:Lcom/facebook/common/g/a;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$a;->Hr:Lcom/facebook/common/g/a;
 
     invoke-interface {p1, v0}, Lcom/facebook/common/g/a;->z(Ljava/lang/Object;)V
 
@@ -201,36 +201,36 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$a;->XF:Lcom/facebook/imagepipeline/f/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$a;->XX:Lcom/facebook/imagepipeline/f/e;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/f/e;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/f/e;->UN:Lcom/facebook/imagepipeline/a/a;
 
     if-eqz v0, :cond_0
 
     :try_start_0
-    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ag$a;->XF:Lcom/facebook/imagepipeline/f/e;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ag$a;->XX:Lcom/facebook/imagepipeline/f/e;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->getSize()I
 
     move-result v0
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/f/e;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/f/e;->UN:Lcom/facebook/imagepipeline/a/a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/a/a;->RG:I
+    iget v1, v1, Lcom/facebook/imagepipeline/a/a;->RY:I
 
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag$a;->QF:Lcom/facebook/common/g/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag$a;->QX:Lcom/facebook/common/g/g;
 
     invoke-interface {v1, v0}, Lcom/facebook/common/g/g;->K(I)Lcom/facebook/common/g/i;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/f/e;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/f/e;->UN:Lcom/facebook/imagepipeline/a/a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/a/a;->RG:I
+    iget v1, v1, Lcom/facebook/imagepipeline/a/a;->RY:I
 
     invoke-virtual {p2}, Lcom/facebook/imagepipeline/f/e;->getInputStream()Ljava/io/InputStream;
 
@@ -248,7 +248,7 @@
 
     invoke-direct {p0, p2, v0, v1}, Lcom/facebook/imagepipeline/h/ag$a;->a(Ljava/io/InputStream;Ljava/io/OutputStream;I)V
 
-    invoke-virtual {v0}, Lcom/facebook/common/g/i;->fI()Lcom/facebook/common/g/f;
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->fM()Lcom/facebook/common/g/f;
 
     move-result-object p2
 
@@ -269,9 +269,9 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->iL()V
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->iK()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     const/4 v2, 0x1
 
@@ -325,7 +325,7 @@
 
     invoke-static {v0, v1, p2}, Lcom/facebook/common/e/a;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p2}, Lcom/facebook/imagepipeline/h/k;->i(Ljava/lang/Throwable;)V
     :try_end_4
@@ -334,13 +334,13 @@
     :goto_1
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->close()V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$a;->XF:Lcom/facebook/imagepipeline/f/e;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$a;->XX:Lcom/facebook/imagepipeline/f/e;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->close()V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$a;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$a;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ag$a;->XE:Lcom/facebook/cache/common/CacheKey;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ag$a;->XW:Lcom/facebook/cache/common/CacheKey;
 
     invoke-virtual {p1, p2}, Lcom/facebook/imagepipeline/cache/e;->f(Lcom/facebook/cache/common/CacheKey;)La/h;
 
@@ -349,7 +349,7 @@
     :goto_2
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->close()V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$a;->XF:Lcom/facebook/imagepipeline/f/e;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$a;->XX:Lcom/facebook/imagepipeline/f/e;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->close()V
 
@@ -358,7 +358,7 @@
     :cond_0
     const/16 v0, 0x8
 
-    invoke-static {p2, v0}, Lcom/facebook/imagepipeline/h/ag$a;->o(II)Z
+    invoke-static {p2, v0}, Lcom/facebook/imagepipeline/h/ag$a;->n(II)Z
 
     move-result v0
 
@@ -370,22 +370,22 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object v1, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
     if-eq v0, v1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$a;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$a;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag$a;->XE:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag$a;->XW:Lcom/facebook/cache/common/CacheKey;
 
     invoke-virtual {v0, v1, p1}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/ag.smali b/com.discord/smali/com/facebook/imagepipeline/h/ag.smali
index 3b10ab0c37..91b79b95f0 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/ag.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/ag.smali
@@ -24,15 +24,15 @@
 
 
 # instance fields
-.field private final Ha:Lcom/facebook/common/g/a;
+.field private final Hr:Lcom/facebook/common/g/a;
 
-.field private final QF:Lcom/facebook/common/g/g;
+.field private final QX:Lcom/facebook/common/g/g;
 
-.field private final Sx:Lcom/facebook/imagepipeline/cache/f;
+.field private final SQ:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final TJ:Lcom/facebook/imagepipeline/cache/e;
+.field private final Ub:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field private final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -61,15 +61,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ag;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ag;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ag;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ag;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ag;->QF:Lcom/facebook/common/g/g;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ag;->QX:Lcom/facebook/common/g/g;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/h/ag;->Ha:Lcom/facebook/common/g/a;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/h/ag;->Hr:Lcom/facebook/common/g/a;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/h/ag;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/h/ag;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     return-void
 .end method
@@ -92,7 +92,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-interface {p0, p1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {p0, p1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result p0
 
@@ -140,11 +140,11 @@
 
     new-instance v8, Lcom/facebook/imagepipeline/h/ag$a;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ag;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ag;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ag;->QF:Lcom/facebook/common/g/g;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ag;->QX:Lcom/facebook/common/g/g;
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/h/ag;->Ha:Lcom/facebook/common/g/a;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/h/ag;->Hr:Lcom/facebook/common/g/a;
 
     const/4 v7, 0x0
 
@@ -158,7 +158,7 @@
 
     invoke-direct/range {v0 .. v7}, Lcom/facebook/imagepipeline/h/ag$a;-><init>(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/cache/common/CacheKey;Lcom/facebook/common/g/g;Lcom/facebook/common/g/a;Lcom/facebook/imagepipeline/f/e;B)V
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/h/ag;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/h/ag;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-interface {p0, v8, p2}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
@@ -180,22 +180,22 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-boolean v1, v0, Lcom/facebook/imagepipeline/request/b;->Yu:Z
+    iget-boolean v1, v0, Lcom/facebook/imagepipeline/request/b;->YM:Z
 
     if-nez v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
     return-void
 
     :cond_0
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v1
 
@@ -207,7 +207,7 @@
 
     invoke-interface {v1, v2, v3}, Lcom/facebook/imagepipeline/h/am;->u(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-virtual {v0}, Landroid/net/Uri;->buildUpon()Landroid/net/Uri$Builder;
 
@@ -225,7 +225,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-interface {v1, v0}, Lcom/facebook/imagepipeline/cache/f;->o(Landroid/net/Uri;)Lcom/facebook/cache/common/CacheKey;
 
@@ -237,7 +237,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
     invoke-virtual {v1, v8, v0}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/cache/common/CacheKey;Ljava/util/concurrent/atomic/AtomicBoolean;)La/h;
 
@@ -247,7 +247,7 @@
 
     move-result-object v5
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v4
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/ai$a.smali b/com.discord/smali/com/facebook/imagepipeline/h/ai$a.smali
index 1ea83d1b84..11d12d594c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/ai$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/ai$a.smali
@@ -27,17 +27,17 @@
 
 
 # instance fields
-.field private Hb:Z
+.field private Hs:Z
 
-.field final IV:Ljava/lang/String;
+.field final Jm:Ljava/lang/String;
 
-.field WW:I
+.field Xo:I
 
-.field final XI:Lcom/facebook/imagepipeline/h/am;
+.field final Ya:Lcom/facebook/imagepipeline/h/am;
 
-.field final XJ:Lcom/facebook/imagepipeline/request/c;
+.field final Yb:Lcom/facebook/imagepipeline/request/c;
 
-.field XK:Lcom/facebook/common/references/CloseableReference;
+.field Yc:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -50,11 +50,11 @@
     .end annotation
 .end field
 
-.field XL:Z
+.field Yd:Z
 
-.field XM:Z
+.field Ye:Z
 
-.field final synthetic XN:Lcom/facebook/imagepipeline/h/ai;
+.field final synthetic Yf:Lcom/facebook/imagepipeline/h/ai;
 
 
 # direct methods
@@ -75,27 +75,27 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$a;->XN:Lcom/facebook/imagepipeline/h/ai;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yf:Lcom/facebook/imagepipeline/h/ai;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ai$a;->XK:Lcom/facebook/common/references/CloseableReference;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yc:Lcom/facebook/common/references/CloseableReference;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/facebook/imagepipeline/h/ai$a;->WW:I
+    iput p2, p0, Lcom/facebook/imagepipeline/h/ai$a;->Xo:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/h/ai$a;->XL:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yd:Z
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/h/ai$a;->XM:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/h/ai$a;->Ye:Z
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ai$a;->XI:Lcom/facebook/imagepipeline/h/am;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ai$a;->Ya:Lcom/facebook/imagepipeline/h/am;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/h/ai$a;->IV:Ljava/lang/String;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/h/ai$a;->Jm:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/h/ai$a;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     new-instance p2, Lcom/facebook/imagepipeline/h/ai$a$1;
 
@@ -125,7 +125,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-interface {p0, p1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {p0, p1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result p0
 
@@ -149,13 +149,13 @@
     return-object p0
 .end method
 
-.method private fX()Z
+.method private gb()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Hs:Z
 
     if-eqz v0, :cond_0
 
@@ -166,15 +166,15 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->XK:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yc:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/h/ai$a;->XK:Lcom/facebook/common/references/CloseableReference;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yc:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/h/ai$a;->Hb:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/h/ai$a;->Hs:Z
 
     monitor-exit p0
     :try_end_0
@@ -201,7 +201,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Hs:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -247,7 +247,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Hs:Z
 
     if-eqz v0, :cond_2
 
@@ -256,21 +256,21 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->XK:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yc:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$a;->XK:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yc:Lcom/facebook/common/references/CloseableReference;
 
-    iput p2, p0, Lcom/facebook/imagepipeline/h/ai$a;->WW:I
+    iput p2, p0, Lcom/facebook/imagepipeline/h/ai$a;->Xo:I
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/h/ai$a;->XL:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yd:Z
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ai$a;->jN()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ai$a;->jL()Z
 
     move-result p1
 
@@ -282,7 +282,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ai$a;->jM()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ai$a;->jK()V
 
     :cond_3
     return-void
@@ -324,14 +324,14 @@
     :cond_0
     if-eqz v0, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ai$a;->fX()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ai$a;->gb()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
@@ -358,24 +358,24 @@
 
     iget-object v1, v0, Lcom/facebook/imagepipeline/f/d;->mBitmap:Landroid/graphics/Bitmap;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ai$a;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yb:Lcom/facebook/imagepipeline/request/c;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ai$a;->XN:Lcom/facebook/imagepipeline/h/ai;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yf:Lcom/facebook/imagepipeline/h/ai;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/h/ai;->Qc:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/h/ai;->Qu:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     invoke-interface {v2, v1, v3}, Lcom/facebook/imagepipeline/request/c;->process(Landroid/graphics/Bitmap;Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;)Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v1
 
-    iget v2, v0, Lcom/facebook/imagepipeline/f/d;->LP:I
+    iget v2, v0, Lcom/facebook/imagepipeline/f/d;->Mh:I
 
-    iget v0, v0, Lcom/facebook/imagepipeline/f/d;->LQ:I
+    iget v0, v0, Lcom/facebook/imagepipeline/f/d;->Mi:I
 
     :try_start_0
     new-instance v3, Lcom/facebook/imagepipeline/f/d;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/c;->iC()Lcom/facebook/imagepipeline/f/h;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/c;->iB()Lcom/facebook/imagepipeline/f/h;
 
     move-result-object p1
 
@@ -407,10 +407,10 @@
     return-void
 .end method
 
-.method protected final iy()V
+.method protected final ix()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ai$a;->jO()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ai$a;->jM()V
 
     return-void
 .end method
@@ -418,13 +418,13 @@
 .method final j(Ljava/lang/Throwable;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ai$a;->fX()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ai$a;->gb()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/h/k;->i(Ljava/lang/Throwable;)V
 
@@ -432,10 +432,10 @@
     return-void
 .end method
 
-.method final jM()V
+.method final jK()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->XN:Lcom/facebook/imagepipeline/h/ai;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yf:Lcom/facebook/imagepipeline/h/ai;
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/h/ai;->mExecutor:Ljava/util/concurrent/Executor;
 
@@ -448,25 +448,25 @@
     return-void
 .end method
 
-.method final declared-synchronized jN()Z
+.method final declared-synchronized jL()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Hs:Z
 
     if-nez v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->XL:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yd:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->XM:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Ye:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->XK:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Yc:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
 
@@ -476,7 +476,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->XM:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$a;->Ye:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -499,18 +499,18 @@
     throw v0
 .end method
 
-.method final jO()V
+.method final jM()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ai$a;->fX()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ai$a;->gb()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fz()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fD()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/ai$b.smali b/com.discord/smali/com/facebook/imagepipeline/h/ai$b.smali
index 9d4ee78e5a..3af9b1702d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/ai$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/ai$b.smali
@@ -27,9 +27,9 @@
 
 
 # instance fields
-.field private Hb:Z
+.field private Hs:Z
 
-.field private XK:Lcom/facebook/common/references/CloseableReference;
+.field private Yc:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -42,24 +42,24 @@
     .end annotation
 .end field
 
-.field final synthetic XN:Lcom/facebook/imagepipeline/h/ai;
+.field final synthetic Yf:Lcom/facebook/imagepipeline/h/ai;
 
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/imagepipeline/h/ai;Lcom/facebook/imagepipeline/h/ai$a;Lcom/facebook/imagepipeline/h/ak;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$b;->XN:Lcom/facebook/imagepipeline/h/ai;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$b;->Yf:Lcom/facebook/imagepipeline/h/ai;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/h/ai$b;->Hb:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/h/ai$b;->Hs:Z
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ai$b;->XK:Lcom/facebook/common/references/CloseableReference;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ai$b;->Yc:Lcom/facebook/common/references/CloseableReference;
 
     new-instance p2, Lcom/facebook/imagepipeline/h/ai$b$1;
 
@@ -94,7 +94,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean p2, p0, Lcom/facebook/imagepipeline/h/ai$b;->Hb:Z
+    iget-boolean p2, p0, Lcom/facebook/imagepipeline/h/ai$b;->Hs:Z
 
     if-eqz p2, :cond_0
 
@@ -103,13 +103,13 @@
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ai$b;->XK:Lcom/facebook/common/references/CloseableReference;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ai$b;->Yc:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$b;->XK:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$b;->Yc:Lcom/facebook/common/references/CloseableReference;
 
     monitor-exit p0
     :try_end_0
@@ -121,7 +121,7 @@
     monitor-enter p0
 
     :try_start_1
-    iget-boolean p1, p0, Lcom/facebook/imagepipeline/h/ai$b;->Hb:Z
+    iget-boolean p1, p0, Lcom/facebook/imagepipeline/h/ai$b;->Hs:Z
 
     if-eqz p1, :cond_1
 
@@ -130,7 +130,7 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ai$b;->XK:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ai$b;->Yc:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -141,7 +141,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    iget-object p2, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     const/4 v0, 0x0
 
@@ -184,13 +184,13 @@
     return-void
 .end method
 
-.method final fX()Z
+.method final gb()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$b;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ai$b;->Hs:Z
 
     if-eqz v0, :cond_0
 
@@ -201,15 +201,15 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$b;->XK:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$b;->Yc:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/h/ai$b;->XK:Lcom/facebook/common/references/CloseableReference;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/h/ai$b;->Yc:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/h/ai$b;->Hb:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/h/ai$b;->Hs:Z
 
     monitor-exit p0
     :try_end_0
@@ -233,13 +233,13 @@
 .method protected final h(Ljava/lang/Throwable;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ai$b;->fX()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ai$b;->gb()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/h/k;->i(Ljava/lang/Throwable;)V
 
@@ -247,18 +247,18 @@
     return-void
 .end method
 
-.method protected final iy()V
+.method protected final ix()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ai$b;->fX()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/ai$b;->gb()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fz()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fD()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/ak.smali b/com.discord/smali/com/facebook/imagepipeline/h/ak.smali
index 435fb9d255..f87a1362e8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/ak.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/ak.smali
@@ -13,20 +13,20 @@
 .method public abstract isPrefetch()Z
 .end method
 
-.method public abstract jm()Lcom/facebook/imagepipeline/request/b;
+.method public abstract jk()Lcom/facebook/imagepipeline/request/b;
 .end method
 
-.method public abstract jn()Lcom/facebook/imagepipeline/h/am;
+.method public abstract jl()Lcom/facebook/imagepipeline/h/am;
 .end method
 
-.method public abstract jo()Ljava/lang/Object;
+.method public abstract jm()Ljava/lang/Object;
 .end method
 
-.method public abstract jp()Lcom/facebook/imagepipeline/request/b$b;
+.method public abstract jn()Lcom/facebook/imagepipeline/request/b$b;
 .end method
 
-.method public abstract jq()Lcom/facebook/imagepipeline/a/d;
+.method public abstract jo()Lcom/facebook/imagepipeline/a/d;
 .end method
 
-.method public abstract jr()Z
+.method public abstract jp()Z
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/am.smali b/com.discord/smali/com/facebook/imagepipeline/h/am.smali
index 4816d5539e..49d5b5f796 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/am.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/am.smali
@@ -44,7 +44,7 @@
 .method public abstract a(Ljava/lang/String;Ljava/lang/String;Z)V
 .end method
 
-.method public abstract aB(Ljava/lang/String;)Z
+.method public abstract aw(Ljava/lang/String;)Z
 .end method
 
 .method public abstract b(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/ao$a.smali b/com.discord/smali/com/facebook/imagepipeline/h/ao$a.smali
index 600fcae133..a846fc24a0 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/ao$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/ao$a.smali
@@ -24,17 +24,17 @@
 
 
 # instance fields
-.field final SJ:Lcom/facebook/imagepipeline/j/d;
+.field final Tc:Lcom/facebook/imagepipeline/j/d;
 
-.field Wh:Z
+.field final WI:Lcom/facebook/imagepipeline/h/ak;
 
-.field final Wq:Lcom/facebook/imagepipeline/h/ak;
+.field final WO:Lcom/facebook/imagepipeline/h/u;
 
-.field final Ww:Lcom/facebook/imagepipeline/h/u;
+.field Wz:Z
 
-.field final XR:Z
+.field final Yj:Z
 
-.field final synthetic XS:Lcom/facebook/imagepipeline/h/ao;
+.field final synthetic Yk:Lcom/facebook/imagepipeline/h/ao;
 
 
 # direct methods
@@ -53,23 +53,23 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ao$a;->XS:Lcom/facebook/imagepipeline/h/ao;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ao$a;->Yk:Lcom/facebook/imagepipeline/h/ao;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/ao$a;->Wh:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/ao$a;->Wz:Z
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/facebook/imagepipeline/request/b;->Yw:Ljava/lang/Boolean;
+    iget-object p3, p3, Lcom/facebook/imagepipeline/request/b;->YO:Ljava/lang/Boolean;
 
     if-eqz p3, :cond_0
 
@@ -78,9 +78,9 @@
     move-result p4
 
     :cond_0
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/h/ao$a;->XR:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/h/ao$a;->Yj:Z
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/h/ao$a;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/h/ao$a;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     new-instance p3, Lcom/facebook/imagepipeline/h/ao$a$1;
 
@@ -94,9 +94,9 @@
 
     invoke-direct {p4, p5, p3, v0}, Lcom/facebook/imagepipeline/h/u;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/imagepipeline/h/u$a;I)V
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/h/ao$a;->Ww:Lcom/facebook/imagepipeline/h/u;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/h/ao$a;->WO:Lcom/facebook/imagepipeline/h/u;
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     new-instance p4, Lcom/facebook/imagepipeline/h/ao$a$2;
 
@@ -120,7 +120,7 @@
 
     if-eqz v0, :cond_0
 
-    iput p1, v0, Lcom/facebook/imagepipeline/f/e;->LP:I
+    iput p1, v0, Lcom/facebook/imagepipeline/f/e;->Mh:I
 
     :cond_0
     return-object v0
@@ -137,7 +137,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/f/e;
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ao$a;->Wh:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/ao$a;->Wz:Z
 
     if-nez v0, :cond_11
 
@@ -151,7 +151,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     const/4 p2, 0x0
 
@@ -161,19 +161,19 @@
     return-void
 
     :cond_1
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ao$a;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ao$a;->Tc:Lcom/facebook/imagepipeline/j/d;
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/h/ao$a;->XR:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/h/ao$a;->Yj:Z
 
     invoke-interface {v4, v2, v5}, Lcom/facebook/imagepipeline/j/d;->createImageTranscoder(Lcom/facebook/d/c;Z)Lcom/facebook/imagepipeline/j/c;
 
@@ -189,18 +189,18 @@
 
     if-eqz p1, :cond_a
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object v6
 
-    sget-object v7, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object v7, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
     if-ne v6, v7, :cond_2
 
     goto :goto_4
 
     :cond_2
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object v6
 
@@ -210,14 +210,14 @@
 
     if-nez v6, :cond_3
 
-    sget-object v1, Lcom/facebook/common/j/e;->HD:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->HU:Lcom/facebook/common/j/e;
 
     goto :goto_5
 
     :cond_3
-    iget-object v6, v3, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v6, v3, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    iget-boolean v7, v6, Lcom/facebook/imagepipeline/a/f;->Sh:Z
+    iget-boolean v7, v6, Lcom/facebook/imagepipeline/a/f;->Sz:Z
 
     if-nez v7, :cond_7
 
@@ -227,22 +227,22 @@
 
     if-nez v7, :cond_6
 
-    invoke-virtual {v6}, Lcom/facebook/imagepipeline/a/f;->hN()Z
+    invoke-virtual {v6}, Lcom/facebook/imagepipeline/a/f;->hQ()Z
 
     move-result v7
 
     if-eqz v7, :cond_5
 
-    iget-boolean v6, v6, Lcom/facebook/imagepipeline/a/f;->Sh:Z
+    iget-boolean v6, v6, Lcom/facebook/imagepipeline/a/f;->Sz:Z
 
     if-eqz v6, :cond_4
 
     goto :goto_0
 
     :cond_4
-    sget-object v6, Lcom/facebook/imagepipeline/j/e;->YJ:Lcom/facebook/common/d/e;
+    sget-object v6, Lcom/facebook/imagepipeline/j/e;->Zb:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iI()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iH()I
 
     move-result v7
 
@@ -258,7 +258,7 @@
 
     :cond_5
     :goto_0
-    iput v5, p1, Lcom/facebook/imagepipeline/f/e;->LQ:I
+    iput v5, p1, Lcom/facebook/imagepipeline/f/e;->Mi:I
 
     const/4 v6, 0x0
 
@@ -276,9 +276,9 @@
     :goto_2
     if-nez v6, :cond_9
 
-    iget-object v6, v3, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v6, v3, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     invoke-interface {v4, p1, v6, v3}, Lcom/facebook/imagepipeline/j/c;->a(Lcom/facebook/imagepipeline/f/e;Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;)Z
 
@@ -293,7 +293,7 @@
 
     :cond_9
     :goto_3
-    invoke-static {v1}, Lcom/facebook/common/j/e;->v(Z)Lcom/facebook/common/j/e;
+    invoke-static {v1}, Lcom/facebook/common/j/e;->t(Z)Lcom/facebook/common/j/e;
 
     move-result-object v1
 
@@ -301,52 +301,52 @@
 
     :cond_a
     :goto_4
-    sget-object v1, Lcom/facebook/common/j/e;->HE:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->HV:Lcom/facebook/common/j/e;
 
     :goto_5
     if-nez v0, :cond_b
 
-    sget-object v3, Lcom/facebook/common/j/e;->HE:Lcom/facebook/common/j/e;
+    sget-object v3, Lcom/facebook/common/j/e;->HV:Lcom/facebook/common/j/e;
 
     if-eq v1, v3, :cond_11
 
     :cond_b
-    sget-object v3, Lcom/facebook/common/j/e;->HC:Lcom/facebook/common/j/e;
+    sget-object v3, Lcom/facebook/common/j/e;->HT:Lcom/facebook/common/j/e;
 
     if-eq v1, v3, :cond_f
 
-    sget-object v0, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
     if-eq v2, v0, :cond_d
 
-    sget-object v0, Lcom/facebook/d/b;->PC:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PU:Lcom/facebook/d/c;
 
     if-ne v2, v0, :cond_c
 
     goto :goto_6
 
     :cond_c
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->hM()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->hP()Z
 
     move-result v1
 
     if-nez v1, :cond_e
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->hN()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->hQ()Z
 
     move-result v1
 
     if-eqz v1, :cond_e
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->hO()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->hR()I
 
     move-result v0
 
@@ -358,25 +358,25 @@
 
     :cond_d
     :goto_6
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/a/f;->Sh:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/a/f;->Sz:Z
 
     if-nez v0, :cond_e
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iH()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()I
 
     move-result v0
 
     if-eqz v0, :cond_e
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iH()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()I
 
     move-result v0
 
@@ -390,14 +390,14 @@
 
     :cond_e
     :goto_7
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
     return-void
 
     :cond_f
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ao$a;->Ww:Lcom/facebook/imagepipeline/h/u;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ao$a;->WO:Lcom/facebook/imagepipeline/h/u;
 
     invoke-virtual {v1, p1, p2}, Lcom/facebook/imagepipeline/h/u;->c(Lcom/facebook/imagepipeline/f/e;I)Z
 
@@ -407,18 +407,18 @@
 
     if-nez v0, :cond_10
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jr()Z
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jp()Z
 
     move-result p1
 
     if-eqz p1, :cond_11
 
     :cond_10
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ao$a;->Ww:Lcom/facebook/imagepipeline/h/u;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ao$a;->WO:Lcom/facebook/imagepipeline/h/u;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/h/u;->jA()Z
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/h/u;->jy()Z
 
     :cond_11
     return-void
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/aq.smali b/com.discord/smali/com/facebook/imagepipeline/h/aq.smali
index a801c1ecf4..a860b4e50b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/aq.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/aq.smali
@@ -16,9 +16,9 @@
 
 
 # instance fields
-.field private final IV:Ljava/lang/String;
+.field private final Jm:Ljava/lang/String;
 
-.field private final WC:Lcom/facebook/imagepipeline/h/k;
+.field private final WV:Lcom/facebook/imagepipeline/h/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/k<",
@@ -27,9 +27,9 @@
     .end annotation
 .end field
 
-.field private final Wd:Lcom/facebook/imagepipeline/h/am;
+.field private final Wv:Lcom/facebook/imagepipeline/h/am;
 
-.field private final XV:Ljava/lang/String;
+.field private final Yn:Ljava/lang/String;
 
 
 # direct methods
@@ -49,19 +49,19 @@
 
     invoke-direct {p0}, Lcom/facebook/common/b/h;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/aq;->WC:Lcom/facebook/imagepipeline/h/k;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/aq;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/aq;->Wd:Lcom/facebook/imagepipeline/h/am;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/aq;->Wv:Lcom/facebook/imagepipeline/h/am;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/aq;->XV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/aq;->Yn:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/h/aq;->IV:Ljava/lang/String;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/h/aq;->Jm:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/aq;->Wd:Lcom/facebook/imagepipeline/h/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/aq;->Wv:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/h/aq;->IV:Ljava/lang/String;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/aq;->Jm:Ljava/lang/String;
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/h/aq;->XV:Ljava/lang/String;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/h/aq;->Yn:Ljava/lang/String;
 
     invoke-interface {p1, p2, p3}, Lcom/facebook/imagepipeline/h/am;->u(Ljava/lang/String;Ljava/lang/String;)V
 
@@ -90,24 +90,24 @@
     return-object p1
 .end method
 
-.method public fz()V
+.method public fD()V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/aq;->Wd:Lcom/facebook/imagepipeline/h/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/aq;->Wv:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/aq;->IV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/aq;->Jm:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/aq;->XV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/aq;->Yn:Ljava/lang/String;
 
-    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     const/4 v3, 0x0
 
     invoke-interface {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/h/am;->b(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/aq;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/aq;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fz()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fD()V
 
     return-void
 .end method
@@ -115,19 +115,19 @@
 .method public onFailure(Ljava/lang/Exception;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/aq;->Wd:Lcom/facebook/imagepipeline/h/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/aq;->Wv:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/aq;->IV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/aq;->Jm:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/aq;->XV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/aq;->Yn:Ljava/lang/String;
 
-    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     const/4 v3, 0x0
 
     invoke-interface {v0, v1, v2, p1, v3}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/aq;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/aq;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/h/k;->i(Ljava/lang/Throwable;)V
 
@@ -142,13 +142,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/aq;->Wd:Lcom/facebook/imagepipeline/h/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/aq;->Wv:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/aq;->IV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/aq;->Jm:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/aq;->XV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/aq;->Yn:Ljava/lang/String;
 
-    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result v3
 
@@ -166,7 +166,7 @@
     :goto_0
     invoke-interface {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/aq;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/aq;->WV:Lcom/facebook/imagepipeline/h/k;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/ar$1.smali b/com.discord/smali/com/facebook/imagepipeline/h/ar$1.smali
index b1288d3911..5a62166dca 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/ar$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/ar$1.smali
@@ -22,30 +22,30 @@
 
 
 # instance fields
-.field final synthetic WE:Ljava/lang/String;
+.field final synthetic WX:Ljava/lang/String;
 
-.field final synthetic WF:Lcom/facebook/imagepipeline/h/k;
+.field final synthetic WY:Lcom/facebook/imagepipeline/h/k;
 
-.field final synthetic XW:Lcom/facebook/imagepipeline/h/am;
+.field final synthetic Yo:Lcom/facebook/imagepipeline/h/am;
 
-.field final synthetic XX:Lcom/facebook/imagepipeline/h/ak;
+.field final synthetic Yp:Lcom/facebook/imagepipeline/h/ak;
 
-.field final synthetic XY:Lcom/facebook/imagepipeline/h/ar;
+.field final synthetic Yq:Lcom/facebook/imagepipeline/h/ar;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ar;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ar$1;->XY:Lcom/facebook/imagepipeline/h/ar;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ar$1;->Yq:Lcom/facebook/imagepipeline/h/ar;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/h/ar$1;->XW:Lcom/facebook/imagepipeline/h/am;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/h/ar$1;->Yo:Lcom/facebook/imagepipeline/h/am;
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/h/ar$1;->WE:Ljava/lang/String;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/h/ar$1;->WX:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/h/ar$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/h/ar$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
-    iput-object p9, p0, Lcom/facebook/imagepipeline/h/ar$1;->XX:Lcom/facebook/imagepipeline/h/ak;
+    iput-object p9, p0, Lcom/facebook/imagepipeline/h/ar$1;->Yp:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-direct {p0, p2, p3, p4, p5}, Lcom/facebook/imagepipeline/h/aq;-><init>(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -84,9 +84,9 @@
         }
     .end annotation
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ar$1;->XW:Lcom/facebook/imagepipeline/h/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ar$1;->Yo:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ar$1;->WE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ar$1;->WX:Ljava/lang/String;
 
     const-string v1, "BackgroundThreadHandoffProducer"
 
@@ -94,13 +94,13 @@
 
     invoke-interface {p1, v0, v1, v2}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ar$1;->XY:Lcom/facebook/imagepipeline/h/ar;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ar$1;->Yq:Lcom/facebook/imagepipeline/h/ar;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/h/ar;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/h/ar;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ar$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ar$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ar$1;->XX:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ar$1;->Yp:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {p1, v0, v1}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/ax$a.smali b/com.discord/smali/com/facebook/imagepipeline/h/ax$a.smali
index e9c69cd366..c82ed34ea1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/ax$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/ax$a.smali
@@ -24,11 +24,11 @@
 
 
 # instance fields
-.field private final WJ:Lcom/facebook/imagepipeline/h/ak;
+.field private final Xc:Lcom/facebook/imagepipeline/h/ak;
 
-.field final synthetic Ym:Lcom/facebook/imagepipeline/h/ax;
+.field final synthetic YE:Lcom/facebook/imagepipeline/h/ax;
 
-.field private Yn:Lcom/facebook/common/j/e;
+.field private YF:Lcom/facebook/common/j/e;
 
 
 # direct methods
@@ -45,15 +45,15 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ax$a;->Ym:Lcom/facebook/imagepipeline/h/ax;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ax$a;->YE:Lcom/facebook/imagepipeline/h/ax;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ax$a;->WJ:Lcom/facebook/imagepipeline/h/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ax$a;->Xc:Lcom/facebook/imagepipeline/h/ak;
 
-    sget-object p1, Lcom/facebook/common/j/e;->HE:Lcom/facebook/common/j/e;
+    sget-object p1, Lcom/facebook/common/j/e;->HV:Lcom/facebook/common/j/e;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ax$a;->Yn:Lcom/facebook/common/j/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ax$a;->YF:Lcom/facebook/common/j/e;
 
     return-void
 .end method
@@ -69,9 +69,9 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/f/e;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$a;->Yn:Lcom/facebook/common/j/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$a;->YF:Lcom/facebook/common/j/e;
 
-    sget-object v1, Lcom/facebook/common/j/e;->HE:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->HV:Lcom/facebook/common/j/e;
 
     if-ne v0, v1, :cond_2
 
@@ -93,7 +93,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->jk()Lcom/facebook/imagepipeline/nativecode/e;
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->ji()Lcom/facebook/imagepipeline/nativecode/e;
 
     move-result-object v1
 
@@ -105,31 +105,31 @@
 
     xor-int/lit8 v0, v0, 0x1
 
-    invoke-static {v0}, Lcom/facebook/common/j/e;->v(Z)Lcom/facebook/common/j/e;
+    invoke-static {v0}, Lcom/facebook/common/j/e;->t(Z)Lcom/facebook/common/j/e;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object v1, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
     if-ne v0, v1, :cond_1
 
-    sget-object v0, Lcom/facebook/common/j/e;->HE:Lcom/facebook/common/j/e;
+    sget-object v0, Lcom/facebook/common/j/e;->HV:Lcom/facebook/common/j/e;
 
     goto :goto_0
 
     :cond_1
-    sget-object v0, Lcom/facebook/common/j/e;->HD:Lcom/facebook/common/j/e;
+    sget-object v0, Lcom/facebook/common/j/e;->HU:Lcom/facebook/common/j/e;
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/imagepipeline/h/ax$a;->Yn:Lcom/facebook/common/j/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/h/ax$a;->YF:Lcom/facebook/common/j/e;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$a;->Yn:Lcom/facebook/common/j/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$a;->YF:Lcom/facebook/common/j/e;
 
-    sget-object v1, Lcom/facebook/common/j/e;->HD:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->HU:Lcom/facebook/common/j/e;
 
     if-eq v0, v1, :cond_3
 
@@ -139,19 +139,19 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$a;->Yn:Lcom/facebook/common/j/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$a;->YF:Lcom/facebook/common/j/e;
 
-    sget-object v1, Lcom/facebook/common/j/e;->HC:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->HT:Lcom/facebook/common/j/e;
 
     if-ne v0, v1, :cond_3
 
     if-eqz p1, :cond_3
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ax$a;->Ym:Lcom/facebook/imagepipeline/h/ax;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ax$a;->YE:Lcom/facebook/imagepipeline/h/ax;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$a;->WJ:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$a;->Xc:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -161,7 +161,7 @@
 
     new-instance p1, Lcom/facebook/imagepipeline/h/ax$1;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v5
 
@@ -184,7 +184,7 @@
     return-void
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/b.smali b/com.discord/smali/com/facebook/imagepipeline/h/b.smali
index d03f591996..f4f34888af 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/b.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private Wc:Z
+.field private Wu:Z
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wc:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wu:Z
 
     return-void
 .end method
@@ -103,7 +103,7 @@
     return-void
 .end method
 
-.method public static o(II)Z
+.method public static n(II)Z
     .locals 0
 
     and-int/2addr p0, p1
@@ -145,7 +145,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wc:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wu:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -161,7 +161,7 @@
 
     move-result v0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wc:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wu:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -195,13 +195,13 @@
     throw p1
 .end method
 
-.method public final declared-synchronized fz()V
+.method public final declared-synchronized fD()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wc:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wu:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -215,12 +215,12 @@
     const/4 v0, 0x1
 
     :try_start_1
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wc:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wu:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/b;->iy()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/b;->ix()V
     :try_end_2
     .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
@@ -258,7 +258,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wc:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wu:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -272,7 +272,7 @@
     const/4 v0, 0x1
 
     :try_start_1
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wc:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wu:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -306,22 +306,22 @@
     throw p1
 .end method
 
-.method protected abstract iy()V
+.method protected abstract ix()V
 .end method
 
-.method protected m(F)V
+.method protected l(F)V
     .locals 0
 
     return-void
 .end method
 
-.method public final declared-synchronized n(F)V
+.method public final declared-synchronized m(F)V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wc:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/b;->Wu:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -333,7 +333,7 @@
 
     :cond_0
     :try_start_1
-    invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/h/b;->m(F)V
+    invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/h/b;->l(F)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
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/d.smali b/com.discord/smali/com/facebook/imagepipeline/h/d.smali
index 5dcbe1bcdd..72c2cd3002 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/d.smali
@@ -7,21 +7,21 @@
 
 
 # instance fields
-.field public final IW:Ljava/lang/Object;
+.field public final Jn:Ljava/lang/Object;
 
-.field public final IX:Lcom/facebook/imagepipeline/request/b;
+.field public final Jo:Lcom/facebook/imagepipeline/request/b;
 
-.field private Jg:Z
+.field private Jx:Z
 
-.field private final Wd:Lcom/facebook/imagepipeline/h/am;
+.field private final Wv:Lcom/facebook/imagepipeline/h/am;
 
-.field private final We:Lcom/facebook/imagepipeline/request/b$b;
+.field private final Ww:Lcom/facebook/imagepipeline/request/b$b;
 
-.field private Wf:Lcom/facebook/imagepipeline/a/d;
+.field private Wx:Lcom/facebook/imagepipeline/a/d;
 
-.field private Wg:Z
+.field private Wy:Z
 
-.field private Wh:Z
+.field private Wz:Z
 
 .field private final mCallbacks:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
@@ -42,25 +42,25 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/d;->IX:Lcom/facebook/imagepipeline/request/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/d;->Jo:Lcom/facebook/imagepipeline/request/b;
 
     iput-object p2, p0, Lcom/facebook/imagepipeline/h/d;->mId:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/d;->Wd:Lcom/facebook/imagepipeline/h/am;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/d;->Wv:Lcom/facebook/imagepipeline/h/am;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/h/d;->IW:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/h/d;->Jn:Ljava/lang/Object;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/h/d;->We:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/h/d;->Ww:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-boolean p6, p0, Lcom/facebook/imagepipeline/h/d;->Jg:Z
+    iput-boolean p6, p0, Lcom/facebook/imagepipeline/h/d;->Jx:Z
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/h/d;->Wf:Lcom/facebook/imagepipeline/a/d;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/h/d;->Wx:Lcom/facebook/imagepipeline/a/d;
 
-    iput-boolean p7, p0, Lcom/facebook/imagepipeline/h/d;->Wg:Z
+    iput-boolean p7, p0, Lcom/facebook/imagepipeline/h/d;->Wy:Z
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/h/d;->Wh:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/h/d;->Wz:Z
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -108,7 +108,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/h/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/al;->jt()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/al;->jr()V
 
     goto :goto_0
 
@@ -153,7 +153,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/h/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/al;->ju()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/al;->js()V
 
     goto :goto_0
 
@@ -198,7 +198,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/h/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/al;->jv()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/al;->jt()V
 
     goto :goto_0
 
@@ -243,7 +243,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/h/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/al;->jw()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/al;->ju()V
 
     goto :goto_0
 
@@ -253,112 +253,6 @@
 
 
 # virtual methods
-.method public final declared-synchronized A(Z)Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(Z)",
-            "Ljava/util/List<",
-            "Lcom/facebook/imagepipeline/h/al;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Jg:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-ne p1, v0, :cond_0
-
-    const/4 p1, 0x0
-
-    monitor-exit p0
-
-    return-object p1
-
-    :cond_0
-    :try_start_1
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/h/d;->Jg:Z
-
-    new-instance p1, Ljava/util/ArrayList;
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->mCallbacks:Ljava/util/List;
-
-    invoke-direct {p1, v0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :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 B(Z)Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(Z)",
-            "Ljava/util/List<",
-            "Lcom/facebook/imagepipeline/h/al;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Wg:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-ne p1, v0, :cond_0
-
-    const/4 p1, 0x0
-
-    monitor-exit p0
-
-    return-object p1
-
-    :cond_0
-    :try_start_1
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/h/d;->Wg:Z
-
-    new-instance p1, Ljava/util/ArrayList;
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->mCallbacks:Ljava/util/List;
-
-    invoke-direct {p1, v0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :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 a(Lcom/facebook/imagepipeline/a/d;)Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -378,7 +272,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->Wf:Lcom/facebook/imagepipeline/a/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->Wx:Lcom/facebook/imagepipeline/a/d;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -392,7 +286,7 @@
 
     :cond_0
     :try_start_1
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/d;->Wf:Lcom/facebook/imagepipeline/a/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/d;->Wx:Lcom/facebook/imagepipeline/a/d;
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -424,7 +318,7 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Wh:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Wz:Z
 
     monitor-exit p0
     :try_end_0
@@ -432,7 +326,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/al;->jt()V
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/al;->jr()V
 
     :cond_0
     return-void
@@ -462,7 +356,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Jg:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Jx:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -478,45 +372,45 @@
     throw v0
 .end method
 
-.method public final jm()Lcom/facebook/imagepipeline/request/b;
+.method public final jk()Lcom/facebook/imagepipeline/request/b;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->IX:Lcom/facebook/imagepipeline/request/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->Jo:Lcom/facebook/imagepipeline/request/b;
 
     return-object v0
 .end method
 
-.method public final jn()Lcom/facebook/imagepipeline/h/am;
+.method public final jl()Lcom/facebook/imagepipeline/h/am;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->Wd:Lcom/facebook/imagepipeline/h/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->Wv:Lcom/facebook/imagepipeline/h/am;
 
     return-object v0
 .end method
 
-.method public final jo()Ljava/lang/Object;
+.method public final jm()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->IW:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->Jn:Ljava/lang/Object;
 
     return-object v0
 .end method
 
-.method public final jp()Lcom/facebook/imagepipeline/request/b$b;
+.method public final jn()Lcom/facebook/imagepipeline/request/b$b;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->We:Lcom/facebook/imagepipeline/request/b$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->Ww:Lcom/facebook/imagepipeline/request/b$b;
 
     return-object v0
 .end method
 
-.method public final declared-synchronized jq()Lcom/facebook/imagepipeline/a/d;
+.method public final declared-synchronized jo()Lcom/facebook/imagepipeline/a/d;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->Wf:Lcom/facebook/imagepipeline/a/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->Wx:Lcom/facebook/imagepipeline/a/d;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -532,13 +426,13 @@
     throw v0
 .end method
 
-.method public final declared-synchronized jr()Z
+.method public final declared-synchronized jp()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Wg:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Wy:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -554,7 +448,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized js()Ljava/util/List;
+.method public final declared-synchronized jq()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -571,7 +465,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Wh:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Wz:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -587,7 +481,7 @@
     const/4 v0, 0x1
 
     :try_start_1
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Wh:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Wz:Z
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -608,3 +502,109 @@
 
     throw v0
 .end method
+
+.method public final declared-synchronized y(Z)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(Z)",
+            "Ljava/util/List<",
+            "Lcom/facebook/imagepipeline/h/al;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Jx:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-ne p1, v0, :cond_0
+
+    const/4 p1, 0x0
+
+    monitor-exit p0
+
+    return-object p1
+
+    :cond_0
+    :try_start_1
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/h/d;->Jx:Z
+
+    new-instance p1, Ljava/util/ArrayList;
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->mCallbacks:Ljava/util/List;
+
+    invoke-direct {p1, v0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :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 z(Z)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(Z)",
+            "Ljava/util/List<",
+            "Lcom/facebook/imagepipeline/h/al;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/d;->Wy:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-ne p1, v0, :cond_0
+
+    const/4 p1, 0x0
+
+    monitor-exit p0
+
+    return-object p1
+
+    :cond_0
+    :try_start_1
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/h/d;->Wy:Z
+
+    new-instance p1, Ljava/util/ArrayList;
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/d;->mCallbacks:Ljava/util/List;
+
+    invoke-direct {p1, v0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :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/com/facebook/imagepipeline/h/k.smali b/com.discord/smali/com/facebook/imagepipeline/h/k.smali
index 9807fe0ac2..2d1560970d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/k.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/k.smali
@@ -23,11 +23,11 @@
     .end annotation
 .end method
 
-.method public abstract fz()V
+.method public abstract fD()V
 .end method
 
 .method public abstract i(Ljava/lang/Throwable;)V
 .end method
 
-.method public abstract n(F)V
+.method public abstract m(F)V
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/m$c.smali b/com.discord/smali/com/facebook/imagepipeline/h/m$c.smali
index 66f8e5729c..a9703050e3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/m$c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/m$c.smali
@@ -25,19 +25,19 @@
 
 
 # instance fields
-.field private final QP:Lcom/facebook/imagepipeline/a/b;
+.field private final Rh:Lcom/facebook/imagepipeline/a/b;
 
 .field private final TAG:Ljava/lang/String;
 
-.field private Wc:Z
+.field final WI:Lcom/facebook/imagepipeline/h/ak;
 
-.field private final Wd:Lcom/facebook/imagepipeline/h/am;
+.field final synthetic WL:Lcom/facebook/imagepipeline/h/m;
 
-.field final Wq:Lcom/facebook/imagepipeline/h/ak;
+.field final WO:Lcom/facebook/imagepipeline/h/u;
 
-.field final synthetic Wt:Lcom/facebook/imagepipeline/h/m;
+.field private Wu:Z
 
-.field final Ww:Lcom/facebook/imagepipeline/h/u;
+.field private final Wv:Lcom/facebook/imagepipeline/h/am;
 
 
 # direct methods
@@ -55,7 +55,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$c;->Wt:Lcom/facebook/imagepipeline/h/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$c;->WL:Lcom/facebook/imagepipeline/h/m;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
@@ -63,25 +63,25 @@
 
     iput-object p2, p0, Lcom/facebook/imagepipeline/h/m$c;->TAG:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/m$c;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/m$c;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/m$c;->Wd:Lcom/facebook/imagepipeline/h/am;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/m$c;->Wv:Lcom/facebook/imagepipeline/h/am;
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/facebook/imagepipeline/request/b;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object p2, p2, Lcom/facebook/imagepipeline/request/b;->Rh:Lcom/facebook/imagepipeline/a/b;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/m$c;->QP:Lcom/facebook/imagepipeline/a/b;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/m$c;->Rh:Lcom/facebook/imagepipeline/a/b;
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/h/m$c;->Wc:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/h/m$c;->Wu:Z
 
     new-instance p2, Lcom/facebook/imagepipeline/h/m$c$1;
 
@@ -91,15 +91,15 @@
 
     iget-object p5, p1, Lcom/facebook/imagepipeline/h/m;->mExecutor:Ljava/util/concurrent/Executor;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c;->Rh:Lcom/facebook/imagepipeline/a/b;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/a/b;->RJ:I
+    iget v0, v0, Lcom/facebook/imagepipeline/a/b;->Sb:I
 
     invoke-direct {p3, p5, p2, v0}, Lcom/facebook/imagepipeline/h/u;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/imagepipeline/h/u$a;I)V
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/m$c;->Ww:Lcom/facebook/imagepipeline/h/u;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/m$c;->WO:Lcom/facebook/imagepipeline/h/u;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/h/m$c;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/m$c;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     new-instance p3, Lcom/facebook/imagepipeline/h/m$c$2;
 
@@ -110,7 +110,7 @@
     return-void
 .end method
 
-.method private C(Z)V
+.method private A(Z)V
     .locals 1
 
     monitor-enter p0
@@ -118,30 +118,30 @@
     if-eqz p1, :cond_1
 
     :try_start_0
-    iget-boolean p1, p0, Lcom/facebook/imagepipeline/h/m$c;->Wc:Z
+    iget-boolean p1, p0, Lcom/facebook/imagepipeline/h/m$c;->Wu:Z
 
     if-eqz p1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    invoke-interface {p1, v0}, Lcom/facebook/imagepipeline/h/k;->n(F)V
+    invoke-interface {p1, v0}, Lcom/facebook/imagepipeline/h/k;->m(F)V
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/h/m$c;->Wc:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/h/m$c;->Wu:Z
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/m$c;->Ww:Lcom/facebook/imagepipeline/h/u;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/m$c;->WO:Lcom/facebook/imagepipeline/h/u;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/h/u;->jz()V
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/h/u;->jx()V
 
     return-void
 
@@ -202,15 +202,15 @@
 
     move-object/from16 v5, p9
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/h/m$c;->Wd:Lcom/facebook/imagepipeline/h/am;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/h/m$c;->Wv:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v7, v0, Lcom/facebook/imagepipeline/h/m$c;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v7, v0, Lcom/facebook/imagepipeline/h/m$c;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {v7}, Lcom/facebook/imagepipeline/h/ak;->getId()Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-interface {v6, v7}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {v6, v7}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result v6
 
@@ -225,7 +225,7 @@
 
     move-result-object v6
 
-    invoke-interface/range {p4 .. p4}, Lcom/facebook/imagepipeline/f/h;->iO()Z
+    invoke-interface/range {p4 .. p4}, Lcom/facebook/imagepipeline/f/h;->iN()Z
 
     move-result v7
 
@@ -356,11 +356,11 @@
 
     const-string v13, "DecodeProducer"
 
-    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object v1
 
-    sget-object v2, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v2, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
     if-eq v1, v2, :cond_1
 
@@ -392,7 +392,7 @@
     goto/16 :goto_9
 
     :cond_2
-    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object v1
 
@@ -434,7 +434,7 @@
 
     move-result-object v8
 
-    iget v1, v12, Lcom/facebook/imagepipeline/f/e;->Ut:I
+    iget v1, v12, Lcom/facebook/imagepipeline/f/e;->UL:I
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
@@ -450,7 +450,7 @@
 
     const/16 v5, 0x8
 
-    invoke-static {v0, v5}, Lcom/facebook/imagepipeline/h/m$c;->o(II)Z
+    invoke-static {v0, v5}, Lcom/facebook/imagepipeline/h/m$c;->n(II)Z
 
     move-result v5
 
@@ -466,17 +466,17 @@
     :goto_2
     const/4 v9, 0x4
 
-    invoke-static {v0, v9}, Lcom/facebook/imagepipeline/h/m$c;->o(II)Z
+    invoke-static {v0, v9}, Lcom/facebook/imagepipeline/h/m$c;->n(II)Z
 
     move-result v14
 
-    iget-object v15, v11, Lcom/facebook/imagepipeline/h/m$c;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v15, v11, Lcom/facebook/imagepipeline/h/m$c;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v15}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v15}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v15
 
-    iget-object v15, v15, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v15, v15, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     if-eqz v15, :cond_5
 
@@ -507,19 +507,19 @@
 
     :goto_3
     :try_start_0
-    iget-object v1, v11, Lcom/facebook/imagepipeline/h/m$c;->Ww:Lcom/facebook/imagepipeline/h/u;
+    iget-object v1, v11, Lcom/facebook/imagepipeline/h/m$c;->WO:Lcom/facebook/imagepipeline/h/u;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/h/u;->jC()J
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/h/u;->jA()J
 
     move-result-wide v17
 
-    iget-object v1, v11, Lcom/facebook/imagepipeline/h/m$c;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v1, v11, Lcom/facebook/imagepipeline/h/m$c;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -552,7 +552,7 @@
     goto :goto_6
 
     :cond_8
-    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/h/m$c;->iC()Lcom/facebook/imagepipeline/f/h;
+    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/h/m$c;->iB()Lcom/facebook/imagepipeline/f/h;
 
     move-result-object v3
 
@@ -560,14 +560,14 @@
 
     :cond_9
     :goto_6
-    sget-object v3, Lcom/facebook/imagepipeline/f/g;->Ux:Lcom/facebook/imagepipeline/f/h;
+    sget-object v3, Lcom/facebook/imagepipeline/f/g;->UQ:Lcom/facebook/imagepipeline/f/h;
 
     :goto_7
     move-object v5, v3
 
-    iget-object v3, v11, Lcom/facebook/imagepipeline/h/m$c;->Wd:Lcom/facebook/imagepipeline/h/am;
+    iget-object v3, v11, Lcom/facebook/imagepipeline/h/m$c;->Wv:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v14, v11, Lcom/facebook/imagepipeline/h/m$c;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v14, v11, Lcom/facebook/imagepipeline/h/m$c;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {v14}, Lcom/facebook/imagepipeline/h/ak;->getId()Ljava/lang/String;
 
@@ -578,11 +578,11 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object v14, v11, Lcom/facebook/imagepipeline/h/m$c;->Wt:Lcom/facebook/imagepipeline/h/m;
+    iget-object v14, v11, Lcom/facebook/imagepipeline/h/m$c;->WL:Lcom/facebook/imagepipeline/h/m;
 
-    iget-object v14, v14, Lcom/facebook/imagepipeline/h/m;->SI:Lcom/facebook/imagepipeline/d/c;
+    iget-object v14, v14, Lcom/facebook/imagepipeline/h/m;->Tb:Lcom/facebook/imagepipeline/d/c;
 
-    iget-object v3, v11, Lcom/facebook/imagepipeline/h/m$c;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object v3, v11, Lcom/facebook/imagepipeline/h/m$c;->Rh:Lcom/facebook/imagepipeline/a/b;
 
     invoke-interface {v14, v12, v2, v5, v3}, Lcom/facebook/imagepipeline/d/c;->a(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/c;
 
@@ -593,7 +593,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    iget v1, v12, Lcom/facebook/imagepipeline/f/e;->Ut:I
+    iget v1, v12, Lcom/facebook/imagepipeline/f/e;->UL:I
     :try_end_2
     .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
@@ -616,9 +616,9 @@
 
     move-result-object v1
 
-    iget-object v2, v11, Lcom/facebook/imagepipeline/h/m$c;->Wd:Lcom/facebook/imagepipeline/h/am;
+    iget-object v2, v11, Lcom/facebook/imagepipeline/h/m$c;->Wv:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v3, v11, Lcom/facebook/imagepipeline/h/m$c;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v3, v11, Lcom/facebook/imagepipeline/h/m$c;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {v3}, Lcom/facebook/imagepipeline/h/ak;->getId()Ljava/lang/String;
 
@@ -637,9 +637,9 @@
 
     move-result v2
 
-    invoke-direct {v11, v2}, Lcom/facebook/imagepipeline/h/m$c;->C(Z)V
+    invoke-direct {v11, v2}, Lcom/facebook/imagepipeline/h/m$c;->A(Z)V
 
-    iget-object v2, v11, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v2, v11, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v2, v1, v0}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
     :try_end_4
@@ -702,7 +702,7 @@
 
     const/4 v1, 0x2
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/f/e;->iJ()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/f/e;->iI()Ljava/lang/String;
 
     move-result-object v4
 
@@ -739,9 +739,9 @@
 
     move-result-object v1
 
-    iget-object v2, v11, Lcom/facebook/imagepipeline/h/m$c;->Wd:Lcom/facebook/imagepipeline/h/am;
+    iget-object v2, v11, Lcom/facebook/imagepipeline/h/m$c;->Wv:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v3, v11, Lcom/facebook/imagepipeline/h/m$c;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v3, v11, Lcom/facebook/imagepipeline/h/m$c;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {v3}, Lcom/facebook/imagepipeline/h/ak;->getId()Ljava/lang/String;
 
@@ -774,9 +774,9 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/h/m$c;->C(Z)V
+    invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/h/m$c;->A(Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/h/k;->i(Ljava/lang/Throwable;)V
 
@@ -789,7 +789,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/m$c;->Wc:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/m$c;->Wu:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -859,7 +859,7 @@
     const/4 p1, 0x4
 
     :try_start_2
-    invoke-static {p2, p1}, Lcom/facebook/imagepipeline/h/m$c;->o(II)Z
+    invoke-static {p2, p1}, Lcom/facebook/imagepipeline/h/m$c;->n(II)Z
 
     move-result p1
 
@@ -867,18 +867,18 @@
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/m$c;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/m$c;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jr()Z
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jp()Z
 
     move-result p1
 
     if-eqz p1, :cond_3
 
     :cond_2
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/m$c;->Ww:Lcom/facebook/imagepipeline/h/u;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/m$c;->WO:Lcom/facebook/imagepipeline/h/u;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/h/u;->jA()Z
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/h/u;->jy()Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -898,7 +898,7 @@
 .method protected a(Lcom/facebook/imagepipeline/f/e;I)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c;->Ww:Lcom/facebook/imagepipeline/h/u;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c;->WO:Lcom/facebook/imagepipeline/h/u;
 
     invoke-virtual {v0, p1, p2}, Lcom/facebook/imagepipeline/h/u;->c(Lcom/facebook/imagepipeline/f/e;I)Z
 
@@ -918,39 +918,39 @@
     return-void
 .end method
 
-.method protected abstract iC()Lcom/facebook/imagepipeline/f/h;
+.method protected abstract iB()Lcom/facebook/imagepipeline/f/h;
 .end method
 
-.method public final iy()V
+.method public final ix()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/m$c;->jy()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/m$c;->jw()V
 
     return-void
 .end method
 
-.method final jy()V
+.method final jw()V
     .locals 1
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/h/m$c;->C(Z)V
+    invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/h/m$c;->A(Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fz()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fD()V
 
     return-void
 .end method
 
-.method protected final m(F)V
+.method protected final l(F)V
     .locals 1
 
     const v0, 0x3f7d70a4    # 0.99f
 
     mul-float p1, p1, v0
 
-    invoke-super {p0, p1}, Lcom/facebook/imagepipeline/h/n;->m(F)V
+    invoke-super {p0, p1}, Lcom/facebook/imagepipeline/h/n;->l(F)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/n.smali b/com.discord/smali/com/facebook/imagepipeline/h/n.smali
index b7f5abb05c..040190d52e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/n.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/n.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final WC:Lcom/facebook/imagepipeline/h/k;
+.field final WV:Lcom/facebook/imagepipeline/h/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/k<",
@@ -41,7 +41,7 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/b;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     return-void
 .end method
@@ -51,29 +51,29 @@
 .method protected h(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/h/k;->i(Ljava/lang/Throwable;)V
 
     return-void
 .end method
 
-.method protected iy()V
+.method protected ix()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fz()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fD()V
 
     return-void
 .end method
 
-.method protected m(F)V
+.method protected l(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/h/k;->n(F)V
+    invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/h/k;->m(F)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/o.smali b/com.discord/smali/com/facebook/imagepipeline/h/o.smali
index cfc779bbc9..99a710dd7d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/o.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/o.smali
@@ -18,13 +18,13 @@
 
 
 # instance fields
-.field private final Sw:Lcom/facebook/imagepipeline/cache/e;
+.field private final SO:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Sx:Lcom/facebook/imagepipeline/cache/f;
+.field private final SQ:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final TJ:Lcom/facebook/imagepipeline/cache/e;
+.field private final Ub:Lcom/facebook/imagepipeline/cache/e;
 
-.field final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -52,13 +52,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/o;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/o;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/o;->Sw:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/o;->SO:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/o;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/o;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/h/o;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/h/o;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     return-void
 .end method
@@ -81,7 +81,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-interface {p0, p1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {p0, p1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result p0
 
@@ -139,23 +139,23 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-boolean v1, v0, Lcom/facebook/imagepipeline/request/b;->Yu:Z
+    iget-boolean v1, v0, Lcom/facebook/imagepipeline/request/b;->YM:Z
 
     const/4 v2, 0x1
 
     if-nez v1, :cond_1
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jp()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v0
 
     iget v0, v0, Lcom/facebook/imagepipeline/request/b$b;->mValue:I
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YB:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YT:Lcom/facebook/imagepipeline/request/b$b;
 
     iget v1, v1, Lcom/facebook/imagepipeline/request/b$b;->mValue:I
 
@@ -168,14 +168,14 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
     return-void
 
     :cond_1
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v1
 
@@ -187,15 +187,15 @@
 
     invoke-interface {v1, v3, v4}, Lcom/facebook/imagepipeline/h/am;->u(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/o;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/o;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-interface {v1, v0}, Lcom/facebook/imagepipeline/cache/f;->a(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/cache/common/CacheKey;
 
     move-result-object v1
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Yo:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->YG:Lcom/facebook/imagepipeline/request/b$a;
 
-    sget-object v3, Lcom/facebook/imagepipeline/request/b$a;->Yx:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v3, Lcom/facebook/imagepipeline/request/b$a;->YP:Lcom/facebook/imagepipeline/request/b$a;
 
     const/4 v4, 0x0
 
@@ -209,12 +209,12 @@
     :goto_0
     if-eqz v2, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o;->Sw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o;->SO:Lcom/facebook/imagepipeline/cache/e;
 
     goto :goto_1
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
     :goto_1
     new-instance v2, Ljava/util/concurrent/atomic/AtomicBoolean;
@@ -229,7 +229,7 @@
 
     move-result-object v6
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v5
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/s.smali b/com.discord/smali/com/facebook/imagepipeline/h/s.smali
index b8989a474f..fdfc01f1f8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/s.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/s.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final WC:Lcom/facebook/imagepipeline/h/k;
+.field final WV:Lcom/facebook/imagepipeline/h/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/k<",
@@ -14,13 +14,13 @@
     .end annotation
 .end field
 
-.field final WJ:Lcom/facebook/imagepipeline/h/ak;
+.field final Xc:Lcom/facebook/imagepipeline/h/ak;
 
-.field WK:J
+.field Xd:J
 
-.field WL:I
+.field Xe:I
 
-.field WM:Lcom/facebook/imagepipeline/a/a;
+.field Xf:Lcom/facebook/imagepipeline/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -42,13 +42,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/s;->WC:Lcom/facebook/imagepipeline/h/k;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/s;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/s;->WJ:Lcom/facebook/imagepipeline/h/ak;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/s;->Xc:Lcom/facebook/imagepipeline/h/ak;
 
     const-wide/16 p1, 0x0
 
-    iput-wide p1, p0, Lcom/facebook/imagepipeline/h/s;->WK:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/h/s;->Xd:J
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 .method public final getId()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/s;->WJ:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/s;->Xc:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->getId()Ljava/lang/String;
 
@@ -67,12 +67,12 @@
     return-object v0
 .end method
 
-.method public final jn()Lcom/facebook/imagepipeline/h/am;
+.method public final jl()Lcom/facebook/imagepipeline/h/am;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/s;->WJ:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/s;->Xc:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/w.smali b/com.discord/smali/com/facebook/imagepipeline/h/w.smali
index e8f3b9aafd..a8f054a669 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/w.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/w.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final Xi:[Ljava/lang/String;
+.field private static final XA:[Ljava/lang/String;
 
 
 # instance fields
@@ -31,7 +31,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/facebook/imagepipeline/h/w;->Xi:[Ljava/lang/String;
+    sput-object v0, Lcom/facebook/imagepipeline/h/w;->XA:[Ljava/lang/String;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/h/w;->mContentResolver:Landroid/content/ContentResolver;
 
-    sget-object v2, Lcom/facebook/imagepipeline/h/w;->Xi:[Ljava/lang/String;
+    sget-object v2, Lcom/facebook/imagepipeline/h/w;->XA:[Ljava/lang/String;
 
     const/4 v3, 0x0
 
@@ -156,7 +156,7 @@
 
 
 # virtual methods
-.method protected final d(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
+.method protected final c(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -164,7 +164,7 @@
         }
     .end annotation
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-static {p1}, Lcom/facebook/common/j/f;->f(Landroid/net/Uri;)Z
 
@@ -303,7 +303,7 @@
     return-object p1
 .end method
 
-.method protected final jx()Ljava/lang/String;
+.method protected final jv()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalContentUriFetchProducer"
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/x.smali b/com.discord/smali/com/facebook/imagepipeline/h/x.smali
index 0c0525a295..ee61024a9d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/x.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/x.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -27,13 +27,13 @@
     .end annotation
 .end field
 
-.field private static final Xi:[Ljava/lang/String;
+.field private static final XA:[Ljava/lang/String;
 
-.field private static final Xj:[Ljava/lang/String;
+.field private static final XB:[Ljava/lang/String;
 
-.field private static final Xk:Landroid/graphics/Rect;
+.field private static final XC:Landroid/graphics/Rect;
 
-.field private static final Xl:Landroid/graphics/Rect;
+.field private static final XD:Landroid/graphics/Rect;
 
 
 # instance fields
@@ -46,7 +46,7 @@
 
     const-class v0, Lcom/facebook/imagepipeline/h/x;
 
-    sput-object v0, Lcom/facebook/imagepipeline/h/x;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/h/x;->FC:Ljava/lang/Class;
 
     const/4 v0, 0x2
 
@@ -64,13 +64,13 @@
 
     aput-object v2, v0, v3
 
-    sput-object v0, Lcom/facebook/imagepipeline/h/x;->Xi:[Ljava/lang/String;
+    sput-object v0, Lcom/facebook/imagepipeline/h/x;->XA:[Ljava/lang/String;
 
     new-array v0, v3, [Ljava/lang/String;
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/facebook/imagepipeline/h/x;->Xj:[Ljava/lang/String;
+    sput-object v0, Lcom/facebook/imagepipeline/h/x;->XB:[Ljava/lang/String;
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -80,7 +80,7 @@
 
     invoke-direct {v0, v1, v1, v2, v3}, Landroid/graphics/Rect;-><init>(IIII)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/h/x;->Xk:Landroid/graphics/Rect;
+    sput-object v0, Lcom/facebook/imagepipeline/h/x;->XC:Landroid/graphics/Rect;
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -88,7 +88,7 @@
 
     invoke-direct {v0, v1, v1, v2, v2}, Landroid/graphics/Rect;-><init>(IIII)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/h/x;->Xl:Landroid/graphics/Rect;
+    sput-object v0, Lcom/facebook/imagepipeline/h/x;->XD:Landroid/graphics/Rect;
 
     return-void
 .end method
@@ -116,7 +116,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/h/x;->mContentResolver:Landroid/content/ContentResolver;
 
-    sget-object v2, Lcom/facebook/imagepipeline/h/x;->Xi:[Ljava/lang/String;
+    sget-object v2, Lcom/facebook/imagepipeline/h/x;->XA:[Ljava/lang/String;
 
     const/4 v3, 0x0
 
@@ -182,11 +182,11 @@
 
     if-eqz p2, :cond_2
 
-    invoke-static {v1}, Lcom/facebook/imagepipeline/h/x;->aC(Ljava/lang/String;)I
+    invoke-static {v1}, Lcom/facebook/imagepipeline/h/x;->ax(Ljava/lang/String;)I
 
     move-result v0
 
-    iput v0, p2, Lcom/facebook/imagepipeline/f/e;->LP:I
+    iput v0, p2, Lcom/facebook/imagepipeline/f/e;->Mh:I
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -218,13 +218,13 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-object v0, Lcom/facebook/imagepipeline/h/x;->Xl:Landroid/graphics/Rect;
+    sget-object v0, Lcom/facebook/imagepipeline/h/x;->XD:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/h/x;->Xl:Landroid/graphics/Rect;
+    sget-object v1, Lcom/facebook/imagepipeline/h/x;->XD:Landroid/graphics/Rect;
 
     invoke-virtual {v1}, Landroid/graphics/Rect;->height()I
 
@@ -241,13 +241,13 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lcom/facebook/imagepipeline/h/x;->Xk:Landroid/graphics/Rect;
+    sget-object v0, Lcom/facebook/imagepipeline/h/x;->XC:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/h/x;->Xk:Landroid/graphics/Rect;
+    sget-object v1, Lcom/facebook/imagepipeline/h/x;->XC:Landroid/graphics/Rect;
 
     invoke-virtual {v1}, Landroid/graphics/Rect;->height()I
 
@@ -279,7 +279,7 @@
 
     int-to-long v2, p2
 
-    sget-object p2, Lcom/facebook/imagepipeline/h/x;->Xj:[Ljava/lang/String;
+    sget-object p2, Lcom/facebook/imagepipeline/h/x;->XB:[Ljava/lang/String;
 
     invoke-static {v1, v2, v3, p1, p2}, Landroid/provider/MediaStore$Images$Thumbnails;->queryMiniThumbnail(Landroid/content/ContentResolver;JI[Ljava/lang/String;)Landroid/database/Cursor;
 
@@ -388,7 +388,7 @@
     throw p2
 .end method
 
-.method private static aC(Ljava/lang/String;)I
+.method private static ax(Ljava/lang/String;)I
     .locals 4
 
     const/4 v0, 0x0
@@ -419,7 +419,7 @@
     :catch_0
     move-exception v2
 
-    sget-object v3, Lcom/facebook/imagepipeline/h/x;->Fl:Ljava/lang/Class;
+    sget-object v3, Lcom/facebook/imagepipeline/h/x;->FC:Ljava/lang/Class;
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -438,13 +438,13 @@
 .method public final a(Lcom/facebook/imagepipeline/a/e;)Z
     .locals 2
 
-    sget-object v0, Lcom/facebook/imagepipeline/h/x;->Xk:Landroid/graphics/Rect;
+    sget-object v0, Lcom/facebook/imagepipeline/h/x;->XC:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/h/x;->Xk:Landroid/graphics/Rect;
+    sget-object v1, Lcom/facebook/imagepipeline/h/x;->XC:Landroid/graphics/Rect;
 
     invoke-virtual {v1}, Landroid/graphics/Rect;->height()I
 
@@ -457,7 +457,7 @@
     return p1
 .end method
 
-.method protected final d(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
+.method protected final c(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -468,7 +468,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-static {v0}, Lcom/facebook/common/j/f;->g(Landroid/net/Uri;)Z
 
@@ -476,7 +476,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     invoke-direct {p0, v0, p1}, Lcom/facebook/imagepipeline/h/x;->a(Landroid/net/Uri;Lcom/facebook/imagepipeline/a/e;)Lcom/facebook/imagepipeline/f/e;
 
@@ -492,7 +492,7 @@
     return-object p1
 .end method
 
-.method protected final jx()Ljava/lang/String;
+.method protected final jv()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalContentUriThumbnailFetchProducer"
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/y$1.smali b/com.discord/smali/com/facebook/imagepipeline/h/y$1.smali
index a6fef567ca..281cf1442c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/y$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/y$1.smali
@@ -23,18 +23,18 @@
 
 
 # instance fields
-.field final synthetic Xm:Lcom/facebook/imagepipeline/request/b;
+.field final synthetic XE:Lcom/facebook/imagepipeline/request/b;
 
-.field final synthetic Xn:Lcom/facebook/imagepipeline/h/y;
+.field final synthetic XF:Lcom/facebook/imagepipeline/h/y;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/y;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/imagepipeline/request/b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/y$1;->Xn:Lcom/facebook/imagepipeline/h/y;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/y$1;->XF:Lcom/facebook/imagepipeline/h/y;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/h/y$1;->Xm:Lcom/facebook/imagepipeline/request/b;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/h/y$1;->XE:Lcom/facebook/imagepipeline/request/b;
 
     invoke-direct {p0, p2, p3, p4, p5}, Lcom/facebook/imagepipeline/h/aq;-><init>(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -82,11 +82,11 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/y$1;->Xm:Lcom/facebook/imagepipeline/request/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/y$1;->XE:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/y$1;->Xn:Lcom/facebook/imagepipeline/h/y;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/y$1;->XF:Lcom/facebook/imagepipeline/h/y;
 
     invoke-virtual {v1, v0}, Lcom/facebook/imagepipeline/h/y;->q(Landroid/net/Uri;)Landroid/media/ExifInterface;
 
@@ -107,7 +107,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/y$1;->Xn:Lcom/facebook/imagepipeline/h/y;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/y$1;->XF:Lcom/facebook/imagepipeline/h/y;
 
     invoke-static {v2}, Lcom/facebook/imagepipeline/h/y;->a(Lcom/facebook/imagepipeline/h/y;)Lcom/facebook/common/g/g;
 
@@ -117,7 +117,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/y$1;->Xn:Lcom/facebook/imagepipeline/h/y;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/y$1;->XF:Lcom/facebook/imagepipeline/h/y;
 
     invoke-static {v2, v1, v0}, Lcom/facebook/imagepipeline/h/y;->a(Lcom/facebook/imagepipeline/h/y;Lcom/facebook/common/g/f;Landroid/media/ExifInterface;)Lcom/facebook/imagepipeline/f/e;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/y.smali b/com.discord/smali/com/facebook/imagepipeline/h/y.smali
index 963109d853..e332b6f49e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/y.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/y.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final QF:Lcom/facebook/common/g/g;
+.field private final QX:Lcom/facebook/common/g/g;
 
 .field private final mContentResolver:Landroid/content/ContentResolver;
 
@@ -33,7 +33,7 @@
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/h/y;->mExecutor:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/y;->QF:Lcom/facebook/common/g/g;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/y;->QX:Lcom/facebook/common/g/g;
 
     iput-object p3, p0, Lcom/facebook/imagepipeline/h/y;->mContentResolver:Landroid/content/ContentResolver;
 
@@ -43,7 +43,7 @@
 .method static synthetic a(Lcom/facebook/imagepipeline/h/y;)Lcom/facebook/common/g/g;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/h/y;->QF:Lcom/facebook/common/g/g;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/h/y;->QX:Lcom/facebook/common/g/g;
 
     return-object p0
 .end method
@@ -115,11 +115,11 @@
 
     invoke-static {p0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
-    sget-object p0, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object p0, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
-    iput-object p0, v0, Lcom/facebook/imagepipeline/f/e;->Us:Lcom/facebook/d/c;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/f/e;->UK:Lcom/facebook/d/c;
 
-    iput p1, v0, Lcom/facebook/imagepipeline/f/e;->LP:I
+    iput p1, v0, Lcom/facebook/imagepipeline/f/e;->Mh:I
 
     iput v2, v0, Lcom/facebook/imagepipeline/f/e;->mWidth:I
 
@@ -160,7 +160,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v3
 
@@ -168,7 +168,7 @@
 
     move-result-object v5
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v6
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/z$1.smali b/com.discord/smali/com/facebook/imagepipeline/h/z$1.smali
index 9b230033c7..4b47d14741 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/z$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/z$1.smali
@@ -23,26 +23,26 @@
 
 
 # instance fields
-.field final synthetic WD:Lcom/facebook/imagepipeline/h/am;
+.field final synthetic WW:Lcom/facebook/imagepipeline/h/am;
 
-.field final synthetic WE:Ljava/lang/String;
+.field final synthetic WX:Ljava/lang/String;
 
-.field final synthetic Xm:Lcom/facebook/imagepipeline/request/b;
+.field final synthetic XE:Lcom/facebook/imagepipeline/request/b;
 
-.field final synthetic Xp:Lcom/facebook/imagepipeline/h/z;
+.field final synthetic XH:Lcom/facebook/imagepipeline/h/z;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/z;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/imagepipeline/request/b;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/z$1;->Xp:Lcom/facebook/imagepipeline/h/z;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/z$1;->XH:Lcom/facebook/imagepipeline/h/z;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/h/z$1;->Xm:Lcom/facebook/imagepipeline/request/b;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/h/z$1;->XE:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/h/z$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/h/z$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/h/z$1;->WE:Ljava/lang/String;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/h/z$1;->WX:Ljava/lang/String;
 
     invoke-direct {p0, p2, p3, p4, p5}, Lcom/facebook/imagepipeline/h/aq;-><init>(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -62,23 +62,23 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/z$1;->Xp:Lcom/facebook/imagepipeline/h/z;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/z$1;->XH:Lcom/facebook/imagepipeline/h/z;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/z$1;->Xm:Lcom/facebook/imagepipeline/request/b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/z$1;->XE:Lcom/facebook/imagepipeline/request/b;
 
-    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/h/z;->d(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
+    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/h/z;->c(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
 
     move-result-object v0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/z$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/z$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/z$1;->WE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/z$1;->WX:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/z$1;->Xp:Lcom/facebook/imagepipeline/h/z;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/z$1;->XH:Lcom/facebook/imagepipeline/h/z;
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/h/z;->jx()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/h/z;->jv()Ljava/lang/String;
 
     move-result-object v2
 
@@ -91,15 +91,15 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/f/e;->iL()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/f/e;->iK()V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/z$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/z$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/z$1;->WE:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/z$1;->WX:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/z$1;->Xp:Lcom/facebook/imagepipeline/h/z;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/z$1;->XH:Lcom/facebook/imagepipeline/h/z;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/h/z;->jx()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/h/z;->jv()Ljava/lang/String;
 
     move-result-object v3
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/z.smali b/com.discord/smali/com/facebook/imagepipeline/h/z.smali
index 60857b7e02..8454bfc448 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/z.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/z.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final QF:Lcom/facebook/common/g/g;
+.field private final QX:Lcom/facebook/common/g/g;
 
 .field private final mExecutor:Ljava/util/concurrent/Executor;
 
@@ -31,7 +31,7 @@
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/h/z;->mExecutor:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/z;->QF:Lcom/facebook/common/g/g;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/z;->QX:Lcom/facebook/common/g/g;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v7
 
@@ -59,13 +59,13 @@
 
     move-result-object v8
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v6
 
     new-instance v9, Lcom/facebook/imagepipeline/h/z$1;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/z;->jx()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/z;->jv()Ljava/lang/String;
 
     move-result-object v4
 
@@ -94,7 +94,7 @@
     return-void
 .end method
 
-.method protected abstract d(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
+.method protected abstract c(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -115,7 +115,7 @@
     if-gtz p2, :cond_0
 
     :try_start_0
-    iget-object p2, p0, Lcom/facebook/imagepipeline/h/z;->QF:Lcom/facebook/common/g/g;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/z;->QX:Lcom/facebook/common/g/g;
 
     invoke-interface {p2, p1}, Lcom/facebook/common/g/g;->c(Ljava/io/InputStream;)Lcom/facebook/common/g/f;
 
@@ -128,7 +128,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/z;->QF:Lcom/facebook/common/g/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/z;->QX:Lcom/facebook/common/g/g;
 
     invoke-interface {v1, p1, p2}, Lcom/facebook/common/g/g;->b(Ljava/io/InputStream;I)Lcom/facebook/common/g/f;
 
@@ -178,5 +178,5 @@
     return-object p1
 .end method
 
-.method protected abstract jx()Ljava/lang/String;
+.method protected abstract jv()Ljava/lang/String;
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/b.smali b/com.discord/smali/com/facebook/imagepipeline/i/b.smali
index 77676c1d2e..a4e38780db 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/b.smali
@@ -14,9 +14,9 @@
 
 
 # static fields
-.field public static final YG:Lcom/facebook/imagepipeline/i/b$a;
+.field public static final YY:Lcom/facebook/imagepipeline/i/b$a;
 
-.field private static volatile YH:Lcom/facebook/imagepipeline/i/b$c;
+.field private static volatile YZ:Lcom/facebook/imagepipeline/i/b$c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -32,11 +32,11 @@
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/i/b$b;-><init>(B)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/b;->YG:Lcom/facebook/imagepipeline/i/b$a;
+    sput-object v0, Lcom/facebook/imagepipeline/i/b;->YY:Lcom/facebook/imagepipeline/i/b$a;
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/b;->YH:Lcom/facebook/imagepipeline/i/b$c;
+    sput-object v0, Lcom/facebook/imagepipeline/i/b;->YZ:Lcom/facebook/imagepipeline/i/b$c;
 
     return-void
 .end method
@@ -52,17 +52,17 @@
 .method public static isTracing()Z
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/i/b;->jT()Lcom/facebook/imagepipeline/i/b$c;
+    invoke-static {}, Lcom/facebook/imagepipeline/i/b;->jR()Lcom/facebook/imagepipeline/i/b$c;
 
     const/4 v0, 0x0
 
     return v0
 .end method
 
-.method private static jT()Lcom/facebook/imagepipeline/i/b$c;
+.method private static jR()Lcom/facebook/imagepipeline/i/b$c;
     .locals 2
 
-    sget-object v0, Lcom/facebook/imagepipeline/i/b;->YH:Lcom/facebook/imagepipeline/i/b$c;
+    sget-object v0, Lcom/facebook/imagepipeline/i/b;->YZ:Lcom/facebook/imagepipeline/i/b$c;
 
     if-nez v0, :cond_1
 
@@ -71,7 +71,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/i/b;->YH:Lcom/facebook/imagepipeline/i/b$c;
+    sget-object v1, Lcom/facebook/imagepipeline/i/b;->YZ:Lcom/facebook/imagepipeline/i/b$c;
 
     if-nez v1, :cond_0
 
@@ -79,7 +79,7 @@
 
     invoke-direct {v1}, Lcom/facebook/imagepipeline/i/a;-><init>()V
 
-    sput-object v1, Lcom/facebook/imagepipeline/i/b;->YH:Lcom/facebook/imagepipeline/i/b$c;
+    sput-object v1, Lcom/facebook/imagepipeline/i/b;->YZ:Lcom/facebook/imagepipeline/i/b$c;
 
     :cond_0
     monitor-exit v0
@@ -97,7 +97,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/facebook/imagepipeline/i/b;->YH:Lcom/facebook/imagepipeline/i/b$c;
+    sget-object v0, Lcom/facebook/imagepipeline/i/b;->YZ:Lcom/facebook/imagepipeline/i/b$c;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/j/a.smali b/com.discord/smali/com/facebook/imagepipeline/j/a.smali
index 633defb9fe..ac6b255428 100644
--- a/com.discord/smali/com/facebook/imagepipeline/j/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/j/a.smali
@@ -215,22 +215,22 @@
 
     move-result p0
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v1, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
     if-ne v0, v1, :cond_1
 
-    invoke-static {p0}, Lcom/facebook/imagepipeline/j/a;->p(F)I
+    invoke-static {p0}, Lcom/facebook/imagepipeline/j/a;->o(F)I
 
     move-result p0
 
     goto :goto_0
 
     :cond_1
-    invoke-static {p0}, Lcom/facebook/imagepipeline/j/a;->o(F)I
+    invoke-static {p0}, Lcom/facebook/imagepipeline/j/a;->n(F)I
 
     move-result p0
 
@@ -249,7 +249,7 @@
 
     if-eqz p1, :cond_2
 
-    iget p1, p1, Lcom/facebook/imagepipeline/a/e;->Se:F
+    iget p1, p1, Lcom/facebook/imagepipeline/a/e;->Sw:F
 
     goto :goto_1
 
@@ -265,11 +265,11 @@
 
     if-lez p3, :cond_4
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object p3
 
-    sget-object v1, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v1, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
     if-ne p3, v1, :cond_3
 
@@ -289,7 +289,7 @@
 .method private static a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/f/e;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hM()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hP()Z
 
     move-result p0
 
@@ -300,7 +300,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iH()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()I
 
     move-result p0
 
@@ -327,7 +327,7 @@
     return p0
 .end method
 
-.method private static o(F)I
+.method private static n(F)I
     .locals 8
 
     const/4 v0, 0x1
@@ -386,7 +386,7 @@
     goto :goto_0
 .end method
 
-.method private static p(F)I
+.method private static o(F)I
     .locals 7
 
     const v0, 0x3f2aaaab
diff --git a/com.discord/smali/com/facebook/imagepipeline/j/e.smali b/com.discord/smali/com/facebook/imagepipeline/j/e.smali
index 70c1ddb126..b0a2f24e06 100644
--- a/com.discord/smali/com/facebook/imagepipeline/j/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/j/e.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final YJ:Lcom/facebook/common/d/e;
+.field public static final Zb:Lcom/facebook/common/d/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/e<",
@@ -63,7 +63,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/j/e;->YJ:Lcom/facebook/common/d/e;
+    sput-object v0, Lcom/facebook/imagepipeline/j/e;->Zb:Lcom/facebook/common/d/e;
 
     return-void
 .end method
@@ -91,9 +91,9 @@
 
     move-result p3
 
-    sget-object v1, Lcom/facebook/imagepipeline/j/e;->YJ:Lcom/facebook/common/d/e;
+    sget-object v1, Lcom/facebook/imagepipeline/j/e;->Zb:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/f/e;->iI()I
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/f/e;->iH()I
 
     move-result v2
 
@@ -198,26 +198,26 @@
 
     mul-float v1, p0, p3
 
-    iget v2, p1, Lcom/facebook/imagepipeline/a/e;->Se:F
+    iget v2, p1, Lcom/facebook/imagepipeline/a/e;->Sw:F
 
     cmpl-float v1, v1, v2
 
     if-lez v1, :cond_8
 
-    iget p3, p1, Lcom/facebook/imagepipeline/a/e;->Se:F
+    iget p3, p1, Lcom/facebook/imagepipeline/a/e;->Sw:F
 
     div-float/2addr p3, p0
 
     :cond_8
     mul-float p0, p2, p3
 
-    iget v1, p1, Lcom/facebook/imagepipeline/a/e;->Se:F
+    iget v1, p1, Lcom/facebook/imagepipeline/a/e;->Sw:F
 
     cmpl-float p0, p0, v1
 
     if-lez p0, :cond_9
 
-    iget p0, p1, Lcom/facebook/imagepipeline/a/e;->Se:F
+    iget p0, p1, Lcom/facebook/imagepipeline/a/e;->Sw:F
 
     div-float/2addr p0, p2
 
@@ -227,7 +227,7 @@
     move p0, p3
 
     :goto_3
-    iget p1, p1, Lcom/facebook/imagepipeline/a/e;->Sf:F
+    iget p1, p1, Lcom/facebook/imagepipeline/a/e;->Sx:F
 
     const/high16 p2, 0x41000000    # 8.0f
 
@@ -253,7 +253,7 @@
 .method public static a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/f/e;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hN()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hQ()Z
 
     move-result v0
 
@@ -268,7 +268,7 @@
 
     move-result p1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hM()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hP()Z
 
     move-result v0
 
@@ -277,7 +277,7 @@
     return p1
 
     :cond_1
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hO()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hR()I
 
     move-result p0
 
@@ -293,9 +293,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-object v0, Lcom/facebook/imagepipeline/j/e;->YJ:Lcom/facebook/common/d/e;
+    sget-object v0, Lcom/facebook/imagepipeline/j/e;->Zb:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->iI()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->iH()I
 
     move-result v1
 
@@ -467,11 +467,11 @@
 .method public static b(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/f/e;)I
     .locals 2
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iI()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iH()I
 
     move-result p1
 
-    sget-object v0, Lcom/facebook/imagepipeline/j/e;->YJ:Lcom/facebook/common/d/e;
+    sget-object v0, Lcom/facebook/imagepipeline/j/e;->Zb:Lcom/facebook/common/d/e;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -485,20 +485,20 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hM()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hP()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hO()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hR()I
 
     move-result v0
 
     :cond_0
     div-int/lit8 v0, v0, 0x5a
 
-    sget-object p0, Lcom/facebook/imagepipeline/j/e;->YJ:Lcom/facebook/common/d/e;
+    sget-object p0, Lcom/facebook/imagepipeline/j/e;->Zb:Lcom/facebook/common/d/e;
 
     add-int/2addr p1, v0
 
@@ -533,7 +533,7 @@
 .method private static h(Lcom/facebook/imagepipeline/f/e;)I
     .locals 2
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->iH()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->iG()I
 
     move-result v0
 
@@ -554,7 +554,7 @@
     return p0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->iH()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->iG()I
 
     move-result p0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/j/f.smali b/com.discord/smali/com/facebook/imagepipeline/j/f.smali
index 620094aaa7..a511c10d62 100644
--- a/com.discord/smali/com/facebook/imagepipeline/j/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/j/f.smali
@@ -7,16 +7,16 @@
 
 
 # instance fields
-.field private final SK:Ljava/lang/Integer;
+.field private final TF:I
+
+.field private final Td:Ljava/lang/Integer;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Tn:I
+.field private final Wm:Z
 
-.field private final VU:Z
-
-.field private final YK:Lcom/facebook/imagepipeline/j/d;
+.field private final Zc:Lcom/facebook/imagepipeline/j/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -36,13 +36,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/j/f;->Tn:I
+    iput p1, p0, Lcom/facebook/imagepipeline/j/f;->TF:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/j/f;->VU:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/j/f;->Wm:Z
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/j/f;->YK:Lcom/facebook/imagepipeline/j/d;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/j/f;->Zc:Lcom/facebook/imagepipeline/j/d;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/j/f;->SK:Ljava/lang/Integer;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/j/f;->Td:Ljava/lang/Integer;
 
     return-void
 .end method
@@ -52,9 +52,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget v0, p0, Lcom/facebook/imagepipeline/j/f;->Tn:I
+    iget v0, p0, Lcom/facebook/imagepipeline/j/f;->TF:I
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/j/f;->VU:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/j/f;->Wm:Z
 
     invoke-static {v0, v1}, Lcom/facebook/imagepipeline/nativecode/b;->c(IZ)Lcom/facebook/imagepipeline/j/d;
 
@@ -72,7 +72,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/j/h;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/j/f;->Tn:I
+    iget v1, p0, Lcom/facebook/imagepipeline/j/f;->TF:I
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/j/h;-><init>(I)V
 
@@ -88,7 +88,7 @@
 .method public final createImageTranscoder(Lcom/facebook/d/c;Z)Lcom/facebook/imagepipeline/j/c;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/j/f;->YK:Lcom/facebook/imagepipeline/j/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/j/f;->Zc:Lcom/facebook/imagepipeline/j/d;
 
     const/4 v1, 0x0
 
@@ -106,7 +106,7 @@
     :goto_0
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/j/f;->SK:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/j/f;->Td:Ljava/lang/Integer;
 
     if-nez v0, :cond_1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/j/g.smali b/com.discord/smali/com/facebook/imagepipeline/j/g.smali
index 4ce15aa0b6..912a7fe72b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/j/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/j/g.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final Tn:I
+.field private final TF:I
 
-.field private final VS:Z
+.field private final Wk:Z
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/j/g;->VS:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/j/g;->Wk:Z
 
-    iput p2, p0, Lcom/facebook/imagepipeline/j/g;->Tn:I
+    iput p2, p0, Lcom/facebook/imagepipeline/j/g;->TF:I
 
     return-void
 .end method
@@ -66,7 +66,7 @@
     :goto_0
     if-nez p3, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hK()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hN()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object v5
 
@@ -76,7 +76,7 @@
     move-object/from16 v5, p3
 
     :goto_1
-    iget-boolean v6, v1, Lcom/facebook/imagepipeline/j/g;->VS:Z
+    iget-boolean v6, v1, Lcom/facebook/imagepipeline/j/g;->Wk:Z
 
     const/4 v7, 0x1
 
@@ -87,7 +87,7 @@
     goto :goto_2
 
     :cond_2
-    iget v6, v1, Lcom/facebook/imagepipeline/j/g;->Tn:I
+    iget v6, v1, Lcom/facebook/imagepipeline/j/g;->TF:I
 
     move-object/from16 v8, p4
 
@@ -267,16 +267,16 @@
 
     if-nez p2, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hK()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hN()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object p2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/j/g;->VS:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/j/g;->Wk:Z
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/j/g;->Tn:I
+    iget v0, p0, Lcom/facebook/imagepipeline/j/g;->TF:I
 
     invoke-static {p2, p3, p1, v0}, Lcom/facebook/imagepipeline/j/a;->a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;Lcom/facebook/imagepipeline/f/e;I)I
 
@@ -297,11 +297,11 @@
 .method public final c(Lcom/facebook/d/c;)Z
     .locals 1
 
-    sget-object v0, Lcom/facebook/d/b;->PC:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PU:Lcom/facebook/d/c;
 
     if-eq p1, v0, :cond_1
 
-    sget-object v0, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
     if-ne p1, v0, :cond_0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/NativeMemoryChunk.smali b/com.discord/smali/com/facebook/imagepipeline/memory/NativeMemoryChunk.smali
index 89285aa08d..f12c3c6df1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/NativeMemoryChunk.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/NativeMemoryChunk.smali
@@ -8,9 +8,9 @@
 
 
 # instance fields
-.field private Hb:Z
+.field private Hs:Z
 
-.field private final Vq:J
+.field private final VI:J
 
 .field private final mSize:I
 
@@ -19,7 +19,7 @@
 .method static constructor <clinit>()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jj()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jh()V
 
     return-void
 .end method
@@ -35,11 +35,11 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Vq:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->VI:J
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Hb:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Hs:Z
 
     return-void
 .end method
@@ -71,9 +71,9 @@
 
     move-result-wide v1
 
-    iput-wide v1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Vq:J
+    iput-wide v1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->VI:J
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Hb:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Hs:Z
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 
     invoke-static {v0, p1, v0, p4, p3}, Lcom/facebook/imagepipeline/memory/t;->b(IIIII)V
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/memory/r;->fG()J
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/memory/r;->fK()J
 
     move-result-wide p1
 
@@ -119,7 +119,7 @@
 
     add-long/2addr p1, v0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Vq:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->VI:J
 
     add-long/2addr v2, v0
 
@@ -207,7 +207,7 @@
     :goto_2
     invoke-static {v1}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Vq:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->VI:J
 
     int-to-long v2, p1
 
@@ -267,7 +267,7 @@
 
     invoke-static {p1, v0, p3, p4, v1}, Lcom/facebook/imagepipeline/memory/t;->b(IIIII)V
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Vq:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->VI:J
 
     int-to-long v2, p1
 
@@ -294,11 +294,11 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iY()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->getUniqueId()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Vq:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->VI:J
 
     const/4 v4, 0x0
 
@@ -340,7 +340,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-wide v1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Vq:J
+    iget-wide v1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->VI:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->toHexString(J)Ljava/lang/String;
 
@@ -359,11 +359,11 @@
     invoke-static {v4}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
     :cond_0
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iY()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->getUniqueId()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Vq:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->VI:J
 
     cmp-long v5, v0, v2
 
@@ -489,7 +489,7 @@
 
     invoke-static {p1, v0, p3, p4, v1}, Lcom/facebook/imagepipeline/memory/t;->b(IIIII)V
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Vq:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->VI:J
 
     int-to-long v2, p1
 
@@ -517,15 +517,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Hs:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Hb:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Hs:Z
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Vq:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->VI:J
 
     invoke-static {v0, v1}, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->nativeFree(J)V
     :try_end_0
@@ -544,10 +544,10 @@
     throw v0
 .end method
 
-.method public final fG()J
+.method public final fK()J
     .locals 2
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Vq:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->VI:J
 
     return-wide v0
 .end method
@@ -632,10 +632,10 @@
     return v0
 .end method
 
-.method public final iY()J
+.method public final getUniqueId()J
     .locals 2
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Vq:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->VI:J
 
     return-wide v0
 .end method
@@ -646,7 +646,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Hb:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Hs:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/a.smali b/com.discord/smali/com/facebook/imagepipeline/memory/a.smali
index 58057ca65e..3357c0a73c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/a.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field private final Fl:Ljava/lang/Class;
+.field private final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -37,11 +37,11 @@
     .end annotation
 .end field
 
-.field final SM:Lcom/facebook/common/g/b;
+.field final Tf:Lcom/facebook/common/g/b;
 
-.field final UC:Lcom/facebook/imagepipeline/memory/ad;
+.field final UV:Lcom/facebook/imagepipeline/memory/ad;
 
-.field final UD:Landroid/util/SparseArray;
+.field final UW:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -51,7 +51,7 @@
     .end annotation
 .end field
 
-.field final UE:Ljava/util/Set;
+.field final UX:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -60,13 +60,13 @@
     .end annotation
 .end field
 
-.field private UF:Z
+.field private UY:Z
 
-.field final UG:Lcom/facebook/imagepipeline/memory/a$a;
+.field final UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
-.field final UH:Lcom/facebook/imagepipeline/memory/a$a;
+.field final Va:Lcom/facebook/imagepipeline/memory/a$a;
 
-.field private final UI:Lcom/facebook/imagepipeline/memory/ae;
+.field private final Vb:Lcom/facebook/imagepipeline/memory/ae;
 
 
 # direct methods
@@ -79,7 +79,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Fl:Ljava/lang/Class;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->FC:Ljava/lang/Class;
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -87,7 +87,7 @@
 
     check-cast p1, Lcom/facebook/common/g/b;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->SM:Lcom/facebook/common/g/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Tf:Lcom/facebook/common/g/b;
 
     invoke-static {p2}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -95,7 +95,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/memory/ad;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UC:Lcom/facebook/imagepipeline/memory/ad;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UV:Lcom/facebook/imagepipeline/memory/ad;
 
     invoke-static {p3}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -103,21 +103,21 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/memory/ae;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UI:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Vb:Lcom/facebook/imagepipeline/memory/ae;
 
     new-instance p1, Landroid/util/SparseArray;
 
     invoke-direct {p1}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UD:Landroid/util/SparseArray;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UW:Landroid/util/SparseArray;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UC:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UV:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/memory/ad;->VN:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/memory/ad;->Wf:Z
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iR()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iQ()V
 
     goto :goto_0
 
@@ -139,19 +139,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UE:Ljava/util/Set;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UX:Ljava/util/Set;
 
     new-instance p1, Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-direct {p1}, Lcom/facebook/imagepipeline/memory/a$a;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
     new-instance p1, Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-direct {p1}, Lcom/facebook/imagepipeline/memory/a$a;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
     return-void
 .end method
@@ -164,13 +164,13 @@
     :try_start_0
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UD:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UW:Landroid/util/SparseArray;
 
     invoke-virtual {v0}, Landroid/util/SparseArray;->clear()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UC:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UV:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ad;->VK:Landroid/util/SparseIntArray;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ad;->Wc:Landroid/util/SparseIntArray;
 
     if-eqz v0, :cond_1
 
@@ -197,7 +197,7 @@
 
     move-result v5
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/memory/a;->UD:Landroid/util/SparseArray;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/memory/a;->UW:Landroid/util/SparseArray;
 
     new-instance v7, Lcom/facebook/imagepipeline/memory/f;
 
@@ -205,9 +205,9 @@
 
     move-result v8
 
-    iget-object v9, p0, Lcom/facebook/imagepipeline/memory/a;->UC:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v9, p0, Lcom/facebook/imagepipeline/memory/a;->UV:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-boolean v9, v9, Lcom/facebook/imagepipeline/memory/ad;->VN:Z
+    iget-boolean v9, v9, Lcom/facebook/imagepipeline/memory/ad;->Wf:Z
 
     invoke-direct {v7, v8, v4, v5, v9}, Lcom/facebook/imagepipeline/memory/f;-><init>(IIIZ)V
 
@@ -218,7 +218,7 @@
     goto :goto_0
 
     :cond_0
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->UF:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->UY:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -230,7 +230,7 @@
     const/4 p1, 0x1
 
     :try_start_1
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/memory/a;->UF:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/memory/a;->UY:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -265,7 +265,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UD:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UW:Landroid/util/SparseArray;
 
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -300,7 +300,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UD:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UW:Landroid/util/SparseArray;
 
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -310,7 +310,7 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->UF:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->UY:Z
 
     if-nez v1, :cond_0
 
@@ -325,7 +325,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Fl:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->FC:Ljava/lang/Class;
 
     const-string v1, "creating new bucket %s"
 
@@ -340,7 +340,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UD:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UW:Landroid/util/SparseArray;
 
     invoke-virtual {v1, p1, v0}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
     :try_end_0
@@ -370,13 +370,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UC:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UV:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/ad;->VI:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/ad;->Wa:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -392,17 +392,17 @@
 
     :cond_0
     :try_start_1
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UC:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UV:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/ad;->VJ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/ad;->Wb:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v4, v4, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v4, v4, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     add-int/2addr v3, v4
 
@@ -415,13 +415,13 @@
     invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/memory/a;->trimToSize(I)V
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -450,7 +450,7 @@
     throw p1
 .end method
 
-.method private hI()V
+.method private hL()V
     .locals 7
 
     const/4 v0, 0x2
@@ -461,9 +461,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Fl:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->FC:Ljava/lang/Class;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
     iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->mCount:I
 
@@ -471,15 +471,15 @@
 
     move-result-object v3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
     iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->mCount:I
 
@@ -487,9 +487,9 @@
 
     move-result-object v5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -503,21 +503,21 @@
     return-void
 .end method
 
-.method private declared-synchronized iQ()V
+.method private declared-synchronized iP()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iT()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iS()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     if-nez v0, :cond_0
 
@@ -549,19 +549,19 @@
     throw v0
 .end method
 
-.method private declared-synchronized iR()V
+.method private declared-synchronized iQ()V
     .locals 9
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UC:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UV:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ad;->VK:Landroid/util/SparseIntArray;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ad;->Wc:Landroid/util/SparseIntArray;
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UD:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UW:Landroid/util/SparseArray;
 
     invoke-virtual {v1}, Landroid/util/SparseArray;->clear()V
 
@@ -584,7 +584,7 @@
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/memory/a;->UD:Landroid/util/SparseArray;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/memory/a;->UW:Landroid/util/SparseArray;
 
     new-instance v6, Lcom/facebook/imagepipeline/memory/f;
 
@@ -592,9 +592,9 @@
 
     move-result v7
 
-    iget-object v8, p0, Lcom/facebook/imagepipeline/memory/a;->UC:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v8, p0, Lcom/facebook/imagepipeline/memory/a;->UV:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-boolean v8, v8, Lcom/facebook/imagepipeline/memory/ad;->VN:Z
+    iget-boolean v8, v8, Lcom/facebook/imagepipeline/memory/ad;->Wf:Z
 
     invoke-direct {v6, v7, v4, v1, v8}, Lcom/facebook/imagepipeline/memory/f;-><init>(IIIZ)V
 
@@ -605,7 +605,7 @@
     goto :goto_0
 
     :cond_0
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->UF:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->UY:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -617,7 +617,7 @@
     const/4 v0, 0x1
 
     :try_start_1
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/a;->UF:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/a;->UY:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -639,21 +639,21 @@
     goto :goto_1
 .end method
 
-.method private declared-synchronized iS()V
+.method private declared-synchronized iR()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iT()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iS()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UC:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UV:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/ad;->VJ:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/ad;->Wb:I
 
     invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/memory/a;->trimToSize(I)V
     :try_end_0
@@ -672,25 +672,25 @@
     throw v0
 .end method
 
-.method private declared-synchronized iT()Z
+.method private declared-synchronized iS()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UC:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UV:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/ad;->VJ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/ad;->Wb:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -723,21 +723,21 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     add-int/2addr v0, v1
 
     sub-int/2addr v0, p1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     invoke-static {v0, v1}, Ljava/lang/Math;->min(II)I
 
@@ -761,7 +761,7 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Fl:Ljava/lang/Class;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->FC:Ljava/lang/Class;
 
     const-string v3, "trimToSize: TargetSize = %d; Initial Size = %d; Bytes to free = %d"
 
@@ -769,13 +769,13 @@
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v5, v5, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v5, v5, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v6, v6, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v6, v6, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     add-int/2addr v5, v6
 
@@ -790,12 +790,12 @@
     invoke-static {v2, v3, v4, v5, v6}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_1
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hI()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hL()V
 
     const/4 v2, 0x0
 
     :goto_0
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UD:Landroid/util/SparseArray;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UW:Landroid/util/SparseArray;
 
     invoke-virtual {v3}, Landroid/util/SparseArray;->size()I
 
@@ -805,7 +805,7 @@
 
     if-lez v0, :cond_3
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UD:Landroid/util/SparseArray;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UW:Landroid/util/SparseArray;
 
     invoke-virtual {v3, v2}, Landroid/util/SparseArray;->valueAt(I)Ljava/lang/Object;
 
@@ -824,13 +824,13 @@
 
     invoke-virtual {p0, v4}, Lcom/facebook/imagepipeline/memory/a;->O(Ljava/lang/Object;)V
 
-    iget v4, v3, Lcom/facebook/imagepipeline/memory/f;->US:I
+    iget v4, v3, Lcom/facebook/imagepipeline/memory/f;->Vk:I
 
     sub-int/2addr v0, v4
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v5, v3, Lcom/facebook/imagepipeline/memory/f;->US:I
+    iget v5, v3, Lcom/facebook/imagepipeline/memory/f;->Vk:I
 
     invoke-virtual {v4, v5}, Lcom/facebook/imagepipeline/memory/a$a;->ar(I)V
 
@@ -842,7 +842,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hI()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hL()V
 
     invoke-static {v1}, Lcom/facebook/common/e/a;->I(I)Z
 
@@ -850,7 +850,7 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Fl:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->FC:Ljava/lang/Class;
 
     const-string v1, "trimToSize: TargetSize = %d; Final Size = %d"
 
@@ -858,13 +858,13 @@
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v2, v2, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v2, v2, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     add-int/2addr v2, v3
 
@@ -950,11 +950,11 @@
 
     if-eqz v0, :cond_0
 
-    iget v1, p1, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iget v1, p1, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iput v1, p1, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iput v1, p1, Lcom/facebook/imagepipeline/memory/f;->Vo:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1001,9 +1001,9 @@
 
     move-result p1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UC:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UV:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/memory/ad;->VN:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/memory/ad;->Wf:Z
 
     const v2, 0x7fffffff
 
@@ -1022,7 +1022,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iQ()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iP()V
 
     invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/memory/a;->ak(I)I
 
@@ -1045,7 +1045,7 @@
 
     if-eqz v2, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UE:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UX:Ljava/util/Set;
 
     invoke-interface {p1, v2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -1061,15 +1061,15 @@
 
     move-result v0
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {v3, v0}, Lcom/facebook/imagepipeline/memory/a$a;->aq(I)V
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {v3, v0}, Lcom/facebook/imagepipeline/memory/a$a;->ar(I)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hI()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hL()V
 
     invoke-static {v1}, Lcom/facebook/common/e/a;->I(I)Z
 
@@ -1077,7 +1077,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Fl:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->FC:Ljava/lang/Class;
 
     const-string v1, "get (reuse) (object, size) = (%x, %s)"
 
@@ -1111,17 +1111,17 @@
 
     if-eqz v3, :cond_5
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {v3, v2}, Lcom/facebook/imagepipeline/memory/a$a;->aq(I)V
 
     if-eqz v0, :cond_2
 
-    iget v3, v0, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iget v3, v0, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
     add-int/lit8 v3, v3, 0x1
 
-    iput v3, v0, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iput v3, v0, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
     :cond_2
     monitor-exit p0
@@ -1145,7 +1145,7 @@
     monitor-enter p0
 
     :try_start_2
-    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {v4, v2}, Lcom/facebook/imagepipeline/memory/a$a;->ar(I)V
 
@@ -1155,7 +1155,7 @@
 
     if-eqz v2, :cond_3
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->iW()V
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->iV()V
 
     :cond_3
     monitor-exit p0
@@ -1168,7 +1168,7 @@
     monitor-enter p0
 
     :try_start_3
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->UE:Ljava/util/Set;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->UX:Ljava/util/Set;
 
     invoke-interface {v2, v0}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -1176,9 +1176,9 @@
 
     invoke-static {v2}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iS()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iR()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hI()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hL()V
 
     invoke-static {v1}, Lcom/facebook/common/e/a;->I(I)Z
 
@@ -1186,7 +1186,7 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Fl:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->FC:Ljava/lang/Class;
 
     const-string v2, "get (alloc) (object, size) = (%x, %s)"
 
@@ -1232,17 +1232,17 @@
     :try_start_5
     new-instance p1, Lcom/facebook/imagepipeline/memory/a$c;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UC:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->UV:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/ad;->VI:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/ad;->Wa:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     invoke-direct {p1, v0, v1, v3, v2}, Lcom/facebook/imagepipeline/memory/a$c;-><init>(IIII)V
 
@@ -1283,7 +1283,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UE:Ljava/util/Set;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->UX:Ljava/util/Set;
 
     invoke-interface {v3, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
@@ -1297,7 +1297,7 @@
 
     if-nez v3, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Fl:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->FC:Ljava/lang/Class;
 
     const-string v2, "release (free, value unrecognized) (object, size) = (%x, %s)"
 
@@ -1328,9 +1328,9 @@
     :cond_0
     if-eqz v2, :cond_6
 
-    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
-    iget-object v7, v2, Lcom/facebook/imagepipeline/memory/f;->UU:Ljava/util/Queue;
+    iget-object v7, v2, Lcom/facebook/imagepipeline/memory/f;->Vm:Ljava/util/Queue;
 
     invoke-interface {v7}, Ljava/util/Queue;->size()I
 
@@ -1338,7 +1338,7 @@
 
     add-int/2addr v3, v7
 
-    iget v7, v2, Lcom/facebook/imagepipeline/memory/f;->UT:I
+    iget v7, v2, Lcom/facebook/imagepipeline/memory/f;->Vl:I
 
     if-le v3, v7, :cond_1
 
@@ -1352,7 +1352,7 @@
     :goto_0
     if-nez v3, :cond_6
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iT()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iS()Z
 
     move-result v3
 
@@ -1369,11 +1369,11 @@
     :cond_2
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-boolean v3, v2, Lcom/facebook/imagepipeline/memory/f;->UV:Z
+    iget-boolean v3, v2, Lcom/facebook/imagepipeline/memory/f;->Vn:Z
 
     if-eqz v3, :cond_4
 
-    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
     if-lez v3, :cond_3
 
@@ -1382,26 +1382,26 @@
     :cond_3
     invoke-static {v5}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
     sub-int/2addr v3, v6
 
-    iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
     invoke-virtual {v2, p1}, Lcom/facebook/imagepipeline/memory/f;->S(Ljava/lang/Object;)V
 
     goto :goto_1
 
     :cond_4
-    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
     if-lez v3, :cond_5
 
-    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
     sub-int/2addr v3, v6
 
-    iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
     invoke-virtual {v2, p1}, Lcom/facebook/imagepipeline/memory/f;->S(Ljava/lang/Object;)V
 
@@ -1419,11 +1419,11 @@
     invoke-static {v2, v3, v6}, Lcom/facebook/common/e/a;->c(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
 
     :goto_1
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->UH:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Va:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {v2, v1}, Lcom/facebook/imagepipeline/memory/a$a;->aq(I)V
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {v2, v1}, Lcom/facebook/imagepipeline/memory/a$a;->ar(I)V
 
@@ -1433,7 +1433,7 @@
 
     if-eqz v1, :cond_9
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Fl:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->FC:Ljava/lang/Class;
 
     const-string v2, "release (reuse) (object, size) = (%x, %s)"
 
@@ -1457,7 +1457,7 @@
     :goto_2
     if-eqz v2, :cond_7
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->iW()V
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->iV()V
 
     :cond_7
     invoke-static {v4}, Lcom/facebook/common/e/a;->I(I)Z
@@ -1466,7 +1466,7 @@
 
     if-eqz v2, :cond_8
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Fl:Ljava/lang/Class;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->FC:Ljava/lang/Class;
 
     const-string v3, "release (free) (object, size) = (%x, %s)"
 
@@ -1487,13 +1487,13 @@
     :cond_8
     invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/memory/a;->O(Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UG:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->UZ:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {p1, v1}, Lcom/facebook/imagepipeline/memory/a$a;->ar(I)V
 
     :cond_9
     :goto_3
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hI()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->hL()V
 
     monitor-exit p0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/ad.smali b/com.discord/smali/com/facebook/imagepipeline/memory/ad.smali
index 63e022966d..3d1ea851f7 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/ad.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/ad.smali
@@ -4,19 +4,19 @@
 
 
 # instance fields
-.field public final VI:I
+.field public final Wa:I
 
-.field public final VJ:I
+.field public final Wb:I
 
-.field public final VK:Landroid/util/SparseIntArray;
+.field public final Wc:Landroid/util/SparseIntArray;
 
-.field public final VL:I
+.field public final Wd:I
 
-.field public final VM:I
+.field public final We:I
 
-.field public VN:Z
+.field public Wf:Z
 
-.field public final VO:I
+.field public final Wg:I
 
 
 # direct methods
@@ -69,17 +69,17 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/memory/ad;->VJ:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/ad;->Wb:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/memory/ad;->VI:I
+    iput p2, p0, Lcom/facebook/imagepipeline/memory/ad;->Wa:I
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/ad;->VK:Landroid/util/SparseIntArray;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/ad;->Wc:Landroid/util/SparseIntArray;
 
-    iput p4, p0, Lcom/facebook/imagepipeline/memory/ad;->VL:I
+    iput p4, p0, Lcom/facebook/imagepipeline/memory/ad;->Wd:I
 
-    iput p5, p0, Lcom/facebook/imagepipeline/memory/ad;->VM:I
+    iput p5, p0, Lcom/facebook/imagepipeline/memory/ad;->We:I
 
-    iput p6, p0, Lcom/facebook/imagepipeline/memory/ad;->VO:I
+    iput p6, p0, Lcom/facebook/imagepipeline/memory/ad;->Wg:I
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/f.smali b/com.discord/smali/com/facebook/imagepipeline/memory/f.smali
index 78dccc2306..ee4ef9697d 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/f.smali
@@ -15,15 +15,15 @@
 
 
 # instance fields
-.field public final US:I
+.field public final Vk:I
 
-.field public final UT:I
+.field public final Vl:I
 
-.field final UU:Ljava/util/Queue;
+.field final Vm:Ljava/util/Queue;
 
-.field final UV:Z
+.field final Vn:Z
 
-.field UW:I
+.field Vo:I
 
 
 # direct methods
@@ -70,19 +70,19 @@
     :goto_2
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/memory/f;->US:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/f;->Vk:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/memory/f;->UT:I
+    iput p2, p0, Lcom/facebook/imagepipeline/memory/f;->Vl:I
 
     new-instance p1, Ljava/util/LinkedList;
 
     invoke-direct {p1}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/f;->UU:Ljava/util/Queue;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/f;->Vm:Ljava/util/Queue;
 
-    iput p3, p0, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iput p3, p0, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/memory/f;->UV:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/memory/f;->Vn:Z
 
     return-void
 .end method
@@ -97,17 +97,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/f;->UU:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/f;->Vm:Ljava/util/Queue;
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
     return-void
 .end method
 
-.method public final iW()V
+.method public final iV()V
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
     const/4 v1, 0x1
 
@@ -123,11 +123,11 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
     sub-int/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/f;->UW:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/f;->Vo:I
 
     return-void
 .end method
@@ -143,7 +143,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/f;->UU:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/f;->Vm:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/g$a.smali b/com.discord/smali/com/facebook/imagepipeline/memory/g$a.smali
index 9fd662d2e6..ded42977c8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/g$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/g$a.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field Va:Lcom/facebook/imagepipeline/memory/g$a;
+.field Vs:Lcom/facebook/imagepipeline/memory/g$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/memory/g$a<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field Vb:Ljava/util/LinkedList;
+.field Vt:Ljava/util/LinkedList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedList<",
@@ -45,7 +45,7 @@
     .end annotation
 .end field
 
-.field Vc:Lcom/facebook/imagepipeline/memory/g$a;
+.field Vu:Lcom/facebook/imagepipeline/memory/g$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/memory/g$a<",
@@ -97,13 +97,13 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g$a;->Va:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g$a;->Vs:Lcom/facebook/imagepipeline/memory/g$a;
 
     iput p2, p0, Lcom/facebook/imagepipeline/memory/g$a;->key:I
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/g$a;->Vb:Ljava/util/LinkedList;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/g$a;->Vt:Ljava/util/LinkedList;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g$a;->Vc:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g$a;->Vu:Lcom/facebook/imagepipeline/memory/g$a;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/g.smali b/com.discord/smali/com/facebook/imagepipeline/memory/g.smali
index c92c071c71..1c358f6ebf 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/g.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field protected final UX:Landroid/util/SparseArray;
+.field protected final Vp:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field UY:Lcom/facebook/imagepipeline/memory/g$a;
+.field Vq:Lcom/facebook/imagepipeline/memory/g$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/memory/g$a<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field UZ:Lcom/facebook/imagepipeline/memory/g$a;
+.field Vr:Lcom/facebook/imagepipeline/memory/g$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/memory/g$a<",
@@ -66,7 +66,7 @@
 
     invoke-direct {v0}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->UX:Landroid/util/SparseArray;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->Vp:Landroid/util/SparseArray;
 
     return-void
 .end method
@@ -84,38 +84,38 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->Va:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->Vs:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/memory/g$a;->Vc:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/memory/g$a;->Vu:Lcom/facebook/imagepipeline/memory/g$a;
 
     if-eqz v0, :cond_0
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/memory/g$a;->Vc:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/memory/g$a;->Vu:Lcom/facebook/imagepipeline/memory/g$a;
 
     :cond_0
     if-eqz v1, :cond_1
 
-    iput-object v0, v1, Lcom/facebook/imagepipeline/memory/g$a;->Va:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v0, v1, Lcom/facebook/imagepipeline/memory/g$a;->Vs:Lcom/facebook/imagepipeline/memory/g$a;
 
     :cond_1
     const/4 v2, 0x0
 
-    iput-object v2, p1, Lcom/facebook/imagepipeline/memory/g$a;->Va:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v2, p1, Lcom/facebook/imagepipeline/memory/g$a;->Vs:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iput-object v2, p1, Lcom/facebook/imagepipeline/memory/g$a;->Vc:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v2, p1, Lcom/facebook/imagepipeline/memory/g$a;->Vu:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/g;->UY:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/g;->Vq:Lcom/facebook/imagepipeline/memory/g$a;
 
     if-ne p1, v2, :cond_2
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->UY:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->Vq:Lcom/facebook/imagepipeline/memory/g$a;
 
     :cond_2
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->UZ:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->Vr:Lcom/facebook/imagepipeline/memory/g$a;
 
     if-ne p1, v1, :cond_3
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->UZ:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->Vr:Lcom/facebook/imagepipeline/memory/g$a;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -142,7 +142,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->UY:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->Vq:Lcom/facebook/imagepipeline/memory/g$a;
 
     if-ne v0, p1, :cond_0
 
@@ -151,22 +151,22 @@
     :cond_0
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/memory/g;->a(Lcom/facebook/imagepipeline/memory/g$a;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->UY:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->Vq:Lcom/facebook/imagepipeline/memory/g$a;
 
     if-nez v0, :cond_1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->UY:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->Vq:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->UZ:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->Vr:Lcom/facebook/imagepipeline/memory/g$a;
 
     return-void
 
     :cond_1
-    iput-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->Vc:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->Vu:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iput-object p1, v0, Lcom/facebook/imagepipeline/memory/g$a;->Va:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, v0, Lcom/facebook/imagepipeline/memory/g$a;->Vs:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->UY:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->Vq:Lcom/facebook/imagepipeline/memory/g$a;
 
     return-void
 .end method
@@ -187,7 +187,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->UX:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->Vp:Landroid/util/SparseArray;
 
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -207,7 +207,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->Vb:Ljava/util/LinkedList;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->Vt:Ljava/util/LinkedList;
 
     invoke-virtual {v0}, Ljava/util/LinkedList;->pollFirst()Ljava/lang/Object;
 
@@ -240,7 +240,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->UX:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->Vp:Landroid/util/SparseArray;
 
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -258,12 +258,12 @@
 
     invoke-direct {v0, p1, v1}, Lcom/facebook/imagepipeline/memory/g$a;-><init>(ILjava/util/LinkedList;)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->UX:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->Vp:Landroid/util/SparseArray;
 
     invoke-virtual {v1, p1, v0}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
 
     :cond_0
-    iget-object p1, v0, Lcom/facebook/imagepipeline/memory/g$a;->Vb:Ljava/util/LinkedList;
+    iget-object p1, v0, Lcom/facebook/imagepipeline/memory/g$a;->Vt:Ljava/util/LinkedList;
 
     invoke-virtual {p1, p2}, Ljava/util/LinkedList;->addLast(Ljava/lang/Object;)V
 
@@ -283,7 +283,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized iX()Ljava/lang/Object;
+.method public final declared-synchronized iW()Ljava/lang/Object;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -297,7 +297,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->UZ:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->Vr:Lcom/facebook/imagepipeline/memory/g$a;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -311,7 +311,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v1, v0, Lcom/facebook/imagepipeline/memory/g$a;->Vb:Ljava/util/LinkedList;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/memory/g$a;->Vt:Ljava/util/LinkedList;
 
     invoke-virtual {v1}, Ljava/util/LinkedList;->pollLast()Ljava/lang/Object;
 
@@ -319,7 +319,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/memory/g$a;->Vb:Ljava/util/LinkedList;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/memory/g$a;->Vt:Ljava/util/LinkedList;
 
     invoke-virtual {v2}, Ljava/util/LinkedList;->isEmpty()Z
 
@@ -329,7 +329,7 @@
 
     invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/memory/g;->a(Lcom/facebook/imagepipeline/memory/g$a;)V
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/g;->UX:Landroid/util/SparseArray;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/g;->Vp:Landroid/util/SparseArray;
 
     iget v0, v0, Lcom/facebook/imagepipeline/memory/g$a;->key:I
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/i.smali b/com.discord/smali/com/facebook/imagepipeline/memory/i.smali
index 55d91f684e..4e0d9f81f4 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/i.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/i.smali
@@ -8,7 +8,7 @@
 
 
 # instance fields
-.field private Vd:Ljava/nio/ByteBuffer;
+.field private Vv:Ljava/nio/ByteBuffer;
 
 .field private final aB:J
 
@@ -25,7 +25,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vd:Ljava/nio/ByteBuffer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vv:Ljava/nio/ByteBuffer;
 
     iput p1, p0, Lcom/facebook/imagepipeline/memory/i;->mSize:I
 
@@ -73,7 +73,7 @@
 
     invoke-static {v0, p1, v0, p4, p3}, Lcom/facebook/imagepipeline/memory/t;->b(IIIII)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->Vd:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->Vv:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p1, v0}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
 
@@ -85,7 +85,7 @@
 
     new-array p1, p4, [B
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/i;->Vd:Ljava/nio/ByteBuffer;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/i;->Vv:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p3, p1, v0, p4}, Ljava/nio/ByteBuffer;->get([BII)Ljava/nio/ByteBuffer;
 
@@ -159,7 +159,7 @@
     :goto_2
     invoke-static {v1}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vd:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vv:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, p1}, Ljava/nio/ByteBuffer;->get(I)B
 
@@ -215,11 +215,11 @@
 
     invoke-static {p1, v0, p3, p4, v1}, Lcom/facebook/imagepipeline/memory/t;->b(IIIII)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vd:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vv:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, p1}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->Vd:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->Vv:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p1, p2, p3, p4}, Ljava/nio/ByteBuffer;->get([BII)Ljava/nio/ByteBuffer;
     :try_end_0
@@ -242,7 +242,7 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iY()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->getUniqueId()J
 
     move-result-wide v0
 
@@ -272,7 +272,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iY()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->getUniqueId()J
 
     move-result-wide v1
 
@@ -297,7 +297,7 @@
     invoke-static {v4}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
     :cond_0
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->iY()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/r;->getUniqueId()J
 
     move-result-wide v0
 
@@ -427,11 +427,11 @@
 
     invoke-static {p1, v0, p3, p4, v1}, Lcom/facebook/imagepipeline/memory/t;->b(IIIII)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vd:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vv:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, p1}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->Vd:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->Vv:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p1, p2, p3, p4}, Ljava/nio/ByteBuffer;->put([BII)Ljava/nio/ByteBuffer;
     :try_end_0
@@ -457,7 +457,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vd:Ljava/nio/ByteBuffer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vv:Ljava/nio/ByteBuffer;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -473,7 +473,7 @@
     throw v0
 .end method
 
-.method public final fG()J
+.method public final fK()J
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -493,7 +493,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vd:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vv:Ljava/nio/ByteBuffer;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -517,7 +517,7 @@
     return v0
 .end method
 
-.method public final iY()J
+.method public final getUniqueId()J
     .locals 2
 
     iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/i;->aB:J
@@ -531,7 +531,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vd:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->Vv:Ljava/nio/ByteBuffer;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/q.smali b/com.discord/smali/com/facebook/imagepipeline/memory/q.smali
index 2c08bbdadd..8170c3b658 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/q.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/q.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final Vm:Ljava/util/Set;
+.field private final VE:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field private final Vn:Lcom/facebook/imagepipeline/memory/g;
+.field private final VF:Lcom/facebook/imagepipeline/memory/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/memory/g<",
@@ -49,13 +49,13 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->Vm:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->VE:Ljava/util/Set;
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/g;
 
     invoke-direct {v0}, Lcom/facebook/imagepipeline/memory/g;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->Vn:Lcom/facebook/imagepipeline/memory/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->VF:Lcom/facebook/imagepipeline/memory/g;
 
     return-void
 .end method
@@ -77,7 +77,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->Vm:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->VE:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
@@ -112,7 +112,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->Vn:Lcom/facebook/imagepipeline/memory/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->VF:Lcom/facebook/imagepipeline/memory/g;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/memory/g;->as(I)Ljava/lang/Object;
 
@@ -136,9 +136,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->Vn:Lcom/facebook/imagepipeline/memory/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->VF:Lcom/facebook/imagepipeline/memory/g;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/g;->iX()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/g;->iW()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -160,7 +160,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->Vm:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->VE:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -172,7 +172,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->Vn:Lcom/facebook/imagepipeline/memory/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->VF:Lcom/facebook/imagepipeline/memory/g;
 
     invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/memory/q;->R(Ljava/lang/Object;)I
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/r.smali b/com.discord/smali/com/facebook/imagepipeline/memory/r.smali
index d0d033d53d..ecd3da0af2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/r.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/r.smali
@@ -19,7 +19,7 @@
 .method public abstract close()V
 .end method
 
-.method public abstract fG()J
+.method public abstract fK()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/UnsupportedOperationException;
@@ -35,7 +35,7 @@
 .method public abstract getSize()I
 .end method
 
-.method public abstract iY()J
+.method public abstract getUniqueId()J
 .end method
 
 .method public abstract isClosed()Z
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/u.smali b/com.discord/smali/com/facebook/imagepipeline/memory/u.smali
index 53c7c45c6a..dea678c69b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/u.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/u.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field Vo:Lcom/facebook/common/references/CloseableReference;
+.field VG:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -60,18 +60,18 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->fJ()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->fN()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/u;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/u;->VG:Lcom/facebook/common/references/CloseableReference;
 
     iput p2, p0, Lcom/facebook/imagepipeline/memory/u;->mSize:I
 
     return-void
 .end method
 
-.method private declared-synchronized fN()V
+.method private declared-synchronized fR()V
     .locals 1
 
     monitor-enter p0
@@ -115,7 +115,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->fN()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->fR()V
 
     const/4 v0, 0x1
 
@@ -145,7 +145,7 @@
     :goto_1
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->VG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -177,7 +177,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->fN()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->fR()V
 
     add-int v0, p1, p4
 
@@ -195,7 +195,7 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->VG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -227,13 +227,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->VG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->VG:Lcom/facebook/common/references/CloseableReference;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -249,7 +249,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized fG()J
+.method public final declared-synchronized fK()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -260,9 +260,9 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->fN()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->fR()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->VG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -270,7 +270,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/memory/r;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/memory/r;->fG()J
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/memory/r;->fK()J
 
     move-result-wide v0
     :try_end_0
@@ -296,7 +296,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->VG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -328,7 +328,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/u;->VG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
 
@@ -370,7 +370,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->fN()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/u;->fR()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/u;->mSize:I
     :try_end_0
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali
index 5b3ba1f359..96713e6977 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali
@@ -7,18 +7,18 @@
 
 
 # static fields
-.field protected static final VP:[B
+.field protected static final Wh:[B
 
 
 # instance fields
-.field private final VQ:Lcom/facebook/imagepipeline/memory/b;
+.field private final Wi:Lcom/facebook/imagepipeline/memory/b;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jj()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jh()V
 
     const/4 v0, 0x2
 
@@ -26,7 +26,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->VP:[B
+    sput-object v0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Wh:[B
 
     return-void
 
@@ -42,11 +42,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/c;->iV()Lcom/facebook/imagepipeline/memory/b;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/c;->iU()Lcom/facebook/imagepipeline/memory/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->VQ:Lcom/facebook/imagepipeline/memory/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Wi:Lcom/facebook/imagepipeline/memory/b;
 
     return-void
 .end method
@@ -153,7 +153,7 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->VQ:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Wi:Lcom/facebook/imagepipeline/memory/b;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/memory/b;->c(Landroid/graphics/Bitmap;)Z
 
@@ -161,9 +161,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->VQ:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Wi:Lcom/facebook/imagepipeline/memory/b;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/b;->UM:Lcom/facebook/common/references/b;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/b;->Vf:Lcom/facebook/common/references/b;
 
     invoke-static {p1, v0}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Object;Lcom/facebook/common/references/b;)Lcom/facebook/common/references/CloseableReference;
 
@@ -194,7 +194,7 @@
 
     const/4 v0, 0x1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->VQ:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Wi:Lcom/facebook/imagepipeline/memory/b;
 
     invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->getCount()I
 
@@ -208,7 +208,7 @@
 
     const/4 v0, 0x2
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->VQ:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Wi:Lcom/facebook/imagepipeline/memory/b;
 
     invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->getSize()J
 
@@ -222,9 +222,9 @@
 
     const/4 v0, 0x3
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->VQ:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Wi:Lcom/facebook/imagepipeline/memory/b;
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->iU()I
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->iT()I
 
     move-result v2
 
@@ -236,7 +236,7 @@
 
     const/4 v0, 0x4
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->VQ:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Wi:Lcom/facebook/imagepipeline/memory/b;
 
     invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->getMaxSize()I
 
@@ -357,13 +357,13 @@
         }
     .end annotation
 
-    iget p3, p1, Lcom/facebook/imagepipeline/f/e;->Ut:I
+    iget p3, p1, Lcom/facebook/imagepipeline/f/e;->UL:I
 
     invoke-static {p3, p2}, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->a(ILandroid/graphics/Bitmap$Config;)Landroid/graphics/BitmapFactory$Options;
 
     move-result-object p2
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -413,13 +413,13 @@
         }
     .end annotation
 
-    iget p3, p1, Lcom/facebook/imagepipeline/f/e;->Ut:I
+    iget p3, p1, Lcom/facebook/imagepipeline/f/e;->UL:I
 
     invoke-static {p3, p2}, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->a(ILandroid/graphics/Bitmap$Config;)Landroid/graphics/BitmapFactory$Options;
 
     move-result-object p2
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.smali
index 9ab09ef689..2e300c1eb5 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.smali
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private Tn:I
+.field private TF:I
 
-.field private VS:Z
+.field private Wk:Z
 
-.field private VT:Z
+.field private Wl:Z
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fc()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fh()V
 
     return-void
 .end method
@@ -28,11 +28,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->VS:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->Wk:Z
 
-    iput p2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->Tn:I
+    iput p2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->TF:I
 
-    iput-boolean p3, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->VT:Z
+    iput-boolean p3, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->Wl:Z
 
     return-void
 .end method
@@ -86,12 +86,12 @@
     :cond_0
     if-nez p3, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hK()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hN()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object p3
 
     :cond_1
-    iget v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->Tn:I
+    iget v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->TF:I
 
     invoke-static {p3, p4, p1, v0}, Lcom/facebook/imagepipeline/j/a;->a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;Lcom/facebook/imagepipeline/f/e;I)I
 
@@ -100,7 +100,7 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->VS:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->Wk:Z
 
     invoke-static {p3, p4, p1, v2}, Lcom/facebook/imagepipeline/j/e;->a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;Lcom/facebook/imagepipeline/f/e;Z)I
 
@@ -110,7 +110,7 @@
 
     move-result v2
 
-    iget-boolean v3, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->VT:Z
+    iget-boolean v3, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->Wl:Z
 
     if-eqz v3, :cond_2
 
@@ -121,9 +121,9 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/facebook/imagepipeline/j/e;->YJ:Lcom/facebook/common/d/e;
+    sget-object v2, Lcom/facebook/imagepipeline/j/e;->Zb:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iI()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iH()I
 
     move-result v3
 
@@ -160,7 +160,7 @@
 
     move-result p3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fc()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fh()V
 
     if-lez p4, :cond_3
 
@@ -259,7 +259,7 @@
 
     move-result p3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fc()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fh()V
 
     if-lez p4, :cond_a
 
@@ -384,12 +384,12 @@
 
     if-nez p2, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hK()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hN()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object p2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->VS:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->Wk:Z
 
     invoke-static {p2, p3, p1, v0}, Lcom/facebook/imagepipeline/j/e;->a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;Lcom/facebook/imagepipeline/f/e;Z)I
 
@@ -412,7 +412,7 @@
 .method public final c(Lcom/facebook/d/c;)Z
     .locals 1
 
-    sget-object v0, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
     if-ne p1, v0, :cond_0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory.smali b/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory.smali
index 98b23ff8f6..3fea82fbc7 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final Tn:I
+.field private final TF:I
 
-.field private final VU:Z
+.field private final Wm:Z
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->Tn:I
+    iput p1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->TF:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->VU:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->Wm:Z
 
     return-void
 .end method
@@ -32,7 +32,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-object v0, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
     if-eq p1, v0, :cond_0
 
@@ -43,9 +43,9 @@
     :cond_0
     new-instance p1, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;
 
-    iget v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->Tn:I
+    iget v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->TF:I
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->VU:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->Wm:Z
 
     invoke-direct {p1, p2, v0, v1}, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;-><init>(ZIZ)V
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/platform/b.smali b/com.discord/smali/com/facebook/imagepipeline/platform/b.smali
index 4e0b11e014..65d1634558 100644
--- a/com.discord/smali/com/facebook/imagepipeline/platform/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/platform/b.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -16,18 +16,18 @@
     .end annotation
 .end field
 
-.field private static final VZ:[B
+.field private static final Wr:[B
 
 
 # instance fields
-.field private final QC:Lcom/facebook/imagepipeline/memory/d;
+.field private final QU:Lcom/facebook/imagepipeline/memory/d;
 
-.field private final VX:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
+.field private final Wp:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final VY:Landroidx/core/util/Pools$SynchronizedPool;
+.field final Wq:Landroidx/core/util/Pools$SynchronizedPool;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/core/util/Pools$SynchronizedPool<",
@@ -44,7 +44,7 @@
 
     const-class v0, Lcom/facebook/imagepipeline/platform/b;
 
-    sput-object v0, Lcom/facebook/imagepipeline/platform/b;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/platform/b;->FC:Ljava/lang/Class;
 
     const/4 v0, 0x2
 
@@ -52,7 +52,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/facebook/imagepipeline/platform/b;->VZ:[B
+    sput-object v0, Lcom/facebook/imagepipeline/platform/b;->Wr:[B
 
     return-void
 
@@ -86,18 +86,18 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/imagepipeline/platform/b;->VX:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/platform/b;->Wp:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->QU:Lcom/facebook/imagepipeline/memory/d;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->VY:Landroidx/core/util/Pools$SynchronizedPool;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->Wq:Landroidx/core/util/Pools$SynchronizedPool;
 
     const/4 p1, 0x0
 
     :goto_1
     if-ge p1, p2, :cond_1
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->VY:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->Wq:Landroidx/core/util/Pools$SynchronizedPool;
 
     const/16 v0, 0x4000
 
@@ -122,7 +122,7 @@
 
     invoke-direct {v0}, Landroid/graphics/BitmapFactory$Options;-><init>()V
 
-    iget v1, p0, Lcom/facebook/imagepipeline/f/e;->Ut:I
+    iget v1, p0, Lcom/facebook/imagepipeline/f/e;->UL:I
 
     iput v1, v0, Landroid/graphics/BitmapFactory$Options;->inSampleSize:I
 
@@ -222,7 +222,7 @@
 
     if-lt v2, v3, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/platform/b;->VX:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/platform/b;->Wp:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
 
     if-eqz v2, :cond_1
 
@@ -268,7 +268,7 @@
 
     move-result v2
 
-    iget-object v7, p0, Lcom/facebook/imagepipeline/platform/b;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iget-object v7, p0, Lcom/facebook/imagepipeline/platform/b;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     invoke-interface {v7, v2}, Lcom/facebook/imagepipeline/memory/d;->get(I)Ljava/lang/Object;
 
@@ -296,7 +296,7 @@
     iput-object p4, p2, Landroid/graphics/BitmapFactory$Options;->inPreferredColorSpace:Landroid/graphics/ColorSpace;
 
     :cond_4
-    iget-object p4, p0, Lcom/facebook/imagepipeline/platform/b;->VY:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p4, p0, Lcom/facebook/imagepipeline/platform/b;->Wq:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {p4}, Landroidx/core/util/Pools$SynchronizedPool;->acquire()Ljava/lang/Object;
 
@@ -371,7 +371,7 @@
 
     :catch_1
     :try_start_4
-    sget-object v1, Lcom/facebook/imagepipeline/platform/b;->Fl:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/platform/b;->FC:Ljava/lang/Class;
 
     const-string v3, "Could not decode region %s, decoding full bitmap instead."
 
@@ -418,7 +418,7 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_2
 
     :cond_9
-    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->VY:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->Wq:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {p1, p4}, Landroidx/core/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
 
@@ -429,7 +429,7 @@
     goto :goto_5
 
     :cond_a
-    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     invoke-interface {p1, v2}, Lcom/facebook/imagepipeline/memory/d;->z(Ljava/lang/Object;)V
 
@@ -443,7 +443,7 @@
 
     :cond_b
     :goto_5
-    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     invoke-static {p3, p1}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Object;Lcom/facebook/common/references/b;)Lcom/facebook/common/references/CloseableReference;
 
@@ -462,7 +462,7 @@
     if-eqz v2, :cond_c
 
     :try_start_6
-    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     invoke-interface {p2, v2}, Lcom/facebook/imagepipeline/memory/d;->z(Ljava/lang/Object;)V
 
@@ -474,7 +474,7 @@
 
     if-eqz v2, :cond_d
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     invoke-interface {p3, v2}, Lcom/facebook/imagepipeline/memory/d;->z(Ljava/lang/Object;)V
     :try_end_6
@@ -490,7 +490,7 @@
 
     if-eqz p1, :cond_e
 
-    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->hy()Lcom/facebook/imagepipeline/bitmaps/g;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->hB()Lcom/facebook/imagepipeline/bitmaps/g;
 
     move-result-object p3
 
@@ -501,7 +501,7 @@
     .catch Ljava/io/IOException; {:try_start_7 .. :try_end_7} :catch_4
     .catchall {:try_start_7 .. :try_end_7} :catchall_2
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->VY:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->Wq:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {p2, p4}, Landroidx/core/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
 
@@ -521,7 +521,7 @@
     .catchall {:try_start_9 .. :try_end_9} :catchall_2
 
     :goto_6
-    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->VY:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->Wq:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {p2, p4}, Landroidx/core/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
 
@@ -595,9 +595,9 @@
     .end annotation
 
     :goto_0
-    iget-object p3, p1, Lcom/facebook/imagepipeline/f/e;->Us:Lcom/facebook/d/c;
+    iget-object p3, p1, Lcom/facebook/imagepipeline/f/e;->UK:Lcom/facebook/d/c;
 
-    sget-object v0, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
     const/4 v1, 0x0
 
@@ -611,18 +611,18 @@
     goto :goto_2
 
     :cond_0
-    iget-object p3, p1, Lcom/facebook/imagepipeline/f/e;->Ur:Lcom/facebook/common/d/k;
+    iget-object p3, p1, Lcom/facebook/imagepipeline/f/e;->UJ:Lcom/facebook/common/d/k;
 
     if-eqz p3, :cond_1
 
     goto :goto_1
 
     :cond_1
-    iget-object p3, p1, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object p3, p1, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {p3}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p3, p1, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object p3, p1, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {p3}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -683,7 +683,7 @@
 
     new-instance p3, Lcom/facebook/common/i/b;
 
-    sget-object v3, Lcom/facebook/imagepipeline/platform/b;->VZ:[B
+    sget-object v3, Lcom/facebook/imagepipeline/platform/b;->Wr:[B
 
     invoke-direct {p3, v0, v3}, Lcom/facebook/common/i/b;-><init>(Ljava/io/InputStream;[B)V
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/platform/c.smali b/com.discord/smali/com/facebook/imagepipeline/platform/c.smali
index fe8c01cc7c..55bbbcb074 100644
--- a/com.discord/smali/com/facebook/imagepipeline/platform/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/platform/c.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static Wa:Ljava/lang/reflect/Method;
+.field private static Ws:Ljava/lang/reflect/Method;
 
 
 # instance fields
-.field private final Th:Lcom/facebook/common/k/b;
+.field private final Tz:Lcom/facebook/common/k/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -20,11 +20,11 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;-><init>()V
 
-    invoke-static {}, Lcom/facebook/common/k/c;->fT()Lcom/facebook/common/k/b;
+    invoke-static {}, Lcom/facebook/common/k/c;->fX()Lcom/facebook/common/k/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/platform/c;->Th:Lcom/facebook/common/k/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/platform/c;->Tz:Lcom/facebook/common/k/b;
 
     return-void
 .end method
@@ -54,11 +54,11 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/c;->Th:Lcom/facebook/common/k/b;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/c;->Tz:Lcom/facebook/common/k/b;
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/c;->Th:Lcom/facebook/common/k/b;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/c;->Tz:Lcom/facebook/common/k/b;
 
     invoke-interface {p2, p1, p4}, Lcom/facebook/common/k/b;->a(Ljava/io/FileDescriptor;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
 
@@ -187,7 +187,7 @@
 
     move-result-object v3
 
-    invoke-static {v4, v3}, Lcom/facebook/common/d/a;->a(Ljava/io/InputStream;Ljava/io/OutputStream;)J
+    invoke-static {v4, v3}, Lcom/facebook/common/d/a;->copy(Ljava/io/InputStream;Ljava/io/OutputStream;)J
 
     if-eqz p2, :cond_1
 
@@ -247,7 +247,7 @@
     .locals 2
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/platform/c;->jl()Ljava/lang/reflect/Method;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/platform/c;->jj()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
@@ -275,13 +275,13 @@
     throw p1
 .end method
 
-.method private declared-synchronized jl()Ljava/lang/reflect/Method;
+.method private declared-synchronized jj()Ljava/lang/reflect/Method;
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->Wa:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->Ws:Ljava/lang/reflect/Method;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -300,7 +300,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/platform/c;->Wa:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/facebook/imagepipeline/platform/c;->Ws:Ljava/lang/reflect/Method;
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -319,7 +319,7 @@
 
     :cond_0
     :goto_0
-    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->Wa:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->Ws:Ljava/lang/reflect/Method;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -362,7 +362,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->VP:[B
+    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->Wh:[B
 
     :goto_0
     invoke-direct {p0, p1, p2, v0, p3}, Lcom/facebook/imagepipeline/platform/c;->a(Lcom/facebook/common/references/CloseableReference;I[BLandroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
diff --git a/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder.smali b/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder.smali
index 0f7c1a44ee..32c79993e2 100644
--- a/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder.smali
@@ -12,55 +12,55 @@
 
 
 # instance fields
-.field public QN:Lcom/facebook/imagepipeline/a/e;
+.field public Rf:Lcom/facebook/imagepipeline/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public QO:Lcom/facebook/imagepipeline/a/f;
+.field public Rg:Lcom/facebook/imagepipeline/a/f;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field QP:Lcom/facebook/imagepipeline/a/b;
+.field Rh:Lcom/facebook/imagepipeline/a/b;
 
-.field SX:Z
-
-.field Sr:Lcom/facebook/imagepipeline/g/c;
+.field SJ:Lcom/facebook/imagepipeline/g/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Td:Z
+.field Tp:Z
 
-.field public Uv:Lcom/facebook/imagepipeline/a/a;
+.field Tv:Z
+
+.field public UN:Lcom/facebook/imagepipeline/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public We:Lcom/facebook/imagepipeline/request/b$b;
+.field public Ww:Lcom/facebook/imagepipeline/request/b$b;
 
-.field XJ:Lcom/facebook/imagepipeline/request/c;
+.field public YG:Lcom/facebook/imagepipeline/request/b$a;
+
+.field YH:Landroid/net/Uri;
+
+.field YK:Z
+
+.field YL:Lcom/facebook/imagepipeline/a/d;
+
+.field YN:Ljava/lang/Boolean;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field YF:Z
-
-.field public Yo:Lcom/facebook/imagepipeline/request/b$a;
-
-.field Yp:Landroid/net/Uri;
-
-.field Ys:Z
-
-.field Yt:Lcom/facebook/imagepipeline/a/d;
-
-.field Yv:Ljava/lang/Boolean;
+.field YO:Ljava/lang/Boolean;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Yw:Ljava/lang/Boolean;
+.field YX:Z
+
+.field public Yb:Lcom/facebook/imagepipeline/request/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -74,115 +74,115 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yp:Landroid/net/Uri;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YH:Landroid/net/Uri;
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YA:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YS:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->We:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ww:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QN:Lcom/facebook/imagepipeline/a/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rf:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QO:Lcom/facebook/imagepipeline/a/f;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/b;->hJ()Lcom/facebook/imagepipeline/a/b;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/b;->hM()Lcom/facebook/imagepipeline/a/b;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QP:Lcom/facebook/imagepipeline/a/b;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rh:Lcom/facebook/imagepipeline/a/b;
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$a;->Yy:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$a;->YQ:Lcom/facebook/imagepipeline/request/b$a;
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yo:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YG:Lcom/facebook/imagepipeline/request/b$a;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/b/h;->hV()Lcom/facebook/imagepipeline/b/h$b;
+    invoke-static {}, Lcom/facebook/imagepipeline/b/h;->hX()Lcom/facebook/imagepipeline/b/h$b;
 
     move-result-object v1
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/h$b;->Td:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/h$b;->Tv:Z
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Td:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Tv:Z
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ys:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YK:Z
 
-    sget-object v1, Lcom/facebook/imagepipeline/a/d;->Sc:Lcom/facebook/imagepipeline/a/d;
+    sget-object v1, Lcom/facebook/imagepipeline/a/d;->Su:Lcom/facebook/imagepipeline/a/d;
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yt:Lcom/facebook/imagepipeline/a/d;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YL:Lcom/facebook/imagepipeline/a/d;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->SX:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Tp:Z
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YF:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YX:Z
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yv:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YN:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UN:Lcom/facebook/imagepipeline/a/a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yw:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YO:Ljava/lang/Boolean;
 
     return-void
 .end method
 
-.method public static i(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
+.method public static h(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->r(Landroid/net/Uri;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Rh:Lcom/facebook/imagepipeline/a/b;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QP:Lcom/facebook/imagepipeline/a/b;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rh:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->UN:Lcom/facebook/imagepipeline/a/a;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UN:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Yo:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->YG:Lcom/facebook/imagepipeline/request/b$a;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yo:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YG:Lcom/facebook/imagepipeline/request/b$a;
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->Ys:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->YK:Z
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ys:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YK:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->We:Lcom/facebook/imagepipeline/request/b$b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Ww:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->We:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ww:Lcom/facebook/imagepipeline/request/b$b;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Yb:Lcom/facebook/imagepipeline/request/c;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yb:Lcom/facebook/imagepipeline/request/c;
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->Td:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->Tv:Z
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Td:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Tv:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Yt:Lcom/facebook/imagepipeline/a/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->YL:Lcom/facebook/imagepipeline/a/d;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yt:Lcom/facebook/imagepipeline/a/d;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YL:Lcom/facebook/imagepipeline/a/d;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QN:Lcom/facebook/imagepipeline/a/e;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rf:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->SJ:Lcom/facebook/imagepipeline/g/c;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->SJ:Lcom/facebook/imagepipeline/g/c;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QO:Lcom/facebook/imagepipeline/a/f;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->Yv:Ljava/lang/Boolean;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->YN:Ljava/lang/Boolean;
 
-    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yv:Ljava/lang/Boolean;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YN:Ljava/lang/Boolean;
 
     return-object v0
 .end method
@@ -196,7 +196,7 @@
 
     invoke-static {p0}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yp:Landroid/net/Uri;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YH:Landroid/net/Uri;
 
     return-object v0
 .end method
@@ -210,31 +210,7 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QO:Lcom/facebook/imagepipeline/a/f;
-
-    return-object p0
-.end method
-
-.method public final a(Lcom/facebook/imagepipeline/request/b$a;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
-    .locals 0
-
-    iput-object p1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yo:Lcom/facebook/imagepipeline/request/b$a;
-
-    return-object p0
-.end method
-
-.method public final a(Lcom/facebook/imagepipeline/request/b$b;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
-    .locals 0
-
-    iput-object p1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->We:Lcom/facebook/imagepipeline/request/b$b;
-
-    return-object p0
-.end method
-
-.method public final a(Lcom/facebook/imagepipeline/request/c;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
-    .locals 0
-
-    iput-object p1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rg:Lcom/facebook/imagepipeline/a/f;
 
     return-object p0
 .end method
@@ -246,15 +222,15 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QN:Lcom/facebook/imagepipeline/a/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     return-object p0
 .end method
 
-.method public final jS()Lcom/facebook/imagepipeline/request/b;
+.method public final jQ()Lcom/facebook/imagepipeline/request/b;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yp:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YH:Landroid/net/Uri;
 
     if-eqz v0, :cond_5
 
@@ -264,7 +240,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yp:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YH:Landroid/net/Uri;
 
     invoke-virtual {v0}, Landroid/net/Uri;->isAbsolute()Z
 
@@ -272,7 +248,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yp:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YH:Landroid/net/Uri;
 
     invoke-virtual {v0}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
@@ -285,7 +261,7 @@
     if-nez v0, :cond_0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yp:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YH:Landroid/net/Uri;
 
     invoke-virtual {v0}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
@@ -332,7 +308,7 @@
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yp:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YH:Landroid/net/Uri;
 
     invoke-static {v0}, Lcom/facebook/common/j/f;->h(Landroid/net/Uri;)Z
 
@@ -340,7 +316,7 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yp:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YH:Landroid/net/Uri;
 
     invoke-virtual {v0}, Landroid/net/Uri;->isAbsolute()Z
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/request/b.smali b/com.discord/smali/com/facebook/imagepipeline/request/b.smali
index bddad128ea..ea50a395cd 100644
--- a/com.discord/smali/com/facebook/imagepipeline/request/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/request/b.smali
@@ -13,56 +13,56 @@
 
 
 # instance fields
-.field public final QN:Lcom/facebook/imagepipeline/a/e;
+.field public final Rf:Lcom/facebook/imagepipeline/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final QO:Lcom/facebook/imagepipeline/a/f;
+.field public final Rg:Lcom/facebook/imagepipeline/a/f;
 
-.field public final QP:Lcom/facebook/imagepipeline/a/b;
+.field public final Rh:Lcom/facebook/imagepipeline/a/b;
 
-.field public final Sr:Lcom/facebook/imagepipeline/g/c;
+.field public final SJ:Lcom/facebook/imagepipeline/g/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Td:Z
+.field public final Tv:Z
 
-.field public final Uv:Lcom/facebook/imagepipeline/a/a;
+.field public final UN:Lcom/facebook/imagepipeline/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final WI:Z
+.field public final Ww:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public final We:Lcom/facebook/imagepipeline/request/b$b;
+.field public final Xb:Z
 
-.field public final XJ:Lcom/facebook/imagepipeline/request/c;
+.field public final YG:Lcom/facebook/imagepipeline/request/b$a;
+
+.field public final YH:Landroid/net/Uri;
+
+.field public final YI:I
+
+.field private YJ:Ljava/io/File;
+
+.field public final YK:Z
+
+.field public final YL:Lcom/facebook/imagepipeline/a/d;
+
+.field public final YM:Z
+
+.field final YN:Ljava/lang/Boolean;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Yo:Lcom/facebook/imagepipeline/request/b$a;
-
-.field public final Yp:Landroid/net/Uri;
-
-.field public final Yq:I
-
-.field private Yr:Ljava/io/File;
-
-.field public final Ys:Z
-
-.field public final Yt:Lcom/facebook/imagepipeline/a/d;
-
-.field public final Yu:Z
-
-.field final Yv:Ljava/lang/Boolean;
+.field public final YO:Ljava/lang/Boolean;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Yw:Ljava/lang/Boolean;
+.field public final Yb:Lcom/facebook/imagepipeline/request/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -74,15 +74,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yo:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YG:Lcom/facebook/imagepipeline/request/b$a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yo:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->YG:Lcom/facebook/imagepipeline/request/b$a;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yp:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YH:Landroid/net/Uri;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     const/4 v1, 0x0
 
@@ -109,11 +109,11 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/facebook/common/f/a;->au(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/facebook/common/f/a;->ap(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/facebook/common/f/a;->at(Ljava/lang/String;)Z
+    invoke-static {v0}, Lcom/facebook/common/f/a;->ao(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -187,57 +187,57 @@
     const/4 v0, -0x1
 
     :goto_0
-    iput v0, p0, Lcom/facebook/imagepipeline/request/b;->Yq:I
+    iput v0, p0, Lcom/facebook/imagepipeline/request/b;->YI:I
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Td:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Tv:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->Td:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->Tv:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ys:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YK:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->Ys:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->YK:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rh:Lcom/facebook/imagepipeline/a/b;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->QP:Lcom/facebook/imagepipeline/a/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Rh:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rf:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rg:Lcom/facebook/imagepipeline/a/f;
 
     if-nez v0, :cond_8
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hK()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hN()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object v0
 
     goto :goto_1
 
     :cond_8
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Rg:Lcom/facebook/imagepipeline/a/f;
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UN:Lcom/facebook/imagepipeline/a/a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->UN:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yt:Lcom/facebook/imagepipeline/a/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YL:Lcom/facebook/imagepipeline/a/d;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yt:Lcom/facebook/imagepipeline/a/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->YL:Lcom/facebook/imagepipeline/a/d;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->We:Lcom/facebook/imagepipeline/request/b$b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ww:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->We:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Ww:Lcom/facebook/imagepipeline/request/b$b;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->SX:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Tp:Z
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yp:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YH:Landroid/net/Uri;
 
     invoke-static {v0}, Lcom/facebook/common/j/f;->c(Landroid/net/Uri;)Z
 
@@ -248,27 +248,27 @@
     const/4 v1, 0x1
 
     :cond_9
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->Yu:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->YM:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YF:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YX:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->WI:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->Xb:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yv:Ljava/lang/Boolean;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YN:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yv:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->YN:Ljava/lang/Boolean;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yb:Lcom/facebook/imagepipeline/request/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yb:Lcom/facebook/imagepipeline/request/c;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->SJ:Lcom/facebook/imagepipeline/g/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Sr:Lcom/facebook/imagepipeline/g/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->SJ:Lcom/facebook/imagepipeline/g/c;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Yw:Ljava/lang/Boolean;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->YO:Ljava/lang/Boolean;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/request/b;->Yw:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/request/b;->YO:Ljava/lang/Boolean;
 
     return-void
 .end method
@@ -289,9 +289,9 @@
     :cond_0
     check-cast p1, Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-static {v0, v2}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -299,9 +299,9 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yo:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->YG:Lcom/facebook/imagepipeline/request/b$a;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Yo:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->YG:Lcom/facebook/imagepipeline/request/b$a;
 
     invoke-static {v0, v2}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -309,9 +309,9 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yr:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->YJ:Ljava/io/File;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Yr:Ljava/io/File;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->YJ:Ljava/io/File;
 
     invoke-static {v0, v2}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -319,9 +319,9 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->UN:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->UN:Lcom/facebook/imagepipeline/a/a;
 
     invoke-static {v0, v2}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -329,9 +329,9 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Rh:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Rh:Lcom/facebook/imagepipeline/a/b;
 
     invoke-static {v0, v2}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -339,9 +339,9 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     invoke-static {v0, v2}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -349,9 +349,9 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
     invoke-static {v0, v2}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -362,7 +362,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     const/4 v1, 0x0
 
@@ -378,7 +378,7 @@
     move-object v0, v1
 
     :goto_0
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     if-eqz p1, :cond_3
 
@@ -401,7 +401,7 @@
 .method public final hashCode()I
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     if-eqz v0, :cond_0
 
@@ -421,43 +421,43 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Yo:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->YG:Lcom/facebook/imagepipeline/request/b$a;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x1
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Yr:Ljava/io/File;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->YJ:Ljava/io/File;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x3
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->UN:Lcom/facebook/imagepipeline/a/a;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x4
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Rh:Lcom/facebook/imagepipeline/a/b;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x5
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x6
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
     aput-object v3, v1, v2
 
@@ -467,7 +467,7 @@
 
     const/16 v0, 0x8
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/request/b;->Yw:Ljava/lang/Boolean;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/request/b;->YO:Ljava/lang/Boolean;
 
     aput-object v2, v1, v0
 
@@ -478,19 +478,19 @@
     return v0
 .end method
 
-.method public final declared-synchronized jR()Ljava/io/File;
+.method public final declared-synchronized jP()Ljava/io/File;
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yr:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->YJ:Ljava/io/File;
 
     if-nez v0, :cond_0
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-virtual {v1}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
@@ -498,10 +498,10 @@
 
     invoke-direct {v0, v1}, Ljava/io/File;-><init>(Ljava/lang/String;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yr:Ljava/io/File;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->YJ:Ljava/io/File;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Yr:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->YJ:Ljava/io/File;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -524,7 +524,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     const-string v2, "uri"
 
@@ -532,7 +532,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Yo:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->YG:Lcom/facebook/imagepipeline/request/b$a;
 
     const-string v2, "cacheChoice"
 
@@ -540,7 +540,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Rh:Lcom/facebook/imagepipeline/a/b;
 
     const-string v2, "decodeOptions"
 
@@ -548,7 +548,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     const-string v2, "postprocessor"
 
@@ -556,7 +556,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Yt:Lcom/facebook/imagepipeline/a/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->YL:Lcom/facebook/imagepipeline/a/d;
 
     const-string v2, "priority"
 
@@ -564,7 +564,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     const-string v2, "resizeOptions"
 
@@ -572,7 +572,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
     const-string v2, "rotationOptions"
 
@@ -580,7 +580,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->UN:Lcom/facebook/imagepipeline/a/a;
 
     const-string v2, "bytesRange"
 
@@ -588,7 +588,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Yw:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->YO:Ljava/lang/Boolean;
 
     const-string v2, "resizingAllowedOverride"
 
diff --git a/com.discord/smali/com/facebook/imageutils/a.smali b/com.discord/smali/com/facebook/imageutils/a.smali
index eac672d061..135dc4d257 100644
--- a/com.discord/smali/com/facebook/imageutils/a.smali
+++ b/com.discord/smali/com/facebook/imageutils/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final YL:Landroidx/core/util/Pools$SynchronizedPool;
+.field private static final Zd:Landroidx/core/util/Pools$SynchronizedPool;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/core/util/Pools$SynchronizedPool<",
@@ -25,7 +25,7 @@
 
     invoke-direct {v0, v1}, Landroidx/core/util/Pools$SynchronizedPool;-><init>(I)V
 
-    sput-object v0, Lcom/facebook/imageutils/a;->YL:Landroidx/core/util/Pools$SynchronizedPool;
+    sput-object v0, Lcom/facebook/imageutils/a;->Zd:Landroidx/core/util/Pools$SynchronizedPool;
 
     return-void
 .end method
@@ -33,7 +33,7 @@
 .method public static c(Landroid/graphics/Bitmap$Config;)I
     .locals 3
 
-    sget-object v0, Lcom/facebook/imageutils/a$1;->YM:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->Ze:[I
 
     invoke-virtual {p0}, Landroid/graphics/Bitmap$Config;->ordinal()I
 
@@ -176,7 +176,7 @@
 
     invoke-static {p0}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/facebook/imageutils/a;->YL:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v0, Lcom/facebook/imageutils/a;->Zd:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {v0}, Landroidx/core/util/Pools$SynchronizedPool;->acquire()Ljava/lang/Object;
 
@@ -245,7 +245,7 @@
 
     :cond_2
     :goto_0
-    sget-object p0, Lcom/facebook/imageutils/a;->YL:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object p0, Lcom/facebook/imageutils/a;->Zd:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {p0, v0}, Landroidx/core/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
 
@@ -254,7 +254,7 @@
     :catchall_0
     move-exception p0
 
-    sget-object v1, Lcom/facebook/imageutils/a;->YL:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v1, Lcom/facebook/imageutils/a;->Zd:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {v1, v0}, Landroidx/core/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
 
@@ -266,7 +266,7 @@
 
     invoke-static {p0}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/facebook/imageutils/a;->YL:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v0, Lcom/facebook/imageutils/a;->Zd:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {v0}, Landroidx/core/util/Pools$SynchronizedPool;->acquire()Ljava/lang/Object;
 
@@ -321,7 +321,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    sget-object v1, Lcom/facebook/imageutils/a;->YL:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v1, Lcom/facebook/imageutils/a;->Zd:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {v1, v0}, Landroidx/core/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
 
@@ -330,7 +330,7 @@
     :catchall_0
     move-exception p0
 
-    sget-object v1, Lcom/facebook/imageutils/a;->YL:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v1, Lcom/facebook/imageutils/a;->Zd:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {v1, v0}, Landroidx/core/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/facebook/imageutils/b.smali b/com.discord/smali/com/facebook/imageutils/b.smali
index 05184c71fc..ea9e763cea 100644
--- a/com.discord/smali/com/facebook/imageutils/b.smali
+++ b/com.discord/smali/com/facebook/imageutils/b.smali
@@ -4,12 +4,12 @@
 
 
 # instance fields
-.field public final Uw:Landroid/graphics/ColorSpace;
+.field public final UO:Landroid/graphics/ColorSpace;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final YN:Landroid/util/Pair;
+.field public final Zf:Landroid/util/Pair;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/Pair<",
@@ -62,9 +62,9 @@
     const/4 v0, 0x0
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/imageutils/b;->YN:Landroid/util/Pair;
+    iput-object v0, p0, Lcom/facebook/imageutils/b;->Zf:Landroid/util/Pair;
 
-    iput-object p3, p0, Lcom/facebook/imageutils/b;->Uw:Landroid/graphics/ColorSpace;
+    iput-object p3, p0, Lcom/facebook/imageutils/b;->UO:Landroid/graphics/ColorSpace;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/soloader/SoLoader.smali b/com.discord/smali/com/facebook/soloader/SoLoader.smali
index a5853eb0a8..5356e20742 100644
--- a/com.discord/smali/com/facebook/soloader/SoLoader.smali
+++ b/com.discord/smali/com/facebook/soloader/SoLoader.smali
@@ -13,33 +13,19 @@
 
 
 # static fields
-.field static final aae:Z
+.field private static aaA:I
 
-.field static aaf:Lcom/facebook/soloader/h;
+.field private static aaB:[Lcom/facebook/soloader/k;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static final aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
-
-.field private static aah:[Lcom/facebook/soloader/i;
+.field private static aaC:Lcom/facebook/soloader/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static aai:I
-
-.field private static aaj:[Lcom/facebook/soloader/k;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private static aak:Lcom/facebook/soloader/b;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private static final aal:Ljava/util/HashSet;
+.field private static final aaD:Ljava/util/HashSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashSet<",
@@ -49,7 +35,7 @@
     .end annotation
 .end field
 
-.field private static final aam:Ljava/util/Map;
+.field private static final aaE:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -60,7 +46,7 @@
     .end annotation
 .end field
 
-.field private static final aan:Ljava/util/Set;
+.field private static final aaF:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -70,12 +56,26 @@
     .end annotation
 .end field
 
-.field private static aao:Lcom/facebook/soloader/j;
+.field private static aaG:Lcom/facebook/soloader/j;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static aap:I
+.field private static aaH:I
+
+.field static final aaw:Z
+
+.field static aax:Lcom/facebook/soloader/h;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private static final aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+
+.field private static aaz:[Lcom/facebook/soloader/i;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
 
 # direct methods
@@ -86,27 +86,27 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;-><init>()V
 
-    sput-object v0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/facebook/soloader/SoLoader;->aah:[Lcom/facebook/soloader/i;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->aaz:[Lcom/facebook/soloader/i;
 
     const/4 v1, 0x0
 
-    sput v1, Lcom/facebook/soloader/SoLoader;->aai:I
+    sput v1, Lcom/facebook/soloader/SoLoader;->aaA:I
 
     new-instance v2, Ljava/util/HashSet;
 
     invoke-direct {v2}, Ljava/util/HashSet;-><init>()V
 
-    sput-object v2, Lcom/facebook/soloader/SoLoader;->aal:Ljava/util/HashSet;
+    sput-object v2, Lcom/facebook/soloader/SoLoader;->aaD:Ljava/util/HashSet;
 
     new-instance v2, Ljava/util/HashMap;
 
     invoke-direct {v2}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v2, Lcom/facebook/soloader/SoLoader;->aam:Ljava/util/Map;
+    sput-object v2, Lcom/facebook/soloader/SoLoader;->aaE:Ljava/util/Map;
 
     new-instance v2, Ljava/util/concurrent/ConcurrentHashMap;
 
@@ -116,9 +116,9 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/facebook/soloader/SoLoader;->aan:Ljava/util/Set;
+    sput-object v2, Lcom/facebook/soloader/SoLoader;->aaF:Ljava/util/Set;
 
-    sput-object v0, Lcom/facebook/soloader/SoLoader;->aao:Lcom/facebook/soloader/j;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->aaG:Lcom/facebook/soloader/j;
 
     :try_start_0
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -136,7 +136,7 @@
 
     :catch_0
     :cond_0
-    sput-boolean v1, Lcom/facebook/soloader/SoLoader;->aae:Z
+    sput-boolean v1, Lcom/facebook/soloader/SoLoader;->aaw:Z
 
     return-void
 .end method
@@ -172,7 +172,7 @@
     :try_start_0
     invoke-static {v4}, Lcom/facebook/soloader/SoLoader;->a(Lcom/facebook/soloader/h;)V
 
-    sget-object v5, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v5, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v5}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
 
@@ -183,7 +183,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    sget-object v5, Lcom/facebook/soloader/SoLoader;->aah:[Lcom/facebook/soloader/i;
+    sget-object v5, Lcom/facebook/soloader/SoLoader;->aaz:[Lcom/facebook/soloader/i;
 
     if-nez v5, :cond_9
 
@@ -193,7 +193,7 @@
 
     const/4 v5, 0x0
 
-    sput v5, Lcom/facebook/soloader/SoLoader;->aap:I
+    sput v5, Lcom/facebook/soloader/SoLoader;->aaH:I
 
     new-instance v6, Ljava/util/ArrayList;
 
@@ -311,7 +311,7 @@
 
     invoke-direct {v9, v0, v8}, Lcom/facebook/soloader/b;-><init>(Landroid/content/Context;I)V
 
-    sput-object v9, Lcom/facebook/soloader/SoLoader;->aak:Lcom/facebook/soloader/b;
+    sput-object v9, Lcom/facebook/soloader/SoLoader;->aaC:Lcom/facebook/soloader/b;
 
     new-instance v8, Ljava/lang/StringBuilder;
 
@@ -319,7 +319,7 @@
 
     invoke-direct {v8, v9}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    sget-object v9, Lcom/facebook/soloader/SoLoader;->aak:Lcom/facebook/soloader/b;
+    sget-object v9, Lcom/facebook/soloader/SoLoader;->aaC:Lcom/facebook/soloader/b;
 
     invoke-virtual {v9}, Lcom/facebook/soloader/b;->toString()Ljava/lang/String;
 
@@ -333,20 +333,20 @@
 
     invoke-static {v2, v8}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    sget-object v8, Lcom/facebook/soloader/SoLoader;->aak:Lcom/facebook/soloader/b;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->aaC:Lcom/facebook/soloader/b;
 
     invoke-virtual {v6, v5, v8}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V
 
     const/4 v8, 0x1
 
     :goto_3
-    sget v9, Lcom/facebook/soloader/SoLoader;->aap:I
+    sget v9, Lcom/facebook/soloader/SoLoader;->aaH:I
 
     and-int/lit8 v9, v9, 0x8
 
     if-eqz v9, :cond_5
 
-    sput-object v4, Lcom/facebook/soloader/SoLoader;->aaj:[Lcom/facebook/soloader/k;
+    sput-object v4, Lcom/facebook/soloader/SoLoader;->aaB:[Lcom/facebook/soloader/k;
 
     goto/16 :goto_5
 
@@ -489,7 +489,7 @@
 
     check-cast v0, [Lcom/facebook/soloader/k;
 
-    sput-object v0, Lcom/facebook/soloader/SoLoader;->aaj:[Lcom/facebook/soloader/k;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->aaB:[Lcom/facebook/soloader/k;
 
     invoke-virtual {v6, v5, v9}, Ljava/util/ArrayList;->addAll(ILjava/util/Collection;)Z
 
@@ -507,7 +507,7 @@
 
     check-cast v0, [Lcom/facebook/soloader/i;
 
-    invoke-static {}, Lcom/facebook/soloader/SoLoader;->kq()I
+    invoke-static {}, Lcom/facebook/soloader/SoLoader;->ko()I
 
     move-result v4
 
@@ -543,15 +543,15 @@
     goto :goto_6
 
     :cond_8
-    sput-object v0, Lcom/facebook/soloader/SoLoader;->aah:[Lcom/facebook/soloader/i;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->aaz:[Lcom/facebook/soloader/i;
 
-    sget v0, Lcom/facebook/soloader/SoLoader;->aai:I
+    sget v0, Lcom/facebook/soloader/SoLoader;->aaA:I
 
     const/4 v4, 0x1
 
     add-int/2addr v0, v4
 
-    sput v0, Lcom/facebook/soloader/SoLoader;->aai:I
+    sput v0, Lcom/facebook/soloader/SoLoader;->aaA:I
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -559,7 +559,7 @@
 
     invoke-direct {v0, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    sget-object v4, Lcom/facebook/soloader/SoLoader;->aah:[Lcom/facebook/soloader/i;
+    sget-object v4, Lcom/facebook/soloader/SoLoader;->aaz:[Lcom/facebook/soloader/i;
 
     array-length v4, v4
 
@@ -581,7 +581,7 @@
     :try_start_2
     invoke-static {v2, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
 
@@ -601,7 +601,7 @@
     :try_start_3
     invoke-static {v2, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    sget-object v1, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v1, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
 
@@ -643,7 +643,7 @@
 
     move-result-object v4
 
-    invoke-static {}, Lcom/facebook/soloader/SoLoader;->kr()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/facebook/soloader/SoLoader;->kp()Ljava/lang/reflect/Method;
 
     move-result-object v5
 
@@ -663,7 +663,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lcom/facebook/soloader/SoLoader$Api14Utils;->ks()Ljava/lang/String;
+    invoke-static {}, Lcom/facebook/soloader/SoLoader$Api14Utils;->kq()Ljava/lang/String;
 
     move-result-object v3
 
@@ -734,7 +734,7 @@
 
     invoke-direct/range {v0 .. v5}, Lcom/facebook/soloader/SoLoader$1;-><init>(ZLjava/lang/String;Ljava/lang/String;Ljava/lang/Runtime;Ljava/lang/reflect/Method;)V
 
-    sput-object v7, Lcom/facebook/soloader/SoLoader;->aaf:Lcom/facebook/soloader/h;
+    sput-object v7, Lcom/facebook/soloader/SoLoader;->aax:Lcom/facebook/soloader/h;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -781,7 +781,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aan:Ljava/util/Set;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aaF:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -795,7 +795,7 @@
     monitor-enter p2
 
     :try_start_0
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aal:Ljava/util/HashSet;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aaD:Ljava/util/HashSet;
 
     invoke-virtual {v0, p0}, Ljava/util/HashSet;->contains(Ljava/lang/Object;)Z
 
@@ -808,7 +808,7 @@
     return v1
 
     :cond_1
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aam:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aaE:Ljava/util/Map;
 
     invoke-interface {v0, p0}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -816,7 +816,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aam:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aaE:Ljava/util/Map;
 
     invoke-interface {v0, p0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -829,7 +829,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v2, Lcom/facebook/soloader/SoLoader;->aam:Ljava/util/Map;
+    sget-object v2, Lcom/facebook/soloader/SoLoader;->aaE:Ljava/util/Map;
 
     invoke-interface {v2, p0, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -846,7 +846,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_2
 
     :try_start_2
-    sget-object v2, Lcom/facebook/soloader/SoLoader;->aal:Ljava/util/HashSet;
+    sget-object v2, Lcom/facebook/soloader/SoLoader;->aaD:Ljava/util/HashSet;
 
     invoke-virtual {v2, p0}, Ljava/util/HashSet;->contains(Ljava/lang/Object;)Z
 
@@ -912,7 +912,7 @@
 
     invoke-static {p3, p4}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    sget-object p3, Lcom/facebook/soloader/SoLoader;->aal:Ljava/util/HashSet;
+    sget-object p3, Lcom/facebook/soloader/SoLoader;->aaD:Ljava/util/HashSet;
 
     invoke-virtual {p3, p0}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
 
@@ -927,7 +927,7 @@
 
     if-nez p0, :cond_4
 
-    sget-object p0, Lcom/facebook/soloader/SoLoader;->aan:Ljava/util/Set;
+    sget-object p0, Lcom/facebook/soloader/SoLoader;->aaF:Ljava/util/Set;
 
     invoke-interface {p0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -1019,17 +1019,7 @@
     throw p0
 .end method
 
-.method public static aE(Ljava/lang/String;)Z
-    .locals 0
-
-    invoke-static {p0}, Lcom/facebook/soloader/SoLoader;->aF(Ljava/lang/String;)Z
-
-    move-result p0
-
-    return p0
-.end method
-
-.method private static aF(Ljava/lang/String;)Z
+.method private static aA(Ljava/lang/String;)Z
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1037,7 +1027,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1046,7 +1036,7 @@
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
 
     :try_start_0
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aah:[Lcom/facebook/soloader/i;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aaz:[Lcom/facebook/soloader/i;
 
     if-nez v0, :cond_3
 
@@ -1064,7 +1054,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1075,14 +1065,14 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
     :try_start_1
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aah:[Lcom/facebook/soloader/i;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aaz:[Lcom/facebook/soloader/i;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     if-eqz v0, :cond_0
 
     :try_start_2
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1110,7 +1100,7 @@
     move-exception p0
 
     :try_start_4
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1128,7 +1118,7 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_2
 
     :try_start_5
-    sget-object v1, Lcom/facebook/soloader/SoLoader;->aal:Ljava/util/HashSet;
+    sget-object v1, Lcom/facebook/soloader/SoLoader;->aaD:Ljava/util/HashSet;
 
     invoke-virtual {v1, p0}, Ljava/util/HashSet;->contains(Ljava/lang/Object;)Z
 
@@ -1138,7 +1128,7 @@
 
     if-eqz v1, :cond_2
 
-    sget-object v2, Lcom/facebook/soloader/SoLoader;->aao:Lcom/facebook/soloader/j;
+    sget-object v2, Lcom/facebook/soloader/SoLoader;->aaG:Lcom/facebook/soloader/j;
 
     if-nez v2, :cond_2
 
@@ -1149,7 +1139,7 @@
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_1
 
-    sget-object p0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object p0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {p0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1174,7 +1164,7 @@
 
     :cond_3
     :goto_0
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1199,7 +1189,7 @@
     :catchall_2
     move-exception p0
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1210,6 +1200,16 @@
     throw p0
 .end method
 
+.method public static az(Ljava/lang/String;)Z
+    .locals 0
+
+    invoke-static {p0}, Lcom/facebook/soloader/SoLoader;->aA(Ljava/lang/String;)Z
+
+    move-result p0
+
+    return p0
+.end method
+
 .method static b(Ljava/lang/String;ILandroid/os/StrictMode$ThreadPolicy;)V
     .locals 1
 
@@ -1228,7 +1228,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1237,7 +1237,7 @@
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
 
     :try_start_0
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aah:[Lcom/facebook/soloader/i;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aaz:[Lcom/facebook/soloader/i;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
@@ -1247,7 +1247,7 @@
 
     if-eqz v0, :cond_11
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1273,7 +1273,7 @@
     const/4 v4, 0x0
 
     :goto_0
-    sget-boolean v5, Lcom/facebook/soloader/SoLoader;->aae:Z
+    sget-boolean v5, Lcom/facebook/soloader/SoLoader;->aaw:Z
 
     if-eqz v5, :cond_1
 
@@ -1293,7 +1293,7 @@
 
     move-result-object v5
 
-    invoke-static {v5}, Lcom/facebook/soloader/Api18TraceUtils;->aD(Ljava/lang/String;)V
+    invoke-static {v5}, Lcom/facebook/soloader/Api18TraceUtils;->ay(Ljava/lang/String;)V
 
     :cond_1
     const/4 v5, 0x0
@@ -1302,7 +1302,7 @@
     const/4 v6, 0x3
 
     :try_start_1
-    sget-object v7, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v7, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v7}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1310,7 +1310,7 @@
 
     invoke-virtual {v7}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
 
-    sget v7, Lcom/facebook/soloader/SoLoader;->aai:I
+    sget v7, Lcom/facebook/soloader/SoLoader;->aaA:I
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_2
 
@@ -1320,13 +1320,13 @@
     if-nez v5, :cond_5
 
     :try_start_2
-    sget-object v9, Lcom/facebook/soloader/SoLoader;->aah:[Lcom/facebook/soloader/i;
+    sget-object v9, Lcom/facebook/soloader/SoLoader;->aaz:[Lcom/facebook/soloader/i;
 
     array-length v9, v9
 
     if-ge v8, v9, :cond_5
 
-    sget-object v9, Lcom/facebook/soloader/SoLoader;->aah:[Lcom/facebook/soloader/i;
+    sget-object v9, Lcom/facebook/soloader/SoLoader;->aaz:[Lcom/facebook/soloader/i;
 
     aget-object v9, v9, v8
 
@@ -1336,7 +1336,7 @@
 
     if-ne v5, v6, :cond_4
 
-    sget-object v9, Lcom/facebook/soloader/SoLoader;->aaj:[Lcom/facebook/soloader/k;
+    sget-object v9, Lcom/facebook/soloader/SoLoader;->aaB:[Lcom/facebook/soloader/k;
 
     if-eqz v9, :cond_4
 
@@ -1352,7 +1352,7 @@
 
     invoke-static {v2, v8}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    sget-object v8, Lcom/facebook/soloader/SoLoader;->aaj:[Lcom/facebook/soloader/k;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->aaB:[Lcom/facebook/soloader/k;
 
     array-length v9, v8
 
@@ -1363,7 +1363,7 @@
 
     aget-object v11, v8, v10
 
-    invoke-virtual {v11, p0}, Lcom/facebook/soloader/k;->aI(Ljava/lang/String;)V
+    invoke-virtual {v11, p0}, Lcom/facebook/soloader/k;->aD(Ljava/lang/String;)V
 
     invoke-virtual {v11, p0, p1, p2}, Lcom/facebook/soloader/k;->a(Ljava/lang/String;ILandroid/os/StrictMode$ThreadPolicy;)I
 
@@ -1391,7 +1391,7 @@
     move-exception p1
 
     :try_start_3
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1403,7 +1403,7 @@
 
     :cond_5
     :goto_3
-    sget-object v8, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v8}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1419,7 +1419,7 @@
 
     if-nez v5, :cond_8
 
-    sget-object v8, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v8}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
 
@@ -1430,26 +1430,26 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_2
 
     :try_start_4
-    sget-object v8, Lcom/facebook/soloader/SoLoader;->aak:Lcom/facebook/soloader/b;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->aaC:Lcom/facebook/soloader/b;
 
     if-eqz v8, :cond_6
 
-    sget-object v8, Lcom/facebook/soloader/SoLoader;->aak:Lcom/facebook/soloader/b;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->aaC:Lcom/facebook/soloader/b;
 
-    invoke-virtual {v8}, Lcom/facebook/soloader/b;->kl()Z
+    invoke-virtual {v8}, Lcom/facebook/soloader/b;->kj()Z
 
     move-result v8
 
     if-eqz v8, :cond_6
 
-    sget v8, Lcom/facebook/soloader/SoLoader;->aai:I
+    sget v8, Lcom/facebook/soloader/SoLoader;->aaA:I
 
     add-int/2addr v8, v3
 
-    sput v8, Lcom/facebook/soloader/SoLoader;->aai:I
+    sput v8, Lcom/facebook/soloader/SoLoader;->aaA:I
 
     :cond_6
-    sget v8, Lcom/facebook/soloader/SoLoader;->aai:I
+    sget v8, Lcom/facebook/soloader/SoLoader;->aaA:I
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
@@ -1464,7 +1464,7 @@
 
     :goto_4
     :try_start_5
-    sget-object v8, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v8}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
 
@@ -1477,7 +1477,7 @@
     :catchall_1
     move-exception p1
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
 
@@ -1495,7 +1495,7 @@
     :goto_5
     if-nez v7, :cond_2
 
-    sget-boolean p1, Lcom/facebook/soloader/SoLoader;->aae:Z
+    sget-boolean p1, Lcom/facebook/soloader/SoLoader;->aaw:Z
 
     if-eqz p1, :cond_9
 
@@ -1533,7 +1533,7 @@
     :catchall_2
     move-exception p1
 
-    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->aae:Z
+    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->aaw:Z
 
     if-eqz v0, :cond_c
 
@@ -1639,7 +1639,7 @@
     :catchall_3
     move-exception p0
 
-    sget-object p1, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object p1, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1656,10 +1656,10 @@
     goto :goto_8
 .end method
 
-.method private static kq()I
+.method private static ko()I
     .locals 2
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
 
@@ -1668,7 +1668,7 @@
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->lock()V
 
     :try_start_0
-    sget v0, Lcom/facebook/soloader/SoLoader;->aap:I
+    sget v0, Lcom/facebook/soloader/SoLoader;->aaH:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1684,7 +1684,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sget-object v1, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v1, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
 
@@ -1697,7 +1697,7 @@
     :catchall_0
     move-exception v0
 
-    sget-object v1, Lcom/facebook/soloader/SoLoader;->aag:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v1, Lcom/facebook/soloader/SoLoader;->aay:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
 
@@ -1708,7 +1708,7 @@
     throw v0
 .end method
 
-.method private static kr()Ljava/lang/reflect/Method;
+.method private static kp()Ljava/lang/reflect/Method;
     .locals 7
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
diff --git a/com.discord/smali/com/facebook/soloader/c.smali b/com.discord/smali/com/facebook/soloader/c.smali
index 8a1582c087..5bb1f9de72 100644
--- a/com.discord/smali/com/facebook/soloader/c.smali
+++ b/com.discord/smali/com/facebook/soloader/c.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field protected final ZR:Ljava/io/File;
+.field protected final aaj:Ljava/io/File;
 
 .field protected final flags:I
 
@@ -15,7 +15,7 @@
 
     invoke-direct {p0}, Lcom/facebook/soloader/i;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/soloader/c;->ZR:Ljava/io/File;
+    iput-object p1, p0, Lcom/facebook/soloader/c;->aaj:Ljava/io/File;
 
     iput p2, p0, Lcom/facebook/soloader/c;->flags:I
 
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    invoke-static {p0}, Lcom/facebook/soloader/c;->p(Ljava/io/File;)[Ljava/lang/String;
+    invoke-static {p0}, Lcom/facebook/soloader/c;->o(Ljava/io/File;)[Ljava/lang/String;
 
     move-result-object p0
 
@@ -84,7 +84,7 @@
     return-void
 .end method
 
-.method private static p(Ljava/io/File;)[Ljava/lang/String;
+.method private static o(Ljava/io/File;)[Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -92,7 +92,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->aae:Z
+    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->aaw:Z
 
     if-eqz v0, :cond_0
 
@@ -116,17 +116,17 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/facebook/soloader/Api18TraceUtils;->aD(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/facebook/soloader/Api18TraceUtils;->ay(Ljava/lang/String;)V
 
     :cond_0
     :try_start_0
-    invoke-static {p0}, Lcom/facebook/soloader/g;->r(Ljava/io/File;)[Ljava/lang/String;
+    invoke-static {p0}, Lcom/facebook/soloader/g;->q(Ljava/io/File;)[Ljava/lang/String;
 
     move-result-object p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->aae:Z
+    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->aaw:Z
 
     if-eqz v0, :cond_1
 
@@ -138,7 +138,7 @@
     :catchall_0
     move-exception p0
 
-    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->aae:Z
+    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->aaw:Z
 
     if-eqz v0, :cond_2
 
@@ -158,7 +158,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/c;->ZR:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/c;->aaj:Ljava/io/File;
 
     invoke-virtual {p0, p1, p2, v0, p3}, Lcom/facebook/soloader/c;->a(Ljava/lang/String;ILjava/io/File;Landroid/os/StrictMode$ThreadPolicy;)I
 
@@ -294,7 +294,7 @@
 
     :goto_0
     :try_start_0
-    sget-object p1, Lcom/facebook/soloader/SoLoader;->aaf:Lcom/facebook/soloader/h;
+    sget-object p1, Lcom/facebook/soloader/SoLoader;->aax:Lcom/facebook/soloader/h;
 
     invoke-virtual {v0}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
 
@@ -337,7 +337,7 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/soloader/c;->ZR:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/c;->aaj:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->getCanonicalPath()Ljava/lang/String;
 
@@ -352,7 +352,7 @@
     goto :goto_0
 
     :catch_0
-    iget-object v0, p0, Lcom/facebook/soloader/c;->ZR:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/c;->aaj:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->getName()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/facebook/soloader/e$b.smali b/com.discord/smali/com/facebook/soloader/e$b.smali
index f2a76f8091..5ac0b117f9 100644
--- a/com.discord/smali/com/facebook/soloader/e$b.smali
+++ b/com.discord/smali/com/facebook/soloader/e$b.smali
@@ -21,16 +21,16 @@
 
 
 # instance fields
-.field ZW:[Lcom/facebook/soloader/e$a;
+.field aao:[Lcom/facebook/soloader/e$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final ZX:Ljava/util/zip/ZipFile;
+.field final aap:Ljava/util/zip/ZipFile;
 
-.field private final ZY:Lcom/facebook/soloader/k;
+.field private final aaq:Lcom/facebook/soloader/k;
 
-.field final synthetic ZZ:Lcom/facebook/soloader/e;
+.field final synthetic aar:Lcom/facebook/soloader/e;
 
 
 # direct methods
@@ -42,19 +42,19 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/soloader/e$b;->ZZ:Lcom/facebook/soloader/e;
+    iput-object p1, p0, Lcom/facebook/soloader/e$b;->aar:Lcom/facebook/soloader/e;
 
     invoke-direct {p0}, Lcom/facebook/soloader/k$e;-><init>()V
 
     new-instance v0, Ljava/util/zip/ZipFile;
 
-    iget-object p1, p1, Lcom/facebook/soloader/e;->ZS:Ljava/io/File;
+    iget-object p1, p1, Lcom/facebook/soloader/e;->aak:Ljava/io/File;
 
     invoke-direct {v0, p1}, Ljava/util/zip/ZipFile;-><init>(Ljava/io/File;)V
 
-    iput-object v0, p0, Lcom/facebook/soloader/e$b;->ZX:Ljava/util/zip/ZipFile;
+    iput-object v0, p0, Lcom/facebook/soloader/e$b;->aap:Ljava/util/zip/ZipFile;
 
-    iput-object p2, p0, Lcom/facebook/soloader/e$b;->ZY:Lcom/facebook/soloader/k;
+    iput-object p2, p0, Lcom/facebook/soloader/e$b;->aaq:Lcom/facebook/soloader/k;
 
     return-void
 .end method
@@ -77,17 +77,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/e$b;->ZX:Ljava/util/zip/ZipFile;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b;->aap:Ljava/util/zip/ZipFile;
 
     invoke-virtual {v0}, Ljava/util/zip/ZipFile;->close()V
 
     return-void
 .end method
 
-.method final km()[Lcom/facebook/soloader/e$a;
+.method final kk()[Lcom/facebook/soloader/e$a;
     .locals 9
 
-    iget-object v0, p0, Lcom/facebook/soloader/e$b;->ZW:[Lcom/facebook/soloader/e$a;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b;->aao:[Lcom/facebook/soloader/e$a;
 
     if-nez v0, :cond_7
 
@@ -99,9 +99,9 @@
 
     invoke-direct {v1}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v2, p0, Lcom/facebook/soloader/e$b;->ZZ:Lcom/facebook/soloader/e;
+    iget-object v2, p0, Lcom/facebook/soloader/e$b;->aar:Lcom/facebook/soloader/e;
 
-    iget-object v2, v2, Lcom/facebook/soloader/e;->ZT:Ljava/lang/String;
+    iget-object v2, v2, Lcom/facebook/soloader/e;->aal:Ljava/lang/String;
 
     invoke-static {v2}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
 
@@ -111,7 +111,7 @@
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/soloader/e$b;->ZX:Ljava/util/zip/ZipFile;
+    iget-object v4, p0, Lcom/facebook/soloader/e$b;->aap:Ljava/util/zip/ZipFile;
 
     invoke-virtual {v4}, Ljava/util/zip/ZipFile;->entries()Ljava/util/Enumeration;
 
@@ -173,7 +173,7 @@
 
     if-eqz v7, :cond_1
 
-    iget v7, v7, Lcom/facebook/soloader/e$a;->ZV:I
+    iget v7, v7, Lcom/facebook/soloader/e$a;->aan:I
 
     if-ge v8, v7, :cond_0
 
@@ -187,7 +187,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v2, p0, Lcom/facebook/soloader/e$b;->ZY:Lcom/facebook/soloader/k;
+    iget-object v2, p0, Lcom/facebook/soloader/e$b;->aaq:Lcom/facebook/soloader/k;
 
     invoke-interface {v0}, Ljava/util/Set;->size()I
 
@@ -201,7 +201,7 @@
 
     check-cast v0, [Ljava/lang/String;
 
-    iput-object v0, v2, Lcom/facebook/soloader/k;->aaw:[Ljava/lang/String;
+    iput-object v0, v2, Lcom/facebook/soloader/k;->aaO:[Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->values()Ljava/util/Collection;
 
@@ -234,7 +234,7 @@
 
     aget-object v4, v0, v2
 
-    iget-object v5, v4, Lcom/facebook/soloader/e$a;->ZU:Ljava/util/zip/ZipEntry;
+    iget-object v5, v4, Lcom/facebook/soloader/e$a;->aam:Ljava/util/zip/ZipEntry;
 
     iget-object v4, v4, Lcom/facebook/soloader/e$a;->name:Ljava/lang/String;
 
@@ -284,15 +284,15 @@
     goto :goto_3
 
     :cond_6
-    iput-object v2, p0, Lcom/facebook/soloader/e$b;->ZW:[Lcom/facebook/soloader/e$a;
+    iput-object v2, p0, Lcom/facebook/soloader/e$b;->aao:[Lcom/facebook/soloader/e$a;
 
     :cond_7
-    iget-object v0, p0, Lcom/facebook/soloader/e$b;->ZW:[Lcom/facebook/soloader/e$a;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b;->aao:[Lcom/facebook/soloader/e$a;
 
     return-object v0
 .end method
 
-.method protected final kn()Lcom/facebook/soloader/k$b;
+.method protected final kl()Lcom/facebook/soloader/k$b;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -302,7 +302,7 @@
 
     new-instance v0, Lcom/facebook/soloader/k$b;
 
-    invoke-virtual {p0}, Lcom/facebook/soloader/e$b;->km()[Lcom/facebook/soloader/e$a;
+    invoke-virtual {p0}, Lcom/facebook/soloader/e$b;->kk()[Lcom/facebook/soloader/e$a;
 
     move-result-object v1
 
@@ -311,7 +311,7 @@
     return-object v0
 .end method
 
-.method protected final ko()Lcom/facebook/soloader/k$d;
+.method protected final km()Lcom/facebook/soloader/k$d;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali/com/facebook/soloader/f.smali b/com.discord/smali/com/facebook/soloader/f.smali
index b37997e381..271676586f 100644
--- a/com.discord/smali/com/facebook/soloader/f.smali
+++ b/com.discord/smali/com/facebook/soloader/f.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aac:Ljava/io/FileOutputStream;
+.field private final aau:Ljava/io/FileOutputStream;
 
-.field private final aad:Ljava/nio/channels/FileLock;
+.field private final aav:Ljava/nio/channels/FileLock;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -30,10 +30,10 @@
 
     invoke-direct {v0, p1}, Ljava/io/FileOutputStream;-><init>(Ljava/io/File;)V
 
-    iput-object v0, p0, Lcom/facebook/soloader/f;->aac:Ljava/io/FileOutputStream;
+    iput-object v0, p0, Lcom/facebook/soloader/f;->aau:Ljava/io/FileOutputStream;
 
     :try_start_0
-    iget-object p1, p0, Lcom/facebook/soloader/f;->aac:Ljava/io/FileOutputStream;
+    iget-object p1, p0, Lcom/facebook/soloader/f;->aau:Ljava/io/FileOutputStream;
 
     invoke-virtual {p1}, Ljava/io/FileOutputStream;->getChannel()Ljava/nio/channels/FileChannel;
 
@@ -47,26 +47,26 @@
 
     if-nez p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/soloader/f;->aac:Ljava/io/FileOutputStream;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->aau:Ljava/io/FileOutputStream;
 
     invoke-virtual {v0}, Ljava/io/FileOutputStream;->close()V
 
     :cond_0
-    iput-object p1, p0, Lcom/facebook/soloader/f;->aad:Ljava/nio/channels/FileLock;
+    iput-object p1, p0, Lcom/facebook/soloader/f;->aav:Ljava/nio/channels/FileLock;
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lcom/facebook/soloader/f;->aac:Ljava/io/FileOutputStream;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->aau:Ljava/io/FileOutputStream;
 
     invoke-virtual {v0}, Ljava/io/FileOutputStream;->close()V
 
     throw p1
 .end method
 
-.method public static q(Ljava/io/File;)Lcom/facebook/soloader/f;
+.method public static p(Ljava/io/File;)Lcom/facebook/soloader/f;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -92,18 +92,18 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/soloader/f;->aad:Ljava/nio/channels/FileLock;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->aav:Ljava/nio/channels/FileLock;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/soloader/f;->aad:Ljava/nio/channels/FileLock;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->aav:Ljava/nio/channels/FileLock;
 
     invoke-virtual {v0}, Ljava/nio/channels/FileLock;->release()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/soloader/f;->aac:Ljava/io/FileOutputStream;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->aau:Ljava/io/FileOutputStream;
 
     invoke-virtual {v0}, Ljava/io/FileOutputStream;->close()V
 
@@ -112,7 +112,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/facebook/soloader/f;->aac:Ljava/io/FileOutputStream;
+    iget-object v1, p0, Lcom/facebook/soloader/f;->aau:Ljava/io/FileOutputStream;
 
     invoke-virtual {v1}, Ljava/io/FileOutputStream;->close()V
 
diff --git a/com.discord/smali/com/facebook/soloader/k$e.smali b/com.discord/smali/com/facebook/soloader/k$e.smali
index bd58804166..e00c2f83ec 100644
--- a/com.discord/smali/com/facebook/soloader/k$e.smali
+++ b/com.discord/smali/com/facebook/soloader/k$e.smali
@@ -39,7 +39,7 @@
     return-void
 .end method
 
-.method protected abstract kn()Lcom/facebook/soloader/k$b;
+.method protected abstract kl()Lcom/facebook/soloader/k$b;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -47,7 +47,7 @@
     .end annotation
 .end method
 
-.method protected abstract ko()Lcom/facebook/soloader/k$d;
+.method protected abstract km()Lcom/facebook/soloader/k$d;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali/com/facebook/soloader/k.smali b/com.discord/smali/com/facebook/soloader/k.smali
index 9dfbecca59..d78efae4c0 100644
--- a/com.discord/smali/com/facebook/soloader/k.smali
+++ b/com.discord/smali/com/facebook/soloader/k.smali
@@ -16,17 +16,17 @@
 
 
 # instance fields
-.field protected aav:Ljava/lang/String;
+.field protected aaN:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field aaw:[Ljava/lang/String;
+.field aaO:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final aax:Ljava/util/Map;
+.field private final aaP:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -78,7 +78,7 @@
 
     invoke-direct {p2}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p2, p0, Lcom/facebook/soloader/k;->aax:Ljava/util/Map;
+    iput-object p2, p0, Lcom/facebook/soloader/k;->aaP:Ljava/util/Map;
 
     iput-object p1, p0, Lcom/facebook/soloader/k;->mContext:Landroid/content/Context;
 
@@ -121,7 +121,7 @@
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v3, v1, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v3, v1, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     const-string v4, "dso_manifest"
 
@@ -183,7 +183,7 @@
 
     move-object/from16 v5, p2
 
-    iget-object v0, v5, Lcom/facebook/soloader/k$b;->aaF:[Lcom/facebook/soloader/k$a;
+    iget-object v0, v5, Lcom/facebook/soloader/k$b;->aaX:[Lcom/facebook/soloader/k$a;
 
     invoke-direct {v1, v0}, Lcom/facebook/soloader/k;->a([Lcom/facebook/soloader/k$a;)V
 
@@ -198,7 +198,7 @@
 
     if-eqz v0, :cond_8
 
-    invoke-virtual/range {p3 .. p3}, Lcom/facebook/soloader/k$d;->kp()Lcom/facebook/soloader/k$c;
+    invoke-virtual/range {p3 .. p3}, Lcom/facebook/soloader/k$d;->kn()Lcom/facebook/soloader/k$c;
 
     move-result-object v9
     :try_end_1
@@ -212,19 +212,19 @@
     if-eqz v0, :cond_3
 
     :try_start_2
-    iget-object v11, v8, Lcom/facebook/soloader/k$b;->aaF:[Lcom/facebook/soloader/k$a;
+    iget-object v11, v8, Lcom/facebook/soloader/k$b;->aaX:[Lcom/facebook/soloader/k$a;
 
     array-length v11, v11
 
     if-ge v10, v11, :cond_3
 
-    iget-object v11, v8, Lcom/facebook/soloader/k$b;->aaF:[Lcom/facebook/soloader/k$a;
+    iget-object v11, v8, Lcom/facebook/soloader/k$b;->aaX:[Lcom/facebook/soloader/k$a;
 
     aget-object v11, v11, v10
 
     iget-object v11, v11, Lcom/facebook/soloader/k$a;->name:Ljava/lang/String;
 
-    iget-object v12, v9, Lcom/facebook/soloader/k$c;->aaG:Lcom/facebook/soloader/k$a;
+    iget-object v12, v9, Lcom/facebook/soloader/k$c;->aaY:Lcom/facebook/soloader/k$a;
 
     iget-object v12, v12, Lcom/facebook/soloader/k$a;->name:Ljava/lang/String;
 
@@ -234,15 +234,15 @@
 
     if-eqz v11, :cond_2
 
-    iget-object v11, v8, Lcom/facebook/soloader/k$b;->aaF:[Lcom/facebook/soloader/k$a;
+    iget-object v11, v8, Lcom/facebook/soloader/k$b;->aaX:[Lcom/facebook/soloader/k$a;
 
     aget-object v11, v11, v10
 
-    iget-object v11, v11, Lcom/facebook/soloader/k$a;->aaE:Ljava/lang/String;
+    iget-object v11, v11, Lcom/facebook/soloader/k$a;->aaW:Ljava/lang/String;
 
-    iget-object v12, v9, Lcom/facebook/soloader/k$c;->aaG:Lcom/facebook/soloader/k$a;
+    iget-object v12, v9, Lcom/facebook/soloader/k$c;->aaY:Lcom/facebook/soloader/k$a;
 
-    iget-object v12, v12, Lcom/facebook/soloader/k$a;->aaE:Ljava/lang/String;
+    iget-object v12, v12, Lcom/facebook/soloader/k$a;->aaW:Ljava/lang/String;
 
     invoke-virtual {v11, v12}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -271,7 +271,7 @@
 
     invoke-direct {v0, v10}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v10, v9, Lcom/facebook/soloader/k$c;->aaG:Lcom/facebook/soloader/k$a;
+    iget-object v10, v9, Lcom/facebook/soloader/k$c;->aaY:Lcom/facebook/soloader/k$a;
 
     iget-object v10, v10, Lcom/facebook/soloader/k$a;->name:Ljava/lang/String;
 
@@ -283,7 +283,7 @@
 
     invoke-static {v2, v0}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget-object v0, v1, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v0, v1, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {v0, v6, v6}, Ljava/io/File;->setWritable(ZZ)Z
 
@@ -293,9 +293,9 @@
 
     new-instance v10, Ljava/io/File;
 
-    iget-object v0, v1, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v0, v1, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
-    iget-object v11, v9, Lcom/facebook/soloader/k$c;->aaG:Lcom/facebook/soloader/k$a;
+    iget-object v11, v9, Lcom/facebook/soloader/k$c;->aaY:Lcom/facebook/soloader/k$a;
 
     iget-object v11, v11, Lcom/facebook/soloader/k$a;->name:Ljava/lang/String;
 
@@ -338,7 +338,7 @@
 
     invoke-static {v2, v11, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    invoke-static {v10}, Lcom/facebook/soloader/SysUtil;->s(Ljava/io/File;)V
+    invoke-static {v10}, Lcom/facebook/soloader/SysUtil;->r(Ljava/io/File;)V
 
     new-instance v0, Ljava/io/RandomAccessFile;
 
@@ -350,7 +350,7 @@
 
     :goto_4
     :try_start_5
-    iget-object v0, v9, Lcom/facebook/soloader/k$c;->aaH:Ljava/io/InputStream;
+    iget-object v0, v9, Lcom/facebook/soloader/k$c;->aaZ:Ljava/io/InputStream;
 
     invoke-virtual {v0}, Ljava/io/InputStream;->available()I
 
@@ -373,7 +373,7 @@
     invoke-static {v12, v13, v14}, Lcom/facebook/soloader/SysUtil$LollipopSysdeps;->fallocateIfSupported(Ljava/io/FileDescriptor;J)V
 
     :cond_4
-    iget-object v0, v9, Lcom/facebook/soloader/k$c;->aaH:Ljava/io/InputStream;
+    iget-object v0, v9, Lcom/facebook/soloader/k$c;->aaZ:Ljava/io/InputStream;
 
     invoke-static {v11, v0, v5}, Lcom/facebook/soloader/SysUtil;->a(Ljava/io/RandomAccessFile;Ljava/io/InputStream;[B)I
 
@@ -429,7 +429,7 @@
     move-exception v0
 
     :try_start_8
-    invoke-static {v10}, Lcom/facebook/soloader/SysUtil;->s(Ljava/io/File;)V
+    invoke-static {v10}, Lcom/facebook/soloader/SysUtil;->r(Ljava/io/File;)V
 
     throw v0
     :try_end_8
@@ -450,7 +450,7 @@
 
     invoke-direct {v2, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, v1, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v4, v1, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -612,7 +612,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->list()[Ljava/lang/String;
 
@@ -696,7 +696,7 @@
 
     new-instance v4, Ljava/io/File;
 
-    iget-object v5, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-direct {v4, v5, v3}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
@@ -714,7 +714,7 @@
 
     invoke-static {v5, v3}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-static {v4}, Lcom/facebook/soloader/SysUtil;->s(Ljava/io/File;)V
+    invoke-static {v4}, Lcom/facebook/soloader/SysUtil;->r(Ljava/io/File;)V
 
     :cond_2
     add-int/lit8 v2, v2, 0x1
@@ -733,7 +733,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -764,7 +764,7 @@
 
     new-instance v6, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     const-string v2, "dso_state"
 
@@ -793,7 +793,7 @@
 
     invoke-direct {v4, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v5, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -840,7 +840,7 @@
 
     new-instance v5, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     const-string v7, "dso_deps"
 
@@ -911,18 +911,18 @@
 
     invoke-static {v6, v3}, Lcom/facebook/soloader/k;->a(Ljava/io/File;B)V
 
-    invoke-virtual {p0}, Lcom/facebook/soloader/k;->kj()Lcom/facebook/soloader/k$e;
+    invoke-virtual {p0}, Lcom/facebook/soloader/k;->kh()Lcom/facebook/soloader/k$e;
 
     move-result-object v0
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_9
 
     :try_start_4
-    invoke-virtual {v0}, Lcom/facebook/soloader/k$e;->kn()Lcom/facebook/soloader/k$b;
+    invoke-virtual {v0}, Lcom/facebook/soloader/k$e;->kl()Lcom/facebook/soloader/k$b;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/facebook/soloader/k$e;->ko()Lcom/facebook/soloader/k$d;
+    invoke-virtual {v0}, Lcom/facebook/soloader/k$e;->km()Lcom/facebook/soloader/k$d;
 
     move-result-object v2
     :try_end_4
@@ -981,7 +981,7 @@
 
     invoke-direct {p2, p3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object p3, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object p3, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {p3}, Ljava/io/File;->getName()Ljava/lang/String;
 
@@ -1075,15 +1075,15 @@
     goto :goto_5
 .end method
 
-.method private aH(Ljava/lang/String;)Ljava/lang/Object;
+.method private aC(Ljava/lang/String;)Ljava/lang/Object;
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/soloader/k;->aax:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->aaP:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/soloader/k;->aax:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->aaP:Ljava/util/Map;
 
     invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1095,7 +1095,7 @@
 
     invoke-direct {v1}, Ljava/lang/Object;-><init>()V
 
-    iget-object v2, p0, Lcom/facebook/soloader/k;->aax:Ljava/util/Map;
+    iget-object v2, p0, Lcom/facebook/soloader/k;->aaP:Ljava/util/Map;
 
     invoke-interface {v2, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1124,14 +1124,14 @@
         }
     .end annotation
 
-    invoke-direct {p0, p1}, Lcom/facebook/soloader/k;->aH(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-direct {p0, p1}, Lcom/facebook/soloader/k;->aC(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v0
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {p0, p1, p2, v1, p3}, Lcom/facebook/soloader/k;->a(Ljava/lang/String;ILjava/io/File;Landroid/os/StrictMode$ThreadPolicy;)I
 
@@ -1151,7 +1151,7 @@
     throw p1
 .end method
 
-.method protected final declared-synchronized aI(Ljava/lang/String;)V
+.method protected final declared-synchronized aD(Ljava/lang/String;)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1162,7 +1162,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0, p1}, Lcom/facebook/soloader/k;->aH(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-direct {p0, p1}, Lcom/facebook/soloader/k;->aC(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1171,7 +1171,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iput-object p1, p0, Lcom/facebook/soloader/k;->aav:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/soloader/k;->aaN:Ljava/lang/String;
 
     const/4 p1, 0x2
 
@@ -1222,7 +1222,7 @@
 
     const-string v3, "fb-UnpackingSoSource"
 
-    iget-object v4, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v4, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {v4}, Ljava/io/File;->mkdirs()Z
 
@@ -1259,13 +1259,13 @@
     :goto_0
     new-instance v4, Ljava/io/File;
 
-    iget-object v5, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     const-string v6, "dso_lock"
 
     invoke-direct {v4, v5, v6}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
-    invoke-static {v4}, Lcom/facebook/soloader/f;->q(Ljava/io/File;)Lcom/facebook/soloader/f;
+    invoke-static {v4}, Lcom/facebook/soloader/f;->p(Ljava/io/File;)Lcom/facebook/soloader/f;
 
     move-result-object v4
 
@@ -1276,7 +1276,7 @@
 
     invoke-direct {v5, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v6, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v6, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1286,7 +1286,7 @@
 
     invoke-static {v3, v5}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-virtual {p0}, Lcom/facebook/soloader/k;->kk()[B
+    invoke-virtual {p0}, Lcom/facebook/soloader/k;->ki()[B
 
     move-result-object v5
 
@@ -1307,7 +1307,7 @@
 
     invoke-direct {p1, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v5, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {p1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1326,7 +1326,7 @@
 
     invoke-direct {p1, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1345,7 +1345,7 @@
 
     invoke-direct {p1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1368,7 +1368,7 @@
 
     invoke-direct {v1, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1387,7 +1387,7 @@
 
     invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v2, p0, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1403,7 +1403,7 @@
     throw p1
 .end method
 
-.method protected abstract kj()Lcom/facebook/soloader/k$e;
+.method protected abstract kh()Lcom/facebook/soloader/k$e;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -1411,7 +1411,7 @@
     .end annotation
 .end method
 
-.method protected kk()[B
+.method protected ki()[B
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1423,16 +1423,16 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/facebook/soloader/k;->kj()Lcom/facebook/soloader/k$e;
+    invoke-virtual {p0}, Lcom/facebook/soloader/k;->kh()Lcom/facebook/soloader/k$e;
 
     move-result-object v1
 
     :try_start_0
-    invoke-virtual {v1}, Lcom/facebook/soloader/k$e;->kn()Lcom/facebook/soloader/k$b;
+    invoke-virtual {v1}, Lcom/facebook/soloader/k$e;->kl()Lcom/facebook/soloader/k$b;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/facebook/soloader/k$b;->aaF:[Lcom/facebook/soloader/k$a;
+    iget-object v2, v2, Lcom/facebook/soloader/k$b;->aaX:[Lcom/facebook/soloader/k$a;
 
     const/4 v3, 0x1
 
@@ -1457,7 +1457,7 @@
 
     aget-object v4, v2, v3
 
-    iget-object v4, v4, Lcom/facebook/soloader/k$a;->aaE:Ljava/lang/String;
+    iget-object v4, v4, Lcom/facebook/soloader/k$a;->aaW:Ljava/lang/String;
 
     invoke-virtual {v0, v4}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
     :try_end_0
diff --git a/com.discord/smali/com/facebook/webpsupport/WebpBitmapFactoryImpl.smali b/com.discord/smali/com/facebook/webpsupport/WebpBitmapFactoryImpl.smali
index 59c8d119bd..670b618f29 100644
--- a/com.discord/smali/com/facebook/webpsupport/WebpBitmapFactoryImpl.smali
+++ b/com.discord/smali/com/facebook/webpsupport/WebpBitmapFactoryImpl.smali
@@ -7,11 +7,11 @@
 
 
 # static fields
-.field private static Tf:Lcom/facebook/common/k/b$a;
+.field private static Tx:Lcom/facebook/common/k/b$a;
 
-.field public static final aaI:Z
+.field public static final aba:Z
 
-.field private static aaJ:Lcom/facebook/common/k/a;
+.field private static abb:Lcom/facebook/common/k/a;
 
 
 # direct methods
@@ -32,7 +32,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->aaI:Z
+    sput-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->aba:Z
 
     return-void
 .end method
@@ -85,7 +85,7 @@
     return-void
 
     :cond_3
-    sget-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->aaI:Z
+    sget-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->aba:Z
 
     if-eqz v0, :cond_4
 
@@ -166,7 +166,7 @@
 .method private static createBitmap(IILandroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
     .locals 1
 
-    sget-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->aaI:Z
+    sget-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->aba:Z
 
     if-eqz v0, :cond_0
 
@@ -189,7 +189,7 @@
     return-object p0
 
     :cond_0
-    sget-object p2, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->aaJ:Lcom/facebook/common/k/a;
+    sget-object p2, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->abb:Lcom/facebook/common/k/a;
 
     sget-object v0, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
 
@@ -284,9 +284,9 @@
 .method public static hookDecodeByteArray([BIILandroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
     .locals 7
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fc()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fh()V
 
-    sget-boolean v0, Lcom/facebook/common/k/c;->HH:Z
+    sget-boolean v0, Lcom/facebook/common/k/c;->HY:Z
 
     if-eqz v0, :cond_0
 
@@ -411,7 +411,7 @@
 .method public static hookDecodeFileDescriptor(Ljava/io/FileDescriptor;Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
     .locals 6
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fc()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fh()V
 
     const/4 v0, 0x0
 
@@ -440,7 +440,7 @@
 
     move-result-object v4
 
-    sget-boolean v5, Lcom/facebook/common/k/c;->HH:Z
+    sget-boolean v5, Lcom/facebook/common/k/c;->HY:Z
 
     if-eqz v5, :cond_0
 
@@ -592,7 +592,7 @@
 
     :cond_1
     :goto_0
-    sget-boolean p0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->aaI:Z
+    sget-boolean p0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->aba:Z
 
     if-eqz p0, :cond_3
 
@@ -692,7 +692,7 @@
 .method public static hookDecodeStream(Ljava/io/InputStream;Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
     .locals 3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fc()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fh()V
 
     invoke-static {p0}, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->q(Ljava/io/InputStream;)Ljava/io/InputStream;
 
@@ -702,7 +702,7 @@
 
     move-result-object v0
 
-    sget-boolean v1, Lcom/facebook/common/k/c;->HH:Z
+    sget-boolean v1, Lcom/facebook/common/k/c;->HY:Z
 
     if-eqz v1, :cond_0
 
@@ -984,7 +984,7 @@
 .method public final a(Lcom/facebook/common/k/a;)V
     .locals 0
 
-    sput-object p1, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->aaJ:Lcom/facebook/common/k/a;
+    sput-object p1, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->abb:Lcom/facebook/common/k/a;
 
     return-void
 .end method
@@ -992,7 +992,7 @@
 .method public final a(Lcom/facebook/common/k/b$a;)V
     .locals 0
 
-    sput-object p1, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->Tf:Lcom/facebook/common/k/b$a;
+    sput-object p1, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->Tx:Lcom/facebook/common/k/b$a;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/ads/identifier/AdvertisingIdClient.smali b/com.discord/smali/com/google/android/gms/ads/identifier/AdvertisingIdClient.smali
index 091c9ad68d..7b9b2fa31c 100644
--- a/com.discord/smali/com/google/android/gms/ads/identifier/AdvertisingIdClient.smali
+++ b/com.discord/smali/com/google/android/gms/ads/identifier/AdvertisingIdClient.smali
@@ -115,7 +115,7 @@
 
     const-string v2, "gads:ad_id_app_context:ping_ratio"
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/ads/identifier/b;->aK(Ljava/lang/String;)F
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/ads/identifier/b;->aF(Ljava/lang/String;)F
 
     move-result v10
 
@@ -304,7 +304,7 @@
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lb()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kZ()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
@@ -356,7 +356,7 @@
     invoke-virtual {v1, p1}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
 
     :try_start_1
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
     const/4 p1, 0x1
 
@@ -411,17 +411,17 @@
 
     const-string v0, "BlockingServiceConnection.getServiceWithTimeout() called on main thread"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aX(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aS(Ljava/lang/String;)V
 
-    iget-boolean v0, p1, Lcom/google/android/gms/common/a;->adj:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/common/a;->adB:Z
 
     if-nez v0, :cond_1
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p1, Lcom/google/android/gms/common/a;->adj:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/common/a;->adB:Z
 
-    iget-object p1, p1, Lcom/google/android/gms/common/a;->adk:Ljava/util/concurrent/BlockingQueue;
+    iget-object p1, p1, Lcom/google/android/gms/common/a;->adC:Ljava/util/concurrent/BlockingQueue;
 
     const-wide/16 v0, 0x2710
 
@@ -493,7 +493,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient;->zzi:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;
 
-    iget-object v1, v1, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->abX:Ljava/util/concurrent/CountDownLatch;
+    iget-object v1, v1, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->acq:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v1}, Ljava/util/concurrent/CountDownLatch;->countDown()V
     :try_end_0
@@ -554,7 +554,7 @@
 
     const-string v0, "Calling this from your main thread can lead to deadlock"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aX(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aS(Ljava/lang/String;)V
 
     monitor-enter p0
 
@@ -756,7 +756,7 @@
 
     const-string v0, "Calling this from your main thread can lead to deadlock"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aX(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aS(Ljava/lang/String;)V
 
     monitor-enter p0
 
@@ -778,7 +778,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient;->zzi:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;
 
-    iget-boolean v1, v1, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->abY:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->acr:Z
 
     if-eqz v1, :cond_1
 
@@ -858,7 +858,7 @@
     :try_start_6
     iget-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient;->zzf:Lcom/google/android/gms/internal/a/e;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/a/e;->mL()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/a/e;->mJ()Z
 
     move-result v0
     :try_end_6
@@ -924,7 +924,7 @@
 
     const-string v0, "Calling this from your main thread can lead to deadlock"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aX(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aS(Ljava/lang/String;)V
 
     monitor-enter p0
 
@@ -947,7 +947,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
     iget-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient;->mContext:Landroid/content/Context;
 
@@ -1011,7 +1011,7 @@
 
     const-string v0, "Calling this from your main thread can lead to deadlock"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aX(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aS(Ljava/lang/String;)V
 
     monitor-enter p0
 
@@ -1033,7 +1033,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient;->zzi:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;
 
-    iget-boolean v1, v1, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->abY:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->acr:Z
 
     if-eqz v1, :cond_1
 
@@ -1121,7 +1121,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient;->zzf:Lcom/google/android/gms/internal/a/e;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/a/e;->mK()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/a/e;->mI()Z
 
     move-result v2
 
diff --git a/com.discord/smali/com/google/android/gms/auth/api/signin/a/a.smali b/com.discord/smali/com/google/android/gms/auth/api/signin/a/a.smali
index e266177f89..d8a2445bc7 100644
--- a/com.discord/smali/com/google/android/gms/auth/api/signin/a/a.smali
+++ b/com.discord/smali/com/google/android/gms/auth/api/signin/a/a.smali
@@ -3,15 +3,15 @@
 
 
 # static fields
-.field private static final adf:Ljava/util/concurrent/locks/Lock;
+.field private static final adx:Ljava/util/concurrent/locks/Lock;
 
-.field private static adg:Lcom/google/android/gms/auth/api/signin/a/a;
+.field private static ady:Lcom/google/android/gms/auth/api/signin/a/a;
 
 
 # instance fields
-.field private final adh:Ljava/util/concurrent/locks/Lock;
+.field private final adA:Landroid/content/SharedPreferences;
 
-.field private final adi:Landroid/content/SharedPreferences;
+.field private final adz:Ljava/util/concurrent/locks/Lock;
 
 
 # direct methods
@@ -22,7 +22,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/locks/ReentrantLock;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->adf:Ljava/util/concurrent/locks/Lock;
+    sput-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->adx:Ljava/util/concurrent/locks/Lock;
 
     return-void
 .end method
@@ -36,7 +36,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/locks/ReentrantLock;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->adh:Ljava/util/concurrent/locks/Lock;
+    iput-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->adz:Ljava/util/concurrent/locks/Lock;
 
     const-string v0, "com.google.android.gms.signin"
 
@@ -46,7 +46,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/auth/api/signin/a/a;->adi:Landroid/content/SharedPreferences;
+    iput-object p1, p0, Lcom/google/android/gms/auth/api/signin/a/a;->adA:Landroid/content/SharedPreferences;
 
     return-void
 .end method
@@ -56,12 +56,12 @@
 
     invoke-static {p0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->adf:Ljava/util/concurrent/locks/Lock;
+    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->adx:Ljava/util/concurrent/locks/Lock;
 
     invoke-interface {v0}, Ljava/util/concurrent/locks/Lock;->lock()V
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->adg:Lcom/google/android/gms/auth/api/signin/a/a;
+    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->ady:Lcom/google/android/gms/auth/api/signin/a/a;
 
     if-nez v0, :cond_0
 
@@ -73,14 +73,14 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/auth/api/signin/a/a;-><init>(Landroid/content/Context;)V
 
-    sput-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->adg:Lcom/google/android/gms/auth/api/signin/a/a;
+    sput-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->ady:Lcom/google/android/gms/auth/api/signin/a/a;
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/auth/api/signin/a/a;->adg:Lcom/google/android/gms/auth/api/signin/a/a;
+    sget-object p0, Lcom/google/android/gms/auth/api/signin/a/a;->ady:Lcom/google/android/gms/auth/api/signin/a/a;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->adf:Ljava/util/concurrent/locks/Lock;
+    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->adx:Ljava/util/concurrent/locks/Lock;
 
     invoke-interface {v0}, Ljava/util/concurrent/locks/Lock;->unlock()V
 
@@ -89,7 +89,7 @@
     :catchall_0
     move-exception p0
 
-    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->adf:Ljava/util/concurrent/locks/Lock;
+    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->adx:Ljava/util/concurrent/locks/Lock;
 
     invoke-interface {v0}, Ljava/util/concurrent/locks/Lock;->unlock()V
 
@@ -98,7 +98,7 @@
 
 
 # virtual methods
-.method public final aP(Ljava/lang/String;)Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+.method public final aK(Ljava/lang/String;)Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
     .locals 4
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -148,14 +148,14 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/auth/api/signin/a/a;->aQ(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/auth/api/signin/a/a;->aL(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
     if-eqz p1, :cond_1
 
     :try_start_0
-    invoke-static {p1}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aO(Ljava/lang/String;)Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    invoke-static {p1}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aJ(Ljava/lang/String;)Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
 
     move-result-object p1
     :try_end_0
@@ -168,17 +168,17 @@
     return-object v1
 .end method
 
-.method public final aQ(Ljava/lang/String;)Ljava/lang/String;
+.method public final aL(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->adh:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->adz:Ljava/util/concurrent/locks/Lock;
 
     invoke-interface {v0}, Ljava/util/concurrent/locks/Lock;->lock()V
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->adi:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->adA:Landroid/content/SharedPreferences;
 
     const/4 v1, 0x0
 
@@ -188,7 +188,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->adh:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->adz:Ljava/util/concurrent/locks/Lock;
 
     invoke-interface {v0}, Ljava/util/concurrent/locks/Lock;->unlock()V
 
@@ -197,7 +197,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->adh:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->adz:Ljava/util/concurrent/locks/Lock;
 
     invoke-interface {v0}, Ljava/util/concurrent/locks/Lock;->unlock()V
 
diff --git a/com.discord/smali/com/google/android/gms/common/g.smali b/com.discord/smali/com/google/android/gms/common/g.smali
index d98d90b28f..acd6b20a9d 100644
--- a/com.discord/smali/com/google/android/gms/common/g.smali
+++ b/com.discord/smali/com/google/android/gms/common/g.smali
@@ -8,7 +8,7 @@
 
 
 # static fields
-.field private static ady:Lcom/google/android/gms/common/g;
+.field private static adQ:Lcom/google/android/gms/common/g;
 
 
 # instance fields
@@ -40,7 +40,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/g;->ady:Lcom/google/android/gms/common/g;
+    sget-object v1, Lcom/google/android/gms/common/g;->adQ:Lcom/google/android/gms/common/g;
 
     if-nez v1, :cond_0
 
@@ -50,14 +50,14 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/common/g;-><init>(Landroid/content/Context;)V
 
-    sput-object v1, Lcom/google/android/gms/common/g;->ady:Lcom/google/android/gms/common/g;
+    sput-object v1, Lcom/google/android/gms/common/g;->adQ:Lcom/google/android/gms/common/g;
 
     :cond_0
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    sget-object p0, Lcom/google/android/gms/common/g;->ady:Lcom/google/android/gms/common/g;
+    sget-object p0, Lcom/google/android/gms/common/g;->adQ:Lcom/google/android/gms/common/g;
 
     return-object p0
 
@@ -156,7 +156,7 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lcom/google/android/gms/common/q;->akN:[Lcom/google/android/gms/common/n;
+    sget-object p1, Lcom/google/android/gms/common/q;->alf:[Lcom/google/android/gms/common/n;
 
     invoke-static {p0, p1}, Lcom/google/android/gms/common/g;->a(Landroid/content/pm/PackageInfo;[Lcom/google/android/gms/common/n;)Lcom/google/android/gms/common/n;
 
@@ -167,7 +167,7 @@
     :cond_0
     new-array p1, v1, [Lcom/google/android/gms/common/n;
 
-    sget-object v2, Lcom/google/android/gms/common/q;->akN:[Lcom/google/android/gms/common/n;
+    sget-object v2, Lcom/google/android/gms/common/q;->alf:[Lcom/google/android/gms/common/n;
 
     aget-object v2, v2, v0
 
@@ -186,7 +186,7 @@
     return v0
 .end method
 
-.method private final aR(Ljava/lang/String;)Lcom/google/android/gms/common/v;
+.method private final aM(Ljava/lang/String;)Lcom/google/android/gms/common/v;
     .locals 7
 
     :try_start_0
@@ -196,7 +196,7 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -218,7 +218,7 @@
 
     const-string v0, "null pkg"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/v;->be(Ljava/lang/String;)Lcom/google/android/gms/common/v;
+    invoke-static {v0}, Lcom/google/android/gms/common/v;->aZ(Ljava/lang/String;)Lcom/google/android/gms/common/v;
 
     move-result-object p1
 
@@ -235,7 +235,7 @@
 
     const-string v0, "single cert required"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/v;->be(Ljava/lang/String;)Lcom/google/android/gms/common/v;
+    invoke-static {v0}, Lcom/google/android/gms/common/v;->aZ(Ljava/lang/String;)Lcom/google/android/gms/common/v;
 
     move-result-object p1
 
@@ -262,7 +262,7 @@
 
     move-result-object v1
 
-    iget-boolean v6, v1, Lcom/google/android/gms/common/v;->akS:Z
+    iget-boolean v6, v1, Lcom/google/android/gms/common/v;->alk:Z
 
     if-eqz v6, :cond_2
 
@@ -282,13 +282,13 @@
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lcom/google/android/gms/common/v;->akS:Z
+    iget-boolean v0, v0, Lcom/google/android/gms/common/v;->alk:Z
 
     if-eqz v0, :cond_2
 
     const-string v0, "debuggable release cert app rejected"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/v;->be(Ljava/lang/String;)Lcom/google/android/gms/common/v;
+    invoke-static {v0}, Lcom/google/android/gms/common/v;->aZ(Ljava/lang/String;)Lcom/google/android/gms/common/v;
 
     move-result-object p1
     :try_end_0
@@ -326,7 +326,7 @@
     invoke-direct {p1, v0}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
     :goto_0
-    invoke-static {p1}, Lcom/google/android/gms/common/v;->be(Ljava/lang/String;)Lcom/google/android/gms/common/v;
+    invoke-static {p1}, Lcom/google/android/gms/common/v;->aZ(Ljava/lang/String;)Lcom/google/android/gms/common/v;
 
     move-result-object p1
 
@@ -344,7 +344,7 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -374,11 +374,11 @@
 
     aget-object v0, p1, v2
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/common/g;->aR(Ljava/lang/String;)Lcom/google/android/gms/common/v;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/common/g;->aM(Ljava/lang/String;)Lcom/google/android/gms/common/v;
 
     move-result-object v0
 
-    iget-boolean v3, v0, Lcom/google/android/gms/common/v;->akS:Z
+    iget-boolean v3, v0, Lcom/google/android/gms/common/v;->alk:Z
 
     if-nez v3, :cond_2
 
@@ -390,12 +390,12 @@
     :goto_1
     const-string p1, "no pkgs"
 
-    invoke-static {p1}, Lcom/google/android/gms/common/v;->be(Ljava/lang/String;)Lcom/google/android/gms/common/v;
+    invoke-static {p1}, Lcom/google/android/gms/common/v;->aZ(Ljava/lang/String;)Lcom/google/android/gms/common/v;
 
     move-result-object v0
 
     :cond_2
-    iget-boolean p1, v0, Lcom/google/android/gms/common/v;->akS:Z
+    iget-boolean p1, v0, Lcom/google/android/gms/common/v;->alk:Z
 
     if-nez p1, :cond_4
 
@@ -413,7 +413,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/v;->mG()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/v;->mE()Ljava/lang/String;
 
     move-result-object p1
 
@@ -424,7 +424,7 @@
     goto :goto_2
 
     :cond_3
-    invoke-virtual {v0}, Lcom/google/android/gms/common/v;->mG()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/v;->mE()Ljava/lang/String;
 
     move-result-object p1
 
@@ -432,7 +432,7 @@
 
     :cond_4
     :goto_2
-    iget-boolean p1, v0, Lcom/google/android/gms/common/v;->akS:Z
+    iget-boolean p1, v0, Lcom/google/android/gms/common/v;->alk:Z
 
     return p1
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/internal/t.smali b/com.discord/smali/com/google/android/gms/common/internal/t.smali
index 120c9963d5..876a6d69e8 100644
--- a/com.discord/smali/com/google/android/gms/common/internal/t.smali
+++ b/com.discord/smali/com/google/android/gms/common/internal/t.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field private final aiG:Landroid/content/res/Resources;
+.field private final aiY:Landroid/content/res/Resources;
 
-.field private final aiH:Ljava/lang/String;
+.field private final aiZ:Ljava/lang/String;
 
 
 # direct methods
@@ -20,9 +20,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/t;->aiG:Landroid/content/res/Resources;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/t;->aiY:Landroid/content/res/Resources;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/t;->aiG:Landroid/content/res/Resources;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/t;->aiY:Landroid/content/res/Resources;
 
     sget v0, Lcom/google/android/gms/common/R$a;->common_google_play_services_unknown_issue:I
 
@@ -30,7 +30,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/t;->aiH:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/t;->aiZ:Ljava/lang/String;
 
     return-void
 .end method
@@ -42,9 +42,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/t;->aiG:Landroid/content/res/Resources;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/t;->aiY:Landroid/content/res/Resources;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/t;->aiH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/t;->aiZ:Ljava/lang/String;
 
     const-string v2, "string"
 
@@ -59,7 +59,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/t;->aiG:Landroid/content/res/Resources;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/t;->aiY:Landroid/content/res/Resources;
 
     invoke-virtual {v0, p1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/google/android/gms/common/l.smali b/com.discord/smali/com/google/android/gms/common/l.smali
index dd32b69b83..2e6e5b9145 100644
--- a/com.discord/smali/com/google/android/gms/common/l.smali
+++ b/com.discord/smali/com/google/android/gms/common/l.smali
@@ -8,11 +8,11 @@
 
 
 # static fields
-.field private static volatile akD:Lcom/google/android/gms/common/internal/ao;
+.field private static volatile akV:Lcom/google/android/gms/common/internal/ao;
 
-.field private static final akE:Ljava/lang/Object;
+.field private static final akW:Ljava/lang/Object;
 
-.field private static akF:Landroid/content/Context;
+.field private static akX:Landroid/content/Context;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/l;->akE:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/common/l;->akW:Ljava/lang/Object;
 
     return-void
 .end method
@@ -36,7 +36,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/l;->akF:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/common/l;->akX:Landroid/content/Context;
 
     if-nez v1, :cond_0
 
@@ -46,7 +46,7 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/android/gms/common/l;->akF:Landroid/content/Context;
+    sput-object p0, Lcom/google/android/gms/common/l;->akX:Landroid/content/Context;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -121,7 +121,7 @@
 
     move-result-object v2
 
-    iget-boolean v2, v2, Lcom/google/android/gms/common/v;->akS:Z
+    iget-boolean v2, v2, Lcom/google/android/gms/common/v;->alk:Z
 
     if-eqz v2, :cond_0
 
@@ -142,28 +142,28 @@
     .locals 4
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/common/l;->akD:Lcom/google/android/gms/common/internal/ao;
+    sget-object v0, Lcom/google/android/gms/common/l;->akV:Lcom/google/android/gms/common/internal/ao;
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/common/l;->akF:Landroid/content/Context;
+    sget-object v0, Lcom/google/android/gms/common/l;->akX:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/google/android/gms/common/l;->akE:Ljava/lang/Object;
+    sget-object v0, Lcom/google/android/gms/common/l;->akW:Ljava/lang/Object;
 
     monitor-enter v0
     :try_end_0
     .catch Lcom/google/android/gms/dynamite/DynamiteModule$a; {:try_start_0 .. :try_end_0} :catch_1
 
     :try_start_1
-    sget-object v1, Lcom/google/android/gms/common/l;->akD:Lcom/google/android/gms/common/internal/ao;
+    sget-object v1, Lcom/google/android/gms/common/l;->akV:Lcom/google/android/gms/common/internal/ao;
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/common/l;->akF:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/common/l;->akX:Landroid/content/Context;
 
-    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->alg:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->alz:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     const-string v3, "com.google.android.gms.googlecertificates"
 
@@ -173,7 +173,7 @@
 
     const-string v2, "com.google.android.gms.common.GoogleCertificatesImpl"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/dynamite/DynamiteModule;->bf(Ljava/lang/String;)Landroid/os/IBinder;
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/dynamite/DynamiteModule;->ba(Ljava/lang/String;)Landroid/os/IBinder;
 
     move-result-object v1
 
@@ -181,7 +181,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/common/l;->akD:Lcom/google/android/gms/common/internal/ao;
+    sput-object v1, Lcom/google/android/gms/common/l;->akV:Lcom/google/android/gms/common/internal/ao;
 
     :cond_0
     monitor-exit v0
@@ -202,7 +202,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/google/android/gms/common/l;->akF:Landroid/content/Context;
+    sget-object v0, Lcom/google/android/gms/common/l;->akX:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -211,9 +211,9 @@
     invoke-direct {v0, p0, p1, p2, p3}, Lcom/google/android/gms/common/zzk;-><init>(Ljava/lang/String;Lcom/google/android/gms/common/n;ZZ)V
 
     :try_start_3
-    sget-object p3, Lcom/google/android/gms/common/l;->akD:Lcom/google/android/gms/common/internal/ao;
+    sget-object p3, Lcom/google/android/gms/common/l;->akV:Lcom/google/android/gms/common/internal/ao;
 
-    sget-object v1, Lcom/google/android/gms/common/l;->akF:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/common/l;->akX:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -231,7 +231,7 @@
 
     if-eqz p3, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/common/v;->mF()Lcom/google/android/gms/common/v;
+    invoke-static {}, Lcom/google/android/gms/common/v;->mD()Lcom/google/android/gms/common/v;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/google/android/gms/common/util/m.smali b/com.discord/smali/com/google/android/gms/common/util/m.smali
index acbe558ee9..3f5cf51d6f 100644
--- a/com.discord/smali/com/google/android/gms/common/util/m.smali
+++ b/com.discord/smali/com/google/android/gms/common/util/m.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field private static akg:Ljava/lang/String;
+.field private static aky:Ljava/lang/String;
 
-.field private static akh:I
+.field private static akz:I
 
 
 # direct methods
@@ -15,7 +15,7 @@
     return-void
 .end method
 
-.method private static ba(Ljava/lang/String;)Ljava/io/BufferedReader;
+.method private static aV(Ljava/lang/String;)Ljava/io/BufferedReader;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -83,7 +83,7 @@
 
     move-result-object p0
 
-    invoke-static {p0}, Lcom/google/android/gms/common/util/m;->ba(Ljava/lang/String;)Ljava/io/BufferedReader;
+    invoke-static {p0}, Lcom/google/android/gms/common/util/m;->aV(Ljava/lang/String;)Ljava/io/BufferedReader;
 
     move-result-object p0
     :try_end_0
@@ -135,16 +135,16 @@
     return-object v0
 .end method
 
-.method public static mv()Ljava/lang/String;
+.method public static mt()Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/common/util/m;->akg:Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/common/util/m;->aky:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    sget v0, Lcom/google/android/gms/common/util/m;->akh:I
+    sget v0, Lcom/google/android/gms/common/util/m;->akz:I
 
     if-nez v0, :cond_0
 
@@ -152,19 +152,19 @@
 
     move-result v0
 
-    sput v0, Lcom/google/android/gms/common/util/m;->akh:I
+    sput v0, Lcom/google/android/gms/common/util/m;->akz:I
 
     :cond_0
-    sget v0, Lcom/google/android/gms/common/util/m;->akh:I
+    sget v0, Lcom/google/android/gms/common/util/m;->akz:I
 
     invoke-static {v0}, Lcom/google/android/gms/common/util/m;->bi(I)Ljava/lang/String;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/m;->akg:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/common/util/m;->aky:Ljava/lang/String;
 
     :cond_1
-    sget-object v0, Lcom/google/android/gms/common/util/m;->akg:Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/common/util/m;->aky:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/v.smali b/com.discord/smali/com/google/android/gms/common/v.smali
index 3064794728..98768fbfbb 100644
--- a/com.discord/smali/com/google/android/gms/common/v.smali
+++ b/com.discord/smali/com/google/android/gms/common/v.smali
@@ -8,13 +8,13 @@
 
 
 # static fields
-.field private static final akR:Lcom/google/android/gms/common/v;
+.field private static final alj:Lcom/google/android/gms/common/v;
 
 
 # instance fields
-.field final akS:Z
+.field final alk:Z
 
-.field private final akT:Ljava/lang/String;
+.field private final alm:Ljava/lang/String;
 
 .field final cause:Ljava/lang/Throwable;
 
@@ -31,7 +31,7 @@
 
     invoke-direct {v0, v2, v1, v1}, Lcom/google/android/gms/common/v;-><init>(ZLjava/lang/String;Ljava/lang/Throwable;)V
 
-    sput-object v0, Lcom/google/android/gms/common/v;->akR:Lcom/google/android/gms/common/v;
+    sput-object v0, Lcom/google/android/gms/common/v;->alj:Lcom/google/android/gms/common/v;
 
     return-void
 .end method
@@ -49,16 +49,16 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/v;->akS:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/v;->alk:Z
 
-    iput-object p2, p0, Lcom/google/android/gms/common/v;->akT:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/v;->alm:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/google/android/gms/common/v;->cause:Ljava/lang/Throwable;
 
     return-void
 .end method
 
-.method static be(Ljava/lang/String;)Lcom/google/android/gms/common/v;
+.method static aZ(Ljava/lang/String;)Lcom/google/android/gms/common/v;
     .locals 3
 
     new-instance v0, Lcom/google/android/gms/common/v;
@@ -101,7 +101,7 @@
 
     const-string p3, "SHA-1"
 
-    invoke-static {p3}, Lcom/google/android/gms/common/util/a;->aZ(Ljava/lang/String;)Ljava/security/MessageDigest;
+    invoke-static {p3}, Lcom/google/android/gms/common/util/a;->aU(Ljava/lang/String;)Ljava/security/MessageDigest;
 
     move-result-object p3
 
@@ -175,22 +175,22 @@
     return-object v0
 .end method
 
-.method static mF()Lcom/google/android/gms/common/v;
+.method static mD()Lcom/google/android/gms/common/v;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/v;->akR:Lcom/google/android/gms/common/v;
+    sget-object v0, Lcom/google/android/gms/common/v;->alj:Lcom/google/android/gms/common/v;
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method mG()Ljava/lang/String;
+.method mE()Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/v;->akT:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/v;->alm:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/google/android/gms/common/zzk.smali b/com.discord/smali/com/google/android/gms/common/zzk.smali
index 70795f7cfd..fde3e6d56d 100644
--- a/com.discord/smali/com/google/android/gms/common/zzk.smali
+++ b/com.discord/smali/com/google/android/gms/common/zzk.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field private final aia:Ljava/lang/String;
+.field private final ais:Ljava/lang/String;
 
-.field private final akO:Lcom/google/android/gms/common/n;
+.field private final alg:Lcom/google/android/gms/common/n;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final akP:Z
+.field private final alh:Z
 
-.field private final akQ:Z
+.field private final ali:Z
 
 
 # direct methods
@@ -49,17 +49,17 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/zzk;->aia:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/zzk;->ais:Ljava/lang/String;
 
     invoke-static {p2}, Lcom/google/android/gms/common/zzk;->h(Landroid/os/IBinder;)Lcom/google/android/gms/common/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/zzk;->akO:Lcom/google/android/gms/common/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/zzk;->alg:Lcom/google/android/gms/common/n;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/common/zzk;->akP:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/common/zzk;->alh:Z
 
-    iput-boolean p4, p0, Lcom/google/android/gms/common/zzk;->akQ:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/common/zzk;->ali:Z
 
     return-void
 .end method
@@ -73,13 +73,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/zzk;->aia:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/zzk;->ais:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/zzk;->akO:Lcom/google/android/gms/common/n;
+    iput-object p2, p0, Lcom/google/android/gms/common/zzk;->alg:Lcom/google/android/gms/common/n;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/common/zzk;->akP:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/common/zzk;->alh:Z
 
-    iput-boolean p4, p0, Lcom/google/android/gms/common/zzk;->akQ:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/common/zzk;->ali:Z
 
     return-void
 .end method
@@ -109,7 +109,7 @@
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/google/android/gms/common/internal/ak;->mk()Lcom/google/android/gms/a/a;
+    invoke-interface {p0}, Lcom/google/android/gms/common/internal/ak;->mi()Lcom/google/android/gms/a/a;
 
     move-result-object p0
     :try_end_0
@@ -162,13 +162,13 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/zzk;->aia:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/zzk;->ais:Ljava/lang/String;
 
     const/4 v1, 0x1
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/zzk;->akO:Lcom/google/android/gms/common/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/zzk;->alg:Lcom/google/android/gms/common/n;
 
     if-nez v0, :cond_0
 
@@ -194,13 +194,13 @@
 
     const/4 v0, 0x3
 
-    iget-boolean v1, p0, Lcom/google/android/gms/common/zzk;->akP:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/zzk;->alh:Z
 
     invoke-static {p1, v0, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
     const/4 v0, 0x4
 
-    iget-boolean v1, p0, Lcom/google/android/gms/common/zzk;->akQ:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/zzk;->ali:Z
 
     invoke-static {p1, v0, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
diff --git a/com.discord/smali/com/google/android/gms/internal/e/j.smali b/com.discord/smali/com/google/android/gms/internal/e/j.smali
index b2a5c68450..226c4b92b2 100644
--- a/com.discord/smali/com/google/android/gms/internal/e/j.smali
+++ b/com.discord/smali/com/google/android/gms/internal/e/j.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final alK:Ljava/util/logging/Logger;
+.field private static final amc:Ljava/util/logging/Logger;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/e/j;->alK:Ljava/util/logging/Logger;
+    sput-object v0, Lcom/google/android/gms/internal/e/j;->amc:Ljava/util/logging/Logger;
 
     return-void
 .end method
@@ -54,7 +54,7 @@
     move-exception v5
 
     :try_start_1
-    sget-object v0, Lcom/google/android/gms/internal/e/j;->alK:Ljava/util/logging/Logger;
+    sget-object v0, Lcom/google/android/gms/internal/e/j;->amc:Ljava/util/logging/Logger;
 
     sget-object v1, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
 
diff --git a/com.discord/smali/com/google/android/gms/internal/measurement/bm.smali b/com.discord/smali/com/google/android/gms/internal/measurement/bm.smali
index 1c049907b9..1112b00067 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/bm.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/bm.smali
@@ -3,23 +3,23 @@
 
 
 # instance fields
-.field private final aoV:Z
+.field private final apo:Z
 
-.field private final asl:Ljava/lang/String;
+.field private final asD:Ljava/lang/String;
 
-.field final asm:Landroid/net/Uri;
+.field final asE:Landroid/net/Uri;
 
-.field final asn:Ljava/lang/String;
+.field final asF:Ljava/lang/String;
 
-.field final aso:Ljava/lang/String;
+.field final asG:Ljava/lang/String;
 
-.field private final asp:Z
+.field private final asH:Z
 
-.field private final asq:Z
+.field private final asI:Z
 
-.field private final asr:Z
+.field private final asJ:Z
 
-.field private final ass:Lcom/google/android/gms/internal/measurement/bq;
+.field private final asK:Lcom/google/android/gms/internal/measurement/bq;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bq<",
@@ -61,25 +61,25 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bm;->asl:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bm;->asD:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bm;->asm:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bm;->asE:Landroid/net/Uri;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/bm;->asn:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/bm;->asF:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/bm;->aso:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/bm;->asG:Ljava/lang/String;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/bm;->asp:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/bm;->asH:Z
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/bm;->asq:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/bm;->asI:Z
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/bm;->asr:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/bm;->asJ:Z
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/bm;->aoV:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/bm;->apo:Z
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bm;->ass:Lcom/google/android/gms/internal/measurement/bq;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bm;->asK:Lcom/google/android/gms/internal/measurement/bq;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/measurement/bn.smali b/com.discord/smali/com/google/android/gms/internal/measurement/bn.smali
index 1550cbc94f..3161bcd272 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/bn.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/bn.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final ast:Lcom/google/android/gms/internal/measurement/bn;
+.field static final asL:Lcom/google/android/gms/internal/measurement/bn;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bn<",
@@ -34,7 +34,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/bn;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bn;->ast:Lcom/google/android/gms/internal/measurement/bn;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bn;->asL:Lcom/google/android/gms/internal/measurement/bn;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/measurement/bp.smali b/com.discord/smali/com/google/android/gms/internal/measurement/bp.smali
index 22a4dfa776..1839b0187f 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/bp.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/bp.smali
@@ -49,7 +49,7 @@
     return-object v0
 .end method
 
-.method public static qL()Lcom/google/android/gms/internal/measurement/bp;
+.method public static qJ()Lcom/google/android/gms/internal/measurement/bp;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -61,7 +61,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/bn;->ast:Lcom/google/android/gms/internal/measurement/bn;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/bn;->asL:Lcom/google/android/gms/internal/measurement/bn;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/measurement/bw.smali b/com.discord/smali/com/google/android/gms/internal/measurement/bw.smali
index b8fd946fa3..4a644b290e 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/bw.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/bw.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field private volatile asv:Z
+.field private volatile asN:Z
 
 .field private value:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -76,14 +76,14 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bw;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bw;->asN:Z
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bw;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bw;->asN:Z
 
     if-nez v0, :cond_0
 
@@ -97,7 +97,7 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/internal/measurement/bw;->asv:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/measurement/bw;->asN:Z
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/measurement/bx.smali b/com.discord/smali/com/google/android/gms/internal/measurement/bx.smali
index 7862c44e56..49895ff1ce 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/bx.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/bx.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field private volatile transient asv:Z
+.field private volatile transient asN:Z
 
 .field private transient value:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -78,14 +78,14 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bx;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bx;->asN:Z
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bx;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bx;->asN:Z
 
     if-nez v0, :cond_0
 
@@ -99,7 +99,7 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/internal/measurement/bx;->asv:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/measurement/bx;->asN:Z
 
     monitor-exit p0
 
@@ -129,7 +129,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bx;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bx;->asN:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali/com/google/firebase/d/a.smali b/com.discord/smali/com/google/firebase/d/a.smali
index 3e18fd52c0..35d14e77f6 100644
--- a/com.discord/smali/com/google/firebase/d/a.smali
+++ b/com.discord/smali/com/google/firebase/d/a.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final aWh:Ljava/lang/String;
+.field private final aWz:Ljava/lang/String;
 
 .field private final version:Ljava/lang/String;
 
@@ -17,7 +17,7 @@
 
     if-eqz p1, :cond_1
 
-    iput-object p1, p0, Lcom/google/firebase/d/a;->aWh:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/d/a;->aWz:Ljava/lang/String;
 
     if-eqz p2, :cond_0
 
@@ -46,12 +46,12 @@
 
 
 # virtual methods
-.method public final BC()Ljava/lang/String;
+.method public final Br()Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nonnull;
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/d/a;->aWh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/d/a;->aWz:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -74,9 +74,9 @@
 
     check-cast p1, Lcom/google/firebase/d/e;
 
-    iget-object v1, p0, Lcom/google/firebase/d/a;->aWh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/a;->aWz:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/firebase/d/e;->BC()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/firebase/d/e;->Br()Ljava/lang/String;
 
     move-result-object v3
 
@@ -117,7 +117,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/d/a;->aWh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/d/a;->aWz:Ljava/lang/String;
 
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
@@ -149,7 +149,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/firebase/d/a;->aWh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/a;->aWz:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/google/firebase/d/e.smali b/com.discord/smali/com/google/firebase/d/e.smali
index 10c2c968fa..f6ee87304c 100644
--- a/com.discord/smali/com/google/firebase/d/e.smali
+++ b/com.discord/smali/com/google/firebase/d/e.smali
@@ -24,7 +24,7 @@
 
 
 # virtual methods
-.method public abstract BC()Ljava/lang/String;
+.method public abstract Br()Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nonnull;
     .end annotation
 .end method
diff --git a/com.discord/smali/com/google/firebase/iid/t.smali b/com.discord/smali/com/google/firebase/iid/t.smali
index c07352ec76..f5ddc7585a 100644
--- a/com.discord/smali/com/google/firebase/iid/t.smali
+++ b/com.discord/smali/com/google/firebase/iid/t.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field aVp:Lcom/google/firebase/iid/u;
+.field aVH:Lcom/google/firebase/iid/u;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Landroid/content/BroadcastReceiver;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/t;->aVp:Lcom/google/firebase/iid/u;
+    iput-object p1, p0, Lcom/google/firebase/iid/t;->aVH:Lcom/google/firebase/iid/u;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/firebase/iid/t;->aVp:Lcom/google/firebase/iid/u;
+    iget-object p1, p0, Lcom/google/firebase/iid/t;->aVH:Lcom/google/firebase/iid/u;
 
     if-nez p1, :cond_0
 
@@ -42,7 +42,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bf()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AZ()Z
 
     move-result p1
 
@@ -55,15 +55,15 @@
     invoke-static {p1, p2}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_2
-    iget-object p1, p0, Lcom/google/firebase/iid/t;->aVp:Lcom/google/firebase/iid/u;
+    iget-object p1, p0, Lcom/google/firebase/iid/t;->aVH:Lcom/google/firebase/iid/u;
 
     const-wide/16 v0, 0x0
 
     invoke-static {p1, v0, v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->a(Ljava/lang/Runnable;J)V
 
-    iget-object p1, p0, Lcom/google/firebase/iid/t;->aVp:Lcom/google/firebase/iid/u;
+    iget-object p1, p0, Lcom/google/firebase/iid/t;->aVH:Lcom/google/firebase/iid/u;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/u;->Bq()Landroid/content/Context;
+    invoke-virtual {p1}, Lcom/google/firebase/iid/u;->Bk()Landroid/content/Context;
 
     move-result-object p1
 
@@ -71,7 +71,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/firebase/iid/t;->aVp:Lcom/google/firebase/iid/u;
+    iput-object p1, p0, Lcom/google/firebase/iid/t;->aVH:Lcom/google/firebase/iid/u;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/google/gson/a/a.smali b/com.discord/smali/com/google/gson/a/a.smali
index 401fcc477c..b1d5effa7d 100644
--- a/com.discord/smali/com/google/gson/a/a.smali
+++ b/com.discord/smali/com/google/gson/a/a.smali
@@ -9,8 +9,8 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lcom/google/gson/a/a;
-        BP = true
-        BQ = true
+        BE = true
+        BF = true
     .end subannotation
 .end annotation
 
@@ -29,8 +29,8 @@
 
 
 # virtual methods
-.method public abstract BP()Z
+.method public abstract BE()Z
 .end method
 
-.method public abstract BQ()Z
+.method public abstract BF()Z
 .end method
diff --git a/com.discord/smali/com/google/gson/a/b.smali b/com.discord/smali/com/google/gson/a/b.smali
index ad593c2ed9..bf9153aa60 100644
--- a/com.discord/smali/com/google/gson/a/b.smali
+++ b/com.discord/smali/com/google/gson/a/b.smali
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lcom/google/gson/a/b;
-        BR = true
+        BG = true
     .end subannotation
 .end annotation
 
@@ -26,7 +26,7 @@
 
 
 # virtual methods
-.method public abstract BR()Z
+.method public abstract BG()Z
 .end method
 
 .method public abstract value()Ljava/lang/Class;
diff --git a/com.discord/smali/com/google/gson/a/c.smali b/com.discord/smali/com/google/gson/a/c.smali
index 555895fbd3..fa5cd4fdba 100644
--- a/com.discord/smali/com/google/gson/a/c.smali
+++ b/com.discord/smali/com/google/gson/a/c.smali
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lcom/google/gson/a/c;
-        BS = {}
+        BH = {}
     .end subannotation
 .end annotation
 
@@ -29,7 +29,7 @@
 
 
 # virtual methods
-.method public abstract BS()[Ljava/lang/String;
+.method public abstract BH()[Ljava/lang/String;
 .end method
 
 .method public abstract value()Ljava/lang/String;
diff --git a/com.discord/smali/com/google/gson/a/d.smali b/com.discord/smali/com/google/gson/a/d.smali
index b99da3bd48..83aedea577 100644
--- a/com.discord/smali/com/google/gson/a/d.smali
+++ b/com.discord/smali/com/google/gson/a/d.smali
@@ -23,5 +23,5 @@
 
 
 # virtual methods
-.method public abstract BT()D
+.method public abstract BI()D
 .end method
diff --git a/com.discord/smali/com/google/gson/a/e.smali b/com.discord/smali/com/google/gson/a/e.smali
index c5b36ef0fd..a950bdeec6 100644
--- a/com.discord/smali/com/google/gson/a/e.smali
+++ b/com.discord/smali/com/google/gson/a/e.smali
@@ -23,5 +23,5 @@
 
 
 # virtual methods
-.method public abstract BT()D
+.method public abstract BI()D
 .end method
diff --git a/com.discord/smali/com/miguelgaeta/backgrounded/Backgrounded.smali b/com.discord/smali/com/miguelgaeta/backgrounded/Backgrounded.smali
index 72edfe44bf..09a63ad7f2 100644
--- a/com.discord/smali/com/miguelgaeta/backgrounded/Backgrounded.smali
+++ b/com.discord/smali/com/miguelgaeta/backgrounded/Backgrounded.smali
@@ -32,7 +32,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -106,7 +106,7 @@
 
     sget-object v0, Lcom/miguelgaeta/backgrounded/Backgrounded;->emitter:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->JO()Lrx/Observable;
 
     move-result-object v0
 
@@ -145,7 +145,7 @@
 
     sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iget-object v0, v0, Lrx/b/a;->bQm:Lrx/Observable;
+    iget-object v0, v0, Lrx/b/a;->bQH:Lrx/Observable;
 
     new-instance v2, Lrx/internal/a/b$1;
 
diff --git a/com.discord/smali/kotlin/Unit.smali b/com.discord/smali/kotlin/Unit.smali
index 8c69bd9c11..04df93df94 100644
--- a/com.discord/smali/kotlin/Unit.smali
+++ b/com.discord/smali/kotlin/Unit.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bjF:Lkotlin/Unit;
+.field public static final bjZ:Lkotlin/Unit;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlin/Unit;-><init>()V
 
-    sput-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sput-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-void
 .end method
diff --git a/com.discord/smali/kotlin/a/ao.smali b/com.discord/smali/kotlin/a/ao.smali
index a28066e7ed..810e20cee0 100644
--- a/com.discord/smali/kotlin/a/ao.smali
+++ b/com.discord/smali/kotlin/a/ao.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final U(II)V
+.method public static final T(II)V
     .locals 3
 
     if-lez p0, :cond_0
diff --git a/com.discord/smali/kotlin/a/k.smali b/com.discord/smali/kotlin/a/k.smali
index 732ed99eed..0aa4a499de 100644
--- a/com.discord/smali/kotlin/a/k.smali
+++ b/com.discord/smali/kotlin/a/k.smali
@@ -233,7 +233,7 @@
     return-object p1
 .end method
 
-.method public static final d([Ljava/lang/Object;)Ljava/lang/Object;
+.method public static final c([Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -273,7 +273,7 @@
     return-object p0
 .end method
 
-.method public static final e([Ljava/lang/Object;)Ljava/lang/Object;
+.method public static final d([Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -301,7 +301,7 @@
     :goto_0
     if-nez v0, :cond_1
 
-    invoke-static {p0}, Lkotlin/a/g;->g([Ljava/lang/Object;)I
+    invoke-static {p0}, Lkotlin/a/g;->f([Ljava/lang/Object;)I
 
     move-result v0
 
@@ -321,7 +321,7 @@
     throw p0
 .end method
 
-.method public static final f([Ljava/lang/Object;)Ljava/util/List;
+.method public static final e([Ljava/lang/Object;)Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -352,7 +352,7 @@
     return-object p0
 .end method
 
-.method public static final g([Ljava/lang/Object;)I
+.method public static final f([Ljava/lang/Object;)I
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -373,7 +373,7 @@
     return p0
 .end method
 
-.method public static final h([Ljava/lang/Object;)Ljava/util/List;
+.method public static final g([Ljava/lang/Object;)Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -391,7 +391,7 @@
 
     new-instance v0, Ljava/util/ArrayList;
 
-    invoke-static {p0}, Lkotlin/a/m;->k([Ljava/lang/Object;)Ljava/util/Collection;
+    invoke-static {p0}, Lkotlin/a/m;->j([Ljava/lang/Object;)Ljava/util/Collection;
 
     move-result-object p0
 
@@ -402,6 +402,69 @@
     return-object v0
 .end method
 
+.method public static final h([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}, Lkotlin/jvm/internal/k;->h(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}, Lkotlin/a/ad;->dj(I)I
+
+    move-result v1
+
+    invoke-direct {v0, v1}, Ljava/util/LinkedHashSet;-><init>(I)V
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-static {p0, v0}, Lkotlin/a/g;->b([Ljava/lang/Object;Ljava/util/Collection;)Ljava/util/Collection;
+
+    move-result-object p0
+
+    check-cast p0, Ljava/util/Set;
+
+    return-object p0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    aget-object p0, p0, v0
+
+    invoke-static {p0}, Lkotlin/a/ak;->bb(Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_1
+    sget-object p0, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
+
+    check-cast p0, Ljava/util/Set;
+
+    return-object p0
+.end method
+
 .method public static final h([I)Lkotlin/ranges/IntRange;
     .locals 2
 
@@ -436,67 +499,50 @@
     return p0
 .end method
 
-.method public static final i([Ljava/lang/Object;)Ljava/util/Set;
-    .locals 2
+.method public static final i([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
             "Ljava/lang/Object;",
             ">([TT;)",
-            "Ljava/util/Set<",
+            "Lkotlin/sequences/Sequence<",
             "TT;>;"
         }
     .end annotation
 
-    const-string v0, "$this$toSet"
+    const-string v0, "$this$asSequence"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p0
 
-    if-eqz v0, :cond_1
+    if-nez v0, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    if-eq v0, v1, :cond_0
-
-    new-instance v0, Ljava/util/LinkedHashSet;
-
-    array-length v1, p0
-
-    invoke-static {v1}, Lkotlin/a/ad;->dm(I)I
-
-    move-result v1
-
-    invoke-direct {v0, v1}, Ljava/util/LinkedHashSet;-><init>(I)V
-
-    check-cast v0, Ljava/util/Collection;
-
-    invoke-static {p0, v0}, Lkotlin/a/g;->b([Ljava/lang/Object;Ljava/util/Collection;)Ljava/util/Collection;
-
-    move-result-object p0
-
-    check-cast p0, Ljava/util/Set;
-
-    return-object p0
+    goto :goto_0
 
     :cond_0
     const/4 v0, 0x0
 
-    aget-object p0, p0, v0
+    :goto_0
+    if-eqz v0, :cond_1
 
-    invoke-static {p0}, Lkotlin/a/ak;->bb(Ljava/lang/Object;)Ljava/util/Set;
+    sget-object p0, Lkotlin/sequences/e;->blD:Lkotlin/sequences/e;
 
-    move-result-object p0
+    check-cast p0, Lkotlin/sequences/Sequence;
 
     return-object p0
 
     :cond_1
-    sget-object p0, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    new-instance v0, Lkotlin/a/k$a;
 
-    check-cast p0, Ljava/util/Set;
+    invoke-direct {v0, p0}, Lkotlin/a/k$a;-><init>([Ljava/lang/Object;)V
 
-    return-object p0
+    check-cast v0, Lkotlin/sequences/Sequence;
+
+    return-object v0
 .end method
 
 .method public static final j([I)Ljava/util/List;
@@ -544,49 +590,3 @@
 
     return-object v0
 .end method
-
-.method public static final j([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}, Lkotlin/jvm/internal/k;->h(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, Lkotlin/sequences/e;->blj:Lkotlin/sequences/e;
-
-    check-cast p0, Lkotlin/sequences/Sequence;
-
-    return-object p0
-
-    :cond_1
-    new-instance v0, Lkotlin/a/k$a;
-
-    invoke-direct {v0, p0}, Lkotlin/a/k$a;-><init>([Ljava/lang/Object;)V
-
-    check-cast v0, Lkotlin/sequences/Sequence;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/kotlin/a/o.smali b/com.discord/smali/kotlin/a/o.smali
index 78c4e64948..c4a9dbdd9d 100644
--- a/com.discord/smali/kotlin/a/o.smali
+++ b/com.discord/smali/kotlin/a/o.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final DY()V
+.method public static final DN()V
     .locals 2
 
     new-instance v0, Ljava/lang/ArithmeticException;
@@ -18,7 +18,7 @@
     throw v0
 .end method
 
-.method public static final DZ()V
+.method public static final DO()V
     .locals 2
 
     new-instance v0, Ljava/lang/ArithmeticException;
@@ -101,7 +101,7 @@
     return-object p0
 
     :cond_1
-    sget-object p0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p0, Ljava/util/List;
 
@@ -138,7 +138,7 @@
     return-object v0
 .end method
 
-.method public static final k([Ljava/lang/Object;)Ljava/util/Collection;
+.method public static final j([Ljava/lang/Object;)Ljava/util/Collection;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -165,7 +165,7 @@
     return-object v0
 .end method
 
-.method public static final varargs l([Ljava/lang/Object;)Ljava/util/List;
+.method public static final varargs k([Ljava/lang/Object;)Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -192,14 +192,14 @@
     return-object p0
 
     :cond_0
-    sget-object p0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p0, Ljava/util/List;
 
     return-object p0
 .end method
 
-.method public static final varargs m([Ljava/lang/Object;)Ljava/util/List;
+.method public static final varargs l([Ljava/lang/Object;)Ljava/util/List;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -245,7 +245,7 @@
     return-object v0
 .end method
 
-.method public static final varargs n([Ljava/lang/Object;)Ljava/util/ArrayList;
+.method public static final varargs m([Ljava/lang/Object;)Ljava/util/ArrayList;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -287,7 +287,7 @@
     return-object v0
 .end method
 
-.method public static final varargs o([Ljava/lang/Object;)Ljava/util/List;
+.method public static final varargs n([Ljava/lang/Object;)Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -303,7 +303,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p0}, Lkotlin/a/g;->f([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {p0}, Lkotlin/a/g;->e([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p0
 
diff --git a/com.discord/smali/kotlin/a/w.smali b/com.discord/smali/kotlin/a/w.smali
index 916b5ce236..e482115cc3 100644
--- a/com.discord/smali/kotlin/a/w.smali
+++ b/com.discord/smali/kotlin/a/w.smali
@@ -790,7 +790,7 @@
 
     if-gez v0, :cond_1
 
-    invoke-static {}, Lkotlin/a/m;->DY()V
+    invoke-static {}, Lkotlin/a/m;->DN()V
 
     :cond_1
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
@@ -916,7 +916,7 @@
 
     if-gtz v3, :cond_2
 
-    sget-object p0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p0, Ljava/util/List;
 
@@ -1258,7 +1258,7 @@
 
     if-nez p1, :cond_1
 
-    sget-object p0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p0, Ljava/util/List;
 
@@ -1873,7 +1873,7 @@
 
     move-result v1
 
-    invoke-static {v1}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v1}, Lkotlin/a/ad;->dj(I)I
 
     move-result v1
 
@@ -1964,7 +1964,7 @@
     return-object p0
 
     :cond_2
-    sget-object p0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p0, Ljava/util/List;
 
@@ -2070,7 +2070,7 @@
 
     move-result v0
 
-    invoke-static {v0}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v0}, Lkotlin/a/ad;->dj(I)I
 
     move-result v0
 
@@ -2118,7 +2118,7 @@
     return-object p0
 
     :cond_2
-    sget-object p0, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p0, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast p0, Ljava/util/Set;
 
@@ -2366,16 +2366,16 @@
 
     if-gez v2, :cond_0
 
-    invoke-static {}, Lkotlin/a/m;->DZ()V
+    invoke-static {}, Lkotlin/a/m;->DO()V
 
     goto :goto_0
 
     :cond_1
     if-nez v2, :cond_2
 
-    sget-object p0, Lkotlin/jvm/internal/g;->bkC:Lkotlin/jvm/internal/g;
+    sget-object p0, Lkotlin/jvm/internal/g;->bkW:Lkotlin/jvm/internal/g;
 
-    invoke-static {}, Lkotlin/jvm/internal/g;->Ek()D
+    invoke-static {}, Lkotlin/jvm/internal/g;->DZ()D
 
     move-result-wide v0
 
diff --git a/com.discord/smali/kotlin/c/c.smali b/com.discord/smali/kotlin/c/c.smali
index 928aa95346..d8dce1b12b 100644
--- a/com.discord/smali/kotlin/c/c.smali
+++ b/com.discord/smali/kotlin/c/c.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method private static final V(II)I
+.method private static final U(II)I
     .locals 0
 
     rem-int/2addr p0, p1
@@ -22,17 +22,17 @@
 .method public static final k(III)I
     .locals 0
 
-    invoke-static {p0, p2}, Lkotlin/c/c;->V(II)I
+    invoke-static {p0, p2}, Lkotlin/c/c;->U(II)I
 
     move-result p0
 
-    invoke-static {p1, p2}, Lkotlin/c/c;->V(II)I
+    invoke-static {p1, p2}, Lkotlin/c/c;->U(II)I
 
     move-result p1
 
     sub-int/2addr p0, p1
 
-    invoke-static {p0, p2}, Lkotlin/c/c;->V(II)I
+    invoke-static {p0, p2}, Lkotlin/c/c;->U(II)I
 
     move-result p0
 
diff --git a/com.discord/smali/kotlin/coroutines/jvm/internal/d.smali b/com.discord/smali/kotlin/coroutines/jvm/internal/d.smali
index 2fdd45f10a..26b00710c0 100644
--- a/com.discord/smali/kotlin/coroutines/jvm/internal/d.smali
+++ b/com.discord/smali/kotlin/coroutines/jvm/internal/d.smali
@@ -9,11 +9,11 @@
 # annotations
 .annotation system Ldalvik/annotation/AnnotationDefault;
     value = .subannotation Lkotlin/coroutines/jvm/internal/d;
-        Eb = 0x1
-        Ec = ""
-        Ed = {}
-        Ee = ""
-        Ef = ""
+        DQ = 0x1
+        DR = ""
+        DS = {}
+        DT = ""
+        DU = ""
     .end subannotation
 .end annotation
 
@@ -29,17 +29,17 @@
 
 
 # virtual methods
-.method public abstract Eb()I
+.method public abstract DQ()I
 .end method
 
-.method public abstract Ec()Ljava/lang/String;
+.method public abstract DR()Ljava/lang/String;
 .end method
 
-.method public abstract Ed()[I
+.method public abstract DS()[I
 .end method
 
-.method public abstract Ee()Ljava/lang/String;
+.method public abstract DT()Ljava/lang/String;
 .end method
 
-.method public abstract Ef()Ljava/lang/String;
+.method public abstract DU()Ljava/lang/String;
 .end method
diff --git a/com.discord/smali/kotlin/jvm/internal/c.smali b/com.discord/smali/kotlin/jvm/internal/c.smali
index 583a8249a8..ec5d17d3f3 100644
--- a/com.discord/smali/kotlin/jvm/internal/c.smali
+++ b/com.discord/smali/kotlin/jvm/internal/c.smali
@@ -29,7 +29,7 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lkotlin/jvm/internal/c$a;->Ei()Lkotlin/jvm/internal/c$a;
+    invoke-static {}, Lkotlin/jvm/internal/c$a;->DX()Lkotlin/jvm/internal/c$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali/kotlin/jvm/internal/k.smali b/com.discord/smali/kotlin/jvm/internal/k.smali
index 701731709a..fd736c993b 100644
--- a/com.discord/smali/kotlin/jvm/internal/k.smali
+++ b/com.discord/smali/kotlin/jvm/internal/k.smali
@@ -12,7 +12,7 @@
     return-void
 .end method
 
-.method public static Em()V
+.method public static Eb()V
     .locals 1
 
     new-instance v0, Lkotlin/e;
@@ -28,7 +28,7 @@
     throw v0
 .end method
 
-.method private static En()V
+.method private static Ec()V
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -40,18 +40,18 @@
     throw v0
 .end method
 
-.method public static Eo()V
+.method public static Ed()V
     .locals 0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->En()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ec()V
 
     return-void
 .end method
 
-.method public static Ep()V
+.method public static Ee()V
     .locals 0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->En()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Ec()V
 
     return-void
 .end method
@@ -136,7 +136,7 @@
     return p0
 .end method
 
-.method public static dT(Ljava/lang/String;)V
+.method public static dN(Ljava/lang/String;)V
     .locals 2
 
     new-instance v0, Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/kotlin/ranges/IntProgression.smali b/com.discord/smali/kotlin/ranges/IntProgression.smali
index 470d03e288..e51c5a406a 100644
--- a/com.discord/smali/kotlin/ranges/IntProgression.smali
+++ b/com.discord/smali/kotlin/ranges/IntProgression.smali
@@ -26,15 +26,15 @@
 
 
 # static fields
-.field public static final bkT:Lkotlin/ranges/IntProgression$a;
+.field public static final bln:Lkotlin/ranges/IntProgression$a;
 
 
 # instance fields
-.field public final bkQ:I
+.field public final blk:I
 
-.field public final bkR:I
+.field public final bll:I
 
-.field public final bkS:I
+.field public final blm:I
 
 
 # direct methods
@@ -47,7 +47,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/ranges/IntProgression$a;-><init>(B)V
 
-    sput-object v0, Lkotlin/ranges/IntProgression;->bkT:Lkotlin/ranges/IntProgression$a;
+    sput-object v0, Lkotlin/ranges/IntProgression;->bln:Lkotlin/ranges/IntProgression$a;
 
     return-void
 .end method
@@ -63,7 +63,7 @@
 
     if-eq p3, v0, :cond_4
 
-    iput p1, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iput p1, p0, Lkotlin/ranges/IntProgression;->blk:I
 
     if-lez p3, :cond_1
 
@@ -97,9 +97,9 @@
     add-int/2addr p2, p1
 
     :goto_0
-    iput p2, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iput p2, p0, Lkotlin/ranges/IntProgression;->bll:I
 
-    iput p3, p0, Lkotlin/ranges/IntProgression;->bkS:I
+    iput p3, p0, Lkotlin/ranges/IntProgression;->blm:I
 
     return-void
 
@@ -163,23 +163,23 @@
     if-nez v0, :cond_1
 
     :cond_0
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->blk:I
 
     check-cast p1, Lkotlin/ranges/IntProgression;
 
-    iget v1, p1, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v1, p1, Lkotlin/ranges/IntProgression;->blk:I
 
     if-ne v0, v1, :cond_2
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bll:I
 
-    iget v1, p1, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v1, p1, Lkotlin/ranges/IntProgression;->bll:I
 
     if-ne v0, v1, :cond_2
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkS:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->blm:I
 
-    iget p1, p1, Lkotlin/ranges/IntProgression;->bkS:I
+    iget p1, p1, Lkotlin/ranges/IntProgression;->blm:I
 
     if-ne v0, p1, :cond_2
 
@@ -208,17 +208,17 @@
     return v0
 
     :cond_0
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->blk:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bll:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bkS:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->blm:I
 
     add-int/2addr v0, v1
 
@@ -228,7 +228,7 @@
 .method public isEmpty()Z
     .locals 4
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkS:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->blm:I
 
     const/4 v1, 0x1
 
@@ -236,9 +236,9 @@
 
     if-lez v0, :cond_1
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget v3, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v3, p0, Lkotlin/ranges/IntProgression;->bll:I
 
     if-le v0, v3, :cond_0
 
@@ -248,9 +248,9 @@
     return v2
 
     :cond_1
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget v3, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v3, p0, Lkotlin/ranges/IntProgression;->bll:I
 
     if-ge v0, v3, :cond_2
 
@@ -265,11 +265,11 @@
 
     new-instance v0, Lkotlin/ranges/b;
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget v2, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->bll:I
 
-    iget v3, p0, Lkotlin/ranges/IntProgression;->bkS:I
+    iget v3, p0, Lkotlin/ranges/IntProgression;->blm:I
 
     invoke-direct {v0, v1, v2, v3}, Lkotlin/ranges/b;-><init>(III)V
 
@@ -283,7 +283,7 @@
 .method public toString()Ljava/lang/String;
     .locals 3
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkS:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->blm:I
 
     const-string v1, " step "
 
@@ -293,7 +293,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget v2, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->blk:I
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -301,13 +301,13 @@
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v2, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->bll:I
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bkS:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->blm:I
 
     :goto_0
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
@@ -323,7 +323,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget v2, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->blk:I
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -331,13 +331,13 @@
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v2, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->bll:I
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bkS:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->blm:I
 
     neg-int v1, v1
 
diff --git a/com.discord/smali/kotlin/ranges/IntRange.smali b/com.discord/smali/kotlin/ranges/IntRange.smali
index a240e0fbf4..c2a86c7ef8 100644
--- a/com.discord/smali/kotlin/ranges/IntRange.smali
+++ b/com.discord/smali/kotlin/ranges/IntRange.smali
@@ -24,9 +24,9 @@
 
 
 # static fields
-.field private static final bkW:Lkotlin/ranges/IntRange;
+.field private static final blq:Lkotlin/ranges/IntRange;
 
-.field public static final bkX:Lkotlin/ranges/IntRange$a;
+.field public static final blr:Lkotlin/ranges/IntRange$a;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/ranges/IntRange$a;-><init>(B)V
 
-    sput-object v0, Lkotlin/ranges/IntRange;->bkX:Lkotlin/ranges/IntRange$a;
+    sput-object v0, Lkotlin/ranges/IntRange;->blr:Lkotlin/ranges/IntRange$a;
 
     new-instance v0, Lkotlin/ranges/IntRange;
 
@@ -47,7 +47,7 @@
 
     invoke-direct {v0, v2, v1}, Lkotlin/ranges/IntRange;-><init>(II)V
 
-    sput-object v0, Lkotlin/ranges/IntRange;->bkW:Lkotlin/ranges/IntRange;
+    sput-object v0, Lkotlin/ranges/IntRange;->blq:Lkotlin/ranges/IntRange;
 
     return-void
 .end method
@@ -62,10 +62,10 @@
     return-void
 .end method
 
-.method public static final synthetic Et()Lkotlin/ranges/IntRange;
+.method public static final synthetic Ei()Lkotlin/ranges/IntRange;
     .locals 1
 
-    sget-object v0, Lkotlin/ranges/IntRange;->bkW:Lkotlin/ranges/IntRange;
+    sget-object v0, Lkotlin/ranges/IntRange;->blq:Lkotlin/ranges/IntRange;
 
     return-object v0
 .end method
@@ -75,11 +75,11 @@
 .method public final contains(I)Z
     .locals 1
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->blk:I
 
     if-gt v0, p1, :cond_0
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bll:I
 
     if-gt p1, v0, :cond_0
 
@@ -117,17 +117,17 @@
     if-nez v0, :cond_1
 
     :cond_0
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->blk:I
 
     check-cast p1, Lkotlin/ranges/IntRange;
 
-    iget v1, p1, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v1, p1, Lkotlin/ranges/IntProgression;->blk:I
 
     if-ne v0, v1, :cond_2
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bll:I
 
-    iget p1, p1, Lkotlin/ranges/IntProgression;->bkR:I
+    iget p1, p1, Lkotlin/ranges/IntProgression;->bll:I
 
     if-ne v0, p1, :cond_2
 
@@ -145,7 +145,7 @@
 .method public final synthetic getEndInclusive()Ljava/lang/Comparable;
     .locals 1
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bll:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -159,7 +159,7 @@
 .method public final synthetic getStart()Ljava/lang/Comparable;
     .locals 1
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->blk:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -184,11 +184,11 @@
     return v0
 
     :cond_0
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->blk:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bll:I
 
     add-int/2addr v0, v1
 
@@ -198,9 +198,9 @@
 .method public final isEmpty()Z
     .locals 2
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bll:I
 
     if-le v0, v1, :cond_0
 
@@ -221,7 +221,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->blk:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -229,7 +229,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bll:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/kotlin/ranges/b.smali b/com.discord/smali/kotlin/ranges/b.smali
index 686a5e1212..5f5620f951 100644
--- a/com.discord/smali/kotlin/ranges/b.smali
+++ b/com.discord/smali/kotlin/ranges/b.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final bkS:I
+.field private final blm:I
 
-.field private final bkU:I
+.field private final blo:I
 
-.field private bkV:I
+.field private blp:I
 
 .field private hasNext:Z
 
@@ -19,11 +19,11 @@
 
     invoke-direct {p0}, Lkotlin/a/ab;-><init>()V
 
-    iput p3, p0, Lkotlin/ranges/b;->bkS:I
+    iput p3, p0, Lkotlin/ranges/b;->blm:I
 
-    iput p2, p0, Lkotlin/ranges/b;->bkU:I
+    iput p2, p0, Lkotlin/ranges/b;->blo:I
 
-    iget p3, p0, Lkotlin/ranges/b;->bkS:I
+    iget p3, p0, Lkotlin/ranges/b;->blm:I
 
     const/4 v0, 0x1
 
@@ -53,10 +53,10 @@
     goto :goto_1
 
     :cond_2
-    iget p1, p0, Lkotlin/ranges/b;->bkU:I
+    iget p1, p0, Lkotlin/ranges/b;->blo:I
 
     :goto_1
-    iput p1, p0, Lkotlin/ranges/b;->bkV:I
+    iput p1, p0, Lkotlin/ranges/b;->blp:I
 
     return-void
 .end method
@@ -74,9 +74,9 @@
 .method public final nextInt()I
     .locals 2
 
-    iget v0, p0, Lkotlin/ranges/b;->bkV:I
+    iget v0, p0, Lkotlin/ranges/b;->blp:I
 
-    iget v1, p0, Lkotlin/ranges/b;->bkU:I
+    iget v1, p0, Lkotlin/ranges/b;->blo:I
 
     if-ne v0, v1, :cond_1
 
@@ -100,11 +100,11 @@
     throw v0
 
     :cond_1
-    iget v1, p0, Lkotlin/ranges/b;->bkS:I
+    iget v1, p0, Lkotlin/ranges/b;->blm:I
 
     add-int/2addr v1, v0
 
-    iput v1, p0, Lkotlin/ranges/b;->bkV:I
+    iput v1, p0, Lkotlin/ranges/b;->blp:I
 
     :goto_0
     return v0
diff --git a/com.discord/smali/kotlin/ranges/f.smali b/com.discord/smali/kotlin/ranges/f.smali
index 72032485c7..1bf9c64259 100644
--- a/com.discord/smali/kotlin/ranges/f.smali
+++ b/com.discord/smali/kotlin/ranges/f.smali
@@ -4,10 +4,10 @@
 
 
 # direct methods
-.method public static final X(II)Lkotlin/ranges/IntProgression;
+.method public static final W(II)Lkotlin/ranges/IntProgression;
     .locals 1
 
-    sget-object v0, Lkotlin/ranges/IntProgression;->bkT:Lkotlin/ranges/IntProgression$a;
+    sget-object v0, Lkotlin/ranges/IntProgression;->bln:Lkotlin/ranges/IntProgression$a;
 
     const/4 v0, -0x1
 
@@ -18,16 +18,16 @@
     return-object p0
 .end method
 
-.method public static final Y(II)Lkotlin/ranges/IntRange;
+.method public static final X(II)Lkotlin/ranges/IntRange;
     .locals 1
 
     const/high16 v0, -0x80000000
 
     if-gt p1, v0, :cond_0
 
-    sget-object p0, Lkotlin/ranges/IntRange;->bkX:Lkotlin/ranges/IntRange$a;
+    sget-object p0, Lkotlin/ranges/IntRange;->blr:Lkotlin/ranges/IntRange$a;
 
-    invoke-static {}, Lkotlin/ranges/IntRange;->Et()Lkotlin/ranges/IntRange;
+    invoke-static {}, Lkotlin/ranges/IntRange;->Ei()Lkotlin/ranges/IntRange;
 
     move-result-object p0
 
@@ -43,7 +43,7 @@
     return-object v0
 .end method
 
-.method public static final Z(II)I
+.method public static final Y(II)I
     .locals 0
 
     if-ge p0, p1, :cond_0
@@ -54,7 +54,7 @@
     return p0
 .end method
 
-.method public static final aa(II)I
+.method public static final Z(II)I
     .locals 0
 
     if-le p0, p1, :cond_0
diff --git a/com.discord/smali/kotlin/sequences/l.smali b/com.discord/smali/kotlin/sequences/l.smali
index 8e2c9b9425..b0629a169c 100644
--- a/com.discord/smali/kotlin/sequences/l.smali
+++ b/com.discord/smali/kotlin/sequences/l.smali
@@ -57,7 +57,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/sequences/l$a;->blw:Lkotlin/sequences/l$a;
+    sget-object v0, Lkotlin/sequences/l$a;->blQ:Lkotlin/sequences/l$a;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -103,7 +103,7 @@
     :cond_0
     new-instance v0, Lkotlin/sequences/g;
 
-    sget-object v1, Lkotlin/sequences/l$c;->bly:Lkotlin/sequences/l$c;
+    sget-object v1, Lkotlin/sequences/l$c;->blS:Lkotlin/sequences/l$c;
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -134,7 +134,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/sequences/l$b;->blx:Lkotlin/sequences/l$b;
+    sget-object v0, Lkotlin/sequences/l$b;->blR:Lkotlin/sequences/l$b;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -145,7 +145,7 @@
     return-object p0
 .end method
 
-.method public static final varargs r([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+.method public static final varargs q([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -175,14 +175,14 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    sget-object p0, Lkotlin/sequences/e;->blj:Lkotlin/sequences/e;
+    sget-object p0, Lkotlin/sequences/e;->blD:Lkotlin/sequences/e;
 
     check-cast p0, Lkotlin/sequences/Sequence;
 
     return-object p0
 
     :cond_1
-    invoke-static {p0}, Lkotlin/a/g;->j([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    invoke-static {p0}, Lkotlin/a/g;->i([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
 
     move-result-object p0
 
diff --git a/com.discord/smali/kotlin/sequences/n.smali b/com.discord/smali/kotlin/sequences/n.smali
index f96850dbf2..02551a50d7 100644
--- a/com.discord/smali/kotlin/sequences/n.smali
+++ b/com.discord/smali/kotlin/sequences/n.smali
@@ -335,7 +335,7 @@
 
     if-nez p1, :cond_1
 
-    sget-object p0, Lkotlin/sequences/e;->blj:Lkotlin/sequences/e;
+    sget-object p0, Lkotlin/sequences/e;->blD:Lkotlin/sequences/e;
 
     check-cast p0, Lkotlin/sequences/Sequence;
 
@@ -348,7 +348,7 @@
 
     check-cast p0, Lkotlin/sequences/d;
 
-    invoke-interface {p0, p1}, Lkotlin/sequences/d;->dq(I)Lkotlin/sequences/Sequence;
+    invoke-interface {p0, p1}, Lkotlin/sequences/d;->dn(I)Lkotlin/sequences/Sequence;
 
     move-result-object p0
 
@@ -462,7 +462,7 @@
 
     aput-object p1, v0, p0
 
-    invoke-static {v0}, Lkotlin/sequences/i;->r([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    invoke-static {v0}, Lkotlin/sequences/i;->q([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
 
     move-result-object p0
 
@@ -611,7 +611,7 @@
 
     check-cast p0, Lkotlin/sequences/d;
 
-    invoke-interface {p0, v1}, Lkotlin/sequences/d;->dp(I)Lkotlin/sequences/Sequence;
+    invoke-interface {p0, v1}, Lkotlin/sequences/d;->dm(I)Lkotlin/sequences/Sequence;
 
     move-result-object p0
 
@@ -680,7 +680,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/sequences/n$c;->blB:Lkotlin/sequences/n$c;
+    sget-object v0, Lkotlin/sequences/n$c;->blV:Lkotlin/sequences/n$c;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -882,7 +882,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/sequences/n$b;->blA:Lkotlin/sequences/n$b;
+    sget-object v0, Lkotlin/sequences/n$b;->blU:Lkotlin/sequences/n$b;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
diff --git a/com.discord/smali/kotlin/text/e.smali b/com.discord/smali/kotlin/text/e.smali
index 3a002fbc5e..ba6f8d41e9 100644
--- a/com.discord/smali/kotlin/text/e.smali
+++ b/com.discord/smali/kotlin/text/e.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field private final blI:Ljava/lang/CharSequence;
+.field private final bmc:Ljava/lang/CharSequence;
 
-.field private final blJ:Lkotlin/jvm/functions/Function2;
+.field private final bmd:Lkotlin/jvm/functions/Function2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function2<",
@@ -69,13 +69,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/text/e;->blI:Ljava/lang/CharSequence;
+    iput-object p1, p0, Lkotlin/text/e;->bmc:Ljava/lang/CharSequence;
 
     iput p2, p0, Lkotlin/text/e;->startIndex:I
 
     iput p3, p0, Lkotlin/text/e;->limit:I
 
-    iput-object p4, p0, Lkotlin/text/e;->blJ:Lkotlin/jvm/functions/Function2;
+    iput-object p4, p0, Lkotlin/text/e;->bmd:Lkotlin/jvm/functions/Function2;
 
     return-void
 .end method
@@ -91,7 +91,7 @@
 .method public static final synthetic b(Lkotlin/text/e;)Ljava/lang/CharSequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/text/e;->blI:Ljava/lang/CharSequence;
+    iget-object p0, p0, Lkotlin/text/e;->bmc:Ljava/lang/CharSequence;
 
     return-object p0
 .end method
@@ -99,7 +99,7 @@
 .method public static final synthetic c(Lkotlin/text/e;)Lkotlin/jvm/functions/Function2;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/text/e;->blJ:Lkotlin/jvm/functions/Function2;
+    iget-object p0, p0, Lkotlin/text/e;->bmd:Lkotlin/jvm/functions/Function2;
 
     return-object p0
 .end method
diff --git a/com.discord/smali/kotlin/text/s.smali b/com.discord/smali/kotlin/text/s.smali
index cdd3f1ff3c..fdf627cf4d 100644
--- a/com.discord/smali/kotlin/text/s.smali
+++ b/com.discord/smali/kotlin/text/s.smali
@@ -12,21 +12,21 @@
     return-void
 .end method
 
-.method public static final dU(Ljava/lang/String;)Ljava/lang/Integer;
+.method public static final dO(Ljava/lang/String;)Ljava/lang/Integer;
     .locals 1
 
     const-string v0, "$this$toIntOrNull"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p0}, Lkotlin/text/l;->dV(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {p0}, Lkotlin/text/l;->dP(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static final dV(Ljava/lang/String;)Ljava/lang/Integer;
+.method public static final dP(Ljava/lang/String;)Ljava/lang/Integer;
     .locals 8
 
     const-string v0, "$this$toIntOrNull"
@@ -157,21 +157,21 @@
     return-object p0
 .end method
 
-.method public static final dW(Ljava/lang/String;)Ljava/lang/Long;
+.method public static final dQ(Ljava/lang/String;)Ljava/lang/Long;
     .locals 1
 
     const-string v0, "$this$toLongOrNull"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p0}, Lkotlin/text/l;->dX(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p0}, Lkotlin/text/l;->dR(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static final dX(Ljava/lang/String;)Ljava/lang/Long;
+.method public static final dR(Ljava/lang/String;)Ljava/lang/Long;
     .locals 14
 
     const-string v0, "$this$toLongOrNull"
diff --git a/com.discord/smali/kotlin/text/u$b.smali b/com.discord/smali/kotlin/text/u$b.smali
index d224ffaac3..5939859615 100644
--- a/com.discord/smali/kotlin/text/u$b.smali
+++ b/com.discord/smali/kotlin/text/u$b.smali
@@ -207,7 +207,7 @@
     throw p1
 
     :cond_5
-    invoke-static {p2, v1}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {p2, v1}, Lkotlin/ranges/c;->Y(II)I
 
     move-result p2
 
@@ -225,11 +225,11 @@
 
     if-eqz p2, :cond_a
 
-    iget p2, v1, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget p2, v1, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget v9, v1, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v9, v1, Lkotlin/ranges/IntProgression;->bll:I
 
-    iget v10, v1, Lkotlin/ranges/IntProgression;->bkS:I
+    iget v10, v1, Lkotlin/ranges/IntProgression;->blm:I
 
     if-ltz v10, :cond_6
 
@@ -312,11 +312,11 @@
     goto :goto_1
 
     :cond_a
-    iget p2, v1, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget p2, v1, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget v2, v1, Lkotlin/ranges/IntProgression;->bkR:I
+    iget v2, v1, Lkotlin/ranges/IntProgression;->bll:I
 
-    iget v1, v1, Lkotlin/ranges/IntProgression;->bkS:I
+    iget v1, v1, Lkotlin/ranges/IntProgression;->blm:I
 
     if-ltz v1, :cond_b
 
diff --git a/com.discord/smali/kotlin/text/u.smali b/com.discord/smali/kotlin/text/u.smali
index 45c82f79ce..97cc4bf8ac 100644
--- a/com.discord/smali/kotlin/text/u.smali
+++ b/com.discord/smali/kotlin/text/u.smali
@@ -102,7 +102,7 @@
 
     if-nez p5, :cond_0
 
-    invoke-static {p2, v0}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {p2, v0}, Lkotlin/ranges/c;->Y(II)I
 
     move-result p2
 
@@ -112,7 +112,7 @@
 
     move-result v0
 
-    invoke-static {p3, v0}, Lkotlin/ranges/c;->aa(II)I
+    invoke-static {p3, v0}, Lkotlin/ranges/c;->Z(II)I
 
     move-result p3
 
@@ -127,15 +127,15 @@
 
     move-result p5
 
-    invoke-static {p2, p5}, Lkotlin/ranges/c;->aa(II)I
+    invoke-static {p2, p5}, Lkotlin/ranges/c;->Z(II)I
 
     move-result p2
 
-    invoke-static {p3, v0}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {p3, v0}, Lkotlin/ranges/c;->Y(II)I
 
     move-result p3
 
-    invoke-static {p2, p3}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntProgression;
+    invoke-static {p2, p3}, Lkotlin/ranges/c;->W(II)Lkotlin/ranges/IntProgression;
 
     move-result-object p5
 
@@ -148,11 +148,11 @@
 
     if-eqz p2, :cond_3
 
-    iget p2, p5, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget p2, p5, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget p3, p5, Lkotlin/ranges/IntProgression;->bkR:I
+    iget p3, p5, Lkotlin/ranges/IntProgression;->bll:I
 
-    iget p5, p5, Lkotlin/ranges/IntProgression;->bkS:I
+    iget p5, p5, Lkotlin/ranges/IntProgression;->blm:I
 
     if-ltz p5, :cond_1
 
@@ -198,11 +198,11 @@
     goto :goto_1
 
     :cond_3
-    iget p2, p5, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget p2, p5, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget p3, p5, Lkotlin/ranges/IntProgression;->bkR:I
+    iget p3, p5, Lkotlin/ranges/IntProgression;->bll:I
 
-    iget p5, p5, Lkotlin/ranges/IntProgression;->bkS:I
+    iget p5, p5, Lkotlin/ranges/IntProgression;->blm:I
 
     if-ltz p5, :cond_4
 
@@ -346,7 +346,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    invoke-static {p2, v1}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {p2, v1}, Lkotlin/ranges/c;->Y(II)I
 
     move-result p2
 
@@ -417,9 +417,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget v0, p1, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v0, p1, Lkotlin/ranges/IntProgression;->blk:I
 
-    iget p1, p1, Lkotlin/ranges/IntProgression;->bkR:I
+    iget p1, p1, Lkotlin/ranges/IntProgression;->bll:I
 
     add-int/lit8 p1, p1, 0x1
 
@@ -544,7 +544,7 @@
 
     if-eqz v4, :cond_3
 
-    invoke-static {p3, v6}, Lkotlin/ranges/c;->aa(II)I
+    invoke-static {p3, v6}, Lkotlin/ranges/c;->Z(II)I
 
     move-result v6
 
@@ -1157,7 +1157,7 @@
 
     move-result p1
 
-    invoke-static {p2, p1}, Lkotlin/ranges/c;->aa(II)I
+    invoke-static {p2, p1}, Lkotlin/ranges/c;->Z(II)I
 
     move-result p1
 
diff --git a/com.discord/smali/kotlin/text/w$a.smali b/com.discord/smali/kotlin/text/w$a.smali
index 7a97dd84f2..ba0b0ddab5 100644
--- a/com.discord/smali/kotlin/text/w$a.smali
+++ b/com.discord/smali/kotlin/text/w$a.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final bmd:Lkotlin/text/w$a;
+.field public static final bmx:Lkotlin/text/w$a;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lkotlin/text/w$a;-><init>()V
 
-    sput-object v0, Lkotlin/text/w$a;->bmd:Lkotlin/text/w$a;
+    sput-object v0, Lkotlin/text/w$a;->bmx:Lkotlin/text/w$a;
 
     return-void
 .end method
diff --git a/com.discord/smali/kotlin/text/w.smali b/com.discord/smali/kotlin/text/w.smali
index 641acfbedd..02e07b89f1 100644
--- a/com.discord/smali/kotlin/text/w.smali
+++ b/com.discord/smali/kotlin/text/w.smali
@@ -29,7 +29,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/text/w$a;->bmd:Lkotlin/text/w$a;
+    sget-object v0, Lkotlin/text/w$a;->bmx:Lkotlin/text/w$a;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -68,7 +68,7 @@
 
     invoke-static {p4, p3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1, p2}, Lkotlin/a/ao;->U(II)V
+    invoke-static {p1, p2}, Lkotlin/a/ao;->T(II)V
 
     invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
 
@@ -165,7 +165,7 @@
 
     move-result v1
 
-    invoke-static {p1, v1}, Lkotlin/ranges/c;->aa(II)I
+    invoke-static {p1, v1}, Lkotlin/ranges/c;->Z(II)I
 
     move-result p1
 
diff --git a/com.discord/smali/okhttp3/Headers.smali b/com.discord/smali/okhttp3/Headers.smali
index 3442a02a5c..6dca3f4f40 100644
--- a/com.discord/smali/okhttp3/Headers.smali
+++ b/com.discord/smali/okhttp3/Headers.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field public final btF:[Ljava/lang/String;
+.field public final btZ:[Ljava/lang/String;
 
 
 # direct methods
@@ -21,9 +21,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/Headers$a;->btG:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/Headers$a;->bua:Ljava/util/List;
 
-    iget-object p1, p1, Lokhttp3/Headers$a;->btG:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/Headers$a;->bua:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -37,7 +37,7 @@
 
     check-cast p1, [Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     return-void
 .end method
@@ -47,7 +47,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     return-void
 .end method
@@ -196,7 +196,7 @@
     return-object p0
 .end method
 
-.method static ee(Ljava/lang/String;)V
+.method static dY(Ljava/lang/String;)V
     .locals 5
 
     if-eqz p0, :cond_3
@@ -358,7 +358,7 @@
 
     aget-object v2, p0, v2
 
-    invoke-static {v1}, Lokhttp3/Headers;->ee(Ljava/lang/String;)V
+    invoke-static {v1}, Lokhttp3/Headers;->dY(Ljava/lang/String;)V
 
     invoke-static {v2, v1}, Lokhttp3/Headers;->aj(Ljava/lang/String;Ljava/lang/String;)V
 
@@ -391,43 +391,43 @@
 
 
 # virtual methods
-.method public final Gz()Lokhttp3/Headers$a;
+.method public final Go()Lokhttp3/Headers$a;
     .locals 3
 
     new-instance v0, Lokhttp3/Headers$a;
 
     invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
 
-    iget-object v1, v0, Lokhttp3/Headers$a;->btG:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/Headers$a;->bua:Ljava/util/List;
 
-    iget-object v2, p0, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     invoke-static {v1, v2}, Ljava/util/Collections;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
 
     return-object v0
 .end method
 
-.method public final dA(I)Ljava/lang/String;
+.method public final dw(I)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     mul-int/lit8 p1, p1, 0x2
 
-    add-int/lit8 p1, p1, 0x1
-
     aget-object p1, v0, p1
 
     return-object p1
 .end method
 
-.method public final dz(I)Ljava/lang/String;
+.method public final dx(I)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     mul-int/lit8 p1, p1, 0x2
 
+    add-int/lit8 p1, p1, 0x1
+
     aget-object p1, v0, p1
 
     return-object p1
@@ -446,9 +446,9 @@
 
     check-cast p1, Lokhttp3/Headers;
 
-    iget-object p1, p1, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     invoke-static {p1, v0}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
 
@@ -471,7 +471,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     invoke-static {v0, p1}, Lokhttp3/Headers;->b([Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -483,7 +483,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     invoke-static {v0}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
 
@@ -499,7 +499,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     array-length v1, v1
 
@@ -510,7 +510,7 @@
     :goto_0
     if-ge v2, v1, :cond_0
 
-    invoke-virtual {p0, v2}, Lokhttp3/Headers;->dz(I)Ljava/lang/String;
+    invoke-virtual {p0, v2}, Lokhttp3/Headers;->dw(I)Ljava/lang/String;
 
     move-result-object v3
 
@@ -520,7 +520,7 @@
 
     invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p0, v2}, Lokhttp3/Headers;->dA(I)Ljava/lang/String;
+    invoke-virtual {p0, v2}, Lokhttp3/Headers;->dx(I)Ljava/lang/String;
 
     move-result-object v3
 
diff --git a/com.discord/smali/okhttp3/Interceptor$Chain.smali b/com.discord/smali/okhttp3/Interceptor$Chain.smali
index 9966e631f1..feb5825722 100644
--- a/com.discord/smali/okhttp3/Interceptor$Chain.smali
+++ b/com.discord/smali/okhttp3/Interceptor$Chain.smali
@@ -15,21 +15,21 @@
 
 
 # virtual methods
-.method public abstract GL()Lokhttp3/w;
+.method public abstract GA()Lokhttp3/w;
 .end method
 
-.method public abstract GM()Lokhttp3/i;
+.method public abstract GB()Lokhttp3/i;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end method
 
-.method public abstract GN()I
+.method public abstract GC()I
 .end method
 
-.method public abstract GO()I
+.method public abstract GD()I
 .end method
 
-.method public abstract GP()I
+.method public abstract GE()I
 .end method
 
 .method public abstract b(Lokhttp3/w;)Lokhttp3/Response;
diff --git a/com.discord/smali/okhttp3/MediaType.smali b/com.discord/smali/okhttp3/MediaType.smali
index c559ef5387..bd140365e1 100644
--- a/com.discord/smali/okhttp3/MediaType.smali
+++ b/com.discord/smali/okhttp3/MediaType.smali
@@ -4,17 +4,17 @@
 
 
 # static fields
-.field private static final btR:Ljava/util/regex/Pattern;
+.field private static final bul:Ljava/util/regex/Pattern;
 
-.field private static final btS:Ljava/util/regex/Pattern;
+.field private static final bum:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final btT:Ljava/lang/String;
+.field private final bun:Ljava/lang/String;
 
-.field public final btU:Ljava/lang/String;
+.field public final buo:Ljava/lang/String;
 
-.field private final btV:Ljava/lang/String;
+.field private final bup:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -32,7 +32,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MediaType;->btR:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/MediaType;->bul:Ljava/util/regex/Pattern;
 
     const-string v0, ";\\s*(?:([a-zA-Z0-9-!#$%&\'*+.^_`{|}~]+)=(?:([a-zA-Z0-9-!#$%&\'*+.^_`{|}~]+)|\"([^\"]*)\"))?"
 
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MediaType;->btS:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/MediaType;->bum:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -54,21 +54,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/MediaType;->btT:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/MediaType;->bun:Ljava/lang/String;
 
     iput-object p2, p0, Lokhttp3/MediaType;->type:Ljava/lang/String;
 
-    iput-object p3, p0, Lokhttp3/MediaType;->btU:Ljava/lang/String;
+    iput-object p3, p0, Lokhttp3/MediaType;->buo:Ljava/lang/String;
 
-    iput-object p4, p0, Lokhttp3/MediaType;->btV:Ljava/lang/String;
+    iput-object p4, p0, Lokhttp3/MediaType;->bup:Ljava/lang/String;
 
     return-void
 .end method
 
-.method public static en(Ljava/lang/String;)Lokhttp3/MediaType;
+.method public static eh(Ljava/lang/String;)Lokhttp3/MediaType;
     .locals 11
 
-    sget-object v0, Lokhttp3/MediaType;->btR:Ljava/util/regex/Pattern;
+    sget-object v0, Lokhttp3/MediaType;->bul:Ljava/util/regex/Pattern;
 
     invoke-virtual {v0, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -108,7 +108,7 @@
 
     const/4 v6, 0x0
 
-    sget-object v7, Lokhttp3/MediaType;->btS:Ljava/util/regex/Pattern;
+    sget-object v7, Lokhttp3/MediaType;->bum:Ljava/util/regex/Pattern;
 
     invoke-virtual {v7, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -316,13 +316,13 @@
     goto :goto_3
 .end method
 
-.method public static eo(Ljava/lang/String;)Lokhttp3/MediaType;
+.method public static ei(Ljava/lang/String;)Lokhttp3/MediaType;
     .locals 0
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
     :try_start_0
-    invoke-static {p0}, Lokhttp3/MediaType;->en(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {p0}, Lokhttp3/MediaType;->eh(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object p0
     :try_end_0
@@ -348,11 +348,11 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/MediaType;->btV:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->bup:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/MediaType;->btV:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->bup:Ljava/lang/String;
 
     invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
 
@@ -378,9 +378,9 @@
 
     check-cast p1, Lokhttp3/MediaType;
 
-    iget-object p1, p1, Lokhttp3/MediaType;->btT:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/MediaType;->bun:Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/MediaType;->btT:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->bun:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -401,7 +401,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/MediaType;->btT:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->bun:Ljava/lang/String;
 
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
@@ -413,7 +413,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/MediaType;->btT:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->bun:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/okhttp3/MultipartBody$Part.smali b/com.discord/smali/okhttp3/MultipartBody$Part.smali
index 22b92ca0fe..29416adb8a 100644
--- a/com.discord/smali/okhttp3/MultipartBody$Part.smali
+++ b/com.discord/smali/okhttp3/MultipartBody$Part.smali
@@ -15,12 +15,12 @@
 
 
 # instance fields
-.field final buj:Lokhttp3/Headers;
+.field final buD:Lokhttp3/Headers;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final buk:Lokhttp3/RequestBody;
+.field final buE:Lokhttp3/RequestBody;
 
 
 # direct methods
@@ -33,9 +33,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/MultipartBody$Part;->buj:Lokhttp3/Headers;
+    iput-object p1, p0, Lokhttp3/MultipartBody$Part;->buD:Lokhttp3/Headers;
 
-    iput-object p2, p0, Lokhttp3/MultipartBody$Part;->buk:Lokhttp3/RequestBody;
+    iput-object p2, p0, Lokhttp3/MultipartBody$Part;->buE:Lokhttp3/RequestBody;
 
     return-void
 .end method
diff --git a/com.discord/smali/okhttp3/MultipartBody$a.smali b/com.discord/smali/okhttp3/MultipartBody$a.smali
index 92a5c67a60..3f5b083503 100644
--- a/com.discord/smali/okhttp3/MultipartBody$a.smali
+++ b/com.discord/smali/okhttp3/MultipartBody$a.smali
@@ -15,9 +15,7 @@
 
 
 # instance fields
-.field public final bue:Lokio/ByteString;
-
-.field public final buh:Ljava/util/List;
+.field public final buB:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -27,7 +25,9 @@
     .end annotation
 .end field
 
-.field public bui:Lokhttp3/MediaType;
+.field public buC:Lokhttp3/MediaType;
+
+.field public final buy:Lokio/ByteString;
 
 
 # direct methods
@@ -52,21 +52,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lokhttp3/MultipartBody;->btW:Lokhttp3/MediaType;
+    sget-object v0, Lokhttp3/MultipartBody;->buq:Lokhttp3/MediaType;
 
-    iput-object v0, p0, Lokhttp3/MultipartBody$a;->bui:Lokhttp3/MediaType;
+    iput-object v0, p0, Lokhttp3/MultipartBody$a;->buC:Lokhttp3/MediaType;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/MultipartBody$a;->buh:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/MultipartBody$a;->buB:Ljava/util/List;
 
-    invoke-static {p1}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {p1}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/MultipartBody$a;->bue:Lokio/ByteString;
+    iput-object p1, p0, Lokhttp3/MultipartBody$a;->buy:Lokio/ByteString;
 
     return-void
 .end method
@@ -96,7 +96,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/MultipartBody$a;->buh:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/MultipartBody$a;->buB:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/okhttp3/MultipartBody.smali b/com.discord/smali/okhttp3/MultipartBody.smali
index 5e7021964c..bf9ebf8c5b 100644
--- a/com.discord/smali/okhttp3/MultipartBody.smali
+++ b/com.discord/smali/okhttp3/MultipartBody.smali
@@ -13,31 +13,27 @@
 
 
 # static fields
-.field public static final btW:Lokhttp3/MediaType;
+.field public static final buq:Lokhttp3/MediaType;
 
-.field public static final btX:Lokhttp3/MediaType;
+.field public static final bur:Lokhttp3/MediaType;
 
-.field public static final btY:Lokhttp3/MediaType;
+.field public static final bus:Lokhttp3/MediaType;
 
-.field public static final btZ:Lokhttp3/MediaType;
+.field public static final but:Lokhttp3/MediaType;
 
-.field public static final bua:Lokhttp3/MediaType;
+.field public static final buu:Lokhttp3/MediaType;
 
-.field private static final bub:[B
+.field private static final buv:[B
 
-.field private static final buc:[B
+.field private static final buw:[B
 
-.field private static final bud:[B
+.field private static final bux:[B
 
 
 # instance fields
-.field private final bue:Lokio/ByteString;
+.field private final buA:Lokhttp3/MediaType;
 
-.field private final buf:Lokhttp3/MediaType;
-
-.field private final bug:Lokhttp3/MediaType;
-
-.field private final buh:Ljava/util/List;
+.field private final buB:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -47,6 +43,10 @@
     .end annotation
 .end field
 
+.field private final buy:Lokio/ByteString;
+
+.field private final buz:Lokhttp3/MediaType;
+
 .field private contentLength:J
 
 
@@ -56,43 +56,43 @@
 
     const-string v0, "multipart/mixed"
 
-    invoke-static {v0}, Lokhttp3/MediaType;->en(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {v0}, Lokhttp3/MediaType;->eh(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->btW:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->buq:Lokhttp3/MediaType;
 
     const-string v0, "multipart/alternative"
 
-    invoke-static {v0}, Lokhttp3/MediaType;->en(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {v0}, Lokhttp3/MediaType;->eh(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->btX:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->bur:Lokhttp3/MediaType;
 
     const-string v0, "multipart/digest"
 
-    invoke-static {v0}, Lokhttp3/MediaType;->en(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {v0}, Lokhttp3/MediaType;->eh(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->btY:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->bus:Lokhttp3/MediaType;
 
     const-string v0, "multipart/parallel"
 
-    invoke-static {v0}, Lokhttp3/MediaType;->en(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {v0}, Lokhttp3/MediaType;->eh(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->btZ:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->but:Lokhttp3/MediaType;
 
     const-string v0, "multipart/form-data"
 
-    invoke-static {v0}, Lokhttp3/MediaType;->en(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {v0}, Lokhttp3/MediaType;->eh(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->bua:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->buu:Lokhttp3/MediaType;
 
     const/4 v0, 0x2
 
@@ -100,19 +100,19 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lokhttp3/MultipartBody;->bub:[B
+    sput-object v1, Lokhttp3/MultipartBody;->buv:[B
 
     new-array v1, v0, [B
 
     fill-array-data v1, :array_1
 
-    sput-object v1, Lokhttp3/MultipartBody;->buc:[B
+    sput-object v1, Lokhttp3/MultipartBody;->buw:[B
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_2
 
-    sput-object v0, Lokhttp3/MultipartBody;->bud:[B
+    sput-object v0, Lokhttp3/MultipartBody;->bux:[B
 
     return-void
 
@@ -160,9 +160,9 @@
 
     iput-wide v0, p0, Lokhttp3/MultipartBody;->contentLength:J
 
-    iput-object p1, p0, Lokhttp3/MultipartBody;->bue:Lokio/ByteString;
+    iput-object p1, p0, Lokhttp3/MultipartBody;->buy:Lokio/ByteString;
 
-    iput-object p2, p0, Lokhttp3/MultipartBody;->buf:Lokhttp3/MediaType;
+    iput-object p2, p0, Lokhttp3/MultipartBody;->buz:Lokhttp3/MediaType;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -174,7 +174,7 @@
 
     invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p1}, Lokio/ByteString;->IF()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Is()Ljava/lang/String;
 
     move-result-object p1
 
@@ -184,17 +184,17 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lokhttp3/MediaType;->en(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {p1}, Lokhttp3/MediaType;->eh(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/MultipartBody;->bug:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/MultipartBody;->buA:Lokhttp3/MediaType;
 
     invoke-static {p3}, Lokhttp3/internal/c;->af(Ljava/util/List;)Ljava/util/List;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/MultipartBody;->buh:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/MultipartBody;->buB:Ljava/util/List;
 
     return-void
 .end method
@@ -225,7 +225,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/MultipartBody;->buh:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/MultipartBody;->buB:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -242,7 +242,7 @@
     :goto_1
     if-ge v3, v1, :cond_6
 
-    iget-object v6, p0, Lokhttp3/MultipartBody;->buh:Ljava/util/List;
+    iget-object v6, p0, Lokhttp3/MultipartBody;->buB:Ljava/util/List;
 
     invoke-interface {v6, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -250,25 +250,25 @@
 
     check-cast v6, Lokhttp3/MultipartBody$Part;
 
-    iget-object v7, v6, Lokhttp3/MultipartBody$Part;->buj:Lokhttp3/Headers;
+    iget-object v7, v6, Lokhttp3/MultipartBody$Part;->buD:Lokhttp3/Headers;
 
-    iget-object v6, v6, Lokhttp3/MultipartBody$Part;->buk:Lokhttp3/RequestBody;
+    iget-object v6, v6, Lokhttp3/MultipartBody$Part;->buE:Lokhttp3/RequestBody;
 
-    sget-object v8, Lokhttp3/MultipartBody;->bud:[B
+    sget-object v8, Lokhttp3/MultipartBody;->bux:[B
 
     invoke-interface {p1, v8}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
-    iget-object v8, p0, Lokhttp3/MultipartBody;->bue:Lokio/ByteString;
+    iget-object v8, p0, Lokhttp3/MultipartBody;->buy:Lokio/ByteString;
 
     invoke-interface {p1, v8}, Lokio/BufferedSink;->m(Lokio/ByteString;)Lokio/BufferedSink;
 
-    sget-object v8, Lokhttp3/MultipartBody;->buc:[B
+    sget-object v8, Lokhttp3/MultipartBody;->buw:[B
 
     invoke-interface {p1, v8}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
     if-eqz v7, :cond_1
 
-    iget-object v8, v7, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v8, v7, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     array-length v8, v8
 
@@ -279,29 +279,29 @@
     :goto_2
     if-ge v9, v8, :cond_1
 
-    invoke-virtual {v7, v9}, Lokhttp3/Headers;->dz(I)Ljava/lang/String;
+    invoke-virtual {v7, v9}, Lokhttp3/Headers;->dw(I)Ljava/lang/String;
 
     move-result-object v10
 
-    invoke-interface {p1, v10}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {p1, v10}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     move-result-object v10
 
-    sget-object v11, Lokhttp3/MultipartBody;->bub:[B
+    sget-object v11, Lokhttp3/MultipartBody;->buv:[B
 
     invoke-interface {v10, v11}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
     move-result-object v10
 
-    invoke-virtual {v7, v9}, Lokhttp3/Headers;->dA(I)Ljava/lang/String;
+    invoke-virtual {v7, v9}, Lokhttp3/Headers;->dx(I)Ljava/lang/String;
 
     move-result-object v11
 
-    invoke-interface {v10, v11}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {v10, v11}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     move-result-object v10
 
-    sget-object v11, Lokhttp3/MultipartBody;->buc:[B
+    sget-object v11, Lokhttp3/MultipartBody;->buw:[B
 
     invoke-interface {v10, v11}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -318,7 +318,7 @@
 
     const-string v8, "Content-Type: "
 
-    invoke-interface {p1, v8}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {p1, v8}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     move-result-object v8
 
@@ -326,11 +326,11 @@
 
     move-result-object v7
 
-    invoke-interface {v8, v7}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {v8, v7}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     move-result-object v7
 
-    sget-object v8, Lokhttp3/MultipartBody;->buc:[B
+    sget-object v8, Lokhttp3/MultipartBody;->buw:[B
 
     invoke-interface {v7, v8}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -347,7 +347,7 @@
 
     const-string v9, "Content-Length: "
 
-    invoke-interface {p1, v9}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {p1, v9}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     move-result-object v9
 
@@ -355,7 +355,7 @@
 
     move-result-object v9
 
-    sget-object v10, Lokhttp3/MultipartBody;->buc:[B
+    sget-object v10, Lokhttp3/MultipartBody;->buw:[B
 
     invoke-interface {v9, v10}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -370,7 +370,7 @@
 
     :cond_4
     :goto_3
-    sget-object v9, Lokhttp3/MultipartBody;->buc:[B
+    sget-object v9, Lokhttp3/MultipartBody;->buw:[B
 
     invoke-interface {p1, v9}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -384,7 +384,7 @@
     invoke-virtual {v6, p1}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
 
     :goto_4
-    sget-object v6, Lokhttp3/MultipartBody;->buc:[B
+    sget-object v6, Lokhttp3/MultipartBody;->buw:[B
 
     invoke-interface {p1, v6}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -393,19 +393,19 @@
     goto/16 :goto_1
 
     :cond_6
-    sget-object v1, Lokhttp3/MultipartBody;->bud:[B
+    sget-object v1, Lokhttp3/MultipartBody;->bux:[B
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
-    iget-object v1, p0, Lokhttp3/MultipartBody;->bue:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/MultipartBody;->buy:Lokio/ByteString;
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->m(Lokio/ByteString;)Lokio/BufferedSink;
 
-    sget-object v1, Lokhttp3/MultipartBody;->bud:[B
+    sget-object v1, Lokhttp3/MultipartBody;->bux:[B
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
-    sget-object v1, Lokhttp3/MultipartBody;->buc:[B
+    sget-object v1, Lokhttp3/MultipartBody;->buw:[B
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -522,7 +522,7 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/MultipartBody;->bug:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/MultipartBody;->buA:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/okhttp3/RequestBody$1.smali b/com.discord/smali/okhttp3/RequestBody$1.smali
index bf15aea516..011e4ff6af 100644
--- a/com.discord/smali/okhttp3/RequestBody$1.smali
+++ b/com.discord/smali/okhttp3/RequestBody$1.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic buV:Lokhttp3/MediaType;
+.field final synthetic bvp:Lokhttp3/MediaType;
 
-.field final synthetic buW:Lokio/ByteString;
+.field final synthetic bvq:Lokio/ByteString;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;Lokio/ByteString;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/RequestBody$1;->buV:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/RequestBody$1;->bvp:Lokhttp3/MediaType;
 
-    iput-object p2, p0, Lokhttp3/RequestBody$1;->buW:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/RequestBody$1;->bvq:Lokio/ByteString;
 
     invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
 
@@ -43,7 +43,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$1;->buW:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/RequestBody$1;->bvq:Lokio/ByteString;
 
     invoke-virtual {v0}, Lokio/ByteString;->size()I
 
@@ -59,7 +59,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$1;->buV:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/RequestBody$1;->bvp:Lokhttp3/MediaType;
 
     return-object v0
 .end method
@@ -72,7 +72,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$1;->buW:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/RequestBody$1;->bvq:Lokio/ByteString;
 
     invoke-interface {p1, v0}, Lokio/BufferedSink;->m(Lokio/ByteString;)Lokio/BufferedSink;
 
diff --git a/com.discord/smali/okhttp3/RequestBody$2.smali b/com.discord/smali/okhttp3/RequestBody$2.smali
index 18c3b5ef95..c32db49214 100644
--- a/com.discord/smali/okhttp3/RequestBody$2.smali
+++ b/com.discord/smali/okhttp3/RequestBody$2.smali
@@ -15,26 +15,26 @@
 
 
 # instance fields
-.field final synthetic buV:Lokhttp3/MediaType;
+.field final synthetic bvp:Lokhttp3/MediaType;
 
-.field final synthetic buX:I
+.field final synthetic bvr:I
 
-.field final synthetic buY:[B
+.field final synthetic bvs:[B
 
-.field final synthetic buZ:I
+.field final synthetic bvt:I
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;I[BI)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/RequestBody$2;->buV:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/RequestBody$2;->bvp:Lokhttp3/MediaType;
 
-    iput p2, p0, Lokhttp3/RequestBody$2;->buX:I
+    iput p2, p0, Lokhttp3/RequestBody$2;->bvr:I
 
-    iput-object p3, p0, Lokhttp3/RequestBody$2;->buY:[B
+    iput-object p3, p0, Lokhttp3/RequestBody$2;->bvs:[B
 
-    iput p4, p0, Lokhttp3/RequestBody$2;->buZ:I
+    iput p4, p0, Lokhttp3/RequestBody$2;->bvt:I
 
     invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
 
@@ -46,7 +46,7 @@
 .method public final contentLength()J
     .locals 2
 
-    iget v0, p0, Lokhttp3/RequestBody$2;->buX:I
+    iget v0, p0, Lokhttp3/RequestBody$2;->bvr:I
 
     int-to-long v0, v0
 
@@ -58,7 +58,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$2;->buV:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/RequestBody$2;->bvp:Lokhttp3/MediaType;
 
     return-object v0
 .end method
@@ -71,11 +71,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$2;->buY:[B
+    iget-object v0, p0, Lokhttp3/RequestBody$2;->bvs:[B
 
-    iget v1, p0, Lokhttp3/RequestBody$2;->buZ:I
+    iget v1, p0, Lokhttp3/RequestBody$2;->bvt:I
 
-    iget v2, p0, Lokhttp3/RequestBody$2;->buX:I
+    iget v2, p0, Lokhttp3/RequestBody$2;->bvr:I
 
     invoke-interface {p1, v0, v1, v2}, Lokio/BufferedSink;->n([BII)Lokio/BufferedSink;
 
diff --git a/com.discord/smali/okhttp3/RequestBody$3.smali b/com.discord/smali/okhttp3/RequestBody$3.smali
index da224c4a81..dc94965fdd 100644
--- a/com.discord/smali/okhttp3/RequestBody$3.smali
+++ b/com.discord/smali/okhttp3/RequestBody$3.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic buV:Lokhttp3/MediaType;
+.field final synthetic bvp:Lokhttp3/MediaType;
 
-.field final synthetic bva:Ljava/io/File;
+.field final synthetic bvu:Ljava/io/File;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;Ljava/io/File;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/RequestBody$3;->buV:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/RequestBody$3;->bvp:Lokhttp3/MediaType;
 
-    iput-object p2, p0, Lokhttp3/RequestBody$3;->bva:Ljava/io/File;
+    iput-object p2, p0, Lokhttp3/RequestBody$3;->bvu:Ljava/io/File;
 
     invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
 
@@ -38,7 +38,7 @@
 .method public final contentLength()J
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/RequestBody$3;->bva:Ljava/io/File;
+    iget-object v0, p0, Lokhttp3/RequestBody$3;->bvu:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->length()J
 
@@ -52,7 +52,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$3;->buV:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/RequestBody$3;->bvp:Lokhttp3/MediaType;
 
     return-object v0
 .end method
@@ -68,9 +68,9 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/RequestBody$3;->bva:Ljava/io/File;
+    iget-object v1, p0, Lokhttp3/RequestBody$3;->bvu:Ljava/io/File;
 
-    invoke-static {v1}, Lokio/j;->B(Ljava/io/File;)Lokio/r;
+    invoke-static {v1}, Lokio/j;->A(Ljava/io/File;)Lokio/r;
 
     move-result-object v0
 
diff --git a/com.discord/smali/okhttp3/RequestBody.smali b/com.discord/smali/okhttp3/RequestBody.smali
index 896ff7606b..9de675b36c 100644
--- a/com.discord/smali/okhttp3/RequestBody.smali
+++ b/com.discord/smali/okhttp3/RequestBody.smali
@@ -72,7 +72,7 @@
 
     move-result-object p0
 
-    invoke-static {p0}, Lokhttp3/MediaType;->eo(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {p0}, Lokhttp3/MediaType;->ei(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object p0
 
diff --git a/com.discord/smali/okhttp3/Response$a.smali b/com.discord/smali/okhttp3/Response$a.smali
index 31d71e410e..cae7cd3098 100644
--- a/com.discord/smali/okhttp3/Response$a.smali
+++ b/com.discord/smali/okhttp3/Response$a.smali
@@ -15,47 +15,47 @@
 
 
 # instance fields
-.field public buU:Lokhttp3/Headers$a;
-
-.field public bvb:Lokhttp3/w;
+.field bvA:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bvc:Lokhttp3/u;
+.field public bvB:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bvd:Lokhttp3/r;
+.field public bvC:J
+
+.field public bvD:J
+
+.field public bvo:Lokhttp3/Headers$a;
+
+.field public bvv:Lokhttp3/w;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bve:Lokhttp3/x;
+.field public bvw:Lokhttp3/u;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bvf:Lokhttp3/Response;
+.field public bvx:Lokhttp3/r;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bvg:Lokhttp3/Response;
+.field public bvy:Lokhttp3/x;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bvh:Lokhttp3/Response;
+.field bvz:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bvi:J
-
-.field public bvj:J
-
 .field public code:I
 
 .field public message:Ljava/lang/String;
@@ -75,7 +75,7 @@
 
     invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/Response$a;->buU:Lokhttp3/Headers$a;
+    iput-object v0, p0, Lokhttp3/Response$a;->bvo:Lokhttp3/Headers$a;
 
     return-void
 .end method
@@ -89,13 +89,13 @@
 
     iput v0, p0, Lokhttp3/Response$a;->code:I
 
-    iget-object v0, p1, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v0, p1, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bvb:Lokhttp3/w;
+    iput-object v0, p0, Lokhttp3/Response$a;->bvv:Lokhttp3/w;
 
-    iget-object v0, p1, Lokhttp3/Response;->bvc:Lokhttp3/u;
+    iget-object v0, p1, Lokhttp3/Response;->bvw:Lokhttp3/u;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bvc:Lokhttp3/u;
+    iput-object v0, p0, Lokhttp3/Response$a;->bvw:Lokhttp3/u;
 
     iget v0, p1, Lokhttp3/Response;->code:I
 
@@ -105,41 +105,41 @@
 
     iput-object v0, p0, Lokhttp3/Response$a;->message:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/Response;->bvd:Lokhttp3/r;
+    iget-object v0, p1, Lokhttp3/Response;->bvx:Lokhttp3/r;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bvd:Lokhttp3/r;
+    iput-object v0, p0, Lokhttp3/Response$a;->bvx:Lokhttp3/r;
 
-    iget-object v0, p1, Lokhttp3/Response;->buj:Lokhttp3/Headers;
+    iget-object v0, p1, Lokhttp3/Response;->buD:Lokhttp3/Headers;
 
-    invoke-virtual {v0}, Lokhttp3/Headers;->Gz()Lokhttp3/Headers$a;
+    invoke-virtual {v0}, Lokhttp3/Headers;->Go()Lokhttp3/Headers$a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/Response$a;->buU:Lokhttp3/Headers$a;
+    iput-object v0, p0, Lokhttp3/Response$a;->bvo:Lokhttp3/Headers$a;
 
-    iget-object v0, p1, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bve:Lokhttp3/x;
+    iput-object v0, p0, Lokhttp3/Response$a;->bvy:Lokhttp3/x;
 
-    iget-object v0, p1, Lokhttp3/Response;->bvf:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bvz:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bvf:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response$a;->bvz:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response;->bvg:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bvA:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bvg:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response$a;->bvA:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response;->bvh:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bvB:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bvh:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response$a;->bvB:Lokhttp3/Response;
 
-    iget-wide v0, p1, Lokhttp3/Response;->bvi:J
+    iget-wide v0, p1, Lokhttp3/Response;->bvC:J
 
-    iput-wide v0, p0, Lokhttp3/Response$a;->bvi:J
+    iput-wide v0, p0, Lokhttp3/Response$a;->bvC:J
 
-    iget-wide v0, p1, Lokhttp3/Response;->bvj:J
+    iget-wide v0, p1, Lokhttp3/Response;->bvD:J
 
-    iput-wide v0, p0, Lokhttp3/Response$a;->bvj:J
+    iput-wide v0, p0, Lokhttp3/Response$a;->bvD:J
 
     return-void
 .end method
@@ -147,19 +147,19 @@
 .method private static a(Ljava/lang/String;Lokhttp3/Response;)V
     .locals 1
 
-    iget-object v0, p1, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     if-nez v0, :cond_3
 
-    iget-object v0, p1, Lokhttp3/Response;->bvf:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bvz:Lokhttp3/Response;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p1, Lokhttp3/Response;->bvg:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bvA:Lokhttp3/Response;
 
     if-nez v0, :cond_1
 
-    iget-object p1, p1, Lokhttp3/Response;->bvh:Lokhttp3/Response;
+    iget-object p1, p1, Lokhttp3/Response;->bvB:Lokhttp3/Response;
 
     if-nez p1, :cond_0
 
@@ -252,14 +252,14 @@
 
 
 # virtual methods
-.method public final He()Lokhttp3/Response;
+.method public final GR()Lokhttp3/Response;
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/Response$a;->bvb:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response$a;->bvv:Lokhttp3/w;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lokhttp3/Response$a;->bvc:Lokhttp3/u;
+    iget-object v0, p0, Lokhttp3/Response$a;->bvw:Lokhttp3/u;
 
     if-eqz v0, :cond_2
 
@@ -329,7 +329,7 @@
 .method public final ar(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Response$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Response$a;->buU:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/Response$a;->bvo:Lokhttp3/Headers$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->ak(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
@@ -350,7 +350,7 @@
     invoke-static {v0, p1}, Lokhttp3/Response$a;->a(Ljava/lang/String;Lokhttp3/Response;)V
 
     :cond_0
-    iput-object p1, p0, Lokhttp3/Response$a;->bvf:Lokhttp3/Response;
+    iput-object p1, p0, Lokhttp3/Response$a;->bvz:Lokhttp3/Response;
 
     return-object p0
 .end method
@@ -358,11 +358,11 @@
 .method public final c(Lokhttp3/Headers;)Lokhttp3/Response$a;
     .locals 0
 
-    invoke-virtual {p1}, Lokhttp3/Headers;->Gz()Lokhttp3/Headers$a;
+    invoke-virtual {p1}, Lokhttp3/Headers;->Go()Lokhttp3/Headers$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/Response$a;->buU:Lokhttp3/Headers$a;
+    iput-object p1, p0, Lokhttp3/Response$a;->bvo:Lokhttp3/Headers$a;
 
     return-object p0
 .end method
@@ -381,7 +381,7 @@
     invoke-static {v0, p1}, Lokhttp3/Response$a;->a(Ljava/lang/String;Lokhttp3/Response;)V
 
     :cond_0
-    iput-object p1, p0, Lokhttp3/Response$a;->bvg:Lokhttp3/Response;
+    iput-object p1, p0, Lokhttp3/Response$a;->bvA:Lokhttp3/Response;
 
     return-object p0
 .end method
diff --git a/com.discord/smali/okhttp3/Response.smali b/com.discord/smali/okhttp3/Response.smali
index 9b8ecf7ddd..c8cea0f949 100644
--- a/com.discord/smali/okhttp3/Response.smali
+++ b/com.discord/smali/okhttp3/Response.smali
@@ -15,46 +15,46 @@
 
 
 # instance fields
-.field private volatile buT:Lokhttp3/d;
+.field public final buD:Lokhttp3/Headers;
+
+.field final bvA:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final buj:Lokhttp3/Headers;
-
-.field public final bvb:Lokhttp3/w;
-
-.field final bvc:Lokhttp3/u;
-
-.field public final bvd:Lokhttp3/r;
+.field public final bvB:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bve:Lokhttp3/x;
+.field public final bvC:J
+
+.field public final bvD:J
+
+.field private volatile bvn:Lokhttp3/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bvf:Lokhttp3/Response;
+.field public final bvv:Lokhttp3/w;
+
+.field final bvw:Lokhttp3/u;
+
+.field public final bvx:Lokhttp3/r;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bvg:Lokhttp3/Response;
+.field public final bvy:Lokhttp3/x;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bvh:Lokhttp3/Response;
+.field final bvz:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bvi:J
-
-.field public final bvj:J
-
 .field public final code:I
 
 .field public final message:Ljava/lang/String;
@@ -66,13 +66,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bvb:Lokhttp3/w;
+    iget-object v0, p1, Lokhttp3/Response$a;->bvv:Lokhttp3/w;
 
-    iput-object v0, p0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iput-object v0, p0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bvc:Lokhttp3/u;
+    iget-object v0, p1, Lokhttp3/Response$a;->bvw:Lokhttp3/u;
 
-    iput-object v0, p0, Lokhttp3/Response;->bvc:Lokhttp3/u;
+    iput-object v0, p0, Lokhttp3/Response;->bvw:Lokhttp3/u;
 
     iget v0, p1, Lokhttp3/Response$a;->code:I
 
@@ -82,77 +82,77 @@
 
     iput-object v0, p0, Lokhttp3/Response;->message:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bvd:Lokhttp3/r;
+    iget-object v0, p1, Lokhttp3/Response$a;->bvx:Lokhttp3/r;
 
-    iput-object v0, p0, Lokhttp3/Response;->bvd:Lokhttp3/r;
+    iput-object v0, p0, Lokhttp3/Response;->bvx:Lokhttp3/r;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->buU:Lokhttp3/Headers$a;
+    iget-object v0, p1, Lokhttp3/Response$a;->bvo:Lokhttp3/Headers$a;
 
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->GA()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Gp()Lokhttp3/Headers;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/Response;->buj:Lokhttp3/Headers;
+    iput-object v0, p0, Lokhttp3/Response;->buD:Lokhttp3/Headers;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bve:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response$a;->bvy:Lokhttp3/x;
 
-    iput-object v0, p0, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iput-object v0, p0, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bvf:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response$a;->bvz:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response;->bvf:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response;->bvz:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bvg:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response$a;->bvA:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response;->bvg:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response;->bvA:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bvh:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response$a;->bvB:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response;->bvh:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response;->bvB:Lokhttp3/Response;
 
-    iget-wide v0, p1, Lokhttp3/Response$a;->bvi:J
+    iget-wide v0, p1, Lokhttp3/Response$a;->bvC:J
 
-    iput-wide v0, p0, Lokhttp3/Response;->bvi:J
+    iput-wide v0, p0, Lokhttp3/Response;->bvC:J
 
-    iget-wide v0, p1, Lokhttp3/Response$a;->bvj:J
+    iget-wide v0, p1, Lokhttp3/Response$a;->bvD:J
 
-    iput-wide v0, p0, Lokhttp3/Response;->bvj:J
+    iput-wide v0, p0, Lokhttp3/Response;->bvD:J
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final GL()Lokhttp3/w;
+.method public final GA()Lokhttp3/w;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
     return-object v0
 .end method
 
-.method public final Ha()Lokhttp3/d;
+.method public final GO()Lokhttp3/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Response;->buT:Lokhttp3/d;
+    iget-object v0, p0, Lokhttp3/Response;->bvn:Lokhttp3/d;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/Response;->buj:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/Response;->buD:Lokhttp3/Headers;
 
     invoke-static {v0}, Lokhttp3/d;->a(Lokhttp3/Headers;)Lokhttp3/d;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/Response;->buT:Lokhttp3/d;
+    iput-object v0, p0, Lokhttp3/Response;->bvn:Lokhttp3/d;
 
     return-object v0
 .end method
 
-.method public final Hd()Lokhttp3/Response$a;
+.method public final GQ()Lokhttp3/Response$a;
     .locals 1
 
     new-instance v0, Lokhttp3/Response$a;
@@ -165,7 +165,7 @@
 .method public final close()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v0, p0, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     if-eqz v0, :cond_0
 
@@ -183,12 +183,24 @@
     throw v0
 .end method
 
-.method public final dO(Ljava/lang/String;)Ljava/lang/String;
+.method public final dI(Ljava/lang/String;)Ljava/lang/String;
+    .locals 0
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+
+    invoke-virtual {p0, p1}, Lokhttp3/Response;->em(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final em(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/Response;->buj:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/Response;->buD:Lokhttp3/Headers;
 
     invoke-virtual {v0, p1}, Lokhttp3/Headers;->get(Ljava/lang/String;)Ljava/lang/String;
 
@@ -204,42 +216,6 @@
     return-object p1
 .end method
 
-.method public final isRedirect()Z
-    .locals 2
-
-    iget v0, p0, Lokhttp3/Response;->code:I
-
-    const/16 v1, 0x133
-
-    if-eq v0, v1, :cond_0
-
-    const/16 v1, 0x134
-
-    if-eq v0, v1, :cond_0
-
-    packed-switch v0, :pswitch_data_0
-
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_0
-    :pswitch_0
-    const/4 v0, 0x1
-
-    return v0
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x12c
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-    .end packed-switch
-.end method
-
 .method public final toString()Ljava/lang/String;
     .locals 2
 
@@ -249,7 +225,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/Response;->bvc:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/Response;->bvw:Lokhttp3/u;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -273,9 +249,9 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v1, p0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    iget-object v1, v1, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -290,7 +266,7 @@
     return-object v0
 .end method
 
-.method public final zW()Z
+.method public final zS()Z
     .locals 2
 
     iget v0, p0, Lokhttp3/Response;->code:I
diff --git a/com.discord/smali/okhttp3/WebSocket.smali b/com.discord/smali/okhttp3/WebSocket.smali
index c380fc0073..3d151056b3 100644
--- a/com.discord/smali/okhttp3/WebSocket.smali
+++ b/com.discord/smali/okhttp3/WebSocket.smali
@@ -7,7 +7,7 @@
 .method public abstract cancel()V
 .end method
 
-.method public abstract et(Ljava/lang/String;)Z
+.method public abstract eo(Ljava/lang/String;)Z
 .end method
 
 .method public abstract f(ILjava/lang/String;)Z
diff --git a/com.discord/smali/okhttp3/a.smali b/com.discord/smali/okhttp3/a.smali
index a9c004a431..120093ef0c 100644
--- a/com.discord/smali/okhttp3/a.smali
+++ b/com.discord/smali/okhttp3/a.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field public final bpQ:Lokhttp3/s;
+.field public final bqk:Lokhttp3/s;
 
-.field public final bpR:Lokhttp3/o;
+.field public final bql:Lokhttp3/o;
 
-.field public final bpS:Ljavax/net/SocketFactory;
+.field public final bqm:Ljavax/net/SocketFactory;
 
-.field final bpT:Lokhttp3/b;
+.field final bqn:Lokhttp3/b;
 
-.field public final bpU:Ljava/util/List;
+.field public final bqo:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field public final bpV:Ljava/util/List;
+.field public final bqp:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -32,12 +32,12 @@
     .end annotation
 .end field
 
-.field public final bpW:Ljava/net/Proxy;
+.field public final bqq:Ljava/net/Proxy;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bpX:Lokhttp3/g;
+.field public final bqr:Lokhttp3/g;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -139,7 +139,7 @@
 
     if-eqz v12, :cond_1
 
-    iput-object v10, v8, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iput-object v10, v8, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
     goto :goto_1
 
@@ -150,7 +150,7 @@
 
     if-eqz v10, :cond_b
 
-    iput-object v9, v8, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iput-object v9, v8, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
     :goto_1
     if-eqz v1, :cond_a
@@ -167,7 +167,7 @@
 
     if-eqz v9, :cond_9
 
-    iput-object v9, v8, Lokhttp3/s$a;->btJ:Ljava/lang/String;
+    iput-object v9, v8, Lokhttp3/s$a;->bud:Ljava/lang/String;
 
     if-lez v2, :cond_8
 
@@ -177,23 +177,23 @@
 
     iput v2, v8, Lokhttp3/s$a;->port:I
 
-    invoke-virtual {v8}, Lokhttp3/s$a;->GK()Lokhttp3/s;
+    invoke-virtual {v8}, Lokhttp3/s$a;->Gz()Lokhttp3/s;
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iput-object v1, v0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     if-eqz v3, :cond_7
 
-    iput-object v3, v0, Lokhttp3/a;->bpR:Lokhttp3/o;
+    iput-object v3, v0, Lokhttp3/a;->bql:Lokhttp3/o;
 
     if-eqz v4, :cond_6
 
-    iput-object v4, v0, Lokhttp3/a;->bpS:Ljavax/net/SocketFactory;
+    iput-object v4, v0, Lokhttp3/a;->bqm:Ljavax/net/SocketFactory;
 
     if-eqz v6, :cond_5
 
-    iput-object v6, v0, Lokhttp3/a;->bpT:Lokhttp3/b;
+    iput-object v6, v0, Lokhttp3/a;->bqn:Lokhttp3/b;
 
     if-eqz p10, :cond_4
 
@@ -201,7 +201,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/a;->bpU:Ljava/util/List;
+    iput-object v1, v0, Lokhttp3/a;->bqo:Ljava/util/List;
 
     if-eqz p11, :cond_3
 
@@ -209,7 +209,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/a;->bpV:Ljava/util/List;
+    iput-object v1, v0, Lokhttp3/a;->bqp:Ljava/util/List;
 
     if-eqz v7, :cond_2
 
@@ -217,7 +217,7 @@
 
     move-object/from16 v1, p9
 
-    iput-object v1, v0, Lokhttp3/a;->bpW:Ljava/net/Proxy;
+    iput-object v1, v0, Lokhttp3/a;->bqq:Ljava/net/Proxy;
 
     iput-object v5, v0, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
@@ -227,7 +227,7 @@
 
     move-object/from16 v1, p7
 
-    iput-object v1, v0, Lokhttp3/a;->bpX:Lokhttp3/g;
+    iput-object v1, v0, Lokhttp3/a;->bqr:Lokhttp3/g;
 
     return-void
 
@@ -347,9 +347,9 @@
 .method final a(Lokhttp3/a;)Z
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/a;->bpR:Lokhttp3/o;
+    iget-object v0, p0, Lokhttp3/a;->bql:Lokhttp3/o;
 
-    iget-object v1, p1, Lokhttp3/a;->bpR:Lokhttp3/o;
+    iget-object v1, p1, Lokhttp3/a;->bql:Lokhttp3/o;
 
     invoke-virtual {v0, v1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -357,9 +357,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bpT:Lokhttp3/b;
+    iget-object v0, p0, Lokhttp3/a;->bqn:Lokhttp3/b;
 
-    iget-object v1, p1, Lokhttp3/a;->bpT:Lokhttp3/b;
+    iget-object v1, p1, Lokhttp3/a;->bqn:Lokhttp3/b;
 
     invoke-virtual {v0, v1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -367,9 +367,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bpU:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/a;->bqo:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/a;->bpU:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/a;->bqo:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
@@ -377,9 +377,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bpV:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/a;->bqp:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/a;->bpV:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/a;->bqp:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
@@ -397,9 +397,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bpW:Ljava/net/Proxy;
+    iget-object v0, p0, Lokhttp3/a;->bqq:Ljava/net/Proxy;
 
-    iget-object v1, p1, Lokhttp3/a;->bpW:Ljava/net/Proxy;
+    iget-object v1, p1, Lokhttp3/a;->bqq:Ljava/net/Proxy;
 
     invoke-static {v0, v1}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -427,9 +427,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bpX:Lokhttp3/g;
+    iget-object v0, p0, Lokhttp3/a;->bqr:Lokhttp3/g;
 
-    iget-object v1, p1, Lokhttp3/a;->bpX:Lokhttp3/g;
+    iget-object v1, p1, Lokhttp3/a;->bqr:Lokhttp3/g;
 
     invoke-static {v0, v1}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -437,11 +437,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     iget v0, v0, Lokhttp3/s;->port:I
 
-    iget-object p1, p1, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     iget p1, p1, Lokhttp3/s;->port:I
 
@@ -468,11 +468,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     check-cast p1, Lokhttp3/a;
 
-    iget-object v1, p1, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v1, p1, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     invoke-virtual {v0, v1}, Lokhttp3/s;->equals(Ljava/lang/Object;)Z
 
@@ -499,7 +499,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     invoke-virtual {v0}, Lokhttp3/s;->hashCode()I
 
@@ -509,7 +509,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bpR:Lokhttp3/o;
+    iget-object v1, p0, Lokhttp3/a;->bql:Lokhttp3/o;
 
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
@@ -519,7 +519,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bpT:Lokhttp3/b;
+    iget-object v1, p0, Lokhttp3/a;->bqn:Lokhttp3/b;
 
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
@@ -529,7 +529,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bpU:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/a;->bqo:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->hashCode()I
 
@@ -539,7 +539,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bpV:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/a;->bqp:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->hashCode()I
 
@@ -559,7 +559,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bpW:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/a;->bqq:Ljava/net/Proxy;
 
     const/4 v2, 0x0
 
@@ -615,7 +615,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bpX:Lokhttp3/g;
+    iget-object v1, p0, Lokhttp3/a;->bqr:Lokhttp3/g;
 
     if-eqz v1, :cond_3
 
@@ -638,9 +638,9 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->bud:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -648,13 +648,13 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     iget v1, v1, Lokhttp3/s;->port:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/a;->bpW:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/a;->bqq:Ljava/net/Proxy;
 
     if-eqz v1, :cond_0
 
@@ -662,7 +662,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/a;->bpW:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/a;->bqq:Ljava/net/Proxy;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/okhttp3/d.smali b/com.discord/smali/okhttp3/d.smali
index f8fbdb8ad8..bcbd5b7270 100644
--- a/com.discord/smali/okhttp3/d.smali
+++ b/com.discord/smali/okhttp3/d.smali
@@ -12,39 +12,39 @@
 
 
 # static fields
-.field public static final bqb:Lokhttp3/d;
+.field public static final bqv:Lokhttp3/d;
 
-.field public static final bqc:Lokhttp3/d;
+.field public static final bqw:Lokhttp3/d;
 
 
 # instance fields
-.field public final bqd:Z
+.field private final bqA:I
 
-.field public final bqe:Z
+.field public final bqB:Z
 
-.field public final bqf:I
+.field public final bqC:Z
 
-.field private final bqg:I
+.field public final bqD:Z
 
-.field public final bqh:Z
+.field public final bqE:I
 
-.field public final bqi:Z
+.field public final bqF:I
 
-.field public final bqj:Z
+.field public final bqG:Z
 
-.field public final bqk:I
+.field private final bqH:Z
 
-.field public final bql:I
-
-.field public final bqm:Z
-
-.field private final bqn:Z
-
-.field bqo:Ljava/lang/String;
+.field bqI:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
+.field public final bqx:Z
+
+.field public final bqy:Z
+
+.field public final bqz:I
+
 .field private final immutable:Z
 
 
@@ -58,19 +58,19 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lokhttp3/d$a;->bqd:Z
+    iput-boolean v1, v0, Lokhttp3/d$a;->bqx:Z
 
-    invoke-virtual {v0}, Lokhttp3/d$a;->Gq()Lokhttp3/d;
+    invoke-virtual {v0}, Lokhttp3/d$a;->Gf()Lokhttp3/d;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/d;->bqb:Lokhttp3/d;
+    sput-object v0, Lokhttp3/d;->bqv:Lokhttp3/d;
 
     new-instance v0, Lokhttp3/d$a;
 
     invoke-direct {v0}, Lokhttp3/d$a;-><init>()V
 
-    iput-boolean v1, v0, Lokhttp3/d$a;->bqm:Z
+    iput-boolean v1, v0, Lokhttp3/d$a;->bqG:Z
 
     sget-object v1, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -92,13 +92,13 @@
     long-to-int v1, v4
 
     :goto_0
-    iput v1, v0, Lokhttp3/d$a;->bqk:I
+    iput v1, v0, Lokhttp3/d$a;->bqE:I
 
-    invoke-virtual {v0}, Lokhttp3/d$a;->Gq()Lokhttp3/d;
+    invoke-virtual {v0}, Lokhttp3/d$a;->Gf()Lokhttp3/d;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/d;->bqc:Lokhttp3/d;
+    sput-object v0, Lokhttp3/d;->bqw:Lokhttp3/d;
 
     return-void
 .end method
@@ -108,45 +108,45 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-boolean v0, p1, Lokhttp3/d$a;->bqd:Z
+    iget-boolean v0, p1, Lokhttp3/d$a;->bqx:Z
 
-    iput-boolean v0, p0, Lokhttp3/d;->bqd:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bqx:Z
 
-    iget-boolean v0, p1, Lokhttp3/d$a;->bqe:Z
+    iget-boolean v0, p1, Lokhttp3/d$a;->bqy:Z
 
-    iput-boolean v0, p0, Lokhttp3/d;->bqe:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bqy:Z
 
-    iget v0, p1, Lokhttp3/d$a;->bqf:I
+    iget v0, p1, Lokhttp3/d$a;->bqz:I
 
-    iput v0, p0, Lokhttp3/d;->bqf:I
+    iput v0, p0, Lokhttp3/d;->bqz:I
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lokhttp3/d;->bqg:I
+    iput v0, p0, Lokhttp3/d;->bqA:I
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/d;->bqh:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bqB:Z
 
-    iput-boolean v0, p0, Lokhttp3/d;->bqi:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bqC:Z
 
-    iput-boolean v0, p0, Lokhttp3/d;->bqj:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bqD:Z
 
-    iget v0, p1, Lokhttp3/d$a;->bqk:I
+    iget v0, p1, Lokhttp3/d$a;->bqE:I
 
-    iput v0, p0, Lokhttp3/d;->bqk:I
+    iput v0, p0, Lokhttp3/d;->bqE:I
 
-    iget v0, p1, Lokhttp3/d$a;->bql:I
+    iget v0, p1, Lokhttp3/d$a;->bqF:I
 
-    iput v0, p0, Lokhttp3/d;->bql:I
+    iput v0, p0, Lokhttp3/d;->bqF:I
 
-    iget-boolean v0, p1, Lokhttp3/d$a;->bqm:Z
+    iget-boolean v0, p1, Lokhttp3/d$a;->bqG:Z
 
-    iput-boolean v0, p0, Lokhttp3/d;->bqm:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bqG:Z
 
-    iget-boolean v0, p1, Lokhttp3/d$a;->bqn:Z
+    iget-boolean v0, p1, Lokhttp3/d$a;->bqH:Z
 
-    iput-boolean v0, p0, Lokhttp3/d;->bqn:Z
+    iput-boolean v0, p0, Lokhttp3/d;->bqH:Z
 
     iget-boolean p1, p1, Lokhttp3/d$a;->immutable:Z
 
@@ -164,31 +164,31 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lokhttp3/d;->bqd:Z
+    iput-boolean p1, p0, Lokhttp3/d;->bqx:Z
 
-    iput-boolean p2, p0, Lokhttp3/d;->bqe:Z
+    iput-boolean p2, p0, Lokhttp3/d;->bqy:Z
 
-    iput p3, p0, Lokhttp3/d;->bqf:I
+    iput p3, p0, Lokhttp3/d;->bqz:I
 
-    iput p4, p0, Lokhttp3/d;->bqg:I
+    iput p4, p0, Lokhttp3/d;->bqA:I
 
-    iput-boolean p5, p0, Lokhttp3/d;->bqh:Z
+    iput-boolean p5, p0, Lokhttp3/d;->bqB:Z
 
-    iput-boolean p6, p0, Lokhttp3/d;->bqi:Z
+    iput-boolean p6, p0, Lokhttp3/d;->bqC:Z
 
-    iput-boolean p7, p0, Lokhttp3/d;->bqj:Z
+    iput-boolean p7, p0, Lokhttp3/d;->bqD:Z
 
-    iput p8, p0, Lokhttp3/d;->bqk:I
+    iput p8, p0, Lokhttp3/d;->bqE:I
 
-    iput p9, p0, Lokhttp3/d;->bql:I
+    iput p9, p0, Lokhttp3/d;->bqF:I
 
-    iput-boolean p10, p0, Lokhttp3/d;->bqm:Z
+    iput-boolean p10, p0, Lokhttp3/d;->bqG:Z
 
-    iput-boolean p11, p0, Lokhttp3/d;->bqn:Z
+    iput-boolean p11, p0, Lokhttp3/d;->bqH:Z
 
     iput-boolean p12, p0, Lokhttp3/d;->immutable:Z
 
-    iput-object p13, p0, Lokhttp3/d;->bqo:Ljava/lang/String;
+    iput-object p13, p0, Lokhttp3/d;->bqI:Ljava/lang/String;
 
     return-void
 .end method
@@ -198,7 +198,7 @@
 
     move-object/from16 v0, p0
 
-    iget-object v1, v0, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     array-length v1, v1
 
@@ -237,11 +237,11 @@
     :goto_0
     if-ge v6, v1, :cond_12
 
-    invoke-virtual {v0, v6}, Lokhttp3/Headers;->dz(I)Ljava/lang/String;
+    invoke-virtual {v0, v6}, Lokhttp3/Headers;->dw(I)Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {v0, v6}, Lokhttp3/Headers;->dA(I)Ljava/lang/String;
+    invoke-virtual {v0, v6}, Lokhttp3/Headers;->dx(I)Ljava/lang/String;
 
     move-result-object v4
 
@@ -602,7 +602,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lokhttp3/d;->bqo:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/d;->bqI:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -613,7 +613,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-boolean v1, p0, Lokhttp3/d;->bqd:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bqx:Z
 
     if-eqz v1, :cond_1
 
@@ -622,7 +622,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_1
-    iget-boolean v1, p0, Lokhttp3/d;->bqe:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bqy:Z
 
     if-eqz v1, :cond_2
 
@@ -631,7 +631,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_2
-    iget v1, p0, Lokhttp3/d;->bqf:I
+    iget v1, p0, Lokhttp3/d;->bqz:I
 
     const-string v2, ", "
 
@@ -643,14 +643,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lokhttp3/d;->bqf:I
+    iget v1, p0, Lokhttp3/d;->bqz: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 v1, p0, Lokhttp3/d;->bqg:I
+    iget v1, p0, Lokhttp3/d;->bqA:I
 
     if-eq v1, v3, :cond_4
 
@@ -658,14 +658,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lokhttp3/d;->bqg:I
+    iget v1, p0, Lokhttp3/d;->bqA: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_4
-    iget-boolean v1, p0, Lokhttp3/d;->bqh:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bqB:Z
 
     if-eqz v1, :cond_5
 
@@ -674,7 +674,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_5
-    iget-boolean v1, p0, Lokhttp3/d;->bqi:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bqC:Z
 
     if-eqz v1, :cond_6
 
@@ -683,7 +683,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_6
-    iget-boolean v1, p0, Lokhttp3/d;->bqj:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bqD:Z
 
     if-eqz v1, :cond_7
 
@@ -692,7 +692,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_7
-    iget v1, p0, Lokhttp3/d;->bqk:I
+    iget v1, p0, Lokhttp3/d;->bqE:I
 
     if-eq v1, v3, :cond_8
 
@@ -700,14 +700,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lokhttp3/d;->bqk:I
+    iget v1, p0, Lokhttp3/d;->bqE: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 v1, p0, Lokhttp3/d;->bql:I
+    iget v1, p0, Lokhttp3/d;->bqF:I
 
     if-eq v1, v3, :cond_9
 
@@ -715,14 +715,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lokhttp3/d;->bql:I
+    iget v1, p0, Lokhttp3/d;->bqF: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_9
-    iget-boolean v1, p0, Lokhttp3/d;->bqm:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bqG:Z
 
     if-eqz v1, :cond_a
 
@@ -731,7 +731,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_a
-    iget-boolean v1, p0, Lokhttp3/d;->bqn:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bqH:Z
 
     if-eqz v1, :cond_b
 
@@ -777,7 +777,7 @@
     move-result-object v0
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/d;->bqo:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/d;->bqI:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/okhttp3/e.smali b/com.discord/smali/okhttp3/e.smali
index 22715fcff2..ad8dcef680 100644
--- a/com.discord/smali/okhttp3/e.smali
+++ b/com.discord/smali/okhttp3/e.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract Gr()Lokhttp3/Response;
+.method public abstract Gg()Lokhttp3/Response;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali/okhttp3/g.smali b/com.discord/smali/okhttp3/g.smali
index 2d1b92f8af..5a6e7582c6 100644
--- a/com.discord/smali/okhttp3/g.smali
+++ b/com.discord/smali/okhttp3/g.smali
@@ -13,11 +13,11 @@
 
 
 # static fields
-.field public static final bqp:Lokhttp3/g;
+.field public static final bqJ:Lokhttp3/g;
 
 
 # instance fields
-.field final bqq:Ljava/util/Set;
+.field final bqK:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field final bqr:Lokhttp3/internal/i/c;
+.field final bqL:Lokhttp3/internal/i/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -45,7 +45,7 @@
 
     new-instance v2, Ljava/util/LinkedHashSet;
 
-    iget-object v0, v0, Lokhttp3/g$a;->bhY:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/g$a;->bis:Ljava/util/List;
 
     invoke-direct {v2, v0}, Ljava/util/LinkedHashSet;-><init>(Ljava/util/Collection;)V
 
@@ -53,7 +53,7 @@
 
     invoke-direct {v1, v2, v0}, Lokhttp3/g;-><init>(Ljava/util/Set;Lokhttp3/internal/i/c;)V
 
-    sput-object v1, Lokhttp3/g;->bqp:Lokhttp3/g;
+    sput-object v1, Lokhttp3/g;->bqJ:Lokhttp3/g;
 
     return-void
 .end method
@@ -77,9 +77,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/g;->bqq:Ljava/util/Set;
+    iput-object p1, p0, Lokhttp3/g;->bqK:Ljava/util/Set;
 
-    iput-object p2, p0, Lokhttp3/g;->bqr:Lokhttp3/internal/i/c;
+    iput-object p2, p0, Lokhttp3/g;->bqL:Lokhttp3/internal/i/c;
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/ByteString;->IG()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->It()Ljava/lang/String;
 
     move-result-object p0
 
@@ -140,7 +140,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/ByteString;->II()Lokio/ByteString;
+    invoke-virtual {p0}, Lokio/ByteString;->Iv()Lokio/ByteString;
 
     move-result-object p0
 
@@ -175,7 +175,7 @@
 
     move-result-object v1
 
-    iget-object v2, v0, Lokhttp3/g;->bqq:Ljava/util/Set;
+    iget-object v2, v0, Lokhttp3/g;->bqK:Ljava/util/Set;
 
     invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -227,7 +227,7 @@
 
     sub-int/2addr v2, v12
 
-    iget-object v3, v11, Lokhttp3/g$b;->bqs:Ljava/lang/String;
+    iget-object v3, v11, Lokhttp3/g$b;->bqM:Ljava/lang/String;
 
     invoke-virtual {v3}, Ljava/lang/String;->length()I
 
@@ -239,11 +239,11 @@
 
     add-int/lit8 v3, v1, 0x1
 
-    iget-object v4, v11, Lokhttp3/g$b;->bqs:Ljava/lang/String;
+    iget-object v4, v11, Lokhttp3/g$b;->bqM:Ljava/lang/String;
 
     const/4 v5, 0x0
 
-    iget-object v1, v11, Lokhttp3/g$b;->bqs:Ljava/lang/String;
+    iget-object v1, v11, Lokhttp3/g$b;->bqM:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
@@ -262,7 +262,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, v11, Lokhttp3/g$b;->bqs:Ljava/lang/String;
+    iget-object v1, v11, Lokhttp3/g$b;->bqM:Ljava/lang/String;
 
     invoke-virtual {v7, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -297,7 +297,7 @@
     return-void
 
     :cond_5
-    iget-object v1, v0, Lokhttp3/g;->bqr:Lokhttp3/internal/i/c;
+    iget-object v1, v0, Lokhttp3/g;->bqL:Lokhttp3/internal/i/c;
 
     move-object/from16 v2, p2
 
@@ -349,7 +349,7 @@
 
     check-cast v12, Lokhttp3/g$b;
 
-    iget-object v13, v12, Lokhttp3/g$b;->bqt:Ljava/lang/String;
+    iget-object v13, v12, Lokhttp3/g$b;->bqN:Ljava/lang/String;
 
     const-string v14, "sha256/"
 
@@ -366,7 +366,7 @@
     move-result-object v8
 
     :cond_7
-    iget-object v12, v12, Lokhttp3/g$b;->bqu:Lokio/ByteString;
+    iget-object v12, v12, Lokhttp3/g$b;->bqO:Lokio/ByteString;
 
     invoke-virtual {v12, v8}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -377,7 +377,7 @@
     return-void
 
     :cond_8
-    iget-object v13, v12, Lokhttp3/g$b;->bqt:Ljava/lang/String;
+    iget-object v13, v12, Lokhttp3/g$b;->bqN:Ljava/lang/String;
 
     const-string v14, "sha1/"
 
@@ -401,12 +401,12 @@
 
     move-result-object v11
 
-    invoke-virtual {v11}, Lokio/ByteString;->IH()Lokio/ByteString;
+    invoke-virtual {v11}, Lokio/ByteString;->Iu()Lokio/ByteString;
 
     move-result-object v11
 
     :cond_9
-    iget-object v12, v12, Lokhttp3/g$b;->bqu:Lokio/ByteString;
+    iget-object v12, v12, Lokhttp3/g$b;->bqO:Lokio/ByteString;
 
     invoke-virtual {v12, v11}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -430,7 +430,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v3, v12, Lokhttp3/g$b;->bqt:Ljava/lang/String;
+    iget-object v3, v12, Lokhttp3/g$b;->bqN:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -565,11 +565,11 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/g;->bqr:Lokhttp3/internal/i/c;
+    iget-object v1, p0, Lokhttp3/g;->bqL:Lokhttp3/internal/i/c;
 
     check-cast p1, Lokhttp3/g;
 
-    iget-object v2, p1, Lokhttp3/g;->bqr:Lokhttp3/internal/i/c;
+    iget-object v2, p1, Lokhttp3/g;->bqL:Lokhttp3/internal/i/c;
 
     invoke-static {v1, v2}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -577,9 +577,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/g;->bqq:Ljava/util/Set;
+    iget-object v1, p0, Lokhttp3/g;->bqK:Ljava/util/Set;
 
-    iget-object p1, p1, Lokhttp3/g;->bqq:Ljava/util/Set;
+    iget-object p1, p1, Lokhttp3/g;->bqK:Ljava/util/Set;
 
     invoke-interface {v1, p1}, Ljava/util/Set;->equals(Ljava/lang/Object;)Z
 
@@ -598,7 +598,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/g;->bqr:Lokhttp3/internal/i/c;
+    iget-object v0, p0, Lokhttp3/g;->bqL:Lokhttp3/internal/i/c;
 
     if-eqz v0, :cond_0
 
@@ -614,7 +614,7 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/g;->bqq:Ljava/util/Set;
+    iget-object v1, p0, Lokhttp3/g;->bqK:Ljava/util/Set;
 
     invoke-interface {v1}, Ljava/util/Set;->hashCode()I
 
diff --git a/com.discord/smali/okhttp3/i.smali b/com.discord/smali/okhttp3/i.smali
index dcd2ee3481..7721e99aa5 100644
--- a/com.discord/smali/okhttp3/i.smali
+++ b/com.discord/smali/okhttp3/i.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract Gs()Lokhttp3/u;
+.method public abstract Gh()Lokhttp3/u;
 .end method
diff --git a/com.discord/smali/okhttp3/internal/a.smali b/com.discord/smali/okhttp3/internal/a.smali
index 222a91487e..33e28f57dc 100644
--- a/com.discord/smali/okhttp3/internal/a.smali
+++ b/com.discord/smali/okhttp3/internal/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static bvw:Lokhttp3/internal/a;
+.field public static bvQ:Lokhttp3/internal/a;
 
 
 # direct methods
diff --git a/com.discord/smali/okhttp3/internal/a/c.smali b/com.discord/smali/okhttp3/internal/a/c.smali
index fbd5a45952..bab384c6eb 100644
--- a/com.discord/smali/okhttp3/internal/a/c.smali
+++ b/com.discord/smali/okhttp3/internal/a/c.smali
@@ -12,12 +12,12 @@
 
 
 # instance fields
-.field public final bvT:Lokhttp3/w;
+.field public final bvA:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bvg:Lokhttp3/Response;
+.field public final bwn:Lokhttp3/w;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -29,9 +29,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/a/c;->bvT:Lokhttp3/w;
+    iput-object p1, p0, Lokhttp3/internal/a/c;->bwn:Lokhttp3/w;
 
-    iput-object p2, p0, Lokhttp3/internal/a/c;->bvg:Lokhttp3/Response;
+    iput-object p2, p0, Lokhttp3/internal/a/c;->bvA:Lokhttp3/Response;
 
     return-void
 .end method
@@ -91,35 +91,35 @@
     :pswitch_0
     const-string v0, "Expires"
 
-    invoke-virtual {p0, v0}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p0, v0}, Lokhttp3/Response;->em(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/Response;->Ha()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->GO()Lokhttp3/d;
 
     move-result-object v0
 
-    iget v0, v0, Lokhttp3/d;->bqf:I
+    iget v0, v0, Lokhttp3/d;->bqz:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/Response;->Ha()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->GO()Lokhttp3/d;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lokhttp3/d;->bqi:Z
+    iget-boolean v0, v0, Lokhttp3/d;->bqC:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/Response;->Ha()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->GO()Lokhttp3/d;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lokhttp3/d;->bqh:Z
+    iget-boolean v0, v0, Lokhttp3/d;->bqB:Z
 
     if-nez v0, :cond_1
 
@@ -128,19 +128,19 @@
 
     :cond_1
     :pswitch_1
-    invoke-virtual {p0}, Lokhttp3/Response;->Ha()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->GO()Lokhttp3/d;
 
     move-result-object p0
 
-    iget-boolean p0, p0, Lokhttp3/d;->bqe:Z
+    iget-boolean p0, p0, Lokhttp3/d;->bqy:Z
 
     if-nez p0, :cond_2
 
-    invoke-virtual {p1}, Lokhttp3/w;->Ha()Lokhttp3/d;
+    invoke-virtual {p1}, Lokhttp3/w;->GO()Lokhttp3/d;
 
     move-result-object p0
 
-    iget-boolean p0, p0, Lokhttp3/d;->bqe:Z
+    iget-boolean p0, p0, Lokhttp3/d;->bqy:Z
 
     if-nez p0, :cond_2
 
diff --git a/com.discord/smali/okhttp3/internal/b/c.smali b/com.discord/smali/okhttp3/internal/b/c.smali
index c2c3054d11..5385146bdb 100644
--- a/com.discord/smali/okhttp3/internal/b/c.smali
+++ b/com.discord/smali/okhttp3/internal/b/c.smali
@@ -7,21 +7,29 @@
 
 
 # instance fields
-.field private final but:Lokhttp3/j;
+.field private final buN:Lokhttp3/j;
 
-.field private bvc:Lokhttp3/u;
+.field private bvw:Lokhttp3/u;
 
-.field public bvd:Lokhttp3/r;
+.field public bvx:Lokhttp3/r;
 
-.field public bwA:Lokio/BufferedSink;
+.field public final bwQ:Lokhttp3/y;
 
-.field public bwB:Z
+.field public bwR:Ljava/net/Socket;
 
-.field public bwC:I
+.field public bwS:Ljava/net/Socket;
 
-.field public bwD:I
+.field bwT:Lokhttp3/internal/e/g;
 
-.field public final bwE:Ljava/util/List;
+.field public bwU:Lokio/BufferedSink;
+
+.field public bwV:Z
+
+.field public bwW:I
+
+.field public bwX:I
+
+.field public final bwY:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -32,17 +40,9 @@
     .end annotation
 .end field
 
-.field public bwF:J
+.field public bwZ:J
 
-.field public final bww:Lokhttp3/y;
-
-.field public bwx:Ljava/net/Socket;
-
-.field public bwy:Ljava/net/Socket;
-
-.field bwz:Lokhttp3/internal/e/g;
-
-.field public nJ:Lokio/d;
+.field public nI:Lokio/d;
 
 
 # direct methods
@@ -53,26 +53,26 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lokhttp3/internal/b/c;->bwD:I
+    iput v0, p0, Lokhttp3/internal/b/c;->bwX:I
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/b/c;->bwE:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/c;->bwY:Ljava/util/List;
 
     const-wide v0, 0x7fffffffffffffffL
 
-    iput-wide v0, p0, Lokhttp3/internal/b/c;->bwF:J
+    iput-wide v0, p0, Lokhttp3/internal/b/c;->bwZ:J
 
-    iput-object p1, p0, Lokhttp3/internal/b/c;->but:Lokhttp3/j;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->buN:Lokhttp3/j;
 
-    iput-object p2, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iput-object p2, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
     return-void
 .end method
 
-.method private ab(II)V
+.method private aa(II)V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -80,13 +80,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bpW:Ljava/net/Proxy;
+    iget-object v0, v0, Lokhttp3/y;->bqq:Ljava/net/Proxy;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bvI:Lokhttp3/a;
 
     invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -115,36 +115,36 @@
 
     :cond_1
     :goto_0
-    iget-object v0, v1, Lokhttp3/a;->bpS:Ljavax/net/SocketFactory;
+    iget-object v0, v1, Lokhttp3/a;->bqm:Ljavax/net/SocketFactory;
 
     invoke-virtual {v0}, Ljavax/net/SocketFactory;->createSocket()Ljava/net/Socket;
 
     move-result-object v1
 
     :goto_1
-    iput-object v1, p0, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iput-object v1, p0, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
     invoke-virtual {v0, p2}, Ljava/net/Socket;->setSoTimeout(I)V
 
     :try_start_0
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object p2
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bvp:Ljava/net/InetSocketAddress;
+    iget-object v1, v1, Lokhttp3/y;->bvJ:Ljava/net/InetSocketAddress;
 
     invoke-virtual {p2, v0, v1, p1}, Lokhttp3/internal/g/f;->a(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
-    iget-object p1, p0, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
     invoke-static {p1}, Lokio/j;->c(Ljava/net/Socket;)Lokio/r;
 
@@ -154,9 +154,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/internal/b/c;->nJ:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->nI:Lokio/d;
 
-    iget-object p1, p0, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
     invoke-static {p1}, Lokio/j;->b(Ljava/net/Socket;)Lokio/q;
 
@@ -166,7 +166,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/internal/b/c;->bwA:Lokio/BufferedSink;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->bwU:Lokio/BufferedSink;
     :try_end_1
     .catch Ljava/lang/NullPointerException; {:try_start_1 .. :try_end_1} :catch_0
 
@@ -207,9 +207,9 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bvp:Ljava/net/InetSocketAddress;
+    iget-object v1, v1, Lokhttp3/y;->bvJ:Ljava/net/InetSocketAddress;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -224,7 +224,7 @@
     throw p2
 .end method
 
-.method private dB(I)V
+.method private dy(I)V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -232,7 +232,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
 
     const/4 v1, 0x0
 
@@ -242,55 +242,55 @@
 
     invoke-direct {v0}, Lokhttp3/internal/e/g$a;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
 
-    iget-object v2, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v2, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v2, v2, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v2, v2, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v2, v2, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v2, v2, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v2, v2, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v2, v2, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iget-object v3, p0, Lokhttp3/internal/b/c;->nJ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/b/c;->nI:Lokio/d;
 
-    iget-object v4, p0, Lokhttp3/internal/b/c;->bwA:Lokio/BufferedSink;
+    iget-object v4, p0, Lokhttp3/internal/b/c;->bwU:Lokio/BufferedSink;
 
     invoke-virtual {v0, v1, v2, v3, v4}, Lokhttp3/internal/e/g$a;->a(Ljava/net/Socket;Ljava/lang/String;Lokio/d;Lokio/BufferedSink;)Lokhttp3/internal/e/g$a;
 
     move-result-object v0
 
-    iput-object p0, v0, Lokhttp3/internal/e/g$a;->byl:Lokhttp3/internal/e/g$b;
+    iput-object p0, v0, Lokhttp3/internal/e/g$a;->byF:Lokhttp3/internal/e/g$b;
 
-    iput p1, v0, Lokhttp3/internal/e/g$a;->byI:I
+    iput p1, v0, Lokhttp3/internal/e/g$a;->bzc:I
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/g$a;->HK()Lokhttp3/internal/e/g;
+    invoke-virtual {v0}, Lokhttp3/internal/e/g$a;->Hx()Lokhttp3/internal/e/g;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/internal/b/c;->bwz:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->bwT:Lokhttp3/internal/e/g;
 
-    iget-object p1, p0, Lokhttp3/internal/b/c;->bwz:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->bwT:Lokhttp3/internal/e/g;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/g;->HI()V
+    invoke-virtual {p1}, Lokhttp3/internal/e/g;->Hv()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Gs()Lokhttp3/u;
+.method public final Gh()Lokhttp3/u;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bvc:Lokhttp3/u;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bvw:Lokhttp3/u;
 
     return-object v0
 .end method
 
-.method public final Ho()Z
+.method public final Hb()Z
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bwz:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwT:Lokhttp3/internal/e/g;
 
     if-eqz v0, :cond_0
 
@@ -304,6 +304,121 @@
     return v0
 .end method
 
+.method public final Z(Z)Z
+    .locals 4
+
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
+
+    invoke-virtual {v0}, Ljava/net/Socket;->isClosed()Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_5
+
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
+
+    invoke-virtual {v0}, Ljava/net/Socket;->isInputShutdown()Z
+
+    move-result v0
+
+    if-nez v0, :cond_5
+
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
+
+    invoke-virtual {v0}, Ljava/net/Socket;->isOutputShutdown()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwT:Lokhttp3/internal/e/g;
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->isShutdown()Z
+
+    move-result p1
+
+    if-nez p1, :cond_1
+
+    return v2
+
+    :cond_1
+    return v1
+
+    :cond_2
+    if-eqz p1, :cond_4
+
+    :try_start_0
+    iget-object p1, p0, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
+
+    invoke-virtual {p1}, Ljava/net/Socket;->getSoTimeout()I
+
+    move-result p1
+    :try_end_0
+    .catch Ljava/net/SocketTimeoutException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :try_start_1
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
+
+    invoke-virtual {v0, v2}, Ljava/net/Socket;->setSoTimeout(I)V
+
+    iget-object v0, p0, Lokhttp3/internal/b/c;->nI:Lokio/d;
+
+    invoke-interface {v0}, Lokio/d;->Ih()Z
+
+    move-result v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-eqz v0, :cond_3
+
+    :try_start_2
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
+
+    invoke-virtual {v0, p1}, Ljava/net/Socket;->setSoTimeout(I)V
+
+    return v1
+
+    :cond_3
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
+
+    invoke-virtual {v0, p1}, Ljava/net/Socket;->setSoTimeout(I)V
+
+    return v2
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v3, p0, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
+
+    invoke-virtual {v3, p1}, Ljava/net/Socket;->setSoTimeout(I)V
+
+    throw v0
+    :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
+
+    :catch_0
+    return v1
+
+    :catch_1
+    :cond_4
+    return v2
+
+    :cond_5
+    :goto_0
+    return v1
+.end method
+
 .method public final a(IIIIZLokhttp3/e;Lokhttp3/p;)V
     .locals 16
 
@@ -311,29 +426,29 @@
 
     move/from16 v2, p4
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bvc:Lokhttp3/u;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bvw:Lokhttp3/u;
 
     if-nez v0, :cond_1c
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bpV:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/a;->bqp:Ljava/util/List;
 
     new-instance v3, Lokhttp3/internal/b/b;
 
     invoke-direct {v3, v0}, Lokhttp3/internal/b/b;-><init>(Ljava/util/List;)V
 
-    iget-object v4, v1, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v4, v1, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v4, v4, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v4, v4, Lokhttp3/y;->bvI:Lokhttp3/a;
 
     iget-object v4, v4, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     if-nez v4, :cond_2
 
-    sget-object v4, Lokhttp3/k;->bsX:Lokhttp3/k;
+    sget-object v4, Lokhttp3/k;->btr:Lokhttp3/k;
 
     invoke-interface {v0, v4}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -341,15 +456,15 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v4
 
@@ -402,13 +517,13 @@
     throw v0
 
     :cond_2
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bpU:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/a;->bqo:Ljava/util/List;
 
-    sget-object v4, Lokhttp3/u;->buG:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->bva:Lokhttp3/u;
 
     invoke-interface {v0, v4}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -427,9 +542,9 @@
     const/4 v7, 0x1
 
     :try_start_0
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    invoke-virtual {v0}, Lokhttp3/y;->Hh()Z
+    invoke-virtual {v0}, Lokhttp3/y;->GU()Z
 
     move-result v0
 
@@ -439,11 +554,11 @@
 
     invoke-direct {v0}, Lokhttp3/w$a;-><init>()V
 
-    iget-object v8, v1, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v8, v8, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v8, v8, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v8, v8, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v8, v8, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     invoke-virtual {v0, v8}, Lokhttp3/w$a;->b(Lokhttp3/s;)Lokhttp3/w$a;
 
@@ -457,11 +572,11 @@
 
     const-string v8, "Host"
 
-    iget-object v9, v1, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v9, v1, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v9, v9, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v9, v9, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v9, v9, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v9, v9, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     invoke-static {v9, v7}, Lokhttp3/internal/c;->a(Lokhttp3/s;Z)Ljava/lang/String;
 
@@ -487,7 +602,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object v0
 
@@ -495,11 +610,11 @@
 
     invoke-direct {v8}, Lokhttp3/Response$a;-><init>()V
 
-    iput-object v0, v8, Lokhttp3/Response$a;->bvb:Lokhttp3/w;
+    iput-object v0, v8, Lokhttp3/Response$a;->bvv:Lokhttp3/w;
 
-    sget-object v9, Lokhttp3/u;->buD:Lokhttp3/u;
+    sget-object v9, Lokhttp3/u;->buX:Lokhttp3/u;
 
-    iput-object v9, v8, Lokhttp3/Response$a;->bvc:Lokhttp3/u;
+    iput-object v9, v8, Lokhttp3/Response$a;->bvw:Lokhttp3/u;
 
     const/16 v9, 0x197
 
@@ -509,29 +624,29 @@
 
     iput-object v10, v8, Lokhttp3/Response$a;->message:Ljava/lang/String;
 
-    sget-object v10, Lokhttp3/internal/c;->bvy:Lokhttp3/x;
+    sget-object v10, Lokhttp3/internal/c;->bvS:Lokhttp3/x;
 
-    iput-object v10, v8, Lokhttp3/Response$a;->bve:Lokhttp3/x;
+    iput-object v10, v8, Lokhttp3/Response$a;->bvy:Lokhttp3/x;
 
     const-wide/16 v10, -0x1
 
-    iput-wide v10, v8, Lokhttp3/Response$a;->bvi:J
+    iput-wide v10, v8, Lokhttp3/Response$a;->bvC:J
 
-    iput-wide v10, v8, Lokhttp3/Response$a;->bvj:J
+    iput-wide v10, v8, Lokhttp3/Response$a;->bvD:J
 
     const-string v12, "Proxy-Authenticate"
 
     const-string v13, "OkHttp-Preemptive"
 
-    iget-object v14, v8, Lokhttp3/Response$a;->buU:Lokhttp3/Headers$a;
+    iget-object v14, v8, Lokhttp3/Response$a;->bvo:Lokhttp3/Headers$a;
 
     invoke-virtual {v14, v12, v13}, Lokhttp3/Headers$a;->am(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
-    invoke-virtual {v8}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {v8}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
-    iget-object v8, v0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v8, v0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
-    invoke-direct/range {p0 .. p2}, Lokhttp3/internal/b/c;->ab(II)V
+    invoke-direct/range {p0 .. p2}, Lokhttp3/internal/b/c;->aa(II)V
 
     new-instance v12, Ljava/lang/StringBuilder;
 
@@ -555,13 +670,13 @@
 
     new-instance v12, Lokhttp3/internal/d/a;
 
-    iget-object v13, v1, Lokhttp3/internal/b/c;->nJ:Lokio/d;
+    iget-object v13, v1, Lokhttp3/internal/b/c;->nI:Lokio/d;
 
-    iget-object v14, v1, Lokhttp3/internal/b/c;->bwA:Lokio/BufferedSink;
+    iget-object v14, v1, Lokhttp3/internal/b/c;->bwU:Lokio/BufferedSink;
 
     invoke-direct {v12, v4, v4, v13, v14}, Lokhttp3/internal/d/a;-><init>(Lokhttp3/t;Lokhttp3/internal/b/g;Lokio/d;Lokio/BufferedSink;)V
 
-    iget-object v13, v1, Lokhttp3/internal/b/c;->nJ:Lokio/d;
+    iget-object v13, v1, Lokhttp3/internal/b/c;->nI:Lokio/d;
 
     invoke-interface {v13}, Lokio/d;->timeout()Lokio/s;
 
@@ -580,7 +695,7 @@
 
     invoke-virtual {v13, v4, v5, v15}, Lokio/s;->d(JLjava/util/concurrent/TimeUnit;)Lokio/s;
 
-    iget-object v4, v1, Lokhttp3/internal/b/c;->bwA:Lokio/BufferedSink;
+    iget-object v4, v1, Lokhttp3/internal/b/c;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v4}, Lokio/BufferedSink;->timeout()Lokio/s;
 
@@ -597,19 +712,19 @@
 
     invoke-virtual {v4, v9, v10, v11}, Lokio/s;->d(JLjava/util/concurrent/TimeUnit;)Lokio/s;
 
-    iget-object v4, v0, Lokhttp3/w;->buj:Lokhttp3/Headers;
+    iget-object v4, v0, Lokhttp3/w;->buD:Lokhttp3/Headers;
 
     invoke-virtual {v12, v4, v8}, Lokhttp3/internal/d/a;->a(Lokhttp3/Headers;Ljava/lang/String;)V
 
-    invoke-virtual {v12}, Lokhttp3/internal/d/a;->Hx()V
+    invoke-virtual {v12}, Lokhttp3/internal/d/a;->Hk()V
 
-    invoke-virtual {v12, v6}, Lokhttp3/internal/d/a;->ad(Z)Lokhttp3/Response$a;
+    invoke-virtual {v12, v6}, Lokhttp3/internal/d/a;->aa(Z)Lokhttp3/Response$a;
 
     move-result-object v4
 
-    iput-object v0, v4, Lokhttp3/Response$a;->bvb:Lokhttp3/w;
+    iput-object v0, v4, Lokhttp3/Response$a;->bvv:Lokhttp3/w;
 
-    invoke-virtual {v4}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {v4}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -678,31 +793,31 @@
     throw v0
 
     :cond_5
-    iget-object v0, v1, Lokhttp3/internal/b/c;->nJ:Lokio/d;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Ir()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Ie()Lokio/c;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/c;->Iu()Z
+    invoke-virtual {v0}, Lokio/c;->Ih()Z
 
     move-result v0
 
     if-eqz v0, :cond_6
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bwA:Lokio/BufferedSink;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwU:Lokio/BufferedSink;
 
-    invoke-interface {v0}, Lokio/BufferedSink;->Ir()Lokio/c;
+    invoke-interface {v0}, Lokio/BufferedSink;->Ie()Lokio/c;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/c;->Iu()Z
+    invoke-virtual {v0}, Lokio/c;->Ih()Z
 
     move-result v0
 
     if-eqz v0, :cond_6
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
     if-nez v0, :cond_8
 
@@ -729,24 +844,24 @@
 
     move/from16 v5, p3
 
-    invoke-direct/range {p0 .. p2}, Lokhttp3/internal/b/c;->ab(II)V
+    invoke-direct/range {p0 .. p2}, Lokhttp3/internal/b/c;->aa(II)V
 
     :cond_8
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bvI:Lokhttp3/a;
 
     iget-object v0, v0, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     if-nez v0, :cond_a
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bpU:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/a;->bqo:Ljava/util/List;
 
-    sget-object v4, Lokhttp3/u;->buG:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->bva:Lokhttp3/u;
 
     invoke-interface {v0, v4}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -754,46 +869,46 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
 
-    sget-object v0, Lokhttp3/u;->buG:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bva:Lokhttp3/u;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->bvc:Lokhttp3/u;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bvw:Lokhttp3/u;
 
-    invoke-direct {v1, v2}, Lokhttp3/internal/b/c;->dB(I)V
+    invoke-direct {v1, v2}, Lokhttp3/internal/b/c;->dy(I)V
 
     goto/16 :goto_4
 
     :cond_9
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
 
-    sget-object v0, Lokhttp3/u;->buD:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->buX:Lokhttp3/u;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->bvc:Lokhttp3/u;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bvw:Lokhttp3/u;
 
     goto/16 :goto_4
 
     :cond_a
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bvI:Lokhttp3/a;
 
     iget-object v4, v0, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
     :try_end_2
     .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_3
 
     :try_start_3
-    iget-object v8, v1, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
-    iget-object v9, v0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v9, v0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v9, v9, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v9, v9, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iget-object v10, v0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v10, v0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     iget v10, v10, Lokhttp3/s;->port:I
 
@@ -811,19 +926,19 @@
 
     move-result-object v8
 
-    iget-boolean v9, v8, Lokhttp3/k;->bsZ:Z
+    iget-boolean v9, v8, Lokhttp3/k;->btt:Z
 
     if-eqz v9, :cond_b
 
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v9
 
-    iget-object v10, v0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v10, v0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v10, v10, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v10, v10, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iget-object v11, v0, Lokhttp3/a;->bpU:Ljava/util/List;
+    iget-object v11, v0, Lokhttp3/a;->bqo:Ljava/util/List;
 
     invoke-virtual {v9, v4, v10, v11}, Lokhttp3/internal/g/f;->a(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
 
@@ -840,9 +955,9 @@
 
     iget-object v11, v0, Lokhttp3/a;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v12, v0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v12, v0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v12, v12, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v12, v12, Lokhttp3/s;->bud:Ljava/lang/String;
 
     invoke-interface {v11, v12, v9}, Ljavax/net/ssl/HostnameVerifier;->verify(Ljava/lang/String;Ljavax/net/ssl/SSLSession;)Z
 
@@ -850,21 +965,21 @@
 
     if-eqz v9, :cond_13
 
-    iget-object v9, v0, Lokhttp3/a;->bpX:Lokhttp3/g;
+    iget-object v9, v0, Lokhttp3/a;->bqr:Lokhttp3/g;
 
-    iget-object v0, v0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iget-object v11, v10, Lokhttp3/r;->btD:Ljava/util/List;
+    iget-object v11, v10, Lokhttp3/r;->btX:Ljava/util/List;
 
     invoke-virtual {v9, v0, v11}, Lokhttp3/g;->d(Ljava/lang/String;Ljava/util/List;)V
 
-    iget-boolean v0, v8, Lokhttp3/k;->bsZ:Z
+    iget-boolean v0, v8, Lokhttp3/k;->btt:Z
 
     if-eqz v0, :cond_c
 
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -878,9 +993,9 @@
     const/4 v0, 0x0
 
     :goto_2
-    iput-object v4, v1, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
 
-    iget-object v8, v1, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
 
     invoke-static {v8}, Lokio/j;->c(Ljava/net/Socket;)Lokio/r;
 
@@ -890,9 +1005,9 @@
 
     move-result-object v8
 
-    iput-object v8, v1, Lokhttp3/internal/b/c;->nJ:Lokio/d;
+    iput-object v8, v1, Lokhttp3/internal/b/c;->nI:Lokio/d;
 
-    iget-object v8, v1, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
 
     invoke-static {v8}, Lokio/j;->b(Ljava/net/Socket;)Lokio/q;
 
@@ -902,23 +1017,23 @@
 
     move-result-object v8
 
-    iput-object v8, v1, Lokhttp3/internal/b/c;->bwA:Lokio/BufferedSink;
+    iput-object v8, v1, Lokhttp3/internal/b/c;->bwU:Lokio/BufferedSink;
 
-    iput-object v10, v1, Lokhttp3/internal/b/c;->bvd:Lokhttp3/r;
+    iput-object v10, v1, Lokhttp3/internal/b/c;->bvx:Lokhttp3/r;
 
     if-eqz v0, :cond_d
 
-    invoke-static {v0}, Lokhttp3/u;->ep(Ljava/lang/String;)Lokhttp3/u;
+    invoke-static {v0}, Lokhttp3/u;->ej(Ljava/lang/String;)Lokhttp3/u;
 
     move-result-object v0
 
     goto :goto_3
 
     :cond_d
-    sget-object v0, Lokhttp3/u;->buD:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->buX:Lokhttp3/u;
 
     :goto_3
-    iput-object v0, v1, Lokhttp3/internal/b/c;->bvc:Lokhttp3/u;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bvw:Lokhttp3/u;
     :try_end_4
     .catch Ljava/lang/AssertionError; {:try_start_4 .. :try_end_4} :catch_1
     .catchall {:try_start_4 .. :try_end_4} :catchall_2
@@ -926,34 +1041,34 @@
     if-eqz v4, :cond_e
 
     :try_start_5
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
     invoke-virtual {v0, v4}, Lokhttp3/internal/g/f;->f(Ljavax/net/ssl/SSLSocket;)V
 
     :cond_e
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bvc:Lokhttp3/u;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bvw:Lokhttp3/u;
 
-    sget-object v4, Lokhttp3/u;->buF:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->buZ:Lokhttp3/u;
 
     if-ne v0, v4, :cond_f
 
-    invoke-direct {v1, v2}, Lokhttp3/internal/b/c;->dB(I)V
+    invoke-direct {v1, v2}, Lokhttp3/internal/b/c;->dy(I)V
     :try_end_5
     .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_3
 
     :cond_f
     :goto_4
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    invoke-virtual {v0}, Lokhttp3/y;->Hh()Z
+    invoke-virtual {v0}, Lokhttp3/y;->GU()Z
 
     move-result v0
 
     if-eqz v0, :cond_11
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
     if-eqz v0, :cond_10
 
@@ -974,22 +1089,22 @@
 
     :cond_11
     :goto_5
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bwz:Lokhttp3/internal/e/g;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwT:Lokhttp3/internal/e/g;
 
     if-eqz v0, :cond_12
 
-    iget-object v2, v1, Lokhttp3/internal/b/c;->but:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/internal/b/c;->buN:Lokhttp3/j;
 
     monitor-enter v2
 
     :try_start_6
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bwz:Lokhttp3/internal/e/g;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bwT:Lokhttp3/internal/e/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/g;->HG()I
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Ht()I
 
     move-result v0
 
-    iput v0, v1, Lokhttp3/internal/b/c;->bwD:I
+    iput v0, v1, Lokhttp3/internal/b/c;->bwX:I
 
     monitor-exit v2
 
@@ -1009,7 +1124,7 @@
 
     :cond_13
     :try_start_7
-    iget-object v8, v10, Lokhttp3/r;->btD:Ljava/util/List;
+    iget-object v8, v10, Lokhttp3/r;->btX:Ljava/util/List;
 
     invoke-interface {v8, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1025,9 +1140,9 @@
 
     invoke-direct {v10, v11}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, v0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->bud:Ljava/lang/String;
 
     invoke-virtual {v10, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1119,7 +1234,7 @@
     if-eqz v4, :cond_15
 
     :try_start_9
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v8
 
@@ -1148,29 +1263,29 @@
     move/from16 v5, p3
 
     :goto_9
-    iget-object v4, v1, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
+    iget-object v4, v1, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
 
     invoke-static {v4}, Lokhttp3/internal/c;->a(Ljava/net/Socket;)V
 
-    iget-object v4, v1, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iget-object v4, v1, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
     invoke-static {v4}, Lokhttp3/internal/c;->a(Ljava/net/Socket;)V
 
     const/4 v4, 0x0
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->nJ:Lokio/d;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->nI:Lokio/d;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->bwA:Lokio/BufferedSink;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bwU:Lokio/BufferedSink;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->bvd:Lokhttp3/r;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bvx:Lokhttp3/r;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->bvc:Lokhttp3/u;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bvw:Lokhttp3/u;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->bwz:Lokhttp3/internal/e/g;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bwT:Lokhttp3/internal/e/g;
 
     if-nez p7, :cond_16
 
@@ -1192,9 +1307,9 @@
     :goto_a
     if-eqz p5, :cond_1a
 
-    iput-boolean v7, v3, Lokhttp3/internal/b/b;->bwv:Z
+    iput-boolean v7, v3, Lokhttp3/internal/b/b;->bwP:Z
 
-    iget-boolean v9, v3, Lokhttp3/internal/b/b;->bwu:Z
+    iget-boolean v9, v3, Lokhttp3/internal/b/b;->bwO:Z
 
     if-eqz v9, :cond_19
 
@@ -1278,16 +1393,16 @@
 .method public final a(Lokhttp3/internal/e/g;)V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->but:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->buN:Lokhttp3/j;
 
     monitor-enter v0
 
     :try_start_0
-    invoke-virtual {p1}, Lokhttp3/internal/e/g;->HG()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/g;->Ht()I
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/internal/b/c;->bwD:I
+    iput p1, p0, Lokhttp3/internal/b/c;->bwX:I
 
     monitor-exit v0
 
@@ -1311,7 +1426,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/e/b;->bxu:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->bxO:Lokhttp3/internal/e/b;
 
     invoke-virtual {p1, v0}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/b;)V
 
@@ -1325,30 +1440,30 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bwE:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwY:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
 
-    iget v1, p0, Lokhttp3/internal/b/c;->bwD:I
+    iget v1, p0, Lokhttp3/internal/b/c;->bwX:I
 
     const/4 v2, 0x0
 
     if-ge v0, v1, :cond_a
 
-    iget-boolean v0, p0, Lokhttp3/internal/b/c;->bwB:Z
+    iget-boolean v0, p0, Lokhttp3/internal/b/c;->bwV:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bvI:Lokhttp3/a;
 
     invoke-virtual {v0, v1, p1}, Lokhttp3/internal/a;->a(Lokhttp3/a;Lokhttp3/a;)Z
 
@@ -1359,17 +1474,17 @@
     return v2
 
     :cond_1
-    iget-object v0, p1, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->bud:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1382,7 +1497,7 @@
     return v1
 
     :cond_2
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bwz:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwT:Lokhttp3/internal/e/g;
 
     if-nez v0, :cond_3
 
@@ -1394,7 +1509,7 @@
     return v2
 
     :cond_4
-    iget-object v0, p2, Lokhttp3/y;->bpW:Ljava/net/Proxy;
+    iget-object v0, p2, Lokhttp3/y;->bqq:Ljava/net/Proxy;
 
     invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -1407,9 +1522,9 @@
     return v2
 
     :cond_5
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bpW:Ljava/net/Proxy;
+    iget-object v0, v0, Lokhttp3/y;->bqq:Ljava/net/Proxy;
 
     invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -1422,11 +1537,11 @@
     return v2
 
     :cond_6
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bvp:Ljava/net/InetSocketAddress;
+    iget-object v0, v0, Lokhttp3/y;->bvJ:Ljava/net/InetSocketAddress;
 
-    iget-object v3, p2, Lokhttp3/y;->bvp:Ljava/net/InetSocketAddress;
+    iget-object v3, p2, Lokhttp3/y;->bvJ:Ljava/net/InetSocketAddress;
 
     invoke-virtual {v0, v3}, Ljava/net/InetSocketAddress;->equals(Ljava/lang/Object;)Z
 
@@ -1437,18 +1552,18 @@
     return v2
 
     :cond_7
-    iget-object p2, p2, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object p2, p2, Lokhttp3/y;->bvI:Lokhttp3/a;
 
     iget-object p2, p2, Lokhttp3/a;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
-    sget-object v0, Lokhttp3/internal/i/d;->bAe:Lokhttp3/internal/i/d;
+    sget-object v0, Lokhttp3/internal/i/d;->bAy:Lokhttp3/internal/i/d;
 
     if-eq p2, v0, :cond_8
 
     return v2
 
     :cond_8
-    iget-object p2, p1, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object p2, p1, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     invoke-virtual {p0, p2}, Lokhttp3/internal/b/c;->c(Lokhttp3/s;)Z
 
@@ -1460,15 +1575,15 @@
 
     :cond_9
     :try_start_0
-    iget-object p2, p1, Lokhttp3/a;->bpX:Lokhttp3/g;
+    iget-object p2, p1, Lokhttp3/a;->bqr:Lokhttp3/g;
 
-    iget-object p1, p1, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object p1, p1, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bvd:Lokhttp3/r;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bvx:Lokhttp3/r;
 
-    iget-object v0, v0, Lokhttp3/r;->btD:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/r;->btX:Ljava/util/List;
 
     invoke-virtual {p2, p1, v0}, Lokhttp3/g;->d(Ljava/lang/String;Ljava/util/List;)V
     :try_end_0
@@ -1482,131 +1597,16 @@
     return v2
 .end method
 
-.method public final ac(Z)Z
-    .locals 4
-
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
-
-    invoke-virtual {v0}, Ljava/net/Socket;->isClosed()Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_5
-
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
-
-    invoke-virtual {v0}, Ljava/net/Socket;->isInputShutdown()Z
-
-    move-result v0
-
-    if-nez v0, :cond_5
-
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
-
-    invoke-virtual {v0}, Ljava/net/Socket;->isOutputShutdown()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bwz:Lokhttp3/internal/e/g;
-
-    const/4 v2, 0x1
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {v0}, Lokhttp3/internal/e/g;->isShutdown()Z
-
-    move-result p1
-
-    if-nez p1, :cond_1
-
-    return v2
-
-    :cond_1
-    return v1
-
-    :cond_2
-    if-eqz p1, :cond_4
-
-    :try_start_0
-    iget-object p1, p0, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
-
-    invoke-virtual {p1}, Ljava/net/Socket;->getSoTimeout()I
-
-    move-result p1
-    :try_end_0
-    .catch Ljava/net/SocketTimeoutException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :try_start_1
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
-
-    invoke-virtual {v0, v2}, Ljava/net/Socket;->setSoTimeout(I)V
-
-    iget-object v0, p0, Lokhttp3/internal/b/c;->nJ:Lokio/d;
-
-    invoke-interface {v0}, Lokio/d;->Iu()Z
-
-    move-result v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-eqz v0, :cond_3
-
-    :try_start_2
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
-
-    invoke-virtual {v0, p1}, Ljava/net/Socket;->setSoTimeout(I)V
-
-    return v1
-
-    :cond_3
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
-
-    invoke-virtual {v0, p1}, Ljava/net/Socket;->setSoTimeout(I)V
-
-    return v2
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v3, p0, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
-
-    invoke-virtual {v3, p1}, Ljava/net/Socket;->setSoTimeout(I)V
-
-    throw v0
-    :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
-
-    :catch_0
-    return v1
-
-    :catch_1
-    :cond_4
-    return v2
-
-    :cond_5
-    :goto_0
-    return v1
-.end method
-
 .method public final c(Lokhttp3/s;)Z
     .locals 4
 
     iget v0, p1, Lokhttp3/s;->port:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     iget v1, v1, Lokhttp3/s;->port:I
 
@@ -1617,15 +1617,15 @@
     return v2
 
     :cond_0
-    iget-object v0, p1, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->bud:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1635,17 +1635,17 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bvd:Lokhttp3/r;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bvx:Lokhttp3/r;
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lokhttp3/internal/i/d;->bAe:Lokhttp3/internal/i/d;
+    sget-object v0, Lokhttp3/internal/i/d;->bAy:Lokhttp3/internal/i/d;
 
-    iget-object p1, p1, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iget-object v3, p0, Lokhttp3/internal/b/c;->bvd:Lokhttp3/r;
+    iget-object v3, p0, Lokhttp3/internal/b/c;->bvx:Lokhttp3/r;
 
-    iget-object v3, v3, Lokhttp3/r;->btD:Ljava/util/List;
+    iget-object v3, v3, Lokhttp3/r;->btX:Ljava/util/List;
 
     invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1677,13 +1677,13 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->bud:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1691,11 +1691,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     iget v1, v1, Lokhttp3/s;->port:I
 
@@ -1705,9 +1705,9 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bpW:Ljava/net/Proxy;
+    iget-object v1, v1, Lokhttp3/y;->bqq:Ljava/net/Proxy;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1715,9 +1715,9 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bvp:Ljava/net/InetSocketAddress;
+    iget-object v1, v1, Lokhttp3/y;->bvJ:Ljava/net/InetSocketAddress;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1725,11 +1725,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bvd:Lokhttp3/r;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bvx:Lokhttp3/r;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v1, Lokhttp3/r;->btC:Lokhttp3/h;
+    iget-object v1, v1, Lokhttp3/r;->btW:Lokhttp3/h;
 
     goto :goto_0
 
@@ -1743,7 +1743,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->bvc:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bvw:Lokhttp3/u;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/okhttp3/internal/c.smali b/com.discord/smali/okhttp3/internal/c.smali
index 0aeb1cb8d3..2ff09c5c53 100644
--- a/com.discord/smali/okhttp3/internal/c.smali
+++ b/com.discord/smali/okhttp3/internal/c.smali
@@ -10,7 +10,7 @@
 
 .field public static final UTF_8:Ljava/nio/charset/Charset;
 
-.field public static final aXt:Ljava/util/Comparator;
+.field public static final aXL:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -20,35 +20,35 @@
     .end annotation
 .end field
 
-.field private static final bvA:Lokio/ByteString;
+.field public static final bvR:[B
 
-.field private static final bvB:Lokio/ByteString;
+.field public static final bvS:Lokhttp3/x;
 
-.field private static final bvC:Lokio/ByteString;
+.field public static final bvT:Lokhttp3/RequestBody;
 
-.field private static final bvD:Lokio/ByteString;
+.field private static final bvU:Lokio/ByteString;
 
-.field private static final bvE:Lokio/ByteString;
+.field private static final bvV:Lokio/ByteString;
 
-.field private static final bvF:Ljava/nio/charset/Charset;
+.field private static final bvW:Lokio/ByteString;
 
-.field private static final bvG:Ljava/nio/charset/Charset;
+.field private static final bvX:Lokio/ByteString;
 
-.field private static final bvH:Ljava/nio/charset/Charset;
+.field private static final bvY:Lokio/ByteString;
 
-.field private static final bvI:Ljava/nio/charset/Charset;
+.field private static final bvZ:Ljava/nio/charset/Charset;
 
-.field public static final bvJ:Ljava/util/TimeZone;
+.field private static final bwa:Ljava/nio/charset/Charset;
 
-.field private static final bvK:Ljava/lang/reflect/Method;
+.field private static final bwb:Ljava/nio/charset/Charset;
 
-.field private static final bvL:Ljava/util/regex/Pattern;
+.field private static final bwc:Ljava/nio/charset/Charset;
 
-.field public static final bvx:[B
+.field public static final bwd:Ljava/util/TimeZone;
 
-.field public static final bvy:Lokhttp3/x;
+.field private static final bwe:Ljava/lang/reflect/Method;
 
-.field public static final bvz:Lokhttp3/RequestBody;
+.field private static final bwf:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -59,21 +59,21 @@
 
     new-array v1, v0, [B
 
-    sput-object v1, Lokhttp3/internal/c;->bvx:[B
+    sput-object v1, Lokhttp3/internal/c;->bvR:[B
 
     new-array v1, v0, [Ljava/lang/String;
 
     sput-object v1, Lokhttp3/internal/c;->EMPTY_STRING_ARRAY:[Ljava/lang/String;
 
-    sget-object v1, Lokhttp3/internal/c;->bvx:[B
+    sget-object v1, Lokhttp3/internal/c;->bvR:[B
 
     invoke-static {v1}, Lokhttp3/x;->B([B)Lokhttp3/x;
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bvy:Lokhttp3/x;
+    sput-object v1, Lokhttp3/internal/c;->bvS:Lokhttp3/x;
 
-    sget-object v1, Lokhttp3/internal/c;->bvx:[B
+    sget-object v1, Lokhttp3/internal/c;->bvR:[B
 
     const/4 v2, 0x0
 
@@ -81,47 +81,47 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bvz:Lokhttp3/RequestBody;
+    sput-object v1, Lokhttp3/internal/c;->bvT:Lokhttp3/RequestBody;
 
     const-string v1, "efbbbf"
 
-    invoke-static {v1}, Lokio/ByteString;->eM(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v1}, Lokio/ByteString;->eH(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bvA:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->bvU:Lokio/ByteString;
 
     const-string v1, "feff"
 
-    invoke-static {v1}, Lokio/ByteString;->eM(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v1}, Lokio/ByteString;->eH(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bvB:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->bvV:Lokio/ByteString;
 
     const-string v1, "fffe"
 
-    invoke-static {v1}, Lokio/ByteString;->eM(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v1}, Lokio/ByteString;->eH(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bvC:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->bvW:Lokio/ByteString;
 
     const-string v1, "0000ffff"
 
-    invoke-static {v1}, Lokio/ByteString;->eM(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v1}, Lokio/ByteString;->eH(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bvD:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->bvX:Lokio/ByteString;
 
     const-string v1, "ffff0000"
 
-    invoke-static {v1}, Lokio/ByteString;->eM(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v1}, Lokio/ByteString;->eH(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bvE:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->bvY:Lokio/ByteString;
 
     const-string v1, "UTF-8"
 
@@ -145,7 +145,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bvF:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->bvZ:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-16LE"
 
@@ -153,7 +153,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bvG:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->bwa:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-32BE"
 
@@ -161,7 +161,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bvH:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->bwb:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-32LE"
 
@@ -169,7 +169,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bvI:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->bwc:Ljava/nio/charset/Charset;
 
     const-string v1, "GMT"
 
@@ -177,13 +177,13 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bvJ:Ljava/util/TimeZone;
+    sput-object v1, Lokhttp3/internal/c;->bwd:Ljava/util/TimeZone;
 
     new-instance v1, Lokhttp3/internal/c$1;
 
     invoke-direct {v1}, Lokhttp3/internal/c$1;-><init>()V
 
-    sput-object v1, Lokhttp3/internal/c;->aXt:Ljava/util/Comparator;
+    sput-object v1, Lokhttp3/internal/c;->aXL:Ljava/util/Comparator;
 
     :try_start_0
     const-class v1, Ljava/lang/Throwable;
@@ -205,7 +205,7 @@
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
-    sput-object v2, Lokhttp3/internal/c;->bvK:Ljava/lang/reflect/Method;
+    sput-object v2, Lokhttp3/internal/c;->bwe:Ljava/lang/reflect/Method;
 
     const-string v0, "([0-9a-fA-F]*:[0-9a-fA-F:.]*)|([\\d.]+)"
 
@@ -213,12 +213,12 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/c;->bvL:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/internal/c;->bwf:Ljava/util/regex/Pattern;
 
     return-void
 .end method
 
-.method public static Hi()Ljavax/net/ssl/X509TrustManager;
+.method public static GV()Ljavax/net/ssl/X509TrustManager;
     .locals 4
 
     :try_start_0
@@ -518,7 +518,7 @@
 .method public static a(Lokhttp3/s;Z)Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->bud:Ljava/lang/String;
 
     const-string v1, ":"
 
@@ -534,7 +534,7 @@
 
     invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->bud:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -549,16 +549,16 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->bud:Ljava/lang/String;
 
     :goto_0
     if-nez p1, :cond_2
 
     iget p1, p0, Lokhttp3/s;->port:I
 
-    iget-object v2, p0, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->buc:Ljava/lang/String;
 
-    invoke-static {v2}, Lokhttp3/s;->eg(Ljava/lang/String;)I
+    invoke-static {v2}, Lokhttp3/s;->ea(Ljava/lang/String;)I
 
     move-result v2
 
@@ -598,7 +598,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/c;->bvA:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->bvU:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->l(Lokio/ByteString;)Z
 
@@ -606,7 +606,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lokhttp3/internal/c;->bvA:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->bvU:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -621,7 +621,7 @@
     return-object p0
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/c;->bvB:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->bvV:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->l(Lokio/ByteString;)Z
 
@@ -629,7 +629,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object p1, Lokhttp3/internal/c;->bvB:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->bvV:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -639,12 +639,12 @@
 
     invoke-interface {p0, v0, v1}, Lokio/d;->aN(J)V
 
-    sget-object p0, Lokhttp3/internal/c;->bvF:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->bvZ:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_1
-    sget-object v0, Lokhttp3/internal/c;->bvC:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->bvW:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->l(Lokio/ByteString;)Z
 
@@ -652,7 +652,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p1, Lokhttp3/internal/c;->bvC:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->bvW:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -662,12 +662,12 @@
 
     invoke-interface {p0, v0, v1}, Lokio/d;->aN(J)V
 
-    sget-object p0, Lokhttp3/internal/c;->bvG:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->bwa:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lokhttp3/internal/c;->bvD:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->bvX:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->l(Lokio/ByteString;)Z
 
@@ -675,7 +675,7 @@
 
     if-eqz v0, :cond_3
 
-    sget-object p1, Lokhttp3/internal/c;->bvD:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->bvX:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -685,12 +685,12 @@
 
     invoke-interface {p0, v0, v1}, Lokio/d;->aN(J)V
 
-    sget-object p0, Lokhttp3/internal/c;->bvH:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->bwb:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_3
-    sget-object v0, Lokhttp3/internal/c;->bvE:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->bvY:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->l(Lokio/ByteString;)Z
 
@@ -698,7 +698,7 @@
 
     if-eqz v0, :cond_4
 
-    sget-object p1, Lokhttp3/internal/c;->bvE:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->bvY:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -708,7 +708,7 @@
 
     invoke-interface {p0, v0, v1}, Lokio/d;->aN(J)V
 
-    sget-object p0, Lokhttp3/internal/c;->bvI:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->bwc:Ljava/nio/charset/Charset;
 
     return-object p0
 
@@ -838,7 +838,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/s;->IN()Z
+    invoke-virtual {v2}, Lokio/s;->IA()Z
 
     move-result v2
 
@@ -850,7 +850,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/s;->IO()J
+    invoke-virtual {v2}, Lokio/s;->IB()J
 
     move-result-wide v5
 
@@ -914,7 +914,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/s;->IQ()Lokio/s;
+    invoke-virtual {p0}, Lokio/s;->ID()Lokio/s;
 
     goto :goto_2
 
@@ -943,7 +943,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/s;->IQ()Lokio/s;
+    invoke-virtual {p0}, Lokio/s;->ID()Lokio/s;
 
     goto :goto_3
 
@@ -970,7 +970,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/s;->IQ()Lokio/s;
+    invoke-virtual {p0}, Lokio/s;->ID()Lokio/s;
 
     goto :goto_4
 
@@ -1145,17 +1145,17 @@
 
     check-cast v1, Lokhttp3/internal/e/c;
 
-    sget-object v2, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v2, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
-    iget-object v3, v1, Lokhttp3/internal/e/c;->bxI:Lokio/ByteString;
+    iget-object v3, v1, Lokhttp3/internal/e/c;->byc:Lokio/ByteString;
 
-    invoke-virtual {v3}, Lokio/ByteString;->IF()Ljava/lang/String;
+    invoke-virtual {v3}, Lokio/ByteString;->Is()Ljava/lang/String;
 
     move-result-object v3
 
-    iget-object v1, v1, Lokhttp3/internal/e/c;->bxJ:Lokio/ByteString;
+    iget-object v1, v1, Lokhttp3/internal/e/c;->byd:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->IF()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Is()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1164,7 +1164,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->GA()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Gp()Lokhttp3/Headers;
 
     move-result-object p0
 
@@ -1344,7 +1344,7 @@
 .method public static e(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
     .locals 3
 
-    sget-object v0, Lokhttp3/internal/c;->bvK:Ljava/lang/reflect/Method;
+    sget-object v0, Lokhttp3/internal/c;->bwe:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
@@ -1367,34 +1367,7 @@
     return-void
 .end method
 
-.method public static equal(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
-
-    return p0
-
-    :cond_1
-    :goto_0
-    const/4 p0, 0x1
-
-    return p0
-.end method
-
-.method public static eu(Ljava/lang/String;)Ljava/lang/String;
+.method public static ep(Ljava/lang/String;)Ljava/lang/String;
     .locals 8
 
     const-string v0, ":"
@@ -1529,20 +1502,20 @@
 
     if-ne v2, v1, :cond_6
 
-    invoke-virtual {p0, v5}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v5}, Lokio/c;->dM(I)Lokio/c;
 
     add-int/2addr v2, v4
 
     if-ne v2, v3, :cond_5
 
-    invoke-virtual {p0, v5}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v5}, Lokio/c;->dM(I)Lokio/c;
 
     goto :goto_3
 
     :cond_6
     if-lez v2, :cond_7
 
-    invoke-virtual {p0, v5}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v5}, Lokio/c;->dM(I)Lokio/c;
 
     :cond_7
     aget-byte v5, v0, v2
@@ -1568,7 +1541,7 @@
     goto :goto_3
 
     :cond_8
-    invoke-virtual {p0}, Lokio/c;->IA()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/c;->In()Ljava/lang/String;
 
     move-result-object p0
 
@@ -1618,7 +1591,7 @@
     return-object v1
 
     :cond_b
-    invoke-static {p0}, Lokhttp3/internal/c;->ev(Ljava/lang/String;)Z
+    invoke-static {p0}, Lokhttp3/internal/c;->eq(Ljava/lang/String;)Z
 
     move-result v0
     :try_end_0
@@ -1635,7 +1608,7 @@
     return-object v1
 .end method
 
-.method private static ev(Ljava/lang/String;)Z
+.method private static eq(Ljava/lang/String;)Z
     .locals 5
 
     const/4 v0, 0x0
@@ -1691,7 +1664,34 @@
     return v0
 .end method
 
-.method public static ew(Ljava/lang/String;)I
+.method public static equal(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
+
+    return p0
+
+    :cond_1
+    :goto_0
+    const/4 p0, 0x1
+
+    return p0
+.end method
+
+.method public static er(Ljava/lang/String;)I
     .locals 4
 
     invoke-virtual {p0}, Ljava/lang/String;->length()I
@@ -1732,10 +1732,10 @@
     return p0
 .end method
 
-.method public static ex(Ljava/lang/String;)Z
+.method public static es(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/c;->bvL:Ljava/util/regex/Pattern;
+    sget-object v0, Lokhttp3/internal/c;->bwf:Ljava/util/regex/Pattern;
 
     invoke-virtual {v0, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -2223,7 +2223,7 @@
     goto :goto_a
 .end method
 
-.method public static varargs s([Ljava/lang/Object;)Ljava/util/List;
+.method public static varargs r([Ljava/lang/Object;)Ljava/util/List;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/okhttp3/internal/c/h.smali b/com.discord/smali/okhttp3/internal/c/h.smali
index 83fb05b0e7..16f951b5a3 100644
--- a/com.discord/smali/okhttp3/internal/c/h.smali
+++ b/com.discord/smali/okhttp3/internal/c/h.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field private final bxh:Ljava/lang/String;
+.field private final bxB:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
 .field private final contentLength:J
 
-.field private final nJ:Lokio/d;
+.field private final nI:Lokio/d;
 
 
 # direct methods
@@ -24,21 +24,21 @@
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/c/h;->bxh:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/c/h;->bxB:Ljava/lang/String;
 
     iput-wide p2, p0, Lokhttp3/internal/c/h;->contentLength:J
 
-    iput-object p4, p0, Lokhttp3/internal/c/h;->nJ:Lokio/d;
+    iput-object p4, p0, Lokhttp3/internal/c/h;->nI:Lokio/d;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Hf()Lokio/d;
+.method public final GS()Lokio/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/c/h;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/c/h;->nI:Lokio/d;
 
     return-object v0
 .end method
@@ -54,11 +54,11 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/c/h;->bxh:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/internal/c/h;->bxB:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    invoke-static {v0}, Lokhttp3/MediaType;->eo(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {v0}, Lokhttp3/MediaType;->ei(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object v0
 
diff --git a/com.discord/smali/okhttp3/internal/e/g$b.smali b/com.discord/smali/okhttp3/internal/e/g$b.smali
index b6dbceac9d..20bc353af7 100644
--- a/com.discord/smali/okhttp3/internal/e/g$b.smali
+++ b/com.discord/smali/okhttp3/internal/e/g$b.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final byJ:Lokhttp3/internal/e/g$b;
+.field public static final bzd:Lokhttp3/internal/e/g$b;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lokhttp3/internal/e/g$b$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/e/g$b;->byJ:Lokhttp3/internal/e/g$b;
+    sput-object v0, Lokhttp3/internal/e/g$b;->bzd:Lokhttp3/internal/e/g$b;
 
     return-void
 .end method
diff --git a/com.discord/smali/okhttp3/internal/e/i.smali b/com.discord/smali/okhttp3/internal/e/i.smali
index 0697ee1d50..ad7ab52f1a 100644
--- a/com.discord/smali/okhttp3/internal/e/i.smali
+++ b/com.discord/smali/okhttp3/internal/e/i.smali
@@ -18,7 +18,13 @@
 
 
 # instance fields
-.field final byW:Ljava/util/Deque;
+.field byN:J
+
+.field byO:J
+
+.field final byz:Lokhttp3/internal/e/g;
+
+.field final bzq:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -28,23 +34,17 @@
     .end annotation
 .end field
 
-.field private byX:Lokhttp3/internal/e/c$a;
+.field private bzr:Lokhttp3/internal/e/c$a;
 
-.field byY:Z
+.field bzs:Z
 
-.field final byZ:Lokhttp3/internal/e/i$b;
+.field final bzt:Lokhttp3/internal/e/i$b;
 
-.field final byf:Lokhttp3/internal/e/g;
+.field final bzu:Lokhttp3/internal/e/i$a;
 
-.field byt:J
+.field final bzv:Lokhttp3/internal/e/i$c;
 
-.field byu:J
-
-.field final bza:Lokhttp3/internal/e/i$a;
-
-.field final bzb:Lokhttp3/internal/e/i$c;
-
-.field final bzc:Lokhttp3/internal/e/i$c;
+.field final bzw:Lokhttp3/internal/e/i$c;
 
 .field errorCode:Lokhttp3/internal/e/b;
 
@@ -69,25 +69,25 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lokhttp3/internal/e/i;->byt:J
+    iput-wide v0, p0, Lokhttp3/internal/e/i;->byN:J
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/e/i;->byW:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/internal/e/i;->bzq:Ljava/util/Deque;
 
     new-instance v0, Lokhttp3/internal/e/i$c;
 
     invoke-direct {v0, p0}, Lokhttp3/internal/e/i$c;-><init>(Lokhttp3/internal/e/i;)V
 
-    iput-object v0, p0, Lokhttp3/internal/e/i;->bzb:Lokhttp3/internal/e/i$c;
+    iput-object v0, p0, Lokhttp3/internal/e/i;->bzv:Lokhttp3/internal/e/i$c;
 
     new-instance v0, Lokhttp3/internal/e/i$c;
 
     invoke-direct {v0, p0}, Lokhttp3/internal/e/i$c;-><init>(Lokhttp3/internal/e/i;)V
 
-    iput-object v0, p0, Lokhttp3/internal/e/i;->bzc:Lokhttp3/internal/e/i$c;
+    iput-object v0, p0, Lokhttp3/internal/e/i;->bzw:Lokhttp3/internal/e/i$c;
 
     const/4 v0, 0x0
 
@@ -97,23 +97,23 @@
 
     iput p1, p0, Lokhttp3/internal/e/i;->id:I
 
-    iput-object p2, p0, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iput-object p2, p0, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
-    iget-object p1, p2, Lokhttp3/internal/e/g;->byw:Lokhttp3/internal/e/m;
+    iget-object p1, p2, Lokhttp3/internal/e/g;->byQ:Lokhttp3/internal/e/m;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->HY()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->HL()I
 
     move-result p1
 
     int-to-long v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/i;->byu:J
+    iput-wide v0, p0, Lokhttp3/internal/e/i;->byO:J
 
     new-instance p1, Lokhttp3/internal/e/i$b;
 
-    iget-object p2, p2, Lokhttp3/internal/e/g;->byv:Lokhttp3/internal/e/m;
+    iget-object p2, p2, Lokhttp3/internal/e/g;->byP:Lokhttp3/internal/e/m;
 
-    invoke-virtual {p2}, Lokhttp3/internal/e/m;->HY()I
+    invoke-virtual {p2}, Lokhttp3/internal/e/m;->HL()I
 
     move-result p2
 
@@ -121,30 +121,30 @@
 
     invoke-direct {p1, p0, v0, v1}, Lokhttp3/internal/e/i$b;-><init>(Lokhttp3/internal/e/i;J)V
 
-    iput-object p1, p0, Lokhttp3/internal/e/i;->byZ:Lokhttp3/internal/e/i$b;
+    iput-object p1, p0, Lokhttp3/internal/e/i;->bzt:Lokhttp3/internal/e/i$b;
 
     new-instance p1, Lokhttp3/internal/e/i$a;
 
     invoke-direct {p1, p0}, Lokhttp3/internal/e/i$a;-><init>(Lokhttp3/internal/e/i;)V
 
-    iput-object p1, p0, Lokhttp3/internal/e/i;->bza:Lokhttp3/internal/e/i$a;
+    iput-object p1, p0, Lokhttp3/internal/e/i;->bzu:Lokhttp3/internal/e/i$a;
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->byZ:Lokhttp3/internal/e/i$b;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->bzt:Lokhttp3/internal/e/i$b;
 
-    iput-boolean p4, p1, Lokhttp3/internal/e/i$b;->bze:Z
+    iput-boolean p4, p1, Lokhttp3/internal/e/i$b;->bzy:Z
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->bza:Lokhttp3/internal/e/i$a;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->bzu:Lokhttp3/internal/e/i$a;
 
-    iput-boolean p3, p1, Lokhttp3/internal/e/i$a;->bze:Z
+    iput-boolean p3, p1, Lokhttp3/internal/e/i$a;->bzy:Z
 
     if-eqz p5, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->byW:Ljava/util/Deque;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->bzq:Ljava/util/Deque;
 
     invoke-interface {p1, p5}, Ljava/util/Deque;->add(Ljava/lang/Object;)Z
 
     :cond_0
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->HM()Z
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Hz()Z
 
     move-result p1
 
@@ -165,7 +165,7 @@
 
     :cond_2
     :goto_0
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->HM()Z
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Hz()Z
 
     move-result p1
 
@@ -201,7 +201,7 @@
 .method static synthetic b(Lokhttp3/internal/e/i;)Ljava/util/Deque;
     .locals 0
 
-    iget-object p0, p0, Lokhttp3/internal/e/i;->byW:Ljava/util/Deque;
+    iget-object p0, p0, Lokhttp3/internal/e/i;->bzq:Ljava/util/Deque;
 
     return-object p0
 .end method
@@ -209,7 +209,7 @@
 .method static synthetic c(Lokhttp3/internal/e/i;)Lokhttp3/internal/e/c$a;
     .locals 0
 
-    iget-object p0, p0, Lokhttp3/internal/e/i;->byX:Lokhttp3/internal/e/c$a;
+    iget-object p0, p0, Lokhttp3/internal/e/i;->bzr:Lokhttp3/internal/e/c$a;
 
     return-object p0
 .end method
@@ -231,15 +231,15 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->byZ:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzt:Lokhttp3/internal/e/i$b;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bze:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bzy:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bza:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzu:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bze:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bzy:Z
 
     if-eqz v0, :cond_1
 
@@ -256,11 +256,11 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
     iget v0, p0, Lokhttp3/internal/e/i;->id:I
 
-    invoke-virtual {p1, v0}, Lokhttp3/internal/e/g;->dJ(I)Lokhttp3/internal/e/i;
+    invoke-virtual {p1, v0}, Lokhttp3/internal/e/g;->dG(I)Lokhttp3/internal/e/i;
 
     const/4 p1, 0x1
 
@@ -279,40 +279,7 @@
 
 
 # virtual methods
-.method public final HM()Z
-    .locals 4
-
-    iget v0, p0, Lokhttp3/internal/e/i;->id: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, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
-
-    iget-boolean v3, v3, Lokhttp3/internal/e/g;->byk:Z
-
-    if-ne v3, v0, :cond_1
-
-    return v1
-
-    :cond_1
-    return v2
-.end method
-
-.method public final declared-synchronized HN()Lokhttp3/Headers;
+.method public final declared-synchronized HA()Lokhttp3/Headers;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -323,7 +290,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bzb:Lokhttp3/internal/e/i$c;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzv:Lokhttp3/internal/e/i$c;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->enter()V
     :try_end_0
@@ -331,7 +298,7 @@
 
     :goto_0
     :try_start_1
-    iget-object v0, p0, Lokhttp3/internal/e/i;->byW:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzq:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->isEmpty()Z
 
@@ -343,7 +310,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->HS()V
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->HF()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -351,11 +318,11 @@
 
     :cond_0
     :try_start_2
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bzb:Lokhttp3/internal/e/i$c;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzv:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->HT()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->HG()V
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->byW:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzq:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->isEmpty()Z
 
@@ -363,7 +330,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->byW:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzq:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->removeFirst()Ljava/lang/Object;
 
@@ -390,9 +357,9 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lokhttp3/internal/e/i;->bzb:Lokhttp3/internal/e/i$c;
+    iget-object v1, p0, Lokhttp3/internal/e/i;->bzv:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->HT()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->HG()V
 
     throw v0
     :try_end_3
@@ -412,17 +379,17 @@
     goto :goto_1
 .end method
 
-.method public final HO()Lokio/q;
+.method public final HB()Lokio/q;
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/e/i;->byY:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/i;->bzs:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->HM()Z
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Hz()Z
 
     move-result v0
 
@@ -445,7 +412,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bza:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzu:Lokhttp3/internal/e/i$a;
 
     return-object v0
 
@@ -460,17 +427,17 @@
     throw v0
 .end method
 
-.method final HP()V
+.method final HC()V
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->byZ:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzt:Lokhttp3/internal/e/i$b;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lokhttp3/internal/e/i$b;->bze:Z
+    iput-boolean v1, v0, Lokhttp3/internal/e/i$b;->bzy:Z
 
     invoke-virtual {p0}, Lokhttp3/internal/e/i;->isOpen()Z
 
@@ -484,11 +451,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
     iget v1, p0, Lokhttp3/internal/e/i;->id:I
 
-    invoke-virtual {v0, v1}, Lokhttp3/internal/e/g;->dJ(I)Lokhttp3/internal/e/i;
+    invoke-virtual {v0, v1}, Lokhttp3/internal/e/g;->dG(I)Lokhttp3/internal/e/i;
 
     :cond_0
     return-void
@@ -504,7 +471,7 @@
     throw v0
 .end method
 
-.method final HQ()V
+.method final HD()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -515,25 +482,25 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->byZ:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzt:Lokhttp3/internal/e/i$b;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bze:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bzy:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->byZ:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzt:Lokhttp3/internal/e/i$b;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->closed:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bza:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzu:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bze:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bzy:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bza:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzu:Lokhttp3/internal/e/i$a;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->closed:Z
 
@@ -558,7 +525,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lokhttp3/internal/e/b;->bxv:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->bxP:Lokhttp3/internal/e/b;
 
     invoke-virtual {p0, v0}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/b;)V
 
@@ -567,11 +534,11 @@
     :cond_2
     if-nez v1, :cond_3
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
     iget v1, p0, Lokhttp3/internal/e/i;->id:I
 
-    invoke-virtual {v0, v1}, Lokhttp3/internal/e/g;->dJ(I)Lokhttp3/internal/e/i;
+    invoke-virtual {v0, v1}, Lokhttp3/internal/e/g;->dG(I)Lokhttp3/internal/e/i;
 
     :cond_3
     return-void
@@ -587,7 +554,7 @@
     throw v0
 .end method
 
-.method final HR()V
+.method final HE()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -595,15 +562,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bza:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzu:Lokhttp3/internal/e/i$a;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->closed:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bza:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzu:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bze:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bzy:Z
 
     if-nez v0, :cond_1
 
@@ -639,7 +606,7 @@
     throw v0
 .end method
 
-.method final HS()V
+.method final HF()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -668,14 +635,47 @@
     throw v0
 .end method
 
+.method public final Hz()Z
+    .locals 4
+
+    iget v0, p0, Lokhttp3/internal/e/i;->id: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, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
+
+    iget-boolean v3, v3, Lokhttp3/internal/e/g;->byE:Z
+
+    if-ne v3, v0, :cond_1
+
+    return v1
+
+    :cond_1
+    return v2
+.end method
+
 .method final aF(J)V
     .locals 3
 
-    iget-wide v0, p0, Lokhttp3/internal/e/i;->byu:J
+    iget-wide v0, p0, Lokhttp3/internal/e/i;->byO:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/i;->byu:J
+    iput-wide v0, p0, Lokhttp3/internal/e/i;->byO:J
 
     const-wide/16 v0, 0x0
 
@@ -706,7 +706,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
     iget v1, p0, Lokhttp3/internal/e/i;->id:I
 
@@ -727,7 +727,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
     iget v1, p0, Lokhttp3/internal/e/i;->id:I
 
@@ -785,33 +785,33 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lokhttp3/internal/e/i;->byZ:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzt:Lokhttp3/internal/e/i$b;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bze:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bzy:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->byZ:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzt:Lokhttp3/internal/e/i$b;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->closed:Z
 
     if-eqz v0, :cond_3
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bza:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzu:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bze:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bzy:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bza:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bzu:Lokhttp3/internal/e/i$a;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->closed:Z
 
     if-eqz v0, :cond_3
 
     :cond_2
-    iget-boolean v0, p0, Lokhttp3/internal/e/i;->byY:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/i;->bzs:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
diff --git a/com.discord/smali/okhttp3/internal/g/a.smali b/com.discord/smali/okhttp3/internal/g/a.smali
index fa3cf244ed..6ea8438079 100644
--- a/com.discord/smali/okhttp3/internal/g/a.smali
+++ b/com.discord/smali/okhttp3/internal/g/a.smali
@@ -14,29 +14,7 @@
 
 
 # instance fields
-.field private final bzA:Lokhttp3/internal/g/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lokhttp3/internal/g/e<",
-            "Ljava/net/Socket;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private final bzB:Lokhttp3/internal/g/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lokhttp3/internal/g/e<",
-            "Ljava/net/Socket;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private final bzC:Lokhttp3/internal/g/a$c;
-
-.field private final bzx:Ljava/lang/Class;
+.field private final bzR:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -45,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final bzy:Lokhttp3/internal/g/e;
+.field private final bzS:Lokhttp3/internal/g/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lokhttp3/internal/g/e<",
@@ -55,7 +33,7 @@
     .end annotation
 .end field
 
-.field private final bzz:Lokhttp3/internal/g/e;
+.field private final bzT:Lokhttp3/internal/g/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lokhttp3/internal/g/e<",
@@ -65,6 +43,28 @@
     .end annotation
 .end field
 
+.field private final bzU:Lokhttp3/internal/g/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lokhttp3/internal/g/e<",
+            "Ljava/net/Socket;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final bzV:Lokhttp3/internal/g/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lokhttp3/internal/g/e<",
+            "Ljava/net/Socket;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final bzW:Lokhttp3/internal/g/a$c;
+
 
 # direct methods
 .method private constructor <init>(Ljava/lang/Class;Lokhttp3/internal/g/e;Lokhttp3/internal/g/e;Lokhttp3/internal/g/e;Lokhttp3/internal/g/e;)V
@@ -91,26 +91,26 @@
 
     invoke-direct {p0}, Lokhttp3/internal/g/f;-><init>()V
 
-    invoke-static {}, Lokhttp3/internal/g/a$c;->Ic()Lokhttp3/internal/g/a$c;
+    invoke-static {}, Lokhttp3/internal/g/a$c;->HP()Lokhttp3/internal/g/a$c;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/internal/g/a;->bzC:Lokhttp3/internal/g/a$c;
+    iput-object v0, p0, Lokhttp3/internal/g/a;->bzW:Lokhttp3/internal/g/a$c;
 
-    iput-object p1, p0, Lokhttp3/internal/g/a;->bzx:Ljava/lang/Class;
+    iput-object p1, p0, Lokhttp3/internal/g/a;->bzR:Ljava/lang/Class;
 
-    iput-object p2, p0, Lokhttp3/internal/g/a;->bzy:Lokhttp3/internal/g/e;
+    iput-object p2, p0, Lokhttp3/internal/g/a;->bzS:Lokhttp3/internal/g/e;
 
-    iput-object p3, p0, Lokhttp3/internal/g/a;->bzz:Lokhttp3/internal/g/e;
+    iput-object p3, p0, Lokhttp3/internal/g/a;->bzT:Lokhttp3/internal/g/e;
 
-    iput-object p4, p0, Lokhttp3/internal/g/a;->bzA:Lokhttp3/internal/g/e;
+    iput-object p4, p0, Lokhttp3/internal/g/a;->bzU:Lokhttp3/internal/g/e;
 
-    iput-object p5, p0, Lokhttp3/internal/g/a;->bzB:Lokhttp3/internal/g/e;
+    iput-object p5, p0, Lokhttp3/internal/g/a;->bzV:Lokhttp3/internal/g/e;
 
     return-void
 .end method
 
-.method private static HZ()Z
+.method private static HM()Z
     .locals 2
 
     const-string v0, "GMSCore_OpenSSL"
@@ -141,7 +141,7 @@
     return v0
 .end method
 
-.method public static Ia()Lokhttp3/internal/g/f;
+.method public static HN()Lokhttp3/internal/g/f;
     .locals 10
 
     const-class v0, [B
@@ -201,7 +201,7 @@
 
     invoke-direct {v6, v1, v2, v7}, Lokhttp3/internal/g/e;-><init>(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/Class;)V
 
-    invoke-static {}, Lokhttp3/internal/g/a;->HZ()Z
+    invoke-static {}, Lokhttp3/internal/g/a;->HM()Z
 
     move-result v2
 
@@ -371,7 +371,7 @@
 
 
 # virtual methods
-.method public final Ib()Ljavax/net/ssl/SSLContext;
+.method public final HO()Ljavax/net/ssl/SSLContext;
     .locals 3
 
     const/4 v0, 0x1
@@ -620,7 +620,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/g/a;->bzy:Lokhttp3/internal/g/e;
+    iget-object v2, p0, Lokhttp3/internal/g/a;->bzS:Lokhttp3/internal/g/e;
 
     new-array v3, v1, [Ljava/lang/Object;
 
@@ -630,7 +630,7 @@
 
     invoke-virtual {v2, p1, v3}, Lokhttp3/internal/g/e;->b(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v2, p0, Lokhttp3/internal/g/a;->bzz:Lokhttp3/internal/g/e;
+    iget-object v2, p0, Lokhttp3/internal/g/a;->bzT:Lokhttp3/internal/g/e;
 
     new-array v3, v1, [Ljava/lang/Object;
 
@@ -639,7 +639,7 @@
     invoke-virtual {v2, p1, v3}, Lokhttp3/internal/g/e;->b(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    iget-object p2, p0, Lokhttp3/internal/g/a;->bzB:Lokhttp3/internal/g/e;
+    iget-object p2, p0, Lokhttp3/internal/g/a;->bzV:Lokhttp3/internal/g/e;
 
     if-eqz p2, :cond_3
 
@@ -670,7 +670,7 @@
 
     check-cast v4, Lokhttp3/u;
 
-    sget-object v5, Lokhttp3/u;->buC:Lokhttp3/u;
+    sget-object v5, Lokhttp3/u;->buW:Lokhttp3/u;
 
     if-eq v4, v5, :cond_1
 
@@ -682,13 +682,13 @@
 
     move-result v5
 
-    invoke-virtual {v1, v5}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v1, v5}, Lokio/c;->dM(I)Lokio/c;
 
     invoke-virtual {v4}, Lokhttp3/u;->toString()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v1, v4}, Lokio/c;->eI(Ljava/lang/String;)Lokio/c;
+    invoke-virtual {v1, v4}, Lokio/c;->eD(Ljava/lang/String;)Lokio/c;
 
     :cond_1
     add-int/lit8 v3, v3, 0x1
@@ -702,7 +702,7 @@
 
     aput-object p3, p2, v0
 
-    iget-object p3, p0, Lokhttp3/internal/g/a;->bzB:Lokhttp3/internal/g/e;
+    iget-object p3, p0, Lokhttp3/internal/g/a;->bzV:Lokhttp3/internal/g/e;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/internal/g/e;->c(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -715,7 +715,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/g/a;->bzx:Ljava/lang/Class;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bzR:Ljava/lang/Class;
 
     const-string v1, "sslParameters"
 
@@ -906,7 +906,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/g/a;->bzA:Lokhttp3/internal/g/e;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bzU:Lokhttp3/internal/g/e;
 
     const/4 v1, 0x0
 
@@ -924,7 +924,7 @@
     return-object v1
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/g/a;->bzA:Lokhttp3/internal/g/e;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bzU:Lokhttp3/internal/g/e;
 
     const/4 v2, 0x0
 
@@ -950,12 +950,12 @@
     return-object v1
 .end method
 
-.method public final eE(Ljava/lang/String;)Ljava/lang/Object;
+.method public final ez(Ljava/lang/String;)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/g/a;->bzC:Lokhttp3/internal/g/a$c;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bzW:Lokhttp3/internal/g/a$c;
 
-    invoke-virtual {v0, p1}, Lokhttp3/internal/g/a$c;->eF(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-virtual {v0, p1}, Lokhttp3/internal/g/a$c;->eA(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -1035,7 +1035,7 @@
 .method public final t(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/g/a;->bzC:Lokhttp3/internal/g/a$c;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bzW:Lokhttp3/internal/g/a$c;
 
     invoke-virtual {v0, p2}, Lokhttp3/internal/g/a$c;->bD(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/okhttp3/internal/g/b.smali b/com.discord/smali/okhttp3/internal/g/b.smali
index ac0a2a05cc..cc3ebe91c4 100644
--- a/com.discord/smali/okhttp3/internal/g/b.smali
+++ b/com.discord/smali/okhttp3/internal/g/b.smali
@@ -12,7 +12,7 @@
     return-void
 .end method
 
-.method public static Id()Lokhttp3/internal/g/b;
+.method public static HQ()Lokhttp3/internal/g/b;
     .locals 2
 
     const/4 v0, 0x0
@@ -63,7 +63,7 @@
 
 
 # virtual methods
-.method public final Ib()Ljavax/net/ssl/SSLContext;
+.method public final HO()Ljavax/net/ssl/SSLContext;
     .locals 3
 
     :try_start_0
diff --git a/com.discord/smali/okhttp3/internal/g/c.smali b/com.discord/smali/okhttp3/internal/g/c.smali
index 91a4b7aa20..9dadf8b136 100644
--- a/com.discord/smali/okhttp3/internal/g/c.smali
+++ b/com.discord/smali/okhttp3/internal/g/c.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final bzJ:Ljava/lang/reflect/Method;
+.field final bAd:Ljava/lang/reflect/Method;
 
-.field final bzK:Ljava/lang/reflect/Method;
+.field final bAe:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -15,14 +15,14 @@
 
     invoke-direct {p0}, Lokhttp3/internal/g/f;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/g/c;->bzJ:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lokhttp3/internal/g/c;->bAd:Ljava/lang/reflect/Method;
 
-    iput-object p2, p0, Lokhttp3/internal/g/c;->bzK:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/c;->bAe:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method public static Ie()Lokhttp3/internal/g/c;
+.method public static HR()Lokhttp3/internal/g/c;
     .locals 5
 
     :try_start_0
@@ -92,7 +92,7 @@
 
     move-result-object p3
 
-    iget-object v0, p0, Lokhttp3/internal/g/c;->bzJ:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/c;->bAd:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x1
 
@@ -157,7 +157,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/g/c;->bzK:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/c;->bAe:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/okhttp3/internal/g/d.smali b/com.discord/smali/okhttp3/internal/g/d.smali
index 8902f10bd6..4dcd1624d3 100644
--- a/com.discord/smali/okhttp3/internal/g/d.smali
+++ b/com.discord/smali/okhttp3/internal/g/d.smali
@@ -12,11 +12,11 @@
 
 
 # instance fields
-.field private final bzL:Ljava/lang/reflect/Method;
+.field private final bAf:Ljava/lang/reflect/Method;
 
-.field private final bzM:Ljava/lang/reflect/Method;
+.field private final bAg:Ljava/lang/reflect/Method;
 
-.field private final bzN:Ljava/lang/Class;
+.field private final bAh:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final bzO:Ljava/lang/Class;
+.field private final bAi:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -55,20 +55,20 @@
 
     invoke-direct {p0}, Lokhttp3/internal/g/f;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/g/d;->bzL:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lokhttp3/internal/g/d;->bAf:Ljava/lang/reflect/Method;
 
     iput-object p2, p0, Lokhttp3/internal/g/d;->getMethod:Ljava/lang/reflect/Method;
 
-    iput-object p3, p0, Lokhttp3/internal/g/d;->bzM:Ljava/lang/reflect/Method;
+    iput-object p3, p0, Lokhttp3/internal/g/d;->bAg:Ljava/lang/reflect/Method;
 
-    iput-object p4, p0, Lokhttp3/internal/g/d;->bzN:Ljava/lang/Class;
+    iput-object p4, p0, Lokhttp3/internal/g/d;->bAh:Ljava/lang/Class;
 
-    iput-object p5, p0, Lokhttp3/internal/g/d;->bzO:Ljava/lang/Class;
+    iput-object p5, p0, Lokhttp3/internal/g/d;->bAi:Ljava/lang/Class;
 
     return-void
 .end method
 
-.method public static Ia()Lokhttp3/internal/g/f;
+.method public static HN()Lokhttp3/internal/g/f;
     .locals 10
 
     :try_start_0
@@ -225,13 +225,13 @@
 
     new-array v1, v0, [Ljava/lang/Class;
 
-    iget-object v2, p0, Lokhttp3/internal/g/d;->bzN:Ljava/lang/Class;
+    iget-object v2, p0, Lokhttp3/internal/g/d;->bAh:Ljava/lang/Class;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lokhttp3/internal/g/d;->bzO:Ljava/lang/Class;
+    iget-object v2, p0, Lokhttp3/internal/g/d;->bAi:Ljava/lang/Class;
 
     const/4 v4, 0x1
 
@@ -245,7 +245,7 @@
 
     move-result-object p2
 
-    iget-object p3, p0, Lokhttp3/internal/g/d;->bzL:Ljava/lang/reflect/Method;
+    iget-object p3, p0, Lokhttp3/internal/g/d;->bAf:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
@@ -308,15 +308,15 @@
 
     check-cast v0, Lokhttp3/internal/g/d$a;
 
-    iget-boolean v1, v0, Lokhttp3/internal/g/d$a;->bzP:Z
+    iget-boolean v1, v0, Lokhttp3/internal/g/d$a;->bAj:Z
 
     if-nez v1, :cond_0
 
-    iget-object v1, v0, Lokhttp3/internal/g/d$a;->bzQ:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/internal/g/d$a;->bAk:Ljava/lang/String;
 
     if-nez v1, :cond_0
 
-    sget-object v0, Lokhttp3/internal/g/f;->bzT:Lokhttp3/internal/g/f;
+    sget-object v0, Lokhttp3/internal/g/f;->bAn:Lokhttp3/internal/g/f;
 
     const/4 v1, 0x4
 
@@ -327,14 +327,14 @@
     return-object p1
 
     :cond_0
-    iget-boolean v1, v0, Lokhttp3/internal/g/d$a;->bzP:Z
+    iget-boolean v1, v0, Lokhttp3/internal/g/d$a;->bAj:Z
 
     if-eqz v1, :cond_1
 
     return-object p1
 
     :cond_1
-    iget-object p1, v0, Lokhttp3/internal/g/d$a;->bzQ:Ljava/lang/String;
+    iget-object p1, v0, Lokhttp3/internal/g/d$a;->bAk:Ljava/lang/String;
     :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
@@ -363,7 +363,7 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/g/d;->bzM:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/d;->bAg:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/okhttp3/internal/g/f.smali b/com.discord/smali/okhttp3/internal/g/f.smali
index 28f34c9c2d..f04b2d036c 100644
--- a/com.discord/smali/okhttp3/internal/g/f.smali
+++ b/com.discord/smali/okhttp3/internal/g/f.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static final bzT:Lokhttp3/internal/g/f;
+.field static final bAn:Lokhttp3/internal/g/f;
 
 .field private static final logger:Ljava/util/logging/Logger;
 
@@ -13,7 +13,7 @@
 .method static constructor <clinit>()V
     .locals 2
 
-    invoke-static {}, Lokhttp3/internal/g/a;->Ia()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/a;->HN()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -62,7 +62,7 @@
     :goto_0
     if-eqz v0, :cond_2
 
-    invoke-static {}, Lokhttp3/internal/g/b;->Id()Lokhttp3/internal/g/b;
+    invoke-static {}, Lokhttp3/internal/g/b;->HQ()Lokhttp3/internal/g/b;
 
     move-result-object v0
 
@@ -71,7 +71,7 @@
     goto :goto_1
 
     :cond_2
-    invoke-static {}, Lokhttp3/internal/g/c;->Ie()Lokhttp3/internal/g/c;
+    invoke-static {}, Lokhttp3/internal/g/c;->HR()Lokhttp3/internal/g/c;
 
     move-result-object v0
 
@@ -80,7 +80,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {}, Lokhttp3/internal/g/d;->Ia()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/d;->HN()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -94,7 +94,7 @@
     invoke-direct {v0}, Lokhttp3/internal/g/f;-><init>()V
 
     :goto_1
-    sput-object v0, Lokhttp3/internal/g/f;->bzT:Lokhttp3/internal/g/f;
+    sput-object v0, Lokhttp3/internal/g/f;->bAn:Lokhttp3/internal/g/f;
 
     const-class v0, Lokhttp3/t;
 
@@ -119,10 +119,10 @@
     return-void
 .end method
 
-.method public static If()Lokhttp3/internal/g/f;
+.method public static HS()Lokhttp3/internal/g/f;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/g/f;->bzT:Lokhttp3/internal/g/f;
+    sget-object v0, Lokhttp3/internal/g/f;->bAn:Lokhttp3/internal/g/f;
 
     return-object v0
 .end method
@@ -268,7 +268,7 @@
 
     check-cast v3, Lokhttp3/u;
 
-    sget-object v4, Lokhttp3/u;->buC:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->buW:Lokhttp3/u;
 
     if-eq v3, v4, :cond_0
 
@@ -289,7 +289,7 @@
 
 
 # virtual methods
-.method public Ib()Ljavax/net/ssl/SSLContext;
+.method public HO()Ljavax/net/ssl/SSLContext;
     .locals 3
 
     const-string v0, "java.specification.version"
@@ -502,7 +502,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    sget-object v2, Lokhttp3/internal/g/f;->bzT:Lokhttp3/internal/g/f;
+    sget-object v2, Lokhttp3/internal/g/f;->bAn:Lokhttp3/internal/g/f;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -535,7 +535,7 @@
     return-object p1
 .end method
 
-.method public eE(Ljava/lang/String;)Ljava/lang/Object;
+.method public ez(Ljava/lang/String;)Ljava/lang/Object;
     .locals 2
 
     sget-object v0, Lokhttp3/internal/g/f;->logger:Ljava/util/logging/Logger;
diff --git a/com.discord/smali/okhttp3/internal/j/a.smali b/com.discord/smali/okhttp3/internal/j/a.smali
index edcb2eb243..9e63076633 100644
--- a/com.discord/smali/okhttp3/internal/j/a.smali
+++ b/com.discord/smali/okhttp3/internal/j/a.smali
@@ -22,7 +22,7 @@
 # static fields
 .field static final synthetic $assertionsDisabled:Z
 
-.field public static final bAf:Ljava/util/List;
+.field public static final bAz:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -34,19 +34,19 @@
 
 
 # instance fields
-.field final bAg:Lokhttp3/WebSocketListener;
+.field final bAA:Lokhttp3/WebSocketListener;
 
-.field final bAh:J
+.field final bAB:J
 
-.field private final bAi:Ljava/lang/Runnable;
+.field private final bAC:Ljava/lang/Runnable;
 
-.field private bAj:Lokhttp3/internal/j/c;
+.field private bAD:Lokhttp3/internal/j/c;
 
-.field bAk:Lokhttp3/internal/j/d;
+.field bAE:Lokhttp3/internal/j/d;
 
-.field private bAl:Lokhttp3/internal/j/a$e;
+.field private bAF:Lokhttp3/internal/j/a$e;
 
-.field private final bAm:Ljava/util/ArrayDeque;
+.field private final bAG:Ljava/util/ArrayDeque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayDeque<",
@@ -56,7 +56,7 @@
     .end annotation
 .end field
 
-.field private final bAn:Ljava/util/ArrayDeque;
+.field private final bAH:Ljava/util/ArrayDeque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayDeque<",
@@ -66,11 +66,11 @@
     .end annotation
 .end field
 
-.field private bAo:J
+.field private bAI:J
 
-.field private bAp:Z
+.field private bAJ:Z
 
-.field private bAq:Ljava/util/concurrent/ScheduledFuture;
+.field private bAK:Ljava/util/concurrent/ScheduledFuture;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ScheduledFuture<",
@@ -79,27 +79,27 @@
     .end annotation
 .end field
 
-.field private bAr:I
+.field private bAL:I
 
-.field private bAs:Ljava/lang/String;
+.field private bAM:Ljava/lang/String;
 
-.field bAt:Z
+.field bAN:Z
 
-.field bAu:I
+.field bAO:I
 
-.field private bAv:I
+.field private bAP:I
 
-.field private bAw:I
+.field private bAQ:I
 
-.field public final buN:Lokhttp3/w;
+.field public final bvh:Lokhttp3/w;
 
-.field public bwJ:Lokhttp3/e;
+.field public bxd:Lokhttp3/e;
 
-.field bys:Z
+.field byM:Z
 
 .field public final key:Ljava/lang/String;
 
-.field private oX:Ljava/util/concurrent/ScheduledExecutorService;
+.field private oW:Ljava/util/concurrent/ScheduledExecutorService;
 
 .field private final random:Ljava/util/Random;
 
@@ -108,13 +108,13 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lokhttp3/u;->buD:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->buX:Lokhttp3/u;
 
     invoke-static {v0}, Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/j/a;->bAf:Ljava/util/List;
+    sput-object v0, Lokhttp3/internal/j/a;->bAz:Ljava/util/List;
 
     return-void
 .end method
@@ -128,17 +128,17 @@
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/j/a;->bAm:Ljava/util/ArrayDeque;
+    iput-object v0, p0, Lokhttp3/internal/j/a;->bAG:Ljava/util/ArrayDeque;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/j/a;->bAn:Ljava/util/ArrayDeque;
+    iput-object v0, p0, Lokhttp3/internal/j/a;->bAH:Ljava/util/ArrayDeque;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/j/a;->bAr:I
+    iput v0, p0, Lokhttp3/internal/j/a;->bAL:I
 
     iget-object v0, p1, Lokhttp3/w;->method:Ljava/lang/String;
 
@@ -150,13 +150,13 @@
 
     if-eqz v0, :cond_0
 
-    iput-object p1, p0, Lokhttp3/internal/j/a;->buN:Lokhttp3/w;
+    iput-object p1, p0, Lokhttp3/internal/j/a;->bvh:Lokhttp3/w;
 
-    iput-object p2, p0, Lokhttp3/internal/j/a;->bAg:Lokhttp3/WebSocketListener;
+    iput-object p2, p0, Lokhttp3/internal/j/a;->bAA:Lokhttp3/WebSocketListener;
 
     iput-object p3, p0, Lokhttp3/internal/j/a;->random:Ljava/util/Random;
 
-    iput-wide p4, p0, Lokhttp3/internal/j/a;->bAh:J
+    iput-wide p4, p0, Lokhttp3/internal/j/a;->bAB:J
 
     const/16 p1, 0x10
 
@@ -168,7 +168,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/ByteString;->IG()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->It()Ljava/lang/String;
 
     move-result-object p1
 
@@ -178,7 +178,7 @@
 
     invoke-direct {p1, p0}, Lokhttp3/internal/j/a$1;-><init>(Lokhttp3/internal/j/a;)V
 
-    iput-object p1, p0, Lokhttp3/internal/j/a;->bAi:Ljava/lang/Runnable;
+    iput-object p1, p0, Lokhttp3/internal/j/a;->bAC:Ljava/lang/Runnable;
 
     return-void
 
@@ -204,14 +204,14 @@
     throw p2
 .end method
 
-.method private Ij()V
+.method private HW()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bAi:Ljava/lang/Runnable;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bAC:Ljava/lang/Runnable;
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/ScheduledExecutorService;->execute(Ljava/lang/Runnable;)V
 
@@ -225,13 +225,13 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-static {p1}, Lokhttp3/internal/j/b;->dN(I)V
+    invoke-static {p1}, Lokhttp3/internal/j/b;->dK(I)V
 
     const/4 v0, 0x0
 
     if-eqz p2, :cond_1
 
-    invoke-static {p2}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {p2}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
@@ -268,11 +268,11 @@
 
     :cond_1
     :goto_0
-    iget-boolean p2, p0, Lokhttp3/internal/j/a;->bAt:Z
+    iget-boolean p2, p0, Lokhttp3/internal/j/a;->bAN:Z
 
     if-nez p2, :cond_3
 
-    iget-boolean p2, p0, Lokhttp3/internal/j/a;->bAp:Z
+    iget-boolean p2, p0, Lokhttp3/internal/j/a;->bAJ:Z
 
     if-eqz p2, :cond_2
 
@@ -281,9 +281,9 @@
     :cond_2
     const/4 p2, 0x1
 
-    iput-boolean p2, p0, Lokhttp3/internal/j/a;->bAp:Z
+    iput-boolean p2, p0, Lokhttp3/internal/j/a;->bAJ:Z
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bAn:Ljava/util/ArrayDeque;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bAH:Ljava/util/ArrayDeque;
 
     new-instance v2, Lokhttp3/internal/j/a$b;
 
@@ -293,7 +293,7 @@
 
     invoke-virtual {v1, v2}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lokhttp3/internal/j/a;->Ij()V
+    invoke-direct {p0}, Lokhttp3/internal/j/a;->HW()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -323,20 +323,20 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAt:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAN:Z
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAp:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAJ:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-wide v2, p0, Lokhttp3/internal/j/a;->bAo:J
+    iget-wide v2, p0, Lokhttp3/internal/j/a;->bAI:J
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -366,7 +366,7 @@
 
     :cond_1
     :try_start_1
-    iget-wide v0, p0, Lokhttp3/internal/j/a;->bAo:J
+    iget-wide v0, p0, Lokhttp3/internal/j/a;->bAI:J
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -376,9 +376,9 @@
 
     add-long/2addr v0, v2
 
-    iput-wide v0, p0, Lokhttp3/internal/j/a;->bAo:J
+    iput-wide v0, p0, Lokhttp3/internal/j/a;->bAI:J
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bAn:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bAH:Ljava/util/ArrayDeque;
 
     new-instance v1, Lokhttp3/internal/j/a$c;
 
@@ -388,7 +388,7 @@
 
     invoke-virtual {v0, v1}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lokhttp3/internal/j/a;->Ij()V
+    invoke-direct {p0}, Lokhttp3/internal/j/a;->HW()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -412,7 +412,7 @@
 
 
 # virtual methods
-.method public final Ih()V
+.method public final HU()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -421,21 +421,21 @@
     .end annotation
 
     :goto_0
-    iget v0, p0, Lokhttp3/internal/j/a;->bAr:I
+    iget v0, p0, Lokhttp3/internal/j/a;->bAL:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_4
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bAj:Lokhttp3/internal/j/c;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bAD:Lokhttp3/internal/j/c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/j/c;->Il()V
+    invoke-virtual {v0}, Lokhttp3/internal/j/c;->HY()V
 
-    iget-boolean v1, v0, Lokhttp3/internal/j/c;->bAH:Z
+    iget-boolean v1, v0, Lokhttp3/internal/j/c;->bBb:Z
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/internal/j/c;->Im()V
+    invoke-virtual {v0}, Lokhttp3/internal/j/c;->HZ()V
 
     goto :goto_0
 
@@ -477,28 +477,28 @@
 
     :cond_2
     :goto_1
-    invoke-virtual {v0}, Lokhttp3/internal/j/c;->Io()V
+    invoke-virtual {v0}, Lokhttp3/internal/j/c;->Ib()V
 
     if-ne v1, v2, :cond_3
 
-    iget-object v1, v0, Lokhttp3/internal/j/c;->bAE:Lokhttp3/internal/j/c$a;
+    iget-object v1, v0, Lokhttp3/internal/j/c;->bAY:Lokhttp3/internal/j/c$a;
 
-    iget-object v0, v0, Lokhttp3/internal/j/c;->bAJ:Lokio/c;
+    iget-object v0, v0, Lokhttp3/internal/j/c;->bBd:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->IA()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/c;->In()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-interface {v1, v0}, Lokhttp3/internal/j/c$a;->eH(Ljava/lang/String;)V
+    invoke-interface {v1, v0}, Lokhttp3/internal/j/c$a;->eC(Ljava/lang/String;)V
 
     goto :goto_0
 
     :cond_3
-    iget-object v1, v0, Lokhttp3/internal/j/c;->bAE:Lokhttp3/internal/j/c$a;
+    iget-object v1, v0, Lokhttp3/internal/j/c;->bAY:Lokhttp3/internal/j/c$a;
 
-    iget-object v0, v0, Lokhttp3/internal/j/c;->bAJ:Lokio/c;
+    iget-object v0, v0, Lokhttp3/internal/j/c;->bBd:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->HF()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/c;->Hs()Lokio/ByteString;
 
     move-result-object v0
 
@@ -510,21 +510,21 @@
     return-void
 .end method
 
-.method public final declared-synchronized Ii()V
+.method public final declared-synchronized HV()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lokhttp3/internal/j/a;->bAw:I
+    iget v0, p0, Lokhttp3/internal/j/a;->bAQ:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lokhttp3/internal/j/a;->bAw:I
+    iput v0, p0, Lokhttp3/internal/j/a;->bAQ:I
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/j/a;->bys:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/a;->byM:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -540,7 +540,7 @@
     throw v0
 .end method
 
-.method final Ik()Z
+.method final HX()Z
     .locals 12
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -551,7 +551,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAt:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAN:Z
 
     const/4 v1, 0x0
 
@@ -562,9 +562,9 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bAk:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bAE:Lokhttp3/internal/j/d;
 
-    iget-object v2, p0, Lokhttp3/internal/j/a;->bAm:Ljava/util/ArrayDeque;
+    iget-object v2, p0, Lokhttp3/internal/j/a;->bAG:Ljava/util/ArrayDeque;
 
     invoke-virtual {v2}, Ljava/util/ArrayDeque;->poll()Ljava/lang/Object;
 
@@ -576,7 +576,7 @@
 
     if-nez v2, :cond_4
 
-    iget-object v4, p0, Lokhttp3/internal/j/a;->bAn:Ljava/util/ArrayDeque;
+    iget-object v4, p0, Lokhttp3/internal/j/a;->bAH:Ljava/util/ArrayDeque;
 
     invoke-virtual {v4}, Ljava/util/ArrayDeque;->poll()Ljava/lang/Object;
 
@@ -586,19 +586,19 @@
 
     if-eqz v5, :cond_2
 
-    iget v5, p0, Lokhttp3/internal/j/a;->bAr:I
+    iget v5, p0, Lokhttp3/internal/j/a;->bAL:I
 
-    iget-object v6, p0, Lokhttp3/internal/j/a;->bAs:Ljava/lang/String;
+    iget-object v6, p0, Lokhttp3/internal/j/a;->bAM:Ljava/lang/String;
 
     const/4 v7, -0x1
 
     if-eq v5, v7, :cond_1
 
-    iget-object v7, p0, Lokhttp3/internal/j/a;->bAl:Lokhttp3/internal/j/a$e;
+    iget-object v7, p0, Lokhttp3/internal/j/a;->bAF:Lokhttp3/internal/j/a$e;
 
-    iput-object v3, p0, Lokhttp3/internal/j/a;->bAl:Lokhttp3/internal/j/a$e;
+    iput-object v3, p0, Lokhttp3/internal/j/a;->bAF:Lokhttp3/internal/j/a$e;
 
-    iget-object v3, p0, Lokhttp3/internal/j/a;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v3, p0, Lokhttp3/internal/j/a;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {v3}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
 
@@ -607,7 +607,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v7, p0, Lokhttp3/internal/j/a;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v7, p0, Lokhttp3/internal/j/a;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v8, Lokhttp3/internal/j/a$a;
 
@@ -617,7 +617,7 @@
 
     check-cast v9, Lokhttp3/internal/j/a$b;
 
-    iget-wide v9, v9, Lokhttp3/internal/j/a$b;->bAA:J
+    iget-wide v9, v9, Lokhttp3/internal/j/a$b;->bAU:J
 
     sget-object v11, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -625,7 +625,7 @@
 
     move-result-object v7
 
-    iput-object v7, p0, Lokhttp3/internal/j/a;->bAq:Ljava/util/concurrent/ScheduledFuture;
+    iput-object v7, p0, Lokhttp3/internal/j/a;->bAK:Ljava/util/concurrent/ScheduledFuture;
 
     goto :goto_1
 
@@ -674,11 +674,11 @@
 
     check-cast v2, Lokhttp3/internal/j/a$c;
 
-    iget-object v2, v2, Lokhttp3/internal/j/a$c;->bAC:Lokio/ByteString;
+    iget-object v2, v2, Lokhttp3/internal/j/a$c;->bAW:Lokio/ByteString;
 
     check-cast v4, Lokhttp3/internal/j/a$c;
 
-    iget v4, v4, Lokhttp3/internal/j/a$c;->bAB:I
+    iget v4, v4, Lokhttp3/internal/j/a$c;->bAV:I
 
     invoke-virtual {v2}, Lokio/ByteString;->size()I
 
@@ -686,29 +686,29 @@
 
     int-to-long v5, v5
 
-    iget-boolean v8, v0, Lokhttp3/internal/j/d;->bAP:Z
+    iget-boolean v8, v0, Lokhttp3/internal/j/d;->bBj:Z
 
     if-nez v8, :cond_6
 
-    iput-boolean v7, v0, Lokhttp3/internal/j/d;->bAP:Z
+    iput-boolean v7, v0, Lokhttp3/internal/j/d;->bBj:Z
 
-    iget-object v8, v0, Lokhttp3/internal/j/d;->bAO:Lokhttp3/internal/j/d$a;
+    iget-object v8, v0, Lokhttp3/internal/j/d;->bBi:Lokhttp3/internal/j/d$a;
 
-    iput v4, v8, Lokhttp3/internal/j/d$a;->bAB:I
+    iput v4, v8, Lokhttp3/internal/j/d$a;->bAV:I
 
-    iget-object v4, v0, Lokhttp3/internal/j/d;->bAO:Lokhttp3/internal/j/d$a;
+    iget-object v4, v0, Lokhttp3/internal/j/d;->bBi:Lokhttp3/internal/j/d$a;
 
     iput-wide v5, v4, Lokhttp3/internal/j/d$a;->contentLength:J
 
-    iget-object v4, v0, Lokhttp3/internal/j/d;->bAO:Lokhttp3/internal/j/d$a;
+    iget-object v4, v0, Lokhttp3/internal/j/d;->bBi:Lokhttp3/internal/j/d$a;
 
-    iput-boolean v7, v4, Lokhttp3/internal/j/d$a;->bAQ:Z
+    iput-boolean v7, v4, Lokhttp3/internal/j/d$a;->bBk:Z
 
-    iget-object v4, v0, Lokhttp3/internal/j/d;->bAO:Lokhttp3/internal/j/d$a;
+    iget-object v4, v0, Lokhttp3/internal/j/d;->bBi:Lokhttp3/internal/j/d$a;
 
     iput-boolean v1, v4, Lokhttp3/internal/j/d$a;->closed:Z
 
-    iget-object v0, v0, Lokhttp3/internal/j/d;->bAO:Lokhttp3/internal/j/d$a;
+    iget-object v0, v0, Lokhttp3/internal/j/d;->bBi:Lokhttp3/internal/j/d$a;
 
     invoke-static {v0}, Lokio/j;->b(Lokio/q;)Lokio/BufferedSink;
 
@@ -723,7 +723,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_2
 
     :try_start_2
-    iget-wide v0, p0, Lokhttp3/internal/j/a;->bAo:J
+    iget-wide v0, p0, Lokhttp3/internal/j/a;->bAI:J
 
     invoke-virtual {v2}, Lokio/ByteString;->size()I
 
@@ -733,7 +733,7 @@
 
     sub-long/2addr v0, v4
 
-    iput-wide v0, p0, Lokhttp3/internal/j/a;->bAo:J
+    iput-wide v0, p0, Lokhttp3/internal/j/a;->bAI:J
 
     monitor-exit p0
 
@@ -767,9 +767,9 @@
 
     iget v1, v4, Lokhttp3/internal/j/a$b;->code:I
 
-    iget-object v2, v4, Lokhttp3/internal/j/a$b;->bAz:Lokio/ByteString;
+    iget-object v2, v4, Lokhttp3/internal/j/a$b;->bAT:Lokio/ByteString;
 
-    sget-object v4, Lokio/ByteString;->bBs:Lokio/ByteString;
+    sget-object v4, Lokio/ByteString;->bBM:Lokio/ByteString;
 
     if-nez v1, :cond_8
 
@@ -778,21 +778,21 @@
     :cond_8
     if-eqz v1, :cond_9
 
-    invoke-static {v1}, Lokhttp3/internal/j/b;->dN(I)V
+    invoke-static {v1}, Lokhttp3/internal/j/b;->dK(I)V
 
     :cond_9
     new-instance v4, Lokio/c;
 
     invoke-direct {v4}, Lokio/c;-><init>()V
 
-    invoke-virtual {v4, v1}, Lokio/c;->dR(I)Lokio/c;
+    invoke-virtual {v4, v1}, Lokio/c;->dN(I)Lokio/c;
 
     if-eqz v2, :cond_a
 
     invoke-virtual {v4, v2}, Lokio/c;->i(Lokio/ByteString;)Lokio/c;
 
     :cond_a
-    invoke-virtual {v4}, Lokio/c;->HF()Lokio/ByteString;
+    invoke-virtual {v4}, Lokio/c;->Hs()Lokio/ByteString;
 
     move-result-object v4
     :try_end_3
@@ -807,11 +807,11 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
     :try_start_5
-    iput-boolean v7, v0, Lokhttp3/internal/j/d;->bAN:Z
+    iput-boolean v7, v0, Lokhttp3/internal/j/d;->bBh:Z
 
     if-eqz v3, :cond_c
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bAg:Lokhttp3/WebSocketListener;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bAA:Lokhttp3/WebSocketListener;
 
     invoke-virtual {v0, p0, v5, v6}, Lokhttp3/WebSocketListener;->onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
     :try_end_5
@@ -827,7 +827,7 @@
     move-exception v1
 
     :try_start_6
-    iput-boolean v7, v0, Lokhttp3/internal/j/d;->bAN:Z
+    iput-boolean v7, v0, Lokhttp3/internal/j/d;->bBh:Z
 
     throw v1
 
@@ -868,7 +868,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAt:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAN:Z
 
     if-eqz v0, :cond_0
 
@@ -879,30 +879,30 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/j/a;->bAt:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/a;->bAN:Z
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bAl:Lokhttp3/internal/j/a$e;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bAF:Lokhttp3/internal/j/a$e;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lokhttp3/internal/j/a;->bAl:Lokhttp3/internal/j/a$e;
+    iput-object v1, p0, Lokhttp3/internal/j/a;->bAF:Lokhttp3/internal/j/a$e;
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bAq:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bAK:Ljava/util/concurrent/ScheduledFuture;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bAq:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bAK:Ljava/util/concurrent/ScheduledFuture;
 
     const/4 v2, 0x0
 
     invoke-interface {v1, v2}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
 
     :cond_1
-    iget-object v1, p0, Lokhttp3/internal/j/a;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {v1}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
 
@@ -912,7 +912,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bAg:Lokhttp3/WebSocketListener;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bAA:Lokhttp3/WebSocketListener;
 
     invoke-virtual {v1, p0, p1, p2}, Lokhttp3/WebSocketListener;->onFailure(Lokhttp3/WebSocket;Ljava/lang/Throwable;Lokhttp3/Response;)V
     :try_end_1
@@ -951,19 +951,19 @@
     monitor-enter p0
 
     :try_start_0
-    iput-object p2, p0, Lokhttp3/internal/j/a;->bAl:Lokhttp3/internal/j/a$e;
+    iput-object p2, p0, Lokhttp3/internal/j/a;->bAF:Lokhttp3/internal/j/a$e;
 
     new-instance v0, Lokhttp3/internal/j/d;
 
-    iget-boolean v1, p2, Lokhttp3/internal/j/a$e;->byk:Z
+    iget-boolean v1, p2, Lokhttp3/internal/j/a$e;->byE:Z
 
-    iget-object v2, p2, Lokhttp3/internal/j/a$e;->bwA:Lokio/BufferedSink;
+    iget-object v2, p2, Lokhttp3/internal/j/a$e;->bwU:Lokio/BufferedSink;
 
     iget-object v3, p0, Lokhttp3/internal/j/a;->random:Ljava/util/Random;
 
     invoke-direct {v0, v1, v2, v3}, Lokhttp3/internal/j/d;-><init>(ZLokio/BufferedSink;Ljava/util/Random;)V
 
-    iput-object v0, p0, Lokhttp3/internal/j/a;->bAk:Lokhttp3/internal/j/d;
+    iput-object v0, p0, Lokhttp3/internal/j/a;->bAE:Lokhttp3/internal/j/d;
 
     new-instance v0, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
 
@@ -977,9 +977,9 @@
 
     invoke-direct {v0, v1, p1}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;-><init>(ILjava/util/concurrent/ThreadFactory;)V
 
-    iput-object v0, p0, Lokhttp3/internal/j/a;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object v0, p0, Lokhttp3/internal/j/a;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget-wide v0, p0, Lokhttp3/internal/j/a;->bAh:J
+    iget-wide v0, p0, Lokhttp3/internal/j/a;->bAB:J
 
     const-wide/16 v2, 0x0
 
@@ -987,22 +987,22 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v1, Lokhttp3/internal/j/a$d;
 
     invoke-direct {v1, p0}, Lokhttp3/internal/j/a$d;-><init>(Lokhttp3/internal/j/a;)V
 
-    iget-wide v2, p0, Lokhttp3/internal/j/a;->bAh:J
+    iget-wide v2, p0, Lokhttp3/internal/j/a;->bAB:J
 
-    iget-wide v4, p0, Lokhttp3/internal/j/a;->bAh:J
+    iget-wide v4, p0, Lokhttp3/internal/j/a;->bAB:J
 
     sget-object v6, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
     invoke-interface/range {v0 .. v6}, Ljava/util/concurrent/ScheduledExecutorService;->scheduleAtFixedRate(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/j/a;->bAn:Ljava/util/ArrayDeque;
+    iget-object p1, p0, Lokhttp3/internal/j/a;->bAH:Ljava/util/ArrayDeque;
 
     invoke-virtual {p1}, Ljava/util/ArrayDeque;->isEmpty()Z
 
@@ -1010,7 +1010,7 @@
 
     if-nez p1, :cond_1
 
-    invoke-direct {p0}, Lokhttp3/internal/j/a;->Ij()V
+    invoke-direct {p0}, Lokhttp3/internal/j/a;->HW()V
 
     :cond_1
     monitor-exit p0
@@ -1019,13 +1019,13 @@
 
     new-instance p1, Lokhttp3/internal/j/c;
 
-    iget-boolean v0, p2, Lokhttp3/internal/j/a$e;->byk:Z
+    iget-boolean v0, p2, Lokhttp3/internal/j/a$e;->byE:Z
 
-    iget-object p2, p2, Lokhttp3/internal/j/a$e;->nJ:Lokio/d;
+    iget-object p2, p2, Lokhttp3/internal/j/a$e;->nI:Lokio/d;
 
     invoke-direct {p1, v0, p2, p0}, Lokhttp3/internal/j/c;-><init>(ZLokio/d;Lokhttp3/internal/j/c$a;)V
 
-    iput-object p1, p0, Lokhttp3/internal/j/a;->bAj:Lokhttp3/internal/j/c;
+    iput-object p1, p0, Lokhttp3/internal/j/a;->bAD:Lokhttp3/internal/j/c;
 
     return-void
 
@@ -1043,14 +1043,14 @@
 .method public final cancel()V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bwJ:Lokhttp3/e;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxd:Lokhttp3/e;
 
     invoke-interface {v0}, Lokhttp3/e;->cancel()V
 
     return-void
 .end method
 
-.method public final eH(Ljava/lang/String;)V
+.method public final eC(Ljava/lang/String;)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1058,19 +1058,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bAg:Lokhttp3/WebSocketListener;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bAA:Lokhttp3/WebSocketListener;
 
     invoke-virtual {v0, p0, p1}, Lokhttp3/WebSocketListener;->onMessage(Lokhttp3/WebSocket;Ljava/lang/String;)V
 
     return-void
 .end method
 
-.method public final et(Ljava/lang/String;)Z
+.method public final eo(Ljava/lang/String;)Z
     .locals 1
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {p1}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object p1
 
@@ -1098,7 +1098,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bAg:Lokhttp3/WebSocketListener;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bAA:Lokhttp3/WebSocketListener;
 
     invoke-virtual {v0, p0, p1}, Lokhttp3/WebSocketListener;->onMessage(Lokhttp3/WebSocket;Lokio/ByteString;)V
 
@@ -1125,21 +1125,21 @@
     monitor-enter p0
 
     :try_start_0
-    iget v1, p0, Lokhttp3/internal/j/a;->bAr:I
+    iget v1, p0, Lokhttp3/internal/j/a;->bAL:I
 
     if-ne v1, v0, :cond_3
 
-    iput p1, p0, Lokhttp3/internal/j/a;->bAr:I
+    iput p1, p0, Lokhttp3/internal/j/a;->bAL:I
 
-    iput-object p2, p0, Lokhttp3/internal/j/a;->bAs:Ljava/lang/String;
+    iput-object p2, p0, Lokhttp3/internal/j/a;->bAM:Ljava/lang/String;
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAp:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAJ:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bAn:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bAH:Ljava/util/ArrayDeque;
 
     invoke-virtual {v0}, Ljava/util/ArrayDeque;->isEmpty()Z
 
@@ -1147,22 +1147,22 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bAl:Lokhttp3/internal/j/a$e;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bAF:Lokhttp3/internal/j/a$e;
 
-    iput-object v1, p0, Lokhttp3/internal/j/a;->bAl:Lokhttp3/internal/j/a$e;
+    iput-object v1, p0, Lokhttp3/internal/j/a;->bAF:Lokhttp3/internal/j/a$e;
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bAq:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bAK:Ljava/util/concurrent/ScheduledFuture;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bAq:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bAK:Ljava/util/concurrent/ScheduledFuture;
 
     const/4 v2, 0x0
 
     invoke-interface {v1, v2}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
 
     :cond_0
-    iget-object v1, p0, Lokhttp3/internal/j/a;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {v1}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
 
@@ -1177,13 +1177,13 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bAg:Lokhttp3/WebSocketListener;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bAA:Lokhttp3/WebSocketListener;
 
     invoke-virtual {v1, p0, p1, p2}, Lokhttp3/WebSocketListener;->onClosing(Lokhttp3/WebSocket;ILjava/lang/String;)V
 
     if-eqz v0, :cond_2
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bAg:Lokhttp3/WebSocketListener;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bAA:Lokhttp3/WebSocketListener;
 
     invoke-virtual {v1, p0, p1, p2}, Lokhttp3/WebSocketListener;->onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
     :try_end_1
@@ -1234,15 +1234,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAt:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAN:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAp:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bAJ:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bAn:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bAH:Ljava/util/ArrayDeque;
 
     invoke-virtual {v0}, Ljava/util/ArrayDeque;->isEmpty()Z
 
@@ -1253,17 +1253,17 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bAm:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bAG:Ljava/util/ArrayDeque;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lokhttp3/internal/j/a;->Ij()V
+    invoke-direct {p0}, Lokhttp3/internal/j/a;->HW()V
 
-    iget p1, p0, Lokhttp3/internal/j/a;->bAv:I
+    iget p1, p0, Lokhttp3/internal/j/a;->bAP:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/j/a;->bAv:I
+    iput p1, p0, Lokhttp3/internal/j/a;->bAP:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/okhttp3/internal/j/c$a.smali b/com.discord/smali/okhttp3/internal/j/c$a.smali
index 175456498b..294af895b6 100644
--- a/com.discord/smali/okhttp3/internal/j/c$a.smali
+++ b/com.discord/smali/okhttp3/internal/j/c$a.smali
@@ -15,10 +15,10 @@
 
 
 # virtual methods
-.method public abstract Ii()V
+.method public abstract HV()V
 .end method
 
-.method public abstract eH(Ljava/lang/String;)V
+.method public abstract eC(Ljava/lang/String;)V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali/okhttp3/k$a.smali b/com.discord/smali/okhttp3/k$a.smali
index 5281b16dfa..a236891bca 100644
--- a/com.discord/smali/okhttp3/k$a.smali
+++ b/com.discord/smali/okhttp3/k$a.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field bsY:Z
+.field bts:Z
 
-.field bsZ:Z
+.field btt:Z
 
-.field bta:[Ljava/lang/String;
+.field btu:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field btb:[Ljava/lang/String;
+.field btv:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -36,21 +36,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-boolean v0, p1, Lokhttp3/k;->bsY:Z
+    iget-boolean v0, p1, Lokhttp3/k;->bts:Z
 
-    iput-boolean v0, p0, Lokhttp3/k$a;->bsY:Z
+    iput-boolean v0, p0, Lokhttp3/k$a;->bts:Z
 
-    iget-object v0, p1, Lokhttp3/k;->bta:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k;->btu:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k$a;->bta:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k$a;->btu:[Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/k;->btb:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k;->btv:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k$a;->btb:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k$a;->btv:[Ljava/lang/String;
 
-    iget-boolean p1, p1, Lokhttp3/k;->bsZ:Z
+    iget-boolean p1, p1, Lokhttp3/k;->btt:Z
 
-    iput-boolean p1, p0, Lokhttp3/k$a;->bsZ:Z
+    iput-boolean p1, p0, Lokhttp3/k$a;->btt:Z
 
     return-void
 .end method
@@ -60,23 +60,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lokhttp3/k$a;->bsY:Z
+    iput-boolean p1, p0, Lokhttp3/k$a;->bts:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Gt()Lokhttp3/k$a;
+.method public final Gi()Lokhttp3/k$a;
     .locals 2
 
-    iget-boolean v0, p0, Lokhttp3/k$a;->bsY:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bts:Z
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/k$a;->bsZ:Z
+    iput-boolean v0, p0, Lokhttp3/k$a;->btt:Z
 
     return-object p0
 
@@ -90,7 +90,7 @@
     throw v0
 .end method
 
-.method public final Gu()Lokhttp3/k;
+.method public final Gj()Lokhttp3/k;
     .locals 1
 
     new-instance v0, Lokhttp3/k;
@@ -103,7 +103,7 @@
 .method public final varargs a([Lokhttp3/h;)Lokhttp3/k$a;
     .locals 3
 
-    iget-boolean v0, p0, Lokhttp3/k$a;->bsY:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bts:Z
 
     if-eqz v0, :cond_1
 
@@ -154,7 +154,7 @@
 .method public final varargs a([Lokhttp3/z;)Lokhttp3/k$a;
     .locals 3
 
-    iget-boolean v0, p0, Lokhttp3/k$a;->bsY:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bts:Z
 
     if-eqz v0, :cond_1
 
@@ -205,7 +205,7 @@
 .method public final varargs d([Ljava/lang/String;)Lokhttp3/k$a;
     .locals 1
 
-    iget-boolean v0, p0, Lokhttp3/k$a;->bsY:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bts:Z
 
     if-eqz v0, :cond_1
 
@@ -219,7 +219,7 @@
 
     check-cast p1, [Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/k$a;->bta:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/k$a;->btu:[Ljava/lang/String;
 
     return-object p0
 
@@ -245,7 +245,7 @@
 .method public final varargs e([Ljava/lang/String;)Lokhttp3/k$a;
     .locals 1
 
-    iget-boolean v0, p0, Lokhttp3/k$a;->bsY:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bts:Z
 
     if-eqz v0, :cond_1
 
@@ -259,7 +259,7 @@
 
     check-cast p1, [Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/k$a;->btb:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/k$a;->btv:[Ljava/lang/String;
 
     return-object p0
 
diff --git a/com.discord/smali/okhttp3/k.smali b/com.discord/smali/okhttp3/k.smali
index 8b01c655bc..80981aaf24 100644
--- a/com.discord/smali/okhttp3/k.smali
+++ b/com.discord/smali/okhttp3/k.smali
@@ -12,30 +12,30 @@
 
 
 # static fields
-.field private static final bsS:[Lokhttp3/h;
+.field private static final btm:[Lokhttp3/h;
 
-.field private static final bsT:[Lokhttp3/h;
+.field private static final btn:[Lokhttp3/h;
 
-.field public static final bsU:Lokhttp3/k;
+.field public static final bto:Lokhttp3/k;
 
-.field public static final bsV:Lokhttp3/k;
+.field public static final btp:Lokhttp3/k;
 
-.field public static final bsW:Lokhttp3/k;
+.field public static final btq:Lokhttp3/k;
 
-.field public static final bsX:Lokhttp3/k;
+.field public static final btr:Lokhttp3/k;
 
 
 # instance fields
-.field final bsY:Z
+.field final bts:Z
 
-.field public final bsZ:Z
+.field public final btt:Z
 
-.field final bta:[Ljava/lang/String;
+.field final btu:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final btb:[Ljava/lang/String;
+.field final btv:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -49,169 +49,169 @@
 
     new-array v1, v0, [Lokhttp3/h;
 
-    sget-object v2, Lokhttp3/h;->bsG:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bta:Lokhttp3/h;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/h;->bsH:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->btb:Lokhttp3/h;
 
     const/4 v4, 0x1
 
     aput-object v2, v1, v4
 
-    sget-object v2, Lokhttp3/h;->bsI:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->btc:Lokhttp3/h;
 
     const/4 v5, 0x2
 
     aput-object v2, v1, v5
 
-    sget-object v2, Lokhttp3/h;->bsJ:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->btd:Lokhttp3/h;
 
     const/4 v6, 0x3
 
     aput-object v2, v1, v6
 
-    sget-object v2, Lokhttp3/h;->bsK:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bte:Lokhttp3/h;
 
     const/4 v7, 0x4
 
     aput-object v2, v1, v7
 
-    sget-object v2, Lokhttp3/h;->bss:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bsM:Lokhttp3/h;
 
     const/4 v8, 0x5
 
     aput-object v2, v1, v8
 
-    sget-object v2, Lokhttp3/h;->bsw:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bsQ:Lokhttp3/h;
 
     const/4 v9, 0x6
 
     aput-object v2, v1, v9
 
-    sget-object v2, Lokhttp3/h;->bst:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bsN:Lokhttp3/h;
 
     const/4 v10, 0x7
 
     aput-object v2, v1, v10
 
-    sget-object v2, Lokhttp3/h;->bsx:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bsR:Lokhttp3/h;
 
     const/16 v11, 0x8
 
     aput-object v2, v1, v11
 
-    sget-object v2, Lokhttp3/h;->bsD:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bsX:Lokhttp3/h;
 
     const/16 v12, 0x9
 
     aput-object v2, v1, v12
 
-    sget-object v2, Lokhttp3/h;->bsC:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bsW:Lokhttp3/h;
 
     const/16 v13, 0xa
 
     aput-object v2, v1, v13
 
-    sput-object v1, Lokhttp3/k;->bsS:[Lokhttp3/h;
+    sput-object v1, Lokhttp3/k;->btm:[Lokhttp3/h;
 
     const/16 v1, 0x12
 
     new-array v1, v1, [Lokhttp3/h;
 
-    sget-object v2, Lokhttp3/h;->bsG:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bta:Lokhttp3/h;
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/h;->bsH:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->btb:Lokhttp3/h;
 
     aput-object v2, v1, v4
 
-    sget-object v2, Lokhttp3/h;->bsI:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->btc:Lokhttp3/h;
 
     aput-object v2, v1, v5
 
-    sget-object v2, Lokhttp3/h;->bsJ:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->btd:Lokhttp3/h;
 
     aput-object v2, v1, v6
 
-    sget-object v2, Lokhttp3/h;->bsK:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bte:Lokhttp3/h;
 
     aput-object v2, v1, v7
 
-    sget-object v2, Lokhttp3/h;->bss:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bsM:Lokhttp3/h;
 
     aput-object v2, v1, v8
 
-    sget-object v2, Lokhttp3/h;->bsw:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bsQ:Lokhttp3/h;
 
     aput-object v2, v1, v9
 
-    sget-object v2, Lokhttp3/h;->bst:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bsN:Lokhttp3/h;
 
     aput-object v2, v1, v10
 
-    sget-object v2, Lokhttp3/h;->bsx:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bsR:Lokhttp3/h;
 
     aput-object v2, v1, v11
 
-    sget-object v2, Lokhttp3/h;->bsD:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bsX:Lokhttp3/h;
 
     aput-object v2, v1, v12
 
-    sget-object v2, Lokhttp3/h;->bsC:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bsW:Lokhttp3/h;
 
     aput-object v2, v1, v13
 
-    sget-object v2, Lokhttp3/h;->bsd:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bsx:Lokhttp3/h;
 
     aput-object v2, v1, v0
 
-    sget-object v0, Lokhttp3/h;->bse:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bsy:Lokhttp3/h;
 
     const/16 v2, 0xc
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->brB:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->brV:Lokhttp3/h;
 
     const/16 v2, 0xd
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->brC:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->brW:Lokhttp3/h;
 
     const/16 v2, 0xe
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->bqZ:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->brt:Lokhttp3/h;
 
     const/16 v2, 0xf
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->brd:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->brx:Lokhttp3/h;
 
     const/16 v2, 0x10
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->bqD:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bqX:Lokhttp3/h;
 
     const/16 v2, 0x11
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lokhttp3/k;->bsT:[Lokhttp3/h;
+    sput-object v1, Lokhttp3/k;->btn:[Lokhttp3/h;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v4}, Lokhttp3/k$a;-><init>(Z)V
 
-    sget-object v1, Lokhttp3/k;->bsS:[Lokhttp3/h;
+    sget-object v1, Lokhttp3/k;->btm:[Lokhttp3/h;
 
     invoke-virtual {v0, v1}, Lokhttp3/k$a;->a([Lokhttp3/h;)Lokhttp3/k$a;
 
@@ -219,11 +219,11 @@
 
     new-array v1, v5, [Lokhttp3/z;
 
-    sget-object v2, Lokhttp3/z;->bvq:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bvK:Lokhttp3/z;
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/z;->bvr:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bvL:Lokhttp3/z;
 
     aput-object v2, v1, v4
 
@@ -231,21 +231,21 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Gt()Lokhttp3/k$a;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Gi()Lokhttp3/k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Gu()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Gj()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bsU:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->bto:Lokhttp3/k;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v4}, Lokhttp3/k$a;-><init>(Z)V
 
-    sget-object v1, Lokhttp3/k;->bsT:[Lokhttp3/h;
+    sget-object v1, Lokhttp3/k;->btn:[Lokhttp3/h;
 
     invoke-virtual {v0, v1}, Lokhttp3/k$a;->a([Lokhttp3/h;)Lokhttp3/k$a;
 
@@ -253,19 +253,19 @@
 
     new-array v1, v7, [Lokhttp3/z;
 
-    sget-object v2, Lokhttp3/z;->bvq:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bvK:Lokhttp3/z;
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/z;->bvr:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bvL:Lokhttp3/z;
 
     aput-object v2, v1, v4
 
-    sget-object v2, Lokhttp3/z;->bvs:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bvM:Lokhttp3/z;
 
     aput-object v2, v1, v5
 
-    sget-object v2, Lokhttp3/z;->bvt:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bvN:Lokhttp3/z;
 
     aput-object v2, v1, v6
 
@@ -273,21 +273,21 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Gt()Lokhttp3/k$a;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Gi()Lokhttp3/k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Gu()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Gj()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bsV:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->btp:Lokhttp3/k;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v4}, Lokhttp3/k$a;-><init>(Z)V
 
-    sget-object v1, Lokhttp3/k;->bsT:[Lokhttp3/h;
+    sget-object v1, Lokhttp3/k;->btn:[Lokhttp3/h;
 
     invoke-virtual {v0, v1}, Lokhttp3/k$a;->a([Lokhttp3/h;)Lokhttp3/k$a;
 
@@ -295,7 +295,7 @@
 
     new-array v1, v4, [Lokhttp3/z;
 
-    sget-object v2, Lokhttp3/z;->bvt:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bvN:Lokhttp3/z;
 
     aput-object v2, v1, v3
 
@@ -303,25 +303,25 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Gt()Lokhttp3/k$a;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Gi()Lokhttp3/k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Gu()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Gj()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bsW:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->btq:Lokhttp3/k;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v3}, Lokhttp3/k$a;-><init>(Z)V
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Gu()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Gj()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bsX:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->btr:Lokhttp3/k;
 
     return-void
 .end method
@@ -331,21 +331,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-boolean v0, p1, Lokhttp3/k$a;->bsY:Z
+    iget-boolean v0, p1, Lokhttp3/k$a;->bts:Z
 
-    iput-boolean v0, p0, Lokhttp3/k;->bsY:Z
+    iput-boolean v0, p0, Lokhttp3/k;->bts:Z
 
-    iget-object v0, p1, Lokhttp3/k$a;->bta:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k$a;->btu:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k;->bta:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k;->btu:[Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/k$a;->btb:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k$a;->btv:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k;->btb:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k;->btv:[Ljava/lang/String;
 
-    iget-boolean p1, p1, Lokhttp3/k$a;->bsZ:Z
+    iget-boolean p1, p1, Lokhttp3/k$a;->btt:Z
 
-    iput-boolean p1, p0, Lokhttp3/k;->bsZ:Z
+    iput-boolean p1, p0, Lokhttp3/k;->btt:Z
 
     return-void
 .end method
@@ -355,7 +355,7 @@
 .method public final b(Ljavax/net/ssl/SSLSocket;)Z
     .locals 4
 
-    iget-boolean v0, p0, Lokhttp3/k;->bsY:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bts:Z
 
     const/4 v1, 0x0
 
@@ -364,13 +364,13 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/k;->btb:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->btv:[Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lokhttp3/internal/c;->aXt:Ljava/util/Comparator;
+    sget-object v0, Lokhttp3/internal/c;->aXL:Ljava/util/Comparator;
 
-    iget-object v2, p0, Lokhttp3/k;->btb:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->btv:[Ljava/lang/String;
 
     invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
 
@@ -385,13 +385,13 @@
     return v1
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/k;->bta:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->btu:[Ljava/lang/String;
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lokhttp3/h;->bqv:Ljava/util/Comparator;
+    sget-object v0, Lokhttp3/h;->bqP:Ljava/util/Comparator;
 
-    iget-object v2, p0, Lokhttp3/k;->bta:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->btu:[Ljava/lang/String;
 
     invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
 
@@ -436,9 +436,9 @@
     :cond_1
     check-cast p1, Lokhttp3/k;
 
-    iget-boolean v2, p0, Lokhttp3/k;->bsY:Z
+    iget-boolean v2, p0, Lokhttp3/k;->bts:Z
 
-    iget-boolean v3, p1, Lokhttp3/k;->bsY:Z
+    iget-boolean v3, p1, Lokhttp3/k;->bts:Z
 
     if-eq v2, v3, :cond_2
 
@@ -447,9 +447,9 @@
     :cond_2
     if-eqz v2, :cond_5
 
-    iget-object v2, p0, Lokhttp3/k;->bta:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->btu:[Ljava/lang/String;
 
-    iget-object v3, p1, Lokhttp3/k;->bta:[Ljava/lang/String;
+    iget-object v3, p1, Lokhttp3/k;->btu:[Ljava/lang/String;
 
     invoke-static {v2, v3}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
 
@@ -460,9 +460,9 @@
     return v1
 
     :cond_3
-    iget-object v2, p0, Lokhttp3/k;->btb:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->btv:[Ljava/lang/String;
 
-    iget-object v3, p1, Lokhttp3/k;->btb:[Ljava/lang/String;
+    iget-object v3, p1, Lokhttp3/k;->btv:[Ljava/lang/String;
 
     invoke-static {v2, v3}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
 
@@ -473,9 +473,9 @@
     return v1
 
     :cond_4
-    iget-boolean v2, p0, Lokhttp3/k;->bsZ:Z
+    iget-boolean v2, p0, Lokhttp3/k;->btt:Z
 
-    iget-boolean p1, p1, Lokhttp3/k;->bsZ:Z
+    iget-boolean p1, p1, Lokhttp3/k;->btt:Z
 
     if-eq v2, p1, :cond_5
 
@@ -488,11 +488,11 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-boolean v0, p0, Lokhttp3/k;->bsY:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bts:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/k;->bta:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->btu:[Ljava/lang/String;
 
     invoke-static {v0}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
 
@@ -502,7 +502,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/k;->btb:[Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/k;->btv:[Ljava/lang/String;
 
     invoke-static {v1}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
 
@@ -512,7 +512,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/k;->bsZ:Z
+    iget-boolean v1, p0, Lokhttp3/k;->btt:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -530,7 +530,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 4
 
-    iget-boolean v0, p0, Lokhttp3/k;->bsY:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bts:Z
 
     if-nez v0, :cond_0
 
@@ -539,7 +539,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/k;->bta:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->btu:[Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -569,7 +569,7 @@
     move-object v0, v2
 
     :goto_1
-    iget-object v3, p0, Lokhttp3/k;->btb:[Ljava/lang/String;
+    iget-object v3, p0, Lokhttp3/k;->btv:[Ljava/lang/String;
 
     if-eqz v3, :cond_4
 
@@ -603,7 +603,7 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v0, p0, Lokhttp3/k;->bsZ:Z
+    iget-boolean v0, p0, Lokhttp3/k;->btt:Z
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/okhttp3/l$a.smali b/com.discord/smali/okhttp3/l$a.smali
index 70cc76d4ce..dbc46b9704 100644
--- a/com.discord/smali/okhttp3/l$a.smali
+++ b/com.discord/smali/okhttp3/l$a.smali
@@ -15,20 +15,20 @@
 
 
 # instance fields
-.field public btg:J
+.field public btA:J
 
-.field bth:Ljava/lang/String;
+.field btB:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bti:Z
+.field public btC:Z
 
-.field public btj:Z
+.field public btD:Z
 
-.field public btk:Z
+.field public btE:Z
 
-.field btl:Z
+.field btF:Z
 
 .field public name:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
@@ -51,7 +51,7 @@
 
     const-wide v0, 0xe677d21fdbffL
 
-    iput-wide v0, p0, Lokhttp3/l$a;->btg:J
+    iput-wide v0, p0, Lokhttp3/l$a;->btA:J
 
     const-string v0, "/"
 
@@ -67,15 +67,15 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lokhttp3/internal/c;->eu(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lokhttp3/internal/c;->ep(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    iput-object v0, p0, Lokhttp3/l$a;->bth:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/l$a;->btB:Ljava/lang/String;
 
-    iput-boolean p2, p0, Lokhttp3/l$a;->btl:Z
+    iput-boolean p2, p0, Lokhttp3/l$a;->btF:Z
 
     return-object p0
 
diff --git a/com.discord/smali/okhttp3/l.smali b/com.discord/smali/okhttp3/l.smali
index 83d515763e..36abeaa012 100644
--- a/com.discord/smali/okhttp3/l.smali
+++ b/com.discord/smali/okhttp3/l.smali
@@ -12,27 +12,27 @@
 
 
 # static fields
-.field private static final btc:Ljava/util/regex/Pattern;
+.field private static final btw:Ljava/util/regex/Pattern;
 
-.field private static final btd:Ljava/util/regex/Pattern;
+.field private static final btx:Ljava/util/regex/Pattern;
 
-.field private static final bte:Ljava/util/regex/Pattern;
+.field private static final bty:Ljava/util/regex/Pattern;
 
-.field private static final btf:Ljava/util/regex/Pattern;
+.field private static final btz:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field public final btg:J
+.field public final btA:J
 
-.field public final bth:Ljava/lang/String;
+.field public final btB:Ljava/lang/String;
 
-.field public final bti:Z
+.field public final btC:Z
 
-.field public final btj:Z
+.field public final btD:Z
 
-.field public final btk:Z
+.field public final btE:Z
 
-.field public final btl:Z
+.field public final btF:Z
 
 .field public final name:Ljava/lang/String;
 
@@ -51,7 +51,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/l;->btc:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->btw:Ljava/util/regex/Pattern;
 
     const-string v0, "(?i)(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*"
 
@@ -59,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/l;->btd:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->btx:Ljava/util/regex/Pattern;
 
     const-string v0, "(\\d{1,2})[^\\d]*"
 
@@ -67,7 +67,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/l;->bte:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->bty:Ljava/util/regex/Pattern;
 
     const-string v0, "(\\d{1,2}):(\\d{1,2}):(\\d{1,2})[^\\d]*"
 
@@ -75,7 +75,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/l;->btf:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->btz:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -89,19 +89,19 @@
 
     iput-object p2, p0, Lokhttp3/l;->value:Ljava/lang/String;
 
-    iput-wide p3, p0, Lokhttp3/l;->btg:J
+    iput-wide p3, p0, Lokhttp3/l;->btA:J
 
-    iput-object p5, p0, Lokhttp3/l;->bth:Ljava/lang/String;
+    iput-object p5, p0, Lokhttp3/l;->btB:Ljava/lang/String;
 
     iput-object p6, p0, Lokhttp3/l;->path:Ljava/lang/String;
 
-    iput-boolean p7, p0, Lokhttp3/l;->bti:Z
+    iput-boolean p7, p0, Lokhttp3/l;->btC:Z
 
-    iput-boolean p8, p0, Lokhttp3/l;->btj:Z
+    iput-boolean p8, p0, Lokhttp3/l;->btD:Z
 
-    iput-boolean p9, p0, Lokhttp3/l;->btl:Z
+    iput-boolean p9, p0, Lokhttp3/l;->btF:Z
 
-    iput-boolean p10, p0, Lokhttp3/l;->btk:Z
+    iput-boolean p10, p0, Lokhttp3/l;->btE:Z
 
     return-void
 .end method
@@ -119,7 +119,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/l$a;->bth:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/l$a;->btB:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -131,33 +131,33 @@
 
     iput-object v0, p0, Lokhttp3/l;->value:Ljava/lang/String;
 
-    iget-wide v0, p1, Lokhttp3/l$a;->btg:J
+    iget-wide v0, p1, Lokhttp3/l$a;->btA:J
 
-    iput-wide v0, p0, Lokhttp3/l;->btg:J
+    iput-wide v0, p0, Lokhttp3/l;->btA:J
 
-    iget-object v0, p1, Lokhttp3/l$a;->bth:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/l$a;->btB:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/l;->bth:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/l;->btB:Ljava/lang/String;
 
     iget-object v0, p1, Lokhttp3/l$a;->path:Ljava/lang/String;
 
     iput-object v0, p0, Lokhttp3/l;->path:Ljava/lang/String;
 
-    iget-boolean v0, p1, Lokhttp3/l$a;->bti:Z
+    iget-boolean v0, p1, Lokhttp3/l$a;->btC:Z
 
-    iput-boolean v0, p0, Lokhttp3/l;->bti:Z
+    iput-boolean v0, p0, Lokhttp3/l;->btC:Z
 
-    iget-boolean v0, p1, Lokhttp3/l$a;->btj:Z
+    iget-boolean v0, p1, Lokhttp3/l$a;->btD:Z
 
-    iput-boolean v0, p0, Lokhttp3/l;->btj:Z
+    iput-boolean v0, p0, Lokhttp3/l;->btD:Z
 
-    iget-boolean v0, p1, Lokhttp3/l$a;->btk:Z
+    iget-boolean v0, p1, Lokhttp3/l$a;->btE:Z
 
-    iput-boolean v0, p0, Lokhttp3/l;->btk:Z
+    iput-boolean v0, p0, Lokhttp3/l;->btE:Z
 
-    iget-boolean p1, p1, Lokhttp3/l$a;->btl:Z
+    iget-boolean p1, p1, Lokhttp3/l$a;->btF:Z
 
-    iput-boolean p1, p0, Lokhttp3/l;->btl:Z
+    iput-boolean p1, p0, Lokhttp3/l;->btF:Z
 
     return-void
 
@@ -286,7 +286,7 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     array-length v0, v0
 
@@ -305,7 +305,7 @@
     :goto_0
     if-ge v4, v0, :cond_2
 
-    invoke-virtual {p1, v4}, Lokhttp3/Headers;->dz(I)Ljava/lang/String;
+    invoke-virtual {p1, v4}, Lokhttp3/Headers;->dw(I)Ljava/lang/String;
 
     move-result-object v6
 
@@ -324,7 +324,7 @@
     invoke-direct {v5, v1}, Ljava/util/ArrayList;-><init>(I)V
 
     :cond_0
-    invoke-virtual {p1, v4}, Lokhttp3/Headers;->dA(I)Ljava/lang/String;
+    invoke-virtual {p1, v4}, Lokhttp3/Headers;->dx(I)Ljava/lang/String;
 
     move-result-object v6
 
@@ -448,7 +448,7 @@
 
     if-nez v9, :cond_28
 
-    invoke-static {v10}, Lokhttp3/internal/c;->ew(Ljava/lang/String;)I
+    invoke-static {v10}, Lokhttp3/internal/c;->er(Ljava/lang/String;)I
 
     move-result v9
 
@@ -467,7 +467,7 @@
 
     move-result-object v7
 
-    invoke-static {v7}, Lokhttp3/internal/c;->ew(Ljava/lang/String;)I
+    invoke-static {v7}, Lokhttp3/internal/c;->er(Ljava/lang/String;)I
 
     move-result v12
 
@@ -538,7 +538,7 @@
 
     move-result v6
 
-    sget-object v12, Lokhttp3/l;->btf:Ljava/util/regex/Pattern;
+    sget-object v12, Lokhttp3/l;->btz:Ljava/util/regex/Pattern;
 
     invoke-virtual {v12, v15}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -571,7 +571,7 @@
 
     if-ne v3, v6, :cond_4
 
-    sget-object v6, Lokhttp3/l;->btf:Ljava/util/regex/Pattern;
+    sget-object v6, Lokhttp3/l;->btz:Ljava/util/regex/Pattern;
 
     invoke-virtual {v12, v6}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
 
@@ -624,7 +624,7 @@
 
     if-ne v6, v9, :cond_6
 
-    sget-object v9, Lokhttp3/l;->bte:Ljava/util/regex/Pattern;
+    sget-object v9, Lokhttp3/l;->bty:Ljava/util/regex/Pattern;
 
     invoke-virtual {v12, v9}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
 
@@ -654,7 +654,7 @@
     :cond_6
     if-ne v4, v9, :cond_8
 
-    sget-object v9, Lokhttp3/l;->btd:Ljava/util/regex/Pattern;
+    sget-object v9, Lokhttp3/l;->btx:Ljava/util/regex/Pattern;
 
     invoke-virtual {v12, v9}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
 
@@ -678,7 +678,7 @@
 
     move-result-object v4
 
-    sget-object v9, Lokhttp3/l;->btd:Ljava/util/regex/Pattern;
+    sget-object v9, Lokhttp3/l;->btx:Ljava/util/regex/Pattern;
 
     invoke-virtual {v9}, Ljava/util/regex/Pattern;->pattern()Ljava/lang/String;
 
@@ -698,7 +698,7 @@
     :cond_8
     if-ne v13, v9, :cond_9
 
-    sget-object v9, Lokhttp3/l;->btc:Ljava/util/regex/Pattern;
+    sget-object v9, Lokhttp3/l;->btw:Ljava/util/regex/Pattern;
 
     invoke-virtual {v12, v9}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
 
@@ -807,7 +807,7 @@
     :try_start_1
     new-instance v15, Ljava/util/GregorianCalendar;
 
-    sget-object v9, Lokhttp3/internal/c;->bvJ:Ljava/util/TimeZone;
+    sget-object v9, Lokhttp3/internal/c;->bwd:Ljava/util/TimeZone;
 
     invoke-direct {v15, v9}, Ljava/util/GregorianCalendar;-><init>(Ljava/util/TimeZone;)V
 
@@ -924,7 +924,7 @@
     if-eqz v3, :cond_14
 
     :try_start_2
-    invoke-static {v15}, Lokhttp3/l;->ec(Ljava/lang/String;)J
+    invoke-static {v15}, Lokhttp3/l;->dW(Ljava/lang/String;)J
 
     move-result-wide v3
     :try_end_2
@@ -976,7 +976,7 @@
     const/4 v3, 0x1
 
     :goto_6
-    invoke-static {v15}, Lokhttp3/internal/c;->eu(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v15}, Lokhttp3/internal/c;->ep(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -1135,7 +1135,7 @@
     move-wide/from16 v12, v21
 
     :goto_b
-    iget-object v1, v0, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s;->bud:Ljava/lang/String;
 
     if-nez v8, :cond_22
 
@@ -1172,11 +1172,11 @@
 
     if-eq v1, v3, :cond_24
 
-    invoke-static {}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->Ig()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+    invoke-static {}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->HT()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
     move-result-object v1
 
-    invoke-virtual {v1, v14}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->eG(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v1, v14}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->eB(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -1206,7 +1206,7 @@
 
     :cond_26
     :goto_d
-    invoke-virtual/range {p2 .. p2}, Lokhttp3/s;->GF()Ljava/lang/String;
+    invoke-virtual/range {p2 .. p2}, Lokhttp3/s;->Gu()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1256,7 +1256,7 @@
 .method public static a(Lokhttp3/s;Ljava/lang/String;)Z
     .locals 2
 
-    invoke-virtual {p0}, Lokhttp3/s;->GF()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Gu()Ljava/lang/String;
 
     move-result-object p0
 
@@ -1308,61 +1308,7 @@
     return p0
 .end method
 
-.method public static domainMatch(Ljava/lang/String;Ljava/lang/String;)Z
-    .locals 2
-
-    invoke-virtual {p0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_0
-    invoke-virtual {p0, p1}, Ljava/lang/String;->endsWith(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result p1
-
-    sub-int/2addr v0, p1
-
-    sub-int/2addr v0, v1
-
-    invoke-virtual {p0, v0}, Ljava/lang/String;->charAt(I)C
-
-    move-result p1
-
-    const/16 v0, 0x2e
-
-    if-ne p1, v0, :cond_1
-
-    invoke-static {p0}, Lokhttp3/internal/c;->ex(Ljava/lang/String;)Z
-
-    move-result p0
-
-    if-nez p0, :cond_1
-
-    return v1
-
-    :cond_1
-    const/4 p0, 0x0
-
-    return p0
-.end method
-
-.method private static ec(Ljava/lang/String;)J
+.method private static dW(Ljava/lang/String;)J
     .locals 6
 
     const-wide/high16 v0, -0x8000000000000000L
@@ -1415,6 +1361,60 @@
     throw v2
 .end method
 
+.method public static domainMatch(Ljava/lang/String;Ljava/lang/String;)Z
+    .locals 2
+
+    invoke-virtual {p0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    return v1
+
+    :cond_0
+    invoke-virtual {p0, p1}, Ljava/lang/String;->endsWith(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result p1
+
+    sub-int/2addr v0, p1
+
+    sub-int/2addr v0, v1
+
+    invoke-virtual {p0, v0}, Ljava/lang/String;->charAt(I)C
+
+    move-result p1
+
+    const/16 v0, 0x2e
+
+    if-ne p1, v0, :cond_1
+
+    invoke-static {p0}, Lokhttp3/internal/c;->es(Ljava/lang/String;)Z
+
+    move-result p0
+
+    if-nez p0, :cond_1
+
+    return v1
+
+    :cond_1
+    const/4 p0, 0x0
+
+    return p0
+.end method
+
 
 # virtual methods
 .method public final equals(Ljava/lang/Object;)Z
@@ -1455,9 +1455,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/l;->bth:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/l;->btB:Ljava/lang/String;
 
-    iget-object v2, p0, Lokhttp3/l;->bth:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/l;->btB:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1475,35 +1475,35 @@
 
     if-eqz v0, :cond_1
 
-    iget-wide v2, p1, Lokhttp3/l;->btg:J
+    iget-wide v2, p1, Lokhttp3/l;->btA:J
 
-    iget-wide v4, p0, Lokhttp3/l;->btg:J
+    iget-wide v4, p0, Lokhttp3/l;->btA:J
 
     cmp-long v0, v2, v4
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p1, Lokhttp3/l;->bti:Z
+    iget-boolean v0, p1, Lokhttp3/l;->btC:Z
 
-    iget-boolean v2, p0, Lokhttp3/l;->bti:Z
+    iget-boolean v2, p0, Lokhttp3/l;->btC:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-boolean v0, p1, Lokhttp3/l;->btj:Z
+    iget-boolean v0, p1, Lokhttp3/l;->btD:Z
 
-    iget-boolean v2, p0, Lokhttp3/l;->btj:Z
+    iget-boolean v2, p0, Lokhttp3/l;->btD:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-boolean v0, p1, Lokhttp3/l;->btk:Z
+    iget-boolean v0, p1, Lokhttp3/l;->btE:Z
 
-    iget-boolean v2, p0, Lokhttp3/l;->btk:Z
+    iget-boolean v2, p0, Lokhttp3/l;->btE:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-boolean p1, p1, Lokhttp3/l;->btl:Z
+    iget-boolean p1, p1, Lokhttp3/l;->btF:Z
 
-    iget-boolean v0, p0, Lokhttp3/l;->btl:Z
+    iget-boolean v0, p0, Lokhttp3/l;->btF:Z
 
     if-ne p1, v0, :cond_1
 
@@ -1538,7 +1538,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/l;->bth:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/l;->btB:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
@@ -1558,7 +1558,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-wide v1, p0, Lokhttp3/l;->btg:J
+    iget-wide v1, p0, Lokhttp3/l;->btA:J
 
     const/16 v3, 0x20
 
@@ -1572,7 +1572,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->bti:Z
+    iget-boolean v1, p0, Lokhttp3/l;->btC:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1580,7 +1580,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->btj:Z
+    iget-boolean v1, p0, Lokhttp3/l;->btD:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1588,7 +1588,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->btk:Z
+    iget-boolean v1, p0, Lokhttp3/l;->btE:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1596,7 +1596,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->btl:Z
+    iget-boolean v1, p0, Lokhttp3/l;->btF:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1624,11 +1624,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lokhttp3/l;->btk:Z
+    iget-boolean v1, p0, Lokhttp3/l;->btE:Z
 
     if-eqz v1, :cond_1
 
-    iget-wide v1, p0, Lokhttp3/l;->btg:J
+    iget-wide v1, p0, Lokhttp3/l;->btA:J
 
     const-wide/high16 v3, -0x8000000000000000L
 
@@ -1649,7 +1649,7 @@
 
     new-instance v1, Ljava/util/Date;
 
-    iget-wide v2, p0, Lokhttp3/l;->btg:J
+    iget-wide v2, p0, Lokhttp3/l;->btA:J
 
     invoke-direct {v1, v2, v3}, Ljava/util/Date;-><init>(J)V
 
@@ -1661,7 +1661,7 @@
 
     :cond_1
     :goto_0
-    iget-boolean v1, p0, Lokhttp3/l;->btl:Z
+    iget-boolean v1, p0, Lokhttp3/l;->btF:Z
 
     if-nez v1, :cond_2
 
@@ -1669,7 +1669,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/l;->bth:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/l;->btB:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1682,7 +1682,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lokhttp3/l;->bti:Z
+    iget-boolean v1, p0, Lokhttp3/l;->btC:Z
 
     if-eqz v1, :cond_3
 
@@ -1691,7 +1691,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_3
-    iget-boolean v1, p0, Lokhttp3/l;->btj:Z
+    iget-boolean v1, p0, Lokhttp3/l;->btD:Z
 
     if-eqz v1, :cond_4
 
diff --git a/com.discord/smali/okhttp3/n.smali b/com.discord/smali/okhttp3/n.smali
index 59c64b9616..e387c02bb0 100644
--- a/com.discord/smali/okhttp3/n.smali
+++ b/com.discord/smali/okhttp3/n.smali
@@ -8,16 +8,16 @@
 
 
 # instance fields
-.field private btn:I
+.field private btH:I
 
-.field private bto:I
+.field private btI:I
 
-.field private btp:Ljava/lang/Runnable;
+.field private btJ:Ljava/lang/Runnable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final btq:Ljava/util/Deque;
+.field final btK:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final btr:Ljava/util/Deque;
+.field private final btL:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private final bts:Ljava/util/Deque;
+.field private final btM:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -67,34 +67,34 @@
 
     const/16 v0, 0x40
 
-    iput v0, p0, Lokhttp3/n;->btn:I
+    iput v0, p0, Lokhttp3/n;->btH:I
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lokhttp3/n;->bto:I
+    iput v0, p0, Lokhttp3/n;->btI:I
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/n;->btq:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/n;->btK:Ljava/util/Deque;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/n;->btr:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/n;->btL:Ljava/util/Deque;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/n;->bts:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/n;->btM:Ljava/util/Deque;
 
     return-void
 .end method
 
-.method private declared-synchronized Gv()Ljava/util/concurrent/ExecutorService;
+.method private declared-synchronized Gk()Ljava/util/concurrent/ExecutorService;
     .locals 9
 
     monitor-enter p0
@@ -149,19 +149,19 @@
     throw v0
 .end method
 
-.method private declared-synchronized Gx()I
+.method private declared-synchronized Gm()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/n;->btr:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->btL:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->size()I
 
     move-result v0
 
-    iget-object v1, p0, Lokhttp3/n;->bts:Ljava/util/Deque;
+    iget-object v1, p0, Lokhttp3/n;->btM:Ljava/util/Deque;
 
     invoke-interface {v1}, Ljava/util/Deque;->size()I
 
@@ -186,7 +186,7 @@
 .method private a(Lokhttp3/v$a;)I
     .locals 4
 
-    iget-object v0, p0, Lokhttp3/n;->btr:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->btL:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -208,17 +208,17 @@
 
     check-cast v2, Lokhttp3/v$a;
 
-    iget-object v3, v2, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v3, v2, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
-    iget-boolean v3, v3, Lokhttp3/v;->buO:Z
+    iget-boolean v3, v3, Lokhttp3/v;->bvi:Z
 
     if-nez v3, :cond_0
 
-    invoke-virtual {v2}, Lokhttp3/v$a;->GX()Ljava/lang/String;
+    invoke-virtual {v2}, Lokhttp3/v$a;->GL()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lokhttp3/v$a;->GX()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/v$a;->GL()Ljava/lang/String;
 
     move-result-object v3
 
@@ -257,13 +257,13 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lokhttp3/n;->btp:Ljava/lang/Runnable;
+    iget-object p1, p0, Lokhttp3/n;->btJ:Ljava/lang/Runnable;
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lokhttp3/n;->Gw()Z
+    invoke-virtual {p0}, Lokhttp3/n;->Gl()Z
 
     move-result p2
 
@@ -298,7 +298,7 @@
 
 
 # virtual methods
-.method final Gw()Z
+.method final Gl()Z
     .locals 8
 
     new-instance v0, Ljava/util/ArrayList;
@@ -308,7 +308,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/n;->btq:Ljava/util/Deque;
+    iget-object v1, p0, Lokhttp3/n;->btK:Ljava/util/Deque;
 
     invoke-interface {v1}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -328,13 +328,13 @@
 
     check-cast v2, Lokhttp3/v$a;
 
-    iget-object v3, p0, Lokhttp3/n;->btr:Ljava/util/Deque;
+    iget-object v3, p0, Lokhttp3/n;->btL:Ljava/util/Deque;
 
     invoke-interface {v3}, Ljava/util/Deque;->size()I
 
     move-result v3
 
-    iget v4, p0, Lokhttp3/n;->btn:I
+    iget v4, p0, Lokhttp3/n;->btH:I
 
     if-ge v3, v4, :cond_1
 
@@ -342,7 +342,7 @@
 
     move-result v3
 
-    iget v4, p0, Lokhttp3/n;->bto:I
+    iget v4, p0, Lokhttp3/n;->btI:I
 
     if-ge v3, v4, :cond_0
 
@@ -350,14 +350,14 @@
 
     invoke-interface {v0, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v3, p0, Lokhttp3/n;->btr:Ljava/util/Deque;
+    iget-object v3, p0, Lokhttp3/n;->btL:Ljava/util/Deque;
 
     invoke-interface {v3, v2}, Ljava/util/Deque;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_1
-    invoke-direct {p0}, Lokhttp3/n;->Gx()I
+    invoke-direct {p0}, Lokhttp3/n;->Gm()I
 
     move-result v1
 
@@ -390,7 +390,7 @@
 
     check-cast v4, Lokhttp3/v$a;
 
-    invoke-direct {p0}, Lokhttp3/n;->Gv()Ljava/util/concurrent/ExecutorService;
+    invoke-direct {p0}, Lokhttp3/n;->Gk()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v5
 
@@ -419,21 +419,21 @@
 
     invoke-virtual {v6, v5}, Ljava/io/InterruptedIOException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
-    iget-object v5, v4, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v5, v4, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
     invoke-static {v5}, Lokhttp3/v;->c(Lokhttp3/v;)Lokhttp3/p;
 
-    iget-object v5, v4, Lokhttp3/v$a;->buR:Lokhttp3/f;
+    iget-object v5, v4, Lokhttp3/v$a;->bvl:Lokhttp3/f;
 
     invoke-interface {v5, v6}, Lokhttp3/f;->a(Ljava/io/IOException;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-object v5, v4, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v5, v4, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
-    iget-object v5, v5, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v5, v5, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget-object v5, v5, Lokhttp3/t;->bun:Lokhttp3/n;
+    iget-object v5, v5, Lokhttp3/t;->buH:Lokhttp3/n;
 
     invoke-virtual {v5, v4}, Lokhttp3/n;->b(Lokhttp3/v$a;)V
 
@@ -443,11 +443,11 @@
     goto :goto_2
 
     :goto_4
-    iget-object v1, v4, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v1, v4, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v1, v1, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->bun:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->buH:Lokhttp3/n;
 
     invoke-virtual {v1, v4}, Lokhttp3/n;->b(Lokhttp3/v$a;)V
 
@@ -479,7 +479,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/n;->bts:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->btM:Ljava/util/Deque;
 
     invoke-interface {v0, p1}, Ljava/util/Deque;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -500,7 +500,7 @@
 .method final b(Lokhttp3/v$a;)V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/n;->btr:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->btL:Ljava/util/Deque;
 
     invoke-direct {p0, v0, p1}, Lokhttp3/n;->a(Ljava/util/Deque;Ljava/lang/Object;)V
 
@@ -510,7 +510,7 @@
 .method final b(Lokhttp3/v;)V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/n;->bts:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->btM:Ljava/util/Deque;
 
     invoke-direct {p0, v0, p1}, Lokhttp3/n;->a(Ljava/util/Deque;Ljava/lang/Object;)V
 
@@ -523,7 +523,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/n;->btq:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->btK:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -542,16 +542,16 @@
 
     check-cast v1, Lokhttp3/v$a;
 
-    iget-object v1, v1, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v1, v1, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->buK:Lokhttp3/internal/c/j;
+    iget-object v1, v1, Lokhttp3/v;->bve:Lokhttp3/internal/c/j;
 
     invoke-virtual {v1}, Lokhttp3/internal/c/j;->cancel()V
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/n;->btr:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->btL:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -570,16 +570,16 @@
 
     check-cast v1, Lokhttp3/v$a;
 
-    iget-object v1, v1, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v1, v1, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->buK:Lokhttp3/internal/c/j;
+    iget-object v1, v1, Lokhttp3/v;->bve:Lokhttp3/internal/c/j;
 
     invoke-virtual {v1}, Lokhttp3/internal/c/j;->cancel()V
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/n;->bts:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->btM:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -598,7 +598,7 @@
 
     check-cast v1, Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->buK:Lokhttp3/internal/c/j;
+    iget-object v1, v1, Lokhttp3/v;->bve:Lokhttp3/internal/c/j;
 
     invoke-virtual {v1}, Lokhttp3/internal/c/j;->cancel()V
     :try_end_0
diff --git a/com.discord/smali/okhttp3/q.smali b/com.discord/smali/okhttp3/q.smali
index 8c284da87f..784fa490fb 100644
--- a/com.discord/smali/okhttp3/q.smali
+++ b/com.discord/smali/okhttp3/q.smali
@@ -12,11 +12,11 @@
 
 
 # static fields
-.field private static final btw:Lokhttp3/MediaType;
+.field private static final btQ:Lokhttp3/MediaType;
 
 
 # instance fields
-.field private final btx:Ljava/util/List;
+.field private final btR:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final bty:Ljava/util/List;
+.field private final btS:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -43,11 +43,11 @@
 
     const-string v0, "application/x-www-form-urlencoded"
 
-    invoke-static {v0}, Lokhttp3/MediaType;->en(Ljava/lang/String;)Lokhttp3/MediaType;
+    invoke-static {v0}, Lokhttp3/MediaType;->eh(Ljava/lang/String;)Lokhttp3/MediaType;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/q;->btw:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/q;->btQ:Lokhttp3/MediaType;
 
     return-void
 .end method
@@ -72,13 +72,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/q;->btx:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/q;->btR:Ljava/util/List;
 
     invoke-static {p2}, Lokhttp3/internal/c;->af(Ljava/util/List;)Ljava/util/List;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/q;->bty:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/q;->btS:Ljava/util/List;
 
     return-void
 .end method
@@ -99,14 +99,14 @@
     goto :goto_0
 
     :cond_0
-    invoke-interface {p1}, Lokio/BufferedSink;->Ir()Lokio/c;
+    invoke-interface {p1}, Lokio/BufferedSink;->Ie()Lokio/c;
 
     move-result-object p1
 
     :goto_0
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lokhttp3/q;->btx:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/q;->btR:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -119,10 +119,10 @@
 
     const/16 v2, 0x26
 
-    invoke-virtual {p1, v2}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p1, v2}, Lokio/c;->dM(I)Lokio/c;
 
     :cond_1
-    iget-object v2, p0, Lokhttp3/q;->btx:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/q;->btR:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -130,13 +130,13 @@
 
     check-cast v2, Ljava/lang/String;
 
-    invoke-virtual {p1, v2}, Lokio/c;->eI(Ljava/lang/String;)Lokio/c;
+    invoke-virtual {p1, v2}, Lokio/c;->eD(Ljava/lang/String;)Lokio/c;
 
     const/16 v2, 0x3d
 
-    invoke-virtual {p1, v2}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p1, v2}, Lokio/c;->dM(I)Lokio/c;
 
-    iget-object v2, p0, Lokhttp3/q;->bty:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/q;->btS:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -144,7 +144,7 @@
 
     check-cast v2, Ljava/lang/String;
 
-    invoke-virtual {p1, v2}, Lokio/c;->eI(Ljava/lang/String;)Lokio/c;
+    invoke-virtual {p1, v2}, Lokio/c;->eD(Ljava/lang/String;)Lokio/c;
 
     add-int/lit8 v0, v0, 0x1
 
@@ -185,7 +185,7 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    sget-object v0, Lokhttp3/q;->btw:Lokhttp3/MediaType;
+    sget-object v0, Lokhttp3/q;->btQ:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/okhttp3/r.smali b/com.discord/smali/okhttp3/r.smali
index fa7f5beeb3..7a6c004295 100644
--- a/com.discord/smali/okhttp3/r.smali
+++ b/com.discord/smali/okhttp3/r.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final btB:Lokhttp3/z;
+.field private final btV:Lokhttp3/z;
 
-.field public final btC:Lokhttp3/h;
+.field public final btW:Lokhttp3/h;
 
-.field public final btD:Ljava/util/List;
+.field public final btX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -18,7 +18,7 @@
     .end annotation
 .end field
 
-.field private final btE:Ljava/util/List;
+.field private final btY:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -48,13 +48,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/r;->btB:Lokhttp3/z;
+    iput-object p1, p0, Lokhttp3/r;->btV:Lokhttp3/z;
 
-    iput-object p2, p0, Lokhttp3/r;->btC:Lokhttp3/h;
+    iput-object p2, p0, Lokhttp3/r;->btW:Lokhttp3/h;
 
-    iput-object p3, p0, Lokhttp3/r;->btD:Ljava/util/List;
+    iput-object p3, p0, Lokhttp3/r;->btX:Ljava/util/List;
 
-    iput-object p4, p0, Lokhttp3/r;->btE:Ljava/util/List;
+    iput-object p4, p0, Lokhttp3/r;->btY:Ljava/util/List;
 
     return-void
 .end method
@@ -81,7 +81,7 @@
 
     if-nez v1, :cond_4
 
-    invoke-static {v0}, Lokhttp3/h;->ea(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dU(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
@@ -99,7 +99,7 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {v1}, Lokhttp3/z;->es(Ljava/lang/String;)Lokhttp3/z;
+    invoke-static {v1}, Lokhttp3/z;->en(Ljava/lang/String;)Lokhttp3/z;
 
     move-result-object v1
 
@@ -118,7 +118,7 @@
     :goto_0
     if-eqz v2, :cond_0
 
-    invoke-static {v2}, Lokhttp3/internal/c;->s([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v2}, Lokhttp3/internal/c;->r([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v2
 
@@ -136,7 +136,7 @@
 
     if-eqz p0, :cond_1
 
-    invoke-static {p0}, Lokhttp3/internal/c;->s([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {p0}, Lokhttp3/internal/c;->r([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p0
 
@@ -211,9 +211,9 @@
     :cond_0
     check-cast p1, Lokhttp3/r;
 
-    iget-object v0, p0, Lokhttp3/r;->btB:Lokhttp3/z;
+    iget-object v0, p0, Lokhttp3/r;->btV:Lokhttp3/z;
 
-    iget-object v2, p1, Lokhttp3/r;->btB:Lokhttp3/z;
+    iget-object v2, p1, Lokhttp3/r;->btV:Lokhttp3/z;
 
     invoke-virtual {v0, v2}, Lokhttp3/z;->equals(Ljava/lang/Object;)Z
 
@@ -221,9 +221,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/r;->btC:Lokhttp3/h;
+    iget-object v0, p0, Lokhttp3/r;->btW:Lokhttp3/h;
 
-    iget-object v2, p1, Lokhttp3/r;->btC:Lokhttp3/h;
+    iget-object v2, p1, Lokhttp3/r;->btW:Lokhttp3/h;
 
     invoke-virtual {v0, v2}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -231,9 +231,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/r;->btD:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/r;->btX:Ljava/util/List;
 
-    iget-object v2, p1, Lokhttp3/r;->btD:Ljava/util/List;
+    iget-object v2, p1, Lokhttp3/r;->btX:Ljava/util/List;
 
     invoke-interface {v0, v2}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
@@ -241,9 +241,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/r;->btE:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/r;->btY:Ljava/util/List;
 
-    iget-object p1, p1, Lokhttp3/r;->btE:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/r;->btY:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
@@ -262,7 +262,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/r;->btB:Lokhttp3/z;
+    iget-object v0, p0, Lokhttp3/r;->btV:Lokhttp3/z;
 
     invoke-virtual {v0}, Lokhttp3/z;->hashCode()I
 
@@ -272,7 +272,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/r;->btC:Lokhttp3/h;
+    iget-object v1, p0, Lokhttp3/r;->btW:Lokhttp3/h;
 
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
@@ -282,7 +282,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/r;->btD:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/r;->btX:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->hashCode()I
 
@@ -292,7 +292,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/r;->btE:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/r;->btY:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->hashCode()I
 
diff --git a/com.discord/smali/okhttp3/s$a.smali b/com.discord/smali/okhttp3/s$a.smali
index 7d816934d5..9d24e25576 100644
--- a/com.discord/smali/okhttp3/s$a.smali
+++ b/com.discord/smali/okhttp3/s$a.smali
@@ -15,21 +15,21 @@
 
 
 # instance fields
-.field btI:Ljava/lang/String;
+.field buc:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field btJ:Ljava/lang/String;
+.field bud:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field btM:Ljava/lang/String;
+.field bug:Ljava/lang/String;
 
-.field btN:Ljava/lang/String;
+.field buh:Ljava/lang/String;
 
-.field final btO:Ljava/util/List;
+.field final bui:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field btP:Ljava/util/List;
+.field buj:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -52,7 +52,7 @@
     .end annotation
 .end field
 
-.field btQ:Ljava/lang/String;
+.field buk:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -68,9 +68,9 @@
 
     const-string v0, ""
 
-    iput-object v0, p0, Lokhttp3/s$a;->btM:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s$a;->bug:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/s$a;->btN:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s$a;->buh:Ljava/lang/String;
 
     const/4 v1, -0x1
 
@@ -80,9 +80,9 @@
 
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v1, p0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iput-object v1, p0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
-    iget-object v1, p0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -122,7 +122,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v3, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
@@ -136,11 +136,11 @@
 
     :cond_2
     :goto_0
-    iget-object v3, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->clear()V
 
-    iget-object v3, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v3, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -260,7 +260,7 @@
     :cond_8
     if-eqz v4, :cond_a
 
-    iget-object v4, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -280,7 +280,7 @@
 
     if-eqz v4, :cond_9
 
-    iget-object v4, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->isEmpty()Z
 
@@ -288,7 +288,7 @@
 
     if-nez v4, :cond_9
 
-    iget-object v4, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -301,14 +301,14 @@
     goto :goto_6
 
     :cond_9
-    iget-object v4, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v4, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     goto :goto_6
 
     :cond_a
-    iget-object v4, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -328,7 +328,7 @@
 
     if-eqz v4, :cond_b
 
-    iget-object v4, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -341,14 +341,14 @@
     goto :goto_5
 
     :cond_b
-    iget-object v4, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v4, v7}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :goto_5
     if-eqz v16, :cond_c
 
-    iget-object v4, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v4, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -539,7 +539,7 @@
 
     move-result-object p0
 
-    invoke-static {p0}, Lokhttp3/internal/c;->eu(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lokhttp3/internal/c;->ep(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
@@ -595,7 +595,7 @@
 
 
 # virtual methods
-.method final GJ()I
+.method final Gy()I
     .locals 2
 
     iget v0, p0, Lokhttp3/s$a;->port:I
@@ -607,23 +607,23 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
-    invoke-static {v0}, Lokhttp3/s;->eg(Ljava/lang/String;)I
+    invoke-static {v0}, Lokhttp3/s;->ea(Ljava/lang/String;)I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final GK()Lokhttp3/s;
+.method public final Gz()Lokhttp3/s;
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/s$a;->btJ:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s$a;->bud:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -661,7 +661,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -669,10 +669,10 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     const/4 v3, 0x0
 
@@ -692,7 +692,7 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     if-eqz p2, :cond_1
 
@@ -741,7 +741,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -749,10 +749,10 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     const/4 v3, 0x1
 
@@ -772,7 +772,7 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     if-eqz p2, :cond_1
 
@@ -871,7 +871,7 @@
 
     const-string v2, "https"
 
-    iput-object v2, v0, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
     add-int/lit8 v9, v9, 0x6
 
@@ -898,7 +898,7 @@
 
     const-string v2, "http"
 
-    iput-object v2, v0, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
     add-int/lit8 v9, v9, 0x5
 
@@ -934,9 +934,9 @@
     :cond_2
     if-eqz v1, :cond_12
 
-    iget-object v2, v1, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object v2, v1, Lokhttp3/s;->buc:Ljava/lang/String;
 
-    iput-object v2, v0, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
     :goto_0
     invoke-static {v10, v9, v11}, Lokhttp3/s$a;->g(Ljava/lang/String;II)I
@@ -953,9 +953,9 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v3, v1, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object v3, v1, Lokhttp3/s;->buc:Ljava/lang/String;
 
-    iget-object v4, v0, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iget-object v4, v0, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
     invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -966,33 +966,33 @@
     goto :goto_1
 
     :cond_3
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->GD()Ljava/lang/String;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Gs()Ljava/lang/String;
 
     move-result-object v2
 
-    iput-object v2, v0, Lokhttp3/s$a;->btM:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->bug:Ljava/lang/String;
 
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->GE()Ljava/lang/String;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Gt()Ljava/lang/String;
 
     move-result-object v2
 
-    iput-object v2, v0, Lokhttp3/s$a;->btN:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->buh:Ljava/lang/String;
 
-    iget-object v2, v1, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v2, v1, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iput-object v2, v0, Lokhttp3/s$a;->btJ:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->bud:Ljava/lang/String;
 
     iget v2, v1, Lokhttp3/s;->port:I
 
     iput v2, v0, Lokhttp3/s$a;->port:I
 
-    iget-object v2, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->clear()V
 
-    iget-object v2, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->GG()Ljava/util/List;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Gv()Ljava/util/List;
 
     move-result-object v3
 
@@ -1007,11 +1007,11 @@
     if-ne v2, v14, :cond_e
 
     :cond_4
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->GH()Ljava/lang/String;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Gw()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lokhttp3/s$a;->em(Ljava/lang/String;)Lokhttp3/s$a;
+    invoke-virtual {v0, v1}, Lokhttp3/s$a;->eg(Ljava/lang/String;)Lokhttp3/s$a;
 
     goto/16 :goto_6
 
@@ -1113,7 +1113,7 @@
 
     invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v3, v0, Lokhttp3/s$a;->btM:Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/s$a;->bug:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1126,7 +1126,7 @@
     move-result-object v1
 
     :cond_8
-    iput-object v1, v0, Lokhttp3/s$a;->btM:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bug:Ljava/lang/String;
 
     if-eq v15, v12, :cond_9
 
@@ -1152,7 +1152,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->btN:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->buh:Ljava/lang/String;
 
     const/16 v16, 0x1
 
@@ -1170,7 +1170,7 @@
 
     invoke-direct {v15}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, v0, Lokhttp3/s$a;->btN:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s$a;->buh:Ljava/lang/String;
 
     invoke-virtual {v15, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1202,7 +1202,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->btN:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->buh:Ljava/lang/String;
 
     :goto_4
     add-int/lit8 v2, v12, 0x1
@@ -1230,7 +1230,7 @@
 
     move-result-object v5
 
-    iput-object v5, v0, Lokhttp3/s$a;->btJ:Ljava/lang/String;
+    iput-object v5, v0, Lokhttp3/s$a;->bud:Ljava/lang/String;
 
     invoke-static {v10, v3, v12}, Lokhttp3/s$a;->j(Ljava/lang/String;II)I
 
@@ -1274,18 +1274,18 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lokhttp3/s$a;->btJ:Ljava/lang/String;
+    iput-object v3, v0, Lokhttp3/s$a;->bud:Ljava/lang/String;
 
-    iget-object v3, v0, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
-    invoke-static {v3}, Lokhttp3/s;->eg(Ljava/lang/String;)I
+    invoke-static {v3}, Lokhttp3/s;->ea(Ljava/lang/String;)I
 
     move-result v3
 
     iput v3, v0, Lokhttp3/s$a;->port:I
 
     :goto_5
-    iget-object v3, v0, Lokhttp3/s$a;->btJ:Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/s$a;->bud:Ljava/lang/String;
 
     if-eqz v3, :cond_11
 
@@ -1339,11 +1339,11 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Lokhttp3/s;->eh(Ljava/lang/String;)Ljava/util/List;
+    invoke-static {v1}, Lokhttp3/s;->eb(Ljava/lang/String;)Ljava/util/List;
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iput-object v1, v0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     move v1, v12
 
@@ -1382,7 +1382,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->btQ:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->buk:Ljava/lang/String;
 
     :cond_10
     return-object v0
@@ -1428,7 +1428,7 @@
     goto :goto_7
 .end method
 
-.method public final em(Ljava/lang/String;)Lokhttp3/s$a;
+.method public final eg(Ljava/lang/String;)Lokhttp3/s$a;
     .locals 6
     .param p1    # Ljava/lang/String;
         .annotation runtime Ljavax/annotation/Nullable;
@@ -1453,7 +1453,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lokhttp3/s;->eh(Ljava/lang/String;)Ljava/util/List;
+    invoke-static {p1}, Lokhttp3/s;->eb(Ljava/lang/String;)Ljava/util/List;
 
     move-result-object p1
 
@@ -1463,7 +1463,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    iput-object p1, p0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     return-object p0
 .end method
@@ -1475,7 +1475,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
     if-eqz v1, :cond_0
 
@@ -1493,7 +1493,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/s$a;->btM:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bug:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->isEmpty()Z
 
@@ -1503,7 +1503,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/s$a;->btN:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->buh:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->isEmpty()Z
 
@@ -1512,11 +1512,11 @@
     if-nez v1, :cond_3
 
     :cond_1
-    iget-object v1, p0, Lokhttp3/s$a;->btM:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bug:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/s$a;->btN:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->buh:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->isEmpty()Z
 
@@ -1526,7 +1526,7 @@
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/s$a;->btN:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->buh:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1536,7 +1536,7 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
     :cond_3
-    iget-object v1, p0, Lokhttp3/s$a;->btJ:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bud:Ljava/lang/String;
 
     const/4 v3, -0x1
 
@@ -1552,7 +1552,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/s$a;->btJ:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bud:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1563,7 +1563,7 @@
     goto :goto_1
 
     :cond_4
-    iget-object v1, p0, Lokhttp3/s$a;->btJ:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bud:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1573,20 +1573,20 @@
 
     if-ne v1, v3, :cond_6
 
-    iget-object v1, p0, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
     if-eqz v1, :cond_8
 
     :cond_6
-    invoke-virtual {p0}, Lokhttp3/s$a;->GJ()I
+    invoke-virtual {p0}, Lokhttp3/s$a;->Gy()I
 
     move-result v1
 
-    iget-object v3, p0, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iget-object v3, p0, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
     if-eqz v3, :cond_7
 
-    invoke-static {v3}, Lokhttp3/s;->eg(Ljava/lang/String;)I
+    invoke-static {v3}, Lokhttp3/s;->ea(Ljava/lang/String;)I
 
     move-result v3
 
@@ -1598,11 +1598,11 @@
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     :cond_8
-    iget-object v1, p0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-static {v0, v1}, Lokhttp3/s;->a(Ljava/lang/StringBuilder;Ljava/util/List;)V
 
-    iget-object v1, p0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     if-eqz v1, :cond_9
 
@@ -1610,12 +1610,12 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     invoke-static {v0, v1}, Lokhttp3/s;->b(Ljava/lang/StringBuilder;Ljava/util/List;)V
 
     :cond_9
-    iget-object v1, p0, Lokhttp3/s$a;->btQ:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->buk:Ljava/lang/String;
 
     if-eqz v1, :cond_a
 
@@ -1623,7 +1623,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/s$a;->btQ:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->buk:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/okhttp3/s.smali b/com.discord/smali/okhttp3/s.smali
index 926c4b37c8..ac86dd4ae9 100644
--- a/com.discord/smali/okhttp3/s.smali
+++ b/com.discord/smali/okhttp3/s.smali
@@ -12,15 +12,15 @@
 
 
 # static fields
-.field private static final btH:[C
+.field private static final bub:[C
 
 
 # instance fields
-.field public final btI:Ljava/lang/String;
+.field public final buc:Ljava/lang/String;
 
-.field public final btJ:Ljava/lang/String;
+.field public final bud:Ljava/lang/String;
 
-.field public final btK:Ljava/util/List;
+.field public final bue:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field public final btL:Ljava/util/List;
+.field public final buf:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -67,7 +67,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lokhttp3/s;->btH:[C
+    sput-object v0, Lokhttp3/s;->bub:[C
 
     return-void
 
@@ -97,11 +97,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/s;->btI:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s;->buc:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/s$a;->btM:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->bug:Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -111,7 +111,7 @@
 
     iput-object v0, p0, Lokhttp3/s;->username:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/s$a;->btN:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->buh:Ljava/lang/String;
 
     invoke-static {v0, v1}, Lokhttp3/s;->h(Ljava/lang/String;Z)Ljava/lang/String;
 
@@ -119,31 +119,31 @@
 
     iput-object v0, p0, Lokhttp3/s;->password:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/s$a;->btJ:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->bud:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lokhttp3/s$a;->GJ()I
+    invoke-virtual {p1}, Lokhttp3/s$a;->Gy()I
 
     move-result v0
 
     iput v0, p0, Lokhttp3/s;->port:I
 
-    iget-object v0, p1, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-static {v0, v1}, Lokhttp3/s;->b(Ljava/util/List;Z)Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/s;->btK:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s;->bue:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     const/4 v2, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     const/4 v3, 0x1
 
@@ -157,13 +157,13 @@
     move-object v0, v2
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/s;->btL:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s;->buf:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/s$a;->btQ:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->buk:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/s$a;->btQ:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->buk:Ljava/lang/String;
 
     invoke-static {v0, v1}, Lokhttp3/s;->h(Ljava/lang/String;Z)Ljava/lang/String;
 
@@ -308,7 +308,7 @@
     const-string v14, "%2B"
 
     :goto_3
-    invoke-virtual {v5, v14}, Lokio/c;->eI(Ljava/lang/String;)Lokio/c;
+    invoke-virtual {v5, v14}, Lokio/c;->eD(Ljava/lang/String;)Lokio/c;
 
     goto/16 :goto_7
 
@@ -343,7 +343,7 @@
     goto :goto_4
 
     :cond_8
-    invoke-virtual {v5, v13}, Lokio/c;->dP(I)Lokio/c;
+    invoke-virtual {v5, v13}, Lokio/c;->dL(I)Lokio/c;
 
     goto/16 :goto_7
 
@@ -509,10 +509,10 @@
 
     :cond_12
     :goto_5
-    invoke-virtual {v12, v13}, Lokio/c;->dP(I)Lokio/c;
+    invoke-virtual {v12, v13}, Lokio/c;->dL(I)Lokio/c;
 
     :goto_6
-    invoke-virtual {v12}, Lokio/c;->Iu()Z
+    invoke-virtual {v12}, Lokio/c;->Ih()Z
 
     move-result v6
 
@@ -524,9 +524,9 @@
 
     and-int/lit16 v6, v6, 0xff
 
-    invoke-virtual {v5, v11}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v5, v11}, Lokio/c;->dM(I)Lokio/c;
 
-    sget-object v14, Lokhttp3/s;->btH:[C
+    sget-object v14, Lokhttp3/s;->bub:[C
 
     shr-int/lit8 v15, v6, 0x4
 
@@ -534,15 +534,15 @@
 
     aget-char v14, v14, v15
 
-    invoke-virtual {v5, v14}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v5, v14}, Lokio/c;->dM(I)Lokio/c;
 
-    sget-object v14, Lokhttp3/s;->btH:[C
+    sget-object v14, Lokhttp3/s;->bub:[C
 
     and-int/lit8 v6, v6, 0xf
 
     aget-char v6, v14, v6
 
-    invoke-virtual {v5, v6}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v5, v6}, Lokio/c;->dM(I)Lokio/c;
 
     goto :goto_6
 
@@ -559,7 +559,7 @@
     goto/16 :goto_2
 
     :cond_14
-    invoke-virtual {v5}, Lokio/c;->IA()Ljava/lang/String;
+    invoke-virtual {v5}, Lokio/c;->In()Ljava/lang/String;
 
     move-result-object v0
 
@@ -722,7 +722,7 @@
 
     add-int/2addr p2, v3
 
-    invoke-virtual {p0, p2}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, p2}, Lokio/c;->dM(I)Lokio/c;
 
     move p2, v1
 
@@ -737,12 +737,12 @@
 
     const/16 v1, 0x20
 
-    invoke-virtual {p0, v1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v1}, Lokio/c;->dM(I)Lokio/c;
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {p0, v0}, Lokio/c;->dP(I)Lokio/c;
+    invoke-virtual {p0, v0}, Lokio/c;->dL(I)Lokio/c;
 
     :goto_1
     invoke-static {v0}, Ljava/lang/Character;->charCount(I)I
@@ -796,7 +796,7 @@
 
     invoke-static {v1, p0, v0, p2, p3}, Lokhttp3/s;->a(Lokio/c;Ljava/lang/String;IIZ)V
 
-    invoke-virtual {v1}, Lokio/c;->IA()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/c;->In()Ljava/lang/String;
 
     move-result-object p0
 
@@ -979,7 +979,7 @@
     return p0
 .end method
 
-.method public static eg(Ljava/lang/String;)I
+.method public static ea(Ljava/lang/String;)I
     .locals 1
 
     const-string v0, "http"
@@ -1013,7 +1013,7 @@
     return p0
 .end method
 
-.method static eh(Ljava/lang/String;)Ljava/util/List;
+.method static eb(Ljava/lang/String;)Ljava/util/List;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1104,13 +1104,13 @@
     return-object v0
 .end method
 
-.method public static ek(Ljava/lang/String;)Lokhttp3/s;
+.method public static ee(Ljava/lang/String;)Lokhttp3/s;
     .locals 0
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
     :try_start_0
-    invoke-static {p0}, Lokhttp3/s;->el(Ljava/lang/String;)Lokhttp3/s;
+    invoke-static {p0}, Lokhttp3/s;->ef(Ljava/lang/String;)Lokhttp3/s;
 
     move-result-object p0
     :try_end_0
@@ -1124,7 +1124,7 @@
     return-object p0
 .end method
 
-.method public static el(Ljava/lang/String;)Lokhttp3/s;
+.method public static ef(Ljava/lang/String;)Lokhttp3/s;
     .locals 2
 
     new-instance v0, Lokhttp3/s$a;
@@ -1137,7 +1137,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokhttp3/s$a;->GK()Lokhttp3/s;
+    invoke-virtual {p0}, Lokhttp3/s$a;->Gz()Lokhttp3/s;
 
     move-result-object p0
 
@@ -1162,38 +1162,38 @@
 
 
 # virtual methods
-.method public final GB()Ljava/net/URI;
+.method public final Gq()Ljava/net/URI;
     .locals 11
 
     new-instance v0, Lokhttp3/s$a;
 
     invoke-direct {v0}, Lokhttp3/s$a;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->buc:Ljava/lang/String;
 
-    iput-object v1, v0, Lokhttp3/s$a;->btI:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->buc:Ljava/lang/String;
 
-    invoke-virtual {p0}, Lokhttp3/s;->GD()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Gs()Ljava/lang/String;
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->btM:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bug:Ljava/lang/String;
 
-    invoke-virtual {p0}, Lokhttp3/s;->GE()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Gt()Ljava/lang/String;
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->btN:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->buh:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iput-object v1, v0, Lokhttp3/s$a;->btJ:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bud:Ljava/lang/String;
 
     iget v1, p0, Lokhttp3/s;->port:I
 
-    iget-object v2, p0, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->buc:Ljava/lang/String;
 
-    invoke-static {v2}, Lokhttp3/s;->eg(Ljava/lang/String;)I
+    invoke-static {v2}, Lokhttp3/s;->ea(Ljava/lang/String;)I
 
     move-result v2
 
@@ -1209,23 +1209,23 @@
     :goto_0
     iput v1, v0, Lokhttp3/s$a;->port:I
 
-    iget-object v1, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->clear()V
 
-    iget-object v1, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
-    invoke-virtual {p0}, Lokhttp3/s;->GG()Ljava/util/List;
+    invoke-virtual {p0}, Lokhttp3/s;->Gv()Ljava/util/List;
 
     move-result-object v2
 
     invoke-interface {v1, v2}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    invoke-virtual {p0}, Lokhttp3/s;->GH()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Gw()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lokhttp3/s$a;->em(Ljava/lang/String;)Lokhttp3/s$a;
+    invoke-virtual {v0, v1}, Lokhttp3/s$a;->eg(Ljava/lang/String;)Lokhttp3/s$a;
 
     iget-object v1, p0, Lokhttp3/s;->fragment:Ljava/lang/String;
 
@@ -1253,9 +1253,9 @@
     move-result-object v1
 
     :goto_1
-    iput-object v1, v0, Lokhttp3/s$a;->btQ:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->buk:Ljava/lang/String;
 
-    iget-object v1, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -1268,7 +1268,7 @@
     :goto_2
     if-ge v3, v1, :cond_2
 
-    iget-object v4, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     invoke-interface {v4, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1278,7 +1278,7 @@
 
     check-cast v5, Ljava/lang/String;
 
-    iget-object v4, v0, Lokhttp3/s$a;->btO:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->bui:Ljava/util/List;
 
     const/4 v7, 0x1
 
@@ -1301,11 +1301,11 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, v0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -1314,7 +1314,7 @@
     :goto_3
     if-ge v2, v1, :cond_4
 
-    iget-object v3, v0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1326,7 +1326,7 @@
 
     if-eqz v4, :cond_3
 
-    iget-object v3, v0, Lokhttp3/s$a;->btP:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->buj:Ljava/util/List;
 
     const/4 v6, 0x1
 
@@ -1350,11 +1350,11 @@
     goto :goto_3
 
     :cond_4
-    iget-object v1, v0, Lokhttp3/s$a;->btQ:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s$a;->buk:Ljava/lang/String;
 
     if-eqz v1, :cond_5
 
-    iget-object v2, v0, Lokhttp3/s$a;->btQ:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/s$a;->buk:Ljava/lang/String;
 
     const/4 v4, 0x1
 
@@ -1370,7 +1370,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->btQ:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->buk:Ljava/lang/String;
 
     :cond_5
     invoke-virtual {v0}, Lokhttp3/s$a;->toString()Ljava/lang/String;
@@ -1420,10 +1420,10 @@
     goto :goto_4
 .end method
 
-.method public final GC()Z
+.method public final Gr()Z
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->buc:Ljava/lang/String;
 
     const-string v1, "https"
 
@@ -1434,7 +1434,7 @@
     return v0
 .end method
 
-.method public final GD()Ljava/lang/String;
+.method public final Gs()Ljava/lang/String;
     .locals 4
 
     iget-object v0, p0, Lokhttp3/s;->username:Ljava/lang/String;
@@ -1450,7 +1450,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->buc:Ljava/lang/String;
 
     invoke-virtual {v0}, Ljava/lang/String;->length()I
 
@@ -1479,7 +1479,7 @@
     return-object v0
 .end method
 
-.method public final GE()Ljava/lang/String;
+.method public final Gt()Ljava/lang/String;
     .locals 3
 
     iget-object v0, p0, Lokhttp3/s;->password:Ljava/lang/String;
@@ -1499,7 +1499,7 @@
 
     const/16 v1, 0x3a
 
-    iget-object v2, p0, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->buc:Ljava/lang/String;
 
     invoke-virtual {v2}, Ljava/lang/String;->length()I
 
@@ -1530,12 +1530,12 @@
     return-object v0
 .end method
 
-.method public final GF()Ljava/lang/String;
+.method public final Gu()Ljava/lang/String;
     .locals 4
 
     iget-object v0, p0, Lokhttp3/s;->url:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->buc:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
@@ -1570,7 +1570,7 @@
     return-object v0
 .end method
 
-.method public final GG()Ljava/util/List;
+.method public final Gv()Ljava/util/List;
     .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1583,7 +1583,7 @@
 
     iget-object v0, p0, Lokhttp3/s;->url:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->buc:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
@@ -1640,12 +1640,12 @@
     return-object v3
 .end method
 
-.method public final GH()Ljava/lang/String;
+.method public final Gw()Ljava/lang/String;
     .locals 4
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/s;->btL:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s;->buf:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -1685,12 +1685,12 @@
     return-object v0
 .end method
 
-.method public final GI()Ljava/lang/String;
+.method public final Gx()Ljava/lang/String;
     .locals 8
 
     const-string v0, "/..."
 
-    invoke-virtual {p0, v0}, Lokhttp3/s;->ej(Ljava/lang/String;)Lokhttp3/s$a;
+    invoke-virtual {p0, v0}, Lokhttp3/s;->ed(Ljava/lang/String;)Lokhttp3/s$a;
 
     move-result-object v0
 
@@ -1710,7 +1710,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->btM:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bug:Ljava/lang/String;
 
     const-string v2, ""
 
@@ -1724,9 +1724,9 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->btN:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->buh:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lokhttp3/s$a;->GK()Lokhttp3/s;
+    invoke-virtual {v0}, Lokhttp3/s$a;->Gz()Lokhttp3/s;
 
     move-result-object v0
 
@@ -1737,18 +1737,18 @@
     return-object v0
 .end method
 
-.method public final ei(Ljava/lang/String;)Lokhttp3/s;
+.method public final ec(Ljava/lang/String;)Lokhttp3/s;
     .locals 0
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-virtual {p0, p1}, Lokhttp3/s;->ej(Ljava/lang/String;)Lokhttp3/s$a;
+    invoke-virtual {p0, p1}, Lokhttp3/s;->ed(Ljava/lang/String;)Lokhttp3/s$a;
 
     move-result-object p1
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lokhttp3/s$a;->GK()Lokhttp3/s;
+    invoke-virtual {p1}, Lokhttp3/s$a;->Gz()Lokhttp3/s;
 
     move-result-object p1
 
@@ -1760,7 +1760,7 @@
     return-object p1
 .end method
 
-.method public final ej(Ljava/lang/String;)Lokhttp3/s$a;
+.method public final ed(Ljava/lang/String;)Lokhttp3/s$a;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
diff --git a/com.discord/smali/okhttp3/t$1.smali b/com.discord/smali/okhttp3/t$1.smali
index 03faafb4d2..70269ddc40 100644
--- a/com.discord/smali/okhttp3/t$1.smali
+++ b/com.discord/smali/okhttp3/t$1.smali
@@ -75,7 +75,7 @@
 
     :cond_1
     :goto_0
-    iget-object p1, p1, Lokhttp3/j;->bsO:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bti:Ljava/util/Deque;
 
     invoke-interface {p1}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -102,13 +102,13 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/c;->Ho()Z
+    invoke-virtual {v0}, Lokhttp3/internal/b/c;->Hb()Z
 
     move-result v1
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {p3}, Lokhttp3/internal/b/g;->Ht()Lokhttp3/internal/b/c;
+    invoke-virtual {p3}, Lokhttp3/internal/b/g;->Hg()Lokhttp3/internal/b/c;
 
     move-result-object v1
 
@@ -118,7 +118,7 @@
 
     if-nez p1, :cond_4
 
-    iget-object p1, p3, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     invoke-static {p1}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
 
@@ -137,13 +137,13 @@
 
     :cond_4
     :goto_1
-    iget-object p1, p3, Lokhttp3/internal/b/g;->bwX:Lokhttp3/internal/c/c;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->bxr:Lokhttp3/internal/c/c;
 
     if-nez p1, :cond_5
 
-    iget-object p1, p3, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bwE:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bwY:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -153,9 +153,9 @@
 
     if-ne p1, p2, :cond_5
 
-    iget-object p1, p3, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bwE:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bwY:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -169,9 +169,9 @@
 
     move-result-object p2
 
-    iput-object v0, p3, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iput-object v0, p3, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
-    iget-object p3, v0, Lokhttp3/internal/b/c;->bwE:Ljava/util/List;
+    iget-object p3, v0, Lokhttp3/internal/b/c;->bwY:Ljava/util/List;
 
     invoke-interface {p3, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -224,7 +224,7 @@
 
     :cond_1
     :goto_0
-    iget-object p1, p1, Lokhttp3/j;->bsO:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bti:Ljava/util/Deque;
 
     invoke-interface {p1}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -264,7 +264,7 @@
 .method public final a(Lokhttp3/j;)Lokhttp3/internal/b/d;
     .locals 0
 
-    iget-object p1, p1, Lokhttp3/j;->bsP:Lokhttp3/internal/b/d;
+    iget-object p1, p1, Lokhttp3/j;->btj:Lokhttp3/internal/b/d;
 
     return-object p1
 .end method
@@ -274,9 +274,9 @@
 
     check-cast p1, Lokhttp3/v;
 
-    iget-object p1, p1, Lokhttp3/v;->buK:Lokhttp3/internal/c/j;
+    iget-object p1, p1, Lokhttp3/v;->bve:Lokhttp3/internal/c/j;
 
-    iget-object p1, p1, Lokhttp3/internal/c/j;->bxe:Lokhttp3/internal/b/g;
+    iget-object p1, p1, Lokhttp3/internal/c/j;->bxy:Lokhttp3/internal/b/g;
 
     return-object p1
 .end method
@@ -346,17 +346,17 @@
 .method public final a(Lokhttp3/k;Ljavax/net/ssl/SSLSocket;Z)V
     .locals 5
 
-    iget-object v0, p1, Lokhttp3/k;->bta:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k;->btu:[Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lokhttp3/h;->bqv:Ljava/util/Comparator;
+    sget-object v0, Lokhttp3/h;->bqP:Ljava/util/Comparator;
 
     invoke-virtual {p2}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v2, p1, Lokhttp3/k;->bta:[Ljava/lang/String;
+    iget-object v2, p1, Lokhttp3/k;->btu:[Ljava/lang/String;
 
     invoke-static {v0, v1, v2}, Lokhttp3/internal/c;->a(Ljava/util/Comparator;[Ljava/lang/String;[Ljava/lang/String;)[Ljava/lang/String;
 
@@ -370,17 +370,17 @@
     move-result-object v0
 
     :goto_0
-    iget-object v1, p1, Lokhttp3/k;->btb:[Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/k;->btv:[Ljava/lang/String;
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lokhttp3/internal/c;->aXt:Ljava/util/Comparator;
+    sget-object v1, Lokhttp3/internal/c;->aXL:Ljava/util/Comparator;
 
     invoke-virtual {p2}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v3, p1, Lokhttp3/k;->btb:[Ljava/lang/String;
+    iget-object v3, p1, Lokhttp3/k;->btv:[Ljava/lang/String;
 
     invoke-static {v1, v2, v3}, Lokhttp3/internal/c;->a(Ljava/util/Comparator;[Ljava/lang/String;[Ljava/lang/String;)[Ljava/lang/String;
 
@@ -398,7 +398,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lokhttp3/h;->bqv:Ljava/util/Comparator;
+    sget-object v3, Lokhttp3/h;->bqP:Ljava/util/Comparator;
 
     const-string v4, "TLS_FALLBACK_SCSV"
 
@@ -431,24 +431,24 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/k$a;->Gu()Lokhttp3/k;
+    invoke-virtual {p1}, Lokhttp3/k$a;->Gj()Lokhttp3/k;
 
     move-result-object p1
 
-    iget-object p3, p1, Lokhttp3/k;->btb:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/k;->btv:[Ljava/lang/String;
 
     if-eqz p3, :cond_3
 
-    iget-object p3, p1, Lokhttp3/k;->btb:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/k;->btv:[Ljava/lang/String;
 
     invoke-virtual {p2, p3}, Ljavax/net/ssl/SSLSocket;->setEnabledProtocols([Ljava/lang/String;)V
 
     :cond_3
-    iget-object p3, p1, Lokhttp3/k;->bta:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/k;->btu:[Ljava/lang/String;
 
     if-eqz p3, :cond_4
 
-    iget-object p1, p1, Lokhttp3/k;->bta:[Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/k;->btu:[Ljava/lang/String;
 
     invoke-virtual {p2, p1}, Ljavax/net/ssl/SSLSocket;->setEnabledCipherSuites([Ljava/lang/String;)V
 
@@ -490,11 +490,11 @@
 
     :cond_1
     :goto_0
-    iget-boolean v0, p2, Lokhttp3/internal/b/c;->bwB:Z
+    iget-boolean v0, p2, Lokhttp3/internal/b/c;->bwV:Z
 
     if-nez v0, :cond_3
 
-    iget v0, p1, Lokhttp3/j;->bsL:I
+    iget v0, p1, Lokhttp3/j;->btf:I
 
     if-nez v0, :cond_2
 
@@ -509,7 +509,7 @@
 
     :cond_3
     :goto_1
-    iget-object p1, p1, Lokhttp3/j;->bsO:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bti:Ljava/util/Deque;
 
     invoke-interface {p1, p2}, Ljava/util/Deque;->remove(Ljava/lang/Object;)Z
 
@@ -542,22 +542,22 @@
 
     :cond_1
     :goto_0
-    iget-boolean v0, p1, Lokhttp3/j;->bsQ:Z
+    iget-boolean v0, p1, Lokhttp3/j;->btk:Z
 
     if-nez v0, :cond_2
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p1, Lokhttp3/j;->bsQ:Z
+    iput-boolean v0, p1, Lokhttp3/j;->btk:Z
 
     sget-object v0, Lokhttp3/j;->executor:Ljava/util/concurrent/Executor;
 
-    iget-object v1, p1, Lokhttp3/j;->bsN:Ljava/lang/Runnable;
+    iget-object v1, p1, Lokhttp3/j;->bth:Ljava/lang/Runnable;
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
     :cond_2
-    iget-object p1, p1, Lokhttp3/j;->bsO:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bti:Ljava/util/Deque;
 
     invoke-interface {p1, p2}, Ljava/util/Deque;->add(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/okhttp3/t$a.smali b/com.discord/smali/okhttp3/t$a.smali
index 45af5245a9..e05622fe8b 100644
--- a/com.discord/smali/okhttp3/t$a.smali
+++ b/com.discord/smali/okhttp3/t$a.smali
@@ -15,13 +15,18 @@
 
 
 # instance fields
-.field bpR:Lokhttp3/o;
+.field bqL:Lokhttp3/internal/i/c;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
-.field bpS:Ljavax/net/SocketFactory;
+.field bql:Lokhttp3/o;
 
-.field bpT:Lokhttp3/b;
+.field bqm:Ljavax/net/SocketFactory;
 
-.field bpU:Ljava/util/List;
+.field bqn:Lokhttp3/b;
+
+.field bqo:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -31,7 +36,7 @@
     .end annotation
 .end field
 
-.field bpV:Ljava/util/List;
+.field bqp:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -41,30 +46,21 @@
     .end annotation
 .end field
 
-.field bpW:Ljava/net/Proxy;
+.field bqq:Ljava/net/Proxy;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bpX:Lokhttp3/g;
+.field bqr:Lokhttp3/g;
 
-.field bpZ:Lokhttp3/internal/a/e;
+.field bqt:Lokhttp3/internal/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bqr:Lokhttp3/internal/i/c;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field buH:Lokhttp3/n;
 
-.field buA:I
-
-.field buB:I
-
-.field bun:Lokhttp3/n;
-
-.field final buo:Ljava/util/List;
+.field final buI:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -74,7 +70,7 @@
     .end annotation
 .end field
 
-.field final bup:Ljava/util/List;
+.field final buJ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -84,28 +80,32 @@
     .end annotation
 .end field
 
-.field buq:Lokhttp3/p$a;
+.field buK:Lokhttp3/p$a;
 
-.field bur:Lokhttp3/c;
+.field buL:Lokhttp3/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bus:Lokhttp3/b;
+.field buM:Lokhttp3/b;
 
-.field but:Lokhttp3/j;
+.field buN:Lokhttp3/j;
 
-.field buu:Z
+.field buO:Z
 
-.field buv:Z
+.field public buP:Z
 
-.field buw:Z
+.field buQ:Z
 
-.field bux:I
+.field buR:I
 
-.field buy:I
+.field buS:I
 
-.field buz:I
+.field buT:I
+
+.field buU:I
+
+.field buV:I
 
 .field cookieJar:Lokhttp3/m;
 
@@ -129,35 +129,35 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->buo:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->buI:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->bup:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->buJ:Ljava/util/List;
 
     new-instance v0, Lokhttp3/n;
 
     invoke-direct {v0}, Lokhttp3/n;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->bun:Lokhttp3/n;
+    iput-object v0, p0, Lokhttp3/t$a;->buH:Lokhttp3/n;
 
-    sget-object v0, Lokhttp3/t;->bul:Ljava/util/List;
+    sget-object v0, Lokhttp3/t;->buF:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpU:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bqo:Ljava/util/List;
 
-    sget-object v0, Lokhttp3/t;->bum:Ljava/util/List;
+    sget-object v0, Lokhttp3/t;->buG:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpV:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bqp:Ljava/util/List;
 
-    sget-object v0, Lokhttp3/p;->btu:Lokhttp3/p;
+    sget-object v0, Lokhttp3/p;->btO:Lokhttp3/p;
 
     invoke-static {v0}, Lokhttp3/p;->a(Lokhttp3/p;)Lokhttp3/p$a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t$a;->buq:Lokhttp3/p$a;
+    iput-object v0, p0, Lokhttp3/t$a;->buK:Lokhttp3/p$a;
 
     invoke-static {}, Ljava/net/ProxySelector;->getDefault()Ljava/net/ProxySelector;
 
@@ -176,7 +176,7 @@
     iput-object v0, p0, Lokhttp3/t$a;->proxySelector:Ljava/net/ProxySelector;
 
     :cond_0
-    sget-object v0, Lokhttp3/m;->btm:Lokhttp3/m;
+    sget-object v0, Lokhttp3/m;->btG:Lokhttp3/m;
 
     iput-object v0, p0, Lokhttp3/t$a;->cookieJar:Lokhttp3/m;
 
@@ -184,55 +184,55 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpS:Ljavax/net/SocketFactory;
+    iput-object v0, p0, Lokhttp3/t$a;->bqm:Ljavax/net/SocketFactory;
 
-    sget-object v0, Lokhttp3/internal/i/d;->bAe:Lokhttp3/internal/i/d;
+    sget-object v0, Lokhttp3/internal/i/d;->bAy:Lokhttp3/internal/i/d;
 
     iput-object v0, p0, Lokhttp3/t$a;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
-    sget-object v0, Lokhttp3/g;->bqp:Lokhttp3/g;
+    sget-object v0, Lokhttp3/g;->bqJ:Lokhttp3/g;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpX:Lokhttp3/g;
+    iput-object v0, p0, Lokhttp3/t$a;->bqr:Lokhttp3/g;
 
-    sget-object v0, Lokhttp3/b;->bpY:Lokhttp3/b;
+    sget-object v0, Lokhttp3/b;->bqs:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpT:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->bqn:Lokhttp3/b;
 
-    sget-object v0, Lokhttp3/b;->bpY:Lokhttp3/b;
+    sget-object v0, Lokhttp3/b;->bqs:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bus:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->buM:Lokhttp3/b;
 
     new-instance v0, Lokhttp3/j;
 
     invoke-direct {v0}, Lokhttp3/j;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->but:Lokhttp3/j;
+    iput-object v0, p0, Lokhttp3/t$a;->buN:Lokhttp3/j;
 
-    sget-object v0, Lokhttp3/o;->btt:Lokhttp3/o;
+    sget-object v0, Lokhttp3/o;->btN:Lokhttp3/o;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpR:Lokhttp3/o;
+    iput-object v0, p0, Lokhttp3/t$a;->bql:Lokhttp3/o;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->buu:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->buO:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->buv:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->buP:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->buw:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->buQ:Z
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/t$a;->bux:I
+    iput v0, p0, Lokhttp3/t$a;->buR:I
 
     const/16 v1, 0x2710
 
-    iput v1, p0, Lokhttp3/t$a;->buy:I
+    iput v1, p0, Lokhttp3/t$a;->buS:I
 
-    iput v1, p0, Lokhttp3/t$a;->buz:I
+    iput v1, p0, Lokhttp3/t$a;->buT:I
 
-    iput v1, p0, Lokhttp3/t$a;->buA:I
+    iput v1, p0, Lokhttp3/t$a;->buU:I
 
-    iput v0, p0, Lokhttp3/t$a;->buB:I
+    iput v0, p0, Lokhttp3/t$a;->buV:I
 
     return-void
 .end method
@@ -246,45 +246,45 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->buo:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->buI:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->bup:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->buJ:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t;->bun:Lokhttp3/n;
+    iget-object v0, p1, Lokhttp3/t;->buH:Lokhttp3/n;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bun:Lokhttp3/n;
+    iput-object v0, p0, Lokhttp3/t$a;->buH:Lokhttp3/n;
 
-    iget-object v0, p1, Lokhttp3/t;->bpW:Ljava/net/Proxy;
+    iget-object v0, p1, Lokhttp3/t;->bqq:Ljava/net/Proxy;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpW:Ljava/net/Proxy;
+    iput-object v0, p0, Lokhttp3/t$a;->bqq:Ljava/net/Proxy;
 
-    iget-object v0, p1, Lokhttp3/t;->bpU:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t;->bqo:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpU:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bqo:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t;->bpV:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t;->bqp:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpV:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bqp:Ljava/util/List;
 
-    iget-object v0, p0, Lokhttp3/t$a;->buo:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t$a;->buI:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/t;->buo:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/t;->buI:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p0, Lokhttp3/t$a;->bup:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t$a;->buJ:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/t;->bup:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/t;->buJ:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p1, Lokhttp3/t;->buq:Lokhttp3/p$a;
+    iget-object v0, p1, Lokhttp3/t;->buK:Lokhttp3/p$a;
 
-    iput-object v0, p0, Lokhttp3/t$a;->buq:Lokhttp3/p$a;
+    iput-object v0, p0, Lokhttp3/t$a;->buK:Lokhttp3/p$a;
 
     iget-object v0, p1, Lokhttp3/t;->proxySelector:Ljava/net/ProxySelector;
 
@@ -294,98 +294,88 @@
 
     iput-object v0, p0, Lokhttp3/t$a;->cookieJar:Lokhttp3/m;
 
-    iget-object v0, p1, Lokhttp3/t;->bpZ:Lokhttp3/internal/a/e;
+    iget-object v0, p1, Lokhttp3/t;->bqt:Lokhttp3/internal/a/e;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpZ:Lokhttp3/internal/a/e;
+    iput-object v0, p0, Lokhttp3/t$a;->bqt:Lokhttp3/internal/a/e;
 
-    iget-object v0, p1, Lokhttp3/t;->bur:Lokhttp3/c;
+    iget-object v0, p1, Lokhttp3/t;->buL:Lokhttp3/c;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bur:Lokhttp3/c;
+    iput-object v0, p0, Lokhttp3/t$a;->buL:Lokhttp3/c;
 
-    iget-object v0, p1, Lokhttp3/t;->bpS:Ljavax/net/SocketFactory;
+    iget-object v0, p1, Lokhttp3/t;->bqm:Ljavax/net/SocketFactory;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpS:Ljavax/net/SocketFactory;
+    iput-object v0, p0, Lokhttp3/t$a;->bqm:Ljavax/net/SocketFactory;
 
     iget-object v0, p1, Lokhttp3/t;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     iput-object v0, p0, Lokhttp3/t$a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    iget-object v0, p1, Lokhttp3/t;->bqr:Lokhttp3/internal/i/c;
+    iget-object v0, p1, Lokhttp3/t;->bqL:Lokhttp3/internal/i/c;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bqr:Lokhttp3/internal/i/c;
+    iput-object v0, p0, Lokhttp3/t$a;->bqL:Lokhttp3/internal/i/c;
 
     iget-object v0, p1, Lokhttp3/t;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
     iput-object v0, p0, Lokhttp3/t$a;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v0, p1, Lokhttp3/t;->bpX:Lokhttp3/g;
+    iget-object v0, p1, Lokhttp3/t;->bqr:Lokhttp3/g;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpX:Lokhttp3/g;
+    iput-object v0, p0, Lokhttp3/t$a;->bqr:Lokhttp3/g;
 
-    iget-object v0, p1, Lokhttp3/t;->bpT:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t;->bqn:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpT:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->bqn:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t;->bus:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t;->buM:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bus:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->buM:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t;->but:Lokhttp3/j;
+    iget-object v0, p1, Lokhttp3/t;->buN:Lokhttp3/j;
 
-    iput-object v0, p0, Lokhttp3/t$a;->but:Lokhttp3/j;
+    iput-object v0, p0, Lokhttp3/t$a;->buN:Lokhttp3/j;
 
-    iget-object v0, p1, Lokhttp3/t;->bpR:Lokhttp3/o;
+    iget-object v0, p1, Lokhttp3/t;->bql:Lokhttp3/o;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bpR:Lokhttp3/o;
+    iput-object v0, p0, Lokhttp3/t$a;->bql:Lokhttp3/o;
 
-    iget-boolean v0, p1, Lokhttp3/t;->buu:Z
+    iget-boolean v0, p1, Lokhttp3/t;->buO:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->buu:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->buO:Z
 
-    iget-boolean v0, p1, Lokhttp3/t;->buv:Z
+    iget-boolean v0, p1, Lokhttp3/t;->buP:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->buv:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->buP:Z
 
-    iget-boolean v0, p1, Lokhttp3/t;->buw:Z
+    iget-boolean v0, p1, Lokhttp3/t;->buQ:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->buw:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->buQ:Z
 
-    iget v0, p1, Lokhttp3/t;->bux:I
+    iget v0, p1, Lokhttp3/t;->buR:I
 
-    iput v0, p0, Lokhttp3/t$a;->bux:I
+    iput v0, p0, Lokhttp3/t$a;->buR:I
 
-    iget v0, p1, Lokhttp3/t;->buy:I
+    iget v0, p1, Lokhttp3/t;->buS:I
 
-    iput v0, p0, Lokhttp3/t$a;->buy:I
+    iput v0, p0, Lokhttp3/t$a;->buS:I
 
-    iget v0, p1, Lokhttp3/t;->buz:I
+    iget v0, p1, Lokhttp3/t;->buT:I
 
-    iput v0, p0, Lokhttp3/t$a;->buz:I
+    iput v0, p0, Lokhttp3/t$a;->buT:I
 
-    iget v0, p1, Lokhttp3/t;->buA:I
+    iget v0, p1, Lokhttp3/t;->buU:I
 
-    iput v0, p0, Lokhttp3/t$a;->buA:I
+    iput v0, p0, Lokhttp3/t$a;->buU:I
 
-    iget p1, p1, Lokhttp3/t;->buB:I
+    iget p1, p1, Lokhttp3/t;->buV:I
 
-    iput p1, p0, Lokhttp3/t$a;->buB:I
+    iput p1, p0, Lokhttp3/t$a;->buV:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final GR()Lokhttp3/t$a;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    iput-boolean v0, p0, Lokhttp3/t$a;->buv:Z
-
-    return-object p0
-.end method
-
-.method public final GS()Lokhttp3/t;
+.method public final GG()Lokhttp3/t;
     .locals 1
 
     new-instance v0, Lokhttp3/t;
@@ -404,7 +394,7 @@
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/t$a;->buy:I
+    iput p1, p0, Lokhttp3/t$a;->buS:I
 
     return-object p0
 .end method
@@ -416,7 +406,7 @@
 
     iput-object p1, p0, Lokhttp3/t$a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -424,7 +414,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/t$a;->bqr:Lokhttp3/internal/i/c;
+    iput-object p1, p0, Lokhttp3/t$a;->bqL:Lokhttp3/internal/i/c;
 
     return-object p0
 
@@ -443,7 +433,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/t$a;->buo:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t$a;->buI:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -487,7 +477,7 @@
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/t$a;->buz:I
+    iput p1, p0, Lokhttp3/t$a;->buT:I
 
     return-object p0
 .end method
@@ -501,7 +491,7 @@
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/t$a;->buA:I
+    iput p1, p0, Lokhttp3/t$a;->buU:I
 
     return-object p0
 .end method
diff --git a/com.discord/smali/okhttp3/t.smali b/com.discord/smali/okhttp3/t.smali
index 1b648d4f2d..6e8081d3fa 100644
--- a/com.discord/smali/okhttp3/t.smali
+++ b/com.discord/smali/okhttp3/t.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field static final bul:Ljava/util/List;
+.field static final buF:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field static final bum:Ljava/util/List;
+.field static final buG:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -38,13 +38,15 @@
 
 
 # instance fields
-.field public final bpR:Lokhttp3/o;
+.field final bqL:Lokhttp3/internal/i/c;
 
-.field public final bpS:Ljavax/net/SocketFactory;
+.field public final bql:Lokhttp3/o;
 
-.field public final bpT:Lokhttp3/b;
+.field public final bqm:Ljavax/net/SocketFactory;
 
-.field public final bpU:Ljava/util/List;
+.field public final bqn:Lokhttp3/b;
+
+.field public final bqo:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -54,7 +56,7 @@
     .end annotation
 .end field
 
-.field public final bpV:Ljava/util/List;
+.field public final bqp:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -64,27 +66,21 @@
     .end annotation
 .end field
 
-.field public final bpW:Ljava/net/Proxy;
+.field public final bqq:Ljava/net/Proxy;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bpX:Lokhttp3/g;
+.field public final bqr:Lokhttp3/g;
 
-.field final bpZ:Lokhttp3/internal/a/e;
+.field final bqt:Lokhttp3/internal/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bqr:Lokhttp3/internal/i/c;
+.field public final buH:Lokhttp3/n;
 
-.field final buA:I
-
-.field public final buB:I
-
-.field public final bun:Lokhttp3/n;
-
-.field final buo:Ljava/util/List;
+.field final buI:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -94,7 +90,7 @@
     .end annotation
 .end field
 
-.field final bup:Ljava/util/List;
+.field final buJ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -104,28 +100,32 @@
     .end annotation
 .end field
 
-.field final buq:Lokhttp3/p$a;
+.field final buK:Lokhttp3/p$a;
 
-.field final bur:Lokhttp3/c;
+.field final buL:Lokhttp3/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bus:Lokhttp3/b;
+.field final buM:Lokhttp3/b;
 
-.field public final but:Lokhttp3/j;
+.field public final buN:Lokhttp3/j;
 
-.field public final buu:Z
+.field public final buO:Z
 
-.field public final buv:Z
+.field public final buP:Z
 
-.field public final buw:Z
+.field public final buQ:Z
 
-.field final bux:I
+.field final buR:I
 
-.field final buy:I
+.field final buS:I
 
-.field final buz:I
+.field final buT:I
+
+.field final buU:I
+
+.field public final buV:I
 
 .field public final cookieJar:Lokhttp3/m;
 
@@ -144,45 +144,45 @@
 
     new-array v1, v0, [Lokhttp3/u;
 
-    sget-object v2, Lokhttp3/u;->buF:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->buZ:Lokhttp3/u;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/u;->buD:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->buX:Lokhttp3/u;
 
     const/4 v4, 0x1
 
     aput-object v2, v1, v4
 
-    invoke-static {v1}, Lokhttp3/internal/c;->s([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lokhttp3/internal/c;->r([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/t;->bul:Ljava/util/List;
+    sput-object v1, Lokhttp3/t;->buF:Ljava/util/List;
 
     new-array v0, v0, [Lokhttp3/k;
 
-    sget-object v1, Lokhttp3/k;->bsV:Lokhttp3/k;
+    sget-object v1, Lokhttp3/k;->btp:Lokhttp3/k;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/k;->bsX:Lokhttp3/k;
+    sget-object v1, Lokhttp3/k;->btr:Lokhttp3/k;
 
     aput-object v1, v0, v4
 
-    invoke-static {v0}, Lokhttp3/internal/c;->s([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lokhttp3/internal/c;->r([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/t;->bum:Ljava/util/List;
+    sput-object v0, Lokhttp3/t;->buG:Ljava/util/List;
 
     new-instance v0, Lokhttp3/t$1;
 
     invoke-direct {v0}, Lokhttp3/t$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sput-object v0, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
     return-void
 .end method
@@ -204,41 +204,41 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/t$a;->bun:Lokhttp3/n;
+    iget-object v0, p1, Lokhttp3/t$a;->buH:Lokhttp3/n;
 
-    iput-object v0, p0, Lokhttp3/t;->bun:Lokhttp3/n;
+    iput-object v0, p0, Lokhttp3/t;->buH:Lokhttp3/n;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bpW:Ljava/net/Proxy;
+    iget-object v0, p1, Lokhttp3/t$a;->bqq:Ljava/net/Proxy;
 
-    iput-object v0, p0, Lokhttp3/t;->bpW:Ljava/net/Proxy;
+    iput-object v0, p0, Lokhttp3/t;->bqq:Ljava/net/Proxy;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bpU:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->bqo:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t;->bpU:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->bqo:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bpV:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->bqp:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t;->bpV:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->bqp:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->buo:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->buI:Ljava/util/List;
 
     invoke-static {v0}, Lokhttp3/internal/c;->af(Ljava/util/List;)Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t;->buo:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->buI:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bup:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->buJ:Ljava/util/List;
 
     invoke-static {v0}, Lokhttp3/internal/c;->af(Ljava/util/List;)Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t;->bup:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->buJ:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->buq:Lokhttp3/p$a;
+    iget-object v0, p1, Lokhttp3/t$a;->buK:Lokhttp3/p$a;
 
-    iput-object v0, p0, Lokhttp3/t;->buq:Lokhttp3/p$a;
+    iput-object v0, p0, Lokhttp3/t;->buK:Lokhttp3/p$a;
 
     iget-object v0, p1, Lokhttp3/t$a;->proxySelector:Ljava/net/ProxySelector;
 
@@ -248,19 +248,19 @@
 
     iput-object v0, p0, Lokhttp3/t;->cookieJar:Lokhttp3/m;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bur:Lokhttp3/c;
+    iget-object v0, p1, Lokhttp3/t$a;->buL:Lokhttp3/c;
 
-    iput-object v0, p0, Lokhttp3/t;->bur:Lokhttp3/c;
+    iput-object v0, p0, Lokhttp3/t;->buL:Lokhttp3/c;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bpZ:Lokhttp3/internal/a/e;
+    iget-object v0, p1, Lokhttp3/t$a;->bqt:Lokhttp3/internal/a/e;
 
-    iput-object v0, p0, Lokhttp3/t;->bpZ:Lokhttp3/internal/a/e;
+    iput-object v0, p0, Lokhttp3/t;->bqt:Lokhttp3/internal/a/e;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bpS:Ljavax/net/SocketFactory;
+    iget-object v0, p1, Lokhttp3/t$a;->bqm:Ljavax/net/SocketFactory;
 
-    iput-object v0, p0, Lokhttp3/t;->bpS:Ljavax/net/SocketFactory;
+    iput-object v0, p0, Lokhttp3/t;->bqm:Ljavax/net/SocketFactory;
 
-    iget-object v0, p0, Lokhttp3/t;->bpV:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t;->bqp:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -286,7 +286,7 @@
 
     if-nez v2, :cond_1
 
-    iget-boolean v2, v3, Lokhttp3/k;->bsY:Z
+    iget-boolean v2, v3, Lokhttp3/k;->bts:Z
 
     if-eqz v2, :cond_0
 
@@ -305,7 +305,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {}, Lokhttp3/internal/c;->Hi()Ljavax/net/ssl/X509TrustManager;
+    invoke-static {}, Lokhttp3/internal/c;->GV()Ljavax/net/ssl/X509TrustManager;
 
     move-result-object v0
 
@@ -315,7 +315,7 @@
 
     iput-object v1, p0, Lokhttp3/t;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v1
 
@@ -323,7 +323,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t;->bqr:Lokhttp3/internal/i/c;
+    iput-object v0, p0, Lokhttp3/t;->bqL:Lokhttp3/internal/i/c;
 
     goto :goto_2
 
@@ -333,16 +333,16 @@
 
     iput-object v0, p0, Lokhttp3/t;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bqr:Lokhttp3/internal/i/c;
+    iget-object v0, p1, Lokhttp3/t$a;->bqL:Lokhttp3/internal/i/c;
 
-    iput-object v0, p0, Lokhttp3/t;->bqr:Lokhttp3/internal/i/c;
+    iput-object v0, p0, Lokhttp3/t;->bqL:Lokhttp3/internal/i/c;
 
     :goto_2
     iget-object v0, p0, Lokhttp3/t;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     if-eqz v0, :cond_5
 
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -355,11 +355,11 @@
 
     iput-object v0, p0, Lokhttp3/t;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bpX:Lokhttp3/g;
+    iget-object v0, p1, Lokhttp3/t$a;->bqr:Lokhttp3/g;
 
-    iget-object v1, p0, Lokhttp3/t;->bqr:Lokhttp3/internal/i/c;
+    iget-object v1, p0, Lokhttp3/t;->bqL:Lokhttp3/internal/i/c;
 
-    iget-object v2, v0, Lokhttp3/g;->bqr:Lokhttp3/internal/i/c;
+    iget-object v2, v0, Lokhttp3/g;->bqL:Lokhttp3/internal/i/c;
 
     invoke-static {v2, v1}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -372,64 +372,64 @@
     :cond_6
     new-instance v2, Lokhttp3/g;
 
-    iget-object v0, v0, Lokhttp3/g;->bqq:Ljava/util/Set;
+    iget-object v0, v0, Lokhttp3/g;->bqK:Ljava/util/Set;
 
     invoke-direct {v2, v0, v1}, Lokhttp3/g;-><init>(Ljava/util/Set;Lokhttp3/internal/i/c;)V
 
     move-object v0, v2
 
     :goto_3
-    iput-object v0, p0, Lokhttp3/t;->bpX:Lokhttp3/g;
+    iput-object v0, p0, Lokhttp3/t;->bqr:Lokhttp3/g;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bpT:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t$a;->bqn:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t;->bpT:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t;->bqn:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bus:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t$a;->buM:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t;->bus:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t;->buM:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t$a;->but:Lokhttp3/j;
+    iget-object v0, p1, Lokhttp3/t$a;->buN:Lokhttp3/j;
 
-    iput-object v0, p0, Lokhttp3/t;->but:Lokhttp3/j;
+    iput-object v0, p0, Lokhttp3/t;->buN:Lokhttp3/j;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bpR:Lokhttp3/o;
+    iget-object v0, p1, Lokhttp3/t$a;->bql:Lokhttp3/o;
 
-    iput-object v0, p0, Lokhttp3/t;->bpR:Lokhttp3/o;
+    iput-object v0, p0, Lokhttp3/t;->bql:Lokhttp3/o;
 
-    iget-boolean v0, p1, Lokhttp3/t$a;->buu:Z
+    iget-boolean v0, p1, Lokhttp3/t$a;->buO:Z
 
-    iput-boolean v0, p0, Lokhttp3/t;->buu:Z
+    iput-boolean v0, p0, Lokhttp3/t;->buO:Z
 
-    iget-boolean v0, p1, Lokhttp3/t$a;->buv:Z
+    iget-boolean v0, p1, Lokhttp3/t$a;->buP:Z
 
-    iput-boolean v0, p0, Lokhttp3/t;->buv:Z
+    iput-boolean v0, p0, Lokhttp3/t;->buP:Z
 
-    iget-boolean v0, p1, Lokhttp3/t$a;->buw:Z
+    iget-boolean v0, p1, Lokhttp3/t$a;->buQ:Z
 
-    iput-boolean v0, p0, Lokhttp3/t;->buw:Z
+    iput-boolean v0, p0, Lokhttp3/t;->buQ:Z
 
-    iget v0, p1, Lokhttp3/t$a;->bux:I
+    iget v0, p1, Lokhttp3/t$a;->buR:I
 
-    iput v0, p0, Lokhttp3/t;->bux:I
+    iput v0, p0, Lokhttp3/t;->buR:I
 
-    iget v0, p1, Lokhttp3/t$a;->buy:I
+    iget v0, p1, Lokhttp3/t$a;->buS:I
 
-    iput v0, p0, Lokhttp3/t;->buy:I
+    iput v0, p0, Lokhttp3/t;->buS:I
 
-    iget v0, p1, Lokhttp3/t$a;->buz:I
+    iget v0, p1, Lokhttp3/t$a;->buT:I
 
-    iput v0, p0, Lokhttp3/t;->buz:I
+    iput v0, p0, Lokhttp3/t;->buT:I
 
-    iget v0, p1, Lokhttp3/t$a;->buA:I
+    iget v0, p1, Lokhttp3/t$a;->buU:I
 
-    iput v0, p0, Lokhttp3/t;->buA:I
+    iput v0, p0, Lokhttp3/t;->buU:I
 
-    iget p1, p1, Lokhttp3/t$a;->buB:I
+    iget p1, p1, Lokhttp3/t$a;->buV:I
 
-    iput p1, p0, Lokhttp3/t;->buB:I
+    iput p1, p0, Lokhttp3/t;->buV:I
 
-    iget-object p1, p0, Lokhttp3/t;->buo:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/t;->buI:Ljava/util/List;
 
     const/4 v0, 0x0
 
@@ -439,7 +439,7 @@
 
     if-nez p1, :cond_8
 
-    iget-object p1, p0, Lokhttp3/t;->bup:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/t;->buJ:Ljava/util/List;
 
     invoke-interface {p1, v0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -458,7 +458,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/t;->bup:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/t;->buJ:Ljava/util/List;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -479,7 +479,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/t;->buo:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/t;->buI:Ljava/util/List;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -502,11 +502,11 @@
     .locals 3
 
     :try_start_0
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/internal/g/f;->Ib()Ljavax/net/ssl/SSLContext;
+    invoke-virtual {v0}, Lokhttp3/internal/g/f;->HO()Ljavax/net/ssl/SSLContext;
 
     move-result-object v0
 
@@ -544,19 +544,19 @@
 
 
 # virtual methods
-.method final GQ()Lokhttp3/internal/a/e;
+.method final GF()Lokhttp3/internal/a/e;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/t;->bur:Lokhttp3/c;
+    iget-object v0, p0, Lokhttp3/t;->buL:Lokhttp3/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lokhttp3/c;->bpZ:Lokhttp3/internal/a/e;
+    iget-object v0, v0, Lokhttp3/c;->bqt:Lokhttp3/internal/a/e;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/t;->bpZ:Lokhttp3/internal/a/e;
+    iget-object v0, p0, Lokhttp3/t;->bqt:Lokhttp3/internal/a/e;
 
     return-object v0
 .end method
@@ -570,7 +570,7 @@
 
     invoke-direct {v3}, Ljava/util/Random;-><init>()V
 
-    iget v0, p0, Lokhttp3/t;->buB:I
+    iget v0, p0, Lokhttp3/t;->buV:I
 
     int-to-long v4, v0
 
@@ -586,7 +586,7 @@
 
     invoke-direct {p1, p0}, Lokhttp3/t$a;-><init>(Lokhttp3/t;)V
 
-    sget-object p2, Lokhttp3/p;->btu:Lokhttp3/p;
+    sget-object p2, Lokhttp3/p;->btO:Lokhttp3/p;
 
     if-eqz p2, :cond_6
 
@@ -594,15 +594,15 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lokhttp3/t$a;->buq:Lokhttp3/p$a;
+    iput-object p2, p1, Lokhttp3/t$a;->buK:Lokhttp3/p$a;
 
-    sget-object p2, Lokhttp3/internal/j/a;->bAf:Ljava/util/List;
+    sget-object p2, Lokhttp3/internal/j/a;->bAz:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0, p2}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    sget-object p2, Lokhttp3/u;->buG:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bva:Lokhttp3/u;
 
     invoke-interface {v0, p2}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -610,7 +610,7 @@
 
     if-nez p2, :cond_1
 
-    sget-object p2, Lokhttp3/u;->buD:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->buX:Lokhttp3/u;
 
     invoke-interface {v0, p2}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -639,7 +639,7 @@
 
     :cond_1
     :goto_0
-    sget-object p2, Lokhttp3/u;->buG:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bva:Lokhttp3/u;
 
     invoke-interface {v0, p2}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -676,7 +676,7 @@
 
     :cond_3
     :goto_1
-    sget-object p2, Lokhttp3/u;->buC:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->buW:Lokhttp3/u;
 
     invoke-interface {v0, p2}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -692,7 +692,7 @@
 
     if-nez p2, :cond_4
 
-    sget-object p2, Lokhttp3/u;->buE:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->buY:Lokhttp3/u;
 
     invoke-interface {v0, p2}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
@@ -700,15 +700,15 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lokhttp3/t$a;->bpU:Ljava/util/List;
+    iput-object p2, p1, Lokhttp3/t$a;->bqo:Ljava/util/List;
 
-    invoke-virtual {p1}, Lokhttp3/t$a;->GS()Lokhttp3/t;
+    invoke-virtual {p1}, Lokhttp3/t$a;->GG()Lokhttp3/t;
 
     move-result-object p1
 
-    iget-object p2, v6, Lokhttp3/internal/j/a;->buN:Lokhttp3/w;
+    iget-object p2, v6, Lokhttp3/internal/j/a;->bvh:Lokhttp3/w;
 
-    invoke-virtual {p2}, Lokhttp3/w;->GZ()Lokhttp3/w$a;
+    invoke-virtual {p2}, Lokhttp3/w;->GN()Lokhttp3/w$a;
 
     move-result-object p2
 
@@ -742,27 +742,27 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {p2}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object p2
 
-    sget-object v0, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/internal/a;->a(Lokhttp3/t;Lokhttp3/w;)Lokhttp3/e;
 
     move-result-object p1
 
-    iput-object p1, v6, Lokhttp3/internal/j/a;->bwJ:Lokhttp3/e;
+    iput-object p1, v6, Lokhttp3/internal/j/a;->bxd:Lokhttp3/e;
 
-    iget-object p1, v6, Lokhttp3/internal/j/a;->bwJ:Lokhttp3/e;
+    iget-object p1, v6, Lokhttp3/internal/j/a;->bxd:Lokhttp3/e;
 
     invoke-interface {p1}, Lokhttp3/e;->timeout()Lokio/s;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/s;->IP()Lokio/s;
+    invoke-virtual {p1}, Lokio/s;->IC()Lokio/s;
 
-    iget-object p1, v6, Lokhttp3/internal/j/a;->bwJ:Lokhttp3/e;
+    iget-object p1, v6, Lokhttp3/internal/j/a;->bxd:Lokhttp3/e;
 
     new-instance v0, Lokhttp3/internal/j/a$2;
 
diff --git a/com.discord/smali/okhttp3/v.smali b/com.discord/smali/okhttp3/v.smali
index 599318cb38..ddbff1025c 100644
--- a/com.discord/smali/okhttp3/v.smali
+++ b/com.discord/smali/okhttp3/v.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final buJ:Lokhttp3/t;
+.field final bvd:Lokhttp3/t;
 
-.field final buK:Lokhttp3/internal/c/j;
+.field final bve:Lokhttp3/internal/c/j;
 
-.field final buL:Lokio/a;
+.field final bvf:Lokio/a;
 
-.field private buM:Lokhttp3/p;
+.field private bvg:Lokhttp3/p;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final buN:Lokhttp3/w;
+.field final bvh:Lokhttp3/w;
 
-.field final buO:Z
+.field final bvi:Z
 
-.field private buP:Z
+.field private bvj:Z
 
 
 # direct methods
@@ -39,27 +39,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iput-object p2, p0, Lokhttp3/v;->buN:Lokhttp3/w;
+    iput-object p2, p0, Lokhttp3/v;->bvh:Lokhttp3/w;
 
-    iput-boolean p3, p0, Lokhttp3/v;->buO:Z
+    iput-boolean p3, p0, Lokhttp3/v;->bvi:Z
 
     new-instance p2, Lokhttp3/internal/c/j;
 
     invoke-direct {p2, p1, p3}, Lokhttp3/internal/c/j;-><init>(Lokhttp3/t;Z)V
 
-    iput-object p2, p0, Lokhttp3/v;->buK:Lokhttp3/internal/c/j;
+    iput-object p2, p0, Lokhttp3/v;->bve:Lokhttp3/internal/c/j;
 
     new-instance p2, Lokhttp3/v$1;
 
     invoke-direct {p2, p0}, Lokhttp3/v$1;-><init>(Lokhttp3/v;)V
 
-    iput-object p2, p0, Lokhttp3/v;->buL:Lokio/a;
+    iput-object p2, p0, Lokhttp3/v;->bvf:Lokio/a;
 
-    iget-object p2, p0, Lokhttp3/v;->buL:Lokio/a;
+    iget-object p2, p0, Lokhttp3/v;->bvf:Lokio/a;
 
-    iget p1, p1, Lokhttp3/t;->bux:I
+    iget p1, p1, Lokhttp3/t;->buR:I
 
     int-to-long v0, p1
 
@@ -70,22 +70,22 @@
     return-void
 .end method
 
-.method private GT()V
+.method private GH()V
     .locals 2
 
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
     const-string v1, "response.body().close()"
 
-    invoke-virtual {v0, v1}, Lokhttp3/internal/g/f;->eE(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-virtual {v0, v1}, Lokhttp3/internal/g/f;->ez(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/v;->buK:Lokhttp3/internal/c/j;
+    iget-object v1, p0, Lokhttp3/v;->bve:Lokhttp3/internal/c/j;
 
-    iput-object v0, v1, Lokhttp3/internal/c/j;->bwR:Ljava/lang/Object;
+    iput-object v0, v1, Lokhttp3/internal/c/j;->bxl:Ljava/lang/Object;
 
     return-void
 .end method
@@ -97,13 +97,13 @@
 
     invoke-direct {v0, p0, p1, p2}, Lokhttp3/v;-><init>(Lokhttp3/t;Lokhttp3/w;Z)V
 
-    iget-object p0, p0, Lokhttp3/t;->buq:Lokhttp3/p$a;
+    iget-object p0, p0, Lokhttp3/t;->buK:Lokhttp3/p$a;
 
-    invoke-interface {p0}, Lokhttp3/p$a;->Gy()Lokhttp3/p;
+    invoke-interface {p0}, Lokhttp3/p$a;->Gn()Lokhttp3/p;
 
     move-result-object p0
 
-    iput-object p0, v0, Lokhttp3/v;->buM:Lokhttp3/p;
+    iput-object p0, v0, Lokhttp3/v;->bvg:Lokhttp3/p;
 
     return-object v0
 .end method
@@ -111,28 +111,28 @@
 .method static synthetic c(Lokhttp3/v;)Lokhttp3/p;
     .locals 0
 
-    iget-object p0, p0, Lokhttp3/v;->buM:Lokhttp3/p;
+    iget-object p0, p0, Lokhttp3/v;->bvg:Lokhttp3/p;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method final GU()Ljava/lang/String;
+.method final GI()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->buN:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/v;->bvh:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
-    invoke-virtual {v0}, Lokhttp3/s;->GI()Ljava/lang/String;
+    invoke-virtual {v0}, Lokhttp3/s;->Gx()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final GV()Lokhttp3/Response;
+.method final GJ()Lokhttp3/Response;
     .locals 13
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -144,19 +144,19 @@
 
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v0, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->buo:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/t;->buI:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p0, Lokhttp3/v;->buK:Lokhttp3/internal/c/j;
+    iget-object v0, p0, Lokhttp3/v;->bve:Lokhttp3/internal/c/j;
 
     invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     new-instance v0, Lokhttp3/internal/c/a;
 
-    iget-object v2, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v2, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
     iget-object v2, v2, Lokhttp3/t;->cookieJar:Lokhttp3/m;
 
@@ -166,9 +166,9 @@
 
     new-instance v0, Lokhttp3/internal/a/a;
 
-    iget-object v2, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v2, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    invoke-virtual {v2}, Lokhttp3/t;->GQ()Lokhttp3/internal/a/e;
+    invoke-virtual {v2}, Lokhttp3/t;->GF()Lokhttp3/internal/a/e;
 
     move-result-object v2
 
@@ -178,26 +178,26 @@
 
     new-instance v0, Lokhttp3/internal/b/a;
 
-    iget-object v2, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v2, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
     invoke-direct {v0, v2}, Lokhttp3/internal/b/a;-><init>(Lokhttp3/t;)V
 
     invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-boolean v0, p0, Lokhttp3/v;->buO:Z
+    iget-boolean v0, p0, Lokhttp3/v;->bvi:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->bup:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/t;->buJ:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
     :cond_0
     new-instance v0, Lokhttp3/internal/c/b;
 
-    iget-boolean v2, p0, Lokhttp3/v;->buO:Z
+    iget-boolean v2, p0, Lokhttp3/v;->bvi:Z
 
     invoke-direct {v0, v2}, Lokhttp3/internal/c/b;-><init>(Z)V
 
@@ -213,21 +213,21 @@
 
     const/4 v5, 0x0
 
-    iget-object v6, p0, Lokhttp3/v;->buN:Lokhttp3/w;
+    iget-object v6, p0, Lokhttp3/v;->bvh:Lokhttp3/w;
 
-    iget-object v8, p0, Lokhttp3/v;->buM:Lokhttp3/p;
+    iget-object v8, p0, Lokhttp3/v;->bvg:Lokhttp3/p;
 
-    iget-object v0, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget v9, v0, Lokhttp3/t;->buy:I
+    iget v9, v0, Lokhttp3/t;->buS:I
 
-    iget-object v0, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget v10, v0, Lokhttp3/t;->buz:I
+    iget v10, v0, Lokhttp3/t;->buT:I
 
-    iget-object v0, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget v11, v0, Lokhttp3/t;->buA:I
+    iget v11, v0, Lokhttp3/t;->buU:I
 
     move-object v0, v12
 
@@ -235,7 +235,7 @@
 
     invoke-direct/range {v0 .. v11}, Lokhttp3/internal/c/g;-><init>(Ljava/util/List;Lokhttp3/internal/b/g;Lokhttp3/internal/c/c;Lokhttp3/internal/b/c;ILokhttp3/w;Lokhttp3/e;Lokhttp3/p;III)V
 
-    iget-object v0, p0, Lokhttp3/v;->buN:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/v;->bvh:Lokhttp3/w;
 
     invoke-interface {v12, v0}, Lokhttp3/Interceptor$Chain;->b(Lokhttp3/w;)Lokhttp3/Response;
 
@@ -244,7 +244,7 @@
     return-object v0
 .end method
 
-.method public final Gr()Lokhttp3/Response;
+.method public final Gg()Lokhttp3/Response;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -255,32 +255,32 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/v;->buP:Z
+    iget-boolean v0, p0, Lokhttp3/v;->bvj:Z
 
     if-nez v0, :cond_1
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/v;->buP:Z
+    iput-boolean v0, p0, Lokhttp3/v;->bvj:Z
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    invoke-direct {p0}, Lokhttp3/v;->GT()V
+    invoke-direct {p0}, Lokhttp3/v;->GH()V
 
-    iget-object v0, p0, Lokhttp3/v;->buL:Lokio/a;
+    iget-object v0, p0, Lokhttp3/v;->bvf:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_1
-    iget-object v0, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->bun:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->buH:Lokhttp3/n;
 
     invoke-virtual {v0, p0}, Lokhttp3/n;->a(Lokhttp3/v;)V
 
-    invoke-virtual {p0}, Lokhttp3/v;->GV()Lokhttp3/Response;
+    invoke-virtual {p0}, Lokhttp3/v;->GJ()Lokhttp3/Response;
 
     move-result-object v0
     :try_end_1
@@ -289,9 +289,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v1, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->bun:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->buH:Lokhttp3/n;
 
     invoke-virtual {v1, p0}, Lokhttp3/n;->b(Lokhttp3/v;)V
 
@@ -328,9 +328,9 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v1, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->bun:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->buH:Lokhttp3/n;
 
     invoke-virtual {v1, p0}, Lokhttp3/n;->b(Lokhttp3/v;)V
 
@@ -362,23 +362,23 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/v;->buP:Z
+    iget-boolean v0, p0, Lokhttp3/v;->bvj:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/v;->buP:Z
+    iput-boolean v0, p0, Lokhttp3/v;->bvj:Z
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    invoke-direct {p0}, Lokhttp3/v;->GT()V
+    invoke-direct {p0}, Lokhttp3/v;->GH()V
 
-    iget-object v0, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->bun:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->buH:Lokhttp3/n;
 
     new-instance v1, Lokhttp3/v$a;
 
@@ -387,7 +387,7 @@
     monitor-enter v0
 
     :try_start_1
-    iget-object p1, v0, Lokhttp3/n;->btq:Ljava/util/Deque;
+    iget-object p1, v0, Lokhttp3/n;->btK:Ljava/util/Deque;
 
     invoke-interface {p1, v1}, Ljava/util/Deque;->add(Ljava/lang/Object;)Z
 
@@ -395,7 +395,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-virtual {v0}, Lokhttp3/n;->Gw()Z
+    invoke-virtual {v0}, Lokhttp3/n;->Gl()Z
 
     return-void
 
@@ -438,9 +438,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/v;->buL:Lokio/a;
+    iget-object v0, p0, Lokhttp3/v;->bvf:Lokio/a;
 
-    invoke-virtual {v0}, Lokio/a;->Ip()Z
+    invoke-virtual {v0}, Lokio/a;->Ic()Z
 
     move-result v0
 
@@ -466,7 +466,7 @@
 .method public final cancel()V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->buK:Lokhttp3/internal/c/j;
+    iget-object v0, p0, Lokhttp3/v;->bve:Lokhttp3/internal/c/j;
 
     invoke-virtual {v0}, Lokhttp3/internal/c/j;->cancel()V
 
@@ -481,11 +481,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget-object v1, p0, Lokhttp3/v;->buN:Lokhttp3/w;
+    iget-object v1, p0, Lokhttp3/v;->bvh:Lokhttp3/w;
 
-    iget-boolean v2, p0, Lokhttp3/v;->buO:Z
+    iget-boolean v2, p0, Lokhttp3/v;->bvi:Z
 
     invoke-static {v0, v1, v2}, Lokhttp3/v;->a(Lokhttp3/t;Lokhttp3/w;Z)Lokhttp3/v;
 
@@ -497,9 +497,9 @@
 .method public final isCanceled()Z
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->buK:Lokhttp3/internal/c/j;
+    iget-object v0, p0, Lokhttp3/v;->bve:Lokhttp3/internal/c/j;
 
-    iget-boolean v0, v0, Lokhttp3/internal/c/j;->bwW:Z
+    iget-boolean v0, v0, Lokhttp3/internal/c/j;->bxq:Z
 
     return v0
 .end method
@@ -507,7 +507,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->buL:Lokio/a;
+    iget-object v0, p0, Lokhttp3/v;->bvf:Lokio/a;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/okhttp3/w$a.smali b/com.discord/smali/okhttp3/w$a.smali
index 2914159d44..58350c4043 100644
--- a/com.discord/smali/okhttp3/w$a.smali
+++ b/com.discord/smali/okhttp3/w$a.smali
@@ -15,12 +15,17 @@
 
 
 # instance fields
-.field bpQ:Lokhttp3/s;
+.field bqk:Lokhttp3/s;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field buS:Ljava/util/Map;
+.field buE:Lokhttp3/RequestBody;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field bvm:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -32,12 +37,7 @@
     .end annotation
 .end field
 
-.field buU:Lokhttp3/Headers$a;
-
-.field buk:Lokhttp3/RequestBody;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field bvo:Lokhttp3/Headers$a;
 
 .field method:Ljava/lang/String;
 
@@ -52,7 +52,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w$a;->buS:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/w$a;->bvm:Ljava/util/Map;
 
     const-string v0, "GET"
 
@@ -62,7 +62,7 @@
 
     invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/w$a;->buU:Lokhttp3/Headers$a;
+    iput-object v0, p0, Lokhttp3/w$a;->bvo:Lokhttp3/Headers$a;
 
     return-void
 .end method
@@ -76,21 +76,21 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w$a;->buS:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/w$a;->bvm:Ljava/util/Map;
 
-    iget-object v0, p1, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w;->bqk:Lokhttp3/s;
 
-    iput-object v0, p0, Lokhttp3/w$a;->bpQ:Lokhttp3/s;
+    iput-object v0, p0, Lokhttp3/w$a;->bqk:Lokhttp3/s;
 
     iget-object v0, p1, Lokhttp3/w;->method:Ljava/lang/String;
 
     iput-object v0, p0, Lokhttp3/w$a;->method:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/w;->buk:Lokhttp3/RequestBody;
+    iget-object v0, p1, Lokhttp3/w;->buE:Lokhttp3/RequestBody;
 
-    iput-object v0, p0, Lokhttp3/w$a;->buk:Lokhttp3/RequestBody;
+    iput-object v0, p0, Lokhttp3/w$a;->buE:Lokhttp3/RequestBody;
 
-    iget-object v0, p1, Lokhttp3/w;->buS:Ljava/util/Map;
+    iget-object v0, p1, Lokhttp3/w;->bvm:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -107,44 +107,30 @@
     :cond_0
     new-instance v0, Ljava/util/LinkedHashMap;
 
-    iget-object v1, p1, Lokhttp3/w;->buS:Ljava/util/Map;
+    iget-object v1, p1, Lokhttp3/w;->bvm:Ljava/util/Map;
 
     invoke-direct {v0, v1}, Ljava/util/LinkedHashMap;-><init>(Ljava/util/Map;)V
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/w$a;->buS:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/w$a;->bvm:Ljava/util/Map;
 
-    iget-object p1, p1, Lokhttp3/w;->buj:Lokhttp3/Headers;
+    iget-object p1, p1, Lokhttp3/w;->buD:Lokhttp3/Headers;
 
-    invoke-virtual {p1}, Lokhttp3/Headers;->Gz()Lokhttp3/Headers$a;
+    invoke-virtual {p1}, Lokhttp3/Headers;->Go()Lokhttp3/Headers$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/w$a;->buU:Lokhttp3/Headers$a;
+    iput-object p1, p0, Lokhttp3/w$a;->bvo:Lokhttp3/Headers$a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Hb()Lokhttp3/w$a;
+.method public final GP()Lokhttp3/w;
     .locals 2
 
-    const-string v0, "GET"
-
-    const/4 v1, 0x0
-
-    invoke-virtual {p0, v0, v1}, Lokhttp3/w$a;->a(Ljava/lang/String;Lokhttp3/RequestBody;)Lokhttp3/w$a;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final Hc()Lokhttp3/w;
-    .locals 2
-
-    iget-object v0, p0, Lokhttp3/w$a;->bpQ:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/w$a;->bqk:Lokhttp3/s;
 
     if-eqz v0, :cond_0
 
@@ -183,7 +169,7 @@
 
     if-eqz p2, :cond_1
 
-    invoke-static {p1}, Lokhttp3/internal/c/f;->eC(Ljava/lang/String;)Z
+    invoke-static {p1}, Lokhttp3/internal/c/f;->ex(Ljava/lang/String;)Z
 
     move-result v1
 
@@ -216,7 +202,7 @@
     :goto_0
     if-nez p2, :cond_3
 
-    invoke-static {p1}, Lokhttp3/internal/c/f;->eB(Ljava/lang/String;)Z
+    invoke-static {p1}, Lokhttp3/internal/c/f;->ew(Ljava/lang/String;)Z
 
     move-result v1
 
@@ -249,7 +235,7 @@
     :goto_1
     iput-object p1, p0, Lokhttp3/w$a;->method:Ljava/lang/String;
 
-    iput-object p2, p0, Lokhttp3/w$a;->buk:Lokhttp3/RequestBody;
+    iput-object p2, p0, Lokhttp3/w$a;->buE:Lokhttp3/RequestBody;
 
     return-object p0
 
@@ -272,22 +258,10 @@
     throw p1
 .end method
 
-.method public final a(Lokhttp3/RequestBody;)Lokhttp3/w$a;
-    .locals 1
-
-    const-string v0, "POST"
-
-    invoke-virtual {p0, v0, p1}, Lokhttp3/w$a;->a(Ljava/lang/String;Lokhttp3/RequestBody;)Lokhttp3/w$a;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
 .method public final ap(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w$a;->buU:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/w$a;->bvo:Lokhttp3/Headers$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->am(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
@@ -297,7 +271,7 @@
 .method public final aq(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w$a;->buU:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/w$a;->bvo:Lokhttp3/Headers$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->ak(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
@@ -307,11 +281,11 @@
 .method public final b(Lokhttp3/Headers;)Lokhttp3/w$a;
     .locals 0
 
-    invoke-virtual {p1}, Lokhttp3/Headers;->Gz()Lokhttp3/Headers$a;
+    invoke-virtual {p1}, Lokhttp3/Headers;->Go()Lokhttp3/Headers$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/w$a;->buU:Lokhttp3/Headers$a;
+    iput-object p1, p0, Lokhttp3/w$a;->bvo:Lokhttp3/Headers$a;
 
     return-object p0
 .end method
@@ -321,7 +295,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokhttp3/w$a;->bpQ:Lokhttp3/s;
+    iput-object p1, p0, Lokhttp3/w$a;->bqk:Lokhttp3/s;
 
     return-object p0
 
@@ -335,7 +309,7 @@
     throw p1
 .end method
 
-.method public final eq(Ljava/lang/String;)Lokhttp3/w$a;
+.method public final ek(Ljava/lang/String;)Lokhttp3/w$a;
     .locals 6
 
     if-eqz p1, :cond_2
@@ -417,7 +391,7 @@
 
     :cond_1
     :goto_0
-    invoke-static {p1}, Lokhttp3/s;->el(Ljava/lang/String;)Lokhttp3/s;
+    invoke-static {p1}, Lokhttp3/s;->ef(Ljava/lang/String;)Lokhttp3/s;
 
     move-result-object p1
 
@@ -437,12 +411,12 @@
     throw p1
 .end method
 
-.method public final er(Ljava/lang/String;)Lokhttp3/w$a;
+.method public final el(Ljava/lang/String;)Lokhttp3/w$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w$a;->buU:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/w$a;->bvo:Lokhttp3/Headers$a;
 
-    invoke-virtual {v0, p1}, Lokhttp3/Headers$a;->ef(Ljava/lang/String;)Lokhttp3/Headers$a;
+    invoke-virtual {v0, p1}, Lokhttp3/Headers$a;->dZ(Ljava/lang/String;)Lokhttp3/Headers$a;
 
     return-object p0
 .end method
diff --git a/com.discord/smali/okhttp3/w.smali b/com.discord/smali/okhttp3/w.smali
index 295156f25b..ae5a5b4adf 100644
--- a/com.discord/smali/okhttp3/w.smali
+++ b/com.discord/smali/okhttp3/w.smali
@@ -12,9 +12,16 @@
 
 
 # instance fields
-.field public final bpQ:Lokhttp3/s;
+.field public final bqk:Lokhttp3/s;
 
-.field final buS:Ljava/util/Map;
+.field public final buD:Lokhttp3/Headers;
+
+.field public final buE:Lokhttp3/RequestBody;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field final bvm:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -26,14 +33,7 @@
     .end annotation
 .end field
 
-.field private volatile buT:Lokhttp3/d;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field public final buj:Lokhttp3/Headers;
-
-.field public final buk:Lokhttp3/RequestBody;
+.field private volatile bvn:Lokhttp3/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -47,48 +47,48 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/w$a;->bpQ:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w$a;->bqk:Lokhttp3/s;
 
-    iput-object v0, p0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iput-object v0, p0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     iget-object v0, p1, Lokhttp3/w$a;->method:Ljava/lang/String;
 
     iput-object v0, p0, Lokhttp3/w;->method:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/w$a;->buU:Lokhttp3/Headers$a;
+    iget-object v0, p1, Lokhttp3/w$a;->bvo:Lokhttp3/Headers$a;
 
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->GA()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Gp()Lokhttp3/Headers;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w;->buj:Lokhttp3/Headers;
+    iput-object v0, p0, Lokhttp3/w;->buD:Lokhttp3/Headers;
 
-    iget-object v0, p1, Lokhttp3/w$a;->buk:Lokhttp3/RequestBody;
+    iget-object v0, p1, Lokhttp3/w$a;->buE:Lokhttp3/RequestBody;
 
-    iput-object v0, p0, Lokhttp3/w;->buk:Lokhttp3/RequestBody;
+    iput-object v0, p0, Lokhttp3/w;->buE:Lokhttp3/RequestBody;
 
-    iget-object p1, p1, Lokhttp3/w$a;->buS:Ljava/util/Map;
+    iget-object p1, p1, Lokhttp3/w$a;->bvm:Ljava/util/Map;
 
     invoke-static {p1}, Lokhttp3/internal/c;->u(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/w;->buS:Ljava/util/Map;
+    iput-object p1, p0, Lokhttp3/w;->bvm:Ljava/util/Map;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final GY()Lokhttp3/s;
+.method public final GM()Lokhttp3/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     return-object v0
 .end method
 
-.method public final GZ()Lokhttp3/w$a;
+.method public final GN()Lokhttp3/w$a;
     .locals 1
 
     new-instance v0, Lokhttp3/w$a;
@@ -98,33 +98,33 @@
     return-object v0
 .end method
 
-.method public final Ha()Lokhttp3/d;
+.method public final GO()Lokhttp3/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w;->buT:Lokhttp3/d;
+    iget-object v0, p0, Lokhttp3/w;->bvn:Lokhttp3/d;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/w;->buj:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/w;->buD:Lokhttp3/Headers;
 
     invoke-static {v0}, Lokhttp3/d;->a(Lokhttp3/Headers;)Lokhttp3/d;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w;->buT:Lokhttp3/d;
+    iput-object v0, p0, Lokhttp3/w;->bvn:Lokhttp3/d;
 
     return-object v0
 .end method
 
-.method public final dO(Ljava/lang/String;)Ljava/lang/String;
+.method public final dI(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/w;->buj:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/w;->buD:Lokhttp3/Headers;
 
     invoke-virtual {v0, p1}, Lokhttp3/Headers;->get(Ljava/lang/String;)Ljava/lang/String;
 
@@ -158,7 +158,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -166,7 +166,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/w;->buS:Ljava/util/Map;
+    iget-object v1, p0, Lokhttp3/w;->bvm:Ljava/util/Map;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/okhttp3/x$1.smali b/com.discord/smali/okhttp3/x$1.smali
index 5afcb3d71b..c6eca3ddcc 100644
--- a/com.discord/smali/okhttp3/x$1.smali
+++ b/com.discord/smali/okhttp3/x$1.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic buV:Lokhttp3/MediaType;
+.field final synthetic bvF:J
 
-.field final synthetic bvl:J
+.field final synthetic bvG:Lokio/d;
 
-.field final synthetic bvm:Lokio/d;
+.field final synthetic bvp:Lokhttp3/MediaType;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;JLokio/d;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/x$1;->buV:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/x$1;->bvp:Lokhttp3/MediaType;
 
-    iput-wide p2, p0, Lokhttp3/x$1;->bvl:J
+    iput-wide p2, p0, Lokhttp3/x$1;->bvF:J
 
-    iput-object p4, p0, Lokhttp3/x$1;->bvm:Lokio/d;
+    iput-object p4, p0, Lokhttp3/x$1;->bvG:Lokio/d;
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
@@ -39,10 +39,10 @@
 
 
 # virtual methods
-.method public final Hf()Lokio/d;
+.method public final GS()Lokio/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/x$1;->bvm:Lokio/d;
+    iget-object v0, p0, Lokhttp3/x$1;->bvG:Lokio/d;
 
     return-object v0
 .end method
@@ -50,7 +50,7 @@
 .method public final contentLength()J
     .locals 2
 
-    iget-wide v0, p0, Lokhttp3/x$1;->bvl:J
+    iget-wide v0, p0, Lokhttp3/x$1;->bvF:J
 
     return-wide v0
 .end method
@@ -60,7 +60,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/x$1;->buV:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/x$1;->bvp:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/okhttp3/x$a.smali b/com.discord/smali/okhttp3/x$a.smali
index 2efda3d712..e6d765ec07 100644
--- a/com.discord/smali/okhttp3/x$a.smali
+++ b/com.discord/smali/okhttp3/x$a.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field private final btA:Ljava/nio/charset/Charset;
+.field private final btU:Ljava/nio/charset/Charset;
 
-.field private bvn:Ljava/io/Reader;
+.field private bvH:Ljava/io/Reader;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
 .field private closed:Z
 
-.field private final nJ:Lokio/d;
+.field private final nI:Lokio/d;
 
 
 # direct methods
@@ -33,9 +33,9 @@
 
     invoke-direct {p0}, Ljava/io/Reader;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/x$a;->nJ:Lokio/d;
+    iput-object p1, p0, Lokhttp3/x$a;->nI:Lokio/d;
 
-    iput-object p2, p0, Lokhttp3/x$a;->btA:Ljava/nio/charset/Charset;
+    iput-object p2, p0, Lokhttp3/x$a;->btU:Ljava/nio/charset/Charset;
 
     return-void
 .end method
@@ -54,7 +54,7 @@
 
     iput-boolean v0, p0, Lokhttp3/x$a;->closed:Z
 
-    iget-object v0, p0, Lokhttp3/x$a;->bvn:Ljava/io/Reader;
+    iget-object v0, p0, Lokhttp3/x$a;->bvH:Ljava/io/Reader;
 
     if-eqz v0, :cond_0
 
@@ -63,7 +63,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/x$a;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/x$a;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->close()V
 
@@ -82,13 +82,13 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/x$a;->bvn:Ljava/io/Reader;
+    iget-object v0, p0, Lokhttp3/x$a;->bvH:Ljava/io/Reader;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/x$a;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/x$a;->nI:Lokio/d;
 
-    iget-object v1, p0, Lokhttp3/x$a;->btA:Ljava/nio/charset/Charset;
+    iget-object v1, p0, Lokhttp3/x$a;->btU:Ljava/nio/charset/Charset;
 
     invoke-static {v0, v1}, Lokhttp3/internal/c;->a(Lokio/d;Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
 
@@ -96,15 +96,15 @@
 
     new-instance v1, Ljava/io/InputStreamReader;
 
-    iget-object v2, p0, Lokhttp3/x$a;->nJ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/x$a;->nI:Lokio/d;
 
-    invoke-interface {v2}, Lokio/d;->Iv()Ljava/io/InputStream;
+    invoke-interface {v2}, Lokio/d;->Ii()Ljava/io/InputStream;
 
     move-result-object v2
 
     invoke-direct {v1, v2, v0}, Ljava/io/InputStreamReader;-><init>(Ljava/io/InputStream;Ljava/nio/charset/Charset;)V
 
-    iput-object v1, p0, Lokhttp3/x$a;->bvn:Ljava/io/Reader;
+    iput-object v1, p0, Lokhttp3/x$a;->bvH:Ljava/io/Reader;
 
     move-object v0, v1
 
diff --git a/com.discord/smali/okhttp3/x.smali b/com.discord/smali/okhttp3/x.smali
index 8e6293eb29..cc607acfca 100644
--- a/com.discord/smali/okhttp3/x.smali
+++ b/com.discord/smali/okhttp3/x.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public bvk:Ljava/io/Reader;
+.field public bvE:Ljava/io/Reader;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -81,10 +81,10 @@
 
 
 # virtual methods
-.method public abstract Hf()Lokio/d;
+.method public abstract GS()Lokio/d;
 .end method
 
-.method public final Hg()Ljava/lang/String;
+.method public final GT()Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -92,7 +92,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokhttp3/x;->Hf()Lokio/d;
+    invoke-virtual {p0}, Lokhttp3/x;->GS()Lokio/d;
 
     move-result-object v0
 
@@ -149,7 +149,7 @@
 .method public close()V
     .locals 1
 
-    invoke-virtual {p0}, Lokhttp3/x;->Hf()Lokio/d;
+    invoke-virtual {p0}, Lokhttp3/x;->GS()Lokio/d;
 
     move-result-object v0
 
diff --git a/com.discord/smali/okhttp3/y.smali b/com.discord/smali/okhttp3/y.smali
index 8a2748fe2e..e5d8532ac2 100644
--- a/com.discord/smali/okhttp3/y.smali
+++ b/com.discord/smali/okhttp3/y.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field public final bpW:Ljava/net/Proxy;
+.field public final bqq:Ljava/net/Proxy;
 
-.field public final bvo:Lokhttp3/a;
+.field public final bvI:Lokhttp3/a;
 
-.field public final bvp:Ljava/net/InetSocketAddress;
+.field public final bvJ:Ljava/net/InetSocketAddress;
 
 
 # direct methods
@@ -23,11 +23,11 @@
 
     if-eqz p3, :cond_0
 
-    iput-object p1, p0, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iput-object p1, p0, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iput-object p2, p0, Lokhttp3/y;->bpW:Ljava/net/Proxy;
+    iput-object p2, p0, Lokhttp3/y;->bqq:Ljava/net/Proxy;
 
-    iput-object p3, p0, Lokhttp3/y;->bvp:Ljava/net/InetSocketAddress;
+    iput-object p3, p0, Lokhttp3/y;->bvJ:Ljava/net/InetSocketAddress;
 
     return-void
 
@@ -61,16 +61,16 @@
 
 
 # virtual methods
-.method public final Hh()Z
+.method public final GU()Z
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/y;->bvI:Lokhttp3/a;
 
     iget-object v0, v0, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/y;->bpW:Ljava/net/Proxy;
+    iget-object v0, p0, Lokhttp3/y;->bqq:Ljava/net/Proxy;
 
     invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -103,9 +103,9 @@
 
     check-cast p1, Lokhttp3/y;
 
-    iget-object v0, p1, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v0, p1, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v1, p0, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v1, p0, Lokhttp3/y;->bvI:Lokhttp3/a;
 
     invoke-virtual {v0, v1}, Lokhttp3/a;->equals(Ljava/lang/Object;)Z
 
@@ -113,9 +113,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lokhttp3/y;->bpW:Ljava/net/Proxy;
+    iget-object v0, p1, Lokhttp3/y;->bqq:Ljava/net/Proxy;
 
-    iget-object v1, p0, Lokhttp3/y;->bpW:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/y;->bqq:Ljava/net/Proxy;
 
     invoke-virtual {v0, v1}, Ljava/net/Proxy;->equals(Ljava/lang/Object;)Z
 
@@ -123,9 +123,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p1, Lokhttp3/y;->bvp:Ljava/net/InetSocketAddress;
+    iget-object p1, p1, Lokhttp3/y;->bvJ:Ljava/net/InetSocketAddress;
 
-    iget-object v0, p0, Lokhttp3/y;->bvp:Ljava/net/InetSocketAddress;
+    iget-object v0, p0, Lokhttp3/y;->bvJ:Ljava/net/InetSocketAddress;
 
     invoke-virtual {p1, v0}, Ljava/net/InetSocketAddress;->equals(Ljava/lang/Object;)Z
 
@@ -146,7 +146,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/y;->bvI:Lokhttp3/a;
 
     invoke-virtual {v0}, Lokhttp3/a;->hashCode()I
 
@@ -156,7 +156,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/y;->bpW:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/y;->bqq:Ljava/net/Proxy;
 
     invoke-virtual {v1}, Ljava/net/Proxy;->hashCode()I
 
@@ -166,7 +166,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/y;->bvp:Ljava/net/InetSocketAddress;
+    iget-object v1, p0, Lokhttp3/y;->bvJ:Ljava/net/InetSocketAddress;
 
     invoke-virtual {v1}, Ljava/net/InetSocketAddress;->hashCode()I
 
@@ -186,7 +186,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/y;->bvp:Ljava/net/InetSocketAddress;
+    iget-object v1, p0, Lokhttp3/y;->bvJ:Ljava/net/InetSocketAddress;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/okio/BufferedSink.smali b/com.discord/smali/okio/BufferedSink.smali
index 2cd003d49f..30d1df3e26 100644
--- a/com.discord/smali/okio/BufferedSink.smali
+++ b/com.discord/smali/okio/BufferedSink.smali
@@ -16,7 +16,10 @@
     .end annotation
 .end method
 
-.method public abstract IE()Lokio/BufferedSink;
+.method public abstract Ie()Lokio/c;
+.end method
+
+.method public abstract Ig()Lokio/BufferedSink;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -24,10 +27,7 @@
     .end annotation
 .end method
 
-.method public abstract Ir()Lokio/c;
-.end method
-
-.method public abstract It()Lokio/BufferedSink;
+.method public abstract Ir()Lokio/BufferedSink;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -59,7 +59,7 @@
     .end annotation
 .end method
 
-.method public abstract dU(I)Lokio/BufferedSink;
+.method public abstract dQ(I)Lokio/BufferedSink;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -67,7 +67,7 @@
     .end annotation
 .end method
 
-.method public abstract dV(I)Lokio/BufferedSink;
+.method public abstract dR(I)Lokio/BufferedSink;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -75,7 +75,7 @@
     .end annotation
 .end method
 
-.method public abstract dW(I)Lokio/BufferedSink;
+.method public abstract dS(I)Lokio/BufferedSink;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -83,7 +83,7 @@
     .end annotation
 .end method
 
-.method public abstract eJ(Ljava/lang/String;)Lokio/BufferedSink;
+.method public abstract eE(Ljava/lang/String;)Lokio/BufferedSink;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali/okio/a.smali b/com.discord/smali/okio/a.smali
index 04513d27e9..6c8dccf13f 100644
--- a/com.discord/smali/okio/a.smali
+++ b/com.discord/smali/okio/a.smali
@@ -12,25 +12,25 @@
 
 
 # static fields
-.field private static final bBc:J
+.field private static final bBw:J
 
-.field private static final bBd:J
+.field private static final bBx:J
 
-.field static bBe:Lokio/a;
+.field static bBy:Lokio/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
 
 # instance fields
-.field private bBf:Z
-
-.field private bBg:Lokio/a;
+.field private bBA:Lokio/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bBh:J
+.field private bBB:J
+
+.field private bBz:Z
 
 
 # direct methods
@@ -45,17 +45,17 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lokio/a;->bBc:J
+    sput-wide v0, Lokio/a;->bBw:J
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-wide v1, Lokio/a;->bBc:J
+    sget-wide v1, Lokio/a;->bBw:J
 
     invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
 
     move-result-wide v0
 
-    sput-wide v0, Lokio/a;->bBd:J
+    sput-wide v0, Lokio/a;->bBx:J
 
     return-void
 .end method
@@ -68,7 +68,7 @@
     return-void
 .end method
 
-.method static Iq()Lokio/a;
+.method static Id()Lokio/a;
     .locals 9
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -81,9 +81,9 @@
 
     const-class v0, Lokio/a;
 
-    sget-object v1, Lokio/a;->bBe:Lokio/a;
+    sget-object v1, Lokio/a;->bBy:Lokio/a;
 
-    iget-object v1, v1, Lokio/a;->bBg:Lokio/a;
+    iget-object v1, v1, Lokio/a;->bBA:Lokio/a;
 
     const/4 v2, 0x0
 
@@ -93,13 +93,13 @@
 
     move-result-wide v3
 
-    sget-wide v5, Lokio/a;->bBc:J
+    sget-wide v5, Lokio/a;->bBw:J
 
     invoke-virtual {v0, v5, v6}, Ljava/lang/Object;->wait(J)V
 
-    sget-object v0, Lokio/a;->bBe:Lokio/a;
+    sget-object v0, Lokio/a;->bBy:Lokio/a;
 
-    iget-object v0, v0, Lokio/a;->bBg:Lokio/a;
+    iget-object v0, v0, Lokio/a;->bBA:Lokio/a;
 
     if-nez v0, :cond_0
 
@@ -109,13 +109,13 @@
 
     sub-long/2addr v0, v3
 
-    sget-wide v3, Lokio/a;->bBd:J
+    sget-wide v3, Lokio/a;->bBx:J
 
     cmp-long v5, v0, v3
 
     if-ltz v5, :cond_0
 
-    sget-object v0, Lokio/a;->bBe:Lokio/a;
+    sget-object v0, Lokio/a;->bBy:Lokio/a;
 
     return-object v0
 
@@ -127,7 +127,7 @@
 
     move-result-wide v3
 
-    iget-wide v5, v1, Lokio/a;->bBh:J
+    iget-wide v5, v1, Lokio/a;->bBB:J
 
     sub-long/2addr v5, v3
 
@@ -152,13 +152,13 @@
     return-object v2
 
     :cond_2
-    sget-object v0, Lokio/a;->bBe:Lokio/a;
+    sget-object v0, Lokio/a;->bBy:Lokio/a;
 
-    iget-object v3, v1, Lokio/a;->bBg:Lokio/a;
+    iget-object v3, v1, Lokio/a;->bBA:Lokio/a;
 
-    iput-object v3, v0, Lokio/a;->bBg:Lokio/a;
+    iput-object v3, v0, Lokio/a;->bBA:Lokio/a;
 
-    iput-object v2, v1, Lokio/a;->bBg:Lokio/a;
+    iput-object v2, v1, Lokio/a;->bBA:Lokio/a;
 
     return-object v1
 .end method
@@ -171,7 +171,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokio/a;->bBe:Lokio/a;
+    sget-object v1, Lokio/a;->bBy:Lokio/a;
 
     if-nez v1, :cond_0
 
@@ -179,7 +179,7 @@
 
     invoke-direct {v1}, Lokio/a;-><init>()V
 
-    sput-object v1, Lokio/a;->bBe:Lokio/a;
+    sput-object v1, Lokio/a;->bBy:Lokio/a;
 
     new-instance v1, Lokio/a$a;
 
@@ -200,7 +200,7 @@
 
     if-eqz p3, :cond_1
 
-    invoke-virtual {p0}, Lokio/a;->IO()J
+    invoke-virtual {p0}, Lokio/a;->IB()J
 
     move-result-wide v3
 
@@ -212,7 +212,7 @@
 
     add-long/2addr p1, v1
 
-    iput-wide p1, p0, Lokio/a;->bBh:J
+    iput-wide p1, p0, Lokio/a;->bBB:J
 
     goto :goto_0
 
@@ -223,34 +223,34 @@
 
     add-long/2addr p1, v1
 
-    iput-wide p1, p0, Lokio/a;->bBh:J
+    iput-wide p1, p0, Lokio/a;->bBB:J
 
     goto :goto_0
 
     :cond_2
     if-eqz p3, :cond_6
 
-    invoke-virtual {p0}, Lokio/a;->IO()J
+    invoke-virtual {p0}, Lokio/a;->IB()J
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lokio/a;->bBh:J
+    iput-wide p1, p0, Lokio/a;->bBB:J
 
     :goto_0
-    iget-wide p1, p0, Lokio/a;->bBh:J
+    iget-wide p1, p0, Lokio/a;->bBB:J
 
     sub-long/2addr p1, v1
 
-    sget-object p3, Lokio/a;->bBe:Lokio/a;
+    sget-object p3, Lokio/a;->bBy:Lokio/a;
 
     :goto_1
-    iget-object v3, p3, Lokio/a;->bBg:Lokio/a;
+    iget-object v3, p3, Lokio/a;->bBA:Lokio/a;
 
     if-eqz v3, :cond_4
 
-    iget-object v3, p3, Lokio/a;->bBg:Lokio/a;
+    iget-object v3, p3, Lokio/a;->bBA:Lokio/a;
 
-    iget-wide v3, v3, Lokio/a;->bBh:J
+    iget-wide v3, v3, Lokio/a;->bBB:J
 
     sub-long/2addr v3, v1
 
@@ -261,19 +261,19 @@
     goto :goto_2
 
     :cond_3
-    iget-object p3, p3, Lokio/a;->bBg:Lokio/a;
+    iget-object p3, p3, Lokio/a;->bBA:Lokio/a;
 
     goto :goto_1
 
     :cond_4
     :goto_2
-    iget-object p1, p3, Lokio/a;->bBg:Lokio/a;
+    iget-object p1, p3, Lokio/a;->bBA:Lokio/a;
 
-    iput-object p1, p0, Lokio/a;->bBg:Lokio/a;
+    iput-object p1, p0, Lokio/a;->bBA:Lokio/a;
 
-    iput-object p0, p3, Lokio/a;->bBg:Lokio/a;
+    iput-object p0, p3, Lokio/a;->bBA:Lokio/a;
 
-    sget-object p0, Lokio/a;->bBe:Lokio/a;
+    sget-object p0, Lokio/a;->bBy:Lokio/a;
 
     if-ne p3, p0, :cond_5
 
@@ -322,22 +322,22 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokio/a;->bBe:Lokio/a;
+    sget-object v1, Lokio/a;->bBy:Lokio/a;
 
     :goto_0
     if-eqz v1, :cond_1
 
-    iget-object v2, v1, Lokio/a;->bBg:Lokio/a;
+    iget-object v2, v1, Lokio/a;->bBA:Lokio/a;
 
     if-ne v2, p0, :cond_0
 
-    iget-object v2, p0, Lokio/a;->bBg:Lokio/a;
+    iget-object v2, p0, Lokio/a;->bBA:Lokio/a;
 
-    iput-object v2, v1, Lokio/a;->bBg:Lokio/a;
+    iput-object v2, v1, Lokio/a;->bBA:Lokio/a;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lokio/a;->bBg:Lokio/a;
+    iput-object v1, p0, Lokio/a;->bBA:Lokio/a;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -349,7 +349,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v1, v1, Lokio/a;->bBg:Lokio/a;
+    iget-object v1, v1, Lokio/a;->bBA:Lokio/a;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -378,16 +378,16 @@
 
 
 # virtual methods
-.method protected GW()V
+.method protected GK()V
     .locals 0
 
     return-void
 .end method
 
-.method public final Ip()Z
+.method public final Ic()Z
     .locals 2
 
-    iget-boolean v0, p0, Lokio/a;->bBf:Z
+    iget-boolean v0, p0, Lokio/a;->bBz:Z
 
     const/4 v1, 0x0
 
@@ -396,7 +396,7 @@
     return v1
 
     :cond_0
-    iput-boolean v1, p0, Lokio/a;->bBf:Z
+    iput-boolean v1, p0, Lokio/a;->bBz:Z
 
     invoke-static {p0}, Lokio/a;->a(Lokio/a;)Z
 
@@ -405,7 +405,7 @@
     return v0
 .end method
 
-.method final af(Z)V
+.method final ac(Z)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -413,7 +413,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokio/a;->Ip()Z
+    invoke-virtual {p0}, Lokio/a;->Ic()Z
 
     move-result v0
 
@@ -461,15 +461,15 @@
 .method public final enter()V
     .locals 6
 
-    iget-boolean v0, p0, Lokio/a;->bBf:Z
+    iget-boolean v0, p0, Lokio/a;->bBz:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lokio/a;->IM()J
+    invoke-virtual {p0}, Lokio/a;->Iz()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lokio/a;->IN()Z
+    invoke-virtual {p0}, Lokio/a;->IA()Z
 
     move-result v2
 
@@ -486,7 +486,7 @@
     :cond_0
     const/4 v3, 0x1
 
-    iput-boolean v3, p0, Lokio/a;->bBf:Z
+    iput-boolean v3, p0, Lokio/a;->bBz:Z
 
     invoke-static {p0, v0, v1, v2}, Lokio/a;->a(Lokio/a;JZ)V
 
@@ -510,7 +510,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokio/a;->Ip()Z
+    invoke-virtual {p0}, Lokio/a;->Ic()Z
 
     move-result v0
 
diff --git a/com.discord/smali/okio/c.smali b/com.discord/smali/okio/c.smali
index 3d28ba2f54..d8e0ddc87d 100644
--- a/com.discord/smali/okio/c.smali
+++ b/com.discord/smali/okio/c.smali
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static final bBn:[B
+.field private static final bBH:[B
 
 
 # instance fields
-.field bBo:Lokio/n;
+.field bBI:Lokio/n;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -40,7 +40,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lokio/c;->bBn:[B
+    sput-object v0, Lokio/c;->bBH:[B
 
     return-void
 
@@ -108,7 +108,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -167,11 +167,11 @@
 
     if-ne p1, p2, :cond_2
 
-    invoke-virtual {v0}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->II()Lokio/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->bBo:Lokio/n;
+    iput-object p1, p0, Lokio/c;->bBI:Lokio/n;
 
     invoke-static {v0}, Lokio/o;->b(Lokio/n;)V
 
@@ -225,7 +225,7 @@
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, v1, Lokio/n;->bBI:Lokio/n;
+    iget-object p1, v1, Lokio/n;->bCc:Lokio/n;
 
     iget-object v0, p1, Lokio/n;->data:[B
 
@@ -311,7 +311,7 @@
     return-object p1
 .end method
 
-.method public final HF()Lokio/ByteString;
+.method public final Hs()Lokio/ByteString;
     .locals 2
 
     new-instance v0, Lokio/ByteString;
@@ -325,158 +325,25 @@
     return-object v0
 .end method
 
-.method public final IA()Ljava/lang/String;
-    .locals 3
-
-    :try_start_0
-    iget-wide v0, p0, Lokio/c;->size:J
-
-    sget-object v2, Lokio/t;->UTF_8:Ljava/nio/charset/Charset;
-
-    invoke-direct {p0, v0, v1, v2}, Lokio/c;->a(JLjava/nio/charset/Charset;)Ljava/lang/String;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v1
-.end method
-
-.method public final IB()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}, Lokio/c;->aK(J)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final IC()J
-    .locals 6
-
-    const/4 v1, 0x0
-
-    const-wide/16 v2, 0x0
-
-    const-wide v4, 0x7fffffffffffffffL
-
-    move-object v0, p0
-
-    invoke-virtual/range {v0 .. v5}, Lokio/c;->a(BJJ)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final ID()Lokio/c;
-    .locals 6
-
-    new-instance v0, Lokio/c;
-
-    invoke-direct {v0}, Lokio/c;-><init>()V
-
-    iget-wide v1, p0, Lokio/c;->size: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, Lokio/c;->bBo:Lokio/n;
-
-    invoke-virtual {v1}, Lokio/n;->IT()Lokio/n;
-
-    move-result-object v1
-
-    iput-object v1, v0, Lokio/c;->bBo:Lokio/n;
-
-    iget-object v1, v0, Lokio/c;->bBo:Lokio/n;
-
-    iput-object v1, v1, Lokio/n;->bBJ:Lokio/n;
-
-    iput-object v1, v1, Lokio/n;->bBI:Lokio/n;
-
-    iget-object v1, p0, Lokio/c;->bBo:Lokio/n;
-
-    :goto_0
-    iget-object v1, v1, Lokio/n;->bBI:Lokio/n;
-
-    iget-object v2, p0, Lokio/c;->bBo:Lokio/n;
-
-    if-eq v1, v2, :cond_1
-
-    iget-object v2, v0, Lokio/c;->bBo:Lokio/n;
-
-    iget-object v2, v2, Lokio/n;->bBJ:Lokio/n;
-
-    invoke-virtual {v1}, Lokio/n;->IT()Lokio/n;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Lokio/n;->a(Lokio/n;)Lokio/n;
-
-    goto :goto_0
-
-    :cond_1
-    iget-wide v1, p0, Lokio/c;->size:J
-
-    iput-wide v1, v0, Lokio/c;->size:J
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic IE()Lokio/BufferedSink;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    return-object p0
-.end method
-
-.method public final Ir()Lokio/c;
+.method public final Ie()Lokio/c;
     .locals 0
 
     return-object p0
 .end method
 
-.method public final Is()Lokio/c;
+.method public final If()Lokio/c;
     .locals 0
 
     return-object p0
 .end method
 
-.method public final It()Lokio/BufferedSink;
+.method public final Ig()Lokio/BufferedSink;
     .locals 0
 
     return-object p0
 .end method
 
-.method public final Iu()Z
+.method public final Ih()Z
     .locals 5
 
     iget-wide v0, p0, Lokio/c;->size:J
@@ -497,7 +364,7 @@
     return v0
 .end method
 
-.method public final Iv()Ljava/io/InputStream;
+.method public final Ii()Ljava/io/InputStream;
     .locals 1
 
     new-instance v0, Lokio/c$2;
@@ -507,7 +374,7 @@
     return-object v0
 .end method
 
-.method public final Iw()J
+.method public final Ij()J
     .locals 5
 
     iget-wide v0, p0, Lokio/c;->size:J
@@ -521,9 +388,9 @@
     return-wide v2
 
     :cond_0
-    iget-object v2, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v2, p0, Lokio/c;->bBI:Lokio/n;
 
-    iget-object v2, v2, Lokio/n;->bBJ:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bCd:Lokio/n;
 
     iget v3, v2, Lokio/n;->limit:I
 
@@ -549,7 +416,7 @@
     return-wide v0
 .end method
 
-.method public final Ix()S
+.method public final Ik()S
     .locals 1
 
     invoke-virtual {p0}, Lokio/c;->readShort()S
@@ -563,21 +430,21 @@
     return v0
 .end method
 
-.method public final Iy()I
+.method public final Il()I
     .locals 1
 
     invoke-virtual {p0}, Lokio/c;->readInt()I
 
     move-result v0
 
-    invoke-static {v0}, Lokio/t;->dY(I)I
+    invoke-static {v0}, Lokio/t;->dU(I)I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final Iz()J
+.method public final Im()J
     .locals 15
 
     iget-wide v0, p0, Lokio/c;->size:J
@@ -595,7 +462,7 @@
     const/4 v1, 0x0
 
     :cond_0
-    iget-object v6, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v6, p0, Lokio/c;->bBI:Lokio/n;
 
     iget-object v7, v6, Lokio/n;->data:[B
 
@@ -681,7 +548,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, v10}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v0, v10}, Lokio/c;->dM(I)Lokio/c;
 
     move-result-object v0
 
@@ -693,7 +560,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lokio/c;->IA()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/c;->In()Ljava/lang/String;
 
     move-result-object v0
 
@@ -741,11 +608,11 @@
     :goto_3
     if-ne v8, v9, :cond_7
 
-    invoke-virtual {v6}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v6}, Lokio/n;->II()Lokio/n;
 
     move-result-object v7
 
-    iput-object v7, p0, Lokio/c;->bBo:Lokio/n;
+    iput-object v7, p0, Lokio/c;->bBI:Lokio/n;
 
     invoke-static {v6}, Lokio/o;->b(Lokio/n;)V
 
@@ -757,7 +624,7 @@
     :goto_4
     if-nez v0, :cond_8
 
-    iget-object v6, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v6, p0, Lokio/c;->bBI:Lokio/n;
 
     if-nez v6, :cond_0
 
@@ -788,6 +655,139 @@
     goto :goto_5
 .end method
 
+.method public final In()Ljava/lang/String;
+    .locals 3
+
+    :try_start_0
+    iget-wide v0, p0, Lokio/c;->size:J
+
+    sget-object v2, Lokio/t;->UTF_8:Ljava/nio/charset/Charset;
+
+    invoke-direct {p0, v0, v1, v2}, Lokio/c;->a(JLjava/nio/charset/Charset;)Ljava/lang/String;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v1
+.end method
+
+.method public final Io()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}, Lokio/c;->aK(J)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final Ip()J
+    .locals 6
+
+    const/4 v1, 0x0
+
+    const-wide/16 v2, 0x0
+
+    const-wide v4, 0x7fffffffffffffffL
+
+    move-object v0, p0
+
+    invoke-virtual/range {v0 .. v5}, Lokio/c;->a(BJJ)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final Iq()Lokio/c;
+    .locals 6
+
+    new-instance v0, Lokio/c;
+
+    invoke-direct {v0}, Lokio/c;-><init>()V
+
+    iget-wide v1, p0, Lokio/c;->size: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, Lokio/c;->bBI:Lokio/n;
+
+    invoke-virtual {v1}, Lokio/n;->IG()Lokio/n;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lokio/c;->bBI:Lokio/n;
+
+    iget-object v1, v0, Lokio/c;->bBI:Lokio/n;
+
+    iput-object v1, v1, Lokio/n;->bCd:Lokio/n;
+
+    iput-object v1, v1, Lokio/n;->bCc:Lokio/n;
+
+    iget-object v1, p0, Lokio/c;->bBI:Lokio/n;
+
+    :goto_0
+    iget-object v1, v1, Lokio/n;->bCc:Lokio/n;
+
+    iget-object v2, p0, Lokio/c;->bBI:Lokio/n;
+
+    if-eq v1, v2, :cond_1
+
+    iget-object v2, v0, Lokio/c;->bBI:Lokio/n;
+
+    iget-object v2, v2, Lokio/n;->bCd:Lokio/n;
+
+    invoke-virtual {v1}, Lokio/n;->IG()Lokio/n;
+
+    move-result-object v3
+
+    invoke-virtual {v2, v3}, Lokio/n;->a(Lokio/n;)Lokio/n;
+
+    goto :goto_0
+
+    :cond_1
+    iget-wide v1, p0, Lokio/c;->size:J
+
+    iput-wide v1, v0, Lokio/c;->size:J
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic Ir()Lokio/BufferedSink;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    return-object p0
+.end method
+
 .method public final a(Lokio/k;)I
     .locals 3
 
@@ -804,7 +804,7 @@
     return v1
 
     :cond_0
-    iget-object p1, p1, Lokio/k;->bBD:[Lokio/ByteString;
+    iget-object p1, p1, Lokio/k;->bBX:[Lokio/ByteString;
 
     aget-object p1, p1, v0
 
@@ -836,7 +836,7 @@
 
     move-object/from16 v1, p0
 
-    iget-object v2, v1, Lokio/c;->bBo:Lokio/n;
+    iget-object v2, v1, Lokio/c;->bBI:Lokio/n;
 
     const/4 v3, -0x2
 
@@ -847,7 +847,7 @@
     return v3
 
     :cond_0
-    sget-object v2, Lokio/ByteString;->bBs:Lokio/ByteString;
+    sget-object v2, Lokio/ByteString;->bBM:Lokio/ByteString;
 
     invoke-virtual {v0, v2}, Lokio/k;->indexOf(Ljava/lang/Object;)I
 
@@ -862,7 +862,7 @@
 
     iget v6, v2, Lokio/n;->limit:I
 
-    iget-object v0, v0, Lokio/k;->bBE:[I
+    iget-object v0, v0, Lokio/k;->bBY:[I
 
     const/4 v8, -0x1
 
@@ -930,7 +930,7 @@
     :goto_2
     if-ne v4, v11, :cond_6
 
-    iget-object v4, v5, Lokio/n;->bBI:Lokio/n;
+    iget-object v4, v5, Lokio/n;->bCc:Lokio/n;
 
     iget v5, v4, Lokio/n;->pos:I
 
@@ -997,7 +997,7 @@
 
     if-ne v14, v11, :cond_b
 
-    iget-object v4, v5, Lokio/n;->bBI:Lokio/n;
+    iget-object v4, v5, Lokio/n;->bCc:Lokio/n;
 
     iget v5, v4, Lokio/n;->pos:I
 
@@ -1081,7 +1081,7 @@
     return-wide v5
 
     :cond_1
-    iget-object v7, v0, Lokio/c;->bBo:Lokio/n;
+    iget-object v7, v0, Lokio/c;->bBI:Lokio/n;
 
     if-nez v7, :cond_2
 
@@ -1101,7 +1101,7 @@
 
     if-lez v1, :cond_4
 
-    iget-object v7, v7, Lokio/n;->bBJ:Lokio/n;
+    iget-object v7, v7, Lokio/n;->bCd:Lokio/n;
 
     iget v1, v7, Lokio/n;->limit:I
 
@@ -1133,7 +1133,7 @@
 
     if-gez v10, :cond_4
 
-    iget-object v7, v7, Lokio/n;->bBI:Lokio/n;
+    iget-object v7, v7, Lokio/n;->bCc:Lokio/n;
 
     goto :goto_2
 
@@ -1212,7 +1212,7 @@
 
     add-long/2addr v1, v8
 
-    iget-object v7, v7, Lokio/n;->bBI:Lokio/n;
+    iget-object v7, v7, Lokio/n;->bCc:Lokio/n;
 
     move-wide v8, v1
 
@@ -1295,7 +1295,7 @@
 
     if-ltz v4, :cond_6
 
-    iget-object v4, v0, Lokio/c;->bBo:Lokio/n;
+    iget-object v4, v0, Lokio/c;->bBI:Lokio/n;
 
     const-wide/16 v5, -0x1
 
@@ -1317,7 +1317,7 @@
 
     if-lez v2, :cond_2
 
-    iget-object v4, v4, Lokio/n;->bBJ:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bCd:Lokio/n;
 
     iget v2, v4, Lokio/n;->limit:I
 
@@ -1349,7 +1349,7 @@
 
     if-gez v9, :cond_2
 
-    iget-object v4, v4, Lokio/n;->bBI:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bCc:Lokio/n;
 
     goto :goto_1
 
@@ -1452,7 +1452,7 @@
 
     add-long v11, v7, v5
 
-    iget-object v4, v4, Lokio/n;->bBI:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bCc:Lokio/n;
 
     move-wide v7, v11
 
@@ -1623,15 +1623,15 @@
 .method public final a(Lokio/c$a;)Lokio/c$a;
     .locals 1
 
-    iget-object v0, p1, Lokio/c$a;->nK:Lokio/c;
+    iget-object v0, p1, Lokio/c$a;->nJ:Lokio/c;
 
     if-nez v0, :cond_0
 
-    iput-object p0, p1, Lokio/c$a;->nK:Lokio/c;
+    iput-object p0, p1, Lokio/c$a;->nJ:Lokio/c;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p1, Lokio/c$a;->bBq:Z
+    iput-boolean v0, p1, Lokio/c$a;->bBK:Z
 
     return-object p1
 
@@ -1673,7 +1673,7 @@
 
     iput-wide v2, p1, Lokio/c;->size:J
 
-    iget-object v2, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v2, p0, Lokio/c;->bBI:Lokio/n;
 
     :goto_0
     iget v3, v2, Lokio/n;->limit:I
@@ -1698,7 +1698,7 @@
 
     sub-long/2addr p2, v3
 
-    iget-object v2, v2, Lokio/n;->bBI:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bCc:Lokio/n;
 
     goto :goto_0
 
@@ -1708,7 +1708,7 @@
 
     if-lez v3, :cond_3
 
-    invoke-virtual {v2}, Lokio/n;->IT()Lokio/n;
+    invoke-virtual {v2}, Lokio/n;->IG()Lokio/n;
 
     move-result-object v3
 
@@ -1736,20 +1736,20 @@
 
     iput p2, v3, Lokio/n;->limit:I
 
-    iget-object p2, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object p2, p1, Lokio/c;->bBI:Lokio/n;
 
     if-nez p2, :cond_2
 
-    iput-object v3, v3, Lokio/n;->bBJ:Lokio/n;
+    iput-object v3, v3, Lokio/n;->bCd:Lokio/n;
 
-    iput-object v3, v3, Lokio/n;->bBI:Lokio/n;
+    iput-object v3, v3, Lokio/n;->bCc:Lokio/n;
 
-    iput-object v3, p1, Lokio/c;->bBo:Lokio/n;
+    iput-object v3, p1, Lokio/c;->bBI:Lokio/n;
 
     goto :goto_2
 
     :cond_2
-    iget-object p2, p2, Lokio/n;->bBJ:Lokio/n;
+    iget-object p2, p2, Lokio/n;->bCd:Lokio/n;
 
     invoke-virtual {p2, v3}, Lokio/n;->a(Lokio/n;)Lokio/n;
 
@@ -1764,7 +1764,7 @@
 
     sub-long/2addr p4, p2
 
-    iget-object v2, v2, Lokio/n;->bBI:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bCc:Lokio/n;
 
     move-wide p2, v0
 
@@ -1832,7 +1832,7 @@
 
     if-lez v4, :cond_1
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     :goto_0
     iget v1, v0, Lokio/n;->limit:I
@@ -1862,17 +1862,17 @@
     :cond_0
     sub-long/2addr p1, v1
 
-    iget-object v0, v0, Lokio/n;->bBI:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bCc:Lokio/n;
 
     goto :goto_0
 
     :cond_1
     sub-long/2addr p1, v0
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     :cond_2
-    iget-object v0, v0, Lokio/n;->bBJ:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bCd:Lokio/n;
 
     iget v1, v0, Lokio/n;->limit:I
 
@@ -2063,11 +2063,11 @@
 
     invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v6}, Lokio/c;->HF()Lokio/ByteString;
+    invoke-virtual {v6}, Lokio/c;->Hs()Lokio/ByteString;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/ByteString;->IJ()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Iw()Ljava/lang/String;
 
     move-result-object p1
 
@@ -2213,13 +2213,13 @@
 
     if-lez v2, :cond_2
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     if-eqz v0, :cond_1
 
     iget v0, v0, Lokio/n;->limit:I
 
-    iget-object v1, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v1, p0, Lokio/c;->bBI:Lokio/n;
 
     iget v1, v1, Lokio/n;->pos:I
 
@@ -2243,7 +2243,7 @@
 
     sub-long/2addr p1, v4
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     iget v2, v0, Lokio/n;->pos:I
 
@@ -2251,23 +2251,23 @@
 
     iput v2, v0, Lokio/n;->pos:I
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     iget v0, v0, Lokio/n;->pos:I
 
-    iget-object v1, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v1, p0, Lokio/c;->bBI:Lokio/n;
 
     iget v1, v1, Lokio/n;->limit:I
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
-    invoke-virtual {v0}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->II()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, p0, Lokio/c;->bBo:Lokio/n;
+    iput-object v1, p0, Lokio/c;->bBI:Lokio/n;
 
     invoke-static {v0}, Lokio/o;->b(Lokio/n;)V
 
@@ -2295,7 +2295,7 @@
 
     const/16 p1, 0x30
 
-    invoke-virtual {p0, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, p1}, Lokio/c;->dM(I)Lokio/c;
 
     move-result-object p1
 
@@ -2318,7 +2318,7 @@
 
     const-string p1, "-9223372036854775808"
 
-    invoke-virtual {p0, p1}, Lokio/c;->eI(Ljava/lang/String;)Lokio/c;
+    invoke-virtual {p0, p1}, Lokio/c;->eD(Ljava/lang/String;)Lokio/c;
 
     move-result-object p1
 
@@ -2532,7 +2532,7 @@
     add-int/lit8 v3, v3, 0x1
 
     :cond_15
-    invoke-virtual {p0, v3}, Lokio/c;->dT(I)Lokio/n;
+    invoke-virtual {p0, v3}, Lokio/c;->dP(I)Lokio/n;
 
     move-result-object v4
 
@@ -2553,7 +2553,7 @@
 
     add-int/lit8 v8, v8, -0x1
 
-    sget-object v9, Lokio/c;->bBn:[B
+    sget-object v9, Lokio/c;->bBH:[B
 
     aget-byte v9, v9, v10
 
@@ -2601,7 +2601,7 @@
 
     const/16 p1, 0x30
 
-    invoke-virtual {p0, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, p1}, Lokio/c;->dM(I)Lokio/c;
 
     move-result-object p1
 
@@ -2622,7 +2622,7 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    invoke-virtual {p0, v0}, Lokio/c;->dT(I)Lokio/n;
+    invoke-virtual {p0, v0}, Lokio/c;->dP(I)Lokio/n;
 
     move-result-object v2
 
@@ -2639,7 +2639,7 @@
     :goto_0
     if-lt v4, v5, :cond_1
 
-    sget-object v6, Lokio/c;->bBn:[B
+    sget-object v6, Lokio/c;->bBH:[B
 
     const-wide/16 v7, 0xf
 
@@ -2714,7 +2714,7 @@
 
     if-ltz v2, :cond_b
 
-    iget-object v2, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v2, p0, Lokio/c;->bBI:Lokio/n;
 
     const-wide/16 v3, -0x1
 
@@ -2736,7 +2736,7 @@
 
     if-lez v0, :cond_2
 
-    iget-object v2, v2, Lokio/n;->bBJ:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bCd:Lokio/n;
 
     iget v0, v2, Lokio/n;->limit:I
 
@@ -2768,7 +2768,7 @@
 
     if-gez v7, :cond_2
 
-    iget-object v2, v2, Lokio/n;->bBI:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bCc:Lokio/n;
 
     goto :goto_1
 
@@ -2854,14 +2854,14 @@
 
     add-long/2addr p2, v5
 
-    iget-object v2, v2, Lokio/n;->bBI:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bCc:Lokio/n;
 
     move-wide v5, p2
 
     goto :goto_2
 
     :cond_6
-    invoke-virtual {p1}, Lokio/ByteString;->IL()[B
+    invoke-virtual {p1}, Lokio/ByteString;->Iy()[B
 
     move-result-object p1
 
@@ -2927,7 +2927,7 @@
 
     add-long/2addr p2, v5
 
-    iget-object v2, v2, Lokio/n;->bBI:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bCc:Lokio/n;
 
     move-wide v5, p2
 
@@ -3034,7 +3034,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokio/c;->ID()Lokio/c;
+    invoke-virtual {p0}, Lokio/c;->Iq()Lokio/c;
 
     move-result-object v0
 
@@ -3047,14 +3047,14 @@
     return-void
 .end method
 
-.method public final dP(I)Lokio/c;
+.method public final dL(I)Lokio/c;
     .locals 3
 
     const/16 v0, 0x80
 
     if-ge p1, v0, :cond_0
 
-    invoke-virtual {p0, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, p1}, Lokio/c;->dM(I)Lokio/c;
 
     goto :goto_0
 
@@ -3069,13 +3069,13 @@
 
     or-int/lit16 v1, v1, 0xc0
 
-    invoke-virtual {p0, v1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v1}, Lokio/c;->dM(I)Lokio/c;
 
     and-int/2addr p1, v2
 
     or-int/2addr p1, v0
 
-    invoke-virtual {p0, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, p1}, Lokio/c;->dM(I)Lokio/c;
 
     goto :goto_0
 
@@ -3092,7 +3092,7 @@
 
     if-gt p1, v1, :cond_2
 
-    invoke-virtual {p0, v2}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v2}, Lokio/c;->dM(I)Lokio/c;
 
     goto :goto_0
 
@@ -3101,7 +3101,7 @@
 
     or-int/lit16 v1, v1, 0xe0
 
-    invoke-virtual {p0, v1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v1}, Lokio/c;->dM(I)Lokio/c;
 
     shr-int/lit8 v1, p1, 0x6
 
@@ -3109,13 +3109,13 @@
 
     or-int/2addr v1, v0
 
-    invoke-virtual {p0, v1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v1}, Lokio/c;->dM(I)Lokio/c;
 
     and-int/2addr p1, v2
 
     or-int/2addr p1, v0
 
-    invoke-virtual {p0, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, p1}, Lokio/c;->dM(I)Lokio/c;
 
     goto :goto_0
 
@@ -3128,7 +3128,7 @@
 
     or-int/lit16 v1, v1, 0xf0
 
-    invoke-virtual {p0, v1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v1}, Lokio/c;->dM(I)Lokio/c;
 
     shr-int/lit8 v1, p1, 0xc
 
@@ -3136,7 +3136,7 @@
 
     or-int/2addr v1, v0
 
-    invoke-virtual {p0, v1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v1}, Lokio/c;->dM(I)Lokio/c;
 
     shr-int/lit8 v1, p1, 0x6
 
@@ -3144,13 +3144,13 @@
 
     or-int/2addr v1, v0
 
-    invoke-virtual {p0, v1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v1}, Lokio/c;->dM(I)Lokio/c;
 
     and-int/2addr p1, v2
 
     or-int/2addr p1, v0
 
-    invoke-virtual {p0, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, p1}, Lokio/c;->dM(I)Lokio/c;
 
     :goto_0
     return-object p0
@@ -3179,12 +3179,12 @@
     throw v0
 .end method
 
-.method public final dQ(I)Lokio/c;
+.method public final dM(I)Lokio/c;
     .locals 4
 
     const/4 v0, 0x1
 
-    invoke-virtual {p0, v0}, Lokio/c;->dT(I)Lokio/n;
+    invoke-virtual {p0, v0}, Lokio/c;->dP(I)Lokio/n;
 
     move-result-object v0
 
@@ -3211,12 +3211,12 @@
     return-object p0
 .end method
 
-.method public final dR(I)Lokio/c;
+.method public final dN(I)Lokio/c;
     .locals 5
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, v0}, Lokio/c;->dT(I)Lokio/n;
+    invoke-virtual {p0, v0}, Lokio/c;->dP(I)Lokio/n;
 
     move-result-object v0
 
@@ -3255,12 +3255,12 @@
     return-object p0
 .end method
 
-.method public final dS(I)Lokio/c;
+.method public final dO(I)Lokio/c;
     .locals 5
 
     const/4 v0, 0x4
 
-    invoke-virtual {p0, v0}, Lokio/c;->dT(I)Lokio/n;
+    invoke-virtual {p0, v0}, Lokio/c;->dP(I)Lokio/n;
 
     move-result-object v0
 
@@ -3319,7 +3319,7 @@
     return-object p0
 .end method
 
-.method public final dT(I)Lokio/n;
+.method public final dP(I)Lokio/n;
     .locals 3
 
     if-lez p1, :cond_3
@@ -3328,26 +3328,26 @@
 
     if-gt p1, v0, :cond_3
 
-    iget-object v1, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v1, p0, Lokio/c;->bBI:Lokio/n;
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lokio/o;->IW()Lokio/n;
+    invoke-static {}, Lokio/o;->IJ()Lokio/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->bBo:Lokio/n;
+    iput-object p1, p0, Lokio/c;->bBI:Lokio/n;
 
-    iget-object p1, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object p1, p0, Lokio/c;->bBI:Lokio/n;
 
-    iput-object p1, p1, Lokio/n;->bBJ:Lokio/n;
+    iput-object p1, p1, Lokio/n;->bCd:Lokio/n;
 
-    iput-object p1, p1, Lokio/n;->bBI:Lokio/n;
+    iput-object p1, p1, Lokio/n;->bCc:Lokio/n;
 
     return-object p1
 
     :cond_0
-    iget-object v1, v1, Lokio/n;->bBJ:Lokio/n;
+    iget-object v1, v1, Lokio/n;->bCd:Lokio/n;
 
     iget v2, v1, Lokio/n;->limit:I
 
@@ -3360,7 +3360,7 @@
     if-nez p1, :cond_2
 
     :cond_1
-    invoke-static {}, Lokio/o;->IW()Lokio/n;
+    invoke-static {}, Lokio/o;->IJ()Lokio/n;
 
     move-result-object p1
 
@@ -3379,7 +3379,7 @@
     throw p1
 .end method
 
-.method public final synthetic dU(I)Lokio/BufferedSink;
+.method public final synthetic dQ(I)Lokio/BufferedSink;
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3387,14 +3387,14 @@
         }
     .end annotation
 
-    invoke-virtual {p0, p1}, Lokio/c;->dS(I)Lokio/c;
+    invoke-virtual {p0, p1}, Lokio/c;->dO(I)Lokio/c;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final synthetic dV(I)Lokio/BufferedSink;
+.method public final synthetic dR(I)Lokio/BufferedSink;
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3402,14 +3402,14 @@
         }
     .end annotation
 
-    invoke-virtual {p0, p1}, Lokio/c;->dR(I)Lokio/c;
+    invoke-virtual {p0, p1}, Lokio/c;->dN(I)Lokio/c;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final synthetic dW(I)Lokio/BufferedSink;
+.method public final synthetic dS(I)Lokio/BufferedSink;
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3417,14 +3417,14 @@
         }
     .end annotation
 
-    invoke-virtual {p0, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, p1}, Lokio/c;->dM(I)Lokio/c;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final eI(Ljava/lang/String;)Lokio/c;
+.method public final eD(Ljava/lang/String;)Lokio/c;
     .locals 2
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
@@ -3440,7 +3440,7 @@
     return-object p1
 .end method
 
-.method public final synthetic eJ(Ljava/lang/String;)Lokio/BufferedSink;
+.method public final synthetic eE(Ljava/lang/String;)Lokio/BufferedSink;
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3448,7 +3448,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0, p1}, Lokio/c;->eI(Ljava/lang/String;)Lokio/c;
+    invoke-virtual {p0, p1}, Lokio/c;->eD(Ljava/lang/String;)Lokio/c;
 
     move-result-object p1
 
@@ -3496,9 +3496,9 @@
     return v0
 
     :cond_3
-    iget-object v1, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v1, p0, Lokio/c;->bBI:Lokio/n;
 
-    iget-object p1, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object p1, p1, Lokio/c;->bBI:Lokio/n;
 
     iget v3, v1, Lokio/n;->pos:I
 
@@ -3568,7 +3568,7 @@
 
     if-ne v4, v3, :cond_6
 
-    iget-object v1, v1, Lokio/n;->bBI:Lokio/n;
+    iget-object v1, v1, Lokio/n;->bCc:Lokio/n;
 
     iget v3, v1, Lokio/n;->pos:I
 
@@ -3582,7 +3582,7 @@
 
     if-ne v9, v4, :cond_7
 
-    iget-object p1, p1, Lokio/n;->bBI:Lokio/n;
+    iget-object p1, p1, Lokio/n;->bCc:Lokio/n;
 
     iget v4, p1, Lokio/n;->pos:I
 
@@ -3609,7 +3609,7 @@
 .method public final hashCode()I
     .locals 5
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     if-nez v0, :cond_0
 
@@ -3641,9 +3641,9 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, v0, Lokio/n;->bBI:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bCc:Lokio/n;
 
-    iget-object v2, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v2, p0, Lokio/c;->bBI:Lokio/n;
 
     if-ne v0, v2, :cond_1
 
@@ -3817,7 +3817,7 @@
 
     const/4 v0, 0x1
 
-    invoke-virtual {p0, v0}, Lokio/c;->dT(I)Lokio/n;
+    invoke-virtual {p0, v0}, Lokio/c;->dP(I)Lokio/n;
 
     move-result-object v0
 
@@ -3915,7 +3915,7 @@
 
     const/4 v2, 0x1
 
-    invoke-virtual {p0, v2}, Lokio/c;->dT(I)Lokio/n;
+    invoke-virtual {p0, v2}, Lokio/c;->dP(I)Lokio/n;
 
     move-result-object v2
 
@@ -3992,13 +3992,13 @@
 
     or-int/lit16 v2, v2, 0xc0
 
-    invoke-virtual {p0, v2}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v2}, Lokio/c;->dM(I)Lokio/c;
 
     and-int/lit8 v0, v0, 0x3f
 
     or-int/2addr v0, v1
 
-    invoke-virtual {p0, v0}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v0}, Lokio/c;->dM(I)Lokio/c;
 
     :goto_2
     add-int/lit8 p2, p2, 0x1
@@ -4066,7 +4066,7 @@
 
     or-int/lit16 v2, v2, 0xf0
 
-    invoke-virtual {p0, v2}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v2}, Lokio/c;->dM(I)Lokio/c;
 
     shr-int/lit8 v2, v0, 0xc
 
@@ -4074,7 +4074,7 @@
 
     or-int/2addr v2, v1
 
-    invoke-virtual {p0, v2}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v2}, Lokio/c;->dM(I)Lokio/c;
 
     shr-int/lit8 v2, v0, 0x6
 
@@ -4082,13 +4082,13 @@
 
     or-int/2addr v2, v1
 
-    invoke-virtual {p0, v2}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v2}, Lokio/c;->dM(I)Lokio/c;
 
     and-int/2addr v0, v3
 
     or-int/2addr v0, v1
 
-    invoke-virtual {p0, v0}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v0}, Lokio/c;->dM(I)Lokio/c;
 
     add-int/lit8 p2, p2, 0x2
 
@@ -4096,7 +4096,7 @@
 
     :cond_6
     :goto_4
-    invoke-virtual {p0, v3}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v3}, Lokio/c;->dM(I)Lokio/c;
 
     move p2, v4
 
@@ -4108,7 +4108,7 @@
 
     or-int/lit16 v2, v2, 0xe0
 
-    invoke-virtual {p0, v2}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v2}, Lokio/c;->dM(I)Lokio/c;
 
     shr-int/lit8 v2, v0, 0x6
 
@@ -4116,13 +4116,13 @@
 
     or-int/2addr v2, v1
 
-    invoke-virtual {p0, v2}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v2}, Lokio/c;->dM(I)Lokio/c;
 
     and-int/lit8 v0, v0, 0x3f
 
     or-int/2addr v0, v1
 
-    invoke-virtual {p0, v0}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p0, v0}, Lokio/c;->dM(I)Lokio/c;
 
     goto :goto_2
 
@@ -4239,7 +4239,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     if-nez v0, :cond_0
 
@@ -4288,11 +4288,11 @@
 
     if-ne p1, v2, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->II()Lokio/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->bBo:Lokio/n;
+    iput-object p1, p0, Lokio/c;->bBI:Lokio/n;
 
     invoke-static {v0}, Lokio/o;->b(Lokio/n;)V
 
@@ -4313,7 +4313,7 @@
 
     invoke-static/range {v1 .. v6}, Lokio/t;->a(JJJ)V
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     if-nez v0, :cond_0
 
@@ -4358,11 +4358,11 @@
 
     if-ne p1, p2, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->II()Lokio/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->bBo:Lokio/n;
+    iput-object p1, p0, Lokio/c;->bBI:Lokio/n;
 
     invoke-static {v0}, Lokio/o;->b(Lokio/n;)V
 
@@ -4381,7 +4381,7 @@
 
     if-eqz v4, :cond_1
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -4403,11 +4403,11 @@
 
     if-ne v4, v2, :cond_0
 
-    invoke-virtual {v0}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->II()Lokio/n;
 
     move-result-object v2
 
-    iput-object v2, p0, Lokio/c;->bBo:Lokio/n;
+    iput-object v2, p0, Lokio/c;->bBI:Lokio/n;
 
     invoke-static {v0}, Lokio/o;->b(Lokio/n;)V
 
@@ -4506,7 +4506,7 @@
 
     if-ltz v4, :cond_2
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -4603,11 +4603,11 @@
 
     if-ne v7, v4, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->II()Lokio/n;
 
     move-result-object v2
 
-    iput-object v2, p0, Lokio/c;->bBo:Lokio/n;
+    iput-object v2, p0, Lokio/c;->bBI:Lokio/n;
 
     invoke-static {v0}, Lokio/o;->b(Lokio/n;)V
 
@@ -4652,7 +4652,7 @@
 
     if-ltz v4, :cond_2
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -4805,11 +4805,11 @@
 
     if-ne v1, v4, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->II()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, p0, Lokio/c;->bBo:Lokio/n;
+    iput-object v1, p0, Lokio/c;->bBI:Lokio/n;
 
     invoke-static {v0}, Lokio/o;->b(Lokio/n;)V
 
@@ -4854,7 +4854,7 @@
 
     if-ltz v4, :cond_2
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -4913,11 +4913,11 @@
 
     if-ne v7, v4, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->II()Lokio/n;
 
     move-result-object v2
 
-    iput-object v2, p0, Lokio/c;->bBo:Lokio/n;
+    iput-object v2, p0, Lokio/c;->bBI:Lokio/n;
 
     invoke-static {v0}, Lokio/o;->b(Lokio/n;)V
 
@@ -4975,7 +4975,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    sget-object v0, Lokio/s;->bBN:Lokio/s;
+    sget-object v0, Lokio/s;->bCh:Lokio/s;
 
     return-object v0
 .end method
@@ -4995,7 +4995,7 @@
 
     if-nez v1, :cond_0
 
-    sget-object v0, Lokio/ByteString;->bBs:Lokio/ByteString;
+    sget-object v0, Lokio/ByteString;->bBM:Lokio/ByteString;
 
     goto :goto_0
 
@@ -5054,7 +5054,7 @@
 
     const/4 v2, 0x1
 
-    invoke-virtual {p0, v2}, Lokio/c;->dT(I)Lokio/n;
+    invoke-virtual {p0, v2}, Lokio/c;->dP(I)Lokio/n;
 
     move-result-object v2
 
@@ -5131,11 +5131,11 @@
 
     if-lez v2, :cond_a
 
-    iget-object v0, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p1, Lokio/c;->bBI:Lokio/n;
 
     iget v0, v0, Lokio/n;->limit:I
 
-    iget-object v1, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object v1, p1, Lokio/c;->bBI:Lokio/n;
 
     iget v1, v1, Lokio/n;->pos:I
 
@@ -5149,11 +5149,11 @@
 
     if-gez v3, :cond_5
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lokio/n;->bBJ:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bCd:Lokio/n;
 
     goto :goto_1
 
@@ -5173,7 +5173,7 @@
 
     add-long/2addr v3, p2
 
-    iget-boolean v1, v0, Lokio/n;->bmY:Z
+    iget-boolean v1, v0, Lokio/n;->bns:Z
 
     if-eqz v1, :cond_1
 
@@ -5195,7 +5195,7 @@
 
     if-gtz v1, :cond_2
 
-    iget-object v1, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object v1, p1, Lokio/c;->bBI:Lokio/n;
 
     long-to-int v2, p2
 
@@ -5216,7 +5216,7 @@
     return-void
 
     :cond_2
-    iget-object v0, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p1, Lokio/c;->bBI:Lokio/n;
 
     long-to-int v1, p2
 
@@ -5234,14 +5234,14 @@
 
     if-lt v1, v3, :cond_3
 
-    invoke-virtual {v0}, Lokio/n;->IT()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->IG()Lokio/n;
 
     move-result-object v3
 
     goto :goto_3
 
     :cond_3
-    invoke-static {}, Lokio/o;->IW()Lokio/n;
+    invoke-static {}, Lokio/o;->IJ()Lokio/n;
 
     move-result-object v3
 
@@ -5266,11 +5266,11 @@
 
     iput v4, v0, Lokio/n;->pos:I
 
-    iget-object v0, v0, Lokio/n;->bBJ:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bCd:Lokio/n;
 
     invoke-virtual {v0, v3}, Lokio/n;->a(Lokio/n;)Lokio/n;
 
-    iput-object v3, p1, Lokio/c;->bBo:Lokio/n;
+    iput-object v3, p1, Lokio/c;->bBI:Lokio/n;
 
     goto :goto_4
 
@@ -5283,7 +5283,7 @@
 
     :cond_5
     :goto_4
-    iget-object v0, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p1, Lokio/c;->bBI:Lokio/n;
 
     iget v1, v0, Lokio/n;->limit:I
 
@@ -5293,38 +5293,38 @@
 
     int-to-long v3, v1
 
-    invoke-virtual {v0}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->II()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, p1, Lokio/c;->bBo:Lokio/n;
+    iput-object v1, p1, Lokio/c;->bBI:Lokio/n;
 
-    iget-object v1, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v1, p0, Lokio/c;->bBI:Lokio/n;
 
     if-nez v1, :cond_6
 
-    iput-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iput-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
-    iget-object v0, p0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p0, Lokio/c;->bBI:Lokio/n;
 
-    iput-object v0, v0, Lokio/n;->bBJ:Lokio/n;
+    iput-object v0, v0, Lokio/n;->bCd:Lokio/n;
 
-    iput-object v0, v0, Lokio/n;->bBI:Lokio/n;
+    iput-object v0, v0, Lokio/n;->bCc:Lokio/n;
 
     goto :goto_6
 
     :cond_6
-    iget-object v1, v1, Lokio/n;->bBJ:Lokio/n;
+    iget-object v1, v1, Lokio/n;->bCd:Lokio/n;
 
     invoke-virtual {v1, v0}, Lokio/n;->a(Lokio/n;)Lokio/n;
 
     move-result-object v0
 
-    iget-object v1, v0, Lokio/n;->bBJ:Lokio/n;
+    iget-object v1, v0, Lokio/n;->bCd:Lokio/n;
 
     if-eq v1, v0, :cond_9
 
-    iget-object v1, v0, Lokio/n;->bBJ:Lokio/n;
+    iget-object v1, v0, Lokio/n;->bCd:Lokio/n;
 
     iget-boolean v1, v1, Lokio/n;->owner:Z
 
@@ -5336,22 +5336,22 @@
 
     sub-int/2addr v1, v5
 
-    iget-object v5, v0, Lokio/n;->bBJ:Lokio/n;
+    iget-object v5, v0, Lokio/n;->bCd:Lokio/n;
 
     iget v5, v5, Lokio/n;->limit:I
 
     rsub-int v5, v5, 0x2000
 
-    iget-object v6, v0, Lokio/n;->bBJ:Lokio/n;
+    iget-object v6, v0, Lokio/n;->bCd:Lokio/n;
 
-    iget-boolean v6, v6, Lokio/n;->bmY:Z
+    iget-boolean v6, v6, Lokio/n;->bns:Z
 
     if-eqz v6, :cond_7
 
     goto :goto_5
 
     :cond_7
-    iget-object v2, v0, Lokio/n;->bBJ:Lokio/n;
+    iget-object v2, v0, Lokio/n;->bCd:Lokio/n;
 
     iget v2, v2, Lokio/n;->pos:I
 
@@ -5360,11 +5360,11 @@
 
     if-gt v1, v5, :cond_8
 
-    iget-object v2, v0, Lokio/n;->bBJ:Lokio/n;
+    iget-object v2, v0, Lokio/n;->bCd:Lokio/n;
 
     invoke-virtual {v0, v2, v1}, Lokio/n;->a(Lokio/n;I)V
 
-    invoke-virtual {v0}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->II()Lokio/n;
 
     invoke-static {v0}, Lokio/o;->b(Lokio/n;)V
 
diff --git a/com.discord/smali/okio/d.smali b/com.discord/smali/okio/d.smali
index 6c0174bf61..3c74d20944 100644
--- a/com.discord/smali/okio/d.smali
+++ b/com.discord/smali/okio/d.smali
@@ -8,31 +8,15 @@
 
 
 # virtual methods
-.method public abstract IB()Ljava/lang/String;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract IC()J
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract Ir()Lokio/c;
+.method public abstract Ie()Lokio/c;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end method
 
-.method public abstract Is()Lokio/c;
+.method public abstract If()Lokio/c;
 .end method
 
-.method public abstract Iu()Z
+.method public abstract Ih()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -40,10 +24,10 @@
     .end annotation
 .end method
 
-.method public abstract Iv()Ljava/io/InputStream;
+.method public abstract Ii()Ljava/io/InputStream;
 .end method
 
-.method public abstract Ix()S
+.method public abstract Ik()S
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -51,7 +35,7 @@
     .end annotation
 .end method
 
-.method public abstract Iy()I
+.method public abstract Il()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -59,7 +43,23 @@
     .end annotation
 .end method
 
-.method public abstract Iz()J
+.method public abstract Im()J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract Io()Ljava/lang/String;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract Ip()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali/okio/j$3.smali b/com.discord/smali/okio/j$3.smali
index 35c04ac695..5f972fb04f 100644
--- a/com.discord/smali/okio/j$3.smali
+++ b/com.discord/smali/okio/j$3.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bBC:Ljava/net/Socket;
+.field final synthetic bBW:Ljava/net/Socket;
 
 
 # direct methods
 .method constructor <init>(Ljava/net/Socket;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/j$3;->bBC:Ljava/net/Socket;
+    iput-object p1, p0, Lokio/j$3;->bBW:Ljava/net/Socket;
 
     invoke-direct {p0}, Lokio/a;-><init>()V
 
@@ -31,13 +31,13 @@
 
 
 # virtual methods
-.method protected final GW()V
+.method protected final GK()V
     .locals 5
 
     const-string v0, "Failed to close timed out socket "
 
     :try_start_0
-    iget-object v1, p0, Lokio/j$3;->bBC:Ljava/net/Socket;
+    iget-object v1, p0, Lokio/j$3;->bBW:Ljava/net/Socket;
 
     invoke-virtual {v1}, Ljava/net/Socket;->close()V
     :try_end_0
@@ -63,7 +63,7 @@
 
     invoke-direct {v4, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lokio/j$3;->bBC:Ljava/net/Socket;
+    iget-object v0, p0, Lokio/j$3;->bBW:Ljava/net/Socket;
 
     invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -89,7 +89,7 @@
 
     invoke-direct {v4, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lokio/j$3;->bBC:Ljava/net/Socket;
+    iget-object v0, p0, Lokio/j$3;->bBW:Ljava/net/Socket;
 
     invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/okio/n.smali b/com.discord/smali/okio/n.smali
index cad421a940..74e0639163 100644
--- a/com.discord/smali/okio/n.smali
+++ b/com.discord/smali/okio/n.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field bBI:Lokio/n;
+.field bCc:Lokio/n;
 
-.field bBJ:Lokio/n;
+.field bCd:Lokio/n;
 
-.field bmY:Z
+.field bns:Z
 
 .field public final data:[B
 
@@ -37,7 +37,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokio/n;->bmY:Z
+    iput-boolean v0, p0, Lokio/n;->bns:Z
 
     return-void
 .end method
@@ -53,7 +53,7 @@
 
     iput p3, p0, Lokio/n;->limit:I
 
-    iput-boolean p4, p0, Lokio/n;->bmY:Z
+    iput-boolean p4, p0, Lokio/n;->bns:Z
 
     iput-boolean p5, p0, Lokio/n;->owner:Z
 
@@ -62,12 +62,12 @@
 
 
 # virtual methods
-.method final IT()Lokio/n;
+.method final IG()Lokio/n;
     .locals 7
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokio/n;->bmY:Z
+    iput-boolean v0, p0, Lokio/n;->bns:Z
 
     new-instance v0, Lokio/n;
 
@@ -88,7 +88,7 @@
     return-object v0
 .end method
 
-.method final IU()Lokio/n;
+.method final IH()Lokio/n;
     .locals 7
 
     new-instance v6, Lokio/n;
@@ -118,12 +118,12 @@
     return-object v6
 .end method
 
-.method public final IV()Lokio/n;
+.method public final II()Lokio/n;
     .locals 4
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokio/n;->bBI:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bCc:Lokio/n;
 
     const/4 v1, 0x0
 
@@ -135,19 +135,19 @@
     move-object v0, v1
 
     :goto_0
-    iget-object v2, p0, Lokio/n;->bBJ:Lokio/n;
+    iget-object v2, p0, Lokio/n;->bCd:Lokio/n;
 
-    iget-object v3, p0, Lokio/n;->bBI:Lokio/n;
+    iget-object v3, p0, Lokio/n;->bCc:Lokio/n;
 
-    iput-object v3, v2, Lokio/n;->bBI:Lokio/n;
+    iput-object v3, v2, Lokio/n;->bCc:Lokio/n;
 
-    iget-object v3, p0, Lokio/n;->bBI:Lokio/n;
+    iget-object v3, p0, Lokio/n;->bCc:Lokio/n;
 
-    iput-object v2, v3, Lokio/n;->bBJ:Lokio/n;
+    iput-object v2, v3, Lokio/n;->bCd:Lokio/n;
 
-    iput-object v1, p0, Lokio/n;->bBI:Lokio/n;
+    iput-object v1, p0, Lokio/n;->bCc:Lokio/n;
 
-    iput-object v1, p0, Lokio/n;->bBJ:Lokio/n;
+    iput-object v1, p0, Lokio/n;->bCd:Lokio/n;
 
     return-object v0
 .end method
@@ -155,17 +155,17 @@
 .method public final a(Lokio/n;)Lokio/n;
     .locals 1
 
-    iput-object p0, p1, Lokio/n;->bBJ:Lokio/n;
+    iput-object p0, p1, Lokio/n;->bCd:Lokio/n;
 
-    iget-object v0, p0, Lokio/n;->bBI:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bCc:Lokio/n;
 
-    iput-object v0, p1, Lokio/n;->bBI:Lokio/n;
+    iput-object v0, p1, Lokio/n;->bCc:Lokio/n;
 
-    iget-object v0, p0, Lokio/n;->bBI:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bCc:Lokio/n;
 
-    iput-object p1, v0, Lokio/n;->bBJ:Lokio/n;
+    iput-object p1, v0, Lokio/n;->bCd:Lokio/n;
 
-    iput-object p1, p0, Lokio/n;->bBI:Lokio/n;
+    iput-object p1, p0, Lokio/n;->bCc:Lokio/n;
 
     return-object p1
 .end method
@@ -185,7 +185,7 @@
 
     if-le v1, v2, :cond_2
 
-    iget-boolean v1, p1, Lokio/n;->bmY:Z
+    iget-boolean v1, p1, Lokio/n;->bns:Z
 
     if-nez v1, :cond_1
 
diff --git a/com.discord/smali/okio/o.smali b/com.discord/smali/okio/o.smali
index 06f16a83fe..bd4b333a79 100644
--- a/com.discord/smali/okio/o.smali
+++ b/com.discord/smali/okio/o.smali
@@ -4,12 +4,12 @@
 
 
 # static fields
-.field static bBI:Lokio/n;
+.field static bCc:Lokio/n;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field static bBK:J
+.field static bCe:J
 
 
 # direct methods
@@ -21,7 +21,7 @@
     return-void
 .end method
 
-.method static IW()Lokio/n;
+.method static IJ()Lokio/n;
     .locals 6
 
     const-class v0, Lokio/o;
@@ -29,27 +29,27 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokio/o;->bBI:Lokio/n;
+    sget-object v1, Lokio/o;->bCc:Lokio/n;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lokio/o;->bBI:Lokio/n;
+    sget-object v1, Lokio/o;->bCc:Lokio/n;
 
-    iget-object v2, v1, Lokio/n;->bBI:Lokio/n;
+    iget-object v2, v1, Lokio/n;->bCc:Lokio/n;
 
-    sput-object v2, Lokio/o;->bBI:Lokio/n;
+    sput-object v2, Lokio/o;->bCc:Lokio/n;
 
     const/4 v2, 0x0
 
-    iput-object v2, v1, Lokio/n;->bBI:Lokio/n;
+    iput-object v2, v1, Lokio/n;->bCc:Lokio/n;
 
-    sget-wide v2, Lokio/o;->bBK:J
+    sget-wide v2, Lokio/o;->bCe:J
 
     const-wide/16 v4, 0x2000
 
     sub-long/2addr v2, v4
 
-    sput-wide v2, Lokio/o;->bBK:J
+    sput-wide v2, Lokio/o;->bCe:J
 
     monitor-exit v0
 
@@ -80,15 +80,15 @@
 .method static b(Lokio/n;)V
     .locals 8
 
-    iget-object v0, p0, Lokio/n;->bBI:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bCc:Lokio/n;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokio/n;->bBJ:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bCd:Lokio/n;
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokio/n;->bmY:Z
+    iget-boolean v0, p0, Lokio/n;->bns:Z
 
     if-eqz v0, :cond_0
 
@@ -100,7 +100,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-wide v1, Lokio/o;->bBK:J
+    sget-wide v1, Lokio/o;->bCe:J
 
     const-wide/16 v3, 0x2000
 
@@ -117,15 +117,15 @@
     return-void
 
     :cond_1
-    sget-wide v1, Lokio/o;->bBK:J
+    sget-wide v1, Lokio/o;->bCe:J
 
     add-long/2addr v1, v3
 
-    sput-wide v1, Lokio/o;->bBK:J
+    sput-wide v1, Lokio/o;->bCe:J
 
-    sget-object v1, Lokio/o;->bBI:Lokio/n;
+    sget-object v1, Lokio/o;->bCc:Lokio/n;
 
-    iput-object v1, p0, Lokio/n;->bBI:Lokio/n;
+    iput-object v1, p0, Lokio/n;->bCc:Lokio/n;
 
     const/4 v1, 0x0
 
@@ -133,7 +133,7 @@
 
     iput v1, p0, Lokio/n;->pos:I
 
-    sput-object p0, Lokio/o;->bBI:Lokio/n;
+    sput-object p0, Lokio/o;->bCc:Lokio/n;
 
     monitor-exit v0
 
diff --git a/com.discord/smali/okio/s.smali b/com.discord/smali/okio/s.smali
index 08da5642e2..7c31c650c1 100644
--- a/com.discord/smali/okio/s.smali
+++ b/com.discord/smali/okio/s.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field public static final bBN:Lokio/s;
+.field public static final bCh:Lokio/s;
 
 
 # instance fields
-.field private bBO:Z
+.field private bCi:Z
 
-.field private bBP:J
+.field private bCj:J
 
-.field private bBQ:J
+.field private bCk:J
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Lokio/s$1;-><init>()V
 
-    sput-object v0, Lokio/s;->bBN:Lokio/s;
+    sput-object v0, Lokio/s;->bCh:Lokio/s;
 
     return-void
 .end method
@@ -38,30 +38,22 @@
 
 
 # virtual methods
-.method public IM()J
-    .locals 2
-
-    iget-wide v0, p0, Lokio/s;->bBQ:J
-
-    return-wide v0
-.end method
-
-.method public IN()Z
+.method public IA()Z
     .locals 1
 
-    iget-boolean v0, p0, Lokio/s;->bBO:Z
+    iget-boolean v0, p0, Lokio/s;->bCi:Z
 
     return v0
 .end method
 
-.method public IO()J
+.method public IB()J
     .locals 2
 
-    iget-boolean v0, p0, Lokio/s;->bBO:Z
+    iget-boolean v0, p0, Lokio/s;->bCi:Z
 
     if-eqz v0, :cond_0
 
-    iget-wide v0, p0, Lokio/s;->bBP:J
+    iget-wide v0, p0, Lokio/s;->bCj:J
 
     return-wide v0
 
@@ -75,27 +67,27 @@
     throw v0
 .end method
 
-.method public IP()Lokio/s;
+.method public IC()Lokio/s;
     .locals 2
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lokio/s;->bBQ:J
+    iput-wide v0, p0, Lokio/s;->bCk:J
 
     return-object p0
 .end method
 
-.method public IQ()Lokio/s;
+.method public ID()Lokio/s;
     .locals 1
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokio/s;->bBO:Z
+    iput-boolean v0, p0, Lokio/s;->bCi:Z
 
     return-object p0
 .end method
 
-.method public IR()V
+.method public IE()V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -109,11 +101,11 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokio/s;->bBO:Z
+    iget-boolean v0, p0, Lokio/s;->bCi:Z
 
     if-eqz v0, :cond_1
 
-    iget-wide v0, p0, Lokio/s;->bBP:J
+    iget-wide v0, p0, Lokio/s;->bCj:J
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
@@ -158,14 +150,22 @@
     throw v0
 .end method
 
+.method public Iz()J
+    .locals 2
+
+    iget-wide v0, p0, Lokio/s;->bCk:J
+
+    return-wide v0
+.end method
+
 .method public aT(J)Lokio/s;
     .locals 1
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokio/s;->bBO:Z
+    iput-boolean v0, p0, Lokio/s;->bCi:Z
 
-    iput-wide p1, p0, Lokio/s;->bBP:J
+    iput-wide p1, p0, Lokio/s;->bCj:J
 
     return-object p0
 .end method
@@ -185,7 +185,7 @@
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lokio/s;->bBQ:J
+    iput-wide p1, p0, Lokio/s;->bCk:J
 
     return-object p0
 
diff --git a/com.discord/smali/rx/Observable.smali b/com.discord/smali/rx/Observable.smali
index a45c28378a..9ecd532354 100644
--- a/com.discord/smali/rx/Observable.smali
+++ b/com.discord/smali/rx/Observable.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field final bIL:Lrx/Observable$a;
+.field final bJf:Lrx/Observable$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$a<",
@@ -46,7 +46,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/Observable;->bIL:Lrx/Observable$a;
+    iput-object p1, p0, Lrx/Observable;->bJf:Lrx/Observable$a;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lrx/internal/util/l$b;->bPI:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bQd:Lrx/internal/util/l$b;
 
     invoke-direct {p0, v0}, Lrx/Observable;->a(Lrx/functions/b;)Lrx/Observable;
 
@@ -157,7 +157,7 @@
     return-object p0
 .end method
 
-.method public static JZ()Lrx/Observable;
+.method public static JM()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -169,14 +169,14 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/e;->Kr()Lrx/Observable;
+    invoke-static {}, Lrx/internal/a/e;->Kf()Lrx/Observable;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static Ka()Lrx/Observable;
+.method public static JN()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -188,14 +188,14 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/f;->Kr()Lrx/Observable;
+    invoke-static {}, Lrx/internal/a/f;->Kf()Lrx/Observable;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method private Ki()Lrx/Observable;
+.method private JW()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -366,11 +366,11 @@
 
     check-cast v0, [Ljava/lang/Object;
 
-    invoke-static {v0}, Lrx/Observable;->u([Ljava/lang/Object;)Lrx/Observable;
+    invoke-static {v0}, Lrx/Observable;->t([Ljava/lang/Object;)Lrx/Observable;
 
     move-result-object p0
 
-    sget-object p1, Lrx/internal/util/l$b;->bPI:Lrx/internal/util/l$b;
+    sget-object p1, Lrx/internal/util/l$b;->bQd:Lrx/internal/util/l$b;
 
     invoke-direct {p0, p1}, Lrx/Observable;->a(Lrx/functions/b;)Lrx/Observable;
 
@@ -1184,7 +1184,7 @@
 
     if-eqz p0, :cond_3
 
-    iget-object v0, p1, Lrx/Observable;->bIL:Lrx/Observable$a;
+    iget-object v0, p1, Lrx/Observable;->bJf:Lrx/Observable$a;
 
     if-eqz v0, :cond_2
 
@@ -1202,7 +1202,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p1, Lrx/Observable;->bIL:Lrx/Observable$a;
+    iget-object v0, p1, Lrx/Observable;->bJf:Lrx/Observable$a;
 
     invoke-static {p1, v0}, Lrx/c/c;->a(Lrx/Observable;Lrx/Observable$a;)Lrx/Observable$a;
 
@@ -1248,7 +1248,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :goto_0
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object p0
 
@@ -1381,7 +1381,7 @@
 
     check-cast p0, Lrx/internal/util/k;
 
-    sget-object v0, Lrx/internal/util/l$b;->bPI:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bQd:Lrx/internal/util/l$b;
 
     invoke-virtual {p0, v0}, Lrx/internal/util/k;->n(Lrx/functions/b;)Lrx/Observable;
 
@@ -1390,7 +1390,7 @@
     return-object p0
 
     :cond_0
-    invoke-static {}, Lrx/internal/a/ah;->KA()Lrx/internal/a/ah;
+    invoke-static {}, Lrx/internal/a/ah;->Ko()Lrx/internal/a/ah;
 
     move-result-object v0
 
@@ -1429,7 +1429,7 @@
 
     aput-object p1, v0, p0
 
-    invoke-static {v0}, Lrx/Observable;->u([Ljava/lang/Object;)Lrx/Observable;
+    invoke-static {v0}, Lrx/Observable;->t([Ljava/lang/Object;)Lrx/Observable;
 
     move-result-object p0
 
@@ -1594,7 +1594,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -1660,7 +1660,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -1690,7 +1690,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -1701,7 +1701,7 @@
     return-object p0
 .end method
 
-.method private static u([Ljava/lang/Object;)Lrx/Observable;
+.method private static t([Ljava/lang/Object;)Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1717,7 +1717,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lrx/internal/a/e;->Kr()Lrx/Observable;
+    invoke-static {}, Lrx/internal/a/e;->Kf()Lrx/Observable;
 
     move-result-object p0
 
@@ -1752,7 +1752,7 @@
 
 
 # virtual methods
-.method public final JY()Lrx/f;
+.method public final JL()Lrx/f;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1773,7 +1773,7 @@
     return-object v0
 .end method
 
-.method public final Kb()Lrx/Observable;
+.method public final JO()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1783,7 +1783,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/ae;->Kz()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Kn()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -1794,7 +1794,32 @@
     return-object v0
 .end method
 
-.method public final Kc()Lrx/Observable;
+.method public final JP()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lrx/Observable;->JU()Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-static {}, Lrx/internal/a/aq;->KF()Lrx/internal/a/aq;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final JQ()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1804,7 +1829,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/aj;->KI()Lrx/internal/a/aj;
+    invoke-static {}, Lrx/internal/a/aj;->Kw()Lrx/internal/a/aj;
 
     move-result-object v0
 
@@ -1815,7 +1840,7 @@
     return-object v0
 .end method
 
-.method public final Kd()Lrx/Observable;
+.method public final JR()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1825,7 +1850,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/ak;->KK()Lrx/internal/a/ak;
+    invoke-static {}, Lrx/internal/a/ak;->Ky()Lrx/internal/a/ak;
 
     move-result-object v0
 
@@ -1836,7 +1861,7 @@
     return-object v0
 .end method
 
-.method public final Ke()Lrx/Observable;
+.method public final JS()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1846,7 +1871,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/aq;->KR()Lrx/internal/a/aq;
+    invoke-static {}, Lrx/internal/a/aq;->KF()Lrx/internal/a/aq;
 
     move-result-object v0
 
@@ -1857,7 +1882,7 @@
     return-object v0
 .end method
 
-.method public final Kf()Lrx/Observable;
+.method public final JT()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1880,7 +1905,7 @@
     return-object v0
 .end method
 
-.method public final Kg()Lrx/Observable;
+.method public final JU()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1903,7 +1928,7 @@
     return-object v0
 .end method
 
-.method public final Kh()Lrx/Observable;
+.method public final JV()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1914,7 +1939,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/ba;->KT()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->KH()Lrx/internal/a/ba;
 
     move-result-object v0
 
@@ -1925,7 +1950,7 @@
     return-object v0
 .end method
 
-.method public final Kj()Lrx/Observable;
+.method public final JX()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1935,11 +1960,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lrx/Observable;->Ki()Lrx/Observable;
+    invoke-direct {p0}, Lrx/Observable;->JW()Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v1, Lrx/internal/util/l$b;->bPI:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->bQd:Lrx/internal/util/l$b;
 
     invoke-direct {v0, v1}, Lrx/Observable;->d(Lrx/functions/b;)Lrx/Observable;
 
@@ -2027,7 +2052,7 @@
 
     new-instance v0, Lrx/internal/a/q;
 
-    iget-object v1, p0, Lrx/Observable;->bIL:Lrx/Observable$a;
+    iget-object v1, p0, Lrx/Observable;->bJf:Lrx/Observable$a;
 
     invoke-direct {v0, v1, p1}, Lrx/internal/a/q;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
@@ -2117,11 +2142,11 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/functions/a;->Kq()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Ke()Lrx/functions/a$b;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/functions/a;->Kq()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Ke()Lrx/functions/a$b;
 
     move-result-object v1
 
@@ -2210,7 +2235,7 @@
     :try_start_0
     invoke-virtual {p1}, Lrx/Subscriber;->onStart()V
 
-    iget-object v0, p0, Lrx/Observable;->bIL:Lrx/Observable$a;
+    iget-object v0, p0, Lrx/Observable;->bJf:Lrx/Observable$a;
 
     invoke-static {p0, v0}, Lrx/c/c;->a(Lrx/Observable;Lrx/Observable$a;)Lrx/Observable$a;
 
@@ -2240,7 +2265,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object p1
 
@@ -2298,7 +2323,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {}, Lrx/functions/a;->Kq()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Ke()Lrx/functions/a$b;
 
     move-result-object v0
 
@@ -2343,7 +2368,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/Observable;->bIL:Lrx/Observable$a;
+    iget-object v0, p0, Lrx/Observable;->bJf:Lrx/Observable$a;
 
     instance-of v0, v0, Lrx/internal/a/j;
 
@@ -2374,7 +2399,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lrx/internal/util/l$b;->bPI:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bQd:Lrx/internal/util/l$b;
 
     invoke-direct {p1, v0}, Lrx/Observable;->d(Lrx/functions/b;)Lrx/Observable;
 
@@ -2421,9 +2446,9 @@
 
     if-eqz p1, :cond_0
 
-    sget-object v0, Lrx/internal/util/f;->bPp:Lrx/functions/Action1;
+    sget-object v0, Lrx/internal/util/f;->bPK:Lrx/functions/Action1;
 
-    invoke-static {}, Lrx/functions/a;->Kq()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Ke()Lrx/functions/a$b;
 
     move-result-object v1
 
@@ -2588,7 +2613,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/au;->KS()Lrx/internal/a/au;
+    invoke-static {}, Lrx/internal/a/au;->KG()Lrx/internal/a/au;
 
     move-result-object v0
 
@@ -2612,7 +2637,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -2668,7 +2693,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -2696,7 +2721,7 @@
 
     new-instance v0, Lrx/internal/a/z;
 
-    sget-object v1, Lrx/internal/util/l$b;->bPI:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->bQd:Lrx/internal/util/l$b;
 
     invoke-direct {v0, p0, p1, v1}, Lrx/internal/a/z;-><init>(Lrx/Observable;Lrx/functions/b;Lrx/functions/b;)V
 
@@ -2719,7 +2744,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -2742,7 +2767,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -2765,7 +2790,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->LF()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Lt()Lrx/Scheduler;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserItem.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserItem.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserItem.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserItem.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder.smali
similarity index 99%
rename from com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder.smali
index 0b5a2b1431..5b85c3f472 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder.smali
@@ -45,7 +45,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder;->itemView:Landroid/view/View;
 
-    const v1, 0x7f0a0110
+    const v1, 0x7f0a0111
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallUsersAdapter$Companion.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallUsersAdapter$Companion.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallUsersAdapter.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/PrivateCallUsersAdapter.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallUsersAdapter.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$Companion.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$Companion.smali
diff --git a/com.discord/smali/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
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali
index 74b7e2b0a0..8b0f44cc08 100644
--- a/com.discord/smali/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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$onViewBound$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$onViewBound$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$onViewBound$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
index c5237897d7..66f564e640 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1;->invoke(Lcom/discord/models/domain/ModelUser;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
similarity index 96%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
index 8135b5a3dc..7752042706 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f120689
+    const v0, 0x7f120697
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed.smali
index 09a6598e25..bc3e44e060 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed.smali
@@ -145,7 +145,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a07d8
+    const v0, 0x7f0a0815
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -153,7 +153,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetCallFailed;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d9
+    const v0, 0x7f0a0816
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -161,7 +161,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetCallFailed;->dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d7
+    const v0, 0x7f0a0814
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -169,7 +169,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetCallFailed;->dialogConfirm$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d6
+    const v0, 0x7f0a0813
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -205,7 +205,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120357
+    const v1, 0x7f12035c
 
     const/4 v2, 0x1
 
@@ -366,7 +366,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     invoke-virtual {p0}, Lcom/discord/widgets/voice/call/WidgetCallFailed;->getContext()Landroid/content/Context;
 
@@ -392,7 +392,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0082
+    const v0, 0x7f0d0089
 
     return v0
 .end method
@@ -410,7 +410,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f121067
+    const v0, 0x7f1210a4
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetCallFailed;->getString(I)Ljava/lang/String;
 
@@ -424,7 +424,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120093
+    const v0, 0x7f120095
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetCallFailed;->getString(I)Ljava/lang/String;
 
@@ -438,7 +438,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120c77
+    const v0, 0x7f120cb0
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetCallFailed;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1.smali
similarity index 78%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1.smali
index e7f59fe5ee..29abca28fa 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppFragment;)V
+    value = Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppPermissions$Requests;Landroid/content/Context;Lcom/discord/app/AppComponent;Landroidx/fragment/app/FragmentManager;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/app/AppFragment;)V
+.method constructor <init>(Lcom/discord/app/AppPermissions$Requests;)V
     .locals 1
 
     const/4 v0, 0x1
@@ -51,7 +51,7 @@
 .method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
     .locals 1
 
-    const-class v0, Lcom/discord/app/AppFragment;
+    const-class v0, Lcom/discord/app/AppPermissions$Requests;
 
     invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1;->invoke(Lrx/functions/Action0;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -85,9 +85,9 @@
 
     iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1;->receiver:Ljava/lang/Object;
 
-    check-cast v0, Lcom/discord/app/AppFragment;
+    check-cast v0, Lcom/discord/app/AppPermissions$Requests;
 
-    invoke-virtual {v0, p1}, Lcom/discord/app/AppFragment;->requestVideoCallPermissions(Lrx/functions/Action0;)V
+    invoke-interface {v0, p1}, Lcom/discord/app/AppPermissions$Requests;->requestVideoCallPermissions(Lrx/functions/Action0;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2.smali
similarity index 79%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2.smali
index 5f58d7179e..76686ea67f 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppFragment;)V
+    value = Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppPermissions$Requests;Landroid/content/Context;Lcom/discord/app/AppComponent;Landroidx/fragment/app/FragmentManager;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/app/AppFragment;)V
+.method constructor <init>(Lcom/discord/app/AppPermissions$Requests;)V
     .locals 1
 
     const/4 v0, 0x1
@@ -51,7 +51,7 @@
 .method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
     .locals 1
 
-    const-class v0, Lcom/discord/app/AppFragment;
+    const-class v0, Lcom/discord/app/AppPermissions$Requests;
 
     invoke-static {v0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2;->invoke(Lrx/functions/Action0;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -85,9 +85,9 @@
 
     iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2;->receiver:Ljava/lang/Object;
 
-    check-cast v0, Lcom/discord/app/AppFragment;
+    check-cast v0, Lcom/discord/app/AppPermissions$Requests;
 
-    invoke-virtual {v0, p1}, Lcom/discord/app/AppFragment;->requestMicrophone(Lrx/functions/Action0;)V
+    invoke-interface {v0, p1}, Lcom/discord/app/AppPermissions$Requests;->requestMicrophone(Lrx/functions/Action0;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$1.smali
index 79b0e900cf..bb1834fc9b 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$1.smali
@@ -78,7 +78,7 @@
 .method public final call(Lcom/discord/rtcconnection/RtcConnection$State;)Z
     .locals 1
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yf:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     if-ne p1, v0, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$2.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$2.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$3.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$3.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$4.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$4.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$4.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$4.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$5.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$5.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$5.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$5.smali
index 0abac80e5b..e0a505b997 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$5.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$5;->invoke(Ljava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1.smali
index 15e26c08d4..88fc75e19c 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6.smali
similarity index 60%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6.smali
index f8576e3af9..25d444a6c4 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6.smali
@@ -50,33 +50,43 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
 
 .method public final invoke()V
-    .locals 5
+    .locals 8
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getCalls()Lcom/discord/stores/StoreCalls;
 
-    move-result-object v0
+    move-result-object v1
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6;->this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;
+    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6;->this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;
 
-    iget-object v1, v1, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$appFragment:Lcom/discord/app/AppFragment;
+    iget-object v2, v0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$appComponent:Lcom/discord/app/AppComponent;
 
-    iget-object v2, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6;->this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;
+    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6;->this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;
 
-    iget-wide v2, v2, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$channelId:J
+    iget-object v3, v0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$context:Landroid/content/Context;
 
-    sget-object v4, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1;->INSTANCE:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1;
+    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6;->this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;
 
-    check-cast v4, Lkotlin/jvm/functions/Function0;
+    iget-object v4, v0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$fragmentManager:Landroidx/fragment/app/FragmentManager;
 
-    invoke-virtual {v0, v1, v2, v3, v4}, Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppFragment;JLkotlin/jvm/functions/Function0;)V
+    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6;->this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;
+
+    iget-wide v5, v0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$channelId:J
+
+    sget-object v0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1;->INSTANCE:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1;
+
+    move-object v7, v0
+
+    check-cast v7, Lkotlin/jvm/functions/Function0;
+
+    invoke-virtual/range {v1 .. v7}, Lcom/discord/stores/StoreCalls;->call(Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;JLkotlin/jvm/functions/Function0;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$7.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$7.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$7.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$7.smali
index 5da19932e9..d634f482dc 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$7.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$7.smali
@@ -74,7 +74,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$7;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3.smali
similarity index 87%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3.smali
index 17f7a71c44..56c558ca96 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppFragment;)V
+    value = Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppPermissions$Requests;Landroid/content/Context;Lcom/discord/app/AppComponent;Landroidx/fragment/app/FragmentManager;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,26 +18,34 @@
 
 
 # instance fields
-.field final synthetic $appFragment:Lcom/discord/app/AppFragment;
+.field final synthetic $appComponent:Lcom/discord/app/AppComponent;
 
 .field final synthetic $channelId:J
 
+.field final synthetic $context:Landroid/content/Context;
+
+.field final synthetic $fragmentManager:Landroidx/fragment/app/FragmentManager;
+
 .field final synthetic $isVideo:Z
 
 .field final synthetic $weakContext:Ljava/lang/ref/WeakReference;
 
 
 # direct methods
-.method constructor <init>(JLjava/lang/ref/WeakReference;Lcom/discord/app/AppFragment;Z)V
+.method constructor <init>(JLjava/lang/ref/WeakReference;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;Z)V
     .locals 0
 
     iput-wide p1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$channelId:J
 
     iput-object p3, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$weakContext:Ljava/lang/ref/WeakReference;
 
-    iput-object p4, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$appFragment:Lcom/discord/app/AppFragment;
+    iput-object p4, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$appComponent:Lcom/discord/app/AppComponent;
 
-    iput-boolean p5, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$isVideo:Z
+    iput-object p5, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$context:Landroid/content/Context;
+
+    iput-object p6, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$fragmentManager:Landroidx/fragment/app/FragmentManager;
+
+    iput-boolean p7, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;->$isVideo:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -117,7 +125,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kg()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JU()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion.smali
similarity index 55%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion.smali
index d347d5c231..ae1b461460 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Companion.smali
@@ -33,50 +33,72 @@
 
 
 # virtual methods
-.method public final callAndLaunch(JZLcom/discord/app/AppFragment;)V
-    .locals 8
+.method public final callAndLaunch(JZLcom/discord/app/AppPermissions$Requests;Landroid/content/Context;Lcom/discord/app/AppComponent;Landroidx/fragment/app/FragmentManager;)V
+    .locals 10
 
-    const-string v0, "appFragment"
+    move-object v0, p4
 
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object v5, p5
 
-    new-instance v4, Ljava/lang/ref/WeakReference;
+    const-string v1, "appPermissionsRequests"
 
-    invoke-virtual {p4}, Lcom/discord/app/AppFragment;->getContext()Landroid/content/Context;
+    invoke-static {p4, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v0
+    const-string v1, "context"
 
-    invoke-direct {v4, v0}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
+    invoke-static {p5, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "appComponent"
+
+    move-object/from16 v4, p6
+
+    invoke-static {v4, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "fragmentManager"
+
+    move-object/from16 v6, p7
+
+    invoke-static {v6, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v3, Ljava/lang/ref/WeakReference;
+
+    invoke-direct {v3, p5}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
     if-eqz p3, :cond_0
 
-    new-instance v0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1;
+    new-instance v1, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1;
 
-    invoke-direct {v0, p4}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1;-><init>(Lcom/discord/app/AppFragment;)V
+    invoke-direct {v1, p4}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1;-><init>(Lcom/discord/app/AppPermissions$Requests;)V
 
     goto :goto_0
 
     :cond_0
-    new-instance v0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2;
+    new-instance v1, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2;
 
-    invoke-direct {v0, p4}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2;-><init>(Lcom/discord/app/AppFragment;)V
+    invoke-direct {v1, p4}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2;-><init>(Lcom/discord/app/AppPermissions$Requests;)V
 
     :goto_0
-    check-cast v0, Lkotlin/jvm/functions/Function1;
+    move-object v8, v1
 
-    new-instance v7, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;
+    check-cast v8, Lkotlin/jvm/functions/Function1;
 
-    move-object v1, v7
+    new-instance v9, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;
 
-    move-wide v2, p1
+    move-object v0, v9
 
-    move-object v5, p4
+    move-wide v1, p1
 
-    move v6, p3
+    move-object/from16 v4, p6
 
-    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;-><init>(JLjava/lang/ref/WeakReference;Lcom/discord/app/AppFragment;Z)V
+    move-object v5, p5
 
-    invoke-interface {v0, v7}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    move-object/from16 v6, p7
+
+    move v7, p3
+
+    invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3;-><init>(JLjava/lang/ref/WeakReference;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;Z)V
+
+    invoke-interface {v8, v9}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$let$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$let$lambda$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$let$lambda$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$let$lambda$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$sortedBy$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$sortedBy$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$sortedBy$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2$$special$$inlined$sortedBy$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2.smali
similarity index 99%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2.smali
index 3c3844f22f..8c1b47f00a 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion$get$2.smali
@@ -479,7 +479,7 @@
     goto :goto_c
 
     :cond_f
-    sget-object v1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v1, Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion.smali
similarity index 89%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion.smali
index 1860a7d024..fa0a1bd648 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion.smali
@@ -72,11 +72,17 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
+    sget-object v5, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
 
-    move-wide v5, p1
+    const/4 v8, 0x0
 
-    invoke-virtual {v1, p1, p2}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get(J)Lrx/Observable;
+    const/4 v9, 0x2
+
+    const/4 v10, 0x0
+
+    move-wide v6, p1
+
+    invoke-static/range {v5 .. v10}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get$default(Lcom/discord/widgets/voice/model/CallModel$Companion;JLcom/discord/widgets/voice/model/CallModel$Type;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v2
 
@@ -88,7 +94,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v5
 
@@ -134,7 +140,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$Model.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$UiState.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$UiState.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$UiState.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$UiState.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$WhenMappings.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$WhenMappings.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$WhenMappings.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$WhenMappings.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1.smali
similarity index 94%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1.smali
index ff91012195..3c69238250 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1.smali
@@ -140,6 +140,17 @@
     :pswitch_2
     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;->toggleOutputMode()V
+
+    return-void
+
+    :pswitch_3
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
     invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
 
     move-result-object p1
@@ -148,7 +159,7 @@
 
     return-void
 
-    :pswitch_3
+    :pswitch_4
     iget-object p1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall;
 
     invoke-static {p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->access$getUiStateSubject$p(Lcom/discord/widgets/voice/call/WidgetPrivateCall;)Lrx/subjects/BehaviorSubject;
@@ -161,7 +172,7 @@
 
     return-void
 
-    :pswitch_4
+    :pswitch_5
     iget-object p1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
@@ -180,7 +191,8 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a045b
+    .packed-switch 0x7f0a046b
+        :pswitch_5
         :pswitch_4
         :pswitch_3
         :pswitch_2
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2.smali
new file mode 100644
index 0000000000..86e06986f6
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2.smali
@@ -0,0 +1,281 @@
+.class final Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;
+.super Ljava/lang/Object;
+.source "WidgetPrivateCall.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/voice/call/WidgetPrivateCall;->configureActionBar(Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Landroid/view/Menu;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $callModel:Lcom/discord/widgets/voice/model/CallModel;
+
+.field final synthetic this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/call/WidgetPrivateCall;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
+
+    iput-object p2, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;->this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Landroid/view/Menu;)V
+    .locals 9
+
+    const v0, 0x7f0a046e
+
+    invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->getOutputMode()Lcom/discord/models/domain/ModelVoice$OutputMode;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/models/domain/ModelVoice$OutputMode;->SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x0
+
+    if-ne v1, v2, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    invoke-interface {v0, v1}, Landroid/view/MenuItem;->setChecked(Z)Landroid/view/MenuItem;
+
+    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;->this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;->this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall;
+
+    invoke-virtual {v2}, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->requireContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    const-string v5, "requireContext()"
+
+    invoke-static {v2, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v6, 0x7f0401bb
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x2
+
+    invoke-static {v2, v6, v4, v8, v7}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+
+    move-result v2
+
+    iget-object v6, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;->this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall;
+
+    invoke-virtual {v6}, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->requireContext()Landroid/content/Context;
+
+    move-result-object v6
+
+    invoke-static {v6, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v6}, Landroid/content/Context;->getTheme()Landroid/content/res/Resources$Theme;
+
+    move-result-object v5
+
+    invoke-static {v1, v2, v5}, Landroidx/core/content/res/ResourcesCompat;->getDrawable(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_3
+
+    check-cast v1, Landroid/graphics/drawable/StateListDrawable;
+
+    new-array v2, v3, [I
+
+    invoke-interface {v0}, Landroid/view/MenuItem;->isChecked()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_1
+
+    const v5, 0x10100a0
+
+    goto :goto_1
+
+    :cond_1
+    const v5, 0x10100a9
+
+    :goto_1
+    aput v5, v2, v4
+
+    invoke-virtual {v1, v2}, Landroid/graphics/drawable/StateListDrawable;->setState([I)Z
+
+    invoke-virtual {v1}, Landroid/graphics/drawable/StateListDrawable;->getCurrent()Landroid/graphics/drawable/Drawable;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Landroid/view/MenuItem;->setIcon(Landroid/graphics/drawable/Drawable;)Landroid/view/MenuItem;
+
+    const v0, 0x7f0a046d
+
+    invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+
+    move-result-object v0
+
+    const-string v1, "menu.findItem(R.id.menu_\u2026ivate_call_select_camera)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->getSelectedVideoDevice()Lco/discord/media_engine/VideoInputDeviceDescription;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->getVideoDevices()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    if-lt v1, v8, :cond_2
+
+    const/4 v4, 0x1
+
+    :cond_2
+    invoke-interface {v0, v4}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+
+    const v0, 0x7f0a046f
+
+    invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+
+    move-result-object v0
+
+    const-string v1, "menu.findItem(R.id.menu_\u2026ivate_call_user_settings)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
+
+    move-result v1
+
+    xor-int/2addr v1, v3
+
+    invoke-interface {v0, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+
+    const v0, 0x7f0a046c
+
+    invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+
+    move-result-object v0
+
+    const-string v1, "menu.findItem(R.id.menu_private_call_participants)"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
+
+    move-result v1
+
+    invoke-interface {v0, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+
+    const v0, 0x7f0a046b
+
+    invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+
+    move-result-object p1
+
+    const-string v0, "menu.findItem(R.id.menu_\u2026vate_call_group_settings)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
+
+    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;->isMultiUserDM()Z
+
+    move-result v0
+
+    invoke-interface {p1, v0}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+
+    return-void
+
+    :cond_3
+    new-instance p1, Lkotlin/r;
+
+    const-string v0, "null cannot be cast to non-null type android.graphics.drawable.StateListDrawable"
+
+    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Landroid/view/Menu;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;->call(Landroid/view/Menu;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1.smali
index e3bc8a858b..ef4631e932 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1;->invoke(Ljava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2.smali
index a44707d441..a3b30a81d1 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$1.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$1.smali
index 0aecdc9ad0..5ee90e0cd0 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$1.smali
@@ -105,7 +105,7 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lrx/Observable;->Ka()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->JN()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$2.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$2.smali
index e25ec9a452..659ef12ae4 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$2.smali
@@ -55,7 +55,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$$inlined$apply$lambda$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$3.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$3.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$2.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$2.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$3.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1$3.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2.smali
index f9f047a7c5..5f84071a87 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2;->invoke(Ljava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali
index 6adb1e5e76..70179f1bab 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali
@@ -62,7 +62,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1;->invoke(Lkotlin/jvm/functions/Function1;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -92,7 +92,7 @@
 
     const/4 v1, 0x0
 
-    invoke-static {v1, v0}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v1, v0}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2.smali
index b32d05b380..a868047ad8 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3$1.smali
index df36043084..9430fc3101 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1.smali
index a0dd53ec1a..f80573454f 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$2.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$2.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3$1.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3$1.smali
index cb894cce56..446b132055 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3$1.smali
@@ -55,7 +55,7 @@
 
     move-result-object p1
 
-    sget-object v2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-virtual {p1, v2}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3.smali
index 650314edc6..ef55c4d3f9 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$4.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$4.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$4.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$4.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5.smali
index eaff58a6d5..7ad0ea8f64 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6.smali
index b504763fe2..ba97a40cf3 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1.smali
index 06f36f846f..d726c47f77 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2.smali
index 7468211004..7697952bfd 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2;->invoke(Lcom/discord/widgets/voice/call/WidgetPrivateCall$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall.smali
index bf654a1c01..c82cedc24e 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall.smali
@@ -396,7 +396,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->actionBar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a052f
+    const v0, 0x7f0a0547
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -404,7 +404,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->voiceCallStatusGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a052b
+    const v0, 0x7f0a0543
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -412,7 +412,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->statusPrimary$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a052c
+    const v0, 0x7f0a0544
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -420,7 +420,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->statusSecondary$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a010f
+    const v0, 0x7f0a0110
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -428,7 +428,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->controls$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0523
+    const v0, 0x7f0a053b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -436,7 +436,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->connectButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0529
+    const v0, 0x7f0a0541
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -444,7 +444,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->pushToTalkButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a052e
+    const v0, 0x7f0a0546
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -452,7 +452,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->videoCallGridView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0528
+    const v0, 0x7f0a0540
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -460,7 +460,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->videoCallPip$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0527
+    const v0, 0x7f0a053f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -468,7 +468,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->memberListRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0111
+    const v0, 0x7f0a0112
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -484,7 +484,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->tappedUsers:Ljava/util/Set;
 
-    sget-object v0, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast v0, Ljava/util/Set;
 
@@ -506,7 +506,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->videoParticipantTapStream:Lrx/subjects/BehaviorSubject;
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-static {v0}, Lrx/subjects/BehaviorSubject;->bT(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -607,12 +607,24 @@
     return-void
 .end method
 
-.method public static final callAndLaunch(JZLcom/discord/app/AppFragment;)V
-    .locals 1
+.method public static final callAndLaunch(JZLcom/discord/app/AppPermissions$Requests;Landroid/content/Context;Lcom/discord/app/AppComponent;Landroidx/fragment/app/FragmentManager;)V
+    .locals 8
 
     sget-object v0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->Companion:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;
 
-    invoke-virtual {v0, p0, p1, p2, p3}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppFragment;)V
+    move-wide v1, p0
+
+    move v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    move-object v6, p5
+
+    move-object v7, p6
+
+    invoke-virtual/range {v0 .. v7}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppPermissions$Requests;Landroid/content/Context;Lcom/discord/app/AppComponent;Landroidx/fragment/app/FragmentManager;)V
 
     return-void
 .end method
@@ -654,7 +666,7 @@
 
     if-eqz v0, :cond_2
 
-    const v5, 0x7f040166
+    const v5, 0x7f040168
 
     invoke-static {v0, v5, v1, v2, v4}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
@@ -680,7 +692,7 @@
 
     if-eqz v0, :cond_2
 
-    const v5, 0x7f040167
+    const v5, 0x7f040169
 
     invoke-static {v0, v5, v1, v2, v4}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
@@ -716,7 +728,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0400b9
+    const v2, 0x7f0400ba
 
     invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -731,7 +743,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0800dd
+    const v1, 0x7f0800e1
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -786,9 +798,9 @@
 
     check-cast v1, Lrx/functions/Action2;
 
-    new-instance v2, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2;
+    new-instance v2, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;
 
-    invoke-direct {v2, p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2;-><init>(Lcom/discord/widgets/voice/model/CallModel;)V
+    invoke-direct {v2, p1, p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$2;-><init>(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/call/WidgetPrivateCall;)V
 
     check-cast v2, Lrx/functions/Action1;
 
@@ -883,7 +895,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1212e4
+    const v0, 0x7f121336
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
 
@@ -1287,7 +1299,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yG:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     if-ne v2, v3, :cond_8
 
@@ -1734,7 +1746,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d015c
+    const v0, 0x7f0d0166
 
     return v0
 .end method
@@ -1758,7 +1770,7 @@
 
     if-eqz v0, :cond_0
 
-    const v3, 0x7f040167
+    const v3, 0x7f040169
 
     const/4 v4, 0x2
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$2.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$2.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
index d43563991a..c84ee95bb0 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
@@ -157,7 +157,7 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p1, 0x7f0a0524
+    const p1, 0x7f0a053c
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -165,7 +165,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView;->disconnect$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0525
+    const p1, 0x7f0a053d
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -173,7 +173,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView;->mute$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0526
+    const p1, 0x7f0a053e
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -189,7 +189,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d015d
+    const p3, 0x7f0d0167
 
     invoke-static {p1, p3, p2}, Landroid/widget/FrameLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -309,12 +309,12 @@
 
     if-eqz v1, :cond_0
 
-    const v1, 0x7f0802e8
+    const v1, 0x7f0802f8
 
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f0802ed
+    const v1, 0x7f0802fd
 
     :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -377,12 +377,12 @@
 
     if-eqz v0, :cond_2
 
-    const v1, 0x7f0803a1
+    const v1, 0x7f0803b8
 
     goto :goto_2
 
     :cond_2
-    const v1, 0x7f0803a0
+    const v1, 0x7f0803b7
 
     :goto_2
     invoke-virtual {p1, v1}, Landroid/widget/ImageView;->setImageResource(I)V
diff --git a/com.discord/smali/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
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$1.smali
diff --git a/com.discord/smali/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
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1.smali
diff --git a/com.discord/smali/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
similarity index 92%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali
index cd834ae727..d229792f57 100644
--- a/com.discord/smali/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
@@ -72,7 +72,7 @@
 .end method
 
 .method public final call(Ljava/util/Set;)Lrx/Observable;
-    .locals 3
+    .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -125,7 +125,13 @@
 
     move-result-wide v1
 
-    invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get(J)Lrx/Observable;
+    const/4 v3, 0x0
+
+    const/4 v4, 0x2
+
+    const/4 v5, 0x0
+
+    invoke-static/range {v0 .. v5}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get$default(Lcom/discord/widgets/voice/model/CallModel$Companion;JLcom/discord/widgets/voice/model/CallModel$Type;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
index 72b9c9b23c..b3325800e8 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
@@ -70,7 +70,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali
similarity index 99%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali
index 6a898c6865..51289e088a 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali
@@ -308,6 +308,10 @@
 
     iget v1, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;->numIncomingCalls:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$2.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$2.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$3.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$3.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$4.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$4.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$4.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$4.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
index 33ac8b68f7..2af0e0df37 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
similarity index 94%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
index 87168d7d34..fe177801df 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
@@ -209,7 +209,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0399
+    const v0, 0x7f0a03a9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -217,7 +217,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->callUsersRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0396
+    const v0, 0x7f0a03a6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -225,7 +225,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->statusPrimary$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0397
+    const v0, 0x7f0a03a7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -233,7 +233,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->statusSecondary$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a038f
+    const v0, 0x7f0a039f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -241,7 +241,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->connectButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0391
+    const v0, 0x7f0a03a1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -249,7 +249,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->connectText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0393
+    const v0, 0x7f0a03a3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -257,7 +257,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->declineButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0392
+    const v0, 0x7f0a03a2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -426,12 +426,12 @@
 
     if-eqz v8, :cond_5
 
-    const v8, 0x7f120978
+    const v8, 0x7f120998
 
     goto :goto_2
 
     :cond_5
-    const v8, 0x7f120973
+    const v8, 0x7f120993
 
     :goto_2
     invoke-virtual {v5, v8}, Landroid/widget/TextView;->setText(I)V
@@ -446,12 +446,12 @@
 
     if-eqz v8, :cond_6
 
-    const v8, 0x7f1212c1
+    const v8, 0x7f121312
 
     goto :goto_3
 
     :cond_6
-    const v8, 0x7f1212d5
+    const v8, 0x7f121326
 
     :goto_3
     invoke-virtual {v5, v8}, Landroid/widget/TextView;->setText(I)V
@@ -509,12 +509,12 @@
 
     if-eqz v0, :cond_8
 
-    const v0, 0x7f0803a1
+    const v0, 0x7f0803b8
 
     goto :goto_4
 
     :cond_8
-    const v0, 0x7f0802ed
+    const v0, 0x7f0802fd
 
     :goto_4
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -529,12 +529,12 @@
 
     if-eqz v0, :cond_9
 
-    const v0, 0x7f120416
+    const v0, 0x7f12041d
 
     goto :goto_5
 
     :cond_9
-    const v0, 0x7f120417
+    const v0, 0x7f12041e
 
     :goto_5
     invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->getString(I)Ljava/lang/String;
@@ -561,7 +561,7 @@
 .end method
 
 .method private final connect(Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;Z)V
-    .locals 3
+    .locals 9
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
@@ -573,23 +573,45 @@
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v0
+    move-result-wide v2
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;->getNumIncomingCalls()I
 
     move-result p1
 
-    const/4 v2, 0x1
+    const/4 v0, 0x1
 
-    if-ne p1, v2, :cond_0
+    if-ne p1, v0, :cond_0
 
-    sget-object p1, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->Companion:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;
+    sget-object v1, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->Companion:Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;
 
-    move-object v2, p0
+    move-object v5, p0
 
-    check-cast v2, Lcom/discord/app/AppFragment;
+    check-cast v5, Lcom/discord/app/AppPermissions$Requests;
 
-    invoke-virtual {p1, v0, v1, p2, v2}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppFragment;)V
+    move-object v7, p0
+
+    check-cast v7, Lcom/discord/app/AppComponent;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->requireContext()Landroid/content/Context;
+
+    move-result-object v6
+
+    const-string p1, "requireContext()"
+
+    invoke-static {v6, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v8
+
+    const-string p1, "requireFragmentManager()"
+
+    invoke-static {v8, p1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move v4, p2
+
+    invoke-virtual/range {v1 .. v8}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion;->callAndLaunch(JZLcom/discord/app/AppPermissions$Requests;Landroid/content/Context;Lcom/discord/app/AppComponent;Landroidx/fragment/app/FragmentManager;)V
 
     return-void
 
@@ -604,7 +626,7 @@
 
     const/4 p2, 0x0
 
-    invoke-static {p1, p2, v2, p2}, Lcom/discord/stores/StoreMediaEngine;->selectDefaultVideoDevice$default(Lcom/discord/stores/StoreMediaEngine;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+    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;
@@ -613,7 +635,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreVoiceChannelSelected;->set(J)V
+    invoke-virtual {p1, v2, v3}, Lcom/discord/stores/StoreVoiceChannelSelected;->set(J)V
 
     return-void
 .end method
@@ -785,7 +807,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d8
+    const v0, 0x7f0d01e6
 
     return v0
 .end method
@@ -799,7 +821,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f06007d
+    const v0, 0x7f060080
 
     invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroidx/fragment/app/Fragment;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncomingRinger.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncomingRinger.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncomingRinger.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncomingRinger.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser.smali
similarity index 99%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser.smali
index cfa98aadaa..8482b09ff7 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser.smali
@@ -79,7 +79,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a07fd
+    const p1, 0x7f0a083a
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -129,7 +129,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f070058
+    const v3, 0x7f070057
 
     const/4 v4, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter.smali
similarity index 99%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter.smali
index 56939bf739..32469785f2 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter.smali
@@ -101,7 +101,7 @@
 
     new-instance p1, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser;
 
-    const p2, 0x7f0d0111
+    const p2, 0x7f0d011a
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser;-><init>(ILcom/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter;)V
 
diff --git a/com.discord/smali/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
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion$get$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion$get$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$2.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$2.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$3.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$3.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2.smali
index 69f862ed2b..694a2404a6 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2.smali
@@ -150,7 +150,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall.smali
similarity index 94%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall.smali
index 0c6244063f..24d1de8deb 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall.smali
@@ -185,25 +185,25 @@
 .end method
 
 .method public final hashCode()I
-    .locals 4
+    .locals 2
 
     iget-wide v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall;->callChannelId:J
 
-    const/16 v2, 0x20
+    invoke-static {v0, v1}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v2, v0, v2
+    move-result v0
 
-    xor-long/2addr v0, v2
+    mul-int/lit8 v0, v0, 0x1f
 
-    long-to-int v1, v0
+    iget v1, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall;->connectedUserCount:I
 
-    mul-int/lit8 v1, v1, 0x1f
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
-    iget v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall;->connectedUserCount:I
+    move-result v1
 
-    add-int/2addr v1, v0
+    add-int/2addr v0, v1
 
-    return v1
+    return v0
 .end method
 
 .method public final toString()Ljava/lang/String;
diff --git a/com.discord/smali/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
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2$2.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2$2.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2.smali
index 965bdfacf6..7a25496173 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2.smali
@@ -114,7 +114,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kh()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JV()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$3.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$3.smali
diff --git a/com.discord/smali/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
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.smali
index 08fad38d94..b02677a19e 100644
--- a/com.discord/smali/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
@@ -152,7 +152,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {v3}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v3
 
@@ -178,7 +178,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object v4
 
diff --git a/com.discord/smali/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
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item$Companion.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item$Companion.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item.smali
index f5cdaa776e..a254cafbc9 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item.smali
@@ -210,6 +210,10 @@
 
     iget v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item;->type:I
 
+    invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v0
+
     mul-int/lit8 v0, v0, 0x1f
 
     iget-object v1, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item;->user:Lcom/discord/models/domain/ModelUser;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$configureOngoingCall$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$configureOngoingCall$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$configureOngoingCall$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$configureOngoingCall$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$configureVoiceConnected$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$configureVoiceConnected$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$configureVoiceConnected$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$configureVoiceConnected$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali
index 1838cd9ac2..78b8fc1b6a 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali
@@ -67,7 +67,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali
index 4e5af8d0b9..f890779fd4 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$sam$rx_functions_Func3$0.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$sam$rx_functions_Func3$0.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$sam$rx_functions_Func3$0.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$sam$rx_functions_Func3$0.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$sam$rx_functions_Func6$0.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$sam$rx_functions_Func6$0.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$sam$rx_functions_Func6$0.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$sam$rx_functions_Func6$0.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
index 4ae62c2eb0..4d75e2a8d3 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
@@ -280,7 +280,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a07e9
+    const v0, 0x7f0a0826
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -288,7 +288,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceConnectedContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ea
+    const v0, 0x7f0a0827
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -296,7 +296,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceConnectedDescription$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07eb
+    const v0, 0x7f0a0828
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -304,7 +304,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceConnectedPTT$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ee
+    const v0, 0x7f0a082b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -312,7 +312,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceConnectedText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ec
+    const v0, 0x7f0a0829
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -320,7 +320,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceConnectedQuality$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07fb
+    const v0, 0x7f0a0838
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -328,7 +328,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07f9
+    const v0, 0x7f0a0836
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -336,7 +336,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->connectionIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07fa
+    const v0, 0x7f0a0837
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -344,7 +344,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceInfoOverlay$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07fe
+    const v0, 0x7f0a083b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -352,7 +352,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceOngoingContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ff
+    const v0, 0x7f0a083c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -406,7 +406,7 @@
 
     move-result-object v0
 
-    const v2, 0x7f120c7a
+    const v2, 0x7f120cb3
 
     const/4 v3, 0x1
 
@@ -470,6 +470,10 @@
     move-result-object p1
 
     :goto_0
+    const-string v0, "if (data.isConnectedOthe\u2026(Color.TRANSPARENT)\n    }"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->getVoiceOngoingContainer()Landroid/view/ViewGroup;
 
     move-result-object v0
@@ -574,7 +578,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yG:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     const/4 v4, 0x1
 
@@ -602,7 +606,7 @@
 
     move-result-object v2
 
-    sget-object v6, Lcom/discord/rtcconnection/RtcConnection$State$f;->yf:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v6, Lcom/discord/rtcconnection/RtcConnection$State$f;->yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     if-eq v2, v6, :cond_2
 
@@ -638,7 +642,7 @@
 
     move-result-object v2
 
-    sget-object v6, Lcom/discord/rtcconnection/RtcConnection$State$f;->yf:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v6, Lcom/discord/rtcconnection/RtcConnection$State$f;->yq:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     if-ne v2, v6, :cond_3
 
@@ -980,7 +984,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d9
+    const v0, 0x7f0d01e7
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/-$$Lambda$CallParticipantsAdapter$ViewHolderUser$lQmDhDoGXP0BOFiSXQJr1P3hJ5k.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/-$$Lambda$CallParticipantsAdapter$ViewHolderUser$lQmDhDoGXP0BOFiSXQJr1P3hJ5k.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/-$$Lambda$CallParticipantsAdapter$ViewHolderUser$lQmDhDoGXP0BOFiSXQJr1P3hJ5k.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/-$$Lambda$CallParticipantsAdapter$ViewHolderUser$lQmDhDoGXP0BOFiSXQJr1P3hJ5k.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider.smali
index c3f0ee9a50..15f5cd9e84 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider.smali
@@ -27,7 +27,7 @@
 .method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d00b6
+    const v0, 0x7f0d00be
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader.smali
index 5b32b6818e..cc636ef779 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader.smali
@@ -31,13 +31,13 @@
 .method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d00b7
+    const v0, 0x7f0d00bf
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0802
+    const v0, 0x7f0a083f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser.smali
similarity index 80%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser.smali
index 6e7efcd104..a7757397bb 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser.smali
@@ -28,6 +28,8 @@
 
 .field private deafenIndicator:Landroid/widget/ImageView;
 
+.field private liveIndicator:Landroid/widget/TextView;
+
 .field private muteIndicator:Landroid/widget/ImageView;
 
 .field private name:Landroid/widget/TextView;
@@ -46,13 +48,13 @@
         }
     .end annotation
 
-    const v0, 0x7f0d00b8
+    const v0, 0x7f0d00c0
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0804
+    const v0, 0x7f0a0842
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -64,7 +66,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0805
+    const v0, 0x7f0a0843
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -76,7 +78,19 @@
 
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0801
+    const v0, 0x7f0a0840
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->liveIndicator:Landroid/widget/TextView;
+
+    iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->itemView:Landroid/view/View;
+
+    const v0, 0x7f0a083e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -88,7 +102,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0803
+    const v0, 0x7f0a0841
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -116,12 +130,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f040190
+    const p1, 0x7f040192
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f04018f
+    const p1, 0x7f040191
 
     :goto_0
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
@@ -138,12 +152,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f04019c
+    const p1, 0x7f04019e
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f04019b
+    const p1, 0x7f04019d
 
     :goto_0
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->muteIndicator:Landroid/widget/ImageView;
@@ -173,7 +187,7 @@
 
 # virtual methods
 .method protected onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
-    .locals 3
+    .locals 4
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -195,81 +209,106 @@
 
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_4
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
 
     move-result-object p2
 
-    if-eqz p2, :cond_4
+    const/4 v0, 0x1
 
-    iget-object p2, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
+    const/4 v1, 0x0
 
-    const/4 v0, 0x0
+    if-eqz p2, :cond_0
 
-    invoke-virtual {p2, v0}, Landroid/widget/ImageView;->setVisibility(I)V
-
-    iget-object p2, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->muteIndicator:Landroid/widget/ImageView;
-
-    invoke-virtual {p2, v0}, Landroid/widget/ImageView;->setVisibility(I)V
-
-    iget-object p2, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfDeaf()Z
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    if-nez v1, :cond_1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelVoice$State;->isDeaf()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
+    const/4 p2, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 p2, 0x0
+
+    :goto_0
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
+
+    move-result v2
+
+    const/16 v3, 0x8
+
+    if-eqz v2, :cond_6
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_6
+
+    iget-object v2, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->liveIndicator:Landroid/widget/TextView;
+
+    if-eqz p2, :cond_1
+
+    const/4 v3, 0x0
+
+    :cond_1
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setVisibility(I)V
+
+    iget-object p2, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
+
+    invoke-virtual {p2, v1}, Landroid/widget/ImageView;->setVisibility(I)V
+
+    iget-object p2, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->muteIndicator:Landroid/widget/ImageView;
+
+    invoke-virtual {p2, v1}, Landroid/widget/ImageView;->setVisibility(I)V
+
+    iget-object p2, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$State;->isSelfDeaf()Z
+
+    move-result v2
+
+    if-nez v2, :cond_3
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$State;->isDeaf()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
 
     goto :goto_1
 
-    :cond_1
-    :goto_0
-    const/4 v1, 0x1
+    :cond_2
+    const/4 v2, 0x0
 
+    goto :goto_2
+
+    :cond_3
     :goto_1
-    invoke-direct {p0, v1}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->getDeafenIcon(Z)I
+    const/4 v2, 0x1
 
-    move-result v1
+    :goto_2
+    invoke-direct {p0, v2}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->getDeafenIcon(Z)I
 
-    invoke-virtual {p2, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+    move-result v2
+
+    invoke-virtual {p2, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
     iget-object p2, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->muteIndicator:Landroid/widget/ImageView;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfMute()Z
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$State;->isSelfMute()Z
 
-    move-result v1
+    move-result v2
 
-    if-nez v1, :cond_2
+    if-nez v2, :cond_5
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
 
@@ -279,12 +318,15 @@
 
     move-result p1
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_4
 
-    :cond_2
-    const/4 v0, 0x1
+    goto :goto_3
 
-    :cond_3
+    :cond_4
+    const/4 v0, 0x0
+
+    :cond_5
+    :goto_3
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->getMuteIcon(Z)I
 
     move-result p1
@@ -293,16 +335,14 @@
 
     return-void
 
-    :cond_4
+    :cond_6
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
 
-    const/16 p2, 0x8
-
-    invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {p1, v3}, Landroid/widget/ImageView;->setVisibility(I)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->muteIndicator:Landroid/widget/ImageView;
 
-    invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {p1, v3}, Landroid/widget/ImageView;->setVisibility(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$1.smali
index 25fad6c579..ab2bd42e94 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$1.smali
@@ -67,7 +67,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView$1;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model$DefaultImpls.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model$DefaultImpls.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model$DefaultImpls.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model$DefaultImpls.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$WhenMappings.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$WhenMappings.smali
similarity index 93%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$WhenMappings.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$WhenMappings.smali
index b2bdddfb10..49c81150ae 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$WhenMappings.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$WhenMappings.smali
@@ -20,7 +20,7 @@
 
     sput-object v0, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yG:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->yQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->ordinal()I
 
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureBackground$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureBackground$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureBackground$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureBackground$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali
index 128d7f0689..8efa95cfc3 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali
@@ -55,7 +55,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f121291
+    const v0, 0x7f1212e2
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$4.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$4.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$4.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$4.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$5.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$5.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$5.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$5.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$disableWithToast$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$disableWithToast$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$disableWithToast$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$disableWithToast$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
index 204b736779..e91055c739 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
@@ -295,7 +295,7 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p2, 0x7f0a07f6
+    const p2, 0x7f0a0833
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -303,7 +303,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->numUsersConnectedTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07f1
+    const p2, 0x7f0a082e
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -311,7 +311,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->connectButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07f7
+    const p2, 0x7f0a0834
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -319,7 +319,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->pttButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07f2
+    const p2, 0x7f0a082f
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -327,7 +327,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->controlsWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07f3
+    const p2, 0x7f0a0830
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -335,7 +335,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->deafenStateButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07f8
+    const p2, 0x7f0a0835
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -343,7 +343,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->speakerButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07f5
+    const p2, 0x7f0a0832
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -351,7 +351,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->muteStateButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07f4
+    const p2, 0x7f0a0831
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -363,7 +363,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d00b5
+    const p3, 0x7f0d00bd
 
     invoke-static {p1, p3, p2}, Landroid/widget/FrameLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -422,7 +422,7 @@
 
     check-cast v0, Landroid/view/View;
 
-    const v1, 0x7f0402a6
+    const v1, 0x7f0402a9
 
     invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -824,12 +824,12 @@
 
     if-eqz v3, :cond_2
 
-    const v3, 0x7f1211b0
+    const v3, 0x7f1211f4
 
     goto :goto_2
 
     :cond_2
-    const v3, 0x7f120b80
+    const v3, 0x7f120bb1
 
     :goto_2
     invoke-virtual {v1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -878,12 +878,12 @@
 
     if-eqz p1, :cond_3
 
-    const p1, 0x7f1211a7
+    const p1, 0x7f1211eb
 
     goto :goto_3
 
     :cond_3
-    const p1, 0x7f1204ba
+    const p1, 0x7f1204c4
 
     :goto_3
     invoke-virtual {v1, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -947,7 +947,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f120417
+    const v4, 0x7f12041e
 
     invoke-virtual {v0, v4}, Landroid/widget/Button;->setText(I)V
 
@@ -970,7 +970,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f12119b
+    const v4, 0x7f1211df
 
     invoke-direct {p0, v0, v4}, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->disableWithToast(Landroid/widget/Button;I)V
 
@@ -1005,7 +1005,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f1203a0
+    const v4, 0x7f1203a5
 
     invoke-virtual {v0, v4}, Landroid/widget/Button;->setText(I)V
 
@@ -1013,7 +1013,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f12039f
+    const v4, 0x7f1203a4
 
     invoke-direct {p0, v0, v4}, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->disableWithToast(Landroid/widget/Button;I)V
 
@@ -1044,7 +1044,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f120c7a
+    const v4, 0x7f120cb3
 
     new-array v1, v1, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$Companion.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$Companion.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1.smali
similarity index 66%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1.smali
index b2b1456b75..9de5eb9bd4 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1.smali
@@ -50,7 +50,7 @@
 
 # virtual methods
 .method public final call(Landroid/view/MenuItem;Landroid/content/Context;)V
-    .locals 7
+    .locals 8
 
     const-string v0, "menuItem"
 
@@ -60,64 +60,87 @@
 
     move-result p1
 
-    const-string v0, "context"
+    const v0, 0x7f0a047a
+
+    const-string v1, "context"
+
+    if-eq p1, v0, :cond_0
 
     packed-switch p1, :pswitch_data_0
 
     goto :goto_0
 
     :pswitch_0
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
+    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsVoice;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
 
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v3, 0x0
+    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
-    const/4 v5, 0x6
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/4 v6, 0x6
 
-    move-object v2, p2
+    const/4 v7, 0x0
 
-    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
+    move-object v3, p2
+
+    invoke-static/range {v2 .. v7}, 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
 
     :pswitch_1
     sget-object p1, Lcom/discord/utilities/voice/DiscordOverlayService;->Companion:Lcom/discord/utilities/voice/DiscordOverlayService$Companion;
 
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->launchForConnect(Landroid/content/Context;)V
 
-    goto :goto_0
+    :goto_0
+    return-void
 
     :pswitch_2
     sget-object p1, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->Companion:Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion;
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1;->$model:Lcom/discord/widgets/voice/model/CallModel;
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1;->$model:Lcom/discord/widgets/voice/model/CallModel;
 
-    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+    invoke-virtual {v0}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v1
+    move-result-wide v2
 
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1, v1, v2, p2}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion;->launch(JLandroid/content/Context;)V
+    invoke-virtual {p1, v2, v3, p2}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion;->launch(JLandroid/content/Context;)V
+
+    return-void
+
+    :cond_0
+    sget-object p1, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->Companion:Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$Companion;
+
+    invoke-static {p2, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1;->$model:Lcom/discord/widgets/voice/model/CallModel;
+
+    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;->getId()J
+
+    move-result-wide v0
+
+    invoke-virtual {p1, p2, v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$Companion;->launch(Landroid/content/Context;J)V
 
-    :goto_0
     return-void
 
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0451
+    .packed-switch 0x7f0a0461
         :pswitch_2
         :pswitch_1
         :pswitch_0
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$2.smali
similarity index 58%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$2.smali
index 991088d319..6009730bbb 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$2.smali
@@ -47,29 +47,103 @@
 
 # virtual methods
 .method public final call(Landroid/view/Menu;)V
-    .locals 3
+    .locals 5
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$2;->$model:Lcom/discord/widgets/voice/model/CallModel;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/voice/model/CallModel;->getChannelPermissions()Ljava/lang/Integer;
+    invoke-virtual {v0}, Lcom/discord/widgets/voice/model/CallModel;->getParticipants()Ljava/util/Map;
 
     move-result-object v0
 
-    const/16 v1, 0x10
+    invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    invoke-static {v1, v0}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
+    move-result-object v0
 
-    move-result v0
+    check-cast v0, Ljava/lang/Iterable;
 
-    const v1, 0x7f0a0451
+    instance-of v1, v0, Ljava/util/Collection;
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-eqz v1, :cond_0
+
+    move-object v1, v0
+
+    check-cast v1, Ljava/util/Collection;
+
+    invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v1
+
+    if-nez v1, :cond_2
+
+    :cond_0
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_1
+    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, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelVoice$User;->isSpectating()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_0
+    const v1, 0x7f0a047a
 
     invoke-interface {p1, v1}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
     move-result-object v1
 
-    const-string v2, "menu.findItem(R.id.menu_\u2026ld_call_channel_settings)"
+    const-string v4, "menu.findItem(R.id.menu_spectate_spectators)"
 
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v1, v0}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+
+    const/16 v0, 0x10
+
+    iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$2;->$model:Lcom/discord/widgets/voice/model/CallModel;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->getChannelPermissions()Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
+
+    move-result v0
+
+    const v1, 0x7f0a0461
+
+    invoke-interface {p1, v1}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+
+    move-result-object v1
+
+    const-string v4, "menu.findItem(R.id.menu_\u2026ld_call_channel_settings)"
+
+    invoke-static {v1, v4}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1, v0}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
@@ -79,7 +153,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_3
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -91,27 +165,25 @@
 
     move-result v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_3
 
-    const/4 v0, 0x1
+    goto :goto_1
 
-    goto :goto_0
+    :cond_3
+    const/4 v2, 0x0
 
-    :cond_0
-    const/4 v0, 0x0
+    :goto_1
+    const v0, 0x7f0a0462
 
-    :goto_0
-    const v1, 0x7f0a0452
-
-    invoke-interface {p1, v1}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+    invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
     move-result-object p1
 
-    const-string v1, "menu.findItem(R.id.menu_\u2026ld_call_overlay_launcher)"
+    const-string v0, "menu.findItem(R.id.menu_\u2026ld_call_overlay_launcher)"
 
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1, v0}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+    invoke-interface {p1, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$2.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$2.smali
index 8293cabc92..0bb9899c1f 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$2.smali
@@ -62,7 +62,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$2;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$3.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$3.smali
index fc1eb15a7a..b82219a90a 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$3.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$3;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$2.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$2.smali
index bfd4bee8c2..60ecde98f7 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$2.smali
@@ -58,7 +58,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$2;->invoke(Lkotlin/Pair;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$3.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$3.smali
index 2bb36bcd17..5fd1f61bf5 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$3.smali
@@ -75,7 +75,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f120417
+    const v0, 0x7f12041e
 
     invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$4.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$4.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$4.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$4.smali
index defa96c8bf..f0587cad4e 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$4.smali
@@ -75,7 +75,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f120d22
+    const v0, 0x7f120d68
 
     invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$5.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$5.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$5.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$5.smali
index 63197044c9..850d9eef2d 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$5.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$5;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$tryConnectToVoice$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$tryConnectToVoice$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall$tryConnectToVoice$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$tryConnectToVoice$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall.smali
similarity index 93%
rename from com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall.smali
index 0b0c4d4ef6..2ebe494f69 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/WidgetGuildCall.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall.smali
@@ -127,7 +127,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0341
+    const v0, 0x7f0a034a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -135,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a033f
+    const v0, 0x7f0a0348
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -143,7 +143,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->controls$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0340
+    const v0, 0x7f0a0349
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -223,7 +223,7 @@
 .method private final configureUI(Lcom/discord/widgets/voice/model/CallModel;ZZ)V
     .locals 4
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_4
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -244,38 +244,15 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->getAppActivity()Lcom/discord/app/AppActivity;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->requireContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    const-string v3, "requireContext()"
-
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v0, v2}, Lcom/discord/utilities/channel/ChannelUtils;->getDisplayName(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;)Ljava/lang/String;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/CharSequence;
-
-    invoke-virtual {v1, v2}, Lcom/discord/app/AppActivity;->setTitle(Ljava/lang/CharSequence;)V
-
-    :cond_1
     iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->participantsAdapter:Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;
 
     const-string v2, "participantsAdapter"
 
-    if-nez v1, :cond_2
+    if-nez v1, :cond_1
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
-    :cond_2
+    :cond_1
     new-instance v3, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$1;
 
     invoke-direct {v3, p0, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$1;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;Lcom/discord/models/domain/ModelChannel;)V
@@ -288,11 +265,11 @@
 
     move-result-object v1
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_2
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->configureMenu(Lcom/discord/widgets/voice/model/CallModel;)V
 
-    :cond_3
+    :cond_2
     invoke-direct {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->configureCenterContent(Lcom/discord/widgets/voice/model/CallModel;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->getControls()Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;
@@ -331,11 +308,11 @@
 
     iget-object p2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->participantsAdapter:Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;
 
-    if-nez p2, :cond_4
+    if-nez p2, :cond_3
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
-    :cond_4
+    :cond_3
     invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->getListItems()Ljava/util/List;
 
     move-result-object p1
@@ -344,17 +321,17 @@
 
     return-void
 
-    :cond_5
+    :cond_4
     :goto_0
     invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->getActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object p1
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_5
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->finish()V
 
-    :cond_6
+    :cond_5
     return-void
 .end method
 
@@ -437,7 +414,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d012b
+    const v0, 0x7f0d0133
 
     return v0
 .end method
@@ -459,7 +436,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f040167
+    const v0, 0x7f040168
 
     const/4 v1, 0x0
 
@@ -519,9 +496,17 @@
 
     move-result-wide v0
 
-    sget-object v2, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
+    sget-object v4, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
 
-    invoke-virtual {v2, v0, v1}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get(J)Lrx/Observable;
+    const/4 v7, 0x0
+
+    const/4 v8, 0x2
+
+    const/4 v9, 0x0
+
+    move-wide v5, v0
+
+    invoke-static/range {v4 .. v9}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get$default(Lcom/discord/widgets/voice/model/CallModel$Companion;JLcom/discord/widgets/voice/model/CallModel$Type;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v2
 
@@ -537,9 +522,9 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/samsung/a;->zM:Lcom/discord/samsung/a;
+    sget-object v3, Lcom/discord/samsung/a;->zV:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eo()Lrx/Observable;
+    invoke-static {}, Lcom/discord/samsung/a;->er()Lrx/Observable;
 
     move-result-object v3
 
@@ -567,12 +552,8 @@
 
     check-cast v11, Lkotlin/jvm/functions/Function1;
 
-    const/4 v7, 0x0
-
     const/4 v8, 0x0
 
-    const/4 v9, 0x0
-
     const/4 v10, 0x0
 
     const/16 v12, 0x1e
@@ -621,7 +602,7 @@
 
     check-cast v6, Lkotlin/jvm/functions/Function1;
 
-    const v7, 0x7f0802e7
+    const v7, 0x7f0802f7
 
     new-instance v2, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$5;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators$Companion.smali
new file mode 100644
index 0000000000..d1f2b32c8a
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators$Companion.smali
@@ -0,0 +1,56 @@
+.class public final Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$Companion;
+.super Ljava/lang/Object;
+.source "WidgetSpectators.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/voice/fullscreen/WidgetSpectators$Companion;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final launch(Landroid/content/Context;J)V
+    .locals 2
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Landroid/content/Intent;
+
+    invoke-direct {v0}, Landroid/content/Intent;-><init>()V
+
+    const-string v1, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+
+    invoke-virtual {v0, v1, p2, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
+
+    const-class p2, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;
+
+    invoke-static {p1, p2, v0}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1.smali
new file mode 100644
index 0000000000..f27dbedb21
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1.smali
@@ -0,0 +1,105 @@
+.class final Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1;
+.super Ljava/lang/Object;
+.source "WidgetSpectators.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->configureUI(Lcom/discord/widgets/voice/model/CallModel;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Lcom/discord/models/domain/ModelVoice$User;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
+
+.field final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;Lcom/discord/models/domain/ModelChannel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;
+
+    iput-object p2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/models/domain/ModelVoice$User;)V
+    .locals 9
+
+    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+
+    const-string v1, "user"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object p1
+
+    const-string v1, "user.user"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v1
+
+    iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v3
+
+    iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v5
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x8
+
+    const/4 v8, 0x0
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JJLandroidx/fragment/app/FragmentManager;Ljava/lang/Long;ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1;->call(Lcom/discord/models/domain/ModelVoice$User;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators$onViewBoundOrOnResume$1.smali
new file mode 100644
index 0000000000..3c7a5a2cf1
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators$onViewBoundOrOnResume$1.smali
@@ -0,0 +1,69 @@
+.class final Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$onViewBoundOrOnResume$1;
+.super Lkotlin/jvm/internal/l;
+.source "WidgetSpectators.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->onViewBoundOrOnResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/l;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/voice/model/CallModel;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/l;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/voice/model/CallModel;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/voice/model/CallModel;)V
+
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/voice/model/CallModel;)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->access$configureUI(Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;Lcom/discord/widgets/voice/model/CallModel;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators.smali
new file mode 100644
index 0000000000..0f5bcb69f8
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators.smali
@@ -0,0 +1,337 @@
+.class public final Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;
+.super Lcom/discord/app/AppFragment;
+.source "WidgetSpectators.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+.field public static final Companion:Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$Companion;
+
+
+# instance fields
+.field private participantsAdapter:Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;
+
+.field private final spectatorsList$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 5
+
+    const/4 v0, 0x1
+
+    new-array v0, v0, [Lkotlin/reflect/KProperty;
+
+    new-instance v1, Lkotlin/jvm/internal/v;
+
+    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;
+
+    invoke-static {v2}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v2
+
+    const-string v3, "spectatorsList"
+
+    const-string v4, "getSpectatorsList()Landroidx/recyclerview/widget/RecyclerView;"
+
+    invoke-direct {v1, v2, v3, v4}, Lkotlin/jvm/internal/v;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v1}, Lkotlin/jvm/internal/w;->a(Lkotlin/jvm/internal/u;)Lkotlin/reflect/d;
+
+    move-result-object v1
+
+    check-cast v1, Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x0
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    new-instance v0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->Companion:Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
+
+    const v0, 0x7f0a0723
+
+    invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->spectatorsList$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method public static final synthetic access$configureUI(Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;Lcom/discord/widgets/voice/model/CallModel;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->configureUI(Lcom/discord/widgets/voice/model/CallModel;)V
+
+    return-void
+.end method
+
+.method private final configureUI(Lcom/discord/widgets/voice/model/CallModel;)V
+    .locals 4
+
+    if-eqz p1, :cond_3
+
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getType()I
+
+    move-result v0
+
+    const/4 v1, 0x2
+
+    if-ne v0, v1, :cond_3
+
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->isConnected()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    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;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    invoke-virtual {p0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->setActionBarTitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
+
+    iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->participantsAdapter:Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;
+
+    const-string v2, "participantsAdapter"
+
+    if-nez v1, :cond_1
+
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_1
+    new-instance v3, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1;
+
+    invoke-direct {v3, p0, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;Lcom/discord/models/domain/ModelChannel;)V
+
+    check-cast v3, Lrx/functions/Action1;
+
+    invoke-virtual {v1, v3}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;->setOnVoiceUserClicked(Lrx/functions/Action1;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->participantsAdapter:Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;
+
+    if-nez v0, :cond_2
+
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
+
+    :cond_2
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->getListItems()Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;->setData(Ljava/util/List;)V
+
+    return-void
+
+    :cond_3
+    :goto_0
+    invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->getActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_4
+
+    invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->finish()V
+
+    :cond_4
+    return-void
+.end method
+
+.method private final getSpectatorsList()Landroidx/recyclerview/widget/RecyclerView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->spectatorsList$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->$$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
+
+
+# virtual methods
+.method public final getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d01c7
+
+    return v0
+.end method
+
+.method public final onViewBound(Landroid/view/View;)V
+    .locals 4
+
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
+
+    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const-string v0, "view.context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f040169
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    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
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p0, v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
+
+    sget-object p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
+
+    new-instance v0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;
+
+    invoke-direct {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->getSpectatorsList()Landroidx/recyclerview/widget/RecyclerView;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+
+    check-cast v0, 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
+
+    check-cast p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->participantsAdapter:Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;
+
+    return-void
+.end method
+
+.method public final onViewBoundOrOnResume()V
+    .locals 13
+
+    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object v0
+
+    const-string v1, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+
+    const-wide/16 v2, -0x1
+
+    invoke-virtual {v0, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+
+    move-result-wide v0
+
+    sget-object v2, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
+
+    sget-object v3, Lcom/discord/widgets/voice/model/CallModel$Type;->SPECTATING:Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    invoke-virtual {v2, v0, v1, v3}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get(JLcom/discord/widgets/voice/model/CallModel$Type;)Lrx/Observable;
+
+    move-result-object v0
+
+    move-object v1, p0
+
+    check-cast v1, 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
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v5
+
+    new-instance v0, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$onViewBoundOrOnResume$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;)V
+
+    move-object v10, v0
+
+    check-cast v10, Lkotlin/jvm/functions/Function1;
+
+    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
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$WhenMappings.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$WhenMappings.smali
new file mode 100644
index 0000000000..5a112b9830
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$WhenMappings.smali
@@ -0,0 +1,46 @@
+.class public final synthetic Lcom/discord/widgets/voice/model/CallModel$Companion$WhenMappings;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field public static final synthetic $EnumSwitchMapping$0:[I
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 3
+
+    invoke-static {}, Lcom/discord/widgets/voice/model/CallModel$Type;->values()[Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Lcom/discord/widgets/voice/model/CallModel$Companion$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/voice/model/CallModel$Type;->CONNECTED:Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel$Type;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/widgets/voice/model/CallModel$Companion$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/widgets/voice/model/CallModel$Type;->SPECTATING:Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel$Type;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x2
+
+    aput v2, v0, v1
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2.smali
new file mode 100644
index 0000000000..377f7a45db
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2.smali
@@ -0,0 +1,180 @@
+.class final Lcom/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2;
+.super Ljava/lang/Object;
+.source "CallModel.kt"
+
+# interfaces
+.implements Ljava/util/Comparator;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/voice/model/CallModel$Companion;->createConnectedListItems(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;)Ljava/util/List;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/util/Comparator<",
+        "Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2;
+
+    invoke-direct {v0}, Lcom/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2;->INSTANCE:Lcom/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final compare(Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;)I
+    .locals 5
+
+    iget-object v0, p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;->data:Ljava/lang/Object;
+
+    const-string v1, "user1.data"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$User;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    iget-object v4, p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;->data:Ljava/lang/Object;
+
+    invoke-static {v4, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v4, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelVoice$User;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    const/4 v2, 0x1
+
+    :cond_1
+    if-eqz v0, :cond_2
+
+    if-nez v2, :cond_2
+
+    return v3
+
+    :cond_2
+    if-eqz v2, :cond_3
+
+    if-eqz v0, :cond_3
+
+    const/4 p1, -0x1
+
+    return p1
+
+    :cond_3
+    iget-object v0, p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;->data:Ljava/lang/Object;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v0
+
+    iget-object v2, p2, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;->data:Ljava/lang/Object;
+
+    const-string v3, "user2.data"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v2, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v2
+
+    iget-object p1, p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;->data:Ljava/lang/Object;
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getNickname()Ljava/lang/String;
+
+    move-result-object p1
+
+    iget-object p2, p2, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;->data:Ljava/lang/Object;
+
+    invoke-static {p2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p2, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelVoice$User;->getNickname()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-static {v0, v2, p1, p2}, Lcom/discord/models/domain/ModelUser;->compareUserNames(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/String;)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public final bridge synthetic compare(Ljava/lang/Object;Ljava/lang/Object;)I
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
+
+    check-cast p2, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2;->compare(Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;)I
+
+    move-result p1
+
+    return p1
+.end method
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
new file mode 100644
index 0000000000..ffa22f6d8e
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali
@@ -0,0 +1,189 @@
+.class final Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;
+.super Ljava/lang/Object;
+.source "CallModel.kt"
+
+# interfaces
+.implements Lrx/functions/Func8;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;->call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    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;",
+        "T6:",
+        "Ljava/lang/Object;",
+        "T7:",
+        "Ljava/lang/Object;",
+        "T8:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func8<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
+
+.field final synthetic this$0:Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;Lcom/discord/models/domain/ModelChannel;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;->this$0:Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;
+
+    iput-object p2, p0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Long;Ljava/lang/Long;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/Boolean;)Lcom/discord/widgets/voice/model/CallModel;
+    .locals 14
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Long;",
+            "Ljava/lang/Long;",
+            "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelVoice$User;",
+            ">;",
+            "Ljava/lang/Integer;",
+            "Ljava/util/List<",
+            "Lco/discord/media_engine/VideoInputDeviceDescription;",
+            ">;",
+            "Lco/discord/media_engine/VideoInputDeviceDescription;",
+            "Ljava/lang/Boolean;",
+            ")",
+            "Lcom/discord/widgets/voice/model/CallModel;"
+        }
+    .end annotation
+
+    move-object v0, p0
+
+    sget-object v1, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
+
+    iget-object v2, v0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    const-string v3, "myUserId"
+
+    move-object v4, p1
+
+    invoke-static {p1, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v3
+
+    const-string v5, "timeConnected"
+
+    move-object/from16 v6, p2
+
+    invoke-static {v6, v5}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p2 .. p2}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v5
+
+    const-string v7, "inputMode"
+
+    move-object/from16 v8, p3
+
+    invoke-static {v8, v7}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "voiceParticipants"
+
+    move-object/from16 v9, p4
+
+    invoke-static {v9, v7}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "videoDevices"
+
+    move-object/from16 v10, p6
+
+    invoke-static {v10, v7}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "isVideoSupported"
+
+    move-object/from16 v11, p8
+
+    invoke-static {v11, v7}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p8 .. p8}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v12
+
+    iget-object v7, v0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;->this$0:Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;
+
+    iget-object v13, v7, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;->$type:Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    move-object/from16 v7, p3
+
+    move-object/from16 v8, p4
+
+    move-object/from16 v9, p5
+
+    move-object/from16 v11, p7
+
+    invoke-static/range {v1 .. v13}, Lcom/discord/widgets/voice/model/CallModel$Companion;->access$create(Lcom/discord/widgets/voice/model/CallModel$Companion;Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;ZLcom/discord/widgets/voice/model/CallModel$Type;)Lcom/discord/widgets/voice/model/CallModel;
+
+    move-result-object v1
+
+    return-object v1
+.end method
+
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    check-cast p2, Ljava/lang/Long;
+
+    check-cast p3, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    check-cast p4, Ljava/util/Map;
+
+    check-cast p5, Ljava/lang/Integer;
+
+    check-cast p6, Ljava/util/List;
+
+    check-cast p7, Lco/discord/media_engine/VideoInputDeviceDescription;
+
+    check-cast p8, Ljava/lang/Boolean;
+
+    invoke-virtual/range {p0 .. p8}, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;->call(Ljava/lang/Long;Ljava/lang/Long;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/Boolean;)Lcom/discord/widgets/voice/model/CallModel;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/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
similarity index 56%
rename from com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali
index 605119f2dc..93b3aa5053 100644
--- a/com.discord/smali/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
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/model/CallModel$Companion;->get(J)Lrx/Observable;
+    value = Lcom/discord/widgets/voice/model/CallModel$Companion;->get(JLcom/discord/widgets/voice/model/CallModel$Type;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -35,13 +35,17 @@
 # instance fields
 .field final synthetic $channelId:J
 
+.field final synthetic $type:Lcom/discord/widgets/voice/model/CallModel$Type;
+
 
 # direct methods
-.method constructor <init>(J)V
+.method constructor <init>(JLcom/discord/widgets/voice/model/CallModel$Type;)V
     .locals 0
 
     iput-wide p1, p0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;->$channelId:J
 
+    iput-object p3, p0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;->$type:Lcom/discord/widgets/voice/model/CallModel$Type;
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -86,111 +90,101 @@
     return-object p1
 
     :cond_0
-    invoke-static {p1}, Lrx/Observable;->bI(Ljava/lang/Object;)Lrx/Observable;
+    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
 
-    sget-object v1, 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/StoreUser;->getMeId()Lrx/Observable;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMeId()Lrx/Observable;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    move-result-object v1
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getVoiceChannelSelected()Lcom/discord/stores/StoreVoiceChannelSelected;
 
-    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    move-result-object v0
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getVoiceChannelSelected()Lcom/discord/stores/StoreVoiceChannelSelected;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreVoiceChannelSelected;->getTimeChannelSelected()Lrx/Observable;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreVoiceChannelSelected;->getTimeChannelSelected()Lrx/Observable;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    move-result-object v2
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
 
-    sget-object v3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    move-result-object v0
 
-    invoke-virtual {v3}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->getVoiceConfiguration()Lrx/Observable;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/discord/stores/StoreMediaSettings;->getVoiceConfiguration()Lrx/Observable;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    move-result-object v3
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getVoiceParticipants()Lcom/discord/stores/StoreVoiceParticipants;
 
-    sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    move-result-object v0
 
-    invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getVoiceParticipants()Lcom/discord/stores/StoreVoiceParticipants;
+    iget-wide v4, p0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;->$channelId:J
+
+    invoke-virtual {v0, v4, v5}, Lcom/discord/stores/StoreVoiceParticipants;->get(J)Lrx/Observable;
 
     move-result-object v4
 
-    iget-wide v5, p0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;->$channelId:J
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v4, v5, v6}, Lcom/discord/stores/StoreVoiceParticipants;->get(J)Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPermissions()Lcom/discord/stores/StorePermissions;
 
-    move-result-object v4
-
-    sget-object v5, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v5}, Lcom/discord/stores/StoreStream$Companion;->getPermissions()Lcom/discord/stores/StorePermissions;
-
-    move-result-object v5
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v6
+    move-result-wide v5
 
-    invoke-virtual {v5, v6, v7}, Lcom/discord/stores/StorePermissions;->getForChannel(J)Lrx/Observable;
+    invoke-virtual {v0, v5, v6}, Lcom/discord/stores/StorePermissions;->getForChannel(J)Lrx/Observable;
 
     move-result-object v5
 
-    sget-object p1, 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 {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
 
-    move-result-object p1
+    move-result-object v0
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaEngine;->getVideoInputDevices()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaEngine;->getVideoInputDevices()Lrx/Observable;
 
     move-result-object v6
 
-    sget-object p1, 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 {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
 
-    move-result-object p1
+    move-result-object v0
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaEngine;->getSelectedVideoInputDevice()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaEngine;->getSelectedVideoInputDevice()Lrx/Observable;
 
     move-result-object v7
 
-    sget-object p1, 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 {p1}, Lcom/discord/stores/StoreStream$Companion;->getVideoSupport()Lcom/discord/stores/StoreVideoSupport;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getVideoSupport()Lcom/discord/stores/StoreVideoSupport;
 
-    move-result-object p1
+    move-result-object v0
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreVideoSupport;->get()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreVideoSupport;->get()Lrx/Observable;
 
     move-result-object v8
 
-    new-instance p1, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;
+    new-instance v0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;
 
-    sget-object v9, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
+    invoke-direct {v0, p0, p1}, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;-><init>(Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-direct {p1, v9}, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;-><init>(Lcom/discord/widgets/voice/model/CallModel$Companion;)V
+    move-object v9, v0
 
-    check-cast p1, Lkotlin/jvm/functions/Function9;
+    check-cast v9, Lrx/functions/Func8;
 
-    new-instance v9, Lcom/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0;
-
-    invoke-direct {v9, p1}, Lcom/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0;-><init>(Lkotlin/jvm/functions/Function9;)V
-
-    check-cast v9, Lrx/functions/Func9;
-
-    invoke-static/range {v0 .. v9}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func9;)Lrx/Observable;
+    invoke-static/range {v1 .. v9}, Lrx/Observable;->a(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
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1.smali
new file mode 100644
index 0000000000..a2906ab2f9
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1.smali
@@ -0,0 +1,180 @@
+.class final Lcom/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1;
+.super Ljava/lang/Object;
+.source "CallModel.kt"
+
+# interfaces
+.implements Ljava/util/Comparator;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/voice/model/CallModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/util/Comparator<",
+        "Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1;->INSTANCE:Lcom/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final compare(Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;)I
+    .locals 5
+
+    iget-object v0, p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;->data:Ljava/lang/Object;
+
+    const-string v1, "user1.data"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$User;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    iget-object v4, p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;->data:Ljava/lang/Object;
+
+    invoke-static {v4, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v4, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelVoice$User;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    const/4 v2, 0x1
+
+    :cond_1
+    if-eqz v0, :cond_2
+
+    if-nez v2, :cond_2
+
+    return v3
+
+    :cond_2
+    if-eqz v2, :cond_3
+
+    if-eqz v0, :cond_3
+
+    const/4 p1, -0x1
+
+    return p1
+
+    :cond_3
+    iget-object v0, p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;->data:Ljava/lang/Object;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v0
+
+    iget-object v2, p2, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;->data:Ljava/lang/Object;
+
+    const-string v3, "user2.data"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v2, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v2
+
+    iget-object p1, p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;->data:Ljava/lang/Object;
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getNickname()Ljava/lang/String;
+
+    move-result-object p1
+
+    iget-object p2, p2, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;->data:Ljava/lang/Object;
+
+    invoke-static {p2, v3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p2, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelVoice$User;->getNickname()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-static {v0, v2, p1, p2}, Lcom/discord/models/domain/ModelUser;->compareUserNames(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/lang/String;)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public final bridge synthetic compare(Ljava/lang/Object;Ljava/lang/Object;)I
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
+
+    check-cast p2, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1;->compare(Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;)I
+
+    move-result p1
+
+    return p1
+.end method
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
new file mode 100644
index 0000000000..c63093fde7
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion.smali
@@ -0,0 +1,799 @@
+.class public final Lcom/discord/widgets/voice/model/CallModel$Companion;
+.super Ljava/lang/Object;
+.source "CallModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/voice/model/CallModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private 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/voice/model/CallModel$Companion;-><init>()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$create(Lcom/discord/widgets/voice/model/CallModel$Companion;Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;ZLcom/discord/widgets/voice/model/CallModel$Type;)Lcom/discord/widgets/voice/model/CallModel;
+    .locals 0
+
+    invoke-direct/range {p0 .. p12}, Lcom/discord/widgets/voice/model/CallModel$Companion;->create(Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;ZLcom/discord/widgets/voice/model/CallModel$Type;)Lcom/discord/widgets/voice/model/CallModel;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method private final create(Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;ZLcom/discord/widgets/voice/model/CallModel$Type;)Lcom/discord/widgets/voice/model/CallModel;
+    .locals 16
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelChannel;",
+            "JJ",
+            "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelVoice$User;",
+            ">;",
+            "Ljava/lang/Integer;",
+            "Ljava/util/List<",
+            "Lco/discord/media_engine/VideoInputDeviceDescription;",
+            ">;",
+            "Lco/discord/media_engine/VideoInputDeviceDescription;",
+            "Z",
+            "Lcom/discord/widgets/voice/model/CallModel$Type;",
+            ")",
+            "Lcom/discord/widgets/voice/model/CallModel;"
+        }
+    .end annotation
+
+    move-object/from16 v2, p7
+
+    invoke-interface/range {p7 .. p7}, Ljava/util/Map;->isEmpty()Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    const/4 v13, 0x0
+
+    goto :goto_1
+
+    :cond_0
+    invoke-interface/range {p7 .. p7}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_1
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    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 v3
+
+    check-cast v3, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_1
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    move v13, v1
+
+    :goto_1
+    sget-object v0, Lcom/discord/widgets/voice/model/CallModel$Companion$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    invoke-virtual/range {p12 .. p12}, Lcom/discord/widgets/voice/model/CallModel$Type;->ordinal()I
+
+    move-result v1
+
+    aget v0, v0, v1
+
+    const/4 v1, 0x1
+
+    if-eq v0, v1, :cond_4
+
+    const/4 v1, 0x2
+
+    if-ne v0, v1, :cond_3
+
+    move-object/from16 v0, p0
+
+    check-cast v0, Lcom/discord/widgets/voice/model/CallModel$Companion;
+
+    invoke-direct {v0, v2}, Lcom/discord/widgets/voice/model/CallModel$Companion;->createSpectatingListItems(Ljava/util/Map;)Ljava/util/List;
+
+    move-result-object v0
+
+    move-object/from16 v10, p1
+
+    goto :goto_2
+
+    :cond_3
+    new-instance v0, Lkotlin/k;
+
+    invoke-direct {v0}, Lkotlin/k;-><init>()V
+
+    throw v0
+
+    :cond_4
+    move-object/from16 v0, p0
+
+    check-cast v0, Lcom/discord/widgets/voice/model/CallModel$Companion;
+
+    move-object/from16 v10, p1
+
+    invoke-direct {v0, v10, v2}, Lcom/discord/widgets/voice/model/CallModel$Companion;->createConnectedListItems(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;)Ljava/util/List;
+
+    move-result-object v0
+
+    :goto_2
+    move-object v1, v0
+
+    new-instance v15, Lcom/discord/widgets/voice/model/CallModel;
+
+    invoke-virtual/range {p6 .. p6}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    move-result-object v11
+
+    invoke-virtual/range {p6 .. p6}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getOutputMode()Lcom/discord/models/domain/ModelVoice$OutputMode;
+
+    move-result-object v12
+
+    move-object v0, v15
+
+    move-object/from16 v2, p7
+
+    move-wide/from16 v3, p2
+
+    move-wide/from16 v5, p4
+
+    move-object/from16 v7, p9
+
+    move-object/from16 v8, p10
+
+    move/from16 v9, p11
+
+    move-object/from16 v10, p1
+
+    move-object/from16 v14, p8
+
+    invoke-direct/range {v0 .. v14}, Lcom/discord/widgets/voice/model/CallModel;-><init>(Ljava/util/List;Ljava/util/Map;JJLjava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;ZLcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;ILjava/lang/Integer;)V
+
+    return-object v15
+.end method
+
+.method private final createConnectedListItems(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;)Ljava/util/List;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelChannel;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelVoice$User;",
+            ">;)",
+            "Ljava/util/List<",
+            "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;",
+            ">;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+
+    new-instance v2, Ljava/util/ArrayList;
+
+    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
+
+    move-result v3
+
+    const/4 v4, 0x1
+
+    if-eq v3, v4, :cond_5
+
+    invoke-interface {p2}, Ljava/util/Map;->values()Ljava/util/Collection;
+
+    move-result-object p2
+
+    check-cast p2, Ljava/lang/Iterable;
+
+    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 v3
+
+    if-eqz v3, :cond_1
+
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_0
+
+    invoke-virtual {v1, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v2, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_1
+    move-object p2, v1
+
+    check-cast p2, Ljava/util/Collection;
+
+    invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result p2
+
+    xor-int/2addr p2, v4
+
+    if-eqz p2, :cond_3
+
+    new-instance v3, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;
+
+    const v5, 0x7f120992
+
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v5
+
+    invoke-direct {v3, v5}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;-><init>(Ljava/lang/Integer;)V
+
+    invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    check-cast v1, Ljava/lang/Iterable;
+
+    new-instance v3, Ljava/util/ArrayList;
+
+    const/16 v5, 0xa
+
+    invoke-static {v1, v5}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
+
+    move-result v5
+
+    invoke-direct {v3, v5}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast v3, Ljava/util/Collection;
+
+    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 v5
+
+    if-eqz v5, :cond_2
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Lcom/discord/models/domain/ModelVoice$User;
+
+    new-instance v6, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
+
+    invoke-direct {v6, v5}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;-><init>(Lcom/discord/models/domain/ModelVoice$User;)V
+
+    invoke-interface {v3, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_2
+    check-cast v3, Ljava/util/List;
+
+    check-cast v3, Ljava/lang/Iterable;
+
+    sget-object v1, Lcom/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2;->INSTANCE:Lcom/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2;
+
+    check-cast v1, Ljava/util/Comparator;
+
+    invoke-static {v3, v1}, Lkotlin/a/m;->a(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/util/Collection;
+
+    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+
+    :cond_3
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
+
+    move-result p1
+
+    const/4 v1, 0x2
+
+    if-eq p1, v1, :cond_5
+
+    move-object p1, v2
+
+    check-cast p1, Ljava/util/Collection;
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result p1
+
+    xor-int/2addr p1, v4
+
+    if-eqz p2, :cond_4
+
+    if-eqz p1, :cond_4
+
+    new-instance p2, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider;
+
+    invoke-direct {p2}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider;-><init>()V
+
+    invoke-virtual {v0, p2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_4
+    if-eqz p1, :cond_5
+
+    new-instance p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;
+
+    const p2, 0x7f120c1e
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;-><init>(Ljava/lang/Integer;)V
+
+    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    check-cast v2, Ljava/lang/Iterable;
+
+    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_2
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_5
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v1, v0
+
+    check-cast v1, Ljava/util/Collection;
+
+    check-cast p2, Lcom/discord/models/domain/ModelVoice$User;
+
+    new-instance v2, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
+
+    invoke-direct {v2, p2}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;-><init>(Lcom/discord/models/domain/ModelVoice$User;)V
+
+    invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_5
+    check-cast v0, Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method private final createSpectatingListItems(Ljava/util/Map;)Ljava/util/List;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelVoice$User;",
+            ">;)",
+            "Ljava/util/List<",
+            "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;",
+            ">;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+
+    new-instance v2, Ljava/util/ArrayList;
+
+    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Iterable;
+
+    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 v3
+
+    if-eqz v3, :cond_1
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_0
+
+    invoke-virtual {v1, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v2, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_1
+    move-object p1, v1
+
+    check-cast p1, Ljava/util/Collection;
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result p1
+
+    xor-int/lit8 p1, p1, 0x1
+
+    new-instance v2, Ljava/util/ArrayList;
+
+    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
+
+    new-instance v3, Ljava/util/ArrayList;
+
+    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
+
+    check-cast v1, Ljava/lang/Iterable;
+
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :cond_2
+    :goto_1
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_4
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lcom/discord/models/domain/ModelVoice$User;
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelVoice$User;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v5
+
+    if-nez v5, :cond_2
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelVoice$User;->isSpectating()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_3
+
+    invoke-virtual {v2, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_3
+    invoke-virtual {v3, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_4
+    if-eqz p1, :cond_7
+
+    new-instance p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;
+
+    const v1, 0x7f121089
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-direct {p1, v1}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;-><init>(Ljava/lang/Integer;)V
+
+    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    check-cast v2, Ljava/lang/Iterable;
+
+    new-instance p1, Ljava/util/ArrayList;
+
+    const/16 v1, 0xa
+
+    invoke-static {v2, v1}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
+
+    move-result v4
+
+    invoke-direct {p1, v4}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast p1, Ljava/util/Collection;
+
+    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v2
+
+    :goto_2
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_5
+
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lcom/discord/models/domain/ModelVoice$User;
+
+    new-instance v5, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
+
+    invoke-direct {v5, v4}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;-><init>(Lcom/discord/models/domain/ModelVoice$User;)V
+
+    invoke-interface {p1, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_5
+    check-cast p1, Ljava/util/List;
+
+    check-cast p1, Ljava/lang/Iterable;
+
+    invoke-static {}, Lcom/discord/widgets/voice/model/CallModel;->access$getUserItemsComparator$cp()Ljava/util/Comparator;
+
+    move-result-object v2
+
+    invoke-static {p1, v2}, Lkotlin/a/m;->a(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/util/Collection;
+
+    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+
+    move-object p1, v3
+
+    check-cast p1, Ljava/util/Collection;
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result p1
+
+    xor-int/lit8 p1, p1, 0x1
+
+    if-eqz p1, :cond_7
+
+    new-instance p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;
+
+    const v2, 0x7f120992
+
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v2
+
+    invoke-direct {p1, v2}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;-><init>(Ljava/lang/Integer;)V
+
+    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    check-cast v3, Ljava/lang/Iterable;
+
+    new-instance p1, Ljava/util/ArrayList;
+
+    invoke-static {v3, v1}, Lkotlin/a/m;->a(Ljava/lang/Iterable;I)I
+
+    move-result v1
+
+    invoke-direct {p1, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast p1, Ljava/util/Collection;
+
+    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :goto_3
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_6
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lcom/discord/models/domain/ModelVoice$User;
+
+    new-instance v3, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
+
+    invoke-direct {v3, v2}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;-><init>(Lcom/discord/models/domain/ModelVoice$User;)V
+
+    invoke-interface {p1, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_3
+
+    :cond_6
+    check-cast p1, Ljava/util/List;
+
+    check-cast p1, Ljava/lang/Iterable;
+
+    invoke-static {}, Lcom/discord/widgets/voice/model/CallModel;->access$getUserItemsComparator$cp()Ljava/util/Comparator;
+
+    move-result-object v1
+
+    invoke-static {p1, v1}, Lkotlin/a/m;->a(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/util/Collection;
+
+    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+
+    :cond_7
+    check-cast v0, Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public static synthetic get$default(Lcom/discord/widgets/voice/model/CallModel$Companion;JLcom/discord/widgets/voice/model/CallModel$Type;ILjava/lang/Object;)Lrx/Observable;
+    .locals 0
+
+    and-int/lit8 p4, p4, 0x2
+
+    if-eqz p4, :cond_0
+
+    sget-object p3, Lcom/discord/widgets/voice/model/CallModel$Type;->CONNECTED:Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    :cond_0
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get(JLcom/discord/widgets/voice/model/CallModel$Type;)Lrx/Observable;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final get(JLcom/discord/widgets/voice/model/CallModel$Type;)Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(J",
+            "Lcom/discord/widgets/voice/model/CallModel$Type;",
+            ")",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/voice/model/CallModel;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "type"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(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;->getChannels()Lcom/discord/stores/StoreChannels;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreChannels;->get(J)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;
+
+    invoke-direct {v1, p1, p2, p3}, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;-><init>(JLcom/discord/widgets/voice/model/CallModel$Type;)V
+
+    check-cast v1, Lrx/functions/b;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string p2, "StoreStream\n          .g\u2026            }\n          }"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(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;->JO()Lrx/Observable;
+
+    move-result-object p1
+
+    const-string p2, "StoreStream\n          .g\u2026  .distinctUntilChanged()"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(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$Type.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Type.smali
new file mode 100644
index 0000000000..78576f7553
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Type.smali
@@ -0,0 +1,109 @@
+.class public final enum Lcom/discord/widgets/voice/model/CallModel$Type;
+.super Ljava/lang/Enum;
+.source "CallModel.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/voice/model/CallModel;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "Type"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/discord/widgets/voice/model/CallModel$Type;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final synthetic $VALUES:[Lcom/discord/widgets/voice/model/CallModel$Type;
+
+.field public static final enum CONNECTED:Lcom/discord/widgets/voice/model/CallModel$Type;
+
+.field public static final enum SPECTATING:Lcom/discord/widgets/voice/model/CallModel$Type;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x2
+
+    new-array v0, v0, [Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    new-instance v1, Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    const/4 v2, 0x0
+
+    const-string v3, "CONNECTED"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/voice/model/CallModel$Type;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/voice/model/CallModel$Type;->CONNECTED:Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    const/4 v2, 0x1
+
+    const-string v3, "SPECTATING"
+
+    invoke-direct {v1, v3, v2}, Lcom/discord/widgets/voice/model/CallModel$Type;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/widgets/voice/model/CallModel$Type;->SPECTATING:Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/widgets/voice/model/CallModel$Type;->$VALUES:[Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    return-void
+.end method
+
+.method private 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/widgets/voice/model/CallModel$Type;
+    .locals 1
+
+    const-class v0, Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    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/widgets/voice/model/CallModel$Type;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/discord/widgets/voice/model/CallModel$Type;
+    .locals 1
+
+    sget-object v0, Lcom/discord/widgets/voice/model/CallModel$Type;->$VALUES:[Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    invoke-virtual {v0}, [Lcom/discord/widgets/voice/model/CallModel$Type;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/discord/widgets/voice/model/CallModel$Type;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/voice/model/CallModel.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel.smali
similarity index 96%
rename from com.discord/smali/com/discord/widgets/voice/model/CallModel.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel.smali
index e0669ab1f9..20842cb10c 100644
--- a/com.discord/smali/com/discord/widgets/voice/model/CallModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel.smali
@@ -9,6 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
+        Lcom/discord/widgets/voice/model/CallModel$Type;,
         Lcom/discord/widgets/voice/model/CallModel$Companion;
     }
 .end annotation
@@ -17,6 +18,16 @@
 # static fields
 .field public static final Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
 
+.field private static final userItemsComparator:Ljava/util/Comparator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Comparator<",
+            "Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 
 # instance fields
 .field private final channel:Lcom/discord/models/domain/ModelChannel;
@@ -83,6 +94,12 @@
 
     sput-object v0, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
 
+    sget-object v0, Lcom/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1;->INSTANCE:Lcom/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1;
+
+    check-cast v0, Ljava/util/Comparator;
+
+    sput-object v0, Lcom/discord/widgets/voice/model/CallModel;->userItemsComparator:Ljava/util/Comparator;
+
     return-void
 .end method
 
@@ -246,6 +263,14 @@
     return-void
 .end method
 
+.method public static final synthetic access$getUserItemsComparator$cp()Ljava/util/Comparator;
+    .locals 1
+
+    sget-object v0, Lcom/discord/widgets/voice/model/CallModel;->userItemsComparator:Ljava/util/Comparator;
+
+    return-object v0
+.end method
+
 .method private final component10()Lcom/discord/models/domain/ModelVoice$OutputMode;
     .locals 1
 
@@ -1033,7 +1058,7 @@
 .end method
 
 .method public final hashCode()I
-    .locals 7
+    .locals 4
 
     iget-object v0, p0, Lcom/discord/widgets/voice/model/CallModel;->listItems:Ljava/util/List;
 
@@ -1073,27 +1098,21 @@
 
     iget-wide v2, p0, Lcom/discord/widgets/voice/model/CallModel;->myId:J
 
-    const/16 v4, 0x20
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    ushr-long v5, v2, v4
+    move-result v2
 
-    xor-long/2addr v2, v5
-
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
     iget-wide v2, p0, Lcom/discord/widgets/voice/model/CallModel;->timeConnected:J
 
-    ushr-long v4, v2, v4
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
 
-    xor-long/2addr v2, v4
+    move-result v2
 
-    long-to-int v3, v2
-
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
@@ -1200,6 +1219,10 @@
 
     iget v2, p0, Lcom/discord/widgets/voice/model/CallModel;->numUsersConnected:I
 
+    invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v2
+
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali
similarity index 90%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali
index d95dfae1a1..345138be19 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali
@@ -50,6 +50,10 @@
 
     move-result-object p1
 
+    const-string p2, "Intent().putExtra(INTENT\u2026RA_CHANNEL_ID, channelId)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-class p2, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
     invoke-static {p3, p2, p1}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
diff --git a/com.discord/smali/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
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
diff --git a/com.discord/smali/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
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
index 87552dc3ec..c9463226b0 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
@@ -72,7 +72,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->Kb()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->JO()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali
similarity index 99%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali
index e442719d71..5d55676a96 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali
@@ -317,6 +317,10 @@
 
     iget v1, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model;->maxBitrate:I
 
+    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
+
+    move-result v1
+
     add-int/2addr v0, v1
 
     return v0
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
similarity index 99%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
index 3d101ebaea..5781143de5 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
@@ -64,7 +64,7 @@
 
     move-result p1
 
-    const p2, 0x7f0a043c
+    const p2, 0x7f0a044c
 
     if-eq p1, p2, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$4.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$4.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$4.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$4.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$1.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.smali
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
index b420ab7358..bfbeece80e 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
similarity index 96%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
index 5911aecba5..128eec06c5 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -67,7 +67,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1203ab
+    const v0, 0x7f1203b0
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
rename to com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
index ea24db842e..fa2597d300 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
@@ -268,7 +268,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0165
+    const v0, 0x7f0a0166
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -276,7 +276,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->channelSettingsName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a016e
+    const v0, 0x7f0a016f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -284,7 +284,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->channelSettingsPermissions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a017a
+    const v0, 0x7f0a017b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -292,7 +292,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->channelSettingsSave$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0783
+    const v0, 0x7f0a07ad
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -300,7 +300,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->userLimitSeekbar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0246
+    const v0, 0x7f0a024f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -308,7 +308,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->userLimitDisplay$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06dc
+    const v0, 0x7f0a06f6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -316,7 +316,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->userLimitHelp$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00ca
+    const v0, 0x7f0a00cb
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -324,7 +324,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->bitrateSeekbar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0245
+    const v0, 0x7f0a024e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -332,7 +332,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->bitrateDisplay$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0683
+    const v0, 0x7f0a069d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -356,10 +356,10 @@
 
     :array_0
     .array-data 4
-        0x7f0a0165
         0x7f0a0166
-        0x7f0a0246
-        0x7f0a0245
+        0x7f0a0167
+        0x7f0a024f
+        0x7f0a024e
     .end array-data
 .end method
 
@@ -499,7 +499,7 @@
 
     invoke-static {p0, v3, v2, v0, v2}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f1203aa
+    const v0, 0x7f1203af
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -523,7 +523,7 @@
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->setActionBarSubtitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
 
-    const v5, 0x7f0e001f
+    const v5, 0x7f0e0020
 
     new-instance v0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1;
 
@@ -581,7 +581,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f1205dd
+    const v4, 0x7f1205e9
 
     invoke-virtual {p0, v4}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getString(I)Ljava/lang/String;
 
@@ -665,7 +665,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f1205c3
+    const v5, 0x7f1205cf
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -787,7 +787,7 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     iget-object p1, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
@@ -820,7 +820,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d00d5
+    const v1, 0x7f0d00de
 
     const/4 v2, 0x0
 
@@ -848,7 +848,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0161
+    const v2, 0x7f0a0162
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -856,7 +856,7 @@
 
     check-cast v2, Landroid/widget/TextView;
 
-    const v3, 0x7f0a0162
+    const v3, 0x7f0a0163
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -864,7 +864,7 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    const v4, 0x7f0a0163
+    const v4, 0x7f0a0164
 
     invoke-virtual {v0, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -912,7 +912,7 @@
 
     aput-object p1, v0, v3
 
-    const p1, 0x7f1204ce
+    const p1, 0x7f1204d9
 
     invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1106,20 +1106,20 @@
 
     move-result-object p1
 
-    const v0, 0x7f120be3
+    const v0, 0x7f120c15
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
-    return-object p1
+    goto :goto_0
 
     :cond_0
     invoke-virtual {p0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
 
-    const v1, 0x7f10008b
+    const v1, 0x7f10008a
 
     const/4 v2, 0x1
 
@@ -1137,6 +1137,11 @@
 
     move-result-object p1
 
+    :goto_0
+    const-string v0, "if (userLimit == 0)\n    \u2026um, userLimit, userLimit)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-object p1
 .end method
 
@@ -1239,7 +1244,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/app/i;->vd:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vc:Lcom/discord/app/i;
 
     invoke-virtual {p0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getContext()Landroid/content/Context;
 
@@ -1265,7 +1270,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01da
+    const v0, 0x7f0d01e8
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/workers/MessageAckWorker$a.smali b/com.discord/smali_classes2/com/discord/workers/MessageAckWorker$a.smali
similarity index 100%
rename from com.discord/smali/com/discord/workers/MessageAckWorker$a.smali
rename to com.discord/smali_classes2/com/discord/workers/MessageAckWorker$a.smali
diff --git a/com.discord/smali/com/discord/workers/MessageAckWorker.smali b/com.discord/smali_classes2/com/discord/workers/MessageAckWorker.smali
similarity index 95%
rename from com.discord/smali/com/discord/workers/MessageAckWorker.smali
rename to com.discord/smali_classes2/com/discord/workers/MessageAckWorker.smali
index c3f5f6656b..75b495fbe3 100644
--- a/com.discord/smali/com/discord/workers/MessageAckWorker.smali
+++ b/com.discord/smali_classes2/com/discord/workers/MessageAckWorker.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field public static final Er:Lcom/discord/workers/MessageAckWorker$a;
+.field public static final EI:Lcom/discord/workers/MessageAckWorker$a;
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/workers/MessageAckWorker$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/workers/MessageAckWorker;->Er:Lcom/discord/workers/MessageAckWorker$a;
+    sput-object v0, Lcom/discord/workers/MessageAckWorker;->EI:Lcom/discord/workers/MessageAckWorker$a;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
 .method public final doWork()Landroidx/work/ListenableWorker$Result;
     .locals 15
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -111,7 +111,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v7, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v7, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -216,9 +216,9 @@
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lrx/b/a;->Ln()Ljava/lang/Object;
+    invoke-virtual {v5}, Lrx/b/a;->Lb()Ljava/lang/Object;
 
-    sget-object v9, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v9, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -285,7 +285,7 @@
     :catchall_0
     move-exception v5
 
-    sget-object v9, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v9, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
diff --git a/com.discord/smali/com/discord/workers/MessageSendWorker$a.smali b/com.discord/smali_classes2/com/discord/workers/MessageSendWorker$a.smali
similarity index 100%
rename from com.discord/smali/com/discord/workers/MessageSendWorker$a.smali
rename to com.discord/smali_classes2/com/discord/workers/MessageSendWorker$a.smali
diff --git a/com.discord/smali/com/discord/workers/MessageSendWorker.smali b/com.discord/smali_classes2/com/discord/workers/MessageSendWorker.smali
similarity index 96%
rename from com.discord/smali/com/discord/workers/MessageSendWorker.smali
rename to com.discord/smali_classes2/com/discord/workers/MessageSendWorker.smali
index 11b808f0d9..1f4f7b6b9b 100644
--- a/com.discord/smali/com/discord/workers/MessageSendWorker.smali
+++ b/com.discord/smali_classes2/com/discord/workers/MessageSendWorker.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field public static final Es:Lcom/discord/workers/MessageSendWorker$a;
+.field public static final EJ:Lcom/discord/workers/MessageSendWorker$a;
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/workers/MessageSendWorker$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/workers/MessageSendWorker;->Es:Lcom/discord/workers/MessageSendWorker$a;
+    sput-object v0, Lcom/discord/workers/MessageSendWorker;->EJ:Lcom/discord/workers/MessageSendWorker$a;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
 .method public final doWork()Landroidx/work/ListenableWorker$Result;
     .locals 15
 
-    sget-object v0, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -111,7 +111,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v7, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v7, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -243,7 +243,7 @@
 
     move-result-object v8
 
-    sget-object v9, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v9, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v9, Ljava/util/List;
 
@@ -273,13 +273,13 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lrx/b/a;->Ln()Ljava/lang/Object;
+    invoke-virtual {v2}, Lrx/b/a;->Lb()Ljava/lang/Object;
 
     move-result-object v2
 
     check-cast v2, Lcom/discord/models/domain/ModelMessage;
 
-    sget-object v8, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v8, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -347,7 +347,7 @@
     move-exception v2
 
     :try_start_1
-    sget-object v7, Lcom/discord/app/AppLog;->uB:Lcom/discord/app/AppLog;
+    sget-object v7, Lcom/discord/app/AppLog;->uA:Lcom/discord/app/AppLog;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
diff --git a/com.discord/smali/com/esotericsoftware/a/a$a.smali b/com.discord/smali_classes2/com/esotericsoftware/a/a$a.smali
similarity index 96%
rename from com.discord/smali/com/esotericsoftware/a/a$a.smali
rename to com.discord/smali_classes2/com/esotericsoftware/a/a$a.smali
index f2c77db0d0..806c84e05f 100644
--- a/com.discord/smali/com/esotericsoftware/a/a$a.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/a/a$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private Ey:J
+.field private EP:J
 
 
 # direct methods
@@ -32,7 +32,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/esotericsoftware/a/a$a;->Ey:J
+    iput-wide v0, p0, Lcom/esotericsoftware/a/a$a;->EP:J
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     move-result-wide v1
 
-    iget-wide v3, p0, Lcom/esotericsoftware/a/a$a;->Ey:J
+    iget-wide v3, p0, Lcom/esotericsoftware/a/a$a;->EP:J
 
     sub-long/2addr v1, v3
 
diff --git a/com.discord/smali/com/esotericsoftware/a/a.smali b/com.discord/smali_classes2/com/esotericsoftware/a/a.smali
similarity index 73%
rename from com.discord/smali/com/esotericsoftware/a/a.smali
rename to com.discord/smali_classes2/com/esotericsoftware/a/a.smali
index 2ea73ba8de..d80d5f2d10 100644
--- a/com.discord/smali/com/esotericsoftware/a/a.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/a/a.smali
@@ -14,15 +14,15 @@
 # static fields
 .field public static DEBUG:Z = false
 
-.field public static Et:Z = true
+.field public static EK:Z = true
 
-.field public static Eu:Z = false
+.field public static EL:Z = false
 
-.field public static Ev:Z = false
+.field public static EM:Z = false
 
-.field public static Ew:Z = false
+.field public static EN:Z = false
 
-.field private static Ex:Lcom/esotericsoftware/a/a$a; = null
+.field private static EO:Lcom/esotericsoftware/a/a$a; = null
 
 .field private static level:I = 0x3
 
@@ -49,7 +49,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lcom/esotericsoftware/a/a;->Eu:Z
+    sput-boolean v0, Lcom/esotericsoftware/a/a;->EL:Z
 
     sget v0, Lcom/esotericsoftware/a/a;->level:I
 
@@ -65,7 +65,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    sput-boolean v0, Lcom/esotericsoftware/a/a;->Ev:Z
+    sput-boolean v0, Lcom/esotericsoftware/a/a;->EM:Z
 
     sget v0, Lcom/esotericsoftware/a/a;->level:I
 
@@ -90,25 +90,25 @@
     const/4 v1, 0x1
 
     :cond_3
-    sput-boolean v1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sput-boolean v1, Lcom/esotericsoftware/a/a;->EN:Z
 
     new-instance v0, Lcom/esotericsoftware/a/a$a;
 
     invoke-direct {v0}, Lcom/esotericsoftware/a/a$a;-><init>()V
 
-    sput-object v0, Lcom/esotericsoftware/a/a;->Ex:Lcom/esotericsoftware/a/a$a;
+    sput-object v0, Lcom/esotericsoftware/a/a;->EO:Lcom/esotericsoftware/a/a$a;
 
     return-void
 .end method
 
-.method public static al(Ljava/lang/String;)V
+.method public static ah(Ljava/lang/String;)V
     .locals 3
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Eu:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EL:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->Ex:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->EO:Lcom/esotericsoftware/a/a$a;
 
     const/4 v1, 0x4
 
@@ -120,14 +120,14 @@
     return-void
 .end method
 
-.method public static am(Ljava/lang/String;)V
+.method public static ai(Ljava/lang/String;)V
     .locals 3
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->Ex:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->EO:Lcom/esotericsoftware/a/a$a;
 
     const/4 v1, 0x1
 
@@ -142,11 +142,11 @@
 .method public static q(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Eu:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EL:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->Ex:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->EO:Lcom/esotericsoftware/a/a$a;
 
     const/4 v1, 0x4
 
@@ -163,7 +163,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->Ex:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->EO:Lcom/esotericsoftware/a/a$a;
 
     const/4 v1, 0x2
 
@@ -176,11 +176,11 @@
 .method public static s(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->Ex:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->EO:Lcom/esotericsoftware/a/a$a;
 
     const/4 v1, 0x1
 
@@ -197,7 +197,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->Ex:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->EO:Lcom/esotericsoftware/a/a$a;
 
     const/4 v1, 0x2
 
diff --git a/com.discord/smali/com/esotericsoftware/b/a.smali b/com.discord/smali_classes2/com/esotericsoftware/b/a.smali
similarity index 86%
rename from com.discord/smali/com/esotericsoftware/b/a.smali
rename to com.discord/smali_classes2/com/esotericsoftware/b/a.smali
index 1be36b1551..484dc56c27 100644
--- a/com.discord/smali/com/esotericsoftware/b/a.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/b/a.smali
@@ -4,13 +4,7 @@
 
 
 # static fields
-.field private static final EA:Ljava/lang/ClassLoader;
-
-.field private static volatile EB:Lcom/esotericsoftware/b/a;
-
-.field private static volatile EC:Ljava/lang/reflect/Method;
-
-.field private static final Ez:Ljava/util/WeakHashMap;
+.field private static final ER:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -22,6 +16,12 @@
     .end annotation
 .end field
 
+.field private static final ES:Ljava/lang/ClassLoader;
+
+.field private static volatile ET:Lcom/esotericsoftware/b/a;
+
+.field private static volatile EU:Ljava/lang/reflect/Method;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -31,7 +31,7 @@
 
     invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
 
-    sput-object v0, Lcom/esotericsoftware/b/a;->Ez:Ljava/util/WeakHashMap;
+    sput-object v0, Lcom/esotericsoftware/b/a;->ER:Ljava/util/WeakHashMap;
 
     const-class v0, Lcom/esotericsoftware/b/a;
 
@@ -39,15 +39,15 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/esotericsoftware/b/a;->EA:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/esotericsoftware/b/a;->ES:Ljava/lang/ClassLoader;
 
     new-instance v0, Lcom/esotericsoftware/b/a;
 
-    sget-object v1, Lcom/esotericsoftware/b/a;->EA:Ljava/lang/ClassLoader;
+    sget-object v1, Lcom/esotericsoftware/b/a;->ES:Ljava/lang/ClassLoader;
 
     invoke-direct {v0, v1}, Lcom/esotericsoftware/b/a;-><init>(Ljava/lang/ClassLoader;)V
 
-    sput-object v0, Lcom/esotericsoftware/b/a;->EB:Lcom/esotericsoftware/b/a;
+    sput-object v0, Lcom/esotericsoftware/b/a;->ET:Lcom/esotericsoftware/b/a;
 
     return-void
 .end method
@@ -126,7 +126,7 @@
     return v2
 .end method
 
-.method private static eQ()Ljava/lang/reflect/Method;
+.method private static eV()Ljava/lang/reflect/Method;
     .locals 7
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -134,11 +134,11 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/esotericsoftware/b/a;->EC:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/esotericsoftware/b/a;->EU:Ljava/lang/reflect/Method;
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/b/a;->Ez:Ljava/util/WeakHashMap;
+    sget-object v0, Lcom/esotericsoftware/b/a;->ER:Ljava/util/WeakHashMap;
 
     monitor-enter v0
 
@@ -185,12 +185,12 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/esotericsoftware/b/a;->EC:Ljava/lang/reflect/Method;
+    sput-object v1, Lcom/esotericsoftware/b/a;->EU:Ljava/lang/reflect/Method;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    sget-object v1, Lcom/esotericsoftware/b/a;->EC:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/esotericsoftware/b/a;->EU:Ljava/lang/reflect/Method;
 
     invoke-virtual {v1, v5}, Ljava/lang/reflect/Method;->setAccessible(Z)V
     :try_end_1
@@ -214,7 +214,7 @@
 
     :cond_0
     :goto_0
-    sget-object v0, Lcom/esotericsoftware/b/a;->EC:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/esotericsoftware/b/a;->EU:Ljava/lang/reflect/Method;
 
     return-object v0
 .end method
@@ -226,7 +226,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/esotericsoftware/b/a;->EA:Ljava/lang/ClassLoader;
+    sget-object v0, Lcom/esotericsoftware/b/a;->ES:Ljava/lang/ClassLoader;
 
     invoke-virtual {v0, p0}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -234,26 +234,26 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p0, Lcom/esotericsoftware/b/a;->EB:Lcom/esotericsoftware/b/a;
+    sget-object p0, Lcom/esotericsoftware/b/a;->ET:Lcom/esotericsoftware/b/a;
 
     if-nez p0, :cond_1
 
-    sget-object p0, Lcom/esotericsoftware/b/a;->Ez:Ljava/util/WeakHashMap;
+    sget-object p0, Lcom/esotericsoftware/b/a;->ER:Ljava/util/WeakHashMap;
 
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/esotericsoftware/b/a;->EB:Lcom/esotericsoftware/b/a;
+    sget-object v0, Lcom/esotericsoftware/b/a;->ET:Lcom/esotericsoftware/b/a;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/esotericsoftware/b/a;
 
-    sget-object v1, Lcom/esotericsoftware/b/a;->EA:Ljava/lang/ClassLoader;
+    sget-object v1, Lcom/esotericsoftware/b/a;->ES:Ljava/lang/ClassLoader;
 
     invoke-direct {v0, v1}, Lcom/esotericsoftware/b/a;-><init>(Ljava/lang/ClassLoader;)V
 
-    sput-object v0, Lcom/esotericsoftware/b/a;->EB:Lcom/esotericsoftware/b/a;
+    sput-object v0, Lcom/esotericsoftware/b/a;->ET:Lcom/esotericsoftware/b/a;
 
     :cond_0
     monitor-exit p0
@@ -271,17 +271,17 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/esotericsoftware/b/a;->EB:Lcom/esotericsoftware/b/a;
+    sget-object p0, Lcom/esotericsoftware/b/a;->ET:Lcom/esotericsoftware/b/a;
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lcom/esotericsoftware/b/a;->Ez:Ljava/util/WeakHashMap;
+    sget-object v0, Lcom/esotericsoftware/b/a;->ER:Ljava/util/WeakHashMap;
 
     monitor-enter v0
 
     :try_start_1
-    sget-object v1, Lcom/esotericsoftware/b/a;->Ez:Ljava/util/WeakHashMap;
+    sget-object v1, Lcom/esotericsoftware/b/a;->ER:Ljava/util/WeakHashMap;
 
     invoke-virtual {v1, p0}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -304,7 +304,7 @@
     return-object v1
 
     :cond_3
-    sget-object v1, Lcom/esotericsoftware/b/a;->Ez:Ljava/util/WeakHashMap;
+    sget-object v1, Lcom/esotericsoftware/b/a;->ER:Ljava/util/WeakHashMap;
 
     invoke-virtual {v1, p0}, Ljava/util/WeakHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -313,7 +313,7 @@
 
     invoke-direct {v1, p0}, Lcom/esotericsoftware/b/a;-><init>(Ljava/lang/ClassLoader;)V
 
-    sget-object v2, Lcom/esotericsoftware/b/a;->Ez:Ljava/util/WeakHashMap;
+    sget-object v2, Lcom/esotericsoftware/b/a;->ER:Ljava/util/WeakHashMap;
 
     new-instance v3, Ljava/lang/ref/WeakReference;
 
@@ -373,7 +373,7 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/esotericsoftware/b/a;->eQ()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/esotericsoftware/b/a;->eV()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/esotericsoftware/b/b.smali b/com.discord/smali_classes2/com/esotericsoftware/b/b.smali
similarity index 94%
rename from com.discord/smali/com/esotericsoftware/b/b.smali
rename to com.discord/smali_classes2/com/esotericsoftware/b/b.smali
index e0e3fd1d1c..ea38f76697 100644
--- a/com.discord/smali/com/esotericsoftware/b/b.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/b/b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field ED:Z
+.field EV:Z
 
 
 # direct methods
@@ -324,7 +324,7 @@
 
     const/16 v11, 0x19
 
-    invoke-virtual {v10, v11, v2}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v10, v11, v2}, Lorg/a/a/t;->ai(II)V
 
     const-string v2, "<init>"
 
@@ -336,9 +336,9 @@
 
     const/16 v0, 0xb1
 
-    invoke-virtual {v10, v0}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v10, v0}, Lorg/a/a/t;->ei(I)V
 
-    invoke-virtual {v10, v3, v3}, Lorg/a/a/t;->al(II)V
+    invoke-virtual {v10, v3, v3}, Lorg/a/a/t;->ak(II)V
 
     const/4 v15, 0x1
 
@@ -362,7 +362,7 @@
 
     const/16 v10, 0x59
 
-    invoke-virtual {v0, v10}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v0, v10}, Lorg/a/a/t;->ei(I)V
 
     const-string v12, "<init>"
 
@@ -372,11 +372,11 @@
 
     const/16 v12, 0xb0
 
-    invoke-virtual {v0, v12}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v0, v12}, Lorg/a/a/t;->ei(I)V
 
     const/4 v15, 0x2
 
-    invoke-virtual {v0, v15, v3}, Lorg/a/a/t;->al(II)V
+    invoke-virtual {v0, v15, v3}, Lorg/a/a/t;->ak(II)V
 
     const/4 v0, 0x1
 
@@ -400,15 +400,15 @@
 
     invoke-virtual {v0, v2, v5}, Lorg/a/a/t;->i(ILjava/lang/String;)V
 
-    invoke-virtual {v0, v10}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v0, v10}, Lorg/a/a/t;->ei(I)V
 
-    invoke-virtual {v0, v11, v3}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v0, v11, v3}, Lorg/a/a/t;->ai(II)V
 
     const/16 v2, 0xc0
 
     invoke-virtual {v0, v2, v8}, Lorg/a/a/t;->i(ILjava/lang/String;)V
 
-    invoke-virtual {v0, v10}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v0, v10}, Lorg/a/a/t;->ei(I)V
 
     const/16 v2, 0xb6
 
@@ -422,7 +422,7 @@
 
     const/16 v2, 0x57
 
-    invoke-virtual {v0, v2}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v0, v2}, Lorg/a/a/t;->ei(I)V
 
     const-string v2, "<init>"
 
@@ -444,13 +444,13 @@
 
     invoke-virtual {v0, v13, v5, v2, v3}, Lorg/a/a/t;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v12}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v0, v12}, Lorg/a/a/t;->ei(I)V
 
     const/4 v2, 0x4
 
     const/4 v3, 0x2
 
-    invoke-virtual {v0, v2, v3}, Lorg/a/a/t;->al(II)V
+    invoke-virtual {v0, v2, v3}, Lorg/a/a/t;->ak(II)V
 
     goto :goto_4
 
@@ -461,7 +461,7 @@
 
     invoke-virtual {v0, v2, v5}, Lorg/a/a/t;->i(ILjava/lang/String;)V
 
-    invoke-virtual {v0, v10}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v0, v10}, Lorg/a/a/t;->ei(I)V
 
     const-string v2, "Not an inner class."
 
@@ -477,11 +477,11 @@
 
     const/16 v2, 0xbf
 
-    invoke-virtual {v0, v2}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v0, v2}, Lorg/a/a/t;->ei(I)V
 
     const/4 v2, 0x3
 
-    invoke-virtual {v0, v2, v3}, Lorg/a/a/t;->al(II)V
+    invoke-virtual {v0, v2, v3}, Lorg/a/a/t;->ak(II)V
 
     :goto_4
     invoke-virtual {v9}, Lorg/a/a/h;->toByteArray()[B
@@ -550,7 +550,7 @@
     throw v0
 
     :cond_7
-    iput-boolean v4, v2, Lcom/esotericsoftware/b/b;->ED:Z
+    iput-boolean v4, v2, Lcom/esotericsoftware/b/b;->EV:Z
 
     return-object v2
 
diff --git a/com.discord/smali/com/esotericsoftware/b/c.smali b/com.discord/smali_classes2/com/esotericsoftware/b/c.smali
similarity index 92%
rename from com.discord/smali/com/esotericsoftware/b/c.smali
rename to com.discord/smali_classes2/com/esotericsoftware/b/c.smali
index 7c6123c6c3..86b5411607 100644
--- a/com.discord/smali/com/esotericsoftware/b/c.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/b/c.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private EE:[Ljava/lang/String;
+.field private EW:[Ljava/lang/String;
 
-.field private EF:[Ljava/lang/Class;
+.field private EX:[Ljava/lang/Class;
 
 
 # direct methods
@@ -29,13 +29,13 @@
 
     const/16 v2, 0x59
 
-    invoke-virtual {p0, v2}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {p0, v2}, Lorg/a/a/t;->ei(I)V
 
     const-string v3, "java/lang/StringBuilder"
 
     invoke-virtual {p0, v1, v3}, Lorg/a/a/t;->i(ILjava/lang/String;)V
 
-    invoke-virtual {p0, v2}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {p0, v2}, Lorg/a/a/t;->ei(I)V
 
     const-string v1, "Field not found: "
 
@@ -53,7 +53,7 @@
 
     const/4 v6, 0x2
 
-    invoke-virtual {p0, v5, v6}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {p0, v5, v6}, Lorg/a/a/t;->ai(II)V
 
     const/16 v5, 0xb6
 
@@ -73,7 +73,7 @@
 
     const/16 v0, 0xbf
 
-    invoke-virtual {p0, v0}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {p0, v0}, Lorg/a/a/t;->ei(I)V
 
     return-object p0
 .end method
@@ -89,13 +89,13 @@
 
     const/16 v2, 0x59
 
-    invoke-virtual {p0, v2}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {p0, v2}, Lorg/a/a/t;->ei(I)V
 
     const-string v3, "java/lang/StringBuilder"
 
     invoke-virtual {p0, v1, v3}, Lorg/a/a/t;->i(ILjava/lang/String;)V
 
-    invoke-virtual {p0, v2}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {p0, v2}, Lorg/a/a/t;->ei(I)V
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -127,7 +127,7 @@
 
     const/4 v5, 0x2
 
-    invoke-virtual {p0, v4, v5}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {p0, v4, v5}, Lorg/a/a/t;->ai(II)V
 
     const/16 v4, 0xb6
 
@@ -147,7 +147,7 @@
 
     const/16 p1, 0xbf
 
-    invoke-virtual {p0, p1}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {p0, p1}, Lorg/a/a/t;->ei(I)V
 
     return-object p0
 .end method
@@ -187,7 +187,7 @@
 
     const/4 v3, 0x2
 
-    invoke-virtual {v1, v2, v3}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v1, v2, v3}, Lorg/a/a/t;->ai(II)V
 
     invoke-virtual/range {p2 .. p2}, Ljava/util/ArrayList;->isEmpty()Z
 
@@ -276,7 +276,7 @@
 
     const/16 v7, 0x19
 
-    invoke-virtual {v1, v7, v13}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v1, v7, v13}, Lorg/a/a/t;->ai(II)V
 
     const/16 v8, 0xc0
 
@@ -284,9 +284,9 @@
 
     const/4 v9, 0x3
 
-    invoke-virtual {v1, v7, v9}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v1, v7, v9}, Lorg/a/a/t;->ai(II)V
 
-    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->Jk()I
+    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->IX()I
 
     move-result v7
 
@@ -297,7 +297,7 @@
     goto/16 :goto_2
 
     :pswitch_0
-    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->Jj()Ljava/lang/String;
+    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->IW()Ljava/lang/String;
 
     move-result-object v7
 
@@ -431,7 +431,7 @@
 
     const/16 v7, 0xb1
 
-    invoke-virtual {v1, v7}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v1, v7}, Lorg/a/a/t;->ei(I)V
 
     add-int/lit8 v5, v5, 0x1
 
@@ -466,7 +466,7 @@
 
     const/4 v1, 0x4
 
-    invoke-virtual {v0, v2, v1}, Lorg/a/a/t;->al(II)V
+    invoke-virtual {v0, v2, v1}, Lorg/a/a/t;->ak(II)V
 
     return-void
 
@@ -510,7 +510,7 @@
 
     move-result-object v2
 
-    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Jk()I
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->IX()I
 
     move-result v3
 
@@ -615,7 +615,7 @@
 
     const/4 v9, 0x2
 
-    invoke-virtual {v8, v6, v9}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v8, v6, v9}, Lorg/a/a/t;->ai(II)V
 
     invoke-virtual/range {p2 .. p2}, Ljava/util/ArrayList;->isEmpty()Z
 
@@ -744,7 +744,7 @@
 
     const/16 v14, 0x19
 
-    invoke-virtual {v8, v14, v4}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v8, v14, v4}, Lorg/a/a/t;->ai(II)V
 
     const/16 v15, 0xc0
 
@@ -752,7 +752,7 @@
 
     const/4 v15, 0x3
 
-    invoke-virtual {v8, v3, v15}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v8, v3, v15}, Lorg/a/a/t;->ai(II)V
 
     const/16 v15, 0xb5
 
@@ -770,7 +770,7 @@
 
     const/16 v4, 0xb1
 
-    invoke-virtual {v8, v4}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v8, v4}, Lorg/a/a/t;->ei(I)V
 
     goto :goto_6
 
@@ -838,7 +838,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, v5, v7}, Lorg/a/a/t;->al(II)V
+    invoke-virtual {v0, v5, v7}, Lorg/a/a/t;->ak(II)V
 
     return-void
 
@@ -890,7 +890,7 @@
 
     const/4 v1, 0x2
 
-    invoke-virtual {p0, v0, v1}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {p0, v0, v1}, Lorg/a/a/t;->ai(II)V
 
     invoke-virtual {p2}, Ljava/util/ArrayList;->isEmpty()Z
 
@@ -969,7 +969,7 @@
 
     const/16 v6, 0x19
 
-    invoke-virtual {p0, v6, v5}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {p0, v6, v5}, Lorg/a/a/t;->ai(II)V
 
     const/16 v6, 0xc0
 
@@ -999,7 +999,7 @@
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lorg/a/a/aa;->Jk()I
+    invoke-virtual {v6}, Lorg/a/a/aa;->IX()I
 
     move-result v6
 
@@ -1084,7 +1084,7 @@
     :goto_2
     const/16 v6, 0xb0
 
-    invoke-virtual {p0, v6}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {p0, v6}, Lorg/a/a/t;->ei(I)V
 
     add-int/lit8 v3, v3, 0x1
 
@@ -1117,7 +1117,7 @@
 
     const/4 p1, 0x3
 
-    invoke-virtual {p0, v0, p1}, Lorg/a/a/t;->al(II)V
+    invoke-virtual {p0, v0, p1}, Lorg/a/a/t;->ak(II)V
 
     return-void
 
@@ -1159,7 +1159,7 @@
 
     move-result-object v2
 
-    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Jk()I
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->IX()I
 
     move-result v3
 
@@ -1249,7 +1249,7 @@
 
     const/4 v6, 0x2
 
-    invoke-virtual {v3, v5, v6}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v3, v5, v6}, Lorg/a/a/t;->ai(II)V
 
     invoke-virtual/range {p2 .. p2}, Ljava/util/ArrayList;->isEmpty()Z
 
@@ -1382,7 +1382,7 @@
 
     const/16 v11, 0x19
 
-    invoke-virtual {v3, v11, v5}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v3, v11, v5}, Lorg/a/a/t;->ai(II)V
 
     const/16 v11, 0xc0
 
@@ -1396,7 +1396,7 @@
 
     invoke-virtual {v3, v11, v0, v12, v2}, Lorg/a/a/t;->a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v3, v4}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v3, v4}, Lorg/a/a/t;->ei(I)V
 
     goto :goto_5
 
@@ -1468,7 +1468,7 @@
 
     const/4 v1, 0x3
 
-    invoke-virtual {v0, v5, v1}, Lorg/a/a/t;->al(II)V
+    invoke-virtual {v0, v5, v1}, Lorg/a/a/t;->ak(II)V
 
     return-void
 
@@ -1522,7 +1522,7 @@
 
     const/4 v4, 0x2
 
-    invoke-virtual {v2, v3, v4}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v2, v3, v4}, Lorg/a/a/t;->ai(II)V
 
     invoke-virtual/range {p2 .. p2}, Ljava/util/ArrayList;->isEmpty()Z
 
@@ -1635,7 +1635,7 @@
 
     const/16 v8, 0x19
 
-    invoke-virtual {v2, v8, v15}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v2, v8, v15}, Lorg/a/a/t;->ai(II)V
 
     const/16 v8, 0xc0
 
@@ -1659,7 +1659,7 @@
 
     const/16 v8, 0xb0
 
-    invoke-virtual {v2, v8}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v2, v8}, Lorg/a/a/t;->ei(I)V
 
     goto :goto_3
 
@@ -1727,7 +1727,7 @@
 
     const/4 v0, 0x3
 
-    invoke-virtual {v2, v3, v0}, Lorg/a/a/t;->al(II)V
+    invoke-virtual {v2, v3, v0}, Lorg/a/a/t;->ak(II)V
 
     return-void
 .end method
@@ -1956,7 +1956,7 @@
 
     const/16 v9, 0x19
 
-    invoke-virtual {v8, v9, v3}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v8, v9, v3}, Lorg/a/a/t;->ai(II)V
 
     const/16 v3, 0xb7
 
@@ -1970,77 +1970,77 @@
 
     const/16 v3, 0xb1
 
-    invoke-virtual {v8, v3}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v8, v3}, Lorg/a/a/t;->ei(I)V
 
     const/4 v3, 0x1
 
-    invoke-virtual {v8, v3, v3}, Lorg/a/a/t;->al(II)V
+    invoke-virtual {v8, v3, v3}, Lorg/a/a/t;->ak(II)V
 
     invoke-static {v7, v4, v0}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;)V
 
     invoke-static {v7, v4, v0}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFJ:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGd:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFJ:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGd:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFL:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGf:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFL:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGf:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFM:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGg:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFM:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGg:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFN:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGh:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFN:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGh:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFP:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGj:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFP:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGj:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFQ:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGk:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFQ:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGk:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFO:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGi:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFO:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGi:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFK:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGe:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->b(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
-    sget-object v3, Lorg/a/a/aa;->bFK:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bGe:Lorg/a/a/aa;
 
     invoke-static {v7, v4, v0, v3}, Lcom/esotericsoftware/b/c;->a(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;Lorg/a/a/aa;)V
 
@@ -2067,9 +2067,9 @@
 
     check-cast v0, Lcom/esotericsoftware/b/c;
 
-    iput-object v1, v0, Lcom/esotericsoftware/b/c;->EE:[Ljava/lang/String;
+    iput-object v1, v0, Lcom/esotericsoftware/b/c;->EW:[Ljava/lang/String;
 
-    iput-object v2, v0, Lcom/esotericsoftware/b/c;->EF:[Ljava/lang/Class;
+    iput-object v2, v0, Lcom/esotericsoftware/b/c;->EX:[Ljava/lang/Class;
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
@@ -2111,40 +2111,40 @@
 
 
 # virtual methods
-.method public abstract eR()Ljava/lang/Object;
+.method public abstract eW()Ljava/lang/Object;
 .end method
 
-.method public abstract eS()Ljava/lang/String;
+.method public abstract eX()Ljava/lang/String;
 .end method
 
-.method public abstract eT()C
+.method public abstract eY()C
 .end method
 
-.method public abstract eU()Z
+.method public abstract eZ()Z
 .end method
 
-.method public abstract eV()B
+.method public abstract fa()B
 .end method
 
-.method public abstract eW()S
+.method public abstract fb()S
 .end method
 
-.method public abstract eX()I
+.method public abstract fc()I
 .end method
 
-.method public abstract eY()J
+.method public abstract fd()J
 .end method
 
-.method public abstract eZ()D
+.method public abstract fe()D
 .end method
 
-.method public abstract fa()F
+.method public abstract ff()F
 .end method
 
 .method public final getIndex(Ljava/lang/String;)I
     .locals 3
 
-    iget-object v0, p0, Lcom/esotericsoftware/b/c;->EE:[Ljava/lang/String;
+    iget-object v0, p0, Lcom/esotericsoftware/b/c;->EW:[Ljava/lang/String;
 
     array-length v0, v0
 
@@ -2153,7 +2153,7 @@
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v2, p0, Lcom/esotericsoftware/b/c;->EE:[Ljava/lang/String;
+    iget-object v2, p0, Lcom/esotericsoftware/b/c;->EW:[Ljava/lang/String;
 
     aget-object v2, v2, v1
 
diff --git a/com.discord/smali/com/esotericsoftware/b/d.smali b/com.discord/smali_classes2/com/esotericsoftware/b/d.smali
similarity index 93%
rename from com.discord/smali/com/esotericsoftware/b/d.smali
rename to com.discord/smali_classes2/com/esotericsoftware/b/d.smali
index b0e65a0539..4b6feb8a61 100644
--- a/com.discord/smali/com/esotericsoftware/b/d.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/b/d.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private EG:[Ljava/lang/String;
+.field private EY:[Ljava/lang/String;
 
-.field private EH:[[Ljava/lang/Class;
+.field private EZ:[[Ljava/lang/Class;
 
-.field private EI:[Ljava/lang/Class;
+.field private Fa:[Ljava/lang/Class;
 
 
 # direct methods
@@ -316,7 +316,7 @@
 
     const/16 v13, 0x19
 
-    invoke-virtual {v12, v13, v7}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v12, v13, v7}, Lorg/a/a/t;->ai(II)V
 
     const-string v14, "com/esotericsoftware/reflectasm/MethodAccess"
 
@@ -330,9 +330,9 @@
 
     const/16 v11, 0xb1
 
-    invoke-virtual {v12, v11}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v12, v11}, Lorg/a/a/t;->ei(I)V
 
-    invoke-virtual {v12, v7, v7}, Lorg/a/a/t;->al(II)V
+    invoke-virtual {v12, v7, v7}, Lorg/a/a/t;->ak(II)V
 
     const/16 v17, 0x81
 
@@ -364,7 +364,7 @@
 
     const/4 v13, 0x1
 
-    invoke-virtual {v11, v12, v13}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v11, v12, v13}, Lorg/a/a/t;->ai(II)V
 
     const/16 v12, 0xc0
 
@@ -374,9 +374,9 @@
 
     const/4 v12, 0x4
 
-    invoke-virtual {v11, v13, v12}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v11, v13, v12}, Lorg/a/a/t;->ai(II)V
 
-    invoke-virtual {v11, v15, v14}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v11, v15, v14}, Lorg/a/a/t;->ai(II)V
 
     new-array v13, v3, [Lorg/a/a/r;
 
@@ -469,7 +469,7 @@
 
     const/16 v7, 0x19
 
-    invoke-virtual {v11, v7, v3}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v11, v7, v3}, Lorg/a/a/t;->ai(II)V
 
     const/4 v7, 0x0
 
@@ -498,15 +498,15 @@
 
     const/16 v6, 0x19
 
-    invoke-virtual {v11, v6, v13}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v11, v6, v13}, Lorg/a/a/t;->ai(II)V
 
     const/16 v13, 0x10
 
-    invoke-virtual {v11, v13, v3}, Lorg/a/a/t;->ai(II)V
+    invoke-virtual {v11, v13, v3}, Lorg/a/a/t;->ah(II)V
 
     const/16 v13, 0x32
 
-    invoke-virtual {v11, v13}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v11, v13}, Lorg/a/a/t;->ei(I)V
 
     aget-object v13, v7, v3
 
@@ -514,7 +514,7 @@
 
     move-result-object v13
 
-    invoke-virtual {v13}, Lorg/a/a/aa;->Jk()I
+    invoke-virtual {v13}, Lorg/a/a/aa;->IX()I
 
     move-result v22
 
@@ -530,7 +530,7 @@
     goto/16 :goto_9
 
     :pswitch_0
-    invoke-virtual {v13}, Lorg/a/a/aa;->Jj()Ljava/lang/String;
+    invoke-virtual {v13}, Lorg/a/a/aa;->IW()Ljava/lang/String;
 
     move-result-object v6
 
@@ -837,7 +837,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lorg/a/a/aa;->Jk()I
+    invoke-virtual {v3}, Lorg/a/a/aa;->IX()I
 
     move-result v3
 
@@ -939,12 +939,12 @@
     :pswitch_12
     const/4 v3, 0x1
 
-    invoke-virtual {v11, v3}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v11, v3}, Lorg/a/a/t;->ei(I)V
 
     :goto_c
     const/16 v5, 0xb0
 
-    invoke-virtual {v11, v5}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v11, v5}, Lorg/a/a/t;->ei(I)V
 
     add-int/lit8 v12, v12, 0x1
 
@@ -1003,13 +1003,13 @@
 
     const/16 v0, 0x59
 
-    invoke-virtual {v11, v0}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v11, v0}, Lorg/a/a/t;->ei(I)V
 
     const-string v3, "java/lang/StringBuilder"
 
     invoke-virtual {v11, v1, v3}, Lorg/a/a/t;->i(ILjava/lang/String;)V
 
-    invoke-virtual {v11, v0}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v11, v0}, Lorg/a/a/t;->ei(I)V
 
     const-string v0, "Method not found: "
 
@@ -1029,7 +1029,7 @@
 
     const/16 v1, 0x15
 
-    invoke-virtual {v11, v1, v0}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v11, v1, v0}, Lorg/a/a/t;->ai(II)V
 
     const-string v0, "java/lang/StringBuilder"
 
@@ -1061,11 +1061,11 @@
 
     const/16 v0, 0xbf
 
-    invoke-virtual {v11, v0}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v11, v0}, Lorg/a/a/t;->ei(I)V
 
     const/4 v0, 0x0
 
-    invoke-virtual {v11, v0, v0}, Lorg/a/a/t;->al(II)V
+    invoke-virtual {v11, v0, v0}, Lorg/a/a/t;->ak(II)V
 
     invoke-virtual {v10}, Lorg/a/a/h;->toByteArray()[B
 
@@ -1090,15 +1090,15 @@
 
     check-cast v0, Lcom/esotericsoftware/b/d;
 
-    iput-object v4, v0, Lcom/esotericsoftware/b/d;->EG:[Ljava/lang/String;
+    iput-object v4, v0, Lcom/esotericsoftware/b/d;->EY:[Ljava/lang/String;
 
     move-object/from16 v1, v31
 
-    iput-object v1, v0, Lcom/esotericsoftware/b/d;->EH:[[Ljava/lang/Class;
+    iput-object v1, v0, Lcom/esotericsoftware/b/d;->EZ:[[Ljava/lang/Class;
 
     move-object/from16 v1, v30
 
-    iput-object v1, v0, Lcom/esotericsoftware/b/d;->EI:[Ljava/lang/Class;
+    iput-object v1, v0, Lcom/esotericsoftware/b/d;->Fa:[Ljava/lang/Class;
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
@@ -1172,7 +1172,7 @@
 .method public final varargs a(Ljava/lang/String;[Ljava/lang/Class;)I
     .locals 3
 
-    iget-object v0, p0, Lcom/esotericsoftware/b/d;->EG:[Ljava/lang/String;
+    iget-object v0, p0, Lcom/esotericsoftware/b/d;->EY:[Ljava/lang/String;
 
     array-length v0, v0
 
@@ -1181,7 +1181,7 @@
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v2, p0, Lcom/esotericsoftware/b/d;->EG:[Ljava/lang/String;
+    iget-object v2, p0, Lcom/esotericsoftware/b/d;->EY:[Ljava/lang/String;
 
     aget-object v2, v2, v1
 
@@ -1191,7 +1191,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p0, Lcom/esotericsoftware/b/d;->EH:[[Ljava/lang/Class;
+    iget-object v2, p0, Lcom/esotericsoftware/b/d;->EZ:[[Ljava/lang/Class;
 
     aget-object v2, v2, v1
 
@@ -1244,5 +1244,5 @@
     goto :goto_1
 .end method
 
-.method public varargs abstract fb()Ljava/lang/Object;
+.method public varargs abstract fg()Ljava/lang/Object;
 .end method
diff --git a/com.discord/smali/com/esotericsoftware/b/e.smali b/com.discord/smali_classes2/com/esotericsoftware/b/e.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/b/e.smali
rename to com.discord/smali_classes2/com/esotericsoftware/b/e.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/ClassResolver.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/ClassResolver.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/ClassResolver.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/ClassResolver.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$1.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$1.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$1.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$1.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultSerializerEntry.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultSerializerEntry.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/Kryo$DefaultSerializerEntry.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultSerializerEntry.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/KryoCopyable.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/KryoCopyable.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/KryoCopyable.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/KryoCopyable.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/KryoSerializable.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/KryoSerializable.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/KryoSerializable.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/KryoSerializable.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/ReferenceResolver.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/ReferenceResolver.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/ReferenceResolver.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/ReferenceResolver.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Registration.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/Registration.smali
similarity index 99%
rename from com.discord/smali/com/esotericsoftware/kryo/Registration.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/Registration.smali
index 5ac7ba053a..41db218ab7 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/Registration.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/Registration.smali
@@ -110,7 +110,7 @@
 
     iput-object p1, p0, Lcom/esotericsoftware/kryo/Registration;->serializer:Lcom/esotericsoftware/kryo/Serializer;
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/StreamFactory.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/StreamFactory.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/StreamFactory.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/StreamFactory.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/factories/PseudoSerializerFactory.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/factories/PseudoSerializerFactory.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/factories/PseudoSerializerFactory.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/factories/PseudoSerializerFactory.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/factories/ReflectionSerializerFactory.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/factories/ReflectionSerializerFactory.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/factories/ReflectionSerializerFactory.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/factories/ReflectionSerializerFactory.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/factories/SerializerFactory.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/factories/SerializerFactory.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/factories/SerializerFactory.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/factories/SerializerFactory.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferInput.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/ByteBufferInput.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferInput.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/ByteBufferInput.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferInputStream.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/ByteBufferInputStream.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferInputStream.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/ByteBufferInputStream.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferOutput.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/ByteBufferOutput.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferOutput.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/ByteBufferOutput.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferOutputStream.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/ByteBufferOutputStream.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/ByteBufferOutputStream.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/ByteBufferOutputStream.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/FastInput.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/FastInput.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/FastInput.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/FastInput.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/FastOutput.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/FastOutput.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/FastOutput.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/FastOutput.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/InputChunked.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/InputChunked.smali
similarity index 98%
rename from com.discord/smali/com/esotericsoftware/kryo/io/InputChunked.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/InputChunked.smali
index d51714bed8..921dfd7af6 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/InputChunked.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/InputChunked.smali
@@ -97,7 +97,7 @@
 
     iput v2, p0, Lcom/esotericsoftware/kryo/io/InputChunked;->chunkSize:I
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -240,7 +240,7 @@
     :cond_1
     iput v1, p0, Lcom/esotericsoftware/kryo/io/InputChunked;->chunkSize:I
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_2
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/KryoDataInput.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/KryoDataInput.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/KryoDataInput.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/KryoDataInput.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/KryoDataOutput.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/KryoDataOutput.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/KryoDataOutput.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/KryoDataOutput.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/KryoObjectInput.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/KryoObjectInput.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/KryoObjectInput.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/KryoObjectInput.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/KryoObjectOutput.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/KryoObjectOutput.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/KryoObjectOutput.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/KryoObjectOutput.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/OutputChunked.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/OutputChunked.smali
similarity index 97%
rename from com.discord/smali/com/esotericsoftware/kryo/io/OutputChunked.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/OutputChunked.smali
index 07f5d4f6b6..b95ab0417c 100644
--- a/com.discord/smali/com/esotericsoftware/kryo/io/OutputChunked.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/OutputChunked.smali
@@ -52,7 +52,7 @@
 
     move-result v0
 
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v1, :cond_0
 
@@ -155,7 +155,7 @@
 
     invoke-virtual {p0}, Lcom/esotericsoftware/kryo/io/OutputChunked;->flush()V
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeInput.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/UnsafeInput.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/UnsafeInput.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/UnsafeInput.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeMemoryInput.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/UnsafeMemoryInput.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/UnsafeMemoryInput.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/UnsafeMemoryInput.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeMemoryOutput.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/UnsafeMemoryOutput.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/UnsafeMemoryOutput.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/UnsafeMemoryOutput.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/UnsafeOutput.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/UnsafeOutput.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/UnsafeOutput.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/UnsafeOutput.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/io/Util.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/Util.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/io/Util.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/io/Util.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoCallback.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/pool/KryoCallback.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/pool/KryoCallback.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/pool/KryoCallback.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoFactory.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/pool/KryoFactory.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/pool/KryoFactory.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/pool/KryoFactory.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPool$Builder.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/pool/KryoPool$Builder.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/pool/KryoPool$Builder.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/pool/KryoPool$Builder.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPool.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/pool/KryoPool.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/pool/KryoPool.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/pool/KryoPool.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/pool/KryoPoolQueueImpl.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/pool/KryoPoolQueueImpl.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/pool/KryoPoolQueueImpl.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/pool/KryoPoolQueueImpl.smali
diff --git a/com.discord/smali/com/esotericsoftware/kryo/pool/SoftReferenceQueue.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/pool/SoftReferenceQueue.smali
similarity index 100%
rename from com.discord/smali/com/esotericsoftware/kryo/pool/SoftReferenceQueue.smali
rename to com.discord/smali_classes2/com/esotericsoftware/kryo/pool/SoftReferenceQueue.smali
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmBooleanField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmBooleanField.smali
index 065043cb8f..33f5f33d71 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmBooleanField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmBooleanField.smali
@@ -44,7 +44,7 @@
 
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmBooleanField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eU()Z
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eZ()Z
 
     move-result p2
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmByteField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmByteField.smali
index 13ccf40dae..ca1e5b2266 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmByteField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmByteField.smali
@@ -44,7 +44,7 @@
 
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmByteField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eV()B
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fa()B
 
     move-result p2
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCharField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCharField.smali
index 96a2e39e0d..10fe843c13 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCharField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCharField.smali
@@ -44,7 +44,7 @@
 
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmCharField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eT()C
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eY()C
 
     move-result p2
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmDoubleField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmDoubleField.smali
index db957d8d78..1b55d55d4f 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmDoubleField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmDoubleField.smali
@@ -44,7 +44,7 @@
 
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmDoubleField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eZ()D
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fe()D
 
     move-result-wide v0
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmFloatField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmFloatField.smali
index 36badc00c8..238f89251a 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmFloatField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmFloatField.smali
@@ -44,7 +44,7 @@
 
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmFloatField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fa()F
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->ff()F
 
     move-result p2
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmIntField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmIntField.smali
index 865f8ceeec..10bd67584c 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmIntField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmIntField.smali
@@ -59,7 +59,7 @@
 
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmIntField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eX()I
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fc()I
 
     move-result p2
 
@@ -72,7 +72,7 @@
     :cond_0
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmIntField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eX()I
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fc()I
 
     move-result p2
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmLongField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmLongField.smali
index 90f1b8b0b3..1052ab6010 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmLongField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmLongField.smali
@@ -59,7 +59,7 @@
 
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmLongField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eY()J
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fd()J
 
     move-result-wide v0
 
@@ -72,7 +72,7 @@
     :cond_0
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmLongField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eY()J
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fd()J
 
     move-result-wide v0
 
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 211d067ad0..6a8a269a8f 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
@@ -43,7 +43,7 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmObjectField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {v1}, Lcom/esotericsoftware/b/c;->eR()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/esotericsoftware/b/c;->eW()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -143,7 +143,7 @@
 
     iget-object p1, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmObjectField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p1}, Lcom/esotericsoftware/b/c;->eR()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/esotericsoftware/b/c;->eW()Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmShortField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmShortField.smali
index 61b7246627..97baf68621 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmShortField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmShortField.smali
@@ -44,7 +44,7 @@
 
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmShortField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eW()S
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fb()S
 
     move-result p2
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmStringField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmStringField.smali
index 433c252730..0ff328ac70 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmStringField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmStringField.smali
@@ -44,7 +44,7 @@
 
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/AsmCacheFields$AsmStringField;->access:Lcom/esotericsoftware/b/c;
 
-    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eS()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->eX()Ljava/lang/String;
 
     move-result-object p2
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/BeanSerializer$CachedProperty.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/BeanSerializer$CachedProperty.smali
index 275d1c59e8..2684678a9d 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/BeanSerializer$CachedProperty.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/BeanSerializer$CachedProperty.smali
@@ -75,7 +75,7 @@
 
     check-cast p1, Lcom/esotericsoftware/b/d;
 
-    invoke-virtual {p1}, Lcom/esotericsoftware/b/d;->fb()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/esotericsoftware/b/d;->fg()Ljava/lang/Object;
 
     move-result-object p1
 
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 2d30b78a49..b5eb635f7b 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/BeanSerializer.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/BeanSerializer.smali
@@ -453,7 +453,7 @@
     aget-object v4, v4, v3
 
     :try_start_0
-    sget-boolean v5, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v5, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v5, :cond_0
 
@@ -686,7 +686,7 @@
     aget-object v5, v5, v4
 
     :try_start_0
-    sget-boolean v6, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v6, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v6, :cond_0
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/CompatibleFieldSerializer.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/CompatibleFieldSerializer.smali
index b1edce7827..22f5c78f12 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/CompatibleFieldSerializer.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/CompatibleFieldSerializer.smali
@@ -76,7 +76,7 @@
 
     move-result v4
 
-    sget-boolean v8, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v8, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v8, :cond_0
 
@@ -167,7 +167,7 @@
     goto :goto_2
 
     :cond_3
-    sget-boolean v6, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v6, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v6, :cond_4
 
@@ -254,7 +254,7 @@
     goto :goto_8
 
     :cond_9
-    sget-boolean v7, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v7, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v7, :cond_a
 
@@ -326,7 +326,7 @@
     :cond_e
     if-nez v8, :cond_10
 
-    sget-boolean v8, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v8, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v8, :cond_f
 
@@ -384,7 +384,7 @@
 
     invoke-virtual {p1, p0, v1}, Lcom/esotericsoftware/kryo/util/ObjectMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz p1, :cond_0
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ObjectArraySerializer.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ObjectArraySerializer.smali
index f466bf98a8..3f03f74b11 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ObjectArraySerializer.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/DefaultArraySerializers$ObjectArraySerializer.smali
@@ -319,7 +319,7 @@
 .method public setGenerics(Lcom/esotericsoftware/kryo/Kryo;[Ljava/lang/Class;)V
     .locals 1
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz p1, :cond_0
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializer.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializer.smali
index 07ee0c94b5..ef67b937c1 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializer.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializer.smali
@@ -163,7 +163,7 @@
     :catchall_0
     nop
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_1
 
@@ -232,7 +232,7 @@
 
     iput-boolean v0, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializer;->varIntsEnabled:Z
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -1111,7 +1111,7 @@
 
     :cond_2
     :goto_1
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v1, :cond_3
 
@@ -1334,7 +1334,7 @@
 
     iput-object p2, p3, Lcom/esotericsoftware/kryo/serializers/ObjectField;->generics:[Ljava/lang/Class;
 
-    sget-boolean p3, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz p3, :cond_3
 
@@ -1539,7 +1539,7 @@
 .method protected rebuildCachedFields(Z)V
     .locals 9
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -2341,7 +2341,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializerConfig.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializerConfig.smali
index 47c28df269..147cc421e8 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializerConfig.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializerConfig.smali
@@ -58,7 +58,7 @@
 
     iput-boolean v0, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;->useAsm:Z
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -202,7 +202,7 @@
 
     iput-object p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;->cachedFieldNameStrategy:Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedFieldNameStrategy;
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -237,7 +237,7 @@
 
     iput-boolean p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;->setFieldsAsAccessible:Z
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -264,7 +264,7 @@
 
     iput-boolean p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;->fieldsCanBeNull:Z
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -291,7 +291,7 @@
 
     iput-boolean p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;->fixedFieldTypes:Z
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -318,7 +318,7 @@
 
     iput-boolean p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;->ignoreSyntheticFields:Z
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -345,7 +345,7 @@
 
     iput-boolean p1, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;->optimizedGenerics:Z
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -394,7 +394,7 @@
 
     iput-boolean v0, p0, Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;->useAsm:Z
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -403,7 +403,7 @@
     invoke-static {v1, v0}, Lcom/esotericsoftware/a/a;->s(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_1
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil.smali
index 2b88dc5611..aa4c26ce6b 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializerGenericsUtil.smali
@@ -66,7 +66,7 @@
     return-object v2
 
     :cond_2
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     const-string v3, "kryo"
 
@@ -106,7 +106,7 @@
 
     aget-object v7, p0, v5
 
-    sget-boolean v8, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v8, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v8, :cond_4
 
@@ -327,7 +327,7 @@
     return-object p1
 
     :cond_0
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz p1, :cond_1
 
@@ -501,7 +501,7 @@
 
     if-lez v1, :cond_d
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     const-string v1, "kryo"
 
@@ -547,7 +547,7 @@
 
     move-result-object v6
 
-    sget-boolean v7, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v7, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v7, :cond_a
 
@@ -588,7 +588,7 @@
 
     invoke-interface {p1, v6, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-boolean v7, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v7, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v7, :cond_b
 
@@ -689,7 +689,7 @@
 
     aput-object p1, v0, v6
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz p1, :cond_c
 
@@ -906,7 +906,7 @@
     goto/16 :goto_0
 
     :cond_8
-    sget-boolean p3, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz p3, :cond_9
 
@@ -968,7 +968,7 @@
 
     move-result-object v0
 
-    sget-boolean p3, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz p3, :cond_b
 
@@ -1007,7 +1007,7 @@
     goto :goto_2
 
     :cond_b
-    sget-boolean p3, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz p3, :cond_c
 
@@ -1039,7 +1039,7 @@
 .method final newCachedFieldOfGenericType(Ljava/lang/reflect/Field;I[Ljava/lang/Class;Ljava/lang/reflect/Type;)Lcom/esotericsoftware/kryo/serializers/FieldSerializer$CachedField;
     .locals 9
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     const-string v1, "kryo"
 
@@ -1080,7 +1080,7 @@
     invoke-static {v1, v0}, Lcom/esotericsoftware/a/a;->s(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_1
 
@@ -1170,7 +1170,7 @@
     invoke-virtual {v0, v3, v4}, Lcom/esotericsoftware/kryo/serializers/Generics;->add(Ljava/lang/String;Ljava/lang/Class;)V
 
     :cond_2
-    sget-boolean v3, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v3, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v3, :cond_3
 
@@ -1245,7 +1245,7 @@
 
     iput-object v0, p2, Lcom/esotericsoftware/kryo/serializers/ObjectField;->generics:[Ljava/lang/Class;
 
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz p2, :cond_4
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl.smali
index 5e5afde6c7..18edbfe549 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/FieldSerializerUnsafeUtilImpl.smali
@@ -268,7 +268,7 @@
 
     if-le v7, v10, :cond_3
 
-    sget-boolean v6, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v6, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v6, :cond_2
 
@@ -461,7 +461,7 @@
 
     if-le v7, v5, :cond_a
 
-    sget-boolean v5, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v5, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v5, :cond_9
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/GenericsResolver.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/GenericsResolver.smali
index da670e62d3..03e880de51 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/GenericsResolver.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/GenericsResolver.smali
@@ -102,7 +102,7 @@
 .method final pushScope(Ljava/lang/Class;Lcom/esotericsoftware/kryo/serializers/Generics;)V
     .locals 2
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
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 4698a185f1..4a82c7dc4e 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField.smali
@@ -71,7 +71,7 @@
 
     iget-object p2, p0, Lcom/esotericsoftware/kryo/serializers/ObjectField;->kryo:Lcom/esotericsoftware/kryo/Kryo;
 
-    invoke-virtual {p1}, Lcom/esotericsoftware/b/c;->eR()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/esotericsoftware/b/c;->eW()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -220,7 +220,7 @@
     const-string v1, " ("
 
     :try_start_0
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v2, :cond_0
 
@@ -485,7 +485,7 @@
     const-string v1, " ("
 
     :try_start_0
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v2, :cond_0
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer.smali
index 333607863e..ad788b4813 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer.smali
@@ -106,7 +106,7 @@
 
     if-nez v4, :cond_1
 
-    sget-boolean v4, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v4, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v4, :cond_0
 
@@ -423,7 +423,7 @@
     :cond_2
     invoke-virtual {v6}, Lcom/esotericsoftware/kryo/io/InputChunked;->nextChunks()V
 
-    sget-boolean v8, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v8, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v8, :cond_7
 
@@ -453,7 +453,7 @@
 
     move-result-object v7
 
-    invoke-static {v7}, Lcom/esotericsoftware/a/a;->am(Ljava/lang/String;)V
+    invoke-static {v7}, Lcom/esotericsoftware/a/a;->ai(Ljava/lang/String;)V
 
     goto :goto_3
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/TaggedFieldSerializerConfig.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/TaggedFieldSerializerConfig.smali
index 18480a2587..9ca9d79b85 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/TaggedFieldSerializerConfig.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/TaggedFieldSerializerConfig.smali
@@ -90,7 +90,7 @@
 
     iput-boolean p1, p0, Lcom/esotericsoftware/kryo/serializers/TaggedFieldSerializerConfig;->skipUnknownTags:Z
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/util/DefaultClassResolver.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/util/DefaultClassResolver.smali
index 596335b22f..94e3084351 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/util/DefaultClassResolver.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/util/DefaultClassResolver.smali
@@ -211,7 +211,7 @@
 
     if-eqz p1, :cond_2
 
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v2, :cond_1
 
@@ -279,7 +279,7 @@
     return-object p1
 
     :cond_4
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->EN:Z
 
     const/4 v1, 0x0
 
@@ -368,7 +368,7 @@
     :catch_0
     move-exception v1
 
-    sget-boolean v3, Lcom/esotericsoftware/a/a;->Eu:Z
+    sget-boolean v3, Lcom/esotericsoftware/a/a;->EL:Z
 
     if-eqz v3, :cond_1
 
@@ -439,7 +439,7 @@
 
     invoke-virtual {v3, v0, v1}, Lcom/esotericsoftware/kryo/util/IntMap;->put(ILjava/lang/Object;)Ljava/lang/Object;
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_5
 
@@ -458,7 +458,7 @@
     goto :goto_2
 
     :cond_4
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz p1, :cond_5
 
@@ -516,7 +516,7 @@
 
     if-eq v0, v1, :cond_1
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_0
 
@@ -582,7 +582,7 @@
     goto :goto_0
 
     :cond_1
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_2
 
@@ -741,7 +741,7 @@
 
     if-nez p2, :cond_2
 
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->EN:Z
 
     const/4 v1, 0x0
 
@@ -791,7 +791,7 @@
     goto :goto_0
 
     :cond_3
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v2, :cond_4
 
@@ -859,7 +859,7 @@
 
     if-eq v0, v2, :cond_1
 
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v2, :cond_0
 
@@ -893,7 +893,7 @@
     return-void
 
     :cond_1
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v0, :cond_2
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/util/UnsafeUtil.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/util/UnsafeUtil.smali
index 03199ef537..9de1ecbc80 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/util/UnsafeUtil.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/util/UnsafeUtil.smali
@@ -207,7 +207,7 @@
 
     :cond_0
     :try_start_8
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v1, :cond_1
 
@@ -257,7 +257,7 @@
     const-wide/16 v14, 0x0
 
     :goto_5
-    sget-boolean v7, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v7, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v7, :cond_2
 
@@ -488,7 +488,7 @@
 
     check-cast v1, Ljava/lang/reflect/Field;
 
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v2, :cond_0
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/util/Util.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/util/Util.smali
index 43f19dee85..dc3b544bf7 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/util/Util.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/util/Util.smali
@@ -497,7 +497,7 @@
 
     if-nez p1, :cond_1
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz p1, :cond_0
 
@@ -596,7 +596,7 @@
 
     :cond_3
     :goto_0
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v1, :cond_4
 
@@ -671,7 +671,7 @@
 
     if-ne v1, v2, :cond_3
 
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v1, :cond_2
 
@@ -708,7 +708,7 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->Ew:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->EN:Z
 
     if-eqz v2, :cond_4
 
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 f16d6362f8..4f639109c5 100644
--- a/com.discord/smali_classes2/com/facebook/animated/gif/GifImage.smali
+++ b/com.discord/smali_classes2/com/facebook/animated/gif/GifImage.smali
@@ -8,7 +8,7 @@
 
 
 # static fields
-.field private static volatile EJ:Z
+.field private static volatile Fb:Z
 
 
 # instance fields
@@ -34,7 +34,7 @@
     return-void
 .end method
 
-.method private static declared-synchronized fc()V
+.method private static declared-synchronized fh()V
     .locals 2
 
     const-class v0, Lcom/facebook/animated/gif/GifImage;
@@ -42,17 +42,17 @@
     monitor-enter v0
 
     :try_start_0
-    sget-boolean v1, Lcom/facebook/animated/gif/GifImage;->EJ:Z
+    sget-boolean v1, Lcom/facebook/animated/gif/GifImage;->Fb:Z
 
     if-nez v1, :cond_0
 
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/facebook/animated/gif/GifImage;->EJ:Z
+    sput-boolean v1, Lcom/facebook/animated/gif/GifImage;->Fb:Z
 
     const-string v1, "gifimage"
 
-    invoke-static {v1}, Lcom/facebook/soloader/SoLoader;->aE(Ljava/lang/String;)Z
+    invoke-static {v1}, Lcom/facebook/soloader/SoLoader;->az(Ljava/lang/String;)Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -133,7 +133,7 @@
 
     move-result v6
 
-    sget v7, Lcom/facebook/imagepipeline/animated/a/b$a;->PO:I
+    sget v7, Lcom/facebook/imagepipeline/animated/a/b$a;->Qh:I
 
     invoke-virtual {v0}, Lcom/facebook/animated/gif/GifFrame;->nativeGetDisposalMode()I
 
@@ -149,7 +149,7 @@
 
     if-ne v1, v2, :cond_0
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->PS:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ql:I
 
     goto :goto_0
 
@@ -158,12 +158,12 @@
 
     if-ne v1, v2, :cond_1
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->PT:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Qm:I
 
     goto :goto_0
 
     :cond_1
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->PR:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Qk:I
 
     :goto_0
     move v8, v1
@@ -201,7 +201,7 @@
 .method public final a(Ljava/nio/ByteBuffer;)Lcom/facebook/imagepipeline/animated/a/c;
     .locals 0
 
-    invoke-static {}, Lcom/facebook/animated/gif/GifImage;->fc()V
+    invoke-static {}, Lcom/facebook/animated/gif/GifImage;->fh()V
 
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->rewind()Ljava/nio/Buffer;
 
@@ -215,7 +215,7 @@
 .method public final b(JI)Lcom/facebook/imagepipeline/animated/a/c;
     .locals 3
 
-    invoke-static {}, Lcom/facebook/animated/gif/GifImage;->fc()V
+    invoke-static {}, Lcom/facebook/animated/gif/GifImage;->fh()V
 
     const-wide/16 v0, 0x0
 
@@ -240,7 +240,7 @@
     return-object p1
 .end method
 
-.method public final fd()[I
+.method public final fi()[I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeGetFrameDurations()[I
@@ -250,7 +250,15 @@
     return-object v0
 .end method
 
-.method public final fe()I
+.method protected finalize()V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeFinalize()V
+
+    return-void
+.end method
+
+.method public final fj()I
     .locals 3
 
     invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeGetLoopCount()I
@@ -278,7 +286,7 @@
     return v2
 .end method
 
-.method public final ff()Z
+.method public final fk()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -286,7 +294,7 @@
     return v0
 .end method
 
-.method public final fg()I
+.method public final fl()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeGetSizeInBytes()I
@@ -296,14 +304,6 @@
     return v0
 .end method
 
-.method protected finalize()V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeFinalize()V
-
-    return-void
-.end method
-
 .method public final getFrameCount()I
     .locals 1
 
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 2147c557a0..5bcd818be9 100644
--- a/com.discord/smali_classes2/com/facebook/animated/webp/WebPImage.smali
+++ b/com.discord/smali_classes2/com/facebook/animated/webp/WebPImage.smali
@@ -100,12 +100,12 @@
 
     if-eqz v1, :cond_0
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->PO:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Qh:I
 
     goto :goto_0
 
     :cond_0
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->PP:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Qi:I
 
     :goto_0
     move v7, v1
@@ -116,12 +116,12 @@
 
     if-eqz v1, :cond_1
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->PS:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ql:I
 
     goto :goto_1
 
     :cond_1
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->PR:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Qk:I
 
     :goto_1
     move v8, v1
@@ -159,7 +159,7 @@
 .method public final a(Ljava/nio/ByteBuffer;)Lcom/facebook/imagepipeline/animated/a/c;
     .locals 0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fc()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fh()V
 
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->rewind()Ljava/nio/Buffer;
 
@@ -173,7 +173,7 @@
 .method public final b(JI)Lcom/facebook/imagepipeline/animated/a/c;
     .locals 3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fc()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fh()V
 
     const-wide/16 v0, 0x0
 
@@ -198,7 +198,7 @@
     return-object p1
 .end method
 
-.method public final fd()[I
+.method public final fi()[I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeGetFrameDurations()[I
@@ -208,7 +208,15 @@
     return-object v0
 .end method
 
-.method public final fe()I
+.method protected finalize()V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeFinalize()V
+
+    return-void
+.end method
+
+.method public final fj()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeGetLoopCount()I
@@ -218,7 +226,7 @@
     return v0
 .end method
 
-.method public final ff()Z
+.method public final fk()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -226,7 +234,7 @@
     return v0
 .end method
 
-.method public final fg()I
+.method public final fl()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeGetSizeInBytes()I
@@ -236,14 +244,6 @@
     return v0
 .end method
 
-.method protected finalize()V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeFinalize()V
-
-    return-void
-.end method
-
 .method public final getFrameCount()I
     .locals 1
 
diff --git a/com.discord/smali_classes2/com/facebook/b/a$1.smali b/com.discord/smali_classes2/com/facebook/b/a$1.smali
index cf074d27b0..5966a60c46 100644
--- a/com.discord/smali_classes2/com/facebook/b/a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/b/a$1.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field final synthetic HV:Z
+.field final synthetic Im:Z
 
-.field final synthetic HW:Lcom/facebook/b/e;
+.field final synthetic In:Lcom/facebook/b/e;
 
-.field final synthetic HX:Z
+.field final synthetic Io:Z
 
-.field final synthetic HY:Lcom/facebook/b/a;
+.field final synthetic Ip:Lcom/facebook/b/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/b/a;ZLcom/facebook/b/e;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/b/a$1;->HY:Lcom/facebook/b/a;
+    iput-object p1, p0, Lcom/facebook/b/a$1;->Ip:Lcom/facebook/b/a;
 
-    iput-boolean p2, p0, Lcom/facebook/b/a$1;->HV:Z
+    iput-boolean p2, p0, Lcom/facebook/b/a$1;->Im:Z
 
-    iput-object p3, p0, Lcom/facebook/b/a$1;->HW:Lcom/facebook/b/e;
+    iput-object p3, p0, Lcom/facebook/b/a$1;->In:Lcom/facebook/b/e;
 
-    iput-boolean p4, p0, Lcom/facebook/b/a$1;->HX:Z
+    iput-boolean p4, p0, Lcom/facebook/b/a$1;->Io:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,33 +49,33 @@
 .method public final run()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/b/a$1;->HV:Z
+    iget-boolean v0, p0, Lcom/facebook/b/a$1;->Im:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/b/a$1;->HW:Lcom/facebook/b/e;
+    iget-object v0, p0, Lcom/facebook/b/a$1;->In:Lcom/facebook/b/e;
 
-    iget-object v1, p0, Lcom/facebook/b/a$1;->HY:Lcom/facebook/b/a;
+    iget-object v1, p0, Lcom/facebook/b/a$1;->Ip:Lcom/facebook/b/a;
 
     invoke-interface {v0, v1}, Lcom/facebook/b/e;->b(Lcom/facebook/b/c;)V
 
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/b/a$1;->HX:Z
+    iget-boolean v0, p0, Lcom/facebook/b/a$1;->Io:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/b/a$1;->HW:Lcom/facebook/b/e;
+    iget-object v0, p0, Lcom/facebook/b/a$1;->In:Lcom/facebook/b/e;
 
-    invoke-interface {v0}, Lcom/facebook/b/e;->ga()V
+    invoke-interface {v0}, Lcom/facebook/b/e;->gf()V
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/b/a$1;->HW:Lcom/facebook/b/e;
+    iget-object v0, p0, Lcom/facebook/b/a$1;->In:Lcom/facebook/b/e;
 
-    iget-object v1, p0, Lcom/facebook/b/a$1;->HY:Lcom/facebook/b/a;
+    iget-object v1, p0, Lcom/facebook/b/a$1;->Ip:Lcom/facebook/b/a;
 
     invoke-interface {v0, v1}, Lcom/facebook/b/e;->a(Lcom/facebook/b/c;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/b/a$2.smali b/com.discord/smali_classes2/com/facebook/b/a$2.smali
index 19766f03fa..458fb6a449 100644
--- a/com.discord/smali_classes2/com/facebook/b/a$2.smali
+++ b/com.discord/smali_classes2/com/facebook/b/a$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic HY:Lcom/facebook/b/a;
+.field final synthetic Ip:Lcom/facebook/b/a;
 
-.field final synthetic HZ:Lcom/facebook/b/e;
+.field final synthetic Iq:Lcom/facebook/b/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/b/a;Lcom/facebook/b/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/b/a$2;->HY:Lcom/facebook/b/a;
+    iput-object p1, p0, Lcom/facebook/b/a$2;->Ip:Lcom/facebook/b/a;
 
-    iput-object p2, p0, Lcom/facebook/b/a$2;->HZ:Lcom/facebook/b/e;
+    iput-object p2, p0, Lcom/facebook/b/a$2;->Iq:Lcom/facebook/b/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/b/a$2;->HZ:Lcom/facebook/b/e;
+    iget-object v0, p0, Lcom/facebook/b/a$2;->Iq:Lcom/facebook/b/e;
 
-    iget-object v1, p0, Lcom/facebook/b/a$2;->HY:Lcom/facebook/b/a;
+    iget-object v1, p0, Lcom/facebook/b/a$2;->Ip:Lcom/facebook/b/a;
 
     invoke-interface {v0, v1}, Lcom/facebook/b/e;->c(Lcom/facebook/b/c;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/b/a$a.smali b/com.discord/smali_classes2/com/facebook/b/a$a.smali
index 0c99f0cf94..1eefc93ffa 100644
--- a/com.discord/smali_classes2/com/facebook/b/a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/b/a$a.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
-.field public static final Ia:I = 0x1
+.field public static final Ir:I = 0x1
 
-.field public static final Ib:I = 0x2
+.field public static final Is:I = 0x2
 
-.field public static final Ic:I = 0x3
+.field public static final It:I = 0x3
 
-.field private static final synthetic Id:[I
+.field private static final synthetic Iu:[I
 
 
 # direct methods
@@ -40,25 +40,25 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/b/a$a;->Ia:I
+    sget v1, Lcom/facebook/b/a$a;->Ir:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/b/a$a;->Ib:I
+    sget v1, Lcom/facebook/b/a$a;->Is:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/b/a$a;->Ic:I
+    sget v1, Lcom/facebook/b/a$a;->It:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/b/a$a;->Id:[I
+    sput-object v0, Lcom/facebook/b/a$a;->Iu:[I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/b/b.smali b/com.discord/smali_classes2/com/facebook/b/b.smali
index 39cdc3a5a4..ee8a653f17 100644
--- a/com.discord/smali_classes2/com/facebook/b/b.smali
+++ b/com.discord/smali_classes2/com/facebook/b/b.smali
@@ -51,7 +51,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {p1}, Lcom/facebook/b/c;->fX()Z
+    invoke-interface {p1}, Lcom/facebook/b/c;->gb()Z
 
     :cond_0
     return-void
@@ -61,7 +61,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-interface {p1}, Lcom/facebook/b/c;->fX()Z
+    invoke-interface {p1}, Lcom/facebook/b/c;->gb()Z
 
     :cond_1
     throw v1
@@ -82,14 +82,14 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-interface {p1}, Lcom/facebook/b/c;->fX()Z
+    invoke-interface {p1}, Lcom/facebook/b/c;->gb()Z
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    invoke-interface {p1}, Lcom/facebook/b/c;->fX()Z
+    invoke-interface {p1}, Lcom/facebook/b/c;->gb()Z
 
     throw v0
 .end method
@@ -127,7 +127,7 @@
     .end annotation
 .end method
 
-.method public final ga()V
+.method public final gf()V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/b/d$1.smali b/com.discord/smali_classes2/com/facebook/b/d$1.smali
index 10a3940e34..d54295ec0f 100644
--- a/com.discord/smali_classes2/com/facebook/b/d$1.smali
+++ b/com.discord/smali_classes2/com/facebook/b/d$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic Ie:Ljava/lang/Throwable;
+.field final synthetic Iv:Ljava/lang/Throwable;
 
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Throwable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/b/d$1;->Ie:Ljava/lang/Throwable;
+    iput-object p1, p0, Lcom/facebook/b/d$1;->Iv:Ljava/lang/Throwable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +46,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/b/d$1;->Ie:Ljava/lang/Throwable;
+    iget-object v0, p0, Lcom/facebook/b/d$1;->Iv:Ljava/lang/Throwable;
 
     invoke-static {v0}, Lcom/facebook/b/d;->g(Ljava/lang/Throwable;)Lcom/facebook/b/c;
 
diff --git a/com.discord/smali_classes2/com/facebook/b/d$2.smali b/com.discord/smali_classes2/com/facebook/b/d$2.smali
index db96cbbc9a..59c2f4e3a4 100644
--- a/com.discord/smali_classes2/com/facebook/b/d$2.smali
+++ b/com.discord/smali_classes2/com/facebook/b/d$2.smali
@@ -1,4 +1,4 @@
-.class final Lcom/facebook/b/d$2;
+.class public final Lcom/facebook/b/d$2;
 .super Ljava/lang/Object;
 .source "DataSources.java"
 
@@ -7,12 +7,12 @@
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/b/d;->f(Lcom/facebook/b/c;)Ljava/lang/Object;
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/facebook/b/d;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x8
+    accessFlags = 0x9
     name = null
 .end annotation
 
@@ -26,22 +26,22 @@
 
 
 # instance fields
-.field final synthetic If:Lcom/facebook/b/d$a;
+.field final synthetic Iw:Lcom/facebook/b/d$a;
 
-.field final synthetic Ig:Lcom/facebook/b/d$a;
+.field final synthetic Ix:Lcom/facebook/b/d$a;
 
 .field final synthetic val$latch:Ljava/util/concurrent/CountDownLatch;
 
 
 # direct methods
-.method constructor <init>(Lcom/facebook/b/d$a;Ljava/util/concurrent/CountDownLatch;Lcom/facebook/b/d$a;)V
+.method public constructor <init>(Lcom/facebook/b/d$a;Ljava/util/concurrent/CountDownLatch;Lcom/facebook/b/d$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/b/d$2;->If:Lcom/facebook/b/d$a;
+    iput-object p1, p0, Lcom/facebook/b/d$2;->Iw:Lcom/facebook/b/d$a;
 
     iput-object p2, p0, Lcom/facebook/b/d$2;->val$latch:Ljava/util/concurrent/CountDownLatch;
 
-    iput-object p3, p0, Lcom/facebook/b/d$2;->Ig:Lcom/facebook/b/d$a;
+    iput-object p3, p0, Lcom/facebook/b/d$2;->Ix:Lcom/facebook/b/d$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -70,7 +70,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/b/d$2;->If:Lcom/facebook/b/d$a;
+    iget-object v0, p0, Lcom/facebook/b/d$2;->Iw:Lcom/facebook/b/d$a;
 
     invoke-interface {p1}, Lcom/facebook/b/c;->getResult()Ljava/lang/Object;
 
@@ -107,9 +107,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/b/d$2;->Ig:Lcom/facebook/b/d$a;
+    iget-object v0, p0, Lcom/facebook/b/d$2;->Ix:Lcom/facebook/b/d$a;
 
-    invoke-interface {p1}, Lcom/facebook/b/c;->fW()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lcom/facebook/b/c;->ga()Ljava/lang/Throwable;
 
     move-result-object p1
 
@@ -146,7 +146,7 @@
     return-void
 .end method
 
-.method public final ga()V
+.method public final gf()V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/b/d$3.smali b/com.discord/smali_classes2/com/facebook/b/d$3.smali
index 2db2570907..78dc0fb3eb 100644
--- a/com.discord/smali_classes2/com/facebook/b/d$3.smali
+++ b/com.discord/smali_classes2/com/facebook/b/d$3.smali
@@ -1,4 +1,4 @@
-.class final Lcom/facebook/b/d$3;
+.class public final Lcom/facebook/b/d$3;
 .super Ljava/lang/Object;
 .source "DataSources.java"
 
@@ -7,18 +7,18 @@
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/b/d;->f(Lcom/facebook/b/c;)Ljava/lang/Object;
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/facebook/b/d;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x8
+    accessFlags = 0x9
     name = null
 .end annotation
 
 
 # direct methods
-.method constructor <init>()V
+.method public constructor <init>()V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
diff --git a/com.discord/smali_classes2/com/facebook/b/d.smali b/com.discord/smali_classes2/com/facebook/b/d.smali
new file mode 100644
index 0000000000..fddb627b25
--- /dev/null
+++ b/com.discord/smali_classes2/com/facebook/b/d.smali
@@ -0,0 +1,36 @@
+.class public final Lcom/facebook/b/d;
+.super Ljava/lang/Object;
+.source "DataSources.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/facebook/b/d$a;
+    }
+.end annotation
+
+
+# direct methods
+.method public static g(Ljava/lang/Throwable;)Lcom/facebook/b/c;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Throwable;",
+            ")",
+            "Lcom/facebook/b/c<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lcom/facebook/b/h;
+
+    invoke-direct {v0}, Lcom/facebook/b/h;-><init>()V
+
+    invoke-virtual {v0, p0}, Lcom/facebook/b/h;->e(Ljava/lang/Throwable;)Z
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/com/facebook/b/e.smali b/com.discord/smali_classes2/com/facebook/b/e.smali
index 30e6062337..06286631d9 100644
--- a/com.discord/smali_classes2/com/facebook/b/e.smali
+++ b/com.discord/smali_classes2/com/facebook/b/e.smali
@@ -45,7 +45,7 @@
     .end annotation
 .end method
 
-.method public abstract ga()V
+.method public abstract gf()V
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()V"
diff --git a/com.discord/smali_classes2/com/facebook/b/f$a$a.smali b/com.discord/smali_classes2/com/facebook/b/f$a$a.smali
index 939ee34e62..4640fea712 100644
--- a/com.discord/smali_classes2/com/facebook/b/f$a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/b/f$a$a.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic Il:Lcom/facebook/b/f$a;
+.field final synthetic IC:Lcom/facebook/b/f$a;
 
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/b/f$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/b/f$a$a;->Il:Lcom/facebook/b/f$a;
+    iput-object p1, p0, Lcom/facebook/b/f$a$a;->IC:Lcom/facebook/b/f$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,13 +60,13 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/facebook/b/c;->fU()Z
+    invoke-interface {p1}, Lcom/facebook/b/c;->fY()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/b/f$a$a;->Il:Lcom/facebook/b/f$a;
+    iget-object v0, p0, Lcom/facebook/b/f$a$a;->IC:Lcom/facebook/b/f$a;
 
     invoke-static {v0, p1}, Lcom/facebook/b/f$a;->b(Lcom/facebook/b/f$a;Lcom/facebook/b/c;)V
 
@@ -79,7 +79,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/b/f$a$a;->Il:Lcom/facebook/b/f$a;
+    iget-object v0, p0, Lcom/facebook/b/f$a$a;->IC:Lcom/facebook/b/f$a;
 
     invoke-static {v0, p1}, Lcom/facebook/b/f$a;->a(Lcom/facebook/b/f$a;Lcom/facebook/b/c;)V
 
@@ -97,7 +97,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/b/f$a$a;->Il:Lcom/facebook/b/f$a;
+    iget-object v0, p0, Lcom/facebook/b/f$a$a;->IC:Lcom/facebook/b/f$a;
 
     invoke-static {v0, p1}, Lcom/facebook/b/f$a;->a(Lcom/facebook/b/f$a;Lcom/facebook/b/c;)V
 
@@ -114,13 +114,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/b/f$a$a;->Il:Lcom/facebook/b/f$a;
+    iget-object v0, p0, Lcom/facebook/b/f$a$a;->IC:Lcom/facebook/b/f$a;
 
     invoke-virtual {v0}, Lcom/facebook/b/f$a;->getProgress()F
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/b/f$a$a;->Il:Lcom/facebook/b/f$a;
+    iget-object v1, p0, Lcom/facebook/b/f$a$a;->IC:Lcom/facebook/b/f$a;
 
     invoke-interface {p1}, Lcom/facebook/b/c;->getProgress()F
 
@@ -135,7 +135,7 @@
     return-void
 .end method
 
-.method public final ga()V
+.method public final gf()V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/b/f.smali b/com.discord/smali_classes2/com/facebook/b/f.smali
index 46776f376a..ebaa9184ba 100644
--- a/com.discord/smali_classes2/com/facebook/b/f.smali
+++ b/com.discord/smali_classes2/com/facebook/b/f.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field final Ih:Ljava/util/List;
+.field final Iy:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -64,7 +64,7 @@
 
     invoke-static {v0, v1}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/facebook/b/f;->Ih:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/b/f;->Iy:Ljava/util/List;
 
     return-void
 .end method
@@ -92,9 +92,9 @@
     :cond_1
     check-cast p1, Lcom/facebook/b/f;
 
-    iget-object v0, p0, Lcom/facebook/b/f;->Ih:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/b/f;->Iy:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/facebook/b/f;->Ih:Ljava/util/List;
+    iget-object p1, p1, Lcom/facebook/b/f;->Iy:Ljava/util/List;
 
     invoke-static {v0, p1}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -116,7 +116,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/b/f;->Ih:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/b/f;->Iy:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->hashCode()I
 
@@ -132,7 +132,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/b/f;->Ih:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/b/f;->Iy:Ljava/util/List;
 
     const-string v2, "list"
 
diff --git a/com.discord/smali_classes2/com/facebook/b/g$a$a.smali b/com.discord/smali_classes2/com/facebook/b/g$a$a.smali
index 400136a6fa..f19596056d 100644
--- a/com.discord/smali_classes2/com/facebook/b/g$a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/b/g$a$a.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field final synthetic It:Lcom/facebook/b/g$a;
+.field final synthetic IK:Lcom/facebook/b/g$a;
 
 .field private mIndex:I
 
@@ -35,7 +35,7 @@
 .method public constructor <init>(Lcom/facebook/b/g$a;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/b/g$a$a;->It:Lcom/facebook/b/g$a;
+    iput-object p1, p0, Lcom/facebook/b/g$a$a;->IK:Lcom/facebook/b/g$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,13 +56,13 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/facebook/b/c;->fU()Z
+    invoke-interface {p1}, Lcom/facebook/b/c;->fY()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/b/g$a$a;->It:Lcom/facebook/b/g$a;
+    iget-object v0, p0, Lcom/facebook/b/g$a$a;->IK:Lcom/facebook/b/g$a;
 
     iget v1, p0, Lcom/facebook/b/g$a$a;->mIndex:I
 
@@ -77,7 +77,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/b/g$a$a;->It:Lcom/facebook/b/g$a;
+    iget-object v0, p0, Lcom/facebook/b/g$a$a;->IK:Lcom/facebook/b/g$a;
 
     iget v1, p0, Lcom/facebook/b/g$a$a;->mIndex:I
 
@@ -97,7 +97,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/b/g$a$a;->It:Lcom/facebook/b/g$a;
+    iget-object v0, p0, Lcom/facebook/b/g$a$a;->IK:Lcom/facebook/b/g$a;
 
     iget v1, p0, Lcom/facebook/b/g$a$a;->mIndex:I
 
@@ -120,7 +120,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/b/g$a$a;->It:Lcom/facebook/b/g$a;
+    iget-object v0, p0, Lcom/facebook/b/g$a$a;->IK:Lcom/facebook/b/g$a;
 
     invoke-interface {p1}, Lcom/facebook/b/c;->getProgress()F
 
@@ -132,7 +132,7 @@
     return-void
 .end method
 
-.method public final ga()V
+.method public final gf()V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/b/g.smali b/com.discord/smali_classes2/com/facebook/b/g.smali
index 27dba2c45e..60de561adb 100644
--- a/com.discord/smali_classes2/com/facebook/b/g.smali
+++ b/com.discord/smali_classes2/com/facebook/b/g.smali
@@ -27,7 +27,9 @@
 
 
 # instance fields
-.field final Ih:Ljava/util/List;
+.field final ID:Z
+
+.field final Iy:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -38,8 +40,6 @@
     .end annotation
 .end field
 
-.field final Im:Z
-
 
 # direct methods
 .method public constructor <init>(Ljava/util/List;Z)V
@@ -66,11 +66,11 @@
 
     invoke-static {p2, v0}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/facebook/b/g;->Ih:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/b/g;->Iy:Ljava/util/List;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/b/g;->Im:Z
+    iput-boolean p1, p0, Lcom/facebook/b/g;->ID:Z
 
     return-void
 .end method
@@ -98,9 +98,9 @@
     :cond_1
     check-cast p1, Lcom/facebook/b/g;
 
-    iget-object v0, p0, Lcom/facebook/b/g;->Ih:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/b/g;->Iy:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/facebook/b/g;->Ih:Ljava/util/List;
+    iget-object p1, p1, Lcom/facebook/b/g;->Iy:Ljava/util/List;
 
     invoke-static {v0, p1}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -122,7 +122,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/b/g;->Ih:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/b/g;->Iy:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->hashCode()I
 
@@ -138,7 +138,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/b/g;->Ih:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/b/g;->Iy:Ljava/util/List;
 
     const-string v2, "list"
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/common/a$a.smali b/com.discord/smali_classes2/com/facebook/cache/common/a$a.smali
index 9066b182f6..93554213f7 100644
--- a/com.discord/smali_classes2/com/facebook/cache/common/a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/common/a$a.smali
@@ -23,41 +23,41 @@
 
 
 # static fields
-.field public static final EK:I = 0x1
+.field public static final Fc:I = 0x1
 
-.field public static final EL:I = 0x2
+.field public static final Fd:I = 0x2
 
-.field public static final EM:I = 0x3
+.field public static final Fe:I = 0x3
 
-.field public static final EN:I = 0x4
+.field public static final Ff:I = 0x4
 
-.field public static final EO:I = 0x5
+.field public static final Fg:I = 0x5
 
-.field public static final EP:I = 0x6
+.field public static final Fh:I = 0x6
 
-.field public static final ER:I = 0x7
+.field public static final Fi:I = 0x7
 
-.field public static final ES:I = 0x8
+.field public static final Fj:I = 0x8
 
-.field public static final ET:I = 0x9
+.field public static final Fk:I = 0x9
 
-.field public static final EU:I = 0xa
+.field public static final Fl:I = 0xa
 
-.field public static final EV:I = 0xb
+.field public static final Fm:I = 0xb
 
-.field public static final EW:I = 0xc
+.field public static final Fn:I = 0xc
 
-.field public static final EX:I = 0xd
+.field public static final Fo:I = 0xd
 
-.field public static final EY:I = 0xe
+.field public static final Fp:I = 0xe
 
-.field public static final EZ:I = 0xf
+.field public static final Fq:I = 0xf
 
-.field public static final Fa:I = 0x10
+.field public static final Fr:I = 0x10
 
-.field public static final Fb:I = 0x11
+.field public static final Fs:I = 0x11
 
-.field private static final synthetic Fc:[I
+.field private static final synthetic Ft:[I
 
 
 # direct methods
@@ -68,109 +68,109 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/cache/common/a$a;->EK:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fc:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->EL:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fd:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->EM:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fe:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->EN:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Ff:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->EO:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fg:I
 
     const/4 v2, 0x4
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->EP:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fh:I
 
     const/4 v2, 0x5
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->ER:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fi:I
 
     const/4 v2, 0x6
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->ES:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fj:I
 
     const/4 v2, 0x7
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->ET:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fk:I
 
     const/16 v2, 0x8
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->EU:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fl:I
 
     const/16 v2, 0x9
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->EV:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fm:I
 
     const/16 v2, 0xa
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->EW:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fn:I
 
     const/16 v2, 0xb
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->EX:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fo:I
 
     const/16 v2, 0xc
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->EY:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fp:I
 
     const/16 v2, 0xd
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->EZ:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fq:I
 
     const/16 v2, 0xe
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Fa:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fr:I
 
     const/16 v2, 0xf
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Fb:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fs:I
 
     const/16 v2, 0x10
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/cache/common/a$a;->Fc:[I
+    sput-object v0, Lcom/facebook/cache/common/a$a;->Ft:[I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/cache/common/b$a.smali b/com.discord/smali_classes2/com/facebook/cache/common/b$a.smali
index d78549d93b..9796efbd41 100644
--- a/com.discord/smali_classes2/com/facebook/cache/common/b$a.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/common/b$a.smali
@@ -23,15 +23,15 @@
 
 
 # static fields
-.field public static final Fd:I = 0x1
+.field public static final Fu:I = 0x1
 
-.field public static final Fe:I = 0x2
+.field public static final Fv:I = 0x2
 
-.field public static final Ff:I = 0x3
+.field public static final Fw:I = 0x3
 
-.field public static final Fg:I = 0x4
+.field public static final Fx:I = 0x4
 
-.field private static final synthetic Fh:[I
+.field private static final synthetic Fy:[I
 
 
 # direct methods
@@ -42,31 +42,31 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/cache/common/b$a;->Fd:I
+    sget v1, Lcom/facebook/cache/common/b$a;->Fu:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/b$a;->Fe:I
+    sget v1, Lcom/facebook/cache/common/b$a;->Fv:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/b$a;->Ff:I
+    sget v1, Lcom/facebook/cache/common/b$a;->Fw:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/b$a;->Fg:I
+    sget v1, Lcom/facebook/cache/common/b$a;->Fx:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/cache/common/b$a;->Fh:[I
+    sput-object v0, Lcom/facebook/cache/common/b$a;->Fy:[I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/cache/common/c.smali b/com.discord/smali_classes2/com/facebook/cache/common/c.smali
index 83be8579e5..21c7375edb 100644
--- a/com.discord/smali_classes2/com/facebook/cache/common/c.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/common/c.smali
@@ -24,7 +24,7 @@
 
     check-cast p0, Lcom/facebook/cache/common/d;
 
-    iget-object p0, p0, Lcom/facebook/cache/common/d;->Fi:Ljava/util/List;
+    iget-object p0, p0, Lcom/facebook/cache/common/d;->Fz:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -103,7 +103,7 @@
 
     check-cast p0, Lcom/facebook/cache/common/d;
 
-    iget-object p0, p0, Lcom/facebook/cache/common/d;->Fi:Ljava/util/List;
+    iget-object p0, p0, Lcom/facebook/cache/common/d;->Fz:Ljava/util/List;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/common/d.smali b/com.discord/smali_classes2/com/facebook/cache/common/d.smali
index 0c9b896430..8de6ee322a 100644
--- a/com.discord/smali_classes2/com/facebook/cache/common/d.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/common/d.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field final Fi:Ljava/util/List;
+.field final Fz:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -35,9 +35,9 @@
 
     check-cast p1, Lcom/facebook/cache/common/d;
 
-    iget-object v0, p0, Lcom/facebook/cache/common/d;->Fi:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/cache/common/d;->Fz:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/facebook/cache/common/d;->Fi:Ljava/util/List;
+    iget-object p1, p1, Lcom/facebook/cache/common/d;->Fz:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
@@ -54,7 +54,7 @@
 .method public final getUriString()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/cache/common/d;->Fi:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/cache/common/d;->Fz:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -74,7 +74,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/cache/common/d;->Fi:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/cache/common/d;->Fz:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->hashCode()I
 
@@ -92,7 +92,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/facebook/cache/common/d;->Fi:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/cache/common/d;->Fz:Ljava/util/List;
 
     invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/DiskCacheConfig$a$1.smali b/com.discord/smali_classes2/com/facebook/cache/disk/DiskCacheConfig$a$1.smali
index 76a0d5b04c..ab322d9d67 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/DiskCacheConfig$a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/DiskCacheConfig$a$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/cache/disk/DiskCacheConfig$a;->fq()Lcom/facebook/cache/disk/DiskCacheConfig;
+    value = Lcom/facebook/cache/disk/DiskCacheConfig$a;->fu()Lcom/facebook/cache/disk/DiskCacheConfig;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic FM:Lcom/facebook/cache/disk/DiskCacheConfig$a;
+.field final synthetic Gd:Lcom/facebook/cache/disk/DiskCacheConfig$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/cache/disk/DiskCacheConfig$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a$1;->FM:Lcom/facebook/cache/disk/DiskCacheConfig$a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a$1;->Gd:Lcom/facebook/cache/disk/DiskCacheConfig$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +46,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a$1;->FM:Lcom/facebook/cache/disk/DiskCacheConfig$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a$1;->Gd:Lcom/facebook/cache/disk/DiskCacheConfig$a;
 
     iget-object v0, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->mContext:Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/a$a.smali b/com.discord/smali_classes2/com/facebook/cache/disk/a$a.smali
index b0be6d2972..e7287a9bee 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/a$a.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final Fs:Ljava/util/List;
+.field final FJ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -28,14 +28,14 @@
     .end annotation
 .end field
 
-.field final synthetic Ft:Lcom/facebook/cache/disk/a;
+.field final synthetic FK:Lcom/facebook/cache/disk/a;
 
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/cache/disk/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/a$a;->Ft:Lcom/facebook/cache/disk/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$a;->FK:Lcom/facebook/cache/disk/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,7 +43,7 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/a$a;->Fs:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$a;->FJ:Ljava/util/List;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 .method public final k(Ljava/io/File;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$a;->Ft:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$a;->FK:Lcom/facebook/cache/disk/a;
 
     invoke-static {v0, p1}, Lcom/facebook/cache/disk/a;->a(Lcom/facebook/cache/disk/a;Ljava/io/File;)Lcom/facebook/cache/disk/a$c;
 
@@ -81,11 +81,11 @@
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/a$a;->Fs:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$a;->FJ:Ljava/util/List;
 
     new-instance v2, Lcom/facebook/cache/disk/a$b;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/a$c;->Fv:Ljava/lang/String;
+    iget-object v0, v0, Lcom/facebook/cache/disk/a$c;->FM:Ljava/lang/String;
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/a$b.smali b/com.discord/smali_classes2/com/facebook/cache/disk/a$b.smali
index 2d0c807c56..586c180059 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/a$b.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/a$b.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final Fu:Lcom/facebook/a/b;
+.field final FL:Lcom/facebook/a/b;
 
 .field private final id:Ljava/lang/String;
 
@@ -47,7 +47,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/a$b;->Fu:Lcom/facebook/a/b;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$b;->FL:Lcom/facebook/a/b;
 
     const-wide/16 p1, -0x1
 
@@ -87,7 +87,7 @@
 
     if-gez v4, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$b;->Fu:Lcom/facebook/a/b;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$b;->FL:Lcom/facebook/a/b;
 
     iget-object v0, v0, Lcom/facebook/a/b;->mFile:Ljava/io/File;
 
@@ -114,7 +114,7 @@
 
     if-gez v4, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$b;->Fu:Lcom/facebook/a/b;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$b;->FL:Lcom/facebook/a/b;
 
     iget-object v0, v0, Lcom/facebook/a/b;->mFile:Ljava/io/File;
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/a$c.smali b/com.discord/smali_classes2/com/facebook/cache/disk/a$c.smali
index 644014befe..6b9c738c96 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/a$c.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/a$c.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public final Fv:Ljava/lang/String;
+.field public final FM:Ljava/lang/String;
 
 .field public final type:Ljava/lang/String;
 
@@ -28,7 +28,7 @@
 
     iput-object p1, p0, Lcom/facebook/cache/disk/a$c;->type:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/facebook/cache/disk/a$c;->Fv:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/cache/disk/a$c;->FM:Ljava/lang/String;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/a$c;->Fv:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$c;->FM:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/a$e.smali b/com.discord/smali_classes2/com/facebook/cache/disk/a$e.smali
index b77f96553f..61fb0f62cf 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/a$e.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/a$e.smali
@@ -18,24 +18,24 @@
 
 
 # instance fields
-.field final synthetic Ft:Lcom/facebook/cache/disk/a;
+.field final synthetic FK:Lcom/facebook/cache/disk/a;
 
-.field private final Fw:Ljava/lang/String;
+.field private final FN:Ljava/lang/String;
 
-.field final Fx:Ljava/io/File;
+.field final FO:Ljava/io/File;
 
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/cache/disk/a;Ljava/lang/String;Ljava/io/File;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/a$e;->Ft:Lcom/facebook/cache/disk/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$e;->FK:Lcom/facebook/cache/disk/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/facebook/cache/disk/a$e;->Fw:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/cache/disk/a$e;->FN:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/facebook/cache/disk/a$e;->Fx:Ljava/io/File;
+    iput-object p3, p0, Lcom/facebook/cache/disk/a$e;->FO:Ljava/io/File;
 
     return-void
 .end method
@@ -53,7 +53,7 @@
     :try_start_0
     new-instance v0, Ljava/io/FileOutputStream;
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->Fx:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->FO:Ljava/io/File;
 
     invoke-direct {v0, v1}, Ljava/io/FileOutputStream;-><init>(Ljava/io/File;)V
     :try_end_0
@@ -68,13 +68,13 @@
 
     invoke-virtual {v1}, Lcom/facebook/common/d/c;->flush()V
 
-    iget-wide v1, v1, Lcom/facebook/common/d/c;->Gc:J
+    iget-wide v1, v1, Lcom/facebook/common/d/c;->Gt:J
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     invoke-virtual {v0}, Ljava/io/FileOutputStream;->close()V
 
-    iget-object p1, p0, Lcom/facebook/cache/disk/a$e;->Fx:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a$e;->FO:Ljava/io/File;
 
     invoke-virtual {p1}, Ljava/io/File;->length()J
 
@@ -89,7 +89,7 @@
     :cond_0
     new-instance p1, Lcom/facebook/cache/disk/a$d;
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->Fx:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->FO:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->length()J
 
@@ -109,18 +109,18 @@
     :catch_0
     move-exception p1
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->Ft:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->FK:Lcom/facebook/cache/disk/a;
 
     invoke-static {v0}, Lcom/facebook/cache/disk/a;->d(Lcom/facebook/cache/disk/a;)Lcom/facebook/cache/common/a;
 
-    sget v0, Lcom/facebook/cache/common/a$a;->ER:I
+    sget v0, Lcom/facebook/cache/common/a$a;->Fi:I
 
-    invoke-static {}, Lcom/facebook/cache/disk/a;->fl()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/cache/disk/a;->fq()Ljava/lang/Class;
 
     throw p1
 .end method
 
-.method public final fm()Lcom/facebook/a/a;
+.method public final fr()Lcom/facebook/a/a;
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -128,16 +128,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->Ft:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->FK:Lcom/facebook/cache/disk/a;
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->Fw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->FN:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/facebook/cache/disk/a;->an(Ljava/lang/String;)Ljava/io/File;
+    invoke-virtual {v0, v1}, Lcom/facebook/cache/disk/a;->aj(Ljava/lang/String;)Ljava/io/File;
 
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->Fx:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->FO:Ljava/io/File;
 
     invoke-static {v1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -248,7 +248,7 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->Ft:Lcom/facebook/cache/disk/a;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->FK:Lcom/facebook/cache/disk/a;
 
     invoke-static {v1}, Lcom/facebook/cache/disk/a;->c(Lcom/facebook/cache/disk/a;)Lcom/facebook/common/time/a;
 
@@ -284,37 +284,37 @@
 
     if-eqz v1, :cond_5
 
-    sget v1, Lcom/facebook/cache/common/a$a;->ES:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fj:I
 
     goto :goto_1
 
     :cond_5
-    sget v1, Lcom/facebook/cache/common/a$a;->EU:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fl:I
 
     goto :goto_1
 
     :cond_6
-    sget v1, Lcom/facebook/cache/common/a$a;->ET:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fk:I
 
     goto :goto_1
 
     :cond_7
-    sget v1, Lcom/facebook/cache/common/a$a;->EU:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fl:I
 
     :goto_1
-    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->Ft:Lcom/facebook/cache/disk/a;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->FK:Lcom/facebook/cache/disk/a;
 
     invoke-static {v1}, Lcom/facebook/cache/disk/a;->d(Lcom/facebook/cache/disk/a;)Lcom/facebook/cache/common/a;
 
-    invoke-static {}, Lcom/facebook/cache/disk/a;->fl()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/cache/disk/a;->fq()Ljava/lang/Class;
 
     throw v0
 .end method
 
-.method public final fn()Z
+.method public final fs()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->Fx:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->FO:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->exists()Z
 
@@ -322,7 +322,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->Fx:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->FO:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->delete()Z
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/a$f.smali b/com.discord/smali_classes2/com/facebook/cache/disk/a$f.smali
index a86d52e967..80a1f0e70f 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/a$f.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/a$f.smali
@@ -18,16 +18,16 @@
 
 
 # instance fields
-.field final synthetic Ft:Lcom/facebook/cache/disk/a;
+.field final synthetic FK:Lcom/facebook/cache/disk/a;
 
-.field private Fy:Z
+.field private FP:Z
 
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/cache/disk/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/a$f;->Ft:Lcom/facebook/cache/disk/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$f;->FK:Lcom/facebook/cache/disk/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,11 +47,11 @@
 .method public final j(Ljava/io/File;)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->Fy:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->FP:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->Ft:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->FK:Lcom/facebook/cache/disk/a;
 
     invoke-static {v0}, Lcom/facebook/cache/disk/a;->a(Lcom/facebook/cache/disk/a;)Ljava/io/File;
 
@@ -65,7 +65,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/cache/disk/a$f;->Fy:Z
+    iput-boolean p1, p0, Lcom/facebook/cache/disk/a$f;->FP:Z
 
     :cond_0
     return-void
@@ -74,11 +74,11 @@
 .method public final k(Ljava/io/File;)V
     .locals 9
 
-    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->Fy:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->FP:Z
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->Ft:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->FK:Lcom/facebook/cache/disk/a;
 
     invoke-static {v0, p1}, Lcom/facebook/cache/disk/a;->a(Lcom/facebook/cache/disk/a;Ljava/io/File;)Lcom/facebook/cache/disk/a$c;
 
@@ -106,7 +106,7 @@
 
     move-result-wide v3
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->Ft:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->FK:Lcom/facebook/cache/disk/a;
 
     invoke-static {v0}, Lcom/facebook/cache/disk/a;->c(Lcom/facebook/cache/disk/a;)Lcom/facebook/common/time/a;
 
@@ -116,7 +116,7 @@
 
     move-result-wide v5
 
-    sget-wide v7, Lcom/facebook/cache/disk/a;->Fm:J
+    sget-wide v7, Lcom/facebook/cache/disk/a;->FD:J
 
     sub-long/2addr v5, v7
 
@@ -151,7 +151,7 @@
 .method public final l(Ljava/io/File;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->Ft:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->FK:Lcom/facebook/cache/disk/a;
 
     invoke-static {v0}, Lcom/facebook/cache/disk/a;->b(Lcom/facebook/cache/disk/a;)Ljava/io/File;
 
@@ -163,18 +163,18 @@
 
     if-nez v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->Fy:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->FP:Z
 
     if-nez v0, :cond_0
 
     invoke-virtual {p1}, Ljava/io/File;->delete()Z
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->Fy:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->FP:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->Ft:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->FK:Lcom/facebook/cache/disk/a;
 
     invoke-static {v0}, Lcom/facebook/cache/disk/a;->a(Lcom/facebook/cache/disk/a;)Ljava/io/File;
 
@@ -188,7 +188,7 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/cache/disk/a$f;->Fy:Z
+    iput-boolean p1, p0, Lcom/facebook/cache/disk/a$f;->FP:Z
 
     :cond_1
     return-void
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/b$1.smali b/com.discord/smali_classes2/com/facebook/cache/disk/b$1.smali
index 7ee9d348db..f39058084f 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/b$1.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/b$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/cache/disk/b;->fo()Lcom/facebook/cache/disk/f;
+    value = Lcom/facebook/cache/disk/b;->ft()Lcom/facebook/cache/disk/f;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Fz:Lcom/facebook/cache/disk/b;
+.field final synthetic FQ:Lcom/facebook/cache/disk/b;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/cache/disk/b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/b$1;->Fz:Lcom/facebook/cache/disk/b;
+    iput-object p1, p0, Lcom/facebook/cache/disk/b$1;->FQ:Lcom/facebook/cache/disk/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/b.smali b/com.discord/smali_classes2/com/facebook/cache/disk/b.smali
index cfbc5bc6fa..58c8aa3a57 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/b.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/b.smali
@@ -17,7 +17,7 @@
 
 
 # virtual methods
-.method public final fo()Lcom/facebook/cache/disk/f;
+.method public final ft()Lcom/facebook/cache/disk/f;
     .locals 1
 
     new-instance v0, Lcom/facebook/cache/disk/b$1;
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/c$b.smali b/com.discord/smali_classes2/com/facebook/cache/disk/c$b.smali
index 93942de463..eb2eee2902 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/c$b.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/c$b.smali
@@ -23,7 +23,7 @@
     .end annotation
 .end method
 
-.method public abstract fm()Lcom/facebook/a/a;
+.method public abstract fr()Lcom/facebook/a/a;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -31,5 +31,5 @@
     .end annotation
 .end method
 
-.method public abstract fn()Z
+.method public abstract fs()Z
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/d$1.smali b/com.discord/smali_classes2/com/facebook/cache/disk/d$1.smali
index 77ce8515ba..2d6c7cb9a3 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/d$1.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/d$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Ga:Lcom/facebook/cache/disk/d;
+.field final synthetic Gr:Lcom/facebook/cache/disk/d;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/cache/disk/d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/d$1;->Ga:Lcom/facebook/cache/disk/d;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d$1;->Gr:Lcom/facebook/cache/disk/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/d$1;->Ga:Lcom/facebook/cache/disk/d;
+    iget-object v0, p0, Lcom/facebook/cache/disk/d$1;->Gr:Lcom/facebook/cache/disk/d;
 
     invoke-static {v0}, Lcom/facebook/cache/disk/d;->a(Lcom/facebook/cache/disk/d;)Ljava/lang/Object;
 
@@ -46,7 +46,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/cache/disk/d$1;->Ga:Lcom/facebook/cache/disk/d;
+    iget-object v1, p0, Lcom/facebook/cache/disk/d$1;->Gr:Lcom/facebook/cache/disk/d;
 
     invoke-static {v1}, Lcom/facebook/cache/disk/d;->b(Lcom/facebook/cache/disk/d;)Z
 
@@ -54,11 +54,11 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/d$1;->Ga:Lcom/facebook/cache/disk/d;
+    iget-object v0, p0, Lcom/facebook/cache/disk/d$1;->Gr:Lcom/facebook/cache/disk/d;
 
     invoke-static {v0}, Lcom/facebook/cache/disk/d;->c(Lcom/facebook/cache/disk/d;)Z
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/d$1;->Ga:Lcom/facebook/cache/disk/d;
+    iget-object v0, p0, Lcom/facebook/cache/disk/d$1;->Gr:Lcom/facebook/cache/disk/d;
 
     invoke-static {v0}, Lcom/facebook/cache/disk/d;->d(Lcom/facebook/cache/disk/d;)Ljava/util/concurrent/CountDownLatch;
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/d$a.smali b/com.discord/smali_classes2/com/facebook/cache/disk/d$a.smali
index d72181f74f..59e525cac7 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/d$a.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/d$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private Gb:J
+.field private Gs:J
 
-.field private Gc:J
+.field private Gt:J
 
 .field private mInitialized:Z
 
@@ -34,9 +34,9 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gb:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gs:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gc:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gt:J
 
     return-void
 .end method
@@ -53,17 +53,17 @@
 
     if-eqz v0, :cond_0
 
-    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gb:J
+    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gs:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gb:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gs:J
 
-    iget-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Gc:J
+    iget-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Gt:J
 
     add-long/2addr p1, p3
 
-    iput-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Gc:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Gt:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -86,7 +86,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gc:J
+    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gt:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -108,7 +108,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gb:J
+    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gs:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -158,9 +158,9 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gc:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gt:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gb:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Gs:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -182,9 +182,9 @@
     monitor-enter p0
 
     :try_start_0
-    iput-wide p3, p0, Lcom/facebook/cache/disk/d$a;->Gc:J
+    iput-wide p3, p0, Lcom/facebook/cache/disk/d$a;->Gt:J
 
-    iput-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Gb:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Gs:J
 
     const/4 p1, 0x1
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/d$b.smali b/com.discord/smali_classes2/com/facebook/cache/disk/d$b.smali
index 04baa964b6..3ecc294269 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/d$b.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/d$b.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field public final FP:J
+.field public final Gg:J
 
-.field public final FQ:J
+.field public final Gh:J
 
-.field public final FV:J
+.field public final Gm:J
 
 
 # direct methods
@@ -28,11 +28,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide p1, p0, Lcom/facebook/cache/disk/d$b;->FV:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d$b;->Gm:J
 
-    iput-wide p3, p0, Lcom/facebook/cache/disk/d$b;->FP:J
+    iput-wide p3, p0, Lcom/facebook/cache/disk/d$b;->Gg:J
 
-    iput-wide p5, p0, Lcom/facebook/cache/disk/d$b;->FQ:J
+    iput-wide p5, p0, Lcom/facebook/cache/disk/d$b;->Gh:J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/e.smali b/com.discord/smali_classes2/com/facebook/cache/disk/e.smali
index 39fd7a5e73..43c69ba774 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/e.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/e.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -26,9 +26,11 @@
 
 
 # instance fields
-.field private final FA:Ljava/lang/String;
+.field private final FH:Lcom/facebook/cache/common/a;
 
-.field private final FB:Lcom/facebook/common/d/k;
+.field private final FR:Ljava/lang/String;
+
+.field private final FS:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -38,9 +40,7 @@
     .end annotation
 .end field
 
-.field private final Fq:Lcom/facebook/cache/common/a;
-
-.field volatile Gd:Lcom/facebook/cache/disk/e$a;
+.field volatile Gu:Lcom/facebook/cache/disk/e$a;
 
 .field private final mVersion:I
 
@@ -51,7 +51,7 @@
 
     const-class v0, Lcom/facebook/cache/disk/e;
 
-    sput-object v0, Lcom/facebook/cache/disk/e;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/cache/disk/e;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -74,11 +74,11 @@
 
     iput p1, p0, Lcom/facebook/cache/disk/e;->mVersion:I
 
-    iput-object p4, p0, Lcom/facebook/cache/disk/e;->Fq:Lcom/facebook/cache/common/a;
+    iput-object p4, p0, Lcom/facebook/cache/disk/e;->FH:Lcom/facebook/cache/common/a;
 
-    iput-object p2, p0, Lcom/facebook/cache/disk/e;->FB:Lcom/facebook/common/d/k;
+    iput-object p2, p0, Lcom/facebook/cache/disk/e;->FS:Lcom/facebook/common/d/k;
 
-    iput-object p3, p0, Lcom/facebook/cache/disk/e;->FA:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/cache/disk/e;->FR:Ljava/lang/String;
 
     new-instance p1, Lcom/facebook/cache/disk/e$a;
 
@@ -86,12 +86,12 @@
 
     invoke-direct {p1, p2, p2}, Lcom/facebook/cache/disk/e$a;-><init>(Ljava/io/File;Lcom/facebook/cache/disk/c;)V
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/e;->Gd:Lcom/facebook/cache/disk/e$a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/e;->Gu:Lcom/facebook/cache/disk/e$a;
 
     return-void
 .end method
 
-.method private declared-synchronized ft()Lcom/facebook/cache/disk/c;
+.method private declared-synchronized fx()Lcom/facebook/cache/disk/c;
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -102,17 +102,17 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Gd:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Gu:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v1, v0, Lcom/facebook/cache/disk/e$a;->Ge:Lcom/facebook/cache/disk/c;
+    iget-object v1, v0, Lcom/facebook/cache/disk/e$a;->Gv:Lcom/facebook/cache/disk/c;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/cache/disk/e$a;->Gf:Ljava/io/File;
+    iget-object v1, v0, Lcom/facebook/cache/disk/e$a;->Gw:Ljava/io/File;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Gf:Ljava/io/File;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Gw:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->exists()Z
 
@@ -134,28 +134,28 @@
     :goto_1
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Gd:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Gu:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Ge:Lcom/facebook/cache/disk/c;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Gv:Lcom/facebook/cache/disk/c;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Gd:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Gu:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Gf:Ljava/io/File;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Gw:Ljava/io/File;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Gd:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Gu:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Gf:Ljava/io/File;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Gw:Ljava/io/File;
 
-    invoke-static {v0}, Lcom/facebook/common/c/a;->n(Ljava/io/File;)Z
+    invoke-static {v0}, Lcom/facebook/common/c/a;->m(Ljava/io/File;)Z
 
     :cond_2
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/e;->FB:Lcom/facebook/common/d/k;
+    iget-object v1, p0, Lcom/facebook/cache/disk/e;->FS:Lcom/facebook/common/d/k;
 
     invoke-interface {v1}, Lcom/facebook/common/d/k;->get()Ljava/lang/Object;
 
@@ -163,20 +163,20 @@
 
     check-cast v1, Ljava/io/File;
 
-    iget-object v2, p0, Lcom/facebook/cache/disk/e;->FA:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/cache/disk/e;->FR:Ljava/lang/String;
 
     invoke-direct {v0, v1, v2}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    invoke-static {v0}, Lcom/facebook/common/c/c;->o(Ljava/io/File;)V
+    invoke-static {v0}, Lcom/facebook/common/c/c;->n(Ljava/io/File;)V
     :try_end_1
     .catch Lcom/facebook/common/c/c$a; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    sget-object v1, Lcom/facebook/cache/disk/e;->Fl:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/cache/disk/e;->FC:Ljava/lang/Class;
 
     const-string v2, "Created cache directory %s"
 
@@ -190,7 +190,7 @@
 
     iget v2, p0, Lcom/facebook/cache/disk/e;->mVersion:I
 
-    iget-object v3, p0, Lcom/facebook/cache/disk/e;->Fq:Lcom/facebook/cache/common/a;
+    iget-object v3, p0, Lcom/facebook/cache/disk/e;->FH:Lcom/facebook/cache/common/a;
 
     invoke-direct {v1, v0, v2, v3}, Lcom/facebook/cache/disk/a;-><init>(Ljava/io/File;ILcom/facebook/cache/common/a;)V
 
@@ -198,22 +198,22 @@
 
     invoke-direct {v2, v0, v1}, Lcom/facebook/cache/disk/e$a;-><init>(Ljava/io/File;Lcom/facebook/cache/disk/c;)V
 
-    iput-object v2, p0, Lcom/facebook/cache/disk/e;->Gd:Lcom/facebook/cache/disk/e$a;
+    iput-object v2, p0, Lcom/facebook/cache/disk/e;->Gu:Lcom/facebook/cache/disk/e$a;
 
     goto :goto_2
 
     :catch_0
     move-exception v0
 
-    sget v1, Lcom/facebook/cache/common/a$a;->EV:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Fm:I
 
     throw v0
 
     :cond_3
     :goto_2
-    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Gd:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Gu:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Ge:Lcom/facebook/cache/disk/c;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Gv:Lcom/facebook/cache/disk/c;
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -245,7 +245,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->ft()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fx()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -256,7 +256,7 @@
     return-wide v0
 .end method
 
-.method public final aq(Ljava/lang/String;)J
+.method public final am(Ljava/lang/String;)J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -264,11 +264,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->ft()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fx()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
-    invoke-interface {v0, p1}, Lcom/facebook/cache/disk/c;->aq(Ljava/lang/String;)J
+    invoke-interface {v0, p1}, Lcom/facebook/cache/disk/c;->am(Ljava/lang/String;)J
 
     move-result-wide v0
 
@@ -283,7 +283,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->ft()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fx()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -302,7 +302,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->ft()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fx()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -313,15 +313,15 @@
     return-object p1
 .end method
 
-.method public final fj()V
+.method public final fo()V
     .locals 3
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->ft()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fx()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fj()V
+    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fo()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -330,7 +330,7 @@
     :catch_0
     move-exception v0
 
-    sget-object v1, Lcom/facebook/cache/disk/e;->Fl:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/cache/disk/e;->FC:Ljava/lang/Class;
 
     const-string v2, "purgeUnexpectedResources"
 
@@ -339,7 +339,7 @@
     return-void
 .end method
 
-.method public final fk()Ljava/util/Collection;
+.method public final fp()Ljava/util/Collection;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -356,11 +356,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->ft()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fx()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fk()Ljava/util/Collection;
+    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fp()Ljava/util/Collection;
 
     move-result-object v0
 
@@ -371,7 +371,7 @@
     .locals 1
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->ft()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fx()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/g.smali b/com.discord/smali_classes2/com/facebook/cache/disk/g.smali
index 68916a2c7d..40bec46b83 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/g.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/g.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract fo()Lcom/facebook/cache/disk/f;
+.method public abstract ft()Lcom/facebook/cache/disk/f;
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/i.smali b/com.discord/smali_classes2/com/facebook/cache/disk/i.smali
index a1f070c853..ecc7593263 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/i.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/i.smali
@@ -4,29 +4,29 @@
 
 
 # static fields
-.field private static final Gg:Ljava/lang/Object;
+.field private static final Gx:Ljava/lang/Object;
 
-.field private static Gh:Lcom/facebook/cache/disk/i;
+.field private static Gy:Lcom/facebook/cache/disk/i;
 
-.field private static Gi:I
+.field private static Gz:I
 
 
 # instance fields
-.field Fw:Ljava/lang/String;
+.field FN:Ljava/lang/String;
 
-.field Gj:Lcom/facebook/cache/common/CacheKey;
+.field GA:Lcom/facebook/cache/common/CacheKey;
 
-.field Gk:J
+.field GB:J
 
-.field Gl:J
+.field GC:J
 
-.field Gm:J
+.field GD:J
 
-.field Gn:Ljava/io/IOException;
+.field GE:Ljava/io/IOException;
 
-.field Go:I
+.field GF:I
 
-.field private Gp:Lcom/facebook/cache/disk/i;
+.field private GG:Lcom/facebook/cache/disk/i;
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/facebook/cache/disk/i;->Gg:Ljava/lang/Object;
+    sput-object v0, Lcom/facebook/cache/disk/i;->Gx:Ljava/lang/Object;
 
     return-void
 .end method
@@ -50,33 +50,33 @@
     return-void
 .end method
 
-.method public static fu()Lcom/facebook/cache/disk/i;
+.method public static fy()Lcom/facebook/cache/disk/i;
     .locals 3
 
-    sget-object v0, Lcom/facebook/cache/disk/i;->Gg:Ljava/lang/Object;
+    sget-object v0, Lcom/facebook/cache/disk/i;->Gx:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/cache/disk/i;->Gh:Lcom/facebook/cache/disk/i;
+    sget-object v1, Lcom/facebook/cache/disk/i;->Gy:Lcom/facebook/cache/disk/i;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/cache/disk/i;->Gh:Lcom/facebook/cache/disk/i;
+    sget-object v1, Lcom/facebook/cache/disk/i;->Gy:Lcom/facebook/cache/disk/i;
 
-    iget-object v2, v1, Lcom/facebook/cache/disk/i;->Gp:Lcom/facebook/cache/disk/i;
+    iget-object v2, v1, Lcom/facebook/cache/disk/i;->GG:Lcom/facebook/cache/disk/i;
 
-    sput-object v2, Lcom/facebook/cache/disk/i;->Gh:Lcom/facebook/cache/disk/i;
+    sput-object v2, Lcom/facebook/cache/disk/i;->Gy:Lcom/facebook/cache/disk/i;
 
     const/4 v2, 0x0
 
-    iput-object v2, v1, Lcom/facebook/cache/disk/i;->Gp:Lcom/facebook/cache/disk/i;
+    iput-object v2, v1, Lcom/facebook/cache/disk/i;->GG:Lcom/facebook/cache/disk/i;
 
-    sget v2, Lcom/facebook/cache/disk/i;->Gi:I
+    sget v2, Lcom/facebook/cache/disk/i;->Gz:I
 
     add-int/lit8 v2, v2, -0x1
 
-    sput v2, Lcom/facebook/cache/disk/i;->Gi:I
+    sput v2, Lcom/facebook/cache/disk/i;->Gz:I
 
     monitor-exit v0
 
@@ -109,23 +109,23 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/i;->Gj:Lcom/facebook/cache/common/CacheKey;
+    iput-object v0, p0, Lcom/facebook/cache/disk/i;->GA:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/i;->Fw:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/cache/disk/i;->FN:Ljava/lang/String;
 
     const-wide/16 v1, 0x0
 
-    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->Gk:J
+    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->GB:J
 
-    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->Gl:J
+    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->GC:J
 
-    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->Gm:J
+    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->GD:J
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/i;->Gn:Ljava/io/IOException;
+    iput-object v0, p0, Lcom/facebook/cache/disk/i;->GE:Ljava/io/IOException;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/cache/disk/i;->Go:I
+    iput v0, p0, Lcom/facebook/cache/disk/i;->GF:I
 
     return-void
 .end method
@@ -135,12 +135,12 @@
 .method public final recycle()V
     .locals 3
 
-    sget-object v0, Lcom/facebook/cache/disk/i;->Gg:Ljava/lang/Object;
+    sget-object v0, Lcom/facebook/cache/disk/i;->Gx:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget v1, Lcom/facebook/cache/disk/i;->Gi:I
+    sget v1, Lcom/facebook/cache/disk/i;->Gz:I
 
     const/4 v2, 0x5
 
@@ -148,22 +148,22 @@
 
     invoke-direct {p0}, Lcom/facebook/cache/disk/i;->reset()V
 
-    sget v1, Lcom/facebook/cache/disk/i;->Gi:I
+    sget v1, Lcom/facebook/cache/disk/i;->Gz:I
 
     add-int/lit8 v1, v1, 0x1
 
-    sput v1, Lcom/facebook/cache/disk/i;->Gi:I
+    sput v1, Lcom/facebook/cache/disk/i;->Gz:I
 
-    sget-object v1, Lcom/facebook/cache/disk/i;->Gh:Lcom/facebook/cache/disk/i;
+    sget-object v1, Lcom/facebook/cache/disk/i;->Gy:Lcom/facebook/cache/disk/i;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/cache/disk/i;->Gh:Lcom/facebook/cache/disk/i;
+    sget-object v1, Lcom/facebook/cache/disk/i;->Gy:Lcom/facebook/cache/disk/i;
 
-    iput-object v1, p0, Lcom/facebook/cache/disk/i;->Gp:Lcom/facebook/cache/disk/i;
+    iput-object v1, p0, Lcom/facebook/cache/disk/i;->GG:Lcom/facebook/cache/disk/i;
 
     :cond_0
-    sput-object p0, Lcom/facebook/cache/disk/i;->Gh:Lcom/facebook/cache/disk/i;
+    sput-object p0, Lcom/facebook/cache/disk/i;->Gy:Lcom/facebook/cache/disk/i;
 
     :cond_1
     monitor-exit v0
diff --git a/com.discord/smali_classes2/com/facebook/common/b/a.smali b/com.discord/smali_classes2/com/facebook/common/b/a.smali
index 6ac8c25497..9fcc0f16e2 100644
--- a/com.discord/smali_classes2/com/facebook/common/b/a.smali
+++ b/com.discord/smali_classes2/com/facebook/common/b/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final Gr:Lcom/facebook/common/b/a;
+.field private static final GI:Lcom/facebook/common/b/a;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/facebook/common/b/a;-><init>()V
 
-    sput-object v0, Lcom/facebook/common/b/a;->Gr:Lcom/facebook/common/b/a;
+    sput-object v0, Lcom/facebook/common/b/a;->GI:Lcom/facebook/common/b/a;
 
     return-void
 .end method
@@ -28,10 +28,10 @@
     return-void
 .end method
 
-.method public static fw()Lcom/facebook/common/b/a;
+.method public static fA()Lcom/facebook/common/b/a;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/b/a;->Gr:Lcom/facebook/common/b/a;
+    sget-object v0, Lcom/facebook/common/b/a;->GI:Lcom/facebook/common/b/a;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/common/b/b$a.smali b/com.discord/smali_classes2/com/facebook/common/b/b$a.smali
index 14e8be8ed7..6dcc1be83e 100644
--- a/com.discord/smali_classes2/com/facebook/common/b/b$a.smali
+++ b/com.discord/smali_classes2/com/facebook/common/b/b$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Gx:Lcom/facebook/common/b/b;
+.field final synthetic GO:Lcom/facebook/common/b/b;
 
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/common/b/b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/common/b/b$a;->Gx:Lcom/facebook/common/b/b;
+    iput-object p1, p0, Lcom/facebook/common/b/b$a;->GO:Lcom/facebook/common/b/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,7 +48,7 @@
     const-string v0, "%s: worker finished; %d workers left"
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/common/b/b$a;->Gx:Lcom/facebook/common/b/b;
+    iget-object v1, p0, Lcom/facebook/common/b/b$a;->GO:Lcom/facebook/common/b/b;
 
     invoke-static {v1}, Lcom/facebook/common/b/b;->a(Lcom/facebook/common/b/b;)Ljava/util/concurrent/BlockingQueue;
 
@@ -67,13 +67,13 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/facebook/common/b/b;->fy()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/b/b;->fC()Ljava/lang/Class;
 
     move-result-object v1
 
     const-string v2, "%s: Worker has nothing to run"
 
-    iget-object v3, p0, Lcom/facebook/common/b/b$a;->Gx:Lcom/facebook/common/b/b;
+    iget-object v3, p0, Lcom/facebook/common/b/b$a;->GO:Lcom/facebook/common/b/b;
 
     invoke-static {v3}, Lcom/facebook/common/b/b;->b(Lcom/facebook/common/b/b;)Ljava/lang/String;
 
@@ -84,7 +84,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/common/b/b$a;->Gx:Lcom/facebook/common/b/b;
+    iget-object v1, p0, Lcom/facebook/common/b/b$a;->GO:Lcom/facebook/common/b/b;
 
     invoke-static {v1}, Lcom/facebook/common/b/b;->c(Lcom/facebook/common/b/b;)Ljava/util/concurrent/atomic/AtomicInteger;
 
@@ -94,7 +94,7 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/facebook/common/b/b$a;->Gx:Lcom/facebook/common/b/b;
+    iget-object v2, p0, Lcom/facebook/common/b/b$a;->GO:Lcom/facebook/common/b/b;
 
     invoke-static {v2}, Lcom/facebook/common/b/b;->a(Lcom/facebook/common/b/b;)Ljava/util/concurrent/BlockingQueue;
 
@@ -106,18 +106,18 @@
 
     if-nez v2, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/common/b/b$a;->Gx:Lcom/facebook/common/b/b;
+    iget-object v0, p0, Lcom/facebook/common/b/b$a;->GO:Lcom/facebook/common/b/b;
 
     invoke-static {v0}, Lcom/facebook/common/b/b;->d(Lcom/facebook/common/b/b;)V
 
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/facebook/common/b/b;->fy()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/b/b;->fC()Ljava/lang/Class;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/common/b/b$a;->Gx:Lcom/facebook/common/b/b;
+    iget-object v3, p0, Lcom/facebook/common/b/b$a;->GO:Lcom/facebook/common/b/b;
 
     invoke-static {v3}, Lcom/facebook/common/b/b;->b(Lcom/facebook/common/b/b;)Ljava/lang/String;
 
@@ -134,7 +134,7 @@
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/facebook/common/b/b$a;->Gx:Lcom/facebook/common/b/b;
+    iget-object v2, p0, Lcom/facebook/common/b/b$a;->GO:Lcom/facebook/common/b/b;
 
     invoke-static {v2}, Lcom/facebook/common/b/b;->c(Lcom/facebook/common/b/b;)Ljava/util/concurrent/atomic/AtomicInteger;
 
@@ -144,7 +144,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/facebook/common/b/b$a;->Gx:Lcom/facebook/common/b/b;
+    iget-object v3, p0, Lcom/facebook/common/b/b$a;->GO:Lcom/facebook/common/b/b;
 
     invoke-static {v3}, Lcom/facebook/common/b/b;->a(Lcom/facebook/common/b/b;)Ljava/util/concurrent/BlockingQueue;
 
@@ -156,18 +156,18 @@
 
     if-nez v3, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/common/b/b$a;->Gx:Lcom/facebook/common/b/b;
+    iget-object v0, p0, Lcom/facebook/common/b/b$a;->GO:Lcom/facebook/common/b/b;
 
     invoke-static {v0}, Lcom/facebook/common/b/b;->d(Lcom/facebook/common/b/b;)V
 
     goto :goto_1
 
     :cond_2
-    invoke-static {}, Lcom/facebook/common/b/b;->fy()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/b/b;->fC()Ljava/lang/Class;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/common/b/b$a;->Gx:Lcom/facebook/common/b/b;
+    iget-object v4, p0, Lcom/facebook/common/b/b$a;->GO:Lcom/facebook/common/b/b;
 
     invoke-static {v4}, Lcom/facebook/common/b/b;->b(Lcom/facebook/common/b/b;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/facebook/common/b/b.smali b/com.discord/smali_classes2/com/facebook/common/b/b.smali
index 595bd4dfd9..59a05c4625 100644
--- a/com.discord/smali_classes2/com/facebook/common/b/b.smali
+++ b/com.discord/smali_classes2/com/facebook/common/b/b.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -23,9 +23,9 @@
 
 
 # instance fields
-.field private volatile Gs:I
+.field private volatile GJ:I
 
-.field private final Gt:Ljava/util/concurrent/BlockingQueue;
+.field private final GK:Ljava/util/concurrent/BlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/BlockingQueue<",
@@ -35,11 +35,11 @@
     .end annotation
 .end field
 
-.field private final Gu:Lcom/facebook/common/b/b$a;
+.field private final GL:Lcom/facebook/common/b/b$a;
 
-.field private final Gv:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final GM:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field private final Gw:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final GN:Ljava/util/concurrent/atomic/AtomicInteger;
 
 .field private final mExecutor:Ljava/util/concurrent/Executor;
 
@@ -52,7 +52,7 @@
 
     const-class v0, Lcom/facebook/common/b/b;
 
-    sput-object v0, Lcom/facebook/common/b/b;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/common/b/b;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -78,9 +78,9 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lcom/facebook/common/b/b;->Gs:I
+    iput p1, p0, Lcom/facebook/common/b/b;->GJ:I
 
-    iput-object p3, p0, Lcom/facebook/common/b/b;->Gt:Ljava/util/concurrent/BlockingQueue;
+    iput-object p3, p0, Lcom/facebook/common/b/b;->GK:Ljava/util/concurrent/BlockingQueue;
 
     new-instance p1, Lcom/facebook/common/b/b$a;
 
@@ -88,19 +88,19 @@
 
     invoke-direct {p1, p0, p2}, Lcom/facebook/common/b/b$a;-><init>(Lcom/facebook/common/b/b;B)V
 
-    iput-object p1, p0, Lcom/facebook/common/b/b;->Gu:Lcom/facebook/common/b/b$a;
+    iput-object p1, p0, Lcom/facebook/common/b/b;->GL:Lcom/facebook/common/b/b$a;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-direct {p1, p2}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object p1, p0, Lcom/facebook/common/b/b;->Gv:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lcom/facebook/common/b/b;->GM:Ljava/util/concurrent/atomic/AtomicInteger;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-direct {p1, p2}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object p1, p0, Lcom/facebook/common/b/b;->Gw:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lcom/facebook/common/b/b;->GN:Ljava/util/concurrent/atomic/AtomicInteger;
 
     return-void
 .end method
@@ -108,7 +108,7 @@
 .method static synthetic a(Lcom/facebook/common/b/b;)Ljava/util/concurrent/BlockingQueue;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/common/b/b;->Gt:Ljava/util/concurrent/BlockingQueue;
+    iget-object p0, p0, Lcom/facebook/common/b/b;->GK:Ljava/util/concurrent/BlockingQueue;
 
     return-object p0
 .end method
@@ -124,7 +124,7 @@
 .method static synthetic c(Lcom/facebook/common/b/b;)Ljava/util/concurrent/atomic/AtomicInteger;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/common/b/b;->Gv:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p0, p0, Lcom/facebook/common/b/b;->GM:Ljava/util/concurrent/atomic/AtomicInteger;
 
     return-object p0
 .end method
@@ -132,28 +132,28 @@
 .method static synthetic d(Lcom/facebook/common/b/b;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/facebook/common/b/b;->fx()V
+    invoke-direct {p0}, Lcom/facebook/common/b/b;->fB()V
 
     return-void
 .end method
 
-.method private fx()V
+.method private fB()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/common/b/b;->Gv:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/b;->GM:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
     move-result v0
 
     :goto_0
-    iget v1, p0, Lcom/facebook/common/b/b;->Gs:I
+    iget v1, p0, Lcom/facebook/common/b/b;->GJ:I
 
     if-ge v0, v1, :cond_1
 
     add-int/lit8 v1, v0, 0x1
 
-    iget-object v2, p0, Lcom/facebook/common/b/b;->Gv:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lcom/facebook/common/b/b;->GM:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
 
@@ -161,7 +161,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/b/b;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/b/b;->FC:Ljava/lang/Class;
 
     iget-object v2, p0, Lcom/facebook/common/b/b;->mName:Ljava/lang/String;
 
@@ -169,7 +169,7 @@
 
     move-result-object v1
 
-    iget v3, p0, Lcom/facebook/common/b/b;->Gs:I
+    iget v3, p0, Lcom/facebook/common/b/b;->GJ:I
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -181,14 +181,14 @@
 
     iget-object v0, p0, Lcom/facebook/common/b/b;->mExecutor:Ljava/util/concurrent/Executor;
 
-    iget-object v1, p0, Lcom/facebook/common/b/b;->Gu:Lcom/facebook/common/b/b$a;
+    iget-object v1, p0, Lcom/facebook/common/b/b;->GL:Lcom/facebook/common/b/b$a;
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
     return-void
 
     :cond_0
-    sget-object v0, Lcom/facebook/common/b/b;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/b/b;->FC:Ljava/lang/Class;
 
     iget-object v1, p0, Lcom/facebook/common/b/b;->mName:Ljava/lang/String;
 
@@ -196,7 +196,7 @@
 
     invoke-static {v0, v2, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/common/b/b;->Gv:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/b;->GM:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -208,10 +208,10 @@
     return-void
 .end method
 
-.method static synthetic fy()Ljava/lang/Class;
+.method static synthetic fC()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/b/b;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/b/b;->FC:Ljava/lang/Class;
 
     return-object v0
 .end method
@@ -238,7 +238,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/common/b/b;->Gt:Ljava/util/concurrent/BlockingQueue;
+    iget-object v0, p0, Lcom/facebook/common/b/b;->GK:Ljava/util/concurrent/BlockingQueue;
 
     invoke-interface {v0, p1}, Ljava/util/concurrent/BlockingQueue;->offer(Ljava/lang/Object;)Z
 
@@ -246,13 +246,13 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/common/b/b;->Gt:Ljava/util/concurrent/BlockingQueue;
+    iget-object p1, p0, Lcom/facebook/common/b/b;->GK:Ljava/util/concurrent/BlockingQueue;
 
     invoke-interface {p1}, Ljava/util/concurrent/BlockingQueue;->size()I
 
     move-result p1
 
-    iget-object v0, p0, Lcom/facebook/common/b/b;->Gw:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/b;->GN:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -260,7 +260,7 @@
 
     if-le p1, v0, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/common/b/b;->Gw:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/facebook/common/b/b;->GN:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v1, v0, p1}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
 
@@ -268,7 +268,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/b/b;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/b/b;->FC:Ljava/lang/Class;
 
     iget-object v1, p0, Lcom/facebook/common/b/b;->mName:Ljava/lang/String;
 
@@ -281,7 +281,7 @@
     invoke-static {v0, v2, v1, p1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/common/b/b;->fx()V
+    invoke-direct {p0}, Lcom/facebook/common/b/b;->fB()V
 
     return-void
 
@@ -300,7 +300,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/facebook/common/b/b;->Gt:Ljava/util/concurrent/BlockingQueue;
+    iget-object v1, p0, Lcom/facebook/common/b/b;->GK:Ljava/util/concurrent/BlockingQueue;
 
     invoke-interface {v1}, Ljava/util/concurrent/BlockingQueue;->size()I
 
diff --git a/com.discord/smali_classes2/com/facebook/common/c/a.smali b/com.discord/smali_classes2/com/facebook/common/c/a.smali
index 407160d17c..b8d03068ea 100644
--- a/com.discord/smali_classes2/com/facebook/common/c/a.smali
+++ b/com.discord/smali_classes2/com/facebook/common/c/a.smali
@@ -68,7 +68,7 @@
 
     aget-object v3, p0, v2
 
-    invoke-static {v3}, Lcom/facebook/common/c/a;->n(Ljava/io/File;)Z
+    invoke-static {v3}, Lcom/facebook/common/c/a;->m(Ljava/io/File;)Z
 
     move-result v3
 
@@ -82,7 +82,7 @@
     return v0
 .end method
 
-.method public static n(Ljava/io/File;)Z
+.method public static m(Ljava/io/File;)Z
     .locals 1
 
     invoke-virtual {p0}, Ljava/io/File;->isDirectory()Z
diff --git a/com.discord/smali_classes2/com/facebook/common/c/c.smali b/com.discord/smali_classes2/com/facebook/common/c/c.smali
index 2ddfac6705..d06780574a 100644
--- a/com.discord/smali_classes2/com/facebook/common/c/c.smali
+++ b/com.discord/smali_classes2/com/facebook/common/c/c.smali
@@ -15,7 +15,7 @@
 
 
 # direct methods
-.method public static o(Ljava/io/File;)V
+.method public static n(Ljava/io/File;)V
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/common/d/a.smali b/com.discord/smali_classes2/com/facebook/common/d/a.smali
index 17856097d7..fa622e6358 100644
--- a/com.discord/smali_classes2/com/facebook/common/d/a.smali
+++ b/com.discord/smali_classes2/com/facebook/common/d/a.smali
@@ -58,7 +58,7 @@
     goto :goto_1
 .end method
 
-.method public static a(Ljava/io/InputStream;Ljava/io/OutputStream;)J
+.method public static copy(Ljava/io/InputStream;Ljava/io/OutputStream;)J
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/common/d/c.smali b/com.discord/smali_classes2/com/facebook/common/d/c.smali
index 5715fd2ac6..1c6ad3a45c 100644
--- a/com.discord/smali_classes2/com/facebook/common/d/c.smali
+++ b/com.discord/smali_classes2/com/facebook/common/d/c.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public Gc:J
+.field public Gt:J
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/common/d/c;->Gc:J
+    iput-wide v0, p0, Lcom/facebook/common/d/c;->Gt:J
 
     return-void
 .end method
@@ -49,13 +49,13 @@
 
     invoke-virtual {v0, p1}, Ljava/io/OutputStream;->write(I)V
 
-    iget-wide v0, p0, Lcom/facebook/common/d/c;->Gc:J
+    iget-wide v0, p0, Lcom/facebook/common/d/c;->Gt:J
 
     const-wide/16 v2, 0x1
 
     add-long/2addr v0, v2
 
-    iput-wide v0, p0, Lcom/facebook/common/d/c;->Gc:J
+    iput-wide v0, p0, Lcom/facebook/common/d/c;->Gt:J
 
     return-void
 .end method
@@ -72,13 +72,13 @@
 
     invoke-virtual {v0, p1, p2, p3}, Ljava/io/OutputStream;->write([BII)V
 
-    iget-wide p1, p0, Lcom/facebook/common/d/c;->Gc:J
+    iget-wide p1, p0, Lcom/facebook/common/d/c;->Gt:J
 
     int-to-long v0, p3
 
     add-long/2addr p1, v0
 
-    iput-wide p1, p0, Lcom/facebook/common/d/c;->Gc:J
+    iput-wide p1, p0, Lcom/facebook/common/d/c;->Gt:J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/common/d/l$1.smali b/com.discord/smali_classes2/com/facebook/common/d/l$1.smali
index 8627217d38..d4eaa4ec38 100644
--- a/com.discord/smali_classes2/com/facebook/common/d/l$1.smali
+++ b/com.discord/smali_classes2/com/facebook/common/d/l$1.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic GH:Ljava/lang/Object;
+.field final synthetic GZ:Ljava/lang/Object;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/common/d/l$1;->GH:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/common/d/l$1;->GZ:Ljava/lang/Object;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +50,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/common/d/l$1;->GH:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/common/d/l$1;->GZ:Ljava/lang/Object;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/common/d/l.smali b/com.discord/smali_classes2/com/facebook/common/d/l.smali
index 77622a5780..15e724a8ea 100644
--- a/com.discord/smali_classes2/com/facebook/common/d/l.smali
+++ b/com.discord/smali_classes2/com/facebook/common/d/l.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final GF:Lcom/facebook/common/d/k;
+.field public static final GX:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field public static final GG:Lcom/facebook/common/d/k;
+.field public static final GY:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -33,13 +33,13 @@
 
     invoke-direct {v0}, Lcom/facebook/common/d/l$2;-><init>()V
 
-    sput-object v0, Lcom/facebook/common/d/l;->GF:Lcom/facebook/common/d/k;
+    sput-object v0, Lcom/facebook/common/d/l;->GX:Lcom/facebook/common/d/k;
 
     new-instance v0, Lcom/facebook/common/d/l$3;
 
     invoke-direct {v0}, Lcom/facebook/common/d/l$3;-><init>()V
 
-    sput-object v0, Lcom/facebook/common/d/l;->GG:Lcom/facebook/common/d/k;
+    sput-object v0, Lcom/facebook/common/d/l;->GY:Lcom/facebook/common/d/k;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/common/e/a.smali b/com.discord/smali_classes2/com/facebook/common/e/a.smali
index 0b9d645a5f..63f2ddb704 100644
--- a/com.discord/smali_classes2/com/facebook/common/e/a.smali
+++ b/com.discord/smali_classes2/com/facebook/common/e/a.smali
@@ -4,18 +4,18 @@
 
 
 # static fields
-.field private static GI:Lcom/facebook/common/e/c;
+.field private static Ha:Lcom/facebook/common/e/c;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/common/e/b;->fC()Lcom/facebook/common/e/b;
+    invoke-static {}, Lcom/facebook/common/e/b;->fG()Lcom/facebook/common/e/b;
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sput-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     return-void
 .end method
@@ -23,7 +23,7 @@
 .method public static I(I)Z
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-interface {v0, p0}, Lcom/facebook/common/e/c;->I(I)Z
 
@@ -44,7 +44,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x2
 
@@ -54,7 +54,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -79,7 +79,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x2
 
@@ -89,7 +89,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -129,7 +129,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x2
 
@@ -139,7 +139,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -232,7 +232,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x2
 
@@ -242,7 +242,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -291,7 +291,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x5
 
@@ -301,7 +301,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -327,7 +327,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x2
 
@@ -337,7 +337,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -393,7 +393,7 @@
 .method public static varargs a(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x2
 
@@ -403,7 +403,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x0
 
@@ -429,7 +429,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x5
 
@@ -439,7 +439,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -464,7 +464,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x3
 
@@ -474,7 +474,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -513,7 +513,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x6
 
@@ -523,7 +523,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -549,7 +549,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x5
 
@@ -559,7 +559,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -592,7 +592,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x6
 
@@ -602,7 +602,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -623,7 +623,7 @@
 .method public static varargs b(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x5
 
@@ -633,7 +633,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x0
 
@@ -659,7 +659,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x6
 
@@ -669,7 +669,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -694,7 +694,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x6
 
@@ -704,7 +704,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -730,7 +730,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x6
 
@@ -740,7 +740,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -761,7 +761,7 @@
 .method public static varargs c(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x6
 
@@ -771,7 +771,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x0
 
@@ -788,7 +788,7 @@
 .method public static d(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x3
 
@@ -798,7 +798,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-interface {v0, p0, p1}, Lcom/facebook/common/e/c;->d(Ljava/lang/String;Ljava/lang/String;)V
 
@@ -809,7 +809,7 @@
 .method public static d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x3
 
@@ -819,7 +819,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-interface {v0, p0, p1, p2}, Lcom/facebook/common/e/c;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
@@ -830,7 +830,7 @@
 .method public static varargs d(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x6
 
@@ -840,7 +840,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x0
 
@@ -857,7 +857,7 @@
 .method public static e(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x6
 
@@ -867,7 +867,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-interface {v0, p0, p1}, Lcom/facebook/common/e/c;->e(Ljava/lang/String;Ljava/lang/String;)V
 
@@ -878,7 +878,7 @@
 .method public static e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x6
 
@@ -888,7 +888,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-interface {v0, p0, p1, p2}, Lcom/facebook/common/e/c;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
@@ -899,7 +899,7 @@
 .method public static t(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x6
 
@@ -909,7 +909,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/e/a;->GI:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ha:Lcom/facebook/common/e/c;
 
     invoke-interface {v0, p0, p1}, Lcom/facebook/common/e/c;->t(Ljava/lang/String;Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/common/e/b.smali b/com.discord/smali_classes2/com/facebook/common/e/b.smali
index b86341c3c2..000609b9a9 100644
--- a/com.discord/smali_classes2/com/facebook/common/e/b.smali
+++ b/com.discord/smali_classes2/com/facebook/common/e/b.smali
@@ -7,13 +7,13 @@
 
 
 # static fields
-.field public static final GJ:Lcom/facebook/common/e/b;
+.field public static final Hb:Lcom/facebook/common/e/b;
 
 
 # instance fields
-.field private GK:Ljava/lang/String;
+.field private Hc:Ljava/lang/String;
 
-.field private GL:I
+.field private Hd:I
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {v0}, Lcom/facebook/common/e/b;-><init>()V
 
-    sput-object v0, Lcom/facebook/common/e/b;->GJ:Lcom/facebook/common/e/b;
+    sput-object v0, Lcom/facebook/common/e/b;->Hb:Lcom/facebook/common/e/b;
 
     return-void
 .end method
@@ -36,11 +36,11 @@
 
     const-string v0, "unknown"
 
-    iput-object v0, p0, Lcom/facebook/common/e/b;->GK:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/common/e/b;->Hc:Ljava/lang/String;
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lcom/facebook/common/e/b;->GL:I
+    iput v0, p0, Lcom/facebook/common/e/b;->Hd:I
 
     return-void
 .end method
@@ -48,7 +48,7 @@
 .method private a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 0
 
-    invoke-direct {p0, p2}, Lcom/facebook/common/e/b;->as(Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {p0, p2}, Lcom/facebook/common/e/b;->an(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -61,10 +61,10 @@
     return-void
 .end method
 
-.method private as(Ljava/lang/String;)Ljava/lang/String;
+.method private an(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/common/e/b;->GK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/common/e/b;->Hc:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -72,7 +72,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lcom/facebook/common/e/b;->GK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/common/e/b;->Hc:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -119,7 +119,7 @@
 .method private c(ILjava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    invoke-direct {p0, p2}, Lcom/facebook/common/e/b;->as(Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {p0, p2}, Lcom/facebook/common/e/b;->an(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -128,10 +128,10 @@
     return-void
 .end method
 
-.method public static fC()Lcom/facebook/common/e/b;
+.method public static fG()Lcom/facebook/common/e/b;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/e/b;->GJ:Lcom/facebook/common/e/b;
+    sget-object v0, Lcom/facebook/common/e/b;->Hb:Lcom/facebook/common/e/b;
 
     return-object v0
 .end method
@@ -168,7 +168,7 @@
 .method public final I(I)Z
     .locals 1
 
-    iget v0, p0, Lcom/facebook/common/e/b;->GL:I
+    iget v0, p0, Lcom/facebook/common/e/b;->Hd:I
 
     if-gt v0, p1, :cond_0
 
diff --git a/com.discord/smali_classes2/com/facebook/common/f/b.smali b/com.discord/smali_classes2/com/facebook/common/f/b.smali
index 21798bf645..39b52e4abe 100644
--- a/com.discord/smali_classes2/com/facebook/common/f/b.smali
+++ b/com.discord/smali_classes2/com/facebook/common/f/b.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final GN:Landroid/webkit/MimeTypeMap;
+.field private static final Hf:Landroid/webkit/MimeTypeMap;
 
-.field private static final GO:Ljava/util/Map;
+.field private static final Hg:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private static final GP:Ljava/util/Map;
+.field private static final Hh:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -37,7 +37,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/f/b;->GN:Landroid/webkit/MimeTypeMap;
+    sput-object v0, Lcom/facebook/common/f/b;->Hf:Landroid/webkit/MimeTypeMap;
 
     const-string v0, "heic"
 
@@ -51,13 +51,13 @@
 
     move-result-object v4
 
-    sput-object v4, Lcom/facebook/common/f/b;->GO:Ljava/util/Map;
+    sput-object v4, Lcom/facebook/common/f/b;->Hg:Ljava/util/Map;
 
     invoke-static {v2, v3, v0, v1}, Lcom/facebook/common/d/f;->a(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/f/b;->GP:Ljava/util/Map;
+    sput-object v0, Lcom/facebook/common/f/b;->Hh:Ljava/util/Map;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 .method public static getMimeTypeFromExtension(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/f/b;->GP:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/common/f/b;->Hh:Ljava/util/Map;
 
     invoke-interface {v0, p0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -78,7 +78,7 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/facebook/common/f/b;->GN:Landroid/webkit/MimeTypeMap;
+    sget-object v0, Lcom/facebook/common/f/b;->Hf:Landroid/webkit/MimeTypeMap;
 
     invoke-virtual {v0, p0}, Landroid/webkit/MimeTypeMap;->getMimeTypeFromExtension(Ljava/lang/String;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/facebook/common/g/c.smali b/com.discord/smali_classes2/com/facebook/common/g/c.smali
index a7c2c5019e..eddb714ae6 100644
--- a/com.discord/smali_classes2/com/facebook/common/g/c.smali
+++ b/com.discord/smali_classes2/com/facebook/common/g/c.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static GQ:Lcom/facebook/common/g/c;
+.field private static Hi:Lcom/facebook/common/g/c;
 
 
 # direct methods
@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized fD()Lcom/facebook/common/g/c;
+.method public static declared-synchronized fH()Lcom/facebook/common/g/c;
     .locals 2
 
     const-class v0, Lcom/facebook/common/g/c;
@@ -33,7 +33,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/common/g/c;->GQ:Lcom/facebook/common/g/c;
+    sget-object v1, Lcom/facebook/common/g/c;->Hi:Lcom/facebook/common/g/c;
 
     if-nez v1, :cond_0
 
@@ -41,10 +41,10 @@
 
     invoke-direct {v1}, Lcom/facebook/common/g/c;-><init>()V
 
-    sput-object v1, Lcom/facebook/common/g/c;->GQ:Lcom/facebook/common/g/c;
+    sput-object v1, Lcom/facebook/common/g/c;->Hi:Lcom/facebook/common/g/c;
 
     :cond_0
-    sget-object v1, Lcom/facebook/common/g/c;->GQ:Lcom/facebook/common/g/c;
+    sget-object v1, Lcom/facebook/common/g/c;->Hi:Lcom/facebook/common/g/c;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/facebook/common/g/e.smali b/com.discord/smali_classes2/com/facebook/common/g/e.smali
index 045f9f1cbf..c463554cbb 100644
--- a/com.discord/smali_classes2/com/facebook/common/g/e.smali
+++ b/com.discord/smali_classes2/com/facebook/common/g/e.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final GR:Ljava/io/InputStream;
+.field private final Hj:Ljava/io/InputStream;
 
-.field private final GS:[B
+.field private final Hk:[B
 
-.field private final GU:Lcom/facebook/common/references/b;
+.field private final Hl:Lcom/facebook/common/references/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/b<",
@@ -17,9 +17,9 @@
     .end annotation
 .end field
 
-.field private GV:I
+.field private Hm:I
 
-.field private GW:I
+.field private Hn:I
 
 .field private mClosed:Z
 
@@ -45,7 +45,7 @@
 
     check-cast p1, Ljava/io/InputStream;
 
-    iput-object p1, p0, Lcom/facebook/common/g/e;->GR:Ljava/io/InputStream;
+    iput-object p1, p0, Lcom/facebook/common/g/e;->Hj:Ljava/io/InputStream;
 
     invoke-static {p2}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -53,7 +53,7 @@
 
     check-cast p1, [B
 
-    iput-object p1, p0, Lcom/facebook/common/g/e;->GS:[B
+    iput-object p1, p0, Lcom/facebook/common/g/e;->Hk:[B
 
     invoke-static {p3}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -61,20 +61,20 @@
 
     check-cast p1, Lcom/facebook/common/references/b;
 
-    iput-object p1, p0, Lcom/facebook/common/g/e;->GU:Lcom/facebook/common/references/b;
+    iput-object p1, p0, Lcom/facebook/common/g/e;->Hl:Lcom/facebook/common/references/b;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/common/g/e;->GV:I
+    iput p1, p0, Lcom/facebook/common/g/e;->Hm:I
 
-    iput p1, p0, Lcom/facebook/common/g/e;->GW:I
+    iput p1, p0, Lcom/facebook/common/g/e;->Hn:I
 
     iput-boolean p1, p0, Lcom/facebook/common/g/e;->mClosed:Z
 
     return-void
 .end method
 
-.method private fE()Z
+.method private fI()Z
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -82,9 +82,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->GW:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Hn:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->GV:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Hm:I
 
     const/4 v2, 0x1
 
@@ -93,9 +93,9 @@
     return v2
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/common/g/e;->GR:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/facebook/common/g/e;->Hj:Ljava/io/InputStream;
 
-    iget-object v1, p0, Lcom/facebook/common/g/e;->GS:[B
+    iget-object v1, p0, Lcom/facebook/common/g/e;->Hk:[B
 
     invoke-virtual {v0, v1}, Ljava/io/InputStream;->read([B)I
 
@@ -108,14 +108,14 @@
     return v1
 
     :cond_1
-    iput v0, p0, Lcom/facebook/common/g/e;->GV:I
+    iput v0, p0, Lcom/facebook/common/g/e;->Hm:I
 
-    iput v1, p0, Lcom/facebook/common/g/e;->GW:I
+    iput v1, p0, Lcom/facebook/common/g/e;->Hn:I
 
     return v2
 .end method
 
-.method private fF()V
+.method private fJ()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -149,9 +149,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->GW:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Hn:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->GV:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Hm:I
 
     if-gt v0, v1, :cond_0
 
@@ -165,15 +165,15 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->fF()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->fJ()V
 
-    iget v0, p0, Lcom/facebook/common/g/e;->GV:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Hm:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->GW:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Hn:I
 
     sub-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/facebook/common/g/e;->GR:Ljava/io/InputStream;
+    iget-object v1, p0, Lcom/facebook/common/g/e;->Hj:Ljava/io/InputStream;
 
     invoke-virtual {v1}, Ljava/io/InputStream;->available()I
 
@@ -200,9 +200,9 @@
 
     iput-boolean v0, p0, Lcom/facebook/common/g/e;->mClosed:Z
 
-    iget-object v0, p0, Lcom/facebook/common/g/e;->GU:Lcom/facebook/common/references/b;
+    iget-object v0, p0, Lcom/facebook/common/g/e;->Hl:Lcom/facebook/common/references/b;
 
-    iget-object v1, p0, Lcom/facebook/common/g/e;->GS:[B
+    iget-object v1, p0, Lcom/facebook/common/g/e;->Hk:[B
 
     invoke-interface {v0, v1}, Lcom/facebook/common/references/b;->z(Ljava/lang/Object;)V
 
@@ -246,9 +246,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->GW:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Hn:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->GV:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Hm:I
 
     if-gt v0, v1, :cond_0
 
@@ -262,9 +262,9 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->fF()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->fJ()V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->fE()Z
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->fI()Z
 
     move-result v0
 
@@ -275,13 +275,13 @@
     return v0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/common/g/e;->GS:[B
+    iget-object v0, p0, Lcom/facebook/common/g/e;->Hk:[B
 
-    iget v1, p0, Lcom/facebook/common/g/e;->GW:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Hn:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lcom/facebook/common/g/e;->GW:I
+    iput v2, p0, Lcom/facebook/common/g/e;->Hn:I
 
     aget-byte v0, v0, v1
 
@@ -298,9 +298,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->GW:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Hn:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->GV:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Hm:I
 
     if-gt v0, v1, :cond_0
 
@@ -314,9 +314,9 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->fF()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->fJ()V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->fE()Z
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->fI()Z
 
     move-result v0
 
@@ -327,9 +327,9 @@
     return p1
 
     :cond_1
-    iget v0, p0, Lcom/facebook/common/g/e;->GV:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Hm:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->GW:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Hn:I
 
     sub-int/2addr v0, v1
 
@@ -337,17 +337,17 @@
 
     move-result p3
 
-    iget-object v0, p0, Lcom/facebook/common/g/e;->GS:[B
+    iget-object v0, p0, Lcom/facebook/common/g/e;->Hk:[B
 
-    iget v1, p0, Lcom/facebook/common/g/e;->GW:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Hn:I
 
     invoke-static {v0, v1, p1, p2, p3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget p1, p0, Lcom/facebook/common/g/e;->GW:I
+    iget p1, p0, Lcom/facebook/common/g/e;->Hn:I
 
     add-int/2addr p1, p3
 
-    iput p1, p0, Lcom/facebook/common/g/e;->GW:I
+    iput p1, p0, Lcom/facebook/common/g/e;->Hn:I
 
     return p3
 .end method
@@ -360,9 +360,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->GW:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Hn:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->GV:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Hm:I
 
     if-gt v0, v1, :cond_0
 
@@ -376,11 +376,11 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->fF()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->fJ()V
 
-    iget v0, p0, Lcom/facebook/common/g/e;->GV:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Hm:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->GW:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Hn:I
 
     sub-int v2, v0, v1
 
@@ -396,14 +396,14 @@
 
     long-to-int v1, v0
 
-    iput v1, p0, Lcom/facebook/common/g/e;->GW:I
+    iput v1, p0, Lcom/facebook/common/g/e;->Hn:I
 
     return-wide p1
 
     :cond_1
-    iput v0, p0, Lcom/facebook/common/g/e;->GW:I
+    iput v0, p0, Lcom/facebook/common/g/e;->Hn:I
 
-    iget-object v0, p0, Lcom/facebook/common/g/e;->GR:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/facebook/common/g/e;->Hj:Ljava/io/InputStream;
 
     sub-long/2addr p1, v2
 
diff --git a/com.discord/smali_classes2/com/facebook/common/g/g.smali b/com.discord/smali_classes2/com/facebook/common/g/g.smali
index b27fd93bf9..b89eb93b84 100644
--- a/com.discord/smali_classes2/com/facebook/common/g/g.smali
+++ b/com.discord/smali_classes2/com/facebook/common/g/g.smali
@@ -26,5 +26,5 @@
     .end annotation
 .end method
 
-.method public abstract fH()Lcom/facebook/common/g/i;
+.method public abstract fL()Lcom/facebook/common/g/i;
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/common/g/h.smali b/com.discord/smali_classes2/com/facebook/common/g/h.smali
index 111dd1ec2b..d1fe7c62bc 100644
--- a/com.discord/smali_classes2/com/facebook/common/g/h.smali
+++ b/com.discord/smali_classes2/com/facebook/common/g/h.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final GX:Lcom/facebook/common/g/f;
+.field final Ho:Lcom/facebook/common/g/f;
 
-.field GY:I
+.field Hp:I
 
 .field mOffset:I
 
@@ -31,13 +31,13 @@
 
     check-cast p1, Lcom/facebook/common/g/f;
 
-    iput-object p1, p0, Lcom/facebook/common/g/h;->GX:Lcom/facebook/common/g/f;
+    iput-object p1, p0, Lcom/facebook/common/g/h;->Ho:Lcom/facebook/common/g/f;
 
     const/4 p1, 0x0
 
     iput p1, p0, Lcom/facebook/common/g/h;->mOffset:I
 
-    iput p1, p0, Lcom/facebook/common/g/h;->GY:I
+    iput p1, p0, Lcom/facebook/common/g/h;->Hp:I
 
     return-void
 .end method
@@ -47,7 +47,7 @@
 .method public final available()I
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/common/g/h;->GX:Lcom/facebook/common/g/f;
+    iget-object v0, p0, Lcom/facebook/common/g/h;->Ho:Lcom/facebook/common/g/f;
 
     invoke-interface {v0}, Lcom/facebook/common/g/f;->size()I
 
@@ -65,7 +65,7 @@
 
     iget p1, p0, Lcom/facebook/common/g/h;->mOffset:I
 
-    iput p1, p0, Lcom/facebook/common/g/h;->GY:I
+    iput p1, p0, Lcom/facebook/common/g/h;->Hp:I
 
     return-void
 .end method
@@ -92,7 +92,7 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/common/g/h;->GX:Lcom/facebook/common/g/f;
+    iget-object v0, p0, Lcom/facebook/common/g/h;->Ho:Lcom/facebook/common/g/f;
 
     iget v1, p0, Lcom/facebook/common/g/h;->mOffset:I
 
@@ -158,7 +158,7 @@
 
     move-result p3
 
-    iget-object v0, p0, Lcom/facebook/common/g/h;->GX:Lcom/facebook/common/g/f;
+    iget-object v0, p0, Lcom/facebook/common/g/h;->Ho:Lcom/facebook/common/g/f;
 
     iget v1, p0, Lcom/facebook/common/g/h;->mOffset:I
 
@@ -209,7 +209,7 @@
 .method public final reset()V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/common/g/h;->GY:I
+    iget v0, p0, Lcom/facebook/common/g/h;->Hp:I
 
     iput v0, p0, Lcom/facebook/common/g/h;->mOffset:I
 
diff --git a/com.discord/smali_classes2/com/facebook/common/g/i.smali b/com.discord/smali_classes2/com/facebook/common/g/i.smali
index 8d2838e37a..181f5c6c7b 100644
--- a/com.discord/smali_classes2/com/facebook/common/g/i.smali
+++ b/com.discord/smali_classes2/com/facebook/common/g/i.smali
@@ -32,7 +32,7 @@
     return-void
 .end method
 
-.method public abstract fI()Lcom/facebook/common/g/f;
+.method public abstract fM()Lcom/facebook/common/g/f;
 .end method
 
 .method public abstract size()I
diff --git a/com.discord/smali_classes2/com/facebook/common/g/j.smali b/com.discord/smali_classes2/com/facebook/common/g/j.smali
index ab65968a90..a96bfe79c3 100644
--- a/com.discord/smali_classes2/com/facebook/common/g/j.smali
+++ b/com.discord/smali_classes2/com/facebook/common/g/j.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final GZ:I
+.field private final Hq:I
 
-.field private final Ha:Lcom/facebook/common/g/a;
+.field private final Hr:Lcom/facebook/common/g/a;
 
 
 # direct methods
@@ -31,16 +31,16 @@
 
     const/16 p2, 0x4000
 
-    iput p2, p0, Lcom/facebook/common/g/j;->GZ:I
+    iput p2, p0, Lcom/facebook/common/g/j;->Hq:I
 
-    iput-object p1, p0, Lcom/facebook/common/g/j;->Ha:Lcom/facebook/common/g/a;
+    iput-object p1, p0, Lcom/facebook/common/g/j;->Hr:Lcom/facebook/common/g/a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final a(Ljava/io/InputStream;Ljava/io/OutputStream;)J
+.method public final copy(Ljava/io/InputStream;Ljava/io/OutputStream;)J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -48,9 +48,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/common/g/j;->Ha:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/common/g/j;->Hr:Lcom/facebook/common/g/a;
 
-    iget v1, p0, Lcom/facebook/common/g/j;->GZ:I
+    iget v1, p0, Lcom/facebook/common/g/j;->Hq:I
 
     invoke-interface {v0, v1}, Lcom/facebook/common/g/a;->get(I)Ljava/lang/Object;
 
@@ -62,7 +62,7 @@
 
     :goto_0
     :try_start_0
-    iget v3, p0, Lcom/facebook/common/g/j;->GZ:I
+    iget v3, p0, Lcom/facebook/common/g/j;->Hq:I
 
     const/4 v4, 0x0
 
@@ -76,7 +76,7 @@
 
     if-ne v3, v5, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/common/g/j;->Ha:Lcom/facebook/common/g/a;
+    iget-object p1, p0, Lcom/facebook/common/g/j;->Hr:Lcom/facebook/common/g/a;
 
     invoke-interface {p1, v0}, Lcom/facebook/common/g/a;->z(Ljava/lang/Object;)V
 
@@ -97,7 +97,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/facebook/common/g/j;->Ha:Lcom/facebook/common/g/a;
+    iget-object p2, p0, Lcom/facebook/common/g/j;->Hr:Lcom/facebook/common/g/a;
 
     invoke-interface {p2, v0}, Lcom/facebook/common/g/a;->z(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/common/h/a$a.smali b/com.discord/smali_classes2/com/facebook/common/h/a$a.smali
index 6f6e996076..b560717cdd 100644
--- a/com.discord/smali_classes2/com/facebook/common/h/a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/common/h/a$a.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
-.field public static final Hr:I = 0x1
+.field public static final HI:I = 0x1
 
-.field public static final Hs:I = 0x2
+.field public static final HJ:I = 0x2
 
-.field private static final synthetic Ht:[I
+.field private static final synthetic HK:[I
 
 
 # direct methods
@@ -38,19 +38,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/common/h/a$a;->Hr:I
+    sget v1, Lcom/facebook/common/h/a$a;->HI:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/common/h/a$a;->Hs:I
+    sget v1, Lcom/facebook/common/h/a$a;->HJ:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/common/h/a$a;->Ht:[I
+    sput-object v0, Lcom/facebook/common/h/a$a;->HK:[I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/common/i/a.smali b/com.discord/smali_classes2/com/facebook/common/i/a.smali
index 7ba85025a7..b7532f761d 100644
--- a/com.discord/smali_classes2/com/facebook/common/i/a.smali
+++ b/com.discord/smali_classes2/com/facebook/common/i/a.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private Hu:I
+.field private HL:I
 
-.field private Hv:I
+.field private HM:I
 
 
 # direct methods
@@ -19,11 +19,11 @@
 
     if-ltz p2, :cond_0
 
-    iput p2, p0, Lcom/facebook/common/i/a;->Hu:I
+    iput p2, p0, Lcom/facebook/common/i/a;->HL:I
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/facebook/common/i/a;->Hv:I
+    iput p1, p0, Lcom/facebook/common/i/a;->HM:I
 
     return-void
 
@@ -60,7 +60,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/facebook/common/i/a;->Hu:I
+    iget v1, p0, Lcom/facebook/common/i/a;->HL:I
 
     invoke-static {v0, v1}, Ljava/lang/Math;->min(II)I
 
@@ -84,9 +84,9 @@
 
     invoke-virtual {v0, p1}, Ljava/io/InputStream;->mark(I)V
 
-    iget p1, p0, Lcom/facebook/common/i/a;->Hu:I
+    iget p1, p0, Lcom/facebook/common/i/a;->HL:I
 
-    iput p1, p0, Lcom/facebook/common/i/a;->Hv:I
+    iput p1, p0, Lcom/facebook/common/i/a;->HM:I
 
     :cond_0
     return-void
@@ -100,7 +100,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/i/a;->Hu:I
+    iget v0, p0, Lcom/facebook/common/i/a;->HL:I
 
     const/4 v1, -0x1
 
@@ -117,11 +117,11 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v1, p0, Lcom/facebook/common/i/a;->Hu:I
+    iget v1, p0, Lcom/facebook/common/i/a;->HL:I
 
     add-int/lit8 v1, v1, -0x1
 
-    iput v1, p0, Lcom/facebook/common/i/a;->Hu:I
+    iput v1, p0, Lcom/facebook/common/i/a;->HL:I
 
     :cond_1
     return v0
@@ -135,7 +135,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/i/a;->Hu:I
+    iget v0, p0, Lcom/facebook/common/i/a;->HL:I
 
     if-nez v0, :cond_0
 
@@ -156,11 +156,11 @@
 
     if-lez p1, :cond_1
 
-    iget p2, p0, Lcom/facebook/common/i/a;->Hu:I
+    iget p2, p0, Lcom/facebook/common/i/a;->HL:I
 
     sub-int/2addr p2, p1
 
-    iput p2, p0, Lcom/facebook/common/i/a;->Hu:I
+    iput p2, p0, Lcom/facebook/common/i/a;->HL:I
 
     :cond_1
     return p1
@@ -182,7 +182,7 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/common/i/a;->Hv:I
+    iget v0, p0, Lcom/facebook/common/i/a;->HM:I
 
     const/4 v1, -0x1
 
@@ -192,9 +192,9 @@
 
     invoke-virtual {v0}, Ljava/io/InputStream;->reset()V
 
-    iget v0, p0, Lcom/facebook/common/i/a;->Hv:I
+    iget v0, p0, Lcom/facebook/common/i/a;->HM:I
 
-    iput v0, p0, Lcom/facebook/common/i/a;->Hu:I
+    iput v0, p0, Lcom/facebook/common/i/a;->HL:I
 
     return-void
 
@@ -225,7 +225,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/i/a;->Hu:I
+    iget v0, p0, Lcom/facebook/common/i/a;->HL:I
 
     int-to-long v0, v0
 
@@ -239,7 +239,7 @@
 
     move-result-wide p1
 
-    iget v0, p0, Lcom/facebook/common/i/a;->Hu:I
+    iget v0, p0, Lcom/facebook/common/i/a;->HL:I
 
     int-to-long v0, v0
 
@@ -247,7 +247,7 @@
 
     long-to-int v1, v0
 
-    iput v1, p0, Lcom/facebook/common/i/a;->Hu:I
+    iput v1, p0, Lcom/facebook/common/i/a;->HL:I
 
     return-wide p1
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/common/i/b.smali b/com.discord/smali_classes2/com/facebook/common/i/b.smali
index 5da25be145..0be7bc535c 100644
--- a/com.discord/smali_classes2/com/facebook/common/i/b.smali
+++ b/com.discord/smali_classes2/com/facebook/common/i/b.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final Hw:[B
+.field private final HN:[B
 
-.field private Hx:I
+.field private HO:I
 
-.field private Hy:I
+.field private HP:I
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     if-eqz p2, :cond_0
 
-    iput-object p2, p0, Lcom/facebook/common/i/b;->Hw:[B
+    iput-object p2, p0, Lcom/facebook/common/i/b;->HN:[B
 
     return-void
 
@@ -40,12 +40,12 @@
     throw p1
 .end method
 
-.method private fR()I
+.method private fV()I
     .locals 3
 
-    iget v0, p0, Lcom/facebook/common/i/b;->Hx:I
+    iget v0, p0, Lcom/facebook/common/i/b;->HO:I
 
-    iget-object v1, p0, Lcom/facebook/common/i/b;->Hw:[B
+    iget-object v1, p0, Lcom/facebook/common/i/b;->HN:[B
 
     array-length v2, v1
 
@@ -58,7 +58,7 @@
     :cond_0
     add-int/lit8 v2, v0, 0x1
 
-    iput v2, p0, Lcom/facebook/common/i/b;->Hx:I
+    iput v2, p0, Lcom/facebook/common/i/b;->HO:I
 
     aget-byte v0, v1, v0
 
@@ -82,9 +82,9 @@
 
     invoke-super {p0, p1}, Ljava/io/FilterInputStream;->mark(I)V
 
-    iget p1, p0, Lcom/facebook/common/i/b;->Hx:I
+    iget p1, p0, Lcom/facebook/common/i/b;->HO:I
 
-    iput p1, p0, Lcom/facebook/common/i/b;->Hy:I
+    iput p1, p0, Lcom/facebook/common/i/b;->HP:I
 
     :cond_0
     return-void
@@ -111,7 +111,7 @@
     return v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/common/i/b;->fR()I
+    invoke-direct {p0}, Lcom/facebook/common/i/b;->fV()I
 
     move-result v0
 
@@ -168,7 +168,7 @@
     :goto_0
     if-ge v0, p3, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/common/i/b;->fR()I
+    invoke-direct {p0}, Lcom/facebook/common/i/b;->fV()I
 
     move-result v2
 
@@ -213,9 +213,9 @@
 
     invoke-virtual {v0}, Ljava/io/InputStream;->reset()V
 
-    iget v0, p0, Lcom/facebook/common/i/b;->Hy:I
+    iget v0, p0, Lcom/facebook/common/i/b;->HP:I
 
-    iput v0, p0, Lcom/facebook/common/i/b;->Hx:I
+    iput v0, p0, Lcom/facebook/common/i/b;->HO:I
 
     return-void
 
diff --git a/com.discord/smali_classes2/com/facebook/common/j/c.smali b/com.discord/smali_classes2/com/facebook/common/j/c.smali
index ca6a50a39e..deefd76fac 100644
--- a/com.discord/smali_classes2/com/facebook/common/j/c.smali
+++ b/com.discord/smali_classes2/com/facebook/common/j/c.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static final HB:[B
+.field static final HS:[B
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/facebook/common/j/c;->HB:[B
+    sput-object v0, Lcom/facebook/common/j/c;->HS:[B
 
     return-void
 
diff --git a/com.discord/smali_classes2/com/facebook/common/j/e.smali b/com.discord/smali_classes2/com/facebook/common/j/e.smali
index a85901ec4d..4970c8b8a3 100644
--- a/com.discord/smali_classes2/com/facebook/common/j/e.smali
+++ b/com.discord/smali_classes2/com/facebook/common/j/e.smali
@@ -14,13 +14,13 @@
 
 
 # static fields
-.field public static final enum HC:Lcom/facebook/common/j/e;
+.field public static final enum HT:Lcom/facebook/common/j/e;
 
-.field public static final enum HD:Lcom/facebook/common/j/e;
+.field public static final enum HU:Lcom/facebook/common/j/e;
 
-.field public static final enum HE:Lcom/facebook/common/j/e;
+.field public static final enum HV:Lcom/facebook/common/j/e;
 
-.field private static final synthetic HF:[Lcom/facebook/common/j/e;
+.field private static final synthetic HW:[Lcom/facebook/common/j/e;
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/common/j/e;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/common/j/e;->HC:Lcom/facebook/common/j/e;
+    sput-object v0, Lcom/facebook/common/j/e;->HT:Lcom/facebook/common/j/e;
 
     new-instance v0, Lcom/facebook/common/j/e;
 
@@ -45,7 +45,7 @@
 
     invoke-direct {v0, v3, v2}, Lcom/facebook/common/j/e;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/common/j/e;->HD:Lcom/facebook/common/j/e;
+    sput-object v0, Lcom/facebook/common/j/e;->HU:Lcom/facebook/common/j/e;
 
     new-instance v0, Lcom/facebook/common/j/e;
 
@@ -55,25 +55,25 @@
 
     invoke-direct {v0, v4, v3}, Lcom/facebook/common/j/e;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/common/j/e;->HE:Lcom/facebook/common/j/e;
+    sput-object v0, Lcom/facebook/common/j/e;->HV:Lcom/facebook/common/j/e;
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lcom/facebook/common/j/e;
 
-    sget-object v4, Lcom/facebook/common/j/e;->HC:Lcom/facebook/common/j/e;
+    sget-object v4, Lcom/facebook/common/j/e;->HT:Lcom/facebook/common/j/e;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/facebook/common/j/e;->HD:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->HU:Lcom/facebook/common/j/e;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/common/j/e;->HE:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->HV:Lcom/facebook/common/j/e;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/facebook/common/j/e;->HF:[Lcom/facebook/common/j/e;
+    sput-object v0, Lcom/facebook/common/j/e;->HW:[Lcom/facebook/common/j/e;
 
     return-void
 .end method
@@ -91,17 +91,17 @@
     return-void
 .end method
 
-.method public static v(Z)Lcom/facebook/common/j/e;
+.method public static t(Z)Lcom/facebook/common/j/e;
     .locals 0
 
     if-eqz p0, :cond_0
 
-    sget-object p0, Lcom/facebook/common/j/e;->HC:Lcom/facebook/common/j/e;
+    sget-object p0, Lcom/facebook/common/j/e;->HT:Lcom/facebook/common/j/e;
 
     return-object p0
 
     :cond_0
-    sget-object p0, Lcom/facebook/common/j/e;->HD:Lcom/facebook/common/j/e;
+    sget-object p0, Lcom/facebook/common/j/e;->HU:Lcom/facebook/common/j/e;
 
     return-object p0
 .end method
@@ -123,7 +123,7 @@
 .method public static values()[Lcom/facebook/common/j/e;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/j/e;->HF:[Lcom/facebook/common/j/e;
+    sget-object v0, Lcom/facebook/common/j/e;->HW:[Lcom/facebook/common/j/e;
 
     invoke-virtual {v0}, [Lcom/facebook/common/j/e;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/common/references/a.smali b/com.discord/smali_classes2/com/facebook/common/references/a.smali
index 7d9aec80a8..4172848cc6 100644
--- a/com.discord/smali_classes2/com/facebook/common/references/a.smali
+++ b/com.discord/smali_classes2/com/facebook/common/references/a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public He:Ljava/lang/ref/SoftReference;
+.field public Hv:Ljava/lang/ref/SoftReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/SoftReference<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field public Hf:Ljava/lang/ref/SoftReference;
+.field public Hw:Ljava/lang/ref/SoftReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/SoftReference<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field public Hg:Ljava/lang/ref/SoftReference;
+.field public Hx:Ljava/lang/ref/SoftReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/SoftReference<",
@@ -51,11 +51,11 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/common/references/a;->He:Ljava/lang/ref/SoftReference;
+    iput-object v0, p0, Lcom/facebook/common/references/a;->Hv:Ljava/lang/ref/SoftReference;
 
-    iput-object v0, p0, Lcom/facebook/common/references/a;->Hf:Ljava/lang/ref/SoftReference;
+    iput-object v0, p0, Lcom/facebook/common/references/a;->Hw:Ljava/lang/ref/SoftReference;
 
-    iput-object v0, p0, Lcom/facebook/common/references/a;->Hg:Ljava/lang/ref/SoftReference;
+    iput-object v0, p0, Lcom/facebook/common/references/a;->Hx:Ljava/lang/ref/SoftReference;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/common/references/c.smali b/com.discord/smali_classes2/com/facebook/common/references/c.smali
index 0a0b6858b1..7cfa91f7c0 100644
--- a/com.discord/smali_classes2/com/facebook/common/references/c.smali
+++ b/com.discord/smali_classes2/com/facebook/common/references/c.smali
@@ -21,7 +21,7 @@
 
 
 # static fields
-.field private static final Hh:Ljava/util/Map;
+.field private static final Hy:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -34,7 +34,7 @@
 
 
 # instance fields
-.field final GU:Lcom/facebook/common/references/b;
+.field final Hl:Lcom/facebook/common/references/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/b<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field private Hi:I
+.field private Hz:I
 
 .field mValue:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -62,7 +62,7 @@
 
     invoke-direct {v0}, Ljava/util/IdentityHashMap;-><init>()V
 
-    sput-object v0, Lcom/facebook/common/references/c;->Hh:Ljava/util/Map;
+    sput-object v0, Lcom/facebook/common/references/c;->Hy:Ljava/util/Map;
 
     return-void
 .end method
@@ -91,18 +91,18 @@
 
     check-cast p2, Lcom/facebook/common/references/b;
 
-    iput-object p2, p0, Lcom/facebook/common/references/c;->GU:Lcom/facebook/common/references/b;
+    iput-object p2, p0, Lcom/facebook/common/references/c;->Hl:Lcom/facebook/common/references/b;
 
     const/4 p2, 0x1
 
-    iput p2, p0, Lcom/facebook/common/references/c;->Hi:I
+    iput p2, p0, Lcom/facebook/common/references/c;->Hz:I
 
-    sget-object v0, Lcom/facebook/common/references/c;->Hh:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/common/references/c;->Hy:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/common/references/c;->Hh:Ljava/util/Map;
+    sget-object v1, Lcom/facebook/common/references/c;->Hy:Ljava/util/Map;
 
     invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -112,7 +112,7 @@
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lcom/facebook/common/references/c;->Hh:Ljava/util/Map;
+    sget-object v1, Lcom/facebook/common/references/c;->Hy:Ljava/util/Map;
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -123,7 +123,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v2, Lcom/facebook/common/references/c;->Hh:Ljava/util/Map;
+    sget-object v2, Lcom/facebook/common/references/c;->Hy:Ljava/util/Map;
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
@@ -155,12 +155,12 @@
 .method static A(Ljava/lang/Object;)V
     .locals 5
 
-    sget-object v0, Lcom/facebook/common/references/c;->Hh:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/common/references/c;->Hy:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/common/references/c;->Hh:Ljava/util/Map;
+    sget-object v1, Lcom/facebook/common/references/c;->Hy:Ljava/util/Map;
 
     invoke-interface {v1, p0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -197,14 +197,14 @@
 
     if-ne v3, v2, :cond_1
 
-    sget-object v1, Lcom/facebook/common/references/c;->Hh:Ljava/util/Map;
+    sget-object v1, Lcom/facebook/common/references/c;->Hy:Ljava/util/Map;
 
     invoke-interface {v1, p0}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_0
 
     :cond_1
-    sget-object v3, Lcom/facebook/common/references/c;->Hh:Ljava/util/Map;
+    sget-object v3, Lcom/facebook/common/references/c;->Hy:Ljava/util/Map;
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
@@ -259,7 +259,7 @@
     return p0
 .end method
 
-.method private fN()V
+.method private fR()V
     .locals 1
 
     invoke-static {p0}, Lcom/facebook/common/references/c;->a(Lcom/facebook/common/references/c;)Z
@@ -284,7 +284,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/common/references/c;->Hi:I
+    iget v0, p0, Lcom/facebook/common/references/c;->Hz:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -318,19 +318,19 @@
 
 
 # virtual methods
-.method public final declared-synchronized fL()V
+.method public final declared-synchronized fP()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/common/references/c;->fN()V
+    invoke-direct {p0}, Lcom/facebook/common/references/c;->fR()V
 
-    iget v0, p0, Lcom/facebook/common/references/c;->Hi:I
+    iget v0, p0, Lcom/facebook/common/references/c;->Hz:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lcom/facebook/common/references/c;->Hi:I
+    iput v0, p0, Lcom/facebook/common/references/c;->Hz:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -346,15 +346,15 @@
     throw v0
 .end method
 
-.method final declared-synchronized fM()I
+.method final declared-synchronized fQ()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/common/references/c;->fN()V
+    invoke-direct {p0}, Lcom/facebook/common/references/c;->fR()V
 
-    iget v0, p0, Lcom/facebook/common/references/c;->Hi:I
+    iget v0, p0, Lcom/facebook/common/references/c;->Hz:I
 
     const/4 v1, 0x1
 
@@ -370,13 +370,13 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget v0, p0, Lcom/facebook/common/references/c;->Hi:I
+    iget v0, p0, Lcom/facebook/common/references/c;->Hz:I
 
     sub-int/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/common/references/c;->Hi:I
+    iput v0, p0, Lcom/facebook/common/references/c;->Hz:I
 
-    iget v0, p0, Lcom/facebook/common/references/c;->Hi:I
+    iget v0, p0, Lcom/facebook/common/references/c;->Hz:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/facebook/common/time/RealtimeSinceBootClock.smali b/com.discord/smali_classes2/com/facebook/common/time/RealtimeSinceBootClock.smali
index 25ff3dc955..1f300b0595 100644
--- a/com.discord/smali_classes2/com/facebook/common/time/RealtimeSinceBootClock.smali
+++ b/com.discord/smali_classes2/com/facebook/common/time/RealtimeSinceBootClock.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final Hz:Lcom/facebook/common/time/RealtimeSinceBootClock;
+.field private static final HQ:Lcom/facebook/common/time/RealtimeSinceBootClock;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/facebook/common/time/RealtimeSinceBootClock;-><init>()V
 
-    sput-object v0, Lcom/facebook/common/time/RealtimeSinceBootClock;->Hz:Lcom/facebook/common/time/RealtimeSinceBootClock;
+    sput-object v0, Lcom/facebook/common/time/RealtimeSinceBootClock;->HQ:Lcom/facebook/common/time/RealtimeSinceBootClock;
 
     return-void
 .end method
@@ -34,7 +34,7 @@
 .method public static get()Lcom/facebook/common/time/RealtimeSinceBootClock;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/time/RealtimeSinceBootClock;->Hz:Lcom/facebook/common/time/RealtimeSinceBootClock;
+    sget-object v0, Lcom/facebook/common/time/RealtimeSinceBootClock;->HQ:Lcom/facebook/common/time/RealtimeSinceBootClock;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/common/time/c.smali b/com.discord/smali_classes2/com/facebook/common/time/c.smali
index d4128af6f3..7b89f26a2e 100644
--- a/com.discord/smali_classes2/com/facebook/common/time/c.smali
+++ b/com.discord/smali_classes2/com/facebook/common/time/c.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final HA:Lcom/facebook/common/time/c;
+.field private static final HR:Lcom/facebook/common/time/c;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/facebook/common/time/c;-><init>()V
 
-    sput-object v0, Lcom/facebook/common/time/c;->HA:Lcom/facebook/common/time/c;
+    sput-object v0, Lcom/facebook/common/time/c;->HR:Lcom/facebook/common/time/c;
 
     return-void
 .end method
@@ -31,10 +31,10 @@
     return-void
 .end method
 
-.method public static fS()Lcom/facebook/common/time/c;
+.method public static fW()Lcom/facebook/common/time/c;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/time/c;->HA:Lcom/facebook/common/time/c;
+    sget-object v0, Lcom/facebook/common/time/c;->HR:Lcom/facebook/common/time/c;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/d/b.smali b/com.discord/smali_classes2/com/facebook/d/b.smali
index 4ab99719f5..80f7032f89 100644
--- a/com.discord/smali_classes2/com/facebook/d/b.smali
+++ b/com.discord/smali_classes2/com/facebook/d/b.smali
@@ -4,27 +4,27 @@
 
 
 # static fields
-.field public static final PA:Lcom/facebook/d/c;
+.field public static final PK:Lcom/facebook/d/c;
 
-.field public static final PB:Lcom/facebook/d/c;
+.field public static final PL:Lcom/facebook/d/c;
 
-.field public static final PC:Lcom/facebook/d/c;
+.field public static final PM:Lcom/facebook/d/c;
 
-.field public static final Ps:Lcom/facebook/d/c;
+.field public static final PN:Lcom/facebook/d/c;
 
-.field public static final Pt:Lcom/facebook/d/c;
+.field public static final PO:Lcom/facebook/d/c;
 
-.field public static final Pu:Lcom/facebook/d/c;
+.field public static final PP:Lcom/facebook/d/c;
 
-.field public static final Pv:Lcom/facebook/d/c;
+.field public static final PQ:Lcom/facebook/d/c;
 
-.field public static final Pw:Lcom/facebook/d/c;
+.field public static final PR:Lcom/facebook/d/c;
 
-.field public static final Px:Lcom/facebook/d/c;
+.field public static final PS:Lcom/facebook/d/c;
 
-.field public static final Py:Lcom/facebook/d/c;
+.field public static final PT:Lcom/facebook/d/c;
 
-.field public static final Pz:Lcom/facebook/d/c;
+.field public static final PU:Lcom/facebook/d/c;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/d/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sput-object v0, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
     new-instance v0, Lcom/facebook/d/c;
 
@@ -49,7 +49,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/d/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/d/b;->Pt:Lcom/facebook/d/c;
+    sput-object v0, Lcom/facebook/d/b;->PL:Lcom/facebook/d/c;
 
     new-instance v0, Lcom/facebook/d/c;
 
@@ -59,7 +59,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/d/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/d/b;->Pu:Lcom/facebook/d/c;
+    sput-object v0, Lcom/facebook/d/b;->PM:Lcom/facebook/d/c;
 
     new-instance v0, Lcom/facebook/d/c;
 
@@ -69,7 +69,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/d/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/d/b;->Pv:Lcom/facebook/d/c;
+    sput-object v0, Lcom/facebook/d/b;->PN:Lcom/facebook/d/c;
 
     new-instance v0, Lcom/facebook/d/c;
 
@@ -79,7 +79,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/d/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/d/b;->Pw:Lcom/facebook/d/c;
+    sput-object v0, Lcom/facebook/d/b;->PO:Lcom/facebook/d/c;
 
     new-instance v0, Lcom/facebook/d/c;
 
@@ -89,7 +89,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/d/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/d/b;->Px:Lcom/facebook/d/c;
+    sput-object v0, Lcom/facebook/d/b;->PP:Lcom/facebook/d/c;
 
     new-instance v0, Lcom/facebook/d/c;
 
@@ -97,7 +97,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/d/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/d/b;->Py:Lcom/facebook/d/c;
+    sput-object v0, Lcom/facebook/d/b;->PQ:Lcom/facebook/d/c;
 
     new-instance v0, Lcom/facebook/d/c;
 
@@ -105,7 +105,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/d/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/d/b;->Pz:Lcom/facebook/d/c;
+    sput-object v0, Lcom/facebook/d/b;->PR:Lcom/facebook/d/c;
 
     new-instance v0, Lcom/facebook/d/c;
 
@@ -113,7 +113,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/d/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/d/b;->PA:Lcom/facebook/d/c;
+    sput-object v0, Lcom/facebook/d/b;->PS:Lcom/facebook/d/c;
 
     new-instance v0, Lcom/facebook/d/c;
 
@@ -121,7 +121,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/d/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/d/b;->PB:Lcom/facebook/d/c;
+    sput-object v0, Lcom/facebook/d/b;->PT:Lcom/facebook/d/c;
 
     new-instance v0, Lcom/facebook/d/c;
 
@@ -131,7 +131,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/d/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/d/b;->PC:Lcom/facebook/d/c;
+    sput-object v0, Lcom/facebook/d/b;->PU:Lcom/facebook/d/c;
 
     return-void
 .end method
@@ -145,7 +145,7 @@
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/facebook/d/b;->PB:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PT:Lcom/facebook/d/c;
 
     if-ne p0, v0, :cond_0
 
@@ -166,19 +166,19 @@
 .method public static b(Lcom/facebook/d/c;)Z
     .locals 1
 
-    sget-object v0, Lcom/facebook/d/b;->Px:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PP:Lcom/facebook/d/c;
 
     if-eq p0, v0, :cond_1
 
-    sget-object v0, Lcom/facebook/d/b;->Py:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PQ:Lcom/facebook/d/c;
 
     if-eq p0, v0, :cond_1
 
-    sget-object v0, Lcom/facebook/d/b;->Pz:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PR:Lcom/facebook/d/c;
 
     if-eq p0, v0, :cond_1
 
-    sget-object v0, Lcom/facebook/d/b;->PA:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PS:Lcom/facebook/d/c;
 
     if-ne p0, v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/facebook/d/e.smali b/com.discord/smali_classes2/com/facebook/d/e.smali
index c7632cbd13..8225f64c8f 100644
--- a/com.discord/smali_classes2/com/facebook/d/e.smali
+++ b/com.discord/smali_classes2/com/facebook/d/e.smali
@@ -124,7 +124,7 @@
     return p0
 .end method
 
-.method public static av(Ljava/lang/String;)[B
+.method public static aq(Ljava/lang/String;)[B
     .locals 2
 
     invoke-static {p0}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
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 43fba08555..876861fd1a 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/R$a.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/R$a.smali
@@ -168,21 +168,18 @@
     .array-data 4
         0x7f040027
         0x7f04004d
-        0x7f040128
-        0x7f040129
         0x7f04012a
-        0x7f040279
-        0x7f040288
-        0x7f040289
-        0x7f04028e
-        0x7f0402b6
-        0x7f0402b7
-        0x7f0402b8
-        0x7f0402c5
-        0x7f0402c6
+        0x7f04012b
+        0x7f04012c
+        0x7f04027c
+        0x7f04028b
+        0x7f04028c
+        0x7f040291
+        0x7f0402b9
+        0x7f0402ba
+        0x7f0402bb
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f0402cb
         0x7f0402cc
         0x7f0402cd
         0x7f0402ce
@@ -194,7 +191,10 @@
         0x7f0402d4
         0x7f0402d5
         0x7f0402d6
-        0x7f0403db
+        0x7f0402d7
+        0x7f0402d8
+        0x7f0402d9
+        0x7f0403e0
     .end array-data
 
     :array_1
@@ -203,21 +203,18 @@
         0x7f040027
         0x7f040028
         0x7f04004d
-        0x7f040128
-        0x7f040129
         0x7f04012a
-        0x7f040279
-        0x7f040288
-        0x7f040289
-        0x7f04028e
-        0x7f0402b6
-        0x7f0402b7
-        0x7f0402b8
-        0x7f0402c5
-        0x7f0402c6
+        0x7f04012b
+        0x7f04012c
+        0x7f04027c
+        0x7f04028b
+        0x7f04028c
+        0x7f040291
+        0x7f0402b9
+        0x7f0402ba
+        0x7f0402bb
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f0402cb
         0x7f0402cc
         0x7f0402cd
         0x7f0402ce
@@ -229,7 +226,10 @@
         0x7f0402d4
         0x7f0402d5
         0x7f0402d6
-        0x7f0403db
+        0x7f0402d7
+        0x7f0402d8
+        0x7f0402d9
+        0x7f0403e0
     .end array-data
 .end method
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/a/a$1.smali b/com.discord/smali_classes2/com/facebook/drawee/a/a$1.smali
index 3dd281ae31..cdf800f032 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/a/a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/a/a$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic JB:Lcom/facebook/drawee/a/a;
+.field final synthetic JS:Lcom/facebook/drawee/a/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/drawee/a/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/drawee/a/a$1;->JB:Lcom/facebook/drawee/a/a;
+    iput-object p1, p0, Lcom/facebook/drawee/a/a$1;->JS:Lcom/facebook/drawee/a/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final run()V
     .locals 2
 
-    invoke-static {}, Lcom/facebook/drawee/a/a;->gv()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->gz()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/a/a$1;->JB:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/a/a$1;->JS:Lcom/facebook/drawee/a/a;
 
     invoke-static {v0}, Lcom/facebook/drawee/a/a;->a(Lcom/facebook/drawee/a/a;)Ljava/util/Set;
 
@@ -67,7 +67,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/a/a$1;->JB:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/a/a$1;->JS:Lcom/facebook/drawee/a/a;
 
     invoke-static {v0}, Lcom/facebook/drawee/a/a;->a(Lcom/facebook/drawee/a/a;)Ljava/util/Set;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/a/b$a.smali b/com.discord/smali_classes2/com/facebook/drawee/a/b$a.smali
index 63c4a51601..0797295b14 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/a/b$a.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/a/b$a.smali
@@ -23,40 +23,6 @@
 
 
 # static fields
-.field public static final enum JF:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JG:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JH:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JI:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JJ:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JK:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JL:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JM:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JN:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JO:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JP:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JQ:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JR:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JS:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JT:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JU:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum JV:Lcom/facebook/drawee/a/b$a;
-
 .field public static final enum JW:Lcom/facebook/drawee/a/b$a;
 
 .field public static final enum JX:Lcom/facebook/drawee/a/b$a;
@@ -71,7 +37,41 @@
 
 .field public static final enum Kc:Lcom/facebook/drawee/a/b$a;
 
-.field private static final synthetic Kd:[Lcom/facebook/drawee/a/b$a;
+.field public static final enum Kd:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Ke:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Kf:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Kg:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Kh:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Ki:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Kj:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Kk:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Kl:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Km:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Kn:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Ko:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Kp:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Kq:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Kr:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Ks:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Kt:Lcom/facebook/drawee/a/b$a;
+
+.field private static final synthetic Ku:[Lcom/facebook/drawee/a/b$a;
 
 
 # direct methods
@@ -86,7 +86,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JF:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->JW:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -96,7 +96,7 @@
 
     invoke-direct {v0, v3, v2}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JG:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->JX:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -106,7 +106,7 @@
 
     invoke-direct {v0, v4, v3}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JH:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->JY:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -116,7 +116,7 @@
 
     invoke-direct {v0, v5, v4}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JI:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->JZ:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -126,7 +126,7 @@
 
     invoke-direct {v0, v6, v5}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JJ:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Ka:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -136,7 +136,7 @@
 
     invoke-direct {v0, v7, v6}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JK:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kb:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -146,7 +146,7 @@
 
     invoke-direct {v0, v8, v7}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JL:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kc:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -156,7 +156,7 @@
 
     invoke-direct {v0, v9, v8}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JM:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kd:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -166,7 +166,7 @@
 
     invoke-direct {v0, v10, v9}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JN:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Ke:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -176,7 +176,7 @@
 
     invoke-direct {v0, v11, v10}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JO:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kf:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -186,7 +186,7 @@
 
     invoke-direct {v0, v12, v11}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JP:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kg:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -196,7 +196,7 @@
 
     invoke-direct {v0, v13, v12}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JQ:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kh:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -206,7 +206,7 @@
 
     invoke-direct {v0, v14, v13}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JR:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Ki:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -216,7 +216,7 @@
 
     invoke-direct {v0, v15, v14}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JS:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kj:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -226,7 +226,7 @@
 
     invoke-direct {v0, v14, v15}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JT:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kk:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -236,7 +236,7 @@
 
     invoke-direct {v0, v14, v15}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JU:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kl:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -246,7 +246,7 @@
 
     invoke-direct {v0, v14, v15}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JV:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Km:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -256,7 +256,7 @@
 
     invoke-direct {v0, v14, v15}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JW:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kn:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -266,7 +266,7 @@
 
     invoke-direct {v0, v14, v15}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JX:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Ko:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -276,7 +276,7 @@
 
     invoke-direct {v0, v14, v15}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JY:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kp:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -286,7 +286,7 @@
 
     invoke-direct {v0, v14, v15}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->JZ:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kq:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -296,7 +296,7 @@
 
     invoke-direct {v0, v14, v15}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->Ka:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kr:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -306,7 +306,7 @@
 
     invoke-direct {v0, v14, v15}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kb:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Ks:Lcom/facebook/drawee/a/b$a;
 
     new-instance v0, Lcom/facebook/drawee/a/b$a;
 
@@ -316,131 +316,131 @@
 
     invoke-direct {v0, v14, v15}, Lcom/facebook/drawee/a/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kc:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kt:Lcom/facebook/drawee/a/b$a;
 
     const/16 v0, 0x18
 
     new-array v0, v0, [Lcom/facebook/drawee/a/b$a;
 
-    sget-object v14, Lcom/facebook/drawee/a/b$a;->JF:Lcom/facebook/drawee/a/b$a;
+    sget-object v14, Lcom/facebook/drawee/a/b$a;->JW:Lcom/facebook/drawee/a/b$a;
 
     aput-object v14, v0, v1
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JG:Lcom/facebook/drawee/a/b$a;
-
-    aput-object v1, v0, v2
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JH:Lcom/facebook/drawee/a/b$a;
-
-    aput-object v1, v0, v3
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JI:Lcom/facebook/drawee/a/b$a;
-
-    aput-object v1, v0, v4
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JJ:Lcom/facebook/drawee/a/b$a;
-
-    aput-object v1, v0, v5
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JK:Lcom/facebook/drawee/a/b$a;
-
-    aput-object v1, v0, v6
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JL:Lcom/facebook/drawee/a/b$a;
-
-    aput-object v1, v0, v7
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JM:Lcom/facebook/drawee/a/b$a;
-
-    aput-object v1, v0, v8
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JN:Lcom/facebook/drawee/a/b$a;
-
-    aput-object v1, v0, v9
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JO:Lcom/facebook/drawee/a/b$a;
-
-    aput-object v1, v0, v10
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JP:Lcom/facebook/drawee/a/b$a;
-
-    aput-object v1, v0, v11
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JQ:Lcom/facebook/drawee/a/b$a;
-
-    aput-object v1, v0, v12
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JR:Lcom/facebook/drawee/a/b$a;
-
-    aput-object v1, v0, v13
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JS:Lcom/facebook/drawee/a/b$a;
-
-    const/16 v2, 0xd
-
-    aput-object v1, v0, v2
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JT:Lcom/facebook/drawee/a/b$a;
-
-    const/16 v2, 0xe
-
-    aput-object v1, v0, v2
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JU:Lcom/facebook/drawee/a/b$a;
-
-    const/16 v2, 0xf
-
-    aput-object v1, v0, v2
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JV:Lcom/facebook/drawee/a/b$a;
-
-    const/16 v2, 0x10
-
-    aput-object v1, v0, v2
-
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JW:Lcom/facebook/drawee/a/b$a;
-
-    const/16 v2, 0x11
-
-    aput-object v1, v0, v2
-
     sget-object v1, Lcom/facebook/drawee/a/b$a;->JX:Lcom/facebook/drawee/a/b$a;
 
-    const/16 v2, 0x12
-
     aput-object v1, v0, v2
 
     sget-object v1, Lcom/facebook/drawee/a/b$a;->JY:Lcom/facebook/drawee/a/b$a;
 
+    aput-object v1, v0, v3
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->JZ:Lcom/facebook/drawee/a/b$a;
+
+    aput-object v1, v0, v4
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ka:Lcom/facebook/drawee/a/b$a;
+
+    aput-object v1, v0, v5
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kb:Lcom/facebook/drawee/a/b$a;
+
+    aput-object v1, v0, v6
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kc:Lcom/facebook/drawee/a/b$a;
+
+    aput-object v1, v0, v7
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kd:Lcom/facebook/drawee/a/b$a;
+
+    aput-object v1, v0, v8
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ke:Lcom/facebook/drawee/a/b$a;
+
+    aput-object v1, v0, v9
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kf:Lcom/facebook/drawee/a/b$a;
+
+    aput-object v1, v0, v10
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kg:Lcom/facebook/drawee/a/b$a;
+
+    aput-object v1, v0, v11
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kh:Lcom/facebook/drawee/a/b$a;
+
+    aput-object v1, v0, v12
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ki:Lcom/facebook/drawee/a/b$a;
+
+    aput-object v1, v0, v13
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kj:Lcom/facebook/drawee/a/b$a;
+
+    const/16 v2, 0xd
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kk:Lcom/facebook/drawee/a/b$a;
+
+    const/16 v2, 0xe
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kl:Lcom/facebook/drawee/a/b$a;
+
+    const/16 v2, 0xf
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Km:Lcom/facebook/drawee/a/b$a;
+
+    const/16 v2, 0x10
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kn:Lcom/facebook/drawee/a/b$a;
+
+    const/16 v2, 0x11
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ko:Lcom/facebook/drawee/a/b$a;
+
+    const/16 v2, 0x12
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kp:Lcom/facebook/drawee/a/b$a;
+
     const/16 v2, 0x13
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->JZ:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kq:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x14
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ka:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kr:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x15
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kb:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ks:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x16
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kc:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Kt:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x17
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->Kd:[Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Ku:[Lcom/facebook/drawee/a/b$a;
 
     return-void
 .end method
@@ -475,7 +475,7 @@
 .method public static values()[Lcom/facebook/drawee/a/b$a;
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/a/b$a;->Kd:[Lcom/facebook/drawee/a/b$a;
+    sget-object v0, Lcom/facebook/drawee/a/b$a;->Ku:[Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v0}, [Lcom/facebook/drawee/a/b$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/a/b.smali b/com.discord/smali_classes2/com/facebook/drawee/a/b.smali
index db9352f8e1..377c8e086a 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/a/b.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/a/b.smali
@@ -12,13 +12,13 @@
 
 
 # static fields
-.field private static final JD:Lcom/facebook/drawee/a/b;
+.field private static final JU:Lcom/facebook/drawee/a/b;
 
-.field private static JE:Z
+.field private static JV:Z
 
 
 # instance fields
-.field private final JC:Ljava/util/Queue;
+.field private final JT:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -37,11 +37,11 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/a/b;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/a/b;->JD:Lcom/facebook/drawee/a/b;
+    sput-object v0, Lcom/facebook/drawee/a/b;->JU:Lcom/facebook/drawee/a/b;
 
     const/4 v0, 0x1
 
-    sput-boolean v0, Lcom/facebook/drawee/a/b;->JE:Z
+    sput-boolean v0, Lcom/facebook/drawee/a/b;->JV:Z
 
     return-void
 .end method
@@ -57,15 +57,15 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/ArrayBlockingQueue;-><init>(I)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/a/b;->JC:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/facebook/drawee/a/b;->JT:Ljava/util/Queue;
 
     return-void
 .end method
 
-.method public static gw()Lcom/facebook/drawee/a/b;
+.method public static gA()Lcom/facebook/drawee/a/b;
     .locals 1
 
-    sget-boolean v0, Lcom/facebook/drawee/a/b;->JE:Z
+    sget-boolean v0, Lcom/facebook/drawee/a/b;->JV:Z
 
     if-eqz v0, :cond_0
 
@@ -76,7 +76,7 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/facebook/drawee/a/b;->JD:Lcom/facebook/drawee/a/b;
+    sget-object v0, Lcom/facebook/drawee/a/b;->JU:Lcom/facebook/drawee/a/b;
 
     return-object v0
 .end method
@@ -86,14 +86,14 @@
 .method public final a(Lcom/facebook/drawee/a/b$a;)V
     .locals 2
 
-    sget-boolean v0, Lcom/facebook/drawee/a/b;->JE:Z
+    sget-boolean v0, Lcom/facebook/drawee/a/b;->JV:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/a/b;->JC:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/drawee/a/b;->JT:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->size()I
 
@@ -105,12 +105,12 @@
 
     if-le v0, v1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/a/b;->JC:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/drawee/a/b;->JT:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/a/b;->JC:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/drawee/a/b;->JT:Ljava/util/Queue;
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
@@ -120,7 +120,7 @@
 .method public toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/a/b;->JC:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/drawee/a/b;->JT:Ljava/util/Queue;
 
     invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/a/c.smali b/com.discord/smali_classes2/com/facebook/drawee/a/c.smali
index 042e42dd05..4d6dcb7514 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/a/c.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/a/c.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field public Ke:Z
+.field public Kv:Z
 
-.field private Kf:I
+.field private Kw:I
 
-.field public Kg:I
+.field public Kx:I
 
 
 # direct methods
@@ -24,16 +24,16 @@
 
 
 # virtual methods
-.method public final gx()Z
+.method public final gB()Z
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/a/c;->Ke:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/a/c;->Kv:Z
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/facebook/drawee/a/c;->Kg:I
+    iget v0, p0, Lcom/facebook/drawee/a/c;->Kx:I
 
-    iget v1, p0, Lcom/facebook/drawee/a/c;->Kf:I
+    iget v1, p0, Lcom/facebook/drawee/a/c;->Kw:I
 
     if-ge v0, v1, :cond_0
 
@@ -52,13 +52,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/a/c;->Ke:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/a/c;->Kv:Z
 
     const/4 v1, 0x4
 
-    iput v1, p0, Lcom/facebook/drawee/a/c;->Kf:I
+    iput v1, p0, Lcom/facebook/drawee/a/c;->Kw:I
 
-    iput v0, p0, Lcom/facebook/drawee/a/c;->Kg:I
+    iput v0, p0, Lcom/facebook/drawee/a/c;->Kx:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/a/a.smali b/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/a/a.smali
index a98d0cf6e4..97642c47bf 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/a/a.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/a/a.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field public IR:I
+.field public Ji:I
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/facebook/drawee/backends/pipeline/a/a;->IR:I
+    iput v0, p0, Lcom/facebook/drawee/backends/pipeline/a/a;->Ji:I
 
     return-void
 .end method
@@ -28,7 +28,7 @@
 .method public final a(Ljava/lang/String;IZ)V
     .locals 0
 
-    iput p2, p0, Lcom/facebook/drawee/backends/pipeline/a/a;->IR:I
+    iput p2, p0, Lcom/facebook/drawee/backends/pipeline/a/a;->Ji:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/b/a.smali b/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/b/a.smali
index 6999a0c532..d0ff02165a 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/b/a.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/b/a.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final IS:Ljava/util/List;
+.field private final Jj:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -30,9 +30,9 @@
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->IS:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Jj:Ljava/util/List;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->IS:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Jj:Ljava/util/List;
 
     invoke-static {v0, p1}, Ljava/util/Collections;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
 
@@ -47,7 +47,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->IS:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Jj:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -71,7 +71,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->IS:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Jj:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -82,7 +82,7 @@
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->IS:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Jj:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -145,7 +145,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->IS:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Jj:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
     :try_end_0
diff --git a/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/b/a/b.smali b/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/b/a/b.smali
index 936519eea6..8af2b4d333 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/b/a/b.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/b/a/b.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+.field private final IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
-.field private final Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+.field private final JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     return-void
 .end method
@@ -30,11 +30,11 @@
 .method public final a(Ljava/lang/String;IZ)V
     .locals 0
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->IR:I
+    iput p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Ji:I
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->IF:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->IX:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     const/4 p3, 0x1
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/b/a/c.smali b/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/b/a/c.smali
index 1230a3400a..436fad2bf9 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/b/a/c.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/b/a/c.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+.field private final JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-.field private final Jw:Lcom/facebook/common/time/b;
+.field private final JN:Lcom/facebook/common/time/b;
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/g/a;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jw:Lcom/facebook/common/time/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JN:Lcom/facebook/common/time/b;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     return-void
 .end method
@@ -27,25 +27,25 @@
 .method public final a(Lcom/facebook/imagepipeline/request/b;Ljava/lang/Object;Ljava/lang/String;Z)V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jw:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JN:Lcom/facebook/common/time/b;
 
     invoke-interface {v1}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v1
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Je:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jv:J
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IX:Lcom/facebook/imagepipeline/request/b;
+    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jo:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IW:Ljava/lang/Object;
+    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jn:Ljava/lang/Object;
 
-    iput-object p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IV:Ljava/lang/String;
+    iput-object p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jm:Ljava/lang/String;
 
-    iput-boolean p4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jg:Z
+    iput-boolean p4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jx:Z
 
     return-void
 .end method
@@ -53,23 +53,23 @@
 .method public final a(Lcom/facebook/imagepipeline/request/b;Ljava/lang/String;Ljava/lang/Throwable;Z)V
     .locals 2
 
-    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jw:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JN:Lcom/facebook/common/time/b;
 
     invoke-interface {v0}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v0
 
-    iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Jf:J
+    iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Jw:J
 
-    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p1, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->IX:Lcom/facebook/imagepipeline/request/b;
+    iput-object p1, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Jo:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object p2, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->IV:Ljava/lang/String;
+    iput-object p2, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Jm:Ljava/lang/String;
 
-    iput-boolean p4, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Jg:Z
+    iput-boolean p4, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Jx:Z
 
     return-void
 .end method
@@ -77,43 +77,43 @@
 .method public final a(Lcom/facebook/imagepipeline/request/b;Ljava/lang/String;Z)V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jw:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JN:Lcom/facebook/common/time/b;
 
     invoke-interface {v1}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v1
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jf:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jw:J
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IX:Lcom/facebook/imagepipeline/request/b;
+    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jo:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IV:Ljava/lang/String;
+    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jm:Ljava/lang/String;
 
-    iput-boolean p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jg:Z
+    iput-boolean p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jx:Z
 
     return-void
 .end method
 
-.method public final ax(Ljava/lang/String;)V
+.method public final as(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jw:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JN:Lcom/facebook/common/time/b;
 
     invoke-interface {v1}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v1
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jf:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jw:J
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->Jp:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->JG:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->IV:Ljava/lang/String;
+    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Jm:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/e$1.smali b/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/e$1.smali
index 24e5c301ea..599504c26e 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/e$1.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/backends/pipeline/e$1.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final synthetic IL:[I
+.field static final synthetic Jd:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->IL:[I
+    sput-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Jd:[I
 
     :try_start_0
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->IL:[I
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Jd:[I
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->KO:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Lf:Lcom/facebook/drawee/controller/a$a;
 
     invoke-virtual {v1}, Lcom/facebook/drawee/controller/a$a;->ordinal()I
 
@@ -49,9 +49,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->IL:[I
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Jd:[I
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->KP:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Lg:Lcom/facebook/drawee/controller/a$a;
 
     invoke-virtual {v1}, Lcom/facebook/drawee/controller/a$a;->ordinal()I
 
@@ -65,9 +65,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->IL:[I
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Jd:[I
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->KQ:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Lh:Lcom/facebook/drawee/controller/a$a;
 
     invoke-virtual {v1}, Lcom/facebook/drawee/controller/a$a;->ordinal()I
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeController$1.smali b/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeController$1.smali
index 530f55208e..c3810fa71d 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeController$1.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeController$1.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/drawee/controller/AbstractDraweeController;->gC()V
+    value = Lcom/facebook/drawee/controller/AbstractDraweeController;->gG()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -22,9 +22,9 @@
 
 
 # instance fields
-.field final synthetic Kx:Z
+.field final synthetic KO:Z
 
-.field final synthetic Ky:Lcom/facebook/drawee/controller/AbstractDraweeController;
+.field final synthetic KP:Lcom/facebook/drawee/controller/AbstractDraweeController;
 
 .field final synthetic val$id:Ljava/lang/String;
 
@@ -33,11 +33,11 @@
 .method constructor <init>(Lcom/facebook/drawee/controller/AbstractDraweeController;Ljava/lang/String;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Ky:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->KP:Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->val$id:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Kx:Z
+    iput-boolean p3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->KO:Z
 
     invoke-direct {p0}, Lcom/facebook/b/b;-><init>()V
 
@@ -64,7 +64,7 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Ky:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->KP:Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     iget-object v3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->val$id:Ljava/lang/String;
 
@@ -97,11 +97,11 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Ky:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->KP:Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->val$id:Ljava/lang/String;
 
-    iget-boolean v6, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Kx:Z
+    iget-boolean v6, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->KO:Z
 
     const/4 v7, 0x0
 
@@ -114,7 +114,7 @@
     :cond_0
     if-eqz v5, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Ky:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->KP:Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->val$id:Ljava/lang/String;
 
@@ -138,11 +138,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Ky:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->KP:Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->val$id:Ljava/lang/String;
 
-    invoke-interface {p1}, Lcom/facebook/b/c;->fW()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lcom/facebook/b/c;->ga()Ljava/lang/Throwable;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeController$a.smali b/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeController$a.smali
index 678d766b49..542233e079 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeController$a.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeController$a.smali
@@ -55,9 +55,9 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;-><init>()V
 
-    invoke-virtual {v0, p0}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->d(Lcom/facebook/drawee/controller/ControllerListener;)V
+    invoke-virtual {v0, p0}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->c(Lcom/facebook/drawee/controller/ControllerListener;)V
 
-    invoke-virtual {v0, p1}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->d(Lcom/facebook/drawee/controller/ControllerListener;)V
+    invoke-virtual {v0, p1}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->c(Lcom/facebook/drawee/controller/ControllerListener;)V
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/controller/a$2.smali b/com.discord/smali_classes2/com/facebook/drawee/controller/a$2.smali
index f3c54a7973..e92d8e7603 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/controller/a$2.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/controller/a$2.smali
@@ -27,34 +27,34 @@
 
 
 # instance fields
-.field final synthetic KI:Lcom/facebook/drawee/d/a;
+.field final synthetic KZ:Lcom/facebook/drawee/d/a;
 
-.field final synthetic KJ:Ljava/lang/String;
+.field final synthetic La:Ljava/lang/String;
 
-.field final synthetic KK:Ljava/lang/Object;
+.field final synthetic Lb:Ljava/lang/Object;
 
-.field final synthetic KL:Ljava/lang/Object;
+.field final synthetic Lc:Ljava/lang/Object;
 
-.field final synthetic KM:Lcom/facebook/drawee/controller/a$a;
+.field final synthetic Ld:Lcom/facebook/drawee/controller/a$a;
 
-.field final synthetic KN:Lcom/facebook/drawee/controller/a;
+.field final synthetic Le:Lcom/facebook/drawee/controller/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/drawee/controller/a;Lcom/facebook/drawee/d/a;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/facebook/drawee/controller/a$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a$2;->KN:Lcom/facebook/drawee/controller/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a$2;->Le:Lcom/facebook/drawee/controller/a;
 
-    iput-object p2, p0, Lcom/facebook/drawee/controller/a$2;->KI:Lcom/facebook/drawee/d/a;
+    iput-object p2, p0, Lcom/facebook/drawee/controller/a$2;->KZ:Lcom/facebook/drawee/d/a;
 
-    iput-object p3, p0, Lcom/facebook/drawee/controller/a$2;->KJ:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/drawee/controller/a$2;->La:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/drawee/controller/a$2;->KK:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/facebook/drawee/controller/a$2;->Lb:Ljava/lang/Object;
 
-    iput-object p5, p0, Lcom/facebook/drawee/controller/a$2;->KL:Ljava/lang/Object;
+    iput-object p5, p0, Lcom/facebook/drawee/controller/a$2;->Lc:Ljava/lang/Object;
 
-    iput-object p6, p0, Lcom/facebook/drawee/controller/a$2;->KM:Lcom/facebook/drawee/controller/a$a;
+    iput-object p6, p0, Lcom/facebook/drawee/controller/a$2;->Ld:Lcom/facebook/drawee/controller/a$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -66,15 +66,15 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a$2;->KN:Lcom/facebook/drawee/controller/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a$2;->Le:Lcom/facebook/drawee/controller/a;
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a$2;->KI:Lcom/facebook/drawee/d/a;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a$2;->KZ:Lcom/facebook/drawee/d/a;
 
-    iget-object v2, p0, Lcom/facebook/drawee/controller/a$2;->KK:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/a$2;->Lb:Ljava/lang/Object;
 
-    iget-object v3, p0, Lcom/facebook/drawee/controller/a$2;->KL:Ljava/lang/Object;
+    iget-object v3, p0, Lcom/facebook/drawee/controller/a$2;->Lc:Ljava/lang/Object;
 
-    iget-object v4, p0, Lcom/facebook/drawee/controller/a$2;->KM:Lcom/facebook/drawee/controller/a$a;
+    iget-object v4, p0, Lcom/facebook/drawee/controller/a$2;->Ld:Lcom/facebook/drawee/controller/a$a;
 
     invoke-virtual {v0, v1, v2, v3, v4}, Lcom/facebook/drawee/controller/a;->a(Lcom/facebook/drawee/d/a;Ljava/lang/Object;Ljava/lang/Object;Lcom/facebook/drawee/controller/a$a;)Lcom/facebook/b/c;
 
@@ -90,7 +90,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a$2;->KK:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a$2;->Lb:Ljava/lang/Object;
 
     invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/controller/a$a.smali b/com.discord/smali_classes2/com/facebook/drawee/controller/a$a.smali
index 101f72df56..892710219d 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/controller/a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/controller/a$a.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
-.field public static final enum KO:Lcom/facebook/drawee/controller/a$a;
+.field public static final enum Lf:Lcom/facebook/drawee/controller/a$a;
 
-.field public static final enum KP:Lcom/facebook/drawee/controller/a$a;
+.field public static final enum Lg:Lcom/facebook/drawee/controller/a$a;
 
-.field public static final enum KQ:Lcom/facebook/drawee/controller/a$a;
+.field public static final enum Lh:Lcom/facebook/drawee/controller/a$a;
 
-.field private static final synthetic KR:[Lcom/facebook/drawee/controller/a$a;
+.field private static final synthetic Li:[Lcom/facebook/drawee/controller/a$a;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/drawee/controller/a$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/controller/a$a;->KO:Lcom/facebook/drawee/controller/a$a;
+    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Lf:Lcom/facebook/drawee/controller/a$a;
 
     new-instance v0, Lcom/facebook/drawee/controller/a$a;
 
@@ -54,7 +54,7 @@
 
     invoke-direct {v0, v3, v2}, Lcom/facebook/drawee/controller/a$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/controller/a$a;->KP:Lcom/facebook/drawee/controller/a$a;
+    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Lg:Lcom/facebook/drawee/controller/a$a;
 
     new-instance v0, Lcom/facebook/drawee/controller/a$a;
 
@@ -64,25 +64,25 @@
 
     invoke-direct {v0, v4, v3}, Lcom/facebook/drawee/controller/a$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/controller/a$a;->KQ:Lcom/facebook/drawee/controller/a$a;
+    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Lh:Lcom/facebook/drawee/controller/a$a;
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lcom/facebook/drawee/controller/a$a;
 
-    sget-object v4, Lcom/facebook/drawee/controller/a$a;->KO:Lcom/facebook/drawee/controller/a$a;
+    sget-object v4, Lcom/facebook/drawee/controller/a$a;->Lf:Lcom/facebook/drawee/controller/a$a;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->KP:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Lg:Lcom/facebook/drawee/controller/a$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->KQ:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Lh:Lcom/facebook/drawee/controller/a$a;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/facebook/drawee/controller/a$a;->KR:[Lcom/facebook/drawee/controller/a$a;
+    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Li:[Lcom/facebook/drawee/controller/a$a;
 
     return-void
 .end method
@@ -117,7 +117,7 @@
 .method public static values()[Lcom/facebook/drawee/controller/a$a;
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/controller/a$a;->KR:[Lcom/facebook/drawee/controller/a$a;
+    sget-object v0, Lcom/facebook/drawee/controller/a$a;->Li:[Lcom/facebook/drawee/controller/a$a;
 
     invoke-virtual {v0}, [Lcom/facebook/drawee/controller/a$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$ScaleType.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$ScaleType.smali
index 6359691d31..12fcec7397 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$ScaleType.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$ScaleType.smali
@@ -15,64 +15,64 @@
 
 
 # static fields
-.field public static final MF:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final MX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final MG:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final MY:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final MH:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final MZ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final MI:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Na:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final MJ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Nb:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final MK:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Nc:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final ML:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Nd:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final MM:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ne:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final MN:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Nf:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$i;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$i;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MF:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MX:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$h;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$h;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MG:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MY:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$f;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$f;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MH:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MZ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$g;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$g;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MI:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Na:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$b;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$b;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MJ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Nb:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$d;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$d;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MK:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Nc:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$c;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$c;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->ML:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Nd:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$j;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$j;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MM:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ne:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$e;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$e;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MN:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Nf:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$b.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$b.smali
index 04ecde8b20..8917d42ff6 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$b.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$b.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/drawable/ScalingUtils$b;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$b;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$b;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$c.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$c.smali
index 2fe73b2ae1..4877a98690 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$c.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$c.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/drawable/ScalingUtils$c;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$c;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$c;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$d.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$d.smali
index 94c02ca44d..0bc56d09f0 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$d.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$d.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/drawable/ScalingUtils$d;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$d;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$d;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$e.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$e.smali
index ca0a00bf95..fb96313f95 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$e.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$e.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/drawable/ScalingUtils$e;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$e;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$e;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$f.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$f.smali
index 5f8a562a18..cd46c63209 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$f.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$f.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/drawable/ScalingUtils$f;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$f;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$f;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$g.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$g.smali
index f544b79022..c4f17956c3 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$g.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$g.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/drawable/ScalingUtils$g;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$g;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$g;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$h.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$h.smali
index f656458c98..5b661e5c2f 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$h.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$h.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/drawable/ScalingUtils$h;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$h;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$h;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$i.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$i.smali
index fc3dba1a21..abacacc69d 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$i.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$i.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/drawable/ScalingUtils$i;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$i;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$i;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$j.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$j.smali
index 23c9f02498..419cc25646 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$j.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$j.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/drawable/ScalingUtils$j;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$j;->MO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$j;->Ng:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/a$1.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/a$1.smali
index 2e9c19a3ad..848dc672e9 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/a$1.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic Ls:Lcom/facebook/drawee/drawable/a;
+.field final synthetic LJ:Lcom/facebook/drawee/drawable/a;
 
 .field final synthetic val$index:I
 
@@ -27,7 +27,7 @@
 .method public constructor <init>(Lcom/facebook/drawee/drawable/a;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/a$1;->Ls:Lcom/facebook/drawee/drawable/a;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/a$1;->LJ:Lcom/facebook/drawee/drawable/a;
 
     iput p2, p0, Lcom/facebook/drawee/drawable/a$1;->val$index:I
 
@@ -41,7 +41,7 @@
 .method public final c(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a$1;->Ls:Lcom/facebook/drawee/drawable/a;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a$1;->LJ:Lcom/facebook/drawee/drawable/a;
 
     iget v1, p0, Lcom/facebook/drawee/drawable/a$1;->val$index:I
 
@@ -55,7 +55,7 @@
 .method public final getDrawable()Landroid/graphics/drawable/Drawable;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a$1;->Ls:Lcom/facebook/drawee/drawable/a;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a$1;->LJ:Lcom/facebook/drawee/drawable/a;
 
     iget v1, p0, Lcom/facebook/drawee/drawable/a$1;->val$index:I
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/b.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/b.smali
index b1a7deb77b..f936d1aeca 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/b.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/b.smali
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private Lt:I
+.field private LK:I
 
-.field private Lu:Z
+.field private LL:Z
 
-.field Lv:F
+.field LM:F
 
-.field private Lw:Z
+.field private LN:Z
 
 
 # direct methods
@@ -40,17 +40,17 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/b;->Lv:F
+    iput p1, p0, Lcom/facebook/drawee/drawable/b;->LM:F
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->Lw:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->LN:Z
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/b;->Lt:I
+    iput p2, p0, Lcom/facebook/drawee/drawable/b;->LK:I
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->Lu:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->LL:Z
 
     return-void
 .end method
@@ -80,9 +80,9 @@
 
     sub-int/2addr v3, v4
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/b;->Lv:F
+    iget v4, p0, Lcom/facebook/drawee/drawable/b;->LM:F
 
-    iget-boolean v5, p0, Lcom/facebook/drawee/drawable/b;->Lu:Z
+    iget-boolean v5, p0, Lcom/facebook/drawee/drawable/b;->LL:Z
 
     if-nez v5, :cond_0
 
@@ -113,13 +113,13 @@
 
     invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
-    iget-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->Lw:Z
+    iget-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->LN:Z
 
     if-nez p1, :cond_1
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->Lw:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->LN:Z
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 
@@ -140,11 +140,11 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/b;->Lw:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/b;->LN:Z
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/b;->Lv:F
+    iget v0, p0, Lcom/facebook/drawee/drawable/b;->LM:F
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/b;->Lt:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/b;->LK:I
 
     int-to-float v1, v1
 
@@ -162,7 +162,7 @@
 
     add-float/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/b;->Lv:F
+    iput v0, p0, Lcom/facebook/drawee/drawable/b;->LM:F
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/b;->invalidateSelf()V
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/d.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/d.smali
index 940badfa0a..2e4d3a3fd8 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/d.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/d.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private Lx:Z
+.field private LO:Z
 
-.field private Ly:I
+.field private LP:I
 
-.field private Lz:I
+.field private LQ:I
 
 .field public mAlpha:I
 
@@ -27,15 +27,15 @@
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/d;->Lx:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/d;->LO:Z
 
     const/4 v1, 0x0
 
     iput-object v1, p0, Lcom/facebook/drawee/drawable/d;->mColorFilter:Landroid/graphics/ColorFilter;
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/d;->Ly:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/d;->LP:I
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/d;->Lz:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/d;->LQ:I
 
     return-void
 .end method
@@ -59,7 +59,7 @@
     invoke-virtual {p1, v0}, Landroid/graphics/drawable/Drawable;->setAlpha(I)V
 
     :cond_1
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/d;->Lx:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/d;->LO:Z
 
     if-eqz v0, :cond_2
 
@@ -68,7 +68,7 @@
     invoke-virtual {p1, v0}, Landroid/graphics/drawable/Drawable;->setColorFilter(Landroid/graphics/ColorFilter;)V
 
     :cond_2
-    iget v0, p0, Lcom/facebook/drawee/drawable/d;->Ly:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/d;->LP:I
 
     const/4 v2, 0x1
 
@@ -89,7 +89,7 @@
     invoke-virtual {p1, v0}, Landroid/graphics/drawable/Drawable;->setDither(Z)V
 
     :cond_4
-    iget v0, p0, Lcom/facebook/drawee/drawable/d;->Lz:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/d;->LQ:I
 
     if-eq v0, v1, :cond_6
 
@@ -114,7 +114,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/d;->Lx:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/d;->LO:Z
 
     return-void
 .end method
@@ -122,7 +122,7 @@
 .method public final setDither(Z)V
     .locals 0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/d;->Ly:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/d;->LP:I
 
     return-void
 .end method
@@ -130,7 +130,7 @@
 .method public final setFilterBitmap(Z)V
     .locals 0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/d;->Lz:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/d;->LQ:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/f.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/f.smali
index db9fa24ec1..a7a5362aea 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/f.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/f.smali
@@ -4,25 +4,25 @@
 
 
 # instance fields
-.field private final LA:Z
+.field private final LE:[Landroid/graphics/drawable/Drawable;
 
-.field private final LB:I
+.field private final LR:Z
 
-.field LC:I
+.field private final LS:I
 
-.field LD:I
+.field LU:I
 
-.field LE:J
+.field LV:I
 
-.field LF:[I
+.field LW:J
 
-.field LG:[I
+.field LX:[I
 
-.field LH:[Z
+.field LY:[I
 
-.field LI:I
+.field LZ:[Z
 
-.field private final Ln:[Landroid/graphics/drawable/Drawable;
+.field Ma:I
 
 .field mAlpha:I
 
@@ -63,19 +63,19 @@
 
     invoke-static {p2, v2}, Lcom/facebook/common/d/i;->a(ZLjava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/f;->Ln:[Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/f;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length p2, p1
 
     new-array p2, p2, [I
 
-    iput-object p2, p0, Lcom/facebook/drawee/drawable/f;->LF:[I
+    iput-object p2, p0, Lcom/facebook/drawee/drawable/f;->LX:[I
 
     array-length p2, p1
 
     new-array p2, p2, [I
 
-    iput-object p2, p0, Lcom/facebook/drawee/drawable/f;->LG:[I
+    iput-object p2, p0, Lcom/facebook/drawee/drawable/f;->LY:[I
 
     const/16 p2, 0xff
 
@@ -85,13 +85,13 @@
 
     new-array p1, p1, [Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/f;->LH:[Z
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/f;->LZ:[Z
 
-    iput v1, p0, Lcom/facebook/drawee/drawable/f;->LI:I
+    iput v1, p0, Lcom/facebook/drawee/drawable/f;->Ma:I
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/f;->LA:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/f;->LR:Z
 
-    iget-boolean p1, p0, Lcom/facebook/drawee/drawable/f;->LA:Z
+    iget-boolean p1, p0, Lcom/facebook/drawee/drawable/f;->LR:Z
 
     if-eqz p1, :cond_1
 
@@ -103,39 +103,39 @@
     const/4 p1, 0x0
 
     :goto_1
-    iput p1, p0, Lcom/facebook/drawee/drawable/f;->LB:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/f;->LS:I
 
     const/4 p1, 0x2
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/f;->LC:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/f;->LU:I
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->LF:[I
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->LX:[I
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/f;->LB:I
+    iget v2, p0, Lcom/facebook/drawee/drawable/f;->LS:I
 
     invoke-static {p1, v2}, Ljava/util/Arrays;->fill([II)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->LF:[I
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->LX:[I
 
     aput p2, p1, v1
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->LG:[I
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->LY:[I
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/f;->LB:I
+    iget v2, p0, Lcom/facebook/drawee/drawable/f;->LS:I
 
     invoke-static {p1, v2}, Ljava/util/Arrays;->fill([II)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->LG:[I
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->LY:[I
 
     aput p2, p1, v1
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->LH:[Z
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->LZ:[Z
 
-    iget-boolean p2, p0, Lcom/facebook/drawee/drawable/f;->LA:Z
+    iget-boolean p2, p0, Lcom/facebook/drawee/drawable/f;->LR:Z
 
     invoke-static {p1, p2}, Ljava/util/Arrays;->fill([ZZ)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->LH:[Z
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->LZ:[Z
 
     aput-boolean v0, p1, v1
 
@@ -154,13 +154,13 @@
     const/4 v3, 0x1
 
     :goto_0
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v4, v4
 
     if-ge v2, v4, :cond_5
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LH:[Z
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LZ:[Z
 
     aget-boolean v4, v4, v2
 
@@ -174,9 +174,9 @@
     const/4 v4, -0x1
 
     :goto_1
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/f;->LG:[I
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/f;->LY:[I
 
-    iget-object v6, p0, Lcom/facebook/drawee/drawable/f;->LF:[I
+    iget-object v6, p0, Lcom/facebook/drawee/drawable/f;->LX:[I
 
     aget v6, v6, v2
 
@@ -203,7 +203,7 @@
     aput v1, v5, v2
 
     :cond_1
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LG:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LY:[I
 
     aget v5, v4, v2
 
@@ -212,13 +212,13 @@
     aput v7, v4, v2
 
     :cond_2
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LH:[Z
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LZ:[Z
 
     aget-boolean v4, v4, v2
 
     if-eqz v4, :cond_3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LG:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LY:[I
 
     aget v4, v4, v2
 
@@ -227,13 +227,13 @@
     const/4 v3, 0x0
 
     :cond_3
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LH:[Z
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LZ:[Z
 
     aget-boolean v4, v4, v2
 
     if-nez v4, :cond_4
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LG:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LY:[I
 
     aget v4, v4, v2
 
@@ -255,9 +255,9 @@
 .method public final O(I)V
     .locals 1
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/f;->LD:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/f;->LV:I
 
-    iget p1, p0, Lcom/facebook/drawee/drawable/f;->LC:I
+    iget p1, p0, Lcom/facebook/drawee/drawable/f;->LU:I
 
     const/4 v0, 0x1
 
@@ -265,7 +265,7 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/f;->LC:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/f;->LU:I
 
     :cond_0
     return-void
@@ -276,9 +276,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->LC:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->LU:I
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->LH:[Z
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->LZ:[Z
 
     const/4 v1, 0x1
 
@@ -294,9 +294,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->LC:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->LU:I
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->LH:[Z
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->LZ:[Z
 
     aput-boolean v0, v1, p1
 
@@ -308,7 +308,7 @@
 .method public final draw(Landroid/graphics/Canvas;)V
     .locals 8
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/f;->LC:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->LU:I
 
     const/4 v1, 0x2
 
@@ -325,7 +325,7 @@
     goto :goto_4
 
     :cond_0
-    iget v0, p0, Lcom/facebook/drawee/drawable/f;->LD:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->LV:I
 
     if-lez v0, :cond_1
 
@@ -343,13 +343,13 @@
 
     move-result-wide v4
 
-    iget-wide v6, p0, Lcom/facebook/drawee/drawable/f;->LE:J
+    iget-wide v6, p0, Lcom/facebook/drawee/drawable/f;->LW:J
 
     sub-long/2addr v4, v6
 
     long-to-float v0, v4
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/f;->LD:I
+    iget v4, p0, Lcom/facebook/drawee/drawable/f;->LV:I
 
     int-to-float v4, v4
 
@@ -367,16 +367,16 @@
     const/4 v1, 0x1
 
     :goto_1
-    iput v1, p0, Lcom/facebook/drawee/drawable/f;->LC:I
+    iput v1, p0, Lcom/facebook/drawee/drawable/f;->LU:I
 
     goto :goto_4
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->LG:[I
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->LY:[I
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LF:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LX:[I
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/f;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/f;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v5, v5
 
@@ -386,9 +386,9 @@
 
     move-result-wide v4
 
-    iput-wide v4, p0, Lcom/facebook/drawee/drawable/f;->LE:J
+    iput-wide v4, p0, Lcom/facebook/drawee/drawable/f;->LW:J
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/f;->LD:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->LV:I
 
     if-nez v0, :cond_4
 
@@ -412,10 +412,10 @@
     const/4 v1, 0x1
 
     :goto_3
-    iput v1, p0, Lcom/facebook/drawee/drawable/f;->LC:I
+    iput v1, p0, Lcom/facebook/drawee/drawable/f;->LU:I
 
     :goto_4
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v4, v1
 
@@ -423,7 +423,7 @@
 
     aget-object v1, v1, v2
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LG:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->LY:[I
 
     aget v4, v4, v2
 
@@ -437,11 +437,11 @@
 
     if-lez v4, :cond_6
 
-    iget v5, p0, Lcom/facebook/drawee/drawable/f;->LI:I
+    iget v5, p0, Lcom/facebook/drawee/drawable/f;->Ma:I
 
     add-int/2addr v5, v3
 
-    iput v5, p0, Lcom/facebook/drawee/drawable/f;->LI:I
+    iput v5, p0, Lcom/facebook/drawee/drawable/f;->Ma:I
 
     invoke-virtual {v1}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable;
 
@@ -449,11 +449,11 @@
 
     invoke-virtual {v5, v4}, Landroid/graphics/drawable/Drawable;->setAlpha(I)V
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/f;->LI:I
+    iget v4, p0, Lcom/facebook/drawee/drawable/f;->Ma:I
 
     sub-int/2addr v4, v3
 
-    iput v4, p0, Lcom/facebook/drawee/drawable/f;->LI:I
+    iput v4, p0, Lcom/facebook/drawee/drawable/f;->Ma:I
 
     invoke-virtual {v1, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
@@ -471,40 +471,40 @@
     return-void
 .end method
 
-.method public final gI()V
+.method public final gM()V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/f;->LI:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Ma:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->LI:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ma:I
 
     return-void
 .end method
 
-.method public final gJ()V
+.method public final gN()V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/f;->LI:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Ma:I
 
     add-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->LI:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ma:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/f;->invalidateSelf()V
 
     return-void
 .end method
 
-.method public final gK()V
+.method public final gO()V
     .locals 2
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->LC:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->LU:I
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->LH:[Z
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->LZ:[Z
 
     const/4 v1, 0x1
 
@@ -515,27 +515,27 @@
     return-void
 .end method
 
-.method public final gL()V
+.method public final gP()V
     .locals 4
 
     const/4 v0, 0x2
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->LC:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->LU:I
 
     const/4 v0, 0x0
 
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/f;->Ln:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/f;->LE:[Landroid/graphics/drawable/Drawable;
 
     array-length v2, v2
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/f;->LG:[I
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/f;->LY:[I
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/f;->LH:[Z
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/f;->LZ:[Z
 
     aget-boolean v3, v3, v1
 
@@ -572,7 +572,7 @@
 .method public final invalidateSelf()V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/f;->LI:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Ma:I
 
     if-nez v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/h.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/h.smali
index 6e7e84f4f4..ed8d731d2e 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/h.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/h.smali
@@ -4,17 +4,17 @@
 
 
 # instance fields
-.field private LL:Landroid/graphics/Matrix;
+.field private Md:Landroid/graphics/Matrix;
 
-.field private LM:I
+.field private Me:I
 
-.field private LN:I
+.field private Mf:I
 
 .field private mMatrix:Landroid/graphics/Matrix;
 
 
 # direct methods
-.method private gM()V
+.method private gQ()V
     .locals 4
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/h;->getCurrent()Landroid/graphics/drawable/Drawable;
@@ -29,13 +29,13 @@
 
     move-result v2
 
-    iput v2, p0, Lcom/facebook/drawee/drawable/h;->LM:I
+    iput v2, p0, Lcom/facebook/drawee/drawable/h;->Me:I
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
 
     move-result v3
 
-    iput v3, p0, Lcom/facebook/drawee/drawable/h;->LN:I
+    iput v3, p0, Lcom/facebook/drawee/drawable/h;->Mf:I
 
     if-lez v2, :cond_1
 
@@ -50,7 +50,7 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->mMatrix:Landroid/graphics/Matrix;
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/h;->LL:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/h;->Md:Landroid/graphics/Matrix;
 
     return-void
 
@@ -60,7 +60,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/h;->LL:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/h;->Md:Landroid/graphics/Matrix;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     invoke-super {p0, p1}, Lcom/facebook/drawee/drawable/g;->c(Landroid/graphics/Matrix;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->LL:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->Md:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_0
 
@@ -85,7 +85,7 @@
 .method public final draw(Landroid/graphics/Canvas;)V
     .locals 2
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/h;->LM:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/h;->Me:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/h;->getCurrent()Landroid/graphics/drawable/Drawable;
 
@@ -97,7 +97,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/h;->LN:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/h;->Mf:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/h;->getCurrent()Landroid/graphics/drawable/Drawable;
 
@@ -110,10 +110,10 @@
     if-eq v0, v1, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->gM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->gQ()V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->LL:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->Md:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_2
 
@@ -127,7 +127,7 @@
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->clipRect(Landroid/graphics/Rect;)Z
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/h;->LL:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/h;->Md:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->concat(Landroid/graphics/Matrix;)V
 
@@ -150,7 +150,7 @@
 
     move-result-object p1
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->gM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->gQ()V
 
     return-object p1
 .end method
@@ -160,7 +160,7 @@
 
     invoke-super {p0, p1}, Lcom/facebook/drawee/drawable/g;->onBoundsChange(Landroid/graphics/Rect;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->gM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->gQ()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/i.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/i.smali
index 2ae6949c0e..e85ada766a 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/i.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/i.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field final LO:Landroid/graphics/Matrix;
+.field final Mg:Landroid/graphics/Matrix;
 
-.field private LP:I
+.field private Mh:I
 
-.field private LQ:I
+.field private Mi:I
 
 .field private final mTempMatrix:Landroid/graphics/Matrix;
 
@@ -69,11 +69,11 @@
 
     invoke-direct {p1}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/i;->LO:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/i;->Mg:Landroid/graphics/Matrix;
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/i;->LP:I
+    iput p2, p0, Lcom/facebook/drawee/drawable/i;->Mh:I
 
-    iput p3, p0, Lcom/facebook/drawee/drawable/i;->LQ:I
+    iput p3, p0, Lcom/facebook/drawee/drawable/i;->Mi:I
 
     return-void
 .end method
@@ -85,7 +85,7 @@
 
     invoke-virtual {p0, p1}, Lcom/facebook/drawee/drawable/i;->d(Landroid/graphics/Matrix;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/i;->LO:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/i;->Mg:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->isIdentity()Z
 
@@ -93,7 +93,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/i;->LO:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/i;->Mg:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v0}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
@@ -104,11 +104,11 @@
 .method public final draw(Landroid/graphics/Canvas;)V
     .locals 2
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->LP:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Mh:I
 
     if-gtz v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->LQ:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Mi:I
 
     if-eqz v0, :cond_0
 
@@ -126,7 +126,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->LO:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Mg:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->concat(Landroid/graphics/Matrix;)V
 
@@ -140,7 +140,7 @@
 .method public final getIntrinsicHeight()I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->LQ:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Mi:I
 
     const/4 v1, 0x5
 
@@ -150,7 +150,7 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->LP:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Mh:I
 
     rem-int/lit16 v0, v0, 0xb4
 
@@ -177,7 +177,7 @@
 .method public final getIntrinsicWidth()I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->LQ:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Mi:I
 
     const/4 v1, 0x5
 
@@ -187,7 +187,7 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->LP:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Mh:I
 
     rem-int/lit16 v0, v0, 0xb4
 
@@ -218,11 +218,11 @@
 
     move-result-object v0
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/i;->LP:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Mh:I
 
     if-gtz v1, :cond_1
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/i;->LQ:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Mi:I
 
     if-eqz v1, :cond_0
 
@@ -239,7 +239,7 @@
 
     :cond_1
     :goto_0
-    iget v1, p0, Lcom/facebook/drawee/drawable/i;->LQ:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Mi:I
 
     const/4 v2, 0x2
 
@@ -263,9 +263,9 @@
 
     if-eq v1, v2, :cond_2
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->LO:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Mg:Landroid/graphics/Matrix;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/i;->LP:I
+    iget v2, p0, Lcom/facebook/drawee/drawable/i;->Mh:I
 
     int-to-float v2, v2
 
@@ -286,7 +286,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->LO:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Mg:Landroid/graphics/Matrix;
 
     invoke-virtual {p1}, Landroid/graphics/Rect;->centerX()I
 
@@ -302,21 +302,21 @@
 
     invoke-virtual {v1, v5, v2, v6}, Landroid/graphics/Matrix;->setRotate(FFF)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->LO:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Mg:Landroid/graphics/Matrix;
 
     invoke-virtual {v1, v3, v4}, Landroid/graphics/Matrix;->postScale(FF)Z
 
     goto :goto_1
 
     :cond_3
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->LO:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Mg:Landroid/graphics/Matrix;
 
     invoke-virtual {v1, v3, v4}, Landroid/graphics/Matrix;->setScale(FF)V
 
     goto :goto_1
 
     :cond_4
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->LO:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Mg:Landroid/graphics/Matrix;
 
     invoke-virtual {p1}, Landroid/graphics/Rect;->centerX()I
 
@@ -332,14 +332,14 @@
 
     invoke-virtual {v1, v5, v2, v6}, Landroid/graphics/Matrix;->setRotate(FFF)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->LO:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Mg:Landroid/graphics/Matrix;
 
     invoke-virtual {v1, v4, v3}, Landroid/graphics/Matrix;->postScale(FF)Z
 
     goto :goto_1
 
     :cond_5
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->LO:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Mg:Landroid/graphics/Matrix;
 
     invoke-virtual {v1, v4, v3}, Landroid/graphics/Matrix;->setScale(FF)V
 
@@ -348,7 +348,7 @@
 
     invoke-virtual {v1}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->LO:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Mg:Landroid/graphics/Matrix;
 
     iget-object v2, p0, Lcom/facebook/drawee/drawable/i;->mTempMatrix:Landroid/graphics/Matrix;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/m$1.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/m$1.smali
index 0f1305767b..9d383f5bf0 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/m$1.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/m$1.smali
@@ -15,14 +15,14 @@
 
 
 # static fields
-.field static final synthetic Mj:[I
+.field static final synthetic MA:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 3
 
-    invoke-static {}, Lcom/facebook/drawee/drawable/m$a;->gQ()[I
+    invoke-static {}, Lcom/facebook/drawee/drawable/m$a;->gU()[I
 
     move-result-object v0
 
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/drawee/drawable/m$1;->Mj:[I
+    sput-object v0, Lcom/facebook/drawee/drawable/m$1;->MA:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/facebook/drawee/drawable/m$1;->Mj:[I
+    sget-object v1, Lcom/facebook/drawee/drawable/m$1;->MA:[I
 
-    sget v2, Lcom/facebook/drawee/drawable/m$a;->Ml:I
+    sget v2, Lcom/facebook/drawee/drawable/m$a;->MC:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/facebook/drawee/drawable/m$1;->Mj:[I
+    sget-object v1, Lcom/facebook/drawee/drawable/m$1;->MA:[I
 
-    sget v2, Lcom/facebook/drawee/drawable/m$a;->Mk:I
+    sget v2, Lcom/facebook/drawee/drawable/m$a;->MB:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/m$a.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/m$a.smali
index 98d2e2dcc2..b807877cdc 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/m$a.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/m$a.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
-.field public static final Mk:I = 0x1
+.field public static final MB:I = 0x1
 
-.field public static final Ml:I = 0x2
+.field public static final MC:I = 0x2
 
-.field private static final synthetic Mm:[I
+.field private static final synthetic MD:[I
 
 
 # direct methods
@@ -38,27 +38,27 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/drawee/drawable/m$a;->Mk:I
+    sget v1, Lcom/facebook/drawee/drawable/m$a;->MB:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/drawee/drawable/m$a;->Ml:I
+    sget v1, Lcom/facebook/drawee/drawable/m$a;->MC:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/drawee/drawable/m$a;->Mm:[I
+    sput-object v0, Lcom/facebook/drawee/drawable/m$a;->MD:[I
 
     return-void
 .end method
 
-.method public static gQ()[I
+.method public static gU()[I
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/drawable/m$a;->Mm:[I
+    sget-object v0, Lcom/facebook/drawee/drawable/m$a;->MD:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/o.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/o.smali
index 3bdbdfcb63..c90aa38f68 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/o.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/o.smali
@@ -19,7 +19,7 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->gO()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->gS()Z
 
     move-result v0
 
@@ -32,9 +32,9 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->gR()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->gV()V
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->gP()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->gT()V
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/o;->mPath:Landroid/graphics/Path;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/generic/d$a.smali b/com.discord/smali_classes2/com/facebook/drawee/generic/d$a.smali
index 475f2eee4b..50312685af 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/generic/d$a.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/generic/d$a.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
-.field public static final enum Nq:Lcom/facebook/drawee/generic/d$a;
+.field public static final enum NI:Lcom/facebook/drawee/generic/d$a;
 
-.field public static final enum Nr:Lcom/facebook/drawee/generic/d$a;
+.field public static final enum NJ:Lcom/facebook/drawee/generic/d$a;
 
-.field private static final synthetic Ns:[Lcom/facebook/drawee/generic/d$a;
+.field private static final synthetic NK:[Lcom/facebook/drawee/generic/d$a;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/drawee/generic/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/generic/d$a;->Nq:Lcom/facebook/drawee/generic/d$a;
+    sput-object v0, Lcom/facebook/drawee/generic/d$a;->NI:Lcom/facebook/drawee/generic/d$a;
 
     new-instance v0, Lcom/facebook/drawee/generic/d$a;
 
@@ -52,21 +52,21 @@
 
     invoke-direct {v0, v3, v2}, Lcom/facebook/drawee/generic/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/drawee/generic/d$a;->Nr:Lcom/facebook/drawee/generic/d$a;
+    sput-object v0, Lcom/facebook/drawee/generic/d$a;->NJ:Lcom/facebook/drawee/generic/d$a;
 
     const/4 v0, 0x2
 
     new-array v0, v0, [Lcom/facebook/drawee/generic/d$a;
 
-    sget-object v3, Lcom/facebook/drawee/generic/d$a;->Nq:Lcom/facebook/drawee/generic/d$a;
+    sget-object v3, Lcom/facebook/drawee/generic/d$a;->NI:Lcom/facebook/drawee/generic/d$a;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/facebook/drawee/generic/d$a;->Nr:Lcom/facebook/drawee/generic/d$a;
+    sget-object v1, Lcom/facebook/drawee/generic/d$a;->NJ:Lcom/facebook/drawee/generic/d$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/facebook/drawee/generic/d$a;->Ns:[Lcom/facebook/drawee/generic/d$a;
+    sput-object v0, Lcom/facebook/drawee/generic/d$a;->NK:[Lcom/facebook/drawee/generic/d$a;
 
     return-void
 .end method
@@ -101,7 +101,7 @@
 .method public static values()[Lcom/facebook/drawee/generic/d$a;
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/generic/d$a;->Ns:[Lcom/facebook/drawee/generic/d$a;
+    sget-object v0, Lcom/facebook/drawee/generic/d$a;->NK:[Lcom/facebook/drawee/generic/d$a;
 
     invoke-virtual {v0}, [Lcom/facebook/drawee/generic/d$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/span/DraweeSpanStringBuilder$a.smali b/com.discord/smali_classes2/com/facebook/drawee/span/DraweeSpanStringBuilder$a.smali
index f56a42badd..75763ba589 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/span/DraweeSpanStringBuilder$a.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/span/DraweeSpanStringBuilder$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+.field final synthetic Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,7 +45,7 @@
 .method public final invalidateDrawable(Landroid/graphics/drawable/Drawable;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->a(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/view/View;
 
@@ -53,7 +53,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->a(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/view/View;
 
@@ -64,7 +64,7 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->b(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/graphics/drawable/Drawable;
 
@@ -72,7 +72,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->b(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/graphics/drawable/Drawable;
 
@@ -87,7 +87,7 @@
 .method public final scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V
     .locals 2
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->a(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/view/View;
 
@@ -101,7 +101,7 @@
 
     sub-long/2addr p3, v0
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->a(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/view/View;
 
@@ -112,7 +112,7 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->b(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/graphics/drawable/Drawable;
 
@@ -120,7 +120,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->b(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/graphics/drawable/Drawable;
 
@@ -135,7 +135,7 @@
 .method public final unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->a(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/view/View;
 
@@ -143,7 +143,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->a(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/view/View;
 
@@ -154,7 +154,7 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->b(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/graphics/drawable/Drawable;
 
@@ -162,7 +162,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->b(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/graphics/drawable/Drawable;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/span/DraweeSpanStringBuilder$b.smali b/com.discord/smali_classes2/com/facebook/drawee/span/DraweeSpanStringBuilder$b.smali
index e510b141df..a9ce6ea9fc 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/span/DraweeSpanStringBuilder$b.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/span/DraweeSpanStringBuilder$b.smali
@@ -1,4 +1,4 @@
-.class final Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;
+.class public final Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;
 .super Lcom/facebook/drawee/controller/b;
 .source "DraweeSpanStringBuilder.java"
 
@@ -9,7 +9,7 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x0
+    accessFlags = 0x1
     name = "b"
 .end annotation
 
@@ -23,32 +23,32 @@
 
 
 # instance fields
-.field final synthetic NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+.field final synthetic Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
-.field private final NI:Lcom/facebook/drawee/span/a;
+.field private final Ob:Lcom/facebook/drawee/span/a;
 
-.field private final NJ:Z
+.field private final Oc:Z
 
-.field private final NK:I
+.field private final Od:I
 
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;Lcom/facebook/drawee/span/a;ZI)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-direct {p0}, Lcom/facebook/drawee/controller/b;-><init>()V
 
     invoke-static {p2}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NI:Lcom/facebook/drawee/span/a;
+    iput-object p2, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Ob:Lcom/facebook/drawee/span/a;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NJ:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Oc:Z
 
-    iput p4, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NK:I
+    iput p4, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Od:I
 
     return-void
 .end method
@@ -60,15 +60,15 @@
 
     check-cast p2, Lcom/facebook/imagepipeline/f/f;
 
-    iget-boolean p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NJ:Z
+    iget-boolean p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Oc:Z
 
     if-eqz p1, :cond_4
 
     if-eqz p2, :cond_4
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NI:Lcom/facebook/drawee/span/a;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Ob:Lcom/facebook/drawee/span/a;
 
-    iget-object p1, p1, Lcom/facebook/drawee/span/a;->NB:Lcom/facebook/drawee/view/b;
+    iget-object p1, p1, Lcom/facebook/drawee/span/a;->NU:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/b;->getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -76,9 +76,9 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NI:Lcom/facebook/drawee/span/a;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Ob:Lcom/facebook/drawee/span/a;
 
-    iget-object p1, p1, Lcom/facebook/drawee/span/a;->NB:Lcom/facebook/drawee/view/b;
+    iget-object p1, p1, Lcom/facebook/drawee/span/a;->NU:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/b;->getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -88,7 +88,7 @@
 
     move-result-object p3
 
-    iget v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NK:I
+    iget v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Od:I
 
     const/4 v1, -0x1
 
@@ -126,16 +126,16 @@
 
     move-result p3
 
-    iget v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NK:I
+    iget v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Od:I
 
     if-eq p3, v0, :cond_1
 
     :cond_0
-    iget p3, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NK:I
+    iget p3, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Od:I
 
     invoke-virtual {p1, v2, v2, p2, p3}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->c(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
 
@@ -143,7 +143,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->c(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
 
@@ -182,7 +182,7 @@
 
     invoke-virtual {p1, v2, v2, p3, p2}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->c(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
 
@@ -190,7 +190,7 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->NH:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Oa:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-static {p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->c(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/span/DraweeSpanStringBuilder.smali b/com.discord/smali_classes2/com/facebook/drawee/span/DraweeSpanStringBuilder.smali
index 3c4842b485..67a042f410 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/span/DraweeSpanStringBuilder.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/span/DraweeSpanStringBuilder.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private final NC:Ljava/util/Set;
+.field public final NV:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -24,13 +24,13 @@
     .end annotation
 .end field
 
-.field private final ND:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
+.field public final NW:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
 
-.field private NE:Landroid/view/View;
+.field private NX:Landroid/view/View;
 
-.field private NF:Landroid/graphics/drawable/Drawable;
+.field private NY:Landroid/graphics/drawable/Drawable;
 
-.field private NG:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
+.field private NZ:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
 
 
 # direct methods
@@ -43,7 +43,7 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NC:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NV:Ljava/util/Set;
 
     new-instance v0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
 
@@ -51,7 +51,7 @@
 
     invoke-direct {v0, p0, v1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;-><init>(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;B)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->ND:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
+    iput-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NW:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 .method static synthetic a(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/view/View;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NE:Landroid/view/View;
+    iget-object p0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NX:Landroid/view/View;
 
     return-object p0
 .end method
@@ -67,7 +67,7 @@
 .method static synthetic b(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Landroid/graphics/drawable/Drawable;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NF:Landroid/graphics/drawable/Drawable;
+    iget-object p0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NY:Landroid/graphics/drawable/Drawable;
 
     return-object p0
 .end method
@@ -75,7 +75,7 @@
 .method static synthetic c(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NG:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
+    iget-object p0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NZ:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
 
     return-object p0
 .end method
@@ -83,7 +83,7 @@
 .method private g(Landroid/view/View;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NE:Landroid/view/View;
+    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NX:Landroid/view/View;
 
     if-eq p1, v0, :cond_0
 
@@ -92,98 +92,24 @@
     :cond_0
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NE:Landroid/view/View;
+    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NX:Landroid/view/View;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final a(Landroid/content/Context;Lcom/facebook/drawee/d/b;Lcom/facebook/drawee/d/a;IIIII)V
-    .locals 1
-
-    invoke-static {p2}, Lcom/facebook/drawee/view/b;->a(Lcom/facebook/drawee/d/b;)Lcom/facebook/drawee/view/b;
-
-    move-result-object p1
-
-    invoke-virtual {p1, p3}, Lcom/facebook/drawee/view/b;->setController(Lcom/facebook/drawee/d/a;)V
-
-    invoke-virtual {p0}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->length()I
-
-    move-result p2
-
-    if-ge p5, p2, :cond_3
-
-    invoke-virtual {p1}, Lcom/facebook/drawee/view/b;->getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
-
-    move-result-object p2
-
-    const/4 p3, 0x0
-
-    if-eqz p2, :cond_1
-
-    invoke-virtual {p2}, Landroid/graphics/drawable/Drawable;->getBounds()Landroid/graphics/Rect;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Landroid/graphics/Rect;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p2, p3, p3, p6, p7}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
-
-    :cond_0
-    iget-object p6, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->ND:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
-
-    invoke-virtual {p2, p6}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
-
-    :cond_1
-    new-instance p2, Lcom/facebook/drawee/span/a;
-
-    invoke-direct {p2, p1, p8}, Lcom/facebook/drawee/span/a;-><init>(Lcom/facebook/drawee/view/b;I)V
-
-    iget-object p1, p1, Lcom/facebook/drawee/view/b;->NQ:Lcom/facebook/drawee/d/a;
-
-    instance-of p6, p1, Lcom/facebook/drawee/controller/AbstractDraweeController;
-
-    if-eqz p6, :cond_2
-
-    check-cast p1, Lcom/facebook/drawee/controller/AbstractDraweeController;
-
-    new-instance p6, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;
-
-    invoke-direct {p6, p0, p2, p3, p7}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;-><init>(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;Lcom/facebook/drawee/span/a;ZI)V
-
-    invoke-virtual {p1, p6}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Lcom/facebook/drawee/controller/ControllerListener;)V
-
-    :cond_2
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NC:Ljava/util/Set;
-
-    invoke-interface {p1, p2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 p5, p5, 0x1
-
-    const/16 p1, 0x21
-
-    invoke-virtual {p0, p2, p4, p5, p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->setSpan(Ljava/lang/Object;III)V
-
-    :cond_3
-    return-void
-.end method
-
 .method public final e(Landroid/view/View;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NE:Landroid/view/View;
+    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NX:Landroid/view/View;
 
     if-eqz v0, :cond_0
 
     invoke-direct {p0, v0}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->g(Landroid/view/View;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NF:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NY:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_1
 
@@ -191,12 +117,12 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NF:Landroid/graphics/drawable/Drawable;
+    iput-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NY:Landroid/graphics/drawable/Drawable;
 
     :cond_1
-    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NE:Landroid/view/View;
+    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NX:Landroid/view/View;
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NC:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NV:Ljava/util/Set;
 
     invoke-interface {p1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -215,9 +141,9 @@
 
     check-cast v0, Lcom/facebook/drawee/span/a;
 
-    iget-object v0, v0, Lcom/facebook/drawee/span/a;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, v0, Lcom/facebook/drawee/span/a;->NU:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gA()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->gE()V
 
     goto :goto_0
 
@@ -230,7 +156,7 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->g(Landroid/view/View;)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NC:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->NV:Ljava/util/Set;
 
     invoke-interface {p1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -249,7 +175,7 @@
 
     check-cast v0, Lcom/facebook/drawee/span/a;
 
-    iget-object v0, v0, Lcom/facebook/drawee/span/a;->NB:Lcom/facebook/drawee/view/b;
+    iget-object v0, v0, Lcom/facebook/drawee/span/a;->NU:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->onDetach()V
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/span/a.smali b/com.discord/smali_classes2/com/facebook/drawee/span/a.smali
index 2e3427b316..9ddc1742a5 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/span/a.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/span/a.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final NB:Lcom/facebook/drawee/view/b;
+.field final NU:Lcom/facebook/drawee/view/b;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {p0, v0, p2}, Lcom/facebook/e/a/a/a;-><init>(Landroid/graphics/drawable/Drawable;I)V
 
-    iput-object p1, p0, Lcom/facebook/drawee/span/a;->NB:Lcom/facebook/drawee/view/b;
+    iput-object p1, p0, Lcom/facebook/drawee/span/a;->NU:Lcom/facebook/drawee/view/b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/e/a/a/a.smali b/com.discord/smali_classes2/com/facebook/e/a/a/a.smali
index b708ae065b..1d91de472c 100644
--- a/com.discord/smali_classes2/com/facebook/e/a/a/a.smali
+++ b/com.discord/smali_classes2/com/facebook/e/a/a/a.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final aaK:I
+.field private final abc:I
 
-.field private final aaL:Landroid/graphics/Paint$FontMetricsInt;
+.field private final abd:Landroid/graphics/Paint$FontMetricsInt;
 
 .field private mBounds:Landroid/graphics/Rect;
 
@@ -27,11 +27,11 @@
 
     invoke-direct {v0}, Landroid/graphics/Paint$FontMetricsInt;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/e/a/a/a;->aaL:Landroid/graphics/Paint$FontMetricsInt;
+    iput-object v0, p0, Lcom/facebook/e/a/a/a;->abd:Landroid/graphics/Paint$FontMetricsInt;
 
     iput-object p1, p0, Lcom/facebook/e/a/a/a;->mDrawable:Landroid/graphics/drawable/Drawable;
 
-    iput p2, p0, Lcom/facebook/e/a/a/a;->aaK:I
+    iput p2, p0, Lcom/facebook/e/a/a/a;->abc:I
 
     invoke-direct {p0}, Lcom/facebook/e/a/a/a;->aV()V
 
@@ -41,7 +41,7 @@
 .method private a(Landroid/graphics/Paint$FontMetricsInt;)I
     .locals 3
 
-    iget v0, p0, Lcom/facebook/e/a/a/a;->aaK:I
+    iget v0, p0, Lcom/facebook/e/a/a/a;->abc:I
 
     if-eqz v0, :cond_1
 
@@ -119,11 +119,11 @@
 .method public draw(Landroid/graphics/Canvas;Ljava/lang/CharSequence;IIFIIILandroid/graphics/Paint;)V
     .locals 0
 
-    iget-object p2, p0, Lcom/facebook/e/a/a/a;->aaL:Landroid/graphics/Paint$FontMetricsInt;
+    iget-object p2, p0, Lcom/facebook/e/a/a/a;->abd:Landroid/graphics/Paint$FontMetricsInt;
 
     invoke-virtual {p9, p2}, Landroid/graphics/Paint;->getFontMetricsInt(Landroid/graphics/Paint$FontMetricsInt;)I
 
-    iget-object p2, p0, Lcom/facebook/e/a/a/a;->aaL:Landroid/graphics/Paint$FontMetricsInt;
+    iget-object p2, p0, Lcom/facebook/e/a/a/a;->abd:Landroid/graphics/Paint$FontMetricsInt;
 
     invoke-direct {p0, p2}, Lcom/facebook/e/a/a/a;->a(Landroid/graphics/Paint$FontMetricsInt;)I
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/a/c$1.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/a/c$1.smali
index 3f24adf479..6cf6d0ea23 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/a/c$1.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/a/c$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Og:Lcom/facebook/fresco/animation/a/c;
+.field final synthetic Oy:Lcom/facebook/fresco/animation/a/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/fresco/animation/a/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/a/c$1;->Og:Lcom/facebook/fresco/animation/a/c;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/a/c$1;->Oy:Lcom/facebook/fresco/animation/a/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,30 +37,30 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c$1;->Og:Lcom/facebook/fresco/animation/a/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c$1;->Oy:Lcom/facebook/fresco/animation/a/c;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->Og:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->Oy:Lcom/facebook/fresco/animation/a/c;
 
     const/4 v2, 0x0
 
-    iput-boolean v2, v1, Lcom/facebook/fresco/animation/a/c;->Oa:Z
+    iput-boolean v2, v1, Lcom/facebook/fresco/animation/a/c;->Os:Z
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->Og:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->Oy:Lcom/facebook/fresco/animation/a/c;
 
-    iget-object v3, v1, Lcom/facebook/fresco/animation/a/c;->Jo:Lcom/facebook/common/time/b;
+    iget-object v3, v1, Lcom/facebook/fresco/animation/a/c;->JF:Lcom/facebook/common/time/b;
 
     invoke-interface {v3}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v3
 
-    iget-wide v5, v1, Lcom/facebook/fresco/animation/a/c;->Ob:J
+    iget-wide v5, v1, Lcom/facebook/fresco/animation/a/c;->Ot:J
 
     sub-long/2addr v3, v5
 
-    iget-wide v5, v1, Lcom/facebook/fresco/animation/a/c;->Oc:J
+    iget-wide v5, v1, Lcom/facebook/fresco/animation/a/c;->Ou:J
 
     cmp-long v1, v3, v5
 
@@ -71,24 +71,24 @@
     :cond_0
     if-eqz v2, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->Og:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->Oy:Lcom/facebook/fresco/animation/a/c;
 
-    iget-object v1, v1, Lcom/facebook/fresco/animation/a/c;->Oe:Lcom/facebook/fresco/animation/a/c$a;
+    iget-object v1, v1, Lcom/facebook/fresco/animation/a/c;->Ow:Lcom/facebook/fresco/animation/a/c$a;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->Og:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->Oy:Lcom/facebook/fresco/animation/a/c;
 
-    iget-object v1, v1, Lcom/facebook/fresco/animation/a/c;->Oe:Lcom/facebook/fresco/animation/a/c$a;
+    iget-object v1, v1, Lcom/facebook/fresco/animation/a/c;->Ow:Lcom/facebook/fresco/animation/a/c$a;
 
     invoke-interface {v1}, Lcom/facebook/fresco/animation/a/c$a;->onInactive()V
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->Og:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->Oy:Lcom/facebook/fresco/animation/a/c;
 
-    invoke-virtual {v1}, Lcom/facebook/fresco/animation/a/c;->hg()V
+    invoke-virtual {v1}, Lcom/facebook/fresco/animation/a/c;->hj()V
 
     :cond_2
     :goto_0
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/b/b/c$a.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/b/b/c$a.smali
index 74d782f7db..607c590bf4 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/b/b/c$a.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/b/b/c$a.smali
@@ -18,32 +18,32 @@
 
 
 # instance fields
-.field private final NY:Lcom/facebook/fresco/animation/a/a;
+.field private final OA:Lcom/facebook/fresco/animation/b/b;
 
-.field private final Oi:Lcom/facebook/fresco/animation/b/b;
+.field private final OP:I
 
-.field private final Ow:I
+.field private final OQ:I
 
-.field private final Ox:I
+.field final synthetic OR:Lcom/facebook/fresco/animation/b/b/c;
 
-.field final synthetic Oy:Lcom/facebook/fresco/animation/b/b/c;
+.field private final Oq:Lcom/facebook/fresco/animation/a/a;
 
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/fresco/animation/b/b/c;Lcom/facebook/fresco/animation/a/a;Lcom/facebook/fresco/animation/b/b;II)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oy:Lcom/facebook/fresco/animation/b/b/c;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OR:Lcom/facebook/fresco/animation/b/b/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oi:Lcom/facebook/fresco/animation/b/b;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OA:Lcom/facebook/fresco/animation/b/b;
 
-    iput p4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Ow:I
+    iput p4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OP:I
 
-    iput p5, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Ox:I
+    iput p5, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OQ:I
 
     return-void
 .end method
@@ -70,7 +70,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oy:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OR:Lcom/facebook/fresco/animation/b/b/c;
 
     invoke-static {v0}, Lcom/facebook/fresco/animation/b/b/c;->d(Lcom/facebook/fresco/animation/b/b/c;)Lcom/facebook/fresco/animation/b/c;
 
@@ -91,11 +91,11 @@
     return v1
 
     :cond_1
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->hl()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->ho()Ljava/lang/Class;
 
     move-result-object p1
 
-    iget v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Ow:I
+    iget v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OP:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -105,7 +105,7 @@
 
     invoke-static {p1, v1, v0}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oy:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OR:Lcom/facebook/fresco/animation/b/b/c;
 
     invoke-static {p1}, Lcom/facebook/fresco/animation/b/b/c;->a(Lcom/facebook/fresco/animation/b/b/c;)Landroid/util/SparseArray;
 
@@ -114,9 +114,9 @@
     monitor-enter p1
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oi:Lcom/facebook/fresco/animation/b/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OA:Lcom/facebook/fresco/animation/b/b;
 
-    iget v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Ow:I
+    iget v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OP:I
 
     invoke-interface {v0, v1, p2}, Lcom/facebook/fresco/animation/b/b;->c(ILcom/facebook/common/references/CloseableReference;)V
 
@@ -151,25 +151,25 @@
     if-eq p2, v1, :cond_0
 
     :try_start_0
-    iget-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oy:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OR:Lcom/facebook/fresco/animation/b/b/c;
 
     invoke-static {p2}, Lcom/facebook/fresco/animation/b/b/c;->c(Lcom/facebook/fresco/animation/b/b/c;)Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     move-result-object p2
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     invoke-interface {v1}, Lcom/facebook/fresco/animation/a/a;->getIntrinsicWidth()I
 
     move-result v1
 
-    iget-object v4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->NY:Lcom/facebook/fresco/animation/a/a;
+    iget-object v4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oq:Lcom/facebook/fresco/animation/a/a;
 
     invoke-interface {v4}, Lcom/facebook/fresco/animation/a/a;->getIntrinsicHeight()I
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oy:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v5, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OR:Lcom/facebook/fresco/animation/b/b/c;
 
     invoke-static {v5}, Lcom/facebook/fresco/animation/b/b/c;->b(Lcom/facebook/fresco/animation/b/b/c;)Landroid/graphics/Bitmap$Config;
 
@@ -197,7 +197,7 @@
     move-exception p1
 
     :try_start_1
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->hl()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->ho()Ljava/lang/Class;
 
     move-result-object p2
 
@@ -215,9 +215,9 @@
 
     :cond_0
     :try_start_2
-    iget-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oi:Lcom/facebook/fresco/animation/b/b;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OA:Lcom/facebook/fresco/animation/b/b;
 
-    invoke-interface {p2}, Lcom/facebook/fresco/animation/b/b;->hj()Lcom/facebook/common/references/CloseableReference;
+    invoke-interface {p2}, Lcom/facebook/fresco/animation/b/b;->hm()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p2
 
@@ -267,9 +267,9 @@
     .locals 5
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oi:Lcom/facebook/fresco/animation/b/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OA:Lcom/facebook/fresco/animation/b/b;
 
-    iget v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Ow:I
+    iget v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OP:I
 
     invoke-interface {v0, v1}, Lcom/facebook/fresco/animation/b/b;->contains(I)Z
 
@@ -277,13 +277,13 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->hl()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->ho()Ljava/lang/Class;
 
     move-result-object v0
 
     const-string v1, "Frame %d is cached already."
 
-    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Ow:I
+    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OP:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -293,7 +293,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oy:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OR:Lcom/facebook/fresco/animation/b/b/c;
 
     invoke-static {v0}, Lcom/facebook/fresco/animation/b/b/c;->a(Lcom/facebook/fresco/animation/b/b/c;)Landroid/util/SparseArray;
 
@@ -302,13 +302,13 @@
     monitor-enter v0
 
     :try_start_1
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oy:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OR:Lcom/facebook/fresco/animation/b/b/c;
 
     invoke-static {v1}, Lcom/facebook/fresco/animation/b/b/c;->a(Lcom/facebook/fresco/animation/b/b/c;)Landroid/util/SparseArray;
 
     move-result-object v1
 
-    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Ox:I
+    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OQ:I
 
     invoke-virtual {v1, v2}, Landroid/util/SparseArray;->remove(I)V
 
@@ -327,7 +327,7 @@
 
     :cond_0
     :try_start_2
-    iget v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Ow:I
+    iget v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OP:I
 
     const/4 v1, 0x1
 
@@ -337,13 +337,13 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->hl()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->ho()Ljava/lang/Class;
 
     move-result-object v0
 
     const-string v1, "Prepared frame frame %d."
 
-    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Ow:I
+    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OP:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -354,7 +354,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->hl()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->ho()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -364,7 +364,7 @@
 
     const/4 v3, 0x0
 
-    iget v4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Ow:I
+    iget v4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OP:I
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -377,7 +377,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_2
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oy:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OR:Lcom/facebook/fresco/animation/b/b/c;
 
     invoke-static {v0}, Lcom/facebook/fresco/animation/b/b/c;->a(Lcom/facebook/fresco/animation/b/b/c;)Landroid/util/SparseArray;
 
@@ -386,13 +386,13 @@
     monitor-enter v0
 
     :try_start_3
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oy:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OR:Lcom/facebook/fresco/animation/b/b/c;
 
     invoke-static {v1}, Lcom/facebook/fresco/animation/b/b/c;->a(Lcom/facebook/fresco/animation/b/b/c;)Landroid/util/SparseArray;
 
     move-result-object v1
 
-    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Ox:I
+    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OQ:I
 
     invoke-virtual {v1, v2}, Landroid/util/SparseArray;->remove(I)V
 
@@ -412,7 +412,7 @@
     :catchall_2
     move-exception v0
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oy:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OR:Lcom/facebook/fresco/animation/b/b/c;
 
     invoke-static {v1}, Lcom/facebook/fresco/animation/b/b/c;->a(Lcom/facebook/fresco/animation/b/b/c;)Landroid/util/SparseArray;
 
@@ -421,13 +421,13 @@
     monitor-enter v1
 
     :try_start_4
-    iget-object v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Oy:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OR:Lcom/facebook/fresco/animation/b/b/c;
 
     invoke-static {v2}, Lcom/facebook/fresco/animation/b/b/c;->a(Lcom/facebook/fresco/animation/b/b/c;)Landroid/util/SparseArray;
 
     move-result-object v2
 
-    iget v3, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Ox:I
+    iget v3, p0, Lcom/facebook/fresco/animation/b/b/c$a;->OQ:I
 
     invoke-virtual {v2, v3}, Landroid/util/SparseArray;->remove(I)V
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/b/b/c.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/b/b/c.smali
index dc91e22a3d..a9ef557472 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/b/b/c.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/b/b/c.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -26,15 +26,13 @@
 
 
 # instance fields
-.field private final Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final OC:Lcom/facebook/fresco/animation/b/c;
 
-.field private final Ok:Lcom/facebook/fresco/animation/b/c;
+.field private final OF:Landroid/graphics/Bitmap$Config;
 
-.field private final On:Landroid/graphics/Bitmap$Config;
+.field private final ON:Ljava/util/concurrent/ExecutorService;
 
-.field private final Ou:Ljava/util/concurrent/ExecutorService;
-
-.field private final Ov:Landroid/util/SparseArray;
+.field private final OO:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -44,6 +42,8 @@
     .end annotation
 .end field
 
+.field private final Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -51,7 +51,7 @@
 
     const-class v0, Lcom/facebook/fresco/animation/b/b/c;
 
-    sput-object v0, Lcom/facebook/fresco/animation/b/b/c;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/b/c;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -61,19 +61,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/b/b/c;->Ok:Lcom/facebook/fresco/animation/b/c;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/b/c;->OC:Lcom/facebook/fresco/animation/b/c;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/b/b/c;->On:Landroid/graphics/Bitmap$Config;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/b/b/c;->OF:Landroid/graphics/Bitmap$Config;
 
-    iput-object p4, p0, Lcom/facebook/fresco/animation/b/b/c;->Ou:Ljava/util/concurrent/ExecutorService;
+    iput-object p4, p0, Lcom/facebook/fresco/animation/b/b/c;->ON:Ljava/util/concurrent/ExecutorService;
 
     new-instance p1, Landroid/util/SparseArray;
 
     invoke-direct {p1}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->Ov:Landroid/util/SparseArray;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->OO:Landroid/util/SparseArray;
 
     return-void
 .end method
@@ -81,7 +81,7 @@
 .method static synthetic a(Lcom/facebook/fresco/animation/b/b/c;)Landroid/util/SparseArray;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->Ov:Landroid/util/SparseArray;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->OO:Landroid/util/SparseArray;
 
     return-object p0
 .end method
@@ -89,7 +89,7 @@
 .method static synthetic b(Lcom/facebook/fresco/animation/b/b/c;)Landroid/graphics/Bitmap$Config;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->On:Landroid/graphics/Bitmap$Config;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->OF:Landroid/graphics/Bitmap$Config;
 
     return-object p0
 .end method
@@ -97,7 +97,7 @@
 .method static synthetic c(Lcom/facebook/fresco/animation/b/b/c;)Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     return-object p0
 .end method
@@ -105,15 +105,15 @@
 .method static synthetic d(Lcom/facebook/fresco/animation/b/b/c;)Lcom/facebook/fresco/animation/b/c;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->Ok:Lcom/facebook/fresco/animation/b/c;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->OC:Lcom/facebook/fresco/animation/b/c;
 
     return-object p0
 .end method
 
-.method static synthetic hl()Ljava/lang/Class;
+.method static synthetic ho()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/fresco/animation/b/b/c;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/fresco/animation/b/b/c;->FC:Ljava/lang/Class;
 
     return-object v0
 .end method
@@ -131,12 +131,12 @@
 
     add-int/2addr v0, p3
 
-    iget-object v7, p0, Lcom/facebook/fresco/animation/b/b/c;->Ov:Landroid/util/SparseArray;
+    iget-object v7, p0, Lcom/facebook/fresco/animation/b/b/c;->OO:Landroid/util/SparseArray;
 
     monitor-enter v7
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c;->Ov:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c;->OO:Landroid/util/SparseArray;
 
     invoke-virtual {v1, v0}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -146,7 +146,7 @@
 
     if-eqz v1, :cond_0
 
-    sget-object p1, Lcom/facebook/fresco/animation/b/b/c;->Fl:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/fresco/animation/b/b/c;->FC:Ljava/lang/Class;
 
     const-string p2, "Already scheduled decode job for frame %d"
 
@@ -167,7 +167,7 @@
 
     if-eqz v1, :cond_1
 
-    sget-object p1, Lcom/facebook/fresco/animation/b/b/c;->Fl:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/fresco/animation/b/b/c;->FC:Ljava/lang/Class;
 
     const-string p2, "Frame %d is cached already."
 
@@ -198,11 +198,11 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/facebook/fresco/animation/b/b/c$a;-><init>(Lcom/facebook/fresco/animation/b/b/c;Lcom/facebook/fresco/animation/a/a;Lcom/facebook/fresco/animation/b/b;II)V
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->Ov:Landroid/util/SparseArray;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->OO:Landroid/util/SparseArray;
 
     invoke-virtual {p1, v0, v9}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->Ou:Ljava/util/concurrent/ExecutorService;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->ON:Ljava/util/concurrent/ExecutorService;
 
     invoke-interface {p1, v9}, Ljava/util/concurrent/ExecutorService;->execute(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/b/b/d.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/b/b/d.smali
index 9847056efe..9c312ba9e4 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/b/b/d.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/b/b/d.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final Oz:I
+.field private final OS:I
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     const-class v0, Lcom/facebook/fresco/animation/b/b/d;
 
-    sput-object v0, Lcom/facebook/fresco/animation/b/b/d;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/b/d;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -47,7 +47,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/fresco/animation/b/b/d;->Oz:I
+    iput p1, p0, Lcom/facebook/fresco/animation/b/b/d;->OS:I
 
     return-void
 .end method
@@ -60,7 +60,7 @@
     const/4 v0, 0x1
 
     :goto_0
-    iget v1, p0, Lcom/facebook/fresco/animation/b/b/d;->Oz:I
+    iget v1, p0, Lcom/facebook/fresco/animation/b/b/d;->OS:I
 
     if-gt v0, v1, :cond_1
 
@@ -80,7 +80,7 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lcom/facebook/fresco/animation/b/b/d;->Fl:Ljava/lang/Class;
+    sget-object v2, Lcom/facebook/fresco/animation/b/b/d;->FC:Ljava/lang/Class;
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/b/c/a.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/b/c/a.smali
index bc8ed76145..0b65da9eed 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/b/c/a.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/b/c/a.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final OA:Lcom/facebook/imagepipeline/animated/a/a;
+.field private final OT:Lcom/facebook/imagepipeline/animated/a/a;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/a;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/a;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final Y(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/animated/a/a;->ac(I)I
 
@@ -35,12 +35,12 @@
     return p1
 .end method
 
-.method public final fe()I
+.method public final fj()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->fe()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->fj()I
 
     move-result v0
 
@@ -50,7 +50,7 @@
 .method public final getFrameCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->getFrameCount()I
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/c/a$1.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/c/a$1.smali
index 1cff3d4cc5..ff573c1ed5 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/c/a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/c/a$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic OR:Lcom/facebook/fresco/animation/c/a;
+.field final synthetic Pj:Lcom/facebook/fresco/animation/c/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/fresco/animation/c/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/c/a$1;->OR:Lcom/facebook/fresco/animation/c/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/c/a$1;->Pj:Lcom/facebook/fresco/animation/c/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a$1;->OR:Lcom/facebook/fresco/animation/c/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a$1;->Pj:Lcom/facebook/fresco/animation/c/a;
 
     invoke-static {v0}, Lcom/facebook/fresco/animation/c/a;->a(Lcom/facebook/fresco/animation/c/a;)Ljava/lang/Runnable;
 
@@ -45,7 +45,7 @@
 
     invoke-virtual {v0, v1}, Lcom/facebook/fresco/animation/c/a;->unscheduleSelf(Ljava/lang/Runnable;)V
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a$1;->OR:Lcom/facebook/fresco/animation/c/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a$1;->Pj:Lcom/facebook/fresco/animation/c/a;
 
     invoke-virtual {v0}, Lcom/facebook/fresco/animation/c/a;->invalidateSelf()V
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/d/a.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/d/a.smali
index fd9727ab48..31aa255f69 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/d/a.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/d/a.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final Oj:Lcom/facebook/fresco/animation/a/d;
+.field private final OB:Lcom/facebook/fresco/animation/a/d;
 
-.field private Pe:J
+.field private Pw:J
 
 
 # direct methods
@@ -20,17 +20,17 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->Pe:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->Pw:J
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/d/a;->Oj:Lcom/facebook/fresco/animation/a/d;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/d/a;->OB:Lcom/facebook/fresco/animation/a/d;
 
     return-void
 .end method
 
-.method private hn()J
+.method private hq()J
     .locals 6
 
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->Pe:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->Pw:J
 
     const-wide/16 v2, -0x1
 
@@ -43,9 +43,9 @@
     :cond_0
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->Pe:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->Pw:J
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/d/a;->Oj:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/d/a;->OB:Lcom/facebook/fresco/animation/a/d;
 
     invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->getFrameCount()I
 
@@ -56,9 +56,9 @@
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/d/a;->Pe:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/d/a;->Pw:J
 
-    iget-object v4, p0, Lcom/facebook/fresco/animation/d/a;->Oj:Lcom/facebook/fresco/animation/a/d;
+    iget-object v4, p0, Lcom/facebook/fresco/animation/d/a;->OB:Lcom/facebook/fresco/animation/a/d;
 
     invoke-interface {v4, v1}, Lcom/facebook/fresco/animation/a/d;->Y(I)I
 
@@ -68,24 +68,24 @@
 
     add-long/2addr v2, v4
 
-    iput-wide v2, p0, Lcom/facebook/fresco/animation/d/a;->Pe:J
+    iput-wide v2, p0, Lcom/facebook/fresco/animation/d/a;->Pw:J
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_1
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->Pe:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->Pw:J
 
     return-wide v0
 .end method
 
-.method private ho()Z
+.method private hr()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/d/a;->Oj:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/d/a;->OB:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fe()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fj()I
 
     move-result v0
 
@@ -106,21 +106,21 @@
 .method public final o(J)I
     .locals 5
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ho()Z
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hr()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hn()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hq()J
 
     move-result-wide v0
 
     div-long v0, p1, v0
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/d/a;->Oj:Lcom/facebook/fresco/animation/a/d;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/d/a;->OB:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v2}, Lcom/facebook/fresco/animation/a/d;->fe()I
+    invoke-interface {v2}, Lcom/facebook/fresco/animation/a/d;->fj()I
 
     move-result v2
 
@@ -135,7 +135,7 @@
     return p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hn()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hq()J
 
     move-result-wide v0
 
@@ -146,7 +146,7 @@
     const-wide/16 v1, 0x0
 
     :cond_1
-    iget-object v3, p0, Lcom/facebook/fresco/animation/d/a;->Oj:Lcom/facebook/fresco/animation/a/d;
+    iget-object v3, p0, Lcom/facebook/fresco/animation/d/a;->OB:Lcom/facebook/fresco/animation/a/d;
 
     invoke-interface {v3, v0}, Lcom/facebook/fresco/animation/a/d;->Y(I)I
 
@@ -170,7 +170,7 @@
 .method public final p(J)J
     .locals 11
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hn()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hq()J
 
     move-result-wide v0
 
@@ -185,21 +185,21 @@
     return-wide v2
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ho()Z
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hr()Z
 
     move-result v6
 
     if-nez v6, :cond_1
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hn()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hq()J
 
     move-result-wide v6
 
     div-long v6, p1, v6
 
-    iget-object v8, p0, Lcom/facebook/fresco/animation/d/a;->Oj:Lcom/facebook/fresco/animation/a/d;
+    iget-object v8, p0, Lcom/facebook/fresco/animation/d/a;->OB:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v8}, Lcom/facebook/fresco/animation/a/d;->fe()I
+    invoke-interface {v8}, Lcom/facebook/fresco/animation/a/d;->fj()I
 
     move-result v8
 
@@ -214,7 +214,7 @@
     :cond_1
     rem-long v0, p1, v0
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/d/a;->Oj:Lcom/facebook/fresco/animation/a/d;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/d/a;->OB:Lcom/facebook/fresco/animation/a/d;
 
     invoke-interface {v2}, Lcom/facebook/fresco/animation/a/d;->getFrameCount()I
 
@@ -229,7 +229,7 @@
 
     if-gtz v6, :cond_2
 
-    iget-object v6, p0, Lcom/facebook/fresco/animation/d/a;->Oj:Lcom/facebook/fresco/animation/a/d;
+    iget-object v6, p0, Lcom/facebook/fresco/animation/d/a;->OB:Lcom/facebook/fresco/animation/a/d;
 
     invoke-interface {v6, v3}, Lcom/facebook/fresco/animation/a/d;->Y(I)I
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1.smali
index 85c8cace14..52b378f377 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic OY:Landroid/graphics/Bitmap$Config;
+.field final synthetic Pq:Landroid/graphics/Bitmap$Config;
 
-.field final synthetic OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;Landroid/graphics/Bitmap$Config;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->OY:Landroid/graphics/Bitmap$Config;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->Pq:Landroid/graphics/Bitmap$Config;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,13 +41,13 @@
 .method public final a(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/c;
     .locals 0
 
-    iget-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
     invoke-static {p2}, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->a(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)Lcom/facebook/imagepipeline/animated/b/d;
 
     move-result-object p2
 
-    iget-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->OY:Landroid/graphics/Bitmap$Config;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->Pq:Landroid/graphics/Bitmap$Config;
 
     invoke-interface {p2, p1, p4, p3}, Lcom/facebook/imagepipeline/animated/b/d;->a(Lcom/facebook/imagepipeline/f/e;Lcom/facebook/imagepipeline/a/b;Landroid/graphics/Bitmap$Config;)Lcom/facebook/imagepipeline/f/c;
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2.smali
index 9c7e8b68e3..2dc2e2f70c 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic OY:Landroid/graphics/Bitmap$Config;
+.field final synthetic Pq:Landroid/graphics/Bitmap$Config;
 
-.field final synthetic OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;Landroid/graphics/Bitmap$Config;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->OY:Landroid/graphics/Bitmap$Config;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->Pq:Landroid/graphics/Bitmap$Config;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,13 +41,13 @@
 .method public final a(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/c;
     .locals 0
 
-    iget-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
     invoke-static {p2}, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->a(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)Lcom/facebook/imagepipeline/animated/b/d;
 
     move-result-object p2
 
-    iget-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->OY:Landroid/graphics/Bitmap$Config;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->Pq:Landroid/graphics/Bitmap$Config;
 
     invoke-interface {p2, p1, p4, p3}, Lcom/facebook/imagepipeline/animated/b/d;->b(Lcom/facebook/imagepipeline/f/e;Lcom/facebook/imagepipeline/a/b;Landroid/graphics/Bitmap$Config;)Lcom/facebook/imagepipeline/f/c;
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$3.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$3.smali
index da6649de21..ed2ec8373d 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$3.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$3.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$3;->OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$3;->Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$4.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$4.smali
index 7eaff3af59..1d49e75d40 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$4.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$4.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$4;->OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$4;->Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5.smali
index ea2ec63041..aa2ecb8d0d 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;->OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;->Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,13 +39,13 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/animated/c/a;
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;->OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;->Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
     invoke-static {v1}, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->b(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)Lcom/facebook/imagepipeline/animated/d/a;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;->OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;->Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
     invoke-static {v2}, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->c(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)Z
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6.smali
index be6c91931c..3f92d36ca7 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6;->OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6;->Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,13 +39,13 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/animated/c/a;
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6;->OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6;->Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
     invoke-static {v1}, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->b(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)Lcom/facebook/imagepipeline/animated/d/a;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6;->OZ:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6;->Pr:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
     invoke-static {v2}, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->c(Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;)Z
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/a$a.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/a$a.smali
index b03e0c99b9..28acee4c30 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/a$a.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final Pd:Ljava/lang/String;
+.field private final Pv:Ljava/lang/String;
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/a$a;->Pd:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/a$a;->Pv:Ljava/lang/String;
 
     return-void
 .end method
@@ -47,7 +47,7 @@
 .method public final getUriString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/a$a;->Pd:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/a$a;->Pv:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/a.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/a.smali
index 54676fd8b3..1a718c7025 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/a.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/a.smali
@@ -15,11 +15,13 @@
 
 
 # instance fields
-.field private final Jo:Lcom/facebook/common/time/b;
+.field private final JF:Lcom/facebook/common/time/b;
 
-.field private final NZ:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final Or:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private final OT:Lcom/facebook/imagepipeline/cache/h;
+.field private final Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+
+.field private final Pl:Lcom/facebook/imagepipeline/cache/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h<",
@@ -30,13 +32,11 @@
     .end annotation
 .end field
 
-.field private final OW:Lcom/facebook/imagepipeline/animated/c/b;
+.field private final Po:Lcom/facebook/imagepipeline/animated/c/b;
 
-.field private final Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final Ps:Ljava/util/concurrent/ExecutorService;
 
-.field private final Pa:Ljava/util/concurrent/ExecutorService;
-
-.field private final Pb:Lcom/facebook/common/d/k;
+.field private final Pt:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -46,7 +46,7 @@
     .end annotation
 .end field
 
-.field private final Pc:Lcom/facebook/common/d/k;
+.field private final Pu:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -83,21 +83,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/a;->OW:Lcom/facebook/imagepipeline/animated/c/b;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/a;->Po:Lcom/facebook/imagepipeline/animated/c/b;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/a;->NZ:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/a;->Or:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/factory/a;->Pa:Ljava/util/concurrent/ExecutorService;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/factory/a;->Ps:Ljava/util/concurrent/ExecutorService;
 
-    iput-object p4, p0, Lcom/facebook/fresco/animation/factory/a;->Jo:Lcom/facebook/common/time/b;
+    iput-object p4, p0, Lcom/facebook/fresco/animation/factory/a;->JF:Lcom/facebook/common/time/b;
 
-    iput-object p5, p0, Lcom/facebook/fresco/animation/factory/a;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p5, p0, Lcom/facebook/fresco/animation/factory/a;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object p6, p0, Lcom/facebook/fresco/animation/factory/a;->OT:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p6, p0, Lcom/facebook/fresco/animation/factory/a;->Pl:Lcom/facebook/imagepipeline/cache/h;
 
-    iput-object p7, p0, Lcom/facebook/fresco/animation/factory/a;->Pb:Lcom/facebook/common/d/k;
+    iput-object p7, p0, Lcom/facebook/fresco/animation/factory/a;->Pt:Lcom/facebook/common/d/k;
 
-    iput-object p8, p0, Lcom/facebook/fresco/animation/factory/a;->Pc:Lcom/facebook/common/d/k;
+    iput-object p8, p0, Lcom/facebook/fresco/animation/factory/a;->Pu:Lcom/facebook/common/d/k;
 
     return-void
 .end method
@@ -115,7 +115,7 @@
 
     invoke-direct {v1, p1}, Lcom/facebook/fresco/animation/factory/a$a;-><init>(I)V
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/factory/a;->OT:Lcom/facebook/imagepipeline/cache/h;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/factory/a;->Pl:Lcom/facebook/imagepipeline/cache/h;
 
     invoke-direct {v0, v1, p1}, Lcom/facebook/imagepipeline/animated/c/c;-><init>(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/cache/h;)V
 
@@ -139,11 +139,11 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/f/a;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/a;->iA()Lcom/facebook/imagepipeline/animated/a/e;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/a;->iz()Lcom/facebook/imagepipeline/animated/a/e;
 
     move-result-object p1
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/animated/a/e;->PV:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/animated/a/e;->Qo:Lcom/facebook/imagepipeline/animated/a/c;
 
     new-instance v2, Landroid/graphics/Rect;
 
@@ -159,13 +159,13 @@
 
     invoke-direct {v2, v4, v4, v3, v1}, Landroid/graphics/Rect;-><init>(IIII)V
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/a;->OW:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/a;->Po:Lcom/facebook/imagepipeline/animated/c/b;
 
     invoke-interface {v1, p1, v2}, Lcom/facebook/imagepipeline/animated/c/b;->a(Lcom/facebook/imagepipeline/animated/a/e;Landroid/graphics/Rect;)Lcom/facebook/imagepipeline/animated/a/a;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/a;->Pb:Lcom/facebook/common/d/k;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/a;->Pt:Lcom/facebook/common/d/k;
 
     invoke-interface {v2}, Lcom/facebook/common/d/k;->get()Ljava/lang/Object;
 
@@ -233,7 +233,7 @@
 
     invoke-direct {v8, v6, v1}, Lcom/facebook/fresco/animation/b/c/b;-><init>(Lcom/facebook/fresco/animation/b/b;Lcom/facebook/imagepipeline/animated/a/a;)V
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/factory/a;->Pc:Lcom/facebook/common/d/k;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/factory/a;->Pu:Lcom/facebook/common/d/k;
 
     invoke-interface {p1}, Lcom/facebook/common/d/k;->get()Ljava/lang/Object;
 
@@ -255,11 +255,11 @@
 
     new-instance p1, Lcom/facebook/fresco/animation/b/b/c;
 
-    iget-object v3, p0, Lcom/facebook/fresco/animation/factory/a;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v3, p0, Lcom/facebook/fresco/animation/factory/a;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     sget-object v4, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
 
-    iget-object v5, p0, Lcom/facebook/fresco/animation/factory/a;->Pa:Ljava/util/concurrent/ExecutorService;
+    iget-object v5, p0, Lcom/facebook/fresco/animation/factory/a;->Ps:Ljava/util/concurrent/ExecutorService;
 
     invoke-direct {p1, v3, v8, v4, v5}, Lcom/facebook/fresco/animation/b/b/c;-><init>(Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;Lcom/facebook/fresco/animation/b/c;Landroid/graphics/Bitmap$Config;Ljava/util/concurrent/ExecutorService;)V
 
@@ -277,7 +277,7 @@
     :goto_3
     new-instance p1, Lcom/facebook/fresco/animation/b/a;
 
-    iget-object v5, p0, Lcom/facebook/fresco/animation/factory/a;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v5, p0, Lcom/facebook/fresco/animation/factory/a;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     new-instance v7, Lcom/facebook/fresco/animation/b/c/a;
 
@@ -287,9 +287,9 @@
 
     invoke-direct/range {v4 .. v10}, Lcom/facebook/fresco/animation/b/a;-><init>(Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;Lcom/facebook/fresco/animation/b/b;Lcom/facebook/fresco/animation/a/d;Lcom/facebook/fresco/animation/b/c;Lcom/facebook/fresco/animation/b/b/a;Lcom/facebook/fresco/animation/b/b/b;)V
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/a;->Jo:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/a;->JF:Lcom/facebook/common/time/b;
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/a;->NZ:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/a;->Or:Ljava/util/concurrent/ScheduledExecutorService;
 
     move-object v3, p1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/a/a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/a/a.smali
index e3c35d579f..ff2090c1f9 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/a/a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/a/a.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field public final RG:I
+.field public final RY:I
 
-.field public final RH:I
+.field public final RZ:I
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/a/a;->RG:I
+    iput p1, p0, Lcom/facebook/imagepipeline/a/a;->RY:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/a/a;->RH:I
+    iput p2, p0, Lcom/facebook/imagepipeline/a/a;->RZ:I
 
     return-void
 .end method
@@ -64,15 +64,15 @@
     :cond_1
     check-cast p1, Lcom/facebook/imagepipeline/a/a;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->RG:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->RY:I
 
-    iget v3, p1, Lcom/facebook/imagepipeline/a/a;->RG:I
+    iget v3, p1, Lcom/facebook/imagepipeline/a/a;->RY:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->RH:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->RZ:I
 
-    iget p1, p1, Lcom/facebook/imagepipeline/a/a;->RH:I
+    iget p1, p1, Lcom/facebook/imagepipeline/a/a;->RZ:I
 
     if-ne v1, p1, :cond_2
 
@@ -85,9 +85,9 @@
 .method public final hashCode()I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/a/a;->RG:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/a;->RY:I
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->RH:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->RZ:I
 
     invoke-static {v0, v1}, Lcom/facebook/common/j/b;->hashCode(II)I
 
@@ -103,7 +103,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->RG:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->RY:I
 
     invoke-static {v1}, Lcom/facebook/imagepipeline/a/a;->af(I)Ljava/lang/String;
 
@@ -113,7 +113,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->RH:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->RZ:I
 
     invoke-static {v1}, Lcom/facebook/imagepipeline/a/a;->af(I)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/a/e.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/a/e.smali
index c8b80d6686..9fdadbca6e 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/a/e.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/a/e.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field public final Se:F
+.field public final Sw:F
 
-.field public final Sf:F
+.field public final Sx:F
 
 .field public final height:I
 
@@ -71,11 +71,11 @@
 
     const/high16 p1, 0x45000000    # 2048.0f
 
-    iput p1, p0, Lcom/facebook/imagepipeline/a/e;->Se:F
+    iput p1, p0, Lcom/facebook/imagepipeline/a/e;->Sw:F
 
     const p1, 0x3f2aaaab
 
-    iput p1, p0, Lcom/facebook/imagepipeline/a/e;->Sf:F
+    iput p1, p0, Lcom/facebook/imagepipeline/a/e;->Sx:F
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/a/f.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/a/f.smali
index db348ab911..7569d9e6f9 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/a/f.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/a/f.smali
@@ -4,17 +4,17 @@
 
 
 # static fields
-.field private static final Si:Lcom/facebook/imagepipeline/a/f;
+.field private static final SA:Lcom/facebook/imagepipeline/a/f;
 
-.field private static final Sj:Lcom/facebook/imagepipeline/a/f;
+.field private static final SB:Lcom/facebook/imagepipeline/a/f;
 
-.field private static final Sk:Lcom/facebook/imagepipeline/a/f;
+.field private static final SC:Lcom/facebook/imagepipeline/a/f;
 
 
 # instance fields
-.field private final Sg:I
+.field private final Sy:I
 
-.field public final Sh:Z
+.field public final Sz:Z
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/imagepipeline/a/f;-><init>(IZ)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/a/f;->Si:Lcom/facebook/imagepipeline/a/f;
+    sput-object v0, Lcom/facebook/imagepipeline/a/f;->SA:Lcom/facebook/imagepipeline/a/f;
 
     new-instance v0, Lcom/facebook/imagepipeline/a/f;
 
@@ -37,7 +37,7 @@
 
     invoke-direct {v0, v3, v1}, Lcom/facebook/imagepipeline/a/f;-><init>(IZ)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/a/f;->Sj:Lcom/facebook/imagepipeline/a/f;
+    sput-object v0, Lcom/facebook/imagepipeline/a/f;->SB:Lcom/facebook/imagepipeline/a/f;
 
     new-instance v0, Lcom/facebook/imagepipeline/a/f;
 
@@ -45,7 +45,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/imagepipeline/a/f;-><init>(IZ)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/a/f;->Sk:Lcom/facebook/imagepipeline/a/f;
+    sput-object v0, Lcom/facebook/imagepipeline/a/f;->SC:Lcom/facebook/imagepipeline/a/f;
 
     return-void
 .end method
@@ -55,25 +55,25 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/a/f;->Sg:I
+    iput p1, p0, Lcom/facebook/imagepipeline/a/f;->Sy:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/a/f;->Sh:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/a/f;->Sz:Z
 
     return-void
 .end method
 
-.method public static hK()Lcom/facebook/imagepipeline/a/f;
+.method public static hN()Lcom/facebook/imagepipeline/a/f;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/a/f;->Si:Lcom/facebook/imagepipeline/a/f;
+    sget-object v0, Lcom/facebook/imagepipeline/a/f;->SA:Lcom/facebook/imagepipeline/a/f;
 
     return-object v0
 .end method
 
-.method public static hL()Lcom/facebook/imagepipeline/a/f;
+.method public static hO()Lcom/facebook/imagepipeline/a/f;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/a/f;->Sk:Lcom/facebook/imagepipeline/a/f;
+    sget-object v0, Lcom/facebook/imagepipeline/a/f;->SC:Lcom/facebook/imagepipeline/a/f;
 
     return-object v0
 .end method
@@ -101,15 +101,15 @@
     :cond_1
     check-cast p1, Lcom/facebook/imagepipeline/a/f;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/f;->Sg:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/f;->Sy:I
 
-    iget v3, p1, Lcom/facebook/imagepipeline/a/f;->Sg:I
+    iget v3, p1, Lcom/facebook/imagepipeline/a/f;->Sy:I
 
     if-ne v1, v3, :cond_2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->Sh:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->Sz:Z
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/a/f;->Sh:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/a/f;->Sz:Z
 
     if-ne v1, p1, :cond_2
 
@@ -119,10 +119,10 @@
     return v2
 .end method
 
-.method public final hM()Z
+.method public final hP()Z
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->Sg:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->Sy:I
 
     const/4 v1, -0x1
 
@@ -138,10 +138,10 @@
     return v0
 .end method
 
-.method public final hN()Z
+.method public final hQ()Z
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->Sg:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->Sy:I
 
     const/4 v1, -0x2
 
@@ -157,16 +157,16 @@
     return v0
 .end method
 
-.method public final hO()I
+.method public final hR()I
     .locals 2
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hM()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->hP()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->Sg:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->Sy:I
 
     return v0
 
@@ -183,13 +183,13 @@
 .method public final hashCode()I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->Sg:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->Sy:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->Sh:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->Sz:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -209,7 +209,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/f;->Sg:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/f;->Sy:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -219,7 +219,7 @@
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->Sh:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->Sz:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/b$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/b$a.smali
index 7dda4495ee..77fdf4963b 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/b$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/b$a.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
-.field public static final PO:I = 0x1
+.field public static final Qh:I = 0x1
 
-.field public static final PP:I = 0x2
+.field public static final Qi:I = 0x2
 
-.field private static final synthetic PQ:[I
+.field private static final synthetic Qj:[I
 
 
 # direct methods
@@ -38,19 +38,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->PO:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Qh:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->PP:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Qi:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/a/b$a;->PQ:[I
+    sput-object v0, Lcom/facebook/imagepipeline/animated/a/b$a;->Qj:[I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/b$b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/b$b.smali
index bdf52709bd..2913a2f755 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/b$b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/b$b.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
-.field public static final PR:I = 0x1
+.field public static final Qk:I = 0x1
 
-.field public static final PS:I = 0x2
+.field public static final Ql:I = 0x2
 
-.field public static final PT:I = 0x3
+.field public static final Qm:I = 0x3
 
-.field private static final synthetic PU:[I
+.field private static final synthetic Qn:[I
 
 
 # direct methods
@@ -40,25 +40,25 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->PR:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Qk:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->PS:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ql:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->PT:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Qm:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/a/b$b;->PU:[I
+    sput-object v0, Lcom/facebook/imagepipeline/animated/a/b$b;->Qn:[I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/b.smali
index fe7c685dfc..654a718e8c 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/b.smali
@@ -13,15 +13,15 @@
 
 
 # instance fields
-.field public final PJ:I
+.field public final Qc:I
 
-.field public final PK:I
+.field public final Qd:I
 
-.field public final PL:I
+.field public final Qe:I
 
-.field public final PM:I
+.field public final Qf:I
 
-.field public final PN:I
+.field public final Qg:I
 
 .field public final height:I
 
@@ -34,19 +34,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/animated/a/b;->PJ:I
+    iput p1, p0, Lcom/facebook/imagepipeline/animated/a/b;->Qc:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/animated/a/b;->PK:I
+    iput p2, p0, Lcom/facebook/imagepipeline/animated/a/b;->Qd:I
 
-    iput p3, p0, Lcom/facebook/imagepipeline/animated/a/b;->PL:I
+    iput p3, p0, Lcom/facebook/imagepipeline/animated/a/b;->Qe:I
 
     iput p4, p0, Lcom/facebook/imagepipeline/animated/a/b;->width:I
 
     iput p5, p0, Lcom/facebook/imagepipeline/animated/a/b;->height:I
 
-    iput p6, p0, Lcom/facebook/imagepipeline/animated/a/b;->PM:I
+    iput p6, p0, Lcom/facebook/imagepipeline/animated/a/b;->Qf:I
 
-    iput p7, p0, Lcom/facebook/imagepipeline/animated/a/b;->PN:I
+    iput p7, p0, Lcom/facebook/imagepipeline/animated/a/b;->Qg:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/c.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/c.smali
index 1906b10b21..f70d812bdf 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/c.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/c.smali
@@ -10,16 +10,16 @@
 .method public abstract H(I)Lcom/facebook/imagepipeline/animated/a/d;
 .end method
 
-.method public abstract fd()[I
+.method public abstract fi()[I
 .end method
 
-.method public abstract fe()I
+.method public abstract fj()I
 .end method
 
-.method public abstract ff()Z
+.method public abstract fk()Z
 .end method
 
-.method public abstract fg()I
+.method public abstract fl()I
 .end method
 
 .method public abstract getFrameCount()I
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/f.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/f.smali
index ed4d6f1a06..c38d695220 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/f.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/f.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field final PV:Lcom/facebook/imagepipeline/animated/a/c;
+.field final Qo:Lcom/facebook/imagepipeline/animated/a/c;
 
-.field public PW:I
+.field public Qp:I
 
-.field public PY:Lcom/facebook/common/references/CloseableReference;
+.field public Qq:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -18,7 +18,7 @@
     .end annotation
 .end field
 
-.field public PZ:Ljava/util/List;
+.field public Qr:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -36,14 +36,14 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/f;->PV:Lcom/facebook/imagepipeline/animated/a/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/f;->Qo:Lcom/facebook/imagepipeline/animated/a/c;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final hu()Lcom/facebook/imagepipeline/animated/a/e;
+.method public final hx()Lcom/facebook/imagepipeline/animated/a/e;
     .locals 3
 
     const/4 v0, 0x0
@@ -55,34 +55,34 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->PY:Lcom/facebook/common/references/CloseableReference;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->Qq:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v2}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->PY:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->Qq:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->PZ:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->Qr:Ljava/util/List;
 
     invoke-static {v2}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Iterable;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->PZ:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->Qr:Ljava/util/List;
 
     return-object v1
 
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->PY:Lcom/facebook/common/references/CloseableReference;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->Qq:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v2}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->PY:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->Qq:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->PZ:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->Qr:Ljava/util/List;
 
     invoke-static {v2}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Iterable;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->PZ:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->Qr:Ljava/util/List;
 
     throw v1
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/b/b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/b/b.smali
index 33c8ac0d60..5a0a04e81d 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/b/b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/b/b.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static Qa:Z
+.field private static Qs:Z
 
-.field private static Qb:Lcom/facebook/imagepipeline/animated/b/a;
+.field private static Qt:Lcom/facebook/imagepipeline/animated/b/a;
 
 
 # direct methods
@@ -31,7 +31,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/facebook/imagepipeline/animated/b/b;->Qa:Z
+    sget-boolean v0, Lcom/facebook/imagepipeline/animated/b/b;->Qs:Z
 
     if-nez v0, :cond_0
 
@@ -94,7 +94,7 @@
 
     check-cast p0, Lcom/facebook/imagepipeline/animated/b/a;
 
-    sput-object p0, Lcom/facebook/imagepipeline/animated/b/b;->Qb:Lcom/facebook/imagepipeline/animated/b/a;
+    sput-object p0, Lcom/facebook/imagepipeline/animated/b/b;->Qt:Lcom/facebook/imagepipeline/animated/b/a;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -104,14 +104,14 @@
     nop
 
     :goto_0
-    sget-object p0, Lcom/facebook/imagepipeline/animated/b/b;->Qb:Lcom/facebook/imagepipeline/animated/b/a;
+    sget-object p0, Lcom/facebook/imagepipeline/animated/b/b;->Qt:Lcom/facebook/imagepipeline/animated/b/a;
 
     if-eqz p0, :cond_0
 
-    sput-boolean v0, Lcom/facebook/imagepipeline/animated/b/b;->Qa:Z
+    sput-boolean v0, Lcom/facebook/imagepipeline/animated/b/b;->Qs:Z
 
     :cond_0
-    sget-object p0, Lcom/facebook/imagepipeline/animated/b/b;->Qb:Lcom/facebook/imagepipeline/animated/b/a;
+    sget-object p0, Lcom/facebook/imagepipeline/animated/b/b;->Qt:Lcom/facebook/imagepipeline/animated/b/a;
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/b/e$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/b/e$2.smali
index 0db1f7f77b..143d5925d0 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/b/e$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/b/e$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic Qf:Lcom/facebook/imagepipeline/animated/b/e;
+.field final synthetic Qx:Lcom/facebook/imagepipeline/animated/b/e;
 
-.field final synthetic Qg:Ljava/util/List;
+.field final synthetic Qy:Ljava/util/List;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/animated/b/e;Ljava/util/List;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->Qf:Lcom/facebook/imagepipeline/animated/b/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->Qx:Lcom/facebook/imagepipeline/animated/b/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->Qg:Ljava/util/List;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->Qy:Ljava/util/List;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,7 +49,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->Qg:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->Qy:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/c$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/c$1.smali
index 9a8c22f8b0..0b395052ed 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/c$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/c$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic Qt:Lcom/facebook/imagepipeline/animated/c/c;
+.field final synthetic QL:Lcom/facebook/imagepipeline/animated/c/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/animated/c/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c$1;->Qt:Lcom/facebook/imagepipeline/animated/c/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c$1;->QL:Lcom/facebook/imagepipeline/animated/c/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,7 +48,7 @@
 
     check-cast p1, Lcom/facebook/cache/common/CacheKey;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c$1;->Qt:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c$1;->QL:Lcom/facebook/imagepipeline/animated/c/c;
 
     invoke-virtual {v0, p1, p2}, Lcom/facebook/imagepipeline/animated/c/c;->a(Lcom/facebook/cache/common/CacheKey;Z)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/d$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/d$1.smali
index 9c16bd89a5..9b7f77e4d6 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/d$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/d$1.smali
@@ -15,14 +15,14 @@
 
 
 # static fields
-.field static final synthetic Qw:[I
+.field static final synthetic QO:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/facebook/imagepipeline/animated/c/d$b;->hx()[I
+    invoke-static {}, Lcom/facebook/imagepipeline/animated/c/d$b;->hA()[I
 
     move-result-object v0
 
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/c/d$1;->Qw:[I
+    sput-object v0, Lcom/facebook/imagepipeline/animated/c/d$1;->QO:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->Qw:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->QO:[I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->Qx:I
+    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->QP:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->Qw:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->QO:[I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->Qy:I
+    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->QQ:I
 
     sub-int/2addr v2, v0
 
@@ -61,9 +61,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->Qw:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->QO:[I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->QA:I
+    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->QS:I
 
     sub-int/2addr v2, v0
 
@@ -75,9 +75,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->Qw:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->QO:[I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->Qz:I
+    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->QR:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/d$b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/d$b.smali
index 2aa174ce77..3b11b19005 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/d$b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/d$b.smali
@@ -23,15 +23,15 @@
 
 
 # static fields
-.field public static final QA:I = 0x4
+.field public static final QP:I = 0x1
 
-.field private static final synthetic QB:[I
+.field public static final QQ:I = 0x2
 
-.field public static final Qx:I = 0x1
+.field public static final QR:I = 0x3
 
-.field public static final Qy:I = 0x2
+.field public static final QS:I = 0x4
 
-.field public static final Qz:I = 0x3
+.field private static final synthetic QT:[I
 
 
 # direct methods
@@ -42,39 +42,39 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->Qx:I
+    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->QP:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->Qy:I
+    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->QQ:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->Qz:I
+    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->QR:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->QA:I
+    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->QS:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/c/d$b;->QB:[I
+    sput-object v0, Lcom/facebook/imagepipeline/animated/c/d$b;->QT:[I
 
     return-void
 .end method
 
-.method public static hx()[I
+.method public static hA()[I
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/animated/c/d$b;->QB:[I
+    sget-object v0, Lcom/facebook/imagepipeline/animated/c/d$b;->QT:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/d.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/d.smali
index 6cec085068..466a1b5ec9 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/d.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/c/d.smali
@@ -13,11 +13,11 @@
 
 
 # instance fields
-.field private final OA:Lcom/facebook/imagepipeline/animated/a/a;
+.field private final OT:Lcom/facebook/imagepipeline/animated/a/a;
 
-.field private final OC:Lcom/facebook/imagepipeline/animated/c/d$a;
+.field private final OV:Lcom/facebook/imagepipeline/animated/c/d$a;
 
-.field private final Qv:Landroid/graphics/Paint;
+.field private final QN:Landroid/graphics/Paint;
 
 
 # direct methods
@@ -26,29 +26,29 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->OC:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->OV:Lcom/facebook/imagepipeline/animated/c/d$a;
 
     new-instance p1, Landroid/graphics/Paint;
 
     invoke-direct {p1}, Landroid/graphics/Paint;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qv:Landroid/graphics/Paint;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->QN:Landroid/graphics/Paint;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qv:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->QN:Landroid/graphics/Paint;
 
     const/4 p2, 0x0
 
     invoke-virtual {p1, p2}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qv:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->QN:Landroid/graphics/Paint;
 
     sget-object p2, Landroid/graphics/Paint$Style;->FILL:Landroid/graphics/Paint$Style;
 
     invoke-virtual {p1, p2}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qv:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->QN:Landroid/graphics/Paint;
 
     new-instance p2, Landroid/graphics/PorterDuffXfermode;
 
@@ -64,15 +64,15 @@
 .method private a(Landroid/graphics/Canvas;Lcom/facebook/imagepipeline/animated/a/b;)V
     .locals 7
 
-    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->PK:I
+    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Qd:I
 
     int-to-float v2, v0
 
-    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->PL:I
+    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Qe:I
 
     int-to-float v3, v0
 
-    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->PK:I
+    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Qd:I
 
     iget v1, p2, Lcom/facebook/imagepipeline/animated/a/b;->width:I
 
@@ -80,7 +80,7 @@
 
     int-to-float v4, v0
 
-    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->PL:I
+    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Qe:I
 
     iget p2, p2, Lcom/facebook/imagepipeline/animated/a/b;->height:I
 
@@ -88,7 +88,7 @@
 
     int-to-float v5, v0
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qv:Landroid/graphics/Paint;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/animated/c/d;->QN:Landroid/graphics/Paint;
 
     move-object v1, p1
 
@@ -100,19 +100,19 @@
 .method private a(Lcom/facebook/imagepipeline/animated/a/b;)Z
     .locals 2
 
-    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/b;->PK:I
+    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/b;->Qd:I
 
     if-nez v0, :cond_0
 
-    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/b;->PL:I
+    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/b;->Qe:I
 
     if-nez v0, :cond_0
 
     iget v0, p1, Lcom/facebook/imagepipeline/animated/a/b;->width:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/animated/a/a;->hs()I
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/animated/a/a;->hv()I
 
     move-result v1
 
@@ -120,9 +120,9 @@
 
     iget p1, p1, Lcom/facebook/imagepipeline/animated/a/b;->height:I
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->ht()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->hw()I
 
     move-result v0
 
@@ -148,13 +148,13 @@
     return v0
 
     :cond_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v1, p1}, Lcom/facebook/imagepipeline/animated/a/a;->G(I)Lcom/facebook/imagepipeline/animated/a/b;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/d;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/d;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     sub-int/2addr p1, v0
 
@@ -162,9 +162,9 @@
 
     move-result-object p1
 
-    iget v2, v1, Lcom/facebook/imagepipeline/animated/a/b;->PM:I
+    iget v2, v1, Lcom/facebook/imagepipeline/animated/a/b;->Qf:I
 
-    sget v3, Lcom/facebook/imagepipeline/animated/a/b$a;->PP:I
+    sget v3, Lcom/facebook/imagepipeline/animated/a/b$a;->Qi:I
 
     if-ne v2, v3, :cond_1
 
@@ -177,9 +177,9 @@
     return v0
 
     :cond_1
-    iget v1, p1, Lcom/facebook/imagepipeline/animated/a/b;->PN:I
+    iget v1, p1, Lcom/facebook/imagepipeline/animated/a/b;->Qg:I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->PS:I
+    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Ql:I
 
     if-ne v1, v2, :cond_2
 
@@ -203,24 +203,24 @@
     :goto_0
     if-ltz p1, :cond_a
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/animated/a/a;->G(I)Lcom/facebook/imagepipeline/animated/a/b;
 
     move-result-object v0
 
-    iget v1, v0, Lcom/facebook/imagepipeline/animated/a/b;->PN:I
+    iget v1, v0, Lcom/facebook/imagepipeline/animated/a/b;->Qg:I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->PR:I
+    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Qk:I
 
     if-ne v1, v2, :cond_0
 
-    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Qx:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->QP:I
 
     goto :goto_1
 
     :cond_0
-    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->PS:I
+    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Ql:I
 
     if-ne v1, v2, :cond_2
 
@@ -230,29 +230,29 @@
 
     if-eqz v0, :cond_1
 
-    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Qy:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->QQ:I
 
     goto :goto_1
 
     :cond_1
-    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Qx:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->QP:I
 
     goto :goto_1
 
     :cond_2
-    sget v0, Lcom/facebook/imagepipeline/animated/a/b$b;->PT:I
+    sget v0, Lcom/facebook/imagepipeline/animated/a/b$b;->Qm:I
 
     if-ne v1, v0, :cond_3
 
-    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Qz:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->QR:I
 
     goto :goto_1
 
     :cond_3
-    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->QA:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->QS:I
 
     :goto_1
-    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->Qw:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->QO:[I
 
     const/4 v2, 0x1
 
@@ -281,13 +281,13 @@
     return p1
 
     :cond_6
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/animated/a/a;->G(I)Lcom/facebook/imagepipeline/animated/a/b;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->OC:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->OV:Lcom/facebook/imagepipeline/animated/c/d$a;
 
     invoke-interface {v1, p1}, Lcom/facebook/imagepipeline/animated/c/d$a;->ab(I)Lcom/facebook/common/references/CloseableReference;
 
@@ -308,9 +308,9 @@
 
     invoke-virtual {p2, v3, v5, v5, v4}, Landroid/graphics/Canvas;->drawBitmap(Landroid/graphics/Bitmap;FFLandroid/graphics/Paint;)V
 
-    iget v3, v0, Lcom/facebook/imagepipeline/animated/a/b;->PN:I
+    iget v3, v0, Lcom/facebook/imagepipeline/animated/a/b;->Qg:I
 
-    sget v4, Lcom/facebook/imagepipeline/animated/a/b$b;->PS:I
+    sget v4, Lcom/facebook/imagepipeline/animated/a/b$b;->Ql:I
 
     if-ne v3, v4, :cond_7
 
@@ -388,32 +388,32 @@
     :goto_0
     if-ge p2, p1, :cond_3
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v1, p2}, Lcom/facebook/imagepipeline/animated/a/a;->G(I)Lcom/facebook/imagepipeline/animated/a/b;
 
     move-result-object v1
 
-    iget v2, v1, Lcom/facebook/imagepipeline/animated/a/b;->PN:I
+    iget v2, v1, Lcom/facebook/imagepipeline/animated/a/b;->Qg:I
 
-    sget v3, Lcom/facebook/imagepipeline/animated/a/b$b;->PT:I
+    sget v3, Lcom/facebook/imagepipeline/animated/a/b$b;->Qm:I
 
     if-eq v2, v3, :cond_2
 
-    iget v3, v1, Lcom/facebook/imagepipeline/animated/a/b;->PM:I
+    iget v3, v1, Lcom/facebook/imagepipeline/animated/a/b;->Qf:I
 
-    sget v4, Lcom/facebook/imagepipeline/animated/a/b$a;->PP:I
+    sget v4, Lcom/facebook/imagepipeline/animated/a/b$a;->Qi:I
 
     if-ne v3, v4, :cond_1
 
     invoke-direct {p0, v0, v1}, Lcom/facebook/imagepipeline/animated/c/d;->a(Landroid/graphics/Canvas;Lcom/facebook/imagepipeline/animated/a/b;)V
 
     :cond_1
-    iget-object v3, p0, Lcom/facebook/imagepipeline/animated/c/d;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/animated/c/d;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v3, p2, v0}, Lcom/facebook/imagepipeline/animated/a/a;->a(ILandroid/graphics/Canvas;)V
 
-    sget v3, Lcom/facebook/imagepipeline/animated/a/b$b;->PS:I
+    sget v3, Lcom/facebook/imagepipeline/animated/a/b$b;->Ql:I
 
     if-ne v2, v3, :cond_2
 
@@ -425,22 +425,22 @@
     goto :goto_0
 
     :cond_3
-    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {p2, p1}, Lcom/facebook/imagepipeline/animated/a/a;->G(I)Lcom/facebook/imagepipeline/animated/a/b;
 
     move-result-object p2
 
-    iget v1, p2, Lcom/facebook/imagepipeline/animated/a/b;->PM:I
+    iget v1, p2, Lcom/facebook/imagepipeline/animated/a/b;->Qf:I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/a/b$a;->PP:I
+    sget v2, Lcom/facebook/imagepipeline/animated/a/b$a;->Qi:I
 
     if-ne v1, v2, :cond_4
 
     invoke-direct {p0, v0, p2}, Lcom/facebook/imagepipeline/animated/c/d;->a(Landroid/graphics/Canvas;Lcom/facebook/imagepipeline/animated/a/b;)V
 
     :cond_4
-    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->OA:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->OT:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {p2, p1, v0}, Lcom/facebook/imagepipeline/animated/a/a;->a(ILandroid/graphics/Canvas;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/a.smali
index e1171aa670..991b2b1375 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/a.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final Sl:Ljava/util/concurrent/Executor;
+.field private final SD:Ljava/util/concurrent/Executor;
 
-.field private final Sm:Ljava/util/concurrent/Executor;
+.field private final SE:Ljava/util/concurrent/Executor;
 
-.field private final Sn:Ljava/util/concurrent/Executor;
+.field private final SF:Ljava/util/concurrent/Executor;
 
 .field private final mBackgroundExecutor:Ljava/util/concurrent/Executor;
 
@@ -34,7 +34,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Sl:Ljava/util/concurrent/Executor;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/a;->SD:Ljava/util/concurrent/Executor;
 
     new-instance v0, Lcom/facebook/imagepipeline/b/k;
 
@@ -46,7 +46,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Sm:Ljava/util/concurrent/Executor;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/a;->SE:Ljava/util/concurrent/Executor;
 
     new-instance v0, Lcom/facebook/imagepipeline/b/k;
 
@@ -72,41 +72,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/a;->Sn:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/a;->SF:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final hP()Ljava/util/concurrent/Executor;
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Sl:Ljava/util/concurrent/Executor;
-
-    return-object v0
-.end method
-
-.method public final hQ()Ljava/util/concurrent/Executor;
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Sl:Ljava/util/concurrent/Executor;
-
-    return-object v0
-.end method
-
-.method public final hR()Ljava/util/concurrent/Executor;
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Sm:Ljava/util/concurrent/Executor;
-
-    return-object v0
-.end method
-
 .method public final hS()Ljava/util/concurrent/Executor;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->mBackgroundExecutor:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->SD:Ljava/util/concurrent/Executor;
 
     return-object v0
 .end method
@@ -114,7 +90,31 @@
 .method public final hT()Ljava/util/concurrent/Executor;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Sn:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->SD:Ljava/util/concurrent/Executor;
+
+    return-object v0
+.end method
+
+.method public final hU()Ljava/util/concurrent/Executor;
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->SE:Ljava/util/concurrent/Executor;
+
+    return-object v0
+.end method
+
+.method public final hV()Ljava/util/concurrent/Executor;
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->mBackgroundExecutor:Ljava/util/concurrent/Executor;
+
+    return-object v0
+.end method
+
+.method public final hW()Ljava/util/concurrent/Executor;
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->SF:Ljava/util/concurrent/Executor;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/b.smali
index 259e45e879..9278c39245 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/b.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private So:Lcom/facebook/imagepipeline/b/c;
+.field private SG:Lcom/facebook/imagepipeline/b/c;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/b;->So:Lcom/facebook/imagepipeline/b/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/b;->SG:Lcom/facebook/imagepipeline/b/c;
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 
     move-object/from16 v1, p1
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/b;->So:Lcom/facebook/imagepipeline/b/c;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/b;->SG:Lcom/facebook/imagepipeline/b/c;
 
     invoke-interface {v2, v1}, Lcom/facebook/imagepipeline/b/c;->b(Lcom/facebook/cache/disk/DiskCacheConfig;)Lcom/facebook/cache/disk/c;
 
@@ -42,11 +42,11 @@
 
     new-instance v2, Lcom/facebook/cache/disk/d$b;
 
-    iget-wide v11, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->FE:J
+    iget-wide v11, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->FV:J
 
-    iget-wide v13, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->FD:J
+    iget-wide v13, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->FU:J
 
-    iget-wide v5, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->FC:J
+    iget-wide v5, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->FT:J
 
     move-object v10, v2
 
@@ -56,13 +56,13 @@
 
     new-instance v11, Lcom/facebook/cache/disk/d;
 
-    iget-object v5, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->FF:Lcom/facebook/cache/disk/g;
+    iget-object v5, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->FW:Lcom/facebook/cache/disk/g;
 
-    iget-object v7, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->FG:Lcom/facebook/cache/common/b;
+    iget-object v7, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->FX:Lcom/facebook/cache/common/b;
 
-    iget-object v8, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->Fq:Lcom/facebook/cache/common/a;
+    iget-object v8, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->FH:Lcom/facebook/cache/common/a;
 
-    iget-boolean v10, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->FI:Z
+    iget-boolean v10, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->FZ:Z
 
     move-object v3, v11
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/d.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/d.smali
index 2e204e3e08..921b6f1f00 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/d.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/d.smali
@@ -24,11 +24,11 @@
 
     iget v1, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->mVersion:I
 
-    iget-object v2, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->FB:Lcom/facebook/common/d/k;
+    iget-object v2, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->FS:Lcom/facebook/common/d/k;
 
-    iget-object v3, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->FA:Ljava/lang/String;
+    iget-object v3, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->FR:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->Fq:Lcom/facebook/cache/common/a;
+    iget-object p1, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->FH:Lcom/facebook/cache/common/a;
 
     invoke-direct {v0, v1, v2, v3, p1}, Lcom/facebook/cache/disk/e;-><init>(ILcom/facebook/common/d/k;Ljava/lang/String;Lcom/facebook/cache/common/a;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/e.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/e.smali
index c9cdc4d1cf..978d75f0c0 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/e.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/e.smali
@@ -4,17 +4,17 @@
 
 
 # virtual methods
-.method public abstract hP()Ljava/util/concurrent/Executor;
-.end method
-
-.method public abstract hQ()Ljava/util/concurrent/Executor;
-.end method
-
-.method public abstract hR()Ljava/util/concurrent/Executor;
-.end method
-
 .method public abstract hS()Ljava/util/concurrent/Executor;
 .end method
 
 .method public abstract hT()Ljava/util/concurrent/Executor;
 .end method
+
+.method public abstract hU()Ljava/util/concurrent/Executor;
+.end method
+
+.method public abstract hV()Ljava/util/concurrent/Executor;
+.end method
+
+.method public abstract hW()Ljava/util/concurrent/Executor;
+.end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/g$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/g$1.smali
index 16bc37a6b0..44f1da51b1 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/g$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/g$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/facebook/imagepipeline/b/g$1;
+.class public final Lcom/facebook/imagepipeline/b/g$1;
 .super Ljava/lang/Object;
 .source "ImagePipeline.java"
 
@@ -7,12 +7,12 @@
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/imagepipeline/b/g;->hU()V
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/facebook/imagepipeline/b/g;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x0
+    accessFlags = 0x1
     name = null
 .end annotation
 
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic SC:Lcom/facebook/imagepipeline/b/g;
+.field final synthetic SV:Lcom/facebook/imagepipeline/b/g;
 
 
 # direct methods
-.method constructor <init>(Lcom/facebook/imagepipeline/b/g;)V
+.method public constructor <init>(Lcom/facebook/imagepipeline/b/g;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/g$1;->SC:Lcom/facebook/imagepipeline/b/g;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/g$1;->SV:Lcom/facebook/imagepipeline/b/g;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/h$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/h$1.smali
index 0ac6876e00..9bc33b5fcc 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/h$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/h$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic SZ:Lcom/facebook/imagepipeline/b/h;
+.field final synthetic Tr:Lcom/facebook/imagepipeline/b/h;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/b/h;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h$1;->SZ:Lcom/facebook/imagepipeline/b/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h$1;->Tr:Lcom/facebook/imagepipeline/b/h;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/h$b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/h$b.smali
index c0991844b3..5b39db02ff 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/h$b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/h$b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public Td:Z
+.field public Tv:Z
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/h$b;->Td:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/h$b;->Tv:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/i$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/i$a.smali
index 23b4dcb738..5646743d14 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/i$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/i$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field public OU:Z
+.field public Pm:Z
 
-.field public SB:Lcom/facebook/common/d/k;
+.field public SU:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -27,35 +27,35 @@
     .end annotation
 .end field
 
-.field Te:Z
+.field TA:Z
 
-.field Tf:Lcom/facebook/common/k/b$a;
+.field TB:Z
 
-.field Tg:Z
+.field TC:I
 
-.field Th:Lcom/facebook/common/k/b;
+.field TD:I
 
-.field Ti:Z
+.field public TE:Z
 
-.field Tj:Z
+.field TF:I
 
-.field Tk:I
+.field TG:Z
 
-.field Tl:I
+.field TH:Z
 
-.field public Tm:Z
+.field TI:Lcom/facebook/imagepipeline/b/i$c;
 
-.field Tn:I
+.field public TJ:Z
 
-.field To:Z
+.field public final TK:Lcom/facebook/imagepipeline/b/h$a;
 
-.field Tp:Z
+.field Tw:Z
 
-.field Tq:Lcom/facebook/imagepipeline/b/i$c;
+.field Tx:Lcom/facebook/common/k/b$a;
 
-.field public Tr:Z
+.field Ty:Z
 
-.field private final Ts:Lcom/facebook/imagepipeline/b/h$a;
+.field Tz:Lcom/facebook/common/k/b;
 
 
 # direct methods
@@ -66,43 +66,29 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Te:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Tw:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Tg:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Ty:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Ti:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->TA:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Tj:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->TB:Z
 
-    iput v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Tk:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/i$a;->TC:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Tl:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/i$a;->TD:I
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Tm:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->TE:Z
 
     const/16 v1, 0x800
 
-    iput v1, p0, Lcom/facebook/imagepipeline/b/i$a;->Tn:I
+    iput v1, p0, Lcom/facebook/imagepipeline/b/i$a;->TF:I
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->To:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->TG:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Tp:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->TH:Z
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/i$a;->Ts:Lcom/facebook/imagepipeline/b/h$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/i$a;->TK:Lcom/facebook/imagepipeline/b/h$a;
 
     return-void
 .end method
-
-
-# virtual methods
-.method public final hZ()Lcom/facebook/imagepipeline/b/h$a;
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->OU:Z
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Ts:Lcom/facebook/imagepipeline/b/h$a;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/i.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/i.smali
index 06b4da4459..94b5694e34 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/i.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/i.smali
@@ -14,9 +14,9 @@
 
 
 # instance fields
-.field final OU:Z
+.field final Pm:Z
 
-.field final SB:Lcom/facebook/common/d/k;
+.field final SU:Lcom/facebook/common/d/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/k<",
@@ -26,33 +26,33 @@
     .end annotation
 .end field
 
-.field final Te:Z
+.field final TA:Z
 
-.field final Tf:Lcom/facebook/common/k/b$a;
+.field final TB:Z
 
-.field final Tg:Z
+.field final TC:I
 
-.field final Th:Lcom/facebook/common/k/b;
+.field final TD:I
 
-.field final Ti:Z
+.field TE:Z
 
-.field final Tj:Z
+.field final TF:I
 
-.field final Tk:I
+.field final TG:Z
 
-.field final Tl:I
+.field final TH:Z
 
-.field Tm:Z
+.field final TI:Lcom/facebook/imagepipeline/b/i$c;
 
-.field final Tn:I
+.field final TJ:Z
 
-.field final To:Z
+.field final Tw:Z
 
-.field final Tp:Z
+.field final Tx:Lcom/facebook/common/k/b$a;
 
-.field final Tq:Lcom/facebook/imagepipeline/b/i$c;
+.field final Ty:Z
 
-.field final Tr:Z
+.field final Tz:Lcom/facebook/common/k/b;
 
 
 # direct methods
@@ -61,55 +61,55 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Te:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tw:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Te:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Tw:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tf:Lcom/facebook/common/k/b$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tx:Lcom/facebook/common/k/b$a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Tf:Lcom/facebook/common/k/b$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Tx:Lcom/facebook/common/k/b$a;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tg:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ty:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Tg:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Ty:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Th:Lcom/facebook/common/k/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tz:Lcom/facebook/common/k/b;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Th:Lcom/facebook/common/k/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Tz:Lcom/facebook/common/k/b;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ti:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TA:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Ti:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->TA:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tj:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TB:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Tj:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->TB:Z
 
-    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tk:I
+    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TC:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->Tk:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->TC:I
 
-    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tl:I
+    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TD:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->Tl:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->TD:I
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tm:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TE:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Tm:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->TE:Z
 
-    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tn:I
+    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TF:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->Tn:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->TF:I
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->To:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TG:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->To:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->TG:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tp:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TH:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Tp:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->TH:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tq:Lcom/facebook/imagepipeline/b/i$c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TI:Lcom/facebook/imagepipeline/b/i$c;
 
     if-nez v0, :cond_0
 
@@ -117,27 +117,27 @@
 
     invoke-direct {v0}, Lcom/facebook/imagepipeline/b/i$b;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Tq:Lcom/facebook/imagepipeline/b/i$c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->TI:Lcom/facebook/imagepipeline/b/i$c;
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tq:Lcom/facebook/imagepipeline/b/i$c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TI:Lcom/facebook/imagepipeline/b/i$c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Tq:Lcom/facebook/imagepipeline/b/i$c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->TI:Lcom/facebook/imagepipeline/b/i$c;
 
     :goto_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->SB:Lcom/facebook/common/d/k;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->SU:Lcom/facebook/common/d/k;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->SB:Lcom/facebook/common/d/k;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->SU:Lcom/facebook/common/d/k;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Tr:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TJ:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Tr:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->TJ:Z
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/i$a;->OU:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/i$a;->Pm:Z
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/b/i;->OU:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/b/i;->Pm:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/k$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/k$1.smali
index 1d67704e3d..a9da3d2077 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/k$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/k$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic TH:Lcom/facebook/imagepipeline/b/k;
+.field final synthetic TZ:Lcom/facebook/imagepipeline/b/k;
 
-.field final synthetic qR:Ljava/lang/Runnable;
+.field final synthetic qQ:Ljava/lang/Runnable;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/b/k;Ljava/lang/Runnable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/k$1;->TH:Lcom/facebook/imagepipeline/b/k;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/k$1;->TZ:Lcom/facebook/imagepipeline/b/k;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/b/k$1;->qR:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/b/k$1;->qQ:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
     .locals 1
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k$1;->TH:Lcom/facebook/imagepipeline/b/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k$1;->TZ:Lcom/facebook/imagepipeline/b/k;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/b/k;->a(Lcom/facebook/imagepipeline/b/k;)I
 
@@ -53,7 +53,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :catchall_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k$1;->qR:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k$1;->qQ:Ljava/lang/Runnable;
 
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/k.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/k.smali
index 420f10c984..c019dde590 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/k.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/k.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final TE:I
+.field private final TW:I
 
-.field private final TF:Z
+.field private final TX:Z
 
-.field private final TG:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final TY:Ljava/util/concurrent/atomic/AtomicInteger;
 
 .field private final mPrefix:Ljava/lang/String;
 
@@ -28,15 +28,15 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->TG:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->TY:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lcom/facebook/imagepipeline/b/k;->TE:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/k;->TW:I
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/b/k;->mPrefix:Ljava/lang/String;
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/b/k;->TF:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/b/k;->TX:Z
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 .method static synthetic a(Lcom/facebook/imagepipeline/b/k;)I
     .locals 0
 
-    iget p0, p0, Lcom/facebook/imagepipeline/b/k;->TE:I
+    iget p0, p0, Lcom/facebook/imagepipeline/b/k;->TW:I
 
     return p0
 .end method
@@ -58,7 +58,7 @@
 
     invoke-direct {v0, p0, p1}, Lcom/facebook/imagepipeline/b/k$1;-><init>(Lcom/facebook/imagepipeline/b/k;Ljava/lang/Runnable;)V
 
-    iget-boolean p1, p0, Lcom/facebook/imagepipeline/b/k;->TF:Z
+    iget-boolean p1, p0, Lcom/facebook/imagepipeline/b/k;->TX:Z
 
     if-eqz p1, :cond_0
 
@@ -74,7 +74,7 @@
 
     invoke-virtual {p1, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->TG:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->TY:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/l.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/l.smali
index 690deb8878..fabb11db2d 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/l.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/l.smali
@@ -4,23 +4,15 @@
 
 
 # instance fields
-.field final Ha:Lcom/facebook/common/g/a;
+.field final Hr:Lcom/facebook/common/g/a;
 
-.field final OS:Lcom/facebook/imagepipeline/b/e;
+.field final Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field final Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field final Pk:Lcom/facebook/imagepipeline/b/e;
 
-.field final QF:Lcom/facebook/common/g/g;
+.field final QX:Lcom/facebook/common/g/g;
 
-.field private final SF:Z
-
-.field private final SI:Lcom/facebook/imagepipeline/d/c;
-
-.field private final SS:Lcom/facebook/imagepipeline/d/e;
-
-.field private final ST:Z
-
-.field final St:Lcom/facebook/imagepipeline/cache/o;
+.field final SL:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -31,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final Su:Lcom/facebook/imagepipeline/cache/o;
+.field private final SM:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -42,23 +34,31 @@
     .end annotation
 .end field
 
-.field private final Sw:Lcom/facebook/imagepipeline/cache/e;
+.field private final SO:Lcom/facebook/imagepipeline/cache/e;
 
-.field final Sx:Lcom/facebook/imagepipeline/cache/f;
+.field final SQ:Lcom/facebook/imagepipeline/cache/f;
 
-.field TI:Landroid/content/res/AssetManager;
+.field private final SY:Z
 
-.field private final TJ:Lcom/facebook/imagepipeline/cache/e;
+.field final TC:I
 
-.field private final Tg:Z
+.field final TD:I
 
-.field final Tk:I
+.field TE:Z
 
-.field final Tl:I
+.field private final TF:I
 
-.field Tm:Z
+.field private final Tb:Lcom/facebook/imagepipeline/d/c;
 
-.field private final Tn:I
+.field private final Tk:Lcom/facebook/imagepipeline/d/e;
+
+.field private final Tl:Z
+
+.field private final Ty:Z
+
+.field Ua:Landroid/content/res/AssetManager;
+
+.field private final Ub:Lcom/facebook/imagepipeline/cache/e;
 
 .field mContentResolver:Landroid/content/ContentResolver;
 
@@ -126,79 +126,79 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->TI:Landroid/content/res/AssetManager;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->Ua:Landroid/content/res/AssetManager;
 
     move-object v1, p2
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->Ha:Lcom/facebook/common/g/a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->Hr:Lcom/facebook/common/g/a;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->SI:Lcom/facebook/imagepipeline/d/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->Tb:Lcom/facebook/imagepipeline/d/c;
 
     move-object v1, p4
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->SS:Lcom/facebook/imagepipeline/d/e;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->Tk:Lcom/facebook/imagepipeline/d/e;
 
     move v1, p5
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/l;->SF:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/l;->SY:Z
 
     move v1, p6
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/l;->ST:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/l;->Tl:Z
 
     move v1, p7
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/l;->Tg:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/l;->Ty:Z
 
     move-object v1, p8
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
 
     move-object v1, p9
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->QF:Lcom/facebook/common/g/g;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->QX:Lcom/facebook/common/g/g;
 
     move-object v1, p10
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->St:Lcom/facebook/imagepipeline/cache/o;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->SL:Lcom/facebook/imagepipeline/cache/o;
 
     move-object v1, p11
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->Su:Lcom/facebook/imagepipeline/cache/o;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->SM:Lcom/facebook/imagepipeline/cache/o;
 
     move-object v1, p12
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
     move-object v1, p13
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->Sw:Lcom/facebook/imagepipeline/cache/e;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->SO:Lcom/facebook/imagepipeline/cache/e;
 
     move-object/from16 v1, p14
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     move-object/from16 v1, p15
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/l;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     move/from16 v1, p16
 
-    iput v1, v0, Lcom/facebook/imagepipeline/b/l;->Tk:I
+    iput v1, v0, Lcom/facebook/imagepipeline/b/l;->TC:I
 
     move/from16 v1, p17
 
-    iput v1, v0, Lcom/facebook/imagepipeline/b/l;->Tl:I
+    iput v1, v0, Lcom/facebook/imagepipeline/b/l;->TD:I
 
     move/from16 v1, p18
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/l;->Tm:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/l;->TE:Z
 
     move/from16 v1, p19
 
-    iput v1, v0, Lcom/facebook/imagepipeline/b/l;->Tn:I
+    iput v1, v0, Lcom/facebook/imagepipeline/b/l;->TF:I
 
     return-void
 .end method
@@ -304,13 +304,13 @@
 
     new-instance v6, Lcom/facebook/imagepipeline/h/ao;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hS()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hV()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->QF:Lcom/facebook/common/g/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->QX:Lcom/facebook/common/g/g;
 
     move-object v0, v6
 
@@ -340,9 +340,9 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/h/f;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->St:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->SL:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, v2, p1}, Lcom/facebook/imagepipeline/h/f;-><init>(Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/h/aj;)V
 
@@ -364,7 +364,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/h/g;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, p1}, Lcom/facebook/imagepipeline/h/g;-><init>(Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/h/aj;)V
 
@@ -386,9 +386,9 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/h/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->St:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->SL:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, v2, p1}, Lcom/facebook/imagepipeline/h/h;-><init>(Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/h/aj;)V
 
@@ -409,25 +409,25 @@
 
     new-instance v10, Lcom/facebook/imagepipeline/h/m;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->Ha:Lcom/facebook/common/g/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->Hr:Lcom/facebook/common/g/a;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hR()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hU()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/l;->SI:Lcom/facebook/imagepipeline/d/c;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/l;->Tb:Lcom/facebook/imagepipeline/d/c;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/b/l;->SS:Lcom/facebook/imagepipeline/d/e;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/b/l;->Tk:Lcom/facebook/imagepipeline/d/e;
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/b/l;->SF:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/b/l;->SY:Z
 
-    iget-boolean v6, p0, Lcom/facebook/imagepipeline/b/l;->ST:Z
+    iget-boolean v6, p0, Lcom/facebook/imagepipeline/b/l;->Tl:Z
 
-    iget-boolean v7, p0, Lcom/facebook/imagepipeline/b/l;->Tg:Z
+    iget-boolean v7, p0, Lcom/facebook/imagepipeline/b/l;->Ty:Z
 
-    iget v9, p0, Lcom/facebook/imagepipeline/b/l;->Tn:I
+    iget v9, p0, Lcom/facebook/imagepipeline/b/l;->TF:I
 
     move-object v0, v10
 
@@ -452,11 +452,11 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/h/o;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->Sw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->SO:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/l;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/l;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, v2, v3, p1}, Lcom/facebook/imagepipeline/h/o;-><init>(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/h/aj;)V
 
@@ -477,11 +477,11 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/h/p;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->Sw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->SO:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/l;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/l;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, v2, v3, p1}, Lcom/facebook/imagepipeline/h/p;-><init>(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/h/aj;)V
 
@@ -502,13 +502,13 @@
 
     new-instance v6, Lcom/facebook/imagepipeline/h/ag;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/l;->QF:Lcom/facebook/common/g/g;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/l;->QX:Lcom/facebook/common/g/g;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/b/l;->Ha:Lcom/facebook/common/g/a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/b/l;->Hr:Lcom/facebook/common/g/a;
 
     move-object v0, v6
 
@@ -533,25 +533,25 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/h/q;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, p1}, Lcom/facebook/imagepipeline/h/q;-><init>(Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/h/aj;)V
 
     return-object v0
 .end method
 
-.method public final io()Lcom/facebook/imagepipeline/h/y;
+.method public final in()Lcom/facebook/imagepipeline/h/y;
     .locals 4
 
     new-instance v0, Lcom/facebook/imagepipeline/h/y;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hP()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hS()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->QF:Lcom/facebook/common/g/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->QX:Lcom/facebook/common/g/g;
 
     iget-object v3, p0, Lcom/facebook/imagepipeline/b/l;->mContentResolver:Landroid/content/ContentResolver;
 
@@ -574,9 +574,9 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/h/r;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->Su:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->SM:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, v2, p1}, Lcom/facebook/imagepipeline/h/r;-><init>(Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/h/aj;)V
 
@@ -599,9 +599,9 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/h/at;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hT()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hW()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
@@ -624,13 +624,13 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/h/ax;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hS()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/e;->hV()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->QF:Lcom/facebook/common/g/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/l;->QX:Lcom/facebook/common/g/g;
 
     invoke-direct {v0, v1, v2, p1}, Lcom/facebook/imagepipeline/h/ax;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Lcom/facebook/imagepipeline/h/aj;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/m.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/m.smali
index 4bbd04f708..1d4dccf7b8 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/m.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/m.smali
@@ -4,21 +4,27 @@
 
 
 # instance fields
-.field private final SF:Z
+.field private final SR:Lcom/facebook/imagepipeline/h/as;
 
-.field private final SJ:Lcom/facebook/imagepipeline/j/d;
+.field private final SY:Z
 
-.field private final SO:Lcom/facebook/imagepipeline/h/af;
+.field final TB:Z
 
-.field private final ST:Z
+.field private final TH:Z
 
-.field private final SX:Z
+.field private final TS:Lcom/facebook/imagepipeline/b/l;
 
-.field private final Sy:Lcom/facebook/imagepipeline/h/as;
+.field private final Tc:Lcom/facebook/imagepipeline/j/d;
 
-.field private final TA:Lcom/facebook/imagepipeline/b/l;
+.field private final Th:Lcom/facebook/imagepipeline/h/af;
 
-.field TK:Lcom/facebook/imagepipeline/h/aj;
+.field private final Tl:Z
+
+.field private final Tp:Z
+
+.field private final Tw:Z
+
+.field Uc:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -29,7 +35,7 @@
     .end annotation
 .end field
 
-.field private TL:Lcom/facebook/imagepipeline/h/aj;
+.field private Ud:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -39,7 +45,7 @@
     .end annotation
 .end field
 
-.field TM:Lcom/facebook/imagepipeline/h/aj;
+.field Ue:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -50,7 +56,7 @@
     .end annotation
 .end field
 
-.field TN:Lcom/facebook/imagepipeline/h/aj;
+.field Uf:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -61,7 +67,7 @@
     .end annotation
 .end field
 
-.field TO:Lcom/facebook/imagepipeline/h/aj;
+.field Ug:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -72,7 +78,7 @@
     .end annotation
 .end field
 
-.field TP:Lcom/facebook/imagepipeline/h/aj;
+.field Uh:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -83,7 +89,7 @@
     .end annotation
 .end field
 
-.field TQ:Lcom/facebook/imagepipeline/h/aj;
+.field Ui:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -94,7 +100,7 @@
     .end annotation
 .end field
 
-.field TR:Lcom/facebook/imagepipeline/h/aj;
+.field Uj:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -105,7 +111,7 @@
     .end annotation
 .end field
 
-.field TS:Lcom/facebook/imagepipeline/h/aj;
+.field Uk:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -116,7 +122,7 @@
     .end annotation
 .end field
 
-.field TT:Ljava/util/Map;
+.field Ul:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -132,7 +138,7 @@
     .end annotation
 .end field
 
-.field TU:Ljava/util/Map;
+.field Um:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -147,7 +153,7 @@
     .end annotation
 .end field
 
-.field TV:Ljava/util/Map;
+.field Un:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -163,12 +169,6 @@
     .end annotation
 .end field
 
-.field private final Te:Z
-
-.field final Tj:Z
-
-.field private final Tp:Z
-
 .field private final mContentResolver:Landroid/content/ContentResolver;
 
 
@@ -180,43 +180,43 @@
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/b/m;->mContentResolver:Landroid/content/ContentResolver;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/b/m;->SO:Lcom/facebook/imagepipeline/h/af;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/b/m;->Th:Lcom/facebook/imagepipeline/h/af;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/b/m;->ST:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/b/m;->Tl:Z
 
-    iput-boolean p5, p0, Lcom/facebook/imagepipeline/b/m;->Te:Z
+    iput-boolean p5, p0, Lcom/facebook/imagepipeline/b/m;->Tw:Z
 
     new-instance p1, Ljava/util/HashMap;
 
     invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/m;->TT:Ljava/util/Map;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/m;->Ul:Ljava/util/Map;
 
     new-instance p1, Ljava/util/HashMap;
 
     invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/m;->TU:Ljava/util/Map;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/m;->Um:Ljava/util/Map;
 
     new-instance p1, Ljava/util/HashMap;
 
     invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/m;->TV:Ljava/util/Map;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/m;->Un:Ljava/util/Map;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/b/m;->Sy:Lcom/facebook/imagepipeline/h/as;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/b/m;->SR:Lcom/facebook/imagepipeline/h/as;
 
-    iput-boolean p7, p0, Lcom/facebook/imagepipeline/b/m;->SF:Z
+    iput-boolean p7, p0, Lcom/facebook/imagepipeline/b/m;->SY:Z
 
-    iput-boolean p8, p0, Lcom/facebook/imagepipeline/b/m;->Tj:Z
+    iput-boolean p8, p0, Lcom/facebook/imagepipeline/b/m;->TB:Z
 
-    iput-boolean p9, p0, Lcom/facebook/imagepipeline/b/m;->Tp:Z
+    iput-boolean p9, p0, Lcom/facebook/imagepipeline/b/m;->TH:Z
 
-    iput-boolean p10, p0, Lcom/facebook/imagepipeline/b/m;->SX:Z
+    iput-boolean p10, p0, Lcom/facebook/imagepipeline/b/m;->Tp:Z
 
-    iput-object p11, p0, Lcom/facebook/imagepipeline/b/m;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iput-object p11, p0, Lcom/facebook/imagepipeline/b/m;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     return-void
 .end method
@@ -275,9 +275,9 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     const/4 v2, 0x1
 
@@ -285,7 +285,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->k(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/at;
 
@@ -320,9 +320,9 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     const/4 v2, 0x1
 
@@ -333,7 +333,7 @@
     return-object p1
 .end method
 
-.method private declared-synchronized ip()Lcom/facebook/imagepipeline/h/aj;
+.method private declared-synchronized io()Lcom/facebook/imagepipeline/h/aj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -350,13 +350,13 @@
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TK:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uc:Lcom/facebook/imagepipeline/h/aj;
 
     if-nez v0, :cond_0
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->iq()Lcom/facebook/imagepipeline/h/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->ip()Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object v0
 
@@ -364,14 +364,107 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TK:Lcom/facebook/imagepipeline/h/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uc:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
     :cond_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TK:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uc:Lcom/facebook/imagepipeline/h/aj;
+    :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 private declared-synchronized ip()Lcom/facebook/imagepipeline/h/aj;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lcom/facebook/imagepipeline/h/aj<",
+            "Lcom/facebook/imagepipeline/f/e;",
+            ">;"
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ud:Lcom/facebook/imagepipeline/h/aj;
+
+    if-nez v0, :cond_1
+
+    invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
+
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Th:Lcom/facebook/imagepipeline/h/af;
+
+    new-instance v2, Lcom/facebook/imagepipeline/h/ae;
+
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/l;->QX:Lcom/facebook/common/g/g;
+
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->Hr:Lcom/facebook/common/g/a;
+
+    invoke-direct {v2, v3, v0, v1}, Lcom/facebook/imagepipeline/h/ae;-><init>(Lcom/facebook/common/g/g;Lcom/facebook/common/g/a;Lcom/facebook/imagepipeline/h/af;)V
+
+    invoke-direct {p0, v2}, Lcom/facebook/imagepipeline/b/m;->o(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/aj;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lcom/facebook/imagepipeline/b/l;->a(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/a;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ud:Lcom/facebook/imagepipeline/h/aj;
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
+
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Ud:Lcom/facebook/imagepipeline/h/aj;
+
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/b/m;->Tl:Z
+
+    if-eqz v2, :cond_0
+
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/b/m;->SY:Z
+
+    if-nez v2, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Tc:Lcom/facebook/imagepipeline/j/d;
+
+    invoke-virtual {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/b/l;->a(Lcom/facebook/imagepipeline/h/aj;ZLcom/facebook/imagepipeline/j/d;)Lcom/facebook/imagepipeline/h/ao;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ud:Lcom/facebook/imagepipeline/h/aj;
+
+    invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
+
+    :cond_1
+    invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ud:Lcom/facebook/imagepipeline/h/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -388,83 +481,46 @@
 .end method
 
 .method private declared-synchronized iq()Lcom/facebook/imagepipeline/h/aj;
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
             "Lcom/facebook/imagepipeline/h/aj<",
-            "Lcom/facebook/imagepipeline/f/e;",
-            ">;"
+            "Lcom/facebook/common/references/CloseableReference<",
+            "Lcom/facebook/imagepipeline/f/c;",
+            ">;>;"
         }
     .end annotation
 
     monitor-enter p0
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ue:Lcom/facebook/imagepipeline/h/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TL:Lcom/facebook/imagepipeline/h/aj;
+    if-nez v0, :cond_0
 
-    if-nez v0, :cond_1
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
+    new-instance v1, Lcom/facebook/imagepipeline/h/aa;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->SO:Lcom/facebook/imagepipeline/h/af;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hS()Ljava/util/concurrent/Executor;
 
-    new-instance v2, Lcom/facebook/imagepipeline/h/ae;
+    move-result-object v2
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/b/l;->QF:Lcom/facebook/common/g/g;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->QX:Lcom/facebook/common/g/g;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->Ha:Lcom/facebook/common/g/a;
+    invoke-direct {v1, v2, v0}, Lcom/facebook/imagepipeline/h/aa;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;)V
 
-    invoke-direct {v2, v3, v0, v1}, Lcom/facebook/imagepipeline/h/ae;-><init>(Lcom/facebook/common/g/g;Lcom/facebook/common/g/a;Lcom/facebook/imagepipeline/h/af;)V
-
-    invoke-direct {p0, v2}, Lcom/facebook/imagepipeline/b/m;->o(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/aj;
+    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/m;->m(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/facebook/imagepipeline/b/l;->a(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/a;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TL:Lcom/facebook/imagepipeline/h/aj;
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
-
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->TL:Lcom/facebook/imagepipeline/h/aj;
-
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/b/m;->ST:Z
-
-    if-eqz v2, :cond_0
-
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/b/m;->SF:Z
-
-    if-nez v2, :cond_0
-
-    const/4 v2, 0x1
-
-    goto :goto_0
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ue:Lcom/facebook/imagepipeline/h/aj;
 
     :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->SJ:Lcom/facebook/imagepipeline/j/d;
-
-    invoke-virtual {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/b/l;->a(Lcom/facebook/imagepipeline/h/aj;ZLcom/facebook/imagepipeline/j/d;)Lcom/facebook/imagepipeline/h/ao;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TL:Lcom/facebook/imagepipeline/h/aj;
-
-    invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
-
-    :cond_1
-    invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TL:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ue:Lcom/facebook/imagepipeline/h/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -495,32 +551,32 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TM:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uf:Lcom/facebook/imagepipeline/h/aj;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
-    new-instance v1, Lcom/facebook/imagepipeline/h/aa;
+    new-instance v1, Lcom/facebook/imagepipeline/h/ac;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hP()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hS()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->QF:Lcom/facebook/common/g/g;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->mContentResolver:Landroid/content/ContentResolver;
 
-    invoke-direct {v1, v2, v0}, Lcom/facebook/imagepipeline/h/aa;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;)V
+    invoke-direct {v1, v2, v0}, Lcom/facebook/imagepipeline/h/ac;-><init>(Ljava/util/concurrent/Executor;Landroid/content/ContentResolver;)V
 
-    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/m;->m(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/aj;
+    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/m;->q(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TM:Lcom/facebook/imagepipeline/h/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uf:Lcom/facebook/imagepipeline/h/aj;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TM:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uf:Lcom/facebook/imagepipeline/h/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -537,7 +593,7 @@
 .end method
 
 .method private declared-synchronized is()Lcom/facebook/imagepipeline/h/aj;
-    .locals 3
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -551,32 +607,68 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TN:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ug:Lcom/facebook/imagepipeline/h/aj;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
-    new-instance v1, Lcom/facebook/imagepipeline/h/ac;
+    new-instance v1, Lcom/facebook/imagepipeline/h/w;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hP()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hS()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/l;->QX:Lcom/facebook/common/g/g;
+
     iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->mContentResolver:Landroid/content/ContentResolver;
 
-    invoke-direct {v1, v2, v0}, Lcom/facebook/imagepipeline/h/ac;-><init>(Ljava/util/concurrent/Executor;Landroid/content/ContentResolver;)V
+    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/h/w;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/ContentResolver;)V
 
-    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/m;->q(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/aj;
+    const/4 v0, 0x2
+
+    new-array v0, v0, [Lcom/facebook/imagepipeline/h/av;
+
+    const/4 v2, 0x0
+
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
+
+    new-instance v4, Lcom/facebook/imagepipeline/h/x;
+
+    iget-object v5, v3, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
+
+    invoke-interface {v5}, Lcom/facebook/imagepipeline/b/e;->hS()Ljava/util/concurrent/Executor;
+
+    move-result-object v5
+
+    iget-object v6, v3, Lcom/facebook/imagepipeline/b/l;->QX:Lcom/facebook/common/g/g;
+
+    iget-object v3, v3, Lcom/facebook/imagepipeline/b/l;->mContentResolver:Landroid/content/ContentResolver;
+
+    invoke-direct {v4, v5, v6, v3}, Lcom/facebook/imagepipeline/h/x;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/ContentResolver;)V
+
+    aput-object v4, v0, v2
+
+    const/4 v2, 0x1
+
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
+
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/b/l;->in()Lcom/facebook/imagepipeline/h/y;
+
+    move-result-object v3
+
+    aput-object v3, v0, v2
+
+    invoke-direct {p0, v1, v0}, Lcom/facebook/imagepipeline/b/m;->a(Lcom/facebook/imagepipeline/h/aj;[Lcom/facebook/imagepipeline/h/av;)Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TN:Lcom/facebook/imagepipeline/h/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ug:Lcom/facebook/imagepipeline/h/aj;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TN:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ug:Lcom/facebook/imagepipeline/h/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -593,7 +685,7 @@
 .end method
 
 .method private declared-synchronized it()Lcom/facebook/imagepipeline/h/aj;
-    .locals 7
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -607,68 +699,34 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TO:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uk:Lcom/facebook/imagepipeline/h/aj;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
-    new-instance v1, Lcom/facebook/imagepipeline/h/w;
+    new-instance v1, Lcom/facebook/imagepipeline/h/an;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hP()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hS()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/b/l;->QF:Lcom/facebook/common/g/g;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/l;->QX:Lcom/facebook/common/g/g;
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->mContentResolver:Landroid/content/ContentResolver;
 
-    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/h/w;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/ContentResolver;)V
+    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/h/an;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/ContentResolver;)V
 
-    const/4 v0, 0x2
-
-    new-array v0, v0, [Lcom/facebook/imagepipeline/h/av;
-
-    const/4 v2, 0x0
-
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
-
-    new-instance v4, Lcom/facebook/imagepipeline/h/x;
-
-    iget-object v5, v3, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
-
-    invoke-interface {v5}, Lcom/facebook/imagepipeline/b/e;->hP()Ljava/util/concurrent/Executor;
-
-    move-result-object v5
-
-    iget-object v6, v3, Lcom/facebook/imagepipeline/b/l;->QF:Lcom/facebook/common/g/g;
-
-    iget-object v3, v3, Lcom/facebook/imagepipeline/b/l;->mContentResolver:Landroid/content/ContentResolver;
-
-    invoke-direct {v4, v5, v6, v3}, Lcom/facebook/imagepipeline/h/x;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/ContentResolver;)V
-
-    aput-object v4, v0, v2
-
-    const/4 v2, 0x1
-
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
-
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/b/l;->io()Lcom/facebook/imagepipeline/h/y;
-
-    move-result-object v3
-
-    aput-object v3, v0, v2
-
-    invoke-direct {p0, v1, v0}, Lcom/facebook/imagepipeline/b/m;->a(Lcom/facebook/imagepipeline/h/aj;[Lcom/facebook/imagepipeline/h/av;)Lcom/facebook/imagepipeline/h/aj;
+    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/m;->m(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TO:Lcom/facebook/imagepipeline/h/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uk:Lcom/facebook/imagepipeline/h/aj;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TO:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uk:Lcom/facebook/imagepipeline/h/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -699,34 +757,34 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/h/aj;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
-    new-instance v1, Lcom/facebook/imagepipeline/h/an;
+    new-instance v1, Lcom/facebook/imagepipeline/h/ab;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hP()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hS()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/b/l;->QF:Lcom/facebook/common/g/g;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/l;->QX:Lcom/facebook/common/g/g;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->mContentResolver:Landroid/content/ContentResolver;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->mResources:Landroid/content/res/Resources;
 
-    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/h/an;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/ContentResolver;)V
+    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/h/ab;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/res/Resources;)V
 
     invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/m;->m(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/h/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/h/aj;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/h/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -757,34 +815,34 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TP:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ui:Lcom/facebook/imagepipeline/h/aj;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
-    new-instance v1, Lcom/facebook/imagepipeline/h/ab;
+    new-instance v1, Lcom/facebook/imagepipeline/h/v;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hP()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hS()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/b/l;->QF:Lcom/facebook/common/g/g;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/l;->QX:Lcom/facebook/common/g/g;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->mResources:Landroid/content/res/Resources;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->Ua:Landroid/content/res/AssetManager;
 
-    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/h/ab;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/res/Resources;)V
+    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/h/v;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/res/AssetManager;)V
 
     invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/m;->m(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TP:Lcom/facebook/imagepipeline/h/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ui:Lcom/facebook/imagepipeline/h/aj;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TP:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ui:Lcom/facebook/imagepipeline/h/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -815,90 +873,32 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TQ:Lcom/facebook/imagepipeline/h/aj;
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
-
-    new-instance v1, Lcom/facebook/imagepipeline/h/v;
-
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
-
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/e;->hP()Ljava/util/concurrent/Executor;
-
-    move-result-object v2
-
-    iget-object v3, v0, Lcom/facebook/imagepipeline/b/l;->QF:Lcom/facebook/common/g/g;
-
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->TI:Landroid/content/res/AssetManager;
-
-    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/h/v;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/res/AssetManager;)V
-
-    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/m;->m(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/aj;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TQ:Lcom/facebook/imagepipeline/h/aj;
-
-    :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TQ:Lcom/facebook/imagepipeline/h/aj;
-    :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 private declared-synchronized ix()Lcom/facebook/imagepipeline/h/aj;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lcom/facebook/imagepipeline/h/aj<",
-            "Lcom/facebook/common/references/CloseableReference<",
-            "Lcom/facebook/imagepipeline/f/c;",
-            ">;>;"
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TR:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uj:Lcom/facebook/imagepipeline/h/aj;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     new-instance v1, Lcom/facebook/imagepipeline/h/l;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->QF:Lcom/facebook/common/g/g;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->QX:Lcom/facebook/common/g/g;
 
     invoke-direct {v1, v0}, Lcom/facebook/imagepipeline/h/l;-><init>(Lcom/facebook/common/g/g;)V
 
-    sget-boolean v0, Lcom/facebook/common/k/c;->HH:Z
+    sget-boolean v0, Lcom/facebook/common/k/c;->HY:Z
 
     if-eqz v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/m;->Te:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/m;->Tw:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/k/c;->HK:Lcom/facebook/common/k/b;
+    sget-object v0, Lcom/facebook/common/k/c;->Ib:Lcom/facebook/common/k/b;
 
     if-nez v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/b/l;->l(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/ax;
 
@@ -909,11 +909,11 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     const/4 v2, 0x1
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     invoke-virtual {v1, v0, v2, v3}, Lcom/facebook/imagepipeline/b/l;->a(Lcom/facebook/imagepipeline/h/aj;ZLcom/facebook/imagepipeline/j/d;)Lcom/facebook/imagepipeline/h/ao;
 
@@ -923,10 +923,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TR:Lcom/facebook/imagepipeline/h/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uj:Lcom/facebook/imagepipeline/h/aj;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TR:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Uj:Lcom/facebook/imagepipeline/h/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -961,9 +961,9 @@
 
     new-array v0, v0, [Lcom/facebook/imagepipeline/h/av;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/b/l;->io()Lcom/facebook/imagepipeline/h/y;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/b/l;->in()Lcom/facebook/imagepipeline/h/y;
 
     move-result-object v1
 
@@ -995,7 +995,7 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->e(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/m;
 
@@ -1024,27 +1024,27 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/facebook/common/k/c;->HH:Z
+    sget-boolean v0, Lcom/facebook/common/k/c;->HY:Z
 
     if-eqz v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/m;->Te:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/m;->Tw:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/k/c;->HK:Lcom/facebook/common/k/b;
+    sget-object v0, Lcom/facebook/common/k/c;->Ib:Lcom/facebook/common/k/b;
 
     if-nez v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->l(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/ax;
 
     move-result-object p1
 
     :cond_1
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/m;->SX:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/m;->Tp:Z
 
     if-eqz v0, :cond_2
 
@@ -1053,13 +1053,13 @@
     move-result-object p1
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->j(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/r;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->i(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/q;
 
@@ -1084,17 +1084,17 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/m;->Tp:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/m;->TH:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->h(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/ag;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->g(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/p;
 
@@ -1103,14 +1103,14 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->g(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/p;
 
     move-result-object p1
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->f(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/o;
 
@@ -1137,25 +1137,25 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->d(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/h;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->c(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/g;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Sy:Lcom/facebook/imagepipeline/h/as;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->SR:Lcom/facebook/imagepipeline/h/as;
 
     invoke-static {p1, v0}, Lcom/facebook/imagepipeline/b/l;->a(Lcom/facebook/imagepipeline/h/aj;Lcom/facebook/imagepipeline/h/as;)Lcom/facebook/imagepipeline/h/ar;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/l;->b(Lcom/facebook/imagepipeline/h/aj;)Lcom/facebook/imagepipeline/h/f;
 
@@ -1166,7 +1166,7 @@
 
 
 # virtual methods
-.method final c(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/h/aj;
+.method final b(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/h/aj;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1185,13 +1185,13 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     const-string v1, "Uri is null."
 
     invoke-static {v0, v1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget p1, p1, Lcom/facebook/imagepipeline/request/b;->Yq:I
+    iget p1, p1, Lcom/facebook/imagepipeline/request/b;->YI:I
 
     if-eqz p1, :cond_2
 
@@ -1249,7 +1249,7 @@
     throw p1
 
     :pswitch_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->iu()Lcom/facebook/imagepipeline/h/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->it()Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object p1
     :try_end_0
@@ -1261,7 +1261,7 @@
 
     :pswitch_1
     :try_start_1
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->ix()Lcom/facebook/imagepipeline/h/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->iw()Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object p1
     :try_end_1
@@ -1273,7 +1273,7 @@
 
     :pswitch_2
     :try_start_2
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->iv()Lcom/facebook/imagepipeline/h/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->iu()Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object p1
     :try_end_2
@@ -1285,7 +1285,7 @@
 
     :pswitch_3
     :try_start_3
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->iw()Lcom/facebook/imagepipeline/h/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->iv()Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object p1
     :try_end_3
@@ -1303,13 +1303,13 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lcom/facebook/common/f/a;->at(Ljava/lang/String;)Z
+    invoke-static {p1}, Lcom/facebook/common/f/a;->ao(Ljava/lang/String;)Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->is()Lcom/facebook/imagepipeline/h/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->ir()Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object p1
     :try_end_4
@@ -1321,7 +1321,7 @@
 
     :cond_1
     :try_start_5
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->it()Lcom/facebook/imagepipeline/h/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->is()Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object p1
     :try_end_5
@@ -1333,7 +1333,7 @@
 
     :pswitch_5
     :try_start_6
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->ir()Lcom/facebook/imagepipeline/h/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->iq()Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object p1
     :try_end_6
@@ -1345,7 +1345,7 @@
 
     :pswitch_6
     :try_start_7
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->is()Lcom/facebook/imagepipeline/h/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->ir()Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object p1
     :try_end_7
@@ -1357,7 +1357,7 @@
 
     :cond_2
     :try_start_8
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->ip()Lcom/facebook/imagepipeline/h/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/m;->io()Lcom/facebook/imagepipeline/h/aj;
 
     move-result-object p1
     :try_end_8
@@ -1407,7 +1407,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TT:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ul:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -1415,36 +1415,36 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     new-instance v1, Lcom/facebook/imagepipeline/h/ai;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->Oh:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/l;->Oz:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->OS:Lcom/facebook/imagepipeline/b/e;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->Pk:Lcom/facebook/imagepipeline/b/e;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hS()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/e;->hV()Ljava/util/concurrent/Executor;
 
     move-result-object v0
 
     invoke-direct {v1, p1, v2, v0}, Lcom/facebook/imagepipeline/h/ai;-><init>(Lcom/facebook/imagepipeline/h/aj;Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;Ljava/util/concurrent/Executor;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     new-instance v2, Lcom/facebook/imagepipeline/h/ah;
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/b/l;->St:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/l;->SL:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/l;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v2, v3, v0, v1}, Lcom/facebook/imagepipeline/h/ah;-><init>(Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/h/aj;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TT:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ul:Ljava/util/Map;
 
     invoke-interface {v0, p1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TT:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Ul:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1485,7 +1485,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TV:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Un:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1495,19 +1495,19 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TA:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TS:Lcom/facebook/imagepipeline/b/l;
 
     new-instance v1, Lcom/facebook/imagepipeline/h/i;
 
-    iget v2, v0, Lcom/facebook/imagepipeline/b/l;->Tk:I
+    iget v2, v0, Lcom/facebook/imagepipeline/b/l;->TC:I
 
-    iget v3, v0, Lcom/facebook/imagepipeline/b/l;->Tl:I
+    iget v3, v0, Lcom/facebook/imagepipeline/b/l;->TD:I
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/l;->Tm:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/l;->TE:Z
 
     invoke-direct {v1, p1, v2, v3, v0}, Lcom/facebook/imagepipeline/h/i;-><init>(Lcom/facebook/imagepipeline/h/aj;IIZ)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->TV:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Un:Ljava/util/Map;
 
     invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/PlatformBitmapFactory.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/PlatformBitmapFactory.smali
index 4b3d0ece65..fd1f93ebae 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/PlatformBitmapFactory.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/PlatformBitmapFactory.smali
@@ -26,23 +26,3 @@
         }
     .end annotation
 .end method
-
-.method public final m(II)Lcom/facebook/common/references/CloseableReference;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(II)",
-            "Lcom/facebook/common/references/CloseableReference<",
-            "Landroid/graphics/Bitmap;",
-            ">;"
-        }
-    .end annotation
-
-    sget-object v0, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
-
-    invoke-virtual {p0, p1, p2, v0}, Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;->c(IILandroid/graphics/Bitmap$Config;)Lcom/facebook/common/references/CloseableReference;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/a.smali
index a11be1d9e9..eb35175ae7 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/a.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final QC:Lcom/facebook/imagepipeline/memory/d;
+.field private final QU:Lcom/facebook/imagepipeline/memory/d;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     return-void
 .end method
@@ -37,7 +37,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     invoke-interface {v1, v0}, Lcom/facebook/imagepipeline/memory/d;->get(I)Ljava/lang/Object;
 
@@ -71,7 +71,7 @@
 
     invoke-virtual {v0, p1, p2, p3}, Landroid/graphics/Bitmap;->reconfigure(IILandroid/graphics/Bitmap$Config;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     invoke-static {v0, p1}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Object;Lcom/facebook/common/references/b;)Lcom/facebook/common/references/CloseableReference;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/b.smali
index a39f1f6248..5039916149 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/b.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static final QD:[B
+.field private static final QV:[B
 
-.field private static final QE:[B
+.field private static final QW:[B
 
 
 # instance fields
-.field private final QF:Lcom/facebook/common/g/g;
+.field private final QX:Lcom/facebook/common/g/g;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/b;->QD:[B
+    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/b;->QV:[B
 
     const/16 v0, 0x1cf
 
@@ -31,7 +31,7 @@
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/b;->QE:[B
+    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/b;->QW:[B
 
     return-void
 
@@ -590,7 +590,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/b;->QF:Lcom/facebook/common/g/g;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/b;->QX:Lcom/facebook/common/g/g;
 
     return-void
 .end method
@@ -611,13 +611,13 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/bitmaps/b;->QF:Lcom/facebook/common/g/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/bitmaps/b;->QX:Lcom/facebook/common/g/g;
 
-    sget-object v2, Lcom/facebook/imagepipeline/bitmaps/b;->QD:[B
+    sget-object v2, Lcom/facebook/imagepipeline/bitmaps/b;->QV:[B
 
     array-length v2, v2
 
-    sget-object v3, Lcom/facebook/imagepipeline/bitmaps/b;->QE:[B
+    sget-object v3, Lcom/facebook/imagepipeline/bitmaps/b;->QW:[B
 
     array-length v3, v3
 
@@ -629,7 +629,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/bitmaps/b;->QD:[B
+    sget-object v1, Lcom/facebook/imagepipeline/bitmaps/b;->QV:[B
 
     invoke-virtual {v0, v1}, Lcom/facebook/common/g/i;->write([B)V
 
@@ -657,11 +657,11 @@
 
     invoke-virtual {v0, p1}, Lcom/facebook/common/g/i;->write(I)V
 
-    sget-object p1, Lcom/facebook/imagepipeline/bitmaps/b;->QE:[B
+    sget-object p1, Lcom/facebook/imagepipeline/bitmaps/b;->QW:[B
 
     invoke-virtual {v0, p1}, Lcom/facebook/common/g/i;->write([B)V
 
-    invoke-virtual {v0}, Lcom/facebook/common/g/i;->fI()Lcom/facebook/common/g/f;
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->fM()Lcom/facebook/common/g/f;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/c.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/c.smali
index 9e04289190..2f9527fe46 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/c.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/c.smali
@@ -31,7 +31,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->hy()Lcom/facebook/imagepipeline/bitmaps/g;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->hB()Lcom/facebook/imagepipeline/bitmaps/g;
 
     move-result-object p2
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/d.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/d.smali
index 9900672510..8339e4fab1 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/d.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/d.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final QG:Lcom/facebook/imagepipeline/bitmaps/b;
+.field private final QY:Lcom/facebook/imagepipeline/bitmaps/b;
 
-.field private final QH:Lcom/facebook/imagepipeline/memory/n;
+.field private final QZ:Lcom/facebook/imagepipeline/memory/n;
 
 
 # direct methods
@@ -18,11 +18,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/memory/ac;->je()Lcom/facebook/imagepipeline/memory/n;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/memory/ac;->jc()Lcom/facebook/imagepipeline/memory/n;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->QH:Lcom/facebook/imagepipeline/memory/n;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->QZ:Lcom/facebook/imagepipeline/memory/n;
 
     new-instance v0, Lcom/facebook/imagepipeline/bitmaps/b;
 
@@ -34,7 +34,7 @@
 
     invoke-direct {v0, p1}, Lcom/facebook/imagepipeline/bitmaps/b;-><init>(Lcom/facebook/common/g/g;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->QG:Lcom/facebook/imagepipeline/bitmaps/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->QY:Lcom/facebook/imagepipeline/bitmaps/b;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 .method public final a(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
     .locals 6
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->QG:Lcom/facebook/imagepipeline/bitmaps/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->QY:Lcom/facebook/imagepipeline/bitmaps/b;
 
     int-to-short p1, p1
 
@@ -64,11 +64,11 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    sget-object v1, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v1, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/f/e;->Us:Lcom/facebook/d/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/f/e;->UK:Lcom/facebook/d/c;
 
-    iget v1, v0, Lcom/facebook/imagepipeline/f/e;->Ut:I
+    iget v1, v0, Lcom/facebook/imagepipeline/f/e;->UL:I
 
     new-instance v2, Landroid/graphics/BitmapFactory$Options;
 
@@ -111,7 +111,7 @@
 
     check-cast v1, Lcom/facebook/common/g/f;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/bitmaps/d;->QH:Lcom/facebook/imagepipeline/memory/n;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/bitmaps/d;->QZ:Lcom/facebook/imagepipeline/memory/n;
 
     add-int/lit8 v5, p3, 0x2
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/e.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/e.smali
index 0c9d6dd803..af9522073f 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/e.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/e.smali
@@ -8,11 +8,11 @@
 
 
 # instance fields
-.field private final QG:Lcom/facebook/imagepipeline/bitmaps/b;
+.field private final QY:Lcom/facebook/imagepipeline/bitmaps/b;
 
-.field private final QI:Lcom/facebook/imagepipeline/platform/f;
+.field private final Ra:Lcom/facebook/imagepipeline/platform/f;
 
-.field private QJ:Z
+.field private Rb:Z
 
 
 # direct methods
@@ -35,9 +35,9 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/e;->QG:Lcom/facebook/imagepipeline/bitmaps/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/e;->QY:Lcom/facebook/imagepipeline/bitmaps/b;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/e;->QI:Lcom/facebook/imagepipeline/platform/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Ra:Lcom/facebook/imagepipeline/platform/f;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->hy()Lcom/facebook/imagepipeline/bitmaps/g;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->hB()Lcom/facebook/imagepipeline/bitmaps/g;
 
     move-result-object p1
 
@@ -85,7 +85,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->QJ:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Rb:Z
 
     if-eqz v0, :cond_0
 
@@ -96,7 +96,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->QG:Lcom/facebook/imagepipeline/bitmaps/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->QY:Lcom/facebook/imagepipeline/bitmaps/b;
 
     int-to-short v1, p1
 
@@ -111,14 +111,14 @@
 
     invoke-direct {v1, v0}, Lcom/facebook/imagepipeline/f/e;-><init>(Lcom/facebook/common/references/CloseableReference;)V
 
-    sget-object v2, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v2, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
-    iput-object v2, v1, Lcom/facebook/imagepipeline/f/e;->Us:Lcom/facebook/d/c;
+    iput-object v2, v1, Lcom/facebook/imagepipeline/f/e;->UK:Lcom/facebook/d/c;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object v2, p0, Lcom/facebook/imagepipeline/bitmaps/e;->QI:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Ra:Lcom/facebook/imagepipeline/platform/f;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -150,7 +150,7 @@
 
     invoke-static {v2}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
-    iput-boolean v4, p0, Lcom/facebook/imagepipeline/bitmaps/e;->QJ:Z
+    iput-boolean v4, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Rb:Z
 
     sget-object v2, Lcom/facebook/imagepipeline/bitmaps/e;->TAG:Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/f.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/f.smali
index a84c58b0cf..7c076153ee 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/f.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/f.smali
@@ -15,7 +15,7 @@
 
     new-instance p1, Lcom/facebook/imagepipeline/bitmaps/a;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->jc()Lcom/facebook/imagepipeline/memory/d;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->ja()Lcom/facebook/imagepipeline/memory/d;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/g.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/g.smali
index b1d30eef8d..3b1fe532c0 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/g.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/g.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field private static QK:Lcom/facebook/imagepipeline/bitmaps/g;
+.field private static Rc:Lcom/facebook/imagepipeline/bitmaps/g;
 
 
 # direct methods
@@ -30,10 +30,10 @@
     return-void
 .end method
 
-.method public static hy()Lcom/facebook/imagepipeline/bitmaps/g;
+.method public static hB()Lcom/facebook/imagepipeline/bitmaps/g;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->QK:Lcom/facebook/imagepipeline/bitmaps/g;
+    sget-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->Rc:Lcom/facebook/imagepipeline/bitmaps/g;
 
     if-nez v0, :cond_0
 
@@ -41,10 +41,10 @@
 
     invoke-direct {v0}, Lcom/facebook/imagepipeline/bitmaps/g;-><init>()V
 
-    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->QK:Lcom/facebook/imagepipeline/bitmaps/g;
+    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->Rc:Lcom/facebook/imagepipeline/bitmaps/g;
 
     :cond_0
-    sget-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->QK:Lcom/facebook/imagepipeline/bitmaps/g;
+    sget-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->Rc:Lcom/facebook/imagepipeline/bitmaps/g;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/MemoryCacheParams.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/MemoryCacheParams.smali
index 0cdc1e577d..14212580fd 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/MemoryCacheParams.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/MemoryCacheParams.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field public final RA:I
+.field public final RR:I
 
-.field public final RB:I
+.field public final RS:I
 
-.field public final RC:I
+.field public final RT:I
 
-.field public final RD:I
+.field public final RU:I
 
-.field public final Rz:I
+.field public final RV:I
 
 
 # direct methods
@@ -21,15 +21,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Rz:I
+    iput p1, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RR:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RA:I
+    iput p2, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RS:I
 
-    iput p3, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RB:I
+    iput p3, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RT:I
 
-    iput p4, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RC:I
+    iput p4, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RU:I
 
-    iput p5, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RD:I
+    iput p5, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->RV:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/a$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/a$1.smali
index 10458e4624..7584df799e 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/a$1.smali
@@ -42,7 +42,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/f/c;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/c;->fg()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/c;->fl()I
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/b$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/b$1.smali
index e9295551b0..ea167939a8 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/b$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/b$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic QL:Lcom/facebook/imagepipeline/cache/m;
+.field final synthetic Rd:Lcom/facebook/imagepipeline/cache/m;
 
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/imagepipeline/cache/m;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/b$1;->QL:Lcom/facebook/imagepipeline/cache/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/b$1;->Rd:Lcom/facebook/imagepipeline/cache/m;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/e$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/e$2.smali
index 06128e1dca..e49b5aadb6 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/e$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/e$2.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic Rb:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic Rt:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic Rc:Lcom/facebook/imagepipeline/cache/e;
+.field final synthetic Ru:Lcom/facebook/imagepipeline/cache/e;
 
-.field final synthetic Rd:Lcom/facebook/imagepipeline/f/e;
+.field final synthetic Rv:Lcom/facebook/imagepipeline/f/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$2;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rb:Lcom/facebook/cache/common/CacheKey;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rt:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rd:Lcom/facebook/imagepipeline/f/e;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rv:Lcom/facebook/imagepipeline/f/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,29 +48,29 @@
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rb:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rt:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rd:Lcom/facebook/imagepipeline/f/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rv:Lcom/facebook/imagepipeline/f/e;
 
     invoke-static {v0, v1, v2}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/imagepipeline/cache/e;)Lcom/facebook/imagepipeline/cache/s;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rb:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rt:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rd:Lcom/facebook/imagepipeline/f/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rv:Lcom/facebook/imagepipeline/f/e;
 
     invoke-virtual {v0, v1, v2}, Lcom/facebook/imagepipeline/cache/s;->b(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rd:Lcom/facebook/imagepipeline/f/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rv:Lcom/facebook/imagepipeline/f/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
@@ -81,19 +81,19 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
     invoke-static {v1}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/imagepipeline/cache/e;)Lcom/facebook/imagepipeline/cache/s;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rb:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rt:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rd:Lcom/facebook/imagepipeline/f/e;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rv:Lcom/facebook/imagepipeline/f/e;
 
     invoke-virtual {v1, v2, v3}, Lcom/facebook/imagepipeline/cache/s;->b(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rd:Lcom/facebook/imagepipeline/f/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->Rv:Lcom/facebook/imagepipeline/f/e;
 
     invoke-static {v1}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/e$3.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/e$3.smali
index 7eba1a034a..2ea6f8a27c 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/e$3.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/e$3.smali
@@ -27,18 +27,18 @@
 
 
 # instance fields
-.field final synthetic Rb:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic Rt:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic Rc:Lcom/facebook/imagepipeline/cache/e;
+.field final synthetic Ru:Lcom/facebook/imagepipeline/cache/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/cache/common/CacheKey;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$3;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$3;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$3;->Rb:Lcom/facebook/cache/common/CacheKey;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$3;->Rt:Lcom/facebook/cache/common/CacheKey;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,23 +56,23 @@
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$3;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$3;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/imagepipeline/cache/e;)Lcom/facebook/imagepipeline/cache/s;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$3;->Rb:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$3;->Rt:Lcom/facebook/cache/common/CacheKey;
 
     invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/cache/s;->h(Lcom/facebook/cache/common/CacheKey;)Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$3;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$3;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/cache/e;->c(Lcom/facebook/imagepipeline/cache/e;)Lcom/facebook/cache/disk/h;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$3;->Rb:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$3;->Rt:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v0, v1}, Lcom/facebook/cache/disk/h;->e(Lcom/facebook/cache/common/CacheKey;)V
     :try_end_0
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/e$4.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/e$4.smali
index aa89c498f5..d6e8072a41 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/e$4.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/e$4.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic Rc:Lcom/facebook/imagepipeline/cache/e;
+.field final synthetic Ru:Lcom/facebook/imagepipeline/cache/e;
 
-.field final synthetic Re:Lcom/facebook/imagepipeline/f/e;
+.field final synthetic Rw:Lcom/facebook/imagepipeline/f/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/imagepipeline/f/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$4;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$4;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$4;->Re:Lcom/facebook/imagepipeline/f/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$4;->Rw:Lcom/facebook/imagepipeline/f/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,19 +46,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$4;->Rc:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$4;->Ru:Lcom/facebook/imagepipeline/cache/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/cache/e;->d(Lcom/facebook/imagepipeline/cache/e;)Lcom/facebook/common/g/j;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$4;->Re:Lcom/facebook/imagepipeline/f/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$4;->Rw:Lcom/facebook/imagepipeline/f/e;
 
     invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->getInputStream()Ljava/io/InputStream;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1, p1}, Lcom/facebook/common/g/j;->a(Ljava/io/InputStream;Ljava/io/OutputStream;)J
+    invoke-virtual {v0, v1, p1}, Lcom/facebook/common/g/j;->copy(Ljava/io/InputStream;Ljava/io/OutputStream;)J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/h$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/h$1.smali
index 7204fc99f1..00b3e671d0 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/h$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/h$1.smali
@@ -27,18 +27,18 @@
 
 
 # instance fields
-.field final synthetic Rq:Lcom/facebook/imagepipeline/cache/t;
+.field final synthetic RI:Lcom/facebook/imagepipeline/cache/t;
 
-.field final synthetic Rr:Lcom/facebook/imagepipeline/cache/h;
+.field final synthetic RJ:Lcom/facebook/imagepipeline/cache/h;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/cache/h;Lcom/facebook/imagepipeline/cache/t;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h$1;->Rr:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h$1;->RJ:Lcom/facebook/imagepipeline/cache/h;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h$1;->Rq:Lcom/facebook/imagepipeline/cache/t;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h$1;->RI:Lcom/facebook/imagepipeline/cache/t;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,9 +52,9 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/cache/h$b;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$1;->Rq:Lcom/facebook/imagepipeline/cache/t;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$1;->RI:Lcom/facebook/imagepipeline/cache/t;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->Rt:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->RL:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/h$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/h$2.smali
index 2b580be2d9..4d19566e89 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/h$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/h$2.smali
@@ -26,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic Rr:Lcom/facebook/imagepipeline/cache/h;
+.field final synthetic RJ:Lcom/facebook/imagepipeline/cache/h;
 
-.field final synthetic Rs:Lcom/facebook/imagepipeline/cache/h$b;
+.field final synthetic RK:Lcom/facebook/imagepipeline/cache/h$b;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/cache/h;Lcom/facebook/imagepipeline/cache/h$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h$2;->Rr:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h$2;->RJ:Lcom/facebook/imagepipeline/cache/h;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h$2;->Rs:Lcom/facebook/imagepipeline/cache/h$b;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h$2;->RK:Lcom/facebook/imagepipeline/cache/h$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,9 +54,9 @@
         }
     .end annotation
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/cache/h$2;->Rr:Lcom/facebook/imagepipeline/cache/h;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/cache/h$2;->RJ:Lcom/facebook/imagepipeline/cache/h;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$2;->Rs:Lcom/facebook/imagepipeline/cache/h$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$2;->RK:Lcom/facebook/imagepipeline/cache/h$b;
 
     invoke-static {p1, v0}, Lcom/facebook/imagepipeline/cache/h;->a(Lcom/facebook/imagepipeline/cache/h;Lcom/facebook/imagepipeline/cache/h$b;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/i.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/i.smali
index c7130b8cf8..9130b48097 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/i.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/i.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static Rw:Lcom/facebook/imagepipeline/cache/i;
+.field private static RO:Lcom/facebook/imagepipeline/cache/i;
 
 
 # direct methods
@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized hF()Lcom/facebook/imagepipeline/cache/i;
+.method public static declared-synchronized hI()Lcom/facebook/imagepipeline/cache/i;
     .locals 2
 
     const-class v0, Lcom/facebook/imagepipeline/cache/i;
@@ -33,7 +33,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/cache/i;->Rw:Lcom/facebook/imagepipeline/cache/i;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/i;->RO:Lcom/facebook/imagepipeline/cache/i;
 
     if-nez v1, :cond_0
 
@@ -41,10 +41,10 @@
 
     invoke-direct {v1}, Lcom/facebook/imagepipeline/cache/i;-><init>()V
 
-    sput-object v1, Lcom/facebook/imagepipeline/cache/i;->Rw:Lcom/facebook/imagepipeline/cache/i;
+    sput-object v1, Lcom/facebook/imagepipeline/cache/i;->RO:Lcom/facebook/imagepipeline/cache/i;
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/cache/i;->Rw:Lcom/facebook/imagepipeline/cache/i;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/i;->RO:Lcom/facebook/imagepipeline/cache/i;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -65,7 +65,7 @@
 .method public final a(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/cache/common/CacheKey;
     .locals 0
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/cache/i;->o(Landroid/net/Uri;)Lcom/facebook/cache/common/CacheKey;
 
@@ -79,17 +79,17 @@
 
     new-instance v8, Lcom/facebook/imagepipeline/cache/c;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-virtual {v0}, Landroid/net/Uri;->toString()Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v3, p1, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v3, p1, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v4, p1, Lcom/facebook/imagepipeline/request/b;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object v4, p1, Lcom/facebook/imagepipeline/request/b;->Rh:Lcom/facebook/imagepipeline/a/b;
 
     const/4 v5, 0x0
 
@@ -107,7 +107,7 @@
 .method public final b(Lcom/facebook/imagepipeline/request/b;Ljava/lang/Object;)Lcom/facebook/cache/common/CacheKey;
     .locals 10
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     const/4 v1, 0x0
 
@@ -139,17 +139,17 @@
     :goto_0
     new-instance v0, Lcom/facebook/imagepipeline/cache/c;
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-virtual {v1}, Landroid/net/Uri;->toString()Ljava/lang/String;
 
     move-result-object v3
 
-    iget-object v4, p1, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v4, p1, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v5, p1, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v5, p1, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v6, p1, Lcom/facebook/imagepipeline/request/b;->QP:Lcom/facebook/imagepipeline/a/b;
+    iget-object v6, p1, Lcom/facebook/imagepipeline/request/b;->Rh:Lcom/facebook/imagepipeline/a/b;
 
     move-object v2, v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/l$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/l$1.smali
index bc33a361f1..e4561c6737 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/l$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/l$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic QL:Lcom/facebook/imagepipeline/cache/m;
+.field final synthetic Rd:Lcom/facebook/imagepipeline/cache/m;
 
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/imagepipeline/cache/m;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/l$1;->QL:Lcom/facebook/imagepipeline/cache/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/l$1;->Rd:Lcom/facebook/imagepipeline/cache/m;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/n.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/n.smali
index 8827ee494d..388b151efe 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/n.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/n.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field private final Rx:Lcom/facebook/imagepipeline/cache/o;
+.field private final RP:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field private final Ry:Lcom/facebook/imagepipeline/cache/p;
+.field private final RQ:Lcom/facebook/imagepipeline/cache/p;
 
 
 # direct methods
@@ -49,9 +49,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/n;->Rx:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/n;->RP:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/n;->Ry:Lcom/facebook/imagepipeline/cache/p;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/n;->RQ:Lcom/facebook/imagepipeline/cache/p;
 
     return-void
 .end method
@@ -68,7 +68,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->Rx:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->RP:Lcom/facebook/imagepipeline/cache/o;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/cache/o;->M(Ljava/lang/Object;)Lcom/facebook/common/references/CloseableReference;
 
@@ -89,7 +89,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->Rx:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->RP:Lcom/facebook/imagepipeline/cache/o;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/cache/o;->a(Ljava/lang/Object;Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -108,7 +108,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->Rx:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->RP:Lcom/facebook/imagepipeline/cache/o;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/cache/o;->b(Lcom/facebook/common/d/j;)I
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/r.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/r.smali
index 94729e8154..5b97a47a81 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/r.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/r.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static RE:Lcom/facebook/imagepipeline/cache/r;
+.field private static RW:Lcom/facebook/imagepipeline/cache/r;
 
 
 # direct methods
@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized hG()Lcom/facebook/imagepipeline/cache/r;
+.method public static declared-synchronized hJ()Lcom/facebook/imagepipeline/cache/r;
     .locals 2
 
     const-class v0, Lcom/facebook/imagepipeline/cache/r;
@@ -33,7 +33,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/cache/r;->RE:Lcom/facebook/imagepipeline/cache/r;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/r;->RW:Lcom/facebook/imagepipeline/cache/r;
 
     if-nez v1, :cond_0
 
@@ -41,10 +41,10 @@
 
     invoke-direct {v1}, Lcom/facebook/imagepipeline/cache/r;-><init>()V
 
-    sput-object v1, Lcom/facebook/imagepipeline/cache/r;->RE:Lcom/facebook/imagepipeline/cache/r;
+    sput-object v1, Lcom/facebook/imagepipeline/cache/r;->RW:Lcom/facebook/imagepipeline/cache/r;
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/cache/r;->RE:Lcom/facebook/imagepipeline/cache/r;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/r;->RW:Lcom/facebook/imagepipeline/cache/r;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/d/b$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/d/b$1.smali
index 54beb74d33..5d8c054bd9 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/d/b$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/d/b$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Uc:Lcom/facebook/imagepipeline/d/b;
+.field final synthetic Uu:Lcom/facebook/imagepipeline/d/b;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/d/b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/d/b$1;->Uc:Lcom/facebook/imagepipeline/d/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/d/b$1;->Uu:Lcom/facebook/imagepipeline/d/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +37,15 @@
 .method public final a(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/c;
     .locals 2
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v1, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/d/b$1;->Uc:Lcom/facebook/imagepipeline/d/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/d/b$1;->Uu:Lcom/facebook/imagepipeline/d/b;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lcom/facebook/imagepipeline/d/b;->b(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/d;
 
@@ -54,21 +54,21 @@
     return-object p1
 
     :cond_0
-    sget-object v1, Lcom/facebook/d/b;->Pu:Lcom/facebook/d/c;
+    sget-object v1, Lcom/facebook/d/b;->PM:Lcom/facebook/d/c;
 
     if-ne v0, v1, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/d/b$1;->Uc:Lcom/facebook/imagepipeline/d/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/d/b$1;->Uu:Lcom/facebook/imagepipeline/d/b;
 
-    iget-boolean v1, p4, Lcom/facebook/imagepipeline/a/b;->RN:Z
+    iget-boolean v1, p4, Lcom/facebook/imagepipeline/a/b;->Sf:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/d/b;->TY:Lcom/facebook/imagepipeline/d/c;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/d/b;->Uq:Lcom/facebook/imagepipeline/d/c;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/d/b;->TY:Lcom/facebook/imagepipeline/d/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/d/b;->Uq:Lcom/facebook/imagepipeline/d/c;
 
     invoke-interface {v0, p1, p2, p3, p4}, Lcom/facebook/imagepipeline/d/c;->a(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/c;
 
@@ -84,13 +84,13 @@
     return-object p1
 
     :cond_2
-    sget-object v1, Lcom/facebook/d/b;->PB:Lcom/facebook/d/c;
+    sget-object v1, Lcom/facebook/d/b;->PT:Lcom/facebook/d/c;
 
     if-ne v0, v1, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/d/b$1;->Uc:Lcom/facebook/imagepipeline/d/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/d/b$1;->Uu:Lcom/facebook/imagepipeline/d/b;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/d/b;->TZ:Lcom/facebook/imagepipeline/d/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/d/b;->Ur:Lcom/facebook/imagepipeline/d/c;
 
     invoke-interface {v0, p1, p2, p3, p4}, Lcom/facebook/imagepipeline/d/c;->a(Lcom/facebook/imagepipeline/f/e;ILcom/facebook/imagepipeline/f/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/c;
 
@@ -99,11 +99,11 @@
     return-object p1
 
     :cond_3
-    sget-object p2, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object p2, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
     if-eq v0, p2, :cond_4
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/d/b$1;->Uc:Lcom/facebook/imagepipeline/d/b;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/d/b$1;->Uu:Lcom/facebook/imagepipeline/d/b;
 
     invoke-virtual {p2, p1, p4}, Lcom/facebook/imagepipeline/d/b;->a(Lcom/facebook/imagepipeline/f/e;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/f/d;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/d/d.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/d/d.smali
index 64c0f781fa..a7dd0419e4 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/d/d.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/d/d.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final Ud:Ljava/util/Map;
+.field public final Uv:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field public final Ue:Ljava/util/List;
+.field public final Uw:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/d/f.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/d/f.smali
index 32696ed17f..f7b8e0c030 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/d/f.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/d/f.smali
@@ -4,21 +4,21 @@
 
 
 # instance fields
-.field private final Ha:Lcom/facebook/common/g/a;
+.field private final Hr:Lcom/facebook/common/g/a;
 
-.field private Uf:I
+.field private UA:I
 
-.field private Ug:I
+.field public UB:I
 
-.field private Uh:I
+.field public UC:I
 
-.field private Ui:I
+.field public UD:Z
 
-.field public Uj:I
+.field private Ux:I
 
-.field public Uk:I
+.field private Uy:I
 
-.field public Ul:Z
+.field private Uz:I
 
 
 # direct methods
@@ -33,21 +33,21 @@
 
     check-cast p1, Lcom/facebook/common/g/a;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/d/f;->Ha:Lcom/facebook/common/g/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/d/f;->Hr:Lcom/facebook/common/g/a;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->Uh:I
+    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->Uz:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->Ug:I
+    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->Uy:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->Ui:I
+    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->UA:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->Uk:I
+    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->UC:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->Uj:I
+    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->UB:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     return-void
 .end method
@@ -55,20 +55,20 @@
 .method private ai(I)V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/d/f;->Ui:I
+    iget v0, p0, Lcom/facebook/imagepipeline/d/f;->UA:I
 
     if-lez v0, :cond_0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->Uk:I
+    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->UC:I
 
     :cond_0
-    iget p1, p0, Lcom/facebook/imagepipeline/d/f;->Ui:I
+    iget p1, p0, Lcom/facebook/imagepipeline/d/f;->UA:I
 
     add-int/lit8 v0, p1, 0x1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/d/f;->Ui:I
+    iput v0, p0, Lcom/facebook/imagepipeline/d/f;->UA:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->Uj:I
+    iput p1, p0, Lcom/facebook/imagepipeline/d/f;->UB:I
 
     return-void
 .end method
@@ -76,7 +76,7 @@
 .method private e(Ljava/io/InputStream;)Z
     .locals 11
 
-    iget v0, p0, Lcom/facebook/imagepipeline/d/f;->Uj:I
+    iget v0, p0, Lcom/facebook/imagepipeline/d/f;->UB:I
 
     :goto_0
     const/4 v1, 0x0
@@ -86,7 +86,7 @@
     const/4 v3, 0x1
 
     :try_start_0
-    iget v4, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iget v4, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     if-eq v4, v2, :cond_11
 
@@ -98,24 +98,24 @@
 
     if-eq v4, v5, :cond_11
 
-    iget v5, p0, Lcom/facebook/imagepipeline/d/f;->Uh:I
+    iget v5, p0, Lcom/facebook/imagepipeline/d/f;->Uz:I
 
     add-int/2addr v5, v3
 
-    iput v5, p0, Lcom/facebook/imagepipeline/d/f;->Uh:I
+    iput v5, p0, Lcom/facebook/imagepipeline/d/f;->Uz:I
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/d/f;->Ul:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/d/f;->UD:Z
 
     if-eqz v5, :cond_0
 
-    iput v2, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput v2, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/d/f;->Ul:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/d/f;->UD:Z
 
     return v1
 
     :cond_0
-    iget v5, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iget v5, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     const/16 v6, 0xff
 
@@ -146,7 +146,7 @@
     goto/16 :goto_2
 
     :cond_1
-    iget v5, p0, Lcom/facebook/imagepipeline/d/f;->Ug:I
+    iget v5, p0, Lcom/facebook/imagepipeline/d/f;->Uy:I
 
     shl-int/lit8 v5, v5, 0x8
 
@@ -158,32 +158,32 @@
 
     invoke-static {p1, v6, v7}, Lcom/facebook/common/j/d;->a(Ljava/io/InputStream;J)J
 
-    iget v6, p0, Lcom/facebook/imagepipeline/d/f;->Uh:I
+    iget v6, p0, Lcom/facebook/imagepipeline/d/f;->Uz:I
 
     add-int/2addr v6, v5
 
-    iput v6, p0, Lcom/facebook/imagepipeline/d/f;->Uh:I
+    iput v6, p0, Lcom/facebook/imagepipeline/d/f;->Uz:I
 
-    iput v8, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput v8, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     goto :goto_2
 
     :cond_2
-    iput v6, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput v6, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     goto :goto_2
 
     :cond_3
     if-ne v4, v6, :cond_4
 
-    iput v9, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput v9, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     goto :goto_2
 
     :cond_4
     if-nez v4, :cond_5
 
-    iput v8, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput v8, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     goto :goto_2
 
@@ -192,15 +192,15 @@
 
     if-ne v4, v5, :cond_6
 
-    iput-boolean v3, p0, Lcom/facebook/imagepipeline/d/f;->Ul:Z
+    iput-boolean v3, p0, Lcom/facebook/imagepipeline/d/f;->UD:Z
 
-    iget v5, p0, Lcom/facebook/imagepipeline/d/f;->Uh:I
+    iget v5, p0, Lcom/facebook/imagepipeline/d/f;->Uz:I
 
     sub-int/2addr v5, v8
 
     invoke-direct {p0, v5}, Lcom/facebook/imagepipeline/d/f;->ai(I)V
 
-    iput v8, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput v8, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     goto :goto_2
 
@@ -209,7 +209,7 @@
 
     if-ne v4, v6, :cond_7
 
-    iget v6, p0, Lcom/facebook/imagepipeline/d/f;->Uh:I
+    iget v6, p0, Lcom/facebook/imagepipeline/d/f;->Uz:I
 
     sub-int/2addr v6, v8
 
@@ -241,47 +241,47 @@
     :goto_1
     if-eqz v5, :cond_a
 
-    iput v10, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput v10, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     goto :goto_2
 
     :cond_a
-    iput v8, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput v8, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     goto :goto_2
 
     :cond_b
     if-ne v4, v6, :cond_10
 
-    iput v9, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput v9, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     goto :goto_2
 
     :cond_c
     if-ne v4, v7, :cond_d
 
-    iput v8, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput v8, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     goto :goto_2
 
     :cond_d
-    iput v2, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput v2, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     goto :goto_2
 
     :cond_e
     if-ne v4, v6, :cond_f
 
-    iput v3, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput v3, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     goto :goto_2
 
     :cond_f
-    iput v2, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iput v2, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     :cond_10
     :goto_2
-    iput v4, p0, Lcom/facebook/imagepipeline/d/f;->Ug:I
+    iput v4, p0, Lcom/facebook/imagepipeline/d/f;->Uy:I
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -293,11 +293,11 @@
     invoke-static {p1}, Lcom/facebook/common/d/m;->d(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
 
     :cond_11
-    iget p1, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iget p1, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     if-eq p1, v2, :cond_12
 
-    iget p1, p0, Lcom/facebook/imagepipeline/d/f;->Uj:I
+    iget p1, p0, Lcom/facebook/imagepipeline/d/f;->UB:I
 
     if-eq p1, v0, :cond_12
 
@@ -312,7 +312,7 @@
 .method public final a(Lcom/facebook/imagepipeline/f/e;)Z
     .locals 4
 
-    iget v0, p0, Lcom/facebook/imagepipeline/d/f;->Uf:I
+    iget v0, p0, Lcom/facebook/imagepipeline/d/f;->Ux:I
 
     const/4 v1, 0x0
 
@@ -327,7 +327,7 @@
 
     move-result v0
 
-    iget v2, p0, Lcom/facebook/imagepipeline/d/f;->Uh:I
+    iget v2, p0, Lcom/facebook/imagepipeline/d/f;->Uz:I
 
     if-gt v0, v2, :cond_1
 
@@ -340,7 +340,7 @@
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/d/f;->Ha:Lcom/facebook/common/g/a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/d/f;->Hr:Lcom/facebook/common/g/a;
 
     const/16 v3, 0x4000
 
@@ -350,12 +350,12 @@
 
     check-cast v2, [B
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/d/f;->Ha:Lcom/facebook/common/g/a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/d/f;->Hr:Lcom/facebook/common/g/a;
 
     invoke-direct {v0, p1, v2, v3}, Lcom/facebook/common/g/e;-><init>(Ljava/io/InputStream;[BLcom/facebook/common/references/b;)V
 
     :try_start_0
-    iget p1, p0, Lcom/facebook/imagepipeline/d/f;->Uh:I
+    iget p1, p0, Lcom/facebook/imagepipeline/d/f;->Uz:I
 
     int-to-long v2, p1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/d/g$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/d/g$a.smali
index 2bd175f3ea..06275f66c6 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/d/g$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/d/g$a.smali
@@ -36,7 +36,7 @@
 
 
 # virtual methods
-.method public final iz()Ljava/util/List;
+.method public final iy()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/d/g$b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/d/g$b.smali
index fab449bbab..fb593f056d 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/d/g$b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/d/g$b.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract iz()Ljava/util/List;
+.method public abstract iy()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/d/g.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/d/g.smali
index 8277c38220..57b6939e8d 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/d/g.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/d/g.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field private final Um:Lcom/facebook/imagepipeline/d/g$b;
+.field private final UE:Lcom/facebook/imagepipeline/d/g$b;
 
 
 # direct methods
@@ -45,7 +45,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/d/g$b;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/d/g;->Um:Lcom/facebook/imagepipeline/d/g$b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/d/g;->UE:Lcom/facebook/imagepipeline/d/g$b;
 
     return-void
 .end method
@@ -55,9 +55,9 @@
 .method public final ag(I)I
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/d/g;->Um:Lcom/facebook/imagepipeline/d/g$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/d/g;->UE:Lcom/facebook/imagepipeline/d/g$b;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/d/g$b;->iz()Ljava/util/List;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/d/g$b;->iy()Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/f/a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/f/a.smali
index ba6bf66398..f836f40d61 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/f/a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/f/a.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private Un:Lcom/facebook/imagepipeline/animated/a/e;
+.field private UF:Lcom/facebook/imagepipeline/animated/a/e;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/f/c;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/f/a;->Un:Lcom/facebook/imagepipeline/animated/a/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/f/a;->UF:Lcom/facebook/imagepipeline/animated/a/e;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->Un:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->UF:Lcom/facebook/imagepipeline/animated/a/e;
 
     if-nez v0, :cond_0
 
@@ -35,11 +35,11 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->Un:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->UF:Lcom/facebook/imagepipeline/animated/a/e;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/f/a;->Un:Lcom/facebook/imagepipeline/animated/a/e;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/f/a;->UF:Lcom/facebook/imagepipeline/animated/a/e;
 
     monitor-exit p0
     :try_end_0
@@ -60,7 +60,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized fg()I
+.method public final declared-synchronized fl()I
     .locals 1
 
     monitor-enter p0
@@ -82,11 +82,11 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->Un:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->UF:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->PV:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->Qo:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fg()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fl()I
 
     move-result v0
     :try_end_1
@@ -126,9 +126,9 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->Un:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->UF:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->PV:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->Qo:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->getHeight()I
 
@@ -170,9 +170,9 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->Un:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->UF:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->PV:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->Qo:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->getWidth()I
 
@@ -192,35 +192,13 @@
     throw v0
 .end method
 
-.method public final declared-synchronized iA()Lcom/facebook/imagepipeline/animated/a/e;
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->Un:Lcom/facebook/imagepipeline/animated/a/e;
-    :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 declared-synchronized isClosed()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->Un:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->UF:Lcom/facebook/imagepipeline/animated/a/e;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -259,3 +237,25 @@
 
     return v0
 .end method
+
+.method public final declared-synchronized iz()Lcom/facebook/imagepipeline/animated/a/e;
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/f/a;->UF:Lcom/facebook/imagepipeline/animated/a/e;
+    :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
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/f/g.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/f/g.smali
index a4d98bb52d..4017a33b29 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/f/g.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/f/g.smali
@@ -7,15 +7,15 @@
 
 
 # static fields
-.field public static final Ux:Lcom/facebook/imagepipeline/f/h;
+.field public static final UQ:Lcom/facebook/imagepipeline/f/h;
 
 
 # instance fields
-.field UA:Z
+.field UR:I
 
-.field Uy:I
+.field US:Z
 
-.field Uz:Z
+.field UT:Z
 
 
 # direct methods
@@ -30,7 +30,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/f/g;->Ux:Lcom/facebook/imagepipeline/f/h;
+    sput-object v0, Lcom/facebook/imagepipeline/f/g;->UQ:Lcom/facebook/imagepipeline/f/h;
 
     return-void
 .end method
@@ -40,11 +40,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/f/g;->Uy:I
+    iput p1, p0, Lcom/facebook/imagepipeline/f/g;->UR:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/f/g;->Uz:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/f/g;->US:Z
 
-    iput-boolean p3, p0, Lcom/facebook/imagepipeline/f/g;->UA:Z
+    iput-boolean p3, p0, Lcom/facebook/imagepipeline/f/g;->UT:Z
 
     return-void
 .end method
@@ -82,21 +82,21 @@
     :cond_1
     check-cast p1, Lcom/facebook/imagepipeline/f/g;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/f/g;->Uy:I
+    iget v1, p0, Lcom/facebook/imagepipeline/f/g;->UR:I
 
-    iget v3, p1, Lcom/facebook/imagepipeline/f/g;->Uy:I
+    iget v3, p1, Lcom/facebook/imagepipeline/f/g;->UR:I
 
     if-ne v1, v3, :cond_2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/f/g;->Uz:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/f/g;->US:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/f/g;->Uz:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/f/g;->US:Z
 
     if-ne v1, v3, :cond_2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/f/g;->UA:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/f/g;->UT:Z
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/f/g;->UA:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/f/g;->UT:Z
 
     if-ne v1, p1, :cond_2
 
@@ -109,7 +109,7 @@
 .method public final getQuality()I
     .locals 1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/f/g;->Uy:I
+    iget v0, p0, Lcom/facebook/imagepipeline/f/g;->UR:I
 
     return v0
 .end method
@@ -117,9 +117,9 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lcom/facebook/imagepipeline/f/g;->Uy:I
+    iget v0, p0, Lcom/facebook/imagepipeline/f/g;->UR:I
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/f/g;->Uz:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/f/g;->US:Z
 
     const/4 v2, 0x0
 
@@ -135,7 +135,7 @@
     :goto_0
     xor-int/2addr v0, v1
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/f/g;->UA:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/f/g;->UT:Z
 
     if-eqz v1, :cond_1
 
@@ -147,18 +147,18 @@
     return v0
 .end method
 
+.method public final iN()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/f/g;->US:Z
+
+    return v0
+.end method
+
 .method public final iO()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/f/g;->Uz:Z
-
-    return v0
-.end method
-
-.method public final iP()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/f/g;->UA:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/f/g;->UT:Z
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/f/h.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/f/h.smali
index c05c266f54..c96abe97c5 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/f/h.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/f/h.smali
@@ -7,8 +7,8 @@
 .method public abstract getQuality()I
 .end method
 
-.method public abstract iO()Z
+.method public abstract iN()Z
 .end method
 
-.method public abstract iP()Z
+.method public abstract iO()Z
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/a$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/a$a.smali
index 8de3aebc40..5a701c7687 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/a$a.smali
@@ -57,7 +57,7 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     const/4 v0, 0x0
 
@@ -72,10 +72,10 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iL()V
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iK()V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/a.smali
index cb2294cb53..5272755ea9 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/a.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field private final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -49,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/a;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/a;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/a;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/a;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     new-instance v1, Lcom/facebook/imagepipeline/h/a$a;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/aa.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/aa.smali
index 0cb51233ab..c56ccd0e99 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/aa.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/aa.smali
@@ -14,7 +14,7 @@
 
 
 # virtual methods
-.method protected final d(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
+.method protected final c(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -24,7 +24,7 @@
 
     new-instance v0, Ljava/io/FileInputStream;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->jR()Ljava/io/File;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->jP()Ljava/io/File;
 
     move-result-object v1
 
@@ -34,7 +34,7 @@
 
     invoke-direct {v0, v1}, Ljava/io/FileInputStream;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->jR()Ljava/io/File;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->jP()Ljava/io/File;
 
     move-result-object p1
 
@@ -51,7 +51,7 @@
     return-object p1
 .end method
 
-.method protected final jx()Ljava/lang/String;
+.method protected final jv()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalFileFetchProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ab.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ab.smali
index 4cda51bb2e..d030774ed3 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ab.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ab.smali
@@ -18,7 +18,7 @@
     return-void
 .end method
 
-.method private e(Lcom/facebook/imagepipeline/request/b;)I
+.method private d(Lcom/facebook/imagepipeline/request/b;)I
     .locals 3
 
     const/4 v0, 0x0
@@ -26,7 +26,7 @@
     :try_start_0
     iget-object v1, p0, Lcom/facebook/imagepipeline/h/ab;->mResources:Landroid/content/res/Resources;
 
-    invoke-static {p1}, Lcom/facebook/imagepipeline/h/ab;->g(Lcom/facebook/imagepipeline/request/b;)I
+    invoke-static {p1}, Lcom/facebook/imagepipeline/h/ab;->f(Lcom/facebook/imagepipeline/request/b;)I
 
     move-result p1
 
@@ -83,10 +83,10 @@
     return p1
 .end method
 
-.method private static g(Lcom/facebook/imagepipeline/request/b;)I
+.method private static f(Lcom/facebook/imagepipeline/request/b;)I
     .locals 1
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-virtual {p0}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
@@ -107,7 +107,7 @@
 
 
 # virtual methods
-.method protected final d(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
+.method protected final c(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -117,7 +117,7 @@
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/h/ab;->mResources:Landroid/content/res/Resources;
 
-    invoke-static {p1}, Lcom/facebook/imagepipeline/h/ab;->g(Lcom/facebook/imagepipeline/request/b;)I
+    invoke-static {p1}, Lcom/facebook/imagepipeline/h/ab;->f(Lcom/facebook/imagepipeline/request/b;)I
 
     move-result v1
 
@@ -125,7 +125,7 @@
 
     move-result-object v0
 
-    invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/h/ab;->e(Lcom/facebook/imagepipeline/request/b;)I
+    invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/h/ab;->d(Lcom/facebook/imagepipeline/request/b;)I
 
     move-result p1
 
@@ -136,7 +136,7 @@
     return-object p1
 .end method
 
-.method protected final jx()Ljava/lang/String;
+.method protected final jv()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalResourceFetchProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ac$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ac$2.smali
index a04f83f53d..9b6ef4c35d 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ac$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ac$2.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic Xo:Lcom/facebook/imagepipeline/h/aq;
+.field final synthetic XG:Lcom/facebook/imagepipeline/h/aq;
 
-.field final synthetic Xq:Lcom/facebook/imagepipeline/h/ac;
+.field final synthetic XI:Lcom/facebook/imagepipeline/h/ac;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ac;Lcom/facebook/imagepipeline/h/aq;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ac$2;->Xq:Lcom/facebook/imagepipeline/h/ac;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ac$2;->XI:Lcom/facebook/imagepipeline/h/ac;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ac$2;->Xo:Lcom/facebook/imagepipeline/h/aq;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ac$2;->XG:Lcom/facebook/imagepipeline/h/aq;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final jt()V
+.method public final jr()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ac$2;->Xo:Lcom/facebook/imagepipeline/h/aq;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ac$2;->XG:Lcom/facebook/imagepipeline/h/aq;
 
     invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/aq;->cancel()V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ad$a$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ad$a$1.smali
index 9dfbbe7c7f..31acbd238e 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ad$a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ad$a$1.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic XA:Lcom/facebook/imagepipeline/h/ad$a;
+.field final synthetic XR:Landroid/util/Pair;
 
-.field final synthetic Xz:Landroid/util/Pair;
+.field final synthetic XS:Lcom/facebook/imagepipeline/h/ad$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ad$a;Landroid/util/Pair;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->Xz:Landroid/util/Pair;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XR:Landroid/util/Pair;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/e;-><init>()V
 
@@ -35,19 +35,19 @@
 
 
 # virtual methods
-.method public final jt()V
+.method public final jr()V
     .locals 7
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->Xz:Landroid/util/Pair;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XR:Landroid/util/Pair;
 
     invoke-virtual {v1, v2}, Ljava/util/concurrent/CopyOnWriteArraySet;->remove(Ljava/lang/Object;)Z
 
@@ -57,9 +57,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v3}, Ljava/util/concurrent/CopyOnWriteArraySet;->isEmpty()Z
 
@@ -67,30 +67,30 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/h/ad$a;->Xw:Lcom/facebook/imagepipeline/h/d;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/h/ad$a;->XO:Lcom/facebook/imagepipeline/h/d;
 
     move-object v4, v2
 
     goto :goto_0
 
     :cond_0
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/h/ad$a;->jG()Ljava/util/List;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/h/ad$a;->jE()Ljava/util/List;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
-    invoke-virtual {v4}, Lcom/facebook/imagepipeline/h/ad$a;->jK()Ljava/util/List;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/h/ad$a;->jI()Ljava/util/List;
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
-    invoke-virtual {v5}, Lcom/facebook/imagepipeline/h/ad$a;->jI()Ljava/util/List;
+    invoke-virtual {v5}, Lcom/facebook/imagepipeline/h/ad$a;->jG()Ljava/util/List;
 
     move-result-object v5
 
@@ -123,7 +123,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/h/d;->js()Ljava/util/List;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/h/d;->jq()Ljava/util/List;
 
     move-result-object v0
 
@@ -132,13 +132,13 @@
     :cond_2
     if-eqz v1, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->Xz:Landroid/util/Pair;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XR:Landroid/util/Pair;
 
     iget-object v0, v0, Landroid/util/Pair;->first:Ljava/lang/Object;
 
     check-cast v0, Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fz()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fD()V
 
     :cond_3
     return-void
@@ -154,12 +154,12 @@
     throw v1
 .end method
 
-.method public final ju()V
+.method public final js()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/ad$a;->jG()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/ad$a;->jE()Ljava/util/List;
 
     move-result-object v0
 
@@ -168,12 +168,12 @@
     return-void
 .end method
 
-.method public final jv()V
+.method public final jt()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/ad$a;->jI()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/ad$a;->jG()Ljava/util/List;
 
     move-result-object v0
 
@@ -182,12 +182,12 @@
     return-void
 .end method
 
-.method public final jw()V
+.method public final ju()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$1;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/ad$a;->jK()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/ad$a;->jI()Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ad$a$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ad$a$a.smali
index eb501c49fd..3b64fc38c9 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ad$a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ad$a$a.smali
@@ -22,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic XA:Lcom/facebook/imagepipeline/h/ad$a;
+.field final synthetic XS:Lcom/facebook/imagepipeline/h/ad$a;
 
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/imagepipeline/h/ad$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a$a;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad$a$a;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/b;-><init>()V
 
@@ -54,7 +54,7 @@
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$a;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$a;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/facebook/imagepipeline/h/ad$a;->a(Lcom/facebook/imagepipeline/h/ad$a$a;Ljava/io/Closeable;I)V
     :try_end_0
@@ -78,14 +78,14 @@
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$a;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$a;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
     monitor-enter v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
     :try_start_1
-    iget-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xx:Lcom/facebook/imagepipeline/h/ad$a$a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->XP:Lcom/facebook/imagepipeline/h/ad$a$a;
 
     if-eq v1, p0, :cond_0
 
@@ -94,29 +94,29 @@
     goto :goto_1
 
     :cond_0
-    iget-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v1}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v2}, Ljava/util/concurrent/CopyOnWriteArraySet;->clear()V
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xy:Lcom/facebook/imagepipeline/h/ad;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/h/ad$a;->XQ:Lcom/facebook/imagepipeline/h/ad;
 
     iget-object v3, v0, Lcom/facebook/imagepipeline/h/ad$a;->mKey:Ljava/lang/Object;
 
     invoke-virtual {v2, v3, v0}, Lcom/facebook/imagepipeline/h/ad;->a(Ljava/lang/Object;Lcom/facebook/imagepipeline/h/ad$a;)V
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xt:Ljava/io/Closeable;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/h/ad$a;->XL:Ljava/io/Closeable;
 
     invoke-static {v2}, Lcom/facebook/imagepipeline/h/ad$a;->d(Ljava/io/Closeable;)V
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xt:Ljava/io/Closeable;
+    iput-object v2, v0, Lcom/facebook/imagepipeline/h/ad$a;->XL:Ljava/io/Closeable;
 
     monitor-exit v0
     :try_end_1
@@ -196,20 +196,20 @@
     goto :goto_2
 .end method
 
-.method protected final iy()V
+.method protected final ix()V
     .locals 3
 
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$a;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$a;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
     monitor-enter v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xx:Lcom/facebook/imagepipeline/h/ad$a$a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->XP:Lcom/facebook/imagepipeline/h/ad$a$a;
 
     if-eq v1, p0, :cond_0
 
@@ -220,22 +220,22 @@
     :cond_0
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xx:Lcom/facebook/imagepipeline/h/ad$a$a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->XP:Lcom/facebook/imagepipeline/h/ad$a$a;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xw:Lcom/facebook/imagepipeline/h/d;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->XO:Lcom/facebook/imagepipeline/h/d;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xt:Ljava/io/Closeable;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/h/ad$a;->XL:Ljava/io/Closeable;
 
     invoke-static {v2}, Lcom/facebook/imagepipeline/h/ad$a;->d(Ljava/io/Closeable;)V
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xt:Ljava/io/Closeable;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->XL:Ljava/io/Closeable;
 
     monitor-exit v0
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/ad$a;->jF()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/ad$a;->jD()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
@@ -265,20 +265,20 @@
     throw v0
 .end method
 
-.method protected final m(F)V
+.method protected final l(F)V
     .locals 3
 
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$a;->XA:Lcom/facebook/imagepipeline/h/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad$a$a;->XS:Lcom/facebook/imagepipeline/h/ad$a;
 
     monitor-enter v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
     :try_start_1
-    iget-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xx:Lcom/facebook/imagepipeline/h/ad$a$a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->XP:Lcom/facebook/imagepipeline/h/ad$a$a;
 
     if-eq v1, p0, :cond_0
 
@@ -287,9 +287,9 @@
     goto :goto_1
 
     :cond_0
-    iput p1, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xu:F
+    iput p1, v0, Lcom/facebook/imagepipeline/h/ad$a;->XM:F
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->Xs:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/h/ad$a;->XK:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v1}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
 
@@ -322,7 +322,7 @@
 
     check-cast v2, Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {v2, p1}, Lcom/facebook/imagepipeline/h/k;->n(F)V
+    invoke-interface {v2, p1}, Lcom/facebook/imagepipeline/h/k;->m(F)V
 
     monitor-exit v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ad.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ad.smali
index 37a9109131..a590a6a3c2 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ad.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ad.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final Xr:Ljava/util/Map;
+.field final XJ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -62,13 +62,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     new-instance p1, Ljava/util/HashMap;
 
     invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad;->Xr:Ljava/util/Map;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ad;->XJ:Ljava/util/Map;
 
     return-void
 .end method
@@ -90,7 +90,7 @@
 
     invoke-direct {v0, p0, p1}, Lcom/facebook/imagepipeline/h/ad$a;-><init>(Lcom/facebook/imagepipeline/h/ad;Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad;->Xr:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ad;->XJ:Ljava/util/Map;
 
     invoke-interface {v1, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
@@ -123,7 +123,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad;->Xr:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad;->XJ:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -208,7 +208,7 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/h/ad$a;->jF()V
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/h/ad$a;->jD()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
@@ -257,7 +257,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad;->Xr:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ad;->XJ:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -265,7 +265,7 @@
 
     if-ne v0, p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ad;->Xr:Ljava/util/Map;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/ad;->XJ:Ljava/util/Map;
 
     invoke-interface {p2, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ae$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ae$1.smali
index 34f879ea9a..9d8dc036e5 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ae$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ae$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic WN:Lcom/facebook/imagepipeline/h/s;
+.field final synthetic XT:Lcom/facebook/imagepipeline/h/ae;
 
-.field final synthetic XB:Lcom/facebook/imagepipeline/h/ae;
+.field final synthetic Xg:Lcom/facebook/imagepipeline/h/s;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ae;Lcom/facebook/imagepipeline/h/s;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ae$1;->XB:Lcom/facebook/imagepipeline/h/ae;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ae$1;->XT:Lcom/facebook/imagepipeline/h/ae;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ae$1;->WN:Lcom/facebook/imagepipeline/h/s;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ae$1;->Xg:Lcom/facebook/imagepipeline/h/s;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,12 +38,12 @@
 
 
 # virtual methods
-.method public final fz()V
+.method public final fD()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ae$1;->WN:Lcom/facebook/imagepipeline/h/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ae$1;->Xg:Lcom/facebook/imagepipeline/h/s;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/s;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/s;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v1
 
@@ -57,9 +57,9 @@
 
     invoke-interface {v1, v2, v3, v4}, Lcom/facebook/imagepipeline/h/am;->b(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/s;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/s;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fz()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fD()V
 
     return-void
 .end method
@@ -74,17 +74,17 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ae$1;->XB:Lcom/facebook/imagepipeline/h/ae;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ae$1;->XT:Lcom/facebook/imagepipeline/h/ae;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ae$1;->WN:Lcom/facebook/imagepipeline/h/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ae$1;->Xg:Lcom/facebook/imagepipeline/h/s;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/h/ae;->QF:Lcom/facebook/common/g/g;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/h/ae;->QX:Lcom/facebook/common/g/g;
 
-    invoke-interface {v2}, Lcom/facebook/common/g/g;->fH()Lcom/facebook/common/g/i;
+    invoke-interface {v2}, Lcom/facebook/common/g/g;->fL()Lcom/facebook/common/g/i;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/h/ae;->Ha:Lcom/facebook/common/g/a;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/h/ae;->Hr:Lcom/facebook/common/g/a;
 
     const/16 v4, 0x4000
 
@@ -118,15 +118,15 @@
 
     move-result-wide v6
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/h/s;->WJ:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/h/s;->Xc:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v4}, Lcom/facebook/imagepipeline/h/ak;->jr()Z
+    invoke-interface {v4}, Lcom/facebook/imagepipeline/h/ak;->jp()Z
 
     move-result v4
 
     if-eqz v4, :cond_1
 
-    iget-wide v8, v1, Lcom/facebook/imagepipeline/h/s;->WK:J
+    iget-wide v8, v1, Lcom/facebook/imagepipeline/h/s;->Xd:J
 
     sub-long v8, v6, v8
 
@@ -136,9 +136,9 @@
 
     if-ltz v4, :cond_1
 
-    iput-wide v6, v1, Lcom/facebook/imagepipeline/h/s;->WK:J
+    iput-wide v6, v1, Lcom/facebook/imagepipeline/h/s;->Xd:J
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/h/s;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/h/s;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v4
 
@@ -150,11 +150,11 @@
 
     invoke-interface {v4, v6, v5, v7}, Lcom/facebook/imagepipeline/h/am;->b(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget v4, v1, Lcom/facebook/imagepipeline/h/s;->WL:I
+    iget v4, v1, Lcom/facebook/imagepipeline/h/s;->Xe:I
 
-    iget-object v5, v1, Lcom/facebook/imagepipeline/h/s;->WM:Lcom/facebook/imagepipeline/a/a;
+    iget-object v5, v1, Lcom/facebook/imagepipeline/h/s;->Xf:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v6, v1, Lcom/facebook/imagepipeline/h/s;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/h/s;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-static {v2, v4, v5, v6}, Lcom/facebook/imagepipeline/h/ae;->a(Lcom/facebook/common/g/i;ILcom/facebook/imagepipeline/a/a;Lcom/facebook/imagepipeline/h/k;)V
 
@@ -186,14 +186,14 @@
 
     sub-float/2addr v5, v4
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/h/s;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/h/s;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {v4, v5}, Lcom/facebook/imagepipeline/h/k;->n(F)V
+    invoke-interface {v4, v5}, Lcom/facebook/imagepipeline/h/k;->m(F)V
 
     goto :goto_0
 
     :cond_2
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/h/s;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/h/s;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object p1
 
@@ -201,9 +201,9 @@
 
     move-result-object v4
 
-    invoke-interface {p1, v4}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {p1, v4}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/h/s;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/h/s;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object p1
 
@@ -223,19 +223,19 @@
 
     invoke-interface {p1, v4, v5, v6}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    iget p1, v1, Lcom/facebook/imagepipeline/h/s;->WL:I
+    iget p1, v1, Lcom/facebook/imagepipeline/h/s;->Xe:I
 
     or-int/2addr p1, v6
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/h/s;->WM:Lcom/facebook/imagepipeline/a/a;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/h/s;->Xf:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/h/s;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/h/s;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-static {v2, p1, v4, v1}, Lcom/facebook/imagepipeline/h/ae;->a(Lcom/facebook/common/g/i;ILcom/facebook/imagepipeline/a/a;Lcom/facebook/imagepipeline/h/k;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-object p1, v0, Lcom/facebook/imagepipeline/h/ae;->Ha:Lcom/facebook/common/g/a;
+    iget-object p1, v0, Lcom/facebook/imagepipeline/h/ae;->Hr:Lcom/facebook/common/g/a;
 
     invoke-interface {p1, v3}, Lcom/facebook/common/g/a;->z(Ljava/lang/Object;)V
 
@@ -248,7 +248,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/ae;->Ha:Lcom/facebook/common/g/a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/ae;->Hr:Lcom/facebook/common/g/a;
 
     invoke-interface {v0, v3}, Lcom/facebook/common/g/a;->z(Ljava/lang/Object;)V
 
@@ -266,9 +266,9 @@
 .method public final i(Ljava/lang/Throwable;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ae$1;->WN:Lcom/facebook/imagepipeline/h/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ae$1;->Xg:Lcom/facebook/imagepipeline/h/s;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/s;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/s;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v1
 
@@ -282,7 +282,7 @@
 
     invoke-interface {v1, v2, v3, p1, v4}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/s;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/s;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v1
 
@@ -294,7 +294,7 @@
 
     invoke-interface {v1, v2, v3, v4}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/s;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/s;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/h/k;->i(Ljava/lang/Throwable;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/af$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/af$a.smali
index a2616053b5..9285cc29bb 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/af$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/af$a.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract fz()V
+.method public abstract fD()V
 .end method
 
 .method public abstract g(Ljava/io/InputStream;)V
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ag$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ag$1.smali
index 997d1bfe7f..154e53d493 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ag$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ag$1.smali
@@ -28,34 +28,34 @@
 
 
 # instance fields
-.field final synthetic WD:Lcom/facebook/imagepipeline/h/am;
+.field final synthetic WQ:Lcom/facebook/imagepipeline/h/ak;
 
-.field final synthetic WE:Ljava/lang/String;
+.field final synthetic WW:Lcom/facebook/imagepipeline/h/am;
 
-.field final synthetic WF:Lcom/facebook/imagepipeline/h/k;
+.field final synthetic WX:Ljava/lang/String;
 
-.field final synthetic Wy:Lcom/facebook/imagepipeline/h/ak;
+.field final synthetic WY:Lcom/facebook/imagepipeline/h/k;
 
-.field final synthetic XC:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic XU:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic XD:Lcom/facebook/imagepipeline/h/ag;
+.field final synthetic XV:Lcom/facebook/imagepipeline/h/ag;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ag;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;Lcom/facebook/cache/common/CacheKey;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ag$1;->XD:Lcom/facebook/imagepipeline/h/ag;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ag$1;->XV:Lcom/facebook/imagepipeline/h/ag;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ag$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ag$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ag$1;->WE:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ag$1;->WX:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/h/ag$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/h/ag$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/h/ag$1;->Wy:Lcom/facebook/imagepipeline/h/ak;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/h/ag$1;->WQ:Lcom/facebook/imagepipeline/h/ak;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/h/ag$1;->XC:Lcom/facebook/cache/common/CacheKey;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/h/ag$1;->XU:Lcom/facebook/cache/common/CacheKey;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -114,15 +114,15 @@
 
     if-eqz v0, :cond_2
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WX:Ljava/lang/String;
 
     invoke-interface {p1, v0, v4, v3}, Lcom/facebook/imagepipeline/h/am;->b(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/k;->fz()V
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/k;->fD()V
 
     goto/16 :goto_4
 
@@ -133,9 +133,9 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag$1;->WE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag$1;->WX:Ljava/lang/String;
 
     invoke-virtual {p1}, La/h;->x()Ljava/lang/Exception;
 
@@ -143,13 +143,13 @@
 
     invoke-interface {v0, v1, v4, p1, v3}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$1;->XD:Lcom/facebook/imagepipeline/h/ag;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ag$1;->XV:Lcom/facebook/imagepipeline/h/ag;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag$1;->Wy:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag$1;->WQ:Lcom/facebook/imagepipeline/h/ak;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ag$1;->XC:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ag$1;->XU:Lcom/facebook/cache/common/CacheKey;
 
     invoke-static {p1, v0, v1, v2, v3}, Lcom/facebook/imagepipeline/h/ag;->a(Lcom/facebook/imagepipeline/h/ag;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)V
 
@@ -164,9 +164,9 @@
 
     if-eqz p1, :cond_8
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/h/ag$1;->WE:Ljava/lang/String;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/h/ag$1;->WX:Ljava/lang/String;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->getSize()I
 
@@ -200,31 +200,31 @@
 
     invoke-direct {v5, v1, v0}, Lcom/facebook/imagepipeline/a/a;-><init>(II)V
 
-    iput-object v5, p1, Lcom/facebook/imagepipeline/f/e;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iput-object v5, p1, Lcom/facebook/imagepipeline/f/e;->UN:Lcom/facebook/imagepipeline/a/a;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->getSize()I
 
     move-result v0
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/h/ag$1;->Wy:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/h/ag$1;->WQ:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v6}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v6}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v6
 
-    iget-object v7, v6, Lcom/facebook/imagepipeline/request/b;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iget-object v7, v6, Lcom/facebook/imagepipeline/request/b;->UN:Lcom/facebook/imagepipeline/a/a;
 
     if-eqz v7, :cond_5
 
-    iget v8, v5, Lcom/facebook/imagepipeline/a/a;->RG:I
+    iget v8, v5, Lcom/facebook/imagepipeline/a/a;->RY:I
 
-    iget v9, v7, Lcom/facebook/imagepipeline/a/a;->RG:I
+    iget v9, v7, Lcom/facebook/imagepipeline/a/a;->RY:I
 
     if-gt v8, v9, :cond_5
 
-    iget v5, v5, Lcom/facebook/imagepipeline/a/a;->RH:I
+    iget v5, v5, Lcom/facebook/imagepipeline/a/a;->RZ:I
 
-    iget v7, v7, Lcom/facebook/imagepipeline/a/a;->RH:I
+    iget v7, v7, Lcom/facebook/imagepipeline/a/a;->RZ:I
 
     if-lt v5, v7, :cond_5
 
@@ -238,13 +238,13 @@
     :goto_3
     if-eqz v5, :cond_6
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag$1;->WE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag$1;->WX:Ljava/lang/String;
 
     invoke-interface {v0, v1, v4, v2}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
     const/16 v1, 0x9
 
@@ -253,13 +253,13 @@
     goto :goto_4
 
     :cond_6
-    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ag$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ag$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
     const/16 v5, 0x8
 
     invoke-interface {v4, p1, v5}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
-    invoke-static {v6}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->i(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
+    invoke-static {v6}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->h(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
 
     move-result-object v4
 
@@ -278,32 +278,32 @@
 
     invoke-direct {v1, v0, v2}, Lcom/facebook/imagepipeline/a/a;-><init>(II)V
 
-    iput-object v1, v4, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Uv:Lcom/facebook/imagepipeline/a/a;
+    iput-object v1, v4, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UN:Lcom/facebook/imagepipeline/a/a;
 
-    invoke-virtual {v4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jS()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
     new-instance v1, Lcom/facebook/imagepipeline/h/ap;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ag$1;->Wy:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ag$1;->WQ:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-direct {v1, v0, v2}, Lcom/facebook/imagepipeline/h/ap;-><init>(Lcom/facebook/imagepipeline/request/b;Lcom/facebook/imagepipeline/h/ak;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->XD:Lcom/facebook/imagepipeline/h/ag;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->XV:Lcom/facebook/imagepipeline/h/ag;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ag$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ag$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ag$1;->XC:Lcom/facebook/cache/common/CacheKey;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ag$1;->XU:Lcom/facebook/cache/common/CacheKey;
 
     invoke-static {v0, v2, v1, v4, p1}, Lcom/facebook/imagepipeline/h/ag;->a(Lcom/facebook/imagepipeline/h/ag;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)V
 
     goto :goto_4
 
     :cond_8
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ag$1;->WE:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ag$1;->WX:Ljava/lang/String;
 
     invoke-static {v0, v2, v1, v1}, Lcom/facebook/imagepipeline/h/ag;->a(Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;ZI)Ljava/util/Map;
 
@@ -311,13 +311,13 @@
 
     invoke-interface {v0, v2, v4, v1}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->XD:Lcom/facebook/imagepipeline/h/ag;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$1;->XV:Lcom/facebook/imagepipeline/h/ag;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ag$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ag$1;->Wy:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ag$1;->WQ:Lcom/facebook/imagepipeline/h/ak;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ag$1;->XC:Lcom/facebook/cache/common/CacheKey;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ag$1;->XU:Lcom/facebook/cache/common/CacheKey;
 
     invoke-static {v0, v1, v2, v4, p1}, Lcom/facebook/imagepipeline/h/ag;->a(Lcom/facebook/imagepipeline/h/ag;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ag$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ag$2.smali
index 123cd2a10c..5f3afdabcf 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ag$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ag$2.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic Ra:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic Rs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic XD:Lcom/facebook/imagepipeline/h/ag;
+.field final synthetic XV:Lcom/facebook/imagepipeline/h/ag;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ag;Ljava/util/concurrent/atomic/AtomicBoolean;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ag$2;->XD:Lcom/facebook/imagepipeline/h/ag;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ag$2;->XV:Lcom/facebook/imagepipeline/h/ag;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ag$2;->Ra:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ag$2;->Rs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final jt()V
+.method public final jr()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$2;->Ra:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ag$2;->Rs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ah$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ah$a.smali
index 36593d226d..96f3b751dc 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ah$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ah$a.smali
@@ -27,9 +27,9 @@
 
 
 # instance fields
-.field private final Gj:Lcom/facebook/cache/common/CacheKey;
+.field private final GA:Lcom/facebook/cache/common/CacheKey;
 
-.field private final IC:Lcom/facebook/imagepipeline/cache/o;
+.field private final IU:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -40,9 +40,9 @@
     .end annotation
 .end field
 
-.field private final XG:Z
+.field private final XY:Z
 
-.field private final XH:Z
+.field private final XZ:Z
 
 
 # direct methods
@@ -66,13 +66,13 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ah$a;->Gj:Lcom/facebook/cache/common/CacheKey;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ah$a;->GA:Lcom/facebook/cache/common/CacheKey;
 
-    iput-boolean p3, p0, Lcom/facebook/imagepipeline/h/ah$a;->XG:Z
+    iput-boolean p3, p0, Lcom/facebook/imagepipeline/h/ah$a;->XY:Z
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/h/ah$a;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/h/ah$a;->IU:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-boolean p5, p0, Lcom/facebook/imagepipeline/h/ah$a;->XH:Z
+    iput-boolean p5, p0, Lcom/facebook/imagepipeline/h/ah$a;->XZ:Z
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {p1, v0, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
@@ -108,7 +108,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/h/ah$a;->XG:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/h/ah$a;->XY:Z
 
     if-eqz v1, :cond_2
 
@@ -119,13 +119,13 @@
 
     :cond_3
     :goto_0
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/h/ah$a;->XH:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/h/ah$a;->XZ:Z
 
     if-eqz v1, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ah$a;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ah$a;->IU:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ah$a;->Gj:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ah$a;->GA:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v0, v1, p1}, Lcom/facebook/imagepipeline/cache/o;->a(Ljava/lang/Object;Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -133,13 +133,13 @@
 
     :cond_4
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     const/high16 v2, 0x3f800000    # 1.0f
 
-    invoke-interface {v1, v2}, Lcom/facebook/imagepipeline/h/k;->n(F)V
+    invoke-interface {v1, v2}, Lcom/facebook/imagepipeline/h/k;->m(F)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     if-eqz v0, :cond_5
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ah.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ah.smali
index b225f79cb7..0987ae4deb 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ah.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ah.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final IC:Lcom/facebook/imagepipeline/cache/o;
+.field private final IU:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -36,9 +36,9 @@
     .end annotation
 .end field
 
-.field private final Sx:Lcom/facebook/imagepipeline/cache/f;
+.field private final SQ:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field private final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -70,11 +70,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ah;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ah;->IU:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ah;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ah;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ah;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ah;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     return-void
 .end method
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v0
 
@@ -103,15 +103,15 @@
 
     move-result-object v1
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jo()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Ljava/lang/Object;
 
     move-result-object v3
 
-    iget-object v4, v2, Lcom/facebook/imagepipeline/request/b;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object v4, v2, Lcom/facebook/imagepipeline/request/b;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     if-eqz v4, :cond_4
 
@@ -128,13 +128,13 @@
 
     invoke-interface {v0, v1, v5}, Lcom/facebook/imagepipeline/h/am;->u(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/h/ah;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/h/ah;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-interface {v6, v2, v3}, Lcom/facebook/imagepipeline/cache/f;->b(Lcom/facebook/imagepipeline/request/b;Ljava/lang/Object;)Lcom/facebook/cache/common/CacheKey;
 
     move-result-object v9
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ah;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ah;->IU:Lcom/facebook/imagepipeline/cache/o;
 
     invoke-interface {v2, v9}, Lcom/facebook/imagepipeline/cache/o;->M(Ljava/lang/Object;)Lcom/facebook/common/references/CloseableReference;
 
@@ -146,7 +146,7 @@
 
     if-eqz v2, :cond_2
 
-    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result p2
 
@@ -167,7 +167,7 @@
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    invoke-interface {p1, v0}, Lcom/facebook/imagepipeline/h/k;->n(F)V
+    invoke-interface {p1, v0}, Lcom/facebook/imagepipeline/h/k;->m(F)V
 
     invoke-interface {p1, v2, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
@@ -178,15 +178,15 @@
     :cond_2
     instance-of v10, v4, Lcom/facebook/imagepipeline/request/d;
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
-    iget-boolean v12, v2, Lcom/facebook/imagepipeline/request/b;->WI:Z
+    iget-boolean v12, v2, Lcom/facebook/imagepipeline/request/b;->Xb:Z
 
     new-instance v2, Lcom/facebook/imagepipeline/h/ah$a;
 
-    iget-object v11, p0, Lcom/facebook/imagepipeline/h/ah;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v11, p0, Lcom/facebook/imagepipeline/h/ah;->IU:Lcom/facebook/imagepipeline/cache/o;
 
     move-object v7, v2
 
@@ -194,7 +194,7 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/facebook/imagepipeline/h/ah$a;-><init>(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/cache/common/CacheKey;ZLcom/facebook/imagepipeline/cache/o;Z)V
 
-    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result p1
 
@@ -209,7 +209,7 @@
     :cond_3
     invoke-interface {v0, v1, v5, v6}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ah;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ah;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-interface {p1, v2, p2}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
@@ -217,7 +217,7 @@
 
     :cond_4
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ah;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ah;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$a$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$a$1.smali
index 5baca811a8..f5b0467f63 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$a$1.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic XO:Lcom/facebook/imagepipeline/h/ai;
+.field final synthetic Yg:Lcom/facebook/imagepipeline/h/ai;
 
-.field final synthetic XP:Lcom/facebook/imagepipeline/h/ai$a;
+.field final synthetic Yh:Lcom/facebook/imagepipeline/h/ai$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ai$a;Lcom/facebook/imagepipeline/h/ai;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$a$1;->XP:Lcom/facebook/imagepipeline/h/ai$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$a$1;->Yh:Lcom/facebook/imagepipeline/h/ai$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ai$a$1;->XO:Lcom/facebook/imagepipeline/h/ai;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ai$a$1;->Yg:Lcom/facebook/imagepipeline/h/ai;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/e;-><init>()V
 
@@ -35,12 +35,12 @@
 
 
 # virtual methods
-.method public final jt()V
+.method public final jr()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a$1;->XP:Lcom/facebook/imagepipeline/h/ai$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a$1;->Yh:Lcom/facebook/imagepipeline/h/ai$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/ai$a;->jO()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/ai$a;->jM()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$a$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$a$2.smali
index 30a7af9ec8..084b54565d 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$a$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$a$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/imagepipeline/h/ai$a;->jM()V
+    value = Lcom/facebook/imagepipeline/h/ai$a;->jK()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic XP:Lcom/facebook/imagepipeline/h/ai$a;
+.field final synthetic Yh:Lcom/facebook/imagepipeline/h/ai$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ai$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->XP:Lcom/facebook/imagepipeline/h/ai$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->Yh:Lcom/facebook/imagepipeline/h/ai$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,30 +37,30 @@
 .method public final run()V
     .locals 11
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->XP:Lcom/facebook/imagepipeline/h/ai$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->Yh:Lcom/facebook/imagepipeline/h/ai$a;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->XP:Lcom/facebook/imagepipeline/h/ai$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->Yh:Lcom/facebook/imagepipeline/h/ai$a;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/h/ai$a;->XK:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/h/ai$a;->Yc:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->XP:Lcom/facebook/imagepipeline/h/ai$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->Yh:Lcom/facebook/imagepipeline/h/ai$a;
 
-    iget v2, v2, Lcom/facebook/imagepipeline/h/ai$a;->WW:I
+    iget v2, v2, Lcom/facebook/imagepipeline/h/ai$a;->Xo:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->XP:Lcom/facebook/imagepipeline/h/ai$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->Yh:Lcom/facebook/imagepipeline/h/ai$a;
 
     const/4 v4, 0x0
 
-    iput-object v4, v3, Lcom/facebook/imagepipeline/h/ai$a;->XK:Lcom/facebook/common/references/CloseableReference;
+    iput-object v4, v3, Lcom/facebook/imagepipeline/h/ai$a;->Yc:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->XP:Lcom/facebook/imagepipeline/h/ai$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->Yh:Lcom/facebook/imagepipeline/h/ai$a;
 
     const/4 v5, 0x0
 
-    iput-boolean v5, v3, Lcom/facebook/imagepipeline/h/ai$a;->XL:Z
+    iput-boolean v5, v3, Lcom/facebook/imagepipeline/h/ai$a;->Yd:Z
 
     monitor-exit v0
     :try_end_0
@@ -73,7 +73,7 @@
     if-eqz v0, :cond_1
 
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->XP:Lcom/facebook/imagepipeline/h/ai$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->Yh:Lcom/facebook/imagepipeline/h/ai$a;
 
     invoke-static {v1}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
 
@@ -96,9 +96,9 @@
     goto :goto_1
 
     :cond_0
-    iget-object v3, v0, Lcom/facebook/imagepipeline/h/ai$a;->XI:Lcom/facebook/imagepipeline/h/am;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/h/ai$a;->Ya:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/h/ai$a;->IV:Ljava/lang/String;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/h/ai$a;->Jm:Ljava/lang/String;
 
     const-string v7, "PostprocessorProducer"
 
@@ -121,17 +121,17 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    iget-object v3, v0, Lcom/facebook/imagepipeline/h/ai$a;->XI:Lcom/facebook/imagepipeline/h/am;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/h/ai$a;->Ya:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/h/ai$a;->IV:Ljava/lang/String;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/h/ai$a;->Jm:Ljava/lang/String;
 
     const-string v7, "PostprocessorProducer"
 
-    iget-object v8, v0, Lcom/facebook/imagepipeline/h/ai$a;->XI:Lcom/facebook/imagepipeline/h/am;
+    iget-object v8, v0, Lcom/facebook/imagepipeline/h/ai$a;->Ya:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v9, v0, Lcom/facebook/imagepipeline/h/ai$a;->IV:Ljava/lang/String;
+    iget-object v9, v0, Lcom/facebook/imagepipeline/h/ai$a;->Jm:Ljava/lang/String;
 
-    iget-object v10, v0, Lcom/facebook/imagepipeline/h/ai$a;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object v10, v0, Lcom/facebook/imagepipeline/h/ai$a;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     invoke-static {v8, v9, v10}, Lcom/facebook/imagepipeline/h/ai$a;->a(Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Lcom/facebook/imagepipeline/request/c;)Ljava/util/Map;
 
@@ -160,17 +160,17 @@
     move-exception v2
 
     :try_start_5
-    iget-object v3, v0, Lcom/facebook/imagepipeline/h/ai$a;->XI:Lcom/facebook/imagepipeline/h/am;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/h/ai$a;->Ya:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/h/ai$a;->IV:Ljava/lang/String;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/h/ai$a;->Jm:Ljava/lang/String;
 
     const-string v7, "PostprocessorProducer"
 
-    iget-object v8, v0, Lcom/facebook/imagepipeline/h/ai$a;->XI:Lcom/facebook/imagepipeline/h/am;
+    iget-object v8, v0, Lcom/facebook/imagepipeline/h/ai$a;->Ya:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v9, v0, Lcom/facebook/imagepipeline/h/ai$a;->IV:Ljava/lang/String;
+    iget-object v9, v0, Lcom/facebook/imagepipeline/h/ai$a;->Jm:Ljava/lang/String;
 
-    iget-object v10, v0, Lcom/facebook/imagepipeline/h/ai$a;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object v10, v0, Lcom/facebook/imagepipeline/h/ai$a;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     invoke-static {v8, v9, v10}, Lcom/facebook/imagepipeline/h/ai$a;->a(Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Lcom/facebook/imagepipeline/request/c;)Ljava/util/Map;
 
@@ -206,14 +206,14 @@
 
     :cond_1
     :goto_3
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->XP:Lcom/facebook/imagepipeline/h/ai$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ai$a$2;->Yh:Lcom/facebook/imagepipeline/h/ai$a;
 
     monitor-enter v1
 
     :try_start_7
-    iput-boolean v5, v1, Lcom/facebook/imagepipeline/h/ai$a;->XM:Z
+    iput-boolean v5, v1, Lcom/facebook/imagepipeline/h/ai$a;->Ye:Z
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/h/ai$a;->jN()Z
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/h/ai$a;->jL()Z
 
     move-result v0
 
@@ -223,7 +223,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/h/ai$a;->jM()V
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/h/ai$a;->jK()V
 
     :cond_2
     return-void
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$b$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$b$1.smali
index e18f6b4866..2947cfce71 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$b$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$b$1.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic XO:Lcom/facebook/imagepipeline/h/ai;
+.field final synthetic Yg:Lcom/facebook/imagepipeline/h/ai;
 
-.field final synthetic XQ:Lcom/facebook/imagepipeline/h/ai$b;
+.field final synthetic Yi:Lcom/facebook/imagepipeline/h/ai$b;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ai$b;Lcom/facebook/imagepipeline/h/ai;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$b$1;->XQ:Lcom/facebook/imagepipeline/h/ai$b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$b$1;->Yi:Lcom/facebook/imagepipeline/h/ai$b;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ai$b$1;->XO:Lcom/facebook/imagepipeline/h/ai;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ai$b$1;->Yg:Lcom/facebook/imagepipeline/h/ai;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/e;-><init>()V
 
@@ -35,22 +35,22 @@
 
 
 # virtual methods
-.method public final jt()V
+.method public final jr()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$b$1;->XQ:Lcom/facebook/imagepipeline/h/ai$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$b$1;->Yi:Lcom/facebook/imagepipeline/h/ai$b;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/ai$b;->fX()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/ai$b;->gb()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$b$1;->XQ:Lcom/facebook/imagepipeline/h/ai$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai$b$1;->Yi:Lcom/facebook/imagepipeline/h/ai$b;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fz()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fD()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$c.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$c.smali
index 0c6e4b6db8..adf4d57946 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$c.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai$c.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic XN:Lcom/facebook/imagepipeline/h/ai;
+.field final synthetic Yf:Lcom/facebook/imagepipeline/h/ai;
 
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/imagepipeline/h/ai;Lcom/facebook/imagepipeline/h/ai$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$c;->XN:Lcom/facebook/imagepipeline/h/ai;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai$c;->Yf:Lcom/facebook/imagepipeline/h/ai;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
@@ -62,7 +62,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai.smali
index 6591122382..eefaf2025f 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ai.smali
@@ -27,9 +27,9 @@
 
 
 # instance fields
-.field final Qc:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field final Qu:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field private final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -67,9 +67,9 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/h/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ai;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ai;->Qc:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ai;->Qu:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     invoke-static {p3}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -98,15 +98,15 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v3
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v7, v0, Lcom/facebook/imagepipeline/request/b;->XJ:Lcom/facebook/imagepipeline/request/c;
+    iget-object v7, v0, Lcom/facebook/imagepipeline/request/b;->Yb:Lcom/facebook/imagepipeline/request/c;
 
     new-instance v8, Lcom/facebook/imagepipeline/h/ai$a;
 
@@ -146,7 +146,7 @@
     invoke-direct {p1, p0, v8, v0}, Lcom/facebook/imagepipeline/h/ai$c;-><init>(Lcom/facebook/imagepipeline/h/ai;Lcom/facebook/imagepipeline/h/ai$a;B)V
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ai;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/al.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/al.smali
index 8fde4977b2..ab757b076b 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/al.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/al.smali
@@ -4,14 +4,14 @@
 
 
 # virtual methods
+.method public abstract jr()V
+.end method
+
+.method public abstract js()V
+.end method
+
 .method public abstract jt()V
 .end method
 
 .method public abstract ju()V
 .end method
-
-.method public abstract jv()V
-.end method
-
-.method public abstract jw()V
-.end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/an.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/an.smali
index 25cff89abd..bfa8e58e7a 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/an.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/an.smali
@@ -20,7 +20,7 @@
 
 
 # virtual methods
-.method protected final d(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
+.method protected final c(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -28,7 +28,7 @@
         }
     .end annotation
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/h/an;->mContentResolver:Landroid/content/ContentResolver;
 
@@ -45,7 +45,7 @@
     return-object p1
 .end method
 
-.method protected final jx()Ljava/lang/String;
+.method protected final jv()Ljava/lang/String;
     .locals 1
 
     const-string v0, "QualifiedResourceFetchProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ao$a$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ao$a$1.smali
index a45bd400dd..1fa8948fe8 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ao$a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ao$a$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic XT:Lcom/facebook/imagepipeline/h/ao;
+.field final synthetic Yl:Lcom/facebook/imagepipeline/h/ao;
 
-.field final synthetic XU:Lcom/facebook/imagepipeline/h/ao$a;
+.field final synthetic Ym:Lcom/facebook/imagepipeline/h/ao$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ao$a;Lcom/facebook/imagepipeline/h/ao;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ao$a$1;->XU:Lcom/facebook/imagepipeline/h/ao$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ao$a$1;->Ym:Lcom/facebook/imagepipeline/h/ao$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ao$a$1;->XT:Lcom/facebook/imagepipeline/h/ao;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ao$a$1;->Yl:Lcom/facebook/imagepipeline/h/ao;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,17 +43,17 @@
 
     const-string v0, "x"
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ao$a$1;->XU:Lcom/facebook/imagepipeline/h/ao$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ao$a$1;->Ym:Lcom/facebook/imagepipeline/h/ao$a;
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/h/ao$a;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/h/ao$a;->Tc:Lcom/facebook/imagepipeline/j/d;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ao$a$1;->XU:Lcom/facebook/imagepipeline/h/ao$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/h/ao$a$1;->Ym:Lcom/facebook/imagepipeline/h/ao$a;
 
-    iget-boolean v4, v4, Lcom/facebook/imagepipeline/h/ao$a;->XR:Z
+    iget-boolean v4, v4, Lcom/facebook/imagepipeline/h/ao$a;->Yj:Z
 
     invoke-interface {v2, v3, v4}, Lcom/facebook/imagepipeline/j/d;->createImageTranscoder(Lcom/facebook/d/c;Z)Lcom/facebook/imagepipeline/j/c;
 
@@ -65,13 +65,13 @@
 
     check-cast v2, Lcom/facebook/imagepipeline/j/c;
 
-    iget-object v3, v1, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v3, v1, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v3
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {v4}, Lcom/facebook/imagepipeline/h/ak;->getId()Ljava/lang/String;
 
@@ -81,26 +81,26 @@
 
     invoke-interface {v3, v4, v9}, Lcom/facebook/imagepipeline/h/am;->u(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v3, v1, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v3, v1, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v10
 
-    iget-object v3, v1, Lcom/facebook/imagepipeline/h/ao$a;->XS:Lcom/facebook/imagepipeline/h/ao;
+    iget-object v3, v1, Lcom/facebook/imagepipeline/h/ao$a;->Yk:Lcom/facebook/imagepipeline/h/ao;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/h/ao;->QF:Lcom/facebook/common/g/g;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/h/ao;->QX:Lcom/facebook/common/g/g;
 
-    invoke-interface {v3}, Lcom/facebook/common/g/g;->fH()Lcom/facebook/common/g/i;
+    invoke-interface {v3}, Lcom/facebook/common/g/g;->fL()Lcom/facebook/common/g/i;
 
     move-result-object v11
 
     const/4 v12, 0x0
 
     :try_start_0
-    iget-object v6, v10, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v6, v10, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v7, v10, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v7, v10, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     const/16 v3, 0x55
 
@@ -118,31 +118,31 @@
 
     move-result-object v3
 
-    iget v4, v3, Lcom/facebook/imagepipeline/j/b;->YI:I
+    iget v4, v3, Lcom/facebook/imagepipeline/j/b;->Za:I
 
     const/4 v5, 0x2
 
     if-eq v4, v5, :cond_3
 
-    iget-object v4, v10, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v4, v10, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     invoke-interface {v2}, Lcom/facebook/imagepipeline/j/c;->getIdentifier()Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v5, v1, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v5, v1, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v5}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {v5}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v5
 
-    iget-object v6, v1, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {v6}, Lcom/facebook/imagepipeline/h/ak;->getId()Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-interface {v5, v6}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {v5, v6}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result v5
 
@@ -205,7 +205,7 @@
 
     const-string v6, "Image format"
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object p1
 
@@ -225,9 +225,9 @@
 
     const-string p1, "queueTime"
 
-    iget-object v0, v1, Lcom/facebook/imagepipeline/h/ao$a;->Ww:Lcom/facebook/imagepipeline/h/u;
+    iget-object v0, v1, Lcom/facebook/imagepipeline/h/ao$a;->WO:Lcom/facebook/imagepipeline/h/u;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/u;->jC()J
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/u;->jA()J
 
     move-result-wide v5
 
@@ -256,7 +256,7 @@
     move-object v12, p1
 
     :goto_1
-    invoke-virtual {v11}, Lcom/facebook/common/g/i;->fI()Lcom/facebook/common/g/f;
+    invoke-virtual {v11}, Lcom/facebook/common/g/i;->fM()Lcom/facebook/common/g/f;
 
     move-result-object p1
 
@@ -272,22 +272,22 @@
 
     invoke-direct {v0, p1}, Lcom/facebook/imagepipeline/f/e;-><init>(Lcom/facebook/common/references/CloseableReference;)V
 
-    sget-object v2, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v2, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
-    iput-object v2, v0, Lcom/facebook/imagepipeline/f/e;->Us:Lcom/facebook/d/c;
+    iput-object v2, v0, Lcom/facebook/imagepipeline/f/e;->UK:Lcom/facebook/d/c;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/f/e;->iL()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/f/e;->iK()V
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v2
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {v4}, Lcom/facebook/imagepipeline/h/ak;->getId()Ljava/lang/String;
 
@@ -295,7 +295,7 @@
 
     invoke-interface {v2, v4, v9, v12}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget v2, v3, Lcom/facebook/imagepipeline/j/b;->YI:I
+    iget v2, v3, Lcom/facebook/imagepipeline/j/b;->Za:I
 
     const/4 v3, 0x1
 
@@ -304,7 +304,7 @@
     or-int/lit8 p2, p2, 0x10
 
     :cond_2
-    iget-object v2, v1, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v2, v0, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
     :try_end_2
@@ -364,13 +364,13 @@
     move-exception p1
 
     :try_start_7
-    iget-object v0, v1, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v0, v1, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v0
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {v2}, Lcom/facebook/imagepipeline/h/ak;->getId()Ljava/lang/String;
 
@@ -384,7 +384,7 @@
 
     if-eqz p2, :cond_4
 
-    iget-object p2, v1, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object p2, v1, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {p2, p1}, Lcom/facebook/imagepipeline/h/k;->i(Ljava/lang/Throwable;)V
     :try_end_7
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ao$a$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ao$a$2.smali
index 7aaec9b7f8..b05a00be8a 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ao$a$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ao$a$2.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic WF:Lcom/facebook/imagepipeline/h/k;
+.field final synthetic WY:Lcom/facebook/imagepipeline/h/k;
 
-.field final synthetic XT:Lcom/facebook/imagepipeline/h/ao;
+.field final synthetic Yl:Lcom/facebook/imagepipeline/h/ao;
 
-.field final synthetic XU:Lcom/facebook/imagepipeline/h/ao$a;
+.field final synthetic Ym:Lcom/facebook/imagepipeline/h/ao$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ao$a;Lcom/facebook/imagepipeline/h/ao;Lcom/facebook/imagepipeline/h/k;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->XU:Lcom/facebook/imagepipeline/h/ao$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->Ym:Lcom/facebook/imagepipeline/h/ao$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->XT:Lcom/facebook/imagepipeline/h/ao;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->Yl:Lcom/facebook/imagepipeline/h/ao;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->WF:Lcom/facebook/imagepipeline/h/k;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->WY:Lcom/facebook/imagepipeline/h/k;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/e;-><init>()V
 
@@ -39,46 +39,46 @@
 
 
 # virtual methods
-.method public final jt()V
+.method public final jr()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->XU:Lcom/facebook/imagepipeline/h/ao$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->Ym:Lcom/facebook/imagepipeline/h/ao$a;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/ao$a;->Ww:Lcom/facebook/imagepipeline/h/u;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/ao$a;->WO:Lcom/facebook/imagepipeline/h/u;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/u;->jz()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/u;->jx()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->XU:Lcom/facebook/imagepipeline/h/ao$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->Ym:Lcom/facebook/imagepipeline/h/ao$a;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/h/ao$a;->Wh:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/h/ao$a;->Wz:Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->WF:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->WY:Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fz()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fD()V
 
     return-void
 .end method
 
-.method public final jv()V
+.method public final jt()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->XU:Lcom/facebook/imagepipeline/h/ao$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->Ym:Lcom/facebook/imagepipeline/h/ao$a;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/ao$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/ao$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jr()Z
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jp()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->XU:Lcom/facebook/imagepipeline/h/ao$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao$a$2;->Ym:Lcom/facebook/imagepipeline/h/ao$a;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/ao$a;->Ww:Lcom/facebook/imagepipeline/h/u;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/ao$a;->WO:Lcom/facebook/imagepipeline/h/u;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/u;->jA()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/u;->jy()Z
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ao.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ao.smali
index 336083a522..0542666658 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ao.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ao.smali
@@ -24,11 +24,11 @@
 
 
 # instance fields
-.field final QF:Lcom/facebook/common/g/g;
+.field final QX:Lcom/facebook/common/g/g;
 
-.field private final SJ:Lcom/facebook/imagepipeline/j/d;
+.field private final Tc:Lcom/facebook/imagepipeline/j/d;
 
-.field private final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field private final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field private final XR:Z
+.field private final Yj:Z
 
 .field final mExecutor:Ljava/util/concurrent/Executor;
 
@@ -75,7 +75,7 @@
 
     check-cast p1, Lcom/facebook/common/g/g;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ao;->QF:Lcom/facebook/common/g/g;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ao;->QX:Lcom/facebook/common/g/g;
 
     invoke-static {p3}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -83,7 +83,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/h/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ao;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ao;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-static {p5}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -91,9 +91,9 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/j/d;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ao;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ao;->Tc:Lcom/facebook/imagepipeline/j/d;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/h/ao;->XR:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/h/ao;->Yj:Z
 
     return-void
 .end method
@@ -113,13 +113,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ao;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     new-instance v7, Lcom/facebook/imagepipeline/h/ao$a;
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/h/ao;->XR:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/h/ao;->Yj:Z
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/h/ao;->SJ:Lcom/facebook/imagepipeline/j/d;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/h/ao;->Tc:Lcom/facebook/imagepipeline/j/d;
 
     move-object v1, v7
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ap.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ap.smali
index f2fb78965c..c9a1d691ec 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ap.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ap.smali
@@ -11,15 +11,15 @@
 
     move-result-object v2
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v3
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jo()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jp()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v5
 
@@ -27,11 +27,11 @@
 
     move-result v6
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jr()Z
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jp()Z
 
     move-result v7
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jq()Lcom/facebook/imagepipeline/a/d;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jo()Lcom/facebook/imagepipeline/a/d;
 
     move-result-object v8
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ar$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ar$2.smali
index 5aa0b98a18..255bb9f5fd 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ar$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ar$2.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic XY:Lcom/facebook/imagepipeline/h/ar;
+.field final synthetic Yq:Lcom/facebook/imagepipeline/h/ar;
 
-.field final synthetic XZ:Lcom/facebook/imagepipeline/h/aq;
+.field final synthetic Yr:Lcom/facebook/imagepipeline/h/aq;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ar;Lcom/facebook/imagepipeline/h/aq;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ar$2;->XY:Lcom/facebook/imagepipeline/h/ar;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ar$2;->Yq:Lcom/facebook/imagepipeline/h/ar;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ar$2;->XZ:Lcom/facebook/imagepipeline/h/aq;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ar$2;->Yr:Lcom/facebook/imagepipeline/h/aq;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/e;-><init>()V
 
@@ -35,18 +35,18 @@
 
 
 # virtual methods
-.method public final jt()V
+.method public final jr()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ar$2;->XZ:Lcom/facebook/imagepipeline/h/aq;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ar$2;->Yr:Lcom/facebook/imagepipeline/h/aq;
 
     invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/aq;->cancel()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ar$2;->XY:Lcom/facebook/imagepipeline/h/ar;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ar$2;->Yq:Lcom/facebook/imagepipeline/h/ar;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/ar;->Sy:Lcom/facebook/imagepipeline/h/as;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/ar;->SR:Lcom/facebook/imagepipeline/h/as;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ar$2;->XZ:Lcom/facebook/imagepipeline/h/aq;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ar$2;->Yr:Lcom/facebook/imagepipeline/h/aq;
 
     invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/h/as;->e(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ar.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ar.smali
index 1408304f1f..5fd16c0669 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ar.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ar.smali
@@ -20,9 +20,9 @@
 
 
 # instance fields
-.field final Sy:Lcom/facebook/imagepipeline/h/as;
+.field final SR:Lcom/facebook/imagepipeline/h/as;
 
-.field final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -53,9 +53,9 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/h/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ar;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ar;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ar;->Sy:Lcom/facebook/imagepipeline/h/as;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/ar;->SR:Lcom/facebook/imagepipeline/h/as;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v6
 
@@ -108,7 +108,7 @@
 
     invoke-interface {p2, p1}, Lcom/facebook/imagepipeline/h/ak;->a(Lcom/facebook/imagepipeline/h/al;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ar;->Sy:Lcom/facebook/imagepipeline/h/as;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/ar;->SR:Lcom/facebook/imagepipeline/h/as;
 
     invoke-virtual {p1, v10}, Lcom/facebook/imagepipeline/h/as;->d(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/as.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/as.smali
index 70c8bf90e5..70204cc339 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/as.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/as.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private Ya:Z
+.field private Ys:Z
 
-.field private final Yb:Ljava/util/Deque;
+.field private final Yt:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -27,7 +27,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/as;->Ya:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/h/as;->Ys:Z
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -41,7 +41,7 @@
 
     invoke-direct {p1}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/as;->Yb:Ljava/util/Deque;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/as;->Yt:Ljava/util/Deque;
 
     return-void
 .end method
@@ -54,11 +54,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/as;->Ya:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/as;->Ys:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/as;->Yb:Ljava/util/Deque;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/as;->Yt:Ljava/util/Deque;
 
     invoke-interface {v0, p1}, Ljava/util/Deque;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -94,7 +94,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/as;->Yb:Ljava/util/Deque;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/as;->Yt:Ljava/util/Deque;
 
     invoke-interface {v0, p1}, Ljava/util/Deque;->remove(Ljava/lang/Object;)Z
     :try_end_0
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/at$a$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/at$a$1.smali
index 286b7832f9..4a93d3d123 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/at$a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/at$a$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/imagepipeline/h/at$a;->jP()V
+    value = Lcom/facebook/imagepipeline/h/at$a;->jN()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic Yg:Landroid/util/Pair;
+.field final synthetic Yy:Landroid/util/Pair;
 
-.field final synthetic Yh:Lcom/facebook/imagepipeline/h/at$a;
+.field final synthetic Yz:Lcom/facebook/imagepipeline/h/at$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/at$a;Landroid/util/Pair;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/at$a$1;->Yh:Lcom/facebook/imagepipeline/h/at$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/at$a$1;->Yz:Lcom/facebook/imagepipeline/h/at$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/at$a$1;->Yg:Landroid/util/Pair;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/at$a$1;->Yy:Landroid/util/Pair;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,17 +41,17 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/at$a$1;->Yh:Lcom/facebook/imagepipeline/h/at$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/at$a$1;->Yz:Lcom/facebook/imagepipeline/h/at$a;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/at$a;->Yf:Lcom/facebook/imagepipeline/h/at;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/at$a;->Yx:Lcom/facebook/imagepipeline/h/at;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/at$a$1;->Yg:Landroid/util/Pair;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/at$a$1;->Yy:Landroid/util/Pair;
 
     iget-object v1, v1, Landroid/util/Pair;->first:Ljava/lang/Object;
 
     check-cast v1, Lcom/facebook/imagepipeline/h/k;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/at$a$1;->Yg:Landroid/util/Pair;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/at$a$1;->Yy:Landroid/util/Pair;
 
     iget-object v2, v2, Landroid/util/Pair;->second:Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/at$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/at$a.smali
index 0feb127943..caa2ac2b1f 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/at$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/at$a.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field final synthetic Yf:Lcom/facebook/imagepipeline/h/at;
+.field final synthetic Yx:Lcom/facebook/imagepipeline/h/at;
 
 
 # direct methods
@@ -36,7 +36,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/at$a;->Yf:Lcom/facebook/imagepipeline/h/at;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/at$a;->Yx:Lcom/facebook/imagepipeline/h/at;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
@@ -51,17 +51,17 @@
     return-void
 .end method
 
-.method private jP()V
+.method private jN()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/at$a;->Yf:Lcom/facebook/imagepipeline/h/at;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/at$a;->Yx:Lcom/facebook/imagepipeline/h/at;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/at$a;->Yf:Lcom/facebook/imagepipeline/h/at;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/at$a;->Yx:Lcom/facebook/imagepipeline/h/at;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/h/at;->Ye:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/h/at;->Yw:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
@@ -71,7 +71,7 @@
 
     if-nez v1, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/at$a;->Yf:Lcom/facebook/imagepipeline/h/at;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/at$a;->Yx:Lcom/facebook/imagepipeline/h/at;
 
     invoke-static {v2}, Lcom/facebook/imagepipeline/h/at;->a(Lcom/facebook/imagepipeline/h/at;)I
 
@@ -82,7 +82,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/at$a;->Yf:Lcom/facebook/imagepipeline/h/at;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/at$a;->Yx:Lcom/facebook/imagepipeline/h/at;
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/h/at;->mExecutor:Ljava/util/concurrent/Executor;
 
@@ -116,7 +116,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
@@ -126,7 +126,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/at$a;->jP()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/at$a;->jN()V
 
     :cond_0
     return-void
@@ -135,23 +135,23 @@
 .method protected final h(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/h/k;->i(Ljava/lang/Throwable;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/at$a;->jP()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/at$a;->jN()V
 
     return-void
 .end method
 
-.method protected final iy()V
+.method protected final ix()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fz()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/k;->fD()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/at$a;->jP()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/at$a;->jN()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/at.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/at.smali
index 6b8742efd7..129b8f3816 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/at.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/at.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field private final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field private final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -35,11 +35,11 @@
     .end annotation
 .end field
 
-.field private final Yc:I
+.field private final Yu:I
 
-.field private Yd:I
+.field private Yv:I
 
-.field final Ye:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field final Yw:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -71,7 +71,7 @@
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lcom/facebook/imagepipeline/h/at;->Yc:I
+    iput v0, p0, Lcom/facebook/imagepipeline/h/at;->Yu:I
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -87,17 +87,17 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/h/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/at;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/at;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     new-instance p1, Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-direct {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/at;->Ye:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/at;->Yw:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/h/at;->Yd:I
+    iput p1, p0, Lcom/facebook/imagepipeline/h/at;->Yv:I
 
     return-void
 .end method
@@ -105,11 +105,11 @@
 .method static synthetic a(Lcom/facebook/imagepipeline/h/at;)I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/h/at;->Yd:I
+    iget v0, p0, Lcom/facebook/imagepipeline/h/at;->Yv:I
 
     add-int/lit8 v1, v0, -0x1
 
-    iput v1, p0, Lcom/facebook/imagepipeline/h/at;->Yd:I
+    iput v1, p0, Lcom/facebook/imagepipeline/h/at;->Yv:I
 
     return v0
 .end method
@@ -128,7 +128,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v0
 
@@ -143,15 +143,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/imagepipeline/h/at;->Yd:I
+    iget v0, p0, Lcom/facebook/imagepipeline/h/at;->Yv:I
 
-    iget v1, p0, Lcom/facebook/imagepipeline/h/at;->Yc:I
+    iget v1, p0, Lcom/facebook/imagepipeline/h/at;->Yu:I
 
     const/4 v2, 0x1
 
     if-lt v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/at;->Ye:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/at;->Yw:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-static {p1, p2}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair;
 
@@ -162,11 +162,11 @@
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/facebook/imagepipeline/h/at;->Yd:I
+    iget v0, p0, Lcom/facebook/imagepipeline/h/at;->Yv:I
 
     add-int/2addr v0, v2
 
-    iput v0, p0, Lcom/facebook/imagepipeline/h/at;->Yd:I
+    iput v0, p0, Lcom/facebook/imagepipeline/h/at;->Yv:I
 
     const/4 v2, 0x0
 
@@ -205,7 +205,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v0
 
@@ -219,7 +219,7 @@
 
     invoke-interface {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/at;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/at;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     new-instance v1, Lcom/facebook/imagepipeline/h/at$a;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/au$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/au$a.smali
index be02c59e25..13dd2fee94 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/au$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/au$a.smali
@@ -24,13 +24,13 @@
 
 
 # instance fields
-.field private final QN:Lcom/facebook/imagepipeline/a/e;
+.field private final Rf:Lcom/facebook/imagepipeline/a/e;
 
-.field private final Wq:Lcom/facebook/imagepipeline/h/ak;
+.field private final WI:Lcom/facebook/imagepipeline/h/ak;
 
-.field private final Yj:I
+.field private final YB:I
 
-.field final synthetic Yk:Lcom/facebook/imagepipeline/h/au;
+.field final synthetic YC:Lcom/facebook/imagepipeline/h/au;
 
 
 # direct methods
@@ -47,23 +47,23 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/au$a;->Yk:Lcom/facebook/imagepipeline/h/au;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/au$a;->YC:Lcom/facebook/imagepipeline/h/au;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/au$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/au$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    iput p4, p0, Lcom/facebook/imagepipeline/h/au$a;->Yj:I
+    iput p4, p0, Lcom/facebook/imagepipeline/h/au$a;->YB:I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/au$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/au$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/au$a;->QN:Lcom/facebook/imagepipeline/a/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/au$a;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/au$a;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/au$a;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     invoke-static {p1, v0}, Lcom/facebook/imagepipeline/h/aw;->a(Lcom/facebook/imagepipeline/f/e;Lcom/facebook/imagepipeline/a/e;)Z
 
@@ -92,7 +92,7 @@
     if-eqz v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
@@ -107,17 +107,17 @@
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/au$a;->Yk:Lcom/facebook/imagepipeline/h/au;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/au$a;->YC:Lcom/facebook/imagepipeline/h/au;
 
-    iget p2, p0, Lcom/facebook/imagepipeline/h/au$a;->Yj:I
+    iget p2, p0, Lcom/facebook/imagepipeline/h/au$a;->YB:I
 
     const/4 v0, 0x1
 
     add-int/2addr p2, v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/au$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/au$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-virtual {p1, p2, v1, v2}, Lcom/facebook/imagepipeline/h/au;->a(ILcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)Z
 
@@ -125,7 +125,7 @@
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     const/4 p2, 0x0
 
@@ -138,15 +138,15 @@
 .method protected final h(Ljava/lang/Throwable;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/au$a;->Yk:Lcom/facebook/imagepipeline/h/au;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/au$a;->YC:Lcom/facebook/imagepipeline/h/au;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/h/au$a;->Yj:I
+    iget v1, p0, Lcom/facebook/imagepipeline/h/au$a;->YB:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/au$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/au$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/h/au;->a(ILcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)Z
 
@@ -154,7 +154,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/h/k;->i(Ljava/lang/Throwable;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/au.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/au.smali
index 4ad64badbd..7ccd5b4d46 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/au.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/au.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private final Yi:[Lcom/facebook/imagepipeline/h/av;
+.field private final YA:[Lcom/facebook/imagepipeline/h/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -56,9 +56,9 @@
 
     check-cast p1, [Lcom/facebook/imagepipeline/h/av;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/au;->Yi:[Lcom/facebook/imagepipeline/h/av;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/au;->YA:[Lcom/facebook/imagepipeline/h/av;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/au;->Yi:[Lcom/facebook/imagepipeline/h/av;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/au;->YA:[Lcom/facebook/imagepipeline/h/av;
 
     array-length p1, p1
 
@@ -129,7 +129,7 @@
     .locals 2
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/au;->Yi:[Lcom/facebook/imagepipeline/h/av;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/au;->YA:[Lcom/facebook/imagepipeline/h/av;
 
     array-length v1, v0
 
@@ -171,11 +171,11 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     const/4 v1, 0x1
 
@@ -215,11 +215,11 @@
         }
     .end annotation
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     invoke-direct {p0, p1, v0}, Lcom/facebook/imagepipeline/h/au;->a(ILcom/facebook/imagepipeline/a/e;)I
 
@@ -234,7 +234,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/au;->Yi:[Lcom/facebook/imagepipeline/h/av;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/au;->YA:[Lcom/facebook/imagepipeline/h/av;
 
     aget-object v0, v0, p1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/aw.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/aw.smali
index 208dd98091..4d33fee002 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/aw.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/aw.smali
@@ -81,7 +81,7 @@
     return p0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->iH()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/f/e;->iG()I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ax$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ax$1.smali
index 1de732545f..86f09a3dc1 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ax$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ax$1.smali
@@ -23,25 +23,25 @@
 
 
 # instance fields
-.field final synthetic Yl:Lcom/facebook/imagepipeline/f/e;
+.field final synthetic YD:Lcom/facebook/imagepipeline/f/e;
 
-.field final synthetic Ym:Lcom/facebook/imagepipeline/h/ax;
+.field final synthetic YE:Lcom/facebook/imagepipeline/h/ax;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/ax;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/imagepipeline/f/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ax$1;->Ym:Lcom/facebook/imagepipeline/h/ax;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ax$1;->YE:Lcom/facebook/imagepipeline/h/ax;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/h/ax$1;->Yl:Lcom/facebook/imagepipeline/f/e;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/h/ax$1;->YD:Lcom/facebook/imagepipeline/f/e;
 
     invoke-direct {p0, p2, p3, p4, p5}, Lcom/facebook/imagepipeline/h/aq;-><init>(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
 .end method
 
-.method private jQ()Lcom/facebook/imagepipeline/f/e;
+.method private jO()Lcom/facebook/imagepipeline/f/e;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -49,16 +49,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$1;->Ym:Lcom/facebook/imagepipeline/h/ax;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$1;->YE:Lcom/facebook/imagepipeline/h/ax;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/ax;->QF:Lcom/facebook/common/g/g;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/ax;->QX:Lcom/facebook/common/g/g;
 
-    invoke-interface {v0}, Lcom/facebook/common/g/g;->fH()Lcom/facebook/common/g/i;
+    invoke-interface {v0}, Lcom/facebook/common/g/g;->fL()Lcom/facebook/common/g/i;
 
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ax$1;->Yl:Lcom/facebook/imagepipeline/f/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/ax$1;->YD:Lcom/facebook/imagepipeline/f/e;
 
     invoke-virtual {v1}, Lcom/facebook/imagepipeline/f/e;->getInputStream()Ljava/io/InputStream;
 
@@ -68,22 +68,22 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/facebook/d/b;->Px:Lcom/facebook/d/c;
+    sget-object v4, Lcom/facebook/d/b;->PP:Lcom/facebook/d/c;
 
     if-eq v3, v4, :cond_3
 
-    sget-object v4, Lcom/facebook/d/b;->Pz:Lcom/facebook/d/c;
+    sget-object v4, Lcom/facebook/d/b;->PR:Lcom/facebook/d/c;
 
     if-ne v3, v4, :cond_0
 
     goto :goto_1
 
     :cond_0
-    sget-object v4, Lcom/facebook/d/b;->Py:Lcom/facebook/d/c;
+    sget-object v4, Lcom/facebook/d/b;->PQ:Lcom/facebook/d/c;
 
     if-eq v3, v4, :cond_2
 
-    sget-object v4, Lcom/facebook/d/b;->PA:Lcom/facebook/d/c;
+    sget-object v4, Lcom/facebook/d/b;->PS:Lcom/facebook/d/c;
 
     if-ne v3, v4, :cond_1
 
@@ -100,32 +100,32 @@
 
     :cond_2
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->jk()Lcom/facebook/imagepipeline/nativecode/e;
-
-    move-result-object v3
-
-    invoke-interface {v3, v2, v0}, Lcom/facebook/imagepipeline/nativecode/e;->c(Ljava/io/InputStream;Ljava/io/OutputStream;)V
-
-    sget-object v2, Lcom/facebook/d/b;->Pt:Lcom/facebook/d/c;
-
-    iput-object v2, v1, Lcom/facebook/imagepipeline/f/e;->Us:Lcom/facebook/d/c;
-
-    goto :goto_2
-
-    :cond_3
-    :goto_1
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->jk()Lcom/facebook/imagepipeline/nativecode/e;
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->ji()Lcom/facebook/imagepipeline/nativecode/e;
 
     move-result-object v3
 
     invoke-interface {v3, v2, v0}, Lcom/facebook/imagepipeline/nativecode/e;->b(Ljava/io/InputStream;Ljava/io/OutputStream;)V
 
-    sget-object v2, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v2, Lcom/facebook/d/b;->PL:Lcom/facebook/d/c;
 
-    iput-object v2, v1, Lcom/facebook/imagepipeline/f/e;->Us:Lcom/facebook/d/c;
+    iput-object v2, v1, Lcom/facebook/imagepipeline/f/e;->UK:Lcom/facebook/d/c;
+
+    goto :goto_2
+
+    :cond_3
+    :goto_1
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->ji()Lcom/facebook/imagepipeline/nativecode/e;
+
+    move-result-object v3
+
+    invoke-interface {v3, v2, v0}, Lcom/facebook/imagepipeline/nativecode/e;->a(Ljava/io/InputStream;Ljava/io/OutputStream;)V
+
+    sget-object v2, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
+
+    iput-object v2, v1, Lcom/facebook/imagepipeline/f/e;->UK:Lcom/facebook/d/c;
 
     :goto_2
-    invoke-virtual {v0}, Lcom/facebook/common/g/i;->fI()Lcom/facebook/common/g/f;
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->fM()Lcom/facebook/common/g/f;
 
     move-result-object v1
 
@@ -140,7 +140,7 @@
 
     invoke-direct {v2, v1}, Lcom/facebook/imagepipeline/f/e;-><init>(Lcom/facebook/common/references/CloseableReference;)V
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ax$1;->Yl:Lcom/facebook/imagepipeline/f/e;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/ax$1;->YD:Lcom/facebook/imagepipeline/f/e;
 
     invoke-virtual {v2, v3}, Lcom/facebook/imagepipeline/f/e;->c(Lcom/facebook/imagepipeline/f/e;)V
     :try_end_1
@@ -175,14 +175,14 @@
 
 
 # virtual methods
-.method public final fz()V
+.method public final fD()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$1;->Yl:Lcom/facebook/imagepipeline/f/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$1;->YD:Lcom/facebook/imagepipeline/f/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
-    invoke-super {p0}, Lcom/facebook/imagepipeline/h/aq;->fz()V
+    invoke-super {p0}, Lcom/facebook/imagepipeline/h/aq;->fD()V
 
     return-void
 .end method
@@ -195,7 +195,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ax$1;->jQ()Lcom/facebook/imagepipeline/f/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/h/ax$1;->jO()Lcom/facebook/imagepipeline/f/e;
 
     move-result-object v0
 
@@ -205,7 +205,7 @@
 .method public final onFailure(Ljava/lang/Exception;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$1;->Yl:Lcom/facebook/imagepipeline/f/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$1;->YD:Lcom/facebook/imagepipeline/f/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
@@ -219,7 +219,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/f/e;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$1;->Yl:Lcom/facebook/imagepipeline/f/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax$1;->YD:Lcom/facebook/imagepipeline/f/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ax.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ax.smali
index ccb2ad0780..1cda88aba7 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/ax.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/ax.smali
@@ -24,9 +24,9 @@
 
 
 # instance fields
-.field final QF:Lcom/facebook/common/g/g;
+.field final QX:Lcom/facebook/common/g/g;
 
-.field private final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field private final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -69,7 +69,7 @@
 
     check-cast p1, Lcom/facebook/common/g/g;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ax;->QF:Lcom/facebook/common/g/g;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ax;->QX:Lcom/facebook/common/g/g;
 
     invoke-static {p3}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -77,7 +77,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/h/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ax;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/ax;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     return-void
 .end method
@@ -97,7 +97,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/ax;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     new-instance v1, Lcom/facebook/imagepipeline/h/ax$a;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/e.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/e.smali
index 25d6edd013..8b74602aed 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/e.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/e.smali
@@ -17,6 +17,18 @@
 
 
 # virtual methods
+.method public jr()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public js()V
+    .locals 0
+
+    return-void
+.end method
+
 .method public jt()V
     .locals 0
 
@@ -28,15 +40,3 @@
 
     return-void
 .end method
-
-.method public jv()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public jw()V
-    .locals 0
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/f.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/f.smali
index f7b0c5803e..be4902edc6 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/f.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/f.smali
@@ -49,7 +49,7 @@
     return-object p1
 .end method
 
-.method protected final jx()Ljava/lang/String;
+.method protected final jv()Ljava/lang/String;
     .locals 1
 
     const-string v0, "BitmapMemoryCacheGetProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/g.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/g.smali
index dc0928ba85..833cb8aafe 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/g.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/g.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field private final Sx:Lcom/facebook/imagepipeline/cache/f;
+.field private final SQ:Lcom/facebook/imagepipeline/cache/f;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/h/ad;-><init>(Lcom/facebook/imagepipeline/h/aj;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/g;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/g;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     return-void
 .end method
@@ -38,13 +38,13 @@
 .method protected final synthetic a(Lcom/facebook/imagepipeline/h/ak;)Ljava/lang/Object;
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/g;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/g;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v1
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jo()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jm()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -52,7 +52,7 @@
 
     move-result-object v0
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jp()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/h$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/h$1.smali
index cd4b5fa3ec..90c5a4af25 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/h$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/h$1.smali
@@ -27,22 +27,22 @@
 
 
 # instance fields
-.field final synthetic Wi:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic WA:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic Wj:Z
+.field final synthetic WB:Z
 
-.field final synthetic Wk:Lcom/facebook/imagepipeline/h/h;
+.field final synthetic WC:Lcom/facebook/imagepipeline/h/h;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/h;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/cache/common/CacheKey;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/h$1;->Wk:Lcom/facebook/imagepipeline/h/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/h$1;->WC:Lcom/facebook/imagepipeline/h/h;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/h$1;->Wi:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/h$1;->WA:Lcom/facebook/cache/common/CacheKey;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/h/h$1;->Wj:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/h/h$1;->WB:Z
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
@@ -69,7 +69,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {p1, v1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
     :try_end_0
@@ -96,7 +96,7 @@
 
     const/16 v2, 0x8
 
-    invoke-static {p2, v2}, Lcom/facebook/imagepipeline/h/h$1;->o(II)Z
+    invoke-static {p2, v2}, Lcom/facebook/imagepipeline/h/h$1;->n(II)Z
 
     move-result v2
 
@@ -107,11 +107,11 @@
     :cond_2
     if-nez v0, :cond_5
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/h$1;->Wk:Lcom/facebook/imagepipeline/h/h;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/h$1;->WC:Lcom/facebook/imagepipeline/h/h;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/h/h;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/h/h;->IU:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/h$1;->Wi:Lcom/facebook/cache/common/CacheKey;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/h$1;->WA:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v2, v3}, Lcom/facebook/imagepipeline/cache/o;->M(Ljava/lang/Object;)Lcom/facebook/common/references/CloseableReference;
 
@@ -128,7 +128,7 @@
 
     check-cast v3, Lcom/facebook/imagepipeline/f/c;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/f/c;->iC()Lcom/facebook/imagepipeline/f/h;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/f/c;->iB()Lcom/facebook/imagepipeline/f/h;
 
     move-result-object v3
 
@@ -138,11 +138,11 @@
 
     check-cast v4, Lcom/facebook/imagepipeline/f/c;
 
-    invoke-virtual {v4}, Lcom/facebook/imagepipeline/f/c;->iC()Lcom/facebook/imagepipeline/f/h;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/f/c;->iB()Lcom/facebook/imagepipeline/f/h;
 
     move-result-object v4
 
-    invoke-interface {v4}, Lcom/facebook/imagepipeline/f/h;->iP()Z
+    invoke-interface {v4}, Lcom/facebook/imagepipeline/f/h;->iO()Z
 
     move-result v5
 
@@ -173,7 +173,7 @@
     :cond_4
     :goto_0
     :try_start_4
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {p1, v2, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
     :try_end_4
@@ -198,15 +198,15 @@
 
     :cond_5
     :goto_1
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/h/h$1;->Wj:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/h/h$1;->WB:Z
 
     if-eqz v2, :cond_6
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/h$1;->Wk:Lcom/facebook/imagepipeline/h/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/h$1;->WC:Lcom/facebook/imagepipeline/h/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/h/h;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/h/h;->IU:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/h$1;->Wi:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/h$1;->WA:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v1, v2, p1}, Lcom/facebook/imagepipeline/cache/o;->a(Ljava/lang/Object;Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -218,14 +218,14 @@
     if-eqz v0, :cond_7
 
     :try_start_7
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     const/high16 v2, 0x3f800000    # 1.0f
 
-    invoke-interface {v0, v2}, Lcom/facebook/imagepipeline/h/k;->n(F)V
+    invoke-interface {v0, v2}, Lcom/facebook/imagepipeline/h/k;->m(F)V
 
     :cond_7
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     if-eqz v1, :cond_8
 
@@ -255,7 +255,7 @@
 
     :cond_9
     :goto_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
     :try_end_9
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/h.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/h.smali
index a926e1c284..dfc03a118b 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/h.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/h.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field final IC:Lcom/facebook/imagepipeline/cache/o;
+.field final IU:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -30,9 +30,9 @@
     .end annotation
 .end field
 
-.field private final Sx:Lcom/facebook/imagepipeline/cache/f;
+.field private final SQ:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field private final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -64,11 +64,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/h;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/h;->IU:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/h;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/h;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/h;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/h;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     return-void
 .end method
@@ -117,7 +117,7 @@
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v0
 
@@ -125,27 +125,27 @@
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/h;->jx()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/h;->jv()Ljava/lang/String;
 
     move-result-object v2
 
     invoke-interface {v0, v1, v2}, Lcom/facebook/imagepipeline/h/am;->u(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jo()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Ljava/lang/Object;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/h/h;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/h/h;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-interface {v4, v2, v3}, Lcom/facebook/imagepipeline/cache/f;->a(Lcom/facebook/imagepipeline/request/b;Ljava/lang/Object;)Lcom/facebook/cache/common/CacheKey;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/h;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/h;->IU:Lcom/facebook/imagepipeline/cache/o;
 
     invoke-interface {v3, v2}, Lcom/facebook/imagepipeline/cache/o;->M(Ljava/lang/Object;)Lcom/facebook/common/references/CloseableReference;
 
@@ -170,21 +170,21 @@
 
     check-cast v8, Lcom/facebook/imagepipeline/f/c;
 
-    invoke-virtual {v8}, Lcom/facebook/imagepipeline/f/c;->iC()Lcom/facebook/imagepipeline/f/h;
+    invoke-virtual {v8}, Lcom/facebook/imagepipeline/f/c;->iB()Lcom/facebook/imagepipeline/f/h;
 
     move-result-object v8
 
-    invoke-interface {v8}, Lcom/facebook/imagepipeline/f/h;->iP()Z
+    invoke-interface {v8}, Lcom/facebook/imagepipeline/f/h;->iO()Z
 
     move-result v8
 
     if-eqz v8, :cond_1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/h;->jx()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/h;->jv()Ljava/lang/String;
 
     move-result-object v9
 
-    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result v10
 
@@ -204,7 +204,7 @@
     :goto_0
     invoke-interface {v0, v1, v9, v10}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/h;->jx()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/h;->jv()Ljava/lang/String;
 
     move-result-object v9
 
@@ -212,7 +212,7 @@
 
     const/high16 v9, 0x3f800000    # 1.0f
 
-    invoke-interface {p1, v9}, Lcom/facebook/imagepipeline/h/k;->n(F)V
+    invoke-interface {p1, v9}, Lcom/facebook/imagepipeline/h/k;->m(F)V
 
     :cond_1
     if-eqz v8, :cond_2
@@ -239,13 +239,13 @@
 
     :cond_3
     :try_start_2
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jp()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v3
 
     iget v3, v3, Lcom/facebook/imagepipeline/request/b$b;->mValue:I
 
-    sget-object v8, Lcom/facebook/imagepipeline/request/b$b;->YD:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v8, Lcom/facebook/imagepipeline/request/b$b;->YV:Lcom/facebook/imagepipeline/request/b$b;
 
     iget v8, v8, Lcom/facebook/imagepipeline/request/b$b;->mValue:I
     :try_end_2
@@ -256,11 +256,11 @@
     if-lt v3, v8, :cond_5
 
     :try_start_3
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/h;->jx()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/h;->jv()Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result v2
 
@@ -278,7 +278,7 @@
     :goto_2
     invoke-interface {v0, v1, p2, v2}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/h;->jx()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/h;->jv()Ljava/lang/String;
 
     move-result-object p2
 
@@ -294,21 +294,21 @@
 
     :cond_5
     :try_start_4
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v3
 
-    iget-boolean v3, v3, Lcom/facebook/imagepipeline/request/b;->WI:Z
+    iget-boolean v3, v3, Lcom/facebook/imagepipeline/request/b;->Xb:Z
 
     invoke-virtual {p0, p1, v2, v3}, Lcom/facebook/imagepipeline/h/h;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/cache/common/CacheKey;Z)Lcom/facebook/imagepipeline/h/k;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/h;->jx()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/h/h;->jv()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result v3
 
@@ -323,7 +323,7 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/h;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/h;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
@@ -343,7 +343,7 @@
     throw p1
 .end method
 
-.method protected jx()Ljava/lang/String;
+.method protected jv()Ljava/lang/String;
     .locals 1
 
     const-string v0, "BitmapMemoryCacheProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/i$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/i$a.smali
index c6ecd8e9b3..f46524ed68 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/i$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/i$a.smali
@@ -27,9 +27,9 @@
 
 
 # instance fields
-.field private final Wl:I
+.field private final WD:I
 
-.field private final Wm:I
+.field private final WE:I
 
 
 # direct methods
@@ -47,9 +47,9 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
-    iput p2, p0, Lcom/facebook/imagepipeline/h/i$a;->Wl:I
+    iput p2, p0, Lcom/facebook/imagepipeline/h/i$a;->WD:I
 
-    iput p3, p0, Lcom/facebook/imagepipeline/h/i$a;->Wm:I
+    iput p3, p0, Lcom/facebook/imagepipeline/h/i$a;->WE:I
 
     return-void
 .end method
@@ -109,11 +109,11 @@
 
     mul-int v1, v1, v2
 
-    iget v2, p0, Lcom/facebook/imagepipeline/h/i$a;->Wl:I
+    iget v2, p0, Lcom/facebook/imagepipeline/h/i$a;->WD:I
 
     if-lt v1, v2, :cond_2
 
-    iget v2, p0, Lcom/facebook/imagepipeline/h/i$a;->Wm:I
+    iget v2, p0, Lcom/facebook/imagepipeline/h/i$a;->WE:I
 
     if-gt v1, v2, :cond_2
 
@@ -121,7 +121,7 @@
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/i.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/i.smali
index bde27e8dc6..285fa7fdb3 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/i.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/i.smali
@@ -25,7 +25,13 @@
 
 
 # instance fields
-.field private final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field private final WD:I
+
+.field private final WE:I
+
+.field private final WF:Z
+
+.field private final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -36,12 +42,6 @@
     .end annotation
 .end field
 
-.field private final Wl:I
-
-.field private final Wm:I
-
-.field private final Wn:Z
-
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/imagepipeline/h/aj;IIZ)V
@@ -76,13 +76,13 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/h/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/i;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/i;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
-    iput p2, p0, Lcom/facebook/imagepipeline/h/i;->Wl:I
+    iput p2, p0, Lcom/facebook/imagepipeline/h/i;->WD:I
 
-    iput p3, p0, Lcom/facebook/imagepipeline/h/i;->Wm:I
+    iput p3, p0, Lcom/facebook/imagepipeline/h/i;->WE:I
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/h/i;->Wn:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/h/i;->WF:Z
 
     return-void
 .end method
@@ -109,24 +109,24 @@
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/i;->Wn:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/i;->WF:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/i;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/i;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/i;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/i;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     new-instance v1, Lcom/facebook/imagepipeline/h/i$a;
 
-    iget v2, p0, Lcom/facebook/imagepipeline/h/i;->Wl:I
+    iget v2, p0, Lcom/facebook/imagepipeline/h/i;->WD:I
 
-    iget v3, p0, Lcom/facebook/imagepipeline/h/i;->Wm:I
+    iget v3, p0, Lcom/facebook/imagepipeline/h/i;->WE:I
 
     invoke-direct {v1, p1, v2, v3}, Lcom/facebook/imagepipeline/h/i$a;-><init>(Lcom/facebook/imagepipeline/h/k;II)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/j$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/j$a.smali
index 1fe85764d7..beb1908f3e 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/j$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/j$a.smali
@@ -24,9 +24,9 @@
 
 
 # instance fields
-.field private Wq:Lcom/facebook/imagepipeline/h/ak;
+.field private WI:Lcom/facebook/imagepipeline/h/ak;
 
-.field final synthetic Wr:Lcom/facebook/imagepipeline/h/j;
+.field final synthetic WJ:Lcom/facebook/imagepipeline/h/j;
 
 
 # direct methods
@@ -43,11 +43,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/j$a;->Wr:Lcom/facebook/imagepipeline/h/j;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/j$a;->WJ:Lcom/facebook/imagepipeline/h/j;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/j$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/j$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     return-void
 .end method
@@ -67,9 +67,9 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/f/e;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/j$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/j$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
@@ -77,7 +77,7 @@
 
     move-result v1
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
     invoke-static {p1, v2}, Lcom/facebook/imagepipeline/h/aw;->a(Lcom/facebook/imagepipeline/f/e;Lcom/facebook/imagepipeline/a/e;)Z
 
@@ -87,7 +87,7 @@
 
     if-nez v2, :cond_0
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/request/b;->Ys:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/request/b;->YK:Z
 
     if-eqz v0, :cond_2
 
@@ -96,7 +96,7 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
@@ -105,7 +105,7 @@
     :cond_1
     and-int/lit8 p2, p2, -0x2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
@@ -117,13 +117,13 @@
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/j$a;->Wr:Lcom/facebook/imagepipeline/h/j;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/j$a;->WJ:Lcom/facebook/imagepipeline/h/j;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/h/j;->Wp:Lcom/facebook/imagepipeline/h/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/h/j;->WH:Lcom/facebook/imagepipeline/h/aj;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/j$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/j$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {p1, p2, v0}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
@@ -134,13 +134,13 @@
 .method protected final h(Ljava/lang/Throwable;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/j$a;->Wr:Lcom/facebook/imagepipeline/h/j;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/j$a;->WJ:Lcom/facebook/imagepipeline/h/j;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/h/j;->Wp:Lcom/facebook/imagepipeline/h/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/h/j;->WH:Lcom/facebook/imagepipeline/h/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/j$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/j$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {p1, v0, v1}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/j.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/j.smali
index c19b417498..27a54a12f5 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/j.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/j.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private final Wo:Lcom/facebook/imagepipeline/h/aj;
+.field private final WG:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field final Wp:Lcom/facebook/imagepipeline/h/aj;
+.field final WH:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -62,9 +62,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/j;->Wo:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/j;->WG:Lcom/facebook/imagepipeline/h/aj;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/j;->Wp:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/j;->WH:Lcom/facebook/imagepipeline/h/aj;
 
     return-void
 .end method
@@ -90,7 +90,7 @@
 
     invoke-direct {v0, p0, p1, p2, v1}, Lcom/facebook/imagepipeline/h/j$a;-><init>(Lcom/facebook/imagepipeline/h/j;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;B)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/j;->Wo:Lcom/facebook/imagepipeline/h/aj;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/j;->WG:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-interface {p1, v0, p2}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/l.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/l.smali
index 7c2761d444..9c93437057 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/l.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/l.smali
@@ -7,7 +7,7 @@
 .method public constructor <init>(Lcom/facebook/common/g/g;)V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/common/b/a;->fw()Lcom/facebook/common/b/a;
+    invoke-static {}, Lcom/facebook/common/b/a;->fA()Lcom/facebook/common/b/a;
 
     move-result-object v0
 
@@ -18,7 +18,7 @@
 
 
 # virtual methods
-.method protected final d(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
+.method protected final c(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-virtual {p1}, Landroid/net/Uri;->toString()Ljava/lang/String;
 
@@ -129,7 +129,7 @@
     return-object p1
 .end method
 
-.method protected final jx()Ljava/lang/String;
+.method protected final jv()Ljava/lang/String;
     .locals 1
 
     const-string v0, "DataFetchProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$a.smali
index 2d559b8e76..8107ba7297 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final synthetic Wt:Lcom/facebook/imagepipeline/h/m;
+.field final synthetic WL:Lcom/facebook/imagepipeline/h/m;
 
 
 # direct methods
@@ -33,7 +33,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$a;->Wt:Lcom/facebook/imagepipeline/h/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$a;->WL:Lcom/facebook/imagepipeline/h/m;
 
     invoke-direct/range {p0 .. p5}, Lcom/facebook/imagepipeline/h/m$c;-><init>(Lcom/facebook/imagepipeline/h/m;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;ZI)V
 
@@ -92,7 +92,7 @@
     return p1
 .end method
 
-.method protected final iC()Lcom/facebook/imagepipeline/f/h;
+.method protected final iB()Lcom/facebook/imagepipeline/f/h;
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$b.smali
index 1200464521..dbd170da92 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$b.smali
@@ -15,13 +15,13 @@
 
 
 # instance fields
-.field private final SS:Lcom/facebook/imagepipeline/d/e;
+.field private final Tk:Lcom/facebook/imagepipeline/d/e;
 
-.field final synthetic Wt:Lcom/facebook/imagepipeline/h/m;
+.field final synthetic WL:Lcom/facebook/imagepipeline/h/m;
 
-.field private final Wu:Lcom/facebook/imagepipeline/d/f;
+.field private final WM:Lcom/facebook/imagepipeline/d/f;
 
-.field private Wv:I
+.field private WN:I
 
 
 # direct methods
@@ -41,7 +41,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$b;->Wt:Lcom/facebook/imagepipeline/h/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$b;->WL:Lcom/facebook/imagepipeline/h/m;
 
     move-object v0, p0
 
@@ -63,7 +63,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/d/f;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$b;->Wu:Lcom/facebook/imagepipeline/d/f;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$b;->WM:Lcom/facebook/imagepipeline/d/f;
 
     invoke-static {p5}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -71,11 +71,11 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/d/e;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$b;->SS:Lcom/facebook/imagepipeline/d/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$b;->Tk:Lcom/facebook/imagepipeline/d/e;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/h/m$b;->Wv:I
+    iput p1, p0, Lcom/facebook/imagepipeline/h/m$b;->WN:I
 
     return-void
 .end method
@@ -100,7 +100,7 @@
 
     const/16 v1, 0x8
 
-    invoke-static {p2, v1}, Lcom/facebook/imagepipeline/h/m$b;->o(II)Z
+    invoke-static {p2, v1}, Lcom/facebook/imagepipeline/h/m$b;->n(II)Z
 
     move-result v1
 
@@ -109,7 +109,7 @@
     :cond_0
     const/4 v1, 0x4
 
-    invoke-static {p2, v1}, Lcom/facebook/imagepipeline/h/m$b;->o(II)Z
+    invoke-static {p2, v1}, Lcom/facebook/imagepipeline/h/m$b;->n(II)Z
 
     move-result p2
 
@@ -121,15 +121,15 @@
 
     if-eqz p2, :cond_4
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object p2
 
-    sget-object v1, Lcom/facebook/d/b;->Ps:Lcom/facebook/d/c;
+    sget-object v1, Lcom/facebook/d/b;->PK:Lcom/facebook/d/c;
 
     if-ne p2, v1, :cond_4
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/h/m$b;->Wu:Lcom/facebook/imagepipeline/d/f;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/h/m$b;->WM:Lcom/facebook/imagepipeline/d/f;
 
     invoke-virtual {p2, p1}, Lcom/facebook/imagepipeline/d/f;->a(Lcom/facebook/imagepipeline/f/e;)Z
 
@@ -147,11 +147,11 @@
 
     :cond_1
     :try_start_1
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/m$b;->Wu:Lcom/facebook/imagepipeline/d/f;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/m$b;->WM:Lcom/facebook/imagepipeline/d/f;
 
-    iget p1, p1, Lcom/facebook/imagepipeline/d/f;->Uj:I
+    iget p1, p1, Lcom/facebook/imagepipeline/d/f;->UB:I
 
-    iget v1, p0, Lcom/facebook/imagepipeline/h/m$b;->Wv:I
+    iget v1, p0, Lcom/facebook/imagepipeline/h/m$b;->WN:I
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -163,9 +163,9 @@
 
     :cond_2
     :try_start_2
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/m$b;->SS:Lcom/facebook/imagepipeline/d/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/m$b;->Tk:Lcom/facebook/imagepipeline/d/e;
 
-    iget v2, p0, Lcom/facebook/imagepipeline/h/m$b;->Wv:I
+    iget v2, p0, Lcom/facebook/imagepipeline/h/m$b;->WN:I
 
     invoke-interface {v1, v2}, Lcom/facebook/imagepipeline/d/e;->ag(I)I
 
@@ -173,9 +173,9 @@
 
     if-ge p1, v1, :cond_3
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/m$b;->Wu:Lcom/facebook/imagepipeline/d/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/m$b;->WM:Lcom/facebook/imagepipeline/d/f;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/d/f;->Ul:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/d/f;->UD:Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -187,7 +187,7 @@
 
     :cond_3
     :try_start_3
-    iput p1, p0, Lcom/facebook/imagepipeline/h/m$b;->Wv:I
+    iput p1, p0, Lcom/facebook/imagepipeline/h/m$b;->WN:I
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
@@ -207,21 +207,21 @@
 .method protected final g(Lcom/facebook/imagepipeline/f/e;)I
     .locals 0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/m$b;->Wu:Lcom/facebook/imagepipeline/d/f;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/m$b;->WM:Lcom/facebook/imagepipeline/d/f;
 
-    iget p1, p1, Lcom/facebook/imagepipeline/d/f;->Uk:I
+    iget p1, p1, Lcom/facebook/imagepipeline/d/f;->UC:I
 
     return p1
 .end method
 
-.method protected final iC()Lcom/facebook/imagepipeline/f/h;
+.method protected final iB()Lcom/facebook/imagepipeline/f/h;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$b;->SS:Lcom/facebook/imagepipeline/d/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$b;->Tk:Lcom/facebook/imagepipeline/d/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/m$b;->Wu:Lcom/facebook/imagepipeline/d/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/m$b;->WM:Lcom/facebook/imagepipeline/d/f;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/d/f;->Uj:I
+    iget v1, v1, Lcom/facebook/imagepipeline/d/f;->UB:I
 
     invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/d/e;->ah(I)Lcom/facebook/imagepipeline/f/h;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$c$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$c$1.smali
index f781ff061f..c3937e6048 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$c$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$c$1.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field final synthetic WA:Lcom/facebook/imagepipeline/h/m$c;
+.field final synthetic WP:Lcom/facebook/imagepipeline/h/m;
 
-.field final synthetic Wx:Lcom/facebook/imagepipeline/h/m;
+.field final synthetic WQ:Lcom/facebook/imagepipeline/h/ak;
 
-.field final synthetic Wy:Lcom/facebook/imagepipeline/h/ak;
+.field final synthetic WR:I
 
-.field final synthetic Wz:I
+.field final synthetic WT:Lcom/facebook/imagepipeline/h/m$c;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/m$c;Lcom/facebook/imagepipeline/h/m;Lcom/facebook/imagepipeline/h/ak;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$c$1;->WA:Lcom/facebook/imagepipeline/h/m$c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$c$1;->WT:Lcom/facebook/imagepipeline/h/m$c;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/m$c$1;->Wx:Lcom/facebook/imagepipeline/h/m;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/m$c$1;->WP:Lcom/facebook/imagepipeline/h/m;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/m$c$1;->Wy:Lcom/facebook/imagepipeline/h/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/m$c$1;->WQ:Lcom/facebook/imagepipeline/h/ak;
 
-    iput p4, p0, Lcom/facebook/imagepipeline/h/m$c$1;->Wz:I
+    iput p4, p0, Lcom/facebook/imagepipeline/h/m$c$1;->WR:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,38 +51,38 @@
 
     if-eqz p1, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c$1;->WA:Lcom/facebook/imagepipeline/h/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c$1;->WT:Lcom/facebook/imagepipeline/h/m$c;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/m$c;->Wt:Lcom/facebook/imagepipeline/h/m;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/m$c;->WL:Lcom/facebook/imagepipeline/h/m;
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/h/m;->SF:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/h/m;->SY:Z
 
     if-nez v0, :cond_0
 
     const/16 v0, 0x10
 
-    invoke-static {p2, v0}, Lcom/facebook/imagepipeline/h/b;->o(II)Z
+    invoke-static {p2, v0}, Lcom/facebook/imagepipeline/h/b;->n(II)Z
 
     move-result v0
 
     if-nez v0, :cond_2
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c$1;->Wy:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c$1;->WQ:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/m$c$1;->WA:Lcom/facebook/imagepipeline/h/m$c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/m$c$1;->WT:Lcom/facebook/imagepipeline/h/m$c;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/h/m$c;->Wt:Lcom/facebook/imagepipeline/h/m;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/h/m$c;->WL:Lcom/facebook/imagepipeline/h/m;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/h/m;->Ws:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/h/m;->WK:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-static {v1}, Lcom/facebook/common/j/f;->c(Landroid/net/Uri;)Z
 
@@ -91,20 +91,20 @@
     if-nez v1, :cond_2
 
     :cond_1
-    iget-object v1, v0, Lcom/facebook/imagepipeline/request/b;->QO:Lcom/facebook/imagepipeline/a/f;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/request/b;->Rg:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->QN:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Rf:Lcom/facebook/imagepipeline/a/e;
 
-    iget v2, p0, Lcom/facebook/imagepipeline/h/m$c$1;->Wz:I
+    iget v2, p0, Lcom/facebook/imagepipeline/h/m$c$1;->WR:I
 
     invoke-static {v1, v0, p1, v2}, Lcom/facebook/imagepipeline/j/a;->a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;Lcom/facebook/imagepipeline/f/e;I)I
 
     move-result v0
 
-    iput v0, p1, Lcom/facebook/imagepipeline/f/e;->Ut:I
+    iput v0, p1, Lcom/facebook/imagepipeline/f/e;->UL:I
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c$1;->WA:Lcom/facebook/imagepipeline/h/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c$1;->WT:Lcom/facebook/imagepipeline/h/m$c;
 
     invoke-static {v0, p1, p2}, Lcom/facebook/imagepipeline/h/m$c;->a(Lcom/facebook/imagepipeline/h/m$c;Lcom/facebook/imagepipeline/f/e;I)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$c$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$c$2.smali
index 2ab574accb..958a4271d5 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$c$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/m$c$2.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic WA:Lcom/facebook/imagepipeline/h/m$c;
+.field final synthetic WP:Lcom/facebook/imagepipeline/h/m;
 
-.field final synthetic WB:Z
+.field final synthetic WT:Lcom/facebook/imagepipeline/h/m$c;
 
-.field final synthetic Wx:Lcom/facebook/imagepipeline/h/m;
+.field final synthetic WU:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/m$c;Lcom/facebook/imagepipeline/h/m;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$c$2;->WA:Lcom/facebook/imagepipeline/h/m$c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m$c$2;->WT:Lcom/facebook/imagepipeline/h/m$c;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/m$c$2;->Wx:Lcom/facebook/imagepipeline/h/m;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/m$c$2;->WP:Lcom/facebook/imagepipeline/h/m;
 
-    iput-boolean p3, p0, Lcom/facebook/imagepipeline/h/m$c$2;->WB:Z
+    iput-boolean p3, p0, Lcom/facebook/imagepipeline/h/m$c$2;->WU:Z
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/e;-><init>()V
 
@@ -39,39 +39,39 @@
 
 
 # virtual methods
-.method public final jt()V
+.method public final jr()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/m$c$2;->WB:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/h/m$c$2;->WU:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c$2;->WA:Lcom/facebook/imagepipeline/h/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c$2;->WT:Lcom/facebook/imagepipeline/h/m$c;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/m$c;->jy()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/m$c;->jw()V
 
     :cond_0
     return-void
 .end method
 
-.method public final jv()V
+.method public final jt()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c$2;->WA:Lcom/facebook/imagepipeline/h/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c$2;->WT:Lcom/facebook/imagepipeline/h/m$c;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/m$c;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/m$c;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jr()Z
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jp()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c$2;->WA:Lcom/facebook/imagepipeline/h/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m$c$2;->WT:Lcom/facebook/imagepipeline/h/m$c;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/m$c;->Ww:Lcom/facebook/imagepipeline/h/u;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/m$c;->WO:Lcom/facebook/imagepipeline/h/u;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/u;->jA()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/u;->jy()Z
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/m.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/m.smali
index 4656857ce1..b3036201d2 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/m.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/m.smali
@@ -27,19 +27,21 @@
 
 
 # instance fields
-.field private final Ha:Lcom/facebook/common/g/a;
+.field private final Hr:Lcom/facebook/common/g/a;
 
-.field final SF:Z
+.field final SY:Z
 
-.field final SI:Lcom/facebook/imagepipeline/d/c;
+.field private final TF:I
 
-.field private final SS:Lcom/facebook/imagepipeline/d/e;
+.field final Tb:Lcom/facebook/imagepipeline/d/c;
 
-.field private final Tg:Z
+.field private final Tk:Lcom/facebook/imagepipeline/d/e;
 
-.field private final Tn:I
+.field private final Ty:Z
 
-.field private final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field final WK:Z
+
+.field private final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -49,8 +51,6 @@
     .end annotation
 .end field
 
-.field final Ws:Z
-
 .field final mExecutor:Ljava/util/concurrent/Executor;
 
 
@@ -79,7 +79,7 @@
 
     check-cast p1, Lcom/facebook/common/g/a;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m;->Ha:Lcom/facebook/common/g/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m;->Hr:Lcom/facebook/common/g/a;
 
     invoke-static {p2}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -95,7 +95,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/d/c;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m;->SI:Lcom/facebook/imagepipeline/d/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m;->Tb:Lcom/facebook/imagepipeline/d/c;
 
     invoke-static {p4}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -103,11 +103,11 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/d/e;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m;->SS:Lcom/facebook/imagepipeline/d/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m;->Tk:Lcom/facebook/imagepipeline/d/e;
 
-    iput-boolean p5, p0, Lcom/facebook/imagepipeline/h/m;->SF:Z
+    iput-boolean p5, p0, Lcom/facebook/imagepipeline/h/m;->SY:Z
 
-    iput-boolean p6, p0, Lcom/facebook/imagepipeline/h/m;->Ws:Z
+    iput-boolean p6, p0, Lcom/facebook/imagepipeline/h/m;->WK:Z
 
     invoke-static {p8}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -115,11 +115,11 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/h/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/m;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
-    iput-boolean p7, p0, Lcom/facebook/imagepipeline/h/m;->Tg:Z
+    iput-boolean p7, p0, Lcom/facebook/imagepipeline/h/m;->Ty:Z
 
-    iput p9, p0, Lcom/facebook/imagepipeline/h/m;->Tn:I
+    iput p9, p0, Lcom/facebook/imagepipeline/h/m;->TF:I
 
     return-void
 .end method
@@ -143,11 +143,11 @@
     :try_start_0
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-static {v0}, Lcom/facebook/common/j/f;->c(Landroid/net/Uri;)Z
 
@@ -157,9 +157,9 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/h/m$a;
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/h/m;->Tg:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/h/m;->Ty:Z
 
-    iget v6, p0, Lcom/facebook/imagepipeline/h/m;->Tn:I
+    iget v6, p0, Lcom/facebook/imagepipeline/h/m;->TF:I
 
     move-object v1, v0
 
@@ -176,17 +176,17 @@
     :cond_0
     new-instance v4, Lcom/facebook/imagepipeline/d/f;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m;->Ha:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/m;->Hr:Lcom/facebook/common/g/a;
 
     invoke-direct {v4, v0}, Lcom/facebook/imagepipeline/d/f;-><init>(Lcom/facebook/common/g/a;)V
 
     new-instance v8, Lcom/facebook/imagepipeline/h/m$b;
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/h/m;->SS:Lcom/facebook/imagepipeline/d/e;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/h/m;->Tk:Lcom/facebook/imagepipeline/d/e;
 
-    iget-boolean v6, p0, Lcom/facebook/imagepipeline/h/m;->Tg:Z
+    iget-boolean v6, p0, Lcom/facebook/imagepipeline/h/m;->Ty:Z
 
-    iget v7, p0, Lcom/facebook/imagepipeline/h/m;->Tn:I
+    iget v7, p0, Lcom/facebook/imagepipeline/h/m;->TF:I
 
     move-object v0, v8
 
@@ -201,7 +201,7 @@
     move-object v0, v8
 
     :goto_0
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/m;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/m;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-interface {p1, v0, p2}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
     :try_end_0
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/o$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/o$1.smali
index f51e78b964..7e59cf696e 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/o$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/o$1.smali
@@ -28,30 +28,30 @@
 
 
 # instance fields
-.field final synthetic WD:Lcom/facebook/imagepipeline/h/am;
+.field final synthetic WQ:Lcom/facebook/imagepipeline/h/ak;
 
-.field final synthetic WE:Ljava/lang/String;
+.field final synthetic WW:Lcom/facebook/imagepipeline/h/am;
 
-.field final synthetic WF:Lcom/facebook/imagepipeline/h/k;
+.field final synthetic WX:Ljava/lang/String;
 
-.field final synthetic WG:Lcom/facebook/imagepipeline/h/o;
+.field final synthetic WY:Lcom/facebook/imagepipeline/h/k;
 
-.field final synthetic Wy:Lcom/facebook/imagepipeline/h/ak;
+.field final synthetic WZ:Lcom/facebook/imagepipeline/h/o;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/o;Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/o$1;->WG:Lcom/facebook/imagepipeline/h/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/o$1;->WZ:Lcom/facebook/imagepipeline/h/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/o$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/o$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/o$1;->WE:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/o$1;->WX:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/h/o$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/h/o$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/h/o$1;->Wy:Lcom/facebook/imagepipeline/h/ak;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/h/o$1;->WQ:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -110,15 +110,15 @@
 
     if-eqz v0, :cond_2
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/o$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/o$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WX:Ljava/lang/String;
 
     invoke-interface {p1, v0, v4, v3}, Lcom/facebook/imagepipeline/h/am;->b(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/o$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/o$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/k;->fz()V
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/k;->fD()V
 
     goto :goto_2
 
@@ -129,9 +129,9 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/o$1;->WE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/o$1;->WX:Ljava/lang/String;
 
     invoke-virtual {p1}, La/h;->x()Ljava/lang/Exception;
 
@@ -139,13 +139,13 @@
 
     invoke-interface {v0, v1, v4, p1, v3}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/o$1;->WG:Lcom/facebook/imagepipeline/h/o;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/o$1;->WZ:Lcom/facebook/imagepipeline/h/o;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/h/o;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/h/o;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/o$1;->Wy:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/o$1;->WQ:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {p1, v0, v1}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
@@ -160,9 +160,9 @@
 
     if-eqz p1, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/o$1;->WE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/o$1;->WX:Ljava/lang/String;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->getSize()I
 
@@ -174,19 +174,19 @@
 
     invoke-interface {v0, v1, v4, v5}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/o$1;->WE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/o$1;->WX:Ljava/lang/String;
 
     invoke-interface {v0, v1, v4, v2}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
     const/high16 v1, 0x3f800000    # 1.0f
 
-    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/k;->n(F)V
+    invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/k;->m(F)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, v2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
@@ -195,9 +195,9 @@
     goto :goto_2
 
     :cond_4
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/o$1;->WD:Lcom/facebook/imagepipeline/h/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/o$1;->WW:Lcom/facebook/imagepipeline/h/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WX:Ljava/lang/String;
 
     invoke-static {p1, v0, v1, v1}, Lcom/facebook/imagepipeline/h/o;->a(Lcom/facebook/imagepipeline/h/am;Ljava/lang/String;ZI)Ljava/util/Map;
 
@@ -205,13 +205,13 @@
 
     invoke-interface {p1, v0, v4, v1}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/o$1;->WG:Lcom/facebook/imagepipeline/h/o;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/o$1;->WZ:Lcom/facebook/imagepipeline/h/o;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/h/o;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/h/o;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WF:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$1;->WY:Lcom/facebook/imagepipeline/h/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/o$1;->Wy:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/o$1;->WQ:Lcom/facebook/imagepipeline/h/ak;
 
     invoke-interface {p1, v0, v1}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/o$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/o$2.smali
index c1c30b92cf..489562e2ba 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/o$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/o$2.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic Ra:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic Rs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic WG:Lcom/facebook/imagepipeline/h/o;
+.field final synthetic WZ:Lcom/facebook/imagepipeline/h/o;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/o;Ljava/util/concurrent/atomic/AtomicBoolean;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/o$2;->WG:Lcom/facebook/imagepipeline/h/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/o$2;->WZ:Lcom/facebook/imagepipeline/h/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/o$2;->Ra:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/o$2;->Rs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final jt()V
+.method public final jr()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$2;->Ra:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/o$2;->Rs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/p$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/p$a.smali
index d090f3ddac..91ad853667 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/p$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/p$a.smali
@@ -24,13 +24,13 @@
 
 
 # instance fields
-.field private final Sw:Lcom/facebook/imagepipeline/cache/e;
+.field private final SO:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Sx:Lcom/facebook/imagepipeline/cache/f;
+.field private final SQ:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final TJ:Lcom/facebook/imagepipeline/cache/e;
+.field private final Ub:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Wq:Lcom/facebook/imagepipeline/h/ak;
+.field private final WI:Lcom/facebook/imagepipeline/h/ak;
 
 
 # direct methods
@@ -52,13 +52,13 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/p$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/p$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/p$a;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/p$a;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/h/p$a;->Sw:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/h/p$a;->SO:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/h/p$a;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/h/p$a;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     return-void
 .end method
@@ -92,48 +92,48 @@
 
     if-nez v0, :cond_2
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object v1, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
     if-ne v0, v1, :cond_0
 
     goto :goto_1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/p$a;->Wq:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/p$a;->WI:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/p$a;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/p$a;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-interface {v1, v0}, Lcom/facebook/imagepipeline/cache/f;->a(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/cache/common/CacheKey;
 
     move-result-object v1
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Yo:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->YG:Lcom/facebook/imagepipeline/request/b$a;
 
-    sget-object v2, Lcom/facebook/imagepipeline/request/b$a;->Yx:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v2, Lcom/facebook/imagepipeline/request/b$a;->YP:Lcom/facebook/imagepipeline/request/b$a;
 
     if-ne v0, v2, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/p$a;->Sw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/p$a;->SO:Lcom/facebook/imagepipeline/cache/e;
 
     invoke-virtual {v0, v1, p1}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)V
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/p$a;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/p$a;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
     invoke-virtual {v0, v1, p1}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/f/e;)V
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
@@ -141,7 +141,7 @@
 
     :cond_2
     :goto_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/p.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/p.smali
index c33846bedb..fc2e454b74 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/p.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/p.smali
@@ -24,13 +24,13 @@
 
 
 # instance fields
-.field private final Sw:Lcom/facebook/imagepipeline/cache/e;
+.field private final SO:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Sx:Lcom/facebook/imagepipeline/cache/f;
+.field private final SQ:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final TJ:Lcom/facebook/imagepipeline/cache/e;
+.field private final Ub:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field private final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -58,13 +58,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/p;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/p;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/p;->Sw:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/p;->SO:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/p;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/p;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/h/p;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/h/p;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     return-void
 .end method
@@ -84,13 +84,13 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jp()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v0
 
     iget v0, v0, Lcom/facebook/imagepipeline/request/b$b;->mValue:I
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YB:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YT:Lcom/facebook/imagepipeline/request/b$b;
 
     iget v1, v1, Lcom/facebook/imagepipeline/request/b$b;->mValue:I
 
@@ -105,21 +105,21 @@
     return-void
 
     :cond_0
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/request/b;->Yu:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/request/b;->YM:Z
 
     if-eqz v0, :cond_1
 
     new-instance v0, Lcom/facebook/imagepipeline/h/p$a;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/h/p;->TJ:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/h/p;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/h/p;->Sw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/h/p;->SO:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/h/p;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/h/p;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     const/4 v7, 0x0
 
@@ -134,7 +134,7 @@
     move-object p1, v0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/p;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/p;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/q.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/q.smali
index 915a7bd082..1516ebf740 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/q.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/q.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final Sx:Lcom/facebook/imagepipeline/cache/f;
+.field private final SQ:Lcom/facebook/imagepipeline/cache/f;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/h/ad;-><init>(Lcom/facebook/imagepipeline/h/aj;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/q;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/q;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     return-void
 .end method
@@ -37,9 +37,9 @@
 .method protected final synthetic a(Lcom/facebook/imagepipeline/h/ak;)Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/q;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/q;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v1
 
@@ -47,7 +47,7 @@
 
     move-result-object v0
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jp()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/r$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/r$a.smali
index 7eb273db80..0ec7cecd5a 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/r$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/r$a.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private final IC:Lcom/facebook/imagepipeline/cache/o;
+.field private final IU:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -35,9 +35,9 @@
     .end annotation
 .end field
 
-.field private final WH:Lcom/facebook/cache/common/CacheKey;
+.field private final Xa:Lcom/facebook/cache/common/CacheKey;
 
-.field private final WI:Z
+.field private final Xb:Z
 
 
 # direct methods
@@ -60,11 +60,11 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/h/n;-><init>(Lcom/facebook/imagepipeline/h/k;)V
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/r$a;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/r$a;->IU:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/r$a;->WH:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/r$a;->Xa:Lcom/facebook/cache/common/CacheKey;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/h/r$a;->WI:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/h/r$a;->Xb:Z
 
     return-void
 .end method
@@ -93,18 +93,18 @@
 
     if-nez v0, :cond_3
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iG()Lcom/facebook/d/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/f/e;->iF()Lcom/facebook/d/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/d/c;->PD:Lcom/facebook/d/c;
+    sget-object v1, Lcom/facebook/d/c;->PV:Lcom/facebook/d/c;
 
     if-ne v0, v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/f/e;->Uq:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/f/e;->UI:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -117,13 +117,13 @@
     const/4 v1, 0x0
 
     :try_start_1
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/h/r$a;->WI:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/h/r$a;->Xb:Z
 
     if-eqz v2, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/r$a;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/r$a;->IU:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/r$a;->WH:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/r$a;->Xa:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v1, v2, v0}, Lcom/facebook/imagepipeline/cache/o;->a(Ljava/lang/Object;Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -154,13 +154,13 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_3
 
     :try_start_5
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     const/high16 v1, 0x3f800000    # 1.0f
 
-    invoke-interface {p1, v1}, Lcom/facebook/imagepipeline/h/k;->n(F)V
+    invoke-interface {p1, v1}, Lcom/facebook/imagepipeline/h/k;->m(F)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {p1, v0, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
     :try_end_5
@@ -198,7 +198,7 @@
     throw p1
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
     :try_end_7
@@ -211,7 +211,7 @@
     :cond_3
     :goto_0
     :try_start_8
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WC:Lcom/facebook/imagepipeline/h/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/n;->WV:Lcom/facebook/imagepipeline/h/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
     :try_end_8
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/r.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/r.smali
index a690e1f8e5..6cb3a50a47 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/r.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/r.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private final IC:Lcom/facebook/imagepipeline/cache/o;
+.field private final IU:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -35,9 +35,9 @@
     .end annotation
 .end field
 
-.field private final Sx:Lcom/facebook/imagepipeline/cache/f;
+.field private final SQ:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Wb:Lcom/facebook/imagepipeline/h/aj;
+.field private final Wt:Lcom/facebook/imagepipeline/h/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/h/aj<",
@@ -67,11 +67,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/r;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/r;->IU:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/r;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/r;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/r;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/r;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     return-void
 .end method
@@ -100,23 +100,23 @@
 
     move-result-object v1
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/h/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jl()Lcom/facebook/imagepipeline/h/am;
 
     move-result-object v2
 
     invoke-interface {v2, v1, v0}, Lcom/facebook/imagepipeline/h/am;->u(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/h/r;->Sx:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/h/r;->SQ:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-interface {v4, v3}, Lcom/facebook/imagepipeline/cache/f;->a(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/cache/common/CacheKey;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/h/r;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/h/r;->IU:Lcom/facebook/imagepipeline/cache/o;
 
     invoke-interface {v4, v3}, Lcom/facebook/imagepipeline/cache/o;->M(Ljava/lang/Object;)Lcom/facebook/common/references/CloseableReference;
 
@@ -140,7 +140,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    invoke-interface {v2, v1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {v2, v1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result v3
 
@@ -159,7 +159,7 @@
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    invoke-interface {p1, v0}, Lcom/facebook/imagepipeline/h/k;->n(F)V
+    invoke-interface {p1, v0}, Lcom/facebook/imagepipeline/h/k;->m(F)V
 
     invoke-interface {p1, p2, v5}, Lcom/facebook/imagepipeline/h/k;->b(Ljava/lang/Object;I)V
     :try_end_2
@@ -188,13 +188,13 @@
     throw p1
 
     :cond_1
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jp()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jn()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v8
 
     iget v8, v8, Lcom/facebook/imagepipeline/request/b$b;->mValue:I
 
-    sget-object v9, Lcom/facebook/imagepipeline/request/b$b;->YC:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v9, Lcom/facebook/imagepipeline/request/b$b;->YU:Lcom/facebook/imagepipeline/request/b$b;
 
     iget v9, v9, Lcom/facebook/imagepipeline/request/b$b;->mValue:I
     :try_end_5
@@ -205,7 +205,7 @@
     if-lt v8, v9, :cond_3
 
     :try_start_6
-    invoke-interface {v2, v1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {v2, v1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result p2
 
@@ -242,19 +242,19 @@
 
     :cond_3
     :try_start_8
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v5
 
-    iget-boolean v5, v5, Lcom/facebook/imagepipeline/request/b;->WI:Z
+    iget-boolean v5, v5, Lcom/facebook/imagepipeline/request/b;->Xb:Z
 
     new-instance v8, Lcom/facebook/imagepipeline/h/r$a;
 
-    iget-object v9, p0, Lcom/facebook/imagepipeline/h/r;->IC:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v9, p0, Lcom/facebook/imagepipeline/h/r;->IU:Lcom/facebook/imagepipeline/cache/o;
 
     invoke-direct {v8, p1, v9, v3, v5}, Lcom/facebook/imagepipeline/h/r$a;-><init>(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/cache/common/CacheKey;Z)V
 
-    invoke-interface {v2, v1}, Lcom/facebook/imagepipeline/h/am;->aB(Ljava/lang/String;)Z
+    invoke-interface {v2, v1}, Lcom/facebook/imagepipeline/h/am;->aw(Ljava/lang/String;)Z
 
     move-result p1
 
@@ -267,7 +267,7 @@
     :cond_4
     invoke-interface {v2, v1, v0, v7}, Lcom/facebook/imagepipeline/h/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/r;->Wb:Lcom/facebook/imagepipeline/h/aj;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/r;->Wt:Lcom/facebook/imagepipeline/h/aj;
 
     invoke-interface {p1, v8, p2}, Lcom/facebook/imagepipeline/h/aj;->a(Lcom/facebook/imagepipeline/h/k;Lcom/facebook/imagepipeline/h/ak;)V
     :try_end_8
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/t$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/t$1.smali
index 102e0e7fa2..95fbd498fe 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/t$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/t$1.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic WN:Lcom/facebook/imagepipeline/h/s;
+.field final synthetic Xg:Lcom/facebook/imagepipeline/h/s;
 
-.field final synthetic WO:Lcom/facebook/imagepipeline/h/af$a;
+.field final synthetic Xh:Lcom/facebook/imagepipeline/h/af$a;
 
-.field final synthetic WP:Lcom/facebook/imagepipeline/h/t;
+.field final synthetic Xi:Lcom/facebook/imagepipeline/h/t;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/t;Lcom/facebook/imagepipeline/h/s;Lcom/facebook/imagepipeline/h/af$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/t$1;->WP:Lcom/facebook/imagepipeline/h/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/t$1;->Xi:Lcom/facebook/imagepipeline/h/t;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/t$1;->WN:Lcom/facebook/imagepipeline/h/s;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/t$1;->Xg:Lcom/facebook/imagepipeline/h/s;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/t$1;->WO:Lcom/facebook/imagepipeline/h/af$a;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/t$1;->Xh:Lcom/facebook/imagepipeline/h/af$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,22 +45,22 @@
 .method public final run()V
     .locals 12
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/t$1;->WP:Lcom/facebook/imagepipeline/h/t;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/t$1;->Xi:Lcom/facebook/imagepipeline/h/t;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/t$1;->WN:Lcom/facebook/imagepipeline/h/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/t$1;->Xg:Lcom/facebook/imagepipeline/h/s;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/t$1;->WO:Lcom/facebook/imagepipeline/h/af$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/t$1;->Xh:Lcom/facebook/imagepipeline/h/af$a;
 
     const/4 v3, 0x0
 
     :try_start_0
-    iget-object v1, v1, Lcom/facebook/imagepipeline/h/s;->WJ:Lcom/facebook/imagepipeline/h/ak;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/h/s;->Xc:Lcom/facebook/imagepipeline/h/ak;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/h/ak;->jm()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/h/ak;->jk()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     const/4 v4, 0x5
 
@@ -75,7 +75,7 @@
 
     check-cast v5, Ljava/net/HttpURLConnection;
 
-    iget v6, v0, Lcom/facebook/imagepipeline/h/t;->Tb:I
+    iget v6, v0, Lcom/facebook/imagepipeline/h/t;->Tt:I
 
     invoke-virtual {v5, v6}, Ljava/net/HttpURLConnection;->setConnectTimeout(I)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/t$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/t$2.smali
index 1ac60716d4..6c62ab76e6 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/t$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/t$2.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic WO:Lcom/facebook/imagepipeline/h/af$a;
+.field final synthetic Xh:Lcom/facebook/imagepipeline/h/af$a;
 
-.field final synthetic WP:Lcom/facebook/imagepipeline/h/t;
+.field final synthetic Xi:Lcom/facebook/imagepipeline/h/t;
 
-.field final synthetic WQ:Ljava/util/concurrent/Future;
+.field final synthetic Xj:Ljava/util/concurrent/Future;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/t;Ljava/util/concurrent/Future;Lcom/facebook/imagepipeline/h/af$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/t$2;->WP:Lcom/facebook/imagepipeline/h/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/t$2;->Xi:Lcom/facebook/imagepipeline/h/t;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/t$2;->WQ:Ljava/util/concurrent/Future;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/t$2;->Xj:Ljava/util/concurrent/Future;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/t$2;->WO:Lcom/facebook/imagepipeline/h/af$a;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/t$2;->Xh:Lcom/facebook/imagepipeline/h/af$a;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/e;-><init>()V
 
@@ -39,10 +39,10 @@
 
 
 # virtual methods
-.method public final jt()V
+.method public final jr()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/t$2;->WQ:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/t$2;->Xj:Ljava/util/concurrent/Future;
 
     const/4 v1, 0x0
 
@@ -52,9 +52,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/t$2;->WO:Lcom/facebook/imagepipeline/h/af$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/t$2;->Xh:Lcom/facebook/imagepipeline/h/af$a;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/af$a;->fz()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/h/af$a;->fD()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/t.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/t.smali
index 2c71ca2ef0..76f19530aa 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/t.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/t.smali
@@ -14,9 +14,9 @@
 
 
 # instance fields
-.field private final Ou:Ljava/util/concurrent/ExecutorService;
+.field private final ON:Ljava/util/concurrent/ExecutorService;
 
-.field Tb:I
+.field Tt:I
 
 
 # direct methods
@@ -45,7 +45,7 @@
 
     invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/h/t;-><init>(Ljava/util/concurrent/ExecutorService;)V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/h/t;->Tb:I
+    iput p1, p0, Lcom/facebook/imagepipeline/h/t;->Tt:I
 
     return-void
 .end method
@@ -55,7 +55,7 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/c;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/t;->Ou:Ljava/util/concurrent/ExecutorService;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/t;->ON:Ljava/util/concurrent/ExecutorService;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 .method public final a(Lcom/facebook/imagepipeline/h/s;Lcom/facebook/imagepipeline/h/af$a;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/t;->Ou:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/t;->ON:Ljava/util/concurrent/ExecutorService;
 
     new-instance v1, Lcom/facebook/imagepipeline/h/t$1;
 
@@ -89,7 +89,7 @@
 
     move-result-object v0
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/h/s;->WJ:Lcom/facebook/imagepipeline/h/ak;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/h/s;->Xc:Lcom/facebook/imagepipeline/h/ak;
 
     new-instance v1, Lcom/facebook/imagepipeline/h/t$2;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$1.smali
index caacc78b1a..16d37097b6 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Xa:Lcom/facebook/imagepipeline/h/u;
+.field final synthetic Xs:Lcom/facebook/imagepipeline/h/u;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/u;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/u$1;->Xa:Lcom/facebook/imagepipeline/h/u;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/u$1;->Xs:Lcom/facebook/imagepipeline/h/u;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/u$1;->Xa:Lcom/facebook/imagepipeline/h/u;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/u$1;->Xs:Lcom/facebook/imagepipeline/h/u;
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 
@@ -48,7 +48,7 @@
     :try_start_0
     iget-object v3, v0, Lcom/facebook/imagepipeline/h/u;->mEncodedImage:Lcom/facebook/imagepipeline/f/e;
 
-    iget v4, v0, Lcom/facebook/imagepipeline/h/u;->WW:I
+    iget v4, v0, Lcom/facebook/imagepipeline/h/u;->Xo:I
 
     const/4 v5, 0x0
 
@@ -56,13 +56,13 @@
 
     const/4 v5, 0x0
 
-    iput v5, v0, Lcom/facebook/imagepipeline/h/u;->WW:I
+    iput v5, v0, Lcom/facebook/imagepipeline/h/u;->Xo:I
 
-    sget v5, Lcom/facebook/imagepipeline/h/u$c;->Xf:I
+    sget v5, Lcom/facebook/imagepipeline/h/u$c;->Xx:I
 
-    iput v5, v0, Lcom/facebook/imagepipeline/h/u;->WX:I
+    iput v5, v0, Lcom/facebook/imagepipeline/h/u;->Xp:I
 
-    iput-wide v1, v0, Lcom/facebook/imagepipeline/h/u;->WZ:J
+    iput-wide v1, v0, Lcom/facebook/imagepipeline/h/u;->Xr:J
 
     monitor-exit v0
     :try_end_0
@@ -75,7 +75,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/h/u;->WR:Lcom/facebook/imagepipeline/h/u$a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/h/u;->Xk:Lcom/facebook/imagepipeline/h/u$a;
 
     invoke-interface {v1, v3, v4}, Lcom/facebook/imagepipeline/h/u$a;->b(Lcom/facebook/imagepipeline/f/e;I)V
     :try_end_1
@@ -84,7 +84,7 @@
     :cond_0
     invoke-static {v3}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/u;->jB()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/u;->jz()V
 
     return-void
 
@@ -93,7 +93,7 @@
 
     invoke-static {v3}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)V
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/u;->jB()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/u;->jz()V
 
     throw v1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$2.smali
index 7a60d8c078..b101ae21d3 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Xa:Lcom/facebook/imagepipeline/h/u;
+.field final synthetic Xs:Lcom/facebook/imagepipeline/h/u;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/u;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/u$2;->Xa:Lcom/facebook/imagepipeline/h/u;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/u$2;->Xs:Lcom/facebook/imagepipeline/h/u;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,11 +37,11 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/u$2;->Xa:Lcom/facebook/imagepipeline/h/u;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/u$2;->Xs:Lcom/facebook/imagepipeline/h/u;
 
     iget-object v1, v0, Lcom/facebook/imagepipeline/h/u;->mExecutor:Ljava/util/concurrent/Executor;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/h/u;->WT:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/h/u;->Xl:Ljava/lang/Runnable;
 
     invoke-interface {v1, v0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$3.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$3.smali
index 1e839e2001..0d46b32b42 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$3.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$3.smali
@@ -15,14 +15,14 @@
 
 
 # static fields
-.field static final synthetic Xb:[I
+.field static final synthetic Xt:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/facebook/imagepipeline/h/u$c;->jE()[I
+    invoke-static {}, Lcom/facebook/imagepipeline/h/u$c;->jC()[I
 
     move-result-object v0
 
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/imagepipeline/h/u$3;->Xb:[I
+    sput-object v0, Lcom/facebook/imagepipeline/h/u$3;->Xt:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/h/u$3;->Xb:[I
+    sget-object v1, Lcom/facebook/imagepipeline/h/u$3;->Xt:[I
 
-    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xd:I
+    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xv:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/facebook/imagepipeline/h/u$3;->Xb:[I
+    sget-object v1, Lcom/facebook/imagepipeline/h/u$3;->Xt:[I
 
-    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xe:I
+    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xw:I
 
     sub-int/2addr v2, v0
 
@@ -61,9 +61,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lcom/facebook/imagepipeline/h/u$3;->Xb:[I
+    sget-object v1, Lcom/facebook/imagepipeline/h/u$3;->Xt:[I
 
-    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xf:I
+    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xx:I
 
     sub-int/2addr v2, v0
 
@@ -75,9 +75,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v1, Lcom/facebook/imagepipeline/h/u$3;->Xb:[I
+    sget-object v1, Lcom/facebook/imagepipeline/h/u$3;->Xt:[I
 
-    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xg:I
+    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xy:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$b.smali
index d55dc87d4e..59943e05d4 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$b.smali
@@ -15,14 +15,14 @@
 
 
 # static fields
-.field private static Xc:Ljava/util/concurrent/ScheduledExecutorService;
+.field private static Xu:Ljava/util/concurrent/ScheduledExecutorService;
 
 
 # direct methods
-.method static jD()Ljava/util/concurrent/ScheduledExecutorService;
+.method static jB()Ljava/util/concurrent/ScheduledExecutorService;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/h/u$b;->Xc:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Lcom/facebook/imagepipeline/h/u$b;->Xu:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-nez v0, :cond_0
 
@@ -30,10 +30,10 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/h/u$b;->Xc:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v0, Lcom/facebook/imagepipeline/h/u$b;->Xu:Ljava/util/concurrent/ScheduledExecutorService;
 
     :cond_0
-    sget-object v0, Lcom/facebook/imagepipeline/h/u$b;->Xc:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Lcom/facebook/imagepipeline/h/u$b;->Xu:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$c.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$c.smali
index ab7d6b3250..22706781f4 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$c.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/u$c.smali
@@ -23,15 +23,15 @@
 
 
 # static fields
-.field public static final Xd:I = 0x1
+.field public static final Xv:I = 0x1
 
-.field public static final Xe:I = 0x2
+.field public static final Xw:I = 0x2
 
-.field public static final Xf:I = 0x3
+.field public static final Xx:I = 0x3
 
-.field public static final Xg:I = 0x4
+.field public static final Xy:I = 0x4
 
-.field private static final synthetic Xh:[I
+.field private static final synthetic Xz:[I
 
 
 # direct methods
@@ -42,39 +42,39 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/imagepipeline/h/u$c;->Xd:I
+    sget v1, Lcom/facebook/imagepipeline/h/u$c;->Xv:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/h/u$c;->Xe:I
+    sget v1, Lcom/facebook/imagepipeline/h/u$c;->Xw:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/h/u$c;->Xf:I
+    sget v1, Lcom/facebook/imagepipeline/h/u$c;->Xx:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/h/u$c;->Xg:I
+    sget v1, Lcom/facebook/imagepipeline/h/u$c;->Xy:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/h/u$c;->Xh:[I
+    sput-object v0, Lcom/facebook/imagepipeline/h/u$c;->Xz:[I
 
     return-void
 .end method
 
-.method public static jE()[I
+.method public static jC()[I
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/h/u$c;->Xh:[I
+    sget-object v0, Lcom/facebook/imagepipeline/h/u$c;->Xz:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/u.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/u.smali
index f4a563856e..640e24553f 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/u.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/u.smali
@@ -14,21 +14,21 @@
 
 
 # instance fields
-.field final WR:Lcom/facebook/imagepipeline/h/u$a;
+.field final Xk:Lcom/facebook/imagepipeline/h/u$a;
 
-.field final WT:Ljava/lang/Runnable;
+.field final Xl:Ljava/lang/Runnable;
 
-.field private final WU:Ljava/lang/Runnable;
+.field private final Xm:Ljava/lang/Runnable;
 
-.field private final WV:I
+.field private final Xn:I
 
-.field WW:I
+.field Xo:I
 
-.field WX:I
+.field Xp:I
 
-.field WY:J
+.field Xq:J
 
-.field WZ:J
+.field Xr:J
 
 .field mEncodedImage:Lcom/facebook/imagepipeline/f/e;
 
@@ -43,21 +43,21 @@
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/h/u;->mExecutor:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/u;->WR:Lcom/facebook/imagepipeline/h/u$a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/u;->Xk:Lcom/facebook/imagepipeline/h/u$a;
 
-    iput p3, p0, Lcom/facebook/imagepipeline/h/u;->WV:I
+    iput p3, p0, Lcom/facebook/imagepipeline/h/u;->Xn:I
 
     new-instance p1, Lcom/facebook/imagepipeline/h/u$1;
 
     invoke-direct {p1, p0}, Lcom/facebook/imagepipeline/h/u$1;-><init>(Lcom/facebook/imagepipeline/h/u;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/u;->WT:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/u;->Xl:Ljava/lang/Runnable;
 
     new-instance p1, Lcom/facebook/imagepipeline/h/u$2;
 
     invoke-direct {p1, p0}, Lcom/facebook/imagepipeline/h/u$2;-><init>(Lcom/facebook/imagepipeline/h/u;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/u;->WU:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/u;->Xm:Ljava/lang/Runnable;
 
     const/4 p1, 0x0
 
@@ -65,17 +65,17 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/h/u;->WW:I
+    iput p1, p0, Lcom/facebook/imagepipeline/h/u;->Xo:I
 
-    sget p1, Lcom/facebook/imagepipeline/h/u$c;->Xd:I
+    sget p1, Lcom/facebook/imagepipeline/h/u$c;->Xv:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/h/u;->WX:I
+    iput p1, p0, Lcom/facebook/imagepipeline/h/u;->Xp:I
 
     const-wide/16 p1, 0x0
 
-    iput-wide p1, p0, Lcom/facebook/imagepipeline/h/u;->WY:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/h/u;->Xq:J
 
-    iput-wide p1, p0, Lcom/facebook/imagepipeline/h/u;->WZ:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/h/u;->Xr:J
 
     return-void
 .end method
@@ -91,7 +91,7 @@
 
     const/4 v0, 0x4
 
-    invoke-static {p1, v0}, Lcom/facebook/imagepipeline/h/b;->o(II)Z
+    invoke-static {p1, v0}, Lcom/facebook/imagepipeline/h/b;->n(II)Z
 
     move-result p1
 
@@ -126,11 +126,11 @@
 
     if-lez v2, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/h/u$b;->jD()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-static {}, Lcom/facebook/imagepipeline/h/u$b;->jB()Ljava/util/concurrent/ScheduledExecutorService;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/u;->WU:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/u;->Xm:Ljava/lang/Runnable;
 
     sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -139,7 +139,7 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/imagepipeline/h/u;->WU:Ljava/lang/Runnable;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/h/u;->Xm:Ljava/lang/Runnable;
 
     invoke-interface {p1}, Ljava/lang/Runnable;->run()V
 
@@ -173,7 +173,7 @@
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/h/u;->mEncodedImage:Lcom/facebook/imagepipeline/f/e;
 
-    iput p2, p0, Lcom/facebook/imagepipeline/h/u;->WW:I
+    iput p2, p0, Lcom/facebook/imagepipeline/h/u;->Xo:I
 
     monitor-exit p0
     :try_end_0
@@ -196,7 +196,68 @@
     throw p1
 .end method
 
-.method public final jA()Z
+.method public final declared-synchronized jA()J
+    .locals 4
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/h/u;->Xr:J
+
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/h/u;->Xq:J
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    sub-long/2addr v0, v2
+
+    monitor-exit p0
+
+    return-wide v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public final jx()V
+    .locals 2
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/u;->mEncodedImage:Lcom/facebook/imagepipeline/f/e;
+
+    const/4 v1, 0x0
+
+    iput-object v1, p0, Lcom/facebook/imagepipeline/h/u;->mEncodedImage:Lcom/facebook/imagepipeline/f/e;
+
+    const/4 v1, 0x0
+
+    iput v1, p0, Lcom/facebook/imagepipeline/h/u;->Xo:I
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-static {v0}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)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 final jy()Z
     .locals 8
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
@@ -208,7 +269,7 @@
     :try_start_0
     iget-object v2, p0, Lcom/facebook/imagepipeline/h/u;->mEncodedImage:Lcom/facebook/imagepipeline/f/e;
 
-    iget v3, p0, Lcom/facebook/imagepipeline/h/u;->WW:I
+    iget v3, p0, Lcom/facebook/imagepipeline/h/u;->Xo:I
 
     invoke-static {v2, v3}, Lcom/facebook/imagepipeline/h/u;->d(Lcom/facebook/imagepipeline/f/e;I)Z
 
@@ -223,9 +284,9 @@
     return v3
 
     :cond_0
-    sget-object v2, Lcom/facebook/imagepipeline/h/u$3;->Xb:[I
+    sget-object v2, Lcom/facebook/imagepipeline/h/u$3;->Xt:[I
 
-    iget v4, p0, Lcom/facebook/imagepipeline/h/u;->WX:I
+    iget v4, p0, Lcom/facebook/imagepipeline/h/u;->Xp:I
 
     const/4 v5, 0x1
 
@@ -246,9 +307,9 @@
     goto :goto_0
 
     :cond_1
-    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xg:I
+    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xy:I
 
-    iput v2, p0, Lcom/facebook/imagepipeline/h/u;->WX:I
+    iput v2, p0, Lcom/facebook/imagepipeline/h/u;->Xp:I
 
     :cond_2
     :goto_0
@@ -257,9 +318,9 @@
     goto :goto_1
 
     :cond_3
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/h/u;->WZ:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/h/u;->Xr:J
 
-    iget v4, p0, Lcom/facebook/imagepipeline/h/u;->WV:I
+    iget v4, p0, Lcom/facebook/imagepipeline/h/u;->Xn:I
 
     int-to-long v6, v4
 
@@ -269,11 +330,11 @@
 
     move-result-wide v6
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/h/u;->WY:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/h/u;->Xq:J
 
-    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xe:I
+    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xw:I
 
-    iput v2, p0, Lcom/facebook/imagepipeline/h/u;->WX:I
+    iput v2, p0, Lcom/facebook/imagepipeline/h/u;->Xp:I
 
     const/4 v3, 0x1
 
@@ -302,7 +363,7 @@
     throw v0
 .end method
 
-.method final jB()V
+.method final jz()V
     .locals 6
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
@@ -312,15 +373,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget v2, p0, Lcom/facebook/imagepipeline/h/u;->WX:I
+    iget v2, p0, Lcom/facebook/imagepipeline/h/u;->Xp:I
 
-    sget v3, Lcom/facebook/imagepipeline/h/u$c;->Xg:I
+    sget v3, Lcom/facebook/imagepipeline/h/u$c;->Xy:I
 
     if-ne v2, v3, :cond_0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/h/u;->WZ:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/h/u;->Xr:J
 
-    iget v4, p0, Lcom/facebook/imagepipeline/h/u;->WV:I
+    iget v4, p0, Lcom/facebook/imagepipeline/h/u;->Xn:I
 
     int-to-long v4, v4
 
@@ -332,18 +393,18 @@
 
     const/4 v4, 0x1
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/h/u;->WY:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/h/u;->Xq:J
 
-    sget v5, Lcom/facebook/imagepipeline/h/u$c;->Xe:I
+    sget v5, Lcom/facebook/imagepipeline/h/u$c;->Xw:I
 
-    iput v5, p0, Lcom/facebook/imagepipeline/h/u;->WX:I
+    iput v5, p0, Lcom/facebook/imagepipeline/h/u;->Xp:I
 
     goto :goto_0
 
     :cond_0
-    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xd:I
+    sget v2, Lcom/facebook/imagepipeline/h/u$c;->Xv:I
 
-    iput v2, p0, Lcom/facebook/imagepipeline/h/u;->WX:I
+    iput v2, p0, Lcom/facebook/imagepipeline/h/u;->Xp:I
 
     const-wide/16 v2, 0x0
 
@@ -373,64 +434,3 @@
 
     throw v0
 .end method
-
-.method public final declared-synchronized jC()J
-    .locals 4
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/h/u;->WZ:J
-
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/h/u;->WY:J
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    sub-long/2addr v0, v2
-
-    monitor-exit p0
-
-    return-wide v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public final jz()V
-    .locals 2
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/u;->mEncodedImage:Lcom/facebook/imagepipeline/f/e;
-
-    const/4 v1, 0x0
-
-    iput-object v1, p0, Lcom/facebook/imagepipeline/h/u;->mEncodedImage:Lcom/facebook/imagepipeline/f/e;
-
-    const/4 v1, 0x0
-
-    iput v1, p0, Lcom/facebook/imagepipeline/h/u;->WW:I
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-static {v0}, Lcom/facebook/imagepipeline/f/e;->e(Lcom/facebook/imagepipeline/f/e;)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
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/v.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/v.smali
index fabaf61fac..f97066dcbe 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/v.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/v.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final TI:Landroid/content/res/AssetManager;
+.field private final Ua:Landroid/content/res/AssetManager;
 
 
 # direct methods
@@ -13,20 +13,20 @@
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/imagepipeline/h/z;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;)V
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/h/v;->TI:Landroid/content/res/AssetManager;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/h/v;->Ua:Landroid/content/res/AssetManager;
 
     return-void
 .end method
 
-.method private e(Lcom/facebook/imagepipeline/request/b;)I
+.method private d(Lcom/facebook/imagepipeline/request/b;)I
     .locals 3
 
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/h/v;->TI:Landroid/content/res/AssetManager;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/v;->Ua:Landroid/content/res/AssetManager;
 
-    invoke-static {p1}, Lcom/facebook/imagepipeline/h/v;->f(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/facebook/imagepipeline/h/v;->e(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -83,10 +83,10 @@
     return p1
 .end method
 
-.method private static f(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
+.method private static e(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
     .locals 1
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->Yp:Landroid/net/Uri;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->YH:Landroid/net/Uri;
 
     invoke-virtual {p0}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
@@ -103,7 +103,7 @@
 
 
 # virtual methods
-.method protected final d(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
+.method protected final c(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/f/e;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -111,9 +111,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/v;->TI:Landroid/content/res/AssetManager;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/v;->Ua:Landroid/content/res/AssetManager;
 
-    invoke-static {p1}, Lcom/facebook/imagepipeline/h/v;->f(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/facebook/imagepipeline/h/v;->e(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -123,7 +123,7 @@
 
     move-result-object v0
 
-    invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/h/v;->e(Lcom/facebook/imagepipeline/request/b;)I
+    invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/h/v;->d(Lcom/facebook/imagepipeline/request/b;)I
 
     move-result p1
 
@@ -134,7 +134,7 @@
     return-object p1
 .end method
 
-.method protected final jx()Ljava/lang/String;
+.method protected final jv()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalAssetFetchProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/y$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/y$2.smali
index 445bc0ba83..c3432c1675 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/y$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/y$2.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic Xn:Lcom/facebook/imagepipeline/h/y;
+.field final synthetic XF:Lcom/facebook/imagepipeline/h/y;
 
-.field final synthetic Xo:Lcom/facebook/imagepipeline/h/aq;
+.field final synthetic XG:Lcom/facebook/imagepipeline/h/aq;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/y;Lcom/facebook/imagepipeline/h/aq;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/y$2;->Xn:Lcom/facebook/imagepipeline/h/y;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/y$2;->XF:Lcom/facebook/imagepipeline/h/y;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/y$2;->Xo:Lcom/facebook/imagepipeline/h/aq;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/y$2;->XG:Lcom/facebook/imagepipeline/h/aq;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final jt()V
+.method public final jr()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/y$2;->Xo:Lcom/facebook/imagepipeline/h/aq;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/y$2;->XG:Lcom/facebook/imagepipeline/h/aq;
 
     invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/aq;->cancel()V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/h/z$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/h/z$2.smali
index b9af602e1f..07e3d1e114 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/h/z$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/h/z$2.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic Xo:Lcom/facebook/imagepipeline/h/aq;
+.field final synthetic XG:Lcom/facebook/imagepipeline/h/aq;
 
-.field final synthetic Xp:Lcom/facebook/imagepipeline/h/z;
+.field final synthetic XH:Lcom/facebook/imagepipeline/h/z;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/h/z;Lcom/facebook/imagepipeline/h/aq;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/h/z$2;->Xp:Lcom/facebook/imagepipeline/h/z;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/h/z$2;->XH:Lcom/facebook/imagepipeline/h/z;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/h/z$2;->Xo:Lcom/facebook/imagepipeline/h/aq;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/h/z$2;->XG:Lcom/facebook/imagepipeline/h/aq;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final jt()V
+.method public final jr()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/z$2;->Xo:Lcom/facebook/imagepipeline/h/aq;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/z$2;->XG:Lcom/facebook/imagepipeline/h/aq;
 
     invoke-virtual {v0}, Lcom/facebook/imagepipeline/h/aq;->cancel()V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/j/b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/j/b.smali
index 9b0141e013..c112c88dfc 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/j/b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/j/b.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final YI:I
+.field public final Za:I
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/j/b;->YI:I
+    iput p1, p0, Lcom/facebook/imagepipeline/j/b;->Za:I
 
     return-void
 .end method
@@ -27,7 +27,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/j/b;->YI:I
+    iget v1, p0, Lcom/facebook/imagepipeline/j/b;->Za:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/j/h.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/j/h.smali
index 2f7a96beb8..49b6baea00 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/j/h.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/j/h.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final Tn:I
+.field private final TF:I
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/j/h;->Tn:I
+    iput p1, p0, Lcom/facebook/imagepipeline/j/h;->TF:I
 
     return-void
 .end method
@@ -28,7 +28,7 @@
 
     new-instance p1, Lcom/facebook/imagepipeline/j/g;
 
-    iget v0, p0, Lcom/facebook/imagepipeline/j/h;->Tn:I
+    iget v0, p0, Lcom/facebook/imagepipeline/j/h;->TF:I
 
     invoke-direct {p1, p2, v0}, Lcom/facebook/imagepipeline/j/g;-><init>(ZI)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/k/a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/k/a.smali
index f38c691a5c..df0b4c8977 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/k/a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/k/a.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract jU()Z
+.method public abstract jS()Z
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/a$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/a$a.smali
index acadee9fbc..5cb946b103 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/a$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field UJ:I
+.field Vc:I
 
 .field mCount:I
 
@@ -40,11 +40,11 @@
 
     iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->mCount:I
 
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     add-int/2addr v0, p1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 .method public final ar(I)V
     .locals 3
 
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     const/4 v1, 0x1
 
@@ -68,7 +68,7 @@
 
     sub-int/2addr v0, p1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     return-void
 
@@ -85,7 +85,7 @@
 
     aput-object p1, v0, v2
 
-    iget p1, p0, Lcom/facebook/imagepipeline/memory/a$a;->UJ:I
+    iget p1, p0, Lcom/facebook/imagepipeline/memory/a$a;->Vc:I
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ab$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ab$a.smali
index d5cfbaf4cd..5700fd4cd1 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ab$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ab$a.smali
@@ -15,29 +15,29 @@
 
 
 # instance fields
-.field SM:Lcom/facebook/common/g/b;
+.field Tf:Lcom/facebook/common/g/b;
 
-.field VA:Ljava/lang/String;
+.field VL:Lcom/facebook/imagepipeline/memory/ad;
 
-.field VB:I
+.field VM:Lcom/facebook/imagepipeline/memory/ae;
 
-.field VC:I
+.field VN:Lcom/facebook/imagepipeline/memory/ad;
 
-.field VD:Z
+.field VO:Lcom/facebook/imagepipeline/memory/ad;
 
-.field Vt:Lcom/facebook/imagepipeline/memory/ad;
+.field VP:Lcom/facebook/imagepipeline/memory/ae;
 
-.field Vu:Lcom/facebook/imagepipeline/memory/ae;
+.field VQ:Lcom/facebook/imagepipeline/memory/ad;
 
-.field Vv:Lcom/facebook/imagepipeline/memory/ad;
+.field VR:Lcom/facebook/imagepipeline/memory/ae;
 
-.field Vw:Lcom/facebook/imagepipeline/memory/ad;
+.field VS:Ljava/lang/String;
 
-.field Vx:Lcom/facebook/imagepipeline/memory/ae;
+.field VT:I
 
-.field Vy:Lcom/facebook/imagepipeline/memory/ad;
+.field VU:I
 
-.field Vz:Lcom/facebook/imagepipeline/memory/ae;
+.field VV:Z
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ab.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ab.smali
index 83b90a14b8..6ba3b14fda 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ab.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ab.smali
@@ -12,29 +12,29 @@
 
 
 # instance fields
-.field final SM:Lcom/facebook/common/g/b;
+.field final Tf:Lcom/facebook/common/g/b;
 
-.field final VA:Ljava/lang/String;
+.field final VL:Lcom/facebook/imagepipeline/memory/ad;
 
-.field final VB:I
+.field final VM:Lcom/facebook/imagepipeline/memory/ae;
 
-.field final VC:I
+.field final VN:Lcom/facebook/imagepipeline/memory/ad;
 
-.field final VD:Z
+.field final VO:Lcom/facebook/imagepipeline/memory/ad;
 
-.field final Vt:Lcom/facebook/imagepipeline/memory/ad;
+.field final VP:Lcom/facebook/imagepipeline/memory/ae;
 
-.field final Vu:Lcom/facebook/imagepipeline/memory/ae;
+.field final VQ:Lcom/facebook/imagepipeline/memory/ad;
 
-.field final Vv:Lcom/facebook/imagepipeline/memory/ad;
+.field final VR:Lcom/facebook/imagepipeline/memory/ae;
 
-.field final Vw:Lcom/facebook/imagepipeline/memory/ad;
+.field final VS:Ljava/lang/String;
 
-.field final Vx:Lcom/facebook/imagepipeline/memory/ae;
+.field final VT:I
 
-.field final Vy:Lcom/facebook/imagepipeline/memory/ad;
+.field final VU:I
 
-.field final Vz:Lcom/facebook/imagepipeline/memory/ae;
+.field final VV:Z
 
 
 # direct methods
@@ -45,71 +45,71 @@
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vt:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VL:Lcom/facebook/imagepipeline/memory/ad;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->iZ()Lcom/facebook/imagepipeline/memory/ad;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->iX()Lcom/facebook/imagepipeline/memory/ad;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vt:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VL:Lcom/facebook/imagepipeline/memory/ad;
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->Vt:Lcom/facebook/imagepipeline/memory/ad;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->VL:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vu:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VM:Lcom/facebook/imagepipeline/memory/ae;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->jb()Lcom/facebook/imagepipeline/memory/y;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iZ()Lcom/facebook/imagepipeline/memory/y;
 
     move-result-object v0
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vu:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VM:Lcom/facebook/imagepipeline/memory/ae;
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->Vu:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->VM:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vv:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VN:Lcom/facebook/imagepipeline/memory/ad;
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/l;->iZ()Lcom/facebook/imagepipeline/memory/ad;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/l;->iX()Lcom/facebook/imagepipeline/memory/ad;
 
     move-result-object v0
 
     goto :goto_2
 
     :cond_2
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vv:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VN:Lcom/facebook/imagepipeline/memory/ad;
 
     :goto_2
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->Vv:Lcom/facebook/imagepipeline/memory/ad;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->VN:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->SM:Lcom/facebook/common/g/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Tf:Lcom/facebook/common/g/b;
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lcom/facebook/common/g/c;->fD()Lcom/facebook/common/g/c;
+    invoke-static {}, Lcom/facebook/common/g/c;->fH()Lcom/facebook/common/g/c;
 
     move-result-object v0
 
     goto :goto_3
 
     :cond_3
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->SM:Lcom/facebook/common/g/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Tf:Lcom/facebook/common/g/b;
 
     :goto_3
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->SM:Lcom/facebook/common/g/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->Tf:Lcom/facebook/common/g/b;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vw:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VO:Lcom/facebook/imagepipeline/memory/ad;
 
     const/high16 v1, 0x100000
 
@@ -235,28 +235,28 @@
     goto :goto_6
 
     :cond_7
-    iget-object v4, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vw:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v4, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VO:Lcom/facebook/imagepipeline/memory/ad;
 
     :goto_6
-    iput-object v4, p0, Lcom/facebook/imagepipeline/memory/ab;->Vw:Lcom/facebook/imagepipeline/memory/ad;
+    iput-object v4, p0, Lcom/facebook/imagepipeline/memory/ab;->VO:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vx:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VP:Lcom/facebook/imagepipeline/memory/ae;
 
     if-nez v0, :cond_8
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->jb()Lcom/facebook/imagepipeline/memory/y;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iZ()Lcom/facebook/imagepipeline/memory/y;
 
     move-result-object v0
 
     goto :goto_7
 
     :cond_8
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vx:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VP:Lcom/facebook/imagepipeline/memory/ae;
 
     :goto_7
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->Vx:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->VP:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vy:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VQ:Lcom/facebook/imagepipeline/memory/ad;
 
     if-nez v0, :cond_9
 
@@ -275,28 +275,28 @@
     goto :goto_8
 
     :cond_9
-    iget-object v2, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vy:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VQ:Lcom/facebook/imagepipeline/memory/ad;
 
     :goto_8
-    iput-object v2, p0, Lcom/facebook/imagepipeline/memory/ab;->Vy:Lcom/facebook/imagepipeline/memory/ad;
+    iput-object v2, p0, Lcom/facebook/imagepipeline/memory/ab;->VQ:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vz:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VR:Lcom/facebook/imagepipeline/memory/ae;
 
     if-nez v0, :cond_a
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->jb()Lcom/facebook/imagepipeline/memory/y;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iZ()Lcom/facebook/imagepipeline/memory/y;
 
     move-result-object v0
 
     goto :goto_9
 
     :cond_a
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->Vz:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VR:Lcom/facebook/imagepipeline/memory/ae;
 
     :goto_9
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->Vz:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->VR:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VA:Ljava/lang/String;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VS:Ljava/lang/String;
 
     if-nez v0, :cond_b
 
@@ -305,20 +305,20 @@
     goto :goto_a
 
     :cond_b
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VA:Ljava/lang/String;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VS:Ljava/lang/String;
 
     :goto_a
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->VA:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ab;->VS:Ljava/lang/String;
 
-    iget v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VB:I
+    iget v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VT:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/ab;->VB:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/ab;->VT:I
 
-    iget v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VC:I
+    iget v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VU:I
 
     if-lez v0, :cond_c
 
-    iget v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VC:I
+    iget v0, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VU:I
 
     goto :goto_b
 
@@ -326,11 +326,11 @@
     const/high16 v0, 0x400000
 
     :goto_b
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/ab;->VC:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/ab;->VU:I
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VD:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/memory/ab$a;->VV:Z
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/memory/ab;->VD:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/memory/ab;->VV:Z
 
     invoke-static {}, Lcom/facebook/imagepipeline/i/b;->isTracing()Z
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ac.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ac.smali
index 762b6498d2..daac39c73e 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ac.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ac.smali
@@ -4,21 +4,21 @@
 
 
 # instance fields
-.field private QC:Lcom/facebook/imagepipeline/memory/d;
+.field private QU:Lcom/facebook/imagepipeline/memory/d;
 
-.field private QF:Lcom/facebook/common/g/g;
+.field private QX:Lcom/facebook/common/g/g;
 
-.field private QH:Lcom/facebook/imagepipeline/memory/n;
+.field private QZ:Lcom/facebook/imagepipeline/memory/n;
 
-.field private QV:Lcom/facebook/common/g/j;
+.field private Rn:Lcom/facebook/common/g/j;
 
-.field private final VE:Lcom/facebook/imagepipeline/memory/ab;
+.field private final VW:Lcom/facebook/imagepipeline/memory/ab;
 
-.field private VF:Lcom/facebook/imagepipeline/memory/j;
+.field private VX:Lcom/facebook/imagepipeline/memory/j;
 
-.field private VG:Lcom/facebook/imagepipeline/memory/x;
+.field private VY:Lcom/facebook/imagepipeline/memory/x;
 
-.field private VH:Lcom/facebook/common/g/a;
+.field private VZ:Lcom/facebook/common/g/a;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/memory/ab;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
     return-void
 .end method
@@ -47,7 +47,7 @@
 
     if-ne p1, v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ac;->jd()Lcom/facebook/imagepipeline/memory/j;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ac;->jb()Lcom/facebook/imagepipeline/memory/j;
 
     move-result-object p1
 
@@ -63,71 +63,71 @@
     throw p1
 
     :cond_1
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ac;->jg()Lcom/facebook/imagepipeline/memory/x;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ac;->je()Lcom/facebook/imagepipeline/memory/x;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method private jd()Lcom/facebook/imagepipeline/memory/j;
+.method private jb()Lcom/facebook/imagepipeline/memory/j;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VF:Lcom/facebook/imagepipeline/memory/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VX:Lcom/facebook/imagepipeline/memory/j;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/j;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ab;->SM:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ab;->Tf:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ab;->Vw:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ab;->VO:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ab;->Vx:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ab;->VP:Lcom/facebook/imagepipeline/memory/ae;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/j;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ad;Lcom/facebook/imagepipeline/memory/ae;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VF:Lcom/facebook/imagepipeline/memory/j;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VX:Lcom/facebook/imagepipeline/memory/j;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VF:Lcom/facebook/imagepipeline/memory/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VX:Lcom/facebook/imagepipeline/memory/j;
 
     return-object v0
 .end method
 
-.method private jg()Lcom/facebook/imagepipeline/memory/x;
+.method private je()Lcom/facebook/imagepipeline/memory/x;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VG:Lcom/facebook/imagepipeline/memory/x;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VY:Lcom/facebook/imagepipeline/memory/x;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/x;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ab;->SM:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ab;->Tf:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ab;->Vw:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ab;->VO:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ab;->Vx:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ab;->VP:Lcom/facebook/imagepipeline/memory/ae;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/x;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ad;Lcom/facebook/imagepipeline/memory/ae;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VG:Lcom/facebook/imagepipeline/memory/x;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VY:Lcom/facebook/imagepipeline/memory/x;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VG:Lcom/facebook/imagepipeline/memory/x;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VY:Lcom/facebook/imagepipeline/memory/x;
 
     return-object v0
 .end method
@@ -137,7 +137,7 @@
 .method public final aA(I)Lcom/facebook/common/g/g;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QF:Lcom/facebook/common/g/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QX:Lcom/facebook/common/g/g;
 
     if-nez v0, :cond_0
 
@@ -147,30 +147,30 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->jh()Lcom/facebook/common/g/j;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->jf()Lcom/facebook/common/g/j;
 
     move-result-object v1
 
     invoke-direct {v0, p1, v1}, Lcom/facebook/imagepipeline/memory/v;-><init>(Lcom/facebook/imagepipeline/memory/s;Lcom/facebook/common/g/j;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QF:Lcom/facebook/common/g/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QX:Lcom/facebook/common/g/g;
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/ac;->QF:Lcom/facebook/common/g/g;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/ac;->QX:Lcom/facebook/common/g/g;
 
     return-object p1
 .end method
 
-.method public final jc()Lcom/facebook/imagepipeline/memory/d;
+.method public final ja()Lcom/facebook/imagepipeline/memory/d;
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ab;->VA:Ljava/lang/String;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ab;->VS:Ljava/lang/String;
 
     const/4 v1, -0x1
 
@@ -246,63 +246,63 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ab;->SM:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ab;->Tf:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ab;->Vt:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ab;->VL:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ab;->Vu:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ab;->VM:Lcom/facebook/imagepipeline/memory/ae;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/h;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ad;Lcom/facebook/imagepipeline/memory/ae;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     goto :goto_1
 
     :cond_1
     new-instance v0, Lcom/facebook/imagepipeline/memory/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ab;->SM:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ab;->Tf:Lcom/facebook/common/g/b;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->iZ()Lcom/facebook/imagepipeline/memory/ad;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->iX()Lcom/facebook/imagepipeline/memory/ad;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ab;->Vu:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ab;->VM:Lcom/facebook/imagepipeline/memory/ae;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/h;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ad;Lcom/facebook/imagepipeline/memory/ae;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     goto :goto_1
 
     :cond_2
     new-instance v0, Lcom/facebook/imagepipeline/memory/p;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/ab;->VB:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/ab;->VT:I
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget v2, v2, Lcom/facebook/imagepipeline/memory/ab;->VC:I
+    iget v2, v2, Lcom/facebook/imagepipeline/memory/ab;->VU:I
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->jb()Lcom/facebook/imagepipeline/memory/y;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iZ()Lcom/facebook/imagepipeline/memory/y;
 
     move-result-object v3
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/p;-><init>(IILcom/facebook/imagepipeline/memory/ae;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     goto :goto_1
 
@@ -311,11 +311,11 @@
 
     invoke-direct {v0}, Lcom/facebook/imagepipeline/memory/m;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     :cond_4
     :goto_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QC:Lcom/facebook/imagepipeline/memory/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QU:Lcom/facebook/imagepipeline/memory/d;
 
     return-object v0
 
@@ -328,95 +328,95 @@
     .end sparse-switch
 .end method
 
-.method public final je()Lcom/facebook/imagepipeline/memory/n;
+.method public final jc()Lcom/facebook/imagepipeline/memory/n;
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QH:Lcom/facebook/imagepipeline/memory/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QZ:Lcom/facebook/imagepipeline/memory/n;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/n;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ab;->SM:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ab;->Tf:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ab;->Vv:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ab;->VN:Lcom/facebook/imagepipeline/memory/ad;
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/imagepipeline/memory/n;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ad;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QH:Lcom/facebook/imagepipeline/memory/n;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QZ:Lcom/facebook/imagepipeline/memory/n;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QH:Lcom/facebook/imagepipeline/memory/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QZ:Lcom/facebook/imagepipeline/memory/n;
 
     return-object v0
 .end method
 
-.method public final jf()I
+.method public final jd()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ab;->Vv:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ab;->VN:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/ad;->VO:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/ad;->Wg:I
 
     return v0
 .end method
 
-.method public final jh()Lcom/facebook/common/g/j;
+.method public final jf()Lcom/facebook/common/g/j;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QV:Lcom/facebook/common/g/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Rn:Lcom/facebook/common/g/j;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/facebook/common/g/j;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->ji()Lcom/facebook/common/g/a;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->jg()Lcom/facebook/common/g/a;
 
     move-result-object v1
 
     invoke-direct {v0, v1}, Lcom/facebook/common/g/j;-><init>(Lcom/facebook/common/g/a;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QV:Lcom/facebook/common/g/j;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Rn:Lcom/facebook/common/g/j;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->QV:Lcom/facebook/common/g/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Rn:Lcom/facebook/common/g/j;
 
     return-object v0
 .end method
 
-.method public final ji()Lcom/facebook/common/g/a;
+.method public final jg()Lcom/facebook/common/g/a;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VH:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VZ:Lcom/facebook/common/g/a;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/o;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ab;->SM:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ab;->Tf:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ab;->Vy:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ab;->VQ:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ac;->VE:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ac;->VW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ab;->Vz:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ab;->VR:Lcom/facebook/imagepipeline/memory/ae;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/o;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ad;Lcom/facebook/imagepipeline/memory/ae;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VH:Lcom/facebook/common/g/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VZ:Lcom/facebook/common/g/a;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VH:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->VZ:Lcom/facebook/common/g/a;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/b$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/b$1.smali
index 7fcbdec1e6..9a0c72de4a 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/b$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/b$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic UN:Lcom/facebook/imagepipeline/memory/b;
+.field final synthetic Vg:Lcom/facebook/imagepipeline/memory/b;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/memory/b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/b$1;->UN:Lcom/facebook/imagepipeline/memory/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/b$1;->Vg:Lcom/facebook/imagepipeline/memory/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,7 +49,7 @@
     check-cast p1, Landroid/graphics/Bitmap;
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/b$1;->UN:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/b$1;->Vg:Lcom/facebook/imagepipeline/memory/b;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/memory/b;->d(Landroid/graphics/Bitmap;)V
     :try_end_0
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/b.smali
index 8db92ab981..4d2bedaa5c 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/b.smali
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field private Gb:J
+.field private Gs:J
 
-.field private final UK:I
+.field private final Vd:I
 
-.field private final UL:I
+.field private final Ve:I
 
-.field public final UM:Lcom/facebook/common/references/b;
+.field public final Vf:Lcom/facebook/common/references/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/b<",
@@ -55,15 +55,15 @@
     :goto_1
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/memory/b;->UK:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/b;->Vd:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/memory/b;->UL:I
+    iput p2, p0, Lcom/facebook/imagepipeline/memory/b;->Ve:I
 
     new-instance p1, Lcom/facebook/imagepipeline/memory/b$1;
 
     invoke-direct {p1, p0}, Lcom/facebook/imagepipeline/memory/b$1;-><init>(Lcom/facebook/imagepipeline/memory/b;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/b;->UM:Lcom/facebook/common/references/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/b;->Vf:Lcom/facebook/common/references/b;
 
     return-void
 .end method
@@ -82,17 +82,17 @@
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/b;->mCount:I
 
-    iget v1, p0, Lcom/facebook/imagepipeline/memory/b;->UK:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/b;->Vd:I
 
     if-ge v0, v1, :cond_1
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Gb:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Gs:J
 
     int-to-long v2, p1
 
     add-long/2addr v0, v2
 
-    iget p1, p0, Lcom/facebook/imagepipeline/memory/b;->UL:I
+    iget p1, p0, Lcom/facebook/imagepipeline/memory/b;->Ve:I
 
     int-to-long v4, p1
 
@@ -111,11 +111,11 @@
 
     iput p1, p0, Lcom/facebook/imagepipeline/memory/b;->mCount:I
 
-    iget-wide v4, p0, Lcom/facebook/imagepipeline/memory/b;->Gb:J
+    iget-wide v4, p0, Lcom/facebook/imagepipeline/memory/b;->Gs:J
 
     add-long/2addr v4, v2
 
-    iput-wide v4, p0, Lcom/facebook/imagepipeline/memory/b;->Gb:J
+    iput-wide v4, p0, Lcom/facebook/imagepipeline/memory/b;->Gs:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -171,7 +171,7 @@
 
     int-to-long v3, p1
 
-    iget-wide v5, p0, Lcom/facebook/imagepipeline/memory/b;->Gb:J
+    iget-wide v5, p0, Lcom/facebook/imagepipeline/memory/b;->Gs:J
 
     cmp-long v0, v3, v5
 
@@ -197,7 +197,7 @@
 
     aput-object p1, v6, v1
 
-    iget-wide v7, p0, Lcom/facebook/imagepipeline/memory/b;->Gb:J
+    iget-wide v7, p0, Lcom/facebook/imagepipeline/memory/b;->Gs:J
 
     invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -207,11 +207,11 @@
 
     if-eqz v0, :cond_2
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Gb:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Gs:J
 
     sub-long/2addr v0, v3
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Gb:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Gs:J
 
     iget p1, p0, Lcom/facebook/imagepipeline/memory/b;->mCount:I
 
@@ -275,7 +275,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/b;->UL:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/b;->Ve:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -297,7 +297,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Gb:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Gs:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -313,13 +313,13 @@
     throw v0
 .end method
 
-.method public final declared-synchronized iU()I
+.method public final declared-synchronized iT()I
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/b;->UK:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/b;->Vd:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/c.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/c.smali
index 718854c23d..5540557196 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/c.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/c.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,11 +13,11 @@
     .end annotation
 .end field
 
-.field public static final UO:I
+.field public static final Vh:I
 
-.field private static UQ:I
+.field private static Vi:I
 
-.field private static volatile UR:Lcom/facebook/imagepipeline/memory/b;
+.field private static volatile Vj:Lcom/facebook/imagepipeline/memory/b;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     const-class v0, Lcom/facebook/imagepipeline/memory/c;
 
-    sput-object v0, Lcom/facebook/imagepipeline/memory/c;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/memory/c;->FC:Ljava/lang/Class;
 
     invoke-static {}, Ljava/lang/Runtime;->getRuntime()Ljava/lang/Runtime;
 
@@ -62,11 +62,11 @@
     div-int/lit8 v1, v1, 0x2
 
     :goto_0
-    sput v1, Lcom/facebook/imagepipeline/memory/c;->UO:I
+    sput v1, Lcom/facebook/imagepipeline/memory/c;->Vh:I
 
     const/16 v0, 0x180
 
-    sput v0, Lcom/facebook/imagepipeline/memory/c;->UQ:I
+    sput v0, Lcom/facebook/imagepipeline/memory/c;->Vi:I
 
     return-void
 .end method
@@ -79,10 +79,10 @@
     return-void
 .end method
 
-.method public static iV()Lcom/facebook/imagepipeline/memory/b;
+.method public static iU()Lcom/facebook/imagepipeline/memory/b;
     .locals 4
 
-    sget-object v0, Lcom/facebook/imagepipeline/memory/c;->UR:Lcom/facebook/imagepipeline/memory/b;
+    sget-object v0, Lcom/facebook/imagepipeline/memory/c;->Vj:Lcom/facebook/imagepipeline/memory/b;
 
     if-nez v0, :cond_1
 
@@ -91,19 +91,19 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/memory/c;->UR:Lcom/facebook/imagepipeline/memory/b;
+    sget-object v1, Lcom/facebook/imagepipeline/memory/c;->Vj:Lcom/facebook/imagepipeline/memory/b;
 
     if-nez v1, :cond_0
 
     new-instance v1, Lcom/facebook/imagepipeline/memory/b;
 
-    sget v2, Lcom/facebook/imagepipeline/memory/c;->UQ:I
+    sget v2, Lcom/facebook/imagepipeline/memory/c;->Vi:I
 
-    sget v3, Lcom/facebook/imagepipeline/memory/c;->UO:I
+    sget v3, Lcom/facebook/imagepipeline/memory/c;->Vh:I
 
     invoke-direct {v1, v2, v3}, Lcom/facebook/imagepipeline/memory/b;-><init>(II)V
 
-    sput-object v1, Lcom/facebook/imagepipeline/memory/c;->UR:Lcom/facebook/imagepipeline/memory/b;
+    sput-object v1, Lcom/facebook/imagepipeline/memory/c;->Vj:Lcom/facebook/imagepipeline/memory/b;
 
     :cond_0
     monitor-exit v0
@@ -121,7 +121,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/facebook/imagepipeline/memory/c;->UR:Lcom/facebook/imagepipeline/memory/b;
+    sget-object v0, Lcom/facebook/imagepipeline/memory/c;->Vj:Lcom/facebook/imagepipeline/memory/b;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/k.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/k.smali
index 26aa2bd69f..a3c0fdec65 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/k.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/k.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final Ve:Landroid/util/SparseIntArray;
+.field private static final Vw:Landroid/util/SparseIntArray;
 
 
 # direct methods
@@ -17,12 +17,12 @@
 
     invoke-direct {v0, v1}, Landroid/util/SparseIntArray;-><init>(I)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/memory/k;->Ve:Landroid/util/SparseIntArray;
+    sput-object v0, Lcom/facebook/imagepipeline/memory/k;->Vw:Landroid/util/SparseIntArray;
 
     return-void
 .end method
 
-.method public static iZ()Lcom/facebook/imagepipeline/memory/ad;
+.method public static iX()Lcom/facebook/imagepipeline/memory/ad;
     .locals 5
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/ad;
@@ -57,7 +57,7 @@
     div-int/lit8 v2, v2, 0x2
 
     :goto_0
-    sget-object v1, Lcom/facebook/imagepipeline/memory/k;->Ve:Landroid/util/SparseIntArray;
+    sget-object v1, Lcom/facebook/imagepipeline/memory/k;->Vw:Landroid/util/SparseIntArray;
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/l.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/l.smali
index 5898017d0d..07d2755b68 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/l.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/l.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final Vf:I
+.field public static final Vx:I
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     move-result v0
 
-    sput v0, Lcom/facebook/imagepipeline/memory/l;->Vf:I
+    sput v0, Lcom/facebook/imagepipeline/memory/l;->Vx:I
 
     return-void
 .end method
@@ -48,12 +48,12 @@
     return-object v0
 .end method
 
-.method public static iZ()Lcom/facebook/imagepipeline/memory/ad;
+.method public static iX()Lcom/facebook/imagepipeline/memory/ad;
     .locals 8
 
     new-instance v7, Lcom/facebook/imagepipeline/memory/ad;
 
-    sget v0, Lcom/facebook/imagepipeline/memory/l;->Vf:I
+    sget v0, Lcom/facebook/imagepipeline/memory/l;->Vx:I
 
     const/high16 v1, 0x400000
 
@@ -63,7 +63,7 @@
 
     move-result-object v3
 
-    sget v6, Lcom/facebook/imagepipeline/memory/l;->Vf:I
+    sget v6, Lcom/facebook/imagepipeline/memory/l;->Vx:I
 
     const/high16 v4, 0x20000
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n$1.smali
index d49bc77816..322cff84c2 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n$1.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic Vh:Lcom/facebook/imagepipeline/memory/n;
+.field final synthetic Vz:Lcom/facebook/imagepipeline/memory/n;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/memory/n;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/n$1;->Vh:Lcom/facebook/imagepipeline/memory/n;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/n$1;->Vz:Lcom/facebook/imagepipeline/memory/n;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,9 +47,9 @@
 
     check-cast p1, [B
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/n$1;->Vh:Lcom/facebook/imagepipeline/memory/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/n$1;->Vz:Lcom/facebook/imagepipeline/memory/n;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/n;->Vg:Lcom/facebook/imagepipeline/memory/n$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/n;->Vy:Lcom/facebook/imagepipeline/memory/n$a;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/memory/n$a;->z(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n$a.smali
index 074d49a0ab..8d1d283374 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n$a.smali
@@ -37,9 +37,9 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/z;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/n$a;->UC:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/n$a;->UV:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/ad;->VO:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/ad;->Wg:I
 
     invoke-direct {v0, p1, v1}, Lcom/facebook/imagepipeline/memory/z;-><init>(II)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n.smali
index 7350717c16..27f34b5930 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field private final GU:Lcom/facebook/common/references/b;
+.field private final Hl:Lcom/facebook/common/references/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/b<",
@@ -21,7 +21,7 @@
     .end annotation
 .end field
 
-.field final Vg:Lcom/facebook/imagepipeline/memory/n$a;
+.field final Vy:Lcom/facebook/imagepipeline/memory/n$a;
 
 
 # direct methods
@@ -30,7 +30,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget v0, p2, Lcom/facebook/imagepipeline/memory/ad;->VO:I
+    iget v0, p2, Lcom/facebook/imagepipeline/memory/ad;->Wg:I
 
     if-lez v0, :cond_0
 
@@ -46,19 +46,19 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/n$a;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->jb()Lcom/facebook/imagepipeline/memory/y;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/y;->iZ()Lcom/facebook/imagepipeline/memory/y;
 
     move-result-object v1
 
     invoke-direct {v0, p1, p2, v1}, Lcom/facebook/imagepipeline/memory/n$a;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ad;Lcom/facebook/imagepipeline/memory/ae;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Vg:Lcom/facebook/imagepipeline/memory/n$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Vy:Lcom/facebook/imagepipeline/memory/n$a;
 
     new-instance p1, Lcom/facebook/imagepipeline/memory/n$1;
 
     invoke-direct {p1, p0}, Lcom/facebook/imagepipeline/memory/n$1;-><init>(Lcom/facebook/imagepipeline/memory/n;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/n;->GU:Lcom/facebook/common/references/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/n;->Hl:Lcom/facebook/common/references/b;
 
     return-void
 .end method
@@ -75,13 +75,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Vg:Lcom/facebook/imagepipeline/memory/n$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Vy:Lcom/facebook/imagepipeline/memory/n$a;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/memory/n$a;->get(I)Ljava/lang/Object;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->GU:Lcom/facebook/common/references/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Hl:Lcom/facebook/common/references/b;
 
     invoke-static {p1, v0}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Object;Lcom/facebook/common/references/b;)Lcom/facebook/common/references/CloseableReference;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o.smali
index 1793212397..26077bc417 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o.smali
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field private final Vi:[I
+.field private final VA:[I
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {p0, p1, p2, p3}, Lcom/facebook/imagepipeline/memory/a;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ad;Lcom/facebook/imagepipeline/memory/ae;)V
 
-    iget-object p1, p2, Lcom/facebook/imagepipeline/memory/ad;->VK:Landroid/util/SparseIntArray;
+    iget-object p1, p2, Lcom/facebook/imagepipeline/memory/ad;->Wc:Landroid/util/SparseIntArray;
 
     invoke-virtual {p1}, Landroid/util/SparseIntArray;->size()I
 
@@ -34,7 +34,7 @@
 
     new-array p2, p2, [I
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/o;->Vi:[I
+    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/o;->VA:[I
 
     const/4 p2, 0x0
 
@@ -45,7 +45,7 @@
 
     if-ge p2, p3, :cond_0
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/o;->Vi:[I
+    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/o;->VA:[I
 
     invoke-virtual {p1, p2}, Landroid/util/SparseIntArray;->keyAt(I)I
 
@@ -98,7 +98,7 @@
 
     if-lez p1, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/o;->Vi:[I
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/o;->VA:[I
 
     array-length v1, v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/p.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/p.smali
index ff0cb26b43..2d3714a543 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/p.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/p.smali
@@ -7,11 +7,9 @@
 
 
 # instance fields
-.field private Tn:I
+.field private TF:I
 
-.field private final UI:Lcom/facebook/imagepipeline/memory/ae;
-
-.field protected final Vj:Lcom/facebook/imagepipeline/memory/aa;
+.field protected final VB:Lcom/facebook/imagepipeline/memory/aa;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/memory/aa<",
@@ -21,9 +19,11 @@
     .end annotation
 .end field
 
-.field private final Vk:I
+.field private final VC:I
 
-.field private Vl:I
+.field private VD:I
+
+.field private final Vb:Lcom/facebook/imagepipeline/memory/ae;
 
 
 # direct methods
@@ -36,13 +36,13 @@
 
     invoke-direct {v0}, Lcom/facebook/imagepipeline/memory/e;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/p;->Vj:Lcom/facebook/imagepipeline/memory/aa;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/p;->VB:Lcom/facebook/imagepipeline/memory/aa;
 
-    iput p1, p0, Lcom/facebook/imagepipeline/memory/p;->Vk:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/p;->VC:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/memory/p;->Tn:I
+    iput p2, p0, Lcom/facebook/imagepipeline/memory/p;->TF:I
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/p;->UI:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/p;->Vb:Lcom/facebook/imagepipeline/memory/ae;
 
     return-void
 .end method
@@ -54,11 +54,11 @@
 
     :goto_0
     :try_start_0
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/p;->Vl:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/p;->VD:I
 
     if-le v0, p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/p;->Vj:Lcom/facebook/imagepipeline/memory/aa;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/p;->VB:Lcom/facebook/imagepipeline/memory/aa;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/memory/aa;->pop()Ljava/lang/Object;
 
@@ -68,17 +68,17 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/p;->Vj:Lcom/facebook/imagepipeline/memory/aa;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/p;->VB:Lcom/facebook/imagepipeline/memory/aa;
 
     invoke-interface {v1, v0}, Lcom/facebook/imagepipeline/memory/aa;->R(Ljava/lang/Object;)I
 
     move-result v0
 
-    iget v1, p0, Lcom/facebook/imagepipeline/memory/p;->Vl:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/p;->VD:I
 
     sub-int/2addr v1, v0
 
-    iput v1, p0, Lcom/facebook/imagepipeline/memory/p;->Vl:I
+    iput v1, p0, Lcom/facebook/imagepipeline/memory/p;->VD:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -109,18 +109,18 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/p;->Vl:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/p;->VD:I
 
-    iget v1, p0, Lcom/facebook/imagepipeline/memory/p;->Vk:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/p;->VC:I
 
     if-le v0, v1, :cond_0
 
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/p;->Vk:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/p;->VC:I
 
     invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/memory/p;->ax(I)V
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/p;->Vj:Lcom/facebook/imagepipeline/memory/aa;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/p;->VB:Lcom/facebook/imagepipeline/memory/aa;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/memory/aa;->get(I)Ljava/lang/Object;
 
@@ -130,17 +130,17 @@
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/p;->Vj:Lcom/facebook/imagepipeline/memory/aa;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/p;->VB:Lcom/facebook/imagepipeline/memory/aa;
 
     invoke-interface {p1, v0}, Lcom/facebook/imagepipeline/memory/aa;->R(Ljava/lang/Object;)I
 
     move-result p1
 
-    iget v1, p0, Lcom/facebook/imagepipeline/memory/p;->Vl:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/p;->VD:I
 
     sub-int/2addr v1, p1
 
-    iput v1, p0, Lcom/facebook/imagepipeline/memory/p;->Vl:I
+    iput v1, p0, Lcom/facebook/imagepipeline/memory/p;->VD:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -189,28 +189,28 @@
 
     check-cast p1, Landroid/graphics/Bitmap;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/p;->Vj:Lcom/facebook/imagepipeline/memory/aa;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/p;->VB:Lcom/facebook/imagepipeline/memory/aa;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/memory/aa;->R(Ljava/lang/Object;)I
 
     move-result v0
 
-    iget v1, p0, Lcom/facebook/imagepipeline/memory/p;->Tn:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/p;->TF:I
 
     if-gt v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/p;->Vj:Lcom/facebook/imagepipeline/memory/aa;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/p;->VB:Lcom/facebook/imagepipeline/memory/aa;
 
     invoke-interface {v1, p1}, Lcom/facebook/imagepipeline/memory/aa;->put(Ljava/lang/Object;)V
 
     monitor-enter p0
 
     :try_start_0
-    iget p1, p0, Lcom/facebook/imagepipeline/memory/p;->Vl:I
+    iget p1, p0, Lcom/facebook/imagepipeline/memory/p;->VD:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/memory/p;->Vl:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/p;->VD:I
 
     monitor-exit p0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/s.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/s.smali
index 2401c18bf2..a4a87dfacc 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/s.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/s.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field final Vi:[I
+.field final VA:[I
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {p0, p1, p2, p3}, Lcom/facebook/imagepipeline/memory/a;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ad;Lcom/facebook/imagepipeline/memory/ae;)V
 
-    iget-object p1, p2, Lcom/facebook/imagepipeline/memory/ad;->VK:Landroid/util/SparseIntArray;
+    iget-object p1, p2, Lcom/facebook/imagepipeline/memory/ad;->Wc:Landroid/util/SparseIntArray;
 
     invoke-virtual {p1}, Landroid/util/SparseIntArray;->size()I
 
@@ -31,12 +31,12 @@
 
     new-array p2, p2, [I
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/s;->Vi:[I
+    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/s;->VA:[I
 
     const/4 p2, 0x0
 
     :goto_0
-    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/s;->Vi:[I
+    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/s;->VA:[I
 
     array-length v0, p3
 
@@ -122,7 +122,7 @@
 
     if-lez p1, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/s;->Vi:[I
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/s;->VA:[I
 
     array-length v1, v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/v.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/v.smali
index 846c8103e1..a6fd2378f3 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/v.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/v.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final QV:Lcom/facebook/common/g/j;
+.field private final Rn:Lcom/facebook/common/g/j;
 
-.field private final Vp:Lcom/facebook/imagepipeline/memory/s;
+.field private final VH:Lcom/facebook/imagepipeline/memory/s;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/v;->Vp:Lcom/facebook/imagepipeline/memory/s;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/v;->VH:Lcom/facebook/imagepipeline/memory/s;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/v;->QV:Lcom/facebook/common/g/j;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/v;->Rn:Lcom/facebook/common/g/j;
 
     return-void
 .end method
@@ -33,11 +33,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->QV:Lcom/facebook/common/g/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->Rn:Lcom/facebook/common/g/j;
 
-    invoke-virtual {v0, p1, p2}, Lcom/facebook/common/g/j;->a(Ljava/io/InputStream;Ljava/io/OutputStream;)J
+    invoke-virtual {v0, p1, p2}, Lcom/facebook/common/g/j;->copy(Ljava/io/InputStream;Ljava/io/OutputStream;)J
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/memory/w;->ja()Lcom/facebook/imagepipeline/memory/u;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/memory/w;->iY()Lcom/facebook/imagepipeline/memory/u;
 
     move-result-object p1
 
@@ -54,7 +54,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/w;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/v;->Vp:Lcom/facebook/imagepipeline/memory/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/v;->VH:Lcom/facebook/imagepipeline/memory/s;
 
     invoke-direct {v0, v1, p2}, Lcom/facebook/imagepipeline/memory/w;-><init>(Lcom/facebook/imagepipeline/memory/s;I)V
 
@@ -87,7 +87,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/w;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/v;->Vp:Lcom/facebook/imagepipeline/memory/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/v;->VH:Lcom/facebook/imagepipeline/memory/s;
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/memory/w;-><init>(Lcom/facebook/imagepipeline/memory/s;)V
 
@@ -115,7 +115,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/w;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/v;->Vp:Lcom/facebook/imagepipeline/memory/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/v;->VH:Lcom/facebook/imagepipeline/memory/s;
 
     array-length v2, p1
 
@@ -128,7 +128,7 @@
 
     invoke-virtual {v0, p1, v1, v2}, Lcom/facebook/imagepipeline/memory/w;->write([BII)V
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/w;->ja()Lcom/facebook/imagepipeline/memory/u;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/w;->iY()Lcom/facebook/imagepipeline/memory/u;
 
     move-result-object p1
     :try_end_0
@@ -169,7 +169,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/w;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/v;->Vp:Lcom/facebook/imagepipeline/memory/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/v;->VH:Lcom/facebook/imagepipeline/memory/s;
 
     invoke-direct {v0, v1, p1}, Lcom/facebook/imagepipeline/memory/w;-><init>(Lcom/facebook/imagepipeline/memory/s;I)V
 
@@ -216,12 +216,12 @@
     return-object p1
 .end method
 
-.method public final synthetic fH()Lcom/facebook/common/g/i;
+.method public final synthetic fL()Lcom/facebook/common/g/i;
     .locals 2
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/w;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/v;->Vp:Lcom/facebook/imagepipeline/memory/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/v;->VH:Lcom/facebook/imagepipeline/memory/s;
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/memory/w;-><init>(Lcom/facebook/imagepipeline/memory/s;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/w.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/w.smali
index 0868580430..16d45e60f6 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/w.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/w.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field private Vo:Lcom/facebook/common/references/CloseableReference;
+.field private VG:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field private final Vp:Lcom/facebook/imagepipeline/memory/s;
+.field private final VH:Lcom/facebook/imagepipeline/memory/s;
 
 .field private mCount:I
 
@@ -31,7 +31,7 @@
 .method public constructor <init>(Lcom/facebook/imagepipeline/memory/s;)V
     .locals 2
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/s;->Vi:[I
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/s;->VA:[I
 
     const/4 v1, 0x0
 
@@ -67,31 +67,31 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/memory/s;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/w;->Vp:Lcom/facebook/imagepipeline/memory/s;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/w;->VH:Lcom/facebook/imagepipeline/memory/s;
 
     iput v0, p0, Lcom/facebook/imagepipeline/memory/w;->mCount:I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/w;->Vp:Lcom/facebook/imagepipeline/memory/s;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/w;->VH:Lcom/facebook/imagepipeline/memory/s;
 
     invoke-virtual {p1, p2}, Lcom/facebook/imagepipeline/memory/s;->get(I)Ljava/lang/Object;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/memory/w;->Vp:Lcom/facebook/imagepipeline/memory/s;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/memory/w;->VH:Lcom/facebook/imagepipeline/memory/s;
 
     invoke-static {p1, p2}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Object;Lcom/facebook/common/references/b;)Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/w;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/w;->VG:Lcom/facebook/common/references/CloseableReference;
 
     return-void
 .end method
 
-.method private fN()V
+.method private fR()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->VG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
 
@@ -114,13 +114,13 @@
 .method public final close()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->VG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->c(Lcom/facebook/common/references/CloseableReference;)V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->VG:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v0, -0x1
 
@@ -131,24 +131,24 @@
     return-void
 .end method
 
-.method public final synthetic fI()Lcom/facebook/common/g/f;
+.method public final synthetic fM()Lcom/facebook/common/g/f;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/w;->ja()Lcom/facebook/imagepipeline/memory/u;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/w;->iY()Lcom/facebook/imagepipeline/memory/u;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final ja()Lcom/facebook/imagepipeline/memory/u;
+.method public final iY()Lcom/facebook/imagepipeline/memory/u;
     .locals 3
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/w;->fN()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/w;->fR()V
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/u;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->VG:Lcom/facebook/common/references/CloseableReference;
 
     iget v2, p0, Lcom/facebook/imagepipeline/memory/w;->mCount:I
 
@@ -206,15 +206,15 @@
 
     if-gt v0, v1, :cond_1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/w;->fN()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/w;->fR()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/w;->mCount:I
 
     add-int/2addr v0, p3
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/w;->fN()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/w;->fR()V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->VG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v1}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -228,7 +228,7 @@
 
     if-le v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->Vp:Lcom/facebook/imagepipeline/memory/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->VH:Lcom/facebook/imagepipeline/memory/s;
 
     invoke-virtual {v1, v0}, Lcom/facebook/imagepipeline/memory/s;->get(I)Ljava/lang/Object;
 
@@ -236,7 +236,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/memory/r;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->VG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v1}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -248,20 +248,20 @@
 
     invoke-interface {v1, v0, v2}, Lcom/facebook/imagepipeline/memory/r;->a(Lcom/facebook/imagepipeline/memory/r;I)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->VG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v1}, Lcom/facebook/common/references/CloseableReference;->close()V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->Vp:Lcom/facebook/imagepipeline/memory/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->VH:Lcom/facebook/imagepipeline/memory/s;
 
     invoke-static {v0, v1}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Object;Lcom/facebook/common/references/b;)Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->VG:Lcom/facebook/common/references/CloseableReference;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->Vo:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->VG:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/y.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/y.smali
index e73f8f1fa9..62aeef01e7 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/y.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/y.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static Vr:Lcom/facebook/imagepipeline/memory/y;
+.field private static VJ:Lcom/facebook/imagepipeline/memory/y;
 
 
 # direct methods
@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized jb()Lcom/facebook/imagepipeline/memory/y;
+.method public static declared-synchronized iZ()Lcom/facebook/imagepipeline/memory/y;
     .locals 2
 
     const-class v0, Lcom/facebook/imagepipeline/memory/y;
@@ -33,7 +33,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/memory/y;->Vr:Lcom/facebook/imagepipeline/memory/y;
+    sget-object v1, Lcom/facebook/imagepipeline/memory/y;->VJ:Lcom/facebook/imagepipeline/memory/y;
 
     if-nez v1, :cond_0
 
@@ -41,10 +41,10 @@
 
     invoke-direct {v1}, Lcom/facebook/imagepipeline/memory/y;-><init>()V
 
-    sput-object v1, Lcom/facebook/imagepipeline/memory/y;->Vr:Lcom/facebook/imagepipeline/memory/y;
+    sput-object v1, Lcom/facebook/imagepipeline/memory/y;->VJ:Lcom/facebook/imagepipeline/memory/y;
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/memory/y;->Vr:Lcom/facebook/imagepipeline/memory/y;
+    sget-object v1, Lcom/facebook/imagepipeline/memory/y;->VJ:Lcom/facebook/imagepipeline/memory/y;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/z.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/z.smali
index d92e158a1d..ea9c14c8e7 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/z.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/z.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field private Vs:Ljava/util/LinkedList;
+.field private VK:Ljava/util/LinkedList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedList<",
@@ -39,7 +39,7 @@
 
     invoke-direct {p1}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/z;->Vs:Ljava/util/LinkedList;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/z;->VK:Ljava/util/LinkedList;
 
     return-void
 .end method
@@ -54,7 +54,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/z;->Vs:Ljava/util/LinkedList;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/z;->VK:Ljava/util/LinkedList;
 
     invoke-virtual {v0}, Ljava/util/LinkedList;->poll()Ljava/lang/Object;
 
@@ -73,21 +73,21 @@
 
     invoke-direct {v1, p1}, Ljava/lang/ref/SoftReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v1, v0, Lcom/facebook/common/references/a;->He:Ljava/lang/ref/SoftReference;
+    iput-object v1, v0, Lcom/facebook/common/references/a;->Hv:Ljava/lang/ref/SoftReference;
 
     new-instance v1, Ljava/lang/ref/SoftReference;
 
     invoke-direct {v1, p1}, Ljava/lang/ref/SoftReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v1, v0, Lcom/facebook/common/references/a;->Hf:Ljava/lang/ref/SoftReference;
+    iput-object v1, v0, Lcom/facebook/common/references/a;->Hw:Ljava/lang/ref/SoftReference;
 
     new-instance v1, Ljava/lang/ref/SoftReference;
 
     invoke-direct {v1, p1}, Ljava/lang/ref/SoftReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v1, v0, Lcom/facebook/common/references/a;->Hg:Ljava/lang/ref/SoftReference;
+    iput-object v1, v0, Lcom/facebook/common/references/a;->Hx:Ljava/lang/ref/SoftReference;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/z;->UU:Ljava/util/Queue;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/z;->Vm:Ljava/util/Queue;
 
     invoke-interface {p1, v0}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
@@ -102,7 +102,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/z;->UU:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/z;->Vm:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
@@ -110,7 +110,7 @@
 
     check-cast v0, Lcom/facebook/common/references/a;
 
-    iget-object v1, v0, Lcom/facebook/common/references/a;->He:Ljava/lang/ref/SoftReference;
+    iget-object v1, v0, Lcom/facebook/common/references/a;->Hv:Ljava/lang/ref/SoftReference;
 
     const/4 v2, 0x0
 
@@ -121,47 +121,47 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, v0, Lcom/facebook/common/references/a;->He:Ljava/lang/ref/SoftReference;
+    iget-object v1, v0, Lcom/facebook/common/references/a;->Hv:Ljava/lang/ref/SoftReference;
 
     invoke-virtual {v1}, Ljava/lang/ref/SoftReference;->get()Ljava/lang/Object;
 
     move-result-object v1
 
     :goto_0
-    iget-object v3, v0, Lcom/facebook/common/references/a;->He:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->Hv:Ljava/lang/ref/SoftReference;
 
     if-eqz v3, :cond_1
 
-    iget-object v3, v0, Lcom/facebook/common/references/a;->He:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->Hv:Ljava/lang/ref/SoftReference;
 
     invoke-virtual {v3}, Ljava/lang/ref/SoftReference;->clear()V
 
-    iput-object v2, v0, Lcom/facebook/common/references/a;->He:Ljava/lang/ref/SoftReference;
+    iput-object v2, v0, Lcom/facebook/common/references/a;->Hv:Ljava/lang/ref/SoftReference;
 
     :cond_1
-    iget-object v3, v0, Lcom/facebook/common/references/a;->Hf:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->Hw:Ljava/lang/ref/SoftReference;
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v0, Lcom/facebook/common/references/a;->Hf:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->Hw:Ljava/lang/ref/SoftReference;
 
     invoke-virtual {v3}, Ljava/lang/ref/SoftReference;->clear()V
 
-    iput-object v2, v0, Lcom/facebook/common/references/a;->Hf:Ljava/lang/ref/SoftReference;
+    iput-object v2, v0, Lcom/facebook/common/references/a;->Hw:Ljava/lang/ref/SoftReference;
 
     :cond_2
-    iget-object v3, v0, Lcom/facebook/common/references/a;->Hg:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->Hx:Ljava/lang/ref/SoftReference;
 
     if-eqz v3, :cond_3
 
-    iget-object v3, v0, Lcom/facebook/common/references/a;->Hg:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->Hx:Ljava/lang/ref/SoftReference;
 
     invoke-virtual {v3}, Ljava/lang/ref/SoftReference;->clear()V
 
-    iput-object v2, v0, Lcom/facebook/common/references/a;->Hg:Ljava/lang/ref/SoftReference;
+    iput-object v2, v0, Lcom/facebook/common/references/a;->Hx:Ljava/lang/ref/SoftReference;
 
     :cond_3
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/z;->Vs:Ljava/util/LinkedList;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/z;->VK:Ljava/util/LinkedList;
 
     invoke-virtual {v2, v0}, Ljava/util/LinkedList;->add(Ljava/lang/Object;)Z
 
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 55bf52cd29..4a79aab5b8 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/Bitmaps.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/Bitmaps.smali
@@ -7,7 +7,7 @@
 .method static constructor <clinit>()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jj()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jh()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/NativeBlurFilter.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/NativeBlurFilter.smali
index 77d8c6408a..11104efc90 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/NativeBlurFilter.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/NativeBlurFilter.smali
@@ -9,7 +9,7 @@
 
     const-string v0, "native-filters"
 
-    invoke-static {v0}, Lcom/facebook/soloader/SoLoader;->aE(Ljava/lang/String;)Z
+    invoke-static {v0}, Lcom/facebook/soloader/SoLoader;->az(Ljava/lang/String;)Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/NativeRoundingFilter.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/NativeRoundingFilter.smali
index c661d42529..ce588e4aff 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/NativeRoundingFilter.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/NativeRoundingFilter.smali
@@ -9,7 +9,7 @@
 
     const-string v0, "native-filters"
 
-    invoke-static {v0}, Lcom/facebook/soloader/SoLoader;->aE(Ljava/lang/String;)Z
+    invoke-static {v0}, Lcom/facebook/soloader/SoLoader;->az(Ljava/lang/String;)Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/WebpTranscoderImpl.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/WebpTranscoderImpl.smali
index 84ab55e7e5..16270bc040 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/WebpTranscoderImpl.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/WebpTranscoderImpl.smali
@@ -33,7 +33,7 @@
 
 
 # virtual methods
-.method public final b(Ljava/io/InputStream;Ljava/io/OutputStream;)V
+.method public final a(Ljava/io/InputStream;Ljava/io/OutputStream;)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -41,7 +41,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fc()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fh()V
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -62,7 +62,7 @@
     return-void
 .end method
 
-.method public final c(Ljava/io/InputStream;Ljava/io/OutputStream;)V
+.method public final b(Ljava/io/InputStream;Ljava/io/OutputStream;)V
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -70,7 +70,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fc()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fh()V
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -92,7 +92,7 @@
 .method public final d(Lcom/facebook/d/c;)Z
     .locals 2
 
-    sget-object v0, Lcom/facebook/d/b;->Px:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PP:Lcom/facebook/d/c;
 
     const/4 v1, 0x0
 
@@ -112,22 +112,22 @@
     return v1
 
     :cond_1
-    sget-object v0, Lcom/facebook/d/b;->Py:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PQ:Lcom/facebook/d/c;
 
     if-eq p1, v0, :cond_4
 
-    sget-object v0, Lcom/facebook/d/b;->Pz:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PR:Lcom/facebook/d/c;
 
     if-eq p1, v0, :cond_4
 
-    sget-object v0, Lcom/facebook/d/b;->PA:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PS:Lcom/facebook/d/c;
 
     if-ne p1, v0, :cond_2
 
     goto :goto_0
 
     :cond_2
-    sget-object v0, Lcom/facebook/d/b;->PB:Lcom/facebook/d/c;
+    sget-object v0, Lcom/facebook/d/b;->PT:Lcom/facebook/d/c;
 
     if-ne p1, v0, :cond_3
 
@@ -144,7 +144,7 @@
 
     :cond_4
     :goto_0
-    sget-boolean p1, Lcom/facebook/common/k/c;->HJ:Z
+    sget-boolean p1, Lcom/facebook/common/k/c;->Ia:Z
 
     return p1
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/a.smali
index 15fe9b4b09..79cea27eec 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final VR:Ljava/util/List;
+.field public static final Wj:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -27,17 +27,17 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/nativecode/a;->VR:Ljava/util/List;
+    sput-object v0, Lcom/facebook/imagepipeline/nativecode/a;->Wj:Ljava/util/List;
 
     return-void
 .end method
 
-.method public static jj()V
+.method public static jh()V
     .locals 1
 
     const-string v0, "imagepipeline"
 
-    invoke-static {v0}, Lcom/facebook/soloader/SoLoader;->aE(Ljava/lang/String;)Z
+    invoke-static {v0}, Lcom/facebook/soloader/SoLoader;->az(Ljava/lang/String;)Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/c.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/c.smali
index b58707c92a..83e51a41fe 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/c.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/c.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static EJ:Z
+.field private static Fb:Z
 
 
 # direct methods
-.method public static declared-synchronized fc()V
+.method public static declared-synchronized fh()V
     .locals 3
 
     const-class v0, Lcom/facebook/imagepipeline/nativecode/c;
@@ -16,7 +16,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-boolean v1, Lcom/facebook/imagepipeline/nativecode/c;->EJ:Z
+    sget-boolean v1, Lcom/facebook/imagepipeline/nativecode/c;->Fb:Z
 
     if-nez v1, :cond_1
 
@@ -31,7 +31,7 @@
     :try_start_1
     const-string v1, "fb_jpegturbo"
 
-    invoke-static {v1}, Lcom/facebook/soloader/SoLoader;->aE(Ljava/lang/String;)Z
+    invoke-static {v1}, Lcom/facebook/soloader/SoLoader;->az(Ljava/lang/String;)Z
     :try_end_1
     .catch Ljava/lang/UnsatisfiedLinkError; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -41,11 +41,11 @@
     :try_start_2
     const-string v1, "native-imagetranscoder"
 
-    invoke-static {v1}, Lcom/facebook/soloader/SoLoader;->aE(Ljava/lang/String;)Z
+    invoke-static {v1}, Lcom/facebook/soloader/SoLoader;->az(Ljava/lang/String;)Z
 
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/facebook/imagepipeline/nativecode/c;->EJ:Z
+    sput-boolean v1, Lcom/facebook/imagepipeline/nativecode/c;->Fb:Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/d.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/d.smali
index 222d1bfed8..cbddd6b2c1 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/d.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/d.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static EJ:Z
+.field private static Fb:Z
 
 
 # direct methods
-.method public static declared-synchronized fc()V
+.method public static declared-synchronized fh()V
     .locals 3
 
     const-class v0, Lcom/facebook/imagepipeline/nativecode/d;
@@ -16,7 +16,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-boolean v1, Lcom/facebook/imagepipeline/nativecode/d;->EJ:Z
+    sget-boolean v1, Lcom/facebook/imagepipeline/nativecode/d;->Fb:Z
 
     if-nez v1, :cond_1
 
@@ -31,7 +31,7 @@
     :try_start_1
     const-string v1, "fb_jpegturbo"
 
-    invoke-static {v1}, Lcom/facebook/soloader/SoLoader;->aE(Ljava/lang/String;)Z
+    invoke-static {v1}, Lcom/facebook/soloader/SoLoader;->az(Ljava/lang/String;)Z
     :try_end_1
     .catch Ljava/lang/UnsatisfiedLinkError; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -41,11 +41,11 @@
     :try_start_2
     const-string v1, "static-webp"
 
-    invoke-static {v1}, Lcom/facebook/soloader/SoLoader;->aE(Ljava/lang/String;)Z
+    invoke-static {v1}, Lcom/facebook/soloader/SoLoader;->az(Ljava/lang/String;)Z
 
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/facebook/imagepipeline/nativecode/d;->EJ:Z
+    sput-boolean v1, Lcom/facebook/imagepipeline/nativecode/d;->Fb:Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/e.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/e.smali
index efd4daabd1..6ee6618037 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/e.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/e.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract b(Ljava/io/InputStream;Ljava/io/OutputStream;)V
+.method public abstract a(Ljava/io/InputStream;Ljava/io/OutputStream;)V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -12,7 +12,7 @@
     .end annotation
 .end method
 
-.method public abstract c(Ljava/io/InputStream;Ljava/io/OutputStream;)V
+.method public abstract b(Ljava/io/InputStream;Ljava/io/OutputStream;)V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/f.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/f.smali
index 9e7496901a..e35e01e957 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/f.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/f.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static VV:Lcom/facebook/imagepipeline/nativecode/e; = null
+.field private static Wn:Lcom/facebook/imagepipeline/nativecode/e; = null
 
-.field public static VW:Z = false
+.field public static Wo:Z = false
 
 
 # direct methods
@@ -26,11 +26,11 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/nativecode/e;
 
-    sput-object v0, Lcom/facebook/imagepipeline/nativecode/f;->VV:Lcom/facebook/imagepipeline/nativecode/e;
+    sput-object v0, Lcom/facebook/imagepipeline/nativecode/f;->Wn:Lcom/facebook/imagepipeline/nativecode/e;
 
     const/4 v0, 0x1
 
-    sput-boolean v0, Lcom/facebook/imagepipeline/nativecode/f;->VW:Z
+    sput-boolean v0, Lcom/facebook/imagepipeline/nativecode/f;->Wo:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -39,15 +39,15 @@
     :catchall_0
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/facebook/imagepipeline/nativecode/f;->VW:Z
+    sput-boolean v0, Lcom/facebook/imagepipeline/nativecode/f;->Wo:Z
 
     return-void
 .end method
 
-.method public static jk()Lcom/facebook/imagepipeline/nativecode/e;
+.method public static ji()Lcom/facebook/imagepipeline/nativecode/e;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/nativecode/f;->VV:Lcom/facebook/imagepipeline/nativecode/e;
+    sget-object v0, Lcom/facebook/imagepipeline/nativecode/f;->Wn:Lcom/facebook/imagepipeline/nativecode/e;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/platform/d.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/platform/d.smali
index 7cf7a2b75f..524e9b9d17 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/platform/d.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/platform/d.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final QH:Lcom/facebook/imagepipeline/memory/n;
+.field private final QZ:Lcom/facebook/imagepipeline/memory/n;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/platform/d;->QH:Lcom/facebook/imagepipeline/memory/n;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/platform/d;->QZ:Lcom/facebook/imagepipeline/memory/n;
 
     return-void
 .end method
@@ -45,7 +45,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lcom/facebook/imagepipeline/platform/d;->VP:[B
+    sget-object v0, Lcom/facebook/imagepipeline/platform/d;->Wh:[B
 
     :goto_0
     invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
@@ -72,7 +72,7 @@
     :goto_1
     invoke-static {v1}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/platform/d;->QH:Lcom/facebook/imagepipeline/memory/n;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/platform/d;->QZ:Lcom/facebook/imagepipeline/memory/n;
 
     add-int/lit8 v3, p2, 0x2
 
@@ -154,7 +154,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/platform/d;->QH:Lcom/facebook/imagepipeline/memory/n;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/platform/d;->QZ:Lcom/facebook/imagepipeline/memory/n;
 
     invoke-virtual {v1, v0}, Lcom/facebook/imagepipeline/memory/n;->aw(I)Lcom/facebook/common/references/CloseableReference;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/platform/g.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/platform/g.smali
index 3569a0f7e3..931a799dce 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/platform/g.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/platform/g.smali
@@ -13,13 +13,13 @@
 
     if-lt v0, v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->jf()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->jd()I
 
     move-result p1
 
     new-instance v0, Lcom/facebook/imagepipeline/platform/e;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->jc()Lcom/facebook/imagepipeline/memory/d;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->ja()Lcom/facebook/imagepipeline/memory/d;
 
     move-result-object p0
 
@@ -38,13 +38,13 @@
 
     if-lt v0, v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->jf()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->jd()I
 
     move-result p1
 
     new-instance v0, Lcom/facebook/imagepipeline/platform/a;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->jc()Lcom/facebook/imagepipeline/memory/d;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->ja()Lcom/facebook/imagepipeline/memory/d;
 
     move-result-object p0
 
@@ -74,7 +74,7 @@
     :cond_2
     new-instance p1, Lcom/facebook/imagepipeline/platform/d;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->je()Lcom/facebook/imagepipeline/memory/n;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ac;->jc()Lcom/facebook/imagepipeline/memory/n;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/request/b$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/request/b$a.smali
index 833a4aa580..7de1e3be9d 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/request/b$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/request/b$a.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
-.field public static final enum Yx:Lcom/facebook/imagepipeline/request/b$a;
+.field public static final enum YP:Lcom/facebook/imagepipeline/request/b$a;
 
-.field public static final enum Yy:Lcom/facebook/imagepipeline/request/b$a;
+.field public static final enum YQ:Lcom/facebook/imagepipeline/request/b$a;
 
-.field private static final synthetic Yz:[Lcom/facebook/imagepipeline/request/b$a;
+.field private static final synthetic YR:[Lcom/facebook/imagepipeline/request/b$a;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/imagepipeline/request/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->Yx:Lcom/facebook/imagepipeline/request/b$a;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->YP:Lcom/facebook/imagepipeline/request/b$a;
 
     new-instance v0, Lcom/facebook/imagepipeline/request/b$a;
 
@@ -52,21 +52,21 @@
 
     invoke-direct {v0, v3, v2}, Lcom/facebook/imagepipeline/request/b$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->Yy:Lcom/facebook/imagepipeline/request/b$a;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->YQ:Lcom/facebook/imagepipeline/request/b$a;
 
     const/4 v0, 0x2
 
     new-array v0, v0, [Lcom/facebook/imagepipeline/request/b$a;
 
-    sget-object v3, Lcom/facebook/imagepipeline/request/b$a;->Yx:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v3, Lcom/facebook/imagepipeline/request/b$a;->YP:Lcom/facebook/imagepipeline/request/b$a;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$a;->Yy:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$a;->YQ:Lcom/facebook/imagepipeline/request/b$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->Yz:[Lcom/facebook/imagepipeline/request/b$a;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->YR:[Lcom/facebook/imagepipeline/request/b$a;
 
     return-void
 .end method
@@ -101,7 +101,7 @@
 .method public static values()[Lcom/facebook/imagepipeline/request/b$a;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/request/b$a;->Yz:[Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v0, Lcom/facebook/imagepipeline/request/b$a;->YR:[Lcom/facebook/imagepipeline/request/b$a;
 
     invoke-virtual {v0}, [Lcom/facebook/imagepipeline/request/b$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/request/b$b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/request/b$b.smali
index a7dba4aaff..ebb0108a85 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/request/b$b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/request/b$b.smali
@@ -23,15 +23,15 @@
 
 
 # static fields
-.field public static final enum YA:Lcom/facebook/imagepipeline/request/b$b;
+.field public static final enum YS:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public static final enum YB:Lcom/facebook/imagepipeline/request/b$b;
+.field public static final enum YT:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public static final enum YC:Lcom/facebook/imagepipeline/request/b$b;
+.field public static final enum YU:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public static final enum YD:Lcom/facebook/imagepipeline/request/b$b;
+.field public static final enum YV:Lcom/facebook/imagepipeline/request/b$b;
 
-.field private static final synthetic YE:[Lcom/facebook/imagepipeline/request/b$b;
+.field private static final synthetic YW:[Lcom/facebook/imagepipeline/request/b$b;
 
 
 # instance fields
@@ -52,7 +52,7 @@
 
     invoke-direct {v0, v3, v1, v2}, Lcom/facebook/imagepipeline/request/b$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->YA:Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->YS:Lcom/facebook/imagepipeline/request/b$b;
 
     new-instance v0, Lcom/facebook/imagepipeline/request/b$b;
 
@@ -62,7 +62,7 @@
 
     invoke-direct {v0, v4, v2, v3}, Lcom/facebook/imagepipeline/request/b$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->YB:Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->YT:Lcom/facebook/imagepipeline/request/b$b;
 
     new-instance v0, Lcom/facebook/imagepipeline/request/b$b;
 
@@ -72,7 +72,7 @@
 
     invoke-direct {v0, v5, v3, v4}, Lcom/facebook/imagepipeline/request/b$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->YC:Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->YU:Lcom/facebook/imagepipeline/request/b$b;
 
     new-instance v0, Lcom/facebook/imagepipeline/request/b$b;
 
@@ -82,27 +82,27 @@
 
     invoke-direct {v0, v6, v4, v5}, Lcom/facebook/imagepipeline/request/b$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->YD:Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->YV:Lcom/facebook/imagepipeline/request/b$b;
 
     new-array v0, v5, [Lcom/facebook/imagepipeline/request/b$b;
 
-    sget-object v5, Lcom/facebook/imagepipeline/request/b$b;->YA:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v5, Lcom/facebook/imagepipeline/request/b$b;->YS:Lcom/facebook/imagepipeline/request/b$b;
 
     aput-object v5, v0, v1
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YB:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YT:Lcom/facebook/imagepipeline/request/b$b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YC:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YU:Lcom/facebook/imagepipeline/request/b$b;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YD:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->YV:Lcom/facebook/imagepipeline/request/b$b;
 
     aput-object v1, v0, v4
 
-    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->YE:[Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->YW:[Lcom/facebook/imagepipeline/request/b$b;
 
     return-void
 .end method
@@ -154,7 +154,7 @@
 .method public static values()[Lcom/facebook/imagepipeline/request/b$b;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/request/b$b;->YE:[Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v0, Lcom/facebook/imagepipeline/request/b$b;->YW:[Lcom/facebook/imagepipeline/request/b$b;
 
     invoke-virtual {v0}, [Lcom/facebook/imagepipeline/request/b$b;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/imageutils/a$1.smali b/com.discord/smali_classes2/com/facebook/imageutils/a$1.smali
index 30bb865fae..2858eb1b35 100644
--- a/com.discord/smali_classes2/com/facebook/imageutils/a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imageutils/a$1.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final synthetic YM:[I
+.field static final synthetic Ze:[I
 
 
 # direct methods
@@ -30,10 +30,10 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/imageutils/a$1;->YM:[I
+    sput-object v0, Lcom/facebook/imageutils/a$1;->Ze:[I
 
     :try_start_0
-    sget-object v0, Lcom/facebook/imageutils/a$1;->YM:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->Ze:[I
 
     sget-object v1, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
 
@@ -49,7 +49,7 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/facebook/imageutils/a$1;->YM:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->Ze:[I
 
     sget-object v1, Landroid/graphics/Bitmap$Config;->ALPHA_8:Landroid/graphics/Bitmap$Config;
 
@@ -65,7 +65,7 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lcom/facebook/imageutils/a$1;->YM:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->Ze:[I
 
     sget-object v1, Landroid/graphics/Bitmap$Config;->ARGB_4444:Landroid/graphics/Bitmap$Config;
 
@@ -81,7 +81,7 @@
 
     :catch_2
     :try_start_3
-    sget-object v0, Lcom/facebook/imageutils/a$1;->YM:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->Ze:[I
 
     sget-object v1, Landroid/graphics/Bitmap$Config;->RGB_565:Landroid/graphics/Bitmap$Config;
 
@@ -97,7 +97,7 @@
 
     :catch_3
     :try_start_4
-    sget-object v0, Lcom/facebook/imageutils/a$1;->YM:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->Ze:[I
 
     sget-object v1, Landroid/graphics/Bitmap$Config;->RGBA_F16:Landroid/graphics/Bitmap$Config;
 
diff --git a/com.discord/smali_classes2/com/facebook/imageutils/e$a.smali b/com.discord/smali_classes2/com/facebook/imageutils/e$a.smali
index 18e1257030..6543fc6ea2 100644
--- a/com.discord/smali_classes2/com/facebook/imageutils/e$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imageutils/e$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field YO:I
+.field Zg:I
 
-.field YP:I
+.field Zh:I
 
 .field isLittleEndian:Z
 
diff --git a/com.discord/smali_classes2/com/facebook/imageutils/e.smali b/com.discord/smali_classes2/com/facebook/imageutils/e.smali
index 5b62953a4f..ebb2ab3411 100644
--- a/com.discord/smali_classes2/com/facebook/imageutils/e.smali
+++ b/com.discord/smali_classes2/com/facebook/imageutils/e.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -28,7 +28,7 @@
 
     const-class v0, Lcom/facebook/imageutils/e;
 
-    sput-object v0, Lcom/facebook/imageutils/e;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imageutils/e;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -117,23 +117,23 @@
 
     move-result v5
 
-    iput v5, v0, Lcom/facebook/imageutils/e$a;->YO:I
+    iput v5, v0, Lcom/facebook/imageutils/e$a;->Zg:I
 
     add-int/lit8 p1, p1, -0x4
 
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->YO:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->Zg:I
 
     const v6, 0x49492a00    # 823968.0f
 
     if-eq v5, v6, :cond_1
 
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->YO:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->Zg:I
 
     const v7, 0x4d4d002a    # 2.14958752E8f
 
     if-eq v5, v7, :cond_1
 
-    sget-object p1, Lcom/facebook/imageutils/e;->Fl:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/imageutils/e;->FC:Ljava/lang/Class;
 
     const-string v5, "Invalid TIFF header"
 
@@ -142,7 +142,7 @@
     goto :goto_0
 
     :cond_1
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->YO:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->Zg:I
 
     if-ne v5, v6, :cond_2
 
@@ -162,22 +162,22 @@
 
     move-result v5
 
-    iput v5, v0, Lcom/facebook/imageutils/e$a;->YP:I
+    iput v5, v0, Lcom/facebook/imageutils/e$a;->Zh:I
 
     add-int/lit8 p1, p1, -0x4
 
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->YP:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->Zh:I
 
     if-lt v5, v4, :cond_3
 
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->YP:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->Zh:I
 
     sub-int/2addr v5, v4
 
     if-le v5, p1, :cond_4
 
     :cond_3
-    sget-object p1, Lcom/facebook/imageutils/e;->Fl:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/imageutils/e;->FC:Ljava/lang/Class;
 
     const-string v5, "Invalid offset"
 
@@ -187,7 +187,7 @@
 
     :cond_4
     :goto_2
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->YP:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->Zh:I
 
     sub-int/2addr v5, v4
 
diff --git a/com.discord/smali_classes2/com/facebook/samples/a/a$a.smali b/com.discord/smali_classes2/com/facebook/samples/a/a$a.smali
index 62f9f7fa47..d38b9c4b95 100644
--- a/com.discord/smali_classes2/com/facebook/samples/a/a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/a/a$a.smali
@@ -15,11 +15,11 @@
 
 
 # virtual methods
+.method public abstract jV()V
+.end method
+
+.method public abstract jW()V
+.end method
+
 .method public abstract jX()V
 .end method
-
-.method public abstract jY()V
-.end method
-
-.method public abstract jZ()V
-.end method
diff --git a/com.discord/smali_classes2/com/facebook/samples/a/a.smali b/com.discord/smali_classes2/com/facebook/samples/a/a.smali
index e6c9387b89..ceb035d636 100644
--- a/com.discord/smali_classes2/com/facebook/samples/a/a.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/a/a.smali
@@ -12,23 +12,23 @@
 
 
 # instance fields
-.field public YQ:Z
+.field public Zi:Z
 
-.field public YR:I
+.field public Zj:I
 
-.field public YS:I
+.field public Zk:I
 
-.field public final YT:[I
+.field public final Zl:[I
 
-.field public final YU:[F
+.field public final Zm:[F
 
-.field public final YV:[F
+.field public final Zn:[F
 
-.field public final YW:[F
+.field public final Zo:[F
 
-.field public final YX:[F
+.field public final Zp:[F
 
-.field public YY:Lcom/facebook/samples/a/a$a;
+.field public Zq:Lcom/facebook/samples/a/a$a;
 
 
 # direct methods
@@ -41,27 +41,27 @@
 
     new-array v1, v0, [I
 
-    iput-object v1, p0, Lcom/facebook/samples/a/a;->YT:[I
+    iput-object v1, p0, Lcom/facebook/samples/a/a;->Zl:[I
 
     new-array v1, v0, [F
 
-    iput-object v1, p0, Lcom/facebook/samples/a/a;->YU:[F
+    iput-object v1, p0, Lcom/facebook/samples/a/a;->Zm:[F
 
     new-array v1, v0, [F
 
-    iput-object v1, p0, Lcom/facebook/samples/a/a;->YV:[F
+    iput-object v1, p0, Lcom/facebook/samples/a/a;->Zn:[F
 
     new-array v1, v0, [F
 
-    iput-object v1, p0, Lcom/facebook/samples/a/a;->YW:[F
+    iput-object v1, p0, Lcom/facebook/samples/a/a;->Zo:[F
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/facebook/samples/a/a;->YX:[F
+    iput-object v0, p0, Lcom/facebook/samples/a/a;->Zp:[F
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/samples/a/a;->YY:Lcom/facebook/samples/a/a$a;
+    iput-object v0, p0, Lcom/facebook/samples/a/a;->Zq:Lcom/facebook/samples/a/a$a;
 
     invoke-virtual {p0}, Lcom/facebook/samples/a/a;->reset()V
 
@@ -70,44 +70,44 @@
 
 
 # virtual methods
-.method public final jV()V
+.method public final jT()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->YQ:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->Zi:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/samples/a/a;->YY:Lcom/facebook/samples/a/a$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/a;->Zq:Lcom/facebook/samples/a/a$a;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->jX()V
+    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->jV()V
 
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->YQ:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->Zi:Z
 
     :cond_1
     return-void
 .end method
 
-.method public final jW()V
+.method public final jU()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->YQ:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->Zi:Z
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->YQ:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->Zi:Z
 
-    iget-object v0, p0, Lcom/facebook/samples/a/a;->YY:Lcom/facebook/samples/a/a$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/a;->Zq:Lcom/facebook/samples/a/a$a;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->jZ()V
+    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->jX()V
 
     :cond_0
     return-void
@@ -118,16 +118,16 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->YQ:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->Zi:Z
 
-    iput v0, p0, Lcom/facebook/samples/a/a;->YR:I
+    iput v0, p0, Lcom/facebook/samples/a/a;->Zj:I
 
     :goto_0
     const/4 v1, 0x2
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/samples/a/a;->YT:[I
+    iget-object v1, p0, Lcom/facebook/samples/a/a;->Zl:[I
 
     const/4 v2, -0x1
 
diff --git a/com.discord/smali_classes2/com/facebook/samples/a/b$a.smali b/com.discord/smali_classes2/com/facebook/samples/a/b$a.smali
index 3d1e80d1a0..a174444ffa 100644
--- a/com.discord/smali_classes2/com/facebook/samples/a/b$a.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/a/b$a.smali
@@ -21,5 +21,5 @@
 .method public abstract b(Lcom/facebook/samples/a/b;)V
 .end method
 
-.method public abstract kb()V
+.method public abstract jZ()V
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/samples/a/b.smali b/com.discord/smali_classes2/com/facebook/samples/a/b.smali
index 13c2def991..83893f05ba 100644
--- a/com.discord/smali_classes2/com/facebook/samples/a/b.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/a/b.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field public final YZ:Lcom/facebook/samples/a/a;
+.field public final Zr:Lcom/facebook/samples/a/a;
 
-.field public Za:Lcom/facebook/samples/a/b$a;
+.field public Zs:Lcom/facebook/samples/a/b$a;
 
 
 # direct methods
@@ -28,13 +28,13 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/samples/a/b;->Za:Lcom/facebook/samples/a/b$a;
+    iput-object v0, p0, Lcom/facebook/samples/a/b;->Zs:Lcom/facebook/samples/a/b$a;
 
-    iput-object p1, p0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iput-object p1, p0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object p1, p0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object p1, p0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iput-object p0, p1, Lcom/facebook/samples/a/a;->YY:Lcom/facebook/samples/a/a$a;
+    iput-object p0, p1, Lcom/facebook/samples/a/a;->Zq:Lcom/facebook/samples/a/a$a;
 
     return-void
 .end method
@@ -77,13 +77,13 @@
 .method public final getPivotX()F
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v0, v0, Lcom/facebook/samples/a/a;->YU:[F
+    iget-object v0, v0, Lcom/facebook/samples/a/a;->Zm:[F
 
-    iget-object v1, p0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v1, p0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget v1, v1, Lcom/facebook/samples/a/a;->YR:I
+    iget v1, v1, Lcom/facebook/samples/a/a;->Zj:I
 
     invoke-static {v0, v1}, Lcom/facebook/samples/a/b;->a([FI)F
 
@@ -95,13 +95,13 @@
 .method public final getPivotY()F
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v0, v0, Lcom/facebook/samples/a/a;->YV:[F
+    iget-object v0, v0, Lcom/facebook/samples/a/a;->Zn:[F
 
-    iget-object v1, p0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v1, p0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget v1, v1, Lcom/facebook/samples/a/a;->YR:I
+    iget v1, v1, Lcom/facebook/samples/a/a;->Zj:I
 
     invoke-static {v0, v1}, Lcom/facebook/samples/a/b;->a([FI)F
 
@@ -110,10 +110,10 @@
     return v0
 .end method
 
-.method public final jX()V
+.method public final jV()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->Za:Lcom/facebook/samples/a/b$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->Zs:Lcom/facebook/samples/a/b$a;
 
     if-eqz v0, :cond_0
 
@@ -123,10 +123,10 @@
     return-void
 .end method
 
-.method public final jY()V
+.method public final jW()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->Za:Lcom/facebook/samples/a/b$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->Zs:Lcom/facebook/samples/a/b$a;
 
     if-eqz v0, :cond_0
 
@@ -136,29 +136,29 @@
     return-void
 .end method
 
-.method public final jZ()V
+.method public final jX()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->Za:Lcom/facebook/samples/a/b$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->Zs:Lcom/facebook/samples/a/b$a;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/facebook/samples/a/b$a;->kb()V
+    invoke-interface {v0}, Lcom/facebook/samples/a/b$a;->jZ()V
 
     :cond_0
     return-void
 .end method
 
-.method public final ka()V
+.method public final jY()V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-boolean v1, v0, Lcom/facebook/samples/a/a;->YQ:Z
+    iget-boolean v1, v0, Lcom/facebook/samples/a/a;->Zi:Z
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jW()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jU()V
 
     const/4 v1, 0x0
 
@@ -167,17 +167,17 @@
 
     if-ge v1, v2, :cond_0
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->YU:[F
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->Zm:[F
 
-    iget-object v3, v0, Lcom/facebook/samples/a/a;->YW:[F
+    iget-object v3, v0, Lcom/facebook/samples/a/a;->Zo:[F
 
     aget v3, v3, v1
 
     aput v3, v2, v1
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->YV:[F
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->Zn:[F
 
-    iget-object v3, v0, Lcom/facebook/samples/a/a;->YX:[F
+    iget-object v3, v0, Lcom/facebook/samples/a/a;->Zp:[F
 
     aget v3, v3, v1
 
@@ -188,7 +188,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jV()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jT()V
 
     :cond_1
     return-void
diff --git a/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView$1.smali b/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView$1.smali
index e147805f96..0e0b61bc09 100644
--- a/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView$1.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView$1.smali
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic ZN:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+.field final synthetic aaf:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;->ZN:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;->aaf:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
     invoke-direct {p0}, Lcom/facebook/drawee/controller/b;-><init>()V
 
@@ -42,7 +42,7 @@
 .method public final onFinalImageSet(Ljava/lang/String;Ljava/lang/Object;Landroid/graphics/drawable/Animatable;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;->ZN:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;->aaf:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
     invoke-static {p1}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->a(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
 
@@ -52,7 +52,7 @@
 .method public final onRelease(Ljava/lang/String;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;->ZN:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;->aaf:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
     invoke-static {p1}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->b(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView$2.smali b/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView$2.smali
index 6c0c04b88d..83e661193c 100644
--- a/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView$2.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic ZN:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+.field final synthetic aaf:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;->ZN:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;->aaf:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final g(Landroid/graphics/Matrix;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;->ZN:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;->aaf:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
     invoke-virtual {v0, p1}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->g(Landroid/graphics/Matrix;)V
 
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 5f05bf66e6..748dcd07c7 100644
--- a/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -29,25 +29,25 @@
 
 
 # instance fields
-.field private final Km:Lcom/facebook/drawee/controller/ControllerListener;
+.field private final KD:Lcom/facebook/drawee/controller/ControllerListener;
 
-.field private ZG:Z
+.field private final ZK:Landroid/graphics/RectF;
 
-.field private ZH:Lcom/facebook/drawee/d/a;
+.field private final ZL:Landroid/graphics/RectF;
 
-.field private ZI:Lcom/facebook/samples/zoomable/f;
+.field private ZY:Z
 
-.field private ZJ:Landroid/view/GestureDetector;
+.field private ZZ:Lcom/facebook/drawee/d/a;
 
-.field private ZK:Z
+.field private aaa:Lcom/facebook/samples/zoomable/f;
 
-.field private final ZL:Lcom/facebook/samples/zoomable/f$a;
+.field private aab:Landroid/view/GestureDetector;
 
-.field private final ZM:Lcom/facebook/samples/zoomable/e;
+.field private aac:Z
 
-.field private final Zs:Landroid/graphics/RectF;
+.field private final aad:Lcom/facebook/samples/zoomable/f$a;
 
-.field private final Zt:Landroid/graphics/RectF;
+.field private final aae:Lcom/facebook/samples/zoomable/e;
 
 
 # direct methods
@@ -56,7 +56,7 @@
 
     const-class v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
-    sput-object v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -68,41 +68,41 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZG:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZY:Z
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zt:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZL:Landroid/graphics/RectF;
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zs:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Landroid/graphics/RectF;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aac:Z
 
     new-instance v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;
 
     invoke-direct {v0, p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;-><init>(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     new-instance v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;
 
     invoke-direct {v0, p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;-><init>(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZL:Lcom/facebook/samples/zoomable/f$a;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aad:Lcom/facebook/samples/zoomable/f$a;
 
     new-instance v0, Lcom/facebook/samples/zoomable/e;
 
     invoke-direct {v0}, Lcom/facebook/samples/zoomable/e;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZM:Lcom/facebook/samples/zoomable/e;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aae:Lcom/facebook/samples/zoomable/e;
 
     const/4 v0, 0x0
 
@@ -120,41 +120,41 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZG:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZY:Z
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zt:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZL:Landroid/graphics/RectF;
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zs:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Landroid/graphics/RectF;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aac:Z
 
     new-instance v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;
 
     invoke-direct {v0, p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;-><init>(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     new-instance v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;
 
     invoke-direct {v0, p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;-><init>(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZL:Lcom/facebook/samples/zoomable/f$a;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aad:Lcom/facebook/samples/zoomable/f$a;
 
     new-instance v0, Lcom/facebook/samples/zoomable/e;
 
     invoke-direct {v0}, Lcom/facebook/samples/zoomable/e;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZM:Lcom/facebook/samples/zoomable/e;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aae:Lcom/facebook/samples/zoomable/e;
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->c(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -170,41 +170,41 @@
 
     const/4 p3, 0x0
 
-    iput-boolean p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZG:Z
+    iput-boolean p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZY:Z
 
     new-instance p3, Landroid/graphics/RectF;
 
     invoke-direct {p3}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zt:Landroid/graphics/RectF;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZL:Landroid/graphics/RectF;
 
     new-instance p3, Landroid/graphics/RectF;
 
     invoke-direct {p3}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zs:Landroid/graphics/RectF;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Landroid/graphics/RectF;
 
     const/4 p3, 0x1
 
-    iput-boolean p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Z
+    iput-boolean p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aac:Z
 
     new-instance p3, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;
 
     invoke-direct {p3, p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;-><init>(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
 
-    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     new-instance p3, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;
 
     invoke-direct {p3, p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;-><init>(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
 
-    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZL:Lcom/facebook/samples/zoomable/f$a;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aad:Lcom/facebook/samples/zoomable/f$a;
 
     new-instance p3, Lcom/facebook/samples/zoomable/e;
 
     invoke-direct {p3}, Lcom/facebook/samples/zoomable/e;-><init>()V
 
-    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZM:Lcom/facebook/samples/zoomable/e;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aae:Lcom/facebook/samples/zoomable/e;
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->c(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -220,41 +220,41 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZG:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZY:Z
 
     new-instance p1, Landroid/graphics/RectF;
 
     invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zt:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZL:Landroid/graphics/RectF;
 
     new-instance p1, Landroid/graphics/RectF;
 
     invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zs:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Landroid/graphics/RectF;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aac:Z
 
     new-instance p1, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;
 
     invoke-direct {p1, p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;-><init>(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     new-instance p1, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;
 
     invoke-direct {p1, p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;-><init>(Lcom/facebook/samples/zoomable/ZoomableDraweeView;)V
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZL:Lcom/facebook/samples/zoomable/f$a;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aad:Lcom/facebook/samples/zoomable/f$a;
 
     new-instance p1, Lcom/facebook/samples/zoomable/e;
 
     invoke-direct {p1}, Lcom/facebook/samples/zoomable/e;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZM:Lcom/facebook/samples/zoomable/e;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aae:Lcom/facebook/samples/zoomable/e;
 
     invoke-virtual {p0, p2}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->setHierarchy(Lcom/facebook/drawee/d/b;)V
 
@@ -276,7 +276,7 @@
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZH:Lcom/facebook/drawee/d/a;
+    iput-object p2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZZ:Lcom/facebook/drawee/d/a;
 
     invoke-super {p0, p1}, Lcom/facebook/drawee/view/DraweeView;->setController(Lcom/facebook/drawee/d/a;)V
 
@@ -302,7 +302,7 @@
 
     invoke-static {v0, v2, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {v0}, Lcom/facebook/samples/zoomable/f;->isEnabled()Z
 
@@ -310,9 +310,9 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ki()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->kg()V
 
-    iget-object p0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object p0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     const/4 v0, 0x1
 
@@ -341,7 +341,7 @@
 
     invoke-static {v0, v2, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object p0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object p0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     const/4 v0, 0x0
 
@@ -361,19 +361,19 @@
 
     invoke-direct {v1, v0}, Lcom/facebook/drawee/generic/a;-><init>(Landroid/content/res/Resources;)V
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MH:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->MZ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    invoke-virtual {v1, v0}, Lcom/facebook/drawee/generic/a;->c(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/generic/a;
+    invoke-virtual {v1, v0}, Lcom/facebook/drawee/generic/a;->b(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/generic/a;
 
     move-result-object v0
 
     invoke-static {v0, p1, p2}, Lcom/facebook/drawee/generic/b;->a(Lcom/facebook/drawee/generic/a;Landroid/content/Context;Landroid/util/AttributeSet;)Lcom/facebook/drawee/generic/a;
 
-    iget p1, v0, Lcom/facebook/drawee/generic/a;->MX:F
+    iget p1, v0, Lcom/facebook/drawee/generic/a;->Np:F
 
     invoke-virtual {p0, p1}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->setAspectRatio(F)V
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/generic/a;->gX()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {v0}, Lcom/facebook/drawee/generic/a;->hb()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
     move-result-object p1
 
@@ -391,7 +391,7 @@
 
     check-cast p1, Lcom/facebook/drawee/controller/AbstractDraweeController;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     invoke-virtual {p1, v0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->b(Lcom/facebook/drawee/controller/ControllerListener;)V
 
@@ -408,7 +408,7 @@
 
     check-cast p1, Lcom/facebook/drawee/controller/AbstractDraweeController;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Km:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->KD:Lcom/facebook/drawee/controller/ControllerListener;
 
     invoke-virtual {p1, v0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Lcom/facebook/drawee/controller/ControllerListener;)V
 
@@ -425,7 +425,7 @@
 
     check-cast v0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
-    iget-object v0, v0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->MT:Lcom/facebook/drawee/drawable/g;
+    iget-object v0, v0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Nl:Lcom/facebook/drawee/drawable/g;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/g;->b(Landroid/graphics/RectF;)V
 
@@ -457,15 +457,15 @@
 .method private init()V
     .locals 3
 
-    invoke-static {}, Lcom/facebook/samples/zoomable/b;->kd()Lcom/facebook/samples/zoomable/b;
+    invoke-static {}, Lcom/facebook/samples/zoomable/b;->kb()Lcom/facebook/samples/zoomable/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZL:Lcom/facebook/samples/zoomable/f$a;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aad:Lcom/facebook/samples/zoomable/f$a;
 
     invoke-interface {v0, v1}, Lcom/facebook/samples/zoomable/f;->a(Lcom/facebook/samples/zoomable/f$a;)V
 
@@ -475,35 +475,35 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZM:Lcom/facebook/samples/zoomable/e;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aae:Lcom/facebook/samples/zoomable/e;
 
     invoke-direct {v0, v1, v2}, Landroid/view/GestureDetector;-><init>(Landroid/content/Context;Landroid/view/GestureDetector$OnGestureListener;)V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZJ:Landroid/view/GestureDetector;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aab:Landroid/view/GestureDetector;
 
     return-void
 .end method
 
-.method private ki()V
+.method private kg()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zt:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZL:Landroid/graphics/RectF;
 
     invoke-direct {p0, v0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->e(Landroid/graphics/RectF;)V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zs:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Landroid/graphics/RectF;
 
     invoke-direct {p0, v0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->f(Landroid/graphics/RectF;)V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zt:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZL:Landroid/graphics/RectF;
 
     invoke-interface {v0, v1}, Lcom/facebook/samples/zoomable/f;->c(Landroid/graphics/RectF;)V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zs:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Landroid/graphics/RectF;
 
     invoke-interface {v0, v1}, Lcom/facebook/samples/zoomable/f;->d(Landroid/graphics/RectF;)V
 
@@ -519,9 +519,9 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zs:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Landroid/graphics/RectF;
 
-    iget-object v3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Zt:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZL:Landroid/graphics/RectF;
 
     const-string v4, "updateZoomableControllerBounds: view %x, view bounds: %s, image bounds: %s"
 
@@ -535,7 +535,7 @@
 .method public computeHorizontalScrollExtent()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {v0}, Lcom/facebook/samples/zoomable/f;->computeHorizontalScrollExtent()I
 
@@ -547,7 +547,7 @@
 .method public computeHorizontalScrollOffset()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {v0}, Lcom/facebook/samples/zoomable/f;->computeHorizontalScrollOffset()I
 
@@ -559,7 +559,7 @@
 .method public computeHorizontalScrollRange()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {v0}, Lcom/facebook/samples/zoomable/f;->computeHorizontalScrollRange()I
 
@@ -571,7 +571,7 @@
 .method public computeVerticalScrollExtent()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {v0}, Lcom/facebook/samples/zoomable/f;->computeVerticalScrollExtent()I
 
@@ -583,7 +583,7 @@
 .method public computeVerticalScrollOffset()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {v0}, Lcom/facebook/samples/zoomable/f;->computeVerticalScrollOffset()I
 
@@ -595,7 +595,7 @@
 .method public computeVerticalScrollRange()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {v0}, Lcom/facebook/samples/zoomable/f;->computeVerticalScrollRange()I
 
@@ -623,11 +623,11 @@
 
     invoke-static {v0, v2, v1, p1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZH:Lcom/facebook/drawee/d/a;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZZ:Lcom/facebook/drawee/d/a;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->getScaleFactor()F
 
@@ -639,7 +639,7 @@
 
     if-lez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZH:Lcom/facebook/drawee/d/a;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZZ:Lcom/facebook/drawee/d/a;
 
     const/4 v0, 0x0
 
@@ -661,7 +661,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->FC:Ljava/lang/Class;
 
     return-object v0
 .end method
@@ -669,7 +669,7 @@
 .method public getZoomableController()Lcom/facebook/samples/zoomable/f;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     return-object v0
 .end method
@@ -681,9 +681,9 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
-    invoke-interface {v1}, Lcom/facebook/samples/zoomable/f;->kg()Landroid/graphics/Matrix;
+    invoke-interface {v1}, Lcom/facebook/samples/zoomable/f;->ke()Landroid/graphics/Matrix;
 
     move-result-object v1
 
@@ -717,7 +717,7 @@
 
     invoke-super/range {p0 .. p5}, Lcom/facebook/drawee/view/DraweeView;->onLayout(ZIIII)V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ki()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->kg()V
 
     return-void
 .end method
@@ -749,7 +749,7 @@
 
     invoke-static {v1, v4, v2, v3}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZJ:Landroid/view/GestureDetector;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aab:Landroid/view/GestureDetector;
 
     invoke-virtual {v1, p1}, Landroid/view/GestureDetector;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
@@ -782,11 +782,11 @@
     return v2
 
     :cond_0
-    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZG:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZY:Z
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {v1, p1}, Lcom/facebook/samples/zoomable/f;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
@@ -797,7 +797,7 @@
     return v2
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {v1, p1}, Lcom/facebook/samples/zoomable/f;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
@@ -805,11 +805,11 @@
 
     if-eqz v1, :cond_5
 
-    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aac:Z
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->isIdentity()Z
 
@@ -818,13 +818,13 @@
     if-eqz p1, :cond_3
 
     :cond_2
-    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aac:Z
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
-    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kf()Z
+    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kd()Z
 
     move-result p1
 
@@ -898,11 +898,11 @@
 
     invoke-virtual {p1, v0}, Landroid/view/MotionEvent;->setAction(I)V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZJ:Landroid/view/GestureDetector;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aab:Landroid/view/GestureDetector;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {v0, p1}, Lcom/facebook/samples/zoomable/f;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
@@ -916,7 +916,7 @@
 .method public setAllowTouchInterceptionWhileZoomed(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZK:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aac:Z
 
     return-void
 .end method
@@ -928,7 +928,7 @@
 
     invoke-direct {p0, v0, v0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->a(Lcom/facebook/drawee/d/a;Lcom/facebook/drawee/d/a;)V
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     const/4 v2, 0x0
 
@@ -942,7 +942,7 @@
 .method public setExperimentalSimpleTouchHandlingEnabled(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZG:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZY:Z
 
     return-void
 .end method
@@ -950,7 +950,7 @@
 .method public setIsLongpressEnabled(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZJ:Landroid/view/GestureDetector;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aab:Landroid/view/GestureDetector;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector;->setIsLongpressEnabled(Z)V
 
@@ -960,9 +960,9 @@
 .method public setTapListener(Landroid/view/GestureDetector$SimpleOnGestureListener;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZM:Lcom/facebook/samples/zoomable/e;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aae:Lcom/facebook/samples/zoomable/e;
 
-    iput-object p1, v0, Lcom/facebook/samples/zoomable/e;->ZF:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iput-object p1, v0, Lcom/facebook/samples/zoomable/e;->ZX:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     return-void
 .end method
@@ -972,17 +972,17 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
     const/4 v1, 0x0
 
     invoke-interface {v0, v1}, Lcom/facebook/samples/zoomable/f;->a(Lcom/facebook/samples/zoomable/f$a;)V
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZI:Lcom/facebook/samples/zoomable/f;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaa:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->ZL:Lcom/facebook/samples/zoomable/f$a;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aad:Lcom/facebook/samples/zoomable/f$a;
 
     invoke-interface {p1, v0}, Lcom/facebook/samples/zoomable/f;->a(Lcom/facebook/samples/zoomable/f$a;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/samples/zoomable/a.smali b/com.discord/smali_classes2/com/facebook/samples/zoomable/a.smali
index 4dbe30f697..c3d5d00ea6 100644
--- a/com.discord/smali_classes2/com/facebook/samples/zoomable/a.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/zoomable/a.smali
@@ -4,17 +4,17 @@
 
 
 # instance fields
-.field Zb:Z
+.field Zt:Z
 
-.field final Zc:[F
+.field final Zu:[F
 
-.field final Zd:[F
+.field final Zv:[F
 
-.field final Ze:[F
+.field final Zw:[F
 
-.field private final Zf:Landroid/graphics/Matrix;
+.field private final Zx:Landroid/graphics/Matrix;
 
-.field final Zg:Landroid/graphics/Matrix;
+.field final Zy:Landroid/graphics/Matrix;
 
 
 # direct methods
@@ -27,27 +27,27 @@
 
     new-array v0, p1, [F
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/a;->Zc:[F
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/a;->Zu:[F
 
     new-array v0, p1, [F
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/a;->Zd:[F
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/a;->Zv:[F
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->Ze:[F
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->Zw:[F
 
     new-instance p1, Landroid/graphics/Matrix;
 
     invoke-direct {p1}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->Zf:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->Zx:Landroid/graphics/Matrix;
 
     new-instance p1, Landroid/graphics/Matrix;
 
     invoke-direct {p1}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->Zg:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->Zy:Landroid/graphics/Matrix;
 
     return-void
 .end method
@@ -96,17 +96,17 @@
 
     invoke-static {v0, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->kc()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->ka()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->Zg:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->Zy:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
     invoke-super {p0, p1}, Lcom/facebook/samples/zoomable/c;->setTransform(Landroid/graphics/Matrix;)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->Zk:Lcom/facebook/samples/a/b;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->ZC:Lcom/facebook/samples/a/b;
 
-    invoke-virtual {p1}, Lcom/facebook/samples/a/b;->ka()V
+    invoke-virtual {p1}, Lcom/facebook/samples/a/b;->jY()V
 
     return-void
 .end method
@@ -146,7 +146,7 @@
 
     invoke-static {v0, v2, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v4, p0, Lcom/facebook/samples/zoomable/a;->Zf:Landroid/graphics/Matrix;
+    iget-object v4, p0, Lcom/facebook/samples/zoomable/a;->Zx:Landroid/graphics/Matrix;
 
     const/4 v8, 0x7
 
@@ -160,7 +160,7 @@
 
     invoke-virtual/range {v3 .. v8}, Lcom/facebook/samples/zoomable/a;->a(Landroid/graphics/Matrix;FLandroid/graphics/PointF;Landroid/graphics/PointF;I)Z
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/a;->Zf:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/a;->Zx:Landroid/graphics/Matrix;
 
     const/4 p2, 0x0
 
@@ -180,7 +180,7 @@
 
     invoke-static {v0, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->kc()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->ka()V
 
     invoke-super {p0, p1}, Lcom/facebook/samples/zoomable/c;->a(Lcom/facebook/samples/a/b;)V
 
@@ -197,7 +197,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/a;->Zb:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/a;->Zt:Z
 
     if-eqz v1, :cond_0
 
@@ -213,7 +213,7 @@
 
     invoke-static {v0, v2, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->Zb:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->Zt:Z
 
     if-eqz v0, :cond_1
 
@@ -238,7 +238,7 @@
 .method public final isIdentity()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->Zb:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->Zt:Z
 
     if-nez v0, :cond_0
 
@@ -258,7 +258,7 @@
     return v0
 .end method
 
-.method protected abstract kc()V
+.method protected abstract ka()V
 .end method
 
 .method public final reset()V
@@ -272,13 +272,13 @@
 
     invoke-static {v0, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->kc()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->ka()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->Zg:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->Zy:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->Zf:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->Zx:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
diff --git a/com.discord/smali_classes2/com/facebook/samples/zoomable/b$1.smali b/com.discord/smali_classes2/com/facebook/samples/zoomable/b$1.smali
index dd7532a2e9..e9f8f931c5 100644
--- a/com.discord/smali_classes2/com/facebook/samples/zoomable/b$1.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/zoomable/b$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Zh:Lcom/facebook/samples/zoomable/b;
+.field final synthetic Zz:Lcom/facebook/samples/zoomable/b;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/samples/zoomable/b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/b$1;->Zh:Lcom/facebook/samples/zoomable/b;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/b$1;->Zz:Lcom/facebook/samples/zoomable/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 6
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$1;->Zh:Lcom/facebook/samples/zoomable/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$1;->Zz:Lcom/facebook/samples/zoomable/b;
 
-    iget-object v1, v0, Lcom/facebook/samples/zoomable/a;->Zg:Landroid/graphics/Matrix;
+    iget-object v1, v0, Lcom/facebook/samples/zoomable/a;->Zy:Landroid/graphics/Matrix;
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
@@ -58,19 +58,19 @@
 
     if-ge v2, v3, :cond_0
 
-    iget-object v3, v0, Lcom/facebook/samples/zoomable/a;->Ze:[F
+    iget-object v3, v0, Lcom/facebook/samples/zoomable/a;->Zw:[F
 
     const/high16 v4, 0x3f800000    # 1.0f
 
     sub-float/2addr v4, p1
 
-    iget-object v5, v0, Lcom/facebook/samples/zoomable/a;->Zc:[F
+    iget-object v5, v0, Lcom/facebook/samples/zoomable/a;->Zu:[F
 
     aget v5, v5, v2
 
     mul-float v4, v4, v5
 
-    iget-object v5, v0, Lcom/facebook/samples/zoomable/a;->Zd:[F
+    iget-object v5, v0, Lcom/facebook/samples/zoomable/a;->Zv:[F
 
     aget v5, v5, v2
 
@@ -85,13 +85,13 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, v0, Lcom/facebook/samples/zoomable/a;->Ze:[F
+    iget-object p1, v0, Lcom/facebook/samples/zoomable/a;->Zw:[F
 
     invoke-virtual {v1, p1}, Landroid/graphics/Matrix;->setValues([F)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/b$1;->Zh:Lcom/facebook/samples/zoomable/b;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/b$1;->Zz:Lcom/facebook/samples/zoomable/b;
 
-    iget-object v0, p1, Lcom/facebook/samples/zoomable/a;->Zg:Landroid/graphics/Matrix;
+    iget-object v0, p1, Lcom/facebook/samples/zoomable/a;->Zy:Landroid/graphics/Matrix;
 
     invoke-static {p1, v0}, Lcom/facebook/samples/zoomable/b;->a(Lcom/facebook/samples/zoomable/b;Landroid/graphics/Matrix;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/samples/zoomable/b$2.smali b/com.discord/smali_classes2/com/facebook/samples/zoomable/b$2.smali
index 94c3038ef8..1b0590368f 100644
--- a/com.discord/smali_classes2/com/facebook/samples/zoomable/b$2.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/zoomable/b$2.smali
@@ -15,43 +15,43 @@
 
 
 # instance fields
-.field final synthetic Zh:Lcom/facebook/samples/zoomable/b;
+.field final synthetic ZA:Ljava/lang/Runnable;
 
-.field final synthetic Zi:Ljava/lang/Runnable;
+.field final synthetic Zz:Lcom/facebook/samples/zoomable/b;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/samples/zoomable/b;Ljava/lang/Runnable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/b$2;->Zh:Lcom/facebook/samples/zoomable/b;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/b$2;->Zz:Lcom/facebook/samples/zoomable/b;
 
-    iput-object p2, p0, Lcom/facebook/samples/zoomable/b$2;->Zi:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/facebook/samples/zoomable/b$2;->ZA:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
     return-void
 .end method
 
-.method private ke()V
+.method private kc()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$2;->Zi:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$2;->ZA:Ljava/lang/Runnable;
 
     if-eqz v0, :cond_0
 
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$2;->Zh:Lcom/facebook/samples/zoomable/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$2;->Zz:Lcom/facebook/samples/zoomable/b;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, v0, Lcom/facebook/samples/zoomable/a;->Zb:Z
+    iput-boolean v1, v0, Lcom/facebook/samples/zoomable/a;->Zt:Z
 
-    iget-object v0, v0, Lcom/facebook/samples/zoomable/c;->Zk:Lcom/facebook/samples/a/b;
+    iget-object v0, v0, Lcom/facebook/samples/zoomable/c;->ZC:Lcom/facebook/samples/a/b;
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->ka()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->jY()V
 
     return-void
 .end method
@@ -61,13 +61,13 @@
 .method public final onAnimationCancel(Landroid/animation/Animator;)V
     .locals 1
 
-    sget-object p1, Lcom/facebook/samples/zoomable/b;->Fl:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/samples/zoomable/b;->FC:Ljava/lang/Class;
 
     const-string v0, "setTransformAnimated: animation cancelled"
 
     invoke-static {p1, v0}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/b$2;->ke()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/b$2;->kc()V
 
     return-void
 .end method
@@ -75,13 +75,13 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    sget-object p1, Lcom/facebook/samples/zoomable/b;->Fl:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/samples/zoomable/b;->FC:Ljava/lang/Class;
 
     const-string v0, "setTransformAnimated: animation finished"
 
     invoke-static {p1, v0}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/b$2;->ke()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/b$2;->kc()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/samples/zoomable/b.smali b/com.discord/smali_classes2/com/facebook/samples/zoomable/b.smali
index 869cf262c9..8c86840383 100644
--- a/com.discord/smali_classes2/com/facebook/samples/zoomable/b.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/zoomable/b.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static final Fl:Ljava/lang/Class;
+.field static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -24,7 +24,7 @@
 
     const-class v0, Lcom/facebook/samples/zoomable/b;
 
-    sput-object v0, Lcom/facebook/samples/zoomable/b;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/samples/zoomable/b;->FC:Ljava/lang/Class;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
     return-void
 .end method
 
-.method public static kd()Lcom/facebook/samples/zoomable/b;
+.method public static kb()Lcom/facebook/samples/zoomable/b;
     .locals 3
 
     new-instance v0, Lcom/facebook/samples/zoomable/b;
@@ -94,7 +94,7 @@
 .method public final b(Landroid/graphics/Matrix;JLjava/lang/Runnable;)V
     .locals 4
 
-    sget-object v0, Lcom/facebook/samples/zoomable/b;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/b;->FC:Ljava/lang/Class;
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -104,7 +104,7 @@
 
     invoke-static {v0, v2, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/b;->kc()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/b;->ka()V
 
     const/4 v0, 0x1
 
@@ -124,25 +124,25 @@
     :goto_0
     invoke-static {v1}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/a;->Zb:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/a;->Zt:Z
 
     xor-int/2addr v1, v0
 
     invoke-static {v1}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->Zb:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->Zt:Z
 
     iget-object v0, p0, Lcom/facebook/samples/zoomable/b;->mValueAnimator:Landroid/animation/ValueAnimator;
 
     invoke-virtual {v0, p2, p3}, Landroid/animation/ValueAnimator;->setDuration(J)Landroid/animation/ValueAnimator;
 
-    iget-object p2, p0, Lcom/facebook/samples/zoomable/c;->Zw:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/facebook/samples/zoomable/c;->ZO:Landroid/graphics/Matrix;
 
-    iget-object p3, p0, Lcom/facebook/samples/zoomable/a;->Zc:[F
+    iget-object p3, p0, Lcom/facebook/samples/zoomable/a;->Zu:[F
 
     invoke-virtual {p2, p3}, Landroid/graphics/Matrix;->getValues([F)V
 
-    iget-object p2, p0, Lcom/facebook/samples/zoomable/a;->Zd:[F
+    iget-object p2, p0, Lcom/facebook/samples/zoomable/a;->Zv:[F
 
     invoke-virtual {p1, p2}, Landroid/graphics/Matrix;->getValues([F)V
 
@@ -179,22 +179,22 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/samples/zoomable/b;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/b;->FC:Ljava/lang/Class;
 
     return-object v0
 .end method
 
-.method public final kc()V
+.method public final ka()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->Zb:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->Zt:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    sget-object v0, Lcom/facebook/samples/zoomable/b;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/b;->FC:Ljava/lang/Class;
 
     const-string v1, "stopAnimation"
 
diff --git a/com.discord/smali_classes2/com/facebook/samples/zoomable/c.smali b/com.discord/smali_classes2/com/facebook/samples/zoomable/c.smali
index 6621cc8f89..8651944646 100644
--- a/com.discord/smali_classes2/com/facebook/samples/zoomable/c.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/zoomable/c.smali
@@ -8,7 +8,7 @@
 
 
 # static fields
-.field private static final Fl:Ljava/lang/Class;
+.field private static final FC:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -17,43 +17,43 @@
     .end annotation
 .end field
 
-.field private static final Zj:Landroid/graphics/RectF;
+.field private static final ZB:Landroid/graphics/RectF;
 
 
 # instance fields
-.field private final Mc:Landroid/graphics/RectF;
+.field private final Mt:Landroid/graphics/RectF;
 
-.field Zk:Lcom/facebook/samples/a/b;
+.field ZC:Lcom/facebook/samples/a/b;
 
-.field private Zl:Lcom/facebook/samples/zoomable/f$a;
+.field private ZD:Lcom/facebook/samples/zoomable/f$a;
 
-.field private Zm:Z
+.field private ZE:Z
 
-.field private Zn:Z
+.field private ZF:Z
 
-.field private Zo:Z
+.field private ZG:Z
 
-.field private Zp:Z
+.field private ZH:Z
 
-.field Zq:F
+.field ZI:F
 
-.field Zr:F
+.field ZJ:F
 
-.field private final Zs:Landroid/graphics/RectF;
+.field private final ZK:Landroid/graphics/RectF;
 
-.field private final Zt:Landroid/graphics/RectF;
+.field private final ZL:Landroid/graphics/RectF;
 
-.field private final Zu:Landroid/graphics/RectF;
+.field private final ZM:Landroid/graphics/RectF;
 
-.field private final Zv:Landroid/graphics/Matrix;
+.field private final ZN:Landroid/graphics/Matrix;
 
-.field final Zw:Landroid/graphics/Matrix;
+.field final ZO:Landroid/graphics/Matrix;
 
-.field private final Zx:Landroid/graphics/Matrix;
+.field private final ZP:Landroid/graphics/Matrix;
 
-.field private final Zy:[F
+.field private final ZQ:[F
 
-.field private Zz:Z
+.field private ZR:Z
 
 
 # direct methods
@@ -62,7 +62,7 @@
 
     const-class v0, Lcom/facebook/samples/zoomable/c;
 
-    sput-object v0, Lcom/facebook/samples/zoomable/c;->Fl:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/samples/zoomable/c;->FC:Ljava/lang/Class;
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -72,7 +72,7 @@
 
     invoke-direct {v0, v2, v2, v1, v1}, Landroid/graphics/RectF;-><init>(FFFF)V
 
-    sput-object v0, Lcom/facebook/samples/zoomable/c;->Zj:Landroid/graphics/RectF;
+    sput-object v0, Lcom/facebook/samples/zoomable/c;->ZB:Landroid/graphics/RectF;
 
     return-void
 .end method
@@ -84,81 +84,81 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zl:Lcom/facebook/samples/zoomable/f$a;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZD:Lcom/facebook/samples/zoomable/f$a;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->Zm:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->ZE:Z
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->Zn:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->ZF:Z
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->Zo:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->ZG:Z
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->Zp:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->ZH:Z
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/facebook/samples/zoomable/c;->Zq:F
+    iput v0, p0, Lcom/facebook/samples/zoomable/c;->ZI:F
 
     const/high16 v0, 0x40000000    # 2.0f
 
-    iput v0, p0, Lcom/facebook/samples/zoomable/c;->Zr:F
+    iput v0, p0, Lcom/facebook/samples/zoomable/c;->ZJ:F
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zu:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZM:Landroid/graphics/RectF;
 
     new-instance v0, Landroid/graphics/Matrix;
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zv:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZN:Landroid/graphics/Matrix;
 
     new-instance v0, Landroid/graphics/Matrix;
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zw:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZO:Landroid/graphics/Matrix;
 
     new-instance v0, Landroid/graphics/Matrix;
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zx:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZP:Landroid/graphics/Matrix;
 
     const/16 v0, 0x9
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zy:[F
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZQ:[F
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->Mc:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->Mt:Landroid/graphics/RectF;
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/c;->Zk:Lcom/facebook/samples/a/b;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/c;->ZC:Lcom/facebook/samples/a/b;
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->Zk:Lcom/facebook/samples/a/b;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->ZC:Lcom/facebook/samples/a/b;
 
-    iput-object p0, p1, Lcom/facebook/samples/a/b;->Za:Lcom/facebook/samples/a/b$a;
+    iput-object p0, p1, Lcom/facebook/samples/a/b;->Zs:Lcom/facebook/samples/a/b$a;
 
     return-void
 .end method
@@ -252,7 +252,7 @@
 
     aget v2, p2, v0
 
-    iget-object v3, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->width()F
 
@@ -260,7 +260,7 @@
 
     mul-float v2, v2, v3
 
-    iget-object v3, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->left:F
 
@@ -272,7 +272,7 @@
 
     aget v3, p2, v2
 
-    iget-object v4, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->height()F
 
@@ -280,7 +280,7 @@
 
     mul-float v3, v3, v4
 
-    iget-object v4, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->top:F
 
@@ -301,7 +301,7 @@
 
     const/4 v0, 0x4
 
-    invoke-static {p4, v0}, Lcom/facebook/samples/zoomable/c;->p(II)Z
+    invoke-static {p4, v0}, Lcom/facebook/samples/zoomable/c;->o(II)Z
 
     move-result p4
 
@@ -316,9 +316,9 @@
 
     move-result p4
 
-    iget v1, p0, Lcom/facebook/samples/zoomable/c;->Zq:F
+    iget v1, p0, Lcom/facebook/samples/zoomable/c;->ZI:F
 
-    iget v2, p0, Lcom/facebook/samples/zoomable/c;->Zr:F
+    iget v2, p0, Lcom/facebook/samples/zoomable/c;->ZJ:F
 
     invoke-static {p4, v1, v2}, Lcom/facebook/samples/zoomable/c;->b(FFF)F
 
@@ -345,7 +345,7 @@
 
     const/4 v0, 0x3
 
-    invoke-static {p2, v0}, Lcom/facebook/samples/zoomable/c;->p(II)Z
+    invoke-static {p2, v0}, Lcom/facebook/samples/zoomable/c;->o(II)Z
 
     move-result v0
 
@@ -356,9 +356,9 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Mc:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Mt:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v2}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
@@ -366,7 +366,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {p2, v2}, Lcom/facebook/samples/zoomable/c;->p(II)Z
+    invoke-static {p2, v2}, Lcom/facebook/samples/zoomable/c;->o(II)Z
 
     move-result v3
 
@@ -378,15 +378,15 @@
 
     iget v5, v0, Landroid/graphics/RectF;->right:F
 
-    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     iget v6, v6, Landroid/graphics/RectF;->left:F
 
-    iget-object v7, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iget-object v7, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     iget v7, v7, Landroid/graphics/RectF;->right:F
 
-    iget-object v8, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v8, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     invoke-virtual {v8}, Landroid/graphics/RectF;->centerX()F
 
@@ -404,7 +404,7 @@
     :goto_0
     const/4 v5, 0x2
 
-    invoke-static {p2, v5}, Lcom/facebook/samples/zoomable/c;->p(II)Z
+    invoke-static {p2, v5}, Lcom/facebook/samples/zoomable/c;->o(II)Z
 
     move-result p2
 
@@ -414,15 +414,15 @@
 
     iget v0, v0, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v5, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->top:F
 
-    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     iget v6, v6, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v7, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v7, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     invoke-virtual {v7}, Landroid/graphics/RectF;->centerY()F
 
@@ -475,11 +475,11 @@
 .method private f(Landroid/graphics/Matrix;)F
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zy:[F
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZQ:[F
 
     invoke-virtual {p1, v0}, Landroid/graphics/Matrix;->getValues([F)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->Zy:[F
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->ZQ:[F
 
     const/4 v0, 0x0
 
@@ -488,26 +488,26 @@
     return p1
 .end method
 
-.method private kh()V
+.method private kf()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zw:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZO:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->Zu:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->ZM:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1, v2}, Landroid/graphics/Matrix;->mapRect(Landroid/graphics/RectF;Landroid/graphics/RectF;)Z
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zl:Lcom/facebook/samples/zoomable/f$a;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZD:Lcom/facebook/samples/zoomable/f$a;
 
     if-eqz v0, :cond_0
 
-    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->Zm:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->ZE:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->Zw:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->ZO:Landroid/graphics/Matrix;
 
     invoke-interface {v0, v1}, Lcom/facebook/samples/zoomable/f$a;->g(Landroid/graphics/Matrix;)V
 
@@ -515,7 +515,7 @@
     return-void
 .end method
 
-.method private static p(II)Z
+.method private static o(II)Z
     .locals 0
 
     and-int/2addr p0, p1
@@ -537,13 +537,13 @@
 .method public a(FLandroid/graphics/PointF;Landroid/graphics/PointF;)V
     .locals 8
 
-    sget-object v0, Lcom/facebook/samples/zoomable/c;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->FC:Ljava/lang/Class;
 
     const-string v1, "zoomToPoint"
 
     invoke-static {v0, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;)V
 
-    iget-object v3, p0, Lcom/facebook/samples/zoomable/c;->Zw:Landroid/graphics/Matrix;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/c;->ZO:Landroid/graphics/Matrix;
 
     const/4 v7, 0x7
 
@@ -557,7 +557,7 @@
 
     invoke-virtual/range {v2 .. v7}, Lcom/facebook/samples/zoomable/c;->a(Landroid/graphics/Matrix;FLandroid/graphics/PointF;Landroid/graphics/PointF;I)Z
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kh()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kf()V
 
     return-void
 .end method
@@ -565,23 +565,23 @@
 .method public a(Lcom/facebook/samples/a/b;)V
     .locals 3
 
-    sget-object p1, Lcom/facebook/samples/zoomable/c;->Fl:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/samples/zoomable/c;->FC:Ljava/lang/Class;
 
     const-string v0, "onGestureBegin"
 
     invoke-static {p1, v0}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->Zv:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->ZN:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zw:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZO:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v0}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->Zu:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->ZM:Landroid/graphics/RectF;
 
     iget p1, p1, Landroid/graphics/RectF;->left:F
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->left:F
 
@@ -595,11 +595,11 @@
 
     if-gez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->Zu:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->ZM:Landroid/graphics/RectF;
 
     iget p1, p1, Landroid/graphics/RectF;->top:F
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->top:F
 
@@ -609,11 +609,11 @@
 
     if-gez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->Zu:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->ZM:Landroid/graphics/RectF;
 
     iget p1, p1, Landroid/graphics/RectF;->right:F
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->right:F
 
@@ -623,11 +623,11 @@
 
     if-lez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->Zu:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->ZM:Landroid/graphics/RectF;
 
     iget p1, p1, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->bottom:F
 
@@ -647,7 +647,7 @@
     :goto_0
     xor-int/2addr p1, v2
 
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->Zz:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->ZR:Z
 
     return-void
 .end method
@@ -655,7 +655,7 @@
 .method public final a(Lcom/facebook/samples/zoomable/f$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/c;->Zl:Lcom/facebook/samples/zoomable/f$a;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/c;->ZD:Lcom/facebook/samples/zoomable/f$a;
 
     return-void
 .end method
@@ -663,7 +663,7 @@
 .method protected final a(Landroid/graphics/Matrix;FLandroid/graphics/PointF;Landroid/graphics/PointF;I)Z
     .locals 4
 
-    iget-object p5, p0, Lcom/facebook/samples/zoomable/c;->Zy:[F
+    iget-object p5, p0, Lcom/facebook/samples/zoomable/c;->ZQ:[F
 
     iget v0, p3, Landroid/graphics/PointF;->x:F
 
@@ -723,7 +723,7 @@
 .method public final b(Landroid/graphics/PointF;)Landroid/graphics/PointF;
     .locals 9
 
-    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->Zy:[F
+    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->ZQ:[F
 
     iget v0, p1, Landroid/graphics/PointF;->x:F
 
@@ -737,13 +737,13 @@
 
     aput p1, v6, v8
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->Zw:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->ZO:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zx:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZP:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v0}, Landroid/graphics/Matrix;->invert(Landroid/graphics/Matrix;)Z
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zx:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZP:Landroid/graphics/Matrix;
 
     const/4 v2, 0x0
 
@@ -764,13 +764,13 @@
 
     aget v0, v6, v7
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     iget v1, v1, Landroid/graphics/RectF;->left:F
 
     sub-float/2addr v0, v1
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->width()F
 
@@ -782,13 +782,13 @@
 
     aget v0, v6, v8
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     iget v1, v1, Landroid/graphics/RectF;->top:F
 
     sub-float/2addr v0, v1
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->height()F
 
@@ -817,21 +817,21 @@
 .method public b(Lcom/facebook/samples/a/b;)V
     .locals 12
 
-    sget-object p1, Lcom/facebook/samples/zoomable/c;->Fl:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/samples/zoomable/c;->FC:Ljava/lang/Class;
 
     const-string v0, "onGestureUpdate"
 
     invoke-static {p1, v0}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->Zw:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->ZO:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zk:Lcom/facebook/samples/a/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZC:Lcom/facebook/samples/a/b;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->Zv:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->ZN:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->Zn:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->ZF:Z
 
     const/4 v2, 0x2
 
@@ -841,9 +841,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v1, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget v1, v1, Lcom/facebook/samples/a/a;->YR:I
+    iget v1, v1, Lcom/facebook/samples/a/a;->Zj:I
 
     if-ge v1, v2, :cond_0
 
@@ -852,57 +852,57 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v1, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v1, v1, Lcom/facebook/samples/a/a;->YU:[F
+    iget-object v1, v1, Lcom/facebook/samples/a/a;->Zm:[F
 
     aget v1, v1, v3
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->YU:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->Zm:[F
 
     aget v5, v5, v4
 
     sub-float/2addr v1, v5
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->YV:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->Zn:[F
 
     aget v5, v5, v3
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->YV:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->Zn:[F
 
     aget v6, v6, v4
 
     sub-float/2addr v5, v6
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->YW:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->Zo:[F
 
     aget v6, v6, v3
 
-    iget-object v7, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v7, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v7, v7, Lcom/facebook/samples/a/a;->YW:[F
+    iget-object v7, v7, Lcom/facebook/samples/a/a;->Zo:[F
 
     aget v7, v7, v4
 
     sub-float/2addr v6, v7
 
-    iget-object v7, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v7, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v7, v7, Lcom/facebook/samples/a/a;->YX:[F
+    iget-object v7, v7, Lcom/facebook/samples/a/a;->Zp:[F
 
     aget v7, v7, v3
 
-    iget-object v8, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v8, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v8, v8, Lcom/facebook/samples/a/a;->YX:[F
+    iget-object v8, v8, Lcom/facebook/samples/a/a;->Zp:[F
 
     aget v8, v8, v4
 
@@ -946,13 +946,13 @@
     invoke-virtual {p1, v1, v5, v6}, Landroid/graphics/Matrix;->postRotate(FFF)Z
 
     :cond_1
-    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->Zo:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->ZG:Z
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v1, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget v1, v1, Lcom/facebook/samples/a/a;->YR:I
+    iget v1, v1, Lcom/facebook/samples/a/a;->Zj:I
 
     if-ge v1, v2, :cond_2
 
@@ -961,57 +961,57 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v1, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v1, v1, Lcom/facebook/samples/a/a;->YU:[F
+    iget-object v1, v1, Lcom/facebook/samples/a/a;->Zm:[F
 
     aget v1, v1, v3
 
-    iget-object v2, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v2, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v2, v2, Lcom/facebook/samples/a/a;->YU:[F
+    iget-object v2, v2, Lcom/facebook/samples/a/a;->Zm:[F
 
     aget v2, v2, v4
 
     sub-float/2addr v1, v2
 
-    iget-object v2, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v2, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v2, v2, Lcom/facebook/samples/a/a;->YV:[F
+    iget-object v2, v2, Lcom/facebook/samples/a/a;->Zn:[F
 
     aget v2, v2, v3
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->YV:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->Zn:[F
 
     aget v5, v5, v4
 
     sub-float/2addr v2, v5
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->YW:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->Zo:[F
 
     aget v5, v5, v3
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->YW:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->Zo:[F
 
     aget v6, v6, v4
 
     sub-float/2addr v5, v6
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->YX:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->Zp:[F
 
     aget v3, v6, v3
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->YX:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->Zp:[F
 
     aget v6, v6, v4
 
@@ -1067,29 +1067,29 @@
 
     or-int/2addr v1, v4
 
-    iget-boolean v2, p0, Lcom/facebook/samples/zoomable/c;->Zp:Z
+    iget-boolean v2, p0, Lcom/facebook/samples/zoomable/c;->ZH:Z
 
     if-eqz v2, :cond_4
 
-    iget-object v2, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v2, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v2, v2, Lcom/facebook/samples/a/a;->YW:[F
+    iget-object v2, v2, Lcom/facebook/samples/a/a;->Zo:[F
 
-    iget-object v4, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v4, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget v4, v4, Lcom/facebook/samples/a/a;->YR:I
+    iget v4, v4, Lcom/facebook/samples/a/a;->Zj:I
 
     invoke-static {v2, v4}, Lcom/facebook/samples/a/b;->a([FI)F
 
     move-result v2
 
-    iget-object v4, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v4, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v4, v4, Lcom/facebook/samples/a/a;->YU:[F
+    iget-object v4, v4, Lcom/facebook/samples/a/a;->Zm:[F
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget v5, v5, Lcom/facebook/samples/a/a;->YR:I
+    iget v5, v5, Lcom/facebook/samples/a/a;->Zj:I
 
     invoke-static {v4, v5}, Lcom/facebook/samples/a/b;->a([FI)F
 
@@ -1097,25 +1097,25 @@
 
     sub-float/2addr v2, v4
 
-    iget-object v4, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v4, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v4, v4, Lcom/facebook/samples/a/a;->YX:[F
+    iget-object v4, v4, Lcom/facebook/samples/a/a;->Zp:[F
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget v5, v5, Lcom/facebook/samples/a/a;->YR:I
+    iget v5, v5, Lcom/facebook/samples/a/a;->Zj:I
 
     invoke-static {v4, v5}, Lcom/facebook/samples/a/b;->a([FI)F
 
     move-result v4
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->YV:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->Zn:[F
 
-    iget-object v0, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v0, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
-    iget v0, v0, Lcom/facebook/samples/a/a;->YR:I
+    iget v0, v0, Lcom/facebook/samples/a/a;->Zj:I
 
     invoke-static {v5, v0}, Lcom/facebook/samples/a/b;->a([FI)F
 
@@ -1132,16 +1132,16 @@
 
     or-int/2addr p1, v1
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kh()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kf()V
 
     if-eqz p1, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zk:Lcom/facebook/samples/a/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZC:Lcom/facebook/samples/a/b;
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->ka()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->jY()V
 
     :cond_5
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->Zz:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->ZR:Z
 
     return-void
 .end method
@@ -1149,7 +1149,7 @@
 .method public final c(Landroid/graphics/RectF;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     invoke-virtual {p1, v0}, Landroid/graphics/RectF;->equals(Ljava/lang/Object;)Z
 
@@ -1157,11 +1157,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zt:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZL:Landroid/graphics/RectF;
 
     invoke-virtual {v0, p1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kh()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kf()V
 
     :cond_0
     return-void
@@ -1170,7 +1170,7 @@
 .method public final computeHorizontalScrollExtent()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
@@ -1184,11 +1184,11 @@
 .method public final computeHorizontalScrollOffset()I
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->left:F
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->Zu:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->ZM:Landroid/graphics/RectF;
 
     iget v1, v1, Landroid/graphics/RectF;->left:F
 
@@ -1202,7 +1202,7 @@
 .method public final computeHorizontalScrollRange()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zu:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZM:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
@@ -1216,7 +1216,7 @@
 .method public final computeVerticalScrollExtent()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->height()F
 
@@ -1230,11 +1230,11 @@
 .method public final computeVerticalScrollOffset()I
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->top:F
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->Zu:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->ZM:Landroid/graphics/RectF;
 
     iget v1, v1, Landroid/graphics/RectF;->top:F
 
@@ -1248,7 +1248,7 @@
 .method public final computeVerticalScrollRange()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zu:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZM:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->height()F
 
@@ -1262,7 +1262,7 @@
 .method public final d(Landroid/graphics/RectF;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zs:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZK:Landroid/graphics/RectF;
 
     invoke-virtual {v0, p1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
@@ -1272,7 +1272,7 @@
 .method public final getScaleFactor()F
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zw:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZO:Landroid/graphics/Matrix;
 
     invoke-direct {p0, v0}, Lcom/facebook/samples/zoomable/c;->f(Landroid/graphics/Matrix;)F
 
@@ -1284,7 +1284,7 @@
 .method public final isEnabled()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->Zm:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->ZE:Z
 
     return v0
 .end method
@@ -1292,13 +1292,13 @@
 .method public isIdentity()Z
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zw:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZO:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->Zy:[F
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->ZQ:[F
 
     invoke-virtual {v0, v1}, Landroid/graphics/Matrix;->getValues([F)V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zy:[F
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZQ:[F
 
     const/4 v1, 0x0
 
@@ -1333,7 +1333,7 @@
 
     if-ge v0, v2, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->Zy:[F
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->ZQ:[F
 
     aget v2, v2, v0
 
@@ -1360,10 +1360,10 @@
     return v0
 .end method
 
-.method public final kb()V
+.method public final jZ()V
     .locals 2
 
-    sget-object v0, Lcom/facebook/samples/zoomable/c;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->FC:Ljava/lang/Class;
 
     const-string v1, "onGestureEnd"
 
@@ -1372,18 +1372,18 @@
     return-void
 .end method
 
-.method public final kf()Z
+.method public final kd()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->Zz:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->ZR:Z
 
     return v0
 .end method
 
-.method public final kg()Landroid/graphics/Matrix;
+.method public final ke()Landroid/graphics/Matrix;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zw:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZO:Landroid/graphics/Matrix;
 
     return-object v0
 .end method
@@ -1391,7 +1391,7 @@
 .method public final onTouchEvent(Landroid/view/MotionEvent;)Z
     .locals 10
 
-    sget-object v0, Lcom/facebook/samples/zoomable/c;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->FC:Ljava/lang/Class;
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getAction()I
 
@@ -1405,15 +1405,15 @@
 
     invoke-static {v0, v2, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->Zm:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->ZE:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_e
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zk:Lcom/facebook/samples/a/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZC:Lcom/facebook/samples/a/b;
 
-    iget-object v0, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v0, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionMasked()I
 
@@ -1446,9 +1446,9 @@
     goto/16 :goto_5
 
     :cond_0
-    iput v1, v0, Lcom/facebook/samples/a/a;->YS:I
+    iput v1, v0, Lcom/facebook/samples/a/a;->Zk:I
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jW()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jU()V
 
     invoke-virtual {v0}, Lcom/facebook/samples/a/a;->reset()V
 
@@ -1458,7 +1458,7 @@
     :goto_0
     if-ge v1, v4, :cond_3
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->YT:[I
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->Zl:[I
 
     aget v2, v2, v1
 
@@ -1468,7 +1468,7 @@
 
     if-eq v2, v5, :cond_2
 
-    iget-object v3, v0, Lcom/facebook/samples/a/a;->YW:[F
+    iget-object v3, v0, Lcom/facebook/samples/a/a;->Zo:[F
 
     invoke-virtual {p1, v2}, Landroid/view/MotionEvent;->getX(I)F
 
@@ -1476,7 +1476,7 @@
 
     aput v7, v3, v1
 
-    iget-object v3, v0, Lcom/facebook/samples/a/a;->YX:[F
+    iget-object v3, v0, Lcom/facebook/samples/a/a;->Zp:[F
 
     invoke-virtual {p1, v2}, Landroid/view/MotionEvent;->getY(I)F
 
@@ -1490,28 +1490,28 @@
     goto :goto_0
 
     :cond_3
-    iget-boolean p1, v0, Lcom/facebook/samples/a/a;->YQ:Z
+    iget-boolean p1, v0, Lcom/facebook/samples/a/a;->Zi:Z
 
     if-nez p1, :cond_4
 
-    iget p1, v0, Lcom/facebook/samples/a/a;->YR:I
+    iget p1, v0, Lcom/facebook/samples/a/a;->Zj:I
 
     if-lez p1, :cond_4
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jV()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jT()V
 
     :cond_4
-    iget-boolean p1, v0, Lcom/facebook/samples/a/a;->YQ:Z
+    iget-boolean p1, v0, Lcom/facebook/samples/a/a;->Zi:Z
 
     if-eqz p1, :cond_d
 
-    iget-object p1, v0, Lcom/facebook/samples/a/a;->YY:Lcom/facebook/samples/a/a$a;
+    iget-object p1, v0, Lcom/facebook/samples/a/a;->Zq:Lcom/facebook/samples/a/a$a;
 
     if-eqz p1, :cond_d
 
-    iget-object p1, v0, Lcom/facebook/samples/a/a;->YY:Lcom/facebook/samples/a/a$a;
+    iget-object p1, v0, Lcom/facebook/samples/a/a;->Zq:Lcom/facebook/samples/a/a$a;
 
-    invoke-interface {p1}, Lcom/facebook/samples/a/a$a;->jY()V
+    invoke-interface {p1}, Lcom/facebook/samples/a/a$a;->jW()V
 
     goto :goto_5
 
@@ -1532,11 +1532,11 @@
     add-int/lit8 v2, v2, -0x1
 
     :cond_7
-    iput v2, v0, Lcom/facebook/samples/a/a;->YS:I
+    iput v2, v0, Lcom/facebook/samples/a/a;->Zk:I
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jW()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jU()V
 
-    iput v1, v0, Lcom/facebook/samples/a/a;->YR:I
+    iput v1, v0, Lcom/facebook/samples/a/a;->Zj:I
 
     :goto_1
     if-ge v1, v4, :cond_c
@@ -1578,14 +1578,14 @@
     :goto_3
     if-ne v7, v5, :cond_b
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->YT:[I
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->Zl:[I
 
     aput v5, v2, v1
 
     goto :goto_4
 
     :cond_b
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->YT:[I
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->Zl:[I
 
     invoke-virtual {p1, v7}, Landroid/view/MotionEvent;->getPointerId(I)I
 
@@ -1593,9 +1593,9 @@
 
     aput v8, v2, v1
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->YW:[F
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->Zo:[F
 
-    iget-object v8, v0, Lcom/facebook/samples/a/a;->YU:[F
+    iget-object v8, v0, Lcom/facebook/samples/a/a;->Zm:[F
 
     invoke-virtual {p1, v7}, Landroid/view/MotionEvent;->getX(I)F
 
@@ -1605,9 +1605,9 @@
 
     aput v9, v2, v1
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->YX:[F
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->Zp:[F
 
-    iget-object v8, v0, Lcom/facebook/samples/a/a;->YV:[F
+    iget-object v8, v0, Lcom/facebook/samples/a/a;->Zn:[F
 
     invoke-virtual {p1, v7}, Landroid/view/MotionEvent;->getY(I)F
 
@@ -1617,11 +1617,11 @@
 
     aput v7, v2, v1
 
-    iget v2, v0, Lcom/facebook/samples/a/a;->YR:I
+    iget v2, v0, Lcom/facebook/samples/a/a;->Zj:I
 
     add-int/2addr v2, v6
 
-    iput v2, v0, Lcom/facebook/samples/a/a;->YR:I
+    iput v2, v0, Lcom/facebook/samples/a/a;->Zj:I
 
     :goto_4
     add-int/lit8 v1, v1, 0x1
@@ -1629,11 +1629,11 @@
     goto :goto_1
 
     :cond_c
-    iget p1, v0, Lcom/facebook/samples/a/a;->YR:I
+    iget p1, v0, Lcom/facebook/samples/a/a;->Zj:I
 
     if-lez p1, :cond_d
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jV()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->jT()V
 
     :cond_d
     :goto_5
@@ -1646,27 +1646,27 @@
 .method public reset()V
     .locals 2
 
-    sget-object v0, Lcom/facebook/samples/zoomable/c;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->FC:Ljava/lang/Class;
 
     const-string v1, "reset"
 
     invoke-static {v0, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zk:Lcom/facebook/samples/a/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZC:Lcom/facebook/samples/a/b;
 
-    iget-object v0, v0, Lcom/facebook/samples/a/b;->YZ:Lcom/facebook/samples/a/a;
+    iget-object v0, v0, Lcom/facebook/samples/a/b;->Zr:Lcom/facebook/samples/a/a;
 
     invoke-virtual {v0}, Lcom/facebook/samples/a/a;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zv:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZN:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zw:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZO:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kh()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kf()V
 
     return-void
 .end method
@@ -1674,7 +1674,7 @@
 .method public final setEnabled(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->Zm:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->ZE:Z
 
     if-nez p1, :cond_0
 
@@ -1687,17 +1687,17 @@
 .method public final setTransform(Landroid/graphics/Matrix;)V
     .locals 2
 
-    sget-object v0, Lcom/facebook/samples/zoomable/c;->Fl:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->FC:Ljava/lang/Class;
 
     const-string v1, "setTransform"
 
     invoke-static {v0, v1}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Zw:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->ZO:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kh()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kf()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/samples/zoomable/d.smali b/com.discord/smali_classes2/com/facebook/samples/zoomable/d.smali
index 27833b6775..54d5f1ee4c 100644
--- a/com.discord/smali_classes2/com/facebook/samples/zoomable/d.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/zoomable/d.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field private final ZA:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+.field private final ZS:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
-.field private final ZB:Landroid/graphics/PointF;
+.field private final ZT:Landroid/graphics/PointF;
 
-.field private final ZC:Landroid/graphics/PointF;
+.field private final ZU:Landroid/graphics/PointF;
 
-.field private ZD:F
+.field private ZV:F
 
-.field private ZE:Z
+.field private ZW:Z
 
 
 # direct methods
@@ -25,23 +25,23 @@
 
     invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/d;->ZB:Landroid/graphics/PointF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/d;->ZT:Landroid/graphics/PointF;
 
     new-instance v0, Landroid/graphics/PointF;
 
     invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/d;->ZC:Landroid/graphics/PointF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/d;->ZU:Landroid/graphics/PointF;
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/facebook/samples/zoomable/d;->ZD:F
+    iput v0, p0, Lcom/facebook/samples/zoomable/d;->ZV:F
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/d;->ZE:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/d;->ZW:Z
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/d;->ZA:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/d;->ZS:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
 
     iget p1, p1, Landroid/graphics/PointF;->y:F
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/d;->ZB:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/d;->ZT:Landroid/graphics/PointF;
 
     iget v0, v0, Landroid/graphics/PointF;->y:F
 
@@ -75,14 +75,14 @@
 
     if-gez p1, :cond_0
 
-    iget p1, p0, Lcom/facebook/samples/zoomable/d;->ZD:F
+    iget p1, p0, Lcom/facebook/samples/zoomable/d;->ZV:F
 
     div-float/2addr p1, v0
 
     return p1
 
     :cond_0
-    iget p1, p0, Lcom/facebook/samples/zoomable/d;->ZD:F
+    iget p1, p0, Lcom/facebook/samples/zoomable/d;->ZV:F
 
     mul-float p1, p1, v0
 
@@ -94,7 +94,7 @@
 .method public final onDoubleTapEvent(Landroid/view/MotionEvent;)Z
     .locals 9
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/d;->ZA:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/d;->ZS:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
     invoke-virtual {v0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->getZoomableController()Lcom/facebook/samples/zoomable/f;
 
@@ -139,13 +139,13 @@
     goto/16 :goto_2
 
     :cond_0
-    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->ZE:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->ZW:Z
 
     if-nez p1, :cond_2
 
     iget p1, v4, Landroid/graphics/PointF;->x:F
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->ZB:Landroid/graphics/PointF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->ZT:Landroid/graphics/PointF;
 
     iget v2, v2, Landroid/graphics/PointF;->x:F
 
@@ -155,7 +155,7 @@
 
     iget p1, v4, Landroid/graphics/PointF;->y:F
 
-    iget-object v5, p0, Lcom/facebook/samples/zoomable/d;->ZB:Landroid/graphics/PointF;
+    iget-object v5, p0, Lcom/facebook/samples/zoomable/d;->ZT:Landroid/graphics/PointF;
 
     iget v5, v5, Landroid/graphics/PointF;->y:F
 
@@ -187,9 +187,9 @@
     const/4 v7, 0x1
 
     :cond_3
-    iput-boolean v7, p0, Lcom/facebook/samples/zoomable/d;->ZE:Z
+    iput-boolean v7, p0, Lcom/facebook/samples/zoomable/d;->ZW:Z
 
-    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->ZE:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->ZW:Z
 
     if-eqz p1, :cond_8
 
@@ -197,16 +197,16 @@
 
     move-result p1
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->ZC:Landroid/graphics/PointF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->ZU:Landroid/graphics/PointF;
 
-    iget-object v3, p0, Lcom/facebook/samples/zoomable/d;->ZB:Landroid/graphics/PointF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/d;->ZT:Landroid/graphics/PointF;
 
     invoke-virtual {v1, p1, v2, v3}, Lcom/facebook/samples/zoomable/a;->a(FLandroid/graphics/PointF;Landroid/graphics/PointF;)V
 
     goto :goto_2
 
     :cond_4
-    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->ZE:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->ZW:Z
 
     if-eqz p1, :cond_5
 
@@ -214,18 +214,18 @@
 
     move-result p1
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->ZC:Landroid/graphics/PointF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->ZU:Landroid/graphics/PointF;
 
-    iget-object v3, p0, Lcom/facebook/samples/zoomable/d;->ZB:Landroid/graphics/PointF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/d;->ZT:Landroid/graphics/PointF;
 
     invoke-virtual {v1, p1, v2, v3}, Lcom/facebook/samples/zoomable/a;->a(FLandroid/graphics/PointF;Landroid/graphics/PointF;)V
 
     goto :goto_1
 
     :cond_5
-    iget v2, v1, Lcom/facebook/samples/zoomable/c;->Zr:F
+    iget v2, v1, Lcom/facebook/samples/zoomable/c;->ZJ:F
 
-    iget p1, v1, Lcom/facebook/samples/zoomable/c;->Zq:F
+    iget p1, v1, Lcom/facebook/samples/zoomable/c;->ZI:F
 
     invoke-virtual {v1}, Lcom/facebook/samples/zoomable/a;->getScaleFactor()F
 
@@ -255,16 +255,16 @@
     invoke-virtual/range {v1 .. v6}, Lcom/facebook/samples/zoomable/a;->a(FLandroid/graphics/PointF;Landroid/graphics/PointF;J)V
 
     :goto_1
-    iput-boolean v7, p0, Lcom/facebook/samples/zoomable/d;->ZE:Z
+    iput-boolean v7, p0, Lcom/facebook/samples/zoomable/d;->ZW:Z
 
     goto :goto_2
 
     :cond_7
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/d;->ZB:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/d;->ZT:Landroid/graphics/PointF;
 
     invoke-virtual {p1, v4}, Landroid/graphics/PointF;->set(Landroid/graphics/PointF;)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/d;->ZC:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/d;->ZU:Landroid/graphics/PointF;
 
     invoke-virtual {p1, v3}, Landroid/graphics/PointF;->set(Landroid/graphics/PointF;)V
 
@@ -272,7 +272,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/facebook/samples/zoomable/d;->ZD:F
+    iput p1, p0, Lcom/facebook/samples/zoomable/d;->ZV:F
 
     :cond_8
     :goto_2
diff --git a/com.discord/smali_classes2/com/facebook/samples/zoomable/e.smali b/com.discord/smali_classes2/com/facebook/samples/zoomable/e.smali
index 8e84a61e3a..2fcd7682cf 100644
--- a/com.discord/smali_classes2/com/facebook/samples/zoomable/e.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/zoomable/e.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field ZF:Landroid/view/GestureDetector$SimpleOnGestureListener;
+.field ZX:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Landroid/view/GestureDetector$SimpleOnGestureListener;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZF:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZX:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     return-void
 .end method
@@ -27,7 +27,7 @@
 .method public final onDoubleTap(Landroid/view/MotionEvent;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZF:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZX:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector$SimpleOnGestureListener;->onDoubleTap(Landroid/view/MotionEvent;)Z
 
@@ -39,7 +39,7 @@
 .method public final onDoubleTapEvent(Landroid/view/MotionEvent;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZF:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZX:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector$SimpleOnGestureListener;->onDoubleTapEvent(Landroid/view/MotionEvent;)Z
 
@@ -51,7 +51,7 @@
 .method public final onDown(Landroid/view/MotionEvent;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZF:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZX:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector$SimpleOnGestureListener;->onDown(Landroid/view/MotionEvent;)Z
 
@@ -63,7 +63,7 @@
 .method public final onFling(Landroid/view/MotionEvent;Landroid/view/MotionEvent;FF)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZF:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZX:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Landroid/view/GestureDetector$SimpleOnGestureListener;->onFling(Landroid/view/MotionEvent;Landroid/view/MotionEvent;FF)Z
 
@@ -75,7 +75,7 @@
 .method public final onLongPress(Landroid/view/MotionEvent;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZF:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZX:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector$SimpleOnGestureListener;->onLongPress(Landroid/view/MotionEvent;)V
 
@@ -85,7 +85,7 @@
 .method public final onScroll(Landroid/view/MotionEvent;Landroid/view/MotionEvent;FF)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZF:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZX:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Landroid/view/GestureDetector$SimpleOnGestureListener;->onScroll(Landroid/view/MotionEvent;Landroid/view/MotionEvent;FF)Z
 
@@ -97,7 +97,7 @@
 .method public final onShowPress(Landroid/view/MotionEvent;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZF:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZX:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector$SimpleOnGestureListener;->onShowPress(Landroid/view/MotionEvent;)V
 
@@ -107,7 +107,7 @@
 .method public final onSingleTapConfirmed(Landroid/view/MotionEvent;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZF:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZX:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector$SimpleOnGestureListener;->onSingleTapConfirmed(Landroid/view/MotionEvent;)Z
 
@@ -119,7 +119,7 @@
 .method public final onSingleTapUp(Landroid/view/MotionEvent;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZF:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->ZX:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector$SimpleOnGestureListener;->onSingleTapUp(Landroid/view/MotionEvent;)Z
 
diff --git a/com.discord/smali_classes2/com/facebook/samples/zoomable/f.smali b/com.discord/smali_classes2/com/facebook/samples/zoomable/f.smali
index 1ce11027e0..3dc32ffaa0 100644
--- a/com.discord/smali_classes2/com/facebook/samples/zoomable/f.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/zoomable/f.smali
@@ -48,10 +48,10 @@
 .method public abstract isIdentity()Z
 .end method
 
-.method public abstract kf()Z
+.method public abstract kd()Z
 .end method
 
-.method public abstract kg()Landroid/graphics/Matrix;
+.method public abstract ke()Landroid/graphics/Matrix;
 .end method
 
 .method public abstract onTouchEvent(Landroid/view/MotionEvent;)Z
diff --git a/com.discord/smali_classes2/com/facebook/soloader/Api18TraceUtils.smali b/com.discord/smali_classes2/com/facebook/soloader/Api18TraceUtils.smali
index 0e009be065..f432e00e37 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/Api18TraceUtils.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/Api18TraceUtils.smali
@@ -12,7 +12,7 @@
     return-void
 .end method
 
-.method public static aD(Ljava/lang/String;)V
+.method public static ay(Ljava/lang/String;)V
     .locals 0
 
     invoke-static {p0}, Landroid/os/Trace;->beginSection(Ljava/lang/String;)V
diff --git a/com.discord/smali_classes2/com/facebook/soloader/SoLoader$1.smali b/com.discord/smali_classes2/com/facebook/soloader/SoLoader$1.smali
index 837e03b6cd..fd82f050f6 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/SoLoader$1.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/SoLoader$1.smali
@@ -18,37 +18,37 @@
 
 
 # instance fields
-.field final synthetic aaq:Z
+.field final synthetic aaI:Z
 
-.field final synthetic aar:Ljava/lang/String;
+.field final synthetic aaJ:Ljava/lang/String;
 
-.field final synthetic aas:Ljava/lang/String;
+.field final synthetic aaK:Ljava/lang/String;
 
-.field final synthetic aat:Ljava/lang/Runtime;
+.field final synthetic aaL:Ljava/lang/Runtime;
 
-.field final synthetic aau:Ljava/lang/reflect/Method;
+.field final synthetic aaM:Ljava/lang/reflect/Method;
 
 
 # direct methods
 .method constructor <init>(ZLjava/lang/String;Ljava/lang/String;Ljava/lang/Runtime;Ljava/lang/reflect/Method;)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/soloader/SoLoader$1;->aaq:Z
+    iput-boolean p1, p0, Lcom/facebook/soloader/SoLoader$1;->aaI:Z
 
-    iput-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->aar:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->aaJ:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/facebook/soloader/SoLoader$1;->aas:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/soloader/SoLoader$1;->aaK:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/soloader/SoLoader$1;->aat:Ljava/lang/Runtime;
+    iput-object p4, p0, Lcom/facebook/soloader/SoLoader$1;->aaL:Ljava/lang/Runtime;
 
-    iput-object p5, p0, Lcom/facebook/soloader/SoLoader$1;->aau:Ljava/lang/reflect/Method;
+    iput-object p5, p0, Lcom/facebook/soloader/SoLoader$1;->aaM:Ljava/lang/reflect/Method;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
-.method private static aG(Ljava/lang/String;)Ljava/lang/String;
+.method private static aB(Ljava/lang/String;)Ljava/lang/String;
     .locals 6
 
     :try_start_0
@@ -178,7 +178,7 @@
 .method public final g(Ljava/lang/String;I)V
     .locals 8
 
-    iget-boolean v0, p0, Lcom/facebook/soloader/SoLoader$1;->aaq:Z
+    iget-boolean v0, p0, Lcom/facebook/soloader/SoLoader$1;->aaI:Z
 
     if-eqz v0, :cond_5
 
@@ -202,18 +202,18 @@
     :goto_0
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->aar:Ljava/lang/String;
+    iget-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->aaJ:Ljava/lang/String;
 
     goto :goto_1
 
     :cond_1
-    iget-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->aas:Ljava/lang/String;
+    iget-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->aaK:Ljava/lang/String;
 
     :goto_1
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v3, p0, Lcom/facebook/soloader/SoLoader$1;->aat:Ljava/lang/Runtime;
+    iget-object v3, p0, Lcom/facebook/soloader/SoLoader$1;->aaL:Ljava/lang/Runtime;
 
     monitor-enter v3
     :try_end_0
@@ -223,9 +223,9 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
     :try_start_1
-    iget-object v4, p0, Lcom/facebook/soloader/SoLoader$1;->aau:Ljava/lang/reflect/Method;
+    iget-object v4, p0, Lcom/facebook/soloader/SoLoader$1;->aaM:Ljava/lang/reflect/Method;
 
-    iget-object v5, p0, Lcom/facebook/soloader/SoLoader$1;->aat:Ljava/lang/Runtime;
+    iget-object v5, p0, Lcom/facebook/soloader/SoLoader$1;->aaL:Ljava/lang/Runtime;
 
     const/4 v6, 0x3
 
@@ -274,7 +274,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-static {p1}, Lcom/facebook/soloader/SoLoader$1;->aG(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/facebook/soloader/SoLoader$1;->aB(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -388,7 +388,7 @@
 
     invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-static {p1}, Lcom/facebook/soloader/SoLoader$1;->aG(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/facebook/soloader/SoLoader$1;->aB(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/facebook/soloader/SoLoader$Api14Utils.smali b/com.discord/smali_classes2/com/facebook/soloader/SoLoader$Api14Utils.smali
index cf1f9b8817..6022057a55 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/SoLoader$Api14Utils.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/SoLoader$Api14Utils.smali
@@ -23,7 +23,7 @@
     return-void
 .end method
 
-.method public static ks()Ljava/lang/String;
+.method public static kq()Ljava/lang/String;
     .locals 5
 
     const-class v0, Lcom/facebook/soloader/SoLoader;
diff --git a/com.discord/smali_classes2/com/facebook/soloader/SysUtil.smali b/com.discord/smali_classes2/com/facebook/soloader/SysUtil.smali
index 05be83100f..fb3318093b 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/SysUtil.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/SysUtil.smali
@@ -157,7 +157,7 @@
     return-object v0
 .end method
 
-.method public static s(Ljava/io/File;)V
+.method public static r(Ljava/io/File;)V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -189,7 +189,7 @@
 
     aget-object v3, v0, v2
 
-    invoke-static {v3}, Lcom/facebook/soloader/SysUtil;->s(Ljava/io/File;)V
+    invoke-static {v3}, Lcom/facebook/soloader/SysUtil;->r(Ljava/io/File;)V
 
     add-int/lit8 v2, v2, 0x1
 
@@ -232,7 +232,7 @@
     return-void
 .end method
 
-.method static t(Ljava/io/File;)V
+.method static s(Ljava/io/File;)V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -261,7 +261,7 @@
 
     aget-object v1, v0, p0
 
-    invoke-static {v1}, Lcom/facebook/soloader/SysUtil;->t(Ljava/io/File;)V
+    invoke-static {v1}, Lcom/facebook/soloader/SysUtil;->s(Ljava/io/File;)V
 
     add-int/lit8 p0, p0, 0x1
 
diff --git a/com.discord/smali_classes2/com/facebook/soloader/a$a.smali b/com.discord/smali_classes2/com/facebook/soloader/a$a.smali
index 15649c71a0..d5af6ce3b1 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/a$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private ZO:Ljava/io/File;
+.field private aag:Ljava/io/File;
 
-.field final synthetic ZP:Lcom/facebook/soloader/a;
+.field final synthetic aah:Lcom/facebook/soloader/a;
 
 .field private final mFlags:I
 
@@ -31,7 +31,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/soloader/a$a;->ZP:Lcom/facebook/soloader/a;
+    iput-object p1, p0, Lcom/facebook/soloader/a$a;->aah:Lcom/facebook/soloader/a;
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/soloader/e$b;-><init>(Lcom/facebook/soloader/e;Lcom/facebook/soloader/k;)V
 
@@ -47,7 +47,7 @@
 
     invoke-direct {p2, v0}, Ljava/io/File;-><init>(Ljava/lang/String;)V
 
-    iput-object p2, p0, Lcom/facebook/soloader/a$a;->ZO:Ljava/io/File;
+    iput-object p2, p0, Lcom/facebook/soloader/a$a;->aag:Ljava/io/File;
 
     iget p1, p1, Lcom/facebook/soloader/a;->mFlags:I
 
@@ -65,9 +65,9 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/soloader/a$a;->ZP:Lcom/facebook/soloader/a;
+    iget-object v1, p0, Lcom/facebook/soloader/a$a;->aah:Lcom/facebook/soloader/a;
 
-    iget-object v1, v1, Lcom/facebook/soloader/a;->aav:Ljava/lang/String;
+    iget-object v1, v1, Lcom/facebook/soloader/a;->aaN:Ljava/lang/String;
 
     invoke-virtual {p2, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -79,11 +79,11 @@
 
     if-eqz v1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/soloader/a$a;->ZP:Lcom/facebook/soloader/a;
+    iget-object p1, p0, Lcom/facebook/soloader/a$a;->aah:Lcom/facebook/soloader/a;
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/facebook/soloader/a;->aav:Ljava/lang/String;
+    iput-object v0, p1, Lcom/facebook/soloader/a;->aaN:Ljava/lang/String;
 
     new-array p1, v3, [Ljava/lang/Object;
 
@@ -125,7 +125,7 @@
     :cond_1
     new-instance v1, Ljava/io/File;
 
-    iget-object v4, p0, Lcom/facebook/soloader/a$a;->ZO:Ljava/io/File;
+    iget-object v4, p0, Lcom/facebook/soloader/a$a;->aag:Ljava/io/File;
 
     invoke-direct {v1, v4, p2}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/soloader/a.smali b/com.discord/smali_classes2/com/facebook/soloader/a.smali
index d2f3501c21..765e6e0cf0 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/a.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/a.smali
@@ -30,7 +30,7 @@
 
 
 # virtual methods
-.method protected final kj()Lcom/facebook/soloader/k$e;
+.method protected final kh()Lcom/facebook/soloader/k$e;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -45,7 +45,7 @@
     return-object v0
 .end method
 
-.method protected final kk()[B
+.method protected final ki()[B
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -53,7 +53,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/a;->ZS:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/a;->aak:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->getCanonicalFile()Ljava/io/File;
 
diff --git a/com.discord/smali_classes2/com/facebook/soloader/b.smali b/com.discord/smali_classes2/com/facebook/soloader/b.smali
index e5e35d4052..0e198b32e0 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/b.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/b.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private ZQ:Lcom/facebook/soloader/c;
+.field private aai:Lcom/facebook/soloader/c;
 
 .field private applicationContext:Landroid/content/Context;
 
@@ -54,7 +54,7 @@
 
     invoke-direct {p1, v0, p2}, Lcom/facebook/soloader/c;-><init>(Ljava/io/File;I)V
 
-    iput-object p1, p0, Lcom/facebook/soloader/b;->ZQ:Lcom/facebook/soloader/c;
+    iput-object p1, p0, Lcom/facebook/soloader/b;->aai:Lcom/facebook/soloader/c;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/b;->ZQ:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->aai:Lcom/facebook/soloader/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/facebook/soloader/c;->a(Ljava/lang/String;ILandroid/os/StrictMode$ThreadPolicy;)I
 
@@ -86,14 +86,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/b;->ZQ:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->aai:Lcom/facebook/soloader/c;
 
     invoke-virtual {v0, p1}, Lcom/facebook/soloader/c;->aJ(I)V
 
     return-void
 .end method
 
-.method public final kl()Z
+.method public final kj()Z
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -102,9 +102,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/soloader/b;->ZQ:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->aai:Lcom/facebook/soloader/c;
 
-    iget-object v0, v0, Lcom/facebook/soloader/c;->ZR:Ljava/io/File;
+    iget-object v0, v0, Lcom/facebook/soloader/c;->aaj:Ljava/io/File;
 
     iget-object v1, p0, Lcom/facebook/soloader/b;->applicationContext:Landroid/content/Context;
 
@@ -172,9 +172,9 @@
 
     invoke-direct {v0, v2, v4}, Lcom/facebook/soloader/c;-><init>(Ljava/io/File;I)V
 
-    iput-object v0, p0, Lcom/facebook/soloader/b;->ZQ:Lcom/facebook/soloader/c;
+    iput-object v0, p0, Lcom/facebook/soloader/b;->aai:Lcom/facebook/soloader/c;
 
-    iget-object v0, p0, Lcom/facebook/soloader/b;->ZQ:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->aai:Lcom/facebook/soloader/c;
 
     iget v2, p0, Lcom/facebook/soloader/b;->flags:I
 
@@ -200,7 +200,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/soloader/b;->ZQ:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->aai:Lcom/facebook/soloader/c;
 
     invoke-virtual {v0}, Lcom/facebook/soloader/c;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/facebook/soloader/e$a.smali b/com.discord/smali_classes2/com/facebook/soloader/e$a.smali
index 5a71ea8c06..92e7b41f7e 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/e$a.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/e$a.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field final ZU:Ljava/util/zip/ZipEntry;
+.field final aam:Ljava/util/zip/ZipEntry;
 
-.field final ZV:I
+.field final aan:I
 
 
 # direct methods
@@ -83,9 +83,9 @@
 
     invoke-direct {p0, p1, v0}, Lcom/facebook/soloader/k$a;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    iput-object p2, p0, Lcom/facebook/soloader/e$a;->ZU:Ljava/util/zip/ZipEntry;
+    iput-object p2, p0, Lcom/facebook/soloader/e$a;->aam:Ljava/util/zip/ZipEntry;
 
-    iput p3, p0, Lcom/facebook/soloader/e$a;->ZV:I
+    iput p3, p0, Lcom/facebook/soloader/e$a;->aan:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/soloader/e$b$a.smali b/com.discord/smali_classes2/com/facebook/soloader/e$b$a.smali
index 7b2be3a790..a90a687ac0 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/e$b$a.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/e$b$a.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field private aaa:I
+.field private aas:I
 
-.field final synthetic aab:Lcom/facebook/soloader/e$b;
+.field final synthetic aat:Lcom/facebook/soloader/e$b;
 
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/soloader/e$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/soloader/e$b$a;->aab:Lcom/facebook/soloader/e$b;
+    iput-object p1, p0, Lcom/facebook/soloader/e$b$a;->aat:Lcom/facebook/soloader/e$b;
 
     invoke-direct {p0}, Lcom/facebook/soloader/k$d;-><init>()V
 
@@ -44,15 +44,15 @@
 .method public final hasNext()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->aab:Lcom/facebook/soloader/e$b;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->aat:Lcom/facebook/soloader/e$b;
 
-    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->km()[Lcom/facebook/soloader/e$a;
+    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->kk()[Lcom/facebook/soloader/e$a;
 
-    iget v0, p0, Lcom/facebook/soloader/e$b$a;->aaa:I
+    iget v0, p0, Lcom/facebook/soloader/e$b$a;->aas:I
 
-    iget-object v1, p0, Lcom/facebook/soloader/e$b$a;->aab:Lcom/facebook/soloader/e$b;
+    iget-object v1, p0, Lcom/facebook/soloader/e$b$a;->aat:Lcom/facebook/soloader/e$b;
 
-    iget-object v1, v1, Lcom/facebook/soloader/e$b;->ZW:[Lcom/facebook/soloader/e$a;
+    iget-object v1, v1, Lcom/facebook/soloader/e$b;->aao:[Lcom/facebook/soloader/e$a;
 
     array-length v1, v1
 
@@ -68,7 +68,7 @@
     return v0
 .end method
 
-.method public final kp()Lcom/facebook/soloader/k$c;
+.method public final kn()Lcom/facebook/soloader/k$c;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -76,27 +76,27 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->aab:Lcom/facebook/soloader/e$b;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->aat:Lcom/facebook/soloader/e$b;
 
-    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->km()[Lcom/facebook/soloader/e$a;
+    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->kk()[Lcom/facebook/soloader/e$a;
 
-    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->aab:Lcom/facebook/soloader/e$b;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->aat:Lcom/facebook/soloader/e$b;
 
-    iget-object v0, v0, Lcom/facebook/soloader/e$b;->ZW:[Lcom/facebook/soloader/e$a;
+    iget-object v0, v0, Lcom/facebook/soloader/e$b;->aao:[Lcom/facebook/soloader/e$a;
 
-    iget v1, p0, Lcom/facebook/soloader/e$b$a;->aaa:I
+    iget v1, p0, Lcom/facebook/soloader/e$b$a;->aas:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lcom/facebook/soloader/e$b$a;->aaa:I
+    iput v2, p0, Lcom/facebook/soloader/e$b$a;->aas:I
 
     aget-object v0, v0, v1
 
-    iget-object v1, p0, Lcom/facebook/soloader/e$b$a;->aab:Lcom/facebook/soloader/e$b;
+    iget-object v1, p0, Lcom/facebook/soloader/e$b$a;->aat:Lcom/facebook/soloader/e$b;
 
-    iget-object v1, v1, Lcom/facebook/soloader/e$b;->ZX:Ljava/util/zip/ZipFile;
+    iget-object v1, v1, Lcom/facebook/soloader/e$b;->aap:Ljava/util/zip/ZipFile;
 
-    iget-object v2, v0, Lcom/facebook/soloader/e$a;->ZU:Ljava/util/zip/ZipEntry;
+    iget-object v2, v0, Lcom/facebook/soloader/e$a;->aam:Ljava/util/zip/ZipEntry;
 
     invoke-virtual {v1, v2}, Ljava/util/zip/ZipFile;->getInputStream(Ljava/util/zip/ZipEntry;)Ljava/io/InputStream;
 
diff --git a/com.discord/smali_classes2/com/facebook/soloader/e.smali b/com.discord/smali_classes2/com/facebook/soloader/e.smali
index 81bfe24e22..7a12bce401 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/e.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/e.smali
@@ -13,9 +13,9 @@
 
 
 # instance fields
-.field protected final ZS:Ljava/io/File;
+.field protected final aak:Ljava/io/File;
 
-.field protected final ZT:Ljava/lang/String;
+.field protected final aal:Ljava/lang/String;
 
 
 # direct methods
@@ -24,16 +24,16 @@
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/soloader/k;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    iput-object p3, p0, Lcom/facebook/soloader/e;->ZS:Ljava/io/File;
+    iput-object p3, p0, Lcom/facebook/soloader/e;->aak:Ljava/io/File;
 
-    iput-object p4, p0, Lcom/facebook/soloader/e;->ZT:Ljava/lang/String;
+    iput-object p4, p0, Lcom/facebook/soloader/e;->aal:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected kj()Lcom/facebook/soloader/k$e;
+.method protected kh()Lcom/facebook/soloader/k$e;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/soloader/g.smali b/com.discord/smali_classes2/com/facebook/soloader/g.smali
index 7c720a1649..a720334d9a 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/g.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/g.smali
@@ -831,7 +831,7 @@
     return p0
 .end method
 
-.method public static r(Ljava/io/File;)[Ljava/lang/String;
+.method public static q(Ljava/io/File;)[Ljava/lang/String;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/soloader/k$1.smali b/com.discord/smali_classes2/com/facebook/soloader/k$1.smali
index 8e03dd73af..10f3b1855b 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/k$1.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/k$1.smali
@@ -18,34 +18,34 @@
 
 
 # instance fields
-.field final synthetic aaA:Lcom/facebook/soloader/k$b;
+.field final synthetic aaQ:Ljava/io/File;
 
-.field final synthetic aaB:Ljava/io/File;
+.field final synthetic aaR:[B
 
-.field final synthetic aaC:Lcom/facebook/soloader/f;
+.field final synthetic aaS:Lcom/facebook/soloader/k$b;
 
-.field final synthetic aaD:Lcom/facebook/soloader/k;
+.field final synthetic aaT:Ljava/io/File;
 
-.field final synthetic aay:Ljava/io/File;
+.field final synthetic aaU:Lcom/facebook/soloader/f;
 
-.field final synthetic aaz:[B
+.field final synthetic aaV:Lcom/facebook/soloader/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/soloader/k;Ljava/io/File;[BLcom/facebook/soloader/k$b;Ljava/io/File;Lcom/facebook/soloader/f;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/soloader/k$1;->aaD:Lcom/facebook/soloader/k;
+    iput-object p1, p0, Lcom/facebook/soloader/k$1;->aaV:Lcom/facebook/soloader/k;
 
-    iput-object p2, p0, Lcom/facebook/soloader/k$1;->aay:Ljava/io/File;
+    iput-object p2, p0, Lcom/facebook/soloader/k$1;->aaQ:Ljava/io/File;
 
-    iput-object p3, p0, Lcom/facebook/soloader/k$1;->aaz:[B
+    iput-object p3, p0, Lcom/facebook/soloader/k$1;->aaR:[B
 
-    iput-object p4, p0, Lcom/facebook/soloader/k$1;->aaA:Lcom/facebook/soloader/k$b;
+    iput-object p4, p0, Lcom/facebook/soloader/k$1;->aaS:Lcom/facebook/soloader/k$b;
 
-    iput-object p5, p0, Lcom/facebook/soloader/k$1;->aaB:Ljava/io/File;
+    iput-object p5, p0, Lcom/facebook/soloader/k$1;->aaT:Ljava/io/File;
 
-    iput-object p6, p0, Lcom/facebook/soloader/k$1;->aaC:Lcom/facebook/soloader/f;
+    iput-object p6, p0, Lcom/facebook/soloader/k$1;->aaU:Lcom/facebook/soloader/f;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -72,14 +72,14 @@
 
     new-instance v4, Ljava/io/RandomAccessFile;
 
-    iget-object v5, p0, Lcom/facebook/soloader/k$1;->aay:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k$1;->aaQ:Ljava/io/File;
 
     invoke-direct {v4, v5, v1}, Ljava/io/RandomAccessFile;-><init>(Ljava/io/File;Ljava/lang/String;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_6
 
     :try_start_1
-    iget-object v5, p0, Lcom/facebook/soloader/k$1;->aaz:[B
+    iget-object v5, p0, Lcom/facebook/soloader/k$1;->aaR:[B
 
     invoke-virtual {v4, v5}, Ljava/io/RandomAccessFile;->write([B)V
 
@@ -96,9 +96,9 @@
 
     new-instance v4, Ljava/io/File;
 
-    iget-object v5, p0, Lcom/facebook/soloader/k$1;->aaD:Lcom/facebook/soloader/k;
+    iget-object v5, p0, Lcom/facebook/soloader/k$1;->aaV:Lcom/facebook/soloader/k;
 
-    iget-object v5, v5, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v5, v5, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     const-string v6, "dso_manifest"
 
@@ -111,7 +111,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_6
 
     :try_start_3
-    iget-object v1, p0, Lcom/facebook/soloader/k$1;->aaA:Lcom/facebook/soloader/k$b;
+    iget-object v1, p0, Lcom/facebook/soloader/k$1;->aaS:Lcom/facebook/soloader/k$b;
 
     invoke-virtual {v1, v5}, Lcom/facebook/soloader/k$b;->a(Ljava/io/DataOutput;)V
     :try_end_3
@@ -120,13 +120,13 @@
     :try_start_4
     invoke-virtual {v5}, Ljava/io/RandomAccessFile;->close()V
 
-    iget-object v1, p0, Lcom/facebook/soloader/k$1;->aaD:Lcom/facebook/soloader/k;
+    iget-object v1, p0, Lcom/facebook/soloader/k$1;->aaV:Lcom/facebook/soloader/k;
 
-    iget-object v1, v1, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v1, v1, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
-    invoke-static {v1}, Lcom/facebook/soloader/SysUtil;->t(Ljava/io/File;)V
+    invoke-static {v1}, Lcom/facebook/soloader/SysUtil;->s(Ljava/io/File;)V
 
-    iget-object v1, p0, Lcom/facebook/soloader/k$1;->aaB:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k$1;->aaT:Ljava/io/File;
 
     const/4 v4, 0x1
 
@@ -139,9 +139,9 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/facebook/soloader/k$1;->aaD:Lcom/facebook/soloader/k;
+    iget-object v2, p0, Lcom/facebook/soloader/k$1;->aaV:Lcom/facebook/soloader/k;
 
-    iget-object v2, v2, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v2, v2, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -153,7 +153,7 @@
 
     invoke-static {v3, v0}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget-object v0, p0, Lcom/facebook/soloader/k$1;->aaC:Lcom/facebook/soloader/f;
+    iget-object v0, p0, Lcom/facebook/soloader/k$1;->aaU:Lcom/facebook/soloader/f;
 
     invoke-virtual {v0}, Lcom/facebook/soloader/f;->close()V
     :try_end_5
@@ -213,9 +213,9 @@
 
     invoke-direct {v4, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/facebook/soloader/k$1;->aaD:Lcom/facebook/soloader/k;
+    iget-object v2, p0, Lcom/facebook/soloader/k$1;->aaV:Lcom/facebook/soloader/k;
 
-    iget-object v2, v2, Lcom/facebook/soloader/k;->ZR:Ljava/io/File;
+    iget-object v2, v2, Lcom/facebook/soloader/k;->aaj:Ljava/io/File;
 
     invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -227,7 +227,7 @@
 
     invoke-static {v3, v0}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget-object v0, p0, Lcom/facebook/soloader/k$1;->aaC:Lcom/facebook/soloader/f;
+    iget-object v0, p0, Lcom/facebook/soloader/k$1;->aaU:Lcom/facebook/soloader/f;
 
     invoke-virtual {v0}, Lcom/facebook/soloader/f;->close()V
 
diff --git a/com.discord/smali_classes2/com/facebook/soloader/k$a.smali b/com.discord/smali_classes2/com/facebook/soloader/k$a.smali
index 863ecf6d87..7ccad325c9 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/k$a.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/k$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public final aaE:Ljava/lang/String;
+.field public final aaW:Ljava/lang/String;
 
 .field public final name:Ljava/lang/String;
 
@@ -28,7 +28,7 @@
 
     iput-object p1, p0, Lcom/facebook/soloader/k$a;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/facebook/soloader/k$a;->aaE:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/soloader/k$a;->aaW:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/soloader/k$b.smali b/com.discord/smali_classes2/com/facebook/soloader/k$b.smali
index 524cc885d7..a409472dfd 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/k$b.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/k$b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public final aaF:[Lcom/facebook/soloader/k$a;
+.field public final aaX:[Lcom/facebook/soloader/k$a;
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/soloader/k$b;->aaF:[Lcom/facebook/soloader/k$a;
+    iput-object p1, p0, Lcom/facebook/soloader/k$b;->aaX:[Lcom/facebook/soloader/k$a;
 
     return-void
 .end method
@@ -122,7 +122,7 @@
 
     invoke-interface {p1, v0}, Ljava/io/DataOutput;->writeByte(I)V
 
-    iget-object v0, p0, Lcom/facebook/soloader/k$b;->aaF:[Lcom/facebook/soloader/k$a;
+    iget-object v0, p0, Lcom/facebook/soloader/k$b;->aaX:[Lcom/facebook/soloader/k$a;
 
     array-length v0, v0
 
@@ -131,7 +131,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/soloader/k$b;->aaF:[Lcom/facebook/soloader/k$a;
+    iget-object v1, p0, Lcom/facebook/soloader/k$b;->aaX:[Lcom/facebook/soloader/k$a;
 
     array-length v2, v1
 
@@ -143,11 +143,11 @@
 
     invoke-interface {p1, v1}, Ljava/io/DataOutput;->writeUTF(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/facebook/soloader/k$b;->aaF:[Lcom/facebook/soloader/k$a;
+    iget-object v1, p0, Lcom/facebook/soloader/k$b;->aaX:[Lcom/facebook/soloader/k$a;
 
     aget-object v1, v1, v0
 
-    iget-object v1, v1, Lcom/facebook/soloader/k$a;->aaE:Ljava/lang/String;
+    iget-object v1, v1, Lcom/facebook/soloader/k$a;->aaW:Ljava/lang/String;
 
     invoke-interface {p1, v1}, Ljava/io/DataOutput;->writeUTF(Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/soloader/k$c.smali b/com.discord/smali_classes2/com/facebook/soloader/k$c.smali
index 55000cbc2c..136093732d 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/k$c.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/k$c.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field public final aaG:Lcom/facebook/soloader/k$a;
+.field public final aaY:Lcom/facebook/soloader/k$a;
 
-.field public final aaH:Ljava/io/InputStream;
+.field public final aaZ:Ljava/io/InputStream;
 
 
 # direct methods
@@ -29,9 +29,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/soloader/k$c;->aaG:Lcom/facebook/soloader/k$a;
+    iput-object p1, p0, Lcom/facebook/soloader/k$c;->aaY:Lcom/facebook/soloader/k$a;
 
-    iput-object p2, p0, Lcom/facebook/soloader/k$c;->aaH:Ljava/io/InputStream;
+    iput-object p2, p0, Lcom/facebook/soloader/k$c;->aaZ:Ljava/io/InputStream;
 
     return-void
 .end method
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/k$c;->aaH:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/facebook/soloader/k$c;->aaZ:Ljava/io/InputStream;
 
     invoke-virtual {v0}, Ljava/io/InputStream;->close()V
 
diff --git a/com.discord/smali_classes2/com/facebook/soloader/k$d.smali b/com.discord/smali_classes2/com/facebook/soloader/k$d.smali
index 73621217e5..7b53bcf8b5 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/k$d.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/k$d.smali
@@ -42,7 +42,7 @@
 .method public abstract hasNext()Z
 .end method
 
-.method public abstract kp()Lcom/facebook/soloader/k$c;
+.method public abstract kn()Lcom/facebook/soloader/k$c;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/PersistentCookieJar.smali b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/PersistentCookieJar.smali
index 5642afecee..dd11fa26ab 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/PersistentCookieJar.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/PersistentCookieJar.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private aaM:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+.field private abe:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 
-.field private aaN:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
+.field private abf:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
 
 
 # direct methods
@@ -18,13 +18,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->aaM:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->abe:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 
-    iput-object p2, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->aaN:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
+    iput-object p2, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->abf:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
 
-    iget-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->aaM:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+    iget-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->abe:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 
-    invoke-interface {p2}, Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;->kt()Ljava/util/List;
+    invoke-interface {p2}, Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;->kr()Ljava/util/List;
 
     move-result-object p2
 
@@ -59,7 +59,7 @@
 
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->aaM:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->abe:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 
     invoke-interface {v2}, Lcom/franmontiel/persistentcookiejar/cache/CookieCache;->iterator()Ljava/util/Iterator;
 
@@ -79,7 +79,7 @@
 
     check-cast v3, Lokhttp3/l;
 
-    iget-wide v4, v3, Lokhttp3/l;->btg:J
+    iget-wide v4, v3, Lokhttp3/l;->btA:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
@@ -110,13 +110,13 @@
     goto :goto_0
 
     :cond_2
-    iget-boolean v4, v3, Lokhttp3/l;->btl:Z
+    iget-boolean v4, v3, Lokhttp3/l;->btF:Z
 
     if-eqz v4, :cond_3
 
-    iget-object v4, p1, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v4, p1, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iget-object v5, v3, Lokhttp3/l;->bth:Ljava/lang/String;
+    iget-object v5, v3, Lokhttp3/l;->btB:Ljava/lang/String;
 
     invoke-virtual {v4, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -125,9 +125,9 @@
     goto :goto_2
 
     :cond_3
-    iget-object v4, p1, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v4, p1, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iget-object v5, v3, Lokhttp3/l;->bth:Ljava/lang/String;
+    iget-object v5, v3, Lokhttp3/l;->btB:Ljava/lang/String;
 
     invoke-static {v4, v5}, Lokhttp3/l;->domainMatch(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -150,11 +150,11 @@
     goto :goto_3
 
     :cond_5
-    iget-boolean v4, v3, Lokhttp3/l;->bti:Z
+    iget-boolean v4, v3, Lokhttp3/l;->btC:Z
 
     if-eqz v4, :cond_6
 
-    invoke-virtual {p1}, Lokhttp3/s;->GC()Z
+    invoke-virtual {p1}, Lokhttp3/s;->Gr()Z
 
     move-result v4
 
@@ -173,7 +173,7 @@
     goto :goto_0
 
     :cond_7
-    iget-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->aaN:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
+    iget-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->abf:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
 
     invoke-interface {p1, v0}, Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;->e(Ljava/util/Collection;)V
     :try_end_0
@@ -211,11 +211,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->aaM:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->abe:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 
     invoke-interface {v0, p1}, Lcom/franmontiel/persistentcookiejar/cache/CookieCache;->addAll(Ljava/util/Collection;)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->aaN:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->abf:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
 
     new-instance v1, Ljava/util/ArrayList;
 
@@ -239,7 +239,7 @@
 
     check-cast v2, Lokhttp3/l;
 
-    iget-boolean v3, v2, Lokhttp3/l;->btk:Z
+    iget-boolean v3, v2, Lokhttp3/l;->btE:Z
 
     if-eqz v3, :cond_0
 
diff --git a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/R$string.smali b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/R$string.smali
index c6dd3ad39a..471f130f5c 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/R$string.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final app_name:I = 0x7f1200d2
+.field public static final app_name:I = 0x7f1200d5
 
 
 # direct methods
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 8f8dffdf22..7fc571fa1f 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/IdentifiableCookie.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/IdentifiableCookie.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field aaO:Lokhttp3/l;
+.field abg:Lokhttp3/l;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
     return-void
 .end method
@@ -85,11 +85,11 @@
     :cond_0
     check-cast p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;
 
-    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
     iget-object v0, v0, Lokhttp3/l;->name:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
     iget-object v2, v2, Lokhttp3/l;->name:Ljava/lang/String;
 
@@ -99,13 +99,13 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
-    iget-object v0, v0, Lokhttp3/l;->bth:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/l;->btB:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
-    iget-object v2, v2, Lokhttp3/l;->bth:Ljava/lang/String;
+    iget-object v2, v2, Lokhttp3/l;->btB:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -113,11 +113,11 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
     iget-object v0, v0, Lokhttp3/l;->path:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
     iget-object v2, v2, Lokhttp3/l;->path:Ljava/lang/String;
 
@@ -127,23 +127,23 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bti:Z
+    iget-boolean v0, v0, Lokhttp3/l;->btC:Z
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
-    iget-boolean v2, v2, Lokhttp3/l;->bti:Z
+    iget-boolean v2, v2, Lokhttp3/l;->btC:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-object p1, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object p1, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
-    iget-boolean p1, p1, Lokhttp3/l;->btl:Z
+    iget-boolean p1, p1, Lokhttp3/l;->btF:Z
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->btl:Z
+    iget-boolean v0, v0, Lokhttp3/l;->btF:Z
 
     if-ne p1, v0, :cond_1
 
@@ -158,7 +158,7 @@
 .method public hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
     iget-object v0, v0, Lokhttp3/l;->name:Ljava/lang/String;
 
@@ -170,9 +170,9 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
-    iget-object v1, v1, Lokhttp3/l;->bth:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/l;->btB:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
@@ -182,7 +182,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
     iget-object v1, v1, Lokhttp3/l;->path:Ljava/lang/String;
 
@@ -194,9 +194,9 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
-    iget-boolean v1, v1, Lokhttp3/l;->bti:Z
+    iget-boolean v1, v1, Lokhttp3/l;->btC:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -204,9 +204,9 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
-    iget-boolean v1, v1, Lokhttp3/l;->btl:Z
+    iget-boolean v1, v1, Lokhttp3/l;->btF: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 c7dbdf3c6e..b2ad8c1f69 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
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field private aaQ:Ljava/util/Iterator;
+.field private abi:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,14 +37,14 @@
     .end annotation
 .end field
 
-.field final synthetic aaR:Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;
+.field final synthetic abj:Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;
 
 
 # direct methods
 .method public constructor <init>(Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->aaR:Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->abj:Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,7 +56,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->aaQ:Ljava/util/Iterator;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->abi:Ljava/util/Iterator;
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 .method public hasNext()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -78,7 +78,7 @@
 .method public bridge synthetic next()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -86,7 +86,7 @@
 
     check-cast v0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;
 
-    iget-object v0, v0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, v0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->abg:Lokhttp3/l;
 
     return-object v0
 .end method
@@ -94,7 +94,7 @@
 .method public remove()V
     .locals 1
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->remove()V
 
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 3f1e0f2ede..159e8c1c84 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/SetCookieCache.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/SetCookieCache.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private aaP:Ljava/util/Set;
+.field private abh:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -36,7 +36,7 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->aaP:Ljava/util/Set;
+    iput-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->abh:Ljava/util/Set;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 .method static synthetic a(Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;)Ljava/util/Set;
     .locals 0
 
-    iget-object p0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->aaP:Ljava/util/Set;
+    iget-object p0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->abh:Ljava/util/Set;
 
     return-object p0
 .end method
@@ -83,11 +83,11 @@
 
     check-cast v0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;
 
-    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->aaP:Ljava/util/Set;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->abh:Ljava/util/Set;
 
     invoke-interface {v1, v0}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
-    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->aaP:Ljava/util/Set;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->abh:Ljava/util/Set;
 
     invoke-interface {v1, v0}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
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 851b909a62..a686ab3549 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/CookiePersistor.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/CookiePersistor.smali
@@ -26,7 +26,7 @@
     .end annotation
 .end method
 
-.method public abstract kt()Ljava/util/List;
+.method public abstract kr()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
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 d7a427fd94..a2fb320073 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali
@@ -9,13 +9,13 @@
 # static fields
 .field private static final TAG:Ljava/lang/String;
 
-.field private static aaS:J = 0x0L
+.field private static abk:J = 0x0L
 
 .field private static final serialVersionUID:J = -0x77442f0b309f5e9eL
 
 
 # instance fields
-.field private transient aaO:Lokhttp3/l;
+.field private transient abg:Lokhttp3/l;
 
 
 # direct methods
@@ -32,7 +32,7 @@
 
     const-wide/16 v0, -0x1
 
-    sput-wide v0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaS:J
+    sput-wide v0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abk:J
 
     return-void
 .end method
@@ -45,7 +45,7 @@
     return-void
 .end method
 
-.method public static aJ(Ljava/lang/String;)Lokhttp3/l;
+.method public static aE(Ljava/lang/String;)Lokhttp3/l;
     .locals 8
 
     const-string v0, "Stream not closed in decodeCookie"
@@ -120,7 +120,7 @@
 
     check-cast p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;
 
-    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaO:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abg:Lokhttp3/l;
     :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
@@ -346,7 +346,7 @@
 
     move-result-wide v1
 
-    sget-wide v3, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaS:J
+    sget-wide v3, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abk:J
 
     const/4 v5, 0x1
 
@@ -372,9 +372,9 @@
     move-wide v1, v3
 
     :cond_1
-    iput-wide v1, v0, Lokhttp3/l$a;->btg:J
+    iput-wide v1, v0, Lokhttp3/l$a;->btA:J
 
-    iput-boolean v5, v0, Lokhttp3/l$a;->btk:Z
+    iput-boolean v5, v0, Lokhttp3/l$a;->btE:Z
 
     :cond_2
     invoke-virtual {p1}, Ljava/io/ObjectInputStream;->readObject()Ljava/lang/Object;
@@ -409,7 +409,7 @@
 
     if-eqz v2, :cond_3
 
-    iput-boolean v5, v0, Lokhttp3/l$a;->bti:Z
+    iput-boolean v5, v0, Lokhttp3/l$a;->btC:Z
 
     :cond_3
     invoke-virtual {p1}, Ljava/io/ObjectInputStream;->readBoolean()Z
@@ -418,7 +418,7 @@
 
     if-eqz v2, :cond_4
 
-    iput-boolean v5, v0, Lokhttp3/l$a;->btj:Z
+    iput-boolean v5, v0, Lokhttp3/l$a;->btD:Z
 
     :cond_4
     invoke-virtual {p1}, Ljava/io/ObjectInputStream;->readBoolean()Z
@@ -434,7 +434,7 @@
 
     invoke-direct {p1, v0}, Lokhttp3/l;-><init>(Lokhttp3/l$a;)V
 
-    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaO:Lokhttp3/l;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abg:Lokhttp3/l;
 
     return-void
 
@@ -492,63 +492,63 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abg:Lokhttp3/l;
 
     iget-object v0, v0, Lokhttp3/l;->name:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeObject(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abg:Lokhttp3/l;
 
     iget-object v0, v0, Lokhttp3/l;->value:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeObject(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abg:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->btk:Z
+    iget-boolean v0, v0, Lokhttp3/l;->btE:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abg:Lokhttp3/l;
 
-    iget-wide v0, v0, Lokhttp3/l;->btg:J
+    iget-wide v0, v0, Lokhttp3/l;->btA:J
 
     goto :goto_0
 
     :cond_0
-    sget-wide v0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaS:J
+    sget-wide v0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abk:J
 
     :goto_0
     invoke-virtual {p1, v0, v1}, Ljava/io/ObjectOutputStream;->writeLong(J)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abg:Lokhttp3/l;
 
-    iget-object v0, v0, Lokhttp3/l;->bth:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/l;->btB:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeObject(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abg:Lokhttp3/l;
 
     iget-object v0, v0, Lokhttp3/l;->path:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeObject(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abg:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bti:Z
+    iget-boolean v0, v0, Lokhttp3/l;->btC:Z
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeBoolean(Z)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abg:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->btj:Z
+    iget-boolean v0, v0, Lokhttp3/l;->btD:Z
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeBoolean(Z)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaO:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abg:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->btl:Z
+    iget-boolean v0, v0, Lokhttp3/l;->btF:Z
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeBoolean(Z)V
 
@@ -562,7 +562,7 @@
 
     const-string v0, "Stream not closed in encodeCookie"
 
-    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aaO:Lokhttp3/l;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->abg:Lokhttp3/l;
 
     new-instance p1, Ljava/io/ByteArrayOutputStream;
 
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 ed6ddbb711..95eea001b3 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.smali
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-boolean v1, p0, Lokhttp3/l;->bti:Z
+    iget-boolean v1, p0, Lokhttp3/l;->btC:Z
 
     if-eqz v1, :cond_0
 
@@ -62,7 +62,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/l;->bth:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/l;->btB:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -191,7 +191,7 @@
     return-void
 .end method
 
-.method public final kt()Ljava/util/List;
+.method public final kr()Ljava/util/List;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -254,7 +254,7 @@
 
     invoke-direct {v3}, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;-><init>()V
 
-    invoke-static {v2}, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aJ(Ljava/lang/String;)Lokhttp3/l;
+    invoke-static {v2}, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->aE(Ljava/lang/String;)Lokhttp3/l;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/com/google/android/cameraview/R$attr.smali b/com.discord/smali_classes2/com/google/android/cameraview/R$attr.smali
index f5f0a451e7..4804f1a95f 100644
--- a/com.discord/smali_classes2/com/google/android/cameraview/R$attr.smali
+++ b/com.discord/smali_classes2/com/google/android/cameraview/R$attr.smali
@@ -19,9 +19,9 @@
 
 .field public static final autoFocus:I = 0x7f040045
 
-.field public static final facing:I = 0x7f040127
+.field public static final facing:I = 0x7f040129
 
-.field public static final flash:I = 0x7f040134
+.field public static final flash:I = 0x7f040136
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/cameraview/R$id.smali b/com.discord/smali_classes2/com/google/android/cameraview/R$id.smali
index 494cf2a280..85a0516104 100644
--- a/com.discord/smali_classes2/com/google/android/cameraview/R$id.smali
+++ b/com.discord/smali_classes2/com/google/android/cameraview/R$id.smali
@@ -15,23 +15,23 @@
 
 
 # static fields
-.field public static final auto:I = 0x7f0a00b8
+.field public static final auto:I = 0x7f0a00b9
 
-.field public static final back:I = 0x7f0a00ba
+.field public static final back:I = 0x7f0a00bb
 
-.field public static final front:I = 0x7f0a030e
+.field public static final front:I = 0x7f0a0313
 
-.field public static final off:I = 0x7f0a04af
+.field public static final off:I = 0x7f0a04c5
 
-.field public static final on:I = 0x7f0a04b1
+.field public static final on:I = 0x7f0a04c7
 
-.field public static final redEye:I = 0x7f0a0556
+.field public static final redEye:I = 0x7f0a0566
 
-.field public static final surface_view:I = 0x7f0a072e
+.field public static final surface_view:I = 0x7f0a0757
 
-.field public static final texture_view:I = 0x7f0a074b
+.field public static final texture_view:I = 0x7f0a0774
 
-.field public static final torch:I = 0x7f0a0758
+.field public static final torch:I = 0x7f0a0781
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/cameraview/R$layout.smali b/com.discord/smali_classes2/com/google/android/cameraview/R$layout.smali
index e888146ef4..4c6a231f60 100644
--- a/com.discord/smali_classes2/com/google/android/cameraview/R$layout.smali
+++ b/com.discord/smali_classes2/com/google/android/cameraview/R$layout.smali
@@ -15,9 +15,9 @@
 
 
 # static fields
-.field public static final surface_view:I = 0x7f0d0067
+.field public static final surface_view:I = 0x7f0d006a
 
-.field public static final texture_view:I = 0x7f0d0068
+.field public static final texture_view:I = 0x7f0d006b
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/cameraview/R$style.smali b/com.discord/smali_classes2/com/google/android/cameraview/R$style.smali
index 93a4ca5cf0..5f8692afc9 100644
--- a/com.discord/smali_classes2/com/google/android/cameraview/R$style.smali
+++ b/com.discord/smali_classes2/com/google/android/cameraview/R$style.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final Widget_CameraView:I = 0x7f1302f4
+.field public static final Widget_CameraView:I = 0x7f1302f7
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/cameraview/R$styleable.smali b/com.discord/smali_classes2/com/google/android/cameraview/R$styleable.smali
index 596683cabb..63f886e175 100644
--- a/com.discord/smali_classes2/com/google/android/cameraview/R$styleable.smali
+++ b/com.discord/smali_classes2/com/google/android/cameraview/R$styleable.smali
@@ -49,8 +49,8 @@
         0x101011e
         0x7f04003e
         0x7f040045
-        0x7f040127
-        0x7f040134
+        0x7f040129
+        0x7f040136
     .end array-data
 .end method
 
diff --git a/com.discord/smali_classes2/com/google/android/flexbox/FlexItem.smali b/com.discord/smali_classes2/com/google/android/flexbox/FlexItem.smali
index 4c5a4c0c8a..dd9a3f56c1 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/FlexItem.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/FlexItem.smali
@@ -34,23 +34,23 @@
 .method public abstract kB()I
 .end method
 
-.method public abstract kC()I
+.method public abstract kt()F
 .end method
 
-.method public abstract kD()I
+.method public abstract ku()F
 .end method
 
-.method public abstract kv()F
+.method public abstract kv()I
 .end method
 
-.method public abstract kw()F
+.method public abstract kw()Z
 .end method
 
-.method public abstract kx()I
+.method public abstract kx()F
 .end method
 
-.method public abstract ky()Z
+.method public abstract ky()I
 .end method
 
-.method public abstract kz()F
+.method public abstract kz()I
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayout$LayoutParams.smali b/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayout$LayoutParams.smali
index fc8b35b7df..1456f16786 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayout$LayoutParams.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayout$LayoutParams.smali
@@ -30,17 +30,17 @@
 
 
 # instance fields
-.field private abA:F
+.field private abR:I
 
-.field private abB:F
+.field private abS:F
 
-.field private abC:I
+.field private abT:F
 
-.field private abD:F
+.field private abU:I
 
-.field private abE:Z
+.field private abV:F
 
-.field private abz:I
+.field private abW:Z
 
 .field private mMaxHeight:I
 
@@ -71,23 +71,23 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abz:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abR:I
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abA:F
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abS:F
 
     const/high16 v2, 0x3f800000    # 1.0f
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abB:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abT:F
 
     const/4 v3, -0x1
 
-    iput v3, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abC:I
+    iput v3, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abU:I
 
     const/high16 v4, -0x40800000    # -1.0f
 
-    iput v4, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abD:F
+    iput v4, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abV:F
 
     const v5, 0xffffff
 
@@ -107,7 +107,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abz:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abR:I
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_Layout_layout_flexGrow:I
 
@@ -115,7 +115,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abA:F
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abS:F
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_Layout_layout_flexShrink:I
 
@@ -123,7 +123,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abB:F
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abT:F
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_Layout_layout_alignSelf:I
 
@@ -131,7 +131,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abC:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abU:I
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_Layout_layout_flexBasisPercent:I
 
@@ -139,7 +139,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abD:F
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abV:F
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_Layout_layout_minWidth:I
 
@@ -181,7 +181,7 @@
 
     move-result p2
 
-    iput-boolean p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abE:Z
+    iput-boolean p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abW:Z
 
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
@@ -197,23 +197,23 @@
 
     const/4 v1, 0x1
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abz:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abR:I
 
     const/4 v2, 0x0
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abA:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abS:F
 
     const/high16 v2, 0x3f800000    # 1.0f
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abB:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abT:F
 
     const/4 v2, -0x1
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abC:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abU:I
 
     const/high16 v2, -0x40800000    # -1.0f
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abD:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abV:F
 
     const v2, 0xffffff
 
@@ -225,31 +225,31 @@
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abz:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abR:I
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abA:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abS:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abB:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abT:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abC:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abU:I
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abD:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abV:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
@@ -284,7 +284,7 @@
     const/4 v0, 0x1
 
     :cond_0
-    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abE:Z
+    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abW:Z
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
@@ -332,23 +332,23 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abz:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abR:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abA:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abS:F
 
     const/high16 p1, 0x3f800000    # 1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abB:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abT:F
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abC:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abU:I
 
     const/high16 p1, -0x40800000    # -1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abD:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abV:F
 
     const p1, 0xffffff
 
@@ -366,23 +366,23 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abz:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abR:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abA:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abS:F
 
     const/high16 p1, 0x3f800000    # 1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abB:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abT:F
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abC:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abU:I
 
     const/high16 p1, -0x40800000    # -1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abD:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abV:F
 
     const p1, 0xffffff
 
@@ -400,23 +400,23 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abz:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abR:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abA:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abS:F
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abB:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abT:F
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abC:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abU:I
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abD:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abV:F
 
     const v0, 0xffffff
 
@@ -424,25 +424,25 @@
 
     iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->mMaxHeight:I
 
-    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abz:I
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abR:I
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abz:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abR:I
 
-    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abA:F
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abS:F
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abA:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abS:F
 
-    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abB:F
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abT:F
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abB:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abT:F
 
-    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abC:I
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abU:I
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abC:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abU:I
 
-    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abD:F
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abV:F
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abD:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abV:F
 
     iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->mMinWidth:I
 
@@ -460,9 +460,9 @@
 
     iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->mMaxHeight:I
 
-    iget-boolean p1, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abE:Z
+    iget-boolean p1, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abW:Z
 
-    iput-boolean p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abE:Z
+    iput-boolean p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abW:Z
 
     return-void
 .end method
@@ -520,7 +520,7 @@
 .method public final getOrder()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abz:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abR:I
 
     return v0
 .end method
@@ -536,7 +536,7 @@
 .method public final kA()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->leftMargin:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->rightMargin:I
 
     return v0
 .end method
@@ -544,63 +544,63 @@
 .method public final kB()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->topMargin:I
-
-    return v0
-.end method
-
-.method public final kC()I
-    .locals 1
-
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->rightMargin:I
-
-    return v0
-.end method
-
-.method public final kD()I
-    .locals 1
-
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->bottomMargin:I
 
     return v0
 .end method
 
-.method public final kv()F
+.method public final kt()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abA:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abS:F
 
     return v0
 .end method
 
-.method public final kw()F
+.method public final ku()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abB:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abT:F
 
     return v0
 .end method
 
-.method public final kx()I
+.method public final kv()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abC:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abU:I
 
     return v0
 .end method
 
-.method public final ky()Z
+.method public final kw()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abE:Z
+    iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abW:Z
 
     return v0
 .end method
 
-.method public final kz()F
+.method public final kx()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abD:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abV:F
+
+    return v0
+.end method
+
+.method public final ky()I
+    .locals 1
+
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->leftMargin:I
+
+    return v0
+.end method
+
+.method public final kz()I
+    .locals 1
+
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->topMargin:I
 
     return v0
 .end method
@@ -608,23 +608,23 @@
 .method public writeToParcel(Landroid/os/Parcel;I)V
     .locals 0
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abz:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abR:I
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeInt(I)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abA:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abS:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abB:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abT:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abC:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abU:I
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeInt(I)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abD:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abV:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
@@ -644,7 +644,7 @@
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeInt(I)V
 
-    iget-boolean p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abE:Z
+    iget-boolean p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->abW:Z
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeByte(B)V
 
diff --git a/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayout.smali b/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayout.smali
index d8aa29b7d0..ba2844fa99 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayout.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private abi:Ljava/util/List;
+.field private abA:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,35 +25,35 @@
     .end annotation
 .end field
 
-.field private abk:I
+.field private abC:I
 
-.field private abl:I
+.field private abD:I
 
-.field private abm:I
+.field private abE:I
 
-.field private abn:I
+.field private abF:I
 
-.field private abo:I
+.field private abG:I
 
-.field private abp:Landroid/graphics/drawable/Drawable;
+.field private abH:Landroid/graphics/drawable/Drawable;
 
-.field private abq:Landroid/graphics/drawable/Drawable;
+.field private abI:Landroid/graphics/drawable/Drawable;
 
-.field private abr:I
+.field private abJ:I
 
-.field private abs:I
+.field private abK:I
 
-.field private abt:I
+.field private abL:I
 
-.field private abu:I
+.field private abM:I
 
-.field private abv:[I
+.field private abN:[I
 
-.field private abw:Landroid/util/SparseIntArray;
+.field private abO:Landroid/util/SparseIntArray;
 
-.field private abx:Lcom/google/android/flexbox/c;
+.field private abP:Lcom/google/android/flexbox/c;
 
-.field private aby:Lcom/google/android/flexbox/c$a;
+.field private abQ:Lcom/google/android/flexbox/c$a;
 
 
 # direct methods
@@ -86,19 +86,19 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/flexbox/c;-><init>(Lcom/google/android/flexbox/a;)V
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     new-instance v0, Lcom/google/android/flexbox/c$a;
 
     invoke-direct {v0}, Lcom/google/android/flexbox/c$a;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->aby:Lcom/google/android/flexbox/c$a;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abQ:Lcom/google/android/flexbox/c$a;
 
     sget-object v0, Lcom/google/android/flexbox/R$a;->FlexboxLayout:[I
 
@@ -114,7 +114,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abk:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abC:I
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_flexWrap:I
 
@@ -122,7 +122,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abl:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abD:I
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_justifyContent:I
 
@@ -130,7 +130,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abm:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abE:I
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_alignItems:I
 
@@ -140,7 +140,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abn:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abF:I
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_alignContent:I
 
@@ -150,7 +150,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abo:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abG:I
 
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_dividerDrawable:I
 
@@ -195,9 +195,9 @@
 
     if-eqz p2, :cond_3
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     :cond_3
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_showDividerVertical:I
@@ -208,7 +208,7 @@
 
     if-eqz p2, :cond_4
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     :cond_4
     sget p2, Lcom/google/android/flexbox/R$a;->FlexboxLayout_showDividerHorizontal:I
@@ -219,7 +219,7 @@
 
     if-eqz p2, :cond_5
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     :cond_5
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
@@ -460,14 +460,14 @@
 .method private a(Landroid/graphics/Canvas;III)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abq:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abI:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     add-int/2addr v1, p2
 
@@ -475,7 +475,7 @@
 
     invoke-virtual {v0, p2, p3, v1, p4}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abq:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abI:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p2, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
@@ -507,7 +507,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
@@ -518,7 +518,7 @@
     :goto_0
     if-ge v4, v3, :cond_9
 
-    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v5, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -533,7 +533,7 @@
 
     if-ge v6, v7, :cond_4
 
-    iget v7, v5, Lcom/google/android/flexbox/b;->abc:I
+    iget v7, v5, Lcom/google/android/flexbox/b;->abu:I
 
     add-int/2addr v7, v6
 
@@ -557,7 +557,7 @@
 
     check-cast v9, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;
 
-    invoke-direct {p0, v7, v6}, Lcom/google/android/flexbox/FlexboxLayout;->s(II)Z
+    invoke-direct {p0, v7, v6}, Lcom/google/android/flexbox/FlexboxLayout;->r(II)Z
 
     move-result v7
 
@@ -584,14 +584,14 @@
 
     sub-int/2addr v7, v10
 
-    iget v10, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget v10, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     sub-int/2addr v7, v10
 
     :goto_2
     iget v10, v5, Lcom/google/android/flexbox/b;->mTop:I
 
-    iget v11, v5, Lcom/google/android/flexbox/b;->aaV:I
+    iget v11, v5, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-direct {p0, p1, v7, v10, v11}, Lcom/google/android/flexbox/FlexboxLayout;->a(Landroid/graphics/Canvas;III)V
 
@@ -602,7 +602,7 @@
 
     if-ne v6, v7, :cond_3
 
-    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     and-int/lit8 v7, v7, 0x4
 
@@ -618,7 +618,7 @@
 
     sub-int/2addr v7, v8
 
-    iget v8, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget v8, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     sub-int/2addr v7, v8
 
@@ -636,7 +636,7 @@
     :goto_3
     iget v8, v5, Lcom/google/android/flexbox/b;->mTop:I
 
-    iget v9, v5, Lcom/google/android/flexbox/b;->aaV:I
+    iget v9, v5, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-direct {p0, p1, v7, v8, v9}, Lcom/google/android/flexbox/FlexboxLayout;->a(Landroid/graphics/Canvas;III)V
 
@@ -661,7 +661,7 @@
     :cond_5
     iget v6, v5, Lcom/google/android/flexbox/b;->mTop:I
 
-    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     sub-int/2addr v6, v7
 
@@ -675,7 +675,7 @@
 
     if-eqz v6, :cond_8
 
-    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     and-int/lit8 v6, v6, 0x4
 
@@ -685,7 +685,7 @@
 
     iget v5, v5, Lcom/google/android/flexbox/b;->mTop:I
 
-    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     sub-int/2addr v5, v6
 
@@ -733,7 +733,7 @@
 
     move-result v5
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v6}, Ljava/util/List;->size()I
 
@@ -748,7 +748,7 @@
     :goto_0
     if-ge v3, v6, :cond_11
 
-    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v9, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -762,14 +762,14 @@
 
     if-eqz v10, :cond_0
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     sub-int/2addr v5, v10
 
     add-int/2addr v8, v10
 
     :cond_0
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abm:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abE:I
 
     const/4 v15, 0x4
 
@@ -793,13 +793,13 @@
 
     if-ne v10, v15, :cond_2
 
-    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->kE()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->kC()I
 
     move-result v7
 
     if-eqz v7, :cond_1
 
-    iget v10, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v10, v4, v10
 
@@ -838,7 +838,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->abm:I
+    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->abE:I
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -853,7 +853,7 @@
     :cond_3
     int-to-float v10, v1
 
-    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->kE()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->kC()I
 
     move-result v7
 
@@ -869,7 +869,7 @@
     const/high16 v7, 0x3f800000    # 1.0f
 
     :goto_2
-    iget v12, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v12, v4, v12
 
@@ -886,7 +886,7 @@
     :cond_5
     int-to-float v7, v1
 
-    iget v10, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v10, v4, v10
 
@@ -900,7 +900,7 @@
 
     int-to-float v7, v7
 
-    iget v14, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v14, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v14, v4, v14
 
@@ -913,7 +913,7 @@
     goto :goto_4
 
     :cond_6
-    iget v7, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v7, v4, v7
 
@@ -921,7 +921,7 @@
 
     int-to-float v10, v7
 
-    iget v7, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int/2addr v7, v1
 
@@ -952,7 +952,7 @@
 
     if-ge v14, v12, :cond_10
 
-    iget v12, v9, Lcom/google/android/flexbox/b;->abc:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->abu:I
 
     add-int/2addr v12, v14
 
@@ -990,13 +990,13 @@
 
     sub-float/2addr v11, v13
 
-    invoke-direct {v0, v12, v14}, Lcom/google/android/flexbox/FlexboxLayout;->s(II)Z
+    invoke-direct {v0, v12, v14}, Lcom/google/android/flexbox/FlexboxLayout;->r(II)Z
 
     move-result v12
 
     if-eqz v12, :cond_8
 
-    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     int-to-float v13, v12
 
@@ -1028,7 +1028,7 @@
 
     if-ne v14, v10, :cond_9
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     const/16 v16, 0x4
 
@@ -1036,7 +1036,7 @@
 
     if-lez v10, :cond_a
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     move/from16 v21, v10
 
@@ -1049,7 +1049,7 @@
     const/16 v21, 0x0
 
     :goto_8
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abl:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abD:I
 
     const/4 v12, 0x2
 
@@ -1057,7 +1057,7 @@
 
     if-eqz p1, :cond_b
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
     invoke-static/range {v19 .. v19}, Ljava/lang/Math;->round(F)I
 
@@ -1120,7 +1120,7 @@
 
     const/16 v27, 0x4
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
     invoke-static/range {v18 .. v18}, Ljava/lang/Math;->round(F)I
 
@@ -1167,7 +1167,7 @@
 
     if-eqz p1, :cond_d
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
     invoke-static/range {v19 .. v19}, Ljava/lang/Math;->round(F)I
 
@@ -1200,7 +1200,7 @@
     goto :goto_9
 
     :cond_d
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
     invoke-static/range {v18 .. v18}, Ljava/lang/Math;->round(F)I
 
@@ -1328,11 +1328,11 @@
     :cond_10
     move/from16 v23, v1
 
-    iget v1, v9, Lcom/google/android/flexbox/b;->aaV:I
+    iget v1, v9, Lcom/google/android/flexbox/b;->abn:I
 
     add-int/2addr v8, v1
 
-    iget v1, v9, Lcom/google/android/flexbox/b;->aaV:I
+    iget v1, v9, Lcom/google/android/flexbox/b;->abn:I
 
     sub-int/2addr v5, v1
 
@@ -1373,7 +1373,7 @@
 
     sub-int/2addr v5, v3
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
@@ -1388,7 +1388,7 @@
     :goto_0
     if-ge v4, v3, :cond_11
 
-    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v9, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1402,14 +1402,14 @@
 
     if-eqz v10, :cond_0
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     add-int/2addr v5, v10
 
     sub-int/2addr v8, v10
 
     :cond_0
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abm:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abE:I
 
     const/4 v15, 0x4
 
@@ -1433,13 +1433,13 @@
 
     if-ne v10, v15, :cond_2
 
-    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->kE()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->kC()I
 
     move-result v10
 
     if-eqz v10, :cond_1
 
-    iget v12, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v12, v6, v12
 
@@ -1478,7 +1478,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->abm:I
+    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->abE:I
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -1493,7 +1493,7 @@
     :cond_3
     int-to-float v12, v1
 
-    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->kE()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->kC()I
 
     move-result v7
 
@@ -1509,7 +1509,7 @@
     const/high16 v7, 0x3f800000    # 1.0f
 
     :goto_2
-    iget v10, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v10, v6, v10
 
@@ -1532,7 +1532,7 @@
     :cond_5
     int-to-float v7, v1
 
-    iget v10, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v10, v6, v10
 
@@ -1546,7 +1546,7 @@
 
     int-to-float v7, v7
 
-    iget v10, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v10, v6, v10
 
@@ -1559,7 +1559,7 @@
     goto :goto_4
 
     :cond_6
-    iget v7, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v7, v6, v7
 
@@ -1567,7 +1567,7 @@
 
     int-to-float v12, v7
 
-    iget v7, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int/2addr v7, v1
 
@@ -1598,7 +1598,7 @@
 
     if-ge v7, v11, :cond_10
 
-    iget v11, v9, Lcom/google/android/flexbox/b;->abc:I
+    iget v11, v9, Lcom/google/android/flexbox/b;->abu:I
 
     add-int/2addr v11, v7
 
@@ -1636,13 +1636,13 @@
 
     sub-float/2addr v10, v13
 
-    invoke-direct {v0, v11, v7}, Lcom/google/android/flexbox/FlexboxLayout;->s(II)Z
+    invoke-direct {v0, v11, v7}, Lcom/google/android/flexbox/FlexboxLayout;->r(II)Z
 
     move-result v11
 
     if-eqz v11, :cond_8
 
-    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     int-to-float v13, v11
 
@@ -1672,7 +1672,7 @@
 
     if-ne v7, v10, :cond_9
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     const/16 v16, 0x4
 
@@ -1680,7 +1680,7 @@
 
     if-lez v10, :cond_a
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     move/from16 v23, v10
 
@@ -1697,7 +1697,7 @@
 
     if-eqz p2, :cond_b
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
     const/4 v13, 0x1
 
@@ -1750,7 +1750,7 @@
 
     const/16 v28, 0x4
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
     const/4 v13, 0x1
 
@@ -1793,7 +1793,7 @@
 
     if-eqz p2, :cond_d
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
     const/4 v13, 0x0
 
@@ -1828,7 +1828,7 @@
     goto :goto_9
 
     :cond_d
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
     const/4 v13, 0x0
 
@@ -1950,11 +1950,11 @@
     goto/16 :goto_6
 
     :cond_10
-    iget v7, v9, Lcom/google/android/flexbox/b;->aaV:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->abn:I
 
     add-int/2addr v5, v7
 
-    iget v7, v9, Lcom/google/android/flexbox/b;->aaV:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->abn:I
 
     sub-int/2addr v8, v7
 
@@ -1971,7 +1971,7 @@
 
     if-ltz p1, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abv:[I
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abN:[I
 
     array-length v1, v0
 
@@ -2002,7 +2002,7 @@
 
     if-ltz p1, :cond_7
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -2021,13 +2021,13 @@
 
     if-eqz p1, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ks()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     and-int/2addr p1, v1
 
@@ -2039,7 +2039,7 @@
     return v0
 
     :cond_2
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     and-int/2addr p1, v1
 
@@ -2051,13 +2051,13 @@
     return v0
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ks()Z
 
     move-result p1
 
     if-eqz p1, :cond_6
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     and-int/lit8 p1, p1, 0x2
 
@@ -2069,7 +2069,7 @@
     return v0
 
     :cond_6
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     and-int/lit8 p1, p1, 0x2
 
@@ -2092,7 +2092,7 @@
     :goto_0
     if-ge v1, p1, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2100,7 +2100,7 @@
 
     check-cast v2, Lcom/google/android/flexbox/b;
 
-    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->kE()I
+    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->kC()I
 
     move-result v2
 
@@ -2126,7 +2126,7 @@
 
     if-ltz p1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -2142,7 +2142,7 @@
     add-int/2addr p1, v1
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -2150,7 +2150,7 @@
 
     if-ge p1, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v2, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2158,7 +2158,7 @@
 
     check-cast v2, Lcom/google/android/flexbox/b;
 
-    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->kE()I
+    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->kC()I
 
     move-result v2
 
@@ -2172,13 +2172,13 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ks()Z
 
     move-result p1
 
     if-eqz p1, :cond_4
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     and-int/lit8 p1, p1, 0x4
 
@@ -2190,7 +2190,7 @@
     return v0
 
     :cond_4
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     and-int/lit8 p1, p1, 0x4
 
@@ -2206,7 +2206,7 @@
 .method private b(Landroid/graphics/Canvas;III)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abp:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abH:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -2215,13 +2215,13 @@
     :cond_0
     add-int/2addr p4, p2
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     add-int/2addr v1, p3
 
     invoke-virtual {v0, p2, p3, p4, v1}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abp:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abH:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p2, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
@@ -2253,7 +2253,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
@@ -2264,7 +2264,7 @@
     :goto_0
     if-ge v4, v3, :cond_9
 
-    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v5, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2279,7 +2279,7 @@
 
     if-ge v6, v7, :cond_4
 
-    iget v7, v5, Lcom/google/android/flexbox/b;->abc:I
+    iget v7, v5, Lcom/google/android/flexbox/b;->abu:I
 
     add-int/2addr v7, v6
 
@@ -2303,7 +2303,7 @@
 
     check-cast v9, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;
 
-    invoke-direct {p0, v7, v6}, Lcom/google/android/flexbox/FlexboxLayout;->s(II)Z
+    invoke-direct {p0, v7, v6}, Lcom/google/android/flexbox/FlexboxLayout;->r(II)Z
 
     move-result v7
 
@@ -2330,14 +2330,14 @@
 
     sub-int/2addr v7, v10
 
-    iget v10, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget v10, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     sub-int/2addr v7, v10
 
     :goto_2
     iget v10, v5, Lcom/google/android/flexbox/b;->mLeft:I
 
-    iget v11, v5, Lcom/google/android/flexbox/b;->aaV:I
+    iget v11, v5, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-direct {p0, p1, v10, v7, v11}, Lcom/google/android/flexbox/FlexboxLayout;->b(Landroid/graphics/Canvas;III)V
 
@@ -2348,7 +2348,7 @@
 
     if-ne v6, v7, :cond_3
 
-    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     and-int/lit8 v7, v7, 0x4
 
@@ -2364,7 +2364,7 @@
 
     sub-int/2addr v7, v8
 
-    iget v8, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget v8, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     sub-int/2addr v7, v8
 
@@ -2382,7 +2382,7 @@
     :goto_3
     iget v8, v5, Lcom/google/android/flexbox/b;->mLeft:I
 
-    iget v9, v5, Lcom/google/android/flexbox/b;->aaV:I
+    iget v9, v5, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-direct {p0, p1, v8, v7, v9}, Lcom/google/android/flexbox/FlexboxLayout;->b(Landroid/graphics/Canvas;III)V
 
@@ -2407,7 +2407,7 @@
     :cond_5
     iget v6, v5, Lcom/google/android/flexbox/b;->mLeft:I
 
-    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     sub-int/2addr v6, v7
 
@@ -2421,7 +2421,7 @@
 
     if-eqz v6, :cond_8
 
-    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     and-int/lit8 v6, v6, 0x4
 
@@ -2431,7 +2431,7 @@
 
     iget v5, v5, Lcom/google/android/flexbox/b;->mLeft:I
 
-    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     sub-int/2addr v5, v6
 
@@ -2452,14 +2452,14 @@
     return-void
 .end method
 
-.method private kG()V
+.method private kE()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abp:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abH:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abq:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abI:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -2480,17 +2480,17 @@
 .method private measureHorizontal(II)V
     .locals 9
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abQ:Lcom/google/android/flexbox/c$a;
 
     invoke-virtual {v0}, Lcom/google/android/flexbox/c$a;->reset()V
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abQ:Lcom/google/android/flexbox/c$a;
 
     const v5, 0x7fffffff
 
@@ -2506,25 +2506,25 @@
 
     invoke-virtual/range {v1 .. v8}, Lcom/google/android/flexbox/c;->a(Lcom/google/android/flexbox/c$a;IIIIILjava/util/List;)V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abQ:Lcom/google/android/flexbox/c$a;
 
-    iget-object v0, v0, Lcom/google/android/flexbox/c$a;->abi:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/flexbox/c$a;->abA:Ljava/util/List;
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
     const/4 v1, 0x0
 
     invoke-virtual {v0, p1, p2, v1}, Lcom/google/android/flexbox/c;->e(III)V
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abn:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abF:I
 
     const/4 v2, 0x3
 
     if-ne v0, v2, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -2554,7 +2554,7 @@
 
     if-ge v3, v5, :cond_2
 
-    iget v5, v2, Lcom/google/android/flexbox/b;->abc:I
+    iget v5, v2, Lcom/google/android/flexbox/b;->abu:I
 
     add-int/2addr v5, v3
 
@@ -2578,13 +2578,13 @@
 
     check-cast v6, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;
 
-    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->abl:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->abD:I
 
     const/4 v8, 0x2
 
     if-eq v7, v8, :cond_0
 
-    iget v7, v2, Lcom/google/android/flexbox/b;->aaZ:I
+    iget v7, v2, Lcom/google/android/flexbox/b;->abr:I
 
     invoke-virtual {v5}, Landroid/view/View;->getBaseline()I
 
@@ -2615,7 +2615,7 @@
     goto :goto_2
 
     :cond_0
-    iget v7, v2, Lcom/google/android/flexbox/b;->aaZ:I
+    iget v7, v2, Lcom/google/android/flexbox/b;->abr:I
 
     invoke-virtual {v5}, Landroid/view/View;->getMeasuredHeight()I
 
@@ -2656,12 +2656,12 @@
     goto :goto_1
 
     :cond_2
-    iput v4, v2, Lcom/google/android/flexbox/b;->aaV:I
+    iput v4, v2, Lcom/google/android/flexbox/b;->abn:I
 
     goto :goto_0
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->getPaddingTop()I
 
@@ -2675,25 +2675,25 @@
 
     invoke-virtual {v0, p1, p2, v2}, Lcom/google/android/flexbox/c;->f(III)V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v0, v1}, Lcom/google/android/flexbox/c;->aO(I)V
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abC:I
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abQ:Lcom/google/android/flexbox/c$a;
 
-    iget v1, v1, Lcom/google/android/flexbox/c$a;->abj:I
+    iget v1, v1, Lcom/google/android/flexbox/c$a;->abB:I
 
     invoke-direct {p0, v0, p1, p2, v1}, Lcom/google/android/flexbox/FlexboxLayout;->a(IIII)V
 
     return-void
 .end method
 
-.method private s(II)Z
+.method private r(II)Z
     .locals 1
 
-    invoke-direct {p0, p1, p2}, Lcom/google/android/flexbox/FlexboxLayout;->t(II)Z
+    invoke-direct {p0, p1, p2}, Lcom/google/android/flexbox/FlexboxLayout;->s(II)Z
 
     move-result p1
 
@@ -2703,13 +2703,13 @@
 
     if-eqz p1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ks()Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     and-int/2addr p1, v0
 
@@ -2721,7 +2721,7 @@
     return p2
 
     :cond_1
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     and-int/2addr p1, v0
 
@@ -2733,13 +2733,13 @@
     return p2
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ks()Z
 
     move-result p1
 
     if-eqz p1, :cond_5
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     and-int/lit8 p1, p1, 0x2
 
@@ -2751,7 +2751,7 @@
     return p2
 
     :cond_5
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     and-int/lit8 p1, p1, 0x2
 
@@ -2763,7 +2763,7 @@
     return p2
 .end method
 
-.method private t(II)Z
+.method private s(II)Z
     .locals 4
 
     const/4 v0, 0x1
@@ -2807,7 +2807,7 @@
 .method public final a(Landroid/view/View;II)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ks()Z
 
     move-result p1
 
@@ -2815,46 +2815,46 @@
 
     if-eqz p1, :cond_1
 
-    invoke-direct {p0, p2, p3}, Lcom/google/android/flexbox/FlexboxLayout;->s(II)Z
+    invoke-direct {p0, p2, p3}, Lcom/google/android/flexbox/FlexboxLayout;->r(II)Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     add-int/2addr v0, p1
 
     :cond_0
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     and-int/lit8 p1, p1, 0x4
 
     if-lez p1, :cond_3
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     goto :goto_0
 
     :cond_1
-    invoke-direct {p0, p2, p3}, Lcom/google/android/flexbox/FlexboxLayout;->s(II)Z
+    invoke-direct {p0, p2, p3}, Lcom/google/android/flexbox/FlexboxLayout;->r(II)Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     add-int/2addr v0, p1
 
     :cond_2
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     and-int/lit8 p1, p1, 0x4
 
     if-lez p1, :cond_3
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     :goto_0
     add-int/2addr v0, p1
@@ -2863,55 +2863,61 @@
     return v0
 .end method
 
+.method public final a(ILandroid/view/View;)V
+    .locals 0
+
+    return-void
+.end method
+
 .method public final a(Landroid/view/View;IILcom/google/android/flexbox/b;)V
     .locals 0
 
-    invoke-direct {p0, p2, p3}, Lcom/google/android/flexbox/FlexboxLayout;->s(II)Z
+    invoke-direct {p0, p2, p3}, Lcom/google/android/flexbox/FlexboxLayout;->r(II)Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ks()Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->aaT:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->abl:I
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->aaT:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->abl:I
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->aaU:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->abm:I
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->aaU:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->abm:I
 
     return-void
 
     :cond_0
-    iget p1, p4, Lcom/google/android/flexbox/b;->aaT:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->abl:I
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->aaT:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->abl:I
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->aaU:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->abm:I
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->aaU:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->abm:I
 
     :cond_1
     return-void
@@ -2920,58 +2926,58 @@
 .method public final a(Lcom/google/android/flexbox/b;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ks()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     and-int/lit8 v0, v0, 0x4
 
     if-lez v0, :cond_1
 
-    iget v0, p1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v0, p1, Lcom/google/android/flexbox/b;->abl:I
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/google/android/flexbox/b;->aaT:I
+    iput v0, p1, Lcom/google/android/flexbox/b;->abl:I
 
-    iget v0, p1, Lcom/google/android/flexbox/b;->aaU:I
+    iget v0, p1, Lcom/google/android/flexbox/b;->abm:I
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/google/android/flexbox/b;->aaU:I
+    iput v0, p1, Lcom/google/android/flexbox/b;->abm:I
 
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     and-int/lit8 v0, v0, 0x4
 
     if-lez v0, :cond_1
 
-    iget v0, p1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v0, p1, Lcom/google/android/flexbox/b;->abl:I
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/google/android/flexbox/b;->aaT:I
+    iput v0, p1, Lcom/google/android/flexbox/b;->abl:I
 
-    iget v0, p1, Lcom/google/android/flexbox/b;->aaU:I
+    iget v0, p1, Lcom/google/android/flexbox/b;->abm:I
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/google/android/flexbox/b;->aaU:I
+    iput v0, p1, Lcom/google/android/flexbox/b;->abm:I
 
     :cond_1
     return-void
@@ -3000,7 +3006,7 @@
 .method public addView(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abw:Landroid/util/SparseIntArray;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abO:Landroid/util/SparseIntArray;
 
     if-nez v0, :cond_0
 
@@ -3012,30 +3018,24 @@
 
     invoke-direct {v0, v1}, Landroid/util/SparseIntArray;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abw:Landroid/util/SparseIntArray;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abO:Landroid/util/SparseIntArray;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abw:Landroid/util/SparseIntArray;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abO:Landroid/util/SparseIntArray;
 
     invoke-virtual {v0, p1, p2, p3, v1}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;Landroid/util/SparseIntArray;)[I
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abv:[I
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abN:[I
 
     invoke-super {p0, p1, p2, p3}, Landroid/view/ViewGroup;->addView(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
 
     return-void
 .end method
 
-.method public final b(ILandroid/view/View;)V
-    .locals 0
-
-    return-void
-.end method
-
 .method public final c(III)I
     .locals 0
 
@@ -3117,7 +3117,7 @@
 .method public getAlignContent()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abo:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abG:I
 
     return v0
 .end method
@@ -3125,7 +3125,7 @@
 .method public getAlignItems()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abn:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abF:I
 
     return v0
 .end method
@@ -3133,7 +3133,7 @@
 .method public getDividerDrawableHorizontal()Landroid/graphics/drawable/Drawable;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abp:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abH:Landroid/graphics/drawable/Drawable;
 
     return-object v0
 .end method
@@ -3141,7 +3141,7 @@
 .method public getDividerDrawableVertical()Landroid/graphics/drawable/Drawable;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abq:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abI:Landroid/graphics/drawable/Drawable;
 
     return-object v0
 .end method
@@ -3149,7 +3149,7 @@
 .method public getFlexDirection()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abC:I
 
     return v0
 .end method
@@ -3177,7 +3177,7 @@
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -3185,7 +3185,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -3205,7 +3205,7 @@
 
     check-cast v2, Lcom/google/android/flexbox/b;
 
-    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->kE()I
+    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->kC()I
 
     move-result v3
 
@@ -3230,7 +3230,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     return-object v0
 .end method
@@ -3238,7 +3238,7 @@
 .method public getFlexWrap()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abl:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abD:I
 
     return v0
 .end method
@@ -3246,7 +3246,7 @@
 .method public getJustifyContent()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abm:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abE:I
 
     return v0
 .end method
@@ -3254,7 +3254,7 @@
 .method public getLargestMainSize()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -3275,7 +3275,7 @@
 
     check-cast v2, Lcom/google/android/flexbox/b;
 
-    iget v2, v2, Lcom/google/android/flexbox/b;->aaT:I
+    iget v2, v2, Lcom/google/android/flexbox/b;->abl:I
 
     invoke-static {v1, v2}, Ljava/lang/Math;->max(II)I
 
@@ -3290,7 +3290,7 @@
 .method public getShowDividerHorizontal()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     return v0
 .end method
@@ -3298,7 +3298,7 @@
 .method public getShowDividerVertical()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     return v0
 .end method
@@ -3306,7 +3306,7 @@
 .method public getSumOfCrossSize()I
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -3319,7 +3319,7 @@
     :goto_0
     if-ge v1, v0, :cond_4
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v3, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -3333,18 +3333,18 @@
 
     if-eqz v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ks()Z
 
     move-result v4
 
     if-eqz v4, :cond_0
 
-    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     goto :goto_1
 
     :cond_0
-    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     :goto_1
     add-int/2addr v2, v4
@@ -3356,24 +3356,24 @@
 
     if-eqz v4, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ks()Z
 
     move-result v4
 
     if-eqz v4, :cond_2
 
-    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     goto :goto_2
 
     :cond_2
-    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     :goto_2
     add-int/2addr v2, v4
 
     :cond_3
-    iget v3, v3, Lcom/google/android/flexbox/b;->aaV:I
+    iget v3, v3, Lcom/google/android/flexbox/b;->abn:I
 
     add-int/2addr v2, v3
 
@@ -3393,10 +3393,10 @@
     return p1
 .end method
 
-.method public final ku()Z
+.method public final ks()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abC:I
 
     const/4 v1, 0x1
 
@@ -3419,22 +3419,22 @@
 .method protected onDraw(Landroid/graphics/Canvas;)V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abq:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abI:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abp:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abH:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     if-nez v0, :cond_1
 
@@ -3445,7 +3445,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abk:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abC:I
 
     const/4 v2, 0x2
 
@@ -3471,7 +3471,7 @@
     const/4 v3, 0x1
 
     :cond_3
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abl:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abD:I
 
     if-ne v0, v2, :cond_4
 
@@ -3492,7 +3492,7 @@
     const/4 v4, 0x0
 
     :goto_1
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abl:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abD:I
 
     if-ne v0, v2, :cond_7
 
@@ -3514,7 +3514,7 @@
     const/4 v0, 0x0
 
     :goto_2
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abl:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abD:I
 
     if-ne v1, v2, :cond_a
 
@@ -3536,7 +3536,7 @@
     const/4 v0, 0x0
 
     :goto_3
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abl:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abD:I
 
     if-ne v1, v2, :cond_d
 
@@ -3555,7 +3555,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abk:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abC:I
 
     const/4 v2, 0x0
 
@@ -3578,7 +3578,7 @@
     const/4 v2, 0x1
 
     :cond_0
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abl:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abD:I
 
     if-ne v0, v4, :cond_1
 
@@ -3617,7 +3617,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abk:I
+    iget v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->abC:I
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -3635,7 +3635,7 @@
     const/4 v2, 0x1
 
     :cond_4
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abl:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abD:I
 
     if-ne v0, v4, :cond_5
 
@@ -3721,7 +3721,7 @@
 
     invoke-super {p0, p1, p2}, Landroid/view/ViewGroup;->onMeasure(II)V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abw:Landroid/util/SparseIntArray;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abO:Landroid/util/SparseIntArray;
 
     if-nez v0, :cond_0
 
@@ -3733,12 +3733,12 @@
 
     invoke-direct {v0, v1}, Landroid/util/SparseIntArray;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abw:Landroid/util/SparseIntArray;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abO:Landroid/util/SparseIntArray;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abw:Landroid/util/SparseIntArray;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abO:Landroid/util/SparseIntArray;
 
     invoke-virtual {v0, v1}, Lcom/google/android/flexbox/c;->c(Landroid/util/SparseIntArray;)Z
 
@@ -3746,18 +3746,18 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abw:Landroid/util/SparseIntArray;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abO:Landroid/util/SparseIntArray;
 
     invoke-virtual {v0, v1}, Lcom/google/android/flexbox/c;->b(Landroid/util/SparseIntArray;)[I
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abv:[I
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abN:[I
 
     :cond_1
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abC:I
 
     if-eqz v0, :cond_4
 
@@ -3784,7 +3784,7 @@
 
     invoke-direct {p2, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abC:I
 
     invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -3798,31 +3798,31 @@
 
     :cond_3
     :goto_0
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abQ:Lcom/google/android/flexbox/c$a;
 
     invoke-virtual {v0}, Lcom/google/android/flexbox/c$a;->reset()V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abQ:Lcom/google/android/flexbox/c$a;
 
     invoke-virtual {v0, v1, p1, p2}, Lcom/google/android/flexbox/c;->a(Lcom/google/android/flexbox/c$a;II)V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abQ:Lcom/google/android/flexbox/c$a;
 
-    iget-object v0, v0, Lcom/google/android/flexbox/c$a;->abi:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/flexbox/c$a;->abA:Ljava/util/List;
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
-    invoke-virtual {v0, p1, p2}, Lcom/google/android/flexbox/c;->q(II)V
+    invoke-virtual {v0, p1, p2}, Lcom/google/android/flexbox/c;->p(II)V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->getPaddingLeft()I
 
@@ -3836,15 +3836,15 @@
 
     invoke-virtual {v0, p1, p2, v1}, Lcom/google/android/flexbox/c;->f(III)V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abx:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abP:Lcom/google/android/flexbox/c;
 
-    invoke-virtual {v0}, Lcom/google/android/flexbox/c;->kF()V
+    invoke-virtual {v0}, Lcom/google/android/flexbox/c;->kD()V
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abC:I
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abQ:Lcom/google/android/flexbox/c$a;
 
-    iget v1, v1, Lcom/google/android/flexbox/c$a;->abj:I
+    iget v1, v1, Lcom/google/android/flexbox/c$a;->abB:I
 
     invoke-direct {p0, v0, p1, p2, v1}, Lcom/google/android/flexbox/FlexboxLayout;->a(IIII)V
 
@@ -3859,11 +3859,11 @@
 .method public setAlignContent(I)V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abo:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abG:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abo:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abG:I
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->requestLayout()V
 
@@ -3874,11 +3874,11 @@
 .method public setAlignItems(I)V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abn:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abF:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abn:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abF:I
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->requestLayout()V
 
@@ -3899,14 +3899,14 @@
 .method public setDividerDrawableHorizontal(Landroid/graphics/drawable/Drawable;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abp:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abH:Landroid/graphics/drawable/Drawable;
 
     if-ne p1, v0, :cond_0
 
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abp:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abH:Landroid/graphics/drawable/Drawable;
 
     if-eqz p1, :cond_1
 
@@ -3914,17 +3914,17 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     goto :goto_0
 
     :cond_1
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abt:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abL:I
 
     :goto_0
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->kG()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->kE()V
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->requestLayout()V
 
@@ -3934,14 +3934,14 @@
 .method public setDividerDrawableVertical(Landroid/graphics/drawable/Drawable;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abq:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abI:Landroid/graphics/drawable/Drawable;
 
     if-ne p1, v0, :cond_0
 
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abq:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abI:Landroid/graphics/drawable/Drawable;
 
     if-eqz p1, :cond_1
 
@@ -3949,17 +3949,17 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     goto :goto_0
 
     :cond_1
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abu:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abM:I
 
     :goto_0
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->kG()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->kE()V
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->requestLayout()V
 
@@ -3969,11 +3969,11 @@
 .method public setFlexDirection(I)V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abC:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abk:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abC:I
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->requestLayout()V
 
@@ -3992,7 +3992,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abi:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abA:Ljava/util/List;
 
     return-void
 .end method
@@ -4000,11 +4000,11 @@
 .method public setFlexWrap(I)V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abl:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abD:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abl:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abD:I
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->requestLayout()V
 
@@ -4015,11 +4015,11 @@
 .method public setJustifyContent(I)V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abm:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abE:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abm:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abE:I
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->requestLayout()V
 
@@ -4040,11 +4040,11 @@
 .method public setShowDividerHorizontal(I)V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     if-eq p1, v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abr:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abJ:I
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->requestLayout()V
 
@@ -4055,11 +4055,11 @@
 .method public setShowDividerVertical(I)V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     if-eq p1, v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abs:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->abK:I
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->requestLayout()V
 
diff --git a/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager$LayoutParams.smali b/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager$LayoutParams.smali
index 17f25504cc..1cf5ff9767 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager$LayoutParams.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager$LayoutParams.smali
@@ -30,15 +30,15 @@
 
 
 # instance fields
-.field private abA:F
+.field private abS:F
 
-.field private abB:F
+.field private abT:F
 
-.field private abC:I
+.field private abU:I
 
-.field private abD:F
+.field private abV:F
 
-.field private abE:Z
+.field private abW:Z
 
 .field private mMaxHeight:I
 
@@ -71,19 +71,19 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abA:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abS:F
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abB:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abT:F
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abC:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abU:I
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abD:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abV:F
 
     const v0, 0xffffff
 
@@ -101,19 +101,19 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abA:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abS:F
 
     const/high16 p1, 0x3f800000    # 1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abB:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abT:F
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abC:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abU:I
 
     const/high16 p1, -0x40800000    # -1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abD:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abV:F
 
     const p1, 0xffffff
 
@@ -133,19 +133,19 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abA:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abS:F
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abB:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abT:F
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abC:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abU:I
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abD:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abV:F
 
     const v0, 0xffffff
 
@@ -157,25 +157,25 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abA:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abS:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abB:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abT:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abC:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abU:I
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abD:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abV:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
@@ -215,7 +215,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abE:Z
+    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abW:Z
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
@@ -325,7 +325,7 @@
 .method public final kA()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->leftMargin:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->rightMargin:I
 
     return v0
 .end method
@@ -333,63 +333,63 @@
 .method public final kB()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->topMargin:I
-
-    return v0
-.end method
-
-.method public final kC()I
-    .locals 1
-
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->rightMargin:I
-
-    return v0
-.end method
-
-.method public final kD()I
-    .locals 1
-
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->bottomMargin:I
 
     return v0
 .end method
 
-.method public final kv()F
+.method public final kt()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abA:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abS:F
 
     return v0
 .end method
 
-.method public final kw()F
+.method public final ku()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abB:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abT:F
 
     return v0
 .end method
 
-.method public final kx()I
+.method public final kv()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abC:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abU:I
 
     return v0
 .end method
 
-.method public final ky()Z
+.method public final kw()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abE:Z
+    iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abW:Z
 
     return v0
 .end method
 
-.method public final kz()F
+.method public final kx()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abD:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abV:F
+
+    return v0
+.end method
+
+.method public final ky()I
+    .locals 1
+
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->leftMargin:I
+
+    return v0
+.end method
+
+.method public final kz()I
+    .locals 1
+
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->topMargin:I
 
     return v0
 .end method
@@ -397,19 +397,19 @@
 .method public writeToParcel(Landroid/os/Parcel;I)V
     .locals 0
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abA:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abS:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abB:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abT:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abC:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abU:I
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeInt(I)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abD:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abV:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
@@ -429,7 +429,7 @@
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeInt(I)V
 
-    iget-boolean p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abE:Z
+    iget-boolean p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->abW:Z
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeByte(B)V
 
diff --git a/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager$a.smali b/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager$a.smali
index 8e86771ccb..d746efae95 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager$a.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager$a.smali
@@ -19,13 +19,13 @@
 
 
 # instance fields
-.field private abQ:I
+.field private aci:I
 
-.field private abR:I
+.field private acj:I
 
-.field private abS:Z
+.field private acl:Z
 
-.field final synthetic abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+.field final synthetic acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
 .field private mCoordinate:I
 
@@ -48,13 +48,13 @@
 .method private constructor <init>(Lcom/google/android/flexbox/FlexboxLayoutManager;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abR:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acj:I
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 .method static synthetic a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
     .locals 0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abQ:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->aci:I
 
     return p1
 .end method
@@ -78,15 +78,15 @@
 .method static synthetic a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;Landroid/view/View;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
-    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->c(Lcom/google/android/flexbox/FlexboxLayoutManager;)Z
 
@@ -98,7 +98,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->d(Lcom/google/android/flexbox/FlexboxLayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -108,7 +108,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->d(Lcom/google/android/flexbox/FlexboxLayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -125,7 +125,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->d(Lcom/google/android/flexbox/FlexboxLayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -144,7 +144,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->d(Lcom/google/android/flexbox/FlexboxLayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -154,7 +154,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->d(Lcom/google/android/flexbox/FlexboxLayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -171,7 +171,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->d(Lcom/google/android/flexbox/FlexboxLayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -184,7 +184,7 @@
     iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->mCoordinate:I
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-virtual {v0, p1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getPosition(Landroid/view/View;)I
 
@@ -194,15 +194,15 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abS:Z
+    iput-boolean p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acl:Z
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->e(Lcom/google/android/flexbox/FlexboxLayoutManager;)Lcom/google/android/flexbox/c;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v0, v0, Lcom/google/android/flexbox/c;->abx:[I
 
     iget v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->mPosition:I
 
@@ -215,9 +215,9 @@
     move p1, v0
 
     :cond_3
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abQ:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->aci:I
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->f(Lcom/google/android/flexbox/FlexboxLayoutManager;)Ljava/util/List;
 
@@ -227,17 +227,17 @@
 
     move-result p1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abQ:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->aci:I
 
     if-le p1, v0, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->f(Lcom/google/android/flexbox/FlexboxLayoutManager;)Ljava/util/List;
 
     move-result-object p1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abQ:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->aci:I
 
     invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -245,7 +245,7 @@
 
     check-cast p1, Lcom/google/android/flexbox/b;
 
-    iget p1, p1, Lcom/google/android/flexbox/b;->abc:I
+    iget p1, p1, Lcom/google/android/flexbox/b;->abu:I
 
     iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->mPosition:I
 
@@ -284,7 +284,7 @@
 
     iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->mPosition:I
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abQ:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->aci:I
 
     const/high16 v0, -0x80000000
 
@@ -294,11 +294,11 @@
 
     iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->mValid:Z
 
-    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abS:Z
+    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acl:Z
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
-    invoke-virtual {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v1
 
@@ -308,7 +308,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->a(Lcom/google/android/flexbox/FlexboxLayoutManager;)I
 
@@ -316,7 +316,7 @@
 
     if-nez v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->b(Lcom/google/android/flexbox/FlexboxLayoutManager;)I
 
@@ -332,7 +332,7 @@
     return-void
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->a(Lcom/google/android/flexbox/FlexboxLayoutManager;)I
 
@@ -348,7 +348,7 @@
     return-void
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->a(Lcom/google/android/flexbox/FlexboxLayoutManager;)I
 
@@ -356,7 +356,7 @@
 
     if-nez v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->b(Lcom/google/android/flexbox/FlexboxLayoutManager;)I
 
@@ -374,7 +374,7 @@
     return-void
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->a(Lcom/google/android/flexbox/FlexboxLayoutManager;)I
 
@@ -411,7 +411,7 @@
 .method static synthetic d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
     .locals 0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abR:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acj:I
 
     return p1
 .end method
@@ -435,7 +435,7 @@
 .method static synthetic f(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
     .locals 0
 
-    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abQ:I
+    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->aci:I
 
     return p0
 .end method
@@ -443,15 +443,15 @@
 .method static synthetic g(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
-    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->c(Lcom/google/android/flexbox/FlexboxLayoutManager;)Z
 
@@ -463,7 +463,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->d(Lcom/google/android/flexbox/FlexboxLayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -476,13 +476,13 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getWidth()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->d(Lcom/google/android/flexbox/FlexboxLayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -504,7 +504,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->d(Lcom/google/android/flexbox/FlexboxLayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -517,7 +517,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abT:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acm:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->d(Lcom/google/android/flexbox/FlexboxLayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -538,7 +538,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abS:Z
+    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acl:Z
 
     return v0
 .end method
@@ -546,7 +546,7 @@
 .method static synthetic i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
     .locals 0
 
-    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abR:I
+    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acj:I
 
     return p0
 .end method
@@ -578,7 +578,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abQ:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->aci:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -594,7 +594,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abR:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acj:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -618,7 +618,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->abS:Z
+    iget-boolean v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->acl:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager$b.smali b/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager$b.smali
index 6dc79439dd..42ea1b556c 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager$b.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager$b.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field abQ:I
+.field aci:I
 
-.field abU:Z
+.field acn:Z
 
 .field mAvailable:I
 
@@ -62,11 +62,11 @@
 .method static synthetic a(Lcom/google/android/flexbox/FlexboxLayoutManager$b;)I
     .locals 2
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     add-int/lit8 v1, v0, 0x1
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     return v0
 .end method
@@ -74,11 +74,11 @@
 .method static synthetic b(Lcom/google/android/flexbox/FlexboxLayoutManager$b;)I
     .locals 2
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     add-int/lit8 v1, v0, -0x1
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     return v0
 .end method
@@ -102,7 +102,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager.smali b/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager.smali
index 3b1bc7893d..22cc63ec62 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager.smali
@@ -21,39 +21,11 @@
 # static fields
 .field static final synthetic $assertionsDisabled:Z
 
-.field private static final abF:Landroid/graphics/Rect;
+.field private static final abX:Landroid/graphics/Rect;
 
 
 # instance fields
-.field private abG:Z
-
-.field private abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
-
-.field private abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
-
-.field private abJ:Landroidx/recyclerview/widget/OrientationHelper;
-
-.field private abK:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
-
-.field private abL:I
-
-.field private abM:I
-
-.field private abN:Landroid/util/SparseArray;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Landroid/util/SparseArray<",
-            "Landroid/view/View;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private abO:Landroid/view/View;
-
-.field private abP:I
-
-.field private abi:Ljava/util/List;
+.field private abA:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -63,17 +35,45 @@
     .end annotation
 .end field
 
-.field private abk:I
+.field private abC:I
 
-.field private abl:I
+.field private abD:I
 
-.field private abm:I
+.field private abE:I
 
-.field private abn:I
+.field private abF:I
 
-.field private final abx:Lcom/google/android/flexbox/c;
+.field private final abP:Lcom/google/android/flexbox/c;
 
-.field private aby:Lcom/google/android/flexbox/c$a;
+.field private abQ:Lcom/google/android/flexbox/c$a;
+
+.field private abY:Z
+
+.field private abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+
+.field private aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+
+.field private acb:Landroidx/recyclerview/widget/OrientationHelper;
+
+.field private acc:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+
+.field private acd:I
+
+.field private ace:I
+
+.field private acf:Landroid/util/SparseArray;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Landroid/util/SparseArray<",
+            "Landroid/view/View;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private acg:Landroid/view/View;
+
+.field private ach:I
 
 .field private final mContext:Landroid/content/Context;
 
@@ -100,7 +100,7 @@
 
     invoke-direct {v0}, Landroid/graphics/Rect;-><init>()V
 
-    sput-object v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abF:Landroid/graphics/Rect;
+    sput-object v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abX:Landroid/graphics/Rect;
 
     return-void
 .end method
@@ -124,13 +124,13 @@
 
     invoke-direct {p2}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     new-instance p2, Lcom/google/android/flexbox/c;
 
     invoke-direct {p2, p0}, Lcom/google/android/flexbox/c;-><init>(Lcom/google/android/flexbox/a;)V
 
-    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     new-instance p2, Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
@@ -138,7 +138,7 @@
 
     invoke-direct {p2, p0, v0}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;-><init>(Lcom/google/android/flexbox/FlexboxLayoutManager;B)V
 
-    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     const/4 p2, -0x1
 
@@ -148,23 +148,23 @@
 
     iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPositionOffset:I
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abL:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acd:I
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abM:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ace:I
 
     new-instance v1, Landroid/util/SparseArray;
 
     invoke-direct {v1}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abN:Landroid/util/SparseArray;
+    iput-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acf:Landroid/util/SparseArray;
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ach:I
 
     new-instance p2, Lcom/google/android/flexbox/c$a;
 
     invoke-direct {p2}, Lcom/google/android/flexbox/c$a;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
     invoke-direct {p0, v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->setFlexDirection(I)V
 
@@ -172,7 +172,7 @@
 
     invoke-direct {p0, p2}, Lcom/google/android/flexbox/FlexboxLayoutManager;->setFlexWrap(I)V
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kH()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kF()V
 
     invoke-virtual {p0, p2}, Lcom/google/android/flexbox/FlexboxLayoutManager;->setAutoMeasureEnabled(Z)V
 
@@ -190,13 +190,13 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     new-instance v0, Lcom/google/android/flexbox/c;
 
     invoke-direct {v0, p0}, Lcom/google/android/flexbox/c;-><init>(Lcom/google/android/flexbox/a;)V
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     new-instance v0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
@@ -204,7 +204,7 @@
 
     invoke-direct {v0, p0, v1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;-><init>(Lcom/google/android/flexbox/FlexboxLayoutManager;B)V
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     const/4 v0, -0x1
 
@@ -214,23 +214,23 @@
 
     iput v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPositionOffset:I
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abL:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acd:I
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abM:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ace:I
 
     new-instance v2, Landroid/util/SparseArray;
 
     invoke-direct {v2}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abN:Landroid/util/SparseArray;
+    iput-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acf:Landroid/util/SparseArray;
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ach:I
 
     new-instance v0, Lcom/google/android/flexbox/c$a;
 
     invoke-direct {v0}, Lcom/google/android/flexbox/c$a;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
     invoke-static {p1, p2, p3, p4}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getProperties(Landroid/content/Context;Landroid/util/AttributeSet;II)Landroidx/recyclerview/widget/RecyclerView$LayoutManager$Properties;
 
@@ -279,7 +279,7 @@
     :goto_0
     invoke-direct {p0, p4}, Lcom/google/android/flexbox/FlexboxLayoutManager;->setFlexWrap(I)V
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kH()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kF()V
 
     invoke-virtual {p0, p4}, Lcom/google/android/flexbox/FlexboxLayoutManager;->setAutoMeasureEnabled(Z)V
 
@@ -304,15 +304,15 @@
     goto :goto_3
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kJ()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kH()V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     const/4 v2, 0x1
 
-    iput-boolean v2, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abU:Z
+    iput-boolean v2, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->acn:Z
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -351,13 +351,13 @@
 
     move-result v3
 
-    invoke-direct {p0, v2, v3}, Lcom/google/android/flexbox/FlexboxLayoutManager;->u(II)V
+    invoke-direct {p0, v2, v3}, Lcom/google/android/flexbox/FlexboxLayoutManager;->t(II)V
 
-    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v4, v4, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
-    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     invoke-direct {p0, p2, p3, v5}, Lcom/google/android/flexbox/FlexboxLayoutManager;->a(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Lcom/google/android/flexbox/FlexboxLayoutManager$b;)I
 
@@ -393,7 +393,7 @@
 
     invoke-virtual {p2, p3}, Landroidx/recyclerview/widget/OrientationHelper;->offsetChildren(I)V
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iput p1, p2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mLastScrollDelta:I
 
@@ -439,7 +439,7 @@
 
     iget v5, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v6
 
@@ -448,7 +448,7 @@
     :goto_0
     if-gtz v5, :cond_3
 
-    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-boolean v9, v9, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mInfinite:Z
 
@@ -463,7 +463,7 @@
 
     :cond_3
     :goto_1
-    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
@@ -479,11 +479,11 @@
 
     if-ge v10, v12, :cond_4
 
-    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     if-ltz v10, :cond_4
 
-    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     invoke-interface {v9}, Ljava/util/List;->size()I
 
@@ -501,9 +501,9 @@
     :goto_2
     if-eqz v9, :cond_2
 
-    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
-    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     invoke-interface {v9, v10}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -511,11 +511,11 @@
 
     check-cast v9, Lcom/google/android/flexbox/b;
 
-    iget v10, v9, Lcom/google/android/flexbox/b;->abc:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->abu:I
 
     iput v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v10
 
@@ -541,7 +541,7 @@
 
     if-ne v15, v7, :cond_5
 
-    iget v7, v9, Lcom/google/android/flexbox/b;->aaV:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->abn:I
 
     sub-int/2addr v14, v7
 
@@ -550,7 +550,7 @@
 
     iget v15, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
-    iget v14, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abm:I
+    iget v14, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abE:I
 
     if-eqz v14, :cond_c
 
@@ -574,7 +574,7 @@
 
     if-eqz v4, :cond_6
 
-    iget v4, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v4, v13, v4
 
@@ -615,7 +615,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abm:I
+    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abE:I
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -646,7 +646,7 @@
     const/high16 v4, 0x3f800000    # 1.0f
 
     :goto_4
-    iget v14, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v14, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v14, v13, v14
 
@@ -663,7 +663,7 @@
     :cond_a
     int-to-float v4, v10
 
-    iget v10, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v10, v13, v10
 
@@ -677,7 +677,7 @@
 
     int-to-float v4, v4
 
-    iget v12, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int/2addr v13, v12
 
@@ -690,7 +690,7 @@
     goto :goto_5
 
     :cond_b
-    iget v4, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int/2addr v13, v4
 
@@ -698,7 +698,7 @@
 
     int-to-float v4, v13
 
-    iget v12, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int/2addr v12, v10
 
@@ -719,7 +719,7 @@
     const/4 v4, 0x0
 
     :goto_6
-    iget-object v13, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v13, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v13}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -729,7 +729,7 @@
 
     sub-float/2addr v10, v13
 
-    iget-object v13, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v13, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v13}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -776,7 +776,7 @@
 
     if-ne v14, v3, :cond_d
 
-    sget-object v14, Lcom/google/android/flexbox/FlexboxLayoutManager;->abF:Landroid/graphics/Rect;
+    sget-object v14, Lcom/google/android/flexbox/FlexboxLayoutManager;->abX:Landroid/graphics/Rect;
 
     invoke-virtual {v0, v11, v14}, Lcom/google/android/flexbox/FlexboxLayoutManager;->calculateItemDecorationsForChild(Landroid/view/View;Landroid/graphics/Rect;)V
 
@@ -785,7 +785,7 @@
     goto :goto_8
 
     :cond_d
-    sget-object v14, Lcom/google/android/flexbox/FlexboxLayoutManager;->abF:Landroid/graphics/Rect;
+    sget-object v14, Lcom/google/android/flexbox/FlexboxLayoutManager;->abX:Landroid/graphics/Rect;
 
     invoke-virtual {v0, v11, v14}, Lcom/google/android/flexbox/FlexboxLayoutManager;->calculateItemDecorationsForChild(Landroid/view/View;Landroid/graphics/Rect;)V
 
@@ -796,9 +796,9 @@
     :goto_8
     move/from16 v19, v12
 
-    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v12, v12, Lcom/google/android/flexbox/c;->abg:[J
+    iget-object v12, v12, Lcom/google/android/flexbox/c;->aby:[J
 
     aget-wide v21, v12, v10
 
@@ -861,7 +861,7 @@
 
     if-eqz v12, :cond_f
 
-    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-static/range {v23 .. v23}, Ljava/lang/Math;->round(F)I
 
@@ -906,7 +906,7 @@
 
     move/from16 v26, v17
 
-    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-static/range {v22 .. v22}, Ljava/lang/Math;->round(F)I
 
@@ -1004,17 +1004,17 @@
     :cond_11
     move/from16 v20, v3
 
-    iget v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iget v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v4, v4, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mLayoutDirection:I
 
     add-int/2addr v3, v4
 
-    iput v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iput v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
-    iget v3, v9, Lcom/google/android/flexbox/b;->aaV:I
+    iget v3, v9, Lcom/google/android/flexbox/b;->abn:I
 
     goto :goto_b
 
@@ -1036,7 +1036,7 @@
 
     iget v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
-    iget v4, v9, Lcom/google/android/flexbox/b;->aaV:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->abn:I
 
     iget v7, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mLayoutDirection:I
 
@@ -1051,7 +1051,7 @@
     :cond_13
     iget v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
-    iget v4, v9, Lcom/google/android/flexbox/b;->aaV:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->abn:I
 
     iget v7, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mLayoutDirection:I
 
@@ -1062,7 +1062,7 @@
     iput v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
     :goto_c
-    iget v3, v9, Lcom/google/android/flexbox/b;->aaV:I
+    iget v3, v9, Lcom/google/android/flexbox/b;->abn:I
 
     sub-int/2addr v5, v3
 
@@ -1117,7 +1117,7 @@
 .method static synthetic a(Lcom/google/android/flexbox/FlexboxLayoutManager;)I
     .locals 0
 
-    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abl:I
+    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abD:I
 
     return p0
 .end method
@@ -1153,11 +1153,11 @@
 
     if-ne v6, v7, :cond_0
 
-    iget v6, v9, Lcom/google/android/flexbox/b;->aaV:I
+    iget v6, v9, Lcom/google/android/flexbox/b;->abn:I
 
     sub-int/2addr v4, v6
 
-    iget v6, v9, Lcom/google/android/flexbox/b;->aaV:I
+    iget v6, v9, Lcom/google/android/flexbox/b;->abn:I
 
     add-int/2addr v5, v6
 
@@ -1168,7 +1168,7 @@
 
     iget v13, v10, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
-    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abm:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abE:I
 
     const/4 v5, 0x0
 
@@ -1196,7 +1196,7 @@
 
     if-eqz v4, :cond_1
 
-    iget v4, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v4, v3, v4
 
@@ -1237,7 +1237,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abm:I
+    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abE:I
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -1268,7 +1268,7 @@
     const/high16 v4, 0x3f800000    # 1.0f
 
     :goto_1
-    iget v6, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v6, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v6, v3, v6
 
@@ -1285,7 +1285,7 @@
     :cond_5
     int-to-float v1, v1
 
-    iget v4, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v4, v3, v4
 
@@ -1299,7 +1299,7 @@
 
     int-to-float v2, v2
 
-    iget v4, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int/2addr v3, v4
 
@@ -1312,7 +1312,7 @@
     goto :goto_2
 
     :cond_6
-    iget v4, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int/2addr v3, v4
 
@@ -1320,7 +1320,7 @@
 
     int-to-float v2, v3
 
-    iget v3, v9, Lcom/google/android/flexbox/b;->aaT:I
+    iget v3, v9, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int/2addr v3, v1
 
@@ -1347,7 +1347,7 @@
     const/4 v4, 0x0
 
     :goto_3
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v3}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -1357,7 +1357,7 @@
 
     sub-float/2addr v1, v3
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v3}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -1388,9 +1388,9 @@
 
     if-eqz v6, :cond_d
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v4, v4, Lcom/google/android/flexbox/c;->abg:[J
+    iget-object v4, v4, Lcom/google/android/flexbox/c;->aby:[J
 
     aget-wide v16, v4, v7
 
@@ -1449,7 +1449,7 @@
 
     if-ne v1, v5, :cond_9
 
-    sget-object v1, Lcom/google/android/flexbox/FlexboxLayoutManager;->abF:Landroid/graphics/Rect;
+    sget-object v1, Lcom/google/android/flexbox/FlexboxLayoutManager;->abX:Landroid/graphics/Rect;
 
     invoke-virtual {v0, v6, v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->calculateItemDecorationsForChild(Landroid/view/View;Landroid/graphics/Rect;)V
 
@@ -1458,7 +1458,7 @@
     goto :goto_5
 
     :cond_9
-    sget-object v1, Lcom/google/android/flexbox/FlexboxLayoutManager;->abF:Landroid/graphics/Rect;
+    sget-object v1, Lcom/google/android/flexbox/FlexboxLayoutManager;->abX:Landroid/graphics/Rect;
 
     invoke-virtual {v0, v6, v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->calculateItemDecorationsForChild(Landroid/view/View;Landroid/graphics/Rect;)V
 
@@ -1485,11 +1485,11 @@
 
     if-eqz v4, :cond_b
 
-    iget-boolean v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abG:Z
+    iget-boolean v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abY:Z
 
     if-eqz v1, :cond_a
 
-    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v6}, Landroid/view/View;->getMeasuredWidth()I
 
@@ -1544,7 +1544,7 @@
 
     const/16 v23, 0x1
 
-    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual/range {v24 .. v24}, Landroid/view/View;->getMeasuredWidth()I
 
@@ -1585,11 +1585,11 @@
 
     const/16 v23, 0x1
 
-    iget-boolean v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abG:Z
+    iget-boolean v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abY:Z
 
     if-eqz v1, :cond_c
 
-    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-static/range {v18 .. v18}, Ljava/lang/Math;->round(F)I
 
@@ -1622,7 +1622,7 @@
     goto :goto_6
 
     :cond_c
-    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-static/range {v16 .. v16}, Ljava/lang/Math;->round(F)I
 
@@ -1720,17 +1720,17 @@
     goto/16 :goto_4
 
     :cond_e
-    iget v1, v10, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iget v1, v10, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
-    iget-object v2, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v2, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v2, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mLayoutDirection:I
 
     add-int/2addr v1, v2
 
-    iput v1, v10, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iput v1, v10, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
-    iget v1, v9, Lcom/google/android/flexbox/b;->aaV:I
+    iget v1, v9, Lcom/google/android/flexbox/b;->abn:I
 
     return v1
 .end method
@@ -1738,7 +1738,7 @@
 .method private a(Landroid/view/View;Lcom/google/android/flexbox/b;)Landroid/view/View;
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -1815,7 +1815,7 @@
 .method private a(Landroidx/recyclerview/widget/RecyclerView$Recycler;Lcom/google/android/flexbox/FlexboxLayoutManager$b;)V
     .locals 2
 
-    iget-boolean v0, p2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abU:Z
+    iget-boolean v0, p2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->acn:Z
 
     if-nez v0, :cond_0
 
@@ -1843,19 +1843,19 @@
 
     if-eqz p3, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kI()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kG()V
 
     goto :goto_0
 
     :cond_0
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     const/4 v0, 0x0
 
     iput-boolean v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mInfinite:Z
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result p3
 
@@ -1865,7 +1865,7 @@
 
     if-eqz p3, :cond_1
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->j(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -1882,7 +1882,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -1899,7 +1899,7 @@
     iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
 
     :goto_1
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->e(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -1907,7 +1907,7 @@
 
     iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     const/4 v0, 0x1
 
@@ -1921,7 +1921,7 @@
 
     iput v1, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     const/high16 v1, -0x80000000
 
@@ -1931,11 +1931,11 @@
 
     move-result v1
 
-    iput v1, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iput v1, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     if-eqz p2, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {p2}, Ljava/util/List;->size()I
 
@@ -1953,7 +1953,7 @@
 
     move-result p2
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {p3}, Ljava/util/List;->size()I
 
@@ -1963,7 +1963,7 @@
 
     if-ge p2, p3, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->f(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -1975,11 +1975,11 @@
 
     check-cast p1, Lcom/google/android/flexbox/b;
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     invoke-static {p2}, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$b;)I
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget p3, p2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
@@ -2013,21 +2013,21 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v3, v2}, Lcom/google/android/flexbox/c;->aQ(I)V
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v3, v2}, Lcom/google/android/flexbox/c;->aP(I)V
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v3, v2}, Lcom/google/android/flexbox/c;->aR(I)V
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v2, v2, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v2, v2, Lcom/google/android/flexbox/c;->abx:[I
 
     array-length v2, v2
 
@@ -2036,7 +2036,7 @@
     return-void
 
     :cond_1
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ach:I
 
     const/4 v2, 0x0
 
@@ -2062,7 +2062,7 @@
 
     iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPosition:I
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result p1
 
@@ -2134,9 +2134,9 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v2, v2, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v2, v2, Lcom/google/android/flexbox/c;->abx:[I
 
     aget v1, v2, v1
 
@@ -2147,7 +2147,7 @@
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2188,13 +2188,13 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v1, v1, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v1, v1, Lcom/google/android/flexbox/c;->abx:[I
 
     aget v0, v1, v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2225,13 +2225,13 @@
     goto/16 :goto_4
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kJ()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kH()V
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abO:Landroid/view/View;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acg:Landroid/view/View;
 
     if-eqz v0, :cond_1
 
@@ -2280,7 +2280,7 @@
 
     if-gez p1, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -2300,7 +2300,7 @@
     goto :goto_3
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -2310,7 +2310,7 @@
 
     if-lez v0, :cond_8
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -2321,7 +2321,7 @@
     :cond_5
     if-lez p1, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -2338,7 +2338,7 @@
     goto :goto_3
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -2351,7 +2351,7 @@
     goto :goto_3
 
     :cond_7
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -2371,7 +2371,7 @@
 .method static synthetic b(Lcom/google/android/flexbox/FlexboxLayoutManager;)I
     .locals 0
 
-    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abk:I
+    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abC:I
 
     return p0
 .end method
@@ -2379,7 +2379,7 @@
 .method private b(Landroid/view/View;Lcom/google/android/flexbox/b;)Landroid/view/View;
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -2490,9 +2490,9 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v3, v3, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v3, v3, Lcom/google/android/flexbox/c;->abx:[I
 
     invoke-virtual {p0, v2}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getPosition(Landroid/view/View;)I
 
@@ -2507,7 +2507,7 @@
     return-void
 
     :cond_2
-    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v4, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2544,7 +2544,7 @@
 
     if-ne v7, v6, :cond_3
 
-    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -2558,7 +2558,7 @@
 
     add-int/2addr v3, v4
 
-    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v4, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2587,19 +2587,19 @@
 
     if-eqz p3, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kI()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kG()V
 
     goto :goto_0
 
     :cond_0
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     const/4 v0, 0x0
 
     iput-boolean v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mInfinite:Z
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result p3
 
@@ -2609,9 +2609,9 @@
 
     if-eqz p3, :cond_1
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abO:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acg:Landroid/view/View;
 
     invoke-virtual {v0}, Landroid/view/View;->getWidth()I
 
@@ -2636,7 +2636,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->j(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -2653,7 +2653,7 @@
     iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
 
     :goto_1
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->e(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -2661,7 +2661,7 @@
 
     iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     const/4 v0, 0x1
 
@@ -2677,7 +2677,7 @@
 
     iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     const/high16 v0, -0x80000000
 
@@ -2687,7 +2687,7 @@
 
     move-result v0
 
-    iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     if-eqz p2, :cond_2
 
@@ -2697,7 +2697,7 @@
 
     if-lez p2, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {p2}, Ljava/util/List;->size()I
 
@@ -2709,7 +2709,7 @@
 
     if-le p2, p3, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->f(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -2721,11 +2721,11 @@
 
     check-cast p1, Lcom/google/android/flexbox/b;
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     invoke-static {p2}, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->b(Lcom/google/android/flexbox/FlexboxLayoutManager$b;)I
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget p3, p2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
@@ -2742,7 +2742,7 @@
 .method private b(Landroid/view/View;I)Z
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -2821,9 +2821,9 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v3, v3, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v3, v3, Lcom/google/android/flexbox/c;->abx:[I
 
     invoke-virtual {p0, v2}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getPosition(Landroid/view/View;)I
 
@@ -2838,7 +2838,7 @@
     return-void
 
     :cond_2
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2865,7 +2865,7 @@
 
     if-eqz v6, :cond_4
 
-    iget v6, v3, Lcom/google/android/flexbox/b;->abc:I
+    iget v6, v3, Lcom/google/android/flexbox/b;->abu:I
 
     invoke-virtual {p0, v5}, Lcom/google/android/flexbox/FlexboxLayoutManager;->getPosition(Landroid/view/View;)I
 
@@ -2879,7 +2879,7 @@
 
     add-int/2addr v2, v3
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2906,7 +2906,7 @@
 .method private c(Landroid/view/View;I)Z
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -3115,7 +3115,7 @@
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kJ()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kH()V
 
     invoke-direct {p0, v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->aX(I)Landroid/view/View;
 
@@ -3234,9 +3234,9 @@
 
     move-result v0
 
-    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v4, v4, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v4, v4, Lcom/google/android/flexbox/c;->abx:[I
 
     aget p1, v4, p1
 
@@ -3249,9 +3249,9 @@
     goto :goto_0
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v1, v1, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v1, v1, Lcom/google/android/flexbox/c;->abx:[I
 
     aget v1, v1, v3
 
@@ -3401,7 +3401,7 @@
 .method static synthetic e(Lcom/google/android/flexbox/FlexboxLayoutManager;)Lcom/google/android/flexbox/c;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     return-object p0
 .end method
@@ -3409,7 +3409,7 @@
 .method private ensureLayoutState()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     if-nez v0, :cond_0
 
@@ -3419,7 +3419,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/flexbox/FlexboxLayoutManager$b;-><init>(B)V
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     :cond_0
     return-void
@@ -3428,7 +3428,7 @@
 .method static synthetic f(Lcom/google/android/flexbox/FlexboxLayoutManager;)Ljava/util/List;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     return-object p0
 .end method
@@ -3442,7 +3442,7 @@
 
     const/4 v1, 0x0
 
-    invoke-direct {p0, v1, v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->v(II)Landroid/view/View;
+    invoke-direct {p0, v1, v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->u(II)Landroid/view/View;
 
     move-result-object v0
 
@@ -3471,7 +3471,7 @@
 
     const/4 v1, -0x1
 
-    invoke-direct {p0, v0, v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->v(II)Landroid/view/View;
+    invoke-direct {p0, v0, v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->u(II)Landroid/view/View;
 
     move-result-object v0
 
@@ -3490,7 +3490,7 @@
 .method private fixLayoutEndGap(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -3583,7 +3583,7 @@
 .method private fixLayoutStartGap(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -3666,7 +3666,7 @@
 .method private g(III)Landroid/view/View;
     .locals 7
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kJ()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kH()V
 
     invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ensureLayoutState()V
 
@@ -3826,10 +3826,10 @@
     return v1
 .end method
 
-.method private kH()V
+.method private kF()V
     .locals 2
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abn:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abF:I
 
     const/4 v1, 0x4
 
@@ -3837,9 +3837,9 @@
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->removeAllViews()V
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kK()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kI()V
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abn:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abF:I
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->requestLayout()V
 
@@ -3847,10 +3847,10 @@
     return-void
 .end method
 
-.method private kI()V
+.method private kG()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -3868,7 +3868,7 @@
     move-result v0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     if-eqz v0, :cond_2
 
@@ -3893,7 +3893,7 @@
     return-void
 .end method
 
-.method private kJ()V
+.method private kH()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -3903,13 +3903,13 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abl:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abD:I
 
     if-eqz v0, :cond_2
 
@@ -3923,12 +3923,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abJ:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acb:Landroidx/recyclerview/widget/OrientationHelper;
 
     return-void
 
     :cond_1
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abl:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abD:I
 
     if-nez v0, :cond_2
 
@@ -3942,7 +3942,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abJ:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acb:Landroidx/recyclerview/widget/OrientationHelper;
 
     return-void
 
@@ -3957,23 +3957,23 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abJ:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acb:Landroidx/recyclerview/widget/OrientationHelper;
 
     return-void
 .end method
 
-.method private kK()V
+.method private kI()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->b(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     const/4 v1, 0x0
 
@@ -4001,21 +4001,21 @@
 .method private setFlexDirection(I)V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abC:I
 
     if-eq v0, p1, :cond_0
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->removeAllViews()V
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abk:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abC:I
 
     const/4 p1, 0x0
 
     iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abJ:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acb:Landroidx/recyclerview/widget/OrientationHelper;
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kK()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kI()V
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->requestLayout()V
 
@@ -4026,7 +4026,7 @@
 .method private setFlexWrap(I)V
     .locals 1
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abl:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abD:I
 
     const/4 v0, 0x1
 
@@ -4036,16 +4036,16 @@
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->removeAllViews()V
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kK()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kI()V
 
     :cond_0
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abl:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abD:I
 
     const/4 p1, 0x0
 
     iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abJ:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acb:Landroidx/recyclerview/widget/OrientationHelper;
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->requestLayout()V
 
@@ -4106,14 +4106,14 @@
     return p1
 .end method
 
-.method private u(II)V
+.method private t(II)V
     .locals 10
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iput p1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mLayoutDirection:I
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -4173,7 +4173,7 @@
 
     move-result-object p1
 
-    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -4187,13 +4187,13 @@
 
     move-result v7
 
-    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v8, v8, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v8, v8, Lcom/google/android/flexbox/c;->abx:[I
 
     aget v8, v8, v7
 
-    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v9, v8}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -4205,7 +4205,7 @@
 
     move-result-object p1
 
-    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iput v4, v8, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mItemDirection:I
 
@@ -4215,43 +4215,43 @@
 
     iput v7, v8, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
-    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v7, v7, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v7, v7, Lcom/google/android/flexbox/c;->abx:[I
 
     array-length v7, v7
 
-    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v8, v8, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
     if-gt v7, v8, :cond_1
 
-    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iput v6, v7, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iput v6, v7, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     goto :goto_1
 
     :cond_1
-    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v8, v8, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v8, v8, Lcom/google/android/flexbox/c;->abx:[I
 
-    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v9, v9, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
     aget v8, v8, v9
 
-    iput v8, v7, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iput v8, v7, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     :goto_1
     if-eqz v5, :cond_3
 
-    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -4261,7 +4261,7 @@
 
     iput v7, v5, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
-    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -4281,13 +4281,13 @@
 
     iput p1, v5, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v5, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
     if-ltz v5, :cond_2
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v3, v3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
@@ -4297,7 +4297,7 @@
     goto :goto_2
 
     :cond_3
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -4307,7 +4307,7 @@
 
     iput v5, v3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -4326,17 +4326,17 @@
     iput p1, v3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
     :goto_2
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     if-eq p1, v6, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
@@ -4347,7 +4347,7 @@
     if-le p1, v3, :cond_c
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
@@ -4357,13 +4357,13 @@
 
     if-gt p1, v3, :cond_c
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
     sub-int v7, p2, p1
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
     invoke-virtual {p1}, Lcom/google/android/flexbox/c$a;->reset()V
 
@@ -4371,15 +4371,15 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v8, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
-    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     move v5, v1
 
@@ -4390,15 +4390,15 @@
     goto :goto_3
 
     :cond_5
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v8, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
-    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     move v5, v1
 
@@ -4407,17 +4407,17 @@
     invoke-virtual/range {v3 .. v9}, Lcom/google/android/flexbox/c;->c(Lcom/google/android/flexbox/c$a;IIIILjava/util/List;)V
 
     :goto_3
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v0, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
     invoke-virtual {p1, v1, v2, v0}, Lcom/google/android/flexbox/c;->e(III)V
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v0, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
@@ -4430,7 +4430,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -4444,13 +4444,13 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v1, v1, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v1, v1, Lcom/google/android/flexbox/c;->abx:[I
 
     aget v1, v1, v0
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -4462,13 +4462,13 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iput v4, v1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mItemDirection:I
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v1, v1, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v1, v1, Lcom/google/android/flexbox/c;->abx:[I
 
     aget v1, v1, v0
 
@@ -4479,7 +4479,7 @@
     :cond_7
     if-lez v1, :cond_8
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     add-int/lit8 v6, v1, -0x1
 
@@ -4489,7 +4489,7 @@
 
     check-cast v2, Lcom/google/android/flexbox/b;
 
-    iget-object v6, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v6, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v2, v2, Lcom/google/android/flexbox/b;->mItemCount:I
 
@@ -4500,12 +4500,12 @@
     goto :goto_4
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iput v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
     :goto_4
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     if-lez v1, :cond_9
 
@@ -4517,11 +4517,11 @@
     const/4 v1, 0x0
 
     :goto_5
-    iput v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iput v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     if-eqz v5, :cond_b
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -4531,7 +4531,7 @@
 
     iput v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -4549,13 +4549,13 @@
 
     iput p1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v0, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
     if-ltz v0, :cond_a
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
@@ -4565,7 +4565,7 @@
     goto :goto_6
 
     :cond_b
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -4575,7 +4575,7 @@
 
     iput v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
 
@@ -4597,7 +4597,7 @@
 
     :cond_c
     :goto_6
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v0, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
@@ -4608,7 +4608,7 @@
     return-void
 .end method
 
-.method private v(II)Landroid/view/View;
+.method private u(II)Landroid/view/View;
     .locals 3
 
     if-le p2, p1, :cond_0
@@ -4653,7 +4653,7 @@
 .method public final a(Landroid/view/View;II)I
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result p2
 
@@ -4684,14 +4684,24 @@
     goto :goto_0
 .end method
 
+.method public final a(ILandroid/view/View;)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acf:Landroid/util/SparseArray;
+
+    invoke-virtual {v0, p1, p2}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
+
+    return-void
+.end method
+
 .method public final a(Landroid/view/View;IILcom/google/android/flexbox/b;)V
     .locals 0
 
-    sget-object p2, Lcom/google/android/flexbox/FlexboxLayoutManager;->abF:Landroid/graphics/Rect;
+    sget-object p2, Lcom/google/android/flexbox/FlexboxLayoutManager;->abX:Landroid/graphics/Rect;
 
     invoke-virtual {p0, p1, p2}, Lcom/google/android/flexbox/FlexboxLayoutManager;->calculateItemDecorationsForChild(Landroid/view/View;Landroid/graphics/Rect;)V
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result p2
 
@@ -4707,17 +4717,17 @@
 
     add-int/2addr p2, p1
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->aaT:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->abl:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->aaT:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->abl:I
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->aaU:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->abm:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->aaU:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->abm:I
 
     return-void
 
@@ -4732,17 +4742,17 @@
 
     add-int/2addr p2, p1
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->aaT:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->abl:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->aaT:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->abl:I
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->aaU:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->abm:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->aaU:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->abm:I
 
     return-void
 .end method
@@ -4756,7 +4766,7 @@
 .method public final aK(I)Landroid/view/View;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abN:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acf:Landroid/util/SparseArray;
 
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -4788,16 +4798,6 @@
     return-object p1
 .end method
 
-.method public final b(ILandroid/view/View;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abN:Landroid/util/SparseArray;
-
-    invoke-virtual {v0, p1, p2}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
-
-    return-void
-.end method
-
 .method public final c(III)I
     .locals 2
 
@@ -4823,7 +4823,7 @@
 .method public canScrollHorizontally()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -4833,7 +4833,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abO:Landroid/view/View;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acg:Landroid/view/View;
 
     invoke-virtual {v1}, Landroid/view/View;->getWidth()I
 
@@ -4858,7 +4858,7 @@
 .method public canScrollVertically()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -4868,7 +4868,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abO:Landroid/view/View;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acg:Landroid/view/View;
 
     invoke-virtual {v1}, Landroid/view/View;->getHeight()I
 
@@ -4964,7 +4964,7 @@
     const/4 p1, 0x1
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -5073,7 +5073,7 @@
 .method public getAlignItems()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abn:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abF:I
 
     return v0
 .end method
@@ -5081,7 +5081,7 @@
 .method public getFlexDirection()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abC:I
 
     return v0
 .end method
@@ -5109,7 +5109,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     return-object v0
 .end method
@@ -5117,7 +5117,7 @@
 .method public getFlexWrap()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abl:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abD:I
 
     return v0
 .end method
@@ -5125,7 +5125,7 @@
 .method public getLargestMainSize()I
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -5140,7 +5140,7 @@
     :cond_0
     const/high16 v0, -0x80000000
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -5149,7 +5149,7 @@
     :goto_0
     if-ge v1, v2, :cond_1
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v3, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -5157,7 +5157,7 @@
 
     check-cast v3, Lcom/google/android/flexbox/b;
 
-    iget v3, v3, Lcom/google/android/flexbox/b;->aaT:I
+    iget v3, v3, Lcom/google/android/flexbox/b;->abl:I
 
     invoke-static {v0, v3}, Ljava/lang/Math;->max(II)I
 
@@ -5174,7 +5174,7 @@
 .method public getSumOfCrossSize()I
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -5187,7 +5187,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v3, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -5195,7 +5195,7 @@
 
     check-cast v3, Lcom/google/android/flexbox/b;
 
-    iget v3, v3, Lcom/google/android/flexbox/b;->aaV:I
+    iget v3, v3, Lcom/google/android/flexbox/b;->abn:I
 
     add-int/2addr v2, v3
 
@@ -5210,7 +5210,7 @@
 .method public final h(Landroid/view/View;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -5241,10 +5241,10 @@
     goto :goto_0
 .end method
 
-.method public final ku()Z
+.method public final ks()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abC:I
 
     const/4 v1, 0x1
 
@@ -5283,7 +5283,7 @@
 
     check-cast p1, Landroid/view/View;
 
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abO:Landroid/view/View;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acg:Landroid/view/View;
 
     return-void
 .end method
@@ -5391,7 +5391,7 @@
 
     move-result v4
 
-    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abk:I
+    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abC:I
 
     const/4 v6, 0x2
 
@@ -5411,7 +5411,7 @@
 
     iput-boolean v7, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
 
-    iput-boolean v7, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abG:Z
+    iput-boolean v7, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abY:Z
 
     goto :goto_6
 
@@ -5428,7 +5428,7 @@
     :goto_0
     iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
 
-    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abl:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abD:I
 
     if-ne v4, v6, :cond_3
 
@@ -5439,7 +5439,7 @@
     iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
 
     :cond_3
-    iput-boolean v8, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abG:Z
+    iput-boolean v8, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abY:Z
 
     goto :goto_6
 
@@ -5456,7 +5456,7 @@
     :goto_1
     iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
 
-    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abl:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abD:I
 
     if-ne v4, v6, :cond_6
 
@@ -5467,7 +5467,7 @@
     iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
 
     :cond_6
-    iput-boolean v7, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abG:Z
+    iput-boolean v7, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abY:Z
 
     goto :goto_6
 
@@ -5484,7 +5484,7 @@
     :goto_2
     iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
 
-    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abl:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abD:I
 
     if-ne v4, v6, :cond_9
 
@@ -5496,7 +5496,7 @@
     const/4 v4, 0x0
 
     :goto_3
-    iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abG:Z
+    iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abY:Z
 
     goto :goto_6
 
@@ -5513,7 +5513,7 @@
     :goto_4
     iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mIsRtl:Z
 
-    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abl:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abD:I
 
     if-ne v4, v6, :cond_c
 
@@ -5525,30 +5525,30 @@
     const/4 v4, 0x0
 
     :goto_5
-    iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abG:Z
+    iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abY:Z
 
     :goto_6
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kJ()V
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->kH()V
 
     invoke-direct/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ensureLayoutState()V
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v4, v3}, Lcom/google/android/flexbox/c;->aQ(I)V
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v4, v3}, Lcom/google/android/flexbox/c;->aP(I)V
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v4, v3}, Lcom/google/android/flexbox/c;->aR(I)V
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iput-boolean v7, v4, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abU:Z
+    iput-boolean v7, v4, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->acn:Z
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abK:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acc:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
     if-eqz v4, :cond_d
 
@@ -5558,7 +5558,7 @@
 
     if-eqz v4, :cond_d
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abK:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acc:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;->b(Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;)I
 
@@ -5567,7 +5567,7 @@
     iput v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPosition:I
 
     :cond_d
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)Z
 
@@ -5583,18 +5583,18 @@
 
     if-ne v4, v6, :cond_e
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abK:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acc:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
     if-eqz v4, :cond_24
 
     :cond_e
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->b(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)V
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
-    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abK:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acc:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
     invoke-virtual/range {p2 .. p2}, Landroidx/recyclerview/widget/RecyclerView$State;->isPreLayout()Z
 
@@ -5624,9 +5624,9 @@
 
     invoke-static {v4, v10}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->b(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v10, v10, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v10, v10, Lcom/google/android/flexbox/c;->abx:[I
 
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->e(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -5636,7 +5636,7 @@
 
     invoke-static {v4, v10}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abK:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acc:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
     if-eqz v10, :cond_11
 
@@ -5829,7 +5829,7 @@
     goto :goto_9
 
     :cond_19
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v9
 
@@ -6016,14 +6016,14 @@
     invoke-static {v4, v7}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
 
     :cond_23
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->c(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)Z
 
     :cond_24
     invoke-virtual/range {p0 .. p1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->detachAndScrapAttachedViews(Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)Z
 
@@ -6031,14 +6031,14 @@
 
     if-eqz v4, :cond_25
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-direct {v0, v4, v7, v8}, Lcom/google/android/flexbox/FlexboxLayoutManager;->b(Lcom/google/android/flexbox/FlexboxLayoutManager$a;ZZ)V
 
     goto :goto_12
 
     :cond_25
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-direct {v0, v4, v7, v8}, Lcom/google/android/flexbox/FlexboxLayoutManager;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;ZZ)V
 
@@ -6075,13 +6075,13 @@
 
     move-result v11
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v12
 
     if-eqz v12, :cond_28
 
-    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abL:I
+    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acd:I
 
     if-eq v12, v5, :cond_26
 
@@ -6095,7 +6095,7 @@
     const/4 v5, 0x0
 
     :goto_13
-    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-boolean v12, v12, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mInfinite:Z
 
@@ -6116,14 +6116,14 @@
     goto :goto_15
 
     :cond_27
-    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v12, v12, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
 
     goto :goto_15
 
     :cond_28
-    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abM:I
+    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ace:I
 
     if-eq v12, v5, :cond_29
 
@@ -6137,7 +6137,7 @@
     const/4 v5, 0x0
 
     :goto_14
-    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget-boolean v12, v12, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mInfinite:Z
 
@@ -6158,18 +6158,18 @@
     goto :goto_15
 
     :cond_2a
-    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v12, v12, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mAvailable:I
 
     :goto_15
     move v14, v12
 
-    iput v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abL:I
+    iput v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acd:I
 
-    iput v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abM:I
+    iput v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ace:I
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ach:I
 
     if-ne v10, v6, :cond_2d
 
@@ -6180,7 +6180,7 @@
     if-eqz v5, :cond_2d
 
     :cond_2b
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v3}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)Z
 
@@ -6188,31 +6188,31 @@
 
     if-nez v3, :cond_32
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->clear()V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
     invoke-virtual {v3}, Lcom/google/android/flexbox/c$a;->reset()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v3
 
     if-eqz v3, :cond_2c
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v3}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->e(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
     move-result v15
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     move v12, v4
 
@@ -6225,17 +6225,17 @@
     goto :goto_16
 
     :cond_2c
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v3}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->e(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
     move-result v15
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     move v12, v4
 
@@ -6246,27 +6246,27 @@
     invoke-virtual/range {v10 .. v16}, Lcom/google/android/flexbox/c;->d(Lcom/google/android/flexbox/c$a;IIIILjava/util/List;)V
 
     :goto_16
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v3, Lcom/google/android/flexbox/c$a;->abi:Ljava/util/List;
+    iget-object v3, v3, Lcom/google/android/flexbox/c$a;->abA:Ljava/util/List;
 
-    iput-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iput-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    invoke-virtual {v3, v4, v9}, Lcom/google/android/flexbox/c;->q(II)V
+    invoke-virtual {v3, v4, v9}, Lcom/google/android/flexbox/c;->p(II)V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    invoke-virtual {v3}, Lcom/google/android/flexbox/c;->kF()V
+    invoke-virtual {v3}, Lcom/google/android/flexbox/c;->kD()V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v4, v4, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v4, v4, Lcom/google/android/flexbox/c;->abx:[I
 
-    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v5}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->e(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -6276,24 +6276,24 @@
 
     invoke-static {v3, v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v4}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->f(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
     move-result v4
 
-    iput v4, v3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->abQ:I
+    iput v4, v3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->aci:I
 
     goto/16 :goto_19
 
     :cond_2d
-    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:I
+    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ach:I
 
     if-eq v5, v6, :cond_2e
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v6}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->e(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -6306,24 +6306,24 @@
     goto :goto_17
 
     :cond_2e
-    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v5}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->e(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
     move-result v5
 
     :goto_17
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
     invoke-virtual {v6}, Lcom/google/android/flexbox/c$a;->reset()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v6
 
     if-eqz v6, :cond_30
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v6}, Ljava/util/List;->size()I
 
@@ -6331,23 +6331,23 @@
 
     if-lez v6, :cond_2f
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-virtual {v3, v6, v5}, Lcom/google/android/flexbox/c;->a(Ljava/util/List;I)V
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v3}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->e(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
     move-result v16
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     move v12, v4
 
@@ -6362,17 +6362,17 @@
     goto :goto_18
 
     :cond_2f
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v6, v3}, Lcom/google/android/flexbox/c;->aR(I)V
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
     const/4 v15, 0x0
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     move v12, v4
 
@@ -6385,7 +6385,7 @@
     goto :goto_18
 
     :cond_30
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-interface {v6}, Ljava/util/List;->size()I
 
@@ -6393,23 +6393,23 @@
 
     if-lez v6, :cond_31
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     invoke-virtual {v3, v6, v5}, Lcom/google/android/flexbox/c;->a(Ljava/util/List;I)V
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v3}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->e(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
     move-result v16
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     move v12, v9
 
@@ -6424,17 +6424,17 @@
     goto :goto_18
 
     :cond_31
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v6, v3}, Lcom/google/android/flexbox/c;->aR(I)V
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
     const/4 v15, 0x0
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     move v12, v4
 
@@ -6445,23 +6445,23 @@
     invoke-virtual/range {v10 .. v16}, Lcom/google/android/flexbox/c;->c(Lcom/google/android/flexbox/c$a;IIIILjava/util/List;)V
 
     :goto_18
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aby:Lcom/google/android/flexbox/c$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abQ:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v3, Lcom/google/android/flexbox/c$a;->abi:Ljava/util/List;
+    iget-object v3, v3, Lcom/google/android/flexbox/c$a;->abA:Ljava/util/List;
 
-    iput-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iput-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v3, v4, v9, v5}, Lcom/google/android/flexbox/c;->e(III)V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abx:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v3, v5}, Lcom/google/android/flexbox/c;->aO(I)V
 
     :cond_32
     :goto_19
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v3}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)Z
 
@@ -6469,46 +6469,46 @@
 
     if-eqz v3, :cond_33
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/google/android/flexbox/FlexboxLayoutManager;->a(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Lcom/google/android/flexbox/FlexboxLayoutManager$b;)I
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v3, v3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-direct {v0, v4, v8, v7}, Lcom/google/android/flexbox/FlexboxLayoutManager;->a(Lcom/google/android/flexbox/FlexboxLayoutManager$a;ZZ)V
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     invoke-direct {v0, v1, v2, v4}, Lcom/google/android/flexbox/FlexboxLayoutManager;->a(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Lcom/google/android/flexbox/FlexboxLayoutManager$b;)I
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v4, v4, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
     goto :goto_1a
 
     :cond_33
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/google/android/flexbox/FlexboxLayoutManager;->a(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Lcom/google/android/flexbox/FlexboxLayoutManager$b;)I
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v4, v3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-direct {v0, v3, v8, v7}, Lcom/google/android/flexbox/FlexboxLayoutManager;->b(Lcom/google/android/flexbox/FlexboxLayoutManager$a;ZZ)V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/google/android/flexbox/FlexboxLayoutManager;->a(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Lcom/google/android/flexbox/FlexboxLayoutManager$b;)I
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abH:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abZ:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v3, v3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mOffset:I
 
@@ -6519,7 +6519,7 @@
 
     if-lez v5, :cond_35
 
-    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {v5}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)Z
 
@@ -6557,7 +6557,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abK:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acc:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
     const/4 p1, -0x1
 
@@ -6567,13 +6567,13 @@
 
     iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPositionOffset:I
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abP:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ach:I
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {p1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->b(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)V
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abN:Landroid/util/SparseArray;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acf:Landroid/util/SparseArray;
 
     invoke-virtual {p1}, Landroid/util/SparseArray;->clear()V
 
@@ -6589,7 +6589,7 @@
 
     check-cast p1, Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abK:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acc:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->requestLayout()V
 
@@ -6600,7 +6600,7 @@
 .method public onSaveInstanceState()Landroid/os/Parcelable;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abK:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acc:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
     const/4 v1, 0x0
 
@@ -6661,7 +6661,7 @@
 .method public scrollHorizontallyBy(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -6671,7 +6671,7 @@
 
     move-result p1
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abN:Landroid/util/SparseArray;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acf:Landroid/util/SparseArray;
 
     invoke-virtual {p2}, Landroid/util/SparseArray;->clear()V
 
@@ -6682,7 +6682,7 @@
 
     move-result p1
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {p2}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -6692,7 +6692,7 @@
 
     invoke-static {p2, p3}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abJ:Landroidx/recyclerview/widget/OrientationHelper;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acb:Landroidx/recyclerview/widget/OrientationHelper;
 
     neg-int p3, p1
 
@@ -6710,7 +6710,7 @@
 
     iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mPendingScrollPositionOffset:I
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abK:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acc:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
     if-eqz p1, :cond_0
 
@@ -6725,7 +6725,7 @@
 .method public scrollVerticallyBy(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ku()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ks()Z
 
     move-result v0
 
@@ -6735,7 +6735,7 @@
 
     move-result p1
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abN:Landroid/util/SparseArray;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acf:Landroid/util/SparseArray;
 
     invoke-virtual {p2}, Landroid/util/SparseArray;->clear()V
 
@@ -6746,7 +6746,7 @@
 
     move-result p1
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abI:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->aca:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
     invoke-static {p2}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->i(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)I
 
@@ -6756,7 +6756,7 @@
 
     invoke-static {p2, p3}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abJ:Landroidx/recyclerview/widget/OrientationHelper;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acb:Landroidx/recyclerview/widget/OrientationHelper;
 
     neg-int p3, p1
 
@@ -6776,7 +6776,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abi:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->abA:Ljava/util/List;
 
     return-void
 .end method
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 6590baaacb..ec179ed1db 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
@@ -90,29 +90,29 @@
     .array-data 4
         0x7f04002d
         0x7f04002e
-        0x7f040105
         0x7f040106
         0x7f040107
-        0x7f040135
-        0x7f04013c
-        0x7f0401fa
-        0x7f0402f2
-        0x7f0402f3
-        0x7f0402f4
+        0x7f040108
+        0x7f040137
+        0x7f04013e
+        0x7f0401fc
+        0x7f0402f5
+        0x7f0402f6
+        0x7f0402f7
     .end array-data
 
     :array_1
     .array-data 4
-        0x7f040200
-        0x7f040232
-        0x7f040233
+        0x7f040202
         0x7f040234
-        0x7f04023d
-        0x7f04023e
+        0x7f040235
+        0x7f040236
         0x7f04023f
         0x7f040240
+        0x7f040241
         0x7f040242
-        0x7f040245
+        0x7f040244
+        0x7f040247
     .end array-data
 .end method
 
diff --git a/com.discord/smali_classes2/com/google/android/flexbox/a.smali b/com.discord/smali_classes2/com/google/android/flexbox/a.smali
index 96087d6da1..dc05534601 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/a.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/a.smali
@@ -7,6 +7,9 @@
 .method public abstract a(Landroid/view/View;II)I
 .end method
 
+.method public abstract a(ILandroid/view/View;)V
+.end method
+
 .method public abstract a(Landroid/view/View;IILcom/google/android/flexbox/b;)V
 .end method
 
@@ -19,9 +22,6 @@
 .method public abstract aL(I)Landroid/view/View;
 .end method
 
-.method public abstract b(ILandroid/view/View;)V
-.end method
-
 .method public abstract c(III)I
 .end method
 
@@ -81,7 +81,7 @@
 .method public abstract h(Landroid/view/View;)I
 .end method
 
-.method public abstract ku()Z
+.method public abstract ks()Z
 .end method
 
 .method public abstract setFlexLines(Ljava/util/List;)V
diff --git a/com.discord/smali_classes2/com/google/android/flexbox/b.smali b/com.discord/smali_classes2/com/google/android/flexbox/b.smali
index e43afdefe6..79ec3e89fe 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/b.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/b.smali
@@ -4,23 +4,23 @@
 
 
 # instance fields
-.field aaT:I
+.field abl:I
 
-.field aaU:I
+.field abm:I
 
-.field aaV:I
+.field abn:I
 
-.field aaW:I
+.field abo:I
 
-.field aaX:F
+.field abp:F
 
-.field aaY:F
+.field abq:F
 
-.field aaZ:I
+.field abr:I
 
-.field aba:I
+.field abs:I
 
-.field abb:Ljava/util/List;
+.field abt:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field abc:I
+.field abu:I
 
 .field mBottom:I
 
@@ -67,7 +67,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/flexbox/b;->abb:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/b;->abt:Ljava/util/List;
 
     return-void
 .end method
@@ -89,7 +89,7 @@
 
     move-result v2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kA()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ky()I
 
     move-result v3
 
@@ -109,7 +109,7 @@
 
     move-result v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kz()I
 
     move-result v2
 
@@ -129,7 +129,7 @@
 
     move-result p3
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kC()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kA()I
 
     move-result v1
 
@@ -149,7 +149,7 @@
 
     move-result p1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kD()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result p3
 
@@ -166,12 +166,12 @@
     return-void
 .end method
 
-.method public final kE()I
+.method public final kC()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/flexbox/b;->mItemCount:I
 
-    iget v1, p0, Lcom/google/android/flexbox/b;->aaW:I
+    iget v1, p0, Lcom/google/android/flexbox/b;->abo:I
 
     sub-int/2addr v0, v1
 
diff --git a/com.discord/smali_classes2/com/google/android/flexbox/c$a.smali b/com.discord/smali_classes2/com/google/android/flexbox/c$a.smali
index 85531853fb..e88d9f7d93 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/c$a.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/c$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field abi:Ljava/util/List;
+.field abA:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field abj:I
+.field abB:I
 
 
 # direct methods
@@ -44,11 +44,11 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/c$a;->abi:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/c$a;->abA:Ljava/util/List;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/flexbox/c$a;->abj:I
+    iput v0, p0, Lcom/google/android/flexbox/c$a;->abB:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/flexbox/c.smali b/com.discord/smali_classes2/com/google/android/flexbox/c.smali
index ea68719342..94f3c87125 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/c.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/c.smali
@@ -17,15 +17,15 @@
 
 
 # instance fields
-.field private final abd:Lcom/google/android/flexbox/a;
+.field private final abv:Lcom/google/android/flexbox/a;
 
-.field private abe:[Z
+.field private abw:[Z
 
-.field abf:[I
+.field abx:[I
 
-.field abg:[J
+.field aby:[J
 
-.field private abh:[J
+.field private abz:[J
 
 
 # direct methods
@@ -40,17 +40,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     return-void
 .end method
 
-.method private D(Z)I
+.method private B(Z)I
     .locals 0
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingStart()I
 
@@ -59,7 +59,7 @@
     return p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingTop()I
 
@@ -68,58 +68,58 @@
     return p1
 .end method
 
+.method private C(Z)I
+    .locals 0
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
+
+    invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingEnd()I
+
+    move-result p1
+
+    return p1
+
+    :cond_0
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
+
+    invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingBottom()I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method private D(Z)I
+    .locals 0
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
+
+    invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingTop()I
+
+    move-result p1
+
+    return p1
+
+    :cond_0
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
+
+    invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingStart()I
+
+    move-result p1
+
+    return p1
+.end method
+
 .method private E(Z)I
     .locals 0
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
-
-    invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingEnd()I
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
-
-    invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingBottom()I
-
-    move-result p1
-
-    return p1
-.end method
-
-.method private F(Z)I
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
-
-    invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingTop()I
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
-
-    invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingStart()I
-
-    move-result p1
-
-    return p1
-.end method
-
-.method private G(Z)I
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingBottom()I
 
@@ -128,7 +128,7 @@
     return p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingEnd()I
 
@@ -140,13 +140,13 @@
 .method private a(ILcom/google/android/flexbox/FlexItem;I)I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getPaddingLeft()I
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v2, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v2}, Lcom/google/android/flexbox/a;->getPaddingRight()I
 
@@ -154,13 +154,13 @@
 
     add-int/2addr v1, v2
 
-    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->kA()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->ky()I
 
     move-result v2
 
     add-int/2addr v1, v2
 
-    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->kC()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->kA()I
 
     move-result v2
 
@@ -288,7 +288,7 @@
 
     invoke-direct {v0}, Lcom/google/android/flexbox/b;-><init>()V
 
-    iput p1, v0, Lcom/google/android/flexbox/b;->aaV:I
+    iput p1, v0, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-interface {p0}, Ljava/util/List;->size()I
 
@@ -334,18 +334,18 @@
 .method private a(IIILandroid/view/View;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abg:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->aby:[J
 
     if-eqz v0, :cond_0
 
-    invoke-static {p2, p3}, Lcom/google/android/flexbox/c;->r(II)J
+    invoke-static {p2, p3}, Lcom/google/android/flexbox/c;->q(II)J
 
     move-result-wide p2
 
     aput-wide p2, v0, p1
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->abh:[J
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->abz:[J
 
     if-eqz p2, :cond_1
 
@@ -357,7 +357,7 @@
 
     move-result p4
 
-    invoke-static {p3, p4}, Lcom/google/android/flexbox/c;->r(II)J
+    invoke-static {p3, p4}, Lcom/google/android/flexbox/c;->q(II)J
 
     move-result-wide p3
 
@@ -381,7 +381,7 @@
     move/from16 v4, p6
 
     :goto_0
-    iget v5, v1, Lcom/google/android/flexbox/b;->aaX:F
+    iget v5, v1, Lcom/google/android/flexbox/b;->abp:F
 
     const/4 v6, 0x0
 
@@ -389,36 +389,36 @@
 
     if-lez v5, :cond_14
 
-    iget v5, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v5, v1, Lcom/google/android/flexbox/b;->abl:I
 
     if-ge v2, v5, :cond_0
 
     goto/16 :goto_b
 
     :cond_0
-    iget v5, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v5, v1, Lcom/google/android/flexbox/b;->abl:I
 
-    iget v7, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v7, v1, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int v7, v2, v7
 
     int-to-float v7, v7
 
-    iget v8, v1, Lcom/google/android/flexbox/b;->aaX:F
+    iget v8, v1, Lcom/google/android/flexbox/b;->abp:F
 
     div-float/2addr v7, v8
 
-    iget v8, v1, Lcom/google/android/flexbox/b;->aaU:I
+    iget v8, v1, Lcom/google/android/flexbox/b;->abm:I
 
     add-int v8, p5, v8
 
-    iput v8, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iput v8, v1, Lcom/google/android/flexbox/b;->abl:I
 
     if-nez v4, :cond_1
 
     const/high16 v4, -0x80000000
 
-    iput v4, v1, Lcom/google/android/flexbox/b;->aaV:I
+    iput v4, v1, Lcom/google/android/flexbox/b;->abn:I
 
     :cond_1
     const/4 v4, 0x0
@@ -434,11 +434,11 @@
 
     if-ge v4, v11, :cond_13
 
-    iget v11, v1, Lcom/google/android/flexbox/b;->abc:I
+    iget v11, v1, Lcom/google/android/flexbox/b;->abu:I
 
     add-int/2addr v11, v4
 
-    iget-object v12, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v12, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v12, v11}, Lcom/google/android/flexbox/a;->aL(I)Landroid/view/View;
 
@@ -460,7 +460,7 @@
 
     check-cast v13, Lcom/google/android/flexbox/FlexItem;
 
-    iget-object v14, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v14}, Lcom/google/android/flexbox/a;->getFlexDirection()I
 
@@ -483,7 +483,7 @@
 
     move-result v14
 
-    iget-object v15, v0, Lcom/google/android/flexbox/c;->abh:[J
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->abz:[J
 
     if-eqz v15, :cond_3
 
@@ -498,7 +498,7 @@
 
     move-result v15
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abh:[J
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abz:[J
 
     move/from16 v21, v7
 
@@ -509,13 +509,13 @@
     long-to-int v15, v6
 
     :cond_4
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abe:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abw:[Z
 
     aget-boolean v3, v3, v11
 
     if-nez v3, :cond_9
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kv()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kt()F
 
     move-result v3
 
@@ -527,7 +527,7 @@
 
     int-to-float v3, v14
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kv()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kt()F
 
     move-result v6
 
@@ -562,19 +562,19 @@
 
     move-result v6
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abe:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abw:[Z
 
     aput-boolean v7, v3, v11
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->aaX:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->abp:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kv()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kt()F
 
     move-result v7
 
     sub-float/2addr v3, v7
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->aaX:F
+    iput v3, v1, Lcom/google/android/flexbox/b;->abp:F
 
     const/4 v8, 0x1
 
@@ -621,7 +621,7 @@
 
     :cond_8
     :goto_3
-    iget v3, v1, Lcom/google/android/flexbox/b;->aba:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->abs:I
 
     move/from16 v7, p1
 
@@ -647,9 +647,9 @@
 
     invoke-direct {v0, v11, v3, v6, v12}, Lcom/google/android/flexbox/c;->a(IIILandroid/view/View;)V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->b(ILandroid/view/View;)V
+    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
 
     goto :goto_4
 
@@ -657,19 +657,19 @@
     move/from16 v7, p1
 
     :goto_4
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ky()I
+
+    move-result v3
+
+    add-int/2addr v15, v3
+
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kA()I
 
     move-result v3
 
     add-int/2addr v15, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kC()I
-
-    move-result v3
-
-    add-int/2addr v15, v3
-
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -681,7 +681,13 @@
 
     move-result v3
 
-    iget v6, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->abl:I
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kz()I
+
+    move-result v10
+
+    add-int/2addr v14, v10
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
@@ -689,15 +695,9 @@
 
     add-int/2addr v14, v10
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kD()I
-
-    move-result v10
-
-    add-int/2addr v14, v10
-
     add-int/2addr v6, v14
 
-    iput v6, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iput v6, v1, Lcom/google/android/flexbox/b;->abl:I
 
     move/from16 v14, p2
 
@@ -713,7 +713,7 @@
 
     move-result v3
 
-    iget-object v6, v0, Lcom/google/android/flexbox/c;->abh:[J
+    iget-object v6, v0, Lcom/google/android/flexbox/c;->abz:[J
 
     if-eqz v6, :cond_b
 
@@ -726,7 +726,7 @@
 
     move-result v6
 
-    iget-object v14, v0, Lcom/google/android/flexbox/c;->abh:[J
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->abz:[J
 
     if-eqz v14, :cond_c
 
@@ -737,13 +737,13 @@
     long-to-int v6, v14
 
     :cond_c
-    iget-object v14, v0, Lcom/google/android/flexbox/c;->abe:[Z
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->abw:[Z
 
     aget-boolean v14, v14, v11
 
     if-nez v14, :cond_11
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kv()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kt()F
 
     move-result v14
 
@@ -755,7 +755,7 @@
 
     int-to-float v3, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kv()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kt()F
 
     move-result v6
 
@@ -790,19 +790,19 @@
 
     move-result v6
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abe:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abw:[Z
 
     aput-boolean v14, v3, v11
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->aaX:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->abp:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kv()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kt()F
 
     move-result v8
 
     sub-float/2addr v3, v8
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->aaX:F
+    iput v3, v1, Lcom/google/android/flexbox/b;->abp:F
 
     const/4 v8, 0x1
 
@@ -849,7 +849,7 @@
 
     :cond_10
     :goto_7
-    iget v3, v1, Lcom/google/android/flexbox/b;->aba:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->abs:I
 
     move/from16 v14, p2
 
@@ -875,9 +875,9 @@
 
     invoke-direct {v0, v11, v6, v3, v12}, Lcom/google/android/flexbox/c;->a(IIILandroid/view/View;)V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->b(ILandroid/view/View;)V
+    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
 
     goto :goto_8
 
@@ -889,19 +889,19 @@
     move/from16 v16, v6
 
     :goto_8
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kz()I
+
+    move-result v3
+
+    add-int v16, v16, v3
+
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result v3
 
     add-int v16, v16, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kD()I
-
-    move-result v3
-
-    add-int v16, v16, v3
-
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -913,7 +913,13 @@
 
     move-result v3
 
-    iget v6, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->abl:I
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ky()I
+
+    move-result v10
+
+    add-int/2addr v15, v10
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kA()I
 
@@ -921,24 +927,18 @@
 
     add-int/2addr v15, v10
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kC()I
-
-    move-result v10
-
-    add-int/2addr v15, v10
-
     add-int/2addr v6, v15
 
-    iput v6, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iput v6, v1, Lcom/google/android/flexbox/b;->abl:I
 
     :goto_9
-    iget v6, v1, Lcom/google/android/flexbox/b;->aaV:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-static {v6, v3}, Ljava/lang/Math;->max(II)I
 
     move-result v6
 
-    iput v6, v1, Lcom/google/android/flexbox/b;->aaV:I
+    iput v6, v1, Lcom/google/android/flexbox/b;->abn:I
 
     move v10, v3
 
@@ -969,7 +969,7 @@
 
     if-eqz v8, :cond_14
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->abl:I
 
     if-eq v5, v3, :cond_14
 
@@ -1080,9 +1080,9 @@
 
     invoke-direct {p0, p2, v1, v0, p1}, Lcom/google/android/flexbox/c;->a(IIILandroid/view/View;)V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v0, p2, p1}, Lcom/google/android/flexbox/a;->b(ILandroid/view/View;)V
+    invoke-interface {v0, p2, p1}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
 
     :cond_4
     return-void
@@ -1101,9 +1101,9 @@
         }
     .end annotation
 
-    iput p4, p2, Lcom/google/android/flexbox/b;->aba:I
+    iput p4, p2, Lcom/google/android/flexbox/b;->abs:I
 
-    iget-object p4, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p4, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p4, p2}, Lcom/google/android/flexbox/a;->a(Lcom/google/android/flexbox/b;)V
 
@@ -1123,7 +1123,7 @@
 
     if-ne p0, p1, :cond_0
 
-    invoke-virtual {p2}, Lcom/google/android/flexbox/b;->kE()I
+    invoke-virtual {p2}, Lcom/google/android/flexbox/b;->kC()I
 
     move-result p0
 
@@ -1140,7 +1140,7 @@
 .method private a(Landroid/view/View;IIIILcom/google/android/flexbox/FlexItem;II)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getFlexWrap()I
 
@@ -1153,7 +1153,7 @@
     return v1
 
     :cond_0
-    invoke-interface {p6}, Lcom/google/android/flexbox/FlexItem;->ky()Z
+    invoke-interface {p6}, Lcom/google/android/flexbox/FlexItem;->kw()Z
 
     move-result p6
 
@@ -1169,7 +1169,7 @@
     return v1
 
     :cond_2
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p2, p1, p7, p8}, Lcom/google/android/flexbox/a;->a(Landroid/view/View;II)I
 
@@ -1268,7 +1268,7 @@
     :goto_0
     if-ge v2, p1, :cond_0
 
-    iget-object v3, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v3, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v2}, Lcom/google/android/flexbox/a;->aK(I)Landroid/view/View;
 
@@ -1305,7 +1305,7 @@
 .method private aN(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abe:[Z
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abw:[Z
 
     if-nez v0, :cond_1
 
@@ -1318,7 +1318,7 @@
     :cond_0
     new-array p1, p1, [Z
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->abe:[Z
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->abw:[Z
 
     return-void
 
@@ -1338,7 +1338,7 @@
     :cond_2
     new-array p1, p1, [Z
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->abe:[Z
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->abw:[Z
 
     return-void
 
@@ -1353,13 +1353,13 @@
 .method private b(ILcom/google/android/flexbox/FlexItem;I)I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getPaddingTop()I
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v2, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v2}, Lcom/google/android/flexbox/a;->getPaddingBottom()I
 
@@ -1367,13 +1367,13 @@
 
     add-int/2addr v1, v2
 
-    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->kB()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->kz()I
 
     move-result v2
 
     add-int/2addr v1, v2
 
-    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->kD()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result v2
 
@@ -1489,9 +1489,9 @@
     move/from16 v4, p6
 
     :goto_0
-    iget v5, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v5, v1, Lcom/google/android/flexbox/b;->abl:I
 
-    iget v6, v1, Lcom/google/android/flexbox/b;->aaY:F
+    iget v6, v1, Lcom/google/android/flexbox/b;->abq:F
 
     const/4 v7, 0x0
 
@@ -1499,34 +1499,34 @@
 
     if-lez v6, :cond_14
 
-    iget v6, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->abl:I
 
     if-le v2, v6, :cond_0
 
     goto/16 :goto_9
 
     :cond_0
-    iget v6, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->abl:I
 
     sub-int/2addr v6, v2
 
     int-to-float v6, v6
 
-    iget v8, v1, Lcom/google/android/flexbox/b;->aaY:F
+    iget v8, v1, Lcom/google/android/flexbox/b;->abq:F
 
     div-float/2addr v6, v8
 
-    iget v8, v1, Lcom/google/android/flexbox/b;->aaU:I
+    iget v8, v1, Lcom/google/android/flexbox/b;->abm:I
 
     add-int v8, p5, v8
 
-    iput v8, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iput v8, v1, Lcom/google/android/flexbox/b;->abl:I
 
     if-nez v4, :cond_1
 
     const/high16 v4, -0x80000000
 
-    iput v4, v1, Lcom/google/android/flexbox/b;->aaV:I
+    iput v4, v1, Lcom/google/android/flexbox/b;->abn:I
 
     :cond_1
     const/4 v4, 0x0
@@ -1542,11 +1542,11 @@
 
     if-ge v4, v11, :cond_13
 
-    iget v11, v1, Lcom/google/android/flexbox/b;->abc:I
+    iget v11, v1, Lcom/google/android/flexbox/b;->abu:I
 
     add-int/2addr v11, v4
 
-    iget-object v12, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v12, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v12, v11}, Lcom/google/android/flexbox/a;->aL(I)Landroid/view/View;
 
@@ -1568,7 +1568,7 @@
 
     check-cast v13, Lcom/google/android/flexbox/FlexItem;
 
-    iget-object v14, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v14}, Lcom/google/android/flexbox/a;->getFlexDirection()I
 
@@ -1593,7 +1593,7 @@
 
     move-result v14
 
-    iget-object v15, v0, Lcom/google/android/flexbox/c;->abh:[J
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->abz:[J
 
     if-eqz v15, :cond_3
 
@@ -1608,7 +1608,7 @@
 
     move-result v15
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abh:[J
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abz:[J
 
     move/from16 v22, v8
 
@@ -1619,13 +1619,13 @@
     long-to-int v15, v7
 
     :cond_4
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abe:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abw:[Z
 
     aget-boolean v3, v3, v11
 
     if-nez v3, :cond_9
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kw()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ku()F
 
     move-result v3
 
@@ -1637,7 +1637,7 @@
 
     int-to-float v3, v14
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kw()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ku()F
 
     move-result v7
 
@@ -1672,19 +1672,19 @@
 
     move-result v7
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abe:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abw:[Z
 
     aput-boolean v8, v3, v11
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->aaY:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->abq:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kw()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ku()F
 
     move-result v8
 
     sub-float/2addr v3, v8
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->aaY:F
+    iput v3, v1, Lcom/google/android/flexbox/b;->abq:F
 
     const/4 v8, 0x1
 
@@ -1723,7 +1723,7 @@
     move/from16 v8, v22
 
     :goto_3
-    iget v3, v1, Lcom/google/android/flexbox/b;->aba:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->abs:I
 
     move/from16 v14, p1
 
@@ -1749,28 +1749,28 @@
 
     invoke-direct {v0, v11, v3, v7, v12}, Lcom/google/android/flexbox/c;->a(IIILandroid/view/View;)V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->b(ILandroid/view/View;)V
+    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
 
     move/from16 v22, v8
 
     move/from16 v14, v16
 
     :cond_9
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ky()I
+
+    move-result v3
+
+    add-int/2addr v15, v3
+
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kA()I
 
     move-result v3
 
     add-int/2addr v15, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kC()I
-
-    move-result v3
-
-    add-int/2addr v15, v3
-
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -1782,7 +1782,13 @@
 
     move-result v3
 
-    iget v7, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v7, v1, Lcom/google/android/flexbox/b;->abl:I
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kz()I
+
+    move-result v8
+
+    add-int/2addr v14, v8
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
@@ -1790,15 +1796,9 @@
 
     add-int/2addr v14, v8
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kD()I
-
-    move-result v8
-
-    add-int/2addr v14, v8
-
     add-int/2addr v7, v14
 
-    iput v7, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iput v7, v1, Lcom/google/android/flexbox/b;->abl:I
 
     move/from16 v14, p2
 
@@ -1814,7 +1814,7 @@
 
     move-result v3
 
-    iget-object v7, v0, Lcom/google/android/flexbox/c;->abh:[J
+    iget-object v7, v0, Lcom/google/android/flexbox/c;->abz:[J
 
     if-eqz v7, :cond_b
 
@@ -1827,7 +1827,7 @@
 
     move-result v7
 
-    iget-object v8, v0, Lcom/google/android/flexbox/c;->abh:[J
+    iget-object v8, v0, Lcom/google/android/flexbox/c;->abz:[J
 
     if-eqz v8, :cond_c
 
@@ -1838,13 +1838,13 @@
     long-to-int v7, v7
 
     :cond_c
-    iget-object v8, v0, Lcom/google/android/flexbox/c;->abe:[Z
+    iget-object v8, v0, Lcom/google/android/flexbox/c;->abw:[Z
 
     aget-boolean v8, v8, v11
 
     if-nez v8, :cond_11
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kw()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ku()F
 
     move-result v8
 
@@ -1856,7 +1856,7 @@
 
     int-to-float v3, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kw()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ku()F
 
     move-result v7
 
@@ -1891,19 +1891,19 @@
 
     move-result v7
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abe:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abw:[Z
 
     aput-boolean v8, v3, v11
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->aaY:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->abq:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kw()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ku()F
 
     move-result v15
 
     sub-float/2addr v3, v15
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->aaY:F
+    iput v3, v1, Lcom/google/android/flexbox/b;->abq:F
 
     const/16 v22, 0x1
 
@@ -1939,7 +1939,7 @@
 
     :cond_10
     :goto_5
-    iget v3, v1, Lcom/google/android/flexbox/b;->aba:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->abs:I
 
     move/from16 v14, p2
 
@@ -1965,9 +1965,9 @@
 
     invoke-direct {v0, v11, v7, v3, v12}, Lcom/google/android/flexbox/c;->a(IIILandroid/view/View;)V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->b(ILandroid/view/View;)V
+    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
 
     goto :goto_6
 
@@ -1981,19 +1981,19 @@
     move/from16 v16, v7
 
     :goto_6
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kz()I
+
+    move-result v3
+
+    add-int v16, v16, v3
+
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result v3
 
     add-int v16, v16, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kD()I
-
-    move-result v3
-
-    add-int v16, v16, v3
-
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -2005,7 +2005,13 @@
 
     move-result v3
 
-    iget v7, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v7, v1, Lcom/google/android/flexbox/b;->abl:I
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ky()I
+
+    move-result v10
+
+    add-int/2addr v15, v10
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kA()I
 
@@ -2013,24 +2019,18 @@
 
     add-int/2addr v15, v10
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->kC()I
-
-    move-result v10
-
-    add-int/2addr v15, v10
-
     add-int/2addr v7, v15
 
-    iput v7, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iput v7, v1, Lcom/google/android/flexbox/b;->abl:I
 
     :goto_7
-    iget v7, v1, Lcom/google/android/flexbox/b;->aaV:I
+    iget v7, v1, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-static {v7, v3}, Ljava/lang/Math;->max(II)I
 
     move-result v7
 
-    iput v7, v1, Lcom/google/android/flexbox/b;->aaV:I
+    iput v7, v1, Lcom/google/android/flexbox/b;->abn:I
 
     move v10, v3
 
@@ -2063,7 +2063,7 @@
 
     if-eqz v22, :cond_14
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->aaT:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->abl:I
 
     if-eq v5, v3, :cond_14
 
@@ -2087,19 +2087,19 @@
 
     check-cast v0, Lcom/google/android/flexbox/FlexItem;
 
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kz()I
+
+    move-result v1
+
+    sub-int/2addr p2, v1
+
     invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result v1
 
     sub-int/2addr p2, v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kD()I
-
-    move-result v1
-
-    sub-int/2addr p2, v1
-
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v1, p1}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -2123,7 +2123,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abh:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abz:[J
 
     if-eqz v0, :cond_0
 
@@ -2153,9 +2153,9 @@
 
     invoke-direct {p0, p3, v0, p2, p1}, Lcom/google/android/flexbox/c;->a(IIILandroid/view/View;)V
 
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
-    invoke-interface {p2, p3, p1}, Lcom/google/android/flexbox/a;->b(ILandroid/view/View;)V
+    invoke-interface {p2, p3, p1}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
 
     return-void
 .end method
@@ -2165,14 +2165,14 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kA()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->ky()I
 
     move-result p0
 
     return p0
 
     :cond_0
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kB()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kz()I
 
     move-result p0
 
@@ -2188,19 +2188,19 @@
 
     check-cast v0, Lcom/google/android/flexbox/FlexItem;
 
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ky()I
+
+    move-result v1
+
+    sub-int/2addr p2, v1
+
     invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kA()I
 
     move-result v1
 
     sub-int/2addr p2, v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kC()I
-
-    move-result v1
-
-    sub-int/2addr p2, v1
-
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v1, p1}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -2224,7 +2224,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abh:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abz:[J
 
     if-eqz v0, :cond_0
 
@@ -2258,9 +2258,9 @@
 
     invoke-direct {p0, p3, p2, v1, p1}, Lcom/google/android/flexbox/c;->a(IIILandroid/view/View;)V
 
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
-    invoke-interface {p2, p3, p1}, Lcom/google/android/flexbox/a;->b(ILandroid/view/View;)V
+    invoke-interface {p2, p3, p1}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
 
     return-void
 .end method
@@ -2270,14 +2270,14 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kC()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kA()I
 
     move-result p0
 
     return p0
 
     :cond_0
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kD()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result p0
 
@@ -2289,6 +2289,25 @@
 
     if-eqz p1, :cond_0
 
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kz()I
+
+    move-result p0
+
+    return p0
+
+    :cond_0
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->ky()I
+
+    move-result p0
+
+    return p0
+.end method
+
+.method private static f(Lcom/google/android/flexbox/FlexItem;Z)I
+    .locals 0
+
+    if-eqz p1, :cond_0
+
     invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result p0
@@ -2303,34 +2322,7 @@
     return p0
 .end method
 
-.method private static f(Lcom/google/android/flexbox/FlexItem;Z)I
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kD()I
-
-    move-result p0
-
-    return p0
-
-    :cond_0
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->kC()I
-
-    move-result p0
-
-    return p0
-.end method
-
-.method static r(J)I
-    .locals 0
-
-    long-to-int p1, p0
-
-    return p1
-.end method
-
-.method private static r(II)J
+.method private static q(II)J
     .locals 4
 
     int-to-long v0, p1
@@ -2350,6 +2342,14 @@
     return-wide p0
 .end method
 
+.method static r(J)I
+    .locals 0
+
+    long-to-int p1, p0
+
+    return p1
+.end method
+
 .method static s(J)I
     .locals 1
 
@@ -2373,13 +2373,13 @@
 
     check-cast v0, Lcom/google/android/flexbox/FlexItem;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v1}, Lcom/google/android/flexbox/a;->getAlignItems()I
 
     move-result v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kx()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kv()I
 
     move-result v2
 
@@ -2387,12 +2387,12 @@
 
     if-eq v2, v3, :cond_0
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kx()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kv()I
 
     move-result v1
 
     :cond_0
-    iget v2, p2, Lcom/google/android/flexbox/b;->aaV:I
+    iget v2, p2, Lcom/google/android/flexbox/b;->abn:I
 
     const/4 v3, 0x2
 
@@ -2415,7 +2415,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v1}, Lcom/google/android/flexbox/a;->getFlexWrap()I
 
@@ -2423,7 +2423,7 @@
 
     if-eq v1, v3, :cond_2
 
-    iget p2, p2, Lcom/google/android/flexbox/b;->aaZ:I
+    iget p2, p2, Lcom/google/android/flexbox/b;->abr:I
 
     invoke-virtual {p1}, Landroid/view/View;->getBaseline()I
 
@@ -2431,7 +2431,7 @@
 
     sub-int/2addr p2, v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kz()I
 
     move-result v0
 
@@ -2448,7 +2448,7 @@
     return-void
 
     :cond_2
-    iget p2, p2, Lcom/google/android/flexbox/b;->aaZ:I
+    iget p2, p2, Lcom/google/android/flexbox/b;->abr:I
 
     invoke-virtual {p1}, Landroid/view/View;->getMeasuredHeight()I
 
@@ -2462,7 +2462,7 @@
 
     add-int/2addr p2, v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kD()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result v0
 
@@ -2485,13 +2485,13 @@
 
     sub-int/2addr v2, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kz()I
 
     move-result p2
 
     add-int/2addr v2, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kD()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result p2
 
@@ -2499,7 +2499,7 @@
 
     div-int/2addr v2, v3
 
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p2}, Lcom/google/android/flexbox/a;->getFlexWrap()I
 
@@ -2534,7 +2534,7 @@
     return-void
 
     :cond_5
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p2}, Lcom/google/android/flexbox/a;->getFlexWrap()I
 
@@ -2550,13 +2550,13 @@
 
     sub-int p2, p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kD()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result p6
 
     sub-int/2addr p2, p6
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kD()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result p6
 
@@ -2575,7 +2575,7 @@
 
     add-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kz()I
 
     move-result p2
 
@@ -2589,7 +2589,7 @@
 
     add-int/2addr p6, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kz()I
 
     move-result p2
 
@@ -2600,7 +2600,7 @@
     return-void
 
     :cond_7
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p2}, Lcom/google/android/flexbox/a;->getFlexWrap()I
 
@@ -2608,13 +2608,13 @@
 
     if-eq p2, v3, :cond_8
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kz()I
 
     move-result p2
 
     add-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kz()I
 
     move-result p2
 
@@ -2625,13 +2625,13 @@
     return-void
 
     :cond_8
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kD()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result p2
 
     sub-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kD()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result p2
 
@@ -2651,13 +2651,13 @@
 
     check-cast v0, Lcom/google/android/flexbox/FlexItem;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v1}, Lcom/google/android/flexbox/a;->getAlignItems()I
 
     move-result v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kx()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kv()I
 
     move-result v2
 
@@ -2665,12 +2665,12 @@
 
     if-eq v2, v3, :cond_0
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kx()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kv()I
 
     move-result v1
 
     :cond_0
-    iget p2, p2, Lcom/google/android/flexbox/b;->aaV:I
+    iget p2, p2, Lcom/google/android/flexbox/b;->abn:I
 
     if-eqz v1, :cond_5
 
@@ -2750,7 +2750,7 @@
 
     sub-int/2addr p4, p3
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kC()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kA()I
 
     move-result p3
 
@@ -2764,7 +2764,7 @@
 
     sub-int/2addr p6, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kC()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kA()I
 
     move-result p2
 
@@ -2783,7 +2783,7 @@
 
     add-int/2addr p4, p3
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kA()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ky()I
 
     move-result p3
 
@@ -2797,7 +2797,7 @@
 
     add-int/2addr p6, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kA()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ky()I
 
     move-result p2
 
@@ -2810,13 +2810,13 @@
     :cond_5
     if-nez p3, :cond_6
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kA()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ky()I
 
     move-result p2
 
     add-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kA()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ky()I
 
     move-result p2
 
@@ -2827,13 +2827,13 @@
     return-void
 
     :cond_6
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kC()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kA()I
 
     move-result p2
 
     sub-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kC()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->kA()I
 
     move-result p2
 
@@ -2891,9 +2891,9 @@
 
     move/from16 v13, p6
 
-    iget-object v0, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/a;->ku()Z
+    invoke-interface {v0}, Lcom/google/android/flexbox/a;->ks()Z
 
     move-result v14
 
@@ -2919,7 +2919,7 @@
     move-object/from16 v7, p7
 
     :goto_0
-    iput-object v7, v10, Lcom/google/android/flexbox/c$a;->abi:Ljava/util/List;
+    iput-object v7, v10, Lcom/google/android/flexbox/c$a;->abA:Ljava/util/List;
 
     const/4 v6, -0x1
 
@@ -2933,19 +2933,19 @@
     const/4 v0, 0x0
 
     :goto_1
-    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->D(Z)I
+    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->B(Z)I
 
     move-result v1
 
-    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->E(Z)I
+    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->C(Z)I
 
     move-result v2
 
-    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->F(Z)I
+    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->D(Z)I
 
     move-result v16
 
-    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->G(Z)I
+    invoke-direct {v9, v14}, Lcom/google/android/flexbox/c;->E(Z)I
 
     move-result v17
 
@@ -2955,13 +2955,13 @@
 
     move/from16 v6, p5
 
-    iput v6, v3, Lcom/google/android/flexbox/b;->abc:I
+    iput v6, v3, Lcom/google/android/flexbox/b;->abu:I
 
     add-int/2addr v2, v1
 
-    iput v2, v3, Lcom/google/android/flexbox/b;->aaT:I
+    iput v2, v3, Lcom/google/android/flexbox/b;->abl:I
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v1}, Lcom/google/android/flexbox/a;->getFlexItemCount()I
 
@@ -2982,7 +2982,7 @@
     :goto_2
     if-ge v6, v1, :cond_15
 
-    iget-object v5, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v5, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v5, v6}, Lcom/google/android/flexbox/a;->aL(I)Landroid/view/View;
 
@@ -3009,13 +3009,13 @@
 
     if-ne v4, v10, :cond_4
 
-    iget v4, v3, Lcom/google/android/flexbox/b;->aaW:I
+    iget v4, v3, Lcom/google/android/flexbox/b;->abo:I
 
     const/4 v5, 0x1
 
     add-int/2addr v4, v5
 
-    iput v4, v3, Lcom/google/android/flexbox/b;->aaW:I
+    iput v4, v3, Lcom/google/android/flexbox/b;->abo:I
 
     iget v4, v3, Lcom/google/android/flexbox/b;->mItemCount:I
 
@@ -3060,7 +3060,7 @@
 
     check-cast v10, Lcom/google/android/flexbox/FlexItem;
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kx()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kv()I
 
     move-result v4
 
@@ -3070,7 +3070,7 @@
 
     if-ne v4, v1, :cond_5
 
-    iget-object v1, v3, Lcom/google/android/flexbox/b;->abb:Ljava/util/List;
+    iget-object v1, v3, Lcom/google/android/flexbox/b;->abt:Ljava/util/List;
 
     invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -3083,7 +3083,7 @@
 
     move-result v1
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kz()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kx()F
 
     move-result v4
 
@@ -3099,7 +3099,7 @@
 
     int-to-float v1, v8
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kz()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kx()F
 
     move-result v4
 
@@ -3112,7 +3112,7 @@
     :cond_6
     if-eqz v14, :cond_7
 
-    iget-object v4, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     move-object/from16 v26, v7
 
@@ -3134,7 +3134,7 @@
 
     move-result v1
 
-    iget-object v4, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     add-int v7, v16, v17
 
@@ -3181,7 +3181,7 @@
 
     const/4 v13, 0x1
 
-    iget-object v4, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     add-int v7, v16, v17
 
@@ -3209,7 +3209,7 @@
 
     move-result v4
 
-    iget-object v7, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v7, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-static {v10, v8}, Lcom/google/android/flexbox/c;->c(Lcom/google/android/flexbox/FlexItem;Z)I
 
@@ -3234,9 +3234,9 @@
     move v13, v1
 
     :goto_4
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v1, v6, v5}, Lcom/google/android/flexbox/a;->b(ILandroid/view/View;)V
+    invoke-interface {v1, v6, v5}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
 
     invoke-direct {v9, v5, v6}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;I)V
 
@@ -3250,7 +3250,7 @@
 
     move-result v19
 
-    iget v4, v3, Lcom/google/android/flexbox/b;->aaT:I
+    iget v4, v3, Lcom/google/android/flexbox/b;->abl:I
 
     invoke-static {v5, v14}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Z)I
 
@@ -3316,7 +3316,7 @@
 
     if-eqz v0, :cond_c
 
-    invoke-virtual/range {v23 .. v23}, Lcom/google/android/flexbox/b;->kE()I
+    invoke-virtual/range {v23 .. v23}, Lcom/google/android/flexbox/b;->kC()I
 
     move-result v0
 
@@ -3340,7 +3340,7 @@
     :goto_5
     invoke-direct {v9, v15, v3, v5, v11}, Lcom/google/android/flexbox/c;->a(Ljava/util/List;Lcom/google/android/flexbox/b;II)V
 
-    iget v0, v3, Lcom/google/android/flexbox/b;->aaV:I
+    iget v0, v3, Lcom/google/android/flexbox/b;->abn:I
 
     add-int/2addr v0, v11
 
@@ -3360,13 +3360,13 @@
 
     if-ne v1, v2, :cond_b
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v1}, Lcom/google/android/flexbox/a;->getPaddingTop()I
 
     move-result v2
 
-    iget-object v3, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v3, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3}, Lcom/google/android/flexbox/a;->getPaddingBottom()I
 
@@ -3374,13 +3374,13 @@
 
     add-int/2addr v2, v3
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kB()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kz()I
 
     move-result v3
 
     add-int/2addr v2, v3
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kD()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result v3
 
@@ -3415,13 +3415,13 @@
 
     if-ne v1, v3, :cond_b
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v1}, Lcom/google/android/flexbox/a;->getPaddingLeft()I
 
     move-result v3
 
-    iget-object v4, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v4}, Lcom/google/android/flexbox/a;->getPaddingRight()I
 
@@ -3429,13 +3429,13 @@
 
     add-int/2addr v3, v4
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kA()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ky()I
 
     move-result v4
 
     add-int/2addr v3, v4
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kC()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kA()I
 
     move-result v4
 
@@ -3467,9 +3467,9 @@
 
     move/from16 v2, v28
 
-    iput v2, v3, Lcom/google/android/flexbox/b;->aaT:I
+    iput v2, v3, Lcom/google/android/flexbox/b;->abl:I
 
-    iput v6, v3, Lcom/google/android/flexbox/b;->abc:I
+    iput v6, v3, Lcom/google/android/flexbox/b;->abu:I
 
     move v11, v0
 
@@ -3499,7 +3499,7 @@
     move/from16 v0, v21
 
     :goto_8
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->abx:[I
 
     if-eqz v1, :cond_d
 
@@ -3510,7 +3510,7 @@
     aput v4, v1, v6
 
     :cond_d
-    iget v1, v3, Lcom/google/android/flexbox/b;->aaT:I
+    iget v1, v3, Lcom/google/android/flexbox/b;->abl:I
 
     invoke-static {v13, v14}, Lcom/google/android/flexbox/c;->a(Landroid/view/View;Z)I
 
@@ -3530,29 +3530,29 @@
 
     add-int/2addr v1, v4
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->aaT:I
+    iput v1, v3, Lcom/google/android/flexbox/b;->abl:I
 
-    iget v1, v3, Lcom/google/android/flexbox/b;->aaX:F
+    iget v1, v3, Lcom/google/android/flexbox/b;->abp:F
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kv()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kt()F
 
     move-result v4
 
     add-float/2addr v1, v4
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->aaX:F
+    iput v1, v3, Lcom/google/android/flexbox/b;->abp:F
 
-    iget v1, v3, Lcom/google/android/flexbox/b;->aaY:F
+    iget v1, v3, Lcom/google/android/flexbox/b;->abq:F
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kw()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ku()F
 
     move-result v4
 
     add-float/2addr v1, v4
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->aaY:F
+    iput v1, v3, Lcom/google/android/flexbox/b;->abq:F
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v1, v13, v6, v5, v3}, Lcom/google/android/flexbox/a;->a(Landroid/view/View;IILcom/google/android/flexbox/b;)V
 
@@ -3572,7 +3572,7 @@
 
     add-int/2addr v1, v4
 
-    iget-object v4, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v4, v13}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -3584,17 +3584,17 @@
 
     move-result v0
 
-    iget v1, v3, Lcom/google/android/flexbox/b;->aaV:I
+    iget v1, v3, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-static {v1, v0}, Ljava/lang/Math;->max(II)I
 
     move-result v1
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->aaV:I
+    iput v1, v3, Lcom/google/android/flexbox/b;->abn:I
 
     if-eqz v14, :cond_f
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v1}, Lcom/google/android/flexbox/a;->getFlexWrap()I
 
@@ -3604,13 +3604,13 @@
 
     if-eq v1, v4, :cond_e
 
-    iget v1, v3, Lcom/google/android/flexbox/b;->aaZ:I
+    iget v1, v3, Lcom/google/android/flexbox/b;->abr:I
 
     invoke-virtual {v13}, Landroid/view/View;->getBaseline()I
 
     move-result v4
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kB()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kz()I
 
     move-result v7
 
@@ -3620,12 +3620,12 @@
 
     move-result v1
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->aaZ:I
+    iput v1, v3, Lcom/google/android/flexbox/b;->abr:I
 
     goto :goto_9
 
     :cond_e
-    iget v1, v3, Lcom/google/android/flexbox/b;->aaZ:I
+    iget v1, v3, Lcom/google/android/flexbox/b;->abr:I
 
     invoke-virtual {v13}, Landroid/view/View;->getMeasuredHeight()I
 
@@ -3637,7 +3637,7 @@
 
     sub-int/2addr v4, v7
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kD()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->kB()I
 
     move-result v7
 
@@ -3647,7 +3647,7 @@
 
     move-result v1
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->aaZ:I
+    iput v1, v3, Lcom/google/android/flexbox/b;->abr:I
 
     :cond_f
     :goto_9
@@ -3661,7 +3661,7 @@
 
     invoke-direct {v9, v15, v3, v6, v11}, Lcom/google/android/flexbox/c;->a(Ljava/util/List;Lcom/google/android/flexbox/b;II)V
 
-    iget v4, v3, Lcom/google/android/flexbox/b;->aaV:I
+    iget v4, v3, Lcom/google/android/flexbox/b;->abn:I
 
     add-int/2addr v11, v4
 
@@ -3700,7 +3700,7 @@
 
     if-nez v22, :cond_12
 
-    iget v4, v3, Lcom/google/android/flexbox/b;->aaV:I
+    iget v4, v3, Lcom/google/android/flexbox/b;->abn:I
 
     neg-int v11, v4
 
@@ -3763,7 +3763,7 @@
     move-object/from16 v0, p1
 
     :goto_d
-    iput v4, v0, Lcom/google/android/flexbox/c$a;->abj:I
+    iput v4, v0, Lcom/google/android/flexbox/c$a;->abB:I
 
     return-void
 .end method
@@ -3813,7 +3813,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abx:[I
 
     aget v0, v0, p2
 
@@ -3840,7 +3840,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->abx:[I
 
     array-length v0, p1
 
@@ -3856,7 +3856,7 @@
     invoke-static {p1, p2, v0, v1}, Ljava/util/Arrays;->fill([IIII)V
 
     :goto_1
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->abg:[J
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->aby:[J
 
     array-length v0, p1
 
@@ -3879,7 +3879,7 @@
 .method final a(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;Landroid/util/SparseIntArray;)[I
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getFlexItemCount()I
 
@@ -3926,7 +3926,7 @@
     goto :goto_2
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p1}, Lcom/google/android/flexbox/a;->getFlexItemCount()I
 
@@ -3984,7 +3984,7 @@
 
     move/from16 v1, p1
 
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v2, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v2}, Lcom/google/android/flexbox/a;->getFlexItemCount()I
 
@@ -3995,13 +3995,13 @@
     return-void
 
     :cond_0
-    iget-object v2, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v2, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v2}, Lcom/google/android/flexbox/a;->getFlexDirection()I
 
     move-result v2
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3}, Lcom/google/android/flexbox/a;->getAlignItems()I
 
@@ -4015,7 +4015,7 @@
 
     if-ne v3, v7, :cond_9
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abx:[I
 
     if-eqz v3, :cond_1
 
@@ -4027,7 +4027,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3}, Lcom/google/android/flexbox/a;->getFlexLinesInternal()Ljava/util/List;
 
@@ -4053,11 +4053,11 @@
     :goto_2
     if-ge v13, v12, :cond_7
 
-    iget v14, v11, Lcom/google/android/flexbox/b;->abc:I
+    iget v14, v11, Lcom/google/android/flexbox/b;->abu:I
 
     add-int/2addr v14, v13
 
-    iget-object v15, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v15}, Lcom/google/android/flexbox/a;->getFlexItemCount()I
 
@@ -4065,7 +4065,7 @@
 
     if-ge v13, v15, :cond_6
 
-    iget-object v15, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v15, v14}, Lcom/google/android/flexbox/a;->aL(I)Landroid/view/View;
 
@@ -4087,7 +4087,7 @@
 
     check-cast v5, Lcom/google/android/flexbox/FlexItem;
 
-    invoke-interface {v5}, Lcom/google/android/flexbox/FlexItem;->kx()I
+    invoke-interface {v5}, Lcom/google/android/flexbox/FlexItem;->kv()I
 
     move-result v9
 
@@ -4095,7 +4095,7 @@
 
     if-eq v9, v6, :cond_2
 
-    invoke-interface {v5}, Lcom/google/android/flexbox/FlexItem;->kx()I
+    invoke-interface {v5}, Lcom/google/android/flexbox/FlexItem;->kv()I
 
     move-result v5
 
@@ -4133,14 +4133,14 @@
 
     :cond_4
     :goto_3
-    iget v5, v11, Lcom/google/android/flexbox/b;->aaV:I
+    iget v5, v11, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-direct {v0, v15, v5, v14}, Lcom/google/android/flexbox/c;->c(Landroid/view/View;II)V
 
     goto :goto_4
 
     :cond_5
-    iget v5, v11, Lcom/google/android/flexbox/b;->aaV:I
+    iget v5, v11, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-direct {v0, v15, v5, v14}, Lcom/google/android/flexbox/c;->b(Landroid/view/View;II)V
 
@@ -4159,7 +4159,7 @@
     return-void
 
     :cond_9
-    iget-object v1, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v1, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v1}, Lcom/google/android/flexbox/a;->getFlexLinesInternal()Ljava/util/List;
 
@@ -4182,7 +4182,7 @@
 
     check-cast v3, Lcom/google/android/flexbox/b;
 
-    iget-object v5, v3, Lcom/google/android/flexbox/b;->abb:Ljava/util/List;
+    iget-object v5, v3, Lcom/google/android/flexbox/b;->abt:Ljava/util/List;
 
     invoke-interface {v5}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -4201,7 +4201,7 @@
 
     check-cast v6, Ljava/lang/Integer;
 
-    iget-object v7, v0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v7, v0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
 
@@ -4242,7 +4242,7 @@
 
     :cond_c
     :goto_6
-    iget v11, v3, Lcom/google/android/flexbox/b;->aaV:I
+    iget v11, v3, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
 
@@ -4257,7 +4257,7 @@
 
     const/4 v10, 0x3
 
-    iget v11, v3, Lcom/google/android/flexbox/b;->aaV:I
+    iget v11, v3, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
 
@@ -4274,7 +4274,7 @@
 .method final aP(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abh:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abz:[J
 
     if-nez v0, :cond_1
 
@@ -4287,7 +4287,7 @@
     :cond_0
     new-array p1, p1, [J
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->abh:[J
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->abz:[J
 
     return-void
 
@@ -4305,13 +4305,13 @@
     move p1, v0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abh:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abz:[J
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->copyOf([JI)[J
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->abh:[J
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->abz:[J
 
     :cond_3
     return-void
@@ -4320,7 +4320,7 @@
 .method final aQ(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abg:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->aby:[J
 
     if-nez v0, :cond_1
 
@@ -4333,7 +4333,7 @@
     :cond_0
     new-array p1, p1, [J
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->abg:[J
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->aby:[J
 
     return-void
 
@@ -4351,13 +4351,13 @@
     move p1, v0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abg:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->aby:[J
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->copyOf([JI)[J
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->abg:[J
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->aby:[J
 
     :cond_3
     return-void
@@ -4366,7 +4366,7 @@
 .method final aR(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abx:[I
 
     if-nez v0, :cond_1
 
@@ -4379,7 +4379,7 @@
     :cond_0
     new-array p1, p1, [I
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->abf:[I
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->abx:[I
 
     return-void
 
@@ -4397,13 +4397,13 @@
     move p1, v0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abx:[I
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->copyOf([II)[I
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->abf:[I
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->abx:[I
 
     :cond_3
     return-void
@@ -4446,7 +4446,7 @@
 .method final b(Landroid/util/SparseIntArray;)[I
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getFlexItemCount()I
 
@@ -4500,7 +4500,7 @@
 .method final c(Landroid/util/SparseIntArray;)Z
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getFlexItemCount()I
 
@@ -4524,7 +4524,7 @@
     :goto_0
     if-ge v3, v0, :cond_2
 
-    iget-object v4, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v4, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v4, v3}, Lcom/google/android/flexbox/a;->aK(I)Landroid/view/View;
 
@@ -4596,7 +4596,7 @@
 .method final e(III)V
     .locals 11
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getFlexItemCount()I
 
@@ -4604,7 +4604,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/flexbox/c;->aN(I)V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getFlexItemCount()I
 
@@ -4615,13 +4615,13 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getFlexDirection()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v1}, Lcom/google/android/flexbox/a;->getFlexDirection()I
 
@@ -4677,20 +4677,20 @@
     goto :goto_1
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getLargestMainSize()I
 
     move-result v1
 
     :goto_1
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getPaddingTop()I
 
     move-result v0
 
-    iget-object v2, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v2, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v2}, Lcom/google/android/flexbox/a;->getPaddingBottom()I
 
@@ -4712,7 +4712,7 @@
     goto :goto_2
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getLargestMainSize()I
 
@@ -4721,13 +4721,13 @@
     move v1, v0
 
     :goto_2
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getPaddingLeft()I
 
     move-result v0
 
-    iget-object v2, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v2, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v2}, Lcom/google/android/flexbox/a;->getPaddingRight()I
 
@@ -4738,14 +4738,14 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/google/android/flexbox/c;->abf:[I
+    iget-object v3, p0, Lcom/google/android/flexbox/c;->abx:[I
 
     if-eqz v3, :cond_6
 
     aget v2, v3, p3
 
     :cond_6
-    iget-object p3, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p3, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p3}, Lcom/google/android/flexbox/a;->getFlexLinesInternal()Ljava/util/List;
 
@@ -4768,7 +4768,7 @@
 
     check-cast v5, Lcom/google/android/flexbox/b;
 
-    iget v2, v5, Lcom/google/android/flexbox/b;->aaT:I
+    iget v2, v5, Lcom/google/android/flexbox/b;->abl:I
 
     if-ge v2, v1, :cond_7
 
@@ -4815,7 +4815,7 @@
 .method final f(III)V
     .locals 11
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getFlexDirection()I
 
@@ -4882,7 +4882,7 @@
     move-result p2
 
     :goto_1
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getFlexLinesInternal()Ljava/util/List;
 
@@ -4892,7 +4892,7 @@
 
     if-ne p1, v4, :cond_14
 
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p1}, Lcom/google/android/flexbox/a;->getSumOfCrossSize()I
 
@@ -4916,7 +4916,7 @@
 
     sub-int/2addr p2, p3
 
-    iput p2, p1, Lcom/google/android/flexbox/b;->aaV:I
+    iput p2, p1, Lcom/google/android/flexbox/b;->abn:I
 
     return-void
 
@@ -4927,7 +4927,7 @@
 
     if-lt p3, v2, :cond_14
 
-    iget-object p3, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p3, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p3}, Lcom/google/android/flexbox/a;->getAlignContent()I
 
@@ -4985,7 +4985,7 @@
 
     check-cast v1, Lcom/google/android/flexbox/b;
 
-    iget v2, v1, Lcom/google/android/flexbox/b;->aaV:I
+    iget v2, v1, Lcom/google/android/flexbox/b;->abn:I
 
     int-to-float v2, v2
 
@@ -5035,7 +5035,7 @@
 
     :cond_7
     :goto_3
-    iput v8, v1, Lcom/google/android/flexbox/b;->aaV:I
+    iput v8, v1, Lcom/google/android/flexbox/b;->abn:I
 
     add-int/lit8 v5, v5, 0x1
 
@@ -5047,7 +5047,7 @@
     :cond_9
     if-lt p1, p2, :cond_a
 
-    iget-object p3, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p3, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-static {v0, p2, p1}, Lcom/google/android/flexbox/c;->a(Ljava/util/List;II)Ljava/util/List;
 
@@ -5076,7 +5076,7 @@
 
     invoke-direct {p3}, Lcom/google/android/flexbox/b;-><init>()V
 
-    iput p2, p3, Lcom/google/android/flexbox/b;->aaV:I
+    iput p2, p3, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -5104,7 +5104,7 @@
     goto :goto_4
 
     :cond_b
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p2, p1}, Lcom/google/android/flexbox/a;->setFlexLines(Ljava/util/List;)V
 
@@ -5174,7 +5174,7 @@
 
     move-result v1
 
-    iput v1, v8, Lcom/google/android/flexbox/b;->aaV:I
+    iput v1, v8, Lcom/google/android/flexbox/b;->abn:I
 
     const/4 v1, 0x0
 
@@ -5185,10 +5185,10 @@
 
     move-result v9
 
-    iput v9, v8, Lcom/google/android/flexbox/b;->aaV:I
+    iput v9, v8, Lcom/google/android/flexbox/b;->abn:I
 
     :goto_6
-    iget v9, v8, Lcom/google/android/flexbox/b;->aaV:I
+    iget v9, v8, Lcom/google/android/flexbox/b;->abn:I
 
     int-to-float v9, v9
 
@@ -5200,11 +5200,11 @@
 
     if-lez v9, :cond_e
 
-    iget v9, v8, Lcom/google/android/flexbox/b;->aaV:I
+    iget v9, v8, Lcom/google/android/flexbox/b;->abn:I
 
     add-int/2addr v9, v3
 
-    iput v9, v8, Lcom/google/android/flexbox/b;->aaV:I
+    iput v9, v8, Lcom/google/android/flexbox/b;->abn:I
 
     sub-float/2addr v1, v7
 
@@ -5215,11 +5215,11 @@
 
     if-gez v9, :cond_f
 
-    iget v9, v8, Lcom/google/android/flexbox/b;->aaV:I
+    iget v9, v8, Lcom/google/android/flexbox/b;->abn:I
 
     sub-int/2addr v9, v3
 
-    iput v9, v8, Lcom/google/android/flexbox/b;->aaV:I
+    iput v9, v8, Lcom/google/android/flexbox/b;->abn:I
 
     add-float/2addr v1, v7
 
@@ -5233,14 +5233,14 @@
     goto :goto_5
 
     :cond_11
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-interface {p1, p2}, Lcom/google/android/flexbox/a;->setFlexLines(Ljava/util/List;)V
 
     return-void
 
     :cond_12
-    iget-object p3, p0, Lcom/google/android/flexbox/c;->abd:Lcom/google/android/flexbox/a;
+    iget-object p3, p0, Lcom/google/android/flexbox/c;->abv:Lcom/google/android/flexbox/a;
 
     invoke-static {v0, p2, p1}, Lcom/google/android/flexbox/c;->a(Ljava/util/List;II)Ljava/util/List;
 
@@ -5257,7 +5257,7 @@
 
     invoke-direct {p1}, Lcom/google/android/flexbox/b;-><init>()V
 
-    iput p2, p1, Lcom/google/android/flexbox/b;->aaV:I
+    iput p2, p1, Lcom/google/android/flexbox/b;->abn:I
 
     invoke-interface {v0, v5, p1}, Ljava/util/List;->add(ILjava/lang/Object;)V
 
@@ -5266,7 +5266,7 @@
     return-void
 .end method
 
-.method final kF()V
+.method final kD()V
     .locals 1
 
     const/4 v0, 0x0
@@ -5276,7 +5276,7 @@
     return-void
 .end method
 
-.method final q(II)V
+.method final p(II)V
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/android/gms/a/b.smali b/com.discord/smali_classes2/com/google/android/gms/a/b.smali
index 11df8450b0..9aa0f070b7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/a/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/a/b.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private final akV:Ljava/lang/Object;
+.field private final alo:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -34,7 +34,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/a/a$a;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/a/b;->akV:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/a/b;->alo:Ljava/lang/Object;
 
     return-void
 .end method
@@ -57,7 +57,7 @@
 
     check-cast p0, Lcom/google/android/gms/a/b;
 
-    iget-object p0, p0, Lcom/google/android/gms/a/b;->akV:Ljava/lang/Object;
+    iget-object p0, p0, Lcom/google/android/gms/a/b;->alo:Ljava/lang/Object;
 
     return-object p0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/ads/identifier/AdvertisingIdClient$a.smali b/com.discord/smali_classes2/com/google/android/gms/ads/identifier/AdvertisingIdClient$a.smali
index dd089ab581..3d0d67e87d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/ads/identifier/AdvertisingIdClient$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/ads/identifier/AdvertisingIdClient$a.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private abV:Ljava/lang/ref/WeakReference;
+.field private aco:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -24,11 +24,11 @@
     .end annotation
 .end field
 
-.field private abW:J
+.field private acp:J
 
-.field abX:Ljava/util/concurrent/CountDownLatch;
+.field acq:Ljava/util/concurrent/CountDownLatch;
 
-.field abY:Z
+.field acr:Z
 
 
 # direct methods
@@ -41,9 +41,9 @@
 
     invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->abV:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->aco:Ljava/lang/ref/WeakReference;
 
-    iput-wide p2, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->abW:J
+    iput-wide p2, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->acp:J
 
     new-instance p1, Ljava/util/concurrent/CountDownLatch;
 
@@ -51,11 +51,11 @@
 
     invoke-direct {p1, p2}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object p1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->abX:Ljava/util/concurrent/CountDownLatch;
+    iput-object p1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->acq:Ljava/util/concurrent/CountDownLatch;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->abY:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->acr:Z
 
     invoke-virtual {p0}, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->start()V
 
@@ -65,7 +65,7 @@
 .method private final disconnect()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->abV:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->aco:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -79,7 +79,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->abY:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->acr:Z
 
     :cond_0
     return-void
@@ -91,9 +91,9 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->abX:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->acq:Ljava/util/concurrent/CountDownLatch;
 
-    iget-wide v1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->abW:J
+    iget-wide v1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->acp:J
 
     sget-object v3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/ads/identifier/a.smali b/com.discord/smali_classes2/com/google/android/gms/ads/identifier/a.smali
index d184d7849d..63a975d870 100644
--- a/com.discord/smali_classes2/com/google/android/gms/ads/identifier/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/ads/identifier/a.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic abZ:Ljava/util/Map;
+.field private final synthetic acs:Ljava/util/Map;
 
 
 # direct methods
 .method constructor <init>(Ljava/util/Map;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/ads/identifier/a;->abZ:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/ads/identifier/a;->acs:Ljava/util/Map;
 
     invoke-direct {p0}, Ljava/lang/Thread;-><init>()V
 
@@ -30,7 +30,7 @@
 
     invoke-direct {v2}, Lcom/google/android/gms/ads/identifier/c;-><init>()V
 
-    iget-object v2, p0, Lcom/google/android/gms/ads/identifier/a;->abZ:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/ads/identifier/a;->acs:Ljava/util/Map;
 
     const-string v3, "https://pagead2.googlesyndication.com/pagead/gen_204?id=gmob-apps"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/ads/identifier/b.smali b/com.discord/smali_classes2/com/google/android/gms/ads/identifier/b.smali
index 623996f6b5..52852c184f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/ads/identifier/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/ads/identifier/b.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private aca:Landroid/content/SharedPreferences;
+.field private act:Landroid/content/SharedPreferences;
 
 
 # direct methods
@@ -35,7 +35,7 @@
     move-result-object p1
 
     :goto_0
-    iput-object p1, p0, Lcom/google/android/gms/ads/identifier/b;->aca:Landroid/content/SharedPreferences;
+    iput-object p1, p0, Lcom/google/android/gms/ads/identifier/b;->act:Landroid/content/SharedPreferences;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -50,27 +50,27 @@
 
     invoke-static {v1, v2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    iput-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->aca:Landroid/content/SharedPreferences;
+    iput-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->act:Landroid/content/SharedPreferences;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final aK(Ljava/lang/String;)F
+.method final aF(Ljava/lang/String;)F
     .locals 3
 
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->aca:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->act:Landroid/content/SharedPreferences;
 
     if-nez v1, :cond_0
 
     return v0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->aca:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->act:Landroid/content/SharedPreferences;
 
     invoke-interface {v1, p1, v0}, Landroid/content/SharedPreferences;->getFloat(Ljava/lang/String;F)F
 
@@ -96,14 +96,14 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->aca:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->act:Landroid/content/SharedPreferences;
 
     if-nez v0, :cond_0
 
     return-object p2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->aca:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->act:Landroid/content/SharedPreferences;
 
     invoke-interface {v0, p1, p2}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -131,14 +131,14 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->aca:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->act:Landroid/content/SharedPreferences;
 
     if-nez v1, :cond_0
 
     return v0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->aca:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->act:Landroid/content/SharedPreferences;
 
     invoke-interface {v1, p1, v0}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/AnalyticsJobService.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/AnalyticsJobService.smali
index cb9bc8b727..89ec43cdcf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/AnalyticsJobService.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/AnalyticsJobService.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private acb:Lcom/google/android/gms/internal/gtm/bk;
+.field private acu:Lcom/google/android/gms/internal/gtm/bk;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/bk<",
@@ -26,7 +26,7 @@
     return-void
 .end method
 
-.method private final kL()Lcom/google/android/gms/internal/gtm/bk;
+.method private final kJ()Lcom/google/android/gms/internal/gtm/bk;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -37,7 +37,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->acb:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->acu:Lcom/google/android/gms/internal/gtm/bk;
 
     if-nez v0, :cond_0
 
@@ -45,10 +45,10 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/internal/gtm/bk;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->acb:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->acu:Lcom/google/android/gms/internal/gtm/bk;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->acb:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->acu:Lcom/google/android/gms/internal/gtm/bk;
 
     return-object v0
 .end method
@@ -80,7 +80,7 @@
 
     invoke-super {p0}, Landroid/app/job/JobService;->onCreate()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kL()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kJ()Lcom/google/android/gms/internal/gtm/bk;
 
     move-result-object v0
 
@@ -92,7 +92,7 @@
 .method public final onDestroy()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kL()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kJ()Lcom/google/android/gms/internal/gtm/bk;
 
     move-result-object v0
 
@@ -106,7 +106,7 @@
 .method public final onStartCommand(Landroid/content/Intent;II)I
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kL()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kJ()Lcom/google/android/gms/internal/gtm/bk;
 
     move-result-object p2
 
@@ -120,17 +120,17 @@
 .method public final onStartJob(Landroid/app/job/JobParameters;)Z
     .locals 4
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kL()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->kJ()Lcom/google/android/gms/internal/gtm/bk;
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/bk;->apl:Landroid/content/Context;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/bk;->apE:Landroid/content/Context;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/gtm/m;->ab(Landroid/content/Context;)Lcom/google/android/gms/internal/gtm/m;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/AnalyticsReceiver.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/AnalyticsReceiver.smali
index 8aeace899b..08985eaa82 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/AnalyticsReceiver.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/AnalyticsReceiver.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private acc:Lcom/google/android/gms/internal/gtm/bj;
+.field private acv:Lcom/google/android/gms/internal/gtm/bj;
 
 
 # direct methods
@@ -20,7 +20,7 @@
 .method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsReceiver;->acc:Lcom/google/android/gms/internal/gtm/bj;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsReceiver;->acv:Lcom/google/android/gms/internal/gtm/bj;
 
     if-nez v0, :cond_0
 
@@ -28,7 +28,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/gtm/bj;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsReceiver;->acc:Lcom/google/android/gms/internal/gtm/bj;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsReceiver;->acv:Lcom/google/android/gms/internal/gtm/bj;
 
     :cond_0
     invoke-static {p1, p2}, Lcom/google/android/gms/internal/gtm/bj;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/AnalyticsService.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/AnalyticsService.smali
index 0932a9fcde..66a56061d4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/AnalyticsService.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/AnalyticsService.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private acb:Lcom/google/android/gms/internal/gtm/bk;
+.field private acu:Lcom/google/android/gms/internal/gtm/bk;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/bk<",
@@ -26,7 +26,7 @@
     return-void
 .end method
 
-.method private final kL()Lcom/google/android/gms/internal/gtm/bk;
+.method private final kJ()Lcom/google/android/gms/internal/gtm/bk;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -37,7 +37,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->acb:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->acu:Lcom/google/android/gms/internal/gtm/bk;
 
     if-nez v0, :cond_0
 
@@ -45,10 +45,10 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/internal/gtm/bk;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->acb:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->acu:Lcom/google/android/gms/internal/gtm/bk;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->acb:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->acu:Lcom/google/android/gms/internal/gtm/bk;
 
     return-object v0
 .end method
@@ -78,7 +78,7 @@
 .method public final onBind(Landroid/content/Intent;)Landroid/os/IBinder;
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kL()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kJ()Lcom/google/android/gms/internal/gtm/bk;
 
     const/4 p1, 0x0
 
@@ -90,7 +90,7 @@
 
     invoke-super {p0}, Landroid/app/Service;->onCreate()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kL()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kJ()Lcom/google/android/gms/internal/gtm/bk;
 
     move-result-object v0
 
@@ -102,7 +102,7 @@
 .method public final onDestroy()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kL()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kJ()Lcom/google/android/gms/internal/gtm/bk;
 
     move-result-object v0
 
@@ -116,7 +116,7 @@
 .method public final onStartCommand(Landroid/content/Intent;II)I
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kL()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->kJ()Lcom/google/android/gms/internal/gtm/bk;
 
     move-result-object p2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/a.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/a.smali
index 185ad37ef5..52d616ed06 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/a.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static acd:Ljava/lang/Boolean;
+.field private static acw:Ljava/lang/Boolean;
 
 
 # direct methods
@@ -20,7 +20,7 @@
 
     invoke-static {p0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/google/android/gms/analytics/a;->acd:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/analytics/a;->acw:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
@@ -43,7 +43,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/analytics/a;->acd:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/analytics/a;->acw:Ljava/lang/Boolean;
 
     return p0
 .end method
@@ -57,7 +57,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -65,7 +65,7 @@
 
     const-string p1, "CampaignTrackingReceiver received null intent"
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     return-void
 
@@ -101,7 +101,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nK()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nI()I
 
     move-result p2
 
@@ -141,7 +141,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object p1
 
@@ -157,7 +157,7 @@
     :goto_1
     const-string p1, "CampaignTrackingReceiver received unexpected intent without referrer extra"
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/a/a.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/a/a.smali
index 5b404d85c3..f759757911 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/a/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/a/a.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private acj:Ljava/util/Map;
+.field private acC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -25,14 +25,14 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/a/a;->acj:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/a/a;->acC:Ljava/util/Map;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final aL(Ljava/lang/String;)Ljava/util/Map;
+.method public final aG(Ljava/lang/String;)Ljava/util/Map;
     .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -50,7 +50,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/a/a;->acj:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/a/a;->acC:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -124,7 +124,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/a/a;->acj:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/a/a;->acC:Ljava/util/Map;
 
     invoke-static {v0}, Lcom/google/android/gms/analytics/k;->n(Ljava/util/Map;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/a/b.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/a/b.smali
index ed1f752242..b2b54fd830 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/a/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/a/b.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private acj:Ljava/util/Map;
+.field private acC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -16,7 +16,7 @@
 
 
 # virtual methods
-.method public final kN()Ljava/util/Map;
+.method public final kL()Ljava/util/Map;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -30,7 +30,7 @@
 
     new-instance v0, Ljava/util/HashMap;
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/a/b;->acj:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/a/b;->acC:Ljava/util/Map;
 
     invoke-direct {v0, v1}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/a/b;->acj:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/a/b;->acC:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/a/c.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/a/c.smali
index 852a103031..7a887b35ef 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/a/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/a/c.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private acj:Ljava/util/Map;
+.field private acC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -25,14 +25,14 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/a/c;->acj:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/a/c;->acC:Ljava/util/Map;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final aL(Ljava/lang/String;)Ljava/util/Map;
+.method public final aG(Ljava/lang/String;)Ljava/util/Map;
     .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -50,7 +50,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/a/c;->acj:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/a/c;->acC:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -124,7 +124,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/a/c;->acj:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/a/c;->acC:Ljava/util/Map;
 
     invoke-static {v0}, Lcom/google/android/gms/analytics/k;->n(Ljava/util/Map;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/b.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/b.smali
index 13c50552cc..9d58aad860 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/b.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static ace:Ljava/util/List;
+.field private static acx:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -15,9 +15,13 @@
 
 
 # instance fields
-.field public acf:Z
+.field public acA:Z
 
-.field private acg:Ljava/util/Set;
+.field volatile acB:Z
+
+.field public acy:Z
+
+.field private acz:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -27,10 +31,6 @@
     .end annotation
 .end field
 
-.field public ach:Z
-
-.field volatile aci:Z
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/analytics/b;->ace:Ljava/util/List;
+    sput-object v0, Lcom/google/android/gms/analytics/b;->acx:Ljava/util/List;
 
     return-void
 .end method
@@ -54,12 +54,12 @@
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/b;->acg:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/b;->acz:Ljava/util/Set;
 
     return-void
 .end method
 
-.method public static kM()V
+.method public static kK()V
     .locals 3
 
     const-class v0, Lcom/google/android/gms/analytics/b;
@@ -67,11 +67,11 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/analytics/b;->ace:Ljava/util/List;
+    sget-object v1, Lcom/google/android/gms/analytics/b;->acx:Ljava/util/List;
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lcom/google/android/gms/analytics/b;->ace:Ljava/util/List;
+    sget-object v1, Lcom/google/android/gms/analytics/b;->acx:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -97,7 +97,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    sput-object v1, Lcom/google/android/gms/analytics/b;->ace:Ljava/util/List;
+    sput-object v1, Lcom/google/android/gms/analytics/b;->acx:Ljava/util/List;
 
     :cond_1
     monitor-exit v0
@@ -125,7 +125,7 @@
 .method public final isInitialized()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/analytics/b;->acf:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/analytics/b;->acy:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/d.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/d.smali
index 7de45fd3a8..12b915c402 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/d.smali
@@ -13,24 +13,24 @@
 
 
 # instance fields
-.field public final acl:Lcom/google/android/gms/internal/gtm/m;
+.field public final acD:Lcom/google/android/gms/internal/gtm/m;
 
-.field public acm:Z
+.field public acE:Z
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/gtm/m;)V
     .locals 2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/m;->act:Lcom/google/android/gms/common/util/e;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/m;->acL:Lcom/google/android/gms/common/util/e;
 
     invoke-direct {p0, v0, v1}, Lcom/google/android/gms/analytics/l;-><init>(Lcom/google/android/gms/analytics/m;Lcom/google/android/gms/common/util/e;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/d;->acl:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/d;->acD:Lcom/google/android/gms/internal/gtm/m;
 
     return-void
 .end method
@@ -48,7 +48,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/gtm/ch;
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->amK:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->anc:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -56,24 +56,24 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/d;->acl:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/d;->acD:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nk()Lcom/google/android/gms/internal/gtm/ae;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ni()Lcom/google/android/gms/internal/gtm/ae;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->nD()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->nB()Ljava/lang/String;
 
     move-result-object v0
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->amK:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->anc:Ljava/lang/String;
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/analytics/d;->acm:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/analytics/d;->acE:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aqi:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aqA:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -81,42 +81,42 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/d;->acl:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/d;->acD:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->amD:Lcom/google/android/gms/internal/gtm/d;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->amV:Lcom/google/android/gms/internal/gtm/d;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/gtm/m;->a(Lcom/google/android/gms/internal/gtm/k;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->amD:Lcom/google/android/gms/internal/gtm/d;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->amV:Lcom/google/android/gms/internal/gtm/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/d;->mR()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/d;->mP()Ljava/lang/String;
 
     move-result-object v1
 
-    iput-object v1, p1, Lcom/google/android/gms/internal/gtm/ch;->aqi:Ljava/lang/String;
+    iput-object v1, p1, Lcom/google/android/gms/internal/gtm/ch;->aqA:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/d;->mQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/d;->mO()Z
 
     move-result v0
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aqj:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aqB:Z
 
     :cond_1
     return-void
 .end method
 
-.method public final aM(Ljava/lang/String;)V
+.method public final aH(Ljava/lang/String;)V
     .locals 3
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {p1}, Lcom/google/android/gms/analytics/e;->aN(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {p1}, Lcom/google/android/gms/analytics/e;->aI(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/l;->acE:Lcom/google/android/gms/analytics/j;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/l;->acW:Lcom/google/android/gms/analytics/j;
 
-    iget-object v1, v1, Lcom/google/android/gms/analytics/j;->acC:Ljava/util/List;
+    iget-object v1, v1, Lcom/google/android/gms/analytics/j;->acU:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->listIterator()Ljava/util/ListIterator;
 
@@ -136,7 +136,7 @@
 
     check-cast v2, Lcom/google/android/gms/analytics/p;
 
-    invoke-interface {v2}, Lcom/google/android/gms/analytics/p;->kP()Landroid/net/Uri;
+    invoke-interface {v2}, Lcom/google/android/gms/analytics/p;->kN()Landroid/net/Uri;
 
     move-result-object v2
 
@@ -151,13 +151,13 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->acE:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->acW:Lcom/google/android/gms/analytics/j;
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/j;->acC:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/j;->acU:Ljava/util/List;
 
     new-instance v1, Lcom/google/android/gms/analytics/e;
 
-    iget-object v2, p0, Lcom/google/android/gms/analytics/d;->acl:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/d;->acD:Lcom/google/android/gms/internal/gtm/m;
 
     invoke-direct {v1, v2, p1}, Lcom/google/android/gms/analytics/e;-><init>(Lcom/google/android/gms/internal/gtm/m;Ljava/lang/String;)V
 
@@ -166,40 +166,40 @@
     return-void
 .end method
 
-.method public final kO()Lcom/google/android/gms/analytics/j;
+.method public final kM()Lcom/google/android/gms/analytics/j;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->acE:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->acW:Lcom/google/android/gms/analytics/j;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->kQ()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->kO()Lcom/google/android/gms/analytics/j;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/d;->acl:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/d;->acD:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/m;->amE:Lcom/google/android/gms/internal/gtm/x;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/m;->amW:Lcom/google/android/gms/internal/gtm/x;
 
     invoke-static {v2}, Lcom/google/android/gms/internal/gtm/m;->a(Lcom/google/android/gms/internal/gtm/k;)V
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->amE:Lcom/google/android/gms/internal/gtm/x;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->amW:Lcom/google/android/gms/internal/gtm/x;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/x;->nt()Lcom/google/android/gms/internal/gtm/by;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/x;->nr()Lcom/google/android/gms/internal/gtm/by;
 
     move-result-object v1
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/analytics/j;->a(Lcom/google/android/gms/analytics/k;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/d;->acl:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/d;->acD:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->amF:Lcom/google/android/gms/internal/gtm/aq;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->amX:Lcom/google/android/gms/internal/gtm/aq;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/aq;->nW()Lcom/google/android/gms/internal/gtm/cd;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/aq;->nU()Lcom/google/android/gms/internal/gtm/cd;
 
     move-result-object v1
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/analytics/j;->a(Lcom/google/android/gms/analytics/k;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/analytics/l;->kS()V
+    invoke-virtual {p0}, Lcom/google/android/gms/analytics/l;->kQ()V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/e.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/e.smali
index 3454cae887..bd3055fe10 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/e.smali
@@ -6,15 +6,15 @@
 
 
 # static fields
-.field private static acn:Ljava/text/DecimalFormat;
+.field private static acF:Ljava/text/DecimalFormat;
 
 
 # instance fields
-.field private final acl:Lcom/google/android/gms/internal/gtm/m;
+.field private final acD:Lcom/google/android/gms/internal/gtm/m;
 
-.field private final aco:Ljava/lang/String;
+.field private final acG:Ljava/lang/String;
 
-.field private final acp:Landroid/net/Uri;
+.field private final acH:Landroid/net/Uri;
 
 
 # direct methods
@@ -33,19 +33,19 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/gtm/j;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/e;->acl:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/e;->acD:Lcom/google/android/gms/internal/gtm/m;
 
-    iput-object p2, p0, Lcom/google/android/gms/analytics/e;->aco:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/analytics/e;->acG:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/analytics/e;->aco:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/analytics/e;->acG:Ljava/lang/String;
 
-    invoke-static {p1}, Lcom/google/android/gms/analytics/e;->aN(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {p1}, Lcom/google/android/gms/analytics/e;->aI(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/e;->acp:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/e;->acH:Landroid/net/Uri;
 
     return-void
 .end method
@@ -53,7 +53,7 @@
 .method private static a(D)Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/analytics/e;->acn:Ljava/text/DecimalFormat;
+    sget-object v0, Lcom/google/android/gms/analytics/e;->acF:Ljava/text/DecimalFormat;
 
     if-nez v0, :cond_0
 
@@ -63,10 +63,10 @@
 
     invoke-direct {v0, v1}, Ljava/text/DecimalFormat;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/android/gms/analytics/e;->acn:Ljava/text/DecimalFormat;
+    sput-object v0, Lcom/google/android/gms/analytics/e;->acF:Ljava/text/DecimalFormat;
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/analytics/e;->acn:Ljava/text/DecimalFormat;
+    sget-object v0, Lcom/google/android/gms/analytics/e;->acF:Ljava/text/DecimalFormat;
 
     invoke-virtual {v0, p0, p1}, Ljava/text/DecimalFormat;->format(D)Ljava/lang/String;
 
@@ -171,10 +171,10 @@
     return-void
 .end method
 
-.method static aN(Ljava/lang/String;)Landroid/net/Uri;
+.method static aI(Ljava/lang/String;)Landroid/net/Uri;
     .locals 2
 
-    invoke-static {p0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     new-instance v0, Landroid/net/Uri$Builder;
 
@@ -225,7 +225,7 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/cc;->amO:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/cc;->ang:Ljava/util/Map;
 
     invoke-static {v1}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
 
@@ -356,13 +356,13 @@
 
     invoke-static {v0, v3, v2}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->amK:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->anc:Ljava/lang/String;
 
     const-string v3, "cid"
 
     invoke-static {v0, v3, v2}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aqh:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aqz:Ljava/lang/String;
 
     const-string v3, "uid"
 
@@ -374,25 +374,25 @@
 
     invoke-static {v0, v3, v2}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-wide v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aql:D
+    iget-wide v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aqD:D
 
     const-string v4, "sf"
 
     invoke-static {v0, v4, v2, v3}, Lcom/google/android/gms/analytics/e;->a(Ljava/util/Map;Ljava/lang/String;D)V
 
-    iget-boolean v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aqk:Z
+    iget-boolean v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aqC:Z
 
     const-string v3, "ni"
 
     invoke-static {v0, v3, v2}, Lcom/google/android/gms/analytics/e;->a(Ljava/util/Map;Ljava/lang/String;Z)V
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aqi:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aqA:Ljava/lang/String;
 
     const-string v3, "adid"
 
     invoke-static {v0, v3, v2}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-boolean v1, v1, Lcom/google/android/gms/internal/gtm/ch;->aqj:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/internal/gtm/ch;->aqB:Z
 
     const-string v2, "ate"
 
@@ -411,11 +411,11 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v3, v1, Lcom/google/android/gms/internal/gtm/a;->alS:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/internal/gtm/a;->amk:Ljava/lang/String;
 
     invoke-static {v0, v2, v3}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget v3, v1, Lcom/google/android/gms/internal/gtm/a;->alT:I
+    iget v3, v1, Lcom/google/android/gms/internal/gtm/a;->aml:I
 
     int-to-double v3, v3
 
@@ -423,7 +423,7 @@
 
     invoke-static {v0, v5, v3, v4}, Lcom/google/android/gms/analytics/e;->a(Ljava/util/Map;Ljava/lang/String;D)V
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/a;->alW:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/a;->amo:Ljava/lang/String;
 
     const-string v3, "dr"
 
@@ -446,7 +446,7 @@
 
     invoke-static {v0, v4, v3}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v3, v1, Lcom/google/android/gms/internal/gtm/cf;->aqf:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/internal/gtm/cf;->aqx:Ljava/lang/String;
 
     const-string v4, "ea"
 
@@ -485,47 +485,47 @@
 
     invoke-static {v0, v5, v4}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->apM:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->aqe:Ljava/lang/String;
 
     const-string v5, "cs"
 
     invoke-static {v0, v5, v4}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->apN:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->aqf:Ljava/lang/String;
 
     invoke-static {v0, v3, v4}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->apO:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->aqg:Ljava/lang/String;
 
     const-string v5, "ck"
 
     invoke-static {v0, v5, v4}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->apP:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->aqh:Ljava/lang/String;
 
     const-string v5, "cc"
 
     invoke-static {v0, v5, v4}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->anw:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->anO:Ljava/lang/String;
 
     const-string v5, "ci"
 
     invoke-static {v0, v5, v4}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->apQ:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->aqi:Ljava/lang/String;
 
     const-string v5, "anid"
 
     invoke-static {v0, v5, v4}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->apR:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->aqj:Ljava/lang/String;
 
     const-string v5, "gclid"
 
     invoke-static {v0, v5, v4}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->apS:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->aqk:Ljava/lang/String;
 
     const-string v5, "dclid"
 
@@ -548,7 +548,7 @@
 
     if-eqz v1, :cond_b
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/cg;->aqg:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/cg;->aqy:Ljava/lang/String;
 
     const-string v5, "exd"
 
@@ -577,13 +577,13 @@
 
     invoke-static {v0, v5, v4}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/b;->alZ:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/b;->amr:Ljava/lang/String;
 
     const-string v5, "sa"
 
     invoke-static {v0, v5, v4}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/b;->ama:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/b;->ams:Ljava/lang/String;
 
     const-string v4, "st"
 
@@ -600,13 +600,13 @@
 
     if-eqz v1, :cond_d
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/c;->amb:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/c;->amt:Ljava/lang/String;
 
     const-string v5, "utv"
 
     invoke-static {v0, v5, v4}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-wide v4, v1, Lcom/google/android/gms/internal/gtm/c;->amc:J
+    iget-wide v4, v1, Lcom/google/android/gms/internal/gtm/c;->amu:J
 
     long-to-double v4, v4
 
@@ -637,7 +637,7 @@
 
     if-eqz v1, :cond_f
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ca;->apT:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ca;->aql:Ljava/util/Map;
 
     invoke-static {v1}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
 
@@ -706,7 +706,7 @@
 
     if-eqz v1, :cond_11
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/cb;->apU:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/cb;->aqm:Ljava/util/Map;
 
     invoke-static {v1}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
 
@@ -783,13 +783,13 @@
 
     if-eqz v1, :cond_1a
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ce;->aqe:Lcom/google/android/gms/analytics/a/b;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ce;->aqw:Lcom/google/android/gms/analytics/a/b;
 
     const/4 v3, 0x1
 
     if-eqz v2, :cond_13
 
-    invoke-virtual {v2}, Lcom/google/android/gms/analytics/a/b;->kN()Ljava/util/Map;
+    invoke-virtual {v2}, Lcom/google/android/gms/analytics/a/b;->kL()Ljava/util/Map;
 
     move-result-object v2
 
@@ -866,7 +866,7 @@
     goto :goto_4
 
     :cond_13
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ce;->aqc:Ljava/util/List;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ce;->aqu:Ljava/util/List;
 
     invoke-static {v2}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
 
@@ -897,7 +897,7 @@
 
     move-result-object v6
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/analytics/a/c;->aL(Ljava/lang/String;)Ljava/util/Map;
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/analytics/a/c;->aG(Ljava/lang/String;)Ljava/util/Map;
 
     move-result-object v5
 
@@ -908,7 +908,7 @@
     goto :goto_5
 
     :cond_14
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ce;->aqb:Ljava/util/List;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ce;->aqt:Ljava/util/List;
 
     invoke-static {v2}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
 
@@ -939,7 +939,7 @@
 
     move-result-object v6
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/analytics/a/a;->aL(Ljava/lang/String;)Ljava/util/Map;
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/analytics/a/a;->aG(Ljava/lang/String;)Ljava/util/Map;
 
     move-result-object v5
 
@@ -950,7 +950,7 @@
     goto :goto_6
 
     :cond_15
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ce;->aqd:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ce;->aqv:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -1040,7 +1040,7 @@
     move-object v9, v10
 
     :goto_9
-    invoke-virtual {v8, v9}, Lcom/google/android/gms/analytics/a/a;->aL(Ljava/lang/String;)Ljava/util/Map;
+    invoke-virtual {v8, v9}, Lcom/google/android/gms/analytics/a/a;->aG(Ljava/lang/String;)Ljava/util/Map;
 
     move-result-object v8
 
@@ -1113,13 +1113,13 @@
 
     if-eqz v1, :cond_1b
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/cd;->apV:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/cd;->aqn:Ljava/lang/String;
 
     const-string v3, "ul"
 
     invoke-static {v0, v3, v2}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget v2, v1, Lcom/google/android/gms/internal/gtm/cd;->apW:I
+    iget v2, v1, Lcom/google/android/gms/internal/gtm/cd;->aqo:I
 
     int-to-double v2, v2
 
@@ -1127,17 +1127,17 @@
 
     invoke-static {v0, v4, v2, v3}, Lcom/google/android/gms/analytics/e;->a(Ljava/util/Map;Ljava/lang/String;D)V
 
-    iget v2, v1, Lcom/google/android/gms/internal/gtm/cd;->apX:I
+    iget v2, v1, Lcom/google/android/gms/internal/gtm/cd;->aqp:I
 
-    iget v3, v1, Lcom/google/android/gms/internal/gtm/cd;->apY:I
+    iget v3, v1, Lcom/google/android/gms/internal/gtm/cd;->aqq:I
 
     const-string v4, "sr"
 
     invoke-static {v0, v4, v2, v3}, Lcom/google/android/gms/analytics/e;->a(Ljava/util/Map;Ljava/lang/String;II)V
 
-    iget v2, v1, Lcom/google/android/gms/internal/gtm/cd;->apZ:I
+    iget v2, v1, Lcom/google/android/gms/internal/gtm/cd;->aqr:I
 
-    iget v1, v1, Lcom/google/android/gms/internal/gtm/cd;->aqa:I
+    iget v1, v1, Lcom/google/android/gms/internal/gtm/cd;->aqs:I
 
     const-string v3, "vp"
 
@@ -1154,25 +1154,25 @@
 
     if-eqz p0, :cond_1c
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->apI:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->aqa:Ljava/lang/String;
 
     const-string v2, "an"
 
     invoke-static {v0, v2, v1}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->apK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->aqc:Ljava/lang/String;
 
     const-string v2, "aid"
 
     invoke-static {v0, v2, v1}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->apL:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->aqd:Ljava/lang/String;
 
     const-string v2, "aiid"
 
     invoke-static {v0, v2, v1}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/by;->apJ:Ljava/lang/String;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/by;->aqb:Ljava/lang/String;
 
     const-string v1, "av"
 
@@ -1216,7 +1216,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-boolean v1, p1, Lcom/google/android/gms/analytics/j;->acu:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/analytics/j;->acM:Z
 
     const-string v2, "Can\'t deliver not submitted measurement"
 
@@ -1224,9 +1224,9 @@
 
     const-string v1, "deliver should be called on worker thread"
 
-    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aX(Ljava/lang/String;)V
+    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aS(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/analytics/j;->kQ()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {p1}, Lcom/google/android/gms/analytics/j;->kO()Lcom/google/android/gms/analytics/j;
 
     move-result-object v1
 
@@ -1246,9 +1246,9 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -1263,7 +1263,7 @@
     return-void
 
     :cond_0
-    iget-object v3, v2, Lcom/google/android/gms/internal/gtm/ch;->amK:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/internal/gtm/ch;->anc:Ljava/lang/String;
 
     invoke-static {v3}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1271,9 +1271,9 @@
 
     if-eqz v3, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -1288,22 +1288,22 @@
     return-void
 
     :cond_1
-    iget-object v3, p0, Lcom/google/android/gms/analytics/e;->acl:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v3, p0, Lcom/google/android/gms/analytics/e;->acD:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/gtm/m;->ni()Lcom/google/android/gms/analytics/b;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/b;
 
     move-result-object v3
 
-    iget-boolean v3, v3, Lcom/google/android/gms/analytics/b;->aci:Z
+    iget-boolean v3, v3, Lcom/google/android/gms/analytics/b;->acB:Z
 
     if-eqz v3, :cond_2
 
     return-void
 
     :cond_2
-    iget-wide v3, v2, Lcom/google/android/gms/internal/gtm/ch;->aql:D
+    iget-wide v3, v2, Lcom/google/android/gms/internal/gtm/ch;->aqD:D
 
-    iget-object v5, v2, Lcom/google/android/gms/internal/gtm/ch;->amK:Ljava/lang/String;
+    iget-object v5, v2, Lcom/google/android/gms/internal/gtm/ch;->anc:Ljava/lang/String;
 
     invoke-static {v3, v4, v5}, Lcom/google/android/gms/internal/gtm/bq;->a(DLjava/lang/String;)Z
 
@@ -1332,25 +1332,25 @@
 
     invoke-interface {v1, v3, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v3, Lcom/google/android/gms/internal/gtm/l;->amr:Ljava/lang/String;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/l;->amJ:Ljava/lang/String;
 
     const-string v4, "_v"
 
     invoke-interface {v1, v4, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v3, p0, Lcom/google/android/gms/analytics/e;->aco:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/analytics/e;->acG:Ljava/lang/String;
 
     const-string v4, "tid"
 
     invoke-interface {v1, v4, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v3, p0, Lcom/google/android/gms/analytics/e;->acl:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v3, p0, Lcom/google/android/gms/analytics/e;->acD:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/gtm/m;->ni()Lcom/google/android/gms/analytics/b;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/b;
 
     move-result-object v3
 
-    iget-boolean v3, v3, Lcom/google/android/gms/analytics/b;->ach:Z
+    iget-boolean v3, v3, Lcom/google/android/gms/analytics/b;->acA:Z
 
     if-eqz v3, :cond_6
 
@@ -1436,7 +1436,7 @@
 
     invoke-direct {v12}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v3, v2, Lcom/google/android/gms/internal/gtm/ch;->aqh:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/internal/gtm/ch;->aqz:Ljava/lang/String;
 
     const-string v4, "uid"
 
@@ -1452,25 +1452,25 @@
 
     if-eqz v3, :cond_7
 
-    iget-object v4, v3, Lcom/google/android/gms/internal/gtm/by;->apI:Ljava/lang/String;
+    iget-object v4, v3, Lcom/google/android/gms/internal/gtm/by;->aqa:Ljava/lang/String;
 
     const-string v5, "an"
 
     invoke-static {v12, v5, v4}, Lcom/google/android/gms/internal/gtm/bq;->d(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v4, v3, Lcom/google/android/gms/internal/gtm/by;->apK:Ljava/lang/String;
+    iget-object v4, v3, Lcom/google/android/gms/internal/gtm/by;->aqc:Ljava/lang/String;
 
     const-string v5, "aid"
 
     invoke-static {v12, v5, v4}, Lcom/google/android/gms/internal/gtm/bq;->d(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v4, v3, Lcom/google/android/gms/internal/gtm/by;->apJ:Ljava/lang/String;
+    iget-object v4, v3, Lcom/google/android/gms/internal/gtm/by;->aqb:Ljava/lang/String;
 
     const-string v5, "av"
 
     invoke-static {v12, v5, v4}, Lcom/google/android/gms/internal/gtm/bq;->d(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/by;->apL:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/by;->aqd:Ljava/lang/String;
 
     const-string v4, "aiid"
 
@@ -1479,11 +1479,11 @@
     :cond_7
     new-instance v3, Lcom/google/android/gms/internal/gtm/p;
 
-    iget-object v7, v2, Lcom/google/android/gms/internal/gtm/ch;->amK:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/internal/gtm/ch;->anc:Ljava/lang/String;
 
-    iget-object v8, p0, Lcom/google/android/gms/analytics/e;->aco:Ljava/lang/String;
+    iget-object v8, p0, Lcom/google/android/gms/analytics/e;->acG:Ljava/lang/String;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/ch;->aqi:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/ch;->aqA:Ljava/lang/String;
 
     invoke-static {v2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1497,9 +1497,9 @@
 
     invoke-direct/range {v6 .. v12}, Lcom/google/android/gms/internal/gtm/p;-><init>(Ljava/lang/String;Ljava/lang/String;ZJLjava/util/Map;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v2
 
@@ -1517,19 +1517,19 @@
 
     new-instance v2, Lcom/google/android/gms/internal/gtm/az;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v3
 
-    iget-wide v4, p1, Lcom/google/android/gms/analytics/j;->acv:J
+    iget-wide v4, p1, Lcom/google/android/gms/analytics/j;->acN:J
 
     invoke-direct {v2, v3, v1, v4, v5}, Lcom/google/android/gms/internal/gtm/az;-><init>(Lcom/google/android/gms/internal/gtm/j;Ljava/util/Map;J)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v0
 
@@ -1538,10 +1538,10 @@
     return-void
 .end method
 
-.method public final kP()Landroid/net/Uri;
+.method public final kN()Landroid/net/Uri;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/e;->acp:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/e;->acH:Landroid/net/Uri;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/f.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/f.smali
index 9e1aa30215..1bf5b6759c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/f.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic acq:Landroid/content/BroadcastReceiver$PendingResult;
+.field private final synthetic acI:Landroid/content/BroadcastReceiver$PendingResult;
 
 
 # direct methods
 .method constructor <init>(Landroid/content/BroadcastReceiver$PendingResult;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/f;->acq:Landroid/content/BroadcastReceiver$PendingResult;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/f;->acI:Landroid/content/BroadcastReceiver$PendingResult;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,7 +25,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/f;->acq:Landroid/content/BroadcastReceiver$PendingResult;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/f;->acI:Landroid/content/BroadcastReceiver$PendingResult;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/h.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/h.smali
index b89ed72bf9..1357458fd0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/h.smali
@@ -6,11 +6,11 @@
 
 
 # static fields
-.field private static final acp:Landroid/net/Uri;
+.field private static final acH:Landroid/net/Uri;
 
 
 # instance fields
-.field private final acr:Landroid/util/LogPrinter;
+.field private final acJ:Landroid/util/LogPrinter;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/analytics/h;->acp:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/analytics/h;->acH:Landroid/net/Uri;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
 
     invoke-direct {v0, v1, v2}, Landroid/util/LogPrinter;-><init>(ILjava/lang/String;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/h;->acr:Landroid/util/LogPrinter;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/h;->acJ:Landroid/util/LogPrinter;
 
     return-void
 .end method
@@ -63,7 +63,7 @@
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object p1, p1, Lcom/google/android/gms/analytics/j;->acB:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/analytics/j;->acT:Ljava/util/Map;
 
     invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -127,7 +127,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/analytics/h;->acr:Landroid/util/LogPrinter;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/h;->acJ:Landroid/util/LogPrinter;
 
     invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -138,10 +138,10 @@
     return-void
 .end method
 
-.method public final kP()Landroid/net/Uri;
+.method public final kN()Landroid/net/Uri;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/analytics/h;->acp:Landroid/net/Uri;
+    sget-object v0, Lcom/google/android/gms/analytics/h;->acH:Landroid/net/Uri;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/j.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/j.smali
index 793c2b7d17..39e4969a07 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/j.smali
@@ -3,9 +3,25 @@
 
 
 # instance fields
-.field acA:Z
+.field final acK:Lcom/google/android/gms/analytics/l;
 
-.field final acB:Ljava/util/Map;
+.field private final acL:Lcom/google/android/gms/common/util/e;
+
+.field acM:Z
+
+.field acN:J
+
+.field public acO:J
+
+.field private acP:J
+
+.field private acQ:J
+
+.field private acR:J
+
+.field acS:Z
+
+.field final acT:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -19,7 +35,7 @@
     .end annotation
 .end field
 
-.field final acC:Ljava/util/List;
+.field final acU:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,22 +45,6 @@
     .end annotation
 .end field
 
-.field final acs:Lcom/google/android/gms/analytics/l;
-
-.field private final act:Lcom/google/android/gms/common/util/e;
-
-.field acu:Z
-
-.field acv:J
-
-.field public acw:J
-
-.field private acx:J
-
-.field private acy:J
-
-.field private acz:J
-
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/gms/analytics/j;)V
@@ -52,45 +52,45 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lcom/google/android/gms/analytics/j;->acs:Lcom/google/android/gms/analytics/l;
+    iget-object v0, p1, Lcom/google/android/gms/analytics/j;->acK:Lcom/google/android/gms/analytics/l;
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->acs:Lcom/google/android/gms/analytics/l;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->acK:Lcom/google/android/gms/analytics/l;
 
-    iget-object v0, p1, Lcom/google/android/gms/analytics/j;->act:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p1, Lcom/google/android/gms/analytics/j;->acL:Lcom/google/android/gms/common/util/e;
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->act:Lcom/google/android/gms/common/util/e;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->acL:Lcom/google/android/gms/common/util/e;
 
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->acv:J
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->acN:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->acv:J
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->acN:J
 
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->acw:J
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->acO:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->acw:J
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->acO:J
 
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->acx:J
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->acP:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->acx:J
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->acP:J
 
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->acy:J
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->acQ:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->acy:J
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->acQ:J
 
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->acz:J
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->acR:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->acz:J
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->acR:J
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p1, Lcom/google/android/gms/analytics/j;->acC:Ljava/util/List;
+    iget-object v1, p1, Lcom/google/android/gms/analytics/j;->acU:Ljava/util/List;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->acC:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->acU:Ljava/util/List;
 
     new-instance v0, Ljava/util/HashMap;
 
-    iget-object v1, p1, Lcom/google/android/gms/analytics/j;->acB:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/analytics/j;->acT:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->size()I
 
@@ -98,9 +98,9 @@
 
     invoke-direct {v0, v1}, Ljava/util/HashMap;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->acB:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->acT:Ljava/util/Map;
 
-    iget-object p1, p1, Lcom/google/android/gms/analytics/j;->acB:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/analytics/j;->acT:Ljava/util/Map;
 
     invoke-interface {p1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -141,7 +141,7 @@
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/analytics/k;->b(Lcom/google/android/gms/analytics/k;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/analytics/j;->acB:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/j;->acT:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -166,29 +166,29 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/j;->acs:Lcom/google/android/gms/analytics/l;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/j;->acK:Lcom/google/android/gms/analytics/l;
 
-    iput-object p2, p0, Lcom/google/android/gms/analytics/j;->act:Lcom/google/android/gms/common/util/e;
+    iput-object p2, p0, Lcom/google/android/gms/analytics/j;->acL:Lcom/google/android/gms/common/util/e;
 
     const-wide/32 p1, 0x1b7740
 
-    iput-wide p1, p0, Lcom/google/android/gms/analytics/j;->acy:J
+    iput-wide p1, p0, Lcom/google/android/gms/analytics/j;->acQ:J
 
     const-wide p1, 0xb43e9400L
 
-    iput-wide p1, p0, Lcom/google/android/gms/analytics/j;->acz:J
+    iput-wide p1, p0, Lcom/google/android/gms/analytics/j;->acR:J
 
     new-instance p1, Ljava/util/HashMap;
 
     invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/j;->acB:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/j;->acT:Ljava/util/Map;
 
     new-instance p1, Ljava/util/ArrayList;
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/j;->acC:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/j;->acU:Ljava/util/List;
 
     return-void
 .end method
@@ -316,7 +316,7 @@
     throw p1
 .end method
 
-.method public final kQ()Lcom/google/android/gms/analytics/j;
+.method public final kO()Lcom/google/android/gms/analytics/j;
     .locals 1
 
     new-instance v0, Lcom/google/android/gms/analytics/j;
@@ -326,34 +326,34 @@
     return-object v0
 .end method
 
-.method public final kR()V
+.method public final kP()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->acs:Lcom/google/android/gms/analytics/l;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->acK:Lcom/google/android/gms/analytics/l;
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/l;->acD:Lcom/google/android/gms/analytics/m;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/l;->acV:Lcom/google/android/gms/analytics/m;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/analytics/j;->acA:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/analytics/j;->acS:Z
 
     if-nez v1, :cond_2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/analytics/j;->acu:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/analytics/j;->acM:Z
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/analytics/j;->kQ()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {p0}, Lcom/google/android/gms/analytics/j;->kO()Lcom/google/android/gms/analytics/j;
 
     move-result-object v1
 
-    iget-object v2, v1, Lcom/google/android/gms/analytics/j;->act:Lcom/google/android/gms/common/util/e;
+    iget-object v2, v1, Lcom/google/android/gms/analytics/j;->acL:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->elapsedRealtime()J
 
     move-result-wide v2
 
-    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->acx:J
+    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->acP:J
 
-    iget-wide v2, v1, Lcom/google/android/gms/analytics/j;->acw:J
+    iget-wide v2, v1, Lcom/google/android/gms/analytics/j;->acO:J
 
     const-wide/16 v4, 0x0
 
@@ -361,25 +361,25 @@
 
     if-eqz v6, :cond_0
 
-    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->acv:J
+    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->acN:J
 
     goto :goto_0
 
     :cond_0
-    iget-object v2, v1, Lcom/google/android/gms/analytics/j;->act:Lcom/google/android/gms/common/util/e;
+    iget-object v2, v1, Lcom/google/android/gms/analytics/j;->acL:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
     move-result-wide v2
 
-    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->acv:J
+    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->acN:J
 
     :goto_0
     const/4 v2, 0x1
 
-    iput-boolean v2, v1, Lcom/google/android/gms/analytics/j;->acu:Z
+    iput-boolean v2, v1, Lcom/google/android/gms/analytics/j;->acM:Z
 
-    iget-object v2, v0, Lcom/google/android/gms/analytics/m;->acK:Lcom/google/android/gms/analytics/m$a;
+    iget-object v2, v0, Lcom/google/android/gms/analytics/m;->adc:Lcom/google/android/gms/analytics/m$a;
 
     new-instance v3, Lcom/google/android/gms/analytics/n;
 
@@ -420,7 +420,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->acB:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->acT:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -443,7 +443,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->acB:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->acT:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -457,7 +457,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/j;->acB:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/j;->acT:Ljava/util/Map;
 
     invoke-interface {v1, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/l.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/l.smali
index 32117aa8cd..a6a98ecd9d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/l.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/l.smali
@@ -14,11 +14,11 @@
 
 
 # instance fields
-.field final acD:Lcom/google/android/gms/analytics/m;
+.field final acV:Lcom/google/android/gms/analytics/m;
 
-.field protected final acE:Lcom/google/android/gms/analytics/j;
+.field protected final acW:Lcom/google/android/gms/analytics/j;
 
-.field private final acF:Ljava/util/List;
+.field private final acX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,13 +37,13 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->acD:Lcom/google/android/gms/analytics/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->acV:Lcom/google/android/gms/analytics/m;
 
     new-instance p1, Ljava/util/ArrayList;
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->acF:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->acX:Ljava/util/List;
 
     new-instance p1, Lcom/google/android/gms/analytics/j;
 
@@ -51,9 +51,9 @@
 
     const/4 p2, 0x1
 
-    iput-boolean p2, p1, Lcom/google/android/gms/analytics/j;->acA:Z
+    iput-boolean p2, p1, Lcom/google/android/gms/analytics/j;->acS:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->acE:Lcom/google/android/gms/analytics/j;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->acW:Lcom/google/android/gms/analytics/j;
 
     return-void
 .end method
@@ -66,24 +66,24 @@
     return-void
 .end method
 
-.method public kO()Lcom/google/android/gms/analytics/j;
+.method public kM()Lcom/google/android/gms/analytics/j;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->acE:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->acW:Lcom/google/android/gms/analytics/j;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->kQ()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->kO()Lcom/google/android/gms/analytics/j;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/analytics/l;->kS()V
+    invoke-virtual {p0}, Lcom/google/android/gms/analytics/l;->kQ()V
 
     return-object v0
 .end method
 
-.method protected final kS()V
+.method protected final kQ()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->acF:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->acX:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/m$a.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/m$a.smali
index 0459ac4edb..768eb69a64 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/m$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/m$a.smali
@@ -14,14 +14,14 @@
 
 
 # instance fields
-.field final synthetic acN:Lcom/google/android/gms/analytics/m;
+.field final synthetic adg:Lcom/google/android/gms/analytics/m;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/analytics/m;)V
     .locals 7
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/m$a;->acN:Lcom/google/android/gms/analytics/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m$a;->adg:Lcom/google/android/gms/analytics/m;
 
     sget-object v5, Ljava/util/concurrent/TimeUnit;->MINUTES:Ljava/util/concurrent/TimeUnit;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/m$b.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/m$b.smali
index d74cce72d2..bdcd8b5da8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/m$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/m$b.smali
@@ -17,7 +17,7 @@
 
 
 # static fields
-.field private static final acO:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private static final adh:Ljava/util/concurrent/atomic/AtomicInteger;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/analytics/m$b;->acO:Ljava/util/concurrent/atomic/AtomicInteger;
+    sput-object v0, Lcom/google/android/gms/analytics/m$b;->adh:Ljava/util/concurrent/atomic/AtomicInteger;
 
     return-void
 .end method
@@ -54,7 +54,7 @@
 .method public final newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/analytics/m$b;->acO:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v0, Lcom/google/android/gms/analytics/m$b;->adh:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/m.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/m.smali
index 02b3efb068..8951661fb5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/m.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/m.smali
@@ -13,13 +13,13 @@
 
 
 # static fields
-.field private static volatile acG:Lcom/google/android/gms/analytics/m;
+.field private static volatile acY:Lcom/google/android/gms/analytics/m;
 
 
 # instance fields
-.field public final acH:Landroid/content/Context;
+.field public final acZ:Landroid/content/Context;
 
-.field private final acI:Ljava/util/List;
+.field private final ada:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,13 +29,13 @@
     .end annotation
 .end field
 
-.field private final acJ:Lcom/google/android/gms/analytics/h;
+.field private final adb:Lcom/google/android/gms/analytics/h;
 
-.field final acK:Lcom/google/android/gms/analytics/m$a;
+.field final adc:Lcom/google/android/gms/analytics/m$a;
 
-.field private volatile acL:Lcom/google/android/gms/internal/gtm/by;
+.field private volatile ade:Lcom/google/android/gms/internal/gtm/by;
 
-.field public acM:Ljava/lang/Thread$UncaughtExceptionHandler;
+.field public adf:Ljava/lang/Thread$UncaughtExceptionHandler;
 
 
 # direct methods
@@ -50,25 +50,25 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->acH:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->acZ:Landroid/content/Context;
 
     new-instance p1, Lcom/google/android/gms/analytics/m$a;
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/analytics/m$a;-><init>(Lcom/google/android/gms/analytics/m;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->acK:Lcom/google/android/gms/analytics/m$a;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->adc:Lcom/google/android/gms/analytics/m$a;
 
     new-instance p1, Ljava/util/concurrent/CopyOnWriteArrayList;
 
     invoke-direct {p1}, Ljava/util/concurrent/CopyOnWriteArrayList;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->acI:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->ada:Ljava/util/List;
 
     new-instance p1, Lcom/google/android/gms/analytics/h;
 
     invoke-direct {p1}, Lcom/google/android/gms/analytics/h;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->acJ:Lcom/google/android/gms/analytics/h;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->adb:Lcom/google/android/gms/analytics/h;
 
     return-void
 .end method
@@ -78,7 +78,7 @@
 
     invoke-static {p0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/google/android/gms/analytics/m;->acG:Lcom/google/android/gms/analytics/m;
+    sget-object v0, Lcom/google/android/gms/analytics/m;->acY:Lcom/google/android/gms/analytics/m;
 
     if-nez v0, :cond_1
 
@@ -87,7 +87,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/analytics/m;->acG:Lcom/google/android/gms/analytics/m;
+    sget-object v1, Lcom/google/android/gms/analytics/m;->acY:Lcom/google/android/gms/analytics/m;
 
     if-nez v1, :cond_0
 
@@ -95,7 +95,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/analytics/m;-><init>(Landroid/content/Context;)V
 
-    sput-object v1, Lcom/google/android/gms/analytics/m;->acG:Lcom/google/android/gms/analytics/m;
+    sput-object v1, Lcom/google/android/gms/analytics/m;->acY:Lcom/google/android/gms/analytics/m;
 
     :cond_0
     monitor-exit v0
@@ -113,7 +113,7 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/google/android/gms/analytics/m;->acG:Lcom/google/android/gms/analytics/m;
+    sget-object p0, Lcom/google/android/gms/analytics/m;->acY:Lcom/google/android/gms/analytics/m;
 
     return-object p0
 .end method
@@ -121,7 +121,7 @@
 .method static synthetic a(Lcom/google/android/gms/analytics/m;)Ljava/util/List;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/analytics/m;->acI:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/android/gms/analytics/m;->ada:Ljava/util/List;
 
     return-object p0
 .end method
@@ -129,7 +129,7 @@
 .method static synthetic b(Lcom/google/android/gms/analytics/m;)Ljava/lang/Thread$UncaughtExceptionHandler;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/analytics/m;->acM:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object p0, p0, Lcom/google/android/gms/analytics/m;->adf:Ljava/lang/Thread$UncaughtExceptionHandler;
 
     return-object p0
 .end method
@@ -139,15 +139,15 @@
 
     const-string v0, "deliver should be called from worker thread"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aX(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aS(Ljava/lang/String;)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/analytics/j;->acu:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/analytics/j;->acM:Z
 
     const-string v1, "Measurement must be submitted"
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->checkArgument(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->acC:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->acU:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -177,7 +177,7 @@
 
     check-cast v2, Lcom/google/android/gms/analytics/p;
 
-    invoke-interface {v2}, Lcom/google/android/gms/analytics/p;->kP()Landroid/net/Uri;
+    invoke-interface {v2}, Lcom/google/android/gms/analytics/p;->kN()Landroid/net/Uri;
 
     move-result-object v3
 
@@ -197,7 +197,7 @@
     return-void
 .end method
 
-.method public static kU()V
+.method public static kS()V
     .locals 2
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
@@ -255,7 +255,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->acK:Lcom/google/android/gms/analytics/m$a;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->adc:Lcom/google/android/gms/analytics/m$a;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/analytics/m$a;->submit(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Future;
 
@@ -269,24 +269,24 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->acK:Lcom/google/android/gms/analytics/m$a;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->adc:Lcom/google/android/gms/analytics/m$a;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/analytics/m$a;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
 
     return-void
 .end method
 
-.method public final kT()Lcom/google/android/gms/internal/gtm/by;
+.method public final kR()Lcom/google/android/gms/internal/gtm/by;
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->acL:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->ade:Lcom/google/android/gms/internal/gtm/by;
 
     if-nez v0, :cond_4
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->acL:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->ade:Lcom/google/android/gms/internal/gtm/by;
 
     if-nez v0, :cond_3
 
@@ -294,32 +294,32 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/gtm/by;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/m;->acH:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/m;->acZ:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/analytics/m;->acH:Landroid/content/Context;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/m;->acZ:Landroid/content/Context;
 
     invoke-virtual {v2}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
     move-result-object v2
 
-    iput-object v2, v0, Lcom/google/android/gms/internal/gtm/by;->apK:Ljava/lang/String;
+    iput-object v2, v0, Lcom/google/android/gms/internal/gtm/by;->aqc:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Landroid/content/pm/PackageManager;->getInstallerPackageName(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/google/android/gms/internal/gtm/by;->apL:Ljava/lang/String;
+    iput-object v3, v0, Lcom/google/android/gms/internal/gtm/by;->aqd:Ljava/lang/String;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     const/4 v3, 0x0
 
     :try_start_1
-    iget-object v4, p0, Lcom/google/android/gms/analytics/m;->acH:Landroid/content/Context;
+    iget-object v4, p0, Lcom/google/android/gms/analytics/m;->acZ:Landroid/content/Context;
 
     invoke-virtual {v4}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
@@ -393,11 +393,11 @@
 
     :cond_2
     :goto_1
-    iput-object v2, v0, Lcom/google/android/gms/internal/gtm/by;->apI:Ljava/lang/String;
+    iput-object v2, v0, Lcom/google/android/gms/internal/gtm/by;->aqa:Ljava/lang/String;
 
-    iput-object v3, v0, Lcom/google/android/gms/internal/gtm/by;->apJ:Ljava/lang/String;
+    iput-object v3, v0, Lcom/google/android/gms/internal/gtm/by;->aqb:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/m;->acL:Lcom/google/android/gms/internal/gtm/by;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/m;->ade:Lcom/google/android/gms/internal/gtm/by;
 
     :cond_3
     monitor-exit p0
@@ -415,7 +415,7 @@
 
     :cond_4
     :goto_2
-    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->acL:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->ade:Lcom/google/android/gms/internal/gtm/by;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/n.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/n.smali
index 06f4cd9a03..557d4a9df4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/n.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic acN:Lcom/google/android/gms/analytics/m;
+.field private final synthetic adg:Lcom/google/android/gms/analytics/m;
 
-.field private final synthetic acP:Lcom/google/android/gms/analytics/j;
+.field private final synthetic adi:Lcom/google/android/gms/analytics/j;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/analytics/m;Lcom/google/android/gms/analytics/j;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/n;->acN:Lcom/google/android/gms/analytics/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/n;->adg:Lcom/google/android/gms/analytics/m;
 
-    iput-object p2, p0, Lcom/google/android/gms/analytics/n;->acP:Lcom/google/android/gms/analytics/j;
+    iput-object p2, p0, Lcom/google/android/gms/analytics/n;->adi:Lcom/google/android/gms/analytics/j;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,15 +29,15 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/n;->acP:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/n;->adi:Lcom/google/android/gms/analytics/j;
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/j;->acs:Lcom/google/android/gms/analytics/l;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/j;->acK:Lcom/google/android/gms/analytics/l;
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/n;->acP:Lcom/google/android/gms/analytics/j;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/n;->adi:Lcom/google/android/gms/analytics/j;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/analytics/l;->a(Lcom/google/android/gms/analytics/j;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/n;->acN:Lcom/google/android/gms/analytics/m;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/n;->adg:Lcom/google/android/gms/analytics/m;
 
     invoke-static {v0}, Lcom/google/android/gms/analytics/m;->a(Lcom/google/android/gms/analytics/m;)Ljava/util/List;
 
@@ -59,7 +59,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/analytics/n;->acP:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/n;->adi:Lcom/google/android/gms/analytics/j;
 
     invoke-static {v0}, Lcom/google/android/gms/analytics/m;->d(Lcom/google/android/gms/analytics/j;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/o.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/o.smali
index b71399f434..66f47b3008 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/o.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/o.smali
@@ -12,14 +12,14 @@
 
 
 # instance fields
-.field private final synthetic acQ:Lcom/google/android/gms/analytics/m$a;
+.field private final synthetic adj:Lcom/google/android/gms/analytics/m$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/analytics/m$a;Ljava/lang/Runnable;Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/o;->acQ:Lcom/google/android/gms/analytics/m$a;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/o;->adj:Lcom/google/android/gms/analytics/m$a;
 
     invoke-direct {p0, p2, p3}, Ljava/util/concurrent/FutureTask;-><init>(Ljava/lang/Runnable;Ljava/lang/Object;)V
 
@@ -31,9 +31,9 @@
 .method protected final setException(Ljava/lang/Throwable;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/o;->acQ:Lcom/google/android/gms/analytics/m$a;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/o;->adj:Lcom/google/android/gms/analytics/m$a;
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/m$a;->acN:Lcom/google/android/gms/analytics/m;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/m$a;->adg:Lcom/google/android/gms/analytics/m;
 
     invoke-static {v0}, Lcom/google/android/gms/analytics/m;->b(Lcom/google/android/gms/analytics/m;)Ljava/lang/Thread$UncaughtExceptionHandler;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/p.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/p.smali
index 3c69a7afdd..8b80dc6e86 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/p.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/p.smali
@@ -6,5 +6,5 @@
 .method public abstract b(Lcom/google/android/gms/analytics/j;)V
 .end method
 
-.method public abstract kP()Landroid/net/Uri;
+.method public abstract kN()Landroid/net/Uri;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/appinvite/a.smali b/com.discord/smali_classes2/com/google/android/gms/appinvite/a.smali
index e3a2b755c2..2921c9ce4c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/appinvite/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/appinvite/a.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic acR:Lcom/google/android/gms/appinvite/PreviewActivity;
+.field private final synthetic adk:Lcom/google/android/gms/appinvite/PreviewActivity;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/appinvite/PreviewActivity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/appinvite/a;->acR:Lcom/google/android/gms/appinvite/PreviewActivity;
+    iput-object p1, p0, Lcom/google/android/gms/appinvite/a;->adk:Lcom/google/android/gms/appinvite/PreviewActivity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,7 +25,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/gms/appinvite/a;->acR:Lcom/google/android/gms/appinvite/PreviewActivity;
+    iget-object p1, p0, Lcom/google/android/gms/appinvite/a;->adk:Lcom/google/android/gms/appinvite/PreviewActivity;
 
     invoke-virtual {p1}, Lcom/google/android/gms/appinvite/PreviewActivity;->finish()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/auth/api/signin/GoogleSignInAccount.smali b/com.discord/smali_classes2/com/google/android/gms/auth/api/signin/GoogleSignInAccount.smali
index fa6a68048c..a0076dd7cf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/auth/api/signin/GoogleSignInAccount.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/auth/api/signin/GoogleSignInAccount.smali
@@ -16,25 +16,25 @@
     .end annotation
 .end field
 
-.field private static acS:Lcom/google/android/gms/common/util/e;
+.field private static adl:Lcom/google/android/gms/common/util/e;
 
 
 # instance fields
-.field private acT:Ljava/lang/String;
+.field private adm:Ljava/lang/String;
 
-.field public acU:Ljava/lang/String;
+.field public adn:Ljava/lang/String;
 
-.field private acV:Ljava/lang/String;
+.field private ado:Ljava/lang/String;
 
-.field private acW:Landroid/net/Uri;
+.field private adp:Landroid/net/Uri;
 
-.field private acX:Ljava/lang/String;
+.field private adq:Ljava/lang/String;
 
-.field private acY:J
+.field private adr:J
 
-.field private acZ:Ljava/lang/String;
+.field private ads:Ljava/lang/String;
 
-.field private ada:Ljava/util/List;
+.field private adt:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -44,11 +44,11 @@
     .end annotation
 .end field
 
-.field private adb:Ljava/lang/String;
+.field private adu:Ljava/lang/String;
 
-.field private adc:Ljava/lang/String;
+.field private adv:Ljava/lang/String;
 
-.field private ade:Ljava/util/Set;
+.field private adw:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -73,11 +73,11 @@
 
     sput-object v0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->CREATOR:Landroid/os/Parcelable$Creator;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->mr()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->mp()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acS:Lcom/google/android/gms/common/util/e;
+    sput-object v0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adl:Lcom/google/android/gms/common/util/e;
 
     return-void
 .end method
@@ -110,36 +110,36 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->ade:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adw:Ljava/util/Set;
 
     iput p1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->versionCode:I
 
     iput-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->mId:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acT:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adm:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acU:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adn:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acV:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->ado:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acW:Landroid/net/Uri;
+    iput-object p6, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adp:Landroid/net/Uri;
 
-    iput-object p7, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acX:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adq:Ljava/lang/String;
 
-    iput-wide p8, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acY:J
+    iput-wide p8, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adr:J
 
-    iput-object p10, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acZ:Ljava/lang/String;
+    iput-object p10, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->ads:Ljava/lang/String;
 
-    iput-object p11, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->ada:Ljava/util/List;
+    iput-object p11, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adt:Ljava/util/List;
 
-    iput-object p12, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adb:Ljava/lang/String;
+    iput-object p12, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adu:Ljava/lang/String;
 
-    iput-object p13, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adc:Ljava/lang/String;
+    iput-object p13, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adv:Ljava/lang/String;
 
     return-void
 .end method
 
-.method public static aO(Ljava/lang/String;)Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+.method public static aJ(Ljava/lang/String;)Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
     .locals 18
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -280,7 +280,7 @@
 
     if-nez v2, :cond_3
 
-    sget-object v2, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acS:Lcom/google/android/gms/common/util/e;
+    sget-object v2, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adl:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
@@ -305,7 +305,7 @@
 
     move-result-wide v12
 
-    invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -343,7 +343,7 @@
 
     move-result-object v0
 
-    iput-object v0, v2, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acX:Ljava/lang/String;
+    iput-object v0, v2, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adq:Ljava/lang/String;
 
     return-object v2
 .end method
@@ -371,9 +371,9 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
 
-    iget-object v1, p1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acZ:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->ads:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acZ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->ads:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -381,11 +381,11 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kV()Ljava/util/Set;
+    invoke-virtual {p1}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kT()Ljava/util/Set;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kV()Ljava/util/Set;
+    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kT()Ljava/util/Set;
 
     move-result-object v1
 
@@ -404,7 +404,7 @@
 .method public hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acZ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->ads:Ljava/lang/String;
 
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
@@ -414,7 +414,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kV()Ljava/util/Set;
+    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kT()Ljava/util/Set;
 
     move-result-object v1
 
@@ -427,7 +427,7 @@
     return v0
 .end method
 
-.method public final kV()Ljava/util/Set;
+.method public final kT()Ljava/util/Set;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -440,11 +440,11 @@
 
     new-instance v0, Ljava/util/HashSet;
 
-    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->ada:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adt:Ljava/util/List;
 
     invoke-direct {v0, v1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->ade:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adw:Ljava/util/Set;
 
     invoke-interface {v0, v1}, Ljava/util/Set;->addAll(Ljava/util/Collection;)Z
 
@@ -472,61 +472,61 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acT:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adm:Ljava/lang/String;
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acU:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adn:Ljava/lang/String;
 
     const/4 v2, 0x4
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->ado:Ljava/lang/String;
 
     const/4 v2, 0x5
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acW:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adp:Landroid/net/Uri;
 
     const/4 v2, 0x6
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acX:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adq:Ljava/lang/String;
 
     const/4 v1, 0x7
 
     invoke-static {p1, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-wide v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acY:J
+    iget-wide v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adr:J
 
     const/16 p2, 0x8
 
     invoke-static {p1, p2, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acZ:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->ads:Ljava/lang/String;
 
     const/16 v1, 0x9
 
     invoke-static {p1, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->ada:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adt:Ljava/util/List;
 
     const/16 v1, 0xa
 
     invoke-static {p1, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->b(Landroid/os/Parcel;ILjava/util/List;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adb:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adu:Ljava/lang/String;
 
     const/16 v1, 0xb
 
     invoke-static {p1, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adc:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adv:Ljava/lang/String;
 
     const/16 v1, 0xc
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/b/a.smali b/com.discord/smali_classes2/com/google/android/gms/b/a.smali
index e2d24aabdd..0fbfdfc3b0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/b/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/b/a.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field private static final aOu:Lcom/google/android/gms/common/c;
+.field private static final aOM:Lcom/google/android/gms/common/c;
 
-.field private static aOv:Ljava/lang/reflect/Method;
+.field private static aON:Ljava/lang/reflect/Method;
 
 .field private static final lock:Ljava/lang/Object;
 
@@ -14,11 +14,11 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lb()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kZ()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/b/a;->aOu:Lcom/google/android/gms/common/c;
+    sput-object v0, Lcom/google/android/gms/b/a;->aOM:Lcom/google/android/gms/common/c;
 
     new-instance v0, Ljava/lang/Object;
 
@@ -28,7 +28,7 @@
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/google/android/gms/b/a;->aOv:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/b/a;->aON:Ljava/lang/reflect/Method;
 
     return-void
 .end method
@@ -68,7 +68,7 @@
     monitor-enter v2
 
     :try_start_0
-    sget-object v3, Lcom/google/android/gms/b/a;->aOv:Ljava/lang/reflect/Method;
+    sget-object v3, Lcom/google/android/gms/b/a;->aON:Ljava/lang/reflect/Method;
 
     const/4 v4, 0x0
 
@@ -98,10 +98,10 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/b/a;->aOv:Ljava/lang/reflect/Method;
+    sput-object v3, Lcom/google/android/gms/b/a;->aON:Ljava/lang/reflect/Method;
 
     :cond_1
-    sget-object v3, Lcom/google/android/gms/b/a;->aOv:Ljava/lang/reflect/Method;
+    sget-object v3, Lcom/google/android/gms/b/a;->aON:Ljava/lang/reflect/Method;
 
     const/4 v6, 0x0
 
@@ -225,7 +225,7 @@
     .locals 2
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alg:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sget-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alz:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     const-string v1, "providerinstaller"
 
@@ -233,7 +233,7 @@
 
     move-result-object p0
 
-    iget-object p0, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->alj:Landroid/content/Context;
+    iget-object p0, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->alC:Landroid/content/Context;
     :try_end_0
     .catch Lcom/google/android/gms/dynamite/DynamiteModule$a; {:try_start_0 .. :try_end_0} :catch_0
 
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 8ee40cb389..ec8711fa92 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
@@ -15,47 +15,47 @@
 
 
 # static fields
-.field public static final common_full_open_on_phone:I = 0x7f08009f
+.field public static final common_full_open_on_phone:I = 0x7f0800a2
 
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a0
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a3
 
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a1
+.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a4
 
-.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a2
+.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a5
 
-.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a3
+.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a6
 
-.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a4
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a7
 
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a5
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a8
 
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a6
+.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a9
 
-.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800a7
+.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800aa
 
-.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800a8
+.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800ab
 
-.field public static final common_google_signin_btn_text_dark:I = 0x7f0800a9
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ac
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800aa
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ad
 
-.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ab
+.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ae
 
-.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800ac
+.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800af
 
-.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800ad
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800b0
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800ae
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800b1
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800af
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b2
 
-.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b0
+.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b3
 
-.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b1
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b4
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801ac
+.field public static final googleg_disabled_color_18:I = 0x7f0801bb
 
-.field public static final googleg_standard_color_18:I = 0x7f0801ad
+.field public static final googleg_standard_color_18:I = 0x7f0801bc
 
 
 # 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 f4d1feb382..0ee48328b7 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
@@ -15,39 +15,39 @@
 
 
 # static fields
-.field public static final common_google_play_services_enable_button:I = 0x7f1203f6
+.field public static final common_google_play_services_enable_button:I = 0x7f1203fd
 
-.field public static final common_google_play_services_enable_text:I = 0x7f1203f7
+.field public static final common_google_play_services_enable_text:I = 0x7f1203fe
 
-.field public static final common_google_play_services_enable_title:I = 0x7f1203f8
+.field public static final common_google_play_services_enable_title:I = 0x7f1203ff
 
-.field public static final common_google_play_services_install_button:I = 0x7f1203f9
+.field public static final common_google_play_services_install_button:I = 0x7f120400
 
-.field public static final common_google_play_services_install_text:I = 0x7f1203fa
+.field public static final common_google_play_services_install_text:I = 0x7f120401
 
-.field public static final common_google_play_services_install_title:I = 0x7f1203fb
+.field public static final common_google_play_services_install_title:I = 0x7f120402
 
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203fc
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120403
 
-.field public static final common_google_play_services_notification_ticker:I = 0x7f1203fd
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120404
 
-.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ff
+.field public static final common_google_play_services_unsupported_text:I = 0x7f120406
 
-.field public static final common_google_play_services_update_button:I = 0x7f120400
+.field public static final common_google_play_services_update_button:I = 0x7f120407
 
-.field public static final common_google_play_services_update_text:I = 0x7f120401
+.field public static final common_google_play_services_update_text:I = 0x7f120408
 
-.field public static final common_google_play_services_update_title:I = 0x7f120402
+.field public static final common_google_play_services_update_title:I = 0x7f120409
 
-.field public static final common_google_play_services_updating_text:I = 0x7f120403
+.field public static final common_google_play_services_updating_text:I = 0x7f12040a
 
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120404
+.field public static final common_google_play_services_wear_update_text:I = 0x7f12040b
 
-.field public static final common_open_on_phone:I = 0x7f120405
+.field public static final common_open_on_phone:I = 0x7f12040c
 
-.field public static final common_signin_button_text:I = 0x7f120406
+.field public static final common_signin_button_text:I = 0x7f12040d
 
-.field public static final common_signin_button_text_long:I = 0x7f120407
+.field public static final common_signin_button_text_long:I = 0x7f12040e
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/ConnectionResult.smali b/com.discord/smali_classes2/com/google/android/gms/common/ConnectionResult.smali
index 9d9001a477..ab050d1008 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/ConnectionResult.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/ConnectionResult.smali
@@ -13,17 +13,17 @@
     .end annotation
 .end field
 
-.field public static final adl:Lcom/google/android/gms/common/ConnectionResult;
+.field public static final adD:Lcom/google/android/gms/common/ConnectionResult;
 
 
 # instance fields
-.field private final adm:I
+.field private final adE:I
 
-.field public final adn:I
+.field public final adF:I
 
-.field public final ado:Landroid/app/PendingIntent;
+.field public final adG:Landroid/app/PendingIntent;
 
-.field public final adp:Ljava/lang/String;
+.field public final adH:Ljava/lang/String;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/common/ConnectionResult;-><init>(I)V
 
-    sput-object v0, Lcom/google/android/gms/common/ConnectionResult;->adl:Lcom/google/android/gms/common/ConnectionResult;
+    sput-object v0, Lcom/google/android/gms/common/ConnectionResult;->adD:Lcom/google/android/gms/common/ConnectionResult;
 
     new-instance v0, Lcom/google/android/gms/common/j;
 
@@ -64,13 +64,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/common/ConnectionResult;->adm:I
+    iput p1, p0, Lcom/google/android/gms/common/ConnectionResult;->adE:I
 
-    iput p2, p0, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iput p2, p0, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
-    iput-object p3, p0, Lcom/google/android/gms/common/ConnectionResult;->ado:Landroid/app/PendingIntent;
+    iput-object p3, p0, Lcom/google/android/gms/common/ConnectionResult;->adG:Landroid/app/PendingIntent;
 
-    iput-object p4, p0, Lcom/google/android/gms/common/ConnectionResult;->adp:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/common/ConnectionResult;->adH:Ljava/lang/String;
 
     return-void
 .end method
@@ -310,15 +310,15 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/common/ConnectionResult;
 
-    iget v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
-    iget v3, p1, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v3, p1, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->ado:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adG:Landroid/app/PendingIntent;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/ConnectionResult;->ado:Landroid/app/PendingIntent;
+    iget-object v3, p1, Lcom/google/android/gms/common/ConnectionResult;->adG:Landroid/app/PendingIntent;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -326,9 +326,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adH:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/ConnectionResult;->adp:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/common/ConnectionResult;->adH:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -349,7 +349,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -359,13 +359,13 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->ado:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adG:Landroid/app/PendingIntent;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adH:Ljava/lang/String;
 
     const/4 v2, 0x2
 
@@ -378,14 +378,14 @@
     return v0
 .end method
 
-.method public final kW()Z
+.method public final kU()Z
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v0, p0, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/ConnectionResult;->ado:Landroid/app/PendingIntent;
+    iget-object v0, p0, Lcom/google/android/gms/common/ConnectionResult;->adG:Landroid/app/PendingIntent;
 
     if-eqz v0, :cond_0
 
@@ -399,10 +399,10 @@
     return v0
 .end method
 
-.method public final kX()Z
+.method public final kV()Z
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v0, p0, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     if-nez v0, :cond_0
 
@@ -423,7 +423,7 @@
 
     move-result-object v0
 
-    iget v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     invoke-static {v1}, Lcom/google/android/gms/common/ConnectionResult;->bb(I)Ljava/lang/String;
 
@@ -435,7 +435,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->ado:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adG:Landroid/app/PendingIntent;
 
     const-string v2, "resolution"
 
@@ -443,7 +443,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adH:Ljava/lang/String;
 
     const-string v2, "message"
 
@@ -467,25 +467,25 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adm:I
+    iget v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adE:I
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->ado:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->adG:Landroid/app/PendingIntent;
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object p2, p0, Lcom/google/android/gms/common/ConnectionResult;->adp:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/common/ConnectionResult;->adH:Ljava/lang/String;
 
     const/4 v1, 0x4
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/Feature.smali b/com.discord/smali_classes2/com/google/android/gms/common/Feature.smali
index 0b9b685346..46788037b9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/Feature.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/Feature.smali
@@ -15,12 +15,12 @@
 
 
 # instance fields
-.field private final adr:I
+.field private final adJ:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final ads:J
+.field private final adK:J
 
 .field public final name:Ljava/lang/String;
 
@@ -45,9 +45,9 @@
 
     iput-object p1, p0, Lcom/google/android/gms/common/Feature;->name:Ljava/lang/String;
 
-    iput p2, p0, Lcom/google/android/gms/common/Feature;->adr:I
+    iput p2, p0, Lcom/google/android/gms/common/Feature;->adJ:I
 
-    iput-wide p3, p0, Lcom/google/android/gms/common/Feature;->ads:J
+    iput-wide p3, p0, Lcom/google/android/gms/common/Feature;->adK:J
 
     return-void
 .end method
@@ -87,11 +87,11 @@
     if-nez v0, :cond_2
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kY()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kW()J
 
     move-result-wide v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/Feature;->kY()J
+    invoke-virtual {p1}, Lcom/google/android/gms/common/Feature;->kW()J
 
     move-result-wide v4
 
@@ -120,7 +120,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kY()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kW()J
 
     move-result-wide v1
 
@@ -139,10 +139,10 @@
     return v0
 .end method
 
-.method public final kY()J
+.method public final kW()J
     .locals 5
 
-    iget-wide v0, p0, Lcom/google/android/gms/common/Feature;->ads:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/Feature;->adK:J
 
     const-wide/16 v2, -0x1
 
@@ -150,7 +150,7 @@
 
     if-nez v4, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/common/Feature;->adr:I
+    iget v0, p0, Lcom/google/android/gms/common/Feature;->adJ:I
 
     int-to-long v0, v0
 
@@ -173,7 +173,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kY()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kW()J
 
     move-result-wide v1
 
@@ -209,13 +209,13 @@
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget v0, p0, Lcom/google/android/gms/common/Feature;->adr:I
+    iget v0, p0, Lcom/google/android/gms/common/Feature;->adJ:I
 
     const/4 v1, 0x2
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kY()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->kW()J
 
     move-result-wide v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/GoogleApiAvailability$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/GoogleApiAvailability$a.smali
index 53f0a8ad45..52aa063bda 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/GoogleApiAvailability$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/GoogleApiAvailability$a.smali
@@ -14,16 +14,16 @@
 
 
 # instance fields
-.field private final adv:Landroid/content/Context;
+.field private final adN:Landroid/content/Context;
 
-.field private final synthetic adw:Lcom/google/android/gms/common/GoogleApiAvailability;
+.field private final synthetic adO:Lcom/google/android/gms/common/GoogleApiAvailability;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/common/GoogleApiAvailability;Landroid/content/Context;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adw:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iput-object p1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adO:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     invoke-static {}, Landroid/os/Looper;->myLooper()Landroid/os/Looper;
 
@@ -49,7 +49,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adv:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adN:Landroid/content/Context;
 
     return-void
 .end method
@@ -90,15 +90,15 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adw:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object p1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adO:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adv:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adN:Landroid/content/Context;
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/common/GoogleApiAvailability;->isGooglePlayServicesAvailable(Landroid/content/Context;)I
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adw:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adO:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/GoogleApiAvailability;->bc(I)Z
 
@@ -106,9 +106,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adw:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adO:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adv:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->adN:Landroid/content/Context;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/android/gms/common/GoogleApiAvailability;->e(Landroid/content/Context;I)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/GoogleApiAvailability.smali b/com.discord/smali_classes2/com/google/android/gms/common/GoogleApiAvailability.smali
index b3681bedbb..3f6f1937f6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/GoogleApiAvailability.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/GoogleApiAvailability.smali
@@ -13,13 +13,13 @@
 # static fields
 .field public static final GOOGLE_PLAY_SERVICES_VERSION_CODE:I
 
-.field private static final adt:Lcom/google/android/gms/common/GoogleApiAvailability;
+.field private static final adL:Lcom/google/android/gms/common/GoogleApiAvailability;
 
 .field private static final mLock:Ljava/lang/Object;
 
 
 # instance fields
-.field private adu:Ljava/lang/String;
+.field private adM:Ljava/lang/String;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/GoogleApiAvailability;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/GoogleApiAvailability;->adt:Lcom/google/android/gms/common/GoogleApiAvailability;
+    sput-object v0, Lcom/google/android/gms/common/GoogleApiAvailability;->adL:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     sget v0, Lcom/google/android/gms/common/c;->GOOGLE_PLAY_SERVICES_VERSION_CODE:I
 
@@ -314,7 +314,7 @@
 
     if-eqz v4, :cond_4
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->mt()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->mr()Z
 
     move-result v1
 
@@ -399,7 +399,7 @@
 
     invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->checkState(Z)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/GoogleApiAvailability;->la()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/GoogleApiAvailability;->kY()Ljava/lang/String;
 
     move-result-object p3
 
@@ -478,15 +478,15 @@
     return-void
 .end method
 
-.method public static kZ()Lcom/google/android/gms/common/GoogleApiAvailability;
+.method public static kX()Lcom/google/android/gms/common/GoogleApiAvailability;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/GoogleApiAvailability;->adt:Lcom/google/android/gms/common/GoogleApiAvailability;
+    sget-object v0, Lcom/google/android/gms/common/GoogleApiAvailability;->adL:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     return-object v0
 .end method
 
-.method private final la()Ljava/lang/String;
+.method private final kY()Ljava/lang/String;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/common/GoogleApiAvailability;->mLock:Ljava/lang/Object;
@@ -494,7 +494,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/GoogleApiAvailability;->adu:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/GoogleApiAvailability;->adM:Ljava/lang/String;
 
     monitor-exit v0
 
@@ -594,7 +594,7 @@
 .method public final a(Landroid/content/Context;Lcom/google/android/gms/common/ConnectionResult;I)Z
     .locals 2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/common/ConnectionResult;->kW()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/common/ConnectionResult;->kU()Z
 
     move-result v0
 
@@ -602,12 +602,12 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p2, Lcom/google/android/gms/common/ConnectionResult;->ado:Landroid/app/PendingIntent;
+    iget-object v0, p2, Lcom/google/android/gms/common/ConnectionResult;->adG:Landroid/app/PendingIntent;
 
     goto :goto_0
 
     :cond_0
-    iget v0, p2, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v0, p2, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     invoke-super {p0, p1, v0, v1}, Lcom/google/android/gms/common/c;->b(Landroid/content/Context;II)Landroid/app/PendingIntent;
 
@@ -616,7 +616,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget p2, p2, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget p2, p2, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     invoke-static {p1, v0, p3}, Lcom/google/android/gms/common/api/GoogleApiActivity;->a(Landroid/content/Context;Landroid/app/PendingIntent;I)Landroid/app/PendingIntent;
 
@@ -642,59 +642,6 @@
     return-object p1
 .end method
 
-.method public final b(Landroid/app/Activity;)Lcom/google/android/gms/tasks/Task;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Landroid/app/Activity;",
-            ")",
-            "Lcom/google/android/gms/tasks/Task<",
-            "Ljava/lang/Void;",
-            ">;"
-        }
-    .end annotation
-
-    sget v0, Lcom/google/android/gms/common/GoogleApiAvailability;->GOOGLE_PLAY_SERVICES_VERSION_CODE:I
-
-    const-string v1, "makeGooglePlayServicesAvailable must be called from the main thread"
-
-    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aW(Ljava/lang/String;)V
-
-    invoke-super {p0, p1, v0}, Lcom/google/android/gms/common/c;->isGooglePlayServicesAvailable(Landroid/content/Context;I)I
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    invoke-static {v1}, Lcom/google/android/gms/tasks/j;->aH(Ljava/lang/Object;)Lcom/google/android/gms/tasks/Task;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    invoke-static {p1}, Lcom/google/android/gms/common/api/internal/ad;->d(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/ad;
-
-    move-result-object p1
-
-    new-instance v2, Lcom/google/android/gms/common/ConnectionResult;
-
-    invoke-direct {v2, v0, v1}, Lcom/google/android/gms/common/ConnectionResult;-><init>(ILandroid/app/PendingIntent;)V
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/common/api/internal/ay;->c(Lcom/google/android/gms/common/ConnectionResult;I)V
-
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/ad;->afI:Lcom/google/android/gms/tasks/h;
-
-    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
-
-    return-object p1
-.end method
-
 .method public final b(Landroid/app/Activity;IILandroid/content/DialogInterface$OnCancelListener;)Z
     .locals 0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/GooglePlayServicesUtil.smali b/com.discord/smali_classes2/com/google/android/gms/common/GooglePlayServicesUtil.smali
index 5de3d85ef8..c8e4644ffc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/GooglePlayServicesUtil.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/GooglePlayServicesUtil.smali
@@ -65,7 +65,7 @@
     const/16 p0, 0x12
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kZ()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kX()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v0
 
@@ -196,7 +196,7 @@
     const/16 p0, 0x12
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kZ()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kX()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v0
 
@@ -209,7 +209,7 @@
     return p0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kZ()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kX()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v0
 
@@ -248,7 +248,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kZ()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kX()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v0
 
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 bc7545a80c..5d6780f760 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
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final common_google_play_services_unknown_issue:I = 0x7f1203fe
+.field public static final common_google_play_services_unknown_issue:I = 0x7f120405
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/a.smali b/com.discord/smali_classes2/com/google/android/gms/common/a.smali
index f13768ba5a..804bebb5c1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/a.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field public adj:Z
+.field public adB:Z
 
-.field public final adk:Ljava/util/concurrent/BlockingQueue;
+.field public final adC:Ljava/util/concurrent/BlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/BlockingQueue<",
@@ -27,13 +27,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/a;->adj:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/a;->adB:Z
 
     new-instance v0, Ljava/util/concurrent/LinkedBlockingQueue;
 
     invoke-direct {v0}, Ljava/util/concurrent/LinkedBlockingQueue;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/a;->adk:Ljava/util/concurrent/BlockingQueue;
+    iput-object v0, p0, Lcom/google/android/gms/common/a;->adC:Ljava/util/concurrent/BlockingQueue;
 
     return-void
 .end method
@@ -43,7 +43,7 @@
 .method public final onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/a;->adk:Ljava/util/concurrent/BlockingQueue;
+    iget-object p1, p0, Lcom/google/android/gms/common/a;->adC:Ljava/util/concurrent/BlockingQueue;
 
     invoke-interface {p1, p2}, Ljava/util/concurrent/BlockingQueue;->add(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/a/a.smali b/com.discord/smali_classes2/com/google/android/gms/common/a/a.smali
index 373a4a025c..c02ebc4096 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/a/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/a/a.smali
@@ -20,15 +20,15 @@
 
 
 # static fields
-.field private static agL:Lcom/google/android/gms/common/a/a$a;
+.field private static ahd:Lcom/google/android/gms/common/a/a$a;
 
-.field private static agM:I
+.field private static ahe:I
 
 .field private static final sLock:Ljava/lang/Object;
 
 
 # instance fields
-.field protected final agN:Ljava/lang/Object;
+.field protected final ahf:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private agO:Ljava/lang/Object;
+.field private ahg:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -59,11 +59,11 @@
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/google/android/gms/common/a/a;->agL:Lcom/google/android/gms/common/a/a$a;
+    sput-object v0, Lcom/google/android/gms/common/a/a;->ahd:Lcom/google/android/gms/common/a/a$a;
 
     const/4 v0, 0x0
 
-    sput v0, Lcom/google/android/gms/common/a/a;->agM:I
+    sput v0, Lcom/google/android/gms/common/a/a;->ahe:I
 
     return-void
 .end method
@@ -82,11 +82,11 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/a/a;->agO:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/a/a;->ahg:Ljava/lang/Object;
 
     iput-object p1, p0, Lcom/google/android/gms/common/a/a;->mKey:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/a/a;->agN:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/common/a/a;->ahf:Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/GoogleApiActivity.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/GoogleApiActivity.smali
index 87479714a3..3d15ec23d5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/GoogleApiActivity.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/GoogleApiActivity.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private adN:I
+.field private aeg:I
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->adN:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->aeg:I
 
     return-void
 .end method
@@ -89,7 +89,7 @@
 
     move-result p1
 
-    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->adN:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->aeg:I
 
     invoke-virtual {p0, p2, p3}, Lcom/google/android/gms/common/api/GoogleApiActivity;->setResult(ILandroid/content/Intent;)V
 
@@ -131,7 +131,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d;->lw()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d;->lu()V
 
     goto :goto_0
 
@@ -140,7 +140,7 @@
 
     if-ne p1, v1, :cond_3
 
-    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->adN:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->aeg:I
 
     invoke-virtual {p0, p2, p3}, Lcom/google/android/gms/common/api/GoogleApiActivity;->setResult(ILandroid/content/Intent;)V
 
@@ -156,7 +156,7 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->adN:I
+    iput p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->aeg:I
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/common/api/GoogleApiActivity;->setResult(I)V
 
@@ -178,10 +178,10 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->adN:I
+    iput p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->aeg:I
 
     :cond_0
-    iget p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->adN:I
+    iget p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->aeg:I
 
     const/4 v0, 0x1
 
@@ -258,7 +258,7 @@
 
     invoke-virtual/range {v2 .. v8}, Lcom/google/android/gms/common/api/GoogleApiActivity;->startIntentSenderForResult(Landroid/content/IntentSender;ILandroid/content/Intent;III)V
 
-    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->adN:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->aeg:I
     :try_end_0
     .catch Landroid/content/IntentSender$SendIntentException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -276,7 +276,7 @@
     return-void
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kZ()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kX()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v1
 
@@ -288,7 +288,7 @@
 
     invoke-virtual {v1, p0, p1, v2, p0}, Lcom/google/android/gms/common/GoogleApiAvailability;->b(Landroid/app/Activity;IILandroid/content/DialogInterface$OnCancelListener;)Z
 
-    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->adN:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->aeg:I
 
     :cond_4
     return-void
@@ -297,7 +297,7 @@
 .method protected onSaveInstanceState(Landroid/os/Bundle;)V
     .locals 2
 
-    iget v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->adN:I
+    iget v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->aeg:I
 
     const-string v1, "resolution"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/Scope.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/Scope.smali
index a240132082..a79ff1e508 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/Scope.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/Scope.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field private final adQ:Ljava/lang/String;
+.field private final adE:I
 
-.field private final adm:I
+.field private final aej:Ljava/lang/String;
 
 
 # direct methods
@@ -45,9 +45,9 @@
 
     invoke-static {p2, v0}, Lcom/google/android/gms/common/internal/r;->i(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
 
-    iput p1, p0, Lcom/google/android/gms/common/api/Scope;->adm:I
+    iput p1, p0, Lcom/google/android/gms/common/api/Scope;->adE:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/Scope;->adQ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/Scope;->aej:Ljava/lang/String;
 
     return-void
 .end method
@@ -83,11 +83,11 @@
     return p1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->adQ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->aej:Ljava/lang/String;
 
     check-cast p1, Lcom/google/android/gms/common/api/Scope;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/Scope;->adQ:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/Scope;->aej:Ljava/lang/String;
 
     invoke-virtual {v0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -99,7 +99,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->adQ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->aej:Ljava/lang/String;
 
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
@@ -111,7 +111,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->adQ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->aej:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -125,13 +125,13 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/common/api/Scope;->adm:I
+    iget v0, p0, Lcom/google/android/gms/common/api/Scope;->adE:I
 
     const/4 v1, 0x1
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->adQ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->aej:Ljava/lang/String;
 
     const/4 v1, 0x2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/Status.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/Status.smali
index d0440ebe32..c52cbca590 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/Status.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/Status.smali
@@ -17,29 +17,29 @@
     .end annotation
 .end field
 
-.field public static final adR:Lcom/google/android/gms/common/api/Status;
+.field public static final aek:Lcom/google/android/gms/common/api/Status;
 
-.field public static final adS:Lcom/google/android/gms/common/api/Status;
+.field public static final ael:Lcom/google/android/gms/common/api/Status;
 
-.field public static final adT:Lcom/google/android/gms/common/api/Status;
+.field public static final aem:Lcom/google/android/gms/common/api/Status;
 
-.field public static final adU:Lcom/google/android/gms/common/api/Status;
+.field public static final aen:Lcom/google/android/gms/common/api/Status;
 
-.field public static final adV:Lcom/google/android/gms/common/api/Status;
+.field public static final aeo:Lcom/google/android/gms/common/api/Status;
 
-.field private static final adW:Lcom/google/android/gms/common/api/Status;
+.field private static final aep:Lcom/google/android/gms/common/api/Status;
 
-.field public static final adX:Lcom/google/android/gms/common/api/Status;
+.field public static final aeq:Lcom/google/android/gms/common/api/Status;
 
 
 # instance fields
-.field private final adm:I
+.field private final adE:I
 
-.field public final adn:I
+.field public final adF:I
 
-.field private final ado:Landroid/app/PendingIntent;
+.field private final adG:Landroid/app/PendingIntent;
 
-.field public final adp:Ljava/lang/String;
+.field public final adH:Ljava/lang/String;
 
 
 # direct methods
@@ -52,7 +52,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/common/api/Status;-><init>(I)V
 
-    sput-object v0, Lcom/google/android/gms/common/api/Status;->adR:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->aek:Lcom/google/android/gms/common/api/Status;
 
     new-instance v0, Lcom/google/android/gms/common/api/Status;
 
@@ -60,7 +60,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/common/api/Status;-><init>(I)V
 
-    sput-object v0, Lcom/google/android/gms/common/api/Status;->adS:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->ael:Lcom/google/android/gms/common/api/Status;
 
     new-instance v0, Lcom/google/android/gms/common/api/Status;
 
@@ -68,7 +68,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/common/api/Status;-><init>(I)V
 
-    sput-object v0, Lcom/google/android/gms/common/api/Status;->adT:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->aem:Lcom/google/android/gms/common/api/Status;
 
     new-instance v0, Lcom/google/android/gms/common/api/Status;
 
@@ -76,7 +76,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/common/api/Status;-><init>(I)V
 
-    sput-object v0, Lcom/google/android/gms/common/api/Status;->adU:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->aen:Lcom/google/android/gms/common/api/Status;
 
     new-instance v0, Lcom/google/android/gms/common/api/Status;
 
@@ -84,7 +84,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/common/api/Status;-><init>(I)V
 
-    sput-object v0, Lcom/google/android/gms/common/api/Status;->adV:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->aeo:Lcom/google/android/gms/common/api/Status;
 
     new-instance v0, Lcom/google/android/gms/common/api/Status;
 
@@ -92,7 +92,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/common/api/Status;-><init>(I)V
 
-    sput-object v0, Lcom/google/android/gms/common/api/Status;->adW:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->aep:Lcom/google/android/gms/common/api/Status;
 
     new-instance v0, Lcom/google/android/gms/common/api/Status;
 
@@ -100,7 +100,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/common/api/Status;-><init>(I)V
 
-    sput-object v0, Lcom/google/android/gms/common/api/Status;->adX:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->aeq:Lcom/google/android/gms/common/api/Status;
 
     new-instance v0, Lcom/google/android/gms/common/api/r;
 
@@ -126,13 +126,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/common/api/Status;->adm:I
+    iput p1, p0, Lcom/google/android/gms/common/api/Status;->adE:I
 
-    iput p2, p0, Lcom/google/android/gms/common/api/Status;->adn:I
+    iput p2, p0, Lcom/google/android/gms/common/api/Status;->adF:I
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/Status;->adp:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/Status;->adH:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/common/api/Status;->ado:Landroid/app/PendingIntent;
+    iput-object p4, p0, Lcom/google/android/gms/common/api/Status;->adG:Landroid/app/PendingIntent;
 
     return-void
 .end method
@@ -175,21 +175,21 @@
     :cond_0
     check-cast p1, Lcom/google/android/gms/common/api/Status;
 
-    iget v0, p0, Lcom/google/android/gms/common/api/Status;->adm:I
+    iget v0, p0, Lcom/google/android/gms/common/api/Status;->adE:I
 
-    iget v2, p1, Lcom/google/android/gms/common/api/Status;->adm:I
+    iget v2, p1, Lcom/google/android/gms/common/api/Status;->adE:I
 
     if-ne v0, v2, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/common/api/Status;->adn:I
+    iget v0, p0, Lcom/google/android/gms/common/api/Status;->adF:I
 
-    iget v2, p1, Lcom/google/android/gms/common/api/Status;->adn:I
+    iget v2, p1, Lcom/google/android/gms/common/api/Status;->adF:I
 
     if-ne v0, v2, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->adp:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->adH:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/android/gms/common/api/Status;->adp:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/common/api/Status;->adH:Ljava/lang/String;
 
     invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -197,9 +197,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->ado:Landroid/app/PendingIntent;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->adG:Landroid/app/PendingIntent;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/Status;->ado:Landroid/app/PendingIntent;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/Status;->adG:Landroid/app/PendingIntent;
 
     invoke-static {v0, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -222,7 +222,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/common/api/Status;->adm:I
+    iget v1, p0, Lcom/google/android/gms/common/api/Status;->adE:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -232,7 +232,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/google/android/gms/common/api/Status;->adn:I
+    iget v1, p0, Lcom/google/android/gms/common/api/Status;->adF:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -242,13 +242,13 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->adp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->adH:Ljava/lang/String;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->ado:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->adG:Landroid/app/PendingIntent;
 
     const/4 v2, 0x3
 
@@ -261,10 +261,10 @@
     return v0
 .end method
 
-.method public final kW()Z
+.method public final kU()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->ado:Landroid/app/PendingIntent;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->adG:Landroid/app/PendingIntent;
 
     if-eqz v0, :cond_0
 
@@ -278,10 +278,10 @@
     return v0
 .end method
 
-.method public final kX()Z
+.method public final kV()Z
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/common/api/Status;->adn:I
+    iget v0, p0, Lcom/google/android/gms/common/api/Status;->adF:I
 
     if-gtz v0, :cond_0
 
@@ -295,7 +295,7 @@
     return v0
 .end method
 
-.method public final ls()Lcom/google/android/gms/common/api/Status;
+.method public final lq()Lcom/google/android/gms/common/api/Status;
     .locals 0
 
     return-object p0
@@ -308,14 +308,14 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->adp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->adH:Ljava/lang/String;
 
     if-eqz v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget v1, p0, Lcom/google/android/gms/common/api/Status;->adn:I
+    iget v1, p0, Lcom/google/android/gms/common/api/Status;->adF:I
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/d;->be(I)Ljava/lang/String;
 
@@ -328,7 +328,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->ado:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->adG:Landroid/app/PendingIntent;
 
     const-string v2, "resolution"
 
@@ -352,25 +352,25 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/common/api/Status;->adn:I
+    iget v1, p0, Lcom/google/android/gms/common/api/Status;->adF:I
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->adp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->adH:Ljava/lang/String;
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->ado:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->adG:Landroid/app/PendingIntent;
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget p2, p0, Lcom/google/android/gms/common/api/Status;->adm:I
+    iget p2, p0, Lcom/google/android/gms/common/api/Status;->adE:I
 
     const/16 v1, 0x3e8
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/a$d$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/a$d$a.smali
index bb0b79bfe0..34f6f95ce8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/a$d$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/a$d$a.smali
@@ -18,5 +18,5 @@
 
 
 # virtual methods
-.method public abstract lc()Landroid/accounts/Account;
+.method public abstract la()Landroid/accounts/Account;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/a$d$b.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/a$d$b.smali
index ee20ee56a8..511e46d74e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/a$d$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/a$d$b.smali
@@ -17,5 +17,5 @@
 
 
 # virtual methods
-.method public abstract ld()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+.method public abstract lb()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/a$f.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/a$f.smali
index 0c1d9db788..f96150c922 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/a$f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/a$f.smali
@@ -44,17 +44,17 @@
 .method public abstract isConnecting()Z
 .end method
 
-.method public abstract le()Z
+.method public abstract lc()Z
 .end method
 
-.method public abstract lf()Z
+.method public abstract ld()Z
 .end method
 
-.method public abstract lg()Ljava/lang/String;
+.method public abstract le()Ljava/lang/String;
 .end method
 
-.method public abstract lh()I
+.method public abstract lf()I
 .end method
 
-.method public abstract li()[Lcom/google/android/gms/common/Feature;
+.method public abstract lg()[Lcom/google/android/gms/common/Feature;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/a$h.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/a$h.smali
index 13a5b13e06..1898906815 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/a$h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/a$h.smali
@@ -27,13 +27,13 @@
 
 
 # virtual methods
-.method public abstract lj()Ljava/lang/String;
+.method public abstract lh()Ljava/lang/String;
 .end method
 
-.method public abstract lk()Ljava/lang/String;
+.method public abstract li()Ljava/lang/String;
 .end method
 
-.method public abstract ll()Landroid/os/IInterface;
+.method public abstract lj()Landroid/os/IInterface;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/a.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/a.smali
index 9faffdb014..bc069458bf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/a.smali
@@ -29,7 +29,16 @@
 
 
 # instance fields
-.field private final adA:Lcom/google/android/gms/common/api/a$i;
+.field final adR:Lcom/google/android/gms/common/api/a$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/common/api/a$a<",
+            "*TO;>;"
+        }
+    .end annotation
+.end field
+
+.field private final adS:Lcom/google/android/gms/common/api/a$i;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$i<",
@@ -38,7 +47,7 @@
     .end annotation
 .end field
 
-.field public final adB:Lcom/google/android/gms/common/api/a$g;
+.field public final adT:Lcom/google/android/gms/common/api/a$g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$g<",
@@ -47,7 +56,7 @@
     .end annotation
 .end field
 
-.field private final adC:Lcom/google/android/gms/common/api/a$j;
+.field private final adU:Lcom/google/android/gms/common/api/a$j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$j<",
@@ -56,15 +65,6 @@
     .end annotation
 .end field
 
-.field final adz:Lcom/google/android/gms/common/api/a$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/common/api/a$a<",
-            "*TO;>;"
-        }
-    .end annotation
-.end field
-
 .field public final mName:Ljava/lang/String;
 
 
@@ -96,15 +96,15 @@
 
     iput-object p1, p0, Lcom/google/android/gms/common/api/a;->mName:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/a;->adz:Lcom/google/android/gms/common/api/a$a;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/a;->adR:Lcom/google/android/gms/common/api/a$a;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/a;->adA:Lcom/google/android/gms/common/api/a$i;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/a;->adS:Lcom/google/android/gms/common/api/a$i;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/a;->adB:Lcom/google/android/gms/common/api/a$g;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/a;->adT:Lcom/google/android/gms/common/api/a$g;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/a;->adC:Lcom/google/android/gms/common/api/a$j;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/a;->adU:Lcom/google/android/gms/common/api/a$j;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/b.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/b.smali
index 9071849d14..1130e8c2a7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/b.smali
@@ -10,13 +10,13 @@
 .method public constructor <init>(Lcom/google/android/gms/common/api/Status;)V
     .locals 4
 
-    iget v0, p1, Lcom/google/android/gms/common/api/Status;->adn:I
+    iget v0, p1, Lcom/google/android/gms/common/api/Status;->adF:I
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/Status;->adp:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/Status;->adH:Ljava/lang/String;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/Status;->adp:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/Status;->adH:Ljava/lang/String;
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/c.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/c.smali
index 6e6f182e92..b9c469e583 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/c.smali
@@ -79,7 +79,7 @@
 
     check-cast v4, Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/common/ConnectionResult;->kX()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/common/ConnectionResult;->kV()Z
 
     move-result v5
 
@@ -88,7 +88,7 @@
     const/4 v2, 0x0
 
     :cond_0
-    iget-object v3, v3, Lcom/google/android/gms/common/api/internal/aw;->adD:Lcom/google/android/gms/common/api/a;
+    iget-object v3, v3, Lcom/google/android/gms/common/api/internal/aw;->adV:Lcom/google/android/gms/common/api/a;
 
     iget-object v3, v3, Lcom/google/android/gms/common/api/a;->mName:Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/e$a$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/e$a$a.smali
index 0e8eed6d1c..14686f1a65 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/e$a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/e$a$a.smali
@@ -14,9 +14,9 @@
 
 
 # instance fields
-.field adG:Landroid/os/Looper;
+.field adY:Landroid/os/Looper;
 
-.field adI:Lcom/google/android/gms/common/api/internal/k;
+.field aea:Lcom/google/android/gms/common/api/internal/k;
 
 
 # direct methods
@@ -30,10 +30,10 @@
 
 
 # virtual methods
-.method public final ln()Lcom/google/android/gms/common/api/e$a;
+.method public final ll()Lcom/google/android/gms/common/api/e$a;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/e$a$a;->adI:Lcom/google/android/gms/common/api/internal/k;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/e$a$a;->aea:Lcom/google/android/gms/common/api/internal/k;
 
     if-nez v0, :cond_0
 
@@ -41,10 +41,10 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/internal/a;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/e$a$a;->adI:Lcom/google/android/gms/common/api/internal/k;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/e$a$a;->aea:Lcom/google/android/gms/common/api/internal/k;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/e$a$a;->adG:Landroid/os/Looper;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/e$a$a;->adY:Landroid/os/Looper;
 
     if-nez v0, :cond_1
 
@@ -52,14 +52,14 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/e$a$a;->adG:Landroid/os/Looper;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/e$a$a;->adY:Landroid/os/Looper;
 
     :cond_1
     new-instance v0, Lcom/google/android/gms/common/api/e$a;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/e$a$a;->adI:Lcom/google/android/gms/common/api/internal/k;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/e$a$a;->aea:Lcom/google/android/gms/common/api/internal/k;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/e$a$a;->adG:Landroid/os/Looper;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/e$a$a;->adY:Landroid/os/Looper;
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/e$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/e$a.smali
index 75e6b18802..83af043166 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/e$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/e$a.smali
@@ -20,13 +20,13 @@
 
 
 # static fields
-.field public static final adK:Lcom/google/android/gms/common/api/e$a;
+.field public static final aed:Lcom/google/android/gms/common/api/e$a;
 
 
 # instance fields
-.field public final adL:Lcom/google/android/gms/common/api/internal/k;
+.field public final aee:Lcom/google/android/gms/common/api/internal/k;
 
-.field public final adM:Landroid/os/Looper;
+.field public final aef:Landroid/os/Looper;
 
 
 # direct methods
@@ -37,11 +37,11 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/e$a$a;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/e$a$a;->ln()Lcom/google/android/gms/common/api/e$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/e$a$a;->ll()Lcom/google/android/gms/common/api/e$a;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/api/e$a;->adK:Lcom/google/android/gms/common/api/e$a;
+    sput-object v0, Lcom/google/android/gms/common/api/e$a;->aed:Lcom/google/android/gms/common/api/e$a;
 
     return-void
 .end method
@@ -51,9 +51,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/e$a;->adL:Lcom/google/android/gms/common/api/internal/k;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/e$a;->aee:Lcom/google/android/gms/common/api/internal/k;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/e$a;->adM:Landroid/os/Looper;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/e$a;->aef:Landroid/os/Looper;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/e.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/e.smali
index 201bbbf175..12aaa0f217 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/e.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final adD:Lcom/google/android/gms/common/api/a;
+.field private final adV:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field private final adE:Lcom/google/android/gms/common/api/a$d;
+.field private final adW:Lcom/google/android/gms/common/api/a$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TO;"
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field public final adF:Lcom/google/android/gms/common/api/internal/aw;
+.field public final adX:Lcom/google/android/gms/common/api/internal/aw;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/aw<",
@@ -46,13 +46,13 @@
     .end annotation
 .end field
 
-.field public final adG:Landroid/os/Looper;
+.field public final adY:Landroid/os/Looper;
 
-.field protected final adH:Lcom/google/android/gms/common/api/f;
+.field public final adZ:Lcom/google/android/gms/common/api/f;
 
-.field private final adI:Lcom/google/android/gms/common/api/internal/k;
+.field private final aea:Lcom/google/android/gms/common/api/internal/k;
 
-.field protected final adJ:Lcom/google/android/gms/common/api/internal/d;
+.field protected final aeb:Lcom/google/android/gms/common/api/internal/d;
 
 .field private final mContext:Landroid/content/Context;
 
@@ -93,29 +93,29 @@
 
     iput-object v0, p0, Lcom/google/android/gms/common/api/e;->mContext:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->adD:Lcom/google/android/gms/common/api/a;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->adV:Lcom/google/android/gms/common/api/a;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/e;->adE:Lcom/google/android/gms/common/api/a$d;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/e;->adW:Lcom/google/android/gms/common/api/a$d;
 
-    iget-object p2, p4, Lcom/google/android/gms/common/api/e$a;->adM:Landroid/os/Looper;
+    iget-object p2, p4, Lcom/google/android/gms/common/api/e$a;->aef:Landroid/os/Looper;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->adG:Landroid/os/Looper;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->adY:Landroid/os/Looper;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/e;->adD:Lcom/google/android/gms/common/api/a;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/e;->adV:Lcom/google/android/gms/common/api/a;
 
-    iget-object p3, p0, Lcom/google/android/gms/common/api/e;->adE:Lcom/google/android/gms/common/api/a$d;
+    iget-object p3, p0, Lcom/google/android/gms/common/api/e;->adW:Lcom/google/android/gms/common/api/a$d;
 
     invoke-static {p2, p3}, Lcom/google/android/gms/common/api/internal/aw;->a(Lcom/google/android/gms/common/api/a;Lcom/google/android/gms/common/api/a$d;)Lcom/google/android/gms/common/api/internal/aw;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->adF:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->adX:Lcom/google/android/gms/common/api/internal/aw;
 
     new-instance p2, Lcom/google/android/gms/common/api/internal/aa;
 
     invoke-direct {p2, p0}, Lcom/google/android/gms/common/api/internal/aa;-><init>(Lcom/google/android/gms/common/api/e;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->adH:Lcom/google/android/gms/common/api/f;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->adZ:Lcom/google/android/gms/common/api/f;
 
     iget-object p2, p0, Lcom/google/android/gms/common/api/e;->mContext:Landroid/content/Context;
 
@@ -123,11 +123,11 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/e;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/e;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object p2, p2, Lcom/google/android/gms/common/api/internal/d;->aeE:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p2, Lcom/google/android/gms/common/api/internal/d;->aeW:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
 
@@ -135,22 +135,22 @@
 
     iput p2, p0, Lcom/google/android/gms/common/api/e;->mId:I
 
-    iget-object p2, p4, Lcom/google/android/gms/common/api/e$a;->adL:Lcom/google/android/gms/common/api/internal/k;
+    iget-object p2, p4, Lcom/google/android/gms/common/api/e$a;->aee:Lcom/google/android/gms/common/api/internal/k;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->adI:Lcom/google/android/gms/common/api/internal/k;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->aea:Lcom/google/android/gms/common/api/internal/k;
 
     instance-of p2, p1, Lcom/google/android/gms/common/api/GoogleApiActivity;
 
     if-nez p2, :cond_0
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/e;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/e;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object p3, p0, Lcom/google/android/gms/common/api/e;->adF:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object p3, p0, Lcom/google/android/gms/common/api/e;->adX:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-static {p1, p2, p3}, Lcom/google/android/gms/common/api/internal/q;->a(Landroid/app/Activity;Lcom/google/android/gms/common/api/internal/d;Lcom/google/android/gms/common/api/internal/aw;)V
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/common/api/e;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/e;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/e;)V
 
@@ -181,7 +181,7 @@
 
     invoke-static {p3, v1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p3, v0, Lcom/google/android/gms/common/api/e$a$a;->adI:Lcom/google/android/gms/common/api/internal/k;
+    iput-object p3, v0, Lcom/google/android/gms/common/api/e$a$a;->aea:Lcom/google/android/gms/common/api/internal/k;
 
     invoke-virtual {p1}, Landroid/app/Activity;->getMainLooper()Landroid/os/Looper;
 
@@ -191,9 +191,9 @@
 
     invoke-static {p3, v1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p3, v0, Lcom/google/android/gms/common/api/e$a$a;->adG:Landroid/os/Looper;
+    iput-object p3, v0, Lcom/google/android/gms/common/api/e$a$a;->adY:Landroid/os/Looper;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/e$a$a;->ln()Lcom/google/android/gms/common/api/e$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/e$a$a;->ll()Lcom/google/android/gms/common/api/e$a;
 
     move-result-object p3
 
@@ -237,31 +237,31 @@
 
     iput-object p1, p0, Lcom/google/android/gms/common/api/e;->mContext:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->adD:Lcom/google/android/gms/common/api/a;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/e;->adV:Lcom/google/android/gms/common/api/a;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/e;->adE:Lcom/google/android/gms/common/api/a$d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/e;->adW:Lcom/google/android/gms/common/api/a$d;
 
-    iget-object p1, p3, Lcom/google/android/gms/common/api/e$a;->adM:Landroid/os/Looper;
+    iget-object p1, p3, Lcom/google/android/gms/common/api/e$a;->aef:Landroid/os/Looper;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/e;->adG:Landroid/os/Looper;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/e;->adY:Landroid/os/Looper;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/e;->adD:Lcom/google/android/gms/common/api/a;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/e;->adV:Lcom/google/android/gms/common/api/a;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/e;->adE:Lcom/google/android/gms/common/api/a$d;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/e;->adW:Lcom/google/android/gms/common/api/a$d;
 
     invoke-static {p1, p2}, Lcom/google/android/gms/common/api/internal/aw;->a(Lcom/google/android/gms/common/api/a;Lcom/google/android/gms/common/api/a$d;)Lcom/google/android/gms/common/api/internal/aw;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/e;->adF:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/e;->adX:Lcom/google/android/gms/common/api/internal/aw;
 
     new-instance p1, Lcom/google/android/gms/common/api/internal/aa;
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/common/api/internal/aa;-><init>(Lcom/google/android/gms/common/api/e;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/e;->adH:Lcom/google/android/gms/common/api/f;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/e;->adZ:Lcom/google/android/gms/common/api/f;
 
     iget-object p1, p0, Lcom/google/android/gms/common/api/e;->mContext:Landroid/content/Context;
 
@@ -269,11 +269,11 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/e;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/e;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/e;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/e;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d;->aeE:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d;->aeW:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
 
@@ -281,11 +281,11 @@
 
     iput p1, p0, Lcom/google/android/gms/common/api/e;->mId:I
 
-    iget-object p1, p3, Lcom/google/android/gms/common/api/e$a;->adL:Lcom/google/android/gms/common/api/internal/k;
+    iget-object p1, p3, Lcom/google/android/gms/common/api/e$a;->aee:Lcom/google/android/gms/common/api/internal/k;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/e;->adI:Lcom/google/android/gms/common/api/internal/k;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/e;->aea:Lcom/google/android/gms/common/api/internal/k;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/e;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/e;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/e;)V
 
@@ -306,17 +306,17 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/e;->lm()Lcom/google/android/gms/common/internal/d$a;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/e;->lk()Lcom/google/android/gms/common/internal/d$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/d$a;->md()Lcom/google/android/gms/common/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/d$a;->mb()Lcom/google/android/gms/common/internal/d;
 
     move-result-object v4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/e;->adD:Lcom/google/android/gms/common/api/a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/e;->adV:Lcom/google/android/gms/common/api/a;
 
-    iget-object v1, v0, Lcom/google/android/gms/common/api/a;->adz:Lcom/google/android/gms/common/api/a$a;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/a;->adR:Lcom/google/android/gms/common/api/a$a;
 
     if-eqz v1, :cond_0
 
@@ -332,11 +332,11 @@
 
     invoke-static {v1, v2}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
-    iget-object v1, v0, Lcom/google/android/gms/common/api/a;->adz:Lcom/google/android/gms/common/api/a$a;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/a;->adR:Lcom/google/android/gms/common/api/a$a;
 
     iget-object v2, p0, Lcom/google/android/gms/common/api/e;->mContext:Landroid/content/Context;
 
-    iget-object v5, p0, Lcom/google/android/gms/common/api/e;->adE:Lcom/google/android/gms/common/api/a$d;
+    iget-object v5, p0, Lcom/google/android/gms/common/api/e;->adW:Lcom/google/android/gms/common/api/a$d;
 
     move-object v3, p1
 
@@ -356,11 +356,11 @@
 
     new-instance v0, Lcom/google/android/gms/common/api/internal/aj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/e;->lm()Lcom/google/android/gms/common/internal/d$a;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/e;->lk()Lcom/google/android/gms/common/internal/d$a;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/d$a;->md()Lcom/google/android/gms/common/internal/d;
+    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/d$a;->mb()Lcom/google/android/gms/common/internal/d;
 
     move-result-object v1
 
@@ -383,13 +383,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aet:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeL:Z
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aef:Ljava/lang/ThreadLocal;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aex:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
 
@@ -415,9 +415,9 @@
     const/4 v0, 0x1
 
     :goto_1
-    iput-boolean v0, p1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aet:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeL:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/e;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/e;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
     new-instance v2, Lcom/google/android/gms/common/api/internal/as;
 
@@ -431,7 +431,7 @@
 
     new-instance v5, Lcom/google/android/gms/common/api/internal/ae;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->aeF:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->aeX:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -465,7 +465,7 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/e;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/e;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
     new-instance v1, Lcom/google/android/gms/tasks/h;
 
@@ -481,7 +481,7 @@
 
     new-instance v4, Lcom/google/android/gms/common/api/internal/ae;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->aeF:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->aeX:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -497,7 +497,7 @@
 
     invoke-virtual {p1, v0}, Landroid/os/Handler;->sendMessage(Landroid/os/Message;)Z
 
-    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     return-object p1
 .end method
@@ -526,23 +526,23 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/j;->afp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/j;->afH:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     const-string v1, "Listener has already been released."
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p2, Lcom/google/android/gms/common/api/internal/m;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, p2, Lcom/google/android/gms/common/api/internal/m;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/j;->afp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/j;->afH:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
-    iget-object v1, p2, Lcom/google/android/gms/common/api/internal/m;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p2, Lcom/google/android/gms/common/api/internal/m;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/common/api/internal/h$a;->equals(Ljava/lang/Object;)Z
 
@@ -552,7 +552,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->checkArgument(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/e;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/e;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
     new-instance v1, Lcom/google/android/gms/tasks/h;
 
@@ -572,7 +572,7 @@
 
     new-instance v3, Lcom/google/android/gms/common/api/internal/ae;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->aeF:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->aeX:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -588,7 +588,7 @@
 
     invoke-virtual {p1, p2}, Landroid/os/Handler;->sendMessage(Landroid/os/Message;)Z
 
-    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     return-object p1
 .end method
@@ -613,9 +613,9 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/tasks/h;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/e;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/e;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/e;->adI:Lcom/google/android/gms/common/api/internal/k;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/e;->aea:Lcom/google/android/gms/common/api/internal/k;
 
     new-instance v3, Lcom/google/android/gms/common/api/internal/au;
 
@@ -629,7 +629,7 @@
 
     new-instance v4, Lcom/google/android/gms/common/api/internal/ae;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d;->aeF:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d;->aeX:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -645,7 +645,7 @@
 
     invoke-virtual {p1, v1}, Landroid/os/Handler;->sendMessage(Landroid/os/Message;)Z
 
-    iget-object p1, v0, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v0, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     return-object p1
 .end method
@@ -667,7 +667,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/e;->adG:Landroid/os/Looper;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/e;->adY:Landroid/os/Looper;
 
     const-string v1, "Listener must not be null"
 
@@ -688,14 +688,14 @@
     return-object v1
 .end method
 
-.method protected lm()Lcom/google/android/gms/common/internal/d$a;
+.method protected lk()Lcom/google/android/gms/common/internal/d$a;
     .locals 4
 
     new-instance v0, Lcom/google/android/gms/common/internal/d$a;
 
     invoke-direct {v0}, Lcom/google/android/gms/common/internal/d$a;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/e;->adE:Lcom/google/android/gms/common/api/a$d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/e;->adW:Lcom/google/android/gms/common/api/a$d;
 
     instance-of v2, v1, Lcom/google/android/gms/common/api/a$d$b;
 
@@ -703,19 +703,19 @@
 
     check-cast v1, Lcom/google/android/gms/common/api/a$d$b;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$b;->ld()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$b;->lb()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
 
     move-result-object v1
 
     if-eqz v1, :cond_0
 
-    iget-object v2, v1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acU:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adn:Ljava/lang/String;
 
     if-eqz v2, :cond_1
 
     new-instance v2, Landroid/accounts/Account;
 
-    iget-object v1, v1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->acU:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->adn:Ljava/lang/String;
 
     const-string v3, "com.google"
 
@@ -724,7 +724,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/e;->adE:Lcom/google/android/gms/common/api/a$d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/e;->adW:Lcom/google/android/gms/common/api/a$d;
 
     instance-of v2, v1, Lcom/google/android/gms/common/api/a$d$a;
 
@@ -732,7 +732,7 @@
 
     check-cast v1, Lcom/google/android/gms/common/api/a$d$a;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$a;->lc()Landroid/accounts/Account;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$a;->la()Landroid/accounts/Account;
 
     move-result-object v2
 
@@ -742,9 +742,9 @@
     const/4 v2, 0x0
 
     :goto_0
-    iput-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ahL:Landroid/accounts/Account;
+    iput-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->aid:Landroid/accounts/Account;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/e;->adE:Lcom/google/android/gms/common/api/a$d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/e;->adW:Lcom/google/android/gms/common/api/a$d;
 
     instance-of v2, v1, Lcom/google/android/gms/common/api/a$d$b;
 
@@ -752,13 +752,13 @@
 
     check-cast v1, Lcom/google/android/gms/common/api/a$d$b;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$b;->ld()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$b;->lb()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
 
     move-result-object v1
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kV()Ljava/util/Set;
+    invoke-virtual {v1}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->kT()Ljava/util/Set;
 
     move-result-object v1
 
@@ -770,7 +770,7 @@
     move-result-object v1
 
     :goto_1
-    iget-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ahW:Landroidx/collection/ArraySet;
+    iget-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->aio:Landroidx/collection/ArraySet;
 
     if-nez v2, :cond_3
 
@@ -778,10 +778,10 @@
 
     invoke-direct {v2}, Landroidx/collection/ArraySet;-><init>()V
 
-    iput-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ahW:Landroidx/collection/ArraySet;
+    iput-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->aio:Landroidx/collection/ArraySet;
 
     :cond_3
-    iget-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ahW:Landroidx/collection/ArraySet;
+    iget-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->aio:Landroidx/collection/ArraySet;
 
     invoke-virtual {v2, v1}, Landroidx/collection/ArraySet;->addAll(Ljava/util/Collection;)Z
 
@@ -795,7 +795,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/google/android/gms/common/internal/d$a;->ahS:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/internal/d$a;->aik:Ljava/lang/String;
 
     iget-object v1, p0, Lcom/google/android/gms/common/api/e;->mContext:Landroid/content/Context;
 
@@ -803,7 +803,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/google/android/gms/common/internal/d$a;->ahR:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/internal/d$a;->aij:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/f$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/f$a.smali
index f89594dcb0..d0d0ad9521 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/f$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/f$a.smali
@@ -14,8 +14,8 @@
 
 
 # virtual methods
-.method public abstract lq()V
+.method public abstract lo()V
 .end method
 
-.method public abstract lr()V
+.method public abstract lp()V
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/f.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/f.smali
index 2dd55b3f4a..16aec27106 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/f.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field private static final adO:Ljava/util/Set;
+.field private static final aeh:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/api/f;->adO:Ljava/util/Set;
+    sput-object v0, Lcom/google/android/gms/common/api/f;->aeh:Ljava/util/Set;
 
     return-void
 .end method
@@ -81,7 +81,7 @@
     throw v0
 .end method
 
-.method public lo()V
+.method public lm()V
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -91,7 +91,7 @@
     throw v0
 .end method
 
-.method public lp()V
+.method public ln()V
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
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 fdcd885d48..2eee28a08c 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
@@ -116,7 +116,7 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/BasePendingResult;
 
-    sget-object v0, Lcom/google/android/gms/common/api/Status;->adU:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/Status;->aen:Lcom/google/android/gms/common/api/Status;
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->d(Lcom/google/android/gms/common/api/Status;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/BasePendingResult$b.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/BasePendingResult$b.smali
index 22048f45c5..03530779f7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/BasePendingResult$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/BasePendingResult$b.smali
@@ -14,14 +14,14 @@
 
 
 # instance fields
-.field private final synthetic aeu:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+.field private final synthetic aeM:Lcom/google/android/gms/common/api/internal/BasePendingResult;
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/gms/common/api/internal/BasePendingResult;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult$b;->aeu:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult$b;->aeM:Lcom/google/android/gms/common/api/internal/BasePendingResult;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult$b;->aeu:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult$b;->aeM:Lcom/google/android/gms/common/api/internal/BasePendingResult;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->a(Lcom/google/android/gms/common/api/internal/BasePendingResult;)Lcom/google/android/gms/common/api/k;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/BasePendingResult.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/BasePendingResult.smali
index 7d664324cc..09d1b9b125 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/BasePendingResult.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/BasePendingResult.smali
@@ -22,7 +22,7 @@
 
 
 # static fields
-.field public static final aef:Ljava/lang/ThreadLocal;
+.field public static final aex:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -34,18 +34,7 @@
 
 
 # instance fields
-.field private final aeg:Ljava/lang/Object;
-
-.field private final aeh:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/common/api/internal/BasePendingResult$a<",
-            "TR;>;"
-        }
-    .end annotation
-.end field
-
-.field private final aei:Ljava/lang/ref/WeakReference;
+.field private final aeA:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -55,9 +44,9 @@
     .end annotation
 .end field
 
-.field private final aej:Ljava/util/concurrent/CountDownLatch;
+.field private final aeB:Ljava/util/concurrent/CountDownLatch;
 
-.field private final aek:Ljava/util/ArrayList;
+.field private final aeC:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -67,7 +56,7 @@
     .end annotation
 .end field
 
-.field private ael:Lcom/google/android/gms/common/api/l;
+.field private aeD:Lcom/google/android/gms/common/api/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/l<",
@@ -76,7 +65,7 @@
     .end annotation
 .end field
 
-.field private final aem:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final aeE:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -86,7 +75,7 @@
     .end annotation
 .end field
 
-.field private aen:Lcom/google/android/gms/common/api/k;
+.field private aeF:Lcom/google/android/gms/common/api/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TR;"
@@ -94,15 +83,15 @@
     .end annotation
 .end field
 
-.field private volatile aeo:Z
+.field private volatile aeG:Z
 
-.field private aep:Z
+.field private aeH:Z
 
-.field private aeq:Z
+.field private aeI:Z
 
-.field private aer:Lcom/google/android/gms/common/internal/l;
+.field private aeJ:Lcom/google/android/gms/common/internal/l;
 
-.field private volatile aes:Lcom/google/android/gms/common/api/internal/an;
+.field private volatile aeK:Lcom/google/android/gms/common/api/internal/an;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/an<",
@@ -111,7 +100,18 @@
     .end annotation
 .end field
 
-.field public aet:Z
+.field public aeL:Z
+
+.field private final aey:Ljava/lang/Object;
+
+.field private final aez:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/common/api/internal/BasePendingResult$a<",
+            "TR;>;"
+        }
+    .end annotation
+.end field
 
 .field private mResultGuardian:Lcom/google/android/gms/common/api/internal/BasePendingResult$b;
     .annotation system Ldalvik/annotation/Signature;
@@ -132,7 +132,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/internal/bc;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aef:Ljava/lang/ThreadLocal;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aex:Ljava/lang/ThreadLocal;
 
     return-void
 .end method
@@ -148,7 +148,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeg:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aey:Ljava/lang/Object;
 
     new-instance v0, Ljava/util/concurrent/CountDownLatch;
 
@@ -156,23 +156,23 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aej:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeB:Ljava/util/concurrent/CountDownLatch;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aek:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeC:Ljava/util/ArrayList;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aem:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeE:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aet:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeL:Z
 
     new-instance v0, Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
 
@@ -182,7 +182,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/common/api/internal/BasePendingResult$a;-><init>(Landroid/os/Looper;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeh:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aez:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
 
     new-instance v0, Ljava/lang/ref/WeakReference;
 
@@ -190,7 +190,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aei:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeA:Ljava/lang/ref/WeakReference;
 
     return-void
 .end method
@@ -204,7 +204,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeg:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aey:Ljava/lang/Object;
 
     new-instance v0, Ljava/util/concurrent/CountDownLatch;
 
@@ -212,23 +212,23 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aej:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeB:Ljava/util/concurrent/CountDownLatch;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aek:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeC:Ljava/util/ArrayList;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aem:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeE:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aet:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeL:Z
 
     if-eqz p1, :cond_0
 
@@ -248,13 +248,13 @@
 
     invoke-direct {v1, v0}, Lcom/google/android/gms/common/api/internal/BasePendingResult$a;-><init>(Landroid/os/Looper;)V
 
-    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeh:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aez:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
 
     new-instance v0, Ljava/lang/ref/WeakReference;
 
     invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aei:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeA:Ljava/lang/ref/WeakReference;
 
     return-void
 .end method
@@ -262,7 +262,7 @@
 .method static synthetic a(Lcom/google/android/gms/common/api/internal/BasePendingResult;)Lcom/google/android/gms/common/api/k;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aen:Lcom/google/android/gms/common/api/k;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeF:Lcom/google/android/gms/common/api/k;
 
     return-object p0
 .end method
@@ -275,40 +275,40 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aen:Lcom/google/android/gms/common/api/k;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeF:Lcom/google/android/gms/common/api/k;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aer:Lcom/google/android/gms/common/internal/l;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeJ:Lcom/google/android/gms/common/internal/l;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aej:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeB:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->countDown()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aen:Lcom/google/android/gms/common/api/k;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeF:Lcom/google/android/gms/common/api/k;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/k;->ls()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/k;->lq()Lcom/google/android/gms/common/api/Status;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->mStatus:Lcom/google/android/gms/common/api/Status;
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aep:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeH:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->ael:Lcom/google/android/gms/common/api/l;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeD:Lcom/google/android/gms/common/api/l;
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->ael:Lcom/google/android/gms/common/api/l;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeD:Lcom/google/android/gms/common/api/l;
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aen:Lcom/google/android/gms/common/api/k;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeF:Lcom/google/android/gms/common/api/k;
 
     instance-of p1, p1, Lcom/google/android/gms/common/api/h;
 
@@ -323,17 +323,17 @@
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeh:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aez:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
 
     const/4 v0, 0x2
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/common/api/internal/BasePendingResult$a;->removeMessages(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeh:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aez:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->ael:Lcom/google/android/gms/common/api/l;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeD:Lcom/google/android/gms/common/api/l;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->lv()Lcom/google/android/gms/common/api/k;
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->lt()Lcom/google/android/gms/common/api/k;
 
     move-result-object v2
 
@@ -341,7 +341,7 @@
 
     :cond_2
     :goto_0
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aek:Ljava/util/ArrayList;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeC:Ljava/util/ArrayList;
 
     check-cast p1, Ljava/util/ArrayList;
 
@@ -367,7 +367,7 @@
     goto :goto_1
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aek:Ljava/util/ArrayList;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeC:Ljava/util/ArrayList;
 
     invoke-virtual {p1}, Ljava/util/ArrayList;->clear()V
 
@@ -388,7 +388,7 @@
 .method private isReady()Z
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aej:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeB:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->getCount()J
 
@@ -410,7 +410,7 @@
     return v0
 .end method
 
-.method private final lv()Lcom/google/android/gms/common/api/k;
+.method private final lt()Lcom/google/android/gms/common/api/k;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -418,12 +418,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeg:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aey:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeo:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeG:Z
 
     const/4 v2, 0x1
 
@@ -449,21 +449,21 @@
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aen:Lcom/google/android/gms/common/api/k;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeF:Lcom/google/android/gms/common/api/k;
 
     const/4 v3, 0x0
 
-    iput-object v3, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aen:Lcom/google/android/gms/common/api/k;
+    iput-object v3, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeF:Lcom/google/android/gms/common/api/k;
 
-    iput-object v3, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->ael:Lcom/google/android/gms/common/api/l;
+    iput-object v3, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeD:Lcom/google/android/gms/common/api/l;
 
-    iput-boolean v2, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeo:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeG:Z
 
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aem:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeE:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -492,7 +492,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeo:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeG:Z
 
     const/4 v1, 0x1
 
@@ -502,7 +502,7 @@
 
     invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aes:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeK:Lcom/google/android/gms/common/api/internal/an;
 
     if-nez v0, :cond_0
 
@@ -517,7 +517,7 @@
     invoke-static {v1, v0}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aej:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeB:Ljava/util/concurrent/CountDownLatch;
 
     const-wide/16 v1, 0x0
 
@@ -527,7 +527,7 @@
 
     if-nez p1, :cond_1
 
-    sget-object p1, Lcom/google/android/gms/common/api/Status;->adU:Lcom/google/android/gms/common/api/Status;
+    sget-object p1, Lcom/google/android/gms/common/api/Status;->aen:Lcom/google/android/gms/common/api/Status;
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->d(Lcom/google/android/gms/common/api/Status;)V
     :try_end_0
@@ -536,7 +536,7 @@
     goto :goto_1
 
     :catch_0
-    sget-object p1, Lcom/google/android/gms/common/api/Status;->adS:Lcom/google/android/gms/common/api/Status;
+    sget-object p1, Lcom/google/android/gms/common/api/Status;->ael:Lcom/google/android/gms/common/api/Status;
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->d(Lcom/google/android/gms/common/api/Status;)V
 
@@ -550,7 +550,7 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->lv()Lcom/google/android/gms/common/api/k;
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->lt()Lcom/google/android/gms/common/api/k;
 
     move-result-object p1
 
@@ -566,7 +566,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->checkArgument(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeg:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aey:Ljava/lang/Object;
 
     monitor-enter v0
 
@@ -584,7 +584,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aek:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeC:Ljava/util/ArrayList;
 
     invoke-virtual {v1, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -613,12 +613,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeg:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aey:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeo:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeG:Z
 
     const/4 v2, 0x1
 
@@ -638,7 +638,7 @@
 
     invoke-static {v1, v4}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aes:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeK:Lcom/google/android/gms/common/api/internal/an;
 
     if-nez v1, :cond_1
 
@@ -669,9 +669,9 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeh:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aez:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->lv()Lcom/google/android/gms/common/api/k;
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->lt()Lcom/google/android/gms/common/api/k;
 
     move-result-object v2
 
@@ -680,7 +680,7 @@
     goto :goto_2
 
     :cond_3
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->ael:Lcom/google/android/gms/common/api/l;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeD:Lcom/google/android/gms/common/api/l;
 
     :goto_2
     monitor-exit v0
@@ -705,16 +705,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeg:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aey:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeq:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeI:Z
 
     if-nez v1, :cond_2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aep:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeH:Z
 
     if-nez v1, :cond_2
 
@@ -742,7 +742,7 @@
 
     invoke-static {v1, v4}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeo:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeG:Z
 
     if-nez v1, :cond_1
 
@@ -780,7 +780,7 @@
 .method public final d(Lcom/google/android/gms/common/api/Status;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeg:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aey:Ljava/lang/Object;
 
     monitor-enter v0
 
@@ -799,7 +799,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeq:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeI:Z
 
     :cond_0
     monitor-exit v0
@@ -829,12 +829,12 @@
 .method public final isCanceled()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeg:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aey:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aep:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aeH:Z
 
     monitor-exit v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/LifecycleCallback.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/LifecycleCallback.smali
index e5cb9d11e0..0240719755 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/LifecycleCallback.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/LifecycleCallback.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field protected final afi:Lcom/google/android/gms/common/api/internal/g;
+.field protected final afB:Lcom/google/android/gms/common/api/internal/g;
 
 
 # direct methods
@@ -12,25 +12,25 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->afi:Lcom/google/android/gms/common/api/internal/g;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->afB:Lcom/google/android/gms/common/api/internal/g;
 
     return-void
 .end method
 
-.method public static c(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/g;
+.method public static b(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/g;
     .locals 1
 
     new-instance v0, Lcom/google/android/gms/common/api/internal/f;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/common/api/internal/f;-><init>(Landroid/app/Activity;)V
 
-    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->afh:Ljava/lang/Object;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->afA:Ljava/lang/Object;
 
     instance-of p0, p0, Landroidx/fragment/app/FragmentActivity;
 
     if-eqz p0, :cond_0
 
-    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->afh:Ljava/lang/Object;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->afA:Ljava/lang/Object;
 
     check-cast p0, Landroidx/fragment/app/FragmentActivity;
 
@@ -41,17 +41,17 @@
     return-object p0
 
     :cond_0
-    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->afh:Ljava/lang/Object;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->afA:Ljava/lang/Object;
 
     instance-of p0, p0, Landroid/app/Activity;
 
     if-eqz p0, :cond_1
 
-    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->afh:Ljava/lang/Object;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->afA:Ljava/lang/Object;
 
     check-cast p0, Landroid/app/Activity;
 
-    invoke-static {p0}, Lcom/google/android/gms/common/api/internal/be;->e(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/be;
+    invoke-static {p0}, Lcom/google/android/gms/common/api/internal/be;->d(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/be;
 
     move-result-object p0
 
@@ -84,9 +84,9 @@
 .method public final getActivity()Landroid/app/Activity;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->afi:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->afB:Lcom/google/android/gms/common/api/internal/g;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/internal/g;->lK()Landroid/app/Activity;
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/internal/g;->lI()Landroid/app/Activity;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aa.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aa.smali
index 4357013f7e..c27a1b312c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aa.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aa.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private final afG:Lcom/google/android/gms/common/api/e;
+.field private final afY:Lcom/google/android/gms/common/api/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/e<",
@@ -39,7 +39,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/common/api/internal/s;-><init>(Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aa;->afG:Lcom/google/android/gms/common/api/e;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aa;->afY:Lcom/google/android/gms/common/api/e;
 
     return-void
 .end method
@@ -60,7 +60,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->afG:Lcom/google/android/gms/common/api/e;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->afY:Lcom/google/android/gms/common/api/e;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/api/e;->a(Lcom/google/android/gms/common/api/internal/c$a;)Lcom/google/android/gms/common/api/internal/c$a;
 
@@ -72,20 +72,20 @@
 .method public final getLooper()Landroid/os/Looper;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->afG:Lcom/google/android/gms/common/api/e;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->afY:Lcom/google/android/gms/common/api/e;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/e;->adG:Landroid/os/Looper;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/e;->adY:Landroid/os/Looper;
 
     return-object v0
 .end method
 
-.method public final lo()V
+.method public final lm()V
     .locals 0
 
     return-void
 .end method
 
-.method public final lp()V
+.method public final ln()V
     .locals 0
 
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ab.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ab.smali
index 771796ebe6..685800f952 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ab.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ab.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final afH:Lcom/google/android/gms/common/api/internal/ac;
+.field private final afZ:Lcom/google/android/gms/common/api/internal/ac;
 
 .field public mContext:Landroid/content/Context;
 
@@ -14,7 +14,7 @@
 
     invoke-direct {p0}, Landroid/content/BroadcastReceiver;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ab;->afH:Lcom/google/android/gms/common/api/internal/ac;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ab;->afZ:Lcom/google/android/gms/common/api/internal/ac;
 
     return-void
 .end method
@@ -48,9 +48,9 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ab;->afH:Lcom/google/android/gms/common/api/internal/ac;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ab;->afZ:Lcom/google/android/gms/common/api/internal/ac;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/ac;->lQ()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/ac;->lO()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ab;->unregister()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ac.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ac.smali
index 52f8ea3710..a02eea2743 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ac.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ac.smali
@@ -13,5 +13,5 @@
 
 
 # virtual methods
-.method public abstract lQ()V
+.method public abstract lO()V
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ad.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ad.smali
index abe43565f7..853a9a3881 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ad.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ad.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field public afI:Lcom/google/android/gms/tasks/h;
+.field public aga:Lcom/google/android/gms/tasks/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/h<",
@@ -24,9 +24,9 @@
 
     invoke-direct {p1}, Lcom/google/android/gms/tasks/h;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ad;->afI:Lcom/google/android/gms/tasks/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ad;->aga:Lcom/google/android/gms/tasks/h;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ad;->afi:Lcom/google/android/gms/common/api/internal/g;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ad;->afB:Lcom/google/android/gms/common/api/internal/g;
 
     const-string v0, "GmsAvailabilityHelper"
 
@@ -35,10 +35,10 @@
     return-void
 .end method
 
-.method public static d(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/ad;
+.method public static c(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/ad;
     .locals 2
 
-    invoke-static {p0}, Lcom/google/android/gms/common/api/internal/ad;->c(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/g;
+    invoke-static {p0}, Lcom/google/android/gms/common/api/internal/ad;->b(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/g;
 
     move-result-object p0
 
@@ -54,9 +54,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/ad;->afI:Lcom/google/android/gms/tasks/h;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/ad;->aga:Lcom/google/android/gms/tasks/h;
 
-    iget-object p0, p0, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object p0, p0, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {p0}, Lcom/google/android/gms/tasks/Task;->isComplete()Z
 
@@ -68,7 +68,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/tasks/h;-><init>()V
 
-    iput-object p0, v0, Lcom/google/android/gms/common/api/internal/ad;->afI:Lcom/google/android/gms/tasks/h;
+    iput-object p0, v0, Lcom/google/android/gms/common/api/internal/ad;->aga:Lcom/google/android/gms/tasks/h;
 
     :cond_0
     return-object v0
@@ -86,15 +86,15 @@
 .method protected final b(Lcom/google/android/gms/common/ConnectionResult;I)V
     .locals 3
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ad;->afI:Lcom/google/android/gms/tasks/h;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ad;->aga:Lcom/google/android/gms/tasks/h;
 
     new-instance v0, Lcom/google/android/gms/common/api/Status;
 
-    iget v1, p1, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v1, p1, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
-    iget-object v2, p1, Lcom/google/android/gms/common/ConnectionResult;->adp:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/common/ConnectionResult;->adH:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/ConnectionResult;->ado:Landroid/app/PendingIntent;
+    iget-object p1, p1, Lcom/google/android/gms/common/ConnectionResult;->adG:Landroid/app/PendingIntent;
 
     invoke-direct {v0, v1, v2, p1}, Lcom/google/android/gms/common/api/Status;-><init>(ILjava/lang/String;Landroid/app/PendingIntent;)V
 
@@ -107,14 +107,14 @@
     return-void
 .end method
 
-.method protected final lw()V
+.method protected final lu()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->agw:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->agO:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ad;->afi:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ad;->afB:Lcom/google/android/gms/common/api/internal/g;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/internal/g;->lK()Landroid/app/Activity;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/internal/g;->lI()Landroid/app/Activity;
 
     move-result-object v1
 
@@ -126,16 +126,16 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->afI:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->aga:Lcom/google/android/gms/tasks/h;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/tasks/h;->k(Ljava/lang/Object;)V
 
     return-void
 
     :cond_0
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ad;->afI:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ad;->aga:Lcom/google/android/gms/tasks/h;
 
-    iget-object v2, v2, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object v2, v2, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v2}, Lcom/google/android/gms/tasks/Task;->isComplete()Z
 
@@ -160,7 +160,7 @@
 
     invoke-super {p0}, Lcom/google/android/gms/common/api/internal/ay;->onDestroy()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->afI:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->aga:Lcom/google/android/gms/tasks/h;
 
     new-instance v1, Ljava/util/concurrent/CancellationException;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ae.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ae.smali
index 8322686956..acd626f554 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ae.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ae.smali
@@ -3,11 +3,11 @@
 
 
 # instance fields
-.field public final afJ:Lcom/google/android/gms/common/api/internal/t;
+.field public final agb:Lcom/google/android/gms/common/api/internal/t;
 
-.field public final afK:I
+.field public final agc:I
 
-.field public final afL:Lcom/google/android/gms/common/api/e;
+.field public final agd:Lcom/google/android/gms/common/api/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/e<",
@@ -32,11 +32,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ae;->afJ:Lcom/google/android/gms/common/api/internal/t;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ae;->agb:Lcom/google/android/gms/common/api/internal/t;
 
-    iput p2, p0, Lcom/google/android/gms/common/api/internal/ae;->afK:I
+    iput p2, p0, Lcom/google/android/gms/common/api/internal/ae;->agc:I
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/ae;->afL:Lcom/google/android/gms/common/api/e;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/ae;->agd:Lcom/google/android/gms/common/api/e;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/af.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/af.smali
index 82466d9c48..963e3d675b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/af.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/af.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field public final afM:Lcom/google/android/gms/common/api/internal/j;
+.field public final age:Lcom/google/android/gms/common/api/internal/j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/j<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field public final afN:Lcom/google/android/gms/common/api/internal/m;
+.field public final agf:Lcom/google/android/gms/common/api/internal/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/m<",
@@ -41,9 +41,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/af;->afM:Lcom/google/android/gms/common/api/internal/j;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/af;->age:Lcom/google/android/gms/common/api/internal/j;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/af;->afN:Lcom/google/android/gms/common/api/internal/m;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/af;->agf:Lcom/google/android/gms/common/api/internal/m;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ah.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ah.smali
index 89a6d7a87d..77a3eb707b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ah.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ah.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final afO:Ljava/util/concurrent/ExecutorService;
+.field private static final agg:Ljava/util/concurrent/ExecutorService;
 
 
 # direct methods
@@ -34,15 +34,15 @@
 
     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, Lcom/google/android/gms/common/api/internal/ah;->afO:Ljava/util/concurrent/ExecutorService;
+    sput-object v8, Lcom/google/android/gms/common/api/internal/ah;->agg:Ljava/util/concurrent/ExecutorService;
 
     return-void
 .end method
 
-.method public static lR()Ljava/util/concurrent/ExecutorService;
+.method public static lP()Ljava/util/concurrent/ExecutorService;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/ah;->afO:Ljava/util/concurrent/ExecutorService;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/ah;->agg:Ljava/util/concurrent/ExecutorService;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aj.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aj.smali
index acfd4e3726..cbd49a13d2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aj.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static afP:Lcom/google/android/gms/common/api/a$a;
+.field private static agh:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field private final adz:Lcom/google/android/gms/common/api/a$a;
+.field private final adR:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private afQ:Ljava/util/Set;
+.field private agi:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -43,11 +43,11 @@
     .end annotation
 .end field
 
-.field private afR:Lcom/google/android/gms/common/internal/d;
+.field private agj:Lcom/google/android/gms/common/internal/d;
 
-.field afS:Lcom/google/android/gms/signin/e;
+.field agk:Lcom/google/android/gms/signin/e;
 
-.field private afT:Lcom/google/android/gms/common/api/internal/am;
+.field private agl:Lcom/google/android/gms/common/api/internal/am;
 
 .field private final mContext:Landroid/content/Context;
 
@@ -58,9 +58,9 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/signin/b;->aOM:Lcom/google/android/gms/common/api/a$a;
+    sget-object v0, Lcom/google/android/gms/signin/b;->aPe:Lcom/google/android/gms/common/api/a$a;
 
-    sput-object v0, Lcom/google/android/gms/common/api/internal/aj;->afP:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/aj;->agh:Lcom/google/android/gms/common/api/a$a;
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/os/Handler;Lcom/google/android/gms/common/internal/d;)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/aj;->afP:Lcom/google/android/gms/common/api/a$a;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/aj;->agh:Lcom/google/android/gms/common/api/a$a;
 
     invoke-direct {p0, p1, p2, p3, v0}, Lcom/google/android/gms/common/api/internal/aj;-><init>(Landroid/content/Context;Landroid/os/Handler;Lcom/google/android/gms/common/internal/d;Lcom/google/android/gms/common/api/a$a;)V
 
@@ -105,13 +105,13 @@
 
     check-cast p1, Lcom/google/android/gms/common/internal/d;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->afR:Lcom/google/android/gms/common/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->agj:Lcom/google/android/gms/common/internal/d;
 
-    iget-object p1, p3, Lcom/google/android/gms/common/internal/d;->ahM:Ljava/util/Set;
+    iget-object p1, p3, Lcom/google/android/gms/common/internal/d;->aie:Ljava/util/Set;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->afQ:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->agi:Ljava/util/Set;
 
-    iput-object p4, p0, Lcom/google/android/gms/common/api/internal/aj;->adz:Lcom/google/android/gms/common/api/a$a;
+    iput-object p4, p0, Lcom/google/android/gms/common/api/internal/aj;->adR:Lcom/google/android/gms/common/api/a$a;
 
     return-void
 .end method
@@ -119,7 +119,7 @@
 .method static synthetic a(Lcom/google/android/gms/common/api/internal/aj;)Lcom/google/android/gms/common/api/internal/am;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/aj;->afT:Lcom/google/android/gms/common/api/internal/am;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/aj;->agl:Lcom/google/android/gms/common/api/internal/am;
 
     return-object p0
 .end method
@@ -127,19 +127,19 @@
 .method static synthetic a(Lcom/google/android/gms/common/api/internal/aj;Lcom/google/android/gms/signin/internal/zaj;)V
     .locals 3
 
-    iget-object v0, p1, Lcom/google/android/gms/signin/internal/zaj;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, p1, Lcom/google/android/gms/signin/internal/zaj;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kV()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object p1, p1, Lcom/google/android/gms/signin/internal/zaj;->aOK:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
+    iget-object p1, p1, Lcom/google/android/gms/signin/internal/zaj;->aPc:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
 
-    iget-object v0, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kV()Z
 
     move-result v1
 
@@ -181,34 +181,34 @@
 
     invoke-static {v2, p1, v1}, Landroid/util/Log;->wtf(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->afT:Lcom/google/android/gms/common/api/internal/am;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->agl:Lcom/google/android/gms/common/api/internal/am;
 
     invoke-interface {p1, v0}, Lcom/google/android/gms/common/api/internal/am;->e(Lcom/google/android/gms/common/ConnectionResult;)V
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->afT:Lcom/google/android/gms/common/api/internal/am;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->agl:Lcom/google/android/gms/common/api/internal/am;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiC:Landroid/os/IBinder;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiU:Landroid/os/IBinder;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/k$a;->e(Landroid/os/IBinder;)Lcom/google/android/gms/common/internal/k;
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aj;->afQ:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aj;->agi:Ljava/util/Set;
 
     invoke-interface {v0, p1, v1}, Lcom/google/android/gms/common/api/internal/am;->b(Lcom/google/android/gms/common/internal/k;Ljava/util/Set;)V
 
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->afT:Lcom/google/android/gms/common/api/internal/am;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->agl:Lcom/google/android/gms/common/api/internal/am;
 
     invoke-interface {p1, v0}, Lcom/google/android/gms/common/api/internal/am;->e(Lcom/google/android/gms/common/ConnectionResult;)V
 
     :goto_0
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/aj;->afS:Lcom/google/android/gms/signin/e;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/aj;->agk:Lcom/google/android/gms/signin/e;
 
     invoke-interface {p0}, Lcom/google/android/gms/signin/e;->disconnect()V
 
@@ -220,7 +220,7 @@
 .method public final a(Lcom/google/android/gms/common/ConnectionResult;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->afT:Lcom/google/android/gms/common/api/internal/am;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->agl:Lcom/google/android/gms/common/api/internal/am;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/common/api/internal/am;->e(Lcom/google/android/gms/common/ConnectionResult;)V
 
@@ -230,14 +230,14 @@
 .method public final a(Lcom/google/android/gms/common/api/internal/am;)V
     .locals 9
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->afS:Lcom/google/android/gms/signin/e;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->agk:Lcom/google/android/gms/signin/e;
 
     if-eqz v0, :cond_0
 
     invoke-interface {v0}, Lcom/google/android/gms/signin/e;->disconnect()V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->afR:Lcom/google/android/gms/common/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->agj:Lcom/google/android/gms/common/internal/d;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -247,9 +247,9 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/google/android/gms/common/internal/d;->ahV:Ljava/lang/Integer;
+    iput-object v1, v0, Lcom/google/android/gms/common/internal/d;->ain:Ljava/lang/Integer;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/aj;->adz:Lcom/google/android/gms/common/api/a$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/aj;->adR:Lcom/google/android/gms/common/api/a$a;
 
     iget-object v3, p0, Lcom/google/android/gms/common/api/internal/aj;->mContext:Landroid/content/Context;
 
@@ -259,9 +259,9 @@
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/google/android/gms/common/api/internal/aj;->afR:Lcom/google/android/gms/common/internal/d;
+    iget-object v5, p0, Lcom/google/android/gms/common/api/internal/aj;->agj:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v6, v5, Lcom/google/android/gms/common/internal/d;->ahT:Lcom/google/android/gms/signin/a;
+    iget-object v6, v5, Lcom/google/android/gms/common/internal/d;->ail:Lcom/google/android/gms/signin/a;
 
     move-object v7, p0
 
@@ -273,11 +273,11 @@
 
     check-cast v0, Lcom/google/android/gms/signin/e;
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->afS:Lcom/google/android/gms/signin/e;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->agk:Lcom/google/android/gms/signin/e;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->afT:Lcom/google/android/gms/common/api/internal/am;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->agl:Lcom/google/android/gms/common/api/internal/am;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->afQ:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->agi:Ljava/util/Set;
 
     if-eqz p1, :cond_2
 
@@ -290,7 +290,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->afS:Lcom/google/android/gms/signin/e;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->agk:Lcom/google/android/gms/signin/e;
 
     invoke-interface {p1}, Lcom/google/android/gms/signin/e;->connect()V
 
@@ -323,20 +323,20 @@
     return-void
 .end method
 
-.method public final lq()V
+.method public final lo()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->afS:Lcom/google/android/gms/signin/e;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->agk:Lcom/google/android/gms/signin/e;
 
     invoke-interface {v0, p0}, Lcom/google/android/gms/signin/e;->a(Lcom/google/android/gms/signin/internal/d;)V
 
     return-void
 .end method
 
-.method public final lr()V
+.method public final lp()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->afS:Lcom/google/android/gms/signin/e;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->agk:Lcom/google/android/gms/signin/e;
 
     invoke-interface {v0}, Lcom/google/android/gms/signin/e;->disconnect()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ak.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ak.smali
index dc52cbce29..b463a925ca 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ak.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ak.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic afU:Lcom/google/android/gms/common/api/internal/aj;
+.field private final synthetic agm:Lcom/google/android/gms/common/api/internal/aj;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/aj;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ak;->afU:Lcom/google/android/gms/common/api/internal/aj;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ak;->agm:Lcom/google/android/gms/common/api/internal/aj;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,7 +25,7 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ak;->afU:Lcom/google/android/gms/common/api/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ak;->agm:Lcom/google/android/gms/common/api/internal/aj;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/aj;->a(Lcom/google/android/gms/common/api/internal/aj;)Lcom/google/android/gms/common/api/internal/am;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/al.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/al.smali
index dd2c873907..0b45353f86 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/al.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/al.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic afU:Lcom/google/android/gms/common/api/internal/aj;
+.field private final synthetic agm:Lcom/google/android/gms/common/api/internal/aj;
 
-.field private final synthetic afV:Lcom/google/android/gms/signin/internal/zaj;
+.field private final synthetic agn:Lcom/google/android/gms/signin/internal/zaj;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/aj;Lcom/google/android/gms/signin/internal/zaj;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/al;->afU:Lcom/google/android/gms/common/api/internal/aj;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/al;->agm:Lcom/google/android/gms/common/api/internal/aj;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/al;->afV:Lcom/google/android/gms/signin/internal/zaj;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/al;->agn:Lcom/google/android/gms/signin/internal/zaj;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,9 +29,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/al;->afU:Lcom/google/android/gms/common/api/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/al;->agm:Lcom/google/android/gms/common/api/internal/aj;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/al;->afV:Lcom/google/android/gms/signin/internal/zaj;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/al;->agn:Lcom/google/android/gms/signin/internal/zaj;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/api/internal/aj;->a(Lcom/google/android/gms/common/api/internal/aj;Lcom/google/android/gms/signin/internal/zaj;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/an.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/an.smali
index 3634cd027b..70bd62827f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/an.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/an.smali
@@ -20,9 +20,7 @@
 
 
 # instance fields
-.field final aeg:Ljava/lang/Object;
-
-.field final aei:Ljava/lang/ref/WeakReference;
+.field final aeA:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -32,7 +30,9 @@
     .end annotation
 .end field
 
-.field afW:Lcom/google/android/gms/common/api/n;
+.field final aey:Ljava/lang/Object;
+
+.field ago:Lcom/google/android/gms/common/api/n;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/n<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field afX:Lcom/google/android/gms/common/api/internal/an;
+.field agp:Lcom/google/android/gms/common/api/internal/an;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/an<",
@@ -54,7 +54,7 @@
     .end annotation
 .end field
 
-.field volatile afY:Lcom/google/android/gms/common/api/m;
+.field volatile agq:Lcom/google/android/gms/common/api/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/m<",
@@ -63,7 +63,7 @@
     .end annotation
 .end field
 
-.field afZ:Lcom/google/android/gms/common/api/g;
+.field agr:Lcom/google/android/gms/common/api/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/g<",
@@ -72,9 +72,9 @@
     .end annotation
 .end field
 
-.field aga:Lcom/google/android/gms/common/api/Status;
+.field ags:Lcom/google/android/gms/common/api/Status;
 
-.field final agb:Lcom/google/android/gms/common/api/internal/ap;
+.field final agt:Lcom/google/android/gms/common/api/internal/ap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/ap;"
@@ -82,14 +82,14 @@
     .end annotation
 .end field
 
-.field agc:Z
+.field agu:Z
 
 
 # direct methods
-.method private final lS()Z
+.method private final lQ()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->aei:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->aeA:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -97,7 +97,7 @@
 
     check-cast v0, Lcom/google/android/gms/common/api/f;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->afY:Lcom/google/android/gms/common/api/m;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->agq:Lcom/google/android/gms/common/api/m;
 
     if-eqz v1, :cond_0
 
@@ -123,26 +123,26 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->aeg:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->aey:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    invoke-interface {p1}, Lcom/google/android/gms/common/api/k;->ls()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {p1}, Lcom/google/android/gms/common/api/k;->lq()Lcom/google/android/gms/common/api/Status;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/api/Status;->kX()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/common/api/Status;->kV()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->afW:Lcom/google/android/gms/common/api/n;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ago:Lcom/google/android/gms/common/api/n;
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/ah;->lR()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/ah;->lP()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v1
 
@@ -155,18 +155,18 @@
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/an;->lS()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/an;->lQ()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->afY:Lcom/google/android/gms/common/api/m;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->agq:Lcom/google/android/gms/common/api/m;
 
     goto :goto_0
 
     :cond_1
-    invoke-interface {p1}, Lcom/google/android/gms/common/api/k;->ls()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {p1}, Lcom/google/android/gms/common/api/k;->lq()Lcom/google/android/gms/common/api/Status;
 
     move-result-object p1
 
@@ -191,14 +191,14 @@
 .method final h(Lcom/google/android/gms/common/api/Status;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->aeg:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->aey:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->aga:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ags:Lcom/google/android/gms/common/api/Status;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->aga:Lcom/google/android/gms/common/api/Status;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ags:Lcom/google/android/gms/common/api/Status;
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/common/api/internal/an;->i(Lcom/google/android/gms/common/api/Status;)V
 
@@ -219,12 +219,12 @@
 .method final i(Lcom/google/android/gms/common/api/Status;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->aeg:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->aey:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->afW:Lcom/google/android/gms/common/api/n;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ago:Lcom/google/android/gms/common/api/n;
 
     if-eqz v1, :cond_0
 
@@ -232,20 +232,20 @@
 
     invoke-static {p1, v1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->afX:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->agp:Lcom/google/android/gms/common/api/internal/an;
 
     invoke-virtual {v1, p1}, Lcom/google/android/gms/common/api/internal/an;->h(Lcom/google/android/gms/common/api/Status;)V
 
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/an;->lS()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/an;->lQ()Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->afY:Lcom/google/android/gms/common/api/m;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->agq:Lcom/google/android/gms/common/api/m;
 
     :cond_1
     :goto_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ao.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ao.smali
index 3fa1937e97..08f5da97b9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ao.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ao.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic agd:Lcom/google/android/gms/common/api/k;
+.field private final synthetic agv:Lcom/google/android/gms/common/api/k;
 
-.field private final synthetic age:Lcom/google/android/gms/common/api/internal/an;
+.field private final synthetic agw:Lcom/google/android/gms/common/api/internal/an;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/an;Lcom/google/android/gms/common/api/k;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ao;->age:Lcom/google/android/gms/common/api/internal/an;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ao;->agw:Lcom/google/android/gms/common/api/internal/an;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ao;->agd:Lcom/google/android/gms/common/api/k;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ao;->agv:Lcom/google/android/gms/common/api/k;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,27 +30,27 @@
     .locals 4
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aef:Ljava/lang/ThreadLocal;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aex:Ljava/lang/ThreadLocal;
 
     sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
     invoke-virtual {v0, v1}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ao;->age:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ao;->agw:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->afW:Lcom/google/android/gms/common/api/n;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->ago:Lcom/google/android/gms/common/api/n;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/n;->lt()Lcom/google/android/gms/common/api/g;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/n;->lr()Lcom/google/android/gms/common/api/g;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->age:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->agw:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->agb:Lcom/google/android/gms/common/api/internal/ap;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->agt:Lcom/google/android/gms/common/api/internal/ap;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ao;->age:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ao;->agw:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->agb:Lcom/google/android/gms/common/api/internal/ap;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->agt:Lcom/google/android/gms/common/api/internal/ap;
 
     const/4 v3, 0x0
 
@@ -63,15 +63,15 @@
     .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aef:Ljava/lang/ThreadLocal;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aex:Ljava/lang/ThreadLocal;
 
     sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
     invoke-virtual {v0, v1}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ao;->age:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ao;->agw:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->aei:Ljava/lang/ref/WeakReference;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->aeA:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -81,7 +81,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/f;->lp()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/f;->ln()V
 
     :cond_0
     return-void
@@ -95,13 +95,13 @@
     move-exception v0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->age:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->agw:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->agb:Lcom/google/android/gms/common/api/internal/ap;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->agt:Lcom/google/android/gms/common/api/internal/ap;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ao;->age:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ao;->agw:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->agb:Lcom/google/android/gms/common/api/internal/ap;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->agt:Lcom/google/android/gms/common/api/internal/ap;
 
     const/4 v3, 0x1
 
@@ -113,15 +113,15 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aef:Ljava/lang/ThreadLocal;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aex:Ljava/lang/ThreadLocal;
 
     sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
     invoke-virtual {v0, v1}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ao;->age:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ao;->agw:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->aei:Ljava/lang/ref/WeakReference;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->aeA:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -131,21 +131,21 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/f;->lp()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/f;->ln()V
 
     :cond_1
     return-void
 
     :goto_0
-    sget-object v1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aef:Ljava/lang/ThreadLocal;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aex:Ljava/lang/ThreadLocal;
 
     sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v2}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->age:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->agw:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->aei:Ljava/lang/ref/WeakReference;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->aeA:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -155,7 +155,7 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/api/f;->lp()V
+    invoke-virtual {v1}, Lcom/google/android/gms/common/api/f;->ln()V
 
     :cond_2
     throw v0
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ap.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ap.smali
index 1e9af9c987..68ef89d818 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ap.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ap.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final synthetic age:Lcom/google/android/gms/common/api/internal/an;
+.field private final synthetic agw:Lcom/google/android/gms/common/api/internal/an;
 
 
 # virtual methods
@@ -88,18 +88,18 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/g;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ap;->age:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ap;->agw:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->aeg:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->aey:Ljava/lang/Object;
 
     monitor-enter v0
 
     if-nez p1, :cond_3
 
     :try_start_0
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ap;->age:Lcom/google/android/gms/common/api/internal/an;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ap;->agw:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/an;->afX:Lcom/google/android/gms/common/api/internal/an;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/an;->agp:Lcom/google/android/gms/common/api/internal/an;
 
     new-instance v1, Lcom/google/android/gms/common/api/Status;
 
@@ -118,9 +118,9 @@
 
     if-eqz v2, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ap;->age:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ap;->agw:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->afX:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->agp:Lcom/google/android/gms/common/api/internal/an;
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/ai;
 
@@ -131,29 +131,29 @@
     goto :goto_2
 
     :cond_4
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ap;->age:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ap;->agw:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->afX:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->agp:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v3, v2, Lcom/google/android/gms/common/api/internal/an;->aeg:Ljava/lang/Object;
+    iget-object v3, v2, Lcom/google/android/gms/common/api/internal/an;->aey:Ljava/lang/Object;
 
     monitor-enter v3
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iput-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->afZ:Lcom/google/android/gms/common/api/g;
+    iput-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->agr:Lcom/google/android/gms/common/api/g;
 
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->afW:Lcom/google/android/gms/common/api/n;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ago:Lcom/google/android/gms/common/api/n;
 
     if-nez p1, :cond_5
 
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->afY:Lcom/google/android/gms/common/api/m;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->agq:Lcom/google/android/gms/common/api/m;
 
     if-eqz p1, :cond_8
 
     :cond_5
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->aei:Ljava/lang/ref/WeakReference;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->aeA:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -161,37 +161,37 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/f;
 
-    iget-boolean v4, v2, Lcom/google/android/gms/common/api/internal/an;->agc:Z
+    iget-boolean v4, v2, Lcom/google/android/gms/common/api/internal/an;->agu:Z
 
     if-nez v4, :cond_6
 
-    iget-object v4, v2, Lcom/google/android/gms/common/api/internal/an;->afW:Lcom/google/android/gms/common/api/n;
+    iget-object v4, v2, Lcom/google/android/gms/common/api/internal/an;->ago:Lcom/google/android/gms/common/api/n;
 
     if-eqz v4, :cond_6
 
     if-eqz p1, :cond_6
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/f;->lo()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/f;->lm()V
 
-    iput-boolean v1, v2, Lcom/google/android/gms/common/api/internal/an;->agc:Z
+    iput-boolean v1, v2, Lcom/google/android/gms/common/api/internal/an;->agu:Z
 
     :cond_6
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->aga:Lcom/google/android/gms/common/api/Status;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ags:Lcom/google/android/gms/common/api/Status;
 
     if-eqz p1, :cond_7
 
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->aga:Lcom/google/android/gms/common/api/Status;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ags:Lcom/google/android/gms/common/api/Status;
 
     invoke-virtual {v2, p1}, Lcom/google/android/gms/common/api/internal/an;->i(Lcom/google/android/gms/common/api/Status;)V
 
     goto :goto_1
 
     :cond_7
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->afZ:Lcom/google/android/gms/common/api/g;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->agr:Lcom/google/android/gms/common/api/g;
 
     if-eqz p1, :cond_8
 
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->afZ:Lcom/google/android/gms/common/api/g;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->agr:Lcom/google/android/gms/common/api/g;
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/common/api/g;->a(Lcom/google/android/gms/common/api/l;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aq.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aq.smali
index 975bf27362..768d19520c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aq.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field public static final agf:Lcom/google/android/gms/common/api/Status;
+.field public static final agx:Lcom/google/android/gms/common/api/Status;
 
-.field private static final agg:[Lcom/google/android/gms/common/api/internal/BasePendingResult;
+.field private static final agy:[Lcom/google/android/gms/common/api/internal/BasePendingResult;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -28,13 +28,13 @@
 
     invoke-direct {v0, v1, v2}, Lcom/google/android/gms/common/api/Status;-><init>(ILjava/lang/String;)V
 
-    sput-object v0, Lcom/google/android/gms/common/api/internal/aq;->agf:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/aq;->agx:Lcom/google/android/gms/common/api/Status;
 
     const/4 v0, 0x0
 
     new-array v0, v0, [Lcom/google/android/gms/common/api/internal/BasePendingResult;
 
-    sput-object v0, Lcom/google/android/gms/common/api/internal/aq;->agg:[Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/aq;->agy:[Lcom/google/android/gms/common/api/internal/BasePendingResult;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ar.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ar.smali
index 705b1e8bd1..dd687afc12 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ar.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ar.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field protected final agh:Lcom/google/android/gms/tasks/h;
+.field protected final agz:Lcom/google/android/gms/tasks/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/h<",
@@ -37,7 +37,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/common/api/internal/ag;-><init>(I)V
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ar;->agh:Lcom/google/android/gms/tasks/h;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ar;->agz:Lcom/google/android/gms/tasks/h;
 
     return-void
 .end method
@@ -108,7 +108,7 @@
 .method public b(Ljava/lang/RuntimeException;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ar;->agh:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ar;->agz:Lcom/google/android/gms/tasks/h;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/h;->g(Ljava/lang/Exception;)Z
 
@@ -134,7 +134,7 @@
 .method public g(Lcom/google/android/gms/common/api/Status;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ar;->agh:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ar;->agz:Lcom/google/android/gms/tasks/h;
 
     new-instance v1, Lcom/google/android/gms/common/api/b;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/as.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/as.smali
index a8186422d4..e0aee810b7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/as.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/as.smali
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field private final agi:Lcom/google/android/gms/common/api/internal/c$a;
+.field private final agA:Lcom/google/android/gms/common/api/internal/c$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TA;"
@@ -39,7 +39,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/common/api/internal/t;-><init>(I)V
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/as;->agi:Lcom/google/android/gms/common/api/internal/c$a;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/as;->agA:Lcom/google/android/gms/common/api/internal/c$a;
 
     return-void
 .end method
@@ -49,9 +49,9 @@
 .method public final a(Lcom/google/android/gms/common/api/internal/n;Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/as;->agi:Lcom/google/android/gms/common/api/internal/c$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/as;->agA:Lcom/google/android/gms/common/api/internal/c$a;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/n;->afu:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/n;->afM:Ljava/util/Map;
 
     invoke-static {p2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -85,9 +85,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/as;->agi:Lcom/google/android/gms/common/api/internal/c$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/as;->agA:Lcom/google/android/gms/common/api/internal/c$a;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/api/internal/c$a;->a(Lcom/google/android/gms/common/api/a$b;)V
     :try_end_0
@@ -160,7 +160,7 @@
 
     invoke-direct {v0, v1, p1}, Lcom/google/android/gms/common/api/Status;-><init>(ILjava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/as;->agi:Lcom/google/android/gms/common/api/internal/c$a;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/as;->agA:Lcom/google/android/gms/common/api/internal/c$a;
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/common/api/internal/c$a;->c(Lcom/google/android/gms/common/api/Status;)V
 
@@ -170,7 +170,7 @@
 .method public final g(Lcom/google/android/gms/common/api/Status;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/as;->agi:Lcom/google/android/gms/common/api/internal/c$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/as;->agA:Lcom/google/android/gms/common/api/internal/c$a;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/api/internal/c$a;->c(Lcom/google/android/gms/common/api/Status;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/at.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/at.smali
index 0aacd9ddc3..dffb90995b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/at.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/at.smali
@@ -13,7 +13,7 @@
 
 
 # instance fields
-.field private final agj:Lcom/google/android/gms/common/api/internal/j;
+.field private final agB:Lcom/google/android/gms/common/api/internal/j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/j<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final agk:Lcom/google/android/gms/common/api/internal/m;
+.field private final agC:Lcom/google/android/gms/common/api/internal/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/m<",
@@ -51,13 +51,13 @@
 
     invoke-direct {p0, v0, p2}, Lcom/google/android/gms/common/api/internal/ar;-><init>(ILcom/google/android/gms/tasks/h;)V
 
-    iget-object p2, p1, Lcom/google/android/gms/common/api/internal/af;->afM:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p2, p1, Lcom/google/android/gms/common/api/internal/af;->age:Lcom/google/android/gms/common/api/internal/j;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/at;->agj:Lcom/google/android/gms/common/api/internal/j;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/at;->agB:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/af;->afN:Lcom/google/android/gms/common/api/internal/m;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/af;->agf:Lcom/google/android/gms/common/api/internal/m;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/at;->agk:Lcom/google/android/gms/common/api/internal/m;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/at;->agC:Lcom/google/android/gms/common/api/internal/m;
 
     return-void
 .end method
@@ -89,9 +89,9 @@
         }
     .end annotation
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/at;->agj:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/at;->agB:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->afq:[Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->afI:[Lcom/google/android/gms/common/Feature;
 
     return-object p1
 .end method
@@ -106,9 +106,9 @@
         }
     .end annotation
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/at;->agj:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/at;->agB:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/j;->afr:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/j;->afJ:Z
 
     return p1
 .end method
@@ -129,35 +129,35 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->agj:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->agB:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/at;->agh:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/at;->agz:Lcom/google/android/gms/tasks/h;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/common/api/internal/j;->a(Lcom/google/android/gms/common/api/a$b;Lcom/google/android/gms/tasks/h;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->agj:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->agB:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/j;->afp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/j;->afH:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeQ:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->afi:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->agj:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->agB:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/j;->afp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/j;->afH:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     new-instance v1, Lcom/google/android/gms/common/api/internal/af;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/at;->agj:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/at;->agB:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/at;->agk:Lcom/google/android/gms/common/api/internal/m;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/at;->agC:Lcom/google/android/gms/common/api/internal/m;
 
     invoke-direct {v1, v2, v3}, Lcom/google/android/gms/common/api/internal/af;-><init>(Lcom/google/android/gms/common/api/internal/j;Lcom/google/android/gms/common/api/internal/m;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/au.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/au.smali
index 181b96ff7b..78db83e579 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/au.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/au.smali
@@ -14,16 +14,7 @@
 
 
 # instance fields
-.field private final agh:Lcom/google/android/gms/tasks/h;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/tasks/h<",
-            "TResultT;>;"
-        }
-    .end annotation
-.end field
-
-.field private final agl:Lcom/google/android/gms/common/api/internal/l;
+.field private final agD:Lcom/google/android/gms/common/api/internal/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/l<",
@@ -33,7 +24,16 @@
     .end annotation
 .end field
 
-.field private final agm:Lcom/google/android/gms/common/api/internal/k;
+.field private final agE:Lcom/google/android/gms/common/api/internal/k;
+
+.field private final agz:Lcom/google/android/gms/tasks/h;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/tasks/h<",
+            "TResultT;>;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
@@ -56,11 +56,11 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/common/api/internal/ag;-><init>(I)V
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/au;->agh:Lcom/google/android/gms/tasks/h;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/au;->agz:Lcom/google/android/gms/tasks/h;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/au;->agl:Lcom/google/android/gms/common/api/internal/l;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/au;->agD:Lcom/google/android/gms/common/api/internal/l;
 
-    iput-object p4, p0, Lcom/google/android/gms/common/api/internal/au;->agm:Lcom/google/android/gms/common/api/internal/k;
+    iput-object p4, p0, Lcom/google/android/gms/common/api/internal/au;->agE:Lcom/google/android/gms/common/api/internal/k;
 
     return-void
 .end method
@@ -70,9 +70,9 @@
 .method public final a(Lcom/google/android/gms/common/api/internal/n;Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->agh:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->agz:Lcom/google/android/gms/tasks/h;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/n;->afv:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/n;->afN:Ljava/util/Map;
 
     invoke-static {p2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -80,7 +80,7 @@
 
     invoke-interface {v1, v0, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p2, v0, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object p2, v0, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     new-instance v1, Lcom/google/android/gms/common/api/internal/p;
 
@@ -108,11 +108,11 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->agl:Lcom/google/android/gms/common/api/internal/l;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->agD:Lcom/google/android/gms/common/api/internal/l;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/au;->agh:Lcom/google/android/gms/tasks/h;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/au;->agz:Lcom/google/android/gms/tasks/h;
 
     invoke-virtual {v0, p1, v1}, Lcom/google/android/gms/common/api/internal/l;->b(Lcom/google/android/gms/common/api/a$b;Lcom/google/android/gms/tasks/h;)V
     :try_end_0
@@ -149,7 +149,7 @@
 .method public final b(Ljava/lang/RuntimeException;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->agh:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->agz:Lcom/google/android/gms/tasks/h;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/h;->g(Ljava/lang/Exception;)Z
 
@@ -167,9 +167,9 @@
         }
     .end annotation
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/au;->agl:Lcom/google/android/gms/common/api/internal/l;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/au;->agD:Lcom/google/android/gms/common/api/internal/l;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/l;->afs:[Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/l;->afK:[Lcom/google/android/gms/common/Feature;
 
     return-object p1
 .end method
@@ -184,9 +184,9 @@
         }
     .end annotation
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/au;->agl:Lcom/google/android/gms/common/api/internal/l;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/au;->agD:Lcom/google/android/gms/common/api/internal/l;
 
-    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/l;->aft:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/l;->afL:Z
 
     return p1
 .end method
@@ -194,9 +194,9 @@
 .method public final g(Lcom/google/android/gms/common/api/Status;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->agh:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->agz:Lcom/google/android/gms/tasks/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/au;->agm:Lcom/google/android/gms/common/api/internal/k;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/au;->agE:Lcom/google/android/gms/common/api/internal/k;
 
     invoke-interface {v1, p1}, Lcom/google/android/gms/common/api/internal/k;->b(Lcom/google/android/gms/common/api/Status;)Ljava/lang/Exception;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/av.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/av.smali
index 1731cefd3f..d92eb4c76e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/av.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/av.smali
@@ -13,7 +13,7 @@
 
 
 # instance fields
-.field private final agn:Lcom/google/android/gms/common/api/internal/h$a;
+.field private final agF:Lcom/google/android/gms/common/api/internal/h$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h$a<",
@@ -41,7 +41,7 @@
 
     invoke-direct {p0, v0, p2}, Lcom/google/android/gms/common/api/internal/ar;-><init>(ILcom/google/android/gms/tasks/h;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/av;->agn:Lcom/google/android/gms/common/api/internal/h$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/av;->agF:Lcom/google/android/gms/common/api/internal/h$a;
 
     return-void
 .end method
@@ -73,9 +73,9 @@
         }
     .end annotation
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeQ:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->afi:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/av;->agn:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/av;->agF:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -90,9 +90,9 @@
     return-object p1
 
     :cond_0
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/af;->afM:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/af;->age:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->afq:[Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->afI:[Lcom/google/android/gms/common/Feature;
 
     return-object p1
 .end method
@@ -107,9 +107,9 @@
         }
     .end annotation
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeQ:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->afi:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/av;->agn:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/av;->agF:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -119,9 +119,9 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/af;->afM:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/af;->age:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/j;->afr:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/j;->afJ:Z
 
     if-eqz p1, :cond_0
 
@@ -151,9 +151,9 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeQ:Ljava/util/Map;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->afi:Ljava/util/Map;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/av;->agn:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/av;->agF:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -163,30 +163,30 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/af;->afN:Lcom/google/android/gms/common/api/internal/m;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/af;->agf:Lcom/google/android/gms/common/api/internal/m;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/av;->agh:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/av;->agz:Lcom/google/android/gms/tasks/h;
 
     invoke-virtual {v1, p1, v2}, Lcom/google/android/gms/common/api/internal/m;->c(Lcom/google/android/gms/common/api/a$b;Lcom/google/android/gms/tasks/h;)V
 
-    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/af;->afM:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/af;->age:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->afp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->afH:Lcom/google/android/gms/common/api/internal/h;
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/gms/common/api/internal/h;->afl:Ljava/lang/Object;
+    iput-object v0, p1, Lcom/google/android/gms/common/api/internal/h;->afD:Ljava/lang/Object;
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/av;->agh:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/av;->agz:Lcom/google/android/gms/tasks/h;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/tasks/ac;->j(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aw.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aw.smali
index e6cda698c3..c2700bb410 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/aw.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field public final adD:Lcom/google/android/gms/common/api/a;
+.field public final adV:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final adE:Lcom/google/android/gms/common/api/a$d;
+.field private final adW:Lcom/google/android/gms/common/api/a$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TO;"
@@ -31,9 +31,9 @@
     .end annotation
 .end field
 
-.field private final ago:Z
+.field private final agG:Z
 
-.field private final agp:I
+.field private final agH:I
 
 
 # direct methods
@@ -51,21 +51,21 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/aw;->ago:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/aw;->agG:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aw;->adD:Lcom/google/android/gms/common/api/a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aw;->adV:Lcom/google/android/gms/common/api/a;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->adE:Lcom/google/android/gms/common/api/a$d;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->adW:Lcom/google/android/gms/common/api/a$d;
 
     const/4 p1, 0x2
 
     new-array p1, p1, [Ljava/lang/Object;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->adD:Lcom/google/android/gms/common/api/a;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->adV:Lcom/google/android/gms/common/api/a;
 
     aput-object p2, p1, v0
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->adE:Lcom/google/android/gms/common/api/a$d;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->adW:Lcom/google/android/gms/common/api/a$d;
 
     const/4 v0, 0x1
 
@@ -75,7 +75,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/gms/common/api/internal/aw;->agp:I
+    iput p1, p0, Lcom/google/android/gms/common/api/internal/aw;->agH:I
 
     return-void
 .end method
@@ -124,17 +124,17 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/common/api/internal/aw;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/aw;->ago:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/aw;->agG:Z
 
     if-nez v1, :cond_2
 
-    iget-boolean v1, p1, Lcom/google/android/gms/common/api/internal/aw;->ago:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/common/api/internal/aw;->agG:Z
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aw;->adD:Lcom/google/android/gms/common/api/a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aw;->adV:Lcom/google/android/gms/common/api/a;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/api/internal/aw;->adD:Lcom/google/android/gms/common/api/a;
+    iget-object v3, p1, Lcom/google/android/gms/common/api/internal/aw;->adV:Lcom/google/android/gms/common/api/a;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -142,9 +142,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aw;->adE:Lcom/google/android/gms/common/api/a$d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aw;->adW:Lcom/google/android/gms/common/api/a$d;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/aw;->adE:Lcom/google/android/gms/common/api/a$d;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/aw;->adW:Lcom/google/android/gms/common/api/a$d;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -161,7 +161,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/common/api/internal/aw;->agp:I
+    iget v0, p0, Lcom/google/android/gms/common/api/internal/aw;->agH:I
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ax.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ax.smali
index 97b68a7be1..60e5486f4a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ax.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ax.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final agq:Landroidx/collection/ArrayMap;
+.field private final agI:Landroidx/collection/ArrayMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/ArrayMap<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field private final agr:Lcom/google/android/gms/tasks/h;
+.field private final agJ:Lcom/google/android/gms/tasks/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/h<",
@@ -28,9 +28,9 @@
     .end annotation
 .end field
 
-.field private ags:I
+.field private agK:I
 
-.field private agt:Z
+.field private agL:Z
 
 .field final zaay:Landroidx/collection/ArrayMap;
     .annotation system Ldalvik/annotation/Signature;
@@ -63,32 +63,32 @@
 
     invoke-virtual {v0, p1, p2}, Landroidx/collection/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ax;->agq:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ax;->agI:Landroidx/collection/ArrayMap;
 
     invoke-virtual {v0, p1, p3}, Landroidx/collection/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget p1, p0, Lcom/google/android/gms/common/api/internal/ax;->ags:I
+    iget p1, p0, Lcom/google/android/gms/common/api/internal/ax;->agK:I
 
     const/4 p3, 0x1
 
     sub-int/2addr p1, p3
 
-    iput p1, p0, Lcom/google/android/gms/common/api/internal/ax;->ags:I
+    iput p1, p0, Lcom/google/android/gms/common/api/internal/ax;->agK:I
 
-    invoke-virtual {p2}, Lcom/google/android/gms/common/ConnectionResult;->kX()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/common/ConnectionResult;->kV()Z
 
     move-result p1
 
     if-nez p1, :cond_0
 
-    iput-boolean p3, p0, Lcom/google/android/gms/common/api/internal/ax;->agt:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/common/api/internal/ax;->agL:Z
 
     :cond_0
-    iget p1, p0, Lcom/google/android/gms/common/api/internal/ax;->ags:I
+    iget p1, p0, Lcom/google/android/gms/common/api/internal/ax;->agK:I
 
     if-nez p1, :cond_2
 
-    iget-boolean p1, p0, Lcom/google/android/gms/common/api/internal/ax;->agt:Z
+    iget-boolean p1, p0, Lcom/google/android/gms/common/api/internal/ax;->agL:Z
 
     if-eqz p1, :cond_1
 
@@ -98,16 +98,16 @@
 
     invoke-direct {p1, p2}, Lcom/google/android/gms/common/api/c;-><init>(Landroidx/collection/ArrayMap;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ax;->agr:Lcom/google/android/gms/tasks/h;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ax;->agJ:Lcom/google/android/gms/tasks/h;
 
     invoke-virtual {p2, p1}, Lcom/google/android/gms/tasks/h;->f(Ljava/lang/Exception;)V
 
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ax;->agr:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ax;->agJ:Lcom/google/android/gms/tasks/h;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ax;->agq:Landroidx/collection/ArrayMap;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ax;->agI:Landroidx/collection/ArrayMap;
 
     invoke-virtual {p1, p2}, Lcom/google/android/gms/tasks/h;->k(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ay.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ay.smali
index 132ef2c1c8..d2cecf7837 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ay.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ay.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field protected final agu:Ljava/util/concurrent/atomic/AtomicReference;
+.field protected final agM:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -16,9 +16,9 @@
     .end annotation
 .end field
 
-.field private final agv:Landroid/os/Handler;
+.field private final agN:Landroid/os/Handler;
 
-.field protected final agw:Lcom/google/android/gms/common/GoogleApiAvailability;
+.field protected final agO:Lcom/google/android/gms/common/GoogleApiAvailability;
 
 .field protected volatile mStarted:Z
 
@@ -27,7 +27,7 @@
 .method protected constructor <init>(Lcom/google/android/gms/common/api/internal/g;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kZ()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kX()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v0
 
@@ -47,7 +47,7 @@
 
     invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->agu:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->agM:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance p1, Lcom/google/android/gms/internal/b/e;
 
@@ -57,9 +57,9 @@
 
     invoke-direct {p1, v0}, Lcom/google/android/gms/internal/b/e;-><init>(Landroid/os/Looper;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->agv:Landroid/os/Handler;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->agN:Landroid/os/Handler;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ay;->agw:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ay;->agO:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
     return p0
 
     :cond_0
-    iget p0, p0, Lcom/google/android/gms/common/api/internal/az;->agx:I
+    iget p0, p0, Lcom/google/android/gms/common/api/internal/az;->agP:I
 
     return p0
 .end method
@@ -91,7 +91,7 @@
 
     invoke-direct {v0, p1, p2}, Lcom/google/android/gms/common/api/internal/az;-><init>(Lcom/google/android/gms/common/ConnectionResult;I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->agu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->agM:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 p2, 0x0
 
@@ -101,7 +101,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->agv:Landroid/os/Handler;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->agN:Landroid/os/Handler;
 
     new-instance p2, Lcom/google/android/gms/common/api/internal/ba;
 
@@ -113,27 +113,27 @@
     return-void
 .end method
 
-.method protected final lT()V
+.method protected final lR()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->agu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->agM:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->lw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->lu()V
 
     return-void
 .end method
 
-.method protected abstract lw()V
+.method protected abstract lu()V
 .end method
 
 .method public final onActivityResult(IILandroid/content/Intent;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->agu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->agM:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -154,7 +154,7 @@
     goto :goto_1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->agw:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->agO:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->getActivity()Landroid/app/Activity;
 
@@ -177,9 +177,9 @@
     return-void
 
     :cond_2
-    iget-object p2, v0, Lcom/google/android/gms/common/api/internal/az;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p2, v0, Lcom/google/android/gms/common/api/internal/az;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget p2, p2, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget p2, p2, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     const/16 p3, 0x12
 
@@ -224,7 +224,7 @@
 
     invoke-direct {p2, p3, p1}, Lcom/google/android/gms/common/api/internal/az;-><init>(Lcom/google/android/gms/common/ConnectionResult;I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->agu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->agM:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {p1, p2}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
@@ -238,16 +238,16 @@
     :goto_2
     if-eqz v1, :cond_8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->lT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->lR()V
 
     return-void
 
     :cond_8
     if-eqz v0, :cond_9
 
-    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/az;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/az;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget p2, v0, Lcom/google/android/gms/common/api/internal/az;->agx:I
+    iget p2, v0, Lcom/google/android/gms/common/api/internal/az;->agP:I
 
     invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/common/api/internal/ay;->b(Lcom/google/android/gms/common/ConnectionResult;I)V
 
@@ -266,7 +266,7 @@
 
     invoke-direct {p1, v0, v1}, Lcom/google/android/gms/common/ConnectionResult;-><init>(ILandroid/app/PendingIntent;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->agu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->agM:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -280,7 +280,7 @@
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/common/api/internal/ay;->b(Lcom/google/android/gms/common/ConnectionResult;I)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->lT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->lR()V
 
     return-void
 .end method
@@ -292,7 +292,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->agu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->agM:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
@@ -351,7 +351,7 @@
 
     invoke-super {p0, p1}, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->onSaveInstanceState(Landroid/os/Bundle;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->agu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->agM:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -367,23 +367,23 @@
 
     invoke-virtual {p1, v2, v1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
-    iget v1, v0, Lcom/google/android/gms/common/api/internal/az;->agx:I
+    iget v1, v0, Lcom/google/android/gms/common/api/internal/az;->agP:I
 
     const-string v2, "failed_client_id"
 
     invoke-virtual {p1, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
-    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/az;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/az;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget v1, v1, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v1, v1, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     const-string v2, "failed_status"
 
     invoke-virtual {p1, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/az;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/az;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/ConnectionResult;->ado:Landroid/app/PendingIntent;
+    iget-object v0, v0, Lcom/google/android/gms/common/ConnectionResult;->adG:Landroid/app/PendingIntent;
 
     const-string v1, "failed_resolution"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/az.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/az.smali
index 66fe4462b0..397f8b8676 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/az.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/az.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field final agx:I
+.field final agP:I
 
-.field final agy:Lcom/google/android/gms/common/ConnectionResult;
+.field final agQ:Lcom/google/android/gms/common/ConnectionResult;
 
 
 # direct methods
@@ -16,9 +16,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/az;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/az;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
-    iput p2, p0, Lcom/google/android/gms/common/api/internal/az;->agx:I
+    iput p2, p0, Lcom/google/android/gms/common/api/internal/az;->agP:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/b$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/b$a.smali
index 48ee41f5f7..3971cc5e57 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/b$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/b$a.smali
@@ -14,5 +14,5 @@
 
 
 # virtual methods
-.method public abstract H(Z)V
+.method public abstract F(Z)V
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/b.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/b.smali
index 55901efc65..9acf6d6a63 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/b.smali
@@ -15,15 +15,15 @@
 
 
 # static fields
-.field private static final adY:Lcom/google/android/gms/common/api/internal/b;
+.field private static final aer:Lcom/google/android/gms/common/api/internal/b;
 
 
 # instance fields
-.field final adZ:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final aes:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final aea:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final aet:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final aeb:Ljava/util/ArrayList;
+.field private final aeu:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private aed:Z
+.field private aev:Z
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/internal/b;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/api/internal/b;->adY:Lcom/google/android/gms/common/api/internal/b;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/b;->aer:Lcom/google/android/gms/common/api/internal/b;
 
     return-void
 .end method
@@ -58,36 +58,36 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/b;->adZ:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/b;->aes:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/b;->aea:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/b;->aet:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/b;->aeb:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/b;->aeu:Ljava/util/ArrayList;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/b;->aed:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/b;->aev:Z
 
     return-void
 .end method
 
-.method private final H(Z)V
+.method private final F(Z)V
     .locals 5
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->adY:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->aer:Lcom/google/android/gms/common/api/internal/b;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/b;->aeb:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/b;->aeu:Ljava/util/ArrayList;
 
     check-cast v1, Ljava/util/ArrayList;
 
@@ -108,7 +108,7 @@
 
     check-cast v4, Lcom/google/android/gms/common/api/internal/b$a;
 
-    invoke-interface {v4, p1}, Lcom/google/android/gms/common/api/internal/b$a;->H(Z)V
+    invoke-interface {v4, p1}, Lcom/google/android/gms/common/api/internal/b$a;->F(Z)V
 
     goto :goto_0
 
@@ -136,30 +136,30 @@
 .method public static initialize(Landroid/app/Application;)V
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->adY:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->aer:Lcom/google/android/gms/common/api/internal/b;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->adY:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->aer:Lcom/google/android/gms/common/api/internal/b;
 
-    iget-boolean v1, v1, Lcom/google/android/gms/common/api/internal/b;->aed:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/common/api/internal/b;->aev:Z
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->adY:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->aer:Lcom/google/android/gms/common/api/internal/b;
 
     invoke-virtual {p0, v1}, Landroid/app/Application;->registerActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
 
-    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->adY:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->aer:Lcom/google/android/gms/common/api/internal/b;
 
     invoke-virtual {p0, v1}, Landroid/app/Application;->registerComponentCallbacks(Landroid/content/ComponentCallbacks;)V
 
-    sget-object p0, Lcom/google/android/gms/common/api/internal/b;->adY:Lcom/google/android/gms/common/api/internal/b;
+    sget-object p0, Lcom/google/android/gms/common/api/internal/b;->aer:Lcom/google/android/gms/common/api/internal/b;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/common/api/internal/b;->aed:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/common/api/internal/b;->aev:Z
 
     :cond_0
     monitor-exit v0
@@ -176,10 +176,10 @@
     throw p0
 .end method
 
-.method public static lu()Lcom/google/android/gms/common/api/internal/b;
+.method public static ls()Lcom/google/android/gms/common/api/internal/b;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->adY:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->aer:Lcom/google/android/gms/common/api/internal/b;
 
     return-object v0
 .end method
@@ -189,12 +189,12 @@
 .method public final a(Lcom/google/android/gms/common/api/internal/b$a;)V
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->adY:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->aer:Lcom/google/android/gms/common/api/internal/b;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/b;->aeb:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/b;->aeu:Ljava/util/ArrayList;
 
     invoke-virtual {v1, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -215,7 +215,7 @@
 .method public final onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->adZ:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->aes:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 p2, 0x0
 
@@ -225,13 +225,13 @@
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/b;->aea:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/b;->aet:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0, p2}, Lcom/google/android/gms/common/api/internal/b;->H(Z)V
+    invoke-direct {p0, p2}, Lcom/google/android/gms/common/api/internal/b;->F(Z)V
 
     :cond_0
     return-void
@@ -252,7 +252,7 @@
 .method public final onActivityResumed(Landroid/app/Activity;)V
     .locals 3
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->adZ:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->aes:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v0, 0x0
 
@@ -262,13 +262,13 @@
 
     move-result p1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/b;->aea:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/b;->aet:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/common/api/internal/b;->H(Z)V
+    invoke-direct {p0, v0}, Lcom/google/android/gms/common/api/internal/b;->F(Z)V
 
     :cond_0
     return-void
@@ -311,7 +311,7 @@
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->adZ:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->aes:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v0, 0x0
 
@@ -323,11 +323,11 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->aea:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->aet:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {p1, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
-    invoke-direct {p0, v1}, Lcom/google/android/gms/common/api/internal/b;->H(Z)V
+    invoke-direct {p0, v1}, Lcom/google/android/gms/common/api/internal/b;->F(Z)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ba.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ba.smali
index 7225037dca..96e019a283 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ba.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/ba.smali
@@ -6,20 +6,20 @@
 
 
 # instance fields
-.field final synthetic agA:Lcom/google/android/gms/common/api/internal/ay;
+.field private final agR:Lcom/google/android/gms/common/api/internal/az;
 
-.field private final agz:Lcom/google/android/gms/common/api/internal/az;
+.field final synthetic agS:Lcom/google/android/gms/common/api/internal/ay;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/ay;Lcom/google/android/gms/common/api/internal/az;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ba;->agz:Lcom/google/android/gms/common/api/internal/az;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ba;->agR:Lcom/google/android/gms/common/api/internal/az;
 
     return-void
 .end method
@@ -29,7 +29,7 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
     iget-boolean v0, v0, Lcom/google/android/gms/common/api/internal/ay;->mStarted:Z
 
@@ -38,31 +38,31 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ba;->agz:Lcom/google/android/gms/common/api/internal/az;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ba;->agR:Lcom/google/android/gms/common/api/internal/az;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/az;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/az;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kW()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kU()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->afi:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->afB:Lcom/google/android/gms/common/api/internal/g;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
     invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/ay;->getActivity()Landroid/app/Activity;
 
     move-result-object v2
 
-    iget-object v0, v0, Lcom/google/android/gms/common/ConnectionResult;->ado:Landroid/app/PendingIntent;
+    iget-object v0, v0, Lcom/google/android/gms/common/ConnectionResult;->adG:Landroid/app/PendingIntent;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/ba;->agz:Lcom/google/android/gms/common/api/internal/az;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/ba;->agR:Lcom/google/android/gms/common/api/internal/az;
 
-    iget v3, v3, Lcom/google/android/gms/common/api/internal/az;->agx:I
+    iget v3, v3, Lcom/google/android/gms/common/api/internal/az;->agP:I
 
     const/4 v4, 0x0
 
@@ -77,11 +77,11 @@
     return-void
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->agw:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->agO:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget v2, v0, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v2, v0, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/common/GoogleApiAvailability;->bc(I)Z
 
@@ -89,48 +89,48 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->agw:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->agO:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
     invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/ay;->getActivity()Landroid/app/Activity;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v3, v3, Lcom/google/android/gms/common/api/internal/ay;->afi:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v3, v3, Lcom/google/android/gms/common/api/internal/ay;->afB:Lcom/google/android/gms/common/api/internal/g;
 
-    iget v0, v0, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v0, v0, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
-    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
     invoke-virtual {v1, v2, v3, v0, v4}, Lcom/google/android/gms/common/GoogleApiAvailability;->a(Landroid/app/Activity;Lcom/google/android/gms/common/api/internal/g;ILandroid/content/DialogInterface$OnCancelListener;)Z
 
     return-void
 
     :cond_2
-    iget v1, v0, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v1, v0, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     const/16 v2, 0x12
 
     if-ne v1, v2, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/ay;->getActivity()Landroid/app/Activity;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/GoogleApiAvailability;->a(Landroid/app/Activity;Landroid/content/DialogInterface$OnCancelListener;)Landroid/app/Dialog;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
     invoke-virtual {v1}, Lcom/google/android/gms/common/api/internal/ay;->getActivity()Landroid/app/Activity;
 
@@ -170,7 +170,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/ac;->lQ()V
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/ac;->lO()V
 
     invoke-virtual {v3}, Lcom/google/android/gms/common/api/internal/ab;->unregister()V
 
@@ -178,11 +178,11 @@
     return-void
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->agz:Lcom/google/android/gms/common/api/internal/az;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->agR:Lcom/google/android/gms/common/api/internal/az;
 
-    iget v2, v2, Lcom/google/android/gms/common/api/internal/az;->agx:I
+    iget v2, v2, Lcom/google/android/gms/common/api/internal/az;->agP:I
 
     invoke-virtual {v1, v0, v2}, Lcom/google/android/gms/common/api/internal/ay;->b(Lcom/google/android/gms/common/ConnectionResult;I)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bb.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bb.smali
index 1937a0400c..44c8caa81d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bb.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic agB:Landroid/app/Dialog;
+.field private final synthetic agT:Landroid/app/Dialog;
 
-.field private final synthetic agC:Lcom/google/android/gms/common/api/internal/ba;
+.field private final synthetic agU:Lcom/google/android/gms/common/api/internal/ba;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/ba;Landroid/app/Dialog;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bb;->agC:Lcom/google/android/gms/common/api/internal/ba;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bb;->agU:Lcom/google/android/gms/common/api/internal/ba;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bb;->agB:Landroid/app/Dialog;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bb;->agT:Landroid/app/Dialog;
 
     invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/ac;-><init>()V
 
@@ -23,16 +23,16 @@
 
 
 # virtual methods
-.method public final lQ()V
+.method public final lO()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->agC:Lcom/google/android/gms/common/api/internal/ba;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->agU:Lcom/google/android/gms/common/api/internal/ba;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/ba;->agA:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/ba;->agS:Lcom/google/android/gms/common/api/internal/ay;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/ay;->lT()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/ay;->lR()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->agB:Landroid/app/Dialog;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->agT:Landroid/app/Dialog;
 
     invoke-virtual {v0}, Landroid/app/Dialog;->isShowing()Z
 
@@ -40,7 +40,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->agB:Landroid/app/Dialog;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->agT:Landroid/app/Dialog;
 
     invoke-virtual {v0}, Landroid/app/Dialog;->dismiss()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/be.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/be.smali
index e157329cb0..b2f42ff60e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/be.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/be.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static agD:Ljava/util/WeakHashMap;
+.field private static agV:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private agE:Ljava/util/Map;
+.field private agW:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -31,9 +31,9 @@
     .end annotation
 .end field
 
-.field private agF:I
+.field private agX:I
 
-.field private agG:Landroid/os/Bundle;
+.field private agY:Landroid/os/Bundle;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/api/internal/be;->agD:Ljava/util/WeakHashMap;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/be;->agV:Ljava/util/WeakHashMap;
 
     return-void
 .end method
@@ -58,11 +58,11 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agE:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agW:Ljava/util/Map;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->agF:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->agX:I
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 .method static synthetic a(Lcom/google/android/gms/common/api/internal/be;)I
     .locals 0
 
-    iget p0, p0, Lcom/google/android/gms/common/api/internal/be;->agF:I
+    iget p0, p0, Lcom/google/android/gms/common/api/internal/be;->agX:I
 
     return p0
 .end method
@@ -78,17 +78,17 @@
 .method static synthetic b(Lcom/google/android/gms/common/api/internal/be;)Landroid/os/Bundle;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/be;->agG:Landroid/os/Bundle;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/be;->agY:Landroid/os/Bundle;
 
     return-object p0
 .end method
 
-.method public static e(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/be;
+.method public static d(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/be;
     .locals 3
 
     const-string v0, "LifecycleFragmentImpl"
 
-    sget-object v1, Lcom/google/android/gms/common/api/internal/be;->agD:Ljava/util/WeakHashMap;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/be;->agV:Ljava/util/WeakHashMap;
 
     invoke-virtual {v1, p0}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -150,7 +150,7 @@
     invoke-virtual {v0}, Landroid/app/FragmentTransaction;->commitAllowingStateLoss()I
 
     :cond_2
-    sget-object v0, Lcom/google/android/gms/common/api/internal/be;->agD:Ljava/util/WeakHashMap;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/be;->agV:Ljava/util/WeakHashMap;
 
     new-instance v2, Ljava/lang/ref/WeakReference;
 
@@ -187,7 +187,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agW:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -205,7 +205,7 @@
 .method public final a(Ljava/lang/String;Lcom/google/android/gms/common/api/internal/LifecycleCallback;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agW:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -213,11 +213,11 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agW:Ljava/util/Map;
 
     invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v0, p0, Lcom/google/android/gms/common/api/internal/be;->agF:I
+    iget v0, p0, Lcom/google/android/gms/common/api/internal/be;->agX:I
 
     if-lez v0, :cond_0
 
@@ -279,7 +279,7 @@
 
     invoke-super {p0, p1, p2, p3, p4}, Landroid/app/Fragment;->dump(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/be;->agE:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/be;->agW:Ljava/util/Map;
 
     invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -304,7 +304,7 @@
     return-void
 .end method
 
-.method public final lK()Landroid/app/Activity;
+.method public final lI()Landroid/app/Activity;
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/be;->getActivity()Landroid/app/Activity;
@@ -319,7 +319,7 @@
 
     invoke-super {p0, p1, p2, p3}, Landroid/app/Fragment;->onActivityResult(IILandroid/content/Intent;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -357,11 +357,11 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->agF:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->agX:I
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/be;->agG:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/be;->agY:Landroid/os/Bundle;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -423,9 +423,9 @@
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->agF:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->agX:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -463,9 +463,9 @@
 
     const/4 v0, 0x3
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->agF:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->agX:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -506,7 +506,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -562,9 +562,9 @@
 
     const/4 v0, 0x2
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->agF:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->agX:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -602,9 +602,9 @@
 
     const/4 v0, 0x4
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->agF:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->agX:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bf.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bf.smali
index fdfd2bfc74..019ae93698 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bf.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+.field private final synthetic agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-.field private final synthetic agI:Ljava/lang/String;
+.field private final synthetic aha:Ljava/lang/String;
 
-.field private final synthetic agJ:Lcom/google/android/gms/common/api/internal/be;
+.field private final synthetic ahb:Lcom/google/android/gms/common/api/internal/be;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/be;Lcom/google/android/gms/common/api/internal/LifecycleCallback;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bf;->agJ:Lcom/google/android/gms/common/api/internal/be;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bf;->ahb:Lcom/google/android/gms/common/api/internal/be;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bf;->agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bf;->agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/bf;->agI:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/bf;->aha:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,7 +33,7 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agJ:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->ahb:Lcom/google/android/gms/common/api/internal/be;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/be;->a(Lcom/google/android/gms/common/api/internal/be;)I
 
@@ -41,9 +41,9 @@
 
     if-lez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bf;->agJ:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bf;->ahb:Lcom/google/android/gms/common/api/internal/be;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/be;->b(Lcom/google/android/gms/common/api/internal/be;)Landroid/os/Bundle;
 
@@ -51,13 +51,13 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bf;->agJ:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bf;->ahb:Lcom/google/android/gms/common/api/internal/be;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/be;->b(Lcom/google/android/gms/common/api/internal/be;)Landroid/os/Bundle;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/bf;->agI:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/bf;->aha:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Landroid/os/Bundle;->getBundle(Ljava/lang/String;)Landroid/os/Bundle;
 
@@ -72,7 +72,7 @@
     invoke-virtual {v0, v1}, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->onCreate(Landroid/os/Bundle;)V
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agJ:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->ahb:Lcom/google/android/gms/common/api/internal/be;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/be;->a(Lcom/google/android/gms/common/api/internal/be;)I
 
@@ -82,12 +82,12 @@
 
     if-lt v0, v1, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->onStart()V
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agJ:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->ahb:Lcom/google/android/gms/common/api/internal/be;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/be;->a(Lcom/google/android/gms/common/api/internal/be;)I
 
@@ -97,12 +97,12 @@
 
     if-lt v0, v1, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->onResume()V
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agJ:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->ahb:Lcom/google/android/gms/common/api/internal/be;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/be;->a(Lcom/google/android/gms/common/api/internal/be;)I
 
@@ -112,12 +112,12 @@
 
     if-lt v0, v1, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->onStop()V
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agJ:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->ahb:Lcom/google/android/gms/common/api/internal/be;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/be;->a(Lcom/google/android/gms/common/api/internal/be;)I
 
@@ -127,7 +127,7 @@
 
     if-lt v0, v1, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->onDestroy()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bg.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bg.smali
index 9968447f1c..f043ff9497 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bg.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static agD:Ljava/util/WeakHashMap;
+.field private static agV:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private agE:Ljava/util/Map;
+.field private agW:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -31,9 +31,9 @@
     .end annotation
 .end field
 
-.field private agF:I
+.field private agX:I
 
-.field private agG:Landroid/os/Bundle;
+.field private agY:Landroid/os/Bundle;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/api/internal/bg;->agD:Ljava/util/WeakHashMap;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/bg;->agV:Ljava/util/WeakHashMap;
 
     return-void
 .end method
@@ -58,11 +58,11 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agE:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agW:Ljava/util/Map;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agF:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agX:I
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 .method static synthetic a(Lcom/google/android/gms/common/api/internal/bg;)I
     .locals 0
 
-    iget p0, p0, Lcom/google/android/gms/common/api/internal/bg;->agF:I
+    iget p0, p0, Lcom/google/android/gms/common/api/internal/bg;->agX:I
 
     return p0
 .end method
@@ -80,7 +80,7 @@
 
     const-string v0, "SupportLifecycleFragmentImpl"
 
-    sget-object v1, Lcom/google/android/gms/common/api/internal/bg;->agD:Ljava/util/WeakHashMap;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/bg;->agV:Ljava/util/WeakHashMap;
 
     invoke-virtual {v1, p0}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -142,7 +142,7 @@
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentTransaction;->commitAllowingStateLoss()I
 
     :cond_2
-    sget-object v0, Lcom/google/android/gms/common/api/internal/bg;->agD:Ljava/util/WeakHashMap;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/bg;->agV:Ljava/util/WeakHashMap;
 
     new-instance v2, Ljava/lang/ref/WeakReference;
 
@@ -167,7 +167,7 @@
 .method static synthetic b(Lcom/google/android/gms/common/api/internal/bg;)Landroid/os/Bundle;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/bg;->agG:Landroid/os/Bundle;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/bg;->agY:Landroid/os/Bundle;
 
     return-object p0
 .end method
@@ -187,7 +187,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agW:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -205,7 +205,7 @@
 .method public final a(Ljava/lang/String;Lcom/google/android/gms/common/api/internal/LifecycleCallback;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agW:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -213,11 +213,11 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agW:Ljava/util/Map;
 
     invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agF:I
+    iget v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agX:I
 
     if-lez v0, :cond_0
 
@@ -279,7 +279,7 @@
 
     invoke-super {p0, p1, p2, p3, p4}, Landroidx/fragment/app/Fragment;->dump(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/bg;->agE:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/bg;->agW:Ljava/util/Map;
 
     invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -304,7 +304,7 @@
     return-void
 .end method
 
-.method public final synthetic lK()Landroid/app/Activity;
+.method public final synthetic lI()Landroid/app/Activity;
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/bg;->getActivity()Landroidx/fragment/app/FragmentActivity;
@@ -319,7 +319,7 @@
 
     invoke-super {p0, p1, p2, p3}, Landroidx/fragment/app/Fragment;->onActivityResult(IILandroid/content/Intent;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -357,11 +357,11 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agF:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agX:I
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bg;->agG:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bg;->agY:Landroid/os/Bundle;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -423,9 +423,9 @@
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agF:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agX:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -463,9 +463,9 @@
 
     const/4 v0, 0x3
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agF:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agX:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -506,7 +506,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -562,9 +562,9 @@
 
     const/4 v0, 0x2
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agF:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agX:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -602,9 +602,9 @@
 
     const/4 v0, 0x4
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agF:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agX:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->agW:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bh.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bh.smali
index a692707a47..dd37c65a13 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/bh.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+.field private final synthetic agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-.field private final synthetic agI:Ljava/lang/String;
+.field private final synthetic aha:Ljava/lang/String;
 
-.field private final synthetic agK:Lcom/google/android/gms/common/api/internal/bg;
+.field private final synthetic ahc:Lcom/google/android/gms/common/api/internal/bg;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/bg;Lcom/google/android/gms/common/api/internal/LifecycleCallback;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bh;->agK:Lcom/google/android/gms/common/api/internal/bg;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bh;->ahc:Lcom/google/android/gms/common/api/internal/bg;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bh;->agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bh;->agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/bh;->agI:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/bh;->aha:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,7 +33,7 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agK:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->ahc:Lcom/google/android/gms/common/api/internal/bg;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/bg;->a(Lcom/google/android/gms/common/api/internal/bg;)I
 
@@ -41,9 +41,9 @@
 
     if-lez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bh;->agK:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bh;->ahc:Lcom/google/android/gms/common/api/internal/bg;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/bg;->b(Lcom/google/android/gms/common/api/internal/bg;)Landroid/os/Bundle;
 
@@ -51,13 +51,13 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bh;->agK:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bh;->ahc:Lcom/google/android/gms/common/api/internal/bg;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/bg;->b(Lcom/google/android/gms/common/api/internal/bg;)Landroid/os/Bundle;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/bh;->agI:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/bh;->aha:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Landroid/os/Bundle;->getBundle(Ljava/lang/String;)Landroid/os/Bundle;
 
@@ -72,7 +72,7 @@
     invoke-virtual {v0, v1}, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->onCreate(Landroid/os/Bundle;)V
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agK:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->ahc:Lcom/google/android/gms/common/api/internal/bg;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/bg;->a(Lcom/google/android/gms/common/api/internal/bg;)I
 
@@ -82,12 +82,12 @@
 
     if-lt v0, v1, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->onStart()V
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agK:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->ahc:Lcom/google/android/gms/common/api/internal/bg;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/bg;->a(Lcom/google/android/gms/common/api/internal/bg;)I
 
@@ -97,12 +97,12 @@
 
     if-lt v0, v1, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->onResume()V
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agK:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->ahc:Lcom/google/android/gms/common/api/internal/bg;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/bg;->a(Lcom/google/android/gms/common/api/internal/bg;)I
 
@@ -112,12 +112,12 @@
 
     if-lt v0, v1, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->onStop()V
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agK:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->ahc:Lcom/google/android/gms/common/api/internal/bg;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/bg;->a(Lcom/google/android/gms/common/api/internal/bg;)I
 
@@ -127,7 +127,7 @@
 
     if-lt v0, v1, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agH:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->agZ:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->onDestroy()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/c$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/c$a.smali
index f45a87e4b6..9563f51931 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/c$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/c$a.smali
@@ -31,7 +31,7 @@
 
 
 # instance fields
-.field private final adD:Lcom/google/android/gms/common/api/a;
+.field private final adV:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field private final aee:Lcom/google/android/gms/common/api/a$c;
+.field private final aew:Lcom/google/android/gms/common/api/a$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$c<",
@@ -77,15 +77,15 @@
 
     invoke-static {p1, p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p2, p1, Lcom/google/android/gms/common/api/a;->adB:Lcom/google/android/gms/common/api/a$g;
+    iget-object p2, p1, Lcom/google/android/gms/common/api/a;->adT:Lcom/google/android/gms/common/api/a$g;
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p1, Lcom/google/android/gms/common/api/a;->adB:Lcom/google/android/gms/common/api/a$g;
+    iget-object p2, p1, Lcom/google/android/gms/common/api/a;->adT:Lcom/google/android/gms/common/api/a$g;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/c$a;->aee:Lcom/google/android/gms/common/api/a$c;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/c$a;->aew:Lcom/google/android/gms/common/api/a$c;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/c$a;->adD:Lcom/google/android/gms/common/api/a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/c$a;->adV:Lcom/google/android/gms/common/api/a;
 
     return-void
 
@@ -141,7 +141,7 @@
 
     check-cast p1, Lcom/google/android/gms/common/internal/s;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/internal/s;->aiF:Lcom/google/android/gms/common/api/a$h;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/s;->aiX:Lcom/google/android/gms/common/api/a$h;
 
     :cond_0
     :try_start_0
@@ -184,7 +184,7 @@
 .method public final c(Lcom/google/android/gms/common/api/Status;)V
     .locals 2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->kX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->kV()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d$a.smali
index f1256df3e2..b1ed3704d2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d$a.smali
@@ -31,7 +31,7 @@
 
 
 # instance fields
-.field private final aeK:Ljava/util/Queue;
+.field private final afc:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -41,11 +41,11 @@
     .end annotation
 .end field
 
-.field final aeL:Lcom/google/android/gms/common/api/a$f;
+.field final afd:Lcom/google/android/gms/common/api/a$f;
 
-.field private final aeM:Lcom/google/android/gms/common/api/a$b;
+.field private final afe:Lcom/google/android/gms/common/api/a$b;
 
-.field private final aeN:Lcom/google/android/gms/common/api/internal/aw;
+.field private final aff:Lcom/google/android/gms/common/api/internal/aw;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/aw<",
@@ -54,9 +54,9 @@
     .end annotation
 .end field
 
-.field private final aeO:Lcom/google/android/gms/common/api/internal/n;
+.field private final afg:Lcom/google/android/gms/common/api/internal/n;
 
-.field final aeP:Ljava/util/Set;
+.field final afh:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -66,7 +66,7 @@
     .end annotation
 .end field
 
-.field final aeQ:Ljava/util/Map;
+.field final afi:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -78,13 +78,13 @@
     .end annotation
 .end field
 
-.field final aeR:I
+.field final afj:I
 
-.field private final aeS:Lcom/google/android/gms/common/api/internal/aj;
+.field private final afl:Lcom/google/android/gms/common/api/internal/aj;
 
-.field aeT:Z
+.field afm:Z
 
-.field final aeU:Ljava/util/List;
+.field final afn:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -94,9 +94,9 @@
     .end annotation
 .end field
 
-.field private aeV:Lcom/google/android/gms/common/ConnectionResult;
+.field private afo:Lcom/google/android/gms/common/ConnectionResult;
 
-.field final synthetic aeW:Lcom/google/android/gms/common/api/internal/d;
+.field final synthetic afp:Lcom/google/android/gms/common/api/internal/d;
 
 
 # direct methods
@@ -110,7 +110,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -118,29 +118,29 @@
 
     invoke-direct {v0}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeK:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afc:Ljava/util/Queue;
 
     new-instance v0, Ljava/util/HashSet;
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeP:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afh:Ljava/util/Set;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeQ:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afi:Ljava/util/Map;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeU:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afn:Ljava/util/List;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeV:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afo:Lcom/google/android/gms/common/ConnectionResult;
 
     invoke-static {p1}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -154,9 +154,9 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     instance-of v2, v1, Lcom/google/android/gms/common/internal/s;
 
@@ -164,33 +164,33 @@
 
     check-cast v1, Lcom/google/android/gms/common/internal/s;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/internal/s;->aiF:Lcom/google/android/gms/common/api/a$h;
+    iget-object v1, v1, Lcom/google/android/gms/common/internal/s;->aiX:Lcom/google/android/gms/common/api/a$h;
 
-    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeM:Lcom/google/android/gms/common/api/a$b;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afe:Lcom/google/android/gms/common/api/a$b;
 
     goto :goto_0
 
     :cond_0
-    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeM:Lcom/google/android/gms/common/api/a$b;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afe:Lcom/google/android/gms/common/api/a$b;
 
     :goto_0
-    iget-object v1, p2, Lcom/google/android/gms/common/api/e;->adF:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p2, Lcom/google/android/gms/common/api/e;->adX:Lcom/google/android/gms/common/api/internal/aw;
 
-    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     new-instance v1, Lcom/google/android/gms/common/api/internal/n;
 
     invoke-direct {v1}, Lcom/google/android/gms/common/api/internal/n;-><init>()V
 
-    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeO:Lcom/google/android/gms/common/api/internal/n;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afg:Lcom/google/android/gms/common/api/internal/n;
 
     iget v1, p2, Lcom/google/android/gms/common/api/e;->mId:I
 
-    iput v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeR:I
+    iput v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afj:I
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->le()Z
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->lc()Z
 
     move-result v1
 
@@ -208,12 +208,12 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeS:Lcom/google/android/gms/common/api/internal/aj;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afl:Lcom/google/android/gms/common/api/internal/aj;
 
     return-void
 
     :cond_1
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeS:Lcom/google/android/gms/common/api/internal/aj;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afl:Lcom/google/android/gms/common/api/internal/aj;
 
     return-void
 .end method
@@ -232,9 +232,9 @@
     goto :goto_3
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->li()[Lcom/google/android/gms/common/Feature;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->lg()[Lcom/google/android/gms/common/Feature;
 
     move-result-object v1
 
@@ -262,7 +262,7 @@
 
     iget-object v7, v6, Lcom/google/android/gms/common/Feature;->name:Ljava/lang/String;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/common/Feature;->kY()J
+    invoke-virtual {v6}, Lcom/google/android/gms/common/Feature;->kW()J
 
     move-result-wide v8
 
@@ -304,7 +304,7 @@
 
     move-result-wide v5
 
-    invoke-virtual {v4}, Lcom/google/android/gms/common/Feature;->kY()J
+    invoke-virtual {v4}, Lcom/google/android/gms/common/Feature;->kW()J
 
     move-result-wide v7
 
@@ -331,7 +331,7 @@
 .method static synthetic a(Lcom/google/android/gms/common/api/internal/d$a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lz()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lx()V
 
     return-void
 .end method
@@ -339,14 +339,14 @@
 .method private final b(Lcom/google/android/gms/common/ConnectionResult;)Z
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->lx()Ljava/lang/Object;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->lv()Ljava/lang/Object;
 
     move-result-object v0
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->f(Lcom/google/android/gms/common/api/internal/d;)Lcom/google/android/gms/common/api/internal/q;
 
@@ -354,13 +354,13 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->g(Lcom/google/android/gms/common/api/internal/d;)Ljava/util/Set;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-interface {v1, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -368,13 +368,13 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->f(Lcom/google/android/gms/common/api/internal/d;)Lcom/google/android/gms/common/api/internal/q;
 
     move-result-object v1
 
-    iget v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeR:I
+    iget v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->afj:I
 
     invoke-virtual {v1, p1, v2}, Lcom/google/android/gms/common/api/internal/ay;->c(Lcom/google/android/gms/common/ConnectionResult;I)V
 
@@ -444,11 +444,11 @@
 
     new-instance p1, Lcom/google/android/gms/common/api/internal/d$b;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-direct {p1, v0, v2, v1}, Lcom/google/android/gms/common/api/internal/d$b;-><init>(Lcom/google/android/gms/common/api/internal/aw;Lcom/google/android/gms/common/Feature;B)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeU:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afn:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I
 
@@ -458,7 +458,7 @@
 
     if-ltz v0, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeU:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afn:Ljava/util/List;
 
     invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -466,7 +466,7 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/d$b;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -474,13 +474,13 @@
 
     invoke-virtual {v0, v2, p1}, Landroid/os/Handler;->removeMessages(ILjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v3}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -490,7 +490,7 @@
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v2}, Lcom/google/android/gms/common/api/internal/d;->c(Lcom/google/android/gms/common/api/internal/d;)J
 
@@ -501,17 +501,17 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeU:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afn:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v3}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -521,7 +521,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v3}, Lcom/google/android/gms/common/api/internal/d;->c(Lcom/google/android/gms/common/api/internal/d;)J
 
@@ -529,13 +529,13 @@
 
     invoke-virtual {v0, v2, v3, v4}, Landroid/os/Handler;->sendMessageDelayed(Landroid/os/Message;J)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v2}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -547,7 +547,7 @@
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v2}, Lcom/google/android/gms/common/api/internal/d;->d(Lcom/google/android/gms/common/api/internal/d;)J
 
@@ -569,9 +569,9 @@
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
-    iget v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeR:I
+    iget v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->afj:I
 
     invoke-virtual {v0, p1, v2}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/ConnectionResult;I)Z
 
@@ -592,7 +592,7 @@
 .method private final c(Lcom/google/android/gms/common/ConnectionResult;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeP:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afh:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -613,7 +613,7 @@
 
     const/4 v2, 0x0
 
-    sget-object v3, Lcom/google/android/gms/common/ConnectionResult;->adl:Lcom/google/android/gms/common/ConnectionResult;
+    sget-object v3, Lcom/google/android/gms/common/ConnectionResult;->adD:Lcom/google/android/gms/common/ConnectionResult;
 
     invoke-static {p1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -621,21 +621,21 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->lg()Ljava/lang/String;
+    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->le()Ljava/lang/String;
 
     move-result-object v2
 
     :cond_0
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-virtual {v1, v3, p1, v2}, Lcom/google/android/gms/common/api/internal/ax;->a(Lcom/google/android/gms/common/api/internal/aw;Lcom/google/android/gms/common/ConnectionResult;Ljava/lang/String;)V
 
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeP:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afh:Ljava/util/Set;
 
     invoke-interface {p1}, Ljava/util/Set;->clear()V
 
@@ -645,9 +645,9 @@
 .method private final c(Lcom/google/android/gms/common/api/internal/t;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeO:Lcom/google/android/gms/common/api/internal/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afg:Lcom/google/android/gms/common/api/internal/n;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->le()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lc()Z
 
     move-result v1
 
@@ -661,49 +661,49 @@
     return-void
 
     :catch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lr()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lp()V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {p1}, Lcom/google/android/gms/common/api/a$f;->disconnect()V
 
     return-void
 .end method
 
-.method private final lG()V
+.method private final lE()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     const/16 v2, 0xc
 
     invoke-virtual {v0, v2, v1}, Landroid/os/Handler;->removeMessages(ILjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
     move-result-object v1
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-virtual {v1, v2, v3}, Landroid/os/Handler;->obtainMessage(ILjava/lang/Object;)Landroid/os/Message;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v2}, Lcom/google/android/gms/common/api/internal/d;->h(Lcom/google/android/gms/common/api/internal/d;)J
 
@@ -714,18 +714,18 @@
     return-void
 .end method
 
-.method private final lz()V
+.method private final lx()V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lD()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lB()V
 
-    sget-object v0, Lcom/google/android/gms/common/ConnectionResult;->adl:Lcom/google/android/gms/common/ConnectionResult;
+    sget-object v0, Lcom/google/android/gms/common/ConnectionResult;->adD:Lcom/google/android/gms/common/ConnectionResult;
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/common/api/internal/d$a;->c(Lcom/google/android/gms/common/ConnectionResult;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lD()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeQ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afi:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -748,9 +748,9 @@
 
     check-cast v1, Lcom/google/android/gms/common/api/internal/af;
 
-    iget-object v2, v1, Lcom/google/android/gms/common/api/internal/af;->afM:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v2, v1, Lcom/google/android/gms/common/api/internal/af;->age:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/j;->afq:[Lcom/google/android/gms/common/Feature;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/j;->afI:[Lcom/google/android/gms/common/Feature;
 
     invoke-direct {p0, v2}, Lcom/google/android/gms/common/api/internal/d$a;->a([Lcom/google/android/gms/common/Feature;)Lcom/google/android/gms/common/Feature;
 
@@ -764,9 +764,9 @@
 
     :cond_0
     :try_start_0
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/af;->afM:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/af;->age:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeM:Lcom/google/android/gms/common/api/a$b;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->afe:Lcom/google/android/gms/common/api/a$b;
 
     new-instance v3, Lcom/google/android/gms/tasks/h;
 
@@ -785,26 +785,26 @@
     goto :goto_0
 
     :catch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lr()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lp()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->disconnect()V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lz()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lG()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lE()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method final I(Z)Z
+.method final G(Z)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -814,7 +814,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(Landroid/os/Handler;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
 
@@ -824,7 +824,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeQ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afi:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->size()I
 
@@ -832,9 +832,9 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeO:Lcom/google/android/gms/common/api/internal/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afg:Lcom/google/android/gms/common/api/internal/n;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->lL()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->lJ()Z
 
     move-result v0
 
@@ -842,13 +842,13 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lG()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lE()V
 
     :cond_0
     return v1
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {p1}, Lcom/google/android/gms/common/api/a$f;->disconnect()V
 
@@ -863,7 +863,7 @@
 .method public final a(Lcom/google/android/gms/common/ConnectionResult;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -873,40 +873,40 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(Landroid/os/Handler;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeS:Lcom/google/android/gms/common/api/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afl:Lcom/google/android/gms/common/api/internal/aj;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/aj;->afS:Lcom/google/android/gms/signin/e;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/aj;->agk:Lcom/google/android/gms/signin/e;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/aj;->afS:Lcom/google/android/gms/signin/e;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/aj;->agk:Lcom/google/android/gms/signin/e;
 
     invoke-interface {v0}, Lcom/google/android/gms/signin/e;->disconnect()V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lD()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lB()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->e(Lcom/google/android/gms/common/api/internal/d;)Lcom/google/android/gms/common/internal/j;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/j;->air:Landroid/util/SparseIntArray;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/j;->aiJ:Landroid/util/SparseIntArray;
 
     invoke-virtual {v0}, Landroid/util/SparseIntArray;->clear()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/common/api/internal/d$a;->c(Lcom/google/android/gms/common/ConnectionResult;)V
 
-    iget v0, p1, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v0, p1, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     const/4 v1, 0x4
 
     if-ne v0, v1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->ly()Lcom/google/android/gms/common/api/Status;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->lw()Lcom/google/android/gms/common/api/Status;
 
     move-result-object p1
 
@@ -915,7 +915,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeK:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afc:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->isEmpty()Z
 
@@ -923,7 +923,7 @@
 
     if-eqz v0, :cond_2
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeV:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afo:Lcom/google/android/gms/common/ConnectionResult;
 
     return-void
 
@@ -937,9 +937,9 @@
     return-void
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
-    iget v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeR:I
+    iget v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afj:I
 
     invoke-virtual {v0, p1, v1}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/ConnectionResult;I)Z
 
@@ -947,7 +947,7 @@
 
     if-nez v0, :cond_6
 
-    iget p1, p1, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget p1, p1, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     const/16 v0, 0x12
 
@@ -955,20 +955,20 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeT:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afm:Z
 
     :cond_4
-    iget-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeT:Z
+    iget-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afm:Z
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {p1}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -976,13 +976,13 @@
 
     const/16 v1, 0x9
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-static {v0, v1, v2}, Landroid/os/Message;->obtain(Landroid/os/Handler;ILjava/lang/Object;)Landroid/os/Message;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->c(Lcom/google/android/gms/common/api/internal/d;)J
 
@@ -997,9 +997,9 @@
 
     const/16 v0, 0x11
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/aw;->adD:Lcom/google/android/gms/common/api/a;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/aw;->adV:Lcom/google/android/gms/common/api/a;
 
     iget-object v1, v1, Lcom/google/android/gms/common/api/a;->mName:Ljava/lang/String;
 
@@ -1042,7 +1042,7 @@
 .method final a(Lcom/google/android/gms/common/api/internal/d$b;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeU:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afn:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
@@ -1050,7 +1050,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1060,7 +1060,7 @@
 
     invoke-virtual {v0, v1, p1}, Landroid/os/Handler;->removeMessages(ILjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1070,11 +1070,11 @@
 
     invoke-virtual {v0, v1, p1}, Landroid/os/Handler;->removeMessages(ILjava/lang/Object;)V
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$b;->aeY:Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$b;->afr:Lcom/google/android/gms/common/Feature;
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeK:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afc:Ljava/util/Queue;
 
     invoke-interface {v1}, Ljava/util/Queue;->size()I
 
@@ -1082,7 +1082,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeK:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afc:Ljava/util/Queue;
 
     invoke-interface {v1}, Ljava/util/Queue;->iterator()Ljava/util/Iterator;
 
@@ -1146,7 +1146,7 @@
 
     check-cast v3, Lcom/google/android/gms/common/api/internal/t;
 
-    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeK:Ljava/util/Queue;
+    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->afc:Ljava/util/Queue;
 
     invoke-interface {v4, v3}, Ljava/util/Queue;->remove(Ljava/lang/Object;)Z
 
@@ -1165,7 +1165,7 @@
 .method public final a(Lcom/google/android/gms/common/api/internal/t;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1175,7 +1175,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(Landroid/os/Handler;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
 
@@ -1189,33 +1189,33 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lG()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lE()V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeK:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afc:Ljava/util/Queue;
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeK:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afc:Ljava/util/Queue;
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeV:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afo:Lcom/google/android/gms/common/ConnectionResult;
 
     if-eqz p1, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->kW()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->kU()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeV:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afo:Lcom/google/android/gms/common/ConnectionResult;
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/common/api/internal/d$a;->a(Lcom/google/android/gms/common/ConnectionResult;)V
 
@@ -1230,7 +1230,7 @@
 .method public final connect()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1240,7 +1240,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(Landroid/os/Handler;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
 
@@ -1248,7 +1248,7 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->isConnecting()Z
 
@@ -1259,19 +1259,19 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->e(Lcom/google/android/gms/common/api/internal/d;)Lcom/google/android/gms/common/internal/j;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->b(Lcom/google/android/gms/common/api/internal/d;)Landroid/content/Context;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/common/internal/j;->a(Landroid/content/Context;Lcom/google/android/gms/common/api/a$f;)I
 
@@ -1292,28 +1292,28 @@
     :cond_1
     new-instance v0, Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/google/android/gms/common/api/internal/d$c;-><init>(Lcom/google/android/gms/common/api/internal/d;Lcom/google/android/gms/common/api/a$f;Lcom/google/android/gms/common/api/internal/aw;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->le()Z
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->lc()Z
 
     move-result v1
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeS:Lcom/google/android/gms/common/api/internal/aj;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afl:Lcom/google/android/gms/common/api/internal/aj;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/common/api/internal/aj;->a(Lcom/google/android/gms/common/api/internal/am;)V
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v1, v0}, Lcom/google/android/gms/common/api/a$f;->a(Lcom/google/android/gms/common/internal/c$c;)V
 
@@ -1325,7 +1325,7 @@
 .method public final f(Lcom/google/android/gms/common/api/Status;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1335,7 +1335,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(Landroid/os/Handler;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeK:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afc:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->iterator()Ljava/util/Iterator;
 
@@ -1359,152 +1359,17 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeK:Ljava/util/Queue;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afc:Ljava/util/Queue;
 
     invoke-interface {p1}, Ljava/util/Queue;->clear()V
 
     return-void
 .end method
 
-.method final lA()V
-    .locals 4
-
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lD()V
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeT:Z
-
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeO:Lcom/google/android/gms/common/api/internal/n;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->lN()V
-
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
-
-    invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
-
-    invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeN:Lcom/google/android/gms/common/api/internal/aw;
-
-    const/16 v3, 0x9
-
-    invoke-static {v1, v3, v2}, Landroid/os/Message;->obtain(Landroid/os/Handler;ILjava/lang/Object;)Landroid/os/Message;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
-
-    invoke-static {v2}, Lcom/google/android/gms/common/api/internal/d;->c(Lcom/google/android/gms/common/api/internal/d;)J
-
-    move-result-wide v2
-
-    invoke-virtual {v0, v1, v2, v3}, Landroid/os/Handler;->sendMessageDelayed(Landroid/os/Message;J)Z
-
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
-
-    invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
-
-    invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeN:Lcom/google/android/gms/common/api/internal/aw;
-
-    const/16 v3, 0xb
-
-    invoke-static {v1, v3, v2}, Landroid/os/Message;->obtain(Landroid/os/Handler;ILjava/lang/Object;)Landroid/os/Message;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
-
-    invoke-static {v2}, Lcom/google/android/gms/common/api/internal/d;->d(Lcom/google/android/gms/common/api/internal/d;)J
-
-    move-result-wide v2
-
-    invoke-virtual {v0, v1, v2, v3}, Landroid/os/Handler;->sendMessageDelayed(Landroid/os/Message;J)Z
-
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
-
-    invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->e(Lcom/google/android/gms/common/api/internal/d;)Lcom/google/android/gms/common/internal/j;
-
-    move-result-object v0
-
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/j;->air:Landroid/util/SparseIntArray;
-
-    invoke-virtual {v0}, Landroid/util/SparseIntArray;->clear()V
-
-    return-void
-.end method
-
-.method final lB()V
-    .locals 5
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeK:Ljava/util/Queue;
-
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
-
-    check-cast v0, Ljava/util/ArrayList;
-
-    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    :cond_0
-    :goto_0
-    if-ge v2, v1, :cond_1
-
-    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    add-int/lit8 v2, v2, 0x1
-
-    check-cast v3, Lcom/google/android/gms/common/api/internal/t;
-
-    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
-
-    invoke-interface {v4}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_1
-
-    invoke-direct {p0, v3}, Lcom/google/android/gms/common/api/internal/d$a;->b(Lcom/google/android/gms/common/api/internal/t;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeK:Ljava/util/Queue;
-
-    invoke-interface {v4, v3}, Ljava/util/Queue;->remove(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_1
-    return-void
-.end method
-
-.method public final lC()V
+.method public final lA()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1514,21 +1379,21 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(Landroid/os/Handler;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->aev:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->aeN:Lcom/google/android/gms/common/api/Status;
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/common/api/internal/d$a;->f(Lcom/google/android/gms/common/api/Status;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeO:Lcom/google/android/gms/common/api/internal/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afg:Lcom/google/android/gms/common/api/internal/n;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->lM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->lK()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeQ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afi:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeQ:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afi:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->size()I
 
@@ -1574,7 +1439,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/common/api/internal/d$a;->c(Lcom/google/android/gms/common/ConnectionResult;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
 
@@ -1582,7 +1447,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     new-instance v1, Lcom/google/android/gms/common/api/internal/x;
 
@@ -1594,10 +1459,10 @@
     return-void
 .end method
 
-.method public final lD()V
+.method public final lB()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1609,15 +1474,15 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeV:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afo:Lcom/google/android/gms/common/ConnectionResult;
 
     return-void
 .end method
 
-.method public final lE()Lcom/google/android/gms/common/ConnectionResult;
+.method public final lC()Lcom/google/android/gms/common/ConnectionResult;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1627,19 +1492,19 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(Landroid/os/Handler;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeV:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afo:Lcom/google/android/gms/common/ConnectionResult;
 
     return-object v0
 .end method
 
-.method final lF()V
+.method final lD()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeT:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afm:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1647,11 +1512,11 @@
 
     const/16 v1, 0xb
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-virtual {v0, v1, v2}, Landroid/os/Handler;->removeMessages(ILjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1659,38 +1524,38 @@
 
     const/16 v1, 0x9
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-virtual {v0, v1, v2}, Landroid/os/Handler;->removeMessages(ILjava/lang/Object;)V
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeT:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afm:Z
 
     :cond_0
     return-void
 .end method
 
-.method public final le()Z
+.method public final lc()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->le()Z
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lc()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final lq()V
+.method public final lo()V
     .locals 2
 
     invoke-static {}, Landroid/os/Looper;->myLooper()Landroid/os/Looper;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1702,12 +1567,12 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lz()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lx()V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1722,14 +1587,14 @@
     return-void
 .end method
 
-.method public final lr()V
+.method public final lp()V
     .locals 2
 
     invoke-static {}, Landroid/os/Looper;->myLooper()Landroid/os/Looper;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1741,12 +1606,12 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->ly()V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -1760,3 +1625,138 @@
 
     return-void
 .end method
+
+.method final ly()V
+    .locals 4
+
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lB()V
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afm:Z
+
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afg:Lcom/google/android/gms/common/api/internal/n;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->lL()V
+
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
+
+    invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
+
+    invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aff:Lcom/google/android/gms/common/api/internal/aw;
+
+    const/16 v3, 0x9
+
+    invoke-static {v1, v3, v2}, Landroid/os/Message;->obtain(Landroid/os/Handler;ILjava/lang/Object;)Landroid/os/Message;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
+
+    invoke-static {v2}, Lcom/google/android/gms/common/api/internal/d;->c(Lcom/google/android/gms/common/api/internal/d;)J
+
+    move-result-wide v2
+
+    invoke-virtual {v0, v1, v2, v3}, Landroid/os/Handler;->sendMessageDelayed(Landroid/os/Message;J)Z
+
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
+
+    invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
+
+    invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->aff:Lcom/google/android/gms/common/api/internal/aw;
+
+    const/16 v3, 0xb
+
+    invoke-static {v1, v3, v2}, Landroid/os/Message;->obtain(Landroid/os/Handler;ILjava/lang/Object;)Landroid/os/Message;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
+
+    invoke-static {v2}, Lcom/google/android/gms/common/api/internal/d;->d(Lcom/google/android/gms/common/api/internal/d;)J
+
+    move-result-wide v2
+
+    invoke-virtual {v0, v1, v2, v3}, Landroid/os/Handler;->sendMessageDelayed(Landroid/os/Message;J)Z
+
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
+
+    invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->e(Lcom/google/android/gms/common/api/internal/d;)Lcom/google/android/gms/common/internal/j;
+
+    move-result-object v0
+
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/j;->aiJ:Landroid/util/SparseIntArray;
+
+    invoke-virtual {v0}, Landroid/util/SparseIntArray;->clear()V
+
+    return-void
+.end method
+
+.method final lz()V
+    .locals 5
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->afc:Ljava/util/Queue;
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+
+    check-cast v0, Ljava/util/ArrayList;
+
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    :cond_0
+    :goto_0
+    if-ge v2, v1, :cond_1
+
+    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    add-int/lit8 v2, v2, 0x1
+
+    check-cast v3, Lcom/google/android/gms/common/api/internal/t;
+
+    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
+
+    invoke-interface {v4}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_1
+
+    invoke-direct {p0, v3}, Lcom/google/android/gms/common/api/internal/d$a;->b(Lcom/google/android/gms/common/api/internal/t;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_0
+
+    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->afc:Ljava/util/Queue;
+
+    invoke-interface {v4, v3}, Ljava/util/Queue;->remove(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d$b.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d$b.smali
index 4d76b9e006..facd4ff651 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d$b.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field final aeX:Lcom/google/android/gms/common/api/internal/aw;
+.field final afq:Lcom/google/android/gms/common/api/internal/aw;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/aw<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field final aeY:Lcom/google/android/gms/common/Feature;
+.field final afr:Lcom/google/android/gms/common/Feature;
 
 
 # direct methods
@@ -41,9 +41,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$b;->aeX:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$b;->afq:Lcom/google/android/gms/common/api/internal/aw;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$b;->aeY:Lcom/google/android/gms/common/Feature;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$b;->afr:Lcom/google/android/gms/common/Feature;
 
     return-void
 .end method
@@ -71,9 +71,9 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/d$b;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->aeX:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->afq:Lcom/google/android/gms/common/api/internal/aw;
 
-    iget-object v2, p1, Lcom/google/android/gms/common/api/internal/d$b;->aeX:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p1, Lcom/google/android/gms/common/api/internal/d$b;->afq:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-static {v1, v2}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -81,9 +81,9 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->aeY:Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->afr:Lcom/google/android/gms/common/Feature;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$b;->aeY:Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$b;->afr:Lcom/google/android/gms/common/Feature;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -106,13 +106,13 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->aeX:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->afq:Lcom/google/android/gms/common/api/internal/aw;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->aeY:Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->afr:Lcom/google/android/gms/common/Feature;
 
     const/4 v2, 0x1
 
@@ -132,7 +132,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->aeX:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->afq:Lcom/google/android/gms/common/api/internal/aw;
 
     const-string v2, "key"
 
@@ -140,7 +140,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->aeY:Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->afr:Lcom/google/android/gms/common/Feature;
 
     const-string v2, "feature"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d$c.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d$c.smali
index 913e54406f..1ebdd7fee5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d$c.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field final aeL:Lcom/google/android/gms/common/api/a$f;
+.field final afd:Lcom/google/android/gms/common/api/a$f;
 
-.field final aeN:Lcom/google/android/gms/common/api/internal/aw;
+.field final aff:Lcom/google/android/gms/common/api/internal/aw;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/aw<",
@@ -29,11 +29,11 @@
     .end annotation
 .end field
 
-.field final synthetic aeW:Lcom/google/android/gms/common/api/internal/d;
+.field final synthetic afp:Lcom/google/android/gms/common/api/internal/d;
 
-.field private aeZ:Lcom/google/android/gms/common/internal/k;
+.field private afs:Lcom/google/android/gms/common/internal/k;
 
-.field private afa:Ljava/util/Set;
+.field private aft:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field afb:Z
+.field afu:Z
 
 
 # direct methods
@@ -58,23 +58,23 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->aeZ:Lcom/google/android/gms/common/internal/k;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->afs:Lcom/google/android/gms/common/internal/k;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->afa:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->aft:Ljava/util/Set;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->afb:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->afu:Z
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$c;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$c;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/d$c;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/d$c;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     return-void
 .end method
@@ -100,11 +100,11 @@
     goto :goto_0
 
     :cond_0
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->aeZ:Lcom/google/android/gms/common/internal/k;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->afs:Lcom/google/android/gms/common/internal/k;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$c;->afa:Ljava/util/Set;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$c;->aft:Ljava/util/Set;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$c;->lH()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$c;->lF()V
 
     return-void
 
@@ -134,7 +134,7 @@
 .method public final d(Lcom/google/android/gms/common/ConnectionResult;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -152,13 +152,13 @@
 .method public final e(Lcom/google/android/gms/common/ConnectionResult;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->i(Lcom/google/android/gms/common/api/internal/d;)Ljava/util/Map;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$c;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$c;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -166,7 +166,7 @@
 
     check-cast v0, Lcom/google/android/gms/common/api/internal/d$a;
 
-    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
@@ -176,7 +176,7 @@
 
     invoke-static {v1, v2}, Lcom/google/android/gms/common/internal/r;->a(Landroid/os/Handler;Ljava/lang/String;)V
 
-    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->disconnect()V
 
@@ -185,20 +185,20 @@
     return-void
 .end method
 
-.method final lH()V
+.method final lF()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->afb:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->afu:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->aeZ:Lcom/google/android/gms/common/internal/k;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->afs:Lcom/google/android/gms/common/internal/k;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$c;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$c;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$c;->afa:Ljava/util/Set;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$c;->aft:Ljava/util/Set;
 
     invoke-interface {v1, v0, v2}, Lcom/google/android/gms/common/api/a$f;->a(Lcom/google/android/gms/common/internal/k;Ljava/util/Set;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d.smali
index 2017baefc7..e893f00fa1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/d.smali
@@ -16,27 +16,33 @@
 
 
 # static fields
-.field private static aeA:Lcom/google/android/gms/common/api/internal/d;
+.field public static final aeN:Lcom/google/android/gms/common/api/Status;
 
-.field public static final aev:Lcom/google/android/gms/common/api/Status;
+.field private static final aeO:Lcom/google/android/gms/common/api/Status;
 
-.field private static final aew:Lcom/google/android/gms/common/api/Status;
+.field private static aeS:Lcom/google/android/gms/common/api/internal/d;
 
 .field static final lock:Ljava/lang/Object;
 
 
 # instance fields
-.field private final aeB:Landroid/content/Context;
+.field private aeP:J
 
-.field private final aeC:Lcom/google/android/gms/common/GoogleApiAvailability;
+.field private aeQ:J
 
-.field private final aeD:Lcom/google/android/gms/common/internal/j;
+.field private aeR:J
 
-.field public final aeE:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final aeT:Landroid/content/Context;
 
-.field public final aeF:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final aeU:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-.field private final aeG:Ljava/util/Map;
+.field private final aeV:Lcom/google/android/gms/common/internal/j;
+
+.field public final aeW:Ljava/util/concurrent/atomic/AtomicInteger;
+
+.field public final aeX:Ljava/util/concurrent/atomic/AtomicInteger;
+
+.field private final aeY:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -48,9 +54,9 @@
     .end annotation
 .end field
 
-.field aeH:Lcom/google/android/gms/common/api/internal/q;
+.field aeZ:Lcom/google/android/gms/common/api/internal/q;
 
-.field final aeI:Ljava/util/Set;
+.field final afa:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -60,7 +66,7 @@
     .end annotation
 .end field
 
-.field private final aeJ:Ljava/util/Set;
+.field private final afb:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -70,12 +76,6 @@
     .end annotation
 .end field
 
-.field private aex:J
-
-.field private aey:J
-
-.field private aez:J
-
 .field public final handler:Landroid/os/Handler;
 
 
@@ -91,7 +91,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/google/android/gms/common/api/Status;-><init>(ILjava/lang/String;)V
 
-    sput-object v0, Lcom/google/android/gms/common/api/internal/d;->aev:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/d;->aeN:Lcom/google/android/gms/common/api/Status;
 
     new-instance v0, Lcom/google/android/gms/common/api/Status;
 
@@ -99,7 +99,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/google/android/gms/common/api/Status;-><init>(ILjava/lang/String;)V
 
-    sput-object v0, Lcom/google/android/gms/common/api/internal/d;->aew:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/d;->aeO:Lcom/google/android/gms/common/api/Status;
 
     new-instance v0, Ljava/lang/Object;
 
@@ -117,15 +117,15 @@
 
     const-wide/16 v0, 0x1388
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->aex:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeP:J
 
     const-wide/32 v0, 0x1d4c0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->aey:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeQ:J
 
     const-wide/16 v0, 0x2710
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->aez:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeR:J
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
 
@@ -133,7 +133,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeE:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeW:Ljava/util/concurrent/atomic/AtomicInteger;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
 
@@ -141,7 +141,7 @@
 
     invoke-direct {v0, v2}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeF:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeX:Ljava/util/concurrent/atomic/AtomicInteger;
 
     new-instance v0, Ljava/util/concurrent/ConcurrentHashMap;
 
@@ -151,25 +151,25 @@
 
     invoke-direct {v0, v2, v3, v1}, Ljava/util/concurrent/ConcurrentHashMap;-><init>(IFI)V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeH:Lcom/google/android/gms/common/api/internal/q;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeZ:Lcom/google/android/gms/common/api/internal/q;
 
     new-instance v0, Landroidx/collection/ArraySet;
 
     invoke-direct {v0}, Landroidx/collection/ArraySet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeI:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->afa:Ljava/util/Set;
 
     new-instance v0, Landroidx/collection/ArraySet;
 
     invoke-direct {v0}, Landroidx/collection/ArraySet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeJ:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->afb:Ljava/util/Set;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeB:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeT:Landroid/content/Context;
 
     new-instance p1, Lcom/google/android/gms/internal/b/e;
 
@@ -177,13 +177,13 @@
 
     iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/d;->aeC:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/d;->aeU:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     new-instance p1, Lcom/google/android/gms/common/internal/j;
 
     invoke-direct {p1, p3}, Lcom/google/android/gms/common/internal/j;-><init>(Lcom/google/android/gms/common/c;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeD:Lcom/google/android/gms/common/internal/j;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeV:Lcom/google/android/gms/common/internal/j;
 
     iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
 
@@ -206,7 +206,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/api/internal/d;->aeA:Lcom/google/android/gms/common/api/internal/d;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/d;->aeS:Lcom/google/android/gms/common/api/internal/d;
 
     if-nez v1, :cond_0
 
@@ -230,16 +230,16 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kZ()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kX()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v3
 
     invoke-direct {v2, p0, v1, v3}, Lcom/google/android/gms/common/api/internal/d;-><init>(Landroid/content/Context;Landroid/os/Looper;Lcom/google/android/gms/common/GoogleApiAvailability;)V
 
-    sput-object v2, Lcom/google/android/gms/common/api/internal/d;->aeA:Lcom/google/android/gms/common/api/internal/d;
+    sput-object v2, Lcom/google/android/gms/common/api/internal/d;->aeS:Lcom/google/android/gms/common/api/internal/d;
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/common/api/internal/d;->aeA:Lcom/google/android/gms/common/api/internal/d;
+    sget-object p0, Lcom/google/android/gms/common/api/internal/d;->aeS:Lcom/google/android/gms/common/api/internal/d;
 
     monitor-exit v0
 
@@ -266,7 +266,7 @@
 .method static synthetic b(Lcom/google/android/gms/common/api/internal/d;)Landroid/content/Context;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->aeB:Landroid/content/Context;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->aeT:Landroid/content/Context;
 
     return-object p0
 .end method
@@ -281,9 +281,9 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/e;->adF:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/e;->adX:Lcom/google/android/gms/common/api/internal/aw;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -297,18 +297,18 @@
 
     invoke-direct {v1, p0, p1}, Lcom/google/android/gms/common/api/internal/d$a;-><init>(Lcom/google/android/gms/common/api/internal/d;Lcom/google/android/gms/common/api/e;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     invoke-interface {p1, v0, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    invoke-virtual {v1}, Lcom/google/android/gms/common/api/internal/d$a;->le()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/common/api/internal/d$a;->lc()Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeJ:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->afb:Ljava/util/Set;
 
     invoke-interface {p1, v0}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -321,7 +321,7 @@
 .method static synthetic c(Lcom/google/android/gms/common/api/internal/d;)J
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->aex:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeP:J
 
     return-wide v0
 .end method
@@ -329,7 +329,7 @@
 .method static synthetic d(Lcom/google/android/gms/common/api/internal/d;)J
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->aey:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeQ:J
 
     return-wide v0
 .end method
@@ -337,7 +337,7 @@
 .method static synthetic e(Lcom/google/android/gms/common/api/internal/d;)Lcom/google/android/gms/common/internal/j;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->aeD:Lcom/google/android/gms/common/internal/j;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->aeV:Lcom/google/android/gms/common/internal/j;
 
     return-object p0
 .end method
@@ -345,7 +345,7 @@
 .method static synthetic f(Lcom/google/android/gms/common/api/internal/d;)Lcom/google/android/gms/common/api/internal/q;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->aeH:Lcom/google/android/gms/common/api/internal/q;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->aeZ:Lcom/google/android/gms/common/api/internal/q;
 
     return-object p0
 .end method
@@ -353,7 +353,7 @@
 .method static synthetic g(Lcom/google/android/gms/common/api/internal/d;)Ljava/util/Set;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->aeI:Ljava/util/Set;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->afa:Ljava/util/Set;
 
     return-object p0
 .end method
@@ -361,7 +361,7 @@
 .method static synthetic h(Lcom/google/android/gms/common/api/internal/d;)J
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->aez:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeR:J
 
     return-wide v0
 .end method
@@ -369,12 +369,12 @@
 .method static synthetic i(Lcom/google/android/gms/common/api/internal/d;)Ljava/util/Map;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     return-object p0
 .end method
 
-.method static synthetic lx()Ljava/lang/Object;
+.method static synthetic lv()Ljava/lang/Object;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/common/api/internal/d;->lock:Ljava/lang/Object;
@@ -382,10 +382,10 @@
     return-object v0
 .end method
 
-.method static synthetic ly()Lcom/google/android/gms/common/api/Status;
+.method static synthetic lw()Lcom/google/android/gms/common/api/Status;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->aew:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->aeO:Lcom/google/android/gms/common/api/Status;
 
     return-object v0
 .end method
@@ -423,20 +423,20 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeH:Lcom/google/android/gms/common/api/internal/q;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeZ:Lcom/google/android/gms/common/api/internal/q;
 
     if-eq v1, p1, :cond_0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeH:Lcom/google/android/gms/common/api/internal/q;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeZ:Lcom/google/android/gms/common/api/internal/q;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeI:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->afa:Ljava/util/Set;
 
     invoke-interface {v1}, Ljava/util/Set;->clear()V
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeI:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->afa:Ljava/util/Set;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/q;->afz:Landroidx/collection/ArraySet;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/q;->afR:Landroidx/collection/ArraySet;
 
     invoke-interface {v1, p1}, Ljava/util/Set;->addAll(Ljava/util/Collection;)Z
 
@@ -457,9 +457,9 @@
 .method final a(Lcom/google/android/gms/common/ConnectionResult;I)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeC:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeU:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeB:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeT:Landroid/content/Context;
 
     invoke-virtual {v0, v1, p1, p2}, Lcom/google/android/gms/common/GoogleApiAvailability;->a(Landroid/content/Context;Lcom/google/android/gms/common/ConnectionResult;I)Z
 
@@ -539,9 +539,9 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/d$b;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->aeX:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->afq:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -549,9 +549,9 @@
 
     if-eqz v0, :cond_e
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->aeX:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->afq:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -568,9 +568,9 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/d$b;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->aeX:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->afq:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -578,9 +578,9 @@
 
     if-eqz v0, :cond_e
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->aeX:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->afq:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -588,7 +588,7 @@
 
     check-cast v0, Lcom/google/android/gms/common/api/internal/d$a;
 
-    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/d$a;->aeU:Ljava/util/List;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/d$a;->afn:Ljava/util/List;
 
     invoke-interface {v1, p1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -596,11 +596,11 @@
 
     if-eqz p1, :cond_e
 
-    iget-boolean p1, v0, Lcom/google/android/gms/common/api/internal/d$a;->aeT:Z
+    iget-boolean p1, v0, Lcom/google/android/gms/common/api/internal/d$a;->afm:Z
 
     if-nez p1, :cond_e
 
-    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {p1}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
 
@@ -613,7 +613,7 @@
     goto/16 :goto_6
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lB()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lz()V
 
     goto/16 :goto_6
 
@@ -622,9 +622,9 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/r;
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/r;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/r;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     invoke-interface {v1, v0}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -632,7 +632,7 @@
 
     if-nez v1, :cond_1
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/r;->afA:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/r;->afS:Lcom/google/android/gms/tasks/h;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
@@ -641,7 +641,7 @@
     goto/16 :goto_6
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -649,11 +649,11 @@
 
     check-cast v0, Lcom/google/android/gms/common/api/internal/d$a;
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/common/api/internal/d$a;->I(Z)Z
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/common/api/internal/d$a;->G(Z)Z
 
     move-result v0
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/r;->afA:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/r;->afS:Lcom/google/android/gms/tasks/h;
 
     invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -664,7 +664,7 @@
     goto/16 :goto_6
 
     :pswitch_3
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     iget-object v1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
 
@@ -674,7 +674,7 @@
 
     if-eqz v0, :cond_e
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
 
@@ -684,12 +684,12 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/d$a;
 
-    invoke-virtual {p1, v7}, Lcom/google/android/gms/common/api/internal/d$a;->I(Z)Z
+    invoke-virtual {p1, v7}, Lcom/google/android/gms/common/api/internal/d$a;->G(Z)Z
 
     goto/16 :goto_6
 
     :pswitch_4
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     iget-object v1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
 
@@ -699,7 +699,7 @@
 
     if-eqz v0, :cond_e
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
 
@@ -709,25 +709,25 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/d$a;
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
 
     invoke-static {v0, v5}, Lcom/google/android/gms/common/internal/r;->a(Landroid/os/Handler;Ljava/lang/String;)V
 
-    iget-boolean v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeT:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->afm:Z
 
     if-eqz v0, :cond_e
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d$a;->lF()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d$a;->lD()V
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->aeC:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->aeU:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d;->aeB:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d;->aeT:Landroid/content/Context;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/common/GoogleApiAvailability;->isGooglePlayServicesAvailable(Landroid/content/Context;)I
 
@@ -757,14 +757,14 @@
     :goto_0
     invoke-virtual {p1, v0}, Lcom/google/android/gms/common/api/internal/d$a;->f(Lcom/google/android/gms/common/api/Status;)V
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {p1}, Lcom/google/android/gms/common/api/a$f;->disconnect()V
 
     goto/16 :goto_6
 
     :pswitch_5
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeJ:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->afb:Ljava/util/Set;
 
     invoke-interface {p1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -783,7 +783,7 @@
 
     check-cast v0, Lcom/google/android/gms/common/api/internal/aw;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     invoke-interface {v1, v0}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -791,19 +791,19 @@
 
     check-cast v0, Lcom/google/android/gms/common/api/internal/d$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lA()V
 
     goto :goto_1
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeJ:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->afb:Ljava/util/Set;
 
     invoke-interface {p1}, Ljava/util/Set;->clear()V
 
     goto/16 :goto_6
 
     :pswitch_6
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     iget-object v1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
 
@@ -813,7 +813,7 @@
 
     if-eqz v0, :cond_e
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
 
@@ -823,13 +823,13 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/d$a;
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
 
     invoke-static {v0, v5}, Lcom/google/android/gms/common/internal/r;->a(Landroid/os/Handler;Ljava/lang/String;)V
 
-    iget-boolean v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->aeT:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->afm:Z
 
     if-eqz v0, :cond_e
 
@@ -847,7 +847,7 @@
     goto/16 :goto_6
 
     :pswitch_8
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeB:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeT:Landroid/content/Context;
 
     invoke-virtual {p1}, Landroid/content/Context;->getApplicationContext()Landroid/content/Context;
 
@@ -857,7 +857,7 @@
 
     if-eqz p1, :cond_e
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeB:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeT:Landroid/content/Context;
 
     invoke-virtual {p1}, Landroid/content/Context;->getApplicationContext()Landroid/content/Context;
 
@@ -867,7 +867,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/api/internal/b;->initialize(Landroid/app/Application;)V
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->lu()Lcom/google/android/gms/common/api/internal/b;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->ls()Lcom/google/android/gms/common/api/internal/b;
 
     move-result-object p1
 
@@ -877,11 +877,11 @@
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/common/api/internal/b;->a(Lcom/google/android/gms/common/api/internal/b$a;)V
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->lu()Lcom/google/android/gms/common/api/internal/b;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->ls()Lcom/google/android/gms/common/api/internal/b;
 
     move-result-object p1
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/b;->aea:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/b;->aet:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -895,7 +895,7 @@
 
     invoke-static {v0}, Landroid/app/ActivityManager;->getMyMemoryState(Landroid/app/ActivityManager$RunningAppProcessInfo;)V
 
-    iget-object v3, p1, Lcom/google/android/gms/common/api/internal/b;->aea:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v3, p1, Lcom/google/android/gms/common/api/internal/b;->aet:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v3, v7}, Ljava/util/concurrent/atomic/AtomicBoolean;->getAndSet(Z)Z
 
@@ -909,12 +909,12 @@
 
     if-le v0, v3, :cond_4
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/b;->adZ:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/b;->aes:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0, v7}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
     :cond_4
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/b;->adZ:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/b;->aes:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -922,7 +922,7 @@
 
     if-nez p1, :cond_e
 
-    iput-wide v1, p0, Lcom/google/android/gms/common/api/internal/d;->aez:J
+    iput-wide v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeR:J
 
     goto/16 :goto_6
 
@@ -933,7 +933,7 @@
 
     check-cast p1, Lcom/google/android/gms/common/ConnectionResult;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -956,7 +956,7 @@
 
     check-cast v2, Lcom/google/android/gms/common/api/internal/d$a;
 
-    iget v3, v2, Lcom/google/android/gms/common/api/internal/d$a;->aeR:I
+    iget v3, v2, Lcom/google/android/gms/common/api/internal/d$a;->afj:I
 
     if-ne v3, v0, :cond_5
 
@@ -972,15 +972,15 @@
 
     const/16 v1, 0x11
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d;->aeC:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d;->aeU:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget v4, p1, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget v4, p1, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
     invoke-virtual {v3, v4}, Lcom/google/android/gms/common/GoogleApiAvailability;->getErrorString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    iget-object p1, p1, Lcom/google/android/gms/common/ConnectionResult;->adp:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/common/ConnectionResult;->adH:Ljava/lang/String;
 
     invoke-static {v3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1062,11 +1062,11 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/ae;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/ae;->afL:Lcom/google/android/gms/common/api/e;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/ae;->agd:Lcom/google/android/gms/common/api/e;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/e;->adF:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/e;->adX:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1076,15 +1076,15 @@
 
     if-nez v0, :cond_8
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/ae;->afL:Lcom/google/android/gms/common/api/e;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/ae;->agd:Lcom/google/android/gms/common/api/e;
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/common/api/internal/d;->b(Lcom/google/android/gms/common/api/e;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/ae;->afL:Lcom/google/android/gms/common/api/e;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/ae;->agd:Lcom/google/android/gms/common/api/e;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/e;->adF:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/e;->adX:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1093,41 +1093,41 @@
     check-cast v0, Lcom/google/android/gms/common/api/internal/d$a;
 
     :cond_8
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->le()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lc()Z
 
     move-result v1
 
     if-eqz v1, :cond_9
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeF:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeX:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
     move-result v1
 
-    iget v2, p1, Lcom/google/android/gms/common/api/internal/ae;->afK:I
+    iget v2, p1, Lcom/google/android/gms/common/api/internal/ae;->agc:I
 
     if-eq v1, v2, :cond_9
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/ae;->afJ:Lcom/google/android/gms/common/api/internal/t;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/ae;->agb:Lcom/google/android/gms/common/api/internal/t;
 
-    sget-object v1, Lcom/google/android/gms/common/api/internal/d;->aev:Lcom/google/android/gms/common/api/Status;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/d;->aeN:Lcom/google/android/gms/common/api/Status;
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/common/api/internal/t;->g(Lcom/google/android/gms/common/api/Status;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lA()V
 
     goto/16 :goto_6
 
     :cond_9
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/ae;->afJ:Lcom/google/android/gms/common/api/internal/t;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/ae;->agb:Lcom/google/android/gms/common/api/internal/t;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/api/internal/d$a;->a(Lcom/google/android/gms/common/api/internal/t;)V
 
     goto/16 :goto_6
 
     :pswitch_b
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -1150,7 +1150,7 @@
 
     check-cast v0, Lcom/google/android/gms/common/api/internal/d$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lD()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lB()V
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->connect()V
 
@@ -1184,7 +1184,7 @@
 
     check-cast v1, Lcom/google/android/gms/common/api/internal/aw;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     invoke-interface {v2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1205,7 +1205,7 @@
     goto :goto_6
 
     :cond_a
-    iget-object v3, v2, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v3, v2, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v3}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
 
@@ -1213,11 +1213,11 @@
 
     if-eqz v3, :cond_b
 
-    sget-object v3, Lcom/google/android/gms/common/ConnectionResult;->adl:Lcom/google/android/gms/common/ConnectionResult;
+    sget-object v3, Lcom/google/android/gms/common/ConnectionResult;->adD:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->lg()Ljava/lang/String;
+    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->le()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1226,13 +1226,13 @@
     goto :goto_4
 
     :cond_b
-    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/d$a;->lE()Lcom/google/android/gms/common/ConnectionResult;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/d$a;->lC()Lcom/google/android/gms/common/ConnectionResult;
 
     move-result-object v3
 
     if-eqz v3, :cond_c
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/d$a;->lE()Lcom/google/android/gms/common/ConnectionResult;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/d$a;->lC()Lcom/google/android/gms/common/ConnectionResult;
 
     move-result-object v2
 
@@ -1241,13 +1241,13 @@
     goto :goto_4
 
     :cond_c
-    iget-object v1, v2, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, v2, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
 
     invoke-static {v1, v5}, Lcom/google/android/gms/common/internal/r;->a(Landroid/os/Handler;Ljava/lang/String;)V
 
-    iget-object v1, v2, Lcom/google/android/gms/common/api/internal/d$a;->aeP:Ljava/util/Set;
+    iget-object v1, v2, Lcom/google/android/gms/common/api/internal/d$a;->afh:Ljava/util/Set;
 
     invoke-interface {v1, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -1269,7 +1269,7 @@
     const-wide/16 v1, 0x2710
 
     :cond_d
-    iput-wide v1, p0, Lcom/google/android/gms/common/api/internal/d;->aez:J
+    iput-wide v1, p0, Lcom/google/android/gms/common/api/internal/d;->aeR:J
 
     iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
 
@@ -1277,7 +1277,7 @@
 
     invoke-virtual {p1, v0}, Landroid/os/Handler;->removeMessages(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeG:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->aeY:Ljava/util/Map;
 
     invoke-interface {p1}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -1306,7 +1306,7 @@
 
     move-result-object v1
 
-    iget-wide v3, p0, Lcom/google/android/gms/common/api/internal/d;->aez:J
+    iget-wide v3, p0, Lcom/google/android/gms/common/api/internal/d;->aeR:J
 
     invoke-virtual {v2, v1, v3, v4}, Landroid/os/Handler;->sendMessageDelayed(Landroid/os/Message;J)Z
 
@@ -1339,7 +1339,7 @@
     .end packed-switch
 .end method
 
-.method public final lw()V
+.method public final lu()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->handler:Landroid/os/Handler;
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/e.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/e.smali
index 11085e472c..a07193c16c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/e.smali
@@ -8,19 +8,19 @@
 
 
 # static fields
-.field private static afc:Lcom/google/android/gms/common/api/internal/e;
+.field private static afv:Lcom/google/android/gms/common/api/internal/e;
 
 .field private static final sLock:Ljava/lang/Object;
 
 
 # instance fields
-.field private final afd:Ljava/lang/String;
+.field private final afw:Ljava/lang/String;
 
-.field private final afe:Lcom/google/android/gms/common/api/Status;
+.field private final afx:Lcom/google/android/gms/common/api/Status;
 
-.field private final aff:Z
+.field private final afy:Z
 
-.field private final afg:Z
+.field private final afz:Z
 
 
 # direct methods
@@ -79,15 +79,15 @@
     :goto_0
     xor-int/lit8 v0, v3, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/e;->afg:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/e;->afz:Z
 
     goto :goto_1
 
     :cond_1
-    iput-boolean v2, p0, Lcom/google/android/gms/common/api/internal/e;->afg:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/common/api/internal/e;->afz:Z
 
     :goto_1
-    iput-boolean v3, p0, Lcom/google/android/gms/common/api/internal/e;->aff:Z
+    iput-boolean v3, p0, Lcom/google/android/gms/common/api/internal/e;->afy:Z
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/ar;->N(Landroid/content/Context;)Ljava/lang/String;
 
@@ -120,20 +120,20 @@
 
     invoke-direct {p1, v0, v1}, Lcom/google/android/gms/common/api/Status;-><init>(ILjava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->afe:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->afx:Lcom/google/android/gms/common/api/Status;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->afd:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->afw:Ljava/lang/String;
 
     return-void
 
     :cond_3
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/e;->afd:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/e;->afw:Ljava/lang/String;
 
-    sget-object p1, Lcom/google/android/gms/common/api/Status;->adR:Lcom/google/android/gms/common/api/Status;
+    sget-object p1, Lcom/google/android/gms/common/api/Status;->aek:Lcom/google/android/gms/common/api/Status;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->afe:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->afx:Lcom/google/android/gms/common/api/Status;
 
     return-void
 .end method
@@ -150,7 +150,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/api/internal/e;->afc:Lcom/google/android/gms/common/api/internal/e;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/e;->afv:Lcom/google/android/gms/common/api/internal/e;
 
     if-nez v1, :cond_0
 
@@ -158,12 +158,12 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/common/api/internal/e;-><init>(Landroid/content/Context;)V
 
-    sput-object v1, Lcom/google/android/gms/common/api/internal/e;->afc:Lcom/google/android/gms/common/api/internal/e;
+    sput-object v1, Lcom/google/android/gms/common/api/internal/e;->afv:Lcom/google/android/gms/common/api/internal/e;
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/common/api/internal/e;->afc:Lcom/google/android/gms/common/api/internal/e;
+    sget-object p0, Lcom/google/android/gms/common/api/internal/e;->afv:Lcom/google/android/gms/common/api/internal/e;
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/e;->afe:Lcom/google/android/gms/common/api/Status;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/e;->afx:Lcom/google/android/gms/common/api/Status;
 
     monitor-exit v0
 
@@ -179,7 +179,7 @@
     throw p0
 .end method
 
-.method private static aS(Ljava/lang/String;)Lcom/google/android/gms/common/api/internal/e;
+.method private static aN(Ljava/lang/String;)Lcom/google/android/gms/common/api/internal/e;
     .locals 4
 
     sget-object v0, Lcom/google/android/gms/common/api/internal/e;->sLock:Ljava/lang/Object;
@@ -187,11 +187,11 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/api/internal/e;->afc:Lcom/google/android/gms/common/api/internal/e;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/e;->afv:Lcom/google/android/gms/common/api/internal/e;
 
     if-eqz v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/common/api/internal/e;->afc:Lcom/google/android/gms/common/api/internal/e;
+    sget-object p0, Lcom/google/android/gms/common/api/internal/e;->afv:Lcom/google/android/gms/common/api/internal/e;
 
     monitor-exit v0
 
@@ -242,30 +242,30 @@
     throw p0
 .end method
 
-.method public static lI()Ljava/lang/String;
+.method public static lG()Ljava/lang/String;
     .locals 1
 
     const-string v0, "getGoogleAppId"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/api/internal/e;->aS(Ljava/lang/String;)Lcom/google/android/gms/common/api/internal/e;
+    invoke-static {v0}, Lcom/google/android/gms/common/api/internal/e;->aN(Ljava/lang/String;)Lcom/google/android/gms/common/api/internal/e;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/e;->afd:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/e;->afw:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public static lJ()Z
+.method public static lH()Z
     .locals 1
 
     const-string v0, "isMeasurementExplicitlyDisabled"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/api/internal/e;->aS(Ljava/lang/String;)Lcom/google/android/gms/common/api/internal/e;
+    invoke-static {v0}, Lcom/google/android/gms/common/api/internal/e;->aN(Ljava/lang/String;)Lcom/google/android/gms/common/api/internal/e;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lcom/google/android/gms/common/api/internal/e;->afg:Z
+    iget-boolean v0, v0, Lcom/google/android/gms/common/api/internal/e;->afz:Z
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/f.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/f.smali
index 00880173df..9274753ba2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/f.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field final afh:Ljava/lang/Object;
+.field final afA:Ljava/lang/Object;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/f;->afh:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/f;->afA:Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/g.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/g.smali
index bc59da0a03..919a9b92ac 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/g.smali
@@ -19,7 +19,7 @@
 .method public abstract a(Ljava/lang/String;Lcom/google/android/gms/common/api/internal/LifecycleCallback;)V
 .end method
 
-.method public abstract lK()Landroid/app/Activity;
+.method public abstract lI()Landroid/app/Activity;
 .end method
 
 .method public abstract startActivityForResult(Landroid/content/Intent;I)V
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/h$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/h$a.smali
index 7b92e3c9ae..81c3f99a2f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/h$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/h$a.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field private final afl:Ljava/lang/Object;
+.field private final afD:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "T",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final afn:Ljava/lang/String;
+.field private final afF:Ljava/lang/String;
 
 
 # direct methods
@@ -49,9 +49,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h$a;->afl:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h$a;->afD:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/h$a;->afn:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/h$a;->afF:Ljava/lang/String;
 
     return-void
 .end method
@@ -79,15 +79,15 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/common/api/internal/h$a;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->afl:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->afD:Ljava/lang/Object;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/api/internal/h$a;->afl:Ljava/lang/Object;
+    iget-object v3, p1, Lcom/google/android/gms/common/api/internal/h$a;->afD:Ljava/lang/Object;
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->afn:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->afF:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/h$a;->afn:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/h$a;->afF:Ljava/lang/String;
 
     invoke-virtual {v1, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -104,7 +104,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h$a;->afl:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h$a;->afD:Ljava/lang/Object;
 
     invoke-static {v0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -112,7 +112,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->afn:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->afF:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/h$c.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/h$c.smali
index 3aea93d0ed..c57c7f256b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/h$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/h$c.smali
@@ -14,14 +14,14 @@
 
 
 # instance fields
-.field private final synthetic afo:Lcom/google/android/gms/common/api/internal/h;
+.field private final synthetic afG:Lcom/google/android/gms/common/api/internal/h;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/common/api/internal/h;Landroid/os/Looper;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h$c;->afo:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h$c;->afG:Lcom/google/android/gms/common/api/internal/h;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/internal/b/e;-><init>(Landroid/os/Looper;)V
 
@@ -47,13 +47,13 @@
     :goto_0
     invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->checkArgument(Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h$c;->afo:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h$c;->afG:Lcom/google/android/gms/common/api/internal/h;
 
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/h$b;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->afl:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->afD:Ljava/lang/Object;
 
     if-eqz v0, :cond_1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/h.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/h.smali
index 3b560e2b4a..9b379fa8ae 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/h.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field private final afj:Lcom/google/android/gms/common/api/internal/h$c;
+.field private final afC:Lcom/google/android/gms/common/api/internal/h$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h$c;"
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field volatile afl:Ljava/lang/Object;
+.field volatile afD:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "T",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field public final afm:Lcom/google/android/gms/common/api/internal/h$a;
+.field public final afE:Lcom/google/android/gms/common/api/internal/h$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h$a<",
@@ -71,7 +71,7 @@
 
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/common/api/internal/h$c;-><init>(Lcom/google/android/gms/common/api/internal/h;Landroid/os/Looper;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/h;->afj:Lcom/google/android/gms/common/api/internal/h$c;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/h;->afC:Lcom/google/android/gms/common/api/internal/h$c;
 
     const-string p1, "Listener must not be null"
 
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h;->afl:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h;->afD:Ljava/lang/Object;
 
     new-instance p1, Lcom/google/android/gms/common/api/internal/h$a;
 
-    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p3
 
     invoke-direct {p1, p2, p3}, Lcom/google/android/gms/common/api/internal/h$a;-><init>(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     return-void
 .end method
@@ -112,7 +112,7 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h;->afj:Lcom/google/android/gms/common/api/internal/h$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h;->afC:Lcom/google/android/gms/common/api/internal/h$c;
 
     const/4 v1, 0x1
 
@@ -120,7 +120,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h;->afj:Lcom/google/android/gms/common/api/internal/h$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h;->afC:Lcom/google/android/gms/common/api/internal/h$c;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/api/internal/h$c;->sendMessage(Landroid/os/Message;)Z
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/j.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/j.smali
index 2b69715541..07f2cadc72 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/j.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public final afp:Lcom/google/android/gms/common/api/internal/h;
+.field public final afH:Lcom/google/android/gms/common/api/internal/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h<",
@@ -26,9 +26,9 @@
     .end annotation
 .end field
 
-.field final afq:[Lcom/google/android/gms/common/Feature;
+.field final afI:[Lcom/google/android/gms/common/Feature;
 
-.field final afr:Z
+.field final afJ:Z
 
 
 # direct methods
@@ -46,15 +46,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/j;->afp:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/j;->afH:Lcom/google/android/gms/common/api/internal/h;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/j;->afq:[Lcom/google/android/gms/common/Feature;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/j;->afI:[Lcom/google/android/gms/common/Feature;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/j;->afr:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/j;->afJ:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/l.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/l.smali
index cab28abdb4..7b255d0eed 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/l.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/l.smali
@@ -16,9 +16,9 @@
 
 
 # instance fields
-.field final afs:[Lcom/google/android/gms/common/Feature;
+.field final afK:[Lcom/google/android/gms/common/Feature;
 
-.field final aft:Z
+.field final afL:Z
 
 
 # direct methods
@@ -31,11 +31,11 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/l;->afs:[Lcom/google/android/gms/common/Feature;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/l;->afK:[Lcom/google/android/gms/common/Feature;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/l;->aft:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/l;->afL:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/m.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/m.smali
index 64c00203d2..5147d04350 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/m.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/m.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public final afm:Lcom/google/android/gms/common/api/internal/h$a;
+.field public final afE:Lcom/google/android/gms/common/api/internal/h$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h$a<",
@@ -42,7 +42,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/m;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/m;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/n.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/n.smali
index 2337550a55..aba2c04443 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/n.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field final afu:Ljava/util/Map;
+.field final afM:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field final afv:Ljava/util/Map;
+.field final afN:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -42,7 +42,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->afu:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->afM:Ljava/util/Map;
 
     new-instance v0, Ljava/util/WeakHashMap;
 
@@ -52,7 +52,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->afv:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->afN:Ljava/util/Map;
 
     return-void
 .end method
@@ -60,14 +60,14 @@
 .method private final a(ZLcom/google/android/gms/common/api/Status;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->afu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->afM:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
     new-instance v1, Ljava/util/HashMap;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/n;->afu:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/n;->afM:Ljava/util/Map;
 
     invoke-direct {v1, v2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
@@ -75,14 +75,14 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/n;->afv:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/n;->afN:Ljava/util/Map;
 
     monitor-enter v2
 
     :try_start_1
     new-instance v0, Ljava/util/HashMap;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/n;->afv:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/n;->afN:Ljava/util/Map;
 
     invoke-direct {v0, v3}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
@@ -221,10 +221,10 @@
 
 
 # virtual methods
-.method final lL()Z
+.method final lJ()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->afu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->afM:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -232,7 +232,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->afv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->afN:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -254,10 +254,10 @@
     return v0
 .end method
 
-.method public final lM()V
+.method public final lK()V
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->aev:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->aeN:Lcom/google/android/gms/common/api/Status;
 
     const/4 v1, 0x0
 
@@ -266,10 +266,10 @@
     return-void
 .end method
 
-.method public final lN()V
+.method public final lL()V
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/aq;->agf:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/aq;->agx:Lcom/google/android/gms/common/api/Status;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/o.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/o.smali
index 44e6021b56..a2d65b40db 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/o.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/o.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic afw:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+.field private final synthetic afO:Lcom/google/android/gms/common/api/internal/BasePendingResult;
 
-.field private final synthetic afx:Lcom/google/android/gms/common/api/internal/n;
+.field private final synthetic afP:Lcom/google/android/gms/common/api/internal/n;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/n;Lcom/google/android/gms/common/api/internal/BasePendingResult;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/o;->afx:Lcom/google/android/gms/common/api/internal/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/o;->afP:Lcom/google/android/gms/common/api/internal/n;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/o;->afw:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/o;->afO:Lcom/google/android/gms/common/api/internal/BasePendingResult;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,11 +29,11 @@
 .method public final a(Lcom/google/android/gms/common/api/Status;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/o;->afx:Lcom/google/android/gms/common/api/internal/n;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/o;->afP:Lcom/google/android/gms/common/api/internal/n;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/n;->afu:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/n;->afM:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/o;->afw:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/o;->afO:Lcom/google/android/gms/common/api/internal/BasePendingResult;
 
     invoke-interface {p1, v0}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/p.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/p.smali
index 0a1c5e2809..b23a8c2fa5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/p.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/p.smali
@@ -16,18 +16,18 @@
 
 
 # instance fields
-.field private final synthetic afx:Lcom/google/android/gms/common/api/internal/n;
+.field private final synthetic afP:Lcom/google/android/gms/common/api/internal/n;
 
-.field private final synthetic afy:Lcom/google/android/gms/tasks/h;
+.field private final synthetic afQ:Lcom/google/android/gms/tasks/h;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/n;Lcom/google/android/gms/tasks/h;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/p;->afx:Lcom/google/android/gms/common/api/internal/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/p;->afP:Lcom/google/android/gms/common/api/internal/n;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/p;->afy:Lcom/google/android/gms/tasks/h;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/p;->afQ:Lcom/google/android/gms/tasks/h;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,11 +46,11 @@
         }
     .end annotation
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/p;->afx:Lcom/google/android/gms/common/api/internal/n;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/p;->afP:Lcom/google/android/gms/common/api/internal/n;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/n;->afv:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/n;->afN:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/p;->afy:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/p;->afQ:Lcom/google/android/gms/tasks/h;
 
     invoke-interface {p1, v0}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/q.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/q.smali
index 3096618084..1ba4542727 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/q.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/q.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field private adJ:Lcom/google/android/gms/common/api/internal/d;
+.field private aeb:Lcom/google/android/gms/common/api/internal/d;
 
-.field final afz:Landroidx/collection/ArraySet;
+.field final afR:Landroidx/collection/ArraySet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/ArraySet<",
@@ -26,9 +26,9 @@
 
     invoke-direct {p1}, Landroidx/collection/ArraySet;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/q;->afz:Landroidx/collection/ArraySet;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/q;->afR:Landroidx/collection/ArraySet;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/q;->afi:Lcom/google/android/gms/common/api/internal/g;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/q;->afB:Lcom/google/android/gms/common/api/internal/g;
 
     const-string v0, "ConnectionlessLifecycleHelper"
 
@@ -49,7 +49,7 @@
         }
     .end annotation
 
-    invoke-static {p0}, Lcom/google/android/gms/common/api/internal/q;->c(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/g;
+    invoke-static {p0}, Lcom/google/android/gms/common/api/internal/q;->b(Landroid/app/Activity;)Lcom/google/android/gms/common/api/internal/g;
 
     move-result-object p0
 
@@ -70,13 +70,13 @@
     invoke-direct {v0, p0}, Lcom/google/android/gms/common/api/internal/q;-><init>(Lcom/google/android/gms/common/api/internal/g;)V
 
     :cond_0
-    iput-object p1, v0, Lcom/google/android/gms/common/api/internal/q;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, v0, Lcom/google/android/gms/common/api/internal/q;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
     const-string p0, "ApiKey cannot be null"
 
     invoke-static {p2, p0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/q;->afz:Landroidx/collection/ArraySet;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/q;->afR:Landroidx/collection/ArraySet;
 
     invoke-virtual {p0, p2}, Landroidx/collection/ArraySet;->add(Ljava/lang/Object;)Z
 
@@ -85,10 +85,10 @@
     return-void
 .end method
 
-.method private final lO()V
+.method private final lM()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->afz:Landroidx/collection/ArraySet;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->afR:Landroidx/collection/ArraySet;
 
     invoke-virtual {v0}, Landroidx/collection/ArraySet;->isEmpty()Z
 
@@ -96,7 +96,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-virtual {v0, p0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/q;)V
 
@@ -109,19 +109,19 @@
 .method protected final b(Lcom/google/android/gms/common/ConnectionResult;I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/common/api/internal/d;->b(Lcom/google/android/gms/common/ConnectionResult;I)V
 
     return-void
 .end method
 
-.method protected final lw()V
+.method protected final lu()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d;->lw()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d;->lu()V
 
     return-void
 .end method
@@ -131,7 +131,7 @@
 
     invoke-super {p0}, Lcom/google/android/gms/common/api/internal/ay;->onResume()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/q;->lO()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/q;->lM()V
 
     return-void
 .end method
@@ -141,7 +141,7 @@
 
     invoke-super {p0}, Lcom/google/android/gms/common/api/internal/ay;->onStart()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/q;->lO()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/q;->lM()V
 
     return-void
 .end method
@@ -151,22 +151,22 @@
 
     invoke-super {p0}, Lcom/google/android/gms/common/api/internal/ay;->onStop()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->adJ:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->aeb:Lcom/google/android/gms/common/api/internal/d;
 
     sget-object v1, Lcom/google/android/gms/common/api/internal/d;->lock:Ljava/lang/Object;
 
     monitor-enter v1
 
     :try_start_0
-    iget-object v2, v0, Lcom/google/android/gms/common/api/internal/d;->aeH:Lcom/google/android/gms/common/api/internal/q;
+    iget-object v2, v0, Lcom/google/android/gms/common/api/internal/d;->aeZ:Lcom/google/android/gms/common/api/internal/q;
 
     if-ne v2, p0, :cond_0
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lcom/google/android/gms/common/api/internal/d;->aeH:Lcom/google/android/gms/common/api/internal/q;
+    iput-object v2, v0, Lcom/google/android/gms/common/api/internal/d;->aeZ:Lcom/google/android/gms/common/api/internal/q;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->aeI:Ljava/util/Set;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->afa:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/r.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/r.smali
index e1be0951c7..0b187a097c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/r.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/r.smali
@@ -3,16 +3,7 @@
 
 
 # instance fields
-.field final aeN:Lcom/google/android/gms/common/api/internal/aw;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/common/api/internal/aw<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-.field final afA:Lcom/google/android/gms/tasks/h;
+.field final afS:Lcom/google/android/gms/tasks/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/h<",
@@ -21,3 +12,12 @@
         }
     .end annotation
 .end field
+
+.field final aff:Lcom/google/android/gms/common/api/internal/aw;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/common/api/internal/aw<",
+            "*>;"
+        }
+    .end annotation
+.end field
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/s.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/s.smali
index d727b28cd4..3fc8c9cbad 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/s.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/s.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final afB:Ljava/lang/String;
+.field private final afT:Ljava/lang/String;
 
 
 # direct methods
@@ -12,7 +12,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/api/f;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/s;->afB:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/s;->afT:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/u.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/u.smali
index 2d70a8fa6b..06e164d0aa 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/u.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/u.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic aeW:Lcom/google/android/gms/common/api/internal/d;
+.field private final synthetic afp:Lcom/google/android/gms/common/api/internal/d;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/u;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/u;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -22,16 +22,16 @@
 
 
 # virtual methods
-.method public final H(Z)V
+.method public final F(Z)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/u;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/u;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/u;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/u;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v1}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/v.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/v.smali
index 4eb755f341..8948551d27 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/v.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/v.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic afC:Lcom/google/android/gms/common/api/internal/d$a;
+.field private final synthetic afU:Lcom/google/android/gms/common/api/internal/d$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/d$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/v;->afC:Lcom/google/android/gms/common/api/internal/d$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/v;->afU:Lcom/google/android/gms/common/api/internal/d$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,7 +25,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/v;->afC:Lcom/google/android/gms/common/api/internal/d$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/v;->afU:Lcom/google/android/gms/common/api/internal/d$a;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d$a;->a(Lcom/google/android/gms/common/api/internal/d$a;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/w.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/w.smali
index f3dae95a10..cd07014f80 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/w.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/w.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic afC:Lcom/google/android/gms/common/api/internal/d$a;
+.field private final synthetic afU:Lcom/google/android/gms/common/api/internal/d$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/d$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/w;->afC:Lcom/google/android/gms/common/api/internal/d$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/w;->afU:Lcom/google/android/gms/common/api/internal/d$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,9 +25,9 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/w;->afC:Lcom/google/android/gms/common/api/internal/d$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/w;->afU:Lcom/google/android/gms/common/api/internal/d$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lA()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->ly()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/x.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/x.smali
index 327131a61f..b8e3ea4ffb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/x.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/x.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field final synthetic afC:Lcom/google/android/gms/common/api/internal/d$a;
+.field final synthetic afU:Lcom/google/android/gms/common/api/internal/d$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/d$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/x;->afC:Lcom/google/android/gms/common/api/internal/d$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/x;->afU:Lcom/google/android/gms/common/api/internal/d$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -22,12 +22,12 @@
 
 
 # virtual methods
-.method public final lP()V
+.method public final lN()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/x;->afC:Lcom/google/android/gms/common/api/internal/d$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/x;->afU:Lcom/google/android/gms/common/api/internal/d$a;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$a;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$a;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/api/internal/d;)Landroid/os/Handler;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/y.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/y.smali
index 961f598589..cf23dd8675 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/y.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/y.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic afD:Lcom/google/android/gms/common/api/internal/x;
+.field private final synthetic afV:Lcom/google/android/gms/common/api/internal/x;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/x;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/y;->afD:Lcom/google/android/gms/common/api/internal/x;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/y;->afV:Lcom/google/android/gms/common/api/internal/x;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,11 +25,11 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/y;->afD:Lcom/google/android/gms/common/api/internal/x;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/y;->afV:Lcom/google/android/gms/common/api/internal/x;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/x;->afC:Lcom/google/android/gms/common/api/internal/d$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/x;->afU:Lcom/google/android/gms/common/api/internal/d$a;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$a;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$a;->afd:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->disconnect()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/z.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/z.smali
index 7967eb2ad1..45bb543bbf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/z.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/z.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic afE:Lcom/google/android/gms/common/ConnectionResult;
+.field private final synthetic afW:Lcom/google/android/gms/common/ConnectionResult;
 
-.field private final synthetic afF:Lcom/google/android/gms/common/api/internal/d$c;
+.field private final synthetic afX:Lcom/google/android/gms/common/api/internal/d$c;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/internal/d$c;Lcom/google/android/gms/common/ConnectionResult;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/z;->afF:Lcom/google/android/gms/common/api/internal/d$c;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/z;->afX:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/z;->afE:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/z;->afW:Lcom/google/android/gms/common/ConnectionResult;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,39 +29,39 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->afE:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->afW:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->kV()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->afF:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->afX:Lcom/google/android/gms/common/api/internal/d$c;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/google/android/gms/common/api/internal/d$c;->afb:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/common/api/internal/d$c;->afu:Z
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->afd:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->le()Z
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lc()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->afF:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->afX:Lcom/google/android/gms/common/api/internal/d$c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$c;->lH()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$c;->lF()V
 
     return-void
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->afF:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->afX:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->aeL:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->afd:Lcom/google/android/gms/common/api/a$f;
 
     const/4 v1, 0x0
 
@@ -84,17 +84,17 @@
 
     invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->afF:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->afX:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->i(Lcom/google/android/gms/common/api/internal/d;)Ljava/util/Map;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/z;->afF:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/z;->afX:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d$c;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d$c;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -113,17 +113,17 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->afF:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->afX:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->aeW:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->afp:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/common/api/internal/d;->i(Lcom/google/android/gms/common/api/internal/d;)Ljava/util/Map;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/z;->afF:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/z;->afX:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d$c;->aeN:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d$c;->aff:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -131,7 +131,7 @@
 
     check-cast v0, Lcom/google/android/gms/common/api/internal/d$a;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/z;->afE:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/z;->afW:Lcom/google/android/gms/common/ConnectionResult;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/common/api/internal/d$a;->a(Lcom/google/android/gms/common/ConnectionResult;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/j.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/j.smali
index bd1f4b9b6e..42af5e4da4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/j.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field public adP:Lcom/google/android/gms/common/api/k;
+.field public aei:Lcom/google/android/gms/common/api/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/k.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/k.smali
index 76976a093c..fbc87eda30 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/k.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/k.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract ls()Lcom/google/android/gms/common/api/Status;
+.method public abstract lq()Lcom/google/android/gms/common/api/Status;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/n.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/n.smali
index dfeea7ab07..2bba06cf89 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/n.smali
@@ -16,7 +16,7 @@
 
 
 # virtual methods
-.method public abstract lt()Lcom/google/android/gms/common/api/g;
+.method public abstract lr()Lcom/google/android/gms/common/api/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/b.smali b/com.discord/smali_classes2/com/google/android/gms/common/b.smali
index 99dd2b916b..0b434af3bb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/b.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private adq:Landroid/content/DialogInterface$OnCancelListener;
+.field private adI:Landroid/content/DialogInterface$OnCancelListener;
 
 .field private mDialog:Landroid/app/Dialog;
 
@@ -18,7 +18,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/common/b;->mDialog:Landroid/app/Dialog;
 
-    iput-object v0, p0, Lcom/google/android/gms/common/b;->adq:Landroid/content/DialogInterface$OnCancelListener;
+    iput-object v0, p0, Lcom/google/android/gms/common/b;->adI:Landroid/content/DialogInterface$OnCancelListener;
 
     return-void
 .end method
@@ -48,7 +48,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, v0, Lcom/google/android/gms/common/b;->adq:Landroid/content/DialogInterface$OnCancelListener;
+    iput-object p1, v0, Lcom/google/android/gms/common/b;->adI:Landroid/content/DialogInterface$OnCancelListener;
 
     :cond_0
     return-object v0
@@ -59,7 +59,7 @@
 .method public final onCancel(Landroid/content/DialogInterface;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/b;->adq:Landroid/content/DialogInterface$OnCancelListener;
+    iget-object v0, p0, Lcom/google/android/gms/common/b;->adI:Landroid/content/DialogInterface$OnCancelListener;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/b/a.smali b/com.discord/smali_classes2/com/google/android/gms/common/b/a.smali
index 4ec3d39653..f002fa6b37 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/b/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/b/a.smali
@@ -11,11 +11,11 @@
 
 
 # static fields
-.field private static ajk:Lcom/google/android/gms/common/b/a$a;
+.field private static ajC:Lcom/google/android/gms/common/b/a$a;
 
 
 # direct methods
-.method public static declared-synchronized mm()Lcom/google/android/gms/common/b/a$a;
+.method public static declared-synchronized mk()Lcom/google/android/gms/common/b/a$a;
     .locals 2
 
     const-class v0, Lcom/google/android/gms/common/b/a;
@@ -23,7 +23,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/b/a;->ajk:Lcom/google/android/gms/common/b/a$a;
+    sget-object v1, Lcom/google/android/gms/common/b/a;->ajC:Lcom/google/android/gms/common/b/a$a;
 
     if-nez v1, :cond_0
 
@@ -31,10 +31,10 @@
 
     invoke-direct {v1}, Lcom/google/android/gms/common/b/b;-><init>()V
 
-    sput-object v1, Lcom/google/android/gms/common/b/a;->ajk:Lcom/google/android/gms/common/b/a$a;
+    sput-object v1, Lcom/google/android/gms/common/b/a;->ajC:Lcom/google/android/gms/common/b/a$a;
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/common/b/a;->ajk:Lcom/google/android/gms/common/b/a$a;
+    sget-object v1, Lcom/google/android/gms/common/b/a;->ajC:Lcom/google/android/gms/common/b/a$a;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/c.smali b/com.discord/smali_classes2/com/google/android/gms/common/c.smali
index b66cf16d7d..c43a6f83ec 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/c.smali
@@ -5,7 +5,7 @@
 # static fields
 .field public static final GOOGLE_PLAY_SERVICES_VERSION_CODE:I
 
-.field private static final adx:Lcom/google/android/gms/common/c;
+.field private static final adP:Lcom/google/android/gms/common/c;
 
 
 # direct methods
@@ -20,7 +20,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/c;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/c;->adx:Lcom/google/android/gms/common/c;
+    sput-object v0, Lcom/google/android/gms/common/c;->adP:Lcom/google/android/gms/common/c;
 
     return-void
 .end method
@@ -132,10 +132,10 @@
     return p0
 .end method
 
-.method public static lb()Lcom/google/android/gms/common/c;
+.method public static kZ()Lcom/google/android/gms/common/c;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/c;->adx:Lcom/google/android/gms/common/c;
+    sget-object v0, Lcom/google/android/gms/common/c;->adP:Lcom/google/android/gms/common/c;
 
     return-object v0
 .end method
@@ -187,7 +187,7 @@
     return-object p1
 
     :cond_0
-    invoke-static {v1}, Lcom/google/android/gms/common/internal/ai;->aY(Ljava/lang/String;)Landroid/content/Intent;
+    invoke-static {v1}, Lcom/google/android/gms/common/internal/ai;->aT(Ljava/lang/String;)Landroid/content/Intent;
 
     move-result-object p1
 
@@ -202,7 +202,7 @@
 
     if-eqz p2, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/common/internal/ai;->mj()Landroid/content/Intent;
+    invoke-static {}, Lcom/google/android/gms/common/internal/ai;->mh()Landroid/content/Intent;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/c/a.smali b/com.discord/smali_classes2/com/google/android/gms/common/c/a.smali
index 3c30d445f4..23cb7bc559 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/c/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/c/a.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field private static aky:Landroid/content/Context;
+.field private static akQ:Landroid/content/Context;
 
-.field private static akz:Ljava/lang/Boolean;
+.field private static akR:Ljava/lang/Boolean;
 
 
 # direct methods
@@ -21,19 +21,19 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/common/c/a;->aky:Landroid/content/Context;
+    sget-object v2, Lcom/google/android/gms/common/c/a;->akQ:Landroid/content/Context;
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lcom/google/android/gms/common/c/a;->akz:Ljava/lang/Boolean;
+    sget-object v2, Lcom/google/android/gms/common/c/a;->akR:Ljava/lang/Boolean;
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lcom/google/android/gms/common/c/a;->aky:Landroid/content/Context;
+    sget-object v2, Lcom/google/android/gms/common/c/a;->akQ:Landroid/content/Context;
 
     if-ne v2, v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/common/c/a;->akz:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/common/c/a;->akR:Ljava/lang/Boolean;
 
     invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -49,7 +49,7 @@
     const/4 v2, 0x0
 
     :try_start_1
-    sput-object v2, Lcom/google/android/gms/common/c/a;->akz:Ljava/lang/Boolean;
+    sput-object v2, Lcom/google/android/gms/common/c/a;->akR:Ljava/lang/Boolean;
 
     invoke-static {}, Lcom/google/android/gms/common/util/l;->isAtLeastO()Z
 
@@ -69,7 +69,7 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/android/gms/common/c/a;->akz:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/c/a;->akR:Ljava/lang/Boolean;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -87,7 +87,7 @@
 
     sget-object p0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sput-object p0, Lcom/google/android/gms/common/c/a;->akz:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/c/a;->akR:Ljava/lang/Boolean;
     :try_end_2
     .catch Ljava/lang/ClassNotFoundException; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
@@ -98,12 +98,12 @@
     :try_start_3
     sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object p0, Lcom/google/android/gms/common/c/a;->akz:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/c/a;->akR:Ljava/lang/Boolean;
 
     :goto_0
-    sput-object v1, Lcom/google/android/gms/common/c/a;->aky:Landroid/content/Context;
+    sput-object v1, Lcom/google/android/gms/common/c/a;->akQ:Landroid/content/Context;
 
-    sget-object p0, Lcom/google/android/gms/common/c/a;->akz:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/common/c/a;->akR:Ljava/lang/Boolean;
 
     invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/c/b.smali b/com.discord/smali_classes2/com/google/android/gms/common/c/b.smali
index c2944b9f3f..64c1bef9d2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/c/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/c/b.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field public final akA:Landroid/content/Context;
+.field public final akS:Landroid/content/Context;
 
 
 # direct methods
@@ -12,13 +12,46 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
 
     return-void
 .end method
 
 
 # virtual methods
+.method public final aX(Ljava/lang/String;)Ljava/lang/CharSequence;
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/content/pm/PackageManager$NameNotFoundException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
+
+    invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
+
+    invoke-virtual {v1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
+
+    move-result-object v1
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v1, p1, v2}, Landroid/content/pm/PackageManager;->getApplicationInfo(Ljava/lang/String;I)Landroid/content/pm/ApplicationInfo;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Landroid/content/pm/PackageManager;->getApplicationLabel(Landroid/content/pm/ApplicationInfo;)Ljava/lang/CharSequence;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
 .method public final b(ILjava/lang/String;)Z
     .locals 4
 
@@ -43,7 +76,7 @@
     if-eqz v0, :cond_1
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
 
     const-string v3, "appops"
 
@@ -63,7 +96,7 @@
     return v2
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -103,43 +136,10 @@
     return v2
 .end method
 
-.method public final bc(Ljava/lang/String;)Ljava/lang/CharSequence;
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/content/pm/PackageManager$NameNotFoundException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
-
-    invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
-
-    invoke-virtual {v1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
-
-    move-result-object v1
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v1, p1, v2}, Landroid/content/pm/PackageManager;->getApplicationInfo(Ljava/lang/String;I)Landroid/content/pm/ApplicationInfo;
-
-    move-result-object p1
-
-    invoke-virtual {v0, p1}, Landroid/content/pm/PackageManager;->getApplicationLabel(Landroid/content/pm/ApplicationInfo;)Ljava/lang/CharSequence;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
 .method public final checkCallingOrSelfPermission(Ljava/lang/String;)I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
 
     invoke-virtual {v0, p1}, Landroid/content/Context;->checkCallingOrSelfPermission(Ljava/lang/String;)I
 
@@ -156,7 +156,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -177,7 +177,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -190,7 +190,7 @@
     return-object p1
 .end method
 
-.method public final mD()Z
+.method public final mB()Z
     .locals 2
 
     invoke-static {}, Landroid/os/Binder;->getCallingUid()I
@@ -203,7 +203,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/common/c/a;->W(Landroid/content/Context;)Z
 
@@ -218,7 +218,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -234,7 +234,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/c/c.smali b/com.discord/smali_classes2/com/google/android/gms/common/c/c.smali
index ac7f7474ee..a9125f7d79 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/c/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/c/c.smali
@@ -3,11 +3,11 @@
 
 
 # static fields
-.field private static akC:Lcom/google/android/gms/common/c/c;
+.field private static akU:Lcom/google/android/gms/common/c/c;
 
 
 # instance fields
-.field private akB:Lcom/google/android/gms/common/c/b;
+.field private akT:Lcom/google/android/gms/common/c/b;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/c/c;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/c/c;->akC:Lcom/google/android/gms/common/c/c;
+    sput-object v0, Lcom/google/android/gms/common/c/c;->akU:Lcom/google/android/gms/common/c/c;
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/c/c;->akB:Lcom/google/android/gms/common/c/b;
+    iput-object v0, p0, Lcom/google/android/gms/common/c/c;->akT:Lcom/google/android/gms/common/c/b;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/c/c;->akB:Lcom/google/android/gms/common/c/b;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/c;->akT:Lcom/google/android/gms/common/c/b;
 
     if-nez v0, :cond_1
 
@@ -63,10 +63,10 @@
 
     invoke-direct {v0, p1}, Lcom/google/android/gms/common/c/b;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/c/c;->akB:Lcom/google/android/gms/common/c/b;
+    iput-object v0, p0, Lcom/google/android/gms/common/c/c;->akT:Lcom/google/android/gms/common/c/b;
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/common/c/c;->akB:Lcom/google/android/gms/common/c/b;
+    iget-object p1, p0, Lcom/google/android/gms/common/c/c;->akT:Lcom/google/android/gms/common/c/b;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -85,7 +85,7 @@
 .method public static Y(Landroid/content/Context;)Lcom/google/android/gms/common/c/b;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/c/c;->akC:Lcom/google/android/gms/common/c/c;
+    sget-object v0, Lcom/google/android/gms/common/c/c;->akU:Lcom/google/android/gms/common/c/c;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/common/c/c;->X(Landroid/content/Context;)Lcom/google/android/gms/common/c/b;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/data/DataHolder$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/data/DataHolder$a.smali
index 201a79b845..51331c7e7e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/data/DataHolder$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/data/DataHolder$a.smali
@@ -14,9 +14,9 @@
 
 
 # instance fields
-.field private final agQ:[Ljava/lang/String;
+.field private final ahi:[Ljava/lang/String;
 
-.field private final agZ:Ljava/util/ArrayList;
+.field private final ahr:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -28,9 +28,9 @@
     .end annotation
 .end field
 
-.field private final aha:Ljava/lang/String;
+.field private final ahs:Ljava/lang/String;
 
-.field private final ahb:Ljava/util/HashMap;
+.field private final aht:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -41,9 +41,9 @@
     .end annotation
 .end field
 
-.field private ahc:Z
+.field private ahu:Z
 
-.field private ahd:Ljava/lang/String;
+.field private ahv:Ljava/lang/String;
 
 
 # direct methods
@@ -58,29 +58,29 @@
 
     check-cast p1, [Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->agQ:[Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->ahi:[Ljava/lang/String;
 
     new-instance p1, Ljava/util/ArrayList;
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->agZ:Ljava/util/ArrayList;
+    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->ahr:Ljava/util/ArrayList;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aha:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->ahs:Ljava/lang/String;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/data/DataHolder$a;->ahb:Ljava/util/HashMap;
+    iput-object v0, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aht:Ljava/util/HashMap;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder$a;->ahc:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder$a;->ahu:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->ahd:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->ahv:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/data/DataHolder.smali b/com.discord/smali_classes2/com/google/android/gms/common/data/DataHolder.smali
index 38f472d014..71969da276 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/data/DataHolder.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/data/DataHolder.smali
@@ -24,27 +24,27 @@
     .end annotation
 .end field
 
-.field private static final agY:Lcom/google/android/gms/common/data/DataHolder$a;
+.field private static final ahq:Lcom/google/android/gms/common/data/DataHolder$a;
 
 
 # instance fields
-.field private final agP:I
+.field private final ahh:I
 
-.field final agQ:[Ljava/lang/String;
+.field final ahi:[Ljava/lang/String;
 
-.field agR:Landroid/os/Bundle;
+.field ahj:Landroid/os/Bundle;
 
-.field final agS:[Landroid/database/CursorWindow;
+.field final ahk:[Landroid/database/CursorWindow;
 
-.field private final agT:I
+.field private final ahl:I
 
-.field private final agU:Landroid/os/Bundle;
+.field private final ahm:Landroid/os/Bundle;
 
-.field agV:[I
+.field ahn:[I
 
-.field agW:I
+.field aho:I
 
-.field private agX:Z
+.field private ahp:Z
 
 .field private mClosed:Z
 
@@ -67,7 +67,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/common/data/a;-><init>([Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/android/gms/common/data/DataHolder;->agY:Lcom/google/android/gms/common/data/DataHolder$a;
+    sput-object v0, Lcom/google/android/gms/common/data/DataHolder;->ahq:Lcom/google/android/gms/common/data/DataHolder$a;
 
     return-void
 .end method
@@ -83,17 +83,17 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder;->agX:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder;->ahp:Z
 
-    iput p1, p0, Lcom/google/android/gms/common/data/DataHolder;->agP:I
+    iput p1, p0, Lcom/google/android/gms/common/data/DataHolder;->ahh:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/data/DataHolder;->agQ:[Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/data/DataHolder;->ahi:[Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/data/DataHolder;->agS:[Landroid/database/CursorWindow;
+    iput-object p3, p0, Lcom/google/android/gms/common/data/DataHolder;->ahk:[Landroid/database/CursorWindow;
 
-    iput p4, p0, Lcom/google/android/gms/common/data/DataHolder;->agT:I
+    iput p4, p0, Lcom/google/android/gms/common/data/DataHolder;->ahl:I
 
-    iput-object p5, p0, Lcom/google/android/gms/common/data/DataHolder;->agU:Landroid/os/Bundle;
+    iput-object p5, p0, Lcom/google/android/gms/common/data/DataHolder;->ahm:Landroid/os/Bundle;
 
     return-void
 .end method
@@ -139,13 +139,13 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->agS:[Landroid/database/CursorWindow;
+    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->ahk:[Landroid/database/CursorWindow;
 
     array-length v1, v1
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->agS:[Landroid/database/CursorWindow;
+    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->ahk:[Landroid/database/CursorWindow;
 
     aget-object v1, v1, v0
 
@@ -185,11 +185,11 @@
     .end annotation
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder;->agX:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder;->ahp:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/data/DataHolder;->agS:[Landroid/database/CursorWindow;
+    iget-object v0, p0, Lcom/google/android/gms/common/data/DataHolder;->ahk:[Landroid/database/CursorWindow;
 
     array-length v0, v0
 
@@ -263,7 +263,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->agQ:[Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->ahi:[Ljava/lang/String;
 
     const/4 v2, 0x1
 
@@ -280,25 +280,25 @@
     :cond_0
     const/4 v1, 0x2
 
-    iget-object v3, p0, Lcom/google/android/gms/common/data/DataHolder;->agS:[Landroid/database/CursorWindow;
+    iget-object v3, p0, Lcom/google/android/gms/common/data/DataHolder;->ahk:[Landroid/database/CursorWindow;
 
     invoke-static {p1, v1, v3, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;I[Landroid/os/Parcelable;I)V
 
     const/4 v1, 0x3
 
-    iget v3, p0, Lcom/google/android/gms/common/data/DataHolder;->agT:I
+    iget v3, p0, Lcom/google/android/gms/common/data/DataHolder;->ahl:I
 
     invoke-static {p1, v1, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
     const/4 v1, 0x4
 
-    iget-object v3, p0, Lcom/google/android/gms/common/data/DataHolder;->agU:Landroid/os/Bundle;
+    iget-object v3, p0, Lcom/google/android/gms/common/data/DataHolder;->ahm:Landroid/os/Bundle;
 
     invoke-static {p1, v1, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Bundle;)V
 
     const/16 v1, 0x3e8
 
-    iget v3, p0, Lcom/google/android/gms/common/data/DataHolder;->agP:I
+    iget v3, p0, Lcom/google/android/gms/common/data/DataHolder;->ahh:I
 
     invoke-static {p1, v1, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/data/b.smali b/com.discord/smali_classes2/com/google/android/gms/common/data/b.smali
index fe2b754750..c7b7d272f5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/data/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/data/b.smali
@@ -162,20 +162,20 @@
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
 
-    iput-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->agR:Landroid/os/Bundle;
+    iput-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->ahj:Landroid/os/Bundle;
 
     const/4 v0, 0x0
 
     :goto_1
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->agQ:[Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->ahi:[Ljava/lang/String;
 
     array-length v1, v1
 
     if-ge v0, v1, :cond_7
 
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->agR:Landroid/os/Bundle;
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->ahj:Landroid/os/Bundle;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/data/DataHolder;->agQ:[Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/common/data/DataHolder;->ahi:[Ljava/lang/String;
 
     aget-object v3, v3, v0
 
@@ -186,28 +186,28 @@
     goto :goto_1
 
     :cond_7
-    iget-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->agS:[Landroid/database/CursorWindow;
+    iget-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->ahk:[Landroid/database/CursorWindow;
 
     array-length v0, v0
 
     new-array v0, v0, [I
 
-    iput-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->agV:[I
+    iput-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->ahn:[I
 
     const/4 v0, 0x0
 
     :goto_2
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->agS:[Landroid/database/CursorWindow;
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->ahk:[Landroid/database/CursorWindow;
 
     array-length v1, v1
 
     if-ge v2, v1, :cond_8
 
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->agV:[I
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->ahn:[I
 
     aput v0, v1, v2
 
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->agS:[Landroid/database/CursorWindow;
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->ahk:[Landroid/database/CursorWindow;
 
     aget-object v1, v1, v2
 
@@ -217,7 +217,7 @@
 
     sub-int v1, v0, v1
 
-    iget-object v3, p1, Lcom/google/android/gms/common/data/DataHolder;->agS:[Landroid/database/CursorWindow;
+    iget-object v3, p1, Lcom/google/android/gms/common/data/DataHolder;->ahk:[Landroid/database/CursorWindow;
 
     aget-object v3, v3, v2
 
@@ -234,7 +234,7 @@
     goto :goto_2
 
     :cond_8
-    iput v0, p1, Lcom/google/android/gms/common/data/DataHolder;->agW:I
+    iput v0, p1, Lcom/google/android/gms/common/data/DataHolder;->aho:I
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/f.smali b/com.discord/smali_classes2/com/google/android/gms/common/f.smali
index e613389123..c65244ccaf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/f.smali
@@ -125,7 +125,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lb()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kZ()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
@@ -135,7 +135,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lb()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kZ()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
@@ -275,7 +275,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lb()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kZ()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
@@ -303,7 +303,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lb()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kZ()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
@@ -595,7 +595,7 @@
 
     if-nez v0, :cond_6
 
-    sget-object v0, Lcom/google/android/gms/common/util/h;->aka:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/util/h;->aks:Ljava/lang/Boolean;
 
     if-nez v0, :cond_5
 
@@ -639,10 +639,10 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/h;->aka:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/common/util/h;->aks:Ljava/lang/Boolean;
 
     :cond_5
-    sget-object v0, Lcom/google/android/gms/common/util/h;->aka:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/util/h;->aks:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -731,7 +731,7 @@
 .method public static isRestrictedUserProfile(Landroid/content/Context;)Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->ms()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->mq()Z
 
     move-result v0
 
@@ -800,7 +800,7 @@
 
     move-result v0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->mu()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->ms()Z
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/h.smali b/com.discord/smali_classes2/com/google/android/gms/common/h.smali
index e6ada98469..5518186f93 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/h.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private adq:Landroid/content/DialogInterface$OnCancelListener;
+.field private adI:Landroid/content/DialogInterface$OnCancelListener;
 
 .field private mDialog:Landroid/app/Dialog;
 
@@ -18,7 +18,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/common/h;->mDialog:Landroid/app/Dialog;
 
-    iput-object v0, p0, Lcom/google/android/gms/common/h;->adq:Landroid/content/DialogInterface$OnCancelListener;
+    iput-object v0, p0, Lcom/google/android/gms/common/h;->adI:Landroid/content/DialogInterface$OnCancelListener;
 
     return-void
 .end method
@@ -48,7 +48,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, v0, Lcom/google/android/gms/common/h;->adq:Landroid/content/DialogInterface$OnCancelListener;
+    iput-object p1, v0, Lcom/google/android/gms/common/h;->adI:Landroid/content/DialogInterface$OnCancelListener;
 
     :cond_0
     return-object v0
@@ -59,7 +59,7 @@
 .method public final onCancel(Landroid/content/DialogInterface;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/h;->adq:Landroid/content/DialogInterface$OnCancelListener;
+    iget-object v0, p0, Lcom/google/android/gms/common/h;->adI:Landroid/content/DialogInterface$OnCancelListener;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/GetServiceRequest.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/GetServiceRequest.smali
index 323847c107..94bd9db5a8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/GetServiceRequest.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/GetServiceRequest.smali
@@ -15,25 +15,25 @@
 
 
 # instance fields
-.field private final ahY:I
+.field private final aiq:I
 
-.field private ahZ:I
+.field private air:I
 
-.field aia:Ljava/lang/String;
+.field ais:Ljava/lang/String;
 
-.field aib:Landroid/os/IBinder;
+.field ait:Landroid/os/IBinder;
 
-.field aic:[Lcom/google/android/gms/common/api/Scope;
+.field aiu:[Lcom/google/android/gms/common/api/Scope;
 
-.field aid:Landroid/os/Bundle;
+.field aiv:Landroid/os/Bundle;
 
-.field aie:Landroid/accounts/Account;
+.field aiw:Landroid/accounts/Account;
 
-.field aif:[Lcom/google/android/gms/common/Feature;
+.field aix:[Lcom/google/android/gms/common/Feature;
 
-.field aig:[Lcom/google/android/gms/common/Feature;
+.field aiy:[Lcom/google/android/gms/common/Feature;
 
-.field private aih:Z
+.field private aiz:Z
 
 .field private final version:I
 
@@ -62,13 +62,13 @@
 
     sget v0, Lcom/google/android/gms/common/c;->GOOGLE_PLAY_SERVICES_VERSION_CODE:I
 
-    iput v0, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ahZ:I
+    iput v0, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->air:I
 
-    iput p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ahY:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiq:I
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aih:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiz:Z
 
     return-void
 .end method
@@ -80,9 +80,9 @@
 
     iput p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->version:I
 
-    iput p2, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ahY:I
+    iput p2, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiq:I
 
-    iput p3, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ahZ:I
+    iput p3, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->air:I
 
     const-string p2, "com.google.android.gms"
 
@@ -92,12 +92,12 @@
 
     if-eqz p3, :cond_0
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aia:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ais:Ljava/lang/String;
 
     goto :goto_0
 
     :cond_0
-    iput-object p4, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aia:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ais:Ljava/lang/String;
 
     :goto_0
     const/4 p2, 0x2
@@ -117,25 +117,25 @@
     move-result-object p1
 
     :cond_1
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aie:Landroid/accounts/Account;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiw:Landroid/accounts/Account;
 
     goto :goto_1
 
     :cond_2
-    iput-object p5, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aib:Landroid/os/IBinder;
+    iput-object p5, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ait:Landroid/os/IBinder;
 
-    iput-object p8, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aie:Landroid/accounts/Account;
+    iput-object p8, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiw:Landroid/accounts/Account;
 
     :goto_1
-    iput-object p6, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aic:[Lcom/google/android/gms/common/api/Scope;
+    iput-object p6, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiu:[Lcom/google/android/gms/common/api/Scope;
 
-    iput-object p7, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aid:Landroid/os/Bundle;
+    iput-object p7, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiv:Landroid/os/Bundle;
 
-    iput-object p9, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aif:[Lcom/google/android/gms/common/Feature;
+    iput-object p9, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aix:[Lcom/google/android/gms/common/Feature;
 
-    iput-object p10, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aig:[Lcom/google/android/gms/common/Feature;
+    iput-object p10, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiy:[Lcom/google/android/gms/common/Feature;
 
-    iput-boolean p11, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aih:Z
+    iput-boolean p11, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiz:Z
 
     return-void
 .end method
@@ -157,61 +157,61 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ahY:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiq:I
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ahZ:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->air:I
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aia:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ais:Ljava/lang/String;
 
     const/4 v2, 0x4
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aib:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ait:Landroid/os/IBinder;
 
     const/4 v2, 0x5
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/IBinder;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aic:[Lcom/google/android/gms/common/api/Scope;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiu:[Lcom/google/android/gms/common/api/Scope;
 
     const/4 v2, 0x6
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;I[Landroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aid:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiv:Landroid/os/Bundle;
 
     const/4 v2, 0x7
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Bundle;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aie:Landroid/accounts/Account;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiw:Landroid/accounts/Account;
 
     const/16 v2, 0x8
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aif:[Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aix:[Lcom/google/android/gms/common/Feature;
 
     const/16 v2, 0xa
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;I[Landroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aig:[Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiy:[Lcom/google/android/gms/common/Feature;
 
     const/16 v2, 0xb
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;I[Landroid/os/Parcelable;I)V
 
-    iget-boolean p2, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aih:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiz:Z
 
     const/16 v1, 0xc
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/ResolveAccountRequest.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/ResolveAccountRequest.smali
index ae2334cd54..2a65f32450 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/ResolveAccountRequest.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/ResolveAccountRequest.smali
@@ -15,13 +15,13 @@
 
 
 # instance fields
-.field private final agP:I
+.field private final ahh:I
 
-.field private final ahL:Landroid/accounts/Account;
+.field private final aiS:I
 
-.field private final aiA:I
+.field private final aiT:Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
 
-.field private final aiB:Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+.field private final aid:Landroid/accounts/Account;
 
 
 # direct methods
@@ -42,13 +42,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->agP:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ahh:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ahL:Landroid/accounts/Account;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aid:Landroid/accounts/Account;
 
-    iput p3, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aiA:I
+    iput p3, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aiS:I
 
-    iput-object p4, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aiB:Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    iput-object p4, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aiT:Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
 
     return-void
 .end method
@@ -74,25 +74,25 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->agP:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ahh:I
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ahL:Landroid/accounts/Account;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aid:Landroid/accounts/Account;
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aiA:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aiS:I
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aiB:Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aiT:Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
 
     const/4 v2, 0x4
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/ResolveAccountResponse.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/ResolveAccountResponse.smali
index ba56717176..d51ba7b6d2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/ResolveAccountResponse.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/ResolveAccountResponse.smali
@@ -15,15 +15,15 @@
 
 
 # instance fields
-.field private final agP:I
+.field public agQ:Lcom/google/android/gms/common/ConnectionResult;
 
-.field public agy:Lcom/google/android/gms/common/ConnectionResult;
+.field private final ahh:I
 
-.field public aiC:Landroid/os/IBinder;
+.field public aiU:Landroid/os/IBinder;
 
-.field private aiD:Z
+.field private aiV:Z
 
-.field private aiE:Z
+.field private aiW:Z
 
 
 # direct methods
@@ -44,15 +44,15 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->agP:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->ahh:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiC:Landroid/os/IBinder;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiU:Landroid/os/IBinder;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiD:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiV:Z
 
-    iput-boolean p5, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiE:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiW:Z
 
     return-void
 .end method
@@ -80,9 +80,9 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v3, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/common/ConnectionResult;->equals(Ljava/lang/Object;)Z
 
@@ -90,13 +90,13 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiC:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiU:Landroid/os/IBinder;
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/k$a;->e(Landroid/os/IBinder;)Lcom/google/android/gms/common/internal/k;
 
     move-result-object v1
 
-    iget-object p1, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiC:Landroid/os/IBinder;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiU:Landroid/os/IBinder;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/k$a;->e(Landroid/os/IBinder;)Lcom/google/android/gms/common/internal/k;
 
@@ -123,31 +123,31 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->agP:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->ahh:I
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiC:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiU:Landroid/os/IBinder;
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/IBinder;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-boolean p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiD:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiV:Z
 
     const/4 v1, 0x4
 
     invoke-static {p1, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget-boolean p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiE:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiW:Z
 
     const/4 v1, 0x5
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/a.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/a.smali
index f0b901d20a..efac11a79b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/a.smali
@@ -13,7 +13,7 @@
     move-result-wide v0
 
     :try_start_0
-    invoke-interface {p0}, Lcom/google/android/gms/common/internal/k;->lc()Landroid/accounts/Account;
+    invoke-interface {p0}, Lcom/google/android/gms/common/internal/k;->la()Landroid/accounts/Account;
 
     move-result-object p0
     :try_end_0
@@ -68,7 +68,7 @@
     throw p1
 .end method
 
-.method public final lc()Landroid/accounts/Account;
+.method public final la()Landroid/accounts/Account;
     .locals 1
 
     new-instance v0, Ljava/lang/NoSuchMethodError;
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/aa.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/aa.smali
index 0054801089..d7dcce0427 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/aa.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/aa.smali
@@ -6,26 +6,26 @@
 
 
 # instance fields
-.field private final synthetic aiM:Lcom/google/android/gms/common/api/g;
+.field private final synthetic aje:Lcom/google/android/gms/common/api/g;
 
-.field private final synthetic aiN:Lcom/google/android/gms/tasks/h;
+.field private final synthetic ajf:Lcom/google/android/gms/tasks/h;
 
-.field private final synthetic aiO:Lcom/google/android/gms/common/internal/q$a;
+.field private final synthetic ajg:Lcom/google/android/gms/common/internal/q$a;
 
-.field private final synthetic aiP:Lcom/google/android/gms/common/internal/q$b;
+.field private final synthetic ajh:Lcom/google/android/gms/common/internal/q$b;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/g;Lcom/google/android/gms/tasks/h;Lcom/google/android/gms/common/internal/q$a;Lcom/google/android/gms/common/internal/q$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/aa;->aiM:Lcom/google/android/gms/common/api/g;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/aa;->aje:Lcom/google/android/gms/common/api/g;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/aa;->aiN:Lcom/google/android/gms/tasks/h;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/aa;->ajf:Lcom/google/android/gms/tasks/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/internal/aa;->aiO:Lcom/google/android/gms/common/internal/q$a;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/aa;->ajg:Lcom/google/android/gms/common/internal/q$a;
 
-    iput-object p4, p0, Lcom/google/android/gms/common/internal/aa;->aiP:Lcom/google/android/gms/common/internal/q$b;
+    iput-object p4, p0, Lcom/google/android/gms/common/internal/aa;->ajh:Lcom/google/android/gms/common/internal/q$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,13 +37,13 @@
 .method public final a(Lcom/google/android/gms/common/api/Status;)V
     .locals 2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->kX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->kV()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/aa;->aiM:Lcom/google/android/gms/common/api/g;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/aa;->aje:Lcom/google/android/gms/common/api/g;
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -51,9 +51,9 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/aa;->aiN:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/aa;->ajf:Lcom/google/android/gms/tasks/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/aa;->aiO:Lcom/google/android/gms/common/internal/q$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/aa;->ajg:Lcom/google/android/gms/common/internal/q$a;
 
     invoke-interface {v1, p1}, Lcom/google/android/gms/common/internal/q$a;->e(Lcom/google/android/gms/common/api/k;)Ljava/lang/Object;
 
@@ -64,9 +64,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/aa;->aiN:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/aa;->ajf:Lcom/google/android/gms/tasks/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/aa;->aiP:Lcom/google/android/gms/common/internal/q$b;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/aa;->ajh:Lcom/google/android/gms/common/internal/q$b;
 
     invoke-interface {v1, p1}, Lcom/google/android/gms/common/internal/q$b;->k(Lcom/google/android/gms/common/api/Status;)Lcom/google/android/gms/common/api/b;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/ab.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/ab.smali
index 85a17babab..e9fb1015bd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/ab.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/ab.smali
@@ -16,14 +16,14 @@
 
 
 # instance fields
-.field private final synthetic aiQ:Lcom/google/android/gms/common/api/j;
+.field private final synthetic aji:Lcom/google/android/gms/common/api/j;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/j;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/ab;->aiQ:Lcom/google/android/gms/common/api/j;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/ab;->aji:Lcom/google/android/gms/common/api/j;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -35,9 +35,9 @@
 .method public final synthetic e(Lcom/google/android/gms/common/api/k;)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ab;->aiQ:Lcom/google/android/gms/common/api/j;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ab;->aji:Lcom/google/android/gms/common/api/j;
 
-    iput-object p1, v0, Lcom/google/android/gms/common/api/j;->adP:Lcom/google/android/gms/common/api/k;
+    iput-object p1, v0, Lcom/google/android/gms/common/api/j;->aei:Lcom/google/android/gms/common/api/k;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/ag.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/ag.smali
index c497d5cb97..4f70dab967 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/ag.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/ag.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private final aiT:Ljava/util/HashMap;
+.field private final ajl:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -17,13 +17,13 @@
     .end annotation
 .end field
 
-.field private final aiU:Landroid/content/Context;
+.field private final ajm:Landroid/content/Context;
 
-.field private final aiV:Lcom/google/android/gms/common/stats/a;
+.field private final ajn:Lcom/google/android/gms/common/stats/a;
 
-.field private final aiW:J
+.field private final ajo:J
 
-.field private final aiX:J
+.field private final ajp:J
 
 .field private final mHandler:Landroid/os/Handler;
 
@@ -38,13 +38,13 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/ag;->aiT:Ljava/util/HashMap;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/ag;->ajl:Ljava/util/HashMap;
 
     invoke-virtual {p1}, Landroid/content/Context;->getApplicationContext()Landroid/content/Context;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/ag;->aiU:Landroid/content/Context;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/ag;->ajm:Landroid/content/Context;
 
     new-instance v0, Lcom/google/android/gms/internal/c/e;
 
@@ -56,19 +56,19 @@
 
     iput-object v0, p0, Lcom/google/android/gms/common/internal/ag;->mHandler:Landroid/os/Handler;
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/ag;->aiV:Lcom/google/android/gms/common/stats/a;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/ag;->ajn:Lcom/google/android/gms/common/stats/a;
 
     const-wide/16 v0, 0x1388
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->aiW:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->ajo:J
 
     const-wide/32 v0, 0x493e0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->aiX:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->ajp:J
 
     return-void
 .end method
@@ -76,7 +76,7 @@
 .method static synthetic a(Lcom/google/android/gms/common/internal/ag;)Ljava/util/HashMap;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/internal/ag;->aiT:Ljava/util/HashMap;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/ag;->ajl:Ljava/util/HashMap;
 
     return-object p0
 .end method
@@ -92,7 +92,7 @@
 .method static synthetic c(Lcom/google/android/gms/common/internal/ag;)Landroid/content/Context;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/internal/ag;->aiU:Landroid/content/Context;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/ag;->ajm:Landroid/content/Context;
 
     return-object p0
 .end method
@@ -100,7 +100,7 @@
 .method static synthetic d(Lcom/google/android/gms/common/internal/ag;)Lcom/google/android/gms/common/stats/a;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/internal/ag;->aiV:Lcom/google/android/gms/common/stats/a;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/ag;->ajn:Lcom/google/android/gms/common/stats/a;
 
     return-object p0
 .end method
@@ -108,7 +108,7 @@
 .method static synthetic e(Lcom/google/android/gms/common/internal/ag;)J
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->aiX:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->ajp:J
 
     return-wide v0
 .end method
@@ -122,12 +122,12 @@
 
     invoke-static {p2, v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->aiT:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->ajl:Ljava/util/HashMap;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->aiT:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->ajl:Ljava/util/HashMap;
 
     invoke-virtual {v1, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -143,11 +143,11 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, v1, Lcom/google/android/gms/common/internal/ah;->aiY:Ljava/util/Set;
+    iget-object v2, v1, Lcom/google/android/gms/common/internal/ah;->ajq:Ljava/util/Set;
 
     invoke-interface {v2, p2}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/ah;->mi()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/ah;->mg()Z
 
     move-result p2
 
@@ -163,7 +163,7 @@
 
     iget-object p2, p0, Lcom/google/android/gms/common/internal/ag;->mHandler:Landroid/os/Handler;
 
-    iget-wide v1, p0, Lcom/google/android/gms/common/internal/ag;->aiW:J
+    iget-wide v1, p0, Lcom/google/android/gms/common/internal/ag;->ajo:J
 
     invoke-virtual {p2, p1, v1, v2}, Landroid/os/Handler;->sendMessageDelayed(Landroid/os/Message;J)Z
 
@@ -259,12 +259,12 @@
 
     invoke-static {p2, p3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p3, p0, Lcom/google/android/gms/common/internal/ag;->aiT:Ljava/util/HashMap;
+    iget-object p3, p0, Lcom/google/android/gms/common/internal/ag;->ajl:Ljava/util/HashMap;
 
     monitor-enter p3
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->aiT:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->ajl:Ljava/util/HashMap;
 
     invoke-virtual {v0, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -280,9 +280,9 @@
 
     invoke-virtual {v0, p2}, Lcom/google/android/gms/common/internal/ah;->a(Landroid/content/ServiceConnection;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/ah;->mh()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/ah;->mf()V
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/ag;->aiT:Ljava/util/HashMap;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/ag;->ajl:Ljava/util/HashMap;
 
     invoke-virtual {p2, p1, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -316,19 +316,19 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/ah;->mh()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/ah;->mf()V
 
     goto :goto_0
 
     :cond_2
     iget-object p1, v0, Lcom/google/android/gms/common/internal/ah;->mComponentName:Landroid/content/ComponentName;
 
-    iget-object v1, v0, Lcom/google/android/gms/common/internal/ah;->aja:Landroid/os/IBinder;
+    iget-object v1, v0, Lcom/google/android/gms/common/internal/ah;->ajs:Landroid/os/IBinder;
 
     invoke-interface {p2, p1, v1}, Landroid/content/ServiceConnection;->onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V
 
     :goto_0
-    iget-boolean p1, v0, Lcom/google/android/gms/common/internal/ah;->aiZ:Z
+    iget-boolean p1, v0, Lcom/google/android/gms/common/internal/ah;->ajr:Z
 
     monitor-exit p3
 
@@ -395,7 +395,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->aiT:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->ajl:Ljava/util/HashMap;
 
     monitor-enter v0
 
@@ -404,7 +404,7 @@
 
     check-cast p1, Lcom/google/android/gms/common/internal/h$a;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->aiT:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->ajl:Ljava/util/HashMap;
 
     invoke-virtual {v1, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -467,7 +467,7 @@
 
     new-instance v3, Landroid/content/ComponentName;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/internal/h$a;->ail:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/h$a;->aiD:Ljava/lang/String;
 
     const-string v4, "unknown"
 
@@ -491,7 +491,7 @@
     throw p1
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->aiT:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->ajl:Ljava/util/HashMap;
 
     monitor-enter v0
 
@@ -500,7 +500,7 @@
 
     check-cast p1, Lcom/google/android/gms/common/internal/h$a;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/internal/ag;->aiT:Ljava/util/HashMap;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/ag;->ajl:Ljava/util/HashMap;
 
     invoke-virtual {v3, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -510,38 +510,38 @@
 
     if-eqz v3, :cond_6
 
-    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/ah;->mi()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/ah;->mg()Z
 
     move-result v4
 
     if-eqz v4, :cond_6
 
-    iget-boolean v4, v3, Lcom/google/android/gms/common/internal/ah;->aiZ:Z
+    iget-boolean v4, v3, Lcom/google/android/gms/common/internal/ah;->ajr:Z
 
     if-eqz v4, :cond_5
 
-    iget-object v4, v3, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v4, v3, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     iget-object v4, v4, Lcom/google/android/gms/common/internal/ag;->mHandler:Landroid/os/Handler;
 
-    iget-object v5, v3, Lcom/google/android/gms/common/internal/ah;->ajb:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v5, v3, Lcom/google/android/gms/common/internal/ah;->ajt:Lcom/google/android/gms/common/internal/h$a;
 
     invoke-virtual {v4, v2, v5}, Landroid/os/Handler;->removeMessages(ILjava/lang/Object;)V
 
-    iget-object v4, v3, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v4, v3, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
-    iget-object v4, v4, Lcom/google/android/gms/common/internal/ag;->aiU:Landroid/content/Context;
+    iget-object v4, v4, Lcom/google/android/gms/common/internal/ag;->ajm:Landroid/content/Context;
 
     invoke-static {v4, v3}, Lcom/google/android/gms/common/stats/a;->a(Landroid/content/Context;Landroid/content/ServiceConnection;)V
 
-    iput-boolean v1, v3, Lcom/google/android/gms/common/internal/ah;->aiZ:Z
+    iput-boolean v1, v3, Lcom/google/android/gms/common/internal/ah;->ajr:Z
 
     const/4 v1, 0x2
 
     iput v1, v3, Lcom/google/android/gms/common/internal/ah;->mState:I
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->aiT:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->ajl:Ljava/util/HashMap;
 
     invoke-virtual {v1, p1}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/ah.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/ah.smali
index 5d9d54a4af..312a1a79bb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/ah.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/ah.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field final aiY:Ljava/util/Set;
+.field final ajq:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -16,13 +16,13 @@
     .end annotation
 .end field
 
-.field aiZ:Z
+.field ajr:Z
 
-.field aja:Landroid/os/IBinder;
+.field ajs:Landroid/os/IBinder;
 
-.field final ajb:Lcom/google/android/gms/common/internal/h$a;
+.field final ajt:Lcom/google/android/gms/common/internal/h$a;
 
-.field final synthetic ajc:Lcom/google/android/gms/common/internal/ag;
+.field final synthetic aju:Lcom/google/android/gms/common/internal/ag;
 
 .field mComponentName:Landroid/content/ComponentName;
 
@@ -33,17 +33,17 @@
 .method public constructor <init>(Lcom/google/android/gms/common/internal/ag;Lcom/google/android/gms/common/internal/h$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/ah;->ajb:Lcom/google/android/gms/common/internal/h$a;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/ah;->ajt:Lcom/google/android/gms/common/internal/h$a;
 
     new-instance p1, Ljava/util/HashSet;
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/ah;->aiY:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/ah;->ajq:Ljava/util/Set;
 
     const/4 p1, 0x2
 
@@ -57,23 +57,23 @@
 .method public final a(Landroid/content/ServiceConnection;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/ag;->d(Lcom/google/android/gms/common/internal/ag;)Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/ag;->c(Lcom/google/android/gms/common/internal/ag;)Landroid/content/Context;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajb:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajt:Lcom/google/android/gms/common/internal/h$a;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/ag;->c(Lcom/google/android/gms/common/internal/ag;)Landroid/content/Context;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/h$a;->mf()Landroid/content/Intent;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/h$a;->md()Landroid/content/Intent;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->aiY:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajq:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -83,7 +83,7 @@
 .method public final b(Landroid/content/ServiceConnection;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->aiY:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajq:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -92,48 +92,48 @@
     return p1
 .end method
 
-.method public final mh()V
+.method public final mf()V
     .locals 4
 
     const/4 v0, 0x3
 
     iput v0, p0, Lcom/google/android/gms/common/internal/ah;->mState:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/ag;->d(Lcom/google/android/gms/common/internal/ag;)Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/ag;->c(Lcom/google/android/gms/common/internal/ag;)Landroid/content/Context;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->ajb:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->ajt:Lcom/google/android/gms/common/internal/h$a;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v2}, Lcom/google/android/gms/common/internal/ag;->c(Lcom/google/android/gms/common/internal/ag;)Landroid/content/Context;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/h$a;->mf()Landroid/content/Intent;
+    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/h$a;->md()Landroid/content/Intent;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->ajb:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->ajt:Lcom/google/android/gms/common/internal/h$a;
 
-    iget v2, v2, Lcom/google/android/gms/common/internal/h$a;->aim:I
+    iget v2, v2, Lcom/google/android/gms/common/internal/h$a;->aiE:I
 
     invoke-static {v0, v1, p0, v2}, Lcom/google/android/gms/common/stats/a;->a(Landroid/content/Context;Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
 
     move-result v0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/internal/ah;->aiZ:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/internal/ah;->ajr:Z
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/internal/ah;->aiZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/internal/ah;->ajr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/ag;->b(Lcom/google/android/gms/common/internal/ag;)Landroid/os/Handler;
 
@@ -141,19 +141,19 @@
 
     const/4 v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->ajb:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->ajt:Lcom/google/android/gms/common/internal/h$a;
 
     invoke-virtual {v0, v1, v2}, Landroid/os/Handler;->obtainMessage(ILjava/lang/Object;)Landroid/os/Message;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/ag;->b(Lcom/google/android/gms/common/internal/ag;)Landroid/os/Handler;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v2}, Lcom/google/android/gms/common/internal/ag;->e(Lcom/google/android/gms/common/internal/ag;)J
 
@@ -169,11 +169,11 @@
     iput v0, p0, Lcom/google/android/gms/common/internal/ah;->mState:I
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/ag;->d(Lcom/google/android/gms/common/internal/ag;)Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/ag;->c(Lcom/google/android/gms/common/internal/ag;)Landroid/content/Context;
 
@@ -187,10 +187,10 @@
     return-void
 .end method
 
-.method public final mi()Z
+.method public final mg()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->aiY:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajq:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->isEmpty()Z
 
@@ -202,7 +202,7 @@
 .method public final onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/ag;->a(Lcom/google/android/gms/common/internal/ag;)Ljava/util/HashMap;
 
@@ -211,23 +211,23 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/ag;->b(Lcom/google/android/gms/common/internal/ag;)Landroid/os/Handler;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->ajb:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->ajt:Lcom/google/android/gms/common/internal/h$a;
 
     const/4 v3, 0x1
 
     invoke-virtual {v1, v3, v2}, Landroid/os/Handler;->removeMessages(ILjava/lang/Object;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/ah;->aja:Landroid/os/IBinder;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/ah;->ajs:Landroid/os/IBinder;
 
     iput-object p1, p0, Lcom/google/android/gms/common/internal/ah;->mComponentName:Landroid/content/ComponentName;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->aiY:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->ajq:Ljava/util/Set;
 
     invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -276,7 +276,7 @@
 .method public final onServiceDisconnected(Landroid/content/ComponentName;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/ag;->a(Lcom/google/android/gms/common/internal/ag;)Ljava/util/HashMap;
 
@@ -285,7 +285,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->ajc:Lcom/google/android/gms/common/internal/ag;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->aju:Lcom/google/android/gms/common/internal/ag;
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/ag;->b(Lcom/google/android/gms/common/internal/ag;)Landroid/os/Handler;
 
@@ -293,17 +293,17 @@
 
     const/4 v2, 0x1
 
-    iget-object v3, p0, Lcom/google/android/gms/common/internal/ah;->ajb:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/ah;->ajt:Lcom/google/android/gms/common/internal/h$a;
 
     invoke-virtual {v1, v2, v3}, Landroid/os/Handler;->removeMessages(ILjava/lang/Object;)V
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/google/android/gms/common/internal/ah;->aja:Landroid/os/IBinder;
+    iput-object v1, p0, Lcom/google/android/gms/common/internal/ah;->ajs:Landroid/os/IBinder;
 
     iput-object p1, p0, Lcom/google/android/gms/common/internal/ah;->mComponentName:Landroid/content/ComponentName;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->aiY:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->ajq:Ljava/util/Set;
 
     invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/ai.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/ai.smali
index 0ed213bd53..6430c68ee8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/ai.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/ai.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field private static final ajd:Landroid/net/Uri;
+.field private static final ajv:Landroid/net/Uri;
 
-.field private static final aje:Landroid/net/Uri;
+.field private static final ajw:Landroid/net/Uri;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/internal/ai;->ajd:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/common/internal/ai;->ajv:Landroid/net/Uri;
 
     invoke-virtual {v0}, Landroid/net/Uri;->buildUpon()Landroid/net/Uri$Builder;
 
@@ -40,12 +40,12 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/internal/ai;->aje:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/common/internal/ai;->ajw:Landroid/net/Uri;
 
     return-void
 .end method
 
-.method public static aY(Ljava/lang/String;)Landroid/content/Intent;
+.method public static aT(Ljava/lang/String;)Landroid/content/Intent;
     .locals 2
 
     const-string v0, "package"
@@ -67,7 +67,7 @@
     return-object v0
 .end method
 
-.method public static mj()Landroid/content/Intent;
+.method public static mh()Landroid/content/Intent;
     .locals 2
 
     new-instance v0, Landroid/content/Intent;
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/aj.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/aj.smali
index 1baa9de478..6853d87b41 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/aj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/aj.smali
@@ -3,11 +3,11 @@
 
 
 # instance fields
-.field final aim:I
+.field final aiE:I
 
-.field final ajf:Ljava/lang/String;
+.field final ajx:Ljava/lang/String;
 
-.field private final ajg:Z
+.field private final ajy:Z
 
 .field final mPackageName:Ljava/lang/String;
 
@@ -20,15 +20,15 @@
 
     iput-object p1, p0, Lcom/google/android/gms/common/internal/aj;->mPackageName:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/aj;->ajf:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/aj;->ajx:Ljava/lang/String;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/aj;->ajg:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/aj;->ajy:Z
 
     const/16 p1, 0x81
 
-    iput p1, p0, Lcom/google/android/gms/common/internal/aj;->aim:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/aj;->aiE:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/ak.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/ak.smali
index f916a30ea6..7ff2bb462c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/ak.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/ak.smali
@@ -6,7 +6,7 @@
 
 
 # virtual methods
-.method public abstract mk()Lcom/google/android/gms/a/a;
+.method public abstract mi()Lcom/google/android/gms/a/a;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -14,7 +14,7 @@
     .end annotation
 .end method
 
-.method public abstract ml()I
+.method public abstract mj()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/al.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/al.smali
index e67e74ad08..1cc616da79 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/al.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/al.smali
@@ -71,7 +71,7 @@
     return p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/al;->ml()I
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/al;->mj()I
 
     move-result p1
 
@@ -82,7 +82,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/al;->mk()Lcom/google/android/gms/a/a;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/al;->mi()Lcom/google/android/gms/a/a;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/am.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/am.smali
index 649c4f686f..c84610e0ff 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/am.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/am.smali
@@ -18,7 +18,7 @@
 
 
 # virtual methods
-.method public final mk()Lcom/google/android/gms/a/a;
+.method public final mi()Lcom/google/android/gms/a/a;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -49,7 +49,7 @@
     return-object v1
 .end method
 
-.method public final ml()I
+.method public final mj()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -57,7 +57,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/an.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/an.smali
index 692f7c4fa4..92cd4842e7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/an.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/an.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -49,7 +49,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -74,7 +74,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/aq.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/aq.smali
index 6cbbd06925..0adad7f1de 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/aq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/aq.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/ar.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/ar.smali
index 003600d1b2..852365e715 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/ar.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/ar.smali
@@ -3,11 +3,11 @@
 
 
 # static fields
-.field private static ajh:Z
+.field private static ajA:Ljava/lang/String;
 
-.field private static aji:Ljava/lang/String;
+.field private static ajB:I
 
-.field private static ajj:I
+.field private static ajz:Z
 
 .field private static sLock:Ljava/lang/Object;
 
@@ -30,7 +30,7 @@
 
     invoke-static {p0}, Lcom/google/android/gms/common/internal/ar;->P(Landroid/content/Context;)V
 
-    sget-object p0, Lcom/google/android/gms/common/internal/ar;->aji:Ljava/lang/String;
+    sget-object p0, Lcom/google/android/gms/common/internal/ar;->ajA:Ljava/lang/String;
 
     return-object p0
 .end method
@@ -40,7 +40,7 @@
 
     invoke-static {p0}, Lcom/google/android/gms/common/internal/ar;->P(Landroid/content/Context;)V
 
-    sget p0, Lcom/google/android/gms/common/internal/ar;->ajj:I
+    sget p0, Lcom/google/android/gms/common/internal/ar;->ajB:I
 
     return p0
 .end method
@@ -53,7 +53,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-boolean v1, Lcom/google/android/gms/common/internal/ar;->ajh:Z
+    sget-boolean v1, Lcom/google/android/gms/common/internal/ar;->ajz:Z
 
     if-eqz v1, :cond_0
 
@@ -64,7 +64,7 @@
     :cond_0
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/google/android/gms/common/internal/ar;->ajh:Z
+    sput-boolean v1, Lcom/google/android/gms/common/internal/ar;->ajz:Z
 
     invoke-virtual {p0}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
@@ -105,7 +105,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/common/internal/ar;->aji:Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/common/internal/ar;->ajA:Ljava/lang/String;
 
     const-string v1, "com.google.android.gms.version"
 
@@ -113,7 +113,7 @@
 
     move-result p0
 
-    sput p0, Lcom/google/android/gms/common/internal/ar;->ajj:I
+    sput p0, Lcom/google/android/gms/common/internal/ar;->ajB:I
     :try_end_3
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_3 .. :try_end_3} :catch_0
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/b.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/b.smali
index 978b162096..d2b2bee7c7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/b.smali
@@ -6,7 +6,7 @@
 .method public static j(Lcom/google/android/gms/common/api/Status;)Lcom/google/android/gms/common/api/b;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/Status;->kW()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/Status;->kU()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$a.smali
index 875720b0c3..c6d99f0d7f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$a.smali
@@ -14,8 +14,8 @@
 
 
 # virtual methods
-.method public abstract lq()V
+.method public abstract lo()V
 .end method
 
-.method public abstract lr()V
+.method public abstract lp()V
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$d.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$d.smali
index 12ef5e9f30..89ae23bcbb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$d.smali
@@ -17,14 +17,14 @@
 
 
 # instance fields
-.field private final synthetic ahE:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ahW:Lcom/google/android/gms/common/internal/c;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/common/internal/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$d;->ahE:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$d;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,17 +36,17 @@
 .method public final d(Lcom/google/android/gms/common/ConnectionResult;)V
     .locals 2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->kX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->kV()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$d;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$d;->ahW:Lcom/google/android/gms/common/internal/c;
 
     const/4 v0, 0x0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/internal/c;->lZ()Ljava/util/Set;
+    invoke-virtual {p1}, Lcom/google/android/gms/common/internal/c;->lX()Ljava/util/Set;
 
     move-result-object v1
 
@@ -55,7 +55,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$d;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$d;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/c;->h(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/internal/c$b;
 
@@ -63,7 +63,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$d;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$d;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/c;->h(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/internal/c$b;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$e.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$e.smali
index 628c8e86f9..024429786e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$e.smali
@@ -14,5 +14,5 @@
 
 
 # virtual methods
-.method public abstract lP()V
+.method public abstract lN()V
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$f.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$f.smali
index efa2e2256e..1504eb8b46 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$f.smali
@@ -22,9 +22,9 @@
 
 
 # instance fields
-.field private final synthetic ahE:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ahW:Lcom/google/android/gms/common/internal/c;
 
-.field private final ahF:Landroid/os/Bundle;
+.field private final ahX:Landroid/os/Bundle;
 
 .field private final statusCode:I
 
@@ -33,7 +33,7 @@
 .method protected constructor <init>(Lcom/google/android/gms/common/internal/c;ILandroid/os/Bundle;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ahE:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ahW:Lcom/google/android/gms/common/internal/c;
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
@@ -41,7 +41,7 @@
 
     iput p2, p0, Lcom/google/android/gms/common/internal/c$f;->statusCode:I
 
-    iput-object p3, p0, Lcom/google/android/gms/common/internal/c$f;->ahF:Landroid/os/Bundle;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/c$f;->ahX:Landroid/os/Bundle;
 
     return-void
 .end method
@@ -57,7 +57,7 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/internal/c;I)V
 
@@ -74,11 +74,11 @@
 
     if-eq p1, v2, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/internal/c;I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ahF:Landroid/os/Bundle;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ahX:Landroid/os/Bundle;
 
     if-eqz p1, :cond_1
 
@@ -104,7 +104,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/internal/c;I)V
 
@@ -126,9 +126,9 @@
 
     aput-object v3, v1, v2
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$f;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$f;->ahW:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/c;->lj()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/c;->lh()Ljava/lang/String;
 
     move-result-object v2
 
@@ -136,9 +136,9 @@
 
     const/4 v0, 0x2
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$f;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$f;->ahW:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/c;->lk()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/c;->li()Ljava/lang/String;
 
     move-result-object v2
 
@@ -155,13 +155,13 @@
     throw p1
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c$f;->mb()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c$f;->lZ()Z
 
     move-result p1
 
     if-nez p1, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/internal/c;I)V
 
@@ -181,5 +181,5 @@
 .method protected abstract f(Lcom/google/android/gms/common/ConnectionResult;)V
 .end method
 
-.method protected abstract mb()Z
+.method protected abstract lZ()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$g.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$g.smali
index dd7b51d6f1..77354b34c9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$g.smali
@@ -14,14 +14,14 @@
 
 
 # instance fields
-.field private final synthetic ahE:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ahW:Lcom/google/android/gms/common/internal/c;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/common/internal/c;Landroid/os/Looper;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/internal/c/e;-><init>(Landroid/os/Looper;)V
 
@@ -78,9 +78,9 @@
 .method public final handleMessage(Landroid/os/Message;)V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ahC:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ahU:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -127,7 +127,7 @@
     if-ne v0, v3, :cond_3
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/internal/c;->isConnecting()Z
 
@@ -148,7 +148,7 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     new-instance v1, Lcom/google/android/gms/common/ConnectionResult;
 
@@ -158,7 +158,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/internal/c;Lcom/google/android/gms/common/ConnectionResult;)Lcom/google/android/gms/common/ConnectionResult;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/c;->c(Lcom/google/android/gms/common/internal/c;)Z
 
@@ -166,7 +166,7 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/c;->d(Lcom/google/android/gms/common/internal/c;)Z
 
@@ -174,14 +174,14 @@
 
     if-nez p1, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1, v5}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/internal/c;I)V
 
     return-void
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/c;->e(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/ConnectionResult;
 
@@ -189,7 +189,7 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/c;->e(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/ConnectionResult;
 
@@ -203,13 +203,13 @@
     invoke-direct {p1, v4}, Lcom/google/android/gms/common/ConnectionResult;-><init>(I)V
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ahq:Lcom/google/android/gms/common/internal/c$c;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ahI:Lcom/google/android/gms/common/internal/c$c;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/common/internal/c$c;->d(Lcom/google/android/gms/common/ConnectionResult;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/ConnectionResult;)V
 
@@ -220,7 +220,7 @@
 
     if-ne v0, v3, :cond_8
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/c;->e(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/ConnectionResult;
 
@@ -228,7 +228,7 @@
 
     if-eqz p1, :cond_7
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/c;->e(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/ConnectionResult;
 
@@ -242,13 +242,13 @@
     invoke-direct {p1, v4}, Lcom/google/android/gms/common/ConnectionResult;-><init>(I)V
 
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ahq:Lcom/google/android/gms/common/internal/c$c;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ahI:Lcom/google/android/gms/common/internal/c$c;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/common/internal/c$c;->d(Lcom/google/android/gms/common/ConnectionResult;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/ConnectionResult;)V
 
@@ -280,13 +280,13 @@
 
     invoke-direct {v0, p1, v1}, Lcom/google/android/gms/common/ConnectionResult;-><init>(ILandroid/app/PendingIntent;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/internal/c;->ahq:Lcom/google/android/gms/common/internal/c$c;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/c;->ahI:Lcom/google/android/gms/common/internal/c$c;
 
     invoke-interface {p1, v0}, Lcom/google/android/gms/common/internal/c$c;->d(Lcom/google/android/gms/common/ConnectionResult;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/ConnectionResult;)V
 
@@ -299,11 +299,11 @@
 
     if-ne v0, v4, :cond_c
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {v0, v3}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/internal/c;I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/c;->f(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/internal/c$a;
 
@@ -311,7 +311,7 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/c;->f(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/internal/c$a;
 
@@ -319,16 +319,16 @@
 
     iget v4, p1, Landroid/os/Message;->arg2:I
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/internal/c$a;->lr()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/internal/c$a;->lp()V
 
     :cond_b
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     iget p1, p1, Landroid/os/Message;->arg2:I
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/internal/c;->bf(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1, v3, v2, v1}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/internal/c;IILandroid/os/IInterface;)Z
 
@@ -341,7 +341,7 @@
 
     if-ne v0, v1, :cond_d
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-virtual {v0}, Lcom/google/android/gms/common/internal/c;->isConnected()Z
 
@@ -364,7 +364,7 @@
 
     check-cast p1, Lcom/google/android/gms/common/internal/c$h;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/internal/c$h;->mc()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/internal/c$h;->ma()V
 
     return-void
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$h.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$h.smali
index b18ad11efb..5ceb105d49 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$h.smali
@@ -23,9 +23,9 @@
 
 
 # instance fields
-.field private final synthetic ahE:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ahW:Lcom/google/android/gms/common/internal/c;
 
-.field private ahG:Ljava/lang/Object;
+.field private ahY:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private ahH:Z
+.field private ahZ:Z
 
 
 # direct methods
@@ -48,15 +48,15 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$h;->ahE:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$h;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/c$h;->ahG:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/c$h;->ahY:Ljava/lang/Object;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/c$h;->ahH:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/c$h;->ahZ:Z
 
     return-void
 .end method
@@ -73,15 +73,15 @@
     .end annotation
 .end method
 
-.method public final mc()V
+.method public final ma()V
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->ahG:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->ahY:Ljava/lang/Object;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/common/internal/c$h;->ahH:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/internal/c$h;->ahZ:Z
 
     if-eqz v1, :cond_0
 
@@ -147,7 +147,7 @@
     const/4 v0, 0x1
 
     :try_start_2
-    iput-boolean v0, p0, Lcom/google/android/gms/common/internal/c$h;->ahH:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/internal/c$h;->ahZ:Z
 
     monitor-exit p0
     :try_end_2
@@ -186,7 +186,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->ahG:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->ahY:Ljava/lang/Object;
 
     monitor-exit p0
 
@@ -207,7 +207,7 @@
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c$h;->removeListener()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/c;->g(Lcom/google/android/gms/common/internal/c;)Ljava/util/ArrayList;
 
@@ -216,7 +216,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/c$h;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c$h;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/c;->g(Lcom/google/android/gms/common/internal/c;)Ljava/util/ArrayList;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$i.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$i.smali
index 7fa4a157b1..037dbc17d5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$i.smali
@@ -14,9 +14,9 @@
 
 
 # instance fields
-.field private ahI:Lcom/google/android/gms/common/internal/c;
+.field private aia:Lcom/google/android/gms/common/internal/c;
 
-.field private final ahJ:I
+.field private final aib:I
 
 
 # direct methods
@@ -25,9 +25,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/m$a;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$i;->ahI:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$i;->aia:Lcom/google/android/gms/common/internal/c;
 
-    iput p2, p0, Lcom/google/android/gms/common/internal/c$i;->ahJ:I
+    iput p2, p0, Lcom/google/android/gms/common/internal/c$i;->aib:I
 
     return-void
 .end method
@@ -53,21 +53,21 @@
 .method public final a(ILandroid/os/IBinder;Landroid/os/Bundle;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->ahI:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->aia:Lcom/google/android/gms/common/internal/c;
 
     const-string v1, "onPostInitComplete can be called only once per call to getRemoteService"
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->ahI:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->aia:Lcom/google/android/gms/common/internal/c;
 
-    iget v1, p0, Lcom/google/android/gms/common/internal/c$i;->ahJ:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c$i;->aib:I
 
     invoke-virtual {v0, p1, p2, p3, v1}, Lcom/google/android/gms/common/internal/c;->a(ILandroid/os/IBinder;Landroid/os/Bundle;I)V
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$i;->ahI:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$i;->aia:Lcom/google/android/gms/common/internal/c;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 .method public final a(ILandroid/os/IBinder;Lcom/google/android/gms/common/internal/zzb;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->ahI:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->aia:Lcom/google/android/gms/common/internal/c;
 
     const-string v1, "onPostInitCompleteWithConnectionInfo can be called only once per call togetRemoteService"
 
@@ -83,11 +83,11 @@
 
     invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->ahI:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->aia:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {v0, p3}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/internal/c;Lcom/google/android/gms/common/internal/zzb;)V
 
-    iget-object p3, p3, Lcom/google/android/gms/common/internal/zzb;->aiR:Landroid/os/Bundle;
+    iget-object p3, p3, Lcom/google/android/gms/common/internal/zzb;->ajj:Landroid/os/Bundle;
 
     invoke-virtual {p0, p1, p2, p3}, Lcom/google/android/gms/common/internal/c$i;->a(ILandroid/os/IBinder;Landroid/os/Bundle;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$j.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$j.smali
index 38af486d0a..75ca2b3d93 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$j.smali
@@ -17,20 +17,20 @@
 
 
 # instance fields
-.field private final synthetic ahE:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ahW:Lcom/google/android/gms/common/internal/c;
 
-.field private final ahJ:I
+.field private final aib:I
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/common/internal/c;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ahE:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p2, p0, Lcom/google/android/gms/common/internal/c$j;->ahJ:I
+    iput p2, p0, Lcom/google/android/gms/common/internal/c$j;->aib:I
 
     return-void
 .end method
@@ -42,14 +42,14 @@
 
     if-nez p2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/internal/c;)V
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/c;->b(Lcom/google/android/gms/common/internal/c;)Ljava/lang/Object;
 
@@ -58,7 +58,7 @@
     monitor-enter p1
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$j;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$j;->ahW:Lcom/google/android/gms/common/internal/c;
 
     if-nez p2, :cond_1
 
@@ -99,13 +99,13 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ahW:Lcom/google/android/gms/common/internal/c;
 
     const/4 p2, 0x0
 
-    iget v0, p0, Lcom/google/android/gms/common/internal/c$j;->ahJ:I
+    iget v0, p0, Lcom/google/android/gms/common/internal/c$j;->aib:I
 
-    invoke-virtual {p1, p2, v0}, Lcom/google/android/gms/common/internal/c;->w(II)V
+    invoke-virtual {p1, p2, v0}, Lcom/google/android/gms/common/internal/c;->v(II)V
 
     return-void
 
@@ -123,7 +123,7 @@
 .method public final onServiceDisconnected(Landroid/content/ComponentName;)V
     .locals 4
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/c;->b(Lcom/google/android/gms/common/internal/c;)Ljava/lang/Object;
 
@@ -132,7 +132,7 @@
     monitor-enter p1
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$j;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$j;->ahW:Lcom/google/android/gms/common/internal/c;
 
     const/4 v1, 0x0
 
@@ -142,17 +142,17 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ahW:Lcom/google/android/gms/common/internal/c;
 
     iget-object p1, p1, Lcom/google/android/gms/common/internal/c;->mHandler:Landroid/os/Handler;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$j;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$j;->ahW:Lcom/google/android/gms/common/internal/c;
 
     iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->mHandler:Landroid/os/Handler;
 
     const/4 v1, 0x6
 
-    iget v2, p0, Lcom/google/android/gms/common/internal/c$j;->ahJ:I
+    iget v2, p0, Lcom/google/android/gms/common/internal/c$j;->aib:I
 
     const/4 v3, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$k.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$k.smali
index aa62b7b6cb..5c1c688e7f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$k.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$k.smali
@@ -20,20 +20,20 @@
 
 
 # instance fields
-.field private final synthetic ahE:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ahW:Lcom/google/android/gms/common/internal/c;
 
-.field private final ahK:Landroid/os/IBinder;
+.field private final aic:Landroid/os/IBinder;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/common/internal/c;ILandroid/os/IBinder;Landroid/os/Bundle;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$k;->ahE:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$k;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-direct {p0, p1, p2, p4}, Lcom/google/android/gms/common/internal/c$f;-><init>(Lcom/google/android/gms/common/internal/c;ILandroid/os/Bundle;)V
 
-    iput-object p3, p0, Lcom/google/android/gms/common/internal/c$k;->ahK:Landroid/os/IBinder;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/c$k;->aic:Landroid/os/IBinder;
 
     return-void
 .end method
@@ -43,7 +43,7 @@
 .method protected final f(Lcom/google/android/gms/common/ConnectionResult;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/c;->h(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/internal/c$b;
 
@@ -51,7 +51,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/c;->h(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/internal/c$b;
 
@@ -60,14 +60,14 @@
     invoke-interface {v0, p1}, Lcom/google/android/gms/common/internal/c$b;->a(Lcom/google/android/gms/common/ConnectionResult;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/ConnectionResult;)V
 
     return-void
 .end method
 
-.method protected final mb()Z
+.method protected final lZ()Z
     .locals 6
 
     const-string v0, "GmsClient"
@@ -75,7 +75,7 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ahK:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->aic:Landroid/os/IBinder;
 
     invoke-interface {v2}, Landroid/os/IBinder;->getInterfaceDescriptor()Ljava/lang/String;
 
@@ -83,9 +83,9 @@
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object v3, p0, Lcom/google/android/gms/common/internal/c$k;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/c$k;->ahW:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/c;->lk()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/c;->li()Ljava/lang/String;
 
     move-result-object v3
 
@@ -95,9 +95,9 @@
 
     if-nez v3, :cond_0
 
-    iget-object v3, p0, Lcom/google/android/gms/common/internal/c$k;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/c$k;->ahW:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/c;->lk()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/c;->li()Ljava/lang/String;
 
     move-result-object v3
 
@@ -146,9 +146,9 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahW:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ahK:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->aic:Landroid/os/IBinder;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/common/internal/c;->d(Landroid/os/IBinder;)Landroid/os/IInterface;
 
@@ -156,7 +156,7 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ahW:Lcom/google/android/gms/common/internal/c;
 
     const/4 v3, 0x2
 
@@ -168,7 +168,7 @@
 
     if-nez v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ahW:Lcom/google/android/gms/common/internal/c;
 
     const/4 v3, 0x3
 
@@ -179,13 +179,13 @@
     if-eqz v0, :cond_3
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahW:Lcom/google/android/gms/common/internal/c;
 
     const/4 v1, 0x0
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/internal/c;Lcom/google/android/gms/common/ConnectionResult;)Lcom/google/android/gms/common/ConnectionResult;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/c;->f(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/internal/c$a;
 
@@ -193,13 +193,13 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/c;->f(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/internal/c$a;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/internal/c$a;->lq()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/internal/c$a;->lo()V
 
     :cond_2
     const/4 v0, 0x1
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$l.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$l.smali
index 2a4e0f0ed6..c0e540c7e9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/c$l.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/c$l.smali
@@ -20,14 +20,14 @@
 
 
 # instance fields
-.field private final synthetic ahE:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ahW:Lcom/google/android/gms/common/internal/c;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/common/internal/c;I)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$l;->ahE:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$l;->ahW:Lcom/google/android/gms/common/internal/c;
 
     const/4 v0, 0x0
 
@@ -41,27 +41,27 @@
 .method protected final f(Lcom/google/android/gms/common/ConnectionResult;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->ahW:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ahq:Lcom/google/android/gms/common/internal/c$c;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ahI:Lcom/google/android/gms/common/internal/c$c;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/common/internal/c$c;->d(Lcom/google/android/gms/common/ConnectionResult;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->ahW:Lcom/google/android/gms/common/internal/c;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/internal/c;->a(Lcom/google/android/gms/common/ConnectionResult;)V
 
     return-void
 .end method
 
-.method protected final mb()Z
+.method protected final lZ()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->ahE:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->ahW:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ahq:Lcom/google/android/gms/common/internal/c$c;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ahI:Lcom/google/android/gms/common/internal/c$c;
 
-    sget-object v1, Lcom/google/android/gms/common/ConnectionResult;->adl:Lcom/google/android/gms/common/ConnectionResult;
+    sget-object v1, Lcom/google/android/gms/common/ConnectionResult;->adD:Lcom/google/android/gms/common/ConnectionResult;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/common/internal/c$c;->d(Lcom/google/android/gms/common/ConnectionResult;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/c.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/c.smali
index 961375cfce..f7941ac197 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/c.smali
@@ -31,43 +31,31 @@
 
 
 # static fields
-.field public static final ahD:[Ljava/lang/String;
+.field public static final ahV:[Ljava/lang/String;
 
-.field private static final ahe:[Lcom/google/android/gms/common/Feature;
+.field private static final ahw:[Lcom/google/android/gms/common/Feature;
 
 
 # instance fields
-.field private ahA:Z
+.field private ahA:I
 
-.field private volatile ahB:Lcom/google/android/gms/common/internal/zzb;
+.field private ahB:J
 
-.field protected ahC:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private ahC:Lcom/google/android/gms/common/internal/aj;
 
-.field private ahf:I
+.field private final ahD:Landroid/os/Looper;
 
-.field private ahg:J
+.field private final ahE:Lcom/google/android/gms/common/internal/h;
 
-.field private ahh:J
+.field private final ahF:Lcom/google/android/gms/common/c;
 
-.field private ahi:I
+.field private final ahG:Ljava/lang/Object;
 
-.field private ahj:J
+.field private ahH:Lcom/google/android/gms/common/internal/n;
 
-.field private ahk:Lcom/google/android/gms/common/internal/aj;
+.field protected ahI:Lcom/google/android/gms/common/internal/c$c;
 
-.field private final ahl:Landroid/os/Looper;
-
-.field private final ahm:Lcom/google/android/gms/common/internal/h;
-
-.field private final ahn:Lcom/google/android/gms/common/c;
-
-.field private final aho:Ljava/lang/Object;
-
-.field private ahp:Lcom/google/android/gms/common/internal/n;
-
-.field protected ahq:Lcom/google/android/gms/common/internal/c$c;
-
-.field private ahr:Landroid/os/IInterface;
+.field private ahJ:Landroid/os/IInterface;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -75,7 +63,7 @@
     .end annotation
 .end field
 
-.field private final ahs:Ljava/util/ArrayList;
+.field private final ahK:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -85,7 +73,7 @@
     .end annotation
 .end field
 
-.field private aht:Lcom/google/android/gms/common/internal/c$j;
+.field private ahL:Lcom/google/android/gms/common/internal/c$j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/internal/c$j;"
@@ -93,17 +81,29 @@
     .end annotation
 .end field
 
-.field private ahu:I
+.field private ahM:I
 
-.field private final ahv:Lcom/google/android/gms/common/internal/c$a;
+.field private final ahN:Lcom/google/android/gms/common/internal/c$a;
 
-.field private final ahw:Lcom/google/android/gms/common/internal/c$b;
+.field private final ahO:Lcom/google/android/gms/common/internal/c$b;
 
-.field private final ahx:I
+.field private final ahP:I
 
-.field private final ahy:Ljava/lang/String;
+.field private final ahQ:Ljava/lang/String;
 
-.field private ahz:Lcom/google/android/gms/common/ConnectionResult;
+.field private ahR:Lcom/google/android/gms/common/ConnectionResult;
+
+.field private ahS:Z
+
+.field private volatile ahT:Lcom/google/android/gms/common/internal/zzb;
+
+.field protected ahU:Ljava/util/concurrent/atomic/AtomicInteger;
+
+.field private ahx:I
+
+.field private ahy:J
+
+.field private ahz:J
 
 .field protected final mContext:Landroid/content/Context;
 
@@ -120,7 +120,7 @@
 
     new-array v1, v0, [Lcom/google/android/gms/common/Feature;
 
-    sput-object v1, Lcom/google/android/gms/common/internal/c;->ahe:[Lcom/google/android/gms/common/Feature;
+    sput-object v1, Lcom/google/android/gms/common/internal/c;->ahw:[Lcom/google/android/gms/common/Feature;
 
     const/4 v1, 0x2
 
@@ -136,7 +136,7 @@
 
     aput-object v2, v1, v0
 
-    sput-object v1, Lcom/google/android/gms/common/internal/c;->ahD:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/common/internal/c;->ahV:[Ljava/lang/String;
 
     return-void
 .end method
@@ -148,7 +148,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lb()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kZ()Lcom/google/android/gms/common/c;
 
     move-result-object v4
 
@@ -198,33 +198,33 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->aho:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahG:Ljava/lang/Object;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahs:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahK:Ljava/util/ArrayList;
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/gms/common/internal/c;->ahu:I
+    iput v0, p0, Lcom/google/android/gms/common/internal/c;->ahM:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahz:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahR:Lcom/google/android/gms/common/ConnectionResult;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/common/internal/c;->ahA:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/common/internal/c;->ahS:Z
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahB:Lcom/google/android/gms/common/internal/zzb;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahT:Lcom/google/android/gms/common/internal/zzb;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahC:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahU:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const-string v0, "Context must not be null"
 
@@ -244,7 +244,7 @@
 
     check-cast p1, Landroid/os/Looper;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahl:Landroid/os/Looper;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahD:Landroid/os/Looper;
 
     const-string p1, "Supervisor must not be null"
 
@@ -254,7 +254,7 @@
 
     check-cast p1, Lcom/google/android/gms/common/internal/h;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahm:Lcom/google/android/gms/common/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahE:Lcom/google/android/gms/common/internal/h;
 
     const-string p1, "API availability must not be null"
 
@@ -264,7 +264,7 @@
 
     check-cast p1, Lcom/google/android/gms/common/c;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahn:Lcom/google/android/gms/common/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahF:Lcom/google/android/gms/common/c;
 
     new-instance p1, Lcom/google/android/gms/common/internal/c$g;
 
@@ -272,13 +272,13 @@
 
     iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->mHandler:Landroid/os/Handler;
 
-    iput p5, p0, Lcom/google/android/gms/common/internal/c;->ahx:I
+    iput p5, p0, Lcom/google/android/gms/common/internal/c;->ahP:I
 
-    iput-object p6, p0, Lcom/google/android/gms/common/internal/c;->ahv:Lcom/google/android/gms/common/internal/c$a;
+    iput-object p6, p0, Lcom/google/android/gms/common/internal/c;->ahN:Lcom/google/android/gms/common/internal/c$a;
 
-    iput-object p7, p0, Lcom/google/android/gms/common/internal/c;->ahw:Lcom/google/android/gms/common/internal/c$b;
+    iput-object p7, p0, Lcom/google/android/gms/common/internal/c;->ahO:Lcom/google/android/gms/common/internal/c$b;
 
-    iput-object p8, p0, Lcom/google/android/gms/common/internal/c;->ahy:Ljava/lang/String;
+    iput-object p8, p0, Lcom/google/android/gms/common/internal/c;->ahQ:Ljava/lang/String;
 
     return-void
 .end method
@@ -286,7 +286,7 @@
 .method static synthetic a(Lcom/google/android/gms/common/internal/c;Lcom/google/android/gms/common/ConnectionResult;)Lcom/google/android/gms/common/ConnectionResult;
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahz:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahR:Lcom/google/android/gms/common/ConnectionResult;
 
     return-object p1
 .end method
@@ -294,7 +294,7 @@
 .method static synthetic a(Lcom/google/android/gms/common/internal/c;Lcom/google/android/gms/common/internal/n;)Lcom/google/android/gms/common/internal/n;
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahp:Lcom/google/android/gms/common/internal/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahH:Lcom/google/android/gms/common/internal/n;
 
     return-object p1
 .end method
@@ -350,9 +350,9 @@
     monitor-enter v3
 
     :try_start_0
-    iput p1, p0, Lcom/google/android/gms/common/internal/c;->ahu:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/c;->ahM:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahr:Landroid/os/IInterface;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahJ:Landroid/os/IInterface;
 
     if-eq p1, v1, :cond_6
 
@@ -374,21 +374,21 @@
     goto/16 :goto_3
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aht:Lcom/google/android/gms/common/internal/c$j;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahL:Lcom/google/android/gms/common/internal/c$j;
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
     if-eqz p1, :cond_5
 
     const-string p1, "GmsClient"
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->ajf:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->ajx:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
     iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->mPackageName:Ljava/lang/String;
 
@@ -434,36 +434,36 @@
 
     invoke-static {p1, p2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->ahm:Lcom/google/android/gms/common/internal/h;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->ahE:Lcom/google/android/gms/common/internal/h;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v5, p1, Lcom/google/android/gms/common/internal/aj;->ajf:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/common/internal/aj;->ajx:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
     iget-object v6, p1, Lcom/google/android/gms/common/internal/aj;->mPackageName:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
-    iget v7, p1, Lcom/google/android/gms/common/internal/aj;->aim:I
+    iget v7, p1, Lcom/google/android/gms/common/internal/aj;->aiE:I
 
-    iget-object v8, p0, Lcom/google/android/gms/common/internal/c;->aht:Lcom/google/android/gms/common/internal/c$j;
+    iget-object v8, p0, Lcom/google/android/gms/common/internal/c;->ahL:Lcom/google/android/gms/common/internal/c$j;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->lU()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->lS()Ljava/lang/String;
 
     move-result-object v9
 
     invoke-virtual/range {v4 .. v9}, Lcom/google/android/gms/common/internal/h;->a(Ljava/lang/String;Ljava/lang/String;ILandroid/content/ServiceConnection;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahC:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahU:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
     :cond_5
     new-instance p1, Lcom/google/android/gms/common/internal/c$j;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahC:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahU:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -471,37 +471,37 @@
 
     invoke-direct {p1, p0, p2}, Lcom/google/android/gms/common/internal/c$j;-><init>(Lcom/google/android/gms/common/internal/c;I)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aht:Lcom/google/android/gms/common/internal/c$j;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahL:Lcom/google/android/gms/common/internal/c$j;
 
     new-instance p1, Lcom/google/android/gms/common/internal/aj;
 
     const-string p2, "com.google.android.gms"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lj()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lh()Ljava/lang/String;
 
     move-result-object v0
 
     invoke-direct {p1, p2, v0, v2}, Lcom/google/android/gms/common/internal/aj;-><init>(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahm:Lcom/google/android/gms/common/internal/h;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahE:Lcom/google/android/gms/common/internal/h;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->ajf:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->ajx:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
     iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->mPackageName:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
-    iget v1, v1, Lcom/google/android/gms/common/internal/aj;->aim:I
+    iget v1, v1, Lcom/google/android/gms/common/internal/aj;->aiE:I
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/c;->aht:Lcom/google/android/gms/common/internal/c$j;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c;->ahL:Lcom/google/android/gms/common/internal/c$j;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->lU()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->lS()Ljava/lang/String;
 
     move-result-object v4
 
@@ -517,11 +517,11 @@
 
     const-string p1, "GmsClient"
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->ajf:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->ajx:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
     iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->mPackageName:Ljava/lang/String;
 
@@ -569,38 +569,38 @@
 
     const/16 p1, 0x10
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahC:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahU:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
     move-result p2
 
-    invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/common/internal/c;->w(II)V
+    invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/common/internal/c;->v(II)V
 
     goto :goto_3
 
     :cond_6
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aht:Lcom/google/android/gms/common/internal/c$j;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahL:Lcom/google/android/gms/common/internal/c$j;
 
     if-eqz p1, :cond_7
 
-    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->ahm:Lcom/google/android/gms/common/internal/h;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->ahE:Lcom/google/android/gms/common/internal/h;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v5, p1, Lcom/google/android/gms/common/internal/aj;->ajf:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/common/internal/aj;->ajx:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
     iget-object v6, p1, Lcom/google/android/gms/common/internal/aj;->mPackageName:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
-    iget v7, p1, Lcom/google/android/gms/common/internal/aj;->aim:I
+    iget v7, p1, Lcom/google/android/gms/common/internal/aj;->aiE:I
 
-    iget-object v8, p0, Lcom/google/android/gms/common/internal/c;->aht:Lcom/google/android/gms/common/internal/c$j;
+    iget-object v8, p0, Lcom/google/android/gms/common/internal/c;->ahL:Lcom/google/android/gms/common/internal/c$j;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->lU()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->lS()Ljava/lang/String;
 
     move-result-object v9
 
@@ -608,7 +608,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aht:Lcom/google/android/gms/common/internal/c$j;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahL:Lcom/google/android/gms/common/internal/c$j;
 
     :cond_7
     :goto_3
@@ -629,7 +629,7 @@
 .method static synthetic a(Lcom/google/android/gms/common/internal/c;)V
     .locals 3
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->lW()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->lU()Z
 
     move-result v0
 
@@ -639,7 +639,7 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/common/internal/c;->ahA:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/common/internal/c;->ahS:Z
 
     goto :goto_0
 
@@ -649,7 +649,7 @@
     :goto_0
     iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->mHandler:Landroid/os/Handler;
 
-    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ahC:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ahU:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -679,7 +679,7 @@
 .method static synthetic a(Lcom/google/android/gms/common/internal/c;Lcom/google/android/gms/common/internal/zzb;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahB:Lcom/google/android/gms/common/internal/zzb;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahT:Lcom/google/android/gms/common/internal/zzb;
 
     return-void
 .end method
@@ -697,7 +697,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ahu:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ahM:I
 
     if-eq v1, p1, :cond_0
 
@@ -739,7 +739,7 @@
 .method static synthetic b(Lcom/google/android/gms/common/internal/c;)Ljava/lang/Object;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->aho:Ljava/lang/Object;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ahG:Ljava/lang/Object;
 
     return-object p0
 .end method
@@ -747,7 +747,7 @@
 .method static synthetic c(Lcom/google/android/gms/common/internal/c;)Z
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->ma()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->lY()Z
 
     move-result p0
 
@@ -757,7 +757,7 @@
 .method static synthetic d(Lcom/google/android/gms/common/internal/c;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lcom/google/android/gms/common/internal/c;->ahA:Z
+    iget-boolean p0, p0, Lcom/google/android/gms/common/internal/c;->ahS:Z
 
     return p0
 .end method
@@ -765,7 +765,7 @@
 .method static synthetic e(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/ConnectionResult;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ahz:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ahR:Lcom/google/android/gms/common/ConnectionResult;
 
     return-object p0
 .end method
@@ -773,7 +773,7 @@
 .method static synthetic f(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/internal/c$a;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ahv:Lcom/google/android/gms/common/internal/c$a;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ahN:Lcom/google/android/gms/common/internal/c$a;
 
     return-object p0
 .end method
@@ -781,7 +781,7 @@
 .method static synthetic g(Lcom/google/android/gms/common/internal/c;)Ljava/util/ArrayList;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ahs:Ljava/util/ArrayList;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ahK:Ljava/util/ArrayList;
 
     return-object p0
 .end method
@@ -789,15 +789,15 @@
 .method static synthetic h(Lcom/google/android/gms/common/internal/c;)Lcom/google/android/gms/common/internal/c$b;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ahw:Lcom/google/android/gms/common/internal/c$b;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ahO:Lcom/google/android/gms/common/internal/c$b;
 
     return-object p0
 .end method
 
-.method private final lU()Ljava/lang/String;
+.method private final lS()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahy:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahQ:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
@@ -815,7 +815,7 @@
     return-object v0
 .end method
 
-.method private final lW()Z
+.method private final lU()Z
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->mLock:Ljava/lang/Object;
@@ -823,7 +823,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ahu:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ahM:I
 
     const/4 v2, 0x3
 
@@ -851,10 +851,10 @@
     throw v1
 .end method
 
-.method private final ma()Z
+.method private final lY()Z
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/internal/c;->ahA:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/internal/c;->ahS:Z
 
     const/4 v1, 0x0
 
@@ -863,7 +863,7 @@
     return v1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lk()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->li()Ljava/lang/String;
 
     move-result-object v0
 
@@ -888,7 +888,7 @@
 
     :cond_2
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lk()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->li()Ljava/lang/String;
 
     move-result-object v0
 
@@ -940,7 +940,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->ahh:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->ahz:J
 
     return-void
 .end method
@@ -948,15 +948,15 @@
 .method protected final a(Lcom/google/android/gms/common/ConnectionResult;)V
     .locals 2
 
-    iget p1, p1, Lcom/google/android/gms/common/ConnectionResult;->adn:I
+    iget p1, p1, Lcom/google/android/gms/common/ConnectionResult;->adF:I
 
-    iput p1, p0, Lcom/google/android/gms/common/internal/c;->ahi:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/c;->ahA:I
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->ahj:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->ahB:J
 
     return-void
 .end method
@@ -972,7 +972,7 @@
 
     check-cast p1, Lcom/google/android/gms/common/internal/c$c;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahq:Lcom/google/android/gms/common/internal/c$c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahI:Lcom/google/android/gms/common/internal/c$c;
 
     const/4 p1, 0x2
 
@@ -986,7 +986,7 @@
 .method public final a(Lcom/google/android/gms/common/internal/c$e;)V
     .locals 0
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/internal/c$e;->lP()V
+    invoke-interface {p1}, Lcom/google/android/gms/common/internal/c$e;->lN()V
 
     return-void
 .end method
@@ -1003,13 +1003,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lX()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lV()Landroid/os/Bundle;
 
     move-result-object v0
 
     new-instance v1, Lcom/google/android/gms/common/internal/GetServiceRequest;
 
-    iget v2, p0, Lcom/google/android/gms/common/internal/c;->ahx:I
+    iget v2, p0, Lcom/google/android/gms/common/internal/c;->ahP:I
 
     invoke-direct {v1, v2}, Lcom/google/android/gms/common/internal/GetServiceRequest;-><init>(I)V
 
@@ -1019,9 +1019,9 @@
 
     move-result-object v2
 
-    iput-object v2, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aia:Ljava/lang/String;
+    iput-object v2, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ais:Ljava/lang/String;
 
-    iput-object v0, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aid:Landroid/os/Bundle;
+    iput-object v0, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiv:Landroid/os/Bundle;
 
     if-eqz p2, :cond_0
 
@@ -1037,22 +1037,22 @@
 
     check-cast p2, [Lcom/google/android/gms/common/api/Scope;
 
-    iput-object p2, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aic:[Lcom/google/android/gms/common/api/Scope;
+    iput-object p2, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiu:[Lcom/google/android/gms/common/api/Scope;
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->le()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lc()Z
 
     move-result p2
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lc()Landroid/accounts/Account;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->la()Landroid/accounts/Account;
 
     move-result-object p2
 
     if-eqz p2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lc()Landroid/accounts/Account;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->la()Landroid/accounts/Account;
 
     move-result-object p2
 
@@ -1068,7 +1068,7 @@
     invoke-direct {p2, v0, v2}, Landroid/accounts/Account;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_0
-    iput-object p2, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aie:Landroid/accounts/Account;
+    iput-object p2, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiw:Landroid/accounts/Account;
 
     if-eqz p1, :cond_2
 
@@ -1076,17 +1076,17 @@
 
     move-result-object p1
 
-    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aib:Landroid/os/IBinder;
+    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ait:Landroid/os/IBinder;
 
     :cond_2
-    sget-object p1, Lcom/google/android/gms/common/internal/c;->ahe:[Lcom/google/android/gms/common/Feature;
+    sget-object p1, Lcom/google/android/gms/common/internal/c;->ahw:[Lcom/google/android/gms/common/Feature;
 
-    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aif:[Lcom/google/android/gms/common/Feature;
+    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aix:[Lcom/google/android/gms/common/Feature;
 
-    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aig:[Lcom/google/android/gms/common/Feature;
+    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->aiy:[Lcom/google/android/gms/common/Feature;
 
     :try_start_0
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aho:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ahG:Ljava/lang/Object;
 
     monitor-enter p1
     :try_end_0
@@ -1096,15 +1096,15 @@
     .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahp:Lcom/google/android/gms/common/internal/n;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahH:Lcom/google/android/gms/common/internal/n;
 
     if-eqz p2, :cond_3
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahp:Lcom/google/android/gms/common/internal/n;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahH:Lcom/google/android/gms/common/internal/n;
 
     new-instance v0, Lcom/google/android/gms/common/internal/c$i;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/c;->ahC:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c;->ahU:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -1160,7 +1160,7 @@
 
     const/16 p1, 0x8
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahC:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ahU:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -1190,7 +1190,7 @@
 
     const/4 p2, 0x6
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahC:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahU:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -1210,13 +1210,13 @@
 .method protected bf(I)V
     .locals 2
 
-    iput p1, p0, Lcom/google/android/gms/common/internal/c;->ahf:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/c;->ahx:I
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->ahg:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->ahy:J
 
     return-void
 .end method
@@ -1234,16 +1234,16 @@
 .method public disconnect()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahC:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahU:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahs:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahK:Ljava/util/ArrayList;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ahs:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ahK:Ljava/util/ArrayList;
 
     invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
 
@@ -1254,7 +1254,7 @@
     :goto_0
     if-ge v2, v1, :cond_0
 
-    iget-object v3, p0, Lcom/google/android/gms/common/internal/c;->ahs:Ljava/util/ArrayList;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/c;->ahK:Ljava/util/ArrayList;
 
     invoke-virtual {v3, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -1269,7 +1269,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ahs:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ahK:Ljava/util/ArrayList;
 
     invoke-virtual {v1}, Ljava/util/ArrayList;->clear()V
 
@@ -1277,14 +1277,14 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->aho:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ahG:Ljava/lang/Object;
 
     monitor-enter v1
 
     const/4 v0, 0x0
 
     :try_start_1
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahp:Lcom/google/android/gms/common/internal/n;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahH:Lcom/google/android/gms/common/internal/n;
 
     monitor-exit v1
     :try_end_1
@@ -1331,7 +1331,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ahu:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ahM:I
 
     const/4 v2, 0x4
 
@@ -1367,13 +1367,13 @@
     monitor-enter v0
 
     :try_start_0
-    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ahu:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ahM:I
 
     const/4 v2, 0x2
 
     if-eq v1, v2, :cond_1
 
-    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ahu:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ahM:I
 
     const/4 v2, 0x3
 
@@ -1405,14 +1405,14 @@
     throw v1
 .end method
 
-.method public final lV()V
+.method public final lT()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahn:Lcom/google/android/gms/common/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahF:Lcom/google/android/gms/common/c;
 
     iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->mContext:Landroid/content/Context;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lf()I
 
     move-result v2
 
@@ -1440,13 +1440,13 @@
 
     check-cast v1, Lcom/google/android/gms/common/internal/c$c;
 
-    iput-object v1, p0, Lcom/google/android/gms/common/internal/c;->ahq:Lcom/google/android/gms/common/internal/c$c;
+    iput-object v1, p0, Lcom/google/android/gms/common/internal/c;->ahI:Lcom/google/android/gms/common/internal/c$c;
 
     iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->mHandler:Landroid/os/Handler;
 
     const/4 v3, 0x3
 
-    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->ahC:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->ahU:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v4}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -1470,7 +1470,7 @@
     return-void
 .end method
 
-.method protected lX()Landroid/os/Bundle;
+.method protected lV()Landroid/os/Bundle;
     .locals 1
 
     new-instance v0, Landroid/os/Bundle;
@@ -1480,7 +1480,7 @@
     return-object v0
 .end method
 
-.method public final lY()Landroid/os/IInterface;
+.method public final lW()Landroid/os/IInterface;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1499,7 +1499,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ahu:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ahM:I
 
     const/4 v2, 0x5
 
@@ -1511,7 +1511,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ahr:Landroid/os/IInterface;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ahJ:Landroid/os/IInterface;
 
     if-eqz v1, :cond_0
 
@@ -1527,7 +1527,7 @@
 
     invoke-static {v1, v2}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ahr:Landroid/os/IInterface;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ahJ:Landroid/os/IInterface;
 
     monitor-exit v0
 
@@ -1559,7 +1559,7 @@
     throw v1
 .end method
 
-.method protected lZ()Ljava/util/Set;
+.method protected lX()Ljava/util/Set;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1575,7 +1575,7 @@
     return-object v0
 .end method
 
-.method public lc()Landroid/accounts/Account;
+.method public la()Landroid/accounts/Account;
     .locals 1
 
     const/4 v0, 0x0
@@ -1583,7 +1583,7 @@
     return-object v0
 .end method
 
-.method public le()Z
+.method public lc()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -1591,7 +1591,7 @@
     return v0
 .end method
 
-.method public lf()Z
+.method public ld()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -1599,7 +1599,7 @@
     return v0
 .end method
 
-.method public final lg()Ljava/lang/String;
+.method public final le()Ljava/lang/String;
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->isConnected()Z
@@ -1608,7 +1608,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahk:Lcom/google/android/gms/common/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahC:Lcom/google/android/gms/common/internal/aj;
 
     if-eqz v0, :cond_0
 
@@ -1626,7 +1626,7 @@
     throw v0
 .end method
 
-.method public lh()I
+.method public lf()I
     .locals 1
 
     sget v0, Lcom/google/android/gms/common/c;->GOOGLE_PLAY_SERVICES_VERSION_CODE:I
@@ -1634,10 +1634,10 @@
     return v0
 .end method
 
-.method public final li()[Lcom/google/android/gms/common/Feature;
+.method public final lg()[Lcom/google/android/gms/common/Feature;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahB:Lcom/google/android/gms/common/internal/zzb;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ahT:Lcom/google/android/gms/common/internal/zzb;
 
     if-nez v0, :cond_0
 
@@ -1646,18 +1646,18 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/zzb;->aiS:[Lcom/google/android/gms/common/Feature;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/zzb;->ajk:[Lcom/google/android/gms/common/Feature;
 
     return-object v0
 .end method
 
-.method protected abstract lj()Ljava/lang/String;
+.method protected abstract lh()Ljava/lang/String;
 .end method
 
-.method protected abstract lk()Ljava/lang/String;
+.method protected abstract li()Ljava/lang/String;
 .end method
 
-.method protected final w(II)V
+.method protected final v(II)V
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->mHandler:Landroid/os/Handler;
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/d$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/d$a.smali
index 46c7839ea7..d2248e514b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/d$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/d$a.smali
@@ -14,9 +14,9 @@
 
 
 # instance fields
-.field public ahL:Landroid/accounts/Account;
+.field public aid:Landroid/accounts/Account;
 
-.field private ahO:Ljava/util/Map;
+.field private aig:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -28,19 +28,19 @@
     .end annotation
 .end field
 
-.field private ahP:I
+.field private aih:I
 
-.field private ahQ:Landroid/view/View;
+.field private aii:Landroid/view/View;
 
-.field public ahR:Ljava/lang/String;
+.field public aij:Ljava/lang/String;
 
-.field public ahS:Ljava/lang/String;
+.field public aik:Ljava/lang/String;
 
-.field private ahT:Lcom/google/android/gms/signin/a;
+.field private ail:Lcom/google/android/gms/signin/a;
 
-.field private ahU:Z
+.field private aim:Z
 
-.field public ahW:Landroidx/collection/ArraySet;
+.field public aio:Landroidx/collection/ArraySet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/ArraySet<",
@@ -59,39 +59,39 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/common/internal/d$a;->ahP:I
+    iput v0, p0, Lcom/google/android/gms/common/internal/d$a;->aih:I
 
-    sget-object v0, Lcom/google/android/gms/signin/a;->aOw:Lcom/google/android/gms/signin/a;
+    sget-object v0, Lcom/google/android/gms/signin/a;->aOO:Lcom/google/android/gms/signin/a;
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/d$a;->ahT:Lcom/google/android/gms/signin/a;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/d$a;->ail:Lcom/google/android/gms/signin/a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final md()Lcom/google/android/gms/common/internal/d;
+.method public final mb()Lcom/google/android/gms/common/internal/d;
     .locals 11
 
     new-instance v10, Lcom/google/android/gms/common/internal/d;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/d$a;->ahL:Landroid/accounts/Account;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/d$a;->aid:Landroid/accounts/Account;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/d$a;->ahW:Landroidx/collection/ArraySet;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/d$a;->aio:Landroidx/collection/ArraySet;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/internal/d$a;->ahO:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/d$a;->aig:Ljava/util/Map;
 
-    iget v4, p0, Lcom/google/android/gms/common/internal/d$a;->ahP:I
+    iget v4, p0, Lcom/google/android/gms/common/internal/d$a;->aih:I
 
-    iget-object v5, p0, Lcom/google/android/gms/common/internal/d$a;->ahQ:Landroid/view/View;
+    iget-object v5, p0, Lcom/google/android/gms/common/internal/d$a;->aii:Landroid/view/View;
 
-    iget-object v6, p0, Lcom/google/android/gms/common/internal/d$a;->ahR:Ljava/lang/String;
+    iget-object v6, p0, Lcom/google/android/gms/common/internal/d$a;->aij:Ljava/lang/String;
 
-    iget-object v7, p0, Lcom/google/android/gms/common/internal/d$a;->ahS:Ljava/lang/String;
+    iget-object v7, p0, Lcom/google/android/gms/common/internal/d$a;->aik:Ljava/lang/String;
 
-    iget-object v8, p0, Lcom/google/android/gms/common/internal/d$a;->ahT:Lcom/google/android/gms/signin/a;
+    iget-object v8, p0, Lcom/google/android/gms/common/internal/d$a;->ail:Lcom/google/android/gms/signin/a;
 
-    iget-boolean v9, p0, Lcom/google/android/gms/common/internal/d$a;->ahU:Z
+    iget-boolean v9, p0, Lcom/google/android/gms/common/internal/d$a;->aim:Z
 
     move-object v0, v10
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/d$b.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/d$b.smali
index 0fb41051a1..b35f474589 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/d$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/d$b.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field public final afQ:Ljava/util/Set;
+.field public final agi:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/d.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/d.smali
index da0e60e601..3c51d4d125 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/d.smali
@@ -12,9 +12,9 @@
 
 
 # instance fields
-.field public final ahL:Landroid/accounts/Account;
+.field public final aid:Landroid/accounts/Account;
 
-.field public final ahM:Ljava/util/Set;
+.field public final aie:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field final ahN:Ljava/util/Set;
+.field final aif:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private final ahO:Ljava/util/Map;
+.field private final aig:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -46,19 +46,19 @@
     .end annotation
 .end field
 
-.field private final ahP:I
+.field private final aih:I
 
-.field private final ahQ:Landroid/view/View;
+.field private final aii:Landroid/view/View;
 
-.field public final ahR:Ljava/lang/String;
+.field public final aij:Ljava/lang/String;
 
-.field final ahS:Ljava/lang/String;
+.field final aik:Ljava/lang/String;
 
-.field public final ahT:Lcom/google/android/gms/signin/a;
+.field public final ail:Lcom/google/android/gms/signin/a;
 
-.field private final ahU:Z
+.field private final aim:Z
 
-.field public ahV:Ljava/lang/Integer;
+.field public ain:Ljava/lang/Integer;
 
 
 # direct methods
@@ -86,7 +86,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/d;->ahL:Landroid/accounts/Account;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/d;->aid:Landroid/accounts/Account;
 
     if-nez p2, :cond_0
 
@@ -100,34 +100,34 @@
     move-result-object p1
 
     :goto_0
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/d;->ahM:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/d;->aie:Ljava/util/Set;
 
     if-nez p3, :cond_1
 
     sget-object p3, Ljava/util/Collections;->EMPTY_MAP:Ljava/util/Map;
 
     :cond_1
-    iput-object p3, p0, Lcom/google/android/gms/common/internal/d;->ahO:Ljava/util/Map;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/d;->aig:Ljava/util/Map;
 
-    iput-object p5, p0, Lcom/google/android/gms/common/internal/d;->ahQ:Landroid/view/View;
+    iput-object p5, p0, Lcom/google/android/gms/common/internal/d;->aii:Landroid/view/View;
 
-    iput p4, p0, Lcom/google/android/gms/common/internal/d;->ahP:I
+    iput p4, p0, Lcom/google/android/gms/common/internal/d;->aih:I
 
-    iput-object p6, p0, Lcom/google/android/gms/common/internal/d;->ahR:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/common/internal/d;->aij:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/google/android/gms/common/internal/d;->ahS:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/android/gms/common/internal/d;->aik:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/google/android/gms/common/internal/d;->ahT:Lcom/google/android/gms/signin/a;
+    iput-object p8, p0, Lcom/google/android/gms/common/internal/d;->ail:Lcom/google/android/gms/signin/a;
 
-    iput-boolean p9, p0, Lcom/google/android/gms/common/internal/d;->ahU:Z
+    iput-boolean p9, p0, Lcom/google/android/gms/common/internal/d;->aim:Z
 
     new-instance p1, Ljava/util/HashSet;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/d;->ahM:Ljava/util/Set;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/d;->aie:Ljava/util/Set;
 
     invoke-direct {p1, p2}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/d;->ahO:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/d;->aig:Ljava/util/Map;
 
     invoke-interface {p2}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -150,7 +150,7 @@
 
     check-cast p3, Lcom/google/android/gms/common/internal/d$b;
 
-    iget-object p3, p3, Lcom/google/android/gms/common/internal/d$b;->afQ:Ljava/util/Set;
+    iget-object p3, p3, Lcom/google/android/gms/common/internal/d$b;->agi:Ljava/util/Set;
 
     invoke-interface {p1, p3}, Ljava/util/Set;->addAll(Ljava/util/Collection;)Z
 
@@ -161,7 +161,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/d;->ahN:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/d;->aif:Ljava/util/Set;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/e.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/e.smali
index fbd76ea603..4da37923fa 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/e.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final ahX:Landroidx/collection/SimpleArrayMap;
+.field private static final aip:Landroidx/collection/SimpleArrayMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/SimpleArrayMap<",
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Landroidx/collection/SimpleArrayMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/internal/e;->ahX:Landroidx/collection/SimpleArrayMap;
+    sput-object v0, Lcom/google/android/gms/common/internal/e;->aip:Landroidx/collection/SimpleArrayMap;
 
     return-void
 .end method
@@ -40,7 +40,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1, v0}, Lcom/google/android/gms/common/c/b;->bc(Ljava/lang/String;)Ljava/lang/CharSequence;
+    invoke-virtual {v1, v0}, Lcom/google/android/gms/common/c/b;->aX(Ljava/lang/String;)Ljava/lang/CharSequence;
 
     move-result-object v1
 
@@ -312,12 +312,12 @@
 .method private static f(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/String;
     .locals 4
 
-    sget-object v0, Lcom/google/android/gms/common/internal/e;->ahX:Landroidx/collection/SimpleArrayMap;
+    sget-object v0, Lcom/google/android/gms/common/internal/e;->aip:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/internal/e;->ahX:Landroidx/collection/SimpleArrayMap;
+    sget-object v1, Lcom/google/android/gms/common/internal/e;->aip:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v1, p1}, Landroidx/collection/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -431,7 +431,7 @@
     return-object v1
 
     :cond_5
-    sget-object v1, Lcom/google/android/gms/common/internal/e;->ahX:Landroidx/collection/SimpleArrayMap;
+    sget-object v1, Lcom/google/android/gms/common/internal/e;->aip:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v1, p1, p0}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/f.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/f.smali
index 7166ec4751..f2a86bb6e4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/f.smali
@@ -48,14 +48,14 @@
 
 
 # virtual methods
-.method protected abstract me()V
+.method protected abstract mc()V
 .end method
 
 .method public onClick(Landroid/content/DialogInterface;I)V
     .locals 2
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/f;->me()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/f;->mc()V
     :try_end_0
     .catch Landroid/content/ActivityNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/g.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/g.smali
index d3e7031f76..480e90c423 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/g.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field private final afQ:Ljava/util/Set;
+.field private final agi:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -29,9 +29,9 @@
     .end annotation
 .end field
 
-.field private final afR:Lcom/google/android/gms/common/internal/d;
+.field private final agj:Lcom/google/android/gms/common/internal/d;
 
-.field private final ahL:Landroid/accounts/Account;
+.field private final aid:Landroid/accounts/Account;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kZ()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kX()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v4
 
@@ -118,7 +118,7 @@
     move-object v7, v0
 
     :goto_1
-    iget-object v8, v10, Lcom/google/android/gms/common/internal/d;->ahS:Ljava/lang/String;
+    iget-object v8, v10, Lcom/google/android/gms/common/internal/d;->aik:Ljava/lang/String;
 
     move-object v0, p0
 
@@ -134,13 +134,13 @@
 
     invoke-direct/range {v0 .. v8}, Lcom/google/android/gms/common/internal/c;-><init>(Landroid/content/Context;Landroid/os/Looper;Lcom/google/android/gms/common/internal/h;Lcom/google/android/gms/common/c;ILcom/google/android/gms/common/internal/c$a;Lcom/google/android/gms/common/internal/c$b;Ljava/lang/String;)V
 
-    iput-object v10, v9, Lcom/google/android/gms/common/internal/g;->afR:Lcom/google/android/gms/common/internal/d;
+    iput-object v10, v9, Lcom/google/android/gms/common/internal/g;->agj:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v0, v10, Lcom/google/android/gms/common/internal/d;->ahL:Landroid/accounts/Account;
+    iget-object v0, v10, Lcom/google/android/gms/common/internal/d;->aid:Landroid/accounts/Account;
 
-    iput-object v0, v9, Lcom/google/android/gms/common/internal/g;->ahL:Landroid/accounts/Account;
+    iput-object v0, v9, Lcom/google/android/gms/common/internal/g;->aid:Landroid/accounts/Account;
 
-    iget-object v0, v10, Lcom/google/android/gms/common/internal/d;->ahN:Ljava/util/Set;
+    iget-object v0, v10, Lcom/google/android/gms/common/internal/d;->aif:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -177,14 +177,14 @@
     throw v0
 
     :cond_3
-    iput-object v0, v9, Lcom/google/android/gms/common/internal/g;->afQ:Ljava/util/Set;
+    iput-object v0, v9, Lcom/google/android/gms/common/internal/g;->agi:Ljava/util/Set;
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected final lZ()Ljava/util/Set;
+.method protected final lX()Ljava/util/Set;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -195,23 +195,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/g;->afQ:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/g;->agi:Ljava/util/Set;
 
     return-object v0
 .end method
 
-.method public final lc()Landroid/accounts/Account;
+.method public final la()Landroid/accounts/Account;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/g;->ahL:Landroid/accounts/Account;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/g;->aid:Landroid/accounts/Account;
 
     return-object v0
 .end method
 
-.method public lh()I
+.method public lf()I
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/common/internal/c;->lh()I
+    invoke-super {p0}, Lcom/google/android/gms/common/internal/c;->lf()I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/h$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/h$a.smali
index 9d21c8d5bd..e592c843c8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/h$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/h$a.smali
@@ -14,11 +14,11 @@
 
 
 # instance fields
-.field private final aik:Ljava/lang/String;
+.field private final aiC:Ljava/lang/String;
 
-.field final ail:Ljava/lang/String;
+.field final aiD:Ljava/lang/String;
 
-.field final aim:I
+.field final aiE:I
 
 .field final mComponentName:Landroid/content/ComponentName;
 
@@ -29,23 +29,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/h$a;->aik:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/h$a;->aiC:Ljava/lang/String;
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/h$a;->ail:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/h$a;->aiD:Ljava/lang/String;
 
     const/4 p1, 0x0
 
     iput-object p1, p0, Lcom/google/android/gms/common/internal/h$a;->mComponentName:Landroid/content/ComponentName;
 
-    iput p3, p0, Lcom/google/android/gms/common/internal/h$a;->aim:I
+    iput p3, p0, Lcom/google/android/gms/common/internal/h$a;->aiE:I
 
     return-void
 .end method
@@ -73,9 +73,9 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/common/internal/h$a;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->aik:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->aiC:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/internal/h$a;->aik:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/common/internal/h$a;->aiC:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -83,9 +83,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->ail:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->aiD:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/internal/h$a;->ail:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/common/internal/h$a;->aiD:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -103,9 +103,9 @@
 
     if-eqz v1, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/common/internal/h$a;->aim:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/h$a;->aiE:I
 
-    iget p1, p1, Lcom/google/android/gms/common/internal/h$a;->aim:I
+    iget p1, p1, Lcom/google/android/gms/common/internal/h$a;->aiE:I
 
     if-ne v1, p1, :cond_2
 
@@ -122,13 +122,13 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->aik:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->aiC:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->ail:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->aiD:Ljava/lang/String;
 
     const/4 v2, 0x1
 
@@ -140,7 +140,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/google/android/gms/common/internal/h$a;->aim:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/h$a;->aiE:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -157,10 +157,10 @@
     return v0
 .end method
 
-.method public final mf()Landroid/content/Intent;
+.method public final md()Landroid/content/Intent;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->aik:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->aiC:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -168,7 +168,7 @@
 
     invoke-direct {v1, v0}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->ail:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->aiD:Ljava/lang/String;
 
     invoke-virtual {v1, v0}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
 
@@ -194,7 +194,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->aik:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->aiC:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/h.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/h.smali
index 5105855a8b..1ac41141b4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/h.smali
@@ -11,9 +11,9 @@
 
 
 # static fields
-.field private static final aii:Ljava/lang/Object;
+.field private static final aiA:Ljava/lang/Object;
 
-.field private static aij:Lcom/google/android/gms/common/internal/h;
+.field private static aiB:Lcom/google/android/gms/common/internal/h;
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/internal/h;->aii:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/common/internal/h;->aiA:Ljava/lang/Object;
 
     return-void
 .end method
@@ -40,12 +40,12 @@
 .method public static M(Landroid/content/Context;)Lcom/google/android/gms/common/internal/h;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/common/internal/h;->aii:Ljava/lang/Object;
+    sget-object v0, Lcom/google/android/gms/common/internal/h;->aiA:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/internal/h;->aij:Lcom/google/android/gms/common/internal/h;
+    sget-object v1, Lcom/google/android/gms/common/internal/h;->aiB:Lcom/google/android/gms/common/internal/h;
 
     if-nez v1, :cond_0
 
@@ -57,14 +57,14 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/common/internal/ag;-><init>(Landroid/content/Context;)V
 
-    sput-object v1, Lcom/google/android/gms/common/internal/h;->aij:Lcom/google/android/gms/common/internal/h;
+    sput-object v1, Lcom/google/android/gms/common/internal/h;->aiB:Lcom/google/android/gms/common/internal/h;
 
     :cond_0
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    sget-object p0, Lcom/google/android/gms/common/internal/h;->aij:Lcom/google/android/gms/common/internal/h;
+    sget-object p0, Lcom/google/android/gms/common/internal/h;->aiB:Lcom/google/android/gms/common/internal/h;
 
     return-object p0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/i.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/i.smali
index 9f3f484cb8..1209e28826 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/i.smali
@@ -3,15 +3,15 @@
 
 
 # static fields
-.field private static final ain:I = 0xf
+.field private static final aiF:I = 0xf
 
-.field private static final aio:Ljava/lang/String;
+.field private static final aiG:Ljava/lang/String;
 
 
 # instance fields
-.field private final aip:Ljava/lang/String;
+.field private final aiH:Ljava/lang/String;
 
-.field private final aiq:Ljava/lang/String;
+.field private final aiI:Ljava/lang/String;
 
 
 # direct methods
@@ -66,7 +66,7 @@
 
     invoke-static {v0, v1, v4}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/String;[Ljava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/i;->aip:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/i;->aiH:Ljava/lang/String;
 
     invoke-virtual {p2}, Ljava/lang/String;->length()I
 
@@ -76,22 +76,22 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/i;->aiq:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/i;->aiI:Ljava/lang/String;
 
     return-void
 
     :cond_1
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/i;->aiq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/i;->aiI:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final aT(Ljava/lang/String;)Ljava/lang/String;
+.method final aO(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/i;->aiq:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/i;->aiI:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
@@ -108,7 +108,7 @@
 .method public final bg(I)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/i;->aip:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/i;->aiH:Ljava/lang/String;
 
     invoke-static {v0, p1}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/j.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/j.smali
index 061254689b..c43dc4865a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/j.smali
@@ -3,16 +3,16 @@
 
 
 # instance fields
-.field public final air:Landroid/util/SparseIntArray;
+.field public final aiJ:Landroid/util/SparseIntArray;
 
-.field private ais:Lcom/google/android/gms/common/c;
+.field private aiK:Lcom/google/android/gms/common/c;
 
 
 # direct methods
 .method public constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kZ()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->kX()Lcom/google/android/gms/common/GoogleApiAvailability;
 
     move-result-object v0
 
@@ -30,11 +30,11 @@
 
     invoke-direct {v0}, Landroid/util/SparseIntArray;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/j;->air:Landroid/util/SparseIntArray;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/j;->aiJ:Landroid/util/SparseIntArray;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/j;->ais:Lcom/google/android/gms/common/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/j;->aiK:Lcom/google/android/gms/common/c;
 
     return-void
 .end method
@@ -48,7 +48,7 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->lf()Z
+    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->ld()Z
 
     move-result v0
 
@@ -59,11 +59,11 @@
     return v1
 
     :cond_0
-    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->lh()I
+    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->lf()I
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/j;->air:Landroid/util/SparseIntArray;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/j;->aiJ:Landroid/util/SparseIntArray;
 
     const/4 v2, -0x1
 
@@ -79,7 +79,7 @@
     const/4 v3, 0x0
 
     :goto_0
-    iget-object v4, p0, Lcom/google/android/gms/common/internal/j;->air:Landroid/util/SparseIntArray;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/j;->aiJ:Landroid/util/SparseIntArray;
 
     invoke-virtual {v4}, Landroid/util/SparseIntArray;->size()I
 
@@ -87,7 +87,7 @@
 
     if-ge v3, v4, :cond_3
 
-    iget-object v4, p0, Lcom/google/android/gms/common/internal/j;->air:Landroid/util/SparseIntArray;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/j;->aiJ:Landroid/util/SparseIntArray;
 
     invoke-virtual {v4, v3}, Landroid/util/SparseIntArray;->keyAt(I)I
 
@@ -95,7 +95,7 @@
 
     if-le v4, p2, :cond_2
 
-    iget-object v5, p0, Lcom/google/android/gms/common/internal/j;->air:Landroid/util/SparseIntArray;
+    iget-object v5, p0, Lcom/google/android/gms/common/internal/j;->aiJ:Landroid/util/SparseIntArray;
 
     invoke-virtual {v5, v4}, Landroid/util/SparseIntArray;->get(I)I
 
@@ -116,14 +116,14 @@
     :goto_1
     if-ne v0, v2, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/j;->ais:Lcom/google/android/gms/common/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/j;->aiK:Lcom/google/android/gms/common/c;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/common/c;->isGooglePlayServicesAvailable(Landroid/content/Context;I)I
 
     move-result v0
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/j;->air:Landroid/util/SparseIntArray;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/j;->aiJ:Landroid/util/SparseIntArray;
 
     invoke-virtual {p1, p2, v0}, Landroid/util/SparseIntArray;->put(II)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/k$a$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/k$a$a.smali
index 52825a2ee6..15d1e27e48 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/k$a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/k$a$a.smali
@@ -29,7 +29,7 @@
 
 
 # virtual methods
-.method public final lc()Landroid/accounts/Account;
+.method public final la()Landroid/accounts/Account;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -37,7 +37,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/k$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/k$a.smali
index deb0afd43c..ce05fc9227 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/k$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/k$a.smali
@@ -69,7 +69,7 @@
 
     if-ne p1, p2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/k$a;->lc()Landroid/accounts/Account;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/k$a;->la()Landroid/accounts/Account;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/k.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/k.smali
index d4ae4544dc..614b235d7b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/k.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/k.smali
@@ -14,7 +14,7 @@
 
 
 # virtual methods
-.method public abstract lc()Landroid/accounts/Account;
+.method public abstract la()Landroid/accounts/Account;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/n$a$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/n$a$a.smali
index 083f532799..6bc031f079 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/n$a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/n$a$a.smali
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field private final ait:Landroid/os/IBinder;
+.field private final aiL:Landroid/os/IBinder;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/n$a$a;->ait:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/n$a$a;->aiL:Landroid/os/IBinder;
 
     return-void
 .end method
@@ -84,7 +84,7 @@
     invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
 
     :goto_1
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/n$a$a;->ait:Landroid/os/IBinder;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/n$a$a;->aiL:Landroid/os/IBinder;
 
     const/16 v2, 0x2e
 
@@ -113,7 +113,7 @@
 .method public final asBinder()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/n$a$a;->ait:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/n$a$a;->aiL:Landroid/os/IBinder;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/o.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/o.smali
index e9cb83f05a..ab2c23e55a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/o.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/o.smali
@@ -3,13 +3,13 @@
 
 
 # static fields
-.field private static final aiu:Lcom/google/android/gms/common/internal/i;
+.field private static final aiM:Lcom/google/android/gms/common/internal/i;
 
-.field private static aiv:Lcom/google/android/gms/common/internal/o;
+.field private static aiN:Lcom/google/android/gms/common/internal/o;
 
 
 # instance fields
-.field private aiw:Ljava/util/concurrent/ConcurrentHashMap;
+.field private aiO:Ljava/util/concurrent/ConcurrentHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentHashMap<",
@@ -33,13 +33,13 @@
 
     invoke-direct {v0, v1, v2}, Lcom/google/android/gms/common/internal/i;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/android/gms/common/internal/o;->aiu:Lcom/google/android/gms/common/internal/i;
+    sput-object v0, Lcom/google/android/gms/common/internal/o;->aiM:Lcom/google/android/gms/common/internal/i;
 
     new-instance v0, Lcom/google/android/gms/common/internal/o;
 
     invoke-direct {v0}, Lcom/google/android/gms/common/internal/o;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/internal/o;->aiv:Lcom/google/android/gms/common/internal/o;
+    sput-object v0, Lcom/google/android/gms/common/internal/o;->aiN:Lcom/google/android/gms/common/internal/o;
 
     return-void
 .end method
@@ -53,22 +53,22 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/o;->aiw:Ljava/util/concurrent/ConcurrentHashMap;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/o;->aiO:Ljava/util/concurrent/ConcurrentHashMap;
 
     return-void
 .end method
 
-.method public static mg()Lcom/google/android/gms/common/internal/o;
+.method public static me()Lcom/google/android/gms/common/internal/o;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/internal/o;->aiv:Lcom/google/android/gms/common/internal/o;
+    sget-object v0, Lcom/google/android/gms/common/internal/o;->aiN:Lcom/google/android/gms/common/internal/o;
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method public final aU(Ljava/lang/String;)Ljava/lang/String;
+.method public final aP(Ljava/lang/String;)Ljava/lang/String;
     .locals 8
 
     const-string v0, "Failed to get app version for libraryName: "
@@ -79,7 +79,7 @@
 
     invoke-static {p1, v2}, Lcom/google/android/gms/common/internal/r;->i(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/o;->aiw:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/o;->aiO:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v2, p1}, Ljava/util/concurrent/ConcurrentHashMap;->containsKey(Ljava/lang/Object;)Z
 
@@ -87,7 +87,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/o;->aiw:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/o;->aiO:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/ConcurrentHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -137,7 +137,7 @@
 
     move-result-object v4
 
-    sget-object v2, Lcom/google/android/gms/common/internal/o;->aiu:Lcom/google/android/gms/common/internal/i;
+    sget-object v2, Lcom/google/android/gms/common/internal/o;->aiM:Lcom/google/android/gms/common/internal/i;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -183,7 +183,7 @@
 
     if-eqz v6, :cond_4
 
-    invoke-virtual {v2, v5}, Lcom/google/android/gms/common/internal/i;->aT(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/common/internal/i;->aO(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -192,7 +192,7 @@
     goto :goto_2
 
     :cond_1
-    sget-object v2, Lcom/google/android/gms/common/internal/o;->aiu:Lcom/google/android/gms/common/internal/i;
+    sget-object v2, Lcom/google/android/gms/common/internal/o;->aiM:Lcom/google/android/gms/common/internal/i;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -222,7 +222,7 @@
 
     if-eqz v6, :cond_4
 
-    invoke-virtual {v2, v5}, Lcom/google/android/gms/common/internal/i;->aT(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/common/internal/i;->aO(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -235,7 +235,7 @@
     :catch_0
     move-exception v2
 
-    sget-object v5, Lcom/google/android/gms/common/internal/o;->aiu:Lcom/google/android/gms/common/internal/i;
+    sget-object v5, Lcom/google/android/gms/common/internal/o;->aiM:Lcom/google/android/gms/common/internal/i;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -267,7 +267,7 @@
 
     if-eqz v3, :cond_4
 
-    invoke-virtual {v5, v0}, Lcom/google/android/gms/common/internal/i;->aT(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v5, v0}, Lcom/google/android/gms/common/internal/i;->aO(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -277,7 +277,7 @@
     :goto_2
     if-nez v4, :cond_6
 
-    sget-object v0, Lcom/google/android/gms/common/internal/o;->aiu:Lcom/google/android/gms/common/internal/i;
+    sget-object v0, Lcom/google/android/gms/common/internal/o;->aiM:Lcom/google/android/gms/common/internal/i;
 
     const/4 v2, 0x3
 
@@ -289,7 +289,7 @@
 
     const-string v2, ".properties file is dropped during release process. Failure to read app version isexpected druing Google internal testing where locally-built libraries are used"
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/common/internal/i;->aT(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/common/internal/i;->aO(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -299,7 +299,7 @@
     const-string v4, "UNKNOWN"
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/o;->aiw:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/o;->aiO:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v0, p1, v4}, Ljava/util/concurrent/ConcurrentHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/p$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/p$a.smali
index 73de1480fe..ee565ce8b0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/p$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/p$a.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private final aix:Ljava/util/List;
+.field private final aiP:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private final aiy:Ljava/lang/Object;
+.field private final aiQ:Ljava/lang/Object;
 
 
 # direct methods
@@ -37,13 +37,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/p$a;->aiy:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/p$a;->aiQ:Ljava/lang/Object;
 
     new-instance p1, Ljava/util/ArrayList;
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/p$a;->aix:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/p$a;->aiP:Ljava/util/List;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 .method public final h(Ljava/lang/String;Ljava/lang/Object;)Lcom/google/android/gms/common/internal/p$a;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/p$a;->aix:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/p$a;->aiP:Ljava/util/List;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -123,7 +123,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/p$a;->aiy:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/p$a;->aiQ:Ljava/lang/Object;
 
     invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -139,7 +139,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/p$a;->aix:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/p$a;->aiP:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -150,7 +150,7 @@
     :goto_0
     if-ge v2, v1, :cond_1
 
-    iget-object v3, p0, Lcom/google/android/gms/common/internal/p$a;->aix:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/p$a;->aiP:Ljava/util/List;
 
     invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/q.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/q.smali
index 427248fadd..f3ce753cab 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/q.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/q.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field private static final aiz:Lcom/google/android/gms/common/internal/q$b;
+.field private static final aiR:Lcom/google/android/gms/common/internal/q$b;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/internal/z;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/internal/q;->aiz:Lcom/google/android/gms/common/internal/q$b;
+    sput-object v0, Lcom/google/android/gms/common/internal/q;->aiR:Lcom/google/android/gms/common/internal/q$b;
 
     return-void
 .end method
@@ -48,7 +48,7 @@
 
     invoke-direct {v0, p1}, Lcom/google/android/gms/common/internal/ab;-><init>(Lcom/google/android/gms/common/api/j;)V
 
-    sget-object p1, Lcom/google/android/gms/common/internal/q;->aiz:Lcom/google/android/gms/common/internal/q$b;
+    sget-object p1, Lcom/google/android/gms/common/internal/q;->aiR:Lcom/google/android/gms/common/internal/q$b;
 
     new-instance v1, Lcom/google/android/gms/tasks/h;
 
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, v2}, Lcom/google/android/gms/common/api/g;->a(Lcom/google/android/gms/common/api/g$a;)V
 
-    iget-object p0, v1, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object p0, v1, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/r.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/r.smali
index 38f36bacb7..b26c82fd5a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/r.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/r.smali
@@ -64,7 +64,7 @@
     throw p0
 .end method
 
-.method public static aV(Ljava/lang/String;)Ljava/lang/String;
+.method public static aQ(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
     invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
@@ -85,7 +85,7 @@
     throw p0
 .end method
 
-.method public static aW(Ljava/lang/String;)V
+.method public static aR(Ljava/lang/String;)V
     .locals 1
 
     invoke-static {}, Lcom/google/android/gms/common/util/s;->isMainThread()Z
@@ -104,7 +104,7 @@
     throw v0
 .end method
 
-.method public static aX(Ljava/lang/String;)V
+.method public static aS(Ljava/lang/String;)V
     .locals 1
 
     invoke-static {}, Lcom/google/android/gms/common/util/s;->isMainThread()Z
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/s.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/s.smali
index a6397eb060..69b4ae780b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/s.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/s.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public final aiF:Lcom/google/android/gms/common/api/a$h;
+.field public final aiX:Lcom/google/android/gms/common/api/a$h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$h<",
@@ -36,43 +36,43 @@
         }
     .end annotation
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/s;->aiF:Lcom/google/android/gms/common/api/a$h;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/s;->aiX:Lcom/google/android/gms/common/api/a$h;
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/api/a$h;->ll()Landroid/os/IInterface;
+    invoke-interface {p1}, Lcom/google/android/gms/common/api/a$h;->lj()Landroid/os/IInterface;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final lh()I
+.method public final lf()I
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/common/internal/g;->lh()I
+    invoke-super {p0}, Lcom/google/android/gms/common/internal/g;->lf()I
 
     move-result v0
 
     return v0
 .end method
 
-.method protected final lj()Ljava/lang/String;
+.method protected final lh()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/s;->aiF:Lcom/google/android/gms/common/api/a$h;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/s;->aiX:Lcom/google/android/gms/common/api/a$h;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->lj()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->lh()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final lk()Ljava/lang/String;
+.method protected final li()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/s;->aiF:Lcom/google/android/gms/common/api/a$h;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/s;->aiX:Lcom/google/android/gms/common/api/a$h;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->lk()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->li()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/u.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/u.smali
index b55eef303c..65e41542b8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/u.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/u.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final synthetic aiI:Landroid/content/Intent;
+.field private final synthetic aja:Landroid/content/Intent;
 
 .field private final synthetic val$activity:Landroid/app/Activity;
 
@@ -14,7 +14,7 @@
 .method constructor <init>(Landroid/content/Intent;Landroid/app/Activity;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/u;->aiI:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/u;->aja:Landroid/content/Intent;
 
     iput-object p2, p0, Lcom/google/android/gms/common/internal/u;->val$activity:Landroid/app/Activity;
 
@@ -27,10 +27,10 @@
 
 
 # virtual methods
-.method public final me()V
+.method public final mc()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/u;->aiI:Landroid/content/Intent;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/u;->aja:Landroid/content/Intent;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/v.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/v.smali
index 14cb1ede45..6cf046d71a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/v.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/v.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final synthetic aiI:Landroid/content/Intent;
+.field private final synthetic aja:Landroid/content/Intent;
 
 .field private final synthetic val$fragment:Landroidx/fragment/app/Fragment;
 
@@ -14,7 +14,7 @@
 .method constructor <init>(Landroid/content/Intent;Landroidx/fragment/app/Fragment;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/v;->aiI:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/v;->aja:Landroid/content/Intent;
 
     iput-object p2, p0, Lcom/google/android/gms/common/internal/v;->val$fragment:Landroidx/fragment/app/Fragment;
 
@@ -27,10 +27,10 @@
 
 
 # virtual methods
-.method public final me()V
+.method public final mc()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/v;->aiI:Landroid/content/Intent;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/v;->aja:Landroid/content/Intent;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/w.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/w.smali
index fe1429ab70..abfcef099d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/w.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/w.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field private final synthetic aiI:Landroid/content/Intent;
+.field private final synthetic aja:Landroid/content/Intent;
 
-.field private final synthetic aiJ:Lcom/google/android/gms/common/api/internal/g;
+.field private final synthetic ajb:Lcom/google/android/gms/common/api/internal/g;
 
 .field private final synthetic val$requestCode:I
 
@@ -14,9 +14,9 @@
 .method constructor <init>(Landroid/content/Intent;Lcom/google/android/gms/common/api/internal/g;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/w;->aiI:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/w;->aja:Landroid/content/Intent;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/w;->aiJ:Lcom/google/android/gms/common/api/internal/g;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/w;->ajb:Lcom/google/android/gms/common/api/internal/g;
 
     const/4 p1, 0x2
 
@@ -29,14 +29,14 @@
 
 
 # virtual methods
-.method public final me()V
+.method public final mc()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/w;->aiI:Landroid/content/Intent;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/w;->aja:Landroid/content/Intent;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/w;->aiJ:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/w;->ajb:Lcom/google/android/gms/common/api/internal/g;
 
     iget v2, p0, Lcom/google/android/gms/common/internal/w;->val$requestCode:I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/x.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/x.smali
index 17dc5f2984..7cc8d16702 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/x.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/x.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic aiK:Lcom/google/android/gms/common/api/f$a;
+.field private final synthetic ajc:Lcom/google/android/gms/common/api/f$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/f$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/x;->aiK:Lcom/google/android/gms/common/api/f$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/x;->ajc:Lcom/google/android/gms/common/api/f$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -22,22 +22,22 @@
 
 
 # virtual methods
-.method public final lq()V
+.method public final lo()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/x;->aiK:Lcom/google/android/gms/common/api/f$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/x;->ajc:Lcom/google/android/gms/common/api/f$a;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/f$a;->lq()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/f$a;->lo()V
 
     return-void
 .end method
 
-.method public final lr()V
+.method public final lp()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/x;->aiK:Lcom/google/android/gms/common/api/f$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/x;->ajc:Lcom/google/android/gms/common/api/f$a;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/f$a;->lr()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/f$a;->lp()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/y.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/y.smali
index bb8186d205..12dc132f71 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/y.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/y.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic aiL:Lcom/google/android/gms/common/api/f$b;
+.field private final synthetic ajd:Lcom/google/android/gms/common/api/f$b;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/f$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/y;->aiL:Lcom/google/android/gms/common/api/f$b;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/y;->ajd:Lcom/google/android/gms/common/api/f$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,7 +25,7 @@
 .method public final a(Lcom/google/android/gms/common/ConnectionResult;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/y;->aiL:Lcom/google/android/gms/common/api/f$b;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/y;->ajd:Lcom/google/android/gms/common/api/f$b;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/common/api/f$b;->a(Lcom/google/android/gms/common/ConnectionResult;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/zzb.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/zzb.smali
index bd7fb678ae..47459e0081 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/zzb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/zzb.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field aiR:Landroid/os/Bundle;
+.field ajj:Landroid/os/Bundle;
 
-.field aiS:[Lcom/google/android/gms/common/Feature;
+.field ajk:[Lcom/google/android/gms/common/Feature;
 
 
 # direct methods
@@ -46,9 +46,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/zzb;->aiR:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/zzb;->ajj:Landroid/os/Bundle;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/zzb;->aiS:[Lcom/google/android/gms/common/Feature;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/zzb;->ajk:[Lcom/google/android/gms/common/Feature;
 
     return-void
 .end method
@@ -64,13 +64,13 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/zzb;->aiR:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/zzb;->ajj:Landroid/os/Bundle;
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Bundle;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/zzb;->aiS:[Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/zzb;->ajk:[Lcom/google/android/gms/common/Feature;
 
     const/4 v2, 0x2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/internal/zzr.smali b/com.discord/smali_classes2/com/google/android/gms/common/internal/zzr.smali
index 60866a34d8..4300b2548d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/zzr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/zzr.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final adm:I
+.field private final adE:I
 
 
 # direct methods
@@ -41,7 +41,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/common/internal/zzr;->adm:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/zzr;->adE:I
 
     return-void
 .end method
@@ -57,7 +57,7 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/common/internal/zzr;->adm:I
+    iget v0, p0, Lcom/google/android/gms/common/internal/zzr;->adE:I
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/m.smali b/com.discord/smali_classes2/com/google/android/gms/common/m.smali
index c4bcb68dcd..647401e396 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/m.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/m.smali
@@ -6,11 +6,11 @@
 
 
 # instance fields
-.field private final akG:Z
+.field private final akY:Z
 
-.field private final akH:Ljava/lang/String;
+.field private final akZ:Ljava/lang/String;
 
-.field private final akI:Lcom/google/android/gms/common/n;
+.field private final ala:Lcom/google/android/gms/common/n;
 
 
 # direct methods
@@ -19,11 +19,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/m;->akG:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/m;->akY:Z
 
-    iput-object p2, p0, Lcom/google/android/gms/common/m;->akH:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/m;->akZ:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/m;->akI:Lcom/google/android/gms/common/n;
+    iput-object p3, p0, Lcom/google/android/gms/common/m;->ala:Lcom/google/android/gms/common/n;
 
     return-void
 .end method
@@ -33,11 +33,11 @@
 .method public final call()Ljava/lang/Object;
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/m;->akG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/m;->akY:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/common/m;->akH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/m;->akZ:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/m;->akI:Lcom/google/android/gms/common/n;
+    iget-object v2, p0, Lcom/google/android/gms/common/m;->ala:Lcom/google/android/gms/common/n;
 
     invoke-static {v0, v1, v2}, Lcom/google/android/gms/common/l;->a(ZLjava/lang/String;Lcom/google/android/gms/common/n;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/n.smali b/com.discord/smali_classes2/com/google/android/gms/common/n.smali
index 12918a3931..8db39fca01 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/n.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private akJ:I
+.field private alb:I
 
 
 # direct methods
@@ -32,12 +32,12 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/gms/common/n;->akJ:I
+    iput p1, p0, Lcom/google/android/gms/common/n;->alb:I
 
     return-void
 .end method
 
-.method protected static bd(Ljava/lang/String;)[B
+.method protected static aY(Ljava/lang/String;)[B
     .locals 1
 
     :try_start_0
@@ -80,7 +80,7 @@
     :try_start_0
     check-cast p1, Lcom/google/android/gms/common/internal/ak;
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/internal/ak;->ml()I
+    invoke-interface {p1}, Lcom/google/android/gms/common/internal/ak;->mj()I
 
     move-result v1
 
@@ -93,7 +93,7 @@
     return v0
 
     :cond_1
-    invoke-interface {p1}, Lcom/google/android/gms/common/internal/ak;->mk()Lcom/google/android/gms/a/a;
+    invoke-interface {p1}, Lcom/google/android/gms/common/internal/ak;->mi()Lcom/google/android/gms/a/a;
 
     move-result-object p1
 
@@ -140,12 +140,12 @@
 .method public hashCode()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/common/n;->akJ:I
+    iget v0, p0, Lcom/google/android/gms/common/n;->alb:I
 
     return v0
 .end method
 
-.method public final mk()Lcom/google/android/gms/a/a;
+.method public final mi()Lcom/google/android/gms/a/a;
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/n;->getBytes()[B
@@ -159,7 +159,7 @@
     return-object v0
 .end method
 
-.method public final ml()I
+.method public final mj()I
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/n;->hashCode()I
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/o.smali b/com.discord/smali_classes2/com/google/android/gms/common/o.smali
index aa6c37047f..ca3d34a999 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/o.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/o.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final akK:[B
+.field private final alc:[B
 
 
 # direct methods
@@ -20,7 +20,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/common/n;-><init>([B)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/o;->akK:[B
+    iput-object p1, p0, Lcom/google/android/gms/common/o;->alc:[B
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 .method final getBytes()[B
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/o;->akK:[B
+    iget-object v0, p0, Lcom/google/android/gms/common/o;->alc:[B
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/p.smali b/com.discord/smali_classes2/com/google/android/gms/common/p.smali
index b5108dff46..52c7867f8d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/p.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/p.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final akM:Ljava/lang/ref/WeakReference;
+.field private static final ale:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private akL:Ljava/lang/ref/WeakReference;
+.field private ald:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -34,7 +34,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/common/p;->akM:Ljava/lang/ref/WeakReference;
+    sput-object v0, Lcom/google/android/gms/common/p;->ale:Ljava/lang/ref/WeakReference;
 
     return-void
 .end method
@@ -44,9 +44,9 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/common/n;-><init>([B)V
 
-    sget-object p1, Lcom/google/android/gms/common/p;->akM:Ljava/lang/ref/WeakReference;
+    sget-object p1, Lcom/google/android/gms/common/p;->ale:Ljava/lang/ref/WeakReference;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/p;->akL:Ljava/lang/ref/WeakReference;
+    iput-object p1, p0, Lcom/google/android/gms/common/p;->ald:Ljava/lang/ref/WeakReference;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/p;->akL:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/p;->ald:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -69,7 +69,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/p;->mE()[B
+    invoke-virtual {p0}, Lcom/google/android/gms/common/p;->mC()[B
 
     move-result-object v0
 
@@ -77,7 +77,7 @@
 
     invoke-direct {v1, v0}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v1, p0, Lcom/google/android/gms/common/p;->akL:Ljava/lang/ref/WeakReference;
+    iput-object v1, p0, Lcom/google/android/gms/common/p;->ald:Ljava/lang/ref/WeakReference;
 
     :cond_0
     monitor-exit p0
@@ -94,5 +94,5 @@
     throw v0
 .end method
 
-.method protected abstract mE()[B
+.method protected abstract mC()[B
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/q.smali b/com.discord/smali_classes2/com/google/android/gms/common/q.smali
index a8b4831a49..4668e6d117 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/q.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/q.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field static final akN:[Lcom/google/android/gms/common/n;
+.field static final alf:[Lcom/google/android/gms/common/n;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     const-string v2, "0\u0082\u0004C0\u0082\u0003+\u00a0\u0003\u0002\u0001\u0002\u0002\t\u0000\u00c2\u00e0\u0087FdJ0\u008d0"
 
-    invoke-static {v2}, Lcom/google/android/gms/common/n;->bd(Ljava/lang/String;)[B
+    invoke-static {v2}, Lcom/google/android/gms/common/n;->aY(Ljava/lang/String;)[B
 
     move-result-object v2
 
@@ -32,7 +32,7 @@
 
     const-string v2, "0\u0082\u0004\u00a80\u0082\u0003\u0090\u00a0\u0003\u0002\u0001\u0002\u0002\t\u0000\u00d5\u0085\u00b8l}\u00d3N\u00f50"
 
-    invoke-static {v2}, Lcom/google/android/gms/common/n;->bd(Ljava/lang/String;)[B
+    invoke-static {v2}, Lcom/google/android/gms/common/n;->aY(Ljava/lang/String;)[B
 
     move-result-object v2
 
@@ -42,7 +42,7 @@
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/android/gms/common/q;->akN:[Lcom/google/android/gms/common/n;
+    sput-object v0, Lcom/google/android/gms/common/q;->alf:[Lcom/google/android/gms/common/n;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/s.smali b/com.discord/smali_classes2/com/google/android/gms/common/s.smali
index 0962a7b05a..ee2094eeb8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/s.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/s.smali
@@ -13,12 +13,12 @@
 
 
 # virtual methods
-.method protected final mE()[B
+.method protected final mC()[B
     .locals 1
 
     const-string v0, "0\u0082\u0004C0\u0082\u0003+\u00a0\u0003\u0002\u0001\u0002\u0002\t\u0000\u00c2\u00e0\u0087FdJ0\u008d0\r\u0006\t*\u0086H\u0086\u00f7\r\u0001\u0001\u0004\u0005\u00000t1\u000b0\t\u0006\u0003U\u0004\u0006\u0013\u0002US1\u00130\u0011\u0006\u0003U\u0004\u0008\u0013\nCalifornia1\u00160\u0014\u0006\u0003U\u0004\u0007\u0013\rMountain View1\u00140\u0012\u0006\u0003U\u0004\n\u0013\u000bGoogle Inc.1\u00100\u000e\u0006\u0003U\u0004\u000b\u0013\u0007Android1\u00100\u000e\u0006\u0003U\u0004\u0003\u0013\u0007Android0\u001e\u0017\r080821231334Z\u0017\r360107231334Z0t1\u000b0\t\u0006\u0003U\u0004\u0006\u0013\u0002US1\u00130\u0011\u0006\u0003U\u0004\u0008\u0013\nCalifornia1\u00160\u0014\u0006\u0003U\u0004\u0007\u0013\rMountain View1\u00140\u0012\u0006\u0003U\u0004\n\u0013\u000bGoogle Inc.1\u00100\u000e\u0006\u0003U\u0004\u000b\u0013\u0007Android1\u00100\u000e\u0006\u0003U\u0004\u0003\u0013\u0007Android0\u0082\u0001 0\r\u0006\t*\u0086H\u0086\u00f7\r\u0001\u0001\u0001\u0005\u0000\u0003\u0082\u0001\r\u00000\u0082\u0001\u0008\u0002\u0082\u0001\u0001\u0000\u00abV.\u0000\u00d8;\u00a2\u0008\u00ae\n\u0096o\u0012N)\u00da\u0011\u00f2\u00abV\u00d0\u008fX\u00e2\u00cc\u00a9\u0013\u0003\u00e9\u00b7T\u00d3r\u00f6@\u00a7\u001b\u001d\u00cb\u0013\tgbNFV\u00a7wj\u0092\u0019=\u00b2\u00e5\u00bf\u00b7$\u00a9\u001ew\u0018\u008b\u000ejG\u00a4;3\u00d9`\u009bw\u00181E\u00cc\u00df{.Xft\u00c9\u00e1V[\u001fLjYU\u00bf\u00f2Q\u00a6=\u00ab\u00f9\u00c5\\\'\"\"R\u00e8u\u00e4\u00f8\u0015Jd_\u0089qh\u00c0\u00b1\u00bf\u00c6\u0012\u00ea\u00bfxWi\u00bb4\u00aay\u0084\u00dc~.\u00a2vL\u00ae\u0083\u0007\u00d8\u00c1qT\u00d7\u00ee_d\u00a5\u001aD\u00a6\u0002\u00c2I\u0005AW\u00dc\u0002\u00cd_\\\u000eU\u00fb\u00ef\u0085\u0019\u00fb\u00e3\'\u00f0\u00b1Q\u0016\u0092\u00c5\u00a0o\u0019\u00d1\u0083\u0085\u00f5\u00c4\u00db\u00c2\u00d6\u00b9?h\u00cc)y\u00c7\u000e\u0018\u00ab\u0093\u0086k;\u00d5\u00db\u0089\u0099U*\u000e;L\u0099\u00dfX\u00fb\u0091\u008b\u00ed\u00c1\u0082\u00ba5\u00e0\u0003\u00c1\u00b4\u00b1\r\u00d2D\u00a8\u00ee$\u00ff\u00fd38r\u00abR!\u0098^\u00da\u00b0\u00fc\r\u000b\u0014[j\u00a1\u0092\u0085\u008ey\u0002\u0001\u0003\u00a3\u0081\u00d90\u0081\u00d60\u001d\u0006\u0003U\u001d\u000e\u0004\u0016\u0004\u0014\u00c7}\u008c\u00c2!\u0017V%\u009a\u007f\u00d3\u0082\u00dfk\u00e3\u0098\u00e4\u00d7\u0086\u00a50\u0081\u00a6\u0006\u0003U\u001d#\u0004\u0081\u009e0\u0081\u009b\u0080\u0014\u00c7}\u008c\u00c2!\u0017V%\u009a\u007f\u00d3\u0082\u00dfk\u00e3\u0098\u00e4\u00d7\u0086\u00a5\u00a1x\u00a4v0t1\u000b0\t\u0006\u0003U\u0004\u0006\u0013\u0002US1\u00130\u0011\u0006\u0003U\u0004\u0008\u0013\nCalifornia1\u00160\u0014\u0006\u0003U\u0004\u0007\u0013\rMountain View1\u00140\u0012\u0006\u0003U\u0004\n\u0013\u000bGoogle Inc.1\u00100\u000e\u0006\u0003U\u0004\u000b\u0013\u0007Android1\u00100\u000e\u0006\u0003U\u0004\u0003\u0013\u0007Android\u0082\t\u0000\u00c2\u00e0\u0087FdJ0\u008d0\u000c\u0006\u0003U\u001d\u0013\u0004\u00050\u0003\u0001\u0001\u00ff0\r\u0006\t*\u0086H\u0086\u00f7\r\u0001\u0001\u0004\u0005\u0000\u0003\u0082\u0001\u0001\u0000m\u00d2R\u00ce\u00ef\u00850,6\n\u00aa\u00ce\u0093\u009b\u00cf\u00f2\u00cc\u00a9\u0004\u00bb]z\u0016a\u00f8\u00aeF\u00b2\u0099B\u0004\u00d0\u00ffJh\u00c7\u00ed\u001aS\u001e\u00c4YZb<\u00e6\u0007c\u00b1g)zz\u00e3W\u0012\u00c4\u0007\u00f2\u0008\u00f0\u00cb\u0010\u0094)\u0012M{\u0010b\u0019\u00c0\u0084\u00ca>\u00b3\u00f9\u00ad_\u00b8q\u00ef\u0092&\u009a\u008b\u00e2\u008b\u00f1mD\u00c8\u00d9\u00a0\u008el\u00b2\u00f0\u0005\u00bb?\u00e2\u00cb\u0096D~\u0086\u008es\u0010v\u00adE\u00b3?`\t\u00ea\u0019\u00c1a\u00e6&A\u00aa\u0099\'\u001d\u00fdR(\u00c5\u00c5\u0087\u0087]\u00db\u007fE\'X\u00d6a\u00f6\u00cc\u000c\u00cc\u00b75.BL\u00c46\\R52\u00f72Q7Y<J\u00e3A\u00f4\u00dbA\u00ed\u00da\r\u000b\u0010q\u00a7\u00c4@\u00f0\u00fe\u009e\u00a0\u001c\u00b6\'\u00cagCi\u00d0\u0084\u00bd/\u00d9\u0011\u00ff\u0006\u00cd\u00bf,\u00fa\u0010\u00dc\u000f\u0089:\u00e3Wb\u0091\u0090H\u00c7\u00ef\u00c6LqD\u0017\u0083B\u00f7\u0005\u0081\u00c9\u00deW:\u00f5[9\r\u00d7\u00fd\u00b9A\u00861\u0089]_u\u009f0\u0011&\u0087\u00ffb\u0014\u0010\u00c0i0\u008a"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/n;->bd(Ljava/lang/String;)[B
+    invoke-static {v0}, Lcom/google/android/gms/common/n;->aY(Ljava/lang/String;)[B
 
     move-result-object v0
 
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 2602897301..6eb353dc49 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
@@ -22,10 +22,10 @@
 .method public abstract getTimeMillis()J
 .end method
 
-.method public abstract mo()J
+.method public abstract mm()J
 .end method
 
-.method public abstract mp()Ljava/lang/String;
+.method public abstract mn()Ljava/lang/String;
 .end method
 
 .method public toString()Ljava/lang/String;
@@ -39,11 +39,11 @@
 
     move-result v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->mo()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->mm()J
 
     move-result-wide v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->mp()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->mn()Ljava/lang/String;
 
     move-result-object v5
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/stats/WakeLockEvent.smali b/com.discord/smali_classes2/com/google/android/gms/common/stats/WakeLockEvent.smali
index ae5f693096..8716608b17 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/stats/WakeLockEvent.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/stats/WakeLockEvent.smali
@@ -15,17 +15,19 @@
 
 
 # instance fields
-.field private ajA:I
+.field private final ajR:J
 
-.field private final ajB:Ljava/lang/String;
+.field private ajS:I
 
-.field private final ajC:Ljava/lang/String;
+.field private final ajT:Ljava/lang/String;
 
-.field private final ajD:Ljava/lang/String;
+.field private final ajU:Ljava/lang/String;
 
-.field private final ajE:I
+.field private final ajV:Ljava/lang/String;
 
-.field private final ajF:Ljava/util/List;
+.field private final ajW:I
+
+.field private final ajX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -35,21 +37,19 @@
     .end annotation
 .end field
 
-.field private final ajG:Ljava/lang/String;
+.field private final ajY:Ljava/lang/String;
 
-.field private final ajH:J
+.field private final ajZ:J
 
-.field private ajI:I
+.field private aka:I
 
-.field private final ajJ:Ljava/lang/String;
+.field private final akb:Ljava/lang/String;
 
-.field private final ajK:F
+.field private final akc:F
 
-.field private final ajL:J
+.field private final akd:J
 
-.field private final ajM:Z
-
-.field private final ajz:J
+.field private final ake:Z
 
 .field private durationMillis:J
 
@@ -99,27 +99,27 @@
 
     move-wide v1, p2
 
-    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajz:J
+    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajR:J
 
     move v1, p4
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajA:I
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajS:I
 
     move-object v1, p5
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajB:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajT:Ljava/lang/String;
 
     move-object v1, p12
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajC:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajU:Ljava/lang/String;
 
     move-object/from16 v1, p17
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajD:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajV:Ljava/lang/String;
 
     move v1, p6
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajE:I
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajW:I
 
     const-wide/16 v1, -0x1
 
@@ -127,35 +127,35 @@
 
     move-object v1, p7
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajF:Ljava/util/List;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajX:Ljava/util/List;
 
     move-object v1, p8
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajG:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajY:Ljava/lang/String;
 
     move-wide v1, p9
 
-    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajH:J
+    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajZ:J
 
     move v1, p11
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajI:I
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aka:I
 
     move-object/from16 v1, p13
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajJ:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->akb:Ljava/lang/String;
 
     move/from16 v1, p14
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajK:F
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->akc:F
 
     move-wide/from16 v1, p15
 
-    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajL:J
+    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->akd:J
 
     move/from16 v1, p18
 
-    iput-boolean v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajM:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ake:Z
 
     return-void
 .end method
@@ -222,7 +222,7 @@
 .method public final getEventType()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajA:I
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajS:I
 
     return v0
 .end method
@@ -230,12 +230,12 @@
 .method public final getTimeMillis()J
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajz:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajR:J
 
     return-wide v0
 .end method
 
-.method public final mo()J
+.method public final mm()J
     .locals 2
 
     iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->durationMillis:J
@@ -243,14 +243,14 @@
     return-wide v0
 .end method
 
-.method public final mp()Ljava/lang/String;
+.method public final mn()Ljava/lang/String;
     .locals 11
 
-    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajB:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajT:Ljava/lang/String;
 
-    iget v1, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajE:I
+    iget v1, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajW:I
 
-    iget-object v2, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajF:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajX:Ljava/util/List;
 
     const-string v3, ""
 
@@ -268,25 +268,25 @@
     move-result-object v2
 
     :goto_0
-    iget v4, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajI:I
+    iget v4, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aka:I
 
-    iget-object v5, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajC:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajU:Ljava/lang/String;
 
     if-nez v5, :cond_1
 
     move-object v5, v3
 
     :cond_1
-    iget-object v6, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajJ:Ljava/lang/String;
+    iget-object v6, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->akb:Ljava/lang/String;
 
     if-nez v6, :cond_2
 
     move-object v6, v3
 
     :cond_2
-    iget v7, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajK:F
+    iget v7, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->akc:F
 
-    iget-object v8, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajD:Ljava/lang/String;
+    iget-object v8, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajV:Ljava/lang/String;
 
     if-nez v8, :cond_3
 
@@ -296,7 +296,7 @@
     move-object v3, v8
 
     :goto_1
-    iget-boolean v8, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajM:Z
+    iget-boolean v8, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ake:Z
 
     invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -420,31 +420,31 @@
 
     invoke-static {p1, v2, v0, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajB:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajT:Ljava/lang/String;
 
     const/4 v1, 0x4
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajE:I
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajW:I
 
     const/4 v2, 0x5
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajF:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajX:Ljava/util/List;
 
     const/4 v2, 0x6
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/util/List;)V
 
-    iget-wide v2, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajH:J
+    iget-wide v2, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajZ:J
 
     const/16 v0, 0x8
 
     invoke-static {p1, v0, v2, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajC:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajU:Ljava/lang/String;
 
     const/16 v2, 0xa
 
@@ -458,25 +458,25 @@
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajG:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajY:Ljava/lang/String;
 
     const/16 v2, 0xc
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->akb:Ljava/lang/String;
 
     const/16 v2, 0xd
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajI:I
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aka:I
 
     const/16 v2, 0xe
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajK:F
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->akc:F
 
     const/16 v2, 0xf
 
@@ -484,19 +484,19 @@
 
     invoke-virtual {p1, v0}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajL:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->akd:J
 
     const/16 v2, 0x10
 
     invoke-static {p1, v2, v0, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajD:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajV:Ljava/lang/String;
 
     const/16 v1, 0x11
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ajM:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ake:Z
 
     const/16 v1, 0x12
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/stats/a.smali b/com.discord/smali_classes2/com/google/android/gms/common/stats/a.smali
index 1f8ea33435..f902694df7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/stats/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/stats/a.smali
@@ -3,15 +3,15 @@
 
 
 # static fields
-.field private static final aii:Ljava/lang/Object;
+.field private static final aiA:Ljava/lang/Object;
 
-.field private static volatile ajl:Lcom/google/android/gms/common/stats/a;
+.field private static volatile ajD:Lcom/google/android/gms/common/stats/a;
 
-.field private static ajm:Z
+.field private static ajE:Z
 
 
 # instance fields
-.field private final ajn:Ljava/util/List;
+.field private final ajF:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -21,7 +21,7 @@
     .end annotation
 .end field
 
-.field private final ajo:Ljava/util/List;
+.field private final ajG:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field private final ajp:Ljava/util/List;
+.field private final ajH:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field private final ajq:Ljava/util/List;
+.field private final ajI:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -60,11 +60,11 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/stats/a;->aii:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/common/stats/a;->aiA:Ljava/lang/Object;
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/google/android/gms/common/stats/a;->ajm:Z
+    sput-boolean v0, Lcom/google/android/gms/common/stats/a;->ajE:Z
 
     return-void
 .end method
@@ -76,19 +76,19 @@
 
     sget-object v0, Ljava/util/Collections;->EMPTY_LIST:Ljava/util/List;
 
-    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->ajn:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->ajF:Ljava/util/List;
 
     sget-object v0, Ljava/util/Collections;->EMPTY_LIST:Ljava/util/List;
 
-    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->ajo:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->ajG:Ljava/util/List;
 
     sget-object v0, Ljava/util/Collections;->EMPTY_LIST:Ljava/util/List;
 
-    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->ajp:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->ajH:Ljava/util/List;
 
     sget-object v0, Ljava/util/Collections;->EMPTY_LIST:Ljava/util/List;
 
-    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->ajq:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->ajI:Ljava/util/List;
 
     return-void
 .end method
@@ -160,19 +160,19 @@
     return p0
 .end method
 
-.method public static mn()Lcom/google/android/gms/common/stats/a;
+.method public static ml()Lcom/google/android/gms/common/stats/a;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/common/stats/a;->ajl:Lcom/google/android/gms/common/stats/a;
+    sget-object v0, Lcom/google/android/gms/common/stats/a;->ajD:Lcom/google/android/gms/common/stats/a;
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/common/stats/a;->aii:Ljava/lang/Object;
+    sget-object v0, Lcom/google/android/gms/common/stats/a;->aiA:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/stats/a;->ajl:Lcom/google/android/gms/common/stats/a;
+    sget-object v1, Lcom/google/android/gms/common/stats/a;->ajD:Lcom/google/android/gms/common/stats/a;
 
     if-nez v1, :cond_0
 
@@ -180,7 +180,7 @@
 
     invoke-direct {v1}, Lcom/google/android/gms/common/stats/a;-><init>()V
 
-    sput-object v1, Lcom/google/android/gms/common/stats/a;->ajl:Lcom/google/android/gms/common/stats/a;
+    sput-object v1, Lcom/google/android/gms/common/stats/a;->ajD:Lcom/google/android/gms/common/stats/a;
 
     :cond_0
     monitor-exit v0
@@ -198,7 +198,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/google/android/gms/common/stats/a;->ajl:Lcom/google/android/gms/common/stats/a;
+    sget-object v0, Lcom/google/android/gms/common/stats/a;->ajD:Lcom/google/android/gms/common/stats/a;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/stats/b.smali b/com.discord/smali_classes2/com/google/android/gms/common/stats/b.smali
index 01261f93f4..19faeb2a4b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/stats/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/stats/b.smali
@@ -5,21 +5,21 @@
 # static fields
 .field private static LOG_LEVEL_OFF:I
 
-.field public static final ajr:Landroid/content/ComponentName;
+.field public static final ajJ:Landroid/content/ComponentName;
 
-.field private static ajs:I
+.field private static ajK:I
 
-.field private static ajt:I
+.field private static ajL:I
 
-.field private static aju:I
+.field private static ajM:I
 
-.field private static ajv:I
+.field private static ajN:I
 
-.field private static ajw:I
+.field private static ajO:I
 
-.field private static ajx:I
+.field private static ajP:I
 
-.field private static ajy:I
+.field private static ajQ:I
 
 
 # direct methods
@@ -34,7 +34,7 @@
 
     invoke-direct {v0, v1, v2}, Landroid/content/ComponentName;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/android/gms/common/stats/b;->ajr:Landroid/content/ComponentName;
+    sput-object v0, Lcom/google/android/gms/common/stats/b;->ajJ:Landroid/content/ComponentName;
 
     const/4 v0, 0x0
 
@@ -42,29 +42,29 @@
 
     const/4 v0, 0x1
 
-    sput v0, Lcom/google/android/gms/common/stats/b;->ajs:I
+    sput v0, Lcom/google/android/gms/common/stats/b;->ajK:I
 
     const/4 v1, 0x2
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->ajt:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->ajL:I
 
     const/4 v1, 0x4
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->aju:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->ajM:I
 
     const/16 v1, 0x8
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->ajv:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->ajN:I
 
     const/16 v1, 0x10
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->ajw:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->ajO:I
 
     const/16 v1, 0x20
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->ajx:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->ajP:I
 
-    sput v0, Lcom/google/android/gms/common/stats/b;->ajy:I
+    sput v0, Lcom/google/android/gms/common/stats/b;->ajQ:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/stats/d.smali b/com.discord/smali_classes2/com/google/android/gms/common/stats/d.smali
index e4b385a4bd..3ab9b6bdec 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/stats/d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/stats/d.smali
@@ -3,11 +3,11 @@
 
 
 # static fields
-.field private static ajN:Lcom/google/android/gms/common/stats/d;
+.field private static akf:Lcom/google/android/gms/common/stats/d;
 
-.field private static ajO:Ljava/lang/Boolean;
+.field private static akg:Ljava/lang/Boolean;
 
-.field private static ajP:Z
+.field private static akh:Z
 
 
 # direct methods
@@ -18,11 +18,11 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/stats/d;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/stats/d;->ajN:Lcom/google/android/gms/common/stats/d;
+    sput-object v0, Lcom/google/android/gms/common/stats/d;->akf:Lcom/google/android/gms/common/stats/d;
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/google/android/gms/common/stats/d;->ajP:Z
+    sput-boolean v0, Lcom/google/android/gms/common/stats/d;->akh:Z
 
     return-void
 .end method
@@ -57,16 +57,16 @@
 
     move-object/from16 v1, p7
 
-    sget-object v2, Lcom/google/android/gms/common/stats/d;->ajO:Ljava/lang/Boolean;
+    sget-object v2, Lcom/google/android/gms/common/stats/d;->akg:Ljava/lang/Boolean;
 
     if-nez v2, :cond_0
 
     sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object v2, Lcom/google/android/gms/common/stats/d;->ajO:Ljava/lang/Boolean;
+    sput-object v2, Lcom/google/android/gms/common/stats/d;->akg:Ljava/lang/Boolean;
 
     :cond_0
-    sget-object v2, Lcom/google/android/gms/common/stats/d;->ajO:Ljava/lang/Boolean;
+    sget-object v2, Lcom/google/android/gms/common/stats/d;->akg:Ljava/lang/Boolean;
 
     invoke-virtual {v2}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -229,7 +229,7 @@
 
     invoke-direct {v1}, Landroid/content/Intent;-><init>()V
 
-    sget-object v2, Lcom/google/android/gms/common/stats/b;->ajr:Landroid/content/ComponentName;
+    sget-object v2, Lcom/google/android/gms/common/stats/b;->ajJ:Landroid/content/ComponentName;
 
     invoke-virtual {v1, v2}, Landroid/content/Intent;->setComponent(Landroid/content/ComponentName;)Landroid/content/Intent;
 
@@ -260,10 +260,10 @@
     return-void
 .end method
 
-.method public static mq()Lcom/google/android/gms/common/stats/d;
+.method public static mo()Lcom/google/android/gms/common/stats/d;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/stats/d;->ajN:Lcom/google/android/gms/common/stats/d;
+    sget-object v0, Lcom/google/android/gms/common/stats/d;->akf:Lcom/google/android/gms/common/stats/d;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/t.smali b/com.discord/smali_classes2/com/google/android/gms/common/t.smali
index f6f7926e2c..7692a2144c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/t.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/t.smali
@@ -13,12 +13,12 @@
 
 
 # virtual methods
-.method protected final mE()[B
+.method protected final mC()[B
     .locals 1
 
     const-string v0, "0\u0082\u0004\u00a80\u0082\u0003\u0090\u00a0\u0003\u0002\u0001\u0002\u0002\t\u0000\u00d5\u0085\u00b8l}\u00d3N\u00f50\r\u0006\t*\u0086H\u0086\u00f7\r\u0001\u0001\u0004\u0005\u00000\u0081\u00941\u000b0\t\u0006\u0003U\u0004\u0006\u0013\u0002US1\u00130\u0011\u0006\u0003U\u0004\u0008\u0013\nCalifornia1\u00160\u0014\u0006\u0003U\u0004\u0007\u0013\rMountain View1\u00100\u000e\u0006\u0003U\u0004\n\u0013\u0007Android1\u00100\u000e\u0006\u0003U\u0004\u000b\u0013\u0007Android1\u00100\u000e\u0006\u0003U\u0004\u0003\u0013\u0007Android1\"0 \u0006\t*\u0086H\u0086\u00f7\r\u0001\t\u0001\u0016\u0013android@android.com0\u001e\u0017\r080415233656Z\u0017\r350901233656Z0\u0081\u00941\u000b0\t\u0006\u0003U\u0004\u0006\u0013\u0002US1\u00130\u0011\u0006\u0003U\u0004\u0008\u0013\nCalifornia1\u00160\u0014\u0006\u0003U\u0004\u0007\u0013\rMountain View1\u00100\u000e\u0006\u0003U\u0004\n\u0013\u0007Android1\u00100\u000e\u0006\u0003U\u0004\u000b\u0013\u0007Android1\u00100\u000e\u0006\u0003U\u0004\u0003\u0013\u0007Android1\"0 \u0006\t*\u0086H\u0086\u00f7\r\u0001\t\u0001\u0016\u0013android@android.com0\u0082\u0001 0\r\u0006\t*\u0086H\u0086\u00f7\r\u0001\u0001\u0001\u0005\u0000\u0003\u0082\u0001\r\u00000\u0082\u0001\u0008\u0002\u0082\u0001\u0001\u0000\u00d6\u00ce.\u0008\n\u00bf\u00e21M\u00d1\u008d\u00b3\u00cf\u00d3\u0018\\\u00b4=3\u00fa\u000ct\u00e1\u00bd\u00b6\u00d1\u00db\u0089\u0013\u00f6,\\9\u00dfV\u00f8F\u0081=e\u00be\u00c0\u00f3\u00caBk\u0007\u00c5\u00a8\u00edZ9\u0090\u00c1g\u00e7k\u00c9\u0099\u00b9\'\u0089K\u008f\u000b\"\u0000\u0019\u0094\u00a9)\u0015\u00e5r\u00c5m*0\u001b\u00a3o\u00c5\u00fc\u0011:\u00d6\u00cb\u009et5\u00a1m#\u00ab}\u00fa\u00ee\u00e1e\u00e4\u00df\u001f\n\u008d\u00bd\u00a7\n\u0086\u009dQlN\u009d\u0005\u0011\u0096\u00ca|\u000cU\u007f\u0017[\u00c3u\u00f9H\u00c5j\u00ae\u0086\u0008\u009b\u00a4O\u008a\u00a6\u00a4\u00dd\u009a}\u00bf,\n5\"\u0082\u00ad\u0006\u00b8\u00cc\u0018^\u00b1Uy\u00ee\u00f8m\u0008\u000b\u001da\u0089\u00c0\u00f9\u00af\u0098\u00b1\u00c2\u00eb\u00d1\u0007\u00eaE\u00ab\u00dbh\u00a3\u00c7\u0083\u008a^T\u0088\u00c7lS\u00d4\u000b\u0012\u001d\u00e7\u00bb\u00d3\u000eb\u000c\u0018\u008a\u00e1\u00aaa\u00db\u00bc\u0087\u00dd<d_/U\u00f3\u00d4\u00c3u\u00ec@p\u00a9?qQ\u00d86p\u00c1j\u0097\u001a\u00be^\u00f2\u00d1\u0018\u0090\u00e1\u00b8\u00ae\u00f3)\u008c\u00f0f\u00bf\u009el\u00e1D\u00ac\u009a\u00e8m\u001c\u001b\u000f\u0002\u0001\u0003\u00a3\u0081\u00fc0\u0081\u00f90\u001d\u0006\u0003U\u001d\u000e\u0004\u0016\u0004\u0014\u008d\u001c\u00c5\u00be\u0095LC<a\u0086:\u0015\u00b0L\u00bc\u0003\u00f2O\u00e0\u00b20\u0081\u00c9\u0006\u0003U\u001d#\u0004\u0081\u00c10\u0081\u00be\u0080\u0014\u008d\u001c\u00c5\u00be\u0095LC<a\u0086:\u0015\u00b0L\u00bc\u0003\u00f2O\u00e0\u00b2\u00a1\u0081\u009a\u00a4\u0081\u00970\u0081\u00941\u000b0\t\u0006\u0003U\u0004\u0006\u0013\u0002US1\u00130\u0011\u0006\u0003U\u0004\u0008\u0013\nCalifornia1\u00160\u0014\u0006\u0003U\u0004\u0007\u0013\rMountain View1\u00100\u000e\u0006\u0003U\u0004\n\u0013\u0007Android1\u00100\u000e\u0006\u0003U\u0004\u000b\u0013\u0007Android1\u00100\u000e\u0006\u0003U\u0004\u0003\u0013\u0007Android1\"0 \u0006\t*\u0086H\u0086\u00f7\r\u0001\t\u0001\u0016\u0013android@android.com\u0082\t\u0000\u00d5\u0085\u00b8l}\u00d3N\u00f50\u000c\u0006\u0003U\u001d\u0013\u0004\u00050\u0003\u0001\u0001\u00ff0\r\u0006\t*\u0086H\u0086\u00f7\r\u0001\u0001\u0004\u0005\u0000\u0003\u0082\u0001\u0001\u0000\u0019\u00d3\u000c\u00f1\u0005\u00fbx\u0092?L\r}\u00d2##=@\u0096z\u00cf\u00ce\u0000\u0008\u001d[\u00d7\u00c6\u00e9\u00d6\u00ed k\u000e\u0011 \u0095\u0006Al\u00a2D\u0093\u0099\u0013\u00d2kJ\u00a0\u00e0\u00f5$\u00ca\u00d2\u00bb\\nL\u00a1\u0001j\u0015\u0091n\u00a1\u00ec]\u00c9Z^:\u0001\u00006\u00f4\u0092H\u00d5\u0010\u009b\u00bf.\u001ea\u0081\u0086g:;\u00e5m\u00af\u000bw\u00b1\u00c2)\u00e3\u00c2U\u00e3\u00e8L\u0090]#\u0087\u00ef\u00ba\t\u00cb\u00f1; +NZ\"\u00c92cHJ#\u00d2\u00fc)\u00fa\u009f\u00199u\u00973\u00af\u00d8\u00aa\u0016\u000fB\u0096\u00c2\u00d0\u0016>\u0081\u0082\u0085\u009cfC\u00e9\u00c1\u0096/\u00a0\u00c1\u008333[\u00c0\u0090\u00ff\u009ak\"\u00de\u00d1\u00adDB)\u00a59\u00a9N\u00ef\u00ad\u00ab\u00d0e\u00ce\u00d2K>Q\u00e5\u00dd{fx{\u00ef\u0012\u00fe\u0097\u00fb\u00a4\u0084\u00c4#\u00fbO\u00f8\u00ccIL\u0002\u00f0\u00f5\u0005\u0016\u0012\u00ffe)9>\u008eF\u00ea\u00c5\u00bb!\u00f2w\u00c1Q\u00aa_*\u00a6\'\u00d1\u00e8\u009d\u00a7\n\u00b6\u00035i\u00de;\u0098\u0097\u00bf\u00ff|\u00a9\u00da>\u0012C\u00f6\u000b"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/n;->bd(Ljava/lang/String;)[B
+    invoke-static {v0}, Lcom/google/android/gms/common/n;->aY(Ljava/lang/String;)[B
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/a.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/a.smali
index 6a3da7cff4..e5a6f39f1d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/a.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static volatile ajQ:I = -0x1
+.field private static volatile aki:I = -0x1
 
 
 # direct methods
@@ -13,7 +13,7 @@
     return-void
 .end method
 
-.method public static aZ(Ljava/lang/String;)Ljava/security/MessageDigest;
+.method public static aU(Ljava/lang/String;)Ljava/security/MessageDigest;
     .locals 2
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/a/a.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/a/a.smali
index 29fd86752e..5a1befabcd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/a/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/a/a.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private final akr:Ljava/util/concurrent/ThreadFactory;
+.field private final akJ:Ljava/util/concurrent/ThreadFactory;
 
 .field private final name:Ljava/lang/String;
 
@@ -33,7 +33,7 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/common/util/a/a;->akr:Ljava/util/concurrent/ThreadFactory;
+    iput-object p2, p0, Lcom/google/android/gms/common/util/a/a;->akJ:Ljava/util/concurrent/ThreadFactory;
 
     const-string p2, "Name must not be null"
 
@@ -57,7 +57,7 @@
 .method public final newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/util/a/a;->akr:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lcom/google/android/gms/common/util/a/a;->akJ:Ljava/util/concurrent/ThreadFactory;
 
     new-instance v1, Lcom/google/android/gms/common/util/a/c;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/a/b.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/a/b.smali
index ca76322052..cdb0e5f2b7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/a/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/a/b.smali
@@ -6,11 +6,11 @@
 
 
 # instance fields
-.field private final akr:Ljava/util/concurrent/ThreadFactory;
+.field private final akJ:Ljava/util/concurrent/ThreadFactory;
 
-.field private final aks:Ljava/lang/String;
+.field private final akK:Ljava/lang/String;
 
-.field private final akt:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final akL:Ljava/util/concurrent/atomic/AtomicInteger;
 
 .field private final priority:I
 
@@ -35,13 +35,13 @@
 
     invoke-direct {p2}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/gms/common/util/a/b;->akt:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p2, p0, Lcom/google/android/gms/common/util/a/b;->akL:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-static {}, Ljava/util/concurrent/Executors;->defaultThreadFactory()Ljava/util/concurrent/ThreadFactory;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/common/util/a/b;->akr:Ljava/util/concurrent/ThreadFactory;
+    iput-object p2, p0, Lcom/google/android/gms/common/util/a/b;->akJ:Ljava/util/concurrent/ThreadFactory;
 
     const-string p2, "Name must not be null"
 
@@ -51,7 +51,7 @@
 
     check-cast p1, Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/util/a/b;->aks:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/util/a/b;->akK:Ljava/lang/String;
 
     const/4 p1, 0x0
 
@@ -65,7 +65,7 @@
 .method public final newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/util/a/b;->akr:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lcom/google/android/gms/common/util/a/b;->akJ:Ljava/util/concurrent/ThreadFactory;
 
     new-instance v1, Lcom/google/android/gms/common/util/a/c;
 
@@ -75,9 +75,9 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/util/a/b;->aks:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/util/a/b;->akK:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/util/a/b;->akt:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/google/android/gms/common/util/a/b;->akL:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/a/c.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/a/c.smali
index c45d352dc3..d15586d5f3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/a/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/a/c.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private final aku:Ljava/lang/Runnable;
+.field private final akM:Ljava/lang/Runnable;
 
 .field private final priority:I
 
@@ -17,7 +17,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/util/a/c;->aku:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/google/android/gms/common/util/a/c;->akM:Ljava/lang/Runnable;
 
     const/4 p1, 0x0
 
@@ -35,7 +35,7 @@
 
     invoke-static {v0}, Landroid/os/Process;->setThreadPriority(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/util/a/c;->aku:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/google/android/gms/common/util/a/c;->akM:Ljava/lang/Runnable;
 
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/f.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/f.smali
index af2fb78598..452ce0b68f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/f.smali
@@ -3,17 +3,17 @@
 
 
 # static fields
-.field private static final ajR:[Ljava/lang/String;
+.field private static final akj:[Ljava/lang/String;
 
-.field private static ajS:Landroid/os/DropBoxManager; = null
+.field private static akk:Landroid/os/DropBoxManager; = null
 
-.field private static ajT:Z = false
+.field private static akl:Z = false
 
-.field private static ajU:I = -0x1
+.field private static akm:I = -0x1
 
-.field private static ajV:I
+.field private static akn:I
 
-.field private static ajW:I
+.field private static ako:I
 
 
 # direct methods
@@ -54,7 +54,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/google/android/gms/common/util/f;->ajR:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/common/util/f;->akj:[Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/g.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/g.smali
index ae50bdbeb8..09a89cada4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/g.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final ajX:Lcom/google/android/gms/common/util/g;
+.field private static final akp:Lcom/google/android/gms/common/util/g;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/util/g;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/common/util/g;->ajX:Lcom/google/android/gms/common/util/g;
+    sput-object v0, Lcom/google/android/gms/common/util/g;->akp:Lcom/google/android/gms/common/util/g;
 
     return-void
 .end method
@@ -30,10 +30,10 @@
     return-void
 .end method
 
-.method public static mr()Lcom/google/android/gms/common/util/e;
+.method public static mp()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/util/g;->ajX:Lcom/google/android/gms/common/util/g;
+    sget-object v0, Lcom/google/android/gms/common/util/g;->akp:Lcom/google/android/gms/common/util/g;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/h.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/h.smali
index 6d5a2ed21d..3642be18d5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/h.smali
@@ -3,22 +3,22 @@
 
 
 # static fields
-.field private static ajY:Ljava/lang/Boolean;
+.field private static akq:Ljava/lang/Boolean;
 
-.field private static ajZ:Ljava/lang/Boolean;
+.field private static akr:Ljava/lang/Boolean;
 
-.field public static aka:Ljava/lang/Boolean;
+.field public static aks:Ljava/lang/Boolean;
 
 
 # direct methods
 .method public static Q(Landroid/content/Context;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/util/h;->ajY:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/util/h;->akq:Ljava/lang/Boolean;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->mt()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->mr()Z
 
     move-result v0
 
@@ -48,10 +48,10 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/android/gms/common/util/h;->ajY:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/util/h;->akq:Ljava/lang/Boolean;
 
     :cond_1
-    sget-object p0, Lcom/google/android/gms/common/util/h;->ajY:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/common/util/h;->akq:Ljava/lang/Boolean;
 
     invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -101,11 +101,11 @@
 .method public static S(Landroid/content/Context;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/util/h;->ajZ:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/util/h;->akr:Ljava/lang/Boolean;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->mu()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->ms()Z
 
     move-result v0
 
@@ -135,10 +135,10 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/android/gms/common/util/h;->ajZ:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/util/h;->akr:Ljava/lang/Boolean;
 
     :cond_1
-    sget-object p0, Lcom/google/android/gms/common/util/h;->ajZ:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/common/util/h;->akr:Ljava/lang/Boolean;
 
     invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/i.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/i.smali
index 6135e5aa45..b521223d0d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/i.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field private static final akb:[C
+.field private static final akt:[C
 
-.field private static final akc:[C
+.field private static final aku:[C
 
 
 # direct methods
@@ -18,13 +18,13 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lcom/google/android/gms/common/util/i;->akb:[C
+    sput-object v1, Lcom/google/android/gms/common/util/i;->akt:[C
 
     new-array v0, v0, [C
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lcom/google/android/gms/common/util/i;->akc:[C
+    sput-object v0, Lcom/google/android/gms/common/util/i;->aku:[C
 
     return-void
 
@@ -87,7 +87,7 @@
     :goto_0
     if-ge v2, v0, :cond_0
 
-    sget-object v3, Lcom/google/android/gms/common/util/i;->akb:[C
+    sget-object v3, Lcom/google/android/gms/common/util/i;->akt:[C
 
     aget-byte v4, p0, v2
 
@@ -99,7 +99,7 @@
 
     invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget-object v3, Lcom/google/android/gms/common/util/i;->akb:[C
+    sget-object v3, Lcom/google/android/gms/common/util/i;->akt:[C
 
     aget-byte v4, p0, v2
 
@@ -145,7 +145,7 @@
 
     add-int/lit8 v4, v2, 0x1
 
-    sget-object v5, Lcom/google/android/gms/common/util/i;->akc:[C
+    sget-object v5, Lcom/google/android/gms/common/util/i;->aku:[C
 
     ushr-int/lit8 v6, v3, 0x4
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/j.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/j.smali
index 3ec14538b3..e1c82b777a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/j.smali
@@ -3,11 +3,11 @@
 
 
 # static fields
-.field private static final akd:Ljava/util/regex/Pattern;
+.field private static final akv:Ljava/util/regex/Pattern;
 
-.field private static final ake:Ljava/util/regex/Pattern;
+.field private static final akw:Ljava/util/regex/Pattern;
 
-.field private static final akf:Ljava/util/regex/Pattern;
+.field private static final akx:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -20,7 +20,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/j;->akd:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/common/util/j;->akv:Ljava/util/regex/Pattern;
 
     const-string v0, "^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$"
 
@@ -28,7 +28,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/j;->ake:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/common/util/j;->akw:Ljava/util/regex/Pattern;
 
     const-string v0, "^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$"
 
@@ -36,7 +36,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/j;->akf:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/common/util/j;->akx:Ljava/util/regex/Pattern;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/l.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/l.smali
index 2c256e0cdc..1b086699d8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/l.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/l.smali
@@ -60,7 +60,7 @@
     return v0
 .end method
 
-.method public static ms()Z
+.method public static mq()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -79,7 +79,7 @@
     return v0
 .end method
 
-.method public static mt()Z
+.method public static mr()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -98,7 +98,7 @@
     return v0
 .end method
 
-.method public static mu()Z
+.method public static ms()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/n.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/n.smali
index 6b5e8cc4b8..2228b29a0a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/n.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final aki:Ljava/util/regex/Pattern;
+.field private static final akA:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -16,12 +16,12 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/n;->aki:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/common/util/n;->akA:Ljava/util/regex/Pattern;
 
     return-void
 .end method
 
-.method public static bb(Ljava/lang/String;)Z
+.method public static aW(Ljava/lang/String;)Z
     .locals 0
 
     if-eqz p0, :cond_1
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/p.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/p.smali
index f4887021c8..e28195c6a4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/p.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/p.smali
@@ -3,21 +3,21 @@
 
 
 # static fields
-.field private static final akj:I
+.field private static final akB:I
 
-.field private static final akk:Ljava/lang/reflect/Method;
+.field private static final akC:Ljava/lang/reflect/Method;
 
-.field private static final akl:Ljava/lang/reflect/Method;
+.field private static final akD:Ljava/lang/reflect/Method;
 
-.field private static final akm:Ljava/lang/reflect/Method;
+.field private static final akE:Ljava/lang/reflect/Method;
 
-.field private static final akn:Ljava/lang/reflect/Method;
+.field private static final akF:Ljava/lang/reflect/Method;
 
-.field private static final ako:Ljava/lang/reflect/Method;
+.field private static final akG:Ljava/lang/reflect/Method;
 
-.field private static final akp:Ljava/lang/reflect/Method;
+.field private static final akH:Ljava/lang/reflect/Method;
 
-.field private static final akq:Ljava/lang/reflect/Method;
+.field private static final akI:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -28,49 +28,49 @@
 
     move-result v0
 
-    sput v0, Lcom/google/android/gms/common/util/p;->akj:I
+    sput v0, Lcom/google/android/gms/common/util/p;->akB:I
+
+    invoke-static {}, Lcom/google/android/gms/common/util/p;->mu()Ljava/lang/reflect/Method;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/common/util/p;->akC:Ljava/lang/reflect/Method;
+
+    invoke-static {}, Lcom/google/android/gms/common/util/p;->mv()Ljava/lang/reflect/Method;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/common/util/p;->akD:Ljava/lang/reflect/Method;
 
     invoke-static {}, Lcom/google/android/gms/common/util/p;->mw()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/p;->akk:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/common/util/p;->akE:Ljava/lang/reflect/Method;
 
     invoke-static {}, Lcom/google/android/gms/common/util/p;->mx()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/p;->akl:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/common/util/p;->akF:Ljava/lang/reflect/Method;
 
     invoke-static {}, Lcom/google/android/gms/common/util/p;->my()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/p;->akm:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/common/util/p;->akG:Ljava/lang/reflect/Method;
 
     invoke-static {}, Lcom/google/android/gms/common/util/p;->mz()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/p;->akn:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/common/util/p;->akH:Ljava/lang/reflect/Method;
 
     invoke-static {}, Lcom/google/android/gms/common/util/p;->mA()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/p;->ako:Ljava/lang/reflect/Method;
-
-    invoke-static {}, Lcom/google/android/gms/common/util/p;->mB()Ljava/lang/reflect/Method;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/common/util/p;->akp:Ljava/lang/reflect/Method;
-
-    invoke-static {}, Lcom/google/android/gms/common/util/p;->mC()Ljava/lang/reflect/Method;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/common/util/p;->akq:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/common/util/p;->akI:Ljava/lang/reflect/Method;
 
     return-void
 .end method
@@ -102,7 +102,7 @@
 
     move-result-object p0
 
-    iget-object v1, v1, Lcom/google/android/gms/common/c/b;->akA:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/common/c/b;->akS:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -127,7 +127,7 @@
 .method private static a(Landroid/os/WorkSource;)I
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/common/util/p;->akm:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/common/util/p;->akE:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
@@ -170,7 +170,7 @@
 
     invoke-direct {v0}, Landroid/os/WorkSource;-><init>()V
 
-    sget-object v1, Lcom/google/android/gms/common/util/p;->akl:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/google/android/gms/common/util/p;->akD:Ljava/lang/reflect/Method;
 
     const/4 v2, 0x0
 
@@ -188,7 +188,7 @@
 
     :cond_0
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/util/p;->akl:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/google/android/gms/common/util/p;->akD:Ljava/lang/reflect/Method;
 
     const/4 v6, 0x2
 
@@ -216,7 +216,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object p1, Lcom/google/android/gms/common/util/p;->akk:Ljava/lang/reflect/Method;
+    sget-object p1, Lcom/google/android/gms/common/util/p;->akC:Ljava/lang/reflect/Method;
 
     if-eqz p1, :cond_2
 
@@ -248,7 +248,7 @@
 .method private static a(Landroid/os/WorkSource;I)Ljava/lang/String;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/common/util/p;->ako:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/common/util/p;->akG:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
@@ -337,7 +337,7 @@
 
     move-result-object v3
 
-    invoke-static {v3}, Lcom/google/android/gms/common/util/n;->bb(Ljava/lang/String;)Z
+    invoke-static {v3}, Lcom/google/android/gms/common/util/n;->aW(Ljava/lang/String;)Z
 
     move-result v4
 
@@ -464,89 +464,7 @@
     return-object v1
 .end method
 
-.method private static mA()Ljava/lang/reflect/Method;
-    .locals 5
-
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->ms()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    :try_start_0
-    const-class v0, Landroid/os/WorkSource;
-
-    const-string v1, "getName"
-
-    const/4 v2, 0x1
-
-    new-array v2, v2, [Ljava/lang/Class;
-
-    const/4 v3, 0x0
-
-    sget-object v4, Ljava/lang/Integer;->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;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return-object v0
-.end method
-
-.method private static final mB()Ljava/lang/reflect/Method;
-    .locals 3
-
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->isAtLeastP()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    :try_start_0
-    const-class v0, Landroid/os/WorkSource;
-
-    const-string v1, "createWorkChain"
-
-    const/4 v2, 0x0
-
-    new-array v2, v2, [Ljava/lang/Class;
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v0
-
-    const-string v1, "WorkSourceUtil"
-
-    const-string v2, "Missing WorkChain API createWorkChain"
-
-    invoke-static {v1, v2, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return-object v0
-.end method
-
-.method private static final mC()Ljava/lang/reflect/Method;
+.method private static final mA()Ljava/lang/reflect/Method;
     .locals 5
 
     invoke-static {}, Lcom/google/android/gms/common/util/l;->isAtLeastP()Z
@@ -604,7 +522,7 @@
     return-object v0
 .end method
 
-.method private static mw()Ljava/lang/reflect/Method;
+.method private static mu()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -637,10 +555,10 @@
     return-object v0
 .end method
 
-.method private static mx()Ljava/lang/reflect/Method;
+.method private static mv()Ljava/lang/reflect/Method;
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->ms()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->mq()Z
 
     move-result v0
 
@@ -683,7 +601,7 @@
     return-object v0
 .end method
 
-.method private static my()Ljava/lang/reflect/Method;
+.method private static mw()Ljava/lang/reflect/Method;
     .locals 3
 
     :try_start_0
@@ -710,7 +628,7 @@
     return-object v0
 .end method
 
-.method private static mz()Ljava/lang/reflect/Method;
+.method private static mx()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -742,3 +660,85 @@
     :goto_0
     return-object v0
 .end method
+
+.method private static my()Ljava/lang/reflect/Method;
+    .locals 5
+
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->mq()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    :try_start_0
+    const-class v0, Landroid/os/WorkSource;
+
+    const-string v1, "getName"
+
+    const/4 v2, 0x1
+
+    new-array v2, v2, [Ljava/lang/Class;
+
+    const/4 v3, 0x0
+
+    sget-object v4, Ljava/lang/Integer;->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;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return-object v0
+.end method
+
+.method private static final mz()Ljava/lang/reflect/Method;
+    .locals 3
+
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->isAtLeastP()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    :try_start_0
+    const-class v0, Landroid/os/WorkSource;
+
+    const-string v1, "createWorkChain"
+
+    const/4 v2, 0x0
+
+    new-array v2, v2, [Ljava/lang/Class;
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v0
+
+    const-string v1, "WorkSourceUtil"
+
+    const-string v2, "Missing WorkChain API createWorkChain"
+
+    invoke-static {v1, v2, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/q.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/q.smali
index ec1b13edd3..a874dcb30b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/q.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/q.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field private static akv:J
+.field private static akN:J
 
-.field private static akw:F
+.field private static akO:F
 
 .field private static final filter:Landroid/content/IntentFilter;
 
@@ -24,7 +24,7 @@
 
     const/high16 v0, 0x7fc00000    # Float.NaN
 
-    sput v0, Lcom/google/android/gms/common/util/q;->akw:F
+    sput v0, Lcom/google/android/gms/common/util/q;->akO:F
 
     return-void
 .end method
@@ -98,7 +98,7 @@
     return v0
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->mt()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->mr()Z
 
     move-result v0
 
@@ -142,7 +142,7 @@
 
     move-result-wide v1
 
-    sget-wide v3, Lcom/google/android/gms/common/util/q;->akv:J
+    sget-wide v3, Lcom/google/android/gms/common/util/q;->akN:J
 
     sub-long/2addr v1, v3
 
@@ -152,7 +152,7 @@
 
     if-gez v5, :cond_0
 
-    sget v1, Lcom/google/android/gms/common/util/q;->akw:F
+    sget v1, Lcom/google/android/gms/common/util/q;->akO:F
 
     invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z
 
@@ -160,7 +160,7 @@
 
     if-nez v1, :cond_0
 
-    sget p0, Lcom/google/android/gms/common/util/q;->akw:F
+    sget p0, Lcom/google/android/gms/common/util/q;->akO:F
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -204,16 +204,16 @@
 
     div-float/2addr v1, p0
 
-    sput v1, Lcom/google/android/gms/common/util/q;->akw:F
+    sput v1, Lcom/google/android/gms/common/util/q;->akO:F
 
     :cond_1
     invoke-static {}, Landroid/os/SystemClock;->elapsedRealtime()J
 
     move-result-wide v1
 
-    sput-wide v1, Lcom/google/android/gms/common/util/q;->akv:J
+    sput-wide v1, Lcom/google/android/gms/common/util/q;->akN:J
 
-    sget p0, Lcom/google/android/gms/common/util/q;->akw:F
+    sget p0, Lcom/google/android/gms/common/util/q;->akO:F
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/r.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/r.smali
index 0b4bbb82d3..e30e80f56a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/r.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/r.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static akx:Ljava/util/regex/Pattern;
+.field private static akP:Ljava/util/regex/Pattern;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/w.smali b/com.discord/smali_classes2/com/google/android/gms/common/w.smali
index 4cd614d851..7e4d8b0e93 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/w.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/w.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final akU:Ljava/util/concurrent/Callable;
+.field private final aln:Ljava/util/concurrent/Callable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/Callable<",
@@ -32,7 +32,7 @@
 
     invoke-direct {p0, v1, v0, v0}, Lcom/google/android/gms/common/v;-><init>(ZLjava/lang/String;Ljava/lang/Throwable;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/w;->akU:Ljava/util/concurrent/Callable;
+    iput-object p1, p0, Lcom/google/android/gms/common/w;->aln:Ljava/util/concurrent/Callable;
 
     return-void
 .end method
@@ -47,11 +47,11 @@
 
 
 # virtual methods
-.method final mG()Ljava/lang/String;
+.method final mE()Ljava/lang/String;
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/w;->akU:Ljava/util/concurrent/Callable;
+    iget-object v0, p0, Lcom/google/android/gms/common/w;->aln:Ljava/util/concurrent/Callable;
 
     invoke-interface {v0}, Ljava/util/concurrent/Callable;->call()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule$b$b.smali b/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule$b$b.smali
index aa08296184..341636c2dd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule$b$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule$b$b.smali
@@ -14,11 +14,11 @@
 
 
 # instance fields
-.field public alk:I
+.field public alD:I
 
-.field public alm:I
+.field public alE:I
 
-.field public aln:I
+.field public alF:I
 
 
 # direct methods
@@ -29,11 +29,11 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
-    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
-    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule$c.smali b/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule$c.smali
index 3ea9208712..4854f263cd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule$c.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field public alo:Landroid/database/Cursor;
+.field public alG:Landroid/database/Cursor;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule$d.smali b/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule$d.smali
index 7abe22617e..caa16691e6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule$d.smali
@@ -17,9 +17,9 @@
 
 
 # instance fields
-.field private final alp:I
+.field private final alH:I
 
-.field private final alq:I
+.field private final alI:I
 
 
 # direct methods
@@ -28,11 +28,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->alp:I
+    iput p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->alH:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->alq:I
+    iput p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->alI:I
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 .method public final j(Landroid/content/Context;Ljava/lang/String;)I
     .locals 0
 
-    iget p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->alp:I
+    iget p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->alH:I
 
     return p1
 .end method
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 c58cdfcf11..300300ee31 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
@@ -15,17 +15,21 @@
 
 
 # static fields
-.field private static akW:Ljava/lang/Boolean; = null
+.field public static final alA:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
-.field private static akX:Lcom/google/android/gms/dynamite/i; = null
+.field private static final alB:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
-.field private static akY:Lcom/google/android/gms/dynamite/k; = null
+.field private static alp:Ljava/lang/Boolean; = null
 
-.field private static akZ:Ljava/lang/String; = null
+.field private static alq:Lcom/google/android/gms/dynamite/i; = null
 
-.field private static ala:I = -0x1
+.field private static alr:Lcom/google/android/gms/dynamite/k; = null
 
-.field private static final alb:Ljava/lang/ThreadLocal;
+.field private static als:Ljava/lang/String; = null
+
+.field private static alt:I = -0x1
+
+.field private static final alu:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -35,23 +39,19 @@
     .end annotation
 .end field
 
-.field private static final alc:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
+.field private static final alv:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
 
-.field public static final ald:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+.field public static final alw:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
-.field public static final ale:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+.field public static final alx:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
-.field public static final alf:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+.field public static final aly:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
-.field public static final alg:Lcom/google/android/gms/dynamite/DynamiteModule$b;
-
-.field public static final alh:Lcom/google/android/gms/dynamite/DynamiteModule$b;
-
-.field private static final ali:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+.field public static final alz:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
 
 # instance fields
-.field public final alj:Landroid/content/Context;
+.field public final alC:Landroid/content/Context;
 
 
 # direct methods
@@ -62,49 +62,49 @@
 
     invoke-direct {v0}, Ljava/lang/ThreadLocal;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alb:Ljava/lang/ThreadLocal;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alu:Ljava/lang/ThreadLocal;
 
     new-instance v0, Lcom/google/android/gms/dynamite/a;
 
     invoke-direct {v0}, Lcom/google/android/gms/dynamite/a;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alc:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alv:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
 
     new-instance v0, Lcom/google/android/gms/dynamite/b;
 
     invoke-direct {v0}, Lcom/google/android/gms/dynamite/b;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->ald:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alw:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     new-instance v0, Lcom/google/android/gms/dynamite/c;
 
     invoke-direct {v0}, Lcom/google/android/gms/dynamite/c;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->ale:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alx:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     new-instance v0, Lcom/google/android/gms/dynamite/d;
 
     invoke-direct {v0}, Lcom/google/android/gms/dynamite/d;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alf:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->aly:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     new-instance v0, Lcom/google/android/gms/dynamite/e;
 
     invoke-direct {v0}, Lcom/google/android/gms/dynamite/e;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alg:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alz:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     new-instance v0, Lcom/google/android/gms/dynamite/f;
 
     invoke-direct {v0}, Lcom/google/android/gms/dynamite/f;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alh:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alA:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     new-instance v0, Lcom/google/android/gms/dynamite/g;
 
     invoke-direct {v0}, Lcom/google/android/gms/dynamite/g;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->ali:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->alB:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     return-void
 .end method
@@ -120,7 +120,7 @@
 
     check-cast p1, Landroid/content/Context;
 
-    iput-object p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->alj:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->alC:Landroid/content/Context;
 
     return-void
 .end method
@@ -136,7 +136,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
     :try_start_1
-    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->akW:Ljava/lang/Boolean;
+    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->alp:Ljava/lang/Boolean;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
@@ -245,11 +245,11 @@
 
     move-result v4
 
-    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->akZ:Ljava/lang/String;
+    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->als:Ljava/lang/String;
 
     if-eqz v5, :cond_4
 
-    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->akZ:Ljava/lang/String;
+    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->als:Ljava/lang/String;
 
     invoke-virtual {v5}, Ljava/lang/String;->isEmpty()Z
 
@@ -262,7 +262,7 @@
     :cond_3
     new-instance v5, Lcom/google/android/gms/dynamite/h;
 
-    sget-object v6, Lcom/google/android/gms/dynamite/DynamiteModule;->akZ:Ljava/lang/String;
+    sget-object v6, Lcom/google/android/gms/dynamite/DynamiteModule;->als:Ljava/lang/String;
 
     invoke-static {}, Ljava/lang/ClassLoader;->getSystemClassLoader()Ljava/lang/ClassLoader;
 
@@ -276,7 +276,7 @@
 
     sget-object v5, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sput-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->akW:Ljava/lang/Boolean;
+    sput-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->alp:Ljava/lang/Boolean;
     :try_end_6
     .catch Lcom/google/android/gms/dynamite/DynamiteModule$a; {:try_start_6 .. :try_end_6} :catch_1
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
@@ -389,7 +389,7 @@
     sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
     :goto_3
-    sput-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->akW:Ljava/lang/Boolean;
+    sput-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->alp:Ljava/lang/Boolean;
 
     :cond_5
     monitor-exit v0
@@ -497,7 +497,7 @@
 
     const-string v1, "DynamiteModule"
 
-    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->alb:Ljava/lang/ThreadLocal;
+    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->alu:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v2}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
 
@@ -511,20 +511,20 @@
 
     invoke-direct {v3, v4}, Lcom/google/android/gms/dynamite/DynamiteModule$c;-><init>(B)V
 
-    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->alb:Ljava/lang/ThreadLocal;
+    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->alu:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v5, v3}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
     :try_start_0
-    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->alc:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
+    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->alv:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
 
     invoke-interface {p1, p0, p2, v5}, Lcom/google/android/gms/dynamite/DynamiteModule$b;->a(Landroid/content/Context;Ljava/lang/String;Lcom/google/android/gms/dynamite/DynamiteModule$b$a;)Lcom/google/android/gms/dynamite/DynamiteModule$b$b;
 
     move-result-object v5
 
-    iget v6, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget v6, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
-    iget v7, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget v7, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -576,33 +576,33 @@
 
     invoke-static {v1, v0}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     if-eqz v0, :cond_9
 
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     const/4 v6, -0x1
 
     if-ne v0, v6, :cond_0
 
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     if-eqz v0, :cond_9
 
     :cond_0
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     const/4 v7, 0x1
 
     if-ne v0, v7, :cond_1
 
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     if-eqz v0, :cond_9
 
     :cond_1
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     if-ne v0, v6, :cond_3
 
@@ -612,16 +612,16 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alo:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alG:Landroid/database/Cursor;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alo:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alG:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_2
-    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->alb:Ljava/lang/ThreadLocal;
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->alu:Ljava/lang/ThreadLocal;
 
     invoke-virtual {p1, v2}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
@@ -629,14 +629,14 @@
 
     :cond_3
     :try_start_1
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     if-ne v0, v7, :cond_8
 
     :try_start_2
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     invoke-static {p0, p2, v0}, Lcom/google/android/gms/dynamite/DynamiteModule;->a(Landroid/content/Context;Ljava/lang/String;I)Lcom/google/android/gms/dynamite/DynamiteModule;
 
@@ -645,16 +645,16 @@
     .catch Lcom/google/android/gms/dynamite/DynamiteModule$a; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alo:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alG:Landroid/database/Cursor;
 
     if-eqz p1, :cond_4
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alo:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alG:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_4
-    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->alb:Ljava/lang/ThreadLocal;
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->alu:Ljava/lang/ThreadLocal;
 
     invoke-virtual {p1, v2}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
@@ -696,13 +696,13 @@
     :goto_0
     invoke-static {v1, v7}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget v1, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget v1, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     if-eqz v1, :cond_7
 
     new-instance v1, Lcom/google/android/gms/dynamite/DynamiteModule$d;
 
-    iget v5, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget v5, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     invoke-direct {v1, v5}, Lcom/google/android/gms/dynamite/DynamiteModule$d;-><init>(I)V
 
@@ -710,7 +710,7 @@
 
     move-result-object p1
 
-    iget p1, p1, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iget p1, p1, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     if-ne p1, v6, :cond_7
 
@@ -720,16 +720,16 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alo:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alG:Landroid/database/Cursor;
 
     if-eqz p1, :cond_6
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alo:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alG:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_6
-    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->alb:Ljava/lang/ThreadLocal;
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->alu:Ljava/lang/ThreadLocal;
 
     invoke-virtual {p1, v2}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
@@ -748,7 +748,7 @@
     :cond_8
     new-instance p0, Lcom/google/android/gms/dynamite/DynamiteModule$a;
 
-    iget p1, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iget p1, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     const/16 p2, 0x2f
 
@@ -773,9 +773,9 @@
     :cond_9
     new-instance p0, Lcom/google/android/gms/dynamite/DynamiteModule$a;
 
-    iget p1, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget p1, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
-    iget p2, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget p2, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     const/16 v0, 0x5b
 
@@ -812,16 +812,16 @@
     :catchall_0
     move-exception p0
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alo:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alG:Landroid/database/Cursor;
 
     if-eqz p1, :cond_a
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alo:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alG:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_a
-    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->alb:Ljava/lang/ThreadLocal;
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->alu:Ljava/lang/ThreadLocal;
 
     invoke-virtual {p1, v2}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
@@ -848,7 +848,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->akW:Ljava/lang/Boolean;
+    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->alp:Ljava/lang/Boolean;
 
     monitor-exit v1
     :try_end_1
@@ -910,7 +910,7 @@
 
     if-eqz v1, :cond_3
 
-    invoke-interface {v1}, Lcom/google/android/gms/dynamite/i;->mI()I
+    invoke-interface {v1}, Lcom/google/android/gms/dynamite/i;->mG()I
 
     move-result v2
 
@@ -1100,7 +1100,7 @@
     move-object p0, v1
 
     :goto_0
-    sput-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->akY:Lcom/google/android/gms/dynamite/k;
+    sput-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->alr:Lcom/google/android/gms/dynamite/k;
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_4
     .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_3
@@ -1151,18 +1151,18 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->akX:Lcom/google/android/gms/dynamite/i;
+    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->alq:Lcom/google/android/gms/dynamite/i;
 
     if-eqz v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->akX:Lcom/google/android/gms/dynamite/i;
+    sget-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->alq:Lcom/google/android/gms/dynamite/i;
 
     monitor-exit v0
 
     return-object p0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/common/c;->lb()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kZ()Lcom/google/android/gms/common/c;
 
     move-result-object v1
 
@@ -1239,7 +1239,7 @@
     :goto_0
     if-eqz p0, :cond_5
 
-    sput-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->akX:Lcom/google/android/gms/dynamite/i;
+    sput-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->alq:Lcom/google/android/gms/dynamite/i;
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -1316,7 +1316,7 @@
 
     :cond_0
     :try_start_0
-    invoke-interface {v1}, Lcom/google/android/gms/dynamite/i;->mI()I
+    invoke-interface {v1}, Lcom/google/android/gms/dynamite/i;->mG()I
 
     move-result v3
 
@@ -1435,7 +1435,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->akY:Lcom/google/android/gms/dynamite/k;
+    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->alr:Lcom/google/android/gms/dynamite/k;
 
     monitor-exit v0
     :try_end_0
@@ -1445,7 +1445,7 @@
 
     if-eqz v1, :cond_3
 
-    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->alb:Ljava/lang/ThreadLocal;
+    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->alu:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v2}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
 
@@ -1455,7 +1455,7 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v3, v2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alo:Landroid/database/Cursor;
+    iget-object v3, v2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alG:Landroid/database/Cursor;
 
     if-eqz v3, :cond_2
 
@@ -1463,13 +1463,13 @@
 
     move-result-object p0
 
-    iget-object v2, v2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alo:Landroid/database/Cursor;
+    iget-object v2, v2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alG:Landroid/database/Cursor;
 
     const/4 v3, 0x0
 
     invoke-static {v3}, Lcom/google/android/gms/a/b;->ab(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
-    invoke-static {}, Lcom/google/android/gms/dynamite/DynamiteModule;->mH()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/dynamite/DynamiteModule;->mF()Ljava/lang/Boolean;
 
     move-result-object v3
 
@@ -1682,7 +1682,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->akZ:Ljava/lang/String;
+    sput-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->als:Ljava/lang/String;
 
     const-string v2, "loaderVersion"
 
@@ -1696,7 +1696,7 @@
 
     move-result v2
 
-    sput v2, Lcom/google/android/gms/dynamite/DynamiteModule;->ala:I
+    sput v2, Lcom/google/android/gms/dynamite/DynamiteModule;->alt:I
 
     :cond_1
     monitor-exit p2
@@ -1704,7 +1704,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->alb:Ljava/lang/ThreadLocal;
+    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->alu:Ljava/lang/ThreadLocal;
 
     invoke-virtual {p2}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
 
@@ -1714,11 +1714,11 @@
 
     if-eqz p2, :cond_2
 
-    iget-object v2, p2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alo:Landroid/database/Cursor;
+    iget-object v2, p2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alG:Landroid/database/Cursor;
 
     if-nez v2, :cond_2
 
-    iput-object p0, p2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alo:Landroid/database/Cursor;
+    iput-object p0, p2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->alG:Landroid/database/Cursor;
     :try_end_3
     .catch Ljava/lang/Exception; {:try_start_3 .. :try_end_3} :catch_0
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
@@ -2085,7 +2085,7 @@
     return-object p1
 .end method
 
-.method private static mH()Ljava/lang/Boolean;
+.method private static mF()Ljava/lang/Boolean;
     .locals 3
 
     const-class v0, Lcom/google/android/gms/dynamite/DynamiteModule;
@@ -2093,7 +2093,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget v1, Lcom/google/android/gms/dynamite/DynamiteModule;->ala:I
+    sget v1, Lcom/google/android/gms/dynamite/DynamiteModule;->alt:I
 
     const/4 v2, 0x2
 
@@ -2127,7 +2127,7 @@
 
 
 # virtual methods
-.method public final bf(Ljava/lang/String;)Landroid/os/IBinder;
+.method public final ba(Ljava/lang/String;)Landroid/os/IBinder;
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2136,7 +2136,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->alj:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->alC:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getClassLoader()Ljava/lang/ClassLoader;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/dynamite/b.smali b/com.discord/smali_classes2/com/google/android/gms/dynamite/b.smali
index 81efa26563..fdaab54170 100644
--- a/com.discord/smali_classes2/com/google/android/gms/dynamite/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/dynamite/b.smali
@@ -34,13 +34,13 @@
 
     move-result v2
 
-    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
-    iget v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     if-eqz v2, :cond_0
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     goto :goto_0
 
@@ -49,15 +49,15 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     if-eqz p1, :cond_1
 
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     :cond_1
     :goto_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/dynamite/c.smali b/com.discord/smali_classes2/com/google/android/gms/dynamite/c.smali
index 06d3ac5a2b..a85ba5aa50 100644
--- a/com.discord/smali_classes2/com/google/android/gms/dynamite/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/dynamite/c.smali
@@ -32,15 +32,15 @@
 
     move-result v1
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
-    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     if-eqz v1, :cond_0
 
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     goto :goto_0
 
@@ -51,13 +51,13 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     if-eqz p1, :cond_1
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     :cond_1
     :goto_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/dynamite/d.smali b/com.discord/smali_classes2/com/google/android/gms/dynamite/d.smali
index a50c8df573..626d64c1e3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/dynamite/d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/dynamite/d.smali
@@ -32,7 +32,7 @@
 
     move-result v1
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     const/4 v1, 0x1
 
@@ -40,37 +40,37 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     if-nez p1, :cond_0
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     if-nez p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     goto :goto_0
 
     :cond_0
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
-    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     if-lt p1, p2, :cond_1
 
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     goto :goto_0
 
     :cond_1
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     :goto_0
     return-object v0
diff --git a/com.discord/smali_classes2/com/google/android/gms/dynamite/e.smali b/com.discord/smali_classes2/com/google/android/gms/dynamite/e.smali
index 4c4cd24af1..0ec8430e20 100644
--- a/com.discord/smali_classes2/com/google/android/gms/dynamite/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/dynamite/e.smali
@@ -32,9 +32,9 @@
 
     move-result v1
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
-    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     const/4 v2, 0x0
 
@@ -46,7 +46,7 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     goto :goto_0
 
@@ -55,36 +55,36 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     :goto_0
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     if-nez p1, :cond_1
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     if-nez p1, :cond_1
 
-    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     goto :goto_1
 
     :cond_1
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
-    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     if-lt p1, p2, :cond_2
 
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     goto :goto_1
 
     :cond_2
-    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     :goto_1
     return-object v0
diff --git a/com.discord/smali_classes2/com/google/android/gms/dynamite/f.smali b/com.discord/smali_classes2/com/google/android/gms/dynamite/f.smali
index a397097427..c2d60491c0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/dynamite/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/dynamite/f.smali
@@ -32,7 +32,7 @@
 
     move-result v1
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     const/4 v1, 0x1
 
@@ -40,37 +40,37 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     if-nez p1, :cond_0
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     if-nez p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     goto :goto_0
 
     :cond_0
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
-    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     if-lt p1, p2, :cond_1
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     goto :goto_0
 
     :cond_1
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     :goto_0
     return-object v0
diff --git a/com.discord/smali_classes2/com/google/android/gms/dynamite/g.smali b/com.discord/smali_classes2/com/google/android/gms/dynamite/g.smali
index bec5c409ea..5a130101c4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/dynamite/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/dynamite/g.smali
@@ -32,9 +32,9 @@
 
     move-result v1
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
-    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     const/4 v2, 0x0
 
@@ -46,7 +46,7 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     goto :goto_0
 
@@ -55,36 +55,36 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     :goto_0
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     if-nez p1, :cond_1
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
     if-nez p1, :cond_1
 
-    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     goto :goto_1
 
     :cond_1
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alm:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alE:I
 
-    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alk:I
+    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alD:I
 
     if-lt p1, p2, :cond_2
 
-    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     goto :goto_1
 
     :cond_2
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->aln:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->alF:I
 
     :goto_1
     return-object v0
diff --git a/com.discord/smali_classes2/com/google/android/gms/dynamite/i.smali b/com.discord/smali_classes2/com/google/android/gms/dynamite/i.smali
index d899b6447a..65846ea1d3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/dynamite/i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/dynamite/i.smali
@@ -38,7 +38,7 @@
     .end annotation
 .end method
 
-.method public abstract mI()I
+.method public abstract mG()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
diff --git a/com.discord/smali_classes2/com/google/android/gms/dynamite/j.smali b/com.discord/smali_classes2/com/google/android/gms/dynamite/j.smali
index 5e4646588f..83bfb6c754 100644
--- a/com.discord/smali_classes2/com/google/android/gms/dynamite/j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/dynamite/j.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -96,7 +96,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -129,7 +129,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -158,7 +158,7 @@
     return-object p2
 .end method
 
-.method public final mI()I
+.method public final mG()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -166,7 +166,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/dynamite/l.smali b/com.discord/smali_classes2/com/google/android/gms/dynamite/l.smali
index 317e34fae5..a1a0885877 100644
--- a/com.discord/smali_classes2/com/google/android/gms/dynamite/l.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/dynamite/l.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -65,7 +65,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->mK()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/a/a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/a/a.smali
index 6ea0340cc2..9a8915194b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/a/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/a/a.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field private final ait:Landroid/os/IBinder;
+.field private final aiL:Landroid/os/IBinder;
 
-.field private final alr:Ljava/lang/String;
+.field private final alJ:Ljava/lang/String;
 
 
 # direct methods
@@ -17,9 +17,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/a/a;->ait:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/a/a;->aiL:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/a/a;->alr:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/a/a;->alJ:Ljava/lang/String;
 
     return-void
 .end method
@@ -39,7 +39,7 @@
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/a/a;->ait:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/a/a;->aiL:Landroid/os/IBinder;
 
     const/4 v2, 0x0
 
@@ -78,19 +78,19 @@
 .method public asBinder()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/a/a;->ait:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/a/a;->aiL:Landroid/os/IBinder;
 
     return-object v0
 .end method
 
-.method protected final mJ()Landroid/os/Parcel;
+.method protected final mH()Landroid/os/Parcel;
     .locals 2
 
     invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/a/a;->alr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/a/a;->alJ:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/a/b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/a/b.smali
index f79f098bc6..ecee9b1ee2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/a/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/a/b.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static als:Lcom/google/android/gms/internal/a/d;
+.field private static alK:Lcom/google/android/gms/internal/a/d;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/a/c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/a/c.smali
index bd85896686..9cf76d5c8b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/a/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/a/c.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final alt:Ljava/lang/ClassLoader;
+.field private static final alL:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/a/c;->alt:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/a/c;->alL:Ljava/lang/ClassLoader;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/a/e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/a/e.smali
index 765ec67771..74527f04a1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/a/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/a/e.smali
@@ -14,7 +14,7 @@
     .end annotation
 .end method
 
-.method public abstract mK()Z
+.method public abstract mI()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -22,7 +22,7 @@
     .end annotation
 .end method
 
-.method public abstract mL()Z
+.method public abstract mJ()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/a/g.smali b/com.discord/smali_classes2/com/google/android/gms/internal/a/g.smali
index 41cf0b626d..5a857eb1fc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/a/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/a/g.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -45,7 +45,7 @@
     return-object v1
 .end method
 
-.method public final mK()Z
+.method public final mI()Z
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -53,7 +53,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -74,7 +74,7 @@
     return v1
 .end method
 
-.method public final mL()Z
+.method public final mJ()Z
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -82,7 +82,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/b/a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/b/a.smali
index 67f0907b03..fde4f5a07b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/b/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/b/a.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field protected final alu:Landroid/os/IBinder;
+.field protected final alM:Landroid/os/IBinder;
 
-.field protected final alv:Ljava/lang/String;
+.field protected final alN:Ljava/lang/String;
 
 
 # direct methods
@@ -17,9 +17,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/b/a;->alu:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/b/a;->alM:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/b/a;->alv:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/b/a;->alN:Ljava/lang/String;
 
     return-void
 .end method
@@ -29,7 +29,7 @@
 .method public asBinder()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/b/a;->alu:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/b/a;->alM:Landroid/os/IBinder;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/b/b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/b/b.smali
index fdfb3bf5fb..f9fc56de50 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/b/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/b/b.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static alw:Lcom/google/android/gms/internal/b/d;
+.field private static alO:Lcom/google/android/gms/internal/b/d;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/b/c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/b/c.smali
index 9e0933ef16..0637e503f3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/b/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/b/c.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final alx:Ljava/lang/ClassLoader;
+.field private static final alP:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/b/c;->alx:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/b/c;->alP:Ljava/lang/ClassLoader;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/b/e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/b/e.smali
index acf91c6a2f..5f92ca36f3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/b/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/b/e.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static volatile aly:Lcom/google/android/gms/internal/b/f;
+.field private static volatile alQ:Lcom/google/android/gms/internal/b/f;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/c/a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/c/a.smali
index 64e1cde801..538404ebf0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/c/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/c/a.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field private final ait:Landroid/os/IBinder;
+.field private final aiL:Landroid/os/IBinder;
 
-.field private final alr:Ljava/lang/String;
+.field private final alJ:Ljava/lang/String;
 
 
 # direct methods
@@ -17,9 +17,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/c/a;->ait:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/c/a;->aiL:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/c/a;->alr:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/c/a;->alJ:Ljava/lang/String;
 
     return-void
 .end method
@@ -29,7 +29,7 @@
 .method public asBinder()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/c/a;->ait:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/c/a;->aiL:Landroid/os/IBinder;
 
     return-object v0
 .end method
@@ -47,7 +47,7 @@
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/c/a;->ait:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/c/a;->aiL:Landroid/os/IBinder;
 
     const/4 v2, 0x0
 
@@ -96,7 +96,7 @@
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/c/a;->ait:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/c/a;->aiL:Landroid/os/IBinder;
 
     const/4 v2, 0x0
 
@@ -122,14 +122,14 @@
     throw p1
 .end method
 
-.method protected final mM()Landroid/os/Parcel;
+.method protected final mK()Landroid/os/Parcel;
     .locals 2
 
     invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/c/a;->alr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/c/a;->alJ:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/c/b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/c/b.smali
index f9aa151245..01299c7fd5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/c/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/c/b.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static alz:Lcom/google/android/gms/internal/c/d;
+.field private static alR:Lcom/google/android/gms/internal/c/d;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/c/c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/c/c.smali
index 730eab8c26..b3f4def6bb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/c/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/c/c.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final alt:Ljava/lang/ClassLoader;
+.field private static final alL:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/c/c;->alt:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/c/c;->alL:Ljava/lang/ClassLoader;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/c/e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/c/e.smali
index 5926501302..a5be34d567 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/c/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/c/e.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static volatile alA:Lcom/google/android/gms/internal/c/f;
+.field private static volatile alS:Lcom/google/android/gms/internal/c/f;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/d/a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/d/a.smali
index 7a0936cb7a..f4b9843221 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/d/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/d/a.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static alB:Lcom/google/android/gms/internal/d/c;
+.field private static alT:Lcom/google/android/gms/internal/d/c;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/d/b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/d/b.smali
index aa8e914e1d..0b024d81a7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/d/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/d/b.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field protected final alC:Landroid/os/IBinder;
+.field protected final alU:Landroid/os/IBinder;
 
-.field protected final alD:Ljava/lang/String;
+.field protected final alV:Ljava/lang/String;
 
 
 # direct methods
@@ -17,9 +17,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/d/b;->alC:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/d/b;->alU:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/d/b;->alD:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/d/b;->alV:Ljava/lang/String;
 
     return-void
 .end method
@@ -29,7 +29,7 @@
 .method public asBinder()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/d/b;->alC:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/d/b;->alU:Landroid/os/IBinder;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/d/d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/d/d.smali
index 1764992719..34bbb009bc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/d/d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/d/d.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final alt:Ljava/lang/ClassLoader;
+.field private static final alL:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/d/d;->alt:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/d/d;->alL:Ljava/lang/ClassLoader;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/e/a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/e/a.smali
index dc94ee093f..679f850878 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/e/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/e/a.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final alE:Lcom/google/android/gms/internal/e/b;
+.field private static final alW:Lcom/google/android/gms/internal/e/b;
 
-.field private static volatile alF:Lcom/google/android/gms/internal/e/b;
+.field private static volatile alX:Lcom/google/android/gms/internal/e/b;
 
 
 # direct methods
@@ -19,17 +19,17 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/e/c;-><init>(B)V
 
-    sput-object v0, Lcom/google/android/gms/internal/e/a;->alE:Lcom/google/android/gms/internal/e/b;
+    sput-object v0, Lcom/google/android/gms/internal/e/a;->alW:Lcom/google/android/gms/internal/e/b;
 
-    sput-object v0, Lcom/google/android/gms/internal/e/a;->alF:Lcom/google/android/gms/internal/e/b;
+    sput-object v0, Lcom/google/android/gms/internal/e/a;->alX:Lcom/google/android/gms/internal/e/b;
 
     return-void
 .end method
 
-.method public static mN()Lcom/google/android/gms/internal/e/b;
+.method public static mL()Lcom/google/android/gms/internal/e/b;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/e/a;->alF:Lcom/google/android/gms/internal/e/b;
+    sget-object v0, Lcom/google/android/gms/internal/e/a;->alX:Lcom/google/android/gms/internal/e/b;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/e/d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/e/d.smali
index be69dddc40..5d94abceec 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/e/d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/e/d.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static volatile alG:Lcom/google/android/gms/internal/e/g;
+.field private static volatile alY:Lcom/google/android/gms/internal/e/g;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/e/e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/e/e.smali
index d0ebc3ac81..c4e4a615c2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/e/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/e/e.smali
@@ -12,9 +12,9 @@
 
 
 # static fields
-.field private static final enum alH:I = 0x1
+.field private static final enum alZ:I = 0x1
 
-.field private static final synthetic alI:[I
+.field private static final synthetic ama:[I
 
 .field public static final enum zza:I = 0x2
 
@@ -29,7 +29,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/google/android/gms/internal/e/e;->alI:[I
+    sput-object v0, Lcom/google/android/gms/internal/e/e;->ama:[I
 
     return-void
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/e/i.smali b/com.discord/smali_classes2/com/google/android/gms/internal/e/i.smali
index 1659ddcbbe..adb29c304a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/e/i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/e/i.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final alJ:Ljava/io/OutputStream;
+.field private static final amb:Ljava/io/OutputStream;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/e/h;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/e/i;->alJ:Ljava/io/OutputStream;
+    sput-object v0, Lcom/google/android/gms/internal/e/i;->amb:Ljava/io/OutputStream;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/e/k.smali b/com.discord/smali_classes2/com/google/android/gms/internal/e/k.smali
index 7fc8c58f70..745a8a8d1e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/e/k.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/e/k.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private alL:J
+.field private amd:J
 
-.field private alM:J
+.field private ame:J
 
 
 # direct methods
@@ -17,13 +17,13 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->alM:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->ame:J
 
     invoke-static {p1}, Lcom/google/android/gms/internal/e/f;->ac(Ljava/lang/Object;)Ljava/lang/Object;
 
     const-wide/32 v0, 0x100000
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->alL:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->amd:J
 
     return-void
 .end method
@@ -46,7 +46,7 @@
 
     int-to-long v0, v0
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/e/k;->alL:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/e/k;->amd:J
 
     invoke-static {v0, v1, v2, v3}, Ljava/lang/Math;->min(JJ)J
 
@@ -67,9 +67,9 @@
 
     invoke-virtual {v0, p1}, Ljava/io/InputStream;->mark(I)V
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->alL:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->amd:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->alM:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->ame:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -93,7 +93,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->alL:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->amd:J
 
     const/4 v2, -0x1
 
@@ -114,13 +114,13 @@
 
     if-eq v0, v2, :cond_1
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/e/k;->alL:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/e/k;->amd:J
 
     const-wide/16 v3, 0x1
 
     sub-long/2addr v1, v3
 
-    iput-wide v1, p0, Lcom/google/android/gms/internal/e/k;->alL:J
+    iput-wide v1, p0, Lcom/google/android/gms/internal/e/k;->amd:J
 
     :cond_1
     return v0
@@ -134,7 +134,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->alL:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->amd:J
 
     const/4 v2, -0x1
 
@@ -163,13 +163,13 @@
 
     if-eq p1, v2, :cond_1
 
-    iget-wide p2, p0, Lcom/google/android/gms/internal/e/k;->alL:J
+    iget-wide p2, p0, Lcom/google/android/gms/internal/e/k;->amd:J
 
     int-to-long v0, p1
 
     sub-long/2addr p2, v0
 
-    iput-wide p2, p0, Lcom/google/android/gms/internal/e/k;->alL:J
+    iput-wide p2, p0, Lcom/google/android/gms/internal/e/k;->amd:J
 
     :cond_1
     return p1
@@ -194,7 +194,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->alM:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->ame:J
 
     const-wide/16 v2, -0x1
 
@@ -206,9 +206,9 @@
 
     invoke-virtual {v0}, Ljava/io/InputStream;->reset()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->alM:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->ame:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->alL:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->amd:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -253,7 +253,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->alL:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->amd:J
 
     invoke-static {p1, p2, v0, v1}, Ljava/lang/Math;->min(JJ)J
 
@@ -265,11 +265,11 @@
 
     move-result-wide p1
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->alL:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->amd:J
 
     sub-long/2addr v0, p1
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->alL:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->amd:J
 
     return-wide p1
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/e/l.smali b/com.discord/smali_classes2/com/google/android/gms/internal/e/l.smali
index 7b64649d09..28c097cdd3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/e/l.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/e/l.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final alN:[Ljava/lang/Throwable;
+.field private static final amf:[Ljava/lang/Throwable;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     new-array v0, v0, [Ljava/lang/Throwable;
 
-    sput-object v0, Lcom/google/android/gms/internal/e/l;->alN:[Ljava/lang/Throwable;
+    sput-object v0, Lcom/google/android/gms/internal/e/l;->amf:[Ljava/lang/Throwable;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/e/m.smali b/com.discord/smali_classes2/com/google/android/gms/internal/e/m.smali
index 4bdfcefeb8..d3065b0e0c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/e/m.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/e/m.smali
@@ -12,9 +12,9 @@
 
 
 # static fields
-.field private static final alH:I
+.field private static final alZ:I
 
-.field private static final alO:Lcom/google/android/gms/internal/e/l;
+.field private static final amg:Lcom/google/android/gms/internal/e/l;
 
 
 # direct methods
@@ -24,7 +24,7 @@
     const/4 v0, 0x1
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/e/m;->mO()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/internal/e/m;->mM()Ljava/lang/Integer;
 
     move-result-object v1
     :try_end_0
@@ -131,7 +131,7 @@
     invoke-direct {v2}, Lcom/google/android/gms/internal/e/m$a;-><init>()V
 
     :goto_1
-    sput-object v2, Lcom/google/android/gms/internal/e/m;->alO:Lcom/google/android/gms/internal/e/l;
+    sput-object v2, Lcom/google/android/gms/internal/e/m;->amg:Lcom/google/android/gms/internal/e/l;
 
     if-nez v1, :cond_2
 
@@ -143,7 +143,7 @@
     move-result v0
 
     :goto_2
-    sput v0, Lcom/google/android/gms/internal/e/m;->alH:I
+    sput v0, Lcom/google/android/gms/internal/e/m;->alZ:I
 
     return-void
 .end method
@@ -151,14 +151,14 @@
 .method public static a(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/e/m;->alO:Lcom/google/android/gms/internal/e/l;
+    sget-object v0, Lcom/google/android/gms/internal/e/m;->amg:Lcom/google/android/gms/internal/e/l;
 
     invoke-virtual {v0, p0, p1}, Lcom/google/android/gms/internal/e/l;->a(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
 
     return-void
 .end method
 
-.method private static mO()Ljava/lang/Integer;
+.method private static mM()Ljava/lang/Integer;
     .locals 4
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/e/o.smali b/com.discord/smali_classes2/com/google/android/gms/internal/e/o.smali
index 25209137a3..e9338afc51 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/e/o.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/e/o.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final alP:Ljava/util/concurrent/ConcurrentHashMap;
+.field private final amh:Ljava/util/concurrent/ConcurrentHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentHashMap<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private final alQ:Ljava/lang/ref/ReferenceQueue;
+.field private final ami:Ljava/lang/ref/ReferenceQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/ReferenceQueue<",
@@ -43,13 +43,13 @@
 
     invoke-direct {v0, v1, v2, v3}, Ljava/util/concurrent/ConcurrentHashMap;-><init>(IFI)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/e/o;->alP:Ljava/util/concurrent/ConcurrentHashMap;
+    iput-object v0, p0, Lcom/google/android/gms/internal/e/o;->amh:Ljava/util/concurrent/ConcurrentHashMap;
 
     new-instance v0, Ljava/lang/ref/ReferenceQueue;
 
     invoke-direct {v0}, Ljava/lang/ref/ReferenceQueue;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/e/o;->alQ:Ljava/lang/ref/ReferenceQueue;
+    iput-object v0, p0, Lcom/google/android/gms/internal/e/o;->ami:Ljava/lang/ref/ReferenceQueue;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/e/o;->alQ:Ljava/lang/ref/ReferenceQueue;
+    iget-object v0, p0, Lcom/google/android/gms/internal/e/o;->ami:Ljava/lang/ref/ReferenceQueue;
 
     invoke-virtual {v0}, Ljava/lang/ref/ReferenceQueue;->poll()Ljava/lang/ref/Reference;
 
@@ -78,11 +78,11 @@
     :goto_0
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/e/o;->alP:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/e/o;->amh:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v1, v0}, Ljava/util/concurrent/ConcurrentHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/e/o;->alQ:Ljava/lang/ref/ReferenceQueue;
+    iget-object v0, p0, Lcom/google/android/gms/internal/e/o;->ami:Ljava/lang/ref/ReferenceQueue;
 
     invoke-virtual {v0}, Ljava/lang/ref/ReferenceQueue;->poll()Ljava/lang/ref/Reference;
 
@@ -97,7 +97,7 @@
 
     invoke-direct {v0, p1, v1}, Lcom/google/android/gms/internal/e/n;-><init>(Ljava/lang/Throwable;Ljava/lang/ref/ReferenceQueue;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/e/o;->alP:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/e/o;->amh:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v1, v0}, Ljava/util/concurrent/ConcurrentHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -116,11 +116,11 @@
 
     invoke-direct {v0, v1}, Ljava/util/Vector;-><init>(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/e/o;->alP:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/e/o;->amh:Ljava/util/concurrent/ConcurrentHashMap;
 
     new-instance v2, Lcom/google/android/gms/internal/e/n;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/e/o;->alQ:Ljava/lang/ref/ReferenceQueue;
+    iget-object v3, p0, Lcom/google/android/gms/internal/e/o;->ami:Ljava/lang/ref/ReferenceQueue;
 
     invoke-direct {v2, p1, v3}, Lcom/google/android/gms/internal/e/n;-><init>(Ljava/lang/Throwable;Ljava/lang/ref/ReferenceQueue;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/e/p.smali b/com.discord/smali_classes2/com/google/android/gms/internal/e/p.smali
index ea4b2ceac9..05eceef468 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/e/p.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/e/p.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final alR:Lcom/google/android/gms/internal/e/o;
+.field private final amj:Lcom/google/android/gms/internal/e/o;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/e/o;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/e/p;->alR:Lcom/google/android/gms/internal/e/o;
+    iput-object v0, p0, Lcom/google/android/gms/internal/e/p;->amj:Lcom/google/android/gms/internal/e/o;
 
     return-void
 .end method
@@ -31,7 +31,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/e/p;->alR:Lcom/google/android/gms/internal/e/o;
+    iget-object v0, p0, Lcom/google/android/gms/internal/e/p;->amj:Lcom/google/android/gms/internal/e/o;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/e/o;->k(Ljava/lang/Throwable;)Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/f/a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/a.smali
index 9455c84ca6..f269249b4d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/a.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field final ait:Landroid/os/IBinder;
+.field final aiL:Landroid/os/IBinder;
 
-.field final alr:Ljava/lang/String;
+.field final alJ:Ljava/lang/String;
 
 
 # direct methods
@@ -17,9 +17,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/f/a;->ait:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/a;->aiL:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/f/a;->alr:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/f/a;->alJ:Ljava/lang/String;
 
     return-void
 .end method
@@ -29,7 +29,7 @@
 .method public asBinder()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/f/a;->ait:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/a;->aiL:Landroid/os/IBinder;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/f/b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/b.smali
index 700e256422..a8d1d12f36 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/b.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static aCP:Lcom/google/android/gms/internal/f/d;
+.field private static aDh:Lcom/google/android/gms/internal/f/d;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/f/c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/c.smali
index 222b488886..8272fc68b3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/c.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final alt:Ljava/lang/ClassLoader;
+.field private static final alL:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/f/c;->alt:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/f/c;->alL:Ljava/lang/ClassLoader;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/f/e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/e.smali
index ea2197b71c..6aaf6fed53 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/e.smali
@@ -23,6 +23,31 @@
     throw p1
 .end method
 
+.method public final vl()V
+    .locals 1
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public final vm()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
 .method public final vn()V
     .locals 1
 
@@ -35,11 +60,6 @@
 
 .method public final vo()V
     .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
 
@@ -87,23 +107,3 @@
 
     throw v0
 .end method
-
-.method public final vt()V
-    .locals 1
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public final vu()V
-    .locals 1
-
-    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/com/google/android/gms/internal/f/f.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/f.smali
index 940ca26b8f..ca3aec8130 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/f.smali
@@ -20,7 +20,7 @@
 .method public constructor <init>(Lcom/google/android/gms/common/api/f;)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/safetynet/a;->aOn:Lcom/google/android/gms/common/api/a;
+    sget-object v0, Lcom/google/android/gms/safetynet/a;->aOF:Lcom/google/android/gms/common/api/a;
 
     invoke-direct {p0, v0, p1}, Lcom/google/android/gms/common/api/internal/c$a;-><init>(Lcom/google/android/gms/common/api/a;Lcom/google/android/gms/common/api/f;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/f/g.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/g.smali
index 8592164974..ace960ab96 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/g.smali
@@ -14,6 +14,22 @@
     .end annotation
 .end method
 
+.method public abstract vl()V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract vm()V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
 .method public abstract vn()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -61,19 +77,3 @@
         }
     .end annotation
 .end method
-
-.method public abstract vt()V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract vu()V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/f/h.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/h.smali
index d8d8af0769..f6201e4ce5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/h.smali
@@ -71,7 +71,7 @@
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/f/c;->b(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vt()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vr()V
 
     goto :goto_0
 
@@ -82,7 +82,7 @@
 
     invoke-static {p2}, Lcom/google/android/gms/internal/f/c;->b(Landroid/os/Parcel;)Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vs()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vq()V
 
     goto :goto_0
 
@@ -95,7 +95,7 @@
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/f/c;->b(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vu()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vs()V
 
     goto :goto_0
 
@@ -108,7 +108,7 @@
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/f/c;->b(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vr()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vp()V
 
     goto :goto_0
 
@@ -140,7 +140,7 @@
 
     invoke-static {p2}, Lcom/google/android/gms/internal/f/c;->b(Landroid/os/Parcel;)Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vo()V
 
     goto :goto_0
 
@@ -153,14 +153,14 @@
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/f/c;->b(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vp()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vn()V
 
     goto :goto_0
 
     :cond_7
     invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vo()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vm()V
 
     goto :goto_0
 
@@ -173,7 +173,7 @@
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/f/c;->b(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->vl()V
 
     :goto_0
     return v0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/f/j.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/j.smali
index 66a45f56cd..a61c621e3c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/j.smali
@@ -30,7 +30,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/f/a;->alr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/f/a;->alJ:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
@@ -43,7 +43,7 @@
     move-result-object p1
 
     :try_start_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/f/a;->ait:Landroid/os/IBinder;
+    iget-object p2, p0, Lcom/google/android/gms/internal/f/a;->aiL:Landroid/os/IBinder;
 
     const/4 v1, 0x6
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/f/k$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/k$a.smali
index 20ec540fda..a90142d1a4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/k$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/k$a.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field protected aCQ:Lcom/google/android/gms/internal/f/g;
+.field protected aDi:Lcom/google/android/gms/internal/f/g;
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/internal/f/m;-><init>(Lcom/google/android/gms/internal/f/k$a;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/f/k$a;->aCQ:Lcom/google/android/gms/internal/f/g;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/k$a;->aDi:Lcom/google/android/gms/internal/f/g;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/f/k$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/k$b.smali
index 14694e2a46..efb26a96a3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/k$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/k$b.smali
@@ -17,9 +17,9 @@
 
 
 # instance fields
-.field private final aCR:Lcom/google/android/gms/common/api/Status;
+.field private final aDj:Lcom/google/android/gms/common/api/Status;
 
-.field private final aCS:Lcom/google/android/gms/safetynet/zzf;
+.field private final aDk:Lcom/google/android/gms/safetynet/zzf;
 
 
 # direct methods
@@ -28,27 +28,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/f/k$b;->aCR:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/k$b;->aDj:Lcom/google/android/gms/common/api/Status;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/f/k$b;->aCS:Lcom/google/android/gms/safetynet/zzf;
+    iput-object p2, p0, Lcom/google/android/gms/internal/f/k$b;->aDk:Lcom/google/android/gms/safetynet/zzf;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final ls()Lcom/google/android/gms/common/api/Status;
+.method public final lq()Lcom/google/android/gms/common/api/Status;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->aCR:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->aDj:Lcom/google/android/gms/common/api/Status;
 
     return-object v0
 .end method
 
-.method public final vv()Ljava/lang/String;
+.method public final vt()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->aCS:Lcom/google/android/gms/safetynet/zzf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->aDk:Lcom/google/android/gms/safetynet/zzf;
 
     if-nez v0, :cond_0
 
@@ -57,7 +57,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/gms/safetynet/zzf;->adp:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/safetynet/zzf;->adH:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/f/l.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/l.smali
index fe230aa184..bc5175666d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/l.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/l.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic aCT:Ljava/lang/String;
+.field private final synthetic aDl:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/f;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/f/l;->aCT:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/f/l;->aDl:Ljava/lang/String;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/f/k$a;-><init>(Lcom/google/android/gms/common/api/f;)V
 
@@ -29,11 +29,11 @@
 
     check-cast p1, Lcom/google/android/gms/internal/f/n;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/f/l;->aCQ:Lcom/google/android/gms/internal/f/g;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/l;->aDi:Lcom/google/android/gms/internal/f/g;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/f/l;->aCT:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/f/l;->aDl:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/f/n;->lY()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/f/n;->lW()Landroid/os/IInterface;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/f/m.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/m.smali
index baebd29203..42ba38334a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/m.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/m.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic aCU:Lcom/google/android/gms/internal/f/k$a;
+.field private final synthetic aDm:Lcom/google/android/gms/internal/f/k$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/f/k$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/f/m;->aCU:Lcom/google/android/gms/internal/f/k$a;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/m;->aDm:Lcom/google/android/gms/internal/f/k$a;
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/f/e;-><init>()V
 
@@ -22,7 +22,7 @@
 .method public final a(Lcom/google/android/gms/common/api/Status;Lcom/google/android/gms/safetynet/zzf;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/f/m;->aCU:Lcom/google/android/gms/internal/f/k$a;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/m;->aDm:Lcom/google/android/gms/internal/f/k$a;
 
     new-instance v1, Lcom/google/android/gms/internal/f/k$b;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/f/n.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/n.smali
index 65880bfdfa..58af352a97 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/n.smali
@@ -13,7 +13,7 @@
 
 
 # instance fields
-.field private final aCV:Landroid/content/Context;
+.field private final aDn:Landroid/content/Context;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct/range {v0 .. v6}, Lcom/google/android/gms/common/internal/g;-><init>(Landroid/content/Context;Landroid/os/Looper;ILcom/google/android/gms/common/internal/d;Lcom/google/android/gms/common/api/f$a;Lcom/google/android/gms/common/api/f$b;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/f/n;->aCV:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/n;->aDn:Landroid/content/Context;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
     return-object v0
 .end method
 
-.method public final lh()I
+.method public final lf()I
     .locals 1
 
     const v0, 0xba2840
@@ -83,7 +83,7 @@
     return v0
 .end method
 
-.method public final lj()Ljava/lang/String;
+.method public final lh()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.safetynet.service.START"
@@ -91,7 +91,7 @@
     return-object v0
 .end method
 
-.method public final lk()Ljava/lang/String;
+.method public final li()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.safetynet.internal.ISafetyNetService"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/a.smali
index a7ed843bf9..3f5f717d52 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/a.smali
@@ -13,19 +13,19 @@
 
 
 # instance fields
-.field public alS:Ljava/lang/String;
+.field public amk:Ljava/lang/String;
 
-.field public alT:I
+.field public aml:I
 
-.field private alU:I
+.field private amm:I
 
-.field private alV:Ljava/lang/String;
+.field private amn:Ljava/lang/String;
 
-.field public alW:Ljava/lang/String;
+.field public amo:Ljava/lang/String;
 
-.field private alX:Z
+.field private amp:Z
 
-.field private alY:Z
+.field private amq:Z
 
 
 # direct methods
@@ -95,11 +95,11 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->bh(I)I
 
-    iput p1, p0, Lcom/google/android/gms/internal/gtm/a;->alT:I
+    iput p1, p0, Lcom/google/android/gms/internal/gtm/a;->aml:I
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/gtm/a;->alY:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/gtm/a;->amq:Z
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/gtm/a;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->alS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->amk:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -119,26 +119,26 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->alS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->amk:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->alS:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->amk:Ljava/lang/String;
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/a;->alT:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/a;->aml:I
 
     if-eqz v0, :cond_1
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/a;->alT:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/a;->aml:I
 
     :cond_1
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/a;->alU:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/a;->amm:I
 
     if-eqz v0, :cond_2
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/a;->alU:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/a;->amm:I
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->alV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->amn:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -146,12 +146,12 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->alV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->amn:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->alV:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->amn:Ljava/lang/String;
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->alW:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->amo:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -159,7 +159,7 @@
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->alW:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->amo:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -169,27 +169,27 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->alW:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->amo:Ljava/lang/String;
 
     goto :goto_0
 
     :cond_4
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->alW:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->amo:Ljava/lang/String;
 
     :cond_5
     :goto_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/a;->alX:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/a;->amp:Z
 
     if-eqz v0, :cond_6
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/a;->alX:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/a;->amp:Z
 
     :cond_6
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/a;->alY:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/a;->amq:Z
 
     if-eqz v0, :cond_7
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/a;->alY:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/a;->amq:Z
 
     :cond_7
     return-void
@@ -202,13 +202,13 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/a;->alS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/a;->amk:Ljava/lang/String;
 
     const-string v2, "screenName"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/a;->alX:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/a;->amp:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -218,7 +218,7 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/a;->alY:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/a;->amq:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -228,7 +228,7 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/internal/gtm/a;->alT:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/a;->aml:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -238,7 +238,7 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/internal/gtm/a;->alU:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/a;->amm:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -248,13 +248,13 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/a;->alV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/a;->amn:Ljava/lang/String;
 
     const-string v2, "referrerScreenName"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/a;->alW:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/a;->amo:Ljava/lang/String;
 
     const-string v2, "referrerUri"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/aa.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/aa.smali
index d3c5e358f5..7df1ae0366 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/aa.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/aa.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic anm:Lcom/google/android/gms/internal/gtm/y;
+.field private final synthetic anE:Lcom/google/android/gms/internal/gtm/y;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/y;Lcom/google/android/gms/internal/gtm/m;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/aa;->anm:Lcom/google/android/gms/internal/gtm/y;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/aa;->anE:Lcom/google/android/gms/internal/gtm/y;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/internal/gtm/ao;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
@@ -22,7 +22,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/aa;->anm:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/aa;->anE:Lcom/google/android/gms/internal/gtm/y;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/y;->b(Lcom/google/android/gms/internal/gtm/y;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ab.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ab.smali
index f5fd9d08c5..874b5b7a6f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ab.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ab.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic anm:Lcom/google/android/gms/internal/gtm/y;
+.field private final synthetic anE:Lcom/google/android/gms/internal/gtm/y;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/y;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ab;->anm:Lcom/google/android/gms/internal/gtm/y;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ab;->anE:Lcom/google/android/gms/internal/gtm/y;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,9 +25,9 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ab;->anm:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ab;->anE:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->nu()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->ns()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ac.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ac.smali
index 58f3b1d2f0..47ce0ff8e2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ac.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ac.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic anm:Lcom/google/android/gms/internal/gtm/y;
+.field private final synthetic anE:Lcom/google/android/gms/internal/gtm/y;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/y;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ac;->anm:Lcom/google/android/gms/internal/gtm/y;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ac;->anE:Lcom/google/android/gms/internal/gtm/y;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -22,12 +22,12 @@
 
 
 # virtual methods
-.method public final nC()V
+.method public final nA()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ac;->anm:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ac;->anE:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->nv()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ad.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ad.smali
index 223395116b..4dc4c371f5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ad.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ad.smali
@@ -13,19 +13,19 @@
 
 
 # static fields
-.field public static final enum ann:Lcom/google/android/gms/internal/gtm/ad;
+.field public static final enum anF:Lcom/google/android/gms/internal/gtm/ad;
 
-.field private static final enum ano:Lcom/google/android/gms/internal/gtm/ad;
+.field private static final enum anG:Lcom/google/android/gms/internal/gtm/ad;
 
-.field private static final enum anp:Lcom/google/android/gms/internal/gtm/ad;
+.field private static final enum anH:Lcom/google/android/gms/internal/gtm/ad;
 
-.field private static final enum anq:Lcom/google/android/gms/internal/gtm/ad;
+.field private static final enum anI:Lcom/google/android/gms/internal/gtm/ad;
 
-.field public static final enum anr:Lcom/google/android/gms/internal/gtm/ad;
+.field public static final enum anJ:Lcom/google/android/gms/internal/gtm/ad;
 
-.field private static final enum ans:Lcom/google/android/gms/internal/gtm/ad;
+.field private static final enum anK:Lcom/google/android/gms/internal/gtm/ad;
 
-.field private static final synthetic ant:[Lcom/google/android/gms/internal/gtm/ad;
+.field private static final synthetic anL:[Lcom/google/android/gms/internal/gtm/ad;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/internal/gtm/ad;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->ann:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->anF:Lcom/google/android/gms/internal/gtm/ad;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/ad;
 
@@ -50,7 +50,7 @@
 
     invoke-direct {v0, v3, v2}, Lcom/google/android/gms/internal/gtm/ad;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->ano:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->anG:Lcom/google/android/gms/internal/gtm/ad;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/ad;
 
@@ -60,7 +60,7 @@
 
     invoke-direct {v0, v4, v3}, Lcom/google/android/gms/internal/gtm/ad;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->anp:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->anH:Lcom/google/android/gms/internal/gtm/ad;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/ad;
 
@@ -70,7 +70,7 @@
 
     invoke-direct {v0, v5, v4}, Lcom/google/android/gms/internal/gtm/ad;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->anq:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->anI:Lcom/google/android/gms/internal/gtm/ad;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/ad;
 
@@ -80,7 +80,7 @@
 
     invoke-direct {v0, v6, v5}, Lcom/google/android/gms/internal/gtm/ad;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->anr:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->anJ:Lcom/google/android/gms/internal/gtm/ad;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/ad;
 
@@ -90,37 +90,37 @@
 
     invoke-direct {v0, v7, v6}, Lcom/google/android/gms/internal/gtm/ad;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->ans:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->anK:Lcom/google/android/gms/internal/gtm/ad;
 
     const/4 v0, 0x6
 
     new-array v0, v0, [Lcom/google/android/gms/internal/gtm/ad;
 
-    sget-object v7, Lcom/google/android/gms/internal/gtm/ad;->ann:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v7, Lcom/google/android/gms/internal/gtm/ad;->anF:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v7, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->ano:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->anG:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->anp:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->anH:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->anq:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->anI:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->anr:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->anJ:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->ans:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->anK:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v6
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->ant:[Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->anL:[Lcom/google/android/gms/internal/gtm/ad;
 
     return-void
 .end method
@@ -138,7 +138,7 @@
     return-void
 .end method
 
-.method public static bs(Ljava/lang/String;)Lcom/google/android/gms/internal/gtm/ad;
+.method public static bn(Ljava/lang/String;)Lcom/google/android/gms/internal/gtm/ad;
     .locals 1
 
     const-string v0, "BATCH_BY_SESSION"
@@ -149,7 +149,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->ano:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->anG:Lcom/google/android/gms/internal/gtm/ad;
 
     return-object p0
 
@@ -162,7 +162,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->anp:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->anH:Lcom/google/android/gms/internal/gtm/ad;
 
     return-object p0
 
@@ -175,7 +175,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->anq:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->anI:Lcom/google/android/gms/internal/gtm/ad;
 
     return-object p0
 
@@ -188,7 +188,7 @@
 
     if-eqz v0, :cond_3
 
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->anr:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->anJ:Lcom/google/android/gms/internal/gtm/ad;
 
     return-object p0
 
@@ -201,12 +201,12 @@
 
     if-eqz p0, :cond_4
 
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->ans:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->anK:Lcom/google/android/gms/internal/gtm/ad;
 
     return-object p0
 
     :cond_4
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->ann:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->anF:Lcom/google/android/gms/internal/gtm/ad;
 
     return-object p0
 .end method
@@ -214,7 +214,7 @@
 .method public static values()[Lcom/google/android/gms/internal/gtm/ad;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/ad;->ant:[Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/ad;->anL:[Lcom/google/android/gms/internal/gtm/ad;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/gtm/ad;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ae.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ae.smali
index df6d1a78a5..bb8a6f80cf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ae.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ae.smali
@@ -3,9 +3,7 @@
 
 
 # instance fields
-.field private volatile amK:Ljava/lang/String;
-
-.field private anu:Ljava/util/concurrent/Future;
+.field private anM:Ljava/util/concurrent/Future;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/Future<",
@@ -15,6 +13,8 @@
     .end annotation
 .end field
 
+.field private volatile anc:Ljava/lang/String;
+
 
 # direct methods
 .method protected constructor <init>(Lcom/google/android/gms/internal/gtm/m;)V
@@ -34,7 +34,7 @@
 
     const-string v2, "ClientId should be loaded from worker thread"
 
-    invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->aX(Ljava/lang/String;)V
+    invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->aS(Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -66,7 +66,7 @@
 
     const-string v4, "clientId file seems corrupted, deleting it."
 
-    invoke-virtual {p0, v4}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p0, v4}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     invoke-virtual {v3}, Ljava/io/FileInputStream;->close()V
 
@@ -102,7 +102,7 @@
     :try_start_3
     const-string v4, "clientId file is empty, deleting it."
 
-    invoke-virtual {p0, v4}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p0, v4}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     invoke-virtual {v3}, Ljava/io/FileInputStream;->close()V
 
@@ -264,11 +264,11 @@
 
     const-string v0, "Failed to close clientId writing stream"
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const-string v1, "ClientId should be saved from worker thread"
 
-    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aX(Ljava/lang/String;)V
+    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aS(Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -398,27 +398,27 @@
 
 
 # virtual methods
-.method protected final mP()V
+.method protected final mN()V
     .locals 0
 
     return-void
 .end method
 
-.method public final nD()Ljava/lang/String;
+.method public final nB()Ljava/lang/String;
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->amK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anc:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -430,17 +430,17 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anu:Ljava/util/concurrent/Future;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anM:Ljava/util/concurrent/Future;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anu:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anM:Ljava/util/concurrent/Future;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     if-eqz v0, :cond_2
 
     :try_start_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anu:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anM:Ljava/util/concurrent/Future;
 
     invoke-interface {v0}, Ljava/util/concurrent/Future;->get()Ljava/lang/Object;
 
@@ -448,7 +448,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->amK:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anc:Ljava/lang/String;
     :try_end_1
     .catch Ljava/lang/InterruptedException; {:try_start_1 .. :try_end_1} :catch_1
     .catch Ljava/util/concurrent/ExecutionException; {:try_start_1 .. :try_end_1} :catch_0
@@ -466,7 +466,7 @@
 
     const-string v0, "0"
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->amK:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anc:Ljava/lang/String;
 
     goto :goto_0
 
@@ -479,30 +479,30 @@
 
     const-string v0, "0"
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->amK:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anc:Ljava/lang/String;
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->amK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anc:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
     const-string v0, "0"
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->amK:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anc:Ljava/lang/String;
 
     :cond_1
     const-string v0, "Loaded clientId"
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ae;->amK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ae;->anc:Ljava/lang/String;
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anu:Ljava/util/concurrent/Future;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anM:Ljava/util/concurrent/Future;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->amK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anc:Ljava/lang/String;
 
     monitor-exit p0
 
@@ -518,7 +518,7 @@
     throw v0
 .end method
 
-.method final nE()Ljava/lang/String;
+.method final nC()Ljava/lang/String;
     .locals 2
 
     monitor-enter p0
@@ -526,11 +526,11 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->amK:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anc:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -542,13 +542,13 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anu:Ljava/util/concurrent/Future;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->anM:Ljava/util/concurrent/Future;
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ae;->nD()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ae;->nB()Ljava/lang/String;
 
     move-result-object v0
 
@@ -565,16 +565,16 @@
     throw v0
 .end method
 
-.method final nF()Ljava/lang/String;
+.method final nD()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/m;->acH:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/m;->acZ:Landroid/content/Context;
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/gtm/ae;->ac(Landroid/content/Context;)Ljava/lang/String;
 
@@ -582,7 +582,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ae;->nG()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ae;->nE()Ljava/lang/String;
 
     move-result-object v0
 
@@ -590,7 +590,7 @@
     return-object v0
 .end method
 
-.method final nG()Ljava/lang/String;
+.method final nE()Ljava/lang/String;
     .locals 3
 
     const-string v0, "0"
@@ -610,13 +610,13 @@
     move-result-object v1
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/analytics/m;->acH:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/analytics/m;->acZ:Landroid/content/Context;
 
     invoke-direct {p0, v2, v1}, Lcom/google/android/gms/internal/gtm/ae;->m(Landroid/content/Context;Ljava/lang/String;)Z
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/af.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/af.smali
index 65c828ad90..13bd9ef005 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/af.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/af.smali
@@ -17,14 +17,14 @@
 
 
 # instance fields
-.field private final synthetic anv:Lcom/google/android/gms/internal/gtm/ae;
+.field private final synthetic anN:Lcom/google/android/gms/internal/gtm/ae;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/ae;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/af;->anv:Lcom/google/android/gms/internal/gtm/ae;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/af;->anN:Lcom/google/android/gms/internal/gtm/ae;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/af;->anv:Lcom/google/android/gms/internal/gtm/ae;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/af;->anN:Lcom/google/android/gms/internal/gtm/ae;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->nF()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->nD()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ag.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ag.smali
index 6d5fabe89e..817ef2b8a5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ag.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ag.smali
@@ -17,14 +17,14 @@
 
 
 # instance fields
-.field private final synthetic anv:Lcom/google/android/gms/internal/gtm/ae;
+.field private final synthetic anN:Lcom/google/android/gms/internal/gtm/ae;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/ae;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ag;->anv:Lcom/google/android/gms/internal/gtm/ae;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ag;->anN:Lcom/google/android/gms/internal/gtm/ae;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ag;->anv:Lcom/google/android/gms/internal/gtm/ae;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ag;->anN:Lcom/google/android/gms/internal/gtm/ae;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->nG()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->nE()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ai.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ai.smali
index 9db9afdbe8..f8a87ad633 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ai.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ai.smali
@@ -13,11 +13,11 @@
 
 
 # static fields
-.field private static final enum anx:Lcom/google/android/gms/internal/gtm/ai;
+.field private static final enum anP:Lcom/google/android/gms/internal/gtm/ai;
 
-.field public static final enum any:Lcom/google/android/gms/internal/gtm/ai;
+.field public static final enum anQ:Lcom/google/android/gms/internal/gtm/ai;
 
-.field private static final synthetic anz:[Lcom/google/android/gms/internal/gtm/ai;
+.field private static final synthetic anR:[Lcom/google/android/gms/internal/gtm/ai;
 
 
 # direct methods
@@ -32,7 +32,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/internal/gtm/ai;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->anx:Lcom/google/android/gms/internal/gtm/ai;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->anP:Lcom/google/android/gms/internal/gtm/ai;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/ai;
 
@@ -42,21 +42,21 @@
 
     invoke-direct {v0, v3, v2}, Lcom/google/android/gms/internal/gtm/ai;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->any:Lcom/google/android/gms/internal/gtm/ai;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->anQ:Lcom/google/android/gms/internal/gtm/ai;
 
     const/4 v0, 0x2
 
     new-array v0, v0, [Lcom/google/android/gms/internal/gtm/ai;
 
-    sget-object v3, Lcom/google/android/gms/internal/gtm/ai;->anx:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/ai;->anP:Lcom/google/android/gms/internal/gtm/ai;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ai;->any:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ai;->anQ:Lcom/google/android/gms/internal/gtm/ai;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->anz:[Lcom/google/android/gms/internal/gtm/ai;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->anR:[Lcom/google/android/gms/internal/gtm/ai;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
     return-void
 .end method
 
-.method public static bt(Ljava/lang/String;)Lcom/google/android/gms/internal/gtm/ai;
+.method public static bo(Ljava/lang/String;)Lcom/google/android/gms/internal/gtm/ai;
     .locals 1
 
     const-string v0, "GZIP"
@@ -85,12 +85,12 @@
 
     if-eqz p0, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ai;->any:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ai;->anQ:Lcom/google/android/gms/internal/gtm/ai;
 
     return-object p0
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ai;->anx:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ai;->anP:Lcom/google/android/gms/internal/gtm/ai;
 
     return-object p0
 .end method
@@ -98,7 +98,7 @@
 .method public static values()[Lcom/google/android/gms/internal/gtm/ai;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/ai;->anz:[Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/ai;->anR:[Lcom/google/android/gms/internal/gtm/ai;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/gtm/ai;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ak.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ak.smali
index 92dfa9a51d..75760c217b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ak.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ak.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private anA:Lcom/google/android/gms/internal/gtm/al;
+.field private anS:Lcom/google/android/gms/internal/gtm/al;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/al<",
@@ -38,7 +38,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/gtm/j;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/ak;->anA:Lcom/google/android/gms/internal/gtm/al;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/ak;->anS:Lcom/google/android/gms/internal/gtm/al;
 
     return-void
 .end method
@@ -150,7 +150,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ak;->anA:Lcom/google/android/gms/internal/gtm/al;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ak;->anS:Lcom/google/android/gms/internal/gtm/al;
 
     invoke-interface {v2, v0, v1}, Lcom/google/android/gms/internal/gtm/al;->z(Ljava/lang/String;Ljava/lang/String;)V
 
@@ -197,7 +197,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/ak;->anA:Lcom/google/android/gms/internal/gtm/al;
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/ak;->anS:Lcom/google/android/gms/internal/gtm/al;
 
     invoke-interface {v3, v0, v2}, Lcom/google/android/gms/internal/gtm/al;->e(Ljava/lang/String;Z)V
     :try_end_2
@@ -258,7 +258,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/ak;->anA:Lcom/google/android/gms/internal/gtm/al;
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/ak;->anS:Lcom/google/android/gms/internal/gtm/al;
 
     invoke-interface {v3, v0, v2}, Lcom/google/android/gms/internal/gtm/al;->i(Ljava/lang/String;I)V
     :try_end_4
@@ -301,9 +301,9 @@
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ak;->anA:Lcom/google/android/gms/internal/gtm/al;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ak;->anS:Lcom/google/android/gms/internal/gtm/al;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/al;->nH()Lcom/google/android/gms/internal/gtm/aj;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/al;->nF()Lcom/google/android/gms/internal/gtm/aj;
 
     move-result-object p1
 
@@ -321,9 +321,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->amt:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->amL:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/al.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/al.smali
index c582e3a333..9023d0a713 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/al.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/al.smali
@@ -20,7 +20,7 @@
 .method public abstract i(Ljava/lang/String;I)V
 .end method
 
-.method public abstract nH()Lcom/google/android/gms/internal/gtm/aj;
+.method public abstract nF()Lcom/google/android/gms/internal/gtm/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TU;"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/am.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/am.smali
index 37c6d0623d..4e886d30e0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/am.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/am.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field private final acl:Lcom/google/android/gms/internal/gtm/m;
+.field private final acD:Lcom/google/android/gms/internal/gtm/m;
 
-.field private volatile anB:Ljava/lang/Boolean;
+.field private volatile anT:Ljava/lang/Boolean;
 
-.field private anC:Ljava/lang/String;
+.field private anU:Ljava/lang/String;
 
-.field private anD:Ljava/util/Set;
+.field private anV:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -28,17 +28,17 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/am;->acl:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/am;->acD:Lcom/google/android/gms/internal/gtm/m;
 
     return-void
 .end method
 
-.method public static nJ()Z
+.method public static nH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->anN:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aof:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Boolean;
 
@@ -49,12 +49,12 @@
     return v0
 .end method
 
-.method public static nK()I
+.method public static nI()I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aok:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoC:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
@@ -65,12 +65,12 @@
     return v0
 .end method
 
-.method public static nL()J
+.method public static nJ()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->anV:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aon:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -81,12 +81,12 @@
     return-wide v0
 .end method
 
-.method public static nM()J
+.method public static nK()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->anY:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoq:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -97,12 +97,12 @@
     return-wide v0
 .end method
 
-.method public static nN()I
+.method public static nL()I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoa:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aos:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
@@ -113,12 +113,12 @@
     return v0
 .end method
 
-.method public static nO()I
+.method public static nM()I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aob:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aot:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
@@ -129,48 +129,48 @@
     return v0
 .end method
 
+.method public static nN()Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aov:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public static nO()Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aou:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/String;
+
+    return-object v0
+.end method
+
 .method public static nP()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aod:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aow:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public static nQ()Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoc:Lcom/google/android/gms/internal/gtm/av;
-
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public static nR()Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoe:Lcom/google/android/gms/internal/gtm/av;
-
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public static nT()J
+.method public static nR()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aos:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoK:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -183,29 +183,29 @@
 
 
 # virtual methods
-.method public final nI()Z
+.method public final nG()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anB:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anT:Ljava/lang/Boolean;
 
     if-nez v0, :cond_5
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anB:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anT:Ljava/lang/Boolean;
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->acl:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->acD:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getApplicationInfo()Landroid/content/pm/ApplicationInfo;
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/m;->mv()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/util/m;->mt()Ljava/lang/String;
 
     move-result-object v1
 
@@ -233,14 +233,14 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anB:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anT:Ljava/lang/Boolean;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anB:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anT:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anB:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anT:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -259,26 +259,26 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anB:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anT:Ljava/lang/Boolean;
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anB:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anT:Ljava/lang/Boolean;
 
     if-nez v0, :cond_4
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anB:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anT:Ljava/lang/Boolean;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->acl:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->acD:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
     const-string v1, "My process not in the list of running processes"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
 
     :cond_4
     monitor-exit p0
@@ -296,7 +296,7 @@
 
     :cond_5
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anB:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anT:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -305,7 +305,7 @@
     return v0
 .end method
 
-.method public final nS()Ljava/util/Set;
+.method public final nQ()Ljava/util/Set;
     .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -316,17 +316,17 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aon:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoF:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/am;->anD:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/am;->anV:Ljava/util/Set;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/am;->anC:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/am;->anU:Ljava/lang/String;
 
     if-eqz v1, :cond_0
 
@@ -375,12 +375,12 @@
     goto :goto_0
 
     :cond_1
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anC:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anU:Ljava/lang/String;
 
-    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/am;->anD:Ljava/util/Set;
+    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/am;->anV:Ljava/util/Set;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anD:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->anV:Ljava/util/Set;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/an.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/an.smali
index 0d8f8f9050..951d4d44a5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/an.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/an.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private anE:I
+.field private anW:I
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     const/4 v0, 0x2
 
-    iput v0, p0, Lcom/google/android/gms/internal/gtm/an;->anE:I
+    iput v0, p0, Lcom/google/android/gms/internal/gtm/an;->anW:I
 
     return-void
 .end method
@@ -27,7 +27,7 @@
 .method public final getLogLevel()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/an;->anE:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/an;->anW:I
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ao.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ao.smali
index e11d280dec..a2991a33f4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ao.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ao.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final amp:Lcom/google/android/gms/internal/gtm/m;
+.field private final amH:Lcom/google/android/gms/internal/gtm/m;
 
-.field private final anF:Ljava/lang/Runnable;
+.field private final anX:Ljava/lang/Runnable;
 
-.field private volatile anG:J
+.field private volatile anY:J
 
 
 # direct methods
@@ -22,13 +22,13 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ao;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ao;->amH:Lcom/google/android/gms/internal/gtm/m;
 
     new-instance p1, Lcom/google/android/gms/internal/gtm/ap;
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/internal/gtm/ap;-><init>(Lcom/google/android/gms/internal/gtm/ao;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ao;->anF:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ao;->anX:Ljava/lang/Runnable;
 
     return-void
 .end method
@@ -36,7 +36,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/gtm/ao;)Lcom/google/android/gms/internal/gtm/m;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/ao;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/ao;->amH:Lcom/google/android/gms/internal/gtm/m;
 
     return-object p0
 .end method
@@ -46,7 +46,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->anG:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->anY:J
 
     return-wide v0
 .end method
@@ -74,9 +74,9 @@
 
     new-instance v1, Lcom/google/android/gms/internal/gtm/bv;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ao;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ao;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     invoke-virtual {v2}, Landroid/content/Context;->getMainLooper()Landroid/os/Looper;
 
@@ -110,23 +110,23 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->anG:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->anY:J
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ao;->getHandler()Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->anF:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->anX:Ljava/lang/Runnable;
 
     invoke-virtual {v0, v1}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
 
     return-void
 .end method
 
-.method public final nU()J
+.method public final nS()J
     .locals 5
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->anG:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->anY:J
 
     const-wide/16 v2, 0x0
 
@@ -137,15 +137,15 @@
     return-wide v2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->act:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acL:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/ao;->anG:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/ao;->anY:J
 
     sub-long/2addr v0, v2
 
@@ -156,10 +156,10 @@
     return-wide v0
 .end method
 
-.method public final nV()Z
+.method public final nT()Z
     .locals 5
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->anG:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->anY:J
 
     const-wide/16 v2, 0x0
 
@@ -191,21 +191,21 @@
 
     if-ltz v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->act:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acL:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->anG:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->anY:J
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ao;->getHandler()Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->anF:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->anX:Ljava/lang/Runnable;
 
     invoke-virtual {v0, v1, p1, p2}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z
 
@@ -213,9 +213,9 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -234,7 +234,7 @@
 .method public final x(J)V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ao;->nV()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ao;->nT()Z
 
     move-result v0
 
@@ -254,15 +254,15 @@
     return-void
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ao;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ao;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->act:Lcom/google/android/gms/common/util/e;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->acL:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
     move-result-wide v2
 
-    iget-wide v4, p0, Lcom/google/android/gms/internal/gtm/ao;->anG:J
+    iget-wide v4, p0, Lcom/google/android/gms/internal/gtm/ao;->anY:J
 
     sub-long/2addr v2, v4
 
@@ -283,7 +283,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->anF:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->anX:Ljava/lang/Runnable;
 
     invoke-virtual {v0, v1}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
 
@@ -291,7 +291,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->anF:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->anX:Ljava/lang/Runnable;
 
     invoke-virtual {v0, v1, p1, p2}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z
 
@@ -299,9 +299,9 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ap.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ap.smali
index 6dbf8e7cf9..229e414663 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ap.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ap.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic anH:Lcom/google/android/gms/internal/gtm/ao;
+.field private final synthetic anZ:Lcom/google/android/gms/internal/gtm/ao;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/ao;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ap;->anH:Lcom/google/android/gms/internal/gtm/ao;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ap;->anZ:Lcom/google/android/gms/internal/gtm/ao;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -35,13 +35,13 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ap;->anH:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ap;->anZ:Lcom/google/android/gms/internal/gtm/ao;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/ao;->a(Lcom/google/android/gms/internal/gtm/ao;)Lcom/google/android/gms/internal/gtm/m;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -50,19 +50,19 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ap;->anH:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ap;->anZ:Lcom/google/android/gms/internal/gtm/ao;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->nV()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->nT()Z
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ap;->anH:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ap;->anZ:Lcom/google/android/gms/internal/gtm/ao;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/gtm/ao;->b(Lcom/google/android/gms/internal/gtm/ao;)J
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ap;->anH:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ap;->anZ:Lcom/google/android/gms/internal/gtm/ao;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->run()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/aq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/aq.smali
index ccf845d9e5..88537b0e5f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/aq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/aq.smali
@@ -13,24 +13,24 @@
 
 
 # virtual methods
-.method protected final mP()V
+.method protected final mN()V
     .locals 0
 
     return-void
 .end method
 
-.method public final nW()Lcom/google/android/gms/internal/gtm/cd;
+.method public final nU()Lcom/google/android/gms/internal/gtm/cd;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/m;->acH:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/m;->acZ:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -52,15 +52,15 @@
 
     move-result-object v2
 
-    iput-object v2, v1, Lcom/google/android/gms/internal/gtm/cd;->apV:Ljava/lang/String;
+    iput-object v2, v1, Lcom/google/android/gms/internal/gtm/cd;->aqn:Ljava/lang/String;
 
     iget v2, v0, Landroid/util/DisplayMetrics;->widthPixels:I
 
-    iput v2, v1, Lcom/google/android/gms/internal/gtm/cd;->apX:I
+    iput v2, v1, Lcom/google/android/gms/internal/gtm/cd;->aqp:I
 
     iget v0, v0, Landroid/util/DisplayMetrics;->heightPixels:I
 
-    iput v0, v1, Lcom/google/android/gms/internal/gtm/cd;->apY:I
+    iput v0, v1, Lcom/google/android/gms/internal/gtm/cd;->aqq:I
 
     return-object v1
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ar.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ar.smali
index 2cd88f7fde..45a70cc0a7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ar.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ar.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field anI:Z
+.field aoa:Z
 
-.field anJ:Z
+.field aob:Z
 
-.field private final anK:Landroid/app/AlarmManager;
+.field private final aoc:Landroid/app/AlarmManager;
 
-.field private anL:Ljava/lang/Integer;
+.field private aod:Ljava/lang/Integer;
 
 
 # direct methods
@@ -30,7 +30,7 @@
 
     check-cast p1, Landroid/app/AlarmManager;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ar;->anK:Landroid/app/AlarmManager;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ar;->aoc:Landroid/app/AlarmManager;
 
     return-void
 .end method
@@ -38,7 +38,7 @@
 .method private final getJobId()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->anL:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->aod:Ljava/lang/Integer;
 
     if-nez v0, :cond_1
 
@@ -84,10 +84,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->anL:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->aod:Ljava/lang/Integer;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->anL:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->aod:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -96,7 +96,7 @@
     return v0
 .end method
 
-.method private final nY()Landroid/app/PendingIntent;
+.method private final nW()Landroid/app/PendingIntent;
     .locals 4
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->getContext()Landroid/content/Context;
@@ -135,11 +135,11 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->anJ:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->aob:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->anK:Landroid/app/AlarmManager;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->aoc:Landroid/app/AlarmManager;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->nY()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->nW()Landroid/app/PendingIntent;
 
     move-result-object v1
 
@@ -181,13 +181,13 @@
     return-void
 .end method
 
-.method protected final mP()V
+.method protected final mN()V
     .locals 5
 
     :try_start_0
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ar;->cancel()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nM()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nK()J
 
     move-result-wide v0
 
@@ -225,11 +225,11 @@
 
     const-string v0, "Receiver registered for local dispatch."
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->anI:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->aoa:Z
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -238,18 +238,18 @@
     return-void
 .end method
 
-.method public final nX()V
+.method public final nV()V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->anI:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->aoa:Z
 
     const-string v1, "Receiver not registered"
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nM()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nK()J
 
     move-result-wide v6
 
@@ -261,7 +261,7 @@
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ar;->cancel()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -273,11 +273,11 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->anJ:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->aob:Z
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aoD:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aoV:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Boolean;
 
@@ -291,7 +291,7 @@
 
     const-string v1, "Scheduling upload with JobScheduler"
 
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->getContext()Landroid/content/Context;
 
@@ -358,13 +358,13 @@
     :cond_0
     const-string v0, "Scheduling upload with AlarmManager"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ar;->anK:Landroid/app/AlarmManager;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ar;->aoc:Landroid/app/AlarmManager;
 
     const/4 v3, 0x2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->nY()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->nW()Landroid/app/PendingIntent;
 
     move-result-object v8
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/as.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/as.smali
index 963398f89a..86a3a13445 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/as.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/as.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract nC()V
+.method public abstract nA()V
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/au.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/au.smali
index 0a70f77da8..a4f417e593 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/au.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/au.smali
@@ -3,27 +3,7 @@
 
 
 # static fields
-.field private static anM:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static anN:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static anO:Lcom/google/android/gms/internal/gtm/av;
+.field public static aoA:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -33,27 +13,7 @@
     .end annotation
 .end field
 
-.field private static anP:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static anQ:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Float;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static anR:Lcom/google/android/gms/internal/gtm/av;
+.field private static aoB:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -63,117 +23,117 @@
     .end annotation
 .end field
 
-.field private static anS:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static anT:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static anU:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static anV:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static anW:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static anX:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static anY:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static anZ:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aoA:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aoB:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field public static aoC:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
 .end field
 
 .field public static aoD:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aoE:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aoF:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aoG:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static aoH:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aoI:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aoJ:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aoK:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static aoL:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static aoM:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aoN:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -183,51 +143,91 @@
     .end annotation
 .end field
 
-.field public static aoa:Lcom/google/android/gms/internal/gtm/av;
+.field public static aoO:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static aob:Lcom/google/android/gms/internal/gtm/av;
+.field public static aoP:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static aoc:Lcom/google/android/gms/internal/gtm/av;
+.field private static aoQ:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static aod:Lcom/google/android/gms/internal/gtm/av;
+.field private static aoR:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static aoe:Lcom/google/android/gms/internal/gtm/av;
+.field public static aoS:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aoT:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aoU:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aoV:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static aoe:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
@@ -237,23 +237,13 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
 .end field
 
 .field public static aog:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aoh:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -263,17 +253,27 @@
     .end annotation
 .end field
 
-.field public static aoi:Lcom/google/android/gms/internal/gtm/av;
+.field private static aoh:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
 .end field
 
-.field private static aoj:Lcom/google/android/gms/internal/gtm/av;
+.field private static aoi:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Float;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aoj:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -283,7 +283,7 @@
     .end annotation
 .end field
 
-.field public static aok:Lcom/google/android/gms/internal/gtm/av;
+.field private static aok:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -307,7 +307,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -317,17 +317,17 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static aoo:Lcom/google/android/gms/internal/gtm/av;
+.field private static aoo:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -347,7 +347,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -357,7 +357,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -367,23 +367,13 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
 .end field
 
-.field private static aot:Lcom/google/android/gms/internal/gtm/av;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static aou:Lcom/google/android/gms/internal/gtm/av;
+.field public static aot:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -393,11 +383,21 @@
     .end annotation
 .end field
 
+.field public static aou:Lcom/google/android/gms/internal/gtm/av;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field public static aov:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -407,7 +407,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -417,27 +417,27 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
 .end field
 
-.field private static aoy:Lcom/google/android/gms/internal/gtm/av;
+.field public static aoy:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
 .end field
 
-.field private static aoz:Lcom/google/android/gms/internal/gtm/av;
+.field public static aoz:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -456,7 +456,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->anM:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoe:Lcom/google/android/gms/internal/gtm/av;
 
     const/4 v1, 0x1
 
@@ -466,7 +466,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->anN:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aof:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v1, "analytics.log_tag"
 
@@ -478,7 +478,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->anO:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aog:Lcom/google/android/gms/internal/gtm/av;
 
     const-wide/16 v1, 0x3c
 
@@ -488,7 +488,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->anP:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoh:Lcom/google/android/gms/internal/gtm/av;
 
     new-instance v1, Lcom/google/android/gms/internal/gtm/av;
 
@@ -506,7 +506,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/google/android/gms/internal/gtm/av;-><init>(Lcom/google/android/gms/common/a/a;Ljava/lang/Object;)V
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->anQ:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoi:Lcom/google/android/gms/internal/gtm/av;
 
     const/16 v1, 0x7d0
 
@@ -518,7 +518,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->anR:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aoj:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v2, "analytics.max_stored_hits_per_app"
 
@@ -526,7 +526,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->anS:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aok:Lcom/google/android/gms/internal/gtm/av;
 
     const/16 v1, 0x64
 
@@ -536,7 +536,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->anT:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aol:Lcom/google/android/gms/internal/gtm/av;
 
     const-wide/32 v1, 0x1d4c0
 
@@ -548,7 +548,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/gtm/au;->anU:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v5, Lcom/google/android/gms/internal/gtm/au;->aom:Lcom/google/android/gms/internal/gtm/av;
 
     const-wide/16 v5, 0x1388
 
@@ -558,7 +558,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->anV:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aon:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v7, "analytics.min_local_dispatch_millis"
 
@@ -566,7 +566,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->anW:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoo:Lcom/google/android/gms/internal/gtm/av;
 
     const-wide/32 v1, 0x6ddd00
 
@@ -576,7 +576,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->anX:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aop:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v7, "analytics.dispatch_alarm_millis"
 
@@ -584,7 +584,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->anY:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoq:Lcom/google/android/gms/internal/gtm/av;
 
     const-wide/32 v1, 0x1ee6280
 
@@ -594,7 +594,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->anZ:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aor:Lcom/google/android/gms/internal/gtm/av;
 
     const/16 v1, 0x14
 
@@ -604,7 +604,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aoa:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aos:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v2, "analytics.max_hits_per_batch"
 
@@ -612,7 +612,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aob:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aot:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v2, "analytics.insecure_host"
 
@@ -622,7 +622,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aoc:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aou:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v2, "analytics.secure_host"
 
@@ -632,7 +632,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aod:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aov:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v2, "analytics.simple_endpoint"
 
@@ -642,7 +642,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aoe:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aow:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v2, "analytics.batching_endpoint"
 
@@ -652,7 +652,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aof:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aox:Lcom/google/android/gms/internal/gtm/av;
 
     const/16 v2, 0x7f4
 
@@ -662,15 +662,15 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aog:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aoy:Lcom/google/android/gms/internal/gtm/av;
 
-    sget-object v2, Lcom/google/android/gms/internal/gtm/ad;->anr:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/ad;->anJ:Lcom/google/android/gms/internal/gtm/ad;
 
     invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/ad;->name()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v7, Lcom/google/android/gms/internal/gtm/ad;->anr:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v7, Lcom/google/android/gms/internal/gtm/ad;->anJ:Lcom/google/android/gms/internal/gtm/ad;
 
     invoke-virtual {v7}, Lcom/google/android/gms/internal/gtm/ad;->name()Ljava/lang/String;
 
@@ -682,9 +682,9 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aoh:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aoz:Lcom/google/android/gms/internal/gtm/av;
 
-    sget-object v2, Lcom/google/android/gms/internal/gtm/ai;->any:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/ai;->anQ:Lcom/google/android/gms/internal/gtm/ai;
 
     invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/ai;->name()Ljava/lang/String;
 
@@ -696,7 +696,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aoi:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aoA:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v2, "analytics.max_hits_per_request.k"
 
@@ -704,7 +704,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoj:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoB:Lcom/google/android/gms/internal/gtm/av;
 
     const/16 v1, 0x2000
 
@@ -714,7 +714,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aok:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aoC:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v2, "analytics.max_post_length.k"
 
@@ -722,7 +722,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aol:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aoD:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v2, "analytics.max_batch_post_length"
 
@@ -730,7 +730,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aom:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoE:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v1, "analytics.fallback_responses.k"
 
@@ -740,7 +740,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aon:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoF:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v1, "analytics.batch_retry_interval.seconds.k"
 
@@ -752,7 +752,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoo:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoG:Lcom/google/android/gms/internal/gtm/av;
 
     const-wide/32 v1, 0x5265c00
 
@@ -762,7 +762,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aop:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoH:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v7, "analytics.http_connection.connect_timeout_millis"
 
@@ -774,7 +774,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoq:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoI:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v7, "analytics.http_connection.read_timeout_millis"
 
@@ -786,7 +786,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aor:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoJ:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v7, "analytics.campaigns.time_limit"
 
@@ -794,7 +794,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aos:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoK:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v7, "analytics.first_party_experiment_id"
 
@@ -804,7 +804,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aot:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoL:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v7, "analytics.first_party_experiment_variant"
 
@@ -812,7 +812,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aou:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoM:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v7, "analytics.test.disable_receiver"
 
@@ -820,7 +820,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aov:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoN:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v7, "analytics.service_client.idle_disconnect_millis"
 
@@ -832,7 +832,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aow:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoO:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v7, "analytics.service_client.connect_timeout_millis"
 
@@ -840,7 +840,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aox:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoP:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v7, "analytics.service_client.second_connect_delay_millis"
 
@@ -848,7 +848,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoy:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoQ:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v7, "analytics.service_client.unexpected_reconnect_millis"
 
@@ -860,7 +860,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoz:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aoR:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v7, "analytics.service_client.reconnect_throttle_millis"
 
@@ -868,7 +868,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/gtm/au;->aoA:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v3, Lcom/google/android/gms/internal/gtm/au;->aoS:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v3, "analytics.monitoring.sample_period_millis"
 
@@ -876,7 +876,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoB:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoT:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v1, "analytics.initialization_warning_threshold"
 
@@ -884,7 +884,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoC:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aoU:Lcom/google/android/gms/internal/gtm/av;
 
     const-string v1, "analytics.gcm_task_service"
 
@@ -892,7 +892,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/au;->aoD:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/au;->aoV:Lcom/google/android/gms/internal/gtm/av;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/av.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/av.smali
index ec4f2c5c71..751f4ec2b1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/av.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/av.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field final aoE:Ljava/lang/Object;
+.field final aoW:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field private final aoF:Lcom/google/android/gms/common/a/a;
+.field private final aoX:Lcom/google/android/gms/common/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/a/a<",
@@ -47,9 +47,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/av;->aoF:Lcom/google/android/gms/common/a/a;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/av;->aoX:Lcom/google/android/gms/common/a/a;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ax.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ax.smali
index a752bb5325..283b9b47b9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ax.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ax.smali
@@ -17,9 +17,9 @@
 
 
 # instance fields
-.field private final amp:Lcom/google/android/gms/internal/gtm/m;
+.field private final amH:Lcom/google/android/gms/internal/gtm/m;
 
-.field private final aoG:Lcom/google/android/gms/internal/gtm/ay;
+.field private final aoY:Lcom/google/android/gms/internal/gtm/ay;
 
 
 # direct methods
@@ -28,13 +28,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->amH:Lcom/google/android/gms/internal/gtm/m;
 
     new-instance p1, Lcom/google/android/gms/internal/gtm/ay;
 
     invoke-direct {p1}, Lcom/google/android/gms/internal/gtm/ay;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aoG:Lcom/google/android/gms/internal/gtm/ay;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aoY:Lcom/google/android/gms/internal/gtm/ay;
 
     return-void
 .end method
@@ -52,16 +52,16 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aoG:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aoY:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aoL:I
+    iput p2, p1, Lcom/google/android/gms/internal/gtm/ay;->apd:I
 
     return-void
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p2
 
@@ -83,16 +83,16 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aoG:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aoY:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aoK:I
+    iput p2, p1, Lcom/google/android/gms/internal/gtm/ay;->apc:I
 
     return-void
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p2
 
@@ -103,10 +103,10 @@
     return-void
 .end method
 
-.method public final synthetic nH()Lcom/google/android/gms/internal/gtm/aj;
+.method public final synthetic nF()Lcom/google/android/gms/internal/gtm/aj;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ax;->aoG:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ax;->aoY:Lcom/google/android/gms/internal/gtm/ay;
 
     return-object v0
 .end method
@@ -122,9 +122,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aoG:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aoY:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aoH:Ljava/lang/String;
+    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aoZ:Ljava/lang/String;
 
     return-void
 
@@ -137,9 +137,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aoG:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aoY:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aoI:Ljava/lang/String;
+    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->apa:Ljava/lang/String;
 
     return-void
 
@@ -152,16 +152,16 @@
 
     if-eqz v0, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aoG:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aoY:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aoJ:Ljava/lang/String;
+    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->apb:Ljava/lang/String;
 
     return-void
 
     :cond_2
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ay.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ay.smali
index 6c480057ab..ac14904ff1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ay.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ay.smali
@@ -6,15 +6,15 @@
 
 
 # instance fields
-.field public aoH:Ljava/lang/String;
+.field public aoZ:Ljava/lang/String;
 
-.field public aoI:Ljava/lang/String;
+.field public apa:Ljava/lang/String;
 
-.field public aoJ:Ljava/lang/String;
+.field public apb:Ljava/lang/String;
 
-.field public aoK:I
+.field public apc:I
 
-.field public aoL:I
+.field public apd:I
 
 
 # direct methods
@@ -25,9 +25,9 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/gms/internal/gtm/ay;->aoK:I
+    iput v0, p0, Lcom/google/android/gms/internal/gtm/ay;->apc:I
 
-    iput v0, p0, Lcom/google/android/gms/internal/gtm/ay;->aoL:I
+    iput v0, p0, Lcom/google/android/gms/internal/gtm/ay;->apd:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/az.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/az.smali
index a1cd398302..857ccc795e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/az.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/az.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field final amO:Ljava/util/Map;
+.field final ang:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field final aoM:Ljava/util/List;
+.field final ape:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,15 +24,15 @@
     .end annotation
 .end field
 
-.field final aoN:J
+.field final apf:J
 
-.field final aoO:J
+.field final apg:J
 
-.field final aoP:I
+.field final aph:I
 
-.field final aoQ:Z
+.field final apj:Z
 
-.field private final aoR:Ljava/lang/String;
+.field private final apk:Ljava/lang/String;
 
 
 # direct methods
@@ -126,13 +126,13 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-wide p3, p0, Lcom/google/android/gms/internal/gtm/az;->aoO:J
+    iput-wide p3, p0, Lcom/google/android/gms/internal/gtm/az;->apg:J
 
-    iput-boolean p5, p0, Lcom/google/android/gms/internal/gtm/az;->aoQ:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/internal/gtm/az;->apj:Z
 
-    iput-wide p6, p0, Lcom/google/android/gms/internal/gtm/az;->aoN:J
+    iput-wide p6, p0, Lcom/google/android/gms/internal/gtm/az;->apf:J
 
-    iput p8, p0, Lcom/google/android/gms/internal/gtm/az;->aoP:I
+    iput p8, p0, Lcom/google/android/gms/internal/gtm/az;->aph:I
 
     if-eqz p9, :cond_0
 
@@ -146,7 +146,7 @@
     move-result-object p3
 
     :goto_0
-    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/az;->aoM:Ljava/util/List;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/az;->ape:Ljava/util/List;
 
     const/4 p3, 0x0
 
@@ -169,7 +169,7 @@
 
     check-cast p5, Lcom/google/android/gms/internal/gtm/zzbk;
 
-    iget-object p6, p5, Lcom/google/android/gms/internal/gtm/zzbk;->anw:Ljava/lang/String;
+    iget-object p6, p5, Lcom/google/android/gms/internal/gtm/zzbk;->anO:Ljava/lang/String;
 
     const-string p7, "appendVersion"
 
@@ -199,7 +199,7 @@
     move-object p3, p4
 
     :goto_2
-    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/az;->aoR:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/az;->apk:Ljava/lang/String;
 
     new-instance p3, Ljava/util/HashMap;
 
@@ -315,7 +315,7 @@
     goto :goto_4
 
     :cond_7
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aoR:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->apk:Ljava/lang/String;
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -323,13 +323,13 @@
 
     if-nez p1, :cond_9
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aoR:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->apk:Ljava/lang/String;
 
     const-string p2, "_v"
 
     invoke-static {p3, p2, p1}, Lcom/google/android/gms/internal/gtm/bq;->d(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aoR:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->apk:Ljava/lang/String;
 
     const-string p2, "ma4.0.0"
 
@@ -339,7 +339,7 @@
 
     if-nez p1, :cond_8
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aoR:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->apk:Ljava/lang/String;
 
     const-string p2, "ma4.0.1"
 
@@ -359,7 +359,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->amO:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->ang:Ljava/util/Map;
 
     return-void
 .end method
@@ -497,7 +497,7 @@
 .method final A(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const-string v0, "&"
 
@@ -511,7 +511,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->checkArgument(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/az;->amO:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/az;->ang:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -538,11 +538,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/az;->aoO:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/az;->apg:J
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/az;->aoN:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/az;->apf:J
 
     const-wide/16 v3, 0x0
 
@@ -554,12 +554,12 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/az;->aoN:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/az;->apf:J
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
     :cond_0
-    iget v1, p0, Lcom/google/android/gms/internal/gtm/az;->aoP:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/az;->aph:I
 
     if-eqz v1, :cond_1
 
@@ -567,14 +567,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/google/android/gms/internal/gtm/az;->aoP:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/az;->aph:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
     :cond_1
     new-instance v1, Ljava/util/ArrayList;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/az;->amO:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/az;->ang:Ljava/util/Map;
 
     invoke-interface {v2}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -613,7 +613,7 @@
 
     invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/az;->amO:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/az;->ang:Ljava/util/Map;
 
     invoke-interface {v5, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/b.smali
index 7a92cb91ae..f474377061 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/b.smali
@@ -13,9 +13,9 @@
 
 
 # instance fields
-.field public alZ:Ljava/lang/String;
+.field public amr:Ljava/lang/String;
 
-.field public ama:Ljava/lang/String;
+.field public ams:Ljava/lang/String;
 
 .field public zzvh:Ljava/lang/String;
 
@@ -49,7 +49,7 @@
     iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->zzvh:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->alZ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->amr:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -57,12 +57,12 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->alZ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->amr:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->alZ:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->amr:Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->ama:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->ams:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -70,9 +70,9 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->ama:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->ams:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->ama:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->ams:Ljava/lang/String;
 
     :cond_2
     return-void
@@ -91,13 +91,13 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/b;->alZ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/b;->amr:Ljava/lang/String;
 
     const-string v2, "action"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/b;->ama:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/b;->ams:Ljava/lang/String;
 
     const-string v2, "target"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bb.smali
index 7c94869101..29f7b5c579 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bb.smali
@@ -42,7 +42,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bx;->apH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bx;->apZ:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
@@ -59,7 +59,7 @@
     move-result-object p1
 
     :try_start_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/bx;->apG:Landroid/os/IBinder;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/bx;->apY:Landroid/os/IBinder;
 
     const/4 p3, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bc.smali
index 3f57b2a912..ee433c3929 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bc.smali
@@ -8,7 +8,7 @@
 
 
 # static fields
-.field private static volatile aoS:Lcom/google/android/gms/analytics/c;
+.field private static volatile apl:Lcom/google/android/gms/analytics/c;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/gtm/an;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bc;->aoS:Lcom/google/android/gms/analytics/c;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bc;->apl:Lcom/google/android/gms/analytics/c;
 
     return-void
 .end method
@@ -27,7 +27,7 @@
 .method public static n(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bd;->nZ()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bd;->nX()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -38,7 +38,7 @@
     return-void
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bc;->aoS:Lcom/google/android/gms/analytics/c;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bc;->apl:Lcom/google/android/gms/analytics/c;
 
     const/4 v1, 0x1
 
@@ -46,7 +46,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bc;->aoS:Lcom/google/android/gms/analytics/c;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bc;->apl:Lcom/google/android/gms/analytics/c;
 
     invoke-interface {v0}, Lcom/google/android/gms/analytics/c;->getLogLevel()I
 
@@ -104,9 +104,9 @@
     move-result-object p0
 
     :cond_2
-    sget-object p1, Lcom/google/android/gms/internal/gtm/au;->anO:Lcom/google/android/gms/internal/gtm/av;
+    sget-object p1, Lcom/google/android/gms/internal/gtm/au;->aog:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast p1, Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bd.smali
index bc4f3e7ff2..b8a47e623e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bd.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static aoT:Lcom/google/android/gms/internal/gtm/bd;
+.field private static apm:Lcom/google/android/gms/internal/gtm/bd;
 
 
 # direct methods
@@ -193,10 +193,10 @@
     return-object v1
 .end method
 
-.method public static nZ()Lcom/google/android/gms/internal/gtm/bd;
+.method public static nX()Lcom/google/android/gms/internal/gtm/bd;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bd;->aoT:Lcom/google/android/gms/internal/gtm/bd;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bd;->apm:Lcom/google/android/gms/internal/gtm/bd;
 
     return-object v0
 .end method
@@ -269,11 +269,11 @@
     const/16 p1, 0x8
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mX()Lcom/google/android/gms/internal/gtm/am;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/am;->nI()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/am;->nG()Z
 
     move-result v1
 
@@ -368,13 +368,13 @@
     move-result-object p1
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/m;->amA:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/m;->amS:Lcom/google/android/gms/internal/gtm/bh;
 
     if-eqz p3, :cond_5
 
-    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/m;->amA:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/m;->amS:Lcom/google/android/gms/internal/gtm/bh;
 
     invoke-virtual {p3}, Lcom/google/android/gms/internal/gtm/k;->isInitialized()Z
 
@@ -385,7 +385,7 @@
     goto :goto_1
 
     :cond_4
-    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/m;->amA:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/m;->amS:Lcom/google/android/gms/internal/gtm/bh;
 
     goto :goto_2
 
@@ -396,9 +396,9 @@
     :goto_2
     if-eqz p2, :cond_b
 
-    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/bh;->apg:Lcom/google/android/gms/internal/gtm/bi;
+    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/bh;->apA:Lcom/google/android/gms/internal/gtm/bi;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->om()J
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->ok()J
 
     move-result-wide p3
 
@@ -408,7 +408,7 @@
 
     if-nez p5, :cond_6
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->ok()V
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->oi()V
 
     :cond_6
     if-nez p1, :cond_7
@@ -421,11 +421,11 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/bi;->apj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/bi;->apC:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object p3, p3, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iget-object p3, p3, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->oo()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->om()Ljava/lang/String;
 
     move-result-object p4
 
@@ -439,21 +439,21 @@
 
     if-gtz p5, :cond_8
 
-    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/bi;->apj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/bi;->apC:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object p3, p3, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iget-object p3, p3, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
     invoke-interface {p3}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
     move-result-object p3
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->op()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->on()Ljava/lang/String;
 
     move-result-object p4
 
     invoke-interface {p3, p4, p1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->oo()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->om()Ljava/lang/String;
 
     move-result-object p1
 
@@ -494,9 +494,9 @@
     const/4 v0, 0x1
 
     :cond_9
-    iget-object p5, p2, Lcom/google/android/gms/internal/gtm/bi;->apj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p5, p2, Lcom/google/android/gms/internal/gtm/bi;->apC:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object p5, p5, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iget-object p5, p5, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
     invoke-interface {p5}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -504,14 +504,14 @@
 
     if-eqz v0, :cond_a
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->op()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->on()Ljava/lang/String;
 
     move-result-object v0
 
     invoke-interface {p5, v0, p1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
     :cond_a
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->oo()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->om()Ljava/lang/String;
 
     move-result-object p1
 
@@ -667,7 +667,7 @@
     return-void
 .end method
 
-.method protected final mP()V
+.method protected final mN()V
     .locals 2
 
     const-class v0, Lcom/google/android/gms/internal/gtm/bd;
@@ -675,7 +675,7 @@
     monitor-enter v0
 
     :try_start_0
-    sput-object p0, Lcom/google/android/gms/internal/gtm/bd;->aoT:Lcom/google/android/gms/internal/gtm/bd;
+    sput-object p0, Lcom/google/android/gms/internal/gtm/bd;->apm:Lcom/google/android/gms/internal/gtm/bd;
 
     monitor-exit v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/be.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/be.smali
index 99746b201f..8c4f8865ba 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/be.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/be.smali
@@ -3,15 +3,15 @@
 
 
 # static fields
-.field static final aoU:Ljava/lang/String;
+.field static final apn:Ljava/lang/String;
 
 
 # instance fields
-.field final amp:Lcom/google/android/gms/internal/gtm/m;
+.field final amH:Lcom/google/android/gms/internal/gtm/m;
 
-.field private aoV:Z
+.field private apo:Z
 
-.field private aoW:Z
+.field private apq:Z
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/be;->aoU:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/be;->apn:Ljava/lang/String;
 
     return-void
 .end method
@@ -36,31 +36,31 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
     return-void
 .end method
 
-.method private final ob()V
+.method private final nZ()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/e;
 
     return-void
 .end method
 
-.method private final oc()Z
+.method private final oa()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     const-string v1, "connectivity"
 
@@ -101,41 +101,41 @@
 .method public final isConnected()Z
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->apo:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
     const-string v1, "Connectivity unknown. Receiver not registered"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoW:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->apq:Z
 
     return v0
 .end method
 
-.method public final oa()V
+.method public final nY()V
     .locals 3
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->ob()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->nZ()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->apo:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     new-instance v1, Landroid/content/IntentFilter;
 
@@ -159,19 +159,19 @@
 
     invoke-virtual {v0, p0, v1}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->oc()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->oa()Z
 
     move-result v0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoW:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->apq:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/be;->aoW:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/be;->apq:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -183,7 +183,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoV:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->apo:Z
 
     return-void
 .end method
@@ -191,15 +191,15 @@
 .method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->ob()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->nZ()V
 
     invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -215,19 +215,19 @@
 
     if-eqz v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->oc()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->oa()Z
 
     move-result p1
 
-    iget-boolean p2, p0, Lcom/google/android/gms/internal/gtm/be;->aoW:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/internal/gtm/be;->apq:Z
 
     if-eq p2, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/gtm/be;->aoW:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/gtm/be;->apq:Z
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object p2
 
@@ -239,9 +239,9 @@
 
     invoke-virtual {p2, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p2, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p2, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -263,7 +263,7 @@
 
     if-eqz v0, :cond_3
 
-    sget-object p1, Lcom/google/android/gms/internal/gtm/be;->aoU:Ljava/lang/String;
+    sget-object p1, Lcom/google/android/gms/internal/gtm/be;->apn:Ljava/lang/String;
 
     invoke-virtual {p2, p1}, Landroid/content/Intent;->hasExtra(Ljava/lang/String;)Z
 
@@ -271,25 +271,25 @@
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object p1
 
     const-string p2, "Radio powered up"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/e;->mV()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/e;->mT()V
 
     :cond_2
     return-void
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p2
 
@@ -303,32 +303,32 @@
 .method public final unregister()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->apo:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
     const-string v1, "Unregistering connectivity change receiver"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoV:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->apo:Z
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoW:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->apq:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     :try_start_0
     invoke-virtual {v0, p0}, Landroid/content/Context;->unregisterReceiver(Landroid/content/BroadcastReceiver;)V
@@ -340,9 +340,9 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bf.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bf.smali
index 431019d570..43dd6e9726 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bf.smali
@@ -3,13 +3,13 @@
 
 
 # static fields
-.field private static final aoZ:[B
+.field private static final apt:[B
 
 
 # instance fields
-.field private final aoX:Ljava/lang/String;
+.field private final apr:Ljava/lang/String;
 
-.field private final aoY:Lcom/google/android/gms/internal/gtm/bp;
+.field private final aps:Lcom/google/android/gms/internal/gtm/bp;
 
 
 # direct methods
@@ -22,7 +22,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bf;->aoZ:[B
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bf;->apt:[B
 
     return-void
 .end method
@@ -84,15 +84,15 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aoX:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->apr:Ljava/lang/String;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/bp;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->act:Lcom/google/android/gms/common/util/e;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->acL:Lcom/google/android/gms/common/util/e;
 
     invoke-direct {v0, p1}, Lcom/google/android/gms/internal/gtm/bp;-><init>(Lcom/google/android/gms/common/util/e;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aoY:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aps:Lcom/google/android/gms/internal/gtm/bp;
 
     return-void
 .end method
@@ -116,7 +116,7 @@
 
     invoke-virtual {p0, v2, v1, p1}, Lcom/google/android/gms/internal/gtm/j;->b(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->nc()Z
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->na()Z
 
     move-result v1
 
@@ -174,13 +174,13 @@
 
     if-ne p2, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/e;->mX()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/e;->mV()V
 
     :cond_1
     const-string v2, "POST status"
@@ -363,13 +363,13 @@
 
     if-ne p1, v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/e;->mX()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/e;->mV()V
 
     :cond_0
     const-string v1, "GET status"
@@ -510,7 +510,7 @@
     invoke-virtual {p0, v3, v4, v5}, Lcom/google/android/gms/internal/gtm/j;->c(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->nc()Z
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->na()Z
 
     move-result v3
 
@@ -595,13 +595,13 @@
 
     if-ne p2, v2, :cond_3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/e;->mX()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/e;->mV()V
 
     :cond_3
     const-string v2, "POST status"
@@ -746,17 +746,17 @@
 .method private final b(Lcom/google/android/gms/internal/gtm/az;Ljava/lang/String;)Ljava/net/URL;
     .locals 4
 
-    iget-boolean p1, p1, Lcom/google/android/gms/internal/gtm/az;->aoQ:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/internal/gtm/az;->apj:Z
 
     const-string v0, "?"
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nP()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nN()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nR()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nP()Ljava/lang/String;
 
     move-result-object v1
 
@@ -809,11 +809,11 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nQ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nO()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nR()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nP()Ljava/lang/String;
 
     move-result-object v1
 
@@ -991,9 +991,9 @@
 
     invoke-virtual {p1, v0}, Ljava/net/HttpURLConnection;->setDefaultUseCaches(Z)V
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aoq:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aoI:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Integer;
 
@@ -1003,9 +1003,9 @@
 
     invoke-virtual {p1, v1}, Ljava/net/HttpURLConnection;->setConnectTimeout(I)V
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aor:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aoJ:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Integer;
 
@@ -1017,7 +1017,7 @@
 
     invoke-virtual {p1, v0}, Ljava/net/HttpURLConnection;->setInstanceFollowRedirects(Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aoX:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->apr:Ljava/lang/String;
 
     const-string v1, "User-Agent"
 
@@ -1042,11 +1042,11 @@
 .method private final d(Lcom/google/android/gms/internal/gtm/az;)Ljava/net/URL;
     .locals 2
 
-    iget-boolean p1, p1, Lcom/google/android/gms/internal/gtm/az;->aoQ:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/internal/gtm/az;->apj:Z
 
     if-eqz p1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nP()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nN()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1054,7 +1054,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nR()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nP()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1085,7 +1085,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nQ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nO()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1093,7 +1093,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nR()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nP()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1142,10 +1142,10 @@
     return-object p1
 .end method
 
-.method private final od()Ljava/net/URL;
+.method private final ob()Ljava/net/URL;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nP()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nN()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1153,9 +1153,9 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aof:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aox:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/String;
 
@@ -1204,10 +1204,10 @@
     return-object v0
 .end method
 
-.method static synthetic oe()[B
+.method static synthetic oc()[B
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bf;->aoZ:[B
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bf;->apt:[B
 
     return-object v0
 .end method
@@ -1224,7 +1224,7 @@
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
     :try_start_0
-    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->amO:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->ang:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -1308,7 +1308,7 @@
     goto :goto_0
 
     :cond_1
-    iget-wide v1, p1, Lcom/google/android/gms/internal/gtm/az;->aoO:J
+    iget-wide v1, p1, Lcom/google/android/gms/internal/gtm/az;->apg:J
 
     invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -1316,7 +1316,7 @@
 
     invoke-static {v0, v5, v1}, Lcom/google/android/gms/internal/gtm/bf;->a(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -1324,7 +1324,7 @@
 
     move-result-wide v1
 
-    iget-wide v5, p1, Lcom/google/android/gms/internal/gtm/az;->aoO:J
+    iget-wide v5, p1, Lcom/google/android/gms/internal/gtm/az;->apg:J
 
     sub-long/2addr v1, v5
 
@@ -1344,7 +1344,7 @@
 
     move-result-object p2
 
-    invoke-static {p2}, Lcom/google/android/gms/internal/gtm/bq;->bv(Ljava/lang/String;)J
+    invoke-static {p2}, Lcom/google/android/gms/internal/gtm/bq;->bq(Ljava/lang/String;)J
 
     move-result-wide v1
 
@@ -1361,7 +1361,7 @@
     goto :goto_1
 
     :cond_2
-    iget-wide p1, p1, Lcom/google/android/gms/internal/gtm/az;->aoN:J
+    iget-wide p1, p1, Lcom/google/android/gms/internal/gtm/az;->apf:J
 
     invoke-static {p1, p2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -1391,10 +1391,10 @@
     return-object p1
 .end method
 
-.method protected final mP()V
+.method protected final mN()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aoX:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->apr:Ljava/lang/String;
 
     const-string v1, "Network initialized. User agent"
 
@@ -1403,12 +1403,12 @@
     return-void
 .end method
 
-.method public final oc()Z
+.method public final oa()Z
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->getContext()Landroid/content/Context;
 
@@ -1454,7 +1454,7 @@
     :goto_1
     const-string v0, "No network connectivity"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1475,17 +1475,17 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mX()Lcom/google/android/gms/internal/gtm/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/am;->nS()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/am;->nQ()Ljava/util/Set;
 
     move-result-object v0
 
@@ -1499,11 +1499,11 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aoY:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aps:Lcom/google/android/gms/internal/gtm/bp;
 
-    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->aoo:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->aoG:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v3, Ljava/lang/Integer;
 
@@ -1526,17 +1526,17 @@
     goto :goto_1
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoh:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoz:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/gtm/ad;->bs(Ljava/lang/String;)Lcom/google/android/gms/internal/gtm/ad;
+    invoke-static {v0}, Lcom/google/android/gms/internal/gtm/ad;->bn(Ljava/lang/String;)Lcom/google/android/gms/internal/gtm/ad;
 
     move-result-object v0
 
-    sget-object v3, Lcom/google/android/gms/internal/gtm/ad;->ann:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/ad;->anF:Lcom/google/android/gms/internal/gtm/ad;
 
     if-eq v0, v3, :cond_1
 
@@ -1548,17 +1548,17 @@
     const/4 v0, 0x0
 
     :goto_0
-    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->aoi:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->aoA:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v3, Ljava/lang/String;
 
-    invoke-static {v3}, Lcom/google/android/gms/internal/gtm/ai;->bt(Ljava/lang/String;)Lcom/google/android/gms/internal/gtm/ai;
+    invoke-static {v3}, Lcom/google/android/gms/internal/gtm/ai;->bo(Ljava/lang/String;)Lcom/google/android/gms/internal/gtm/ai;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/internal/gtm/ai;->any:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v4, Lcom/google/android/gms/internal/gtm/ai;->anQ:Lcom/google/android/gms/internal/gtm/ai;
 
     if-ne v3, v4, :cond_3
 
@@ -1637,7 +1637,7 @@
 
     if-eqz v5, :cond_4
 
-    iget-wide v5, v3, Lcom/google/android/gms/internal/gtm/az;->aoN:J
+    iget-wide v5, v3, Lcom/google/android/gms/internal/gtm/az;->apf:J
 
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -1648,14 +1648,14 @@
     goto :goto_3
 
     :cond_4
-    iget p1, v1, Lcom/google/android/gms/internal/gtm/bg;->apa:I
+    iget p1, v1, Lcom/google/android/gms/internal/gtm/bg;->apu:I
 
     if-nez p1, :cond_5
 
     return-object v2
 
     :cond_5
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bf;->od()Ljava/net/URL;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bf;->ob()Ljava/net/URL;
 
     move-result-object p1
 
@@ -1663,14 +1663,14 @@
 
     const-string p1, "Failed to build batching endpoint url"
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
 
     goto :goto_5
 
     :cond_6
     if-eqz v0, :cond_7
 
-    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/bg;->apb:Ljava/io/ByteArrayOutputStream;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/bg;->apv:Ljava/io/ByteArrayOutputStream;
 
     invoke-virtual {v0}, Ljava/io/ByteArrayOutputStream;->toByteArray()[B
 
@@ -1683,7 +1683,7 @@
     goto :goto_4
 
     :cond_7
-    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/bg;->apb:Ljava/io/ByteArrayOutputStream;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/bg;->apv:Ljava/io/ByteArrayOutputStream;
 
     invoke-virtual {v0}, Ljava/io/ByteArrayOutputStream;->toByteArray()[B
 
@@ -1696,7 +1696,7 @@
     :goto_4
     if-ne v4, p1, :cond_8
 
-    iget p1, v1, Lcom/google/android/gms/internal/gtm/bg;->apa:I
+    iget p1, v1, Lcom/google/android/gms/internal/gtm/bg;->apu:I
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1717,11 +1717,11 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/am;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mX()Lcom/google/android/gms/internal/gtm/am;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/am;->nS()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/am;->nQ()Ljava/util/Set;
 
     move-result-object v0
 
@@ -1737,9 +1737,9 @@
 
     const-string p1, "Server instructed the client to stop batching"
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bf;->aoY:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bf;->aps:Lcom/google/android/gms/internal/gtm/bp;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bp;->start()V
 
@@ -1779,7 +1779,7 @@
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-boolean v5, v3, Lcom/google/android/gms/internal/gtm/az;->aoQ:Z
+    iget-boolean v5, v3, Lcom/google/android/gms/internal/gtm/az;->apj:Z
 
     xor-int/2addr v5, v2
 
@@ -1789,9 +1789,9 @@
 
     if-nez v5, :cond_c
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v5
 
@@ -1809,9 +1809,9 @@
 
     move-result v6
 
-    sget-object v7, Lcom/google/android/gms/internal/gtm/au;->aog:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v7, Lcom/google/android/gms/internal/gtm/au;->aoy:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v7, v7, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v7, v7, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v7, Ljava/lang/Integer;
 
@@ -1829,7 +1829,7 @@
 
     const-string v5, "Failed to build collect GET endpoint url"
 
-    invoke-virtual {p0, v5}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {p0, v5}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
 
     goto :goto_8
 
@@ -1856,9 +1856,9 @@
 
     if-nez v5, :cond_10
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v5
 
@@ -1875,9 +1875,9 @@
 
     array-length v6, v5
 
-    sget-object v7, Lcom/google/android/gms/internal/gtm/au;->aol:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v7, Lcom/google/android/gms/internal/gtm/au;->aoD:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v7, v7, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v7, v7, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v7, Ljava/lang/Integer;
 
@@ -1887,9 +1887,9 @@
 
     if-le v6, v7, :cond_11
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v5
 
@@ -1908,7 +1908,7 @@
 
     const-string v5, "Failed to build collect POST endpoint url"
 
-    invoke-virtual {p0, v5}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {p0, v5}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
 
     goto :goto_8
 
@@ -1924,7 +1924,7 @@
     :goto_9
     if-eqz v5, :cond_13
 
-    iget-wide v5, v3, Lcom/google/android/gms/internal/gtm/az;->aoN:J
+    iget-wide v5, v3, Lcom/google/android/gms/internal/gtm/az;->apf:J
 
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -1936,7 +1936,7 @@
 
     move-result v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nN()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nL()I
 
     move-result v5
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bg.smali
index c375ea1367..829a514cae 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bg.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field apa:I
+.field apu:I
 
-.field apb:Ljava/io/ByteArrayOutputStream;
+.field apv:Ljava/io/ByteArrayOutputStream;
 
-.field private final synthetic apc:Lcom/google/android/gms/internal/gtm/bf;
+.field private final synthetic apw:Lcom/google/android/gms/internal/gtm/bf;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/gtm/bf;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apc:Lcom/google/android/gms/internal/gtm/bf;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apw:Lcom/google/android/gms/internal/gtm/bf;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -22,7 +22,7 @@
 
     invoke-direct {p1}, Ljava/io/ByteArrayOutputStream;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apb:Ljava/io/ByteArrayOutputStream;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apv:Ljava/io/ByteArrayOutputStream;
 
     return-void
 .end method
@@ -34,13 +34,13 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/bg;->apa:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/bg;->apu:I
 
     const/4 v1, 0x1
 
     add-int/2addr v0, v1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nO()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nM()I
 
     move-result v2
 
@@ -51,7 +51,7 @@
     return v3
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->apc:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->apw:Lcom/google/android/gms/internal/gtm/bf;
 
     invoke-virtual {v0, p1, v3}, Lcom/google/android/gms/internal/gtm/bf;->a(Lcom/google/android/gms/internal/gtm/az;Z)Ljava/lang/String;
 
@@ -59,11 +59,11 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->apc:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->apw:Lcom/google/android/gms/internal/gtm/bf;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -80,17 +80,17 @@
 
     array-length v2, v0
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nK()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nI()I
 
     move-result v4
 
     if-le v2, v4, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->apc:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->apw:Lcom/google/android/gms/internal/gtm/bf;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -101,7 +101,7 @@
     return v1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apb:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apv:Ljava/io/ByteArrayOutputStream;
 
     invoke-virtual {p1}, Ljava/io/ByteArrayOutputStream;->size()I
 
@@ -112,7 +112,7 @@
     add-int/lit8 v2, v2, 0x1
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apb:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apv:Ljava/io/ByteArrayOutputStream;
 
     invoke-virtual {p1}, Ljava/io/ByteArrayOutputStream;->size()I
 
@@ -120,9 +120,9 @@
 
     add-int/2addr p1, v2
 
-    sget-object v2, Lcom/google/android/gms/internal/gtm/au;->aom:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/au;->aoE:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v2, Ljava/lang/Integer;
 
@@ -136,7 +136,7 @@
 
     :cond_4
     :try_start_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apb:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apv:Ljava/io/ByteArrayOutputStream;
 
     invoke-virtual {p1}, Ljava/io/ByteArrayOutputStream;->size()I
 
@@ -144,33 +144,33 @@
 
     if-lez p1, :cond_5
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apb:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apv:Ljava/io/ByteArrayOutputStream;
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->oe()[B
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->oc()[B
 
     move-result-object v2
 
     invoke-virtual {p1, v2}, Ljava/io/ByteArrayOutputStream;->write([B)V
 
     :cond_5
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apb:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apv:Ljava/io/ByteArrayOutputStream;
 
     invoke-virtual {p1, v0}, Ljava/io/ByteArrayOutputStream;->write([B)V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apa:I
+    iget p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apu:I
 
     add-int/2addr p1, v1
 
-    iput p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apa:I
+    iput p1, p0, Lcom/google/android/gms/internal/gtm/bg;->apu:I
 
     return v1
 
     :catch_0
     move-exception p1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->apc:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->apw:Lcom/google/android/gms/internal/gtm/bf;
 
     const-string v2, "Failed to write payload when batching hits"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bh.smali
index 5dcaa8f55e..72d3c0664d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bh.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field apd:Landroid/content/SharedPreferences;
+.field final apA:Lcom/google/android/gms/internal/gtm/bi;
 
-.field private ape:J
+.field apx:Landroid/content/SharedPreferences;
 
-.field private apf:J
+.field private apy:J
 
-.field final apg:Lcom/google/android/gms/internal/gtm/bi;
+.field private apz:J
 
 
 # direct methods
@@ -20,13 +20,13 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apf:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apz:J
 
     new-instance p1, Lcom/google/android/gms/internal/gtm/bi;
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoB:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoT:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -44,21 +44,21 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/internal/gtm/bi;-><init>(Lcom/google/android/gms/internal/gtm/bh;Ljava/lang/String;JB)V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bh;->apg:Lcom/google/android/gms/internal/gtm/bi;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bh;->apA:Lcom/google/android/gms/internal/gtm/bi;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final bu(Ljava/lang/String;)V
+.method public final bp(Ljava/lang/String;)V
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -88,13 +88,13 @@
 
     const-string p1, "Failed to commit campaign data"
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     :cond_1
     return-void
 .end method
 
-.method protected final mP()V
+.method protected final mN()V
     .locals 3
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->getContext()Landroid/content/Context;
@@ -109,19 +109,19 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
     return-void
 .end method
 
-.method public final of()J
+.method public final od()J
     .locals 6
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->ape:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apy:J
 
     const-wide/16 v2, 0x0
 
@@ -129,7 +129,7 @@
 
     if-nez v4, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
     const-string v1, "first_run"
 
@@ -141,12 +141,12 @@
 
     if-eqz v0, :cond_0
 
-    iput-wide v4, p0, Lcom/google/android/gms/internal/gtm/bh;->ape:J
+    iput-wide v4, p0, Lcom/google/android/gms/internal/gtm/bh;->apy:J
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -154,7 +154,7 @@
 
     move-result-wide v2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -170,28 +170,28 @@
 
     const-string v0, "Failed to commit first run time"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     :cond_1
-    iput-wide v2, p0, Lcom/google/android/gms/internal/gtm/bh;->ape:J
+    iput-wide v2, p0, Lcom/google/android/gms/internal/gtm/bh;->apy:J
 
     :cond_2
     :goto_0
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->ape:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apy:J
 
     return-wide v0
 .end method
 
-.method public final og()Lcom/google/android/gms/internal/gtm/bp;
+.method public final oe()Lcom/google/android/gms/internal/gtm/bp;
     .locals 4
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/bp;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bh;->of()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bh;->od()J
 
     move-result-wide v2
 
@@ -200,14 +200,14 @@
     return-object v0
 .end method
 
-.method public final oh()J
+.method public final of()J
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apf:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apz:J
 
     const-wide/16 v2, -0x1
 
@@ -215,7 +215,7 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
     const-wide/16 v1, 0x0
 
@@ -225,22 +225,22 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apf:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apz:J
 
     :cond_0
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apf:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apz:J
 
     return-wide v0
 .end method
 
-.method public final oi()V
+.method public final og()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -248,7 +248,7 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
     invoke-interface {v2}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -260,19 +260,19 @@
 
     invoke-interface {v2}, Landroid/content/SharedPreferences$Editor;->apply()V
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apf:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apz:J
 
     return-void
 .end method
 
-.method public final oj()Ljava/lang/String;
+.method public final oh()Ljava/lang/String;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bi.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bi.smali
index 5007089c23..b64f323508 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bi.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bi.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field private final aph:J
+.field private final apB:J
 
-.field final synthetic apj:Lcom/google/android/gms/internal/gtm/bh;
+.field final synthetic apC:Lcom/google/android/gms/internal/gtm/bh;
 
 .field private final name:Ljava/lang/String;
 
@@ -14,11 +14,11 @@
 .method private constructor <init>(Lcom/google/android/gms/internal/gtm/bh;Ljava/lang/String;J)V
     .locals 2
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bi;->apj:Lcom/google/android/gms/internal/gtm/bh;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bi;->apC:Lcom/google/android/gms/internal/gtm/bh;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const-wide/16 v0, 0x0
 
@@ -38,7 +38,7 @@
 
     iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bi;->name:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/internal/gtm/bi;->aph:J
+    iput-wide p3, p0, Lcom/google/android/gms/internal/gtm/bi;->apB:J
 
     return-void
 .end method
@@ -51,7 +51,7 @@
     return-void
 .end method
 
-.method private final on()Ljava/lang/String;
+.method private final ol()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->name:Ljava/lang/String;
@@ -71,12 +71,12 @@
 
 
 # virtual methods
-.method final ok()V
+.method final oi()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->apj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->apC:Lcom/google/android/gms/internal/gtm/bh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -84,27 +84,27 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bi;->apj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bi;->apC:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
     invoke-interface {v2}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->oo()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->om()Ljava/lang/String;
 
     move-result-object v3
 
     invoke-interface {v2, v3}, Landroid/content/SharedPreferences$Editor;->remove(Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->op()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->on()Ljava/lang/String;
 
     move-result-object v3
 
     invoke-interface {v2, v3}, Landroid/content/SharedPreferences$Editor;->remove(Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bi;->on()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bi;->ol()Ljava/lang/String;
 
     move-result-object v3
 
@@ -115,7 +115,7 @@
     return-void
 .end method
 
-.method public final ol()Landroid/util/Pair;
+.method public final oj()Landroid/util/Pair;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -127,7 +127,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->om()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->ok()J
 
     move-result-wide v0
 
@@ -142,9 +142,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/bi;->apj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/bi;->apC:Lcom/google/android/gms/internal/gtm/bh;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v4
 
@@ -159,7 +159,7 @@
     move-result-wide v0
 
     :goto_0
-    iget-wide v4, p0, Lcom/google/android/gms/internal/gtm/bi;->aph:J
+    iget-wide v4, p0, Lcom/google/android/gms/internal/gtm/bi;->apB:J
 
     const/4 v6, 0x0
 
@@ -178,16 +178,16 @@
 
     if-lez v7, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->oi()V
 
     return-object v6
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->apj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->apC:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->op()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->on()Ljava/lang/String;
 
     move-result-object v1
 
@@ -195,11 +195,11 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bi;->apj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bi;->apC:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->oo()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->om()Ljava/lang/String;
 
     move-result-object v4
 
@@ -207,7 +207,7 @@
 
     move-result-wide v4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->oi()V
 
     if-eqz v0, :cond_4
 
@@ -233,14 +233,14 @@
     return-object v6
 .end method
 
-.method final om()J
+.method final ok()J
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->apj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->apC:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bh;->apd:Landroid/content/SharedPreferences;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bh;->apx:Landroid/content/SharedPreferences;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bi;->on()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bi;->ol()Ljava/lang/String;
 
     move-result-object v1
 
@@ -253,7 +253,7 @@
     return-wide v0
 .end method
 
-.method final oo()Ljava/lang/String;
+.method final om()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->name:Ljava/lang/String;
@@ -271,7 +271,7 @@
     return-object v0
 .end method
 
-.method final op()Ljava/lang/String;
+.method final on()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->name:Ljava/lang/String;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bj.smali
index 9f9cd7e474..e0b98c6c48 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bj.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field private static acd:Ljava/lang/Boolean;
+.field private static acw:Ljava/lang/Boolean;
 
-.field static apk:Lcom/google/android/gms/stats/a;
+.field static apD:Lcom/google/android/gms/stats/a;
 
 .field static lock:Ljava/lang/Object;
 
@@ -36,7 +36,7 @@
 
     invoke-static {p0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bj;->acd:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bj;->acw:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
@@ -59,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bj;->acd:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bj;->acw:Ljava/lang/Boolean;
 
     return p0
 .end method
@@ -71,7 +71,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -79,7 +79,7 @@
 
     const-string p0, "AnalyticsReceiver called with null intent"
 
-    invoke-virtual {v0, p0}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {v0, p0}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     return-void
 
@@ -139,7 +139,7 @@
 
     :cond_1
     :try_start_1
-    sget-object p1, Lcom/google/android/gms/internal/gtm/bj;->apk:Lcom/google/android/gms/stats/a;
+    sget-object p1, Lcom/google/android/gms/internal/gtm/bj;->apD:Lcom/google/android/gms/stats/a;
 
     const/4 v1, 0x0
 
@@ -151,26 +151,26 @@
 
     invoke-direct {p1, p0, v3}, Lcom/google/android/gms/stats/a;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    sput-object p1, Lcom/google/android/gms/internal/gtm/bj;->apk:Lcom/google/android/gms/stats/a;
+    sput-object p1, Lcom/google/android/gms/internal/gtm/bj;->apD:Lcom/google/android/gms/stats/a;
 
-    iget-object p0, p1, Lcom/google/android/gms/stats/a;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object p0, p1, Lcom/google/android/gms/stats/a;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {p0, v1}, Landroid/os/PowerManager$WakeLock;->setReferenceCounted(Z)V
 
-    iput-boolean v1, p1, Lcom/google/android/gms/stats/a;->aOt:Z
+    iput-boolean v1, p1, Lcom/google/android/gms/stats/a;->aOL:Z
 
     :cond_2
-    sget-object p0, Lcom/google/android/gms/internal/gtm/bj;->apk:Lcom/google/android/gms/stats/a;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/bj;->apD:Lcom/google/android/gms/stats/a;
 
-    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aPa:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aPs:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/stats/a;->zV()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/stats/a;->zR()Ljava/lang/String;
 
     move-result-object v7
 
-    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aOR:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aPj:Ljava/lang/Object;
 
     monitor-enter p1
     :try_end_1
@@ -178,7 +178,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    iget-object v3, p0, Lcom/google/android/gms/stats/a;->aOX:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/stats/a;->aPp:Ljava/util/Map;
 
     invoke-interface {v3}, Ljava/util/Map;->isEmpty()Z
 
@@ -186,12 +186,12 @@
 
     if-eqz v3, :cond_3
 
-    iget v3, p0, Lcom/google/android/gms/stats/a;->aOZ:I
+    iget v3, p0, Lcom/google/android/gms/stats/a;->aPr:I
 
     if-lez v3, :cond_4
 
     :cond_3
-    iget-object v3, p0, Lcom/google/android/gms/stats/a;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object v3, p0, Lcom/google/android/gms/stats/a;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v3}, Landroid/os/PowerManager$WakeLock;->isHeld()Z
 
@@ -199,20 +199,20 @@
 
     if-nez v3, :cond_4
 
-    iget-object v3, p0, Lcom/google/android/gms/stats/a;->aOX:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/stats/a;->aPp:Ljava/util/Map;
 
     invoke-interface {v3}, Ljava/util/Map;->clear()V
 
-    iput v1, p0, Lcom/google/android/gms/stats/a;->aOZ:I
+    iput v1, p0, Lcom/google/android/gms/stats/a;->aPr:I
 
     :cond_4
-    iget-boolean v3, p0, Lcom/google/android/gms/stats/a;->aOt:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/stats/a;->aOL:Z
 
     const/4 v13, 0x1
 
     if-eqz v3, :cond_6
 
-    iget-object v3, p0, Lcom/google/android/gms/stats/a;->aOX:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/stats/a;->aPp:Ljava/util/Map;
 
     invoke-interface {v3, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -222,7 +222,7 @@
 
     if-nez v3, :cond_5
 
-    iget-object v3, p0, Lcom/google/android/gms/stats/a;->aOX:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/stats/a;->aPp:Ljava/util/Map;
 
     new-array v4, v13, [Ljava/lang/Integer;
 
@@ -257,20 +257,20 @@
     if-nez v1, :cond_7
 
     :cond_6
-    iget-boolean v1, p0, Lcom/google/android/gms/stats/a;->aOt:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/stats/a;->aOL:Z
 
     if-nez v1, :cond_8
 
-    iget v1, p0, Lcom/google/android/gms/stats/a;->aOZ:I
+    iget v1, p0, Lcom/google/android/gms/stats/a;->aPr:I
 
     if-nez v1, :cond_8
 
     :cond_7
-    invoke-static {}, Lcom/google/android/gms/common/stats/d;->mq()Lcom/google/android/gms/common/stats/d;
+    invoke-static {}, Lcom/google/android/gms/common/stats/d;->mo()Lcom/google/android/gms/common/stats/d;
 
-    iget-object v3, p0, Lcom/google/android/gms/stats/a;->aOW:Landroid/content/Context;
+    iget-object v3, p0, Lcom/google/android/gms/stats/a;->aPo:Landroid/content/Context;
 
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-static {v1, v7}, Lcom/google/android/gms/common/stats/c;->a(Landroid/os/PowerManager$WakeLock;Ljava/lang/String;)Ljava/lang/String;
 
@@ -278,13 +278,13 @@
 
     const/4 v5, 0x7
 
-    iget-object v6, p0, Lcom/google/android/gms/stats/a;->aOq:Ljava/lang/String;
+    iget-object v6, p0, Lcom/google/android/gms/stats/a;->aOI:Ljava/lang/String;
 
     const/4 v8, 0x0
 
     iget v9, p0, Lcom/google/android/gms/stats/a;->zzd:I
 
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aOT:Landroid/os/WorkSource;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aPl:Landroid/os/WorkSource;
 
     invoke-static {v1}, Lcom/google/android/gms/common/util/p;->b(Landroid/os/WorkSource;)Ljava/util/List;
 
@@ -294,11 +294,11 @@
 
     invoke-static/range {v3 .. v12}, Lcom/google/android/gms/common/stats/d;->a(Landroid/content/Context;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/util/List;J)V
 
-    iget v1, p0, Lcom/google/android/gms/stats/a;->aOZ:I
+    iget v1, p0, Lcom/google/android/gms/stats/a;->aPr:I
 
     add-int/2addr v1, v13
 
-    iput v1, p0, Lcom/google/android/gms/stats/a;->aOZ:I
+    iput v1, p0, Lcom/google/android/gms/stats/a;->aPr:I
 
     :cond_8
     monitor-exit p1
@@ -306,11 +306,11 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {p1}, Landroid/os/PowerManager$WakeLock;->acquire()V
 
-    sget-object p1, Lcom/google/android/gms/stats/a;->aPb:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object p1, Lcom/google/android/gms/stats/a;->aPt:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v1, Lcom/google/android/gms/stats/c;
 
@@ -345,7 +345,7 @@
     :try_start_6
     const-string p0, "Analytics service at risk of not starting. For more reliable analytics, add the WAKE_LOCK permission to your manifest. See http://goo.gl/8Rd3yj for instructions."
 
-    invoke-virtual {v0, p0}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {v0, p0}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     :goto_1
     monitor-exit v2
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bk.smali
index f42c8a9f09..6c2df32d59 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bk.smali
@@ -16,11 +16,11 @@
 
 
 # static fields
-.field private static apm:Ljava/lang/Boolean;
+.field private static apF:Ljava/lang/Boolean;
 
 
 # instance fields
-.field public final apl:Landroid/content/Context;
+.field public final apE:Landroid/content/Context;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -44,7 +44,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bk;->apl:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bk;->apE:Landroid/content/Context;
 
     new-instance p1, Lcom/google/android/gms/internal/gtm/bv;
 
@@ -60,7 +60,7 @@
 
     invoke-static {p0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bk;->apm:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bk;->apF:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
@@ -81,7 +81,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bk;->apm:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bk;->apF:Ljava/lang/Boolean;
 
     return p0
 .end method
@@ -101,11 +101,11 @@
     .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bj;->apk:Lcom/google/android/gms/stats/a;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bj;->apD:Lcom/google/android/gms/stats/a;
 
     if-eqz v0, :cond_6
 
-    iget-object v3, v0, Lcom/google/android/gms/stats/a;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object v3, v0, Lcom/google/android/gms/stats/a;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v3}, Landroid/os/PowerManager$WakeLock;->isHeld()Z
 
@@ -113,7 +113,7 @@
 
     if-eqz v3, :cond_6
 
-    iget-object v3, v0, Lcom/google/android/gms/stats/a;->aPa:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v3, v0, Lcom/google/android/gms/stats/a;->aPs:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
 
@@ -123,7 +123,7 @@
 
     const-string v3, "WakeLock"
 
-    iget-object v4, v0, Lcom/google/android/gms/stats/a;->aOq:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/stats/a;->aOI:Ljava/lang/String;
 
     invoke-static {v4}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -138,24 +138,24 @@
     invoke-static {v3, v4}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/stats/a;->zV()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/stats/a;->zR()Ljava/lang/String;
 
     move-result-object v9
 
-    iget-object v3, v0, Lcom/google/android/gms/stats/a;->aOR:Ljava/lang/Object;
+    iget-object v3, v0, Lcom/google/android/gms/stats/a;->aPj:Ljava/lang/Object;
 
     monitor-enter v3
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    iget-boolean v4, v0, Lcom/google/android/gms/stats/a;->aOt:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/stats/a;->aOL:Z
 
     const/4 v15, 0x1
 
     if-eqz v4, :cond_3
 
-    iget-object v4, v0, Lcom/google/android/gms/stats/a;->aOX:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/stats/a;->aPp:Ljava/util/Map;
 
     invoke-interface {v4, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -178,7 +178,7 @@
 
     if-ne v6, v15, :cond_2
 
-    iget-object v4, v0, Lcom/google/android/gms/stats/a;->aOX:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/stats/a;->aPp:Ljava/util/Map;
 
     invoke-interface {v4, v9}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -205,30 +205,30 @@
     if-nez v5, :cond_4
 
     :cond_3
-    iget-boolean v4, v0, Lcom/google/android/gms/stats/a;->aOt:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/stats/a;->aOL:Z
 
     if-nez v4, :cond_5
 
-    iget v4, v0, Lcom/google/android/gms/stats/a;->aOZ:I
+    iget v4, v0, Lcom/google/android/gms/stats/a;->aPr:I
 
     if-ne v4, v15, :cond_5
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/common/stats/d;->mq()Lcom/google/android/gms/common/stats/d;
+    invoke-static {}, Lcom/google/android/gms/common/stats/d;->mo()Lcom/google/android/gms/common/stats/d;
 
-    iget-object v5, v0, Lcom/google/android/gms/stats/a;->aOW:Landroid/content/Context;
+    iget-object v5, v0, Lcom/google/android/gms/stats/a;->aPo:Landroid/content/Context;
 
-    iget-object v4, v0, Lcom/google/android/gms/stats/a;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object v4, v0, Lcom/google/android/gms/stats/a;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-static {v4, v9}, Lcom/google/android/gms/common/stats/c;->a(Landroid/os/PowerManager$WakeLock;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v6
 
-    iget-object v8, v0, Lcom/google/android/gms/stats/a;->aOq:Ljava/lang/String;
+    iget-object v8, v0, Lcom/google/android/gms/stats/a;->aOI:Ljava/lang/String;
 
     iget v11, v0, Lcom/google/android/gms/stats/a;->zzd:I
 
-    iget-object v4, v0, Lcom/google/android/gms/stats/a;->aOT:Landroid/os/WorkSource;
+    iget-object v4, v0, Lcom/google/android/gms/stats/a;->aPl:Landroid/os/WorkSource;
 
     invoke-static {v4}, Lcom/google/android/gms/common/util/p;->b(Landroid/os/WorkSource;)Ljava/util/List;
 
@@ -242,11 +242,11 @@
 
     invoke-static/range {v5 .. v14}, Lcom/google/android/gms/common/stats/d;->a(Landroid/content/Context;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/util/List;J)V
 
-    iget v4, v0, Lcom/google/android/gms/stats/a;->aOZ:I
+    iget v4, v0, Lcom/google/android/gms/stats/a;->aPr:I
 
     sub-int/2addr v4, v15
 
-    iput v4, v0, Lcom/google/android/gms/stats/a;->aOZ:I
+    iput v4, v0, Lcom/google/android/gms/stats/a;->aPr:I
 
     :cond_5
     monitor-exit v3
@@ -254,7 +254,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    invoke-virtual {v0}, Lcom/google/android/gms/stats/a;->zU()V
+    invoke-virtual {v0}, Lcom/google/android/gms/stats/a;->zQ()V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
@@ -293,13 +293,13 @@
     nop
 
     :goto_2
-    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/bk;->apl:Landroid/content/Context;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/bk;->apE:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/m;->ab(Landroid/content/Context;)Lcom/google/android/gms/internal/gtm/m;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -309,7 +309,7 @@
 
     const-string v3, "AnalyticsService started with null intent"
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     return v2
 
@@ -349,13 +349,13 @@
 .method public final g(Ljava/lang/Runnable;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->apl:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->apE:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/m;->ab(Landroid/content/Context;)Lcom/google/android/gms/internal/gtm/m;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v0
 
@@ -371,19 +371,19 @@
 .method public final onCreate()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->apl:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->apE:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/m;->ab(Landroid/content/Context;)Lcom/google/android/gms/internal/gtm/m;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
     const-string v1, "Local AnalyticsService is starting up"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     return-void
 .end method
@@ -391,19 +391,19 @@
 .method public final onDestroy()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->apl:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->apE:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/m;->ab(Landroid/content/Context;)Lcom/google/android/gms/internal/gtm/m;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
     const-string v1, "Local AnalyticsService is shutting down"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bl.smali
index ea21f8652a..fa21e64dc5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bl.smali
@@ -6,11 +6,11 @@
 
 
 # instance fields
-.field private final apn:Lcom/google/android/gms/internal/gtm/bk;
+.field private final apG:Lcom/google/android/gms/internal/gtm/bk;
 
-.field private final apo:I
+.field private final apH:I
 
-.field private final apq:Lcom/google/android/gms/internal/gtm/bd;
+.field private final apI:Lcom/google/android/gms/internal/gtm/bd;
 
 
 # direct methods
@@ -19,11 +19,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bl;->apn:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bl;->apG:Lcom/google/android/gms/internal/gtm/bk;
 
-    iput p2, p0, Lcom/google/android/gms/internal/gtm/bl;->apo:I
+    iput p2, p0, Lcom/google/android/gms/internal/gtm/bl;->apH:I
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/bl;->apq:Lcom/google/android/gms/internal/gtm/bd;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/bl;->apI:Lcom/google/android/gms/internal/gtm/bd;
 
     return-void
 .end method
@@ -33,13 +33,13 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bl;->apn:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bl;->apG:Lcom/google/android/gms/internal/gtm/bk;
 
-    iget v1, p0, Lcom/google/android/gms/internal/gtm/bl;->apo:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/bl;->apH:I
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bl;->apq:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bl;->apI:Lcom/google/android/gms/internal/gtm/bd;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bk;->apl:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bk;->apE:Landroid/content/Context;
 
     check-cast v0, Lcom/google/android/gms/internal/gtm/bo;
 
@@ -51,7 +51,7 @@
 
     const-string v0, "Local AnalyticsService processed last dispatch request"
 
-    invoke-virtual {v2, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {v2, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bm.smali
index cda9d773d0..b15e3d2a14 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bm.smali
@@ -6,11 +6,11 @@
 
 
 # instance fields
-.field private final apn:Lcom/google/android/gms/internal/gtm/bk;
+.field private final apG:Lcom/google/android/gms/internal/gtm/bk;
 
-.field private final apr:Lcom/google/android/gms/internal/gtm/bd;
+.field private final apJ:Lcom/google/android/gms/internal/gtm/bd;
 
-.field private final aps:Landroid/app/job/JobParameters;
+.field private final apK:Landroid/app/job/JobParameters;
 
 
 # direct methods
@@ -19,11 +19,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bm;->apn:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bm;->apG:Lcom/google/android/gms/internal/gtm/bk;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bm;->apr:Lcom/google/android/gms/internal/gtm/bd;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bm;->apJ:Lcom/google/android/gms/internal/gtm/bd;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/bm;->aps:Landroid/app/job/JobParameters;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/bm;->apK:Landroid/app/job/JobParameters;
 
     return-void
 .end method
@@ -33,17 +33,17 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bm;->apn:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bm;->apG:Lcom/google/android/gms/internal/gtm/bk;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bm;->apr:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bm;->apJ:Lcom/google/android/gms/internal/gtm/bd;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bm;->aps:Landroid/app/job/JobParameters;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bm;->apK:Landroid/app/job/JobParameters;
 
     const-string v3, "AnalyticsJobService processed last dispatch request"
 
-    invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bk;->apl:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bk;->apE:Landroid/content/Context;
 
     check-cast v0, Lcom/google/android/gms/internal/gtm/bo;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bn.smali
index 18f1a4309f..44f4238c6d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bn.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic apt:Ljava/lang/Runnable;
+.field private final synthetic apL:Ljava/lang/Runnable;
 
-.field private final synthetic apu:Lcom/google/android/gms/internal/gtm/bk;
+.field private final synthetic apM:Lcom/google/android/gms/internal/gtm/bk;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/bk;Ljava/lang/Runnable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bn;->apu:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bn;->apM:Lcom/google/android/gms/internal/gtm/bk;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bn;->apt:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bn;->apL:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,14 +26,14 @@
 
 
 # virtual methods
-.method public final nC()V
+.method public final nA()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bn;->apu:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bn;->apM:Lcom/google/android/gms/internal/gtm/bk;
 
     iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bk;->handler:Landroid/os/Handler;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bn;->apt:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bn;->apL:Ljava/lang/Runnable;
 
     invoke-virtual {v0, v1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bp.smali
index 227a998fcf..9ee74eecf0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bp.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final act:Lcom/google/android/gms/common/util/e;
+.field private final acL:Lcom/google/android/gms/common/util/e;
 
 .field startTime:J
 
@@ -16,7 +16,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bp;->act:Lcom/google/android/gms/common/util/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bp;->acL:Lcom/google/android/gms/common/util/e;
 
     return-void
 .end method
@@ -28,7 +28,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bp;->act:Lcom/google/android/gms/common/util/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bp;->acL:Lcom/google/android/gms/common/util/e;
 
     iput-wide p2, p0, Lcom/google/android/gms/internal/gtm/bp;->startTime:J
 
@@ -40,7 +40,7 @@
 .method public final start()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bp;->act:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bp;->acL:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->elapsedRealtime()J
 
@@ -67,7 +67,7 @@
     return v2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bp;->act:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bp;->acL:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->elapsedRealtime()J
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bq.smali
index 7aac80fe75..b70014da33 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bq.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final apv:[C
+.field private static final apN:[C
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bq;->apv:[C
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bq;->apN:[C
 
     return-void
 
@@ -110,7 +110,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apP:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqh:Ljava/lang/String;
 
     const-string v0, "utm_medium"
 
@@ -120,7 +120,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apN:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqf:Ljava/lang/String;
 
     const-string v0, "utm_campaign"
 
@@ -140,7 +140,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apM:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqe:Ljava/lang/String;
 
     const-string v0, "utm_term"
 
@@ -150,7 +150,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apO:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqg:Ljava/lang/String;
 
     const-string v0, "utm_id"
 
@@ -160,7 +160,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->anw:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->anO:Ljava/lang/String;
 
     const-string v0, "anid"
 
@@ -170,7 +170,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apQ:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqi:Ljava/lang/String;
 
     const-string v0, "gclid"
 
@@ -180,7 +180,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apR:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqj:Ljava/lang/String;
 
     const-string v0, "dclid"
 
@@ -190,7 +190,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apS:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqk:Ljava/lang/String;
 
     const-string v0, "aclid"
 
@@ -370,7 +370,7 @@
     return-object p0
 .end method
 
-.method public static bv(Ljava/lang/String;)J
+.method public static bq(Ljava/lang/String;)J
     .locals 2
 
     const-wide/16 v0, 0x0
@@ -391,7 +391,7 @@
     return-wide v0
 .end method
 
-.method public static bw(Ljava/lang/String;)Ljava/security/MessageDigest;
+.method public static br(Ljava/lang/String;)Ljava/security/MessageDigest;
     .locals 2
 
     const/4 v0, 0x0
@@ -424,7 +424,7 @@
     return-object p0
 .end method
 
-.method public static bx(Ljava/lang/String;)Z
+.method public static bs(Ljava/lang/String;)Z
     .locals 2
 
     invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/br.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/br.smali
index b281368512..569878bc88 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/br.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/br.smali
@@ -3,19 +3,19 @@
 
 
 # instance fields
-.field private aoH:Ljava/lang/String;
+.field private aoZ:Ljava/lang/String;
 
-.field private aoI:Ljava/lang/String;
+.field private apO:I
 
-.field protected aoK:I
+.field protected apP:Z
 
-.field private apw:I
+.field private apQ:Z
 
-.field protected apx:Z
+.field private apR:Z
 
-.field private apy:Z
+.field private apa:Ljava/lang/String;
 
-.field private apz:Z
+.field protected apc:I
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
 
 # virtual methods
-.method protected final mP()V
+.method protected final mN()V
     .locals 6
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->getContext()Landroid/content/Context;
@@ -69,7 +69,7 @@
 
     const-string v0, "Couldn\'t get ApplicationInfo to load global config"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     return-void
 
@@ -88,7 +88,7 @@
 
     new-instance v1, Lcom/google/android/gms/internal/gtm/aw;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
     invoke-direct {v1, v2}, Lcom/google/android/gms/internal/gtm/aw;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
@@ -102,9 +102,9 @@
 
     const-string v1, "Loading global XML config values"
 
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aoH:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aoZ:Ljava/lang/String;
 
     const/4 v2, 0x0
 
@@ -122,16 +122,16 @@
     :goto_1
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aoH:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aoZ:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/br;->aoH:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/br;->aoZ:Ljava/lang/String;
 
     const-string v4, "XML config - app name"
 
     invoke-virtual {p0, v4, v1}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aoI:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->apa:Ljava/lang/String;
 
     if-eqz v1, :cond_3
 
@@ -145,16 +145,16 @@
     :goto_2
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aoI:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->apa:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/br;->aoI:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/br;->apa:Ljava/lang/String;
 
     const-string v4, "XML config - app version"
 
     invoke-virtual {p0, v4, v1}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_4
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aoJ:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->apb:Ljava/lang/String;
 
     if-eqz v1, :cond_5
 
@@ -170,7 +170,7 @@
 
     if-eqz v1, :cond_a
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aoJ:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->apb:Ljava/lang/String;
 
     sget-object v5, Ljava/util/Locale;->US:Ljava/util/Locale;
 
@@ -235,7 +235,7 @@
     :goto_4
     if-ltz v1, :cond_a
 
-    iput v1, p0, Lcom/google/android/gms/internal/gtm/br;->apw:I
+    iput v1, p0, Lcom/google/android/gms/internal/gtm/br;->apO:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -246,7 +246,7 @@
     invoke-virtual {p0, v5, v1}, Lcom/google/android/gms/internal/gtm/j;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_a
-    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aoK:I
+    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->apc:I
 
     if-ltz v1, :cond_b
 
@@ -260,11 +260,11 @@
     :goto_5
     if-eqz v1, :cond_c
 
-    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aoK:I
+    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->apc:I
 
-    iput v1, p0, Lcom/google/android/gms/internal/gtm/br;->aoK:I
+    iput v1, p0, Lcom/google/android/gms/internal/gtm/br;->apc:I
 
-    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/br;->apx:Z
+    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/br;->apP:Z
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -275,20 +275,20 @@
     invoke-virtual {p0, v5, v1}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_c
-    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aoL:I
+    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->apd:I
 
     if-eq v1, v4, :cond_e
 
-    iget v0, v0, Lcom/google/android/gms/internal/gtm/ay;->aoL:I
+    iget v0, v0, Lcom/google/android/gms/internal/gtm/ay;->apd:I
 
     if-ne v0, v3, :cond_d
 
     const/4 v2, 0x1
 
     :cond_d
-    iput-boolean v2, p0, Lcom/google/android/gms/internal/gtm/br;->apz:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/internal/gtm/br;->apR:Z
 
-    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/br;->apy:Z
+    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/br;->apQ:Z
 
     invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -302,52 +302,52 @@
     return-void
 .end method
 
-.method public final oq()Ljava/lang/String;
+.method public final oo()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/br;->aoI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/br;->apa:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final or()Ljava/lang/String;
+.method public final op()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/br;->aoH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/br;->aoZ:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final os()Z
+.method public final oq()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     const/4 v0, 0x0
 
     return v0
 .end method
 
-.method public final ot()Z
+.method public final or()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/br;->apy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/br;->apQ:Z
 
     return v0
 .end method
 
-.method public final ou()Z
+.method public final os()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/br;->apz:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/br;->apR:Z
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bs.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bs.smali
index 6fd0dbac04..a6816651fa 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bs.smali
@@ -3,36 +3,36 @@
 
 
 # static fields
-.field private static final apB:Ljava/lang/reflect/Method;
+.field private static final apT:Ljava/lang/reflect/Method;
 
-.field private static final apC:Ljava/lang/reflect/Method;
+.field private static final apU:Ljava/lang/reflect/Method;
 
-.field private static volatile apD:Lcom/google/android/gms/internal/gtm/bu;
+.field private static volatile apV:Lcom/google/android/gms/internal/gtm/bu;
 
 
 # instance fields
-.field private final apA:Landroid/app/job/JobScheduler;
+.field private final apS:Landroid/app/job/JobScheduler;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->ov()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->ot()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->apB:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->apT:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->ow()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->ou()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->apC:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->apU:Ljava/lang/reflect/Method;
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bt;->apE:Lcom/google/android/gms/internal/gtm/bu;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bt;->apW:Lcom/google/android/gms/internal/gtm/bu;
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->apD:Lcom/google/android/gms/internal/gtm/bu;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->apV:Lcom/google/android/gms/internal/gtm/bu;
 
     return-void
 .end method
@@ -42,7 +42,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bs;->apA:Landroid/app/job/JobScheduler;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bs;->apS:Landroid/app/job/JobScheduler;
 
     return-void
 .end method
@@ -50,12 +50,12 @@
 .method private final a(Landroid/app/job/JobInfo;Ljava/lang/String;ILjava/lang/String;)I
     .locals 4
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bs;->apB:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bs;->apT:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bs;->apA:Landroid/app/job/JobScheduler;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bs;->apS:Landroid/app/job/JobScheduler;
 
     const/4 v2, 0x4
 
@@ -110,7 +110,7 @@
     invoke-static {p4, p3, p2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/bs;->apA:Landroid/app/job/JobScheduler;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/bs;->apS:Landroid/app/job/JobScheduler;
 
     invoke-virtual {p2, p1}, Landroid/app/job/JobScheduler;->schedule(Landroid/app/job/JobInfo;)I
 
@@ -130,13 +130,13 @@
 
     check-cast v0, Landroid/app/job/JobScheduler;
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/bs;->apB:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/bs;->apT:Ljava/lang/reflect/Method;
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/bs;->apD:Lcom/google/android/gms/internal/gtm/bu;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/bs;->apV:Lcom/google/android/gms/internal/gtm/bu;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/gtm/bu;->oz()Z
+    invoke-interface {v1}, Lcom/google/android/gms/internal/gtm/bu;->ox()Z
 
     move-result v1
 
@@ -157,7 +157,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/gtm/bs;-><init>(Landroid/app/job/JobScheduler;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->ox()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->ov()I
 
     move-result v0
 
@@ -176,7 +176,7 @@
     return p0
 .end method
 
-.method private static ov()Ljava/lang/reflect/Method;
+.method private static ot()Ljava/lang/reflect/Method;
     .locals 5
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -249,7 +249,7 @@
     return-object v0
 .end method
 
-.method private static ow()Ljava/lang/reflect/Method;
+.method private static ou()Ljava/lang/reflect/Method;
     .locals 3
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -294,10 +294,10 @@
     return-object v1
 .end method
 
-.method private static ox()I
+.method private static ov()I
     .locals 4
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bs;->apC:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bs;->apU:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
@@ -350,7 +350,7 @@
     return v1
 .end method
 
-.method static final synthetic oy()Z
+.method static final synthetic ow()Z
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bt.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bt.smali
index 7ac8889f00..0db596caa6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bt.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bt.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final apE:Lcom/google/android/gms/internal/gtm/bu;
+.field static final apW:Lcom/google/android/gms/internal/gtm/bu;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/gtm/bt;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bt;->apE:Lcom/google/android/gms/internal/gtm/bu;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bt;->apW:Lcom/google/android/gms/internal/gtm/bu;
 
     return-void
 .end method
@@ -32,10 +32,10 @@
 
 
 # virtual methods
-.method public final oz()Z
+.method public final ox()Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->oy()Z
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->ow()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bu.smali
index 6217addf57..6d31ab8433 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bu.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract oz()Z
+.method public abstract ox()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bv.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bv.smali
index 395edbf15c..bc7413526d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bv.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static volatile apF:Lcom/google/android/gms/internal/gtm/bw;
+.field private static volatile apX:Lcom/google/android/gms/internal/gtm/bw;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bx.smali
index ad1170deeb..c193d34090 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bx.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field final apG:Landroid/os/IBinder;
+.field final apY:Landroid/os/IBinder;
 
-.field final apH:Ljava/lang/String;
+.field final apZ:Ljava/lang/String;
 
 
 # direct methods
@@ -17,9 +17,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bx;->apG:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bx;->apY:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bx;->apH:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bx;->apZ:Ljava/lang/String;
 
     return-void
 .end method
@@ -29,7 +29,7 @@
 .method public asBinder()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bx;->apG:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bx;->apY:Landroid/os/IBinder;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/by.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/by.smali
index 59b7752081..4b3c12ae2b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/by.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/by.smali
@@ -13,13 +13,13 @@
 
 
 # instance fields
-.field public apI:Ljava/lang/String;
+.field public aqa:Ljava/lang/String;
 
-.field public apJ:Ljava/lang/String;
+.field public aqb:Ljava/lang/String;
 
-.field public apK:Ljava/lang/String;
+.field public aqc:Ljava/lang/String;
 
-.field public apL:Ljava/lang/String;
+.field public aqd:Ljava/lang/String;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 .method public final a(Lcom/google/android/gms/internal/gtm/by;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->apI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->aqa:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -44,12 +44,12 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->apI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->aqa:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->apI:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->aqa:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->apJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->aqb:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -57,12 +57,12 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->apJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->aqb:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->apJ:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->aqb:Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->apK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->aqc:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -70,12 +70,12 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->apK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->aqc:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->apK:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->aqc:Ljava/lang/String;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->apL:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->aqd:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -83,9 +83,9 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->apL:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->aqd:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->apL:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->aqd:Ljava/lang/String;
 
     :cond_3
     return-void
@@ -108,25 +108,25 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->apI:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->aqa:Ljava/lang/String;
 
     const-string v2, "appName"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->apJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->aqb:Ljava/lang/String;
 
     const-string v2, "appVersion"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->apK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->aqc:Ljava/lang/String;
 
     const-string v2, "appId"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->apL:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->aqd:Ljava/lang/String;
 
     const-string v2, "appInstallerId"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bz.smali
index 2a576d662f..995daa2eb2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bz.smali
@@ -13,21 +13,21 @@
 
 
 # instance fields
-.field public anw:Ljava/lang/String;
+.field public anO:Ljava/lang/String;
 
-.field public apM:Ljava/lang/String;
+.field public aqe:Ljava/lang/String;
 
-.field public apN:Ljava/lang/String;
+.field public aqf:Ljava/lang/String;
 
-.field public apO:Ljava/lang/String;
+.field public aqg:Ljava/lang/String;
 
-.field public apP:Ljava/lang/String;
+.field public aqh:Ljava/lang/String;
 
-.field public apQ:Ljava/lang/String;
+.field public aqi:Ljava/lang/String;
 
-.field public apR:Ljava/lang/String;
+.field public aqj:Ljava/lang/String;
 
-.field public apS:Ljava/lang/String;
+.field public aqk:Ljava/lang/String;
 
 .field public name:Ljava/lang/String;
 
@@ -63,7 +63,7 @@
     iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->name:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqe:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -71,12 +71,12 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqe:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apM:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqe:Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apN:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqf:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -84,12 +84,12 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apN:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqf:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apN:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqf:Ljava/lang/String;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apO:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqg:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -97,12 +97,12 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apO:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqg:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apO:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqg:Ljava/lang/String;
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apP:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqh:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -110,12 +110,12 @@
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apP:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqh:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apP:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqh:Ljava/lang/String;
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->anw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->anO:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -123,12 +123,12 @@
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->anw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->anO:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->anw:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->anO:Ljava/lang/String;
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apQ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqi:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -136,12 +136,12 @@
 
     if-nez v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apQ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqi:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apQ:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqi:Ljava/lang/String;
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apR:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqj:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -149,12 +149,12 @@
 
     if-nez v0, :cond_7
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apR:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqj:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apR:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqj:Ljava/lang/String;
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqk:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -162,9 +162,9 @@
 
     if-nez v0, :cond_8
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aqk:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apS:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aqk:Ljava/lang/String;
 
     :cond_8
     iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->zzug:Ljava/lang/String;
@@ -196,49 +196,49 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->apM:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->aqe:Ljava/lang/String;
 
     const-string v2, "source"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->apN:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->aqf:Ljava/lang/String;
 
     const-string v2, "medium"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->apO:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->aqg:Ljava/lang/String;
 
     const-string v2, "keyword"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->apP:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->aqh:Ljava/lang/String;
 
     const-string v2, "content"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->anw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->anO:Ljava/lang/String;
 
     const-string v2, "id"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->apQ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->aqi:Ljava/lang/String;
 
     const-string v2, "adNetworkId"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->apR:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->aqj:Ljava/lang/String;
 
     const-string v2, "gclid"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->apS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->aqk:Ljava/lang/String;
 
     const-string v2, "dclid"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/c.smali
index 4a0261eb2c..dc5eabcc05 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/c.smali
@@ -13,9 +13,9 @@
 
 
 # instance fields
-.field public amb:Ljava/lang/String;
+.field public amt:Ljava/lang/String;
 
-.field public amc:J
+.field public amu:J
 
 .field public mCategory:Ljava/lang/String;
 
@@ -38,7 +38,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/gtm/c;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->amb:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->amt:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -46,12 +46,12 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->amb:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->amt:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/c;->amb:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/c;->amt:Ljava/lang/String;
 
     :cond_0
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/c;->amc:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/c;->amu:J
 
     const-wide/16 v2, 0x0
 
@@ -59,7 +59,7 @@
 
     if-eqz v4, :cond_1
 
-    iput-wide v0, p1, Lcom/google/android/gms/internal/gtm/c;->amc:J
+    iput-wide v0, p1, Lcom/google/android/gms/internal/gtm/c;->amu:J
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->mCategory:Ljava/lang/String;
@@ -98,13 +98,13 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/c;->amb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/c;->amt:Ljava/lang/String;
 
     const-string v2, "variableName"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/c;->amc:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/c;->amu:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ca.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ca.smali
index fa0c073513..88ce105b56 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ca.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ca.smali
@@ -13,7 +13,7 @@
 
 
 # instance fields
-.field public apT:Ljava/util/Map;
+.field public aql:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -37,7 +37,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/HashMap;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ca;->apT:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ca;->aql:Ljava/util/Map;
 
     return-void
 .end method
@@ -49,9 +49,9 @@
 
     check-cast p1, Lcom/google/android/gms/internal/gtm/ca;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/ca;->apT:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/ca;->aql:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ca;->apT:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ca;->aql:Ljava/util/Map;
 
     invoke-interface {p1, v0}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
 
@@ -65,7 +65,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ca;->apT:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ca;->aql:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cb.smali
index 30da6b6462..2379458202 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cb.smali
@@ -13,7 +13,7 @@
 
 
 # instance fields
-.field public apU:Ljava/util/Map;
+.field public aqm:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -37,7 +37,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/HashMap;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/cb;->apU:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/cb;->aqm:Ljava/util/Map;
 
     return-void
 .end method
@@ -49,9 +49,9 @@
 
     check-cast p1, Lcom/google/android/gms/internal/gtm/cb;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/cb;->apU:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/cb;->aqm:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cb;->apU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cb;->aqm:Ljava/util/Map;
 
     invoke-interface {p1, v0}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
 
@@ -65,7 +65,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cb;->apU:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cb;->aqm:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cc.smali
index f93b1ec3bb..857c44d411 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cc.smali
@@ -13,7 +13,7 @@
 
 
 # instance fields
-.field public final amO:Ljava/util/Map;
+.field public final ang:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->amO:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->ang:Ljava/util/Map;
 
     return-void
 .end method
@@ -49,9 +49,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/cc;->amO:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/cc;->ang:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->amO:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->ang:Ljava/util/Map;
 
     invoke-interface {p1, v0}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
 
@@ -61,7 +61,7 @@
 .method public final set(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     if-eqz p1, :cond_0
 
@@ -84,7 +84,7 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/r;->i(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->amO:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->ang:Ljava/util/Map;
 
     invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->amO:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->ang:Ljava/util/Map;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cd.smali
index ad5a25b3bd..971f034672 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cd.smali
@@ -13,17 +13,17 @@
 
 
 # instance fields
-.field public apV:Ljava/lang/String;
+.field public aqn:Ljava/lang/String;
 
-.field public apW:I
+.field public aqo:I
 
-.field public apX:I
+.field public aqp:I
 
-.field public apY:I
+.field public aqq:I
 
-.field public apZ:I
+.field public aqr:I
 
-.field public aqa:I
+.field public aqs:I
 
 
 # direct methods
@@ -42,42 +42,42 @@
 
     check-cast p1, Lcom/google/android/gms/internal/gtm/cd;
 
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->apW:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->aqo:I
 
     if-eqz v0, :cond_0
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->apW:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->aqo:I
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->apX:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->aqp:I
 
     if-eqz v0, :cond_1
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->apX:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->aqp:I
 
     :cond_1
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->apY:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->aqq:I
 
     if-eqz v0, :cond_2
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->apY:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->aqq:I
 
     :cond_2
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->apZ:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->aqr:I
 
     if-eqz v0, :cond_3
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->apZ:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->aqr:I
 
     :cond_3
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->aqa:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->aqs:I
 
     if-eqz v0, :cond_4
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->aqa:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->aqs:I
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cd;->apV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cd;->aqn:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -85,9 +85,9 @@
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cd;->apV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cd;->aqn:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cd;->apV:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cd;->aqn:Ljava/lang/String;
 
     :cond_5
     return-void
@@ -100,13 +100,13 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cd;->apV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cd;->aqn:Ljava/lang/String;
 
     const-string v2, "language"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->apW:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->aqo:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -116,7 +116,7 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->apX:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->aqp:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -126,7 +126,7 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->apY:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->aqq:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -136,7 +136,7 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->apZ:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->aqr:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -146,7 +146,7 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->aqa:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->aqs:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ce.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ce.smali
index c390342058..1082e5ddf0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ce.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ce.smali
@@ -13,7 +13,7 @@
 
 
 # instance fields
-.field public final aqb:Ljava/util/List;
+.field public final aqt:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field public final aqc:Ljava/util/List;
+.field public final aqu:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field public final aqd:Ljava/util/Map;
+.field public final aqv:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -45,7 +45,7 @@
     .end annotation
 .end field
 
-.field public aqe:Lcom/google/android/gms/analytics/a/b;
+.field public aqw:Lcom/google/android/gms/analytics/a/b;
 
 
 # direct methods
@@ -58,19 +58,19 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->aqb:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->aqt:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->aqc:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->aqu:Ljava/util/List;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->aqd:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->aqv:Ljava/util/Map;
 
     return-void
 .end method
@@ -82,19 +82,19 @@
 
     check-cast p1, Lcom/google/android/gms/internal/gtm/ce;
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->aqb:Ljava/util/List;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->aqt:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqb:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqt:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->aqc:Ljava/util/List;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->aqu:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqu:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->aqd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->aqv:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -159,7 +159,7 @@
     move-object v4, v2
 
     :goto_1
-    iget-object v5, p1, Lcom/google/android/gms/internal/gtm/ce;->aqd:Ljava/util/Map;
+    iget-object v5, p1, Lcom/google/android/gms/internal/gtm/ce;->aqv:Ljava/util/Map;
 
     invoke-interface {v5, v4}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -167,7 +167,7 @@
 
     if-nez v5, :cond_3
 
-    iget-object v5, p1, Lcom/google/android/gms/internal/gtm/ce;->aqd:Ljava/util/Map;
+    iget-object v5, p1, Lcom/google/android/gms/internal/gtm/ce;->aqv:Ljava/util/Map;
 
     new-instance v6, Ljava/util/ArrayList;
 
@@ -176,7 +176,7 @@
     invoke-interface {v5, v4, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_3
-    iget-object v5, p1, Lcom/google/android/gms/internal/gtm/ce;->aqd:Ljava/util/Map;
+    iget-object v5, p1, Lcom/google/android/gms/internal/gtm/ce;->aqv:Ljava/util/Map;
 
     invoke-interface {v5, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -189,11 +189,11 @@
     goto :goto_0
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->aqe:Lcom/google/android/gms/analytics/a/b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->aqw:Lcom/google/android/gms/analytics/a/b;
 
     if-eqz v0, :cond_5
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->aqe:Lcom/google/android/gms/analytics/a/b;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->aqw:Lcom/google/android/gms/analytics/a/b;
 
     :cond_5
     return-void
@@ -206,7 +206,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqb:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqt:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
 
@@ -214,14 +214,14 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqb:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqt:Ljava/util/List;
 
     const-string v2, "products"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqu:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
 
@@ -229,14 +229,14 @@
 
     if-nez v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqu:Ljava/util/List;
 
     const-string v2, "promotions"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqd:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqv:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->isEmpty()Z
 
@@ -244,14 +244,14 @@
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqd:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqv:Ljava/util/Map;
 
     const-string v2, "impressions"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqe:Lcom/google/android/gms/analytics/a/b;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->aqw:Lcom/google/android/gms/analytics/a/b;
 
     const-string v2, "productAction"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cf.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cf.smali
index 543b6ae693..313ed936af 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cf.smali
@@ -13,7 +13,7 @@
 
 
 # instance fields
-.field public aqf:Ljava/lang/String;
+.field public aqx:Ljava/lang/String;
 
 .field public category:Ljava/lang/String;
 
@@ -51,7 +51,7 @@
     iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cf;->category:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->aqf:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->aqx:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -59,9 +59,9 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->aqf:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->aqx:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cf;->aqf:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cf;->aqx:Ljava/lang/String;
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->label:Ljava/lang/String;
@@ -104,7 +104,7 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cf;->aqf:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cf;->aqx:Ljava/lang/String;
 
     const-string v2, "action"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cg.smali
index 3dbcacad3a..1820aa1cb5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cg.smali
@@ -13,7 +13,7 @@
 
 
 # instance fields
-.field public aqg:Ljava/lang/String;
+.field public aqy:Ljava/lang/String;
 
 .field public zzur:Z
 
@@ -34,7 +34,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/gtm/cg;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cg;->aqg:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cg;->aqy:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -42,9 +42,9 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cg;->aqg:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cg;->aqy:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cg;->aqg:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cg;->aqy:Ljava/lang/String;
 
     :cond_0
     iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/cg;->zzur:Z
@@ -64,7 +64,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cg;->aqg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cg;->aqy:Ljava/lang/String;
 
     const-string v2, "description"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ch.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ch.smali
index 15510f7479..2cdeee57b7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ch.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/ch.smali
@@ -13,17 +13,17 @@
 
 
 # instance fields
-.field public amK:Ljava/lang/String;
+.field public anc:Ljava/lang/String;
 
-.field public aqh:Ljava/lang/String;
+.field public aqA:Ljava/lang/String;
 
-.field public aqi:Ljava/lang/String;
+.field public aqB:Z
 
-.field public aqj:Z
+.field public aqC:Z
 
-.field public aqk:Z
+.field public aqD:D
 
-.field public aql:D
+.field public aqz:Ljava/lang/String;
 
 .field public zzus:Ljava/lang/String;
 
@@ -59,7 +59,7 @@
     iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->zzus:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->amK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->anc:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -67,12 +67,12 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->amK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->anc:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->amK:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->anc:Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aqh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aqz:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -80,12 +80,12 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aqh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aqz:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aqh:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aqz:Ljava/lang/String;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aqi:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aqA:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -93,18 +93,18 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aqi:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aqA:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aqi:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aqA:Ljava/lang/String;
 
     :cond_3
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aqj:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aqB:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_4
 
-    iput-boolean v1, p1, Lcom/google/android/gms/internal/gtm/ch;->aqj:Z
+    iput-boolean v1, p1, Lcom/google/android/gms/internal/gtm/ch;->aqB:Z
 
     :cond_4
     iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->zzux:Ljava/lang/String;
@@ -120,14 +120,14 @@
     iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->zzux:Ljava/lang/String;
 
     :cond_5
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aqk:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aqC:Z
 
     if-eqz v0, :cond_6
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aqk:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aqC:Z
 
     :cond_6
-    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/ch;->aql:D
+    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/ch;->aqD:D
 
     const-wide/16 v4, 0x0
 
@@ -155,7 +155,7 @@
 
     invoke-static {v1, v0}, Lcom/google/android/gms/common/internal/r;->checkArgument(ZLjava/lang/Object;)V
 
-    iput-wide v2, p1, Lcom/google/android/gms/internal/gtm/ch;->aql:D
+    iput-wide v2, p1, Lcom/google/android/gms/internal/gtm/ch;->aqD:D
 
     :cond_8
     return-void
@@ -174,25 +174,25 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->amK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->anc:Ljava/lang/String;
 
     const-string v2, "clientId"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->aqh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->aqz:Ljava/lang/String;
 
     const-string v2, "userId"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->aqi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->aqA:Ljava/lang/String;
 
     const-string v2, "androidAdId"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/ch;->aqj:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/ch;->aqB:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -208,7 +208,7 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/ch;->aqk:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/ch;->aqC:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -218,7 +218,7 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/ch;->aql:D
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/ch;->aqD:D
 
     invoke-static {v1, v2}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/d.smali
index 503a40ed2f..01c23a2cd1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/d.smali
@@ -3,19 +3,19 @@
 
 
 # static fields
-.field private static amd:Z
+.field private static amv:Z
 
 
 # instance fields
-.field private ame:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+.field private final amA:Ljava/lang/Object;
 
-.field private final amf:Lcom/google/android/gms/internal/gtm/bp;
+.field private amw:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
-.field private amg:Ljava/lang/String;
+.field private final amx:Lcom/google/android/gms/internal/gtm/bp;
 
-.field private amh:Z
+.field private amy:Ljava/lang/String;
 
-.field private final ami:Ljava/lang/Object;
+.field private amz:Z
 
 
 # direct methods
@@ -26,21 +26,21 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/d;->amh:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/d;->amz:Z
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->ami:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->amA:Ljava/lang/Object;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/bp;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->act:Lcom/google/android/gms/common/util/e;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->acL:Lcom/google/android/gms/common/util/e;
 
     invoke-direct {v0, p1}, Lcom/google/android/gms/internal/gtm/bp;-><init>(Lcom/google/android/gms/common/util/e;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->amf:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->amx:Lcom/google/android/gms/internal/gtm/bp;
 
     return-void
 .end method
@@ -73,37 +73,37 @@
     return v2
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->nk()Lcom/google/android/gms/internal/gtm/ae;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->ni()Lcom/google/android/gms/internal/gtm/ae;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/ae;->nD()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/ae;->nB()Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/d;->ami:Ljava/lang/Object;
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/d;->amA:Ljava/lang/Object;
 
     monitor-enter v3
 
     :try_start_0
-    iget-boolean v4, p0, Lcom/google/android/gms/internal/gtm/d;->amh:Z
+    iget-boolean v4, p0, Lcom/google/android/gms/internal/gtm/d;->amz:Z
 
     if-nez v4, :cond_2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->mU()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->mS()Ljava/lang/String;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->amg:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->amy:Ljava/lang/String;
 
-    iput-boolean v2, p0, Lcom/google/android/gms/internal/gtm/d;->amh:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/internal/gtm/d;->amz:Z
 
     goto :goto_4
 
     :cond_2
-    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/d;->amg:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/d;->amy:Ljava/lang/String;
 
     invoke-static {v4}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -151,7 +151,7 @@
     move-object p1, p2
 
     :goto_2
-    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/gtm/d;->bh(Ljava/lang/String;)Z
+    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/gtm/d;->bc(Ljava/lang/String;)Z
 
     move-result p1
 
@@ -188,11 +188,11 @@
     move-object p1, v0
 
     :goto_3
-    invoke-static {p1}, Lcom/google/android/gms/internal/gtm/d;->bg(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/internal/gtm/d;->bb(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->amg:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->amy:Ljava/lang/String;
 
     :cond_7
     :goto_4
@@ -224,7 +224,7 @@
     move-object p1, v0
 
     :goto_5
-    invoke-static {p1}, Lcom/google/android/gms/internal/gtm/d;->bg(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/internal/gtm/d;->bb(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -241,7 +241,7 @@
     return p1
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->amg:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->amy:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -254,7 +254,7 @@
     return v2
 
     :cond_a
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->amg:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->amy:Ljava/lang/String;
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -264,15 +264,15 @@
 
     const-string p1, "Resetting the client id because Advertising Id changed."
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->nk()Lcom/google/android/gms/internal/gtm/ae;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->ni()Lcom/google/android/gms/internal/gtm/ae;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/ae;->nE()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/ae;->nC()Ljava/lang/String;
 
     move-result-object v1
 
@@ -309,7 +309,7 @@
     move-object p1, p2
 
     :goto_6
-    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/gtm/d;->bh(Ljava/lang/String;)Z
+    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/gtm/d;->bc(Ljava/lang/String;)Z
 
     move-result p1
 
@@ -327,12 +327,12 @@
     throw p1
 .end method
 
-.method private static bg(Ljava/lang/String;)Ljava/lang/String;
+.method private static bb(Ljava/lang/String;)Ljava/lang/String;
     .locals 6
 
     const-string v0, "MD5"
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/gtm/bq;->bw(Ljava/lang/String;)Ljava/security/MessageDigest;
+    invoke-static {v0}, Lcom/google/android/gms/internal/gtm/bq;->br(Ljava/lang/String;)Ljava/security/MessageDigest;
 
     move-result-object v0
 
@@ -374,23 +374,23 @@
     return-object p0
 .end method
 
-.method private final bh(Ljava/lang/String;)Z
+.method private final bc(Ljava/lang/String;)Z
     .locals 3
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-static {p1}, Lcom/google/android/gms/internal/gtm/d;->bg(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/internal/gtm/d;->bb(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
     const-string v1, "Storing hashed adid."
 
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     const-string v2, "gaClientIdData"
 
@@ -406,7 +406,7 @@
 
     invoke-virtual {v1}, Ljava/io/FileOutputStream;->close()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->amg:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->amy:Ljava/lang/String;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -424,13 +424,13 @@
     return v0
 .end method
 
-.method private final declared-synchronized mS()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+.method private final declared-synchronized mQ()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->amf:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->amx:Lcom/google/android/gms/internal/gtm/bp;
 
     const-wide/16 v1, 0x3e8
 
@@ -440,15 +440,15 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->amf:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->amx:Lcom/google/android/gms/internal/gtm/bp;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bp;->start()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->mT()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->mR()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/d;->ame:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/d;->amw:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     invoke-direct {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/d;->a(Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;)Z
 
@@ -456,14 +456,14 @@
 
     if-eqz v1, :cond_0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->ame:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->amw:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     goto :goto_0
 
     :cond_0
     const-string v0, "Failed to reset client id on adid change. Not using adid"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
 
     new-instance v0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
@@ -473,11 +473,11 @@
 
     invoke-direct {v0, v1, v2}, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;-><init>(Ljava/lang/String;Z)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->ame:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->amw:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->ame:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->amw:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -493,13 +493,13 @@
     throw v0
 .end method
 
-.method private final mT()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+.method private final mR()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient;->getAdvertisingIdInfo(Landroid/content/Context;)Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
@@ -513,13 +513,13 @@
     :catch_0
     move-exception v0
 
-    sget-boolean v1, Lcom/google/android/gms/internal/gtm/d;->amd:Z
+    sget-boolean v1, Lcom/google/android/gms/internal/gtm/d;->amv:Z
 
     if-nez v1, :cond_0
 
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/google/android/gms/internal/gtm/d;->amd:Z
+    sput-boolean v1, Lcom/google/android/gms/internal/gtm/d;->amv:Z
 
     const-string v1, "Error getting advertiser id"
 
@@ -530,7 +530,7 @@
     :catch_1
     const-string v0, "IllegalStateException getting Ad Id Info. If you would like to see Audience reports, please ensure that you have added \'<meta-data android:name=\"com.google.android.gms.version\" android:value=\"@integer/google_play_services_version\" />\' to your application manifest file. See http://goo.gl/naFqQk for details."
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     :cond_0
     :goto_0
@@ -540,7 +540,7 @@
     return-object v0
 .end method
 
-.method private final mU()Ljava/lang/String;
+.method private final mS()Ljava/lang/String;
     .locals 7
 
     const-string v0, "gaClientIdData"
@@ -548,9 +548,9 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     invoke-virtual {v2, v0}, Landroid/content/Context;->openFileInput(Ljava/lang/String;)Ljava/io/FileInputStream;
 
@@ -574,13 +574,13 @@
 
     const-string v3, "Hash file seems corrupted, deleting it."
 
-    invoke-virtual {p0, v3}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p0, v3}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     invoke-virtual {v2}, Ljava/io/FileInputStream;->close()V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     invoke-virtual {v2, v0}, Landroid/content/Context;->deleteFile(Ljava/lang/String;)Z
 
@@ -591,7 +591,7 @@
 
     const-string v3, "Hash file is empty."
 
-    invoke-virtual {p0, v3}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v3}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     invoke-virtual {v2}, Ljava/io/FileInputStream;->close()V
 
@@ -631,9 +631,9 @@
 
     invoke-virtual {p0, v3, v2}, Lcom/google/android/gms/internal/gtm/j;->l(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     invoke-virtual {v2, v0}, Landroid/content/Context;->deleteFile(Ljava/lang/String;)Z
 
@@ -644,18 +644,18 @@
 
 
 # virtual methods
-.method protected final mP()V
+.method protected final mN()V
     .locals 0
 
     return-void
 .end method
 
-.method public final mQ()Z
+.method public final mO()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->mS()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->mQ()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     move-result-object v0
 
@@ -677,12 +677,12 @@
     return v1
 .end method
 
-.method public final mR()Ljava/lang/String;
+.method public final mP()Ljava/lang/String;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->mS()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->mQ()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/e.smali
index 2915eebaf9..26fee36a0e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/e.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field final amj:Lcom/google/android/gms/internal/gtm/y;
+.field final amB:Lcom/google/android/gms/internal/gtm/y;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0, p1, p2}, Lcom/google/android/gms/internal/gtm/y;-><init>(Lcom/google/android/gms/internal/gtm/m;Lcom/google/android/gms/internal/gtm/o;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->amj:Lcom/google/android/gms/internal/gtm/y;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->amB:Lcom/google/android/gms/internal/gtm/y;
 
     return-void
 .end method
@@ -28,13 +28,13 @@
 .method public final a(Lcom/google/android/gms/internal/gtm/p;)J
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->amj:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->amB:Lcom/google/android/gms/internal/gtm/y;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/gtm/y;->c(Lcom/google/android/gms/internal/gtm/p;)J
 
@@ -46,7 +46,7 @@
 
     if-nez v4, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/e;->amj:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/e;->amB:Lcom/google/android/gms/internal/gtm/y;
 
     invoke-virtual {v2, p1}, Lcom/google/android/gms/internal/gtm/y;->b(Lcom/google/android/gms/internal/gtm/p;)V
 
@@ -57,11 +57,11 @@
 .method public final a(Lcom/google/android/gms/internal/gtm/as;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -79,15 +79,15 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     const-string v0, "Hit delivery requested"
 
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -107,9 +107,9 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/r;->i(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -122,24 +122,24 @@
     return-void
 .end method
 
-.method protected final mP()V
+.method protected final mN()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->amj:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->amB:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ne()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->nc()V
 
     return-void
 .end method
 
-.method public final mV()V
+.method public final mT()V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/bj;->C(Landroid/content/Context;)Z
 
@@ -179,34 +179,34 @@
     return-void
 .end method
 
-.method public final mW()V
+.method public final mU()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->amj:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->amB:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     const-string v1, "Service disconnected"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     return-void
 .end method
 
-.method final mX()V
+.method final mV()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->amj:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->amB:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->mX()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->mV()V
 
     return-void
 .end method
@@ -214,9 +214,9 @@
 .method final onServiceConnected()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->amj:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->amB:Lcom/google/android/gms/internal/gtm/y;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->onServiceConnected()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/f.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/f.smali
index 0fd86670d5..c88f2decdd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/f.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic amk:Z
+.field private final synthetic amC:Z
 
-.field private final synthetic aml:Lcom/google/android/gms/internal/gtm/e;
+.field private final synthetic amD:Lcom/google/android/gms/internal/gtm/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/e;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/f;->aml:Lcom/google/android/gms/internal/gtm/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/f;->amD:Lcom/google/android/gms/internal/gtm/e;
 
-    iput-boolean p2, p0, Lcom/google/android/gms/internal/gtm/f;->amk:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/internal/gtm/f;->amC:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,11 +29,11 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/f;->aml:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/f;->amD:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->amj:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->amB:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->nv()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/g.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/g.smali
index fa260094c0..926c4bed2c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/g.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field private final synthetic aml:Lcom/google/android/gms/internal/gtm/e;
+.field private final synthetic amD:Lcom/google/android/gms/internal/gtm/e;
 
-.field private final synthetic amm:Ljava/lang/Runnable;
+.field private final synthetic amE:Ljava/lang/Runnable;
 
 .field private final synthetic zzvy:Ljava/lang/String;
 
@@ -17,11 +17,11 @@
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/e;Ljava/lang/String;Ljava/lang/Runnable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/g;->aml:Lcom/google/android/gms/internal/gtm/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/g;->amD:Lcom/google/android/gms/internal/gtm/e;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/gtm/g;->zzvy:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/g;->amm:Ljava/lang/Runnable;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/g;->amE:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +33,15 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/g;->aml:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/g;->amD:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->amj:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->amB:Lcom/google/android/gms/internal/gtm/y;
 
     iget-object v1, p0, Lcom/google/android/gms/internal/gtm/g;->zzvy:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/y;->br(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/y;->bm(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/g;->amm:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/g;->amE:Ljava/lang/Runnable;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/h.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/h.smali
index dbc54ef480..7e90c7b08b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/h.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aml:Lcom/google/android/gms/internal/gtm/e;
+.field private final synthetic amD:Lcom/google/android/gms/internal/gtm/e;
 
-.field private final synthetic amn:Lcom/google/android/gms/internal/gtm/az;
+.field private final synthetic amF:Lcom/google/android/gms/internal/gtm/az;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/e;Lcom/google/android/gms/internal/gtm/az;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/h;->aml:Lcom/google/android/gms/internal/gtm/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/h;->amD:Lcom/google/android/gms/internal/gtm/e;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/h;->amn:Lcom/google/android/gms/internal/gtm/az;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/h;->amF:Lcom/google/android/gms/internal/gtm/az;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,11 +29,11 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/h;->aml:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/h;->amD:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->amj:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->amB:Lcom/google/android/gms/internal/gtm/y;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/h;->amn:Lcom/google/android/gms/internal/gtm/az;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/h;->amF:Lcom/google/android/gms/internal/gtm/az;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/y;->a(Lcom/google/android/gms/internal/gtm/az;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/i.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/i.smali
index c04ee74693..e1dd4809b6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/i.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aml:Lcom/google/android/gms/internal/gtm/e;
+.field private final synthetic amD:Lcom/google/android/gms/internal/gtm/e;
 
-.field private final synthetic amo:Lcom/google/android/gms/internal/gtm/as;
+.field private final synthetic amG:Lcom/google/android/gms/internal/gtm/as;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/e;Lcom/google/android/gms/internal/gtm/as;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/i;->aml:Lcom/google/android/gms/internal/gtm/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/i;->amD:Lcom/google/android/gms/internal/gtm/e;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/i;->amo:Lcom/google/android/gms/internal/gtm/as;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/i;->amG:Lcom/google/android/gms/internal/gtm/as;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,11 +29,11 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/i;->aml:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/i;->amD:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->amj:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->amB:Lcom/google/android/gms/internal/gtm/y;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/i;->amo:Lcom/google/android/gms/internal/gtm/as;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/i;->amG:Lcom/google/android/gms/internal/gtm/as;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/y;->b(Lcom/google/android/gms/internal/gtm/as;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/j.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/j.smali
index 6af9582f83..4c79e25f5c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/j.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field protected final amp:Lcom/google/android/gms/internal/gtm/m;
+.field protected final amH:Lcom/google/android/gms/internal/gtm/m;
 
 
 # direct methods
@@ -14,7 +14,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
     return-void
 .end method
@@ -159,12 +159,12 @@
     return-object p0
 .end method
 
-.method public static nc()Z
+.method public static na()Z
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->anO:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aog:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
@@ -182,11 +182,11 @@
 .method protected final a(ILjava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->amv:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->amN:Lcom/google/android/gms/internal/gtm/bd;
 
     goto :goto_0
 
@@ -198,9 +198,9 @@
 
     if-eqz v1, :cond_3
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->anO:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aog:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
@@ -237,9 +237,9 @@
     return-void
 
     :cond_3
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->anO:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aog:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
@@ -339,7 +339,7 @@
     return-void
 .end method
 
-.method public final bi(Ljava/lang/String;)V
+.method public final bd(Ljava/lang/String;)V
     .locals 6
 
     const/4 v1, 0x2
@@ -359,7 +359,7 @@
     return-void
 .end method
 
-.method public final bj(Ljava/lang/String;)V
+.method public final be(Ljava/lang/String;)V
     .locals 6
 
     const/4 v1, 0x3
@@ -379,7 +379,7 @@
     return-void
 .end method
 
-.method public final bk(Ljava/lang/String;)V
+.method public final bf(Ljava/lang/String;)V
     .locals 6
 
     const/4 v1, 0x4
@@ -399,7 +399,7 @@
     return-void
 .end method
 
-.method public final bl(Ljava/lang/String;)V
+.method public final bg(Ljava/lang/String;)V
     .locals 6
 
     const/4 v1, 0x5
@@ -419,7 +419,7 @@
     return-void
 .end method
 
-.method public final bm(Ljava/lang/String;)V
+.method public final bh(Ljava/lang/String;)V
     .locals 6
 
     const/4 v1, 0x6
@@ -482,9 +482,9 @@
 .method protected final getContext()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     return-object v0
 .end method
@@ -569,50 +569,50 @@
     return-void
 .end method
 
-.method protected final mY()Lcom/google/android/gms/common/util/e;
+.method protected final mW()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->act:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acL:Lcom/google/android/gms/common/util/e;
 
     return-object v0
 .end method
 
-.method protected final mZ()Lcom/google/android/gms/internal/gtm/am;
+.method protected final mX()Lcom/google/android/gms/internal/gtm/am;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->amu:Lcom/google/android/gms/internal/gtm/am;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->amM:Lcom/google/android/gms/internal/gtm/am;
 
     return-object v0
 .end method
 
-.method protected final na()Lcom/google/android/gms/internal/gtm/ar;
+.method protected final mY()Lcom/google/android/gms/internal/gtm/ar;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->amy:Lcom/google/android/gms/internal/gtm/ar;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->amQ:Lcom/google/android/gms/internal/gtm/ar;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/gtm/m;->a(Lcom/google/android/gms/internal/gtm/k;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->amy:Lcom/google/android/gms/internal/gtm/ar;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->amQ:Lcom/google/android/gms/internal/gtm/ar;
 
     return-object v0
 .end method
 
-.method protected final nb()Lcom/google/android/gms/internal/gtm/bh;
+.method protected final mZ()Lcom/google/android/gms/internal/gtm/bh;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->amA:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->amS:Lcom/google/android/gms/internal/gtm/bh;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/gtm/m;->a(Lcom/google/android/gms/internal/gtm/k;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->amA:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->amS:Lcom/google/android/gms/internal/gtm/bh;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/k.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/k.smali
index 780ed55f13..14803e0622 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/k.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/k.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private amq:Z
+.field private amI:Z
 
 
 # direct methods
@@ -20,7 +20,7 @@
 .method public final isInitialized()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/k;->amq:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/k;->amI:Z
 
     if-eqz v0, :cond_0
 
@@ -34,10 +34,10 @@
     return v0
 .end method
 
-.method protected abstract mP()V
+.method protected abstract mN()V
 .end method
 
-.method protected final nd()V
+.method protected final nb()V
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->isInitialized()Z
@@ -58,14 +58,14 @@
     throw v0
 .end method
 
-.method public final ne()V
+.method public final nc()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->mP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->mN()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/k;->amq:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/k;->amI:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/l.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/l.smali
index 686b4b7ac0..bfb1bbc508 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/l.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/l.smali
@@ -5,7 +5,7 @@
 # static fields
 .field public static final VERSION:Ljava/lang/String;
 
-.field public static final amr:Ljava/lang/String;
+.field public static final amJ:Ljava/lang/String;
 
 
 # direct methods
@@ -56,7 +56,7 @@
     invoke-direct {v0, v2}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
     :goto_0
-    sput-object v0, Lcom/google/android/gms/internal/gtm/l;->amr:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/l;->amJ:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/m.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/m.smali
index 4f4749db9d..21162fc90c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/m.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/m.smali
@@ -3,39 +3,39 @@
 
 
 # static fields
-.field private static volatile ams:Lcom/google/android/gms/internal/gtm/m;
+.field private static volatile amK:Lcom/google/android/gms/internal/gtm/m;
 
 
 # instance fields
-.field final acH:Landroid/content/Context;
+.field public final acL:Lcom/google/android/gms/common/util/e;
 
-.field public final act:Lcom/google/android/gms/common/util/e;
+.field final acZ:Landroid/content/Context;
 
-.field final amA:Lcom/google/android/gms/internal/gtm/bh;
+.field final amL:Landroid/content/Context;
 
-.field private final amB:Lcom/google/android/gms/analytics/b;
+.field final amM:Lcom/google/android/gms/internal/gtm/am;
 
-.field private final amC:Lcom/google/android/gms/internal/gtm/ae;
+.field final amN:Lcom/google/android/gms/internal/gtm/bd;
 
-.field public final amD:Lcom/google/android/gms/internal/gtm/d;
+.field private final amO:Lcom/google/android/gms/analytics/m;
 
-.field public final amE:Lcom/google/android/gms/internal/gtm/x;
+.field private final amP:Lcom/google/android/gms/internal/gtm/e;
 
-.field public final amF:Lcom/google/android/gms/internal/gtm/aq;
+.field final amQ:Lcom/google/android/gms/internal/gtm/ar;
 
-.field final amt:Landroid/content/Context;
+.field private final amR:Lcom/google/android/gms/internal/gtm/br;
 
-.field final amu:Lcom/google/android/gms/internal/gtm/am;
+.field final amS:Lcom/google/android/gms/internal/gtm/bh;
 
-.field final amv:Lcom/google/android/gms/internal/gtm/bd;
+.field private final amT:Lcom/google/android/gms/analytics/b;
 
-.field private final amw:Lcom/google/android/gms/analytics/m;
+.field private final amU:Lcom/google/android/gms/internal/gtm/ae;
 
-.field private final amx:Lcom/google/android/gms/internal/gtm/e;
+.field public final amV:Lcom/google/android/gms/internal/gtm/d;
 
-.field final amy:Lcom/google/android/gms/internal/gtm/ar;
+.field public final amW:Lcom/google/android/gms/internal/gtm/x;
 
-.field private final amz:Lcom/google/android/gms/internal/gtm/br;
+.field public final amX:Lcom/google/android/gms/internal/gtm/aq;
 
 
 # direct methods
@@ -44,41 +44,41 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/o;->amH:Landroid/content/Context;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/o;->amZ:Landroid/content/Context;
 
     const-string v1, "Application context can\'t be null"
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/o;->amI:Landroid/content/Context;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/o;->ana:Landroid/content/Context;
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->amt:Landroid/content/Context;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->amL:Landroid/content/Context;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->mr()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->mp()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->act:Lcom/google/android/gms/common/util/e;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->acL:Lcom/google/android/gms/common/util/e;
 
     new-instance v1, Lcom/google/android/gms/internal/gtm/am;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/internal/gtm/am;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->amu:Lcom/google/android/gms/internal/gtm/am;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->amM:Lcom/google/android/gms/internal/gtm/am;
 
     new-instance v1, Lcom/google/android/gms/internal/gtm/bd;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/internal/gtm/bd;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->ne()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->nc()V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->amv:Lcom/google/android/gms/internal/gtm/bd;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->amN:Lcom/google/android/gms/internal/gtm/bd;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v1
 
@@ -112,23 +112,23 @@
 
     move-result-object v2
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/internal/gtm/j;->bk(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/internal/gtm/j;->bf(Ljava/lang/String;)V
 
     new-instance v1, Lcom/google/android/gms/internal/gtm/bh;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/internal/gtm/bh;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->ne()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->nc()V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->amA:Lcom/google/android/gms/internal/gtm/bh;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->amS:Lcom/google/android/gms/internal/gtm/bh;
 
     new-instance v1, Lcom/google/android/gms/internal/gtm/br;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/internal/gtm/br;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->ne()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->nc()V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->amz:Lcom/google/android/gms/internal/gtm/br;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->amR:Lcom/google/android/gms/internal/gtm/br;
 
     new-instance v1, Lcom/google/android/gms/internal/gtm/e;
 
@@ -158,72 +158,72 @@
 
     invoke-direct {v5, p0}, Lcom/google/android/gms/internal/gtm/n;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    iput-object v5, v0, Lcom/google/android/gms/analytics/m;->acM:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iput-object v5, v0, Lcom/google/android/gms/analytics/m;->adf:Ljava/lang/Thread$UncaughtExceptionHandler;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amw:Lcom/google/android/gms/analytics/m;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amO:Lcom/google/android/gms/analytics/m;
 
     new-instance v0, Lcom/google/android/gms/analytics/b;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/analytics/b;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/k;->ne()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/k;->nc()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/m;->amC:Lcom/google/android/gms/internal/gtm/ae;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/m;->amU:Lcom/google/android/gms/internal/gtm/ae;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/k;->ne()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/k;->nc()V
 
-    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/m;->amD:Lcom/google/android/gms/internal/gtm/d;
+    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/m;->amV:Lcom/google/android/gms/internal/gtm/d;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/gtm/k;->ne()V
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/gtm/k;->nc()V
 
-    iput-object v3, p0, Lcom/google/android/gms/internal/gtm/m;->amE:Lcom/google/android/gms/internal/gtm/x;
+    iput-object v3, p0, Lcom/google/android/gms/internal/gtm/m;->amW:Lcom/google/android/gms/internal/gtm/x;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/gtm/k;->ne()V
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/gtm/k;->nc()V
 
-    iput-object v4, p0, Lcom/google/android/gms/internal/gtm/m;->amF:Lcom/google/android/gms/internal/gtm/aq;
+    iput-object v4, p0, Lcom/google/android/gms/internal/gtm/m;->amX:Lcom/google/android/gms/internal/gtm/aq;
 
     new-instance p1, Lcom/google/android/gms/internal/gtm/ar;
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/internal/gtm/ar;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/k;->ne()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/k;->nc()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/m;->amy:Lcom/google/android/gms/internal/gtm/ar;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/m;->amQ:Lcom/google/android/gms/internal/gtm/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->ne()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->nc()V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->amx:Lcom/google/android/gms/internal/gtm/e;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->amP:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object p1, v0, Lcom/google/android/gms/analytics/d;->acl:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, v0, Lcom/google/android/gms/analytics/d;->acD:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->nj()Lcom/google/android/gms/internal/gtm/br;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/br;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->os()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->oq()Z
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->ot()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->or()Z
 
     move-result v2
 
     if-eqz v2, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->ou()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->os()Z
 
     move-result v2
 
-    iput-boolean v2, v0, Lcom/google/android/gms/analytics/b;->ach:Z
+    iput-boolean v2, v0, Lcom/google/android/gms/analytics/b;->acA:Z
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->os()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->oq()Z
 
     const/4 p1, 0x1
 
-    iput-boolean p1, v0, Lcom/google/android/gms/analytics/b;->acf:Z
+    iput-boolean p1, v0, Lcom/google/android/gms/analytics/b;->acy:Z
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amB:Lcom/google/android/gms/analytics/b;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amT:Lcom/google/android/gms/analytics/b;
 
-    iget-object p1, v1, Lcom/google/android/gms/internal/gtm/e;->amj:Lcom/google/android/gms/internal/gtm/y;
+    iget-object p1, v1, Lcom/google/android/gms/internal/gtm/e;->amB:Lcom/google/android/gms/internal/gtm/y;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/y;->start()V
 
@@ -253,7 +253,7 @@
 
     invoke-static {p0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/m;->ams:Lcom/google/android/gms/internal/gtm/m;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/m;->amK:Lcom/google/android/gms/internal/gtm/m;
 
     if-nez v0, :cond_1
 
@@ -262,11 +262,11 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/gtm/m;->ams:Lcom/google/android/gms/internal/gtm/m;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/m;->amK:Lcom/google/android/gms/internal/gtm/m;
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->mr()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->mp()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -282,9 +282,9 @@
 
     invoke-direct {p0, v4}, Lcom/google/android/gms/internal/gtm/m;-><init>(Lcom/google/android/gms/internal/gtm/o;)V
 
-    sput-object p0, Lcom/google/android/gms/internal/gtm/m;->ams:Lcom/google/android/gms/internal/gtm/m;
+    sput-object p0, Lcom/google/android/gms/internal/gtm/m;->amK:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/b;->kM()V
+    invoke-static {}, Lcom/google/android/gms/analytics/b;->kK()V
 
     invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->elapsedRealtime()J
 
@@ -292,9 +292,9 @@
 
     sub-long/2addr v4, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aoC:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aoU:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Long;
 
@@ -306,7 +306,7 @@
 
     if-lez v3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p0
 
@@ -338,57 +338,57 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/google/android/gms/internal/gtm/m;->ams:Lcom/google/android/gms/internal/gtm/m;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/m;->amK:Lcom/google/android/gms/internal/gtm/m;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method public final nf()Lcom/google/android/gms/internal/gtm/bd;
+.method public final nd()Lcom/google/android/gms/internal/gtm/bd;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amv:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amN:Lcom/google/android/gms/internal/gtm/bd;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/m;->a(Lcom/google/android/gms/internal/gtm/k;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amv:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amN:Lcom/google/android/gms/internal/gtm/bd;
 
     return-object v0
 .end method
 
-.method public final ng()Lcom/google/android/gms/analytics/m;
+.method public final ne()Lcom/google/android/gms/analytics/m;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amw:Lcom/google/android/gms/analytics/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amO:Lcom/google/android/gms/analytics/m;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amw:Lcom/google/android/gms/analytics/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amO:Lcom/google/android/gms/analytics/m;
 
     return-object v0
 .end method
 
-.method public final nh()Lcom/google/android/gms/internal/gtm/e;
+.method public final nf()Lcom/google/android/gms/internal/gtm/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amx:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amP:Lcom/google/android/gms/internal/gtm/e;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/m;->a(Lcom/google/android/gms/internal/gtm/k;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amx:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amP:Lcom/google/android/gms/internal/gtm/e;
 
     return-object v0
 .end method
 
-.method public final ni()Lcom/google/android/gms/analytics/b;
+.method public final ng()Lcom/google/android/gms/analytics/b;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amB:Lcom/google/android/gms/analytics/b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amT:Lcom/google/android/gms/analytics/b;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amB:Lcom/google/android/gms/analytics/b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amT:Lcom/google/android/gms/analytics/b;
 
     invoke-virtual {v0}, Lcom/google/android/gms/analytics/b;->isInitialized()Z
 
@@ -398,31 +398,31 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->checkArgument(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amB:Lcom/google/android/gms/analytics/b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amT:Lcom/google/android/gms/analytics/b;
 
     return-object v0
 .end method
 
-.method public final nj()Lcom/google/android/gms/internal/gtm/br;
+.method public final nh()Lcom/google/android/gms/internal/gtm/br;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amz:Lcom/google/android/gms/internal/gtm/br;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amR:Lcom/google/android/gms/internal/gtm/br;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/m;->a(Lcom/google/android/gms/internal/gtm/k;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amz:Lcom/google/android/gms/internal/gtm/br;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amR:Lcom/google/android/gms/internal/gtm/br;
 
     return-object v0
 .end method
 
-.method public final nk()Lcom/google/android/gms/internal/gtm/ae;
+.method public final ni()Lcom/google/android/gms/internal/gtm/ae;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amC:Lcom/google/android/gms/internal/gtm/ae;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amU:Lcom/google/android/gms/internal/gtm/ae;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/m;->a(Lcom/google/android/gms/internal/gtm/k;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amC:Lcom/google/android/gms/internal/gtm/ae;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->amU:Lcom/google/android/gms/internal/gtm/ae;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/n.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/n.smali
index 0a905f74fa..408d87abb5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/n.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic amG:Lcom/google/android/gms/internal/gtm/m;
+.field private final synthetic amY:Lcom/google/android/gms/internal/gtm/m;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/m;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/n;->amG:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/n;->amY:Lcom/google/android/gms/internal/gtm/m;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,9 +25,9 @@
 .method public final uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/n;->amG:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/n;->amY:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->amv:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->amN:Lcom/google/android/gms/internal/gtm/bd;
 
     if-eqz p1, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/o.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/o.smali
index 7fd2fab2f0..9571c9a511 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/o.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/o.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field final amH:Landroid/content/Context;
+.field final amZ:Landroid/content/Context;
 
-.field final amI:Landroid/content/Context;
+.field final ana:Landroid/content/Context;
 
 
 # direct methods
@@ -24,9 +24,9 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/o;->amH:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/o;->amZ:Landroid/content/Context;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/o;->amI:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/o;->ana:Landroid/content/Context;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/p.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/p.smali
index 157092f085..c8c89419cc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/p.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/p.smali
@@ -3,17 +3,17 @@
 
 
 # instance fields
-.field final amJ:J
+.field final anb:J
 
-.field final amK:Ljava/lang/String;
+.field final anc:Ljava/lang/String;
 
-.field final amL:Ljava/lang/String;
+.field final and:Ljava/lang/String;
 
-.field final amM:Z
+.field final ane:Z
 
-.field amN:J
+.field anf:J
 
-.field final amO:Ljava/util/Map;
+.field final ang:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -43,21 +43,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/p;->amJ:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/p;->anb:J
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->amK:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->anc:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/p;->amL:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/p;->and:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/internal/gtm/p;->amM:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/internal/gtm/p;->ane:Z
 
-    iput-wide p4, p0, Lcom/google/android/gms/internal/gtm/p;->amN:J
+    iput-wide p4, p0, Lcom/google/android/gms/internal/gtm/p;->anf:J
 
     if-eqz p6, :cond_0
 
@@ -65,7 +65,7 @@
 
     invoke-direct {p1, p6}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->amO:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->ang:Ljava/util/Map;
 
     return-void
 
@@ -74,7 +74,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->amO:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->ang:Ljava/util/Map;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/q.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/q.smali
index ce6827399b..b334c6db96 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/q.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/q.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field final amP:Lcom/google/android/gms/internal/gtm/s;
+.field final anh:Lcom/google/android/gms/internal/gtm/s;
 
-.field private amQ:Lcom/google/android/gms/internal/gtm/ba;
+.field private ani:Lcom/google/android/gms/internal/gtm/ba;
 
-.field private final amR:Lcom/google/android/gms/internal/gtm/ao;
+.field private final anj:Lcom/google/android/gms/internal/gtm/ao;
 
-.field private final amS:Lcom/google/android/gms/internal/gtm/bp;
+.field private final ank:Lcom/google/android/gms/internal/gtm/bp;
 
 
 # direct methods
@@ -20,23 +20,23 @@
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/bp;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/m;->act:Lcom/google/android/gms/common/util/e;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/m;->acL:Lcom/google/android/gms/common/util/e;
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/gtm/bp;-><init>(Lcom/google/android/gms/common/util/e;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amS:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->ank:Lcom/google/android/gms/internal/gtm/bp;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/s;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/internal/gtm/s;-><init>(Lcom/google/android/gms/internal/gtm/q;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amP:Lcom/google/android/gms/internal/gtm/s;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->anh:Lcom/google/android/gms/internal/gtm/s;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/r;
 
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/internal/gtm/r;-><init>(Lcom/google/android/gms/internal/gtm/q;Lcom/google/android/gms/internal/gtm/m;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amR:Lcom/google/android/gms/internal/gtm/ao;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->anj:Lcom/google/android/gms/internal/gtm/ao;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/gtm/q;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -54,7 +54,7 @@
 
     const-string v0, "Inactivity, disconnecting from device AnalyticsService"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/q;->disconnect()V
 
@@ -65,27 +65,27 @@
 .method static synthetic a(Lcom/google/android/gms/internal/gtm/q;Landroid/content/ComponentName;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amQ:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->ani:Lcom/google/android/gms/internal/gtm/ba;
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amQ:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->ani:Lcom/google/android/gms/internal/gtm/ba;
 
     const-string v0, "Disconnected from device AnalyticsService"
 
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/internal/gtm/j;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/e;->mW()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/e;->mU()V
 
     :cond_0
     return-void
@@ -94,15 +94,15 @@
 .method static synthetic a(Lcom/google/android/gms/internal/gtm/q;Lcom/google/android/gms/internal/gtm/ba;)V
     .locals 0
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/q;->amQ:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/q;->ani:Lcom/google/android/gms/internal/gtm/ba;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/q;->nl()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/q;->nj()V
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object p0
 
@@ -111,18 +111,18 @@
     return-void
 .end method
 
-.method private final nl()V
+.method private final nj()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amS:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->ank:Lcom/google/android/gms/internal/gtm/bp;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bp;->start()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amR:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->anj:Lcom/google/android/gms/internal/gtm/ao;
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aow:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aoO:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Long;
 
@@ -142,11 +142,11 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amQ:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->ani:Lcom/google/android/gms/internal/gtm/ba;
 
     const/4 v6, 0x0
 
@@ -155,18 +155,18 @@
     return v6
 
     :cond_0
-    iget-boolean v1, p1, Lcom/google/android/gms/internal/gtm/az;->aoQ:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/internal/gtm/az;->apj:Z
 
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nP()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nN()Ljava/lang/String;
 
     move-result-object v1
 
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nQ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nO()Ljava/lang/String;
 
     move-result-object v1
 
@@ -178,13 +178,13 @@
     move-result-object v5
 
     :try_start_0
-    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->amO:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->ang:Ljava/util/Map;
 
-    iget-wide v2, p1, Lcom/google/android/gms/internal/gtm/az;->aoO:J
+    iget-wide v2, p1, Lcom/google/android/gms/internal/gtm/az;->apg:J
 
     invoke-interface/range {v0 .. v5}, Lcom/google/android/gms/internal/gtm/ba;->a(Ljava/util/Map;JLjava/lang/String;Ljava/util/List;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/q;->nl()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/q;->nj()V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -195,7 +195,7 @@
     :catch_0
     const-string p1, "Failed to send hits to AnalyticsService"
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     return v6
 .end method
@@ -203,11 +203,11 @@
 .method public final connect()Z
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amQ:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->ani:Lcom/google/android/gms/internal/gtm/ba;
 
     const/4 v1, 0x1
 
@@ -216,17 +216,17 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amP:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->anh:Lcom/google/android/gms/internal/gtm/s;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/s;->nm()Lcom/google/android/gms/internal/gtm/ba;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/s;->nk()Lcom/google/android/gms/internal/gtm/ba;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amQ:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->ani:Lcom/google/android/gms/internal/gtm/ba;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/q;->nl()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/q;->nj()V
 
     return v1
 
@@ -239,18 +239,18 @@
 .method public final disconnect()V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/q;->amP:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/q;->anh:Lcom/google/android/gms/internal/gtm/s;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/stats/a;->a(Landroid/content/Context;Landroid/content/ServiceConnection;)V
     :try_end_0
@@ -263,21 +263,21 @@
     nop
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amQ:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->ani:Lcom/google/android/gms/internal/gtm/ba;
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amQ:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->ani:Lcom/google/android/gms/internal/gtm/ba;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->mW()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->mU()V
 
     :cond_0
     return-void
@@ -286,11 +286,11 @@
 .method public final isConnected()Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->amQ:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->ani:Lcom/google/android/gms/internal/gtm/ba;
 
     if-eqz v0, :cond_0
 
@@ -304,7 +304,7 @@
     return v0
 .end method
 
-.method protected final mP()V
+.method protected final mN()V
     .locals 0
 
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/r.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/r.smali
index 6f0b23700d..3ce8bc083f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/r.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/r.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic amT:Lcom/google/android/gms/internal/gtm/q;
+.field private final synthetic anl:Lcom/google/android/gms/internal/gtm/q;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/q;Lcom/google/android/gms/internal/gtm/m;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/r;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/r;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/internal/gtm/ao;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
@@ -22,7 +22,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/r;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/r;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/q;->a(Lcom/google/android/gms/internal/gtm/q;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/s.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/s.smali
index e4b9f71180..8175eae241 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/s.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/s.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field final synthetic amT:Lcom/google/android/gms/internal/gtm/q;
+.field final synthetic anl:Lcom/google/android/gms/internal/gtm/q;
 
-.field private volatile amU:Lcom/google/android/gms/internal/gtm/ba;
+.field private volatile anm:Lcom/google/android/gms/internal/gtm/ba;
 
-.field private volatile amV:Z
+.field private volatile ann:Z
 
 
 # direct methods
 .method protected constructor <init>(Lcom/google/android/gms/internal/gtm/q;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,10 +26,10 @@
 
 
 # virtual methods
-.method public final nm()Lcom/google/android/gms/internal/gtm/ba;
+.method public final nk()Lcom/google/android/gms/internal/gtm/ba;
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -47,7 +47,7 @@
 
     invoke-virtual {v0, v1}, Landroid/content/Intent;->setComponent(Landroid/content/ComponentName;)Landroid/content/Intent;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/j;->getContext()Landroid/content/Context;
 
@@ -61,22 +61,22 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
     monitor-enter p0
 
     const/4 v2, 0x0
 
     :try_start_0
-    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/s;->amU:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/s;->anm:Lcom/google/android/gms/internal/gtm/ba;
 
     const/4 v3, 0x1
 
-    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/s;->amV:Z
+    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/s;->ann:Z
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/q;->amP:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/q;->anh:Lcom/google/android/gms/internal/gtm/s;
 
     const/16 v4, 0x81
 
@@ -84,7 +84,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v3, "Bind to service requested"
 
@@ -98,7 +98,7 @@
 
     if-nez v0, :cond_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/s;->amV:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/s;->ann:Z
 
     monitor-exit p0
     :try_end_0
@@ -108,9 +108,9 @@
 
     :cond_0
     :try_start_1
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aox:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoP:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -127,26 +127,26 @@
 
     :catch_0
     :try_start_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v3, "Wait for service connect was interrupted"
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     :goto_0
-    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/s;->amV:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/s;->ann:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->amU:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->anm:Lcom/google/android/gms/internal/gtm/ba;
 
-    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/s;->amU:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/s;->anm:Lcom/google/android/gms/internal/gtm/ba;
 
     if-nez v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v2, "Successfully bound to service but never got onServiceConnected callback"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
 
     :cond_1
     monitor-exit p0
@@ -168,18 +168,18 @@
 
     const-string p1, "AnalyticsServiceConnection.onServiceConnected"
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aW(Ljava/lang/String;)V
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aR(Ljava/lang/String;)V
 
     monitor-enter p0
 
     if-nez p2, :cond_0
 
     :try_start_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     const-string p2, "Service connected with null binder"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -241,16 +241,16 @@
     move-object p1, v0
 
     :goto_1
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v0, "Bound to IAnalyticsService interface"
 
-    invoke-virtual {p2, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p2, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     goto :goto_2
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v1, "Got binder with a wrong descriptor"
 
@@ -263,11 +263,11 @@
 
     :catch_0
     :try_start_3
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v0, "Service connect failed to get IAnalyticsService"
 
-    invoke-virtual {p2, v0}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {p2, v0}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
@@ -275,17 +275,17 @@
     if-nez p1, :cond_4
 
     :try_start_4
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/j;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/q;->amP:Lcom/google/android/gms/internal/gtm/s;
+    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/q;->anh:Lcom/google/android/gms/internal/gtm/s;
 
     invoke-static {p1, p2}, Lcom/google/android/gms/common/stats/a;->a(Landroid/content/Context;Landroid/content/ServiceConnection;)V
     :try_end_4
@@ -296,21 +296,21 @@
 
     :cond_4
     :try_start_5
-    iget-boolean p2, p0, Lcom/google/android/gms/internal/gtm/s;->amV:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/internal/gtm/s;->ann:Z
 
     if-nez p2, :cond_5
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v0, "onServiceConnected received after the timeout limit"
 
-    invoke-virtual {p2, v0}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p2, v0}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object p2
 
@@ -323,7 +323,7 @@
     goto :goto_3
 
     :cond_5
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->amU:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->anm:Lcom/google/android/gms/internal/gtm/ba;
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
@@ -356,13 +356,13 @@
 
     const-string v0, "AnalyticsServiceConnection.onServiceDisconnected"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aW(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aR(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/t.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/t.smali
index 774f69a51b..a238d5bca7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/t.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/t.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic amW:Lcom/google/android/gms/internal/gtm/ba;
+.field private final synthetic ano:Lcom/google/android/gms/internal/gtm/ba;
 
-.field private final synthetic amX:Lcom/google/android/gms/internal/gtm/s;
+.field private final synthetic anp:Lcom/google/android/gms/internal/gtm/s;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/s;Lcom/google/android/gms/internal/gtm/ba;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/t;->amX:Lcom/google/android/gms/internal/gtm/s;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/t;->anp:Lcom/google/android/gms/internal/gtm/s;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/t;->amW:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/t;->ano:Lcom/google/android/gms/internal/gtm/ba;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,9 +29,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->amX:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->anp:Lcom/google/android/gms/internal/gtm/s;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -39,19 +39,19 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->amX:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->anp:Lcom/google/android/gms/internal/gtm/s;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v1, "Connected to service after a timeout"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->be(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->amX:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->anp:Lcom/google/android/gms/internal/gtm/s;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/t;->amW:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/t;->ano:Lcom/google/android/gms/internal/gtm/ba;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/internal/gtm/q;->a(Lcom/google/android/gms/internal/gtm/q;Lcom/google/android/gms/internal/gtm/ba;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/u.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/u.smali
index 1dc1d96700..24b0fc8a6f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/u.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/u.smali
@@ -8,14 +8,14 @@
 # instance fields
 .field private final synthetic I:Landroid/content/ComponentName;
 
-.field private final synthetic amX:Lcom/google/android/gms/internal/gtm/s;
+.field private final synthetic anp:Lcom/google/android/gms/internal/gtm/s;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/s;Landroid/content/ComponentName;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/u;->amX:Lcom/google/android/gms/internal/gtm/s;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/u;->anp:Lcom/google/android/gms/internal/gtm/s;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/gtm/u;->I:Landroid/content/ComponentName;
 
@@ -29,9 +29,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/u;->amX:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/u;->anp:Lcom/google/android/gms/internal/gtm/s;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->amT:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->anl:Lcom/google/android/gms/internal/gtm/q;
 
     iget-object v1, p0, Lcom/google/android/gms/internal/gtm/u;->I:Landroid/content/ComponentName;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/v.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/v.smali
index bcc47529e8..1ff4bab01c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/v.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/v.smali
@@ -6,17 +6,17 @@
 
 
 # static fields
-.field private static final amY:Ljava/lang/String;
+.field private static final anq:Ljava/lang/String;
 
 .field private static final zzxj:Ljava/lang/String;
 
 
 # instance fields
-.field private final amZ:Lcom/google/android/gms/internal/gtm/w;
+.field private final anr:Lcom/google/android/gms/internal/gtm/w;
 
-.field private final ana:Lcom/google/android/gms/internal/gtm/bp;
+.field private final ans:Lcom/google/android/gms/internal/gtm/bp;
 
-.field private final anb:Lcom/google/android/gms/internal/gtm/bp;
+.field private final ant:Lcom/google/android/gms/internal/gtm/bp;
 
 
 # direct methods
@@ -83,7 +83,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/v;->amY:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/v;->anq:Ljava/lang/String;
 
     return-void
 .end method
@@ -95,33 +95,33 @@
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/bp;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/gtm/bp;-><init>(Lcom/google/android/gms/common/util/e;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->ana:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->ans:Lcom/google/android/gms/internal/gtm/bp;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/bp;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/gtm/bp;-><init>(Lcom/google/android/gms/common/util/e;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->anb:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->ant:Lcom/google/android/gms/internal/gtm/bp;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/w;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     const-string v1, "google_analytics_v4.db"
 
     invoke-direct {v0, p0, p1, v1}, Lcom/google/android/gms/internal/gtm/w;-><init>(Lcom/google/android/gms/internal/gtm/v;Landroid/content/Context;Ljava/lang/String;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->amZ:Lcom/google/android/gms/internal/gtm/w;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->anr:Lcom/google/android/gms/internal/gtm/w;
 
     return-void
 .end method
@@ -201,12 +201,12 @@
 .method static synthetic a(Lcom/google/android/gms/internal/gtm/v;)Lcom/google/android/gms/internal/gtm/bp;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/v;->anb:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/v;->ant:Lcom/google/android/gms/internal/gtm/bp;
 
     return-object p0
 .end method
 
-.method private final bn(Ljava/lang/String;)J
+.method private final bi(Ljava/lang/String;)J
     .locals 4
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/v;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
@@ -281,7 +281,7 @@
     throw p1
 .end method
 
-.method private final bo(Ljava/lang/String;)Ljava/util/Map;
+.method private final bj(Ljava/lang/String;)Ljava/util/Map;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -372,7 +372,7 @@
     return-object p1
 .end method
 
-.method private final bp(Ljava/lang/String;)Ljava/util/Map;
+.method private final bk(Ljava/lang/String;)Ljava/util/Map;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -454,23 +454,23 @@
     return-object p1
 .end method
 
-.method private final nn()J
+.method private final nl()J
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     const-string v0, "SELECT COUNT(*) FROM hits2"
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/gtm/v;->bn(Ljava/lang/String;)J
+    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/gtm/v;->bi(Ljava/lang/String;)J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method static synthetic nr()Ljava/lang/String;
+.method static synthetic np()Ljava/lang/String;
     .locals 1
 
     const-string v0, "google_analytics_v4.db"
@@ -478,7 +478,7 @@
     return-object v0
 .end method
 
-.method static synthetic ns()Ljava/lang/String;
+.method static synthetic nq()Ljava/lang/String;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/gtm/v;->zzxj:Ljava/lang/String;
@@ -499,9 +499,9 @@
 
     const-string v0, "hit_id"
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     const-wide/16 v1, 0x0
 
@@ -657,13 +657,13 @@
 .method public final a(JLjava/lang/String;Ljava/lang/String;)J
     .locals 1
 
-    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
     const/4 v0, 0x3
 
@@ -697,7 +697,7 @@
 .method public final beginTransaction()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/v;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -713,9 +713,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -723,7 +723,7 @@
 
     invoke-direct {v0}, Landroid/net/Uri$Builder;-><init>()V
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->amO:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->ang:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -809,9 +809,9 @@
 
     if-le v1, v2, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -822,9 +822,9 @@
     return-void
 
     :cond_3
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->anR:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aoj:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Integer;
 
@@ -832,7 +832,7 @@
 
     move-result v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/v;->nn()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/v;->nl()J
 
     move-result-wide v2
 
@@ -883,7 +883,7 @@
 
     invoke-virtual {v2, v3, v0}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-wide v3, p1, Lcom/google/android/gms/internal/gtm/az;->aoO:J
+    iget-wide v3, p1, Lcom/google/android/gms/internal/gtm/az;->apg:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -893,7 +893,7 @@
 
     invoke-virtual {v2, v3, v0}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget v0, p1, Lcom/google/android/gms/internal/gtm/az;->aoP:I
+    iget v0, p1, Lcom/google/android/gms/internal/gtm/az;->aph:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -903,18 +903,18 @@
 
     invoke-virtual {v2, v3, v0}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Integer;)V
 
-    iget-boolean v0, p1, Lcom/google/android/gms/internal/gtm/az;->aoQ:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/internal/gtm/az;->apj:Z
 
     if-eqz v0, :cond_5
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nP()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nN()Ljava/lang/String;
 
     move-result-object v0
 
     goto :goto_1
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nQ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nO()Ljava/lang/String;
 
     move-result-object v0
 
@@ -940,7 +940,7 @@
 
     const-string p1, "Failed to insert a hit (got -1)"
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
 
     return-void
 
@@ -971,7 +971,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->amZ:Lcom/google/android/gms/internal/gtm/w;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->anr:Lcom/google/android/gms/internal/gtm/w;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/w;->close()V
     :try_end_0
@@ -1002,7 +1002,7 @@
 .method public final endTransaction()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/v;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1017,7 +1017,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->amZ:Lcom/google/android/gms/internal/gtm/w;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->anr:Lcom/google/android/gms/internal/gtm/w;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/w;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1040,7 +1040,7 @@
 .method final isEmpty()Z
     .locals 5
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/v;->nn()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/v;->nl()J
 
     move-result-wide v0
 
@@ -1060,20 +1060,20 @@
     return v0
 .end method
 
-.method protected final mP()V
+.method protected final mN()V
     .locals 0
 
     return-void
 .end method
 
-.method public final no()I
+.method public final nm()I
     .locals 6
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->ana:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->ans:Lcom/google/android/gms/internal/gtm/bp;
 
     const-wide/32 v1, 0x5265c00
 
@@ -1088,19 +1088,19 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->ana:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->ans:Lcom/google/android/gms/internal/gtm/bp;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bp;->start()V
 
     const-string v0, "Deleting stale hits (if any)"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/v;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v2
 
@@ -1141,14 +1141,14 @@
     return v0
 .end method
 
-.method public final np()J
+.method public final nn()J
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/v;->amY:Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/v;->anq:Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -1159,7 +1159,7 @@
     return-wide v0
 .end method
 
-.method public final nq()Ljava/util/List;
+.method public final no()Ljava/util/List;
     .locals 23
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1172,9 +1172,9 @@
 
     move-object/from16 v1, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/v;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1215,9 +1215,9 @@
 
     aput-object v0, v4, v10
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->anT:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aol:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
@@ -1300,7 +1300,7 @@
 
     move-result-object v8
 
-    invoke-direct {v1, v8}, Lcom/google/android/gms/internal/gtm/v;->bp(Ljava/lang/String;)Ljava/util/Map;
+    invoke-direct {v1, v8}, Lcom/google/android/gms/internal/gtm/v;->bk(Ljava/lang/String;)Ljava/util/Map;
 
     move-result-object v22
 
@@ -1357,7 +1357,7 @@
 
     const-string v0, "Sending hits to too many properties. Campaign report might be incorrect"
 
-    invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -1439,9 +1439,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
@@ -1591,7 +1591,7 @@
 .method public final setTransactionSuccessful()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/v;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1637,9 +1637,9 @@
     :goto_0
     invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->checkArgument(Z)V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/v;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1739,11 +1739,11 @@
 
     move-result v16
 
-    invoke-direct {v10, v1}, Lcom/google/android/gms/internal/gtm/v;->bo(Ljava/lang/String;)Ljava/util/Map;
+    invoke-direct {v10, v1}, Lcom/google/android/gms/internal/gtm/v;->bj(Ljava/lang/String;)Ljava/util/Map;
 
     move-result-object v3
 
-    invoke-static {v2}, Lcom/google/android/gms/internal/gtm/bq;->bx(Ljava/lang/String;)Z
+    invoke-static {v2}, Lcom/google/android/gms/internal/gtm/bq;->bs(Ljava/lang/String;)Z
 
     move-result v6
 
@@ -1850,9 +1850,9 @@
 .method public final v(J)V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     new-instance v0, Ljava/util/ArrayList;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/w.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/w.smali
index efb5974303..63eb77956c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/w.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/w.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic anc:Lcom/google/android/gms/internal/gtm/v;
+.field private final synthetic anu:Lcom/google/android/gms/internal/gtm/v;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/v;Landroid/content/Context;Ljava/lang/String;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/w;->anc:Lcom/google/android/gms/internal/gtm/v;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/w;->anu:Lcom/google/android/gms/internal/gtm/v;
 
     const/4 p1, 0x0
 
@@ -80,7 +80,7 @@
     move-exception p1
 
     :try_start_1
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/w;->anc:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/w;->anu:Lcom/google/android/gms/internal/gtm/v;
 
     const-string v3, "Error querying for table"
 
@@ -202,7 +202,7 @@
 .method public final getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/w;->anc:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/w;->anu:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/v;->a(Lcom/google/android/gms/internal/gtm/v;)Lcom/google/android/gms/internal/gtm/bp;
 
@@ -226,7 +226,7 @@
     return-object v0
 
     :catch_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/w;->anc:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/w;->anu:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/v;->a(Lcom/google/android/gms/internal/gtm/v;)Lcom/google/android/gms/internal/gtm/bp;
 
@@ -234,17 +234,17 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bp;->start()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/w;->anc:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/w;->anu:Lcom/google/android/gms/internal/gtm/v;
 
     const-string v1, "Opening the database failed, dropping the table and recreating it"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/v;->nr()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/v;->np()Ljava/lang/String;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->anc:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->anu:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/j;->getContext()Landroid/content/Context;
 
@@ -261,7 +261,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->anc:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->anu:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/gtm/v;->a(Lcom/google/android/gms/internal/gtm/v;)Lcom/google/android/gms/internal/gtm/bp;
 
@@ -278,7 +278,7 @@
     :catch_1
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->anc:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->anu:Lcom/google/android/gms/internal/gtm/v;
 
     const-string v2, "Failed to open freshly created database"
 
@@ -384,7 +384,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/v;->ns()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/v;->nq()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/x.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/x.smali
index 27712f6753..df15607b3a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/x.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/x.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final acL:Lcom/google/android/gms/internal/gtm/by;
+.field private final ade:Lcom/google/android/gms/internal/gtm/by;
 
 
 # direct methods
@@ -16,67 +16,67 @@
 
     invoke-direct {p1}, Lcom/google/android/gms/internal/gtm/by;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/x;->acL:Lcom/google/android/gms/internal/gtm/by;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/x;->ade:Lcom/google/android/gms/internal/gtm/by;
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected final mP()V
+.method protected final mN()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/m;->kT()Lcom/google/android/gms/internal/gtm/by;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/m;->kR()Lcom/google/android/gms/internal/gtm/by;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/x;->acL:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/x;->ade:Lcom/google/android/gms/internal/gtm/by;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/by;->a(Lcom/google/android/gms/internal/gtm/by;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nj()Lcom/google/android/gms/internal/gtm/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/br;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/br;->or()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/br;->op()Ljava/lang/String;
 
     move-result-object v1
 
     if-eqz v1, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/x;->acL:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/x;->ade:Lcom/google/android/gms/internal/gtm/by;
 
-    iput-object v1, v2, Lcom/google/android/gms/internal/gtm/by;->apI:Ljava/lang/String;
+    iput-object v1, v2, Lcom/google/android/gms/internal/gtm/by;->aqa:Ljava/lang/String;
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/br;->oq()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/br;->oo()Ljava/lang/String;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/x;->acL:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/x;->ade:Lcom/google/android/gms/internal/gtm/by;
 
-    iput-object v0, v1, Lcom/google/android/gms/internal/gtm/by;->apJ:Ljava/lang/String;
+    iput-object v0, v1, Lcom/google/android/gms/internal/gtm/by;->aqb:Ljava/lang/String;
 
     :cond_1
     return-void
 .end method
 
-.method public final nt()Lcom/google/android/gms/internal/gtm/by;
+.method public final nr()Lcom/google/android/gms/internal/gtm/by;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/x;->acL:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/x;->ade:Lcom/google/android/gms/internal/gtm/by;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/y.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/y.smali
index 1b05042b6f..f15b8ff95b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/y.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/y.smali
@@ -3,23 +3,23 @@
 
 
 # instance fields
-.field private final and:Lcom/google/android/gms/internal/gtm/v;
+.field private final anA:Lcom/google/android/gms/internal/gtm/ao;
 
-.field private final ane:Lcom/google/android/gms/internal/gtm/bf;
+.field private final anB:Lcom/google/android/gms/internal/gtm/bp;
 
-.field private final anf:Lcom/google/android/gms/internal/gtm/be;
+.field private anC:J
 
-.field private final ang:Lcom/google/android/gms/internal/gtm/q;
+.field private anD:Z
 
-.field private final anh:Lcom/google/android/gms/internal/gtm/ao;
+.field private final anv:Lcom/google/android/gms/internal/gtm/v;
 
-.field private final ani:Lcom/google/android/gms/internal/gtm/ao;
+.field private final anw:Lcom/google/android/gms/internal/gtm/bf;
 
-.field private final anj:Lcom/google/android/gms/internal/gtm/bp;
+.field private final anx:Lcom/google/android/gms/internal/gtm/be;
 
-.field private ank:J
+.field private final any:Lcom/google/android/gms/internal/gtm/q;
 
-.field private anl:Z
+.field private final anz:Lcom/google/android/gms/internal/gtm/ao;
 
 .field private started:Z
 
@@ -42,47 +42,47 @@
 
     invoke-direct {p2, p1}, Lcom/google/android/gms/internal/gtm/be;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->anf:Lcom/google/android/gms/internal/gtm/be;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->anx:Lcom/google/android/gms/internal/gtm/be;
 
     new-instance p2, Lcom/google/android/gms/internal/gtm/v;
 
     invoke-direct {p2, p1}, Lcom/google/android/gms/internal/gtm/v;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     new-instance p2, Lcom/google/android/gms/internal/gtm/bf;
 
     invoke-direct {p2, p1}, Lcom/google/android/gms/internal/gtm/bf;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->ane:Lcom/google/android/gms/internal/gtm/bf;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->anw:Lcom/google/android/gms/internal/gtm/bf;
 
     new-instance p2, Lcom/google/android/gms/internal/gtm/q;
 
     invoke-direct {p2, p1}, Lcom/google/android/gms/internal/gtm/q;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->ang:Lcom/google/android/gms/internal/gtm/q;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->any:Lcom/google/android/gms/internal/gtm/q;
 
     new-instance p2, Lcom/google/android/gms/internal/gtm/bp;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     invoke-direct {p2, v0}, Lcom/google/android/gms/internal/gtm/bp;-><init>(Lcom/google/android/gms/common/util/e;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->anj:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->anB:Lcom/google/android/gms/internal/gtm/bp;
 
     new-instance p2, Lcom/google/android/gms/internal/gtm/z;
 
     invoke-direct {p2, p0, p1}, Lcom/google/android/gms/internal/gtm/z;-><init>(Lcom/google/android/gms/internal/gtm/y;Lcom/google/android/gms/internal/gtm/m;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->anh:Lcom/google/android/gms/internal/gtm/ao;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->anz:Lcom/google/android/gms/internal/gtm/ao;
 
     new-instance p2, Lcom/google/android/gms/internal/gtm/aa;
 
     invoke-direct {p2, p0, p1}, Lcom/google/android/gms/internal/gtm/aa;-><init>(Lcom/google/android/gms/internal/gtm/y;Lcom/google/android/gms/internal/gtm/m;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->ani:Lcom/google/android/gms/internal/gtm/ao;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->anA:Lcom/google/android/gms/internal/gtm/ao;
 
     return-void
 .end method
@@ -96,19 +96,19 @@
 
     new-instance v0, Lcom/google/android/gms/analytics/d;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/analytics/d;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/p;->amL:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/p;->and:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/analytics/d;->aM(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/analytics/d;->aH(Ljava/lang/String;)V
 
-    iget-boolean v1, p1, Lcom/google/android/gms/internal/gtm/p;->amM:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/internal/gtm/p;->ane:Z
 
-    iput-boolean v1, v0, Lcom/google/android/gms/analytics/d;->acm:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/analytics/d;->acE:Z
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/l;->kO()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/l;->kM()Lcom/google/android/gms/analytics/j;
 
     move-result-object v0
 
@@ -126,7 +126,7 @@
 
     const/4 v2, 0x1
 
-    iput-boolean v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aqk:Z
+    iput-boolean v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aqC:Z
 
     invoke-virtual {v0, p2}, Lcom/google/android/gms/analytics/j;->a(Lcom/google/android/gms/analytics/k;)V
 
@@ -146,7 +146,7 @@
 
     check-cast v3, Lcom/google/android/gms/internal/gtm/by;
 
-    iget-object v4, p1, Lcom/google/android/gms/internal/gtm/p;->amO:Ljava/util/Map;
+    iget-object v4, p1, Lcom/google/android/gms/internal/gtm/p;->ang:Ljava/util/Map;
 
     invoke-interface {v4}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -189,7 +189,7 @@
 
     if-eqz v7, :cond_0
 
-    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->apI:Ljava/lang/String;
+    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->aqa:Ljava/lang/String;
 
     goto :goto_0
 
@@ -202,7 +202,7 @@
 
     if-eqz v7, :cond_1
 
-    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->apJ:Ljava/lang/String;
+    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->aqb:Ljava/lang/String;
 
     goto :goto_0
 
@@ -215,7 +215,7 @@
 
     if-eqz v7, :cond_2
 
-    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->apK:Ljava/lang/String;
+    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->aqc:Ljava/lang/String;
 
     goto :goto_0
 
@@ -228,7 +228,7 @@
 
     if-eqz v7, :cond_3
 
-    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->apL:Ljava/lang/String;
+    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->aqd:Ljava/lang/String;
 
     goto :goto_0
 
@@ -241,7 +241,7 @@
 
     if-eqz v7, :cond_4
 
-    iput-object v5, v1, Lcom/google/android/gms/internal/gtm/ch;->aqh:Ljava/lang/String;
+    iput-object v5, v1, Lcom/google/android/gms/internal/gtm/ch;->aqz:Ljava/lang/String;
 
     goto :goto_0
 
@@ -251,23 +251,23 @@
     goto :goto_0
 
     :cond_5
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/p;->amL:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/p;->and:Ljava/lang/String;
 
     const-string v1, "Sending installation campaign to"
 
     invoke-virtual {p0, v1, p1, p2}, Lcom/google/android/gms/internal/gtm/j;->b(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->nb()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bh;->of()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bh;->od()J
 
     move-result-wide p1
 
-    iput-wide p1, v0, Lcom/google/android/gms/analytics/j;->acw:J
+    iput-wide p1, v0, Lcom/google/android/gms/analytics/j;->acO:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->kR()V
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->kP()V
 
     return-void
 .end method
@@ -288,11 +288,11 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->no()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->nm()I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nv()V
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -306,7 +306,7 @@
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->l(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_0
-    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/y;->ani:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/y;->anA:Lcom/google/android/gms/internal/gtm/ao;
 
     const-wide/32 v0, 0x5265c00
 
@@ -315,7 +315,7 @@
     return-void
 .end method
 
-.method private final bq(Ljava/lang/String;)Z
+.method private final bl(Ljava/lang/String;)Z
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->getContext()Landroid/content/Context;
@@ -342,93 +342,17 @@
     return p1
 .end method
 
-.method private final nA()J
-    .locals 5
-
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->zzxt:J
-
-    const-wide/high16 v2, -0x8000000000000000L
-
-    cmp-long v4, v0, v2
-
-    if-eqz v4, :cond_0
-
-    return-wide v0
-
-    :cond_0
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->anU:Lcom/google/android/gms/internal/gtm/av;
-
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
-
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->nj()Lcom/google/android/gms/internal/gtm/br;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/k;->nd()V
-
-    iget-boolean v2, v2, Lcom/google/android/gms/internal/gtm/br;->apx:Z
-
-    if-eqz v2, :cond_1
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nj()Lcom/google/android/gms/internal/gtm/br;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
-
-    iget v0, v0, Lcom/google/android/gms/internal/gtm/br;->aoK:I
-
-    int-to-long v0, v0
-
-    const-wide/16 v2, 0x3e8
-
-    mul-long v0, v0, v2
-
-    :cond_1
-    return-wide v0
-.end method
-
-.method private final nB()V
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
-
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->anl:Z
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->ang:Lcom/google/android/gms/internal/gtm/q;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->disconnect()V
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
-
-    return-void
-.end method
-
-.method private final np()J
+.method private final nn()J
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->np()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->nn()J
 
     move-result-wide v0
     :try_end_0
@@ -448,17 +372,17 @@
     return-wide v0
 .end method
 
-.method private final nv()V
+.method private final nt()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->anl:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->anD:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nJ()Z
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nH()Z
 
     move-result v0
 
@@ -467,7 +391,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->ang:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->any:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -478,9 +402,9 @@
     return-void
 
     :cond_2
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoA:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoS:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -488,7 +412,7 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->anj:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->anB:Lcom/google/android/gms/internal/gtm/bp;
 
     invoke-virtual {v2, v0, v1}, Lcom/google/android/gms/internal/gtm/bp;->y(J)Z
 
@@ -496,15 +420,15 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anj:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anB:Lcom/google/android/gms/internal/gtm/bp;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bp;->start()V
 
     const-string v0, "Connecting to service"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->ang:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->any:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->connect()Z
 
@@ -514,9 +438,9 @@
 
     const-string v0, "Connected to service"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anj:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anB:Lcom/google/android/gms/internal/gtm/bp;
 
     const-wide/16 v1, 0x0
 
@@ -528,20 +452,20 @@
     return-void
 .end method
 
-.method private final nw()Z
+.method private final nu()Z
     .locals 12
 
     const-string v0, "Failed to commit local dispatch transaction"
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     const-string v1, "Dispatching a batch of local hits"
 
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->ang:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->any:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -549,9 +473,9 @@
 
     xor-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->ane:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->anw:Lcom/google/android/gms/internal/gtm/bf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bf;->oc()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bf;->oa()Z
 
     move-result v2
 
@@ -565,16 +489,16 @@
 
     const-string v0, "No network or service available. Will retry later"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     return v3
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nN()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nL()I
 
     move-result v1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nO()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nM()I
 
     move-result v2
 
@@ -592,7 +516,7 @@
 
     :goto_0
     :try_start_0
-    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v7}, Lcom/google/android/gms/internal/gtm/v;->beginTransaction()V
 
@@ -601,7 +525,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v7, v1, v2}, Lcom/google/android/gms/internal/gtm/v;->u(J)Ljava/util/List;
 
@@ -615,19 +539,19 @@
 
     const-string v1, "Store is empty, nothing to dispatch"
 
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_8
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->setTransactionSuccessful()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_2
@@ -640,7 +564,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
 
     return v3
 
@@ -679,7 +603,7 @@
 
     check-cast v9, Lcom/google/android/gms/internal/gtm/az;
 
-    iget-wide v9, v9, Lcom/google/android/gms/internal/gtm/az;->aoN:J
+    iget-wide v9, v9, Lcom/google/android/gms/internal/gtm/az;->apf:J
 
     cmp-long v11, v9, v5
 
@@ -701,16 +625,16 @@
 
     invoke-virtual {p0, v1, v2, v4}, Lcom/google/android/gms/internal/gtm/j;->d(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     :try_start_5
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->setTransactionSuccessful()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_5
@@ -723,13 +647,13 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
 
     return v3
 
     :cond_3
     :try_start_6
-    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->ang:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->any:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v8}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -739,7 +663,7 @@
 
     const-string v8, "Service connected, sending hits to the service"
 
-    invoke-virtual {p0, v8}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v8}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     :goto_1
     invoke-interface {v7}, Ljava/util/List;->isEmpty()Z
@@ -754,7 +678,7 @@
 
     check-cast v8, Lcom/google/android/gms/internal/gtm/az;
 
-    iget-object v9, p0, Lcom/google/android/gms/internal/gtm/y;->ang:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v9, p0, Lcom/google/android/gms/internal/gtm/y;->any:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v9, v8}, Lcom/google/android/gms/internal/gtm/q;->b(Lcom/google/android/gms/internal/gtm/az;)Z
 
@@ -762,7 +686,7 @@
 
     if-eqz v9, :cond_4
 
-    iget-wide v9, v8, Lcom/google/android/gms/internal/gtm/az;->aoN:J
+    iget-wide v9, v8, Lcom/google/android/gms/internal/gtm/az;->apf:J
 
     invoke-static {v5, v6, v9, v10}, Ljava/lang/Math;->max(JJ)J
 
@@ -777,13 +701,13 @@
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
     :try_start_7
-    iget-object v9, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v9, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
-    iget-wide v10, v8, Lcom/google/android/gms/internal/gtm/az;->aoN:J
+    iget-wide v10, v8, Lcom/google/android/gms/internal/gtm/az;->apf:J
 
     invoke-virtual {v9, v10, v11}, Lcom/google/android/gms/internal/gtm/v;->v(J)V
 
-    iget-wide v8, v8, Lcom/google/android/gms/internal/gtm/az;->aoN:J
+    iget-wide v8, v8, Lcom/google/android/gms/internal/gtm/az;->apf:J
 
     invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -804,16 +728,16 @@
 
     invoke-virtual {p0, v2, v1}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
     :try_end_8
     .catchall {:try_start_8 .. :try_end_8} :catchall_0
 
     :try_start_9
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->setTransactionSuccessful()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_9
@@ -826,21 +750,21 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
 
     return v3
 
     :cond_4
     :try_start_a
-    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->ane:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->anw:Lcom/google/android/gms/internal/gtm/bf;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/gtm/bf;->oc()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/gtm/bf;->oa()Z
 
     move-result v8
 
     if-eqz v8, :cond_6
 
-    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->ane:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->anw:Lcom/google/android/gms/internal/gtm/bf;
 
     invoke-virtual {v8, v7}, Lcom/google/android/gms/internal/gtm/bf;->q(Ljava/util/List;)Ljava/util/List;
 
@@ -877,7 +801,7 @@
 
     :cond_5
     :try_start_b
-    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v8, v7}, Lcom/google/android/gms/internal/gtm/v;->p(Ljava/util/List;)V
 
@@ -896,16 +820,16 @@
 
     invoke-virtual {p0, v2, v1}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
     :try_end_c
     .catchall {:try_start_c .. :try_end_c} :catchall_0
 
     :try_start_d
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->setTransactionSuccessful()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_d
@@ -918,7 +842,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
 
     return v3
 
@@ -934,11 +858,11 @@
     if-eqz v7, :cond_7
 
     :try_start_f
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->setTransactionSuccessful()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_f
@@ -951,17 +875,17 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
 
     return v3
 
     :cond_7
     :try_start_10
-    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v7}, Lcom/google/android/gms/internal/gtm/v;->setTransactionSuccessful()V
 
-    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v7}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_10
@@ -974,7 +898,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
 
     return v3
 
@@ -986,16 +910,16 @@
 
     invoke-virtual {p0, v2, v1}, Lcom/google/android/gms/internal/gtm/j;->l(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
     :try_end_11
     .catchall {:try_start_11 .. :try_end_11} :catchall_0
 
     :try_start_12
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->setTransactionSuccessful()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_12
@@ -1008,7 +932,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
 
     return v3
 
@@ -1016,11 +940,11 @@
     move-exception v1
 
     :try_start_13
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/v;->setTransactionSuccessful()V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_13
@@ -1033,30 +957,30 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
 
     return v3
 .end method
 
-.method private final ny()V
+.method private final nw()V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->na()Lcom/google/android/gms/internal/gtm/ar;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/internal/gtm/ar;
 
     move-result-object v0
 
-    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->anI:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->aoa:Z
 
     if-nez v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->anJ:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->aob:Z
 
     if-nez v1, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->np()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nn()J
 
     move-result-wide v1
 
@@ -1066,7 +990,7 @@
 
     if-eqz v5, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v3
 
@@ -1080,9 +1004,9 @@
 
     move-result-wide v1
 
-    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->anZ:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->aor:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v3, Ljava/lang/Long;
 
@@ -1094,7 +1018,7 @@
 
     if-gtz v5, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nM()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nK()J
 
     move-result-wide v1
 
@@ -1106,18 +1030,18 @@
 
     invoke-virtual {p0, v2, v1}, Lcom/google/android/gms/internal/gtm/j;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ar;->nX()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ar;->nV()V
 
     :cond_1
     return-void
 .end method
 
-.method private final nz()V
+.method private final nx()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anh:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anz:Lcom/google/android/gms/internal/gtm/ao;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->nV()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->nT()Z
 
     move-result v0
 
@@ -1125,18 +1049,18 @@
 
     const-string v0, "All hits dispatched or no network/service. Going to power save mode"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anh:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anz:Lcom/google/android/gms/internal/gtm/ao;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->cancel()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->na()Lcom/google/android/gms/internal/gtm/ar;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/internal/gtm/ar;
 
     move-result-object v0
 
-    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->anJ:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->aob:Z
 
     if-eqz v1, :cond_1
 
@@ -1146,6 +1070,82 @@
     return-void
 .end method
 
+.method private final ny()J
+    .locals 5
+
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->zzxt:J
+
+    const-wide/high16 v2, -0x8000000000000000L
+
+    cmp-long v4, v0, v2
+
+    if-eqz v4, :cond_0
+
+    return-wide v0
+
+    :cond_0
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aom:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
+
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/br;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/k;->nb()V
+
+    iget-boolean v2, v2, Lcom/google/android/gms/internal/gtm/br;->apP:Z
+
+    if-eqz v2, :cond_1
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nh()Lcom/google/android/gms/internal/gtm/br;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
+
+    iget v0, v0, Lcom/google/android/gms/internal/gtm/br;->apc:I
+
+    int-to-long v0, v0
+
+    const-wide/16 v2, 0x3e8
+
+    mul-long v0, v0, v2
+
+    :cond_1
+    return-wide v0
+.end method
+
+.method private final nz()V
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
+
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->anD:Z
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->any:Lcom/google/android/gms/internal/gtm/q;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->disconnect()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nv()V
+
+    return-void
+.end method
+
 
 # virtual methods
 .method public final a(Lcom/google/android/gms/internal/gtm/az;)V
@@ -1153,17 +1153,17 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->anl:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->anD:Z
 
     if-eqz v0, :cond_0
 
     const-string v0, "Hit delivery not possible. Missing network permissions. See http://goo.gl/8Rd3yj for instructions"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->be(Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -1190,13 +1190,13 @@
     goto :goto_1
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->nb()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bh;->apg:Lcom/google/android/gms/internal/gtm/bi;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bh;->apA:Lcom/google/android/gms/internal/gtm/bi;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/bi;->ol()Landroid/util/Pair;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/bi;->oj()Landroid/util/Pair;
 
     move-result-object v1
 
@@ -1255,7 +1255,7 @@
 
     new-instance v4, Ljava/util/HashMap;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/gtm/az;->amO:Ljava/util/Map;
+    iget-object v2, p1, Lcom/google/android/gms/internal/gtm/az;->ang:Ljava/util/Map;
 
     invoke-direct {v4, v2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
@@ -1263,15 +1263,15 @@
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/az;
 
-    iget-wide v5, p1, Lcom/google/android/gms/internal/gtm/az;->aoO:J
+    iget-wide v5, p1, Lcom/google/android/gms/internal/gtm/az;->apg:J
 
-    iget-boolean v7, p1, Lcom/google/android/gms/internal/gtm/az;->aoQ:Z
+    iget-boolean v7, p1, Lcom/google/android/gms/internal/gtm/az;->apj:Z
 
-    iget-wide v8, p1, Lcom/google/android/gms/internal/gtm/az;->aoN:J
+    iget-wide v8, p1, Lcom/google/android/gms/internal/gtm/az;->apf:J
 
-    iget v10, p1, Lcom/google/android/gms/internal/gtm/az;->aoP:I
+    iget v10, p1, Lcom/google/android/gms/internal/gtm/az;->aph:I
 
-    iget-object v11, p1, Lcom/google/android/gms/internal/gtm/az;->aoM:Ljava/util/List;
+    iget-object v11, p1, Lcom/google/android/gms/internal/gtm/az;->ape:Ljava/util/List;
 
     move-object v2, v0
 
@@ -1282,9 +1282,9 @@
     move-object p1, v0
 
     :goto_1
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nv()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nt()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->ang:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->any:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/gtm/q;->b(Lcom/google/android/gms/internal/gtm/az;)Z
 
@@ -1294,17 +1294,17 @@
 
     const-string p1, "Hit sent to the device AnalyticsService for delivery"
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->be(Ljava/lang/String;)V
 
     return-void
 
     :cond_3
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/gtm/v;->c(Lcom/google/android/gms/internal/gtm/az;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nv()V
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1317,9 +1317,9 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -1333,17 +1333,17 @@
 .method public final b(Lcom/google/android/gms/internal/gtm/as;)V
     .locals 7
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->ank:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->anC:J
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->nb()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bh;->oh()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bh;->of()J
 
     move-result-wide v2
 
@@ -1353,7 +1353,7 @@
 
     if-eqz v6, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v4
 
@@ -1381,35 +1381,35 @@
 
     invoke-virtual {p0, v3, v2}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nv()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nt()V
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nw()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nu()Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->nb()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bh;->oi()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bh;->og()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nv()V
 
     if-eqz p1, :cond_1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/as;->nC()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/as;->nA()V
 
     :cond_1
-    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/y;->ank:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/y;->anC:J
 
     cmp-long v4, v2, v0
 
     if-eqz v4, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anf:Lcom/google/android/gms/internal/gtm/be;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anx:Lcom/google/android/gms/internal/gtm/be;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/be;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/be;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     new-instance v1, Landroid/content/Intent;
 
@@ -1423,7 +1423,7 @@
 
     invoke-virtual {v1, v2}, Landroid/content/Intent;->addCategory(Ljava/lang/String;)Landroid/content/Intent;
 
-    sget-object v2, Lcom/google/android/gms/internal/gtm/be;->aoU:Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/be;->apn:Ljava/lang/String;
 
     const/4 v3, 0x1
 
@@ -1445,17 +1445,17 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->nb()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->oi()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->og()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nv()V
 
     if-eqz p1, :cond_3
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/as;->nC()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/as;->nA()V
 
     :cond_3
     return-void
@@ -1464,23 +1464,23 @@
 .method protected final b(Lcom/google/android/gms/internal/gtm/p;)V
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/p;->amL:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/p;->and:Ljava/lang/String;
 
     const-string v1, "Sending first hit to property"
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->nb()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->og()Lcom/google/android/gms/internal/gtm/bp;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->oe()Lcom/google/android/gms/internal/gtm/bp;
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nT()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nR()J
 
     move-result-wide v1
 
@@ -1493,11 +1493,11 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->nb()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->oj()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->oh()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1510,9 +1510,9 @@
     return-void
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v1
 
@@ -1529,16 +1529,16 @@
     return-void
 .end method
 
-.method public final br(Ljava/lang/String;)V
+.method public final bm(Ljava/lang/String;)V
     .locals 3
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nf()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->nd()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -1555,11 +1555,11 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->nb()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/bh;->oj()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/bh;->oh()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1571,7 +1571,7 @@
 
     const-string p1, "Ignoring duplicate install campaign"
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     return-void
 
@@ -1589,21 +1589,21 @@
     return-void
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->nb()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v1
 
-    invoke-virtual {v1, p1}, Lcom/google/android/gms/internal/gtm/bh;->bu(Ljava/lang/String;)V
+    invoke-virtual {v1, p1}, Lcom/google/android/gms/internal/gtm/bh;->bp(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->nb()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bh;->og()Lcom/google/android/gms/internal/gtm/bp;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bh;->oe()Lcom/google/android/gms/internal/gtm/bp;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nT()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nR()J
 
     move-result-wide v1
 
@@ -1624,9 +1624,9 @@
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/v;->nq()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/v;->no()Ljava/util/List;
 
     move-result-object p1
 
@@ -1668,28 +1668,28 @@
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
     const-wide/16 v4, -0x1
 
     :try_start_0
-    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v6}, Lcom/google/android/gms/internal/gtm/v;->beginTransaction()V
 
-    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
-    iget-wide v7, v0, Lcom/google/android/gms/internal/gtm/p;->amJ:J
+    iget-wide v7, v0, Lcom/google/android/gms/internal/gtm/p;->anb:J
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/gtm/p;->amK:Ljava/lang/String;
+    iget-object v9, v0, Lcom/google/android/gms/internal/gtm/p;->anc:Ljava/lang/String;
 
-    invoke-static {v9}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v9}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
     invoke-virtual {v6}, Lcom/google/android/gms/internal/gtm/v;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1728,13 +1728,13 @@
     invoke-virtual {v6, v10, v9}, Lcom/google/android/gms/internal/gtm/j;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_0
-    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
-    iget-wide v9, v0, Lcom/google/android/gms/internal/gtm/p;->amJ:J
+    iget-wide v9, v0, Lcom/google/android/gms/internal/gtm/p;->anb:J
 
-    iget-object v11, v0, Lcom/google/android/gms/internal/gtm/p;->amK:Ljava/lang/String;
+    iget-object v11, v0, Lcom/google/android/gms/internal/gtm/p;->anc:Ljava/lang/String;
 
-    iget-object v12, v0, Lcom/google/android/gms/internal/gtm/p;->amL:Ljava/lang/String;
+    iget-object v12, v0, Lcom/google/android/gms/internal/gtm/p;->and:Ljava/lang/String;
 
     invoke-virtual {v6, v9, v10, v11, v12}, Lcom/google/android/gms/internal/gtm/v;->a(JLjava/lang/String;Ljava/lang/String;)J
 
@@ -1744,21 +1744,21 @@
 
     add-long/2addr v11, v9
 
-    iput-wide v11, v0, Lcom/google/android/gms/internal/gtm/p;->amN:J
+    iput-wide v11, v0, Lcom/google/android/gms/internal/gtm/p;->anf:J
 
-    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
     invoke-virtual {v6}, Lcom/google/android/gms/internal/gtm/v;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v11
 
-    iget-object v12, v0, Lcom/google/android/gms/internal/gtm/p;->amO:Ljava/util/Map;
+    iget-object v12, v0, Lcom/google/android/gms/internal/gtm/p;->ang:Ljava/util/Map;
 
     invoke-static {v12}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1823,7 +1823,7 @@
 
     const-string v14, "app_uid"
 
-    iget-wide v7, v0, Lcom/google/android/gms/internal/gtm/p;->amJ:J
+    iget-wide v7, v0, Lcom/google/android/gms/internal/gtm/p;->anb:J
 
     invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -1833,19 +1833,19 @@
 
     const-string v7, "cid"
 
-    iget-object v8, v0, Lcom/google/android/gms/internal/gtm/p;->amK:Ljava/lang/String;
+    iget-object v8, v0, Lcom/google/android/gms/internal/gtm/p;->anc:Ljava/lang/String;
 
     invoke-virtual {v13, v7, v8}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v7, "tid"
 
-    iget-object v8, v0, Lcom/google/android/gms/internal/gtm/p;->amL:Ljava/lang/String;
+    iget-object v8, v0, Lcom/google/android/gms/internal/gtm/p;->and:Ljava/lang/String;
 
     invoke-virtual {v13, v7, v8}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v7, "adid"
 
-    iget-boolean v8, v0, Lcom/google/android/gms/internal/gtm/p;->amM:Z
+    iget-boolean v8, v0, Lcom/google/android/gms/internal/gtm/p;->ane:Z
 
     if-eqz v8, :cond_3
 
@@ -1865,7 +1865,7 @@
 
     const-string v7, "hits_count"
 
-    iget-wide v14, v0, Lcom/google/android/gms/internal/gtm/p;->amN:J
+    iget-wide v14, v0, Lcom/google/android/gms/internal/gtm/p;->anf:J
 
     invoke-static {v14, v15}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -1895,7 +1895,7 @@
 
     const-string v0, "Failed to insert/update a property (got -1)"
 
-    invoke-virtual {v6, v0}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {v6, v0}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -1912,7 +1912,7 @@
 
     :cond_4
     :goto_2
-    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->setTransactionSuccessful()V
     :try_end_2
@@ -1920,7 +1920,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_3
@@ -1954,7 +1954,7 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     :try_start_5
-    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_5
@@ -1972,7 +1972,7 @@
 
     :goto_5
     :try_start_6
-    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_6
@@ -1995,30 +1995,30 @@
     goto :goto_7
 .end method
 
-.method protected final mP()V
+.method protected final mN()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ne()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->nc()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->ane:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anw:Lcom/google/android/gms/internal/gtm/bf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ne()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->nc()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->ang:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->any:Lcom/google/android/gms/internal/gtm/q;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ne()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->nc()V
 
     return-void
 .end method
 
-.method final mX()V
+.method final mV()V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -2026,21 +2026,21 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->ank:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->anC:J
 
     return-void
 .end method
 
-.method protected final nu()V
+.method protected final ns()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acH:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->acZ:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/bj;->C(Landroid/content/Context;)Z
 
@@ -2050,7 +2050,7 @@
 
     const-string v1, "AnalyticsReceiver is not registered or is disabled. Register the receiver for reliable dispatching on non-Google Play devices. See http://goo.gl/8Rd3yj for instructions."
 
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -2063,7 +2063,7 @@
 
     const-string v1, "AnalyticsService is not registered or is disabled. Analytics service at risk of not starting. See http://goo.gl/8Rd3yj for instructions."
 
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
 
     :cond_1
     :goto_0
@@ -2075,18 +2075,18 @@
 
     const-string v0, "CampaignTrackingReceiver is not registered, not exported or is disabled. Installation campaign tracking is not possible. See http://goo.gl/8Rd3yj for instructions."
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->nb()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->of()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->od()J
 
     const-string v0, "android.permission.ACCESS_NETWORK_STATE"
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/gtm/y;->bq(Ljava/lang/String;)Z
+    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/gtm/y;->bl(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -2094,14 +2094,14 @@
 
     const-string v0, "Missing required android.permission.ACCESS_NETWORK_STATE. Google Analytics disabled. See http://goo.gl/8Rd3yj for instructions"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nB()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
 
     :cond_3
     const-string v0, "android.permission.INTERNET"
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/gtm/y;->bq(Ljava/lang/String;)Z
+    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/gtm/y;->bl(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -2109,9 +2109,9 @@
 
     const-string v0, "Missing required android.permission.INTERNET. Google Analytics disabled. See http://goo.gl/8Rd3yj for instructions"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bh(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nB()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
 
     :cond_4
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->getContext()Landroid/content/Context;
@@ -2126,21 +2126,21 @@
 
     const-string v0, "AnalyticsService registered in the app manifest and enabled"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     goto :goto_1
 
     :cond_5
     const-string v0, "AnalyticsService not registered in the app manifest. Hits might not be delivered reliably. See http://goo.gl/8Rd3yj for instructions."
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     :goto_1
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->anl:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->anD:Z
 
     if-nez v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->isEmpty()Z
 
@@ -2148,22 +2148,22 @@
 
     if-nez v0, :cond_6
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nv()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nt()V
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nv()V
 
     return-void
 .end method
 
-.method public final nx()V
+.method public final nv()V
     .locals 8
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->anl:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->anD:Z
 
     const/4 v1, 0x1
 
@@ -2171,7 +2171,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nA()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->ny()J
 
     move-result-wide v4
 
@@ -2189,16 +2189,16 @@
     :goto_0
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anf:Lcom/google/android/gms/internal/gtm/be;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anx:Lcom/google/android/gms/internal/gtm/be;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/be;->unregister()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->isEmpty()Z
 
@@ -2206,18 +2206,18 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anf:Lcom/google/android/gms/internal/gtm/be;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anx:Lcom/google/android/gms/internal/gtm/be;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/be;->unregister()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
 
     return-void
 
     :cond_2
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aov:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aoN:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoE:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aoW:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Boolean;
 
@@ -2227,11 +2227,11 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anf:Lcom/google/android/gms/internal/gtm/be;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anx:Lcom/google/android/gms/internal/gtm/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/be;->oa()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/be;->nY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anf:Lcom/google/android/gms/internal/gtm/be;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anx:Lcom/google/android/gms/internal/gtm/be;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/be;->isConnected()Z
 
@@ -2240,17 +2240,17 @@
     :cond_3
     if-eqz v1, :cond_7
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->ny()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nw()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nA()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->ny()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->nb()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mZ()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/gtm/bh;->oh()J
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/gtm/bh;->of()J
 
     move-result-wide v4
 
@@ -2258,7 +2258,7 @@
 
     if-eqz v6, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mY()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->mW()Lcom/google/android/gms/common/util/e;
 
     move-result-object v6
 
@@ -2281,7 +2281,7 @@
     goto :goto_1
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nL()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nJ()J
 
     move-result-wide v2
 
@@ -2292,7 +2292,7 @@
     goto :goto_1
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nL()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nJ()J
 
     move-result-wide v2
 
@@ -2309,9 +2309,9 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anh:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anz:Lcom/google/android/gms/internal/gtm/ao;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->nV()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->nT()Z
 
     move-result v0
 
@@ -2319,9 +2319,9 @@
 
     const-wide/16 v0, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->anh:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->anz:Lcom/google/android/gms/internal/gtm/ao;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/ao;->nU()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/ao;->nS()J
 
     move-result-wide v2
 
@@ -2331,23 +2331,23 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->anh:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->anz:Lcom/google/android/gms/internal/gtm/ao;
 
     invoke-virtual {v2, v0, v1}, Lcom/google/android/gms/internal/gtm/ao;->x(J)V
 
     return-void
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anh:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anz:Lcom/google/android/gms/internal/gtm/ao;
 
     invoke-virtual {v0, v4, v5}, Lcom/google/android/gms/internal/gtm/ao;->w(J)V
 
     return-void
 
     :cond_7
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->ny()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nw()V
 
     return-void
 .end method
@@ -2355,13 +2355,13 @@
 .method protected final onServiceConnected()V
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->kU()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->kS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nJ()Z
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nH()Z
 
     move-result v0
 
@@ -2369,10 +2369,10 @@
 
     const-string v0, "Service client disabled. Can\'t dispatch local hits to device AnalyticsService"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bl(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bg(Ljava/lang/String;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->ang:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->any:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -2382,12 +2382,12 @@
 
     const-string v0, "Service not connected"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->isEmpty()Z
 
@@ -2397,13 +2397,13 @@
 
     const-string v0, "Dispatching local hits to device AnalyticsService"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bi(Ljava/lang/String;)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bd(Ljava/lang/String;)V
 
     :cond_2
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nN()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->nL()I
 
     move-result v1
 
@@ -2419,7 +2419,7 @@
 
     if-eqz v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nv()V
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_1
 
@@ -2441,7 +2441,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/gtm/az;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->ang:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->any:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/internal/gtm/q;->b(Lcom/google/android/gms/internal/gtm/az;)Z
 
@@ -2449,7 +2449,7 @@
 
     if-nez v2, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nv()V
 
     return-void
 
@@ -2457,9 +2457,9 @@
     invoke-interface {v0, v1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
     :try_start_1
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->and:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->anv:Lcom/google/android/gms/internal/gtm/v;
 
-    iget-wide v3, v1, Lcom/google/android/gms/internal/gtm/az;->aoN:J
+    iget-wide v3, v1, Lcom/google/android/gms/internal/gtm/az;->apf:J
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/internal/gtm/v;->v(J)V
     :try_end_1
@@ -2474,7 +2474,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
 
     return-void
 
@@ -2485,7 +2485,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->m(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->nx()V
 
     :cond_5
     return-void
@@ -2494,7 +2494,7 @@
 .method final start()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nd()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nb()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->started:Z
 
@@ -2508,9 +2508,9 @@
 
     iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/y;->started:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amp:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->amH:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ng()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ne()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/z.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/z.smali
index 39c31a4052..41ede5108c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/z.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/z.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic anm:Lcom/google/android/gms/internal/gtm/y;
+.field private final synthetic anE:Lcom/google/android/gms/internal/gtm/y;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/gtm/y;Lcom/google/android/gms/internal/gtm/m;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/z;->anm:Lcom/google/android/gms/internal/gtm/y;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/z;->anE:Lcom/google/android/gms/internal/gtm/y;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/internal/gtm/ao;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
@@ -22,7 +22,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/z;->anm:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/z;->anE:Lcom/google/android/gms/internal/gtm/y;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/y;->a(Lcom/google/android/gms/internal/gtm/y;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/zzbk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/zzbk.smali
index 2d6a19716e..87662d2bd8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/gtm/zzbk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/zzbk.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field anw:Ljava/lang/String;
+.field anO:Ljava/lang/String;
 
 .field value:Ljava/lang/String;
 
@@ -62,7 +62,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/zzbk;->anw:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/zzbk;->anO:Ljava/lang/String;
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readString()Ljava/lang/String;
 
@@ -96,7 +96,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/zzbk;->anw:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/zzbk;->anO:Ljava/lang/String;
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/a.smali
index 0dc75b5c6b..8d27e2ce2b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/a.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static aqm:Lcom/google/android/gms/internal/measurement/at;
+.field private static aqE:Lcom/google/android/gms/internal/measurement/at;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aa.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aa.smali
index 033cb022e6..845288e551 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aa.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aa.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final synthetic aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+.field private final synthetic ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
 .field private final synthetic val$activity:Landroid/app/Activity;
 
@@ -12,11 +12,11 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw$b;Landroid/app/Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/aa;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/aa;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/aa;->val$activity:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -25,7 +25,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -33,9 +33,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aa;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aa;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
@@ -47,7 +47,7 @@
 
     move-result-object v1
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/aa;->aBg:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/aa;->aBy:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/iu;->onActivityStopped(Lcom/google/android/gms/a/a;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ab.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ab.smali
index 1838344558..abb486555e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ab.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ab.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final synthetic aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+.field private final synthetic ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
 .field private final synthetic val$activity:Landroid/app/Activity;
 
@@ -12,11 +12,11 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw$b;Landroid/app/Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ab;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ab;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/ab;->val$activity:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -25,7 +25,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -33,9 +33,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ab;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ab;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
@@ -47,7 +47,7 @@
 
     move-result-object v1
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/ab;->aBg:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/ab;->aBy:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/iu;->onActivityDestroyed(Lcom/google/android/gms/a/a;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac.smali
index b7daac19ac..09c7338cfc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac.smali
@@ -3,14 +3,14 @@
 
 
 # static fields
-.field static final synthetic aqN:[I
+.field static final synthetic arf:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dr$d;->sp()[I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dr$d;->sn()[I
 
     move-result-object v0
 
@@ -18,14 +18,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac;->aqN:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac;->arf:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auS:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avk:I
 
     sub-int/2addr v2, v0
 
@@ -35,9 +35,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auT:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avl:I
 
     sub-int/2addr v2, v0
 
@@ -49,9 +49,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auR:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avj:I
 
     sub-int/2addr v2, v0
 
@@ -63,9 +63,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auU:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avm:I
 
     sub-int/2addr v2, v0
 
@@ -77,9 +77,9 @@
 
     :catch_3
     :try_start_4
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auV:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avn:I
 
     sub-int/2addr v2, v0
 
@@ -91,9 +91,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auP:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avh:I
 
     sub-int/2addr v2, v0
 
@@ -105,9 +105,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auQ:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avi:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$a$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$a$a.smali
index 90c9c30382..ba1a3730ef 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$a$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$a;->oF()Lcom/google/android/gms/internal/measurement/ad$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$a;->oD()Lcom/google/android/gms/internal/measurement/ad$a;
 
     move-result-object v0
 
@@ -52,9 +52,9 @@
 .method public final a(ILcom/google/android/gms/internal/measurement/ad$b;)Lcom/google/android/gms/internal/measurement/ad$a$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$a$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$a$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ad$a;
 
@@ -66,7 +66,7 @@
 .method public final bm(I)Lcom/google/android/gms/internal/measurement/ad$b;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$a$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$a$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ad$a;
 
@@ -81,12 +81,12 @@
     return-object p1
 .end method
 
-.method public final by(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ad$a$a;
+.method public final bt(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ad$a$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$a$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$a$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ad$a;
 
@@ -95,10 +95,10 @@
     return-object p0
 .end method
 
-.method public final oG()Ljava/lang/String;
+.method public final oE()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$a$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$a$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ad$a;
 
@@ -107,10 +107,10 @@
     return-object v0
 .end method
 
-.method public final oH()I
+.method public final oF()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$a$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$a$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ad$a;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$a.smali
index fd4d1b9d05..f4ebfc4f2d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$a.smali
@@ -102,7 +102,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$a;->zzug:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sY()Lcom/google/android/gms/internal/measurement/fp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sW()Lcom/google/android/gms/internal/measurement/fp;
 
     move-result-object v0
 
@@ -137,7 +137,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$a;->zzuh:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v0
 
@@ -189,7 +189,7 @@
     throw p0
 .end method
 
-.method public static oE()Lcom/google/android/gms/internal/measurement/fk;
+.method public static oC()Lcom/google/android/gms/internal/measurement/fk;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -202,7 +202,7 @@
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ad$a;->zzun:Lcom/google/android/gms/internal/measurement/ad$a;
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auV:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avn:I
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -213,7 +213,7 @@
     return-object v0
 .end method
 
-.method static synthetic oF()Lcom/google/android/gms/internal/measurement/ad$a;
+.method static synthetic oD()Lcom/google/android/gms/internal/measurement/ad$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ad$a;->zzun:Lcom/google/android/gms/internal/measurement/ad$a;
@@ -226,7 +226,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ac;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ac;->arf:[I
 
     const/4 v1, 0x1
 
@@ -400,7 +400,7 @@
     .end packed-switch
 .end method
 
-.method public final oC()Z
+.method public final oA()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ad$a;->zzue:I
@@ -419,14 +419,14 @@
     return v0
 .end method
 
-.method public final oD()Lcom/google/android/gms/internal/measurement/ad$c;
+.method public final oB()Lcom/google/android/gms/internal/measurement/ad$c;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$a;->zzuj:Lcom/google/android/gms/internal/measurement/ad$c;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$c;->oS()Lcom/google/android/gms/internal/measurement/ad$c;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$c;->oQ()Lcom/google/android/gms/internal/measurement/ad$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$b$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$b$a.smali
index 6c60bdf393..6c5d934f92 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$b$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$b$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$b;->oO()Lcom/google/android/gms/internal/measurement/ad$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$b;->oM()Lcom/google/android/gms/internal/measurement/ad$b;
 
     move-result-object v0
 
@@ -49,12 +49,12 @@
 
 
 # virtual methods
-.method public final bz(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ad$b$a;
+.method public final bu(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ad$b$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$b$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$b$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ad$b;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$b.smali
index 54013380ff..5e23b6ba48 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$b.smali
@@ -112,7 +112,7 @@
     throw p0
 .end method
 
-.method public static oN()Lcom/google/android/gms/internal/measurement/ad$b;
+.method public static oL()Lcom/google/android/gms/internal/measurement/ad$b;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ad$b;->zzut:Lcom/google/android/gms/internal/measurement/ad$b;
@@ -120,7 +120,7 @@
     return-object v0
 .end method
 
-.method static synthetic oO()Lcom/google/android/gms/internal/measurement/ad$b;
+.method static synthetic oM()Lcom/google/android/gms/internal/measurement/ad$b;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ad$b;->zzut:Lcom/google/android/gms/internal/measurement/ad$b;
@@ -133,7 +133,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ac;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ac;->arf:[I
 
     const/4 v1, 0x1
 
@@ -277,7 +277,7 @@
     .end packed-switch
 .end method
 
-.method public final oI()Z
+.method public final oG()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ad$b;->zzue:I
@@ -296,14 +296,14 @@
     return v0
 .end method
 
-.method public final oJ()Lcom/google/android/gms/internal/measurement/ad$e;
+.method public final oH()Lcom/google/android/gms/internal/measurement/ad$e;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$b;->zzup:Lcom/google/android/gms/internal/measurement/ad$e;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$e;->pc()Lcom/google/android/gms/internal/measurement/ad$e;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$e;->pa()Lcom/google/android/gms/internal/measurement/ad$e;
 
     move-result-object v0
 
@@ -311,7 +311,7 @@
     return-object v0
 .end method
 
-.method public final oK()Z
+.method public final oI()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ad$b;->zzue:I
@@ -330,14 +330,14 @@
     return v0
 .end method
 
-.method public final oL()Lcom/google/android/gms/internal/measurement/ad$c;
+.method public final oJ()Lcom/google/android/gms/internal/measurement/ad$c;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$b;->zzuq:Lcom/google/android/gms/internal/measurement/ad$c;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$c;->oS()Lcom/google/android/gms/internal/measurement/ad$c;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$c;->oQ()Lcom/google/android/gms/internal/measurement/ad$c;
 
     move-result-object v0
 
@@ -345,7 +345,7 @@
     return-object v0
 .end method
 
-.method public final oM()Z
+.method public final oK()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ad$b;->zzue:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$c$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$c$a.smali
index 0277366d3c..68f9050952 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$c$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$c$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$c;->oT()Lcom/google/android/gms/internal/measurement/ad$c;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$c;->oR()Lcom/google/android/gms/internal/measurement/ad$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$c$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$c$b.smali
index 4941532b20..3445600e38 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$c$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$c$b.smali
@@ -26,17 +26,17 @@
 
 
 # static fields
-.field public static final enum aqO:Lcom/google/android/gms/internal/measurement/ad$c$b;
+.field public static final enum arg:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
-.field public static final enum aqP:Lcom/google/android/gms/internal/measurement/ad$c$b;
+.field public static final enum arh:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
-.field public static final enum aqQ:Lcom/google/android/gms/internal/measurement/ad$c$b;
+.field public static final enum ari:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
-.field public static final enum aqR:Lcom/google/android/gms/internal/measurement/ad$c$b;
+.field public static final enum arj:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
-.field public static final enum aqS:Lcom/google/android/gms/internal/measurement/ad$c$b;
+.field public static final enum ark:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
-.field private static final aqT:Lcom/google/android/gms/internal/measurement/dv;
+.field private static final arl:Lcom/google/android/gms/internal/measurement/dv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/dv<",
@@ -46,7 +46,7 @@
     .end annotation
 .end field
 
-.field private static final synthetic aqU:[Lcom/google/android/gms/internal/measurement/ad$c$b;
+.field private static final synthetic arm:[Lcom/google/android/gms/internal/measurement/ad$c$b;
 
 
 # instance fields
@@ -65,7 +65,7 @@
 
     invoke-direct {v0, v2, v1, v1}, Lcom/google/android/gms/internal/measurement/ad$c$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqO:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->arg:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ad$c$b;
 
@@ -75,7 +75,7 @@
 
     invoke-direct {v0, v3, v2, v2}, Lcom/google/android/gms/internal/measurement/ad$c$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqP:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->arh:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ad$c$b;
 
@@ -85,7 +85,7 @@
 
     invoke-direct {v0, v4, v3, v3}, Lcom/google/android/gms/internal/measurement/ad$c$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqQ:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->ari:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ad$c$b;
 
@@ -95,7 +95,7 @@
 
     invoke-direct {v0, v5, v4, v4}, Lcom/google/android/gms/internal/measurement/ad$c$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqR:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->arj:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ad$c$b;
 
@@ -105,39 +105,39 @@
 
     invoke-direct {v0, v6, v5, v5}, Lcom/google/android/gms/internal/measurement/ad$c$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqS:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->ark:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     const/4 v0, 0x5
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/ad$c$b;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqO:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ad$c$b;->arg:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     aput-object v6, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqP:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$c$b;->arh:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqQ:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$c$b;->ari:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqR:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$c$b;->arj:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqS:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$c$b;->ark:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     aput-object v1, v0, v5
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqU:[Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->arm:[Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ae;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ae;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqT:Lcom/google/android/gms/internal/measurement/dv;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->arl:Lcom/google/android/gms/internal/measurement/dv;
 
     return-void
 .end method
@@ -183,35 +183,35 @@
     return-object p0
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqS:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$c$b;->ark:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     return-object p0
 
     :cond_1
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqR:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$c$b;->arj:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     return-object p0
 
     :cond_2
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqQ:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$c$b;->ari:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     return-object p0
 
     :cond_3
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqP:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$c$b;->arh:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     return-object p0
 
     :cond_4
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqO:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$c$b;->arg:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     return-object p0
 .end method
 
-.method public static oV()Lcom/google/android/gms/internal/measurement/dy;
+.method public static oT()Lcom/google/android/gms/internal/measurement/dy;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/af;->ard:Lcom/google/android/gms/internal/measurement/dy;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/af;->arv:Lcom/google/android/gms/internal/measurement/dy;
 
     return-object v0
 .end method
@@ -219,7 +219,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/ad$c$b;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqU:[Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->arm:[Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/ad$c$b;->clone()Ljava/lang/Object;
 
@@ -232,7 +232,7 @@
 
 
 # virtual methods
-.method public final oU()I
+.method public final oS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ad$c$b;->value:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$c.smali
index bce9c5483c..2378337ac7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$c.smali
@@ -96,7 +96,7 @@
     return-void
 .end method
 
-.method public static oS()Lcom/google/android/gms/internal/measurement/ad$c;
+.method public static oQ()Lcom/google/android/gms/internal/measurement/ad$c;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ad$c;->zzuz:Lcom/google/android/gms/internal/measurement/ad$c;
@@ -104,7 +104,7 @@
     return-object v0
 .end method
 
-.method static synthetic oT()Lcom/google/android/gms/internal/measurement/ad$c;
+.method static synthetic oR()Lcom/google/android/gms/internal/measurement/ad$c;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ad$c;->zzuz:Lcom/google/android/gms/internal/measurement/ad$c;
@@ -117,7 +117,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ac;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ac;->arf:[I
 
     const/4 v1, 0x1
 
@@ -207,7 +207,7 @@
 
     const/4 v0, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$c$b;->oV()Lcom/google/android/gms/internal/measurement/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$c$b;->oT()Lcom/google/android/gms/internal/measurement/dy;
 
     move-result-object v1
 
@@ -275,7 +275,7 @@
     .end packed-switch
 .end method
 
-.method public final oP()Z
+.method public final oN()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ad$c;->zzue:I
@@ -294,7 +294,7 @@
     return v0
 .end method
 
-.method public final oQ()Lcom/google/android/gms/internal/measurement/ad$c$b;
+.method public final oO()Lcom/google/android/gms/internal/measurement/ad$c$b;
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ad$c;->zzuu:I
@@ -305,13 +305,13 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqO:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad$c$b;->arg:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     :cond_0
     return-object v0
 .end method
 
-.method public final oR()Z
+.method public final oP()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ad$c;->zzue:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$d$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$d$a.smali
index 1189a2a4e0..75074dd720 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$d$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$d$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$d;->oX()Lcom/google/android/gms/internal/measurement/ad$d;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$d;->oV()Lcom/google/android/gms/internal/measurement/ad$d;
 
     move-result-object v0
 
@@ -49,12 +49,12 @@
 
 
 # virtual methods
-.method public final bA(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ad$d$a;
+.method public final bv(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ad$d$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$d$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$d$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ad$d;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$d.smali
index d852bb7775..5a80fe3488 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$d.smali
@@ -135,7 +135,7 @@
     return-object p0
 .end method
 
-.method public static oE()Lcom/google/android/gms/internal/measurement/fk;
+.method public static oC()Lcom/google/android/gms/internal/measurement/fk;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -148,7 +148,7 @@
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ad$d;->zzvj:Lcom/google/android/gms/internal/measurement/ad$d;
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auV:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avn:I
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -159,7 +159,7 @@
     return-object v0
 .end method
 
-.method static synthetic oX()Lcom/google/android/gms/internal/measurement/ad$d;
+.method static synthetic oV()Lcom/google/android/gms/internal/measurement/ad$d;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ad$d;->zzvj:Lcom/google/android/gms/internal/measurement/ad$d;
@@ -172,7 +172,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ac;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ac;->arf:[I
 
     const/4 v1, 0x1
 
@@ -328,7 +328,7 @@
     .end packed-switch
 .end method
 
-.method public final oC()Z
+.method public final oA()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ad$d;->zzue:I
@@ -347,14 +347,14 @@
     return v0
 .end method
 
-.method public final oW()Lcom/google/android/gms/internal/measurement/ad$b;
+.method public final oU()Lcom/google/android/gms/internal/measurement/ad$b;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$d;->zzvi:Lcom/google/android/gms/internal/measurement/ad$b;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$b;->oN()Lcom/google/android/gms/internal/measurement/ad$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$b;->oL()Lcom/google/android/gms/internal/measurement/ad$b;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$e$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$e$a.smali
index 093d0cb92e..2cd832eda9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$e$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$e$a.smali
@@ -26,7 +26,7 @@
 
 
 # static fields
-.field private static final aqT:Lcom/google/android/gms/internal/measurement/dv;
+.field private static final arl:Lcom/google/android/gms/internal/measurement/dv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/dv<",
@@ -36,21 +36,21 @@
     .end annotation
 .end field
 
-.field public static final enum aqV:Lcom/google/android/gms/internal/measurement/ad$e$a;
+.field public static final enum arn:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
-.field public static final enum aqW:Lcom/google/android/gms/internal/measurement/ad$e$a;
+.field public static final enum aro:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
-.field public static final enum aqX:Lcom/google/android/gms/internal/measurement/ad$e$a;
+.field public static final enum arp:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
-.field public static final enum aqY:Lcom/google/android/gms/internal/measurement/ad$e$a;
+.field public static final enum arq:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
-.field public static final enum aqZ:Lcom/google/android/gms/internal/measurement/ad$e$a;
+.field public static final enum arr:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
-.field public static final enum ara:Lcom/google/android/gms/internal/measurement/ad$e$a;
+.field public static final enum ars:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
-.field public static final enum arb:Lcom/google/android/gms/internal/measurement/ad$e$a;
+.field public static final enum art:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
-.field private static final synthetic arc:[Lcom/google/android/gms/internal/measurement/ad$e$a;
+.field private static final synthetic aru:[Lcom/google/android/gms/internal/measurement/ad$e$a;
 
 
 # instance fields
@@ -69,7 +69,7 @@
 
     invoke-direct {v0, v2, v1, v1}, Lcom/google/android/gms/internal/measurement/ad$e$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqV:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arn:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ad$e$a;
 
@@ -79,7 +79,7 @@
 
     invoke-direct {v0, v3, v2, v2}, Lcom/google/android/gms/internal/measurement/ad$e$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqW:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aro:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ad$e$a;
 
@@ -89,7 +89,7 @@
 
     invoke-direct {v0, v4, v3, v3}, Lcom/google/android/gms/internal/measurement/ad$e$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqX:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arp:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ad$e$a;
 
@@ -99,7 +99,7 @@
 
     invoke-direct {v0, v5, v4, v4}, Lcom/google/android/gms/internal/measurement/ad$e$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqY:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arq:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ad$e$a;
 
@@ -109,7 +109,7 @@
 
     invoke-direct {v0, v6, v5, v5}, Lcom/google/android/gms/internal/measurement/ad$e$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqZ:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arr:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ad$e$a;
 
@@ -119,7 +119,7 @@
 
     invoke-direct {v0, v7, v6, v6}, Lcom/google/android/gms/internal/measurement/ad$e$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->ara:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->ars:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ad$e$a;
 
@@ -129,47 +129,47 @@
 
     invoke-direct {v0, v8, v7, v7}, Lcom/google/android/gms/internal/measurement/ad$e$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arb:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->art:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     const/4 v0, 0x7
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/ad$e$a;
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqV:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/ad$e$a;->arn:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     aput-object v8, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqW:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->aro:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqX:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->arp:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqY:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->arq:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqZ:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->arr:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->ara:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->ars:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->arb:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->art:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     aput-object v1, v0, v7
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arc:[Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aru:[Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ah;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ah;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqT:Lcom/google/android/gms/internal/measurement/dv;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arl:Lcom/google/android/gms/internal/measurement/dv;
 
     return-void
 .end method
@@ -199,37 +199,37 @@
     return-object p0
 
     :pswitch_0
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arb:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->art:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     return-object p0
 
     :pswitch_1
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->ara:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->ars:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     return-object p0
 
     :pswitch_2
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqZ:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arr:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     return-object p0
 
     :pswitch_3
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqY:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arq:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     return-object p0
 
     :pswitch_4
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqX:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arp:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     return-object p0
 
     :pswitch_5
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqW:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aro:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     return-object p0
 
     :pswitch_6
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqV:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arn:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     return-object p0
 
@@ -245,10 +245,10 @@
     .end packed-switch
 .end method
 
-.method public static oV()Lcom/google/android/gms/internal/measurement/dy;
+.method public static oT()Lcom/google/android/gms/internal/measurement/dy;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ag;->ard:Lcom/google/android/gms/internal/measurement/dy;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ag;->arv:Lcom/google/android/gms/internal/measurement/dy;
 
     return-object v0
 .end method
@@ -256,7 +256,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/ad$e$a;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arc:[Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aru:[Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/ad$e$a;->clone()Ljava/lang/Object;
 
@@ -269,7 +269,7 @@
 
 
 # virtual methods
-.method public final oU()I
+.method public final oS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ad$e$a;->value:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$e$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$e$b.smali
index 56ff65318d..5f62429126 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$e$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$e$b.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$e;->pd()Lcom/google/android/gms/internal/measurement/ad$e;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$e;->pb()Lcom/google/android/gms/internal/measurement/ad$e;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$e.smali
index 7868a799a9..d3c6af2b33 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad$e.smali
@@ -95,7 +95,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$e;->zzvm:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sY()Lcom/google/android/gms/internal/measurement/fp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sW()Lcom/google/android/gms/internal/measurement/fp;
 
     move-result-object v0
 
@@ -104,7 +104,7 @@
     return-void
 .end method
 
-.method public static pc()Lcom/google/android/gms/internal/measurement/ad$e;
+.method public static pa()Lcom/google/android/gms/internal/measurement/ad$e;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ad$e;->zzvp:Lcom/google/android/gms/internal/measurement/ad$e;
@@ -112,7 +112,7 @@
     return-object v0
 .end method
 
-.method static synthetic pd()Lcom/google/android/gms/internal/measurement/ad$e;
+.method static synthetic pb()Lcom/google/android/gms/internal/measurement/ad$e;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ad$e;->zzvp:Lcom/google/android/gms/internal/measurement/ad$e;
@@ -125,7 +125,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ac;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ac;->arf:[I
 
     const/4 v1, 0x1
 
@@ -215,7 +215,7 @@
 
     const/4 v0, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$e$a;->oV()Lcom/google/android/gms/internal/measurement/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$e$a;->oT()Lcom/google/android/gms/internal/measurement/dy;
 
     move-result-object v1
 
@@ -275,7 +275,7 @@
     .end packed-switch
 .end method
 
-.method public final oY()Z
+.method public final oW()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ad$e;->zzue:I
@@ -294,7 +294,7 @@
     return v0
 .end method
 
-.method public final oZ()Lcom/google/android/gms/internal/measurement/ad$e$a;
+.method public final oX()Lcom/google/android/gms/internal/measurement/ad$e$a;
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ad$e;->zzvl:I
@@ -305,13 +305,13 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqV:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad$e$a;->arn:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     :cond_0
     return-object v0
 .end method
 
-.method public final pa()Z
+.method public final oY()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ad$e;->zzue:I
@@ -330,7 +330,7 @@
     return v0
 .end method
 
-.method public final pb()I
+.method public final oZ()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ad$e;->zzvo:Lcom/google/android/gms/internal/measurement/dz;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/af.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/af.smali
index cba46919af..2ab12b71c7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/af.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/af.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final ard:Lcom/google/android/gms/internal/measurement/dy;
+.field static final arv:Lcom/google/android/gms/internal/measurement/dy;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/af;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/af;->ard:Lcom/google/android/gms/internal/measurement/dy;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/af;->arv:Lcom/google/android/gms/internal/measurement/dy;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ag.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ag.smali
index 25a9068dd3..f9f7ce4c27 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ag.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ag.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final ard:Lcom/google/android/gms/internal/measurement/dy;
+.field static final arv:Lcom/google/android/gms/internal/measurement/dy;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ag;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ag;->ard:Lcom/google/android/gms/internal/measurement/dy;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ag;->arv:Lcom/google/android/gms/internal/measurement/dy;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ai.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ai.smali
index 2557920643..53f8cb5977 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ai.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ai.smali
@@ -3,14 +3,14 @@
 
 
 # static fields
-.field static final synthetic aqN:[I
+.field static final synthetic arf:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dr$d;->sp()[I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dr$d;->sn()[I
 
     move-result-object v0
 
@@ -18,14 +18,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ai;->aqN:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ai;->arf:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auS:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avk:I
 
     sub-int/2addr v2, v0
 
@@ -35,9 +35,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auT:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avl:I
 
     sub-int/2addr v2, v0
 
@@ -49,9 +49,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auR:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avj:I
 
     sub-int/2addr v2, v0
 
@@ -63,9 +63,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auU:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avm:I
 
     sub-int/2addr v2, v0
 
@@ -77,9 +77,9 @@
 
     :catch_3
     :try_start_4
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auV:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avn:I
 
     sub-int/2addr v2, v0
 
@@ -91,9 +91,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auP:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avh:I
 
     sub-int/2addr v2, v0
 
@@ -105,9 +105,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ai;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auQ:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avi:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aj$a$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aj$a$a.smali
index 80d1f0d8f3..ee10be2378 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aj$a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aj$a$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/aj$a;->pe()Lcom/google/android/gms/internal/measurement/aj$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/aj$a;->pc()Lcom/google/android/gms/internal/measurement/aj$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aj$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aj$a.smali
index 7e8c292095..2370be9cae 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aj$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aj$a.smali
@@ -87,7 +87,7 @@
     return-void
 .end method
 
-.method public static oE()Lcom/google/android/gms/internal/measurement/fk;
+.method public static oC()Lcom/google/android/gms/internal/measurement/fk;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -100,7 +100,7 @@
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/aj$a;->zzwa:Lcom/google/android/gms/internal/measurement/aj$a;
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auV:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avn:I
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -111,7 +111,7 @@
     return-object v0
 .end method
 
-.method static synthetic pe()Lcom/google/android/gms/internal/measurement/aj$a;
+.method static synthetic pc()Lcom/google/android/gms/internal/measurement/aj$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/aj$a;->zzwa:Lcom/google/android/gms/internal/measurement/aj$a;
@@ -124,7 +124,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ai;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ai;->arf:[I
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak.smali
index 15d12f5306..88071de398 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak.smali
@@ -3,14 +3,14 @@
 
 
 # static fields
-.field static final synthetic aqN:[I
+.field static final synthetic arf:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dr$d;->sp()[I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dr$d;->sn()[I
 
     move-result-object v0
 
@@ -18,14 +18,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auS:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avk:I
 
     sub-int/2addr v2, v0
 
@@ -35,9 +35,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auT:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avl:I
 
     sub-int/2addr v2, v0
 
@@ -49,9 +49,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auR:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avj:I
 
     sub-int/2addr v2, v0
 
@@ -63,9 +63,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auU:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avm:I
 
     sub-int/2addr v2, v0
 
@@ -77,9 +77,9 @@
 
     :catch_3
     :try_start_4
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auV:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avn:I
 
     sub-int/2addr v2, v0
 
@@ -91,9 +91,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auP:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avh:I
 
     sub-int/2addr v2, v0
 
@@ -105,9 +105,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auQ:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avi:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$a$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$a$a.smali
index 7bd49f40c0..77a22251ee 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$a$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$a;->pi()Lcom/google/android/gms/internal/measurement/al$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$a;->pg()Lcom/google/android/gms/internal/measurement/al$a;
 
     move-result-object v0
 
@@ -49,12 +49,12 @@
 
 
 # virtual methods
-.method public final J(Z)Lcom/google/android/gms/internal/measurement/al$a$a;
+.method public final H(Z)Lcom/google/android/gms/internal/measurement/al$a$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$a;
 
@@ -66,9 +66,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/al$i$a;)Lcom/google/android/gms/internal/measurement/al$a$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$a;
 
@@ -80,9 +80,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/al$i;)Lcom/google/android/gms/internal/measurement/al$a$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$a;
 
@@ -94,9 +94,9 @@
 .method public final bq(I)Lcom/google/android/gms/internal/measurement/al$a$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$a;
 
@@ -105,38 +105,38 @@
     return-object p0
 .end method
 
-.method public final pf()Lcom/google/android/gms/internal/measurement/al$i;
+.method public final pd()Lcom/google/android/gms/internal/measurement/al$i;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$a;->pf()Lcom/google/android/gms/internal/measurement/al$i;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$a;->pd()Lcom/google/android/gms/internal/measurement/al$i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final pg()Lcom/google/android/gms/internal/measurement/al$i;
+.method public final pe()Lcom/google/android/gms/internal/measurement/al$i;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$a;->pg()Lcom/google/android/gms/internal/measurement/al$i;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$a;->pe()Lcom/google/android/gms/internal/measurement/al$i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final pj()Z
+.method public final ph()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$a;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$a.smali
index efb3268d15..5d18959ca4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$a.smali
@@ -102,7 +102,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$a;Lcom/google/android/gms/internal/measurement/al$i$a;)V
     .locals 0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/dr;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()Lcom/google/android/gms/internal/measurement/dr;
 
     move-result-object p1
 
@@ -158,12 +158,12 @@
     return-void
 .end method
 
-.method public static ph()Lcom/google/android/gms/internal/measurement/al$a$a;
+.method public static pf()Lcom/google/android/gms/internal/measurement/al$a$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$a;->zzwf:Lcom/google/android/gms/internal/measurement/al$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sd()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sb()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v0
 
@@ -172,7 +172,7 @@
     return-object v0
 .end method
 
-.method static synthetic pi()Lcom/google/android/gms/internal/measurement/al$a;
+.method static synthetic pg()Lcom/google/android/gms/internal/measurement/al$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$a;->zzwf:Lcom/google/android/gms/internal/measurement/al$a;
@@ -185,7 +185,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
     const/4 v1, 0x1
 
@@ -329,14 +329,14 @@
     .end packed-switch
 .end method
 
-.method public final pf()Lcom/google/android/gms/internal/measurement/al$i;
+.method public final pd()Lcom/google/android/gms/internal/measurement/al$i;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a;->zzwc:Lcom/google/android/gms/internal/measurement/al$i;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$i;->ql()Lcom/google/android/gms/internal/measurement/al$i;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$i;->qj()Lcom/google/android/gms/internal/measurement/al$i;
 
     move-result-object v0
 
@@ -344,14 +344,14 @@
     return-object v0
 .end method
 
-.method public final pg()Lcom/google/android/gms/internal/measurement/al$i;
+.method public final pe()Lcom/google/android/gms/internal/measurement/al$i;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$a;->zzwd:Lcom/google/android/gms/internal/measurement/al$i;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$i;->ql()Lcom/google/android/gms/internal/measurement/al$i;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$i;->qj()Lcom/google/android/gms/internal/measurement/al$i;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$b$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$b$a.smali
index 526167c061..fa616ac279 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$b$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$b$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$b;->pn()Lcom/google/android/gms/internal/measurement/al$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$b;->pl()Lcom/google/android/gms/internal/measurement/al$b;
 
     move-result-object v0
 
@@ -52,9 +52,9 @@
 .method public final br(I)Lcom/google/android/gms/internal/measurement/al$b$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$b$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$b$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$b;
 
@@ -66,9 +66,9 @@
 .method public final z(J)Lcom/google/android/gms/internal/measurement/al$b$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$b$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$b$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$b;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$b.smali
index dc6ad07324..b7419ab2a6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$b.smali
@@ -109,12 +109,12 @@
     return-void
 .end method
 
-.method public static pm()Lcom/google/android/gms/internal/measurement/al$b$a;
+.method public static pk()Lcom/google/android/gms/internal/measurement/al$b$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$b;->zzwi:Lcom/google/android/gms/internal/measurement/al$b;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sd()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sb()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v0
 
@@ -123,7 +123,7 @@
     return-object v0
 .end method
 
-.method static synthetic pn()Lcom/google/android/gms/internal/measurement/al$b;
+.method static synthetic pl()Lcom/google/android/gms/internal/measurement/al$b;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$b;->zzwi:Lcom/google/android/gms/internal/measurement/al$b;
@@ -136,7 +136,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
     const/4 v1, 0x1
 
@@ -268,7 +268,7 @@
     .end packed-switch
 .end method
 
-.method public final pk()Z
+.method public final pi()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$b;->zzue:I
@@ -287,7 +287,7 @@
     return v0
 .end method
 
-.method public final pl()Z
+.method public final pj()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$b;->zzue:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$c$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$c$a.smali
index acf4067b4c..506a0919c2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$c$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$c$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$c;->ps()Lcom/google/android/gms/internal/measurement/al$c;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$c;->pq()Lcom/google/android/gms/internal/measurement/al$c;
 
     move-result-object v0
 
@@ -52,9 +52,9 @@
 .method public final A(J)Lcom/google/android/gms/internal/measurement/al$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
@@ -66,9 +66,9 @@
 .method public final B(J)Lcom/google/android/gms/internal/measurement/al$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
@@ -80,9 +80,9 @@
 .method public final a(ILcom/google/android/gms/internal/measurement/al$e$a;)Lcom/google/android/gms/internal/measurement/al$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
@@ -94,9 +94,9 @@
 .method public final a(ILcom/google/android/gms/internal/measurement/al$e;)Lcom/google/android/gms/internal/measurement/al$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
@@ -108,9 +108,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/al$e$a;)Lcom/google/android/gms/internal/measurement/al$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
@@ -122,9 +122,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/al$e;)Lcom/google/android/gms/internal/measurement/al$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
@@ -133,24 +133,10 @@
     return-object p0
 .end method
 
-.method public final bB(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$c$a;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
-
-    invoke-static {v0, p1}, Lcom/google/android/gms/internal/measurement/al$c;->a(Lcom/google/android/gms/internal/measurement/al$c;Ljava/lang/String;)V
-
-    return-object p0
-.end method
-
 .method public final bs(I)Lcom/google/android/gms/internal/measurement/al$e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
@@ -168,9 +154,9 @@
 .method public final bt(I)Lcom/google/android/gms/internal/measurement/al$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
@@ -179,10 +165,24 @@
     return-object p0
 .end method
 
+.method public final bw(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$c$a;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
+
+    invoke-static {v0, p1}, Lcom/google/android/gms/internal/measurement/al$c;->a(Lcom/google/android/gms/internal/measurement/al$c;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
@@ -194,7 +194,7 @@
 .method public final getTimestampMillis()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
@@ -203,35 +203,35 @@
     return-wide v0
 .end method
 
-.method public final po()I
+.method public final pm()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$c;->po()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$c;->pm()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final pq()Z
+.method public final po()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$c;->pq()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$c;->po()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final pt()Ljava/util/List;
+.method public final pr()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -242,7 +242,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
@@ -255,10 +255,10 @@
     return-object v0
 .end method
 
-.method public final pu()J
+.method public final ps()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$c;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$c.smali
index ae8350a8d5..61724b22f6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$c.smali
@@ -92,7 +92,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dr;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sY()Lcom/google/android/gms/internal/measurement/fp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sW()Lcom/google/android/gms/internal/measurement/fp;
 
     move-result-object v0
 
@@ -108,7 +108,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$c;I)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$c;->pp()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$c;->pn()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$c;->zzwj:Lcom/google/android/gms/internal/measurement/dz;
 
@@ -120,11 +120,11 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$c;ILcom/google/android/gms/internal/measurement/al$e$a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$c;->pp()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$c;->pn()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$c;->zzwj:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/dr;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()Lcom/google/android/gms/internal/measurement/dr;
 
     move-result-object p2
 
@@ -142,7 +142,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$c;->pp()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$c;->pn()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$c;->zzwj:Lcom/google/android/gms/internal/measurement/dz;
 
@@ -175,11 +175,11 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$c;Lcom/google/android/gms/internal/measurement/al$e$a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$c;->pp()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$c;->pn()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$c;->zzwj:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/dr;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()Lcom/google/android/gms/internal/measurement/dr;
 
     move-result-object p1
 
@@ -197,7 +197,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$c;->pp()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$c;->pn()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$c;->zzwj:Lcom/google/android/gms/internal/measurement/dz;
 
@@ -269,12 +269,12 @@
     return-object p0
 .end method
 
-.method private final pp()V
+.method private final pn()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c;->zzwj:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v0
 
@@ -292,12 +292,12 @@
     return-void
 .end method
 
-.method public static pr()Lcom/google/android/gms/internal/measurement/al$c$a;
+.method public static pp()Lcom/google/android/gms/internal/measurement/al$c$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$c;->zzwo:Lcom/google/android/gms/internal/measurement/al$c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sd()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sb()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v0
 
@@ -306,7 +306,7 @@
     return-object v0
 .end method
 
-.method static synthetic ps()Lcom/google/android/gms/internal/measurement/al$c;
+.method static synthetic pq()Lcom/google/android/gms/internal/measurement/al$c;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$c;->zzwo:Lcom/google/android/gms/internal/measurement/al$c;
@@ -319,7 +319,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
     const/4 v1, 0x1
 
@@ -475,7 +475,7 @@
     .end packed-switch
 .end method
 
-.method public final po()I
+.method public final pm()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$c;->zzwj:Lcom/google/android/gms/internal/measurement/dz;
@@ -487,7 +487,7 @@
     return v0
 .end method
 
-.method public final pq()Z
+.method public final po()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$c;->zzue:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$d$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$d$a.smali
index e7a278f723..648e621916 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$d$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$d$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$d;->pw()Lcom/google/android/gms/internal/measurement/al$d;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$d;->pu()Lcom/google/android/gms/internal/measurement/al$d;
 
     move-result-object v0
 
@@ -52,9 +52,9 @@
 .method public final C(J)Lcom/google/android/gms/internal/measurement/al$d$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$d$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$d$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$d;
 
@@ -63,12 +63,12 @@
     return-object p0
 .end method
 
-.method public final bC(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$d$a;
+.method public final bx(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$d$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$d$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$d$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$d;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$d.smali
index d5bd1fd77c..b02e4551c0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$d.smali
@@ -122,12 +122,12 @@
     throw p0
 .end method
 
-.method public static pv()Lcom/google/android/gms/internal/measurement/al$d$a;
+.method public static pt()Lcom/google/android/gms/internal/measurement/al$d$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$d;->zzwq:Lcom/google/android/gms/internal/measurement/al$d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sd()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sb()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v0
 
@@ -136,7 +136,7 @@
     return-object v0
 .end method
 
-.method static synthetic pw()Lcom/google/android/gms/internal/measurement/al$d;
+.method static synthetic pu()Lcom/google/android/gms/internal/measurement/al$d;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$d;->zzwq:Lcom/google/android/gms/internal/measurement/al$d;
@@ -149,7 +149,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$e$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$e$a.smali
index 9b546affbc..d4fcd9db41 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$e$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$e$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->pB()Lcom/google/android/gms/internal/measurement/al$e;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->pz()Lcom/google/android/gms/internal/measurement/al$e;
 
     move-result-object v0
 
@@ -52,9 +52,9 @@
 .method public final D(J)Lcom/google/android/gms/internal/measurement/al$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$e;
 
@@ -66,9 +66,9 @@
 .method public final b(D)Lcom/google/android/gms/internal/measurement/al$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$e;
 
@@ -77,12 +77,12 @@
     return-object p0
 .end method
 
-.method public final bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
+.method public final by(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$e;
 
@@ -91,12 +91,12 @@
     return-object p0
 .end method
 
-.method public final bE(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
+.method public final bz(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$e;
 
@@ -105,12 +105,12 @@
     return-object p0
 .end method
 
-.method public final pC()Lcom/google/android/gms/internal/measurement/al$e$a;
+.method public final pA()Lcom/google/android/gms/internal/measurement/al$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$e;
 
@@ -119,12 +119,12 @@
     return-object p0
 .end method
 
-.method public final pD()Lcom/google/android/gms/internal/measurement/al$e$a;
+.method public final pB()Lcom/google/android/gms/internal/measurement/al$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$e;
 
@@ -133,12 +133,12 @@
     return-object p0
 .end method
 
-.method public final pE()Lcom/google/android/gms/internal/measurement/al$e$a;
+.method public final pC()Lcom/google/android/gms/internal/measurement/al$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$e$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$e;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$e.smali
index 3c210798e8..793dccea92 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$e.smali
@@ -217,12 +217,12 @@
     return-void
 .end method
 
-.method public static pA()Lcom/google/android/gms/internal/measurement/al$e$a;
+.method public static py()Lcom/google/android/gms/internal/measurement/al$e$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$e;->zzwu:Lcom/google/android/gms/internal/measurement/al$e;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sd()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sb()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v0
 
@@ -231,7 +231,7 @@
     return-object v0
 .end method
 
-.method static synthetic pB()Lcom/google/android/gms/internal/measurement/al$e;
+.method static synthetic pz()Lcom/google/android/gms/internal/measurement/al$e;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$e;->zzwu:Lcom/google/android/gms/internal/measurement/al$e;
@@ -244,7 +244,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
     const/4 v1, 0x1
 
@@ -392,7 +392,7 @@
     .end packed-switch
 .end method
 
-.method public final px()Z
+.method public final pv()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$e;->zzue:I
@@ -411,7 +411,7 @@
     return v0
 .end method
 
-.method public final py()Z
+.method public final pw()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$e;->zzue:I
@@ -430,7 +430,7 @@
     return v0
 .end method
 
-.method public final pz()Z
+.method public final px()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$e;->zzue:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$f$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$f$a.smali
index 6f79f20a19..9e33c4e8ef 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$f$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$f$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$f;->pG()Lcom/google/android/gms/internal/measurement/al$f;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$f;->pE()Lcom/google/android/gms/internal/measurement/al$f;
 
     move-result-object v0
 
@@ -52,9 +52,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/al$g$a;)Lcom/google/android/gms/internal/measurement/al$f$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$f$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$f$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$f;
 
@@ -63,10 +63,10 @@
     return-object p0
 .end method
 
-.method public final pH()Lcom/google/android/gms/internal/measurement/al$g;
+.method public final pF()Lcom/google/android/gms/internal/measurement/al$g;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$f$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$f$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$f;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$f.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$f.smali
index 542cb85a2d..1c51ca17f0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$f.smali
@@ -82,7 +82,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dr;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sY()Lcom/google/android/gms/internal/measurement/fp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sW()Lcom/google/android/gms/internal/measurement/fp;
 
     move-result-object v0
 
@@ -96,7 +96,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$f;->zzwv:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v0
 
@@ -113,7 +113,7 @@
     :cond_0
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$f;->zzwv:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/dr;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()Lcom/google/android/gms/internal/measurement/dr;
 
     move-result-object p1
 
@@ -126,12 +126,12 @@
     return-void
 .end method
 
-.method public static pF()Lcom/google/android/gms/internal/measurement/al$f$a;
+.method public static pD()Lcom/google/android/gms/internal/measurement/al$f$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$f;->zzww:Lcom/google/android/gms/internal/measurement/al$f;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sd()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sb()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v0
 
@@ -140,7 +140,7 @@
     return-object v0
 .end method
 
-.method static synthetic pG()Lcom/google/android/gms/internal/measurement/al$f;
+.method static synthetic pE()Lcom/google/android/gms/internal/measurement/al$f;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$f;->zzww:Lcom/google/android/gms/internal/measurement/al$f;
@@ -153,7 +153,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$g$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$g$a.smali
index 2ecce3532a..7530c97115 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$g$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$g$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$g;->pN()Lcom/google/android/gms/internal/measurement/al$g;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$g;->pL()Lcom/google/android/gms/internal/measurement/al$g;
 
     move-result-object v0
 
@@ -52,9 +52,9 @@
 .method public final E(J)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -66,9 +66,9 @@
 .method public final F(J)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -80,9 +80,9 @@
 .method public final G(J)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -94,9 +94,9 @@
 .method public final H(J)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -108,9 +108,9 @@
 .method public final I(J)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -119,12 +119,26 @@
     return-object p0
 .end method
 
+.method public final I(Z)Lcom/google/android/gms/internal/measurement/al$g$a;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
+
+    invoke-static {v0, p1}, Lcom/google/android/gms/internal/measurement/al$g;->a(Lcom/google/android/gms/internal/measurement/al$g;Z)V
+
+    return-object p0
+.end method
+
 .method public final J(J)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -133,12 +147,26 @@
     return-object p0
 .end method
 
+.method public final J(Z)Lcom/google/android/gms/internal/measurement/al$g$a;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
+
+    invoke-static {v0, p1}, Lcom/google/android/gms/internal/measurement/al$g;->b(Lcom/google/android/gms/internal/measurement/al$g;Z)V
+
+    return-object p0
+.end method
+
 .method public final K(J)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -149,26 +177,12 @@
     return-object p0
 .end method
 
-.method public final K(Z)Lcom/google/android/gms/internal/measurement/al$g$a;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
-
-    invoke-static {v0, p1}, Lcom/google/android/gms/internal/measurement/al$g;->a(Lcom/google/android/gms/internal/measurement/al$g;Z)V
-
-    return-object p0
-.end method
-
 .method public final L(J)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -177,26 +191,12 @@
     return-object p0
 .end method
 
-.method public final L(Z)Lcom/google/android/gms/internal/measurement/al$g$a;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
-
-    invoke-static {v0, p1}, Lcom/google/android/gms/internal/measurement/al$g;->b(Lcom/google/android/gms/internal/measurement/al$g;Z)V
-
-    return-object p0
-.end method
-
 .method public final M(J)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -208,9 +208,9 @@
 .method public final N(J)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -222,9 +222,9 @@
 .method public final O(J)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -236,9 +236,9 @@
 .method public final P(J)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -250,9 +250,9 @@
 .method public final a(ILcom/google/android/gms/internal/measurement/al$c$a;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -264,9 +264,9 @@
 .method public final a(ILcom/google/android/gms/internal/measurement/al$k;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -278,9 +278,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/al$c$a;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -292,9 +292,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/al$h$a;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -306,9 +306,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/al$k$a;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -320,9 +320,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/al$k;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -344,9 +344,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -358,9 +358,9 @@
 .method public final bA(I)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -369,12 +369,12 @@
     return-object p0
 .end method
 
-.method public final bF(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bA(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -383,12 +383,12 @@
     return-object p0
 .end method
 
-.method public final bG(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bB(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -397,12 +397,12 @@
     return-object p0
 .end method
 
-.method public final bH(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bC(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -411,12 +411,12 @@
     return-object p0
 .end method
 
-.method public final bI(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -425,12 +425,12 @@
     return-object p0
 .end method
 
-.method public final bJ(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bE(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -439,12 +439,12 @@
     return-object p0
 .end method
 
-.method public final bK(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bF(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -453,12 +453,12 @@
     return-object p0
 .end method
 
-.method public final bL(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bG(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -467,12 +467,12 @@
     return-object p0
 .end method
 
-.method public final bM(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bH(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -481,12 +481,12 @@
     return-object p0
 .end method
 
-.method public final bN(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bI(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -495,12 +495,12 @@
     return-object p0
 .end method
 
-.method public final bO(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bJ(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -509,12 +509,12 @@
     return-object p0
 .end method
 
-.method public final bP(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bK(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -523,12 +523,12 @@
     return-object p0
 .end method
 
-.method public final bQ(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bL(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -537,12 +537,12 @@
     return-object p0
 .end method
 
-.method public final bR(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bM(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -551,12 +551,12 @@
     return-object p0
 .end method
 
-.method public final bS(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final bN(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -568,7 +568,7 @@
 .method public final bu(I)Lcom/google/android/gms/internal/measurement/al$c;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -586,9 +586,9 @@
 .method public final bv(I)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -600,7 +600,7 @@
 .method public final bw(I)Lcom/google/android/gms/internal/measurement/al$k;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -618,9 +618,9 @@
 .method public final bx(I)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -632,9 +632,9 @@
 .method public final by(I)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -646,9 +646,9 @@
 .method public final bz(I)Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -670,9 +670,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -694,9 +694,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -718,9 +718,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -732,7 +732,7 @@
 .method public final getGmpAppId()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -741,12 +741,12 @@
     return-object v0
 .end method
 
-.method public final pO()Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final pM()Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -755,7 +755,7 @@
     return-object p0
 .end method
 
-.method public final pP()Ljava/util/List;
+.method public final pN()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -766,7 +766,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -779,10 +779,10 @@
     return-object v0
 .end method
 
-.method public final pQ()I
+.method public final pO()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -795,12 +795,12 @@
     return v0
 .end method
 
-.method public final pR()Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final pP()Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -809,7 +809,7 @@
     return-object p0
 .end method
 
-.method public final pS()Ljava/util/List;
+.method public final pQ()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -820,7 +820,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -833,10 +833,10 @@
     return-object v0
 .end method
 
-.method public final pT()I
+.method public final pR()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -849,10 +849,10 @@
     return v0
 .end method
 
-.method public final pU()J
+.method public final pS()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -861,10 +861,10 @@
     return-wide v0
 .end method
 
-.method public final pV()J
+.method public final pT()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -873,12 +873,12 @@
     return-wide v0
 .end method
 
-.method public final pW()Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final pU()Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -887,12 +887,12 @@
     return-object p0
 .end method
 
-.method public final pX()Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final pV()Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -901,10 +901,10 @@
     return-object p0
 .end method
 
-.method public final pY()Ljava/lang/String;
+.method public final pW()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -913,12 +913,12 @@
     return-object v0
 .end method
 
-.method public final pZ()Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final pX()Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -927,12 +927,12 @@
     return-object p0
 .end method
 
-.method public final qa()Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final pY()Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -941,12 +941,12 @@
     return-object p0
 .end method
 
-.method public final qb()Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final pZ()Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
@@ -955,12 +955,12 @@
     return-object p0
 .end method
 
-.method public final qc()Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public final qa()Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$g;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$g.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$g.smali
index 197bf9fcb5..e771377120 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$g.smali
@@ -184,13 +184,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dr;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sY()Lcom/google/android/gms/internal/measurement/fp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sW()Lcom/google/android/gms/internal/measurement/fp;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzwz:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sY()Lcom/google/android/gms/internal/measurement/fp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sW()Lcom/google/android/gms/internal/measurement/fp;
 
     move-result-object v0
 
@@ -220,7 +220,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzxw:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sY()Lcom/google/android/gms/internal/measurement/fp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sW()Lcom/google/android/gms/internal/measurement/fp;
 
     move-result-object v1
 
@@ -236,7 +236,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzyj:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/du;->sr()Lcom/google/android/gms/internal/measurement/du;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/du;->sp()Lcom/google/android/gms/internal/measurement/du;
 
     move-result-object v0
 
@@ -264,7 +264,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$g;I)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pI()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pG()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzwz:Lcom/google/android/gms/internal/measurement/dz;
 
@@ -276,11 +276,11 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$g;ILcom/google/android/gms/internal/measurement/al$c$a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pI()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pG()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzwz:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/dr;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()Lcom/google/android/gms/internal/measurement/dr;
 
     move-result-object p2
 
@@ -298,7 +298,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pJ()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pH()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzxa:Lcom/google/android/gms/internal/measurement/dz;
 
@@ -331,11 +331,11 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$g;Lcom/google/android/gms/internal/measurement/al$c$a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pI()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pG()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzwz:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/dr;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()Lcom/google/android/gms/internal/measurement/dr;
 
     move-result-object p1
 
@@ -351,7 +351,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$g;Lcom/google/android/gms/internal/measurement/al$h$a;)V
     .locals 0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/dr;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()Lcom/google/android/gms/internal/measurement/dr;
 
     move-result-object p1
 
@@ -373,11 +373,11 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$g;Lcom/google/android/gms/internal/measurement/al$k$a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pJ()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pH()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzxa:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/dr;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()Lcom/google/android/gms/internal/measurement/dr;
 
     move-result-object p1
 
@@ -395,7 +395,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pJ()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pH()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzxa:Lcom/google/android/gms/internal/measurement/dz;
 
@@ -414,7 +414,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$g;Ljava/lang/Iterable;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pI()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pG()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzwz:Lcom/google/android/gms/internal/measurement/dz;
 
@@ -465,7 +465,7 @@
 .method static synthetic b(Lcom/google/android/gms/internal/measurement/al$g;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sY()Lcom/google/android/gms/internal/measurement/fp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sW()Lcom/google/android/gms/internal/measurement/fp;
 
     move-result-object v0
 
@@ -505,7 +505,7 @@
 .method static synthetic b(Lcom/google/android/gms/internal/measurement/al$g;Ljava/lang/Iterable;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pJ()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$g;->pH()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzxa:Lcom/google/android/gms/internal/measurement/dz;
 
@@ -604,7 +604,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzxy:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v0
 
@@ -719,7 +719,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzyl:Lcom/google/android/gms/internal/measurement/dx;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dx;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dx;->qP()Z
 
     move-result v0
 
@@ -852,7 +852,7 @@
 .method static synthetic f(Lcom/google/android/gms/internal/measurement/al$g;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sY()Lcom/google/android/gms/internal/measurement/fp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sW()Lcom/google/android/gms/internal/measurement/fp;
 
     move-result-object v0
 
@@ -1216,12 +1216,12 @@
     throw p0
 .end method
 
-.method private final pI()V
+.method private final pG()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzwz:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v0
 
@@ -1239,12 +1239,12 @@
     return-void
 .end method
 
-.method private final pJ()V
+.method private final pH()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzxa:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v0
 
@@ -1262,12 +1262,12 @@
     return-void
 .end method
 
-.method public static pM()Lcom/google/android/gms/internal/measurement/al$g$a;
+.method public static pK()Lcom/google/android/gms/internal/measurement/al$g$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$g;->zzyo:Lcom/google/android/gms/internal/measurement/al$g;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sd()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sb()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v0
 
@@ -1276,7 +1276,7 @@
     return-object v0
 .end method
 
-.method static synthetic pN()Lcom/google/android/gms/internal/measurement/al$g;
+.method static synthetic pL()Lcom/google/android/gms/internal/measurement/al$g;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$g;->zzyo:Lcom/google/android/gms/internal/measurement/al$g;
@@ -1289,7 +1289,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
     const/4 v1, 0x1
 
@@ -1685,7 +1685,7 @@
     .end packed-switch
 .end method
 
-.method public final pK()Z
+.method public final pI()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzue:I
@@ -1704,7 +1704,7 @@
     return v0
 .end method
 
-.method public final pL()Z
+.method public final pJ()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$g;->zzwx:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$h$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$h$a.smali
index 6da1b40772..06f3c36ecd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$h$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$h$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$h;->qe()Lcom/google/android/gms/internal/measurement/al$h;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$h;->qc()Lcom/google/android/gms/internal/measurement/al$h;
 
     move-result-object v0
 
@@ -52,9 +52,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/al$d$a;)Lcom/google/android/gms/internal/measurement/al$h$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$h$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$h$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$h;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$h$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$h$b.smali
index cdf0ddf8df..6f2dc3daa0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$h$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$h$b.smali
@@ -26,7 +26,7 @@
 
 
 # static fields
-.field private static final aqT:Lcom/google/android/gms/internal/measurement/dv;
+.field private static final arl:Lcom/google/android/gms/internal/measurement/dv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/dv<",
@@ -36,11 +36,11 @@
     .end annotation
 .end field
 
-.field private static final enum are:Lcom/google/android/gms/internal/measurement/al$h$b;
+.field private static final enum arw:Lcom/google/android/gms/internal/measurement/al$h$b;
 
-.field private static final enum arf:Lcom/google/android/gms/internal/measurement/al$h$b;
+.field private static final enum arx:Lcom/google/android/gms/internal/measurement/al$h$b;
 
-.field private static final synthetic arg:[Lcom/google/android/gms/internal/measurement/al$h$b;
+.field private static final synthetic ary:[Lcom/google/android/gms/internal/measurement/al$h$b;
 
 
 # instance fields
@@ -61,7 +61,7 @@
 
     invoke-direct {v0, v3, v1, v2}, Lcom/google/android/gms/internal/measurement/al$h$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/al$h$b;->are:Lcom/google/android/gms/internal/measurement/al$h$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/al$h$b;->arw:Lcom/google/android/gms/internal/measurement/al$h$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/al$h$b;
 
@@ -71,25 +71,25 @@
 
     invoke-direct {v0, v4, v2, v3}, Lcom/google/android/gms/internal/measurement/al$h$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/al$h$b;->arf:Lcom/google/android/gms/internal/measurement/al$h$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/al$h$b;->arx:Lcom/google/android/gms/internal/measurement/al$h$b;
 
     new-array v0, v3, [Lcom/google/android/gms/internal/measurement/al$h$b;
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/al$h$b;->are:Lcom/google/android/gms/internal/measurement/al$h$b;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/al$h$b;->arw:Lcom/google/android/gms/internal/measurement/al$h$b;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/al$h$b;->arf:Lcom/google/android/gms/internal/measurement/al$h$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al$h$b;->arx:Lcom/google/android/gms/internal/measurement/al$h$b;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/al$h$b;->arg:[Lcom/google/android/gms/internal/measurement/al$h$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/al$h$b;->ary:[Lcom/google/android/gms/internal/measurement/al$h$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/am;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/am;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/al$h$b;->aqT:Lcom/google/android/gms/internal/measurement/dv;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/al$h$b;->arl:Lcom/google/android/gms/internal/measurement/dv;
 
     return-void
 .end method
@@ -125,20 +125,20 @@
     return-object p0
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/internal/measurement/al$h$b;->arf:Lcom/google/android/gms/internal/measurement/al$h$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/al$h$b;->arx:Lcom/google/android/gms/internal/measurement/al$h$b;
 
     return-object p0
 
     :cond_1
-    sget-object p0, Lcom/google/android/gms/internal/measurement/al$h$b;->are:Lcom/google/android/gms/internal/measurement/al$h$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/al$h$b;->arw:Lcom/google/android/gms/internal/measurement/al$h$b;
 
     return-object p0
 .end method
 
-.method public static oV()Lcom/google/android/gms/internal/measurement/dy;
+.method public static oT()Lcom/google/android/gms/internal/measurement/dy;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/an;->ard:Lcom/google/android/gms/internal/measurement/dy;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/an;->arv:Lcom/google/android/gms/internal/measurement/dy;
 
     return-object v0
 .end method
@@ -146,7 +146,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/al$h$b;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/al$h$b;->arg:[Lcom/google/android/gms/internal/measurement/al$h$b;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al$h$b;->ary:[Lcom/google/android/gms/internal/measurement/al$h$b;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/al$h$b;->clone()Ljava/lang/Object;
 
@@ -159,7 +159,7 @@
 
 
 # virtual methods
-.method public final oU()I
+.method public final oS()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$h$b;->value:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$h.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$h.smali
index bce709b7f8..efc11ae701 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$h.smali
@@ -91,7 +91,7 @@
 
     iput v0, p0, Lcom/google/android/gms/internal/measurement/al$h;->zzyp:I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sY()Lcom/google/android/gms/internal/measurement/fp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sW()Lcom/google/android/gms/internal/measurement/fp;
 
     move-result-object v0
 
@@ -105,7 +105,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$h;->zzyq:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v0
 
@@ -122,7 +122,7 @@
     :cond_0
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$h;->zzyq:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/dr;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()Lcom/google/android/gms/internal/measurement/dr;
 
     move-result-object p1
 
@@ -135,12 +135,12 @@
     return-void
 .end method
 
-.method public static qd()Lcom/google/android/gms/internal/measurement/al$h$a;
+.method public static qb()Lcom/google/android/gms/internal/measurement/al$h$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$h;->zzyr:Lcom/google/android/gms/internal/measurement/al$h;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sd()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sb()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v0
 
@@ -149,7 +149,7 @@
     return-object v0
 .end method
 
-.method static synthetic qe()Lcom/google/android/gms/internal/measurement/al$h;
+.method static synthetic qc()Lcom/google/android/gms/internal/measurement/al$h;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$h;->zzyr:Lcom/google/android/gms/internal/measurement/al$h;
@@ -162,7 +162,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
     const/4 v1, 0x1
 
@@ -252,7 +252,7 @@
 
     const/4 v0, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$h$b;->oV()Lcom/google/android/gms/internal/measurement/dy;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$h$b;->oT()Lcom/google/android/gms/internal/measurement/dy;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$i$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$i$a.smali
index ed4bb26ded..6eda3d2ee0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$i$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$i$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$i;->qm()Lcom/google/android/gms/internal/measurement/al$i;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$i;->qk()Lcom/google/android/gms/internal/measurement/al$i;
 
     move-result-object v0
 
@@ -52,9 +52,9 @@
 .method public final bC(I)Lcom/google/android/gms/internal/measurement/al$i$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$i;
 
@@ -66,9 +66,9 @@
 .method public final bD(I)Lcom/google/android/gms/internal/measurement/al$i$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$i;
 
@@ -90,9 +90,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$i;
 
@@ -114,9 +114,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$i;
 
@@ -138,9 +138,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$i;
 
@@ -162,9 +162,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$i;
 
@@ -173,12 +173,12 @@
     return-object p0
 .end method
 
-.method public final qn()Lcom/google/android/gms/internal/measurement/al$i$a;
+.method public final ql()Lcom/google/android/gms/internal/measurement/al$i$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$i;
 
@@ -187,12 +187,12 @@
     return-object p0
 .end method
 
-.method public final qo()Lcom/google/android/gms/internal/measurement/al$i$a;
+.method public final qm()Lcom/google/android/gms/internal/measurement/al$i$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$i;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$i.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$i.smali
index 42041eb307..affbe03917 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$i.smali
@@ -96,25 +96,25 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dr;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eo;->sH()Lcom/google/android/gms/internal/measurement/eo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eo;->sF()Lcom/google/android/gms/internal/measurement/eo;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyv:Lcom/google/android/gms/internal/measurement/ea;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eo;->sH()Lcom/google/android/gms/internal/measurement/eo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eo;->sF()Lcom/google/android/gms/internal/measurement/eo;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyw:Lcom/google/android/gms/internal/measurement/ea;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sY()Lcom/google/android/gms/internal/measurement/fp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sW()Lcom/google/android/gms/internal/measurement/fp;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyx:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sY()Lcom/google/android/gms/internal/measurement/fp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fp;->sW()Lcom/google/android/gms/internal/measurement/fp;
 
     move-result-object v0
 
@@ -126,7 +126,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$i;I)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$i;->qh()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$i;->qf()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyx:Lcom/google/android/gms/internal/measurement/dz;
 
@@ -140,7 +140,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyv:Lcom/google/android/gms/internal/measurement/ea;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ea;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ea;->qP()Z
 
     move-result v0
 
@@ -165,7 +165,7 @@
 .method static synthetic b(Lcom/google/android/gms/internal/measurement/al$i;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eo;->sH()Lcom/google/android/gms/internal/measurement/eo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eo;->sF()Lcom/google/android/gms/internal/measurement/eo;
 
     move-result-object v0
 
@@ -177,7 +177,7 @@
 .method static synthetic b(Lcom/google/android/gms/internal/measurement/al$i;I)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$i;->qj()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$i;->qh()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyy:Lcom/google/android/gms/internal/measurement/dz;
 
@@ -191,7 +191,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyw:Lcom/google/android/gms/internal/measurement/ea;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ea;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ea;->qP()Z
 
     move-result v0
 
@@ -216,7 +216,7 @@
 .method static synthetic c(Lcom/google/android/gms/internal/measurement/al$i;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eo;->sH()Lcom/google/android/gms/internal/measurement/eo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eo;->sF()Lcom/google/android/gms/internal/measurement/eo;
 
     move-result-object v0
 
@@ -228,7 +228,7 @@
 .method static synthetic c(Lcom/google/android/gms/internal/measurement/al$i;Ljava/lang/Iterable;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$i;->qh()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$i;->qf()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyx:Lcom/google/android/gms/internal/measurement/dz;
 
@@ -240,7 +240,7 @@
 .method static synthetic d(Lcom/google/android/gms/internal/measurement/al$i;Ljava/lang/Iterable;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$i;->qj()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$i;->qh()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyy:Lcom/google/android/gms/internal/measurement/dz;
 
@@ -268,12 +268,12 @@
     return-object p0
 .end method
 
-.method private final qh()V
+.method private final qf()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyx:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v0
 
@@ -291,12 +291,12 @@
     return-void
 .end method
 
-.method private final qj()V
+.method private final qh()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyy:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v0
 
@@ -314,12 +314,12 @@
     return-void
 .end method
 
-.method public static qk()Lcom/google/android/gms/internal/measurement/al$i$a;
+.method public static qi()Lcom/google/android/gms/internal/measurement/al$i$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$i;->zzyz:Lcom/google/android/gms/internal/measurement/al$i;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sd()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sb()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v0
 
@@ -328,7 +328,7 @@
     return-object v0
 .end method
 
-.method public static ql()Lcom/google/android/gms/internal/measurement/al$i;
+.method public static qj()Lcom/google/android/gms/internal/measurement/al$i;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$i;->zzyz:Lcom/google/android/gms/internal/measurement/al$i;
@@ -336,7 +336,7 @@
     return-object v0
 .end method
 
-.method static synthetic qm()Lcom/google/android/gms/internal/measurement/al$i;
+.method static synthetic qk()Lcom/google/android/gms/internal/measurement/al$i;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$i;->zzyz:Lcom/google/android/gms/internal/measurement/al$i;
@@ -349,7 +349,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
     const/4 v1, 0x1
 
@@ -497,7 +497,7 @@
     .end packed-switch
 .end method
 
-.method public final qf()I
+.method public final qd()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyv:Lcom/google/android/gms/internal/measurement/ea;
@@ -509,7 +509,7 @@
     return v0
 .end method
 
-.method public final qg()I
+.method public final qe()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyx:Lcom/google/android/gms/internal/measurement/dz;
@@ -521,7 +521,7 @@
     return v0
 .end method
 
-.method public final qi()I
+.method public final qg()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$i;->zzyy:Lcom/google/android/gms/internal/measurement/dz;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$j$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$j$a.smali
index 819ddfec0e..21f1d8f6c2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$j$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$j$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$j;->qs()Lcom/google/android/gms/internal/measurement/al$j;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$j;->qq()Lcom/google/android/gms/internal/measurement/al$j;
 
     move-result-object v0
 
@@ -52,9 +52,9 @@
 .method public final Q(J)Lcom/google/android/gms/internal/measurement/al$j$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$j$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$j$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$j;
 
@@ -66,9 +66,9 @@
 .method public final bF(I)Lcom/google/android/gms/internal/measurement/al$j$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$j$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$j$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$j;
 
@@ -90,9 +90,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$j$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$j$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$j;
 
@@ -101,12 +101,12 @@
     return-object p0
 .end method
 
-.method public final qt()Lcom/google/android/gms/internal/measurement/al$j$a;
+.method public final qr()Lcom/google/android/gms/internal/measurement/al$j$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$j$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$j$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$j;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$j.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$j.smali
index 3c8ad12123..a8245cc623 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$j.smali
@@ -78,7 +78,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dr;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eo;->sH()Lcom/google/android/gms/internal/measurement/eo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eo;->sF()Lcom/google/android/gms/internal/measurement/eo;
 
     move-result-object v0
 
@@ -90,7 +90,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$j;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eo;->sH()Lcom/google/android/gms/internal/measurement/eo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eo;->sF()Lcom/google/android/gms/internal/measurement/eo;
 
     move-result-object v0
 
@@ -116,7 +116,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$j;J)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$j;->qq()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$j;->qo()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$j;->zzza:Lcom/google/android/gms/internal/measurement/ea;
 
@@ -128,7 +128,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/al$j;Ljava/lang/Iterable;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$j;->qq()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/al$j;->qo()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/al$j;->zzza:Lcom/google/android/gms/internal/measurement/ea;
 
@@ -137,12 +137,12 @@
     return-void
 .end method
 
-.method private final qq()V
+.method private final qo()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$j;->zzza:Lcom/google/android/gms/internal/measurement/ea;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ea;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ea;->qP()Z
 
     move-result v0
 
@@ -160,12 +160,12 @@
     return-void
 .end method
 
-.method public static qr()Lcom/google/android/gms/internal/measurement/al$j$a;
+.method public static qp()Lcom/google/android/gms/internal/measurement/al$j$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$j;->zzzb:Lcom/google/android/gms/internal/measurement/al$j;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sd()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sb()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v0
 
@@ -174,7 +174,7 @@
     return-object v0
 .end method
 
-.method static synthetic qs()Lcom/google/android/gms/internal/measurement/al$j;
+.method static synthetic qq()Lcom/google/android/gms/internal/measurement/al$j;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$j;->zzzb:Lcom/google/android/gms/internal/measurement/al$j;
@@ -199,7 +199,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
     const/4 v1, 0x1
 
@@ -331,7 +331,7 @@
     .end packed-switch
 .end method
 
-.method public final pk()Z
+.method public final pi()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$j;->zzue:I
@@ -350,7 +350,7 @@
     return v0
 .end method
 
-.method public final qp()I
+.method public final qn()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$j;->zzza:Lcom/google/android/gms/internal/measurement/ea;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$k$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$k$a.smali
index 1d115f4aae..d5607a73e9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$k$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$k$a.smali
@@ -30,7 +30,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$k;->qw()Lcom/google/android/gms/internal/measurement/al$k;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$k;->qu()Lcom/google/android/gms/internal/measurement/al$k;
 
     move-result-object v0
 
@@ -52,9 +52,9 @@
 .method public final R(J)Lcom/google/android/gms/internal/measurement/al$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$k;
 
@@ -66,9 +66,9 @@
 .method public final S(J)Lcom/google/android/gms/internal/measurement/al$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$k;
 
@@ -77,12 +77,12 @@
     return-object p0
 .end method
 
-.method public final bT(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
+.method public final bO(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$k;
 
@@ -91,12 +91,12 @@
     return-object p0
 .end method
 
-.method public final bU(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
+.method public final bP(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$k;
 
@@ -108,9 +108,9 @@
 .method public final c(D)Lcom/google/android/gms/internal/measurement/al$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$k;
 
@@ -119,12 +119,12 @@
     return-object p0
 .end method
 
-.method public final qx()Lcom/google/android/gms/internal/measurement/al$k$a;
+.method public final qv()Lcom/google/android/gms/internal/measurement/al$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$k;
 
@@ -133,12 +133,12 @@
     return-object p0
 .end method
 
-.method public final qy()Lcom/google/android/gms/internal/measurement/al$k$a;
+.method public final qw()Lcom/google/android/gms/internal/measurement/al$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$k;
 
@@ -147,12 +147,12 @@
     return-object p0
 .end method
 
-.method public final qz()Lcom/google/android/gms/internal/measurement/al$k$a;
+.method public final qx()Lcom/google/android/gms/internal/measurement/al$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/al$k$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/al$k;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$k.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$k.smali
index 392e0a42dc..e38b8e4c61 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$k.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al$k.smali
@@ -233,12 +233,12 @@
     return-void
 .end method
 
-.method public static qv()Lcom/google/android/gms/internal/measurement/al$k$a;
+.method public static qt()Lcom/google/android/gms/internal/measurement/al$k$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$k;->zzzd:Lcom/google/android/gms/internal/measurement/al$k;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sd()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->sb()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v0
 
@@ -247,7 +247,7 @@
     return-object v0
 .end method
 
-.method static synthetic qw()Lcom/google/android/gms/internal/measurement/al$k;
+.method static synthetic qu()Lcom/google/android/gms/internal/measurement/al$k;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/al$k;->zzzd:Lcom/google/android/gms/internal/measurement/al$k;
@@ -260,7 +260,7 @@
 .method protected final bl(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->aqN:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak;->arf:[I
 
     const/4 v1, 0x1
 
@@ -416,7 +416,7 @@
     .end packed-switch
 .end method
 
-.method public final px()Z
+.method public final pv()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$k;->zzue:I
@@ -435,7 +435,7 @@
     return v0
 .end method
 
-.method public final py()Z
+.method public final pw()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$k;->zzue:I
@@ -454,7 +454,7 @@
     return v0
 .end method
 
-.method public final pz()Z
+.method public final px()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$k;->zzue:I
@@ -473,7 +473,7 @@
     return v0
 .end method
 
-.method public final qu()Z
+.method public final qs()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/al$k;->zzue:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/an.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/an.smali
index 551d68ba47..b948df96c4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/an.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/an.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final ard:Lcom/google/android/gms/internal/measurement/dy;
+.field static final arv:Lcom/google/android/gms/internal/measurement/dy;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/an;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/an;->ard:Lcom/google/android/gms/internal/measurement/dy;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/an;->arv:Lcom/google/android/gms/internal/measurement/dy;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ao.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ao.smali
index bf39e81aed..bee1e24c4e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ao.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ao.smali
@@ -13,19 +13,19 @@
 
 
 # static fields
-.field private static volatile arh:[Lcom/google/android/gms/internal/measurement/ao;
+.field private static volatile arz:[Lcom/google/android/gms/internal/measurement/ao;
 
 
 # instance fields
-.field public ari:Ljava/lang/Integer;
+.field public arA:Ljava/lang/Integer;
 
-.field public arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+.field public arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
-.field public ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+.field public arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
-.field private arl:Ljava/lang/Boolean;
+.field private arD:Ljava/lang/Boolean;
 
-.field private arm:Ljava/lang/Boolean;
+.field private arE:Ljava/lang/Boolean;
 
 
 # direct methods
@@ -36,44 +36,44 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->ari:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arA:Ljava/lang/Integer;
 
     const/4 v1, 0x0
 
     new-array v2, v1, [Lcom/google/android/gms/internal/measurement/ad$d;
 
-    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     new-array v1, v1, [Lcom/google/android/gms/internal/measurement/ad$a;
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arl:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arD:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arm:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/ao;->ayf:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/ao;->ayx:I
 
     return-void
 .end method
 
-.method public static qA()[Lcom/google/android/gms/internal/measurement/ao;
+.method public static qy()[Lcom/google/android/gms/internal/measurement/ao;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ao;->arh:[Lcom/google/android/gms/internal/measurement/ao;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ao;->arz:[Lcom/google/android/gms/internal/measurement/ao;
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hn;->aye:Ljava/lang/Object;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hn;->ayw:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ao;->arh:[Lcom/google/android/gms/internal/measurement/ao;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ao;->arz:[Lcom/google/android/gms/internal/measurement/ao;
 
     if-nez v1, :cond_0
 
@@ -81,7 +81,7 @@
 
     new-array v1, v1, [Lcom/google/android/gms/internal/measurement/ao;
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ao;->arh:[Lcom/google/android/gms/internal/measurement/ao;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ao;->arz:[Lcom/google/android/gms/internal/measurement/ao;
 
     :cond_0
     monitor-exit v0
@@ -99,7 +99,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ao;->arh:[Lcom/google/android/gms/internal/measurement/ao;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ao;->arz:[Lcom/google/android/gms/internal/measurement/ao;
 
     return-object v0
 .end method
@@ -116,7 +116,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qW()I
 
     move-result v0
 
@@ -153,7 +153,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->re()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->rc()Z
 
     move-result v0
 
@@ -161,12 +161,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arm:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arE:Ljava/lang/Boolean;
 
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->re()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->rc()Z
 
     move-result v0
 
@@ -174,7 +174,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arl:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arD:Ljava/lang/Boolean;
 
     goto :goto_0
 
@@ -183,7 +183,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     if-nez v1, :cond_4
 
@@ -201,7 +201,7 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     invoke-static {v3, v2, v0, v2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -213,7 +213,7 @@
 
     if-ge v1, v2, :cond_6
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$a;->oE()Lcom/google/android/gms/internal/measurement/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$a;->oC()Lcom/google/android/gms/internal/measurement/fk;
 
     move-result-object v2
 
@@ -225,14 +225,14 @@
 
     aput-object v2, v0, v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qW()I
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_2
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$a;->oE()Lcom/google/android/gms/internal/measurement/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$a;->oC()Lcom/google/android/gms/internal/measurement/fk;
 
     move-result-object v2
 
@@ -244,7 +244,7 @@
 
     aput-object v2, v0, v1
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     goto :goto_0
 
@@ -253,7 +253,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     if-nez v1, :cond_8
 
@@ -271,7 +271,7 @@
 
     if-eqz v1, :cond_9
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     invoke-static {v3, v2, v0, v2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -283,7 +283,7 @@
 
     if-ge v1, v2, :cond_a
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$d;->oE()Lcom/google/android/gms/internal/measurement/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$d;->oC()Lcom/google/android/gms/internal/measurement/fk;
 
     move-result-object v2
 
@@ -295,14 +295,14 @@
 
     aput-object v2, v0, v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qW()I
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_4
 
     :cond_a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$d;->oE()Lcom/google/android/gms/internal/measurement/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ad$d;->oC()Lcom/google/android/gms/internal/measurement/fk;
 
     move-result-object v2
 
@@ -314,12 +314,12 @@
 
     aput-object v2, v0, v1
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     goto/16 :goto_0
 
     :cond_b
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->rs()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->rq()I
 
     move-result v0
 
@@ -327,7 +327,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->ari:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arA:Ljava/lang/Integer;
 
     goto/16 :goto_0
 
@@ -343,7 +343,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->ari:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arA:Ljava/lang/Integer;
 
     if-eqz v0, :cond_0
 
@@ -353,10 +353,10 @@
 
     const/4 v1, 0x1
 
-    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/hh;->z(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/hh;->y(II)V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     const/4 v1, 0x0
 
@@ -369,7 +369,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     array-length v3, v2
 
@@ -389,7 +389,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     if-eqz v0, :cond_4
 
@@ -398,7 +398,7 @@
     if-lez v0, :cond_4
 
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     array-length v2, v0
 
@@ -418,7 +418,7 @@
     goto :goto_1
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arl:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arD:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_5
 
@@ -431,7 +431,7 @@
     invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/hh;->e(IZ)V
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arm:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->arE:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_6
 
@@ -470,18 +470,18 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/internal/measurement/ao;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ari:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arA:Ljava/lang/Integer;
 
     if-nez v1, :cond_2
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ao;->ari:Ljava/lang/Integer;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ao;->arA:Ljava/lang/Integer;
 
     if-eqz v1, :cond_3
 
     return v2
 
     :cond_2
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ao;->ari:Ljava/lang/Integer;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ao;->arA:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
 
@@ -492,9 +492,9 @@
     return v2
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/hn;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
 
@@ -505,9 +505,9 @@
     return v2
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/hn;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
 
@@ -518,18 +518,18 @@
     return v2
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arl:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arD:Ljava/lang/Boolean;
 
     if-nez v1, :cond_6
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ao;->arl:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ao;->arD:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_7
 
     return v2
 
     :cond_6
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ao;->arl:Ljava/lang/Boolean;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ao;->arD:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
 
@@ -540,18 +540,18 @@
     return v2
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arm:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arE:Ljava/lang/Boolean;
 
     if-nez v1, :cond_8
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ao;->arm:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ao;->arE:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_9
 
     return v2
 
     :cond_8
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ao;->arm:Ljava/lang/Boolean;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ao;->arE:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
 
@@ -562,11 +562,11 @@
     return v2
 
     :cond_9
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     if-eqz v1, :cond_b
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hl;->isEmpty()Z
 
@@ -577,9 +577,9 @@
     goto :goto_0
 
     :cond_a
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ao;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ao;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ao;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/hl;->equals(Ljava/lang/Object;)Z
 
@@ -589,11 +589,11 @@
 
     :cond_b
     :goto_0
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ao;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ao;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     if-eqz v1, :cond_d
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ao;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ao;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/hl;->isEmpty()Z
 
@@ -630,7 +630,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ari:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arA:Ljava/lang/Integer;
 
     const/4 v2, 0x0
 
@@ -650,7 +650,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/hn;->hashCode([Ljava/lang/Object;)I
 
@@ -660,7 +660,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/hn;->hashCode([Ljava/lang/Object;)I
 
@@ -670,7 +670,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arl:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arD:Ljava/lang/Boolean;
 
     if-nez v1, :cond_1
 
@@ -688,7 +688,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arm:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arE:Ljava/lang/Boolean;
 
     if-nez v1, :cond_2
 
@@ -706,11 +706,11 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hl;->isEmpty()Z
 
@@ -721,7 +721,7 @@
     goto :goto_3
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hl;->hashCode()I
 
@@ -734,14 +734,14 @@
     return v0
 .end method
 
-.method protected final qB()I
+.method protected final qz()I
     .locals 6
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/hj;->qB()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/hj;->qz()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ari:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arA:Ljava/lang/Integer;
 
     const/4 v2, 0x1
 
@@ -751,14 +751,14 @@
 
     move-result v1
 
-    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/hh;->D(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/hh;->C(II)I
 
     move-result v1
 
     add-int/2addr v0, v1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     const/4 v3, 0x0
 
@@ -773,7 +773,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     array-length v5, v4
 
@@ -800,7 +800,7 @@
     move v0, v1
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     if-eqz v1, :cond_5
 
@@ -809,7 +809,7 @@
     if-lez v1, :cond_5
 
     :goto_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     array-length v4, v1
 
@@ -833,7 +833,7 @@
     goto :goto_1
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arl:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arD:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_6
 
@@ -850,7 +850,7 @@
     add-int/2addr v0, v1
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arm:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ao;->arE:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_7
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ap.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ap.smali
index e252517cc1..be7c5572bd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ap.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ap.smali
@@ -13,21 +13,21 @@
 
 
 # instance fields
-.field public arn:Ljava/lang/Long;
+.field public arF:Ljava/lang/Long;
 
-.field public aro:Ljava/lang/String;
+.field public arG:Ljava/lang/String;
 
-.field private arp:Ljava/lang/Integer;
+.field private arH:Ljava/lang/Integer;
 
-.field public arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+.field public arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
-.field public arr:[Lcom/google/android/gms/internal/measurement/aq;
+.field public arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
-.field public ars:[Lcom/google/android/gms/internal/measurement/ao;
+.field public arK:[Lcom/google/android/gms/internal/measurement/ao;
 
-.field private art:Ljava/lang/String;
+.field private arL:Ljava/lang/String;
 
-.field public aru:Ljava/lang/Boolean;
+.field public arM:Ljava/lang/Boolean;
 
 
 # direct methods
@@ -38,39 +38,39 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arn:Ljava/lang/Long;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arF:Ljava/lang/Long;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->aro:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arG:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arp:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arH:Ljava/lang/Integer;
 
     const/4 v1, 0x0
 
     new-array v1, v1, [Lcom/google/android/gms/internal/measurement/aj$a;
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/aq;->qC()[Lcom/google/android/gms/internal/measurement/aq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/aq;->qA()[Lcom/google/android/gms/internal/measurement/aq;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arr:[Lcom/google/android/gms/internal/measurement/aq;
+    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ao;->qA()[Lcom/google/android/gms/internal/measurement/ao;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ao;->qy()[Lcom/google/android/gms/internal/measurement/ao;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->ars:[Lcom/google/android/gms/internal/measurement/ao;
+    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arK:[Lcom/google/android/gms/internal/measurement/ao;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->art:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arL:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->aru:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arM:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/ap;->ayf:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/ap;->ayx:I
 
     return-void
 .end method
@@ -87,7 +87,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qW()I
 
     move-result v0
 
@@ -136,7 +136,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->re()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->rc()Z
 
     move-result v0
 
@@ -144,7 +144,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->aru:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arM:Ljava/lang/Boolean;
 
     goto :goto_0
 
@@ -153,7 +153,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->art:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arL:Ljava/lang/String;
 
     goto :goto_0
 
@@ -162,7 +162,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->ars:[Lcom/google/android/gms/internal/measurement/ao;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arK:[Lcom/google/android/gms/internal/measurement/ao;
 
     if-nez v1, :cond_4
 
@@ -180,7 +180,7 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ap;->ars:[Lcom/google/android/gms/internal/measurement/ao;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ap;->arK:[Lcom/google/android/gms/internal/measurement/ao;
 
     invoke-static {v2, v3, v0, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -202,7 +202,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/hp;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qW()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -219,7 +219,7 @@
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/hp;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->ars:[Lcom/google/android/gms/internal/measurement/ao;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arK:[Lcom/google/android/gms/internal/measurement/ao;
 
     goto :goto_0
 
@@ -228,7 +228,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arr:[Lcom/google/android/gms/internal/measurement/aq;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
     if-nez v1, :cond_8
 
@@ -246,7 +246,7 @@
 
     if-eqz v1, :cond_9
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ap;->arr:[Lcom/google/android/gms/internal/measurement/aq;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ap;->arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
     invoke-static {v2, v3, v0, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -268,7 +268,7 @@
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/hp;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qW()I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -285,7 +285,7 @@
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/measurement/he;->a(Lcom/google/android/gms/internal/measurement/hp;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arr:[Lcom/google/android/gms/internal/measurement/aq;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
     goto/16 :goto_0
 
@@ -294,7 +294,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
     if-nez v1, :cond_c
 
@@ -312,7 +312,7 @@
 
     if-eqz v1, :cond_d
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ap;->arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ap;->arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
     invoke-static {v2, v3, v0, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -324,7 +324,7 @@
 
     if-ge v1, v2, :cond_e
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/aj$a;->oE()Lcom/google/android/gms/internal/measurement/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/aj$a;->oC()Lcom/google/android/gms/internal/measurement/fk;
 
     move-result-object v2
 
@@ -336,14 +336,14 @@
 
     aput-object v2, v0, v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qW()I
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_6
 
     :cond_e
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/aj$a;->oE()Lcom/google/android/gms/internal/measurement/fk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/aj$a;->oC()Lcom/google/android/gms/internal/measurement/fk;
 
     move-result-object v2
 
@@ -355,12 +355,12 @@
 
     aput-object v2, v0, v1
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
     goto/16 :goto_0
 
     :cond_f
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->rs()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->rq()I
 
     move-result v0
 
@@ -368,7 +368,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arp:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arH:Ljava/lang/Integer;
 
     goto/16 :goto_0
 
@@ -377,7 +377,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->aro:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arG:Ljava/lang/String;
 
     goto/16 :goto_0
 
@@ -387,7 +387,7 @@
     :goto_7
     if-ge v3, v2, :cond_13
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
     move-result v4
 
@@ -407,7 +407,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arn:Ljava/lang/Long;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arF:Ljava/lang/Long;
 
     goto/16 :goto_0
 
@@ -417,7 +417,7 @@
     goto :goto_7
 
     :cond_13
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tC()Lcom/google/android/gms/internal/measurement/hm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tA()Lcom/google/android/gms/internal/measurement/hm;
 
     move-result-object p1
 
@@ -435,7 +435,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arn:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arF:Ljava/lang/Long;
 
     const/4 v1, 0x0
 
@@ -447,12 +447,12 @@
 
     const/4 v0, 0x1
 
-    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/hh;->y(II)V
+    invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/hh;->x(II)V
 
     invoke-virtual {p1, v2, v3}, Lcom/google/android/gms/internal/measurement/hh;->ae(J)V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->aro:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arG:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
@@ -461,7 +461,7 @@
     invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/hh;->c(ILjava/lang/String;)V
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arp:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arH:Ljava/lang/Integer;
 
     if-eqz v0, :cond_2
 
@@ -471,10 +471,10 @@
 
     move-result v0
 
-    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/hh;->z(II)V
+    invoke-virtual {p1, v2, v0}, Lcom/google/android/gms/internal/measurement/hh;->y(II)V
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
     if-eqz v0, :cond_4
 
@@ -485,7 +485,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ap;->arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ap;->arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
     array-length v3, v2
 
@@ -505,7 +505,7 @@
     goto :goto_0
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arr:[Lcom/google/android/gms/internal/measurement/aq;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
     if-eqz v0, :cond_6
 
@@ -516,7 +516,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ap;->arr:[Lcom/google/android/gms/internal/measurement/aq;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ap;->arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
     array-length v3, v2
 
@@ -536,7 +536,7 @@
     goto :goto_1
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->ars:[Lcom/google/android/gms/internal/measurement/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arK:[Lcom/google/android/gms/internal/measurement/ao;
 
     if-eqz v0, :cond_8
 
@@ -545,7 +545,7 @@
     if-lez v0, :cond_8
 
     :goto_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->ars:[Lcom/google/android/gms/internal/measurement/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arK:[Lcom/google/android/gms/internal/measurement/ao;
 
     array-length v2, v0
 
@@ -565,7 +565,7 @@
     goto :goto_2
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->art:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arL:Ljava/lang/String;
 
     if-eqz v0, :cond_9
 
@@ -574,7 +574,7 @@
     invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/hh;->c(ILjava/lang/String;)V
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->aru:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->arM:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_a
 
@@ -613,18 +613,18 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/internal/measurement/ap;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arn:Ljava/lang/Long;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arF:Ljava/lang/Long;
 
     if-nez v1, :cond_2
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ap;->arn:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ap;->arF:Ljava/lang/Long;
 
     if-eqz v1, :cond_3
 
     return v2
 
     :cond_2
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->arn:Ljava/lang/Long;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->arF:Ljava/lang/Long;
 
     invoke-virtual {v1, v3}, Ljava/lang/Long;->equals(Ljava/lang/Object;)Z
 
@@ -635,18 +635,18 @@
     return v2
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->aro:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arG:Ljava/lang/String;
 
     if-nez v1, :cond_4
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ap;->aro:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ap;->arG:Ljava/lang/String;
 
     if-eqz v1, :cond_5
 
     return v2
 
     :cond_4
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->aro:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->arG:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -657,18 +657,18 @@
     return v2
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arp:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arH:Ljava/lang/Integer;
 
     if-nez v1, :cond_6
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ap;->arp:Ljava/lang/Integer;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ap;->arH:Ljava/lang/Integer;
 
     if-eqz v1, :cond_7
 
     return v2
 
     :cond_6
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->arp:Ljava/lang/Integer;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->arH:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
 
@@ -679,9 +679,9 @@
     return v2
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/hn;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
 
@@ -692,9 +692,9 @@
     return v2
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arr:[Lcom/google/android/gms/internal/measurement/aq;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->arr:[Lcom/google/android/gms/internal/measurement/aq;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/hn;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
 
@@ -705,9 +705,9 @@
     return v2
 
     :cond_9
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->ars:[Lcom/google/android/gms/internal/measurement/ao;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arK:[Lcom/google/android/gms/internal/measurement/ao;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->ars:[Lcom/google/android/gms/internal/measurement/ao;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->arK:[Lcom/google/android/gms/internal/measurement/ao;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/hn;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
 
@@ -718,18 +718,18 @@
     return v2
 
     :cond_a
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->art:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arL:Ljava/lang/String;
 
     if-nez v1, :cond_b
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ap;->art:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ap;->arL:Ljava/lang/String;
 
     if-eqz v1, :cond_c
 
     return v2
 
     :cond_b
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->art:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->arL:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -740,18 +740,18 @@
     return v2
 
     :cond_c
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->aru:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arM:Ljava/lang/Boolean;
 
     if-nez v1, :cond_d
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ap;->aru:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ap;->arM:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_e
 
     return v2
 
     :cond_d
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->aru:Ljava/lang/Boolean;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ap;->arM:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
 
@@ -762,11 +762,11 @@
     return v2
 
     :cond_e
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     if-eqz v1, :cond_10
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hl;->isEmpty()Z
 
@@ -777,9 +777,9 @@
     goto :goto_0
 
     :cond_f
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ap;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ap;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ap;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/hl;->equals(Ljava/lang/Object;)Z
 
@@ -789,11 +789,11 @@
 
     :cond_10
     :goto_0
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ap;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ap;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     if-eqz v1, :cond_12
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ap;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ap;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/hl;->isEmpty()Z
 
@@ -830,7 +830,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arn:Ljava/lang/Long;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arF:Ljava/lang/Long;
 
     const/4 v2, 0x0
 
@@ -850,7 +850,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->aro:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arG:Ljava/lang/String;
 
     if-nez v1, :cond_1
 
@@ -868,7 +868,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arp:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arH:Ljava/lang/Integer;
 
     if-nez v1, :cond_2
 
@@ -886,7 +886,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/hn;->hashCode([Ljava/lang/Object;)I
 
@@ -896,7 +896,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arr:[Lcom/google/android/gms/internal/measurement/aq;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/hn;->hashCode([Ljava/lang/Object;)I
 
@@ -906,7 +906,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->ars:[Lcom/google/android/gms/internal/measurement/ao;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arK:[Lcom/google/android/gms/internal/measurement/ao;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/hn;->hashCode([Ljava/lang/Object;)I
 
@@ -916,7 +916,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->art:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arL:Ljava/lang/String;
 
     if-nez v1, :cond_3
 
@@ -934,7 +934,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->aru:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arM:Ljava/lang/Boolean;
 
     if-nez v1, :cond_4
 
@@ -952,11 +952,11 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hl;->isEmpty()Z
 
@@ -967,7 +967,7 @@
     goto :goto_5
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hl;->hashCode()I
 
@@ -980,16 +980,16 @@
     return v0
 .end method
 
-.method protected final qB()I
+.method protected final qz()I
     .locals 18
 
     move-object/from16 v0, p0
 
-    invoke-super/range {p0 .. p0}, Lcom/google/android/gms/internal/measurement/hj;->qB()I
+    invoke-super/range {p0 .. p0}, Lcom/google/android/gms/internal/measurement/hj;->qz()I
 
     move-result v1
 
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arn:Ljava/lang/Long;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arF:Ljava/lang/Long;
 
     const/4 v3, 0x6
 
@@ -1142,7 +1142,7 @@
     add-int/2addr v1, v12
 
     :cond_9
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->aro:Ljava/lang/String;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arG:Ljava/lang/String;
 
     if-eqz v2, :cond_a
 
@@ -1153,7 +1153,7 @@
     add-int/2addr v1, v2
 
     :cond_a
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arp:Ljava/lang/Integer;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arH:Ljava/lang/Integer;
 
     if-eqz v2, :cond_b
 
@@ -1161,14 +1161,14 @@
 
     move-result v2
 
-    invoke-static {v7, v2}, Lcom/google/android/gms/internal/measurement/hh;->D(II)I
+    invoke-static {v7, v2}, Lcom/google/android/gms/internal/measurement/hh;->C(II)I
 
     move-result v2
 
     add-int/2addr v1, v2
 
     :cond_b
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
     const/4 v7, 0x0
 
@@ -1183,7 +1183,7 @@
     const/4 v1, 0x0
 
     :goto_1
-    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/ap;->arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/ap;->arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
     array-length v10, v8
 
@@ -1208,7 +1208,7 @@
     move v1, v2
 
     :cond_e
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arr:[Lcom/google/android/gms/internal/measurement/aq;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
     if-eqz v2, :cond_11
 
@@ -1221,7 +1221,7 @@
     const/4 v1, 0x0
 
     :goto_2
-    iget-object v6, v0, Lcom/google/android/gms/internal/measurement/ap;->arr:[Lcom/google/android/gms/internal/measurement/aq;
+    iget-object v6, v0, Lcom/google/android/gms/internal/measurement/ap;->arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
     array-length v8, v6
 
@@ -1246,7 +1246,7 @@
     move v1, v2
 
     :cond_11
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->ars:[Lcom/google/android/gms/internal/measurement/ao;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arK:[Lcom/google/android/gms/internal/measurement/ao;
 
     if-eqz v2, :cond_13
 
@@ -1255,7 +1255,7 @@
     if-lez v2, :cond_13
 
     :goto_3
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->ars:[Lcom/google/android/gms/internal/measurement/ao;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arK:[Lcom/google/android/gms/internal/measurement/ao;
 
     array-length v5, v2
 
@@ -1277,7 +1277,7 @@
     goto :goto_3
 
     :cond_13
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->art:Ljava/lang/String;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arL:Ljava/lang/String;
 
     if-eqz v2, :cond_14
 
@@ -1288,7 +1288,7 @@
     add-int/2addr v1, v2
 
     :cond_14
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->aru:Ljava/lang/Boolean;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arM:Ljava/lang/Boolean;
 
     if-eqz v2, :cond_15
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aq.smali
index 0b2f5a5481..a42f834f19 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aq.smali
@@ -13,15 +13,15 @@
 
 
 # static fields
-.field private static volatile arv:[Lcom/google/android/gms/internal/measurement/aq;
+.field private static volatile arN:[Lcom/google/android/gms/internal/measurement/aq;
 
 
 # instance fields
-.field public arw:Ljava/lang/Boolean;
+.field public arO:Ljava/lang/Boolean;
 
-.field public arx:Ljava/lang/Boolean;
+.field public arP:Ljava/lang/Boolean;
 
-.field public ary:Ljava/lang/Integer;
+.field public arQ:Ljava/lang/Integer;
 
 .field public name:Ljava/lang/String;
 
@@ -36,34 +36,34 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->name:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arw:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arO:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arx:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arP:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->ary:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arQ:Ljava/lang/Integer;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/aq;->ayf:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/aq;->ayx:I
 
     return-void
 .end method
 
-.method public static qC()[Lcom/google/android/gms/internal/measurement/aq;
+.method public static qA()[Lcom/google/android/gms/internal/measurement/aq;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/aq;->arv:[Lcom/google/android/gms/internal/measurement/aq;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/aq;->arN:[Lcom/google/android/gms/internal/measurement/aq;
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hn;->aye:Ljava/lang/Object;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hn;->ayw:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/aq;->arv:[Lcom/google/android/gms/internal/measurement/aq;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aq;->arN:[Lcom/google/android/gms/internal/measurement/aq;
 
     if-nez v1, :cond_0
 
@@ -71,7 +71,7 @@
 
     new-array v1, v1, [Lcom/google/android/gms/internal/measurement/aq;
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/aq;->arv:[Lcom/google/android/gms/internal/measurement/aq;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/aq;->arN:[Lcom/google/android/gms/internal/measurement/aq;
 
     :cond_0
     monitor-exit v0
@@ -89,7 +89,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/aq;->arv:[Lcom/google/android/gms/internal/measurement/aq;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/aq;->arN:[Lcom/google/android/gms/internal/measurement/aq;
 
     return-object v0
 .end method
@@ -106,7 +106,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->qW()I
 
     move-result v0
 
@@ -137,7 +137,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->rs()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->rq()I
 
     move-result v0
 
@@ -145,12 +145,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->ary:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arQ:Ljava/lang/Integer;
 
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->re()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->rc()Z
 
     move-result v0
 
@@ -158,12 +158,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arx:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arP:Ljava/lang/Boolean;
 
     goto :goto_0
 
     :cond_3
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->re()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->rc()Z
 
     move-result v0
 
@@ -171,7 +171,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arw:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arO:Ljava/lang/Boolean;
 
     goto :goto_0
 
@@ -205,7 +205,7 @@
     invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/hh;->c(ILjava/lang/String;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arw:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arO:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_1
 
@@ -218,7 +218,7 @@
     invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/hh;->e(IZ)V
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arx:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arP:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_2
 
@@ -231,7 +231,7 @@
     invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/hh;->e(IZ)V
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->ary:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->arQ:Ljava/lang/Integer;
 
     if-eqz v0, :cond_3
 
@@ -241,7 +241,7 @@
 
     move-result v0
 
-    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/hh;->z(II)V
+    invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/internal/measurement/hh;->y(II)V
 
     :cond_3
     invoke-super {p0, p1}, Lcom/google/android/gms/internal/measurement/hj;->a(Lcom/google/android/gms/internal/measurement/hh;)V
@@ -292,18 +292,18 @@
     return v2
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arw:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arO:Ljava/lang/Boolean;
 
     if-nez v1, :cond_4
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/aq;->arw:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/aq;->arO:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_5
 
     return v2
 
     :cond_4
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/aq;->arw:Ljava/lang/Boolean;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/aq;->arO:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
 
@@ -314,18 +314,18 @@
     return v2
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arx:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arP:Ljava/lang/Boolean;
 
     if-nez v1, :cond_6
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/aq;->arx:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/aq;->arP:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_7
 
     return v2
 
     :cond_6
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/aq;->arx:Ljava/lang/Boolean;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/aq;->arP:Ljava/lang/Boolean;
 
     invoke-virtual {v1, v3}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
 
@@ -336,18 +336,18 @@
     return v2
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->ary:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arQ:Ljava/lang/Integer;
 
     if-nez v1, :cond_8
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/aq;->ary:Ljava/lang/Integer;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/aq;->arQ:Ljava/lang/Integer;
 
     if-eqz v1, :cond_9
 
     return v2
 
     :cond_8
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/aq;->ary:Ljava/lang/Integer;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/aq;->arQ:Ljava/lang/Integer;
 
     invoke-virtual {v1, v3}, Ljava/lang/Integer;->equals(Ljava/lang/Object;)Z
 
@@ -358,11 +358,11 @@
     return v2
 
     :cond_9
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     if-eqz v1, :cond_b
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hl;->isEmpty()Z
 
@@ -373,9 +373,9 @@
     goto :goto_0
 
     :cond_a
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/aq;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/aq;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/hl;->equals(Ljava/lang/Object;)Z
 
@@ -385,11 +385,11 @@
 
     :cond_b
     :goto_0
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/aq;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/aq;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     if-eqz v1, :cond_d
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/aq;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/aq;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/hl;->isEmpty()Z
 
@@ -446,7 +446,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arw:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arO:Ljava/lang/Boolean;
 
     if-nez v1, :cond_1
 
@@ -464,7 +464,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arx:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arP:Ljava/lang/Boolean;
 
     if-nez v1, :cond_2
 
@@ -482,7 +482,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->ary:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arQ:Ljava/lang/Integer;
 
     if-nez v1, :cond_3
 
@@ -500,11 +500,11 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hl;->isEmpty()Z
 
@@ -515,7 +515,7 @@
     goto :goto_4
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hl;->hashCode()I
 
@@ -528,10 +528,10 @@
     return v0
 .end method
 
-.method protected final qB()I
+.method protected final qz()I
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/hj;->qB()I
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/hj;->qz()I
 
     move-result v0
 
@@ -548,7 +548,7 @@
     add-int/2addr v0, v1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arw:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arO:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_1
 
@@ -565,7 +565,7 @@
     add-int/2addr v0, v1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arx:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arP:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_2
 
@@ -582,7 +582,7 @@
     add-int/2addr v0, v1
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->ary:Ljava/lang/Integer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->arQ:Ljava/lang/Integer;
 
     if-eqz v1, :cond_3
 
@@ -592,7 +592,7 @@
 
     move-result v1
 
-    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/hh;->D(II)I
+    invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/hh;->C(II)I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ar.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ar.smali
index 55a9f9bfff..36b9b66908 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ar.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ar.smali
@@ -18,7 +18,7 @@
 .method public final onChange(Z)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/as;->qD()Ljava/util/concurrent/atomic/AtomicBoolean;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/as;->qB()Ljava/util/concurrent/atomic/AtomicBoolean;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/as.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/as.smali
index 23e1d558e8..05245c3b5c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/as.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/as.smali
@@ -5,13 +5,15 @@
 # static fields
 .field public static final CONTENT_URI:Landroid/net/Uri;
 
-.field public static final arA:Ljava/util/regex/Pattern;
+.field private static final arR:Landroid/net/Uri;
 
-.field public static final arB:Ljava/util/regex/Pattern;
+.field public static final arS:Ljava/util/regex/Pattern;
 
-.field private static final arC:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field public static final arT:Ljava/util/regex/Pattern;
 
-.field private static arD:Ljava/util/HashMap;
+.field private static final arU:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+.field private static arV:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -22,7 +24,7 @@
     .end annotation
 .end field
 
-.field private static final arE:Ljava/util/HashMap;
+.field private static final arW:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -33,7 +35,7 @@
     .end annotation
 .end field
 
-.field private static final arF:Ljava/util/HashMap;
+.field private static final arX:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -44,7 +46,7 @@
     .end annotation
 .end field
 
-.field private static final arG:Ljava/util/HashMap;
+.field private static final arY:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -55,7 +57,7 @@
     .end annotation
 .end field
 
-.field private static final arH:Ljava/util/HashMap;
+.field private static final arZ:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -66,13 +68,11 @@
     .end annotation
 .end field
 
-.field private static arI:Ljava/lang/Object;
+.field private static asa:Ljava/lang/Object;
 
-.field private static arJ:Z
+.field private static asb:Z
 
-.field private static arK:[Ljava/lang/String;
-
-.field private static final arz:Landroid/net/Uri;
+.field private static asc:[Ljava/lang/String;
 
 
 # direct methods
@@ -93,7 +93,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arz:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arR:Landroid/net/Uri;
 
     const/4 v0, 0x2
 
@@ -103,7 +103,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/as;->arA:Ljava/util/regex/Pattern;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/as;->arS:Ljava/util/regex/Pattern;
 
     const-string v1, "^(0|false|f|off|no|n)$"
 
@@ -111,43 +111,43 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arB:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arT:Ljava/util/regex/Pattern;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arC:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arU:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arE:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arW:Ljava/util/HashMap;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arF:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arX:Ljava/util/HashMap;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arG:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arY:Ljava/util/HashMap;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arH:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arZ:Ljava/util/HashMap;
 
     const/4 v0, 0x0
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->arK:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/as;->asc:[Ljava/lang/String;
 
     return-void
 .end method
@@ -168,7 +168,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arD:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arV:Ljava/util/HashMap;
 
     const/4 v2, 0x1
 
@@ -176,7 +176,7 @@
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arC:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arU:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1, v3}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
@@ -184,15 +184,15 @@
 
     invoke-direct {v1}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/as;->arD:Ljava/util/HashMap;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/as;->arV:Ljava/util/HashMap;
 
     new-instance v1, Ljava/lang/Object;
 
     invoke-direct {v1}, Ljava/lang/Object;-><init>()V
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/as;->arI:Ljava/lang/Object;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/as;->asa:Ljava/lang/Object;
 
-    sput-boolean v3, Lcom/google/android/gms/internal/measurement/as;->arJ:Z
+    sput-boolean v3, Lcom/google/android/gms/internal/measurement/as;->asb:Z
 
     sget-object v1, Lcom/google/android/gms/internal/measurement/as;->CONTENT_URI:Landroid/net/Uri;
 
@@ -205,7 +205,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arC:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arU:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1, v3}, Ljava/util/concurrent/atomic/AtomicBoolean;->getAndSet(Z)Z
 
@@ -213,23 +213,23 @@
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arD:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arV:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arE:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arW:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arF:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arX:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arG:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arY:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arH:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arZ:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
 
@@ -237,15 +237,15 @@
 
     invoke-direct {v1}, Ljava/lang/Object;-><init>()V
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/as;->arI:Ljava/lang/Object;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/as;->asa:Ljava/lang/Object;
 
-    sput-boolean v3, Lcom/google/android/gms/internal/measurement/as;->arJ:Z
+    sput-boolean v3, Lcom/google/android/gms/internal/measurement/as;->asb:Z
 
     :cond_1
     :goto_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arI:Ljava/lang/Object;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->asa:Ljava/lang/Object;
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/as;->arD:Ljava/util/HashMap;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/as;->arV:Ljava/util/HashMap;
 
     invoke-virtual {v4, p1}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z
 
@@ -255,7 +255,7 @@
 
     if-eqz v4, :cond_3
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/as;->arD:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/as;->arV:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -276,7 +276,7 @@
     return-object p0
 
     :cond_3
-    sget-object v4, Lcom/google/android/gms/internal/measurement/as;->arK:[Ljava/lang/String;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/as;->asc:[Ljava/lang/String;
 
     array-length v6, v4
 
@@ -293,11 +293,11 @@
 
     if-eqz v8, :cond_7
 
-    sget-boolean v1, Lcom/google/android/gms/internal/measurement/as;->arJ:Z
+    sget-boolean v1, Lcom/google/android/gms/internal/measurement/as;->asb:Z
 
     if-eqz v1, :cond_4
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arD:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arV:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->isEmpty()Z
 
@@ -306,9 +306,9 @@
     if-eqz v1, :cond_6
 
     :cond_4
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arK:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->asc:[Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/as;->arD:Ljava/util/HashMap;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/as;->arV:Ljava/util/HashMap;
 
     invoke-static {p0, v1}, Lcom/google/android/gms/internal/measurement/as;->a(Landroid/content/ContentResolver;[Ljava/lang/String;)Ljava/util/Map;
 
@@ -316,9 +316,9 @@
 
     invoke-virtual {v3, p0}, Ljava/util/HashMap;->putAll(Ljava/util/Map;)V
 
-    sput-boolean v2, Lcom/google/android/gms/internal/measurement/as;->arJ:Z
+    sput-boolean v2, Lcom/google/android/gms/internal/measurement/as;->asb:Z
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/as;->arD:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/as;->arV:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z
 
@@ -326,7 +326,7 @@
 
     if-eqz p0, :cond_6
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/as;->arD:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/as;->arV:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -486,7 +486,7 @@
         }
     .end annotation
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arz:Landroid/net/Uri;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arR:Landroid/net/Uri;
 
     const/4 v2, 0x0
 
@@ -564,11 +564,11 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arI:Ljava/lang/Object;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->asa:Ljava/lang/Object;
 
     if-ne p0, v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/as;->arD:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/as;->arV:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1, p2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -587,10 +587,10 @@
     throw p0
 .end method
 
-.method static synthetic qD()Ljava/util/concurrent/atomic/AtomicBoolean;
+.method static synthetic qB()Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/as;->arC:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/as;->arU:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/au.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/au.smali
index 696cdd50a6..68d3cdf1c9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/au.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/au.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final arL:Ljava/util/Map;
+.field static final asd:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -17,15 +17,15 @@
     .end annotation
 .end field
 
-.field private static final arQ:[Ljava/lang/String;
+.field private static final asi:[Ljava/lang/String;
 
 
 # instance fields
-.field private final arM:Landroid/content/ContentResolver;
+.field private final ase:Landroid/content/ContentResolver;
 
-.field final arN:Ljava/lang/Object;
+.field final asf:Ljava/lang/Object;
 
-.field volatile arO:Ljava/util/Map;
+.field volatile asg:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field final arP:Ljava/util/List;
+.field final ash:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -57,7 +57,7 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/au;->arL:Ljava/util/Map;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/au;->asd:Ljava/util/Map;
 
     const/4 v0, 0x2
 
@@ -75,7 +75,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/au;->arQ:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/au;->asi:[Ljava/lang/String;
 
     return-void
 .end method
@@ -89,19 +89,19 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->arN:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->asf:Ljava/lang/Object;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->arP:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->ash:Ljava/util/List;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/au;->arM:Landroid/content/ContentResolver;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/au;->ase:Landroid/content/ContentResolver;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/au;->uri:Landroid/net/Uri;
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/au;->arM:Landroid/content/ContentResolver;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/au;->ase:Landroid/content/ContentResolver;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/aw;
 
@@ -122,7 +122,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/au;->arL:Ljava/util/Map;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/au;->asd:Ljava/util/Map;
 
     invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -143,7 +143,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    sget-object p0, Lcom/google/android/gms/internal/measurement/au;->arL:Ljava/util/Map;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/au;->asd:Ljava/util/Map;
 
     invoke-interface {p0, p1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_2
@@ -170,7 +170,7 @@
     throw p0
 .end method
 
-.method private final qF()Ljava/util/Map;
+.method private final qD()Ljava/util/Map;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -213,10 +213,10 @@
 
 
 # virtual methods
-.method public final synthetic bV(Ljava/lang/String;)Ljava/lang/Object;
+.method public final synthetic bQ(Ljava/lang/String;)Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/au;->qE()Ljava/util/Map;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/au;->qC()Ljava/util/Map;
 
     move-result-object v0
 
@@ -229,7 +229,7 @@
     return-object p1
 .end method
 
-.method public final qE()Ljava/util/Map;
+.method public final qC()Ljava/util/Map;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -241,24 +241,24 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->arO:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->asg:Ljava/util/Map;
 
     if-nez v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/au;->arN:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/au;->asf:Ljava/lang/Object;
 
     monitor-enter v1
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->arO:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->asg:Ljava/util/Map;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/au;->qF()Ljava/util/Map;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/au;->qD()Ljava/util/Map;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->arO:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->asg:Ljava/util/Map;
 
     :cond_0
     monitor-exit v1
@@ -288,14 +288,14 @@
     return-object v0
 .end method
 
-.method final synthetic qG()Ljava/util/Map;
+.method final synthetic qE()Ljava/util/Map;
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->arM:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->ase:Landroid/content/ContentResolver;
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/au;->uri:Landroid/net/Uri;
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/au;->arQ:[Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/au;->asi:[Ljava/lang/String;
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/av.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/av.smali
index e22458f970..01211601bd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/av.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/av.smali
@@ -3,28 +3,28 @@
 
 
 # static fields
-.field private static arR:Landroid/os/UserManager;
+.field private static asj:Landroid/os/UserManager;
 
-.field private static volatile arS:Z
+.field private static volatile ask:Z
 
-.field private static arT:Z
+.field private static asl:Z
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/av;->qH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/av;->qF()Z
 
     move-result v0
 
     xor-int/lit8 v0, v0, 0x1
 
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/av;->arS:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/av;->ask:Z
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/av;->arT:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/av;->asl:Z
 
     return-void
 .end method
@@ -53,7 +53,7 @@
 
     if-gt v1, v2, :cond_3
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/av;->arR:Landroid/os/UserManager;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/av;->asj:Landroid/os/UserManager;
 
     if-nez v2, :cond_0
 
@@ -65,10 +65,10 @@
 
     check-cast v2, Landroid/os/UserManager;
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/av;->arR:Landroid/os/UserManager;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/av;->asj:Landroid/os/UserManager;
 
     :cond_0
-    sget-object v2, Lcom/google/android/gms/internal/measurement/av;->arR:Landroid/os/UserManager;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/av;->asj:Landroid/os/UserManager;
 
     if-nez v2, :cond_1
 
@@ -108,7 +108,7 @@
 
     invoke-static {v4, v5, v2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/av;->arR:Landroid/os/UserManager;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/av;->asj:Landroid/os/UserManager;
 
     add-int/lit8 v1, v1, 0x1
 
@@ -118,7 +118,7 @@
     :goto_1
     if-eqz v4, :cond_4
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/av;->arR:Landroid/os/UserManager;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/av;->asj:Landroid/os/UserManager;
 
     :cond_4
     return v4
@@ -127,7 +127,7 @@
 .method private static af(Landroid/content/Context;)Z
     .locals 3
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/av;->arS:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/av;->ask:Z
 
     const/4 v1, 0x1
 
@@ -141,7 +141,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-boolean v2, Lcom/google/android/gms/internal/measurement/av;->arS:Z
+    sget-boolean v2, Lcom/google/android/gms/internal/measurement/av;->ask:Z
 
     if-eqz v2, :cond_1
 
@@ -156,7 +156,7 @@
 
     if-eqz p0, :cond_2
 
-    sput-boolean p0, Lcom/google/android/gms/internal/measurement/av;->arS:Z
+    sput-boolean p0, Lcom/google/android/gms/internal/measurement/av;->ask:Z
 
     :cond_2
     monitor-exit v0
@@ -176,7 +176,7 @@
 .method public static isUserUnlocked(Landroid/content/Context;)Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/av;->qH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/av;->qF()Z
 
     move-result v0
 
@@ -202,7 +202,7 @@
     return p0
 .end method
 
-.method public static qH()Z
+.method public static qF()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aw.smali
index 4e57da1241..28f8829752 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aw.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic arU:Lcom/google/android/gms/internal/measurement/au;
+.field private final synthetic asm:Lcom/google/android/gms/internal/measurement/au;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/au;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/aw;->arU:Lcom/google/android/gms/internal/measurement/au;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/aw;->asm:Lcom/google/android/gms/internal/measurement/au;
 
     const/4 p1, 0x0
 
@@ -24,18 +24,18 @@
 .method public final onChange(Z)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/aw;->arU:Lcom/google/android/gms/internal/measurement/au;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/aw;->asm:Lcom/google/android/gms/internal/measurement/au;
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/au;->arN:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/au;->asf:Ljava/lang/Object;
 
     monitor-enter v0
 
     const/4 v1, 0x0
 
     :try_start_0
-    iput-object v1, p1, Lcom/google/android/gms/internal/measurement/au;->arO:Ljava/util/Map;
+    iput-object v1, p1, Lcom/google/android/gms/internal/measurement/au;->asg:Ljava/util/Map;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/bf;->qJ()V
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/bf;->qH()V
 
     monitor-exit v0
     :try_end_0
@@ -44,7 +44,7 @@
     monitor-enter p1
 
     :try_start_1
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/au;->arP:Ljava/util/List;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/au;->ash:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ax.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ax.smali
index c6c3ac6a29..ffaca78d6c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ax.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ax.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private final arV:Lcom/google/android/gms/internal/measurement/au;
+.field private final asn:Lcom/google/android/gms/internal/measurement/au;
 
 
 # direct methods
@@ -15,19 +15,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ax;->arV:Lcom/google/android/gms/internal/measurement/au;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ax;->asn:Lcom/google/android/gms/internal/measurement/au;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final qI()Ljava/lang/Object;
+.method public final qG()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ax;->arV:Lcom/google/android/gms/internal/measurement/au;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ax;->asn:Lcom/google/android/gms/internal/measurement/au;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/au;->qG()Ljava/util/Map;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/au;->qE()Ljava/util/Map;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ay.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ay.smali
index c7ec3fb7fb..bfb82aba16 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ay.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ay.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract bV(Ljava/lang/String;)Ljava/lang/Object;
+.method public abstract bQ(Ljava/lang/String;)Ljava/lang/Object;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/az.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/az.smali
index d3dc989c61..794614daac 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/az.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/az.smali
@@ -14,7 +14,7 @@
 
 
 # virtual methods
-.method public abstract qI()Ljava/lang/Object;
+.method public abstract qG()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TV;"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/b.smali
index 4bec7d9917..09e87cc422 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/b.smali
@@ -3,26 +3,26 @@
 
 
 # instance fields
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
-.field private final synthetic aqp:Lcom/google/android/gms/internal/measurement/jv;
+.field private final synthetic aqH:Lcom/google/android/gms/internal/measurement/jv;
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/internal/measurement/jv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/b;->aqn:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/b;->aqF:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/b;->aqo:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/b;->aqG:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/b;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/b;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -31,7 +31,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -39,27 +39,27 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/b;->aqn:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/b;->aqF:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->aqo:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->aqG:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/iu;->getConditionalUserProperties(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/internal/measurement/ln;)V
 
     return-void
 .end method
 
-.method protected final oB()V
+.method protected final oz()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/b;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/b;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ba.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ba.smali
index 8acc5e7c0f..6ca44ec46b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ba.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ba.smali
@@ -16,7 +16,7 @@
     .end annotation
 
     :try_start_0
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/az;->qI()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/az;->qG()Ljava/lang/Object;
 
     move-result-object p0
     :try_end_0
@@ -30,7 +30,7 @@
     move-result-wide v0
 
     :try_start_1
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/az;->qI()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/az;->qG()Ljava/lang/Object;
 
     move-result-object p0
     :try_end_1
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bb.smali
index 7e302ab4b9..f97c422d75 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bb.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field private final arW:Lcom/google/android/gms/internal/measurement/bc;
+.field private final aso:Lcom/google/android/gms/internal/measurement/bc;
 
-.field private final arX:Ljava/lang/String;
+.field private final asp:Ljava/lang/String;
 
 
 # direct methods
@@ -17,23 +17,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bb;->arW:Lcom/google/android/gms/internal/measurement/bc;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bb;->aso:Lcom/google/android/gms/internal/measurement/bc;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/bb;->arX:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/bb;->asp:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final qI()Ljava/lang/Object;
+.method public final qG()Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bb;->arW:Lcom/google/android/gms/internal/measurement/bc;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bb;->aso:Lcom/google/android/gms/internal/measurement/bc;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/bb;->arX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/bb;->asp:Ljava/lang/String;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/bc;->arZ:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/bc;->asr:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bc.smali
index 5991cf4b86..e6a58be8eb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bc.smali
@@ -6,11 +6,11 @@
 
 
 # static fields
-.field static arY:Lcom/google/android/gms/internal/measurement/bc;
+.field static asq:Lcom/google/android/gms/internal/measurement/bc;
 
 
 # instance fields
-.field final arZ:Landroid/content/Context;
+.field final asr:Landroid/content/Context;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bc;->arZ:Landroid/content/Context;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bc;->asr:Landroid/content/Context;
 
     return-void
 .end method
@@ -31,9 +31,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bc;->arZ:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bc;->asr:Landroid/content/Context;
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/bc;->arZ:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/bc;->asr:Landroid/content/Context;
 
     invoke-virtual {p1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
@@ -60,7 +60,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/bc;->arY:Lcom/google/android/gms/internal/measurement/bc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bc;->asq:Lcom/google/android/gms/internal/measurement/bc;
 
     if-nez v1, :cond_2
 
@@ -94,10 +94,10 @@
     invoke-direct {v1}, Lcom/google/android/gms/internal/measurement/bc;-><init>()V
 
     :goto_1
-    sput-object v1, Lcom/google/android/gms/internal/measurement/bc;->arY:Lcom/google/android/gms/internal/measurement/bc;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/bc;->asq:Lcom/google/android/gms/internal/measurement/bc;
 
     :cond_2
-    sget-object p0, Lcom/google/android/gms/internal/measurement/bc;->arY:Lcom/google/android/gms/internal/measurement/bc;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/bc;->asq:Lcom/google/android/gms/internal/measurement/bc;
 
     monitor-exit v0
 
@@ -113,10 +113,10 @@
     throw p0
 .end method
 
-.method private final bW(Ljava/lang/String;)Ljava/lang/String;
+.method private final bR(Ljava/lang/String;)Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bc;->arZ:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bc;->asr:Landroid/content/Context;
 
     const/4 v1, 0x0
 
@@ -176,10 +176,10 @@
 
 
 # virtual methods
-.method public final synthetic bV(Ljava/lang/String;)Ljava/lang/Object;
+.method public final synthetic bQ(Ljava/lang/String;)Ljava/lang/Object;
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/bc;->bW(Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/bc;->bR(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bd.smali
index f57742eded..265016ad7c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bd.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static volatile asa:Lcom/google/android/gms/internal/measurement/bp;
+.field private static volatile ass:Lcom/google/android/gms/internal/measurement/bp;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bp<",
@@ -13,24 +13,24 @@
     .end annotation
 .end field
 
-.field private static final asb:Ljava/lang/Object;
+.field private static final ast:Ljava/lang/Object;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/bp;->qL()Lcom/google/android/gms/internal/measurement/bp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/bp;->qJ()Lcom/google/android/gms/internal/measurement/bp;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bd;->asa:Lcom/google/android/gms/internal/measurement/bp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bd;->ass:Lcom/google/android/gms/internal/measurement/bp;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bd;->asb:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bd;->ast:Ljava/lang/Object;
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
     if-eqz v0, :cond_5
 
-    sget-object p1, Lcom/google/android/gms/internal/measurement/bd;->asa:Lcom/google/android/gms/internal/measurement/bp;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/bd;->ass:Lcom/google/android/gms/internal/measurement/bp;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/bp;->isPresent()Z
 
@@ -58,7 +58,7 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/bd;->asa:Lcom/google/android/gms/internal/measurement/bp;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/bd;->ass:Lcom/google/android/gms/internal/measurement/bp;
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bp;->get()Ljava/lang/Object;
 
@@ -73,12 +73,12 @@
     return p0
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/bd;->asb:Ljava/lang/Object;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/bd;->ast:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object p1, Lcom/google/android/gms/internal/measurement/bd;->asa:Lcom/google/android/gms/internal/measurement/bp;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/bd;->ass:Lcom/google/android/gms/internal/measurement/bp;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/bp;->isPresent()Z
 
@@ -86,7 +86,7 @@
 
     if-eqz p1, :cond_1
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/bd;->asa:Lcom/google/android/gms/internal/measurement/bp;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/bd;->ass:Lcom/google/android/gms/internal/measurement/bp;
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bp;->get()Ljava/lang/Object;
 
@@ -172,13 +172,13 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/bd;->asa:Lcom/google/android/gms/internal/measurement/bp;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/bd;->ass:Lcom/google/android/gms/internal/measurement/bp;
 
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/bd;->asa:Lcom/google/android/gms/internal/measurement/bp;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/bd;->ass:Lcom/google/android/gms/internal/measurement/bp;
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bp;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/be.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/be.smali
index 98e1d1e2ad..c09d36b985 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/be.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/be.smali
@@ -18,7 +18,7 @@
 .method public final onChange(Z)V
     .locals 0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/bf;->qJ()V
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/bf;->qH()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bf.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bf.smali
index 7b4f84c052..86547aff69 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bf.smali
@@ -14,21 +14,21 @@
 
 
 # static fields
-.field private static arZ:Landroid/content/Context;
+.field private static asr:Landroid/content/Context;
 
-.field private static final asc:Ljava/lang/Object;
+.field private static final asu:Ljava/lang/Object;
 
-.field private static asd:Z
+.field private static asv:Z
 
-.field private static final asg:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private static final asy:Ljava/util/concurrent/atomic/AtomicInteger;
 
 
 # instance fields
-.field private volatile aoP:I
+.field private volatile aph:I
 
-.field private final ase:Lcom/google/android/gms/internal/measurement/bm;
+.field private final asw:Lcom/google/android/gms/internal/measurement/bm;
 
-.field private final asf:Ljava/lang/Object;
+.field private final asx:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private volatile ash:Ljava/lang/Object;
+.field private volatile asz:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -55,21 +55,21 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bf;->asc:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bf;->asu:Ljava/lang/Object;
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bf;->arZ:Landroid/content/Context;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bf;->asr:Landroid/content/Context;
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/bf;->asd:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/bf;->asv:Z
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bf;->asg:Ljava/util/concurrent/atomic/AtomicInteger;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bf;->asy:Ljava/util/concurrent/atomic/AtomicInteger;
 
     return-void
 .end method
@@ -89,17 +89,17 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/bf;->aoP:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/bf;->aph:I
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/bm;->asm:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/bm;->asE:Landroid/net/Uri;
 
     if-eqz v0, :cond_0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bf;->ase:Lcom/google/android/gms/internal/measurement/bm;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bf;->asw:Lcom/google/android/gms/internal/measurement/bm;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/bf;->name:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/bf;->asf:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/bf;->asx:Ljava/lang/Object;
 
     return-void
 
@@ -178,7 +178,7 @@
 .method public static ai(Landroid/content/Context;)V
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/bf;->asc:Ljava/lang/Object;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/bf;->asu:Ljava/lang/Object;
 
     monitor-enter v0
 
@@ -195,7 +195,7 @@
     move-object p0, v1
 
     :goto_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->arZ:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->asr:Landroid/content/Context;
 
     if-eq v1, p0, :cond_1
 
@@ -206,7 +206,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
     :try_start_1
-    sget-object v2, Lcom/google/android/gms/internal/measurement/au;->arL:Ljava/util/Map;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/au;->asd:Ljava/util/Map;
 
     invoke-interface {v2}, Ljava/util/Map;->clear()V
 
@@ -222,7 +222,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_3
 
     :try_start_3
-    sget-object v2, Lcom/google/android/gms/internal/measurement/bl;->asi:Ljava/util/Map;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/bl;->asA:Ljava/util/Map;
 
     invoke-interface {v2}, Ljava/util/Map;->clear()V
 
@@ -240,18 +240,18 @@
     const/4 v2, 0x0
 
     :try_start_5
-    sput-object v2, Lcom/google/android/gms/internal/measurement/bc;->arY:Lcom/google/android/gms/internal/measurement/bc;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/bc;->asq:Lcom/google/android/gms/internal/measurement/bc;
 
     monitor-exit v1
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
     :try_start_6
-    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->asg:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->asy:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/bf;->arZ:Landroid/content/Context;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/bf;->asr:Landroid/content/Context;
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_3
 
@@ -310,7 +310,7 @@
     throw p0
 .end method
 
-.method private final bX(Ljava/lang/String;)Ljava/lang/String;
+.method private final bS(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
     if-eqz p1, :cond_0
@@ -356,10 +356,10 @@
     return-object v0
 .end method
 
-.method static qJ()V
+.method static qH()V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/bf;->asg:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/bf;->asy:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
@@ -386,28 +386,28 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/bf;->asg:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/bf;->asy:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/bf;->aoP:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/bf;->aph:I
 
     if-ge v1, v0, :cond_b
 
     monitor-enter p0
 
     :try_start_0
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/bf;->aoP:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/bf;->aph:I
 
     if-ge v1, v0, :cond_a
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->arZ:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->asr:Landroid/content/Context;
 
     if-eqz v1, :cond_9
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->arZ:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->asr:Landroid/content/Context;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bc;->ag(Landroid/content/Context;)Lcom/google/android/gms/internal/measurement/bc;
 
@@ -415,7 +415,7 @@
 
     const-string v2, "gms:phenotype:phenotype_flag:debug_bypass_phenotype"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/internal/measurement/bc;->bV(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/internal/measurement/bc;->bQ(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -423,7 +423,7 @@
 
     if-eqz v1, :cond_0
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/as;->arA:Ljava/util/regex/Pattern;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/as;->arS:Ljava/util/regex/Pattern;
 
     invoke-virtual {v2, v1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -447,17 +447,17 @@
 
     if-nez v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/bf;->ase:Lcom/google/android/gms/internal/measurement/bm;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/bf;->asw:Lcom/google/android/gms/internal/measurement/bm;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/bm;->asm:Landroid/net/Uri;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/bm;->asE:Landroid/net/Uri;
 
     if-eqz v1, :cond_2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->arZ:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->asr:Landroid/content/Context;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/bf;->ase:Lcom/google/android/gms/internal/measurement/bm;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/bf;->asw:Lcom/google/android/gms/internal/measurement/bm;
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/measurement/bm;->asm:Landroid/net/Uri;
+    iget-object v3, v3, Lcom/google/android/gms/internal/measurement/bm;->asE:Landroid/net/Uri;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/bd;->a(Landroid/content/Context;Landroid/net/Uri;)Z
 
@@ -465,15 +465,15 @@
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->arZ:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->asr:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
     move-result-object v1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/bf;->ase:Lcom/google/android/gms/internal/measurement/bm;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/bf;->asw:Lcom/google/android/gms/internal/measurement/bm;
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/measurement/bm;->asm:Landroid/net/Uri;
+    iget-object v3, v3, Lcom/google/android/gms/internal/measurement/bm;->asE:Landroid/net/Uri;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/internal/measurement/au;->b(Landroid/content/ContentResolver;Landroid/net/Uri;)Lcom/google/android/gms/internal/measurement/au;
 
@@ -487,7 +487,7 @@
     goto :goto_1
 
     :cond_2
-    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->arZ:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->asr:Landroid/content/Context;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bl;->aj(Landroid/content/Context;)Lcom/google/android/gms/internal/measurement/bl;
 
@@ -496,11 +496,11 @@
     :goto_1
     if-eqz v1, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bf;->qK()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bf;->qI()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-interface {v1, v3}, Lcom/google/android/gms/internal/measurement/ay;->bV(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-interface {v1, v3}, Lcom/google/android/gms/internal/measurement/ay;->bQ(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -527,7 +527,7 @@
 
     const-string v3, "Bypass reading Phenotype values for flag: "
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bf;->qK()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bf;->qI()Ljava/lang/String;
 
     move-result-object v4
 
@@ -566,21 +566,21 @@
     goto :goto_4
 
     :cond_6
-    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->arZ:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->asr:Landroid/content/Context;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bc;->ag(Landroid/content/Context;)Lcom/google/android/gms/internal/measurement/bc;
 
     move-result-object v1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/bf;->ase:Lcom/google/android/gms/internal/measurement/bm;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/bf;->asw:Lcom/google/android/gms/internal/measurement/bm;
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/measurement/bm;->asn:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/internal/measurement/bm;->asF:Ljava/lang/String;
 
-    invoke-direct {p0, v3}, Lcom/google/android/gms/internal/measurement/bf;->bX(Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {p0, v3}, Lcom/google/android/gms/internal/measurement/bf;->bS(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-interface {v1, v3}, Lcom/google/android/gms/internal/measurement/ay;->bV(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-interface {v1, v3}, Lcom/google/android/gms/internal/measurement/ay;->bQ(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -598,12 +598,12 @@
     goto :goto_4
 
     :cond_8
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/bf;->asf:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/bf;->asx:Ljava/lang/Object;
 
     :goto_4
-    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/bf;->ash:Ljava/lang/Object;
+    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/bf;->asz:Ljava/lang/Object;
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/bf;->aoP:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/bf;->aph:I
 
     goto :goto_5
 
@@ -633,19 +633,19 @@
 
     :cond_b
     :goto_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bf;->ash:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bf;->asz:Ljava/lang/Object;
 
     return-object v0
 .end method
 
-.method public final qK()Ljava/lang/String;
+.method public final qI()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bf;->ase:Lcom/google/android/gms/internal/measurement/bm;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bf;->asw:Lcom/google/android/gms/internal/measurement/bm;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/bm;->aso:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/bm;->asG:Ljava/lang/String;
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/bf;->bX(Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/bf;->bS(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bg.smali
index 46100b5fac..fc40356eaf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bg.smali
@@ -3,7 +3,7 @@
 
 
 # direct methods
-.method public static bY(Ljava/lang/String;)Landroid/net/Uri;
+.method public static bT(Ljava/lang/String;)Landroid/net/Uri;
     .locals 2
 
     invoke-static {p0}, Landroid/net/Uri;->encode(Ljava/lang/String;)Ljava/lang/String;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bh.smali
index add62a947f..4fb7e1c0d3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bh.smali
@@ -45,7 +45,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arA:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arS:Ljava/util/regex/Pattern;
 
     invoke-virtual {v1, v0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -62,7 +62,7 @@
     return-object p1
 
     :cond_1
-    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arB:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/as;->arT:Ljava/util/regex/Pattern;
 
     invoke-virtual {v1, v0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -79,7 +79,7 @@
     return-object p1
 
     :cond_2
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/bf;->qK()Ljava/lang/String;
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/bf;->qI()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bi.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bi.smali
index 48a8b93a38..41b760381c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bi.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bi.smali
@@ -58,7 +58,7 @@
 
     :catch_0
     :cond_1
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/bf;->qK()Ljava/lang/String;
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/bf;->qI()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bk.smali
index 16c611c2d4..824a7b956c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bk.smali
@@ -75,7 +75,7 @@
 
     :catch_0
     :cond_2
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/bf;->qK()Ljava/lang/String;
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/bf;->qI()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bl.smali
index 4c077187c2..9af8b06542 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bl.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final asi:Ljava/util/Map;
+.field static final asA:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -19,9 +19,13 @@
 
 
 # instance fields
-.field final arN:Ljava/lang/Object;
+.field private final asB:Landroid/content/SharedPreferences;
 
-.field volatile arO:Ljava/util/Map;
+.field private final asC:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
+
+.field final asf:Ljava/lang/Object;
+
+.field volatile asg:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -31,7 +35,7 @@
     .end annotation
 .end field
 
-.field final arP:Ljava/util/List;
+.field final ash:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -41,10 +45,6 @@
     .end annotation
 .end field
 
-.field private final asj:Landroid/content/SharedPreferences;
-
-.field private final ask:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -54,7 +54,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bl;->asi:Ljava/util/Map;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bl;->asA:Ljava/util/Map;
 
     return-void
 .end method
@@ -68,25 +68,25 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/internal/measurement/bo;-><init>(Lcom/google/android/gms/internal/measurement/bl;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->ask:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->asC:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->arN:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->asf:Ljava/lang/Object;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->arP:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->ash:Ljava/util/List;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bl;->asj:Landroid/content/SharedPreferences;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bl;->asB:Landroid/content/SharedPreferences;
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/bl;->asj:Landroid/content/SharedPreferences;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/bl;->asB:Landroid/content/SharedPreferences;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->ask:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->asC:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
 
     invoke-interface {p1, v0}, Landroid/content/SharedPreferences;->registerOnSharedPreferenceChangeListener(Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;)V
 
@@ -96,7 +96,7 @@
 .method static aj(Landroid/content/Context;)Lcom/google/android/gms/internal/measurement/bl;
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/av;->qH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/av;->qF()Z
 
     move-result v0
 
@@ -132,7 +132,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v2, Lcom/google/android/gms/internal/measurement/bl;->asi:Ljava/util/Map;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/bl;->asA:Ljava/util/Map;
 
     invoke-interface {v2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -154,7 +154,7 @@
 
     if-eqz v3, :cond_3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/av;->qH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/av;->qF()Z
 
     move-result v3
 
@@ -185,7 +185,7 @@
     :goto_1
     invoke-direct {v2, p0}, Lcom/google/android/gms/internal/measurement/bl;-><init>(Landroid/content/SharedPreferences;)V
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/bl;->asi:Ljava/util/Map;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/bl;->asA:Ljava/util/Map;
 
     invoke-interface {p0, v1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -206,29 +206,29 @@
 
 
 # virtual methods
-.method public final bV(Ljava/lang/String;)Ljava/lang/Object;
+.method public final bQ(Ljava/lang/String;)Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->arO:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->asg:Ljava/util/Map;
 
     if-nez v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/bl;->arN:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/bl;->asf:Ljava/lang/Object;
 
     monitor-enter v1
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->arO:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->asg:Ljava/util/Map;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->asj:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->asB:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->getAll()Ljava/util/Map;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->arO:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bl;->asg:Ljava/util/Map;
 
     :cond_0
     monitor-exit v1
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bo.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bo.smali
index 774678748f..5c3ea121a5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bo.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bo.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private final asu:Lcom/google/android/gms/internal/measurement/bl;
+.field private final asM:Lcom/google/android/gms/internal/measurement/bl;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bo;->asu:Lcom/google/android/gms/internal/measurement/bl;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bo;->asM:Lcom/google/android/gms/internal/measurement/bl;
 
     return-void
 .end method
@@ -25,18 +25,18 @@
 .method public final onSharedPreferenceChanged(Landroid/content/SharedPreferences;Ljava/lang/String;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/bo;->asu:Lcom/google/android/gms/internal/measurement/bl;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/bo;->asM:Lcom/google/android/gms/internal/measurement/bl;
 
-    iget-object p2, p1, Lcom/google/android/gms/internal/measurement/bl;->arN:Ljava/lang/Object;
+    iget-object p2, p1, Lcom/google/android/gms/internal/measurement/bl;->asf:Ljava/lang/Object;
 
     monitor-enter p2
 
     const/4 v0, 0x0
 
     :try_start_0
-    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/bl;->arO:Ljava/util/Map;
+    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/bl;->asg:Ljava/util/Map;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/bf;->qJ()V
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/bf;->qH()V
 
     monitor-exit p2
     :try_end_0
@@ -45,7 +45,7 @@
     monitor-enter p1
 
     :try_start_1
-    iget-object p2, p1, Lcom/google/android/gms/internal/measurement/bl;->arP:Ljava/util/List;
+    iget-object p2, p1, Lcom/google/android/gms/internal/measurement/bl;->ash:Ljava/util/List;
 
     invoke-interface {p2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bt.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bt.smali
index c6db0c2fd4..7009e230f9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bt.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bt.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final alt:Ljava/lang/ClassLoader;
+.field private static final alL:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bt;->alt:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bt;->alL:Ljava/lang/ClassLoader;
 
     return-void
 .end method
@@ -126,7 +126,7 @@
 .method public static d(Landroid/os/Parcel;)Ljava/util/HashMap;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/bt;->alt:Ljava/lang/ClassLoader;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/bt;->alL:Ljava/lang/ClassLoader;
 
     invoke-virtual {p0, v0}, Landroid/os/Parcel;->readHashMap(Ljava/lang/ClassLoader;)Ljava/util/HashMap;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bz.smali
index 6126223c03..f04d411ef4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bz.smali
@@ -74,7 +74,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/ei;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/ei;->sC()Ljava/util/List;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/ei;->sA()Ljava/util/List;
 
     move-result-object p0
 
@@ -291,11 +291,11 @@
     throw p1
 .end method
 
-.method public final qM()Lcom/google/android/gms/internal/measurement/cj;
+.method public final qK()Lcom/google/android/gms/internal/measurement/cj;
     .locals 6
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bz;->sf()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bz;->sd()I
 
     move-result v0
 
@@ -303,11 +303,11 @@
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/cr;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/cr;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/bz;->a(Lcom/google/android/gms/internal/measurement/cy;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cr;->qX()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cr;->qV()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object v0
     :try_end_0
@@ -375,7 +375,7 @@
     throw v1
 .end method
 
-.method qN()I
+.method qL()I
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -389,7 +389,7 @@
     .locals 6
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bz;->sf()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bz;->sd()I
 
     move-result v0
 
@@ -401,7 +401,7 @@
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/bz;->a(Lcom/google/android/gms/internal/measurement/cy;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cy;->rG()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cy;->rE()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/c.smali
index 3a0e2f72ae..1539af434c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/c.smali
@@ -3,26 +3,26 @@
 
 
 # instance fields
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-.field private final synthetic aqr:Ljava/lang/String;
+.field private final synthetic aqJ:Ljava/lang/String;
 
-.field private final synthetic aqs:Ljava/lang/String;
+.field private final synthetic aqK:Ljava/lang/String;
 
-.field private final synthetic aqt:Landroid/os/Bundle;
+.field private final synthetic aqL:Landroid/os/Bundle;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/c;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/c;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/c;->aqr:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/c;->aqJ:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/c;->aqs:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/c;->aqK:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/c;->aqt:Landroid/os/Bundle;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/c;->aqL:Landroid/os/Bundle;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -31,7 +31,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -39,17 +39,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/c;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/c;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/c;->aqr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/c;->aqJ:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/c;->aqs:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/c;->aqK:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/c;->aqt:Landroid/os/Bundle;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/c;->aqL:Landroid/os/Bundle;
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/iu;->clearConditionalUserProperty(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ca.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ca.smali
index 3532109d1a..5abc6cf440 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ca.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ca.smali
@@ -19,18 +19,18 @@
 
 
 # static fields
-.field private static final asw:Lcom/google/android/gms/internal/measurement/de;
+.field private static final asO:Lcom/google/android/gms/internal/measurement/de;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rM()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rK()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ca;->asw:Lcom/google/android/gms/internal/measurement/de;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ca;->asO:Lcom/google/android/gms/internal/measurement/de;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb.smali
index 0abb156928..b35321fa95 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cb.smali
@@ -155,7 +155,7 @@
 .method public final synthetic a(Lcom/google/android/gms/internal/measurement/fb;)Lcom/google/android/gms/internal/measurement/fa;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cb;->si()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cb;->sg()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v0
 
@@ -195,7 +195,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cb;->qO()Lcom/google/android/gms/internal/measurement/cb;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cb;->qM()Lcom/google/android/gms/internal/measurement/cb;
 
     move-result-object v0
 
@@ -227,7 +227,7 @@
     return-object p1
 .end method
 
-.method public abstract qO()Lcom/google/android/gms/internal/measurement/cb;
+.method public abstract qM()Lcom/google/android/gms/internal/measurement/cb;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TBuilderType;"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cc.smali
index 3a3795107a..7c3164e119 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cc.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final asx:Ljava/lang/Class;
+.field private static final asP:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -12,7 +12,7 @@
     .end annotation
 .end field
 
-.field private static final asy:Z
+.field private static final asQ:Z
 
 
 # direct methods
@@ -21,15 +21,15 @@
 
     const-string v0, "libcore.io.Memory"
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cc;->bZ(Ljava/lang/String;)Ljava/lang/Class;
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cc;->bU(Ljava/lang/String;)Ljava/lang/Class;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/cc;->asx:Ljava/lang/Class;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/cc;->asP:Ljava/lang/Class;
 
     const-string v0, "org.robolectric.Robolectric"
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cc;->bZ(Ljava/lang/String;)Ljava/lang/Class;
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cc;->bU(Ljava/lang/String;)Ljava/lang/Class;
 
     move-result-object v0
 
@@ -43,12 +43,12 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/cc;->asy:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/cc;->asQ:Z
 
     return-void
 .end method
 
-.method private static bZ(Ljava/lang/String;)Ljava/lang/Class;
+.method private static bU(Ljava/lang/String;)Ljava/lang/Class;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -77,14 +77,14 @@
     return-object p0
 .end method
 
-.method static qP()Z
+.method static qN()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cc;->asx:Ljava/lang/Class;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cc;->asP:Ljava/lang/Class;
 
     if-eqz v0, :cond_0
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/cc;->asy:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/cc;->asQ:Z
 
     if-nez v0, :cond_0
 
@@ -98,7 +98,7 @@
     return v0
 .end method
 
-.method static qQ()Ljava/lang/Class;
+.method static qO()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -108,7 +108,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cc;->asx:Ljava/lang/Class;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cc;->asP:Ljava/lang/Class;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cd.smali
index afaadef6f2..497530b7bf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cd.smali
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-super {p0, p1, p2}, Ljava/util/AbstractList;->add(ILjava/lang/Object;)V
 
@@ -61,7 +61,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->add(Ljava/lang/Object;)Z
 
@@ -80,7 +80,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-super {p0, p1, p2}, Ljava/util/AbstractList;->addAll(ILjava/util/Collection;)Z
 
@@ -99,7 +99,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->addAll(Ljava/util/Collection;)Z
 
@@ -111,7 +111,7 @@
 .method public clear()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-super {p0}, Ljava/util/AbstractList;->clear()V
 
@@ -227,7 +227,7 @@
     return v1
 .end method
 
-.method public qR()Z
+.method public qP()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/cd;->zzacz:Z
@@ -235,7 +235,7 @@
     return v0
 .end method
 
-.method public final qS()V
+.method public final qQ()V
     .locals 1
 
     const/4 v0, 0x0
@@ -245,7 +245,7 @@
     return-void
 .end method
 
-.method protected final qT()V
+.method protected final qR()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/cd;->zzacz:Z
@@ -270,7 +270,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(I)Ljava/lang/Object;
 
@@ -282,7 +282,7 @@
 .method public remove(Ljava/lang/Object;)Z
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(Ljava/lang/Object;)Z
 
@@ -301,7 +301,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->removeAll(Ljava/util/Collection;)Z
 
@@ -320,7 +320,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->retainAll(Ljava/util/Collection;)Z
 
@@ -337,7 +337,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-super {p0, p1, p2}, Ljava/util/AbstractList;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ce.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ce.smali
index 343a373e3f..49ccea7f45 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ce.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ce.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field public asA:J
+.field public asR:I
 
-.field public asB:Ljava/lang/Object;
+.field public asS:J
 
-.field public final asC:Lcom/google/android/gms/internal/measurement/de;
+.field public asT:Ljava/lang/Object;
 
-.field public asz:I
+.field public final asU:Lcom/google/android/gms/internal/measurement/de;
 
 
 # direct methods
@@ -18,11 +18,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rM()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rK()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ce;->asC:Lcom/google/android/gms/internal/measurement/de;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ce;->asU:Lcom/google/android/gms/internal/measurement/de;
 
     return-void
 .end method
@@ -34,7 +34,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ce;->asC:Lcom/google/android/gms/internal/measurement/de;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ce;->asU:Lcom/google/android/gms/internal/measurement/de;
 
     return-void
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cf.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cf.smali
index 34603b3383..d6fae7ad9b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cf.smali
@@ -40,7 +40,7 @@
     return p2
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -60,7 +60,7 @@
 
     move-result p2
 
-    iget v0, p4, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v0, p4, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-eq v0, p0, :cond_2
 
@@ -78,7 +78,7 @@
     return p2
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sz()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -89,7 +89,7 @@
 
     move-result p0
 
-    iget p1, p4, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget p1, p4, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     add-int/2addr p0, p1
 
@@ -108,7 +108,7 @@
     return p0
 
     :cond_7
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -139,7 +139,7 @@
 
     move-result p2
 
-    iget v0, p5, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v0, p5, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-virtual {p4, v0}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
@@ -150,7 +150,7 @@
 
     move-result v0
 
-    iget v1, p5, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v1, p5, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne p0, v1, :cond_0
 
@@ -158,7 +158,7 @@
 
     move-result p2
 
-    iget v0, p5, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v0, p5, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-virtual {p4, v0}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
@@ -215,14 +215,14 @@
     return p2
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
     throw p0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tp()Lcom/google/android/gms/internal/measurement/gl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tm()Lcom/google/android/gms/internal/measurement/gl;
 
     move-result-object v6
 
@@ -239,7 +239,7 @@
 
     move-result v2
 
-    iget p2, p5, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget p2, p5, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     move v0, p2
 
@@ -278,7 +278,7 @@
     return p2
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sz()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -289,7 +289,7 @@
 
     move-result p2
 
-    iget p3, p5, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget p3, p5, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ltz p3, :cond_8
 
@@ -301,7 +301,7 @@
 
     if-nez p3, :cond_6
 
-    sget-object p1, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
     invoke-virtual {p4, p0, p1}, Lcom/google/android/gms/internal/measurement/gl;->d(ILjava/lang/Object;)V
 
@@ -320,14 +320,14 @@
     return p2
 
     :cond_7
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
     throw p0
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -353,7 +353,7 @@
 
     move-result p1
 
-    iget-wide p2, p5, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide p2, p5, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -364,7 +364,7 @@
     return p1
 
     :cond_b
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -392,7 +392,7 @@
 
     or-int/2addr p0, p1
 
-    iput p0, p3, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iput p0, p3, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     return v0
 
@@ -413,7 +413,7 @@
 
     or-int/2addr p0, p1
 
-    iput p0, p3, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iput p0, p3, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     return p2
 
@@ -434,7 +434,7 @@
 
     or-int/2addr p0, p1
 
-    iput p0, p3, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iput p0, p3, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     return v0
 
@@ -455,7 +455,7 @@
 
     or-int/2addr p0, p1
 
-    iput p0, p3, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iput p0, p3, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     return p2
 
@@ -473,7 +473,7 @@
 
     if-ltz p2, :cond_4
 
-    iput p0, p3, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iput p0, p3, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     return v0
 
@@ -507,7 +507,7 @@
 
     move-result p3
 
-    iget-object v0, p6, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v0, p6, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-interface {p5, v0}, Lcom/google/android/gms/internal/measurement/dz;->add(Ljava/lang/Object;)Z
 
@@ -518,7 +518,7 @@
 
     move-result v0
 
-    iget v1, p6, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v1, p6, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne p1, v1, :cond_0
 
@@ -526,7 +526,7 @@
 
     move-result p3
 
-    iget-object v0, p6, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v0, p6, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-interface {p5, v0}, Lcom/google/android/gms/internal/measurement/dz;->add(Ljava/lang/Object;)Z
 
@@ -570,7 +570,7 @@
 
     invoke-virtual {p0, v7}, Lcom/google/android/gms/internal/measurement/ff;->an(Ljava/lang/Object;)V
 
-    iput-object v7, p5, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object v7, p5, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     return p1
 .end method
@@ -593,7 +593,7 @@
 
     move-result v0
 
-    iget p2, p4, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget p2, p4, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     :cond_0
     move v3, v0
@@ -624,12 +624,12 @@
 
     invoke-interface {p0, p3}, Lcom/google/android/gms/internal/measurement/fq;->an(Ljava/lang/Object;)V
 
-    iput-object p3, p4, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p3, p4, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     return p2
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -645,7 +645,7 @@
 
     if-ltz p1, :cond_0
 
-    iput p1, p2, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iput p1, p2, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     return v0
 
@@ -681,7 +681,7 @@
 
     move-result p1
 
-    iget v0, p3, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v0, p3, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     add-int/2addr v0, p1
 
@@ -692,7 +692,7 @@
 
     move-result p1
 
-    iget v1, p3, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v1, p3, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-virtual {p2, v1}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
@@ -704,7 +704,7 @@
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -732,7 +732,7 @@
 
     if-ltz p1, :cond_0
 
-    iput-wide v1, p2, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iput-wide v1, p2, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     return v0
 
@@ -783,7 +783,7 @@
     goto :goto_0
 
     :cond_1
-    iput-wide v1, p2, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iput-wide v1, p2, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     return p1
 .end method
@@ -800,7 +800,7 @@
 
     move-result p1
 
-    iget v0, p2, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v0, p2, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ltz v0, :cond_1
 
@@ -808,7 +808,7 @@
 
     const-string p0, ""
 
-    iput-object p0, p2, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p0, p2, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     return p1
 
@@ -819,14 +819,14 @@
 
     invoke-direct {v1, p0, p1, v0, v2}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
-    iput-object v1, p2, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object v1, p2, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     add-int/2addr p1, v0
 
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -885,7 +885,7 @@
 
     move-result p1
 
-    iget v0, p2, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v0, p2, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ltz v0, :cond_1
 
@@ -893,7 +893,7 @@
 
     const-string p0, ""
 
-    iput-object p0, p2, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p0, p2, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     return p1
 
@@ -902,14 +902,14 @@
 
     move-result-object p0
 
-    iput-object p0, p2, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p0, p2, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     add-int/2addr p1, v0
 
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -928,7 +928,7 @@
 
     move-result p1
 
-    iget v0, p2, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v0, p2, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ltz v0, :cond_2
 
@@ -940,9 +940,9 @@
 
     if-nez v0, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
-    iput-object p0, p2, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p0, p2, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     return p1
 
@@ -951,21 +951,21 @@
 
     move-result-object p0
 
-    iput-object p0, p2, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p0, p2, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     add-int/2addr p1, v0
 
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
     throw p0
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ch.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ch.smali
index ee51f83911..6a6daa2cb9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ch.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ch.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
-.field private static final asD:Lcom/google/android/gms/internal/measurement/ch;
+.field private static final asV:Lcom/google/android/gms/internal/measurement/ch;
 
 
 # instance fields
-.field private asE:[Z
+.field private asW:[Z
 
 .field private size:I
 
@@ -44,7 +44,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/internal/measurement/ch;-><init>([ZI)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ch;->asD:Lcom/google/android/gms/internal/measurement/ch;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ch;->asV:Lcom/google/android/gms/internal/measurement/ch;
 
     iput-boolean v1, v0, Lcom/google/android/gms/internal/measurement/cd;->zzacz:Z
 
@@ -70,7 +70,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cd;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     iput p2, p0, Lcom/google/android/gms/internal/measurement/ch;->size:I
 
@@ -133,7 +133,7 @@
 .method private final d(IZ)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     if-ltz p1, :cond_1
 
@@ -141,7 +141,7 @@
 
     if-gt p1, v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     array-length v2, v1
 
@@ -168,7 +168,7 @@
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     add-int/lit8 v2, p1, 0x1
 
@@ -178,10 +178,10 @@
 
     invoke-static {v1, p1, v0, v2, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     aput-boolean p2, v0, p1
 
@@ -239,7 +239,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/ds;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -275,7 +275,7 @@
 
     add-int/2addr v3, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     array-length v2, v0
 
@@ -285,12 +285,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/ch;->size:I
 
@@ -337,7 +337,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ch;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->copyOf([ZI)[Z
 
@@ -391,7 +391,7 @@
     return v3
 
     :cond_2
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     const/4 v1, 0x0
 
@@ -400,7 +400,7 @@
 
     if-ge v1, v2, :cond_4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     aget-boolean v2, v2, v1
 
@@ -424,7 +424,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/ch;->bH(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     aget-boolean p1, v0, p1
 
@@ -449,11 +449,11 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     aget-boolean v2, v2, v1
 
-    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/ds;->N(Z)I
+    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/ds;->L(Z)I
 
     move-result v2
 
@@ -470,11 +470,11 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/ch;->bH(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     aget-boolean v1, v0, p1
 
@@ -515,7 +515,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     const/4 v0, 0x0
 
@@ -526,7 +526,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     aget-boolean v2, v2, v1
 
@@ -540,7 +540,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     add-int/lit8 v0, v1, 0x1
 
@@ -580,11 +580,11 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/ch;->size:I
 
@@ -627,11 +627,11 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/ch;->bH(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asE:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ch;->asW:[Z
 
     aget-boolean v1, v0, p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ci.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ci.smali
index 15a110e2ed..56cf4101c4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ci.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ci.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final synthetic asF:Lcom/google/android/gms/internal/measurement/cj;
+.field private final synthetic asX:Lcom/google/android/gms/internal/measurement/cj;
 
 .field private final limit:I
 
@@ -14,7 +14,7 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/cj;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ci;->asF:Lcom/google/android/gms/internal/measurement/cj;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ci;->asX:Lcom/google/android/gms/internal/measurement/cj;
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ck;-><init>()V
 
@@ -22,7 +22,7 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/measurement/ci;->position:I
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ci;->asF:Lcom/google/android/gms/internal/measurement/cj;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ci;->asX:Lcom/google/android/gms/internal/measurement/cj;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cj;->size()I
 
@@ -67,7 +67,7 @@
 
     iput v1, p0, Lcom/google/android/gms/internal/measurement/ci;->position:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->asF:Lcom/google/android/gms/internal/measurement/cj;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ci;->asX:Lcom/google/android/gms/internal/measurement/cj;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/measurement/cj;->bL(I)B
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cj.smali
index f3a18b063a..ecd3e3723b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cj.smali
@@ -19,11 +19,11 @@
 
 
 # static fields
-.field public static final asG:Lcom/google/android/gms/internal/measurement/cj;
+.field public static final asY:Lcom/google/android/gms/internal/measurement/cj;
 
-.field private static final asH:Lcom/google/android/gms/internal/measurement/cp;
+.field private static final asZ:Lcom/google/android/gms/internal/measurement/cp;
 
-.field private static final asI:Ljava/util/Comparator;
+.field private static final ata:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -44,13 +44,13 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ct;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ds;->avd:[B
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ds;->avv:[B
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/ct;-><init>([B)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qP()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qN()Z
 
     move-result v0
 
@@ -70,13 +70,13 @@
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/cn;-><init>(B)V
 
     :goto_0
-    sput-object v0, Lcom/google/android/gms/internal/measurement/cj;->asH:Lcom/google/android/gms/internal/measurement/cp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/cj;->asZ:Lcom/google/android/gms/internal/measurement/cp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/cl;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/cl;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/cj;->asI:Ljava/util/Comparator;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/cj;->ata:Ljava/util/Comparator;
 
     return-void
 .end method
@@ -113,6 +113,22 @@
     return-object v0
 .end method
 
+.method public static bV(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/cj;
+    .locals 2
+
+    new-instance v0, Lcom/google/android/gms/internal/measurement/ct;
+
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ds;->UTF_8:Ljava/nio/charset/Charset;
+
+    invoke-virtual {p0, v1}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Lcom/google/android/gms/internal/measurement/ct;-><init>([B)V
+
+    return-object v0
+.end method
+
 .method public static c([BII)Lcom/google/android/gms/internal/measurement/cj;
     .locals 2
 
@@ -124,7 +140,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ct;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/cj;->asH:Lcom/google/android/gms/internal/measurement/cp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/cj;->asZ:Lcom/google/android/gms/internal/measurement/cp;
 
     invoke-interface {v1, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/cp;->d([BII)[B
 
@@ -135,22 +151,6 @@
     return-object v0
 .end method
 
-.method public static ca(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/cj;
-    .locals 2
-
-    new-instance v0, Lcom/google/android/gms/internal/measurement/ct;
-
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ds;->UTF_8:Ljava/nio/charset/Charset;
-
-    invoke-virtual {p0, v1}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Lcom/google/android/gms/internal/measurement/ct;-><init>([B)V
-
-    return-object v0
-.end method
-
 .method static h(III)I
     .locals 3
 
@@ -304,7 +304,7 @@
 
     move-result v0
 
-    invoke-virtual {p0, v0, v0}, Lcom/google/android/gms/internal/measurement/cj;->x(II)I
+    invoke-virtual {p0, v0, v0}, Lcom/google/android/gms/internal/measurement/cj;->w(II)I
 
     move-result v0
 
@@ -329,7 +329,7 @@
     return-object v0
 .end method
 
-.method public final qU()Ljava/lang/String;
+.method public final qS()Ljava/lang/String;
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ds;->UTF_8:Ljava/nio/charset/Charset;
@@ -352,7 +352,7 @@
     return-object v0
 .end method
 
-.method public abstract qV()Z
+.method public abstract qT()Z
 .end method
 
 .method public abstract size()I
@@ -398,5 +398,5 @@
     return-object v0
 .end method
 
-.method protected abstract x(II)I
+.method protected abstract w(II)I
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cm.smali
index 8e947f28b1..0e821d0c67 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cm.smali
@@ -123,7 +123,7 @@
     return p1
 .end method
 
-.method protected final qW()I
+.method protected final qU()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cm;->zzadl:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cr.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cr.smali
index abfed8280e..f4a25a016e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cr.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field final asJ:Lcom/google/android/gms/internal/measurement/cy;
+.field final atb:Lcom/google/android/gms/internal/measurement/cy;
 
 .field private final buffer:[B
 
@@ -24,7 +24,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cr;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cr;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     return-void
 .end method
@@ -39,12 +39,12 @@
 
 
 # virtual methods
-.method public final qX()Lcom/google/android/gms/internal/measurement/cj;
+.method public final qV()Lcom/google/android/gms/internal/measurement/cj;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cr;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cr;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cy;->rG()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cy;->rE()V
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ct;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ct.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ct.smali
index 4d309d60f0..930152e17f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ct.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ct.smali
@@ -35,7 +35,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->zzado:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qW()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qU()I
 
     move-result v2
 
@@ -58,7 +58,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->zzado:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qW()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qU()I
 
     move-result v1
 
@@ -96,17 +96,17 @@
 
     iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ct;->zzado:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qW()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qU()I
 
     move-result v2
 
     add-int/2addr v2, p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qW()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qU()I
 
     move-result p2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ct;->qW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ct;->qU()I
 
     move-result p1
 
@@ -254,7 +254,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
     return-object p1
 
@@ -263,7 +263,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ct;->zzado:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qW()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qU()I
 
     move-result v2
 
@@ -354,10 +354,10 @@
     return p1
 .end method
 
-.method public final qV()Z
+.method public final qT()Z
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qW()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qU()I
 
     move-result v0
 
@@ -376,7 +376,7 @@
     return v0
 .end method
 
-.method protected qW()I
+.method protected qU()I
     .locals 1
 
     const/4 v0, 0x0
@@ -394,12 +394,12 @@
     return v0
 .end method
 
-.method protected final x(II)I
+.method protected final w(II)I
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ct;->zzado:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qW()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ct;->qU()I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cv.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cv.smali
index 2a570a6e6d..bba82f97a9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cv.smali
@@ -3,15 +3,15 @@
 
 
 # instance fields
-.field asK:I
+.field atc:I
 
-.field asL:I
+.field atd:I
 
-.field private asM:I
+.field private ate:I
 
-.field asN:Lcom/google/android/gms/internal/measurement/cw;
+.field atf:Lcom/google/android/gms/internal/measurement/cw;
 
-.field private asO:Z
+.field private atg:Z
 
 
 # direct methods
@@ -22,15 +22,15 @@
 
     const/16 v0, 0x64
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cv;->asL:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cv;->atd:I
 
     const v0, 0x7fffffff
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cv;->asM:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cv;->ate:I
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/cv;->asO:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/cv;->atg:Z
 
     return-void
 .end method
@@ -156,7 +156,7 @@
     .end annotation
 .end method
 
-.method public abstract qY()I
+.method public abstract qW()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -164,7 +164,23 @@
     .end annotation
 .end method
 
-.method public abstract qZ()J
+.method public abstract qX()J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract qY()J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract qZ()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -188,7 +204,7 @@
     .end annotation
 .end method
 
-.method public abstract rc()J
+.method public abstract rc()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -196,7 +212,7 @@
     .end annotation
 .end method
 
-.method public abstract rd()I
+.method public abstract rd()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -204,7 +220,7 @@
     .end annotation
 .end method
 
-.method public abstract re()Z
+.method public abstract re()Lcom/google/android/gms/internal/measurement/cj;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -236,7 +252,7 @@
     .end annotation
 .end method
 
-.method public abstract rf()Ljava/lang/String;
+.method public abstract rf()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -244,7 +260,7 @@
     .end annotation
 .end method
 
-.method public abstract rg()Lcom/google/android/gms/internal/measurement/cj;
+.method public abstract rg()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -260,7 +276,7 @@
     .end annotation
 .end method
 
-.method public abstract ri()I
+.method public abstract ri()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -284,7 +300,7 @@
     .end annotation
 .end method
 
-.method public abstract rl()I
+.method abstract rl()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -292,7 +308,7 @@
     .end annotation
 .end method
 
-.method public abstract rm()J
+.method public abstract rm()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -300,21 +316,5 @@
     .end annotation
 .end method
 
-.method abstract rn()J
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract ro()Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract rp()I
+.method public abstract rn()I
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cw.smali
index 7a85ff9e9c..81f7737cdb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cw.smali
@@ -6,11 +6,11 @@
 
 
 # instance fields
-.field private final asP:Lcom/google/android/gms/internal/measurement/cv;
+.field private final ath:Lcom/google/android/gms/internal/measurement/cv;
 
-.field private asQ:I
+.field private ati:I
 
-.field private asR:I
+.field private atj:I
 
 .field private tag:I
 
@@ -23,7 +23,7 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     const-string v0, "input"
 
@@ -33,11 +33,11 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/cv;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/cv;->asN:Lcom/google/android/gms/internal/measurement/cw;
+    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/cv;->atf:Lcom/google/android/gms/internal/measurement/cw;
 
     return-void
 .end method
@@ -45,11 +45,11 @@
 .method public static a(Lcom/google/android/gms/internal/measurement/cv;)Lcom/google/android/gms/internal/measurement/cw;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cv;->asN:Lcom/google/android/gms/internal/measurement/cw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cv;->atf:Lcom/google/android/gms/internal/measurement/cw;
 
     if-eqz v0, :cond_0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/cv;->asN:Lcom/google/android/gms/internal/measurement/cw;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/cv;->atf:Lcom/google/android/gms/internal/measurement/cw;
 
     return-object p0
 
@@ -81,7 +81,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -100,7 +100,7 @@
     throw p1
 
     :pswitch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->qZ()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->qX()J
 
     move-result-wide p1
 
@@ -111,7 +111,7 @@
     return-object p1
 
     :pswitch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rf()I
 
     move-result p1
 
@@ -122,35 +122,13 @@
     return-object p1
 
     :pswitch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rf()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rd()Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
 
     :pswitch_3
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rm()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_4
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rl()I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    return-object p1
-
-    :pswitch_5
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rk()J
 
     move-result-wide p1
@@ -161,7 +139,7 @@
 
     return-object p1
 
-    :pswitch_6
+    :pswitch_4
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rj()I
 
     move-result p1
@@ -172,12 +150,34 @@
 
     return-object p1
 
+    :pswitch_5
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->ri()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_6
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rh()I
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
+
     :pswitch_7
     const/4 p1, 0x2
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object p1
 
@@ -192,7 +192,7 @@
     return-object p1
 
     :pswitch_8
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->ra()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->qY()J
 
     move-result-wide p1
 
@@ -203,7 +203,7 @@
     return-object p1
 
     :pswitch_9
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rb()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->qZ()I
 
     move-result p1
 
@@ -225,7 +225,7 @@
     return-object p1
 
     :pswitch_b
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rc()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->ra()J
 
     move-result-wide p1
 
@@ -236,7 +236,7 @@
     return-object p1
 
     :pswitch_c
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rd()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rb()I
 
     move-result p1
 
@@ -247,7 +247,7 @@
     return-object p1
 
     :pswitch_d
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->ri()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rg()I
 
     move-result p1
 
@@ -269,14 +269,14 @@
     return-object p1
 
     :pswitch_f
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rg()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->re()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object p1
 
     return-object p1
 
     :pswitch_10
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->re()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rc()Z
 
     move-result p1
 
@@ -344,15 +344,15 @@
     check-cast v0, Lcom/google/android/gms/internal/measurement/ei;
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rg()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->re()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object p1
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/internal/measurement/ei;->c(Lcom/google/android/gms/internal/measurement/cj;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -361,9 +361,9 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -371,14 +371,14 @@
 
     if-eq p1, p2, :cond_0
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
     :cond_2
     if-eqz p2, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rf()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rd()Ljava/lang/String;
 
     move-result-object v0
 
@@ -392,9 +392,9 @@
     :goto_0
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -403,9 +403,9 @@
     return-void
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -413,12 +413,12 @@
 
     if-eq v0, v1, :cond_2
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
@@ -448,7 +448,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
@@ -470,7 +470,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sz()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -492,7 +492,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sz()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -507,9 +507,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -518,7 +518,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -545,23 +545,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    iget v1, v1, Lcom/google/android/gms/internal/measurement/cv;->asK:I
+    iget v1, v1, Lcom/google/android/gms/internal/measurement/cv;->atc:I
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    iget v2, v2, Lcom/google/android/gms/internal/measurement/cv;->asL:I
+    iget v2, v2, Lcom/google/android/gms/internal/measurement/cv;->atd:I
 
     if-ge v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/measurement/cv;->bQ(I)I
 
@@ -571,40 +571,40 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    iget v3, v2, Lcom/google/android/gms/internal/measurement/cv;->asK:I
+    iget v3, v2, Lcom/google/android/gms/internal/measurement/cv;->atc:I
 
     add-int/lit8 v3, v3, 0x1
 
-    iput v3, v2, Lcom/google/android/gms/internal/measurement/cv;->asK:I
+    iput v3, v2, Lcom/google/android/gms/internal/measurement/cv;->atc:I
 
     invoke-interface {p1, v1, p0, p2}, Lcom/google/android/gms/internal/measurement/fq;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/fr;Lcom/google/android/gms/internal/measurement/de;)V
 
     invoke-interface {p1, v1}, Lcom/google/android/gms/internal/measurement/fq;->an(Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     const/4 p2, 0x0
 
     invoke-virtual {p1, p2}, Lcom/google/android/gms/internal/measurement/cv;->bO(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    iget p2, p1, Lcom/google/android/gms/internal/measurement/cv;->asK:I
+    iget p2, p1, Lcom/google/android/gms/internal/measurement/cv;->atc:I
 
     add-int/lit8 p2, p2, -0x1
 
-    iput p2, p1, Lcom/google/android/gms/internal/measurement/cv;->asK:I
+    iput p2, p1, Lcom/google/android/gms/internal/measurement/cv;->atc:I
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/measurement/cv;->bR(I)V
 
     return-object v1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sw()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -631,7 +631,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asQ:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ati:I
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/cw;->tag:I
 
@@ -641,7 +641,7 @@
 
     or-int/lit8 v1, v1, 0x4
 
-    iput v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asQ:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ati:I
 
     :try_start_0
     invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fq;->newInstance()Ljava/lang/Object;
@@ -654,19 +654,19 @@
 
     iget p1, p0, Lcom/google/android/gms/internal/measurement/cw;->tag:I
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/cw;->asQ:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/cw;->ati:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     if-ne p1, p2, :cond_0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asQ:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ati:I
 
     return-object v1
 
     :cond_0
     :try_start_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sz()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -677,7 +677,7 @@
     :catchall_0
     move-exception p1
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asQ:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ati:I
 
     throw p1
 .end method
@@ -710,15 +710,15 @@
     if-ne v0, v1, :cond_2
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rg()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->re()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object v0
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -727,9 +727,9 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -737,12 +737,12 @@
 
     if-eq v0, v1, :cond_0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
@@ -790,32 +790,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -826,24 +826,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -852,9 +852,9 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -862,7 +862,7 @@
 
     if-eq p1, v1, :cond_2
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
@@ -875,24 +875,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
@@ -902,9 +902,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -915,16 +915,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
@@ -934,9 +934,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -945,9 +945,9 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -955,7 +955,7 @@
 
     if-eq v0, v1, :cond_7
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 .end method
@@ -995,32 +995,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ri()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rg()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -1031,24 +1031,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ri()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rg()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -1057,9 +1057,9 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -1067,7 +1067,7 @@
 
     if-eq p1, v1, :cond_2
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
@@ -1080,24 +1080,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rg()I
 
     move-result v0
 
@@ -1107,9 +1107,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -1120,16 +1120,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ri()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rg()I
 
     move-result v0
 
@@ -1139,9 +1139,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -1150,9 +1150,9 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -1160,7 +1160,7 @@
 
     if-eq v0, v1, :cond_7
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 .end method
@@ -1203,17 +1203,17 @@
     if-ne p1, v1, :cond_2
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -1222,9 +1222,9 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -1232,46 +1232,46 @@
 
     if-eq p1, v1, :cond_0
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/cw;->bW(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int v3, v1, p1
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -1289,9 +1289,9 @@
     if-ne v0, v1, :cond_8
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rj()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
 
     move-result v0
 
@@ -1301,9 +1301,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -1312,9 +1312,9 @@
     return-void
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -1322,38 +1322,38 @@
 
     if-eq v0, v1, :cond_6
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cw;->bW(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_a
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rj()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
 
     move-result v0
 
@@ -1363,9 +1363,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -1411,34 +1411,34 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/cw;->bV(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ri()J
 
     move-result-wide v2
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/internal/measurement/eo;->ad(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -1447,24 +1447,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ri()J
 
     move-result-wide v1
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/eo;->ad(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -1473,9 +1473,9 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -1483,7 +1483,7 @@
 
     if-eq p1, v1, :cond_2
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
@@ -1496,26 +1496,26 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cw;->bV(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rk()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ri()J
 
     move-result-wide v2
 
@@ -1525,9 +1525,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -1536,16 +1536,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rk()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ri()J
 
     move-result-wide v0
 
@@ -1555,9 +1555,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -1566,9 +1566,9 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -1576,7 +1576,7 @@
 
     if-eq v0, v1, :cond_7
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 .end method
@@ -1616,32 +1616,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rl()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rj()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -1652,24 +1652,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rl()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rj()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -1678,9 +1678,9 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -1688,7 +1688,7 @@
 
     if-eq p1, v1, :cond_2
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
@@ -1701,24 +1701,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rl()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rj()I
 
     move-result v0
 
@@ -1728,9 +1728,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -1741,16 +1741,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rl()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rj()I
 
     move-result v0
 
@@ -1760,9 +1760,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -1771,9 +1771,9 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -1781,7 +1781,7 @@
 
     if-eq v0, v1, :cond_7
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 .end method
@@ -1821,32 +1821,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rk()J
 
     move-result-wide v2
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/internal/measurement/eo;->ad(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -1857,24 +1857,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rk()J
 
     move-result-wide v1
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/eo;->ad(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -1883,9 +1883,9 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -1893,7 +1893,7 @@
 
     if-eq p1, v1, :cond_2
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
@@ -1906,24 +1906,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rk()J
 
     move-result-wide v2
 
@@ -1933,9 +1933,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -1946,16 +1946,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rk()J
 
     move-result-wide v0
 
@@ -1965,9 +1965,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -1976,9 +1976,9 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -1986,7 +1986,7 @@
 
     if-eq v0, v1, :cond_7
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 .end method
@@ -2059,37 +2059,37 @@
 
     invoke-interface {p1, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v1
 
     if-nez v1, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     if-eqz v1, :cond_1
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v1
 
     if-eq v1, v0, :cond_0
 
-    iput v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     :cond_2
     :goto_0
     return-void
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
@@ -2130,25 +2130,25 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/internal/measurement/cv;->bQ(I)I
 
     move-result v1
 
-    iget-object v2, p2, Lcom/google/android/gms/internal/measurement/er;->avK:Ljava/lang/Object;
+    iget-object v2, p2, Lcom/google/android/gms/internal/measurement/er;->awc:Ljava/lang/Object;
 
-    iget-object v3, p2, Lcom/google/android/gms/internal/measurement/er;->asf:Ljava/lang/Object;
+    iget-object v3, p2, Lcom/google/android/gms/internal/measurement/er;->asx:Ljava/lang/Object;
 
     :goto_0
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rq()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->ro()I
 
     move-result v4
 
@@ -2156,9 +2156,9 @@
 
     if-eq v4, v5, :cond_4
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v5
     :try_end_0
@@ -2175,7 +2175,7 @@
     if-eq v4, v0, :cond_1
 
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rr()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rp()Z
 
     move-result v4
 
@@ -2191,9 +2191,9 @@
     throw v4
 
     :cond_1
-    iget-object v4, p2, Lcom/google/android/gms/internal/measurement/er;->avL:Lcom/google/android/gms/internal/measurement/gz;
+    iget-object v4, p2, Lcom/google/android/gms/internal/measurement/er;->awd:Lcom/google/android/gms/internal/measurement/gz;
 
-    iget-object v5, p2, Lcom/google/android/gms/internal/measurement/er;->asf:Ljava/lang/Object;
+    iget-object v5, p2, Lcom/google/android/gms/internal/measurement/er;->asx:Ljava/lang/Object;
 
     invoke-virtual {v5}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -2206,7 +2206,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v4, p2, Lcom/google/android/gms/internal/measurement/er;->avJ:Lcom/google/android/gms/internal/measurement/gz;
+    iget-object v4, p2, Lcom/google/android/gms/internal/measurement/er;->awb:Lcom/google/android/gms/internal/measurement/gz;
 
     const/4 v5, 0x0
 
@@ -2221,7 +2221,7 @@
 
     :catch_0
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rr()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cw;->rp()Z
 
     move-result v4
 
@@ -2241,7 +2241,7 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/measurement/cv;->bR(I)V
 
@@ -2250,7 +2250,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {p2, v1}, Lcom/google/android/gms/internal/measurement/cv;->bR(I)V
 
@@ -2331,37 +2331,37 @@
 
     invoke-interface {p1, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v1
 
     if-nez v1, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     if-eqz v1, :cond_1
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v1
 
     if-eq v1, v0, :cond_0
 
-    iput v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     :cond_2
     :goto_0
     return-void
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
@@ -2382,7 +2382,7 @@
     return v0
 .end method
 
-.method public final qZ()J
+.method public final qX()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2394,15 +2394,57 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qZ()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qX()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
+.method public final qY()J
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final qZ()I
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qZ()I
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final r(Ljava/util/List;)V
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
@@ -2440,24 +2482,24 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/cw;->bV(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->readDouble()D
 
@@ -2465,9 +2507,9 @@
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/internal/measurement/da;->e(D)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -2476,14 +2518,14 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->readDouble()D
 
@@ -2491,9 +2533,9 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/da;->e(D)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -2502,9 +2544,9 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -2512,7 +2554,7 @@
 
     if-eq p1, v1, :cond_2
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
@@ -2525,24 +2567,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cw;->bV(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->readDouble()D
 
@@ -2554,9 +2596,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -2565,14 +2607,14 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->readDouble()D
 
@@ -2584,9 +2626,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -2595,9 +2637,9 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -2605,7 +2647,7 @@
 
     if-eq v0, v1, :cond_7
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 .end method
@@ -2618,11 +2660,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ra()J
 
@@ -2639,11 +2681,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const/4 v0, 0x5
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rb()I
 
@@ -2652,49 +2694,7 @@
     return v0
 .end method
 
-.method public final rc()J
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rc()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final rd()I
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x5
-
-    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rd()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final re()Z
+.method public final rc()Z
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2706,15 +2706,57 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->re()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rc()Z
 
     move-result v0
 
     return v0
 .end method
 
+.method public final rd()Ljava/lang/String;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rd()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final re()Lcom/google/android/gms/internal/measurement/cj;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->re()Lcom/google/android/gms/internal/measurement/cj;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public final readDouble()D
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
@@ -2727,7 +2769,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->readDouble()D
 
@@ -2748,7 +2790,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->readFloat()F
 
@@ -2769,7 +2811,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->readString()Ljava/lang/String;
 
@@ -2802,7 +2844,7 @@
     return-void
 .end method
 
-.method public final rf()Ljava/lang/String;
+.method public final rf()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2810,20 +2852,20 @@
         }
     .end annotation
 
-    const/4 v0, 0x2
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
-    move-result-object v0
+    move-result v0
 
-    return-object v0
+    return v0
 .end method
 
-.method public final rg()Lcom/google/android/gms/internal/measurement/cj;
+.method public final rg()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2831,17 +2873,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x2
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rg()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rg()I
 
-    move-result-object v0
+    move-result v0
 
-    return-object v0
+    return v0
 .end method
 
 .method public final rh()I
@@ -2852,53 +2894,53 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final ri()I
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ri()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final rj()I
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
     const/4 v0, 0x5
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final ri()J
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ri()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final rj()I
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rj()I
 
@@ -2915,11 +2957,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x1
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rk()J
 
@@ -2928,28 +2970,7 @@
     return-wide v0
 .end method
 
-.method public final rl()I
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rl()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final rm()J
+.method public final ro()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2957,28 +2978,7 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cw;->bU(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final rq()I
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     if-eqz v0, :cond_0
 
@@ -2986,14 +2986,14 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -3004,7 +3004,7 @@
 
     if-eqz v0, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asQ:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ati:I
 
     if-ne v0, v1, :cond_1
 
@@ -3022,7 +3022,7 @@
     return v0
 .end method
 
-.method public final rr()Z
+.method public final rp()Z
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3030,9 +3030,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -3040,14 +3040,14 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cw;->tag:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asQ:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ati:I
 
     if-ne v0, v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/measurement/cv;->bP(I)Z
 
@@ -3100,17 +3100,17 @@
     if-ne p1, v1, :cond_2
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->readFloat()F
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dn;->r(F)V
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dn;->q(F)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -3119,9 +3119,9 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -3129,46 +3129,46 @@
 
     if-eq p1, v1, :cond_0
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/cw;->bW(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int v3, v1, p1
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->readFloat()F
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dn;->r(F)V
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dn;->q(F)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -3186,7 +3186,7 @@
     if-ne v0, v1, :cond_8
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->readFloat()F
 
@@ -3198,9 +3198,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -3209,9 +3209,9 @@
     return-void
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -3219,36 +3219,36 @@
 
     if-eq v0, v1, :cond_6
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cw;->bW(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_a
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->readFloat()F
 
@@ -3260,9 +3260,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -3306,32 +3306,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qZ()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qX()J
 
     move-result-wide v2
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/internal/measurement/eo;->ad(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -3342,24 +3342,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qZ()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qX()J
 
     move-result-wide v1
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/eo;->ad(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -3368,9 +3368,9 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -3378,7 +3378,7 @@
 
     if-eq p1, v1, :cond_2
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
@@ -3391,24 +3391,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qZ()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qX()J
 
     move-result-wide v2
 
@@ -3418,9 +3418,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -3431,16 +3431,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qZ()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qX()J
 
     move-result-wide v0
 
@@ -3450,9 +3450,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -3461,9 +3461,9 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -3471,7 +3471,7 @@
 
     if-eq v0, v1, :cond_7
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 .end method
@@ -3511,32 +3511,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ra()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()J
 
     move-result-wide v2
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/internal/measurement/eo;->ad(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -3547,24 +3547,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ra()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()J
 
     move-result-wide v1
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/eo;->ad(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -3573,9 +3573,9 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -3583,7 +3583,7 @@
 
     if-eq p1, v1, :cond_2
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
@@ -3596,24 +3596,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ra()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()J
 
     move-result-wide v2
 
@@ -3623,9 +3623,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -3636,16 +3636,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ra()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()J
 
     move-result-wide v0
 
@@ -3655,9 +3655,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -3666,9 +3666,9 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -3676,7 +3676,7 @@
 
     if-eq v0, v1, :cond_7
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 .end method
@@ -3716,32 +3716,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qZ()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -3752,24 +3752,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qZ()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -3778,9 +3778,9 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -3788,7 +3788,7 @@
 
     if-eq p1, v1, :cond_2
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
@@ -3801,24 +3801,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qZ()I
 
     move-result v0
 
@@ -3828,9 +3828,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -3841,16 +3841,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qZ()I
 
     move-result v0
 
@@ -3860,9 +3860,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -3871,9 +3871,9 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -3881,7 +3881,7 @@
 
     if-eq v0, v1, :cond_7
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 .end method
@@ -3923,34 +3923,34 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/cw;->bV(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rc()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ra()J
 
     move-result-wide v2
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/internal/measurement/eo;->ad(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -3959,24 +3959,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rc()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ra()J
 
     move-result-wide v1
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/eo;->ad(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -3985,9 +3985,9 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -3995,7 +3995,7 @@
 
     if-eq p1, v1, :cond_2
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
@@ -4008,26 +4008,26 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cw;->bV(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rc()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ra()J
 
     move-result-wide v2
 
@@ -4037,9 +4037,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -4048,16 +4048,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rc()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ra()J
 
     move-result-wide v0
 
@@ -4067,9 +4067,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -4078,9 +4078,9 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -4088,7 +4088,7 @@
 
     if-eq v0, v1, :cond_7
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 .end method
@@ -4131,17 +4131,17 @@
     if-ne p1, v1, :cond_2
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rd()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rb()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -4150,9 +4150,9 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -4160,46 +4160,46 @@
 
     if-eq p1, v1, :cond_0
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/cw;->bW(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int v3, v1, p1
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rd()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rb()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/du;->ct(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -4217,9 +4217,9 @@
     if-ne v0, v1, :cond_8
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rd()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rb()I
 
     move-result v0
 
@@ -4229,9 +4229,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -4240,9 +4240,9 @@
     return-void
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -4250,38 +4250,38 @@
 
     if-eq v0, v1, :cond_6
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cw;->bW(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_a
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rd()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rb()I
 
     move-result v0
 
@@ -4291,9 +4291,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -4337,32 +4337,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->re()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rc()Z
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/ch;->addBoolean(Z)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result p1
 
@@ -4373,24 +4373,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->re()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rc()Z
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/ch;->addBoolean(Z)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result p1
 
@@ -4399,9 +4399,9 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result p1
 
@@ -4409,7 +4409,7 @@
 
     if-eq p1, v1, :cond_2
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 
@@ -4422,24 +4422,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rf()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->re()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rc()Z
 
     move-result v0
 
@@ -4449,9 +4449,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
@@ -4462,16 +4462,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->re()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rc()Z
 
     move-result v0
 
@@ -4481,9 +4481,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -4492,9 +4492,9 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asP:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->ath:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -4502,7 +4502,7 @@
 
     if-eq v0, v1, :cond_7
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->asR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cw;->atj:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cx.smali
index 96ae3b13ae..1b4b4706f7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cx.smali
@@ -3,15 +3,15 @@
 
 
 # instance fields
-.field private final asS:Z
+.field private final atk:Z
 
-.field private asT:I
+.field private atl:I
 
-.field private asU:I
+.field private atm:I
 
-.field private asV:I
+.field private atn:I
 
-.field private asW:I
+.field private ato:I
 
 .field private final buffer:[B
 
@@ -40,7 +40,7 @@
 
     const v0, 0x7fffffff
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cx;->asW:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cx;->ato:I
 
     iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cx;->buffer:[B
 
@@ -52,14 +52,14 @@
 
     iget p1, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cx;->asU:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cx;->atm:I
 
-    iput-boolean p4, p0, Lcom/google/android/gms/internal/measurement/cx;->asS:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/internal/measurement/cx;->atk:Z
 
     return-void
 .end method
 
-.method private final rs()I
+.method private final rq()I
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -193,7 +193,7 @@
     return v0
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cv;->rn()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cv;->rl()J
 
     move-result-wide v0
 
@@ -202,7 +202,7 @@
     return v1
 .end method
 
-.method private final rt()J
+.method private final rr()J
     .locals 11
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -432,14 +432,14 @@
     return-wide v3
 
     :cond_9
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cv;->rn()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cv;->rl()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method private final ru()I
+.method private final rs()I
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -500,14 +500,14 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method private final rv()J
+.method private final rt()J
     .locals 9
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -638,19 +638,19 @@
     return-wide v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method private final rw()V
+.method private final ru()V
     .locals 3
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cx;->limit:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->asT:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->atl:I
 
     add-int/2addr v0, v1
 
@@ -658,19 +658,19 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cx;->limit:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->asU:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->atm:I
 
     sub-int v1, v0, v1
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->asW:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->ato:I
 
     if-le v1, v2, :cond_0
 
     sub-int/2addr v1, v2
 
-    iput v1, p0, Lcom/google/android/gms/internal/measurement/cx;->asT:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/cx;->atl:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->asT:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->atl:I
 
     sub-int/2addr v0, v1
 
@@ -681,12 +681,12 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cx;->asT:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cx;->atl:I
 
     return-void
 .end method
 
-.method private final rx()B
+.method private final rv()B
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -711,7 +711,7 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v0
 
@@ -740,13 +740,13 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rs()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rq()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->asK:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->atc:I
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->asL:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->atd:I
 
     if-ge v1, v2, :cond_0
 
@@ -754,11 +754,11 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->asK:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->atc:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iput v1, p0, Lcom/google/android/gms/internal/measurement/cx;->asK:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/cx;->atc:I
 
     invoke-interface {p1, p0, p2}, Lcom/google/android/gms/internal/measurement/fk;->c(Lcom/google/android/gms/internal/measurement/cv;Lcom/google/android/gms/internal/measurement/de;)Ljava/lang/Object;
 
@@ -770,18 +770,18 @@
 
     invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cv;->bO(I)V
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/cx;->asK:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/cx;->atc:I
 
     add-int/lit8 p2, p2, -0x1
 
-    iput p2, p0, Lcom/google/android/gms/internal/measurement/cx;->asK:I
+    iput p2, p0, Lcom/google/android/gms/internal/measurement/cx;->atc:I
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/cv;->bR(I)V
 
     return-object p1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sw()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -796,14 +796,14 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/cx;->asV:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/cx;->atn:I
 
     if-ne v0, p1, :cond_0
 
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sw()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->su()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -849,7 +849,7 @@
     return v2
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
@@ -859,7 +859,7 @@
     return v1
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cv;->qY()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cv;->qW()I
 
     move-result v0
 
@@ -883,7 +883,7 @@
     return v2
 
     :cond_4
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rs()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rq()I
 
     move-result p1
 
@@ -929,7 +929,7 @@
     goto :goto_0
 
     :cond_7
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->su()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -939,7 +939,7 @@
     :goto_1
     if-ge v1, v0, :cond_a
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rx()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rv()B
 
     move-result p1
 
@@ -953,7 +953,7 @@
     return v2
 
     :cond_a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->su()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -976,31 +976,31 @@
 
     if-ltz p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
     add-int/2addr p1, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/cx;->asW:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/cx;->ato:I
 
     if-gt p1, v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cx;->asW:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cx;->ato:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rw()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->ru()V
 
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -1010,9 +1010,9 @@
 .method public final bR(I)V
     .locals 0
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cx;->asW:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cx;->ato:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rw()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->ru()V
 
     return-void
 .end method
@@ -1044,21 +1044,21 @@
     :cond_0
     if-gez p1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
     throw p1
 .end method
 
-.method public final qY()I
+.method public final qW()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1066,7 +1066,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cv;->ro()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cv;->rm()Z
 
     move-result v0
 
@@ -1074,18 +1074,18 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cx;->asV:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cx;->atn:I
 
     return v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rs()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rq()I
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cx;->asV:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cx;->atn:I
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/cx;->asV:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/cx;->atn:I
 
     ushr-int/lit8 v1, v0, 0x3
 
@@ -1094,14 +1094,14 @@
     return v0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final qZ()J
+.method public final qX()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1109,13 +1109,43 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rt()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rr()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
+.method public final qY()J
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rr()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final qZ()I
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rq()I
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final ra()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
@@ -1146,37 +1176,7 @@
     return v0
 .end method
 
-.method public final rc()J
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rv()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final rd()I
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->ru()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final re()Z
+.method public final rc()Z
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1184,7 +1184,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rt()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rr()J
 
     move-result-wide v0
 
@@ -1204,6 +1204,163 @@
     return v0
 .end method
 
+.method public final rd()Ljava/lang/String;
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rq()I
+
+    move-result v0
+
+    if-lez v0, :cond_0
+
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->limit:I
+
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
+
+    sub-int/2addr v1, v2
+
+    if-gt v0, v1, :cond_0
+
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cx;->buffer:[B
+
+    invoke-static {v1, v2, v0}, Lcom/google/android/gms/internal/measurement/gr;->g([BII)Ljava/lang/String;
+
+    move-result-object v1
+
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
+
+    add-int/2addr v2, v0
+
+    iput v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
+
+    return-object v1
+
+    :cond_0
+    if-nez v0, :cond_1
+
+    const-string v0, ""
+
+    return-object v0
+
+    :cond_1
+    if-gtz v0, :cond_2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_2
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
+
+    move-result-object v0
+
+    throw v0
+.end method
+
+.method public final re()Lcom/google/android/gms/internal/measurement/cj;
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rq()I
+
+    move-result v0
+
+    if-lez v0, :cond_0
+
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->limit:I
+
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
+
+    sub-int/2addr v1, v2
+
+    if-gt v0, v1, :cond_0
+
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cx;->buffer:[B
+
+    invoke-static {v1, v2, v0}, Lcom/google/android/gms/internal/measurement/cj;->c([BII)Lcom/google/android/gms/internal/measurement/cj;
+
+    move-result-object v1
+
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
+
+    add-int/2addr v2, v0
+
+    iput v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
+
+    return-object v1
+
+    :cond_0
+    if-nez v0, :cond_1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
+
+    return-object v0
+
+    :cond_1
+    if-lez v0, :cond_2
+
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->limit:I
+
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
+
+    sub-int/2addr v1, v2
+
+    if-gt v0, v1, :cond_2
+
+    add-int/2addr v0, v2
+
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cx;->buffer:[B
+
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
+
+    invoke-static {v0, v2, v1}, Ljava/util/Arrays;->copyOfRange([BII)[B
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_2
+    if-gtz v0, :cond_4
+
+    if-nez v0, :cond_3
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ds;->avv:[B
+
+    :goto_0
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cj;->l([B)Lcom/google/android/gms/internal/measurement/cj;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_3
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_4
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
+
+    move-result-object v0
+
+    throw v0
+.end method
+
 .method public final readDouble()D
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
@@ -1212,7 +1369,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rv()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rt()J
 
     move-result-wide v0
 
@@ -1231,7 +1388,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->ru()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rs()I
 
     move-result v0
 
@@ -1250,7 +1407,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rs()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rq()I
 
     move-result v0
 
@@ -1290,175 +1447,48 @@
     :cond_1
     if-gez v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v0
 
     throw v0
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final rf()Ljava/lang/String;
-    .locals 3
+.method public final rf()I
+    .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rs()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rq()I
 
     move-result v0
 
-    if-lez v0, :cond_0
-
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->limit:I
-
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
-
-    sub-int/2addr v1, v2
-
-    if-gt v0, v1, :cond_0
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cx;->buffer:[B
-
-    invoke-static {v1, v2, v0}, Lcom/google/android/gms/internal/measurement/gr;->g([BII)Ljava/lang/String;
-
-    move-result-object v1
-
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
-
-    add-int/2addr v2, v0
-
-    iput v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
-
-    return-object v1
-
-    :cond_0
-    if-nez v0, :cond_1
-
-    const-string v0, ""
-
-    return-object v0
-
-    :cond_1
-    if-gtz v0, :cond_2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
-
-    move-result-object v0
-
-    throw v0
+    return v0
 .end method
 
-.method public final rg()Lcom/google/android/gms/internal/measurement/cj;
-    .locals 3
+.method public final rg()I
+    .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rs()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rq()I
 
     move-result v0
 
-    if-lez v0, :cond_0
-
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->limit:I
-
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
-
-    sub-int/2addr v1, v2
-
-    if-gt v0, v1, :cond_0
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cx;->buffer:[B
-
-    invoke-static {v1, v2, v0}, Lcom/google/android/gms/internal/measurement/cj;->c([BII)Lcom/google/android/gms/internal/measurement/cj;
-
-    move-result-object v1
-
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
-
-    add-int/2addr v2, v0
-
-    iput v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
-
-    return-object v1
-
-    :cond_0
-    if-nez v0, :cond_1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
-
-    return-object v0
-
-    :cond_1
-    if-lez v0, :cond_2
-
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->limit:I
-
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
-
-    sub-int/2addr v1, v2
-
-    if-gt v0, v1, :cond_2
-
-    add-int/2addr v0, v2
-
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cx;->buffer:[B
-
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
-
-    invoke-static {v0, v2, v1}, Ljava/util/Arrays;->copyOfRange([BII)[B
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_2
-    if-gtz v0, :cond_4
-
-    if-nez v0, :cond_3
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ds;->avd:[B
-
-    :goto_0
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cj;->l([B)Lcom/google/android/gms/internal/measurement/cj;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_4
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
-
-    move-result-object v0
-
-    throw v0
+    return v0
 .end method
 
 .method public final rh()I
@@ -1476,19 +1506,19 @@
     return v0
 .end method
 
-.method public final ri()I
-    .locals 1
+.method public final ri()J
+    .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rs()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rt()J
 
-    move-result v0
+    move-result-wide v0
 
-    return v0
+    return-wide v0
 .end method
 
 .method public final rj()I
@@ -1499,7 +1529,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->ru()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rq()I
+
+    move-result v0
+
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cx;->bT(I)I
 
     move-result v0
 
@@ -1514,41 +1548,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rv()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final rl()I
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rs()I
-
-    move-result v0
-
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cx;->bT(I)I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final rm()J
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rt()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rr()J
 
     move-result-wide v0
 
@@ -1559,7 +1559,7 @@
     return-wide v0
 .end method
 
-.method final rn()J
+.method final rl()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1576,7 +1576,7 @@
 
     if-ge v2, v3, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rx()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cx;->rv()B
 
     move-result v3
 
@@ -1600,7 +1600,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->su()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v0
 
@@ -1613,7 +1613,7 @@
     goto :goto_1
 .end method
 
-.method public final ro()Z
+.method public final rm()Z
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1637,12 +1637,12 @@
     return v0
 .end method
 
-.method public final rp()I
+.method public final rn()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cx;->pos:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->asU:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cx;->atm:I
 
     sub-int/2addr v0, v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$a.smali
index df106cfc18..347f4a358d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$a.smali
@@ -108,24 +108,7 @@
 
 
 # virtual methods
-.method public final A(II)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
-
-    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
-
-    return-void
-.end method
-
-.method public final C(II)V
+.method public final B(II)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -135,7 +118,7 @@
 
     const/4 v0, 0x5
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->cb(I)V
 
@@ -150,7 +133,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/cy;->asX:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/cy;->atp:Z
 
     const/4 v1, 0x7
 
@@ -160,7 +143,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->rF()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->rD()I
 
     move-result v0
 
@@ -533,7 +516,7 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->a(Lcom/google/android/gms/internal/measurement/cj;)V
 
@@ -550,7 +533,7 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->b(Lcom/google/android/gms/internal/measurement/fb;)V
 
@@ -567,13 +550,13 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     move-object p1, p2
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/bz;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/bz;->qN()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/bz;->qL()I
 
     move-result v0
 
@@ -590,7 +573,7 @@
     :cond_0
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cy$a;->asY:Lcom/google/android/gms/internal/measurement/db;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cy$a;->atq:Lcom/google/android/gms/internal/measurement/db;
 
     invoke-interface {p3, p2, p1}, Lcom/google/android/gms/internal/measurement/fq;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hf;)V
 
@@ -628,7 +611,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/bz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bz;->qN()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bz;->qL()I
 
     move-result v1
 
@@ -645,7 +628,7 @@
     :cond_0
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$a;->asY:Lcom/google/android/gms/internal/measurement/db;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$a;->atq:Lcom/google/android/gms/internal/measurement/db;
 
     invoke-interface {p2, p1, v0}, Lcom/google/android/gms/internal/measurement/fq;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hf;)V
 
@@ -664,17 +647,17 @@
 
     const/4 v1, 0x1
 
-    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 v2, 0x2
 
-    invoke-virtual {p0, v2, p1}, Lcom/google/android/gms/internal/measurement/cy;->A(II)V
+    invoke-virtual {p0, v2, p1}, Lcom/google/android/gms/internal/measurement/cy;->z(II)V
 
     invoke-virtual {p0, v0, p2}, Lcom/google/android/gms/internal/measurement/cy;->a(ILcom/google/android/gms/internal/measurement/cj;)V
 
     const/4 p1, 0x4
 
-    invoke-virtual {p0, v1, p1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, v1, p1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     return-void
 .end method
@@ -691,17 +674,17 @@
 
     const/4 v1, 0x1
 
-    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 v2, 0x2
 
-    invoke-virtual {p0, v2, p1}, Lcom/google/android/gms/internal/measurement/cy;->A(II)V
+    invoke-virtual {p0, v2, p1}, Lcom/google/android/gms/internal/measurement/cy;->z(II)V
 
     invoke-virtual {p0, v0, p2}, Lcom/google/android/gms/internal/measurement/cy;->a(ILcom/google/android/gms/internal/measurement/fb;)V
 
     const/4 p1, 0x4
 
-    invoke-virtual {p0, v1, p1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, v1, p1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     return-void
 .end method
@@ -714,7 +697,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fb;->sf()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fb;->sd()I
 
     move-result v0
 
@@ -738,6 +721,110 @@
     return-void
 .end method
 
+.method public final bW(Ljava/lang/String;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
+
+    :try_start_0
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    mul-int/lit8 v1, v1, 0x3
+
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/cy$a;->cl(I)I
+
+    move-result v1
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/cy$a;->cl(I)I
+
+    move-result v2
+
+    if-ne v2, v1, :cond_0
+
+    add-int v1, v0, v2
+
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
+
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cy$a;->buffer:[B
+
+    iget v3, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->rD()I
+
+    move-result v4
+
+    invoke-static {p1, v1, v3, v4}, Lcom/google/android/gms/internal/measurement/gr;->a(Ljava/lang/CharSequence;[BII)I
+
+    move-result v1
+
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
+
+    sub-int v3, v1, v0
+
+    sub-int/2addr v3, v2
+
+    invoke-virtual {p0, v3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
+
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
+
+    return-void
+
+    :cond_0
+    invoke-static {p1}, Lcom/google/android/gms/internal/measurement/gr;->b(Ljava/lang/CharSequence;)I
+
+    move-result v1
+
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
+
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cy$a;->buffer:[B
+
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->rD()I
+
+    move-result v3
+
+    invoke-static {p1, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/gr;->a(Ljava/lang/CharSequence;[BII)I
+
+    move-result v1
+
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
+    :try_end_0
+    .catch Lcom/google/android/gms/internal/measurement/gv; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Lcom/google/android/gms/internal/measurement/cy$b;
+
+    invoke-direct {v0, p1}, Lcom/google/android/gms/internal/measurement/cy$b;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_1
+    move-exception v1
+
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
+
+    invoke-virtual {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/gv;)V
+
+    return-void
+.end method
+
 .method public final bY(I)V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
@@ -768,17 +855,17 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/cy;->asX:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/cy;->atp:Z
 
     if-eqz v0, :cond_4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qP()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qN()Z
 
     move-result v0
 
     if-nez v0, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->rF()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->rD()I
 
     move-result v0
 
@@ -1137,7 +1224,7 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->U(J)V
 
@@ -1154,9 +1241,9 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
-    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->cb(Ljava/lang/String;)V
+    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bW(Ljava/lang/String;)V
 
     return-void
 .end method
@@ -1276,110 +1363,6 @@
     throw v0
 .end method
 
-.method public final cb(Ljava/lang/String;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
-
-    :try_start_0
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    mul-int/lit8 v1, v1, 0x3
-
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/cy$a;->cl(I)I
-
-    move-result v1
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/cy$a;->cl(I)I
-
-    move-result v2
-
-    if-ne v2, v1, :cond_0
-
-    add-int v1, v0, v2
-
-    iput v1, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cy$a;->buffer:[B
-
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->rF()I
-
-    move-result v4
-
-    invoke-static {p1, v1, v3, v4}, Lcom/google/android/gms/internal/measurement/gr;->a(Ljava/lang/CharSequence;[BII)I
-
-    move-result v1
-
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
-
-    sub-int v3, v1, v0
-
-    sub-int/2addr v3, v2
-
-    invoke-virtual {p0, v3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
-
-    iput v1, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
-
-    return-void
-
-    :cond_0
-    invoke-static {p1}, Lcom/google/android/gms/internal/measurement/gr;->b(Ljava/lang/CharSequence;)I
-
-    move-result v1
-
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cy$a;->buffer:[B
-
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->rF()I
-
-    move-result v3
-
-    invoke-static {p1, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/gr;->a(Ljava/lang/CharSequence;[BII)I
-
-    move-result v1
-
-    iput v1, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
-    :try_end_0
-    .catch Lcom/google/android/gms/internal/measurement/gv; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Lcom/google/android/gms/internal/measurement/cy$b;
-
-    invoke-direct {v0, p1}, Lcom/google/android/gms/internal/measurement/cy$b;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_1
-    move-exception v1
-
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
-
-    invoke-virtual {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/gv;)V
-
-    return-void
-.end method
-
 .method public final e(IJ)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -1390,7 +1373,7 @@
 
     const/4 v0, 0x1
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->W(J)V
 
@@ -1407,7 +1390,7 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     int-to-byte p1, p2
 
@@ -1439,7 +1422,7 @@
     return-void
 .end method
 
-.method public final rF()I
+.method public final rD()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cy$a;->limit:I
@@ -1524,7 +1507,7 @@
     throw p2
 .end method
 
-.method public final y(II)V
+.method public final x(II)V
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1541,6 +1524,23 @@
     return-void
 .end method
 
+.method public final y(II)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
+
+    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bY(I)V
+
+    return-void
+.end method
+
 .method public final z(II)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -1551,9 +1551,9 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
-    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bY(I)V
+    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$c.smali
index 57b92b80b6..337da56449 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$c.smali
@@ -14,9 +14,9 @@
 
 
 # instance fields
-.field private final asZ:Ljava/nio/ByteBuffer;
+.field private final atr:Ljava/nio/ByteBuffer;
 
-.field private ata:I
+.field private ats:I
 
 
 # direct methods
@@ -43,13 +43,13 @@
 
     invoke-direct {p0, v0, v1, v2}, Lcom/google/android/gms/internal/measurement/cy$a;-><init>([BII)V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cy$c;->asZ:Ljava/nio/ByteBuffer;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cy$c;->atr:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->position()I
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cy$c;->ata:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cy$c;->ats:I
 
     return-void
 .end method
@@ -59,9 +59,9 @@
 .method public final flush()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$c;->asZ:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$c;->atr:Ljava/nio/ByteBuffer;
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cy$c;->ata:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cy$c;->ats:I
 
     iget v2, p0, Lcom/google/android/gms/internal/measurement/cy$a;->position:I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$d.smali
index 71246d4177..3aecef26c9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$d.smali
@@ -14,19 +14,19 @@
 
 
 # instance fields
-.field private final atb:Ljava/nio/ByteBuffer;
+.field private final att:Ljava/nio/ByteBuffer;
 
-.field private final atc:Ljava/nio/ByteBuffer;
+.field private final atu:Ljava/nio/ByteBuffer;
 
-.field private final atd:J
+.field private final atv:J
 
-.field private final ate:J
+.field private final atw:J
 
-.field private final atf:J
+.field private final atx:J
 
-.field private final atg:J
+.field private final aty:J
 
-.field private ath:J
+.field private atz:J
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cy;-><init>(B)V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atb:Ljava/nio/ByteBuffer;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->att:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->duplicate()Ljava/nio/ByteBuffer;
 
@@ -49,15 +49,15 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atc:Ljava/nio/ByteBuffer;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atu:Ljava/nio/ByteBuffer;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/go;->c(Ljava/nio/ByteBuffer;)J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atd:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atv:J
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atd:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atv:J
 
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->position()I
 
@@ -67,9 +67,9 @@
 
     add-long/2addr v0, v2
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ate:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atw:J
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atd:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atv:J
 
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->limit()I
 
@@ -79,19 +79,19 @@
 
     add-long/2addr v0, v2
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atf:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atx:J
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atf:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atx:J
 
     const-wide/16 v2, 0xa
 
     sub-long/2addr v0, v2
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atg:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->aty:J
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ate:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atw:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     return-void
 .end method
@@ -99,9 +99,9 @@
 .method private final ab(J)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atu:Ljava/nio/ByteBuffer;
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atd:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atv:J
 
     sub-long/2addr p1, v1
 
@@ -114,24 +114,7 @@
 
 
 # virtual methods
-.method public final A(II)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
-
-    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
-
-    return-void
-.end method
-
-.method public final C(II)V
+.method public final B(II)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -141,7 +124,7 @@
 
     const/4 v0, 0x5
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->cb(I)V
 
@@ -156,9 +139,9 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atg:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->aty:J
 
     const/4 v4, 0x7
 
@@ -179,11 +162,11 @@
 
     if-nez v2, :cond_0
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     add-long/2addr v9, v0
 
-    iput-wide v9, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iput-wide v9, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     long-to-int p2, p1
 
@@ -194,11 +177,11 @@
     return-void
 
     :cond_0
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     add-long v2, v0, v9
 
-    iput-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iput-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     long-to-int v2, p1
 
@@ -216,9 +199,9 @@
 
     :cond_1
     :goto_1
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atf:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atx:J
 
     cmp-long v11, v0, v2
 
@@ -232,7 +215,7 @@
 
     add-long/2addr v9, v0
 
-    iput-wide v9, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iput-wide v9, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     long-to-int p2, p1
 
@@ -245,7 +228,7 @@
     :cond_2
     add-long v2, v0, v9
 
-    iput-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iput-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     long-to-int v2, p1
 
@@ -276,7 +259,7 @@
 
     aput-object v0, p2, v2
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atf:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atx:J
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -319,11 +302,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atu:Ljava/nio/ByteBuffer;
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atd:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atv:J
 
     sub-long/2addr v1, v3
 
@@ -331,13 +314,13 @@
 
     invoke-virtual {v0, v2, p1, p2}, Ljava/nio/ByteBuffer;->putLong(IJ)Ljava/nio/ByteBuffer;
 
-    iget-wide p1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide p1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     const-wide/16 v0, 0x8
 
     add-long/2addr p1, v0
 
-    iput-wide p1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iput-wide p1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     return-void
 .end method
@@ -352,7 +335,7 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->a(Lcom/google/android/gms/internal/measurement/cj;)V
 
@@ -369,7 +352,7 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->b(Lcom/google/android/gms/internal/measurement/fb;)V
 
@@ -386,7 +369,7 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->a(Lcom/google/android/gms/internal/measurement/fb;Lcom/google/android/gms/internal/measurement/fq;)V
 
@@ -424,7 +407,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/bz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bz;->qN()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bz;->qL()I
 
     move-result v1
 
@@ -441,7 +424,7 @@
     :cond_0
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->asY:Lcom/google/android/gms/internal/measurement/db;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atq:Lcom/google/android/gms/internal/measurement/db;
 
     invoke-interface {p2, p1, v0}, Lcom/google/android/gms/internal/measurement/fq;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hf;)V
 
@@ -460,17 +443,17 @@
 
     const/4 v1, 0x1
 
-    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 v2, 0x2
 
-    invoke-virtual {p0, v2, p1}, Lcom/google/android/gms/internal/measurement/cy;->A(II)V
+    invoke-virtual {p0, v2, p1}, Lcom/google/android/gms/internal/measurement/cy;->z(II)V
 
     invoke-virtual {p0, v0, p2}, Lcom/google/android/gms/internal/measurement/cy;->a(ILcom/google/android/gms/internal/measurement/cj;)V
 
     const/4 p1, 0x4
 
-    invoke-virtual {p0, v1, p1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, v1, p1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     return-void
 .end method
@@ -487,17 +470,17 @@
 
     const/4 v1, 0x1
 
-    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 v2, 0x2
 
-    invoke-virtual {p0, v2, p1}, Lcom/google/android/gms/internal/measurement/cy;->A(II)V
+    invoke-virtual {p0, v2, p1}, Lcom/google/android/gms/internal/measurement/cy;->z(II)V
 
     invoke-virtual {p0, v0, p2}, Lcom/google/android/gms/internal/measurement/cy;->a(ILcom/google/android/gms/internal/measurement/fb;)V
 
     const/4 p1, 0x4
 
-    invoke-virtual {p0, v1, p1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, v1, p1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     return-void
 .end method
@@ -510,7 +493,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fb;->sf()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fb;->sd()I
 
     move-result v0
 
@@ -534,6 +517,136 @@
     return-void
 .end method
 
+.method public final bW(Ljava/lang/String;)V
+    .locals 8
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
+
+    :try_start_0
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    mul-int/lit8 v2, v2, 0x3
+
+    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/cy$d;->cl(I)I
+
+    move-result v2
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/cy$d;->cl(I)I
+
+    move-result v3
+
+    if-ne v3, v2, :cond_0
+
+    iget-wide v4, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
+
+    iget-wide v6, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atv:J
+
+    sub-long/2addr v4, v6
+
+    long-to-int v2, v4
+
+    add-int/2addr v2, v3
+
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atu:Ljava/nio/ByteBuffer;
+
+    invoke-virtual {v3, v2}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
+
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atu:Ljava/nio/ByteBuffer;
+
+    invoke-static {p1, v3}, Lcom/google/android/gms/internal/measurement/gr;->a(Ljava/lang/CharSequence;Ljava/nio/ByteBuffer;)V
+
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atu:Ljava/nio/ByteBuffer;
+
+    invoke-virtual {v3}, Ljava/nio/ByteBuffer;->position()I
+
+    move-result v3
+
+    sub-int/2addr v3, v2
+
+    invoke-virtual {p0, v3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
+
+    iget-wide v4, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
+
+    int-to-long v2, v3
+
+    add-long/2addr v4, v2
+
+    iput-wide v4, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
+
+    return-void
+
+    :cond_0
+    invoke-static {p1}, Lcom/google/android/gms/internal/measurement/gr;->b(Ljava/lang/CharSequence;)I
+
+    move-result v2
+
+    invoke-virtual {p0, v2}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
+
+    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
+
+    invoke-direct {p0, v3, v4}, Lcom/google/android/gms/internal/measurement/cy$d;->ab(J)V
+
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atu:Ljava/nio/ByteBuffer;
+
+    invoke-static {p1, v3}, Lcom/google/android/gms/internal/measurement/gr;->a(Ljava/lang/CharSequence;Ljava/nio/ByteBuffer;)V
+
+    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
+
+    int-to-long v5, v2
+
+    add-long/2addr v3, v5
+
+    iput-wide v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
+    :try_end_0
+    .catch Lcom/google/android/gms/internal/measurement/gv; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Lcom/google/android/gms/internal/measurement/cy$b;
+
+    invoke-direct {v0, p1}, Lcom/google/android/gms/internal/measurement/cy$b;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_1
+    move-exception p1
+
+    new-instance v0, Lcom/google/android/gms/internal/measurement/cy$b;
+
+    invoke-direct {v0, p1}, Lcom/google/android/gms/internal/measurement/cy$b;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_2
+    move-exception v2
+
+    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
+
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
+
+    invoke-direct {p0, v0, v1}, Lcom/google/android/gms/internal/measurement/cy$d;->ab(J)V
+
+    invoke-virtual {p0, p1, v2}, Lcom/google/android/gms/internal/measurement/cy;->a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/gv;)V
+
+    return-void
+.end method
+
 .method public final bY(I)V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
@@ -564,9 +677,9 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atg:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->aty:J
 
     const-wide/16 v4, 0x1
 
@@ -579,11 +692,11 @@
 
     if-nez v0, :cond_0
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     add-long/2addr v4, v0
 
-    iput-wide v4, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iput-wide v4, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     int-to-byte p1, p1
 
@@ -592,11 +705,11 @@
     return-void
 
     :cond_0
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     add-long v2, v0, v4
 
-    iput-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iput-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     and-int/lit8 v2, p1, 0x7f
 
@@ -612,9 +725,9 @@
 
     :cond_1
     :goto_1
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atf:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atx:J
 
     cmp-long v6, v0, v2
 
@@ -626,7 +739,7 @@
 
     add-long/2addr v4, v0
 
-    iput-wide v4, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iput-wide v4, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     int-to-byte p1, p1
 
@@ -637,7 +750,7 @@
     :cond_2
     add-long v2, v0, v4
 
-    iput-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iput-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     and-int/lit8 v2, p1, 0x7f
 
@@ -666,7 +779,7 @@
 
     aput-object v0, v2, v3
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atf:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atx:J
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -709,9 +822,9 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atf:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atx:J
 
     cmp-long v4, v0, v2
 
@@ -721,7 +834,7 @@
 
     add-long/2addr v2, v0
 
-    iput-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iput-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     invoke-static {v0, v1, p1}, Lcom/google/android/gms/internal/measurement/go;->a(JB)V
 
@@ -742,7 +855,7 @@
 
     aput-object v0, v2, v3
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atf:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atx:J
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -781,7 +894,7 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->U(J)V
 
@@ -798,9 +911,9 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
-    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->cb(Ljava/lang/String;)V
+    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bW(Ljava/lang/String;)V
 
     return-void
 .end method
@@ -813,11 +926,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atu:Ljava/nio/ByteBuffer;
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atd:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atv:J
 
     sub-long/2addr v1, v3
 
@@ -825,143 +938,13 @@
 
     invoke-virtual {v0, v2, p1}, Ljava/nio/ByteBuffer;->putInt(II)Ljava/nio/ByteBuffer;
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     const-wide/16 v2, 0x4
 
     add-long/2addr v0, v2
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
-
-    return-void
-.end method
-
-.method public final cb(Ljava/lang/String;)V
-    .locals 8
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
-
-    :try_start_0
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    mul-int/lit8 v2, v2, 0x3
-
-    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/cy$d;->cl(I)I
-
-    move-result v2
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/cy$d;->cl(I)I
-
-    move-result v3
-
-    if-ne v3, v2, :cond_0
-
-    iget-wide v4, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
-
-    iget-wide v6, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atd:J
-
-    sub-long/2addr v4, v6
-
-    long-to-int v2, v4
-
-    add-int/2addr v2, v3
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atc:Ljava/nio/ByteBuffer;
-
-    invoke-virtual {v3, v2}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atc:Ljava/nio/ByteBuffer;
-
-    invoke-static {p1, v3}, Lcom/google/android/gms/internal/measurement/gr;->a(Ljava/lang/CharSequence;Ljava/nio/ByteBuffer;)V
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atc:Ljava/nio/ByteBuffer;
-
-    invoke-virtual {v3}, Ljava/nio/ByteBuffer;->position()I
-
-    move-result v3
-
-    sub-int/2addr v3, v2
-
-    invoke-virtual {p0, v3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
-
-    iget-wide v4, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
-
-    int-to-long v2, v3
-
-    add-long/2addr v4, v2
-
-    iput-wide v4, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
-
-    return-void
-
-    :cond_0
-    invoke-static {p1}, Lcom/google/android/gms/internal/measurement/gr;->b(Ljava/lang/CharSequence;)I
-
-    move-result v2
-
-    invoke-virtual {p0, v2}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
-
-    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
-
-    invoke-direct {p0, v3, v4}, Lcom/google/android/gms/internal/measurement/cy$d;->ab(J)V
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atc:Ljava/nio/ByteBuffer;
-
-    invoke-static {p1, v3}, Lcom/google/android/gms/internal/measurement/gr;->a(Ljava/lang/CharSequence;Ljava/nio/ByteBuffer;)V
-
-    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
-
-    int-to-long v5, v2
-
-    add-long/2addr v3, v5
-
-    iput-wide v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
-    :try_end_0
-    .catch Lcom/google/android/gms/internal/measurement/gv; {:try_start_0 .. :try_end_0} :catch_2
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Lcom/google/android/gms/internal/measurement/cy$b;
-
-    invoke-direct {v0, p1}, Lcom/google/android/gms/internal/measurement/cy$b;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_1
-    move-exception p1
-
-    new-instance v0, Lcom/google/android/gms/internal/measurement/cy$b;
-
-    invoke-direct {v0, p1}, Lcom/google/android/gms/internal/measurement/cy$b;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_2
-    move-exception v2
-
-    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
-
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
-
-    invoke-direct {p0, v0, v1}, Lcom/google/android/gms/internal/measurement/cy$d;->ab(J)V
-
-    invoke-virtual {p0, p1, v2}, Lcom/google/android/gms/internal/measurement/cy;->a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/gv;)V
+    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     return-void
 .end method
@@ -976,7 +959,7 @@
 
     const/4 v0, 0x1
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->W(J)V
 
@@ -993,7 +976,7 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     int-to-byte p1, p2
 
@@ -1005,11 +988,11 @@
 .method public final flush()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atb:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->att:Ljava/nio/ByteBuffer;
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atd:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atv:J
 
     sub-long/2addr v1, v3
 
@@ -1037,12 +1020,12 @@
     return-void
 .end method
 
-.method public final rF()I
+.method public final rD()I
     .locals 4
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atf:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atx:J
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     sub-long/2addr v0, v2
 
@@ -1071,13 +1054,13 @@
 
     if-lt v0, p2, :cond_1
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atf:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atx:J
 
     int-to-long v9, p3
 
     sub-long/2addr v0, v9
 
-    iget-wide v5, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v5, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     cmp-long v2, v0, v5
 
@@ -1094,11 +1077,11 @@
 
     invoke-static/range {v2 .. v8}, Lcom/google/android/gms/internal/measurement/go;->a([BJJJ)V
 
-    iget-wide p1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide p1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     add-long/2addr p1, v9
 
-    iput-wide p1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iput-wide p1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     return-void
 
@@ -1123,7 +1106,7 @@
 
     const/4 v0, 0x0
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->ath:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atz:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -1133,7 +1116,7 @@
 
     const/4 v0, 0x1
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atf:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/measurement/cy$d;->atx:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -1160,7 +1143,7 @@
     throw p1
 .end method
 
-.method public final y(II)V
+.method public final x(II)V
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1177,6 +1160,23 @@
     return-void
 .end method
 
+.method public final y(II)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
+
+    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bY(I)V
+
+    return-void
+.end method
+
 .method public final z(II)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -1187,9 +1187,9 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
-    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bY(I)V
+    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$e.smali
index 9d9aadf31a..83aaf1d9f5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy$e.smali
@@ -14,11 +14,11 @@
 
 
 # instance fields
-.field private final ata:I
+.field private final ats:I
 
-.field private final atb:Ljava/nio/ByteBuffer;
+.field private final att:Ljava/nio/ByteBuffer;
 
-.field private final atc:Ljava/nio/ByteBuffer;
+.field private final atu:Ljava/nio/ByteBuffer;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/cy;-><init>(B)V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atb:Ljava/nio/ByteBuffer;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cy$e;->att:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->duplicate()Ljava/nio/ByteBuffer;
 
@@ -41,18 +41,18 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->position()I
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cy$e;->ata:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cy$e;->ats:I
 
     return-void
 .end method
 
-.method private final cd(Ljava/lang/String;)V
+.method private final bY(Ljava/lang/String;)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -61,7 +61,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
 
     invoke-static {p1, v0}, Lcom/google/android/gms/internal/measurement/gr;->a(Ljava/lang/CharSequence;Ljava/nio/ByteBuffer;)V
     :try_end_0
@@ -81,24 +81,7 @@
 
 
 # virtual methods
-.method public final A(II)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
-
-    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
-
-    return-void
-.end method
-
-.method public final C(II)V
+.method public final B(II)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -108,7 +91,7 @@
 
     const/4 v0, 0x5
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->cb(I)V
 
@@ -135,7 +118,7 @@
     if-nez v4, :cond_0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
 
     long-to-int p2, p1
 
@@ -146,7 +129,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
 
     long-to-int v1, p1
 
@@ -191,7 +174,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, p1, p2}, Ljava/nio/ByteBuffer;->putLong(J)Ljava/nio/ByteBuffer;
     :try_end_0
@@ -219,7 +202,7 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->a(Lcom/google/android/gms/internal/measurement/cj;)V
 
@@ -236,7 +219,7 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->b(Lcom/google/android/gms/internal/measurement/fb;)V
 
@@ -253,7 +236,7 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->a(Lcom/google/android/gms/internal/measurement/fb;Lcom/google/android/gms/internal/measurement/fq;)V
 
@@ -291,7 +274,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/bz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bz;->qN()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bz;->qL()I
 
     move-result v1
 
@@ -308,7 +291,7 @@
     :cond_0
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->asY:Lcom/google/android/gms/internal/measurement/db;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atq:Lcom/google/android/gms/internal/measurement/db;
 
     invoke-interface {p2, p1, v0}, Lcom/google/android/gms/internal/measurement/fq;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hf;)V
 
@@ -327,17 +310,17 @@
 
     const/4 v1, 0x1
 
-    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 v2, 0x2
 
-    invoke-virtual {p0, v2, p1}, Lcom/google/android/gms/internal/measurement/cy;->A(II)V
+    invoke-virtual {p0, v2, p1}, Lcom/google/android/gms/internal/measurement/cy;->z(II)V
 
     invoke-virtual {p0, v0, p2}, Lcom/google/android/gms/internal/measurement/cy;->a(ILcom/google/android/gms/internal/measurement/cj;)V
 
     const/4 p1, 0x4
 
-    invoke-virtual {p0, v1, p1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, v1, p1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     return-void
 .end method
@@ -354,17 +337,17 @@
 
     const/4 v1, 0x1
 
-    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 v2, 0x2
 
-    invoke-virtual {p0, v2, p1}, Lcom/google/android/gms/internal/measurement/cy;->A(II)V
+    invoke-virtual {p0, v2, p1}, Lcom/google/android/gms/internal/measurement/cy;->z(II)V
 
     invoke-virtual {p0, v0, p2}, Lcom/google/android/gms/internal/measurement/cy;->a(ILcom/google/android/gms/internal/measurement/fb;)V
 
     const/4 p1, 0x4
 
-    invoke-virtual {p0, v1, p1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, v1, p1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     return-void
 .end method
@@ -377,7 +360,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fb;->sf()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fb;->sd()I
 
     move-result v0
 
@@ -401,6 +384,110 @@
     return-void
 .end method
 
+.method public final bW(Ljava/lang/String;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
+
+    invoke-virtual {v0}, Ljava/nio/ByteBuffer;->position()I
+
+    move-result v0
+
+    :try_start_0
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    mul-int/lit8 v1, v1, 0x3
+
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/cy$e;->cl(I)I
+
+    move-result v1
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/cy$e;->cl(I)I
+
+    move-result v2
+
+    if-ne v2, v1, :cond_0
+
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
+
+    invoke-virtual {v1}, Ljava/nio/ByteBuffer;->position()I
+
+    move-result v1
+
+    add-int/2addr v1, v2
+
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
+
+    invoke-virtual {v2, v1}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
+
+    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/cy$e;->bY(Ljava/lang/String;)V
+
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
+
+    invoke-virtual {v2}, Ljava/nio/ByteBuffer;->position()I
+
+    move-result v2
+
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
+
+    invoke-virtual {v3, v0}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
+
+    sub-int v1, v2, v1
+
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
+
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
+
+    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
+
+    return-void
+
+    :cond_0
+    invoke-static {p1}, Lcom/google/android/gms/internal/measurement/gr;->b(Ljava/lang/CharSequence;)I
+
+    move-result v1
+
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
+
+    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/cy$e;->bY(Ljava/lang/String;)V
+    :try_end_0
+    .catch Lcom/google/android/gms/internal/measurement/gv; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Lcom/google/android/gms/internal/measurement/cy$b;
+
+    invoke-direct {v0, p1}, Lcom/google/android/gms/internal/measurement/cy$b;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_1
+    move-exception v1
+
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
+
+    invoke-virtual {v2, v0}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
+
+    invoke-virtual {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/gv;)V
+
+    return-void
+.end method
+
 .method public final bY(I)V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
@@ -437,7 +524,7 @@
     if-nez v0, :cond_0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
 
     int-to-byte p1, p1
 
@@ -446,7 +533,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
 
     and-int/lit8 v1, p1, 0x7f
 
@@ -487,7 +574,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, p1}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
     :try_end_0
@@ -515,7 +602,7 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->U(J)V
 
@@ -532,9 +619,9 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
-    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->cb(Ljava/lang/String;)V
+    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bW(Ljava/lang/String;)V
 
     return-void
 .end method
@@ -548,7 +635,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, p1}, Ljava/nio/ByteBuffer;->putInt(I)Ljava/nio/ByteBuffer;
     :try_end_0
@@ -566,110 +653,6 @@
     throw v0
 .end method
 
-.method public final cb(Ljava/lang/String;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
-
-    invoke-virtual {v0}, Ljava/nio/ByteBuffer;->position()I
-
-    move-result v0
-
-    :try_start_0
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    mul-int/lit8 v1, v1, 0x3
-
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/cy$e;->cl(I)I
-
-    move-result v1
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/cy$e;->cl(I)I
-
-    move-result v2
-
-    if-ne v2, v1, :cond_0
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
-
-    invoke-virtual {v1}, Ljava/nio/ByteBuffer;->position()I
-
-    move-result v1
-
-    add-int/2addr v1, v2
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
-
-    invoke-virtual {v2, v1}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
-
-    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/cy$e;->cd(Ljava/lang/String;)V
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
-
-    invoke-virtual {v2}, Ljava/nio/ByteBuffer;->position()I
-
-    move-result v2
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
-
-    invoke-virtual {v3, v0}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
-
-    sub-int v1, v2, v1
-
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
-
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
-
-    return-void
-
-    :cond_0
-    invoke-static {p1}, Lcom/google/android/gms/internal/measurement/gr;->b(Ljava/lang/CharSequence;)I
-
-    move-result v1
-
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
-
-    invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/cy$e;->cd(Ljava/lang/String;)V
-    :try_end_0
-    .catch Lcom/google/android/gms/internal/measurement/gv; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Lcom/google/android/gms/internal/measurement/cy$b;
-
-    invoke-direct {v0, p1}, Lcom/google/android/gms/internal/measurement/cy$b;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_1
-    move-exception v1
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
-
-    invoke-virtual {v2, v0}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
-
-    invoke-virtual {p0, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/gv;)V
-
-    return-void
-.end method
-
 .method public final e(IJ)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -680,7 +663,7 @@
 
     const/4 v0, 0x1
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-virtual {p0, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->W(J)V
 
@@ -697,7 +680,7 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     int-to-byte p1, p2
 
@@ -709,9 +692,9 @@
 .method public final flush()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atb:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->att:Ljava/nio/ByteBuffer;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v1}, Ljava/nio/ByteBuffer;->position()I
 
@@ -739,10 +722,10 @@
     return-void
 .end method
 
-.method public final rF()I
+.method public final rD()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0}, Ljava/nio/ByteBuffer;->remaining()I
 
@@ -760,7 +743,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy$e;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, p1, p2, p3}, Ljava/nio/ByteBuffer;->put([BII)Ljava/nio/ByteBuffer;
     :try_end_0
@@ -788,7 +771,7 @@
     throw p2
 .end method
 
-.method public final y(II)V
+.method public final x(II)V
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -805,6 +788,23 @@
     return-void
 .end method
 
+.method public final y(II)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
+
+    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bY(I)V
+
+    return-void
+.end method
+
 .method public final z(II)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -815,9 +815,9 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
-    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bY(I)V
+    invoke-virtual {p0, p2}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy.smali
index 8667d7df95..130f8d27a7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cy.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field static final asX:Z
+.field static final atp:Z
 
 .field private static final logger:Ljava/util/logging/Logger;
 
 
 # instance fields
-.field asY:Lcom/google/android/gms/internal/measurement/db;
+.field atq:Lcom/google/android/gms/internal/measurement/db;
 
 
 # direct methods
@@ -40,11 +40,11 @@
 
     sput-object v0, Lcom/google/android/gms/internal/measurement/cy;->logger:Ljava/util/logging/Logger;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tq()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tn()Z
 
     move-result v0
 
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/cy;->asX:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/cy;->atp:Z
 
     return-void
 .end method
@@ -65,7 +65,7 @@
     return-void
 .end method
 
-.method public static D(II)I
+.method public static C(II)I
     .locals 0
 
     shl-int/lit8 p0, p0, 0x3
@@ -83,7 +83,7 @@
     return p0
 .end method
 
-.method public static E(II)I
+.method public static D(II)I
     .locals 0
 
     shl-int/lit8 p0, p0, 0x3
@@ -101,7 +101,7 @@
     return p0
 .end method
 
-.method public static F(II)I
+.method public static E(II)I
     .locals 0
 
     shl-int/lit8 p0, p0, 0x3
@@ -123,7 +123,7 @@
     return p0
 .end method
 
-.method public static G(II)I
+.method public static F(II)I
     .locals 0
 
     shl-int/lit8 p0, p0, 0x3
@@ -250,7 +250,7 @@
 
     move-result p0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/eg;->sf()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/eg;->sd()I
 
     move-result p1
 
@@ -268,7 +268,7 @@
 .method public static a(Lcom/google/android/gms/internal/measurement/eg;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eg;->sf()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eg;->sd()I
 
     move-result p0
 
@@ -310,7 +310,7 @@
 
     const/4 v1, 0x2
 
-    invoke-static {v1, p0}, Lcom/google/android/gms/internal/measurement/cy;->E(II)I
+    invoke-static {v1, p0}, Lcom/google/android/gms/internal/measurement/cy;->D(II)I
 
     move-result p0
 
@@ -366,7 +366,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/bz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bz;->qN()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/bz;->qL()I
 
     move-result v0
 
@@ -418,7 +418,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tr()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tp()Z
 
     move-result v0
 
@@ -447,6 +447,37 @@
     throw p0
 .end method
 
+.method public static bX(Ljava/lang/String;)I
+    .locals 1
+
+    :try_start_0
+    invoke-static {p0}, Lcom/google/android/gms/internal/measurement/gr;->b(Ljava/lang/CharSequence;)I
+
+    move-result p0
+    :try_end_0
+    .catch Lcom/google/android/gms/internal/measurement/gv; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ds;->UTF_8:Ljava/nio/charset/Charset;
+
+    invoke-virtual {p0, v0}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
+
+    move-result-object p0
+
+    array-length p0, p0
+
+    :goto_0
+    invoke-static {p0}, Lcom/google/android/gms/internal/measurement/cy;->cl(I)I
+
+    move-result v0
+
+    add-int/2addr v0, p0
+
+    return v0
+.end method
+
 .method public static c(ILcom/google/android/gms/internal/measurement/cj;)I
     .locals 1
 
@@ -504,7 +535,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/bz;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/bz;->qN()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/bz;->qL()I
 
     move-result v0
 
@@ -527,7 +558,7 @@
 .method public static c(Lcom/google/android/gms/internal/measurement/fb;)I
     .locals 1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fb;->sf()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fb;->sd()I
 
     move-result p0
 
@@ -554,37 +585,6 @@
     return p0
 .end method
 
-.method public static cc(Ljava/lang/String;)I
-    .locals 1
-
-    :try_start_0
-    invoke-static {p0}, Lcom/google/android/gms/internal/measurement/gr;->b(Ljava/lang/CharSequence;)I
-
-    move-result p0
-    :try_end_0
-    .catch Lcom/google/android/gms/internal/measurement/gv; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ds;->UTF_8:Ljava/nio/charset/Charset;
-
-    invoke-virtual {p0, v0}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
-
-    move-result-object p0
-
-    array-length p0, p0
-
-    :goto_0
-    invoke-static {p0}, Lcom/google/android/gms/internal/measurement/cy;->cl(I)I
-
-    move-result v0
-
-    add-int/2addr v0, p0
-
-    return v0
-.end method
-
 .method public static cd(I)I
     .locals 0
 
@@ -807,7 +807,7 @@
 
     const/4 v1, 0x2
 
-    invoke-static {v1, p0}, Lcom/google/android/gms/internal/measurement/cy;->E(II)I
+    invoke-static {v1, p0}, Lcom/google/android/gms/internal/measurement/cy;->D(II)I
 
     move-result p0
 
@@ -837,7 +837,7 @@
 
     const/4 v1, 0x2
 
-    invoke-static {v1, p0}, Lcom/google/android/gms/internal/measurement/cy;->E(II)I
+    invoke-static {v1, p0}, Lcom/google/android/gms/internal/measurement/cy;->D(II)I
 
     move-result p0
 
@@ -863,7 +863,7 @@
 
     move-result p0
 
-    invoke-static {p1}, Lcom/google/android/gms/internal/measurement/cy;->cc(Ljava/lang/String;)I
+    invoke-static {p1}, Lcom/google/android/gms/internal/measurement/cy;->bX(Ljava/lang/String;)I
 
     move-result p1
 
@@ -877,7 +877,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fb;->sf()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fb;->sd()I
 
     move-result p0
 
@@ -973,7 +973,7 @@
 .method public static rA()I
     .locals 1
 
-    const/16 v0, 0x8
+    const/4 v0, 0x4
 
     return v0
 .end method
@@ -989,23 +989,23 @@
 .method public static rC()I
     .locals 1
 
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public static rw()I
+    .locals 1
+
     const/4 v0, 0x4
 
     return v0
 .end method
 
-.method public static rD()I
+.method public static rx()I
     .locals 1
 
-    const/16 v0, 0x8
-
-    return v0
-.end method
-
-.method public static rE()I
-    .locals 1
-
-    const/4 v0, 0x1
+    const/4 v0, 0x4
 
     return v0
 .end method
@@ -1013,7 +1013,7 @@
 .method public static ry()I
     .locals 1
 
-    const/4 v0, 0x4
+    const/16 v0, 0x8
 
     return v0
 .end method
@@ -1021,22 +1021,14 @@
 .method public static rz()I
     .locals 1
 
-    const/4 v0, 0x4
+    const/16 v0, 0x8
 
     return v0
 .end method
 
 
 # virtual methods
-.method public abstract A(II)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public final B(II)V
+.method public final A(II)V
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1048,12 +1040,12 @@
 
     move-result p2
 
-    invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->A(II)V
+    invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->z(II)V
 
     return-void
 .end method
 
-.method public abstract C(II)V
+.method public abstract B(II)V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -1061,7 +1053,7 @@
     .end annotation
 .end method
 
-.method public final M(Z)V
+.method public final K(Z)V
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1237,7 +1229,7 @@
 
     move-result p2
 
-    invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->C(II)V
+    invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->B(II)V
 
     return-void
 .end method
@@ -1266,6 +1258,14 @@
     .end annotation
 .end method
 
+.method public abstract bW(Ljava/lang/String;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
 .method public abstract bY(I)V
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1331,14 +1331,6 @@
     .end annotation
 .end method
 
-.method public abstract cb(Ljava/lang/String;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
 .method public final d(D)V
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
@@ -1405,7 +1397,7 @@
     .end annotation
 .end method
 
-.method public final q(F)V
+.method public final p(F)V
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1422,13 +1414,13 @@
     return-void
 .end method
 
-.method public abstract rF()I
+.method public abstract rD()I
 .end method
 
-.method public final rG()V
+.method public final rE()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->rF()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->rD()I
 
     move-result v0
 
@@ -1454,6 +1446,14 @@
     .end annotation
 .end method
 
+.method public abstract x(II)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
 .method public abstract y(II)V
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cz.smali
index 8799d77874..b090daf4fa 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cz.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field static final synthetic ati:[I
+.field static final synthetic atA:[I
 
 
 # direct methods
@@ -18,12 +18,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axt:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axL:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -37,9 +37,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axx:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axP:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -53,9 +53,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axm:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axE:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -69,9 +69,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axz:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axR:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -85,9 +85,9 @@
 
     :catch_3
     :try_start_4
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axs:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axK:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -101,9 +101,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axr:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axJ:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -117,9 +117,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axn:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axF:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -133,9 +133,9 @@
 
     :catch_6
     :try_start_7
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axq:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axI:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -149,9 +149,9 @@
 
     :catch_7
     :try_start_8
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axo:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axG:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -165,9 +165,9 @@
 
     :catch_8
     :try_start_9
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axw:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axO:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -181,9 +181,9 @@
 
     :catch_9
     :try_start_a
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axA:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axS:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -197,9 +197,9 @@
 
     :catch_a
     :try_start_b
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axB:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axT:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -213,9 +213,9 @@
 
     :catch_b
     :try_start_c
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axC:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axU:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -229,9 +229,9 @@
 
     :catch_c
     :try_start_d
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axD:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axV:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -245,9 +245,9 @@
 
     :catch_d
     :try_start_e
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axu:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axM:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -261,9 +261,9 @@
 
     :catch_e
     :try_start_f
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axy:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axQ:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -277,9 +277,9 @@
 
     :catch_f
     :try_start_10
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cz;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axp:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axH:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/d.smali
index ffb6ce23be..620a8d9763 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/d.smali
@@ -3,11 +3,11 @@
 
 
 # instance fields
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-.field private final synthetic aqu:Ljava/lang/String;
+.field private final synthetic aqM:Ljava/lang/String;
 
-.field private final synthetic aqv:Ljava/lang/String;
+.field private final synthetic aqN:Ljava/lang/String;
 
 .field private final synthetic val$activity:Landroid/app/Activity;
 
@@ -16,13 +16,13 @@
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Landroid/app/Activity;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/d;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/d;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/d;->val$activity:Landroid/app/Activity;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/d;->aqu:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/d;->aqM:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/d;->aqv:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/d;->aqN:Ljava/lang/String;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -31,7 +31,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 7
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -39,7 +39,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/d;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/d;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
@@ -51,9 +51,9 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/d;->aqu:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/d;->aqM:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/d;->aqv:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/d;->aqN:Ljava/lang/String;
 
     iget-wide v5, p0, Lcom/google/android/gms/internal/measurement/d;->timestamp:J
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/da.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/da.smali
index ddb0f2d74a..b3f304980e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/da.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/da.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
-.field private static final atj:Lcom/google/android/gms/internal/measurement/da;
+.field private static final atB:Lcom/google/android/gms/internal/measurement/da;
 
 
 # instance fields
-.field private atk:[D
+.field private atC:[D
 
 .field private size:I
 
@@ -44,7 +44,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/internal/measurement/da;-><init>([DI)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/da;->atj:Lcom/google/android/gms/internal/measurement/da;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/da;->atB:Lcom/google/android/gms/internal/measurement/da;
 
     iput-boolean v1, v0, Lcom/google/android/gms/internal/measurement/cd;->zzacz:Z
 
@@ -70,7 +70,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cd;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     iput p2, p0, Lcom/google/android/gms/internal/measurement/da;->size:I
 
@@ -80,7 +80,7 @@
 .method private final b(ID)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     if-ltz p1, :cond_1
 
@@ -88,7 +88,7 @@
 
     if-gt p1, v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     array-length v2, v1
 
@@ -115,7 +115,7 @@
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     add-int/lit8 v2, p1, 0x1
 
@@ -125,10 +125,10 @@
 
     invoke-static {v1, p1, v0, v2, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     aput-wide p2, v0, p1
 
@@ -239,7 +239,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/ds;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -275,7 +275,7 @@
 
     add-int/2addr v3, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     array-length v2, v0
 
@@ -285,12 +285,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/da;->size:I
 
@@ -327,7 +327,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/da;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->copyOf([DI)[D
 
@@ -391,7 +391,7 @@
     return v3
 
     :cond_2
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     const/4 v1, 0x0
 
@@ -400,7 +400,7 @@
 
     if-ge v1, v2, :cond_4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     aget-wide v4, v2, v1
 
@@ -434,7 +434,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/da;->bH(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     aget-wide v1, v0, p1
 
@@ -457,7 +457,7 @@
 
     if-ge v1, v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     aget-wide v3, v2, v1
 
@@ -484,11 +484,11 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/da;->bH(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     aget-wide v1, v0, p1
 
@@ -529,7 +529,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     const/4 v0, 0x0
 
@@ -540,7 +540,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     aget-wide v3, v2, v1
 
@@ -554,7 +554,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     add-int/lit8 v0, v1, 0x1
 
@@ -594,11 +594,11 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/da;->size:I
 
@@ -641,11 +641,11 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/da;->bH(I)V
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/da;->atk:[D
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/da;->atC:[D
 
     aget-wide v2, p2, p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/db.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/db.smali
index 0711aa44a8..5aad872cf6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/db.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/db.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private final asJ:Lcom/google/android/gms/internal/measurement/cy;
+.field private final atb:Lcom/google/android/gms/internal/measurement/cy;
 
 
 # direct methods
@@ -23,11 +23,11 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/cy;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
-    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/cy;->asY:Lcom/google/android/gms/internal/measurement/db;
+    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/cy;->atq:Lcom/google/android/gms/internal/measurement/db;
 
     return-void
 .end method
@@ -42,7 +42,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->A(II)V
 
@@ -57,14 +57,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->B(II)V
 
     return-void
 .end method
 
-.method public final C(II)V
+.method public final G(II)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -72,9 +72,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
-    invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->C(II)V
+    invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->B(II)V
 
     return-void
 .end method
@@ -87,24 +87,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
-    invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->C(II)V
-
-    return-void
-.end method
-
-.method public final I(II)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
-
-    invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->z(II)V
+    invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
 
     return-void
 .end method
@@ -117,7 +102,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->a(ID)V
 
@@ -132,7 +117,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->a(ILcom/google/android/gms/internal/measurement/cj;)V
 
@@ -182,13 +167,13 @@
 
     check-cast v0, Ljava/util/Map$Entry;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v2, 0x2
 
-    invoke-virtual {v1, p1, v2}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {v1, p1, v2}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {v0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -204,7 +189,7 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {v0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -230,7 +215,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/fb;
 
@@ -281,7 +266,7 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     check-cast v2, Ljava/lang/String;
 
@@ -290,7 +275,7 @@
     goto :goto_1
 
     :cond_0
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/cj;
 
@@ -312,7 +297,7 @@
 
     if-ge v1, v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -392,11 +377,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -430,7 +415,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -441,7 +426,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -470,7 +455,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -482,7 +467,7 @@
 
     move-result v1
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->z(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -500,7 +485,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->b(IF)V
 
@@ -515,21 +500,21 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/fb;
 
     const/4 v1, 0x3
 
-    invoke-virtual {v0, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {v0, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/cy;->asY:Lcom/google/android/gms/internal/measurement/db;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/cy;->atq:Lcom/google/android/gms/internal/measurement/db;
 
     invoke-interface {p3, p2, v1}, Lcom/google/android/gms/internal/measurement/fq;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hf;)V
 
     const/4 p2, 0x4
 
-    invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     return-void
 .end method
@@ -560,7 +545,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -640,11 +625,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -665,7 +650,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->ry()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rw()I
 
     move-result v1
 
@@ -676,7 +661,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -687,7 +672,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -716,7 +701,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -728,7 +713,7 @@
 
     move-result v1
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->C(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->B(II)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -746,7 +731,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->c(IJ)V
 
@@ -765,7 +750,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/cj;
 
@@ -774,7 +759,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/fb;
 
@@ -791,7 +776,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->c(ILjava/lang/String;)V
 
@@ -819,11 +804,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -857,7 +842,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -868,7 +853,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -897,7 +882,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -927,11 +912,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x3
 
-    invoke-virtual {v0, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {v0, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     return-void
 .end method
@@ -944,11 +929,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x4
 
-    invoke-virtual {v0, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {v0, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     return-void
 .end method
@@ -961,7 +946,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->d(IJ)V
 
@@ -989,11 +974,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -1027,7 +1012,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -1038,7 +1023,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1067,7 +1052,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1097,7 +1082,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->e(IJ)V
 
@@ -1125,11 +1110,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -1150,7 +1135,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rA()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->ry()I
 
     move-result v1
 
@@ -1161,7 +1146,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -1172,7 +1157,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1201,7 +1186,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1231,7 +1216,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->e(IZ)V
 
@@ -1259,11 +1244,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -1284,7 +1269,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rC()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rA()I
 
     move-result v1
 
@@ -1295,7 +1280,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -1306,7 +1291,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1318,7 +1303,7 @@
 
     move-result p3
 
-    invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->q(F)V
+    invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->p(F)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -1335,7 +1320,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1378,11 +1363,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -1403,7 +1388,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Double;->doubleValue()D
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rD()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rB()I
 
     move-result v1
 
@@ -1414,7 +1399,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -1425,7 +1410,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1454,7 +1439,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1497,11 +1482,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -1535,7 +1520,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -1546,7 +1531,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1575,7 +1560,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1587,7 +1572,7 @@
 
     move-result v1
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->z(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -1605,7 +1590,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->c(IJ)V
 
@@ -1633,11 +1618,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -1658,7 +1643,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rE()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rC()I
 
     move-result v1
 
@@ -1669,7 +1654,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -1680,7 +1665,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1692,7 +1677,7 @@
 
     move-result p3
 
-    invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->M(Z)V
+    invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->K(Z)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -1709,7 +1694,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1739,7 +1724,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/cy;->e(IJ)V
 
@@ -1767,11 +1752,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -1805,7 +1790,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -1816,7 +1801,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1845,7 +1830,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1857,7 +1842,7 @@
 
     move-result v1
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->A(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->z(II)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -1888,11 +1873,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -1913,7 +1898,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rz()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rx()I
 
     move-result v1
 
@@ -1924,7 +1909,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -1935,7 +1920,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1964,7 +1949,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1976,7 +1961,7 @@
 
     move-result v1
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->C(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->B(II)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -2007,11 +1992,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -2032,7 +2017,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rB()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rz()I
 
     move-result v1
 
@@ -2043,7 +2028,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -2054,7 +2039,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2083,7 +2068,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2126,11 +2111,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -2164,7 +2149,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -2175,7 +2160,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2204,7 +2189,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2216,7 +2201,7 @@
 
     move-result v1
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->B(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->A(II)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -2247,11 +2232,11 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     const/4 v1, 0x2
 
-    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p3, p1, v1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     const/4 p1, 0x0
 
@@ -2285,7 +2270,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/cy;->bZ(I)V
 
@@ -2296,7 +2281,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2325,7 +2310,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2347,14 +2332,29 @@
     return-void
 .end method
 
-.method public final rH()I
+.method public final rF()I
     .locals 1
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->ava:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avs:I
 
     return v0
 .end method
 
+.method public final y(II)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
+
+    invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+
+    return-void
+.end method
+
 .method public final z(II)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -2363,7 +2363,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/db;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->z(II)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dc.smali
index 69efb6e576..d2aa01bf7c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dc.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final atl:Ljava/lang/Class;
+.field private static final atD:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -17,16 +17,16 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dc;->rI()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dc;->rG()Ljava/lang/Class;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dc;->atl:Ljava/lang/Class;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dc;->atD:Ljava/lang/Class;
 
     return-void
 .end method
 
-.method private static final ce(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/de;
+.method private static final bZ(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/de;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -34,7 +34,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dc;->atl:Ljava/lang/Class;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dc;->atD:Ljava/lang/Class;
 
     const/4 v1, 0x0
 
@@ -57,7 +57,7 @@
     return-object p0
 .end method
 
-.method private static rI()Ljava/lang/Class;
+.method private static rG()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -84,17 +84,17 @@
     return-object v0
 .end method
 
-.method public static rJ()Lcom/google/android/gms/internal/measurement/de;
+.method public static rH()Lcom/google/android/gms/internal/measurement/de;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dc;->atl:Ljava/lang/Class;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dc;->atD:Ljava/lang/Class;
 
     if-eqz v0, :cond_0
 
     :try_start_0
     const-string v0, "getEmptyRegistry"
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/dc;->ce(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/dc;->bZ(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v0
     :try_end_0
@@ -104,22 +104,22 @@
 
     :catch_0
     :cond_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/de;->atq:Lcom/google/android/gms/internal/measurement/de;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/de;->atI:Lcom/google/android/gms/internal/measurement/de;
 
     return-object v0
 .end method
 
-.method static rK()Lcom/google/android/gms/internal/measurement/de;
+.method static rI()Lcom/google/android/gms/internal/measurement/de;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dc;->atl:Ljava/lang/Class;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dc;->atD:Ljava/lang/Class;
 
     if-eqz v0, :cond_0
 
     :try_start_0
     const-string v0, "loadGeneratedRegistry"
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/dc;->ce(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/dc;->bZ(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v0
     :try_end_0
@@ -134,14 +134,14 @@
     :goto_0
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rK()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rI()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v0
 
     :cond_1
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dc;->rJ()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dc;->rH()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/de.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/de.smali
index 7fda30ca79..0d60895348 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/de.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/de.smali
@@ -11,9 +11,9 @@
 
 
 # static fields
-.field private static volatile atm:Z = false
+.field private static volatile atE:Z = false
 
-.field private static final atn:Ljava/lang/Class;
+.field private static final atF:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -22,15 +22,15 @@
     .end annotation
 .end field
 
-.field private static volatile ato:Lcom/google/android/gms/internal/measurement/de;
+.field private static volatile atG:Lcom/google/android/gms/internal/measurement/de;
 
-.field private static volatile atp:Lcom/google/android/gms/internal/measurement/de;
+.field private static volatile atH:Lcom/google/android/gms/internal/measurement/de;
 
-.field static final atq:Lcom/google/android/gms/internal/measurement/de;
+.field static final atI:Lcom/google/android/gms/internal/measurement/de;
 
 
 # instance fields
-.field private final atr:Ljava/util/Map;
+.field private final atJ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -46,11 +46,11 @@
 .method static constructor <clinit>()V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rL()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rJ()Ljava/lang/Class;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/de;->atn:Ljava/lang/Class;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/de;->atF:Ljava/lang/Class;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/de;
 
@@ -58,7 +58,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/de;-><init>(B)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/de;->atq:Lcom/google/android/gms/internal/measurement/de;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/de;->atI:Lcom/google/android/gms/internal/measurement/de;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->atr:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->atJ:Ljava/util/Map;
 
     return-void
 .end method
@@ -86,12 +86,12 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->atr:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->atJ:Ljava/util/Map;
 
     return-void
 .end method
 
-.method static rK()Lcom/google/android/gms/internal/measurement/de;
+.method static rI()Lcom/google/android/gms/internal/measurement/de;
     .locals 1
 
     const-class v0, Lcom/google/android/gms/internal/measurement/de;
@@ -103,7 +103,7 @@
     return-object v0
 .end method
 
-.method private static rL()Ljava/lang/Class;
+.method private static rJ()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -130,10 +130,10 @@
     return-object v0
 .end method
 
-.method public static rM()Lcom/google/android/gms/internal/measurement/de;
+.method public static rK()Lcom/google/android/gms/internal/measurement/de;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/de;->ato:Lcom/google/android/gms/internal/measurement/de;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/de;->atG:Lcom/google/android/gms/internal/measurement/de;
 
     if-nez v0, :cond_1
 
@@ -142,15 +142,15 @@
     monitor-enter v1
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/de;->ato:Lcom/google/android/gms/internal/measurement/de;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/de;->atG:Lcom/google/android/gms/internal/measurement/de;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dc;->rJ()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dc;->rH()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/de;->ato:Lcom/google/android/gms/internal/measurement/de;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/de;->atG:Lcom/google/android/gms/internal/measurement/de;
 
     :cond_0
     monitor-exit v1
@@ -171,10 +171,10 @@
     return-object v0
 .end method
 
-.method public static rN()Lcom/google/android/gms/internal/measurement/de;
+.method public static rL()Lcom/google/android/gms/internal/measurement/de;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/de;->atp:Lcom/google/android/gms/internal/measurement/de;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/de;->atH:Lcom/google/android/gms/internal/measurement/de;
 
     if-nez v0, :cond_1
 
@@ -183,15 +183,15 @@
     monitor-enter v1
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/de;->atp:Lcom/google/android/gms/internal/measurement/de;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/de;->atH:Lcom/google/android/gms/internal/measurement/de;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dc;->rK()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dc;->rI()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/de;->atp:Lcom/google/android/gms/internal/measurement/de;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/de;->atH:Lcom/google/android/gms/internal/measurement/de;
 
     :cond_0
     monitor-exit v1
@@ -226,7 +226,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->atr:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->atJ:Ljava/util/Map;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/de$a;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/df.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/df.smali
index b073dd2c25..d0936592d6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/df.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/df.smali
@@ -87,7 +87,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/dr$b;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$b;->so()Lcom/google/android/gms/internal/measurement/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$b;->sm()Lcom/google/android/gms/internal/measurement/dh;
 
     move-result-object p1
 
@@ -101,7 +101,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dh;->qS()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dh;->qQ()V
 
     return-void
 .end method
@@ -139,7 +139,7 @@
     return p1
 .end method
 
-.method final rO()Ljava/lang/Object;
+.method final rM()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -164,7 +164,7 @@
     throw v0
 .end method
 
-.method final rP()V
+.method final rN()V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -185,7 +185,7 @@
     throw v0
 .end method
 
-.method final rQ()V
+.method final rO()V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dg.smali
index 2eb847e3a9..81e6a22ef2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dg.smali
@@ -83,7 +83,7 @@
 .method abstract e(Lcom/google/android/gms/internal/measurement/fb;)Z
 .end method
 
-.method abstract rO()Ljava/lang/Object;
+.method abstract rM()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<UT:",
@@ -101,7 +101,7 @@
     .end annotation
 .end method
 
-.method abstract rP()V
+.method abstract rN()V
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()V"
@@ -115,7 +115,7 @@
     .end annotation
 .end method
 
-.method abstract rQ()V
+.method abstract rO()V
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()V"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dh.smali
index 5234a72904..2b7801e66d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dh.smali
@@ -14,11 +14,11 @@
 
 
 # static fields
-.field private static final atv:Lcom/google/android/gms/internal/measurement/dh;
+.field private static final atN:Lcom/google/android/gms/internal/measurement/dh;
 
 
 # instance fields
-.field final ats:Lcom/google/android/gms/internal/measurement/fw;
+.field final atK:Lcom/google/android/gms/internal/measurement/fw;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/fw<",
@@ -29,9 +29,9 @@
     .end annotation
 .end field
 
-.field att:Z
+.field atL:Z
 
-.field atu:Z
+.field atM:Z
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/dh;-><init>(B)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dh;->atv:Lcom/google/android/gms/internal/measurement/dh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dh;->atN:Lcom/google/android/gms/internal/measurement/dh;
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atu:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atM:Z
 
     const/16 v0, 0x10
 
@@ -64,7 +64,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     return-void
 .end method
@@ -76,15 +76,15 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/dh;->atu:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/dh;->atM:Z
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/fw;->cC(I)Lcom/google/android/gms/internal/measurement/fw;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dh;->qS()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dh;->qQ()V
 
     return-void
 .end method
@@ -96,11 +96,11 @@
 
     move-result p1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gz;->axv:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gz;->axN:Lcom/google/android/gms/internal/measurement/gz;
 
     if-ne p0, v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ds;->sq()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ds;->so()Z
 
     shl-int/lit8 p1, p1, 0x1
 
@@ -123,7 +123,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/fw;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -133,7 +133,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ed;->sB()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ed;->sz()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object p1
 
@@ -149,32 +149,32 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gz;->axv:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gz;->axN:Lcom/google/android/gms/internal/measurement/gz;
 
     if-ne p1, v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ds;->sq()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ds;->so()Z
 
     check-cast p3, Lcom/google/android/gms/internal/measurement/fb;
 
     const/4 p1, 0x3
 
-    invoke-virtual {p0, p2, p1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p2, p1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     invoke-interface {p3, p0}, Lcom/google/android/gms/internal/measurement/fb;->a(Lcom/google/android/gms/internal/measurement/cy;)V
 
     const/4 p1, 0x4
 
-    invoke-virtual {p0, p2, p1}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p2, p1}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
     return-void
 
     :cond_0
     iget v0, p1, Lcom/google/android/gms/internal/measurement/gz;->zzanu:I
 
-    invoke-virtual {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/cy;->y(II)V
+    invoke-virtual {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/cy;->x(II)V
 
-    sget-object p2, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object p2, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -193,7 +193,7 @@
 
     check-cast p3, Lcom/google/android/gms/internal/measurement/dw;
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/dw;->oU()I
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/dw;->oS()I
 
     move-result p1
 
@@ -301,7 +301,7 @@
     :cond_3
     check-cast p3, Ljava/lang/String;
 
-    invoke-virtual {p0, p3}, Lcom/google/android/gms/internal/measurement/cy;->cb(Ljava/lang/String;)V
+    invoke-virtual {p0, p3}, Lcom/google/android/gms/internal/measurement/cy;->bW(Ljava/lang/String;)V
 
     return-void
 
@@ -326,7 +326,7 @@
 
     move-result p1
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/measurement/cy;->M(Z)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/measurement/cy;->K(Z)V
 
     return-void
 
@@ -392,7 +392,7 @@
 
     move-result p1
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/measurement/cy;->q(F)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/measurement/cy;->p(F)V
 
     return-void
 
@@ -443,7 +443,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dj;->rX()Z
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dj;->rV()Z
 
     move-result v0
 
@@ -480,7 +480,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dj;->rV()Lcom/google/android/gms/internal/measurement/gz;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dj;->rT()Lcom/google/android/gms/internal/measurement/gz;
 
     move-result-object v4
 
@@ -503,7 +503,7 @@
     throw p1
 
     :cond_2
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dj;->rV()Lcom/google/android/gms/internal/measurement/gz;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dj;->rT()Lcom/google/android/gms/internal/measurement/gz;
 
     move-result-object v0
 
@@ -516,10 +516,10 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atu:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atM:Z
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/fw;->a(Ljava/lang/Comparable;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -531,7 +531,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/ds;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->aty:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->atQ:[I
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gz;->zzant:Lcom/google/android/gms/internal/measurement/hc;
 
@@ -661,7 +661,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/fg;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sT()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sR()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p0
 
@@ -702,21 +702,21 @@
         }
     .end annotation
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dj;->rV()Lcom/google/android/gms/internal/measurement/gz;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dj;->rT()Lcom/google/android/gms/internal/measurement/gz;
 
     move-result-object v0
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dj;->oU()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dj;->oS()I
 
     move-result v1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dj;->rX()Z
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dj;->rV()Z
 
     move-result v2
 
     if-eqz v2, :cond_3
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dj;->rY()Z
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dj;->rW()Z
 
     move-result p0
 
@@ -804,7 +804,7 @@
 .method private static b(Lcom/google/android/gms/internal/measurement/gz;Ljava/lang/Object;)I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -829,7 +829,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/dw;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dw;->oU()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dw;->oS()I
 
     move-result p0
 
@@ -883,7 +883,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rB()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rz()I
 
     move-result p0
 
@@ -894,7 +894,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rz()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rx()I
 
     move-result p0
 
@@ -951,7 +951,7 @@
     :cond_2
     check-cast p1, Ljava/lang/String;
 
-    invoke-static {p1}, Lcom/google/android/gms/internal/measurement/cy;->cc(Ljava/lang/String;)I
+    invoke-static {p1}, Lcom/google/android/gms/internal/measurement/cy;->bX(Ljava/lang/String;)I
 
     move-result p0
 
@@ -993,7 +993,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rE()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rC()I
 
     move-result p0
 
@@ -1004,7 +1004,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->ry()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rw()I
 
     move-result p0
 
@@ -1015,7 +1015,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rA()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->ry()I
 
     move-result p0
 
@@ -1065,7 +1065,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rC()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rA()I
 
     move-result p0
 
@@ -1076,7 +1076,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Double;->doubleValue()D
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rD()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cy;->rB()I
 
     move-result p0
 
@@ -1123,17 +1123,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dj;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rW()Lcom/google/android/gms/internal/measurement/hc;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rU()Lcom/google/android/gms/internal/measurement/hc;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/hc;->axN:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/hc;->ayf:Lcom/google/android/gms/internal/measurement/hc;
 
     const/4 v3, 0x1
 
     if-ne v1, v2, :cond_4
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rX()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rV()Z
 
     move-result v0
 
@@ -1233,21 +1233,21 @@
 
     move-result-object v1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rW()Lcom/google/android/gms/internal/measurement/hc;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rU()Lcom/google/android/gms/internal/measurement/hc;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/hc;->axN:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/hc;->ayf:Lcom/google/android/gms/internal/measurement/hc;
 
     if-ne v2, v3, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rX()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rV()Z
 
     move-result v2
 
     if-nez v2, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rY()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rW()Z
 
     move-result v2
 
@@ -1263,7 +1263,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/dj;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dj;->oU()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dj;->oS()I
 
     move-result p0
 
@@ -1282,7 +1282,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/dj;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dj;->oU()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dj;->oS()I
 
     move-result p0
 
@@ -1302,7 +1302,7 @@
     return p0
 .end method
 
-.method public static rR()Lcom/google/android/gms/internal/measurement/dh;
+.method public static rP()Lcom/google/android/gms/internal/measurement/dh;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1314,7 +1314,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dh;->atv:Lcom/google/android/gms/internal/measurement/dh;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dh;->atN:Lcom/google/android/gms/internal/measurement/dh;
 
     return-object v0
 .end method
@@ -1336,15 +1336,15 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/fw;->te()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/fw;->tc()I
 
     move-result v2
 
     if-ge v1, v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/internal/measurement/fw;->cD(I)Ljava/util/Map$Entry;
 
@@ -1367,9 +1367,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fw;->tf()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fw;->td()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -1405,9 +1405,9 @@
     goto :goto_1
 
     :cond_1
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/dh;->atu:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/dh;->atM:Z
 
-    iput-boolean v1, v0, Lcom/google/android/gms/internal/measurement/dh;->atu:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/internal/measurement/dh;->atM:Z
 
     return-object v0
 .end method
@@ -1438,12 +1438,12 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ed;->sB()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ed;->sz()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object p1
 
     :cond_0
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rX()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rV()Z
 
     move-result v1
 
@@ -1490,18 +1490,18 @@
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/fw;->a(Ljava/lang/Comparable;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
 
     :cond_3
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rW()Lcom/google/android/gms/internal/measurement/hc;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rU()Lcom/google/android/gms/internal/measurement/hc;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/hc;->axN:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/hc;->ayf:Lcom/google/android/gms/internal/measurement/hc;
 
     if-ne v1, v2, :cond_6
 
@@ -1511,7 +1511,7 @@
 
     if-nez v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/dh;->ao(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1526,7 +1526,7 @@
 
     if-eqz p1, :cond_5
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->sa()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rY()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p1
 
@@ -1535,25 +1535,25 @@
     :cond_5
     check-cast v1, Lcom/google/android/gms/internal/measurement/fb;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fb;->sg()Lcom/google/android/gms/internal/measurement/fa;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fb;->se()Lcom/google/android/gms/internal/measurement/fa;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rZ()Lcom/google/android/gms/internal/measurement/fa;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dj;->rX()Lcom/google/android/gms/internal/measurement/fa;
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fa;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fa;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object p1
 
     :goto_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v1, v0, p1}, Lcom/google/android/gms/internal/measurement/fw;->a(Ljava/lang/Comparable;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/dh;->ao(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1585,9 +1585,9 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/internal/measurement/dh;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/fw;->equals(Ljava/lang/Object;)Z
 
@@ -1599,7 +1599,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fw;->hashCode()I
 
@@ -1616,15 +1616,15 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/fw;->te()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/fw;->tc()I
 
     move-result v2
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/internal/measurement/fw;->cD(I)Ljava/util/Map$Entry;
 
@@ -1644,9 +1644,9 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fw;->tf()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fw;->td()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -1694,13 +1694,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atu:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atM:Z
 
     if-eqz v0, :cond_0
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/eh;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fw;->entrySet()Ljava/util/Set;
 
@@ -1715,7 +1715,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fw;->entrySet()Ljava/util/Set;
 
@@ -1728,23 +1728,23 @@
     return-object v0
 .end method
 
-.method public final qS()V
+.method public final qQ()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dh;->att:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atL:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fw;->qS()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fw;->qQ()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dh;->att:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dh;->atL:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/di.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/di.smali
index 1878bbe27b..84ac655f81 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/di.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/di.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final atw:Lcom/google/android/gms/internal/measurement/dg;
+.field private static final atO:Lcom/google/android/gms/internal/measurement/dg;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/dg<",
@@ -12,7 +12,7 @@
     .end annotation
 .end field
 
-.field private static final atx:Lcom/google/android/gms/internal/measurement/dg;
+.field private static final atP:Lcom/google/android/gms/internal/measurement/dg;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/dg<",
@@ -30,18 +30,18 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/df;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->atw:Lcom/google/android/gms/internal/measurement/dg;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->atO:Lcom/google/android/gms/internal/measurement/dg;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->rS()Lcom/google/android/gms/internal/measurement/dg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->rQ()Lcom/google/android/gms/internal/measurement/dg;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->atx:Lcom/google/android/gms/internal/measurement/dg;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->atP:Lcom/google/android/gms/internal/measurement/dg;
 
     return-void
 .end method
 
-.method private static rS()Lcom/google/android/gms/internal/measurement/dg;
+.method private static rQ()Lcom/google/android/gms/internal/measurement/dg;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -84,7 +84,7 @@
     return-object v0
 .end method
 
-.method static rT()Lcom/google/android/gms/internal/measurement/dg;
+.method static rR()Lcom/google/android/gms/internal/measurement/dg;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -94,12 +94,12 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->atw:Lcom/google/android/gms/internal/measurement/dg;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->atO:Lcom/google/android/gms/internal/measurement/dg;
 
     return-object v0
 .end method
 
-.method static rU()Lcom/google/android/gms/internal/measurement/dg;
+.method static rS()Lcom/google/android/gms/internal/measurement/dg;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -109,7 +109,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->atx:Lcom/google/android/gms/internal/measurement/dg;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->atP:Lcom/google/android/gms/internal/measurement/dg;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dj.smali
index 84e81311af..d2c372b828 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dj.smali
@@ -19,23 +19,23 @@
 
 
 # virtual methods
-.method public abstract oU()I
+.method public abstract oS()I
 .end method
 
-.method public abstract rV()Lcom/google/android/gms/internal/measurement/gz;
+.method public abstract rT()Lcom/google/android/gms/internal/measurement/gz;
 .end method
 
-.method public abstract rW()Lcom/google/android/gms/internal/measurement/hc;
+.method public abstract rU()Lcom/google/android/gms/internal/measurement/hc;
 .end method
 
-.method public abstract rX()Z
+.method public abstract rV()Z
 .end method
 
-.method public abstract rY()Z
+.method public abstract rW()Z
 .end method
 
-.method public abstract rZ()Lcom/google/android/gms/internal/measurement/fa;
+.method public abstract rX()Lcom/google/android/gms/internal/measurement/fa;
 .end method
 
-.method public abstract sa()Lcom/google/android/gms/internal/measurement/fg;
+.method public abstract rY()Lcom/google/android/gms/internal/measurement/fg;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dk.smali
index c441263f63..2e7bbf02d7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dk.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field static final synthetic ati:[I
+.field static final synthetic atA:[I
 
-.field static final synthetic aty:[I
+.field static final synthetic atQ:[I
 
 
 # direct methods
@@ -20,14 +20,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/gz;->axm:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/gz;->axE:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -41,9 +41,9 @@
     const/4 v1, 0x2
 
     :try_start_1
-    sget-object v2, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v2, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/gz;->axn:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/gz;->axF:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -57,9 +57,9 @@
     const/4 v2, 0x3
 
     :try_start_2
-    sget-object v3, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v3, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/gz;->axo:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/gz;->axG:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -73,9 +73,9 @@
     const/4 v3, 0x4
 
     :try_start_3
-    sget-object v4, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v4, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/gz;->axp:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/gz;->axH:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -89,9 +89,9 @@
     const/4 v4, 0x5
 
     :try_start_4
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/gz;->axq:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/gz;->axI:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -105,9 +105,9 @@
     const/4 v5, 0x6
 
     :try_start_5
-    sget-object v6, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v6, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/gz;->axr:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/gz;->axJ:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -121,9 +121,9 @@
     const/4 v6, 0x7
 
     :try_start_6
-    sget-object v7, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v7, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/gz;->axs:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/gz;->axK:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -137,9 +137,9 @@
     const/16 v7, 0x8
 
     :try_start_7
-    sget-object v8, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v8, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/gz;->axt:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v9, Lcom/google/android/gms/internal/measurement/gz;->axL:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -153,9 +153,9 @@
     const/16 v8, 0x9
 
     :try_start_8
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axv:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axN:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -167,9 +167,9 @@
 
     :catch_8
     :try_start_9
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axw:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axO:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -183,9 +183,9 @@
 
     :catch_9
     :try_start_a
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axu:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axM:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -199,9 +199,9 @@
 
     :catch_a
     :try_start_b
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axx:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axP:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -215,9 +215,9 @@
 
     :catch_b
     :try_start_c
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axy:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axQ:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -231,9 +231,9 @@
 
     :catch_c
     :try_start_d
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axA:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axS:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -247,9 +247,9 @@
 
     :catch_d
     :try_start_e
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axB:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axT:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -263,9 +263,9 @@
 
     :catch_e
     :try_start_f
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axC:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axU:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -279,9 +279,9 @@
 
     :catch_f
     :try_start_10
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axD:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axV:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -295,9 +295,9 @@
 
     :catch_10
     :try_start_11
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->ati:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->atA:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axz:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/gz;->axR:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -318,12 +318,12 @@
 
     new-array v9, v9, [I
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/dk;->aty:[I
+    sput-object v9, Lcom/google/android/gms/internal/measurement/dk;->atQ:[I
 
     :try_start_12
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->aty:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dk;->atQ:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/hc;->axF:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/hc;->axX:Lcom/google/android/gms/internal/measurement/hc;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/hc;->ordinal()I
 
@@ -335,9 +335,9 @@
 
     :catch_12
     :try_start_13
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->aty:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->atQ:[I
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/hc;->axG:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v9, Lcom/google/android/gms/internal/measurement/hc;->axY:Lcom/google/android/gms/internal/measurement/hc;
 
     invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/hc;->ordinal()I
 
@@ -349,9 +349,9 @@
 
     :catch_13
     :try_start_14
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->aty:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->atQ:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axH:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axZ:Lcom/google/android/gms/internal/measurement/hc;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hc;->ordinal()I
 
@@ -363,9 +363,9 @@
 
     :catch_14
     :try_start_15
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->aty:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->atQ:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axI:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->aya:Lcom/google/android/gms/internal/measurement/hc;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hc;->ordinal()I
 
@@ -377,9 +377,9 @@
 
     :catch_15
     :try_start_16
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->aty:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->atQ:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axJ:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->ayb:Lcom/google/android/gms/internal/measurement/hc;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hc;->ordinal()I
 
@@ -391,9 +391,9 @@
 
     :catch_16
     :try_start_17
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->aty:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->atQ:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axK:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->ayc:Lcom/google/android/gms/internal/measurement/hc;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hc;->ordinal()I
 
@@ -405,9 +405,9 @@
 
     :catch_17
     :try_start_18
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->aty:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->atQ:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axL:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->ayd:Lcom/google/android/gms/internal/measurement/hc;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hc;->ordinal()I
 
@@ -419,9 +419,9 @@
 
     :catch_18
     :try_start_19
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->aty:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->atQ:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axM:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->aye:Lcom/google/android/gms/internal/measurement/hc;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hc;->ordinal()I
 
@@ -433,9 +433,9 @@
 
     :catch_19
     :try_start_1a
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->aty:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dk;->atQ:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axN:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->ayf:Lcom/google/android/gms/internal/measurement/hc;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hc;->ordinal()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dl.smali
index 204d59fe25..c4777c878d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dl.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field static final synthetic atA:[I
+.field static final synthetic atR:[I
 
-.field static final synthetic atz:[I
+.field static final synthetic atS:[I
 
 
 # direct methods
@@ -20,14 +20,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dl;->atA:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dl;->atS:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dl;->atA:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dl;->atS:[I
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ee;->avp:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ee;->avH:Lcom/google/android/gms/internal/measurement/ee;
 
     invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ee;->ordinal()I
 
@@ -41,9 +41,9 @@
     const/4 v1, 0x2
 
     :try_start_1
-    sget-object v2, Lcom/google/android/gms/internal/measurement/dl;->atA:[I
+    sget-object v2, Lcom/google/android/gms/internal/measurement/dl;->atS:[I
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/ee;->avr:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/ee;->avJ:Lcom/google/android/gms/internal/measurement/ee;
 
     invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ee;->ordinal()I
 
@@ -57,9 +57,9 @@
     const/4 v2, 0x3
 
     :try_start_2
-    sget-object v3, Lcom/google/android/gms/internal/measurement/dl;->atA:[I
+    sget-object v3, Lcom/google/android/gms/internal/measurement/dl;->atS:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/ee;->avo:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/ee;->avG:Lcom/google/android/gms/internal/measurement/ee;
 
     invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ee;->ordinal()I
 
@@ -78,12 +78,12 @@
 
     new-array v3, v3, [I
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/dl;->atz:[I
+    sput-object v3, Lcom/google/android/gms/internal/measurement/dl;->atR:[I
 
     :try_start_3
-    sget-object v3, Lcom/google/android/gms/internal/measurement/dl;->atz:[I
+    sget-object v3, Lcom/google/android/gms/internal/measurement/dl;->atR:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/do;->auI:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/do;->ava:Lcom/google/android/gms/internal/measurement/do;
 
     invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/do;->ordinal()I
 
@@ -95,9 +95,9 @@
 
     :catch_3
     :try_start_4
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dl;->atz:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dl;->atR:[I
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
     invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/do;->ordinal()I
 
@@ -109,9 +109,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dl;->atz:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dl;->atR:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/do;->ordinal()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dm.smali
index 7b60877a58..c49a439a53 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dm.smali
@@ -13,42 +13,6 @@
 
 
 # static fields
-.field private static final enum atB:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atC:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atD:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atE:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atF:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atG:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atH:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atI:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atJ:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atK:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atL:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atM:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atN:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atO:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atP:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atQ:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atR:Lcom/google/android/gms/internal/measurement/dm;
-
-.field private static final enum atS:Lcom/google/android/gms/internal/measurement/dm;
-
 .field private static final enum atT:Lcom/google/android/gms/internal/measurement/dm;
 
 .field private static final enum atU:Lcom/google/android/gms/internal/measurement/dm;
@@ -63,11 +27,47 @@
 
 .field private static final enum atZ:Lcom/google/android/gms/internal/measurement/dm;
 
-.field private static final auA:[Lcom/google/android/gms/internal/measurement/dm;
+.field private static final enum auA:Lcom/google/android/gms/internal/measurement/dm;
 
-.field private static final auB:[Ljava/lang/reflect/Type;
+.field private static final enum auB:Lcom/google/android/gms/internal/measurement/dm;
 
-.field private static final synthetic auC:[Lcom/google/android/gms/internal/measurement/dm;
+.field public static final enum auC:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auD:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auE:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auF:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auG:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auH:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auI:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auJ:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auK:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auL:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auM:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auN:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auO:Lcom/google/android/gms/internal/measurement/dm;
+
+.field public static final enum auP:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auQ:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final enum auR:Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final auS:[Lcom/google/android/gms/internal/measurement/dm;
+
+.field private static final auT:[Ljava/lang/reflect/Type;
+
+.field private static final synthetic auU:[Lcom/google/android/gms/internal/measurement/dm;
 
 .field private static final enum aua:Lcom/google/android/gms/internal/measurement/dm;
 
@@ -89,7 +89,7 @@
 
 .field private static final enum auj:Lcom/google/android/gms/internal/measurement/dm;
 
-.field public static final enum auk:Lcom/google/android/gms/internal/measurement/dm;
+.field private static final enum auk:Lcom/google/android/gms/internal/measurement/dm;
 
 .field private static final enum aul:Lcom/google/android/gms/internal/measurement/dm;
 
@@ -115,7 +115,7 @@
 
 .field private static final enum auw:Lcom/google/android/gms/internal/measurement/dm;
 
-.field public static final enum aux:Lcom/google/android/gms/internal/measurement/dm;
+.field private static final enum aux:Lcom/google/android/gms/internal/measurement/dm;
 
 .field private static final enum auy:Lcom/google/android/gms/internal/measurement/dm;
 
@@ -147,9 +147,9 @@
 
     new-instance v6, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/ee;->avm:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/ee;->avE:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v1, "DOUBLE"
 
@@ -161,13 +161,13 @@
 
     invoke-direct/range {v0 .. v5}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v6, Lcom/google/android/gms/internal/measurement/dm;->atB:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v6, Lcom/google/android/gms/internal/measurement/dm;->atT:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avl:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avD:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "FLOAT"
 
@@ -179,13 +179,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atC:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atU:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "INT64"
 
@@ -197,13 +197,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atD:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atV:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "UINT64"
 
@@ -215,13 +215,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atE:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atW:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "INT32"
 
@@ -233,13 +233,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atF:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atX:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "FIXED64"
 
@@ -251,13 +251,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atG:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atY:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "FIXED32"
 
@@ -269,13 +269,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atH:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atZ:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avn:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avF:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "BOOL"
 
@@ -287,13 +287,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atI:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aua:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avo:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avG:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "STRING"
 
@@ -305,13 +305,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atJ:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aub:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avr:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avJ:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "MESSAGE"
 
@@ -323,13 +323,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atK:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auc:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avp:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avH:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "BYTES"
 
@@ -341,13 +341,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atL:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aud:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "UINT32"
 
@@ -359,13 +359,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atM:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aue:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avq:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avI:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "ENUM"
 
@@ -377,13 +377,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atN:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auf:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "SFIXED32"
 
@@ -395,13 +395,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atO:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aug:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "SFIXED64"
 
@@ -413,13 +413,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atP:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auh:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "SINT32"
 
@@ -431,13 +431,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atQ:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aui:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "SINT64"
 
@@ -449,13 +449,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atR:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auj:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avr:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avJ:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "GROUP"
 
@@ -467,13 +467,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atS:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auk:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avm:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avE:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "DOUBLE_LIST"
 
@@ -485,13 +485,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atT:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aul:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avl:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avD:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "FLOAT_LIST"
 
@@ -503,13 +503,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atU:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aum:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "INT64_LIST"
 
@@ -521,13 +521,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atV:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aun:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "UINT64_LIST"
 
@@ -539,13 +539,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atW:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auo:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "INT32_LIST"
 
@@ -557,13 +557,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atX:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aup:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "FIXED64_LIST"
 
@@ -575,13 +575,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atY:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auq:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "FIXED32_LIST"
 
@@ -593,13 +593,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->atZ:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aur:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avn:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avF:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "BOOL_LIST"
 
@@ -611,13 +611,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aua:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aus:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avo:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avG:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "STRING_LIST"
 
@@ -629,13 +629,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aub:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aut:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avr:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avJ:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "MESSAGE_LIST"
 
@@ -647,13 +647,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auc:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auu:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avp:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avH:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "BYTES_LIST"
 
@@ -665,13 +665,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aud:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auv:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "UINT32_LIST"
 
@@ -683,13 +683,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aue:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auw:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avq:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avI:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "ENUM_LIST"
 
@@ -701,13 +701,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auf:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aux:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "SFIXED32_LIST"
 
@@ -719,13 +719,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aug:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auy:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "SFIXED64_LIST"
 
@@ -737,13 +737,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auh:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auz:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "SINT32_LIST"
 
@@ -755,13 +755,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aui:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auA:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "SINT64_LIST"
 
@@ -773,13 +773,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auj:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auB:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avm:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avE:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "DOUBLE_LIST_PACKED"
 
@@ -791,13 +791,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auk:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auC:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avl:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avD:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "FLOAT_LIST_PACKED"
 
@@ -809,13 +809,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aul:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auD:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "INT64_LIST_PACKED"
 
@@ -827,13 +827,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aum:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auE:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "UINT64_LIST_PACKED"
 
@@ -845,13 +845,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aun:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auF:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "INT32_LIST_PACKED"
 
@@ -863,13 +863,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auo:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auG:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "FIXED64_LIST_PACKED"
 
@@ -881,13 +881,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aup:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auH:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "FIXED32_LIST_PACKED"
 
@@ -899,13 +899,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auq:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auI:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avn:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avF:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "BOOL_LIST_PACKED"
 
@@ -917,13 +917,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aur:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auJ:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "UINT32_LIST_PACKED"
 
@@ -935,13 +935,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aus:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auK:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avq:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avI:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "ENUM_LIST_PACKED"
 
@@ -953,13 +953,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aut:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auL:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "SFIXED32_LIST_PACKED"
 
@@ -971,13 +971,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auu:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auM:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "SFIXED64_LIST_PACKED"
 
@@ -989,13 +989,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auv:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auN:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "SINT32_LIST_PACKED"
 
@@ -1007,13 +1007,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auw:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auO:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "SINT64_LIST_PACKED"
 
@@ -1025,13 +1025,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->aux:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auP:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avr:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ee;->avJ:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v8, "GROUP_LIST"
 
@@ -1043,13 +1043,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auy:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auQ:Lcom/google/android/gms/internal/measurement/dm;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auI:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->ava:Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avi:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ee;->avA:Lcom/google/android/gms/internal/measurement/ee;
 
     const-string v2, "MAP"
 
@@ -1061,323 +1061,323 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dm;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/do;Lcom/google/android/gms/internal/measurement/ee;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auz:Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auR:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v0, 0x33
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/dm;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atB:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atT:Lcom/google/android/gms/internal/measurement/dm;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atC:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atU:Lcom/google/android/gms/internal/measurement/dm;
 
     const/4 v3, 0x1
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atD:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atV:Lcom/google/android/gms/internal/measurement/dm;
 
     const/4 v3, 0x2
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atE:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atW:Lcom/google/android/gms/internal/measurement/dm;
 
     const/4 v3, 0x3
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atF:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atX:Lcom/google/android/gms/internal/measurement/dm;
 
     const/4 v3, 0x4
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atG:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atY:Lcom/google/android/gms/internal/measurement/dm;
 
     const/4 v3, 0x5
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atH:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atZ:Lcom/google/android/gms/internal/measurement/dm;
 
     const/4 v3, 0x6
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atI:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aua:Lcom/google/android/gms/internal/measurement/dm;
 
     const/4 v3, 0x7
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atJ:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aub:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x8
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atK:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auc:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x9
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atL:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aud:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0xa
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atM:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aue:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0xb
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atN:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auf:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0xc
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atO:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aug:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0xd
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atP:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auh:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0xe
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atQ:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aui:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0xf
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atR:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auj:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x10
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atS:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auk:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x11
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atT:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aul:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x12
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atU:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aum:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x13
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atV:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aun:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x14
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atW:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auo:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x15
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atX:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aup:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x16
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atY:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auq:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x17
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->atZ:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aur:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x18
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aua:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aus:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x19
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aub:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aut:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x1a
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auc:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auu:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x1b
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aud:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auv:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x1c
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aue:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auw:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x1d
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auf:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aux:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x1e
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aug:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auy:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x1f
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auh:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auz:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x20
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aui:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auA:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x21
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auj:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auB:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x22
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auk:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auC:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x23
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aul:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auD:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x24
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aum:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auE:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x25
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aun:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auF:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x26
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auo:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auG:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x27
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aup:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auH:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x28
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auq:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auI:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x29
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aur:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auJ:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x2a
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aus:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auK:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x2b
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aut:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auL:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x2c
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auu:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auM:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x2d
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auv:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auN:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x2e
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auw:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auO:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x2f
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->aux:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auP:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x30
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auy:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auQ:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x31
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auz:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dm;->auR:Lcom/google/android/gms/internal/measurement/dm;
 
     const/16 v3, 0x32
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auC:[Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auU:[Lcom/google/android/gms/internal/measurement/dm;
 
     new-array v0, v2, [Ljava/lang/reflect/Type;
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auB:[Ljava/lang/reflect/Type;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dm;->auT:[Ljava/lang/reflect/Type;
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/dm;->values()[Lcom/google/android/gms/internal/measurement/dm;
 
@@ -1387,7 +1387,7 @@
 
     new-array v1, v1, [Lcom/google/android/gms/internal/measurement/dm;
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/dm;->auA:[Lcom/google/android/gms/internal/measurement/dm;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/dm;->auS:[Lcom/google/android/gms/internal/measurement/dm;
 
     array-length v1, v0
 
@@ -1396,7 +1396,7 @@
 
     aget-object v3, v0, v2
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/dm;->auA:[Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/dm;->auS:[Lcom/google/android/gms/internal/measurement/dm;
 
     iget v5, v3, Lcom/google/android/gms/internal/measurement/dm;->id:I
 
@@ -1429,7 +1429,7 @@
 
     iput-object p5, p0, Lcom/google/android/gms/internal/measurement/dm;->zzahf:Lcom/google/android/gms/internal/measurement/ee;
 
-    sget-object p1, Lcom/google/android/gms/internal/measurement/dl;->atz:[I
+    sget-object p1, Lcom/google/android/gms/internal/measurement/dl;->atR:[I
 
     invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/do;->ordinal()I
 
@@ -1466,11 +1466,11 @@
     :goto_0
     const/4 p1, 0x0
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
     if-ne p4, v0, :cond_2
 
-    sget-object p4, Lcom/google/android/gms/internal/measurement/dl;->atA:[I
+    sget-object p4, Lcom/google/android/gms/internal/measurement/dl;->atS:[I
 
     invoke-virtual {p5}, Lcom/google/android/gms/internal/measurement/ee;->ordinal()I
 
@@ -1497,7 +1497,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/dm;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dm;->auC:[Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dm;->auU:[Lcom/google/android/gms/internal/measurement/dm;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/dm;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dn.smali
index 563bbca5e7..4e4db474fa 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dn.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
-.field private static final auD:Lcom/google/android/gms/internal/measurement/dn;
+.field private static final auV:Lcom/google/android/gms/internal/measurement/dn;
 
 
 # instance fields
-.field private auE:[F
+.field private auW:[F
 
 .field private size:I
 
@@ -44,7 +44,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/internal/measurement/dn;-><init>([FI)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dn;->auD:Lcom/google/android/gms/internal/measurement/dn;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dn;->auV:Lcom/google/android/gms/internal/measurement/dn;
 
     iput-boolean v1, v0, Lcom/google/android/gms/internal/measurement/cd;->zzacz:Z
 
@@ -70,7 +70,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cd;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     iput p2, p0, Lcom/google/android/gms/internal/measurement/dn;->size:I
 
@@ -133,7 +133,7 @@
 .method private final c(IF)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     if-ltz p1, :cond_1
 
@@ -141,7 +141,7 @@
 
     if-gt p1, v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     array-length v2, v1
 
@@ -168,7 +168,7 @@
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     add-int/lit8 v2, p1, 0x1
 
@@ -178,10 +178,10 @@
 
     invoke-static {v1, p1, v0, v2, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     aput p2, v0, p1
 
@@ -239,7 +239,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/ds;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -275,7 +275,7 @@
 
     add-int/2addr v3, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     array-length v2, v0
 
@@ -285,12 +285,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/dn;->size:I
 
@@ -327,7 +327,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dn;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->copyOf([FI)[F
 
@@ -381,7 +381,7 @@
     return v3
 
     :cond_2
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     const/4 v1, 0x0
 
@@ -390,7 +390,7 @@
 
     if-ge v1, v2, :cond_4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     aget v2, v2, v1
 
@@ -422,7 +422,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/dn;->bH(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     aget p1, v0, p1
 
@@ -447,7 +447,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     aget v2, v2, v1
 
@@ -465,7 +465,7 @@
     return v0
 .end method
 
-.method public final r(F)V
+.method public final q(F)V
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/dn;->size:I
@@ -478,11 +478,11 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/dn;->bH(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     aget v1, v0, p1
 
@@ -523,7 +523,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     const/4 v0, 0x0
 
@@ -534,7 +534,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     aget v2, v2, v1
 
@@ -548,7 +548,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     add-int/lit8 v0, v1, 0x1
 
@@ -588,11 +588,11 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/dn;->size:I
 
@@ -635,11 +635,11 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/dn;->bH(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auE:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dn;->auW:[F
 
     aget v1, v0, p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/do.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/do.smali
index 27d9535cf9..baa16282ed 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/do.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/do.smali
@@ -13,15 +13,15 @@
 
 
 # static fields
-.field public static final enum auF:Lcom/google/android/gms/internal/measurement/do;
+.field public static final enum auX:Lcom/google/android/gms/internal/measurement/do;
 
-.field public static final enum auG:Lcom/google/android/gms/internal/measurement/do;
+.field public static final enum auY:Lcom/google/android/gms/internal/measurement/do;
 
-.field public static final enum auH:Lcom/google/android/gms/internal/measurement/do;
+.field public static final enum auZ:Lcom/google/android/gms/internal/measurement/do;
 
-.field public static final enum auI:Lcom/google/android/gms/internal/measurement/do;
+.field public static final enum ava:Lcom/google/android/gms/internal/measurement/do;
 
-.field private static final synthetic auJ:[Lcom/google/android/gms/internal/measurement/do;
+.field private static final synthetic avb:[Lcom/google/android/gms/internal/measurement/do;
 
 
 # instance fields
@@ -40,7 +40,7 @@
 
     invoke-direct {v0, v2, v1, v1}, Lcom/google/android/gms/internal/measurement/do;-><init>(Ljava/lang/String;IZ)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/do;
 
@@ -50,7 +50,7 @@
 
     invoke-direct {v0, v3, v2, v2}, Lcom/google/android/gms/internal/measurement/do;-><init>(Ljava/lang/String;IZ)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/do;
 
@@ -60,7 +60,7 @@
 
     invoke-direct {v0, v4, v3, v2}, Lcom/google/android/gms/internal/measurement/do;-><init>(Ljava/lang/String;IZ)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/do;
 
@@ -70,29 +70,29 @@
 
     invoke-direct {v0, v5, v4, v1}, Lcom/google/android/gms/internal/measurement/do;-><init>(Ljava/lang/String;IZ)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/do;->auI:Lcom/google/android/gms/internal/measurement/do;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/do;->ava:Lcom/google/android/gms/internal/measurement/do;
 
     const/4 v0, 0x4
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/do;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auF:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/do;->auX:Lcom/google/android/gms/internal/measurement/do;
 
     aput-object v5, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/do;->auG:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/do;->auY:Lcom/google/android/gms/internal/measurement/do;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/do;->auH:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/do;->auZ:Lcom/google/android/gms/internal/measurement/do;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/do;->auI:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/do;->ava:Lcom/google/android/gms/internal/measurement/do;
 
     aput-object v1, v0, v4
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/do;->auJ:[Lcom/google/android/gms/internal/measurement/do;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/do;->avb:[Lcom/google/android/gms/internal/measurement/do;
 
     return-void
 .end method
@@ -115,7 +115,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/do;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/do;->auJ:[Lcom/google/android/gms/internal/measurement/do;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/do;->avb:[Lcom/google/android/gms/internal/measurement/do;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/do;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dp.smali
index cef6cc5e87..51faf22726 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dp.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final auK:Lcom/google/android/gms/internal/measurement/dp;
+.field private static final avc:Lcom/google/android/gms/internal/measurement/dp;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/dp;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auK:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avc:Lcom/google/android/gms/internal/measurement/dp;
 
     return-void
 .end method
@@ -30,10 +30,10 @@
     return-void
 .end method
 
-.method public static sb()Lcom/google/android/gms/internal/measurement/dp;
+.method public static rZ()Lcom/google/android/gms/internal/measurement/dp;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dp;->auK:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dp;->avc:Lcom/google/android/gms/internal/measurement/dp;
 
     return-object v0
 .end method
@@ -124,7 +124,7 @@
 
     move-result-object v0
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auR:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avj:I
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dq.smali
index 9e9e6cc04d..6333f9b61d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dq.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field private static auL:Ljava/lang/String;
+.field private static avd:Ljava/lang/String;
 
 .field private static final logger:Ljava/util/logging/Logger;
 
@@ -37,7 +37,7 @@
 
     const-string v0, "com.google.protobuf.BlazeGeneratedExtensionRegistryLiteLoader"
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dq;->auL:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dq;->avd:Ljava/lang/String;
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/dq;->auL:Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/dq;->avd:Ljava/lang/String;
 
     goto :goto_0
 
@@ -155,7 +155,7 @@
     .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_4
 
     :try_start_2
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dq;->sc()Lcom/google/android/gms/internal/measurement/de;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dq;->sa()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v2
 
@@ -232,7 +232,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/dq;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dq;->sc()Lcom/google/android/gms/internal/measurement/de;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dq;->sa()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v2
 
@@ -398,7 +398,7 @@
 
 
 # virtual methods
-.method protected abstract sc()Lcom/google/android/gms/internal/measurement/de;
+.method protected abstract sa()Lcom/google/android/gms/internal/measurement/de;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$a.smali
index 6550a23520..632f3f8075 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$a.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field private final auM:Lcom/google/android/gms/internal/measurement/dr;
+.field private final ave:Lcom/google/android/gms/internal/measurement/dr;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TMessageType;"
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field protected auN:Lcom/google/android/gms/internal/measurement/dr;
+.field protected avf:Lcom/google/android/gms/internal/measurement/dr;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TMessageType;"
@@ -42,7 +42,7 @@
     .end annotation
 .end field
 
-.field private auO:Z
+.field private avg:Z
 
 
 # direct methods
@@ -56,9 +56,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cb;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auM:Lcom/google/android/gms/internal/measurement/dr;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->ave:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auS:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avk:I
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -66,11 +66,11 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/dr;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auO:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avg:Z
 
     return-void
 .end method
@@ -83,7 +83,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object v0
 
@@ -113,20 +113,20 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/fm;->az(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/fq;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/cw;->a(Lcom/google/android/gms/internal/measurement/cv;)Lcom/google/android/gms/internal/measurement/cw;
 
@@ -177,20 +177,20 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/fm;->az(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/fq;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     const/4 v5, 0x0
 
@@ -222,7 +222,7 @@
     throw p2
 
     :catch_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -234,7 +234,7 @@
     throw p1
 .end method
 
-.method private sk()Lcom/google/android/gms/internal/measurement/dr;
+.method private si()Lcom/google/android/gms/internal/measurement/dr;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -242,24 +242,24 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auO:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avg:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->qS()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr;->qQ()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auO:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avg:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     return-object v0
 .end method
@@ -316,9 +316,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sh()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     invoke-static {v0, p1}, Lcom/google/android/gms/internal/measurement/dr$a;->a(Lcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/dr;)V
 
@@ -333,11 +333,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auM:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->ave:Lcom/google/android/gms/internal/measurement/dr;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dr;
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auT:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avl:I
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -345,7 +345,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dr$a;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sk()Lcom/google/android/gms/internal/measurement/dr;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->si()Lcom/google/android/gms/internal/measurement/dr;
 
     move-result-object v1
 
@@ -359,7 +359,7 @@
 .method public final isInitialized()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     const/4 v1, 0x0
 
@@ -370,7 +370,7 @@
     return v0
 .end method
 
-.method public final synthetic qO()Lcom/google/android/gms/internal/measurement/cb;
+.method public final synthetic qM()Lcom/google/android/gms/internal/measurement/cb;
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cb;->clone()Ljava/lang/Object;
@@ -382,24 +382,24 @@
     return-object v0
 .end method
 
-.method public final synthetic si()Lcom/google/android/gms/internal/measurement/fb;
+.method public final synthetic sg()Lcom/google/android/gms/internal/measurement/fb;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auM:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->ave:Lcom/google/android/gms/internal/measurement/dr;
 
     return-object v0
 .end method
 
-.method protected final sj()V
+.method protected final sh()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auO:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avg:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auS:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avk:I
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -407,21 +407,21 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dr;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/internal/measurement/dr$a;->a(Lcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/dr;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auN:Lcom/google/android/gms/internal/measurement/dr;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avf:Lcom/google/android/gms/internal/measurement/dr;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->auO:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dr$a;->avg:Z
 
     :cond_0
     return-void
 .end method
 
-.method public final sl()Lcom/google/android/gms/internal/measurement/dr;
+.method public final sj()Lcom/google/android/gms/internal/measurement/dr;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -429,7 +429,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sk()Lcom/google/android/gms/internal/measurement/dr;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->si()Lcom/google/android/gms/internal/measurement/dr;
 
     move-result-object v0
 
@@ -451,20 +451,20 @@
     throw v0
 .end method
 
-.method public final synthetic sm()Lcom/google/android/gms/internal/measurement/fb;
+.method public final synthetic sk()Lcom/google/android/gms/internal/measurement/fb;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sk()Lcom/google/android/gms/internal/measurement/dr;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->si()Lcom/google/android/gms/internal/measurement/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final synthetic sn()Lcom/google/android/gms/internal/measurement/fb;
+.method public final synthetic sl()Lcom/google/android/gms/internal/measurement/fb;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/dr;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr$a;->sj()Lcom/google/android/gms/internal/measurement/dr;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$b.smali
index ca8ad4c27d..32b59c62f1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$b.smali
@@ -47,7 +47,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dr;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dh;->rR()Lcom/google/android/gms/internal/measurement/dh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dh;->rP()Lcom/google/android/gms/internal/measurement/dh;
 
     move-result-object v0
 
@@ -58,7 +58,7 @@
 
 
 # virtual methods
-.method final so()Lcom/google/android/gms/internal/measurement/dh;
+.method final sm()Lcom/google/android/gms/internal/measurement/dh;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -71,7 +71,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$b;->zzaic:Lcom/google/android/gms/internal/measurement/dh;
 
-    iget-boolean v0, v0, Lcom/google/android/gms/internal/measurement/dh;->att:Z
+    iget-boolean v0, v0, Lcom/google/android/gms/internal/measurement/dh;->atL:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$c.smali
index db72fc014f..f41ded768f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$c.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private final auM:Lcom/google/android/gms/internal/measurement/dr;
+.field private final ave:Lcom/google/android/gms/internal/measurement/dr;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -44,7 +44,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ca;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dr$c;->auM:Lcom/google/android/gms/internal/measurement/dr;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dr$c;->ave:Lcom/google/android/gms/internal/measurement/dr;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$c;->auM:Lcom/google/android/gms/internal/measurement/dr;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr$c;->ave:Lcom/google/android/gms/internal/measurement/dr;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/dr;->a(Lcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/cv;Lcom/google/android/gms/internal/measurement/de;)Lcom/google/android/gms/internal/measurement/dr;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$d.smali
index a26ae58d38..4bbf81c9d5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr$d.smali
@@ -20,33 +20,33 @@
 
 
 # static fields
-.field public static final enum auP:I = 0x1
+.field public static final enum avh:I = 0x1
 
-.field public static final enum auQ:I = 0x2
+.field public static final enum avi:I = 0x2
 
-.field public static final enum auR:I = 0x3
+.field public static final enum avj:I = 0x3
 
-.field public static final enum auS:I = 0x4
+.field public static final enum avk:I = 0x4
 
-.field public static final enum auT:I = 0x5
+.field public static final enum avl:I = 0x5
 
-.field public static final enum auU:I = 0x6
+.field public static final enum avm:I = 0x6
 
-.field public static final enum auV:I = 0x7
+.field public static final enum avn:I = 0x7
 
-.field private static final synthetic auW:[I
+.field private static final synthetic avo:[I
 
-.field public static final enum auX:I = 0x1
+.field public static final enum avp:I = 0x1
 
-.field public static final enum auY:I = 0x2
+.field public static final enum avq:I = 0x2
 
-.field private static final synthetic auZ:[I
+.field private static final synthetic avr:[I
 
-.field public static final enum ava:I = 0x1
+.field public static final enum avs:I = 0x1
 
-.field public static final enum avb:I = 0x2
+.field public static final enum avt:I = 0x2
 
-.field private static final synthetic avc:[I
+.field private static final synthetic avu:[I
 
 
 # direct methods
@@ -57,81 +57,81 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auP:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avh:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auQ:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avi:I
 
     const/4 v3, 0x1
 
     aput v1, v0, v3
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auR:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avj:I
 
     const/4 v4, 0x2
 
     aput v1, v0, v4
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auS:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avk:I
 
     const/4 v5, 0x3
 
     aput v1, v0, v5
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auT:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avl:I
 
     const/4 v5, 0x4
 
     aput v1, v0, v5
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auU:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avm:I
 
     const/4 v5, 0x5
 
     aput v1, v0, v5
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auV:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avn:I
 
     const/4 v5, 0x6
 
     aput v1, v0, v5
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dr$d;->auW:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dr$d;->avo:[I
 
     new-array v0, v4, [I
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auX:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avp:I
 
     aput v1, v0, v2
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auY:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avq:I
 
     aput v1, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dr$d;->auZ:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dr$d;->avr:[I
 
     new-array v0, v4, [I
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->ava:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avs:I
 
     aput v1, v0, v2
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avb:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avt:I
 
     aput v1, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dr$d;->avc:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dr$d;->avu:[I
 
     return-void
 .end method
 
-.method public static sp()[I
+.method public static sn()[I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dr$d;->auW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dr$d;->avo:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr.smali
index acbef4c414..45f5adb753 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dr.smali
@@ -63,7 +63,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/bz;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tn()Lcom/google/android/gms/internal/measurement/gl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tl()Lcom/google/android/gms/internal/measurement/gl;
 
     move-result-object v0
 
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auS:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avk:I
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -104,7 +104,7 @@
     check-cast p0, Lcom/google/android/gms/internal/measurement/dr;
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object v0
 
@@ -118,7 +118,7 @@
 
     invoke-interface {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/fq;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/fr;Lcom/google/android/gms/internal/measurement/de;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr;->qS()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr;->qQ()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
@@ -198,7 +198,7 @@
         }
     .end annotation
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auS:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avk:I
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -207,7 +207,7 @@
     check-cast p0, Lcom/google/android/gms/internal/measurement/dr;
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object v0
 
@@ -229,7 +229,7 @@
 
     invoke-interface/range {v0 .. v5}, Lcom/google/android/gms/internal/measurement/fq;->a(Ljava/lang/Object;[BIILcom/google/android/gms/internal/measurement/ce;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr;->qS()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dr;->qQ()V
 
     iget p1, p0, Lcom/google/android/gms/internal/measurement/dr;->zzact:I
 
@@ -248,7 +248,7 @@
     .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -503,7 +503,7 @@
         }
     .end annotation
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auP:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avh:I
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -529,7 +529,7 @@
     return p0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object v0
 
@@ -543,7 +543,7 @@
 
     if-eqz p1, :cond_2
 
-    sget p1, Lcom/google/android/gms/internal/measurement/dr$d;->auQ:I
+    sget p1, Lcom/google/android/gms/internal/measurement/dr$d;->avi:I
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -619,7 +619,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dr;
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->auU:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avm:I
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -657,7 +657,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object v0
 
@@ -669,11 +669,11 @@
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/cy;->asY:Lcom/google/android/gms/internal/measurement/db;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/cy;->atq:Lcom/google/android/gms/internal/measurement/db;
 
     if-eqz v1, :cond_0
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/cy;->asY:Lcom/google/android/gms/internal/measurement/db;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/cy;->atq:Lcom/google/android/gms/internal/measurement/db;
 
     goto :goto_0
 
@@ -711,7 +711,7 @@
     return p1
 
     :cond_0
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auU:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avm:I
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -734,7 +734,7 @@
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object v0
 
@@ -763,7 +763,7 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object v0
 
@@ -794,7 +794,7 @@
     return v0
 .end method
 
-.method final qN()I
+.method final qL()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/dr;->zzaia:I
@@ -802,10 +802,10 @@
     return v0
 .end method
 
-.method protected final qS()V
+.method protected final qQ()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object v0
 
@@ -818,7 +818,7 @@
     return-void
 .end method
 
-.method protected final sd()Lcom/google/android/gms/internal/measurement/dr$a;
+.method protected final sb()Lcom/google/android/gms/internal/measurement/dr$a;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -830,7 +830,7 @@
         }
     .end annotation
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auT:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avl:I
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -841,7 +841,7 @@
     return-object v0
 .end method
 
-.method public final se()Lcom/google/android/gms/internal/measurement/dr$a;
+.method public final sc()Lcom/google/android/gms/internal/measurement/dr$a;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -849,7 +849,7 @@
         }
     .end annotation
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auT:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avl:I
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -862,7 +862,7 @@
     return-object v0
 .end method
 
-.method public final sf()I
+.method public final sd()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/dr;->zzaia:I
@@ -871,7 +871,7 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object v0
 
@@ -891,10 +891,10 @@
     return v0
 .end method
 
-.method public final synthetic sg()Lcom/google/android/gms/internal/measurement/fa;
+.method public final synthetic se()Lcom/google/android/gms/internal/measurement/fa;
     .locals 1
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auT:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avl:I
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -907,10 +907,10 @@
     return-object v0
 .end method
 
-.method public final synthetic sh()Lcom/google/android/gms/internal/measurement/fa;
+.method public final synthetic sf()Lcom/google/android/gms/internal/measurement/fa;
     .locals 1
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auT:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avl:I
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
@@ -921,10 +921,10 @@
     return-object v0
 .end method
 
-.method public final synthetic si()Lcom/google/android/gms/internal/measurement/fb;
+.method public final synthetic sg()Lcom/google/android/gms/internal/measurement/fb;
     .locals 1
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auU:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avm:I
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ds.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ds.smali
index 278374a593..980f52df24 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ds.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ds.smali
@@ -7,11 +7,11 @@
 
 .field static final UTF_8:Ljava/nio/charset/Charset;
 
-.field public static final avd:[B
+.field public static final avv:[B
 
-.field private static final ave:Ljava/nio/ByteBuffer;
+.field private static final avw:Ljava/nio/ByteBuffer;
 
-.field private static final avf:Lcom/google/android/gms/internal/measurement/cv;
+.field private static final avx:Lcom/google/android/gms/internal/measurement/cv;
 
 
 # direct methods
@@ -38,15 +38,15 @@
 
     new-array v1, v0, [B
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ds;->avd:[B
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ds;->avv:[B
 
     invoke-static {v1}, Ljava/nio/ByteBuffer;->wrap([B)Ljava/nio/ByteBuffer;
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ds;->ave:Ljava/nio/ByteBuffer;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ds;->avw:Ljava/nio/ByteBuffer;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ds;->avd:[B
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ds;->avv:[B
 
     array-length v2, v1
 
@@ -54,12 +54,12 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ds;->avf:Lcom/google/android/gms/internal/measurement/cv;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ds;->avx:Lcom/google/android/gms/internal/measurement/cv;
 
     return-void
 .end method
 
-.method public static N(Z)I
+.method public static L(Z)I
     .locals 0
 
     if-eqz p0, :cond_0
@@ -165,7 +165,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/fb;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fb;->sg()Lcom/google/android/gms/internal/measurement/fa;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fb;->se()Lcom/google/android/gms/internal/measurement/fa;
 
     move-result-object p0
 
@@ -175,7 +175,7 @@
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fa;->sm()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fa;->sk()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object p0
 
@@ -223,7 +223,7 @@
     return-object v0
 .end method
 
-.method static sq()Z
+.method static so()Z
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/du.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/du.smali
index c7f01e7516..82e410b630 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/du.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/du.smali
@@ -21,11 +21,11 @@
 
 
 # static fields
-.field private static final avg:Lcom/google/android/gms/internal/measurement/du;
+.field private static final avy:Lcom/google/android/gms/internal/measurement/du;
 
 
 # instance fields
-.field private avh:[I
+.field private avz:[I
 
 .field private size:I
 
@@ -42,7 +42,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/internal/measurement/du;-><init>([II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/du;->avg:Lcom/google/android/gms/internal/measurement/du;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/du;->avy:Lcom/google/android/gms/internal/measurement/du;
 
     iput-boolean v1, v0, Lcom/google/android/gms/internal/measurement/cd;->zzacz:Z
 
@@ -68,17 +68,17 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cd;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     iput p2, p0, Lcom/google/android/gms/internal/measurement/du;->size:I
 
     return-void
 .end method
 
-.method private final J(II)V
+.method private final I(II)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     if-ltz p1, :cond_1
 
@@ -86,7 +86,7 @@
 
     if-gt p1, v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     array-length v2, v1
 
@@ -113,7 +113,7 @@
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     add-int/lit8 v2, p1, 0x1
 
@@ -123,10 +123,10 @@
 
     invoke-static {v1, p1, v0, v2, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     aput p2, v0, p1
 
@@ -209,10 +209,10 @@
     return-object p1
 .end method
 
-.method public static sr()Lcom/google/android/gms/internal/measurement/du;
+.method public static sp()Lcom/google/android/gms/internal/measurement/du;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/du;->avg:Lcom/google/android/gms/internal/measurement/du;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/du;->avy:Lcom/google/android/gms/internal/measurement/du;
 
     return-object v0
 .end method
@@ -228,7 +228,7 @@
 
     move-result p2
 
-    invoke-direct {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/du;->J(II)V
+    invoke-direct {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/du;->I(II)V
 
     return-void
 .end method
@@ -245,7 +245,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/ds;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -281,7 +281,7 @@
 
     add-int/2addr v3, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     array-length v2, v0
 
@@ -291,12 +291,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/du;->size:I
 
@@ -343,7 +343,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/du;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->copyOf([II)[I
 
@@ -368,7 +368,7 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/du;->size:I
 
-    invoke-direct {p0, v0, p1}, Lcom/google/android/gms/internal/measurement/du;->J(II)V
+    invoke-direct {p0, v0, p1}, Lcom/google/android/gms/internal/measurement/du;->I(II)V
 
     return-void
 .end method
@@ -407,7 +407,7 @@
     return v3
 
     :cond_2
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     const/4 v1, 0x0
 
@@ -416,7 +416,7 @@
 
     if-ge v1, v2, :cond_4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     aget v2, v2, v1
 
@@ -454,7 +454,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/du;->bH(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     aget p1, v0, p1
 
@@ -475,7 +475,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     aget v2, v2, v1
 
@@ -492,11 +492,11 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/du;->bH(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     aget v1, v0, p1
 
@@ -537,7 +537,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     const/4 v0, 0x0
 
@@ -548,7 +548,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     aget v2, v2, v1
 
@@ -562,7 +562,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     add-int/lit8 v0, v1, 0x1
 
@@ -602,11 +602,11 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/du;->size:I
 
@@ -649,11 +649,11 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/du;->bH(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avh:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/du;->avz:[I
 
     aget v1, v0, p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw.smali
index 541c464291..c4c704c4a6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract oU()I
+.method public abstract oS()I
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dz.smali
index 3254546c7a..b25eb64b6c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dz.smali
@@ -31,8 +31,8 @@
     .end annotation
 .end method
 
-.method public abstract qR()Z
+.method public abstract qP()Z
 .end method
 
-.method public abstract qS()V
+.method public abstract qQ()V
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/e.smali
index a9d27da78b..2be6677014 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/e.smali
@@ -1,18 +1,18 @@
-.class public final Lcom/google/android/gms/internal/measurement/e;
+.class final Lcom/google/android/gms/internal/measurement/e;
 .super Lcom/google/android/gms/internal/measurement/lw$a;
 
 
 # instance fields
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
 .field private final synthetic val$id:Ljava/lang/String;
 
 
 # direct methods
-.method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/String;)V
+.method constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/e;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/e;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/e;->val$id:Ljava/lang/String;
 
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -31,7 +31,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/e;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/e;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ec.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ec.smali
index 44bb3cd6c9..3b6a1fe8c9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ec.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ec.smali
@@ -19,19 +19,7 @@
     return-void
 .end method
 
-.method static sA()Lcom/google/android/gms/internal/measurement/ec;
-    .locals 2
-
-    new-instance v0, Lcom/google/android/gms/internal/measurement/ec;
-
-    const-string v1, "Protocol message had invalid UTF-8."
-
-    invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/ec;-><init>(Ljava/lang/String;)V
-
-    return-object v0
-.end method
-
-.method static ss()Lcom/google/android/gms/internal/measurement/ec;
+.method static sq()Lcom/google/android/gms/internal/measurement/ec;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ec;
@@ -43,7 +31,7 @@
     return-object v0
 .end method
 
-.method static st()Lcom/google/android/gms/internal/measurement/ec;
+.method static sr()Lcom/google/android/gms/internal/measurement/ec;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ec;
@@ -55,7 +43,7 @@
     return-object v0
 .end method
 
-.method static su()Lcom/google/android/gms/internal/measurement/ec;
+.method static ss()Lcom/google/android/gms/internal/measurement/ec;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ec;
@@ -67,7 +55,7 @@
     return-object v0
 .end method
 
-.method static sv()Lcom/google/android/gms/internal/measurement/ec;
+.method static st()Lcom/google/android/gms/internal/measurement/ec;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ec;
@@ -79,7 +67,7 @@
     return-object v0
 .end method
 
-.method static sw()Lcom/google/android/gms/internal/measurement/ec;
+.method static su()Lcom/google/android/gms/internal/measurement/ec;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ec;
@@ -91,7 +79,7 @@
     return-object v0
 .end method
 
-.method static sx()Lcom/google/android/gms/internal/measurement/eb;
+.method static sv()Lcom/google/android/gms/internal/measurement/eb;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/eb;
@@ -103,7 +91,7 @@
     return-object v0
 .end method
 
-.method static sy()Lcom/google/android/gms/internal/measurement/ec;
+.method static sw()Lcom/google/android/gms/internal/measurement/ec;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ec;
@@ -115,7 +103,7 @@
     return-object v0
 .end method
 
-.method static sz()Lcom/google/android/gms/internal/measurement/ec;
+.method static sx()Lcom/google/android/gms/internal/measurement/ec;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ec;
@@ -126,3 +114,15 @@
 
     return-object v0
 .end method
+
+.method static sy()Lcom/google/android/gms/internal/measurement/ec;
+    .locals 2
+
+    new-instance v0, Lcom/google/android/gms/internal/measurement/ec;
+
+    const-string v1, "Protocol message had invalid UTF-8."
+
+    invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/ec;-><init>(Ljava/lang/String;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ed.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ed.smali
index bac1d95e9d..d061723c28 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ed.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ed.smali
@@ -3,7 +3,7 @@
 
 
 # direct methods
-.method public static sB()Lcom/google/android/gms/internal/measurement/fb;
+.method public static sz()Lcom/google/android/gms/internal/measurement/fb;
     .locals 1
 
     new-instance v0, Ljava/lang/NoSuchMethodError;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ee.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ee.smali
index b945c8e50a..b6ce9a7565 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ee.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ee.smali
@@ -13,27 +13,27 @@
 
 
 # static fields
-.field public static final enum avi:Lcom/google/android/gms/internal/measurement/ee;
+.field public static final enum avA:Lcom/google/android/gms/internal/measurement/ee;
 
-.field public static final enum avj:Lcom/google/android/gms/internal/measurement/ee;
+.field public static final enum avB:Lcom/google/android/gms/internal/measurement/ee;
 
-.field public static final enum avk:Lcom/google/android/gms/internal/measurement/ee;
+.field public static final enum avC:Lcom/google/android/gms/internal/measurement/ee;
 
-.field public static final enum avl:Lcom/google/android/gms/internal/measurement/ee;
+.field public static final enum avD:Lcom/google/android/gms/internal/measurement/ee;
 
-.field public static final enum avm:Lcom/google/android/gms/internal/measurement/ee;
+.field public static final enum avE:Lcom/google/android/gms/internal/measurement/ee;
 
-.field public static final enum avn:Lcom/google/android/gms/internal/measurement/ee;
+.field public static final enum avF:Lcom/google/android/gms/internal/measurement/ee;
 
-.field public static final enum avo:Lcom/google/android/gms/internal/measurement/ee;
+.field public static final enum avG:Lcom/google/android/gms/internal/measurement/ee;
 
-.field public static final enum avp:Lcom/google/android/gms/internal/measurement/ee;
+.field public static final enum avH:Lcom/google/android/gms/internal/measurement/ee;
 
-.field public static final enum avq:Lcom/google/android/gms/internal/measurement/ee;
+.field public static final enum avI:Lcom/google/android/gms/internal/measurement/ee;
 
-.field public static final enum avr:Lcom/google/android/gms/internal/measurement/ee;
+.field public static final enum avJ:Lcom/google/android/gms/internal/measurement/ee;
 
-.field private static final synthetic avs:[Lcom/google/android/gms/internal/measurement/ee;
+.field private static final synthetic avK:[Lcom/google/android/gms/internal/measurement/ee;
 
 
 # instance fields
@@ -78,7 +78,7 @@
 
     invoke-direct/range {v0 .. v5}, Lcom/google/android/gms/internal/measurement/ee;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v6, Lcom/google/android/gms/internal/measurement/ee;->avi:Lcom/google/android/gms/internal/measurement/ee;
+    sput-object v6, Lcom/google/android/gms/internal/measurement/ee;->avA:Lcom/google/android/gms/internal/measurement/ee;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ee;
 
@@ -100,7 +100,7 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/ee;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ee;
 
@@ -122,7 +122,7 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/internal/measurement/ee;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ee;
 
@@ -144,7 +144,7 @@
 
     invoke-direct/range {v8 .. v13}, Lcom/google/android/gms/internal/measurement/ee;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avl:Lcom/google/android/gms/internal/measurement/ee;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avD:Lcom/google/android/gms/internal/measurement/ee;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ee;
 
@@ -166,7 +166,7 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/internal/measurement/ee;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avm:Lcom/google/android/gms/internal/measurement/ee;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avE:Lcom/google/android/gms/internal/measurement/ee;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ee;
 
@@ -184,7 +184,7 @@
 
     invoke-direct/range {v8 .. v13}, Lcom/google/android/gms/internal/measurement/ee;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avn:Lcom/google/android/gms/internal/measurement/ee;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avF:Lcom/google/android/gms/internal/measurement/ee;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ee;
 
@@ -202,7 +202,7 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/internal/measurement/ee;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avo:Lcom/google/android/gms/internal/measurement/ee;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avG:Lcom/google/android/gms/internal/measurement/ee;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ee;
 
@@ -210,7 +210,7 @@
 
     const-class v12, Lcom/google/android/gms/internal/measurement/cj;
 
-    sget-object v13, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sget-object v13, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
     const-string v9, "BYTE_STRING"
 
@@ -220,7 +220,7 @@
 
     invoke-direct/range {v8 .. v13}, Lcom/google/android/gms/internal/measurement/ee;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avp:Lcom/google/android/gms/internal/measurement/ee;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avH:Lcom/google/android/gms/internal/measurement/ee;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ee;
 
@@ -238,7 +238,7 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/internal/measurement/ee;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avq:Lcom/google/android/gms/internal/measurement/ee;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avI:Lcom/google/android/gms/internal/measurement/ee;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ee;
 
@@ -256,71 +256,71 @@
 
     invoke-direct/range {v8 .. v13}, Lcom/google/android/gms/internal/measurement/ee;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avr:Lcom/google/android/gms/internal/measurement/ee;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avJ:Lcom/google/android/gms/internal/measurement/ee;
 
     const/16 v0, 0xa
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/ee;
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ee;->avi:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ee;->avA:Lcom/google/android/gms/internal/measurement/ee;
 
     aput-object v2, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avj:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avB:Lcom/google/android/gms/internal/measurement/ee;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avk:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avC:Lcom/google/android/gms/internal/measurement/ee;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avl:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avD:Lcom/google/android/gms/internal/measurement/ee;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avm:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avE:Lcom/google/android/gms/internal/measurement/ee;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avn:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avF:Lcom/google/android/gms/internal/measurement/ee;
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avo:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avG:Lcom/google/android/gms/internal/measurement/ee;
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avp:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avH:Lcom/google/android/gms/internal/measurement/ee;
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avq:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avI:Lcom/google/android/gms/internal/measurement/ee;
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avr:Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ee;->avJ:Lcom/google/android/gms/internal/measurement/ee;
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avs:[Lcom/google/android/gms/internal/measurement/ee;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ee;->avK:[Lcom/google/android/gms/internal/measurement/ee;
 
     return-void
 .end method
@@ -353,7 +353,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/ee;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ee;->avs:[Lcom/google/android/gms/internal/measurement/ee;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ee;->avK:[Lcom/google/android/gms/internal/measurement/ee;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/ee;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ef.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ef.smali
index 09797ff635..a30bb03892 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ef.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ef.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field avt:Ljava/util/Map$Entry;
+.field avL:Ljava/util/Map$Entry;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map$Entry<",
@@ -48,7 +48,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ef;->avt:Ljava/util/Map$Entry;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ef;->avL:Ljava/util/Map$Entry;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ef;->avt:Ljava/util/Map$Entry;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ef;->avL:Ljava/util/Map$Entry;
 
     invoke-interface {v0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -83,7 +83,7 @@
 .method public final getValue()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ef;->avt:Ljava/util/Map$Entry;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ef;->avL:Ljava/util/Map$Entry;
 
     invoke-interface {v0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
@@ -98,7 +98,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ed;->sB()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ed;->sz()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v0
 
@@ -112,7 +112,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ef;->avt:Ljava/util/Map$Entry;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ef;->avL:Ljava/util/Map$Entry;
 
     invoke-interface {v0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
@@ -122,15 +122,15 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/fb;
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/eg;->avv:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/eg;->avN:Lcom/google/android/gms/internal/measurement/fb;
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lcom/google/android/gms/internal/measurement/eg;->avu:Lcom/google/android/gms/internal/measurement/cj;
+    iput-object v2, v0, Lcom/google/android/gms/internal/measurement/eg;->avM:Lcom/google/android/gms/internal/measurement/cj;
 
-    iput-object v2, v0, Lcom/google/android/gms/internal/measurement/eg;->avw:Lcom/google/android/gms/internal/measurement/cj;
+    iput-object v2, v0, Lcom/google/android/gms/internal/measurement/eg;->avO:Lcom/google/android/gms/internal/measurement/cj;
 
-    iput-object p1, v0, Lcom/google/android/gms/internal/measurement/eg;->avv:Lcom/google/android/gms/internal/measurement/fb;
+    iput-object p1, v0, Lcom/google/android/gms/internal/measurement/eg;->avN:Lcom/google/android/gms/internal/measurement/fb;
 
     return-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eg.smali
index c5b10ba5c5..6464aac962 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eg.smali
@@ -3,26 +3,26 @@
 
 
 # static fields
-.field private static final asw:Lcom/google/android/gms/internal/measurement/de;
+.field private static final asO:Lcom/google/android/gms/internal/measurement/de;
 
 
 # instance fields
-.field avu:Lcom/google/android/gms/internal/measurement/cj;
+.field avM:Lcom/google/android/gms/internal/measurement/cj;
 
-.field volatile avv:Lcom/google/android/gms/internal/measurement/fb;
+.field volatile avN:Lcom/google/android/gms/internal/measurement/fb;
 
-.field volatile avw:Lcom/google/android/gms/internal/measurement/cj;
+.field volatile avO:Lcom/google/android/gms/internal/measurement/cj;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rM()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rK()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/eg;->asw:Lcom/google/android/gms/internal/measurement/de;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/eg;->asO:Lcom/google/android/gms/internal/measurement/de;
 
     return-void
 .end method
@@ -38,14 +38,14 @@
 .method private final f(Lcom/google/android/gms/internal/measurement/fb;)Lcom/google/android/gms/internal/measurement/fb;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avv:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avN:Lcom/google/android/gms/internal/measurement/fb;
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avv:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avN:Lcom/google/android/gms/internal/measurement/fb;
 
     if-eqz v0, :cond_0
 
@@ -57,11 +57,11 @@
 
     :cond_0
     :try_start_1
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eg;->avv:Lcom/google/android/gms/internal/measurement/fb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eg;->avN:Lcom/google/android/gms/internal/measurement/fb;
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avw:Lcom/google/android/gms/internal/measurement/cj;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avO:Lcom/google/android/gms/internal/measurement/cj;
     :try_end_1
     .catch Lcom/google/android/gms/internal/measurement/ec; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -70,11 +70,11 @@
 
     :catch_0
     :try_start_2
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eg;->avv:Lcom/google/android/gms/internal/measurement/fb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eg;->avN:Lcom/google/android/gms/internal/measurement/fb;
 
-    sget-object p1, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eg;->avw:Lcom/google/android/gms/internal/measurement/cj;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eg;->avO:Lcom/google/android/gms/internal/measurement/cj;
 
     :goto_0
     monitor-exit p0
@@ -92,7 +92,7 @@
 
     :cond_1
     :goto_1
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/eg;->avv:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/eg;->avN:Lcom/google/android/gms/internal/measurement/fb;
 
     return-object p1
 .end method
@@ -120,19 +120,19 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/internal/measurement/eg;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avv:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avN:Lcom/google/android/gms/internal/measurement/fb;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/eg;->avv:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/eg;->avN:Lcom/google/android/gms/internal/measurement/fb;
 
     if-nez v0, :cond_2
 
     if-nez v1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eg;->qM()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/eg;->qK()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/eg;->qM()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/eg;->qK()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object p1
 
@@ -156,7 +156,7 @@
     :cond_3
     if-eqz v0, :cond_4
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fb;->si()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fb;->sg()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v1
 
@@ -171,7 +171,7 @@
     return p1
 
     :cond_4
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fb;->si()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fb;->sg()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object p1
 
@@ -194,14 +194,14 @@
     return v0
 .end method
 
-.method public final qM()Lcom/google/android/gms/internal/measurement/cj;
+.method public final qK()Lcom/google/android/gms/internal/measurement/cj;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avw:Lcom/google/android/gms/internal/measurement/cj;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avO:Lcom/google/android/gms/internal/measurement/cj;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avw:Lcom/google/android/gms/internal/measurement/cj;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avO:Lcom/google/android/gms/internal/measurement/cj;
 
     return-object v0
 
@@ -209,38 +209,38 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avw:Lcom/google/android/gms/internal/measurement/cj;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avO:Lcom/google/android/gms/internal/measurement/cj;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avw:Lcom/google/android/gms/internal/measurement/cj;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avO:Lcom/google/android/gms/internal/measurement/cj;
 
     monitor-exit p0
 
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avv:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avN:Lcom/google/android/gms/internal/measurement/fb;
 
     if-nez v0, :cond_2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avw:Lcom/google/android/gms/internal/measurement/cj;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avO:Lcom/google/android/gms/internal/measurement/cj;
 
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avv:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avN:Lcom/google/android/gms/internal/measurement/fb;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fb;->qM()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fb;->qK()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avw:Lcom/google/android/gms/internal/measurement/cj;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avO:Lcom/google/android/gms/internal/measurement/cj;
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avw:Lcom/google/android/gms/internal/measurement/cj;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avO:Lcom/google/android/gms/internal/measurement/cj;
 
     monitor-exit p0
 
@@ -256,14 +256,14 @@
     throw v0
 .end method
 
-.method public final sf()I
+.method public final sd()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avw:Lcom/google/android/gms/internal/measurement/cj;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avO:Lcom/google/android/gms/internal/measurement/cj;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avw:Lcom/google/android/gms/internal/measurement/cj;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avO:Lcom/google/android/gms/internal/measurement/cj;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cj;->size()I
 
@@ -272,13 +272,13 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avv:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avN:Lcom/google/android/gms/internal/measurement/fb;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avv:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eg;->avN:Lcom/google/android/gms/internal/measurement/fb;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fb;->sf()I
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fb;->sd()I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eh.smali
index 847181fad1..bb94ff3344 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eh.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field private avx:Ljava/util/Iterator;
+.field private avP:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -51,7 +51,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eh;->avx:Ljava/util/Iterator;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eh;->avP:Ljava/util/Iterator;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 .method public final hasNext()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eh;->avx:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eh;->avP:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -73,7 +73,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eh;->avx:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eh;->avP:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -104,7 +104,7 @@
 .method public final remove()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eh;->avx:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eh;->avP:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->remove()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ei.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ei.smali
index 36e4250f38..3598690f40 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ei.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ei.smali
@@ -12,7 +12,7 @@
 .method public abstract cv(I)Ljava/lang/Object;
 .end method
 
-.method public abstract sC()Ljava/util/List;
+.method public abstract sA()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -22,5 +22,5 @@
     .end annotation
 .end method
 
-.method public abstract sD()Lcom/google/android/gms/internal/measurement/ei;
+.method public abstract sB()Lcom/google/android/gms/internal/measurement/ei;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ej.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ej.smali
index a4ec9cc584..2b2e325a41 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ej.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ej.smali
@@ -19,13 +19,13 @@
 
 
 # static fields
-.field private static final avy:Lcom/google/android/gms/internal/measurement/ej;
+.field private static final avQ:Lcom/google/android/gms/internal/measurement/ej;
 
-.field private static final avz:Lcom/google/android/gms/internal/measurement/ei;
+.field private static final avR:Lcom/google/android/gms/internal/measurement/ei;
 
 
 # instance fields
-.field private final avA:Ljava/util/List;
+.field private final avS:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -44,15 +44,15 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ej;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avy:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
 
     const/4 v1, 0x0
 
     iput-boolean v1, v0, Lcom/google/android/gms/internal/measurement/cd;->zzacz:Z
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ej;->avy:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avz:Lcom/google/android/gms/internal/measurement/ei;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ei;
 
     return-void
 .end method
@@ -92,7 +92,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cd;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     return-void
 .end method
@@ -115,7 +115,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/cj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cj;->qU()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cj;->qS()Ljava/lang/String;
 
     move-result-object p0
 
@@ -138,9 +138,9 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1, p2}, Ljava/util/List;->add(ILjava/lang/Object;)V
 
@@ -165,7 +165,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     instance-of v0, p2, Lcom/google/android/gms/internal/measurement/ei;
 
@@ -173,12 +173,12 @@
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/ei;
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/ei;->sC()Ljava/util/List;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/ei;->sA()Ljava/util/List;
 
     move-result-object p2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1, p2}, Ljava/util/List;->addAll(ILjava/util/Collection;)Z
 
@@ -229,7 +229,7 @@
 
     invoke-direct {v0, p1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
@@ -250,9 +250,9 @@
 .method public final c(Lcom/google/android/gms/internal/measurement/cj;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -268,9 +268,9 @@
 .method public final clear()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
@@ -286,7 +286,7 @@
 .method public final cv(I)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -308,7 +308,7 @@
 .method public final synthetic get(I)Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -329,17 +329,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/cj;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cj;->qU()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cj;->qS()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cj;->qV()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cj;->qT()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1, v1}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -359,7 +359,7 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1, v1}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -377,10 +377,10 @@
     return v0
 .end method
 
-.method public final bridge synthetic qR()Z
+.method public final bridge synthetic qP()Z
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()Z
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/cd;->qP()Z
 
     move-result v0
 
@@ -390,9 +390,9 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
@@ -441,7 +441,7 @@
     return p1
 .end method
 
-.method public final sC()Ljava/util/List;
+.method public final sA()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -451,7 +451,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     invoke-static {v0}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
 
@@ -460,10 +460,10 @@
     return-object v0
 .end method
 
-.method public final sD()Lcom/google/android/gms/internal/measurement/ei;
+.method public final sB()Lcom/google/android/gms/internal/measurement/ei;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qP()Z
 
     move-result v0
 
@@ -484,9 +484,9 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1, p2}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -502,7 +502,7 @@
 .method public final size()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ej;->avS:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ek.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ek.smali
index a19d05cfd0..da701c8f08 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ek.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ek.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field private static final avB:Lcom/google/android/gms/internal/measurement/ek;
+.field private static final avT:Lcom/google/android/gms/internal/measurement/ek;
 
-.field private static final avC:Lcom/google/android/gms/internal/measurement/ek;
+.field private static final avU:Lcom/google/android/gms/internal/measurement/ek;
 
 
 # direct methods
@@ -18,13 +18,13 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/em;-><init>(B)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ek;->avB:Lcom/google/android/gms/internal/measurement/ek;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ek;->avT:Lcom/google/android/gms/internal/measurement/ek;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/el;
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/el;-><init>(B)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ek;->avC:Lcom/google/android/gms/internal/measurement/ek;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ek;->avU:Lcom/google/android/gms/internal/measurement/ek;
 
     return-void
 .end method
@@ -45,18 +45,18 @@
     return-void
 .end method
 
-.method static sE()Lcom/google/android/gms/internal/measurement/ek;
+.method static sC()Lcom/google/android/gms/internal/measurement/ek;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ek;->avB:Lcom/google/android/gms/internal/measurement/ek;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ek;->avT:Lcom/google/android/gms/internal/measurement/ek;
 
     return-object v0
 .end method
 
-.method static sF()Lcom/google/android/gms/internal/measurement/ek;
+.method static sD()Lcom/google/android/gms/internal/measurement/ek;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ek;->avC:Lcom/google/android/gms/internal/measurement/ek;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ek;->avU:Lcom/google/android/gms/internal/measurement/ek;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/el.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/el.smali
index 1ed203c4be..c11b991f9c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/el.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/el.smali
@@ -66,7 +66,7 @@
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v1
 
@@ -129,7 +129,7 @@
 
     if-lez v2, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v3
 
@@ -162,7 +162,7 @@
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dz;->qS()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dz;->qQ()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/em.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/em.smali
index 4c70431b9c..8752332970 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/em.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/em.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final avD:Ljava/lang/Class;
+.field private static final avV:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -29,7 +29,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/em;->avD:Ljava/lang/Class;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/em;->avV:Ljava/lang/Class;
 
     return-void
 .end method
@@ -118,7 +118,7 @@
     goto :goto_2
 
     :cond_2
-    sget-object v1, Lcom/google/android/gms/internal/measurement/em;->avD:Ljava/lang/Class;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/em;->avV:Ljava/lang/Class;
 
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -185,7 +185,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v2
 
@@ -323,14 +323,14 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ei;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ei;->sD()Lcom/google/android/gms/internal/measurement/ei;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ei;->sB()Lcom/google/android/gms/internal/measurement/ei;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/em;->avD:Ljava/lang/Class;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/em;->avV:Ljava/lang/Class;
 
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -355,13 +355,13 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qS()V
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qQ()V
 
     :cond_2
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/en.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/en.smali
index 4f16a6f48e..1aaccfbd0e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/en.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/en.smali
@@ -6,11 +6,11 @@
 
 
 # static fields
-.field private static final avF:Lcom/google/android/gms/internal/measurement/ey;
+.field private static final avX:Lcom/google/android/gms/internal/measurement/ey;
 
 
 # instance fields
-.field private final avE:Lcom/google/android/gms/internal/measurement/ey;
+.field private final avW:Lcom/google/android/gms/internal/measurement/ey;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/eq;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/en;->avF:Lcom/google/android/gms/internal/measurement/ey;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/en;->avX:Lcom/google/android/gms/internal/measurement/ey;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 
     new-array v1, v1, [Lcom/google/android/gms/internal/measurement/ey;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dp;->sb()Lcom/google/android/gms/internal/measurement/dp;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dp;->rZ()Lcom/google/android/gms/internal/measurement/dp;
 
     move-result-object v2
 
@@ -43,7 +43,7 @@
 
     aput-object v2, v1, v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/en;->sG()Lcom/google/android/gms/internal/measurement/ey;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/en;->sE()Lcom/google/android/gms/internal/measurement/ey;
 
     move-result-object v2
 
@@ -71,7 +71,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/ey;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/en;->avE:Lcom/google/android/gms/internal/measurement/ey;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/en;->avW:Lcom/google/android/gms/internal/measurement/ey;
 
     return-void
 .end method
@@ -79,11 +79,11 @@
 .method private static a(Lcom/google/android/gms/internal/measurement/ez;)Z
     .locals 1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/ez;->sQ()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/ez;->sO()I
 
     move-result p0
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auX:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avp:I
 
     if-ne p0, v0, :cond_0
 
@@ -97,7 +97,7 @@
     return p0
 .end method
 
-.method private static sG()Lcom/google/android/gms/internal/measurement/ey;
+.method private static sE()Lcom/google/android/gms/internal/measurement/ey;
     .locals 4
 
     :try_start_0
@@ -132,7 +132,7 @@
     return-object v0
 
     :catch_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/en;->avF:Lcom/google/android/gms/internal/measurement/ey;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/en;->avX:Lcom/google/android/gms/internal/measurement/ey;
 
     return-object v0
 .end method
@@ -155,13 +155,13 @@
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/fs;->u(Ljava/lang/Class;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/en;->avE:Lcom/google/android/gms/internal/measurement/ey;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/en;->avW:Lcom/google/android/gms/internal/measurement/ey;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/internal/measurement/ey;->p(Ljava/lang/Class;)Lcom/google/android/gms/internal/measurement/ez;
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ez;->sR()Z
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ez;->sP()Z
 
     move-result v0
 
@@ -175,15 +175,15 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->tb()Lcom/google/android/gms/internal/measurement/gi;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->sZ()Lcom/google/android/gms/internal/measurement/gi;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->rT()Lcom/google/android/gms/internal/measurement/dg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->rR()Lcom/google/android/gms/internal/measurement/dg;
 
     move-result-object v0
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ez;->sS()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ez;->sQ()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v1
 
@@ -194,15 +194,15 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->sZ()Lcom/google/android/gms/internal/measurement/gi;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->sX()Lcom/google/android/gms/internal/measurement/gi;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->rU()Lcom/google/android/gms/internal/measurement/dg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->rS()Lcom/google/android/gms/internal/measurement/dg;
 
     move-result-object v0
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ez;->sS()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ez;->sQ()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v1
 
@@ -227,23 +227,23 @@
 
     if-eqz p1, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fl;->sV()Lcom/google/android/gms/internal/measurement/fj;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fl;->sT()Lcom/google/android/gms/internal/measurement/fj;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ek;->sF()Lcom/google/android/gms/internal/measurement/ek;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ek;->sD()Lcom/google/android/gms/internal/measurement/ek;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->tb()Lcom/google/android/gms/internal/measurement/gi;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->sZ()Lcom/google/android/gms/internal/measurement/gi;
 
     move-result-object v4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->rT()Lcom/google/android/gms/internal/measurement/dg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->rR()Lcom/google/android/gms/internal/measurement/dg;
 
     move-result-object v5
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ew;->sO()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ew;->sM()Lcom/google/android/gms/internal/measurement/eu;
 
     move-result-object v6
 
@@ -254,21 +254,21 @@
     return-object p1
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fl;->sV()Lcom/google/android/gms/internal/measurement/fj;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fl;->sT()Lcom/google/android/gms/internal/measurement/fj;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ek;->sF()Lcom/google/android/gms/internal/measurement/ek;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ek;->sD()Lcom/google/android/gms/internal/measurement/ek;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->tb()Lcom/google/android/gms/internal/measurement/gi;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->sZ()Lcom/google/android/gms/internal/measurement/gi;
 
     move-result-object v4
 
     const/4 v5, 0x0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ew;->sO()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ew;->sM()Lcom/google/android/gms/internal/measurement/eu;
 
     move-result-object v6
 
@@ -285,23 +285,23 @@
 
     if-eqz p1, :cond_4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fl;->sU()Lcom/google/android/gms/internal/measurement/fj;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fl;->sS()Lcom/google/android/gms/internal/measurement/fj;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ek;->sE()Lcom/google/android/gms/internal/measurement/ek;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ek;->sC()Lcom/google/android/gms/internal/measurement/ek;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->sZ()Lcom/google/android/gms/internal/measurement/gi;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->sX()Lcom/google/android/gms/internal/measurement/gi;
 
     move-result-object v4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->rU()Lcom/google/android/gms/internal/measurement/dg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->rS()Lcom/google/android/gms/internal/measurement/dg;
 
     move-result-object v5
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ew;->sN()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ew;->sL()Lcom/google/android/gms/internal/measurement/eu;
 
     move-result-object v6
 
@@ -312,21 +312,21 @@
     return-object p1
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fl;->sU()Lcom/google/android/gms/internal/measurement/fj;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fl;->sS()Lcom/google/android/gms/internal/measurement/fj;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ek;->sE()Lcom/google/android/gms/internal/measurement/ek;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ek;->sC()Lcom/google/android/gms/internal/measurement/ek;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->ta()Lcom/google/android/gms/internal/measurement/gi;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->sY()Lcom/google/android/gms/internal/measurement/gi;
 
     move-result-object v4
 
     const/4 v5, 0x0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ew;->sN()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ew;->sL()Lcom/google/android/gms/internal/measurement/eu;
 
     move-result-object v6
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eo.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eo.smali
index 8528d3a97a..11009b2464 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eo.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eo.smali
@@ -21,11 +21,11 @@
 
 
 # static fields
-.field private static final avG:Lcom/google/android/gms/internal/measurement/eo;
+.field private static final avY:Lcom/google/android/gms/internal/measurement/eo;
 
 
 # instance fields
-.field private avH:[J
+.field private avZ:[J
 
 .field private size:I
 
@@ -42,7 +42,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/internal/measurement/eo;-><init>([JI)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/eo;->avG:Lcom/google/android/gms/internal/measurement/eo;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/eo;->avY:Lcom/google/android/gms/internal/measurement/eo;
 
     iput-boolean v1, v0, Lcom/google/android/gms/internal/measurement/cd;->zzacz:Z
 
@@ -68,7 +68,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cd;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     iput p2, p0, Lcom/google/android/gms/internal/measurement/eo;->size:I
 
@@ -131,7 +131,7 @@
 .method private final k(IJ)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     if-ltz p1, :cond_1
 
@@ -139,7 +139,7 @@
 
     if-gt p1, v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     array-length v2, v1
 
@@ -166,7 +166,7 @@
 
     invoke-static {v1, v2, v0, v2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     add-int/lit8 v2, p1, 0x1
 
@@ -176,10 +176,10 @@
 
     invoke-static {v1, p1, v0, v2, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     aput-wide p2, v0, p1
 
@@ -209,10 +209,10 @@
     throw p2
 .end method
 
-.method public static sH()Lcom/google/android/gms/internal/measurement/eo;
+.method public static sF()Lcom/google/android/gms/internal/measurement/eo;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/eo;->avG:Lcom/google/android/gms/internal/measurement/eo;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/eo;->avY:Lcom/google/android/gms/internal/measurement/eo;
 
     return-object v0
 .end method
@@ -255,7 +255,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/ds;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -291,7 +291,7 @@
 
     add-int/2addr v3, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     array-length v2, v0
 
@@ -301,12 +301,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/eo;->size:I
 
@@ -353,7 +353,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/eo;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->copyOf([JI)[J
 
@@ -407,7 +407,7 @@
     return v3
 
     :cond_2
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     const/4 v1, 0x0
 
@@ -416,7 +416,7 @@
 
     if-ge v1, v2, :cond_4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     aget-wide v4, v2, v1
 
@@ -456,7 +456,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/eo;->bH(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     aget-wide v1, v0, p1
 
@@ -477,7 +477,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     aget-wide v3, v2, v1
 
@@ -498,11 +498,11 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/eo;->bH(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     aget-wide v1, v0, p1
 
@@ -543,7 +543,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     const/4 v0, 0x0
 
@@ -554,7 +554,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     aget-wide v3, v2, v1
 
@@ -568,7 +568,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     add-int/lit8 v0, v1, 0x1
 
@@ -608,11 +608,11 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/eo;->size:I
 
@@ -655,11 +655,11 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/eo;->bH(I)V
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/eo;->avH:[J
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/eo;->avZ:[J
 
     aget-wide v2, p2, p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ep.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ep.smali
index 97780fec8a..4a8f5bd56f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ep.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ep.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private avI:[Lcom/google/android/gms/internal/measurement/ey;
+.field private awa:[Lcom/google/android/gms/internal/measurement/ey;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ep;->avI:[Lcom/google/android/gms/internal/measurement/ey;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ep;->awa:[Lcom/google/android/gms/internal/measurement/ey;
 
     return-void
 .end method
@@ -32,7 +32,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ep;->avI:[Lcom/google/android/gms/internal/measurement/ey;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ep;->awa:[Lcom/google/android/gms/internal/measurement/ey;
 
     array-length v1, v0
 
@@ -75,7 +75,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ep;->avI:[Lcom/google/android/gms/internal/measurement/ey;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ep;->awa:[Lcom/google/android/gms/internal/measurement/ey;
 
     array-length v1, v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/er.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/er.smali
index ef27764acc..697a21f837 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/er.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/er.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field public final asf:Ljava/lang/Object;
+.field public final asx:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -24,9 +24,9 @@
     .end annotation
 .end field
 
-.field public final avJ:Lcom/google/android/gms/internal/measurement/gz;
+.field public final awb:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public final avK:Ljava/lang/Object;
+.field public final awc:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TK;"
@@ -34,4 +34,4 @@
     .end annotation
 .end field
 
-.field public final avL:Lcom/google/android/gms/internal/measurement/gz;
+.field public final awd:Lcom/google/android/gms/internal/measurement/gz;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/es.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/es.smali
index 9ce72c617e..2235eb6d23 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/es.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/es.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/et.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/et.smali
index 24db2b91d4..7993f77ca7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/et.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/et.smali
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/er;->avJ:Lcom/google/android/gms/internal/measurement/gz;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/er;->awb:Lcom/google/android/gms/internal/measurement/gz;
 
     const/4 v1, 0x1
 
@@ -38,7 +38,7 @@
 
     move-result p1
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/er;->avL:Lcom/google/android/gms/internal/measurement/gz;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/er;->awd:Lcom/google/android/gms/internal/measurement/gz;
 
     const/4 v0, 0x2
 
@@ -72,13 +72,13 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/er;->avJ:Lcom/google/android/gms/internal/measurement/gz;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/er;->awb:Lcom/google/android/gms/internal/measurement/gz;
 
     const/4 v1, 0x1
 
     invoke-static {p0, v0, v1, p2}, Lcom/google/android/gms/internal/measurement/dh;->a(Lcom/google/android/gms/internal/measurement/cy;Lcom/google/android/gms/internal/measurement/gz;ILjava/lang/Object;)V
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/er;->avL:Lcom/google/android/gms/internal/measurement/gz;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/er;->awd:Lcom/google/android/gms/internal/measurement/gz;
 
     const/4 p2, 0x2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eu.smali
index c750ad46a8..14c5fb157a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eu.smali
@@ -39,10 +39,10 @@
 .method public abstract f(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 .end method
 
-.method public abstract sI()Ljava/lang/Object;
+.method public abstract sG()Ljava/lang/Object;
 .end method
 
-.method public abstract sJ()Lcom/google/android/gms/internal/measurement/er;
+.method public abstract sH()Lcom/google/android/gms/internal/measurement/er;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ev.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ev.smali
index 53abb80b5d..1ccea41a5a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ev.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ev.smali
@@ -17,7 +17,7 @@
 
 
 # static fields
-.field private static final avM:Lcom/google/android/gms/internal/measurement/ev;
+.field private static final awe:Lcom/google/android/gms/internal/measurement/ev;
 
 
 # instance fields
@@ -32,7 +32,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ev;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ev;->avM:Lcom/google/android/gms/internal/measurement/ev;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ev;->awe:Lcom/google/android/gms/internal/measurement/ev;
 
     const/4 v1, 0x0
 
@@ -106,7 +106,7 @@
     throw p0
 .end method
 
-.method public static sK()Lcom/google/android/gms/internal/measurement/ev;
+.method public static sI()Lcom/google/android/gms/internal/measurement/ev;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -120,7 +120,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ev;->avM:Lcom/google/android/gms/internal/measurement/ev;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ev;->awe:Lcom/google/android/gms/internal/measurement/ev;
 
     return-object v0
 .end method
@@ -130,7 +130,7 @@
 .method public final clear()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->sM()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->sK()V
 
     invoke-super {p0}, Ljava/util/LinkedHashMap;->clear()V
 
@@ -345,7 +345,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->sM()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->sK()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/ds;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -368,7 +368,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->sM()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->sK()V
 
     invoke-interface {p1}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -415,7 +415,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->sM()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ev;->sK()V
 
     invoke-super {p0, p1}, Ljava/util/LinkedHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -424,7 +424,7 @@
     return-object p1
 .end method
 
-.method public final sL()Lcom/google/android/gms/internal/measurement/ev;
+.method public final sJ()Lcom/google/android/gms/internal/measurement/ev;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -454,7 +454,7 @@
     return-object v0
 .end method
 
-.method final sM()V
+.method final sK()V
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ev;->zzacz:Z
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ew.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ew.smali
index 0845a03321..764ac11702 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ew.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ew.smali
@@ -3,47 +3,47 @@
 
 
 # static fields
-.field private static final avN:Lcom/google/android/gms/internal/measurement/eu;
+.field private static final awf:Lcom/google/android/gms/internal/measurement/eu;
 
-.field private static final avO:Lcom/google/android/gms/internal/measurement/eu;
+.field private static final awg:Lcom/google/android/gms/internal/measurement/eu;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ew;->sP()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ew;->sN()Lcom/google/android/gms/internal/measurement/eu;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ew;->avN:Lcom/google/android/gms/internal/measurement/eu;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ew;->awf:Lcom/google/android/gms/internal/measurement/eu;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ex;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ex;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ew;->avO:Lcom/google/android/gms/internal/measurement/eu;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ew;->awg:Lcom/google/android/gms/internal/measurement/eu;
 
     return-void
 .end method
 
-.method static sN()Lcom/google/android/gms/internal/measurement/eu;
+.method static sL()Lcom/google/android/gms/internal/measurement/eu;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ew;->avN:Lcom/google/android/gms/internal/measurement/eu;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ew;->awf:Lcom/google/android/gms/internal/measurement/eu;
 
     return-object v0
 .end method
 
-.method static sO()Lcom/google/android/gms/internal/measurement/eu;
+.method static sM()Lcom/google/android/gms/internal/measurement/eu;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ew;->avO:Lcom/google/android/gms/internal/measurement/eu;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ew;->awg:Lcom/google/android/gms/internal/measurement/eu;
 
     return-object v0
 .end method
 
-.method private static sP()Lcom/google/android/gms/internal/measurement/eu;
+.method private static sN()Lcom/google/android/gms/internal/measurement/eu;
     .locals 3
 
     :try_start_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ex.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ex.smali
index 7c9fc8a3ad..64d35e2b94 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ex.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ex.smali
@@ -150,12 +150,12 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ev;->sL()Lcom/google/android/gms/internal/measurement/ev;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ev;->sJ()Lcom/google/android/gms/internal/measurement/ev;
 
     move-result-object p1
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ev;->sM()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ev;->sK()V
 
     invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ev;->isEmpty()Z
 
@@ -169,21 +169,21 @@
     return-object p1
 .end method
 
-.method public final sI()Ljava/lang/Object;
+.method public final sG()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ev;->sK()Lcom/google/android/gms/internal/measurement/ev;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ev;->sI()Lcom/google/android/gms/internal/measurement/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ev;->sL()Lcom/google/android/gms/internal/measurement/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ev;->sJ()Lcom/google/android/gms/internal/measurement/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final sJ()Lcom/google/android/gms/internal/measurement/er;
+.method public final sH()Lcom/google/android/gms/internal/measurement/er;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ez.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ez.smali
index f9cc0baab2..1323d40d9f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ez.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ez.smali
@@ -3,11 +3,11 @@
 
 
 # virtual methods
-.method public abstract sQ()I
+.method public abstract sO()I
 .end method
 
-.method public abstract sR()Z
+.method public abstract sP()Z
 .end method
 
-.method public abstract sS()Lcom/google/android/gms/internal/measurement/fb;
+.method public abstract sQ()Lcom/google/android/gms/internal/measurement/fb;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/f.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/f.smali
index 05b9290b98..a70f677434 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/f.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-.field private final synthetic aqw:Ljava/lang/String;
+.field private final synthetic aqO:Ljava/lang/String;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/f;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/f;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/f;->aqw:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/f;->aqO:Ljava/lang/String;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -31,15 +31,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/f;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/f;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/f;->aqw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/f;->aqO:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/f;->aBg:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/f;->aBy:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/iu;->endAdUnitExposure(Ljava/lang/String;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fa.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fa.smali
index 807239902c..b6c40d53ad 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fa.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fa.smali
@@ -10,8 +10,8 @@
 .method public abstract a(Lcom/google/android/gms/internal/measurement/fb;)Lcom/google/android/gms/internal/measurement/fa;
 .end method
 
-.method public abstract sm()Lcom/google/android/gms/internal/measurement/fb;
+.method public abstract sk()Lcom/google/android/gms/internal/measurement/fb;
 .end method
 
-.method public abstract sn()Lcom/google/android/gms/internal/measurement/fb;
+.method public abstract sl()Lcom/google/android/gms/internal/measurement/fb;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb.smali
index f16cce5e59..28ee0bbde7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb.smali
@@ -14,14 +14,14 @@
     .end annotation
 .end method
 
-.method public abstract qM()Lcom/google/android/gms/internal/measurement/cj;
+.method public abstract qK()Lcom/google/android/gms/internal/measurement/cj;
 .end method
 
-.method public abstract sf()I
+.method public abstract sd()I
 .end method
 
-.method public abstract sg()Lcom/google/android/gms/internal/measurement/fa;
+.method public abstract se()Lcom/google/android/gms/internal/measurement/fa;
 .end method
 
-.method public abstract sh()Lcom/google/android/gms/internal/measurement/fa;
+.method public abstract sf()Lcom/google/android/gms/internal/measurement/fa;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fc.smali
index a1cef9850b..f552f5f64c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fc.smali
@@ -201,7 +201,7 @@
 
     if-eqz v14, :cond_4
 
-    invoke-static {v11}, Lcom/google/android/gms/internal/measurement/fc;->cf(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v11}, Lcom/google/android/gms/internal/measurement/fc;->ca(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v6
 
@@ -314,7 +314,7 @@
 
     if-eqz v12, :cond_6
 
-    invoke-static {v11}, Lcom/google/android/gms/internal/measurement/fc;->cf(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v11}, Lcom/google/android/gms/internal/measurement/fc;->ca(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v7
 
@@ -617,7 +617,7 @@
 
     if-eqz v7, :cond_13
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
     invoke-virtual {v11, v7}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -634,7 +634,7 @@
 
     check-cast v7, Lcom/google/android/gms/internal/measurement/fb;
 
-    invoke-interface {v7}, Lcom/google/android/gms/internal/measurement/fb;->si()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-interface {v7}, Lcom/google/android/gms/internal/measurement/fb;->sg()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v7
 
@@ -687,7 +687,7 @@
     :goto_b
     if-eqz v13, :cond_2
 
-    invoke-static {v6}, Lcom/google/android/gms/internal/measurement/fc;->cf(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v6}, Lcom/google/android/gms/internal/measurement/fc;->ca(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v6
 
@@ -850,7 +850,7 @@
 
     check-cast p3, Ljava/lang/String;
 
-    invoke-static {p3}, Lcom/google/android/gms/internal/measurement/cj;->ca(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/cj;
+    invoke-static {p3}, Lcom/google/android/gms/internal/measurement/cj;->bV(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object p1
 
@@ -975,7 +975,7 @@
     return-void
 .end method
 
-.method private static final cf(Ljava/lang/String;)Ljava/lang/String;
+.method private static final ca(Ljava/lang/String;)Ljava/lang/String;
     .locals 4
 
     new-instance v0, Ljava/lang/StringBuilder;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fd.smali
index 347103f75e..d024588a00 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fd.smali
@@ -6,5 +6,5 @@
 .method public abstract isInitialized()Z
 .end method
 
-.method public abstract si()Lcom/google/android/gms/internal/measurement/fb;
+.method public abstract sg()Lcom/google/android/gms/internal/measurement/fb;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fe.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fe.smali
index 225477d983..a4a4f0b8f1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fe.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fe.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field static final synthetic ati:[I
+.field static final synthetic atA:[I
 
 
 # direct methods
@@ -18,12 +18,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axt:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axL:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -37,9 +37,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axx:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axP:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -53,9 +53,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axm:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axE:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -69,9 +69,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axs:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axK:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -85,9 +85,9 @@
 
     :catch_3
     :try_start_4
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axA:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axS:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -101,9 +101,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axr:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axJ:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -117,9 +117,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axB:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axT:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -133,9 +133,9 @@
 
     :catch_6
     :try_start_7
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axn:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axF:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -149,9 +149,9 @@
 
     :catch_7
     :try_start_8
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axz:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axR:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -165,9 +165,9 @@
 
     :catch_8
     :try_start_9
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axq:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axI:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -181,9 +181,9 @@
 
     :catch_9
     :try_start_a
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axy:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axQ:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -197,9 +197,9 @@
 
     :catch_a
     :try_start_b
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axo:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axG:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -213,9 +213,9 @@
 
     :catch_b
     :try_start_c
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axp:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axH:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -229,9 +229,9 @@
 
     :catch_c
     :try_start_d
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axw:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axO:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -245,9 +245,9 @@
 
     :catch_d
     :try_start_e
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axC:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axU:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -261,9 +261,9 @@
 
     :catch_e
     :try_start_f
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axD:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axV:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -277,9 +277,9 @@
 
     :catch_f
     :try_start_10
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axu:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axM:Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ff.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ff.smali
index 84c1bae701..325e187e15 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ff.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ff.smali
@@ -19,41 +19,41 @@
 
 
 # static fields
-.field private static final avP:[I
+.field private static final awh:[I
 
-.field private static final avQ:Lsun/misc/Unsafe;
+.field private static final awi:Lsun/misc/Unsafe;
 
 
 # instance fields
-.field private final avR:[I
+.field private final awj:[I
 
-.field private final avS:[Ljava/lang/Object;
+.field private final awk:[Ljava/lang/Object;
 
-.field private final avT:I
+.field private final awl:I
 
-.field private final avU:I
+.field private final awm:I
 
-.field private final avV:Lcom/google/android/gms/internal/measurement/fb;
+.field private final awn:Lcom/google/android/gms/internal/measurement/fb;
 
-.field private final avW:Z
+.field private final awo:Z
 
-.field private final avX:Z
+.field private final awp:Z
 
-.field private final avY:Z
+.field private final awq:Z
 
-.field private final avZ:Z
+.field private final awr:Z
 
-.field private final awa:[I
+.field private final aws:[I
 
-.field private final awb:I
+.field private final awt:I
 
-.field private final awc:I
+.field private final awu:I
 
-.field private final awd:Lcom/google/android/gms/internal/measurement/fj;
+.field private final awv:Lcom/google/android/gms/internal/measurement/fj;
 
-.field private final awe:Lcom/google/android/gms/internal/measurement/ek;
+.field private final aww:Lcom/google/android/gms/internal/measurement/ek;
 
-.field private final awf:Lcom/google/android/gms/internal/measurement/gi;
+.field private final awx:Lcom/google/android/gms/internal/measurement/gi;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gi<",
@@ -62,7 +62,7 @@
     .end annotation
 .end field
 
-.field private final awg:Lcom/google/android/gms/internal/measurement/dg;
+.field private final awy:Lcom/google/android/gms/internal/measurement/dg;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/dg<",
@@ -71,7 +71,7 @@
     .end annotation
 .end field
 
-.field private final awh:Lcom/google/android/gms/internal/measurement/eu;
+.field private final awz:Lcom/google/android/gms/internal/measurement/eu;
 
 
 # direct methods
@@ -82,13 +82,13 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ff;->avP:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ff;->awh:[I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->ts()Lsun/misc/Unsafe;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tq()Lsun/misc/Unsafe;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ff;->avQ:Lsun/misc/Unsafe;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ff;->awi:Lsun/misc/Unsafe;
 
     return-void
 .end method
@@ -115,19 +115,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/ff;->avS:[Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/ff;->awk:[Ljava/lang/Object;
 
-    iput p3, p0, Lcom/google/android/gms/internal/measurement/ff;->avT:I
+    iput p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awl:I
 
-    iput p4, p0, Lcom/google/android/gms/internal/measurement/ff;->avU:I
+    iput p4, p0, Lcom/google/android/gms/internal/measurement/ff;->awm:I
 
     instance-of p1, p5, Lcom/google/android/gms/internal/measurement/dr;
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/ff;->avX:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/ff;->awp:Z
 
-    iput-boolean p6, p0, Lcom/google/android/gms/internal/measurement/ff;->avY:Z
+    iput-boolean p6, p0, Lcom/google/android/gms/internal/measurement/ff;->awq:Z
 
     const/4 p1, 0x0
 
@@ -147,43 +147,43 @@
     const/4 p2, 0x0
 
     :goto_0
-    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/ff;->avW:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/ff;->awo:Z
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
-    iput-object p7, p0, Lcom/google/android/gms/internal/measurement/ff;->awa:[I
+    iput-object p7, p0, Lcom/google/android/gms/internal/measurement/ff;->aws:[I
 
-    iput p8, p0, Lcom/google/android/gms/internal/measurement/ff;->awb:I
+    iput p8, p0, Lcom/google/android/gms/internal/measurement/ff;->awt:I
 
-    iput p9, p0, Lcom/google/android/gms/internal/measurement/ff;->awc:I
+    iput p9, p0, Lcom/google/android/gms/internal/measurement/ff;->awu:I
 
-    iput-object p10, p0, Lcom/google/android/gms/internal/measurement/ff;->awd:Lcom/google/android/gms/internal/measurement/fj;
+    iput-object p10, p0, Lcom/google/android/gms/internal/measurement/ff;->awv:Lcom/google/android/gms/internal/measurement/fj;
 
-    iput-object p11, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iput-object p11, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
-    iput-object p12, p0, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iput-object p12, p0, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
-    iput-object p13, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iput-object p13, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/ff;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/ff;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
-    iput-object p14, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iput-object p14, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     return-void
 .end method
 
-.method private final K(II)I
+.method private final J(II)I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avT:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awl:I
 
     if-lt p1, v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avU:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awm:I
 
     if-gt p1, v0, :cond_0
 
-    invoke-direct {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/ff;->L(II)I
+    invoke-direct {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/ff;->K(II)I
 
     move-result p1
 
@@ -195,10 +195,10 @@
     return p1
 .end method
 
-.method private final L(II)I
+.method private final K(II)I
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     array-length v0, v0
 
@@ -215,7 +215,7 @@
 
     mul-int/lit8 v2, v1, 0x3
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v3, v3, v2
 
@@ -302,9 +302,9 @@
 
     move-object/from16 v11, p13
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ff;->avQ:Lsun/misc/Unsafe;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ff;->awi:Lsun/misc/Unsafe;
 
-    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     add-int/lit8 v13, v6, 0x2
 
@@ -369,14 +369,14 @@
     :goto_0
     if-nez v15, :cond_1
 
-    iget-object v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-virtual {v12, v1, v9, v10, v3}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
     goto/16 :goto_9
 
     :cond_1
-    iget-object v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-static {v15, v3}, Lcom/google/android/gms/internal/measurement/ds;->e(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -393,7 +393,7 @@
 
     move-result v2
 
-    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/cv;->T(J)J
 
@@ -414,7 +414,7 @@
 
     move-result v2
 
-    iget v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-static {v3}, Lcom/google/android/gms/internal/measurement/cv;->bT(I)I
 
@@ -435,7 +435,7 @@
 
     move-result v3
 
-    iget v4, v11, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v4, v11, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-direct {v0, v6}, Lcom/google/android/gms/internal/measurement/ff;->cx(I)Lcom/google/android/gms/internal/measurement/dy;
 
@@ -487,7 +487,7 @@
 
     move-result v2
 
-    iget-object v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-virtual {v12, v1, v9, v10, v3}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -524,14 +524,14 @@
     :goto_2
     if-nez v15, :cond_5
 
-    iget-object v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-virtual {v12, v1, v9, v10, v3}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
     goto :goto_3
 
     :cond_5
-    iget-object v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-static {v15, v3}, Lcom/google/android/gms/internal/measurement/ds;->e(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -551,7 +551,7 @@
 
     move-result v2
 
-    iget v4, v11, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v4, v11, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-nez v4, :cond_6
 
@@ -579,7 +579,7 @@
     goto :goto_4
 
     :cond_7
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sA()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
@@ -609,7 +609,7 @@
 
     move-result v2
 
-    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     const-wide/16 v5, 0x0
 
@@ -672,7 +672,7 @@
 
     move-result v2
 
-    iget v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -689,7 +689,7 @@
 
     move-result v2
 
-    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -808,7 +808,7 @@
 
     move-object/from16 v7, p14
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/ff;->avQ:Lsun/misc/Unsafe;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/ff;->awi:Lsun/misc/Unsafe;
 
     invoke-virtual {v11, v1, v9, v10}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -816,7 +816,7 @@
 
     check-cast v11, Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v11}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v11}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v12
 
@@ -842,7 +842,7 @@
 
     move-result-object v11
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ff;->avQ:Lsun/misc/Unsafe;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ff;->awi:Lsun/misc/Unsafe;
 
     invoke-virtual {v12, v1, v9, v10, v11}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -886,7 +886,7 @@
 
     move-result v4
 
-    iget-object v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-interface {v11, v8}, Lcom/google/android/gms/internal/measurement/dz;->add(Ljava/lang/Object;)Z
 
@@ -897,7 +897,7 @@
 
     move-result v8
 
-    iget v9, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v9, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne v2, v9, :cond_32
 
@@ -917,7 +917,7 @@
 
     move-result v4
 
-    iget-object v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-interface {v11, v8}, Lcom/google/android/gms/internal/measurement/dz;->add(Ljava/lang/Object;)Z
 
@@ -932,7 +932,7 @@
 
     move-result v1
 
-    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     add-int/2addr v2, v1
 
@@ -943,7 +943,7 @@
 
     move-result v1
 
-    iget-wide v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     invoke-static {v4, v5}, Lcom/google/android/gms/internal/measurement/cv;->T(J)J
 
@@ -959,7 +959,7 @@
     goto/16 :goto_1e
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
@@ -974,7 +974,7 @@
 
     move-result v1
 
-    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     invoke-static {v8, v9}, Lcom/google/android/gms/internal/measurement/cv;->T(J)J
 
@@ -989,7 +989,7 @@
 
     move-result v4
 
-    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne v2, v6, :cond_33
 
@@ -997,7 +997,7 @@
 
     move-result v1
 
-    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     invoke-static {v8, v9}, Lcom/google/android/gms/internal/measurement/cv;->T(J)J
 
@@ -1016,7 +1016,7 @@
 
     move-result v1
 
-    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     add-int/2addr v2, v1
 
@@ -1027,7 +1027,7 @@
 
     move-result v1
 
-    iget v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-static {v4}, Lcom/google/android/gms/internal/measurement/cv;->bT(I)I
 
@@ -1043,7 +1043,7 @@
     goto/16 :goto_1e
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
@@ -1058,7 +1058,7 @@
 
     move-result v1
 
-    iget v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-static {v4}, Lcom/google/android/gms/internal/measurement/cv;->bT(I)I
 
@@ -1073,7 +1073,7 @@
 
     move-result v4
 
-    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne v2, v6, :cond_33
 
@@ -1081,7 +1081,7 @@
 
     move-result v1
 
-    iget v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-static {v4}, Lcom/google/android/gms/internal/measurement/cv;->bT(I)I
 
@@ -1124,7 +1124,7 @@
 
     iget-object v3, v1, Lcom/google/android/gms/internal/measurement/dr;->zzahz:Lcom/google/android/gms/internal/measurement/gl;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tn()Lcom/google/android/gms/internal/measurement/gl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tl()Lcom/google/android/gms/internal/measurement/gl;
 
     move-result-object v4
 
@@ -1137,7 +1137,7 @@
 
     move-result-object v4
 
-    iget-object v5, v0, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v5, v0, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     move/from16 v6, p6
 
@@ -1164,7 +1164,7 @@
 
     move-result v1
 
-    iget v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ltz v4, :cond_10
 
@@ -1176,7 +1176,7 @@
 
     if-nez v4, :cond_b
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
     invoke-interface {v11, v4}, Lcom/google/android/gms/internal/measurement/dz;->add(Ljava/lang/Object;)Z
 
@@ -1199,7 +1199,7 @@
 
     move-result v4
 
-    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne v2, v6, :cond_33
 
@@ -1207,7 +1207,7 @@
 
     move-result v1
 
-    iget v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ltz v4, :cond_e
 
@@ -1219,7 +1219,7 @@
 
     if-nez v4, :cond_c
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
     invoke-interface {v11, v4}, Lcom/google/android/gms/internal/measurement/dz;->add(Ljava/lang/Object;)Z
 
@@ -1235,28 +1235,28 @@
     goto :goto_8
 
     :cond_d
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
     throw v1
 
     :cond_e
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
     throw v1
 
     :cond_f
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
     throw v1
 
     :cond_10
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
@@ -1306,7 +1306,7 @@
 
     move-result v4
 
-    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ltz v6, :cond_14
 
@@ -1335,7 +1335,7 @@
 
     move-result v6
 
-    iget v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne v2, v8, :cond_32
 
@@ -1343,7 +1343,7 @@
 
     move-result v4
 
-    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ltz v6, :cond_13
 
@@ -1365,14 +1365,14 @@
     goto :goto_a
 
     :cond_13
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
     throw v1
 
     :cond_14
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
@@ -1383,7 +1383,7 @@
 
     move-result v4
 
-    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ltz v6, :cond_1b
 
@@ -1420,7 +1420,7 @@
 
     move-result v6
 
-    iget v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne v2, v8, :cond_32
 
@@ -1428,7 +1428,7 @@
 
     move-result v4
 
-    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ltz v6, :cond_19
 
@@ -1458,28 +1458,28 @@
     goto :goto_c
 
     :cond_18
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sA()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
     throw v1
 
     :cond_19
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
     throw v1
 
     :cond_1a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sA()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
     throw v1
 
     :cond_1b
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->st()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sr()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
@@ -1496,7 +1496,7 @@
 
     move-result v2
 
-    iget v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     add-int/2addr v4, v2
 
@@ -1507,7 +1507,7 @@
 
     move-result v2
 
-    iget-wide v5, v7, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v5, v7, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     cmp-long v8, v5, v14
 
@@ -1531,7 +1531,7 @@
     goto/16 :goto_7
 
     :cond_1e
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
@@ -1546,7 +1546,7 @@
 
     move-result v4
 
-    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     cmp-long v6, v8, v14
 
@@ -1569,7 +1569,7 @@
 
     move-result v6
 
-    iget v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne v2, v8, :cond_32
 
@@ -1577,7 +1577,7 @@
 
     move-result v4
 
-    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     cmp-long v6, v8, v14
 
@@ -1604,7 +1604,7 @@
 
     move-result v1
 
-    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     add-int/2addr v2, v1
 
@@ -1627,7 +1627,7 @@
     goto/16 :goto_1e
 
     :cond_23
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
@@ -1653,7 +1653,7 @@
 
     move-result v4
 
-    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne v2, v6, :cond_33
 
@@ -1674,7 +1674,7 @@
 
     move-result v1
 
-    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     add-int/2addr v2, v1
 
@@ -1697,7 +1697,7 @@
     goto/16 :goto_1e
 
     :cond_26
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
@@ -1723,7 +1723,7 @@
 
     move-result v4
 
-    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne v2, v6, :cond_33
 
@@ -1772,7 +1772,7 @@
 
     move-result v1
 
-    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     add-int/2addr v2, v1
 
@@ -1783,7 +1783,7 @@
 
     move-result v1
 
-    iget-wide v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v4, v7, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     invoke-virtual {v11, v4, v5}, Lcom/google/android/gms/internal/measurement/eo;->ad(J)V
 
@@ -1795,7 +1795,7 @@
     goto/16 :goto_1e
 
     :cond_2a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
@@ -1810,7 +1810,7 @@
 
     move-result v1
 
-    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     invoke-virtual {v11, v8, v9}, Lcom/google/android/gms/internal/measurement/eo;->ad(J)V
 
@@ -1821,7 +1821,7 @@
 
     move-result v4
 
-    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne v2, v6, :cond_33
 
@@ -1829,7 +1829,7 @@
 
     move-result v1
 
-    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     invoke-virtual {v11, v8, v9}, Lcom/google/android/gms/internal/measurement/eo;->ad(J)V
 
@@ -1844,7 +1844,7 @@
 
     move-result v1
 
-    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     add-int/2addr v2, v1
 
@@ -1855,7 +1855,7 @@
 
     move-result v4
 
-    invoke-virtual {v11, v4}, Lcom/google/android/gms/internal/measurement/dn;->r(F)V
+    invoke-virtual {v11, v4}, Lcom/google/android/gms/internal/measurement/dn;->q(F)V
 
     add-int/lit8 v1, v1, 0x4
 
@@ -1867,7 +1867,7 @@
     goto :goto_1e
 
     :cond_2d
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
@@ -1882,7 +1882,7 @@
 
     move-result v1
 
-    invoke-virtual {v11, v1}, Lcom/google/android/gms/internal/measurement/dn;->r(F)V
+    invoke-virtual {v11, v1}, Lcom/google/android/gms/internal/measurement/dn;->q(F)V
 
     :goto_1a
     add-int/lit8 v1, v4, 0x4
@@ -1893,7 +1893,7 @@
 
     move-result v4
 
-    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne v2, v6, :cond_33
 
@@ -1901,7 +1901,7 @@
 
     move-result v1
 
-    invoke-virtual {v11, v1}, Lcom/google/android/gms/internal/measurement/dn;->r(F)V
+    invoke-virtual {v11, v1}, Lcom/google/android/gms/internal/measurement/dn;->q(F)V
 
     goto :goto_1a
 
@@ -1914,7 +1914,7 @@
 
     move-result v1
 
-    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v2, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     add-int/2addr v2, v1
 
@@ -1937,7 +1937,7 @@
     goto :goto_1e
 
     :cond_30
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v1
 
@@ -1963,7 +1963,7 @@
 
     move-result v4
 
-    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v6, v7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ne v2, v6, :cond_33
 
@@ -2040,13 +2040,13 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ff;->avQ:Lsun/misc/Unsafe;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ff;->awi:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p5, p6}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     invoke-interface {v2, v1}, Lcom/google/android/gms/internal/measurement/eu;->as(Ljava/lang/Object;)Z
 
@@ -2054,13 +2054,13 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/eu;->sI()Ljava/lang/Object;
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/eu;->sG()Ljava/lang/Object;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     invoke-interface {v3, v2, v1}, Lcom/google/android/gms/internal/measurement/eu;->f(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -2069,13 +2069,13 @@
     move-object v1, v2
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/eu;->sJ()Lcom/google/android/gms/internal/measurement/er;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/eu;->sH()Lcom/google/android/gms/internal/measurement/er;
 
     move-result-object p1
 
-    iget-object p5, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object p5, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     invoke-interface {p5, v1}, Lcom/google/android/gms/internal/measurement/eu;->aq(Ljava/lang/Object;)Ljava/util/Map;
 
@@ -2085,7 +2085,7 @@
 
     move-result p3
 
-    iget p6, p7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget p6, p7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     if-ltz p6, :cond_7
 
@@ -2095,9 +2095,9 @@
 
     add-int/2addr p6, p3
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/er;->avK:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/er;->awc:Ljava/lang/Object;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/er;->asf:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/er;->asx:Ljava/lang/Object;
 
     :goto_0
     if-ge p3, p6, :cond_5
@@ -2112,7 +2112,7 @@
 
     move-result v2
 
-    iget p3, p7, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget p3, p7, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     :cond_1
     move v3, v2
@@ -2132,15 +2132,15 @@
     goto :goto_1
 
     :cond_2
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/er;->avL:Lcom/google/android/gms/internal/measurement/gz;
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/er;->awd:Lcom/google/android/gms/internal/measurement/gz;
 
     iget v2, v2, Lcom/google/android/gms/internal/measurement/gz;->zzanu:I
 
     if-ne v4, v2, :cond_4
 
-    iget-object v5, p1, Lcom/google/android/gms/internal/measurement/er;->avL:Lcom/google/android/gms/internal/measurement/gz;
+    iget-object v5, p1, Lcom/google/android/gms/internal/measurement/er;->awd:Lcom/google/android/gms/internal/measurement/gz;
 
-    iget-object p3, p1, Lcom/google/android/gms/internal/measurement/er;->asf:Ljava/lang/Object;
+    iget-object p3, p1, Lcom/google/android/gms/internal/measurement/er;->asx:Ljava/lang/Object;
 
     invoke-virtual {p3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -2156,18 +2156,18 @@
 
     move-result p3
 
-    iget-object v1, p7, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v1, p7, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     goto :goto_0
 
     :cond_3
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/er;->avJ:Lcom/google/android/gms/internal/measurement/gz;
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/er;->awb:Lcom/google/android/gms/internal/measurement/gz;
 
     iget v2, v2, Lcom/google/android/gms/internal/measurement/gz;->zzanu:I
 
     if-ne v4, v2, :cond_4
 
-    iget-object v5, p1, Lcom/google/android/gms/internal/measurement/er;->avJ:Lcom/google/android/gms/internal/measurement/gz;
+    iget-object v5, p1, Lcom/google/android/gms/internal/measurement/er;->awb:Lcom/google/android/gms/internal/measurement/gz;
 
     const/4 v6, 0x0
 
@@ -2181,7 +2181,7 @@
 
     move-result p3
 
-    iget-object v0, p7, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v0, p7, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     goto :goto_0
 
@@ -2201,14 +2201,14 @@
     return p6
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sz()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->ss()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sq()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -2240,7 +2240,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->ati:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fe;->atA:[I
 
     invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/gz;->ordinal()I
 
@@ -2270,7 +2270,7 @@
 
     move-result p0
 
-    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     invoke-static {p1, p2}, Lcom/google/android/gms/internal/measurement/cv;->T(J)J
 
@@ -2280,7 +2280,7 @@
 
     move-result-object p1
 
-    iput-object p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     goto/16 :goto_3
 
@@ -2289,7 +2289,7 @@
 
     move-result p0
 
-    iget p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/cv;->bT(I)I
 
@@ -2299,12 +2299,12 @@
 
     move-result-object p1
 
-    iput-object p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     goto/16 :goto_3
 
     :pswitch_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object p3
 
@@ -2323,13 +2323,13 @@
 
     move-result p0
 
-    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
-    iput-object p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     goto :goto_3
 
@@ -2338,13 +2338,13 @@
 
     move-result p0
 
-    iget p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p1
 
-    iput-object p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     goto :goto_3
 
@@ -2357,7 +2357,7 @@
 
     move-result-object p0
 
-    iput-object p0, p5, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p0, p5, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     goto :goto_0
 
@@ -2370,7 +2370,7 @@
 
     move-result-object p0
 
-    iput-object p0, p5, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p0, p5, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     goto :goto_1
 
@@ -2383,7 +2383,7 @@
 
     move-result-object p0
 
-    iput-object p0, p5, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p0, p5, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     :goto_0
     add-int/lit8 p0, p1, 0x4
@@ -2399,7 +2399,7 @@
 
     move-result-object p0
 
-    iput-object p0, p5, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p0, p5, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     :goto_1
     add-int/lit8 p0, p1, 0x8
@@ -2418,7 +2418,7 @@
 
     move-result p0
 
-    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     const-wide/16 p3, 0x0
 
@@ -2438,7 +2438,7 @@
 
     move-result-object p1
 
-    iput-object p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iput-object p1, p5, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     :goto_3
     return p0
@@ -2496,11 +2496,11 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/fo;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fo;->sQ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fo;->sO()I
 
     move-result v1
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->auY:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dr$d;->avq:I
 
     const/4 v3, 0x0
 
@@ -2614,7 +2614,7 @@
     :goto_4
     if-nez v9, :cond_5
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/ff;->avP:[I
+    sget-object v8, Lcom/google/android/gms/internal/measurement/ff;->awh:[I
 
     move-object v15, v8
 
@@ -3025,11 +3025,11 @@
     move/from16 v12, v35
 
     :goto_12
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ff;->avQ:Lsun/misc/Unsafe;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ff;->awi:Lsun/misc/Unsafe;
 
-    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/fo;->avS:[Ljava/lang/Object;
+    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/fo;->awk:[Ljava/lang/Object;
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fo;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fo;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
     invoke-virtual {v4}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -3786,7 +3786,7 @@
 
     move-object/from16 v1, v29
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/fo;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/fo;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
     move-object v5, v0
 
@@ -3850,9 +3850,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/eu;->sJ()Lcom/google/android/gms/internal/measurement/er;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/eu;->sH()Lcom/google/android/gms/internal/measurement/er;
 
     move-result-object v0
 
@@ -3896,7 +3896,7 @@
 
     if-nez p4, :cond_1
 
-    invoke-virtual {p5}, Lcom/google/android/gms/internal/measurement/gi;->tm()Ljava/lang/Object;
+    invoke-virtual {p5}, Lcom/google/android/gms/internal/measurement/gi;->tk()Ljava/lang/Object;
 
     move-result-object p4
 
@@ -3917,7 +3917,7 @@
 
     move-result-object v2
 
-    iget-object v3, v2, Lcom/google/android/gms/internal/measurement/cr;->asJ:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v3, v2, Lcom/google/android/gms/internal/measurement/cr;->atb:Lcom/google/android/gms/internal/measurement/cy;
 
     :try_start_0
     invoke-interface {v1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
@@ -3932,7 +3932,7 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/cr;->qX()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/cr;->qV()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object v1
 
@@ -3971,7 +3971,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v2, v0, p2
 
@@ -4003,7 +4003,7 @@
     return-object p3
 
     :cond_1
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     invoke-interface {p2, p1}, Lcom/google/android/gms/internal/measurement/eu;->aq(Ljava/lang/Object;)Ljava/util/Map;
 
@@ -4103,13 +4103,13 @@
 
     if-eqz p3, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/eu;->sJ()Lcom/google/android/gms/internal/measurement/er;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/eu;->sH()Lcom/google/android/gms/internal/measurement/er;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     invoke-interface {v1, p3}, Lcom/google/android/gms/internal/measurement/eu;->ar(Ljava/lang/Object;)Ljava/util/Map;
 
@@ -4141,7 +4141,7 @@
 
     int-to-long v0, p2
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fr;->rf()Ljava/lang/String;
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fr;->rd()Ljava/lang/String;
 
     move-result-object p2
 
@@ -4150,7 +4150,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avX:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awp:Z
 
     if-eqz v0, :cond_1
 
@@ -4171,7 +4171,7 @@
 
     int-to-long v0, p2
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fr;->rg()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fr;->re()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object p2
 
@@ -4282,7 +4282,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avY:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awq:Z
 
     if-eqz v0, :cond_0
 
@@ -4334,13 +4334,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dr;->zzahz:Lcom/google/android/gms/internal/measurement/gl;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tn()Lcom/google/android/gms/internal/measurement/gl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tl()Lcom/google/android/gms/internal/measurement/gl;
 
     move-result-object v1
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tp()Lcom/google/android/gms/internal/measurement/gl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tm()Lcom/google/android/gms/internal/measurement/gl;
 
     move-result-object v0
 
@@ -4395,17 +4395,17 @@
 
     move-object/from16 v2, p2
 
-    iget-boolean v3, v0, Lcom/google/android/gms/internal/measurement/ff;->avW:Z
+    iget-boolean v3, v0, Lcom/google/android/gms/internal/measurement/ff;->awo:Z
 
     if-eqz v3, :cond_0
 
-    iget-object v3, v0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v3, v0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v3, v1}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
     move-result-object v3
 
-    iget-object v5, v3, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v5, v3, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/fw;->isEmpty()Z
 
@@ -4433,11 +4433,11 @@
     :goto_0
     const/4 v6, -0x1
 
-    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     array-length v7, v7
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/ff;->avQ:Lsun/misc/Unsafe;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/ff;->awi:Lsun/misc/Unsafe;
 
     move-object v10, v5
 
@@ -4452,7 +4452,7 @@
 
     move-result v12
 
-    iget-object v13, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v13, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v14, v13, v5
 
@@ -4462,7 +4462,7 @@
 
     ushr-int/lit8 v15, v15, 0x14
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avY:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awq:Z
 
     const v16, 0xfffff
 
@@ -4516,7 +4516,7 @@
     :goto_3
     if-eqz v10, :cond_4
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v4, v10}, Lcom/google/android/gms/internal/measurement/dg;->a(Ljava/util/Map$Entry;)I
 
@@ -4524,7 +4524,7 @@
 
     if-gt v4, v14, :cond_4
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v4, v10}, Lcom/google/android/gms/internal/measurement/dg;->b(Ljava/util/Map$Entry;)V
 
@@ -4607,7 +4607,7 @@
 
     move-result v4
 
-    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->B(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->A(II)V
 
     goto :goto_4
 
@@ -4637,7 +4637,7 @@
 
     move-result v4
 
-    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->H(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->G(II)V
 
     goto :goto_4
 
@@ -4652,7 +4652,7 @@
 
     move-result v4
 
-    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->I(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->H(II)V
 
     goto :goto_4
 
@@ -4667,7 +4667,7 @@
 
     move-result v4
 
-    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->A(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->z(II)V
 
     goto :goto_4
 
@@ -4748,7 +4748,7 @@
 
     move-result v4
 
-    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->C(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->B(II)V
 
     goto/16 :goto_4
 
@@ -4778,7 +4778,7 @@
 
     move-result v4
 
-    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->z(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->y(II)V
 
     goto/16 :goto_4
 
@@ -4852,7 +4852,7 @@
     goto/16 :goto_4
 
     :pswitch_13
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -4871,7 +4871,7 @@
     goto/16 :goto_4
 
     :pswitch_14
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -4890,7 +4890,7 @@
     :pswitch_15
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -4907,7 +4907,7 @@
     :pswitch_16
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -4924,7 +4924,7 @@
     :pswitch_17
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -4941,7 +4941,7 @@
     :pswitch_18
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -4958,7 +4958,7 @@
     :pswitch_19
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -4975,7 +4975,7 @@
     :pswitch_1a
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -4992,7 +4992,7 @@
     :pswitch_1b
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5009,7 +5009,7 @@
     :pswitch_1c
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5026,7 +5026,7 @@
     :pswitch_1d
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5043,7 +5043,7 @@
     :pswitch_1e
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5060,7 +5060,7 @@
     :pswitch_1f
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5077,7 +5077,7 @@
     :pswitch_20
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5094,7 +5094,7 @@
     :pswitch_21
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5109,7 +5109,7 @@
     goto/16 :goto_4
 
     :pswitch_22
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5128,7 +5128,7 @@
     :pswitch_23
     const/4 v14, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5145,7 +5145,7 @@
     :pswitch_24
     const/4 v14, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5162,7 +5162,7 @@
     :pswitch_25
     const/4 v14, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5179,7 +5179,7 @@
     :pswitch_26
     const/4 v14, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5196,7 +5196,7 @@
     :pswitch_27
     const/4 v14, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5211,7 +5211,7 @@
     goto/16 :goto_4
 
     :pswitch_28
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5226,7 +5226,7 @@
     goto/16 :goto_4
 
     :pswitch_29
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5245,7 +5245,7 @@
     goto/16 :goto_4
 
     :pswitch_2a
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5260,7 +5260,7 @@
     goto/16 :goto_4
 
     :pswitch_2b
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5279,7 +5279,7 @@
     :pswitch_2c
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5296,7 +5296,7 @@
     :pswitch_2d
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5313,7 +5313,7 @@
     :pswitch_2e
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5330,7 +5330,7 @@
     :pswitch_2f
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5347,7 +5347,7 @@
     :pswitch_30
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5364,7 +5364,7 @@
     :pswitch_31
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5381,7 +5381,7 @@
     :pswitch_32
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v5
 
@@ -5440,7 +5440,7 @@
 
     move-result v4
 
-    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->B(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->A(II)V
 
     goto/16 :goto_5
 
@@ -5470,7 +5470,7 @@
 
     move-result v4
 
-    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->H(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->G(II)V
 
     goto/16 :goto_5
 
@@ -5485,7 +5485,7 @@
 
     move-result v4
 
-    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->I(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->H(II)V
 
     goto/16 :goto_5
 
@@ -5500,7 +5500,7 @@
 
     move-result v4
 
-    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->A(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->z(II)V
 
     goto/16 :goto_5
 
@@ -5581,7 +5581,7 @@
 
     move-result v4
 
-    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->C(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->B(II)V
 
     goto :goto_5
 
@@ -5611,7 +5611,7 @@
 
     move-result v4
 
-    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->z(II)V
+    invoke-interface {v2, v14, v4}, Lcom/google/android/gms/internal/measurement/hf;->y(II)V
 
     goto :goto_5
 
@@ -5687,7 +5687,7 @@
     :goto_6
     if-eqz v4, :cond_9
 
-    iget-object v5, v0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v5, v0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v5, v4}, Lcom/google/android/gms/internal/measurement/dg;->b(Ljava/util/Map$Entry;)V
 
@@ -5711,7 +5711,7 @@
     goto :goto_6
 
     :cond_9
-    iget-object v3, v0, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v3, v0, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-static {v3, v1, v2}, Lcom/google/android/gms/internal/measurement/ff;->a(Lcom/google/android/gms/internal/measurement/gi;Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hf;)V
 
@@ -5805,7 +5805,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v1, v1, p3
 
@@ -5907,17 +5907,17 @@
 .method private final cB(I)I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avT:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awl:I
 
     if-lt p1, v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avU:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awm:I
 
     if-gt p1, v0, :cond_0
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/ff;->L(II)I
+    invoke-direct {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/ff;->K(II)I
 
     move-result p1
 
@@ -5936,7 +5936,7 @@
 
     shl-int/lit8 p1, p1, 0x1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avS:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awk:[Ljava/lang/Object;
 
     aget-object v0, v0, p1
 
@@ -5947,11 +5947,11 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->avS:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awk:[Ljava/lang/Object;
 
     add-int/lit8 v2, p1, 0x1
 
@@ -5963,7 +5963,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->avS:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awk:[Ljava/lang/Object;
 
     aput-object v0, v1, p1
 
@@ -5973,7 +5973,7 @@
 .method private final cx(I)Lcom/google/android/gms/internal/measurement/dy;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avS:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awk:[Ljava/lang/Object;
 
     div-int/lit8 p1, p1, 0x3
 
@@ -5991,7 +5991,7 @@
 .method private final cy(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     add-int/lit8 p1, p1, 0x1
 
@@ -6003,7 +6003,7 @@
 .method private final cz(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     add-int/lit8 p1, p1, 0x2
 
@@ -6151,7 +6151,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avY:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awq:Z
 
     const v1, 0xfffff
 
@@ -6274,7 +6274,7 @@
     return v2
 
     :pswitch_7
-    sget-object p2, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sget-object p2, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
     invoke-static {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/go;->p(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -6330,7 +6330,7 @@
 
     if-eqz p2, :cond_c
 
-    sget-object p2, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sget-object p2, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
     invoke-virtual {p2, p1}, Lcom/google/android/gms/internal/measurement/cj;->equals(Ljava/lang/Object;)Z
 
@@ -6535,7 +6535,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avY:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awq:Z
 
     if-eqz v0, :cond_0
 
@@ -6714,7 +6714,7 @@
 
     move-object/from16 v9, p6
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/ff;->avQ:Lsun/misc/Unsafe;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/ff;->awi:Lsun/misc/Unsafe;
 
     const/16 v16, 0x0
 
@@ -6743,7 +6743,7 @@
 
     move-result v0
 
-    iget v3, v9, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v3, v9, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     move v4, v0
 
@@ -6767,7 +6767,7 @@
 
     div-int/2addr v2, v8
 
-    invoke-direct {v15, v3, v2}, Lcom/google/android/gms/internal/measurement/ff;->K(II)I
+    invoke-direct {v15, v3, v2}, Lcom/google/android/gms/internal/measurement/ff;->J(II)I
 
     move-result v1
 
@@ -6804,7 +6804,7 @@
     goto/16 :goto_16
 
     :cond_2
-    iget-object v1, v15, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v1, v15, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     add-int/lit8 v18, v2, 0x1
 
@@ -6926,7 +6926,7 @@
 
     move-object/from16 v5, p6
 
-    iget-object v1, v5, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v1, v5, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-virtual {v10, v14, v12, v13, v1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -6939,7 +6939,7 @@
 
     move-result-object v1
 
-    iget-object v2, v5, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v2, v5, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/ds;->e(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -7002,7 +7002,7 @@
 
     move-result v13
 
-    iget-wide v0, v5, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v0, v5, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     invoke-static {v0, v1}, Lcom/google/android/gms/internal/measurement/cv;->T(J)J
 
@@ -7054,7 +7054,7 @@
 
     move-result v0
 
-    iget v1, v13, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v1, v13, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/cv;->bT(I)I
 
@@ -7085,7 +7085,7 @@
 
     move-result v0
 
-    iget v1, v13, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v1, v13, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-direct {v15, v9}, Lcom/google/android/gms/internal/measurement/ff;->cx(I)Lcom/google/android/gms/internal/measurement/dy;
 
@@ -7145,7 +7145,7 @@
 
     move-result v0
 
-    iget-object v1, v13, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v1, v13, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-virtual {v10, v14, v2, v3, v1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -7187,7 +7187,7 @@
 
     if-nez v1, :cond_a
 
-    iget-object v1, v13, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v1, v13, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-virtual {v10, v14, v2, v3, v1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -7198,7 +7198,7 @@
 
     move-result-object v1
 
-    iget-object v4, v13, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v4, v13, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-static {v1, v4}, Lcom/google/android/gms/internal/measurement/ds;->e(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -7252,7 +7252,7 @@
     move-result v0
 
     :goto_7
-    iget-object v1, v13, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v1, v13, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-virtual {v10, v14, v2, v3, v1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -7283,7 +7283,7 @@
 
     move/from16 p3, v0
 
-    iget-wide v0, v13, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v0, v13, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     const-wide/16 v19, 0x0
 
@@ -7422,7 +7422,7 @@
 
     move-result v0
 
-    iget v1, v13, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v1, v13, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-virtual {v10, v14, v2, v3, v1}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
@@ -7453,7 +7453,7 @@
 
     move-result v7
 
-    iget-wide v4, v13, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v4, v13, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     move-object v0, v10
 
@@ -7616,7 +7616,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v1
 
@@ -7917,23 +7917,23 @@
     :goto_17
     move-object/from16 v8, p0
 
-    iget-boolean v0, v8, Lcom/google/android/gms/internal/measurement/ff;->avW:Z
+    iget-boolean v0, v8, Lcom/google/android/gms/internal/measurement/ff;->awo:Z
 
     if-eqz v0, :cond_1d
 
     move-object/from16 v9, p6
 
-    iget-object v0, v9, Lcom/google/android/gms/internal/measurement/ce;->asC:Lcom/google/android/gms/internal/measurement/de;
+    iget-object v0, v9, Lcom/google/android/gms/internal/measurement/ce;->asU:Lcom/google/android/gms/internal/measurement/de;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rM()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rK()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v1
 
     if-eq v0, v1, :cond_1c
 
-    iget-object v0, v8, Lcom/google/android/gms/internal/measurement/ff;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v0, v8, Lcom/google/android/gms/internal/measurement/ff;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
-    iget-object v1, v9, Lcom/google/android/gms/internal/measurement/ce;->asC:Lcom/google/android/gms/internal/measurement/de;
+    iget-object v1, v9, Lcom/google/android/gms/internal/measurement/ce;->asU:Lcom/google/android/gms/internal/measurement/de;
 
     move/from16 v10, v24
 
@@ -7980,7 +7980,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dr$b;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr$b;->so()Lcom/google/android/gms/internal/measurement/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr$b;->sm()Lcom/google/android/gms/internal/measurement/dh;
 
     new-instance v0, Ljava/lang/NoSuchMethodError;
 
@@ -8104,18 +8104,18 @@
     :cond_20
     const/4 v0, 0x0
 
-    iget v1, v8, Lcom/google/android/gms/internal/measurement/ff;->awb:I
+    iget v1, v8, Lcom/google/android/gms/internal/measurement/ff;->awt:I
 
     :goto_1b
-    iget v4, v8, Lcom/google/android/gms/internal/measurement/ff;->awc:I
+    iget v4, v8, Lcom/google/android/gms/internal/measurement/ff;->awu:I
 
     if-ge v1, v4, :cond_21
 
-    iget-object v4, v8, Lcom/google/android/gms/internal/measurement/ff;->awa:[I
+    iget-object v4, v8, Lcom/google/android/gms/internal/measurement/ff;->aws:[I
 
     aget v4, v4, v1
 
-    iget-object v5, v8, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v5, v8, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-direct {v8, v11, v4, v0, v5}, Lcom/google/android/gms/internal/measurement/ff;->a(Ljava/lang/Object;ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/gi;)Ljava/lang/Object;
 
@@ -8130,7 +8130,7 @@
     :cond_21
     if-eqz v0, :cond_22
 
-    iget-object v1, v8, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v1, v8, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-virtual {v1, v11, v0}, Lcom/google/android/gms/internal/measurement/gi;->j(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -8144,7 +8144,7 @@
     goto :goto_1c
 
     :cond_23
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sz()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v0
 
@@ -8161,7 +8161,7 @@
     return v2
 
     :cond_25
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sz()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v0
 
@@ -8215,9 +8215,9 @@
 
     if-eqz p3, :cond_1d
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     const/4 v2, 0x0
 
@@ -8228,7 +8228,7 @@
     :cond_0
     :goto_0
     :try_start_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rq()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ro()I
 
     move-result v5
 
@@ -8244,14 +8244,14 @@
 
     if-ne v5, v6, :cond_3
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/ff;->awb:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/ff;->awt:I
 
     :goto_1
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awc:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awu:I
 
     if-ge p2, p3, :cond_1
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awa:[I
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/ff;->aws:[I
 
     aget p3, p3, p2
 
@@ -8273,7 +8273,7 @@
 
     :cond_3
     :try_start_1
-    iget-boolean v6, p0, Lcom/google/android/gms/internal/measurement/ff;->avW:Z
+    iget-boolean v6, p0, Lcom/google/android/gms/internal/measurement/ff;->awo:Z
 
     if-nez v6, :cond_4
 
@@ -8282,7 +8282,7 @@
     goto :goto_2
 
     :cond_4
-    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/ff;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/ff;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
     invoke-virtual {v1, p3, v6, v5}, Lcom/google/android/gms/internal/measurement/dg;->a(Lcom/google/android/gms/internal/measurement/de;Lcom/google/android/gms/internal/measurement/fb;I)Ljava/lang/Object;
 
@@ -8298,7 +8298,7 @@
     move-result-object v4
 
     :cond_5
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dg;->rO()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dg;->rM()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -8320,14 +8320,14 @@
 
     if-nez v5, :cond_0
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/ff;->awb:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/ff;->awt:I
 
     :goto_3
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awc:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awu:I
 
     if-ge p2, p3, :cond_8
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awa:[I
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/ff;->aws:[I
 
     aget p3, p3, p2
 
@@ -8368,7 +8368,7 @@
     if-nez v3, :cond_15
 
     :try_start_3
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gi;->tm()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gi;->tk()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -8398,7 +8398,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rm()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rk()J
 
     move-result-wide v9
 
@@ -8417,7 +8417,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rl()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rj()I
 
     move-result v9
 
@@ -8436,7 +8436,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rk()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ri()J
 
     move-result-wide v9
 
@@ -8455,7 +8455,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rj()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rh()I
 
     move-result v9
 
@@ -8470,7 +8470,7 @@
     goto/16 :goto_0
 
     :pswitch_5
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ri()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rg()I
 
     move-result v8
 
@@ -8516,7 +8516,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rh()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rf()I
 
     move-result v9
 
@@ -8535,7 +8535,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rg()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->re()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object v9
 
@@ -8610,7 +8610,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->re()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rc()Z
 
     move-result v9
 
@@ -8629,7 +8629,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rd()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rb()I
 
     move-result v9
 
@@ -8648,7 +8648,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rc()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ra()J
 
     move-result-wide v9
 
@@ -8667,7 +8667,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rb()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->qZ()I
 
     move-result v9
 
@@ -8686,7 +8686,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->qZ()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->qX()J
 
     move-result-wide v9
 
@@ -8705,7 +8705,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ra()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->qY()J
 
     move-result-wide v9
 
@@ -8772,9 +8772,9 @@
 
     if-nez v7, :cond_e
 
-    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
-    invoke-interface {v7}, Lcom/google/android/gms/internal/measurement/eu;->sI()Ljava/lang/Object;
+    invoke-interface {v7}, Lcom/google/android/gms/internal/measurement/eu;->sG()Ljava/lang/Object;
 
     move-result-object v7
 
@@ -8783,7 +8783,7 @@
     goto :goto_6
 
     :cond_e
-    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     invoke-interface {v8, v7}, Lcom/google/android/gms/internal/measurement/eu;->as(Ljava/lang/Object;)Z
 
@@ -8791,13 +8791,13 @@
 
     if-eqz v8, :cond_f
 
-    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
-    invoke-interface {v8}, Lcom/google/android/gms/internal/measurement/eu;->sI()Ljava/lang/Object;
+    invoke-interface {v8}, Lcom/google/android/gms/internal/measurement/eu;->sG()Ljava/lang/Object;
 
     move-result-object v8
 
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     invoke-interface {v9, v8, v7}, Lcom/google/android/gms/internal/measurement/eu;->f(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -8807,15 +8807,15 @@
 
     :cond_f
     :goto_6
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     invoke-interface {v5, v7}, Lcom/google/android/gms/internal/measurement/eu;->aq(Ljava/lang/Object;)Ljava/util/Map;
 
     move-result-object v5
 
-    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
-    invoke-interface {v6}, Lcom/google/android/gms/internal/measurement/eu;->sJ()Lcom/google/android/gms/internal/measurement/er;
+    invoke-interface {v6}, Lcom/google/android/gms/internal/measurement/eu;->sH()Lcom/google/android/gms/internal/measurement/er;
 
     move-result-object v6
 
@@ -8832,7 +8832,7 @@
 
     move-result-object v5
 
-    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     invoke-virtual {v6, p1, v7, v8}, Lcom/google/android/gms/internal/measurement/ek;->a(Ljava/lang/Object;J)Ljava/util/List;
 
@@ -8843,7 +8843,7 @@
     goto/16 :goto_0
 
     :pswitch_14
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -8858,7 +8858,7 @@
     goto/16 :goto_0
 
     :pswitch_15
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -8873,7 +8873,7 @@
     goto/16 :goto_0
 
     :pswitch_16
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -8888,7 +8888,7 @@
     goto/16 :goto_0
 
     :pswitch_17
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -8903,7 +8903,7 @@
     goto/16 :goto_0
 
     :pswitch_18
-    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int/2addr v7, v9
 
@@ -8926,7 +8926,7 @@
     goto/16 :goto_0
 
     :pswitch_19
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -8941,7 +8941,7 @@
     goto/16 :goto_0
 
     :pswitch_1a
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -8956,7 +8956,7 @@
     goto/16 :goto_0
 
     :pswitch_1b
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -8971,7 +8971,7 @@
     goto/16 :goto_0
 
     :pswitch_1c
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -8986,7 +8986,7 @@
     goto/16 :goto_0
 
     :pswitch_1d
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9001,7 +9001,7 @@
     goto/16 :goto_0
 
     :pswitch_1e
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9016,7 +9016,7 @@
     goto/16 :goto_0
 
     :pswitch_1f
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9031,7 +9031,7 @@
     goto/16 :goto_0
 
     :pswitch_20
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9046,7 +9046,7 @@
     goto/16 :goto_0
 
     :pswitch_21
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9061,7 +9061,7 @@
     goto/16 :goto_0
 
     :pswitch_22
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9076,7 +9076,7 @@
     goto/16 :goto_0
 
     :pswitch_23
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9091,7 +9091,7 @@
     goto/16 :goto_0
 
     :pswitch_24
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9106,7 +9106,7 @@
     goto/16 :goto_0
 
     :pswitch_25
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9121,7 +9121,7 @@
     goto/16 :goto_0
 
     :pswitch_26
-    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int/2addr v7, v9
 
@@ -9144,7 +9144,7 @@
     goto/16 :goto_0
 
     :pswitch_27
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9159,7 +9159,7 @@
     goto/16 :goto_0
 
     :pswitch_28
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9182,7 +9182,7 @@
 
     int-to-long v6, v6
 
-    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     invoke-virtual {v8, p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ek;->a(Ljava/lang/Object;J)Ljava/util/List;
 
@@ -9199,7 +9199,7 @@
 
     if-eqz v5, :cond_10
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9214,7 +9214,7 @@
     goto/16 :goto_0
 
     :cond_10
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9229,7 +9229,7 @@
     goto/16 :goto_0
 
     :pswitch_2b
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9244,7 +9244,7 @@
     goto/16 :goto_0
 
     :pswitch_2c
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9259,7 +9259,7 @@
     goto/16 :goto_0
 
     :pswitch_2d
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9274,7 +9274,7 @@
     goto/16 :goto_0
 
     :pswitch_2e
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9289,7 +9289,7 @@
     goto/16 :goto_0
 
     :pswitch_2f
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9304,7 +9304,7 @@
     goto/16 :goto_0
 
     :pswitch_30
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9319,7 +9319,7 @@
     goto/16 :goto_0
 
     :pswitch_31
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9334,7 +9334,7 @@
     goto/16 :goto_0
 
     :pswitch_32
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     and-int v6, v7, v9
 
@@ -9403,7 +9403,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rm()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rk()J
 
     move-result-wide v9
 
@@ -9418,7 +9418,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rl()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rj()I
 
     move-result v5
 
@@ -9433,7 +9433,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rk()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ri()J
 
     move-result-wide v9
 
@@ -9448,7 +9448,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rj()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rh()I
 
     move-result v5
 
@@ -9459,7 +9459,7 @@
     goto/16 :goto_0
 
     :pswitch_38
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ri()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rg()I
 
     move-result v8
 
@@ -9501,7 +9501,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rh()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rf()I
 
     move-result v5
 
@@ -9516,7 +9516,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rg()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->re()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object v5
 
@@ -9588,7 +9588,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->re()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rc()Z
 
     move-result v5
 
@@ -9603,7 +9603,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rd()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rb()I
 
     move-result v5
 
@@ -9618,7 +9618,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rc()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ra()J
 
     move-result-wide v9
 
@@ -9633,7 +9633,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rb()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->qZ()I
 
     move-result v5
 
@@ -9648,7 +9648,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->qZ()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->qX()J
 
     move-result-wide v9
 
@@ -9663,7 +9663,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ra()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->qY()J
 
     move-result-wide v9
 
@@ -9714,14 +9714,14 @@
 
     if-nez v5, :cond_0
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/ff;->awb:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/ff;->awt:I
 
     :goto_9
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awc:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awu:I
 
     if-ge p2, p3, :cond_16
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awa:[I
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/ff;->aws:[I
 
     aget p3, p3, p2
 
@@ -9758,14 +9758,14 @@
 
     if-nez v5, :cond_0
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/ff;->awb:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/ff;->awt:I
 
     :goto_a
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awc:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awu:I
 
     if-ge p2, p3, :cond_19
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awa:[I
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/ff;->aws:[I
 
     aget p3, p3, p2
 
@@ -9788,14 +9788,14 @@
     :catchall_0
     move-exception p2
 
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awb:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/ff;->awt:I
 
     :goto_b
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awc:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awu:I
 
     if-ge p3, v1, :cond_1b
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awa:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->aws:[I
 
     aget v1, v1, p3
 
@@ -9918,11 +9918,11 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hf;->rH()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hf;->rF()I
 
     move-result v0
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avb:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avt:I
 
     const/high16 v2, 0xff00000
 
@@ -9936,21 +9936,21 @@
 
     if-ne v0, v1, :cond_8
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/ff;->a(Lcom/google/android/gms/internal/measurement/gi;Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hf;)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avW:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awo:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fw;->isEmpty()Z
 
@@ -9958,15 +9958,15 @@
 
     if-nez v1, :cond_1
 
-    iget-boolean v1, v0, Lcom/google/android/gms/internal/measurement/dh;->atu:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/internal/measurement/dh;->atM:Z
 
     if-eqz v1, :cond_0
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/eh;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fw;->tg()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fw;->te()Ljava/util/Set;
 
     move-result-object v0
 
@@ -9981,9 +9981,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fw;->tg()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fw;->te()Ljava/util/Set;
 
     move-result-object v0
 
@@ -10006,7 +10006,7 @@
     move-object v1, v0
 
     :goto_1
-    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     array-length v7, v7
 
@@ -10019,14 +10019,14 @@
 
     move-result v8
 
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
     :goto_3
     if-eqz v1, :cond_3
 
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v10, v1}, Lcom/google/android/gms/internal/measurement/dg;->a(Ljava/util/Map$Entry;)I
 
@@ -10034,7 +10034,7 @@
 
     if-le v10, v9, :cond_3
 
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v10, v1}, Lcom/google/android/gms/internal/measurement/dg;->b(Ljava/util/Map$Entry;)V
 
@@ -10123,7 +10123,7 @@
 
     move-result v8
 
-    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->B(II)V
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->A(II)V
 
     goto/16 :goto_4
 
@@ -10161,7 +10161,7 @@
 
     move-result v8
 
-    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->H(II)V
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->G(II)V
 
     goto/16 :goto_4
 
@@ -10180,7 +10180,7 @@
 
     move-result v8
 
-    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->I(II)V
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->H(II)V
 
     goto/16 :goto_4
 
@@ -10199,7 +10199,7 @@
 
     move-result v8
 
-    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->A(II)V
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->z(II)V
 
     goto/16 :goto_4
 
@@ -10300,7 +10300,7 @@
 
     move-result v8
 
-    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->C(II)V
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->B(II)V
 
     goto/16 :goto_4
 
@@ -10338,7 +10338,7 @@
 
     move-result v8
 
-    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->z(II)V
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->y(II)V
 
     goto/16 :goto_4
 
@@ -10432,7 +10432,7 @@
     goto/16 :goto_4
 
     :pswitch_13
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10455,7 +10455,7 @@
     goto/16 :goto_4
 
     :pswitch_14
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10474,7 +10474,7 @@
     goto/16 :goto_4
 
     :pswitch_15
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10493,7 +10493,7 @@
     goto/16 :goto_4
 
     :pswitch_16
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10512,7 +10512,7 @@
     goto/16 :goto_4
 
     :pswitch_17
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10531,7 +10531,7 @@
     goto/16 :goto_4
 
     :pswitch_18
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10550,7 +10550,7 @@
     goto/16 :goto_4
 
     :pswitch_19
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10569,7 +10569,7 @@
     goto/16 :goto_4
 
     :pswitch_1a
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10588,7 +10588,7 @@
     goto/16 :goto_4
 
     :pswitch_1b
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10607,7 +10607,7 @@
     goto/16 :goto_4
 
     :pswitch_1c
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10626,7 +10626,7 @@
     goto/16 :goto_4
 
     :pswitch_1d
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10645,7 +10645,7 @@
     goto/16 :goto_4
 
     :pswitch_1e
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10664,7 +10664,7 @@
     goto/16 :goto_4
 
     :pswitch_1f
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10683,7 +10683,7 @@
     goto/16 :goto_4
 
     :pswitch_20
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10702,7 +10702,7 @@
     goto/16 :goto_4
 
     :pswitch_21
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10721,7 +10721,7 @@
     goto/16 :goto_4
 
     :pswitch_22
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10740,7 +10740,7 @@
     goto/16 :goto_4
 
     :pswitch_23
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10759,7 +10759,7 @@
     goto/16 :goto_4
 
     :pswitch_24
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10778,7 +10778,7 @@
     goto/16 :goto_4
 
     :pswitch_25
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10797,7 +10797,7 @@
     goto/16 :goto_4
 
     :pswitch_26
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10816,7 +10816,7 @@
     goto/16 :goto_4
 
     :pswitch_27
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10835,7 +10835,7 @@
     goto/16 :goto_4
 
     :pswitch_28
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10854,7 +10854,7 @@
     goto/16 :goto_4
 
     :pswitch_29
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10877,7 +10877,7 @@
     goto/16 :goto_4
 
     :pswitch_2a
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10896,7 +10896,7 @@
     goto/16 :goto_4
 
     :pswitch_2b
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10915,7 +10915,7 @@
     goto/16 :goto_4
 
     :pswitch_2c
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10934,7 +10934,7 @@
     goto/16 :goto_4
 
     :pswitch_2d
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10953,7 +10953,7 @@
     goto/16 :goto_4
 
     :pswitch_2e
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10972,7 +10972,7 @@
     goto/16 :goto_4
 
     :pswitch_2f
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -10991,7 +10991,7 @@
     goto/16 :goto_4
 
     :pswitch_30
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -11010,7 +11010,7 @@
     goto/16 :goto_4
 
     :pswitch_31
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -11029,7 +11029,7 @@
     goto/16 :goto_4
 
     :pswitch_32
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v9, v9, v7
 
@@ -11104,7 +11104,7 @@
 
     move-result v8
 
-    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->B(II)V
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->A(II)V
 
     goto/16 :goto_4
 
@@ -11142,7 +11142,7 @@
 
     move-result v8
 
-    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->H(II)V
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->G(II)V
 
     goto/16 :goto_4
 
@@ -11161,7 +11161,7 @@
 
     move-result v8
 
-    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->I(II)V
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->H(II)V
 
     goto/16 :goto_4
 
@@ -11180,7 +11180,7 @@
 
     move-result v8
 
-    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->A(II)V
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->z(II)V
 
     goto/16 :goto_4
 
@@ -11281,7 +11281,7 @@
 
     move-result v8
 
-    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->C(II)V
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->B(II)V
 
     goto :goto_4
 
@@ -11319,7 +11319,7 @@
 
     move-result v8
 
-    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->z(II)V
+    invoke-interface {p2, v9, v8}, Lcom/google/android/gms/internal/measurement/hf;->y(II)V
 
     goto :goto_4
 
@@ -11407,7 +11407,7 @@
     :goto_5
     if-eqz v1, :cond_7
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/measurement/dg;->b(Ljava/util/Map$Entry;)V
 
@@ -11436,21 +11436,21 @@
     return-void
 
     :cond_8
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avY:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awq:Z
 
     if-eqz v0, :cond_10
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avW:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awo:Z
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fw;->isEmpty()Z
 
@@ -11476,7 +11476,7 @@
     move-object v1, v0
 
     :goto_6
-    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     array-length v7, v7
 
@@ -11491,14 +11491,14 @@
 
     move-result v9
 
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
     :goto_8
     if-eqz v8, :cond_b
 
-    iget-object v11, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v11, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v11, v8}, Lcom/google/android/gms/internal/measurement/dg;->a(Ljava/util/Map$Entry;)I
 
@@ -11506,7 +11506,7 @@
 
     if-gt v11, v10, :cond_b
 
-    iget-object v11, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v11, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v11, v8}, Lcom/google/android/gms/internal/measurement/dg;->b(Ljava/util/Map$Entry;)V
 
@@ -11595,7 +11595,7 @@
 
     move-result v9
 
-    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->B(II)V
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->A(II)V
 
     goto/16 :goto_9
 
@@ -11633,7 +11633,7 @@
 
     move-result v9
 
-    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->H(II)V
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->G(II)V
 
     goto/16 :goto_9
 
@@ -11652,7 +11652,7 @@
 
     move-result v9
 
-    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->I(II)V
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->H(II)V
 
     goto/16 :goto_9
 
@@ -11671,7 +11671,7 @@
 
     move-result v9
 
-    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->A(II)V
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->z(II)V
 
     goto/16 :goto_9
 
@@ -11772,7 +11772,7 @@
 
     move-result v9
 
-    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->C(II)V
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->B(II)V
 
     goto/16 :goto_9
 
@@ -11810,7 +11810,7 @@
 
     move-result v9
 
-    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->z(II)V
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->y(II)V
 
     goto/16 :goto_9
 
@@ -11904,7 +11904,7 @@
     goto/16 :goto_9
 
     :pswitch_58
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -11927,7 +11927,7 @@
     goto/16 :goto_9
 
     :pswitch_59
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -11946,7 +11946,7 @@
     goto/16 :goto_9
 
     :pswitch_5a
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -11965,7 +11965,7 @@
     goto/16 :goto_9
 
     :pswitch_5b
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -11984,7 +11984,7 @@
     goto/16 :goto_9
 
     :pswitch_5c
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12003,7 +12003,7 @@
     goto/16 :goto_9
 
     :pswitch_5d
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12022,7 +12022,7 @@
     goto/16 :goto_9
 
     :pswitch_5e
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12041,7 +12041,7 @@
     goto/16 :goto_9
 
     :pswitch_5f
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12060,7 +12060,7 @@
     goto/16 :goto_9
 
     :pswitch_60
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12079,7 +12079,7 @@
     goto/16 :goto_9
 
     :pswitch_61
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12098,7 +12098,7 @@
     goto/16 :goto_9
 
     :pswitch_62
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12117,7 +12117,7 @@
     goto/16 :goto_9
 
     :pswitch_63
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12136,7 +12136,7 @@
     goto/16 :goto_9
 
     :pswitch_64
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12155,7 +12155,7 @@
     goto/16 :goto_9
 
     :pswitch_65
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12174,7 +12174,7 @@
     goto/16 :goto_9
 
     :pswitch_66
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12193,7 +12193,7 @@
     goto/16 :goto_9
 
     :pswitch_67
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12212,7 +12212,7 @@
     goto/16 :goto_9
 
     :pswitch_68
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12231,7 +12231,7 @@
     goto/16 :goto_9
 
     :pswitch_69
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12250,7 +12250,7 @@
     goto/16 :goto_9
 
     :pswitch_6a
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12269,7 +12269,7 @@
     goto/16 :goto_9
 
     :pswitch_6b
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12288,7 +12288,7 @@
     goto/16 :goto_9
 
     :pswitch_6c
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12307,7 +12307,7 @@
     goto/16 :goto_9
 
     :pswitch_6d
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12326,7 +12326,7 @@
     goto/16 :goto_9
 
     :pswitch_6e
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12349,7 +12349,7 @@
     goto/16 :goto_9
 
     :pswitch_6f
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12368,7 +12368,7 @@
     goto/16 :goto_9
 
     :pswitch_70
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12387,7 +12387,7 @@
     goto/16 :goto_9
 
     :pswitch_71
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12406,7 +12406,7 @@
     goto/16 :goto_9
 
     :pswitch_72
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12425,7 +12425,7 @@
     goto/16 :goto_9
 
     :pswitch_73
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12444,7 +12444,7 @@
     goto/16 :goto_9
 
     :pswitch_74
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12463,7 +12463,7 @@
     goto/16 :goto_9
 
     :pswitch_75
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12482,7 +12482,7 @@
     goto/16 :goto_9
 
     :pswitch_76
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12501,7 +12501,7 @@
     goto/16 :goto_9
 
     :pswitch_77
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v1
 
@@ -12576,7 +12576,7 @@
 
     move-result v9
 
-    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->B(II)V
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->A(II)V
 
     goto/16 :goto_9
 
@@ -12614,7 +12614,7 @@
 
     move-result v9
 
-    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->H(II)V
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->G(II)V
 
     goto/16 :goto_9
 
@@ -12633,7 +12633,7 @@
 
     move-result v9
 
-    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->I(II)V
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->H(II)V
 
     goto/16 :goto_9
 
@@ -12652,7 +12652,7 @@
 
     move-result v9
 
-    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->A(II)V
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->z(II)V
 
     goto/16 :goto_9
 
@@ -12753,7 +12753,7 @@
 
     move-result v9
 
-    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->C(II)V
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->B(II)V
 
     goto :goto_9
 
@@ -12791,7 +12791,7 @@
 
     move-result v9
 
-    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->z(II)V
+    invoke-interface {p2, v10, v9}, Lcom/google/android/gms/internal/measurement/hf;->y(II)V
 
     goto :goto_9
 
@@ -12879,7 +12879,7 @@
     :goto_a
     if-eqz v8, :cond_f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v1, v8}, Lcom/google/android/gms/internal/measurement/dg;->b(Ljava/util/Map$Entry;)V
 
@@ -12905,7 +12905,7 @@
     goto :goto_a
 
     :cond_f
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/ff;->a(Lcom/google/android/gms/internal/measurement/gi;Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hf;)V
 
@@ -13091,11 +13091,11 @@
 
     move-object/from16 v11, p5
 
-    iget-boolean v0, v15, Lcom/google/android/gms/internal/measurement/ff;->avY:Z
+    iget-boolean v0, v15, Lcom/google/android/gms/internal/measurement/ff;->awq:Z
 
     if-eqz v0, :cond_12
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/ff;->avQ:Lsun/misc/Unsafe;
+    sget-object v9, Lcom/google/android/gms/internal/measurement/ff;->awi:Lsun/misc/Unsafe;
 
     const/4 v10, -0x1
 
@@ -13120,7 +13120,7 @@
 
     move-result v0
 
-    iget v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v3, v11, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     move v8, v0
 
@@ -13142,7 +13142,7 @@
 
     div-int/lit8 v2, v2, 0x3
 
-    invoke-direct {v15, v7, v2}, Lcom/google/android/gms/internal/measurement/ff;->K(II)I
+    invoke-direct {v15, v7, v2}, Lcom/google/android/gms/internal/measurement/ff;->J(II)I
 
     move-result v0
 
@@ -13171,7 +13171,7 @@
     goto/16 :goto_e
 
     :cond_2
-    iget-object v0, v15, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v0, v15, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     add-int/lit8 v1, v4, 0x1
 
@@ -13210,7 +13210,7 @@
 
     move-wide/from16 v19, v1
 
-    iget-wide v0, v11, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v0, v11, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     invoke-static {v0, v1}, Lcom/google/android/gms/internal/measurement/cv;->T(J)J
 
@@ -13241,7 +13241,7 @@
 
     move-result v0
 
-    iget v1, v11, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v1, v11, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/cv;->bT(I)I
 
@@ -13262,7 +13262,7 @@
 
     move-result v0
 
-    iget v1, v11, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v1, v11, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-virtual {v9, v14, v2, v3, v1}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
@@ -13277,7 +13277,7 @@
 
     move-result v0
 
-    iget-object v1, v11, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v1, v11, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-virtual {v9, v14, v2, v3, v1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -13302,14 +13302,14 @@
 
     if-nez v1, :cond_3
 
-    iget-object v1, v11, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v1, v11, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-virtual {v9, v14, v2, v3, v1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
     goto :goto_5
 
     :cond_3
-    iget-object v5, v11, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v5, v11, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-static {v1, v5}, Lcom/google/android/gms/internal/measurement/ds;->e(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -13342,7 +13342,7 @@
     move-result v0
 
     :goto_3
-    iget-object v1, v11, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v1, v11, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     invoke-virtual {v9, v14, v2, v3, v1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -13357,7 +13357,7 @@
 
     move-result v1
 
-    iget-wide v5, v11, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v5, v11, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     const-wide/16 v19, 0x0
 
@@ -13431,7 +13431,7 @@
 
     move-result v0
 
-    iget v1, v11, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v1, v11, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     invoke-virtual {v9, v14, v2, v3, v1}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
@@ -13448,7 +13448,7 @@
 
     move-result v6
 
-    iget-wide v4, v11, Lcom/google/android/gms/internal/measurement/ce;->asA:J
+    iget-wide v4, v11, Lcom/google/android/gms/internal/measurement/ce;->asS:J
 
     move-object v0, v9
 
@@ -13527,7 +13527,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dz;->qP()Z
 
     move-result v3
 
@@ -13792,7 +13792,7 @@
     return-void
 
     :cond_11
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sz()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object v0
 
@@ -13851,14 +13851,14 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awb:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awt:I
 
     :goto_0
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awc:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awu:I
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awa:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->aws:[I
 
     aget v1, v1, v0
 
@@ -13878,7 +13878,7 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     invoke-interface {v4, v3}, Lcom/google/android/gms/internal/measurement/eu;->at(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -13892,16 +13892,16 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awa:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->aws:[I
 
     array-length v0, v0
 
     :goto_1
     if-ge v1, v0, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ff;->awa:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ff;->aws:[I
 
     aget v3, v3, v1
 
@@ -13914,15 +13914,15 @@
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gi;->an(Ljava/lang/Object;)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avW:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awo:Z
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dg;->an(Ljava/lang/Object;)V
 
@@ -13942,7 +13942,7 @@
 
     move-object/from16 v1, p1
 
-    iget-boolean v2, v0, Lcom/google/android/gms/internal/measurement/ff;->avY:Z
+    iget-boolean v2, v0, Lcom/google/android/gms/internal/measurement/ff;->awq:Z
 
     const/high16 v3, 0xff00000
 
@@ -13952,14 +13952,14 @@
 
     if-eqz v2, :cond_13
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ff;->avQ:Lsun/misc/Unsafe;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ff;->awi:Lsun/misc/Unsafe;
 
     const/4 v6, 0x0
 
     const/4 v7, 0x0
 
     :goto_0
-    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     array-length v8, v8
 
@@ -13973,7 +13973,7 @@
 
     ushr-int/lit8 v9, v9, 0x14
 
-    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v10, v10, v6
 
@@ -13981,19 +13981,19 @@
 
     int-to-long v11, v8
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/dm;->auk:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/dm;->auC:Lcom/google/android/gms/internal/measurement/dm;
 
     iget v8, v8, Lcom/google/android/gms/internal/measurement/dm;->id:I
 
     if-lt v9, v8, :cond_0
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/dm;->aux:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/dm;->auP:Lcom/google/android/gms/internal/measurement/dm;
 
     iget v8, v8, Lcom/google/android/gms/internal/measurement/dm;->id:I
 
     if-gt v9, v8, :cond_0
 
-    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     add-int/lit8 v13, v6, 0x2
 
@@ -14062,7 +14062,7 @@
 
     move-result v8
 
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->F(II)I
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->E(II)I
 
     move-result v8
 
@@ -14105,7 +14105,7 @@
 
     move-result v8
 
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->G(II)I
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->F(II)I
 
     move-result v8
 
@@ -14122,7 +14122,7 @@
 
     move-result v8
 
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->E(II)I
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->D(II)I
 
     move-result v8
 
@@ -14250,7 +14250,7 @@
 
     move-result v8
 
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->D(II)I
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->C(II)I
 
     move-result v8
 
@@ -14317,7 +14317,7 @@
     goto/16 :goto_3
 
     :pswitch_12
-    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/go;->p(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -14357,7 +14357,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_2
 
@@ -14389,7 +14389,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_3
 
@@ -14421,7 +14421,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_4
 
@@ -14453,7 +14453,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_5
 
@@ -14485,7 +14485,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_6
 
@@ -14517,7 +14517,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_7
 
@@ -14549,7 +14549,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_8
 
@@ -14581,7 +14581,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_9
 
@@ -14613,7 +14613,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_a
 
@@ -14645,7 +14645,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_b
 
@@ -14677,7 +14677,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_c
 
@@ -14709,7 +14709,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_d
 
@@ -14741,7 +14741,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_e
 
@@ -14773,7 +14773,7 @@
 
     if-lez v9, :cond_11
 
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_f
 
@@ -15042,7 +15042,7 @@
 
     move-result v8
 
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->F(II)I
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->E(II)I
 
     move-result v8
 
@@ -15085,7 +15085,7 @@
 
     move-result v8
 
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->G(II)I
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->F(II)I
 
     move-result v8
 
@@ -15102,7 +15102,7 @@
 
     move-result v8
 
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->E(II)I
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->D(II)I
 
     move-result v8
 
@@ -15230,7 +15230,7 @@
 
     move-result v8
 
-    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->D(II)I
+    invoke-static {v10, v8}, Lcom/google/android/gms/internal/measurement/cy;->C(II)I
 
     move-result v8
 
@@ -15303,7 +15303,7 @@
     goto/16 :goto_0
 
     :cond_12
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/ff;->a(Lcom/google/android/gms/internal/measurement/gi;Ljava/lang/Object;)I
 
@@ -15314,7 +15314,7 @@
     return v7
 
     :cond_13
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ff;->avQ:Lsun/misc/Unsafe;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ff;->awi:Lsun/misc/Unsafe;
 
     const/4 v6, -0x1
 
@@ -15327,7 +15327,7 @@
     const/4 v9, 0x0
 
     :goto_5
-    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     array-length v10, v10
 
@@ -15337,7 +15337,7 @@
 
     move-result v10
 
-    iget-object v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v12, v11, v6
 
@@ -15380,23 +15380,23 @@
     goto :goto_8
 
     :cond_15
-    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v11, :cond_16
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dm;->auk:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dm;->auC:Lcom/google/android/gms/internal/measurement/dm;
 
     iget v11, v11, Lcom/google/android/gms/internal/measurement/dm;->id:I
 
     if-lt v13, v11, :cond_16
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dm;->aux:Lcom/google/android/gms/internal/measurement/dm;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dm;->auP:Lcom/google/android/gms/internal/measurement/dm;
 
     iget v11, v11, Lcom/google/android/gms/internal/measurement/dm;->id:I
 
     if-gt v13, v11, :cond_16
 
-    iget-object v11, v0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v11, v0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     add-int/lit8 v14, v6, 0x2
 
@@ -15472,7 +15472,7 @@
 
     move-result v3
 
-    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->F(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->E(II)I
 
     move-result v3
 
@@ -15515,7 +15515,7 @@
 
     move-result v3
 
-    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->G(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->F(II)I
 
     move-result v3
 
@@ -15532,7 +15532,7 @@
 
     move-result v3
 
-    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->E(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->D(II)I
 
     move-result v3
 
@@ -15660,7 +15660,7 @@
 
     move-result v3
 
-    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->D(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->C(II)I
 
     move-result v3
 
@@ -15727,7 +15727,7 @@
     goto/16 :goto_a
 
     :pswitch_57
-    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -15769,7 +15769,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_18
 
@@ -15801,7 +15801,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_19
 
@@ -15833,7 +15833,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_1a
 
@@ -15865,7 +15865,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_1b
 
@@ -15897,7 +15897,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_1c
 
@@ -15929,7 +15929,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_1d
 
@@ -15961,7 +15961,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_1e
 
@@ -15993,7 +15993,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_1f
 
@@ -16025,7 +16025,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_20
 
@@ -16057,7 +16057,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_21
 
@@ -16089,7 +16089,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_22
 
@@ -16121,7 +16121,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_23
 
@@ -16153,7 +16153,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_24
 
@@ -16185,7 +16185,7 @@
 
     if-lez v3, :cond_27
 
-    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->avZ:Z
+    iget-boolean v4, v0, Lcom/google/android/gms/internal/measurement/ff;->awr:Z
 
     if-eqz v4, :cond_25
 
@@ -16484,7 +16484,7 @@
 
     move-result v3
 
-    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->F(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->E(II)I
 
     move-result v3
 
@@ -16521,7 +16521,7 @@
 
     move-result v3
 
-    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->G(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->F(II)I
 
     move-result v3
 
@@ -16536,7 +16536,7 @@
 
     move-result v3
 
-    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->E(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->D(II)I
 
     move-result v3
 
@@ -16650,7 +16650,7 @@
 
     move-result v3
 
-    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->D(II)I
+    invoke-static {v12, v3}, Lcom/google/android/gms/internal/measurement/cy;->C(II)I
 
     move-result v3
 
@@ -16719,7 +16719,7 @@
     goto/16 :goto_5
 
     :cond_28
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/ff;->a(Lcom/google/android/gms/internal/measurement/gi;Ljava/lang/Object;)I
 
@@ -16727,11 +16727,11 @@
 
     add-int/2addr v7, v2
 
-    iget-boolean v2, v0, Lcom/google/android/gms/internal/measurement/ff;->avW:Z
+    iget-boolean v2, v0, Lcom/google/android/gms/internal/measurement/ff;->awo:Z
 
     if-eqz v2, :cond_2b
 
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
@@ -16740,15 +16740,15 @@
     const/4 v2, 0x0
 
     :goto_c
-    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/fw;->te()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/fw;->tc()I
 
     move-result v3
 
     if-ge v5, v3, :cond_29
 
-    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v3, v5}, Lcom/google/android/gms/internal/measurement/fw;->cD(I)Ljava/util/Map$Entry;
 
@@ -16775,9 +16775,9 @@
     goto :goto_c
 
     :cond_29
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fw;->tf()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/fw;->td()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -16988,17 +16988,17 @@
     const/4 v3, 0x0
 
     :goto_0
-    iget v4, p0, Lcom/google/android/gms/internal/measurement/ff;->awb:I
+    iget v4, p0, Lcom/google/android/gms/internal/measurement/ff;->awt:I
 
     const/4 v5, 0x1
 
     if-ge v1, v4, :cond_e
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ff;->awa:[I
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ff;->aws:[I
 
     aget v4, v4, v1
 
-    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v6, v6, v4
 
@@ -17006,13 +17006,13 @@
 
     move-result v7
 
-    iget-boolean v8, p0, Lcom/google/android/gms/internal/measurement/ff;->avY:Z
+    iget-boolean v8, p0, Lcom/google/android/gms/internal/measurement/ff;->awq:Z
 
     const v9, 0xfffff
 
     if-nez v8, :cond_0
 
-    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     add-int/lit8 v10, v4, 0x2
 
@@ -17026,7 +17026,7 @@
 
     if-eq v10, v2, :cond_1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ff;->avQ:Lsun/misc/Unsafe;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ff;->awi:Lsun/misc/Unsafe;
 
     int-to-long v11, v10
 
@@ -17107,7 +17107,7 @@
     goto/16 :goto_5
 
     :cond_4
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     and-int v6, v7, v9
 
@@ -17127,17 +17127,17 @@
 
     if-nez v6, :cond_7
 
-    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
-    invoke-interface {v6}, Lcom/google/android/gms/internal/measurement/eu;->sJ()Lcom/google/android/gms/internal/measurement/er;
+    invoke-interface {v6}, Lcom/google/android/gms/internal/measurement/eu;->sH()Lcom/google/android/gms/internal/measurement/er;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/internal/measurement/er;->avL:Lcom/google/android/gms/internal/measurement/gz;
+    iget-object v6, v6, Lcom/google/android/gms/internal/measurement/er;->awd:Lcom/google/android/gms/internal/measurement/gz;
 
     iget-object v6, v6, Lcom/google/android/gms/internal/measurement/gz;->zzant:Lcom/google/android/gms/internal/measurement/hc;
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/hc;->axN:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/hc;->ayf:Lcom/google/android/gms/internal/measurement/hc;
 
     if-ne v6, v7, :cond_7
 
@@ -17164,7 +17164,7 @@
 
     if-nez v6, :cond_6
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     move-result-object v6
 
@@ -17290,11 +17290,11 @@
     goto/16 :goto_0
 
     :cond_e
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/ff;->avW:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awo:Z
 
     if-eqz v1, :cond_f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v1, p1}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
@@ -17320,7 +17320,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     array-length v0, v0
 
@@ -17818,13 +17818,13 @@
     goto/16 :goto_0
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gi;->aA(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-virtual {v2, p2}, Lcom/google/android/gms/internal/measurement/gi;->aA(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -17839,17 +17839,17 @@
     return v1
 
     :cond_4
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avW:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awo:Z
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v0, p2}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
@@ -17951,7 +17951,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     array-length v1, v1
 
@@ -17967,7 +17967,7 @@
 
     int-to-long v2, v2
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v0
 
@@ -18026,14 +18026,14 @@
     goto/16 :goto_1
 
     :pswitch_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awh:Lcom/google/android/gms/internal/measurement/eu;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awz:Lcom/google/android/gms/internal/measurement/eu;
 
     invoke-static {v1, p1, p2, v2, v3}, Lcom/google/android/gms/internal/measurement/fs;->a(Lcom/google/android/gms/internal/measurement/eu;Ljava/lang/Object;Ljava/lang/Object;J)V
 
     goto/16 :goto_1
 
     :pswitch_5
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awe:Lcom/google/android/gms/internal/measurement/ek;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->aww:Lcom/google/android/gms/internal/measurement/ek;
 
     invoke-virtual {v1, p1, p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ek;->a(Ljava/lang/Object;Ljava/lang/Object;J)V
 
@@ -18326,19 +18326,19 @@
     goto/16 :goto_0
 
     :cond_1
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avY:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awq:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/fs;->a(Lcom/google/android/gms/internal/measurement/gi;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avW:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awo:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/fs;->a(Lcom/google/android/gms/internal/measurement/dg;Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -18440,7 +18440,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     array-length v0, v0
 
@@ -18455,7 +18455,7 @@
 
     move-result v3
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ff;->avR:[I
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/ff;->awj:[I
 
     aget v4, v4, v1
 
@@ -18666,7 +18666,7 @@
 
     move-result v3
 
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ds;->N(Z)I
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ds;->L(Z)I
 
     move-result v3
 
@@ -18956,7 +18956,7 @@
 
     move-result v3
 
-    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ds;->N(Z)I
+    invoke-static {v3}, Lcom/google/android/gms/internal/measurement/ds;->L(Z)I
 
     move-result v3
 
@@ -19059,7 +19059,7 @@
     :cond_2
     mul-int/lit8 v2, v2, 0x35
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gi;->aA(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -19071,13 +19071,13 @@
 
     add-int/2addr v2, v0
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->avW:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awo:Z
 
     if-eqz v0, :cond_3
 
     mul-int/lit8 v2, v2, 0x35
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
@@ -19176,9 +19176,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awd:Lcom/google/android/gms/internal/measurement/fj;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ff;->awv:Lcom/google/android/gms/internal/measurement/fj;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ff;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/fj;->newInstance(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fg.smali
index 063b63fe56..4e92347ba5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fg.smali
@@ -7,5 +7,5 @@
 
 
 # virtual methods
-.method public abstract sT()Lcom/google/android/gms/internal/measurement/fg;
+.method public abstract sR()Lcom/google/android/gms/internal/measurement/fg;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fh.smali
index 0d69e5a609..14bf38f18f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fh.smali
@@ -19,11 +19,11 @@
 
 
 # instance fields
-.field private final avV:Lcom/google/android/gms/internal/measurement/fb;
+.field private final awn:Lcom/google/android/gms/internal/measurement/fb;
 
-.field private final avW:Z
+.field private final awo:Z
 
-.field private final awf:Lcom/google/android/gms/internal/measurement/gi;
+.field private final awx:Lcom/google/android/gms/internal/measurement/gi;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gi<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final awg:Lcom/google/android/gms/internal/measurement/dg;
+.field private final awy:Lcom/google/android/gms/internal/measurement/dg;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/dg<",
@@ -59,17 +59,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fh;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fh;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-virtual {p2, p3}, Lcom/google/android/gms/internal/measurement/dg;->e(Lcom/google/android/gms/internal/measurement/fb;)Z
 
     move-result p1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/fh;->avW:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/fh;->awo:Z
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fh;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fh;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/fh;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/fh;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
     return-void
 .end method
@@ -118,9 +118,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fh;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fh;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gi;->aB(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -130,7 +130,7 @@
 
     :cond_0
     :try_start_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rq()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ro()I
 
     move-result v3
     :try_end_0
@@ -160,7 +160,7 @@
 
     if-ne v4, v5, :cond_3
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fh;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fh;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
     ushr-int/lit8 v3, v3, 0x3
 
@@ -170,7 +170,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dg;->rP()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dg;->rN()V
 
     goto :goto_1
 
@@ -182,7 +182,7 @@
     goto :goto_2
 
     :cond_3
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rr()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rp()Z
 
     move-result v3
 
@@ -197,7 +197,7 @@
 
     :cond_5
     :goto_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rq()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ro()I
 
     move-result v7
 
@@ -211,11 +211,11 @@
 
     if-ne v7, v8, :cond_6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rh()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rf()I
 
     move-result v3
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fh;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fh;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
     invoke-virtual {v1, p3, v5, v3}, Lcom/google/android/gms/internal/measurement/dg;->a(Lcom/google/android/gms/internal/measurement/de;Lcom/google/android/gms/internal/measurement/fb;I)Ljava/lang/Object;
 
@@ -230,19 +230,19 @@
 
     if-eqz v5, :cond_7
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dg;->rP()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dg;->rN()V
 
     goto :goto_0
 
     :cond_7
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rg()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->re()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object v6
 
     goto :goto_0
 
     :cond_8
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rr()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rp()Z
 
     move-result v7
 
@@ -261,7 +261,7 @@
 
     if-eqz v5, :cond_a
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dg;->rQ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dg;->rO()V
 
     goto :goto_1
 
@@ -283,7 +283,7 @@
 
     :cond_c
     :try_start_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sw()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->su()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p2
 
@@ -321,7 +321,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
@@ -350,21 +350,21 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/dj;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->rW()Lcom/google/android/gms/internal/measurement/hc;
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->rU()Lcom/google/android/gms/internal/measurement/hc;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/hc;->axN:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/hc;->ayf:Lcom/google/android/gms/internal/measurement/hc;
 
     if-ne v3, v4, :cond_1
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->rX()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->rV()Z
 
     move-result v3
 
     if-nez v3, :cond_1
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->rY()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->rW()Z
 
     move-result v3
 
@@ -374,13 +374,13 @@
 
     if-eqz v3, :cond_0
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->oU()I
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->oS()I
 
     move-result v2
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ef;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/ef;->avt:Ljava/util/Map$Entry;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/ef;->avL:Ljava/util/Map$Entry;
 
     invoke-interface {v1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
@@ -388,7 +388,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ed;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/eg;->qM()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/eg;->qK()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object v1
 
@@ -397,7 +397,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->oU()I
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->oS()I
 
     move-result v2
 
@@ -419,7 +419,7 @@
     throw p1
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gi;->aA(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -452,13 +452,13 @@
 
     iget-object v1, v0, Lcom/google/android/gms/internal/measurement/dr;->zzahz:Lcom/google/android/gms/internal/measurement/gl;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tn()Lcom/google/android/gms/internal/measurement/gl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tl()Lcom/google/android/gms/internal/measurement/gl;
 
     move-result-object v2
 
     if-ne v1, v2, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tp()Lcom/google/android/gms/internal/measurement/gl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tm()Lcom/google/android/gms/internal/measurement/gl;
 
     move-result-object v1
 
@@ -467,7 +467,7 @@
     :cond_0
     check-cast p1, Lcom/google/android/gms/internal/measurement/dr$b;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$b;->so()Lcom/google/android/gms/internal/measurement/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$b;->sm()Lcom/google/android/gms/internal/measurement/dh;
 
     const/4 p1, 0x0
 
@@ -480,7 +480,7 @@
 
     move-result v4
 
-    iget v2, p5, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v2, p5, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     const/16 p3, 0xb
 
@@ -492,11 +492,11 @@
 
     if-ne p3, v3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fh;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fh;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
-    iget-object v0, p5, Lcom/google/android/gms/internal/measurement/ce;->asC:Lcom/google/android/gms/internal/measurement/de;
+    iget-object v0, p5, Lcom/google/android/gms/internal/measurement/ce;->asU:Lcom/google/android/gms/internal/measurement/de;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fh;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fh;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
     ushr-int/lit8 v5, v2, 0x3
 
@@ -525,7 +525,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     new-instance p1, Ljava/lang/NoSuchMethodError;
 
@@ -552,7 +552,7 @@
 
     move-result v4
 
-    iget v5, p5, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget v5, p5, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
     ushr-int/lit8 v6, v5, 0x3
 
@@ -575,14 +575,14 @@
 
     move-result v4
 
-    iget-object v2, p5, Lcom/google/android/gms/internal/measurement/ce;->asB:Ljava/lang/Object;
+    iget-object v2, p5, Lcom/google/android/gms/internal/measurement/ce;->asT:Ljava/lang/Object;
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/cj;
 
     goto :goto_1
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sX()Lcom/google/android/gms/internal/measurement/fm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fm;->sV()Lcom/google/android/gms/internal/measurement/fm;
 
     new-instance p1, Ljava/lang/NoSuchMethodError;
 
@@ -597,13 +597,13 @@
 
     move-result v4
 
-    iget p3, p5, Lcom/google/android/gms/internal/measurement/ce;->asz:I
+    iget p3, p5, Lcom/google/android/gms/internal/measurement/ce;->asR:I
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
-    iget-object v5, p5, Lcom/google/android/gms/internal/measurement/ce;->asC:Lcom/google/android/gms/internal/measurement/de;
+    iget-object v5, p5, Lcom/google/android/gms/internal/measurement/ce;->asU:Lcom/google/android/gms/internal/measurement/de;
 
-    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fh;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fh;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
     invoke-virtual {v0, v5, v6, p3}, Lcom/google/android/gms/internal/measurement/dg;->a(Lcom/google/android/gms/internal/measurement/de;Lcom/google/android/gms/internal/measurement/fb;I)Ljava/lang/Object;
 
@@ -645,7 +645,7 @@
     return-void
 
     :cond_b
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sz()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -666,11 +666,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gi;->an(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dg;->an(Ljava/lang/Object;)V
 
@@ -685,7 +685,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gi;->aA(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -699,11 +699,11 @@
 
     add-int/2addr v0, v1
 
-    iget-boolean v2, p0, Lcom/google/android/gms/internal/measurement/fh;->avW:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/internal/measurement/fh;->awo:Z
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fh;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fh;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v2, p1}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
@@ -712,15 +712,15 @@
     const/4 v2, 0x0
 
     :goto_0
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/fw;->te()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/fw;->tc()I
 
     move-result v3
 
     if-ge v1, v3, :cond_0
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v3, v1}, Lcom/google/android/gms/internal/measurement/fw;->cD(I)Ljava/util/Map$Entry;
 
@@ -737,9 +737,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fw;->tf()Ljava/lang/Iterable;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fw;->td()Ljava/lang/Iterable;
 
     move-result-object p1
 
@@ -783,7 +783,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
@@ -804,13 +804,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gi;->aA(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fh;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fh;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-virtual {v1, p2}, Lcom/google/android/gms/internal/measurement/gi;->aA(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -827,17 +827,17 @@
     return p1
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fh;->avW:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awo:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v0, p2}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
@@ -863,15 +863,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/fs;->a(Lcom/google/android/gms/internal/measurement/gi;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fh;->avW:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awo:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/fs;->a(Lcom/google/android/gms/internal/measurement/dg;Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -887,7 +887,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awx:Lcom/google/android/gms/internal/measurement/gi;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gi;->aA(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -897,11 +897,11 @@
 
     move-result v0
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/fh;->avW:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/fh;->awo:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fh;->awg:Lcom/google/android/gms/internal/measurement/dg;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fh;->awy:Lcom/google/android/gms/internal/measurement/dg;
 
     invoke-virtual {v1, p1}, Lcom/google/android/gms/internal/measurement/dg;->al(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/dh;
 
@@ -927,13 +927,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fh;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fb;->sh()Lcom/google/android/gms/internal/measurement/fa;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fb;->sf()Lcom/google/android/gms/internal/measurement/fa;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fa;->sm()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fa;->sk()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fi.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fi.smali
index a6a34612ce..8b4abc2d00 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fi.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fi.smali
@@ -21,7 +21,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/dr;
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auS:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avk:I
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/measurement/dr;->bl(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fl.smali
index 86f4403db4..259656144d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fl.smali
@@ -3,47 +3,47 @@
 
 
 # static fields
-.field private static final awi:Lcom/google/android/gms/internal/measurement/fj;
+.field private static final awA:Lcom/google/android/gms/internal/measurement/fj;
 
-.field private static final awj:Lcom/google/android/gms/internal/measurement/fj;
+.field private static final awB:Lcom/google/android/gms/internal/measurement/fj;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fl;->sW()Lcom/google/android/gms/internal/measurement/fj;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fl;->sU()Lcom/google/android/gms/internal/measurement/fj;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fl;->awi:Lcom/google/android/gms/internal/measurement/fj;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fl;->awA:Lcom/google/android/gms/internal/measurement/fj;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/fi;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/fi;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fl;->awj:Lcom/google/android/gms/internal/measurement/fj;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fl;->awB:Lcom/google/android/gms/internal/measurement/fj;
 
     return-void
 .end method
 
-.method static sU()Lcom/google/android/gms/internal/measurement/fj;
+.method static sS()Lcom/google/android/gms/internal/measurement/fj;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fl;->awi:Lcom/google/android/gms/internal/measurement/fj;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fl;->awA:Lcom/google/android/gms/internal/measurement/fj;
 
     return-object v0
 .end method
 
-.method static sV()Lcom/google/android/gms/internal/measurement/fj;
+.method static sT()Lcom/google/android/gms/internal/measurement/fj;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fl;->awj:Lcom/google/android/gms/internal/measurement/fj;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fl;->awB:Lcom/google/android/gms/internal/measurement/fj;
 
     return-object v0
 .end method
 
-.method private static sW()Lcom/google/android/gms/internal/measurement/fj;
+.method private static sU()Lcom/google/android/gms/internal/measurement/fj;
     .locals 3
 
     :try_start_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fm.smali
index 6fc5bf0e75..6a00b58479 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fm.smali
@@ -3,13 +3,13 @@
 
 
 # static fields
-.field private static final awk:Lcom/google/android/gms/internal/measurement/fm;
+.field private static final awC:Lcom/google/android/gms/internal/measurement/fm;
 
 
 # instance fields
-.field private final awl:Lcom/google/android/gms/internal/measurement/fu;
+.field private final awD:Lcom/google/android/gms/internal/measurement/fu;
 
-.field private final awm:Ljava/util/concurrent/ConcurrentMap;
+.field private final awE:Ljava/util/concurrent/ConcurrentMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentMap<",
@@ -30,7 +30,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/fm;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fm;->awk:Lcom/google/android/gms/internal/measurement/fm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fm;->awC:Lcom/google/android/gms/internal/measurement/fm;
 
     return-void
 .end method
@@ -44,21 +44,21 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awm:Ljava/util/concurrent/ConcurrentMap;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awE:Ljava/util/concurrent/ConcurrentMap;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/en;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/en;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awl:Lcom/google/android/gms/internal/measurement/fu;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awD:Lcom/google/android/gms/internal/measurement/fu;
 
     return-void
 .end method
 
-.method public static sX()Lcom/google/android/gms/internal/measurement/fm;
+.method public static sV()Lcom/google/android/gms/internal/measurement/fm;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fm;->awk:Lcom/google/android/gms/internal/measurement/fm;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fm;->awC:Lcom/google/android/gms/internal/measurement/fm;
 
     return-object v0
 .end method
@@ -106,7 +106,7 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/internal/measurement/ds;->d(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awm:Ljava/util/concurrent/ConcurrentMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awE:Ljava/util/concurrent/ConcurrentMap;
 
     invoke-interface {v1, p1}, Ljava/util/concurrent/ConcurrentMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -116,7 +116,7 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awl:Lcom/google/android/gms/internal/measurement/fu;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awD:Lcom/google/android/gms/internal/measurement/fu;
 
     invoke-interface {v1, p1}, Lcom/google/android/gms/internal/measurement/fu;->s(Ljava/lang/Class;)Lcom/google/android/gms/internal/measurement/fq;
 
@@ -128,7 +128,7 @@
 
     invoke-static {v1, v0}, Lcom/google/android/gms/internal/measurement/ds;->d(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awm:Ljava/util/concurrent/ConcurrentMap;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awE:Ljava/util/concurrent/ConcurrentMap;
 
     invoke-interface {v0, p1, v1}, Ljava/util/concurrent/ConcurrentMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fo.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fo.smali
index ad2011b3c3..15190ccd56 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fo.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fo.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field final avS:[Ljava/lang/Object;
+.field final awk:[Ljava/lang/Object;
 
-.field final avV:Lcom/google/android/gms/internal/measurement/fb;
+.field final awn:Lcom/google/android/gms/internal/measurement/fb;
 
 .field private final flags:I
 
@@ -21,11 +21,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fo;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fo;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fo;->info:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/fo;->avS:[Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/fo;->awk:[Ljava/lang/Object;
 
     const/4 p1, 0x0
 
@@ -81,7 +81,7 @@
 
 
 # virtual methods
-.method public final sQ()I
+.method public final sO()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/fo;->flags:I
@@ -92,17 +92,17 @@
 
     if-ne v0, v1, :cond_0
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auX:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avp:I
 
     return v0
 
     :cond_0
-    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->auY:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dr$d;->avq:I
 
     return v0
 .end method
 
-.method public final sR()Z
+.method public final sP()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/fo;->flags:I
@@ -123,10 +123,10 @@
     return v0
 .end method
 
-.method public final sS()Lcom/google/android/gms/internal/measurement/fb;
+.method public final sQ()Lcom/google/android/gms/internal/measurement/fb;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fo;->avV:Lcom/google/android/gms/internal/measurement/fb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fo;->awn:Lcom/google/android/gms/internal/measurement/fb;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fp.smali
index 05de0db3f7..c8a4ed7925 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fp.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field private static final awn:Lcom/google/android/gms/internal/measurement/fp;
+.field private static final awF:Lcom/google/android/gms/internal/measurement/fp;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/fp<",
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field private final avA:Ljava/util/List;
+.field private final avS:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -51,7 +51,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/fp;-><init>(Ljava/util/List;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fp;->awn:Lcom/google/android/gms/internal/measurement/fp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fp;->awF:Lcom/google/android/gms/internal/measurement/fp;
 
     iput-boolean v2, v0, Lcom/google/android/gms/internal/measurement/cd;->zzacz:Z
 
@@ -84,12 +84,12 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cd;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fp;->avA:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fp;->avS:Ljava/util/List;
 
     return-void
 .end method
 
-.method public static sY()Lcom/google/android/gms/internal/measurement/fp;
+.method public static sW()Lcom/google/android/gms/internal/measurement/fp;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -101,7 +101,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fp;->awn:Lcom/google/android/gms/internal/measurement/fp;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fp;->awF:Lcom/google/android/gms/internal/measurement/fp;
 
     return-object v0
 .end method
@@ -116,9 +116,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fp;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fp;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1, p2}, Ljava/util/List;->add(ILjava/lang/Object;)V
 
@@ -144,7 +144,7 @@
 
     invoke-direct {v0, p1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fp;->avA:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fp;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
@@ -170,7 +170,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fp;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fp;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -187,9 +187,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fp;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fp;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
@@ -212,9 +212,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cd;->qR()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fp;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fp;->avS:Ljava/util/List;
 
     invoke-interface {v0, p1, p2}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -232,7 +232,7 @@
 .method public final size()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fp;->avA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fp;->avS:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fr.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fr.smali
index 1da2cd0be2..b3dd18eb07 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fr.smali
@@ -239,7 +239,23 @@
 .method public abstract getTag()I
 .end method
 
-.method public abstract qZ()J
+.method public abstract qX()J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract qY()J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract qZ()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -280,7 +296,7 @@
     .end annotation
 .end method
 
-.method public abstract rc()J
+.method public abstract rc()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -288,7 +304,7 @@
     .end annotation
 .end method
 
-.method public abstract rd()I
+.method public abstract rd()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -296,7 +312,7 @@
     .end annotation
 .end method
 
-.method public abstract re()Z
+.method public abstract re()Lcom/google/android/gms/internal/measurement/cj;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -345,7 +361,7 @@
     .end annotation
 .end method
 
-.method public abstract rf()Ljava/lang/String;
+.method public abstract rf()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -353,7 +369,7 @@
     .end annotation
 .end method
 
-.method public abstract rg()Lcom/google/android/gms/internal/measurement/cj;
+.method public abstract rg()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -369,7 +385,7 @@
     .end annotation
 .end method
 
-.method public abstract ri()I
+.method public abstract ri()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -393,7 +409,7 @@
     .end annotation
 .end method
 
-.method public abstract rl()I
+.method public abstract ro()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -401,23 +417,7 @@
     .end annotation
 .end method
 
-.method public abstract rm()J
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract rq()I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract rr()Z
+.method public abstract rp()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fs.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fs.smali
index c79bc28595..1c3a816258 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fs.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final awo:Ljava/lang/Class;
+.field private static final awG:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -12,7 +12,7 @@
     .end annotation
 .end field
 
-.field private static final awp:Lcom/google/android/gms/internal/measurement/gi;
+.field private static final awH:Lcom/google/android/gms/internal/measurement/gi;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gi<",
@@ -21,7 +21,7 @@
     .end annotation
 .end field
 
-.field private static final awq:Lcom/google/android/gms/internal/measurement/gi;
+.field private static final awI:Lcom/google/android/gms/internal/measurement/gi;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gi<",
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field private static final awr:Lcom/google/android/gms/internal/measurement/gi;
+.field private static final awJ:Lcom/google/android/gms/internal/measurement/gi;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gi<",
@@ -44,33 +44,33 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->tc()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->ta()Ljava/lang/Class;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awo:Ljava/lang/Class;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awG:Ljava/lang/Class;
 
     const/4 v0, 0x0
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/fs;->O(Z)Lcom/google/android/gms/internal/measurement/gi;
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/fs;->M(Z)Lcom/google/android/gms/internal/measurement/gi;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awp:Lcom/google/android/gms/internal/measurement/gi;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awH:Lcom/google/android/gms/internal/measurement/gi;
 
     const/4 v0, 0x1
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/fs;->O(Z)Lcom/google/android/gms/internal/measurement/gi;
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/fs;->M(Z)Lcom/google/android/gms/internal/measurement/gi;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awq:Lcom/google/android/gms/internal/measurement/gi;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awI:Lcom/google/android/gms/internal/measurement/gi;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gk;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/gk;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awr:Lcom/google/android/gms/internal/measurement/gi;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awJ:Lcom/google/android/gms/internal/measurement/gi;
 
     return-void
 .end method
@@ -537,6 +537,64 @@
     return v2
 .end method
 
+.method private static M(Z)Lcom/google/android/gms/internal/measurement/gi;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(Z)",
+            "Lcom/google/android/gms/internal/measurement/gi<",
+            "**>;"
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->tb()Ljava/lang/Class;
+
+    move-result-object v1
+
+    if-nez v1, :cond_0
+
+    return-object v0
+
+    :cond_0
+    const/4 v2, 0x1
+
+    new-array v3, v2, [Ljava/lang/Class;
+
+    sget-object v4, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
+
+    const/4 v5, 0x0
+
+    aput-object v4, v3, v5
+
+    invoke-virtual {v1, v3}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+
+    move-result-object v1
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    invoke-static {p0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p0
+
+    aput-object p0, v2, v5
+
+    invoke-virtual {v1, v2}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/google/android/gms/internal/measurement/gi;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    return-object p0
+
+    :catchall_0
+    return-object v0
+.end method
+
 .method static N(Ljava/util/List;)I
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
@@ -633,64 +691,6 @@
     return p0
 .end method
 
-.method private static O(Z)Lcom/google/android/gms/internal/measurement/gi;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(Z)",
-            "Lcom/google/android/gms/internal/measurement/gi<",
-            "**>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->td()Ljava/lang/Class;
-
-    move-result-object v1
-
-    if-nez v1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    const/4 v2, 0x1
-
-    new-array v3, v2, [Ljava/lang/Class;
-
-    sget-object v4, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
-    const/4 v5, 0x0
-
-    aput-object v4, v3, v5
-
-    invoke-virtual {v1, v3}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
-
-    move-result-object v1
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    invoke-static {p0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p0
-
-    aput-object p0, v2, v5
-
-    invoke-virtual {v1, v2}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, Lcom/google/android/gms/internal/measurement/gi;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    return-object p0
-
-    :catchall_0
-    return-object v0
-.end method
-
 .method static P(Ljava/util/List;)I
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
@@ -743,7 +743,7 @@
 
     if-nez p2, :cond_0
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/gi;->tm()Ljava/lang/Object;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/gi;->tk()Ljava/lang/Object;
 
     move-result-object p2
 
@@ -1007,7 +1007,7 @@
 
     move-result-object p2
 
-    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fw;->isEmpty()Z
 
@@ -1022,15 +1022,15 @@
     const/4 p1, 0x0
 
     :goto_0
-    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fw;->te()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fw;->tc()I
 
     move-result v0
 
     if-ge p1, v0, :cond_0
 
-    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/fw;->cD(I)Ljava/util/Map$Entry;
 
@@ -1043,9 +1043,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/dh;->ats:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/dh;->atK:Lcom/google/android/gms/internal/measurement/fw;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fw;->tf()Ljava/lang/Iterable;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fw;->td()Ljava/lang/Iterable;
 
     move-result-object p1
 
@@ -2140,7 +2140,7 @@
     :cond_1
     check-cast v2, Ljava/lang/String;
 
-    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/cy;->cc(Ljava/lang/String;)I
+    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/cy;->bX(Ljava/lang/String;)I
 
     move-result v2
 
@@ -2174,7 +2174,7 @@
     :cond_3
     check-cast v2, Ljava/lang/String;
 
-    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/cy;->cc(Ljava/lang/String;)I
+    invoke-static {v2}, Lcom/google/android/gms/internal/measurement/cy;->bX(Ljava/lang/String;)I
 
     move-result v2
 
@@ -2310,6 +2310,36 @@
     return-void
 .end method
 
+.method public static sX()Lcom/google/android/gms/internal/measurement/gi;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lcom/google/android/gms/internal/measurement/gi<",
+            "**>;"
+        }
+    .end annotation
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awH:Lcom/google/android/gms/internal/measurement/gi;
+
+    return-object v0
+.end method
+
+.method public static sY()Lcom/google/android/gms/internal/measurement/gi;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lcom/google/android/gms/internal/measurement/gi<",
+            "**>;"
+        }
+    .end annotation
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awI:Lcom/google/android/gms/internal/measurement/gi;
+
+    return-object v0
+.end method
+
 .method public static sZ()Lcom/google/android/gms/internal/measurement/gi;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -2320,42 +2350,12 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awp:Lcom/google/android/gms/internal/measurement/gi;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awJ:Lcom/google/android/gms/internal/measurement/gi;
 
     return-object v0
 .end method
 
-.method public static ta()Lcom/google/android/gms/internal/measurement/gi;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lcom/google/android/gms/internal/measurement/gi<",
-            "**>;"
-        }
-    .end annotation
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awq:Lcom/google/android/gms/internal/measurement/gi;
-
-    return-object v0
-.end method
-
-.method public static tb()Lcom/google/android/gms/internal/measurement/gi;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lcom/google/android/gms/internal/measurement/gi<",
-            "**>;"
-        }
-    .end annotation
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awr:Lcom/google/android/gms/internal/measurement/gi;
-
-    return-object v0
-.end method
-
-.method private static tc()Ljava/lang/Class;
+.method private static ta()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2382,7 +2382,7 @@
     return-object v0
 .end method
 
-.method private static td()Ljava/lang/Class;
+.method private static tb()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2427,7 +2427,7 @@
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awo:Ljava/lang/Class;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awG:Ljava/lang/Class;
 
     if-eqz v0, :cond_1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ft.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ft.smali
index c7e18d8c29..72f1f3e457 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ft.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ft.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static volatile aws:Lcom/google/android/gms/internal/measurement/ht;
+.field private static volatile awK:Lcom/google/android/gms/internal/measurement/ht;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fv.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fv.smali
index f3816c5300..7866be1e26 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fv.smali
@@ -26,17 +26,17 @@
 
 
 # virtual methods
-.method public final qS()V
+.method public final qQ()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fw;->att:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fw;->atL:Z
 
     if-nez v0, :cond_3
 
     const/4 v0, 0x0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fw;->te()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fw;->tc()I
 
     move-result v1
 
@@ -52,7 +52,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/dj;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->rX()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->rV()Z
 
     move-result v2
 
@@ -76,7 +76,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fw;->tf()Ljava/lang/Iterable;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fw;->td()Ljava/lang/Iterable;
 
     move-result-object v0
 
@@ -104,7 +104,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/dj;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->rX()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dj;->rV()Z
 
     move-result v2
 
@@ -125,7 +125,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/fw;->qS()V
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/fw;->qQ()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fw.smali
index aa97a28acf..32e6ca6c50 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fw.smali
@@ -17,11 +17,11 @@
 
 
 # instance fields
-.field att:Z
+.field atL:Z
 
-.field private final awt:I
+.field private final awL:I
 
-.field private awu:Ljava/util/List;
+.field private awM:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field private awv:Ljava/util/Map;
+.field private awN:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field private volatile aww:Lcom/google/android/gms/internal/measurement/gd;
+.field private volatile awO:Lcom/google/android/gms/internal/measurement/gd;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gd;"
@@ -48,7 +48,7 @@
     .end annotation
 .end field
 
-.field private awx:Ljava/util/Map;
+.field private awP:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -57,7 +57,7 @@
     .end annotation
 .end field
 
-.field private volatile awy:Lcom/google/android/gms/internal/measurement/fx;
+.field private volatile awQ:Lcom/google/android/gms/internal/measurement/fx;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/fx;"
@@ -72,25 +72,25 @@
 
     invoke-direct {p0}, Ljava/util/AbstractMap;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/fw;->awt:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/fw;->awL:I
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fw;->awx:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fw;->awP:Ljava/util/Map;
 
     return-void
 .end method
@@ -111,7 +111,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -121,7 +121,7 @@
 
     if-ltz v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -162,7 +162,7 @@
 
     div-int/lit8 v2, v2, 0x2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -217,7 +217,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/fw;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->th()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->tf()V
 
     return-void
 .end method
@@ -225,7 +225,7 @@
 .method static synthetic b(Lcom/google/android/gms/internal/measurement/fw;)Ljava/util/List;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     return-object p0
 .end method
@@ -233,7 +233,7 @@
 .method static synthetic c(Lcom/google/android/gms/internal/measurement/fw;)Ljava/util/Map;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     return-object p0
 .end method
@@ -267,9 +267,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->th()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->tf()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
@@ -281,7 +281,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -289,7 +289,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->ti()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->tg()Ljava/util/SortedMap;
 
     move-result-object v0
 
@@ -301,7 +301,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     new-instance v2, Lcom/google/android/gms/internal/measurement/gb;
 
@@ -324,15 +324,15 @@
 .method static synthetic d(Lcom/google/android/gms/internal/measurement/fw;)Ljava/util/Map;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/fw;->awx:Ljava/util/Map;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/fw;->awP:Ljava/util/Map;
 
     return-object p0
 .end method
 
-.method private final th()V
+.method private final tf()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fw;->att:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fw;->atL:Z
 
     if-nez v0, :cond_0
 
@@ -346,7 +346,7 @@
     throw v0
 .end method
 
-.method private final ti()Ljava/util/SortedMap;
+.method private final tg()Ljava/util/SortedMap;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -356,9 +356,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->th()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->tf()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -366,7 +366,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     instance-of v0, v0, Ljava/util/TreeMap;
 
@@ -376,9 +376,9 @@
 
     invoke-direct {v0}, Ljava/util/TreeMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     check-cast v0, Ljava/util/TreeMap;
 
@@ -386,10 +386,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awx:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awP:Ljava/util/Map;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     check-cast v0, Ljava/util/SortedMap;
 
@@ -406,7 +406,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->th()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->tf()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/fw;->a(Ljava/lang/Comparable;)I
 
@@ -414,7 +414,7 @@
 
     if-ltz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -429,9 +429,9 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->th()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->tf()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
 
@@ -439,7 +439,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     instance-of v1, v1, Ljava/util/ArrayList;
 
@@ -447,22 +447,22 @@
 
     new-instance v1, Ljava/util/ArrayList;
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/fw;->awt:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/fw;->awL:I
 
     invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     :cond_1
     add-int/lit8 v0, v0, 0x1
 
     neg-int v0, v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awt:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awL:I
 
     if-lt v0, v1, :cond_2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->ti()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->tg()Ljava/util/SortedMap;
 
     move-result-object v0
 
@@ -473,17 +473,17 @@
     return-object p1
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
     move-result v1
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/fw;->awt:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/fw;->awL:I
 
     if-ne v1, v2, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     add-int/lit8 v2, v2, -0x1
 
@@ -493,7 +493,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->ti()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->tg()Ljava/util/SortedMap;
 
     move-result-object v2
 
@@ -510,7 +510,7 @@
     invoke-interface {v2, v3, v1}, Ljava/util/SortedMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     new-instance v2, Lcom/google/android/gms/internal/measurement/gb;
 
@@ -533,7 +533,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -547,9 +547,9 @@
 .method public clear()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->th()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->tf()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -557,12 +557,12 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -570,7 +570,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->clear()V
 
@@ -589,7 +589,7 @@
 
     if-gez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -622,7 +622,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->aww:Lcom/google/android/gms/internal/measurement/gd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awO:Lcom/google/android/gms/internal/measurement/gd;
 
     if-nez v0, :cond_0
 
@@ -632,10 +632,10 @@
 
     invoke-direct {v0, p0, v1}, Lcom/google/android/gms/internal/measurement/gd;-><init>(Lcom/google/android/gms/internal/measurement/fw;B)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->aww:Lcom/google/android/gms/internal/measurement/gd;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awO:Lcom/google/android/gms/internal/measurement/gd;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->aww:Lcom/google/android/gms/internal/measurement/gd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awO:Lcom/google/android/gms/internal/measurement/gd;
 
     return-object v0
 .end method
@@ -678,11 +678,11 @@
     return v3
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fw;->te()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fw;->tc()I
 
     move-result v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fw;->te()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fw;->tc()I
 
     move-result v4
 
@@ -732,9 +732,9 @@
     :cond_5
     if-eq v2, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->equals(Ljava/lang/Object;)Z
 
@@ -764,7 +764,7 @@
 
     if-ltz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -779,7 +779,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -791,7 +791,7 @@
 .method public hashCode()I
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fw;->te()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fw;->tc()I
 
     move-result v0
 
@@ -802,7 +802,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {v3, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -821,7 +821,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->size()I
 
@@ -829,7 +829,7 @@
 
     if-lez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->hashCode()I
 
@@ -853,14 +853,14 @@
     return-object p1
 .end method
 
-.method public qS()V
+.method public qQ()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fw;->att:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fw;->atL:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -875,16 +875,16 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-static {v0}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object v0
 
     :goto_0
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awx:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awP:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -899,18 +899,18 @@
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awx:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awP:Ljava/util/Map;
 
     invoke-static {v0}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object v0
 
     :goto_1
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awx:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awP:Ljava/util/Map;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fw;->att:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fw;->atL:Z
 
     :cond_2
     return-void
@@ -926,7 +926,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->th()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fw;->tf()V
 
     check-cast p1, Ljava/lang/Comparable;
 
@@ -943,7 +943,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -956,7 +956,7 @@
     return-object p1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -968,13 +968,13 @@
 .method public size()I
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->size()I
 
@@ -985,10 +985,10 @@
     return v0
 .end method
 
-.method public final te()I
+.method public final tc()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awM:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -997,7 +997,7 @@
     return v0
 .end method
 
-.method public final tf()Ljava/lang/Iterable;
+.method public final td()Ljava/lang/Iterable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1008,7 +1008,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -1016,14 +1016,14 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ga;->tk()Ljava/lang/Iterable;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ga;->ti()Ljava/lang/Iterable;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awN:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -1032,7 +1032,7 @@
     return-object v0
 .end method
 
-.method final tg()Ljava/util/Set;
+.method final te()Ljava/util/Set;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1043,7 +1043,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awy:Lcom/google/android/gms/internal/measurement/fx;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awQ:Lcom/google/android/gms/internal/measurement/fx;
 
     if-nez v0, :cond_0
 
@@ -1053,10 +1053,10 @@
 
     invoke-direct {v0, p0, v1}, Lcom/google/android/gms/internal/measurement/fx;-><init>(Lcom/google/android/gms/internal/measurement/fw;B)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awy:Lcom/google/android/gms/internal/measurement/fx;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awQ:Lcom/google/android/gms/internal/measurement/fx;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awy:Lcom/google/android/gms/internal/measurement/fx;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fw;->awQ:Lcom/google/android/gms/internal/measurement/fx;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fx.smali
index ac7c130366..2729218ec0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fx.smali
@@ -11,14 +11,14 @@
 
 
 # instance fields
-.field private final synthetic awz:Lcom/google/android/gms/internal/measurement/fw;
+.field private final synthetic awR:Lcom/google/android/gms/internal/measurement/fw;
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/gms/internal/measurement/fw;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fx;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fx;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     const/4 v0, 0x0
 
@@ -50,7 +50,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/fy;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fx;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fx;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fy.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fy.smali
index cc50c093aa..5fc483ff9d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fy.smali
@@ -17,7 +17,9 @@
 
 
 # instance fields
-.field private awA:Ljava/util/Iterator;
+.field private final synthetic awR:Lcom/google/android/gms/internal/measurement/fw;
+
+.field private awS:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -27,8 +29,6 @@
     .end annotation
 .end field
 
-.field private final synthetic awz:Lcom/google/android/gms/internal/measurement/fw;
-
 .field private pos:I
 
 
@@ -36,11 +36,11 @@
 .method private constructor <init>(Lcom/google/android/gms/internal/measurement/fw;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fy;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fy;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fy;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fy;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/fw;->b(Lcom/google/android/gms/internal/measurement/fw;)Ljava/util/List;
 
@@ -63,7 +63,7 @@
     return-void
 .end method
 
-.method private final tj()Ljava/util/Iterator;
+.method private final th()Ljava/util/Iterator;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -74,11 +74,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fy;->awA:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fy;->awS:Ljava/util/Iterator;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fy;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fy;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/fw;->d(Lcom/google/android/gms/internal/measurement/fw;)Ljava/util/Map;
 
@@ -92,10 +92,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fy;->awA:Ljava/util/Iterator;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fy;->awS:Ljava/util/Iterator;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fy;->awA:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fy;->awS:Ljava/util/Iterator;
 
     return-object v0
 .end method
@@ -109,7 +109,7 @@
 
     if-lez v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fy;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fy;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/fw;->b(Lcom/google/android/gms/internal/measurement/fw;)Ljava/util/List;
 
@@ -122,7 +122,7 @@
     if-le v0, v1, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fy;->tj()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fy;->th()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -146,7 +146,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fy;->tj()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fy;->th()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -156,7 +156,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fy;->tj()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/fy;->th()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -169,7 +169,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fy;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fy;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/fw;->b(Lcom/google/android/gms/internal/measurement/fw;)Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/g.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/g.smali
index 8e79aa74b5..6c675242cd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/g.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-.field private final synthetic aqw:Ljava/lang/String;
+.field private final synthetic aqO:Ljava/lang/String;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/g;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/g;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/g;->aqw:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/g;->aqO:Ljava/lang/String;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -31,15 +31,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/g;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/g;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/g;->aqw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/g;->aqO:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/g;->aBg:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/g;->aBy:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/iu;->beginAdUnitExposure(Ljava/lang/String;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ga.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ga.smali
index 32658e4ebb..3d5de0459c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ga.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ga.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final awB:Ljava/util/Iterator;
+.field private static final awT:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private static final awC:Ljava/lang/Iterable;
+.field private static final awU:Ljava/lang/Iterable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Iterable<",
@@ -32,18 +32,18 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/fz;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ga;->awB:Ljava/util/Iterator;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ga;->awT:Ljava/util/Iterator;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gc;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/gc;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ga;->awC:Ljava/lang/Iterable;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ga;->awU:Ljava/lang/Iterable;
 
     return-void
 .end method
 
-.method static tk()Ljava/lang/Iterable;
+.method static ti()Ljava/lang/Iterable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -55,15 +55,15 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ga;->awC:Ljava/lang/Iterable;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ga;->awU:Ljava/lang/Iterable;
 
     return-object v0
 .end method
 
-.method static synthetic tl()Ljava/util/Iterator;
+.method static synthetic tj()Ljava/util/Iterator;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ga;->awB:Ljava/util/Iterator;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ga;->awT:Ljava/util/Iterator;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gb.smali
index be5918aa82..85c4995df1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gb.smali
@@ -20,7 +20,9 @@
 
 
 # instance fields
-.field private final awD:Ljava/lang/Comparable;
+.field private final synthetic awR:Lcom/google/android/gms/internal/measurement/fw;
+
+.field private final awV:Ljava/lang/Comparable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TK;"
@@ -28,8 +30,6 @@
     .end annotation
 .end field
 
-.field private final synthetic awz:Lcom/google/android/gms/internal/measurement/fw;
-
 .field private value:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -48,11 +48,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/gb;->awD:Ljava/lang/Comparable;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/gb;->awV:Ljava/lang/Comparable;
 
     iput-object p3, p0, Lcom/google/android/gms/internal/measurement/gb;->value:Ljava/lang/Object;
 
@@ -155,7 +155,7 @@
     :cond_1
     check-cast p1, Ljava/util/Map$Entry;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awD:Ljava/lang/Comparable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awV:Ljava/lang/Comparable;
 
     invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -188,7 +188,7 @@
 .method public final synthetic getKey()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awD:Ljava/lang/Comparable;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awV:Ljava/lang/Comparable;
 
     return-object v0
 .end method
@@ -209,7 +209,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awD:Ljava/lang/Comparable;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awV:Ljava/lang/Comparable;
 
     const/4 v1, 0x0
 
@@ -250,7 +250,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/fw;->a(Lcom/google/android/gms/internal/measurement/fw;)V
 
@@ -264,7 +264,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awD:Ljava/lang/Comparable;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awV:Ljava/lang/Comparable;
 
     invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gc.smali
index 3780e2960b..4c032da428 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gc.smali
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ga;->tl()Ljava/util/Iterator;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ga;->tj()Ljava/util/Iterator;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gd.smali
index 8ffadd236c..1cc9c3e722 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gd.smali
@@ -13,14 +13,14 @@
 
 
 # instance fields
-.field private final synthetic awz:Lcom/google/android/gms/internal/measurement/fw;
+.field private final synthetic awR:Lcom/google/android/gms/internal/measurement/fw;
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/gms/internal/measurement/fw;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gd;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gd;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-direct {p0}, Ljava/util/AbstractSet;-><init>()V
 
@@ -48,7 +48,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -75,7 +75,7 @@
 .method public clear()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fw;->clear()V
 
@@ -87,7 +87,7 @@
 
     check-cast p1, Ljava/util/Map$Entry;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -138,7 +138,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ge;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gd;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gd;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     const/4 v2, 0x0
 
@@ -158,7 +158,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -179,7 +179,7 @@
 .method public size()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fw;->size()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ge.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ge.smali
index deac302c90..1c321f130c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ge.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ge.smali
@@ -17,7 +17,9 @@
 
 
 # instance fields
-.field private awA:Ljava/util/Iterator;
+.field private final synthetic awR:Lcom/google/android/gms/internal/measurement/fw;
+
+.field private awS:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -27,9 +29,7 @@
     .end annotation
 .end field
 
-.field private awE:Z
-
-.field private final synthetic awz:Lcom/google/android/gms/internal/measurement/fw;
+.field private awW:Z
 
 .field private pos:I
 
@@ -38,7 +38,7 @@
 .method private constructor <init>(Lcom/google/android/gms/internal/measurement/fw;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ge;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ge;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,7 +57,7 @@
     return-void
 .end method
 
-.method private final tj()Ljava/util/Iterator;
+.method private final th()Ljava/util/Iterator;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -68,11 +68,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awA:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awS:Ljava/util/Iterator;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/fw;->c(Lcom/google/android/gms/internal/measurement/fw;)Ljava/util/Map;
 
@@ -86,10 +86,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awA:Ljava/util/Iterator;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awS:Ljava/util/Iterator;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awA:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awS:Ljava/util/Iterator;
 
     return-object v0
 .end method
@@ -105,7 +105,7 @@
 
     add-int/2addr v0, v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ge;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ge;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/fw;->b(Lcom/google/android/gms/internal/measurement/fw;)Ljava/util/List;
 
@@ -117,7 +117,7 @@
 
     if-lt v0, v2, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/fw;->c(Lcom/google/android/gms/internal/measurement/fw;)Ljava/util/Map;
 
@@ -129,7 +129,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ge;->tj()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ge;->th()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -156,7 +156,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awE:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awW:Z
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/ge;->pos:I
 
@@ -164,7 +164,7 @@
 
     iput v1, p0, Lcom/google/android/gms/internal/measurement/ge;->pos:I
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/fw;->b(Lcom/google/android/gms/internal/measurement/fw;)Ljava/util/List;
 
@@ -176,7 +176,7 @@
 
     if-ge v1, v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/fw;->b(Lcom/google/android/gms/internal/measurement/fw;)Ljava/util/List;
 
@@ -193,7 +193,7 @@
     return-object v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ge;->tj()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ge;->th()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -209,21 +209,21 @@
 .method public final remove()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awE:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awW:Z
 
     if-eqz v0, :cond_1
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awE:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awW:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/fw;->a(Lcom/google/android/gms/internal/measurement/fw;)V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ge;->pos:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ge;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ge;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/fw;->b(Lcom/google/android/gms/internal/measurement/fw;)Ljava/util/List;
 
@@ -235,7 +235,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awz:Lcom/google/android/gms/internal/measurement/fw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ge;->awR:Lcom/google/android/gms/internal/measurement/fw;
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/ge;->pos:I
 
@@ -248,7 +248,7 @@
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ge;->tj()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ge;->th()Ljava/util/Iterator;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gh.smali
index 54845b46ef..b563a31d4c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gh.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic awF:Lcom/google/android/gms/internal/measurement/cj;
+.field private final synthetic awX:Lcom/google/android/gms/internal/measurement/cj;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/cj;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gh;->awF:Lcom/google/android/gms/internal/measurement/cj;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gh;->awX:Lcom/google/android/gms/internal/measurement/cj;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,7 +25,7 @@
 .method public final bK(I)B
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gh;->awF:Lcom/google/android/gms/internal/measurement/cj;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gh;->awX:Lcom/google/android/gms/internal/measurement/cj;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/cj;->bK(I)B
 
@@ -37,7 +37,7 @@
 .method public final size()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gh;->awF:Lcom/google/android/gms/internal/measurement/cj;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gh;->awX:Lcom/google/android/gms/internal/measurement/cj;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cj;->size()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gi.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gi.smali
index f718efd9ed..73ff32d0b7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gi.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gi.smali
@@ -114,7 +114,7 @@
 
     if-ne v0, v3, :cond_0
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rd()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rb()I
 
     move-result p2
 
@@ -123,7 +123,7 @@
     return v2
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
@@ -135,7 +135,7 @@
     return p1
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gi;->tm()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gi;->tk()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -144,7 +144,7 @@
     or-int/2addr v3, v4
 
     :cond_3
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rq()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ro()I
 
     move-result v4
 
@@ -174,14 +174,14 @@
     return v2
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sw()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->su()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
     throw p1
 
     :cond_6
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rg()Lcom/google/android/gms/internal/measurement/cj;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->re()Lcom/google/android/gms/internal/measurement/cj;
 
     move-result-object p2
 
@@ -190,7 +190,7 @@
     return v2
 
     :cond_7
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->rc()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ra()J
 
     move-result-wide v3
 
@@ -199,7 +199,7 @@
     return v2
 
     :cond_8
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->ra()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fr;->qY()J
 
     move-result-wide v3
 
@@ -315,7 +315,7 @@
     .end annotation
 .end method
 
-.method abstract tm()Ljava/lang/Object;
+.method abstract tk()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TB;"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gk.smali
index c048d28c87..ae3932c372 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gk.smali
@@ -114,13 +114,13 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/dr;->zzahz:Lcom/google/android/gms/internal/measurement/gl;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tn()Lcom/google/android/gms/internal/measurement/gl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tl()Lcom/google/android/gms/internal/measurement/gl;
 
     move-result-object v1
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tp()Lcom/google/android/gms/internal/measurement/gl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tm()Lcom/google/android/gms/internal/measurement/gl;
 
     move-result-object v0
 
@@ -153,13 +153,13 @@
 
     if-ge v0, v2, :cond_1
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     aget v2, v2, v0
 
     ushr-int/lit8 v2, v2, 0x3
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     aget-object v3, v3, v0
 
@@ -212,7 +212,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/gl;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gl;->sf()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gl;->sd()I
 
     move-result p1
 
@@ -265,11 +265,11 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/gl;
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hf;->rH()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hf;->rF()I
 
     move-result v0
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avb:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avt:I
 
     if-ne v0, v1, :cond_1
 
@@ -280,13 +280,13 @@
     :goto_0
     if-ltz v0, :cond_0
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     aget v1, v1, v0
 
     ushr-int/lit8 v1, v1, 0x3
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -307,13 +307,13 @@
 
     if-ge v0, v1, :cond_2
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     aget v1, v1, v0
 
     ushr-int/lit8 v1, v1, 0x3
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -354,7 +354,7 @@
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/gl;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tn()Lcom/google/android/gms/internal/measurement/gl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tl()Lcom/google/android/gms/internal/measurement/gl;
 
     move-result-object v0
 
@@ -374,10 +374,10 @@
     return-object p1
 .end method
 
-.method final synthetic tm()Ljava/lang/Object;
+.method final synthetic tk()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tp()Lcom/google/android/gms/internal/measurement/gl;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gl;->tm()Lcom/google/android/gms/internal/measurement/gl;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gl.smali
index e3d5522e03..c61ff840d5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gl.smali
@@ -3,13 +3,13 @@
 
 
 # static fields
-.field private static final awG:Lcom/google/android/gms/internal/measurement/gl;
+.field private static final awY:Lcom/google/android/gms/internal/measurement/gl;
 
 
 # instance fields
-.field avS:[Ljava/lang/Object;
+.field awZ:[I
 
-.field awH:[I
+.field awk:[Ljava/lang/Object;
 
 .field count:I
 
@@ -32,7 +32,7 @@
 
     invoke-direct {v0, v1, v2, v3, v1}, Lcom/google/android/gms/internal/measurement/gl;-><init>(I[I[Ljava/lang/Object;Z)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gl;->awG:Lcom/google/android/gms/internal/measurement/gl;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gl;->awY:Lcom/google/android/gms/internal/measurement/gl;
 
     return-void
 .end method
@@ -66,9 +66,9 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/measurement/gl;->count:I
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     iput-boolean p4, p0, Lcom/google/android/gms/internal/measurement/gl;->zzacz:Z
 
@@ -84,13 +84,13 @@
 
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     invoke-static {v1, v0}, Ljava/util/Arrays;->copyOf([II)[I
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     iget v3, p0, Lcom/google/android/gms/internal/measurement/gl;->count:I
 
@@ -100,13 +100,13 @@
 
     invoke-static {v2, v5, v1, v3, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
     move-result-object v2
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     iget p0, p0, Lcom/google/android/gms/internal/measurement/gl;->count:I
 
@@ -159,14 +159,14 @@
 
     move-result p0
 
-    invoke-interface {p2, v0, p0}, Lcom/google/android/gms/internal/measurement/hf;->C(II)V
+    invoke-interface {p2, v0, p0}, Lcom/google/android/gms/internal/measurement/hf;->B(II)V
 
     return-void
 
     :cond_0
     new-instance p0, Ljava/lang/RuntimeException;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object p1
 
@@ -175,11 +175,11 @@
     throw p0
 
     :cond_1
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hf;->rH()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hf;->rF()I
 
     move-result p0
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->ava:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avs:I
 
     if-ne p0, v1, :cond_2
 
@@ -234,15 +234,15 @@
     return-void
 .end method
 
-.method public static tn()Lcom/google/android/gms/internal/measurement/gl;
+.method public static tl()Lcom/google/android/gms/internal/measurement/gl;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gl;->awG:Lcom/google/android/gms/internal/measurement/gl;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gl;->awY:Lcom/google/android/gms/internal/measurement/gl;
 
     return-object v0
 .end method
 
-.method static tp()Lcom/google/android/gms/internal/measurement/gl;
+.method static tm()Lcom/google/android/gms/internal/measurement/gl;
     .locals 1
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gl;
@@ -269,11 +269,11 @@
     return-void
 
     :cond_0
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/hf;->rH()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/hf;->rF()I
 
     move-result v0
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->ava:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dr$d;->avs:I
 
     if-ne v0, v1, :cond_2
 
@@ -284,11 +284,11 @@
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     aget v1, v1, v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -309,11 +309,11 @@
     :goto_1
     if-ltz v0, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     aget v1, v1, v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -337,7 +337,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     aget v1, v1, v0
 
@@ -347,7 +347,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -370,7 +370,7 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/gl;->count:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     array-length v1, v1
 
@@ -392,30 +392,30 @@
 
     add-int/2addr v1, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->copyOf([II)[I
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/gl;->count:I
 
     aput p1, v0, v1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     aput-object p2, p1, v1
 
@@ -465,9 +465,9 @@
 
     if-ne v2, v3, :cond_8
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
-    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     const/4 v5, 0x0
 
@@ -495,9 +495,9 @@
     :goto_1
     if-eqz v2, :cond_8
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     iget v3, p0, Lcom/google/android/gms/internal/measurement/gl;->count:I
 
@@ -550,7 +550,7 @@
 
     mul-int/lit8 v1, v1, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     const/4 v3, 0x0
 
@@ -578,7 +578,7 @@
 
     mul-int/lit8 v1, v1, 0x1f
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     iget v2, p0, Lcom/google/android/gms/internal/measurement/gl;->count:I
 
@@ -605,7 +605,7 @@
     return v1
 .end method
 
-.method public final sf()I
+.method public final sd()I
     .locals 6
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/gl;->zzaia:I
@@ -626,7 +626,7 @@
 
     if-ge v0, v2, :cond_6
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->awH:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->awZ:[I
 
     aget v2, v2, v0
 
@@ -652,7 +652,7 @@
 
     if-ne v2, v4, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -669,7 +669,7 @@
     :cond_1
     new-instance v0, Ljava/lang/IllegalStateException;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sx()Lcom/google/android/gms/internal/measurement/eb;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sv()Lcom/google/android/gms/internal/measurement/eb;
 
     move-result-object v1
 
@@ -684,13 +684,13 @@
 
     shl-int/2addr v2, v4
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     aget-object v3, v3, v0
 
     check-cast v3, Lcom/google/android/gms/internal/measurement/gl;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gl;->sf()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gl;->sd()I
 
     move-result v3
 
@@ -699,7 +699,7 @@
     goto :goto_1
 
     :cond_3
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -712,7 +712,7 @@
     goto :goto_1
 
     :cond_4
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -727,7 +727,7 @@
     goto :goto_1
 
     :cond_5
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->avS:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gl;->awk:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gm.smali
index bb55af2c05..bee8733f21 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gm.smali
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field private awI:Ljava/util/ListIterator;
+.field private axa:Ljava/util/ListIterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ListIterator<",
@@ -27,34 +27,34 @@
     .end annotation
 .end field
 
-.field private final synthetic awJ:I
+.field private final synthetic axb:I
 
-.field private final synthetic awK:Lcom/google/android/gms/internal/measurement/gn;
+.field private final synthetic axc:Lcom/google/android/gms/internal/measurement/gn;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/gn;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gm;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gm;->axc:Lcom/google/android/gms/internal/measurement/gn;
 
-    iput p2, p0, Lcom/google/android/gms/internal/measurement/gm;->awJ:I
+    iput p2, p0, Lcom/google/android/gms/internal/measurement/gm;->axb:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gm;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gm;->axc:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/gn;->a(Lcom/google/android/gms/internal/measurement/gn;)Lcom/google/android/gms/internal/measurement/ei;
 
     move-result-object p1
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/gm;->awJ:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/gm;->axb:I
 
     invoke-interface {p1, p2}, Lcom/google/android/gms/internal/measurement/ei;->listIterator(I)Ljava/util/ListIterator;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gm;->awI:Ljava/util/ListIterator;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gm;->axa:Ljava/util/ListIterator;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 .method public final hasNext()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->awI:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->axa:Ljava/util/ListIterator;
 
     invoke-interface {v0}, Ljava/util/ListIterator;->hasNext()Z
 
@@ -86,7 +86,7 @@
 .method public final hasPrevious()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->awI:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->axa:Ljava/util/ListIterator;
 
     invoke-interface {v0}, Ljava/util/ListIterator;->hasPrevious()Z
 
@@ -98,7 +98,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->awI:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->axa:Ljava/util/ListIterator;
 
     invoke-interface {v0}, Ljava/util/ListIterator;->next()Ljava/lang/Object;
 
@@ -112,7 +112,7 @@
 .method public final nextIndex()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->awI:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->axa:Ljava/util/ListIterator;
 
     invoke-interface {v0}, Ljava/util/ListIterator;->nextIndex()I
 
@@ -124,7 +124,7 @@
 .method public final synthetic previous()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->awI:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->axa:Ljava/util/ListIterator;
 
     invoke-interface {v0}, Ljava/util/ListIterator;->previous()Ljava/lang/Object;
 
@@ -138,7 +138,7 @@
 .method public final previousIndex()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->awI:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->axa:Ljava/util/ListIterator;
 
     invoke-interface {v0}, Ljava/util/ListIterator;->previousIndex()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gn.smali
index 31f8512891..8066f551b7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gn.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field private final awL:Lcom/google/android/gms/internal/measurement/ei;
+.field private final axd:Lcom/google/android/gms/internal/measurement/ei;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     invoke-direct {p0}, Ljava/util/AbstractList;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gn;->awL:Lcom/google/android/gms/internal/measurement/ei;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gn;->axd:Lcom/google/android/gms/internal/measurement/ei;
 
     return-void
 .end method
@@ -36,7 +36,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/gn;)Lcom/google/android/gms/internal/measurement/ei;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gn;->awL:Lcom/google/android/gms/internal/measurement/ei;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gn;->axd:Lcom/google/android/gms/internal/measurement/ei;
 
     return-object p0
 .end method
@@ -56,7 +56,7 @@
 .method public final cv(I)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gn;->awL:Lcom/google/android/gms/internal/measurement/ei;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gn;->axd:Lcom/google/android/gms/internal/measurement/ei;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/internal/measurement/ei;->cv(I)Ljava/lang/Object;
 
@@ -68,7 +68,7 @@
 .method public final synthetic get(I)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gn;->awL:Lcom/google/android/gms/internal/measurement/ei;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gn;->axd:Lcom/google/android/gms/internal/measurement/ei;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/internal/measurement/ei;->get(I)Ljava/lang/Object;
 
@@ -115,7 +115,7 @@
     return-object v0
 .end method
 
-.method public final sC()Ljava/util/List;
+.method public final sA()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -125,16 +125,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gn;->awL:Lcom/google/android/gms/internal/measurement/ei;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gn;->axd:Lcom/google/android/gms/internal/measurement/ei;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ei;->sC()Ljava/util/List;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ei;->sA()Ljava/util/List;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final sD()Lcom/google/android/gms/internal/measurement/ei;
+.method public final sB()Lcom/google/android/gms/internal/measurement/ei;
     .locals 0
 
     return-object p0
@@ -143,7 +143,7 @@
 .method public final size()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gn;->awL:Lcom/google/android/gms/internal/measurement/ei;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gn;->axd:Lcom/google/android/gms/internal/measurement/ei;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ei;->size()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$a.smali
index 1a4f97a0ee..367dc8c3b4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$a.smali
@@ -71,7 +71,7 @@
 .method public final a(Ljava/lang/Object;JZ)V
     .locals 1
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axf:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axx:Z
 
     if-eqz v0, :cond_0
 
@@ -106,7 +106,7 @@
 .method public final e(Ljava/lang/Object;JB)V
     .locals 1
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axf:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axx:Z
 
     if-eqz v0, :cond_0
 
@@ -123,7 +123,7 @@
 .method public final m(Ljava/lang/Object;J)Z
     .locals 1
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axf:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axx:Z
 
     if-eqz v0, :cond_0
 
@@ -172,7 +172,7 @@
 .method public final w(Ljava/lang/Object;J)B
     .locals 1
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axf:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axx:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$b.smali
index c3c4bf15c0..7682c361cb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$b.smali
@@ -27,7 +27,7 @@
 .method public final a(JB)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axg:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->putByte(JB)V
 
@@ -37,7 +37,7 @@
 .method public final a(Ljava/lang/Object;JD)V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axg:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axy:Lsun/misc/Unsafe;
 
     move-object v1, p1
 
@@ -53,7 +53,7 @@
 .method public final a(Ljava/lang/Object;JF)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axg:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lsun/misc/Unsafe;->putFloat(Ljava/lang/Object;JF)V
 
@@ -63,7 +63,7 @@
 .method public final a(Ljava/lang/Object;JZ)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axg:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lsun/misc/Unsafe;->putBoolean(Ljava/lang/Object;JZ)V
 
@@ -75,9 +75,9 @@
 
     move-object v0, p0
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/go$b;->axg:Lsun/misc/Unsafe;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/go$b;->axy:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lcom/google/android/gms/internal/measurement/go;->awQ:J
+    sget-wide v2, Lcom/google/android/gms/internal/measurement/go;->axi:J
 
     add-long v4, v2, p2
 
@@ -101,7 +101,7 @@
 .method public final e(Ljava/lang/Object;JB)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axg:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lsun/misc/Unsafe;->putByte(Ljava/lang/Object;JB)V
 
@@ -111,7 +111,7 @@
 .method public final m(Ljava/lang/Object;J)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axg:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getBoolean(Ljava/lang/Object;J)Z
 
@@ -123,7 +123,7 @@
 .method public final n(Ljava/lang/Object;J)F
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axg:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getFloat(Ljava/lang/Object;J)F
 
@@ -135,7 +135,7 @@
 .method public final o(Ljava/lang/Object;J)D
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axg:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getDouble(Ljava/lang/Object;J)D
 
@@ -147,7 +147,7 @@
 .method public final w(Ljava/lang/Object;J)B
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axg:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$b;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getByte(Ljava/lang/Object;J)B
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$c.smali
index f0636a9b37..cc0f74eaa7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$c.smali
@@ -65,7 +65,7 @@
 .method public final a(Ljava/lang/Object;JZ)V
     .locals 1
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axf:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axx:Z
 
     if-eqz v0, :cond_0
 
@@ -94,7 +94,7 @@
 .method public final e(Ljava/lang/Object;JB)V
     .locals 1
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axf:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axx:Z
 
     if-eqz v0, :cond_0
 
@@ -111,7 +111,7 @@
 .method public final m(Ljava/lang/Object;J)Z
     .locals 1
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axf:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axx:Z
 
     if-eqz v0, :cond_0
 
@@ -160,7 +160,7 @@
 .method public final w(Ljava/lang/Object;J)B
     .locals 1
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axf:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axx:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$d.smali
index f0c7ce5b71..c46aa57a0d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go$d.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field axg:Lsun/misc/Unsafe;
+.field axy:Lsun/misc/Unsafe;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/go$d;->axg:Lsun/misc/Unsafe;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/go$d;->axy:Lsun/misc/Unsafe;
 
     return-void
 .end method
@@ -42,7 +42,7 @@
 .method public final a(Ljava/lang/Object;JJ)V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$d;->axg:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$d;->axy:Lsun/misc/Unsafe;
 
     move-object v1, p1
 
@@ -64,7 +64,7 @@
 .method public final b(Ljava/lang/Object;JI)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$d;->axg:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$d;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
@@ -77,7 +77,7 @@
 .method public final k(Ljava/lang/Object;J)I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$d;->axg:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$d;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
@@ -89,7 +89,7 @@
 .method public final l(Ljava/lang/Object;J)J
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$d;->axg:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/go$d;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getLong(Ljava/lang/Object;J)J
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go.smali
index 5f0904ee49..dcc2cce817 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/go.smali
@@ -14,9 +14,7 @@
 
 
 # static fields
-.field private static final asX:Z
-
-.field private static final asx:Ljava/lang/Class;
+.field private static final asP:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,47 +23,49 @@
     .end annotation
 .end field
 
-.field private static final avQ:Lsun/misc/Unsafe;
+.field private static final atp:Z
 
-.field private static final awM:Z
+.field private static final awi:Lsun/misc/Unsafe;
 
-.field private static final awN:Z
+.field private static final axe:Z
 
-.field private static final awO:Lcom/google/android/gms/internal/measurement/go$d;
+.field private static final axf:Z
 
-.field private static final awP:Z
+.field private static final axg:Lcom/google/android/gms/internal/measurement/go$d;
 
-.field static final awQ:J
+.field private static final axh:Z
 
-.field private static final awR:J
+.field static final axi:J
 
-.field private static final awS:J
+.field private static final axj:J
 
-.field private static final awT:J
+.field private static final axk:J
 
-.field private static final awU:J
+.field private static final axl:J
 
-.field private static final awV:J
+.field private static final axm:J
 
-.field private static final awW:J
+.field private static final axn:J
 
-.field private static final awX:J
+.field private static final axo:J
 
-.field private static final awY:J
+.field private static final axp:J
 
-.field private static final awZ:J
+.field private static final axq:J
 
-.field private static final axa:J
+.field private static final axr:J
 
-.field private static final axb:J
+.field private static final axs:J
 
-.field private static final axc:J
+.field private static final axt:J
 
-.field private static final axd:J
+.field private static final axu:J
 
-.field private static final axe:I
+.field private static final axv:J
 
-.field static final axf:Z
+.field private static final axw:I
+
+.field static final axx:Z
 
 .field private static final logger:Ljava/util/logging/Logger;
 
@@ -96,17 +96,17 @@
 
     sput-object v5, Lcom/google/android/gms/internal/measurement/go;->logger:Ljava/util/logging/Logger;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->ts()Lsun/misc/Unsafe;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tq()Lsun/misc/Unsafe;
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/go;->avQ:Lsun/misc/Unsafe;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/go;->awi:Lsun/misc/Unsafe;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qQ()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qO()Ljava/lang/Class;
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/go;->asx:Ljava/lang/Class;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/go;->asP:Ljava/lang/Class;
 
     sget-object v5, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
 
@@ -114,7 +114,7 @@
 
     move-result v5
 
-    sput-boolean v5, Lcom/google/android/gms/internal/measurement/go;->awM:Z
+    sput-boolean v5, Lcom/google/android/gms/internal/measurement/go;->axe:Z
 
     sget-object v5, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
 
@@ -122,9 +122,9 @@
 
     move-result v5
 
-    sput-boolean v5, Lcom/google/android/gms/internal/measurement/go;->awN:Z
+    sput-boolean v5, Lcom/google/android/gms/internal/measurement/go;->axf:Z
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/go;->avQ:Lsun/misc/Unsafe;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/go;->awi:Lsun/misc/Unsafe;
 
     const/4 v6, 0x0
 
@@ -133,32 +133,32 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qP()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qN()Z
 
     move-result v5
 
     if-eqz v5, :cond_2
 
-    sget-boolean v5, Lcom/google/android/gms/internal/measurement/go;->awM:Z
+    sget-boolean v5, Lcom/google/android/gms/internal/measurement/go;->axe:Z
 
     if-eqz v5, :cond_1
 
     new-instance v6, Lcom/google/android/gms/internal/measurement/go$c;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/go;->avQ:Lsun/misc/Unsafe;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/go;->awi:Lsun/misc/Unsafe;
 
     invoke-direct {v6, v5}, Lcom/google/android/gms/internal/measurement/go$c;-><init>(Lsun/misc/Unsafe;)V
 
     goto :goto_0
 
     :cond_1
-    sget-boolean v5, Lcom/google/android/gms/internal/measurement/go;->awN:Z
+    sget-boolean v5, Lcom/google/android/gms/internal/measurement/go;->axf:Z
 
     if-eqz v5, :cond_3
 
     new-instance v6, Lcom/google/android/gms/internal/measurement/go$a;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/go;->avQ:Lsun/misc/Unsafe;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/go;->awi:Lsun/misc/Unsafe;
 
     invoke-direct {v6, v5}, Lcom/google/android/gms/internal/measurement/go$a;-><init>(Lsun/misc/Unsafe;)V
 
@@ -167,25 +167,25 @@
     :cond_2
     new-instance v6, Lcom/google/android/gms/internal/measurement/go$b;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/go;->avQ:Lsun/misc/Unsafe;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/go;->awi:Lsun/misc/Unsafe;
 
     invoke-direct {v6, v5}, Lcom/google/android/gms/internal/measurement/go$b;-><init>(Lsun/misc/Unsafe;)V
 
     :cond_3
     :goto_0
-    sput-object v6, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sput-object v6, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tu()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->ts()Z
 
     move-result v5
 
-    sput-boolean v5, Lcom/google/android/gms/internal/measurement/go;->awP:Z
+    sput-boolean v5, Lcom/google/android/gms/internal/measurement/go;->axh:Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tt()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tr()Z
 
     move-result v5
 
-    sput-boolean v5, Lcom/google/android/gms/internal/measurement/go;->asX:Z
+    sput-boolean v5, Lcom/google/android/gms/internal/measurement/go;->atp:Z
 
     const-class v5, [B
 
@@ -195,7 +195,7 @@
 
     int-to-long v5, v5
 
-    sput-wide v5, Lcom/google/android/gms/internal/measurement/go;->awQ:J
+    sput-wide v5, Lcom/google/android/gms/internal/measurement/go;->axi:J
 
     invoke-static {v4}, Lcom/google/android/gms/internal/measurement/go;->w(Ljava/lang/Class;)I
 
@@ -203,7 +203,7 @@
 
     int-to-long v5, v5
 
-    sput-wide v5, Lcom/google/android/gms/internal/measurement/go;->awR:J
+    sput-wide v5, Lcom/google/android/gms/internal/measurement/go;->axj:J
 
     invoke-static {v4}, Lcom/google/android/gms/internal/measurement/go;->x(Ljava/lang/Class;)I
 
@@ -211,7 +211,7 @@
 
     int-to-long v4, v4
 
-    sput-wide v4, Lcom/google/android/gms/internal/measurement/go;->awS:J
+    sput-wide v4, Lcom/google/android/gms/internal/measurement/go;->axk:J
 
     invoke-static {v3}, Lcom/google/android/gms/internal/measurement/go;->w(Ljava/lang/Class;)I
 
@@ -219,7 +219,7 @@
 
     int-to-long v4, v4
 
-    sput-wide v4, Lcom/google/android/gms/internal/measurement/go;->awT:J
+    sput-wide v4, Lcom/google/android/gms/internal/measurement/go;->axl:J
 
     invoke-static {v3}, Lcom/google/android/gms/internal/measurement/go;->x(Ljava/lang/Class;)I
 
@@ -227,7 +227,7 @@
 
     int-to-long v3, v3
 
-    sput-wide v3, Lcom/google/android/gms/internal/measurement/go;->awU:J
+    sput-wide v3, Lcom/google/android/gms/internal/measurement/go;->axm:J
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/go;->w(Ljava/lang/Class;)I
 
@@ -235,7 +235,7 @@
 
     int-to-long v3, v3
 
-    sput-wide v3, Lcom/google/android/gms/internal/measurement/go;->awV:J
+    sput-wide v3, Lcom/google/android/gms/internal/measurement/go;->axn:J
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/go;->x(Ljava/lang/Class;)I
 
@@ -243,7 +243,7 @@
 
     int-to-long v2, v2
 
-    sput-wide v2, Lcom/google/android/gms/internal/measurement/go;->awW:J
+    sput-wide v2, Lcom/google/android/gms/internal/measurement/go;->axo:J
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/go;->w(Ljava/lang/Class;)I
 
@@ -251,7 +251,7 @@
 
     int-to-long v2, v2
 
-    sput-wide v2, Lcom/google/android/gms/internal/measurement/go;->awX:J
+    sput-wide v2, Lcom/google/android/gms/internal/measurement/go;->axp:J
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/go;->x(Ljava/lang/Class;)I
 
@@ -259,7 +259,7 @@
 
     int-to-long v1, v1
 
-    sput-wide v1, Lcom/google/android/gms/internal/measurement/go;->awY:J
+    sput-wide v1, Lcom/google/android/gms/internal/measurement/go;->axq:J
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/go;->w(Ljava/lang/Class;)I
 
@@ -267,7 +267,7 @@
 
     int-to-long v1, v1
 
-    sput-wide v1, Lcom/google/android/gms/internal/measurement/go;->awZ:J
+    sput-wide v1, Lcom/google/android/gms/internal/measurement/go;->axr:J
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/go;->x(Ljava/lang/Class;)I
 
@@ -275,7 +275,7 @@
 
     int-to-long v0, v0
 
-    sput-wide v0, Lcom/google/android/gms/internal/measurement/go;->axa:J
+    sput-wide v0, Lcom/google/android/gms/internal/measurement/go;->axs:J
 
     const-class v0, [Ljava/lang/Object;
 
@@ -285,7 +285,7 @@
 
     int-to-long v0, v0
 
-    sput-wide v0, Lcom/google/android/gms/internal/measurement/go;->axb:J
+    sput-wide v0, Lcom/google/android/gms/internal/measurement/go;->axt:J
 
     const-class v0, [Ljava/lang/Object;
 
@@ -295,22 +295,22 @@
 
     int-to-long v0, v0
 
-    sput-wide v0, Lcom/google/android/gms/internal/measurement/go;->axc:J
+    sput-wide v0, Lcom/google/android/gms/internal/measurement/go;->axu:J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tv()Ljava/lang/reflect/Field;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tt()Ljava/lang/reflect/Field;
 
     move-result-object v0
 
     if-eqz v0, :cond_5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
     if-nez v1, :cond_4
 
     goto :goto_1
 
     :cond_4
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/go$d;->axg:Lsun/misc/Unsafe;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/go$d;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
 
@@ -323,9 +323,9 @@
     const-wide/16 v0, -0x1
 
     :goto_2
-    sput-wide v0, Lcom/google/android/gms/internal/measurement/go;->axd:J
+    sput-wide v0, Lcom/google/android/gms/internal/measurement/go;->axv:J
 
-    sget-wide v0, Lcom/google/android/gms/internal/measurement/go;->awQ:J
+    sget-wide v0, Lcom/google/android/gms/internal/measurement/go;->axi:J
 
     const-wide/16 v2, 0x7
 
@@ -333,7 +333,7 @@
 
     long-to-int v1, v0
 
-    sput v1, Lcom/google/android/gms/internal/measurement/go;->axe:I
+    sput v1, Lcom/google/android/gms/internal/measurement/go;->axw:I
 
     invoke-static {}, Ljava/nio/ByteOrder;->nativeOrder()Ljava/nio/ByteOrder;
 
@@ -351,7 +351,7 @@
     const/4 v0, 0x0
 
     :goto_3
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axf:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axx:Z
 
     return-void
 .end method
@@ -367,9 +367,9 @@
 .method static a([BJ)B
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
-    sget-wide v1, Lcom/google/android/gms/internal/measurement/go;->awQ:J
+    sget-wide v1, Lcom/google/android/gms/internal/measurement/go;->axi:J
 
     add-long/2addr v1, p1
 
@@ -383,7 +383,7 @@
 .method static a(JB)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/go$d;->a(JB)V
 
@@ -431,7 +431,7 @@
 .method static a(Ljava/lang/Object;JD)V
     .locals 6
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
     move-object v1, p0
 
@@ -447,7 +447,7 @@
 .method static a(Ljava/lang/Object;JF)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
     invoke-virtual {v0, p0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/go$d;->a(Ljava/lang/Object;JF)V
 
@@ -457,7 +457,7 @@
 .method static a(Ljava/lang/Object;JJ)V
     .locals 6
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
     move-object v1, p0
 
@@ -473,9 +473,9 @@
 .method static a(Ljava/lang/Object;JLjava/lang/Object;)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/go$d;->axg:Lsun/misc/Unsafe;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/go$d;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0, p1, p2, p3}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -485,7 +485,7 @@
 .method static a(Ljava/lang/Object;JZ)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
     invoke-virtual {v0, p0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/go$d;->a(Ljava/lang/Object;JZ)V
 
@@ -495,9 +495,9 @@
 .method static a([BJB)V
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
-    sget-wide v1, Lcom/google/android/gms/internal/measurement/go;->awQ:J
+    sget-wide v1, Lcom/google/android/gms/internal/measurement/go;->axi:J
 
     add-long/2addr v1, p1
 
@@ -509,7 +509,7 @@
 .method static a([BJJJ)V
     .locals 8
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
     move-object v1, p0
 
@@ -563,7 +563,7 @@
 .method static b(Ljava/lang/Object;JI)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
     invoke-virtual {v0, p0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/go$d;->b(Ljava/lang/Object;JI)V
 
@@ -583,9 +583,9 @@
 .method static c(Ljava/nio/ByteBuffer;)J
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
-    sget-wide v1, Lcom/google/android/gms/internal/measurement/go;->axd:J
+    sget-wide v1, Lcom/google/android/gms/internal/measurement/go;->axv:J
 
     invoke-virtual {v0, p0, v1, v2}, Lcom/google/android/gms/internal/measurement/go$d;->l(Ljava/lang/Object;J)J
 
@@ -652,7 +652,7 @@
 .method static k(Ljava/lang/Object;J)I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/go$d;->k(Ljava/lang/Object;J)I
 
@@ -664,7 +664,7 @@
 .method static l(Ljava/lang/Object;J)J
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/go$d;->l(Ljava/lang/Object;J)J
 
@@ -676,7 +676,7 @@
 .method static m(Ljava/lang/Object;J)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/go$d;->m(Ljava/lang/Object;J)Z
 
@@ -688,7 +688,7 @@
 .method static n(Ljava/lang/Object;J)F
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/go$d;->n(Ljava/lang/Object;J)F
 
@@ -700,7 +700,7 @@
 .method static o(Ljava/lang/Object;J)D
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/go$d;->o(Ljava/lang/Object;J)D
 
@@ -712,9 +712,9 @@
 .method static p(Ljava/lang/Object;J)Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/go$d;->axg:Lsun/misc/Unsafe;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/go$d;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0, p1, p2}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -803,23 +803,23 @@
     return p0
 .end method
 
-.method static tq()Z
+.method static tn()Z
     .locals 1
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->asX:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->atp:Z
 
     return v0
 .end method
 
-.method static tr()Z
+.method static tp()Z
     .locals 1
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->awP:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->axh:Z
 
     return v0
 .end method
 
-.method static ts()Lsun/misc/Unsafe;
+.method static tq()Lsun/misc/Unsafe;
     .locals 1
 
     :try_start_0
@@ -844,10 +844,10 @@
     return-object v0
 .end method
 
-.method private static tt()Z
+.method private static tr()Z
     .locals 8
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->avQ:Lsun/misc/Unsafe;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awi:Lsun/misc/Unsafe;
 
     const/4 v1, 0x0
 
@@ -993,7 +993,7 @@
 
     invoke-virtual {v0, v2, v6}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qP()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qN()Z
 
     move-result v2
 
@@ -1178,14 +1178,14 @@
     return v1
 .end method
 
-.method private static tu()Z
+.method private static ts()Z
     .locals 9
 
     const-string v0, "copyMemory"
 
     const-string v1, "getLong"
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/go;->avQ:Lsun/misc/Unsafe;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/go;->awi:Lsun/misc/Unsafe;
 
     const/4 v3, 0x0
 
@@ -1225,7 +1225,7 @@
 
     invoke-virtual {v2, v1, v6}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tv()Ljava/lang/reflect/Field;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tt()Ljava/lang/reflect/Field;
 
     move-result-object v6
 
@@ -1234,7 +1234,7 @@
     return v3
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qP()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qN()Z
 
     move-result v6
 
@@ -1407,10 +1407,10 @@
     return v3
 .end method
 
-.method private static tv()Ljava/lang/reflect/Field;
+.method private static tt()Ljava/lang/reflect/Field;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qP()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qN()Z
 
     move-result v0
 
@@ -1487,7 +1487,7 @@
     .end annotation
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->avQ:Lsun/misc/Unsafe;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awi:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0}, Lsun/misc/Unsafe;->allocateInstance(Ljava/lang/Class;)Ljava/lang/Object;
 
@@ -1536,13 +1536,13 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->asX:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->atp:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/go$d;->axg:Lsun/misc/Unsafe;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/go$d;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0}, Lsun/misc/Unsafe;->arrayBaseOffset(Ljava/lang/Class;)I
 
@@ -1566,13 +1566,13 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->asX:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/go;->atp:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->awO:Lcom/google/android/gms/internal/measurement/go$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/go;->axg:Lcom/google/android/gms/internal/measurement/go$d;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/go$d;->axg:Lsun/misc/Unsafe;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/go$d;->axy:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0}, Lsun/misc/Unsafe;->arrayIndexScale(Ljava/lang/Class;)I
 
@@ -1598,7 +1598,7 @@
 
     const-class v0, [B
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qP()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qN()Z
 
     move-result v1
 
@@ -1610,7 +1610,7 @@
 
     :cond_0
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/go;->asx:Ljava/lang/Class;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/go;->asP:Ljava/lang/Class;
 
     const-string v3, "peekLong"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gp.smali
index 0b234f57f2..2cd27e12ca 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gp.smali
@@ -17,9 +17,9 @@
 
 
 # instance fields
-.field private final synthetic awK:Lcom/google/android/gms/internal/measurement/gn;
+.field private final synthetic axc:Lcom/google/android/gms/internal/measurement/gn;
 
-.field private axh:Ljava/util/Iterator;
+.field private axz:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -34,11 +34,11 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/gn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gp;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gp;->axc:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gp;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gp;->axc:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/gn;->a(Lcom/google/android/gms/internal/measurement/gn;)Lcom/google/android/gms/internal/measurement/ei;
 
@@ -48,7 +48,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gp;->axh:Ljava/util/Iterator;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gp;->axz:Ljava/util/Iterator;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 .method public final hasNext()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gp;->axh:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gp;->axz:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -70,7 +70,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gp;->axh:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gp;->axz:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gr.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gr.smali
index 528639fe12..357a3642a4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gr.smali
@@ -3,20 +3,20 @@
 
 
 # static fields
-.field private static final axi:Lcom/google/android/gms/internal/measurement/gs;
+.field private static final axA:Lcom/google/android/gms/internal/measurement/gs;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tq()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tn()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tr()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/go;->tp()Z
 
     move-result v0
 
@@ -32,7 +32,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qP()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/cc;->qN()Z
 
     move-result v0
 
@@ -50,12 +50,12 @@
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/gw;-><init>()V
 
     :goto_1
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gr;->axi:Lcom/google/android/gms/internal/measurement/gs;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gr;->axA:Lcom/google/android/gms/internal/measurement/gs;
 
     return-void
 .end method
 
-.method private static M(II)I
+.method private static L(II)I
     .locals 1
 
     const/16 v0, -0xc
@@ -82,10 +82,10 @@
     return p0
 .end method
 
-.method static synthetic N(II)I
+.method static synthetic M(II)I
     .locals 0
 
-    invoke-static {p0, p1}, Lcom/google/android/gms/internal/measurement/gr;->M(II)I
+    invoke-static {p0, p1}, Lcom/google/android/gms/internal/measurement/gr;->L(II)I
 
     move-result p0
 
@@ -95,7 +95,7 @@
 .method static a(Ljava/lang/CharSequence;[BII)I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gr;->axi:Lcom/google/android/gms/internal/measurement/gs;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gr;->axA:Lcom/google/android/gms/internal/measurement/gs;
 
     invoke-virtual {v0, p0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/gs;->b(Ljava/lang/CharSequence;[BII)I
 
@@ -107,7 +107,7 @@
 .method static a(Ljava/lang/CharSequence;Ljava/nio/ByteBuffer;)V
     .locals 4
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gr;->axi:Lcom/google/android/gms/internal/measurement/gs;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gr;->axA:Lcom/google/android/gms/internal/measurement/gs;
 
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->hasArray()Z
 
@@ -338,7 +338,7 @@
 .method public static f([BII)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gr;->axi:Lcom/google/android/gms/internal/measurement/gs;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gr;->axA:Lcom/google/android/gms/internal/measurement/gs;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/gs;->f([BII)Z
 
@@ -355,7 +355,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gr;->axi:Lcom/google/android/gms/internal/measurement/gs;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gr;->axA:Lcom/google/android/gms/internal/measurement/gs;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/gs;->g([BII)Ljava/lang/String;
 
@@ -405,7 +405,7 @@
     :cond_1
     aget-byte p0, p0, p1
 
-    invoke-static {v0, p0}, Lcom/google/android/gms/internal/measurement/gr;->M(II)I
+    invoke-static {v0, p0}, Lcom/google/android/gms/internal/measurement/gr;->L(II)I
 
     move-result p0
 
@@ -465,7 +465,7 @@
 .method public static o([B)Z
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gr;->axi:Lcom/google/android/gms/internal/measurement/gs;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gr;->axA:Lcom/google/android/gms/internal/measurement/gs;
 
     array-length v1, p0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gt.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gt.smali
index 1944938cbc..6d04b34fd3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gt.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gt.smali
@@ -3,30 +3,30 @@
 
 
 # static fields
-.field private static final axk:Ljava/lang/reflect/Method;
+.field private static final axC:Ljava/lang/reflect/Method;
 
-.field private static final axl:Ljava/lang/reflect/Method;
+.field private static final axD:Ljava/lang/reflect/Method;
 
 
 # instance fields
-.field private final axj:Landroid/app/job/JobScheduler;
+.field private final axB:Landroid/app/job/JobScheduler;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gt;->tw()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gt;->tu()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gt;->axk:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gt;->axC:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gt;->tx()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gt;->tv()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gt;->axl:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gt;->axD:Ljava/lang/reflect/Method;
 
     return-void
 .end method
@@ -36,7 +36,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gt;->axj:Landroid/app/job/JobScheduler;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gt;->axB:Landroid/app/job/JobScheduler;
 
     return-void
 .end method
@@ -44,12 +44,12 @@
 .method private final a(Landroid/app/job/JobInfo;Ljava/lang/String;ILjava/lang/String;)I
     .locals 4
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gt;->axk:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gt;->axC:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gt;->axj:Landroid/app/job/JobScheduler;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gt;->axB:Landroid/app/job/JobScheduler;
 
     const/4 v2, 0x4
 
@@ -104,7 +104,7 @@
     invoke-static {p4, p3, p2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/gt;->axj:Landroid/app/job/JobScheduler;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/gt;->axB:Landroid/app/job/JobScheduler;
 
     invoke-virtual {p2, p1}, Landroid/app/job/JobScheduler;->schedule(Landroid/app/job/JobInfo;)I
 
@@ -124,7 +124,7 @@
 
     check-cast v0, Landroid/app/job/JobScheduler;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gt;->axk:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gt;->axC:Ljava/lang/reflect/Method;
 
     if-eqz v1, :cond_1
 
@@ -143,7 +143,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/gt;-><init>(Landroid/app/job/JobScheduler;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gt;->ml()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gt;->mj()I
 
     move-result v0
 
@@ -162,10 +162,10 @@
     return p0
 .end method
 
-.method private static ml()I
+.method private static mj()I
     .locals 4
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gt;->axl:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gt;->axD:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
@@ -218,7 +218,7 @@
     return v1
 .end method
 
-.method private static tw()Ljava/lang/reflect/Method;
+.method private static tu()Ljava/lang/reflect/Method;
     .locals 5
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -291,7 +291,7 @@
     return-object v0
 .end method
 
-.method private static tx()Ljava/lang/reflect/Method;
+.method private static tv()Ljava/lang/reflect/Method;
     .locals 3
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gu.smali
index 686b7540da..701618ac1f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gu.smali
@@ -84,7 +84,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sA()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -148,7 +148,7 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sA()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
@@ -188,7 +188,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sA()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gw.smali
index bf50b4fabb..4b0e87085a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gw.smali
@@ -460,7 +460,7 @@
     goto :goto_2
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sA()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -496,7 +496,7 @@
     goto :goto_2
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sA()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -542,7 +542,7 @@
     goto :goto_2
 
     :cond_a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sA()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gx.smali
index 260f348ae4..166fb339a4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gx.smali
@@ -54,7 +54,7 @@
 
     move-result p0
 
-    invoke-static {p1, p0}, Lcom/google/android/gms/internal/measurement/gr;->N(II)I
+    invoke-static {p1, p0}, Lcom/google/android/gms/internal/measurement/gr;->M(II)I
 
     move-result p0
 
@@ -1047,7 +1047,7 @@
     goto :goto_2
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sA()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -1091,7 +1091,7 @@
     goto :goto_2
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sA()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
@@ -1149,7 +1149,7 @@
     goto/16 :goto_2
 
     :cond_a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sA()Lcom/google/android/gms/internal/measurement/ec;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ec;->sy()Lcom/google/android/gms/internal/measurement/ec;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gz.smali
index 68d5717409..c0527a69be 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gz.smali
@@ -13,43 +13,43 @@
 
 
 # static fields
-.field public static final enum axA:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axE:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axB:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axF:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axC:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axG:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axD:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axH:Lcom/google/android/gms/internal/measurement/gz;
 
-.field private static final synthetic axE:[Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axI:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axm:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axJ:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axn:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axK:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axo:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axL:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axp:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axM:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axq:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axN:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axr:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axO:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axs:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axP:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axt:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axQ:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axu:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axR:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axv:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axS:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axw:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axT:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axx:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axU:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axy:Lcom/google/android/gms/internal/measurement/gz;
+.field public static final enum axV:Lcom/google/android/gms/internal/measurement/gz;
 
-.field public static final enum axz:Lcom/google/android/gms/internal/measurement/gz;
+.field private static final synthetic axW:[Lcom/google/android/gms/internal/measurement/gz;
 
 
 # instance fields
@@ -64,7 +64,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axI:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->aya:Lcom/google/android/gms/internal/measurement/hc;
 
     const/4 v2, 0x1
 
@@ -74,11 +74,11 @@
 
     invoke-direct {v0, v4, v3, v1, v2}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axm:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axE:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axH:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axZ:Lcom/google/android/gms/internal/measurement/hc;
 
     const/4 v4, 0x5
 
@@ -86,11 +86,11 @@
 
     invoke-direct {v0, v5, v2, v1, v4}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axn:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axF:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axG:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axY:Lcom/google/android/gms/internal/measurement/hc;
 
     const/4 v5, 0x2
 
@@ -98,11 +98,11 @@
 
     invoke-direct {v0, v6, v5, v1, v3}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axo:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axG:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axG:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axY:Lcom/google/android/gms/internal/measurement/hc;
 
     const/4 v6, 0x3
 
@@ -110,11 +110,11 @@
 
     invoke-direct {v0, v7, v6, v1, v3}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axp:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axH:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axF:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axX:Lcom/google/android/gms/internal/measurement/hc;
 
     const/4 v7, 0x4
 
@@ -122,21 +122,21 @@
 
     invoke-direct {v0, v8, v7, v1, v3}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axq:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axI:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axG:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axY:Lcom/google/android/gms/internal/measurement/hc;
 
     const-string v8, "FIXED64"
 
     invoke-direct {v0, v8, v4, v1, v2}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axr:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axJ:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axF:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axX:Lcom/google/android/gms/internal/measurement/hc;
 
     const/4 v8, 0x6
 
@@ -144,11 +144,11 @@
 
     invoke-direct {v0, v9, v8, v1, v4}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axs:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axK:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axJ:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->ayb:Lcom/google/android/gms/internal/measurement/hc;
 
     const/4 v9, 0x7
 
@@ -156,51 +156,51 @@
 
     invoke-direct {v0, v10, v9, v1, v3}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axt:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axL:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gy;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axK:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->ayc:Lcom/google/android/gms/internal/measurement/hc;
 
     const-string v10, "STRING"
 
     invoke-direct {v0, v10, v1}, Lcom/google/android/gms/internal/measurement/gy;-><init>(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/hc;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axu:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axM:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hb;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axN:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->ayf:Lcom/google/android/gms/internal/measurement/hc;
 
     const-string v10, "GROUP"
 
     invoke-direct {v0, v10, v1}, Lcom/google/android/gms/internal/measurement/hb;-><init>(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/hc;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axv:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axN:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ha;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axN:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->ayf:Lcom/google/android/gms/internal/measurement/hc;
 
     const-string v10, "MESSAGE"
 
     invoke-direct {v0, v10, v1}, Lcom/google/android/gms/internal/measurement/ha;-><init>(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/hc;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axw:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axO:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hd;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axL:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->ayd:Lcom/google/android/gms/internal/measurement/hc;
 
     const-string v10, "BYTES"
 
     invoke-direct {v0, v10, v1}, Lcom/google/android/gms/internal/measurement/hd;-><init>(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/hc;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axx:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axP:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axF:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axX:Lcom/google/android/gms/internal/measurement/hc;
 
     const/16 v10, 0xc
 
@@ -208,11 +208,11 @@
 
     invoke-direct {v0, v11, v10, v1, v3}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axy:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axQ:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axM:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->aye:Lcom/google/android/gms/internal/measurement/hc;
 
     const/16 v11, 0xd
 
@@ -220,11 +220,11 @@
 
     invoke-direct {v0, v12, v11, v1, v3}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axz:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axR:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axF:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axX:Lcom/google/android/gms/internal/measurement/hc;
 
     const/16 v12, 0xe
 
@@ -232,11 +232,11 @@
 
     invoke-direct {v0, v13, v12, v1, v4}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axA:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axS:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axG:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axY:Lcom/google/android/gms/internal/measurement/hc;
 
     const/16 v13, 0xf
 
@@ -244,11 +244,11 @@
 
     invoke-direct {v0, v14, v13, v1, v2}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axB:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axT:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axF:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axX:Lcom/google/android/gms/internal/measurement/hc;
 
     const/16 v14, 0x10
 
@@ -256,11 +256,11 @@
 
     invoke-direct {v0, v15, v14, v1, v3}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axC:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axU:Lcom/google/android/gms/internal/measurement/gz;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axG:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axY:Lcom/google/android/gms/internal/measurement/hc;
 
     const/16 v15, 0x11
 
@@ -268,95 +268,95 @@
 
     invoke-direct {v0, v14, v15, v1, v3}, Lcom/google/android/gms/internal/measurement/gz;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hc;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axD:Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axV:Lcom/google/android/gms/internal/measurement/gz;
 
     const/16 v0, 0x12
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/gz;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axm:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axE:Lcom/google/android/gms/internal/measurement/gz;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axn:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axF:Lcom/google/android/gms/internal/measurement/gz;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axo:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axG:Lcom/google/android/gms/internal/measurement/gz;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axp:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axH:Lcom/google/android/gms/internal/measurement/gz;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axq:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axI:Lcom/google/android/gms/internal/measurement/gz;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axr:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axJ:Lcom/google/android/gms/internal/measurement/gz;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axs:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axK:Lcom/google/android/gms/internal/measurement/gz;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axt:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axL:Lcom/google/android/gms/internal/measurement/gz;
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axu:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axM:Lcom/google/android/gms/internal/measurement/gz;
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axv:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axN:Lcom/google/android/gms/internal/measurement/gz;
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axw:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axO:Lcom/google/android/gms/internal/measurement/gz;
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axx:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axP:Lcom/google/android/gms/internal/measurement/gz;
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axy:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axQ:Lcom/google/android/gms/internal/measurement/gz;
 
     aput-object v1, v0, v10
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axz:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axR:Lcom/google/android/gms/internal/measurement/gz;
 
     aput-object v1, v0, v11
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axA:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axS:Lcom/google/android/gms/internal/measurement/gz;
 
     aput-object v1, v0, v12
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axB:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axT:Lcom/google/android/gms/internal/measurement/gz;
 
     aput-object v1, v0, v13
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axC:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axU:Lcom/google/android/gms/internal/measurement/gz;
 
     const/16 v2, 0x10
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axD:Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gz;->axV:Lcom/google/android/gms/internal/measurement/gz;
 
     aput-object v1, v0, v15
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axE:[Lcom/google/android/gms/internal/measurement/gz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gz;->axW:[Lcom/google/android/gms/internal/measurement/gz;
 
     return-void
 .end method
@@ -391,7 +391,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/gz;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gz;->axE:[Lcom/google/android/gms/internal/measurement/gz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gz;->axW:[Lcom/google/android/gms/internal/measurement/gz;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/gz;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/h.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/h.smali
index b8c9cdb8f3..0dbb6805eb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/h.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic aqp:Lcom/google/android/gms/internal/measurement/jv;
+.field private final synthetic aqH:Lcom/google/android/gms/internal/measurement/jv;
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Lcom/google/android/gms/internal/measurement/jv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/h;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/h;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/h;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/h;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -31,23 +31,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/h;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/h;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/h;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/h;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/iu;->getGmpAppId(Lcom/google/android/gms/internal/measurement/ln;)V
 
     return-void
 .end method
 
-.method protected final oB()V
+.method protected final oz()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/h;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/h;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hc.smali
index c7f2aea896..373787f9fa 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hc.smali
@@ -13,25 +13,25 @@
 
 
 # static fields
-.field public static final enum axF:Lcom/google/android/gms/internal/measurement/hc;
+.field public static final enum axX:Lcom/google/android/gms/internal/measurement/hc;
 
-.field public static final enum axG:Lcom/google/android/gms/internal/measurement/hc;
+.field public static final enum axY:Lcom/google/android/gms/internal/measurement/hc;
 
-.field public static final enum axH:Lcom/google/android/gms/internal/measurement/hc;
+.field public static final enum axZ:Lcom/google/android/gms/internal/measurement/hc;
 
-.field public static final enum axI:Lcom/google/android/gms/internal/measurement/hc;
+.field public static final enum aya:Lcom/google/android/gms/internal/measurement/hc;
 
-.field public static final enum axJ:Lcom/google/android/gms/internal/measurement/hc;
+.field public static final enum ayb:Lcom/google/android/gms/internal/measurement/hc;
 
-.field public static final enum axK:Lcom/google/android/gms/internal/measurement/hc;
+.field public static final enum ayc:Lcom/google/android/gms/internal/measurement/hc;
 
-.field public static final enum axL:Lcom/google/android/gms/internal/measurement/hc;
+.field public static final enum ayd:Lcom/google/android/gms/internal/measurement/hc;
 
-.field public static final enum axM:Lcom/google/android/gms/internal/measurement/hc;
+.field public static final enum aye:Lcom/google/android/gms/internal/measurement/hc;
 
-.field public static final enum axN:Lcom/google/android/gms/internal/measurement/hc;
+.field public static final enum ayf:Lcom/google/android/gms/internal/measurement/hc;
 
-.field private static final synthetic axO:[Lcom/google/android/gms/internal/measurement/hc;
+.field private static final synthetic ayg:[Lcom/google/android/gms/internal/measurement/hc;
 
 
 # instance fields
@@ -54,7 +54,7 @@
 
     invoke-direct {v0, v3, v1, v2}, Lcom/google/android/gms/internal/measurement/hc;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->axF:Lcom/google/android/gms/internal/measurement/hc;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->axX:Lcom/google/android/gms/internal/measurement/hc;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hc;
 
@@ -70,7 +70,7 @@
 
     invoke-direct {v0, v4, v3, v2}, Lcom/google/android/gms/internal/measurement/hc;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->axG:Lcom/google/android/gms/internal/measurement/hc;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->axY:Lcom/google/android/gms/internal/measurement/hc;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hc;
 
@@ -86,7 +86,7 @@
 
     invoke-direct {v0, v5, v4, v2}, Lcom/google/android/gms/internal/measurement/hc;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->axH:Lcom/google/android/gms/internal/measurement/hc;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->axZ:Lcom/google/android/gms/internal/measurement/hc;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hc;
 
@@ -102,7 +102,7 @@
 
     invoke-direct {v0, v6, v5, v2}, Lcom/google/android/gms/internal/measurement/hc;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->axI:Lcom/google/android/gms/internal/measurement/hc;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->aya:Lcom/google/android/gms/internal/measurement/hc;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hc;
 
@@ -114,7 +114,7 @@
 
     invoke-direct {v0, v7, v6, v2}, Lcom/google/android/gms/internal/measurement/hc;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->axJ:Lcom/google/android/gms/internal/measurement/hc;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->ayb:Lcom/google/android/gms/internal/measurement/hc;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hc;
 
@@ -126,11 +126,11 @@
 
     invoke-direct {v0, v7, v2, v8}, Lcom/google/android/gms/internal/measurement/hc;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->axK:Lcom/google/android/gms/internal/measurement/hc;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->ayc:Lcom/google/android/gms/internal/measurement/hc;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hc;
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/cj;->asG:Lcom/google/android/gms/internal/measurement/cj;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/cj;->asY:Lcom/google/android/gms/internal/measurement/cj;
 
     const/4 v8, 0x6
 
@@ -138,7 +138,7 @@
 
     invoke-direct {v0, v9, v8, v7}, Lcom/google/android/gms/internal/measurement/hc;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->axL:Lcom/google/android/gms/internal/measurement/hc;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->ayd:Lcom/google/android/gms/internal/measurement/hc;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hc;
 
@@ -150,7 +150,7 @@
 
     invoke-direct {v0, v10, v9, v7}, Lcom/google/android/gms/internal/measurement/hc;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->axM:Lcom/google/android/gms/internal/measurement/hc;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->aye:Lcom/google/android/gms/internal/measurement/hc;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hc;
 
@@ -160,49 +160,49 @@
 
     invoke-direct {v0, v11, v10, v7}, Lcom/google/android/gms/internal/measurement/hc;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->axN:Lcom/google/android/gms/internal/measurement/hc;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->ayf:Lcom/google/android/gms/internal/measurement/hc;
 
     const/16 v0, 0x9
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/hc;
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/hc;->axF:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/hc;->axX:Lcom/google/android/gms/internal/measurement/hc;
 
     aput-object v7, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axG:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axY:Lcom/google/android/gms/internal/measurement/hc;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axH:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axZ:Lcom/google/android/gms/internal/measurement/hc;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axI:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->aya:Lcom/google/android/gms/internal/measurement/hc;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axJ:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->ayb:Lcom/google/android/gms/internal/measurement/hc;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axK:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->ayc:Lcom/google/android/gms/internal/measurement/hc;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axL:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->ayd:Lcom/google/android/gms/internal/measurement/hc;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axM:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->aye:Lcom/google/android/gms/internal/measurement/hc;
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->axN:Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hc;->ayf:Lcom/google/android/gms/internal/measurement/hc;
 
     aput-object v1, v0, v10
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->axO:[Lcom/google/android/gms/internal/measurement/hc;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hc;->ayg:[Lcom/google/android/gms/internal/measurement/hc;
 
     return-void
 .end method
@@ -227,7 +227,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/hc;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hc;->axO:[Lcom/google/android/gms/internal/measurement/hc;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hc;->ayg:[Lcom/google/android/gms/internal/measurement/hc;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/hc;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/he.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/he.smali
index c284fe2f1f..8ee4e2a172 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/he.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/he.smali
@@ -3,27 +3,27 @@
 
 
 # instance fields
-.field private asK:I
+.field private atc:I
 
-.field private asL:I
+.field private atd:I
 
-.field private asM:I
+.field private ate:I
 
-.field private asT:I
+.field private atl:I
 
-.field asV:I
+.field atn:I
 
-.field private asW:I
+.field private ato:I
 
-.field final axP:I
+.field final ayh:I
 
-.field private final axQ:I
+.field private final ayi:I
 
-.field private axR:I
+.field private ayj:I
 
-.field axS:I
+.field ayk:I
 
-.field private axT:Lcom/google/android/gms/internal/measurement/cv;
+.field private ayl:Lcom/google/android/gms/internal/measurement/cv;
 
 .field final buffer:[B
 
@@ -36,29 +36,29 @@
 
     const v0, 0x7fffffff
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->asW:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->ato:I
 
     const/16 v0, 0x40
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->asL:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->atd:I
 
     const/high16 v0, 0x4000000
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->asM:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->ate:I
 
     iput-object p1, p0, Lcom/google/android/gms/internal/measurement/he;->buffer:[B
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/he;->axP:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/he;->ayh:I
 
     add-int/2addr p2, p1
 
-    iput p2, p0, Lcom/google/android/gms/internal/measurement/he;->axR:I
+    iput p2, p0, Lcom/google/android/gms/internal/measurement/he;->ayj:I
 
-    iput p2, p0, Lcom/google/android/gms/internal/measurement/he;->axQ:I
+    iput p2, p0, Lcom/google/android/gms/internal/measurement/he;->ayi:I
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
     return-void
 .end method
@@ -71,7 +71,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->asV:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->atn:I
 
     if-ne v0, p1, :cond_0
 
@@ -97,15 +97,15 @@
 
     if-ltz p1, :cond_2
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
     add-int v1, v0, p1
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->asW:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->ato:I
 
     if-gt v1, v2, :cond_1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->axR:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->ayj:I
 
     sub-int/2addr v1, v0
 
@@ -113,12 +113,12 @@
 
     add-int/2addr v0, p1
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tA()Lcom/google/android/gms/internal/measurement/hm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->ty()Lcom/google/android/gms/internal/measurement/hm;
 
     move-result-object p1
 
@@ -129,14 +129,14 @@
 
     invoke-direct {p0, v2}, Lcom/google/android/gms/internal/measurement/he;->bS(I)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tA()Lcom/google/android/gms/internal/measurement/hm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->ty()Lcom/google/android/gms/internal/measurement/hm;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tB()Lcom/google/android/gms/internal/measurement/hm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tz()Lcom/google/android/gms/internal/measurement/hm;
 
     move-result-object p1
 
@@ -153,39 +153,39 @@
     return-object v0
 .end method
 
-.method private final rw()V
+.method private final ru()V
     .locals 2
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->axR:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayj:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->asT:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->atl:I
 
     add-int/2addr v0, v1
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->axR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayj:I
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->axR:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayj:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->asW:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->ato:I
 
     if-le v0, v1, :cond_0
 
     sub-int v1, v0, v1
 
-    iput v1, p0, Lcom/google/android/gms/internal/measurement/he;->asT:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/he;->atl:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->asT:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->atl:I
 
     sub-int/2addr v0, v1
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->axR:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayj:I
 
     return-void
 
     :cond_0
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->asT:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->atl:I
 
     return-void
 .end method
@@ -211,58 +211,58 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->axT:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayl:Lcom/google/android/gms/internal/measurement/cv;
 
     if-nez v0, :cond_0
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->buffer:[B
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->axP:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->ayh:I
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->axQ:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->ayi:I
 
     invoke-static {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/cv;->e([BII)Lcom/google/android/gms/internal/measurement/cv;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->axT:Lcom/google/android/gms/internal/measurement/cv;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayl:Lcom/google/android/gms/internal/measurement/cv;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->axT:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayl:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rp()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cv;->rn()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->axP:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->ayh:I
 
     sub-int/2addr v1, v2
 
     if-gt v0, v1, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/he;->axT:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/he;->ayl:Lcom/google/android/gms/internal/measurement/cv;
 
     sub-int/2addr v1, v0
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/internal/measurement/cv;->bS(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->axT:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayl:Lcom/google/android/gms/internal/measurement/cv;
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->asL:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->atd:I
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->asK:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->atc:I
 
     sub-int/2addr v1, v2
 
     if-ltz v1, :cond_1
 
-    iput v1, v0, Lcom/google/android/gms/internal/measurement/cv;->asL:I
+    iput v1, v0, Lcom/google/android/gms/internal/measurement/cv;->atd:I
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->axT:Lcom/google/android/gms/internal/measurement/cv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayl:Lcom/google/android/gms/internal/measurement/cv;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rN()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rL()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v1
 
@@ -272,7 +272,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/dr;
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->asV:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->atn:I
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/he;->bP(I)Z
 
@@ -356,35 +356,35 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rs()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rq()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->asK:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->atc:I
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->asL:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->atd:I
 
     if-ge v1, v2, :cond_2
 
     if-ltz v0, :cond_1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
     add-int/2addr v0, v1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->asW:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->ato:I
 
     if-gt v0, v1, :cond_0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->asW:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->ato:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/he;->rw()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/he;->ru()V
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->asK:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->atc:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->asK:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->atc:I
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/internal/measurement/hp;->a(Lcom/google/android/gms/internal/measurement/he;)Lcom/google/android/gms/internal/measurement/hp;
 
@@ -392,27 +392,27 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/he;->bO(I)V
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/he;->asK:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/he;->atc:I
 
     add-int/lit8 p1, p1, -0x1
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/he;->asK:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/he;->atc:I
 
-    iput v1, p0, Lcom/google/android/gms/internal/measurement/he;->asW:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/he;->ato:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/he;->rw()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/he;->ru()V
 
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tA()Lcom/google/android/gms/internal/measurement/hm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->ty()Lcom/google/android/gms/internal/measurement/hm;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tB()Lcom/google/android/gms/internal/measurement/hm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tz()Lcom/google/android/gms/internal/measurement/hm;
 
     move-result-object p1
 
@@ -460,13 +460,13 @@
 
     if-ne v0, p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
     return v1
 
@@ -485,7 +485,7 @@
     return p1
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->qY()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->qW()I
 
     move-result v0
 
@@ -509,7 +509,7 @@
     return v1
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rs()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rq()I
 
     move-result p1
 
@@ -518,26 +518,26 @@
     return v1
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
     return v1
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rs()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rq()I
 
     return v1
 .end method
@@ -545,16 +545,16 @@
 .method public final getPosition()I
     .locals 2
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->axP:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->ayh:I
 
     sub-int/2addr v0, v1
 
     return v0
 .end method
 
-.method public final qY()I
+.method public final qW()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -562,26 +562,26 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->axR:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->ayj:I
 
     if-ne v0, v1, :cond_0
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->asV:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->atn:I
 
     return v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rs()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rq()I
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->asV:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/he;->atn:I
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->asV:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->atn:I
 
     if-eqz v0, :cond_1
 
@@ -597,7 +597,7 @@
     throw v0
 .end method
 
-.method public final re()Z
+.method public final rc()Z
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -605,7 +605,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rs()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rq()I
 
     move-result v0
 
@@ -629,15 +629,15 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rs()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rq()I
 
     move-result v0
 
     if-ltz v0, :cond_1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->axR:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->ayj:I
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
     sub-int/2addr v1, v2
 
@@ -651,30 +651,30 @@
 
     invoke-direct {v1, v3, v2, v0, v4}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
     add-int/2addr v2, v0
 
-    iput v2, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iput v2, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
     return-object v1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tA()Lcom/google/android/gms/internal/measurement/hm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->ty()Lcom/google/android/gms/internal/measurement/hm;
 
     move-result-object v0
 
     throw v0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tB()Lcom/google/android/gms/internal/measurement/hm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tz()Lcom/google/android/gms/internal/measurement/hm;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final rs()I
+.method public final rq()I
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -682,7 +682,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
     move-result v0
 
@@ -693,7 +693,7 @@
     :cond_0
     and-int/lit8 v0, v0, 0x7f
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
     move-result v1
 
@@ -713,7 +713,7 @@
 
     or-int/2addr v0, v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
     move-result v1
 
@@ -730,7 +730,7 @@
 
     or-int/2addr v0, v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
     move-result v1
 
@@ -747,7 +747,7 @@
 
     or-int/2addr v0, v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
     move-result v1
 
@@ -764,7 +764,7 @@
 
     if-ge v1, v2, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rx()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->rv()B
 
     move-result v2
 
@@ -778,7 +778,7 @@
     goto :goto_1
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tC()Lcom/google/android/gms/internal/measurement/hm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tA()Lcom/google/android/gms/internal/measurement/hm;
 
     move-result-object v0
 
@@ -789,7 +789,7 @@
     return v0
 .end method
 
-.method final rx()B
+.method final rv()B
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -797,9 +797,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->axR:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->ayj:I
 
     if-eq v0, v1, :cond_0
 
@@ -807,14 +807,14 @@
 
     add-int/lit8 v2, v0, 0x1
 
-    iput v2, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iput v2, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
     aget-byte v0, v1, v0
 
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tA()Lcom/google/android/gms/internal/measurement/hm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->ty()Lcom/google/android/gms/internal/measurement/hm;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hf.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hf.smali
index 78fa2f0993..4253211c71 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hf.smali
@@ -19,7 +19,7 @@
     .end annotation
 .end method
 
-.method public abstract C(II)V
+.method public abstract G(II)V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -35,14 +35,6 @@
     .end annotation
 .end method
 
-.method public abstract I(II)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
 .method public abstract a(ID)V
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -505,7 +497,15 @@
     .end annotation
 .end method
 
-.method public abstract rH()I
+.method public abstract rF()I
+.end method
+
+.method public abstract y(II)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
 .end method
 
 .method public abstract z(II)V
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hh.smali
index 3cb0535443..21cdaa3bf0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hh.smali
@@ -3,11 +3,11 @@
 
 
 # instance fields
-.field private final atc:Ljava/nio/ByteBuffer;
+.field private final atu:Ljava/nio/ByteBuffer;
 
-.field private axU:Lcom/google/android/gms/internal/measurement/cy;
+.field private aym:Lcom/google/android/gms/internal/measurement/cy;
 
-.field private axV:I
+.field private ayn:I
 
 
 # direct methods
@@ -16,9 +16,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     sget-object v0, Ljava/nio/ByteOrder;->LITTLE_ENDIAN:Ljava/nio/ByteOrder;
 
@@ -41,7 +41,7 @@
     return-void
 .end method
 
-.method public static D(II)I
+.method public static C(II)I
     .locals 0
 
     shl-int/lit8 p0, p0, 0x3
@@ -68,7 +68,7 @@
 
     move-result p0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/hp;->sf()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/hp;->sd()I
 
     move-result p1
 
@@ -261,7 +261,7 @@
 
     int-to-byte p1, p1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0}, Ljava/nio/ByteBuffer;->hasRemaining()Z
 
@@ -269,7 +269,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, p1}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
@@ -278,13 +278,13 @@
     :cond_0
     new-instance p1, Lcom/google/android/gms/internal/measurement/hg;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0}, Ljava/nio/ByteBuffer;->position()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v1}, Ljava/nio/ByteBuffer;->limit()I
 
@@ -929,16 +929,16 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/hh;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/hh;->x(II)V
 
-    iget p1, p2, Lcom/google/android/gms/internal/measurement/hp;->ayf:I
+    iget p1, p2, Lcom/google/android/gms/internal/measurement/hp;->ayx:I
 
     if-gez p1, :cond_0
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/hp;->sf()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/hp;->sd()I
 
     :cond_0
-    iget p1, p2, Lcom/google/android/gms/internal/measurement/hp;->ayf:I
+    iget p1, p2, Lcom/google/android/gms/internal/measurement/hp;->ayx:I
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/measurement/hh;->cI(I)V
 
@@ -998,7 +998,7 @@
 
     const/4 v0, 0x2
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/hh;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/hh;->x(II)V
 
     :try_start_0
     invoke-virtual {p2}, Ljava/lang/String;->length()I
@@ -1021,13 +1021,13 @@
 
     if-ne p1, v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0}, Ljava/nio/ByteBuffer;->position()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v1}, Ljava/nio/ByteBuffer;->remaining()I
 
@@ -1035,23 +1035,23 @@
 
     if-lt v1, p1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     add-int v2, v0, p1
 
     invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-static {p2, v1}, Lcom/google/android/gms/internal/measurement/hh;->d(Ljava/lang/CharSequence;Ljava/nio/ByteBuffer;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p2}, Ljava/nio/ByteBuffer;->position()I
 
     move-result p2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v1, v0}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
 
@@ -1061,7 +1061,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/hh;->cI(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p1, p2}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
 
@@ -1072,7 +1072,7 @@
 
     add-int/2addr v0, p1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->limit()I
 
@@ -1089,7 +1089,7 @@
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/measurement/hh;->cI(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/measurement/hh;->d(Ljava/lang/CharSequence;Ljava/nio/ByteBuffer;)V
     :try_end_0
@@ -1102,13 +1102,13 @@
 
     new-instance p2, Lcom/google/android/gms/internal/measurement/hg;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0}, Ljava/nio/ByteBuffer;->position()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v1}, Ljava/nio/ByteBuffer;->limit()I
 
@@ -1158,32 +1158,32 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->axU:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->aym:Lcom/google/android/gms/internal/measurement/cy;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/cy;->b(Ljava/nio/ByteBuffer;)Lcom/google/android/gms/internal/measurement/cy;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->axU:Lcom/google/android/gms/internal/measurement/cy;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->aym:Lcom/google/android/gms/internal/measurement/cy;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0}, Ljava/nio/ByteBuffer;->position()I
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/hh;->axV:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/hh;->ayn:I
 
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/hh;->axV:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/hh;->ayn:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v1}, Ljava/nio/ByteBuffer;->position()I
 
@@ -1191,51 +1191,51 @@
 
     if-eq v0, v1, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->axU:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->aym:Lcom/google/android/gms/internal/measurement/cy;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v1}, Ljava/nio/ByteBuffer;->array()[B
 
     move-result-object v1
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/hh;->axV:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/hh;->ayn:I
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v3}, Ljava/nio/ByteBuffer;->position()I
 
     move-result v3
 
-    iget v4, p0, Lcom/google/android/gms/internal/measurement/hh;->axV:I
+    iget v4, p0, Lcom/google/android/gms/internal/measurement/hh;->ayn:I
 
     sub-int/2addr v3, v4
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/cy;->write([BII)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0}, Ljava/nio/ByteBuffer;->position()I
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/hh;->axV:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/hh;->ayn:I
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->axU:Lcom/google/android/gms/internal/measurement/cy;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->aym:Lcom/google/android/gms/internal/measurement/cy;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/cy;->a(ILcom/google/android/gms/internal/measurement/fb;)V
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cy;->flush()V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p1}, Ljava/nio/ByteBuffer;->position()I
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/hh;->axV:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/hh;->ayn:I
 
     return-void
 .end method
@@ -1250,11 +1250,11 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/hh;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/hh;->x(II)V
 
     int-to-byte p1, p2
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p2}, Ljava/nio/ByteBuffer;->hasRemaining()Z
 
@@ -1262,7 +1262,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p2, p1}, Ljava/nio/ByteBuffer;->put(B)Ljava/nio/ByteBuffer;
 
@@ -1271,13 +1271,13 @@
     :cond_0
     new-instance p1, Lcom/google/android/gms/internal/measurement/hg;
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p2}, Ljava/nio/ByteBuffer;->position()I
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0}, Ljava/nio/ByteBuffer;->limit()I
 
@@ -1298,7 +1298,7 @@
 
     array-length v0, p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v1}, Ljava/nio/ByteBuffer;->remaining()I
 
@@ -1306,7 +1306,7 @@
 
     if-lt v1, v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     const/4 v2, 0x0
 
@@ -1317,13 +1317,13 @@
     :cond_0
     new-instance p1, Lcom/google/android/gms/internal/measurement/hg;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0}, Ljava/nio/ByteBuffer;->position()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atc:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hh;->atu:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v1}, Ljava/nio/ByteBuffer;->limit()I
 
@@ -1334,7 +1334,7 @@
     throw p1
 .end method
 
-.method public final y(II)V
+.method public final x(II)V
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1351,7 +1351,7 @@
     return-void
 .end method
 
-.method public final z(II)V
+.method public final y(II)V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1361,7 +1361,7 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/hh;->y(II)V
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/measurement/hh;->x(II)V
 
     if-ltz p2, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hi.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hi.smali
index 25b43c34b9..3c41fe27a5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hi.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hi.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field protected final axW:Ljava/lang/Class;
+.field protected final ayo:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hj.smali
index 8169839fa3..0d505ce8b3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hj.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field protected axX:Lcom/google/android/gms/internal/measurement/hl;
+.field protected ayp:Lcom/google/android/gms/internal/measurement/hl;
 
 
 # direct methods
@@ -36,7 +36,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hj;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hj;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     if-nez v0, :cond_0
 
@@ -46,15 +46,15 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hj;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hj;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     iget v1, v1, Lcom/google/android/gms/internal/measurement/hl;->mSize:I
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hj;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hj;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     aget-object v1, v1, v0
 
@@ -101,14 +101,14 @@
 
     if-nez v3, :cond_1
 
-    sget-object p1, Lcom/google/android/gms/internal/measurement/hq;->ayq:[B
+    sget-object p1, Lcom/google/android/gms/internal/measurement/hq;->ayI:[B
 
     goto :goto_0
 
     :cond_1
     new-array v4, v3, [B
 
-    iget v5, p1, Lcom/google/android/gms/internal/measurement/he;->axP:I
+    iget v5, p1, Lcom/google/android/gms/internal/measurement/he;->ayh:I
 
     add-int/2addr v5, v0
 
@@ -123,7 +123,7 @@
 
     invoke-direct {v0, p2, p1}, Lcom/google/android/gms/internal/measurement/hr;-><init>(I[B)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/hj;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/hj;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     const/4 p2, 0x0
 
@@ -133,7 +133,7 @@
 
     invoke-direct {p1}, Lcom/google/android/gms/internal/measurement/hl;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hj;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hj;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     :cond_2
     :goto_1
@@ -148,18 +148,18 @@
 
     if-ltz v3, :cond_2
 
-    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     aget-object v4, v4, v3
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/hl;->aya:Lcom/google/android/gms/internal/measurement/hk;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/hl;->ays:Lcom/google/android/gms/internal/measurement/hk;
 
     if-ne v4, v5, :cond_4
 
     goto :goto_1
 
     :cond_4
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     aget-object p1, p1, v3
 
@@ -172,7 +172,7 @@
 
     invoke-direct {p1}, Lcom/google/android/gms/internal/measurement/hk;-><init>()V
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/hj;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/hj;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {v4, v1}, Lcom/google/android/gms/internal/measurement/hl;->cJ(I)I
 
@@ -180,7 +180,7 @@
 
     if-ltz v5, :cond_5
 
-    iget-object v1, v4, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v1, v4, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     aput-object p1, v1, v5
 
@@ -193,19 +193,19 @@
 
     if-ge v5, v6, :cond_6
 
-    iget-object v6, v4, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v6, v4, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     aget-object v6, v6, v5
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/hl;->aya:Lcom/google/android/gms/internal/measurement/hk;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/hl;->ays:Lcom/google/android/gms/internal/measurement/hk;
 
     if-ne v6, v7, :cond_6
 
-    iget-object v2, v4, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iget-object v2, v4, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
     aput v1, v2, v5
 
-    iget-object v1, v4, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v1, v4, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     aput-object p1, v1, v5
 
@@ -214,7 +214,7 @@
     :cond_6
     iget v6, v4, Lcom/google/android/gms/internal/measurement/hl;->mSize:I
 
-    iget-object v7, v4, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iget-object v7, v4, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
     array-length v7, v7
 
@@ -232,25 +232,25 @@
 
     new-array v6, v6, [Lcom/google/android/gms/internal/measurement/hk;
 
-    iget-object v8, v4, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iget-object v8, v4, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
-    iget-object v9, v4, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iget-object v9, v4, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
     array-length v9, v9
 
     invoke-static {v8, v2, v7, v2, v9}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v8, v4, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v8, v4, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
-    iget-object v9, v4, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v9, v4, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     array-length v9, v9
 
     invoke-static {v8, v2, v6, v2, v9}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v7, v4, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iput-object v7, v4, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
-    iput-object v6, v4, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iput-object v6, v4, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     :cond_7
     iget v2, v4, Lcom/google/android/gms/internal/measurement/hl;->mSize:I
@@ -259,7 +259,7 @@
 
     if-eqz v2, :cond_8
 
-    iget-object v2, v4, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iget-object v2, v4, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
     add-int/lit8 v6, v5, 0x1
 
@@ -269,7 +269,7 @@
 
     invoke-static {v2, v5, v2, v6, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v2, v4, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v2, v4, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     iget v7, v4, Lcom/google/android/gms/internal/measurement/hl;->mSize:I
 
@@ -278,11 +278,11 @@
     invoke-static {v2, v5, v2, v6, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     :cond_8
-    iget-object v2, v4, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iget-object v2, v4, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
     aput v1, v2, v5
 
-    iget-object v1, v4, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v1, v4, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     aput-object p1, v1, v5
 
@@ -294,11 +294,11 @@
 
     :cond_9
     :goto_3
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/hk;->axZ:Ljava/util/List;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/hk;->ayr:Ljava/util/List;
 
     if-eqz v1, :cond_a
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/hk;->axZ:Ljava/util/List;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/hk;->ayr:Ljava/util/List;
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -319,7 +319,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->rs()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->rq()I
 
     move-result v2
 
@@ -341,19 +341,19 @@
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/hk;->axY:Lcom/google/android/gms/internal/measurement/hi;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/hk;->ayq:Lcom/google/android/gms/internal/measurement/hi;
 
-    iput-object v1, p1, Lcom/google/android/gms/internal/measurement/hk;->axY:Lcom/google/android/gms/internal/measurement/hi;
+    iput-object v1, p1, Lcom/google/android/gms/internal/measurement/hk;->ayq:Lcom/google/android/gms/internal/measurement/hi;
 
     iput-object v0, p1, Lcom/google/android/gms/internal/measurement/hk;->value:Ljava/lang/Object;
 
-    iput-object p2, p1, Lcom/google/android/gms/internal/measurement/hk;->axZ:Ljava/util/List;
+    iput-object p2, p1, Lcom/google/android/gms/internal/measurement/hk;->ayr:Ljava/util/List;
 
     :goto_4
     return v3
 
     :cond_b
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->tA()Lcom/google/android/gms/internal/measurement/hm;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hm;->ty()Lcom/google/android/gms/internal/measurement/hm;
 
     move-result-object p1
 
@@ -428,7 +428,7 @@
         }
     .end annotation
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/hp;->ty()Lcom/google/android/gms/internal/measurement/hp;
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/hp;->tw()Lcom/google/android/gms/internal/measurement/hp;
 
     move-result-object v0
 
@@ -439,10 +439,10 @@
     return-object v0
 .end method
 
-.method protected qB()I
+.method protected qz()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hj;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hj;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     const/4 v1, 0x0
 
@@ -451,19 +451,19 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hj;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hj;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     iget v2, v2, Lcom/google/android/gms/internal/measurement/hl;->mSize:I
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hj;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hj;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     aget-object v2, v2, v1
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/hk;->qB()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/hk;->qz()I
 
     move-result v2
 
@@ -480,7 +480,7 @@
     return v0
 .end method
 
-.method public final synthetic ty()Lcom/google/android/gms/internal/measurement/hp;
+.method public final synthetic tw()Lcom/google/android/gms/internal/measurement/hp;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hk.smali
index b1c2ab894e..e3004dc640 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hk.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field axY:Lcom/google/android/gms/internal/measurement/hi;
+.field ayq:Lcom/google/android/gms/internal/measurement/hi;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/hi<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field axZ:Ljava/util/List;
+.field ayr:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -38,7 +38,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/hk;->axZ:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/hk;->ayr:Ljava/util/List;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hk;->qB()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hk;->qz()I
 
     move-result v0
 
@@ -66,7 +66,7 @@
     return-object v0
 .end method
 
-.method private final tz()Lcom/google/android/gms/internal/measurement/hk;
+.method private final tx()Lcom/google/android/gms/internal/measurement/hk;
     .locals 5
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hk;
@@ -74,24 +74,24 @@
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/hk;-><init>()V
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hk;->axY:Lcom/google/android/gms/internal/measurement/hi;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hk;->ayq:Lcom/google/android/gms/internal/measurement/hi;
 
-    iput-object v1, v0, Lcom/google/android/gms/internal/measurement/hk;->axY:Lcom/google/android/gms/internal/measurement/hi;
+    iput-object v1, v0, Lcom/google/android/gms/internal/measurement/hk;->ayq:Lcom/google/android/gms/internal/measurement/hi;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hk;->axZ:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hk;->ayr:Ljava/util/List;
 
     if-nez v1, :cond_0
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/gms/internal/measurement/hk;->axZ:Ljava/util/List;
+    iput-object v1, v0, Lcom/google/android/gms/internal/measurement/hk;->ayr:Ljava/util/List;
 
     goto :goto_0
 
     :cond_0
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/hk;->axZ:Ljava/util/List;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/hk;->ayr:Ljava/util/List;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hk;->axZ:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hk;->ayr:Ljava/util/List;
 
     invoke-interface {v1, v2}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
@@ -344,7 +344,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hk;->axZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hk;->ayr:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -398,7 +398,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hk;->tz()Lcom/google/android/gms/internal/measurement/hk;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/hk;->tx()Lcom/google/android/gms/internal/measurement/hk;
 
     move-result-object v0
 
@@ -434,16 +434,16 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hk;->axY:Lcom/google/android/gms/internal/measurement/hi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hk;->ayq:Lcom/google/android/gms/internal/measurement/hi;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/hk;->axY:Lcom/google/android/gms/internal/measurement/hi;
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/hk;->ayq:Lcom/google/android/gms/internal/measurement/hi;
 
     if-eq v0, v2, :cond_2
 
     return v1
 
     :cond_2
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/hi;->axW:Ljava/lang/Class;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/hi;->ayo:Ljava/lang/Class;
 
     invoke-virtual {v0}, Ljava/lang/Class;->isArray()Z
 
@@ -579,11 +579,11 @@
     return p1
 
     :cond_a
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hk;->axZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hk;->ayr:Ljava/util/List;
 
     if-eqz v0, :cond_b
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/hk;->axZ:Ljava/util/List;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/hk;->ayr:Ljava/util/List;
 
     if-eqz v1, :cond_b
 
@@ -649,14 +649,14 @@
     throw v1
 .end method
 
-.method final qB()I
+.method final qz()I
     .locals 5
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hk;->value:Ljava/lang/Object;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hk;->axZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hk;->ayr:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hl.smali
index 4693c948ae..1869824f56 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hl.smali
@@ -6,15 +6,15 @@
 
 
 # static fields
-.field static final aya:Lcom/google/android/gms/internal/measurement/hk;
+.field static final ays:Lcom/google/android/gms/internal/measurement/hk;
 
 
 # instance fields
-.field private ayb:Z
+.field private ayt:Z
 
-.field ayc:[I
+.field ayu:[I
 
-.field ayd:[Lcom/google/android/gms/internal/measurement/hk;
+.field ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
 .field mSize:I
 
@@ -27,7 +27,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/hk;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hl;->aya:Lcom/google/android/gms/internal/measurement/hk;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hl;->ays:Lcom/google/android/gms/internal/measurement/hk;
 
     return-void
 .end method
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/hl;->ayb:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/hl;->ayt:Z
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/hl;->idealIntArraySize(I)I
 
@@ -57,11 +57,11 @@
 
     new-array v1, p1, [I
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
     new-array p1, p1, [Lcom/google/android/gms/internal/measurement/hk;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     iput v0, p0, Lcom/google/android/gms/internal/measurement/hl;->mSize:I
 
@@ -124,7 +124,7 @@
 
     ushr-int/lit8 v2, v2, 0x1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
     aget v3, v3, v2
 
@@ -164,9 +164,9 @@
 
     invoke-direct {v1, v0}, Lcom/google/android/gms/internal/measurement/hl;-><init>(I)V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
-    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
     const/4 v4, 0x0
 
@@ -175,13 +175,13 @@
     :goto_0
     if-ge v4, v0, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     aget-object v3, v2, v4
 
     if-eqz v3, :cond_0
 
-    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     aget-object v2, v2, v4
 
@@ -234,9 +234,9 @@
     return v2
 
     :cond_2
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
-    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
     const/4 v5, 0x0
 
@@ -264,9 +264,9 @@
     :goto_1
     if-eqz v1, :cond_7
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     iget v3, p0, Lcom/google/android/gms/internal/measurement/hl;->mSize:I
 
@@ -320,7 +320,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hl;->ayc:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hl;->ayu:[I
 
     aget v2, v2, v1
 
@@ -328,7 +328,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hl;->ayd:[Lcom/google/android/gms/internal/measurement/hk;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/hl;->ayv:[Lcom/google/android/gms/internal/measurement/hk;
 
     aget-object v2, v2, v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hm.smali
index a1c88ed3de..07ee8d0cf3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hm.smali
@@ -24,6 +24,18 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hm;
 
+    const-string v1, "CodedInputStream encountered a malformed varint."
+
+    invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/hm;-><init>(Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method static ty()Lcom/google/android/gms/internal/measurement/hm;
+    .locals 2
+
+    new-instance v0, Lcom/google/android/gms/internal/measurement/hm;
+
     const-string v1, "While parsing a protocol message, the input ended unexpectedly in the middle of a field.  This could mean either than the input has been truncated or that an embedded message misreported its own length."
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/hm;-><init>(Ljava/lang/String;)V
@@ -31,7 +43,7 @@
     return-object v0
 .end method
 
-.method static tB()Lcom/google/android/gms/internal/measurement/hm;
+.method static tz()Lcom/google/android/gms/internal/measurement/hm;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hm;
@@ -42,15 +54,3 @@
 
     return-object v0
 .end method
-
-.method static tC()Lcom/google/android/gms/internal/measurement/hm;
-    .locals 2
-
-    new-instance v0, Lcom/google/android/gms/internal/measurement/hm;
-
-    const-string v1, "CodedInputStream encountered a malformed varint."
-
-    invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/hm;-><init>(Ljava/lang/String;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hn.smali
index e6849ba1b8..ab1adf0552 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hn.smali
@@ -7,7 +7,7 @@
 
 .field protected static final UTF_8:Ljava/nio/charset/Charset;
 
-.field public static final aye:Ljava/lang/Object;
+.field public static final ayw:Ljava/lang/Object;
 
 
 # direct methods
@@ -34,7 +34,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hn;->aye:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hn;->ayw:Ljava/lang/Object;
 
     return-void
 .end method
@@ -42,11 +42,11 @@
 .method public static a(Lcom/google/android/gms/internal/measurement/hj;Lcom/google/android/gms/internal/measurement/hj;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hj;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hj;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     if-eqz v0, :cond_0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/hj;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/hj;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hl;->clone()Ljava/lang/Object;
 
@@ -54,7 +54,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/hl;
 
-    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/hj;->axX:Lcom/google/android/gms/internal/measurement/hl;
+    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/hj;->ayp:Lcom/google/android/gms/internal/measurement/hl;
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ho.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ho.smali
index 27cf91a2c2..82d0f15e4a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ho.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ho.smali
@@ -30,7 +30,7 @@
 
     invoke-virtual {p3, p2}, Ljava/lang/StringBuffer;->append(Ljava/lang/StringBuffer;)Ljava/lang/StringBuffer;
 
-    invoke-static {p0}, Lcom/google/android/gms/internal/measurement/ho;->cg(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lcom/google/android/gms/internal/measurement/ho;->cb(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
@@ -304,7 +304,7 @@
     return-void
 
     :cond_a
-    invoke-static {p0}, Lcom/google/android/gms/internal/measurement/ho;->cg(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lcom/google/android/gms/internal/measurement/ho;->cb(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
@@ -622,7 +622,7 @@
     return-object p0
 .end method
 
-.method private static cg(Ljava/lang/String;)Ljava/lang/String;
+.method private static cb(Ljava/lang/String;)Ljava/lang/String;
     .locals 4
 
     new-instance v0, Ljava/lang/StringBuffer;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hp.smali
index 609df1ebab..e7daa9cfe7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hp.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field protected volatile ayf:I
+.field protected volatile ayx:I
 
 
 # direct methods
@@ -14,7 +14,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/hp;->ayf:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/hp;->ayx:I
 
     return-void
 .end method
@@ -48,14 +48,14 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hp;->ty()Lcom/google/android/gms/internal/measurement/hp;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hp;->tw()Lcom/google/android/gms/internal/measurement/hp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected qB()I
+.method protected qz()I
     .locals 1
 
     const/4 v0, 0x0
@@ -63,14 +63,14 @@
     return v0
 .end method
 
-.method public final sf()I
+.method public final sd()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hp;->qB()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/hp;->qz()I
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/hp;->ayf:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/hp;->ayx:I
 
     return v0
 .end method
@@ -85,7 +85,7 @@
     return-object v0
 .end method
 
-.method public ty()Lcom/google/android/gms/internal/measurement/hp;
+.method public tw()Lcom/google/android/gms/internal/measurement/hp;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hq.smali
index 0f8b5c4f26..628497dc27 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hq.smali
@@ -3,29 +3,29 @@
 
 
 # static fields
-.field private static final avP:[I
+.field private static final awh:[I
 
-.field private static final ayg:I = 0xb
+.field private static final ayA:I = 0x10
 
-.field private static final ayh:I = 0xc
+.field private static final ayB:I = 0x1a
 
-.field private static final ayi:I = 0x10
+.field private static final ayC:[J
 
-.field private static final ayj:I = 0x1a
+.field private static final ayD:[F
 
-.field private static final ayk:[J
+.field private static final ayE:[D
 
-.field private static final ayl:[F
+.field private static final ayF:[Z
 
-.field private static final aym:[D
+.field private static final ayG:[Ljava/lang/String;
 
-.field private static final ayn:[Z
+.field private static final ayH:[[B
 
-.field private static final ayo:[Ljava/lang/String;
+.field public static final ayI:[B
 
-.field private static final ayp:[[B
+.field private static final ayy:I = 0xb
 
-.field public static final ayq:[B
+.field private static final ayz:I = 0xc
 
 
 # direct methods
@@ -36,35 +36,35 @@
 
     new-array v1, v0, [I
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->avP:[I
+    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->awh:[I
 
     new-array v1, v0, [J
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->ayk:[J
+    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->ayC:[J
 
     new-array v1, v0, [F
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->ayl:[F
+    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->ayD:[F
 
     new-array v1, v0, [D
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->aym:[D
+    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->ayE:[D
 
     new-array v1, v0, [Z
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->ayn:[Z
+    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->ayF:[Z
 
     new-array v1, v0, [Ljava/lang/String;
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->ayo:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->ayG:[Ljava/lang/String;
 
     new-array v1, v0, [[B
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->ayp:[[B
+    sput-object v1, Lcom/google/android/gms/internal/measurement/hq;->ayH:[[B
 
     new-array v0, v0, [B
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hq;->ayq:[B
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hq;->ayI:[B
 
     return-void
 .end method
@@ -86,7 +86,7 @@
     const/4 v1, 0x1
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->qY()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->qW()I
 
     move-result v2
 
@@ -99,9 +99,9 @@
     goto :goto_0
 
     :cond_0
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/he;->axP:I
+    iget v3, p0, Lcom/google/android/gms/internal/measurement/he;->ayh:I
 
     sub-int/2addr v2, v3
 
@@ -109,13 +109,13 @@
 
     if-ltz v0, :cond_1
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->axP:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/he;->ayh:I
 
     add-int/2addr v2, v0
 
-    iput v2, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iput v2, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/he;->asV:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/he;->atn:I
 
     return v1
 
@@ -145,9 +145,9 @@
     :cond_2
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->axS:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/he;->ayk:I
 
-    iget p0, p0, Lcom/google/android/gms/internal/measurement/he;->axP:I
+    iget p0, p0, Lcom/google/android/gms/internal/measurement/he;->ayh:I
 
     sub-int/2addr v1, p0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hs.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hs.smali
index e30918a1a3..0506d1863c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hs.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract tD()Z
+.method public abstract tB()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hu.smali
index 06eb6e6571..25b03d17e8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hu.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static ayr:Lcom/google/android/gms/internal/measurement/hu;
+.field private static ayJ:Lcom/google/android/gms/internal/measurement/hu;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/hu;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hu;->ayr:Lcom/google/android/gms/internal/measurement/hu;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hu;->ayJ:Lcom/google/android/gms/internal/measurement/hu;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hu;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hu;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static tD()Z
+.method public static tB()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hu;->ayr:Lcom/google/android/gms/internal/measurement/hu;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hu;->ayJ:Lcom/google/android/gms/internal/measurement/hu;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hu;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/hs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hs;->tD()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hs;->tB()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hu;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hu;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hv.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hv.smali
index 4755399e23..953bae4779 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hv.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static ayt:Lcom/google/android/gms/internal/measurement/hv;
+.field private static ayL:Lcom/google/android/gms/internal/measurement/hv;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/hv;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hv;->ayt:Lcom/google/android/gms/internal/measurement/hv;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hv;->ayL:Lcom/google/android/gms/internal/measurement/hv;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hv;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hv;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static tE()Z
+.method public static tC()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hv;->ayt:Lcom/google/android/gms/internal/measurement/hv;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hv;->ayL:Lcom/google/android/gms/internal/measurement/hv;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hv;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/hy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hy;->tE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hy;->tC()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hv;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hv;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hw.smali
index 0fed485999..c23e6bb51c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hw.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final ayu:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayM:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hw;->ayu:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hw;->ayM:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final tD()Z
+.method public final tB()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hw;->ayu:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hw;->ayM:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hx.smali
index b0923a3a4f..297af1d169 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hx.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final ayv:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayN:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hx;->ayv:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hx;->ayN:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final tE()Z
+.method public final tC()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hx;->ayv:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hx;->ayN:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hy.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hy.smali
index b227d5f99e..f02cbcf5d7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hy.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract tE()Z
+.method public abstract tC()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hz.smali
index a87d9f62b0..2ac11a3220 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hz.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract tF()Z
+.method public abstract tD()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/i.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/i.smali
index cfa30bf4ab..6c8d136164 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/i.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic aqp:Lcom/google/android/gms/internal/measurement/jv;
+.field private final synthetic aqH:Lcom/google/android/gms/internal/measurement/jv;
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Lcom/google/android/gms/internal/measurement/jv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/i;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/i;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/i;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/i;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -31,23 +31,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/i;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/i;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/i;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/i;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/iu;->generateEventId(Lcom/google/android/gms/internal/measurement/ln;)V
 
     return-void
 .end method
 
-.method protected final oB()V
+.method protected final oz()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/i;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/i;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ia.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ia.smali
index d530d3f68f..e2b9268a1a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ia.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ia.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static ayw:Lcom/google/android/gms/internal/measurement/ia;
+.field private static ayO:Lcom/google/android/gms/internal/measurement/ia;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ia;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ia;->ayw:Lcom/google/android/gms/internal/measurement/ia;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ia;->ayO:Lcom/google/android/gms/internal/measurement/ia;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ia;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ia;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static tF()Z
+.method public static tD()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ia;->ayw:Lcom/google/android/gms/internal/measurement/ia;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ia;->ayO:Lcom/google/android/gms/internal/measurement/ia;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ia;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/hz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hz;->tF()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hz;->tD()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ia;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ia;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ib.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ib.smali
index c2a7953e80..bd547aa7f7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ib.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ib.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static ayx:Lcom/google/android/gms/internal/measurement/ib;
+.field private static ayP:Lcom/google/android/gms/internal/measurement/ib;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ib;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayx:Lcom/google/android/gms/internal/measurement/ib;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayP:Lcom/google/android/gms/internal/measurement/ib;
 
     return-void
 .end method
@@ -78,15 +78,51 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ib;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ib;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
+.method public static tE()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayP:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ie;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ie;->tE()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public static tF()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayP:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ie;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ie;->tF()Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public static tG()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayx:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayP:Lcom/google/android/gms/internal/measurement/ib;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->get()Ljava/lang/Object;
 
@@ -101,48 +137,12 @@
     return v0
 .end method
 
-.method public static tH()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayx:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ie;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ie;->tH()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public static tI()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayx:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ie;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ie;->tI()Z
-
-    move-result v0
-
-    return v0
-.end method
-
 
 # virtual methods
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ib;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ib;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ic.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ic.smali
index c846b25c1c..8a05ca6d9d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ic.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ic.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final ayy:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayQ:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayy:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayQ:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final tF()Z
+.method public final tD()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayy:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayQ:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/id.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/id.smali
index 376ca278ca..5bc69dc821 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/id.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/id.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final ayA:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayR:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final ayB:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayS:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private static final ayz:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayT:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -45,7 +45,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -59,7 +59,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/id;->ayz:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/id;->ayR:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.log_third_party_store_events_enabled"
 
@@ -67,7 +67,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/id;->ayA:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/id;->ayS:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.log_upgrades_enabled"
 
@@ -75,7 +75,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/id;->ayB:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/id;->ayT:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -90,46 +90,46 @@
 
 
 # virtual methods
+.method public final tE()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayR:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final tF()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayS:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final tG()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayz:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final tH()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayA:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final tI()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayB:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayT:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ie.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ie.smali
index 61dd1a2294..8a12e6cc6a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ie.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ie.smali
@@ -3,11 +3,11 @@
 
 
 # virtual methods
+.method public abstract tE()Z
+.end method
+
+.method public abstract tF()Z
+.end method
+
 .method public abstract tG()Z
 .end method
-
-.method public abstract tH()Z
-.end method
-
-.method public abstract tI()Z
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/if.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/if.smali
index 8ca3c6d0b3..7a794d90c9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/if.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/if.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract tJ()Z
+.method public abstract tH()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ig.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ig.smali
index 6cf05b797a..2384047b97 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ig.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ig.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static ayC:Lcom/google/android/gms/internal/measurement/ig;
+.field private static ayU:Lcom/google/android/gms/internal/measurement/ig;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ig;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ig;->ayC:Lcom/google/android/gms/internal/measurement/ig;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ig;->ayU:Lcom/google/android/gms/internal/measurement/ig;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ig;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ig;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static tJ()Z
+.method public static tH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ig;->ayC:Lcom/google/android/gms/internal/measurement/ig;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ig;->ayU:Lcom/google/android/gms/internal/measurement/ig;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ig;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/if;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/if;->tJ()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/if;->tH()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ig;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ig;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ih.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ih.smali
index 87b913496d..8a2935006c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ih.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ih.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static ayD:Lcom/google/android/gms/internal/measurement/ih;
+.field private static ayV:Lcom/google/android/gms/internal/measurement/ih;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ih;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ih;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ih;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static tK()J
+.method public static tI()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -94,17 +94,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ik;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->tK()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->tI()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static tL()J
+.method public static tJ()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -112,17 +112,53 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ik;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->tL()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->tJ()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
+.method public static tK()Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ik;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->tK()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public static tL()Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ik;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->tL()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public static tM()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -137,10 +173,10 @@
     return-object v0
 .end method
 
-.method public static tN()Ljava/lang/String;
-    .locals 1
+.method public static tN()J
+    .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -148,17 +184,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ik;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->tN()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->tN()J
 
-    move-result-object v0
+    move-result-wide v0
 
-    return-object v0
+    return-wide v0
 .end method
 
-.method public static tO()Ljava/lang/String;
-    .locals 1
+.method public static tO()J
+    .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -166,17 +202,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ik;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->tO()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->tO()J
 
-    move-result-object v0
+    move-result-wide v0
 
-    return-object v0
+    return-wide v0
 .end method
 
 .method public static tP()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -194,7 +230,7 @@
 .method public static tQ()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -212,7 +248,7 @@
 .method public static tR()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -230,7 +266,7 @@
 .method public static tS()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -248,7 +284,7 @@
 .method public static tT()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -266,7 +302,7 @@
 .method public static tU()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -284,7 +320,7 @@
 .method public static tV()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -302,7 +338,7 @@
 .method public static tW()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -320,7 +356,7 @@
 .method public static tX()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -338,7 +374,7 @@
 .method public static tY()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -356,7 +392,7 @@
 .method public static tZ()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -374,7 +410,7 @@
 .method public static ua()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -392,7 +428,7 @@
 .method public static ub()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -410,7 +446,7 @@
 .method public static uc()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -428,7 +464,7 @@
 .method public static ud()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -446,7 +482,7 @@
 .method public static ue()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -464,7 +500,7 @@
 .method public static uf()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -482,7 +518,7 @@
 .method public static ug()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -500,7 +536,7 @@
 .method public static uh()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -518,7 +554,7 @@
 .method public static ui()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -536,7 +572,7 @@
 .method public static uj()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -554,7 +590,7 @@
 .method public static uk()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -572,7 +608,7 @@
 .method public static ul()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -590,7 +626,7 @@
 .method public static um()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -608,7 +644,7 @@
 .method public static un()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -623,10 +659,10 @@
     return-wide v0
 .end method
 
-.method public static uo()J
-    .locals 2
+.method public static uo()Ljava/lang/String;
+    .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -634,17 +670,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ik;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->uo()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->uo()Ljava/lang/String;
 
-    move-result-wide v0
+    move-result-object v0
 
-    return-wide v0
+    return-object v0
 .end method
 
 .method public static up()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayV:Lcom/google/android/gms/internal/measurement/ih;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
 
@@ -659,48 +695,12 @@
     return-wide v0
 .end method
 
-.method public static uq()Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ik;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->uq()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public static ur()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayD:Lcom/google/android/gms/internal/measurement/ih;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ik;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ik;->ur()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
 
 # virtual methods
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ii.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ii.smali
index 0c09657010..6c1688fd48 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ii.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ii.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final ayE:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayW:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final ayF:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayX:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -35,7 +35,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -49,7 +49,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ii;->ayE:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ii;->ayW:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.id.app_launch.event_ordering_fix"
 
@@ -59,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ii;->ayF:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ii;->ayX:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -74,10 +74,10 @@
 
 
 # virtual methods
-.method public final tJ()Z
+.method public final tH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ii;->ayE:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ii;->ayW:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ij.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ij.smali
index 20bb4dd92e..0164d59537 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ij.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ij.smali
@@ -6,186 +6,6 @@
 
 
 # static fields
-.field private static final ayG:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayH:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayI:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayJ:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayK:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayL:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayM:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayN:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayO:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayP:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayQ:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayR:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayS:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayT:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayU:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayV:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayW:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayX:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private static final ayY:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -206,7 +26,7 @@
     .end annotation
 .end field
 
-.field private static final aza:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final azA:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -216,11 +36,91 @@
     .end annotation
 .end field
 
+.field private static final azB:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azC:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azD:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azE:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azF:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azG:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azH:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final aza:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field private static final azb:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -230,7 +130,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -350,13 +250,113 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
 .end field
 
 .field private static final azp:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azq:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azr:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azs:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azt:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azu:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azv:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azw:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azx:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azy:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final azz:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -375,7 +375,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -389,7 +389,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/ij;->ayG:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/ij;->ayY:Lcom/google/android/gms/internal/measurement/bf;
 
     const-wide/32 v3, 0x36ee80
 
@@ -399,7 +399,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->ayH:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->ayZ:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v5, "measurement.log_tag"
 
@@ -409,7 +409,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->ayI:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->aza:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v5, "measurement.config.url_authority"
 
@@ -419,7 +419,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->ayJ:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->azb:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v5, "measurement.config.url_scheme"
 
@@ -429,7 +429,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->ayK:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->azc:Lcom/google/android/gms/internal/measurement/bf;
 
     const-wide/16 v5, 0x3e8
 
@@ -439,7 +439,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/measurement/ij;->ayL:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v7, Lcom/google/android/gms/internal/measurement/ij;->azd:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v7, "measurement.lifetimevalue.max_currency_tracked"
 
@@ -449,7 +449,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/measurement/ij;->ayM:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v7, Lcom/google/android/gms/internal/measurement/ij;->aze:Lcom/google/android/gms/internal/measurement/bf;
 
     const-wide/32 v7, 0x186a0
 
@@ -459,7 +459,7 @@
 
     move-result-object v9
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/ij;->ayN:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/ij;->azf:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v9, "measurement.experiment.max_ids"
 
@@ -469,7 +469,7 @@
 
     move-result-object v9
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/ij;->ayO:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/ij;->azg:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v9, "measurement.audience.filter_result_max_count"
 
@@ -479,7 +479,7 @@
 
     move-result-object v9
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/ij;->ayP:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/ij;->azh:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v9, "measurement.alarm_manager.minimum_interval"
 
@@ -489,7 +489,7 @@
 
     move-result-object v9
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/ij;->ayQ:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/ij;->azi:Lcom/google/android/gms/internal/measurement/bf;
 
     const-wide/16 v9, 0x1f4
 
@@ -499,7 +499,7 @@
 
     move-result-object v11
 
-    sput-object v11, Lcom/google/android/gms/internal/measurement/ij;->ayR:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/ij;->azj:Lcom/google/android/gms/internal/measurement/bf;
 
     const-wide/32 v11, 0x5265c00
 
@@ -509,7 +509,7 @@
 
     move-result-object v13
 
-    sput-object v13, Lcom/google/android/gms/internal/measurement/ij;->ayS:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v13, Lcom/google/android/gms/internal/measurement/ij;->azk:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v13, "measurement.upload.realtime_upload_interval"
 
@@ -517,7 +517,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->ayT:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azl:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.upload.refresh_blacklisted_config_interval"
 
@@ -527,7 +527,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->ayU:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azm:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.config.cache_time.service"
 
@@ -535,7 +535,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->ayV:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azn:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.service_client.idle_disconnect_millis"
 
@@ -545,7 +545,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->ayW:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azo:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.log_tag.service"
 
@@ -555,7 +555,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->ayX:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azp:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.upload.stale_data_deletion_interval"
 
@@ -563,7 +563,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->ayY:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azq:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.upload.backoff_period"
 
@@ -573,7 +573,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->ayZ:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azr:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.upload.initial_upload_delay_time"
 
@@ -583,7 +583,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->aza:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azs:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.upload.interval"
 
@@ -591,7 +591,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azb:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azt:Lcom/google/android/gms/internal/measurement/bf;
 
     const-wide/32 v1, 0x10000
 
@@ -601,7 +601,7 @@
 
     move-result-object v11
 
-    sput-object v11, Lcom/google/android/gms/internal/measurement/ij;->azc:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/ij;->azu:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v11, "measurement.upload.max_bundles"
 
@@ -611,7 +611,7 @@
 
     move-result-object v11
 
-    sput-object v11, Lcom/google/android/gms/internal/measurement/ij;->azd:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/ij;->azv:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v11, "measurement.upload.max_conversions_per_day"
 
@@ -619,7 +619,7 @@
 
     move-result-object v9
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/ij;->aze:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/ij;->azw:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v9, "measurement.upload.max_error_events_per_day"
 
@@ -627,7 +627,7 @@
 
     move-result-object v9
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/ij;->azf:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/ij;->azx:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v9, "measurement.upload.max_events_per_bundle"
 
@@ -635,7 +635,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->azg:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->azy:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v5, "measurement.upload.max_events_per_day"
 
@@ -643,7 +643,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->azh:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->azz:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v5, "measurement.upload.max_public_events_per_day"
 
@@ -653,7 +653,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->azi:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->azA:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v5, "measurement.upload.max_queue_time"
 
@@ -663,7 +663,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->azj:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->azB:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v5, "measurement.upload.max_realtime_events_per_day"
 
@@ -673,7 +673,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->azk:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/ij;->azC:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v5, "measurement.upload.max_batch_size"
 
@@ -681,7 +681,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azl:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azD:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.upload.retry_count"
 
@@ -691,7 +691,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azm:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azE:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.upload.retry_time"
 
@@ -701,7 +701,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azn:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azF:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.upload.url"
 
@@ -711,7 +711,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azo:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ij;->azG:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.upload.window_interval"
 
@@ -719,7 +719,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ij;->azp:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ij;->azH:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -734,283 +734,7 @@
 
 
 # virtual methods
-.method public final tK()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayG:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final tL()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayH:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final tM()Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayI:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final tN()Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayJ:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final tO()Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayK:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final tP()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayL:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final tQ()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayM:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final tR()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayN:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final tS()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayO:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final tT()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayP:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final tU()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayQ:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final tV()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayR:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final tW()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayS:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final tX()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayT:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final tY()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayU:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final tZ()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayW:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final ua()J
+.method public final tI()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayY:Lcom/google/android/gms/internal/measurement/bf;
@@ -1028,7 +752,7 @@
     return-wide v0
 .end method
 
-.method public final ub()J
+.method public final tJ()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayZ:Lcom/google/android/gms/internal/measurement/bf;
@@ -1046,8 +770,8 @@
     return-wide v0
 .end method
 
-.method public final uc()J
-    .locals 2
+.method public final tK()Ljava/lang/String;
+    .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->aza:Lcom/google/android/gms/internal/measurement/bf;
 
@@ -1055,17 +779,13 @@
 
     move-result-object v0
 
-    check-cast v0, Ljava/lang/Long;
+    check-cast v0, Ljava/lang/String;
 
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
+    return-object v0
 .end method
 
-.method public final ud()J
-    .locals 2
+.method public final tL()Ljava/lang/String;
+    .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azb:Lcom/google/android/gms/internal/measurement/bf;
 
@@ -1073,17 +793,13 @@
 
     move-result-object v0
 
-    check-cast v0, Ljava/lang/Long;
+    check-cast v0, Ljava/lang/String;
 
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
+    return-object v0
 .end method
 
-.method public final ue()J
-    .locals 2
+.method public final tM()Ljava/lang/String;
+    .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azc:Lcom/google/android/gms/internal/measurement/bf;
 
@@ -1091,16 +807,12 @@
 
     move-result-object v0
 
-    check-cast v0, Ljava/lang/Long;
+    check-cast v0, Ljava/lang/String;
 
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
+    return-object v0
 .end method
 
-.method public final uf()J
+.method public final tN()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azd:Lcom/google/android/gms/internal/measurement/bf;
@@ -1118,7 +830,7 @@
     return-wide v0
 .end method
 
-.method public final ug()J
+.method public final tO()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->aze:Lcom/google/android/gms/internal/measurement/bf;
@@ -1136,7 +848,7 @@
     return-wide v0
 .end method
 
-.method public final uh()J
+.method public final tP()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azf:Lcom/google/android/gms/internal/measurement/bf;
@@ -1154,7 +866,7 @@
     return-wide v0
 .end method
 
-.method public final ui()J
+.method public final tQ()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azg:Lcom/google/android/gms/internal/measurement/bf;
@@ -1172,7 +884,7 @@
     return-wide v0
 .end method
 
-.method public final uj()J
+.method public final tR()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azh:Lcom/google/android/gms/internal/measurement/bf;
@@ -1190,7 +902,7 @@
     return-wide v0
 .end method
 
-.method public final uk()J
+.method public final tS()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azi:Lcom/google/android/gms/internal/measurement/bf;
@@ -1208,7 +920,7 @@
     return-wide v0
 .end method
 
-.method public final ul()J
+.method public final tT()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azj:Lcom/google/android/gms/internal/measurement/bf;
@@ -1226,7 +938,7 @@
     return-wide v0
 .end method
 
-.method public final um()J
+.method public final tU()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azk:Lcom/google/android/gms/internal/measurement/bf;
@@ -1244,7 +956,7 @@
     return-wide v0
 .end method
 
-.method public final un()J
+.method public final tV()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azl:Lcom/google/android/gms/internal/measurement/bf;
@@ -1262,7 +974,7 @@
     return-wide v0
 .end method
 
-.method public final uo()J
+.method public final tW()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azm:Lcom/google/android/gms/internal/measurement/bf;
@@ -1280,10 +992,10 @@
     return-wide v0
 .end method
 
-.method public final up()J
+.method public final tX()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azn:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azo:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
@@ -1298,10 +1010,298 @@
     return-wide v0
 .end method
 
-.method public final uq()Ljava/lang/String;
+.method public final tY()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azq:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final tZ()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azr:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final ua()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azs:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final ub()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azt:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final uc()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azu:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final ud()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azv:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final ue()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azw:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final uf()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azx:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final ug()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azy:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final uh()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azz:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final ui()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azA:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final uj()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azB:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final uk()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azC:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final ul()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azD:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final um()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azE:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final un()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azF:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final uo()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azo:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azG:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
@@ -1312,10 +1312,10 @@
     return-object v0
 .end method
 
-.method public final ur()J
+.method public final up()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azp:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->azH:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ik.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ik.smali
index f871612e1f..424b5f323e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ik.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ik.smali
@@ -3,19 +3,25 @@
 
 
 # virtual methods
-.method public abstract tK()J
+.method public abstract tI()J
 .end method
 
-.method public abstract tL()J
+.method public abstract tJ()J
+.end method
+
+.method public abstract tK()Ljava/lang/String;
+.end method
+
+.method public abstract tL()Ljava/lang/String;
 .end method
 
 .method public abstract tM()Ljava/lang/String;
 .end method
 
-.method public abstract tN()Ljava/lang/String;
+.method public abstract tN()J
 .end method
 
-.method public abstract tO()Ljava/lang/String;
+.method public abstract tO()J
 .end method
 
 .method public abstract tP()J
@@ -93,14 +99,8 @@
 .method public abstract un()J
 .end method
 
-.method public abstract uo()J
+.method public abstract uo()Ljava/lang/String;
 .end method
 
 .method public abstract up()J
 .end method
-
-.method public abstract uq()Ljava/lang/String;
-.end method
-
-.method public abstract ur()J
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/il.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/il.smali
index 28668d8909..327f60cd8f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/il.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/il.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract us()Z
+.method public abstract uq()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/im.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/im.smali
index 186916f596..9aabd52097 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/im.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/im.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azq:Lcom/google/android/gms/internal/measurement/im;
+.field private static azI:Lcom/google/android/gms/internal/measurement/im;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/im;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/im;->azq:Lcom/google/android/gms/internal/measurement/im;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/im;->azI:Lcom/google/android/gms/internal/measurement/im;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/im;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/im;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static us()Z
+.method public static uq()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/im;->azq:Lcom/google/android/gms/internal/measurement/im;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/im;->azI:Lcom/google/android/gms/internal/measurement/im;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/im;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/il;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/il;->us()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/il;->uq()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/im;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/im;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/in.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/in.smali
index 2cbc060190..34eea9a6c1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/in.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/in.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azr:Lcom/google/android/gms/internal/measurement/in;
+.field private static azJ:Lcom/google/android/gms/internal/measurement/in;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/in;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/in;->azr:Lcom/google/android/gms/internal/measurement/in;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/in;->azJ:Lcom/google/android/gms/internal/measurement/in;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/in;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/in;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static ut()Z
+.method public static ur()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/in;->azr:Lcom/google/android/gms/internal/measurement/in;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/in;->azJ:Lcom/google/android/gms/internal/measurement/in;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/in;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/iq;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/iq;->ut()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/iq;->ur()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/in;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/in;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/io.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/io.smali
index f155d3674b..898df9dd0c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/io.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/io.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final azs:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final azK:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/io;->azs:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/io;->azK:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final us()Z
+.method public final uq()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/io;->azs:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/io;->azK:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip.smali
index 5aac70f033..1e38b49f99 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ip.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final ayF:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayX:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final azt:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final azL:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -35,7 +35,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -49,7 +49,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ip;->azt:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ip;->azL:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.id.upload_dsid_enabled"
 
@@ -59,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ip;->ayF:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ip;->ayX:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -74,10 +74,10 @@
 
 
 # virtual methods
-.method public final ut()Z
+.method public final ur()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ip;->azt:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ip;->azL:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iq.smali
index 3e0ba12360..b9bdb8cc4b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iq.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract ut()Z
+.method public abstract ur()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ir.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ir.smali
index 371b89650d..74ce91f820 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ir.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ir.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract uu()Z
+.method public abstract us()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/is.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/is.smali
index 12ae69e075..40798816f6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/is.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/is.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azu:Lcom/google/android/gms/internal/measurement/is;
+.field private static azM:Lcom/google/android/gms/internal/measurement/is;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/is;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/is;->azu:Lcom/google/android/gms/internal/measurement/is;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/is;->azM:Lcom/google/android/gms/internal/measurement/is;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/is;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/is;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uu()Z
+.method public static us()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/is;->azu:Lcom/google/android/gms/internal/measurement/is;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/is;->azM:Lcom/google/android/gms/internal/measurement/is;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/is;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ir;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ir;->uu()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ir;->us()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/is;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/is;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/it.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/it.smali
index 751720be2a..766842be21 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/it.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/it.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azv:Lcom/google/android/gms/internal/measurement/it;
+.field private static azN:Lcom/google/android/gms/internal/measurement/it;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/it;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/it;->azv:Lcom/google/android/gms/internal/measurement/it;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/it;->azN:Lcom/google/android/gms/internal/measurement/it;
 
     return-void
 .end method
@@ -78,15 +78,51 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/it;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/it;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
+.method public static ut()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/it;->azN:Lcom/google/android/gms/internal/measurement/it;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/it;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ix;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ix;->ut()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public static uu()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/it;->azN:Lcom/google/android/gms/internal/measurement/it;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/it;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ix;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ix;->uu()Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public static uv()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/it;->azv:Lcom/google/android/gms/internal/measurement/it;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/it;->azN:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/it;->get()Ljava/lang/Object;
 
@@ -101,48 +137,12 @@
     return v0
 .end method
 
-.method public static uw()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/it;->azv:Lcom/google/android/gms/internal/measurement/it;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/it;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ix;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ix;->uw()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public static ux()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/it;->azv:Lcom/google/android/gms/internal/measurement/it;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/it;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ix;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ix;->ux()Z
-
-    move-result v0
-
-    return v0
-.end method
-
 
 # virtual methods
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/it;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/it;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iv.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iv.smali
index 1bb6c263e3..d1407e7b93 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iv.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final azw:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final azO:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/iv;->azw:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/iv;->azO:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final uu()Z
+.method public final us()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iv;->azw:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iv;->azO:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iw.smali
index 2220dbb17e..b80826635c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iw.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final ayF:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayX:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final azA:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final azP:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private static final azx:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final azQ:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private static final azy:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final azR:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -46,7 +46,7 @@
     .end annotation
 .end field
 
-.field private static final azz:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final azS:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -65,7 +65,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -79,7 +79,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/iw;->azx:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/iw;->azP:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.collection.init_params_control_enabled"
 
@@ -89,7 +89,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/iw;->azy:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/iw;->azQ:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.sdk.dynamite.use_dynamite"
 
@@ -97,7 +97,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/iw;->azz:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/iw;->azR:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.sdk.dynamite.use_dynamite2"
 
@@ -105,7 +105,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/iw;->azA:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/iw;->azS:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.id.sdk.dynamite.use_dynamite"
 
@@ -115,7 +115,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/iw;->ayF:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/iw;->ayX:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -130,46 +130,46 @@
 
 
 # virtual methods
+.method public final ut()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iw;->azP:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final uu()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iw;->azQ:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final uv()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iw;->azx:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final uw()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iw;->azy:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final ux()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iw;->azz:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iw;->azR:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ix.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ix.smali
index dd8ebf4c2e..ff83899728 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ix.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ix.smali
@@ -3,11 +3,11 @@
 
 
 # virtual methods
+.method public abstract ut()Z
+.end method
+
+.method public abstract uu()Z
+.end method
+
 .method public abstract uv()Z
 .end method
-
-.method public abstract uw()Z
-.end method
-
-.method public abstract ux()Z
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iy.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iy.smali
index af19b35143..3cc58ca909 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iy.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract uy()Z
+.method public abstract uw()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iz.smali
index 64d701c65f..211ff21038 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iz.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azB:Lcom/google/android/gms/internal/measurement/iz;
+.field private static azT:Lcom/google/android/gms/internal/measurement/iz;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/iz;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/iz;->azB:Lcom/google/android/gms/internal/measurement/iz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/iz;->azT:Lcom/google/android/gms/internal/measurement/iz;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/iz;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/iz;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uy()Z
+.method public static uw()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iz;->azB:Lcom/google/android/gms/internal/measurement/iz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iz;->azT:Lcom/google/android/gms/internal/measurement/iz;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/iz;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/iy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/iy;->uy()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/iy;->uw()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/iz;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/iz;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/j.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/j.smali
index 29de9320f7..b9c6549eb8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/j.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic aqp:Lcom/google/android/gms/internal/measurement/jv;
+.field private final synthetic aqH:Lcom/google/android/gms/internal/measurement/jv;
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Lcom/google/android/gms/internal/measurement/jv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/j;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/j;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/j;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/j;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -31,23 +31,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/j;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/j;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/j;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/j;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/iu;->getCachedAppInstanceId(Lcom/google/android/gms/internal/measurement/ln;)V
 
     return-void
 .end method
 
-.method protected final oB()V
+.method protected final oz()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/j;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/j;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ja.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ja.smali
index c4273621f9..e8da2a9c97 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ja.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ja.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azC:Lcom/google/android/gms/internal/measurement/ja;
+.field private static azU:Lcom/google/android/gms/internal/measurement/ja;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ja;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ja;->azC:Lcom/google/android/gms/internal/measurement/ja;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ja;->azU:Lcom/google/android/gms/internal/measurement/ja;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ja;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ja;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uz()Z
+.method public static ux()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ja;->azC:Lcom/google/android/gms/internal/measurement/ja;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ja;->azU:Lcom/google/android/gms/internal/measurement/ja;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ja;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jd;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jd;->uz()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jd;->ux()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ja;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ja;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jb.smali
index 1162cc3e8a..bd65861a7b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jb.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final azD:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final azV:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jb;->azD:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jb;->azV:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final uy()Z
+.method public final uw()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jb;->azD:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jb;->azV:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jc.smali
index 1bf2eb8ae5..df597697e0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jc.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final ayF:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayX:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final azE:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final azW:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -35,7 +35,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -49,7 +49,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/jc;->azE:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/jc;->azW:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.id.fetch_config_with_admob_app_id"
 
@@ -59,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jc;->ayF:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jc;->ayX:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -74,10 +74,10 @@
 
 
 # virtual methods
-.method public final uz()Z
+.method public final ux()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jc;->azE:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jc;->azW:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jd.smali
index 6c1d29c9ec..ea0a4984ab 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jd.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract uz()Z
+.method public abstract ux()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/je.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/je.smali
index 57864d23a7..cb3aef1640 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/je.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/je.smali
@@ -3,8 +3,8 @@
 
 
 # virtual methods
-.method public abstract uA()Z
+.method public abstract uy()Z
 .end method
 
-.method public abstract uB()Z
+.method public abstract uz()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jf.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jf.smali
index b9b66d0f06..9d770ba2e7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jf.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azF:Lcom/google/android/gms/internal/measurement/jf;
+.field private static azX:Lcom/google/android/gms/internal/measurement/jf;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jf;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jf;->azF:Lcom/google/android/gms/internal/measurement/jf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jf;->azX:Lcom/google/android/gms/internal/measurement/jf;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jf;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jf;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uA()Z
+.method public static uy()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jf;->azF:Lcom/google/android/gms/internal/measurement/jf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jf;->azX:Lcom/google/android/gms/internal/measurement/jf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jf;->get()Ljava/lang/Object;
 
@@ -94,17 +94,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/je;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/je;->uA()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/je;->uy()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static uB()Z
+.method public static uz()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jf;->azF:Lcom/google/android/gms/internal/measurement/jf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jf;->azX:Lcom/google/android/gms/internal/measurement/jf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jf;->get()Ljava/lang/Object;
 
@@ -112,7 +112,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/je;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/je;->uB()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/je;->uz()Z
 
     move-result v0
 
@@ -124,7 +124,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jf;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jf;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jg.smali
index cf137c82da..8850ac732b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jg.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azG:Lcom/google/android/gms/internal/measurement/jg;
+.field private static azY:Lcom/google/android/gms/internal/measurement/jg;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jg;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jg;->azG:Lcom/google/android/gms/internal/measurement/jg;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jg;->azY:Lcom/google/android/gms/internal/measurement/jg;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jg;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jg;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uC()Z
+.method public static uA()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jg;->azG:Lcom/google/android/gms/internal/measurement/jg;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jg;->azY:Lcom/google/android/gms/internal/measurement/jg;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jg;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jj;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jj;->uC()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jj;->uA()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jg;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jg;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jh.smali
index c4cff4ce3e..8b8f52fa08 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jh.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final azH:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAa:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final azI:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final azZ:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -35,7 +35,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -49,7 +49,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/jh;->azH:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/jh;->azZ:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.collection.redundant_engagement_removal_enabled"
 
@@ -57,7 +57,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jh;->azI:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jh;->aAa:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -72,10 +72,10 @@
 
 
 # virtual methods
-.method public final uA()Z
+.method public final uy()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azH:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azZ:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
@@ -90,10 +90,10 @@
     return v0
 .end method
 
-.method public final uB()Z
+.method public final uz()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azI:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->aAa:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ji.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ji.smali
index d1fba38336..bbe098247d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ji.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ji.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final azJ:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAb:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ji;->azJ:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ji;->aAb:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final uC()Z
+.method public final uA()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ji;->azJ:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ji;->aAb:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jj.smali
index 39eaef71c5..7cf94c450f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jj.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract uC()Z
+.method public abstract uA()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jk.smali
index 5d5cd3203f..6c29a3c4a5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jk.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract uD()Z
+.method public abstract uB()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jl.smali
index bbd07e8d84..52f3fbb53d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jl.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azK:Lcom/google/android/gms/internal/measurement/jl;
+.field private static aAc:Lcom/google/android/gms/internal/measurement/jl;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jl;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jl;->azK:Lcom/google/android/gms/internal/measurement/jl;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jl;->aAc:Lcom/google/android/gms/internal/measurement/jl;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jl;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jl;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uD()Z
+.method public static uB()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jl;->azK:Lcom/google/android/gms/internal/measurement/jl;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jl;->aAc:Lcom/google/android/gms/internal/measurement/jl;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jl;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jk;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jk;->uD()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jk;->uB()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jl;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jm.smali
index ef60c9db27..3559254e6b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jm.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azL:Lcom/google/android/gms/internal/measurement/jm;
+.field private static aAd:Lcom/google/android/gms/internal/measurement/jm;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jm;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jm;->azL:Lcom/google/android/gms/internal/measurement/jm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jm;->aAd:Lcom/google/android/gms/internal/measurement/jm;
 
     return-void
 .end method
@@ -78,15 +78,51 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jm;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jm;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
+.method public static uC()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jm;->aAd:Lcom/google/android/gms/internal/measurement/jm;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jm;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/jp;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jp;->uC()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public static uD()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jm;->aAd:Lcom/google/android/gms/internal/measurement/jm;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jm;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/jp;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jp;->uD()Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public static uE()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jm;->azL:Lcom/google/android/gms/internal/measurement/jm;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jm;->aAd:Lcom/google/android/gms/internal/measurement/jm;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jm;->get()Ljava/lang/Object;
 
@@ -101,48 +137,12 @@
     return v0
 .end method
 
-.method public static uF()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jm;->azL:Lcom/google/android/gms/internal/measurement/jm;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jm;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/jp;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jp;->uF()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public static uG()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jm;->azL:Lcom/google/android/gms/internal/measurement/jm;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jm;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/jp;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jp;->uG()Z
-
-    move-result v0
-
-    return v0
-.end method
-
 
 # virtual methods
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jm;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jm;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jn.smali
index 17e2849f01..c62f5f7467 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jn.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final azM:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAe:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jn;->azM:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jn;->aAe:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final uD()Z
+.method public final uB()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jn;->azM:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jn;->aAe:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jo.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jo.smali
index 0705464a6c..3c6401fbeb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jo.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jo.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final azN:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAf:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final azO:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAg:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private static final azP:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAh:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -45,7 +45,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -59,7 +59,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/jo;->azN:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/jo;->aAf:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.sdk.collection.last_deep_link_referrer_campaign"
 
@@ -67,7 +67,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/jo;->azO:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/jo;->aAg:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.sdk.collection.last_gclid_from_referrer"
 
@@ -75,7 +75,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jo;->azP:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jo;->aAh:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -90,46 +90,46 @@
 
 
 # virtual methods
+.method public final uC()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jo;->aAf:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final uD()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jo;->aAg:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final uE()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jo;->azN:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final uF()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jo;->azO:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final uG()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jo;->azP:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jo;->aAh:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jp.smali
index feafb21dd3..ded4ea885a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jp.smali
@@ -3,11 +3,11 @@
 
 
 # virtual methods
+.method public abstract uC()Z
+.end method
+
+.method public abstract uD()Z
+.end method
+
 .method public abstract uE()Z
 .end method
-
-.method public abstract uF()Z
-.end method
-
-.method public abstract uG()Z
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jq.smali
index 3ef59e1416..24b5a7835c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jq.smali
@@ -3,8 +3,8 @@
 
 
 # virtual methods
-.method public abstract uH()Z
+.method public abstract uF()Z
 .end method
 
-.method public abstract uI()Z
+.method public abstract uG()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jr.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jr.smali
index f5c72acd2d..ead8c34cc5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jr.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azQ:Lcom/google/android/gms/internal/measurement/jr;
+.field private static aAi:Lcom/google/android/gms/internal/measurement/jr;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jr;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jr;->azQ:Lcom/google/android/gms/internal/measurement/jr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jr;->aAi:Lcom/google/android/gms/internal/measurement/jr;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jr;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jr;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uH()Z
+.method public static uF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jr;->azQ:Lcom/google/android/gms/internal/measurement/jr;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jr;->aAi:Lcom/google/android/gms/internal/measurement/jr;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jr;->get()Ljava/lang/Object;
 
@@ -94,17 +94,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jq;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jq;->uH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jq;->uF()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static uI()Z
+.method public static uG()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jr;->azQ:Lcom/google/android/gms/internal/measurement/jr;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jr;->aAi:Lcom/google/android/gms/internal/measurement/jr;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jr;->get()Ljava/lang/Object;
 
@@ -112,7 +112,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jq;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jq;->uI()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jq;->uG()Z
 
     move-result v0
 
@@ -124,7 +124,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jr;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jr;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/js.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/js.smali
index cae60ce2af..8260c90464 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/js.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/js.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azR:Lcom/google/android/gms/internal/measurement/js;
+.field private static aAj:Lcom/google/android/gms/internal/measurement/js;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/js;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/js;->azR:Lcom/google/android/gms/internal/measurement/js;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/js;->aAj:Lcom/google/android/gms/internal/measurement/js;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/js;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/js;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uJ()Z
+.method public static uH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/js;->azR:Lcom/google/android/gms/internal/measurement/js;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/js;->aAj:Lcom/google/android/gms/internal/measurement/js;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/js;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jw;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jw;->uJ()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jw;->uH()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/js;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/js;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jt.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jt.smali
index 8b4a7dfeaf..c390c52253 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jt.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jt.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final azS:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAk:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final azT:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAl:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -35,7 +35,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -49,7 +49,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/jt;->azS:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/jt;->aAk:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.personalized_ads_property_translation_enabled"
 
@@ -57,7 +57,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jt;->azT:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jt;->aAl:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -72,10 +72,10 @@
 
 
 # virtual methods
-.method public final uH()Z
+.method public final uF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jt;->azS:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jt;->aAk:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
@@ -90,10 +90,10 @@
     return v0
 .end method
 
-.method public final uI()Z
+.method public final uG()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jt;->azT:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jt;->aAl:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ju.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ju.smali
index a2c5659342..1e8302311b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ju.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ju.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final azU:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAm:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ju;->azU:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ju;->aAm:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final uJ()Z
+.method public final uH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ju;->azU:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ju;->aAm:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jv.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jv.smali
index f5e13e9491..c849fc90ea 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jv.smali
@@ -3,9 +3,7 @@
 
 
 # instance fields
-.field private akG:Z
-
-.field private final azV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final aAn:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -15,6 +13,8 @@
     .end annotation
 .end field
 
+.field private akY:Z
+
 
 # direct methods
 .method public constructor <init>()V
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/jv;->azV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/jv;->aAn:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -137,19 +137,19 @@
 .method public final ag(J)Landroid/os/Bundle;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jv;->azV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jv;->aAn:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/jv;->akG:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/jv;->akY:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     if-nez v1, :cond_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jv;->azV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jv;->aAn:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1, p1, p2}, Ljava/lang/Object;->wait(J)V
     :try_end_1
@@ -168,7 +168,7 @@
 
     :cond_0
     :goto_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/jv;->azV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/jv;->aAn:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -193,23 +193,23 @@
 .method public final d(Landroid/os/Bundle;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jv;->azV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jv;->aAn:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jv;->azV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jv;->aAn:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/jv;->akG:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/jv;->akY:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/jv;->azV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/jv;->aAn:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {p1}, Ljava/lang/Object;->notify()V
 
@@ -220,7 +220,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jv;->azV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/jv;->aAn:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jw.smali
index 6c9ca2d4b0..ce567c6b1b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jw.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract uJ()Z
+.method public abstract uH()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jx.smali
index 555213a7fc..12e9f26506 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jx.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract uK()Z
+.method public abstract uI()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jy.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jy.smali
index 946a3c1872..117d6bc81f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jy.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azW:Lcom/google/android/gms/internal/measurement/jy;
+.field private static aAo:Lcom/google/android/gms/internal/measurement/jy;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jy;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jy;->azW:Lcom/google/android/gms/internal/measurement/jy;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jy;->aAo:Lcom/google/android/gms/internal/measurement/jy;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jy;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jy;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uK()Z
+.method public static uI()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jy;->azW:Lcom/google/android/gms/internal/measurement/jy;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jy;->aAo:Lcom/google/android/gms/internal/measurement/jy;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jy;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jx;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jx;->uK()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jx;->uI()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jy;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jy;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jz.smali
index e08b362229..0db821b667 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/jz.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static azX:Lcom/google/android/gms/internal/measurement/jz;
+.field private static aAp:Lcom/google/android/gms/internal/measurement/jz;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jz;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jz;->azX:Lcom/google/android/gms/internal/measurement/jz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jz;->aAp:Lcom/google/android/gms/internal/measurement/jz;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jz;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jz;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uL()Z
+.method public static uJ()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azX:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->aAp:Lcom/google/android/gms/internal/measurement/jz;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->get()Ljava/lang/Object;
 
@@ -94,17 +94,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kc;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kc;->uL()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kc;->uJ()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static uM()D
+.method public static uK()D
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azX:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->aAp:Lcom/google/android/gms/internal/measurement/jz;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->get()Ljava/lang/Object;
 
@@ -112,17 +112,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kc;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kc;->uM()D
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kc;->uK()D
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static uN()J
+.method public static uL()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azX:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->aAp:Lcom/google/android/gms/internal/measurement/jz;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->get()Ljava/lang/Object;
 
@@ -130,17 +130,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kc;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kc;->uN()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kc;->uL()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static uO()J
+.method public static uM()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azX:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->aAp:Lcom/google/android/gms/internal/measurement/jz;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->get()Ljava/lang/Object;
 
@@ -148,17 +148,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kc;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kc;->uO()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kc;->uM()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static uP()Ljava/lang/String;
+.method public static uN()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azX:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->aAp:Lcom/google/android/gms/internal/measurement/jz;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->get()Ljava/lang/Object;
 
@@ -166,7 +166,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kc;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kc;->uP()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kc;->uN()Ljava/lang/String;
 
     move-result-object v0
 
@@ -178,7 +178,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jz;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jz;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/k.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/k.smali
index bb4db69a9c..742be98677 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/k.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/k.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic aqp:Lcom/google/android/gms/internal/measurement/jv;
+.field private final synthetic aqH:Lcom/google/android/gms/internal/measurement/jv;
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Lcom/google/android/gms/internal/measurement/jv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/k;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/k;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/k;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/k;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -31,23 +31,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/k;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/k;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/iu;->getCurrentScreenClass(Lcom/google/android/gms/internal/measurement/ln;)V
 
     return-void
 .end method
 
-.method protected final oB()V
+.method protected final oz()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ka.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ka.smali
index 79b0e6bf77..de80dce78f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ka.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ka.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final azY:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAq:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ka;->azY:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ka;->aAq:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final uK()Z
+.method public final uI()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ka;->azY:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ka;->aAq:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kb.smali
index ef62d994a5..552c27d01f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kb.smali
@@ -6,7 +6,17 @@
 
 
 # static fields
-.field private static final aAa:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAr:Lcom/google/android/gms/internal/measurement/bf;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/bf<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final aAs:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +26,7 @@
     .end annotation
 .end field
 
-.field private static final aAb:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAt:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -26,7 +36,7 @@
     .end annotation
 .end field
 
-.field private static final aAc:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAu:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -36,7 +46,7 @@
     .end annotation
 .end field
 
-.field private static final aAd:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAv:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -46,16 +56,6 @@
     .end annotation
 .end field
 
-.field private static final azZ:Lcom/google/android/gms/internal/measurement/bf;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/bf<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -65,7 +65,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -79,7 +79,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/kb;->azZ:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kb;->aAr:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.test.double_flag"
 
@@ -87,7 +87,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/kb;->aAa:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kb;->aAs:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.test.int_flag"
 
@@ -97,7 +97,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/kb;->aAb:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kb;->aAt:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.test.long_flag"
 
@@ -107,7 +107,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/kb;->aAc:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kb;->aAu:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.test.string_flag"
 
@@ -117,7 +117,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kb;->aAd:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kb;->aAv:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -132,10 +132,10 @@
 
 
 # virtual methods
-.method public final uL()Z
+.method public final uJ()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->azZ:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->aAr:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
@@ -150,10 +150,10 @@
     return v0
 .end method
 
-.method public final uM()D
+.method public final uK()D
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->aAa:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->aAs:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
@@ -168,10 +168,10 @@
     return-wide v0
 .end method
 
-.method public final uN()J
+.method public final uL()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->aAb:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->aAt:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
@@ -186,10 +186,10 @@
     return-wide v0
 .end method
 
-.method public final uO()J
+.method public final uM()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->aAc:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->aAu:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
@@ -204,10 +204,10 @@
     return-wide v0
 .end method
 
-.method public final uP()Ljava/lang/String;
+.method public final uN()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->aAd:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->aAv:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kc.smali
index 521c787dc5..4ce84adfd3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kc.smali
@@ -3,17 +3,17 @@
 
 
 # virtual methods
-.method public abstract uL()Z
+.method public abstract uJ()Z
 .end method
 
-.method public abstract uM()D
+.method public abstract uK()D
 .end method
 
-.method public abstract uN()J
+.method public abstract uL()J
 .end method
 
-.method public abstract uO()J
+.method public abstract uM()J
 .end method
 
-.method public abstract uP()Ljava/lang/String;
+.method public abstract uN()Ljava/lang/String;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kd.smali
index 607c557626..a4eaf0140c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kd.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract uQ()Z
+.method public abstract uO()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ke.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ke.smali
index a4217a07f8..02c349cdec 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ke.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ke.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static aAe:Lcom/google/android/gms/internal/measurement/ke;
+.field private static aAw:Lcom/google/android/gms/internal/measurement/ke;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ke;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ke;->aAe:Lcom/google/android/gms/internal/measurement/ke;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ke;->aAw:Lcom/google/android/gms/internal/measurement/ke;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ke;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ke;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uQ()Z
+.method public static uO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ke;->aAe:Lcom/google/android/gms/internal/measurement/ke;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ke;->aAw:Lcom/google/android/gms/internal/measurement/ke;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ke;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kd;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kd;->uQ()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kd;->uO()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ke;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ke;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kf.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kf.smali
index a9fa5c8932..b641f13d00 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kf.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static aAf:Lcom/google/android/gms/internal/measurement/kf;
+.field private static aAx:Lcom/google/android/gms/internal/measurement/kf;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/kf;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kf;->aAf:Lcom/google/android/gms/internal/measurement/kf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kf;->aAx:Lcom/google/android/gms/internal/measurement/kf;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kf;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kf;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uR()Z
+.method public static uP()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kf;->aAf:Lcom/google/android/gms/internal/measurement/kf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kf;->aAx:Lcom/google/android/gms/internal/measurement/kf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kf;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ki;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ki;->uR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ki;->uP()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kf;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kf;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kg.smali
index 3812506f3d..7998014b0a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kg.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final aAg:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAy:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kg;->aAg:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kg;->aAy:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final uQ()Z
+.method public final uO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kg;->aAg:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kg;->aAy:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kh.smali
index a22c121eac..6342d71fb2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kh.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final aAh:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAz:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kh;->aAh:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kh;->aAz:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final uR()Z
+.method public final uP()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kh;->aAh:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kh;->aAz:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ki.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ki.smali
index a6615a2357..acf0309ab8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ki.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ki.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract uR()Z
+.method public abstract uP()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kj.smali
index 3070a37448..a862e199f3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kj.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract uS()Z
+.method public abstract uQ()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kk.smali
index 750c6ef24d..3b12cc85bf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kk.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static aAi:Lcom/google/android/gms/internal/measurement/kk;
+.field private static aAA:Lcom/google/android/gms/internal/measurement/kk;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/kk;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kk;->aAi:Lcom/google/android/gms/internal/measurement/kk;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kk;->aAA:Lcom/google/android/gms/internal/measurement/kk;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kk;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kk;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uS()Z
+.method public static uQ()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kk;->aAi:Lcom/google/android/gms/internal/measurement/kk;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kk;->aAA:Lcom/google/android/gms/internal/measurement/kk;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kk;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kj;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kj;->uS()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kj;->uQ()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kk;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kk;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kl.smali
index 5260f94384..07df6c7dea 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kl.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static aAj:Lcom/google/android/gms/internal/measurement/kl;
+.field private static aAB:Lcom/google/android/gms/internal/measurement/kl;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/kl;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kl;->aAj:Lcom/google/android/gms/internal/measurement/kl;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kl;->aAB:Lcom/google/android/gms/internal/measurement/kl;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kl;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kl;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uT()Z
+.method public static uR()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->aAj:Lcom/google/android/gms/internal/measurement/kl;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->aAB:Lcom/google/android/gms/internal/measurement/kl;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ko;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ko;->uT()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ko;->uR()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kl;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kl;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/km.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/km.smali
index ac039dd3d4..5cbb8a5b16 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/km.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/km.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final aAk:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAC:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final ayF:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayX:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -35,7 +35,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -49,7 +49,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/km;->aAk:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/km;->aAC:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.id.reset_analytics.persist_time"
 
@@ -59,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/km;->ayF:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/km;->ayX:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -74,10 +74,10 @@
 
 
 # virtual methods
-.method public final uS()Z
+.method public final uQ()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/km;->aAk:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/km;->aAC:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kn.smali
index bc0c1c211f..5a252a7d3f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kn.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final aAl:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAD:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kn;->aAl:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kn;->aAD:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final uT()Z
+.method public final uR()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->aAl:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->aAD:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ko.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ko.smali
index 80ec0ad6b9..ec56f2dbbc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ko.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ko.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract uT()Z
+.method public abstract uR()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kp.smali
index cc16c8c37c..c15553377f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kp.smali
@@ -3,14 +3,14 @@
 
 
 # virtual methods
+.method public abstract uS()Z
+.end method
+
+.method public abstract uT()Z
+.end method
+
 .method public abstract uU()Z
 .end method
 
 .method public abstract uV()Z
 .end method
-
-.method public abstract uW()Z
-.end method
-
-.method public abstract uX()Z
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kq.smali
index 372bf269d9..0844719897 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kq.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static aAm:Lcom/google/android/gms/internal/measurement/kq;
+.field private static aAE:Lcom/google/android/gms/internal/measurement/kq;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/kq;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kq;->aAm:Lcom/google/android/gms/internal/measurement/kq;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kq;->aAE:Lcom/google/android/gms/internal/measurement/kq;
 
     return-void
 .end method
@@ -78,15 +78,51 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kq;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kq;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
+.method public static uS()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kq;->aAE:Lcom/google/android/gms/internal/measurement/kq;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kq;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/kp;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kp;->uS()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public static uT()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kq;->aAE:Lcom/google/android/gms/internal/measurement/kq;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kq;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/kp;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kp;->uT()Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public static uU()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kq;->aAm:Lcom/google/android/gms/internal/measurement/kq;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kq;->aAE:Lcom/google/android/gms/internal/measurement/kq;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kq;->get()Ljava/lang/Object;
 
@@ -104,7 +140,7 @@
 .method public static uV()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kq;->aAm:Lcom/google/android/gms/internal/measurement/kq;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kq;->aAE:Lcom/google/android/gms/internal/measurement/kq;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kq;->get()Ljava/lang/Object;
 
@@ -119,48 +155,12 @@
     return v0
 .end method
 
-.method public static uW()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kq;->aAm:Lcom/google/android/gms/internal/measurement/kq;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kq;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/kp;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kp;->uW()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public static uX()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kq;->aAm:Lcom/google/android/gms/internal/measurement/kq;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kq;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/kp;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kp;->uX()Z
-
-    move-result v0
-
-    return v0
-.end method
-
 
 # virtual methods
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kq;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kq;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kr.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kr.smali
index e3fdb1c7fa..20fc6c0cad 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kr.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static aAn:Lcom/google/android/gms/internal/measurement/kr;
+.field private static aAF:Lcom/google/android/gms/internal/measurement/kr;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/kr;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kr;->aAn:Lcom/google/android/gms/internal/measurement/kr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kr;->aAF:Lcom/google/android/gms/internal/measurement/kr;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kr;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kr;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static uY()Z
+.method public static uW()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kr;->aAn:Lcom/google/android/gms/internal/measurement/kr;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kr;->aAF:Lcom/google/android/gms/internal/measurement/kr;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kr;->get()Ljava/lang/Object;
 
@@ -94,17 +94,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ku;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ku;->uY()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ku;->uW()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static uZ()Z
+.method public static uX()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kr;->aAn:Lcom/google/android/gms/internal/measurement/kr;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kr;->aAF:Lcom/google/android/gms/internal/measurement/kr;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kr;->get()Ljava/lang/Object;
 
@@ -112,7 +112,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ku;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ku;->uZ()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ku;->uX()Z
 
     move-result v0
 
@@ -124,7 +124,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kr;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kr;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ks.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ks.smali
index d4385fa24f..f6a27fe59d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ks.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ks.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final aAo:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAG:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final aAp:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAH:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private static final aAq:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAI:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private static final aAr:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAJ:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -55,7 +55,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -69,7 +69,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/ks;->aAo:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/ks;->aAG:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.service.audience.session_scoped_user_engagement"
 
@@ -77,7 +77,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/ks;->aAp:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/ks;->aAH:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.service.audience.session_scoped_event_aggregates"
 
@@ -85,7 +85,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/ks;->aAq:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/ks;->aAI:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.service.audience.remove_disabled_session_scoped_user_engagement"
 
@@ -93,7 +93,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ks;->aAr:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ks;->aAJ:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -108,10 +108,46 @@
 
 
 # virtual methods
+.method public final uS()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ks;->aAG:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final uT()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ks;->aAH:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final uU()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ks;->aAo:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ks;->aAI:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
@@ -129,43 +165,7 @@
 .method public final uV()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ks;->aAp:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final uW()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ks;->aAq:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final uX()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ks;->aAr:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ks;->aAJ:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kt.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kt.smali
index 4e9cee822c..1bad79343f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kt.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kt.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final aAs:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAK:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final aAt:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAL:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private static final ayF:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayX:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -45,7 +45,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -59,7 +59,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/kt;->aAs:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/kt;->aAK:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.audience.sequence_filters_bundle_timestamp"
 
@@ -67,7 +67,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/kt;->aAt:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kt;->aAL:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.id.audience.sequence_filters"
 
@@ -77,7 +77,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kt;->ayF:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kt;->ayX:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -92,10 +92,10 @@
 
 
 # virtual methods
-.method public final uY()Z
+.method public final uW()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kt;->aAs:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kt;->aAK:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
@@ -110,10 +110,10 @@
     return v0
 .end method
 
-.method public final uZ()Z
+.method public final uX()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kt;->aAt:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kt;->aAL:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ku.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ku.smali
index a78a2c1ae3..5874f66e6b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ku.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ku.smali
@@ -3,8 +3,8 @@
 
 
 # virtual methods
-.method public abstract uY()Z
+.method public abstract uW()Z
 .end method
 
-.method public abstract uZ()Z
+.method public abstract uX()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kv.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kv.smali
index d000182a21..acff61a5a9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kv.smali
@@ -3,11 +3,11 @@
 
 
 # virtual methods
+.method public abstract uY()Z
+.end method
+
+.method public abstract uZ()Z
+.end method
+
 .method public abstract va()Z
 .end method
-
-.method public abstract vb()Z
-.end method
-
-.method public abstract vc()Z
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kw.smali
index 81b185ec07..a8b46d03a8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kw.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -49,7 +49,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -74,7 +74,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -97,7 +97,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -118,7 +118,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -139,7 +139,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -160,7 +160,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -185,7 +185,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -206,7 +206,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -227,7 +227,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -248,7 +248,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -269,7 +269,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -292,7 +292,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -315,7 +315,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -342,7 +342,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -363,7 +363,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -388,7 +388,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -409,7 +409,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -440,7 +440,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -469,7 +469,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -498,7 +498,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -523,7 +523,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -546,7 +546,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -569,7 +569,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -592,7 +592,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -617,7 +617,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -640,7 +640,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -663,7 +663,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -688,7 +688,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -709,7 +709,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -730,7 +730,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -753,7 +753,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -780,7 +780,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -801,7 +801,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -822,7 +822,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -843,7 +843,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -866,7 +866,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -887,7 +887,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -908,7 +908,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -931,7 +931,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -960,7 +960,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kx.smali
index fd2514ebe3..3edc02ceb5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kx.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static aAu:Lcom/google/android/gms/internal/measurement/kx;
+.field private static aAM:Lcom/google/android/gms/internal/measurement/kx;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/kx;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kx;->aAu:Lcom/google/android/gms/internal/measurement/kx;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kx;->aAM:Lcom/google/android/gms/internal/measurement/kx;
 
     return-void
 .end method
@@ -78,15 +78,51 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kx;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kx;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
+.method public static uY()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kx;->aAM:Lcom/google/android/gms/internal/measurement/kx;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kx;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/kv;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kv;->uY()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public static uZ()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kx;->aAM:Lcom/google/android/gms/internal/measurement/kx;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kx;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/kv;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kv;->uZ()Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public static va()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kx;->aAu:Lcom/google/android/gms/internal/measurement/kx;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kx;->aAM:Lcom/google/android/gms/internal/measurement/kx;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kx;->get()Ljava/lang/Object;
 
@@ -101,48 +137,12 @@
     return v0
 .end method
 
-.method public static vb()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kx;->aAu:Lcom/google/android/gms/internal/measurement/kx;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kx;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/kv;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kv;->vb()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public static vc()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kx;->aAu:Lcom/google/android/gms/internal/measurement/kx;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kx;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/kv;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kv;->vc()Z
-
-    move-result v0
-
-    return v0
-.end method
-
 
 # virtual methods
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kx;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kx;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ky.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ky.smali
index b876cf3054..d2a4cc96d8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ky.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ky.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static aAv:Lcom/google/android/gms/internal/measurement/ky;
+.field private static aAN:Lcom/google/android/gms/internal/measurement/ky;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ky;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ky;->aAv:Lcom/google/android/gms/internal/measurement/ky;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ky;->aAN:Lcom/google/android/gms/internal/measurement/ky;
 
     return-void
 .end method
@@ -78,15 +78,51 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ky;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ky;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
+.method public static vb()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ky;->aAN:Lcom/google/android/gms/internal/measurement/ky;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ky;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/lb;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lb;->vb()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public static vc()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ky;->aAN:Lcom/google/android/gms/internal/measurement/ky;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ky;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/lb;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lb;->vc()Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public static vd()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ky;->aAv:Lcom/google/android/gms/internal/measurement/ky;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ky;->aAN:Lcom/google/android/gms/internal/measurement/ky;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ky;->get()Ljava/lang/Object;
 
@@ -104,7 +140,7 @@
 .method public static ve()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ky;->aAv:Lcom/google/android/gms/internal/measurement/ky;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ky;->aAN:Lcom/google/android/gms/internal/measurement/ky;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ky;->get()Ljava/lang/Object;
 
@@ -119,48 +155,12 @@
     return v0
 .end method
 
-.method public static vf()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ky;->aAv:Lcom/google/android/gms/internal/measurement/ky;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ky;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/lb;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lb;->vf()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public static vg()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ky;->aAv:Lcom/google/android/gms/internal/measurement/ky;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ky;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/lb;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lb;->vg()Z
-
-    move-result v0
-
-    return v0
-.end method
-
 
 # virtual methods
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ky;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ky;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kz.smali
index 3105062705..0fb7da386b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/kz.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final aAw:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAO:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final aAx:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAP:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private static final aAy:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAQ:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private static final ayF:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayX:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -55,7 +55,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -69,7 +69,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/kz;->aAw:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/kz;->aAO:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.service.sessions.session_number_enabled"
 
@@ -77,7 +77,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/kz;->aAx:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/kz;->aAP:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.service.sessions.session_number_backfill_enabled"
 
@@ -85,7 +85,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/kz;->aAy:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kz;->aAQ:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.id.session_number"
 
@@ -95,7 +95,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kz;->ayF:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kz;->ayX:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -110,46 +110,46 @@
 
 
 # virtual methods
+.method public final uY()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->aAO:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final uZ()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->aAP:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final va()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->aAw:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final vb()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->aAx:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final vc()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->aAy:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->aAQ:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/l.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/l.smali
index 4112e8ef67..ce688b91c2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/l.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/l.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic aqp:Lcom/google/android/gms/internal/measurement/jv;
+.field private final synthetic aqH:Lcom/google/android/gms/internal/measurement/jv;
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Lcom/google/android/gms/internal/measurement/jv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/l;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/l;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/l;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/l;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -31,23 +31,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/l;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/l;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/iu;->getCurrentScreenName(Lcom/google/android/gms/internal/measurement/ln;)V
 
     return-void
 .end method
 
-.method protected final oB()V
+.method protected final oz()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/la.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/la.smali
index 05b360242e..bccc6eded5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/la.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/la.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final aAA:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAR:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final aAB:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAS:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private static final aAC:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAT:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private static final aAD:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAU:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -46,7 +46,7 @@
     .end annotation
 .end field
 
-.field private static final aAz:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAV:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -56,7 +56,7 @@
     .end annotation
 .end field
 
-.field private static final ayF:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final ayX:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -75,7 +75,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -89,7 +89,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/la;->aAz:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/la;->aAR:Lcom/google/android/gms/internal/measurement/bf;
 
     const/4 v2, 0x0
 
@@ -99,7 +99,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/la;->aAA:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/la;->aAS:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v3, "measurement.client.sessions.immediate_start_enabled"
 
@@ -107,7 +107,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/la;->aAB:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/la;->aAT:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.client.sessions.remove_expired_session_properties_enabled"
 
@@ -115,7 +115,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/la;->aAC:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/la;->aAU:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v2, "measurement.client.sessions.session_id_enabled"
 
@@ -123,7 +123,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/la;->aAD:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/la;->aAV:Lcom/google/android/gms/internal/measurement/bf;
 
     const-string v1, "measurement.id.sessionization_client"
 
@@ -133,7 +133,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/la;->ayF:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/la;->ayX:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -148,10 +148,46 @@
 
 
 # virtual methods
+.method public final vb()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/la;->aAR:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final vc()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/la;->aAS:Lcom/google/android/gms/internal/measurement/bf;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final vd()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/la;->aAz:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/la;->aAU:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
@@ -169,43 +205,7 @@
 .method public final ve()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/la;->aAA:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final vf()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/la;->aAC:Lcom/google/android/gms/internal/measurement/bf;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final vg()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/la;->aAD:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/la;->aAV:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lb.smali
index 28852aa2f2..1c05604ffe 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lb.smali
@@ -3,14 +3,14 @@
 
 
 # virtual methods
+.method public abstract vb()Z
+.end method
+
+.method public abstract vc()Z
+.end method
+
 .method public abstract vd()Z
 .end method
 
 .method public abstract ve()Z
 .end method
-
-.method public abstract vf()Z
-.end method
-
-.method public abstract vg()Z
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lc.smali
index 0ce9a56656..44e31c3a5c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lc.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract vh()Z
+.method public abstract vf()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ld.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ld.smali
index 9dcd5fa239..2d708d2591 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ld.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ld.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static aAE:Lcom/google/android/gms/internal/measurement/ld;
+.field private static aAW:Lcom/google/android/gms/internal/measurement/ld;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ld;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ld;->aAE:Lcom/google/android/gms/internal/measurement/ld;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ld;->aAW:Lcom/google/android/gms/internal/measurement/ld;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ld;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ld;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static vh()Z
+.method public static vf()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ld;->aAE:Lcom/google/android/gms/internal/measurement/ld;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ld;->aAW:Lcom/google/android/gms/internal/measurement/ld;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ld;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/lc;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->vh()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->vf()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ld;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ld;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/le.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/le.smali
index 568f78751c..514059c06a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/le.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/le.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static aAF:Lcom/google/android/gms/internal/measurement/le;
+.field private static aAX:Lcom/google/android/gms/internal/measurement/le;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/le;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/le;->aAF:Lcom/google/android/gms/internal/measurement/le;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/le;->aAX:Lcom/google/android/gms/internal/measurement/le;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/le;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/le;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static vi()Z
+.method public static vg()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/le;->aAF:Lcom/google/android/gms/internal/measurement/le;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/le;->aAX:Lcom/google/android/gms/internal/measurement/le;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/le;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/lh;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lh;->vi()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lh;->vg()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/le;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/le;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lf.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lf.smali
index fa290b57a1..72c5953fdb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lf.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final aAG:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAY:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lf;->aAG:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lf;->aAY:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final vh()Z
+.method public final vf()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->aAG:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->aAY:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lg.smali
index 88fb798a3d..6c7ded5e83 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lg.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final aAH:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aAZ:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lg;->aAH:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lg;->aAZ:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final vi()Z
+.method public final vg()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lg;->aAH:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lg;->aAZ:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lh.smali
index 7428cef019..65562817da 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lh.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract vi()Z
+.method public abstract vg()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/li.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/li.smali
index 5b98e0871b..0470dc5c3c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/li.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/li.smali
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract vj()Z
+.method public abstract vh()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lj.smali
index e70288dc9f..bcb0c062fe 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lj.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field private static aAI:Lcom/google/android/gms/internal/measurement/lj;
+.field private static aBa:Lcom/google/android/gms/internal/measurement/lj;
 
 
 # instance fields
-.field private final ays:Lcom/google/android/gms/internal/measurement/bv;
+.field private final ayK:Lcom/google/android/gms/internal/measurement/bv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bv<",
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/lj;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lj;->aAI:Lcom/google/android/gms/internal/measurement/lj;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lj;->aBa:Lcom/google/android/gms/internal/measurement/lj;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lj;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lj;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     return-void
 .end method
 
-.method public static vj()Z
+.method public static vh()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lj;->aAI:Lcom/google/android/gms/internal/measurement/lj;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lj;->aBa:Lcom/google/android/gms/internal/measurement/lj;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lj;->get()Ljava/lang/Object;
 
@@ -94,7 +94,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/li;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/li;->vj()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/li;->vh()Z
 
     move-result v0
 
@@ -106,7 +106,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lj;->ays:Lcom/google/android/gms/internal/measurement/bv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lj;->ayK:Lcom/google/android/gms/internal/measurement/bv;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bv;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lk.smali
index d41e013ff7..eebb4a400b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lk.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static final aAJ:Lcom/google/android/gms/internal/measurement/bf;
+.field private static final aBb:Lcom/google/android/gms/internal/measurement/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bf<",
@@ -25,7 +25,7 @@
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lk;->aAJ:Lcom/google/android/gms/internal/measurement/bf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lk;->aBb:Lcom/google/android/gms/internal/measurement/bf;
 
     return-void
 .end method
@@ -54,10 +54,10 @@
 
 
 # virtual methods
-.method public final vj()Z
+.method public final vh()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lk;->aAJ:Lcom/google/android/gms/internal/measurement/bf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lk;->aBb:Lcom/google/android/gms/internal/measurement/bf;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/bf;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lp.smali
index 743ea7fe4b..cd8302c73b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lp.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lq.smali
index 3beb2c915e..596d2e5230 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lq.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -53,7 +53,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lv.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lv.smali
index 20e7950cc5..4ebcbc9d8c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lv.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field private final synthetic aAR:Landroid/os/Bundle;
+.field private final synthetic aBj:Landroid/os/Bundle;
 
-.field private final synthetic aia:Ljava/lang/String;
+.field private final synthetic ais:Ljava/lang/String;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
 .field private final synthetic val$context:Landroid/content/Context;
 
@@ -18,15 +18,15 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/String;Ljava/lang/String;Landroid/content/Context;Landroid/os/Bundle;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lv;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lv;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/lv;->aqn:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/lv;->aqF:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/lv;->aia:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/lv;->ais:Ljava/lang/String;
 
     iput-object p4, p0, Lcom/google/android/gms/internal/measurement/lv;->val$context:Landroid/content/Context;
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/lv;->aAR:Landroid/os/Bundle;
+    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/lv;->aBj:Landroid/os/Bundle;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -35,7 +35,7 @@
 
 
 # virtual methods
-.method public final oA()V
+.method public final oy()V
     .locals 14
 
     const/4 v0, 0x0
@@ -43,7 +43,7 @@
     const/4 v1, 0x1
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/lv;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/lv;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v3, Ljava/util/ArrayList;
 
@@ -51,9 +51,9 @@
 
     invoke-static {v2, v3}, Lcom/google/android/gms/internal/measurement/lw;->a(Lcom/google/android/gms/internal/measurement/lw;Ljava/util/List;)Ljava/util/List;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/lv;->aqn:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/lv;->aqF:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/lv;->aia:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/lv;->ais:Ljava/lang/String;
 
     invoke-static {v2, v3}, Lcom/google/android/gms/internal/measurement/lw;->C(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -63,11 +63,11 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/lv;->aia:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/lv;->ais:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/lv;->aqn:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/lv;->aqF:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/lv;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/lv;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v4}, Lcom/google/android/gms/internal/measurement/lw;->b(Lcom/google/android/gms/internal/measurement/lw;)Ljava/lang/String;
 
@@ -93,7 +93,7 @@
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/lw;->an(Landroid/content/Context;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lw;->vl()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lw;->vj()Ljava/lang/Boolean;
 
     move-result-object v2
 
@@ -117,9 +117,9 @@
     const/4 v2, 0x1
 
     :goto_2
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/lv;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/lv;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/lv;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/lv;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     iget-object v5, p0, Lcom/google/android/gms/internal/measurement/lv;->val$context:Landroid/content/Context;
 
@@ -129,7 +129,7 @@
 
     invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/lw;->a(Lcom/google/android/gms/internal/measurement/lw;Lcom/google/android/gms/internal/measurement/iu;)Lcom/google/android/gms/internal/measurement/iu;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/lv;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/lv;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v3}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
@@ -137,7 +137,7 @@
 
     if-nez v3, :cond_3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/lv;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/lv;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/lw;->b(Lcom/google/android/gms/internal/measurement/lw;)Ljava/lang/String;
 
@@ -205,13 +205,13 @@
 
     int-to-long v6, v2
 
-    iget-object v12, p0, Lcom/google/android/gms/internal/measurement/lv;->aAR:Landroid/os/Bundle;
+    iget-object v12, p0, Lcom/google/android/gms/internal/measurement/lv;->aBj:Landroid/os/Bundle;
 
     move-object v3, v13
 
     invoke-direct/range {v3 .. v12}, Lcom/google/android/gms/internal/measurement/zzx;-><init>(JJZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/lv;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/lv;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
@@ -234,7 +234,7 @@
     :catch_0
     move-exception v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/lv;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/lv;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v3, v2, v1, v0}, Lcom/google/android/gms/internal/measurement/lw;->a(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/Exception;ZZ)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw$a.smali
index 3f65b8aea2..c558396c17 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw$a.smali
@@ -17,11 +17,11 @@
 
 
 # instance fields
-.field final aBg:J
+.field final aBy:J
 
-.field private final aBh:Z
+.field private final aBz:Z
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
 .field final timestamp:J
 
@@ -40,11 +40,11 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Z)V
     .locals 2
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lw$a;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lw$a;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/lw;->aAT:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/lw;->aBl:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
@@ -52,22 +52,22 @@
 
     iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/lw$a;->timestamp:J
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw;->aAT:Lcom/google/android/gms/common/util/e;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw;->aBl:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {p1}, Lcom/google/android/gms/common/util/e;->elapsedRealtime()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/lw$a;->aBg:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/lw$a;->aBy:J
 
-    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/lw$a;->aBh:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/lw$a;->aBz:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method abstract oA()V
+.method abstract oy()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -75,7 +75,7 @@
     .end annotation
 .end method
 
-.method protected oB()V
+.method protected oz()V
     .locals 0
 
     return-void
@@ -84,7 +84,7 @@
 .method public run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$a;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$a;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->a(Lcom/google/android/gms/internal/measurement/lw;)Z
 
@@ -92,13 +92,13 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/lw$a;->oB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/lw$a;->oz()V
 
     return-void
 
     :cond_0
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/lw$a;->oA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/lw$a;->oy()V
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -107,15 +107,15 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/lw$a;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/lw$a;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     const/4 v2, 0x0
 
-    iget-boolean v3, p0, Lcom/google/android/gms/internal/measurement/lw$a;->aBh:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/internal/measurement/lw$a;->aBz:Z
 
     invoke-static {v1, v0, v2, v3}, Lcom/google/android/gms/internal/measurement/lw;->a(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/Exception;ZZ)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/lw$a;->oB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/lw$a;->oz()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw$b.smali
index c2a30d8570..8aadbd0e0a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw$b.smali
@@ -17,14 +17,14 @@
 
 
 # instance fields
-.field final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,7 +36,7 @@
 .method public final onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/w;
 
@@ -50,7 +50,7 @@
 .method public final onActivityDestroyed(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/ab;
 
@@ -64,7 +64,7 @@
 .method public final onActivityPaused(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/x;
 
@@ -78,7 +78,7 @@
 .method public final onActivityResumed(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/y;
 
@@ -96,7 +96,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jv;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v2, Lcom/google/android/gms/internal/measurement/z;
 
@@ -121,7 +121,7 @@
 .method public final onActivityStarted(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/v;
 
@@ -135,7 +135,7 @@
 .method public final onActivityStopped(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/aa;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw$c.smali
index f72fad9db0..49ae2bb285 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw$c.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private final aBi:Lcom/google/android/gms/measurement/internal/fp;
+.field private final aBA:Lcom/google/android/gms/measurement/internal/fp;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/lr;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lw$c;->aBi:Lcom/google/android/gms/measurement/internal/fp;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lw$c;->aBA:Lcom/google/android/gms/measurement/internal/fp;
 
     return-void
 .end method
@@ -33,7 +33,7 @@
 .method public final id()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$c;->aBi:Lcom/google/android/gms/measurement/internal/fp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$c;->aBA:Lcom/google/android/gms/measurement/internal/fp;
 
     invoke-static {v0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -45,7 +45,7 @@
 .method public final onEvent(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;J)V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$c;->aBi:Lcom/google/android/gms/measurement/internal/fp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw$c;->aBA:Lcom/google/android/gms/measurement/internal/fp;
 
     move-object v1, p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw.smali
index 3fd16c9b52..a47d42f471 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lw.smali
@@ -13,35 +13,35 @@
 
 
 # static fields
-.field private static volatile aAS:Lcom/google/android/gms/internal/measurement/lw; = null
+.field private static volatile aBk:Lcom/google/android/gms/internal/measurement/lw; = null
 
-.field private static aAX:Ljava/lang/Boolean; = null
+.field private static aBp:Ljava/lang/Boolean; = null
 
-.field private static aAY:Ljava/lang/Boolean; = null
+.field private static aBq:Ljava/lang/Boolean; = null
 
-.field private static aAZ:Ljava/lang/Boolean; = null
+.field private static aBr:Ljava/lang/Boolean; = null
 
-.field private static aBa:Ljava/lang/String; = "use_dynamite_api"
+.field private static aBs:Ljava/lang/String; = "use_dynamite_api"
 
-.field private static aBb:Ljava/lang/String; = "allow_remote_dynamite"
+.field private static aBt:Ljava/lang/String; = "allow_remote_dynamite"
 
-.field private static aBc:Z = false
+.field private static aBu:Z = false
 
-.field private static aBd:Z = false
+.field private static aBv:Z = false
 
 .field private static zzaj:Z = false
 
 
 # instance fields
-.field private final aAN:Ljava/lang/String;
+.field private final aBf:Ljava/lang/String;
 
-.field protected final aAT:Lcom/google/android/gms/common/util/e;
+.field protected final aBl:Lcom/google/android/gms/common/util/e;
 
-.field private final aAU:Ljava/util/concurrent/ExecutorService;
+.field private final aBm:Ljava/util/concurrent/ExecutorService;
 
-.field private final aAV:Lcom/google/android/gms/measurement/api/a;
+.field private final aBn:Lcom/google/android/gms/measurement/api/a;
 
-.field private aAW:Ljava/util/List;
+.field private aBo:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -53,11 +53,11 @@
     .end annotation
 .end field
 
-.field private aBe:Z
+.field private aBw:Z
 
-.field private aBf:Lcom/google/android/gms/internal/measurement/iu;
+.field private aBx:Lcom/google/android/gms/internal/measurement/iu;
 
-.field private adQ:Ljava/lang/String;
+.field private aej:Ljava/lang/String;
 
 .field private zzag:I
 
@@ -76,13 +76,13 @@
 
     const-string p2, "FA"
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/lw;->aAN:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/lw;->aBf:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->mr()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->mp()Lcom/google/android/gms/common/util/e;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/lw;->aAT:Lcom/google/android/gms/common/util/e;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/lw;->aBl:Lcom/google/android/gms/common/util/e;
 
     new-instance p2, Ljava/util/concurrent/ThreadPoolExecutor;
 
@@ -102,13 +102,13 @@
 
     invoke-direct/range {v0 .. v6}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/lw;->aAU:Ljava/util/concurrent/ExecutorService;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/lw;->aBm:Ljava/util/concurrent/ExecutorService;
 
     new-instance p2, Lcom/google/android/gms/measurement/api/a;
 
     invoke-direct {p2, p0}, Lcom/google/android/gms/measurement/api/a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/lw;->aAV:Lcom/google/android/gms/measurement/api/a;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/lw;->aBn:Lcom/google/android/gms/measurement/api/a;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/lw;->al(Landroid/content/Context;)Z
 
@@ -118,7 +118,7 @@
 
     if-eqz p2, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lw;->vk()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lw;->vi()Z
 
     move-result p2
 
@@ -140,11 +140,11 @@
 
     if-nez p2, :cond_2
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/lw;->adQ:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/lw;->aej:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/internal/measurement/lw;->aBe:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/internal/measurement/lw;->aBw:Z
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/lw;->aAN:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/lw;->aBf:Ljava/lang/String;
 
     const-string p2, "Disabling data collection. Found google_app_id in strings.xml but Google Analytics for Firebase is missing. Remove this value or add Google Analytics for Firebase to resume data collection."
 
@@ -161,12 +161,12 @@
 
     const-string p2, "fa"
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/lw;->adQ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/lw;->aej:Ljava/lang/String;
 
     goto :goto_2
 
     :cond_3
-    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/lw;->adQ:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/lw;->aej:Ljava/lang/String;
 
     :goto_2
     new-instance p2, Lcom/google/android/gms/internal/measurement/lv;
@@ -195,7 +195,7 @@
 
     if-nez p1, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/lw;->aAN:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/lw;->aBf:Ljava/lang/String;
 
     const-string p2, "Unable to register lifecycle notifications. Application null."
 
@@ -220,7 +220,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lw;->vk()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lw;->vi()Z
 
     move-result p0
 
@@ -254,11 +254,11 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aAX:Ljava/lang/Boolean;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBp:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aAY:Ljava/lang/Boolean;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBq:Ljava/lang/Boolean;
     :try_end_0
     .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_2
     .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_1
@@ -286,11 +286,11 @@
 
     sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/lw;->aAX:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/lw;->aBp:Ljava/lang/Boolean;
 
     sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/lw;->aAY:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/lw;->aBq:Ljava/lang/Boolean;
     :try_end_2
     .catch Ljava/lang/NullPointerException; {:try_start_2 .. :try_end_2} :catch_2
     .catch Ljava/lang/ClassCastException; {:try_start_2 .. :try_end_2} :catch_1
@@ -314,7 +314,7 @@
 
     move-result-object p0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBa:Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBs:Ljava/lang/String;
 
     invoke-interface {p0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
 
@@ -324,9 +324,9 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/lw;->aAX:Ljava/lang/Boolean;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBp:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBb:Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBt:Ljava/lang/String;
 
     invoke-interface {p0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
 
@@ -336,17 +336,17 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/lw;->aAY:Ljava/lang/Boolean;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBq:Ljava/lang/Boolean;
 
     invoke-interface {p0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
     move-result-object p0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBa:Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBs:Ljava/lang/String;
 
     invoke-interface {p0, v1}, Landroid/content/SharedPreferences$Editor;->remove(Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBb:Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBt:Ljava/lang/String;
 
     invoke-interface {p0, v1}, Landroid/content/SharedPreferences$Editor;->remove(Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
@@ -387,11 +387,11 @@
 
     sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/lw;->aAX:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/lw;->aBp:Ljava/lang/Boolean;
 
     sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/lw;->aAY:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/lw;->aBq:Ljava/lang/Boolean;
 
     :goto_1
     monitor-exit v0
@@ -409,7 +409,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/lw;Lcom/google/android/gms/internal/measurement/iu;)Lcom/google/android/gms/internal/measurement/iu;
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lw;->aBf:Lcom/google/android/gms/internal/measurement/iu;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lw;->aBx:Lcom/google/android/gms/internal/measurement/iu;
 
     return-object p1
 .end method
@@ -419,7 +419,7 @@
 
     invoke-static {p0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lw;->aAS:Lcom/google/android/gms/internal/measurement/lw;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lw;->aBk:Lcom/google/android/gms/internal/measurement/lw;
 
     if-nez v0, :cond_1
 
@@ -428,7 +428,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aAS:Lcom/google/android/gms/internal/measurement/lw;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBk:Lcom/google/android/gms/internal/measurement/lw;
 
     if-nez v1, :cond_0
 
@@ -448,7 +448,7 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/internal/measurement/lw;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/lw;->aAS:Lcom/google/android/gms/internal/measurement/lw;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/lw;->aBk:Lcom/google/android/gms/internal/measurement/lw;
 
     :cond_0
     monitor-exit v0
@@ -466,7 +466,7 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/google/android/gms/internal/measurement/lw;->aAS:Lcom/google/android/gms/internal/measurement/lw;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/lw;->aBk:Lcom/google/android/gms/internal/measurement/lw;
 
     return-object p0
 .end method
@@ -474,7 +474,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/lw;Ljava/util/List;)Ljava/util/List;
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lw;->aAW:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lw;->aBo:Ljava/util/List;
 
     return-object p1
 .end method
@@ -498,15 +498,15 @@
 .method private final a(Ljava/lang/Exception;ZZ)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/lw;->aBe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/lw;->aBw:Z
 
     or-int/2addr v0, p2
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/lw;->aBe:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/lw;->aBw:Z
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/lw;->aAN:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/lw;->aBf:Ljava/lang/String;
 
     const-string p3, "Data collection startup failed. No data will be collected."
 
@@ -522,7 +522,7 @@
     invoke-direct {p0, p2, p1}, Lcom/google/android/gms/internal/measurement/lw;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_1
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/lw;->aAN:Ljava/lang/String;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/lw;->aBf:Ljava/lang/String;
 
     invoke-static {p3, p2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
@@ -532,7 +532,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/lw;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lcom/google/android/gms/internal/measurement/lw;->aBe:Z
+    iget-boolean p0, p0, Lcom/google/android/gms/internal/measurement/lw;->aBw:Z
 
     return p0
 .end method
@@ -557,7 +557,7 @@
     :try_start_0
     invoke-static {p0}, Lcom/google/android/gms/common/api/internal/e;->J(Landroid/content/Context;)Lcom/google/android/gms/common/api/Status;
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lI()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lG()Ljava/lang/String;
 
     move-result-object p0
     :try_end_0
@@ -652,7 +652,7 @@
 
     sget-object v2, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lw;->aAZ:Ljava/lang/Boolean;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lw;->aBr:Ljava/lang/Boolean;
 
     goto :goto_0
 
@@ -667,12 +667,12 @@
 
     sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lw;->aAZ:Ljava/lang/Boolean;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lw;->aBr:Ljava/lang/Boolean;
 
     goto :goto_0
 
     :cond_2
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lw;->aAZ:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lw;->aBr:Ljava/lang/Boolean;
     :try_end_1
     .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_3
     .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_2
@@ -719,7 +719,7 @@
 
     invoke-static {v3, v4, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lw;->aAZ:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lw;->aBr:Ljava/lang/Boolean;
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
@@ -732,11 +732,11 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
     :goto_3
-    sget-object p0, Lcom/google/android/gms/internal/measurement/lw;->aAZ:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/lw;->aBr:Ljava/lang/Boolean;
 
     if-nez p0, :cond_3
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/lw;->aAX:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/lw;->aBp:Ljava/lang/Boolean;
 
     :cond_3
     invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
@@ -796,7 +796,7 @@
 .method static synthetic b(Lcom/google/android/gms/internal/measurement/lw;)Ljava/lang/String;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/lw;->aAN:Ljava/lang/String;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/lw;->aBf:Ljava/lang/String;
 
     return-object p0
 .end method
@@ -804,7 +804,7 @@
 .method static synthetic c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/lw;->aBf:Lcom/google/android/gms/internal/measurement/iu;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/lw;->aBx:Lcom/google/android/gms/internal/measurement/iu;
 
     return-object p0
 .end method
@@ -812,7 +812,7 @@
 .method static synthetic d(Lcom/google/android/gms/internal/measurement/lw;)Ljava/util/List;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/lw;->aAW:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/lw;->aBo:Ljava/util/List;
 
     return-object p0
 .end method
@@ -820,7 +820,7 @@
 .method private static n(Landroid/content/Context;Ljava/lang/String;)Z
     .locals 3
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const/4 v0, 0x0
 
@@ -876,7 +876,7 @@
     return-void
 .end method
 
-.method private static vk()Z
+.method private static vi()Z
     .locals 1
 
     :try_start_0
@@ -896,10 +896,10 @@
     return v0
 .end method
 
-.method static synthetic vl()Ljava/lang/Boolean;
+.method static synthetic vj()Ljava/lang/Boolean;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lw;->aAY:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lw;->aBq:Ljava/lang/Boolean;
 
     return-object v0
 .end method
@@ -912,12 +912,12 @@
     if-eqz p2, :cond_0
 
     :try_start_0
-    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->alh:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->alA:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     goto :goto_0
 
     :cond_0
-    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->ale:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->alx:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     :goto_0
     const-string v0, "com.google.android.gms.measurement.dynamite"
@@ -928,7 +928,7 @@
 
     const-string p2, "com.google.android.gms.measurement.internal.AppMeasurementDynamiteService"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/dynamite/DynamiteModule;->bf(Ljava/lang/String;)Landroid/os/IBinder;
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/dynamite/DynamiteModule;->ba(Ljava/lang/String;)Landroid/os/IBinder;
 
     move-result-object p1
 
@@ -957,7 +957,7 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/lw$a;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw;->aAU:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lw;->aBm:Ljava/util/concurrent/ExecutorService;
 
     invoke-interface {v0, p1}, Ljava/util/concurrent/ExecutorService;->execute(Ljava/lang/Runnable;)V
 
@@ -992,6 +992,18 @@
     return-void
 .end method
 
+.method public final cc(Ljava/lang/String;)V
+    .locals 1
+
+    new-instance v0, Lcom/google/android/gms/internal/measurement/e;
+
+    invoke-direct {v0, p0, p1}, Lcom/google/android/gms/internal/measurement/e;-><init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/String;)V
+
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/lw;->a(Lcom/google/android/gms/internal/measurement/lw$a;)V
+
+    return-void
+.end method
+
 .method public final generateEventId()J
     .locals 5
 
@@ -1027,7 +1039,7 @@
 
     move-result-wide v1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/lw;->aAT:Lcom/google/android/gms/common/util/e;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/lw;->aBl:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v3}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/m.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/m.smali
index d06ce73a2d..a4d54ce34d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/m.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/m.smali
@@ -3,38 +3,38 @@
 
 
 # instance fields
-.field private final synthetic aqA:Ljava/lang/Object;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-.field private final synthetic aqB:Ljava/lang/Object;
+.field private final synthetic aqP:I
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqQ:Ljava/lang/String;
 
-.field private final synthetic aqx:I
+.field private final synthetic aqR:Ljava/lang/Object;
 
-.field private final synthetic aqy:Ljava/lang/String;
+.field private final synthetic aqS:Ljava/lang/Object;
 
-.field private final synthetic aqz:Ljava/lang/Object;
+.field private final synthetic aqT:Ljava/lang/Object;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/String;Ljava/lang/Object;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/m;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/m;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/m;->aqx:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/m;->aqP:I
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/m;->aqy:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/m;->aqQ:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/m;->aqz:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/m;->aqR:Ljava/lang/Object;
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/m;->aqA:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/m;->aqS:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/m;->aqB:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/m;->aqT:Ljava/lang/Object;
 
     const/4 p2, 0x0
 
@@ -45,7 +45,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 7
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -53,29 +53,29 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v1
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/m;->aqx:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/m;->aqP:I
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/m;->aqy:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/m;->aqQ:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->aqz:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->aqR:Ljava/lang/Object;
 
     invoke-static {v0}, Lcom/google/android/gms/a/b;->ab(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
     move-result-object v4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->aqA:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->aqS:Ljava/lang/Object;
 
     invoke-static {v0}, Lcom/google/android/gms/a/b;->ab(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
     move-result-object v5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->aqB:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->aqT:Ljava/lang/Object;
 
     invoke-static {v0}, Lcom/google/android/gms/a/b;->ab(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/n.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/n.smali
index e30db2e8a6..ec0eac74cc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/n.smali
@@ -3,30 +3,30 @@
 
 
 # instance fields
-.field private final synthetic aqC:Z
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqH:Lcom/google/android/gms/internal/measurement/jv;
 
-.field private final synthetic aqp:Lcom/google/android/gms/internal/measurement/jv;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqU:Z
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/String;Ljava/lang/String;ZLcom/google/android/gms/internal/measurement/jv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/n;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/n;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/n;->aqn:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/n;->aqF:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/n;->aqo:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/n;->aqG:Ljava/lang/String;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/internal/measurement/n;->aqC:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/internal/measurement/n;->aqU:Z
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/n;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/n;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -35,7 +35,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -43,29 +43,29 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/n;->aqn:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/n;->aqF:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/n;->aqo:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/n;->aqG:Ljava/lang/String;
 
-    iget-boolean v3, p0, Lcom/google/android/gms/internal/measurement/n;->aqC:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/internal/measurement/n;->aqU:Z
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/n;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/n;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-interface {v0, v1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/iu;->getUserProperties(Ljava/lang/String;Ljava/lang/String;ZLcom/google/android/gms/internal/measurement/ln;)V
 
     return-void
 .end method
 
-.method protected final oB()V
+.method protected final oz()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/o.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/o.smali
index aa08ce498d..c66ab7a8dc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/o.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/o.smali
@@ -3,22 +3,22 @@
 
 
 # instance fields
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqp:Lcom/google/android/gms/internal/measurement/jv;
+.field private final synthetic aqH:Lcom/google/android/gms/internal/measurement/jv;
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/String;Lcom/google/android/gms/internal/measurement/jv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/o;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/o;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/o;->aqn:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/o;->aqF:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/o;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/o;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -27,7 +27,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -35,25 +35,25 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/o;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/o;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/o;->aqn:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/o;->aqF:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/o;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/o;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     invoke-interface {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/iu;->getMaxUserProperties(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/ln;)V
 
     return-void
 .end method
 
-.method protected final oB()V
+.method protected final oz()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/o;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/o;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/p.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/p.smali
index 5f92ac6beb..76176644fc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/p.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/p.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic aqD:Lcom/google/android/gms/measurement/internal/fp;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqV:Lcom/google/android/gms/measurement/internal/fp;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Lcom/google/android/gms/measurement/internal/fp;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/p;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/p;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/p;->aqD:Lcom/google/android/gms/measurement/internal/fp;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/p;->aqV:Lcom/google/android/gms/measurement/internal/fp;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -34,7 +34,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/lw;->d(Lcom/google/android/gms/internal/measurement/lw;)Ljava/util/List;
 
@@ -46,9 +46,9 @@
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->aqD:Lcom/google/android/gms/measurement/internal/fp;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->aqV:Lcom/google/android/gms/measurement/internal/fp;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/p;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/p;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/lw;->d(Lcom/google/android/gms/internal/measurement/lw;)Ljava/util/List;
 
@@ -68,7 +68,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/p;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/p;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->b(Lcom/google/android/gms/internal/measurement/lw;)Ljava/lang/String;
 
@@ -88,11 +88,11 @@
     :cond_1
     new-instance v0, Lcom/google/android/gms/internal/measurement/lw$c;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->aqD:Lcom/google/android/gms/measurement/internal/fp;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->aqV:Lcom/google/android/gms/measurement/internal/fp;
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/lw$c;-><init>(Lcom/google/android/gms/measurement/internal/fp;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/lw;->d(Lcom/google/android/gms/internal/measurement/lw;)Ljava/util/List;
 
@@ -100,13 +100,13 @@
 
     new-instance v2, Landroid/util/Pair;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/p;->aqD:Lcom/google/android/gms/measurement/internal/fp;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/p;->aqV:Lcom/google/android/gms/measurement/internal/fp;
 
     invoke-direct {v2, v3, v0}, Landroid/util/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/q.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/q.smali
index ea53058575..3bd3f2e0b3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/q.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/q.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic aqE:Z
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aqW:Z
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/q;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/q;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/q;->aqE:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/q;->aqW:Z
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -31,13 +31,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/q;->aqE:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/q;->aqW:Z
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/iu;->setDataCollectionEnabled(Z)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/r.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/r.smali
index e1d6f3671b..0660451739 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/r.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/r.smali
@@ -3,42 +3,42 @@
 
 
 # instance fields
-.field private final synthetic aqF:Ljava/lang/Long;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqG:Ljava/lang/String;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-.field private final synthetic aqH:Landroid/os/Bundle;
+.field private final synthetic aqX:Ljava/lang/Long;
 
-.field private final synthetic aqI:Z
+.field private final synthetic aqY:Ljava/lang/String;
 
-.field private final synthetic aqJ:Z
+.field private final synthetic aqZ:Landroid/os/Bundle;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic ara:Z
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic arb:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;ZZ)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/r;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/r;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/r;->aqF:Ljava/lang/Long;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/r;->aqX:Ljava/lang/Long;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/r;->aqn:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/r;->aqF:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/r;->aqG:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/r;->aqY:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/r;->aqH:Landroid/os/Bundle;
+    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/r;->aqZ:Landroid/os/Bundle;
 
-    iput-boolean p6, p0, Lcom/google/android/gms/internal/measurement/r;->aqI:Z
+    iput-boolean p6, p0, Lcom/google/android/gms/internal/measurement/r;->ara:Z
 
     const/4 p2, 0x1
 
-    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/r;->aqJ:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/r;->arb:Z
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -47,7 +47,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 10
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -55,7 +55,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/r;->aqF:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/r;->aqX:Ljava/lang/Long;
 
     if-nez v0, :cond_0
 
@@ -71,21 +71,21 @@
     :goto_0
     move-wide v8, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/r;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/r;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/r;->aqn:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/r;->aqF:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/r;->aqG:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/r;->aqY:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/r;->aqH:Landroid/os/Bundle;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/r;->aqZ:Landroid/os/Bundle;
 
-    iget-boolean v6, p0, Lcom/google/android/gms/internal/measurement/r;->aqI:Z
+    iget-boolean v6, p0, Lcom/google/android/gms/internal/measurement/r;->ara:Z
 
-    iget-boolean v7, p0, Lcom/google/android/gms/internal/measurement/r;->aqJ:Z
+    iget-boolean v7, p0, Lcom/google/android/gms/internal/measurement/r;->arb:Z
 
     invoke-interface/range {v2 .. v9}, Lcom/google/android/gms/internal/measurement/iu;->logEvent(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;ZZJ)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/s.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/s.smali
index 198dc94d3a..f95768735d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/s.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/s.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field private final alC:Landroid/os/IBinder;
+.field private final alU:Landroid/os/IBinder;
 
-.field private final alD:Ljava/lang/String;
+.field private final alV:Ljava/lang/String;
 
 
 # direct methods
@@ -17,9 +17,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/s;->alC:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/s;->alU:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/s;->alD:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/s;->alV:Ljava/lang/String;
 
     return-void
 .end method
@@ -39,7 +39,7 @@
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/s;->alC:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/s;->alU:Landroid/os/IBinder;
 
     const/4 v2, 0x0
 
@@ -78,7 +78,7 @@
 .method public asBinder()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/s;->alC:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/s;->alU:Landroid/os/IBinder;
 
     return-object v0
 .end method
@@ -96,7 +96,7 @@
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/s;->alC:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/s;->alU:Landroid/os/IBinder;
 
     const/4 v2, 0x0
 
@@ -122,14 +122,14 @@
     throw p1
 .end method
 
-.method protected final mJ()Landroid/os/Parcel;
+.method protected final mH()Landroid/os/Parcel;
     .locals 2
 
     invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/s;->alD:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/s;->alV:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/t.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/t.smali
index ac9ab083d5..d833e4d868 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/t.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/t.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic aqK:Landroid/os/Bundle;
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic arc:Landroid/os/Bundle;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Landroid/os/Bundle;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/t;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/t;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/t;->aqK:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/t;->arc:Landroid/os/Bundle;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -31,13 +31,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/t;->aqK:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/t;->arc:Landroid/os/Bundle;
 
     iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/t;->timestamp:J
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/u.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/u.smali
index f6fafdb744..4ccc6c2054 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/u.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/u.smali
@@ -3,32 +3,32 @@
 
 
 # instance fields
-.field private final synthetic agO:Ljava/lang/Object;
+.field private final synthetic ahg:Ljava/lang/Object;
 
-.field private final synthetic aqG:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqI:Z
+.field private final synthetic aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqY:Ljava/lang/String;
 
-.field private final synthetic aqq:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic ara:Z
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/u;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/u;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/u;->aqn:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/u;->aqF:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/u;->aqG:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/u;->aqY:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/u;->agO:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/u;->ahg:Ljava/lang/Object;
 
     const/4 p2, 0x1
 
-    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/u;->aqI:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/u;->ara:Z
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -37,7 +37,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 8
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -45,23 +45,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/u;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/u;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/u;->aqn:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/u;->aqF:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/u;->aqG:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/u;->aqY:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/u;->agO:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/u;->ahg:Ljava/lang/Object;
 
     invoke-static {v0}, Lcom/google/android/gms/a/b;->ab(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
     move-result-object v4
 
-    iget-boolean v5, p0, Lcom/google/android/gms/internal/measurement/u;->aqI:Z
+    iget-boolean v5, p0, Lcom/google/android/gms/internal/measurement/u;->ara:Z
 
     iget-wide v6, p0, Lcom/google/android/gms/internal/measurement/u;->timestamp:J
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/v.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/v.smali
index 823978a790..c7601e0465 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/v.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/v.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final synthetic aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+.field private final synthetic ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
 .field private final synthetic val$activity:Landroid/app/Activity;
 
@@ -12,11 +12,11 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw$b;Landroid/app/Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/v;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/v;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/v;->val$activity:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -25,7 +25,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -33,9 +33,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/v;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/v;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
@@ -47,7 +47,7 @@
 
     move-result-object v1
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/v;->aBg:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/v;->aBy:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/iu;->onActivityStarted(Lcom/google/android/gms/a/a;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/w.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/w.smali
index 897ce5778c..bdea30da43 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/w.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/w.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field private final synthetic aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+.field private final synthetic ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
-.field private final synthetic aqM:Landroid/os/Bundle;
+.field private final synthetic are:Landroid/os/Bundle;
 
 .field private final synthetic val$activity:Landroid/app/Activity;
 
@@ -14,13 +14,13 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw$b;Landroid/app/Activity;Landroid/os/Bundle;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/w;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/w;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/w;->val$activity:Landroid/app/Activity;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/w;->aqM:Landroid/os/Bundle;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/w;->are:Landroid/os/Bundle;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -29,7 +29,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -37,9 +37,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/w;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/w;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
@@ -51,9 +51,9 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/w;->aqM:Landroid/os/Bundle;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/w;->are:Landroid/os/Bundle;
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/w;->aBg:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/w;->aBy:J
 
     invoke-interface {v0, v1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/iu;->onActivityCreated(Lcom/google/android/gms/a/a;Landroid/os/Bundle;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/x.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/x.smali
index d0e60b4a97..de0944cf5c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/x.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/x.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final synthetic aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+.field private final synthetic ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
 .field private final synthetic val$activity:Landroid/app/Activity;
 
@@ -12,11 +12,11 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw$b;Landroid/app/Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/x;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/x;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/x;->val$activity:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -25,7 +25,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -33,9 +33,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/x;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/x;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
@@ -47,7 +47,7 @@
 
     move-result-object v1
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/x;->aBg:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/x;->aBy:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/iu;->onActivityPaused(Lcom/google/android/gms/a/a;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/y.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/y.smali
index b54805ce71..edf8f9e36f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/y.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/y.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final synthetic aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+.field private final synthetic ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
 .field private final synthetic val$activity:Landroid/app/Activity;
 
@@ -12,11 +12,11 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw$b;Landroid/app/Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/y;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/y;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/y;->val$activity:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -25,7 +25,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -33,9 +33,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/y;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/y;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
@@ -47,7 +47,7 @@
 
     move-result-object v1
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/y;->aBg:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/y;->aBy:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/iu;->onActivityResumed(Lcom/google/android/gms/a/a;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/z.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/z.smali
index 4ea30aaa47..569d5bfdfe 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/z.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/z.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field private final synthetic aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+.field private final synthetic aqH:Lcom/google/android/gms/internal/measurement/jv;
 
-.field private final synthetic aqp:Lcom/google/android/gms/internal/measurement/jv;
+.field private final synthetic ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
 .field private final synthetic val$activity:Landroid/app/Activity;
 
@@ -14,13 +14,13 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw$b;Landroid/app/Activity;Lcom/google/android/gms/internal/measurement/jv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/z;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/z;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/z;->val$activity:Landroid/app/Activity;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/z;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/z;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/lw$a;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
@@ -29,7 +29,7 @@
 
 
 # virtual methods
-.method final oA()V
+.method final oy()V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -37,9 +37,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/z;->aqL:Lcom/google/android/gms/internal/measurement/lw$b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/z;->ard:Lcom/google/android/gms/internal/measurement/lw$b;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqq:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/lw$b;->aqI:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/lw;->c(Lcom/google/android/gms/internal/measurement/lw;)Lcom/google/android/gms/internal/measurement/iu;
 
@@ -51,9 +51,9 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/z;->aqp:Lcom/google/android/gms/internal/measurement/jv;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/z;->aqH:Lcom/google/android/gms/internal/measurement/jv;
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/z;->aBg:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/z;->aBy:J
 
     invoke-interface {v0, v1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/iu;->onActivitySaveInstanceState(Lcom/google/android/gms/a/a;Lcom/google/android/gms/internal/measurement/ln;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/zzx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/zzx.smali
index f73b910649..4b8758e26c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/zzx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/zzx.smali
@@ -15,19 +15,19 @@
 
 
 # instance fields
-.field public final aAK:J
+.field public final aBc:J
 
-.field public final aAL:J
+.field public final aBd:J
 
-.field public final aAM:Z
+.field public final aBe:Z
 
-.field public final aAN:Ljava/lang/String;
+.field public final aBf:Ljava/lang/String;
 
-.field public final aAO:Ljava/lang/String;
+.field public final aBg:Ljava/lang/String;
 
-.field public final aAP:Ljava/lang/String;
+.field public final aBh:Ljava/lang/String;
 
-.field public final aAQ:Landroid/os/Bundle;
+.field public final aBi:Landroid/os/Bundle;
 
 
 # direct methods
@@ -48,19 +48,19 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-wide p1, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAK:J
+    iput-wide p1, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBc:J
 
-    iput-wide p3, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAL:J
+    iput-wide p3, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBd:J
 
-    iput-boolean p5, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAM:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBe:Z
 
-    iput-object p6, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAN:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBf:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAO:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBg:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAP:Ljava/lang/String;
+    iput-object p8, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBh:Ljava/lang/String;
 
-    iput-object p9, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAQ:Landroid/os/Bundle;
+    iput-object p9, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBi:Landroid/os/Bundle;
 
     return-void
 .end method
@@ -76,43 +76,43 @@
 
     move-result p2
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAK:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBc:J
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v0, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAL:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBd:J
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v0, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAM:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBe:Z
 
     const/4 v1, 0x3
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAN:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBf:Ljava/lang/String;
 
     const/4 v1, 0x4
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAO:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBg:Ljava/lang/String;
 
     const/4 v1, 0x5
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAP:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBh:Ljava/lang/String;
 
     const/4 v1, 0x6
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aAQ:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/zzx;->aBi:Landroid/os/Bundle;
 
     const/4 v1, 0x7
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/a.smali
index cdb775bb25..9699367113 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/a.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field final ait:Landroid/os/IBinder;
+.field final aiL:Landroid/os/IBinder;
 
-.field private final alr:Ljava/lang/String;
+.field private final alJ:Ljava/lang/String;
 
 
 # direct methods
@@ -17,9 +17,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/a;->ait:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/a;->aiL:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/a;->alr:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/a;->alJ:Ljava/lang/String;
 
     return-void
 .end method
@@ -29,7 +29,7 @@
 .method public asBinder()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/a;->ait:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/a;->aiL:Landroid/os/IBinder;
 
     return-object v0
 .end method
@@ -43,7 +43,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/a;->ait:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/a;->aiL:Landroid/os/IBinder;
 
     const/4 v1, 0x0
 
@@ -65,14 +65,14 @@
     throw p1
 .end method
 
-.method protected final mJ()Landroid/os/Parcel;
+.method protected final mH()Landroid/os/Parcel;
     .locals 2
 
     invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/a;->alr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/a;->alJ:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ab.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ab.smali
index 706a626462..139ca5caf4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ab.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ab.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -37,7 +37,7 @@
     move-result-object p1
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/a;->ait:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/a;->aiL:Landroid/os/IBinder;
 
     const/16 v2, 0x7db
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/an.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/an.smali
index 9f3edd1e95..2bb5b21714 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/an.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/an.smali
@@ -69,7 +69,7 @@
     return-object v0
 .end method
 
-.method public final lh()I
+.method public final lf()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -77,7 +77,7 @@
     return v0
 .end method
 
-.method public final lj()Ljava/lang/String;
+.method public final lh()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.nearby.bootstrap.service.NearbyBootstrapService.START"
@@ -85,7 +85,7 @@
     return-object v0
 .end method
 
-.method public final lk()Ljava/lang/String;
+.method public final li()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.nearby.bootstrap.internal.INearbyBootstrapService"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ap.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ap.smali
index 8c54c20898..06ed140b00 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ap.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ap.smali
@@ -3,11 +3,11 @@
 
 
 # instance fields
-.field private final aBN:Ljava/util/concurrent/ExecutorService;
+.field private final aCf:Ljava/util/concurrent/ExecutorService;
 
-.field private volatile aBO:Ljava/io/InputStream;
+.field private volatile aCg:Ljava/io/InputStream;
 
-.field private volatile aBP:Z
+.field private volatile aCh:Z
 
 
 # direct methods
@@ -20,15 +20,15 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aBN:Ljava/util/concurrent/ExecutorService;
+    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aCf:Ljava/util/concurrent/ExecutorService;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aBO:Ljava/io/InputStream;
+    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aCg:Ljava/io/InputStream;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aBP:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aCh:Z
 
     return-void
 .end method
@@ -40,13 +40,13 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aBP:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aCh:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aBN:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aCf:Ljava/util/concurrent/ExecutorService;
 
     invoke-interface {v0}, Ljava/util/concurrent/ExecutorService;->shutdownNow()Ljava/util/List;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aBO:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aCg:Ljava/io/InputStream;
 
     invoke-static {v0}, Lcom/google/android/gms/common/util/k;->closeQuietly(Ljava/io/Closeable;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ar.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ar.smali
index 7222924d30..df6a239929 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ar.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ar.smali
@@ -57,7 +57,7 @@
     return-object v4
 
     :cond_0
-    iget-object p0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBR:Landroid/os/ParcelFileDescriptor;
+    iget-object p0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCj:Landroid/os/ParcelFileDescriptor;
 
     const-string v0, "Cannot create Payload.Stream from null ParcelFileDescriptor."
 
@@ -82,7 +82,7 @@
     return-object p0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCk:Ljava/lang/String;
 
     if-eqz v0, :cond_3
 
@@ -91,7 +91,7 @@
 
     invoke-direct {v3, v0}, Ljava/io/File;-><init>(Ljava/lang/String;)V
 
-    iget-wide v6, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aiW:J
+    iget-wide v6, p0, Lcom/google/android/gms/internal/nearby/zzfh;->ajo:J
 
     new-instance v8, Lcom/google/android/gms/nearby/connection/e$a;
 
@@ -149,7 +149,7 @@
     invoke-static {v5, v0, v3}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     :cond_3
-    iget-object p0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBR:Landroid/os/ParcelFileDescriptor;
+    iget-object p0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCj:Landroid/os/ParcelFileDescriptor;
 
     new-instance v0, Lcom/google/android/gms/nearby/connection/e$a;
 
@@ -174,7 +174,7 @@
     return-object p0
 
     :cond_4
-    iget-object v4, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBQ:[B
+    iget-object v4, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCi:[B
 
     new-instance p0, Lcom/google/android/gms/nearby/connection/e;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/as.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/as.smali
index 450e0a484d..7993904636 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/as.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/as.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field public static final aBC:Lcom/google/android/gms/common/api/a$g;
+.field public static final aBU:Lcom/google/android/gms/common/api/a$g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$g<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field public static final aBD:Lcom/google/android/gms/common/api/a$a;
+.field public static final aBV:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -33,13 +33,13 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/a$g;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/as;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/as;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     new-instance v0, Lcom/google/android/gms/internal/nearby/bb;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/nearby/bb;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/as;->aBD:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/as;->aBV:Lcom/google/android/gms/common/api/a$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/au.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/au.smali
index 7e7ee188a7..69cf1568c8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/au.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/au.smali
@@ -3,13 +3,17 @@
 
 
 # static fields
-.field private static final aCc:Landroid/os/ParcelUuid;
+.field private static final aCu:Landroid/os/ParcelUuid;
 
 
 # instance fields
-.field private final aCd:I
+.field private final aCA:Ljava/lang/String;
 
-.field private final aCe:Ljava/util/List;
+.field private final aCB:[B
+
+.field private final aCv:I
+
+.field private final aCw:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -19,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final aCf:Landroid/util/SparseArray;
+.field private final aCx:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -28,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final aCg:Ljava/util/Map;
+.field private final aCy:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -38,11 +42,7 @@
     .end annotation
 .end field
 
-.field private final aCh:I
-
-.field private final aCi:Ljava/lang/String;
-
-.field private final aCj:[B
+.field private final aCz:I
 
 
 # direct methods
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/au;->aCc:Landroid/os/ParcelUuid;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/au;->aCu:Landroid/os/ParcelUuid;
 
     return-void
 .end method
@@ -80,19 +80,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/au;->aCe:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/au;->aCw:Ljava/util/List;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/au;->aCf:Landroid/util/SparseArray;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/au;->aCx:Landroid/util/SparseArray;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/au;->aCg:Ljava/util/Map;
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/au;->aCy:Ljava/util/Map;
 
-    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/au;->aCi:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/au;->aCA:Ljava/lang/String;
 
-    iput p4, p0, Lcom/google/android/gms/internal/nearby/au;->aCd:I
+    iput p4, p0, Lcom/google/android/gms/internal/nearby/au;->aCv:I
 
-    iput p5, p0, Lcom/google/android/gms/internal/nearby/au;->aCh:I
+    iput p5, p0, Lcom/google/android/gms/internal/nearby/au;->aCz:I
 
-    iput-object p7, p0, Lcom/google/android/gms/internal/nearby/au;->aCj:[B
+    iput-object p7, p0, Lcom/google/android/gms/internal/nearby/au;->aCB:[B
 
     return-void
 .end method
@@ -534,7 +534,7 @@
     add-long/2addr v0, v6
 
     :goto_1
-    sget-object p0, Lcom/google/android/gms/internal/nearby/au;->aCc:Landroid/os/ParcelUuid;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/au;->aCu:Landroid/os/ParcelUuid;
 
     invoke-virtual {p0}, Landroid/os/ParcelUuid;->getUuid()Ljava/util/UUID;
 
@@ -550,7 +550,7 @@
 
     add-long/2addr v2, v0
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/au;->aCc:Landroid/os/ParcelUuid;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/au;->aCu:Landroid/os/ParcelUuid;
 
     invoke-virtual {p0}, Landroid/os/ParcelUuid;->getUuid()Ljava/util/UUID;
 
@@ -603,9 +603,9 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/internal/nearby/au;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/au;->aCj:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/au;->aCB:[B
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/au;->aCj:[B
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/au;->aCB:[B
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->equals([B[B)Z
 
@@ -617,7 +617,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/au;->aCj:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/au;->aCB:[B
 
     invoke-static {v0}, Ljava/util/Arrays;->hashCode([B)I
 
@@ -629,15 +629,15 @@
 .method public final toString()Ljava/lang/String;
     .locals 14
 
-    iget v0, p0, Lcom/google/android/gms/internal/nearby/au;->aCd:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/au;->aCv:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/au;->aCe:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/au;->aCw:Ljava/util/List;
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/au;->aCf:Landroid/util/SparseArray;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/au;->aCx:Landroid/util/SparseArray;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -724,7 +724,7 @@
     move-result-object v2
 
     :goto_2
-    iget-object v3, p0, Lcom/google/android/gms/internal/nearby/au;->aCg:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/internal/nearby/au;->aCy:Ljava/util/Map;
 
     new-instance v4, Ljava/lang/StringBuilder;
 
@@ -811,9 +811,9 @@
     move-result-object v9
 
     :goto_5
-    iget v3, p0, Lcom/google/android/gms/internal/nearby/au;->aCh:I
+    iget v3, p0, Lcom/google/android/gms/internal/nearby/au;->aCz:I
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/nearby/au;->aCi:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/internal/nearby/au;->aCA:Ljava/lang/String;
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ax.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ax.smali
index 80d50dfe89..4f65868fcb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ax.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ax.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aCr:Lcom/google/android/gms/common/api/internal/h;
+.field private final aCJ:Lcom/google/android/gms/common/api/internal/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h<",
@@ -28,7 +28,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/nearby/messages/internal/ar;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/ax;->aCr:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/ax;->aCJ:Lcom/google/android/gms/common/api/internal/h;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/nearby/messages/MessageListener;->onFound(Lcom/google/android/gms/nearby/messages/Message;)V
 
@@ -85,7 +85,7 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/nearby/messages/MessageListener;->onLost(Lcom/google/android/gms/nearby/messages/Message;)V
 
@@ -98,9 +98,9 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNt:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNL:Lcom/google/android/gms/nearby/messages/internal/zze;
 
     invoke-virtual {p1, v1, v2}, Lcom/google/android/gms/nearby/messages/MessageListener;->onDistanceChanged(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/Distance;)V
 
@@ -113,9 +113,9 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object v0, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNu:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v0, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNM:Lcom/google/android/gms/nearby/messages/internal/zza;
 
     invoke-virtual {p1, v1, v0}, Lcom/google/android/gms/nearby/messages/MessageListener;->onBleSignalChanged(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/BleSignal;)V
 
@@ -156,7 +156,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ax;->aCr:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ax;->aCJ:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/ay;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ay.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ay.smali
index 720b281726..7da6d25dff 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ay.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ay.smali
@@ -13,14 +13,14 @@
 
 
 # instance fields
-.field private final synthetic aCs:Ljava/util/List;
+.field private final synthetic aCK:Ljava/util/List;
 
 
 # direct methods
 .method constructor <init>(Ljava/util/List;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/ay;->aCs:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/ay;->aCK:Ljava/util/List;
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/nearby/bc;-><init>()V
 
@@ -34,7 +34,7 @@
 
     check-cast p1, Lcom/google/android/gms/nearby/messages/MessageListener;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ay;->aCs:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ay;->aCK:Ljava/util/List;
 
     invoke-static {v0, p1}, Lcom/google/android/gms/internal/nearby/ax;->a(Ljava/lang/Iterable;Lcom/google/android/gms/nearby/messages/MessageListener;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/az.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/az.smali
index 851ba3e116..ffbbff8e91 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/az.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/az.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aCr:Lcom/google/android/gms/common/api/internal/h;
+.field private final aCJ:Lcom/google/android/gms/common/api/internal/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private aCt:Z
+.field private aCL:Z
 
 
 # direct methods
@@ -34,9 +34,9 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/az;->aCt:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/az;->aCL:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/az;->aCr:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/az;->aCJ:Lcom/google/android/gms/common/api/internal/h;
 
     return-void
 .end method
@@ -54,11 +54,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/az;->aCt:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/az;->aCL:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/az;->aCr:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/az;->aCJ:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/ba;
 
@@ -68,7 +68,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/nearby/az;->aCt:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/nearby/az;->aCL:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/b.smali
index fb4e9037a3..0fd7263b69 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/b.smali
@@ -13,14 +13,14 @@
 
 
 # instance fields
-.field private final synthetic aBj:Lcom/google/android/gms/internal/nearby/zzeh;
+.field private final synthetic aBB:Lcom/google/android/gms/internal/nearby/zzeh;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/nearby/zzeh;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/b;->aBj:Lcom/google/android/gms/internal/nearby/zzeh;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/b;->aBB:Lcom/google/android/gms/internal/nearby/zzeh;
 
     const/4 p1, 0x0
 
@@ -36,17 +36,17 @@
 
     new-instance p1, Lcom/google/android/gms/nearby/connection/a;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/b;->aBj:Lcom/google/android/gms/internal/nearby/zzeh;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/b;->aBB:Lcom/google/android/gms/internal/nearby/zzeh;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzeh;->aBF:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzeh;->aBX:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/b;->aBj:Lcom/google/android/gms/internal/nearby/zzeh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/b;->aBB:Lcom/google/android/gms/internal/nearby/zzeh;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/nearby/zzeh;->akH:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/internal/nearby/zzeh;->akZ:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/b;->aBj:Lcom/google/android/gms/internal/nearby/zzeh;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/b;->aBB:Lcom/google/android/gms/internal/nearby/zzeh;
 
-    iget-boolean v2, v2, Lcom/google/android/gms/internal/nearby/zzeh;->aBG:Z
+    iget-boolean v2, v2, Lcom/google/android/gms/internal/nearby/zzeh;->aBY:Z
 
     invoke-direct {p1, v0, v1, v2}, Lcom/google/android/gms/nearby/connection/a;-><init>(Ljava/lang/String;Ljava/lang/String;Z)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ba.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ba.smali
index 83006a3aae..41b53d8105 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ba.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/ba.smali
@@ -14,14 +14,14 @@
 
 
 # instance fields
-.field private final synthetic aBl:Lcom/google/android/gms/common/api/Status;
+.field private final synthetic aBD:Lcom/google/android/gms/common/api/Status;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/Status;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/ba;->aBl:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/ba;->aBD:Lcom/google/android/gms/common/api/Status;
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/nearby/bc;-><init>()V
 
@@ -35,22 +35,22 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/internal/c$b;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->aBl:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->aBD:Lcom/google/android/gms/common/api/Status;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->kX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->kV()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->aBl:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->aBD:Lcom/google/android/gms/common/api/Status;
 
     invoke-interface {p1, v0}, Lcom/google/android/gms/common/api/internal/c$b;->k(Ljava/lang/Object;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->aBl:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->aBD:Lcom/google/android/gms/common/api/Status;
 
     invoke-interface {p1, v0}, Lcom/google/android/gms/common/api/internal/c$b;->c(Lcom/google/android/gms/common/api/Status;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bd.smali
index 8c8d08d1b8..8accd180fd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bd.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aCr:Lcom/google/android/gms/common/api/internal/h;
+.field private final aCJ:Lcom/google/android/gms/common/api/internal/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h<",
@@ -28,7 +28,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/nearby/messages/internal/bc;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bd;->aCr:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bd;->aCJ:Lcom/google/android/gms/common/api/internal/h;
 
     return-void
 .end method
@@ -38,7 +38,7 @@
 .method public final onPermissionChanged(Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bd;->aCr:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bd;->aCJ:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/be;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/be.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/be.smali
index bd60d70cea..218e959616 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/be.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/be.smali
@@ -13,14 +13,14 @@
 
 
 # instance fields
-.field private final synthetic aCu:Z
+.field private final synthetic aCM:Z
 
 
 # direct methods
 .method constructor <init>(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/nearby/be;->aCu:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/nearby/be;->aCM:Z
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/nearby/bc;-><init>()V
 
@@ -34,7 +34,7 @@
 
     check-cast p1, Lcom/google/android/gms/nearby/messages/d;
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/be;->aCu:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/be;->aCM:Z
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/nearby/messages/d;->onPermissionChanged(Z)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bg.smali
index 663897ec17..9e24372652 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bg.smali
@@ -5,7 +5,26 @@
 # static fields
 .field private static final CONTENT_URI:Landroid/net/Uri;
 
-.field private static final aCA:Ljava/util/HashMap;
+.field private static final aCN:Landroid/net/Uri;
+
+.field private static final aCO:Ljava/util/regex/Pattern;
+
+.field private static final aCP:Ljava/util/regex/Pattern;
+
+.field private static final aCQ:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+.field private static aCR:Ljava/util/HashMap;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/HashMap<",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final aCS:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -16,7 +35,7 @@
     .end annotation
 .end field
 
-.field private static final aCB:Ljava/util/HashMap;
+.field private static final aCT:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -27,7 +46,7 @@
     .end annotation
 .end field
 
-.field private static final aCC:Ljava/util/HashMap;
+.field private static final aCU:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -38,7 +57,7 @@
     .end annotation
 .end field
 
-.field private static final aCD:Ljava/util/HashMap;
+.field private static final aCV:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -49,30 +68,11 @@
     .end annotation
 .end field
 
-.field private static aCE:Ljava/lang/Object;
+.field private static aCW:Ljava/lang/Object;
 
-.field private static aCF:Z
+.field private static aCX:Z
 
-.field private static aCG:[Ljava/lang/String;
-
-.field private static final aCv:Landroid/net/Uri;
-
-.field private static final aCw:Ljava/util/regex/Pattern;
-
-.field private static final aCx:Ljava/util/regex/Pattern;
-
-.field private static final aCy:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-.field private static aCz:Ljava/util/HashMap;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/HashMap<",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private static aCY:[Ljava/lang/String;
 
 
 # direct methods
@@ -93,7 +93,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCv:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCN:Landroid/net/Uri;
 
     const/4 v0, 0x2
 
@@ -103,7 +103,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCw:Ljava/util/regex/Pattern;
+    sput-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCO:Ljava/util/regex/Pattern;
 
     const-string v1, "^(0|false|f|off|no|n)$"
 
@@ -111,43 +111,43 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCx:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCP:Ljava/util/regex/Pattern;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCy:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCQ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCA:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCS:Ljava/util/HashMap;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCB:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCT:Ljava/util/HashMap;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCC:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCU:Ljava/util/HashMap;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCD:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCV:Ljava/util/HashMap;
 
     const/4 v0, 0x0
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCG:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCY:[Ljava/lang/String;
 
     return-void
 .end method
@@ -229,9 +229,9 @@
     :try_start_0
     invoke-static {p0}, Lcom/google/android/gms/internal/nearby/bg;->c(Landroid/content/ContentResolver;)V
 
-    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCE:Ljava/lang/Object;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCW:Ljava/lang/Object;
 
-    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aCz:Ljava/util/HashMap;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aCR:Ljava/util/HashMap;
 
     invoke-virtual {v2, p1}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z
 
@@ -241,7 +241,7 @@
 
     if-eqz v2, :cond_1
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCz:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCR:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -262,7 +262,7 @@
     return-object p0
 
     :cond_1
-    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aCG:[Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aCY:[Ljava/lang/String;
 
     array-length v4, v2
 
@@ -283,11 +283,11 @@
 
     if-eqz v8, :cond_5
 
-    sget-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aCF:Z
+    sget-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aCX:Z
 
     if-eqz v1, :cond_2
 
-    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCz:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCR:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->isEmpty()Z
 
@@ -296,9 +296,9 @@
     if-eqz v1, :cond_4
 
     :cond_2
-    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCG:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCY:[Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aCz:Ljava/util/HashMap;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aCR:Ljava/util/HashMap;
 
     invoke-static {p0, v1}, Lcom/google/android/gms/internal/nearby/bg;->a(Landroid/content/ContentResolver;[Ljava/lang/String;)Ljava/util/Map;
 
@@ -306,9 +306,9 @@
 
     invoke-virtual {v2, p0}, Ljava/util/HashMap;->putAll(Ljava/util/Map;)V
 
-    sput-boolean v7, Lcom/google/android/gms/internal/nearby/bg;->aCF:Z
+    sput-boolean v7, Lcom/google/android/gms/internal/nearby/bg;->aCX:Z
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCz:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCR:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z
 
@@ -316,7 +316,7 @@
 
     if-eqz p0, :cond_4
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCz:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCR:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -472,7 +472,7 @@
         }
     .end annotation
 
-    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCv:Landroid/net/Uri;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCN:Landroid/net/Uri;
 
     const/4 v2, 0x0
 
@@ -550,11 +550,11 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCE:Ljava/lang/Object;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCW:Ljava/lang/Object;
 
     if-ne p0, v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCz:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCR:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1, p2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -580,7 +580,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCA:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aCS:Ljava/util/HashMap;
 
     sget-object v2, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
@@ -618,7 +618,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object v3, Lcom/google/android/gms/internal/nearby/bg;->aCw:Ljava/util/regex/Pattern;
+    sget-object v3, Lcom/google/android/gms/internal/nearby/bg;->aCO:Ljava/util/regex/Pattern;
 
     invoke-virtual {v3, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -635,7 +635,7 @@
     goto :goto_0
 
     :cond_2
-    sget-object v3, Lcom/google/android/gms/internal/nearby/bg;->aCx:Ljava/util/regex/Pattern;
+    sget-object v3, Lcom/google/android/gms/internal/nearby/bg;->aCP:Ljava/util/regex/Pattern;
 
     invoke-virtual {v3, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -682,20 +682,20 @@
 
     :cond_4
     :goto_0
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCA:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCS:Ljava/util/HashMap;
 
     const-class v3, Lcom/google/android/gms/internal/nearby/bg;
 
     monitor-enter v3
 
     :try_start_0
-    sget-object v4, Lcom/google/android/gms/internal/nearby/bg;->aCE:Ljava/lang/Object;
+    sget-object v4, Lcom/google/android/gms/internal/nearby/bg;->aCW:Ljava/lang/Object;
 
     if-ne v0, v4, :cond_5
 
     invoke-virtual {p0, p1, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCz:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCR:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -717,13 +717,13 @@
 .method private static c(Landroid/content/ContentResolver;)V
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCz:Ljava/util/HashMap;
+    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCR:Ljava/util/HashMap;
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCy:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCQ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
@@ -731,15 +731,15 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCz:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCR:Ljava/util/HashMap;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCE:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCW:Ljava/lang/Object;
 
-    sput-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aCF:Z
+    sput-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aCX:Z
 
     sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->CONTENT_URI:Landroid/net/Uri;
 
@@ -754,7 +754,7 @@
     return-void
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCy:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCQ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {p0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->getAndSet(Z)Z
 
@@ -762,23 +762,23 @@
 
     if-eqz p0, :cond_1
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCz:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCR:Ljava/util/HashMap;
 
     invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCA:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCS:Ljava/util/HashMap;
 
     invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCB:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCT:Ljava/util/HashMap;
 
     invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCC:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCU:Ljava/util/HashMap;
 
     invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCD:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCV:Ljava/util/HashMap;
 
     invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
 
@@ -786,9 +786,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sput-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCE:Ljava/lang/Object;
+    sput-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCW:Ljava/lang/Object;
 
-    sput-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aCF:Z
+    sput-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aCX:Z
 
     :cond_1
     return-void
@@ -804,7 +804,7 @@
     :try_start_0
     invoke-static {p0}, Lcom/google/android/gms/internal/nearby/bg;->c(Landroid/content/ContentResolver;)V
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCE:Ljava/lang/Object;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aCW:Ljava/lang/Object;
 
     monitor-exit v0
 
@@ -820,10 +820,10 @@
     throw p0
 .end method
 
-.method static synthetic vm()Ljava/util/concurrent/atomic/AtomicBoolean;
+.method static synthetic vk()Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCy:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aCQ:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bh.smali
index 0ea9db0844..05e1bda955 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bh.smali
@@ -18,7 +18,7 @@
 .method public final onChange(Z)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/nearby/bg;->vm()Ljava/util/concurrent/atomic/AtomicBoolean;
+    invoke-static {}, Lcom/google/android/gms/internal/nearby/bg;->vk()Ljava/util/concurrent/atomic/AtomicBoolean;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bk.smali
index 1e9ee836b2..efaa34077f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bk.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field final aCH:Lcom/google/android/gms/internal/nearby/zzu;
+.field final aCZ:Lcom/google/android/gms/internal/nearby/zzu;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/nearby/zzu;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/bk;->aCH:Lcom/google/android/gms/internal/nearby/zzu;
+    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/bk;->aCZ:Lcom/google/android/gms/internal/nearby/zzu;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bm.smali
index 221c829792..938fb325db 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bm.smali
@@ -13,9 +13,9 @@
 
 
 # instance fields
-.field private final aCI:J
+.field private final aDa:J
 
-.field private final aCJ:Ljava/util/Set;
+.field private final aDb:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final aCK:Ljava/util/Set;
+.field private final aDc:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final aCL:Ljava/util/Set;
+.field private final aDd:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -45,7 +45,7 @@
     .end annotation
 .end field
 
-.field private aCM:Lcom/google/android/gms/internal/nearby/ap;
+.field private aDe:Lcom/google/android/gms/internal/nearby/ap;
 
 
 # direct methods
@@ -72,19 +72,19 @@
 
     invoke-direct {p1}, Landroidx/collection/ArraySet;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aCJ:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aDb:Ljava/util/Set;
 
     new-instance p1, Landroidx/collection/ArraySet;
 
     invoke-direct {p1}, Landroidx/collection/ArraySet;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aCK:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aDc:Ljava/util/Set;
 
     new-instance p1, Landroidx/collection/ArraySet;
 
     invoke-direct {p1}, Landroidx/collection/ArraySet;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aCL:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aDd:Ljava/util/Set;
 
     invoke-virtual {p0}, Ljava/lang/Object;->hashCode()I
 
@@ -92,7 +92,7 @@
 
     int-to-long p1, p1
 
-    iput-wide p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aCI:J
+    iput-wide p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aDa:J
 
     return-void
 .end method
@@ -273,7 +273,7 @@
 .method private final reset()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aCJ:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aDb:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -297,7 +297,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aCK:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aDc:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -321,7 +321,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aCL:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aDd:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -345,19 +345,19 @@
     goto :goto_2
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aCJ:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aDb:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aCK:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aDc:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aCL:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aDd:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aCM:Lcom/google/android/gms/internal/nearby/ap;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aDe:Lcom/google/android/gms/internal/nearby/ap;
 
     if-eqz v0, :cond_3
 
@@ -365,7 +365,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aCM:Lcom/google/android/gms/internal/nearby/ap;
+    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aDe:Lcom/google/android/gms/internal/nearby/ap;
 
     :cond_3
     return-void
@@ -384,7 +384,7 @@
 
     invoke-direct {p1}, Lcom/google/android/gms/internal/nearby/ap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aCM:Lcom/google/android/gms/internal/nearby/ap;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aDe:Lcom/google/android/gms/internal/nearby/ap;
 
     return-void
 .end method
@@ -446,7 +446,7 @@
     if-eqz v0, :cond_0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/bm;->lY()Landroid/os/IInterface;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/bm;->lW()Landroid/os/IInterface;
 
     move-result-object v0
 
@@ -456,7 +456,7 @@
 
     invoke-direct {v1}, Lcom/google/android/gms/internal/nearby/bk;-><init>()V
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/nearby/bk;->aCH:Lcom/google/android/gms/internal/nearby/zzu;
+    iget-object v1, v1, Lcom/google/android/gms/internal/nearby/bk;->aCZ:Lcom/google/android/gms/internal/nearby/zzu;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/nearby/aa;->a(Lcom/google/android/gms/internal/nearby/zzu;)V
     :try_end_0
@@ -482,14 +482,14 @@
     return-void
 .end method
 
-.method public final lX()Landroid/os/Bundle;
+.method public final lV()Landroid/os/Bundle;
     .locals 4
 
     new-instance v0, Landroid/os/Bundle;
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/bm;->aCI:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/bm;->aDa:J
 
     const-string v3, "clientId"
 
@@ -498,7 +498,7 @@
     return-object v0
 .end method
 
-.method public final lf()Z
+.method public final ld()Z
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->mContext:Landroid/content/Context;
@@ -510,7 +510,7 @@
     return v0
 .end method
 
-.method public final lh()I
+.method public final lf()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -518,7 +518,7 @@
     return v0
 .end method
 
-.method public final lj()Ljava/lang/String;
+.method public final lh()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.nearby.connection.service.START"
@@ -526,7 +526,7 @@
     return-object v0
 .end method
 
-.method public final lk()Ljava/lang/String;
+.method public final li()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.nearby.internal.connection.INearbyConnectionService"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bn.smali
index 28e4735b3c..364767bc34 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bn.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aBp:Lcom/google/android/gms/common/api/internal/h;
+.field private final aBH:Lcom/google/android/gms/common/api/internal/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private final aCN:Ljava/util/Set;
+.field private final aDf:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final aCO:Ljava/util/Set;
+.field private final aDg:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -38,7 +38,7 @@
 .method public final a(Lcom/google/android/gms/internal/nearby/zzef;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBH:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/e;
 
@@ -52,13 +52,13 @@
 .method public final a(Lcom/google/android/gms/internal/nearby/zzeh;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aCN:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aDf:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aBE:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aBW:Ljava/lang/String;
 
     invoke-interface {v0, v1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBH:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/b;
 
@@ -72,9 +72,9 @@
 .method public final a(Lcom/google/android/gms/internal/nearby/zzen;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aCN:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aDf:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzen;->aBE:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzen;->aBW:Ljava/lang/String;
 
     invoke-interface {v0, v1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
@@ -84,20 +84,20 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->kX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->kV()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/bn;->aCO:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/bn;->aDg:Ljava/util/Set;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzen;->aBE:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzen;->aBW:Ljava/lang/String;
 
     invoke-interface {v1, v2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/bn;->aBp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/bn;->aBH:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v2, Lcom/google/android/gms/internal/nearby/c;
 
@@ -111,13 +111,13 @@
 .method public final a(Lcom/google/android/gms/internal/nearby/zzep;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aCO:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aDg:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzep;->aBE:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzep;->aBW:Ljava/lang/String;
 
     invoke-interface {v0, v1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBH:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/d;
 
@@ -131,7 +131,7 @@
 .method final shutdown()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aCN:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aDf:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -150,7 +150,7 @@
 
     check-cast v1, Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/bn;->aBp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/bn;->aBH:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v3, Lcom/google/android/gms/internal/nearby/f;
 
@@ -161,11 +161,11 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aCN:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aDf:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aCO:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aDg:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -184,7 +184,7 @@
 
     check-cast v1, Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/bn;->aBp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/bn;->aBH:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v3, Lcom/google/android/gms/internal/nearby/g;
 
@@ -195,7 +195,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aCO:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aDg:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/c.smali
index 06e2f2c2b8..c12e76ba97 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/c.smali
@@ -13,18 +13,18 @@
 
 
 # instance fields
-.field private final synthetic aBk:Lcom/google/android/gms/internal/nearby/zzen;
+.field private final synthetic aBC:Lcom/google/android/gms/internal/nearby/zzen;
 
-.field private final synthetic aBl:Lcom/google/android/gms/common/api/Status;
+.field private final synthetic aBD:Lcom/google/android/gms/common/api/Status;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/nearby/zzen;Lcom/google/android/gms/common/api/Status;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/c;->aBk:Lcom/google/android/gms/internal/nearby/zzen;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/c;->aBC:Lcom/google/android/gms/internal/nearby/zzen;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/c;->aBl:Lcom/google/android/gms/common/api/Status;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/c;->aBD:Lcom/google/android/gms/common/api/Status;
 
     const/4 p1, 0x0
 
@@ -40,7 +40,7 @@
 
     new-instance p1, Lcom/google/android/gms/nearby/connection/b;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/c;->aBl:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/c;->aBD:Lcom/google/android/gms/common/api/Status;
 
     invoke-direct {p1, v0}, Lcom/google/android/gms/nearby/connection/b;-><init>(Lcom/google/android/gms/common/api/Status;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/d.smali
index bd1756a981..14ab93d53b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/d.smali
@@ -13,14 +13,14 @@
 
 
 # instance fields
-.field private final synthetic aBm:Lcom/google/android/gms/internal/nearby/zzep;
+.field private final synthetic aBE:Lcom/google/android/gms/internal/nearby/zzep;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/nearby/zzep;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/d;->aBm:Lcom/google/android/gms/internal/nearby/zzep;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/d;->aBE:Lcom/google/android/gms/internal/nearby/zzep;
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/e.smali
index e2093a76e1..80b2ed2e77 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/e.smali
@@ -13,14 +13,14 @@
 
 
 # instance fields
-.field private final synthetic aBn:Lcom/google/android/gms/internal/nearby/zzef;
+.field private final synthetic aBF:Lcom/google/android/gms/internal/nearby/zzef;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/nearby/zzef;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/e;->aBn:Lcom/google/android/gms/internal/nearby/zzef;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/e;->aBF:Lcom/google/android/gms/internal/nearby/zzef;
 
     const/4 p1, 0x0
 
@@ -36,7 +36,7 @@
 
     new-instance p1, Lcom/google/android/gms/nearby/connection/f;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/e;->aBn:Lcom/google/android/gms/internal/nearby/zzef;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/e;->aBF:Lcom/google/android/gms/internal/nearby/zzef;
 
     iget v0, v0, Lcom/google/android/gms/internal/nearby/zzef;->quality:I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/f.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/f.smali
index 331a84b8ac..2f56459701 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/f.smali
@@ -13,14 +13,14 @@
 
 
 # instance fields
-.field private final synthetic aBo:Ljava/lang/String;
+.field private final synthetic aBG:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/f;->aBo:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/f;->aBG:Ljava/lang/String;
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/g.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/g.smali
index 142bf21d89..7ffe295dcb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/g.smali
@@ -13,14 +13,14 @@
 
 
 # instance fields
-.field private final synthetic aBo:Ljava/lang/String;
+.field private final synthetic aBG:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/g;->aBo:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/g;->aBG:Ljava/lang/String;
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/h.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/h.smali
index dd5ecd346b..c12ea833ab 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/h.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aBp:Lcom/google/android/gms/common/api/internal/h;
+.field private final aBH:Lcom/google/android/gms/common/api/internal/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private final aBq:Ljava/util/Set;
+.field private final aBI:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -28,13 +28,13 @@
 .method public final a(Lcom/google/android/gms/internal/nearby/zzer;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aBq:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aBI:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aBz:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aBR:Ljava/lang/String;
 
     invoke-interface {v0, v1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aBp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aBH:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/i;
 
@@ -48,13 +48,13 @@
 .method public final a(Lcom/google/android/gms/internal/nearby/zzet;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aBq:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aBI:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzet;->aBz:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzet;->aBR:Ljava/lang/String;
 
     invoke-interface {v0, v1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aBp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aBH:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/j;
 
@@ -68,7 +68,7 @@
 .method final shutdown()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aBq:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aBI:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -87,7 +87,7 @@
 
     check-cast v1, Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/h;->aBp:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/h;->aBH:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v3, Lcom/google/android/gms/internal/nearby/k;
 
@@ -98,7 +98,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aBq:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aBI:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/i.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/i.smali
index 437759137c..5b30b17c61 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/i.smali
@@ -13,14 +13,14 @@
 
 
 # instance fields
-.field private final synthetic aBr:Lcom/google/android/gms/internal/nearby/zzer;
+.field private final synthetic aBJ:Lcom/google/android/gms/internal/nearby/zzer;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/nearby/zzer;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/i;->aBr:Lcom/google/android/gms/internal/nearby/zzer;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/i;->aBJ:Lcom/google/android/gms/internal/nearby/zzer;
 
     const/4 p1, 0x0
 
@@ -34,9 +34,9 @@
 .method public final synthetic Y(Ljava/lang/Object;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/nearby/i;->aBr:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object p1, p0, Lcom/google/android/gms/internal/nearby/i;->aBJ:Lcom/google/android/gms/internal/nearby/zzer;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aBz:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aBR:Ljava/lang/String;
 
     const-string v0, "__UNRECOGNIZED_BLUETOOTH_DEVICE__"
 
@@ -48,13 +48,13 @@
 
     new-instance p1, Lcom/google/android/gms/nearby/connection/d;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/i;->aBr:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/i;->aBJ:Lcom/google/android/gms/internal/nearby/zzer;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzer;->aAN:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzer;->aBf:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/i;->aBr:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/i;->aBJ:Lcom/google/android/gms/internal/nearby/zzer;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/nearby/zzer;->aBI:Landroid/bluetooth/BluetoothDevice;
+    iget-object v1, v1, Lcom/google/android/gms/internal/nearby/zzer;->aCa:Landroid/bluetooth/BluetoothDevice;
 
     invoke-direct {p1, v0, v1}, Lcom/google/android/gms/nearby/connection/d;-><init>(Ljava/lang/String;Landroid/bluetooth/BluetoothDevice;)V
 
@@ -63,11 +63,11 @@
     :cond_0
     new-instance p1, Lcom/google/android/gms/nearby/connection/d;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/i;->aBr:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/i;->aBJ:Lcom/google/android/gms/internal/nearby/zzer;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzer;->aAN:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzer;->aBf:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/i;->aBr:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/i;->aBJ:Lcom/google/android/gms/internal/nearby/zzer;
 
     iget-object v1, v1, Lcom/google/android/gms/internal/nearby/zzer;->zzq:Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/j.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/j.smali
index 777d972b85..2be428a234 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/j.smali
@@ -13,14 +13,14 @@
 
 
 # instance fields
-.field private final synthetic aBs:Lcom/google/android/gms/internal/nearby/zzet;
+.field private final synthetic aBK:Lcom/google/android/gms/internal/nearby/zzet;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/nearby/zzet;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/j;->aBs:Lcom/google/android/gms/internal/nearby/zzet;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/j;->aBK:Lcom/google/android/gms/internal/nearby/zzet;
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/k.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/k.smali
index 8e718ceb4b..0792909625 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/k.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/k.smali
@@ -13,14 +13,14 @@
 
 
 # instance fields
-.field private final synthetic aBo:Ljava/lang/String;
+.field private final synthetic aBG:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/k;->aBo:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/k;->aBG:Ljava/lang/String;
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/m.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/m.smali
index e0ce3dcc46..4f727d7764 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/m.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/m.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aBt:Lcom/google/android/gms/common/api/internal/h;
+.field private final aBL:Lcom/google/android/gms/common/api/internal/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private final aBu:Ljava/util/Map;
+.field private final aBM:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -29,7 +29,7 @@
 .method public final a(Lcom/google/android/gms/internal/nearby/zzev;)V
     .locals 7
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/nearby/zzev;->aBJ:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v0, p1, Lcom/google/android/gms/internal/nearby/zzev;->aCb:Lcom/google/android/gms/internal/nearby/zzfh;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/nearby/ar;->a(Lcom/google/android/gms/internal/nearby/zzfh;)Lcom/google/android/gms/nearby/connection/e;
 
@@ -43,7 +43,7 @@
 
     const/4 v1, 0x0
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzev;->aBJ:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzev;->aCb:Lcom/google/android/gms/internal/nearby/zzfh;
 
     iget-wide v2, p1, Lcom/google/android/gms/internal/nearby/zzfh;->id:J
 
@@ -66,13 +66,13 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/m;->aBu:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/m;->aBM:Ljava/util/Map;
 
     new-instance v2, Lcom/google/android/gms/internal/nearby/q;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aBE:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aBW:Ljava/lang/String;
 
-    iget-object v4, p1, Lcom/google/android/gms/internal/nearby/zzev;->aBJ:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v4, p1, Lcom/google/android/gms/internal/nearby/zzev;->aCb:Lcom/google/android/gms/internal/nearby/zzfh;
 
     iget-wide v4, v4, Lcom/google/android/gms/internal/nearby/zzfh;->id:J
 
@@ -82,19 +82,19 @@
 
     invoke-direct {v3}, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;-><init>()V
 
-    iget-object v4, p1, Lcom/google/android/gms/internal/nearby/zzev;->aBJ:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v4, p1, Lcom/google/android/gms/internal/nearby/zzev;->aCb:Lcom/google/android/gms/internal/nearby/zzfh;
 
     iget-wide v4, v4, Lcom/google/android/gms/internal/nearby/zzfh;->id:J
 
-    iget-object v6, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMv:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v6, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMN:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     invoke-static {v6, v4, v5}, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->a(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;J)J
 
-    iget-object v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMv:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMN:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     invoke-interface {v1, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/m;->aBt:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/m;->aBL:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v2, Lcom/google/android/gms/internal/nearby/n;
 
@@ -108,7 +108,7 @@
 .method public final a(Lcom/google/android/gms/internal/nearby/zzex;)V
     .locals 5
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/nearby/zzex;->aBL:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p1, Lcom/google/android/gms/internal/nearby/zzex;->aCd:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     iget v0, v0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->status:I
 
@@ -116,41 +116,41 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aBu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aBM:Ljava/util/Map;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/q;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aBE:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aBW:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aBL:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aCd:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-    iget-wide v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBA:J
+    iget-wide v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBS:J
 
     invoke-direct {v1, v2, v3, v4}, Lcom/google/android/gms/internal/nearby/q;-><init>(Ljava/lang/String;J)V
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aBL:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aCd:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     invoke-interface {v0, v1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aBu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aBM:Ljava/util/Map;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/q;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aBE:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aBW:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aBL:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aCd:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-    iget-wide v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBA:J
+    iget-wide v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBS:J
 
     invoke-direct {v1, v2, v3, v4}, Lcom/google/android/gms/internal/nearby/q;-><init>(Ljava/lang/String;J)V
 
     invoke-interface {v0, v1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aBt:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aBL:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/o;
 
@@ -164,7 +164,7 @@
 .method final shutdown()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aBu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aBM:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -193,7 +193,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/nearby/q;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/nearby/q;->aBz:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/internal/nearby/q;->aBR:Ljava/lang/String;
 
     invoke-interface {v1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
@@ -201,7 +201,7 @@
 
     check-cast v1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/nearby/m;->aBt:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v3, p0, Lcom/google/android/gms/internal/nearby/m;->aBL:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v4, Lcom/google/android/gms/internal/nearby/p;
 
@@ -212,7 +212,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aBu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aBM:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->clear()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/n.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/n.smali
index ef2d02676e..c26d9cb467 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/n.smali
@@ -13,18 +13,18 @@
 
 
 # instance fields
-.field private final synthetic aBv:Lcom/google/android/gms/internal/nearby/zzev;
+.field private final synthetic aBN:Lcom/google/android/gms/internal/nearby/zzev;
 
-.field private final synthetic aBw:Lcom/google/android/gms/nearby/connection/e;
+.field private final synthetic aBO:Lcom/google/android/gms/nearby/connection/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/nearby/zzev;Lcom/google/android/gms/nearby/connection/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/n;->aBv:Lcom/google/android/gms/internal/nearby/zzev;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/n;->aBN:Lcom/google/android/gms/internal/nearby/zzev;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/n;->aBw:Lcom/google/android/gms/nearby/connection/e;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/n;->aBO:Lcom/google/android/gms/nearby/connection/e;
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/o.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/o.smali
index 0aaa59630e..6eb0ce5efb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/o.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/o.smali
@@ -13,14 +13,14 @@
 
 
 # instance fields
-.field private final synthetic aBx:Lcom/google/android/gms/internal/nearby/zzex;
+.field private final synthetic aBP:Lcom/google/android/gms/internal/nearby/zzex;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/nearby/zzex;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/o;->aBx:Lcom/google/android/gms/internal/nearby/zzex;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/o;->aBP:Lcom/google/android/gms/internal/nearby/zzex;
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/p.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/p.smali
index 59556dd6d9..7949e95a49 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/p.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/p.smali
@@ -13,18 +13,18 @@
 
 
 # instance fields
-.field private final synthetic aBo:Ljava/lang/String;
+.field private final synthetic aBG:Ljava/lang/String;
 
-.field private final synthetic aBy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+.field private final synthetic aBQ:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/String;Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/p;->aBo:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/p;->aBG:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/p;->aBy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/p;->aBQ:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     const/4 p1, 0x0
 
@@ -40,11 +40,11 @@
 
     new-instance p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/p;->aBy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/p;->aBQ:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     invoke-direct {p1, v0}, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;-><init>(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;)V
 
-    iget-object p1, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMv:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMN:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     const/4 v0, 0x2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/q.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/q.smali
index 04159e1721..fd07941a6a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/q.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/q.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field private final aBA:J
+.field final aBR:Ljava/lang/String;
 
-.field final aBz:Ljava/lang/String;
+.field private final aBS:J
 
 
 # direct methods
@@ -14,9 +14,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/q;->aBz:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/q;->aBR:Ljava/lang/String;
 
-    iput-wide p2, p0, Lcom/google/android/gms/internal/nearby/q;->aBA:J
+    iput-wide p2, p0, Lcom/google/android/gms/internal/nearby/q;->aBS:J
 
     return-void
 .end method
@@ -41,9 +41,9 @@
 
     check-cast p1, Lcom/google/android/gms/internal/nearby/q;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/q;->aBz:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/q;->aBR:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/q;->aBz:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/q;->aBR:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -51,13 +51,13 @@
 
     if-eqz v1, :cond_1
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/nearby/q;->aBA:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/nearby/q;->aBS:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
 
-    iget-wide v3, p1, Lcom/google/android/gms/internal/nearby/q;->aBA:J
+    iget-wide v3, p1, Lcom/google/android/gms/internal/nearby/q;->aBS:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -82,13 +82,13 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/q;->aBz:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/q;->aBR:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/q;->aBA:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/q;->aBS:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/r.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/r.smali
index 3eb81b252e..e531dbf888 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/r.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/r.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field private static aBB:Lcom/google/android/gms/internal/nearby/v;
+.field private static aBT:Lcom/google/android/gms/internal/nearby/v;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/s.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/s.smali
index 80da213d7a..ee3583b9af 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/s.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/s.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final alt:Ljava/lang/ClassLoader;
+.field private static final alL:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/s;->alt:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/s;->alL:Ljava/lang/ClassLoader;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/t.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/t.smali
index 407a5eb512..c64b3ed875 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/t.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/t.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field public static final aBC:Lcom/google/android/gms/common/api/a$g;
+.field public static final aBU:Lcom/google/android/gms/common/api/a$g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$g<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field public static final aBD:Lcom/google/android/gms/common/api/a$a;
+.field public static final aBV:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -36,13 +36,13 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/a$g;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/t;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/t;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     new-instance v0, Lcom/google/android/gms/internal/nearby/u;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/nearby/u;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/t;->aBD:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/t;->aBV:Lcom/google/android/gms/common/api/a$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzef.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzef.smali
index 630633d83a..377003220b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzef.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzef.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private aBE:Ljava/lang/String;
+.field private aBW:Ljava/lang/String;
 
 .field quality:I
 
@@ -46,7 +46,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aBE:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aBW:Ljava/lang/String;
 
     iput p2, p0, Lcom/google/android/gms/internal/nearby/zzef;->quality:I
 
@@ -73,9 +73,9 @@
 
     check-cast p1, Lcom/google/android/gms/internal/nearby/zzef;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aBE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aBW:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzef;->aBE:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzef;->aBW:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -114,7 +114,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aBE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aBW:Ljava/lang/String;
 
     const/4 v2, 0x0
 
@@ -146,7 +146,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzef;->aBE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzef;->aBW:Ljava/lang/String;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzeh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzeh.smali
index 5e6e8fb29c..c2969218a1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzeh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzeh.smali
@@ -15,15 +15,15 @@
 
 
 # instance fields
-.field aBE:Ljava/lang/String;
+.field aBW:Ljava/lang/String;
 
-.field aBF:Ljava/lang/String;
+.field aBX:Ljava/lang/String;
 
-.field aBG:Z
+.field aBY:Z
 
-.field private aBH:[B
+.field private aBZ:[B
 
-.field akH:Ljava/lang/String;
+.field akZ:Ljava/lang/String;
 
 
 # direct methods
@@ -52,15 +52,15 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBE:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBW:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBF:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBX:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzeh;->akH:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzeh;->akZ:Ljava/lang/String;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBG:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBY:Z
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBH:[B
+    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBZ:[B
 
     return-void
 .end method
@@ -85,9 +85,9 @@
 
     check-cast p1, Lcom/google/android/gms/internal/nearby/zzeh;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBW:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aBE:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aBW:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -95,9 +95,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBF:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBX:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aBF:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aBX:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -105,9 +105,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->akH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->akZ:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->akH:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->akZ:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -115,13 +115,13 @@
 
     if-eqz v1, :cond_1
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBG:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBY:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object v1
 
-    iget-boolean v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aBG:Z
+    iget-boolean v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aBY:Z
 
     invoke-static {v3}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -133,9 +133,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBH:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBZ:[B
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aBH:[B
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aBZ:[B
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->equals([B[B)Z
 
@@ -156,25 +156,25 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBW:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBF:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBX:Ljava/lang/String;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->akH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->akZ:Ljava/lang/String;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBG:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBY:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -184,7 +184,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBH:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBZ:[B
 
     invoke-static {v1}, Ljava/util/Arrays;->hashCode([B)I
 
@@ -214,31 +214,31 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBW:Ljava/lang/String;
 
     const/4 v1, 0x1
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBF:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBX:Ljava/lang/String;
 
     const/4 v1, 0x2
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->akH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->akZ:Ljava/lang/String;
 
     const/4 v1, 0x3
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBY:Z
 
     const/4 v1, 0x4
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBH:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aBZ:[B
 
     const/4 v1, 0x5
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzen.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzen.smali
index adef5cf866..46a94898fb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzen.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzen.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field aBE:Ljava/lang/String;
+.field aBW:Ljava/lang/String;
 
-.field private aBH:[B
+.field private aBZ:[B
 
 .field statusCode:I
 
@@ -48,11 +48,11 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBE:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBW:Ljava/lang/String;
 
     iput p2, p0, Lcom/google/android/gms/internal/nearby/zzen;->statusCode:I
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBH:[B
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBZ:[B
 
     return-void
 .end method
@@ -77,9 +77,9 @@
 
     check-cast p1, Lcom/google/android/gms/internal/nearby/zzen;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBW:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzen;->aBE:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzen;->aBW:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -105,9 +105,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBH:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBZ:[B
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzen;->aBH:[B
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzen;->aBZ:[B
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->equals([B[B)Z
 
@@ -128,7 +128,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBW:Ljava/lang/String;
 
     const/4 v2, 0x0
 
@@ -144,7 +144,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBH:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBZ:[B
 
     invoke-static {v1}, Ljava/util/Arrays;->hashCode([B)I
 
@@ -174,7 +174,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBW:Ljava/lang/String;
 
     const/4 v1, 0x1
 
@@ -186,7 +186,7 @@
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBH:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzen;->aBZ:[B
 
     const/4 v1, 0x3
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzep.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzep.smali
index 22f3b44f3d..56eff5143e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzep.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzep.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field aBE:Ljava/lang/String;
+.field aBW:Ljava/lang/String;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzep;->aBE:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzep;->aBW:Ljava/lang/String;
 
     return-void
 .end method
@@ -67,9 +67,9 @@
 
     check-cast p1, Lcom/google/android/gms/internal/nearby/zzep;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzep;->aBE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzep;->aBW:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzep;->aBE:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzep;->aBW:Ljava/lang/String;
 
     invoke-static {v0, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -90,7 +90,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzep;->aBE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzep;->aBW:Ljava/lang/String;
 
     const/4 v2, 0x0
 
@@ -112,7 +112,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzep;->aBE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzep;->aBW:Ljava/lang/String;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzer.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzer.smali
index ea9ab18cf1..2f358bb541 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzer.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzer.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field aAN:Ljava/lang/String;
+.field aBR:Ljava/lang/String;
 
-.field aBI:Landroid/bluetooth/BluetoothDevice;
+.field aBf:Ljava/lang/String;
 
-.field aBz:Ljava/lang/String;
+.field aCa:Landroid/bluetooth/BluetoothDevice;
 
 .field zzq:Ljava/lang/String;
 
@@ -50,13 +50,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBz:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBR:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAN:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBf:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzer;->zzq:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBI:Landroid/bluetooth/BluetoothDevice;
+    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzer;->aCa:Landroid/bluetooth/BluetoothDevice;
 
     return-void
 .end method
@@ -81,9 +81,9 @@
 
     check-cast p1, Lcom/google/android/gms/internal/nearby/zzer;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBz:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBR:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzer;->aBz:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzer;->aBR:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -91,9 +91,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAN:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBf:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAN:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzer;->aBf:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -111,9 +111,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBI:Landroid/bluetooth/BluetoothDevice;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aCa:Landroid/bluetooth/BluetoothDevice;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aBI:Landroid/bluetooth/BluetoothDevice;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aCa:Landroid/bluetooth/BluetoothDevice;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -134,13 +134,13 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBz:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBR:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAN:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBf:Ljava/lang/String;
 
     const/4 v2, 0x1
 
@@ -152,7 +152,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBI:Landroid/bluetooth/BluetoothDevice;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aCa:Landroid/bluetooth/BluetoothDevice;
 
     const/4 v2, 0x3
 
@@ -174,13 +174,13 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBz:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBR:Ljava/lang/String;
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAN:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBf:Ljava/lang/String;
 
     const/4 v2, 0x2
 
@@ -192,7 +192,7 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aBI:Landroid/bluetooth/BluetoothDevice;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aCa:Landroid/bluetooth/BluetoothDevice;
 
     const/4 v2, 0x4
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzet.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzet.smali
index 0e429e1351..51e65d9f5e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzet.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzet.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field aBz:Ljava/lang/String;
+.field aBR:Ljava/lang/String;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzet;->aBz:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzet;->aBR:Ljava/lang/String;
 
     return-void
 .end method
@@ -67,9 +67,9 @@
 
     check-cast p1, Lcom/google/android/gms/internal/nearby/zzet;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzet;->aBz:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzet;->aBR:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzet;->aBz:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzet;->aBR:Ljava/lang/String;
 
     invoke-static {v0, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -90,7 +90,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzet;->aBz:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzet;->aBR:Ljava/lang/String;
 
     const/4 v2, 0x0
 
@@ -112,7 +112,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzet;->aBz:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzet;->aBR:Ljava/lang/String;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzev.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzev.smali
index 880ed37ebf..5c1dd95af4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzev.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzev.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field aBE:Ljava/lang/String;
+.field aBW:Ljava/lang/String;
 
-.field aBJ:Lcom/google/android/gms/internal/nearby/zzfh;
+.field aCb:Lcom/google/android/gms/internal/nearby/zzfh;
 
-.field private aBK:Z
+.field private aCc:Z
 
 
 # direct methods
@@ -48,11 +48,11 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBE:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBW:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBJ:Lcom/google/android/gms/internal/nearby/zzfh;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzev;->aCb:Lcom/google/android/gms/internal/nearby/zzfh;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBK:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/internal/nearby/zzev;->aCc:Z
 
     return-void
 .end method
@@ -77,9 +77,9 @@
 
     check-cast p1, Lcom/google/android/gms/internal/nearby/zzev;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBW:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aBE:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aBW:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -87,9 +87,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBJ:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aCb:Lcom/google/android/gms/internal/nearby/zzfh;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aBJ:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aCb:Lcom/google/android/gms/internal/nearby/zzfh;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -97,13 +97,13 @@
 
     if-eqz v1, :cond_1
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBK:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aCc:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object v1
 
-    iget-boolean p1, p1, Lcom/google/android/gms/internal/nearby/zzev;->aBK:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/internal/nearby/zzev;->aCc:Z
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -128,19 +128,19 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBW:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBJ:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aCb:Lcom/google/android/gms/internal/nearby/zzfh;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBK:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aCc:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -166,19 +166,19 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBW:Ljava/lang/String;
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBJ:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aCb:Lcom/google/android/gms/internal/nearby/zzfh;
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-boolean p2, p0, Lcom/google/android/gms/internal/nearby/zzev;->aBK:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/internal/nearby/zzev;->aCc:Z
 
     const/4 v1, 0x3
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzex.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzex.smali
index de0726b70c..4bddd0440f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzex.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzex.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field aBE:Ljava/lang/String;
+.field aBW:Ljava/lang/String;
 
-.field aBL:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+.field aCd:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
 
 # direct methods
@@ -46,9 +46,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aBE:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aBW:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzex;->aBL:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzex;->aCd:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     return-void
 .end method
@@ -73,9 +73,9 @@
 
     check-cast p1, Lcom/google/android/gms/internal/nearby/zzex;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aBE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aBW:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aBE:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aBW:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -83,9 +83,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aBL:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aCd:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzex;->aBL:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzex;->aCd:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -106,13 +106,13 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aBE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aBW:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aBL:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aCd:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     const/4 v2, 0x1
 
@@ -134,13 +134,13 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aBE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aBW:Ljava/lang/String;
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aBL:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aCd:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     const/4 v2, 0x2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzfd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzfd.smali
index a2d81360ce..f7e6b15e66 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzfd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzfd.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private aBM:I
+.field private aCe:I
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aBM:I
+    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aCe:I
 
     return-void
 .end method
@@ -67,13 +67,13 @@
 
     check-cast p1, Lcom/google/android/gms/internal/nearby/zzfd;
 
-    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aBM:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aCe:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
 
-    iget p1, p1, Lcom/google/android/gms/internal/nearby/zzfd;->aBM:I
+    iget p1, p1, Lcom/google/android/gms/internal/nearby/zzfd;->aCe:I
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -98,7 +98,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aBM:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aCe:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -124,7 +124,7 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aBM:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aCe:I
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzfh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzfh.smali
index 6673d12010..99472a0773 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzfh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzfh.smali
@@ -15,15 +15,15 @@
 
 
 # instance fields
-.field aBQ:[B
+.field aCi:[B
 
-.field aBR:Landroid/os/ParcelFileDescriptor;
+.field aCj:Landroid/os/ParcelFileDescriptor;
 
-.field aBS:Ljava/lang/String;
+.field aCk:Ljava/lang/String;
 
-.field private aBT:Landroid/os/ParcelFileDescriptor;
+.field private aCl:Landroid/os/ParcelFileDescriptor;
 
-.field aiW:J
+.field ajo:J
 
 .field id:J
 
@@ -50,7 +50,7 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aiW:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->ajo:J
 
     return-void
 .end method
@@ -62,21 +62,21 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aiW:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->ajo:J
 
     iput-wide p1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->id:J
 
     iput p3, p0, Lcom/google/android/gms/internal/nearby/zzfh;->type:I
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBQ:[B
+    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCi:[B
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBR:Landroid/os/ParcelFileDescriptor;
+    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCj:Landroid/os/ParcelFileDescriptor;
 
-    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBS:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCk:Ljava/lang/String;
 
-    iput-wide p7, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aiW:J
+    iput-wide p7, p0, Lcom/google/android/gms/internal/nearby/zzfh;->ajo:J
 
-    iput-object p9, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBT:Landroid/os/ParcelFileDescriptor;
+    iput-object p9, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCl:Landroid/os/ParcelFileDescriptor;
 
     return-void
 .end method
@@ -137,9 +137,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBQ:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCi:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aBQ:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aCi:[B
 
     invoke-static {v1, v3}, Ljava/util/Arrays;->equals([B[B)Z
 
@@ -147,9 +147,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBR:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCj:Landroid/os/ParcelFileDescriptor;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aBR:Landroid/os/ParcelFileDescriptor;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aCj:Landroid/os/ParcelFileDescriptor;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -157,9 +157,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCk:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aBS:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aCk:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -167,13 +167,13 @@
 
     if-eqz v1, :cond_1
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aiW:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/nearby/zzfh;->ajo:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
 
-    iget-wide v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aiW:J
+    iget-wide v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->ajo:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -185,9 +185,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBT:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCl:Landroid/os/ParcelFileDescriptor;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aBT:Landroid/os/ParcelFileDescriptor;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aCl:Landroid/os/ParcelFileDescriptor;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -228,7 +228,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBQ:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCi:[B
 
     invoke-static {v1}, Ljava/util/Arrays;->hashCode([B)I
 
@@ -242,19 +242,19 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBR:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCj:Landroid/os/ParcelFileDescriptor;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCk:Ljava/lang/String;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aiW:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->ajo:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -264,7 +264,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBT:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCl:Landroid/os/ParcelFileDescriptor;
 
     const/4 v2, 0x6
 
@@ -298,31 +298,31 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBQ:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCi:[B
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;I[B)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBR:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCj:Landroid/os/ParcelFileDescriptor;
 
     const/4 v2, 0x4
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCk:Ljava/lang/String;
 
     const/4 v2, 0x5
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aiW:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->ajo:J
 
     const/4 v3, 0x6
 
     invoke-static {p1, v3, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aBT:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aCl:Landroid/os/ParcelFileDescriptor;
 
     const/4 v2, 0x7
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzgp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzgp.smali
index 13f3c86b49..1ed60b8984 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzgp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzgp.smali
@@ -15,23 +15,23 @@
 
 
 # instance fields
-.field private final aBU:I
+.field private final aCm:I
 
-.field private final aBV:Landroid/os/ParcelUuid;
+.field private final aCn:Landroid/os/ParcelUuid;
 
-.field private final aBW:Landroid/os/ParcelUuid;
+.field private final aCo:Landroid/os/ParcelUuid;
 
-.field private final aBX:Landroid/os/ParcelUuid;
+.field private final aCp:Landroid/os/ParcelUuid;
 
-.field private final aBY:[B
+.field private final aCq:[B
 
-.field private final aBZ:[B
+.field private final aCr:[B
 
-.field private final aCa:[B
+.field private final aCs:[B
 
-.field private final aCb:[B
+.field private final aCt:[B
 
-.field private final ajU:I
+.field private final akm:I
 
 
 # direct methods
@@ -52,23 +52,23 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBU:I
+    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCm:I
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBV:Landroid/os/ParcelUuid;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCn:Landroid/os/ParcelUuid;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBW:Landroid/os/ParcelUuid;
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCo:Landroid/os/ParcelUuid;
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBX:Landroid/os/ParcelUuid;
+    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCp:Landroid/os/ParcelUuid;
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBY:[B
+    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCq:[B
 
-    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBZ:[B
+    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCr:[B
 
-    iput p7, p0, Lcom/google/android/gms/internal/nearby/zzgp;->ajU:I
+    iput p7, p0, Lcom/google/android/gms/internal/nearby/zzgp;->akm:I
 
-    iput-object p8, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCa:[B
+    iput-object p8, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCs:[B
 
-    iput-object p9, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCb:[B
+    iput-object p9, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCt:[B
 
     return-void
 .end method
@@ -104,15 +104,15 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/internal/nearby/zzgp;
 
-    iget v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->ajU:I
+    iget v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->akm:I
 
-    iget v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->ajU:I
+    iget v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->akm:I
 
     if-ne v2, v3, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCa:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCs:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aCa:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aCs:[B
 
     invoke-static {v2, v3}, Ljava/util/Arrays;->equals([B[B)Z
 
@@ -120,9 +120,9 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCb:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCt:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aCb:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aCt:[B
 
     invoke-static {v2, v3}, Ljava/util/Arrays;->equals([B[B)Z
 
@@ -130,9 +130,9 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBX:Landroid/os/ParcelUuid;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCp:Landroid/os/ParcelUuid;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aBX:Landroid/os/ParcelUuid;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aCp:Landroid/os/ParcelUuid;
 
     invoke-static {v2, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -140,9 +140,9 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBY:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCq:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aBY:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aCq:[B
 
     invoke-static {v2, v3}, Ljava/util/Arrays;->equals([B[B)Z
 
@@ -150,9 +150,9 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBZ:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCr:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aBZ:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aCr:[B
 
     invoke-static {v2, v3}, Ljava/util/Arrays;->equals([B[B)Z
 
@@ -160,9 +160,9 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBV:Landroid/os/ParcelUuid;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCn:Landroid/os/ParcelUuid;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aBV:Landroid/os/ParcelUuid;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aCn:Landroid/os/ParcelUuid;
 
     invoke-static {v2, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -170,9 +170,9 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBW:Landroid/os/ParcelUuid;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCo:Landroid/os/ParcelUuid;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aBW:Landroid/os/ParcelUuid;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aCo:Landroid/os/ParcelUuid;
 
     invoke-static {v2, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -194,7 +194,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->ajU:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->akm:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -204,7 +204,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCa:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCs:[B
 
     invoke-static {v1}, Ljava/util/Arrays;->hashCode([B)I
 
@@ -218,7 +218,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCb:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCt:[B
 
     invoke-static {v1}, Ljava/util/Arrays;->hashCode([B)I
 
@@ -232,13 +232,13 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBX:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCp:Landroid/os/ParcelUuid;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBY:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCq:[B
 
     invoke-static {v1}, Ljava/util/Arrays;->hashCode([B)I
 
@@ -252,7 +252,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBZ:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCr:[B
 
     invoke-static {v1}, Ljava/util/Arrays;->hashCode([B)I
 
@@ -266,13 +266,13 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBV:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCn:Landroid/os/ParcelUuid;
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBW:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCo:Landroid/os/ParcelUuid;
 
     const/4 v2, 0x7
 
@@ -294,55 +294,55 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBU:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCm:I
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBV:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCn:Landroid/os/ParcelUuid;
 
     const/4 v2, 0x4
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBW:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCo:Landroid/os/ParcelUuid;
 
     const/4 v2, 0x5
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBX:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCp:Landroid/os/ParcelUuid;
 
     const/4 v2, 0x6
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBY:[B
+    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCq:[B
 
     const/4 v1, 0x7
 
     invoke-static {p1, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;I[B)V
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aBZ:[B
+    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCr:[B
 
     const/16 v1, 0x8
 
     invoke-static {p1, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;I[B)V
 
-    iget p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->ajU:I
+    iget p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->akm:I
 
     const/16 v1, 0x9
 
     invoke-static {p1, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCa:[B
+    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCs:[B
 
     const/16 v1, 0xa
 
     invoke-static {p1, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;I[B)V
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCb:[B
+    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aCt:[B
 
     const/16 v1, 0xb
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzgs.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzgs.smali
index d7a30d9293..f539b44206 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzgs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzgs.smali
@@ -13,17 +13,17 @@
     .end annotation
 .end field
 
-.field private static final aCk:Ljava/lang/String;
+.field private static final aCC:Ljava/lang/String;
 
-.field public static final aCl:Lcom/google/android/gms/internal/nearby/zzgs;
+.field public static final aCD:Lcom/google/android/gms/internal/nearby/zzgs;
 
 
 # instance fields
-.field private final aBU:I
+.field private final aCE:Ljava/lang/String;
 
-.field private final aCm:Ljava/lang/String;
+.field private final aCF:Ljava/lang/String;
 
-.field private final aCn:Ljava/lang/String;
+.field private final aCm:I
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/zzgs;->aCk:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/zzgs;->aCC:Ljava/lang/String;
 
     new-instance v0, Lcom/google/android/gms/internal/nearby/zzgs;
 
@@ -46,7 +46,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/nearby/zzgs;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/zzgs;->aCl:Lcom/google/android/gms/internal/nearby/zzgs;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/zzgs;->aCD:Lcom/google/android/gms/internal/nearby/zzgs;
 
     return-void
 .end method
@@ -70,16 +70,16 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aBU:I
+    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCm:I
 
     if-nez p2, :cond_0
 
     const-string p2, ""
 
     :cond_0
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCm:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCE:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCn:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCF:Ljava/lang/String;
 
     return-void
 .end method
@@ -119,9 +119,9 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/internal/nearby/zzgs;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCm:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCE:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgs;->aCm:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgs;->aCE:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -129,9 +129,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCn:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCF:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzgs;->aCn:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzgs;->aCF:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -152,13 +152,13 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCm:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCE:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCn:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCF:Ljava/lang/String;
 
     const/4 v2, 0x1
 
@@ -174,9 +174,9 @@
 .method public final toString()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCE:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCn:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCF:Ljava/lang/String;
 
     invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -234,19 +234,19 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCE:Ljava/lang/String;
 
     const/4 v1, 0x3
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCn:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCF:Ljava/lang/String;
 
     const/4 v1, 0x6
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aBU:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aCm:I
 
     const/16 v1, 0x3e8
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzgu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzgu.smali
index 330a6333f3..c1ac580e37 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzgu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/zzgu.smali
@@ -15,13 +15,13 @@
 
 
 # instance fields
-.field private final aBU:I
+.field private final aCG:I
 
-.field private final aCo:I
+.field private final aCH:[B
 
-.field private final aCp:[B
+.field private final aCI:Z
 
-.field private final aCq:Z
+.field private final aCm:I
 
 
 # direct methods
@@ -42,13 +42,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aBU:I
+    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCm:I
 
-    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCo:I
+    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCG:I
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCp:[B
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCH:[B
 
-    iput-boolean p4, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCq:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCI:Z
 
     return-void
 .end method
@@ -64,25 +64,25 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCo:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCG:I
 
     const/4 v1, 0x1
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCp:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCH:[B
 
     const/4 v1, 0x2
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;I[B)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCq:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCI:Z
 
     const/4 v1, 0x3
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aBU:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aCm:I
 
     const/16 v1, 0x3e8
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurement.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurement.smali
index c6162ad745..7945dab169 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurement.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurement.smali
@@ -16,15 +16,15 @@
 
 
 # static fields
-.field private static volatile aCW:Lcom/google/android/gms/measurement/AppMeasurement;
+.field private static volatile aDo:Lcom/google/android/gms/measurement/AppMeasurement;
 
 
 # instance fields
-.field public final aCX:Lcom/google/android/gms/measurement/internal/ek;
+.field public final aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-.field public final aCY:Lcom/google/android/gms/measurement/internal/gj;
+.field public final aDq:Lcom/google/android/gms/measurement/internal/gj;
 
-.field public final aCZ:Z
+.field public final aDr:Z
 
 
 # direct methods
@@ -35,15 +35,15 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     return-void
 .end method
@@ -55,15 +55,15 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 .method private static aq(Landroid/content/Context;)Lcom/google/android/gms/measurement/AppMeasurement;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/measurement/AppMeasurement;->aCW:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object v0, Lcom/google/android/gms/measurement/AppMeasurement;->aDo:Lcom/google/android/gms/measurement/AppMeasurement;
 
     if-nez v0, :cond_2
 
@@ -80,7 +80,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aCW:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aDo:Lcom/google/android/gms/measurement/AppMeasurement;
 
     if-nez v1, :cond_1
 
@@ -96,7 +96,7 @@
 
     invoke-direct {p0, v2}, Lcom/google/android/gms/measurement/AppMeasurement;-><init>(Lcom/google/android/gms/measurement/internal/gj;)V
 
-    sput-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCW:Lcom/google/android/gms/measurement/AppMeasurement;
+    sput-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDo:Lcom/google/android/gms/measurement/AppMeasurement;
 
     goto :goto_0
 
@@ -109,7 +109,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/AppMeasurement;-><init>(Lcom/google/android/gms/measurement/internal/ek;)V
 
-    sput-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aCW:Lcom/google/android/gms/measurement/AppMeasurement;
+    sput-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aDo:Lcom/google/android/gms/measurement/AppMeasurement;
 
     :cond_1
     :goto_0
@@ -128,7 +128,7 @@
 
     :cond_2
     :goto_1
-    sget-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCW:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDo:Lcom/google/android/gms/measurement/AppMeasurement;
 
     return-object p0
 .end method
@@ -136,7 +136,7 @@
 .method public static b(Landroid/content/Context;Landroid/os/Bundle;)Lcom/google/android/gms/measurement/AppMeasurement;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/AppMeasurement;->aCW:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object v0, Lcom/google/android/gms/measurement/AppMeasurement;->aDo:Lcom/google/android/gms/measurement/AppMeasurement;
 
     if-nez v0, :cond_2
 
@@ -145,7 +145,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aCW:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aDo:Lcom/google/android/gms/measurement/AppMeasurement;
 
     if-nez v1, :cond_1
 
@@ -159,7 +159,7 @@
 
     invoke-direct {p0, v1}, Lcom/google/android/gms/measurement/AppMeasurement;-><init>(Lcom/google/android/gms/measurement/internal/gj;)V
 
-    sput-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCW:Lcom/google/android/gms/measurement/AppMeasurement;
+    sput-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDo:Lcom/google/android/gms/measurement/AppMeasurement;
 
     goto :goto_0
 
@@ -172,7 +172,7 @@
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/measurement/AppMeasurement;-><init>(Lcom/google/android/gms/measurement/internal/ek;)V
 
-    sput-object p1, Lcom/google/android/gms/measurement/AppMeasurement;->aCW:Lcom/google/android/gms/measurement/AppMeasurement;
+    sput-object p1, Lcom/google/android/gms/measurement/AppMeasurement;->aDo:Lcom/google/android/gms/measurement/AppMeasurement;
 
     :cond_1
     :goto_0
@@ -191,7 +191,7 @@
 
     :cond_2
     :goto_1
-    sget-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCW:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDo:Lcom/google/android/gms/measurement/AppMeasurement;
 
     return-object p0
 .end method
@@ -270,26 +270,26 @@
 .method public beginAdUnitExposure(Ljava/lang/String;)V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/measurement/internal/gj;->beginAdUnitExposure(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vz()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -305,20 +305,20 @@
 .method public clearConditionalUserProperty(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v0, p1, p2, p3}, Lcom/google/android/gms/measurement/internal/gj;->clearConditionalUserProperty(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -330,19 +330,19 @@
 .method protected clearConditionalUserPropertyAs(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vx()V
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lcom/google/android/gms/measurement/internal/fr;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
@@ -361,26 +361,26 @@
 .method public endAdUnitExposure(Ljava/lang/String;)V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/measurement/internal/gj;->endAdUnitExposure(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vz()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -396,11 +396,11 @@
 .method public generateEventId()J
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gj;->generateEventId()J
 
@@ -409,13 +409,13 @@
     return-wide v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->zi()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->zg()J
 
     move-result-wide v0
 
@@ -425,26 +425,26 @@
 .method public getAppInstanceId()Ljava/lang/String;
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gj;->yJ()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gj;->yH()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fr;->yJ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fr;->yH()Ljava/lang/String;
 
     move-result-object v0
 
@@ -465,11 +465,11 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/gj;->getConditionalUserProperties(Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
 
@@ -478,9 +478,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -553,19 +553,19 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vx()V
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/measurement/internal/fr;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/ArrayList;
 
@@ -638,11 +638,11 @@
 .method public getCurrentScreenClass()Ljava/lang/String;
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gj;->getCurrentScreenClass()Ljava/lang/String;
 
@@ -651,9 +651,9 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -667,11 +667,11 @@
 .method public getCurrentScreenName()Ljava/lang/String;
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gj;->getCurrentScreenName()Ljava/lang/String;
 
@@ -680,9 +680,9 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -696,11 +696,11 @@
 .method public getGmpAppId()Ljava/lang/String;
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gj;->getGmpAppId()Ljava/lang/String;
 
@@ -709,9 +709,9 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -725,11 +725,11 @@
 .method public getMaxUserProperties(Ljava/lang/String;)I
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/measurement/internal/gj;->getMaxUserProperties(Ljava/lang/String;)I
 
@@ -738,11 +738,11 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const/16 p1, 0x19
 
@@ -764,11 +764,11 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v0, p1, p2, p3}, Lcom/google/android/gms/measurement/internal/gj;->getUserProperties(Ljava/lang/String;Ljava/lang/String;Z)Ljava/util/Map;
 
@@ -777,9 +777,9 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -808,19 +808,19 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vx()V
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lcom/google/android/gms/measurement/internal/fr;->b(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Ljava/util/Map;
 
@@ -841,20 +841,20 @@
 .method public logEventInternal(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v0, p1, p2, p3}, Lcom/google/android/gms/measurement/internal/gj;->logEventInternal(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -866,20 +866,20 @@
 .method public registerOnMeasurementEventListener(Lcom/google/android/gms/measurement/AppMeasurement$OnEventListener;)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/measurement/internal/gj;->a(Lcom/google/android/gms/measurement/internal/fp;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -893,11 +893,11 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->a(Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;)Landroid/os/Bundle;
 
@@ -908,9 +908,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -918,7 +918,7 @@
 
     move-result-object p1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -936,13 +936,13 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -958,15 +958,15 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vx()V
 
     new-instance v1, Landroid/os/Bundle;
 
     invoke-direct {v1, p1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver.smali
index 041591395c..28c9308804 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private aDa:Lcom/google/android/gms/measurement/internal/dz;
+.field private aDs:Lcom/google/android/gms/measurement/internal/dz;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 .method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aDa:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aDs:Lcom/google/android/gms/measurement/internal/dz;
 
     if-nez v0, :cond_0
 
@@ -37,17 +37,17 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/dz;-><init>(Lcom/google/android/gms/measurement/internal/eb;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aDa:Lcom/google/android/gms/measurement/internal/dz;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aDs:Lcom/google/android/gms/measurement/internal/dz;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aDa:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aDs:Lcom/google/android/gms/measurement/internal/dz;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/dz;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V
 
     return-void
 .end method
 
-.method public final vw()Landroid/content/BroadcastReceiver$PendingResult;
+.method public final vu()Landroid/content/BroadcastReceiver$PendingResult;
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->goAsync()Landroid/content/BroadcastReceiver$PendingResult;
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementJobService.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementJobService.smali
index 17152118de..77db7d5e6a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementJobService.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementJobService.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private aDb:Lcom/google/android/gms/measurement/internal/hu;
+.field private aDt:Lcom/google/android/gms/measurement/internal/hu;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/hu<",
@@ -26,7 +26,7 @@
     return-void
 .end method
 
-.method private final vx()Lcom/google/android/gms/measurement/internal/hu;
+.method private final vv()Lcom/google/android/gms/measurement/internal/hu;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -37,7 +37,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aDb:Lcom/google/android/gms/measurement/internal/hu;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aDt:Lcom/google/android/gms/measurement/internal/hu;
 
     if-nez v0, :cond_0
 
@@ -45,10 +45,10 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/hu;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aDb:Lcom/google/android/gms/measurement/internal/hu;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aDt:Lcom/google/android/gms/measurement/internal/hu;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aDb:Lcom/google/android/gms/measurement/internal/hu;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aDt:Lcom/google/android/gms/measurement/internal/hu;
 
     return-object v0
 .end method
@@ -86,7 +86,7 @@
 
     invoke-super {p0}, Landroid/app/job/JobService;->onCreate()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->vx()Lcom/google/android/gms/measurement/internal/hu;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->vv()Lcom/google/android/gms/measurement/internal/hu;
 
     move-result-object v0
 
@@ -98,7 +98,7 @@
 .method public final onDestroy()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->vx()Lcom/google/android/gms/measurement/internal/hu;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->vv()Lcom/google/android/gms/measurement/internal/hu;
 
     move-result-object v0
 
@@ -112,7 +112,7 @@
 .method public final onRebind(Landroid/content/Intent;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->vx()Lcom/google/android/gms/measurement/internal/hu;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->vv()Lcom/google/android/gms/measurement/internal/hu;
 
     move-result-object v0
 
@@ -124,11 +124,11 @@
 .method public final onStartJob(Landroid/app/job/JobParameters;)Z
     .locals 5
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->vx()Lcom/google/android/gms/measurement/internal/hu;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->vv()Lcom/google/android/gms/measurement/internal/hu;
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/hu;->aKw:Landroid/content/Context;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/hu;->aKO:Landroid/content/Context;
 
     const/4 v2, 0x0
 
@@ -136,7 +136,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
@@ -150,7 +150,7 @@
 
     move-result-object v2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Local AppMeasurementJobService called. action"
 
@@ -187,7 +187,7 @@
 .method public final onUnbind(Landroid/content/Intent;)Z
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->vx()Lcom/google/android/gms/measurement/internal/hu;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->vv()Lcom/google/android/gms/measurement/internal/hu;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementReceiver.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementReceiver.smali
index 9ee5ec1ba2..464e1cd98b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementReceiver.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementReceiver.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private aDa:Lcom/google/android/gms/measurement/internal/dz;
+.field private aDs:Lcom/google/android/gms/measurement/internal/dz;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 .method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aDa:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aDs:Lcom/google/android/gms/measurement/internal/dz;
 
     if-nez v0, :cond_0
 
@@ -39,17 +39,17 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/dz;-><init>(Lcom/google/android/gms/measurement/internal/eb;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aDa:Lcom/google/android/gms/measurement/internal/dz;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aDs:Lcom/google/android/gms/measurement/internal/dz;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aDa:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aDs:Lcom/google/android/gms/measurement/internal/dz;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/dz;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V
 
     return-void
 .end method
 
-.method public final vw()Landroid/content/BroadcastReceiver$PendingResult;
+.method public final vu()Landroid/content/BroadcastReceiver$PendingResult;
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->goAsync()Landroid/content/BroadcastReceiver$PendingResult;
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementService.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementService.smali
index 6291d2bb6d..71e3d83070 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementService.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/AppMeasurementService.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private aDb:Lcom/google/android/gms/measurement/internal/hu;
+.field private aDt:Lcom/google/android/gms/measurement/internal/hu;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/hu<",
@@ -26,7 +26,7 @@
     return-void
 .end method
 
-.method private final vx()Lcom/google/android/gms/measurement/internal/hu;
+.method private final vv()Lcom/google/android/gms/measurement/internal/hu;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -37,7 +37,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aDb:Lcom/google/android/gms/measurement/internal/hu;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aDt:Lcom/google/android/gms/measurement/internal/hu;
 
     if-nez v0, :cond_0
 
@@ -45,10 +45,10 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/hu;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aDb:Lcom/google/android/gms/measurement/internal/hu;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aDt:Lcom/google/android/gms/measurement/internal/hu;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aDb:Lcom/google/android/gms/measurement/internal/hu;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aDt:Lcom/google/android/gms/measurement/internal/hu;
 
     return-object v0
 .end method
@@ -86,7 +86,7 @@
 .method public final onBind(Landroid/content/Intent;)Landroid/os/IBinder;
     .locals 3
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->vx()Lcom/google/android/gms/measurement/internal/hu;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->vv()Lcom/google/android/gms/measurement/internal/hu;
 
     move-result-object v0
 
@@ -94,15 +94,15 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hu;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hu;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "onBind called with null intent"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-object v1
 
@@ -121,7 +121,7 @@
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/el;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hu;->aKw:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hu;->aKO:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ii;->au(Landroid/content/Context;)Lcom/google/android/gms/measurement/internal/ii;
 
@@ -132,11 +132,11 @@
     return-object p1
 
     :cond_1
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hu;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hu;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "onBind received unknown action"
 
@@ -150,7 +150,7 @@
 
     invoke-super {p0}, Landroid/app/Service;->onCreate()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->vx()Lcom/google/android/gms/measurement/internal/hu;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->vv()Lcom/google/android/gms/measurement/internal/hu;
 
     move-result-object v0
 
@@ -162,7 +162,7 @@
 .method public final onDestroy()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->vx()Lcom/google/android/gms/measurement/internal/hu;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->vv()Lcom/google/android/gms/measurement/internal/hu;
 
     move-result-object v0
 
@@ -176,7 +176,7 @@
 .method public final onRebind(Landroid/content/Intent;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->vx()Lcom/google/android/gms/measurement/internal/hu;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->vv()Lcom/google/android/gms/measurement/internal/hu;
 
     move-result-object v0
 
@@ -188,11 +188,11 @@
 .method public final onStartCommand(Landroid/content/Intent;II)I
     .locals 5
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->vx()Lcom/google/android/gms/measurement/internal/hu;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->vv()Lcom/google/android/gms/measurement/internal/hu;
 
     move-result-object p2
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/hu;->aKw:Landroid/content/Context;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/hu;->aKO:Landroid/content/Context;
 
     const/4 v1, 0x0
 
@@ -200,17 +200,17 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     if-nez p1, :cond_0
 
-    iget-object p1, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "AppMeasurementService started with null intent"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -219,7 +219,7 @@
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -253,7 +253,7 @@
 .method public final onUnbind(Landroid/content/Intent;)Z
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->vx()Lcom/google/android/gms/measurement/internal/hu;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->vv()Lcom/google/android/gms/measurement/internal/hu;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/api/a.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/api/a.smali
index 731d1e1aeb..e562b919cb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/api/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/api/a.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aDc:Lcom/google/android/gms/internal/measurement/lw;
+.field private final aDu:Lcom/google/android/gms/internal/measurement/lw;
 
 
 # direct methods
@@ -12,7 +12,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/api/a;->aDc:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/api/a;->aDu:Lcom/google/android/gms/internal/measurement/lw;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a.smali
index 6a2596686b..9943521f5b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a.smali
@@ -17,20 +17,20 @@
 
 
 # instance fields
-.field private aDe:Lcom/google/android/gms/internal/measurement/lo;
+.field private aDw:Lcom/google/android/gms/internal/measurement/lo;
 
-.field private final synthetic aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/lo;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aDe:Lcom/google/android/gms/internal/measurement/lo;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aDw:Lcom/google/android/gms/internal/measurement/lo;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
     .locals 6
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aDe:Lcom/google/android/gms/internal/measurement/lo;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aDw:Lcom/google/android/gms/internal/measurement/lo;
 
     move-object v1, p1
 
@@ -60,15 +60,15 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Event listener threw exception"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b.smali
index 6f6529491c..e58f081de8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b.smali
@@ -17,20 +17,20 @@
 
 
 # instance fields
-.field private aDe:Lcom/google/android/gms/internal/measurement/lo;
+.field private aDw:Lcom/google/android/gms/internal/measurement/lo;
 
-.field private final synthetic aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/lo;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aDe:Lcom/google/android/gms/internal/measurement/lo;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aDw:Lcom/google/android/gms/internal/measurement/lo;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
     .locals 6
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aDe:Lcom/google/android/gms/internal/measurement/lo;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aDw:Lcom/google/android/gms/internal/measurement/lo;
 
     move-object v1, p1
 
@@ -60,15 +60,15 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Event interceptor threw exception"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService.smali
index aac3127fc8..d269b95ccc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService.smali
@@ -12,9 +12,9 @@
 
 
 # instance fields
-.field aCX:Lcom/google/android/gms/measurement/internal/ek;
+.field aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-.field private aDd:Ljava/util/Map;
+.field private aDv:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -34,13 +34,13 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     new-instance v0, Landroidx/collection/ArrayMap;
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDd:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDv:Ljava/util/Map;
 
     return-void
 .end method
@@ -48,9 +48,9 @@
 .method private final a(Lcom/google/android/gms/internal/measurement/ln;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
@@ -59,10 +59,10 @@
     return-void
 .end method
 
-.method private final vy()V
+.method private final vw()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     if-eqz v0, :cond_0
 
@@ -88,11 +88,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vz()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
@@ -109,11 +109,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -130,11 +130,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vz()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
@@ -151,21 +151,21 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->zi()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->zg()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v2
 
@@ -182,11 +182,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -207,15 +207,15 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fr;->yJ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fr;->yH()Ljava/lang/String;
 
     move-result-object v0
 
@@ -232,11 +232,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -257,11 +257,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -282,11 +282,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -307,21 +307,21 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFr:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFJ:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v3, 0x0
 
@@ -333,7 +333,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
@@ -342,11 +342,11 @@
     return-void
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aHb:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aHt:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -358,7 +358,7 @@
 
     if-lez v1, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
@@ -367,13 +367,13 @@
     return-void
 
     :cond_1
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aHb:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aHt:Lcom/google/android/gms/measurement/internal/dt;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v2
 
@@ -383,7 +383,7 @@
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/internal/measurement/ln;)V
 
@@ -398,11 +398,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -423,17 +423,17 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p1
 
@@ -452,7 +452,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
     if-eqz p2, :cond_4
 
@@ -475,15 +475,15 @@
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -491,7 +491,7 @@
 
     invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
@@ -517,15 +517,15 @@
     return-void
 
     :cond_1
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -533,7 +533,7 @@
 
     invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
@@ -558,15 +558,15 @@
     return-void
 
     :cond_2
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -574,7 +574,7 @@
 
     invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
@@ -612,13 +612,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/it;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/it;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Error returning double value to wrapper"
 
@@ -627,15 +627,15 @@
     return-void
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -643,7 +643,7 @@
 
     invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
@@ -668,15 +668,15 @@
     return-void
 
     :cond_4
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -684,7 +684,7 @@
 
     invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
@@ -713,11 +713,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -750,7 +750,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
     return-void
 .end method
@@ -769,7 +769,7 @@
 
     check-cast p1, Landroid/content/Context;
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     if-nez p3, :cond_0
 
@@ -777,20 +777,20 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     return-void
 
     :cond_0
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Attempting to initialize multiple times"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 .end method
@@ -803,11 +803,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -828,13 +828,13 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
     move-object v0, p0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v2
 
@@ -863,9 +863,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     new-instance v0, Landroid/os/Bundle;
 
@@ -899,9 +899,9 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/zzai;-><init>(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzah;Ljava/lang/String;J)V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p2
 
@@ -922,7 +922,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
     const/4 v0, 0x0
 
@@ -966,9 +966,9 @@
     :goto_2
     move-object v8, v0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
@@ -993,25 +993,25 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/fr;->aJp:Lcom/google/android/gms/measurement/internal/gk;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/fr;->aJH:Lcom/google/android/gms/measurement/internal/gk;
 
     if-eqz p3, :cond_0
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p4
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fr;->yH()V
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fr;->yF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -1033,25 +1033,25 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/fr;->aJp:Lcom/google/android/gms/measurement/internal/gk;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/fr;->aJH:Lcom/google/android/gms/measurement/internal/gk;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fr;->yH()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fr;->yF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -1073,25 +1073,25 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/fr;->aJp:Lcom/google/android/gms/measurement/internal/gk;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/fr;->aJH:Lcom/google/android/gms/measurement/internal/gk;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fr;->yH()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fr;->yF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -1113,25 +1113,25 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/fr;->aJp:Lcom/google/android/gms/measurement/internal/gk;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/fr;->aJH:Lcom/google/android/gms/measurement/internal/gk;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fr;->yH()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fr;->yF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -1153,15 +1153,15 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/fr;->aJp:Lcom/google/android/gms/measurement/internal/gk;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/fr;->aJH:Lcom/google/android/gms/measurement/internal/gk;
 
     new-instance p4, Landroid/os/Bundle;
 
@@ -1169,13 +1169,13 @@
 
     if-eqz p3, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fr;->yH()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fr;->yF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -1196,13 +1196,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Error returning bundle value to wrapper"
 
@@ -1219,25 +1219,25 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/fr;->aJp:Lcom/google/android/gms/measurement/internal/gk;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/fr;->aJH:Lcom/google/android/gms/measurement/internal/gk;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fr;->yH()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fr;->yF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -1259,25 +1259,25 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/fr;->aJp:Lcom/google/android/gms/measurement/internal/gk;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/fr;->aJH:Lcom/google/android/gms/measurement/internal/gk;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fr;->yH()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fr;->yF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -1299,7 +1299,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
     const/4 p1, 0x0
 
@@ -1316,9 +1316,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDv:Ljava/util/Map;
 
     invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/lo;->id()I
 
@@ -1340,7 +1340,7 @@
 
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;-><init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/lo;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDd:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDv:Ljava/util/Map;
 
     invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/lo;->id()I
 
@@ -1353,9 +1353,9 @@
     invoke-interface {v1, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p1
 
@@ -1372,19 +1372,19 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/fr;->cM(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/fr;->cI(Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v1
 
@@ -1405,28 +1405,28 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Conditional user property must not be null"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -1443,11 +1443,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ek;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object p4
 
@@ -1470,11 +1470,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -1491,11 +1491,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -1503,9 +1503,9 @@
 
     invoke-direct {v1, p0, p1}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;-><init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/lo;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p1
 
@@ -1526,7 +1526,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
     return-void
 .end method
@@ -1539,15 +1539,15 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p2
 
-    invoke-virtual {p2, p1}, Lcom/google/android/gms/measurement/internal/fr;->Q(Z)V
+    invoke-virtual {p2, p1}, Lcom/google/android/gms/measurement/internal/fr;->O(Z)V
 
     return-void
 .end method
@@ -1560,15 +1560,15 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v1
 
@@ -1589,15 +1589,15 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v1
 
@@ -1618,11 +1618,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v1
 
@@ -1649,15 +1649,15 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
     invoke-static {p3}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
     move-result-object v3
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -1682,9 +1682,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDv:Ljava/util/Map;
 
     invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/lo;->id()I
 
@@ -1707,9 +1707,9 @@
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;-><init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/lo;)V
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/a.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/a.smali
index f5d8ca98d3..71db923a42 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/a.smali
@@ -3,7 +3,9 @@
 
 
 # instance fields
-.field final aDg:Ljava/util/Map;
+.field aDA:J
+
+.field final aDy:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -14,7 +16,7 @@
     .end annotation
 .end field
 
-.field final aDh:Ljava/util/Map;
+.field final aDz:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -25,8 +27,6 @@
     .end annotation
 .end field
 
-.field aDi:J
-
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/measurement/internal/ek;)V
@@ -38,13 +38,13 @@
 
     invoke-direct {p1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/a;->aDh:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/a;->aDz:Ljava/util/Map;
 
     new-instance p1, Landroidx/collection/ArrayMap;
 
     invoke-direct {p1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/a;->aDg:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/a;->aDy:Ljava/util/Map;
 
     return-void
 .end method
@@ -56,15 +56,15 @@
 
     if-nez p3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Not logging ad exposure. No active activity"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
@@ -75,11 +75,11 @@
 
     if-gez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -104,7 +104,7 @@
 
     invoke-static {p3, v0, p1}, Lcom/google/android/gms/measurement/internal/gr;->a(Lcom/google/android/gms/measurement/internal/gs;Landroid/os/Bundle;Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p1
 
@@ -122,15 +122,15 @@
 
     if-nez p4, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Not logging ad unit exposure. No active activity"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
@@ -141,11 +141,11 @@
 
     if-gez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -174,7 +174,7 @@
 
     invoke-static {p4, v0, p1}, Lcom/google/android/gms/measurement/internal/gr;->a(Lcom/google/android/gms/measurement/internal/gs;Landroid/os/Bundle;Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p1
 
@@ -190,15 +190,15 @@
 .method public final ah(J)V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gr;->yM()Lcom/google/android/gms/measurement/internal/gs;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gr;->yK()Lcom/google/android/gms/measurement/internal/gs;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/a;->aDg:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/a;->aDy:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -221,7 +221,7 @@
 
     check-cast v2, Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/a;->aDg:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/a;->aDy:Ljava/util/Map;
 
     invoke-interface {v3, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -240,7 +240,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/a;->aDg:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/a;->aDy:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->isEmpty()Z
 
@@ -248,7 +248,7 @@
 
     if-nez v1, :cond_1
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/a;->aDi:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/a;->aDA:J
 
     sub-long v1, p1, v1
 
@@ -263,7 +263,7 @@
 .method final ai(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/a;->aDg:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/a;->aDy:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -286,7 +286,7 @@
 
     check-cast v1, Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/a;->aDg:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/a;->aDy:Ljava/util/Map;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -297,7 +297,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/a;->aDg:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/a;->aDy:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -305,7 +305,7 @@
 
     if-nez v0, :cond_1
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/a;->aDi:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/a;->aDA:J
 
     :cond_1
     return-void
@@ -325,7 +325,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -339,15 +339,15 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Ad unit id must be a non-empty string"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 .end method
@@ -366,7 +366,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -380,15 +380,15 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Ad unit id must be a non-empty string"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 .end method
@@ -403,176 +403,176 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->ma()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vA()V
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/fr;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vA()Lcom/google/android/gms/measurement/internal/fr;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/cz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/gw;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/gw;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/gr;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/dd;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/dd;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/hx;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/hx;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vG()Lcom/google/android/gms/measurement/internal/d;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vH()Lcom/google/android/gms/common/util/e;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vI()Lcom/google/android/gms/measurement/internal/df;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vJ()Lcom/google/android/gms/measurement/internal/it;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vK()Lcom/google/android/gms/measurement/internal/ed;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vL()Lcom/google/android/gms/measurement/internal/dh;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vM()Lcom/google/android/gms/measurement/internal/dp;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vN()Lcom/google/android/gms/measurement/internal/jb;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vx()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/a;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/a;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/fr;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/fr;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/cz;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/gw;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/gw;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/gr;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/dd;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vG()Lcom/google/android/gms/measurement/internal/dd;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vH()Lcom/google/android/gms/measurement/internal/hx;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vH()Lcom/google/android/gms/measurement/internal/hx;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vI()Lcom/google/android/gms/measurement/internal/d;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vJ()Lcom/google/android/gms/common/util/e;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vK()Lcom/google/android/gms/measurement/internal/df;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vL()Lcom/google/android/gms/measurement/internal/it;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vM()Lcom/google/android/gms/measurement/internal/ed;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vN()Lcom/google/android/gms/measurement/internal/dh;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vO()Lcom/google/android/gms/measurement/internal/dp;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vP()Lcom/google/android/gms/measurement/internal/jb;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vy()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vy()V
 
     return-void
 .end method
+
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/a;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/cb;->vz()Lcom/google/android/gms/measurement/internal/a;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aa.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aa.smali
index f6be0547f5..2a978b2cf8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aa.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aa.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/aa;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/aa;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/aa;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xh()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xf()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ab.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ab.smali
index 6757e4ecd3..27e5bfa62e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ab.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ab.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ab;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ab;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ab;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xi()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xg()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ac.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ac.smali
index 10ef068928..bd251b7d46 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ac.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ac.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ac;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ac;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ac;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xf()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xd()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ad.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ad.smali
index e9ef4f5387..5626ef1031 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ad.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ad.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ad;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ad;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ad;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xg()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xe()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ae.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ae.smali
index 8e06e599b8..878565b74a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ae.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ae.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ae;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ae;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ae;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xd()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xb()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/af.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/af.smali
index b4afef89ca..246141cd3b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/af.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/af.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/af;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/af;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/af;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xe()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xc()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ag.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ag.smali
index 69a9b08304..db5c60f6c1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ag.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ag.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ag;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ag;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ag;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xb()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wZ()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ah.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ah.smali
index 81d7b7faaa..e0769cc2cd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ah.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ah.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ah;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ah;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ah;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xc()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xa()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ai.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ai.smali
index b01295147c..0a61474ade 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ai.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ai.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ai;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ai;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ai;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xA()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xy()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aj.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aj.smali
index 83f652dbab..938ce86049 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aj.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/aj;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/aj;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/aj;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xa()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wY()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ak.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ak.smali
index cf1a1b3038..c33beeb62b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ak.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ak.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ak;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ak;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ak;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wY()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wW()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/al.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/al.smali
index 42ccc71898..455a94ac08 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/al.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/al.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/al;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/al;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/al;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wZ()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wX()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/am.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/am.smali
index fdb1cac787..532ce40fbf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/am.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/am.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/am;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/am;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/am;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wW()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wU()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/an.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/an.smali
index a4a6a8f898..1cd4018511 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/an.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/an.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/an;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/an;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/an;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wX()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wV()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ao.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ao.smali
index 4d2363620a..98fcf259e7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ao.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ao.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ao;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ao;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ao;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wU()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wS()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ap.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ap.smali
index 431a007ec8..cfc123d42f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ap.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ap.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ap;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ap;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wV()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wT()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aq.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aq.smali
index 6f196546e1..ee5bac7098 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aq.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/aq;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/aq;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/aq;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wS()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wQ()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ar.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ar.smali
index 7c12925e51..2f1ef7c196 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ar.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ar.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ar;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ar;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ar;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wT()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wR()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/as.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/as.smali
index bbcaa82931..19a941ae62 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/as.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/as.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/as;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/as;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/as;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wQ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wO()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/at.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/at.smali
index 1e5685c179..d28693d27c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/at.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/at.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/at;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/at;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/at;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wR()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wP()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/au.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/au.smali
index d1d5226e76..38ffb817d0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/au.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/au.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/au;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/au;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/au;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wP()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wN()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/av.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/av.smali
index d415dc5070..e21bc84b2f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/av.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/av.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/av;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/av;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/av;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xz()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xx()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aw.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aw.smali
index 137370e12d..ebf222ff17 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aw.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/aw;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/aw;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/aw;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wN()Ljava/lang/Double;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wL()Ljava/lang/Double;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ax.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ax.smali
index 4293480d1b..1e1f9b55e3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ax.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ax.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ax;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ax;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ax;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wO()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wM()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ay.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ay.smali
index ded44848d5..743a836b6f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ay.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ay.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ay;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ay;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ay;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wL()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wJ()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/az.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/az.smali
index 6b7e285fa4..11ae036376 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/az.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/az.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/az;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/az;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/az;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wM()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wK()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/b.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/b.smali
index b7f36be409..0454d9ef77 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/b.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final aDj:Lcom/google/android/gms/measurement/internal/fj;
+.field private final aDB:Lcom/google/android/gms/measurement/internal/fj;
 
-.field private final aDk:Ljava/lang/Runnable;
+.field private final aDC:Ljava/lang/Runnable;
 
-.field private volatile aDl:J
+.field private volatile aDD:J
 
 
 # direct methods
@@ -22,13 +22,13 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/b;->aDj:Lcom/google/android/gms/measurement/internal/fj;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/b;->aDB:Lcom/google/android/gms/measurement/internal/fj;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/e;
 
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/measurement/internal/e;-><init>(Lcom/google/android/gms/measurement/internal/b;Lcom/google/android/gms/measurement/internal/fj;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDk:Ljava/lang/Runnable;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDC:Ljava/lang/Runnable;
 
     return-void
 .end method
@@ -38,7 +38,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDl:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDD:J
 
     return-wide v0
 .end method
@@ -66,7 +66,7 @@
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/ft;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/b;->aDj:Lcom/google/android/gms/measurement/internal/fj;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/b;->aDB:Lcom/google/android/gms/measurement/internal/fj;
 
     invoke-interface {v2}, Lcom/google/android/gms/measurement/internal/fj;->getContext()Landroid/content/Context;
 
@@ -110,9 +110,9 @@
 
     if-ltz v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDj:Lcom/google/android/gms/measurement/internal/fj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDB:Lcom/google/android/gms/measurement/internal/fj;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fj;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fj;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -120,13 +120,13 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDl:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDD:J
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/b;->getHandler()Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/b;->aDk:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/b;->aDC:Ljava/lang/Runnable;
 
     invoke-virtual {v0, v1, p1, p2}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z
 
@@ -134,13 +134,13 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDj:Lcom/google/android/gms/measurement/internal/fj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDB:Lcom/google/android/gms/measurement/internal/fj;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fj;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fj;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -159,13 +159,13 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDl:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDD:J
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/b;->getHandler()Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/b;->aDk:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/b;->aDC:Ljava/lang/Runnable;
 
     invoke-virtual {v0, v1}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
 
@@ -175,10 +175,10 @@
 .method public abstract run()V
 .end method
 
-.method public final vQ()Z
+.method public final vO()Z
     .locals 5
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDl:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/b;->aDD:J
 
     const-wide/16 v2, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ba.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ba.smali
index 554e3bd32f..14e2b08eac 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ba.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ba.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic aFy:J
+.field private final synthetic aFQ:J
 
-.field private final synthetic aFz:Lcom/google/android/gms/measurement/internal/a;
+.field private final synthetic aFR:Lcom/google/android/gms/measurement/internal/a;
 
-.field private final synthetic aqw:Ljava/lang/String;
+.field private final synthetic aqO:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/a;Ljava/lang/String;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ba;->aFz:Lcom/google/android/gms/measurement/internal/a;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ba;->aFR:Lcom/google/android/gms/measurement/internal/a;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ba;->aqw:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ba;->aqO:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/ba;->aFy:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/ba;->aFQ:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,17 +33,17 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ba;->aFz:Lcom/google/android/gms/measurement/internal/a;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ba;->aFR:Lcom/google/android/gms/measurement/internal/a;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ba;->aqw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ba;->aqO:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ba;->aFy:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ba;->aFQ:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDh:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDz:Ljava/util/Map;
 
     invoke-interface {v4}, Ljava/util/Map;->isEmpty()Z
 
@@ -51,10 +51,10 @@
 
     if-eqz v4, :cond_0
 
-    iput-wide v2, v0, Lcom/google/android/gms/measurement/internal/a;->aDi:J
+    iput-wide v2, v0, Lcom/google/android/gms/measurement/internal/a;->aDA:J
 
     :cond_0
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDh:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDz:Ljava/util/Map;
 
     invoke-interface {v4, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -66,7 +66,7 @@
 
     if-eqz v4, :cond_1
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/a;->aDh:Ljava/util/Map;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/a;->aDz:Ljava/util/Map;
 
     invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
 
@@ -83,7 +83,7 @@
     return-void
 
     :cond_1
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDh:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDz:Ljava/util/Map;
 
     invoke-interface {v4}, Ljava/util/Map;->size()I
 
@@ -93,20 +93,20 @@
 
     if-lt v4, v6, :cond_2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Too many ads visible"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_2
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDh:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDz:Ljava/util/Map;
 
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -114,7 +114,7 @@
 
     invoke-interface {v4, v1, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/a;->aDg:Ljava/util/Map;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/a;->aDy:Ljava/util/Map;
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bb.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bb.smali
index 563dc60ae4..0ab5bbd5a9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bb.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bb;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bb;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bb;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wJ()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wH()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bc.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bc.smali
index d338756fa2..d8b56113d6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bc.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bc;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bc;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bc;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wK()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wI()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bd.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bd.smali
index 01791587ab..b06ce6f7b6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bd.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bd;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bd;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bd;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wH()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wF()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/be.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/be.smali
index b200cf01c3..48de90aff4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/be.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/be.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/be;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/be;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/be;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wI()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wG()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bf.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bf.smali
index c4a66f99e6..48ae6c3411 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bf.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bf;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bf;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bf;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xy()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xw()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bg.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bg.smali
index fe0353de88..afcded483c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bg.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bg;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bg;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bg;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wG()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wE()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bh.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bh.smali
index 567ba96d9e..1db2366dfb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bh.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bh;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bh;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bh;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wE()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wC()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bi.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bi.smali
index 9cedaf78a7..acfc8b8383 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bi.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bi.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bi;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bi;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bi;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wF()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wD()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bj.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bj.smali
index 7c5dda13c2..54724f7e18 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bj.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bj;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bj;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bj;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wC()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wA()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bk.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bk.smali
index 1f5c57e48b..28fbbe067e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bk.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bk;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bk;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bk;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wD()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wB()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bl.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bl.smali
index 109a8a871f..3defe63562 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bl.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bl;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bl;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bl;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wA()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wy()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bm.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bm.smali
index 7434855bd6..835777c72c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bm.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bm;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bm;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bm;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wB()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wz()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bn.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bn.smali
index 88cf54a4ed..6853b31498 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bn.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bn;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bn;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bn;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wy()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->ww()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bo.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bo.smali
index f2a6eddc6a..fac6506356 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bo.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bo.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bo;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bo;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bo;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wz()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wx()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bp.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bp.smali
index 677b0c2df3..ccdc07da6f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bp.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bp;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bp;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bp;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->ww()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wu()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bq.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bq.smali
index a91703d5a9..883bb138e3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bq.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bq;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bq;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bq;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wx()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wv()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/br.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/br.smali
index 7495265ac2..47c19352ab 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/br.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/br.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/br;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/br;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/br;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wv()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wt()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bs.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bs.smali
index 3d24ed37c9..27e84ca27a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bs.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bs;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bs;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bs;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xx()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xv()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bt.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bt.smali
index 182dfb43b1..bdb6982448 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bt.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bt.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bt;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bt;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bt;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wt()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wr()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bu.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bu.smali
index adb1dcf545..7ced665779 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bu.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bu;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bu;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bu;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wu()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->ws()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bv.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bv.smali
index 4f28cd95e3..ae49d2e0d0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bv.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bv;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bv;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bv;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wr()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wp()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bw.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bw.smali
index 3963e50cd8..bfbc48b24b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bw.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bw;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bw;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bw;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->ws()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wq()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bx.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bx.smali
index 6cf377fc84..9510bd18dc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bx.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bx;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bx;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bx;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wp()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wn()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/by.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/by.smali
index 6e882af569..8af671aa6d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/by.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/by.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/by;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/by;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/by;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wq()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wo()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bz.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bz.smali
index 8b7546ba2a..03dddf6cca 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/bz.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bz;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bz;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bz;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wn()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wl()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/c.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/c.smali
index 03c621e413..a4c34be9c3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/c.smali
@@ -24,11 +24,11 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to turn off database read permission"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0, p1, p1}, Ljava/io/File;->setWritable(ZZ)Z
@@ -37,11 +37,11 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Failed to turn off database write permission"
 
-    invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_1
     const/4 p1, 0x1
@@ -52,11 +52,11 @@
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to turn on database read permission for owner"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_2
     invoke-virtual {v0, p1, p1}, Ljava/io/File;->setWritable(ZZ)Z
@@ -65,11 +65,11 @@
 
     if-nez p1, :cond_3
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p1, "Failed to turn on database write permission for owner"
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_3
     return-void
@@ -220,7 +220,7 @@
 
     if-nez p1, :cond_5
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p4, "Table has extra columns. table, columns"
 
@@ -250,7 +250,7 @@
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
 
     :goto_2
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Failed to verify columns on table that was just created"
 
@@ -333,7 +333,7 @@
     move-exception p1
 
     :try_start_1
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Error querying for table"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ca.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ca.smali
index 0f6d47d6a6..2456295c60 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ca.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ca.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ca;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ca;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ca;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wo()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wm()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cb.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cb.smali
index 98d93abd76..2f87b80c0e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cb.smali
@@ -18,122 +18,122 @@
 
 
 # virtual methods
-.method public mc()V
+.method public ma()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     return-void
 .end method
 
-.method public vA()V
+.method public vA()Lcom/google/android/gms/measurement/internal/fr;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vA()V
-
-    return-void
-.end method
-
-.method public vB()Lcom/google/android/gms/measurement/internal/a;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aCX:Lcom/google/android/gms/measurement/internal/ek;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vC()Lcom/google/android/gms/measurement/internal/fr;
+.method public vB()Lcom/google/android/gms/measurement/internal/cz;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vD()Lcom/google/android/gms/measurement/internal/cz;
+.method public vC()Lcom/google/android/gms/measurement/internal/gw;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vE()Lcom/google/android/gms/measurement/internal/gw;
+.method public vD()Lcom/google/android/gms/measurement/internal/gr;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vF()Lcom/google/android/gms/measurement/internal/gr;
+.method public vE()Lcom/google/android/gms/measurement/internal/dd;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vG()Lcom/google/android/gms/measurement/internal/dd;
+.method public vF()Lcom/google/android/gms/measurement/internal/hx;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vH()Lcom/google/android/gms/measurement/internal/hx;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aCX:Lcom/google/android/gms/measurement/internal/ek;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/measurement/internal/hx;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public vz()V
+.method public vx()V
     .locals 0
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ek;->vz()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ek;->vx()V
 
     return-void
 .end method
+
+.method public vy()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aDp:Lcom/google/android/gms/measurement/internal/ek;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vy()V
+
+    return-void
+.end method
+
+.method public vz()Lcom/google/android/gms/measurement/internal/a;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aDp:Lcom/google/android/gms/measurement/internal/ek;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vz()Lcom/google/android/gms/measurement/internal/a;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cc.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cc.smali
index f2156becb0..ef5676f90c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cc.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cc;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cc;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cc;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xw()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xu()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cd.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cd.smali
index 4452be95fa..7c07b231ab 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cd.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cd;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cd;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cd;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wm()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wk()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ce.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ce.smali
index 5689ce4cbc..639bacb93c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ce.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ce.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ce;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ce;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ce;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wk()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wi()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cf.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cf.smali
index 65f22a982b..c07a721c77 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cf.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cf;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cf;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cf;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wl()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wj()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cg.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cg.smali
index 48aa26da41..83e59021a4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cg.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cg;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cg;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cg;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wi()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wg()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ch.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ch.smali
index 91d70a1374..cba4fa577f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ch.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ch.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ch;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ch;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ch;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wj()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wh()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ci.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ci.smali
index 8179090814..76eeb242ad 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ci.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ci.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ci;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ci;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ci;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wg()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->we()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cj.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cj.smali
index b70de563c5..4d399a0f19 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cj.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cj;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cj;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cj;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wh()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wf()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ck.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ck.smali
index 538327a861..a90d12262a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ck.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ck.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ck;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ck;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ck;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->we()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wc()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cl.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cl.smali
index a5d76c91b3..186c11f299 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cl.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cl;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cl;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cl;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wf()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wd()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cm.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cm.smali
index c1fc05e722..6fe6aeb689 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cm.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cm;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cm;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cm;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wc()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wa()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cn.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cn.smali
index 0ecc91cb25..247fdad460 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cn.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cn;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cn;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cn;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wd()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wb()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/co.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/co.smali
index 298d74241b..1dc53f9b73 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/co.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/co.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/co;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/co;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/co;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wb()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->vZ()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cp.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cp.smali
index 43dabf91a8..d1c739444e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cp.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cp;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cp;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cp;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xv()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xt()Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cq.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cq.smali
index 88447ebf8f..7eefb14ea6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cq.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cq;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cq;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cq;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->vZ()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->vX()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cr.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cr.smali
index fca69cf9f5..dc189774cd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cr.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cr;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cr;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cr;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->wa()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->vY()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cs.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cs.smali
index 8ce36cda44..2cf830d732 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cs.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cs;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cs;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cs;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->vX()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->vV()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ct.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ct.smali
index 4a8f59c32b..0e4735d6cc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ct.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ct.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ct;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ct;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ct;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->vY()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->vW()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cu.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cu.smali
index f1ad13a22b..8c24a2bad4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cu.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cu;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cu;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cu;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xu()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xs()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cv.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cv.smali
index 80abc9f27c..13cc008a72 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cv.smali
@@ -14,13 +14,13 @@
 
 
 # static fields
-.field private static final aFF:Ljava/lang/Object;
+.field private static final aFX:Ljava/lang/Object;
 
 
 # instance fields
-.field final aFA:Ljava/lang/String;
+.field final aFS:Ljava/lang/String;
 
-.field private final aFB:Lcom/google/android/gms/measurement/internal/cw;
+.field private final aFT:Lcom/google/android/gms/measurement/internal/cw;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cw<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field private final aFC:Ljava/lang/Object;
+.field private final aFU:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private final aFD:Ljava/lang/Object;
+.field private final aFV:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -45,9 +45,9 @@
     .end annotation
 .end field
 
-.field private final aFE:Ljava/lang/Object;
+.field private final aFW:Ljava/lang/Object;
 
-.field private volatile aFG:Ljava/lang/Object;
+.field private volatile aFY:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -55,7 +55,7 @@
     .end annotation
 .end field
 
-.field private volatile ash:Ljava/lang/Object;
+.field private volatile asz:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -72,7 +72,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cv;->aFF:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cv;->aFX:Ljava/lang/Object;
 
     return-void
 .end method
@@ -95,21 +95,21 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->aFE:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->aFW:Ljava/lang/Object;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->aFG:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->aFY:Ljava/lang/Object;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->ash:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->asz:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->aFA:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->aFS:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/cv;->aFC:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/cv;->aFU:Ljava/lang/Object;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/cv;->aFD:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/cv;->aFV:Ljava/lang/Object;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/cv;->aFB:Lcom/google/android/gms/measurement/internal/cw;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/cv;->aFT:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -132,12 +132,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->aFE:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->aFW:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cv;->aFG:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cv;->aFY:Ljava/lang/Object;
 
     monitor-exit v0
     :try_end_0
@@ -148,18 +148,18 @@
     return-object p1
 
     :cond_0
-    sget-object p1, Lcom/google/android/gms/measurement/internal/j;->aDK:Lcom/google/android/gms/measurement/internal/ja;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/j;->aEc:Lcom/google/android/gms/measurement/internal/ja;
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->aFC:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->aFU:Ljava/lang/Object;
 
     return-object p1
 
     :cond_1
-    sget-object p1, Lcom/google/android/gms/measurement/internal/j;->aDK:Lcom/google/android/gms/measurement/internal/ja;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/j;->aEc:Lcom/google/android/gms/measurement/internal/ja;
 
-    sget-object p1, Lcom/google/android/gms/measurement/internal/cv;->aFF:Ljava/lang/Object;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/cv;->aFX:Ljava/lang/Object;
 
     monitor-enter p1
 
@@ -170,16 +170,16 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->ash:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->asz:Ljava/lang/Object;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->aFC:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->aFU:Ljava/lang/Object;
 
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->ash:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cv;->asz:Ljava/lang/Object;
 
     :goto_0
     monitor-exit p1
@@ -193,12 +193,12 @@
 
     if-nez v0, :cond_8
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aDK:Lcom/google/android/gms/measurement/internal/ja;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEc:Lcom/google/android/gms/measurement/internal/ja;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xE()Ljava/util/List;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xC()Ljava/util/List;
 
     move-result-object v0
 
@@ -219,7 +219,7 @@
 
     check-cast v1, Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/cv;->aFF:Ljava/lang/Object;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/cv;->aFX:Ljava/lang/Object;
 
     monitor-enter v2
     :try_end_2
@@ -233,11 +233,11 @@
 
     if-nez v3, :cond_5
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/cv;->aFB:Lcom/google/android/gms/measurement/internal/cw;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/cv;->aFT:Lcom/google/android/gms/measurement/internal/cw;
 
     if-eqz v3, :cond_4
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/cv;->aFB:Lcom/google/android/gms/measurement/internal/cw;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/cv;->aFT:Lcom/google/android/gms/measurement/internal/cw;
 
     invoke-interface {v3}, Lcom/google/android/gms/measurement/internal/cw;->get()Ljava/lang/Object;
 
@@ -249,7 +249,7 @@
     const/4 v3, 0x0
 
     :goto_2
-    iput-object v3, v1, Lcom/google/android/gms/measurement/internal/cv;->ash:Ljava/lang/Object;
+    iput-object v3, v1, Lcom/google/android/gms/measurement/internal/cv;->asz:Ljava/lang/Object;
 
     monitor-exit v2
 
@@ -288,13 +288,13 @@
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->aFB:Lcom/google/android/gms/measurement/internal/cw;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->aFT:Lcom/google/android/gms/measurement/internal/cw;
 
     if-nez p1, :cond_7
 
-    sget-object p1, Lcom/google/android/gms/measurement/internal/j;->aDK:Lcom/google/android/gms/measurement/internal/ja;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/j;->aEc:Lcom/google/android/gms/measurement/internal/ja;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->aFC:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->aFU:Ljava/lang/Object;
 
     return-object p1
 
@@ -313,9 +313,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/j;->e(Ljava/lang/Exception;)V
 
-    sget-object p1, Lcom/google/android/gms/measurement/internal/j;->aDK:Lcom/google/android/gms/measurement/internal/ja;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/j;->aEc:Lcom/google/android/gms/measurement/internal/ja;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->aFC:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/cv;->aFU:Ljava/lang/Object;
 
     return-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cz.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cz.smali
index 6be268adec..256306934e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cz.smali
@@ -3,23 +3,23 @@
 
 
 # instance fields
-.field private aAL:J
+.field private aBd:J
 
-.field private aDu:Ljava/lang/String;
+.field private aDM:Ljava/lang/String;
 
-.field private aFH:Ljava/lang/String;
+.field private aFZ:Ljava/lang/String;
 
-.field private aFI:I
+.field private aGa:I
 
-.field private aFJ:Ljava/lang/String;
+.field private aGb:Ljava/lang/String;
 
-.field private aFK:Ljava/lang/String;
+.field private aGc:Ljava/lang/String;
 
-.field private aFL:J
+.field private aGd:J
 
-.field private aFM:J
+.field private aGe:J
 
-.field aFN:Ljava/util/List;
+.field aGf:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,11 +29,11 @@
     .end annotation
 .end field
 
-.field private aFO:I
+.field private aGg:I
 
-.field private aFP:Ljava/lang/String;
+.field private aGh:Ljava/lang/String;
 
-.field private aro:Ljava/lang/String;
+.field private arG:Ljava/lang/String;
 
 
 # direct methods
@@ -42,12 +42,12 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/fb;-><init>(Lcom/google/android/gms/measurement/internal/ek;)V
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/cz;->aAL:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/cz;->aBd:J
 
     return-void
 .end method
 
-.method private final on()Ljava/lang/String;
+.method private final ol()Ljava/lang/String;
     .locals 7
 
     const/4 v0, 0x0
@@ -132,28 +132,28 @@
     return-object v1
 
     :catch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to retrieve Firebase Instance Id"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-object v0
 
     :catch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGj:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGB:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to obtain Firebase Analytics instance"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :catch_2
     return-object v0
@@ -161,16 +161,16 @@
 
 
 # virtual methods
-.method final ci(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzn;
+.method final ce(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzn;
     .locals 33
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     new-instance v29, Lcom/google/android/gms/measurement/internal/zzn;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v2
 
@@ -178,25 +178,25 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/cz;->aFH:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/cz;->aFZ:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->xH()I
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->xF()I
 
     move-result v1
 
     int-to-long v5, v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    iget-object v7, v0, Lcom/google/android/gms/measurement/internal/cz;->aFJ:Ljava/lang/String;
+    iget-object v7, v0, Lcom/google/android/gms/measurement/internal/cz;->aGb:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v8, v0, Lcom/google/android/gms/measurement/internal/cz;->aFL:J
+    iget-wide v8, v0, Lcom/google/android/gms/measurement/internal/cz;->aGd:J
 
     const-wide/16 v10, 0x0
 
@@ -204,9 +204,9 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cz;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cz;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v1
 
@@ -226,30 +226,30 @@
 
     move-result-wide v8
 
-    iput-wide v8, v0, Lcom/google/android/gms/measurement/internal/cz;->aFL:J
+    iput-wide v8, v0, Lcom/google/android/gms/measurement/internal/cz;->aGd:J
 
     :cond_0
-    iget-wide v12, v0, Lcom/google/android/gms/measurement/internal/cz;->aFL:J
+    iget-wide v12, v0, Lcom/google/android/gms/measurement/internal/cz;->aGd:J
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cz;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cz;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
     move-result v14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    iget-boolean v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aGZ:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aHr:Z
 
     const/4 v8, 0x1
 
     xor-int/lit8 v15, v1, 0x1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cz;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cz;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
@@ -262,24 +262,24 @@
     goto :goto_0
 
     :cond_1
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->on()Ljava/lang/String;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->ol()Ljava/lang/String;
 
     move-result-object v1
 
     move-object/from16 v16, v1
 
     :goto_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    iget-wide v8, v0, Lcom/google/android/gms/measurement/internal/cz;->aFM:J
+    iget-wide v8, v0, Lcom/google/android/gms/measurement/internal/cz;->aGe:J
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cz;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cz;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dp;->aGL:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dp;->aHd:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -299,7 +299,7 @@
 
     if-nez v11, :cond_2
 
-    iget-wide v10, v1, Lcom/google/android/gms/measurement/internal/ek;->aIT:J
+    iget-wide v10, v1, Lcom/google/android/gms/measurement/internal/ek;->aJl:J
 
     move-wide/from16 v19, v8
 
@@ -310,7 +310,7 @@
     :cond_2
     move-wide/from16 v19, v8
 
-    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/ek;->aIT:J
+    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/ek;->aJl:J
 
     invoke-virtual {v10}, Ljava/lang/Long;->longValue()J
 
@@ -323,15 +323,15 @@
     move-wide/from16 v21, v8
 
     :goto_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->xI()I
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->xG()I
 
     move-result v23
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->zr()Ljava/lang/Boolean;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->zp()Ljava/lang/Boolean;
 
     move-result-object v1
 
@@ -339,13 +339,13 @@
 
     move-result v24
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
     const-string v8, "google_analytics_ssaid_collection_enabled"
 
-    invoke-virtual {v1, v8}, Lcom/google/android/gms/measurement/internal/jb;->cZ(Ljava/lang/String;)Ljava/lang/Boolean;
+    invoke-virtual {v1, v8}, Lcom/google/android/gms/measurement/internal/jb;->cV(Ljava/lang/String;)Ljava/lang/Boolean;
 
     move-result-object v1
 
@@ -371,13 +371,13 @@
     const/16 v25, 0x1
 
     :goto_3
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -387,19 +387,19 @@
 
     move-result v26
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->xG()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->xE()Ljava/lang/String;
 
     move-result-object v27
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v8
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/j;->aEY:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v9, Lcom/google/android/gms/measurement/internal/j;->aFq:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v1, v8, v9}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -407,13 +407,13 @@
 
     if-eqz v1, :cond_5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
     const-string v8, "google_analytics_default_allow_ad_personalization_signals"
 
-    invoke-virtual {v1, v8}, Lcom/google/android/gms/measurement/internal/jb;->cZ(Ljava/lang/String;)Ljava/lang/Boolean;
+    invoke-virtual {v1, v8}, Lcom/google/android/gms/measurement/internal/jb;->cV(Ljava/lang/String;)Ljava/lang/Boolean;
 
     move-result-object v1
 
@@ -439,17 +439,17 @@
     const/16 v28, 0x0
 
     :goto_4
-    iget-wide v10, v0, Lcom/google/android/gms/measurement/internal/cz;->aAL:J
+    iget-wide v10, v0, Lcom/google/android/gms/measurement/internal/cz;->aBd:J
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v8
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/j;->aFm:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v9, Lcom/google/android/gms/measurement/internal/j;->aFE:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v1, v8, v9}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -457,7 +457,7 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cz;->aFN:Ljava/util/List;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/cz;->aGf:Ljava/util/List;
 
     move-object/from16 v30, v1
 
@@ -523,190 +523,172 @@
 .method final getGmpAppId()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aro:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cz;->arG:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->ma()V
 
     return-void
 .end method
 
-.method final pY()Ljava/lang/String;
+.method final pW()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aDu:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aDM:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/a;
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/fr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/fr;
+.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/cz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/cz;
+.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/gw;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/gw;
+.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/gr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/gr;
+.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/dd;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/dd;
+.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/hx;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vH()Lcom/google/android/gms/measurement/internal/hx;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vP()Lcom/google/android/gms/measurement/internal/jb;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -714,15 +696,33 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vx()V
 
     return-void
 .end method
 
-.method protected final xF()V
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+
+    return-void
+.end method
+
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/a;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vz()Lcom/google/android/gms/measurement/internal/a;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method protected final xD()V
     .locals 13
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
@@ -753,13 +753,13 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v8
 
@@ -783,13 +783,13 @@
     goto :goto_0
 
     :catch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v8
 
@@ -876,13 +876,13 @@
     move-object v7, v2
 
     :goto_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v9
 
@@ -895,19 +895,19 @@
     move-object v2, v7
 
     :goto_4
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aDu:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aDM:Ljava/lang/String;
 
-    iput-object v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aFJ:Ljava/lang/String;
+    iput-object v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aGb:Ljava/lang/String;
 
-    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/cz;->aFH:Ljava/lang/String;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/cz;->aFZ:Ljava/lang/String;
 
-    iput v6, p0, Lcom/google/android/gms/measurement/internal/cz;->aFI:I
+    iput v6, p0, Lcom/google/android/gms/measurement/internal/cz;->aGa:I
 
-    iput-object v8, p0, Lcom/google/android/gms/measurement/internal/cz;->aFK:Ljava/lang/String;
+    iput-object v8, p0, Lcom/google/android/gms/measurement/internal/cz;->aGc:Ljava/lang/String;
 
     const-wide/16 v5, 0x0
 
-    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aFL:J
+    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aGd:J
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
@@ -921,7 +921,7 @@
 
     if-eqz v2, :cond_5
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/api/Status;->kX()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/Status;->kV()Z
 
     move-result v8
 
@@ -935,9 +935,9 @@
     const/4 v8, 0x0
 
     :goto_5
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/cz;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/cz;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ek;->aAP:Ljava/lang/String;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ek;->aBh:Ljava/lang/String;
 
     invoke-static {v9}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -947,9 +947,9 @@
 
     if-nez v9, :cond_6
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/cz;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/cz;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ek;->aIu:Ljava/lang/String;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ek;->aIM:Ljava/lang/String;
 
     invoke-virtual {v10, v9}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -971,32 +971,32 @@
 
     if-nez v2, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v9, "GoogleService failed to initialize (no status)"
 
-    invoke-virtual {v2, v9}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v2, v9}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_7
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget v11, v2, Lcom/google/android/gms/common/api/Status;->adn:I
+    iget v11, v2, Lcom/google/android/gms/common/api/Status;->adF:I
 
     invoke-static {v11}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v11
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/Status;->adp:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/Status;->adH:Ljava/lang/String;
 
     const-string v12, "GoogleService failed to initialize, status"
 
@@ -1006,29 +1006,29 @@
     :goto_7
     if-eqz v8, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v2
 
     const-string v8, "firebase_analytics_collection_enabled"
 
-    invoke-virtual {v2, v8}, Lcom/google/android/gms/measurement/internal/jb;->cZ(Ljava/lang/String;)Ljava/lang/Boolean;
+    invoke-virtual {v2, v8}, Lcom/google/android/gms/measurement/internal/jb;->cV(Ljava/lang/String;)Ljava/lang/Boolean;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v8
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jb;->zq()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jb;->zo()Z
 
     move-result v8
 
     if-eqz v8, :cond_9
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cz;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cz;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ek;->aAP:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ek;->aBh:Ljava/lang/String;
 
     invoke-static {v2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1036,15 +1036,15 @@
 
     if-eqz v2, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Collection disabled with firebase_analytics_collection_deactivated=1"
 
-    invoke-virtual {v2, v8}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v2, v8}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_8
 
@@ -1057,9 +1057,9 @@
 
     if-nez v8, :cond_a
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cz;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cz;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ek;->aAP:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ek;->aBh:Ljava/lang/String;
 
     invoke-static {v2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1067,49 +1067,49 @@
 
     if-eqz v2, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Collection disabled with firebase_analytics_collection_enabled=0"
 
-    invoke-virtual {v2, v8}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v2, v8}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_8
 
     :cond_a
     if-nez v2, :cond_b
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lJ()Z
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lH()Z
 
     move-result v2
 
     if-eqz v2, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Collection disabled with google_app_measurement_enable=0"
 
-    invoke-virtual {v2, v8}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v2, v8}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_8
 
     :cond_b
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Collection enabled"
 
-    invoke-virtual {v2, v8}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v2, v8}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
@@ -1120,15 +1120,15 @@
     const/4 v2, 0x0
 
     :goto_9
-    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/cz;->aro:Ljava/lang/String;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/cz;->arG:Ljava/lang/String;
 
-    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/cz;->aFP:Ljava/lang/String;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/cz;->aGh:Ljava/lang/String;
 
-    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aFM:J
+    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aGe:J
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aAP:Ljava/lang/String;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aBh:Ljava/lang/String;
 
     invoke-static {v5}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1136,9 +1136,9 @@
 
     if-nez v5, :cond_d
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIu:Ljava/lang/String;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIM:Ljava/lang/String;
 
     invoke-virtual {v10, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1146,15 +1146,15 @@
 
     if-eqz v5, :cond_d
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aAP:Ljava/lang/String;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aBh:Ljava/lang/String;
 
-    iput-object v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aFP:Ljava/lang/String;
+    iput-object v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aGh:Ljava/lang/String;
 
     :cond_d
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lI()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lG()Ljava/lang/String;
 
     move-result-object v5
 
@@ -1170,7 +1170,7 @@
     move-object v3, v5
 
     :goto_a
-    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/cz;->aro:Ljava/lang/String;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/cz;->arG:Ljava/lang/String;
 
     invoke-static {v5}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1192,22 +1192,22 @@
 
     move-result-object v3
 
-    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/cz;->aFP:Ljava/lang/String;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/cz;->aGh:Ljava/lang/String;
 
     :cond_f
     if-eqz v2, :cond_10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "App package, google app id"
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aDu:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/cz;->aDM:Ljava/lang/String;
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/cz;->aro:Ljava/lang/String;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/cz;->arG:Ljava/lang/String;
 
     invoke-virtual {v2, v3, v5, v6}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
     :try_end_3
@@ -1218,13 +1218,13 @@
     :catch_3
     move-exception v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1236,15 +1236,15 @@
     :goto_b
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aFN:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aGf:Ljava/util/List;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cz;->aDu:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/cz;->aDM:Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/j;->aFm:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/j;->aFE:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -1252,13 +1252,13 @@
 
     if-eqz v0, :cond_14
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     const-string v2, "analytics.safelisted_events"
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/jb;->da(Ljava/lang/String;)Ljava/util/List;
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/jb;->cW(Ljava/lang/String;)Ljava/util/List;
 
     move-result-object v0
 
@@ -1270,15 +1270,15 @@
 
     if-nez v2, :cond_11
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Safelisted event list cannot be empty. Ignoring"
 
-    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :goto_c
     const/4 v7, 0x0
@@ -1303,7 +1303,7 @@
 
     check-cast v3, Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v5
 
@@ -1321,7 +1321,7 @@
     :goto_d
     if-eqz v7, :cond_14
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aFN:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aGf:Ljava/util/List;
 
     :cond_14
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -1340,47 +1340,47 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aFO:I
+    iput v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aGg:I
 
     return-void
 
     :cond_15
-    iput v4, p0, Lcom/google/android/gms/measurement/internal/cz;->aFO:I
+    iput v4, p0, Lcom/google/android/gms/measurement/internal/cz;->aGg:I
 
     return-void
 
     :cond_16
-    iput v4, p0, Lcom/google/android/gms/measurement/internal/cz;->aFO:I
+    iput v4, p0, Lcom/google/android/gms/measurement/internal/cz;->aGg:I
 
     return-void
 .end method
 
-.method final xG()Ljava/lang/String;
+.method final xE()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aFP:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aGh:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method final xH()I
+.method final xF()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    iget v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aFI:I
+    iget v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aGa:I
 
     return v0
 .end method
 
-.method final xI()I
+.method final xG()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    iget v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aFO:I
+    iget v0, p0, Lcom/google/android/gms/measurement/internal/cz;->aGg:I
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/d.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/d.smali
index 1dafe73514..b7cd23822b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/d.smali
@@ -3,17 +3,17 @@
 
 
 # instance fields
-.field private aDm:J
+.field private aDE:J
 
-.field private aDn:Ljava/lang/String;
+.field private aDF:Ljava/lang/String;
 
-.field private aDo:Ljava/lang/Boolean;
+.field private aDG:Ljava/lang/Boolean;
 
-.field private aDp:Landroid/accounts/AccountManager;
+.field private aDH:Landroid/accounts/AccountManager;
 
-.field private aDq:Ljava/lang/Boolean;
+.field private aDI:Ljava/lang/Boolean;
 
-.field aDr:J
+.field aDJ:J
 
 
 # direct methods
@@ -30,13 +30,13 @@
 .method public final ar(Landroid/content/Context;)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDo:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDG:Ljava/lang/Boolean;
 
     if-nez v0, :cond_0
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDo:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDG:Ljava/lang/Boolean;
 
     :try_start_0
     invoke-virtual {p1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
@@ -53,13 +53,13 @@
 
     sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/d;->aDo:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/d;->aDG:Ljava/lang/Boolean;
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/d;->aDo:Ljava/lang/Boolean;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/d;->aDG:Ljava/lang/Boolean;
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -78,103 +78,95 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->ma()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 4
 
     invoke-static {}, Ljava/util/Calendar;->getInstance()Ljava/util/Calendar;
@@ -205,7 +197,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDm:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDE:J
 
     invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale;
 
@@ -267,57 +259,57 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDn:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDF:Ljava/lang/String;
 
     const/4 v0, 0x0
 
     return v0
 .end method
 
-.method public final vS()J
+.method public final vQ()J
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDm:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDE:J
 
     return-wide v0
 .end method
 
-.method public final vT()Ljava/lang/String;
+.method public final vR()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDn:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDF:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method final vU()V
+.method final vS()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDq:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDI:Ljava/lang/Boolean;
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDr:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDJ:J
 
     return-void
 .end method
 
-.method final vV()Z
+.method final vT()Z
     .locals 9
 
     const-string v0, "com.google"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -325,7 +317,7 @@
 
     move-result-wide v1
 
-    iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/d;->aDr:J
+    iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/d;->aDJ:J
 
     sub-long v3, v1, v3
 
@@ -337,10 +329,10 @@
 
     if-lez v8, :cond_0
 
-    iput-object v5, p0, Lcom/google/android/gms/measurement/internal/d;->aDq:Ljava/lang/Boolean;
+    iput-object v5, p0, Lcom/google/android/gms/measurement/internal/d;->aDI:Ljava/lang/Boolean;
 
     :cond_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/d;->aDq:Ljava/lang/Boolean;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/d;->aDI:Ljava/lang/Boolean;
 
     if-eqz v3, :cond_1
 
@@ -365,26 +357,26 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGj:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGB:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Permission error checking for dasher/unicorn accounts"
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/d;->aDr:J
+    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/d;->aDJ:J
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDq:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDI:Ljava/lang/Boolean;
 
     return v4
 
     :cond_2
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/d;->aDp:Landroid/accounts/AccountManager;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/d;->aDH:Landroid/accounts/AccountManager;
 
     if-nez v3, :cond_3
 
@@ -396,11 +388,11 @@
 
     move-result-object v3
 
-    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/d;->aDp:Landroid/accounts/AccountManager;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/d;->aDH:Landroid/accounts/AccountManager;
 
     :cond_3
     :try_start_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/d;->aDp:Landroid/accounts/AccountManager;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/d;->aDH:Landroid/accounts/AccountManager;
 
     const/4 v6, 0x1
 
@@ -428,14 +420,14 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDq:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDI:Ljava/lang/Boolean;
 
-    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/d;->aDr:J
+    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/d;->aDJ:J
 
     return v6
 
     :cond_4
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/d;->aDp:Landroid/accounts/AccountManager;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/d;->aDH:Landroid/accounts/AccountManager;
 
     new-array v7, v6, [Ljava/lang/String;
 
@@ -461,9 +453,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDq:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDI:Ljava/lang/Boolean;
 
-    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/d;->aDr:J
+    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/d;->aDJ:J
     :try_end_0
     .catch Landroid/accounts/AuthenticatorException; {:try_start_0 .. :try_end_0} :catch_2
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
@@ -485,30 +477,38 @@
     move-exception v0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGg:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGy:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Exception checking account types"
 
     invoke-virtual {v3, v5, v0}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_5
-    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/d;->aDr:J
+    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/d;->aDJ:J
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDq:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aDI:Ljava/lang/Boolean;
 
     return v4
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vx()V
+
+    return-void
+.end method
+
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/da.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/da.smali
index f80640f6ca..9bfd719072 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/da.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/da.smali
@@ -37,7 +37,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -83,7 +83,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -131,7 +131,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -182,7 +182,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -219,7 +219,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -246,7 +246,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -269,7 +269,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -294,7 +294,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -317,7 +317,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -338,7 +338,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -359,7 +359,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -382,7 +382,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -413,7 +413,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -434,7 +434,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -476,7 +476,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -511,7 +511,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/s;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/db.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/db.smali
index 569d71d9b0..2cccedb939 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/db.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/db.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aFQ:J
+.field private final synthetic aFR:Lcom/google/android/gms/measurement/internal/a;
 
-.field private final synthetic aFz:Lcom/google/android/gms/measurement/internal/a;
+.field private final synthetic aGi:J
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/a;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/db;->aFz:Lcom/google/android/gms/measurement/internal/a;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/db;->aFR:Lcom/google/android/gms/measurement/internal/a;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/db;->aFQ:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/db;->aGi:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,9 +29,9 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/db;->aFz:Lcom/google/android/gms/measurement/internal/a;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/db;->aFR:Lcom/google/android/gms/measurement/internal/a;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/db;->aFQ:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/db;->aGi:J
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/a;->ai(J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dc.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dc.smali
index aa73de27ad..c5348bdeac 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dc.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic aFR:Lcom/google/android/gms/measurement/internal/dd;
+.field private final synthetic aGj:Lcom/google/android/gms/measurement/internal/dd;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/dd;Landroid/content/Context;Ljava/lang/String;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dc;->aFR:Lcom/google/android/gms/measurement/internal/dd;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dc;->aGj:Lcom/google/android/gms/measurement/internal/dd;
 
     const/4 p1, 0x0
 
@@ -42,21 +42,21 @@
     return-object v0
 
     :catch_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aFR:Lcom/google/android/gms/measurement/internal/dd;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aGj:Lcom/google/android/gms/measurement/internal/dd;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Opening the local database failed, dropping and recreating it"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     const-string v0, "google_app_measurement_local.db"
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dc;->aFR:Lcom/google/android/gms/measurement/internal/dd;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dc;->aGj:Lcom/google/android/gms/measurement/internal/dd;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
@@ -72,13 +72,13 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dc;->aFR:Lcom/google/android/gms/measurement/internal/dd;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dc;->aGj:Lcom/google/android/gms/measurement/internal/dd;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to delete corrupted local db file"
 
@@ -97,13 +97,13 @@
     :catch_1
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dc;->aFR:Lcom/google/android/gms/measurement/internal/dd;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dc;->aGj:Lcom/google/android/gms/measurement/internal/dd;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to open local database. Events will bypass local storage"
 
@@ -122,9 +122,9 @@
 .method public final onCreate(Landroid/database/sqlite/SQLiteDatabase;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aFR:Lcom/google/android/gms/measurement/internal/dd;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aGj:Lcom/google/android/gms/measurement/internal/dd;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
@@ -179,9 +179,9 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aFR:Lcom/google/android/gms/measurement/internal/dd;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aGj:Lcom/google/android/gms/measurement/internal/dd;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dd.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dd.smali
index 3b2916ac50..5fd82b6414 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dd.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field private final aFS:Lcom/google/android/gms/measurement/internal/dc;
+.field private final aGk:Lcom/google/android/gms/measurement/internal/dc;
 
-.field private aFT:Z
+.field private aGl:Z
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {p1, p0, v0, v1}, Lcom/google/android/gms/measurement/internal/dc;-><init>(Lcom/google/android/gms/measurement/internal/dd;Landroid/content/Context;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dd;->aFS:Lcom/google/android/gms/measurement/internal/dc;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dd;->aGk:Lcom/google/android/gms/measurement/internal/dc;
 
     return-void
 .end method
@@ -117,7 +117,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
 
     const/4 v1, 0x0
 
@@ -126,7 +126,7 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dd;->aFS:Lcom/google/android/gms/measurement/internal/dc;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dd;->aGk:Lcom/google/android/gms/measurement/internal/dc;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -136,7 +136,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
 
     return-object v1
 
@@ -144,7 +144,7 @@
     return-object v0
 .end method
 
-.method private final xL()Z
+.method private final xJ()Z
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
@@ -173,9 +173,9 @@
 
     const-string v2, "Error writing entry to local database"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
 
     const/4 v3, 0x0
 
@@ -228,7 +228,7 @@
     if-nez v10, :cond_2
 
     :try_start_1
-    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_1 .. :try_end_1} :catch_1
     .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_1 .. :try_end_1} :catch_6
@@ -319,15 +319,15 @@
     if-ltz v16, :cond_4
 
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Data loss, local db full"
 
-    invoke-virtual {v5, v8}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v5, v8}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     sub-long/2addr v14, v11
 
@@ -355,11 +355,11 @@
 
     if-eqz v5, :cond_4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Different delete count than expected in local db. expected, received, difference"
 
@@ -478,17 +478,17 @@
     invoke-virtual {v8}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
 
     :cond_7
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {v3, v2, v0}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     const/4 v3, 0x1
 
-    iput-boolean v3, v1, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iput-boolean v3, v1, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_3
 
@@ -545,17 +545,17 @@
 
     :goto_5
     :try_start_7
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {v3, v2, v0}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     const/4 v3, 0x1
 
-    iput-boolean v3, v1, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iput-boolean v3, v1, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
     :try_end_7
     .catchall {:try_start_7 .. :try_end_7} :catchall_4
 
@@ -597,15 +597,15 @@
     throw v0
 
     :cond_e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to write entry to local database"
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -622,22 +622,22 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->ma()V
 
     return-void
 .end method
 
-.method public final ot()Z
+.method public final or()Z
     .locals 11
 
     const-string v0, "Error deleting app launch break from local database"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
 
     const/4 v2, 0x0
 
@@ -646,7 +646,7 @@
     return v2
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dd;->xL()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dd;->xJ()Z
 
     move-result v1
 
@@ -675,7 +675,7 @@
 
     if-nez v5, :cond_3
 
-    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_0 .. :try_end_0} :catch_2
     .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_0 .. :try_end_0} :catch_1
@@ -745,15 +745,15 @@
     invoke-virtual {v5}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {v8, v0, v7}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -783,15 +783,15 @@
     move-exception v7
 
     :try_start_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {v8, v0, v7}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
@@ -814,178 +814,160 @@
     throw v0
 
     :cond_8
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Error deleting app launch break from local database in reasonable time"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return v2
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/a;
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/fr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/fr;
+.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/cz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/cz;
+.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/gw;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/gw;
+.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/gr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/gr;
+.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/dd;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/dd;
+.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/hx;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vH()Lcom/google/android/gms/measurement/internal/hx;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vP()Lcom/google/android/gms/measurement/internal/jb;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -993,18 +975,36 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vx()V
 
     return-void
 .end method
 
-.method public final xJ()V
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+
+    return-void
+.end method
+
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/a;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vz()Lcom/google/android/gms/measurement/internal/a;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final xH()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     :try_start_0
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dd;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
@@ -1023,11 +1023,11 @@
 
     if-lez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Reset local analytics data. records"
 
@@ -1045,11 +1045,11 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Error resetting local analytics data. error"
 
@@ -1058,7 +1058,7 @@
     return-void
 .end method
 
-.method public final xK()Ljava/util/List;
+.method public final xI()Ljava/util/List;
     .locals 24
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1073,9 +1073,9 @@
 
     const-string v2, "Error reading entries from local database"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
 
     const/4 v3, 0x0
 
@@ -1088,7 +1088,7 @@
 
     invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dd;->xL()Z
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dd;->xJ()Z
 
     move-result v0
 
@@ -1123,7 +1123,7 @@
     if-nez v15, :cond_3
 
     :try_start_1
-    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteFullException; {:try_start_1 .. :try_end_1} :catch_1
     .catch Landroid/database/sqlite/SQLiteDatabaseLockedException; {:try_start_1 .. :try_end_1} :catch_c
@@ -1155,11 +1155,11 @@
     :try_start_2
     invoke-virtual {v15}, Landroid/database/sqlite/SQLiteDatabase;->beginTransaction()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    sget-object v10, Lcom/google/android/gms/measurement/internal/j;->aFs:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/j;->aFK:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v10}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -1411,15 +1411,15 @@
 
     :catch_3
     :try_start_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v13, "Failed to load event from local database"
 
-    invoke-virtual {v12, v13}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v12, v13}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
     :try_end_a
     .catchall {:try_start_a .. :try_end_a} :catchall_0
 
@@ -1488,13 +1488,13 @@
 
     :catch_4
     :try_start_f
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {v12, v13}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v12, v13}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
     :try_end_f
     .catchall {:try_start_f .. :try_end_f} :catchall_1
 
@@ -1562,13 +1562,13 @@
 
     :catch_5
     :try_start_13
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {v12, v13}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v12, v13}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
     :try_end_13
     .catchall {:try_start_13 .. :try_end_13} :catchall_2
 
@@ -1592,28 +1592,28 @@
     :cond_9
     if-ne v11, v0, :cond_a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v11
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v12, "Skipping app launch break"
 
-    invoke-virtual {v11, v12}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v11, v12}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto/16 :goto_2
 
     :cond_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v11
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v12, "Unknown record type in local database"
 
-    invoke-virtual {v11, v12}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v11, v12}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto/16 :goto_2
 
@@ -1640,15 +1640,15 @@
 
     if-ge v0, v5, :cond_c
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Fewer entries removed from local database than expected"
 
-    invoke-virtual {v0, v5}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v5}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_c
     invoke-virtual {v3}, Landroid/database/sqlite/SQLiteDatabase;->setTransactionSuccessful()V
@@ -1775,15 +1775,15 @@
     invoke-virtual {v3}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
 
     :cond_f
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {v5, v2, v0}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
     :try_end_15
     .catchall {:try_start_15 .. :try_end_15} :catchall_6
 
@@ -1847,15 +1847,15 @@
 
     :goto_d
     :try_start_17
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {v5, v2, v0}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dd;->aFT:Z
+    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dd;->aGl:Z
     :try_end_17
     .catchall {:try_start_17 .. :try_end_17} :catchall_8
 
@@ -1899,15 +1899,15 @@
     throw v0
 
     :cond_16
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to read events from database in reasonable time"
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/de.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/de.smali
index bd9a65dd87..c324ab72fa 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/de.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/de.smali
@@ -55,7 +55,7 @@
     return-object v0
 .end method
 
-.method public final lh()I
+.method public final lf()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -63,7 +63,7 @@
     return v0
 .end method
 
-.method public final lj()Ljava/lang/String;
+.method public final lh()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.measurement.START"
@@ -71,7 +71,7 @@
     return-object v0
 .end method
 
-.method public final lk()Ljava/lang/String;
+.method public final li()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.measurement.internal.IMeasurementService"
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/df.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/df.smali
index 8b15554a3e..1675c081e9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/df.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/df.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final aFU:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aGm:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private static final aFV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aGn:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private static final aFW:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aGo:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -45,19 +45,19 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/df;->aFU:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/df;->aGm:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/df;->aFV:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/df;->aGn:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/df;->aFW:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/df;->aGo:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -208,7 +208,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->ou()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->os()Z
 
     move-result v0
 
@@ -221,7 +221,7 @@
     return-object p1
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzah;->vW()Landroid/os/Bundle;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzah;->vU()Landroid/os/Bundle;
 
     move-result-object p1
 
@@ -232,12 +232,12 @@
     return-object p1
 .end method
 
-.method private final ou()Z
+.method private final os()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/df;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/df;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aAP:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aBh:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -245,9 +245,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/df;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/df;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
@@ -281,7 +281,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->ou()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->os()Z
 
     move-result v0
 
@@ -302,7 +302,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -312,7 +312,7 @@
 
     iget-object v1, p1, Lcom/google/android/gms/measurement/internal/g;->name:Ljava/lang/String;
 
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -322,7 +322,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/g;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/g;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/df;->b(Lcom/google/android/gms/measurement/internal/zzah;)Ljava/lang/String;
 
@@ -351,7 +351,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->ou()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->os()Z
 
     move-result v0
 
@@ -372,7 +372,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -382,7 +382,7 @@
 
     iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -392,7 +392,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/df;->b(Lcom/google/android/gms/measurement/internal/zzah;)Ljava/lang/String;
 
@@ -407,7 +407,7 @@
     return-object p1
 .end method
 
-.method protected final cj(Ljava/lang/String;)Ljava/lang/String;
+.method protected final cf(Ljava/lang/String;)Ljava/lang/String;
     .locals 3
 
     if-nez p1, :cond_0
@@ -417,7 +417,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->ou()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->os()Z
 
     move-result v0
 
@@ -426,11 +426,11 @@
     return-object p1
 
     :cond_1
-    sget-object v0, Lcom/google/android/gms/measurement/internal/fl;->aJj:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fl;->aJB:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fl;->aJi:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fl;->aJA:[Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/df;->aFU:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/df;->aGm:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {p1, v0, v1, v2}, Lcom/google/android/gms/measurement/internal/df;->a(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/String;
 
@@ -439,7 +439,7 @@
     return-object p1
 .end method
 
-.method protected final ck(Ljava/lang/String;)Ljava/lang/String;
+.method protected final cg(Ljava/lang/String;)Ljava/lang/String;
     .locals 3
 
     if-nez p1, :cond_0
@@ -449,7 +449,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->ou()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->os()Z
 
     move-result v0
 
@@ -458,11 +458,11 @@
     return-object p1
 
     :cond_1
-    sget-object v0, Lcom/google/android/gms/measurement/internal/fk;->aJh:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fk;->aJz:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fk;->aJg:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fk;->aJy:[Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/df;->aFV:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/df;->aGn:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {p1, v0, v1, v2}, Lcom/google/android/gms/measurement/internal/df;->a(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/String;
 
@@ -471,7 +471,7 @@
     return-object p1
 .end method
 
-.method protected final cl(Ljava/lang/String;)Ljava/lang/String;
+.method protected final ch(Ljava/lang/String;)Ljava/lang/String;
     .locals 3
 
     if-nez p1, :cond_0
@@ -481,7 +481,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->ou()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->os()Z
 
     move-result v0
 
@@ -523,11 +523,11 @@
     return-object p1
 
     :cond_2
-    sget-object v0, Lcom/google/android/gms/measurement/internal/fn;->aJl:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fn;->aJD:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fn;->aJk:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fn;->aJC:[Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/df;->aFW:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/df;->aGo:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {p1, v0, v1, v2}, Lcom/google/android/gms/measurement/internal/df;->a(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/String;
 
@@ -546,7 +546,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->ou()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/df;->os()Z
 
     move-result v0
 
@@ -602,7 +602,7 @@
     invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :goto_1
-    invoke-virtual {p0, v2}, Lcom/google/android/gms/measurement/internal/df;->ck(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p0, v2}, Lcom/google/android/gms/measurement/internal/df;->cg(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
@@ -642,103 +642,95 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->ma()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -746,10 +738,18 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vx()V
+
+    return-void
+.end method
+
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dg.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dg.smali
index 385fc37f7b..4a76eac85e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dg.smali
@@ -6,34 +6,34 @@
 
 
 # instance fields
-.field private final synthetic aFX:I
+.field private final synthetic aGp:I
 
-.field private final synthetic aFY:Ljava/lang/String;
+.field private final synthetic aGq:Ljava/lang/String;
 
-.field private final synthetic aFZ:Ljava/lang/Object;
+.field private final synthetic aGr:Ljava/lang/Object;
 
-.field private final synthetic aGa:Ljava/lang/Object;
+.field private final synthetic aGs:Ljava/lang/Object;
 
-.field private final synthetic aGb:Ljava/lang/Object;
+.field private final synthetic aGt:Ljava/lang/Object;
 
-.field private final synthetic aGc:Lcom/google/android/gms/measurement/internal/dh;
+.field private final synthetic aGu:Lcom/google/android/gms/measurement/internal/dh;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/dh;ILjava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
-    iput p2, p0, Lcom/google/android/gms/measurement/internal/dg;->aFX:I
+    iput p2, p0, Lcom/google/android/gms/measurement/internal/dg;->aGp:I
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/dg;->aFY:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/dg;->aGq:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/dg;->aFZ:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/dg;->aGr:Ljava/lang/Object;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/dg;->aGa:Ljava/lang/Object;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/dg;->aGs:Ljava/lang/Object;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/dg;->aGb:Ljava/lang/Object;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/dg;->aGt:Ljava/lang/Object;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,11 +45,11 @@
 .method public final run()V
     .locals 14
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dg;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dg;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
@@ -59,7 +59,7 @@
 
     if-nez v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dg;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dg;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
     const/4 v1, 0x6
 
@@ -70,44 +70,44 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
-    iget-char v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGd:C
+    iget-char v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGv:C
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->zo()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->zm()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
     const/16 v2, 0x43
 
-    iput-char v2, v1, Lcom/google/android/gms/measurement/internal/dh;->aGd:C
+    iput-char v2, v1, Lcom/google/android/gms/measurement/internal/dh;->aGv:C
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
     const/16 v2, 0x63
 
-    iput-char v2, v1, Lcom/google/android/gms/measurement/internal/dh;->aGd:C
+    iput-char v2, v1, Lcom/google/android/gms/measurement/internal/dh;->aGv:C
 
     :cond_2
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
-    iget-wide v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aAK:J
+    iget-wide v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aBc:J
 
     const-wide/16 v3, 0x0
 
@@ -115,14 +115,14 @@
 
     if-gez v5, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
     const-wide/16 v5, 0x3f7a
 
-    iput-wide v5, v1, Lcom/google/android/gms/measurement/internal/dh;->aAK:J
+    iput-wide v5, v1, Lcom/google/android/gms/measurement/internal/dh;->aBc:J
 
     :cond_3
-    iget v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aFX:I
+    iget v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGp:I
 
     const-string v2, "01VDIWEA?"
 
@@ -130,21 +130,21 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dg;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dg;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
-    iget-char v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGd:C
+    iget-char v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGv:C
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/dg;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/dg;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
-    iget-wide v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aAK:J
+    iget-wide v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aBc:J
 
-    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/dg;->aFY:Ljava/lang/String;
+    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/dg;->aGq:Ljava/lang/String;
 
-    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/dg;->aFZ:Ljava/lang/Object;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/dg;->aGr:Ljava/lang/Object;
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/dg;->aGa:Ljava/lang/Object;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/dg;->aGs:Ljava/lang/Object;
 
-    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/dg;->aGb:Ljava/lang/Object;
+    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/dg;->aGt:Ljava/lang/Object;
 
     const/4 v11, 0x1
 
@@ -196,20 +196,20 @@
 
     if-le v2, v6, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aFY:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dg;->aGq:Ljava/lang/String;
 
     invoke-virtual {v1, v5, v6}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
     move-result-object v1
 
     :cond_4
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGF:Lcom/google/android/gms/measurement/internal/ds;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGX:Lcom/google/android/gms/measurement/internal/ds;
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->yc()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->ya()J
 
     move-result-wide v6
 
@@ -217,7 +217,7 @@
 
     if-nez v2, :cond_5
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->yb()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xZ()V
 
     :cond_5
     if-nez v1, :cond_6
@@ -225,13 +225,13 @@
     const-string v1, ""
 
     :cond_6
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dp;->a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
 
     move-result-object v2
 
-    iget-object v6, v0, Lcom/google/android/gms/measurement/internal/ds;->aHi:Ljava/lang/String;
+    iget-object v6, v0, Lcom/google/android/gms/measurement/internal/ds;->aHA:Ljava/lang/String;
 
     invoke-interface {v2, v6, v3, v4}, Landroid/content/SharedPreferences;->getLong(Ljava/lang/String;J)J
 
@@ -243,7 +243,7 @@
 
     if-gtz v2, :cond_7
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dp;->a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
 
@@ -253,11 +253,11 @@
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ds;->aHj:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ds;->aHB:Ljava/lang/String;
 
     invoke-interface {v2, v3, v1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ds;->aHi:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ds;->aHA:Ljava/lang/String;
 
     invoke-interface {v2, v0, v8, v9}, Landroid/content/SharedPreferences$Editor;->putLong(Ljava/lang/String;J)Landroid/content/SharedPreferences$Editor;
 
@@ -266,13 +266,13 @@
     return-void
 
     :cond_7
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/it;->zj()Ljava/security/SecureRandom;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/it;->zh()Ljava/security/SecureRandom;
 
     move-result-object v2
 
@@ -295,7 +295,7 @@
     const/4 v5, 0x1
 
     :cond_8
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dp;->a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
 
@@ -307,12 +307,12 @@
 
     if-eqz v5, :cond_9
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ds;->aHj:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ds;->aHB:Ljava/lang/String;
 
     invoke-interface {v2, v3, v1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
     :cond_9
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ds;->aHi:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ds;->aHA:Ljava/lang/String;
 
     invoke-interface {v2, v0, v6, v7}, Landroid/content/SharedPreferences$Editor;->putLong(Ljava/lang/String;J)Landroid/content/SharedPreferences$Editor;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dh.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dh.smali
index 4400604141..4b03f96ecc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dh.smali
@@ -3,29 +3,29 @@
 
 
 # instance fields
-.field aAK:J
+.field aBc:J
 
-.field aGd:C
+.field public final aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-.field private aGe:Ljava/lang/String;
+.field final aGB:Lcom/google/android/gms/measurement/internal/dj;
 
-.field public final aGf:Lcom/google/android/gms/measurement/internal/dj;
+.field final aGC:Lcom/google/android/gms/measurement/internal/dj;
 
-.field final aGg:Lcom/google/android/gms/measurement/internal/dj;
+.field final aGD:Lcom/google/android/gms/measurement/internal/dj;
 
-.field final aGh:Lcom/google/android/gms/measurement/internal/dj;
+.field final aGE:Lcom/google/android/gms/measurement/internal/dj;
 
-.field public final aGi:Lcom/google/android/gms/measurement/internal/dj;
+.field public final aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-.field final aGj:Lcom/google/android/gms/measurement/internal/dj;
+.field aGv:C
 
-.field final aGk:Lcom/google/android/gms/measurement/internal/dj;
+.field private aGw:Ljava/lang/String;
 
-.field final aGl:Lcom/google/android/gms/measurement/internal/dj;
+.field public final aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-.field final aGm:Lcom/google/android/gms/measurement/internal/dj;
+.field final aGy:Lcom/google/android/gms/measurement/internal/dj;
 
-.field public final aGn:Lcom/google/android/gms/measurement/internal/dj;
+.field final aGz:Lcom/google/android/gms/measurement/internal/dj;
 
 
 # direct methods
@@ -36,11 +36,11 @@
 
     const/4 p1, 0x0
 
-    iput-char p1, p0, Lcom/google/android/gms/measurement/internal/dh;->aGd:C
+    iput-char p1, p0, Lcom/google/android/gms/measurement/internal/dh;->aGv:C
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aAK:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aBc:J
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dj;
 
@@ -48,7 +48,7 @@
 
     invoke-direct {v0, p0, v1, p1, p1}, Lcom/google/android/gms/measurement/internal/dj;-><init>(Lcom/google/android/gms/measurement/internal/dh;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dj;
 
@@ -56,13 +56,13 @@
 
     invoke-direct {v0, p0, v1, v2, p1}, Lcom/google/android/gms/measurement/internal/dj;-><init>(Lcom/google/android/gms/measurement/internal/dh;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGg:Lcom/google/android/gms/measurement/internal/dj;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGy:Lcom/google/android/gms/measurement/internal/dj;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-direct {v0, p0, v1, p1, v2}, Lcom/google/android/gms/measurement/internal/dj;-><init>(Lcom/google/android/gms/measurement/internal/dh;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dj;
 
@@ -70,19 +70,19 @@
 
     invoke-direct {v0, p0, v1, p1, p1}, Lcom/google/android/gms/measurement/internal/dj;-><init>(Lcom/google/android/gms/measurement/internal/dh;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-direct {v0, p0, v1, v2, p1}, Lcom/google/android/gms/measurement/internal/dj;-><init>(Lcom/google/android/gms/measurement/internal/dh;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGj:Lcom/google/android/gms/measurement/internal/dj;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGB:Lcom/google/android/gms/measurement/internal/dj;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-direct {v0, p0, v1, p1, v2}, Lcom/google/android/gms/measurement/internal/dj;-><init>(Lcom/google/android/gms/measurement/internal/dh;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dj;
 
@@ -90,7 +90,7 @@
 
     invoke-direct {v0, p0, v1, p1, p1}, Lcom/google/android/gms/measurement/internal/dj;-><init>(Lcom/google/android/gms/measurement/internal/dh;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dj;
 
@@ -98,7 +98,7 @@
 
     invoke-direct {v0, p0, v1, p1, p1}, Lcom/google/android/gms/measurement/internal/dj;-><init>(Lcom/google/android/gms/measurement/internal/dh;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dj;
 
@@ -106,7 +106,7 @@
 
     invoke-direct {v0, p0, v1, p1, p1}, Lcom/google/android/gms/measurement/internal/dj;-><init>(Lcom/google/android/gms/measurement/internal/dh;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     return-void
 .end method
@@ -406,7 +406,7 @@
 
     move-result-object p0
 
-    invoke-static {p0}, Lcom/google/android/gms/measurement/internal/dh;->cn(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lcom/google/android/gms/measurement/internal/dh;->cj(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
@@ -433,7 +433,7 @@
 
     if-eqz v4, :cond_8
 
-    invoke-static {v4}, Lcom/google/android/gms/measurement/internal/dh;->cn(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v4}, Lcom/google/android/gms/measurement/internal/dh;->cj(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -471,7 +471,7 @@
 
     check-cast p1, Lcom/google/android/gms/measurement/internal/di;
 
-    iget-object p0, p1, Lcom/google/android/gms/measurement/internal/di;->aGo:Ljava/lang/String;
+    iget-object p0, p1, Lcom/google/android/gms/measurement/internal/di;->aGG:Ljava/lang/String;
 
     return-object p0
 
@@ -488,7 +488,7 @@
     return-object p0
 .end method
 
-.method protected static cm(Ljava/lang/String;)Ljava/lang/Object;
+.method protected static ci(Ljava/lang/String;)Ljava/lang/Object;
     .locals 1
 
     if-nez p0, :cond_0
@@ -505,7 +505,7 @@
     return-object v0
 .end method
 
-.method private static cn(Ljava/lang/String;)Ljava/lang/String;
+.method private static cj(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
     invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
@@ -541,40 +541,40 @@
     return-object p0
 .end method
 
-.method private final xM()Ljava/lang/String;
+.method private final xK()Ljava/lang/String;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGe:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGw:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIv:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIN:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIv:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIN:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGe:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGw:Ljava/lang/String;
 
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zn()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zl()Ljava/lang/String;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGe:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGw:Ljava/lang/String;
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGe:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dh;->aGw:Ljava/lang/String;
 
     monitor-exit p0
 
@@ -595,7 +595,7 @@
 .method protected final I(I)Z
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dh;->xM()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dh;->xK()Ljava/lang/String;
 
     move-result-object v0
 
@@ -634,9 +634,9 @@
 
     invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ek;->aIz:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ek;->aIR:Lcom/google/android/gms/measurement/internal/ed;
 
     const/4 p3, 0x6
 
@@ -706,7 +706,7 @@
 .method protected final e(ILjava/lang/String;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dh;->xM()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dh;->xK()Ljava/lang/String;
 
     move-result-object v0
 
@@ -725,103 +725,95 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->ma()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -829,32 +821,40 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vx()V
 
     return-void
 .end method
 
-.method public final xN()Ljava/lang/String;
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+
+    return-void
+.end method
+
+.method public final xL()Ljava/lang/String;
     .locals 10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGF:Lcom/google/android/gms/measurement/internal/ds;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGX:Lcom/google/android/gms/measurement/internal/ds;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->yc()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->ya()J
 
     move-result-wide v1
 
@@ -864,16 +864,16 @@
 
     if-nez v5, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->yb()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xZ()V
 
     move-wide v1, v3
 
     goto :goto_0
 
     :cond_0
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v5
 
@@ -888,7 +888,7 @@
     move-result-wide v1
 
     :goto_0
-    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/ds;->aHk:J
+    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/ds;->aHC:J
 
     const/4 v7, 0x1
 
@@ -904,7 +904,7 @@
     goto :goto_3
 
     :cond_1
-    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/ds;->aHk:J
+    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/ds;->aHC:J
 
     shl-long/2addr v5, v7
 
@@ -912,36 +912,36 @@
 
     if-lez v9, :cond_2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->yb()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xZ()V
 
     goto :goto_1
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/dp;->a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHj:Ljava/lang/String;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHB:Ljava/lang/String;
 
     invoke-interface {v1, v2, v8}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dp;->a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
 
     move-result-object v2
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/ds;->aHi:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/ds;->aHA:Ljava/lang/String;
 
     invoke-interface {v2, v5, v3, v4}, Landroid/content/SharedPreferences;->getLong(Ljava/lang/String;J)J
 
     move-result-wide v5
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->yb()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xZ()V
 
     if-eqz v1, :cond_4
 
@@ -964,12 +964,12 @@
 
     :cond_4
     :goto_2
-    sget-object v0, Lcom/google/android/gms/measurement/internal/dp;->aGD:Landroid/util/Pair;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/dp;->aGV:Landroid/util/Pair;
 
     :goto_3
     if-eqz v0, :cond_6
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/dp;->aGD:Landroid/util/Pair;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/dp;->aGV:Landroid/util/Pair;
 
     if-ne v0, v1, :cond_5
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/di.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/di.smali
index fb6b69599f..20a14e1b04 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/di.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/di.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field final aGo:Ljava/lang/String;
+.field final aGG:Ljava/lang/String;
 
 
 # direct methods
@@ -12,7 +12,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/di;->aGo:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/di;->aGG:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dj.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dj.smali
index a1bafb03d5..e5e843da17 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dj.smali
@@ -3,11 +3,11 @@
 
 
 # instance fields
-.field private final synthetic aGc:Lcom/google/android/gms/measurement/internal/dh;
+.field private final aGH:Z
 
-.field private final aGp:Z
+.field private final aGI:Z
 
-.field private final aGq:Z
+.field private final synthetic aGu:Lcom/google/android/gms/measurement/internal/dh;
 
 .field private final priority:I
 
@@ -16,15 +16,15 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/dh;IZZ)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dj;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dj;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput p2, p0, Lcom/google/android/gms/measurement/internal/dj;->priority:I
 
-    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/dj;->aGp:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/dj;->aGH:Z
 
-    iput-boolean p4, p0, Lcom/google/android/gms/measurement/internal/dj;->aGq:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/measurement/internal/dj;->aGI:Z
 
     return-void
 .end method
@@ -34,13 +34,13 @@
 .method public final a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dj;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dj;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
     iget v1, p0, Lcom/google/android/gms/measurement/internal/dj;->priority:I
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dj;->aGp:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dj;->aGH:Z
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dj;->aGq:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dj;->aGI:Z
 
     const/4 v7, 0x0
 
@@ -58,13 +58,13 @@
 .method public final a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dj;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dj;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
     iget v1, p0, Lcom/google/android/gms/measurement/internal/dj;->priority:I
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dj;->aGp:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dj;->aGH:Z
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dj;->aGq:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dj;->aGI:Z
 
     move-object v4, p1
 
@@ -79,16 +79,16 @@
     return-void
 .end method
 
-.method public final co(Ljava/lang/String;)V
+.method public final ck(Ljava/lang/String;)V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dj;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dj;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
     iget v1, p0, Lcom/google/android/gms/measurement/internal/dj;->priority:I
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dj;->aGp:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dj;->aGH:Z
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dj;->aGq:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dj;->aGI:Z
 
     const/4 v5, 0x0
 
@@ -106,13 +106,13 @@
 .method public final j(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dj;->aGc:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dj;->aGu:Lcom/google/android/gms/measurement/internal/dh;
 
     iget v1, p0, Lcom/google/android/gms/measurement/internal/dj;->priority:I
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dj;->aGp:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dj;->aGH:Z
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dj;->aGq:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dj;->aGI:Z
 
     const/4 v6, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dk.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dk.smali
index 9e76f6de68..af96381802 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dk.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field final aGr:Ljavax/net/ssl/SSLSocketFactory;
+.field final aGJ:Ljavax/net/ssl/SSLSocketFactory;
 
 
 # direct methods
@@ -28,7 +28,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dk;->aGr:Ljavax/net/ssl/SSLSocketFactory;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dk;->aGJ:Ljavax/net/ssl/SSLSocketFactory;
 
     return-void
 .end method
@@ -112,103 +112,95 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->ma()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -216,18 +208,26 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vx()V
 
     return-void
 .end method
 
-.method public final xO()Z
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+
+    return-void
+.end method
+
+.method public final xM()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
@@ -272,40 +272,40 @@
     return v0
 .end method
 
-.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/ip;
+.method public final bridge synthetic xN()Lcom/google/android/gms/measurement/internal/ip;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/iz;
+.method public final bridge synthetic xO()Lcom/google/android/gms/measurement/internal/iz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xQ()Lcom/google/android/gms/measurement/internal/iz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xO()Lcom/google/android/gms/measurement/internal/iz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/jg;
+.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/jg;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/ee;
+.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/ee;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dl.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dl.smali
index 9fdbe5661d..f1b7e3a7bc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dl.smali
@@ -6,11 +6,11 @@
 
 
 # instance fields
-.field private final aGs:Lcom/google/android/gms/measurement/internal/dm;
+.field private final aGK:Lcom/google/android/gms/measurement/internal/dm;
 
-.field private final aGt:[B
+.field private final aGL:[B
 
-.field private final aGu:Ljava/util/Map;
+.field private final aGM:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -52,17 +52,17 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dl;->aGs:Lcom/google/android/gms/measurement/internal/dm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dl;->aGK:Lcom/google/android/gms/measurement/internal/dm;
 
     iput p3, p0, Lcom/google/android/gms/measurement/internal/dl;->status:I
 
     iput-object p4, p0, Lcom/google/android/gms/measurement/internal/dl;->exception:Ljava/lang/Throwable;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/dl;->aGt:[B
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/dl;->aGL:[B
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dl;->packageName:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/dl;->aGu:Ljava/util/Map;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/dl;->aGM:Ljava/util/Map;
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dl;->aGs:Lcom/google/android/gms/measurement/internal/dm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dl;->aGK:Lcom/google/android/gms/measurement/internal/dm;
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dl;->packageName:Ljava/lang/String;
 
@@ -88,9 +88,9 @@
 
     iget-object v3, p0, Lcom/google/android/gms/measurement/internal/dl;->exception:Ljava/lang/Throwable;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/dl;->aGt:[B
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/dl;->aGL:[B
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/dl;->aGu:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/dl;->aGM:Ljava/util/Map;
 
     invoke-interface/range {v0 .. v5}, Lcom/google/android/gms/measurement/internal/dm;->a(Ljava/lang/String;ILjava/lang/Throwable;[BLjava/util/Map;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dn.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dn.smali
index cd9da4b4f1..8487c95887 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dn.smali
@@ -3,15 +3,15 @@
 
 
 # static fields
-.field private static final aGv:Ljava/lang/String;
+.field private static final aGN:Ljava/lang/String;
 
 
 # instance fields
-.field private final aGw:Lcom/google/android/gms/measurement/internal/ii;
+.field private final aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-.field private aGx:Z
+.field private aGP:Z
 
-.field private aGy:Z
+.field private aGQ:Z
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/dn;->aGv:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dn;->aGN:Ljava/lang/String;
 
     return-void
 .end method
@@ -36,7 +36,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/dn;)Lcom/google/android/gms/measurement/internal/ii;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
     return-object p0
 .end method
@@ -54,21 +54,21 @@
 .method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
     invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "NetworkBroadcastReceiver received action"
 
@@ -82,25 +82,25 @@
 
     if-eqz p2, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ii;->yV()Lcom/google/android/gms/measurement/internal/dk;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ii;->yT()Lcom/google/android/gms/measurement/internal/dk;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dk;->xO()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dk;->xM()Z
 
     move-result p1
 
-    iget-boolean p2, p0, Lcom/google/android/gms/measurement/internal/dn;->aGy:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/measurement/internal/dn;->aGQ:Z
 
     if-eq p2, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/dn;->aGy:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/dn;->aGQ:Z
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p2
 
@@ -114,13 +114,13 @@
     return-void
 
     :cond_1
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "NetworkBroadcastReceiver received unknown action"
 
@@ -132,52 +132,52 @@
 .method public final unregister()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGP:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Unregistering connectivity change receiver"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGx:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGP:Z
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGQ:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->getContext()Landroid/content/Context;
 
@@ -193,13 +193,13 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to unregister the network broadcast receiver"
 
@@ -208,29 +208,29 @@
     return-void
 .end method
 
-.method public final xT()V
+.method public final xR()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGP:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->getContext()Landroid/content/Context;
 
@@ -244,27 +244,27 @@
 
     invoke-virtual {v0, p0, v1}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->yV()Lcom/google/android/gms/measurement/internal/dk;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->yT()Lcom/google/android/gms/measurement/internal/dk;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dk;->xO()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dk;->xM()Z
 
     move-result v0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGQ:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dn;->aGy:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dn;->aGQ:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -276,7 +276,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGx:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dn;->aGP:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/do.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/do.smali
index 12c6843560..cc6fbddab6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/do.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/do.smali
@@ -6,9 +6,11 @@
 
 
 # instance fields
-.field private final aGA:Lcom/google/android/gms/measurement/internal/dm;
+.field private final aGR:[B
 
-.field private final aGB:Ljava/util/Map;
+.field private final aGS:Lcom/google/android/gms/measurement/internal/dm;
+
+.field private final aGT:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -19,9 +21,7 @@
     .end annotation
 .end field
 
-.field private final synthetic aGC:Lcom/google/android/gms/measurement/internal/dk;
-
-.field private final aGz:[B
+.field private final synthetic aGU:Lcom/google/android/gms/measurement/internal/dk;
 
 .field private final packageName:Ljava/lang/String;
 
@@ -46,11 +46,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/do;->aGC:Lcom/google/android/gms/measurement/internal/dk;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/do;->aGU:Lcom/google/android/gms/measurement/internal/dk;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -58,13 +58,13 @@
 
     iput-object p3, p0, Lcom/google/android/gms/measurement/internal/do;->url:Ljava/net/URL;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/do;->aGz:[B
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/do;->aGR:[B
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/do;->aGA:Lcom/google/android/gms/measurement/internal/dm;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/do;->aGS:Lcom/google/android/gms/measurement/internal/dm;
 
     iput-object p2, p0, Lcom/google/android/gms/measurement/internal/do;->packageName:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/do;->aGB:Ljava/util/Map;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/do;->aGT:Ljava/util/Map;
 
     return-void
 .end method
@@ -76,16 +76,16 @@
 
     const-string v0, "Error closing HTTP compressed POST connection output stream. appId"
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/do;->aGC:Lcom/google/android/gms/measurement/internal/dk;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/do;->aGU:Lcom/google/android/gms/measurement/internal/dk;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vA()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vy()V
 
     const/4 v1, 0x0
 
     const/4 v2, 0x0
 
     :try_start_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/do;->aGC:Lcom/google/android/gms/measurement/internal/dk;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/do;->aGU:Lcom/google/android/gms/measurement/internal/dk;
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/do;->url:Ljava/net/URL;
 
@@ -97,7 +97,7 @@
 
     if-eqz v5, :cond_4
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/dk;->aGr:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/dk;->aGJ:Ljavax/net/ssl/SSLSocketFactory;
 
     if-eqz v5, :cond_0
 
@@ -109,7 +109,7 @@
 
     check-cast v5, Ljavax/net/ssl/HttpsURLConnection;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dk;->aGr:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dk;->aGJ:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v5, v3}, Ljavax/net/ssl/HttpsURLConnection;->setSSLSocketFactory(Ljavax/net/ssl/SSLSocketFactory;)V
 
@@ -138,11 +138,11 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_4
 
     :try_start_1
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/do;->aGB:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/do;->aGT:Ljava/util/Map;
 
     if-eqz v5, :cond_1
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/do;->aGB:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/do;->aGT:Ljava/util/Map;
 
     invoke-interface {v5}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -182,29 +182,29 @@
     goto :goto_0
 
     :cond_1
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/do;->aGz:[B
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/do;->aGR:[B
 
     if-eqz v5, :cond_2
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/do;->aGC:Lcom/google/android/gms/measurement/internal/dk;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/do;->aGU:Lcom/google/android/gms/measurement/internal/dk;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v5
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/do;->aGz:[B
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/do;->aGR:[B
 
     invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ip;->w([B)[B
 
     move-result-object v5
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/do;->aGC:Lcom/google/android/gms/measurement/internal/dk;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/do;->aGU:Lcom/google/android/gms/measurement/internal/dk;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v7, "Uploading data. size"
 
@@ -300,9 +300,9 @@
     invoke-virtual {v3}, Ljava/net/HttpURLConnection;->disconnect()V
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->aGC:Lcom/google/android/gms/measurement/internal/dk;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->aGU:Lcom/google/android/gms/measurement/internal/dk;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -310,7 +310,7 @@
 
     iget-object v6, p0, Lcom/google/android/gms/measurement/internal/do;->packageName:Ljava/lang/String;
 
-    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/do;->aGA:Lcom/google/android/gms/measurement/internal/dm;
+    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/do;->aGS:Lcom/google/android/gms/measurement/internal/dm;
 
     const/4 v9, 0x0
 
@@ -420,17 +420,17 @@
     :catch_4
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/do;->aGC:Lcom/google/android/gms/measurement/internal/dk;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/do;->aGU:Lcom/google/android/gms/measurement/internal/dk;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/do;->packageName:Ljava/lang/String;
 
-    invoke-static {v5}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v5}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -443,9 +443,9 @@
     invoke-virtual {v3}, Ljava/net/HttpURLConnection;->disconnect()V
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->aGC:Lcom/google/android/gms/measurement/internal/dk;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->aGU:Lcom/google/android/gms/measurement/internal/dk;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -453,7 +453,7 @@
 
     iget-object v6, p0, Lcom/google/android/gms/measurement/internal/do;->packageName:Ljava/lang/String;
 
-    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/do;->aGA:Lcom/google/android/gms/measurement/internal/dm;
+    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/do;->aGS:Lcom/google/android/gms/measurement/internal/dm;
 
     const/4 v9, 0x0
 
@@ -493,17 +493,17 @@
     :catch_6
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/do;->aGC:Lcom/google/android/gms/measurement/internal/dk;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/do;->aGU:Lcom/google/android/gms/measurement/internal/dk;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/do;->packageName:Ljava/lang/String;
 
-    invoke-static {v4}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v4}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -516,9 +516,9 @@
     invoke-virtual {v3}, Ljava/net/HttpURLConnection;->disconnect()V
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->aGC:Lcom/google/android/gms/measurement/internal/dk;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->aGU:Lcom/google/android/gms/measurement/internal/dk;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -526,7 +526,7 @@
 
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/do;->packageName:Ljava/lang/String;
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/do;->aGA:Lcom/google/android/gms/measurement/internal/dm;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/do;->aGS:Lcom/google/android/gms/measurement/internal/dm;
 
     const/4 v9, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dp.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dp.smali
index 37eea9df19..04081c8573 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dp.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field static final aGD:Landroid/util/Pair;
+.field static final aGV:Landroid/util/Pair;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/Pair<",
@@ -16,53 +16,53 @@
 
 
 # instance fields
-.field aGE:Landroid/content/SharedPreferences;
+.field aGW:Landroid/content/SharedPreferences;
 
-.field public aGF:Lcom/google/android/gms/measurement/internal/ds;
-
-.field public final aGG:Lcom/google/android/gms/measurement/internal/dt;
-
-.field public final aGH:Lcom/google/android/gms/measurement/internal/dt;
-
-.field public final aGI:Lcom/google/android/gms/measurement/internal/dt;
-
-.field public final aGJ:Lcom/google/android/gms/measurement/internal/dt;
-
-.field public final aGK:Lcom/google/android/gms/measurement/internal/dt;
-
-.field public final aGL:Lcom/google/android/gms/measurement/internal/dt;
-
-.field public final aGM:Lcom/google/android/gms/measurement/internal/dt;
-
-.field public final aGN:Lcom/google/android/gms/measurement/internal/dv;
-
-.field private aGO:Ljava/lang/String;
-
-.field private aGP:Z
-
-.field private aGQ:J
-
-.field public final aGR:Lcom/google/android/gms/measurement/internal/dt;
-
-.field public final aGS:Lcom/google/android/gms/measurement/internal/dt;
-
-.field public final aGT:Lcom/google/android/gms/measurement/internal/dr;
-
-.field public final aGU:Lcom/google/android/gms/measurement/internal/dv;
-
-.field public final aGV:Lcom/google/android/gms/measurement/internal/dr;
-
-.field public final aGW:Lcom/google/android/gms/measurement/internal/dr;
-
-.field public final aGX:Lcom/google/android/gms/measurement/internal/dt;
+.field public aGX:Lcom/google/android/gms/measurement/internal/ds;
 
 .field public final aGY:Lcom/google/android/gms/measurement/internal/dt;
 
-.field public aGZ:Z
+.field public final aGZ:Lcom/google/android/gms/measurement/internal/dt;
 
-.field public aHa:Lcom/google/android/gms/measurement/internal/dr;
+.field public final aHa:Lcom/google/android/gms/measurement/internal/dt;
 
-.field public aHb:Lcom/google/android/gms/measurement/internal/dt;
+.field public final aHb:Lcom/google/android/gms/measurement/internal/dt;
+
+.field public final aHc:Lcom/google/android/gms/measurement/internal/dt;
+
+.field public final aHd:Lcom/google/android/gms/measurement/internal/dt;
+
+.field public final aHe:Lcom/google/android/gms/measurement/internal/dt;
+
+.field public final aHf:Lcom/google/android/gms/measurement/internal/dv;
+
+.field private aHg:Ljava/lang/String;
+
+.field private aHh:Z
+
+.field private aHi:J
+
+.field public final aHj:Lcom/google/android/gms/measurement/internal/dt;
+
+.field public final aHk:Lcom/google/android/gms/measurement/internal/dt;
+
+.field public final aHl:Lcom/google/android/gms/measurement/internal/dr;
+
+.field public final aHm:Lcom/google/android/gms/measurement/internal/dv;
+
+.field public final aHn:Lcom/google/android/gms/measurement/internal/dr;
+
+.field public final aHo:Lcom/google/android/gms/measurement/internal/dr;
+
+.field public final aHp:Lcom/google/android/gms/measurement/internal/dt;
+
+.field public final aHq:Lcom/google/android/gms/measurement/internal/dt;
+
+.field public aHr:Z
+
+.field public aHs:Lcom/google/android/gms/measurement/internal/dr;
+
+.field public aHt:Lcom/google/android/gms/measurement/internal/dt;
 
 
 # direct methods
@@ -81,7 +81,7 @@
 
     invoke-direct {v0, v2, v1}, Landroid/util/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/dp;->aGD:Landroid/util/Pair;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dp;->aGV:Landroid/util/Pair;
 
     return-void
 .end method
@@ -99,7 +99,7 @@
 
     invoke-direct {p1, p0, v2, v0, v1}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGG:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dt;
 
@@ -107,7 +107,7 @@
 
     invoke-direct {p1, p0, v2, v0, v1}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGH:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGZ:Lcom/google/android/gms/measurement/internal/dt;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dt;
 
@@ -115,7 +115,7 @@
 
     invoke-direct {p1, p0, v2, v0, v1}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGI:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHa:Lcom/google/android/gms/measurement/internal/dt;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dt;
 
@@ -123,7 +123,7 @@
 
     invoke-direct {p1, p0, v2, v0, v1}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGJ:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHb:Lcom/google/android/gms/measurement/internal/dt;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dt;
 
@@ -133,7 +133,7 @@
 
     invoke-direct {p1, p0, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGR:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHj:Lcom/google/android/gms/measurement/internal/dt;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dt;
 
@@ -143,7 +143,7 @@
 
     invoke-direct {p1, p0, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGS:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHk:Lcom/google/android/gms/measurement/internal/dt;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dr;
 
@@ -153,7 +153,7 @@
 
     invoke-direct {p1, p0, v2, v3}, Lcom/google/android/gms/measurement/internal/dr;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;Z)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGT:Lcom/google/android/gms/measurement/internal/dr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHl:Lcom/google/android/gms/measurement/internal/dr;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dt;
 
@@ -161,7 +161,7 @@
 
     invoke-direct {p1, p0, v2, v0, v1}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGX:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHp:Lcom/google/android/gms/measurement/internal/dt;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dt;
 
@@ -169,7 +169,7 @@
 
     invoke-direct {p1, p0, v2, v0, v1}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHq:Lcom/google/android/gms/measurement/internal/dt;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dv;
 
@@ -177,7 +177,7 @@
 
     invoke-direct {p1, p0, v2}, Lcom/google/android/gms/measurement/internal/dv;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGU:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHm:Lcom/google/android/gms/measurement/internal/dv;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dr;
 
@@ -187,7 +187,7 @@
 
     invoke-direct {p1, p0, v3, v2}, Lcom/google/android/gms/measurement/internal/dr;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;Z)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGV:Lcom/google/android/gms/measurement/internal/dr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHn:Lcom/google/android/gms/measurement/internal/dr;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dr;
 
@@ -195,7 +195,7 @@
 
     invoke-direct {p1, p0, v3, v2}, Lcom/google/android/gms/measurement/internal/dr;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;Z)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGW:Lcom/google/android/gms/measurement/internal/dr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHo:Lcom/google/android/gms/measurement/internal/dr;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dt;
 
@@ -203,7 +203,7 @@
 
     invoke-direct {p1, p0, v3, v0, v1}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGK:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHc:Lcom/google/android/gms/measurement/internal/dt;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dt;
 
@@ -211,7 +211,7 @@
 
     invoke-direct {p1, p0, v3, v0, v1}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGL:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHd:Lcom/google/android/gms/measurement/internal/dt;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dt;
 
@@ -219,7 +219,7 @@
 
     invoke-direct {p1, p0, v3, v0, v1}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGM:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHe:Lcom/google/android/gms/measurement/internal/dt;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dv;
 
@@ -227,7 +227,7 @@
 
     invoke-direct {p1, p0, v0}, Lcom/google/android/gms/measurement/internal/dv;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGN:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHf:Lcom/google/android/gms/measurement/internal/dv;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dr;
 
@@ -235,7 +235,7 @@
 
     invoke-direct {p1, p0, v0, v2}, Lcom/google/android/gms/measurement/internal/dr;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;Z)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHa:Lcom/google/android/gms/measurement/internal/dr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHs:Lcom/google/android/gms/measurement/internal/dr;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dt;
 
@@ -245,7 +245,7 @@
 
     invoke-direct {p1, p0, v0, v1, v2}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHb:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHt:Lcom/google/android/gms/measurement/internal/dt;
 
     return-void
 .end method
@@ -253,7 +253,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object p0
 
@@ -262,16 +262,16 @@
 
 
 # virtual methods
-.method final P(Z)V
+.method final N(Z)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -281,7 +281,7 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -298,16 +298,16 @@
     return-void
 .end method
 
-.method final Q(Z)V
+.method final O(Z)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -317,7 +317,7 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -334,12 +334,12 @@
     return-void
 .end method
 
-.method final R(Z)Z
+.method final P(Z)Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -352,16 +352,16 @@
     return p1
 .end method
 
-.method final S(Z)V
+.method final Q(Z)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -371,7 +371,7 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -391,7 +391,7 @@
 .method final al(J)Z
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGS:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aHk:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -399,7 +399,7 @@
 
     sub-long/2addr p1, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGX:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aHp:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -419,7 +419,7 @@
     return p1
 .end method
 
-.method final cp(Ljava/lang/String;)Landroid/util/Pair;
+.method final cl(Ljava/lang/String;)Landroid/util/Pair;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -435,9 +435,9 @@
 
     const-string v0, ""
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -445,11 +445,11 @@
 
     move-result-wide v1
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/dp;->aGO:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/dp;->aHg:Ljava/lang/String;
 
     if-eqz v3, :cond_0
 
-    iget-wide v4, p0, Lcom/google/android/gms/measurement/internal/dp;->aGQ:J
+    iget-wide v4, p0, Lcom/google/android/gms/measurement/internal/dp;->aHi:J
 
     cmp-long v6, v1, v4
 
@@ -457,7 +457,7 @@
 
     new-instance p1, Landroid/util/Pair;
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGP:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aHh:Z
 
     invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -468,11 +468,11 @@
     return-object p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aDV:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aEn:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v3, p1, v4}, Lcom/google/android/gms/measurement/internal/jb;->a(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)J
 
@@ -480,7 +480,7 @@
 
     add-long/2addr v1, v3
 
-    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGQ:J
+    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHi:J
 
     const/4 p1, 0x1
 
@@ -501,20 +501,20 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGO:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHg:Ljava/lang/String;
 
     invoke-virtual {p1}, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;->isLimitAdTrackingEnabled()Z
 
     move-result p1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGP:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHh:Z
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGO:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHg:Ljava/lang/String;
 
     if-nez p1, :cond_2
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGO:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aHg:Ljava/lang/String;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -523,17 +523,17 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Unable to get advertising id"
 
     invoke-virtual {v1, v2, p1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGO:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aHg:Ljava/lang/String;
 
     :cond_2
     :goto_0
@@ -543,9 +543,9 @@
 
     new-instance p1, Landroid/util/Pair;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGO:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aHg:Ljava/lang/String;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dp;->aGP:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dp;->aHh:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -556,12 +556,12 @@
     return-object p1
 .end method
 
-.method final cq(Ljava/lang/String;)Ljava/lang/String;
+.method final cm(Ljava/lang/String;)Ljava/lang/String;
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/dp;->cp(Ljava/lang/String;)Landroid/util/Pair;
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/dp;->cl(Ljava/lang/String;)Landroid/util/Pair;
 
     move-result-object p1
 
@@ -611,12 +611,12 @@
     return-object p1
 .end method
 
-.method final cr(Ljava/lang/String;)V
+.method final cn(Ljava/lang/String;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -633,12 +633,12 @@
     return-void
 .end method
 
-.method final cs(Ljava/lang/String;)V
+.method final co(Ljava/lang/String;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -655,7 +655,7 @@
     return-void
 .end method
 
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -663,7 +663,7 @@
     return v0
 .end method
 
-.method protected final xF()V
+.method protected final xD()V
     .locals 9
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
@@ -678,9 +678,9 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGE:Landroid/content/SharedPreferences;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGW:Landroid/content/SharedPreferences;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGE:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGW:Landroid/content/SharedPreferences;
 
     const-string v2, "has_been_opened"
 
@@ -688,13 +688,13 @@
 
     move-result v0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGZ:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aHr:Z
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aHr:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGE:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGW:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -711,7 +711,7 @@
 
     const-wide/16 v1, 0x0
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/j;->aDW:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/j;->aEo:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v4, 0x0
 
@@ -739,29 +739,29 @@
 
     invoke-direct/range {v3 .. v8}, Lcom/google/android/gms/measurement/internal/ds;-><init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;JB)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGF:Lcom/google/android/gms/measurement/internal/ds;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGX:Lcom/google/android/gms/measurement/internal/ds;
 
     return-void
 .end method
 
-.method final xU()Landroid/content/SharedPreferences;
+.method final xS()Landroid/content/SharedPreferences;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGE:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGW:Landroid/content/SharedPreferences;
 
     return-object v0
 .end method
 
-.method final xV()Ljava/lang/String;
+.method final xT()Ljava/lang/String;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -776,12 +776,12 @@
     return-object v0
 .end method
 
-.method final xW()Ljava/lang/String;
+.method final xU()Ljava/lang/String;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -796,12 +796,12 @@
     return-object v0
 .end method
 
-.method final xX()Ljava/lang/Boolean;
+.method final xV()Ljava/lang/Boolean;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -818,7 +818,7 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -835,26 +835,26 @@
     return-object v0
 .end method
 
-.method final xY()V
+.method final xW()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Clearing collection preferences."
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFa:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFs:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -862,11 +862,11 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xZ()Ljava/lang/Boolean;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xX()Ljava/lang/Boolean;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -884,13 +884,13 @@
 
     move-result v0
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/measurement/internal/dp;->Q(Z)V
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/measurement/internal/dp;->O(Z)V
 
     :cond_0
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -904,12 +904,12 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/dp;->R(Z)Z
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/dp;->P(Z)Z
 
     move-result v1
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v2
 
@@ -923,18 +923,18 @@
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/dp;->Q(Z)V
+    invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/dp;->O(Z)V
 
     :cond_3
     return-void
 .end method
 
-.method final xZ()Ljava/lang/Boolean;
+.method final xX()Ljava/lang/Boolean;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -946,7 +946,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -968,12 +968,12 @@
     return-object v0
 .end method
 
-.method protected final ya()Ljava/lang/String;
+.method protected final xY()Ljava/lang/String;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -985,11 +985,11 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
     sget-object v2, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
@@ -1005,7 +1005,7 @@
 
     if-nez v3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xU()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dp;->xS()Landroid/content/SharedPreferences;
 
     move-result-object v3
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dq.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dq.smali
index 3a4d936984..d002526ef7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dq.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aHc:Z
+.field private final synthetic aHu:Z
 
-.field private final synthetic aHd:Lcom/google/android/gms/measurement/internal/dn;
+.field private final synthetic aHv:Lcom/google/android/gms/measurement/internal/dn;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/dn;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dq;->aHd:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dq;->aHv:Lcom/google/android/gms/measurement/internal/dn;
 
-    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/dq;->aHc:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/dq;->aHu:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,13 +29,13 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dq;->aHd:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dq;->aHv:Lcom/google/android/gms/measurement/internal/dn;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dn;->a(Lcom/google/android/gms/measurement/internal/dn;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dr.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dr.smali
index 0dfbe2222a..89ea9983e4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dr.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field private final aFA:Ljava/lang/String;
+.field private final aFS:Ljava/lang/String;
 
-.field private final aHe:Z
+.field private final aHw:Z
 
-.field private aHf:Z
+.field private aHx:Z
 
-.field private final synthetic aHg:Lcom/google/android/gms/measurement/internal/dp;
+.field private final synthetic aHy:Lcom/google/android/gms/measurement/internal/dp;
 
 .field private value:Z
 
@@ -18,15 +18,15 @@
 .method public constructor <init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->aFA:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dr;->aFS:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/dr;->aHe:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/dr;->aHw:Z
 
     return-void
 .end method
@@ -36,23 +36,23 @@
 .method public final get()Z
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->aHf:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->aHx:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->aHf:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->aHx:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dp;->a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->aFA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->aFS:Ljava/lang/String;
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dr;->aHe:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dr;->aHw:Z
 
     invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
 
@@ -69,7 +69,7 @@
 .method public final set(Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dp;->a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
 
@@ -79,7 +79,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->aFA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dr;->aFS:Ljava/lang/String;
 
     invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ds.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ds.smali
index 930a89a200..5b6f42c975 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ds.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ds.smali
@@ -3,26 +3,26 @@
 
 
 # instance fields
-.field final synthetic aHg:Lcom/google/android/gms/measurement/internal/dp;
+.field final aHA:Ljava/lang/String;
 
-.field private final aHh:Ljava/lang/String;
+.field final aHB:Ljava/lang/String;
 
-.field final aHi:Ljava/lang/String;
+.field final aHC:J
 
-.field final aHj:Ljava/lang/String;
+.field final synthetic aHy:Lcom/google/android/gms/measurement/internal/dp;
 
-.field final aHk:J
+.field private final aHz:Ljava/lang/String;
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
     .locals 2
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const-wide/16 v0, 0x0
 
@@ -50,7 +50,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ds;->aHh:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ds;->aHz:Ljava/lang/String;
 
     invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -62,7 +62,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ds;->aHi:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ds;->aHA:Ljava/lang/String;
 
     invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -74,9 +74,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ds;->aHj:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ds;->aHB:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/ds;->aHk:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/ds;->aHC:J
 
     return-void
 .end method
@@ -91,16 +91,16 @@
 
 
 # virtual methods
-.method final yb()V
+.method final xZ()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -108,7 +108,7 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dp;->a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
 
@@ -118,15 +118,15 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->aHi:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->aHA:Ljava/lang/String;
 
     invoke-interface {v2, v3}, Landroid/content/SharedPreferences$Editor;->remove(Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->aHj:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->aHB:Ljava/lang/String;
 
     invoke-interface {v2, v3}, Landroid/content/SharedPreferences$Editor;->remove(Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->aHh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->aHz:Ljava/lang/String;
 
     invoke-interface {v2, v3, v0, v1}, Landroid/content/SharedPreferences$Editor;->putLong(Ljava/lang/String;J)Landroid/content/SharedPreferences$Editor;
 
@@ -135,16 +135,16 @@
     return-void
 .end method
 
-.method final yc()J
+.method final ya()J
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dp;->a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ds;->aHh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ds;->aHz:Ljava/lang/String;
 
     const-wide/16 v2, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dt.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dt.smali
index da5b56f186..6674662142 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dt.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dt.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field private final aFA:Ljava/lang/String;
+.field private final aFS:Ljava/lang/String;
 
-.field private aHf:Z
+.field private final aHD:J
 
-.field private final synthetic aHg:Lcom/google/android/gms/measurement/internal/dp;
+.field private aHx:Z
 
-.field private final aHl:J
+.field private final synthetic aHy:Lcom/google/android/gms/measurement/internal/dp;
 
 .field private value:J
 
@@ -18,15 +18,15 @@
 .method public constructor <init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dt;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dt;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dt;->aFA:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dt;->aFS:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/dt;->aHl:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/dt;->aHD:J
 
     return-void
 .end method
@@ -36,23 +36,23 @@
 .method public final get()J
     .locals 4
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aHf:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aHx:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aHf:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aHx:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dp;->a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dt;->aFA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dt;->aFS:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/dt;->aHl:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/dt;->aHD:J
 
     invoke-interface {v0, v1, v2, v3}, Landroid/content/SharedPreferences;->getLong(Ljava/lang/String;J)J
 
@@ -69,7 +69,7 @@
 .method public final set(J)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dp;->a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
 
@@ -79,7 +79,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dt;->aFA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dt;->aFS:Ljava/lang/String;
 
     invoke-interface {v0, v1, p1, p2}, Landroid/content/SharedPreferences$Editor;->putLong(Ljava/lang/String;J)Landroid/content/SharedPreferences$Editor;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/du.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/du.smali
index 7d3add4ffa..e4b3e1ba17 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/du.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/du.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field final aCX:Lcom/google/android/gms/measurement/internal/ek;
+.field final aDp:Lcom/google/android/gms/measurement/internal/ek;
 
 
 # direct methods
@@ -12,18 +12,18 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     return-void
 .end method
 
-.method private final yd()Z
+.method private final yb()Z
     .locals 4
 
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -35,17 +35,17 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to retrieve Package Manager to check Play Store compatibility"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return v0
 
@@ -74,13 +74,13 @@
     :catch_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Failed to retrieve Play Store version"
 
@@ -94,29 +94,29 @@
 .method final a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/dt;)Landroid/os/Bundle;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     const/4 v0, 0x0
 
     if-nez p2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Attempting to use Install Referrer Service while it is not initialized"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-object v0
 
@@ -136,17 +136,17 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Install Referrer Service returned a null response"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -158,13 +158,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {p1}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
 
@@ -177,7 +177,7 @@
     return-object v0
 .end method
 
-.method protected final ct(Ljava/lang/String;)V
+.method protected final cp(Ljava/lang/String;)V
     .locals 5
 
     if-eqz p1, :cond_7
@@ -191,58 +191,58 @@
     goto/16 :goto_1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/du;->yd()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/du;->yb()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Install Referrer Reporter is not available"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Install Referrer Reporter is initializing"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/measurement/internal/dx;-><init>(Lcom/google/android/gms/measurement/internal/du;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     new-instance p1, Landroid/content/Intent;
 
@@ -260,7 +260,7 @@
 
     invoke-virtual {p1, v1}, Landroid/content/Intent;->setComponent(Landroid/content/ComponentName;)Landroid/content/Intent;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -272,17 +272,17 @@
 
     if-nez v1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Failed to obtain Package Manager to verify binding conditions"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
@@ -327,7 +327,7 @@
 
     if-eqz v1, :cond_4
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/du;->yd()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/du;->yb()Z
 
     move-result v1
 
@@ -338,9 +338,9 @@
     invoke-direct {v1, p1}, Landroid/content/Intent;-><init>(Landroid/content/Intent;)V
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -352,13 +352,13 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Install Referrer Service is"
 
@@ -381,13 +381,13 @@
     :catch_0
     move-exception p1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {p1}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
 
@@ -400,49 +400,49 @@
     return-void
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Play Store missing or incompatible. Version 8.3.73 or later required"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_5
     return-void
 
     :cond_6
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Play Service for fetching Install Referrer is unavailable on device"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_7
     :goto_1
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Install Referrer Reporter was called with invalid app package name"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dv.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dv.smali
index 07d30518db..f054836c29 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dv.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field private final aFA:Ljava/lang/String;
+.field private final aFS:Ljava/lang/String;
 
-.field private aHf:Z
+.field private final aHE:Ljava/lang/String;
 
-.field private final synthetic aHg:Lcom/google/android/gms/measurement/internal/dp;
+.field private aHx:Z
 
-.field private final aHm:Ljava/lang/String;
+.field private final synthetic aHy:Lcom/google/android/gms/measurement/internal/dp;
 
 .field private value:Ljava/lang/String;
 
@@ -18,24 +18,24 @@
 .method public constructor <init>(Lcom/google/android/gms/measurement/internal/dp;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dv;->aFA:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dv;->aFS:Ljava/lang/String;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aHm:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aHE:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final cu(Ljava/lang/String;)V
+.method public final cq(Ljava/lang/String;)V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->value:Ljava/lang/String;
@@ -49,7 +49,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dp;->a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
 
@@ -59,7 +59,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dv;->aFA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dv;->aFS:Ljava/lang/String;
 
     invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
@@ -70,24 +70,24 @@
     return-void
 .end method
 
-.method public final ye()Ljava/lang/String;
+.method public final yc()Ljava/lang/String;
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aHf:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aHx:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aHf:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aHx:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aHg:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aHy:Lcom/google/android/gms/measurement/internal/dp;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dp;->a(Lcom/google/android/gms/measurement/internal/dp;)Landroid/content/SharedPreferences;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dv;->aFA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dv;->aFS:Ljava/lang/String;
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dw.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dw.smali
index b15f54b259..aa3c38ed69 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dw.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic aHn:Lcom/google/android/gms/internal/measurement/dt;
+.field private final synthetic aHF:Lcom/google/android/gms/internal/measurement/dt;
 
-.field private final synthetic aHo:Landroid/content/ServiceConnection;
+.field private final synthetic aHG:Landroid/content/ServiceConnection;
 
-.field private final synthetic aHp:Lcom/google/android/gms/measurement/internal/dx;
+.field private final synthetic aHH:Lcom/google/android/gms/measurement/internal/dx;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/dx;Lcom/google/android/gms/internal/measurement/dt;Landroid/content/ServiceConnection;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dw;->aHp:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dw;->aHH:Lcom/google/android/gms/measurement/internal/dx;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dw;->aHn:Lcom/google/android/gms/internal/measurement/dt;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dw;->aHF:Lcom/google/android/gms/internal/measurement/dt;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/dw;->aHo:Landroid/content/ServiceConnection;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/dw;->aHG:Landroid/content/ServiceConnection;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,31 +33,31 @@
 .method public final run()V
     .locals 13
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dw;->aHp:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dw;->aHH:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dx;->aHq:Lcom/google/android/gms/measurement/internal/du;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dx;->aHI:Lcom/google/android/gms/measurement/internal/du;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dw;->aHp:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dw;->aHH:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/dx;->a(Lcom/google/android/gms/measurement/internal/dx;)Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dw;->aHn:Lcom/google/android/gms/internal/measurement/dt;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dw;->aHF:Lcom/google/android/gms/internal/measurement/dt;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/dw;->aHo:Landroid/content/ServiceConnection;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/dw;->aHG:Landroid/content/ServiceConnection;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/du;->a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/dt;)Landroid/os/Bundle;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     if-eqz v1, :cond_9
 
@@ -77,17 +77,17 @@
 
     if-nez v2, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Service response is missing Install Referrer install timestamp"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto/16 :goto_3
 
@@ -109,21 +109,21 @@
     goto/16 :goto_2
 
     :cond_1
-    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v11, "InstallReferrer API result"
 
     invoke-virtual {v10, v11, v2}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v10
 
@@ -161,17 +161,17 @@
 
     if-nez v2, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "No campaign params defined in install referrer result"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto/16 :goto_3
 
@@ -222,17 +222,17 @@
 
     if-nez v1, :cond_5
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Install Referrer is missing click timestamp for ad campaign"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_3
 
@@ -242,13 +242,13 @@
     invoke-virtual {v2, v1, v10, v11}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_6
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aGM:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aHe:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -258,38 +258,38 @@
 
     if-nez v1, :cond_7
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Campaign has already been logged"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_3
 
     :cond_7
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aGM:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aHe:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v1, v6, v7}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "referrer API"
 
@@ -301,9 +301,9 @@
 
     invoke-virtual {v2, v1, v4}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v1
 
@@ -317,25 +317,25 @@
 
     :cond_8
     :goto_2
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "No referrer defined in install referrer response"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_9
     :goto_3
     if-eqz v3, :cond_a
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dx.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dx.smali
index b892d8c16c..beeec24680 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dx.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field final synthetic aHq:Lcom/google/android/gms/measurement/internal/du;
+.field final synthetic aHI:Lcom/google/android/gms/measurement/internal/du;
 
 .field private final packageName:Ljava/lang/String;
 
@@ -15,7 +15,7 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/du;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dx;->aHq:Lcom/google/android/gms/measurement/internal/du;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dx;->aHI:Lcom/google/android/gms/measurement/internal/du;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,19 +39,19 @@
 
     if-nez p2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dx;->aHq:Lcom/google/android/gms/measurement/internal/du;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dx;->aHI:Lcom/google/android/gms/measurement/internal/du;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Install Referrer connection returned with null binder"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
@@ -63,42 +63,42 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dx;->aHq:Lcom/google/android/gms/measurement/internal/du;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dx;->aHI:Lcom/google/android/gms/measurement/internal/du;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Install Referrer Service implementation was not found"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_1
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dx;->aHq:Lcom/google/android/gms/measurement/internal/du;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dx;->aHI:Lcom/google/android/gms/measurement/internal/du;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Install Referrer Service connected"
 
-    invoke-virtual {p2, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p2, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dx;->aHq:Lcom/google/android/gms/measurement/internal/du;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dx;->aHI:Lcom/google/android/gms/measurement/internal/du;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p2
 
@@ -115,15 +115,15 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dx;->aHq:Lcom/google/android/gms/measurement/internal/du;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dx;->aHI:Lcom/google/android/gms/measurement/internal/du;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Exception occurred while calling Install Referrer API"
 
@@ -135,19 +135,19 @@
 .method public final onServiceDisconnected(Landroid/content/ComponentName;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dx;->aHq:Lcom/google/android/gms/measurement/internal/du;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dx;->aHI:Lcom/google/android/gms/measurement/internal/du;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Install Referrer Service disconnected"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dy.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dy.smali
index 9243af0598..388fa9cf9c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dy.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aHr:Lcom/google/android/gms/measurement/internal/ek;
+.field private final synthetic aHJ:Lcom/google/android/gms/measurement/internal/ek;
 
-.field private final synthetic aHs:Lcom/google/android/gms/measurement/internal/dh;
+.field private final synthetic aHK:Lcom/google/android/gms/measurement/internal/dh;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ek;Lcom/google/android/gms/measurement/internal/dh;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dy;->aHr:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dy;->aHJ:Lcom/google/android/gms/measurement/internal/ek;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dy;->aHs:Lcom/google/android/gms/measurement/internal/dh;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/dy;->aHK:Lcom/google/android/gms/measurement/internal/dh;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,28 +29,28 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dy;->aHr:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dy;->aHJ:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIL:Lcom/google/android/gms/measurement/internal/du;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aJd:Lcom/google/android/gms/measurement/internal/du;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dy;->aHs:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dy;->aHK:Lcom/google/android/gms/measurement/internal/dh;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Install Referrer Reporter is null"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dy;->aHr:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dy;->aHJ:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIL:Lcom/google/android/gms/measurement/internal/du;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aJd:Lcom/google/android/gms/measurement/internal/du;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/du;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -60,7 +60,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/du;->ct(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/du;->cp(Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dz.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dz.smali
index 75d516f089..a0b54199d4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dz.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aHt:Lcom/google/android/gms/measurement/internal/eb;
+.field private final aHL:Lcom/google/android/gms/measurement/internal/eb;
 
 
 # direct methods
@@ -14,7 +14,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dz;->aHt:Lcom/google/android/gms/measurement/internal/eb;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dz;->aHL:Lcom/google/android/gms/measurement/internal/eb;
 
     return-void
 .end method
@@ -74,17 +74,17 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v7
 
     if-nez p2, :cond_0
 
-    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Receiver called with null intent"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
@@ -93,7 +93,7 @@
 
     move-result-object v0
 
-    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Local receiver got"
 
@@ -119,13 +119,13 @@
 
     invoke-virtual {p2, v1}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
 
-    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Starting wakeful intent."
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dz;->aHt:Lcom/google/android/gms/measurement/internal/eb;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dz;->aHL:Lcom/google/android/gms/measurement/internal/eb;
 
     invoke-interface {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/eb;->a(Landroid/content/Context;Landroid/content/Intent;)V
 
@@ -141,7 +141,7 @@
     if-eqz v0, :cond_8
 
     :try_start_0
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -158,16 +158,16 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Install Referrer Reporter encountered a problem"
 
     invoke-virtual {v1, v3, v0}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dz;->aHt:Lcom/google/android/gms/measurement/internal/eb;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dz;->aHL:Lcom/google/android/gms/measurement/internal/eb;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/eb;->vw()Landroid/content/BroadcastReceiver$PendingResult;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/eb;->vu()Landroid/content/BroadcastReceiver$PendingResult;
 
     move-result-object v8
 
@@ -179,11 +179,11 @@
 
     if-nez v0, :cond_3
 
-    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Install referrer extras are null"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     if-eqz v8, :cond_2
 
@@ -193,7 +193,7 @@
     return-void
 
     :cond_3
-    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Install referrer extras are"
 
@@ -234,7 +234,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v1
 
@@ -244,11 +244,11 @@
 
     if-nez v5, :cond_6
 
-    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "No campaign defined in install referrer broadcast"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     if-eqz v8, :cond_8
 
@@ -273,14 +273,14 @@
 
     if-nez p2, :cond_7
 
-    iget-object p2, v7, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, v7, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Install referrer is missing timestamp"
 
-    invoke-virtual {p2, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p2, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_7
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/e.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/e.smali
index 1db30ec774..07c4998f73 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/e.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aDs:Lcom/google/android/gms/measurement/internal/fj;
+.field private final synthetic aDK:Lcom/google/android/gms/measurement/internal/fj;
 
-.field private final synthetic aDt:Lcom/google/android/gms/measurement/internal/b;
+.field private final synthetic aDL:Lcom/google/android/gms/measurement/internal/b;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/b;Lcom/google/android/gms/measurement/internal/fj;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/e;->aDt:Lcom/google/android/gms/measurement/internal/b;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/e;->aDL:Lcom/google/android/gms/measurement/internal/b;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/e;->aDs:Lcom/google/android/gms/measurement/internal/fj;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/e;->aDK:Lcom/google/android/gms/measurement/internal/fj;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -35,9 +35,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aDs:Lcom/google/android/gms/measurement/internal/fj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aDK:Lcom/google/android/gms/measurement/internal/fj;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fj;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fj;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -46,19 +46,19 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aDt:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aDL:Lcom/google/android/gms/measurement/internal/b;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/b;->vQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/b;->vO()Z
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aDt:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aDL:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/b;->a(Lcom/google/android/gms/measurement/internal/b;)J
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aDt:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aDL:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/b;->run()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ea.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ea.smali
index 2a06e38b1a..82cfe78aa5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ea.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ea.smali
@@ -3,21 +3,21 @@
 
 
 # instance fields
-.field private aAK:J
+.field private aBc:J
 
-.field private aAL:J
+.field private aBd:J
 
-.field final aCX:Lcom/google/android/gms/measurement/internal/ek;
+.field private final aDM:Ljava/lang/String;
 
-.field private final aDu:Ljava/lang/String;
+.field final aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-.field private aFH:Ljava/lang/String;
+.field private aFZ:Ljava/lang/String;
 
-.field private aFJ:Ljava/lang/String;
+.field private aGb:Ljava/lang/String;
 
-.field private aFM:J
+.field private aGe:J
 
-.field aFN:Ljava/util/List;
+.field aGf:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -27,53 +27,53 @@
     .end annotation
 .end field
 
-.field private aFP:Ljava/lang/String;
+.field private aGh:Ljava/lang/String;
 
-.field private aHA:J
+.field private aHM:Ljava/lang/String;
 
-.field private aHB:J
+.field private aHN:Ljava/lang/String;
 
-.field private aHC:Z
-
-.field private aHD:Z
-
-.field private aHE:Z
-
-.field private aHF:Ljava/lang/Boolean;
-
-.field aHG:J
-
-.field aHH:J
-
-.field aHI:J
-
-.field aHJ:J
-
-.field aHK:J
-
-.field aHL:J
-
-.field aHM:Ljava/lang/String;
-
-.field aHN:Z
-
-.field private aHO:J
+.field private aHO:Ljava/lang/String;
 
 .field private aHP:J
 
-.field private aHu:Ljava/lang/String;
+.field private aHQ:J
 
-.field private aHv:Ljava/lang/String;
+.field private aHR:J
 
-.field private aHw:Ljava/lang/String;
+.field private aHS:J
 
-.field private aHx:J
+.field private aHT:J
 
-.field private aHy:J
+.field private aHU:Z
 
-.field private aHz:J
+.field private aHV:Z
 
-.field private aro:Ljava/lang/String;
+.field private aHW:Z
+
+.field private aHX:Ljava/lang/Boolean;
+
+.field aHY:J
+
+.field aHZ:J
+
+.field aIa:J
+
+.field aIb:J
+
+.field aIc:J
+
+.field aId:J
+
+.field aIe:Ljava/lang/String;
+
+.field aIf:Z
+
+.field private aIg:J
+
+.field private aIh:J
+
+.field private arG:Ljava/lang/String;
 
 
 # direct methods
@@ -84,39 +84,39 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ea;->aDu:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ea;->aDM:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Q(Z)V
+.method public final O(Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHC:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHU:Z
 
     if-eq v1, p1, :cond_0
 
@@ -130,25 +130,25 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHC:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHU:Z
 
     return-void
 .end method
 
-.method public final T(Z)V
+.method public final R(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHD:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHV:Z
 
     if-eq v0, p1, :cond_0
 
@@ -160,25 +160,25 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHD:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHV:Z
 
     return-void
 .end method
 
-.method public final U(Z)V
+.method public final S(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHE:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHW:Z
 
     if-eq v0, p1, :cond_0
 
@@ -190,27 +190,27 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHE:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHW:Z
 
     return-void
 .end method
 
-.method public final aM(Ljava/lang/String;)V
+.method public final aH(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHu:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHM:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/it;->K(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -220,9 +220,9 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHu:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHM:Ljava/lang/String;
 
     return-void
 .end method
@@ -230,17 +230,17 @@
 .method public final am(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHz:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHR:J
 
     cmp-long v3, v1, p1
 
@@ -256,9 +256,9 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHz:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHR:J
 
     return-void
 .end method
@@ -266,17 +266,17 @@
 .method public final an(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHA:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHS:J
 
     cmp-long v3, v1, p1
 
@@ -292,9 +292,9 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHA:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHS:J
 
     return-void
 .end method
@@ -302,17 +302,17 @@
 .method public final ao(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aAL:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aBd:J
 
     cmp-long v3, v1, p1
 
@@ -328,9 +328,9 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aAL:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aBd:J
 
     return-void
 .end method
@@ -358,17 +358,17 @@
     :goto_0
     invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->checkArgument(Z)V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/ea;->aHx:J
+    iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/ea;->aHP:J
 
     cmp-long v5, v3, p1
 
@@ -382,9 +382,9 @@
     :goto_1
     or-int/2addr v0, v2
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHx:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHP:J
 
     return-void
 .end method
@@ -392,17 +392,17 @@
 .method public final aq(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHO:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aIg:J
 
     cmp-long v3, v1, p1
 
@@ -418,9 +418,9 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHO:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aIg:J
 
     return-void
 .end method
@@ -428,17 +428,17 @@
 .method public final ar(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHP:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aIh:J
 
     cmp-long v3, v1, p1
 
@@ -454,9 +454,9 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHP:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aIh:J
 
     return-void
 .end method
@@ -464,17 +464,17 @@
 .method public final as(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aFM:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aGe:J
 
     cmp-long v3, v1, p1
 
@@ -490,9 +490,9 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aFM:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aGe:J
 
     return-void
 .end method
@@ -500,15 +500,15 @@
 .method public final c(Ljava/lang/Boolean;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHF:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHX:Ljava/lang/Boolean;
 
     invoke-static {v0, p1}, Lcom/google/android/gms/measurement/internal/it;->b(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
 
@@ -516,27 +516,36 @@
 
     xor-int/lit8 v0, v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHF:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHX:Ljava/lang/Boolean;
 
     return-void
 .end method
 
-.method public final cA(Ljava/lang/String;)V
+.method public final cr(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aFJ:Ljava/lang/String;
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 p1, 0x0
+
+    :cond_0
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
+
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->arG:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/it;->K(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -546,27 +555,36 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aFJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->arG:Ljava/lang/String;
 
     return-void
 .end method
 
-.method public final cB(Ljava/lang/String;)V
+.method public final cs(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHM:Ljava/lang/String;
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 p1, 0x0
+
+    :cond_0
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
+
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aGh:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/it;->K(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -576,9 +594,69 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHM:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aGh:Ljava/lang/String;
+
+    return-void
+.end method
+
+.method public final ct(Ljava/lang/String;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
+
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
+
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Ljava/lang/String;
+
+    invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/it;->K(Ljava/lang/String;Ljava/lang/String;)Z
+
+    move-result v1
+
+    xor-int/lit8 v1, v1, 0x1
+
+    or-int/2addr v0, v1
+
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
+
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Ljava/lang/String;
+
+    return-void
+.end method
+
+.method public final cu(Ljava/lang/String;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
+
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
+
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHO:Ljava/lang/String;
+
+    invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/it;->K(Ljava/lang/String;Ljava/lang/String;)Z
+
+    move-result v1
+
+    xor-int/lit8 v1, v1, 0x1
+
+    or-int/2addr v0, v1
+
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
+
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHO:Ljava/lang/String;
 
     return-void
 .end method
@@ -586,26 +664,17 @@
 .method public final cv(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 p1, 0x0
-
-    :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
-
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aro:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aFZ:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/it;->K(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -615,9 +684,9 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aro:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aFZ:Ljava/lang/String;
 
     return-void
 .end method
@@ -625,26 +694,17 @@
 .method public final cw(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 p1, 0x0
-
-    :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
-
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aFP:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aGb:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/it;->K(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -654,9 +714,9 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aFP:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aGb:Ljava/lang/String;
 
     return-void
 .end method
@@ -664,17 +724,17 @@
 .method public final cx(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHv:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aIe:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/it;->K(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -684,69 +744,9 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHv:Ljava/lang/String;
-
-    return-void
-.end method
-
-.method public final cy(Ljava/lang/String;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
-
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
-
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHw:Ljava/lang/String;
-
-    invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/it;->K(Ljava/lang/String;Ljava/lang/String;)Z
-
-    move-result v1
-
-    xor-int/lit8 v1, v1, 0x1
-
-    or-int/2addr v0, v1
-
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
-
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHw:Ljava/lang/String;
-
-    return-void
-.end method
-
-.method public final cz(Ljava/lang/String;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
-
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
-
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aFH:Ljava/lang/String;
-
-    invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/it;->K(Ljava/lang/String;Ljava/lang/String;)Z
-
-    move-result v1
-
-    xor-int/lit8 v1, v1, 0x1
-
-    or-int/2addr v0, v1
-
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
-
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aFH:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aIe:Ljava/lang/String;
 
     return-void
 .end method
@@ -754,15 +754,15 @@
 .method public final getAppInstanceId()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHu:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHM:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -770,15 +770,15 @@
 .method public final getFirebaseInstanceId()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHO:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -786,31 +786,31 @@
 .method public final getGmpAppId()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aro:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->arG:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final pY()Ljava/lang/String;
+.method public final pW()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDu:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDM:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -818,17 +818,17 @@
 .method public final v(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHy:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHQ:J
 
     cmp-long v3, v1, p1
 
@@ -844,9 +844,9 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHy:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHQ:J
 
     return-void
 .end method
@@ -854,17 +854,17 @@
 .method public final w(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aAK:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aBc:J
 
     cmp-long v3, v1, p1
 
@@ -880,9 +880,9 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aAK:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aBc:J
 
     return-void
 .end method
@@ -890,17 +890,17 @@
 .method public final x(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHB:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHT:J
 
     cmp-long v3, v1, p1
 
@@ -916,73 +916,105 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHB:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ea;->aHT:J
 
     return-void
 .end method
 
-.method public final xG()Ljava/lang/String;
+.method public final xE()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aFP:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aGh:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final yf()Ljava/lang/String;
+.method public final yd()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHv:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final yg()J
+.method public final ye()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHy:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHQ:J
 
     return-wide v0
 .end method
 
+.method public final yf()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHR:J
+
+    return-wide v0
+.end method
+
+.method public final yg()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aFZ:Ljava/lang/String;
+
+    return-object v0
+.end method
+
 .method public final yh()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHz:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHS:J
 
     return-wide v0
 .end method
@@ -990,15 +1022,15 @@
 .method public final yi()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aFH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aGb:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1006,159 +1038,127 @@
 .method public final yj()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHA:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aBc:J
 
     return-wide v0
 .end method
 
-.method public final yk()Ljava/lang/String;
-    .locals 1
+.method public final yk()J
+    .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aFJ:Ljava/lang/String;
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHT:J
 
-    return-object v0
+    return-wide v0
 .end method
 
 .method public final yl()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aAK:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aBd:J
 
     return-wide v0
 .end method
 
-.method public final ym()J
-    .locals 2
+.method public final ym()Z
+    .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHB:J
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHU:Z
 
-    return-wide v0
+    return v0
 .end method
 
 .method public final yn()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
-
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aAL:J
-
-    return-wide v0
-.end method
-
-.method public final yo()Z
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
-
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHC:Z
-
-    return v0
-.end method
-
-.method public final yp()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
-
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHx:J
-
-    return-wide v0
-.end method
-
-.method public final yq()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
-
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHO:J
-
-    return-wide v0
-.end method
-
-.method public final yr()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHP:J
 
     return-wide v0
 .end method
 
-.method public final ys()V
-    .locals 5
+.method public final yo()J
+    .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHx:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIg:J
+
+    return-wide v0
+.end method
+
+.method public final yp()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIh:J
+
+    return-wide v0
+.end method
+
+.method public final yq()V
+    .locals 5
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHP:J
 
     const-wide/16 v2, 0x1
 
@@ -1170,17 +1170,17 @@
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aDu:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ea;->aDM:Ljava/lang/String;
 
-    invoke-static {v1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -1193,94 +1193,94 @@
     :cond_0
     const/4 v2, 0x1
 
-    iput-boolean v2, p0, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHx:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHP:J
 
     return-void
 .end method
 
-.method public final yt()Ljava/lang/String;
+.method public final yr()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aIe:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final yu()J
+.method public final ys()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aFM:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aGe:J
 
     return-wide v0
 .end method
 
-.method public final yv()Z
+.method public final yt()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHD:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHV:Z
 
     return v0
 .end method
 
-.method public final yw()Z
+.method public final yu()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHE:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHW:Z
 
     return v0
 .end method
 
-.method public final yx()Ljava/lang/Boolean;
+.method public final yv()Ljava/lang/Boolean;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHF:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aHX:Ljava/lang/Boolean;
 
     return-object v0
 .end method
 
-.method public final yy()Ljava/util/List;
+.method public final yw()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1291,15 +1291,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aFN:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ea;->aGf:Ljava/util/List;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eb.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eb.smali
index 72a9ff8223..de3c9920a0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eb.smali
@@ -6,5 +6,5 @@
 .method public abstract a(Landroid/content/Context;Landroid/content/Intent;)V
 .end method
 
-.method public abstract vw()Landroid/content/BroadcastReceiver$PendingResult;
+.method public abstract vu()Landroid/content/BroadcastReceiver$PendingResult;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ec.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ec.smali
index ae05d6d09e..148525c77a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ec.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ec.smali
@@ -6,15 +6,15 @@
 
 
 # instance fields
-.field private final synthetic aHQ:J
+.field private final synthetic aHJ:Lcom/google/android/gms/measurement/internal/ek;
 
-.field private final synthetic aHR:Landroid/os/Bundle;
+.field private final synthetic aHK:Lcom/google/android/gms/measurement/internal/dh;
 
-.field private final synthetic aHS:Landroid/content/BroadcastReceiver$PendingResult;
+.field private final synthetic aIi:J
 
-.field private final synthetic aHr:Lcom/google/android/gms/measurement/internal/ek;
+.field private final synthetic aIj:Landroid/os/Bundle;
 
-.field private final synthetic aHs:Lcom/google/android/gms/measurement/internal/dh;
+.field private final synthetic aIk:Landroid/content/BroadcastReceiver$PendingResult;
 
 .field private final synthetic val$context:Landroid/content/Context;
 
@@ -23,17 +23,17 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ek;JLandroid/os/Bundle;Landroid/content/Context;Lcom/google/android/gms/measurement/internal/dh;Landroid/content/BroadcastReceiver$PendingResult;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ec;->aHr:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ec;->aHJ:Lcom/google/android/gms/measurement/internal/ek;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/ec;->aHQ:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/ec;->aIi:J
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ec;->aHR:Landroid/os/Bundle;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ec;->aIj:Landroid/os/Bundle;
 
     iput-object p5, p0, Lcom/google/android/gms/measurement/internal/ec;->val$context:Landroid/content/Context;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ec;->aHs:Lcom/google/android/gms/measurement/internal/dh;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ec;->aHK:Lcom/google/android/gms/measurement/internal/dh;
 
-    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/ec;->aHS:Landroid/content/BroadcastReceiver$PendingResult;
+    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/ec;->aIk:Landroid/content/BroadcastReceiver$PendingResult;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,19 +45,19 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aHr:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aHJ:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGL:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHd:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ec;->aHQ:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ec;->aIi:J
 
     const-wide/16 v4, 0x0
 
@@ -83,14 +83,14 @@
 
     if-lez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aHR:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aIj:Landroid/os/Bundle;
 
     const-string v1, "click_timestamp"
 
     invoke-virtual {v0, v1, v2, v3}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aHR:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aIj:Landroid/os/Bundle;
 
     const-string v1, "_cis"
 
@@ -106,11 +106,11 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ec;->aHR:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ec;->aIj:Landroid/os/Bundle;
 
     const-string v2, "auto"
 
@@ -118,15 +118,15 @@
 
     invoke-virtual {v0, v2, v3, v1}, Lcom/google/android/gms/measurement/internal/fr;->a(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aHs:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aHK:Lcom/google/android/gms/measurement/internal/dh;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Install campaign recorded"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aHS:Landroid/content/BroadcastReceiver$PendingResult;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aIk:Landroid/content/BroadcastReceiver$PendingResult;
 
     if-eqz v0, :cond_3
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ed.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ed.smali
index 5e7716bccc..02af8911c5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ed.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ed.smali
@@ -3,15 +3,15 @@
 
 
 # static fields
-.field private static final aIc:Ljava/util/concurrent/atomic/AtomicLong;
+.field private static final aIu:Ljava/util/concurrent/atomic/AtomicLong;
 
 
 # instance fields
-.field private aHT:Lcom/google/android/gms/measurement/internal/eh;
+.field private aIl:Lcom/google/android/gms/measurement/internal/eh;
 
-.field private aHU:Lcom/google/android/gms/measurement/internal/eh;
+.field private aIm:Lcom/google/android/gms/measurement/internal/eh;
 
-.field private final aHV:Ljava/util/concurrent/PriorityBlockingQueue;
+.field private final aIn:Ljava/util/concurrent/PriorityBlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/PriorityBlockingQueue<",
@@ -21,7 +21,7 @@
     .end annotation
 .end field
 
-.field private final aHW:Ljava/util/concurrent/BlockingQueue;
+.field private final aIo:Ljava/util/concurrent/BlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/BlockingQueue<",
@@ -31,15 +31,15 @@
     .end annotation
 .end field
 
-.field private final aHX:Ljava/lang/Thread$UncaughtExceptionHandler;
+.field private final aIp:Ljava/lang/Thread$UncaughtExceptionHandler;
 
-.field private final aHY:Ljava/lang/Thread$UncaughtExceptionHandler;
+.field private final aIq:Ljava/lang/Thread$UncaughtExceptionHandler;
 
-.field private final aHZ:Ljava/lang/Object;
+.field private final aIr:Ljava/lang/Object;
 
-.field private final aIa:Ljava/util/concurrent/Semaphore;
+.field private final aIs:Ljava/util/concurrent/Semaphore;
 
-.field private volatile aIb:Z
+.field private volatile aIt:Z
 
 
 # direct methods
@@ -52,7 +52,7 @@
 
     invoke-direct {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;-><init>(J)V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ed;->aIc:Ljava/util/concurrent/atomic/AtomicLong;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ed;->aIu:Ljava/util/concurrent/atomic/AtomicLong;
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHZ:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIr:Ljava/lang/Object;
 
     new-instance p1, Ljava/util/concurrent/Semaphore;
 
@@ -74,19 +74,19 @@
 
     invoke-direct {p1, v0}, Ljava/util/concurrent/Semaphore;-><init>(I)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIa:Ljava/util/concurrent/Semaphore;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIs:Ljava/util/concurrent/Semaphore;
 
     new-instance p1, Ljava/util/concurrent/PriorityBlockingQueue;
 
     invoke-direct {p1}, Ljava/util/concurrent/PriorityBlockingQueue;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHV:Ljava/util/concurrent/PriorityBlockingQueue;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIn:Ljava/util/concurrent/PriorityBlockingQueue;
 
     new-instance p1, Ljava/util/concurrent/LinkedBlockingQueue;
 
     invoke-direct {p1}, Ljava/util/concurrent/LinkedBlockingQueue;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHW:Ljava/util/concurrent/BlockingQueue;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIo:Ljava/util/concurrent/BlockingQueue;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ef;
 
@@ -94,7 +94,7 @@
 
     invoke-direct {p1, p0, v0}, Lcom/google/android/gms/measurement/internal/ef;-><init>(Lcom/google/android/gms/measurement/internal/ed;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHX:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIp:Ljava/lang/Thread$UncaughtExceptionHandler;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ef;
 
@@ -102,7 +102,7 @@
 
     invoke-direct {p1, p0, v0}, Lcom/google/android/gms/measurement/internal/ef;-><init>(Lcom/google/android/gms/measurement/internal/ed;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHY:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIq:Ljava/lang/Thread$UncaughtExceptionHandler;
 
     return-void
 .end method
@@ -110,7 +110,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/ed;)Ljava/util/concurrent/Semaphore;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIa:Ljava/util/concurrent/Semaphore;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIs:Ljava/util/concurrent/Semaphore;
 
     return-object p0
 .end method
@@ -125,16 +125,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aHZ:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIr:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHV:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIn:Ljava/util/concurrent/PriorityBlockingQueue;
 
     invoke-virtual {v1, p1}, Ljava/util/concurrent/PriorityBlockingQueue;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHT:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIl:Lcom/google/android/gms/measurement/internal/eh;
 
     if-nez p1, :cond_0
 
@@ -142,28 +142,28 @@
 
     const-string v1, "Measurement Worker"
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ed;->aHV:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ed;->aIn:Ljava/util/concurrent/PriorityBlockingQueue;
 
     invoke-direct {p1, p0, v1, v2}, Lcom/google/android/gms/measurement/internal/eh;-><init>(Lcom/google/android/gms/measurement/internal/ed;Ljava/lang/String;Ljava/util/concurrent/BlockingQueue;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHT:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIl:Lcom/google/android/gms/measurement/internal/eh;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHT:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIl:Lcom/google/android/gms/measurement/internal/eh;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHX:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIp:Ljava/lang/Thread$UncaughtExceptionHandler;
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/eh;->setUncaughtExceptionHandler(Ljava/lang/Thread$UncaughtExceptionHandler;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHT:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIl:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/eh;->start()V
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHT:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIl:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/eh;->yB()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/eh;->yz()V
 
     :goto_0
     monitor-exit v0
@@ -183,7 +183,7 @@
 .method static synthetic b(Lcom/google/android/gms/measurement/internal/ed;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIb:Z
+    iget-boolean p0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIt:Z
 
     return p0
 .end method
@@ -191,7 +191,7 @@
 .method static synthetic c(Lcom/google/android/gms/measurement/internal/ed;)Ljava/lang/Object;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ed;->aHZ:Ljava/lang/Object;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIr:Ljava/lang/Object;
 
     return-object p0
 .end method
@@ -199,7 +199,7 @@
 .method static synthetic d(Lcom/google/android/gms/measurement/internal/ed;)Lcom/google/android/gms/measurement/internal/eh;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ed;->aHT:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIl:Lcom/google/android/gms/measurement/internal/eh;
 
     return-object p0
 .end method
@@ -209,7 +209,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aHT:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIl:Lcom/google/android/gms/measurement/internal/eh;
 
     return-object v0
 .end method
@@ -217,7 +217,7 @@
 .method static synthetic f(Lcom/google/android/gms/measurement/internal/ed;)Lcom/google/android/gms/measurement/internal/eh;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ed;->aHU:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIm:Lcom/google/android/gms/measurement/internal/eh;
 
     return-object p0
 .end method
@@ -227,15 +227,15 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aHU:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIm:Lcom/google/android/gms/measurement/internal/eh;
 
     return-object v0
 .end method
 
-.method static synthetic yA()Ljava/util/concurrent/atomic/AtomicLong;
+.method static synthetic yy()Ljava/util/concurrent/atomic/AtomicLong;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ed;->aIc:Ljava/util/concurrent/atomic/AtomicLong;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ed;->aIu:Ljava/util/concurrent/atomic/AtomicLong;
 
     return-object v0
 .end method
@@ -260,7 +260,7 @@
     monitor-enter p1
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -287,11 +287,11 @@
 
     if-nez p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Timed out waiting for "
 
@@ -317,18 +317,18 @@
     invoke-direct {p2, v0}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
     :goto_0
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_1
     return-object p1
 
     :catch_0
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Interrupted waiting for "
 
@@ -354,7 +354,7 @@
     invoke-direct {p2, v0}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
     :goto_1
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     const/4 p2, 0x0
 
@@ -392,7 +392,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -408,11 +408,11 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHT:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIl:Lcom/google/android/gms/measurement/internal/eh;
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHV:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIn:Ljava/util/concurrent/PriorityBlockingQueue;
 
     invoke-virtual {p1}, Ljava/util/concurrent/PriorityBlockingQueue;->isEmpty()Z
 
@@ -420,15 +420,15 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Callable skipped the worker queue."
 
-    invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->run()V
@@ -462,7 +462,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -478,7 +478,7 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHT:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIl:Lcom/google/android/gms/measurement/internal/eh;
 
     if-ne p1, v1, :cond_0
 
@@ -501,7 +501,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -524,7 +524,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -534,16 +534,16 @@
 
     invoke-direct {v0, p0, p1, v1}, Lcom/google/android/gms/measurement/internal/ei;-><init>(Lcom/google/android/gms/measurement/internal/ed;Ljava/lang/Runnable;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHZ:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIr:Ljava/lang/Object;
 
     monitor-enter p1
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHW:Ljava/util/concurrent/BlockingQueue;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIo:Ljava/util/concurrent/BlockingQueue;
 
     invoke-interface {v1, v0}, Ljava/util/concurrent/BlockingQueue;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aHU:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIm:Lcom/google/android/gms/measurement/internal/eh;
 
     if-nez v0, :cond_0
 
@@ -551,28 +551,28 @@
 
     const-string v1, "Measurement Network"
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ed;->aHW:Ljava/util/concurrent/BlockingQueue;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ed;->aIo:Ljava/util/concurrent/BlockingQueue;
 
     invoke-direct {v0, p0, v1, v2}, Lcom/google/android/gms/measurement/internal/eh;-><init>(Lcom/google/android/gms/measurement/internal/ed;Ljava/lang/String;Ljava/util/concurrent/BlockingQueue;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aHU:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIm:Lcom/google/android/gms/measurement/internal/eh;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aHU:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIm:Lcom/google/android/gms/measurement/internal/eh;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHY:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIq:Ljava/lang/Thread$UncaughtExceptionHandler;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/eh;->setUncaughtExceptionHandler(Ljava/lang/Thread$UncaughtExceptionHandler;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aHU:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIm:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->start()V
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aHU:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aIm:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->yB()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->yz()V
 
     :goto_0
     monitor-exit p1
@@ -599,14 +599,14 @@
     return-object v0
 .end method
 
-.method public final mc()V
+.method public final ma()V
     .locals 2
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHT:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIl:Lcom/google/android/gms/measurement/internal/eh;
 
     if-ne v0, v1, :cond_0
 
@@ -622,14 +622,110 @@
     throw v0
 .end method
 
-.method public final vA()V
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vG()Lcom/google/android/gms/measurement/internal/d;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vH()Lcom/google/android/gms/common/util/e;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vI()Lcom/google/android/gms/measurement/internal/df;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vJ()Lcom/google/android/gms/measurement/internal/it;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vK()Lcom/google/android/gms/measurement/internal/ed;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vL()Lcom/google/android/gms/measurement/internal/dh;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vM()Lcom/google/android/gms/measurement/internal/dp;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vN()Lcom/google/android/gms/measurement/internal/jb;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method protected final vP()Z
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final bridge synthetic vx()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vx()V
+
+    return-void
+.end method
+
+.method public final vy()V
     .locals 2
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHU:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIm:Lcom/google/android/gms/measurement/internal/eh;
 
     if-ne v0, v1, :cond_0
 
@@ -645,110 +741,14 @@
     throw v0
 .end method
 
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vI()Lcom/google/android/gms/measurement/internal/d;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vJ()Lcom/google/android/gms/common/util/e;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vK()Lcom/google/android/gms/measurement/internal/df;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vL()Lcom/google/android/gms/measurement/internal/it;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vM()Lcom/google/android/gms/measurement/internal/ed;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vN()Lcom/google/android/gms/measurement/internal/dh;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vO()Lcom/google/android/gms/measurement/internal/dp;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vP()Lcom/google/android/gms/measurement/internal/jb;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method protected final vR()Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public final bridge synthetic vz()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vz()V
-
-    return-void
-.end method
-
-.method public final yz()Z
+.method public final yx()Z
     .locals 2
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aHT:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aIl:Lcom/google/android/gms/measurement/internal/eh;
 
     if-ne v0, v1, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ee.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ee.smali
index fddde0573a..df3ba66464 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ee.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ee.smali
@@ -6,52 +6,13 @@
 
 
 # static fields
-.field private static aId:I = 0xffff
+.field private static aIv:I = 0xffff
 
-.field private static aIe:I = 0x2
+.field private static aIw:I = 0x2
 
 
 # instance fields
-.field private final aIf:Ljava/util/Map;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ">;>;"
-        }
-    .end annotation
-.end field
-
-.field private final aIg:Ljava/util/Map;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/lang/Boolean;",
-            ">;>;"
-        }
-    .end annotation
-.end field
-
-.field private final aIh:Ljava/util/Map;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/lang/Boolean;",
-            ">;>;"
-        }
-    .end annotation
-.end field
-
-.field private final aIi:Ljava/util/Map;
+.field private final aIA:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -62,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final aIj:Ljava/util/Map;
+.field private final aIB:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -75,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final aIk:Ljava/util/Map;
+.field private final aIC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -86,6 +47,45 @@
     .end annotation
 .end field
 
+.field private final aIx:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+.field private final aIy:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/Boolean;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+.field private final aIz:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/Boolean;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -103,37 +103,37 @@
 
     invoke-direct {p1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ee;->aIf:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ee;->aIx:Ljava/util/Map;
 
     new-instance p1, Landroidx/collection/ArrayMap;
 
     invoke-direct {p1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ee;->aIg:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ee;->aIy:Ljava/util/Map;
 
     new-instance p1, Landroidx/collection/ArrayMap;
 
     invoke-direct {p1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ee;->aIh:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ee;->aIz:Ljava/util/Map;
 
     new-instance p1, Landroidx/collection/ArrayMap;
 
     invoke-direct {p1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ee;->aIi:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ee;->aIA:Ljava/util/Map;
 
     new-instance p1, Landroidx/collection/ArrayMap;
 
     invoke-direct {p1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ee;->aIk:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ee;->aIC:Ljava/util/Map;
 
     new-instance p1, Landroidx/collection/ArrayMap;
 
     invoke-direct {p1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ee;->aIj:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ee;->aIB:Ljava/util/Map;
 
     return-void
 .end method
@@ -158,11 +158,11 @@
 
     if-eqz p0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ap;->arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
     if-eqz v1, :cond_1
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ap;->arq:[Lcom/google/android/gms/internal/measurement/aj$a;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ap;->arI:[Lcom/google/android/gms/internal/measurement/aj$a;
 
     array-length v1, p0
 
@@ -207,11 +207,11 @@
 
     if-eqz p2, :cond_5
 
-    iget-object v3, p2, Lcom/google/android/gms/internal/measurement/ap;->arr:[Lcom/google/android/gms/internal/measurement/aq;
+    iget-object v3, p2, Lcom/google/android/gms/internal/measurement/ap;->arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
     if-eqz v3, :cond_5
 
-    iget-object p2, p2, Lcom/google/android/gms/internal/measurement/ap;->arr:[Lcom/google/android/gms/internal/measurement/aq;
+    iget-object p2, p2, Lcom/google/android/gms/internal/measurement/ap;->arJ:[Lcom/google/android/gms/internal/measurement/aq;
 
     array-length v3, p2
 
@@ -230,22 +230,22 @@
 
     if-eqz v6, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v6, "EventConfig contained null event name"
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_2
 
     :cond_0
     iget-object v6, v5, Lcom/google/android/gms/internal/measurement/aq;->name:Ljava/lang/String;
 
-    invoke-static {v6}, Lcom/google/android/gms/measurement/internal/fl;->cL(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v6}, Lcom/google/android/gms/measurement/internal/fl;->cH(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v6
 
@@ -260,37 +260,37 @@
     :cond_1
     iget-object v6, v5, Lcom/google/android/gms/internal/measurement/aq;->name:Ljava/lang/String;
 
-    iget-object v7, v5, Lcom/google/android/gms/internal/measurement/aq;->arw:Ljava/lang/Boolean;
+    iget-object v7, v5, Lcom/google/android/gms/internal/measurement/aq;->arO:Ljava/lang/Boolean;
 
     invoke-interface {v0, v6, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object v6, v5, Lcom/google/android/gms/internal/measurement/aq;->name:Ljava/lang/String;
 
-    iget-object v7, v5, Lcom/google/android/gms/internal/measurement/aq;->arx:Ljava/lang/Boolean;
+    iget-object v7, v5, Lcom/google/android/gms/internal/measurement/aq;->arP:Ljava/lang/Boolean;
 
     invoke-interface {v1, v6, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v6, v5, Lcom/google/android/gms/internal/measurement/aq;->ary:Ljava/lang/Integer;
+    iget-object v6, v5, Lcom/google/android/gms/internal/measurement/aq;->arQ:Ljava/lang/Integer;
 
     if-eqz v6, :cond_4
 
-    iget-object v6, v5, Lcom/google/android/gms/internal/measurement/aq;->ary:Ljava/lang/Integer;
+    iget-object v6, v5, Lcom/google/android/gms/internal/measurement/aq;->arQ:Ljava/lang/Integer;
 
     invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
 
     move-result v6
 
-    sget v7, Lcom/google/android/gms/measurement/internal/ee;->aIe:I
+    sget v7, Lcom/google/android/gms/measurement/internal/ee;->aIw:I
 
     if-lt v6, v7, :cond_3
 
-    iget-object v6, v5, Lcom/google/android/gms/internal/measurement/aq;->ary:Ljava/lang/Integer;
+    iget-object v6, v5, Lcom/google/android/gms/internal/measurement/aq;->arQ:Ljava/lang/Integer;
 
     invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
 
     move-result v6
 
-    sget v7, Lcom/google/android/gms/measurement/internal/ee;->aId:I
+    sget v7, Lcom/google/android/gms/measurement/internal/ee;->aIv:I
 
     if-le v6, v7, :cond_2
 
@@ -299,7 +299,7 @@
     :cond_2
     iget-object v6, v5, Lcom/google/android/gms/internal/measurement/aq;->name:Ljava/lang/String;
 
-    iget-object v5, v5, Lcom/google/android/gms/internal/measurement/aq;->ary:Ljava/lang/Integer;
+    iget-object v5, v5, Lcom/google/android/gms/internal/measurement/aq;->arQ:Ljava/lang/Integer;
 
     invoke-interface {v2, v6, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -307,15 +307,15 @@
 
     :cond_3
     :goto_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object v7, v5, Lcom/google/android/gms/internal/measurement/aq;->name:Ljava/lang/String;
 
-    iget-object v5, v5, Lcom/google/android/gms/internal/measurement/aq;->ary:Ljava/lang/Integer;
+    iget-object v5, v5, Lcom/google/android/gms/internal/measurement/aq;->arQ:Ljava/lang/Integer;
 
     const-string v8, "Invalid sampling rate. Event name, sample rate"
 
@@ -328,15 +328,15 @@
     goto :goto_0
 
     :cond_5
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ee;->aIg:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ee;->aIy:Ljava/util/Map;
 
     invoke-interface {p2, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ee;->aIh:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ee;->aIz:Ljava/util/Map;
 
     invoke-interface {p2, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ee;->aIj:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ee;->aIB:Ljava/util/Map;
 
     invoke-interface {p2, p1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -368,17 +368,17 @@
     :try_start_0
     invoke-virtual {v0, p2}, Lcom/google/android/gms/internal/measurement/hp;->a(Lcom/google/android/gms/internal/measurement/he;)Lcom/google/android/gms/internal/measurement/hp;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Parsed config. version, gmp_app_id"
 
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arn:Ljava/lang/Long;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/ap;->arF:Ljava/lang/Long;
 
-    iget-object v3, v0, Lcom/google/android/gms/internal/measurement/ap;->aro:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/internal/measurement/ap;->arG:Ljava/lang/String;
 
     invoke-virtual {p2, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
     :try_end_0
@@ -389,13 +389,13 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -410,16 +410,16 @@
     return-object p1
 .end method
 
-.method private final cC(Ljava/lang/String;)V
+.method private final cy(Ljava/lang/String;)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIi:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIA:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -427,11 +427,11 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/jg;->dm(Ljava/lang/String;)[B
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/jg;->di(Ljava/lang/String;)[B
 
     move-result-object v0
 
@@ -439,27 +439,27 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIf:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIx:Ljava/util/Map;
 
     invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIg:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIy:Ljava/util/Map;
 
     invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIh:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIz:Ljava/util/Map;
 
     invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIi:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIA:Ljava/util/Map;
 
     invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIk:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIC:Ljava/util/Map;
 
     invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIj:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIB:Ljava/util/Map;
 
     invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -470,7 +470,7 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ee;->aIf:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ee;->aIx:Ljava/util/Map;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ee;->a(Lcom/google/android/gms/internal/measurement/ap;)Ljava/util/Map;
 
@@ -480,11 +480,11 @@
 
     invoke-direct {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/ee;->a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/ap;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ee;->aIi:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ee;->aIA:Ljava/util/Map;
 
     invoke-interface {v2, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIk:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIC:Ljava/util/Map;
 
     invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -497,11 +497,11 @@
 .method public final D(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cC(Ljava/lang/String;)V
+    invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cy(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIf:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIx:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -528,11 +528,11 @@
 .method final E(Ljava/lang/String;Ljava/lang/String;)Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cC(Ljava/lang/String;)V
+    invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cy(Ljava/lang/String;)V
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cJ(Ljava/lang/String;)Z
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cF(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -540,7 +540,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/it;->cW(Ljava/lang/String;)Z
+    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/it;->cS(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -549,13 +549,13 @@
     return v1
 
     :cond_0
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cK(Ljava/lang/String;)Z
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cG(Ljava/lang/String;)Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/it;->cQ(Ljava/lang/String;)Z
+    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/it;->cM(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -564,7 +564,7 @@
     return v1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIg:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIy:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -600,9 +600,9 @@
 .method final F(Ljava/lang/String;Ljava/lang/String;)Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cC(Ljava/lang/String;)V
+    invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cy(Ljava/lang/String;)V
 
     const-string v0, "ecommerce_purchase"
 
@@ -617,7 +617,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIh:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIz:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -653,11 +653,11 @@
 .method final G(Ljava/lang/String;Ljava/lang/String;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cC(Ljava/lang/String;)V
+    invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cy(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIj:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIB:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -697,11 +697,11 @@
 
     move-object/from16 v2, p1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-direct/range {p0 .. p2}, Lcom/google/android/gms/measurement/internal/ee;->b(Ljava/lang/String;[B)Lcom/google/android/gms/internal/measurement/ap;
 
@@ -709,17 +709,17 @@
 
     invoke-direct {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/ee;->a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/ap;)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ee;->aIi:Ljava/util/Map;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ee;->aIA:Ljava/util/Map;
 
     invoke-interface {v3, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ee;->aIk:Ljava/util/Map;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ee;->aIC:Ljava/util/Map;
 
     move-object/from16 v4, p3
 
     invoke-interface {v3, v2, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ee;->aIf:Ljava/util/Map;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ee;->aIx:Ljava/util/Map;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ee;->a(Lcom/google/android/gms/internal/measurement/ap;)Ljava/util/Map;
 
@@ -727,11 +727,11 @@
 
     invoke-interface {v3, v2, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xQ()Lcom/google/android/gms/measurement/internal/iz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xO()Lcom/google/android/gms/measurement/internal/iz;
 
     move-result-object v3
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ap;->ars:[Lcom/google/android/gms/internal/measurement/ao;
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/ap;->arK:[Lcom/google/android/gms/internal/measurement/ao;
 
     invoke-static {v4}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -748,24 +748,24 @@
 
     aget-object v7, v4, v6
 
-    iget-object v9, v7, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v9, v7, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     if-eqz v9, :cond_4
 
     const/4 v9, 0x0
 
     :goto_1
-    iget-object v10, v7, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v10, v7, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     array-length v10, v10
 
     if-ge v9, v10, :cond_4
 
-    iget-object v10, v7, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v10, v7, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     aget-object v10, v10, v9
 
-    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/dr;->se()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/dr;->sc()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v10
 
@@ -781,17 +781,17 @@
 
     check-cast v11, Lcom/google/android/gms/internal/measurement/ad$a$a;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ad$a$a;->oG()Ljava/lang/String;
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ad$a$a;->oE()Ljava/lang/String;
 
     move-result-object v12
 
-    invoke-static {v12}, Lcom/google/android/gms/measurement/internal/fl;->cL(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v12}, Lcom/google/android/gms/measurement/internal/fl;->cH(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v12
 
     if-eqz v12, :cond_0
 
-    invoke-virtual {v11, v12}, Lcom/google/android/gms/internal/measurement/ad$a$a;->by(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ad$a$a;
+    invoke-virtual {v11, v12}, Lcom/google/android/gms/internal/measurement/ad$a$a;->bt(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ad$a$a;
 
     const/4 v12, 0x1
 
@@ -806,7 +806,7 @@
     const/4 v12, 0x0
 
     :goto_3
-    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ad$a$a;->oH()I
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ad$a$a;->oF()I
 
     move-result v14
 
@@ -818,13 +818,13 @@
 
     iget-object v15, v14, Lcom/google/android/gms/internal/measurement/ad$b;->zzus:Ljava/lang/String;
 
-    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/fk;->cL(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/fk;->cH(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v15
 
     if-eqz v15, :cond_1
 
-    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dr;->se()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dr;->sc()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v13
 
@@ -832,11 +832,11 @@
 
     check-cast v13, Lcom/google/android/gms/internal/measurement/ad$b$a;
 
-    invoke-virtual {v13, v15}, Lcom/google/android/gms/internal/measurement/ad$b$a;->bz(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ad$b$a;
+    invoke-virtual {v13, v15}, Lcom/google/android/gms/internal/measurement/ad$b$a;->bu(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ad$b$a;
 
     move-result-object v13
 
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v13
 
@@ -856,9 +856,9 @@
     :cond_2
     if-eqz v13, :cond_3
 
-    iget-object v10, v7, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v10, v7, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v11
 
@@ -874,34 +874,34 @@
     goto :goto_1
 
     :cond_4
-    iget-object v8, v7, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v8, v7, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     if-eqz v8, :cond_6
 
     const/4 v8, 0x0
 
     :goto_4
-    iget-object v9, v7, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v9, v7, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     array-length v9, v9
 
     if-ge v8, v9, :cond_6
 
-    iget-object v9, v7, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v9, v7, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     aget-object v9, v9, v8
 
     iget-object v10, v9, Lcom/google/android/gms/internal/measurement/ad$d;->zzvh:Ljava/lang/String;
 
-    invoke-static {v10}, Lcom/google/android/gms/measurement/internal/fn;->cL(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v10}, Lcom/google/android/gms/measurement/internal/fn;->cH(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v10
 
     if-eqz v10, :cond_5
 
-    iget-object v11, v7, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v11, v7, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dr;->se()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dr;->sc()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v9
 
@@ -909,11 +909,11 @@
 
     check-cast v9, Lcom/google/android/gms/internal/measurement/ad$d$a;
 
-    invoke-virtual {v9, v10}, Lcom/google/android/gms/internal/measurement/ad$d$a;->bA(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ad$d$a;
+    invoke-virtual {v9, v10}, Lcom/google/android/gms/internal/measurement/ad$d$a;->bv(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ad$d$a;
 
     move-result-object v9
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v9
 
@@ -934,7 +934,7 @@
     goto/16 :goto_0
 
     :cond_7
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
@@ -943,9 +943,9 @@
     const/4 v3, 0x0
 
     :try_start_0
-    iput-object v3, v0, Lcom/google/android/gms/internal/measurement/ap;->ars:[Lcom/google/android/gms/internal/measurement/ao;
+    iput-object v3, v0, Lcom/google/android/gms/internal/measurement/ap;->arK:[Lcom/google/android/gms/internal/measurement/ao;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hp;->sf()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hp;->sd()I
 
     move-result v3
 
@@ -966,13 +966,13 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -983,15 +983,15 @@
     move-object/from16 v3, p2
 
     :goto_5
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v4
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     new-instance v0, Landroid/content/ContentValues;
 
@@ -1026,15 +1026,15 @@
 
     if-nez v0, :cond_8
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Failed to update remote config (got 0). appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -1047,13 +1047,13 @@
     :catch_1
     move-exception v0
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -1066,34 +1066,12 @@
     return v8
 .end method
 
-.method protected final cD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ap;
+.method protected final cA(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
-
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
-
-    invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cC(Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIi:Ljava/util/Map;
-
-    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/google/android/gms/internal/measurement/ap;
-
-    return-object p1
-.end method
-
-.method protected final cE(Ljava/lang/String;)Ljava/lang/String;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIk:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIC:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1104,12 +1082,12 @@
     return-object p1
 .end method
 
-.method protected final cF(Ljava/lang/String;)V
+.method protected final cB(Ljava/lang/String;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIk:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIC:Ljava/util/Map;
 
     const/4 v1, 0x0
 
@@ -1118,24 +1096,24 @@
     return-void
 .end method
 
-.method final cG(Ljava/lang/String;)V
+.method final cC(Ljava/lang/String;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIi:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIA:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
 .end method
 
-.method final cH(Ljava/lang/String;)Z
+.method final cD(Ljava/lang/String;)Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ap;
+    invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cz(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ap;
 
     move-result-object p1
 
@@ -1146,7 +1124,7 @@
     return v0
 
     :cond_0
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ap;->aru:Ljava/lang/Boolean;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ap;->arM:Ljava/lang/Boolean;
 
     if-nez p1, :cond_1
 
@@ -1160,7 +1138,7 @@
     return p1
 .end method
 
-.method final cI(Ljava/lang/String;)J
+.method final cE(Ljava/lang/String;)J
     .locals 3
 
     const-string v0, "measurement.account.time_zone_offset_minutes"
@@ -1187,13 +1165,13 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -1207,7 +1185,7 @@
     return-wide v0
 .end method
 
-.method final cJ(Ljava/lang/String;)Z
+.method final cF(Ljava/lang/String;)Z
     .locals 1
 
     const-string v0, "measurement.upload.blacklist_internal"
@@ -1225,7 +1203,7 @@
     return p1
 .end method
 
-.method final cK(Ljava/lang/String;)Z
+.method final cG(Ljava/lang/String;)Z
     .locals 1
 
     const-string v0, "measurement.upload.blacklist_public"
@@ -1243,6 +1221,28 @@
     return p1
 .end method
 
+.method protected final cz(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ap;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
+
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
+
+    invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/ee;->cy(Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aIA:Ljava/util/Map;
+
+    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/google/android/gms/internal/measurement/ap;
+
+    return-object p1
+.end method
+
 .method public final bridge synthetic getContext()Landroid/content/Context;
     .locals 1
 
@@ -1253,103 +1253,95 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->ma()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -1357,48 +1349,56 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vx()V
 
     return-void
 .end method
 
-.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/ip;
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+
+    return-void
+.end method
+
+.method public final bridge synthetic xN()Lcom/google/android/gms/measurement/internal/ip;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/iz;
+.method public final bridge synthetic xO()Lcom/google/android/gms/measurement/internal/iz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xQ()Lcom/google/android/gms/measurement/internal/iz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xO()Lcom/google/android/gms/measurement/internal/iz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/jg;
+.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/jg;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/ee;
+.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/ee;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ef.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ef.smali
index 1b8abe60b2..cb8fd5e36a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ef.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ef.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final aIl:Ljava/lang/String;
+.field private final aID:Ljava/lang/String;
 
-.field private final synthetic aIm:Lcom/google/android/gms/measurement/internal/ed;
+.field private final synthetic aIE:Lcom/google/android/gms/measurement/internal/ed;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/measurement/internal/ed;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ef;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ef;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ef;->aIl:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ef;->aID:Ljava/lang/String;
 
     return-void
 .end method
@@ -34,15 +34,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ef;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ef;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ef;->aIl:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ef;->aID:Ljava/lang/String;
 
     invoke-virtual {p1, v0, p2}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
     :try_end_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eh.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eh.smali
index 9ade8afa24..41990d155a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eh.smali
@@ -3,11 +3,11 @@
 
 
 # instance fields
-.field private final synthetic aIm:Lcom/google/android/gms/measurement/internal/ed;
+.field private final synthetic aIE:Lcom/google/android/gms/measurement/internal/ed;
 
-.field private final aIn:Ljava/lang/Object;
+.field private final aIF:Ljava/lang/Object;
 
-.field private final aIo:Ljava/util/concurrent/BlockingQueue;
+.field private final aIG:Ljava/util/concurrent/BlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/BlockingQueue<",
@@ -31,7 +31,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-direct {p0}, Ljava/lang/Thread;-><init>()V
 
@@ -43,9 +43,9 @@
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIn:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIF:Ljava/lang/Object;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/eh;->aIo:Ljava/util/concurrent/BlockingQueue;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/eh;->aIG:Ljava/util/concurrent/BlockingQueue;
 
     invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/eh;->setName(Ljava/lang/String;)V
 
@@ -55,13 +55,13 @@
 .method private final a(Ljava/lang/InterruptedException;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->getName()Ljava/lang/String;
 
@@ -93,7 +93,7 @@
     if-nez v0, :cond_0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ed;->a(Lcom/google/android/gms/measurement/internal/ed;)Ljava/util/concurrent/Semaphore;
 
@@ -125,7 +125,7 @@
     move-result v0
 
     :goto_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIo:Ljava/util/concurrent/BlockingQueue;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIG:Ljava/util/concurrent/BlockingQueue;
 
     invoke-interface {v1}, Ljava/util/concurrent/BlockingQueue;->poll()Ljava/lang/Object;
 
@@ -135,7 +135,7 @@
 
     if-eqz v1, :cond_2
 
-    iget-boolean v2, v1, Lcom/google/android/gms/measurement/internal/ei;->aIq:Z
+    iget-boolean v2, v1, Lcom/google/android/gms/measurement/internal/ei;->aII:Z
 
     if-eqz v2, :cond_1
 
@@ -154,14 +154,14 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIn:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIF:Ljava/lang/Object;
 
     monitor-enter v1
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_3
 
     :try_start_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIo:Ljava/util/concurrent/BlockingQueue;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIG:Ljava/util/concurrent/BlockingQueue;
 
     invoke-interface {v2}, Ljava/util/concurrent/BlockingQueue;->peek()Ljava/lang/Object;
 
@@ -169,7 +169,7 @@
 
     if-nez v2, :cond_3
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ed;->b(Lcom/google/android/gms/measurement/internal/ed;)Z
 
@@ -180,7 +180,7 @@
     if-nez v2, :cond_3
 
     :try_start_3
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIn:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIF:Ljava/lang/Object;
 
     const-wide/16 v3, 0x7530
 
@@ -204,7 +204,7 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_2
 
     :try_start_5
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ed;->c(Lcom/google/android/gms/measurement/internal/ed;)Ljava/lang/Object;
 
@@ -215,7 +215,7 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_3
 
     :try_start_6
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIo:Ljava/util/concurrent/BlockingQueue;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIG:Ljava/util/concurrent/BlockingQueue;
 
     invoke-interface {v2}, Ljava/util/concurrent/BlockingQueue;->peek()Ljava/lang/Object;
 
@@ -227,7 +227,7 @@
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ed;->c(Lcom/google/android/gms/measurement/internal/ed;)Ljava/lang/Object;
 
@@ -236,7 +236,7 @@
     monitor-enter v0
 
     :try_start_7
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ed;->a(Lcom/google/android/gms/measurement/internal/ed;)Ljava/util/concurrent/Semaphore;
 
@@ -244,7 +244,7 @@
 
     invoke-virtual {v1}, Ljava/util/concurrent/Semaphore;->release()V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ed;->c(Lcom/google/android/gms/measurement/internal/ed;)Ljava/lang/Object;
 
@@ -252,7 +252,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Object;->notifyAll()V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ed;->d(Lcom/google/android/gms/measurement/internal/ed;)Lcom/google/android/gms/measurement/internal/eh;
 
@@ -260,14 +260,14 @@
 
     if-ne p0, v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ed;->e(Lcom/google/android/gms/measurement/internal/ed;)Lcom/google/android/gms/measurement/internal/eh;
 
     goto :goto_4
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ed;->f(Lcom/google/android/gms/measurement/internal/ed;)Lcom/google/android/gms/measurement/internal/eh;
 
@@ -275,24 +275,24 @@
 
     if-ne p0, v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ed;->g(Lcom/google/android/gms/measurement/internal/ed;)Lcom/google/android/gms/measurement/internal/eh;
 
     goto :goto_4
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Current scheduler thread is neither worker nor network"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :goto_4
     monitor-exit v0
@@ -342,7 +342,7 @@
     :catchall_3
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ed;->c(Lcom/google/android/gms/measurement/internal/ed;)Ljava/lang/Object;
 
@@ -351,7 +351,7 @@
     monitor-enter v1
 
     :try_start_c
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ed;->a(Lcom/google/android/gms/measurement/internal/ed;)Ljava/util/concurrent/Semaphore;
 
@@ -359,7 +359,7 @@
 
     invoke-virtual {v2}, Ljava/util/concurrent/Semaphore;->release()V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ed;->c(Lcom/google/android/gms/measurement/internal/ed;)Ljava/lang/Object;
 
@@ -367,7 +367,7 @@
 
     invoke-virtual {v2}, Ljava/lang/Object;->notifyAll()V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ed;->d(Lcom/google/android/gms/measurement/internal/ed;)Lcom/google/android/gms/measurement/internal/eh;
 
@@ -375,7 +375,7 @@
 
     if-eq p0, v2, :cond_8
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ed;->f(Lcom/google/android/gms/measurement/internal/ed;)Lcom/google/android/gms/measurement/internal/eh;
 
@@ -383,29 +383,29 @@
 
     if-ne p0, v2, :cond_7
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ed;->g(Lcom/google/android/gms/measurement/internal/ed;)Lcom/google/android/gms/measurement/internal/eh;
 
     goto :goto_5
 
     :cond_7
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Current scheduler thread is neither worker nor network"
 
-    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_5
 
     :cond_8
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eh;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ed;->e(Lcom/google/android/gms/measurement/internal/ed;)Lcom/google/android/gms/measurement/internal/eh;
 
@@ -433,15 +433,15 @@
     goto :goto_6
 .end method
 
-.method public final yB()V
+.method public final yz()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aIn:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aIF:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIn:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aIF:Ljava/lang/Object;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notifyAll()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ei.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ei.smali
index 83145898d9..be87b3afef 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ei.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ei.smali
@@ -21,20 +21,20 @@
 
 
 # instance fields
-.field private final aIl:Ljava/lang/String;
+.field private final aID:Ljava/lang/String;
 
-.field private final synthetic aIm:Lcom/google/android/gms/measurement/internal/ed;
+.field private final synthetic aIE:Lcom/google/android/gms/measurement/internal/ed;
 
-.field private final aIp:J
+.field private final aIH:J
 
-.field final aIq:Z
+.field final aII:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ed;Ljava/lang/Runnable;Ljava/lang/String;)V
     .locals 3
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ei;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ei;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     const/4 v0, 0x0
 
@@ -42,7 +42,7 @@
 
     invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ed;->yA()Ljava/util/concurrent/atomic/AtomicLong;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ed;->yy()Ljava/util/concurrent/atomic/AtomicLong;
 
     move-result-object p2
 
@@ -50,15 +50,15 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aIp:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aIH:J
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ei;->aIl:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ei;->aID:Ljava/lang/String;
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/ei;->aIq:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/ei;->aII:Z
 
-    iget-wide p2, p0, Lcom/google/android/gms/measurement/internal/ei;->aIp:J
+    iget-wide p2, p0, Lcom/google/android/gms/measurement/internal/ei;->aIH:J
 
     const-wide v0, 0x7fffffffffffffffL
 
@@ -66,15 +66,15 @@
 
     if-nez v2, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Tasks index overflow"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_0
     return-void
@@ -92,13 +92,13 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ei;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ei;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
     invoke-direct {p0, p2}, Ljava/util/concurrent/FutureTask;-><init>(Ljava/util/concurrent/Callable;)V
 
     invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ed;->yA()Ljava/util/concurrent/atomic/AtomicLong;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ed;->yy()Ljava/util/concurrent/atomic/AtomicLong;
 
     move-result-object p2
 
@@ -106,13 +106,13 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aIp:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aIH:J
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ei;->aIl:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ei;->aID:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/ei;->aIq:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/ei;->aII:Z
 
-    iget-wide p2, p0, Lcom/google/android/gms/measurement/internal/ei;->aIp:J
+    iget-wide p2, p0, Lcom/google/android/gms/measurement/internal/ei;->aIH:J
 
     const-wide v0, 0x7fffffffffffffffL
 
@@ -120,15 +120,15 @@
 
     if-nez p4, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Tasks index overflow"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_0
     return-void
@@ -141,9 +141,9 @@
 
     check-cast p1, Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aIq:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aII:Z
 
-    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/ei;->aIq:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/ei;->aII:Z
 
     const/4 v2, 0x1
 
@@ -159,9 +159,9 @@
     return v2
 
     :cond_1
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aIp:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aIH:J
 
-    iget-wide v4, p1, Lcom/google/android/gms/measurement/internal/ei;->aIp:J
+    iget-wide v4, p1, Lcom/google/android/gms/measurement/internal/ei;->aIH:J
 
     cmp-long p1, v0, v4
 
@@ -177,15 +177,15 @@
     return v2
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ei;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ei;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGg:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGy:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aIp:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aIH:J
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -203,15 +203,15 @@
 .method protected final setException(Ljava/lang/Throwable;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aIm:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aIE:Lcom/google/android/gms/measurement/internal/ed;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ei;->aIl:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ei;->aID:Ljava/lang/String;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ej.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ej.smali
index d05a2d1074..ed05e715fe 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ej.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ej.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field private final aIr:Lcom/google/android/gms/measurement/internal/ek;
+.field private final aIJ:Lcom/google/android/gms/measurement/internal/ek;
 
-.field private final aIs:Lcom/google/android/gms/internal/measurement/ln;
+.field private final aIK:Lcom/google/android/gms/internal/measurement/ln;
 
 
 # direct methods
@@ -17,9 +17,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ej;->aIr:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ej;->aIJ:Lcom/google/android/gms/measurement/internal/ek;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ej;->aIs:Lcom/google/android/gms/internal/measurement/ln;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ej;->aIK:Lcom/google/android/gms/internal/measurement/ln;
 
     return-void
 .end method
@@ -33,9 +33,9 @@
 
     const-string v1, "deeplink"
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ej;->aIr:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ej;->aIJ:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ej;->aIs:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ej;->aIK:Lcom/google/android/gms/internal/measurement/ln;
 
     const/4 v4, 0x1
 
@@ -68,11 +68,11 @@
 
     if-nez v6, :cond_2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -82,7 +82,7 @@
 
     invoke-virtual {p3, v0, p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p1
 
@@ -95,7 +95,7 @@
 
     if-nez p1, :cond_3
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p1
 
@@ -121,7 +121,7 @@
 
     move-result-object p2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p3
 
@@ -169,17 +169,17 @@
     :goto_1
     if-nez v4, :cond_5
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Deferred Deep Link validation failed. gclid, deep link"
 
     invoke-virtual {p3, v0, p2, p1}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p1
 
@@ -196,7 +196,7 @@
 
     invoke-virtual {p3, v0, p2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p2, v2, Lcom/google/android/gms/measurement/internal/ek;->aIE:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object p2, v2, Lcom/google/android/gms/measurement/internal/ek;->aIW:Lcom/google/android/gms/measurement/internal/fr;
 
     const-string v0, "auto"
 
@@ -204,7 +204,7 @@
 
     invoke-virtual {p2, v0, v1, p3}, Lcom/google/android/gms/measurement/internal/fr;->a(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p2
 
@@ -217,17 +217,17 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Failed to parse the Deferred Deep Link response. exception"
 
     invoke-virtual {p2, p3, p1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ek.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ek.smali
index 3d4f737e09..3cac2828f2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ek.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ek.smali
@@ -6,73 +6,73 @@
 
 
 # static fields
-.field private static volatile aIt:Lcom/google/android/gms/measurement/internal/ek;
+.field private static volatile aIL:Lcom/google/android/gms/measurement/internal/ek;
 
 
 # instance fields
-.field final aAM:Z
+.field final aBe:Z
 
-.field final aAP:Ljava/lang/String;
+.field final aBh:Ljava/lang/String;
 
-.field private final aAT:Lcom/google/android/gms/common/util/e;
+.field private final aBl:Lcom/google/android/gms/common/util/e;
 
-.field private final aDK:Lcom/google/android/gms/measurement/internal/ja;
+.field private final aEc:Lcom/google/android/gms/measurement/internal/ja;
 
-.field private final aIA:Lcom/google/android/gms/measurement/internal/hx;
+.field final aIM:Ljava/lang/String;
 
-.field private final aIB:Lcom/google/android/gms/measurement/internal/it;
+.field final aIN:Ljava/lang/String;
 
-.field private final aIC:Lcom/google/android/gms/measurement/internal/df;
+.field final aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-.field private final aID:Lcom/google/android/gms/measurement/internal/gr;
+.field private final aIP:Lcom/google/android/gms/measurement/internal/dp;
 
-.field final aIE:Lcom/google/android/gms/measurement/internal/fr;
+.field final aIQ:Lcom/google/android/gms/measurement/internal/dh;
 
-.field private final aIF:Lcom/google/android/gms/measurement/internal/a;
+.field final aIR:Lcom/google/android/gms/measurement/internal/ed;
 
-.field private final aIG:Lcom/google/android/gms/measurement/internal/gm;
+.field private final aIS:Lcom/google/android/gms/measurement/internal/hx;
 
-.field private aIH:Lcom/google/android/gms/measurement/internal/dd;
+.field private final aIT:Lcom/google/android/gms/measurement/internal/it;
 
-.field private aII:Lcom/google/android/gms/measurement/internal/gw;
+.field private final aIU:Lcom/google/android/gms/measurement/internal/df;
 
-.field private aIJ:Lcom/google/android/gms/measurement/internal/d;
+.field private final aIV:Lcom/google/android/gms/measurement/internal/gr;
 
-.field private aIK:Lcom/google/android/gms/measurement/internal/cz;
+.field final aIW:Lcom/google/android/gms/measurement/internal/fr;
 
-.field aIL:Lcom/google/android/gms/measurement/internal/du;
+.field private final aIX:Lcom/google/android/gms/measurement/internal/a;
 
-.field private aIM:Ljava/lang/Boolean;
+.field private final aIY:Lcom/google/android/gms/measurement/internal/gm;
 
-.field private aIN:J
+.field private aIZ:Lcom/google/android/gms/measurement/internal/dd;
 
-.field private volatile aIO:Ljava/lang/Boolean;
+.field private aJa:Lcom/google/android/gms/measurement/internal/gw;
 
-.field private aIP:Ljava/lang/Boolean;
+.field private aJb:Lcom/google/android/gms/measurement/internal/d;
 
-.field private aIQ:Ljava/lang/Boolean;
+.field private aJc:Lcom/google/android/gms/measurement/internal/cz;
 
-.field aIR:I
+.field aJd:Lcom/google/android/gms/measurement/internal/du;
 
-.field private aIS:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private aJe:Ljava/lang/Boolean;
 
-.field final aIT:J
+.field private aJf:J
 
-.field final aIu:Ljava/lang/String;
+.field private volatile aJg:Ljava/lang/Boolean;
 
-.field final aIv:Ljava/lang/String;
+.field private aJh:Ljava/lang/Boolean;
 
-.field final aIw:Lcom/google/android/gms/measurement/internal/jb;
+.field private aJi:Ljava/lang/Boolean;
 
-.field private final aIx:Lcom/google/android/gms/measurement/internal/dp;
+.field aJj:I
 
-.field final aIy:Lcom/google/android/gms/measurement/internal/dh;
+.field private aJk:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field final aIz:Lcom/google/android/gms/measurement/internal/ed;
+.field final aJl:J
 
-.field private final arZ:Landroid/content/Context;
+.field private asN:Z
 
-.field private asv:Z
+.field private final asr:Landroid/content/Context;
 
 
 # direct methods
@@ -83,13 +83,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asv:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asN:Z
 
     new-instance v1, Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-direct {v1, v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIS:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJk:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -97,45 +97,45 @@
 
     invoke-direct {v1}, Lcom/google/android/gms/measurement/internal/ja;-><init>()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aDK:Lcom/google/android/gms/measurement/internal/ja;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aEc:Lcom/google/android/gms/measurement/internal/ja;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aDK:Lcom/google/android/gms/measurement/internal/ja;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aEc:Lcom/google/android/gms/measurement/internal/ja;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/j;->a(Lcom/google/android/gms/measurement/internal/ja;)V
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->arZ:Landroid/content/Context;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->asr:Landroid/content/Context;
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->arZ:Landroid/content/Context;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->asr:Landroid/content/Context;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aAP:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aBh:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aAP:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aBh:Ljava/lang/String;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aIu:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aIM:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIu:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIM:Ljava/lang/String;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aIv:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aIN:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIv:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIN:Ljava/lang/String;
 
-    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aAM:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aBe:Z
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aAM:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aBe:Z
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aIO:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aJg:Ljava/lang/Boolean;
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Ljava/lang/Boolean;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJg:Ljava/lang/Boolean;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aJm:Lcom/google/android/gms/internal/measurement/zzx;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aJE:Lcom/google/android/gms/internal/measurement/zzx;
 
     if-eqz v1, :cond_1
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/zzx;->aAQ:Landroid/os/Bundle;
+    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/zzx;->aBi:Landroid/os/Bundle;
 
     if-eqz v2, :cond_1
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/zzx;->aAQ:Landroid/os/Bundle;
+    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/zzx;->aBi:Landroid/os/Bundle;
 
     const-string v3, "measurementEnabled"
 
@@ -149,10 +149,10 @@
 
     check-cast v2, Ljava/lang/Boolean;
 
-    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ek;->aIP:Ljava/lang/Boolean;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ek;->aJh:Ljava/lang/Boolean;
 
     :cond_0
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/zzx;->aAQ:Landroid/os/Bundle;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/zzx;->aBi:Landroid/os/Bundle;
 
     const-string v2, "measurementDeactivated"
 
@@ -166,32 +166,32 @@
 
     check-cast v1, Ljava/lang/Boolean;
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIQ:Ljava/lang/Boolean;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJi:Ljava/lang/Boolean;
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->arZ:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->asr:Landroid/content/Context;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bf;->ai(Landroid/content/Context;)V
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->mr()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->mp()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aAT:Lcom/google/android/gms/common/util/e;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aBl:Lcom/google/android/gms/common/util/e;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aAT:Lcom/google/android/gms/common/util/e;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aBl:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
     move-result-wide v1
 
-    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIT:J
+    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJl:J
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/jb;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/jb;-><init>(Lcom/google/android/gms/measurement/internal/ek;)V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/dp;
 
@@ -199,7 +199,7 @@
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fg;->initialize()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIx:Lcom/google/android/gms/measurement/internal/dp;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIP:Lcom/google/android/gms/measurement/internal/dp;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/dh;
 
@@ -207,7 +207,7 @@
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fg;->initialize()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIy:Lcom/google/android/gms/measurement/internal/dh;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIQ:Lcom/google/android/gms/measurement/internal/dh;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/it;
 
@@ -215,7 +215,7 @@
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fg;->initialize()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIB:Lcom/google/android/gms/measurement/internal/it;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIT:Lcom/google/android/gms/measurement/internal/it;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/df;
 
@@ -223,13 +223,13 @@
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fg;->initialize()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIC:Lcom/google/android/gms/measurement/internal/df;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIU:Lcom/google/android/gms/measurement/internal/df;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/a;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/a;-><init>(Lcom/google/android/gms/measurement/internal/ek;)V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIF:Lcom/google/android/gms/measurement/internal/a;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIX:Lcom/google/android/gms/measurement/internal/a;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/gr;
 
@@ -237,7 +237,7 @@
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->initialize()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aID:Lcom/google/android/gms/measurement/internal/gr;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIV:Lcom/google/android/gms/measurement/internal/gr;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/fr;
 
@@ -245,7 +245,7 @@
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->initialize()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIE:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIW:Lcom/google/android/gms/measurement/internal/fr;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/hx;
 
@@ -253,7 +253,7 @@
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->initialize()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIA:Lcom/google/android/gms/measurement/internal/hx;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIS:Lcom/google/android/gms/measurement/internal/hx;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/gm;
 
@@ -261,7 +261,7 @@
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fg;->initialize()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIG:Lcom/google/android/gms/measurement/internal/gm;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIY:Lcom/google/android/gms/measurement/internal/gm;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/ed;
 
@@ -269,17 +269,17 @@
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fg;->initialize()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIz:Lcom/google/android/gms/measurement/internal/ed;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIR:Lcom/google/android/gms/measurement/internal/ed;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aJm:Lcom/google/android/gms/internal/measurement/zzx;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aJE:Lcom/google/android/gms/internal/measurement/zzx;
 
     const/4 v2, 0x1
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aJm:Lcom/google/android/gms/internal/measurement/zzx;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aJE:Lcom/google/android/gms/internal/measurement/zzx;
 
-    iget-wide v3, v1, Lcom/google/android/gms/internal/measurement/zzx;->aAL:J
+    iget-wide v3, v1, Lcom/google/android/gms/internal/measurement/zzx;->aBd:J
 
     const-wide/16 v5, 0x0
 
@@ -297,7 +297,7 @@
     :goto_0
     xor-int/2addr v1, v2
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ek;->arZ:Landroid/content/Context;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ek;->asr:Landroid/content/Context;
 
     invoke-virtual {v2}, Landroid/content/Context;->getApplicationContext()Landroid/content/Context;
 
@@ -307,7 +307,7 @@
 
     if-eqz v2, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v2
 
@@ -333,7 +333,7 @@
 
     check-cast v3, Landroid/app/Application;
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/fr;->aJp:Lcom/google/android/gms/measurement/internal/gk;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/fr;->aJH:Lcom/google/android/gms/measurement/internal/gk;
 
     if-nez v4, :cond_3
 
@@ -341,45 +341,45 @@
 
     invoke-direct {v4, v2, v0}, Lcom/google/android/gms/measurement/internal/gk;-><init>(Lcom/google/android/gms/measurement/internal/fr;B)V
 
-    iput-object v4, v2, Lcom/google/android/gms/measurement/internal/fr;->aJp:Lcom/google/android/gms/measurement/internal/gk;
+    iput-object v4, v2, Lcom/google/android/gms/measurement/internal/fr;->aJH:Lcom/google/android/gms/measurement/internal/gk;
 
     :cond_3
     if-eqz v1, :cond_5
 
-    iget-object v0, v2, Lcom/google/android/gms/measurement/internal/fr;->aJp:Lcom/google/android/gms/measurement/internal/gk;
+    iget-object v0, v2, Lcom/google/android/gms/measurement/internal/fr;->aJH:Lcom/google/android/gms/measurement/internal/gk;
 
     invoke-virtual {v3, v0}, Landroid/app/Application;->unregisterActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
 
-    iget-object v0, v2, Lcom/google/android/gms/measurement/internal/fr;->aJp:Lcom/google/android/gms/measurement/internal/gk;
+    iget-object v0, v2, Lcom/google/android/gms/measurement/internal/fr;->aJH:Lcom/google/android/gms/measurement/internal/gk;
 
     invoke-virtual {v3, v0}, Landroid/app/Application;->registerActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Registered activity lifecycle callback"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_1
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Application context is not an Application"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_5
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIz:Lcom/google/android/gms/measurement/internal/ed;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIR:Lcom/google/android/gms/measurement/internal/ed;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/em;
 
@@ -395,30 +395,30 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/zzx;->aAO:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/zzx;->aBg:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/zzx;->aAP:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/zzx;->aBh:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
     :cond_0
     new-instance v0, Lcom/google/android/gms/internal/measurement/zzx;
 
-    iget-wide v2, p1, Lcom/google/android/gms/internal/measurement/zzx;->aAK:J
+    iget-wide v2, p1, Lcom/google/android/gms/internal/measurement/zzx;->aBc:J
 
-    iget-wide v4, p1, Lcom/google/android/gms/internal/measurement/zzx;->aAL:J
+    iget-wide v4, p1, Lcom/google/android/gms/internal/measurement/zzx;->aBd:J
 
-    iget-boolean v6, p1, Lcom/google/android/gms/internal/measurement/zzx;->aAM:Z
+    iget-boolean v6, p1, Lcom/google/android/gms/internal/measurement/zzx;->aBe:Z
 
-    iget-object v7, p1, Lcom/google/android/gms/internal/measurement/zzx;->aAN:Ljava/lang/String;
+    iget-object v7, p1, Lcom/google/android/gms/internal/measurement/zzx;->aBf:Ljava/lang/String;
 
     const/4 v8, 0x0
 
     const/4 v9, 0x0
 
-    iget-object v10, p1, Lcom/google/android/gms/internal/measurement/zzx;->aAQ:Landroid/os/Bundle;
+    iget-object v10, p1, Lcom/google/android/gms/internal/measurement/zzx;->aBi:Landroid/os/Bundle;
 
     move-object v1, v0
 
@@ -435,7 +435,7 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ek;->aIt:Lcom/google/android/gms/measurement/internal/ek;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ek;->aIL:Lcom/google/android/gms/measurement/internal/ek;
 
     if-nez v0, :cond_3
 
@@ -444,7 +444,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ek;->aIt:Lcom/google/android/gms/measurement/internal/ek;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ek;->aIL:Lcom/google/android/gms/measurement/internal/ek;
 
     if-nez v1, :cond_2
 
@@ -456,7 +456,7 @@
 
     invoke-direct {p0, v1}, Lcom/google/android/gms/measurement/internal/ek;-><init>(Lcom/google/android/gms/measurement/internal/fo;)V
 
-    sput-object p0, Lcom/google/android/gms/measurement/internal/ek;->aIt:Lcom/google/android/gms/measurement/internal/ek;
+    sput-object p0, Lcom/google/android/gms/measurement/internal/ek;->aIL:Lcom/google/android/gms/measurement/internal/ek;
 
     :cond_2
     monitor-exit v0
@@ -475,11 +475,11 @@
     :cond_3
     if-eqz p1, :cond_4
 
-    iget-object p0, p1, Lcom/google/android/gms/internal/measurement/zzx;->aAQ:Landroid/os/Bundle;
+    iget-object p0, p1, Lcom/google/android/gms/internal/measurement/zzx;->aBi:Landroid/os/Bundle;
 
     if-eqz p0, :cond_4
 
-    iget-object p0, p1, Lcom/google/android/gms/internal/measurement/zzx;->aAQ:Landroid/os/Bundle;
+    iget-object p0, p1, Lcom/google/android/gms/internal/measurement/zzx;->aBi:Landroid/os/Bundle;
 
     const-string v0, "dataCollectionDefaultEnabled"
 
@@ -489,9 +489,9 @@
 
     if-eqz p0, :cond_4
 
-    sget-object p0, Lcom/google/android/gms/measurement/internal/ek;->aIt:Lcom/google/android/gms/measurement/internal/ek;
+    sget-object p0, Lcom/google/android/gms/measurement/internal/ek;->aIL:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/zzx;->aAQ:Landroid/os/Bundle;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/zzx;->aBi:Landroid/os/Bundle;
 
     const-string v0, "dataCollectionDefaultEnabled"
 
@@ -503,7 +503,7 @@
 
     :cond_4
     :goto_0
-    sget-object p0, Lcom/google/android/gms/measurement/internal/ek;->aIt:Lcom/google/android/gms/measurement/internal/ek;
+    sget-object p0, Lcom/google/android/gms/measurement/internal/ek;->aIL:Lcom/google/android/gms/measurement/internal/ek;
 
     return-object p0
 .end method
@@ -511,13 +511,13 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/ek;Lcom/google/android/gms/measurement/internal/fo;)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zn()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zl()Ljava/lang/String;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/d;
 
@@ -525,17 +525,17 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fg;->initialize()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIJ:Lcom/google/android/gms/measurement/internal/d;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJb:Lcom/google/android/gms/measurement/internal/d;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/cz;
 
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aAL:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/fo;->aBd:J
 
     invoke-direct {v0, p0, v1, v2}, Lcom/google/android/gms/measurement/internal/cz;-><init>(Lcom/google/android/gms/measurement/internal/ek;J)V
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->initialize()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIK:Lcom/google/android/gms/measurement/internal/cz;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJc:Lcom/google/android/gms/measurement/internal/cz;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dd;
 
@@ -543,7 +543,7 @@
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->initialize()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIH:Lcom/google/android/gms/measurement/internal/dd;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIZ:Lcom/google/android/gms/measurement/internal/dd;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/gw;
 
@@ -551,31 +551,31 @@
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->initialize()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aII:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJa:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIB:Lcom/google/android/gms/measurement/internal/it;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIT:Lcom/google/android/gms/measurement/internal/it;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fg;->yG()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fg;->yE()V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIx:Lcom/google/android/gms/measurement/internal/dp;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIP:Lcom/google/android/gms/measurement/internal/dp;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fg;->yG()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fg;->yE()V
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/du;
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/measurement/internal/du;-><init>(Lcom/google/android/gms/measurement/internal/ek;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIL:Lcom/google/android/gms/measurement/internal/du;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJd:Lcom/google/android/gms/measurement/internal/du;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIK:Lcom/google/android/gms/measurement/internal/cz;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJc:Lcom/google/android/gms/measurement/internal/cz;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->yG()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->yE()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-wide/16 v1, 0x3f7a
 
@@ -587,21 +587,21 @@
 
     invoke-virtual {p1, v2, v1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "To enable debug logging run: adb shell setprop log.tag.FA VERBOSE"
 
-    invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aAP:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aBh:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -609,21 +609,21 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/it;->cX(Ljava/lang/String;)Z
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/it;->cT(Ljava/lang/String;)Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Faster debug mode event logging enabled. To disable, run:\n  adb shell setprop debug.firebase.analytics.app .none."
 
@@ -636,11 +636,11 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "To enable faster debug mode event logging run:\n  adb shell setprop debug.firebase.analytics.app "
 
@@ -666,22 +666,22 @@
     invoke-direct {p1, v1}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
 
     :goto_0
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Debug-level message logging enabled"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIR:I
+    iget p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJj:I
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIS:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJk:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -689,19 +689,19 @@
 
     if-eq p1, v0, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIR:I
+    iget v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJj:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIS:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJk:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -718,7 +718,7 @@
     :cond_3
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ek;->asv:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ek;->asN:Z
 
     return-void
 .end method
@@ -894,10 +894,10 @@
     return-object p0
 .end method
 
-.method private final vy()V
+.method private final vw()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asN:Z
 
     if-eqz v0, :cond_0
 
@@ -913,7 +913,7 @@
     throw v0
 .end method
 
-.method static vz()V
+.method static vx()V
     .locals 2
 
     new-instance v0, Ljava/lang/IllegalStateException;
@@ -925,14 +925,14 @@
     throw v0
 .end method
 
-.method private final yC()Lcom/google/android/gms/measurement/internal/gm;
+.method private final yA()Lcom/google/android/gms/measurement/internal/gm;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIG:Lcom/google/android/gms/measurement/internal/gm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIY:Lcom/google/android/gms/measurement/internal/gm;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fg;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIG:Lcom/google/android/gms/measurement/internal/gm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIY:Lcom/google/android/gms/measurement/internal/gm;
 
     return-object v0
 .end method
@@ -942,37 +942,37 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/ln;)V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ek;->yC()Lcom/google/android/gms/measurement/internal/gm;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ek;->yA()Lcom/google/android/gms/measurement/internal/gm;
 
     move-result-object v0
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fg;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    invoke-virtual {v1, v0}, Lcom/google/android/gms/measurement/internal/dp;->cp(Ljava/lang/String;)Landroid/util/Pair;
+    invoke-virtual {v1, v0}, Lcom/google/android/gms/measurement/internal/dp;->cl(Ljava/lang/String;)Landroid/util/Pair;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jb;->zr()Ljava/lang/Boolean;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jb;->zp()Ljava/lang/Boolean;
 
     move-result-object v2
 
@@ -997,27 +997,27 @@
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ek;->yC()Lcom/google/android/gms/measurement/internal/gm;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ek;->yA()Lcom/google/android/gms/measurement/internal/gm;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gm;->xO()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gm;->xM()Z
 
     move-result v2
 
     if-nez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Network is not available for Deferred Deep Link request. Skipping"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
@@ -1026,11 +1026,11 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     const-wide/16 v3, 0x3f7a
 
@@ -1042,7 +1042,7 @@
 
     move-result-object v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ek;->yC()Lcom/google/android/gms/measurement/internal/gm;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ek;->yA()Lcom/google/android/gms/measurement/internal/gm;
 
     move-result-object v2
 
@@ -1050,15 +1050,15 @@
 
     invoke-direct {v3, p0, p1}, Lcom/google/android/gms/measurement/internal/ej;-><init>(Lcom/google/android/gms/measurement/internal/ek;Lcom/google/android/gms/internal/measurement/ln;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p1
 
@@ -1072,17 +1072,17 @@
 
     :cond_2
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "ADID unavailable to retrieve Deferred Deep Link. Skipping"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
@@ -1094,7 +1094,7 @@
 .method public final getContext()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->arZ:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asr:Landroid/content/Context;
 
     return-object v0
 .end method
@@ -1102,17 +1102,17 @@
 .method public final isEnabled()Z
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ek;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ek;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFa:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFs:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -1126,9 +1126,9 @@
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->zq()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->zo()Z
 
     move-result v0
 
@@ -1137,7 +1137,7 @@
     return v3
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIQ:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJi:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_1
 
@@ -1150,11 +1150,11 @@
     return v3
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->xZ()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->xX()Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1167,9 +1167,9 @@
     return v0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/jb;->cZ(Ljava/lang/String;)Ljava/lang/Boolean;
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/jb;->cV(Ljava/lang/String;)Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1182,7 +1182,7 @@
     return v0
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIP:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJh:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_4
 
@@ -1193,7 +1193,7 @@
     return v0
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lJ()Z
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lH()Z
 
     move-result v0
 
@@ -1202,9 +1202,9 @@
     return v3
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aEV:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFn:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -1212,11 +1212,11 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJg:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJg:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1228,9 +1228,9 @@
     return v1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->zq()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->zo()Z
 
     move-result v0
 
@@ -1239,9 +1239,9 @@
     return v3
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/jb;->cZ(Ljava/lang/String;)Ljava/lang/Boolean;
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/jb;->cV(Ljava/lang/String;)Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1254,7 +1254,7 @@
     goto :goto_0
 
     :cond_9
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lJ()Z
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lH()Z
 
     move-result v0
 
@@ -1262,11 +1262,11 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJg:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_a
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aEV:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFn:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v2, 0x0
 
@@ -1282,7 +1282,7 @@
 
     if-eqz v1, :cond_a
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJg:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1290,11 +1290,11 @@
 
     :cond_a
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    invoke-virtual {v1, v0}, Lcom/google/android/gms/measurement/internal/dp;->R(Z)Z
+    invoke-virtual {v1, v0}, Lcom/google/android/gms/measurement/internal/dp;->P(Z)Z
 
     move-result v0
 
@@ -1304,17 +1304,17 @@
 .method protected final start()V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGG:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -1326,13 +1326,13 @@
 
     if-nez v4, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGG:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aAT:Lcom/google/android/gms/common/util/e;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aBl:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
@@ -1341,11 +1341,11 @@
     invoke-virtual {v0, v4, v5}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGL:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHd:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -1355,13 +1355,13 @@
 
     if-nez v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIT:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJl:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -1371,18 +1371,18 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGL:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHd:Lcom/google/android/gms/measurement/internal/dt;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIT:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJl:J
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->yF()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->yD()Z
 
     move-result v0
 
@@ -1394,73 +1394,73 @@
 
     if-eqz v0, :cond_d
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     const-string v1, "android.permission.INTERNET"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/it;->cV(Ljava/lang/String;)Z
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/it;->cR(Ljava/lang/String;)Z
 
     move-result v0
 
     if-nez v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "App is missing INTERNET permission"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     const-string v1, "android.permission.ACCESS_NETWORK_STATE"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/it;->cV(Ljava/lang/String;)Z
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/it;->cR(Ljava/lang/String;)Z
 
     move-result v0
 
     if-nez v0, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "App is missing ACCESS_NETWORK_STATE permission"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->arZ:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asr:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/common/c/c;->Y(Landroid/content/Context;)Lcom/google/android/gms/common/c/b;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/c/b;->mD()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/c/b;->mB()Z
 
     move-result v0
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->mQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->mO()Z
 
     move-result v0
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->arZ:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asr:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dz;->at(Landroid/content/Context;)Z
 
@@ -1468,18 +1468,18 @@
 
     if-nez v0, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "AppMeasurementReceiver not registered/enabled"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->arZ:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asr:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/it;->av(Landroid/content/Context;)Z
 
@@ -1487,31 +1487,31 @@
 
     if-nez v0, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "AppMeasurementService not registered/enabled"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Uploading is not possible. App measurement disabled"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto/16 :goto_0
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
@@ -1525,11 +1525,11 @@
 
     if-eqz v0, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->xG()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->xE()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1540,9 +1540,9 @@
     if-nez v0, :cond_9
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
@@ -1550,27 +1550,27 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dp;->xV()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dp;->xT()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->xG()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->xE()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dp;->xW()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dp;->xU()Ljava/lang/String;
 
     move-result-object v3
 
@@ -1580,62 +1580,62 @@
 
     if-eqz v0, :cond_8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Rechecking which service to use due to a GMP App Id change"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->xY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->xW()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dd;->xJ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dd;->xH()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aII:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJa:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->disconnect()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aII:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJa:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yP()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGL:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHd:Lcom/google/android/gms/measurement/internal/dt;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIT:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJl:J
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGN:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHf:Lcom/google/android/gms/measurement/internal/dv;
 
     const/4 v1, 0x0
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dv;->cu(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dv;->cq(Ljava/lang/String;)V
 
     :cond_8
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v1
 
@@ -1643,40 +1643,40 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dp;->cr(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dp;->cn(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->xG()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->xE()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dp;->cs(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dp;->co(Ljava/lang/String;)V
 
     :cond_9
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aGN:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aHf:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dv;->ye()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dv;->yc()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/fr;->cM(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/fr;->cI(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
@@ -1690,11 +1690,11 @@
 
     if-eqz v0, :cond_a
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->xG()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->xE()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1709,11 +1709,11 @@
 
     move-result v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aGE:Landroid/content/SharedPreferences;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aGW:Landroid/content/SharedPreferences;
 
     const-string v2, "deferred_analytics_collection"
 
@@ -1723,33 +1723,33 @@
 
     if-nez v1, :cond_b
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->zq()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->zo()Z
 
     move-result v1
 
     if-nez v1, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
     xor-int/lit8 v2, v0, 0x1
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dp;->S(Z)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dp;->Q(Z)V
 
     :cond_b
     if-eqz v0, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fr;->yK()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fr;->yI()V
 
     :cond_c
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
@@ -1761,15 +1761,15 @@
 
     :cond_d
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGV:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHn:Lcom/google/android/gms/measurement/internal/dr;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFj:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFB:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -1777,15 +1777,15 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dr;->set(Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGW:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHo:Lcom/google/android/gms/measurement/internal/dr;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFk:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFC:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -1796,10 +1796,162 @@
     return-void
 .end method
 
-.method public final vB()Lcom/google/android/gms/measurement/internal/a;
+.method public final vA()Lcom/google/android/gms/measurement/internal/fr;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIW:Lcom/google/android/gms/measurement/internal/fr;
+
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fb;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIW:Lcom/google/android/gms/measurement/internal/fr;
+
+    return-object v0
+.end method
+
+.method public final vB()Lcom/google/android/gms/measurement/internal/cz;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJc:Lcom/google/android/gms/measurement/internal/cz;
+
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fb;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJc:Lcom/google/android/gms/measurement/internal/cz;
+
+    return-object v0
+.end method
+
+.method public final vC()Lcom/google/android/gms/measurement/internal/gw;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJa:Lcom/google/android/gms/measurement/internal/gw;
+
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fb;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJa:Lcom/google/android/gms/measurement/internal/gw;
+
+    return-object v0
+.end method
+
+.method public final vD()Lcom/google/android/gms/measurement/internal/gr;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIV:Lcom/google/android/gms/measurement/internal/gr;
+
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fb;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIV:Lcom/google/android/gms/measurement/internal/gr;
+
+    return-object v0
+.end method
+
+.method public final vE()Lcom/google/android/gms/measurement/internal/dd;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIZ:Lcom/google/android/gms/measurement/internal/dd;
+
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fb;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIZ:Lcom/google/android/gms/measurement/internal/dd;
+
+    return-object v0
+.end method
+
+.method public final vF()Lcom/google/android/gms/measurement/internal/hx;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIS:Lcom/google/android/gms/measurement/internal/hx;
+
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fb;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIS:Lcom/google/android/gms/measurement/internal/hx;
+
+    return-object v0
+.end method
+
+.method public final vG()Lcom/google/android/gms/measurement/internal/d;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJb:Lcom/google/android/gms/measurement/internal/d;
+
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fg;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJb:Lcom/google/android/gms/measurement/internal/d;
+
+    return-object v0
+.end method
+
+.method public final vH()Lcom/google/android/gms/common/util/e;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aBl:Lcom/google/android/gms/common/util/e;
+
+    return-object v0
+.end method
+
+.method public final vI()Lcom/google/android/gms/measurement/internal/df;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIU:Lcom/google/android/gms/measurement/internal/df;
+
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fh;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIU:Lcom/google/android/gms/measurement/internal/df;
+
+    return-object v0
+.end method
+
+.method public final vJ()Lcom/google/android/gms/measurement/internal/it;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIT:Lcom/google/android/gms/measurement/internal/it;
+
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fh;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIT:Lcom/google/android/gms/measurement/internal/it;
+
+    return-object v0
+.end method
+
+.method public final vK()Lcom/google/android/gms/measurement/internal/ed;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIR:Lcom/google/android/gms/measurement/internal/ed;
+
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fg;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIR:Lcom/google/android/gms/measurement/internal/ed;
+
+    return-object v0
+.end method
+
+.method public final vL()Lcom/google/android/gms/measurement/internal/dh;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIQ:Lcom/google/android/gms/measurement/internal/dh;
+
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fg;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIQ:Lcom/google/android/gms/measurement/internal/dh;
+
+    return-object v0
+.end method
+
+.method public final vM()Lcom/google/android/gms/measurement/internal/dp;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIP:Lcom/google/android/gms/measurement/internal/dp;
+
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fh;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIP:Lcom/google/android/gms/measurement/internal/dp;
+
+    return-object v0
+.end method
+
+.method public final vz()Lcom/google/android/gms/measurement/internal/a;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIF:Lcom/google/android/gms/measurement/internal/a;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIX:Lcom/google/android/gms/measurement/internal/a;
 
     if-eqz v0, :cond_0
 
@@ -1815,166 +1967,14 @@
     throw v0
 .end method
 
-.method public final vC()Lcom/google/android/gms/measurement/internal/fr;
+.method public final yB()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIE:Lcom/google/android/gms/measurement/internal/fr;
-
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fb;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIE:Lcom/google/android/gms/measurement/internal/fr;
-
-    return-object v0
-.end method
-
-.method public final vD()Lcom/google/android/gms/measurement/internal/cz;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIK:Lcom/google/android/gms/measurement/internal/cz;
-
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fb;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIK:Lcom/google/android/gms/measurement/internal/cz;
-
-    return-object v0
-.end method
-
-.method public final vE()Lcom/google/android/gms/measurement/internal/gw;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aII:Lcom/google/android/gms/measurement/internal/gw;
-
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fb;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aII:Lcom/google/android/gms/measurement/internal/gw;
-
-    return-object v0
-.end method
-
-.method public final vF()Lcom/google/android/gms/measurement/internal/gr;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aID:Lcom/google/android/gms/measurement/internal/gr;
-
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fb;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aID:Lcom/google/android/gms/measurement/internal/gr;
-
-    return-object v0
-.end method
-
-.method public final vG()Lcom/google/android/gms/measurement/internal/dd;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIH:Lcom/google/android/gms/measurement/internal/dd;
-
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fb;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIH:Lcom/google/android/gms/measurement/internal/dd;
-
-    return-object v0
-.end method
-
-.method public final vH()Lcom/google/android/gms/measurement/internal/hx;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIA:Lcom/google/android/gms/measurement/internal/hx;
-
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fb;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIA:Lcom/google/android/gms/measurement/internal/hx;
-
-    return-object v0
-.end method
-
-.method public final vI()Lcom/google/android/gms/measurement/internal/d;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIJ:Lcom/google/android/gms/measurement/internal/d;
-
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fg;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIJ:Lcom/google/android/gms/measurement/internal/d;
-
-    return-object v0
-.end method
-
-.method public final vJ()Lcom/google/android/gms/common/util/e;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aAT:Lcom/google/android/gms/common/util/e;
-
-    return-object v0
-.end method
-
-.method public final vK()Lcom/google/android/gms/measurement/internal/df;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIC:Lcom/google/android/gms/measurement/internal/df;
-
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fh;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIC:Lcom/google/android/gms/measurement/internal/df;
-
-    return-object v0
-.end method
-
-.method public final vL()Lcom/google/android/gms/measurement/internal/it;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIB:Lcom/google/android/gms/measurement/internal/it;
-
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fh;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIB:Lcom/google/android/gms/measurement/internal/it;
-
-    return-object v0
-.end method
-
-.method public final vM()Lcom/google/android/gms/measurement/internal/ed;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIz:Lcom/google/android/gms/measurement/internal/ed;
-
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fg;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIz:Lcom/google/android/gms/measurement/internal/ed;
-
-    return-object v0
-.end method
-
-.method public final vN()Lcom/google/android/gms/measurement/internal/dh;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIy:Lcom/google/android/gms/measurement/internal/dh;
-
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fg;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIy:Lcom/google/android/gms/measurement/internal/dh;
-
-    return-object v0
-.end method
-
-.method public final vO()Lcom/google/android/gms/measurement/internal/dp;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIx:Lcom/google/android/gms/measurement/internal/dp;
-
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/fh;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIx:Lcom/google/android/gms/measurement/internal/dp;
-
-    return-object v0
-.end method
-
-.method public final yD()Z
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJg:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJg:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1992,32 +1992,32 @@
     return v0
 .end method
 
-.method final yE()V
+.method final yC()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIS:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJk:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
     return-void
 .end method
 
-.method protected final yF()Z
+.method protected final yD()Z
     .locals 6
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ek;->vy()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ek;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIM:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJe:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIN:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJf:J
 
     const-wide/16 v3, 0x0
 
@@ -2033,13 +2033,13 @@
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aAT:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aBl:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->elapsedRealtime()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ek;->aIN:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ek;->aJf:J
 
     sub-long/2addr v0, v2
 
@@ -2054,21 +2054,21 @@
     if-lez v4, :cond_5
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aAT:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aBl:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->elapsedRealtime()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIN:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJf:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     const-string v1, "android.permission.INTERNET"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/it;->cV(Ljava/lang/String;)Z
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/it;->cR(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -2078,39 +2078,39 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     const-string v3, "android.permission.ACCESS_NETWORK_STATE"
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/it;->cV(Ljava/lang/String;)Z
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/it;->cR(Ljava/lang/String;)Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->arZ:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asr:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/common/c/c;->Y(Landroid/content/Context;)Lcom/google/android/gms/common/c/b;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/c/b;->mD()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/c/b;->mB()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->mQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->mO()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->arZ:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asr:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dz;->at(Landroid/content/Context;)Z
 
@@ -2118,7 +2118,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->arZ:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asr:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/it;->av(Landroid/content/Context;)Z
 
@@ -2139,9 +2139,9 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIM:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJe:Ljava/lang/Boolean;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIM:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJe:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -2149,11 +2149,11 @@
 
     if-eqz v0, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v3
 
@@ -2161,11 +2161,11 @@
 
     move-result-object v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cz;->xG()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cz;->xE()Ljava/lang/String;
 
     move-result-object v4
 
@@ -2175,11 +2175,11 @@
 
     if-nez v0, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->xG()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->xE()Ljava/lang/String;
 
     move-result-object v0
 
@@ -2200,10 +2200,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIM:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJe:Ljava/lang/Boolean;
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aIM:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aJe:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -2219,7 +2219,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aJg:Ljava/lang/Boolean;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/el.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/el.smali
index 43d8c1c6b0..142c80d935 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/el.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/el.smali
@@ -3,11 +3,11 @@
 
 
 # instance fields
-.field final aGw:Lcom/google/android/gms/measurement/internal/ii;
+.field final aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-.field private aIU:Ljava/lang/Boolean;
+.field private aJm:Ljava/lang/Boolean;
 
-.field private aIV:Ljava/lang/String;
+.field private aJn:Ljava/lang/String;
 
 
 # direct methods
@@ -28,11 +28,11 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->aIV:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->aJn:Ljava/lang/String;
 
     return-void
 .end method
@@ -40,7 +40,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
     return-object p0
 .end method
@@ -56,17 +56,17 @@
 
     invoke-direct {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/el;->e(Ljava/lang/String;Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/android/gms/measurement/internal/it;->J(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -89,13 +89,13 @@
     if-eqz p2, :cond_3
 
     :try_start_0
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aIU:Ljava/lang/Boolean;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aJm:Ljava/lang/Boolean;
 
     if-nez p2, :cond_2
 
     const-string p2, "com.google.android.gms"
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/el;->aIV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/el;->aJn:Ljava/lang/String;
 
     invoke-virtual {p2, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -103,7 +103,7 @@
 
     if-nez p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->getContext()Landroid/content/Context;
 
@@ -119,7 +119,7 @@
 
     if-nez p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->getContext()Landroid/content/Context;
 
@@ -155,10 +155,10 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aIU:Ljava/lang/Boolean;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aJm:Ljava/lang/Boolean;
 
     :cond_2
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aIU:Ljava/lang/Boolean;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aJm:Ljava/lang/Boolean;
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -167,11 +167,11 @@
     if-nez p2, :cond_5
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aIV:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aJn:Ljava/lang/String;
 
     if-nez p2, :cond_4
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->getContext()Landroid/content/Context;
 
@@ -187,10 +187,10 @@
 
     if-eqz p2, :cond_4
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->aIV:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->aJn:Ljava/lang/String;
 
     :cond_4
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aIV:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aJn:Ljava/lang/String;
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -223,15 +223,15 @@
     :catch_0
     move-exception p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -242,17 +242,17 @@
     throw p2
 
     :cond_7
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Measurement Service called without app package"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     new-instance p1, Ljava/lang/SecurityException;
 
@@ -266,13 +266,13 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yz()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yx()Z
 
     move-result v0
 
@@ -283,9 +283,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -311,9 +311,9 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/el;->e(Lcom/google/android/gms/measurement/internal/zzn;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -362,7 +362,7 @@
 
     iget-object v3, v2, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/it;->cW(Ljava/lang/String;)Z
+    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/it;->cS(Ljava/lang/String;)Z
 
     move-result v3
 
@@ -392,17 +392,17 @@
     move-exception p2
 
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -432,9 +432,9 @@
 
     invoke-direct {p0, p3}, Lcom/google/android/gms/measurement/internal/el;->e(Lcom/google/android/gms/measurement/internal/zzn;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -467,13 +467,13 @@
     move-exception p1
 
     :goto_0
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Failed to get conditional user properties"
 
@@ -505,9 +505,9 @@
 
     invoke-direct {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/el;->e(Ljava/lang/String;Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -556,7 +556,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-static {v1}, Lcom/google/android/gms/measurement/internal/it;->cW(Ljava/lang/String;)Z
+    invoke-static {v1}, Lcom/google/android/gms/measurement/internal/it;->cS(Ljava/lang/String;)Z
 
     move-result v1
 
@@ -586,15 +586,15 @@
     move-exception p2
 
     :goto_1
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -627,9 +627,9 @@
 
     invoke-direct {p0, p4}, Lcom/google/android/gms/measurement/internal/el;->e(Lcom/google/android/gms/measurement/internal/zzn;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -678,7 +678,7 @@
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-static {v1}, Lcom/google/android/gms/measurement/internal/it;->cW(Ljava/lang/String;)Z
+    invoke-static {v1}, Lcom/google/android/gms/measurement/internal/it;->cS(Ljava/lang/String;)Z
 
     move-result v1
 
@@ -708,17 +708,17 @@
     move-exception p1
 
     :goto_1
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object p3, p4, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {p3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p3
 
@@ -778,7 +778,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const/4 p3, 0x1
 
@@ -843,7 +843,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -857,7 +857,7 @@
 
     invoke-direct {v0, p1}, Lcom/google/android/gms/measurement/internal/zzq;-><init>(Lcom/google/android/gms/measurement/internal/zzq;)V
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzjn;->getValue()Ljava/lang/Object;
 
@@ -888,7 +888,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -902,7 +902,7 @@
 
     iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzjn;->getValue()Ljava/lang/Object;
 
@@ -931,7 +931,7 @@
 .method public final a(Lcom/google/android/gms/measurement/internal/zzai;Ljava/lang/String;)[B
     .locals 9
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -939,25 +939,25 @@
 
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/measurement/internal/el;->e(Ljava/lang/String;Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v1
 
     iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -965,9 +965,9 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -979,9 +979,9 @@
 
     div-long/2addr v0, v2
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ii;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ii;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v4
 
@@ -1002,17 +1002,17 @@
 
     if-nez v4, :cond_0
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Log and bundle returned null. appId"
 
-    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v6
 
@@ -1023,9 +1023,9 @@
     new-array v4, v4, [B
 
     :cond_0
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ii;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ii;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v5
 
@@ -1035,27 +1035,27 @@
 
     div-long/2addr v5, v2
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Log and bundle processed. event, size, time_ms"
 
-    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v7
 
     iget-object v8, p1, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v7
 
@@ -1087,29 +1087,29 @@
     move-exception v0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p2
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v2
 
     iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    invoke-virtual {v2, p1}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, p1}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -1141,7 +1141,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/el;->e(Lcom/google/android/gms/measurement/internal/zzn;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/ii;->h(Lcom/google/android/gms/measurement/internal/zzn;)Ljava/lang/String;
 
@@ -1169,9 +1169,9 @@
 
     invoke-direct {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/el;->e(Ljava/lang/String;Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -1204,13 +1204,13 @@
     move-exception p1
 
     :goto_0
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Failed to get conditional user properties"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/em.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/em.smali
index f7d97ba030..f4cda2092f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/em.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/em.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aIW:Lcom/google/android/gms/measurement/internal/fo;
+.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fo;
 
-.field private final synthetic aIX:Lcom/google/android/gms/measurement/internal/ek;
+.field private final synthetic aJp:Lcom/google/android/gms/measurement/internal/ek;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ek;Lcom/google/android/gms/measurement/internal/fo;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aIX:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aJp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->aIW:Lcom/google/android/gms/measurement/internal/fo;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->aJo:Lcom/google/android/gms/measurement/internal/fo;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,13 +29,13 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/em;->aIX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/em;->aJp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/em;->aIW:Lcom/google/android/gms/measurement/internal/fo;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/em;->aJo:Lcom/google/android/gms/measurement/internal/fo;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/measurement/internal/ek;->a(Lcom/google/android/gms/measurement/internal/ek;Lcom/google/android/gms/measurement/internal/fo;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/em;->aIX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/em;->aJp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->start()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/en.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/en.smali
index 45418e35e1..eaae948826 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/en.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/en.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic aIY:Lcom/google/android/gms/measurement/internal/zzq;
+.field private final synthetic aJq:Lcom/google/android/gms/measurement/internal/zzq;
 
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzq;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/en;->aIY:Lcom/google/android/gms/measurement/internal/zzq;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/en;->aJq:Lcom/google/android/gms/measurement/internal/zzq;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/en;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/en;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,23 +33,23 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/en;->aIY:Lcom/google/android/gms/measurement/internal/zzq;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/en;->aJq:Lcom/google/android/gms/measurement/internal/zzq;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/en;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/en;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ii;->c(Lcom/google/android/gms/measurement/internal/zzq;Lcom/google/android/gms/measurement/internal/zzn;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eo.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eo.smali
index 28e7728478..f58df28ecd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eo.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eo.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eo;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eo;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/eo;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/eo;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,29 +29,29 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eo;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eo;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ii;->g(Lcom/google/android/gms/measurement/internal/zzn;)Lcom/google/android/gms/measurement/internal/ea;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ep.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ep.smali
index f3fda5e016..d0d4acf8d4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ep.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ep.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aIY:Lcom/google/android/gms/measurement/internal/zzq;
+.field private final synthetic aJq:Lcom/google/android/gms/measurement/internal/zzq;
 
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzq;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ep;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ep;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ep;->aIY:Lcom/google/android/gms/measurement/internal/zzq;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ep;->aJq:Lcom/google/android/gms/measurement/internal/zzq;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,25 +29,25 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ep;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ep;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ep;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ep;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ep;->aIY:Lcom/google/android/gms/measurement/internal/zzq;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ep;->aJq:Lcom/google/android/gms/measurement/internal/zzq;
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/ii;->cO(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/ii;->cK(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eq.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eq.smali
index d5123cbb94..b0f0e3a159 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eq.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic aIY:Lcom/google/android/gms/measurement/internal/zzq;
+.field private final synthetic aJq:Lcom/google/android/gms/measurement/internal/zzq;
 
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzq;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eq;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eq;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/eq;->aIY:Lcom/google/android/gms/measurement/internal/zzq;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/eq;->aJq:Lcom/google/android/gms/measurement/internal/zzq;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/eq;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/eq;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,23 +33,23 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eq;->aIY:Lcom/google/android/gms/measurement/internal/zzq;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eq;->aJq:Lcom/google/android/gms/measurement/internal/zzq;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eq;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eq;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ii;->b(Lcom/google/android/gms/measurement/internal/zzq;Lcom/google/android/gms/measurement/internal/zzn;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/er.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/er.smali
index 9a87f5ad11..813135a073 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/er.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/er.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzn;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/er;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/er;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/er;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/er;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/er;->aqn:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/er;->aqF:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/er;->aqo:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/er;->aqG:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,31 +54,31 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/er;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/er;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/er;->aqn:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/er;->aqF:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/er;->aqo:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/er;->aqG:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/jg;->f(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/es.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/es.smali
index 8c8f5d0553..273487356a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/es.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/es.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aIY:Lcom/google/android/gms/measurement/internal/zzq;
+.field private final synthetic aJq:Lcom/google/android/gms/measurement/internal/zzq;
 
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzq;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/es;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/es;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/es;->aIY:Lcom/google/android/gms/measurement/internal/zzq;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/es;->aJq:Lcom/google/android/gms/measurement/internal/zzq;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,25 +29,25 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/es;->aIY:Lcom/google/android/gms/measurement/internal/zzq;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/es;->aJq:Lcom/google/android/gms/measurement/internal/zzq;
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/ii;->cO(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/ii;->cK(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/et.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/et.smali
index f01b1211c9..483a6f1272 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/et.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/et.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzn;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/et;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/et;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/et;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/et;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/et;->aqn:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/et;->aqF:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/et;->aqo:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/et;->aqG:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,31 +54,31 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/et;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/et;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/et;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/et;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/et;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/et;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/et;->aqn:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/et;->aqF:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/et;->aqo:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/et;->aqG:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/jg;->g(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eu.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eu.smali
index 5532b88178..9b5f495868 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eu.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
-.field private final synthetic aJb:Ljava/lang/String;
+.field private final synthetic aJt:Ljava/lang/String;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eu;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eu;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/eu;->aJb:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/eu;->aJt:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/eu;->aqn:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/eu;->aqF:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/eu;->aqo:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/eu;->aqG:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,29 +54,29 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eu;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eu;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eu;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eu;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eu;->aJb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eu;->aJt:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eu;->aqn:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/eu;->aqF:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/eu;->aqo:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/eu;->aqG:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/jg;->f(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ev.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ev.smali
index b9a5ae977f..44aa1aee46 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ev.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ev.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ev;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ev;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,21 +29,21 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ii;->d(Lcom/google/android/gms/measurement/internal/zzn;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ew.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ew.smali
index 0214c86a89..cc1e0c9197 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ew.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ew.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
-.field private final synthetic aJb:Ljava/lang/String;
+.field private final synthetic aJt:Ljava/lang/String;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ew;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ew;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ew;->aJb:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ew;->aJt:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ew;->aqn:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ew;->aqF:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ew;->aqo:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ew;->aqG:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,29 +54,29 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ew;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ew;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ew;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ew;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ew;->aJb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ew;->aJt:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ew;->aqn:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ew;->aqF:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ew;->aqo:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ew;->aqG:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/jg;->g(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ex.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ex.smali
index 7194650fb4..fd69c20820 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ex.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ex.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
-.field private final synthetic aJb:Ljava/lang/String;
+.field private final synthetic aJt:Ljava/lang/String;
 
-.field private final synthetic aJc:Lcom/google/android/gms/measurement/internal/zzai;
+.field private final synthetic aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzai;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ex;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ex;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ex;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ex;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ex;->aJb:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ex;->aJt:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,23 +33,23 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ex;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ex;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ex;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ex;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ex;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ex;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ex;->aJb:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ex;->aJt:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ii;->d(Lcom/google/android/gms/measurement/internal/zzai;Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ey.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ey.smali
index 3da8b206d2..1dbd08d16a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ey.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ey.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
-.field private final synthetic aJc:Lcom/google/android/gms/measurement/internal/zzai;
+.field private final synthetic aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzai;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ey;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ey;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ey;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ey;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,11 +33,11 @@
 .method public final run()V
     .locals 10
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
@@ -51,13 +51,13 @@
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzah;->aDI:Landroid/os/Bundle;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzah;->aEa:Landroid/os/Bundle;
 
     invoke-virtual {v3}, Landroid/os/Bundle;->size()I
 
@@ -68,7 +68,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     const-string v5, "_cis"
 
@@ -99,15 +99,15 @@
     if-eqz v3, :cond_2
 
     :cond_1
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v3, v2}, Lcom/google/android/gms/measurement/internal/jb;->de(Ljava/lang/String;)Z
+    invoke-virtual {v3, v2}, Lcom/google/android/gms/measurement/internal/jb;->da(Ljava/lang/String;)Z
 
     move-result v2
 
@@ -119,13 +119,13 @@
     :goto_0
     if-eqz v4, :cond_3
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/el;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/el;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzai;->toString()Ljava/lang/String;
 
@@ -137,11 +137,11 @@
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
-    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/zzai;->aDJ:J
+    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/zzai;->aEb:J
 
     const-string v5, "_cmpx"
 
@@ -155,21 +155,21 @@
     move-object v0, v1
 
     :goto_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-virtual {v1, v0, v2}, Lcom/google/android/gms/measurement/internal/ii;->b(Lcom/google/android/gms/measurement/internal/zzai;Lcom/google/android/gms/measurement/internal/zzn;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ez.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ez.smali
index 9f5019b29e..d220b0c904 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ez.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ez.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
-.field private final synthetic aJd:Lcom/google/android/gms/measurement/internal/zzjn;
+.field private final synthetic aJv:Lcom/google/android/gms/measurement/internal/zzjn;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzjn;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ez;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ez;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ez;->aJd:Lcom/google/android/gms/measurement/internal/zzjn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ez;->aJv:Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ez;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ez;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,23 +33,23 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ez;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ez;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ez;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ez;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aJd:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aJv:Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ii;->c(Lcom/google/android/gms/measurement/internal/zzjn;Lcom/google/android/gms/measurement/internal/zzn;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/f.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/f.smali
index 623e4ee8a3..e081ca1731 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/f.smali
@@ -3,25 +3,25 @@
 
 
 # instance fields
-.field final aDA:Ljava/lang/Long;
+.field final aDM:Ljava/lang/String;
 
-.field final aDB:Ljava/lang/Long;
+.field final aDN:J
 
-.field final aDC:Ljava/lang/Long;
+.field final aDO:J
 
-.field final aDD:Ljava/lang/Boolean;
+.field final aDP:J
 
-.field final aDu:Ljava/lang/String;
+.field final aDQ:J
 
-.field final aDv:J
+.field final aDR:J
 
-.field final aDw:J
+.field final aDS:Ljava/lang/Long;
 
-.field final aDx:J
+.field final aDT:Ljava/lang/Long;
 
-.field final aDy:J
+.field final aDU:Ljava/lang/Long;
 
-.field final aDz:J
+.field final aDV:Ljava/lang/Boolean;
 
 .field final name:Ljava/lang/String;
 
@@ -74,9 +74,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const/4 v9, 0x1
 
@@ -140,39 +140,39 @@
 
     move-object v9, p1
 
-    iput-object v9, v0, Lcom/google/android/gms/measurement/internal/f;->aDu:Ljava/lang/String;
+    iput-object v9, v0, Lcom/google/android/gms/measurement/internal/f;->aDM:Ljava/lang/String;
 
     move-object/from16 v9, p2
 
     iput-object v9, v0, Lcom/google/android/gms/measurement/internal/f;->name:Ljava/lang/String;
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDv:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDN:J
 
-    iput-wide v3, v0, Lcom/google/android/gms/measurement/internal/f;->aDw:J
+    iput-wide v3, v0, Lcom/google/android/gms/measurement/internal/f;->aDO:J
 
-    iput-wide v5, v0, Lcom/google/android/gms/measurement/internal/f;->aDx:J
+    iput-wide v5, v0, Lcom/google/android/gms/measurement/internal/f;->aDP:J
 
     move-wide/from16 v1, p9
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDy:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDQ:J
 
-    iput-wide v7, v0, Lcom/google/android/gms/measurement/internal/f;->aDz:J
+    iput-wide v7, v0, Lcom/google/android/gms/measurement/internal/f;->aDR:J
 
     move-object/from16 v1, p13
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDA:Ljava/lang/Long;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDS:Ljava/lang/Long;
 
     move-object/from16 v1, p14
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDB:Ljava/lang/Long;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDT:Ljava/lang/Long;
 
     move-object/from16 v1, p15
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDC:Ljava/lang/Long;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDU:Ljava/lang/Long;
 
     move-object/from16 v1, p16
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDD:Ljava/lang/Boolean;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDV:Ljava/lang/Boolean;
 
     return-void
 .end method
@@ -206,21 +206,21 @@
 
     move-object v2, v1
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/f;->aDu:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/f;->aDM:Ljava/lang/String;
 
     iget-object v4, v0, Lcom/google/android/gms/measurement/internal/f;->name:Ljava/lang/String;
 
-    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/f;->aDv:J
+    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/f;->aDN:J
 
-    iget-wide v7, v0, Lcom/google/android/gms/measurement/internal/f;->aDw:J
+    iget-wide v7, v0, Lcom/google/android/gms/measurement/internal/f;->aDO:J
 
-    iget-wide v9, v0, Lcom/google/android/gms/measurement/internal/f;->aDx:J
+    iget-wide v9, v0, Lcom/google/android/gms/measurement/internal/f;->aDP:J
 
-    iget-wide v11, v0, Lcom/google/android/gms/measurement/internal/f;->aDy:J
+    iget-wide v11, v0, Lcom/google/android/gms/measurement/internal/f;->aDQ:J
 
-    iget-wide v13, v0, Lcom/google/android/gms/measurement/internal/f;->aDz:J
+    iget-wide v13, v0, Lcom/google/android/gms/measurement/internal/f;->aDR:J
 
-    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/f;->aDA:Ljava/lang/Long;
+    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/f;->aDS:Ljava/lang/Long;
 
     move-object/from16 v16, p1
 
@@ -242,29 +242,29 @@
 
     move-object/from16 v1, v18
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/f;->aDu:Ljava/lang/String;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/f;->aDM:Ljava/lang/String;
 
     iget-object v3, v0, Lcom/google/android/gms/measurement/internal/f;->name:Ljava/lang/String;
 
-    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/f;->aDv:J
+    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/f;->aDN:J
 
-    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/f;->aDw:J
+    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/f;->aDO:J
 
-    iget-wide v8, v0, Lcom/google/android/gms/measurement/internal/f;->aDx:J
+    iget-wide v8, v0, Lcom/google/android/gms/measurement/internal/f;->aDP:J
 
-    iget-wide v12, v0, Lcom/google/android/gms/measurement/internal/f;->aDz:J
+    iget-wide v12, v0, Lcom/google/android/gms/measurement/internal/f;->aDR:J
 
-    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/f;->aDA:Ljava/lang/Long;
+    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/f;->aDS:Ljava/lang/Long;
 
-    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/f;->aDB:Ljava/lang/Long;
+    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/f;->aDT:Ljava/lang/Long;
 
     move-object/from16 p1, v1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDC:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDU:Ljava/lang/Long;
 
     move-object/from16 v16, v1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDD:Ljava/lang/Boolean;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDV:Ljava/lang/Boolean;
 
     move-object/from16 v17, v1
 
@@ -286,31 +286,31 @@
 
     move-object/from16 v1, v18
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/f;->aDu:Ljava/lang/String;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/f;->aDM:Ljava/lang/String;
 
     iget-object v3, v0, Lcom/google/android/gms/measurement/internal/f;->name:Ljava/lang/String;
 
-    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/f;->aDv:J
+    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/f;->aDN:J
 
-    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/f;->aDw:J
+    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/f;->aDO:J
 
-    iget-wide v8, v0, Lcom/google/android/gms/measurement/internal/f;->aDx:J
+    iget-wide v8, v0, Lcom/google/android/gms/measurement/internal/f;->aDP:J
 
-    iget-wide v10, v0, Lcom/google/android/gms/measurement/internal/f;->aDy:J
+    iget-wide v10, v0, Lcom/google/android/gms/measurement/internal/f;->aDQ:J
 
     invoke-static/range {p3 .. p4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v14
 
-    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/f;->aDB:Ljava/lang/Long;
+    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/f;->aDT:Ljava/lang/Long;
 
     move-object/from16 p1, v1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDC:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDU:Ljava/lang/Long;
 
     move-object/from16 v16, v1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDD:Ljava/lang/Boolean;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/f;->aDV:Ljava/lang/Boolean;
 
     move-object/from16 v17, v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fa.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fa.smali
index 917516fc75..ad10a13acf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fa.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fa.smali
@@ -16,22 +16,22 @@
 
 
 # instance fields
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
-.field private final synthetic aJb:Ljava/lang/String;
+.field private final synthetic aJt:Ljava/lang/String;
 
-.field private final synthetic aJc:Lcom/google/android/gms/measurement/internal/zzai;
+.field private final synthetic aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzai;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fa;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fa;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fa;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fa;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fa;->aJb:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fa;->aJt:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,29 +48,29 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fa;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fa;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fa;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fa;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aKR:Lcom/google/android/gms/measurement/internal/gq;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aLj:Lcom/google/android/gms/measurement/internal/gq;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ii;->a(Lcom/google/android/gms/measurement/internal/ij;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ii;->aKR:Lcom/google/android/gms/measurement/internal/gq;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ii;->aLj:Lcom/google/android/gms/measurement/internal/gq;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fa;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fa;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fa;->aJb:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fa;->aJt:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/gq;->b(Lcom/google/android/gms/measurement/internal/zzai;Ljava/lang/String;)[B
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fb.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fb.smali
index 0462da7725..a1bdb44c60 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fb.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private asv:Z
+.field private asN:Z
 
 
 # direct methods
@@ -12,13 +12,13 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/cb;-><init>(Lcom/google/android/gms/measurement/internal/ek;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget v0, p1, Lcom/google/android/gms/measurement/internal/ek;->aIR:I
+    iget v0, p1, Lcom/google/android/gms/measurement/internal/ek;->aJj:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p1, Lcom/google/android/gms/measurement/internal/ek;->aIR:I
+    iput v0, p1, Lcom/google/android/gms/measurement/internal/ek;->aJj:I
 
     return-void
 .end method
@@ -28,23 +28,23 @@
 .method public final initialize()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->asN:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vR()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vP()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->yE()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->yC()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->asv:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->asN:Z
 
     :cond_0
     return-void
@@ -62,7 +62,7 @@
 .method final isInitialized()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->asN:Z
 
     if-eqz v0, :cond_0
 
@@ -76,10 +76,10 @@
     return v0
 .end method
 
-.method protected abstract vR()Z
+.method protected abstract vP()Z
 .end method
 
-.method protected final vy()V
+.method protected final vw()V
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->isInitialized()Z
@@ -100,28 +100,28 @@
     throw v0
 .end method
 
-.method protected xF()V
+.method protected xD()V
     .locals 0
 
     return-void
 .end method
 
-.method public final yG()V
+.method public final yE()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->asN:Z
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->xF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->xD()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->yE()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->yC()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->asv:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->asN:Z
 
     return-void
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fc.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fc.smali
index 43c059e078..af44b2a84d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fc.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fc;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fc;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fc;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fc;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,29 +46,29 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fc;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fc;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fc;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fc;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fc;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fc;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jg;->dj(Ljava/lang/String;)Ljava/util/List;
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jg;->df(Ljava/lang/String;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fd.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fd.smali
index c242a107c1..9634d220ff 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fd.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
-.field private final synthetic aJd:Lcom/google/android/gms/measurement/internal/zzjn;
+.field private final synthetic aJv:Lcom/google/android/gms/measurement/internal/zzjn;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzjn;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fd;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fd;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fd;->aJd:Lcom/google/android/gms/measurement/internal/zzjn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fd;->aJv:Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fd;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fd;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,23 +33,23 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fd;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fd;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fd;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fd;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fd;->aJd:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fd;->aJv:Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fd;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fd;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ii;->b(Lcom/google/android/gms/measurement/internal/zzjn;Lcom/google/android/gms/measurement/internal/zzn;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fe.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fe.smali
index 1d47a79f0d..cfd4199f41 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fe.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fe.smali
@@ -6,30 +6,30 @@
 
 
 # instance fields
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
-.field private final synthetic aJb:Ljava/lang/String;
+.field private final synthetic aJt:Ljava/lang/String;
 
-.field private final synthetic aJe:Ljava/lang/String;
+.field private final synthetic aJw:Ljava/lang/String;
 
-.field private final synthetic aJf:J
+.field private final synthetic aJx:J
 
-.field private final synthetic aqu:Ljava/lang/String;
+.field private final synthetic aqM:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aJe:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aJw:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fe;->aJb:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fe;->aJt:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fe;->aqu:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fe;->aqM:Ljava/lang/String;
 
-    iput-wide p5, p0, Lcom/google/android/gms/measurement/internal/fe;->aJf:J
+    iput-wide p5, p0, Lcom/google/android/gms/measurement/internal/fe;->aJx:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,23 +41,23 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aJe:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aJw:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fe;->aJb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fe;->aJt:Ljava/lang/String;
 
     const/4 v2, 0x0
 
@@ -68,25 +68,25 @@
     :cond_0
     new-instance v1, Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fe;->aqu:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fe;->aqM:Ljava/lang/String;
 
-    iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/fe;->aJf:J
+    iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/fe;->aJx:J
 
     invoke-direct {v1, v2, v0, v3, v4}, Lcom/google/android/gms/measurement/internal/gs;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fe;->aJb:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fe;->aJt:Ljava/lang/String;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/gr;->a(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/gs;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ff.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ff.smali
index 2a9466c42b..08d035b334 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ff.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ff.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJa:Lcom/google/android/gms/measurement/internal/el;
+.field private final synthetic aJs:Lcom/google/android/gms/measurement/internal/el;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/el;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ff;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ff;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ff;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ff;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,21 +29,21 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ff;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ff;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ff;->aJa:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ff;->aJs:Lcom/google/android/gms/measurement/internal/el;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/el;->a(Lcom/google/android/gms/measurement/internal/el;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ff;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ff;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ii;->f(Lcom/google/android/gms/measurement/internal/zzn;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fg.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fg.smali
index 71420eb3fc..a8c098a071 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fg.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private asv:Z
+.field private asN:Z
 
 
 # direct methods
@@ -12,13 +12,13 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/fh;-><init>(Lcom/google/android/gms/measurement/internal/ek;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/fg;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/fg;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget v0, p1, Lcom/google/android/gms/measurement/internal/ek;->aIR:I
+    iget v0, p1, Lcom/google/android/gms/measurement/internal/ek;->aJj:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p1, Lcom/google/android/gms/measurement/internal/ek;->aIR:I
+    iput v0, p1, Lcom/google/android/gms/measurement/internal/ek;->aJj:I
 
     return-void
 .end method
@@ -28,23 +28,23 @@
 .method public final initialize()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fg;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fg;->asN:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vR()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vP()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->yE()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->yC()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fg;->asv:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fg;->asN:Z
 
     :cond_0
     return-void
@@ -62,7 +62,7 @@
 .method final isInitialized()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fg;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fg;->asN:Z
 
     if-eqz v0, :cond_0
 
@@ -76,10 +76,10 @@
     return v0
 .end method
 
-.method protected abstract vR()Z
+.method protected abstract vP()Z
 .end method
 
-.method protected final vy()V
+.method protected final vw()V
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->isInitialized()Z
@@ -100,28 +100,28 @@
     throw v0
 .end method
 
-.method protected xF()V
+.method protected xD()V
     .locals 0
 
     return-void
 .end method
 
-.method public final yG()V
+.method public final yE()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fg;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fg;->asN:Z
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->xF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->xD()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->yE()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->yC()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fg;->asv:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fg;->asN:Z
 
     return-void
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fh.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fh.smali
index 52dae0320e..36dbba202d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fh.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field protected final aCX:Lcom/google/android/gms/measurement/internal/ek;
+.field protected final aDp:Lcom/google/android/gms/measurement/internal/ek;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     return-void
 .end method
@@ -27,7 +27,7 @@
 .method public getContext()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -36,132 +36,132 @@
     return-object v0
 .end method
 
-.method public mc()V
+.method public ma()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     return-void
 .end method
 
-.method public vA()V
+.method public vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vA()V
-
-    return-void
-.end method
-
-.method public vI()Lcom/google/android/gms/measurement/internal/d;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vJ()Lcom/google/android/gms/common/util/e;
+.method public vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vK()Lcom/google/android/gms/measurement/internal/df;
+.method public vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vL()Lcom/google/android/gms/measurement/internal/it;
+.method public vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vP()Lcom/google/android/gms/measurement/internal/jb;
+.method public vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     return-object v0
 .end method
 
-.method public vz()V
+.method public vx()V
     .locals 0
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ek;->vz()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ek;->vx()V
+
+    return-void
+.end method
+
+.method public vy()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aDp:Lcom/google/android/gms/measurement/internal/ek;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vy()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fj.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fj.smali
index e4c90186bc..cbf1fb88b8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fj.smali
@@ -6,11 +6,11 @@
 .method public abstract getContext()Landroid/content/Context;
 .end method
 
-.method public abstract vJ()Lcom/google/android/gms/common/util/e;
+.method public abstract vH()Lcom/google/android/gms/common/util/e;
 .end method
 
-.method public abstract vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public abstract vK()Lcom/google/android/gms/measurement/internal/ed;
 .end method
 
-.method public abstract vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public abstract vL()Lcom/google/android/gms/measurement/internal/dh;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fk.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fk.smali
index bcf3a25c1d..a168665497 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fk.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field public static final aJg:[Ljava/lang/String;
+.field public static final aJy:[Ljava/lang/String;
 
-.field public static final aJh:[Ljava/lang/String;
+.field public static final aJz:[Ljava/lang/String;
 
 
 # direct methods
@@ -322,7 +322,7 @@
 
     aput-object v17, v1, v16
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/fk;->aJg:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/fk;->aJy:[Ljava/lang/String;
 
     new-array v0, v0, [Ljava/lang/String;
 
@@ -604,17 +604,17 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/fk;->aJh:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/fk;->aJz:[Ljava/lang/String;
 
     return-void
 .end method
 
-.method public static cL(Ljava/lang/String;)Ljava/lang/String;
+.method public static cH(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/fk;->aJg:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fk;->aJy:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fk;->aJh:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fk;->aJz:[Ljava/lang/String;
 
     invoke-static {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/gp;->a(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fl.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fl.smali
index a1e3446883..18a990bfd4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fl.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field public static final aJi:[Ljava/lang/String;
+.field public static final aJA:[Ljava/lang/String;
 
-.field public static final aJj:[Ljava/lang/String;
+.field public static final aJB:[Ljava/lang/String;
 
 
 # direct methods
@@ -184,7 +184,7 @@
 
     aput-object v17, v1, v16
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/fl;->aJi:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/fl;->aJA:[Ljava/lang/String;
 
     new-array v0, v0, [Ljava/lang/String;
 
@@ -328,17 +328,17 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/fl;->aJj:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/fl;->aJB:[Ljava/lang/String;
 
     return-void
 .end method
 
-.method public static cL(Ljava/lang/String;)Ljava/lang/String;
+.method public static cH(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/fl;->aJi:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fl;->aJA:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fl;->aJj:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fl;->aJB:[Ljava/lang/String;
 
     invoke-static {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/gp;->a(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fn.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fn.smali
index 7fe66e493c..17bcefb88a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fn.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field public static final aJk:[Ljava/lang/String;
+.field public static final aJC:[Ljava/lang/String;
 
-.field public static final aJl:[Ljava/lang/String;
+.field public static final aJD:[Ljava/lang/String;
 
 
 # direct methods
@@ -100,7 +100,7 @@
 
     aput-object v16, v1, v15
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/fn;->aJk:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/fn;->aJC:[Ljava/lang/String;
 
     new-array v0, v0, [Ljava/lang/String;
 
@@ -160,17 +160,17 @@
 
     aput-object v1, v0, v15
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/fn;->aJl:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/fn;->aJD:[Ljava/lang/String;
 
     return-void
 .end method
 
-.method public static cL(Ljava/lang/String;)Ljava/lang/String;
+.method public static cH(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/fn;->aJk:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fn;->aJC:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fn;->aJl:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fn;->aJD:[Ljava/lang/String;
 
     invoke-static {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/gp;->a(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fo.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fo.smali
index fa7c7724dc..54cafa2467 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fo.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fo.smali
@@ -3,21 +3,21 @@
 
 
 # instance fields
-.field aAL:J
+.field aBd:J
 
-.field aAM:Z
+.field aBe:Z
 
-.field aAP:Ljava/lang/String;
+.field aBh:Ljava/lang/String;
 
-.field aIO:Ljava/lang/Boolean;
+.field aIM:Ljava/lang/String;
 
-.field aIu:Ljava/lang/String;
+.field aIN:Ljava/lang/String;
 
-.field aIv:Ljava/lang/String;
+.field aJE:Lcom/google/android/gms/internal/measurement/zzx;
 
-.field aJm:Lcom/google/android/gms/internal/measurement/zzx;
+.field aJg:Ljava/lang/Boolean;
 
-.field final arZ:Landroid/content/Context;
+.field final asr:Landroid/content/Context;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fo;->aAM:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fo;->aBe:Z
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -38,37 +38,37 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fo;->arZ:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fo;->asr:Landroid/content/Context;
 
     if-eqz p2, :cond_0
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fo;->aJm:Lcom/google/android/gms/internal/measurement/zzx;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fo;->aJE:Lcom/google/android/gms/internal/measurement/zzx;
 
-    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aAP:Ljava/lang/String;
+    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aBh:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fo;->aAP:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fo;->aBh:Ljava/lang/String;
 
-    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aAO:Ljava/lang/String;
+    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aBg:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fo;->aIu:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fo;->aIM:Ljava/lang/String;
 
-    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aAN:Ljava/lang/String;
+    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aBf:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fo;->aIv:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fo;->aIN:Ljava/lang/String;
 
-    iget-boolean p1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aAM:Z
+    iget-boolean p1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aBe:Z
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/fo;->aAM:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/fo;->aBe:Z
 
-    iget-wide v1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aAL:J
+    iget-wide v1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aBd:J
 
-    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/fo;->aAL:J
+    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/fo;->aBd:J
 
-    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aAQ:Landroid/os/Bundle;
+    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aBi:Landroid/os/Bundle;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aAQ:Landroid/os/Bundle;
+    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzx;->aBi:Landroid/os/Bundle;
 
     const-string p2, "dataCollectionDefaultEnabled"
 
@@ -80,7 +80,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fo;->aIO:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fo;->aJg:Ljava/lang/Boolean;
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fq.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fq.smali
index 9d06354ab9..ec0d960486 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fq.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJn:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Ljava/util/concurrent/atomic/AtomicReference;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fq;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fq;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fq;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fq;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,30 +29,30 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fq;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fq;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fq;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fq;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fq;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fq;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fq;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fq;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aEB:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aET:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -67,7 +67,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fq;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fq;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -78,7 +78,7 @@
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fq;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fq;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2}, Ljava/lang/Object;->notify()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fr.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fr.smali
index 205d624bda..35f86eede6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fr.smali
@@ -3,11 +3,11 @@
 
 
 # instance fields
-.field protected aJp:Lcom/google/android/gms/measurement/internal/gk;
+.field protected aJH:Lcom/google/android/gms/measurement/internal/gk;
 
-.field private aJq:Lcom/google/android/gms/measurement/internal/fm;
+.field private aJI:Lcom/google/android/gms/measurement/internal/fm;
 
-.field private final aJr:Ljava/util/Set;
+.field private final aJJ:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -17,9 +17,9 @@
     .end annotation
 .end field
 
-.field private aJs:Z
+.field private aJK:Z
 
-.field private final aJt:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final aJL:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field protected aJu:Z
+.field protected aJM:Z
 
 
 # direct methods
@@ -42,17 +42,17 @@
 
     invoke-direct {p1}, Ljava/util/concurrent/CopyOnWriteArraySet;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fr;->aJr:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fr;->aJJ:Ljava/util/Set;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/fr;->aJu:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/fr;->aJM:Z
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fr;->aJt:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fr;->aJL:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -60,7 +60,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/fr;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/fr;->yI()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/fr;->yG()V
 
     return-void
 .end method
@@ -72,9 +72,9 @@
 
     const-string v1, "app_id"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -84,7 +84,7 @@
 
     move-result-object v3
 
-    invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const-string v3, "origin"
 
@@ -92,7 +92,7 @@
 
     move-result-object v4
 
-    invoke-static {v4}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v4}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const-string v4, "value"
 
@@ -104,7 +104,7 @@
 
     move-object/from16 v5, p0
 
-    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
@@ -112,15 +112,15 @@
 
     if-nez v6, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Conditional property not sent since collection is disabled"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
@@ -150,7 +150,7 @@
     invoke-direct/range {v6 .. v11}, Lcom/google/android/gms/measurement/internal/zzjn;-><init>(Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v13
 
@@ -180,7 +180,7 @@
 
     move-result-object v17
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v18
 
@@ -210,7 +210,7 @@
 
     move-result-object v14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v18
 
@@ -286,7 +286,7 @@
 
     invoke-direct/range {v6 .. v20}, Lcom/google/android/gms/measurement/internal/zzq;-><init>(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzjn;JZLjava/lang/String;Lcom/google/android/gms/measurement/internal/zzai;JLcom/google/android/gms/measurement/internal/zzai;JLcom/google/android/gms/measurement/internal/zzai;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
@@ -307,15 +307,15 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/fr;Z)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -325,13 +325,13 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/dp;->Q(Z)V
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/dp;->O(Z)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/fr;->yI()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/fr;->yG()V
 
     return-void
 .end method
@@ -343,7 +343,7 @@
 
     move-result-object v6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v11
 
@@ -389,13 +389,13 @@
 
     move-object/from16 v11, p9
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFe:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFw:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v11, v1}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -403,16 +403,16 @@
 
     if-nez v0, :cond_0
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     :cond_0
     invoke-static/range {p5 .. p5}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
@@ -420,32 +420,32 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Event not sent since app measurement is disabled"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFm:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFE:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -453,11 +453,11 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/cz;->aFN:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/cz;->aGf:Ljava/util/List;
 
     if-eqz v0, :cond_2
 
@@ -467,11 +467,11 @@
 
     if-nez v0, :cond_2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Dropping non-safelisted event. event name, origin"
 
@@ -480,7 +480,7 @@
     return-void
 
     :cond_2
-    iget-boolean v0, v7, Lcom/google/android/gms/measurement/internal/fr;->aJs:Z
+    iget-boolean v0, v7, Lcom/google/android/gms/measurement/internal/fr;->aJK:Z
 
     const/4 v10, 0x0
 
@@ -490,12 +490,12 @@
 
     if-nez v0, :cond_4
 
-    iput-boolean v9, v7, Lcom/google/android/gms/measurement/internal/fr;->aJs:Z
+    iput-boolean v9, v7, Lcom/google/android/gms/measurement/internal/fr;->aJK:Z
 
     :try_start_0
-    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-boolean v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aAM:Z
+    iget-boolean v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aBe:Z
     :try_end_0
     .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_1
 
@@ -558,11 +558,11 @@
     move-exception v0
 
     :try_start_3
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to invoke Tag Manager\'s initialize() method"
 
@@ -573,31 +573,31 @@
     goto :goto_1
 
     :catch_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Tag Manager is not found and thus will not be used"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_4
     :goto_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFt:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFL:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -625,7 +625,7 @@
 
     move-result-object v4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -656,9 +656,9 @@
 
     if-nez v2, :cond_a
 
-    iget-object v2, v7, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v7, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v2
 
@@ -676,7 +676,7 @@
     goto :goto_3
 
     :cond_6
-    sget-object v4, Lcom/google/android/gms/measurement/internal/fl;->aJi:[Ljava/lang/String;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/fl;->aJA:[Ljava/lang/String;
 
     invoke-virtual {v2, v3, v4, v15}, Lcom/google/android/gms/measurement/internal/it;->a(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -703,17 +703,17 @@
     :goto_3
     if-eqz v2, :cond_a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v3
 
-    invoke-virtual {v3, v15}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v3, v15}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
@@ -721,9 +721,9 @@
 
     invoke-virtual {v1, v4, v3}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     invoke-static {v15, v0, v9}, Lcom/google/android/gms/measurement/internal/it;->b(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -743,9 +743,9 @@
     const/4 v1, 0x0
 
     :goto_4
-    iget-object v3, v7, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v7, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v3
 
@@ -756,11 +756,11 @@
     return-void
 
     :cond_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gr;->yM()Lcom/google/android/gms/measurement/internal/gs;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gr;->yK()Lcom/google/android/gms/measurement/internal/gs;
 
     move-result-object v2
 
@@ -774,7 +774,7 @@
 
     if-nez v4, :cond_b
 
-    iput-boolean v9, v2, Lcom/google/android/gms/measurement/internal/gs;->aJV:Z
+    iput-boolean v9, v2, Lcom/google/android/gms/measurement/internal/gs;->aKn:Z
 
     :cond_b
     if-eqz p6, :cond_c
@@ -797,13 +797,13 @@
 
     move-result v17
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/it;->cW(Ljava/lang/String;)Z
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/it;->cS(Ljava/lang/String;)Z
 
     move-result v4
 
     if-eqz p6, :cond_d
 
-    iget-object v5, v7, Lcom/google/android/gms/measurement/internal/fr;->aJq:Lcom/google/android/gms/measurement/internal/fm;
+    iget-object v5, v7, Lcom/google/android/gms/measurement/internal/fr;->aJI:Lcom/google/android/gms/measurement/internal/fm;
 
     if-eqz v5, :cond_d
 
@@ -811,21 +811,21 @@
 
     if-nez v17, :cond_d
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v1
 
-    invoke-virtual {v1, v15}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v1, v15}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v2
 
@@ -837,7 +837,7 @@
 
     invoke-virtual {v0, v3, v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/fr;->aJq:Lcom/google/android/gms/measurement/internal/fm;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/fr;->aJI:Lcom/google/android/gms/measurement/internal/fm;
 
     move-object/from16 v2, p1
 
@@ -852,9 +852,9 @@
     return-void
 
     :cond_d
-    iget-object v4, v7, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v4, v7, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->yF()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->yD()Z
 
     move-result v4
 
@@ -863,27 +863,27 @@
     return-void
 
     :cond_e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v4
 
-    invoke-virtual {v4, v15}, Lcom/google/android/gms/measurement/internal/it;->cR(Ljava/lang/String;)I
+    invoke-virtual {v4, v15}, Lcom/google/android/gms/measurement/internal/it;->cN(Ljava/lang/String;)I
 
     move-result v4
 
     if-eqz v4, :cond_10
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v2
 
-    invoke-virtual {v2, v15}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, v15}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -891,7 +891,7 @@
 
     invoke-virtual {v1, v3, v2}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     invoke-static {v15, v0, v9}, Lcom/google/android/gms/measurement/internal/it;->b(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -906,9 +906,9 @@
     move/from16 v16, v1
 
     :cond_f
-    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v1
 
@@ -959,7 +959,7 @@
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v1
 
@@ -1049,13 +1049,13 @@
     move-object v14, v10
 
     :goto_8
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
     move-object/from16 v13, p9
 
-    invoke-virtual {v1, v13}, Lcom/google/android/gms/measurement/internal/jb;->di(Ljava/lang/String;)Z
+    invoke-virtual {v1, v13}, Lcom/google/android/gms/measurement/internal/jb;->de(Ljava/lang/String;)Z
 
     move-result v1
 
@@ -1065,11 +1065,11 @@
 
     if-eqz v1, :cond_14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/gr;->yM()Lcom/google/android/gms/measurement/internal/gs;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/gr;->yK()Lcom/google/android/gms/measurement/internal/gs;
 
     move-result-object v1
 
@@ -1081,11 +1081,11 @@
 
     if-eqz v1, :cond_14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hx;->yS()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hx;->yQ()J
 
     move-result-wide v1
 
@@ -1093,7 +1093,7 @@
 
     if-lez v3, :cond_14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v3
 
@@ -1106,11 +1106,11 @@
 
     invoke-interface {v11, v15}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/it;->zj()Ljava/security/SecureRandom;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/it;->zh()Ljava/security/SecureRandom;
 
     move-result-object v1
 
@@ -1118,19 +1118,19 @@
 
     move-result-wide v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aES:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aFk:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v1, v2, v6}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -1138,11 +1138,11 @@
 
     if-eqz v1, :cond_16
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aGX:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aHp:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -1152,7 +1152,7 @@
 
     if-lez v6, :cond_16
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
@@ -1162,11 +1162,11 @@
 
     if-eqz v1, :cond_16
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aHa:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aHs:Lcom/google/android/gms/measurement/internal/dr;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->get()Z
 
@@ -1174,29 +1174,29 @@
 
     if-eqz v1, :cond_16
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Current session is expired, remove the session number and Id"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aEO:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aFg:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v1, v2, v6}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -1206,7 +1206,7 @@
 
     const/4 v6, 0x0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -1240,19 +1240,19 @@
     move-wide/from16 v21, v3
 
     :goto_9
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/j;->aEP:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/j;->aFh:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -1262,7 +1262,7 @@
 
     const/4 v4, 0x0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -1287,19 +1287,19 @@
 
     :cond_17
     :goto_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->dh(Ljava/lang/String;)Z
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->dd(Ljava/lang/String;)Z
 
     move-result v1
 
@@ -1317,23 +1317,23 @@
 
     if-nez v5, :cond_18
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "EXTEND_SESSION param attached: initiate a new session or extend the current active session"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     move-wide v5, v7
 
     move-object/from16 v7, p0
 
-    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object v1
 
@@ -1386,7 +1386,7 @@
 
     move-result-object v18
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     invoke-static/range {v18 .. v18}, Lcom/google/android/gms/measurement/internal/it;->aD(Ljava/lang/Object;)[Landroid/os/Bundle;
 
@@ -1415,7 +1415,7 @@
 
     invoke-static {v14, v2, v5}, Lcom/google/android/gms/measurement/internal/gr;->a(Lcom/google/android/gms/measurement/internal/gs;Landroid/os/Bundle;Z)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v5
 
@@ -1649,7 +1649,7 @@
 
     if-eqz p7, :cond_1f
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v4
 
@@ -1660,21 +1660,21 @@
     :cond_1f
     move-object v12, v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v4
 
-    invoke-virtual {v4, v10}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v10}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v5
 
@@ -1706,7 +1706,7 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/zzai;-><init>(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzah;Ljava/lang/String;J)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v1
 
@@ -1714,7 +1714,7 @@
 
     if-nez v17, :cond_20
 
-    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/fr;->aJr:Ljava/util/Set;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/fr;->aJJ:Ljava/util/Set;
 
     invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -1757,11 +1757,11 @@
     goto/16 :goto_f
 
     :cond_21
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gr;->yM()Lcom/google/android/gms/measurement/internal/gs;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gr;->yK()Lcom/google/android/gms/measurement/internal/gs;
 
     move-result-object v0
 
@@ -1775,7 +1775,7 @@
 
     if-eqz v0, :cond_22
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object v0
 
@@ -1790,7 +1790,7 @@
 .method private final a(Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -1826,9 +1826,9 @@
 
     const-string v3, "app_id"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1838,11 +1838,11 @@
 
     move-result-object v5
 
-    invoke-static {v5}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v5}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     move-object/from16 v5, p0
 
-    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
@@ -1850,15 +1850,15 @@
 
     if-nez v6, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Conditional property not cleared since collection is disabled"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
@@ -1880,7 +1880,7 @@
     invoke-direct/range {v6 .. v11}, Lcom/google/android/gms/measurement/internal/zzjn;-><init>(Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v13
 
@@ -1964,7 +1964,7 @@
 
     invoke-direct/range {v6 .. v20}, Lcom/google/android/gms/measurement/internal/zzq;-><init>(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzjn;JZLjava/lang/String;Lcom/google/android/gms/measurement/internal/zzai;JLcom/google/android/gms/measurement/internal/zzai;JLcom/google/android/gms/measurement/internal/zzai;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
@@ -1974,22 +1974,22 @@
     return-void
 .end method
 
-.method private final yI()V
+.method private final yG()V
     .locals 8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aEZ:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFr:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -1997,15 +1997,15 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGU:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHm:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dv;->ye()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dv;->yc()Ljava/lang/String;
 
     move-result-object v0
 
@@ -2021,7 +2021,7 @@
 
     const/4 v5, 0x0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -2060,7 +2060,7 @@
 
     move-result-object v5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -2078,7 +2078,7 @@
 
     :cond_2
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
@@ -2086,52 +2086,52 @@
 
     if-eqz v0, :cond_3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJu:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJM:Z
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Recording app launch after enabling measurement for the first time (FE)"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fr;->yK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fr;->yI()V
 
     return-void
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Updating Scion state (FE)"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yN()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yL()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Q(Z)V
+.method public final O(Z)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -2239,13 +2239,13 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-virtual {p1, v2}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-virtual {p1, v4}, Landroid/os/Bundle;->get(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -2265,27 +2265,27 @@
 
     move-result-object p3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/it;->cS(Ljava/lang/String;)I
+    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/it;->cO(Ljava/lang/String;)I
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -2296,7 +2296,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
@@ -2306,17 +2306,17 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
-    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -2327,7 +2327,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     invoke-static {p2, p3}, Lcom/google/android/gms/measurement/internal/it;->r(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -2335,17 +2335,17 @@
 
     if-nez v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
-    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -2385,17 +2385,17 @@
     if-gez p3, :cond_4
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -2425,7 +2425,7 @@
     goto :goto_0
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p2
 
@@ -2439,17 +2439,17 @@
 
     :cond_6
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -2467,13 +2467,13 @@
 .method public final a(Lcom/google/android/gms/measurement/internal/fm;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJq:Lcom/google/android/gms/measurement/internal/fm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJI:Lcom/google/android/gms/measurement/internal/fm;
 
     if-eq p1, v0, :cond_1
 
@@ -2492,7 +2492,7 @@
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
     :cond_1
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fr;->aJq:Lcom/google/android/gms/measurement/internal/fm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fr;->aJI:Lcom/google/android/gms/measurement/internal/fm;
 
     return-void
 .end method
@@ -2500,11 +2500,11 @@
 .method public final a(Lcom/google/android/gms/measurement/internal/fp;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJr:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJJ:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -2512,15 +2512,15 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "OnEventListener already registered"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_0
     return-void
@@ -2529,15 +2529,15 @@
 .method final a(Ljava/lang/String;Ljava/lang/String;JLandroid/os/Bundle;)V
     .locals 11
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     move-object v10, p0
 
-    iget-object v0, v10, Lcom/google/android/gms/measurement/internal/fr;->aJq:Lcom/google/android/gms/measurement/internal/fm;
+    iget-object v0, v10, Lcom/google/android/gms/measurement/internal/fr;->aJI:Lcom/google/android/gms/measurement/internal/fm;
 
     if-eqz v0, :cond_1
 
-    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/it;->cW(Ljava/lang/String;)Z
+    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/it;->cS(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -2583,7 +2583,7 @@
 .method public final a(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -2611,27 +2611,27 @@
 .method final a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;J)V
     .locals 8
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aEZ:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFr:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -2691,11 +2691,11 @@
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGU:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHm:Lcom/google/android/gms/measurement/internal/dv;
 
     move-object v4, p2
 
@@ -2712,7 +2712,7 @@
     const-string p3, "true"
 
     :cond_1
-    invoke-virtual {v0, p3}, Lcom/google/android/gms/measurement/internal/dv;->cu(Ljava/lang/String;)V
+    invoke-virtual {v0, p3}, Lcom/google/android/gms/measurement/internal/dv;->cq(Ljava/lang/String;)V
 
     move-object v6, p2
 
@@ -2721,15 +2721,15 @@
     :cond_2
     if-nez p3, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dp;->aGU:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dp;->aHm:Lcom/google/android/gms/measurement/internal/dv;
 
     const-string v0, "unset"
 
-    invoke-virtual {p2, v0}, Lcom/google/android/gms/measurement/internal/dv;->cu(Ljava/lang/String;)V
+    invoke-virtual {p2, v0}, Lcom/google/android/gms/measurement/internal/dv;->cq(Ljava/lang/String;)V
 
     move-object v6, p3
 
@@ -2744,7 +2744,7 @@
     move-object v6, p3
 
     :goto_2
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
@@ -2752,22 +2752,22 @@
 
     if-nez p2, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "User property not set since app measurement is disabled"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_4
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->yF()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->yD()Z
 
     move-result p2
 
@@ -2776,17 +2776,17 @@
     return-void
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, v3}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, v3}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p3
 
@@ -2804,7 +2804,7 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/measurement/internal/zzjn;-><init>(Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object p1
 
@@ -2831,18 +2831,18 @@
 
     if-eqz p4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p1
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/it;->cS(Ljava/lang/String;)I
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/it;->cO(Ljava/lang/String;)I
 
     move-result p1
 
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p4
 
@@ -2857,7 +2857,7 @@
     goto :goto_0
 
     :cond_2
-    sget-object v4, Lcom/google/android/gms/measurement/internal/fn;->aJk:[Ljava/lang/String;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/fn;->aJC:[Ljava/lang/String;
 
     invoke-virtual {p4, v3, v4, p2}, Lcom/google/android/gms/measurement/internal/it;->a(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -2888,7 +2888,7 @@
 
     if-eqz p1, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     invoke-static {p2, v2, v3}, Lcom/google/android/gms/measurement/internal/it;->b(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -2901,9 +2901,9 @@
     move-result v0
 
     :cond_5
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p2
 
@@ -2914,7 +2914,7 @@
     :cond_6
     if-eqz p3, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p1
 
@@ -2924,7 +2924,7 @@
 
     if-eqz p1, :cond_9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     invoke-static {p2, v2, v3}, Lcom/google/android/gms/measurement/internal/it;->b(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -2948,9 +2948,9 @@
     move-result v0
 
     :cond_8
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p3
 
@@ -2959,7 +2959,7 @@
     return-void
 
     :cond_9
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     invoke-static {p2, p3}, Lcom/google/android/gms/measurement/internal/it;->r(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -2995,7 +2995,7 @@
 .method public final a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -3003,7 +3003,7 @@
 
     move-result-wide v0
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     new-instance v2, Landroid/os/Bundle;
 
@@ -3035,7 +3035,7 @@
     invoke-virtual {v2, p1, p4}, Landroid/os/Bundle;->putBundle(Ljava/lang/String;Landroid/os/Bundle;)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p1
 
@@ -3064,25 +3064,25 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yz()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yx()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Cannot get user properties from analytics worker thread"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
 
@@ -3097,15 +3097,15 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Cannot get user properties from main thread"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
 
@@ -3121,9 +3121,9 @@
     monitor-enter v7
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v8
 
@@ -3163,11 +3163,11 @@
     move-exception p1
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Interrupted waiting for get user properties"
 
@@ -3186,15 +3186,15 @@
 
     if-nez p1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Timed out waiting for get user properties"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
 
@@ -3261,11 +3261,11 @@
 .method public final b(Lcom/google/android/gms/measurement/internal/fp;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJr:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJJ:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
@@ -3273,15 +3273,15 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "OnEventListener had not been registered"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_0
     return-void
@@ -3290,7 +3290,7 @@
 .method public final b(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
     .locals 8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -3313,10 +3313,10 @@
     return-void
 .end method
 
-.method final cM(Ljava/lang/String;)V
+.method final cI(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJt:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJL:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
@@ -3348,11 +3348,11 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yz()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ed;->yx()Z
 
     move-result v0
 
@@ -3360,15 +3360,15 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Cannot get conditional user properties from analytics worker thread"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -3383,15 +3383,15 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Cannot get conditional user properties from main thread"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -3407,9 +3407,9 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v1
 
@@ -3447,11 +3447,11 @@
     move-exception p2
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Interrupted waiting for get conditional user properties"
 
@@ -3470,11 +3470,11 @@
 
     if-nez p2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Timed out waiting for get conditional user properties"
 
@@ -3517,17 +3517,17 @@
 .method public final getCurrentScreenClass()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gr;->aJN:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gr;->aKf:Lcom/google/android/gms/measurement/internal/gs;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gs;->aJT:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gs;->aKl:Ljava/lang/String;
 
     return-object v0
 
@@ -3540,17 +3540,17 @@
 .method public final getCurrentScreenName()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gr;->aJN:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gr;->aKf:Lcom/google/android/gms/measurement/internal/gs;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gs;->aJS:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gs;->aKk:Ljava/lang/String;
 
     return-object v0
 
@@ -3563,21 +3563,21 @@
 .method public final getGmpAppId()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aAP:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aBh:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aAP:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aBh:Ljava/lang/String;
 
     return-object v0
 
     :cond_0
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lI()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->lG()Ljava/lang/String;
 
     move-result-object v0
     :try_end_0
@@ -3588,13 +3588,13 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "getGoogleAppId failed with exception"
 
@@ -3640,11 +3640,11 @@
 
     if-eqz p5, :cond_3
 
-    iget-object v2, v9, Lcom/google/android/gms/measurement/internal/fr;->aJq:Lcom/google/android/gms/measurement/internal/fm;
+    iget-object v2, v9, Lcom/google/android/gms/measurement/internal/fr;->aJI:Lcom/google/android/gms/measurement/internal/fm;
 
     if-eqz v2, :cond_3
 
-    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/it;->cW(Ljava/lang/String;)Z
+    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/it;->cS(Ljava/lang/String;)Z
 
     move-result v2
 
@@ -3679,10 +3679,10 @@
     return-void
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->ma()V
 
     return-void
 .end method
@@ -3708,15 +3708,15 @@
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Package name should be null when calling setConditionalUserProperty"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0, p1}, Landroid/os/Bundle;->remove(Ljava/lang/String;)V
@@ -3726,165 +3726,147 @@
     return-void
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/a;
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/fr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/fr;
+.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/cz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/cz;
+.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/gw;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/gw;
+.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/gr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/gr;
+.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/dd;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/dd;
+.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/hx;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vH()Lcom/google/android/gms/measurement/internal/hx;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vP()Lcom/google/android/gms/measurement/internal/jb;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -3892,15 +3874,33 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vx()V
 
     return-void
 .end method
 
-.method public final yH()V
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+
+    return-void
+.end method
+
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/a;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vz()Lcom/google/android/gms/measurement/internal/a;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final yF()V
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
@@ -3925,7 +3925,7 @@
 
     check-cast v0, Landroid/app/Application;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fr;->aJp:Lcom/google/android/gms/measurement/internal/gk;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fr;->aJH:Lcom/google/android/gms/measurement/internal/gk;
 
     invoke-virtual {v0, v1}, Landroid/app/Application;->unregisterActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
 
@@ -3933,10 +3933,10 @@
     return-void
 .end method
 
-.method public final yJ()Ljava/lang/String;
+.method public final yH()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJt:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJL:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -3947,16 +3947,16 @@
     return-object v0
 .end method
 
-.method public final yK()V
+.method public final yI()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->yF()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->yD()Z
 
     move-result v0
 
@@ -3965,21 +3965,21 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yK()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yI()V
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJu:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aJM:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->ya()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->xY()Ljava/lang/String;
 
     move-result-object v0
 
@@ -3989,11 +3989,11 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
     sget-object v1, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
@@ -4024,9 +4024,9 @@
 .method public final zza(Z)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fs.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fs.smali
index cbdeee5aff..9159db402b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fs.smali
@@ -6,30 +6,30 @@
 
 
 # instance fields
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-.field private final synthetic aJv:Ljava/lang/Object;
+.field private final synthetic aJN:Ljava/lang/Object;
 
-.field private final synthetic aJw:J
+.field private final synthetic aJO:J
 
-.field private final synthetic aqG:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqY:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fs;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fs;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fs;->aqn:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fs;->aqF:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fs;->aqG:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fs;->aqY:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fs;->aJv:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fs;->aJN:Ljava/lang/Object;
 
-    iput-wide p5, p0, Lcom/google/android/gms/measurement/internal/fs;->aJw:J
+    iput-wide p5, p0, Lcom/google/android/gms/measurement/internal/fs;->aJO:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,15 +41,15 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fs;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fs;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fs;->aqn:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fs;->aqF:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fs;->aqG:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fs;->aqY:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fs;->aJv:Ljava/lang/Object;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fs;->aJN:Ljava/lang/Object;
 
-    iget-wide v4, p0, Lcom/google/android/gms/measurement/internal/fs;->aJw:J
+    iget-wide v4, p0, Lcom/google/android/gms/measurement/internal/fs;->aJO:J
 
     invoke-virtual/range {v0 .. v5}, Lcom/google/android/gms/measurement/internal/fr;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ft.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ft.smali
index e7f99eb2e8..b6ee66dbc0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ft.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ft.smali
@@ -6,48 +6,48 @@
 
 
 # instance fields
-.field private final synthetic aJb:Ljava/lang/String;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJO:J
 
-.field private final synthetic aJw:J
+.field private final synthetic aJP:Landroid/os/Bundle;
 
-.field private final synthetic aJx:Landroid/os/Bundle;
+.field private final synthetic aJQ:Z
 
-.field private final synthetic aJy:Z
+.field private final synthetic aJR:Z
 
-.field private final synthetic aJz:Z
+.field private final synthetic aJt:Ljava/lang/String;
 
-.field private final synthetic aqG:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqJ:Z
+.field private final synthetic aqY:Ljava/lang/String;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic arb:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Ljava/lang/String;Ljava/lang/String;JLandroid/os/Bundle;ZZZLjava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ft;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ft;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ft;->aqn:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ft;->aqF:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ft;->aqG:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ft;->aqY:Ljava/lang/String;
 
-    iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/ft;->aJw:J
+    iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/ft;->aJO:J
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ft;->aJx:Landroid/os/Bundle;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ft;->aJP:Landroid/os/Bundle;
 
-    iput-boolean p7, p0, Lcom/google/android/gms/measurement/internal/ft;->aqJ:Z
+    iput-boolean p7, p0, Lcom/google/android/gms/measurement/internal/ft;->arb:Z
 
-    iput-boolean p8, p0, Lcom/google/android/gms/measurement/internal/ft;->aJy:Z
+    iput-boolean p8, p0, Lcom/google/android/gms/measurement/internal/ft;->aJQ:Z
 
-    iput-boolean p9, p0, Lcom/google/android/gms/measurement/internal/ft;->aJz:Z
+    iput-boolean p9, p0, Lcom/google/android/gms/measurement/internal/ft;->aJR:Z
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ft;->aJb:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ft;->aJt:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,23 +59,23 @@
 .method public final run()V
     .locals 10
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ft;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ft;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ft;->aqn:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ft;->aqF:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ft;->aqG:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ft;->aqY:Ljava/lang/String;
 
-    iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/ft;->aJw:J
+    iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/ft;->aJO:J
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ft;->aJx:Landroid/os/Bundle;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ft;->aJP:Landroid/os/Bundle;
 
-    iget-boolean v6, p0, Lcom/google/android/gms/measurement/internal/ft;->aqJ:Z
+    iget-boolean v6, p0, Lcom/google/android/gms/measurement/internal/ft;->arb:Z
 
-    iget-boolean v7, p0, Lcom/google/android/gms/measurement/internal/ft;->aJy:Z
+    iget-boolean v7, p0, Lcom/google/android/gms/measurement/internal/ft;->aJQ:Z
 
-    iget-boolean v8, p0, Lcom/google/android/gms/measurement/internal/ft;->aJz:Z
+    iget-boolean v8, p0, Lcom/google/android/gms/measurement/internal/ft;->aJR:Z
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/ft;->aJb:Ljava/lang/String;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/ft;->aJt:Ljava/lang/String;
 
     invoke-static/range {v0 .. v9}, Lcom/google/android/gms/measurement/internal/fr;->a(Lcom/google/android/gms/measurement/internal/fr;Ljava/lang/String;Ljava/lang/String;JLandroid/os/Bundle;ZZZLjava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fu.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fu.smali
index 19a04e59af..bb0db1c630 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fu.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJA:Lcom/google/android/gms/measurement/internal/fm;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJS:Lcom/google/android/gms/measurement/internal/fm;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Lcom/google/android/gms/measurement/internal/fm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fu;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fu;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fu;->aJA:Lcom/google/android/gms/measurement/internal/fm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fu;->aJS:Lcom/google/android/gms/measurement/internal/fm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,9 +29,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fu;->aJA:Lcom/google/android/gms/measurement/internal/fm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fu;->aJS:Lcom/google/android/gms/measurement/internal/fm;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/fr;->a(Lcom/google/android/gms/measurement/internal/fm;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fv.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fv.smali
index 260a403fa6..1d1726ff03 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fv.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJB:J
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJT:J
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fv;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fv;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/fv;->aJB:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/fv;->aJT:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,111 +29,111 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fv;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fv;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fv;->aJB:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fv;->aJT:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Resetting analytics data (FE)"
 
-    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/hx;->aKC:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/hx;->aKU:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/b;->cancel()V
 
-    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/hx;->aKD:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/hx;->aKV:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/b;->cancel()V
 
     const-wide/16 v4, 0x0
 
-    iput-wide v4, v3, Lcom/google/android/gms/measurement/internal/hx;->aKB:J
+    iput-wide v4, v3, Lcom/google/android/gms/measurement/internal/hx;->aKT:J
 
-    iget-wide v4, v3, Lcom/google/android/gms/measurement/internal/hx;->aKB:J
+    iget-wide v4, v3, Lcom/google/android/gms/measurement/internal/hx;->aKT:J
 
-    iput-wide v4, v3, Lcom/google/android/gms/measurement/internal/hx;->acv:J
+    iput-wide v4, v3, Lcom/google/android/gms/measurement/internal/hx;->acN:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v3
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/jb;->dd(Ljava/lang/String;)Z
+    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/jb;->cZ(Ljava/lang/String;)Z
 
     move-result v3
 
     if-eqz v3, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dp;->aGL:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dp;->aHd:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v3, v1, v2}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
     :cond_0
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
     move-result v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jb;->zq()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jb;->zo()Z
 
     move-result v2
 
     if-nez v2, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v2
 
     xor-int/lit8 v3, v1, 0x1
 
-    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/dp;->S(Z)V
+    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/dp;->Q(Z)V
 
     :cond_1
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gw;->xJ()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gw;->xH()V
 
     xor-int/lit8 v1, v1, 0x1
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/fr;->aJu:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/fr;->aJM:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fv;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fv;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fw.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fw.smali
index 3fe1e57963..5bc9eceba9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fw.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJC:Landroid/os/Bundle;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJU:Landroid/os/Bundle;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Landroid/os/Bundle;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fw;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fw;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fw;->aJC:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fw;->aJU:Landroid/os/Bundle;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,9 +29,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fw;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fw;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fw;->aJC:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fw;->aJU:Landroid/os/Bundle;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/measurement/internal/fr;->b(Lcom/google/android/gms/measurement/internal/fr;Landroid/os/Bundle;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fx.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fx.smali
index 2d60d12cc5..c31d32c464 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fx.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJC:Landroid/os/Bundle;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJU:Landroid/os/Bundle;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Landroid/os/Bundle;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fx;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fx;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fx;->aJC:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fx;->aJU:Landroid/os/Bundle;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,9 +29,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fx;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fx;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fx;->aJC:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fx;->aJU:Landroid/os/Bundle;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/measurement/internal/fr;->a(Lcom/google/android/gms/measurement/internal/fr;Landroid/os/Bundle;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fy.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fy.smali
index 642392e6e3..7056ca3e43 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fy.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJn:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Ljava/util/concurrent/atomic/AtomicReference;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fy;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fy;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fy;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fy;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,30 +29,30 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fy;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fy;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fy;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fy;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fy;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fy;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fy;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fy;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aEC:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aEU:Lcom/google/android/gms/measurement/internal/cv;
 
     if-nez v3, :cond_0
 
@@ -67,9 +67,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/jb;->aLL:Lcom/google/android/gms/measurement/internal/jd;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/jb;->aMd:Lcom/google/android/gms/measurement/internal/jd;
 
-    iget-object v5, v4, Lcom/google/android/gms/measurement/internal/cv;->aFA:Ljava/lang/String;
+    iget-object v5, v4, Lcom/google/android/gms/measurement/internal/cv;->aFS:Ljava/lang/String;
 
     invoke-interface {v2, v3, v5}, Lcom/google/android/gms/measurement/internal/jd;->D(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -87,7 +87,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fy;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fy;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -98,7 +98,7 @@
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fy;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fy;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2}, Ljava/lang/Object;->notify()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fz.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fz.smali
index 82e5d3dadc..d109ebf5df 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fz.smali
@@ -6,30 +6,30 @@
 
 
 # instance fields
-.field private final synthetic aJb:Ljava/lang/String;
+.field private final synthetic aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field private final synthetic aJn:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJt:Ljava/lang/String;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fz;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fz;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fz;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fz;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fz;->aJb:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fz;->aJt:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fz;->aqn:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fz;->aqF:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/fz;->aqo:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/fz;->aqG:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,21 +41,21 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fz;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fz;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fz;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fz;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fz;->aJb:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fz;->aJt:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fz;->aqn:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fz;->aqF:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/fz;->aqo:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/fz;->aqG:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/gw;->a(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/g.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/g.smali
index 0dbfb6a6e3..262a5d2502 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/g.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field private final aAO:Ljava/lang/String;
+.field private final aBg:Ljava/lang/String;
 
-.field final aDE:J
+.field final aDM:Ljava/lang/String;
 
-.field final aDF:Lcom/google/android/gms/measurement/internal/zzah;
+.field final aDW:J
 
-.field final aDu:Ljava/lang/String;
+.field final aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
 .field final name:Ljava/lang/String;
 
@@ -22,11 +22,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
     iput-object p4, p0, Lcom/google/android/gms/measurement/internal/g;->name:Ljava/lang/String;
 
@@ -39,13 +39,13 @@
     const/4 p2, 0x0
 
     :cond_0
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/g;->aAO:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/g;->aBg:Ljava/lang/String;
 
     iput-wide p5, p0, Lcom/google/android/gms/measurement/internal/g;->timestamp:J
 
-    iput-wide p7, p0, Lcom/google/android/gms/measurement/internal/g;->aDE:J
+    iput-wide p7, p0, Lcom/google/android/gms/measurement/internal/g;->aDW:J
 
-    iget-wide p4, p0, Lcom/google/android/gms/measurement/internal/g;->aDE:J
+    iget-wide p4, p0, Lcom/google/android/gms/measurement/internal/g;->aDW:J
 
     const-wide/16 p6, 0x0
 
@@ -59,13 +59,13 @@
 
     if-lez p2, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p3
 
@@ -109,22 +109,22 @@
 
     if-nez p4, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p4
 
-    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p5, "Param name can\'t be null"
 
-    invoke-virtual {p4, p5}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p4, p5}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     invoke-interface {p3}, Ljava/util/Iterator;->remove()V
 
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     invoke-virtual {p2, p4}, Landroid/os/Bundle;->get(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -136,17 +136,17 @@
 
     if-nez p5, :cond_3
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p5
 
-    iget-object p5, p5, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p5, p5, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p6
 
-    invoke-virtual {p6, p4}, Lcom/google/android/gms/measurement/internal/df;->ck(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p6, p4}, Lcom/google/android/gms/measurement/internal/df;->cg(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p4
 
@@ -159,7 +159,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p6
 
@@ -184,7 +184,7 @@
     invoke-direct {p1, p2}, Lcom/google/android/gms/measurement/internal/zzah;-><init>(Landroid/os/Bundle;)V
 
     :goto_1
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/g;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/g;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     return-void
 .end method
@@ -194,13 +194,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {p9}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
     iput-object p4, p0, Lcom/google/android/gms/measurement/internal/g;->name:Ljava/lang/String;
 
@@ -213,13 +213,13 @@
     const/4 p2, 0x0
 
     :cond_0
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/g;->aAO:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/g;->aBg:Ljava/lang/String;
 
     iput-wide p5, p0, Lcom/google/android/gms/measurement/internal/g;->timestamp:J
 
-    iput-wide p7, p0, Lcom/google/android/gms/measurement/internal/g;->aDE:J
+    iput-wide p7, p0, Lcom/google/android/gms/measurement/internal/g;->aDW:J
 
-    iget-wide p5, p0, Lcom/google/android/gms/measurement/internal/g;->aDE:J
+    iget-wide p5, p0, Lcom/google/android/gms/measurement/internal/g;->aDW:J
 
     const-wide/16 p7, 0x0
 
@@ -233,17 +233,17 @@
 
     if-lez p2, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p2
 
-    invoke-static {p4}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p4}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p3
 
@@ -252,7 +252,7 @@
     invoke-virtual {p1, p4, p2, p3}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_1
-    iput-object p9, p0, Lcom/google/android/gms/measurement/internal/g;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iput-object p9, p0, Lcom/google/android/gms/measurement/internal/g;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     return-void
 .end method
@@ -264,15 +264,15 @@
 
     new-instance v10, Lcom/google/android/gms/measurement/internal/g;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/g;->aAO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/g;->aBg:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/g;->name:Ljava/lang/String;
 
     iget-wide v5, p0, Lcom/google/android/gms/measurement/internal/g;->timestamp:J
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/g;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/g;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     move-object v0, v10
 
@@ -288,11 +288,11 @@
 .method public final toString()Ljava/lang/String;
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/g;->name:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/g;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/g;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ga.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ga.smali
index 85c1a8a5ac..7f02801dff 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ga.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ga.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic aJD:Lcom/google/android/gms/internal/measurement/ln;
+.field private final synthetic aJV:Lcom/google/android/gms/internal/measurement/ln;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/ln;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ga;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ga;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ga;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ga;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,15 +29,15 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ga;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ga;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ga;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ga;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/gw;->getAppInstanceId(Lcom/google/android/gms/internal/measurement/ln;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gb.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gb.smali
index a6127ec04e..7594f56b19 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gb.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJn:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Ljava/util/concurrent/atomic/AtomicReference;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gb;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gb;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,30 +29,30 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gb;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gb;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gb;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gb;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gb;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gb;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gb;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gb;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aED:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aEV:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/jb;->a(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)J
 
@@ -67,7 +67,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gb;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gb;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -78,7 +78,7 @@
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gb;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gb;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2}, Ljava/lang/Object;->notify()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gc.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gc.smali
index fbcbaee795..d7dee20646 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gc.smali
@@ -6,34 +6,34 @@
 
 
 # instance fields
-.field private final synthetic aJb:Ljava/lang/String;
+.field private final synthetic aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field private final synthetic aJn:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJt:Ljava/lang/String;
 
-.field private final synthetic aqC:Z
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqU:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gc;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gc;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gc;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gc;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gc;->aJb:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gc;->aJt:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gc;->aqn:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gc;->aqF:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/gc;->aqo:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/gc;->aqG:Ljava/lang/String;
 
-    iput-boolean p6, p0, Lcom/google/android/gms/measurement/internal/gc;->aqC:Z
+    iput-boolean p6, p0, Lcom/google/android/gms/measurement/internal/gc;->aqU:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,23 +45,23 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gc;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gc;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gc;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gc;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gc;->aJb:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gc;->aJt:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/gc;->aqn:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/gc;->aqF:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/gc;->aqo:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/gc;->aqG:Ljava/lang/String;
 
-    iget-boolean v6, p0, Lcom/google/android/gms/measurement/internal/gc;->aqC:Z
+    iget-boolean v6, p0, Lcom/google/android/gms/measurement/internal/gc;->aqU:Z
 
     invoke-virtual/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/gw;->a(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gd.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gd.smali
index 8cf34feeba..cc9f9fa684 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gd.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJn:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Ljava/util/concurrent/atomic/AtomicReference;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gd;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gd;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gd;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gd;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,30 +29,30 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gd;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gd;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gd;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gd;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gd;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gd;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gd;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gd;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aEF:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aEX:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/jb;->c(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)D
 
@@ -67,7 +67,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gd;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gd;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -78,7 +78,7 @@
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gd;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gd;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2}, Ljava/lang/Object;->notify()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ge.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ge.smali
index 09d9e8f80e..d34abb461e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ge.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ge.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJn:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Ljava/util/concurrent/atomic/AtomicReference;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ge;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ge;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ge;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ge;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,30 +29,30 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ge;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ge;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ge;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ge;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ge;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ge;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ge;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ge;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aEE:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aEW:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/jb;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)I
 
@@ -67,7 +67,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ge;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ge;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -78,7 +78,7 @@
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ge;->aJn:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ge;->aJF:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2}, Ljava/lang/Object;->notify()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gf.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gf.smali
index 24018f9ac5..80ea06ba17 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gf.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-.field private final synthetic aqE:Z
+.field private final synthetic aqW:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gf;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gf;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/gf;->aqE:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/gf;->aqW:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,45 +29,45 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->yD()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->yB()Z
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gf;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gf;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/gf;->aqE:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/gf;->aqW:Z
 
     invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/ek;->zza(Z)V
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/gf;->aqE:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/gf;->aqW:Z
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/gf;->aqE:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/gf;->aqW:Z
 
     invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -78,9 +78,9 @@
     invoke-virtual {v1, v3, v2}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
@@ -88,36 +88,36 @@
 
     if-eq v1, v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gf;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gf;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->yD()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->yB()Z
 
     move-result v2
 
     if-eq v1, v2, :cond_2
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/fr;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/fr;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/gf;->aqE:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/gf;->aqW:Z
 
     invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -132,7 +132,7 @@
     invoke-virtual {v1, v3, v2, v0}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fr;->a(Lcom/google/android/gms/measurement/internal/fr;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gg.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gg.smali
index 27ff3e1314..4316fa7652 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gg.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-.field private final synthetic aqE:Z
+.field private final synthetic aqW:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gg;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gg;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/gg;->aqE:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/gg;->aqW:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,9 +29,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gg;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gg;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/gg;->aqE:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/gg;->aqW:Z
 
     invoke-static {v0, v1}, Lcom/google/android/gms/measurement/internal/fr;->a(Lcom/google/android/gms/measurement/internal/fr;Z)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gh.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gh.smali
index 5b2aa18acd..8869b60826 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gh.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJE:J
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJW:J
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gh;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gh;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gh;->aJE:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gh;->aJW:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,27 +29,27 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gh;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gh;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGS:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHk:Lcom/google/android/gms/measurement/internal/dt;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gh;->aJE:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gh;->aJW:J
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gh;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gh;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gh;->aJE:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gh;->aJW:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gi.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gi.smali
index 96c8949fe1..ce6d2cd0f5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gi.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gi.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJE:J
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJW:J
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fr;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gi;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gi;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gi;->aJE:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gi;->aJW:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,27 +29,27 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gi;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gi;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGR:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHj:Lcom/google/android/gms/measurement/internal/dt;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gi;->aJE:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gi;->aJW:J
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gi;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gi;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gi;->aJE:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gi;->aJW:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gj.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gj.smali
index ab11633005..90c3b3259a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gj.smali
@@ -71,5 +71,5 @@
 .method public abstract setDataCollectionEnabled(Z)V
 .end method
 
-.method public abstract yJ()Ljava/lang/String;
+.method public abstract yH()Ljava/lang/String;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gk.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gk.smali
index 7da3611f47..1ef29777f1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gk.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic aJo:Lcom/google/android/gms/measurement/internal/fr;
+.field private final synthetic aJG:Lcom/google/android/gms/measurement/internal/fr;
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/gms/measurement/internal/fr;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,17 +42,17 @@
     const-string v0, "referrer"
 
     :try_start_0
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "onActivityCreated"
 
-    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Landroid/app/Activity;->getIntent()Landroid/content/Intent;
 
@@ -63,9 +63,9 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
@@ -90,9 +90,9 @@
     goto/16 :goto_8
 
     :cond_1
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     invoke-static {v4}, Lcom/google/android/gms/measurement/internal/it;->c(Landroid/content/Intent;)Z
 
@@ -118,13 +118,13 @@
 
     move-result-object v7
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v8
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/j;->aFt:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v9, Lcom/google/android/gms/measurement/internal/j;->aFL:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v8, v9}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -148,13 +148,13 @@
     if-nez v8, :cond_4
 
     :try_start_3
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v8
 
-    sget-object v14, Lcom/google/android/gms/measurement/internal/j;->aFv:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v14, Lcom/google/android/gms/measurement/internal/j;->aFN:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v8, v14}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -207,22 +207,22 @@
 
     if-nez v8, :cond_6
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {v0, v9}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v9}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_1
 
     :cond_6
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v8
 
@@ -272,9 +272,9 @@
 
     if-nez v3, :cond_b
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v9
 
@@ -288,13 +288,13 @@
 
     invoke-virtual {v5, v11, v9}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v9
 
-    sget-object v11, Lcom/google/android/gms/measurement/internal/j;->aFt:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v11, Lcom/google/android/gms/measurement/internal/j;->aFL:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v9, v11}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -342,7 +342,7 @@
     const/16 v18, 0x0
 
     :goto_5
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
     const-string v9, "_cmp"
 
@@ -361,13 +361,13 @@
     const/4 v5, 0x0
 
     :goto_6
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v4
 
-    sget-object v8, Lcom/google/android/gms/measurement/internal/j;->aFv:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v8, Lcom/google/android/gms/measurement/internal/j;->aFN:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v4, v8}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -392,7 +392,7 @@
     if-nez v4, :cond_d
 
     :cond_c
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
     const-string v5, "_lgclid"
 
@@ -412,9 +412,9 @@
 
     if-eqz v4, :cond_e
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
@@ -473,24 +473,24 @@
     :goto_7
     if-nez v0, :cond_11
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     move-object/from16 v4, v17
 
-    invoke-virtual {v0, v4}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v4}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
     :try_end_4
     .catch Ljava/lang/Exception; {:try_start_4 .. :try_end_4} :catch_0
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
@@ -500,13 +500,13 @@
 
     :cond_11
     :try_start_5
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Activity created with referrer"
 
@@ -518,7 +518,7 @@
 
     if-nez v0, :cond_12
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
     const-string v4, "_ldl"
 
@@ -528,9 +528,9 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
     :cond_12
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
@@ -540,9 +540,9 @@
 
     :cond_13
     :goto_8
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
@@ -559,13 +559,13 @@
     move-exception v0
 
     :try_start_6
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Throwable caught in onActivityCreated"
 
@@ -573,9 +573,9 @@
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
@@ -584,9 +584,9 @@
     return-void
 
     :goto_9
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v4
 
@@ -604,13 +604,13 @@
 .method public final onActivityDestroyed(Landroid/app/Activity;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gr;->aJP:Ljava/util/Map;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gr;->aKh:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -620,25 +620,25 @@
 .method public final onActivityPaused(Landroid/app/Activity;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/gr;->f(Landroid/app/Activity;)Lcom/google/android/gms/measurement/internal/gs;
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/gr;->e(Landroid/app/Activity;)Lcom/google/android/gms/measurement/internal/gs;
 
     move-result-object p1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/gr;->aJN:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/gr;->aKf:Lcom/google/android/gms/measurement/internal/gs;
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/gr;->aJO:Lcom/google/android/gms/measurement/internal/gs;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/gr;->aKg:Lcom/google/android/gms/measurement/internal/gs;
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/gr;->aJN:Lcom/google/android/gms/measurement/internal/gs;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/gr;->aKf:Lcom/google/android/gms/measurement/internal/gs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v1
 
@@ -648,13 +648,13 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/ed;->f(Ljava/lang/Runnable;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/cb;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -662,7 +662,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
@@ -678,13 +678,13 @@
 .method public final onActivityResumed(Landroid/app/Activity;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/gr;->f(Landroid/app/Activity;)Lcom/google/android/gms/measurement/internal/gs;
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/gr;->e(Landroid/app/Activity;)Lcom/google/android/gms/measurement/internal/gs;
 
     move-result-object v1
 
@@ -692,11 +692,11 @@
 
     invoke-virtual {v0, p1, v1, v2}, Lcom/google/android/gms/measurement/internal/gr;->a(Landroid/app/Activity;Lcom/google/android/gms/measurement/internal/gs;Z)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vz()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -704,7 +704,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
@@ -714,13 +714,13 @@
 
     invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/ed;->f(Ljava/lang/Runnable;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/cb;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -728,7 +728,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
@@ -744,15 +744,15 @@
 .method public final onActivitySaveInstanceState(Landroid/app/Activity;Landroid/os/Bundle;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gk;->aJo:Lcom/google/android/gms/measurement/internal/fr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gk;->aJG:Lcom/google/android/gms/measurement/internal/fr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
     if-eqz p2, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gr;->aJP:Ljava/util/Map;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gr;->aKh:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -766,19 +766,19 @@
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
 
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/gs;->aJU:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/gs;->aKm:J
 
     const-string v3, "id"
 
     invoke-virtual {v0, v3, v1, v2}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gs;->aJS:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gs;->aKk:Ljava/lang/String;
 
     const-string v2, "name"
 
     invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/gs;->aJT:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/gs;->aKl:Ljava/lang/String;
 
     const-string v1, "referrer_name"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gm.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gm.smali
index 2d048b2bf3..a407a4563e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gm.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field final aGr:Ljavax/net/ssl/SSLSocketFactory;
+.field final aGJ:Ljavax/net/ssl/SSLSocketFactory;
 
 
 # direct methods
@@ -28,7 +28,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gm;->aGr:Ljavax/net/ssl/SSLSocketFactory;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gm;->aGJ:Ljavax/net/ssl/SSLSocketFactory;
 
     return-void
 .end method
@@ -112,103 +112,95 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->ma()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -216,18 +208,26 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vx()V
 
     return-void
 .end method
 
-.method public final xO()Z
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+
+    return-void
+.end method
+
+.method public final xM()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gn.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gn.smali
index cfe65e6abc..ab5fbd3eb0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gn.smali
@@ -6,15 +6,15 @@
 
 
 # instance fields
-.field private final aJF:Lcom/google/android/gms/measurement/internal/go;
+.field private final aJX:Lcom/google/android/gms/measurement/internal/go;
 
-.field private final aJG:I
+.field private final aJY:I
 
-.field private final aJH:Ljava/lang/Exception;
+.field private final aJZ:Ljava/lang/Exception;
 
-.field private final aJI:[B
+.field private final aKa:[B
 
-.field private final aJJ:Ljava/util/Map;
+.field private final aKb:Ljava/util/Map;
 
 
 # direct methods
@@ -23,15 +23,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gn;->aJF:Lcom/google/android/gms/measurement/internal/go;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gn;->aJX:Lcom/google/android/gms/measurement/internal/go;
 
-    iput p2, p0, Lcom/google/android/gms/measurement/internal/gn;->aJG:I
+    iput p2, p0, Lcom/google/android/gms/measurement/internal/gn;->aJY:I
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gn;->aJH:Ljava/lang/Exception;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gn;->aJZ:Ljava/lang/Exception;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gn;->aJI:[B
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gn;->aKa:[B
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/gn;->aJJ:Ljava/util/Map;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/gn;->aKb:Ljava/util/Map;
 
     return-void
 .end method
@@ -41,15 +41,15 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gn;->aJF:Lcom/google/android/gms/measurement/internal/go;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gn;->aJX:Lcom/google/android/gms/measurement/internal/go;
 
-    iget v1, p0, Lcom/google/android/gms/measurement/internal/gn;->aJG:I
+    iget v1, p0, Lcom/google/android/gms/measurement/internal/gn;->aJY:I
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gn;->aJH:Ljava/lang/Exception;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gn;->aJZ:Ljava/lang/Exception;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gn;->aJI:[B
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gn;->aKa:[B
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/go;->aJK:Lcom/google/android/gms/measurement/internal/gl;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/go;->aKc:Lcom/google/android/gms/measurement/internal/gl;
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/gl;->a(ILjava/lang/Throwable;[B)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/go.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/go.smali
index 93cf0e024f..3a1c01b401 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/go.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/go.smali
@@ -6,7 +6,9 @@
 
 
 # instance fields
-.field private final aGB:Ljava/util/Map;
+.field private final aGR:[B
+
+.field private final aGT:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -17,11 +19,9 @@
     .end annotation
 .end field
 
-.field private final aGz:[B
+.field final aKc:Lcom/google/android/gms/measurement/internal/gl;
 
-.field final aJK:Lcom/google/android/gms/measurement/internal/gl;
-
-.field private final synthetic aJL:Lcom/google/android/gms/measurement/internal/gm;
+.field private final synthetic aKd:Lcom/google/android/gms/measurement/internal/gm;
 
 .field final packageName:Ljava/lang/String;
 
@@ -40,11 +40,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/go;->aJL:Lcom/google/android/gms/measurement/internal/gm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/go;->aKd:Lcom/google/android/gms/measurement/internal/gm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -54,13 +54,13 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/go;->aGz:[B
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/go;->aGR:[B
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/go;->aJK:Lcom/google/android/gms/measurement/internal/gl;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/go;->aKc:Lcom/google/android/gms/measurement/internal/gl;
 
     iput-object p2, p0, Lcom/google/android/gms/measurement/internal/go;->packageName:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/go;->aGB:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/go;->aGT:Ljava/util/Map;
 
     return-void
 .end method
@@ -80,9 +80,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/go;->aJL:Lcom/google/android/gms/measurement/internal/gm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/go;->aKd:Lcom/google/android/gms/measurement/internal/gm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -112,16 +112,16 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/go;->aJL:Lcom/google/android/gms/measurement/internal/gm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/go;->aKd:Lcom/google/android/gms/measurement/internal/gm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vA()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vy()V
 
     const/4 v0, 0x0
 
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/go;->aJL:Lcom/google/android/gms/measurement/internal/gm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/go;->aKd:Lcom/google/android/gms/measurement/internal/gm;
 
     iget-object v3, p0, Lcom/google/android/gms/measurement/internal/go;->url:Ljava/net/URL;
 
@@ -133,7 +133,7 @@
 
     if-eqz v4, :cond_3
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/gm;->aGr:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/gm;->aGJ:Ljavax/net/ssl/SSLSocketFactory;
 
     if-eqz v4, :cond_0
 
@@ -145,7 +145,7 @@
 
     check-cast v4, Ljavax/net/ssl/HttpsURLConnection;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gm;->aGr:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gm;->aGJ:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v4, v2}, Ljavax/net/ssl/HttpsURLConnection;->setSSLSocketFactory(Ljavax/net/ssl/SSLSocketFactory;)V
 
@@ -174,11 +174,11 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
     :try_start_1
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/go;->aGB:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/go;->aGT:Ljava/util/Map;
 
     if-eqz v3, :cond_1
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/go;->aGB:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/go;->aGT:Ljava/util/Map;
 
     invoke-interface {v3}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gq.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gq.smali
index 5b87d54193..f0f9a211a9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gq.smali
@@ -11,7 +11,7 @@
     return-void
 .end method
 
-.method private static yL()Ljava/lang/String;
+.method private static yJ()Ljava/lang/String;
     .locals 2
 
     new-instance v0, Ljava/lang/SecurityException;
@@ -36,19 +36,19 @@
 
     const-string v2, "_r"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ek;->vz()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ek;->vx()V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aFd:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aFv:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v3, v12, v4}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -58,11 +58,11 @@
 
     if-nez v3, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Generating ScionPayload disabled. packageName"
 
@@ -95,11 +95,11 @@
 
     if-nez v3, :cond_1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
@@ -110,32 +110,32 @@
     return-object v13
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$f;->pF()Lcom/google/android/gms/internal/measurement/al$f$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$f;->pD()Lcom/google/android/gms/internal/measurement/al$f$a;
 
     move-result-object v14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jg;->beginTransaction()V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
-    invoke-virtual {v3, v12}, Lcom/google/android/gms/measurement/internal/jg;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v3, v12}, Lcom/google/android/gms/measurement/internal/jg;->dg(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v15
 
     if-nez v15, :cond_2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Log and bundle not available. package_name"
 
@@ -145,7 +145,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -155,17 +155,17 @@
 
     :cond_2
     :try_start_1
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yo()Z
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->ym()Z
 
     move-result v3
 
     if-nez v3, :cond_3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Log and bundle disabled. package_name"
 
@@ -175,7 +175,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -185,21 +185,21 @@
 
     :cond_3
     :try_start_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$g;->pM()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$g;->pK()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->pO()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->pM()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v3
 
     const-string v5, "android"
 
-    invoke-virtual {v3, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bF(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v3, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bA(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v11
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v3
 
@@ -209,14 +209,14 @@
 
     if-nez v3, :cond_4
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bK(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bF(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_4
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yk()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
 
     move-result-object v3
 
@@ -226,14 +226,14 @@
 
     if-nez v3, :cond_5
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yk()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bJ(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bE(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_5
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
 
     move-result-object v3
 
@@ -243,14 +243,14 @@
 
     if-nez v3, :cond_6
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bL(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bG(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_6
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yh()J
 
     move-result-wide v5
 
@@ -260,7 +260,7 @@
 
     if-eqz v3, :cond_7
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yh()J
 
     move-result-wide v5
 
@@ -269,7 +269,7 @@
     invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bz(I)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_7
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yl()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
 
     move-result-wide v5
 
@@ -277,7 +277,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yn()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yl()J
 
     move-result-wide v5
 
@@ -297,12 +297,12 @@
 
     move-result-object v3
 
-    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bP(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bK(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     goto :goto_0
 
     :cond_8
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->xG()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->xE()Ljava/lang/String;
 
     move-result-object v3
 
@@ -312,21 +312,21 @@
 
     if-nez v3, :cond_9
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->xG()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->xE()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bS(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bN(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_9
     :goto_0
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->ym()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yk()J
 
     move-result-wide v5
 
     invoke-virtual {v11, v5, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->L(J)Lcom/google/android/gms/internal/measurement/al$g$a;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gq;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gq;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
@@ -334,21 +334,21 @@
 
     if-eqz v3, :cond_a
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zv()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zt()Z
 
     move-result v3
 
     if-eqz v3, :cond_a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v3
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v3, v5}, Lcom/google/android/gms/measurement/internal/jb;->db(Ljava/lang/String;)Z
+    invoke-virtual {v3, v5}, Lcom/google/android/gms/measurement/internal/jb;->cX(Ljava/lang/String;)Z
 
     move-result v3
 
@@ -360,22 +360,22 @@
 
     if-nez v3, :cond_a
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/al$g$a;->qb()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/al$g$a;->pZ()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v3
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v3, v5}, Lcom/google/android/gms/measurement/internal/dp;->cp(Ljava/lang/String;)Landroid/util/Pair;
+    invoke-virtual {v3, v5}, Lcom/google/android/gms/measurement/internal/dp;->cl(Ljava/lang/String;)Landroid/util/Pair;
 
     move-result-object v3
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yv()Z
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yt()Z
 
     move-result v5
 
@@ -396,15 +396,15 @@
     :try_start_3
     iget-object v5, v3, Landroid/util/Pair;->first:Ljava/lang/Object;
 
-    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/zzai;->aDJ:J
+    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/zzai;->aEb:J
 
     invoke-static {v5, v6}, Ljava/lang/Long;->toString(J)Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/gq;->yL()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/gq;->yJ()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v11, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bM(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v11, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bH(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     :try_end_3
     .catch Ljava/lang/SecurityException; {:try_start_3 .. :try_end_3} :catch_0
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
@@ -422,18 +422,18 @@
 
     move-result v3
 
-    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->K(Z)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->I(Z)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     goto :goto_1
 
     :catch_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Resettable device id encryption failed"
 
@@ -447,7 +447,7 @@
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -458,35 +458,35 @@
     :cond_b
     :goto_1
     :try_start_5
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
     sget-object v3, Landroid/os/Build;->MODEL:Ljava/lang/String;
 
-    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bH(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bC(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
     sget-object v5, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
-    invoke-virtual {v3, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bG(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v3, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bB(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->vS()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->vQ()J
 
     move-result-wide v5
 
@@ -496,30 +496,30 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->vT()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->vR()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v3, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bI(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v3, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
     :try_start_6
     invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->getAppInstanceId()Ljava/lang/String;
 
-    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/zzai;->aDJ:J
+    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/zzai;->aEb:J
 
     invoke-static {v5, v6}, Ljava/lang/Long;->toString(J)Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/gq;->yL()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/gq;->yJ()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bN(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bI(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
     :try_end_6
     .catch Ljava/lang/SecurityException; {:try_start_6 .. :try_end_6} :catch_2
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
@@ -539,18 +539,18 @@
 
     move-result-object v3
 
-    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bQ(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->bL(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_c
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v5
 
-    invoke-virtual {v5, v3}, Lcom/google/android/gms/measurement/internal/jg;->dj(Ljava/lang/String;)Ljava/util/List;
+    invoke-virtual {v5, v3}, Lcom/google/android/gms/measurement/internal/jg;->df(Ljava/lang/String;)Ljava/util/List;
 
     move-result-object v5
 
@@ -602,7 +602,7 @@
 
     const-string v19, "_lte"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v7
 
@@ -622,18 +622,18 @@
 
     invoke-interface {v5, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v7
 
     invoke-virtual {v7, v6}, Lcom/google/android/gms/measurement/internal/jg;->a(Lcom/google/android/gms/measurement/internal/iq;)Z
 
     :cond_10
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v6
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/j;->aEY:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/j;->aFq:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v6, v3, v7}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -643,59 +643,59 @@
 
     if-eqz v3, :cond_13
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v9, "Checking account type status for ad personalization signals"
 
-    invoke-virtual {v8, v9}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v8, v9}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v8
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/d;->vV()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/d;->vT()Z
 
     move-result v8
 
     if-eqz v8, :cond_13
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yv()Z
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yt()Z
 
     move-result v9
 
     if-eqz v9, :cond_13
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ig;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ig;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v9
 
-    invoke-virtual {v9, v8}, Lcom/google/android/gms/measurement/internal/ee;->cH(Ljava/lang/String;)Z
+    invoke-virtual {v9, v8}, Lcom/google/android/gms/measurement/internal/ee;->cD(Ljava/lang/String;)Z
 
     move-result v9
 
     if-eqz v9, :cond_13
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v10, "Turning off ad personalization due to account type"
 
-    invoke-virtual {v9, v10}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v9, v10}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     invoke-interface {v5}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -741,7 +741,7 @@
 
     const-string v19, "_npa"
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v3
 
@@ -777,7 +777,7 @@
 
     if-ge v4, v8, :cond_14
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$k;->qv()Lcom/google/android/gms/internal/measurement/al$k$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$k;->qt()Lcom/google/android/gms/internal/measurement/al$k$a;
 
     move-result-object v8
 
@@ -789,7 +789,7 @@
 
     iget-object v9, v9, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-virtual {v8, v9}, Lcom/google/android/gms/internal/measurement/al$k$a;->bT(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
+    invoke-virtual {v8, v9}, Lcom/google/android/gms/internal/measurement/al$k$a;->bO(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
 
     move-result-object v8
 
@@ -799,13 +799,13 @@
 
     check-cast v9, Lcom/google/android/gms/measurement/internal/iq;
 
-    iget-wide v9, v9, Lcom/google/android/gms/measurement/internal/iq;->aLn:J
+    iget-wide v9, v9, Lcom/google/android/gms/measurement/internal/iq;->aLF:J
 
     invoke-virtual {v8, v9, v10}, Lcom/google/android/gms/internal/measurement/al$k$a;->R(J)Lcom/google/android/gms/internal/measurement/al$k$a;
 
     move-result-object v8
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v9
 
@@ -819,7 +819,7 @@
 
     invoke-virtual {v9, v8, v10}, Lcom/google/android/gms/measurement/internal/ip;->a(Lcom/google/android/gms/internal/measurement/al$k$a;Ljava/lang/Object;)V
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v8
 
@@ -840,9 +840,9 @@
 
     invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->c(Ljava/lang/Iterable;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzah;->vW()Landroid/os/Bundle;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzah;->vU()Landroid/os/Bundle;
 
     move-result-object v9
 
@@ -850,39 +850,39 @@
 
     invoke-virtual {v9, v3, v6, v7}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Marking in-app purchase as real-time"
 
-    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     invoke-virtual {v9, v2, v6, v7}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     const-string v3, "_o"
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
     invoke-virtual {v9, v3, v4}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v3
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/it;->cX(Ljava/lang/String;)Z
+    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/it;->cT(Ljava/lang/String;)Z
 
     move-result v3
 
     if-eqz v3, :cond_15
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v3
 
@@ -894,7 +894,7 @@
 
     invoke-virtual {v3, v9, v4, v5}, Lcom/google/android/gms/measurement/internal/it;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v3
 
@@ -905,7 +905,7 @@
     invoke-virtual {v3, v9, v2, v4}, Lcom/google/android/gms/measurement/internal/it;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_15
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -925,7 +925,7 @@
 
     const-wide/16 v7, 0x0
 
-    iget-wide v2, v0, Lcom/google/android/gms/measurement/internal/zzai;->aDJ:J
+    iget-wide v2, v0, Lcom/google/android/gms/measurement/internal/zzai;->aEb:J
 
     move-wide/from16 v17, v2
 
@@ -948,9 +948,9 @@
     :cond_16
     move-object/from16 v19, v9
 
-    iget-wide v3, v2, Lcom/google/android/gms/measurement/internal/f;->aDy:J
+    iget-wide v3, v2, Lcom/google/android/gms/measurement/internal/f;->aDQ:J
 
-    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/zzai;->aDJ:J
+    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/zzai;->aEb:J
 
     invoke-virtual {v2, v5, v6}, Lcom/google/android/gms/measurement/internal/f;->ak(J)Lcom/google/android/gms/measurement/internal/f;
 
@@ -961,7 +961,7 @@
     move-wide/from16 v16, v3
 
     :goto_6
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -969,13 +969,13 @@
 
     new-instance v10, Lcom/google/android/gms/measurement/internal/g;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gq;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gq;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
     iget-object v6, v0, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    iget-wide v7, v0, Lcom/google/android/gms/measurement/internal/zzai;->aDJ:J
+    iget-wide v7, v0, Lcom/google/android/gms/measurement/internal/zzai;->aEb:J
 
     move-object v2, v10
 
@@ -993,7 +993,7 @@
 
     invoke-direct/range {v2 .. v11}, Lcom/google/android/gms/measurement/internal/g;-><init>(Lcom/google/android/gms/measurement/internal/ek;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJLandroid/os/Bundle;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$c;->pr()Lcom/google/android/gms/internal/measurement/al$c$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$c;->pp()Lcom/google/android/gms/internal/measurement/al$c$a;
 
     move-result-object v2
 
@@ -1005,17 +1005,17 @@
 
     iget-object v3, v1, Lcom/google/android/gms/measurement/internal/g;->name:Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Lcom/google/android/gms/internal/measurement/al$c$a;->bB(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$c$a;
+    invoke-virtual {v2, v3}, Lcom/google/android/gms/internal/measurement/al$c$a;->bw(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$c$a;
 
     move-result-object v2
 
-    iget-wide v3, v1, Lcom/google/android/gms/measurement/internal/g;->aDE:J
+    iget-wide v3, v1, Lcom/google/android/gms/measurement/internal/g;->aDW:J
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/internal/measurement/al$c$a;->B(J)Lcom/google/android/gms/internal/measurement/al$c$a;
 
     move-result-object v2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/g;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/g;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzah;->iterator()Ljava/util/Iterator;
 
@@ -1034,21 +1034,21 @@
 
     check-cast v4, Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->pA()Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->py()Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v5
 
-    invoke-virtual {v5, v4}, Lcom/google/android/gms/internal/measurement/al$e$a;->bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-virtual {v5, v4}, Lcom/google/android/gms/internal/measurement/al$e$a;->by(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v5
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/g;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/g;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     invoke-virtual {v6, v4}, Lcom/google/android/gms/measurement/internal/zzah;->get(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v6
 
@@ -1063,15 +1063,15 @@
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$h;->qd()Lcom/google/android/gms/internal/measurement/al$h$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$h;->qb()Lcom/google/android/gms/internal/measurement/al$h$a;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$d;->pv()Lcom/google/android/gms/internal/measurement/al$d$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$d;->pt()Lcom/google/android/gms/internal/measurement/al$d$a;
 
     move-result-object v4
 
-    iget-wide v5, v13, Lcom/google/android/gms/measurement/internal/f;->aDv:J
+    iget-wide v5, v13, Lcom/google/android/gms/measurement/internal/f;->aDN:J
 
     invoke-virtual {v4, v5, v6}, Lcom/google/android/gms/internal/measurement/al$d$a;->C(J)Lcom/google/android/gms/internal/measurement/al$d$a;
 
@@ -1079,7 +1079,7 @@
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    invoke-virtual {v4, v0}, Lcom/google/android/gms/internal/measurement/al$d$a;->bC(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$d$a;
+    invoke-virtual {v4, v0}, Lcom/google/android/gms/internal/measurement/al$d$a;->bx(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$d$a;
 
     move-result-object v0
 
@@ -1089,11 +1089,11 @@
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/measurement/al$g$a;->a(Lcom/google/android/gms/internal/measurement/al$h$a;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xQ()Lcom/google/android/gms/measurement/internal/iz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xO()Lcom/google/android/gms/measurement/internal/iz;
 
     move-result-object v0
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1101,7 +1101,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$g$a;->pS()Ljava/util/List;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$g$a;->pQ()Ljava/util/List;
 
     move-result-object v4
 
@@ -1111,7 +1111,7 @@
 
     invoke-virtual {v12, v0}, Lcom/google/android/gms/internal/measurement/al$g$a;->d(Ljava/lang/Iterable;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$c$a;->pq()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$c$a;->po()Z
 
     move-result v0
 
@@ -1132,7 +1132,7 @@
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/al$g$a;->G(J)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_18
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yh()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yf()J
 
     move-result-wide v0
 
@@ -1143,7 +1143,7 @@
     invoke-virtual {v12, v0, v1}, Lcom/google/android/gms/internal/measurement/al$g$a;->I(J)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_19
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yg()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->ye()J
 
     move-result-wide v2
 
@@ -1164,9 +1164,9 @@
 
     :cond_1b
     :goto_8
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->ys()V
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yq()V
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yp()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yn()J
 
     move-result-wide v0
 
@@ -1182,7 +1182,7 @@
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -1196,29 +1196,29 @@
 
     const/4 v1, 0x1
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/al$g$a;->L(Z)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/al$g$a;->J(Z)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     invoke-virtual {v14, v12}, Lcom/google/android/gms/internal/measurement/al$f$a;->a(Lcom/google/android/gms/internal/measurement/al$g$a;)Lcom/google/android/gms/internal/measurement/al$f$a;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$g$a;->pU()J
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$g$a;->pS()J
 
     move-result-wide v0
 
     invoke-virtual {v15, v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->v(J)V
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$g$a;->pV()J
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$g$a;->pT()J
 
     move-result-wide v0
 
     invoke-virtual {v15, v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->am(J)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
     invoke-virtual {v0, v15}, Lcom/google/android/gms/measurement/internal/jg;->c(Lcom/google/android/gms/measurement/internal/ea;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
@@ -1226,18 +1226,18 @@
     :try_end_7
     .catchall {:try_start_7 .. :try_end_7} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jg;->endTransaction()V
 
     :try_start_8
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v0
 
-    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v1
 
@@ -1260,13 +1260,13 @@
     :catch_1
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -1282,11 +1282,11 @@
     move-exception v0
 
     :try_start_9
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "app instance id encryption failed"
 
@@ -1302,7 +1302,7 @@
     :try_end_9
     .catchall {:try_start_9 .. :try_end_9} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
@@ -1313,7 +1313,7 @@
     :catchall_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
@@ -1328,7 +1328,7 @@
     goto :goto_9
 .end method
 
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gr.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gr.smali
index 35982dc21f..0316353f52 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gr.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field protected aJM:Lcom/google/android/gms/measurement/internal/gs;
+.field protected aKe:Lcom/google/android/gms/measurement/internal/gs;
 
-.field volatile aJN:Lcom/google/android/gms/measurement/internal/gs;
+.field volatile aKf:Lcom/google/android/gms/measurement/internal/gs;
 
-.field aJO:Lcom/google/android/gms/measurement/internal/gs;
+.field aKg:Lcom/google/android/gms/measurement/internal/gs;
 
-.field final aJP:Ljava/util/Map;
+.field final aKh:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -20,9 +20,9 @@
     .end annotation
 .end field
 
-.field private aJQ:Lcom/google/android/gms/measurement/internal/gs;
+.field private aKi:Lcom/google/android/gms/measurement/internal/gs;
 
-.field private aJR:Ljava/lang/String;
+.field private aKj:Ljava/lang/String;
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     invoke-direct {p1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gr;->aJP:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gr;->aKh:Ljava/util/Map;
 
     return-void
 .end method
@@ -43,11 +43,11 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/gr;Lcom/google/android/gms/measurement/internal/gs;Z)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vz()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -57,11 +57,11 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/a;->ah(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object p0
 
-    iget-boolean v0, p1, Lcom/google/android/gms/measurement/internal/gs;->aJV:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/measurement/internal/gs;->aKn:Z
 
     invoke-virtual {p0, v0, p2}, Lcom/google/android/gms/measurement/internal/hx;->c(ZZ)Z
 
@@ -71,7 +71,7 @@
 
     const/4 p0, 0x0
 
-    iput-boolean p0, p1, Lcom/google/android/gms/measurement/internal/gs;->aJV:Z
+    iput-boolean p0, p1, Lcom/google/android/gms/measurement/internal/gs;->aKn:Z
 
     :cond_0
     return-void
@@ -99,11 +99,11 @@
     if-eqz p2, :cond_2
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gs;->aJS:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gs;->aKk:Ljava/lang/String;
 
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gs;->aJS:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gs;->aKk:Ljava/lang/String;
 
     invoke-virtual {p1, v1, p2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
@@ -113,11 +113,11 @@
     invoke-virtual {p1, v1}, Landroid/os/Bundle;->remove(Ljava/lang/String;)V
 
     :goto_0
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gs;->aJT:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gs;->aKl:Ljava/lang/String;
 
     invoke-virtual {p1, v2, p2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gs;->aJU:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gs;->aKm:J
 
     invoke-virtual {p1, v0, v1, v2}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
@@ -140,7 +140,7 @@
     return-void
 .end method
 
-.method private static cN(Ljava/lang/String;)Ljava/lang/String;
+.method private static cJ(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
     const-string v0, "\\."
@@ -188,25 +188,25 @@
 .method final a(Landroid/app/Activity;Lcom/google/android/gms/measurement/internal/gs;Z)V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aJN:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aKf:Lcom/google/android/gms/measurement/internal/gs;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aJO:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aKg:Lcom/google/android/gms/measurement/internal/gs;
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aJN:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aKf:Lcom/google/android/gms/measurement/internal/gs;
 
     :goto_0
-    iget-object v1, p2, Lcom/google/android/gms/measurement/internal/gs;->aJT:Ljava/lang/String;
+    iget-object v1, p2, Lcom/google/android/gms/measurement/internal/gs;->aKl:Ljava/lang/String;
 
     if-nez v1, :cond_1
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/gs;->aJS:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/gs;->aKk:Ljava/lang/String;
 
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -216,24 +216,24 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/gr;->cN(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/gr;->cJ(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
-    iget-wide v3, p2, Lcom/google/android/gms/measurement/internal/gs;->aJU:J
+    iget-wide v3, p2, Lcom/google/android/gms/measurement/internal/gs;->aKm:J
 
     invoke-direct {v1, v2, p1, v3, v4}, Lcom/google/android/gms/measurement/internal/gs;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
 
     move-object p2, v1
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gr;->aJN:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gr;->aKf:Lcom/google/android/gms/measurement/internal/gs;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gr;->aJO:Lcom/google/android/gms/measurement/internal/gs;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gr;->aKg:Lcom/google/android/gms/measurement/internal/gs;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gr;->aJN:Lcom/google/android/gms/measurement/internal/gs;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gr;->aKf:Lcom/google/android/gms/measurement/internal/gs;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p1
 
@@ -249,16 +249,16 @@
 .method public final a(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/gs;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aJR:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aKj:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aJR:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aKj:Ljava/lang/String;
 
     invoke-virtual {v0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -269,9 +269,9 @@
     if-eqz p2, :cond_1
 
     :cond_0
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gr;->aJR:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gr;->aKj:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gr;->aJQ:Lcom/google/android/gms/measurement/internal/gs;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gr;->aKi:Lcom/google/android/gms/measurement/internal/gs;
 
     :cond_1
     monitor-exit p0
@@ -288,12 +288,12 @@
     throw p1
 .end method
 
-.method final f(Landroid/app/Activity;)Lcom/google/android/gms/measurement/internal/gs;
+.method final e(Landroid/app/Activity;)Lcom/google/android/gms/measurement/internal/gs;
     .locals 5
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aJP:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aKh:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -311,7 +311,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/gr;->cN(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/gr;->cJ(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -319,17 +319,17 @@
 
     const/4 v2, 0x0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/it;->zi()J
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/it;->zg()J
 
     move-result-wide v3
 
     invoke-direct {v1, v2, v0, v3, v4}, Lcom/google/android/gms/measurement/internal/gs;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aJP:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aKh:Ljava/util/Map;
 
     invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -349,10 +349,10 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->ma()V
 
     return-void
 .end method
@@ -398,7 +398,7 @@
 
     invoke-direct {v0, v1, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/gs;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gr;->aJP:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gr;->aKh:Ljava/util/Map;
 
     invoke-interface {p2, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -408,24 +408,24 @@
 .method public final setCurrentScreen(Landroid/app/Activity;Ljava/lang/String;Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aJN:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aKf:Lcom/google/android/gms/measurement/internal/gs;
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "setCurrentScreen cannot be called while no activity active"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aJP:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aKh:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -433,15 +433,15 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "setCurrentScreen must be called with an activity in the activity lifecycle"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
@@ -456,22 +456,22 @@
 
     move-result-object p3
 
-    invoke-static {p3}, Lcom/google/android/gms/measurement/internal/gr;->cN(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p3}, Lcom/google/android/gms/measurement/internal/gr;->cJ(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p3
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aJN:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aKf:Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gs;->aJT:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gs;->aKl:Ljava/lang/String;
 
     invoke-virtual {v0, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gr;->aJN:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gr;->aKf:Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gs;->aJS:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gs;->aKk:Ljava/lang/String;
 
     invoke-static {v1, p2}, Lcom/google/android/gms/measurement/internal/it;->K(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -481,15 +481,15 @@
 
     if-eqz v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "setCurrentScreen cannot be called with the same class and name"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
@@ -511,11 +511,11 @@
     if-le v1, v0, :cond_5
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {p2}, Ljava/lang/String;->length()I
 
@@ -547,11 +547,11 @@
     if-le v1, v0, :cond_7
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {p3}, Ljava/lang/String;->length()I
 
@@ -568,11 +568,11 @@
     return-void
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     if-nez p2, :cond_8
 
@@ -590,17 +590,17 @@
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/gs;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/it;->zi()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/it;->zg()J
 
     move-result-wide v1
 
     invoke-direct {v0, p2, p3, v1, v2}, Lcom/google/android/gms/measurement/internal/gs;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gr;->aJP:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gr;->aKh:Ljava/util/Map;
 
     invoke-interface {p2, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -611,165 +611,147 @@
     return-void
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/a;
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/fr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/fr;
+.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/cz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/cz;
+.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/gw;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/gw;
+.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/gr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/gr;
+.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/dd;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/dd;
+.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/hx;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vH()Lcom/google/android/gms/measurement/internal/hx;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vP()Lcom/google/android/gms/measurement/internal/jb;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -777,22 +759,40 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vx()V
 
     return-void
 .end method
 
-.method public final yM()Lcom/google/android/gms/measurement/internal/gs;
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+
+    return-void
+.end method
+
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vz()Lcom/google/android/gms/measurement/internal/a;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aJM:Lcom/google/android/gms/measurement/internal/gs;
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final yK()Lcom/google/android/gms/measurement/internal/gs;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aKe:Lcom/google/android/gms/measurement/internal/gs;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gs.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gs.smali
index 82d0df7673..dd50456019 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gs.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field public final aJS:Ljava/lang/String;
+.field public final aKk:Ljava/lang/String;
 
-.field public final aJT:Ljava/lang/String;
+.field public final aKl:Ljava/lang/String;
 
-.field public final aJU:J
+.field public final aKm:J
 
-.field aJV:Z
+.field aKn:Z
 
 
 # direct methods
@@ -18,15 +18,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gs;->aJS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gs;->aKk:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gs;->aJT:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gs;->aKl:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/gs;->aJU:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/gs;->aKm:J
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/gs;->aJV:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/gs;->aKn:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gt.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gt.smali
index 5d278757e1..d2fde2381b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gt.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gt.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJW:Lcom/google/android/gms/measurement/internal/gs;
+.field private final synthetic aKo:Lcom/google/android/gms/measurement/internal/gs;
 
-.field private final synthetic aJX:Lcom/google/android/gms/measurement/internal/gr;
+.field private final synthetic aKp:Lcom/google/android/gms/measurement/internal/gr;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gr;Lcom/google/android/gms/measurement/internal/gs;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gt;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gt;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gt;->aJW:Lcom/google/android/gms/measurement/internal/gs;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gt;->aKo:Lcom/google/android/gms/measurement/internal/gs;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,21 +29,21 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gt;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gt;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gt;->aJW:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gt;->aKo:Lcom/google/android/gms/measurement/internal/gs;
 
     const/4 v2, 0x0
 
     invoke-static {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/gr;->a(Lcom/google/android/gms/measurement/internal/gr;Lcom/google/android/gms/measurement/internal/gs;Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gt;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gt;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/gr;->aJM:Lcom/google/android/gms/measurement/internal/gs;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/gr;->aKe:Lcom/google/android/gms/measurement/internal/gs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gu.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gu.smali
index 14f4724356..49703ae3fc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gu.smali
@@ -6,26 +6,26 @@
 
 
 # instance fields
-.field private final synthetic aJX:Lcom/google/android/gms/measurement/internal/gr;
+.field private final synthetic aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-.field private final synthetic aJY:Z
+.field private final synthetic aKq:Z
 
-.field private final synthetic aJZ:Lcom/google/android/gms/measurement/internal/gs;
+.field private final synthetic aKr:Lcom/google/android/gms/measurement/internal/gs;
 
-.field private final synthetic aKa:Lcom/google/android/gms/measurement/internal/gs;
+.field private final synthetic aKs:Lcom/google/android/gms/measurement/internal/gs;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gr;ZLcom/google/android/gms/measurement/internal/gs;Lcom/google/android/gms/measurement/internal/gs;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gu;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gu;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/gu;->aJY:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/gu;->aKq:Z
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gu;->aJZ:Lcom/google/android/gms/measurement/internal/gs;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gu;->aKr:Lcom/google/android/gms/measurement/internal/gs;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gu;->aKa:Lcom/google/android/gms/measurement/internal/gs;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gu;->aKs:Lcom/google/android/gms/measurement/internal/gs;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,23 +37,23 @@
 .method public final run()V
     .locals 9
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jb;->di(Ljava/lang/String;)Z
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jb;->de(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -63,13 +63,13 @@
 
     if-eqz v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aJY:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aKq:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gr;->aJM:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gr;->aKe:Lcom/google/android/gms/measurement/internal/gs;
 
     if-eqz v0, :cond_0
 
@@ -83,28 +83,28 @@
     :goto_0
     if-eqz v0, :cond_3
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gu;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gu;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/gr;->aJM:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/gr;->aKe:Lcom/google/android/gms/measurement/internal/gs;
 
     invoke-static {v3, v4, v2}, Lcom/google/android/gms/measurement/internal/gr;->a(Lcom/google/android/gms/measurement/internal/gr;Lcom/google/android/gms/measurement/internal/gs;Z)V
 
     goto :goto_1
 
     :cond_1
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aJY:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aKq:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gr;->aJM:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gr;->aKe:Lcom/google/android/gms/measurement/internal/gs;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/gr;->aJM:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/gr;->aKe:Lcom/google/android/gms/measurement/internal/gs;
 
     invoke-static {v0, v3, v2}, Lcom/google/android/gms/measurement/internal/gr;->a(Lcom/google/android/gms/measurement/internal/gr;Lcom/google/android/gms/measurement/internal/gs;Z)V
 
@@ -113,27 +113,27 @@
 
     :cond_3
     :goto_1
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gu;->aJZ:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gu;->aKr:Lcom/google/android/gms/measurement/internal/gs;
 
     if-eqz v3, :cond_4
 
-    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/gs;->aJU:J
+    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/gs;->aKm:J
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/gu;->aKa:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/gu;->aKs:Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-wide v5, v5, Lcom/google/android/gms/measurement/internal/gs;->aJU:J
+    iget-wide v5, v5, Lcom/google/android/gms/measurement/internal/gs;->aKm:J
 
     cmp-long v7, v3, v5
 
     if-nez v7, :cond_4
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gu;->aJZ:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gu;->aKr:Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/gs;->aJT:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/gs;->aKl:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/gu;->aKa:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/gu;->aKs:Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/gs;->aJT:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/gs;->aKl:Ljava/lang/String;
 
     invoke-static {v3, v4}, Lcom/google/android/gms/measurement/internal/it;->K(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -141,13 +141,13 @@
 
     if-eqz v3, :cond_4
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gu;->aJZ:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gu;->aKr:Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/gs;->aJS:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/gs;->aKk:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/gu;->aKa:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/gu;->aKs:Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/gs;->aJS:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/gs;->aKk:Ljava/lang/String;
 
     invoke-static {v3, v4}, Lcom/google/android/gms/measurement/internal/it;->K(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -165,61 +165,61 @@
 
     invoke-direct {v8}, Landroid/os/Bundle;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aKa:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aKs:Lcom/google/android/gms/measurement/internal/gs;
 
     invoke-static {v1, v8, v2}, Lcom/google/android/gms/measurement/internal/gr;->a(Lcom/google/android/gms/measurement/internal/gs;Landroid/os/Bundle;Z)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aJZ:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aKr:Lcom/google/android/gms/measurement/internal/gs;
 
     if-eqz v1, :cond_7
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gs;->aJS:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gs;->aKk:Ljava/lang/String;
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aJZ:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aKr:Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gs;->aJS:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gs;->aKk:Ljava/lang/String;
 
     const-string v2, "_pn"
 
     invoke-virtual {v8, v2, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aJZ:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aKr:Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gs;->aJT:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gs;->aKl:Ljava/lang/String;
 
     const-string v2, "_pc"
 
     invoke-virtual {v8, v2, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aJZ:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aKr:Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-wide v1, v1, Lcom/google/android/gms/measurement/internal/gs;->aJU:J
+    iget-wide v1, v1, Lcom/google/android/gms/measurement/internal/gs;->aKm:J
 
     const-string v3, "_pi"
 
     invoke-virtual {v8, v3, v1, v2}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_7
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gu;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gu;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->di(Ljava/lang/String;)Z
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->de(Ljava/lang/String;)Z
 
     move-result v1
 
@@ -227,13 +227,13 @@
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hx;->yS()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hx;->yQ()J
 
     move-result-wide v0
 
@@ -243,24 +243,24 @@
 
     if-lez v4, :cond_8
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gu;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gu;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v2
 
     invoke-virtual {v2, v8, v0, v1}, Lcom/google/android/gms/measurement/internal/it;->b(Landroid/os/Bundle;J)V
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -275,17 +275,17 @@
     invoke-virtual/range {v3 .. v8}, Lcom/google/android/gms/measurement/internal/fr;->a(Ljava/lang/String;Ljava/lang/String;JLandroid/os/Bundle;)V
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aJX:Lcom/google/android/gms/measurement/internal/gr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aKp:Lcom/google/android/gms/measurement/internal/gr;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aKa:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aKs:Lcom/google/android/gms/measurement/internal/gs;
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/gr;->aJM:Lcom/google/android/gms/measurement/internal/gs;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/gr;->aKe:Lcom/google/android/gms/measurement/internal/gs;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aKa:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gu;->aKs:Lcom/google/android/gms/measurement/internal/gs;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/gw;->a(Lcom/google/android/gms/measurement/internal/gs;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gv.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gv.smali
index c24456bab0..5acb5c3612 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gv.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;Lcom/google/android/gms/measurement/internal/fj;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gv;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gv;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/measurement/internal/b;-><init>(Lcom/google/android/gms/measurement/internal/fj;)V
 
@@ -22,9 +22,9 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gv;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gv;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->isConnected()Z
 
@@ -32,15 +32,15 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Inactivity, disconnecting from the service"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->disconnect()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gw.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gw.smali
index 7e69f02dd1..a25b310b8f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gw.smali
@@ -3,17 +3,19 @@
 
 
 # instance fields
-.field final aKc:Lcom/google/android/gms/measurement/internal/ho;
+.field private final aKA:Lcom/google/android/gms/measurement/internal/b;
 
-.field aKd:Lcom/google/android/gms/measurement/internal/cy;
+.field final aKu:Lcom/google/android/gms/measurement/internal/ho;
 
-.field volatile aKe:Ljava/lang/Boolean;
+.field aKv:Lcom/google/android/gms/measurement/internal/cy;
 
-.field private final aKf:Lcom/google/android/gms/measurement/internal/b;
+.field volatile aKw:Ljava/lang/Boolean;
 
-.field private final aKg:Lcom/google/android/gms/measurement/internal/if;
+.field private final aKx:Lcom/google/android/gms/measurement/internal/b;
 
-.field private final aKh:Ljava/util/List;
+.field private final aKy:Lcom/google/android/gms/measurement/internal/if;
+
+.field private final aKz:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -23,8 +25,6 @@
     .end annotation
 .end field
 
-.field private final aKi:Lcom/google/android/gms/measurement/internal/b;
-
 
 # direct methods
 .method protected constructor <init>(Lcom/google/android/gms/measurement/internal/ek;)V
@@ -36,53 +36,53 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKh:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKz:Ljava/util/List;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/if;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/measurement/internal/if;-><init>(Lcom/google/android/gms/common/util/e;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKg:Lcom/google/android/gms/measurement/internal/if;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKy:Lcom/google/android/gms/measurement/internal/if;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/ho;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/ho;-><init>(Lcom/google/android/gms/measurement/internal/gw;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKc:Lcom/google/android/gms/measurement/internal/ho;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKu:Lcom/google/android/gms/measurement/internal/ho;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/gv;
 
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/measurement/internal/gv;-><init>(Lcom/google/android/gms/measurement/internal/gw;Lcom/google/android/gms/measurement/internal/fj;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKf:Lcom/google/android/gms/measurement/internal/b;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKx:Lcom/google/android/gms/measurement/internal/b;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/hg;
 
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/measurement/internal/hg;-><init>(Lcom/google/android/gms/measurement/internal/gw;Lcom/google/android/gms/measurement/internal/fj;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKi:Lcom/google/android/gms/measurement/internal/b;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKA:Lcom/google/android/gms/measurement/internal/b;
 
     return-void
 .end method
 
-.method private final V(Z)Lcom/google/android/gms/measurement/internal/zzn;
+.method private final T(Z)Lcom/google/android/gms/measurement/internal/zzn;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dh;->xN()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dh;->xL()Ljava/lang/String;
 
     move-result-object p1
 
@@ -92,7 +92,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/cz;->ci(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/cz;->ce(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object p1
 
@@ -102,29 +102,29 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/gw;Landroid/content/ComponentName;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Disconnected from device MeasurementService"
 
     invoke-virtual {v0, v1, p1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/gw;->yP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/gw;->yN()V
 
     :cond_0
     return-void
@@ -138,7 +138,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/gw;->isConnected()Z
 
@@ -151,7 +151,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKz:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -165,30 +165,30 @@
 
     if-ltz v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Discarding data. Max runnable queue size reached"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKz:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gw;->aKi:Lcom/google/android/gms/measurement/internal/b;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gw;->aKA:Lcom/google/android/gms/measurement/internal/b;
 
     const-wide/32 v0, 0xea60
 
     invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/measurement/internal/b;->aj(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/gw;->yP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/gw;->yN()V
 
     return-void
 .end method
@@ -198,31 +198,31 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/ln;Lcom/google/android/gms/measurement/internal/zzai;Ljava/lang/String;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->zl()I
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->zj()I
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Not bundling data. Service unavailable or out of date"
 
-    invoke-virtual {p2, p3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p2, p3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object p2
 
@@ -247,13 +247,13 @@
 .method protected final a(Lcom/google/android/gms/internal/measurement/ln;Ljava/lang/String;Ljava/lang/String;)V
     .locals 7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->V(Z)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->T(Z)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object v5
 
@@ -279,13 +279,13 @@
 .method protected final a(Lcom/google/android/gms/internal/measurement/ln;Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->V(Z)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->T(Z)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object v6
 
@@ -313,25 +313,25 @@
 .method protected final a(Lcom/google/android/gms/measurement/internal/cy;)V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/gw;->yQ()V
-
     return-void
 .end method
 
 .method final a(Lcom/google/android/gms/measurement/internal/cy;Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     const/4 v0, 0x0
 
@@ -352,11 +352,11 @@
 
     invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dd;->xK()Ljava/util/List;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dd;->xI()Ljava/util/List;
 
     move-result-object v4
 
@@ -416,11 +416,11 @@
     :catch_0
     move-exception v7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v9, "Failed to send event to the service"
 
@@ -445,11 +445,11 @@
     :catch_1
     move-exception v7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v9, "Failed to send attribute to the service"
 
@@ -474,11 +474,11 @@
     :catch_2
     move-exception v7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v9, "Failed to send conditional property to the service"
 
@@ -487,15 +487,15 @@
     goto :goto_2
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Discarding data. Unrecognized parcel type."
 
-    invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -513,9 +513,9 @@
 .method protected final a(Lcom/google/android/gms/measurement/internal/gs;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/he;
 
@@ -529,11 +529,11 @@
 .method protected final a(Lcom/google/android/gms/measurement/internal/zzjn;)V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v0
 
@@ -559,15 +559,15 @@
 
     if-le v1, v5, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "User property too long for local database. Sending directly to service"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -577,7 +577,7 @@
     move-result v2
 
     :goto_0
-    invoke-direct {p0, v4}, Lcom/google/android/gms/measurement/internal/gw;->V(Z)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-direct {p0, v4}, Lcom/google/android/gms/measurement/internal/gw;->T(Z)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object v0
 
@@ -601,13 +601,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->V(Z)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->T(Z)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object v0
 
@@ -636,13 +636,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->V(Z)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->T(Z)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object v7
 
@@ -683,13 +683,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->V(Z)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->T(Z)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object v8
 
@@ -721,15 +721,15 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/it;->a(Landroid/os/Parcelable;)[B
 
@@ -741,15 +741,15 @@
 
     if-le v2, v3, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Conditional user property too long for local database. Sending directly to service"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -773,7 +773,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->V(Z)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->T(Z)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object v5
 
@@ -797,11 +797,11 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v0
 
@@ -825,15 +825,15 @@
 
     if-le v1, v4, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Event is too long for local database. Sending event directly to service"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     const/4 v6, 0x0
 
@@ -849,7 +849,7 @@
     :goto_0
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->V(Z)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->T(Z)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object v8
 
@@ -875,17 +875,17 @@
 .method public final disconnect()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKc:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKu:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKr:Lcom/google/android/gms/measurement/internal/de;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKJ:Lcom/google/android/gms/measurement/internal/de;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKr:Lcom/google/android/gms/measurement/internal/de;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKJ:Lcom/google/android/gms/measurement/internal/de;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/de;->isConnected()Z
 
@@ -893,7 +893,7 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKr:Lcom/google/android/gms/measurement/internal/de;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKJ:Lcom/google/android/gms/measurement/internal/de;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/de;->isConnecting()Z
 
@@ -902,23 +902,23 @@
     if-eqz v1, :cond_1
 
     :cond_0
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKr:Lcom/google/android/gms/measurement/internal/de;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKJ:Lcom/google/android/gms/measurement/internal/de;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/de;->disconnect()V
 
     :cond_1
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKr:Lcom/google/android/gms/measurement/internal/de;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKJ:Lcom/google/android/gms/measurement/internal/de;
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gw;->aKc:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gw;->aKu:Lcom/google/android/gms/measurement/internal/ho;
 
     invoke-static {v0, v2}, Lcom/google/android/gms/common/stats/a;->a(Landroid/content/Context;Landroid/content/ServiceConnection;)V
     :try_end_0
@@ -926,7 +926,7 @@
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     return-void
 .end method
@@ -934,13 +934,13 @@
 .method public final getAppInstanceId(Lcom/google/android/gms/internal/measurement/ln;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->V(Z)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->T(Z)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object v0
 
@@ -966,11 +966,11 @@
 .method public final isConnected()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-eqz v0, :cond_0
 
@@ -984,173 +984,155 @@
     return v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->ma()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/a;
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/fr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/fr;
+.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/cz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/cz;
+.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/gw;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/gw;
+.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/gr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/gr;
+.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/dd;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/dd;
+.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/hx;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vH()Lcom/google/android/gms/measurement/internal/hx;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vP()Lcom/google/android/gms/measurement/internal/jb;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -1158,32 +1140,50 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vx()V
 
     return-void
 .end method
 
-.method protected final xJ()V
-    .locals 2
+.method public final bridge synthetic vy()V
+    .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    return-void
+.end method
 
-    const/4 v0, 0x0
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/a;
+    .locals 1
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->V(Z)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vz()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    return-object v0
+.end method
+
+.method protected final xH()V
+    .locals 2
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->T(Z)Lcom/google/android/gms/measurement/internal/zzn;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dd;->xJ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dd;->xH()V
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/gz;
 
@@ -1194,24 +1194,24 @@
     return-void
 .end method
 
-.method protected final yK()V
+.method protected final yI()V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->V(Z)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->T(Z)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFs:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFK:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -1219,7 +1219,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v2
 
@@ -1241,16 +1241,16 @@
     return-void
 .end method
 
-.method protected final yN()V
+.method protected final yL()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->V(Z)Lcom/google/android/gms/measurement/internal/zzn;
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/gw;->T(Z)Lcom/google/android/gms/measurement/internal/zzn;
 
     move-result-object v0
 
@@ -1263,18 +1263,18 @@
     return-void
 .end method
 
-.method final yO()V
+.method final yM()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKg:Lcom/google/android/gms/measurement/internal/if;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKy:Lcom/google/android/gms/measurement/internal/if;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/if;->start()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKf:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKx:Lcom/google/android/gms/measurement/internal/b;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aEA:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aES:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v2, 0x0
 
@@ -1293,12 +1293,12 @@
     return-void
 .end method
 
-.method final yP()V
+.method final yN()V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/gw;->isConnected()Z
 
@@ -1309,7 +1309,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKe:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKw:Ljava/lang/Boolean;
 
     const/4 v1, 0x0
 
@@ -1317,15 +1317,15 @@
 
     if-nez v0, :cond_e
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->xX()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->xV()Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1342,11 +1342,11 @@
     goto/16 :goto_6
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->xI()I
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->xG()I
 
     move-result v0
 
@@ -1361,21 +1361,21 @@
     goto/16 :goto_5
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Checking service availability"
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->zl()I
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->zj()I
 
     move-result v0
 
@@ -1399,11 +1399,11 @@
 
     if-eq v0, v3, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1423,60 +1423,60 @@
     goto :goto_5
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Service updating"
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_0
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Service invalid"
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_2
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Service disabled"
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_2
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Service container out of date"
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->zk()I
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->zi()I
 
     move-result v0
 
@@ -1487,11 +1487,11 @@
     goto :goto_4
 
     :cond_8
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->xX()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dp;->xV()Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1509,15 +1509,15 @@
     goto :goto_3
 
     :cond_a
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Service missing"
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :goto_4
     const/4 v0, 0x0
@@ -1525,51 +1525,51 @@
     goto/16 :goto_1
 
     :cond_b
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Service available"
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto/16 :goto_0
 
     :goto_5
     if-nez v0, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->mQ()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->mO()Z
 
     move-result v4
 
     if-eqz v4, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "No way to upload. Consider using the full version of Analytics"
 
-    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
     :cond_c
     if-eqz v3, :cond_d
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v3
 
-    invoke-virtual {v3, v0}, Lcom/google/android/gms/measurement/internal/dp;->P(Z)V
+    invoke-virtual {v3, v0}, Lcom/google/android/gms/measurement/internal/dp;->N(Z)V
 
     :cond_d
     :goto_6
@@ -1577,10 +1577,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKe:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKw:Ljava/lang/Boolean;
 
     :cond_e
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKe:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKw:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1588,13 +1588,13 @@
 
     if-eqz v0, :cond_12
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKc:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKu:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
@@ -1603,32 +1603,32 @@
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v3, v0, Lcom/google/android/gms/measurement/internal/ho;->ach:Z
+    iget-boolean v3, v0, Lcom/google/android/gms/measurement/internal/ho;->acA:Z
 
     if-eqz v3, :cond_f
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Connection attempt already in progress"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     monitor-exit v0
 
     return-void
 
     :cond_f
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ho;->aKr:Lcom/google/android/gms/measurement/internal/de;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ho;->aKJ:Lcom/google/android/gms/measurement/internal/de;
 
     if-eqz v3, :cond_11
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ho;->aKr:Lcom/google/android/gms/measurement/internal/de;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ho;->aKJ:Lcom/google/android/gms/measurement/internal/de;
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/de;->isConnecting()Z
 
@@ -1636,7 +1636,7 @@
 
     if-nez v3, :cond_10
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ho;->aKr:Lcom/google/android/gms/measurement/internal/de;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ho;->aKJ:Lcom/google/android/gms/measurement/internal/de;
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/de;->isConnected()Z
 
@@ -1645,17 +1645,17 @@
     if-eqz v3, :cond_11
 
     :cond_10
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Already awaiting connection attempt"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     monitor-exit v0
 
@@ -1670,25 +1670,25 @@
 
     invoke-direct {v3, v1, v4, v0, v0}, Lcom/google/android/gms/measurement/internal/de;-><init>(Landroid/content/Context;Landroid/os/Looper;Lcom/google/android/gms/common/internal/c$a;Lcom/google/android/gms/common/internal/c$b;)V
 
-    iput-object v3, v0, Lcom/google/android/gms/measurement/internal/ho;->aKr:Lcom/google/android/gms/measurement/internal/de;
+    iput-object v3, v0, Lcom/google/android/gms/measurement/internal/ho;->aKJ:Lcom/google/android/gms/measurement/internal/de;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Connecting to remote service"
 
-    invoke-virtual {v1, v3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iput-boolean v2, v0, Lcom/google/android/gms/measurement/internal/ho;->ach:Z
+    iput-boolean v2, v0, Lcom/google/android/gms/measurement/internal/ho;->acA:Z
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKr:Lcom/google/android/gms/measurement/internal/de;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ho;->aKJ:Lcom/google/android/gms/measurement/internal/de;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/de;->lV()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/de;->lT()V
 
     monitor-exit v0
 
@@ -1704,11 +1704,11 @@
     throw v1
 
     :cond_12
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->mQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->mO()Z
 
     move-result v0
 
@@ -1773,61 +1773,61 @@
 
     invoke-virtual {v0, v1}, Landroid/content/Intent;->setComponent(Landroid/content/ComponentName;)Landroid/content/Intent;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aKc:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aKu:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
     monitor-enter v1
 
     :try_start_1
-    iget-boolean v4, v1, Lcom/google/android/gms/measurement/internal/ho;->ach:Z
+    iget-boolean v4, v1, Lcom/google/android/gms/measurement/internal/ho;->acA:Z
 
     if-eqz v4, :cond_14
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Connection attempt already in progress"
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     monitor-exit v1
 
     return-void
 
     :cond_14
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Using local app measurement service"
 
-    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iput-boolean v2, v1, Lcom/google/android/gms/measurement/internal/ho;->ach:Z
+    iput-boolean v2, v1, Lcom/google/android/gms/measurement/internal/ho;->acA:Z
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gw;->aKc:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gw;->aKu:Lcom/google/android/gms/measurement/internal/ho;
 
     const/16 v4, 0x81
 
@@ -1847,32 +1847,32 @@
     throw v0
 
     :cond_15
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Unable to use remote or local measurement implementation. Please register the AppMeasurementService service in the app manifest"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_16
     return-void
 .end method
 
-.method final yQ()V
+.method final yO()V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aKh:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aKz:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -1886,7 +1886,7 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKz:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -1915,11 +1915,11 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Task exception while flushing queue"
 
@@ -1928,11 +1928,11 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKz:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKi:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aKA:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/b;->cancel()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gx.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gx.smali
index baa505ec2d..dab9c4cc73 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gx.smali
@@ -6,26 +6,26 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJd:Lcom/google/android/gms/measurement/internal/zzjn;
+.field private final synthetic aJv:Lcom/google/android/gms/measurement/internal/zzjn;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKB:Z
 
-.field private final synthetic aKj:Z
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;ZLcom/google/android/gms/measurement/internal/zzjn;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gx;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gx;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/gx;->aKj:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/gx;->aKB:Z
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gx;->aJd:Lcom/google/android/gms/measurement/internal/zzjn;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gx;->aJv:Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gx;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gx;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,30 +37,30 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gx;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gx;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gx;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gx;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Discarding data. Failed to set user attribute"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gx;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gx;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/gx;->aKj:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/gx;->aKB:Z
 
     if-eqz v2, :cond_1
 
@@ -69,16 +69,16 @@
     goto :goto_0
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gx;->aJd:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gx;->aJv:Lcom/google/android/gms/measurement/internal/zzjn;
 
     :goto_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gx;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gx;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-virtual {v1, v0, v2, v3}, Lcom/google/android/gms/measurement/internal/gw;->a(Lcom/google/android/gms/measurement/internal/cy;Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;Lcom/google/android/gms/measurement/internal/zzn;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gx;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gx;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gy.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gy.smali
index 8223029a96..74173e1953 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gy.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field private final synthetic aKk:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;Ljava/util/concurrent/atomic/AtomicReference;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gy;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gy;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gy;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gy;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,34 +33,34 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gy;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gy;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to get app instance id"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)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
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -72,9 +72,9 @@
 
     :cond_0
     :try_start_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gy;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gy;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gy;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gy;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-interface {v1, v3}, Lcom/google/android/gms/measurement/internal/cy;->c(Lcom/google/android/gms/measurement/internal/zzn;)Ljava/lang/String;
 
@@ -82,7 +82,7 @@
 
     invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -92,34 +92,34 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gy;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gy;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v2
 
-    invoke-virtual {v2, v1}, Lcom/google/android/gms/measurement/internal/fr;->cM(Ljava/lang/String;)V
+    invoke-virtual {v2, v1}, Lcom/google/android/gms/measurement/internal/fr;->cI(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gy;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gy;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dp;->aGN:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dp;->aHf:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v2, v1}, Lcom/google/android/gms/measurement/internal/dv;->cu(Ljava/lang/String;)V
+    invoke-virtual {v2, v1}, Lcom/google/android/gms/measurement/internal/dv;->cq(Ljava/lang/String;)V
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
     :try_end_2
     .catch Landroid/os/RemoteException; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
     :try_end_3
@@ -136,13 +136,13 @@
     move-exception v1
 
     :try_start_4
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gy;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gy;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Failed to get app instance id"
 
@@ -151,7 +151,7 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     :try_start_5
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gy;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -161,7 +161,7 @@
     return-void
 
     :goto_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gy;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gy;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2}, Ljava/lang/Object;->notify()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gz.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gz.smali
index 00da0eba6c..33d16338c7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gz.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gz;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gz;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gz;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gz;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,29 +29,29 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gz;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gz;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gz;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gz;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Failed to reset data on the service; null service"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gz;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gz;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/measurement/internal/cy;->d(Lcom/google/android/gms/measurement/internal/zzn;)V
     :try_end_0
@@ -62,22 +62,22 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gz;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gz;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to reset data on the service"
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gz;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gz;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/h.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/h.smali
index 813ba80d8a..c93ee747b2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/h.smali
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field private aDG:Ljava/util/Iterator;
+.field private aDY:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -27,18 +27,18 @@
     .end annotation
 .end field
 
-.field private final synthetic aDH:Lcom/google/android/gms/measurement/internal/zzah;
+.field private final synthetic aDZ:Lcom/google/android/gms/measurement/internal/zzah;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/zzah;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/h;->aDH:Lcom/google/android/gms/measurement/internal/zzah;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/h;->aDZ:Lcom/google/android/gms/measurement/internal/zzah;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/h;->aDH:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/h;->aDZ:Lcom/google/android/gms/measurement/internal/zzah;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/zzah;->a(Lcom/google/android/gms/measurement/internal/zzah;)Landroid/os/Bundle;
 
@@ -52,7 +52,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/h;->aDG:Ljava/util/Iterator;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/h;->aDY:Ljava/util/Iterator;
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 .method public final hasNext()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/h;->aDG:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/h;->aDY:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -74,7 +74,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/h;->aDG:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/h;->aDY:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ha.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ha.smali
index f6904b1b05..27c12d91ab 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ha.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ha.smali
@@ -6,30 +6,30 @@
 
 
 # instance fields
-.field private final synthetic aBK:Z
+.field private final synthetic aCc:Z
 
-.field private final synthetic aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic aJD:Lcom/google/android/gms/internal/measurement/ln;
+.field private final synthetic aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/ln;Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ha;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ha;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ha;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ha;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ha;->aqn:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ha;->aqF:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ha;->aqo:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ha;->aqG:Ljava/lang/String;
 
-    iput-boolean p5, p0, Lcom/google/android/gms/measurement/internal/ha;->aBK:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/measurement/internal/ha;->aCc:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,21 +41,21 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ha;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ha;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ha;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ha;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ha;->aqn:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ha;->aqF:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ha;->aqo:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ha;->aqG:Ljava/lang/String;
 
-    iget-boolean v4, p0, Lcom/google/android/gms/measurement/internal/ha;->aBK:Z
+    iget-boolean v4, p0, Lcom/google/android/gms/measurement/internal/ha;->aCc:Z
 
     invoke-virtual {v0, v1, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/gw;->a(Lcom/google/android/gms/internal/measurement/ln;Ljava/lang/String;Ljava/lang/String;Z)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hb.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hb.smali
index 7d19de02fc..e55c81d35c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hb.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKD:Z
 
-.field private final synthetic aKl:Z
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;Lcom/google/android/gms/measurement/internal/zzn;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hb;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hb;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hb;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hb;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/hb;->aKl:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/hb;->aKD:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,56 +33,56 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hb;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hb;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hb;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hb;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Discarding data. Failed to send app launch"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/measurement/internal/cy;->a(Lcom/google/android/gms/measurement/internal/zzn;)V
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aKl:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aKD:Z
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cb;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cb;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dd;->ot()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dd;->or()Z
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hb;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hb;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-virtual {v1, v0, v2, v3}, Lcom/google/android/gms/measurement/internal/gw;->a(Lcom/google/android/gms/measurement/internal/cy;Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;Lcom/google/android/gms/measurement/internal/zzn;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hb;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hb;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -91,13 +91,13 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to send app launch to the service"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hc.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hc.smali
index 91dea0623c..86ae4c12b1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hc.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-.field private final synthetic aJD:Lcom/google/android/gms/internal/measurement/ln;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;Lcom/google/android/gms/measurement/internal/zzn;Lcom/google/android/gms/internal/measurement/ln;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hc;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hc;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hc;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hc;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hc;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hc;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,32 +38,32 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {v2, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v2, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)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
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hc;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hc;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/it;->b(Lcom/google/android/gms/internal/measurement/ln;Ljava/lang/String;)V
 
@@ -71,7 +71,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hc;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hc;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-interface {v2, v3}, Lcom/google/android/gms/measurement/internal/cy;->c(Lcom/google/android/gms/measurement/internal/zzn;)Ljava/lang/String;
 
@@ -79,39 +79,39 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v2
 
-    invoke-virtual {v2, v1}, Lcom/google/android/gms/measurement/internal/fr;->cM(Ljava/lang/String;)V
+    invoke-virtual {v2, v1}, Lcom/google/android/gms/measurement/internal/fr;->cI(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dp;->aGN:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dp;->aHf:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v2, v1}, Lcom/google/android/gms/measurement/internal/dv;->cu(Ljava/lang/String;)V
+    invoke-virtual {v2, v1}, Lcom/google/android/gms/measurement/internal/dv;->cq(Ljava/lang/String;)V
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
     :try_end_1
     .catch Landroid/os/RemoteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hc;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hc;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/it;->b(Lcom/google/android/gms/internal/measurement/ln;Ljava/lang/String;)V
 
@@ -126,38 +126,38 @@
     move-exception v2
 
     :try_start_2
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hc;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hc;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {v3, v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hc;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hc;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/it;->b(Lcom/google/android/gms/internal/measurement/ln;Ljava/lang/String;)V
 
     return-void
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hc;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hc;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hc;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v2, v3, v1}, Lcom/google/android/gms/measurement/internal/it;->b(Lcom/google/android/gms/internal/measurement/ln;Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hd.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hd.smali
index 5aed89b89a..41f925646e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hd.smali
@@ -6,26 +6,26 @@
 
 
 # instance fields
-.field private final synthetic aJD:Lcom/google/android/gms/internal/measurement/ln;
+.field private final synthetic aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-.field private final synthetic aJb:Ljava/lang/String;
+.field private final synthetic aJt:Ljava/lang/String;
 
-.field private final synthetic aJc:Lcom/google/android/gms/measurement/internal/zzai;
+.field private final synthetic aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;Lcom/google/android/gms/measurement/internal/zzai;Ljava/lang/String;Lcom/google/android/gms/internal/measurement/ln;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hd;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hd;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hd;->aJb:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hd;->aJt:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hd;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hd;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,34 +40,34 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Discarding data. Failed to send event to service to bundle"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)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
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/it;->a(Lcom/google/android/gms/internal/measurement/ln;[B)V
 
@@ -75,28 +75,28 @@
 
     :cond_0
     :try_start_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hd;->aJb:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hd;->aJt:Ljava/lang/String;
 
     invoke-interface {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/cy;->a(Lcom/google/android/gms/measurement/internal/zzai;Ljava/lang/String;)[B
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
     :try_end_1
     .catch Landroid/os/RemoteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/it;->a(Lcom/google/android/gms/internal/measurement/ln;[B)V
 
@@ -111,13 +111,13 @@
     move-exception v1
 
     :try_start_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Failed to send event to the service to bundle"
 
@@ -125,26 +125,26 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hd;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/it;->a(Lcom/google/android/gms/internal/measurement/ln;[B)V
 
     return-void
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hd;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hd;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v2, v3, v0}, Lcom/google/android/gms/measurement/internal/it;->a(Lcom/google/android/gms/internal/measurement/ln;[B)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/he.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/he.smali
index a6a9f399c1..17b1f4a2f5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/he.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/he.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aJW:Lcom/google/android/gms/measurement/internal/gs;
+.field private final synthetic aKo:Lcom/google/android/gms/measurement/internal/gs;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;Lcom/google/android/gms/measurement/internal/gs;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/he;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/he;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/he;->aJW:Lcom/google/android/gms/measurement/internal/gs;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/he;->aKo:Lcom/google/android/gms/measurement/internal/gs;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,29 +29,29 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Failed to send current screen to service"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aJW:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKo:Lcom/google/android/gms/measurement/internal/gs;
 
     if-nez v0, :cond_1
 
@@ -61,7 +61,7 @@
 
     const/4 v5, 0x0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
@@ -76,19 +76,19 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aJW:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKo:Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-wide v2, v0, Lcom/google/android/gms/measurement/internal/gs;->aJU:J
+    iget-wide v2, v0, Lcom/google/android/gms/measurement/internal/gs;->aKm:J
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aJW:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKo:Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/gs;->aJS:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/gs;->aKk:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aJW:Lcom/google/android/gms/measurement/internal/gs;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKo:Lcom/google/android/gms/measurement/internal/gs;
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/gs;->aJT:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/gs;->aKl:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
@@ -101,9 +101,9 @@
     invoke-interface/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/cy;->a(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -112,13 +112,13 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/he;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/he;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to send current screen to the service"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hf.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hf.smali
index 2f899c1b80..a3822cf4d1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hf.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hf;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hf;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hf;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hf;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,35 +29,35 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hf;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hf;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hf;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hf;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Failed to send measurementEnabled to service"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hf;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hf;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/measurement/internal/cy;->b(Lcom/google/android/gms/measurement/internal/zzn;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hf;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hf;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -66,13 +66,13 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hf;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hf;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to send measurementEnabled to the service"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hg.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hg.smali
index 3ee10ec893..ae9ae7db6f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hg.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;Lcom/google/android/gms/measurement/internal/fj;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hg;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hg;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/measurement/internal/b;-><init>(Lcom/google/android/gms/measurement/internal/fj;)V
 
@@ -22,17 +22,17 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hg;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hg;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Tasks have been queued for a long time"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hh.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hh.smali
index 6ebc6e29f8..5fc4f30536 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hh.smali
@@ -6,36 +6,36 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKB:Z
 
-.field private final synthetic aKj:Z
+.field private final synthetic aKE:Z
 
-.field private final synthetic aKm:Z
+.field private final synthetic aKF:Lcom/google/android/gms/measurement/internal/zzq;
 
-.field private final synthetic aKn:Lcom/google/android/gms/measurement/internal/zzq;
+.field private final synthetic aKG:Lcom/google/android/gms/measurement/internal/zzq;
 
-.field private final synthetic aKo:Lcom/google/android/gms/measurement/internal/zzq;
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;ZLcom/google/android/gms/measurement/internal/zzq;Lcom/google/android/gms/measurement/internal/zzn;Lcom/google/android/gms/measurement/internal/zzq;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKm:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKE:Z
 
-    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/hh;->aKj:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/hh;->aKB:Z
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hh;->aKn:Lcom/google/android/gms/measurement/internal/zzq;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hh;->aKF:Lcom/google/android/gms/measurement/internal/zzq;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hh;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hh;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hh;->aKo:Lcom/google/android/gms/measurement/internal/zzq;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hh;->aKG:Lcom/google/android/gms/measurement/internal/zzq;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,34 +47,34 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Discarding data. Failed to send conditional user property to service"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKm:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKE:Z
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/hh;->aKj:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/hh;->aKB:Z
 
     if-eqz v2, :cond_1
 
@@ -83,10 +83,10 @@
     goto :goto_0
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hh;->aKn:Lcom/google/android/gms/measurement/internal/zzq;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hh;->aKF:Lcom/google/android/gms/measurement/internal/zzq;
 
     :goto_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hh;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hh;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-virtual {v1, v0, v2, v3}, Lcom/google/android/gms/measurement/internal/gw;->a(Lcom/google/android/gms/measurement/internal/cy;Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;Lcom/google/android/gms/measurement/internal/zzn;)V
 
@@ -94,7 +94,7 @@
 
     :cond_2
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKo:Lcom/google/android/gms/measurement/internal/zzq;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKG:Lcom/google/android/gms/measurement/internal/zzq;
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
@@ -104,16 +104,16 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKn:Lcom/google/android/gms/measurement/internal/zzq;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKF:Lcom/google/android/gms/measurement/internal/zzq;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hh;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hh;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-interface {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/cy;->a(Lcom/google/android/gms/measurement/internal/zzq;Lcom/google/android/gms/measurement/internal/zzn;)V
 
     goto :goto_1
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKn:Lcom/google/android/gms/measurement/internal/zzq;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKF:Lcom/google/android/gms/measurement/internal/zzq;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/measurement/internal/cy;->a(Lcom/google/android/gms/measurement/internal/zzq;)V
     :try_end_0
@@ -124,22 +124,22 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to send conditional user property to the service"
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hi.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hi.smali
index 83b624d688..8569c000dc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hi.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hi.smali
@@ -6,36 +6,36 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJb:Ljava/lang/String;
+.field private final synthetic aJt:Ljava/lang/String;
 
-.field private final synthetic aJc:Lcom/google/android/gms/measurement/internal/zzai;
+.field private final synthetic aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKB:Z
 
-.field private final synthetic aKj:Z
+.field private final synthetic aKE:Z
 
-.field private final synthetic aKm:Z
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;ZZLcom/google/android/gms/measurement/internal/zzai;Lcom/google/android/gms/measurement/internal/zzn;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hi;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hi;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/hi;->aKm:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/hi;->aKE:Z
 
-    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/hi;->aKj:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/hi;->aKB:Z
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hi;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hi;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hi;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hi;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/hi;->aJb:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/hi;->aJt:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,34 +47,34 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hi;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hi;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hi;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hi;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Discarding data. Failed to send event to service"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aKm:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aKE:Z
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/hi;->aKj:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/hi;->aKB:Z
 
     if-eqz v2, :cond_1
 
@@ -83,10 +83,10 @@
     goto :goto_0
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hi;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hi;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
     :goto_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hi;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hi;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-virtual {v1, v0, v2, v3}, Lcom/google/android/gms/measurement/internal/gw;->a(Lcom/google/android/gms/measurement/internal/cy;Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;Lcom/google/android/gms/measurement/internal/zzn;)V
 
@@ -94,7 +94,7 @@
 
     :cond_2
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aJb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aJt:Ljava/lang/String;
 
     invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -102,26 +102,26 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hi;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hi;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-interface {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/cy;->a(Lcom/google/android/gms/measurement/internal/zzai;Lcom/google/android/gms/measurement/internal/zzn;)V
 
     goto :goto_1
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hi;->aJb:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hi;->aJt:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hi;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hi;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dh;->xN()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dh;->xL()Ljava/lang/String;
 
     move-result-object v3
 
@@ -134,22 +134,22 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to send event to the service"
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hi;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hi;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hj.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hj.smali
index fcdaa8c3fb..69e7a33fd3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hj.smali
@@ -6,30 +6,30 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-.field private final synthetic aJD:Lcom/google/android/gms/internal/measurement/ln;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzn;Lcom/google/android/gms/internal/measurement/ln;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hj;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hj;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hj;->aqn:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hj;->aqF:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hj;->aqo:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hj;->aqG:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hj;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hj;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hj;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hj;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,36 +48,36 @@
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hj;->aqn:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hj;->aqF:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hj;->aqo:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hj;->aqG:Ljava/lang/String;
 
     invoke-virtual {v2, v0, v3, v4}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)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
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hj;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hj;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/it;->a(Lcom/google/android/gms/internal/measurement/ln;Ljava/util/ArrayList;)V
 
@@ -85,11 +85,11 @@
 
     :cond_0
     :try_start_1
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hj;->aqn:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hj;->aqF:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hj;->aqo:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hj;->aqG:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hj;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hj;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-interface {v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/cy;->a(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzn;)Ljava/util/List;
 
@@ -99,20 +99,20 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
     :try_end_1
     .catch Landroid/os/RemoteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hj;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hj;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/it;->a(Lcom/google/android/gms/internal/measurement/ln;Ljava/util/ArrayList;)V
 
@@ -127,42 +127,42 @@
     move-exception v2
 
     :try_start_2
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hj;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hj;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hj;->aqn:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hj;->aqF:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hj;->aqo:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hj;->aqG:Ljava/lang/String;
 
     invoke-virtual {v3, v0, v4, v5, v2}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hj;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hj;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/it;->a(Lcom/google/android/gms/internal/measurement/ln;Ljava/util/ArrayList;)V
 
     return-void
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hj;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hj;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hj;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v2, v3, v1}, Lcom/google/android/gms/measurement/internal/it;->a(Lcom/google/android/gms/internal/measurement/ln;Ljava/util/ArrayList;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hk.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hk.smali
index 0203f9b89c..571c443bb3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hk.smali
@@ -6,34 +6,34 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJb:Ljava/lang/String;
+.field private final synthetic aJt:Ljava/lang/String;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field private final synthetic aKk:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hk;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hk;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hk;->aJb:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hk;->aJt:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hk;->aqn:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hk;->aqF:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hk;->aqo:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hk;->aqG:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/hk;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/hk;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,40 +45,40 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to get conditional properties"
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aJb:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aJt:Ljava/lang/String;
 
-    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aqn:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aqF:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hk;->aqo:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hk;->aqG:Ljava/lang/String;
 
     invoke-virtual {v1, v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
@@ -90,7 +90,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -102,7 +102,7 @@
 
     :cond_0
     :try_start_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aJb:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aJt:Ljava/lang/String;
 
     invoke-static {v2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -110,13 +110,13 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aqn:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aqF:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aqo:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aqG:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hk;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hk;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-interface {v1, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/cy;->a(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzn;)Ljava/util/List;
 
@@ -127,13 +127,13 @@
     goto :goto_0
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aJb:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aJt:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aqn:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aqF:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hk;->aqo:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hk;->aqG:Ljava/lang/String;
 
     invoke-interface {v1, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/cy;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
 
@@ -142,15 +142,15 @@
     invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
     :try_end_2
     .catch Landroid/os/RemoteException; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
     :try_end_3
@@ -167,27 +167,27 @@
     move-exception v1
 
     :try_start_4
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Failed to get conditional properties"
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aJb:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aJt:Ljava/lang/String;
 
-    invoke-static {v4}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v4}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hk;->aqn:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hk;->aqF:Ljava/lang/String;
 
     invoke-virtual {v2, v3, v4, v5, v1}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
@@ -198,7 +198,7 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     :try_start_5
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -208,7 +208,7 @@
     return-void
 
     :goto_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2}, Ljava/lang/Object;->notify()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hl.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hl.smali
index 4d80ac4c3d..390ecbee9b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hl.smali
@@ -6,34 +6,34 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-.field private final synthetic aJD:Lcom/google/android/gms/internal/measurement/ln;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-.field private final synthetic aqC:Z
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqU:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;Ljava/lang/String;Ljava/lang/String;ZLcom/google/android/gms/measurement/internal/zzn;Lcom/google/android/gms/internal/measurement/ln;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hl;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hl;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hl;->aqn:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hl;->aqF:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hl;->aqo:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hl;->aqG:Ljava/lang/String;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/measurement/internal/hl;->aqC:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/measurement/internal/hl;->aqU:Z
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hl;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hl;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/hl;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/hl;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,36 +52,36 @@
     invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hl;->aqn:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hl;->aqF:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hl;->aqo:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hl;->aqG:Ljava/lang/String;
 
     invoke-virtual {v2, v0, v3, v4}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)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
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hl;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hl;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/it;->a(Lcom/google/android/gms/internal/measurement/ln;Landroid/os/Bundle;)V
 
@@ -89,13 +89,13 @@
 
     :cond_0
     :try_start_1
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hl;->aqn:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hl;->aqF:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hl;->aqo:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hl;->aqG:Ljava/lang/String;
 
-    iget-boolean v5, p0, Lcom/google/android/gms/measurement/internal/hl;->aqC:Z
+    iget-boolean v5, p0, Lcom/google/android/gms/measurement/internal/hl;->aqU:Z
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/hl;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/hl;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-interface {v2, v3, v4, v5, v6}, Lcom/google/android/gms/measurement/internal/cy;->a(Ljava/lang/String;Ljava/lang/String;ZLcom/google/android/gms/measurement/internal/zzn;)Ljava/util/List;
 
@@ -105,20 +105,20 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
     :try_end_1
     .catch Landroid/os/RemoteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hl;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hl;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/it;->a(Lcom/google/android/gms/internal/measurement/ln;Landroid/os/Bundle;)V
 
@@ -133,40 +133,40 @@
     move-exception v2
 
     :try_start_2
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hl;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hl;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hl;->aqn:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hl;->aqF:Ljava/lang/String;
 
     invoke-virtual {v3, v0, v4, v2}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hl;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hl;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/it;->a(Lcom/google/android/gms/internal/measurement/ln;Landroid/os/Bundle;)V
 
     return-void
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hl;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hl;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hl;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-virtual {v2, v3, v1}, Lcom/google/android/gms/measurement/internal/it;->a(Lcom/google/android/gms/internal/measurement/ln;Landroid/os/Bundle;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hm.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hm.smali
index 9084db7776..155c5695e1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hm.smali
@@ -6,38 +6,38 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aJb:Ljava/lang/String;
+.field private final synthetic aJt:Ljava/lang/String;
 
-.field private final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field private final synthetic aKk:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-.field private final synthetic aqC:Z
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqU:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hm;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hm;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hm;->aJb:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hm;->aJt:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hm;->aqn:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hm;->aqF:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hm;->aqo:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hm;->aqG:Ljava/lang/String;
 
-    iput-boolean p6, p0, Lcom/google/android/gms/measurement/internal/hm;->aqC:Z
+    iput-boolean p6, p0, Lcom/google/android/gms/measurement/internal/hm;->aqU:Z
 
-    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/hm;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/hm;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,40 +49,40 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to get user properties"
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hm;->aJb:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hm;->aJt:Ljava/lang/String;
 
-    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hm;->aqn:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hm;->aqF:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hm;->aqo:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hm;->aqG:Ljava/lang/String;
 
     invoke-virtual {v1, v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
@@ -94,7 +94,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -106,7 +106,7 @@
 
     :cond_0
     :try_start_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aJb:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aJt:Ljava/lang/String;
 
     invoke-static {v2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -114,15 +114,15 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hm;->aqn:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hm;->aqF:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hm;->aqo:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hm;->aqG:Ljava/lang/String;
 
-    iget-boolean v5, p0, Lcom/google/android/gms/measurement/internal/hm;->aqC:Z
+    iget-boolean v5, p0, Lcom/google/android/gms/measurement/internal/hm;->aqU:Z
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/hm;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/hm;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-interface {v1, v3, v4, v5, v6}, Lcom/google/android/gms/measurement/internal/cy;->a(Ljava/lang/String;Ljava/lang/String;ZLcom/google/android/gms/measurement/internal/zzn;)Ljava/util/List;
 
@@ -133,15 +133,15 @@
     goto :goto_0
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hm;->aJb:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hm;->aJt:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hm;->aqn:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hm;->aqF:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hm;->aqo:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hm;->aqG:Ljava/lang/String;
 
-    iget-boolean v6, p0, Lcom/google/android/gms/measurement/internal/hm;->aqC:Z
+    iget-boolean v6, p0, Lcom/google/android/gms/measurement/internal/hm;->aqU:Z
 
     invoke-interface {v1, v3, v4, v5, v6}, Lcom/google/android/gms/measurement/internal/cy;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Ljava/util/List;
 
@@ -150,15 +150,15 @@
     invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/gw;->yM()V
     :try_end_2
     .catch Landroid/os/RemoteException; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
     :try_end_3
@@ -175,27 +175,27 @@
     move-exception v1
 
     :try_start_4
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Failed to get user properties"
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hm;->aJb:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hm;->aJt:Ljava/lang/String;
 
-    invoke-static {v4}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v4}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hm;->aqn:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hm;->aqF:Ljava/lang/String;
 
     invoke-virtual {v2, v3, v4, v5, v1}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
@@ -206,7 +206,7 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     :try_start_5
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -216,7 +216,7 @@
     return-void
 
     :goto_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aKk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aKC:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2}, Ljava/lang/Object;->notify()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hn.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hn.smali
index f755bdf980..c87d9d42ba 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hn.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aKp:Lcom/google/android/gms/measurement/internal/cy;
+.field private final synthetic aKH:Lcom/google/android/gms/measurement/internal/cy;
 
-.field private final synthetic aKq:Lcom/google/android/gms/measurement/internal/ho;
+.field private final synthetic aKI:Lcom/google/android/gms/measurement/internal/ho;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ho;Lcom/google/android/gms/measurement/internal/cy;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hn;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hn;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hn;->aKp:Lcom/google/android/gms/measurement/internal/cy;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hn;->aKH:Lcom/google/android/gms/measurement/internal/cy;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,18 +29,18 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hn;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hn;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hn;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hn;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ho;->a(Lcom/google/android/gms/measurement/internal/ho;)Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hn;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hn;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/gw;->isConnected()Z
 
@@ -48,25 +48,25 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hn;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hn;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Connected to service"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hn;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hn;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hn;->aKp:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hn;->aKH:Lcom/google/android/gms/measurement/internal/cy;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/gw;->a(Lcom/google/android/gms/measurement/internal/cy;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ho.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ho.smali
index 6345bbfe22..4f90765ab8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ho.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ho.smali
@@ -8,18 +8,18 @@
 
 
 # instance fields
-.field final synthetic aKb:Lcom/google/android/gms/measurement/internal/gw;
+.field volatile aKJ:Lcom/google/android/gms/measurement/internal/de;
 
-.field volatile aKr:Lcom/google/android/gms/measurement/internal/de;
+.field final synthetic aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-.field volatile ach:Z
+.field volatile acA:Z
 
 
 # direct methods
 .method protected constructor <init>(Lcom/google/android/gms/measurement/internal/gw;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -31,7 +31,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ho;->ach:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ho;->acA:Z
 
     return v0
 .end method
@@ -43,19 +43,19 @@
 
     const-string v0, "MeasurementServiceConnection.onConnectionFailed"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aW(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aR(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gw;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ek;->aIy:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ek;->aIQ:Lcom/google/android/gms/measurement/internal/dh;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ek;->aIy:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ek;->aIQ:Lcom/google/android/gms/measurement/internal/dh;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fg;->isInitialized()Z
 
@@ -63,7 +63,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIy:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIQ:Lcom/google/android/gms/measurement/internal/dh;
 
     goto :goto_0
 
@@ -73,7 +73,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Service connection failed"
 
@@ -85,17 +85,17 @@
     const/4 p1, 0x0
 
     :try_start_0
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ho;->ach:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ho;->acA:Z
 
-    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aKr:Lcom/google/android/gms/measurement/internal/de;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aKJ:Lcom/google/android/gms/measurement/internal/de;
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p1
 
@@ -118,27 +118,27 @@
     throw p1
 .end method
 
-.method public final lq()V
+.method public final lo()V
     .locals 3
 
     const-string v0, "MeasurementServiceConnection.onConnected"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aW(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aR(Ljava/lang/String;)V
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKr:Lcom/google/android/gms/measurement/internal/de;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKJ:Lcom/google/android/gms/measurement/internal/de;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/de;->lY()Landroid/os/IInterface;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/de;->lW()Landroid/os/IInterface;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/measurement/internal/cy;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v1
 
@@ -163,11 +163,11 @@
     const/4 v0, 0x0
 
     :try_start_1
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKr:Lcom/google/android/gms/measurement/internal/de;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKJ:Lcom/google/android/gms/measurement/internal/de;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ho;->ach:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ho;->acA:Z
 
     :goto_0
     monitor-exit p0
@@ -182,28 +182,28 @@
     throw v0
 .end method
 
-.method public final lr()V
+.method public final lp()V
     .locals 2
 
     const-string v0, "MeasurementServiceConnection.onConnectionSuspended"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aW(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aR(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Service connection suspended"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -221,7 +221,7 @@
 
     const-string p1, "MeasurementServiceConnection.onServiceConnected"
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aW(Ljava/lang/String;)V
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aR(Ljava/lang/String;)V
 
     monitor-enter p0
 
@@ -230,19 +230,19 @@
     if-nez p2, :cond_0
 
     :try_start_0
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ho;->ach:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ho;->acA:Z
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Service connected with null binder"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     monitor-exit p0
     :try_end_0
@@ -299,28 +299,28 @@
     move-object v0, v1
 
     :goto_1
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Bound to IMeasurementService interface"
 
-    invoke-virtual {p2, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p2, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_2
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Got binder with a wrong descriptor"
 
@@ -333,37 +333,37 @@
 
     :catch_0
     :try_start_2
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Service connect failed to get IMeasurementService"
 
-    invoke-virtual {p2, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p2, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :goto_2
     if-nez v0, :cond_4
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ho;->ach:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ho;->acA:Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gw;->aKc:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gw;->aKu:Lcom/google/android/gms/measurement/internal/ho;
 
     invoke-static {p1, p2}, Lcom/google/android/gms/common/stats/a;->a(Landroid/content/Context;Landroid/content/ServiceConnection;)V
     :try_end_3
@@ -374,9 +374,9 @@
 
     :cond_4
     :try_start_4
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p1
 
@@ -405,23 +405,23 @@
 
     const-string v0, "MeasurementServiceConnection.onServiceDisconnected"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aW(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aR(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Service disconnected"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hp.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hp.smali
index 44ed04b1c8..f9d5aa25f7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hp.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aKq:Lcom/google/android/gms/measurement/internal/ho;
+.field private final synthetic aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-.field private final synthetic aKs:Lcom/google/android/gms/measurement/internal/cy;
+.field private final synthetic aKK:Lcom/google/android/gms/measurement/internal/cy;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ho;Lcom/google/android/gms/measurement/internal/cy;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hp;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hp;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hp;->aKs:Lcom/google/android/gms/measurement/internal/cy;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hp;->aKK:Lcom/google/android/gms/measurement/internal/cy;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,18 +29,18 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hp;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hp;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ho;->a(Lcom/google/android/gms/measurement/internal/ho;)Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/gw;->isConnected()Z
 
@@ -48,25 +48,25 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Connected to remote service"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hp;->aKs:Lcom/google/android/gms/measurement/internal/cy;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hp;->aKK:Lcom/google/android/gms/measurement/internal/cy;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/gw;->a(Lcom/google/android/gms/measurement/internal/cy;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hq.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hq.smali
index f12c1b21e7..fa8ff8f2a4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hq.smali
@@ -8,14 +8,14 @@
 # instance fields
 .field private final synthetic I:Landroid/content/ComponentName;
 
-.field private final synthetic aKq:Lcom/google/android/gms/measurement/internal/ho;
+.field private final synthetic aKI:Lcom/google/android/gms/measurement/internal/ho;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ho;Landroid/content/ComponentName;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hq;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hq;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
     iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hq;->I:Landroid/content/ComponentName;
 
@@ -29,9 +29,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hq;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hq;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->I:Landroid/content/ComponentName;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hr.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hr.smali
index c5a4da734a..f08503edd2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hr.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic aKq:Lcom/google/android/gms/measurement/internal/ho;
+.field private final synthetic aKI:Lcom/google/android/gms/measurement/internal/ho;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ho;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hr;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hr;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,19 +25,19 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hr;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hr;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/gw;->aKd:Lcom/google/android/gms/measurement/internal/cy;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/gw;->aKv:Lcom/google/android/gms/measurement/internal/cy;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hr;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hr;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yQ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gw;->yO()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hs.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hs.smali
index 1a4ae8f6e7..1333bd6f27 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hs.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic aKq:Lcom/google/android/gms/measurement/internal/ho;
+.field private final synthetic aKI:Lcom/google/android/gms/measurement/internal/ho;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ho;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hs;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hs;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,15 +25,15 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hs;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hs;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     new-instance v1, Landroid/content/ComponentName;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aKq:Lcom/google/android/gms/measurement/internal/ho;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aKI:Lcom/google/android/gms/measurement/internal/ho;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ho;->aKb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ho;->aKt:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ht.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ht.smali
index 95130595f7..b118fca3ff 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ht.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ht.smali
@@ -6,13 +6,13 @@
 
 
 # instance fields
-.field private final aJG:I
+.field private final aJY:I
 
-.field private final aKt:Lcom/google/android/gms/measurement/internal/hu;
+.field private final aKL:Lcom/google/android/gms/measurement/internal/hu;
 
-.field private final aKu:Lcom/google/android/gms/measurement/internal/dh;
+.field private final aKM:Lcom/google/android/gms/measurement/internal/dh;
 
-.field private final aKv:Landroid/content/Intent;
+.field private final aKN:Landroid/content/Intent;
 
 
 # direct methods
@@ -21,13 +21,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ht;->aKt:Lcom/google/android/gms/measurement/internal/hu;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ht;->aKL:Lcom/google/android/gms/measurement/internal/hu;
 
-    iput p2, p0, Lcom/google/android/gms/measurement/internal/ht;->aJG:I
+    iput p2, p0, Lcom/google/android/gms/measurement/internal/ht;->aJY:I
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ht;->aKu:Lcom/google/android/gms/measurement/internal/dh;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ht;->aKM:Lcom/google/android/gms/measurement/internal/dh;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ht;->aKv:Landroid/content/Intent;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ht;->aKN:Landroid/content/Intent;
 
     return-void
 .end method
@@ -37,15 +37,15 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aKt:Lcom/google/android/gms/measurement/internal/hu;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aKL:Lcom/google/android/gms/measurement/internal/hu;
 
-    iget v1, p0, Lcom/google/android/gms/measurement/internal/ht;->aJG:I
+    iget v1, p0, Lcom/google/android/gms/measurement/internal/ht;->aJY:I
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ht;->aKu:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ht;->aKM:Lcom/google/android/gms/measurement/internal/dh;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ht;->aKv:Landroid/content/Intent;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ht;->aKN:Landroid/content/Intent;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/hu;->aKw:Landroid/content/Context;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/hu;->aKO:Landroid/content/Context;
 
     check-cast v4, Lcom/google/android/gms/measurement/internal/hy;
 
@@ -55,7 +55,7 @@
 
     if-eqz v4, :cond_0
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -65,17 +65,17 @@
 
     invoke-virtual {v2, v4, v1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hu;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hu;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Completed wakeful intent."
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hu;->aKw:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hu;->aKO:Landroid/content/Context;
 
     check-cast v0, Lcom/google/android/gms/measurement/internal/hy;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hu.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hu.smali
index 7992df782b..8986cd802a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hu.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field public final aKw:Landroid/content/Context;
+.field public final aKO:Landroid/content/Context;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -38,7 +38,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hu;->aKw:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hu;->aKO:Landroid/content/Context;
 
     return-void
 .end method
@@ -48,13 +48,13 @@
 .method public final j(Ljava/lang/Runnable;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aKw:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aKO:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ii;->au(Landroid/content/Context;)Lcom/google/android/gms/measurement/internal/ii;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v1
 
@@ -70,7 +70,7 @@
 .method public final onCreate()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aKw:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aKO:Landroid/content/Context;
 
     const/4 v1, 0x0
 
@@ -78,15 +78,15 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Local AppMeasurementService is starting up"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 .method public final onDestroy()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aKw:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aKO:Landroid/content/Context;
 
     const/4 v1, 0x0
 
@@ -102,15 +102,15 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Local AppMeasurementService is shutting down"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 .end method
@@ -120,15 +120,15 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hu;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hu;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "onRebind called with null intent"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
@@ -137,11 +137,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hu;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hu;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "onRebind called. action"
 
@@ -157,15 +157,15 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hu;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hu;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "onUnbind called with null intent"
 
-    invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return v0
 
@@ -174,11 +174,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hu;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hu;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "onUnbind called for intent. action"
 
@@ -187,10 +187,10 @@
     return v0
 .end method
 
-.method public final vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aKw:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aKO:Landroid/content/Context;
 
     const/4 v1, 0x0
 
@@ -198,7 +198,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hv.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hv.smali
index 30df822beb..1f7770d614 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hv.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aKx:Lcom/google/android/gms/measurement/internal/ii;
+.field private final synthetic aKP:Lcom/google/android/gms/measurement/internal/ii;
 
-.field private final synthetic aKy:Ljava/lang/Runnable;
+.field private final synthetic aKQ:Ljava/lang/Runnable;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ii;Ljava/lang/Runnable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hv;->aKx:Lcom/google/android/gms/measurement/internal/ii;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hv;->aKP:Lcom/google/android/gms/measurement/internal/ii;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hv;->aKy:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hv;->aKQ:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,17 +29,17 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hv;->aKx:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hv;->aKP:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zf()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hv;->aKx:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hv;->aKP:Lcom/google/android/gms/measurement/internal/ii;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hv;->aKy:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hv;->aKQ:Ljava/lang/Runnable;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ii;->aKV:Ljava/util/List;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ii;->aLn:Ljava/util/List;
 
     if-nez v2, :cond_0
 
@@ -47,16 +47,16 @@
 
     invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/ii;->aKV:Ljava/util/List;
+    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/ii;->aLn:Ljava/util/List;
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ii;->aKV:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ii;->aLn:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hv;->aKx:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hv;->aKP:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hw.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hw.smali
index a76f47fb2b..0d26dbfc63 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hw.smali
@@ -6,11 +6,11 @@
 
 
 # instance fields
-.field private final aKA:Landroid/app/job/JobParameters;
+.field private final aKL:Lcom/google/android/gms/measurement/internal/hu;
 
-.field private final aKt:Lcom/google/android/gms/measurement/internal/hu;
+.field private final aKR:Lcom/google/android/gms/measurement/internal/dh;
 
-.field private final aKz:Lcom/google/android/gms/measurement/internal/dh;
+.field private final aKS:Landroid/app/job/JobParameters;
 
 
 # direct methods
@@ -19,11 +19,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hw;->aKt:Lcom/google/android/gms/measurement/internal/hu;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hw;->aKL:Lcom/google/android/gms/measurement/internal/hu;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hw;->aKz:Lcom/google/android/gms/measurement/internal/dh;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hw;->aKR:Lcom/google/android/gms/measurement/internal/dh;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hw;->aKA:Landroid/app/job/JobParameters;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hw;->aKS:Landroid/app/job/JobParameters;
 
     return-void
 .end method
@@ -33,19 +33,19 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hw;->aKt:Lcom/google/android/gms/measurement/internal/hu;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hw;->aKL:Lcom/google/android/gms/measurement/internal/hu;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aKz:Lcom/google/android/gms/measurement/internal/dh;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aKR:Lcom/google/android/gms/measurement/internal/dh;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hw;->aKA:Landroid/app/job/JobParameters;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hw;->aKS:Landroid/app/job/JobParameters;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "AppMeasurementJobService processed last upload request."
 
-    invoke-virtual {v1, v3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hu;->aKw:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hu;->aKO:Landroid/content/Context;
 
     check-cast v0, Lcom/google/android/gms/measurement/internal/hy;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hx.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hx.smali
index ac649286b8..19f3a96c8b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hx.smali
@@ -3,13 +3,13 @@
 
 
 # instance fields
-.field aKB:J
+.field aKT:J
 
-.field final aKC:Lcom/google/android/gms/measurement/internal/b;
+.field final aKU:Lcom/google/android/gms/measurement/internal/b;
 
-.field final aKD:Lcom/google/android/gms/measurement/internal/b;
+.field final aKV:Lcom/google/android/gms/measurement/internal/b;
 
-.field acv:J
+.field acN:J
 
 .field private handler:Landroid/os/Handler;
 
@@ -22,21 +22,21 @@
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ia;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-direct {p1, p0, v0}, Lcom/google/android/gms/measurement/internal/ia;-><init>(Lcom/google/android/gms/measurement/internal/hx;Lcom/google/android/gms/measurement/internal/fj;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKC:Lcom/google/android/gms/measurement/internal/b;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKU:Lcom/google/android/gms/measurement/internal/b;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/hz;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-direct {p1, p0, v0}, Lcom/google/android/gms/measurement/internal/hz;-><init>(Lcom/google/android/gms/measurement/internal/hx;Lcom/google/android/gms/measurement/internal/fj;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKD:Lcom/google/android/gms/measurement/internal/b;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKV:Lcom/google/android/gms/measurement/internal/b;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object p1
 
@@ -44,11 +44,11 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aKB:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aKT:J
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aKB:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aKT:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/hx;->acv:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/hx;->acN:J
 
     return-void
 .end method
@@ -56,17 +56,17 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/hx;)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     const/4 v0, 0x0
 
     invoke-virtual {p0, v0, v0}, Lcom/google/android/gms/measurement/internal/hx;->c(ZZ)Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vz()Lcom/google/android/gms/measurement/internal/a;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object p0
 
@@ -82,23 +82,23 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/hx;J)V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hx;->yR()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hx;->yP()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aES:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFk:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -108,20 +108,20 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHa:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHs:Lcom/google/android/gms/measurement/internal/dr;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dr;->set(Z)V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -131,13 +131,13 @@
 
     invoke-virtual {v0, v3, v2}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKB:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKT:J
 
-    iget-wide p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKB:J
+    iget-wide p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKT:J
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/hx;->acv:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/hx;->acN:J
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
@@ -145,19 +145,19 @@
 
     if-eqz p1, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object p2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEQ:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aFi:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {p1, p2, v0}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -165,7 +165,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object p1
 
@@ -178,19 +178,19 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKC:Lcom/google/android/gms/measurement/internal/b;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKU:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/b;->cancel()V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKD:Lcom/google/android/gms/measurement/internal/b;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKV:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/b;->cancel()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object p2
 
@@ -206,30 +206,30 @@
 
     if-eqz p1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aGT:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aHl:Lcom/google/android/gms/measurement/internal/dr;
 
     const/4 p2, 0x1
 
     invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dr;->set(Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aHq:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aGT:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aHl:Lcom/google/android/gms/measurement/internal/dr;
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dr;->get()Z
 
@@ -237,23 +237,23 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKC:Lcom/google/android/gms/measurement/internal/b;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKU:Lcom/google/android/gms/measurement/internal/b;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dp;->aGR:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dp;->aHj:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
     move-result-wide v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dp;->aHq:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -270,15 +270,15 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKD:Lcom/google/android/gms/measurement/internal/b;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKV:Lcom/google/android/gms/measurement/internal/b;
 
     const-wide/32 v2, 0x36ee80
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dp;->aHq:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -301,9 +301,9 @@
 .method final at(J)V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -311,11 +311,11 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -325,19 +325,19 @@
 
     invoke-virtual {v2, v1, v0}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jb;->df(Ljava/lang/String;)Z
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jb;->db(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -357,7 +357,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v1
 
@@ -371,11 +371,11 @@
 
     invoke-virtual/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/fr;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aGT:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aHl:Lcom/google/android/gms/measurement/internal/dr;
 
     const/4 v2, 0x0
 
@@ -385,19 +385,19 @@
 
     invoke-direct {v8}, Landroid/os/Bundle;-><init>()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->df(Ljava/lang/String;)Z
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->db(Ljava/lang/String;)Z
 
     move-result v1
 
@@ -412,7 +412,7 @@
     invoke-virtual {v8, v2, v0, v1}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v3
 
@@ -424,11 +424,11 @@
 
     invoke-virtual/range {v3 .. v8}, Lcom/google/android/gms/measurement/internal/fr;->a(Ljava/lang/String;Ljava/lang/String;JLandroid/os/Bundle;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGX:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHp:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
@@ -438,19 +438,19 @@
 .method final b(JZ)V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hx;->yR()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hx;->yP()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aKC:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aKU:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/b;->cancel()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aKD:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aKV:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/b;->cancel()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
@@ -462,59 +462,59 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGT:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHl:Lcom/google/android/gms/measurement/internal/dr;
 
     const/4 v3, 0x1
 
     invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dr;->set(Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHq:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
     :cond_0
     if-eqz p3, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object p3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/jb;->dh(Ljava/lang/String;)Z
+    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/jb;->dd(Ljava/lang/String;)Z
 
     move-result p3
 
     if-eqz p3, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dp;->aGX:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dp;->aHp:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {p3, p1, p2}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dp;->aGT:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dp;->aHl:Lcom/google/android/gms/measurement/internal/dr;
 
     invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/dr;->get()Z
 
@@ -527,15 +527,15 @@
     return-void
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKD:Lcom/google/android/gms/measurement/internal/b;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKV:Lcom/google/android/gms/measurement/internal/b;
 
     const-wide/32 p2, 0x36ee80
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHq:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -555,11 +555,11 @@
 .method public final c(ZZ)Z
     .locals 8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fb;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -567,13 +567,13 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dp;->aGX:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dp;->aHp:Lcom/google/android/gms/measurement/internal/dt;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v3
 
@@ -583,7 +583,7 @@
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/hx;->aKB:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/hx;->aKT:J
 
     sub-long v2, v0, v2
 
@@ -595,11 +595,11 @@
 
     if-gez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -614,19 +614,19 @@
     return p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aHq:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {p1, v2, v3}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -644,11 +644,11 @@
 
     invoke-virtual {p1, v4, v2, v3}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gr;->yM()Lcom/google/android/gms/measurement/internal/gs;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/gr;->yK()Lcom/google/android/gms/measurement/internal/gs;
 
     move-result-object v2
 
@@ -656,37 +656,37 @@
 
     invoke-static {v2, p1, v3}, Lcom/google/android/gms/measurement/internal/gr;->a(Lcom/google/android/gms/measurement/internal/gs;Landroid/os/Bundle;Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v2, v4}, Lcom/google/android/gms/measurement/internal/jb;->di(Ljava/lang/String;)Z
+    invoke-virtual {v2, v4}, Lcom/google/android/gms/measurement/internal/jb;->de(Ljava/lang/String;)Z
 
     move-result v2
 
     if-eqz v2, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aEX:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aFp:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v2, v4, v5}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -696,7 +696,7 @@
 
     if-nez p2, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hx;->yS()J
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hx;->yQ()J
 
     goto :goto_0
 
@@ -712,23 +712,23 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hx;->yS()J
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hx;->yQ()J
 
     :cond_3
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aEX:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aFp:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v2, v4, v5}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -739,7 +739,7 @@
     if-nez p2, :cond_5
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/cb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p2
 
@@ -750,23 +750,23 @@
     invoke-virtual {p2, v2, v4, p1}, Lcom/google/android/gms/measurement/internal/fr;->a(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
     :cond_5
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aKB:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aKT:J
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKD:Lcom/google/android/gms/measurement/internal/b;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKV:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/b;->cancel()V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKD:Lcom/google/android/gms/measurement/internal/b;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aKV:Lcom/google/android/gms/measurement/internal/b;
 
     const-wide/16 v0, 0x0
 
     const-wide/32 v4, 0x36ee80
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dp;->aHq:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -793,173 +793,155 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->ma()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/a;
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/fr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vB()Lcom/google/android/gms/measurement/internal/a;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/fr;
+.method public final bridge synthetic vB()Lcom/google/android/gms/measurement/internal/cz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/cz;
+.method public final bridge synthetic vC()Lcom/google/android/gms/measurement/internal/gw;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/gw;
+.method public final bridge synthetic vD()Lcom/google/android/gms/measurement/internal/gr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/gr;
+.method public final bridge synthetic vE()Lcom/google/android/gms/measurement/internal/dd;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vE()Lcom/google/android/gms/measurement/internal/dd;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/dd;
+.method public final bridge synthetic vF()Lcom/google/android/gms/measurement/internal/hx;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vG()Lcom/google/android/gms/measurement/internal/dd;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vF()Lcom/google/android/gms/measurement/internal/hx;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vH()Lcom/google/android/gms/measurement/internal/hx;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vH()Lcom/google/android/gms/measurement/internal/hx;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vP()Lcom/google/android/gms/measurement/internal/jb;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -967,15 +949,33 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vx()V
 
     return-void
 .end method
 
-.method final yR()V
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vy()V
+
+    return-void
+.end method
+
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/a;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fb;->vz()Lcom/google/android/gms/measurement/internal/a;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method final yP()V
     .locals 2
 
     monitor-enter p0
@@ -1010,10 +1010,10 @@
     throw v0
 .end method
 
-.method final yS()J
+.method final yQ()J
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -1021,11 +1021,11 @@
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/hx;->acv:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/hx;->acN:J
 
     sub-long v2, v0, v2
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/hx;->acv:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/hx;->acN:J
 
     return-wide v2
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hz.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hz.smali
index 189e581b85..d4e71f238b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hz.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic aKE:Lcom/google/android/gms/measurement/internal/hx;
+.field private final synthetic aKW:Lcom/google/android/gms/measurement/internal/hx;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hx;Lcom/google/android/gms/measurement/internal/fj;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hz;->aKE:Lcom/google/android/gms/measurement/internal/hx;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hz;->aKW:Lcom/google/android/gms/measurement/internal/hx;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/measurement/internal/b;-><init>(Lcom/google/android/gms/measurement/internal/fj;)V
 
@@ -22,7 +22,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hz;->aKE:Lcom/google/android/gms/measurement/internal/hx;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hz;->aKW:Lcom/google/android/gms/measurement/internal/hx;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/hx;->a(Lcom/google/android/gms/measurement/internal/hx;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ia.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ia.smali
index ad9e59498c..d89780f211 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ia.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ia.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic aKE:Lcom/google/android/gms/measurement/internal/hx;
+.field private final synthetic aKW:Lcom/google/android/gms/measurement/internal/hx;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hx;Lcom/google/android/gms/measurement/internal/fj;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ia;->aKE:Lcom/google/android/gms/measurement/internal/hx;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ia;->aKW:Lcom/google/android/gms/measurement/internal/hx;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/measurement/internal/b;-><init>(Lcom/google/android/gms/measurement/internal/fj;)V
 
@@ -22,11 +22,11 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ia;->aKE:Lcom/google/android/gms/measurement/internal/hx;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ia;->aKW:Lcom/google/android/gms/measurement/internal/hx;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ib.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ib.smali
index 8590e68ec9..396ea6c87d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ib.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ib.smali
@@ -6,26 +6,26 @@
 
 
 # instance fields
-.field private final synthetic aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic aJD:Lcom/google/android/gms/internal/measurement/ln;
+.field private final synthetic aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-.field private final synthetic aJb:Ljava/lang/String;
+.field private final synthetic aJt:Ljava/lang/String;
 
-.field private final synthetic aJc:Lcom/google/android/gms/measurement/internal/zzai;
+.field private final synthetic aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/ln;Lcom/google/android/gms/measurement/internal/zzai;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ib;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ib;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ib;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ib;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ib;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ib;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ib;->aJb:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ib;->aJt:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,19 +37,19 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ib;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ib;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ib;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ib;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ib;->aJc:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ib;->aJu:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ib;->aJb:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ib;->aJt:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/gw;->a(Lcom/google/android/gms/internal/measurement/ln;Lcom/google/android/gms/measurement/internal/zzai;Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ic.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ic.smali
index 1a5c5afae2..1c01e09ab8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ic.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ic.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aFQ:J
+.field private final synthetic aGi:J
 
-.field private final synthetic aKE:Lcom/google/android/gms/measurement/internal/hx;
+.field private final synthetic aKW:Lcom/google/android/gms/measurement/internal/hx;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hx;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ic;->aKE:Lcom/google/android/gms/measurement/internal/hx;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ic;->aKW:Lcom/google/android/gms/measurement/internal/hx;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/ic;->aFQ:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/ic;->aGi:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,27 +29,27 @@
 .method public final run()V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ic;->aKE:Lcom/google/android/gms/measurement/internal/hx;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ic;->aKW:Lcom/google/android/gms/measurement/internal/hx;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aFQ:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aGi:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hx;->yR()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hx;->yP()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v3
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cz;->pY()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/cz;->pW()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aES:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aFk:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v3, v4, v5}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -57,30 +57,30 @@
 
     if-eqz v3, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dp;->aHa:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dp;->aHs:Lcom/google/android/gms/measurement/internal/dr;
 
     const/4 v4, 0x1
 
     invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dr;->set(Z)V
 
     :cond_0
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/hx;->aKC:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/hx;->aKU:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/b;->cancel()V
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/hx;->aKD:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/hx;->aKV:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/b;->cancel()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -90,7 +90,7 @@
 
     invoke-virtual {v3, v5, v4}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-wide v3, v0, Lcom/google/android/gms/measurement/internal/hx;->aKB:J
+    iget-wide v3, v0, Lcom/google/android/gms/measurement/internal/hx;->aKT:J
 
     const-wide/16 v5, 0x0
 
@@ -98,23 +98,23 @@
 
     if-eqz v7, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dp;->aHq:Lcom/google/android/gms/measurement/internal/dt;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dp;->aHq:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
     move-result-wide v4
 
-    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/hx;->aKB:J
+    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/hx;->aKT:J
 
     sub-long/2addr v1, v6
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/id.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/id.smali
index 6ed11d46e2..fdc87b530d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/id.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/id.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aFQ:J
+.field private final synthetic aGi:J
 
-.field private final synthetic aKE:Lcom/google/android/gms/measurement/internal/hx;
+.field private final synthetic aKW:Lcom/google/android/gms/measurement/internal/hx;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hx;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/id;->aKE:Lcom/google/android/gms/measurement/internal/hx;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/id;->aKW:Lcom/google/android/gms/measurement/internal/hx;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/id;->aFQ:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/id;->aGi:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,9 +29,9 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/id;->aKE:Lcom/google/android/gms/measurement/internal/hx;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/id;->aKW:Lcom/google/android/gms/measurement/internal/hx;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/id;->aFQ:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/id;->aGi:J
 
     invoke-static {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/hx;->a(Lcom/google/android/gms/measurement/internal/hx;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ie.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ie.smali
index c57431ed59..3074bc216f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ie.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ie.smali
@@ -3,11 +3,11 @@
 
 
 # instance fields
-.field private final aKF:Landroid/app/AlarmManager;
+.field private final aKX:Landroid/app/AlarmManager;
 
-.field private final aKG:Lcom/google/android/gms/measurement/internal/b;
+.field private final aKY:Lcom/google/android/gms/measurement/internal/b;
 
-.field private aKH:Ljava/lang/Integer;
+.field private aKZ:Ljava/lang/Integer;
 
 
 # direct methods
@@ -28,15 +28,15 @@
 
     check-cast v0, Landroid/app/AlarmManager;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKF:Landroid/app/AlarmManager;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKX:Landroid/app/AlarmManager;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/ih;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-direct {v0, p0, v1, p1}, Lcom/google/android/gms/measurement/internal/ih;-><init>(Lcom/google/android/gms/measurement/internal/ie;Lcom/google/android/gms/measurement/internal/fj;Lcom/google/android/gms/measurement/internal/ii;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKG:Lcom/google/android/gms/measurement/internal/b;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKY:Lcom/google/android/gms/measurement/internal/b;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 .method private final getJobId()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKH:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKZ:Ljava/lang/Integer;
 
     if-nez v0, :cond_1
 
@@ -90,10 +90,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKH:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKZ:Ljava/lang/Integer;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKH:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKZ:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -102,7 +102,7 @@
     return v0
 .end method
 
-.method private final yT()V
+.method private final yR()V
     .locals 5
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
@@ -121,11 +121,11 @@
 
     move-result v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -140,7 +140,7 @@
     return-void
 .end method
 
-.method private final yU()Landroid/app/PendingIntent;
+.method private final yS()Landroid/app/PendingIntent;
     .locals 3
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
@@ -177,7 +177,7 @@
 .method public final aj(J)V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
@@ -189,15 +189,15 @@
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Receiver not registered/enabled"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_0
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/it;->av(Landroid/content/Context;)Z
@@ -206,20 +206,20 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Service not registered/enabled"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ie;->cancel()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -231,7 +231,7 @@
 
     const-wide/16 v0, 0x0
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aEr:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aEJ:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v3, 0x0
 
@@ -253,25 +253,25 @@
 
     if-gez v2, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKG:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKY:Lcom/google/android/gms/measurement/internal/b;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/b;->vQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/b;->vO()Z
 
     move-result v0
 
     if-nez v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Scheduling upload with DelayedRunnable"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKG:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKY:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/b;->aj(J)V
 
@@ -282,15 +282,15 @@
 
     if-lt v0, v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Scheduling upload with JobScheduler"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
@@ -340,11 +340,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -363,21 +363,21 @@
     return-void
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Scheduling upload with AlarmManager"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ie;->aKF:Landroid/app/AlarmManager;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ie;->aKX:Landroid/app/AlarmManager;
 
     const/4 v0, 0x2
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aEm:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aEE:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -393,7 +393,7 @@
 
     move-result-wide v6
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ie;->yU()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ie;->yS()Landroid/app/PendingIntent;
 
     move-result-object v8
 
@@ -407,17 +407,17 @@
 .method public final cancel()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKF:Landroid/app/AlarmManager;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKX:Landroid/app/AlarmManager;
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ie;->yU()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ie;->yS()Landroid/app/PendingIntent;
 
     move-result-object v1
 
     invoke-virtual {v0, v1}, Landroid/app/AlarmManager;->cancel(Landroid/app/PendingIntent;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKG:Lcom/google/android/gms/measurement/internal/b;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKY:Lcom/google/android/gms/measurement/internal/b;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/b;->cancel()V
 
@@ -427,7 +427,7 @@
 
     if-lt v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ie;->yT()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ie;->yR()V
 
     :cond_0
     return-void
@@ -443,108 +443,100 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->ma()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKF:Landroid/app/AlarmManager;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aKX:Landroid/app/AlarmManager;
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ie;->yU()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ie;->yS()Landroid/app/PendingIntent;
 
     move-result-object v1
 
@@ -556,7 +548,7 @@
 
     if-lt v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ie;->yT()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ie;->yR()V
 
     :cond_0
     const/4 v0, 0x0
@@ -564,48 +556,56 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vx()V
 
     return-void
 .end method
 
-.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/ip;
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+
+    return-void
+.end method
+
+.method public final bridge synthetic xN()Lcom/google/android/gms/measurement/internal/ip;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/iz;
+.method public final bridge synthetic xO()Lcom/google/android/gms/measurement/internal/iz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xQ()Lcom/google/android/gms/measurement/internal/iz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xO()Lcom/google/android/gms/measurement/internal/iz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/jg;
+.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/jg;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/ee;
+.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/ee;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/if.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/if.smali
index 12e3f06d28..e1e5e4e691 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/if.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/if.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field final aAT:Lcom/google/android/gms/common/util/e;
+.field final aBl:Lcom/google/android/gms/common/util/e;
 
 .field startTime:J
 
@@ -16,7 +16,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/if;->aAT:Lcom/google/android/gms/common/util/e;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/if;->aBl:Lcom/google/android/gms/common/util/e;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final start()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/if;->aAT:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/if;->aBl:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->elapsedRealtime()J
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ig.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ig.smali
index c1b643d5ea..eefd0932ef 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ig.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ig.smali
@@ -6,68 +6,68 @@
 
 
 # instance fields
-.field protected final aGw:Lcom/google/android/gms/measurement/internal/ii;
+.field protected final aGO:Lcom/google/android/gms/measurement/internal/ii;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ii;)V
     .locals 1
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/fh;-><init>(Lcom/google/android/gms/measurement/internal/ek;)V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ig;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ig;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public xP()Lcom/google/android/gms/measurement/internal/ip;
+.method public xN()Lcom/google/android/gms/measurement/internal/ip;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ig;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ig;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xQ()Lcom/google/android/gms/measurement/internal/iz;
+.method public xO()Lcom/google/android/gms/measurement/internal/iz;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ig;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ig;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/iz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xO()Lcom/google/android/gms/measurement/internal/iz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xR()Lcom/google/android/gms/measurement/internal/jg;
+.method public xP()Lcom/google/android/gms/measurement/internal/jg;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ig;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ig;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xS()Lcom/google/android/gms/measurement/internal/ee;
+.method public xQ()Lcom/google/android/gms/measurement/internal/ee;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ig;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ig;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ih.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ih.smali
index d1fb00a81f..5b087512be 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ih.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ih.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic aKI:Lcom/google/android/gms/measurement/internal/ie;
+.field private final synthetic aKP:Lcom/google/android/gms/measurement/internal/ii;
 
-.field private final synthetic aKx:Lcom/google/android/gms/measurement/internal/ii;
+.field private final synthetic aLa:Lcom/google/android/gms/measurement/internal/ie;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ie;Lcom/google/android/gms/measurement/internal/fj;Lcom/google/android/gms/measurement/internal/ii;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ih;->aKI:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ih;->aLa:Lcom/google/android/gms/measurement/internal/ie;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ih;->aKx:Lcom/google/android/gms/measurement/internal/ii;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ih;->aKP:Lcom/google/android/gms/measurement/internal/ii;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/measurement/internal/b;-><init>(Lcom/google/android/gms/measurement/internal/fj;)V
 
@@ -26,25 +26,25 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ih;->aKI:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ih;->aLa:Lcom/google/android/gms/measurement/internal/ie;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ie;->cancel()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ih;->aKI:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ih;->aLa:Lcom/google/android/gms/measurement/internal/ie;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Starting upload from DelayedRunnable"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ih;->aKx:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ih;->aKP:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ii$a.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ii$a.smali
index f8e675107b..15b02d2830 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ii$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ii$a.smali
@@ -17,19 +17,7 @@
 
 
 # instance fields
-.field aLg:Lcom/google/android/gms/internal/measurement/al$g;
-
-.field aLh:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field aLi:Ljava/util/List;
+.field aLA:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -39,16 +27,28 @@
     .end annotation
 .end field
 
-.field private aLj:J
+.field private aLB:J
 
-.field private final synthetic aLk:Lcom/google/android/gms/measurement/internal/ii;
+.field private final synthetic aLC:Lcom/google/android/gms/measurement/internal/ii;
+
+.field aLy:Lcom/google/android/gms/internal/measurement/al$g;
+
+.field aLz:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/gms/measurement/internal/ii;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLk:Lcom/google/android/gms/measurement/internal/ii;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLC:Lcom/google/android/gms/measurement/internal/ii;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -88,7 +88,7 @@
 
     invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLA:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -96,10 +96,10 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLi:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLA:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLz:Ljava/util/List;
 
     if-nez v0, :cond_1
 
@@ -107,10 +107,10 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLh:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLz:Ljava/util/List;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLA:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -120,7 +120,7 @@
 
     if-lez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLA:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -143,9 +143,9 @@
     return v1
 
     :cond_2
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLj:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLB:J
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/dr;->sf()I
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/dr;->sd()I
 
     move-result v0
 
@@ -153,7 +153,7 @@
 
     add-long/2addr v2, v4
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEc:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEu:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v4, 0x0
 
@@ -180,13 +180,13 @@
     return v1
 
     :cond_3
-    iput-wide v2, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLj:J
+    iput-wide v2, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLB:J
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLi:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLA:Ljava/util/List;
 
     invoke-interface {v0, p3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLh:Ljava/util/List;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLz:Ljava/util/List;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -194,13 +194,13 @@
 
     invoke-interface {p3, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLi:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLA:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
     move-result p1
 
-    sget-object p2, Lcom/google/android/gms/measurement/internal/j;->aEd:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object p2, Lcom/google/android/gms/measurement/internal/j;->aEv:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {p2, v4}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -231,7 +231,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ii.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ii.smali
index c47fa5fe26..e65be8156b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ii.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ii.smali
@@ -14,35 +14,35 @@
 
 
 # static fields
-.field private static volatile aKJ:Lcom/google/android/gms/measurement/internal/ii;
+.field private static volatile aLb:Lcom/google/android/gms/measurement/internal/ii;
 
 
 # instance fields
-.field final aCX:Lcom/google/android/gms/measurement/internal/ek;
+.field final aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-.field private aKK:Lcom/google/android/gms/measurement/internal/ee;
+.field private aLc:Lcom/google/android/gms/measurement/internal/ee;
 
-.field private aKL:Lcom/google/android/gms/measurement/internal/dk;
+.field private aLd:Lcom/google/android/gms/measurement/internal/dk;
 
-.field private aKM:Lcom/google/android/gms/measurement/internal/jg;
+.field private aLe:Lcom/google/android/gms/measurement/internal/jg;
 
-.field private aKN:Lcom/google/android/gms/measurement/internal/dn;
+.field private aLf:Lcom/google/android/gms/measurement/internal/dn;
 
-.field private aKO:Lcom/google/android/gms/measurement/internal/ie;
+.field private aLg:Lcom/google/android/gms/measurement/internal/ie;
 
-.field private aKP:Lcom/google/android/gms/measurement/internal/iz;
+.field private aLh:Lcom/google/android/gms/measurement/internal/iz;
 
-.field private final aKQ:Lcom/google/android/gms/measurement/internal/ip;
+.field private final aLi:Lcom/google/android/gms/measurement/internal/ip;
 
-.field aKR:Lcom/google/android/gms/measurement/internal/gq;
+.field aLj:Lcom/google/android/gms/measurement/internal/gq;
 
-.field private aKS:Z
+.field private aLk:Z
 
-.field private aKT:Z
+.field private aLl:Z
 
-.field private aKU:J
+.field private aLm:J
 
-.field aKV:Ljava/util/List;
+.field aLn:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -52,21 +52,21 @@
     .end annotation
 .end field
 
-.field aKW:I
+.field aLo:I
 
-.field aKX:I
+.field aLp:I
 
-.field private aKY:Z
+.field private aLq:Z
 
-.field private aKZ:Z
+.field private aLr:Z
 
-.field private aLa:Z
+.field private aLs:Z
 
-.field private aLb:Ljava/nio/channels/FileLock;
+.field private aLt:Ljava/nio/channels/FileLock;
 
-.field private aLc:Ljava/nio/channels/FileChannel;
+.field private aLu:Ljava/nio/channels/FileChannel;
 
-.field private aLd:Ljava/util/List;
+.field private aLv:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -76,7 +76,7 @@
     .end annotation
 .end field
 
-.field private aLe:Ljava/util/List;
+.field private aLw:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -86,9 +86,9 @@
     .end annotation
 .end field
 
-.field private aLf:J
+.field private aLx:J
 
-.field private asv:Z
+.field private asN:Z
 
 
 # direct methods
@@ -109,11 +109,11 @@
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/ii;->asv:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/ii;->asN:Z
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p2, p1, Lcom/google/android/gms/measurement/internal/io;->arZ:Landroid/content/Context;
+    iget-object p2, p1, Lcom/google/android/gms/measurement/internal/io;->asr:Landroid/content/Context;
 
     const/4 v0, 0x0
 
@@ -121,11 +121,11 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLf:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLx:J
 
     new-instance p2, Lcom/google/android/gms/measurement/internal/ip;
 
@@ -133,7 +133,7 @@
 
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ij;->initialize()V
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aKQ:Lcom/google/android/gms/measurement/internal/ip;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLi:Lcom/google/android/gms/measurement/internal/ip;
 
     new-instance p2, Lcom/google/android/gms/measurement/internal/dk;
 
@@ -141,7 +141,7 @@
 
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ij;->initialize()V
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aKL:Lcom/google/android/gms/measurement/internal/dk;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLd:Lcom/google/android/gms/measurement/internal/dk;
 
     new-instance p2, Lcom/google/android/gms/measurement/internal/ee;
 
@@ -149,11 +149,11 @@
 
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ij;->initialize()V
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aKK:Lcom/google/android/gms/measurement/internal/ee;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLc:Lcom/google/android/gms/measurement/internal/ee;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object p2
 
@@ -193,17 +193,17 @@
 
     if-nez v3, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "PackageManager is null, can not log app install information"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-object v4
 
@@ -218,15 +218,15 @@
     goto :goto_0
 
     :catch_0
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -275,7 +275,7 @@
 
     move-result-object v5
 
-    invoke-virtual {v5, v2}, Lcom/google/android/gms/common/c/b;->bc(Ljava/lang/String;)Ljava/lang/CharSequence;
+    invoke-virtual {v5, v2}, Lcom/google/android/gms/common/c/b;->aX(Ljava/lang/String;)Ljava/lang/CharSequence;
 
     move-result-object v5
 
@@ -310,11 +310,11 @@
     :goto_2
     const-wide/16 v5, 0x0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->dd(Ljava/lang/String;)Z
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->cZ(Ljava/lang/String;)Z
 
     move-result v1
 
@@ -336,9 +336,9 @@
 
     const-wide/16 v8, 0x3f7a
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v3
 
@@ -383,15 +383,15 @@
     return-object v29
 
     :catch_1
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -405,7 +405,7 @@
 .method private static a(Lcom/google/android/gms/internal/measurement/al$c$a;ILjava/lang/String;)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al$c$a;->pt()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al$c$a;->pr()Ljava/util/List;
 
     move-result-object v0
 
@@ -442,11 +442,11 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->pA()Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->py()Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v0
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/internal/measurement/al$e$a;->bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/internal/measurement/al$e$a;->by(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v0
 
@@ -456,7 +456,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object p1
 
@@ -464,21 +464,21 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/al$e;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->pA()Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->py()Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v0
 
     const-string v1, "_ev"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/al$e$a;->bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/al$e$a;->by(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v0
 
-    invoke-virtual {v0, p2}, Lcom/google/android/gms/internal/measurement/al$e$a;->bE(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-virtual {v0, p2}, Lcom/google/android/gms/internal/measurement/al$e$a;->bz(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object p2
 
@@ -498,7 +498,7 @@
 .method private static a(Lcom/google/android/gms/internal/measurement/al$c$a;Ljava/lang/String;)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al$c$a;->pt()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al$c$a;->pr()Ljava/util/List;
 
     move-result-object v0
 
@@ -551,11 +551,11 @@
     const-string v0, "_lte"
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v2
 
@@ -574,13 +574,13 @@
     :cond_1
     new-instance v8, Lcom/google/android/gms/measurement/internal/iq;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v3
 
@@ -616,13 +616,13 @@
     :goto_1
     new-instance v8, Lcom/google/android/gms/measurement/internal/iq;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -643,17 +643,17 @@
     invoke-direct/range {v1 .. v7}, Lcom/google/android/gms/measurement/internal/iq;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
 
     :goto_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$k;->qv()Lcom/google/android/gms/internal/measurement/al$k$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$k;->qt()Lcom/google/android/gms/internal/measurement/al$k$a;
 
     move-result-object v1
 
-    invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/measurement/al$k$a;->bT(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
+    invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/measurement/al$k$a;->bO(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v2
 
@@ -677,7 +677,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v1
 
@@ -690,7 +690,7 @@
     const/4 v3, 0x0
 
     :goto_3
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$g$a;->pT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$g$a;->pR()I
 
     move-result v4
 
@@ -732,7 +732,7 @@
 
     if-lez p1, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -748,13 +748,13 @@
     const-string p1, "lifetime"
 
     :goto_5
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object p3, v8, Lcom/google/android/gms/measurement/internal/iq;->value:Ljava/lang/Object;
 
@@ -769,7 +769,7 @@
 .method private final a(Lcom/google/android/gms/measurement/internal/ea;)V
     .locals 11
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->getGmpAppId()Ljava/lang/String;
 
@@ -781,13 +781,13 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zw()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zu()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->xG()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->xE()Ljava/lang/String;
 
     move-result-object v0
 
@@ -798,7 +798,7 @@
     if-eqz v0, :cond_1
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v2
 
@@ -831,18 +831,18 @@
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zw()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zu()Z
 
     move-result v2
 
     if-eqz v2, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->xG()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->xE()Ljava/lang/String;
 
     move-result-object v1
 
     :cond_2
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aDY:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aEq:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v3, 0x0
 
@@ -856,7 +856,7 @@
 
     move-result-object v2
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aDZ:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aEr:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v4, v3}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -933,43 +933,43 @@
 
     invoke-direct {v7, v0}, Ljava/net/URL;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Fetching remote configuration"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v4
 
     invoke-virtual {v1, v2, v4}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/ee;->cD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ap;
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/ee;->cz(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ap;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v2, v4}, Lcom/google/android/gms/measurement/internal/ee;->cE(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, v4}, Lcom/google/android/gms/measurement/internal/ee;->cA(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -994,13 +994,13 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aKY:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLq:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yV()Lcom/google/android/gms/measurement/internal/dk;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yT()Lcom/google/android/gms/measurement/internal/dk;
 
     move-result-object v5
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v6
 
@@ -1008,15 +1008,15 @@
 
     invoke-direct {v10, p0}, Lcom/google/android/gms/measurement/internal/in;-><init>(Lcom/google/android/gms/measurement/internal/ii;)V
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-static {v7}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-static {v10}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v1
 
@@ -1035,19 +1035,19 @@
     return-void
 
     :catch_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -1061,13 +1061,13 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/ii;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/jg;
 
@@ -1075,15 +1075,15 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ij;->initialize()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKM:Lcom/google/android/gms/measurement/internal/jg;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLe:Lcom/google/android/gms/measurement/internal/jg;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aKK:Lcom/google/android/gms/measurement/internal/ee;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLc:Lcom/google/android/gms/measurement/internal/ee;
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/jb;->aLL:Lcom/google/android/gms/measurement/internal/jd;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/jb;->aMd:Lcom/google/android/gms/measurement/internal/jd;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/iz;
 
@@ -1091,7 +1091,7 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ij;->initialize()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKP:Lcom/google/android/gms/measurement/internal/iz;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLh:Lcom/google/android/gms/measurement/internal/iz;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/gq;
 
@@ -1099,7 +1099,7 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ij;->initialize()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKR:Lcom/google/android/gms/measurement/internal/gq;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLj:Lcom/google/android/gms/measurement/internal/gq;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/ie;
 
@@ -1107,35 +1107,35 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ij;->initialize()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKO:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLg:Lcom/google/android/gms/measurement/internal/ie;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dn;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/dn;-><init>(Lcom/google/android/gms/measurement/internal/ii;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKN:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLf:Lcom/google/android/gms/measurement/internal/dn;
 
-    iget v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKW:I
+    iget v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLo:I
 
-    iget v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aKX:I
+    iget v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLp:I
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aKW:I
+    iget v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLo:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    iget v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aKX:I
+    iget v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLp:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1148,7 +1148,7 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->asv:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->asN:Z
 
     return-void
 .end method
@@ -1218,7 +1218,7 @@
 .method private final a(ILjava/nio/channels/FileChannel;)Z
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
     const/4 v0, 0x0
 
@@ -1264,13 +1264,13 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Error writing to channel. Bytes written"
 
@@ -1292,13 +1292,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Failed to write to channel"
 
@@ -1308,17 +1308,17 @@
 
     :cond_2
     :goto_0
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Bad channel to read from"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return v0
 .end method
@@ -1338,9 +1338,9 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkArgument(Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v0
 
@@ -1366,9 +1366,9 @@
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/al$e;->zzwr:Ljava/lang/String;
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v2
 
@@ -1398,9 +1398,9 @@
 
     if-eqz v0, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v0
 
@@ -1414,7 +1414,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e;->py()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e;->pw()Z
 
     move-result v2
 
@@ -1435,9 +1435,9 @@
     :cond_2
     iget-wide v4, v0, Lcom/google/android/gms/internal/measurement/al$e;->zzwp:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v0
 
@@ -1462,7 +1462,7 @@
     add-long/2addr v4, v6
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -1470,7 +1470,7 @@
 
     invoke-static {p2, v1, v0}, Lcom/google/android/gms/measurement/internal/ip;->a(Lcom/google/android/gms/internal/measurement/al$c$a;Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     const-wide/16 v0, 0x1
 
@@ -1503,7 +1503,7 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ii;->aKJ:Lcom/google/android/gms/measurement/internal/ii;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ii;->aLb:Lcom/google/android/gms/measurement/internal/ii;
 
     if-nez v0, :cond_1
 
@@ -1512,7 +1512,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ii;->aKJ:Lcom/google/android/gms/measurement/internal/ii;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ii;->aLb:Lcom/google/android/gms/measurement/internal/ii;
 
     if-nez v1, :cond_0
 
@@ -1524,7 +1524,7 @@
 
     invoke-direct {p0, v1}, Lcom/google/android/gms/measurement/internal/ii;-><init>(Lcom/google/android/gms/measurement/internal/io;)V
 
-    sput-object p0, Lcom/google/android/gms/measurement/internal/ii;->aKJ:Lcom/google/android/gms/measurement/internal/ii;
+    sput-object p0, Lcom/google/android/gms/measurement/internal/ii;->aLb:Lcom/google/android/gms/measurement/internal/ii;
 
     :cond_0
     monitor-exit v0
@@ -1542,7 +1542,7 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/google/android/gms/measurement/internal/ii;->aKJ:Lcom/google/android/gms/measurement/internal/ii;
+    sget-object p0, Lcom/google/android/gms/measurement/internal/ii;->aLb:Lcom/google/android/gms/measurement/internal/ii;
 
     return-object p0
 .end method
@@ -1552,7 +1552,7 @@
 
     move-object/from16 v1, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -1565,17 +1565,17 @@
 
     invoke-direct {v2, v1, v3}, Lcom/google/android/gms/measurement/internal/ii$a;-><init>(Lcom/google/android/gms/measurement/internal/ii;B)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v4
 
-    iget-wide v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aLf:J
+    iget-wide v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aLx:J
 
     invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_7
 
@@ -1919,15 +1919,15 @@
 
     if-nez v9, :cond_7
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v6, "Raw event metadata record is missing. appId"
 
-    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v7
 
@@ -1955,7 +1955,7 @@
     .catchall {:try_start_11 .. :try_end_11} :catchall_5
 
     :try_start_12
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rN()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rL()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v13
 
@@ -1974,15 +1974,15 @@
 
     if-eqz v13, :cond_8
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v13
 
-    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v14, "Get multiple raw event metadata records, expected one. appId"
 
-    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v15
 
@@ -2083,15 +2083,15 @@
 
     if-nez v6, :cond_a
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v7, "Raw event data disappeared while in transaction. appId"
 
-    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v8
 
@@ -2125,11 +2125,11 @@
     .catchall {:try_start_16 .. :try_end_16} :catchall_1
 
     :try_start_17
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$c;->pr()Lcom/google/android/gms/internal/measurement/al$c$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$c;->pp()Lcom/google/android/gms/internal/measurement/al$c$a;
 
     move-result-object v8
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rN()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rL()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v13
 
@@ -2148,7 +2148,7 @@
 
     move-result-object v9
 
-    invoke-virtual {v8, v9}, Lcom/google/android/gms/internal/measurement/al$c$a;->bB(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$c$a;
+    invoke-virtual {v8, v9}, Lcom/google/android/gms/internal/measurement/al$c$a;->bw(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$c$a;
 
     move-result-object v9
 
@@ -2158,7 +2158,7 @@
 
     invoke-virtual {v9, v13, v14}, Lcom/google/android/gms/internal/measurement/al$c$a;->A(J)Lcom/google/android/gms/internal/measurement/al$c$a;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v8
 
@@ -2190,15 +2190,15 @@
     move-object v6, v0
 
     :try_start_1a
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Data loss. Failed to merge raw event. appId"
 
-    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v9
 
@@ -2245,15 +2245,15 @@
     move-object v5, v0
 
     :try_start_1c
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v7, "Data loss. Failed to merge raw event metadata. appId"
 
-    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v9
 
@@ -2330,15 +2330,15 @@
 
     :goto_9
     :try_start_1e
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v6, "Data loss. Error selecting raw event. appId"
 
-    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v7
 
@@ -2353,11 +2353,11 @@
 
     :cond_c
     :goto_a
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLi:Ljava/util/List;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLA:Ljava/util/List;
 
     if-eqz v4, :cond_e
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLi:Ljava/util/List;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLA:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->isEmpty()Z
 
@@ -2379,9 +2379,9 @@
     :goto_c
     if-nez v4, :cond_74
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dr;->se()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dr;->sc()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v4
 
@@ -2389,19 +2389,19 @@
 
     check-cast v4, Lcom/google/android/gms/internal/measurement/al$g$a;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/al$g$a;->pR()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/al$g$a;->pP()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v4
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v6, v6, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/j;->aEX:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/j;->aFp:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v5, v6, v7}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -2424,7 +2424,7 @@
     const/16 v17, 0x0
 
     :goto_d
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLi:Ljava/util/List;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLA:Ljava/util/List;
 
     invoke-interface {v8}, Ljava/util/List;->size()I
 
@@ -2441,7 +2441,7 @@
     if-ge v9, v8, :cond_39
 
     :try_start_20
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLi:Ljava/util/List;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLA:Ljava/util/List;
 
     invoke-interface {v8, v9}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2449,7 +2449,7 @@
 
     check-cast v8, Lcom/google/android/gms/internal/measurement/al$c;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr;->se()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr;->sc()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v8
 
@@ -2457,11 +2457,11 @@
 
     check-cast v8, Lcom/google/android/gms/internal/measurement/al$c$a;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v13
 
-    iget-object v14, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v14, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v14, v14, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
@@ -2482,27 +2482,27 @@
     if-eqz v11, :cond_12
 
     :try_start_21
-    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v11, "Dropping blacklisted raw event. appId"
 
-    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v12, v12, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {v12}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v12}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v12
 
-    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v14
 
@@ -2512,35 +2512,35 @@
 
     move-result-object v15
 
-    invoke-virtual {v14, v15}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v14, v15}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v14
 
     invoke-virtual {v10, v11, v12, v14}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v10
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-virtual {v10, v11}, Lcom/google/android/gms/measurement/internal/ee;->cJ(Ljava/lang/String;)Z
+    invoke-virtual {v10, v11}, Lcom/google/android/gms/measurement/internal/ee;->cF(Ljava/lang/String;)Z
 
     move-result v10
 
     if-nez v10, :cond_10
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v10
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-virtual {v10, v11}, Lcom/google/android/gms/measurement/internal/ee;->cK(Ljava/lang/String;)Z
+    invoke-virtual {v10, v11}, Lcom/google/android/gms/measurement/internal/ee;->cG(Ljava/lang/String;)Z
 
     move-result v10
 
@@ -2570,13 +2570,13 @@
 
     if-nez v10, :cond_11
 
-    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v26
 
-    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v10, v10, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
@@ -2616,11 +2616,11 @@
     :cond_12
     move/from16 v23, v15
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v11
 
-    iget-object v14, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v14, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v14, v14, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
@@ -2639,13 +2639,13 @@
     if-nez v11, :cond_19
 
     :try_start_22
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/al$c$a;->getName()Ljava/lang/String;
 
     move-result-object v15
 
-    invoke-static {v15}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v15}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     move/from16 v28, v9
 
@@ -2763,7 +2763,7 @@
     const/4 v15, 0x0
 
     :goto_14
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/al$c$a;->po()I
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/al$c$a;->pm()I
 
     move-result v3
     :try_end_22
@@ -2792,7 +2792,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr;->se()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr;->sc()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v3
 
@@ -2808,7 +2808,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v3
 
@@ -2843,7 +2843,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr;->se()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr;->sc()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v3
 
@@ -2859,7 +2859,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v3
 
@@ -2896,19 +2896,19 @@
 
     if-eqz v11, :cond_1d
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Marking event as conversion"
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v6
 
@@ -2916,17 +2916,17 @@
 
     move-result-object v9
 
-    invoke-virtual {v6, v9}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v6, v9}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v6
 
     invoke-virtual {v3, v5, v6}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->pA()Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->py()Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v3
 
-    invoke-virtual {v3, v14}, Lcom/google/android/gms/internal/measurement/al$e$a;->bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-virtual {v3, v14}, Lcom/google/android/gms/internal/measurement/al$e$a;->by(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v3
 
@@ -2941,19 +2941,19 @@
     :cond_1d
     if-nez v15, :cond_1e
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Marking event as real-time"
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v6
 
@@ -2961,17 +2961,17 @@
 
     move-result-object v9
 
-    invoke-virtual {v6, v9}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v6, v9}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v6
 
     invoke-virtual {v3, v5, v6}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->pA()Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->py()Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v3
 
-    invoke-virtual {v3, v7}, Lcom/google/android/gms/internal/measurement/al$e$a;->bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-virtual {v3, v7}, Lcom/google/android/gms/internal/measurement/al$e$a;->by(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v3
 
@@ -2984,15 +2984,15 @@
     invoke-virtual {v8, v3}, Lcom/google/android/gms/internal/measurement/al$c$a;->a(Lcom/google/android/gms/internal/measurement/al$e$a;)Lcom/google/android/gms/internal/measurement/al$c$a;
 
     :cond_1e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v33
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yZ()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yX()J
 
     move-result-wide v34
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v3, v3, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
@@ -3012,17 +3012,17 @@
 
     move-result-object v3
 
-    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/jf;->aLS:J
+    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/jf;->aMk:J
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v9, v9, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-virtual {v3, v9}, Lcom/google/android/gms/measurement/internal/jb;->cY(Ljava/lang/String;)I
+    invoke-virtual {v3, v9}, Lcom/google/android/gms/measurement/internal/jb;->cU(Ljava/lang/String;)I
 
     move-result v3
 
@@ -3046,7 +3046,7 @@
 
     move-result-object v3
 
-    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/it;->cQ(Ljava/lang/String;)Z
+    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/it;->cM(Ljava/lang/String;)Z
 
     move-result v3
 
@@ -3054,15 +3054,15 @@
 
     if-eqz v11, :cond_25
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v33
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yZ()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yX()J
 
     move-result-wide v34
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v3, v3, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
@@ -3082,17 +3082,17 @@
 
     move-result-object v3
 
-    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/jf;->aLQ:J
+    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/jf;->aMi:J
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v6, v6, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/j;->aEh:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/j;->aEz:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v5, v6, v7}, Lcom/google/android/gms/measurement/internal/jb;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)I
 
@@ -3104,21 +3104,21 @@
 
     if-lez v7, :cond_25
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Too many conversions. Not logging as conversion. appId"
 
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v5, v5, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {v5}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v5}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -3133,7 +3133,7 @@
     const/4 v6, -0x1
 
     :goto_17
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/al$c$a;->po()I
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/al$c$a;->pm()I
 
     move-result v7
 
@@ -3151,7 +3151,7 @@
 
     if-eqz v15, :cond_20
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr;->se()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr;->sc()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v5
 
@@ -3200,7 +3200,7 @@
 
     check-cast v3, Lcom/google/android/gms/internal/measurement/al$e$a;
 
-    invoke-virtual {v3, v13}, Lcom/google/android/gms/internal/measurement/al$e$a;->bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-virtual {v3, v13}, Lcom/google/android/gms/internal/measurement/al$e$a;->by(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v3
 
@@ -3210,7 +3210,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v3
 
@@ -3223,21 +3223,21 @@
     goto :goto_19
 
     :cond_24
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Did not find conversion parameter. appId"
 
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v5, v5, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {v5}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v5}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -3245,15 +3245,15 @@
 
     :cond_25
     :goto_19
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v4, v4, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aEK:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aFc:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v3, v4, v5}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -3265,7 +3265,7 @@
 
     new-instance v3, Ljava/util/ArrayList;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/al$c$a;->pt()Ljava/util/List;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/al$c$a;->pr()Ljava/util/List;
 
     move-result-object v4
 
@@ -3340,7 +3340,7 @@
 
     check-cast v4, Lcom/google/android/gms/internal/measurement/al$e;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/al$e;->py()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/al$e;->pw()Z
 
     move-result v4
 
@@ -3352,23 +3352,23 @@
 
     check-cast v4, Lcom/google/android/gms/internal/measurement/al$e;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/al$e;->pz()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/al$e;->px()Z
 
     move-result v4
 
     if-nez v4, :cond_29
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Value must be specified with a numeric type."
 
-    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     invoke-virtual {v8, v5}, Lcom/google/android/gms/internal/measurement/al$c$a;->bt(I)Lcom/google/android/gms/internal/measurement/al$c$a;
 
@@ -3452,17 +3452,17 @@
     :goto_1e
     if-eqz v3, :cond_30
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v6, "Value parameter discarded. You must also supply a 3-letter ISO_4217 currency code in the currency parameter."
 
-    invoke-virtual {v3, v6}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v3, v6}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     invoke-virtual {v8, v5}, Lcom/google/android/gms/internal/measurement/al$c$a;->bt(I)Lcom/google/android/gms/internal/measurement/al$c$a;
 
@@ -3485,15 +3485,15 @@
 
     :cond_30
     :goto_20
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v5, v5, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aEW:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aFo:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v3, v5, v6}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -3511,9 +3511,9 @@
 
     if-eqz v3, :cond_32
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v3
 
@@ -3601,9 +3601,9 @@
 
     if-eqz v3, :cond_35
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v3
 
@@ -3693,27 +3693,27 @@
 
     if-eqz v3, :cond_38
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/al$c$a;->po()I
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/al$c$a;->pm()I
 
     move-result v3
 
     if-nez v3, :cond_36
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Engagement event does not contain any parameters. appId"
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v11
 
@@ -3722,9 +3722,9 @@
     goto :goto_24
 
     :cond_36
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v3
 
@@ -3740,21 +3740,21 @@
 
     if-nez v3, :cond_37
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Engagement event does not include duration. appId"
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v11
 
@@ -3776,9 +3776,9 @@
     move-wide/from16 v13, v24
 
     :goto_25
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLi:Ljava/util/List;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLA:Ljava/util/List;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v5
 
@@ -3851,7 +3851,7 @@
 
     if-eqz v7, :cond_3a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     const-string v7, "_fr"
 
@@ -3870,7 +3870,7 @@
     goto :goto_29
 
     :cond_3a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     invoke-static {v6, v5}, Lcom/google/android/gms/measurement/internal/ip;->b(Lcom/google/android/gms/internal/measurement/al$c;Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e;
 
@@ -3878,7 +3878,7 @@
 
     if-eqz v6, :cond_3c
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$e;->py()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$e;->pw()Z
 
     move-result v7
 
@@ -3930,15 +3930,15 @@
 
     invoke-direct {v1, v9, v13, v14, v3}, Lcom/google/android/gms/measurement/internal/ii;->a(Lcom/google/android/gms/internal/measurement/al$g$a;JZ)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aFp:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aFH:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v3, v4, v5}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -3946,7 +3946,7 @@
 
     if-eqz v3, :cond_42
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pP()Ljava/util/List;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pN()Ljava/util/List;
 
     move-result-object v3
 
@@ -3987,11 +3987,11 @@
     :goto_2a
     if-eqz v3, :cond_41
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v4
 
@@ -4007,15 +4007,15 @@
     goto :goto_2b
 
     :cond_42
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aFq:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aFI:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v3, v4, v5}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -4023,11 +4023,11 @@
 
     if-eqz v3, :cond_43
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v4
 
@@ -4037,15 +4037,15 @@
 
     :cond_43
     :goto_2b
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aEY:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aFq:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v3, v4, v5}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -4053,91 +4053,91 @@
 
     if-eqz v3, :cond_46
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Checking account type status for ad personalization signals"
 
-    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ig;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ig;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v4
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/ee;->cH(Ljava/lang/String;)Z
+    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/ee;->cD(Ljava/lang/String;)Z
 
     move-result v4
 
     if-eqz v4, :cond_46
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v4
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/jg;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/jg;->dg(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v4
 
     if-eqz v4, :cond_46
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ea;->yv()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ea;->yt()Z
 
     move-result v4
 
     if-eqz v4, :cond_46
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/d;->vV()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/d;->vT()Z
 
     move-result v4
 
     if-eqz v4, :cond_46
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Turning off ad personalization due to account type"
 
-    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$k;->qv()Lcom/google/android/gms/internal/measurement/al$k$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$k;->qt()Lcom/google/android/gms/internal/measurement/al$k$a;
 
     move-result-object v4
 
     const-string v5, "_npa"
 
-    invoke-virtual {v4, v5}, Lcom/google/android/gms/internal/measurement/al$k$a;->bT(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
+    invoke-virtual {v4, v5}, Lcom/google/android/gms/internal/measurement/al$k$a;->bO(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
 
     move-result-object v4
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/d;->aDr:J
+    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/d;->aDJ:J
 
     invoke-virtual {v4, v5, v6}, Lcom/google/android/gms/internal/measurement/al$k$a;->R(J)Lcom/google/android/gms/internal/measurement/al$k$a;
 
@@ -4149,7 +4149,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v3
 
@@ -4160,7 +4160,7 @@
     const/4 v4, 0x0
 
     :goto_2c
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pT()I
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pR()I
 
     move-result v5
 
@@ -4200,25 +4200,25 @@
     invoke-virtual {v9, v3}, Lcom/google/android/gms/internal/measurement/al$g$a;->a(Lcom/google/android/gms/internal/measurement/al$k;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_46
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->qa()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v3
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pS()Ljava/util/List;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pQ()Ljava/util/List;
 
     move-result-object v5
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pP()Ljava/util/List;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pN()Ljava/util/List;
 
     move-result-object v6
 
-    invoke-static {v4}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v4}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/iz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xO()Lcom/google/android/gms/measurement/internal/iz;
 
     move-result-object v7
 
@@ -4228,17 +4228,17 @@
 
     invoke-virtual {v3, v4}, Lcom/google/android/gms/internal/measurement/al$g$a;->d(Ljava/lang/Iterable;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v4, v4, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
     const-string v5, "1"
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/jb;->aLL:Lcom/google/android/gms/measurement/internal/jd;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/jb;->aMd:Lcom/google/android/gms/measurement/internal/jd;
 
     const-string v6, "measurement.event_sampling_enabled"
 
@@ -4263,20 +4263,20 @@
 
     invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/it;->zj()Ljava/security/SecureRandom;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/it;->zh()Ljava/security/SecureRandom;
 
     move-result-object v5
 
     const/4 v6, 0x0
 
     :goto_2e
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pQ()I
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pO()I
 
     move-result v7
 
@@ -4286,7 +4286,7 @@
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr;->se()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr;->sc()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v7
 
@@ -4311,9 +4311,9 @@
     if-eqz v8, :cond_4b
 
     :try_start_25
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v8
 
@@ -4337,11 +4337,11 @@
 
     if-nez v11, :cond_47
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v11
 
-    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v12, v12, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
@@ -4352,11 +4352,11 @@
     invoke-interface {v3, v8, v11}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_47
-    iget-object v8, v11, Lcom/google/android/gms/measurement/internal/f;->aDB:Ljava/lang/Long;
+    iget-object v8, v11, Lcom/google/android/gms/measurement/internal/f;->aDT:Ljava/lang/Long;
 
     if-nez v8, :cond_4a
 
-    iget-object v8, v11, Lcom/google/android/gms/measurement/internal/f;->aDC:Ljava/lang/Long;
+    iget-object v8, v11, Lcom/google/android/gms/measurement/internal/f;->aDU:Ljava/lang/Long;
 
     invoke-virtual {v8}, Ljava/lang/Long;->longValue()J
 
@@ -4368,18 +4368,18 @@
 
     if-lez v8, :cond_48
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
-    iget-object v8, v11, Lcom/google/android/gms/measurement/internal/f;->aDC:Ljava/lang/Long;
+    iget-object v8, v11, Lcom/google/android/gms/measurement/internal/f;->aDU:Ljava/lang/Long;
 
     invoke-static {v7, v10, v8}, Lcom/google/android/gms/measurement/internal/ip;->a(Lcom/google/android/gms/internal/measurement/al$c$a;Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_48
-    iget-object v8, v11, Lcom/google/android/gms/measurement/internal/f;->aDD:Ljava/lang/Boolean;
+    iget-object v8, v11, Lcom/google/android/gms/measurement/internal/f;->aDV:Ljava/lang/Boolean;
 
     if-eqz v8, :cond_49
 
-    iget-object v8, v11, Lcom/google/android/gms/measurement/internal/f;->aDD:Ljava/lang/Boolean;
+    iget-object v8, v11, Lcom/google/android/gms/measurement/internal/f;->aDV:Ljava/lang/Boolean;
 
     invoke-virtual {v8}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -4387,7 +4387,7 @@
 
     if-eqz v8, :cond_49
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     const-string v8, "_efs"
 
@@ -4400,7 +4400,7 @@
     invoke-static {v7, v8, v12}, Lcom/google/android/gms/measurement/internal/ip;->a(Lcom/google/android/gms/internal/measurement/al$c$a;Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_49
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v8
 
@@ -4428,21 +4428,21 @@
 
     :cond_4b
     :try_start_26
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v8
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-virtual {v8, v11}, Lcom/google/android/gms/measurement/internal/ee;->cI(Ljava/lang/String;)J
+    invoke-virtual {v8, v11}, Lcom/google/android/gms/measurement/internal/ee;->cE(Ljava/lang/String;)J
 
     move-result-wide v11
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/al$c$a;->getTimestampMillis()J
 
@@ -4452,7 +4452,7 @@
 
     move-result-wide v13
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v8
 
@@ -4553,11 +4553,11 @@
     :goto_33
     if-nez v8, :cond_50
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v8
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
@@ -4577,13 +4577,13 @@
     :goto_34
     if-gtz v12, :cond_51
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v10, "Sample rate must be positive. event, rate"
 
@@ -4597,7 +4597,7 @@
 
     invoke-virtual {v8, v10, v11, v12}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v8
 
@@ -4630,11 +4630,11 @@
     if-nez v8, :cond_53
 
     :try_start_29
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v8
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
@@ -4648,17 +4648,17 @@
 
     if-nez v8, :cond_53
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v11, "Event being bundled has no eventAggregate. appId, eventName"
 
-    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v13, v13, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
@@ -4668,15 +4668,15 @@
 
     invoke-virtual {v8, v11, v13, v14}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    sget-object v13, Lcom/google/android/gms/measurement/internal/j;->aFo:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v13, Lcom/google/android/gms/measurement/internal/j;->aFG:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v8, v11, v13}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -4686,7 +4686,7 @@
 
     new-instance v8, Lcom/google/android/gms/measurement/internal/f;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
@@ -4725,7 +4725,7 @@
     :cond_52
     new-instance v8, Lcom/google/android/gms/measurement/internal/f;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
@@ -4752,9 +4752,9 @@
     :cond_53
     :goto_35
     :try_start_2a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v11
 
@@ -4791,7 +4791,7 @@
     if-ne v12, v14, :cond_57
 
     :try_start_2b
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v10
 
@@ -4807,15 +4807,15 @@
 
     if-eqz v10, :cond_56
 
-    iget-object v10, v8, Lcom/google/android/gms/measurement/internal/f;->aDB:Ljava/lang/Long;
+    iget-object v10, v8, Lcom/google/android/gms/measurement/internal/f;->aDT:Ljava/lang/Long;
 
     if-nez v10, :cond_55
 
-    iget-object v10, v8, Lcom/google/android/gms/measurement/internal/f;->aDC:Ljava/lang/Long;
+    iget-object v10, v8, Lcom/google/android/gms/measurement/internal/f;->aDU:Ljava/lang/Long;
 
     if-nez v10, :cond_55
 
-    iget-object v10, v8, Lcom/google/android/gms/measurement/internal/f;->aDD:Ljava/lang/Boolean;
+    iget-object v10, v8, Lcom/google/android/gms/measurement/internal/f;->aDV:Ljava/lang/Boolean;
 
     if-eqz v10, :cond_56
 
@@ -4850,7 +4850,7 @@
     if-nez v14, :cond_59
 
     :try_start_2d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     int-to-long v11, v12
 
@@ -4860,7 +4860,7 @@
 
     invoke-static {v7, v10, v14}, Lcom/google/android/gms/measurement/internal/ip;->a(Lcom/google/android/gms/internal/measurement/al$c$a;Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v10
 
@@ -4921,19 +4921,19 @@
     move-wide/from16 v14, v28
 
     :try_start_2e
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     move/from16 v18, v6
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v6, v6, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
     move-object/from16 v22, v2
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aEL:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFd:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v5, v6, v2}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -4941,14 +4941,14 @@
 
     if-eqz v2, :cond_5c
 
-    iget-object v2, v8, Lcom/google/android/gms/measurement/internal/f;->aDA:Ljava/lang/Long;
+    iget-object v2, v8, Lcom/google/android/gms/measurement/internal/f;->aDS:Ljava/lang/Long;
     :try_end_2e
     .catchall {:try_start_2e .. :try_end_2e} :catchall_4
 
     if-eqz v2, :cond_5a
 
     :try_start_2f
-    iget-object v2, v8, Lcom/google/android/gms/measurement/internal/f;->aDA:Ljava/lang/Long;
+    iget-object v2, v8, Lcom/google/android/gms/measurement/internal/f;->aDS:Ljava/lang/Long;
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
@@ -4960,11 +4960,11 @@
 
     :cond_5a
     :try_start_30
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/al$c$a;->pu()J
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/al$c$a;->ps()J
 
     move-result-wide v5
 
@@ -4990,7 +4990,7 @@
     goto :goto_39
 
     :cond_5c
-    iget-wide v1, v8, Lcom/google/android/gms/measurement/internal/f;->aDz:J
+    iget-wide v1, v8, Lcom/google/android/gms/measurement/internal/f;->aDR:J
 
     invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/al$c$a;->getTimestampMillis()J
 
@@ -5013,7 +5013,7 @@
     :goto_39
     if-eqz v1, :cond_5e
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     const-string v1, "_efs"
 
@@ -5025,7 +5025,7 @@
 
     invoke-static {v7, v1, v2}, Lcom/google/android/gms/measurement/internal/ip;->a(Lcom/google/android/gms/internal/measurement/al$c$a;Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     int-to-long v1, v12
 
@@ -5035,7 +5035,7 @@
 
     invoke-static {v7, v10, v11}, Lcom/google/android/gms/measurement/internal/ip;->a(Lcom/google/android/gms/internal/measurement/al$c$a;Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v10
 
@@ -5128,13 +5128,13 @@
 
     move-result v1
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pQ()I
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pO()I
 
     move-result v2
 
     if-ge v1, v2, :cond_61
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pR()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pP()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v1
 
@@ -5162,7 +5162,7 @@
 
     check-cast v2, Ljava/util/Map$Entry;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
@@ -5193,7 +5193,7 @@
     const/4 v1, 0x0
 
     :goto_3e
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pQ()I
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pO()I
 
     move-result v2
 
@@ -5205,7 +5205,7 @@
 
     iget-wide v3, v2, Lcom/google/android/gms/internal/measurement/al$c;->zzwl:J
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pU()J
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pS()J
 
     move-result-wide v5
 
@@ -5220,7 +5220,7 @@
     :cond_64
     iget-wide v3, v2, Lcom/google/android/gms/internal/measurement/al$c;->zzwl:J
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pV()J
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pT()J
 
     move-result-wide v5
 
@@ -5240,15 +5240,15 @@
     :cond_66
     move-object/from16 v1, v22
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v2, v2, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
-    invoke-virtual {v3, v2}, Lcom/google/android/gms/measurement/internal/jg;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v3, v2}, Lcom/google/android/gms/measurement/internal/jg;->dg(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v3
     :try_end_30
@@ -5259,21 +5259,21 @@
     move-object/from16 v4, p0
 
     :try_start_31
-    iget-object v3, v4, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v4, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Bundling raw events w/o app info. appId"
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v6, v6, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {v6}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v6}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v6
 
@@ -5284,13 +5284,13 @@
     :cond_67
     move-object/from16 v4, p0
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pQ()I
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pO()I
 
     move-result v5
 
     if-lez v5, :cond_6c
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ea;->yh()J
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ea;->yf()J
 
     move-result-wide v5
 
@@ -5305,10 +5305,10 @@
     goto :goto_3f
 
     :cond_68
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pX()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pV()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :goto_3f
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ea;->yg()J
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ea;->ye()J
 
     move-result-wide v7
 
@@ -5333,12 +5333,12 @@
     goto :goto_41
 
     :cond_6a
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pU()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :goto_41
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ea;->ys()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ea;->yq()V
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ea;->yp()J
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ea;->yn()J
 
     move-result-wide v5
 
@@ -5346,43 +5346,43 @@
 
     invoke-virtual {v9, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->by(I)Lcom/google/android/gms/internal/measurement/al$g$a;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pU()J
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pS()J
 
     move-result-wide v5
 
     invoke-virtual {v3, v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->v(J)V
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pV()J
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pT()J
 
     move-result-wide v5
 
     invoke-virtual {v3, v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->am(J)V
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/ea;->aHM:Ljava/lang/String;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/ea;->aIe:Ljava/lang/String;
 
     const/4 v6, 0x0
 
-    invoke-virtual {v3, v6}, Lcom/google/android/gms/measurement/internal/ea;->cB(Ljava/lang/String;)V
+    invoke-virtual {v3, v6}, Lcom/google/android/gms/measurement/internal/ea;->cx(Ljava/lang/String;)V
 
     if-eqz v5, :cond_6b
 
-    invoke-virtual {v9, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bO(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v9, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bJ(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     goto :goto_42
 
     :cond_6b
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pZ()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pX()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :goto_42
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v5
 
@@ -5390,34 +5390,34 @@
 
     :cond_6c
     :goto_43
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pQ()I
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/al$g$a;->pO()I
 
     move-result v3
 
     if-lez v3, :cond_70
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v3
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v5, v5, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-virtual {v3, v5}, Lcom/google/android/gms/measurement/internal/ee;->cD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ap;
+    invoke-virtual {v3, v5}, Lcom/google/android/gms/measurement/internal/ee;->cz(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ap;
 
     move-result-object v3
 
     if-eqz v3, :cond_6e
 
-    iget-object v5, v3, Lcom/google/android/gms/internal/measurement/ap;->arn:Ljava/lang/Long;
+    iget-object v5, v3, Lcom/google/android/gms/internal/measurement/ap;->arF:Ljava/lang/Long;
 
     if-nez v5, :cond_6d
 
     goto :goto_44
 
     :cond_6d
-    iget-object v3, v3, Lcom/google/android/gms/internal/measurement/ap;->arn:Ljava/lang/Long;
+    iget-object v3, v3, Lcom/google/android/gms/internal/measurement/ap;->arF:Ljava/lang/Long;
 
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
@@ -5429,7 +5429,7 @@
 
     :cond_6e
     :goto_44
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v3, v3, Lcom/google/android/gms/internal/measurement/al$g;->zzxw:Ljava/lang/String;
 
@@ -5446,32 +5446,32 @@
     goto :goto_45
 
     :cond_6f
-    iget-object v3, v4, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v4, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Did not find measurement config or missing version info. appId"
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii$a;->aLg:Lcom/google/android/gms/internal/measurement/al$g;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii$a;->aLy:Lcom/google/android/gms/internal/measurement/al$g;
 
     iget-object v6, v6, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {v6}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v6}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v6
 
     invoke-virtual {v3, v5, v6}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_45
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v5
 
@@ -5484,17 +5484,17 @@
     invoke-virtual {v3, v5, v6}, Lcom/google/android/gms/measurement/internal/jg;->c(Lcom/google/android/gms/internal/measurement/al$g;Z)Z
 
     :cond_70
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ii$a;->aLh:Ljava/util/List;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ii$a;->aLz:Ljava/util/List;
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     new-instance v5, Ljava/lang/StringBuilder;
 
@@ -5561,11 +5561,11 @@
 
     if-eq v5, v6, :cond_73
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v6, "Deleted fewer rows from raw events table than expected"
 
@@ -5584,7 +5584,7 @@
     invoke-virtual {v3, v6, v5, v1}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_73
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
@@ -5622,22 +5622,22 @@
     move-object v3, v0
 
     :try_start_33
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Failed to remove unused event metadata. appId"
 
-    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
     invoke-virtual {v1, v5, v2, v3}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :goto_47
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
@@ -5645,7 +5645,7 @@
     :try_end_33
     .catchall {:try_start_33 .. :try_end_33} :catchall_6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
@@ -5666,7 +5666,7 @@
     move-object v4, v1
 
     :try_start_34
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
@@ -5674,7 +5674,7 @@
     :try_end_34
     .catchall {:try_start_34 .. :try_end_34} :catchall_6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
@@ -5715,7 +5715,7 @@
     :goto_49
     move-object v1, v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -5733,7 +5733,7 @@
 .method private final b(Ljava/nio/channels/FileChannel;)I
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
     const/4 v0, 0x0
 
@@ -5769,13 +5769,13 @@
 
     if-eq p1, v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Unexpected data length. Bytes read"
 
@@ -5802,13 +5802,13 @@
     :catch_0
     move-exception p1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to read from channel"
 
@@ -5819,17 +5819,17 @@
 
     :cond_3
     :goto_1
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Bad channel to read from"
 
-    invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return v0
 .end method
@@ -5838,7 +5838,7 @@
     .locals 6
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yh()J
 
     move-result-wide v0
 
@@ -5850,7 +5850,7 @@
 
     if-eqz v5, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -5860,7 +5860,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v1
 
@@ -5870,7 +5870,7 @@
 
     iget v0, v0, Landroid/content/pm/PackageInfo;->versionCode:I
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yh()J
 
     move-result-wide v1
 
@@ -5885,7 +5885,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -5895,7 +5895,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v1
 
@@ -5905,13 +5905,13 @@
 
     iget-object v0, v0, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
 
     move-result-object v1
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
 
     move-result-object p1
 
@@ -5953,19 +5953,19 @@
 
     iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {v5}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v5}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
     move-result-wide v5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
     iget-object v15, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     invoke-static/range {p1 .. p2}, Lcom/google/android/gms/measurement/internal/ip;->d(Lcom/google/android/gms/measurement/internal/zzai;Lcom/google/android/gms/measurement/internal/zzn;)Z
 
@@ -5976,7 +5976,7 @@
     return-void
 
     :cond_0
-    iget-boolean v7, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iget-boolean v7, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
     if-nez v7, :cond_1
 
@@ -5985,7 +5985,7 @@
     return-void
 
     :cond_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v7
 
@@ -6003,27 +6003,27 @@
 
     if-eqz v7, :cond_6
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v5
 
     iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v5
 
@@ -6031,21 +6031,21 @@
 
     invoke-virtual {v3, v6, v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v3
 
-    invoke-virtual {v3, v15}, Lcom/google/android/gms/measurement/internal/ee;->cJ(Ljava/lang/String;)Z
+    invoke-virtual {v3, v15}, Lcom/google/android/gms/measurement/internal/ee;->cF(Ljava/lang/String;)Z
 
     move-result v3
 
     if-nez v3, :cond_3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v3
 
-    invoke-virtual {v3, v15}, Lcom/google/android/gms/measurement/internal/ee;->cK(Ljava/lang/String;)Z
+    invoke-virtual {v3, v15}, Lcom/google/android/gms/measurement/internal/ee;->cG(Ljava/lang/String;)Z
 
     move-result v3
 
@@ -6068,9 +6068,9 @@
 
     if-nez v3, :cond_4
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v7
 
@@ -6089,21 +6089,21 @@
     :cond_4
     if-eqz v17, :cond_5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
-    invoke-virtual {v2, v15}, Lcom/google/android/gms/measurement/internal/jg;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v2, v15}, Lcom/google/android/gms/measurement/internal/jg;->dg(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v2
 
     if-eqz v2, :cond_5
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ea;->yr()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ea;->yp()J
 
     move-result-wide v3
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ea;->yq()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ea;->yo()J
 
     move-result-wide v5
 
@@ -6111,9 +6111,9 @@
 
     move-result-wide v3
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v5
 
@@ -6127,7 +6127,7 @@
 
     move-result-wide v3
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aEt:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aEL:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v5, v13}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -6143,17 +6143,17 @@
 
     if-lez v7, :cond_5
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Fetching config for blacklisted app"
 
-    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     invoke-direct {v1, v2}, Lcom/google/android/gms/measurement/internal/ii;->a(Lcom/google/android/gms/measurement/internal/ea;)V
 
@@ -6161,9 +6161,9 @@
     return-void
 
     :cond_6
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v7
 
@@ -6175,17 +6175,17 @@
 
     if-eqz v7, :cond_7
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v8
 
@@ -6198,7 +6198,7 @@
     invoke-virtual {v7, v9, v8}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_7
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v7
 
@@ -6241,7 +6241,7 @@
 
     :cond_9
     :goto_1
-    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     const-string v9, "currency"
 
@@ -6262,9 +6262,9 @@
     if-eqz v8, :cond_c
 
     :try_start_2
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-    invoke-virtual {v8, v9}, Lcom/google/android/gms/measurement/internal/zzah;->ch(Ljava/lang/String;)Ljava/lang/Double;
+    invoke-virtual {v8, v9}, Lcom/google/android/gms/measurement/internal/zzah;->cd(Ljava/lang/String;)Ljava/lang/Double;
 
     move-result-object v8
 
@@ -6282,7 +6282,7 @@
 
     if-nez v8, :cond_a
 
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     invoke-virtual {v8, v9}, Lcom/google/android/gms/measurement/internal/zzah;->getLong(Ljava/lang/String;)Ljava/lang/Long;
 
@@ -6321,17 +6321,17 @@
     goto :goto_2
 
     :cond_b
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Data lost. Currency value is too big. appId"
 
-    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v9
 
@@ -6350,7 +6350,7 @@
     goto/16 :goto_8
 
     :cond_c
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     invoke-virtual {v8, v9}, Lcom/google/android/gms/measurement/internal/zzah;->getLong(Ljava/lang/String;)Ljava/lang/Long;
 
@@ -6407,7 +6407,7 @@
     :goto_3
     move-object v10, v7
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v7
 
@@ -6436,11 +6436,11 @@
 
     new-instance v20, Lcom/google/android/gms/measurement/internal/iq;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v7
 
@@ -6484,15 +6484,15 @@
 
     const/4 v6, 0x0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v7
 
-    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v12, Lcom/google/android/gms/measurement/internal/j;->aEy:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v12, Lcom/google/android/gms/measurement/internal/j;->aEQ:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v11, v15, v12}, Lcom/google/android/gms/measurement/internal/jb;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)I
 
@@ -6500,11 +6500,11 @@
 
     add-int/lit8 v11, v11, -0x1
 
-    invoke-static {v15}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v15}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
@@ -6544,15 +6544,15 @@
     move-object v5, v0
 
     :try_start_5
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v11, "Error pruning currencies. appId"
 
-    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v12
 
@@ -6561,11 +6561,11 @@
     :goto_5
     new-instance v5, Lcom/google/android/gms/measurement/internal/iq;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v7
 
@@ -6590,7 +6590,7 @@
     invoke-direct/range {v7 .. v13}, Lcom/google/android/gms/measurement/internal/iq;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
 
     :goto_6
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v7
 
@@ -6600,29 +6600,29 @@
 
     if-nez v7, :cond_11
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Too many unique user properties are set. Ignoring user property. appId"
 
-    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v9
 
-    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v10
 
     iget-object v11, v5, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-virtual {v10, v11}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v10, v11}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v10
 
@@ -6630,9 +6630,9 @@
 
     invoke-virtual {v7, v8, v9, v10, v5}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v7
 
@@ -6662,7 +6662,7 @@
     :goto_8
     if-nez v11, :cond_12
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -6670,7 +6670,7 @@
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -6683,7 +6683,7 @@
     :try_start_6
     iget-object v5, v2, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    invoke-static {v5}, Lcom/google/android/gms/measurement/internal/it;->cQ(Ljava/lang/String;)Z
+    invoke-static {v5}, Lcom/google/android/gms/measurement/internal/it;->cM(Ljava/lang/String;)Z
 
     move-result v5
 
@@ -6693,11 +6693,11 @@
 
     move-result v16
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v7
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yZ()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yX()J
 
     move-result-wide v8
 
@@ -6721,9 +6721,9 @@
 
     move-result-object v7
 
-    iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/jf;->aLP:J
+    iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/jf;->aMh:J
 
-    sget-object v10, Lcom/google/android/gms/measurement/internal/j;->aEe:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/j;->aEw:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v14, 0x0
 
@@ -6757,21 +6757,21 @@
 
     if-nez v2, :cond_13
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Data loss. Too many events logged. appId, count"
 
-    invoke-static/range {v20 .. v20}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {v20 .. v20}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
-    iget-wide v5, v7, Lcom/google/android/gms/measurement/internal/jf;->aLP:J
+    iget-wide v5, v7, Lcom/google/android/gms/measurement/internal/jf;->aMh:J
 
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -6780,7 +6780,7 @@
     invoke-virtual {v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_13
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -6788,7 +6788,7 @@
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -6800,9 +6800,9 @@
     if-eqz v5, :cond_16
 
     :try_start_7
-    iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/jf;->aLO:J
+    iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/jf;->aMg:J
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aEg:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aEy:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v12, 0x0
 
@@ -6832,21 +6832,21 @@
 
     if-nez v5, :cond_15
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Data loss. Too many public events logged. appId, count"
 
-    invoke-static/range {v20 .. v20}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {v20 .. v20}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v5
 
-    iget-wide v6, v7, Lcom/google/android/gms/measurement/internal/jf;->aLO:J
+    iget-wide v6, v7, Lcom/google/android/gms/measurement/internal/jf;->aMg:J
 
     invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -6855,9 +6855,9 @@
     invoke-virtual {v3, v4, v5, v6}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_15
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v7
 
@@ -6873,7 +6873,7 @@
 
     invoke-virtual/range {v7 .. v12}, Lcom/google/android/gms/measurement/internal/it;->a(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;I)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -6881,7 +6881,7 @@
     :try_end_7
     .catchall {:try_start_7 .. :try_end_7} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -6893,15 +6893,15 @@
     if-eqz v16, :cond_18
 
     :try_start_8
-    iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/jf;->aLR:J
+    iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/jf;->aMj:J
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v10, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    sget-object v11, Lcom/google/android/gms/measurement/internal/j;->aEf:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v11, Lcom/google/android/gms/measurement/internal/j;->aEx:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v6, v10, v11}, Lcom/google/android/gms/measurement/internal/jb;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)I
 
@@ -6933,21 +6933,21 @@
 
     if-nez v2, :cond_17
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Too many error events logged. appId, count"
 
-    invoke-static/range {v20 .. v20}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {v20 .. v20}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
-    iget-wide v5, v7, Lcom/google/android/gms/measurement/internal/jf;->aLR:J
+    iget-wide v5, v7, Lcom/google/android/gms/measurement/internal/jf;->aMj:J
 
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -6956,7 +6956,7 @@
     invoke-virtual {v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_17
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -6964,7 +6964,7 @@
     :try_end_8
     .catchall {:try_start_8 .. :try_end_8} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -6977,33 +6977,33 @@
 
     :cond_19
     :try_start_9
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/zzah;->vW()Landroid/os/Bundle;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/zzah;->vU()Landroid/os/Bundle;
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v7
 
     const-string v8, "_o"
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
     invoke-virtual {v7, v6, v8, v9}, Lcom/google/android/gms/measurement/internal/it;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v7
 
     move-object/from16 v13, v20
 
-    invoke-virtual {v7, v13}, Lcom/google/android/gms/measurement/internal/it;->cX(Ljava/lang/String;)Z
+    invoke-virtual {v7, v13}, Lcom/google/android/gms/measurement/internal/it;->cT(Ljava/lang/String;)Z
 
     move-result v7
     :try_end_9
@@ -7014,9 +7014,9 @@
     if-eqz v7, :cond_1a
 
     :try_start_a
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v7
 
@@ -7030,9 +7030,9 @@
 
     invoke-virtual {v7, v6, v8, v12}, Lcom/google/android/gms/measurement/internal/it;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v7
 
@@ -7056,19 +7056,19 @@
     if-eqz v7, :cond_1b
 
     :try_start_b
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v7, v9}, Lcom/google/android/gms/measurement/internal/jb;->dg(Ljava/lang/String;)Z
+    invoke-virtual {v7, v9}, Lcom/google/android/gms/measurement/internal/jb;->dc(Ljava/lang/String;)Z
 
     move-result v7
 
     if-eqz v7, :cond_1b
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v7
 
@@ -7086,9 +7086,9 @@
 
     if-eqz v9, :cond_1b
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v9
 
@@ -7105,13 +7105,13 @@
 
     if-eqz v4, :cond_1c
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/j;->aEU:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v9, Lcom/google/android/gms/measurement/internal/j;->aFm:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v4, v7, v9}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -7119,13 +7119,13 @@
 
     if-eqz v4, :cond_1c
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v4, v7}, Lcom/google/android/gms/measurement/internal/jb;->dg(Ljava/lang/String;)Z
+    invoke-virtual {v4, v7}, Lcom/google/android/gms/measurement/internal/jb;->dc(Ljava/lang/String;)Z
 
     move-result v4
 
@@ -7138,11 +7138,11 @@
     invoke-virtual {v1, v4, v3}, Lcom/google/android/gms/measurement/internal/ii;->c(Lcom/google/android/gms/measurement/internal/zzjn;Lcom/google/android/gms/measurement/internal/zzn;)V
 
     :cond_1c
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v4
 
-    invoke-virtual {v4, v13}, Lcom/google/android/gms/measurement/internal/jg;->dl(Ljava/lang/String;)J
+    invoke-virtual {v4, v13}, Lcom/google/android/gms/measurement/internal/jg;->dh(Ljava/lang/String;)J
 
     move-result-wide v7
 
@@ -7150,17 +7150,17 @@
 
     if-lez v4, :cond_1d
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v9, "Data lost. Too many events stored on disk, deleted. appId"
 
-    invoke-static {v13}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v13}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v10
 
@@ -7173,13 +7173,13 @@
     :cond_1d
     new-instance v4, Lcom/google/android/gms/measurement/internal/g;
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
     iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    iget-wide v14, v2, Lcom/google/android/gms/measurement/internal/zzai;->aDJ:J
+    iget-wide v14, v2, Lcom/google/android/gms/measurement/internal/zzai;->aEb:J
 
     const-wide/16 v21, 0x0
 
@@ -7209,7 +7209,7 @@
 
     invoke-direct/range {v7 .. v16}, Lcom/google/android/gms/measurement/internal/g;-><init>(Lcom/google/android/gms/measurement/internal/ek;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJLandroid/os/Bundle;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v6
 
@@ -7221,11 +7221,11 @@
 
     if-nez v6, :cond_1f
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v6
 
-    invoke-virtual {v6, v2}, Lcom/google/android/gms/measurement/internal/jg;->bv(Ljava/lang/String;)J
+    invoke-virtual {v6, v2}, Lcom/google/android/gms/measurement/internal/jg;->bq(Ljava/lang/String;)J
 
     move-result-wide v6
 
@@ -7237,29 +7237,29 @@
 
     if-eqz v5, :cond_1e
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Too many event names used, ignoring event. appId, name, supported count"
 
-    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v7
 
     iget-object v4, v4, Lcom/google/android/gms/measurement/internal/g;->name:Ljava/lang/String;
 
-    invoke-virtual {v7, v4}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v7, v4}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -7271,9 +7271,9 @@
 
     invoke-virtual {v3, v5, v6, v4, v7}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v7
 
@@ -7291,7 +7291,7 @@
     :try_end_b
     .catchall {:try_start_b .. :try_end_b} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -7320,9 +7320,9 @@
     goto :goto_a
 
     :cond_1f
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-wide v7, v6, Lcom/google/android/gms/measurement/internal/f;->aDy:J
+    iget-wide v7, v6, Lcom/google/android/gms/measurement/internal/f;->aDQ:J
 
     invoke-virtual {v4, v2, v7, v8}, Lcom/google/android/gms/measurement/internal/g;->a(Lcom/google/android/gms/measurement/internal/ek;J)Lcom/google/android/gms/measurement/internal/g;
 
@@ -7335,25 +7335,25 @@
     move-result-object v5
 
     :goto_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
     invoke-virtual {v2, v5}, Lcom/google/android/gms/measurement/internal/jg;->a(Lcom/google/android/gms/measurement/internal/f;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
     invoke-static {v4}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v2, v4, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iget-object v2, v4, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
-    invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v2, v4, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iget-object v2, v4, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
     iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
@@ -7363,17 +7363,17 @@
 
     invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->checkArgument(Z)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$g;->pM()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$g;->pK()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$g$a;->pO()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$g$a;->pM()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v2
 
     const-string v5, "android"
 
-    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bF(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bA(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v2
 
@@ -7387,10 +7387,10 @@
 
     iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bK(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bF(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_20
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFJ:Ljava/lang/String;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aGb:Ljava/lang/String;
 
     invoke-static {v5}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -7398,12 +7398,12 @@
 
     if-nez v5, :cond_21
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFJ:Ljava/lang/String;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aGb:Ljava/lang/String;
 
-    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bJ(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bE(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_21
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFH:Ljava/lang/String;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFZ:Ljava/lang/String;
 
     invoke-static {v5}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -7411,12 +7411,12 @@
 
     if-nez v5, :cond_22
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFH:Ljava/lang/String;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFZ:Ljava/lang/String;
 
-    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bL(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bG(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_22
-    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHA:J
+    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHS:J
 
     const-wide/32 v7, -0x80000000
 
@@ -7424,18 +7424,18 @@
 
     if-eqz v9, :cond_23
 
-    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHA:J
+    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHS:J
 
     long-to-int v6, v5
 
     invoke-virtual {v2, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->bz(I)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_23
-    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aAK:J
+    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aBc:J
 
     invoke-virtual {v2, v5, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->J(J)Lcom/google/android/gms/internal/measurement/al$g$a;
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
     invoke-static {v5}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -7443,16 +7443,16 @@
 
     if-nez v5, :cond_24
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
-    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bP(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bK(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_24
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aFi:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aFA:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -7470,7 +7470,7 @@
 
     if-eqz v5, :cond_26
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
     invoke-static {v5}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -7478,14 +7478,14 @@
 
     if-nez v5, :cond_26
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
-    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bS(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bN(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     goto :goto_b
 
     :cond_25
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
     invoke-static {v5}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -7493,13 +7493,13 @@
 
     if-nez v5, :cond_26
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
-    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bS(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bN(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_26
     :goto_b
-    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHB:J
+    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHT:J
 
     const-wide/16 v7, 0x0
 
@@ -7507,22 +7507,22 @@
 
     if-eqz v9, :cond_27
 
-    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHB:J
+    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHT:J
 
     invoke-virtual {v2, v5, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->L(J)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_27
-    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aAL:J
+    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aBd:J
 
     invoke-virtual {v2, v5, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->O(J)Lcom/google/android/gms/internal/measurement/al$g$a;
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/j;->aFc:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v9, Lcom/google/android/gms/measurement/internal/j;->aFu:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v5, v6, v9}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -7530,11 +7530,11 @@
 
     if-eqz v5, :cond_28
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ip;->zh()Ljava/util/List;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ip;->zf()Ljava/util/List;
 
     move-result-object v5
 
@@ -7543,15 +7543,15 @@
     invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->e(Ljava/lang/Iterable;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_28
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v5
 
     iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/dp;->cp(Ljava/lang/String;)Landroid/util/Pair;
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/dp;->cl(Ljava/lang/String;)Landroid/util/Pair;
 
     move-result-object v5
 
@@ -7565,7 +7565,7 @@
 
     if-nez v6, :cond_29
 
-    iget-boolean v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHD:Z
+    iget-boolean v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHV:Z
 
     if-eqz v6, :cond_2c
 
@@ -7573,7 +7573,7 @@
 
     check-cast v6, Ljava/lang/String;
 
-    invoke-virtual {v2, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->bM(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->bH(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     iget-object v6, v5, Landroid/util/Pair;->second:Ljava/lang/Object;
 
@@ -7587,18 +7587,18 @@
 
     move-result v5
 
-    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->K(Z)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->I(Z)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     goto :goto_d
 
     :cond_29
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -7610,11 +7610,11 @@
 
     if-nez v5, :cond_2c
 
-    iget-boolean v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHE:Z
+    iget-boolean v5, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHW:Z
 
     if-eqz v5, :cond_2c
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -7632,21 +7632,21 @@
 
     if-nez v5, :cond_2a
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v6, "null secure ID. appId"
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v9
 
-    invoke-static {v9}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v9}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v9
 
@@ -7663,21 +7663,21 @@
 
     if-eqz v6, :cond_2b
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v9, "empty secure ID. appId"
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v10
 
-    invoke-static {v10}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v10}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v10
 
@@ -7685,45 +7685,45 @@
 
     :cond_2b
     :goto_c
-    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bR(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bM(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_2c
     :goto_d
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
     sget-object v5, Landroid/os/Build;->MODEL:Ljava/lang/String;
 
-    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bH(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bC(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v5
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
     sget-object v6, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->bG(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->bB(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v5
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/d;->vS()J
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/d;->vQ()J
 
     move-result-wide v9
 
@@ -7733,25 +7733,25 @@
 
     move-result-object v5
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/d;->vT()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/d;->vR()Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->bI(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v5
 
-    iget-wide v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFM:J
+    iget-wide v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->aGe:J
 
     invoke-virtual {v5, v9, v10}, Lcom/google/android/gms/internal/measurement/al$g$a;->N(J)Lcom/google/android/gms/internal/measurement/al$g$a;
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->isEnabled()Z
 
@@ -7759,7 +7759,7 @@
 
     if-eqz v5, :cond_2d
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zv()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zt()Z
 
     move-result v5
 
@@ -7771,16 +7771,16 @@
 
     if-nez v5, :cond_2d
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$g$a;->qb()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$g$a;->pZ()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_2d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v5
 
     iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/jg;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/jg;->dg(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v5
 
@@ -7788,45 +7788,45 @@
 
     new-instance v5, Lcom/google/android/gms/measurement/internal/ea;
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     iget-object v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
     invoke-direct {v5, v6, v9}, Lcom/google/android/gms/measurement/internal/ea;-><init>(Lcom/google/android/gms/measurement/internal/ek;Ljava/lang/String;)V
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/it;->zm()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/it;->zk()Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->aM(Ljava/lang/String;)V
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->aH(Ljava/lang/String;)V
 
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHw:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHO:Ljava/lang/String;
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->cy(Ljava/lang/String;)V
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->cu(Ljava/lang/String;)V
 
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->cv(Ljava/lang/String;)V
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->cr(Ljava/lang/String;)V
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v6
 
     iget-object v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v6, v9}, Lcom/google/android/gms/measurement/internal/dp;->cq(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v6, v9}, Lcom/google/android/gms/measurement/internal/dp;->cm(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->cx(Ljava/lang/String;)V
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->ct(Ljava/lang/String;)V
 
     invoke-virtual {v5, v7, v8}, Lcom/google/android/gms/measurement/internal/ea;->ap(J)V
 
@@ -7834,39 +7834,39 @@
 
     invoke-virtual {v5, v7, v8}, Lcom/google/android/gms/measurement/internal/ea;->am(J)V
 
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFH:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFZ:Ljava/lang/String;
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->cz(Ljava/lang/String;)V
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->cv(Ljava/lang/String;)V
 
-    iget-wide v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHA:J
+    iget-wide v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHS:J
 
     invoke-virtual {v5, v9, v10}, Lcom/google/android/gms/measurement/internal/ea;->an(J)V
 
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFJ:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->aGb:Ljava/lang/String;
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->cA(Ljava/lang/String;)V
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->cw(Ljava/lang/String;)V
 
-    iget-wide v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->aAK:J
+    iget-wide v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->aBc:J
 
     invoke-virtual {v5, v9, v10}, Lcom/google/android/gms/measurement/internal/ea;->w(J)V
 
-    iget-wide v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHB:J
+    iget-wide v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHT:J
 
     invoke-virtual {v5, v9, v10}, Lcom/google/android/gms/measurement/internal/ea;->x(J)V
 
-    iget-boolean v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iget-boolean v6, v3, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->Q(Z)V
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/ea;->O(Z)V
 
-    iget-wide v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->aFM:J
+    iget-wide v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->aGe:J
 
     invoke-virtual {v5, v9, v10}, Lcom/google/android/gms/measurement/internal/ea;->as(J)V
 
-    iget-wide v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->aAL:J
+    iget-wide v9, v3, Lcom/google/android/gms/measurement/internal/zzn;->aBd:J
 
     invoke-virtual {v5, v9, v10}, Lcom/google/android/gms/measurement/internal/ea;->ao(J)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v6
 
@@ -7887,7 +7887,7 @@
 
     move-result-object v6
 
-    invoke-virtual {v2, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->bN(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2, v6}, Lcom/google/android/gms/internal/measurement/al$g$a;->bI(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_2f
     invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ea;->getFirebaseInstanceId()Ljava/lang/String;
@@ -7904,16 +7904,16 @@
 
     move-result-object v5
 
-    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bQ(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v2, v5}, Lcom/google/android/gms/internal/measurement/al$g$a;->bL(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_30
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v5
 
     iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v5, v3}, Lcom/google/android/gms/measurement/internal/jg;->dj(Ljava/lang/String;)Ljava/util/List;
+    invoke-virtual {v5, v3}, Lcom/google/android/gms/measurement/internal/jg;->df(Ljava/lang/String;)Ljava/util/List;
 
     move-result-object v3
 
@@ -7926,7 +7926,7 @@
 
     if-ge v5, v6, :cond_31
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$k;->qv()Lcom/google/android/gms/internal/measurement/al$k$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$k;->qt()Lcom/google/android/gms/internal/measurement/al$k$a;
 
     move-result-object v6
 
@@ -7938,7 +7938,7 @@
 
     iget-object v9, v9, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-virtual {v6, v9}, Lcom/google/android/gms/internal/measurement/al$k$a;->bT(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
+    invoke-virtual {v6, v9}, Lcom/google/android/gms/internal/measurement/al$k$a;->bO(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
 
     move-result-object v6
 
@@ -7948,13 +7948,13 @@
 
     check-cast v9, Lcom/google/android/gms/measurement/internal/iq;
 
-    iget-wide v9, v9, Lcom/google/android/gms/measurement/internal/iq;->aLn:J
+    iget-wide v9, v9, Lcom/google/android/gms/measurement/internal/iq;->aLF:J
 
     invoke-virtual {v6, v9, v10}, Lcom/google/android/gms/internal/measurement/al$k$a;->R(J)Lcom/google/android/gms/internal/measurement/al$k$a;
 
     move-result-object v6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v9
 
@@ -7978,11 +7978,11 @@
 
     :cond_31
     :try_start_d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v5
 
@@ -7998,15 +7998,15 @@
     .catchall {:try_start_d .. :try_end_d} :catchall_0
 
     :try_start_e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v5
 
-    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/g;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/g;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     if-eqz v6, :cond_34
 
-    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/g;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/g;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/zzah;->iterator()Ljava/util/Iterator;
 
@@ -8044,11 +8044,11 @@
     goto :goto_f
 
     :cond_33
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v6
 
-    iget-object v9, v4, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iget-object v9, v4, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
     iget-object v10, v4, Lcom/google/android/gms/measurement/internal/g;->name:Ljava/lang/String;
 
@@ -8056,15 +8056,15 @@
 
     move-result v6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v26
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yZ()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yX()J
 
     move-result-wide v27
 
-    iget-object v9, v4, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iget-object v9, v4, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
     const/16 v30, 0x0
 
@@ -8084,15 +8084,15 @@
 
     if-eqz v6, :cond_34
 
-    iget-wide v9, v9, Lcom/google/android/gms/measurement/internal/jf;->aLS:J
+    iget-wide v9, v9, Lcom/google/android/gms/measurement/internal/jf;->aMk:J
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    iget-object v11, v4, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iget-object v11, v4, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
-    invoke-virtual {v6, v11}, Lcom/google/android/gms/measurement/internal/jb;->cY(Ljava/lang/String;)I
+    invoke-virtual {v6, v11}, Lcom/google/android/gms/measurement/internal/jb;->cU(Ljava/lang/String;)I
 
     move-result v6
 
@@ -8114,7 +8114,7 @@
 
     if-eqz v2, :cond_35
 
-    iput-wide v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aKU:J
+    iput-wide v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aLm:J
 
     goto :goto_12
 
@@ -8123,21 +8123,21 @@
 
     move-object v3, v0
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v6, "Data loss. Failed to insert raw event metadata. appId"
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$g$a;->pY()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$g$a;->pW()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -8145,15 +8145,15 @@
 
     :cond_35
     :goto_12
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
     invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jg;->setTransactionSuccessful()V
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
@@ -8165,19 +8165,19 @@
 
     if-eqz v2, :cond_36
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Event recorded"
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v5
 
@@ -8190,21 +8190,21 @@
     .catchall {:try_start_e .. :try_end_e} :catchall_0
 
     :cond_36
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
     invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jg;->endTransaction()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->zc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
@@ -8235,7 +8235,7 @@
 
     move-object v2, v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
@@ -8250,10 +8250,10 @@
     goto :goto_13
 .end method
 
-.method private final yW()Lcom/google/android/gms/measurement/internal/dn;
+.method private final yU()Lcom/google/android/gms/measurement/internal/dn;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKN:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLf:Lcom/google/android/gms/measurement/internal/dn;
 
     if-eqz v0, :cond_0
 
@@ -8269,24 +8269,24 @@
     throw v0
 .end method
 
-.method private final yX()Lcom/google/android/gms/measurement/internal/ie;
+.method private final yV()Lcom/google/android/gms/measurement/internal/ie;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKO:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLg:Lcom/google/android/gms/measurement/internal/ie;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ii;->a(Lcom/google/android/gms/measurement/internal/ij;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKO:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLg:Lcom/google/android/gms/measurement/internal/ie;
 
     return-object v0
 .end method
 
-.method private final yZ()J
+.method private final yX()J
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -8294,17 +8294,17 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fg;->vw()V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/dp;->aGK:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/dp;->aHc:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -8318,11 +8318,11 @@
 
     const-wide/16 v3, 0x1
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/it;->zj()Ljava/security/SecureRandom;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/it;->zh()Ljava/security/SecureRandom;
 
     move-result-object v5
 
@@ -8336,7 +8336,7 @@
 
     add-long/2addr v3, v5
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dp;->aGK:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dp;->aHc:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
@@ -8360,28 +8360,28 @@
     return-wide v0
 .end method
 
-.method private final zb()Z
+.method private final yZ()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jg;->zC()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jg;->zA()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jg;->zx()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jg;->zv()Ljava/lang/String;
 
     move-result-object v0
 
@@ -8405,39 +8405,39 @@
     return v0
 .end method
 
-.method private final zd()V
+.method private final zb()V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKY:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLq:Z
 
     if-nez v0, :cond_3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLr:Z
 
     if-nez v0, :cond_3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLa:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLs:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Stopping uploading service(s)"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKV:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLn:Ljava/util/List;
 
     if-nez v0, :cond_1
 
@@ -8466,7 +8466,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKV:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLn:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
@@ -8474,27 +8474,27 @@
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aKY:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLq:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object v1
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aKZ:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLr:Z
 
     invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object v2
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aLa:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aLs:Z
 
     invoke-static {v3}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -8507,16 +8507,16 @@
     return-void
 .end method
 
-.method private final ze()Z
+.method private final zc()Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFw:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFO:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -8528,7 +8528,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLb:Ljava/nio/channels/FileLock;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLt:Ljava/nio/channels/FileLock;
 
     if-eqz v0, :cond_0
 
@@ -8538,20 +8538,20 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -8578,44 +8578,44 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLc:Ljava/nio/channels/FileChannel;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLu:Ljava/nio/channels/FileChannel;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLc:Ljava/nio/channels/FileChannel;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLu:Ljava/nio/channels/FileChannel;
 
     invoke-virtual {v0}, Ljava/nio/channels/FileChannel;->tryLock()Ljava/nio/channels/FileLock;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLb:Ljava/nio/channels/FileLock;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLt:Ljava/nio/channels/FileLock;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLb:Ljava/nio/channels/FileLock;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLt:Ljava/nio/channels/FileLock;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return v1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Storage concurrent data access panic"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
     :try_end_0
     .catch Ljava/io/FileNotFoundException; {:try_start_0 .. :try_end_0} :catch_2
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
@@ -8626,13 +8626,13 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Storage lock already acquired"
 
@@ -8643,13 +8643,13 @@
     :catch_1
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to access storage lock file"
 
@@ -8660,13 +8660,13 @@
     :catch_2
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to acquire storage lock"
 
@@ -8678,14 +8678,14 @@
     return v0
 .end method
 
-.method private final zg()Z
+.method private final ze()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKS:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLk:Z
 
     if-eqz v0, :cond_0
 
@@ -8704,9 +8704,9 @@
 .method final b(ILjava/lang/Throwable;[B)V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
     const/4 v0, 0x0
 
@@ -8716,11 +8716,11 @@
     new-array p3, v0, [B
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLd:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLv:Ljava/util/List;
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLd:Ljava/util/List;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLv:Ljava/util/List;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
@@ -8738,17 +8738,17 @@
     if-nez p2, :cond_6
 
     :try_start_1
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dp;->aGG:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v3
 
@@ -8758,27 +8758,27 @@
 
     invoke-virtual {p2, v5, v6}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dp;->aGH:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dp;->aGZ:Lcom/google/android/gms/measurement/internal/dt;
 
     const-wide/16 v5, 0x0
 
     invoke-virtual {p2, v5, v6}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->zc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Successful upload. Got network response. code, size"
 
@@ -8794,7 +8794,7 @@
 
     invoke-virtual {p2, v3, p1, p3}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -8824,7 +8824,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p3
 
@@ -8832,9 +8832,9 @@
 
     move-result-wide v7
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/jg;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -8880,11 +8880,11 @@
     move-exception v1
 
     :try_start_5
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Failed to delete a bundle in a queue table"
 
@@ -8899,11 +8899,11 @@
     move-exception p3
 
     :try_start_6
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLe:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLw:Ljava/util/List;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLe:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLw:Ljava/util/List;
 
     invoke-interface {v1, p2}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -8917,7 +8917,7 @@
     throw p3
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -8926,50 +8926,50 @@
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
     :try_start_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jg;->endTransaction()V
 
-    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLe:Ljava/util/List;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLw:Ljava/util/List;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yV()Lcom/google/android/gms/measurement/internal/dk;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yT()Lcom/google/android/gms/measurement/internal/dk;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dk;->xO()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dk;->xM()Z
 
     move-result p1
 
     if-eqz p1, :cond_5
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->yZ()Z
 
     move-result p1
 
     if-eqz p1, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
 
     goto :goto_1
 
     :cond_5
     const-wide/16 p1, -0x1
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLf:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLx:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->zc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
 
     :goto_1
-    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/ii;->aKU:J
+    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/ii;->aLm:J
 
     goto/16 :goto_3
 
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p2
 
@@ -8984,21 +8984,21 @@
     move-exception p1
 
     :try_start_8
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Database error while trying to delete uploaded bundles"
 
     invoke-virtual {p2, p3, p1}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object p1
 
@@ -9006,19 +9006,19 @@
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aKU:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLm:J
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Disable upload, time"
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aKU:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLm:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -9029,13 +9029,13 @@
     goto :goto_3
 
     :cond_6
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Network upload failed. Will retry later. code, error"
 
@@ -9045,17 +9045,17 @@
 
     invoke-virtual {p3, v2, v3, p2}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dp;->aGH:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dp;->aGZ:Lcom/google/android/gms/measurement/internal/dt;
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object p3
 
@@ -9082,17 +9082,17 @@
     :goto_2
     if-eqz v4, :cond_9
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aGI:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aHa:Lcom/google/android/gms/measurement/internal/dt;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object p2
 
@@ -9103,29 +9103,29 @@
     invoke-virtual {p1, p2, p3}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
     :cond_9
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/jg;->T(Ljava/util/List;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->zc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
     :try_end_8
     .catchall {:try_start_8 .. :try_end_8} :catchall_1
 
     :goto_3
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKZ:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLr:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()V
 
     return-void
 
     :catchall_1
     move-exception p1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKZ:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLr:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()V
 
     goto :goto_5
 
@@ -9149,17 +9149,17 @@
 
     iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
     iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    iget-wide v11, v0, Lcom/google/android/gms/measurement/internal/zzai;->aDJ:J
+    iget-wide v11, v0, Lcom/google/android/gms/measurement/internal/zzai;->aEb:J
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     invoke-static/range {p1 .. p2}, Lcom/google/android/gms/measurement/internal/ip;->d(Lcom/google/android/gms/measurement/internal/zzai;Lcom/google/android/gms/measurement/internal/zzn;)Z
 
@@ -9170,7 +9170,7 @@
     return-void
 
     :cond_0
-    iget-boolean v4, v2, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iget-boolean v4, v2, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
     if-nez v4, :cond_1
 
@@ -9179,11 +9179,11 @@
     return-void
 
     :cond_1
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aFm:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aFE:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v4, v3, v5}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -9191,11 +9191,11 @@
 
     if-eqz v4, :cond_3
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzn;->aFN:Ljava/util/List;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzn;->aGf:Ljava/util/List;
 
     if-eqz v4, :cond_3
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzn;->aFN:Ljava/util/List;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzn;->aGf:Ljava/util/List;
 
     iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
@@ -9205,9 +9205,9 @@
 
     if-eqz v4, :cond_2
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/zzah;->vW()Landroid/os/Bundle;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/zzah;->vU()Landroid/os/Bundle;
 
     move-result-object v4
 
@@ -9225,9 +9225,9 @@
 
     invoke-direct {v15, v4}, Lcom/google/android/gms/measurement/internal/zzah;-><init>(Landroid/os/Bundle;)V
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
-    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/zzai;->aDJ:J
+    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/zzai;->aEb:J
 
     move-object v13, v5
 
@@ -9242,17 +9242,17 @@
     goto :goto_0
 
     :cond_2
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
     const-string v5, "Dropping non-safelisted event. appId, event name, origin"
 
@@ -9262,22 +9262,22 @@
 
     :cond_3
     :goto_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v4
 
     invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jg;->beginTransaction()V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v4
 
-    invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     const/4 v5, 0x2
 
@@ -9291,15 +9291,15 @@
 
     if-gez v8, :cond_4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Invalid time querying timed out conditional properties"
 
-    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v9
 
@@ -9353,33 +9353,33 @@
 
     if-eqz v8, :cond_5
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v10, "User property timed out"
 
     iget-object v15, v8, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v14
 
-    iget-object v13, v8, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v13, v8, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v13, v13, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-virtual {v14, v13}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v14, v13}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v13
 
-    iget-object v14, v8, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v14, v8, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/zzjn;->getValue()Ljava/lang/Object;
 
@@ -9387,24 +9387,24 @@
 
     invoke-virtual {v9, v10, v15, v13, v14}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v9, v8, Lcom/google/android/gms/measurement/internal/zzq;->aLF:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v9, v8, Lcom/google/android/gms/measurement/internal/zzq;->aLX:Lcom/google/android/gms/measurement/internal/zzai;
 
     if-eqz v9, :cond_6
 
     new-instance v9, Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v10, v8, Lcom/google/android/gms/measurement/internal/zzq;->aLF:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v10, v8, Lcom/google/android/gms/measurement/internal/zzq;->aLX:Lcom/google/android/gms/measurement/internal/zzai;
 
     invoke-direct {v9, v10, v11, v12}, Lcom/google/android/gms/measurement/internal/zzai;-><init>(Lcom/google/android/gms/measurement/internal/zzai;J)V
 
     invoke-direct {v1, v9, v2}, Lcom/google/android/gms/measurement/internal/ii;->c(Lcom/google/android/gms/measurement/internal/zzai;Lcom/google/android/gms/measurement/internal/zzn;)V
 
     :cond_6
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v9
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v8, v8, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
@@ -9417,29 +9417,29 @@
     goto :goto_2
 
     :cond_7
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v4
 
-    invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     cmp-long v8, v11, v6
 
     if-gez v8, :cond_8
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Invalid time querying expired conditional properties"
 
-    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v9
 
@@ -9505,33 +9505,33 @@
 
     if-eqz v9, :cond_9
 
-    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v13, "User property expired"
 
     iget-object v14, v9, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v15
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-virtual {v15, v5}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v15, v5}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v5
 
-    iget-object v15, v9, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v15, v9, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/zzjn;->getValue()Ljava/lang/Object;
 
@@ -9539,30 +9539,30 @@
 
     invoke-virtual {v10, v13, v14, v5, v15}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v5
 
-    iget-object v10, v9, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v10, v9, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v10, v10, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
     invoke-virtual {v5, v3, v10}, Lcom/google/android/gms/measurement/internal/jg;->M(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
     if-eqz v5, :cond_a
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
     invoke-interface {v8, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v5
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v9, v9, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
@@ -9601,41 +9601,41 @@
     goto :goto_5
 
     :cond_c
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v4
 
     iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {v5}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v5}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     cmp-long v8, v11, v6
 
     if-gez v8, :cond_d
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v7, "Invalid time querying triggered conditional properties"
 
-    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v4
 
-    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -9711,13 +9711,13 @@
 
     if-eqz v15, :cond_e
 
-    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     new-instance v10, Lcom/google/android/gms/measurement/internal/iq;
 
     iget-object v5, v15, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
     iget-object v7, v4, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
@@ -9735,7 +9735,7 @@
 
     invoke-direct/range {v4 .. v10}, Lcom/google/android/gms/measurement/internal/iq;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v4
 
@@ -9745,27 +9745,27 @@
 
     if-eqz v4, :cond_f
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "User property triggered"
 
     iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v7
 
     iget-object v8, v13, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v7
 
@@ -9776,31 +9776,31 @@
     goto :goto_8
 
     :cond_f
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Too many active user properties, ignoring"
 
     iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    invoke-static {v6}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v6}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v7
 
     iget-object v8, v13, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v7
 
@@ -9809,11 +9809,11 @@
     invoke-virtual {v4, v5, v6, v7, v8}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :goto_8
-    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
     if-eqz v4, :cond_10
 
-    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
     invoke-interface {v14, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -9822,13 +9822,13 @@
 
     invoke-direct {v4, v13}, Lcom/google/android/gms/measurement/internal/zzjn;-><init>(Lcom/google/android/gms/measurement/internal/iq;)V
 
-    iput-object v4, v15, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iput-object v4, v15, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     const/4 v4, 0x1
 
     iput-boolean v4, v15, Lcom/google/android/gms/measurement/internal/zzq;->active:Z
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v5
 
@@ -9869,7 +9869,7 @@
     goto :goto_9
 
     :cond_12
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
@@ -9877,7 +9877,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
@@ -9888,7 +9888,7 @@
     :catchall_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -9906,11 +9906,11 @@
 .method final b(Lcom/google/android/gms/measurement/internal/zzjn;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 12
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -9918,7 +9918,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -9929,7 +9929,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iget-boolean v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
     if-nez v0, :cond_1
 
@@ -9938,15 +9938,15 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/it;->cS(Ljava/lang/String;)I
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/it;->cO(Ljava/lang/String;)I
 
     move-result v4
 
@@ -9958,9 +9958,9 @@
 
     if-eqz v4, :cond_3
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
@@ -9986,9 +9986,9 @@
     const/4 v7, 0x0
 
     :goto_0
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v2
 
@@ -10001,9 +10001,9 @@
     return-void
 
     :cond_3
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v3
 
@@ -10019,9 +10019,9 @@
 
     if-eqz v8, :cond_6
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
@@ -10060,9 +10060,9 @@
     const/4 v11, 0x0
 
     :goto_1
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v6
 
@@ -10075,9 +10075,9 @@
     return-void
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
@@ -10104,25 +10104,25 @@
 
     if-eqz v1, :cond_b
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v2, p2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->dg(Ljava/lang/String;)Z
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->dc(Ljava/lang/String;)Z
 
     move-result v1
 
     if-eqz v1, :cond_b
 
-    iget-wide v4, p1, Lcom/google/android/gms/measurement/internal/zzjn;->aLn:J
+    iget-wide v4, p1, Lcom/google/android/gms/measurement/internal/zzjn;->aLF:J
 
-    iget-object v7, p1, Lcom/google/android/gms/measurement/internal/zzjn;->aAO:Ljava/lang/String;
+    iget-object v7, p1, Lcom/google/android/gms/measurement/internal/zzjn;->aBg:Ljava/lang/String;
 
     const-wide/16 v1, 0x0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
@@ -10155,13 +10155,13 @@
     :cond_8
     if-eqz v3, :cond_9
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object v3, v3, Lcom/google/android/gms/measurement/internal/iq;->value:Ljava/lang/Object;
 
@@ -10170,13 +10170,13 @@
     invoke-virtual {v6, v8, v3}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_9
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v6, p2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    sget-object v8, Lcom/google/android/gms/measurement/internal/j;->aET:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v8, Lcom/google/android/gms/measurement/internal/j;->aFl:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v3, v6, v8}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -10184,7 +10184,7 @@
 
     if-eqz v3, :cond_a
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
@@ -10198,15 +10198,15 @@
 
     if-eqz v3, :cond_a
 
-    iget-wide v1, v3, Lcom/google/android/gms/measurement/internal/f;->aDv:J
+    iget-wide v1, v3, Lcom/google/android/gms/measurement/internal/f;->aDN:J
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -10241,11 +10241,11 @@
 
     iget-object v3, p2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzjn;->aAO:Ljava/lang/String;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzjn;->aBg:Ljava/lang/String;
 
     iget-object v5, p1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    iget-wide v6, p1, Lcom/google/android/gms/measurement/internal/zzjn;->aLn:J
+    iget-wide v6, p1, Lcom/google/android/gms/measurement/internal/zzjn;->aLF:J
 
     move-object v2, v1
 
@@ -10253,23 +10253,23 @@
 
     invoke-direct/range {v2 .. v8}, Lcom/google/android/gms/measurement/internal/iq;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v2
 
     iget-object v3, v1, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -10277,7 +10277,7 @@
 
     invoke-virtual {p1, v3, v2, v0}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -10286,7 +10286,7 @@
     :try_start_0
     invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/ii;->g(Lcom/google/android/gms/measurement/internal/zzn;)Lcom/google/android/gms/measurement/internal/ea;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -10294,7 +10294,7 @@
 
     move-result p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
@@ -10302,25 +10302,25 @@
 
     if-eqz p1, :cond_c
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "User property set"
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -10331,25 +10331,25 @@
     goto :goto_3
 
     :cond_c
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Too many unique user properties are set. Ignoring user property"
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v2
 
     iget-object v3, v1, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -10357,9 +10357,9 @@
 
     invoke-virtual {p1, v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
@@ -10378,7 +10378,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :goto_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -10389,7 +10389,7 @@
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p2
 
@@ -10405,27 +10405,27 @@
 
     iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -10433,7 +10433,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -10444,7 +10444,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iget-boolean v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
     if-nez v0, :cond_1
 
@@ -10461,20 +10461,20 @@
 
     iput-boolean p1, v0, Lcom/google/android/gms/measurement/internal/zzq;->active:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jg;->beginTransaction()V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
     iget-object v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
@@ -10484,9 +10484,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -10494,33 +10494,33 @@
 
     if-nez v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Updating a conditional user property with different origin. name, origin, origin (from DB)"
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v4
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
     invoke-virtual {v2, v3, v4, v5, v6}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -10533,25 +10533,25 @@
 
     if-eqz v3, :cond_3
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
-    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
-    iget-wide v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLD:J
+    iget-wide v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLV:J
 
-    iput-wide v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLD:J
+    iput-wide v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLV:J
 
-    iget-wide v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLG:J
+    iget-wide v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLY:J
 
-    iput-wide v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLG:J
+    iput-wide v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLY:J
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLE:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLW:Ljava/lang/String;
 
-    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLE:Ljava/lang/String;
+    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLW:Ljava/lang/String;
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
     iget-boolean v2, v1, Lcom/google/android/gms/measurement/internal/zzq;->active:Z
 
@@ -10559,34 +10559,34 @@
 
     new-instance v2, Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v4, v3, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzjn;->aLn:J
+    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzjn;->aLF:J
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzjn;->getValue()Ljava/lang/Object;
 
     move-result-object v7
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aAO:Ljava/lang/String;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aBg:Ljava/lang/String;
 
     move-object v3, v2
 
     invoke-direct/range {v3 .. v8}, Lcom/google/android/gms/measurement/internal/zzjn;-><init>(Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     goto :goto_0
 
     :cond_3
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLE:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLW:Ljava/lang/String;
 
     invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -10596,27 +10596,27 @@
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v4, v1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLD:J
+    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLV:J
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzjn;->getValue()Ljava/lang/Object;
 
     move-result-object v7
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aAO:Ljava/lang/String;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aBg:Ljava/lang/String;
 
     move-object v3, p1
 
     invoke-direct/range {v3 .. v8}, Lcom/google/android/gms/measurement/internal/zzjn;-><init>(Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iput-object p1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iput-boolean v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->active:Z
 
@@ -10628,17 +10628,17 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     new-instance v9, Lcom/google/android/gms/measurement/internal/iq;
 
     iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
     iget-object v5, v1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    iget-wide v6, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aLn:J
+    iget-wide v6, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aLF:J
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzjn;->getValue()Ljava/lang/Object;
 
@@ -10648,7 +10648,7 @@
 
     invoke-direct/range {v2 .. v8}, Lcom/google/android/gms/measurement/internal/iq;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
@@ -10658,27 +10658,27 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "User property updated immediately"
 
     iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v4
 
     iget-object v5, v9, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -10689,31 +10689,31 @@
     goto :goto_1
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "(2)Too many active user properties, ignoring"
 
     iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v4
 
     iget-object v5, v9, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -10724,22 +10724,22 @@
     :goto_1
     if-eqz p1, :cond_6
 
-    iget-object p1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object p1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
     if-eqz p1, :cond_6
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-wide v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLD:J
+    iget-wide v2, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLV:J
 
     invoke-direct {p1, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/zzai;-><init>(Lcom/google/android/gms/measurement/internal/zzai;J)V
 
     invoke-direct {p0, p1, p2}, Lcom/google/android/gms/measurement/internal/ii;->c(Lcom/google/android/gms/measurement/internal/zzai;Lcom/google/android/gms/measurement/internal/zzn;)V
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -10749,33 +10749,33 @@
 
     if-eqz p1, :cond_7
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Conditional property added"
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzjn;->getValue()Ljava/lang/Object;
 
@@ -10786,37 +10786,37 @@
     goto :goto_2
 
     :cond_7
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Too many conditional properties, ignoring"
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    invoke-static {v1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzjn;->getValue()Ljava/lang/Object;
 
@@ -10825,7 +10825,7 @@
     invoke-virtual {p1, p2, v1, v2, v0}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :goto_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -10833,7 +10833,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -10844,7 +10844,7 @@
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p2
 
@@ -10870,11 +10870,11 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const/4 v0, 0x0
 
@@ -10884,13 +10884,13 @@
     new-array p4, v0, [B
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "onConfigFetched. Response size"
 
@@ -10902,7 +10902,7 @@
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
@@ -10911,11 +10911,11 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
-    invoke-virtual {v1, p1}, Lcom/google/android/gms/measurement/internal/jg;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v1, p1}, Lcom/google/android/gms/measurement/internal/jg;->dg(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v1
 
@@ -10946,17 +10946,17 @@
     :goto_0
     if-nez v1, :cond_3
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "App does not exist in onConfigFetched. appId"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -10974,9 +10974,9 @@
     goto :goto_2
 
     :cond_4
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object p4
 
@@ -10986,19 +10986,19 @@
 
     invoke-virtual {v1, p4, p5}, Lcom/google/android/gms/measurement/internal/ea;->ar(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p4
 
     invoke-virtual {p4, v1}, Lcom/google/android/gms/measurement/internal/jg;->c(Lcom/google/android/gms/measurement/internal/ea;)V
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p4
 
-    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p5, "Fetching config failed. code, error"
 
@@ -11008,23 +11008,23 @@
 
     invoke-virtual {p4, p5, v1, p3}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object p3
 
-    invoke-virtual {p3, p1}, Lcom/google/android/gms/measurement/internal/ee;->cF(Ljava/lang/String;)V
+    invoke-virtual {p3, p1}, Lcom/google/android/gms/measurement/internal/ee;->cB(Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aGH:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aGZ:Lcom/google/android/gms/measurement/internal/dt;
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object p3
 
@@ -11051,17 +11051,17 @@
     :goto_1
     if-eqz v4, :cond_7
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aGI:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dp;->aHa:Lcom/google/android/gms/measurement/internal/dt;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object p2
 
@@ -11072,7 +11072,7 @@
     invoke-virtual {p1, p2, p3}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->zc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
 
     goto/16 :goto_8
 
@@ -11123,7 +11123,7 @@
     goto :goto_5
 
     :cond_b
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object p3
 
@@ -11133,17 +11133,17 @@
 
     :cond_c
     :goto_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object p5
 
-    invoke-virtual {p5, p1}, Lcom/google/android/gms/measurement/internal/ee;->cD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ap;
+    invoke-virtual {p5, p1}, Lcom/google/android/gms/measurement/internal/ee;->cz(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ap;
 
     move-result-object p5
 
     if-nez p5, :cond_d
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object p5
 
@@ -11151,9 +11151,9 @@
 
     :cond_d
     :goto_6
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object p3
 
@@ -11163,7 +11163,7 @@
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ea;->aq(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p3
 
@@ -11171,13 +11171,13 @@
 
     if-ne p2, v5, :cond_e
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Config not found. Using empty config. appId"
 
@@ -11186,13 +11186,13 @@
     goto :goto_7
 
     :cond_e
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Successfully fetched config. Got network response. code, size"
 
@@ -11209,31 +11209,31 @@
     invoke-virtual {p1, p3, p2, p4}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :goto_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yV()Lcom/google/android/gms/measurement/internal/dk;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yT()Lcom/google/android/gms/measurement/internal/dk;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dk;->xO()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dk;->xM()Z
 
     move-result p1
 
     if-eqz p1, :cond_f
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->yZ()Z
 
     move-result p1
 
     if-eqz p1, :cond_f
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
 
     goto :goto_8
 
     :cond_f
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->zc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
 
     :goto_8
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -11242,7 +11242,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -11250,9 +11250,9 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKY:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLq:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()V
 
     return-void
 
@@ -11260,7 +11260,7 @@
     move-exception p1
 
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p2
 
@@ -11273,9 +11273,9 @@
     :catchall_1
     move-exception p1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKY:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLq:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()V
 
     throw p1
 .end method
@@ -11283,11 +11283,11 @@
 .method final c(Lcom/google/android/gms/measurement/internal/zzjn;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -11295,7 +11295,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -11306,7 +11306,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iget-boolean v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
     if-nez v0, :cond_1
 
@@ -11315,13 +11315,13 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v1, p2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aEY:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFq:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -11343,27 +11343,27 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aHF:Ljava/lang/Boolean;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aHX:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_3
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Falling back to manifest metadata value for ad personalization"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -11371,7 +11371,7 @@
 
     move-result-wide v3
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aHF:Ljava/lang/Boolean;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aHX:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -11404,29 +11404,29 @@
     return-void
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v3
 
     iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
@@ -11435,7 +11435,7 @@
     :try_start_0
     invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/ii;->g(Lcom/google/android/gms/measurement/internal/zzn;)Lcom/google/android/gms/measurement/internal/ea;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
@@ -11445,29 +11445,29 @@
 
     invoke-virtual {v0, p2, v2}, Lcom/google/android/gms/measurement/internal/jg;->M(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p2
 
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jg;->setTransactionSuccessful()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -11475,7 +11475,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -11486,7 +11486,7 @@
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p2
 
@@ -11495,29 +11495,29 @@
     throw p1
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v3
 
     iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
@@ -11526,7 +11526,7 @@
     :try_start_1
     invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/ii;->g(Lcom/google/android/gms/measurement/internal/zzn;)Lcom/google/android/gms/measurement/internal/ea;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
@@ -11536,29 +11536,29 @@
 
     invoke-virtual {v0, p2, v2}, Lcom/google/android/gms/measurement/internal/jg;->M(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p2
 
     invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jg;->setTransactionSuccessful()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -11566,7 +11566,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -11577,7 +11577,7 @@
     :catchall_1
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p2
 
@@ -11593,23 +11593,23 @@
 
     iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -11617,7 +11617,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -11628,7 +11628,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iget-boolean v0, p2, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
     if-nez v0, :cond_1
 
@@ -11637,7 +11637,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
@@ -11646,13 +11646,13 @@
     :try_start_0
     invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/ii;->g(Lcom/google/android/gms/measurement/internal/zzn;)Lcom/google/android/gms/measurement/internal/ea;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
     iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
@@ -11662,41 +11662,41 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Removing conditional user property"
 
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v4
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
     invoke-virtual {v1, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
     iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
@@ -11706,59 +11706,59 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
     iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/jg;->M(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_2
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
     if-eqz v1, :cond_5
 
     const/4 v1, 0x0
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     if-eqz v2, :cond_3
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzah;->vW()Landroid/os/Bundle;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzah;->vU()Landroid/os/Bundle;
 
     move-result-object v1
 
     :cond_3
     move-object v3, v1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v1
 
     iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
     iget-object v4, v4, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-wide v6, p1, Lcom/google/android/gms/measurement/internal/zzai;->aDJ:J
+    iget-wide v6, p1, Lcom/google/android/gms/measurement/internal/zzai;->aEb:J
 
     move-object v0, v1
 
@@ -11779,33 +11779,33 @@
     goto :goto_0
 
     :cond_4
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Conditional user property doesn\'t exist"
 
     iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    invoke-static {v1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v2
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    invoke-virtual {v2, p1}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, p1}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -11813,7 +11813,7 @@
 
     :cond_5
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -11821,7 +11821,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -11832,7 +11832,7 @@
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p2
 
@@ -11841,18 +11841,18 @@
     throw p1
 .end method
 
-.method final cO(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzn;
+.method final cK(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzn;
     .locals 30
 
     move-object/from16 v0, p0
 
     move-object/from16 v2, p1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jg;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jg;->dg(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v15
 
@@ -11860,7 +11860,7 @@
 
     if-eqz v15, :cond_2
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
 
     move-result-object v3
 
@@ -11885,15 +11885,15 @@
 
     if-nez v3, :cond_1
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -11912,29 +11912,29 @@
 
     move-result-object v3
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yh()J
 
     move-result-wide v5
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yk()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yl()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
 
     move-result-wide v8
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->ym()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yk()J
 
     move-result-wide v10
 
     const/4 v12, 0x0
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yo()Z
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->ym()Z
 
     move-result v13
 
@@ -11948,7 +11948,7 @@
 
     move-object/from16 v15, v16
 
-    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->yu()J
+    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->ys()J
 
     move-result-wide v16
 
@@ -11956,29 +11956,29 @@
 
     const/16 v20, 0x0
 
-    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->yv()Z
+    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->yt()Z
 
     move-result v21
 
-    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->yw()Z
+    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->yu()Z
 
     move-result v22
 
     const/16 v23, 0x0
 
-    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->xG()Ljava/lang/String;
+    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->xE()Ljava/lang/String;
 
     move-result-object v24
 
-    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->yx()Ljava/lang/Boolean;
+    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->yv()Ljava/lang/Boolean;
 
     move-result-object v25
 
-    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->yn()J
+    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->yl()J
 
     move-result-wide v26
 
-    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->yy()Ljava/util/List;
+    invoke-virtual/range {v28 .. v28}, Lcom/google/android/gms/measurement/internal/ea;->yw()Ljava/util/List;
 
     move-result-object v28
 
@@ -11990,13 +11990,13 @@
 
     :cond_2
     :goto_0
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "No app data available; dropping"
 
@@ -12014,17 +12014,17 @@
 
     move-object/from16 v3, p2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
-    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/jg;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/jg;->dg(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v15
 
     if-eqz v15, :cond_3
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
 
     move-result-object v2
 
@@ -12053,15 +12053,15 @@
 
     if-nez v2, :cond_2
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -12078,15 +12078,15 @@
 
     if-nez v2, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -12106,29 +12106,29 @@
 
     move-result-object v4
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yh()J
 
     move-result-wide v6
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yk()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yl()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
 
     move-result-wide v9
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->ym()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yk()J
 
     move-result-wide v11
 
     const/4 v13, 0x0
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->yo()Z
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ea;->ym()Z
 
     move-result v16
 
@@ -12146,7 +12146,7 @@
 
     move-result-object v16
 
-    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->yu()J
+    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->ys()J
 
     move-result-wide v17
 
@@ -12154,29 +12154,29 @@
 
     const/16 v21, 0x0
 
-    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->yv()Z
+    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->yt()Z
 
     move-result v22
 
-    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->yw()Z
+    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->yu()Z
 
     move-result v23
 
     const/16 v24, 0x0
 
-    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->xG()Ljava/lang/String;
+    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->xE()Ljava/lang/String;
 
     move-result-object v25
 
-    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->yx()Ljava/lang/Boolean;
+    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->yv()Ljava/lang/Boolean;
 
     move-result-object v26
 
-    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->yn()J
+    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->yl()J
 
     move-result-wide v27
 
-    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->yy()Ljava/util/List;
+    invoke-virtual/range {v29 .. v29}, Lcom/google/android/gms/measurement/internal/ea;->yw()Ljava/util/List;
 
     move-result-object v29
 
@@ -12192,13 +12192,13 @@
 
     :cond_3
     :goto_1
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "No app data available; dropping event"
 
@@ -12212,7 +12212,7 @@
 
     const-string v0, "app_id=?"
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLd:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLv:Ljava/util/List;
 
     if-eqz v1, :cond_0
 
@@ -12220,26 +12220,26 @@
 
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLe:Ljava/util/List;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLw:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLe:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLw:Ljava/util/List;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLd:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLv:Ljava/util/List;
 
     invoke-interface {v1, v2}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
     iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     :try_start_0
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jg;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
@@ -12328,11 +12328,11 @@
 
     if-lez v6, :cond_1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Reset analytics data. app, records"
 
@@ -12349,13 +12349,13 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -12365,7 +12365,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -12373,17 +12373,17 @@
 
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
-    iget-boolean v5, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iget-boolean v5, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
-    iget-boolean v6, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHD:Z
+    iget-boolean v6, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHV:Z
 
-    iget-boolean v7, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHE:Z
+    iget-boolean v7, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHW:Z
 
-    iget-wide v8, p1, Lcom/google/android/gms/measurement/internal/zzn;->aIT:J
+    iget-wide v8, p1, Lcom/google/android/gms/measurement/internal/zzn;->aJl:J
 
-    iget-object v10, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v10, p1, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
     move-object v1, p0
 
@@ -12391,7 +12391,7 @@
 
     move-result-object v0
 
-    iget-boolean p1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
     if-eqz p1, :cond_2
 
@@ -12416,17 +12416,17 @@
 
     const-string v0, "app_id=?"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {v6}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v6}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
     invoke-static {v6}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -12434,7 +12434,7 @@
 
     if-eqz v6, :cond_0
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
     invoke-static {v6}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -12445,13 +12445,13 @@
     return-void
 
     :cond_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v6
 
     iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v6, v7}, Lcom/google/android/gms/measurement/internal/jg;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v6, v7}, Lcom/google/android/gms/measurement/internal/jg;->dg(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v6
 
@@ -12469,7 +12469,7 @@
 
     if-eqz v9, :cond_1
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
     invoke-static {v9}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -12479,22 +12479,22 @@
 
     invoke-virtual {v6, v7, v8}, Lcom/google/android/gms/measurement/internal/ea;->aq(J)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v9
 
     invoke-virtual {v9, v6}, Lcom/google/android/gms/measurement/internal/jg;->c(Lcom/google/android/gms/measurement/internal/ea;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v6
 
     iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v6, v9}, Lcom/google/android/gms/measurement/internal/ee;->cG(Ljava/lang/String;)V
+    invoke-virtual {v6, v9}, Lcom/google/android/gms/measurement/internal/ee;->cC(Ljava/lang/String;)V
 
     :cond_1
-    iget-boolean v6, v2, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iget-boolean v6, v2, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
     if-nez v6, :cond_2
 
@@ -12503,15 +12503,15 @@
     return-void
 
     :cond_2
-    iget-wide v9, v2, Lcom/google/android/gms/measurement/internal/zzn;->aIT:J
+    iget-wide v9, v2, Lcom/google/android/gms/measurement/internal/zzn;->aJl:J
 
     cmp-long v6, v9, v7
 
     if-nez v6, :cond_3
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v6
 
@@ -12520,13 +12520,13 @@
     move-result-wide v9
 
     :cond_3
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    sget-object v12, Lcom/google/android/gms/measurement/internal/j;->aEY:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v12, Lcom/google/android/gms/measurement/internal/j;->aFq:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v6, v11, v12}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -12534,16 +12534,16 @@
 
     if-eqz v6, :cond_4
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/d;->vU()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/d;->vS()V
 
     :cond_4
-    iget v6, v2, Lcom/google/android/gms/measurement/internal/zzn;->aFO:I
+    iget v6, v2, Lcom/google/android/gms/measurement/internal/zzn;->aGg:I
 
     const/4 v15, 0x0
 
@@ -12553,17 +12553,17 @@
 
     if-eq v6, v13, :cond_5
 
-    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v11
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {v12}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v12}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v12
 
@@ -12578,20 +12578,20 @@
     const/4 v6, 0x0
 
     :cond_5
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v11
 
     invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/jg;->beginTransaction()V
 
     :try_start_0
-    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    sget-object v14, Lcom/google/android/gms/measurement/internal/j;->aEY:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v14, Lcom/google/android/gms/measurement/internal/j;->aFq:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v11, v12, v14}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -12599,7 +12599,7 @@
 
     if-eqz v11, :cond_a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v11
 
@@ -12615,7 +12615,7 @@
 
     const-string v11, "auto"
 
-    iget-object v12, v14, Lcom/google/android/gms/measurement/internal/iq;->aAO:Ljava/lang/String;
+    iget-object v12, v14, Lcom/google/android/gms/measurement/internal/iq;->aBg:Ljava/lang/String;
 
     invoke-virtual {v11, v12}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -12624,7 +12624,7 @@
     if-eqz v11, :cond_a
 
     :cond_6
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->aHF:Ljava/lang/Boolean;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->aHX:Ljava/lang/Boolean;
 
     if-eqz v11, :cond_9
 
@@ -12632,7 +12632,7 @@
 
     const-string v16, "_npa"
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->aHF:Ljava/lang/Boolean;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->aHX:Ljava/lang/Boolean;
 
     invoke-virtual {v11}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -12678,7 +12678,7 @@
 
     iget-object v8, v8, Lcom/google/android/gms/measurement/internal/iq;->value:Ljava/lang/Object;
 
-    iget-object v11, v7, Lcom/google/android/gms/measurement/internal/zzjn;->aLo:Ljava/lang/Long;
+    iget-object v11, v7, Lcom/google/android/gms/measurement/internal/zzjn;->aLG:Ljava/lang/Long;
 
     invoke-virtual {v8, v11}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -12725,31 +12725,31 @@
 
     :cond_b
     :goto_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v7
 
     iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/jg;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/jg;->dg(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v7
 
     if-eqz v7, :cond_d
 
-    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
     invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->getGmpAppId()Ljava/lang/String;
 
     move-result-object v12
 
-    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->xG()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->xE()Ljava/lang/String;
 
     move-result-object v14
 
@@ -12759,39 +12759,39 @@
 
     if-eqz v11, :cond_d
 
-    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v11
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v12, "New GMP App Id passed in. Removing cached database data. appId"
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v13
 
-    invoke-static {v13}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v13}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v13
 
     invoke-virtual {v11, v12, v13}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v11
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {v7}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v7}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -12884,11 +12884,11 @@
 
     if-lez v14, :cond_c
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Deleted application data. app, records"
 
@@ -12915,15 +12915,15 @@
 
     :goto_2
     :try_start_3
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v11, "Error deleting application data. appId, error"
 
-    invoke-static {v7}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v7}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v7
 
@@ -12941,7 +12941,7 @@
     :goto_4
     if-eqz v7, :cond_f
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->yh()J
 
     move-result-wide v11
     :try_end_3
@@ -12956,11 +12956,11 @@
     if-eqz v8, :cond_e
 
     :try_start_4
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->yh()J
 
     move-result-wide v11
 
-    iget-wide v13, v2, Lcom/google/android/gms/measurement/internal/zzn;->aHA:J
+    iget-wide v13, v2, Lcom/google/android/gms/measurement/internal/zzn;->aHS:J
 
     cmp-long v8, v11, v13
 
@@ -12970,7 +12970,7 @@
 
     invoke-direct {v8}, Landroid/os/Bundle;-><init>()V
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
 
     move-result-object v7
 
@@ -13001,17 +13001,17 @@
     :cond_e
     const/4 v8, 0x0
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
 
     move-result-object v11
 
     if-eqz v11, :cond_10
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
 
     move-result-object v11
 
-    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzn;->aFH:Ljava/lang/String;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzn;->aFZ:Ljava/lang/String;
 
     invoke-virtual {v11, v12}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -13023,7 +13023,7 @@
 
     invoke-direct {v11}, Landroid/os/Bundle;-><init>()V
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
 
     move-result-object v7
 
@@ -13058,7 +13058,7 @@
 
     if-nez v6, :cond_11
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
@@ -13075,7 +13075,7 @@
     :cond_11
     if-ne v6, v3, :cond_12
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
@@ -13148,32 +13148,32 @@
 
     invoke-virtual {v1, v6, v2}, Lcom/google/android/gms/measurement/internal/ii;->b(Lcom/google/android/gms/measurement/internal/zzjn;Lcom/google/android/gms/measurement/internal/zzn;)V
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
-    invoke-virtual {v6, v11}, Lcom/google/android/gms/measurement/internal/jb;->de(Ljava/lang/String;)Z
+    invoke-virtual {v6, v11}, Lcom/google/android/gms/measurement/internal/jb;->da(Ljava/lang/String;)Z
 
     move-result v6
 
     if-eqz v6, :cond_13
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ek;->aIL:Lcom/google/android/gms/measurement/internal/du;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ek;->aJd:Lcom/google/android/gms/measurement/internal/du;
 
     iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v6, v11}, Lcom/google/android/gms/measurement/internal/du;->ct(Ljava/lang/String;)V
+    invoke-virtual {v6, v11}, Lcom/google/android/gms/measurement/internal/du;->cp(Ljava/lang/String;)V
 
     :cond_13
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
     new-instance v6, Landroid/os/Bundle;
 
@@ -13199,13 +13199,13 @@
 
     invoke-virtual {v6, v11, v7, v8}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/jb;->di(Ljava/lang/String;)Z
+    invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/jb;->de(Ljava/lang/String;)Z
 
     move-result v7
 
@@ -13221,14 +13221,14 @@
     const-wide/16 v7, 0x1
 
     :goto_7
-    iget-boolean v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->aLz:Z
+    iget-boolean v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->aLR:Z
 
     if-eqz v11, :cond_15
 
     invoke-virtual {v6, v0, v7, v8}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_15
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -13240,19 +13240,19 @@
 
     if-nez v0, :cond_16
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "PackageManager is null, first open report might be inaccurate. appId"
 
     iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {v7}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v7}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v7
 
@@ -13264,7 +13264,7 @@
 
     :cond_16
     :try_start_6
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -13291,19 +13291,19 @@
     move-exception v0
 
     :try_start_7
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Package info is null, first open report might be inaccurate. appId"
 
     iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v11
 
@@ -13383,7 +13383,7 @@
 
     :goto_b
     :try_start_8
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -13410,19 +13410,19 @@
     move-exception v0
 
     :try_start_9
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Application info is null, first open report might be inaccurate. appId"
 
     iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v11}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v11
 
@@ -13460,17 +13460,17 @@
 
     :cond_1b
     :goto_d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
     iget-object v5, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {v5}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v5}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     const-string v7, "first_open_count"
 
@@ -13534,9 +13534,9 @@
 
     invoke-virtual {v1, v4, v2}, Lcom/google/android/gms/measurement/internal/ii;->b(Lcom/google/android/gms/measurement/internal/zzjn;Lcom/google/android/gms/measurement/internal/zzn;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
     new-instance v4, Landroid/os/Bundle;
 
@@ -13548,13 +13548,13 @@
 
     invoke-virtual {v4, v7, v5, v6}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/jb;->di(Ljava/lang/String;)Z
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/jb;->de(Ljava/lang/String;)Z
 
     move-result v5
 
@@ -13570,7 +13570,7 @@
     const-wide/16 v5, 0x1
 
     :goto_e
-    iget-boolean v7, v2, Lcom/google/android/gms/measurement/internal/zzn;->aLz:Z
+    iget-boolean v7, v2, Lcom/google/android/gms/measurement/internal/zzn;->aLR:Z
 
     if-eqz v7, :cond_1f
 
@@ -13597,13 +13597,13 @@
 
     :cond_20
     :goto_f
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aEX:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aFp:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v4, v5}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -13619,13 +13619,13 @@
 
     invoke-virtual {v0, v3, v4, v5}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/jb;->di(Ljava/lang/String;)Z
+    invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/jb;->de(Ljava/lang/String;)Z
 
     move-result v3
 
@@ -13659,7 +13659,7 @@
     goto :goto_10
 
     :cond_22
-    iget-boolean v0, v2, Lcom/google/android/gms/measurement/internal/zzn;->aBP:Z
+    iget-boolean v0, v2, Lcom/google/android/gms/measurement/internal/zzn;->aCh:Z
 
     if-eqz v0, :cond_23
 
@@ -13687,7 +13687,7 @@
 
     :cond_23
     :goto_10
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
@@ -13695,7 +13695,7 @@
     :try_end_9
     .catchall {:try_start_9 .. :try_end_9} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
@@ -13706,7 +13706,7 @@
     :catchall_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -13718,35 +13718,35 @@
 .method final g(Lcom/google/android/gms/measurement/internal/zzn;)Lcom/google/android/gms/measurement/internal/ea;
     .locals 10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
     iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jg;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jg;->dg(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
     iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dp;->cq(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dp;->cm(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -13756,25 +13756,25 @@
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/ea;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
     invoke-direct {v0, v3, v4}, Lcom/google/android/gms/measurement/internal/ea;-><init>(Lcom/google/android/gms/measurement/internal/ek;Ljava/lang/String;)V
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/it;->zm()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/it;->zk()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/ea;->aM(Ljava/lang/String;)V
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/ea;->aH(Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cx(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->ct(Ljava/lang/String;)V
 
     :goto_0
     const/4 v1, 0x1
@@ -13782,7 +13782,7 @@
     goto :goto_1
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yf()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yd()Ljava/lang/String;
 
     move-result-object v3
 
@@ -13792,19 +13792,19 @@
 
     if-nez v3, :cond_1
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cx(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->ct(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/it;->zm()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/it;->zk()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->aM(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->aH(Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -13812,7 +13812,7 @@
     const/4 v1, 0x0
 
     :goto_1
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->getGmpAppId()Ljava/lang/String;
 
@@ -13824,16 +13824,16 @@
 
     if-nez v3, :cond_2
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cv(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cr(Ljava/lang/String;)V
 
     const/4 v1, 0x1
 
     :cond_2
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->xG()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->xE()Ljava/lang/String;
 
     move-result-object v4
 
@@ -13843,14 +13843,14 @@
 
     if-nez v3, :cond_3
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cw(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cs(Ljava/lang/String;)V
 
     const/4 v1, 0x1
 
     :cond_3
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHw:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHO:Ljava/lang/String;
 
     invoke-static {v3}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -13858,7 +13858,7 @@
 
     if-nez v3, :cond_4
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHw:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHO:Ljava/lang/String;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->getFirebaseInstanceId()Ljava/lang/String;
 
@@ -13870,14 +13870,14 @@
 
     if-nez v3, :cond_4
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHw:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHO:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cy(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cu(Ljava/lang/String;)V
 
     const/4 v1, 0x1
 
     :cond_4
-    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aAK:J
+    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aBc:J
 
     const-wide/16 v5, 0x0
 
@@ -13885,9 +13885,9 @@
 
     if-eqz v7, :cond_5
 
-    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aAK:J
+    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aBc:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yl()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
 
     move-result-wide v7
 
@@ -13895,14 +13895,14 @@
 
     if-eqz v9, :cond_5
 
-    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aAK:J
+    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aBc:J
 
     invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/measurement/internal/ea;->w(J)V
 
     const/4 v1, 0x1
 
     :cond_5
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFH:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFZ:Ljava/lang/String;
 
     invoke-static {v3}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -13910,7 +13910,47 @@
 
     if-nez v3, :cond_6
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFH:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFZ:Ljava/lang/String;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v3
+
+    if-nez v3, :cond_6
+
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFZ:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cv(Ljava/lang/String;)V
+
+    const/4 v1, 0x1
+
+    :cond_6
+    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHS:J
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yh()J
+
+    move-result-wide v7
+
+    cmp-long v9, v3, v7
+
+    if-eqz v9, :cond_7
+
+    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHS:J
+
+    invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/measurement/internal/ea;->an(J)V
+
+    const/4 v1, 0x1
+
+    :cond_7
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aGb:Ljava/lang/String;
+
+    if-eqz v3, :cond_8
+
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aGb:Ljava/lang/String;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
 
@@ -13920,58 +13960,18 @@
 
     move-result v3
 
-    if-nez v3, :cond_6
-
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFH:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cz(Ljava/lang/String;)V
-
-    const/4 v1, 0x1
-
-    :cond_6
-    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHA:J
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
-
-    move-result-wide v7
-
-    cmp-long v9, v3, v7
-
-    if-eqz v9, :cond_7
-
-    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHA:J
-
-    invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/measurement/internal/ea;->an(J)V
-
-    const/4 v1, 0x1
-
-    :cond_7
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFJ:Ljava/lang/String;
-
-    if-eqz v3, :cond_8
-
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFJ:Ljava/lang/String;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yk()Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v3
-
     if-nez v3, :cond_8
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFJ:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aGb:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cA(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cw(Ljava/lang/String;)V
 
     const/4 v1, 0x1
 
     :cond_8
-    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHB:J
+    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHT:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->ym()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yk()J
 
     move-result-wide v7
 
@@ -13979,29 +13979,29 @@
 
     if-eqz v9, :cond_9
 
-    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHB:J
+    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHT:J
 
     invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/measurement/internal/ea;->x(J)V
 
     const/4 v1, 0x1
 
     :cond_9
-    iget-boolean v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iget-boolean v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yo()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->ym()Z
 
     move-result v4
 
     if-eq v3, v4, :cond_a
 
-    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->Q(Z)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->O(Z)V
 
     const/4 v1, 0x1
 
     :cond_a
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aLy:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aLQ:Ljava/lang/String;
 
     invoke-static {v3}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -14009,9 +14009,9 @@
 
     if-nez v3, :cond_b
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aLy:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aLQ:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yt()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yr()Ljava/lang/String;
 
     move-result-object v4
 
@@ -14021,16 +14021,16 @@
 
     if-nez v3, :cond_b
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aLy:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aLQ:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cB(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->cx(Ljava/lang/String;)V
 
     const/4 v1, 0x1
 
     :cond_b
-    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFM:J
+    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aGe:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yu()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->ys()J
 
     move-result-wide v7
 
@@ -14038,50 +14038,50 @@
 
     if-eqz v9, :cond_c
 
-    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFM:J
+    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aGe:J
 
     invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/measurement/internal/ea;->as(J)V
 
     const/4 v1, 0x1
 
     :cond_c
-    iget-boolean v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHD:Z
+    iget-boolean v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHV:Z
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yv()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yt()Z
 
     move-result v4
 
     if-eq v3, v4, :cond_d
 
-    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHD:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHV:Z
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->T(Z)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->R(Z)V
 
     const/4 v1, 0x1
 
     :cond_d
-    iget-boolean v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHE:Z
+    iget-boolean v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHW:Z
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yw()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yu()Z
 
     move-result v4
 
     if-eq v3, v4, :cond_e
 
-    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHE:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHW:Z
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->U(Z)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->S(Z)V
 
     const/4 v1, 0x1
 
     :cond_e
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
     iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/j;->aEY:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/j;->aFq:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v3, v4, v7}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -14089,30 +14089,30 @@
 
     if-eqz v3, :cond_f
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHF:Ljava/lang/Boolean;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHX:Ljava/lang/Boolean;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yx()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yv()Ljava/lang/Boolean;
 
     move-result-object v4
 
     if-eq v3, v4, :cond_f
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHF:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzn;->aHX:Ljava/lang/Boolean;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ea;->c(Ljava/lang/Boolean;)V
 
     const/4 v1, 0x1
 
     :cond_f
-    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aAL:J
+    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aBd:J
 
     cmp-long v7, v3, v5
 
     if-eqz v7, :cond_10
 
-    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aAL:J
+    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aBd:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yn()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ea;->yl()J
 
     move-result-wide v5
 
@@ -14120,7 +14120,7 @@
 
     if-eqz v7, :cond_10
 
-    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aAL:J
+    iget-wide v3, p1, Lcom/google/android/gms/measurement/internal/zzn;->aBd:J
 
     invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/measurement/internal/ea;->ao(J)V
 
@@ -14129,7 +14129,7 @@
     :cond_10
     if-eqz v1, :cond_11
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object p1
 
@@ -14142,7 +14142,7 @@
 .method public final getContext()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
@@ -14154,9 +14154,9 @@
 .method final h(Lcom/google/android/gms/measurement/internal/zzn;)Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -14199,17 +14199,17 @@
     move-exception v0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzn;->packageName:Ljava/lang/String;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -14222,16 +14222,16 @@
     return-object p1
 .end method
 
-.method final mc()V
+.method final ma()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     return-void
 .end method
@@ -14239,27 +14239,27 @@
 .method protected final start()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jg;->zz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jg;->zx()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGG:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -14271,17 +14271,17 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGG:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -14292,111 +14292,111 @@
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->zc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
 
     return-void
 .end method
 
-.method public final vJ()Lcom/google/android/gms/common/util/e;
+.method public final vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final xP()Lcom/google/android/gms/measurement/internal/ip;
+.method public final xN()Lcom/google/android/gms/measurement/internal/ip;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKQ:Lcom/google/android/gms/measurement/internal/ip;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLi:Lcom/google/android/gms/measurement/internal/ip;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ii;->a(Lcom/google/android/gms/measurement/internal/ij;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKQ:Lcom/google/android/gms/measurement/internal/ip;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLi:Lcom/google/android/gms/measurement/internal/ip;
 
     return-object v0
 .end method
 
-.method public final xQ()Lcom/google/android/gms/measurement/internal/iz;
+.method public final xO()Lcom/google/android/gms/measurement/internal/iz;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKP:Lcom/google/android/gms/measurement/internal/iz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLh:Lcom/google/android/gms/measurement/internal/iz;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ii;->a(Lcom/google/android/gms/measurement/internal/ij;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKP:Lcom/google/android/gms/measurement/internal/iz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLh:Lcom/google/android/gms/measurement/internal/iz;
 
     return-object v0
 .end method
 
-.method public final xR()Lcom/google/android/gms/measurement/internal/jg;
+.method public final xP()Lcom/google/android/gms/measurement/internal/jg;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKM:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLe:Lcom/google/android/gms/measurement/internal/jg;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ii;->a(Lcom/google/android/gms/measurement/internal/ij;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKM:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLe:Lcom/google/android/gms/measurement/internal/jg;
 
     return-object v0
 .end method
 
-.method public final xS()Lcom/google/android/gms/measurement/internal/ee;
+.method public final xQ()Lcom/google/android/gms/measurement/internal/ee;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKK:Lcom/google/android/gms/measurement/internal/ee;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLc:Lcom/google/android/gms/measurement/internal/ee;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ii;->a(Lcom/google/android/gms/measurement/internal/ij;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKK:Lcom/google/android/gms/measurement/internal/ee;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLc:Lcom/google/android/gms/measurement/internal/ee;
 
     return-object v0
 .end method
 
-.method public final yV()Lcom/google/android/gms/measurement/internal/dk;
+.method public final yT()Lcom/google/android/gms/measurement/internal/dk;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKL:Lcom/google/android/gms/measurement/internal/dk;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLd:Lcom/google/android/gms/measurement/internal/dk;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ii;->a(Lcom/google/android/gms/measurement/internal/ij;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKL:Lcom/google/android/gms/measurement/internal/dk;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLd:Lcom/google/android/gms/measurement/internal/dk;
 
     return-object v0
 .end method
 
-.method final yY()V
+.method final yW()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->asN:Z
 
     if-eqz v0, :cond_0
 
@@ -14412,47 +14412,47 @@
     throw v0
 .end method
 
-.method final za()V
+.method final yY()V
     .locals 15
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLa:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLs:Z
 
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gw;->aKe:Ljava/lang/Boolean;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gw;->aKw:Ljava/lang/Boolean;
 
     if-nez v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Upload data called on the client side before use of service was decided"
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLa:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLs:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()V
 
     return-void
 
@@ -14464,29 +14464,29 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Upload called in the client side when service should be used"
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLa:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLs:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()V
 
     return-void
 
     :cond_1
     :try_start_2
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aKU:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLm:J
 
     const-wide/16 v4, 0x0
 
@@ -14494,21 +14494,21 @@
 
     if-lez v6, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->zc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLa:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLs:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()V
 
     return-void
 
     :cond_2
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLd:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aLv:Ljava/util/List;
 
     if-eqz v2, :cond_3
 
@@ -14522,65 +14522,65 @@
     :goto_0
     if-eqz v2, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Uploading requested multiple times"
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLa:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLs:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()V
 
     return-void
 
     :cond_4
     :try_start_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yV()Lcom/google/android/gms/measurement/internal/dk;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yT()Lcom/google/android/gms/measurement/internal/dk;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/dk;->xO()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/dk;->xM()Z
 
     move-result v2
 
     if-nez v2, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Network not connected, ignoring upload request"
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->zc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLa:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLs:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()V
 
     return-void
 
     :cond_5
     :try_start_5
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v2
 
@@ -14588,7 +14588,7 @@
 
     move-result-wide v2
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zt()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zr()J
 
     move-result-wide v6
 
@@ -14596,13 +14596,13 @@
 
     invoke-direct {p0, v6, v7}, Lcom/google/android/gms/measurement/internal/ii;->au(J)Z
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dp;->aGG:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
@@ -14612,13 +14612,13 @@
 
     if-eqz v8, :cond_6
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Uploading events. Elapsed time since last upload attempt (ms)"
 
@@ -14635,11 +14635,11 @@
     invoke-virtual {v4, v5, v6}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jg;->zx()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jg;->zv()Ljava/lang/String;
 
     move-result-object v4
 
@@ -14651,38 +14651,38 @@
 
     if-nez v5, :cond_14
 
-    iget-wide v8, p0, Lcom/google/android/gms/measurement/internal/ii;->aLf:J
+    iget-wide v8, p0, Lcom/google/android/gms/measurement/internal/ii;->aLx:J
 
     cmp-long v5, v8, v6
 
     if-nez v5, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jg;->zE()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jg;->zC()J
 
     move-result-wide v5
 
-    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/ii;->aLf:J
+    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/ii;->aLx:J
 
     :cond_7
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aEa:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aEs:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v5, v4, v6}, Lcom/google/android/gms/measurement/internal/jb;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)I
 
     move-result v5
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/j;->aEb:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/j;->aEt:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v6, v4, v7}, Lcom/google/android/gms/measurement/internal/jb;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)I
 
@@ -14692,7 +14692,7 @@
 
     move-result v6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v7
 
@@ -14795,7 +14795,7 @@
 
     :cond_b
     :goto_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$f;->pF()Lcom/google/android/gms/internal/measurement/al$f$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$f;->pD()Lcom/google/android/gms/internal/measurement/al$f$a;
 
     move-result-object v6
 
@@ -14811,17 +14811,17 @@
 
     invoke-direct {v9, v10}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zv()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zt()Z
 
     move-result v10
 
     if-eqz v10, :cond_c
 
-    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v10, v4}, Lcom/google/android/gms/measurement/internal/jb;->db(Ljava/lang/String;)Z
+    invoke-virtual {v10, v4}, Lcom/google/android/gms/measurement/internal/jb;->cX(Ljava/lang/String;)Z
 
     move-result v10
 
@@ -14850,7 +14850,7 @@
 
     check-cast v12, Lcom/google/android/gms/internal/measurement/al$g;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dr;->se()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dr;->sc()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v12
 
@@ -14880,18 +14880,18 @@
 
     move-result-object v13
 
-    invoke-virtual {v13, v1}, Lcom/google/android/gms/internal/measurement/al$g$a;->L(Z)Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v13, v1}, Lcom/google/android/gms/internal/measurement/al$g$a;->J(Z)Lcom/google/android/gms/internal/measurement/al$g$a;
 
     if-nez v10, :cond_d
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$g$a;->qc()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$g$a;->qa()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     :cond_d
-    iget-object v13, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v13, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v14, Lcom/google/android/gms/measurement/internal/j;->aFh:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v14, Lcom/google/android/gms/measurement/internal/j;->aFz:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v13, v4, v14}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -14899,7 +14899,7 @@
 
     if-eqz v13, :cond_e
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v13
 
@@ -14911,7 +14911,7 @@
 
     move-result-object v13
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v14
 
@@ -14929,9 +14929,9 @@
     goto :goto_5
 
     :cond_f
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v5
 
@@ -14943,11 +14943,11 @@
 
     if-eqz v5, :cond_10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v5
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v10
 
@@ -14965,9 +14965,9 @@
     move-object v5, v8
 
     :goto_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v10
 
@@ -14979,7 +14979,7 @@
 
     move-result-object v10
 
-    sget-object v11, Lcom/google/android/gms/measurement/internal/j;->aEk:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v11, Lcom/google/android/gms/measurement/internal/j;->aEC:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v11, v8}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -15012,21 +15012,21 @@
     :goto_7
     invoke-static {v11}, Lcom/google/android/gms/common/internal/r;->checkArgument(Z)V
 
-    iget-object v11, p0, Lcom/google/android/gms/measurement/internal/ii;->aLd:Ljava/util/List;
+    iget-object v11, p0, Lcom/google/android/gms/measurement/internal/ii;->aLv:Ljava/util/List;
 
     if-eqz v11, :cond_12
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v11, "Set uploading progress before finishing the previous upload"
 
-    invoke-virtual {v9, v11}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v9, v11}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_8
 
@@ -15035,16 +15035,16 @@
 
     invoke-direct {v11, v9}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iput-object v11, p0, Lcom/google/android/gms/measurement/internal/ii;->aLd:Ljava/util/List;
+    iput-object v11, p0, Lcom/google/android/gms/measurement/internal/ii;->aLv:Ljava/util/List;
 
     :goto_8
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dp;->aGH:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dp;->aGZ:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v9, v2, v3}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
@@ -15052,20 +15052,20 @@
 
     if-lez v7, :cond_13
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$f$a;->pH()Lcom/google/android/gms/internal/measurement/al$g;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$f$a;->pF()Lcom/google/android/gms/internal/measurement/al$g;
 
     move-result-object v2
 
     iget-object v2, v2, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
     :cond_13
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v6, "Uploading data. app, uncompressed size, data"
 
@@ -15077,9 +15077,9 @@
 
     invoke-virtual {v3, v6, v2, v7, v5}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKZ:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLr:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yV()Lcom/google/android/gms/measurement/internal/dk;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yT()Lcom/google/android/gms/measurement/internal/dk;
 
     move-result-object v6
 
@@ -15087,9 +15087,9 @@
 
     invoke-direct {v11, p0, v4}, Lcom/google/android/gms/measurement/internal/ik;-><init>(Lcom/google/android/gms/measurement/internal/ii;Ljava/lang/String;)V
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-static {v8}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -15097,7 +15097,7 @@
 
     invoke-static {v11}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
@@ -15124,17 +15124,17 @@
 
     :catch_0
     :try_start_7
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to parse upload URL. Not uploading. appId"
 
-    invoke-static {v4}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v4}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -15143,13 +15143,13 @@
     goto :goto_9
 
     :cond_14
-    iput-wide v6, p0, Lcom/google/android/gms/measurement/internal/ii;->aLf:J
+    iput-wide v6, p0, Lcom/google/android/gms/measurement/internal/ii;->aLx:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zt()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zr()J
 
     move-result-wide v4
 
@@ -15165,11 +15165,11 @@
 
     if-nez v2, :cond_15
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
-    invoke-virtual {v2, v0}, Lcom/google/android/gms/measurement/internal/jg;->dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
+    invoke-virtual {v2, v0}, Lcom/google/android/gms/measurement/internal/jg;->dg(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
 
     move-result-object v0
 
@@ -15181,18 +15181,18 @@
 
     :cond_15
     :goto_9
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLa:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLs:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLa:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLs:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zd()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()V
 
     goto :goto_b
 
@@ -15203,26 +15203,26 @@
     goto :goto_a
 .end method
 
-.method final zc()V
+.method final za()V
     .locals 21
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->zg()Z
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->ze()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFb:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFt:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -15233,7 +15233,7 @@
     return-void
 
     :cond_0
-    iget-wide v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aKU:J
+    iget-wide v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aLm:J
 
     const-wide/16 v3, 0x0
 
@@ -15241,9 +15241,9 @@
 
     if-lez v5, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -15253,7 +15253,7 @@
 
     const-wide/32 v5, 0x36ee80
 
-    iget-wide v7, v0, Lcom/google/android/gms/measurement/internal/ii;->aKU:J
+    iget-wide v7, v0, Lcom/google/android/gms/measurement/internal/ii;->aLm:J
 
     sub-long/2addr v1, v7
 
@@ -15267,13 +15267,13 @@
 
     if-lez v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -15283,13 +15283,13 @@
 
     invoke-virtual {v1, v3, v2}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()Lcom/google/android/gms/measurement/internal/dn;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yU()Lcom/google/android/gms/measurement/internal/dn;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dn;->unregister()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yX()Lcom/google/android/gms/measurement/internal/ie;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yV()Lcom/google/android/gms/measurement/internal/ie;
 
     move-result-object v1
 
@@ -15298,18 +15298,18 @@
     return-void
 
     :cond_1
-    iput-wide v3, v0, Lcom/google/android/gms/measurement/internal/ii;->aKU:J
+    iput-wide v3, v0, Lcom/google/android/gms/measurement/internal/ii;->aLm:J
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->yF()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->yD()Z
 
     move-result v1
 
     if-eqz v1, :cond_12
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->zb()Z
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yZ()Z
 
     move-result v1
 
@@ -15318,9 +15318,9 @@
     goto/16 :goto_6
 
     :cond_3
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -15328,7 +15328,7 @@
 
     move-result-wide v1
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aEu:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aEM:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v6, 0x0
 
@@ -15346,21 +15346,21 @@
 
     move-result-wide v7
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jg;->zD()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jg;->zB()Z
 
     move-result v5
 
     if-nez v5, :cond_5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jg;->zy()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jg;->zw()Z
 
     move-result v5
 
@@ -15380,11 +15380,11 @@
     :goto_1
     if-eqz v5, :cond_7
 
-    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/jb;->zu()Ljava/lang/String;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/jb;->zs()Ljava/lang/String;
 
     move-result-object v10
 
@@ -15402,7 +15402,7 @@
 
     if-nez v10, :cond_6
 
-    sget-object v10, Lcom/google/android/gms/measurement/internal/j;->aEp:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/j;->aEH:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v10, v6}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -15421,7 +15421,7 @@
     goto :goto_2
 
     :cond_6
-    sget-object v10, Lcom/google/android/gms/measurement/internal/j;->aEo:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/j;->aEG:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v10, v6}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -15440,7 +15440,7 @@
     goto :goto_2
 
     :cond_7
-    sget-object v10, Lcom/google/android/gms/measurement/internal/j;->aEn:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/j;->aEF:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v10, v6}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -15457,47 +15457,47 @@
     move-result-wide v10
 
     :goto_2
-    iget-object v12, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v12, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dp;->aGG:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
     move-result-wide v12
 
-    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v14
 
-    iget-object v14, v14, Lcom/google/android/gms/measurement/internal/dp;->aGH:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v14, v14, Lcom/google/android/gms/measurement/internal/dp;->aGZ:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
     move-result-wide v14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v16
 
     move-wide/from16 v17, v10
 
-    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/measurement/internal/jg;->zA()J
+    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/measurement/internal/jg;->zy()J
 
     move-result-wide v9
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v11
 
     move-wide/from16 v19, v7
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/jg;->zB()J
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/jg;->zz()J
 
     move-result-wide v6
 
@@ -15558,7 +15558,7 @@
     add-long v10, v10, v17
 
     :cond_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v5
 
@@ -15591,7 +15591,7 @@
     :goto_4
     const/16 v6, 0x14
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/j;->aEw:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/j;->aEO:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v10, 0x0
 
@@ -15621,7 +15621,7 @@
 
     shl-long/2addr v6, v5
 
-    sget-object v12, Lcom/google/android/gms/measurement/internal/j;->aEv:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v12, Lcom/google/android/gms/measurement/internal/j;->aEN:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v12, v10}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -15658,25 +15658,25 @@
 
     if-nez v1, :cond_e
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Next upload time is 0"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()Lcom/google/android/gms/measurement/internal/dn;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yU()Lcom/google/android/gms/measurement/internal/dn;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dn;->unregister()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yX()Lcom/google/android/gms/measurement/internal/ie;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yV()Lcom/google/android/gms/measurement/internal/ie;
 
     move-result-object v1
 
@@ -15685,35 +15685,35 @@
     return-void
 
     :cond_e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yV()Lcom/google/android/gms/measurement/internal/dk;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yT()Lcom/google/android/gms/measurement/internal/dk;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dk;->xO()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dk;->xM()Z
 
     move-result v1
 
     if-nez v1, :cond_f
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "No network"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()Lcom/google/android/gms/measurement/internal/dn;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yU()Lcom/google/android/gms/measurement/internal/dn;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dn;->xT()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dn;->xR()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yX()Lcom/google/android/gms/measurement/internal/ie;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yV()Lcom/google/android/gms/measurement/internal/ie;
 
     move-result-object v1
 
@@ -15722,19 +15722,19 @@
     return-void
 
     :cond_f
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aGI:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aHa:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
     move-result-wide v1
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aEl:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/j;->aED:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v6, 0x0
 
@@ -15752,7 +15752,7 @@
 
     move-result-wide v5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v7
 
@@ -15769,15 +15769,15 @@
     move-result-wide v8
 
     :cond_10
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()Lcom/google/android/gms/measurement/internal/dn;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yU()Lcom/google/android/gms/measurement/internal/dn;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dn;->unregister()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -15791,7 +15791,7 @@
 
     if-gtz v1, :cond_11
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aEq:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aEI:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v2, 0x0
 
@@ -15809,17 +15809,17 @@
 
     move-result-wide v8
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aGG:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dp;->aGY:Lcom/google/android/gms/measurement/internal/dt;
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v2
 
@@ -15830,13 +15830,13 @@
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
     :cond_11
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -15846,7 +15846,7 @@
 
     invoke-virtual {v1, v3, v2}, Lcom/google/android/gms/measurement/internal/dj;->j(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yX()Lcom/google/android/gms/measurement/internal/ie;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yV()Lcom/google/android/gms/measurement/internal/ie;
 
     move-result-object v1
 
@@ -15856,25 +15856,25 @@
 
     :cond_12
     :goto_6
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Nothing to upload or uploading impossible"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()Lcom/google/android/gms/measurement/internal/dn;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yU()Lcom/google/android/gms/measurement/internal/dn;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dn;->unregister()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yX()Lcom/google/android/gms/measurement/internal/ie;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ii;->yV()Lcom/google/android/gms/measurement/internal/ie;
 
     move-result-object v1
 
@@ -15883,30 +15883,30 @@
     return-void
 .end method
 
-.method final zf()V
+.method final zd()V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKT:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLl:Z
 
     const/4 v1, 0x1
 
     if-nez v0, :cond_3
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aKT:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLl:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->yW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFb:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFt:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -15914,46 +15914,46 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zg()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    :cond_0
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->ze()Z
 
     move-result v0
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLc:Ljava/nio/channels/FileChannel;
+    :cond_0
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ii;->zc()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLu:Ljava/nio/channels/FileChannel;
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/ii;->b(Ljava/nio/channels/FileChannel;)I
 
     move-result v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/cz;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vB()Lcom/google/android/gms/measurement/internal/cz;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->xH()I
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/cz;->xF()I
 
     move-result v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->ma()V
 
     if-le v0, v2, :cond_1
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -15972,7 +15972,7 @@
     :cond_1
     if-ge v0, v2, :cond_3
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aLc:Ljava/nio/channels/FileChannel;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aLu:Ljava/nio/channels/FileChannel;
 
     invoke-direct {p0, v2, v3}, Lcom/google/android/gms/measurement/internal/ii;->a(ILjava/nio/channels/FileChannel;)Z
 
@@ -15980,13 +15980,13 @@
 
     if-eqz v3, :cond_2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -16003,13 +16003,13 @@
     goto :goto_0
 
     :cond_2
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -16025,15 +16025,15 @@
 
     :cond_3
     :goto_0
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aKS:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aLk:Z
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIw:Lcom/google/android/gms/measurement/internal/jb;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aIO:Lcom/google/android/gms/measurement/internal/jb;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFb:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFt:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/jb;->a(Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -16041,21 +16041,21 @@
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGl:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGD:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "This instance being marked as an uploader"
 
-    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aKS:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ii;->aLk:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->zc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ii;->za()V
 
     :cond_4
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ij.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ij.smali
index cd41be796e..c01dc2abc8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ij.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ij.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private asv:Z
+.field private asN:Z
 
 
 # direct methods
@@ -12,13 +12,13 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/ig;-><init>(Lcom/google/android/gms/measurement/internal/ii;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ij;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ij;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    iget v0, p1, Lcom/google/android/gms/measurement/internal/ii;->aKW:I
+    iget v0, p1, Lcom/google/android/gms/measurement/internal/ii;->aLo:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p1, Lcom/google/android/gms/measurement/internal/ii;->aKW:I
+    iput v0, p1, Lcom/google/android/gms/measurement/internal/ii;->aLo:I
 
     return-void
 .end method
@@ -28,23 +28,23 @@
 .method public final initialize()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ij;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ij;->asN:Z
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vR()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vP()Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ij;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ij;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    iget v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aKX:I
+    iget v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aLp:I
 
     const/4 v2, 0x1
 
     add-int/2addr v1, v2
 
-    iput v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aKX:I
+    iput v1, v0, Lcom/google/android/gms/measurement/internal/ii;->aLp:I
 
-    iput-boolean v2, p0, Lcom/google/android/gms/measurement/internal/ij;->asv:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/measurement/internal/ij;->asN:Z
 
     return-void
 
@@ -61,7 +61,7 @@
 .method final isInitialized()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ij;->asv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ij;->asN:Z
 
     if-eqz v0, :cond_0
 
@@ -75,10 +75,10 @@
     return v0
 .end method
 
-.method protected abstract vR()Z
+.method protected abstract vP()Z
 .end method
 
-.method protected final vy()V
+.method protected final vw()V
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->isInitialized()Z
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ik.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ik.smali
index 45747a457e..7313a66c3b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ik.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ik.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aLk:Lcom/google/android/gms/measurement/internal/ii;
+.field private final synthetic aLC:Lcom/google/android/gms/measurement/internal/ii;
 
-.field private final synthetic aLl:Ljava/lang/String;
+.field private final synthetic aLD:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ii;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ik;->aLk:Lcom/google/android/gms/measurement/internal/ii;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ik;->aLC:Lcom/google/android/gms/measurement/internal/ii;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ik;->aLl:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ik;->aLD:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,7 +43,7 @@
         }
     .end annotation
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ik;->aLk:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ik;->aLC:Lcom/google/android/gms/measurement/internal/ii;
 
     invoke-virtual {p1, p2, p3, p4}, Lcom/google/android/gms/measurement/internal/ii;->b(ILjava/lang/Throwable;[B)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/il.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/il.smali
index 64044d215f..c3571cab1d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/il.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/il.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aLk:Lcom/google/android/gms/measurement/internal/ii;
+.field private final synthetic aLC:Lcom/google/android/gms/measurement/internal/ii;
 
-.field private final synthetic aLm:Lcom/google/android/gms/measurement/internal/io;
+.field private final synthetic aLE:Lcom/google/android/gms/measurement/internal/io;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ii;Lcom/google/android/gms/measurement/internal/io;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/il;->aLk:Lcom/google/android/gms/measurement/internal/ii;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/il;->aLC:Lcom/google/android/gms/measurement/internal/ii;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/il;->aLm:Lcom/google/android/gms/measurement/internal/io;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/il;->aLE:Lcom/google/android/gms/measurement/internal/io;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,11 +29,11 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/il;->aLk:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/il;->aLC:Lcom/google/android/gms/measurement/internal/ii;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ii;->a(Lcom/google/android/gms/measurement/internal/ii;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/il;->aLk:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/il;->aLC:Lcom/google/android/gms/measurement/internal/ii;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->start()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/im.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/im.smali
index 03753bc562..b551e6a927 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/im.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/im.smali
@@ -17,18 +17,18 @@
 
 
 # instance fields
-.field private final synthetic aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+.field private final synthetic aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
-.field private final synthetic aLk:Lcom/google/android/gms/measurement/internal/ii;
+.field private final synthetic aLC:Lcom/google/android/gms/measurement/internal/ii;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ii;Lcom/google/android/gms/measurement/internal/zzn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/im;->aLk:Lcom/google/android/gms/measurement/internal/ii;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/im;->aLC:Lcom/google/android/gms/measurement/internal/ii;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/im;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/im;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,9 +45,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/im;->aLk:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/im;->aLC:Lcom/google/android/gms/measurement/internal/ii;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/im;->aIZ:Lcom/google/android/gms/measurement/internal/zzn;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/im;->aJr:Lcom/google/android/gms/measurement/internal/zzn;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/measurement/internal/ii;->a(Lcom/google/android/gms/measurement/internal/ii;Lcom/google/android/gms/measurement/internal/zzn;)Lcom/google/android/gms/measurement/internal/ea;
 
@@ -55,17 +55,17 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/im;->aLk:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/im;->aLC:Lcom/google/android/gms/measurement/internal/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "App info was null when attempting to get app instance id"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/in.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/in.smali
index e55b833b5e..2098fb3739 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/in.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/in.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic aLk:Lcom/google/android/gms/measurement/internal/ii;
+.field private final synthetic aLC:Lcom/google/android/gms/measurement/internal/ii;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ii;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/in;->aLk:Lcom/google/android/gms/measurement/internal/ii;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/in;->aLC:Lcom/google/android/gms/measurement/internal/ii;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,7 +39,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aLk:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aLC:Lcom/google/android/gms/measurement/internal/ii;
 
     move-object v1, p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/io.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/io.smali
index d997eda769..6e752ce72c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/io.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/io.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field final arZ:Landroid/content/Context;
+.field final asr:Landroid/content/Context;
 
 
 # direct methods
@@ -20,7 +20,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/io;->arZ:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/io;->asr:Landroid/content/Context;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ip.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ip.smali
index f57806d042..c2d773a31b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ip.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ip.smali
@@ -134,7 +134,7 @@
 .method static a(Lcom/google/android/gms/internal/measurement/al$c$a;Ljava/lang/String;Ljava/lang/Object;)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al$c$a;->pt()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al$c$a;->pr()Ljava/util/List;
 
     move-result-object v0
 
@@ -172,11 +172,11 @@
     const/4 v1, -0x1
 
     :goto_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->pA()Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->py()Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v0
 
-    invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/al$e$a;->bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/al$e$a;->by(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object p1
 
@@ -219,7 +219,7 @@
 
     invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oM()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oK()Z
 
     move-result v0
 
@@ -236,13 +236,13 @@
     invoke-static {p1, p2, v1, v0}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     iget-object v1, p3, Lcom/google/android/gms/internal/measurement/ad$b;->zzus:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/df;->ck(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/df;->cg(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -252,7 +252,7 @@
 
     add-int/lit8 v0, p2, 0x1
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oJ()Lcom/google/android/gms/internal/measurement/ad$e;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oH()Lcom/google/android/gms/internal/measurement/ad$e;
 
     move-result-object v1
 
@@ -270,13 +270,13 @@
 
     invoke-virtual {p1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$e;->oY()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$e;->oW()Z
 
     move-result v3
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$e;->oZ()Lcom/google/android/gms/internal/measurement/ad$e$a;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$e;->oX()Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     move-result-object v3
 
@@ -322,7 +322,7 @@
     invoke-static {p1, v0, v4, v3}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_4
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$e;->pb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$e;->oZ()I
 
     move-result v3
 
@@ -376,7 +376,7 @@
     invoke-virtual {p1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_7
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oL()Lcom/google/android/gms/internal/measurement/ad$c;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oJ()Lcom/google/android/gms/internal/measurement/ad$c;
 
     move-result-object p3
 
@@ -407,13 +407,13 @@
 
     invoke-virtual {p0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$c;->oP()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$c;->oN()Z
 
     move-result p2
 
     if-eqz p2, :cond_1
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$c;->oQ()Lcom/google/android/gms/internal/measurement/ad$c$b;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$c;->oO()Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     move-result-object p2
 
@@ -426,7 +426,7 @@
     invoke-static {p0, p1, v0, p2}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_1
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$c;->oR()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$c;->oP()Z
 
     move-result p2
 
@@ -548,7 +548,7 @@
     invoke-virtual {p1, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
     :cond_3
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/al$i;->qf()I
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/al$i;->qd()I
 
     move-result p2
 
@@ -598,11 +598,11 @@
     invoke-virtual {p1, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object p2
 
-    invoke-virtual {p2, p4}, Lcom/google/android/gms/measurement/internal/jb;->dc(Ljava/lang/String;)Z
+    invoke-virtual {p2, p4}, Lcom/google/android/gms/measurement/internal/jb;->cY(Ljava/lang/String;)Z
 
     move-result p2
 
@@ -610,7 +610,7 @@
 
     if-eqz p2, :cond_11
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/al$i;->qg()I
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/al$i;->qe()I
 
     move-result p2
 
@@ -652,7 +652,7 @@
     invoke-virtual {p1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_7
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$b;->pk()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$b;->pi()Z
 
     move-result v5
 
@@ -676,7 +676,7 @@
 
     invoke-virtual {p1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$b;->pl()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$b;->pj()Z
 
     move-result v5
 
@@ -704,7 +704,7 @@
     invoke-virtual {p1, p4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_b
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/al$i;->qi()I
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/al$i;->qg()I
 
     move-result p2
 
@@ -744,7 +744,7 @@
     invoke-virtual {p1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_c
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$j;->pk()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$j;->pi()Z
 
     move-result p3
 
@@ -975,7 +975,7 @@
 
     if-eqz p0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al$e;->px()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al$e;->pv()Z
 
     move-result p1
 
@@ -986,7 +986,7 @@
     return-object p0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al$e;->py()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al$e;->pw()Z
 
     move-result p1
 
@@ -1001,7 +1001,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al$e;->pz()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/al$e;->px()Z
 
     move-result p1
 
@@ -1021,7 +1021,7 @@
     return-object p0
 .end method
 
-.method static cP(Ljava/lang/String;)Z
+.method static cL(Ljava/lang/String;)Z
     .locals 1
 
     if-eqz p0, :cond_0
@@ -1059,7 +1059,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p0, p1, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object p0, p1, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
     invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1067,7 +1067,7 @@
 
     if-eqz p0, :cond_0
 
-    iget-object p0, p1, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object p0, p1, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
     invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1139,15 +1139,15 @@
 
     :catch_0
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Failed to load parcelable from buffer"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -1179,7 +1179,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$a;->oC()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$a;->oA()Z
 
     move-result v1
 
@@ -1198,13 +1198,13 @@
     invoke-static {v0, v2, v3, v1}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v1
 
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ad$a;->zzug:Ljava/lang/String;
 
-    invoke-virtual {v1, v3}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v1, v3}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -1233,7 +1233,7 @@
     invoke-static {v0, v2, v3, v1}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$a;->oD()Lcom/google/android/gms/internal/measurement/ad$c;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$a;->oB()Lcom/google/android/gms/internal/measurement/ad$c;
 
     move-result-object v1
 
@@ -1304,7 +1304,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$d;->oC()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$d;->oA()Z
 
     move-result v1
 
@@ -1323,13 +1323,13 @@
     invoke-static {v0, v2, v3, v1}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v1
 
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ad$d;->zzvh:Ljava/lang/String;
 
-    invoke-virtual {v1, v3}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v1, v3}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -1360,7 +1360,7 @@
     :cond_2
     const/4 v1, 0x1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$d;->oW()Lcom/google/android/gms/internal/measurement/ad$b;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$d;->oU()Lcom/google/android/gms/internal/measurement/ad$b;
 
     move-result-object p1
 
@@ -1726,7 +1726,7 @@
     invoke-static {v2, v5, v9, v6}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_13
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/al$g;->pK()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/al$g;->pI()Z
 
     move-result v6
 
@@ -1996,7 +1996,7 @@
     invoke-static {v2, v5, v9, v6}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_22
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/al$g;->pL()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/al$g;->pJ()Z
 
     move-result v6
 
@@ -2053,7 +2053,7 @@
 
     invoke-virtual {v2, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/al$k;->qu()Z
+    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/al$k;->qs()Z
 
     move-result v15
 
@@ -2079,13 +2079,13 @@
 
     invoke-static {v2, v8, v6, v5}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v5
 
     iget-object v6, v14, Lcom/google/android/gms/internal/measurement/al$k;->zzwk:Ljava/lang/String;
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v5
 
@@ -2095,7 +2095,7 @@
 
     invoke-static {v2, v8, v11, v5}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/al$k;->py()Z
+    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/al$k;->pw()Z
 
     move-result v5
 
@@ -2115,7 +2115,7 @@
     :goto_13
     invoke-static {v2, v8, v10, v5}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/al$k;->pz()Z
+    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/al$k;->px()Z
 
     move-result v5
 
@@ -2234,7 +2234,7 @@
     invoke-static {v2, v8, v15, v7}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_2d
-    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/al$a;->pf()Lcom/google/android/gms/internal/measurement/al$i;
+    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/al$a;->pd()Lcom/google/android/gms/internal/measurement/al$i;
 
     move-result-object v7
 
@@ -2242,7 +2242,7 @@
 
     invoke-direct {v0, v2, v15, v7, v6}, Lcom/google/android/gms/measurement/internal/ip;->a(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/google/android/gms/internal/measurement/al$i;Ljava/lang/String;)V
 
-    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/al$a;->pg()Lcom/google/android/gms/internal/measurement/al$i;
+    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/al$a;->pe()Lcom/google/android/gms/internal/measurement/al$i;
 
     move-result-object v7
 
@@ -2287,19 +2287,19 @@
 
     invoke-virtual {v2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v6
 
     iget-object v7, v5, Lcom/google/android/gms/internal/measurement/al$c;->zzwk:Ljava/lang/String;
 
-    invoke-virtual {v6, v7}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v6, v7}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v6
 
     invoke-static {v2, v8, v12, v6}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/al$c;->pq()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/al$c;->po()Z
 
     move-result v6
 
@@ -2370,7 +2370,7 @@
     invoke-static {v2, v8, v7, v6}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_34
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/al$c;->po()I
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/al$c;->pm()I
 
     move-result v6
 
@@ -2408,13 +2408,13 @@
 
     invoke-virtual {v2, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v14
 
     iget-object v15, v6, Lcom/google/android/gms/internal/measurement/al$e;->zzwk:Ljava/lang/String;
 
-    invoke-virtual {v14, v15}, Lcom/google/android/gms/measurement/internal/df;->ck(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v14, v15}, Lcom/google/android/gms/measurement/internal/df;->cg(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v14
 
@@ -2424,7 +2424,7 @@
 
     invoke-static {v2, v7, v11, v14}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$e;->py()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$e;->pw()Z
 
     move-result v14
 
@@ -2444,7 +2444,7 @@
     :goto_1c
     invoke-static {v2, v7, v10, v14}, Lcom/google/android/gms/measurement/internal/ip;->b(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$e;->pz()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$e;->px()Z
 
     move-result v14
 
@@ -2501,15 +2501,15 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$e$a;->pC()Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$e$a;->pA()Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e$a;->pD()Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e$a;->pB()Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e$a;->pE()Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e$a;->pC()Lcom/google/android/gms/internal/measurement/al$e$a;
 
     instance-of v0, p2, Ljava/lang/String;
 
@@ -2517,7 +2517,7 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/internal/measurement/al$e$a;->bE(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/internal/measurement/al$e$a;->bz(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
 
     return-void
 
@@ -2552,11 +2552,11 @@
     return-void
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Ignoring invalid (type) event param value"
 
@@ -2570,15 +2570,15 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$k$a;->qx()Lcom/google/android/gms/internal/measurement/al$k$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$k$a;->qv()Lcom/google/android/gms/internal/measurement/al$k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$k$a;->qy()Lcom/google/android/gms/internal/measurement/al$k$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$k$a;->qw()Lcom/google/android/gms/internal/measurement/al$k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$k$a;->qz()Lcom/google/android/gms/internal/measurement/al$k$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$k$a;->qx()Lcom/google/android/gms/internal/measurement/al$k$a;
 
     instance-of v0, p2, Ljava/lang/String;
 
@@ -2586,7 +2586,7 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/internal/measurement/al$k$a;->bU(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/internal/measurement/al$k$a;->bP(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$k$a;
 
     return-void
 
@@ -2621,11 +2621,11 @@
     return-void
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Ignoring invalid (type) user attribute value"
 
@@ -2678,11 +2678,11 @@
 
     if-gez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Ignoring negative bit index to be cleared"
 
@@ -2703,11 +2703,11 @@
 
     if-lt v1, v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
@@ -2821,7 +2821,7 @@
 
     if-lez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -2863,10 +2863,10 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->ma()V
 
     return-void
 .end method
@@ -2876,11 +2876,11 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     invoke-static {}, Lcom/google/android/gms/measurement/internal/it;->getMessageDigest()Ljava/security/MessageDigest;
 
@@ -2888,15 +2888,15 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Failed to get MD5"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     const-wide/16 v0, 0x0
 
@@ -2968,11 +2968,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Failed to ungzip content"
 
@@ -2987,95 +2987,87 @@
     goto :goto_1
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -3083,10 +3075,18 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vx()V
+
+    return-void
+.end method
+
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
 
     return-void
 .end method
@@ -3125,11 +3125,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Failed to gzip content"
 
@@ -3138,47 +3138,47 @@
     throw p1
 .end method
 
-.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/ip;
+.method public final bridge synthetic xN()Lcom/google/android/gms/measurement/internal/ip;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/iz;
+.method public final bridge synthetic xO()Lcom/google/android/gms/measurement/internal/iz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xQ()Lcom/google/android/gms/measurement/internal/iz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xO()Lcom/google/android/gms/measurement/internal/iz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/jg;
+.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/jg;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/ee;
+.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/ee;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xS()Lcom/google/android/gms/measurement/internal/ee;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ij;->xQ()Lcom/google/android/gms/measurement/internal/ee;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final zh()Ljava/util/List;
+.method final zf()Ljava/util/List;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -3189,7 +3189,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ip;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ip;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ii;->getContext()Landroid/content/Context;
 
@@ -3216,7 +3216,7 @@
 
     invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/j;->aEG:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/j;->aEY:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v3, v1}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -3289,11 +3289,11 @@
 
     if-lt v4, v3, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Too many experiment IDs. Number of IDs"
 
@@ -3314,11 +3314,11 @@
     :catch_0
     move-exception v4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v6, "Experiment ID NumberFormatException"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iq.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iq.smali
index 2396396006..40961a80dd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iq.smali
@@ -3,11 +3,11 @@
 
 
 # instance fields
-.field final aAO:Ljava/lang/String;
+.field final aBg:Ljava/lang/String;
 
-.field final aDu:Ljava/lang/String;
+.field final aDM:Ljava/lang/String;
 
-.field final aLn:J
+.field final aLF:J
 
 .field final name:Ljava/lang/String;
 
@@ -20,19 +20,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {p6}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iq;->aDu:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iq;->aDM:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/iq;->aAO:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/iq;->aBg:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/iq;->aLn:J
+    iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/iq;->aLF:J
 
     iput-object p6, p0, Lcom/google/android/gms/measurement/internal/iq;->value:Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/is.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/is.smali
index 913bfabb7e..694c18543a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/is.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/is.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aLr:Ljavax/net/ssl/SSLSocketFactory;
+.field private final aLJ:Ljavax/net/ssl/SSLSocketFactory;
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {p0}, Ljavax/net/ssl/SSLSocketFactory;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/is;->aLr:Ljavax/net/ssl/SSLSocketFactory;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/is;->aLJ:Ljavax/net/ssl/SSLSocketFactory;
 
     return-void
 .end method
@@ -49,7 +49,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLr:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLJ:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocketFactory;->createSocket()Ljava/net/Socket;
 
@@ -72,7 +72,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLr:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLJ:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v0, p1, p2}, Ljavax/net/ssl/SSLSocketFactory;->createSocket(Ljava/lang/String;I)Ljava/net/Socket;
 
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLr:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLJ:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Ljavax/net/ssl/SSLSocketFactory;->createSocket(Ljava/lang/String;ILjava/net/InetAddress;I)Ljava/net/Socket;
 
@@ -118,7 +118,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLr:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLJ:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v0, p1, p2}, Ljavax/net/ssl/SSLSocketFactory;->createSocket(Ljava/net/InetAddress;I)Ljava/net/Socket;
 
@@ -141,7 +141,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLr:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLJ:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Ljavax/net/ssl/SSLSocketFactory;->createSocket(Ljava/net/InetAddress;ILjava/net/InetAddress;I)Ljava/net/Socket;
 
@@ -164,7 +164,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLr:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLJ:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Ljavax/net/ssl/SSLSocketFactory;->createSocket(Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket;
 
@@ -182,7 +182,7 @@
 .method public final getDefaultCipherSuites()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLr:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLJ:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocketFactory;->getDefaultCipherSuites()[Ljava/lang/String;
 
@@ -194,7 +194,7 @@
 .method public final getSupportedCipherSuites()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLr:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/is;->aLJ:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocketFactory;->getSupportedCipherSuites()[Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/it.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/it.smali
index bbb14ba720..b3e7c1b908 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/it.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/it.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field private static final aLs:[Ljava/lang/String;
+.field private static final aLK:[Ljava/lang/String;
 
-.field private static final aLw:Ljava/util/List;
+.field private static final aLO:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -17,11 +17,11 @@
 
 
 # instance fields
-.field private aLt:Ljava/security/SecureRandom;
+.field private aLL:Ljava/security/SecureRandom;
 
-.field private final aLu:Ljava/util/concurrent/atomic/AtomicLong;
+.field private final aLM:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private aLv:Ljava/lang/Integer;
+.field private aLN:Ljava/lang/Integer;
 
 .field private zzag:I
 
@@ -52,7 +52,7 @@
 
     aput-object v5, v1, v4
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/it;->aLs:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/it;->aLK:[Ljava/lang/String;
 
     const/4 v1, 0x5
 
@@ -88,7 +88,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/it;->aLw:Ljava/util/List;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/it;->aLO:Ljava/util/List;
 
     return-void
 .end method
@@ -100,7 +100,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aLv:Ljava/lang/Integer;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aLN:Ljava/lang/Integer;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -108,7 +108,7 @@
 
     invoke-direct {p1, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>(J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aLu:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aLM:Ljava/util/concurrent/atomic/AtomicLong;
 
     return-void
 .end method
@@ -178,26 +178,26 @@
 
     check-cast v1, Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aGo:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aGG:Ljava/lang/String;
 
     if-eqz v2, :cond_2
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aGo:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aGG:Ljava/lang/String;
 
     invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_0
 
     :cond_2
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aLo:Ljava/lang/Long;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aLG:Ljava/lang/Long;
 
     if-eqz v2, :cond_3
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aLo:Ljava/lang/Long;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aLG:Ljava/lang/Long;
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -208,13 +208,13 @@
     goto :goto_0
 
     :cond_3
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aLq:Ljava/lang/Double;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aLI:Ljava/lang/Double;
 
     if-eqz v2, :cond_1
 
     iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aLq:Ljava/lang/Double;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzjn;->aLI:Ljava/lang/Double;
 
     invoke-virtual {v1}, Ljava/lang/Double;->doubleValue()D
 
@@ -288,19 +288,19 @@
 
     invoke-virtual {v2, v4, v3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
     const-string v4, "origin"
 
     invoke-virtual {v2, v4, v3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-wide v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLD:J
+    iget-wide v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLV:J
 
     const-string v5, "creation_timestamp"
 
     invoke-virtual {v2, v5, v3, v4}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
@@ -308,7 +308,7 @@
 
     invoke-virtual {v2, v4, v3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzjn;->getValue()Ljava/lang/Object;
 
@@ -322,22 +322,22 @@
 
     invoke-virtual {v2, v4, v3}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLE:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLW:Ljava/lang/String;
 
     if-eqz v3, :cond_1
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLE:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLW:Ljava/lang/String;
 
     const-string v4, "trigger_event_name"
 
     invoke-virtual {v2, v4, v3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_1
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLF:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLX:Lcom/google/android/gms/measurement/internal/zzai;
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLF:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLX:Lcom/google/android/gms/measurement/internal/zzai;
 
     iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
@@ -345,17 +345,17 @@
 
     invoke-virtual {v2, v4, v3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLF:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLX:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLF:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLX:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzah;->vW()Landroid/os/Bundle;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzah;->vU()Landroid/os/Bundle;
 
     move-result-object v3
 
@@ -364,17 +364,17 @@
     invoke-virtual {v2, v4, v3}, Landroid/os/Bundle;->putBundle(Ljava/lang/String;Landroid/os/Bundle;)V
 
     :cond_2
-    iget-wide v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLG:J
+    iget-wide v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLY:J
 
     const-string v5, "trigger_timeout"
 
     invoke-virtual {v2, v5, v3, v4}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
     if-eqz v3, :cond_3
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
     iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
@@ -382,17 +382,17 @@
 
     invoke-virtual {v2, v4, v3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     if-eqz v3, :cond_3
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzah;->vW()Landroid/os/Bundle;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzah;->vU()Landroid/os/Bundle;
 
     move-result-object v3
 
@@ -401,25 +401,25 @@
     invoke-virtual {v2, v4, v3}, Landroid/os/Bundle;->putBundle(Ljava/lang/String;Landroid/os/Bundle;)V
 
     :cond_3
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/zzjn;->aLn:J
+    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/zzjn;->aLF:J
 
     const-string v5, "triggered_timestamp"
 
     invoke-virtual {v2, v5, v3, v4}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    iget-wide v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLI:J
+    iget-wide v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aMa:J
 
     const-string v5, "time_to_live"
 
     invoke-virtual {v2, v5, v3, v4}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
     if-eqz v3, :cond_4
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
     iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
@@ -427,17 +427,17 @@
 
     invoke-virtual {v2, v4, v3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     if-eqz v3, :cond_4
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzah;->vW()Landroid/os/Bundle;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzah;->vU()Landroid/os/Bundle;
 
     move-result-object v1
 
@@ -727,11 +727,11 @@
 
     if-nez v1, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {p5}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -779,11 +779,11 @@
 
     if-nez v1, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {p5}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -817,11 +817,11 @@
 
     if-le p5, p3, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {p4}, Ljava/lang/String;->length()I
 
@@ -1296,10 +1296,10 @@
     return p0
 .end method
 
-.method static cQ(Ljava/lang/String;)Z
+.method static cM(Ljava/lang/String;)Z
     .locals 3
 
-    invoke-static {p0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const/4 v0, 0x0
 
@@ -1331,7 +1331,7 @@
     return p0
 .end method
 
-.method private static cT(Ljava/lang/String;)Z
+.method private static cP(Ljava/lang/String;)Z
     .locals 1
 
     invoke-static {p0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
@@ -1345,7 +1345,7 @@
     return p0
 .end method
 
-.method private static cU(Ljava/lang/String;)I
+.method private static cQ(Ljava/lang/String;)I
     .locals 1
 
     const-string v0, "_ldl"
@@ -1379,7 +1379,7 @@
     return p0
 .end method
 
-.method static cW(Ljava/lang/String;)Z
+.method static cS(Ljava/lang/String;)Z
     .locals 1
 
     invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
@@ -1649,7 +1649,7 @@
     return-object p0
 
     :cond_0
-    invoke-static {p0}, Lcom/google/android/gms/measurement/internal/it;->cW(Ljava/lang/String;)Z
+    invoke-static {p0}, Lcom/google/android/gms/measurement/internal/it;->cS(Ljava/lang/String;)Z
 
     move-result p0
 
@@ -1744,11 +1744,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Package name not found"
 
@@ -1759,11 +1759,11 @@
     :catch_1
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Error obtaining certificate"
 
@@ -1787,7 +1787,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {p0}, Lcom/google/android/gms/measurement/internal/it;->cU(Ljava/lang/String;)I
+    invoke-static {p0}, Lcom/google/android/gms/measurement/internal/it;->cQ(Ljava/lang/String;)I
 
     move-result p0
 
@@ -1800,7 +1800,7 @@
     return-object p0
 
     :cond_0
-    invoke-static {p0}, Lcom/google/android/gms/measurement/internal/it;->cU(Ljava/lang/String;)I
+    invoke-static {p0}, Lcom/google/android/gms/measurement/internal/it;->cQ(Ljava/lang/String;)I
 
     move-result p0
 
@@ -1882,11 +1882,11 @@
 
     if-nez p2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Name is required and can\'t be null. Type"
 
@@ -1901,11 +1901,11 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Name is required and can\'t be empty. Type"
 
@@ -1924,11 +1924,11 @@
 
     if-nez v2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Name must start with a letter. Type, name"
 
@@ -1962,11 +1962,11 @@
 
     if-nez v4, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Name must consist of letters, digits or _ (underscores). Type, name"
 
@@ -1996,11 +1996,11 @@
 
     if-nez p2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Name is required and can\'t be null. Type"
 
@@ -2015,11 +2015,11 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Name is required and can\'t be empty. Type"
 
@@ -2042,11 +2042,11 @@
 
     if-eq v1, v3, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Name must start with a letter or _ (underscore). Type, name"
 
@@ -2078,11 +2078,11 @@
 
     if-nez v5, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Name must consist of letters, digits or _ (underscores). Type, name"
 
@@ -2116,15 +2116,15 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/it;->cT(Ljava/lang/String;)Z
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/it;->cP(Ljava/lang/String;)Z
 
     move-result p2
 
     if-nez p2, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ek;->aAP:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ek;->aBh:Ljava/lang/String;
 
     invoke-static {p2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -2132,13 +2132,13 @@
 
     if-eqz p2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -2156,19 +2156,19 @@
 
     if-nez p1, :cond_3
 
-    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/it;->cT(Ljava/lang/String;)Z
+    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/it;->cP(Ljava/lang/String;)Z
 
     move-result p1
 
     if-nez p1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p2
 
@@ -2184,9 +2184,9 @@
     return p1
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/ek;->aAP:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/ek;->aBh:Ljava/lang/String;
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -2194,15 +2194,15 @@
 
     if-eqz p1, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Missing google_app_id. Firebase Analytics disabled. See https://goo.gl/NAOOOI"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_4
     return v1
@@ -2239,11 +2239,11 @@
 
     invoke-direct {v11, v8}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFl:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFD:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v7, v1}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -2417,7 +2417,7 @@
 
     move-result-object v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     if-eqz p6, :cond_d
 
@@ -2451,11 +2451,11 @@
 
     if-le v0, v1, :cond_c
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -2486,11 +2486,11 @@
     goto :goto_a
 
     :cond_d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aEH:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aEZ:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v7, v1}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -2498,14 +2498,14 @@
 
     if-eqz v0, :cond_e
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/it;->cW(Ljava/lang/String;)Z
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/it;->cS(Ljava/lang/String;)Z
 
     move-result v0
 
     if-nez v0, :cond_f
 
     :cond_e
-    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/it;->cW(Ljava/lang/String;)Z
+    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/it;->cS(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -2609,7 +2609,7 @@
     goto/16 :goto_1
 
     :cond_13
-    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/it;->cQ(Ljava/lang/String;)Z
+    invoke-static {v15}, Lcom/google/android/gms/measurement/internal/it;->cM(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -2635,23 +2635,23 @@
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v2
 
     move-object/from16 v3, p2
 
-    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v4
 
@@ -2695,7 +2695,7 @@
     return-object p1
 
     :cond_0
-    invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/it;->cR(Ljava/lang/String;)I
+    invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/it;->cN(Ljava/lang/String;)I
 
     move-result v0
 
@@ -2760,17 +2760,17 @@
     return-object p3
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -2874,17 +2874,17 @@
     const/4 p1, 0x0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
-    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->ck(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->cg(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -2917,13 +2917,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Error returning int value to wrapper"
 
@@ -2953,13 +2953,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Error returning long value to wrapper"
 
@@ -2981,13 +2981,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Error returning bundle value to wrapper"
 
@@ -3026,13 +3026,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Error returning bundle list to wrapper"
 
@@ -3062,13 +3062,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Error returning boolean value to wrapper"
 
@@ -3098,13 +3098,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Error returning byte array to wrapper"
 
@@ -3122,11 +3122,11 @@
 
     invoke-static {v0, p2}, Lcom/google/android/gms/measurement/internal/it;->a(Landroid/os/Bundle;I)Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFe:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aFw:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v1, p1, v2}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -3181,9 +3181,9 @@
     invoke-virtual {v0, p3, p1, p2}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object p1
 
@@ -3203,11 +3203,11 @@
 
     if-nez p3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Name is required and can\'t be null. Type"
 
@@ -3218,7 +3218,7 @@
     :cond_0
     invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/it;->aLs:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/it;->aLK:[Ljava/lang/String;
 
     array-length v2, v1
 
@@ -3252,11 +3252,11 @@
     :goto_1
     if-eqz v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Name starts with reserved prefix. Type, name"
 
@@ -3299,11 +3299,11 @@
     :goto_3
     if-eqz p2, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Name is reserved. Type, name"
 
@@ -3319,9 +3319,9 @@
     .locals 6
 
     :try_start_0
-    invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const-string p1, "https://www.googleadservices.com/pagead/conversion/app/deeplink?id_type=adid&sdk_version=%s&rdid=%s&bundleid=%s"
 
@@ -3345,7 +3345,7 @@
 
     aput-object v3, v2, v4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/it;->zk()I
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/it;->zi()I
 
     move-result v3
 
@@ -3389,11 +3389,11 @@
     move-exception p1
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-virtual {p1}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
 
@@ -3423,11 +3423,11 @@
 
     if-eqz v5, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -3466,13 +3466,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Error returning string value to wrapper"
 
@@ -3488,11 +3488,11 @@
 
     if-nez p3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Name is required and can\'t be null. Type"
 
@@ -3511,11 +3511,11 @@
 
     if-le v1, p2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGh:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGz:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -3533,7 +3533,7 @@
     return p1
 .end method
 
-.method final cR(Ljava/lang/String;)I
+.method final cN(Ljava/lang/String;)I
     .locals 3
 
     const-string v0, "event"
@@ -3549,7 +3549,7 @@
     return v2
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fl;->aJi:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fl;->aJA:[Ljava/lang/String;
 
     invoke-virtual {p0, v0, v1, p1}, Lcom/google/android/gms/measurement/internal/it;->a(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -3578,7 +3578,7 @@
     return p1
 .end method
 
-.method final cS(Ljava/lang/String;)I
+.method final cO(Ljava/lang/String;)I
     .locals 3
 
     const-string v0, "user property"
@@ -3594,7 +3594,7 @@
     return v2
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fn;->aJk:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fn;->aJC:[Ljava/lang/String;
 
     invoke-virtual {p0, v0, v1, p1}, Lcom/google/android/gms/measurement/internal/it;->a(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -3623,10 +3623,10 @@
     return p1
 .end method
 
-.method final cV(Ljava/lang/String;)Z
+.method final cR(Ljava/lang/String;)Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
@@ -3647,11 +3647,11 @@
     return p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGm:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGE:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Permission not granted"
 
@@ -3662,7 +3662,7 @@
     return p1
 .end method
 
-.method final cX(Ljava/lang/String;)Z
+.method final cT(Ljava/lang/String;)Z
     .locals 1
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
@@ -3676,11 +3676,11 @@
     return p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->zu()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->zs()Ljava/lang/String;
 
     move-result-object v0
 
@@ -3731,17 +3731,17 @@
 
     if-nez v3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGk:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGC:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v4
 
-    invoke-virtual {v4, v2}, Lcom/google/android/gms/measurement/internal/df;->ck(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v2}, Lcom/google/android/gms/measurement/internal/df;->cg(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -3770,10 +3770,10 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->ma()V
 
     return-void
 .end method
@@ -3781,11 +3781,11 @@
 .method final o(Landroid/content/Context;Ljava/lang/String;)J
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-virtual {p1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -3801,15 +3801,15 @@
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Could not get MD5 instance"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -3872,15 +3872,15 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Could not get signatures"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -3889,11 +3889,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Package name not found"
 
@@ -3917,7 +3917,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/it;->cU(Ljava/lang/String;)I
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/it;->cQ(Ljava/lang/String;)I
 
     move-result v4
 
@@ -3938,7 +3938,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/it;->cU(Ljava/lang/String;)I
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/it;->cQ(Ljava/lang/String;)I
 
     move-result v3
 
@@ -4188,11 +4188,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Install referrer url isn\'t a hierarchical URI"
 
@@ -4201,95 +4201,87 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic vA()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vA()V
-
-    return-void
-.end method
-
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vG()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -4297,18 +4289,26 @@
     return v0
 .end method
 
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vx()V
 
     return-void
 .end method
 
-.method protected final xF()V
+.method public final bridge synthetic vy()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fg;->vy()V
+
+    return-void
+.end method
+
+.method protected final xD()V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     new-instance v0, Ljava/security/SecureRandom;
 
@@ -4332,28 +4332,28 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Utils falling back to Random for random id"
 
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLu:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLM:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->set(J)V
 
     return-void
 .end method
 
-.method public final zi()J
+.method public final zg()J
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLu:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLM:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -4365,7 +4365,7 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLu:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLM:Ljava/util/concurrent/atomic/AtomicLong;
 
     monitor-enter v0
 
@@ -4376,7 +4376,7 @@
 
     move-result-wide v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v4
 
@@ -4416,12 +4416,12 @@
     throw v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLu:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLM:Ljava/util/concurrent/atomic/AtomicLong;
 
     monitor-enter v0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/it;->aLu:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/it;->aLM:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-wide/16 v2, -0x1
 
@@ -4429,7 +4429,7 @@
 
     invoke-virtual {v1, v2, v3, v4, v5}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/it;->aLu:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/it;->aLM:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
 
@@ -4449,12 +4449,12 @@
     throw v1
 .end method
 
-.method final zj()Ljava/security/SecureRandom;
+.method final zh()Ljava/security/SecureRandom;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLt:Ljava/security/SecureRandom;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLL:Ljava/security/SecureRandom;
 
     if-nez v0, :cond_0
 
@@ -4462,22 +4462,22 @@
 
     invoke-direct {v0}, Ljava/security/SecureRandom;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLt:Ljava/security/SecureRandom;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLL:Ljava/security/SecureRandom;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLt:Ljava/security/SecureRandom;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLL:Ljava/security/SecureRandom;
 
     return-object v0
 .end method
 
-.method public final zk()I
+.method public final zi()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLv:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLN:Ljava/lang/Integer;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lb()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kZ()Lcom/google/android/gms/common/c;
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
@@ -4493,10 +4493,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLv:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLN:Ljava/lang/Integer;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLv:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aLN:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -4505,10 +4505,10 @@
     return v0
 .end method
 
-.method public final zl()I
+.method public final zj()I
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lb()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kZ()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
@@ -4525,14 +4525,14 @@
     return v0
 .end method
 
-.method final zm()Ljava/lang/String;
+.method final zk()Ljava/lang/String;
     .locals 5
 
     const/16 v0, 0x10
 
     new-array v0, v0, [B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/it;->zj()Ljava/security/SecureRandom;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/it;->zh()Ljava/security/SecureRandom;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iu.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iu.smali
index f7c9f21d23..b308aee4f0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iu.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aLx:Ljavax/net/ssl/SSLSocket;
+.field private final aLP:Ljavax/net/ssl/SSLSocket;
 
 
 # direct methods
@@ -12,7 +12,7 @@
 
     invoke-direct {p0}, Ljavax/net/ssl/SSLSocket;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     return-void
 .end method
@@ -22,7 +22,7 @@
 .method public final addHandshakeCompletedListener(Ljavax/net/ssl/HandshakeCompletedListener;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->addHandshakeCompletedListener(Ljavax/net/ssl/HandshakeCompletedListener;)V
 
@@ -37,7 +37,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->bind(Ljava/net/SocketAddress;)V
 
@@ -55,7 +55,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->close()V
     :try_end_0
@@ -81,7 +81,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->connect(Ljava/net/SocketAddress;)V
 
@@ -96,7 +96,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1, p2}, Ljavax/net/ssl/SSLSocket;->connect(Ljava/net/SocketAddress;I)V
 
@@ -106,7 +106,7 @@
 .method public final equals(Ljava/lang/Object;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -118,7 +118,7 @@
 .method public final getChannel()Ljava/nio/channels/SocketChannel;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getChannel()Ljava/nio/channels/SocketChannel;
 
@@ -130,7 +130,7 @@
 .method public final getEnableSessionCreation()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getEnableSessionCreation()Z
 
@@ -142,7 +142,7 @@
 .method public final getEnabledCipherSuites()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
 
@@ -154,7 +154,7 @@
 .method public final getEnabledProtocols()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
 
@@ -166,7 +166,7 @@
 .method public final getInetAddress()Ljava/net/InetAddress;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getInetAddress()Ljava/net/InetAddress;
 
@@ -183,7 +183,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getInputStream()Ljava/io/InputStream;
 
@@ -200,7 +200,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getKeepAlive()Z
 
@@ -212,7 +212,7 @@
 .method public final getLocalAddress()Ljava/net/InetAddress;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getLocalAddress()Ljava/net/InetAddress;
 
@@ -224,7 +224,7 @@
 .method public final getLocalPort()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getLocalPort()I
 
@@ -236,7 +236,7 @@
 .method public final getLocalSocketAddress()Ljava/net/SocketAddress;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getLocalSocketAddress()Ljava/net/SocketAddress;
 
@@ -248,7 +248,7 @@
 .method public final getNeedClientAuth()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getNeedClientAuth()Z
 
@@ -265,7 +265,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getOOBInline()Z
 
@@ -282,7 +282,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getOutputStream()Ljava/io/OutputStream;
 
@@ -294,7 +294,7 @@
 .method public final getPort()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getPort()I
 
@@ -314,7 +314,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getReceiveBufferSize()I
 
@@ -337,7 +337,7 @@
 .method public final getRemoteSocketAddress()Ljava/net/SocketAddress;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getRemoteSocketAddress()Ljava/net/SocketAddress;
 
@@ -354,7 +354,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getReuseAddress()Z
 
@@ -374,7 +374,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getSendBufferSize()I
 
@@ -397,7 +397,7 @@
 .method public final getSession()Ljavax/net/ssl/SSLSession;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getSession()Ljavax/net/ssl/SSLSession;
 
@@ -414,7 +414,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getSoLinger()I
 
@@ -434,7 +434,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getSoTimeout()I
 
@@ -457,7 +457,7 @@
 .method public final getSupportedCipherSuites()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getSupportedCipherSuites()[Ljava/lang/String;
 
@@ -469,7 +469,7 @@
 .method public final getSupportedProtocols()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getSupportedProtocols()[Ljava/lang/String;
 
@@ -486,7 +486,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getTcpNoDelay()Z
 
@@ -503,7 +503,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getTrafficClass()I
 
@@ -515,7 +515,7 @@
 .method public final getUseClientMode()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getUseClientMode()Z
 
@@ -527,7 +527,7 @@
 .method public final getWantClientAuth()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getWantClientAuth()Z
 
@@ -539,7 +539,7 @@
 .method public final isBound()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->isBound()Z
 
@@ -551,7 +551,7 @@
 .method public final isClosed()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->isClosed()Z
 
@@ -563,7 +563,7 @@
 .method public final isConnected()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->isConnected()Z
 
@@ -575,7 +575,7 @@
 .method public final isInputShutdown()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->isInputShutdown()Z
 
@@ -587,7 +587,7 @@
 .method public final isOutputShutdown()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->isOutputShutdown()Z
 
@@ -599,7 +599,7 @@
 .method public final removeHandshakeCompletedListener(Ljavax/net/ssl/HandshakeCompletedListener;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->removeHandshakeCompletedListener(Ljavax/net/ssl/HandshakeCompletedListener;)V
 
@@ -614,7 +614,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->sendUrgentData(I)V
 
@@ -624,7 +624,7 @@
 .method public final setEnableSessionCreation(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setEnableSessionCreation(Z)V
 
@@ -634,7 +634,7 @@
 .method public final setEnabledCipherSuites([Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setEnabledCipherSuites([Ljava/lang/String;)V
 
@@ -660,7 +660,7 @@
 
     new-instance p1, Ljava/util/ArrayList;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
 
@@ -696,7 +696,7 @@
     check-cast p1, [Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setEnabledProtocols([Ljava/lang/String;)V
 
@@ -711,7 +711,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setKeepAlive(Z)V
 
@@ -721,7 +721,7 @@
 .method public final setNeedClientAuth(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setNeedClientAuth(Z)V
 
@@ -736,7 +736,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setOOBInline(Z)V
 
@@ -746,7 +746,7 @@
 .method public final setPerformancePreferences(III)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1, p2, p3}, Ljavax/net/ssl/SSLSocket;->setPerformancePreferences(III)V
 
@@ -764,7 +764,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setReceiveBufferSize(I)V
     :try_end_0
@@ -790,7 +790,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setReuseAddress(Z)V
 
@@ -808,7 +808,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setSendBufferSize(I)V
     :try_end_0
@@ -834,7 +834,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1, p2}, Ljavax/net/ssl/SSLSocket;->setSoLinger(ZI)V
 
@@ -852,7 +852,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setSoTimeout(I)V
     :try_end_0
@@ -878,7 +878,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setTcpNoDelay(Z)V
 
@@ -893,7 +893,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setTrafficClass(I)V
 
@@ -903,7 +903,7 @@
 .method public final setUseClientMode(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setUseClientMode(Z)V
 
@@ -913,7 +913,7 @@
 .method public final setWantClientAuth(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setWantClientAuth(Z)V
 
@@ -928,7 +928,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->shutdownInput()V
 
@@ -943,7 +943,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->shutdownOutput()V
 
@@ -958,7 +958,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->startHandshake()V
 
@@ -968,7 +968,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aLP:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iv.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iv.smali
index 0b72bbb4de..46f925c9ac 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iv.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic aJD:Lcom/google/android/gms/internal/measurement/ln;
+.field private final synthetic aJV:Lcom/google/android/gms/internal/measurement/ln;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/ln;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iv;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iv;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/iv;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/iv;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,21 +29,21 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->yD()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->yB()Z
 
     move-result v2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iw.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iw.smali
index 3ee1b0533b..89049b5b12 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iw.smali
@@ -6,26 +6,26 @@
 
 
 # instance fields
-.field private final synthetic aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic aJD:Lcom/google/android/gms/internal/measurement/ln;
+.field private final synthetic aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-.field private final synthetic aqn:Ljava/lang/String;
+.field private final synthetic aqF:Ljava/lang/String;
 
-.field private final synthetic aqo:Ljava/lang/String;
+.field private final synthetic aqG:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/ln;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iw;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iw;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/iw;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/iw;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/iw;->aqn:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/iw;->aqF:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/iw;->aqo:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/iw;->aqG:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,19 +37,19 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iw;->aDf:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iw;->aDx:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vE()Lcom/google/android/gms/measurement/internal/gw;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/gw;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iw;->aJD:Lcom/google/android/gms/internal/measurement/ln;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iw;->aJV:Lcom/google/android/gms/internal/measurement/ln;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iw;->aqn:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iw;->aqF:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/iw;->aqo:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/iw;->aqG:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/gw;->a(Lcom/google/android/gms/internal/measurement/ln;Ljava/lang/String;Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iy.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iy.smali
index 9c2cff55a0..90140ab89a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iy.smali
@@ -3,9 +3,9 @@
 
 
 # static fields
-.field static final synthetic aLA:[I
+.field static final synthetic aLS:[I
 
-.field static final synthetic aLB:[I
+.field static final synthetic aLT:[I
 
 
 # direct methods
@@ -20,14 +20,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/iy;->aLB:[I
+    sput-object v0, Lcom/google/android/gms/measurement/internal/iy;->aLT:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/iy;->aLB:[I
+    sget-object v1, Lcom/google/android/gms/measurement/internal/iy;->aLT:[I
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqP:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ad$c$b;->arh:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ad$c$b;->ordinal()I
 
@@ -41,9 +41,9 @@
     const/4 v1, 0x2
 
     :try_start_1
-    sget-object v2, Lcom/google/android/gms/measurement/internal/iy;->aLB:[I
+    sget-object v2, Lcom/google/android/gms/measurement/internal/iy;->aLT:[I
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqQ:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/ad$c$b;->ari:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ad$c$b;->ordinal()I
 
@@ -57,9 +57,9 @@
     const/4 v2, 0x3
 
     :try_start_2
-    sget-object v3, Lcom/google/android/gms/measurement/internal/iy;->aLB:[I
+    sget-object v3, Lcom/google/android/gms/measurement/internal/iy;->aLT:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqR:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/ad$c$b;->arj:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ad$c$b;->ordinal()I
 
@@ -73,9 +73,9 @@
     const/4 v3, 0x4
 
     :try_start_3
-    sget-object v4, Lcom/google/android/gms/measurement/internal/iy;->aLB:[I
+    sget-object v4, Lcom/google/android/gms/measurement/internal/iy;->aLT:[I
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqS:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/ad$c$b;->ark:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ad$c$b;->ordinal()I
 
@@ -94,12 +94,12 @@
 
     new-array v4, v4, [I
 
-    sput-object v4, Lcom/google/android/gms/measurement/internal/iy;->aLA:[I
+    sput-object v4, Lcom/google/android/gms/measurement/internal/iy;->aLS:[I
 
     :try_start_4
-    sget-object v4, Lcom/google/android/gms/measurement/internal/iy;->aLA:[I
+    sget-object v4, Lcom/google/android/gms/measurement/internal/iy;->aLS:[I
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqW:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/ad$e$a;->aro:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ad$e$a;->ordinal()I
 
@@ -111,9 +111,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v0, Lcom/google/android/gms/measurement/internal/iy;->aLA:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/iy;->aLS:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqX:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/ad$e$a;->arp:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ad$e$a;->ordinal()I
 
@@ -125,9 +125,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v0, Lcom/google/android/gms/measurement/internal/iy;->aLA:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/iy;->aLS:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqY:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->arq:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$e$a;->ordinal()I
 
@@ -139,9 +139,9 @@
 
     :catch_6
     :try_start_7
-    sget-object v0, Lcom/google/android/gms/measurement/internal/iy;->aLA:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/iy;->aLS:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqZ:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->arr:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$e$a;->ordinal()I
 
@@ -153,9 +153,9 @@
 
     :catch_7
     :try_start_8
-    sget-object v0, Lcom/google/android/gms/measurement/internal/iy;->aLA:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/iy;->aLS:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->ara:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->ars:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$e$a;->ordinal()I
 
@@ -169,9 +169,9 @@
 
     :catch_8
     :try_start_9
-    sget-object v0, Lcom/google/android/gms/measurement/internal/iy;->aLA:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/iy;->aLS:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->arb:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->art:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$e$a;->ordinal()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iz.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iz.smali
index bc5862cdd7..bcdb731cbf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/iz.smali
@@ -97,7 +97,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$a;->oD()Lcom/google/android/gms/internal/measurement/ad$c;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$a;->oB()Lcom/google/android/gms/internal/measurement/ad$c;
 
     move-result-object v0
 
@@ -152,17 +152,17 @@
 
     if-eqz v4, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -210,7 +210,7 @@
 
     if-eqz v4, :cond_5
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e;->py()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e;->pw()Z
 
     move-result v4
 
@@ -218,7 +218,7 @@
 
     iget-object v4, v0, Lcom/google/android/gms/internal/measurement/al$e;->zzwk:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e;->py()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e;->pw()Z
 
     move-result v5
 
@@ -241,7 +241,7 @@
     goto :goto_2
 
     :cond_7
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e;->pz()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e;->px()Z
 
     move-result v4
 
@@ -249,7 +249,7 @@
 
     iget-object v4, v0, Lcom/google/android/gms/internal/measurement/al$e;->zzwk:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e;->pz()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e;->px()Z
 
     move-result v5
 
@@ -272,7 +272,7 @@
     goto :goto_2
 
     :cond_9
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e;->px()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/al$e;->pv()Z
 
     move-result v4
 
@@ -287,27 +287,27 @@
     goto :goto_2
 
     :cond_a
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
     iget-object p4, v0, Lcom/google/android/gms/internal/measurement/al$e;->zzwk:Ljava/lang/String;
 
-    invoke-virtual {p3, p4}, Lcom/google/android/gms/measurement/internal/df;->ck(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p4}, Lcom/google/android/gms/measurement/internal/df;->cg(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p3
 
@@ -337,7 +337,7 @@
 
     check-cast p3, Lcom/google/android/gms/internal/measurement/ad$b;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oM()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oK()Z
 
     move-result p4
 
@@ -363,17 +363,17 @@
 
     if-eqz v4, :cond_e
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -392,31 +392,31 @@
 
     if-eqz v5, :cond_11
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oK()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oI()Z
 
     move-result v5
 
     if-nez v5, :cond_f
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/df;->ck(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/df;->cg(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p3
 
@@ -433,7 +433,7 @@
 
     move-result-wide v4
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oL()Lcom/google/android/gms/internal/measurement/ad$c;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oJ()Lcom/google/android/gms/internal/measurement/ad$c;
 
     move-result-object p3
 
@@ -461,31 +461,31 @@
 
     if-eqz v5, :cond_14
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oK()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oI()Z
 
     move-result v5
 
     if-nez v5, :cond_12
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/df;->ck(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/df;->cg(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p3
 
@@ -502,7 +502,7 @@
 
     move-result-wide v4
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oL()Lcom/google/android/gms/internal/measurement/ad$c;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oJ()Lcom/google/android/gms/internal/measurement/ad$c;
 
     move-result-object p3
 
@@ -530,7 +530,7 @@
 
     if-eqz v5, :cond_19
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oI()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oG()Z
 
     move-result v5
 
@@ -538,7 +538,7 @@
 
     check-cast v4, Ljava/lang/String;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oJ()Lcom/google/android/gms/internal/measurement/ad$e;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oH()Lcom/google/android/gms/internal/measurement/ad$e;
 
     move-result-object p3
 
@@ -549,7 +549,7 @@
     goto :goto_6
 
     :cond_15
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oK()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oI()Z
 
     move-result v5
 
@@ -557,13 +557,13 @@
 
     check-cast v4, Ljava/lang/String;
 
-    invoke-static {v4}, Lcom/google/android/gms/measurement/internal/ip;->cP(Ljava/lang/String;)Z
+    invoke-static {v4}, Lcom/google/android/gms/measurement/internal/ip;->cL(Ljava/lang/String;)Z
 
     move-result v5
 
     if-eqz v5, :cond_17
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oL()Lcom/google/android/gms/internal/measurement/ad$c;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$b;->oJ()Lcom/google/android/gms/internal/measurement/ad$c;
 
     move-result-object p3
 
@@ -588,25 +588,25 @@
     return-object p1
 
     :cond_17
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/df;->ck(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/df;->cg(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p3
 
@@ -617,25 +617,25 @@
     return-object v3
 
     :cond_18
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/df;->ck(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/df;->cg(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p3
 
@@ -648,25 +648,25 @@
     :cond_19
     if-nez v4, :cond_1a
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/df;->ck(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/df;->cg(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p3
 
@@ -679,25 +679,25 @@
     return-object p1
 
     :cond_1a
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, p2}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object p3
 
-    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/df;->ck(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/df;->cg(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p3
 
@@ -716,13 +716,13 @@
 .method private final a(Lcom/google/android/gms/internal/measurement/ad$d;Lcom/google/android/gms/internal/measurement/al$k;)Ljava/lang/Boolean;
     .locals 3
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$d;->oW()Lcom/google/android/gms/internal/measurement/ad$b;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$d;->oU()Lcom/google/android/gms/internal/measurement/ad$b;
 
     move-result-object p1
 
     iget-boolean v0, p1, Lcom/google/android/gms/internal/measurement/ad$b;->zzur:Z
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/al$k;->py()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/al$k;->pw()Z
 
     move-result v1
 
@@ -730,25 +730,25 @@
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oK()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oI()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     iget-object p2, p2, Lcom/google/android/gms/internal/measurement/al$k;->zzwk:Ljava/lang/String;
 
-    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -761,7 +761,7 @@
     :cond_0
     iget-wide v1, p2, Lcom/google/android/gms/internal/measurement/al$k;->zzwp:J
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oL()Lcom/google/android/gms/internal/measurement/ad$c;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oJ()Lcom/google/android/gms/internal/measurement/ad$c;
 
     move-result-object p1
 
@@ -776,31 +776,31 @@
     return-object p1
 
     :cond_1
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/al$k;->pz()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/al$k;->px()Z
 
     move-result v1
 
     if-eqz v1, :cond_3
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oK()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oI()Z
 
     move-result v1
 
     if-nez v1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     iget-object p2, p2, Lcom/google/android/gms/internal/measurement/al$k;->zzwk:Ljava/lang/String;
 
-    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -813,7 +813,7 @@
     :cond_2
     iget-wide v1, p2, Lcom/google/android/gms/internal/measurement/al$k;->zzwt:D
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oL()Lcom/google/android/gms/internal/measurement/ad$c;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oJ()Lcom/google/android/gms/internal/measurement/ad$c;
 
     move-result-object p1
 
@@ -828,37 +828,37 @@
     return-object p1
 
     :cond_3
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/al$k;->px()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/al$k;->pv()Z
 
     move-result v1
 
     if-eqz v1, :cond_7
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oI()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oG()Z
 
     move-result v1
 
     if-nez v1, :cond_6
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oK()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oI()Z
 
     move-result v1
 
     if-nez v1, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     iget-object p2, p2, Lcom/google/android/gms/internal/measurement/al$k;->zzwk:Ljava/lang/String;
 
-    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -871,7 +871,7 @@
     :cond_4
     iget-object v1, p2, Lcom/google/android/gms/internal/measurement/al$k;->zzwr:Ljava/lang/String;
 
-    invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ip;->cP(Ljava/lang/String;)Z
+    invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ip;->cL(Ljava/lang/String;)Z
 
     move-result v1
 
@@ -879,7 +879,7 @@
 
     iget-object p2, p2, Lcom/google/android/gms/internal/measurement/al$k;->zzwr:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oL()Lcom/google/android/gms/internal/measurement/ad$c;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oJ()Lcom/google/android/gms/internal/measurement/ad$c;
 
     move-result-object p1
 
@@ -894,19 +894,19 @@
     return-object p1
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     iget-object v1, p2, Lcom/google/android/gms/internal/measurement/al$k;->zzwk:Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -922,7 +922,7 @@
     :cond_6
     iget-object p2, p2, Lcom/google/android/gms/internal/measurement/al$k;->zzwr:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oJ()Lcom/google/android/gms/internal/measurement/ad$e;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$b;->oH()Lcom/google/android/gms/internal/measurement/ad$e;
 
     move-result-object p1
 
@@ -937,19 +937,19 @@
     return-object p1
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v0
 
     iget-object p2, p2, Lcom/google/android/gms/internal/measurement/al$k;->zzwk:Ljava/lang/String;
 
-    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, p2}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -994,7 +994,7 @@
 .method private static a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/ad$c;)Ljava/lang/Boolean;
     .locals 4
 
-    invoke-static {p0}, Lcom/google/android/gms/measurement/internal/ip;->cP(Ljava/lang/String;)Z
+    invoke-static {p0}, Lcom/google/android/gms/measurement/internal/ip;->cL(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -1049,7 +1049,7 @@
     return-object v0
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->arb:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->art:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     if-ne p2, v1, :cond_2
 
@@ -1072,7 +1072,7 @@
     :cond_3
     if-nez p3, :cond_5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqW:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->aro:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     if-ne p2, v1, :cond_4
 
@@ -1087,7 +1087,7 @@
 
     :cond_5
     :goto_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/iy;->aLA:[I
+    sget-object v1, Lcom/google/android/gms/measurement/internal/iy;->aLS:[I
 
     invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e$a;->ordinal()I
 
@@ -1187,11 +1187,11 @@
     return-object p1
 
     :catch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Invalid regular expression in REGEXP audience filter. expression"
 
@@ -1224,32 +1224,32 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->oY()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->oW()Z
 
     move-result v1
 
     if-eqz v1, :cond_a
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->oZ()Lcom/google/android/gms/internal/measurement/ad$e$a;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->oX()Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqV:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ad$e$a;->arn:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     if-ne v1, v2, :cond_1
 
     goto/16 :goto_6
 
     :cond_1
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->oZ()Lcom/google/android/gms/internal/measurement/ad$e$a;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->oX()Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ad$e$a;->arb:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ad$e$a;->art:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     if-ne v1, v2, :cond_2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->pb()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->oZ()I
 
     move-result v1
 
@@ -1258,7 +1258,7 @@
     return-object v0
 
     :cond_2
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->pa()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->oY()Z
 
     move-result v1
 
@@ -1267,7 +1267,7 @@
     return-object v0
 
     :cond_3
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->oZ()Lcom/google/android/gms/internal/measurement/ad$e$a;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->oX()Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     move-result-object v4
 
@@ -1275,11 +1275,11 @@
 
     if-nez v5, :cond_5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqW:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->aro:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     if-eq v4, v1, :cond_5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->arb:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad$e$a;->art:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     if-ne v4, v1, :cond_4
 
@@ -1303,7 +1303,7 @@
     :goto_1
     move-object v6, v1
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->pb()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ad$e;->oZ()I
 
     move-result v1
 
@@ -1367,7 +1367,7 @@
     goto :goto_2
 
     :goto_4
-    sget-object p2, Lcom/google/android/gms/internal/measurement/ad$e$a;->aqW:Lcom/google/android/gms/internal/measurement/ad$e$a;
+    sget-object p2, Lcom/google/android/gms/internal/measurement/ad$e$a;->aro:Lcom/google/android/gms/internal/measurement/ad$e$a;
 
     if-ne v4, p2, :cond_9
 
@@ -1399,7 +1399,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$c;->oP()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$c;->oN()Z
 
     move-result v0
 
@@ -1407,22 +1407,22 @@
 
     if-eqz v0, :cond_17
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$c;->oQ()Lcom/google/android/gms/internal/measurement/ad$c$b;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$c;->oO()Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     move-result-object v0
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqO:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ad$c$b;->arg:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     if-ne v0, v2, :cond_0
 
     goto/16 :goto_5
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$c;->oQ()Lcom/google/android/gms/internal/measurement/ad$c$b;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$c;->oO()Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     move-result-object v0
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqS:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ad$c$b;->ark:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     const/4 v3, 0x4
 
@@ -1487,21 +1487,21 @@
     return-object v1
 
     :cond_6
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$c;->oQ()Lcom/google/android/gms/internal/measurement/ad$c$b;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$c;->oO()Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$c;->oQ()Lcom/google/android/gms/internal/measurement/ad$c$b;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ad$c;->oO()Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     move-result-object v2
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqS:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ad$c$b;->ark:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     if-ne v2, v6, :cond_9
 
     iget-object v2, p1, Lcom/google/android/gms/internal/measurement/ad$c;->zzux:Ljava/lang/String;
 
-    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ip;->cP(Ljava/lang/String;)Z
+    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ip;->cL(Ljava/lang/String;)Z
 
     move-result v2
 
@@ -1509,7 +1509,7 @@
 
     iget-object v2, p1, Lcom/google/android/gms/internal/measurement/ad$c;->zzuy:Ljava/lang/String;
 
-    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ip;->cP(Ljava/lang/String;)Z
+    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ip;->cL(Ljava/lang/String;)Z
 
     move-result v2
 
@@ -1547,7 +1547,7 @@
     :cond_9
     iget-object v2, p1, Lcom/google/android/gms/internal/measurement/ad$c;->zzuw:Ljava/lang/String;
 
-    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ip;->cP(Ljava/lang/String;)Z
+    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ip;->cL(Ljava/lang/String;)Z
 
     move-result v2
 
@@ -1570,7 +1570,7 @@
     move-object v6, p1
 
     :goto_4
-    sget-object v7, Lcom/google/android/gms/internal/measurement/ad$c$b;->aqS:Lcom/google/android/gms/internal/measurement/ad$c$b;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/ad$c$b;->ark:Lcom/google/android/gms/internal/measurement/ad$c$b;
 
     if-ne v0, v7, :cond_b
 
@@ -1582,7 +1582,7 @@
     if-eqz v2, :cond_17
 
     :cond_c
-    sget-object v7, Lcom/google/android/gms/measurement/internal/iy;->aLB:[I
+    sget-object v7, Lcom/google/android/gms/measurement/internal/iy;->aLT:[I
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ad$c$b;->ordinal()I
 
@@ -1897,7 +1897,7 @@
 
     move-result v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$b;->pm()Lcom/google/android/gms/internal/measurement/al$b$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$b;->pk()Lcom/google/android/gms/internal/measurement/al$b$a;
 
     move-result-object v3
 
@@ -1923,7 +1923,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v2
 
@@ -1963,7 +1963,7 @@
 
     move-object/from16 v9, p1
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1993,39 +1993,39 @@
 
     invoke-direct {v10}, Landroidx/collection/ArrayMap;-><init>()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    invoke-virtual {v0, v9}, Lcom/google/android/gms/measurement/internal/jb;->dc(Ljava/lang/String;)Z
+    invoke-virtual {v0, v9}, Lcom/google/android/gms/measurement/internal/jb;->cY(Ljava/lang/String;)Z
 
     move-result v25
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFf:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFx:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v9, v1}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
     move-result v26
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFn:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFF:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v9, v1}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
     move-result v27
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFo:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFG:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v9, v1}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -2085,15 +2085,15 @@
 
     if-eqz v28, :cond_3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     new-instance v0, Landroid/content/ContentValues;
 
@@ -2129,13 +2129,13 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -2145,11 +2145,11 @@
 
     :cond_3
     :goto_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v0
 
-    invoke-virtual {v0, v9}, Lcom/google/android/gms/measurement/internal/jg;->do(Ljava/lang/String;)Ljava/util/Map;
+    invoke-virtual {v0, v9}, Lcom/google/android/gms/measurement/internal/jg;->dk(Ljava/lang/String;)Ljava/util/Map;
 
     move-result-object v0
 
@@ -2173,11 +2173,11 @@
 
     if-eqz v29, :cond_b
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xQ()Lcom/google/android/gms/measurement/internal/iz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xO()Lcom/google/android/gms/measurement/internal/iz;
 
     move-result-object v2
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -2191,11 +2191,11 @@
 
     if-nez v5, :cond_c
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v5
 
-    invoke-virtual {v5, v9}, Lcom/google/android/gms/measurement/internal/jg;->dn(Ljava/lang/String;)Ljava/util/Map;
+    invoke-virtual {v5, v9}, Lcom/google/android/gms/measurement/internal/jg;->dj(Ljava/lang/String;)Ljava/util/Map;
 
     move-result-object v5
 
@@ -2257,7 +2257,7 @@
     :cond_4
     move-object/from16 v20, v5
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v5
 
@@ -2275,7 +2275,7 @@
 
     if-nez v8, :cond_9
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dr;->se()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dr;->sc()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v8
 
@@ -2283,7 +2283,7 @@
 
     check-cast v8, Lcom/google/android/gms/internal/measurement/al$i$a;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/al$i$a;->qo()Lcom/google/android/gms/internal/measurement/al$i$a;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/al$i$a;->qm()Lcom/google/android/gms/internal/measurement/al$i$a;
 
     move-result-object v8
 
@@ -2291,7 +2291,7 @@
 
     move-result-object v5
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v8
 
@@ -2303,7 +2303,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/al$i$a;->qn()Lcom/google/android/gms/internal/measurement/al$i$a;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/al$i$a;->ql()Lcom/google/android/gms/internal/measurement/al$i$a;
 
     move-result-object v8
 
@@ -2312,7 +2312,7 @@
     const/4 v2, 0x0
 
     :goto_3
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$i;->qg()I
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$i;->qe()I
 
     move-result v8
 
@@ -2349,7 +2349,7 @@
     const/4 v2, 0x0
 
     :goto_4
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$i;->qi()I
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/al$i;->qg()I
 
     move-result v8
 
@@ -2387,7 +2387,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v4
 
@@ -2497,7 +2497,7 @@
 
     if-eqz v4, :cond_11
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/al$i;->qg()I
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/al$i;->qe()I
 
     move-result v17
 
@@ -2531,7 +2531,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/al$b;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/al$b;->pk()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/al$b;->pi()Z
 
     move-result v20
 
@@ -2545,7 +2545,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/al$b;->pl()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/al$b;->pj()Z
 
     move-result v22
 
@@ -2653,7 +2653,7 @@
     const/4 v1, 0x0
 
     :goto_11
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/al$i;->qf()I
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/al$i;->qd()I
 
     move-result v3
 
@@ -2669,11 +2669,11 @@
 
     if-eqz v3, :cond_14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -2740,13 +2740,13 @@
 
     move-object/from16 v22, v12
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$a;->ph()Lcom/google/android/gms/internal/measurement/al$a$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$a;->pf()Lcom/google/android/gms/internal/measurement/al$a$a;
 
     move-result-object v1
 
     const/4 v3, 0x0
 
-    invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/measurement/al$a$a;->J(Z)Lcom/google/android/gms/internal/measurement/al$a$a;
+    invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/measurement/al$a$a;->H(Z)Lcom/google/android/gms/internal/measurement/al$a$a;
 
     move-result-object v1
 
@@ -2770,7 +2770,7 @@
     invoke-virtual {v1, v4}, Lcom/google/android/gms/internal/measurement/al$a$a;->a(Lcom/google/android/gms/internal/measurement/al$i;)Lcom/google/android/gms/internal/measurement/al$a$a;
 
     :goto_13
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$i;->qk()Lcom/google/android/gms/internal/measurement/al$i$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$i;->qi()Lcom/google/android/gms/internal/measurement/al$i$a;
 
     move-result-object v3
 
@@ -2815,7 +2815,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v1
 
@@ -2887,7 +2887,7 @@
 
     iget-object v11, v4, Lcom/google/android/gms/internal/measurement/al$c;->zzwj:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     const-string v12, "_eid"
 
@@ -2935,7 +2935,7 @@
 
     if-eqz v2, :cond_27
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     const-string v2, "_en"
 
@@ -2953,11 +2953,11 @@
 
     if-eqz v2, :cond_1d
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Extra parameter without an event name. eventId"
 
@@ -2997,7 +2997,7 @@
 
     :cond_1f
     :goto_17
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
@@ -3026,7 +3026,7 @@
 
     move-result-wide v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     invoke-static {v0, v12}, Lcom/google/android/gms/measurement/internal/ip;->c(Lcom/google/android/gms/internal/measurement/al$c;Ljava/lang/String;)Ljava/lang/Object;
 
@@ -3047,17 +3047,17 @@
 
     if-gtz v0, :cond_21
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Clearing complex main event info. appId"
 
@@ -3109,11 +3109,11 @@
     const/16 v18, 0x0
 
     :goto_1a
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Error clearing complex main event"
 
@@ -3135,7 +3135,7 @@
 
     const/16 v18, 0x0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
@@ -3184,7 +3184,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/al$e;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     iget-object v3, v2, Lcom/google/android/gms/internal/measurement/al$e;->zzwk:Ljava/lang/String;
 
@@ -3234,11 +3234,11 @@
     goto :goto_1f
 
     :cond_25
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "No unique parameters in main event. eventName"
 
@@ -3265,11 +3265,11 @@
 
     move-object v10, v5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Extra parameter without existing main event. eventName, eventId"
 
@@ -3295,7 +3295,7 @@
 
     if-eqz v23, :cond_2a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     invoke-static/range {v32 .. v33}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -3325,11 +3325,11 @@
 
     if-gtz v0, :cond_29
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Complex event with zero extra param count. eventName"
 
@@ -3340,7 +3340,7 @@
     goto :goto_23
 
     :cond_29
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
@@ -3379,7 +3379,7 @@
     move-object/from16 v41, v11
 
     :goto_24
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
@@ -3391,21 +3391,21 @@
 
     if-nez v1, :cond_2c
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v3
 
-    invoke-virtual {v3, v0}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v3, v0}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
@@ -3541,7 +3541,7 @@
 
     move-object/from16 v48, v2
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/f;->aDu:Ljava/lang/String;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/f;->aDM:Ljava/lang/String;
 
     move-object/from16 v49, v6
 
@@ -3549,39 +3549,39 @@
 
     move-object/from16 v50, v6
 
-    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/f;->aDv:J
+    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/f;->aDN:J
 
     add-long v51, v8, v36
 
-    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/f;->aDw:J
+    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/f;->aDO:J
 
     add-long v53, v8, v36
 
-    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/f;->aDx:J
+    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/f;->aDP:J
 
     add-long v55, v8, v36
 
-    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/f;->aDy:J
+    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/f;->aDQ:J
 
     move-wide/from16 v57, v8
 
-    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/f;->aDz:J
+    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/f;->aDR:J
 
     move-wide/from16 v59, v8
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/f;->aDA:Ljava/lang/Long;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/f;->aDS:Ljava/lang/Long;
 
     move-object/from16 v61, v6
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/f;->aDB:Ljava/lang/Long;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/f;->aDT:Ljava/lang/Long;
 
     move-object/from16 v62, v6
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/f;->aDC:Ljava/lang/Long;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/f;->aDU:Ljava/lang/Long;
 
     move-object/from16 v63, v6
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/f;->aDD:Ljava/lang/Boolean;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/f;->aDV:Ljava/lang/Boolean;
 
     move-object/from16 v64, v1
 
@@ -3599,15 +3599,15 @@
 
     move-object v8, v2
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/f;->aDu:Ljava/lang/String;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/f;->aDM:Ljava/lang/String;
 
     iget-object v10, v1, Lcom/google/android/gms/measurement/internal/f;->name:Ljava/lang/String;
 
-    iget-wide v11, v1, Lcom/google/android/gms/measurement/internal/f;->aDv:J
+    iget-wide v11, v1, Lcom/google/android/gms/measurement/internal/f;->aDN:J
 
     add-long v11, v11, v36
 
-    iget-wide v13, v1, Lcom/google/android/gms/measurement/internal/f;->aDw:J
+    iget-wide v13, v1, Lcom/google/android/gms/measurement/internal/f;->aDO:J
 
     add-long v13, v13, v36
 
@@ -3615,31 +3615,31 @@
 
     move-object v6, v3
 
-    iget-wide v2, v1, Lcom/google/android/gms/measurement/internal/f;->aDx:J
+    iget-wide v2, v1, Lcom/google/android/gms/measurement/internal/f;->aDP:J
 
     move-wide v15, v2
 
-    iget-wide v2, v1, Lcom/google/android/gms/measurement/internal/f;->aDy:J
+    iget-wide v2, v1, Lcom/google/android/gms/measurement/internal/f;->aDQ:J
 
     move-wide/from16 v17, v2
 
-    iget-wide v2, v1, Lcom/google/android/gms/measurement/internal/f;->aDz:J
+    iget-wide v2, v1, Lcom/google/android/gms/measurement/internal/f;->aDR:J
 
     move-wide/from16 v19, v2
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/f;->aDA:Ljava/lang/Long;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/f;->aDS:Ljava/lang/Long;
 
     move-object/from16 v21, v2
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/f;->aDB:Ljava/lang/Long;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/f;->aDT:Ljava/lang/Long;
 
     move-object/from16 v22, v2
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/f;->aDC:Ljava/lang/Long;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/f;->aDU:Ljava/lang/Long;
 
     move-object/from16 v23, v2
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/f;->aDD:Ljava/lang/Boolean;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/f;->aDV:Ljava/lang/Boolean;
 
     move-object/from16 v24, v1
 
@@ -3648,13 +3648,13 @@
     move-object/from16 v8, v36
 
     :goto_26
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
     invoke-virtual {v1, v8}, Lcom/google/android/gms/measurement/internal/jg;->a(Lcom/google/android/gms/measurement/internal/f;)V
 
-    iget-wide v9, v8, Lcom/google/android/gms/measurement/internal/f;->aDv:J
+    iget-wide v9, v8, Lcom/google/android/gms/measurement/internal/f;->aDN:J
 
     move-object/from16 v11, v40
 
@@ -3666,7 +3666,7 @@
 
     if-nez v1, :cond_2f
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v1
 
@@ -3723,11 +3723,11 @@
 
     if-eqz v1, :cond_30
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v14}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -3830,7 +3830,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$a;->ph()Lcom/google/android/gms/internal/measurement/al$a$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$a;->pf()Lcom/google/android/gms/internal/measurement/al$a$a;
 
     move-result-object v2
 
@@ -3838,11 +3838,11 @@
 
     const/4 v13, 0x1
 
-    invoke-virtual {v2, v13}, Lcom/google/android/gms/internal/measurement/al$a$a;->J(Z)Lcom/google/android/gms/internal/measurement/al$a$a;
+    invoke-virtual {v2, v13}, Lcom/google/android/gms/internal/measurement/al$a$a;->H(Z)Lcom/google/android/gms/internal/measurement/al$a$a;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v2
 
@@ -3971,7 +3971,7 @@
 
     if-eqz v2, :cond_35
 
-    iget-wide v2, v8, Lcom/google/android/gms/measurement/internal/f;->aDx:J
+    iget-wide v2, v8, Lcom/google/android/gms/measurement/internal/f;->aDP:J
 
     move-wide/from16 v22, v2
 
@@ -3986,7 +3986,7 @@
     move-wide/from16 v22, v16
 
     :goto_2c
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
@@ -3998,17 +3998,17 @@
 
     if-eqz v2, :cond_37
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v14}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v3
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$a;->oC()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$a;->oA()Z
 
     move-result v24
 
@@ -4034,7 +4034,7 @@
     const/4 v4, 0x0
 
     :goto_2d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v5
 
@@ -4042,7 +4042,7 @@
 
     iget-object v6, v1, Lcom/google/android/gms/internal/measurement/ad$a;->zzug:Ljava/lang/String;
 
-    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v5
 
@@ -4050,13 +4050,13 @@
 
     invoke-virtual {v2, v6, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v3
 
@@ -4080,7 +4080,7 @@
     move-object/from16 v5, v44
 
     :goto_2e
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$a;->oC()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$a;->oA()Z
 
     move-result v2
 
@@ -4145,17 +4145,17 @@
 
     if-nez v42, :cond_3d
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v14}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v3
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$a;->oC()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ad$a;->oA()Z
 
     move-result v4
 
@@ -4238,11 +4238,11 @@
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     if-nez v1, :cond_3e
 
@@ -4283,7 +4283,7 @@
 
     if-eqz v42, :cond_41
 
-    invoke-virtual/range {v44 .. v44}, Lcom/google/android/gms/internal/measurement/al$c;->pq()Z
+    invoke-virtual/range {v44 .. v44}, Lcom/google/android/gms/internal/measurement/al$c;->po()Z
 
     move-result v1
 
@@ -4361,17 +4361,17 @@
 
     if-eqz v1, :cond_44
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v14}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ad$a;->oC()Z
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ad$a;->oA()Z
 
     move-result v3
 
@@ -4421,11 +4421,11 @@
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     if-nez v1, :cond_45
 
@@ -4492,17 +4492,17 @@
 
     move-object/from16 v12, v68
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ad$a;->oC()Z
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ad$a;->oA()Z
 
     move-result v3
 
@@ -4656,7 +4656,7 @@
 
     if-nez v3, :cond_4e
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v3
 
@@ -4713,11 +4713,11 @@
 
     if-eqz v6, :cond_4f
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -4822,17 +4822,17 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$a;->ph()Lcom/google/android/gms/internal/measurement/al$a$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$a;->pf()Lcom/google/android/gms/internal/measurement/al$a$a;
 
     move-result-object v6
 
     const/4 v10, 0x1
 
-    invoke-virtual {v6, v10}, Lcom/google/android/gms/internal/measurement/al$a$a;->J(Z)Lcom/google/android/gms/internal/measurement/al$a$a;
+    invoke-virtual {v6, v10}, Lcom/google/android/gms/internal/measurement/al$a$a;->H(Z)Lcom/google/android/gms/internal/measurement/al$a$a;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v6
 
@@ -4918,7 +4918,7 @@
 
     move-object/from16 v17, v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
@@ -4932,17 +4932,17 @@
 
     if-eqz v3, :cond_53
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v8
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ad$d;->oC()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ad$d;->oA()Z
 
     move-result v19
 
@@ -4964,7 +4964,7 @@
     const/4 v7, 0x0
 
     :goto_41
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v1
 
@@ -4972,7 +4972,7 @@
 
     iget-object v13, v0, Lcom/google/android/gms/internal/measurement/ad$d;->zzvh:Ljava/lang/String;
 
-    invoke-virtual {v1, v13}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v1, v13}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -4980,13 +4980,13 @@
 
     invoke-virtual {v3, v13, v8, v7, v1}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v3
 
@@ -5008,7 +5008,7 @@
     move-object/from16 v7, v66
 
     :goto_42
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ad$d;->oC()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ad$d;->oA()Z
 
     move-result v1
 
@@ -5077,17 +5077,17 @@
 
     if-nez v8, :cond_59
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v3
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ad$d;->oC()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ad$d;->oA()Z
 
     move-result v7
 
@@ -5132,11 +5132,11 @@
 
     move-object/from16 v42, v11
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v11
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     move-object/from16 v45, v4
 
@@ -5239,7 +5239,7 @@
 
     if-eqz v8, :cond_5b
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$k;->qu()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/al$k;->qs()Z
 
     move-result v1
 
@@ -5294,17 +5294,17 @@
 
     if-eqz v3, :cond_66
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v3
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ad$d;->oC()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ad$d;->oA()Z
 
     move-result v4
 
@@ -5356,11 +5356,11 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     if-nez v3, :cond_67
 
@@ -5413,17 +5413,17 @@
 
     move-object/from16 v7, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ad$d;->oC()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ad$d;->oA()Z
 
     move-result v4
 
@@ -5563,14 +5563,14 @@
 
     if-nez v3, :cond_6e
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$a;->ph()Lcom/google/android/gms/internal/measurement/al$a$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$a;->pf()Lcom/google/android/gms/internal/measurement/al$a$a;
 
     move-result-object v3
 
     goto :goto_50
 
     :cond_6e
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr;->se()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr;->sc()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v3
 
@@ -5581,7 +5581,7 @@
     :goto_50
     invoke-virtual {v3, v0}, Lcom/google/android/gms/internal/measurement/al$a$a;->bq(I)Lcom/google/android/gms/internal/measurement/al$a$a;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$i;->qk()Lcom/google/android/gms/internal/measurement/al$i$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$i;->qi()Lcom/google/android/gms/internal/measurement/al$i$a;
 
     move-result-object v5
 
@@ -5701,7 +5701,7 @@
 
     move-object/from16 p2, v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$j;->qr()Lcom/google/android/gms/internal/measurement/al$j$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$j;->qp()Lcom/google/android/gms/internal/measurement/al$j$a;
 
     move-result-object v2
 
@@ -5759,7 +5759,7 @@
     :cond_70
     move-object/from16 p3, v6
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v2
 
@@ -5783,13 +5783,13 @@
     :goto_53
     if-eqz v26, :cond_72
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/al$a$a;->pj()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/al$a$a;->ph()Z
 
     move-result v2
 
     if-eqz v2, :cond_72
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/al$a$a;->pg()Lcom/google/android/gms/internal/measurement/al$i;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/al$a$a;->pe()Lcom/google/android/gms/internal/measurement/al$i;
 
     move-result-object v2
 
@@ -5836,13 +5836,13 @@
 
     check-cast v12, Lcom/google/android/gms/internal/measurement/al$j;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$j;->pk()Z
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$j;->pi()Z
 
     move-result v13
 
     if-eqz v13, :cond_74
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$j;->qp()I
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$j;->qn()I
 
     move-result v13
 
@@ -5854,7 +5854,7 @@
 
     move-result-object v13
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$j;->qp()I
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$j;->qn()I
 
     move-result v14
 
@@ -5897,7 +5897,7 @@
 
     check-cast v12, Lcom/google/android/gms/internal/measurement/al$j;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$j;->pk()Z
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$j;->pi()Z
 
     move-result v13
 
@@ -5950,7 +5950,7 @@
 
     invoke-interface {v14, v13}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dr;->se()Lcom/google/android/gms/internal/measurement/dr$a;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dr;->sc()Lcom/google/android/gms/internal/measurement/dr$a;
 
     move-result-object v12
 
@@ -5958,7 +5958,7 @@
 
     check-cast v12, Lcom/google/android/gms/internal/measurement/al$j$a;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$j$a;->qt()Lcom/google/android/gms/internal/measurement/al$j$a;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/al$j$a;->qr()Lcom/google/android/gms/internal/measurement/al$j$a;
 
     move-result-object v12
 
@@ -5966,7 +5966,7 @@
 
     move-result-object v12
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v12
 
@@ -6016,7 +6016,7 @@
 
     check-cast v12, Ljava/lang/Integer;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$j;->qr()Lcom/google/android/gms/internal/measurement/al$j$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$j;->qp()Lcom/google/android/gms/internal/measurement/al$j$a;
 
     move-result-object v13
 
@@ -6044,7 +6044,7 @@
 
     move-result-object v8
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v8
 
@@ -6090,7 +6090,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v5
 
@@ -6100,7 +6100,7 @@
 
     invoke-interface {v4, v2, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v2
 
@@ -6110,19 +6110,19 @@
 
     invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xR()Lcom/google/android/gms/measurement/internal/jg;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/jg;
 
     move-result-object v2
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/al$a$a;->pf()Lcom/google/android/gms/internal/measurement/al$i;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/al$a$a;->pd()Lcom/google/android/gms/internal/measurement/al$i;
 
     move-result-object v3
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -6176,15 +6176,15 @@
 
     if-nez v0, :cond_7c
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Failed to insert filter results (got -1). appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -6205,13 +6205,13 @@
     const/4 v8, 0x0
 
     :goto_5b
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -6244,7 +6244,7 @@
     return-object v1
 .end method
 
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/j.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/j.smali
index 924de73c2e..600367f4c7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/j.smali
@@ -3,149 +3,13 @@
 
 
 # static fields
-.field private static volatile aCX:Lcom/google/android/gms/measurement/internal/ek;
-
-.field static aDK:Lcom/google/android/gms/measurement/internal/ja;
-
-.field private static aDL:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "*>;>;"
-        }
-    .end annotation
-.end field
-
-.field private static aDM:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "*>;>;"
-        }
-    .end annotation
-.end field
-
-.field private static final aDN:Lcom/google/android/gms/internal/measurement/bm;
-
-.field private static aDO:Ljava/lang/Boolean;
-
-.field private static aDP:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static aDQ:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static aDR:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aDS:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aDT:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aDU:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aDV:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aDW:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aDX:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aDY:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aDZ:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private static volatile aDp:Lcom/google/android/gms/measurement/internal/ek;
 
 .field public static aEA:Lcom/google/android/gms/measurement/internal/cv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -155,7 +19,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -185,7 +49,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -195,7 +59,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Double;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -205,7 +69,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -215,7 +79,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -225,7 +89,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -235,7 +99,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -245,7 +109,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -255,7 +119,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -265,7 +129,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -275,7 +139,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -285,7 +149,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -295,7 +159,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -305,7 +169,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -315,7 +179,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -325,7 +189,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -345,7 +209,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -355,7 +219,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -365,7 +229,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -375,7 +239,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Double;",
             ">;"
         }
     .end annotation
@@ -385,7 +249,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -401,101 +265,57 @@
     .end annotation
 .end field
 
-.field public static aEa:Lcom/google/android/gms/measurement/internal/cv;
+.field static aEc:Lcom/google/android/gms/measurement/internal/ja;
+
+.field private static aEd:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "*>;>;"
+        }
+    .end annotation
+.end field
+
+.field private static aEe:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "*>;>;"
+        }
+    .end annotation
+.end field
+
+.field private static final aEf:Lcom/google/android/gms/internal/measurement/bm;
+
+.field private static aEg:Ljava/lang/Boolean;
+
+.field private static aEh:Lcom/google/android/gms/measurement/internal/cv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static aEb:Lcom/google/android/gms/measurement/internal/cv;
+.field private static aEi:Lcom/google/android/gms/measurement/internal/cv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static aEc:Lcom/google/android/gms/measurement/internal/cv;
+.field private static aEj:Lcom/google/android/gms/measurement/internal/cv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aEd:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aEe:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aEf:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aEg:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aEh:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aEi:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aEj:Lcom/google/android/gms/measurement/internal/cv;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
@@ -505,7 +325,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
@@ -515,7 +335,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
@@ -525,7 +345,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -565,7 +385,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -575,7 +395,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -585,7 +405,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -595,7 +415,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -605,7 +425,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -615,7 +435,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -635,7 +455,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -661,6 +481,156 @@
     .end annotation
 .end field
 
+.field public static aFA:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFB:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFC:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFD:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFE:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFF:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFG:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFH:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFI:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFJ:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFK:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFL:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static aFM:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFN:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFO:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field public static aFa:Lcom/google/android/gms/measurement/internal/cv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -721,7 +691,7 @@
     .end annotation
 .end field
 
-.field private static aFg:Lcom/google/android/gms/measurement/internal/cv;
+.field public static aFg:Lcom/google/android/gms/measurement/internal/cv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
@@ -861,7 +831,7 @@
     .end annotation
 .end field
 
-.field private static aFu:Lcom/google/android/gms/measurement/internal/cv;
+.field public static aFu:Lcom/google/android/gms/measurement/internal/cv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/cv<",
@@ -891,6 +861,36 @@
     .end annotation
 .end field
 
+.field public static aFx:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static aFy:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aFz:Lcom/google/android/gms/measurement/internal/cv;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -904,7 +904,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aDL:Ljava/util/List;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEd:Ljava/util/List;
 
     new-instance v0, Ljava/util/HashSet;
 
@@ -914,23 +914,23 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aDM:Ljava/util/Set;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEe:Ljava/util/Set;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/bm;
 
     const-string v1, "com.google.android.gms.measurement"
 
-    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v1
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/bm;-><init>(Landroid/net/Uri;)V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aDN:Lcom/google/android/gms/internal/measurement/bm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEf:Lcom/google/android/gms/internal/measurement/bm;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/m;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/m;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.log_third_party_store_events_enabled"
 
@@ -938,11 +938,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aDP:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEh:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/l;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/l;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.log_installs_enabled"
 
@@ -950,11 +950,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aDQ:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEi:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/y;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/y;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.log_upgrades_enabled"
 
@@ -962,11 +962,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aDR:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEj:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ai;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ai;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.log_androidId_enabled"
 
@@ -974,11 +974,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aDS:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEk:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/av;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/av;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.upload_dsid_enabled"
 
@@ -986,9 +986,9 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aDT:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEl:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/bf;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/bf;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v1, "measurement.log_tag"
 
@@ -1000,7 +1000,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aDU:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEm:Lcom/google/android/gms/measurement/internal/cv;
 
     const-wide/16 v0, 0x2710
 
@@ -1008,7 +1008,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bs;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bs;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.ad_id_cache_time"
 
@@ -1016,7 +1016,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/j;->aDV:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/j;->aEn:Lcom/google/android/gms/measurement/internal/cv;
 
     const-wide/32 v1, 0x5265c00
 
@@ -1024,7 +1024,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/cc;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/cc;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v3, "measurement.monitoring.sample_period_millis"
 
@@ -1032,7 +1032,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/measurement/internal/j;->aDW:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v2, Lcom/google/android/gms/measurement/internal/j;->aEo:Lcom/google/android/gms/measurement/internal/cv;
 
     const-wide/32 v2, 0x36ee80
 
@@ -1040,7 +1040,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/cp;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/cp;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v4, "measurement.config.cache_time"
 
@@ -1048,9 +1048,9 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aDX:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEp:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/cu;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/cu;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v4, "measurement.config.url_scheme"
 
@@ -1060,9 +1060,9 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aDY:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEq:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v4, "measurement.config.url_authority"
 
@@ -1072,7 +1072,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aDZ:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEr:Lcom/google/android/gms/measurement/internal/cv;
 
     const/16 v3, 0x64
 
@@ -1080,7 +1080,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/n;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/n;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v5, "measurement.upload.max_bundles"
 
@@ -1088,7 +1088,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEa:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEs:Lcom/google/android/gms/measurement/internal/cv;
 
     const/high16 v3, 0x10000
 
@@ -1096,7 +1096,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/q;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/q;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v5, "measurement.upload.max_batch_size"
 
@@ -1104,9 +1104,9 @@
 
     move-result-object v4
 
-    sput-object v4, Lcom/google/android/gms/measurement/internal/j;->aEb:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v4, Lcom/google/android/gms/measurement/internal/j;->aEt:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/p;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/p;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v5, "measurement.upload.max_bundle_size"
 
@@ -1114,7 +1114,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEc:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEu:Lcom/google/android/gms/measurement/internal/cv;
 
     const/16 v3, 0x3e8
 
@@ -1122,7 +1122,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/s;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/s;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v5, "measurement.upload.max_events_per_bundle"
 
@@ -1130,7 +1130,7 @@
 
     move-result-object v4
 
-    sput-object v4, Lcom/google/android/gms/measurement/internal/j;->aEd:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v4, Lcom/google/android/gms/measurement/internal/j;->aEv:Lcom/google/android/gms/measurement/internal/cv;
 
     const v4, 0x186a0
 
@@ -1138,7 +1138,7 @@
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/r;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/r;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v6, "measurement.upload.max_events_per_day"
 
@@ -1146,9 +1146,9 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/measurement/internal/j;->aEe:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v5, Lcom/google/android/gms/measurement/internal/j;->aEw:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/u;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/u;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v6, "measurement.upload.max_error_events_per_day"
 
@@ -1156,7 +1156,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEf:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEx:Lcom/google/android/gms/measurement/internal/cv;
 
     const v3, 0xc350
 
@@ -1164,7 +1164,7 @@
 
     move-result-object v3
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/t;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/t;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v6, "measurement.upload.max_public_events_per_day"
 
@@ -1172,7 +1172,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEg:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEy:Lcom/google/android/gms/measurement/internal/cv;
 
     const/16 v3, 0x1f4
 
@@ -1180,7 +1180,7 @@
 
     move-result-object v3
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/w;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/w;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v6, "measurement.upload.max_conversions_per_day"
 
@@ -1188,7 +1188,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEh:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEz:Lcom/google/android/gms/measurement/internal/cv;
 
     const/16 v3, 0xa
 
@@ -1196,7 +1196,7 @@
 
     move-result-object v3
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/v;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/v;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v6, "measurement.upload.max_realtime_events_per_day"
 
@@ -1204,9 +1204,9 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEi:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEA:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/x;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/x;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v5, "measurement.store.max_stored_events_per_app"
 
@@ -1214,9 +1214,9 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEj:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEB:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/ab;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/ab;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v4, "measurement.upload.url"
 
@@ -1226,7 +1226,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEk:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEC:Lcom/google/android/gms/measurement/internal/cv;
 
     const-wide/32 v3, 0x2932e00
 
@@ -1234,7 +1234,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/aa;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/aa;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v5, "measurement.upload.backoff_period"
 
@@ -1242,9 +1242,9 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEl:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aED:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/ad;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/ad;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v4, "measurement.upload.window_interval"
 
@@ -1252,9 +1252,9 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEm:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/j;->aEE:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/ac;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/ac;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v4, "measurement.upload.interval"
 
@@ -1262,9 +1262,9 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/measurement/internal/j;->aEn:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v2, Lcom/google/android/gms/measurement/internal/j;->aEF:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/af;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/af;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v3, "measurement.upload.realtime_upload_interval"
 
@@ -1272,7 +1272,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEo:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEG:Lcom/google/android/gms/measurement/internal/cv;
 
     const-wide/16 v2, 0x3e8
 
@@ -1280,7 +1280,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/ae;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/ae;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v3, "measurement.upload.debug_upload_interval"
 
@@ -1288,7 +1288,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEp:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEH:Lcom/google/android/gms/measurement/internal/cv;
 
     const-wide/16 v2, 0x1f4
 
@@ -1296,7 +1296,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/ah;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/ah;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v3, "measurement.upload.minimum_delay"
 
@@ -1304,7 +1304,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEq:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEI:Lcom/google/android/gms/measurement/internal/cv;
 
     const-wide/32 v2, 0xea60
 
@@ -1312,7 +1312,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/ag;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/ag;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v3, "measurement.alarm_manager.minimum_interval"
 
@@ -1320,9 +1320,9 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEr:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEJ:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/aj;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/aj;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.upload.stale_data_deletion_interval"
 
@@ -1330,7 +1330,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEs:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEK:Lcom/google/android/gms/measurement/internal/cv;
 
     const-wide/32 v0, 0x240c8400
 
@@ -1338,7 +1338,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/al;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/al;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.upload.refresh_blacklisted_config_interval"
 
@@ -1346,7 +1346,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEt:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEL:Lcom/google/android/gms/measurement/internal/cv;
 
     const-wide/16 v0, 0x3a98
 
@@ -1354,7 +1354,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ak;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ak;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.upload.initial_upload_delay_time"
 
@@ -1362,7 +1362,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEu:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEM:Lcom/google/android/gms/measurement/internal/cv;
 
     const-wide/32 v0, 0x1b7740
 
@@ -1370,7 +1370,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/an;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/an;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.upload.retry_time"
 
@@ -1378,7 +1378,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEv:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEN:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v0, 0x6
 
@@ -1386,7 +1386,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/am;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/am;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.upload.retry_count"
 
@@ -1394,7 +1394,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEw:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEO:Lcom/google/android/gms/measurement/internal/cv;
 
     const-wide v0, 0x90321000L
 
@@ -1402,7 +1402,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ap;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ap;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.upload.max_queue_time"
 
@@ -1410,7 +1410,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEx:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEP:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v0, 0x4
 
@@ -1418,7 +1418,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ao;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ao;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.lifetimevalue.max_currency_tracked"
 
@@ -1426,7 +1426,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEy:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEQ:Lcom/google/android/gms/measurement/internal/cv;
 
     const/16 v0, 0xc8
 
@@ -1434,7 +1434,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ar;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ar;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.audience.filter_result_max_count"
 
@@ -1442,7 +1442,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEz:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aER:Lcom/google/android/gms/measurement/internal/cv;
 
     const-wide/16 v0, 0x1388
 
@@ -1450,7 +1450,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/aq;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/aq;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.service_client.idle_disconnect_millis"
 
@@ -1458,245 +1458,13 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEA:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/at;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.test.boolean_flag"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEB:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/as;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v1, "measurement.test.string_flag"
-
-    const-string v2, "---"
-
-    invoke-static {v1, v2, v2, v0}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEC:Lcom/google/android/gms/measurement/internal/cv;
-
-    const-wide/16 v0, -0x1
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/au;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.test.long_flag"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aED:Lcom/google/android/gms/measurement/internal/cv;
-
-    const/4 v0, -0x2
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ax;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.test.int_flag"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEE:Lcom/google/android/gms/measurement/internal/cv;
-
-    const-wide/high16 v0, -0x3ff8000000000000L    # -3.0
-
-    invoke-static {v0, v1}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/aw;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.test.double_flag"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEF:Lcom/google/android/gms/measurement/internal/cv;
-
-    const/16 v0, 0x32
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/az;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.experiment.max_ids"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEG:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ay;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.validation.internal_limits_internal_event_params"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEH:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bc;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.audience.dynamic_filters"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEI:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bb;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.reset_analytics.persist_time"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEJ:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/be;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.validation.value_and_currency_params"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEK:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bd;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.sampling.time_zone_offset_enabled"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEL:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bg;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.referrer.enable_logging_install_referrer_cmp_from_apk"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEM:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bi;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.fetch_config_with_admob_app_id"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEN:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bh;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.client.sessions.session_id_enabled"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEO:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bk;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.service.sessions.session_number_enabled"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEP:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bj;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.client.sessions.immediate_start_enabled_foreground"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEQ:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bm;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.client.sessions.background_sessions_enabled"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aER:Lcom/google/android/gms/measurement/internal/cv;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bl;->aFx:Lcom/google/android/gms/measurement/internal/cw;
-
-    const-string v2, "measurement.client.sessions.remove_expired_session_properties_enabled"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
-
-    move-result-object v0
-
     sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aES:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bo;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/at;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
-    const-string v2, "measurement.service.sessions.session_number_backfill_enabled"
+    const-string v2, "measurement.test.boolean_flag"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
 
@@ -1704,23 +1472,27 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aET:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/as;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bn;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    const-string v1, "measurement.test.string_flag"
 
-    const-string v2, "measurement.service.sessions.remove_disabled_session_number"
+    const-string v2, "---"
 
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+    invoke-static {v1, v2, v2, v0}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
 
     move-result-object v0
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEU:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    const-wide/16 v0, -0x1
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bq;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    const-string v2, "measurement.collection.firebase_global_collection_flag_enabled"
+    move-result-object v0
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/au;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.test.long_flag"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
 
@@ -1728,11 +1500,15 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEV:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+    const/4 v0, -0x2
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bp;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    const-string v2, "measurement.collection.efficient_engagement_reporting_enabled"
+    move-result-object v0
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ax;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.test.int_flag"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
 
@@ -1740,11 +1516,15 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEW:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+    const-wide/high16 v0, -0x3ff8000000000000L    # -3.0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/br;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    invoke-static {v0, v1}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
 
-    const-string v2, "measurement.collection.redundant_engagement_removal_enabled"
+    move-result-object v0
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/aw;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.test.double_flag"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
 
@@ -1752,11 +1532,15 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEX:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    const/16 v0, 0x32
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bu;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    const-string v2, "measurement.personalized_ads_signals_collection_enabled"
+    move-result-object v0
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/az;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.experiment.max_ids"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
 
@@ -1764,11 +1548,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEY:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bt;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ay;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
-    const-string v2, "measurement.personalized_ads_property_translation_enabled"
+    const-string v2, "measurement.validation.internal_limits_internal_event_params"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
 
@@ -1778,9 +1562,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bw;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bc;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
-    const-string v2, "measurement.collection.init_params_control_enabled"
+    const-string v2, "measurement.audience.dynamic_filters"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
 
@@ -1788,11 +1572,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFa:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bv;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bb;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
-    const-string v2, "measurement.upload.disable_is_uploader"
+    const-string v2, "measurement.reset_analytics.persist_time"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
 
@@ -1802,9 +1586,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/by;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/be;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
-    const-string v2, "measurement.experiment.enable_experiment_reporting"
+    const-string v2, "measurement.validation.value_and_currency_params"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
 
@@ -1812,11 +1596,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFc:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bx;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bd;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
-    const-string v2, "measurement.collection.log_event_and_bundle_v2"
+    const-string v2, "measurement.sampling.time_zone_offset_enabled"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
 
@@ -1824,11 +1608,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFd:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ca;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bg;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
-    const-string v2, "measurement.collection.null_empty_event_name_fix"
+    const-string v2, "measurement.referrer.enable_logging_install_referrer_cmp_from_apk"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
 
@@ -1836,11 +1620,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFe:Lcom/google/android/gms/measurement/internal/cv;
 
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bz;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bi;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
-    const-string v2, "measurement.audience.sequence_filters"
+    const-string v2, "measurement.fetch_config_with_admob_app_id"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
 
@@ -1850,7 +1634,223 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cd;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bh;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.client.sessions.session_id_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFg:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bk;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.service.sessions.session_number_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFh:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bj;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.client.sessions.immediate_start_enabled_foreground"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFi:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bm;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.client.sessions.background_sessions_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFj:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bl;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.client.sessions.remove_expired_session_properties_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFk:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bo;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.service.sessions.session_number_backfill_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFl:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bn;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.service.sessions.remove_disabled_session_number"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFm:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bq;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.collection.firebase_global_collection_flag_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFn:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bp;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.collection.efficient_engagement_reporting_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFo:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/br;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.collection.redundant_engagement_removal_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFp:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bu;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.personalized_ads_signals_collection_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFq:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bt;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.personalized_ads_property_translation_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFr:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bw;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.collection.init_params_control_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFs:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bv;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.upload.disable_is_uploader"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFt:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/by;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.experiment.enable_experiment_reporting"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFu:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bx;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.collection.log_event_and_bundle_v2"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFv:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ca;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.collection.null_empty_event_name_fix"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFw:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bz;->aFP:Lcom/google/android/gms/measurement/internal/cw;
+
+    const-string v2, "measurement.audience.sequence_filters"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/j;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;)Lcom/google/android/gms/measurement/internal/cv;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFx:Lcom/google/android/gms/measurement/internal/cv;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cd;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.audience.sequence_filters_bundle_timestamp"
 
@@ -1858,7 +1858,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFg:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFy:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
@@ -1870,11 +1870,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFh:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFz:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cf;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cf;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.module.collection.conditionally_omit_admob_app_id"
 
@@ -1882,11 +1882,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFi:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFA:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ce;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ce;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.sdk.dynamite.use_dynamite2"
 
@@ -1894,11 +1894,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFj:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFB:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ch;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ch;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.sdk.dynamite.allow_remote_dynamite"
 
@@ -1906,11 +1906,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFk:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFC:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cg;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cg;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.sdk.collection.validate_param_names_alphabetical"
 
@@ -1918,11 +1918,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFl:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFD:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cj;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cj;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.collection.event_safelist"
 
@@ -1930,11 +1930,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFm:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFE:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ci;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ci;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.service.audience.scoped_filters_v27"
 
@@ -1942,11 +1942,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFn:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFF:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cl;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cl;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.service.audience.session_scoped_event_aggregates"
 
@@ -1954,11 +1954,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFo:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFG:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ck;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ck;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.service.audience.session_scoped_user_engagement"
 
@@ -1966,11 +1966,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFp:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFH:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cn;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cn;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.service.audience.remove_disabled_session_scoped_user_engagement"
 
@@ -1978,11 +1978,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFq:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFI:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cm;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cm;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.sdk.collection.retrieve_deeplink_from_bow"
 
@@ -1990,11 +1990,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFr:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFJ:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/co;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/co;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.app_launch.event_ordering_fix"
 
@@ -2002,11 +2002,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFs:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFK:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cr;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cr;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.sdk.collection.last_deep_link_referrer"
 
@@ -2014,11 +2014,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFt:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFL:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cq;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cq;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.sdk.collection.last_deep_link_referrer_campaign"
 
@@ -2026,11 +2026,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFu:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFM:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ct;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ct;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.sdk.collection.last_gclid_from_referrer"
 
@@ -2038,11 +2038,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFv:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFN:Lcom/google/android/gms/measurement/internal/cv;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cs;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cs;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     const-string v2, "measurement.upload.file_lock_state_check"
 
@@ -2050,7 +2050,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFw:Lcom/google/android/gms/measurement/internal/cv;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aFO:Lcom/google/android/gms/measurement/internal/cv;
 
     return-void
 .end method
@@ -2087,7 +2087,7 @@
 
     invoke-direct/range {v0 .. v5}, Lcom/google/android/gms/measurement/internal/cv;-><init>(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/cw;B)V
 
-    sget-object p0, Lcom/google/android/gms/measurement/internal/j;->aDL:Ljava/util/List;
+    sget-object p0, Lcom/google/android/gms/measurement/internal/j;->aEd:Ljava/util/List;
 
     invoke-interface {p0, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -2097,7 +2097,7 @@
 .method static a(Lcom/google/android/gms/measurement/internal/ek;)V
     .locals 0
 
-    sput-object p0, Lcom/google/android/gms/measurement/internal/j;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    sput-object p0, Lcom/google/android/gms/measurement/internal/j;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     return-void
 .end method
@@ -2105,7 +2105,7 @@
 .method static a(Lcom/google/android/gms/measurement/internal/ja;)V
     .locals 0
 
-    sput-object p0, Lcom/google/android/gms/measurement/internal/j;->aDK:Lcom/google/android/gms/measurement/internal/ja;
+    sput-object p0, Lcom/google/android/gms/measurement/internal/j;->aEc:Lcom/google/android/gms/measurement/internal/ja;
 
     return-void
 .end method
@@ -2130,7 +2130,7 @@
 
     const-string v0, "com.google.android.gms.measurement"
 
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/bg;->bY(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/bg;->bT(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v0
 
@@ -2147,7 +2147,7 @@
     return-object p0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/au;->qE()Ljava/util/Map;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/au;->qC()Ljava/util/Map;
 
     move-result-object p0
 
@@ -2157,24 +2157,24 @@
 .method static e(Ljava/lang/Exception;)V
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aDO:Ljava/lang/Boolean;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aEg:Ljava/lang/Boolean;
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lb()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->kZ()Lcom/google/android/gms/common/c;
 
     move-result-object v1
 
@@ -2198,10 +2198,10 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aDO:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/j;->aEg:Ljava/lang/Boolean;
 
     :cond_2
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aDO:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEg:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -2209,13 +2209,13 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Got Exception on PhenotypeFlag.get on Play device"
 
@@ -2225,10 +2225,38 @@
     return-void
 .end method
 
+.method static final synthetic vV()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->vg()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 static final synthetic vW()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->uE()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 static final synthetic vX()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->vi()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->uD()Z
 
     move-result v0
 
@@ -2242,7 +2270,7 @@
 .method static final synthetic vY()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->uG()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->uC()Z
 
     move-result v0
 
@@ -2256,7 +2284,7 @@
 .method static final synthetic vZ()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->uF()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ig;->tH()Z
 
     move-result v0
 
@@ -2270,7 +2298,7 @@
 .method static final synthetic wA()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ky;->vf()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ky;->vc()Z
 
     move-result v0
 
@@ -2284,7 +2312,7 @@
 .method static final synthetic wB()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ky;->vd()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kx;->uZ()Z
 
     move-result v0
 
@@ -2312,7 +2340,7 @@
 .method static final synthetic wD()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kx;->vb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ja;->ux()Z
 
     move-result v0
 
@@ -2326,7 +2354,7 @@
 .method static final synthetic wE()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ky;->vg()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jl;->uB()Z
 
     move-result v0
 
@@ -2340,7 +2368,7 @@
 .method static final synthetic wF()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ja;->uz()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->uR()Z
 
     move-result v0
 
@@ -2354,7 +2382,7 @@
 .method static final synthetic wG()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jl;->uD()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lj;->vh()Z
 
     move-result v0
 
@@ -2368,7 +2396,7 @@
 .method static final synthetic wH()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->uT()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kk;->uQ()Z
 
     move-result v0
 
@@ -2382,7 +2410,7 @@
 .method static final synthetic wI()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lj;->vj()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/is;->us()Z
 
     move-result v0
 
@@ -2396,7 +2424,7 @@
 .method static final synthetic wJ()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kk;->uS()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jy;->uI()Z
 
     move-result v0
 
@@ -2407,149 +2435,7 @@
     return-object v0
 .end method
 
-.method static final synthetic wK()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/is;->uu()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 static final synthetic wL()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jy;->uK()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 static final synthetic wM()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tS()J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wN()Ljava/lang/Double;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->uM()D
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wO()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->uN()J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wP()Ljava/lang/Long;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->uO()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 static final synthetic wQ()Ljava/lang/String;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->uP()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wR()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->uL()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 static final synthetic wS()Ljava/lang/Long;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tZ()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 static final synthetic wT()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tT()J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wU()Ljava/lang/Integer;
+.method static final synthetic wK()Ljava/lang/Integer;
     .locals 2
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tQ()J
@@ -2565,24 +2451,24 @@
     return-object v0
 .end method
 
-.method static final synthetic wV()Ljava/lang/Long;
+.method static final synthetic wL()Ljava/lang/Double;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->ul()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->uK()D
 
     move-result-wide v0
 
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method static final synthetic wW()Ljava/lang/Integer;
+.method static final synthetic wM()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->uo()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->uL()J
 
     move-result-wide v0
 
@@ -2595,10 +2481,10 @@
     return-object v0
 .end method
 
-.method static final synthetic wX()Ljava/lang/Long;
+.method static final synthetic wN()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->up()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->uM()J
 
     move-result-wide v0
 
@@ -2609,10 +2495,34 @@
     return-object v0
 .end method
 
-.method static final synthetic wY()Ljava/lang/Long;
+.method static final synthetic wO()Ljava/lang/String;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->uN()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic wP()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->uJ()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 static final synthetic wQ()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->uc()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tX()J
 
     move-result-wide v0
 
@@ -2623,10 +2533,42 @@
     return-object v0
 .end method
 
-.method static final synthetic wZ()Ljava/lang/Long;
+.method static final synthetic wR()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tY()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tR()J
+
+    move-result-wide v0
+
+    long-to-int v1, v0
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic wS()Ljava/lang/Integer;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tO()J
+
+    move-result-wide v0
+
+    long-to-int v1, v0
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic wT()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->uj()J
 
     move-result-wide v0
 
@@ -2637,435 +2579,37 @@
     return-object v0
 .end method
 
-.method static final synthetic wa()Ljava/lang/Boolean;
-    .locals 1
+.method static final synthetic wU()Ljava/lang/Integer;
+    .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->uE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->um()J
 
-    move-result v0
+    move-result-wide v0
 
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    long-to-int v1, v0
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method static final synthetic wb()Ljava/lang/Boolean;
-    .locals 1
+.method static final synthetic wV()Ljava/lang/Long;
+    .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ig;->tJ()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->un()J
 
-    move-result v0
+    move-result-wide v0
 
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method static final synthetic wc()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ld;->vh()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 static final synthetic wd()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kq;->uX()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 static final synthetic we()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kq;->uV()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 static final synthetic wf()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kq;->uW()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 static final synthetic wg()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kq;->uU()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 static final synthetic wh()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/iz;->uy()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 static final synthetic wi()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hu;->tD()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 static final synthetic wj()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/it;->uv()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 static final synthetic wk()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/it;->ux()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 static final synthetic wl()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ia;->tF()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 static final synthetic wm()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kr;->uZ()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 static final synthetic wn()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kr;->uY()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 static final synthetic wo()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->uJ()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 static final synthetic wp()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ke;->uQ()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 static final synthetic wq()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kf;->uR()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 static final synthetic wr()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/im;->us()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 static final synthetic ws()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/it;->uw()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 static final synthetic wt()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jr;->uI()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 static final synthetic wu()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jr;->uH()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 static final synthetic wv()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jf;->uB()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 static final synthetic ww()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jf;->uA()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 static final synthetic wx()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jg;->uC()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 static final synthetic wy()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kx;->va()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 static final synthetic wz()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kx;->vc()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 static final synthetic xA()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hv;->tE()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 static final synthetic xB()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->tI()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 static final synthetic xC()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->tG()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 static final synthetic xD()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->tH()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 static synthetic xE()Ljava/util/List;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aDL:Ljava/util/List;
-
-    return-object v0
-.end method
-
-.method static final synthetic xa()Ljava/lang/Long;
+.method static final synthetic wW()Ljava/lang/Long;
     .locals 2
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->ua()J
@@ -3079,10 +2623,466 @@
     return-object v0
 .end method
 
+.method static final synthetic wX()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tW()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 static final synthetic wY()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tY()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 static final synthetic wZ()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tS()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 static final synthetic wa()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ld;->vf()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 static final synthetic wb()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kq;->uV()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 static final synthetic wc()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kq;->uT()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 static final synthetic wd()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kq;->uU()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 static final synthetic we()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kq;->uS()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 static final synthetic wf()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/iz;->uw()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 static final synthetic wg()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hu;->tB()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 static final synthetic wh()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/it;->ut()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 static final synthetic wi()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/it;->uv()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 static final synthetic wj()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ia;->tD()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 static final synthetic wk()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kr;->uX()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 static final synthetic wl()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kr;->uW()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 static final synthetic wm()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->uH()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 static final synthetic wn()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ke;->uO()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 static final synthetic wo()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kf;->uP()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 static final synthetic wp()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/im;->uq()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 static final synthetic wq()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/it;->uu()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 static final synthetic wr()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jr;->uG()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 static final synthetic ws()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jr;->uF()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 static final synthetic wt()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jf;->uz()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 static final synthetic wu()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jf;->uy()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 static final synthetic wv()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jg;->uA()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 static final synthetic ww()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kx;->uY()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 static final synthetic wx()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kx;->va()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 static final synthetic wy()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ky;->vd()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 static final synthetic wz()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ky;->vb()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 static final synthetic xA()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->tE()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 static final synthetic xB()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->tF()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 static synthetic xC()Ljava/util/List;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEd:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method static final synthetic xa()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tT()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 static final synthetic xb()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tU()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tN()J
 
     move-result-wide v0
 
@@ -3110,7 +3110,7 @@
 .method static final synthetic xd()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tP()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->ub()J
 
     move-result-wide v0
 
@@ -3124,7 +3124,7 @@
 .method static final synthetic xe()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tX()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->up()J
 
     move-result-wide v0
 
@@ -3138,7 +3138,7 @@
 .method static final synthetic xf()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->ud()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tZ()J
 
     move-result-wide v0
 
@@ -3149,48 +3149,20 @@
     return-object v0
 .end method
 
-.method static final synthetic xg()Ljava/lang/Long;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->ur()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 static final synthetic xh()Ljava/lang/Long;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->ub()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 static final synthetic xi()Ljava/lang/String;
+.method static final synthetic xg()Ljava/lang/String;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->uq()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->uo()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method static final synthetic xj()Ljava/lang/Integer;
+.method static final synthetic xh()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tR()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tP()J
 
     move-result-wide v0
 
@@ -3203,39 +3175,7 @@
     return-object v0
 .end method
 
-.method static final synthetic xk()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->um()J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic xl()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->ug()J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic xm()Ljava/lang/Integer;
+.method static final synthetic xi()Ljava/lang/Integer;
     .locals 2
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->uk()J
@@ -3251,55 +3191,7 @@
     return-object v0
 .end method
 
-.method static final synthetic xn()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->uh()J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic xo()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->uj()J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic xp()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->ui()J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic xq()Ljava/lang/Integer;
+.method static final synthetic xj()Ljava/lang/Integer;
     .locals 2
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->ue()J
@@ -3315,10 +3207,10 @@
     return-object v0
 .end method
 
-.method static final synthetic xr()Ljava/lang/Integer;
+.method static final synthetic xk()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->un()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->ui()J
 
     move-result-wide v0
 
@@ -3331,7 +3223,7 @@
     return-object v0
 .end method
 
-.method static final synthetic xs()Ljava/lang/Integer;
+.method static final synthetic xl()Ljava/lang/Integer;
     .locals 2
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->uf()J
@@ -3347,69 +3239,97 @@
     return-object v0
 .end method
 
-.method static final synthetic xt()Ljava/lang/String;
+.method static final synthetic xm()Ljava/lang/Integer;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->uh()J
+
+    move-result-wide v0
+
+    long-to-int v1, v0
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic xn()Ljava/lang/Integer;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->ug()J
+
+    move-result-wide v0
+
+    long-to-int v1, v0
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic xo()Ljava/lang/Integer;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->uc()J
+
+    move-result-wide v0
+
+    long-to-int v1, v0
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic xp()Ljava/lang/Integer;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->ul()J
+
+    move-result-wide v0
+
+    long-to-int v1, v0
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic xq()Ljava/lang/Integer;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->ud()J
+
+    move-result-wide v0
+
+    long-to-int v1, v0
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic xr()Ljava/lang/String;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tN()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tL()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method static final synthetic xu()Ljava/lang/String;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tO()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic xv()Ljava/lang/Long;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tL()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 static final synthetic xw()Ljava/lang/Long;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tW()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 static final synthetic xx()Ljava/lang/Long;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tK()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 static final synthetic xy()Ljava/lang/String;
+.method static final synthetic xs()Ljava/lang/String;
     .locals 1
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tM()Ljava/lang/String;
@@ -3419,10 +3339,90 @@
     return-object v0
 .end method
 
-.method static final synthetic xz()Ljava/lang/Boolean;
+.method static final synthetic xt()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tJ()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 static final synthetic xu()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tU()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 static final synthetic xv()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tI()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 static final synthetic xw()Ljava/lang/String;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/in;->ut()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->tK()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic xx()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/in;->ur()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 static final synthetic xy()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hv;->tC()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 static final synthetic xz()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->tG()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ja.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ja.smali
index 10d57e8936..761f9552e2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ja.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ja.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aiZ:Z
+.field private final ajr:Z
 
 
 # direct methods
@@ -14,7 +14,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aiZ:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ja;->ajr:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jb.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jb.smali
index df33136a78..4e95f8fba7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jb.smali
@@ -3,11 +3,11 @@
 
 
 # instance fields
-.field private aLK:Ljava/lang/Boolean;
+.field private aMc:Ljava/lang/Boolean;
 
-.field aLL:Lcom/google/android/gms/measurement/internal/jd;
+.field aMd:Lcom/google/android/gms/measurement/internal/jd;
 
-.field private aLM:Ljava/lang/Boolean;
+.field private aMe:Ljava/lang/Boolean;
 
 
 # direct methods
@@ -16,19 +16,19 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/fh;-><init>(Lcom/google/android/gms/measurement/internal/ek;)V
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/je;->aLN:Lcom/google/android/gms/measurement/internal/jd;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/je;->aMf:Lcom/google/android/gms/measurement/internal/jd;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aLL:Lcom/google/android/gms/measurement/internal/jd;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aMd:Lcom/google/android/gms/measurement/internal/jd;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/j;->a(Lcom/google/android/gms/measurement/internal/ek;)V
 
     return-void
 .end method
 
-.method static zn()Ljava/lang/String;
+.method static zl()Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aDU:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEm:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v1, 0x0
 
@@ -41,7 +41,7 @@
     return-object v0
 .end method
 
-.method private final zp()Landroid/os/Bundle;
+.method private final zn()Landroid/os/Bundle;
     .locals 4
 
     const/4 v0, 0x0
@@ -57,15 +57,15 @@
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to load metadata: PackageManager is null"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-object v0
 
@@ -94,15 +94,15 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to load metadata: ApplicationInfo is null"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-object v0
 
@@ -116,11 +116,11 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Failed to load metadata: Package name not found"
 
@@ -129,10 +129,10 @@
     return-object v0
 .end method
 
-.method public static zs()J
+.method public static zq()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEx:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEP:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v1, 0x0
 
@@ -149,10 +149,10 @@
     return-wide v0
 .end method
 
-.method public static zt()J
+.method public static zr()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aDX:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEp:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v1, 0x0
 
@@ -169,10 +169,10 @@
     return-wide v0
 .end method
 
-.method public static zv()Z
+.method public static zt()Z
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aDT:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEl:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v1, 0x0
 
@@ -189,10 +189,10 @@
     return v0
 .end method
 
-.method static zw()Z
+.method static zu()Z
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEN:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aFf:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v1, 0x0
 
@@ -240,9 +240,9 @@
     return-wide p1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jb;->aLL:Lcom/google/android/gms/measurement/internal/jd;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jb;->aMd:Lcom/google/android/gms/measurement/internal/jd;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/cv;->aFA:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/cv;->aFS:Ljava/lang/String;
 
     invoke-interface {v1, p1, v2}, Lcom/google/android/gms/measurement/internal/jd;->D(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -353,9 +353,9 @@
     return p1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jb;->aLL:Lcom/google/android/gms/measurement/internal/jd;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jb;->aMd:Lcom/google/android/gms/measurement/internal/jd;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/cv;->aFA:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/cv;->aFS:Ljava/lang/String;
 
     invoke-interface {v1, p1, v2}, Lcom/google/android/gms/measurement/internal/jd;->D(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -446,9 +446,9 @@
     return-wide p1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jb;->aLL:Lcom/google/android/gms/measurement/internal/jd;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jb;->aMd:Lcom/google/android/gms/measurement/internal/jd;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/cv;->aFA:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/cv;->aFS:Ljava/lang/String;
 
     invoke-interface {v1, p1, v2}, Lcom/google/android/gms/measurement/internal/jd;->D(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -510,10 +510,10 @@
     return-wide p1
 .end method
 
-.method public final cY(Ljava/lang/String;)I
+.method public final cU(Ljava/lang/String;)I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEi:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEA:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/jb;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)I
 
@@ -522,12 +522,12 @@
     return p1
 .end method
 
-.method final cZ(Ljava/lang/String;)Ljava/lang/Boolean;
+.method final cV(Ljava/lang/String;)Ljava/lang/Boolean;
     .locals 3
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jb;->zp()Landroid/os/Bundle;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jb;->zn()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -535,15 +535,15 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Failed to load metadata: Metadata bundle is null"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-object v1
 
@@ -568,84 +568,7 @@
     return-object p1
 .end method
 
-.method public final d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            "Lcom/google/android/gms/measurement/internal/cv<",
-            "Ljava/lang/Boolean;",
-            ">;)Z"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-nez p1, :cond_0
-
-    invoke-virtual {p2, v0}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jb;->aLL:Lcom/google/android/gms/measurement/internal/jd;
-
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/cv;->aFA:Ljava/lang/String;
-
-    invoke-interface {v1, p1, v2}, Lcom/google/android/gms/measurement/internal/jd;->D(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {p2, v0}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result p1
-
-    return p1
-
-    :cond_1
-    invoke-static {p1}, Ljava/lang/Boolean;->parseBoolean(Ljava/lang/String;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    invoke-virtual {p2, p1}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result p1
-
-    return p1
-.end method
-
-.method final da(Ljava/lang/String;)Ljava/util/List;
+.method final cW(Ljava/lang/String;)Ljava/util/List;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -658,9 +581,9 @@
         }
     .end annotation
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jb;->zp()Landroid/os/Bundle;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jb;->zn()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -668,15 +591,15 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Failed to load metadata: Metadata bundle is null"
 
-    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :goto_0
     move-object p1, v1
@@ -740,11 +663,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to load string array from metadata: resource not found"
 
@@ -753,10 +676,10 @@
     return-object v1
 .end method
 
-.method public final db(Ljava/lang/String;)Z
+.method public final cX(Ljava/lang/String;)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aLL:Lcom/google/android/gms/measurement/internal/jd;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aMd:Lcom/google/android/gms/measurement/internal/jd;
 
     const-string v1, "gaia_collection_enabled"
 
@@ -773,10 +696,135 @@
     return p1
 .end method
 
+.method final cY(Ljava/lang/String;)Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aFa:Lcom/google/android/gms/measurement/internal/cv;
+
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
+
+    move-result p1
+
+    return p1
+.end method
+
+.method final cZ(Ljava/lang/String;)Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aFb:Lcom/google/android/gms/measurement/internal/cv;
+
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public final d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Lcom/google/android/gms/measurement/internal/cv<",
+            "Ljava/lang/Boolean;",
+            ">;)Z"
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    if-nez p1, :cond_0
+
+    invoke-virtual {p2, v0}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+
+    return p1
+
+    :cond_0
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jb;->aMd:Lcom/google/android/gms/measurement/internal/jd;
+
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/cv;->aFS:Ljava/lang/String;
+
+    invoke-interface {v1, p1, v2}, Lcom/google/android/gms/measurement/internal/jd;->D(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p2, v0}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+
+    return p1
+
+    :cond_1
+    invoke-static {p1}, Ljava/lang/Boolean;->parseBoolean(Ljava/lang/String;)Z
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    invoke-virtual {p2, p1}, Lcom/google/android/gms/measurement/internal/cv;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+
+    return p1
+.end method
+
+.method final da(Ljava/lang/String;)Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aFe:Lcom/google/android/gms/measurement/internal/cv;
+
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
+
+    move-result p1
+
+    return p1
+.end method
+
+.method final db(Ljava/lang/String;)Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aFg:Lcom/google/android/gms/measurement/internal/cv;
+
+    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
+
+    move-result p1
+
+    return p1
+.end method
+
 .method final dc(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEI:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aFh:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -788,7 +836,7 @@
 .method final dd(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEJ:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aFj:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -800,55 +848,7 @@
 .method final de(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEM:Lcom/google/android/gms/measurement/internal/cv;
-
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
-
-    move-result p1
-
-    return p1
-.end method
-
-.method final df(Ljava/lang/String;)Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEO:Lcom/google/android/gms/measurement/internal/cv;
-
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
-
-    move-result p1
-
-    return p1
-.end method
-
-.method final dg(Ljava/lang/String;)Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEP:Lcom/google/android/gms/measurement/internal/cv;
-
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
-
-    move-result p1
-
-    return p1
-.end method
-
-.method final dh(Ljava/lang/String;)Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aER:Lcom/google/android/gms/measurement/internal/cv;
-
-    invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
-
-    move-result p1
-
-    return p1
-.end method
-
-.method final di(Ljava/lang/String;)Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aEW:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/j;->aFo:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -867,31 +867,31 @@
     return-object v0
 .end method
 
-.method final mQ()Z
+.method final mO()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aLK:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aMc:Ljava/lang/Boolean;
 
     if-nez v0, :cond_0
 
     const-string v0, "app_measurement_lite"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/measurement/internal/jb;->cZ(Ljava/lang/String;)Ljava/lang/Boolean;
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/measurement/internal/jb;->cV(Ljava/lang/String;)Ljava/lang/Boolean;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aLK:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aMc:Ljava/lang/Boolean;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aLK:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aMc:Ljava/lang/Boolean;
 
     if-nez v0, :cond_0
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aLK:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aMc:Ljava/lang/Boolean;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aLK:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aMc:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -899,9 +899,9 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iget-boolean v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aAM:Z
+    iget-boolean v0, v0, Lcom/google/android/gms/measurement/internal/ek;->aBe:Z
 
     if-nez v0, :cond_1
 
@@ -919,121 +919,121 @@
     return v0
 .end method
 
-.method public final bridge synthetic mc()V
+.method public final bridge synthetic ma()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vA()V
+.method public final bridge synthetic vG()Lcom/google/android/gms/measurement/internal/d;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vG()Lcom/google/android/gms/measurement/internal/d;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vH()Lcom/google/android/gms/common/util/e;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/df;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vJ()Lcom/google/android/gms/measurement/internal/it;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/ed;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/ed;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/dh;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/dp;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/jb;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vx()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vx()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vI()Lcom/google/android/gms/measurement/internal/d;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/d;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vJ()Lcom/google/android/gms/common/util/e;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vK()Lcom/google/android/gms/measurement/internal/df;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vL()Lcom/google/android/gms/measurement/internal/it;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vM()Lcom/google/android/gms/measurement/internal/ed;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/ed;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vN()Lcom/google/android/gms/measurement/internal/dh;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vO()Lcom/google/android/gms/measurement/internal/dp;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vP()Lcom/google/android/gms/measurement/internal/jb;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vz()V
+.method public final bridge synthetic vy()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vz()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fh;->vy()V
 
     return-void
 .end method
 
-.method public final zo()Z
+.method public final zm()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aLM:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aMe:Ljava/lang/Boolean;
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aLM:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aMe:Ljava/lang/Boolean;
 
     if-nez v0, :cond_2
 
@@ -1045,7 +1045,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/m;->mv()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/util/m;->mt()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1073,26 +1073,26 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aLM:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aMe:Ljava/lang/Boolean;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aLM:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aMe:Ljava/lang/Boolean;
 
     if-nez v0, :cond_2
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aLM:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aMe:Ljava/lang/Boolean;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "My process not in the list of running processes"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_2
     monitor-exit p0
@@ -1110,7 +1110,7 @@
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aLM:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aMe:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1119,12 +1119,12 @@
     return v0
 .end method
 
-.method public final zq()Z
+.method public final zo()Z
     .locals 1
 
     const-string v0, "firebase_analytics_collection_deactivated"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/measurement/internal/jb;->cZ(Ljava/lang/String;)Ljava/lang/Boolean;
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/measurement/internal/jb;->cV(Ljava/lang/String;)Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1146,12 +1146,12 @@
     return v0
 .end method
 
-.method public final zr()Ljava/lang/Boolean;
+.method public final zp()Ljava/lang/Boolean;
     .locals 1
 
     const-string v0, "google_analytics_adid_collection_enabled"
 
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/measurement/internal/jb;->cZ(Ljava/lang/String;)Ljava/lang/Boolean;
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/measurement/internal/jb;->cV(Ljava/lang/String;)Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1182,7 +1182,7 @@
     return-object v0
 .end method
 
-.method public final zu()Ljava/lang/String;
+.method public final zs()Ljava/lang/String;
     .locals 8
 
     const-string v0, ""
@@ -1242,11 +1242,11 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "SystemProperties.get() threw an exception"
 
@@ -1257,11 +1257,11 @@
     :catch_1
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Could not access SystemProperties.get()"
 
@@ -1272,11 +1272,11 @@
     :catch_2
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Could not find SystemProperties.get() method"
 
@@ -1287,11 +1287,11 @@
     :catch_3
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Could not find SystemProperties class"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/je.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/je.smali
index 21558047e9..9914dc2ae3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/je.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/je.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aLN:Lcom/google/android/gms/measurement/internal/jd;
+.field static final aMf:Lcom/google/android/gms/measurement/internal/jd;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/je;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/je;->aLN:Lcom/google/android/gms/measurement/internal/jd;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/je;->aMf:Lcom/google/android/gms/measurement/internal/jd;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jf.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jf.smali
index 2c7f505d6a..eac2dd2e81 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jf.smali
@@ -3,15 +3,15 @@
 
 
 # instance fields
-.field aLO:J
+.field aMg:J
 
-.field aLP:J
+.field aMh:J
 
-.field aLQ:J
+.field aMi:J
 
-.field aLR:J
+.field aMj:J
 
-.field aLS:J
+.field aMk:J
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jg.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jg.smali
index ca5e4d26c2..0146419f05 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jg.smali
@@ -3,27 +3,27 @@
 
 
 # static fields
-.field private static final aLT:[Ljava/lang/String;
+.field private static final aMl:[Ljava/lang/String;
 
-.field private static final aLU:[Ljava/lang/String;
+.field private static final aMm:[Ljava/lang/String;
 
-.field private static final aLV:[Ljava/lang/String;
+.field private static final aMn:[Ljava/lang/String;
 
-.field private static final aLW:[Ljava/lang/String;
+.field private static final aMo:[Ljava/lang/String;
 
-.field private static final aLX:[Ljava/lang/String;
+.field private static final aMp:[Ljava/lang/String;
 
-.field private static final aLY:[Ljava/lang/String;
+.field private static final aMq:[Ljava/lang/String;
 
-.field private static final aLZ:[Ljava/lang/String;
+.field private static final aMr:[Ljava/lang/String;
 
-.field private static final aMa:[Ljava/lang/String;
+.field private static final aMs:[Ljava/lang/String;
 
 
 # instance fields
-.field private final aMb:Lcom/google/android/gms/measurement/internal/jh;
+.field private final aMt:Lcom/google/android/gms/measurement/internal/jh;
 
-.field private final aMc:Lcom/google/android/gms/measurement/internal/if;
+.field private final aMu:Lcom/google/android/gms/measurement/internal/if;
 
 
 # direct methods
@@ -106,7 +106,7 @@
 
     aput-object v14, v1, v13
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/jg;->aLT:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/jg;->aMl:[Ljava/lang/String;
 
     new-array v1, v4, [Ljava/lang/String;
 
@@ -118,7 +118,7 @@
 
     aput-object v14, v1, v3
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/jg;->aLU:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/jg;->aMm:[Ljava/lang/String;
 
     const/16 v1, 0x32
 
@@ -398,7 +398,7 @@
 
     aput-object v7, v1, v0
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/jg;->aLV:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/jg;->aMn:[Ljava/lang/String;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -410,7 +410,7 @@
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/jg;->aLW:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMo:[Ljava/lang/String;
 
     new-array v0, v6, [Ljava/lang/String;
 
@@ -430,7 +430,7 @@
 
     aput-object v1, v0, v5
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/jg;->aLX:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMp:[Ljava/lang/String;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -442,7 +442,7 @@
 
     aput-object v5, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/jg;->aLY:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMq:[Ljava/lang/String;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -452,7 +452,7 @@
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/jg;->aLZ:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMr:[Ljava/lang/String;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -464,7 +464,7 @@
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMa:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMs:[Ljava/lang/String;
 
     return-void
 .end method
@@ -476,13 +476,13 @@
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/if;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     invoke-direct {p1, v0}, Lcom/google/android/gms/measurement/internal/if;-><init>(Lcom/google/android/gms/common/util/e;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jg;->aMc:Lcom/google/android/gms/measurement/internal/if;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jg;->aMu:Lcom/google/android/gms/measurement/internal/if;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/jh;
 
@@ -494,7 +494,7 @@
 
     invoke-direct {p1, p0, v0, v1}, Lcom/google/android/gms/measurement/internal/jh;-><init>(Lcom/google/android/gms/measurement/internal/jg;Landroid/content/Context;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jg;->aMb:Lcom/google/android/gms/measurement/internal/jh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jg;->aMt:Lcom/google/android/gms/measurement/internal/jh;
 
     return-void
 .end method
@@ -552,11 +552,11 @@
     move-exception p2
 
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p4, "Database error"
 
@@ -578,7 +578,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/jg;)Lcom/google/android/gms/measurement/internal/if;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/jg;->aMc:Lcom/google/android/gms/measurement/internal/if;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/jg;->aMu:Lcom/google/android/gms/measurement/internal/if;
 
     return-object p0
 .end method
@@ -610,11 +610,11 @@
 
     if-eq v0, p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -627,15 +627,15 @@
     return-object v1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Loaded invalid blob type value, ignoring it"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-object v1
 
@@ -669,15 +669,15 @@
     return-object p1
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Loaded invalid null value from database"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-object v1
 .end method
@@ -685,7 +685,7 @@
 .method private static a(Landroid/content/ContentValues;Ljava/lang/String;Ljava/lang/Object;)V
     .locals 1
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -734,11 +734,11 @@
 .method private final a(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/ad$a;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -754,13 +754,13 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -768,7 +768,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$a;->oC()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$a;->oA()Z
 
     move-result v3
 
@@ -812,7 +812,7 @@
 
     invoke-virtual {v3, v4, p2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Integer;)V
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$a;->oC()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$a;->oA()Z
 
     move-result p2
 
@@ -840,11 +840,11 @@
 
     invoke-virtual {v3, v4, p2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object p2
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aFn:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aFF:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {p2, p1, v4}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -910,15 +910,15 @@
 
     if-nez v0, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Failed to insert event filter (got -1). appId"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -932,13 +932,13 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -952,11 +952,11 @@
 .method private final a(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/ad$d;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -972,13 +972,13 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -986,7 +986,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$d;->oC()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$d;->oA()Z
 
     move-result v3
 
@@ -1030,7 +1030,7 @@
 
     invoke-virtual {v3, v4, p2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Integer;)V
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$d;->oC()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ad$d;->oA()Z
 
     move-result p2
 
@@ -1058,11 +1058,11 @@
 
     invoke-virtual {v3, v4, p2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object p2
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aFn:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aFF:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {p2, p1, v4}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -1128,15 +1128,15 @@
 
     if-nez v0, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p3, "Failed to insert property filter (got -1). appId"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1152,13 +1152,13 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -1227,11 +1227,11 @@
     move-exception p2
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Database error"
 
@@ -1262,11 +1262,11 @@
         }
     .end annotation
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jg;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1289,11 +1289,11 @@
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v2
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aEz:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aER:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v2, p1, v6}, Lcom/google/android/gms/measurement/internal/jb;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)I
 
@@ -1455,13 +1455,13 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -1472,7 +1472,7 @@
     return v1
 .end method
 
-.method private final xL()Z
+.method private final xJ()Z
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
@@ -1492,10 +1492,26 @@
     return v0
 .end method
 
+.method static synthetic zD()[Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMl:[Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method static synthetic zE()[Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMm:[Ljava/lang/String;
+
+    return-object v0
+.end method
+
 .method static synthetic zF()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aLT:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMn:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1503,7 +1519,7 @@
 .method static synthetic zG()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aLU:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMp:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1511,7 +1527,7 @@
 .method static synthetic zH()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aLV:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMo:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1519,7 +1535,7 @@
 .method static synthetic zI()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aLX:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMq:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1527,7 +1543,7 @@
 .method static synthetic zJ()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aLW:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMr:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1535,23 +1551,7 @@
 .method static synthetic zK()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aLY:[Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method static synthetic zL()[Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aLZ:[Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method static synthetic zM()[Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMa:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/jg;->aMs:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1565,19 +1565,19 @@
 
     move-object/from16 v14, p2
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFo:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/j;->aFG:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v15, v1}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -1898,15 +1898,15 @@
 
     if-eqz v1, :cond_a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Got multiple records for event aggregates, expected one. appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -1956,25 +1956,25 @@
 
     :goto_6
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Error querying events. appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v4
 
     move-object/from16 v5, p2
 
-    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -2004,13 +2004,13 @@
 .method public final M(Ljava/lang/String;Ljava/lang/String;)V
     .locals 5
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     :try_start_0
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jg;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
@@ -2037,11 +2037,11 @@
 
     move-result v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Deleted user attribute rows"
 
@@ -2058,21 +2058,21 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v2
 
-    invoke-virtual {v2, p2}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, p2}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -2088,13 +2088,13 @@
 
     move-object/from16 v8, p2
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     const/4 v9, 0x0
 
@@ -2201,15 +2201,15 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Got multiple records for user property, expected one. appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -2263,23 +2263,23 @@
 
     :goto_0
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Error querying user property. appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v4
 
-    invoke-virtual {v4, v8}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v8}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -2311,13 +2311,13 @@
 
     move-object/from16 v7, p2
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     const/4 v8, 0x0
 
@@ -2490,7 +2490,7 @@
 
     move-result-wide v26
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v1
 
@@ -2514,7 +2514,7 @@
 
     move-result-wide v12
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v0
 
@@ -2544,7 +2544,7 @@
 
     move-result-wide v29
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v0
 
@@ -2592,23 +2592,23 @@
 
     if-eqz v1, :cond_3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Got multiple records for conditional property, expected one"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v4
 
-    invoke-virtual {v4, v7}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v7}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -2662,23 +2662,23 @@
 
     :goto_1
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Error querying conditional property"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v4
 
-    invoke-virtual {v4, v7}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v7}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -2708,13 +2708,13 @@
 .method public final P(Ljava/lang/String;Ljava/lang/String;)I
     .locals 6
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     const/4 v0, 0x0
 
@@ -2748,21 +2748,21 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v3
 
-    invoke-virtual {v3, p2}, Lcom/google/android/gms/measurement/internal/df;->cl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v3, p2}, Lcom/google/android/gms/measurement/internal/df;->ch(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -2789,13 +2789,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     new-instance v0, Landroidx/collection/ArrayMap;
 
@@ -2886,7 +2886,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rN()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rL()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v2
 
@@ -2933,15 +2933,15 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Failed to merge filter. appId"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -2983,15 +2983,15 @@
 
     :goto_1
     :try_start_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Database error querying filters. appId"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -3040,13 +3040,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     new-instance v0, Landroidx/collection/ArrayMap;
 
@@ -3137,7 +3137,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rN()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rL()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v2
 
@@ -3184,15 +3184,15 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Failed to merge filter"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -3234,15 +3234,15 @@
 
     :goto_1
     :try_start_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Database error querying filters. appId"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -3282,13 +3282,13 @@
 
     move-object/from16 v2, p2
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jg;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -3393,15 +3393,15 @@
 
     if-nez v14, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v6, "Failed to insert column (got -1). appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v7
 
@@ -3451,15 +3451,15 @@
 
     if-nez v0, :cond_2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Failed to update column (got 0). appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -3510,15 +3510,15 @@
 
     :goto_1
     :try_start_5
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Error inserting column. appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -3551,9 +3551,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -3563,7 +3563,7 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->bh(I)I
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jg;->xL()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jg;->xJ()Z
 
     move-result v0
 
@@ -3646,15 +3646,15 @@
 
     if-lez v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "The number of upload retries exceeds the limit. Will remain unchanged."
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     :cond_1
     :try_start_0
@@ -3699,11 +3699,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Error incrementing retry count. error"
 
@@ -3727,11 +3727,11 @@
 
     const-string v5, "day"
 
-    invoke-static/range {p3 .. p3}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p3 .. p3}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     const/4 v6, 0x1
 
@@ -3816,15 +3816,15 @@
 
     if-nez v11, :cond_1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Not updating daily counts, app is not known. appId"
 
-    invoke-static/range {p3 .. p3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p3 .. p3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -3854,7 +3854,7 @@
 
     move-result-wide v11
 
-    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aLP:J
+    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aMh:J
 
     const/4 v6, 0x2
 
@@ -3862,7 +3862,7 @@
 
     move-result-wide v11
 
-    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aLO:J
+    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aMg:J
 
     const/4 v6, 0x3
 
@@ -3870,7 +3870,7 @@
 
     move-result-wide v11
 
-    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aLQ:J
+    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aMi:J
 
     const/4 v6, 0x4
 
@@ -3878,7 +3878,7 @@
 
     move-result-wide v11
 
-    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aLR:J
+    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aMj:J
 
     const/4 v6, 0x5
 
@@ -3886,54 +3886,54 @@
 
     move-result-wide v11
 
-    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aLS:J
+    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aMk:J
 
     :cond_2
     const-wide/16 v11, 0x1
 
     if-eqz p4, :cond_3
 
-    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aLP:J
+    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aMh:J
 
     add-long/2addr v13, v11
 
-    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aLP:J
+    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aMh:J
 
     :cond_3
     if-eqz p5, :cond_4
 
-    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aLO:J
+    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aMg:J
 
     add-long/2addr v13, v11
 
-    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aLO:J
+    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aMg:J
 
     :cond_4
     if-eqz p6, :cond_5
 
-    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aLQ:J
+    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aMi:J
 
     add-long/2addr v13, v11
 
-    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aLQ:J
+    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aMi:J
 
     :cond_5
     if-eqz p7, :cond_6
 
-    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aLR:J
+    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aMj:J
 
     add-long/2addr v13, v11
 
-    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aLR:J
+    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aMj:J
 
     :cond_6
     if-eqz p8, :cond_7
 
-    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aLS:J
+    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aMk:J
 
     add-long/2addr v13, v11
 
-    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aLS:J
+    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/jf;->aMk:J
 
     :cond_7
     new-instance v6, Landroid/content/ContentValues;
@@ -3946,7 +3946,7 @@
 
     invoke-virtual {v6, v5, v8}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aLO:J
+    iget-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aMg:J
 
     invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -3954,7 +3954,7 @@
 
     invoke-virtual {v6, v3, v5}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aLP:J
+    iget-wide v11, v9, Lcom/google/android/gms/measurement/internal/jf;->aMh:J
 
     invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -3962,7 +3962,7 @@
 
     invoke-virtual {v6, v4, v3}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-wide v3, v9, Lcom/google/android/gms/measurement/internal/jf;->aLQ:J
+    iget-wide v3, v9, Lcom/google/android/gms/measurement/internal/jf;->aMi:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -3970,7 +3970,7 @@
 
     invoke-virtual {v6, v2, v3}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-wide v2, v9, Lcom/google/android/gms/measurement/internal/jf;->aLR:J
+    iget-wide v2, v9, Lcom/google/android/gms/measurement/internal/jf;->aMj:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -3978,7 +3978,7 @@
 
     invoke-virtual {v6, v1, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-wide v1, v9, Lcom/google/android/gms/measurement/internal/jf;->aLS:J
+    iget-wide v1, v9, Lcom/google/android/gms/measurement/internal/jf;->aMk:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4023,15 +4023,15 @@
 
     :goto_0
     :try_start_3
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Error updating daily counts. appId"
 
-    invoke-static/range {p3 .. p3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p3 .. p3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -4063,15 +4063,15 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     new-instance v0, Landroid/content/ContentValues;
 
     invoke-direct {v0}, Landroid/content/ContentValues;-><init>()V
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDu:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDM:Ljava/lang/String;
 
     const-string v2, "app_id"
 
@@ -4083,7 +4083,7 @@
 
     invoke-virtual {v0, v2, v1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDv:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDN:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4093,7 +4093,7 @@
 
     invoke-virtual {v0, v2, v1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDw:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDO:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4103,7 +4103,7 @@
 
     invoke-virtual {v0, v2, v1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDy:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDQ:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4113,7 +4113,7 @@
 
     invoke-virtual {v0, v2, v1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDz:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDR:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4123,31 +4123,31 @@
 
     invoke-virtual {v0, v2, v1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDA:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDS:Ljava/lang/Long;
 
     const-string v2, "last_bundled_day"
 
     invoke-virtual {v0, v2, v1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDB:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDT:Ljava/lang/Long;
 
     const-string v2, "last_sampled_complex_event_id"
 
     invoke-virtual {v0, v2, v1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDC:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDU:Ljava/lang/Long;
 
     const-string v2, "last_sampling_rate"
 
     invoke-virtual {v0, v2, v1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/f;->aDu:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/f;->aDM:Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/j;->aFo:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/j;->aFG:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -4155,7 +4155,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDx:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDP:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4166,13 +4166,13 @@
     invoke-virtual {v0, v2, v1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
     :cond_0
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDD:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDV:Ljava/lang/Boolean;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDD:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/f;->aDV:Ljava/lang/Boolean;
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -4215,17 +4215,17 @@
 
     if-nez v4, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Failed to insert/update event aggregates (got -1). appId"
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/f;->aDu:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/f;->aDM:Ljava/lang/String;
 
-    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -4239,15 +4239,15 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/f;->aDu:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/f;->aDM:Ljava/lang/String;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -4275,11 +4275,11 @@
 
     const-string v6, "property_filters"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -4290,11 +4290,11 @@
     invoke-virtual {v7}, Landroid/database/sqlite/SQLiteDatabase;->beginTransaction()V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jg;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -4325,35 +4325,35 @@
 
     aget-object v10, v2, v8
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {v10}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v12, v10, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v12, v10, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     invoke-static {v12}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v12, v10, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v12, v10, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     invoke-static {v12}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v12, v10, Lcom/google/android/gms/internal/measurement/ao;->ari:Ljava/lang/Integer;
+    iget-object v12, v10, Lcom/google/android/gms/internal/measurement/ao;->arA:Ljava/lang/Integer;
 
     if-nez v12, :cond_1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v12, "Audience with no ID. appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v13
 
@@ -4366,13 +4366,13 @@
     goto/16 :goto_8
 
     :cond_1
-    iget-object v12, v10, Lcom/google/android/gms/internal/measurement/ao;->ari:Ljava/lang/Integer;
+    iget-object v12, v10, Lcom/google/android/gms/internal/measurement/ao;->arA:Ljava/lang/Integer;
 
     invoke-virtual {v12}, Ljava/lang/Integer;->intValue()I
 
     move-result v12
 
-    iget-object v13, v10, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v13, v10, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     array-length v14, v13
 
@@ -4383,25 +4383,25 @@
 
     aget-object v16, v13, v15
 
-    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/internal/measurement/ad$a;->oC()Z
+    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/internal/measurement/ad$a;->oA()Z
 
     move-result v16
 
     if-nez v16, :cond_2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v13, "Event filter with no ID. Audience definition ignored. appId, audienceId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v14
 
-    iget-object v10, v10, Lcom/google/android/gms/internal/measurement/ao;->ari:Ljava/lang/Integer;
+    iget-object v10, v10, Lcom/google/android/gms/internal/measurement/ao;->arA:Ljava/lang/Integer;
 
     invoke-virtual {v12, v13, v14, v10}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -4413,7 +4413,7 @@
     goto :goto_2
 
     :cond_3
-    iget-object v13, v10, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v13, v10, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     array-length v14, v13
 
@@ -4424,25 +4424,25 @@
 
     aget-object v16, v13, v15
 
-    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/internal/measurement/ad$d;->oC()Z
+    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/internal/measurement/ad$d;->oA()Z
 
     move-result v16
 
     if-nez v16, :cond_4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v13, "Property filter with no ID. Audience definition ignored. appId, audienceId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v14
 
-    iget-object v10, v10, Lcom/google/android/gms/internal/measurement/ao;->ari:Ljava/lang/Integer;
+    iget-object v10, v10, Lcom/google/android/gms/internal/measurement/ao;->arA:Ljava/lang/Integer;
 
     invoke-virtual {v12, v13, v14, v10}, Lcom/google/android/gms/measurement/internal/dj;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -4454,7 +4454,7 @@
     goto :goto_3
 
     :cond_5
-    iget-object v13, v10, Lcom/google/android/gms/internal/measurement/ao;->ark:[Lcom/google/android/gms/internal/measurement/ad$a;
+    iget-object v13, v10, Lcom/google/android/gms/internal/measurement/ao;->arC:[Lcom/google/android/gms/internal/measurement/ad$a;
 
     array-length v14, v13
 
@@ -4488,7 +4488,7 @@
     :goto_5
     if-eqz v9, :cond_9
 
-    iget-object v10, v10, Lcom/google/android/gms/internal/measurement/ao;->arj:[Lcom/google/android/gms/internal/measurement/ad$d;
+    iget-object v10, v10, Lcom/google/android/gms/internal/measurement/ao;->arB:[Lcom/google/android/gms/internal/measurement/ad$d;
 
     array-length v13, v10
 
@@ -4518,11 +4518,11 @@
     :goto_7
     if-nez v9, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jg;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -4577,7 +4577,7 @@
 
     aget-object v5, v2, v11
 
-    iget-object v5, v5, Lcom/google/android/gms/internal/measurement/ao;->ari:Ljava/lang/Integer;
+    iget-object v5, v5, Lcom/google/android/gms/internal/measurement/ao;->arA:Ljava/lang/Integer;
 
     invoke-interface {v3, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -4613,27 +4613,27 @@
 .method public final a(Lcom/google/android/gms/measurement/internal/g;JZ)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$c;->pr()Lcom/google/android/gms/internal/measurement/al$c$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$c;->pp()Lcom/google/android/gms/internal/measurement/al$c$a;
 
     move-result-object v0
 
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/g;->aDE:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/g;->aDW:J
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/al$c$a;->B(J)Lcom/google/android/gms/internal/measurement/al$c$a;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/g;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/g;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzah;->iterator()Ljava/util/Iterator;
 
@@ -4652,21 +4652,21 @@
 
     check-cast v2, Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->pA()Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$e;->py()Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v3
 
-    invoke-virtual {v3, v2}, Lcom/google/android/gms/internal/measurement/al$e$a;->bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
+    invoke-virtual {v3, v2}, Lcom/google/android/gms/internal/measurement/al$e$a;->by(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/al$e$a;
 
     move-result-object v3
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/g;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/g;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     invoke-virtual {v4, v2}, Lcom/google/android/gms/measurement/internal/zzah;->get(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v4
 
@@ -4677,7 +4677,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v0
 
@@ -4689,19 +4689,19 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v2
 
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/g;->name:Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -4719,7 +4719,7 @@
 
     invoke-direct {v1}, Landroid/content/ContentValues;-><init>()V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
     const-string v3, "app_id"
 
@@ -4782,17 +4782,17 @@
 
     if-nez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p4, "Failed to insert raw event (got -1). appId"
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -4810,15 +4810,15 @@
     :catch_0
     move-exception p3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p4
 
-    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/g;->aDu:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/g;->aDM:Ljava/lang/String;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -4834,11 +4834,11 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/iq;->aDu:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/iq;->aDM:Ljava/lang/String;
 
     iget-object v1, p1, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
@@ -4852,7 +4852,7 @@
 
     iget-object v0, p1, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/it;->cQ(Ljava/lang/String;)Z
+    invoke-static {v0}, Lcom/google/android/gms/measurement/internal/it;->cM(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -4864,7 +4864,7 @@
 
     new-array v0, v1, [Ljava/lang/String;
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aDu:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aDM:Ljava/lang/String;
 
     aput-object v5, v0, v4
 
@@ -4881,13 +4881,13 @@
     return v4
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v0
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aDu:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aDM:Ljava/lang/String;
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aEY:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/j;->aFq:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v0, v5, v6}, Lcom/google/android/gms/measurement/internal/jb;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)Z
 
@@ -4911,11 +4911,11 @@
 
     new-array v0, v5, [Ljava/lang/String;
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aDu:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aDM:Ljava/lang/String;
 
     aput-object v5, v0, v4
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aAO:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aBg:Ljava/lang/String;
 
     aput-object v5, v0, v1
 
@@ -4932,11 +4932,11 @@
     :cond_1
     new-array v0, v5, [Ljava/lang/String;
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aDu:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aDM:Ljava/lang/String;
 
     aput-object v5, v0, v4
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aAO:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aBg:Ljava/lang/String;
 
     aput-object v5, v0, v1
 
@@ -4955,13 +4955,13 @@
 
     invoke-direct {v0}, Landroid/content/ContentValues;-><init>()V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/iq;->aDu:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/iq;->aDM:Ljava/lang/String;
 
     const-string v3, "app_id"
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/iq;->aAO:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/iq;->aBg:Ljava/lang/String;
 
     const-string v3, "origin"
 
@@ -4973,7 +4973,7 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/iq;->aLn:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/iq;->aLF:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -5010,17 +5010,17 @@
 
     if-nez v0, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to insert/update user property (got -1). appId"
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/iq;->aDu:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/iq;->aDM:Ljava/lang/String;
 
-    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -5033,15 +5033,15 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/iq;->aDu:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/iq;->aDM:Ljava/lang/String;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -5057,13 +5057,13 @@
 .method public final a(Ljava/lang/String;Ljava/lang/Long;JLcom/google/android/gms/internal/measurement/al$c;)Z
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-static {p5}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -5071,17 +5071,17 @@
 
     move-result-object p5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vK()Lcom/google/android/gms/measurement/internal/df;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vI()Lcom/google/android/gms/measurement/internal/df;
 
     move-result-object v1
 
-    invoke-virtual {v1, p1}, Lcom/google/android/gms/measurement/internal/df;->cj(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v1, p1}, Lcom/google/android/gms/measurement/internal/df;->cf(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -5142,15 +5142,15 @@
 
     if-nez p5, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p4, "Failed to insert complex main event (got -1). appId"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p5
 
@@ -5168,13 +5168,13 @@
     :catch_0
     move-exception p3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p4
 
-    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -5188,9 +5188,9 @@
 .method public final av(J)Ljava/lang/String;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     const/4 v0, 0x0
 
@@ -5227,15 +5227,15 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "No expired configs for apps with pending events"
 
-    invoke-virtual {p2, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p2, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
@@ -5282,11 +5282,11 @@
 
     :goto_0
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Error selecting expired configs"
 
@@ -5328,9 +5328,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     const/4 v0, 0x0
 
@@ -5371,15 +5371,15 @@
 
     if-nez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "Main event not found"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
@@ -5409,7 +5409,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rN()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rL()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v4
 
@@ -5440,15 +5440,15 @@
     move-exception v2
 
     :try_start_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Failed to merge main event. appId, eventId"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -5483,11 +5483,11 @@
 
     :goto_0
     :try_start_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Error selecting main event"
 
@@ -5531,9 +5531,9 @@
 
     move/from16 v1, p3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     const/4 v2, 0x1
 
@@ -5563,7 +5563,7 @@
     :goto_1
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkArgument(Z)V
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -5653,7 +5653,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v9
 
@@ -5683,11 +5683,11 @@
 
     :cond_5
     :try_start_4
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$g;->pM()Lcom/google/android/gms/internal/measurement/al$g$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/al$g;->pK()Lcom/google/android/gms/internal/measurement/al$g$a;
 
     move-result-object v9
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rN()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rL()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v10
 
@@ -5719,7 +5719,7 @@
 
     add-int/2addr v6, v0
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dr$a;->sn()Lcom/google/android/gms/internal/measurement/fb;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dr$a;->sl()Lcom/google/android/gms/internal/measurement/fb;
 
     move-result-object v0
 
@@ -5742,15 +5742,15 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Failed to merge queued bundle. appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v9
 
@@ -5761,15 +5761,15 @@
     :catch_1
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v8, "Failed to unzip queued bundle. appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v9
 
@@ -5804,15 +5804,15 @@
     move-exception v0
 
     :try_start_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Error querying bundles. appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -5849,7 +5849,7 @@
 .method public final beginTransaction()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jg;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -5860,10 +5860,10 @@
     return-void
 .end method
 
-.method public final bv(Ljava/lang/String;)J
+.method public final bq(Ljava/lang/String;)J
     .locals 3
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const/4 v0, 0x1
 
@@ -5899,9 +5899,9 @@
         }
     .end annotation
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -6061,11 +6061,11 @@
 
     if-lt v3, v4, :cond_2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Read more than the max allowed conditional properties, ignoring extra"
 
@@ -6120,7 +6120,7 @@
 
     move-result-wide v25
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v4
 
@@ -6144,7 +6144,7 @@
 
     move-result-wide v27
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v4
 
@@ -6176,7 +6176,7 @@
 
     move-result-wide v31
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v4
 
@@ -6290,11 +6290,11 @@
 
     :goto_3
     :try_start_3
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Error querying conditional user property value"
 
@@ -6340,15 +6340,15 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     new-instance v1, Landroid/content/ContentValues;
 
     invoke-direct {v1}, Landroid/content/ContentValues;-><init>()V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v2
 
@@ -6372,7 +6372,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yf()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yd()Ljava/lang/String;
 
     move-result-object v2
 
@@ -6380,7 +6380,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yp()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yn()J
 
     move-result-wide v2
 
@@ -6392,7 +6392,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yg()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->ye()J
 
     move-result-wide v2
 
@@ -6404,7 +6404,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yh()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yf()J
 
     move-result-wide v2
 
@@ -6416,7 +6416,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yg()Ljava/lang/String;
 
     move-result-object v2
 
@@ -6424,7 +6424,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yk()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yi()Ljava/lang/String;
 
     move-result-object v2
 
@@ -6432,7 +6432,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yl()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
 
     move-result-wide v2
 
@@ -6444,7 +6444,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->ym()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yk()J
 
     move-result-wide v2
 
@@ -6456,7 +6456,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yo()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->ym()Z
 
     move-result v2
 
@@ -6468,15 +6468,15 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Boolean;)V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aHG:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aHY:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -6486,15 +6486,15 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aHH:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aHZ:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -6504,15 +6504,15 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aHI:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aIa:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -6522,15 +6522,15 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aHJ:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aIb:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -6540,7 +6540,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yq()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yo()J
 
     move-result-wide v2
 
@@ -6552,7 +6552,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yr()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yp()J
 
     move-result-wide v2
 
@@ -6564,7 +6564,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yj()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yh()J
 
     move-result-wide v2
 
@@ -6584,15 +6584,15 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aHK:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aIc:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -6602,15 +6602,15 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aHL:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/ea;->aId:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -6620,7 +6620,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yt()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yr()Ljava/lang/String;
 
     move-result-object v2
 
@@ -6628,7 +6628,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yu()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->ys()J
 
     move-result-wide v2
 
@@ -6640,7 +6640,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yv()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yt()Z
 
     move-result v2
 
@@ -6652,7 +6652,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Boolean;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yw()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yu()Z
 
     move-result v2
 
@@ -6664,7 +6664,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Boolean;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->xG()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->xE()Ljava/lang/String;
 
     move-result-object v2
 
@@ -6672,7 +6672,7 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yn()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yl()J
 
     move-result-wide v2
 
@@ -6684,13 +6684,13 @@
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yy()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yw()Ljava/util/List;
 
     move-result-object v2
 
     if-eqz v2, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yy()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yw()Ljava/util/List;
 
     move-result-object v2
 
@@ -6700,13 +6700,13 @@
 
     if-nez v2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v3
 
@@ -6717,7 +6717,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yy()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->yw()Ljava/util/List;
 
     move-result-object v2
 
@@ -6746,7 +6746,7 @@
 
     const/4 v5, 0x0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v6
 
@@ -6778,19 +6778,19 @@
 
     if-nez v4, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Failed to insert/update app (got -1). appId"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -6804,17 +6804,17 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pY()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ea;->pW()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -6828,25 +6828,25 @@
 .method public final c(Lcom/google/android/gms/internal/measurement/al$g;Z)Z
     .locals 7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object v0, p1, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$g;->pK()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$g;->pI()Z
 
     move-result v0
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkState(Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jg;->zz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jg;->zx()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -6856,7 +6856,7 @@
 
     iget-wide v2, p1, Lcom/google/android/gms/internal/measurement/al$g;->zzxd:J
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zs()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zq()J
 
     move-result-wide v4
 
@@ -6868,7 +6868,7 @@
 
     iget-wide v2, p1, Lcom/google/android/gms/internal/measurement/al$g;->zzxd:J
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zs()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zq()J
 
     move-result-wide v4
 
@@ -6879,15 +6879,15 @@
     if-lez v6, :cond_1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -6913,7 +6913,7 @@
     const/4 v1, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v2
 
@@ -6923,11 +6923,11 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     array-length v3, v0
 
@@ -6971,7 +6971,7 @@
 
     invoke-virtual {v2, v0, p2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Integer;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$g;->pL()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/al$g;->pJ()Z
 
     move-result p2
 
@@ -7007,17 +7007,17 @@
 
     if-nez p2, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v0, "Failed to insert bundle (got -1). appId"
 
     iget-object v2, p1, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -7035,15 +7035,15 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object p1, p1, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -7056,15 +7056,15 @@
     :catch_1
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object p1, p1, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -7080,13 +7080,13 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
@@ -7131,13 +7131,13 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
     const-string v3, "origin"
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
@@ -7145,7 +7145,7 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/zzjn;->getValue()Ljava/lang/Object;
 
@@ -7165,13 +7165,13 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Boolean;)V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLE:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLW:Ljava/lang/String;
 
     const-string v3, "trigger_event_name"
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLG:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLY:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -7181,9 +7181,9 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLF:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLX:Lcom/google/android/gms/measurement/internal/zzai;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/it;->a(Landroid/os/Parcelable;)[B
 
@@ -7193,7 +7193,7 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;[B)V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLD:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLV:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -7203,9 +7203,9 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/it;->a(Landroid/os/Parcelable;)[B
 
@@ -7215,9 +7215,9 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;[B)V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iget-wide v2, v2, Lcom/google/android/gms/measurement/internal/zzjn;->aLn:J
+    iget-wide v2, v2, Lcom/google/android/gms/measurement/internal/zzjn;->aLF:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -7227,7 +7227,7 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLI:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aMa:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -7237,9 +7237,9 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/it;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/measurement/internal/it;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/it;->a(Landroid/os/Parcelable;)[B
 
@@ -7270,17 +7270,17 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to insert/update conditional user property (got -1)"
 
     iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -7293,15 +7293,15 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -7314,7 +7314,7 @@
     return v1
 .end method
 
-.method public final dj(Ljava/lang/String;)Ljava/util/List;
+.method public final df(Ljava/lang/String;)Ljava/util/List;
     .locals 22
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -7327,11 +7327,11 @@
         }
     .end annotation
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -7445,15 +7445,15 @@
 
     if-nez v21, :cond_3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Read invalid user property value, ignoring it. appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v6
 
@@ -7526,15 +7526,15 @@
 
     :goto_1
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Error querying user properties. appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v6
 
@@ -7567,16 +7567,16 @@
     goto :goto_3
 .end method
 
-.method public final dk(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
+.method public final dg(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/ea;
     .locals 20
 
     move-object/from16 v1, p1
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     const/4 v2, 0x0
 
@@ -7823,9 +7823,9 @@
     move-object/from16 v5, p0
 
     :try_start_3
-    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/jg;->aGw:Lcom/google/android/gms/measurement/internal/ii;
+    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/jg;->aGO:Lcom/google/android/gms/measurement/internal/ii;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ii;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ii;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-direct {v4, v6, v1}, Lcom/google/android/gms/measurement/internal/ea;-><init>(Lcom/google/android/gms/measurement/internal/ek;Ljava/lang/String;)V
 
@@ -7833,19 +7833,19 @@
 
     move-result-object v6
 
-    invoke-virtual {v4, v6}, Lcom/google/android/gms/measurement/internal/ea;->aM(Ljava/lang/String;)V
+    invoke-virtual {v4, v6}, Lcom/google/android/gms/measurement/internal/ea;->aH(Ljava/lang/String;)V
 
     invoke-interface {v3, v12}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-virtual {v4, v6}, Lcom/google/android/gms/measurement/internal/ea;->cv(Ljava/lang/String;)V
+    invoke-virtual {v4, v6}, Lcom/google/android/gms/measurement/internal/ea;->cr(Ljava/lang/String;)V
 
     invoke-interface {v3, v13}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-virtual {v4, v6}, Lcom/google/android/gms/measurement/internal/ea;->cx(Ljava/lang/String;)V
+    invoke-virtual {v4, v6}, Lcom/google/android/gms/measurement/internal/ea;->ct(Ljava/lang/String;)V
 
     invoke-interface {v3, v14}, Landroid/database/Cursor;->getLong(I)J
 
@@ -7871,7 +7871,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->cz(Ljava/lang/String;)V
+    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->cv(Ljava/lang/String;)V
 
     const/4 v0, 0x7
 
@@ -7879,7 +7879,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->cA(Ljava/lang/String;)V
+    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->cw(Ljava/lang/String;)V
 
     const/16 v0, 0x8
 
@@ -7923,7 +7923,7 @@
     const/4 v0, 0x1
 
     :goto_1
-    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->Q(Z)V
+    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->O(Z)V
 
     const/16 v0, 0xb
 
@@ -7931,17 +7931,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/ea;->aHG:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/ea;->aHY:J
 
     cmp-long v10, v8, v6
 
@@ -7957,9 +7957,9 @@
     :goto_2
     or-int/2addr v0, v8
 
-    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aHG:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aHY:J
 
     const/16 v0, 0xc
 
@@ -7967,17 +7967,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/ea;->aHH:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/ea;->aHZ:J
 
     cmp-long v10, v8, v6
 
@@ -7993,9 +7993,9 @@
     :goto_3
     or-int/2addr v0, v8
 
-    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aHH:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aHZ:J
 
     const/16 v0, 0xd
 
@@ -8003,17 +8003,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/ea;->aHI:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/ea;->aIa:J
 
     cmp-long v10, v8, v6
 
@@ -8029,9 +8029,9 @@
     :goto_4
     or-int/2addr v0, v8
 
-    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aHI:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aIa:J
 
     const/16 v0, 0xe
 
@@ -8039,17 +8039,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/ea;->aHJ:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/ea;->aIb:J
 
     cmp-long v10, v8, v6
 
@@ -8065,9 +8065,9 @@
     :goto_5
     or-int/2addr v0, v8
 
-    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aHJ:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aIb:J
 
     const/16 v0, 0xf
 
@@ -8113,7 +8113,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->cy(Ljava/lang/String;)V
+    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->cu(Ljava/lang/String;)V
 
     const/16 v0, 0x13
 
@@ -8121,17 +8121,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/ea;->aHK:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/ea;->aIc:J
 
     cmp-long v10, v8, v6
 
@@ -8147,9 +8147,9 @@
     :goto_7
     or-int/2addr v0, v8
 
-    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aHK:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aIc:J
 
     const/16 v0, 0x14
 
@@ -8157,17 +8157,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/ea;->aHL:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/ea;->aId:J
 
     cmp-long v10, v8, v6
 
@@ -8183,9 +8183,9 @@
     :goto_8
     or-int/2addr v0, v8
 
-    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aHL:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aId:J
 
     const/16 v0, 0x15
 
@@ -8193,7 +8193,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->cB(Ljava/lang/String;)V
+    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->cx(Ljava/lang/String;)V
 
     const/16 v0, 0x16
 
@@ -8241,7 +8241,7 @@
     const/4 v0, 0x1
 
     :goto_b
-    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->T(Z)V
+    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->R(Z)V
 
     const/16 v0, 0x18
 
@@ -8269,7 +8269,7 @@
     const/4 v0, 0x1
 
     :goto_d
-    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->U(Z)V
+    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->S(Z)V
 
     const/16 v0, 0x19
 
@@ -8277,7 +8277,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->cw(Ljava/lang/String;)V
+    invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/ea;->cs(Ljava/lang/String;)V
 
     const/16 v0, 0x1a
 
@@ -8323,15 +8323,15 @@
 
     move-result-object v0
 
-    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aFN:Ljava/util/List;
+    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aGf:Ljava/util/List;
 
     invoke-static {v6, v0}, Lcom/google/android/gms/measurement/internal/it;->c(Ljava/util/List;Ljava/util/List;)Z
 
@@ -8339,7 +8339,7 @@
 
     if-nez v6, :cond_12
 
-    iput-boolean v12, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v12, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
     if-eqz v0, :cond_11
 
@@ -8353,18 +8353,18 @@
     move-object v6, v2
 
     :goto_f
-    iput-object v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aFN:Ljava/util/List;
+    iput-object v6, v4, Lcom/google/android/gms/measurement/internal/ea;->aGf:Ljava/util/List;
 
     :cond_12
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/ea;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vM()Lcom/google/android/gms/measurement/internal/ed;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vK()Lcom/google/android/gms/measurement/internal/ed;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    iput-boolean v11, v4, Lcom/google/android/gms/measurement/internal/ea;->aHN:Z
+    iput-boolean v11, v4, Lcom/google/android/gms/measurement/internal/ea;->aIf:Z
 
     invoke-interface {v3}, Landroid/database/Cursor;->moveToNext()Z
 
@@ -8372,15 +8372,15 @@
 
     if-eqz v0, :cond_13
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v6, "Got multiple records for app, expected one. appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v7
 
@@ -8434,15 +8434,15 @@
 
     :goto_10
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v6, "Error querying app. appId"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -8469,25 +8469,25 @@
     throw v0
 .end method
 
-.method public final dl(Ljava/lang/String;)J
+.method public final dh(Ljava/lang/String;)J
     .locals 6
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     :try_start_0
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jg;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vP()Lcom/google/android/gms/measurement/internal/jb;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/jb;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aEj:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/j;->aEB:Lcom/google/android/gms/measurement/internal/cv;
 
     invoke-virtual {v1, p1, v2}, Lcom/google/android/gms/measurement/internal/jb;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/cv;)I
 
@@ -8536,13 +8536,13 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -8555,14 +8555,14 @@
     return-wide v0
 .end method
 
-.method public final dm(Ljava/lang/String;)[B
+.method public final di(Ljava/lang/String;)[B
     .locals 11
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     const/4 v0, 0x0
 
@@ -8643,15 +8643,15 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Got multiple records for app config, expected one. appId"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -8687,15 +8687,15 @@
 
     :goto_0
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Error querying remote config. appId"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -8722,7 +8722,7 @@
     throw p1
 .end method
 
-.method final dn(Ljava/lang/String;)Ljava/util/Map;
+.method final dj(Ljava/lang/String;)Ljava/util/Map;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -8737,11 +8737,11 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     new-instance v0, Landroidx/collection/ArrayMap;
 
@@ -8870,15 +8870,15 @@
 
     :goto_0
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Database error querying scoped filters. appId"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -8911,7 +8911,7 @@
     goto :goto_2
 .end method
 
-.method final do(Ljava/lang/String;)Ljava/util/Map;
+.method final dk(Ljava/lang/String;)Ljava/util/Map;
     .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -8925,11 +8925,11 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jg;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -9011,7 +9011,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rN()Lcom/google/android/gms/internal/measurement/de;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/de;->rL()Lcom/google/android/gms/internal/measurement/de;
 
     move-result-object v4
 
@@ -9035,15 +9035,15 @@
     :catch_0
     move-exception v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Failed to merge filter results. appId, audienceId, error"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v6
 
@@ -9089,15 +9089,15 @@
 
     :goto_1
     :try_start_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v3, "Database error querying filter results. appId"
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -9133,7 +9133,7 @@
 .method public final endTransaction()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jg;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -9159,11 +9159,11 @@
         }
     .end annotation
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -9332,11 +9332,11 @@
 
     if-lt v4, v6, :cond_4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Read more than the max allowed user properties, ignoring excess"
 
@@ -9379,15 +9379,15 @@
     if-nez v15, :cond_5
 
     :try_start_6
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "(2)Read invalid user property value, ignoring it"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v7
 
@@ -9546,15 +9546,15 @@
 
     :goto_7
     :try_start_9
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "(2)Error querying user properties"
 
-    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v6
 
@@ -9605,11 +9605,11 @@
         }
     .end annotation
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -9687,10 +9687,10 @@
 .method final getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jg;->aMb:Lcom/google/android/gms/measurement/internal/jh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jg;->aMt:Lcom/google/android/gms/measurement/internal/jh;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jh;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -9703,11 +9703,11 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Error opening database"
 
@@ -9724,21 +9724,21 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object v0, p1, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/bz;->toByteArray()[B
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ig;->xP()Lcom/google/android/gms/measurement/internal/ip;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ig;->xN()Lcom/google/android/gms/measurement/internal/ip;
 
     move-result-object v1
 
@@ -9788,15 +9788,15 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     iget-object p1, p1, Lcom/google/android/gms/internal/measurement/al$g;->zzxm:Ljava/lang/String;
 
-    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->cm(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dh;->ci(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -9810,7 +9810,7 @@
 .method public final setTransactionSuccessful()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jg;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -9821,7 +9821,7 @@
     return-void
 .end method
 
-.method protected final vR()Z
+.method protected final vP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -9829,39 +9829,7 @@
     return v0
 .end method
 
-.method public final zA()J
-    .locals 4
-
-    const-string v0, "select max(bundle_end_timestamp) from queue"
-
-    const/4 v1, 0x0
-
-    const-wide/16 v2, 0x0
-
-    invoke-direct {p0, v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/jg;->a(Ljava/lang/String;[Ljava/lang/String;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final zB()J
-    .locals 4
-
-    const-string v0, "select max(timestamp) from raw_events"
-
-    const/4 v1, 0x0
-
-    const-wide/16 v2, 0x0
-
-    invoke-direct {p0, v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/jg;->a(Ljava/lang/String;[Ljava/lang/String;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final zC()Z
+.method public final zA()Z
     .locals 5
 
     const-string v0, "select count(1) > 0 from raw_events"
@@ -9888,7 +9856,7 @@
     return v0
 .end method
 
-.method public final zD()Z
+.method public final zB()Z
     .locals 5
 
     const-string v0, "select count(1) > 0 from raw_events where realtime = 1"
@@ -9915,7 +9883,7 @@
     return v0
 .end method
 
-.method public final zE()J
+.method public final zC()J
     .locals 6
 
     const-wide/16 v0, -0x1
@@ -9976,11 +9944,11 @@
     move-exception v3
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v5, "Error querying raw events"
 
@@ -10004,7 +9972,7 @@
     throw v0
 .end method
 
-.method public final zx()Ljava/lang/String;
+.method public final zv()Ljava/lang/String;
     .locals 6
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jg;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
@@ -10077,11 +10045,11 @@
 
     :goto_0
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "Database error getting next bundle app id"
 
@@ -10108,7 +10076,7 @@
     throw v1
 .end method
 
-.method public final zy()Z
+.method public final zw()Z
     .locals 5
 
     const-string v0, "select count(1) > 0 from queue where has_realtime = 1"
@@ -10135,14 +10103,14 @@
     return v0
 .end method
 
-.method final zz()V
+.method final zx()V
     .locals 7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jg;->xL()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jg;->xJ()Z
 
     move-result v0
 
@@ -10151,17 +10119,17 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGJ:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHb:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dt;->get()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v2
 
@@ -10175,7 +10143,7 @@
 
     move-result-wide v0
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aEs:Lcom/google/android/gms/measurement/internal/cv;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/j;->aEK:Lcom/google/android/gms/measurement/internal/cv;
 
     const/4 v5, 0x0
 
@@ -10193,19 +10161,19 @@
 
     if-lez v6, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vO()Lcom/google/android/gms/measurement/internal/dp;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vM()Lcom/google/android/gms/measurement/internal/dp;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aGJ:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dp;->aHb:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/dt;->set(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ij;->vw()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jg;->xL()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jg;->xJ()Z
 
     move-result v0
 
@@ -10221,7 +10189,7 @@
 
     const/4 v2, 0x0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vH()Lcom/google/android/gms/common/util/e;
 
     move-result-object v3
 
@@ -10237,7 +10205,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zs()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jb;->zq()J
 
     move-result-wide v3
 
@@ -10257,11 +10225,11 @@
 
     if-lez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGn:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGF:Lcom/google/android/gms/measurement/internal/dj;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -10274,3 +10242,35 @@
     :cond_1
     return-void
 .end method
+
+.method public final zy()J
+    .locals 4
+
+    const-string v0, "select max(bundle_end_timestamp) from queue"
+
+    const/4 v1, 0x0
+
+    const-wide/16 v2, 0x0
+
+    invoke-direct {p0, v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/jg;->a(Ljava/lang/String;[Ljava/lang/String;J)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final zz()J
+    .locals 4
+
+    const-string v0, "select max(timestamp) from raw_events"
+
+    const/4 v1, 0x0
+
+    const-wide/16 v2, 0x0
+
+    invoke-direct {p0, v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/jg;->a(Ljava/lang/String;[Ljava/lang/String;J)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jh.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jh.smali
index 9831eb3117..5fdf450dd3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jh.smali
@@ -3,14 +3,14 @@
 
 
 # instance fields
-.field private final synthetic aMd:Lcom/google/android/gms/measurement/internal/jg;
+.field private final synthetic aMv:Lcom/google/android/gms/measurement/internal/jg;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/jg;Landroid/content/Context;Ljava/lang/String;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
     const/4 p1, 0x0
 
@@ -26,7 +26,7 @@
 .method public final getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jg;->a(Lcom/google/android/gms/measurement/internal/jg;)Lcom/google/android/gms/measurement/internal/if;
 
@@ -45,7 +45,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/if;->aAT:Lcom/google/android/gms/common/util/e;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/if;->aBl:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->elapsedRealtime()J
 
@@ -79,7 +79,7 @@
     return-object v0
 
     :catch_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jg;->a(Lcom/google/android/gms/measurement/internal/jg;)Lcom/google/android/gms/measurement/internal/if;
 
@@ -87,21 +87,21 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/if;->start()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "Opening the database failed, dropping and recreating it"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     const-string v0, "google_app_measurement.db"
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->getContext()Landroid/content/Context;
 
@@ -117,13 +117,13 @@
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to delete corrupted db file"
 
@@ -135,7 +135,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/jg;->a(Lcom/google/android/gms/measurement/internal/jg;)Lcom/google/android/gms/measurement/internal/if;
 
@@ -150,13 +150,13 @@
     :catch_1
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Failed to open freshly created database"
 
@@ -177,9 +177,9 @@
 .method public final onCreate(Landroid/database/sqlite/SQLiteDatabase;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
@@ -197,13 +197,13 @@
 .method public final onOpen(Landroid/database/sqlite/SQLiteDatabase;)V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zF()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zD()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -217,9 +217,9 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/c;->a(Lcom/google/android/gms/measurement/internal/dh;Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
@@ -233,13 +233,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/c;->a(Lcom/google/android/gms/measurement/internal/dh;Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zG()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zE()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -251,13 +251,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/c;->a(Lcom/google/android/gms/measurement/internal/dh;Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zH()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zF()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -269,13 +269,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/c;->a(Lcom/google/android/gms/measurement/internal/dh;Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zI()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zG()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -287,9 +287,9 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/c;->a(Lcom/google/android/gms/measurement/internal/dh;Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
@@ -303,13 +303,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/c;->a(Lcom/google/android/gms/measurement/internal/dh;Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zJ()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zH()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -321,13 +321,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/c;->a(Lcom/google/android/gms/measurement/internal/dh;Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zK()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zI()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -339,13 +339,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/c;->a(Lcom/google/android/gms/measurement/internal/dh;Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zL()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zJ()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -357,9 +357,9 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/c;->a(Lcom/google/android/gms/measurement/internal/dh;Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
@@ -373,13 +373,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/c;->a(Lcom/google/android/gms/measurement/internal/dh;Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zM()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jg;->zK()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -391,9 +391,9 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/c;->a(Lcom/google/android/gms/measurement/internal/dh;Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMd:Lcom/google/android/gms/measurement/internal/jg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jh;->aMv:Lcom/google/android/gms/measurement/internal/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/l.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/l.smali
index 893865acef..3af43a2842 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/l.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/l.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/l;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/l;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/l;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xC()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xA()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/m.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/m.smali
index 5dc31712f1..142981ccf0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/m.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/m.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/m;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/m;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/m;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xD()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xB()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/n.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/n.smali
index 093e43131e..45d32765f8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/n.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/n;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/n;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/n;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xs()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xq()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/o.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/o.smali
index 69feddae2e..6d2b6870ff 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/o.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/o.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/o;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xt()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xr()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/p.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/p.smali
index 2b3510446c..7bc620fb12 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/p.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/p.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/p;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/p;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/p;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xq()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xo()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/q.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/q.smali
index 4aaa91b6c8..044e9178b3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/q.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/q.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/q;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/q;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/q;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xr()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xp()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/r.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/r.smali
index 997d34a128..004368f162 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/r.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/r.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/r;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/r;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/r;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xo()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xm()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/s.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/s.smali
index 23c91ef2b2..146f6c368d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/s.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/s.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/s;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/s;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/s;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xp()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xn()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/t.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/t.smali
index 2155851a06..f812942178 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/t.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/t.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/t;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/t;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/t;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xm()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xk()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/u.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/u.smali
index e517755345..04f914cec0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/u.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/u.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/u;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/u;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/u;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xn()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xl()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/v.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/v.smali
index 6e77b46e60..9a5bdb7b34 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/v.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/v.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/v;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/v;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/v;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xk()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xi()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/w.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/w.smali
index 9024db242a..fa96a33040 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/w.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/w.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/w;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/w;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/w;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xl()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xj()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/x.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/x.smali
index 3d16958b8e..2a560aae57 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/x.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/x.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/x;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/x;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/x;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xj()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xh()Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/y.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/y.smali
index 01cbcb8f75..d1bf22c36b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/y.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/y.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aFx:Lcom/google/android/gms/measurement/internal/cw;
+.field static final aFP:Lcom/google/android/gms/measurement/internal/cw;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/y;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/y;->aFx:Lcom/google/android/gms/measurement/internal/cw;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/y;->aFP:Lcom/google/android/gms/measurement/internal/cw;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xB()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/j;->xz()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/z.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/z.smali
index 2a5188a870..c8b136d09c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/z.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/z.smali
@@ -6,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic aFy:J
+.field private final synthetic aFQ:J
 
-.field private final synthetic aFz:Lcom/google/android/gms/measurement/internal/a;
+.field private final synthetic aFR:Lcom/google/android/gms/measurement/internal/a;
 
-.field private final synthetic aqw:Ljava/lang/String;
+.field private final synthetic aqO:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/a;Ljava/lang/String;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/z;->aFz:Lcom/google/android/gms/measurement/internal/a;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/z;->aFR:Lcom/google/android/gms/measurement/internal/a;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/z;->aqw:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/z;->aqO:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/z;->aFy:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/z;->aFQ:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,17 +33,17 @@
 .method public final run()V
     .locals 10
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/z;->aFz:Lcom/google/android/gms/measurement/internal/a;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/z;->aFR:Lcom/google/android/gms/measurement/internal/a;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/z;->aqw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/z;->aqO:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/z;->aFy:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/z;->aFQ:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->mc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->ma()V
 
-    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDh:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDz:Ljava/util/Map;
 
     invoke-interface {v4, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -53,11 +53,11 @@
 
     if-eqz v4, :cond_4
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/cb;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/gr;->yM()Lcom/google/android/gms/measurement/internal/gs;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/gr;->yK()Lcom/google/android/gms/measurement/internal/gs;
 
     move-result-object v5
 
@@ -69,11 +69,11 @@
 
     if-nez v4, :cond_3
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDh:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDz:Ljava/util/Map;
 
     invoke-interface {v4, v1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDg:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDy:Ljava/util/Map;
 
     invoke-interface {v4, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -83,15 +83,15 @@
 
     if-nez v4, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v4, "First ad unit exposure time was never set"
 
-    invoke-virtual {v1, v4}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v1, v4}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -102,14 +102,14 @@
 
     sub-long v6, v2, v6
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDg:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/a;->aDy:Ljava/util/Map;
 
     invoke-interface {v4, v1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {v0, v1, v6, v7, v5}, Lcom/google/android/gms/measurement/internal/a;->a(Ljava/lang/String;JLcom/google/android/gms/measurement/internal/gs;)V
 
     :goto_0
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/a;->aDh:Ljava/util/Map;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/a;->aDz:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->isEmpty()Z
 
@@ -117,7 +117,7 @@
 
     if-eqz v1, :cond_2
 
-    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/a;->aDi:J
+    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/a;->aDA:J
 
     const-wide/16 v8, 0x0
 
@@ -125,32 +125,32 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v1, "First ad exposure time was never set"
 
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_1
-    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/a;->aDi:J
+    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/a;->aDA:J
 
     sub-long/2addr v2, v6
 
     invoke-virtual {v0, v2, v3, v5}, Lcom/google/android/gms/measurement/internal/a;->a(JLcom/google/android/gms/measurement/internal/gs;)V
 
-    iput-wide v8, v0, Lcom/google/android/gms/measurement/internal/a;->aDi:J
+    iput-wide v8, v0, Lcom/google/android/gms/measurement/internal/a;->aDA:J
 
     :cond_2
     return-void
 
     :cond_3
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/a;->aDh:Ljava/util/Map;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/a;->aDz:Ljava/util/Map;
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -161,11 +161,11 @@
     return-void
 
     :cond_4
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fh;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGf:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dh;->aGx:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string v2, "Call to endAdUnitExposure for unknown ad unit id"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzah.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzah.smali
index fb5ba8a610..9031372a77 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzah.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzah.smali
@@ -29,7 +29,7 @@
 
 
 # instance fields
-.field final aDI:Landroid/os/Bundle;
+.field final aEa:Landroid/os/Bundle;
 
 
 # direct methods
@@ -50,7 +50,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzah;->aDI:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzah;->aEa:Landroid/os/Bundle;
 
     return-void
 .end method
@@ -58,17 +58,17 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/zzah;)Landroid/os/Bundle;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/zzah;->aDI:Landroid/os/Bundle;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/zzah;->aEa:Landroid/os/Bundle;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method final ch(Ljava/lang/String;)Ljava/lang/Double;
+.method final cd(Ljava/lang/String;)Ljava/lang/Double;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzah;->aDI:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzah;->aEa:Landroid/os/Bundle;
 
     invoke-virtual {v0, p1}, Landroid/os/Bundle;->getDouble(Ljava/lang/String;)D
 
@@ -84,7 +84,7 @@
 .method final get(Ljava/lang/String;)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzah;->aDI:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzah;->aEa:Landroid/os/Bundle;
 
     invoke-virtual {v0, p1}, Landroid/os/Bundle;->get(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -96,7 +96,7 @@
 .method final getLong(Ljava/lang/String;)Ljava/lang/Long;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzah;->aDI:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzah;->aEa:Landroid/os/Bundle;
 
     invoke-virtual {v0, p1}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
@@ -112,7 +112,7 @@
 .method final getString(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzah;->aDI:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzah;->aEa:Landroid/os/Bundle;
 
     invoke-virtual {v0, p1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
@@ -142,7 +142,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzah;->aDI:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzah;->aEa:Landroid/os/Bundle;
 
     invoke-virtual {v0}, Landroid/os/Bundle;->toString()Ljava/lang/String;
 
@@ -151,12 +151,12 @@
     return-object v0
 .end method
 
-.method public final vW()Landroid/os/Bundle;
+.method public final vU()Landroid/os/Bundle;
     .locals 2
 
     new-instance v0, Landroid/os/Bundle;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzah;->aDI:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzah;->aEa:Landroid/os/Bundle;
 
     invoke-direct {v0, v1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
 
@@ -172,7 +172,7 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/zzah;->vW()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/zzah;->vU()Landroid/os/Bundle;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzai.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzai.smali
index 8eb5a28347..cab8484695 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzai.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzai.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field public final aAO:Ljava/lang/String;
+.field public final aBg:Ljava/lang/String;
 
-.field public final aDF:Lcom/google/android/gms/measurement/internal/zzah;
+.field public final aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-.field public final aDJ:J
+.field public final aEb:J
 
 .field public final name:Ljava/lang/String;
 
@@ -48,15 +48,15 @@
 
     iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/zzai;->aDJ:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/zzai;->aEb:J
 
     return-void
 .end method
@@ -68,11 +68,11 @@
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
-    iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/zzai;->aDJ:J
+    iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/zzai;->aEb:J
 
     return-void
 .end method
@@ -82,11 +82,11 @@
 .method public final toString()Ljava/lang/String;
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzai;->name:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -166,19 +166,19 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzai;->aDF:Lcom/google/android/gms/measurement/internal/zzah;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzai;->aDX:Lcom/google/android/gms/measurement/internal/zzah;
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/zzai;->aAO:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/zzai;->aBg:Ljava/lang/String;
 
     const/4 v1, 0x4
 
     invoke-static {p1, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/zzai;->aDJ:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/zzai;->aEb:J
 
     const/4 p2, 0x5
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzjn.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzjn.smali
index 645ccfb12a..dfaa1b778f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzjn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzjn.smali
@@ -15,17 +15,17 @@
 
 
 # instance fields
-.field public final aAO:Ljava/lang/String;
+.field public final aBg:Ljava/lang/String;
 
-.field public final aGo:Ljava/lang/String;
+.field public final aGG:Ljava/lang/String;
 
-.field public final aLn:J
+.field public final aLF:J
 
-.field public final aLo:Ljava/lang/Long;
+.field public final aLG:Ljava/lang/Long;
 
-.field private final aLp:Ljava/lang/Float;
+.field private final aLH:Ljava/lang/Float;
 
-.field public final aLq:Ljava/lang/Double;
+.field public final aLI:Ljava/lang/Double;
 
 .field public final name:Ljava/lang/String;
 
@@ -54,13 +54,13 @@
 
     iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLn:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLF:J
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLo:Ljava/lang/Long;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLG:Ljava/lang/Long;
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLp:Ljava/lang/Float;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLH:Ljava/lang/Float;
 
     const/4 p3, 0x1
 
@@ -77,17 +77,17 @@
     move-result-object p2
 
     :cond_0
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLq:Ljava/lang/Double;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLI:Ljava/lang/Double;
 
     goto :goto_0
 
     :cond_1
-    iput-object p9, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLq:Ljava/lang/Double;
+    iput-object p9, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLI:Ljava/lang/Double;
 
     :goto_0
-    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGo:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGG:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aAO:Ljava/lang/String;
+    iput-object p8, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aBg:Ljava/lang/String;
 
     return-void
 .end method
@@ -97,11 +97,11 @@
 
     iget-object v1, p1, Lcom/google/android/gms/measurement/internal/iq;->name:Ljava/lang/String;
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/iq;->aLn:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/iq;->aLF:J
 
     iget-object v4, p1, Lcom/google/android/gms/measurement/internal/iq;->value:Ljava/lang/Object;
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aAO:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/iq;->aBg:Ljava/lang/String;
 
     move-object v0, p0
 
@@ -115,7 +115,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const/4 v0, 0x2
 
@@ -125,19 +125,19 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLn:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLF:J
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLo:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLG:Ljava/lang/Long;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLp:Ljava/lang/Float;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLH:Ljava/lang/Float;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLq:Ljava/lang/Double;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLI:Ljava/lang/Double;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGo:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGG:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aAO:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aBg:Ljava/lang/String;
 
     return-void
 .end method
@@ -147,7 +147,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     const/4 v0, 0x2
 
@@ -155,21 +155,21 @@
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->name:Ljava/lang/String;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLn:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLF:J
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aAO:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aBg:Ljava/lang/String;
 
     const/4 p1, 0x0
 
     if-nez p4, :cond_0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLo:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLG:Ljava/lang/Long;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLp:Ljava/lang/Float;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLH:Ljava/lang/Float;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLq:Ljava/lang/Double;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLI:Ljava/lang/Double;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGo:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGG:Ljava/lang/String;
 
     return-void
 
@@ -180,13 +180,13 @@
 
     check-cast p4, Ljava/lang/Long;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLo:Ljava/lang/Long;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLG:Ljava/lang/Long;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLp:Ljava/lang/Float;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLH:Ljava/lang/Float;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLq:Ljava/lang/Double;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLI:Ljava/lang/Double;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGo:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGG:Ljava/lang/String;
 
     return-void
 
@@ -195,15 +195,15 @@
 
     if-eqz p2, :cond_2
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLo:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLG:Ljava/lang/Long;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLp:Ljava/lang/Float;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLH:Ljava/lang/Float;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLq:Ljava/lang/Double;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLI:Ljava/lang/Double;
 
     check-cast p4, Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGo:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGG:Ljava/lang/String;
 
     return-void
 
@@ -212,15 +212,15 @@
 
     if-eqz p2, :cond_3
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLo:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLG:Ljava/lang/Long;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLp:Ljava/lang/Float;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLH:Ljava/lang/Float;
 
     check-cast p4, Ljava/lang/Double;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLq:Ljava/lang/Double;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLI:Ljava/lang/Double;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGo:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGG:Ljava/lang/String;
 
     return-void
 
@@ -239,21 +239,21 @@
 .method public final getValue()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLo:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLG:Ljava/lang/Long;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLq:Ljava/lang/Double;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLI:Ljava/lang/Double;
 
     if-eqz v0, :cond_1
 
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGo:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGG:Ljava/lang/String;
 
     if-eqz v0, :cond_2
 
@@ -286,13 +286,13 @@
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLn:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLF:J
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v0, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLo:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLG:Ljava/lang/Long;
 
     const/16 v1, 0x8
 
@@ -311,17 +311,17 @@
     :cond_0
     const/4 v0, 0x6
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGo:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aGG:Ljava/lang/String;
 
     invoke-static {p1, v0, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
     const/4 v0, 0x7
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aAO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aBg:Ljava/lang/String;
 
     invoke-static {p1, v0, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLq:Ljava/lang/Double;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzjn;->aLI:Ljava/lang/Double;
 
     if-eqz v0, :cond_1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzn.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzn.smali
index b6081b9833..b75fc258a0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzn.smali
@@ -15,19 +15,19 @@
 
 
 # instance fields
-.field public final aAK:J
+.field public final aBc:J
 
-.field public final aAL:J
+.field public final aBd:J
 
-.field public final aBP:Z
+.field public final aCh:Z
 
-.field public final aFH:Ljava/lang/String;
+.field public final aFZ:Ljava/lang/String;
 
-.field public final aFJ:Ljava/lang/String;
+.field public final aGb:Ljava/lang/String;
 
-.field public final aFM:J
+.field public final aGe:J
 
-.field public final aFN:Ljava/util/List;
+.field public final aGf:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,31 +37,31 @@
     .end annotation
 .end field
 
-.field public final aFO:I
+.field public final aGg:I
 
-.field public final aFP:Ljava/lang/String;
+.field public final aGh:Ljava/lang/String;
 
-.field public final aHA:J
+.field public final aHO:Ljava/lang/String;
 
-.field public final aHB:J
+.field public final aHS:J
 
-.field public final aHC:Z
+.field public final aHT:J
 
-.field public final aHD:Z
+.field public final aHU:Z
 
-.field public final aHE:Z
+.field public final aHV:Z
 
-.field public final aHF:Ljava/lang/Boolean;
+.field public final aHW:Z
 
-.field public final aHw:Ljava/lang/String;
+.field public final aHX:Ljava/lang/Boolean;
 
-.field public final aIT:J
+.field public final aJl:J
 
-.field public final aLy:Ljava/lang/String;
+.field public final aLQ:Ljava/lang/String;
 
-.field public final aLz:Z
+.field public final aLR:Z
 
-.field public final aro:Ljava/lang/String;
+.field public final arG:Ljava/lang/String;
 
 .field public final packageName:Ljava/lang/String;
 
@@ -107,7 +107,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     move-object v1, p1
 
@@ -127,83 +127,83 @@
     move-object v1, p2
 
     :goto_0
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFH:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFZ:Ljava/lang/String;
 
     move-wide v1, p4
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHA:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHS:J
 
     move-object v1, p6
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFJ:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aGb:Ljava/lang/String;
 
     move-wide v1, p7
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aAK:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aBc:J
 
     move-wide v1, p9
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHB:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHT:J
 
     move-object v1, p11
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aLy:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aLQ:Ljava/lang/String;
 
     move v1, p12
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
     move/from16 v1, p13
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aBP:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aCh:Z
 
     move-object/from16 v1, p14
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHw:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHO:Ljava/lang/String;
 
     move-wide/from16 v1, p15
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFM:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aGe:J
 
     move-wide/from16 v1, p17
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aIT:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aJl:J
 
     move/from16 v1, p19
 
-    iput v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFO:I
+    iput v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aGg:I
 
     move/from16 v1, p20
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHD:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHV:Z
 
     move/from16 v1, p21
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHE:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHW:Z
 
     move/from16 v1, p22
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aLz:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aLR:Z
 
     move-object/from16 v1, p23
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
     move-object/from16 v1, p24
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHF:Ljava/lang/Boolean;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHX:Ljava/lang/Boolean;
 
     move-wide/from16 v1, p25
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aAL:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aBd:J
 
     move-object/from16 v1, p27
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFN:Ljava/util/List;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aGf:Ljava/util/List;
 
     return-void
 .end method
@@ -241,83 +241,83 @@
 
     move-object v1, p2
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFH:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFZ:Ljava/lang/String;
 
     move-wide v1, p12
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHA:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHS:J
 
     move-object v1, p4
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFJ:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aGb:Ljava/lang/String;
 
     move-wide v1, p5
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aAK:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aBc:J
 
     move-wide v1, p7
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHB:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHT:J
 
     move-object v1, p9
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aLy:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aLQ:Ljava/lang/String;
 
     move v1, p10
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
     move v1, p11
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aBP:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aCh:Z
 
     move-object/from16 v1, p14
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHw:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHO:Ljava/lang/String;
 
     move-wide/from16 v1, p15
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFM:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aGe:J
 
     move-wide/from16 v1, p17
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aIT:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aJl:J
 
     move/from16 v1, p19
 
-    iput v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFO:I
+    iput v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aGg:I
 
     move/from16 v1, p20
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHD:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHV:Z
 
     move/from16 v1, p21
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHE:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHW:Z
 
     move/from16 v1, p22
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aLz:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aLR:Z
 
     move-object/from16 v1, p23
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
     move-object/from16 v1, p24
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHF:Ljava/lang/Boolean;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aHX:Ljava/lang/Boolean;
 
     move-wide/from16 v1, p25
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aAL:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aBd:J
 
     move-object/from16 v1, p27
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aFN:Ljava/util/List;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzn;->aGf:Ljava/util/List;
 
     return-void
 .end method
@@ -339,109 +339,109 @@
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aro:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->arG:Ljava/lang/String;
 
     const/4 v1, 0x3
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aFH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aFZ:Ljava/lang/String;
 
     const/4 v1, 0x4
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aFJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aGb:Ljava/lang/String;
 
     const/4 v2, 0x5
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/zzn;->aAK:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/zzn;->aBc:J
 
     const/4 v0, 0x6
 
     invoke-static {p1, v0, v2, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHB:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHT:J
 
     const/4 v0, 0x7
 
     invoke-static {p1, v0, v2, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aLy:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aLQ:Ljava/lang/String;
 
     const/16 v2, 0x8
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHC:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHU:Z
 
     const/16 v2, 0x9
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aBP:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aCh:Z
 
     const/16 v2, 0xa
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHA:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHS:J
 
     const/16 v0, 0xb
 
     invoke-static {p1, v0, v2, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHO:Ljava/lang/String;
 
     const/16 v2, 0xc
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/zzn;->aFM:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/zzn;->aGe:J
 
     const/16 v0, 0xd
 
     invoke-static {p1, v0, v2, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/zzn;->aIT:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/zzn;->aJl:J
 
     const/16 v0, 0xe
 
     invoke-static {p1, v0, v2, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aFO:I
+    iget v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aGg:I
 
     const/16 v2, 0xf
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHD:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHV:Z
 
     const/16 v2, 0x10
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHE:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHW:Z
 
     const/16 v2, 0x11
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aLz:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aLR:Z
 
     const/16 v2, 0x12
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aFP:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aGh:Ljava/lang/String;
 
     const/16 v2, 0x13
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHF:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzn;->aHX:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
@@ -458,13 +458,13 @@
     :cond_0
     const/16 v0, 0x16
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/zzn;->aAL:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/zzn;->aBd:J
 
     invoke-static {p1, v0, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
     const/16 v0, 0x17
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzn;->aFN:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzn;->aGf:Ljava/util/List;
 
     invoke-static {p1, v0, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/util/List;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzq.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzq.smali
index 9761958ea0..4e1df16371 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzq.smali
@@ -15,23 +15,23 @@
 
 
 # instance fields
-.field public aAO:Ljava/lang/String;
+.field public aBg:Ljava/lang/String;
 
-.field public aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+.field public aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
-.field public aLD:J
+.field public aLV:J
 
-.field public aLE:Ljava/lang/String;
+.field public aLW:Ljava/lang/String;
 
-.field public aLF:Lcom/google/android/gms/measurement/internal/zzai;
+.field public aLX:Lcom/google/android/gms/measurement/internal/zzai;
 
-.field public aLG:J
+.field public aLY:J
 
-.field public aLH:Lcom/google/android/gms/measurement/internal/zzai;
+.field public aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
-.field public aLI:J
+.field public aMa:J
 
-.field public aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+.field public aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
 .field public active:Z
 
@@ -62,45 +62,45 @@
 
     iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iget-wide v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLD:J
+    iget-wide v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLV:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLD:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLV:J
 
     iget-boolean v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->active:Z
 
     iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->active:Z
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLE:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLW:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLE:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLW:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLF:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLX:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLF:Lcom/google/android/gms/measurement/internal/zzai;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLX:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-wide v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLG:J
+    iget-wide v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLY:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLG:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLY:J
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iget-wide v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLI:J
+    iget-wide v0, p1, Lcom/google/android/gms/measurement/internal/zzq;->aMa:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLI:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzq;->aMa:J
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
     return-void
 .end method
@@ -112,25 +112,25 @@
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzq;->packageName:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
-    iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLD:J
+    iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLV:J
 
     iput-boolean p6, p0, Lcom/google/android/gms/measurement/internal/zzq;->active:Z
 
-    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLE:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLW:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLF:Lcom/google/android/gms/measurement/internal/zzai;
+    iput-object p8, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLX:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iput-wide p9, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLG:J
+    iput-wide p9, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLY:J
 
-    iput-object p11, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iput-object p11, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
-    iput-wide p12, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLI:J
+    iput-wide p12, p0, Lcom/google/android/gms/measurement/internal/zzq;->aMa:J
 
-    iput-object p14, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iput-object p14, p0, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
     return-void
 .end method
@@ -152,19 +152,19 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aAO:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aBg:Ljava/lang/String;
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLC:Lcom/google/android/gms/measurement/internal/zzjn;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLU:Lcom/google/android/gms/measurement/internal/zzjn;
 
     const/4 v2, 0x4
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLD:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLV:J
 
     const/4 v3, 0x5
 
@@ -176,37 +176,37 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLW:Ljava/lang/String;
 
     const/4 v2, 0x7
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLF:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLX:Lcom/google/android/gms/measurement/internal/zzai;
 
     const/16 v2, 0x8
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLG:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLY:J
 
     const/16 v3, 0x9
 
     invoke-static {p1, v3, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLH:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLZ:Lcom/google/android/gms/measurement/internal/zzai;
 
     const/16 v2, 0xa
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLI:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aMa:J
 
     const/16 v3, 0xb
 
     invoke-static {p1, v3, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aLJ:Lcom/google/android/gms/measurement/internal/zzai;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzq;->aMb:Lcom/google/android/gms/measurement/internal/zzai;
 
     const/16 v2, 0xc
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/module/Analytics.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/module/Analytics.smali
index 654bcbfe82..18c7afd4e0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/module/Analytics.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/module/Analytics.smali
@@ -3,11 +3,11 @@
 
 
 # static fields
-.field private static volatile aMe:Lcom/google/android/gms/measurement/module/Analytics;
+.field private static volatile aMw:Lcom/google/android/gms/measurement/module/Analytics;
 
 
 # instance fields
-.field private final aCX:Lcom/google/android/gms/measurement/internal/ek;
+.field private final aDp:Lcom/google/android/gms/measurement/internal/ek;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/module/Analytics;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/module/Analytics;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public static getInstance(Landroid/content/Context;)Lcom/google/android/gms/measurement/module/Analytics;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/module/Analytics;->aMe:Lcom/google/android/gms/measurement/module/Analytics;
+    sget-object v0, Lcom/google/android/gms/measurement/module/Analytics;->aMw:Lcom/google/android/gms/measurement/module/Analytics;
 
     if-nez v0, :cond_1
 
@@ -35,7 +35,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/module/Analytics;->aMe:Lcom/google/android/gms/measurement/module/Analytics;
+    sget-object v1, Lcom/google/android/gms/measurement/module/Analytics;->aMw:Lcom/google/android/gms/measurement/module/Analytics;
 
     if-nez v1, :cond_0
 
@@ -49,7 +49,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/module/Analytics;-><init>(Lcom/google/android/gms/measurement/internal/ek;)V
 
-    sput-object v1, Lcom/google/android/gms/measurement/module/Analytics;->aMe:Lcom/google/android/gms/measurement/module/Analytics;
+    sput-object v1, Lcom/google/android/gms/measurement/module/Analytics;->aMw:Lcom/google/android/gms/measurement/module/Analytics;
 
     :cond_0
     monitor-exit v0
@@ -67,7 +67,7 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/google/android/gms/measurement/module/Analytics;->aMe:Lcom/google/android/gms/measurement/module/Analytics;
+    sget-object p0, Lcom/google/android/gms/measurement/module/Analytics;->aMw:Lcom/google/android/gms/measurement/module/Analytics;
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/a.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/a.smali
index ea9f28fae3..6089e5a9e4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/a.smali
@@ -3,7 +3,26 @@
 
 
 # static fields
-.field public static final aMf:Lcom/google/android/gms/common/api/a;
+.field public static final aMA:Lcom/google/android/gms/nearby/messages/a;
+    .annotation runtime Ljava/lang/Deprecated;
+    .end annotation
+.end field
+
+.field private static final aMB:Lcom/google/android/gms/nearby/messages/h;
+
+.field private static final aMC:Lcom/google/android/gms/common/api/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/common/api/a<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final aMD:Lcom/google/android/gms/internal/nearby/ae;
+
+.field public static final aMx:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -16,12 +35,12 @@
     .end annotation
 .end field
 
-.field public static final aMg:Lcom/google/android/gms/nearby/connection/c;
+.field public static final aMy:Lcom/google/android/gms/nearby/connection/c;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field public static final aMh:Lcom/google/android/gms/common/api/a;
+.field public static final aMz:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -34,25 +53,6 @@
     .end annotation
 .end field
 
-.field public static final aMi:Lcom/google/android/gms/nearby/messages/a;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-.end field
-
-.field private static final aMj:Lcom/google/android/gms/nearby/messages/h;
-
-.field private static final aMk:Lcom/google/android/gms/common/api/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/common/api/a<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final aMl:Lcom/google/android/gms/internal/nearby/ae;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -60,61 +60,61 @@
 
     new-instance v0, Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/internal/nearby/t;->aBD:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/t;->aBV:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/internal/nearby/t;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/t;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     const-string v3, "Nearby.CONNECTIONS_API"
 
     invoke-direct {v0, v3, v1, v2}, Lcom/google/android/gms/common/api/a;-><init>(Ljava/lang/String;Lcom/google/android/gms/common/api/a$a;Lcom/google/android/gms/common/api/a$g;)V
 
-    sput-object v0, Lcom/google/android/gms/nearby/a;->aMf:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aMx:Lcom/google/android/gms/common/api/a;
 
     new-instance v0, Lcom/google/android/gms/internal/nearby/t;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/nearby/t;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/nearby/a;->aMg:Lcom/google/android/gms/nearby/connection/c;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aMy:Lcom/google/android/gms/nearby/connection/c;
 
     new-instance v0, Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/ae;->aBD:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/ae;->aBV:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/nearby/messages/internal/ae;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/nearby/messages/internal/ae;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     const-string v3, "Nearby.MESSAGES_API"
 
     invoke-direct {v0, v3, v1, v2}, Lcom/google/android/gms/common/api/a;-><init>(Ljava/lang/String;Lcom/google/android/gms/common/api/a$a;Lcom/google/android/gms/common/api/a$g;)V
 
-    sput-object v0, Lcom/google/android/gms/nearby/a;->aMh:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aMz:Lcom/google/android/gms/common/api/a;
 
-    sget-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aNX:Lcom/google/android/gms/nearby/messages/internal/ae;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aOp:Lcom/google/android/gms/nearby/messages/internal/ae;
 
-    sput-object v0, Lcom/google/android/gms/nearby/a;->aMi:Lcom/google/android/gms/nearby/messages/a;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aMA:Lcom/google/android/gms/nearby/messages/a;
 
     new-instance v0, Lcom/google/android/gms/nearby/messages/internal/ag;
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/internal/ag;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/nearby/a;->aMj:Lcom/google/android/gms/nearby/messages/h;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aMB:Lcom/google/android/gms/nearby/messages/h;
 
     new-instance v0, Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/internal/nearby/as;->aBD:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/as;->aBV:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/internal/nearby/as;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/as;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     const-string v3, "Nearby.BOOTSTRAP_API"
 
     invoke-direct {v0, v3, v1, v2}, Lcom/google/android/gms/common/api/a;-><init>(Ljava/lang/String;Lcom/google/android/gms/common/api/a$a;Lcom/google/android/gms/common/api/a$g;)V
 
-    sput-object v0, Lcom/google/android/gms/nearby/a;->aMk:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aMC:Lcom/google/android/gms/common/api/a;
 
     new-instance v0, Lcom/google/android/gms/internal/nearby/as;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/nearby/as;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/nearby/a;->aMl:Lcom/google/android/gms/internal/nearby/ae;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aMD:Lcom/google/android/gms/internal/nearby/ae;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/PayloadTransferUpdate$a.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/PayloadTransferUpdate$a.smali
index c9c57b1f49..3f703d729a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/PayloadTransferUpdate$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/PayloadTransferUpdate$a.smali
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field public final aMv:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+.field public final aMN:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
 
 # direct methods
@@ -32,7 +32,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;-><init>(B)V
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMv:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMN:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     return-void
 .end method
@@ -48,9 +48,9 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;-><init>(B)V
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMv:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMN:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMv:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMN:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     invoke-static {p1}, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->a(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;)J
 
@@ -58,7 +58,7 @@
 
     invoke-static {v0, v1, v2}, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->a(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;J)J
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMv:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMN:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     invoke-static {p1}, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->b(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;)I
 
@@ -66,7 +66,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->a(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;I)I
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMv:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMN:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     invoke-static {p1}, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->c(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;)J
 
@@ -74,7 +74,7 @@
 
     invoke-static {v0, v1, v2}, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->b(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;J)J
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMv:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aMN:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
     invoke-static {p1}, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->d(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;)J
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/PayloadTransferUpdate.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/PayloadTransferUpdate.smali
index 39e714507a..da8839804e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/PayloadTransferUpdate.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/PayloadTransferUpdate.smali
@@ -23,11 +23,11 @@
 
 
 # instance fields
-.field public aBA:J
+.field public aBS:J
 
-.field private aMt:J
+.field private aML:J
 
-.field private aMu:J
+.field private aMM:J
 
 .field public status:I
 
@@ -66,13 +66,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBA:J
+    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBS:J
 
     iput p3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->status:I
 
-    iput-wide p4, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMt:J
+    iput-wide p4, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aML:J
 
-    iput-wide p6, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMu:J
+    iput-wide p6, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMM:J
 
     return-void
 .end method
@@ -88,7 +88,7 @@
 .method static synthetic a(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;)J
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBA:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBS:J
 
     return-wide v0
 .end method
@@ -96,7 +96,7 @@
 .method public static synthetic a(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;J)J
     .locals 0
 
-    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBA:J
+    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBS:J
 
     return-wide p1
 .end method
@@ -112,7 +112,7 @@
 .method static synthetic b(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;J)J
     .locals 0
 
-    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMt:J
+    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aML:J
 
     return-wide p1
 .end method
@@ -120,7 +120,7 @@
 .method static synthetic c(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;)J
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMt:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aML:J
 
     return-wide v0
 .end method
@@ -128,7 +128,7 @@
 .method static synthetic c(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;J)J
     .locals 0
 
-    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMu:J
+    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMM:J
 
     return-wide p1
 .end method
@@ -136,7 +136,7 @@
 .method static synthetic d(Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;)J
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMu:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMM:J
 
     return-wide v0
 .end method
@@ -161,13 +161,13 @@
 
     check-cast p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-    iget-wide v3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBA:J
+    iget-wide v3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBS:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
 
-    iget-wide v3, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBA:J
+    iget-wide v3, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBS:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -197,13 +197,13 @@
 
     if-eqz v1, :cond_1
 
-    iget-wide v3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMt:J
+    iget-wide v3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aML:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
 
-    iget-wide v3, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMt:J
+    iget-wide v3, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aML:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -215,13 +215,13 @@
 
     if-eqz v1, :cond_1
 
-    iget-wide v3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMu:J
+    iget-wide v3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMM:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
 
-    iget-wide v3, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMu:J
+    iget-wide v3, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMM:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -246,7 +246,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-wide v1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBA:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBS:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -266,7 +266,7 @@
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMt:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aML:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -276,7 +276,7 @@
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMu:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMM:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -302,7 +302,7 @@
 
     move-result p2
 
-    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBA:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aBS:J
 
     const/4 v2, 0x1
 
@@ -314,13 +314,13 @@
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMt:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aML:J
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v0, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMu:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aMM:J
 
     const/4 v2, 0x4
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/a.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/a.smali
index c2cd31f4c9..3e518d21ca 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/a.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field private final aBG:Z
+.field private final aBY:Z
 
-.field private final akH:Ljava/lang/String;
+.field private final akZ:Ljava/lang/String;
 
 .field private final zzq:Ljava/lang/String;
 
@@ -20,9 +20,9 @@
 
     iput-object p1, p0, Lcom/google/android/gms/nearby/connection/a;->zzq:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/connection/a;->akH:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/connection/a;->akZ:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/nearby/connection/a;->aBG:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/nearby/connection/a;->aBY:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/b.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/b.smali
index 978aff22ed..93def62ff3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/b.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aMm:Lcom/google/android/gms/common/api/Status;
+.field private final aME:Lcom/google/android/gms/common/api/Status;
 
 
 # direct methods
@@ -14,7 +14,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/b;->aMm:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/b;->aME:Lcom/google/android/gms/common/api/Status;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/d.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/d.smali
index d822094df1..facbcbd304 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/d.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field private final aAN:Ljava/lang/String;
+.field private final aBf:Ljava/lang/String;
 
-.field private final aBI:Landroid/bluetooth/BluetoothDevice;
+.field private final aCa:Landroid/bluetooth/BluetoothDevice;
 
 .field private final zzq:Ljava/lang/String;
 
@@ -16,13 +16,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/d;->aAN:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/d;->aBf:Ljava/lang/String;
 
     const-string p1, "__UNRECOGNIZED_BLUETOOTH_DEVICE__"
 
     iput-object p1, p0, Lcom/google/android/gms/nearby/connection/d;->zzq:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/connection/d;->aBI:Landroid/bluetooth/BluetoothDevice;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/connection/d;->aCa:Landroid/bluetooth/BluetoothDevice;
 
     return-void
 .end method
@@ -34,13 +34,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/d;->aAN:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/d;->aBf:Ljava/lang/String;
 
     iput-object p2, p0, Lcom/google/android/gms/nearby/connection/d;->zzq:Ljava/lang/String;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/d;->aBI:Landroid/bluetooth/BluetoothDevice;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/d;->aCa:Landroid/bluetooth/BluetoothDevice;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/e$a.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/e$a.smali
index aebada5fd5..bf36855c54 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/e$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/e$a.smali
@@ -14,11 +14,11 @@
 
 
 # instance fields
-.field private final aMp:Ljava/io/File;
+.field private final aMH:Ljava/io/File;
 
-.field private final aMq:Landroid/os/ParcelFileDescriptor;
+.field private final aMI:Landroid/os/ParcelFileDescriptor;
 
-.field private final aMr:J
+.field private final aMJ:J
 
 
 # direct methods
@@ -27,11 +27,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$a;->aMp:Ljava/io/File;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$a;->aMH:Ljava/io/File;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/connection/e$a;->aMq:Landroid/os/ParcelFileDescriptor;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/connection/e$a;->aMI:Landroid/os/ParcelFileDescriptor;
 
-    iput-wide p3, p0, Lcom/google/android/gms/nearby/connection/e$a;->aMr:J
+    iput-wide p3, p0, Lcom/google/android/gms/nearby/connection/e$a;->aMJ:J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/e$b.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/e$b.smali
index a55090945c..f8fadcd96a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/e$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/e$b.smali
@@ -14,9 +14,9 @@
 
 
 # instance fields
-.field private final aMq:Landroid/os/ParcelFileDescriptor;
+.field private final aMI:Landroid/os/ParcelFileDescriptor;
 
-.field private aMs:Ljava/io/InputStream;
+.field private aMK:Ljava/io/InputStream;
 
 
 # direct methods
@@ -25,11 +25,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$b;->aMq:Landroid/os/ParcelFileDescriptor;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$b;->aMI:Landroid/os/ParcelFileDescriptor;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$b;->aMs:Ljava/io/InputStream;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$b;->aMK:Ljava/io/InputStream;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/e.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/e.smali
index 39353f6f8c..bb923bacf3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/e.smali
@@ -12,11 +12,11 @@
 
 
 # instance fields
-.field private final aBQ:[B
+.field private final aCi:[B
 
-.field private final aMn:Lcom/google/android/gms/nearby/connection/e$a;
+.field private final aMF:Lcom/google/android/gms/nearby/connection/e$a;
 
-.field private final aMo:Lcom/google/android/gms/nearby/connection/e$b;
+.field private final aMG:Lcom/google/android/gms/nearby/connection/e$b;
 
 .field private final id:J
 
@@ -33,11 +33,11 @@
 
     iput p3, p0, Lcom/google/android/gms/nearby/connection/e;->type:I
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/connection/e;->aBQ:[B
+    iput-object p4, p0, Lcom/google/android/gms/nearby/connection/e;->aCi:[B
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/connection/e;->aMn:Lcom/google/android/gms/nearby/connection/e$a;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/connection/e;->aMF:Lcom/google/android/gms/nearby/connection/e$a;
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/connection/e;->aMo:Lcom/google/android/gms/nearby/connection/e$b;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/connection/e;->aMG:Lcom/google/android/gms/nearby/connection/e$b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Distance.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Distance.smali
index 4dd7091a28..8cfd223c38 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Distance.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Distance.smali
@@ -17,7 +17,7 @@
 
 
 # static fields
-.field public static final aMw:Lcom/google/android/gms/nearby/messages/Distance;
+.field public static final aMO:Lcom/google/android/gms/nearby/messages/Distance;
 
 
 # direct methods
@@ -28,12 +28,12 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/internal/zze;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/Distance;->aMw:Lcom/google/android/gms/nearby/messages/Distance;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Distance;->aMO:Lcom/google/android/gms/nearby/messages/Distance;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public abstract zN()D
+.method public abstract zL()D
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Message.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Message.smali
index 272f9025d1..a32a6a48c6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Message.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Message.smali
@@ -16,20 +16,20 @@
     .end annotation
 .end field
 
-.field private static final aMx:[Lcom/google/android/gms/internal/nearby/zzgs;
+.field private static final aMP:[Lcom/google/android/gms/internal/nearby/zzgs;
 
 
 # instance fields
-.field private final aMA:J
+.field private final aMQ:Ljava/lang/String;
 
-.field private final aMy:Ljava/lang/String;
-
-.field private final aMz:[Lcom/google/android/gms/internal/nearby/zzgs;
+.field private final aMR:[Lcom/google/android/gms/internal/nearby/zzgs;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final content:[B
+.field private final aMS:J
+
+.field public final content:[B
 
 .field private final type:Ljava/lang/String;
 
@@ -50,13 +50,13 @@
 
     new-array v0, v0, [Lcom/google/android/gms/internal/nearby/zzgs;
 
-    sget-object v1, Lcom/google/android/gms/internal/nearby/zzgs;->aCl:Lcom/google/android/gms/internal/nearby/zzgs;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/zzgs;->aCD:Lcom/google/android/gms/internal/nearby/zzgs;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/Message;->aMx:[Lcom/google/android/gms/internal/nearby/zzgs;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Message;->aMP:[Lcom/google/android/gms/internal/nearby/zzgs;
 
     return-void
 .end method
@@ -81,9 +81,9 @@
     const-string p3, ""
 
     :cond_0
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/Message;->aMy:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/Message;->aMQ:Ljava/lang/String;
 
-    iput-wide p6, p0, Lcom/google/android/gms/nearby/messages/Message;->aMA:J
+    iput-wide p6, p0, Lcom/google/android/gms/nearby/messages/Message;->aMS:J
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -136,10 +136,10 @@
     if-nez p1, :cond_3
 
     :cond_2
-    sget-object p5, Lcom/google/android/gms/nearby/messages/Message;->aMx:[Lcom/google/android/gms/internal/nearby/zzgs;
+    sget-object p5, Lcom/google/android/gms/nearby/messages/Message;->aMP:[Lcom/google/android/gms/internal/nearby/zzgs;
 
     :cond_3
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/Message;->aMz:[Lcom/google/android/gms/internal/nearby/zzgs;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/Message;->aMR:[Lcom/google/android/gms/internal/nearby/zzgs;
 
     invoke-virtual {p4}, Ljava/lang/String;->length()I
 
@@ -195,7 +195,7 @@
 .method private constructor <init>([BLjava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/nearby/messages/Message;->aMx:[Lcom/google/android/gms/internal/nearby/zzgs;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/Message;->aMP:[Lcom/google/android/gms/internal/nearby/zzgs;
 
     invoke-direct {p0, p1, p2, p3, v0}, Lcom/google/android/gms/nearby/messages/Message;-><init>([BLjava/lang/String;Ljava/lang/String;[Lcom/google/android/gms/internal/nearby/zzgs;)V
 
@@ -267,9 +267,9 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aMy:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aMQ:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/Message;->aMy:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/Message;->aMQ:Ljava/lang/String;
 
     invoke-static {v1, v3}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
 
@@ -297,9 +297,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-wide v3, p0, Lcom/google/android/gms/nearby/messages/Message;->aMA:J
+    iget-wide v3, p0, Lcom/google/android/gms/nearby/messages/Message;->aMS:J
 
-    iget-wide v5, p1, Lcom/google/android/gms/nearby/messages/Message;->aMA:J
+    iget-wide v5, p1, Lcom/google/android/gms/nearby/messages/Message;->aMS:J
 
     cmp-long p1, v3, v5
 
@@ -318,7 +318,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aMy:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aMQ:Ljava/lang/String;
 
     const/4 v2, 0x0
 
@@ -344,7 +344,7 @@
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aMA:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aMS:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -364,7 +364,7 @@
 .method public toString()Ljava/lang/String;
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/Message;->aMy:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/Message;->aMQ:Ljava/lang/String;
 
     iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->type:Ljava/lang/String;
 
@@ -454,19 +454,19 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aMy:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aMQ:Ljava/lang/String;
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aMz:[Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aMR:[Lcom/google/android/gms/internal/nearby/zzgs;
 
     const/4 v2, 0x4
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;I[Landroid/os/Parcelable;I)V
 
-    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aMA:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aMS:J
 
     const/4 p2, 0x5
 
@@ -482,11 +482,3 @@
 
     return-void
 .end method
-
-.method public final zO()[B
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/Message;->content:[B
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/MessageFilter$a.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/MessageFilter$a.smali
index 8e361dd88a..9ba8c50469 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/MessageFilter$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/MessageFilter$a.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field final aMD:Ljava/util/List;
+.field final aMV:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,11 +24,11 @@
     .end annotation
 .end field
 
-.field aME:Z
+.field aMW:Z
 
-.field aMG:I
+.field aMY:I
 
-.field final aMH:Ljava/util/Set;
+.field final aMZ:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field final aMI:Ljava/util/Set;
+.field final aNa:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -59,23 +59,23 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMH:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMZ:Ljava/util/Set;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMD:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMV:Ljava/util/List;
 
     new-instance v0, Ljava/util/HashSet;
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMI:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aNa:Ljava/util/Set;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMG:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMY:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/MessageFilter.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/MessageFilter.smali
index 424cca018c..c54ed20fec 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/MessageFilter.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/MessageFilter.smali
@@ -21,13 +21,13 @@
     .end annotation
 .end field
 
-.field public static final aMB:Lcom/google/android/gms/nearby/messages/MessageFilter;
+.field public static final aMT:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
 
 # instance fields
-.field private final aBU:I
+.field private final aCm:I
 
-.field private final aMC:Ljava/util/List;
+.field private final aMU:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private final aMD:Ljava/util/List;
+.field private final aMV:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -47,9 +47,9 @@
     .end annotation
 .end field
 
-.field private final aME:Z
+.field private final aMW:Z
 
-.field private final aMF:Ljava/util/List;
+.field private final aMX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -59,7 +59,7 @@
     .end annotation
 .end field
 
-.field private final aMG:I
+.field private final aMY:I
 
 
 # direct methods
@@ -78,13 +78,13 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aME:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMW:Z
 
-    iget-boolean v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aME:Z
+    iget-boolean v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMW:Z
 
     if-nez v2, :cond_1
 
-    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMH:Ljava/util/Set;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMZ:Ljava/util/Set;
 
     invoke-interface {v2}, Ljava/util/Set;->isEmpty()Z
 
@@ -107,21 +107,21 @@
 
     new-instance v4, Ljava/util/ArrayList;
 
-    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMH:Ljava/util/Set;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMZ:Ljava/util/Set;
 
     invoke-direct {v4, v2}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget-object v5, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMD:Ljava/util/List;
+    iget-object v5, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMV:Ljava/util/List;
 
-    iget-boolean v6, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aME:Z
+    iget-boolean v6, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMW:Z
 
     new-instance v7, Ljava/util/ArrayList;
 
-    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMI:Ljava/util/Set;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aNa:Ljava/util/Set;
 
     invoke-direct {v7, v2}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget v8, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMG:I
+    iget v8, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aMY:I
 
     const/4 v9, 0x0
 
@@ -129,7 +129,7 @@
 
     invoke-direct/range {v3 .. v9}, Lcom/google/android/gms/nearby/messages/MessageFilter;-><init>(Ljava/util/List;Ljava/util/List;ZLjava/util/List;IB)V
 
-    sput-object v1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMB:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    sput-object v1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMT:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
     return-void
 .end method
@@ -153,7 +153,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aBU:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aCm:I
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -165,9 +165,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMC:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMU:Ljava/util/List;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aME:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMW:Z
 
     if-nez p3, :cond_0
 
@@ -180,7 +180,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMD:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMV:Ljava/util/List;
 
     if-nez p5, :cond_1
 
@@ -193,9 +193,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMF:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMX:Ljava/util/List;
 
-    iput p6, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMG:I
+    iput p6, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMY:I
 
     return-void
 .end method
@@ -267,15 +267,15 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aME:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMW:Z
 
-    iget-boolean v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aME:Z
+    iget-boolean v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMW:Z
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMC:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMU:Ljava/util/List;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMC:Ljava/util/List;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMU:Ljava/util/List;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -283,9 +283,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMD:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMV:Ljava/util/List;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMD:Ljava/util/List;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMV:Ljava/util/List;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -293,9 +293,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMF:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMX:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMF:Ljava/util/List;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMX:Ljava/util/List;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -316,19 +316,19 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMC:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMU:Ljava/util/List;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMD:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMV:Ljava/util/List;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aME:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMW:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -338,7 +338,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMF:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMX:Ljava/util/List;
 
     const/4 v2, 0x3
 
@@ -354,9 +354,9 @@
 .method public toString()Ljava/lang/String;
     .locals 4
 
-    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aME:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMW:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMC:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMU:Ljava/util/List;
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -408,37 +408,37 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMC:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMU:Ljava/util/List;
 
     const/4 v1, 0x1
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->b(Landroid/os/Parcel;ILjava/util/List;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMD:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMV:Ljava/util/List;
 
     const/4 v1, 0x2
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->b(Landroid/os/Parcel;ILjava/util/List;)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aME:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMW:Z
 
     const/4 v1, 0x3
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMF:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMX:Ljava/util/List;
 
     const/4 v1, 0x4
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->b(Landroid/os/Parcel;ILjava/util/List;)V
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMG:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMY:I
 
     const/4 v1, 0x5
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aBU:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aCm:I
 
     const/16 v1, 0x3e8
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/PublishOptions$a.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/PublishOptions$a.smali
index 545c46bdb6..964fd7c2f2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/PublishOptions$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/PublishOptions$a.smali
@@ -14,9 +14,9 @@
 
 
 # instance fields
-.field private aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+.field private aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field private aMP:Lcom/google/android/gms/nearby/messages/c;
+.field public aNh:Lcom/google/android/gms/nearby/messages/c;
 
 
 # direct methods
@@ -25,37 +25,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aMQ:Lcom/google/android/gms/nearby/messages/Strategy;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aNi:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final a(Lcom/google/android/gms/nearby/messages/c;)Lcom/google/android/gms/nearby/messages/PublishOptions$a;
-    .locals 0
-
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/google/android/gms/nearby/messages/c;
-
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aMP:Lcom/google/android/gms/nearby/messages/c;
-
-    return-object p0
-.end method
-
-.method public final zQ()Lcom/google/android/gms/nearby/messages/PublishOptions;
+.method public final zM()Lcom/google/android/gms/nearby/messages/PublishOptions;
     .locals 4
 
     new-instance v0, Lcom/google/android/gms/nearby/messages/PublishOptions;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aMP:Lcom/google/android/gms/nearby/messages/c;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aNh:Lcom/google/android/gms/nearby/messages/c;
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/PublishOptions.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/PublishOptions.smali
index a0ed914e0c..8cb62e5832 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/PublishOptions.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/PublishOptions.smali
@@ -11,13 +11,13 @@
 
 
 # static fields
-.field public static final aMN:Lcom/google/android/gms/nearby/messages/PublishOptions;
+.field public static final aNf:Lcom/google/android/gms/nearby/messages/PublishOptions;
 
 
 # instance fields
-.field public final aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public final aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field public final aMP:Lcom/google/android/gms/nearby/messages/c;
+.field public final aNh:Lcom/google/android/gms/nearby/messages/c;
 
 
 # direct methods
@@ -28,11 +28,11 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->zQ()Lcom/google/android/gms/nearby/messages/PublishOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->zM()Lcom/google/android/gms/nearby/messages/PublishOptions;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aMN:Lcom/google/android/gms/nearby/messages/PublishOptions;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aNf:Lcom/google/android/gms/nearby/messages/PublishOptions;
 
     return-void
 .end method
@@ -42,9 +42,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aMP:Lcom/google/android/gms/nearby/messages/c;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aNh:Lcom/google/android/gms/nearby/messages/c;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Strategy$a.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Strategy$a.smali
index 5cb07459c0..cdf3263367 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Strategy$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Strategy$a.smali
@@ -14,15 +14,15 @@
 
 
 # instance fields
-.field private aMX:I
+.field private aNp:I
 
-.field aMY:I
+.field aNq:I
 
-.field private aMZ:I
+.field private aNr:I
 
-.field private aNa:I
+.field private aNs:I
 
-.field ajI:I
+.field aka:I
 
 
 # direct methods
@@ -33,37 +33,37 @@
 
     const/4 v0, 0x3
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aMX:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aNp:I
 
     const/16 v0, 0x12c
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aMY:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aNq:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aMZ:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aNr:I
 
     const/4 v1, -0x1
 
-    iput v1, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->ajI:I
+    iput v1, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aka:I
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aNa:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aNs:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final zR()Lcom/google/android/gms/nearby/messages/Strategy;
+.method public final zN()Lcom/google/android/gms/nearby/messages/Strategy;
     .locals 11
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->ajI:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aka:I
 
     const/4 v1, 0x2
 
     if-ne v0, v1, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aMZ:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aNr:I
 
     const/4 v1, 0x1
 
@@ -88,15 +88,15 @@
 
     const/4 v4, 0x0
 
-    iget v5, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aMY:I
+    iget v5, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aNq:I
 
-    iget v6, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aMZ:I
+    iget v6, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aNr:I
 
     const/4 v7, 0x0
 
-    iget v8, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->ajI:I
+    iget v8, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aka:I
 
-    iget v9, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aMX:I
+    iget v9, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aNp:I
 
     const/4 v10, 0x0
 
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 d89b30b557..0441d899e6 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
@@ -21,39 +21,39 @@
     .end annotation
 .end field
 
-.field public static final aMQ:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public static final aNi:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field public static final aMR:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public static final aNj:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field private static final aMS:Lcom/google/android/gms/nearby/messages/Strategy;
+.field private static final aNk:Lcom/google/android/gms/nearby/messages/Strategy;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
 
 # instance fields
-.field private final aBU:I
+.field private final aCm:I
 
-.field private final aMT:I
+.field private final aNl:I
 
-.field private final aMU:Z
+.field private final aNm:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aMV:I
+.field private final aNn:I
 
-.field private final aMW:I
+.field private final aNo:I
 
-.field private final ajA:I
-
-.field public final ajE:I
-
-.field private final ajy:I
+.field private final ajQ:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
+.field private final ajS:I
+
+.field public final ajW:I
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -69,11 +69,11 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->zR()Lcom/google/android/gms/nearby/messages/Strategy;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->zN()Lcom/google/android/gms/nearby/messages/Strategy;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aMQ:Lcom/google/android/gms/nearby/messages/Strategy;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aNi:Lcom/google/android/gms/nearby/messages/Strategy;
 
     new-instance v0, Lcom/google/android/gms/nearby/messages/Strategy$a;
 
@@ -81,7 +81,7 @@
 
     const/4 v1, 0x2
 
-    iput v1, v0, Lcom/google/android/gms/nearby/messages/Strategy$a;->ajI:I
+    iput v1, v0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aka:I
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -109,15 +109,15 @@
 
     invoke-static {v4, v3, v1}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/String;[Ljava/lang/Object;)V
 
-    iput v2, v0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aMY:I
+    iput v2, v0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aNq:I
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->zR()Lcom/google/android/gms/nearby/messages/Strategy;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->zN()Lcom/google/android/gms/nearby/messages/Strategy;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aMR:Lcom/google/android/gms/nearby/messages/Strategy;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aNj:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aMS:Lcom/google/android/gms/nearby/messages/Strategy;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aNk:Lcom/google/android/gms/nearby/messages/Strategy;
 
     return-void
 .end method
@@ -127,9 +127,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aBU:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aCm:I
 
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajy:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajQ:I
 
     const/4 p1, 0x1
 
@@ -138,7 +138,7 @@
     if-nez p2, :cond_0
 
     :goto_0
-    iput p7, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMW:I
+    iput p7, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNo:I
 
     goto :goto_1
 
@@ -152,30 +152,30 @@
     goto :goto_0
 
     :cond_1
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMW:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNo:I
 
     goto :goto_1
 
     :cond_2
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMW:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNo:I
 
     :goto_1
-    iput p4, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajA:I
+    iput p4, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajS:I
 
-    iput-boolean p5, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMU:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNm:Z
 
     if-eqz p5, :cond_3
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMV:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNn:I
 
     const p1, 0x7fffffff
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMT:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNl:I
 
     goto :goto_2
 
     :cond_3
-    iput p3, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMT:I
+    iput p3, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNl:I
 
     const/4 p2, -0x1
 
@@ -189,15 +189,15 @@
 
     if-eq p6, p1, :cond_4
 
-    iput p6, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMV:I
+    iput p6, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNn:I
 
     goto :goto_2
 
     :cond_4
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMV:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNn:I
 
     :goto_2
-    iput p8, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajE:I
+    iput p8, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajW:I
 
     return-void
 .end method
@@ -225,39 +225,39 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aBU:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aCm:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aBU:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aCm:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMW:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNo:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aMW:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aNo:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMT:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNl:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aMT:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aNl:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajA:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajS:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->ajA:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->ajS:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMV:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNn:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aMV:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aNn:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajE:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajW:I
 
-    iget p1, p1, Lcom/google/android/gms/nearby/messages/Strategy;->ajE:I
+    iget p1, p1, Lcom/google/android/gms/nearby/messages/Strategy;->ajW:I
 
     if-ne v1, p1, :cond_2
 
@@ -270,35 +270,35 @@
 .method public hashCode()I
     .locals 2
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aBU:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aCm:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMW:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNo:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMT:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNl:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajA:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajS:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMV:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNn:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajE:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajW:I
 
     add-int/2addr v0, v1
 
@@ -308,9 +308,9 @@
 .method public toString()Ljava/lang/String;
     .locals 10
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMT:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNl:I
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajA:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajS:I
 
     const-string v2, "UNKNOWN:"
 
@@ -347,7 +347,7 @@
     move-object v1, v5
 
     :goto_0
-    iget v6, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMV:I
+    iget v6, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNn:I
 
     const/4 v7, -0x1
 
@@ -406,7 +406,7 @@
     move-result-object v6
 
     :goto_1
-    iget v7, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMW:I
+    iget v7, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNo:I
 
     const/4 v8, 0x3
 
@@ -465,7 +465,7 @@
     move-result-object v2
 
     :goto_2
-    iget v3, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajE:I
+    iget v3, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajW:I
 
     if-eqz v3, :cond_b
 
@@ -588,49 +588,49 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajy:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajQ:I
 
     const/4 v1, 0x1
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMT:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNl:I
 
     const/4 v1, 0x2
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajA:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajS:I
 
     const/4 v1, 0x3
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMU:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNm:Z
 
     const/4 v1, 0x4
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMV:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNn:I
 
     const/4 v1, 0x5
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aMW:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aNo:I
 
     const/4 v1, 0x6
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajE:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ajW:I
 
     const/4 v1, 0x7
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aBU:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aCm:I
 
     const/16 v1, 0x3e8
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/SubscribeOptions$a.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/SubscribeOptions$a.smali
index 666885a4fc..55e7bd3445 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/SubscribeOptions$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/SubscribeOptions$a.smali
@@ -14,11 +14,11 @@
 
 
 # instance fields
-.field private aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field private aNc:Lcom/google/android/gms/nearby/messages/MessageFilter;
+.field private aNu:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-.field private aNd:Lcom/google/android/gms/nearby/messages/e;
+.field private aNv:Lcom/google/android/gms/nearby/messages/e;
 
 
 # direct methods
@@ -27,37 +27,29 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aMQ:Lcom/google/android/gms/nearby/messages/Strategy;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aNi:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    sget-object v0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMB:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aMT:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aNc:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aNu:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final a(Lcom/google/android/gms/nearby/messages/Strategy;)Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;
-    .locals 0
-
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aMO:Lcom/google/android/gms/nearby/messages/Strategy;
-
-    return-object p0
-.end method
-
-.method public final zS()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+.method public final zO()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
     .locals 5
 
     new-instance v0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aNc:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aNu:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aNd:Lcom/google/android/gms/nearby/messages/e;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aNv:Lcom/google/android/gms/nearby/messages/e;
 
     const/4 v4, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/SubscribeOptions.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/SubscribeOptions.smali
index 9670ee19b9..d636ebb569 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/SubscribeOptions.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/SubscribeOptions.smali
@@ -11,19 +11,19 @@
 
 
 # static fields
-.field public static final aNb:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+.field public static final aNt:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
 
 # instance fields
-.field public final aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public final aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field public final aNc:Lcom/google/android/gms/nearby/messages/MessageFilter;
+.field public final aNu:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-.field public final aNd:Lcom/google/android/gms/nearby/messages/e;
+.field public final aNv:Lcom/google/android/gms/nearby/messages/e;
 
-.field public final aNe:I
+.field public final aNw:I
 
-.field public final ajM:Z
+.field public final ake:Z
 
 
 # direct methods
@@ -34,11 +34,11 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->zS()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->zO()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNb:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNt:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
     return-void
 .end method
@@ -48,17 +48,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNc:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNu:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNd:Lcom/google/android/gms/nearby/messages/e;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNv:Lcom/google/android/gms/nearby/messages/e;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->ajM:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->ake:Z
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNe:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNw:I
 
     return-void
 .end method
@@ -76,13 +76,13 @@
 .method public final toString()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
     invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNc:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNu:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/b$a.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/b$a.smali
index 1d96b244d7..aa2436f02b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/b$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/b$a.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field ajs:I
+.field ajK:I
 
 
 # direct methods
@@ -25,21 +25,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/b$a;->ajs:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/b$a;->ajK:I
 
     return-void
 .end method
-
-
-# virtual methods
-.method public final zP()Lcom/google/android/gms/nearby/messages/b;
-    .locals 2
-
-    new-instance v0, Lcom/google/android/gms/nearby/messages/b;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, p0, v1}, Lcom/google/android/gms/nearby/messages/b;-><init>(Lcom/google/android/gms/nearby/messages/b$a;B)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/b.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/b.smali
index d4085cf2a8..5b7a050863 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/b.smali
@@ -14,15 +14,15 @@
 
 
 # instance fields
-.field public final aMJ:Ljava/lang/String;
+.field public final aNb:Ljava/lang/String;
 
-.field public final aMK:Z
+.field public final aNc:Z
 
-.field public final aML:Ljava/lang/String;
+.field public final aNd:Ljava/lang/String;
 
-.field public final aMM:Ljava/lang/String;
+.field public final aNe:Ljava/lang/String;
 
-.field public final ajs:I
+.field public final ajK:I
 
 
 # direct methods
@@ -33,24 +33,24 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aMJ:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aNb:Ljava/lang/String;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/nearby/messages/b;->aMK:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/nearby/messages/b;->aNc:Z
 
-    iget p1, p1, Lcom/google/android/gms/nearby/messages/b$a;->ajs:I
+    iget p1, p1, Lcom/google/android/gms/nearby/messages/b$a;->ajK:I
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/b;->ajs:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/b;->ajK:I
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aML:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aNd:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aMM:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aNe:Ljava/lang/String;
 
     return-void
 .end method
 
-.method synthetic constructor <init>(Lcom/google/android/gms/nearby/messages/b$a;B)V
+.method public synthetic constructor <init>(Lcom/google/android/gms/nearby/messages/b$a;B)V
     .locals 0
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/nearby/messages/b;-><init>(Lcom/google/android/gms/nearby/messages/b$a;)V
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ClientAppContext.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ClientAppContext.smali
index 2d6a633e5a..271e642485 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ClientAppContext.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ClientAppContext.smali
@@ -18,15 +18,15 @@
 
 
 # instance fields
-.field private final aMK:Z
+.field private final aNc:Z
 
-.field private final aML:Ljava/lang/String;
+.field private final aNd:Ljava/lang/String;
 
-.field private final aMM:Ljava/lang/String;
+.field private final aNe:Ljava/lang/String;
 
-.field private final aNf:Ljava/lang/String;
+.field private final aNx:Ljava/lang/String;
 
-.field public final aNg:I
+.field public final aNy:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
@@ -60,7 +60,7 @@
 
     check-cast p1, Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aMM:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNe:Ljava/lang/String;
 
     if-eqz p3, :cond_1
 
@@ -129,13 +129,13 @@
 
     :cond_1
     :goto_0
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNf:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNx:Ljava/lang/String;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aMK:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNc:Z
 
-    iput p5, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNg:I
+    iput p5, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNy:I
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aML:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNd:Ljava/lang/String;
 
     return-void
 .end method
@@ -238,9 +238,9 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aMM:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNe:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aMM:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNe:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->T(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -248,9 +248,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNf:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNx:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNf:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNx:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->T(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -258,15 +258,15 @@
 
     if-eqz v1, :cond_2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aMK:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNc:Z
 
-    iget-boolean v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aMK:Z
+    iget-boolean v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNc:Z
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aML:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNd:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aML:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNd:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->T(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -274,9 +274,9 @@
 
     if-eqz v1, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNg:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNy:I
 
-    iget p1, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNg:I
+    iget p1, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNy:I
 
     if-ne v1, p1, :cond_2
 
@@ -293,19 +293,19 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aMM:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNe:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNf:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNx:Ljava/lang/String;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aMK:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNc:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -315,13 +315,13 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aML:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNd:Ljava/lang/String;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNg:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNy:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -347,19 +347,19 @@
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aMM:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNe:Ljava/lang/String;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNf:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNx:Ljava/lang/String;
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aMK:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNc:Z
 
     invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -369,13 +369,13 @@
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aML:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNd:Ljava/lang/String;
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    iget v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNg:I
+    iget v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNy:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -409,31 +409,31 @@
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aMM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNe:Ljava/lang/String;
 
     const/4 v1, 0x2
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNf:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNx:Ljava/lang/String;
 
     const/4 v1, 0x3
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aMK:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNc:Z
 
     const/4 v1, 0x4
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNg:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNy:I
 
     const/4 v1, 0x5
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aML:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aNd:Ljava/lang/String;
 
     const/4 v1, 0x6
 
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 c6bc5a869f..cd4a67459f 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
@@ -18,55 +18,55 @@
 
 
 # instance fields
-.field private final aMJ:Ljava/lang/String;
+.field private final aNA:Lcom/google/android/gms/nearby/messages/Strategy;
+
+.field private final aNB:Lcom/google/android/gms/nearby/messages/internal/at;
+
+.field private final aNC:Lcom/google/android/gms/nearby/messages/MessageFilter;
+
+.field private final aND:Landroid/app/PendingIntent;
+
+.field private final aNE:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aMK:Z
+.field private final aNF:[B
+
+.field private final aNG:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aMM:Ljava/lang/String;
+.field private final aNH:Lcom/google/android/gms/nearby/messages/internal/a;
+
+.field private final aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aNe:I
-
-.field private final aNg:I
-
-.field private final aNh:Lcom/google/android/gms/nearby/messages/internal/aq;
-
-.field private final aNi:Lcom/google/android/gms/nearby/messages/Strategy;
-
-.field private final aNj:Lcom/google/android/gms/nearby/messages/internal/at;
-
-.field private final aNk:Lcom/google/android/gms/nearby/messages/MessageFilter;
-
-.field private final aNl:Landroid/app/PendingIntent;
-
-.field private final aNm:I
+.field private final aNb:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aNn:[B
-
-.field private final aNo:Z
+.field private final aNc:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aNp:Lcom/google/android/gms/nearby/messages/internal/a;
-
-.field private final aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aNe:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final ajM:Z
+.field private final aNw:I
+
+.field private final aNy:I
+
+.field private final aNz:Lcom/google/android/gms/nearby/messages/internal/aq;
+
+.field private final ake:Z
 
 .field private final versionCode:I
 
@@ -140,11 +140,11 @@
     move-object v1, v8
 
     :goto_0
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNh:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNz:Lcom/google/android/gms/nearby/messages/internal/aq;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNi:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNA:Lcom/google/android/gms/nearby/messages/Strategy;
 
     if-nez v2, :cond_2
 
@@ -173,31 +173,31 @@
     invoke-direct {v1, p4}, Lcom/google/android/gms/nearby/messages/internal/av;-><init>(Landroid/os/IBinder;)V
 
     :goto_1
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNj:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNB:Lcom/google/android/gms/nearby/messages/internal/at;
 
     move-object v1, p5
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNk:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNC:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
     move-object/from16 v1, p6
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNl:Landroid/app/PendingIntent;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aND:Landroid/app/PendingIntent;
 
     move/from16 v1, p7
 
-    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNm:I
+    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNE:I
 
-    iput-object v3, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aMJ:Ljava/lang/String;
+    iput-object v3, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNb:Ljava/lang/String;
 
-    iput-object v4, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aMM:Ljava/lang/String;
+    iput-object v4, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNe:Ljava/lang/String;
 
     move-object/from16 v1, p10
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNn:[B
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNF:[B
 
     move/from16 v1, p11
 
-    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNo:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNG:Z
 
     if-nez v5, :cond_4
 
@@ -231,9 +231,9 @@
     invoke-direct {v7, v5}, Lcom/google/android/gms/nearby/messages/internal/c;-><init>(Landroid/os/IBinder;)V
 
     :goto_2
-    iput-object v7, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNp:Lcom/google/android/gms/nearby/messages/internal/a;
+    iput-object v7, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNH:Lcom/google/android/gms/nearby/messages/internal/a;
 
-    iput-boolean v6, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aMK:Z
+    iput-boolean v6, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNc:Z
 
     move-object/from16 v1, p14
 
@@ -241,19 +241,19 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     move/from16 v1, p15
 
-    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->ajM:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->ake:Z
 
     move/from16 v1, p16
 
-    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNe:I
+    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNw:I
 
     move/from16 v1, p17
 
-    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNg:I
+    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNy:I
 
     return-void
 .end method
@@ -335,37 +335,37 @@
 
     move-object/from16 v0, p0
 
-    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNh:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNz:Lcom/google/android/gms/nearby/messages/internal/aq;
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNi:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNA:Lcom/google/android/gms/nearby/messages/Strategy;
 
     invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNj:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v3, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNB:Lcom/google/android/gms/nearby/messages/internal/at;
 
     invoke-static {v3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v3
 
-    iget-object v4, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNk:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v4, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNC:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
     invoke-static {v4}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v4
 
-    iget-object v5, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNl:Landroid/app/PendingIntent;
+    iget-object v5, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aND:Landroid/app/PendingIntent;
 
     invoke-static {v5}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v5
 
-    iget-object v6, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNn:[B
+    iget-object v6, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNF:[B
 
     if-nez v6, :cond_0
 
@@ -397,29 +397,29 @@
     move-result-object v6
 
     :goto_0
-    iget-object v7, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNp:Lcom/google/android/gms/nearby/messages/internal/a;
+    iget-object v7, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNH:Lcom/google/android/gms/nearby/messages/internal/a;
 
     invoke-static {v7}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v7
 
-    iget-boolean v8, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aMK:Z
+    iget-boolean v8, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNc:Z
 
-    iget-object v9, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v9, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     invoke-static {v9}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v9
 
-    iget-boolean v10, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->ajM:Z
+    iget-boolean v10, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->ake:Z
 
-    iget-object v11, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aMJ:Ljava/lang/String;
+    iget-object v11, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNb:Ljava/lang/String;
 
-    iget-object v12, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aMM:Ljava/lang/String;
+    iget-object v12, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNe:Ljava/lang/String;
 
-    iget-boolean v13, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNo:Z
+    iget-boolean v13, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNG:Z
 
-    iget v14, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNg:I
+    iget v14, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNy:I
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -635,7 +635,7 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNh:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNz:Lcom/google/android/gms/nearby/messages/internal/aq;
 
     const/4 v2, 0x0
 
@@ -657,13 +657,13 @@
 
     const/4 v1, 0x3
 
-    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNi:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNA:Lcom/google/android/gms/nearby/messages/Strategy;
 
     invoke-static {p1, v1, v3, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
     const/4 v1, 0x4
 
-    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNj:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNB:Lcom/google/android/gms/nearby/messages/internal/at;
 
     if-nez v3, :cond_1
 
@@ -681,49 +681,49 @@
 
     const/4 v1, 0x5
 
-    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNk:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNC:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
     invoke-static {p1, v1, v3, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
     const/4 v1, 0x6
 
-    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNl:Landroid/app/PendingIntent;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aND:Landroid/app/PendingIntent;
 
     invoke-static {p1, v1, v3, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
     const/4 v1, 0x7
 
-    iget v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNm:I
+    iget v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNE:I
 
     invoke-static {p1, v1, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
     const/16 v1, 0x8
 
-    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aMJ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNb:Ljava/lang/String;
 
     invoke-static {p1, v1, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
     const/16 v1, 0x9
 
-    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aMM:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNe:Ljava/lang/String;
 
     invoke-static {p1, v1, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
     const/16 v1, 0xa
 
-    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNn:[B
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNF:[B
 
     invoke-static {p1, v1, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;I[B)V
 
     const/16 v1, 0xb
 
-    iget-boolean v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNo:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNG:Z
 
     invoke-static {p1, v1, v3}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
     const/16 v1, 0xc
 
-    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNp:Lcom/google/android/gms/nearby/messages/internal/a;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNH:Lcom/google/android/gms/nearby/messages/internal/a;
 
     if-nez v3, :cond_2
 
@@ -739,31 +739,31 @@
 
     const/16 v1, 0xd
 
-    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aMK:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNc:Z
 
     invoke-static {p1, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
     const/16 v1, 0xe
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     invoke-static {p1, v1, v2, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
     const/16 p2, 0xf
 
-    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->ajM:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->ake:Z
 
     invoke-static {p1, p2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
     const/16 p2, 0x10
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNe:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNw:I
 
     invoke-static {p1, p2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
     const/16 p2, 0x11
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNg:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aNy:I
 
     invoke-static {p1, p2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
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 5e236cd2ae..9a42c69350 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
@@ -18,17 +18,17 @@
 
 
 # instance fields
-.field private final aNr:I
+.field private final aNJ:I
 
-.field public final aNs:Lcom/google/android/gms/nearby/messages/Message;
+.field public final aNK:Lcom/google/android/gms/nearby/messages/Message;
 
-.field public final aNt:Lcom/google/android/gms/nearby/messages/internal/zze;
+.field public final aNL:Lcom/google/android/gms/nearby/messages/internal/zze;
 
-.field public final aNu:Lcom/google/android/gms/nearby/messages/internal/zza;
+.field public final aNM:Lcom/google/android/gms/nearby/messages/internal/zza;
 
-.field public final aNv:Lcom/google/android/gms/internal/nearby/zzgs;
+.field public final aNN:Lcom/google/android/gms/internal/nearby/zzgs;
 
-.field private final aNw:[B
+.field private final aNO:[B
 
 .field private final versionCode:I
 
@@ -55,7 +55,7 @@
 
     const/4 p1, 0x2
 
-    invoke-static {p2, p1}, Lcom/google/android/gms/nearby/messages/internal/Update;->O(II)Z
+    invoke-static {p2, p1}, Lcom/google/android/gms/nearby/messages/internal/Update;->N(II)Z
 
     move-result v0
 
@@ -77,22 +77,22 @@
     move p1, p2
 
     :goto_0
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNr:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNJ:I
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNt:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNL:Lcom/google/android/gms/nearby/messages/internal/zze;
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNu:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNM:Lcom/google/android/gms/nearby/messages/internal/zza;
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNv:Lcom/google/android/gms/internal/nearby/zzgs;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNN:Lcom/google/android/gms/internal/nearby/zzgs;
 
-    iput-object p7, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNw:[B
+    iput-object p7, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNO:[B
 
     return-void
 .end method
 
-.method private static O(II)Z
+.method private static N(II)Z
     .locals 0
 
     and-int/2addr p0, p1
@@ -114,9 +114,9 @@
 .method public final bp(I)Z
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNr:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNJ:I
 
-    invoke-static {v0, p1}, Lcom/google/android/gms/nearby/messages/internal/Update;->O(II)Z
+    invoke-static {v0, p1}, Lcom/google/android/gms/nearby/messages/internal/Update;->N(II)Z
 
     move-result p1
 
@@ -144,15 +144,15 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/nearby/messages/internal/Update;
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNr:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNJ:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aNr:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aNJ:I
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -160,9 +160,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNt:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNL:Lcom/google/android/gms/nearby/messages/internal/zze;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aNt:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aNL:Lcom/google/android/gms/nearby/messages/internal/zze;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -170,9 +170,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNu:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNM:Lcom/google/android/gms/nearby/messages/internal/zza;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aNu:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aNM:Lcom/google/android/gms/nearby/messages/internal/zza;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -180,9 +180,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNv:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNN:Lcom/google/android/gms/internal/nearby/zzgs;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aNv:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aNN:Lcom/google/android/gms/internal/nearby/zzgs;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -190,9 +190,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNw:[B
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNO:[B
 
-    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aNw:[B
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aNO:[B
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->equals([B[B)Z
 
@@ -213,7 +213,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNr:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNJ:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -223,31 +223,31 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNt:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNL:Lcom/google/android/gms/nearby/messages/internal/zze;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNu:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNM:Lcom/google/android/gms/nearby/messages/internal/zza;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNv:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNN:Lcom/google/android/gms/internal/nearby/zzgs;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNw:[B
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNO:[B
 
     const/4 v2, 0x5
 
@@ -349,31 +349,31 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNt:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNL:Lcom/google/android/gms/nearby/messages/internal/zze;
 
     invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNu:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNM:Lcom/google/android/gms/nearby/messages/internal/zza;
 
     invoke-static {v3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNv:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v4, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNN:Lcom/google/android/gms/internal/nearby/zzgs;
 
     invoke-static {v4}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNw:[B
+    iget-object v5, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNO:[B
 
     invoke-static {v5}, Lcom/google/android/gms/internal/nearby/au;->s([B)Lcom/google/android/gms/internal/nearby/au;
 
@@ -509,37 +509,37 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNr:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNJ:I
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNt:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNL:Lcom/google/android/gms/nearby/messages/internal/zze;
 
     const/4 v2, 0x4
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNu:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNM:Lcom/google/android/gms/nearby/messages/internal/zza;
 
     const/4 v2, 0x5
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNv:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNN:Lcom/google/android/gms/internal/nearby/zzgs;
 
     const/4 v2, 0x6
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNw:[B
+    iget-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aNO:[B
 
     const/4 v1, 0x7
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/aa.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/aa.smali
index e34cb5b0c7..c755e19c0e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/aa.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/aa.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final aNV:Lcom/google/android/gms/internal/nearby/bc;
+.field private static final aOn:Lcom/google/android/gms/internal/nearby/bc;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/nearby/bc<",
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final aNW:Lcom/google/android/gms/common/api/internal/h;
+.field private final aOo:Lcom/google/android/gms/common/api/internal/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h<",
@@ -34,7 +34,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/internal/ab;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/aa;->aNV:Lcom/google/android/gms/internal/nearby/bc;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/aa;->aOn:Lcom/google/android/gms/internal/nearby/bc;
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/nearby/messages/internal/az;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/aa;->aNW:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/aa;->aOo:Lcom/google/android/gms/common/api/internal/h;
 
     return-void
 .end method
@@ -62,11 +62,11 @@
 .method public onExpired()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/aa;->aNW:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/aa;->aOo:Lcom/google/android/gms/common/api/internal/h;
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/aa;->aNV:Lcom/google/android/gms/internal/nearby/bc;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/aa;->aOn:Lcom/google/android/gms/internal/nearby/bc;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/common/api/internal/h;->a(Lcom/google/android/gms/common/api/internal/h$b;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ac.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ac.smali
index aadc5a8405..f020d068e8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ac.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ac.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final aNV:Lcom/google/android/gms/internal/nearby/bc;
+.field private static final aOn:Lcom/google/android/gms/internal/nearby/bc;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/nearby/bc<",
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final aNW:Lcom/google/android/gms/common/api/internal/h;
+.field private final aOo:Lcom/google/android/gms/common/api/internal/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h<",
@@ -34,7 +34,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/internal/ad;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ac;->aNV:Lcom/google/android/gms/internal/nearby/bc;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ac;->aOn:Lcom/google/android/gms/internal/nearby/bc;
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/nearby/messages/internal/b;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/ac;->aNW:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/ac;->aOo:Lcom/google/android/gms/common/api/internal/h;
 
     return-void
 .end method
@@ -62,11 +62,11 @@
 .method public onExpired()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ac;->aNW:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ac;->aOo:Lcom/google/android/gms/common/api/internal/h;
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/ac;->aNV:Lcom/google/android/gms/internal/nearby/bc;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/ac;->aOn:Lcom/google/android/gms/internal/nearby/bc;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/common/api/internal/h;->a(Lcom/google/android/gms/common/api/internal/h$b;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ae.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ae.smali
index 30d689ee3c..d3ce74a4a9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ae.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ae.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field public static final aBC:Lcom/google/android/gms/common/api/a$g;
+.field public static final aBU:Lcom/google/android/gms/common/api/a$g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$g<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field public static final aBD:Lcom/google/android/gms/common/api/a$a;
+.field public static final aBV:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field public static final aNX:Lcom/google/android/gms/nearby/messages/internal/ae;
+.field public static final aOp:Lcom/google/android/gms/nearby/messages/internal/ae;
 
 
 # direct methods
@@ -38,19 +38,19 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/internal/ae;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aNX:Lcom/google/android/gms/nearby/messages/internal/ae;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aOp:Lcom/google/android/gms/nearby/messages/internal/ae;
 
     new-instance v0, Lcom/google/android/gms/common/api/a$g;
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/a$g;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     new-instance v0, Lcom/google/android/gms/nearby/messages/internal/af;
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/internal/af;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aBD:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aBV:Lcom/google/android/gms/common/api/a$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ag.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ag.smali
index e973df59e6..0dd5a578ea 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ag.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ag.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final aBC:Lcom/google/android/gms/common/api/a$g;
+.field private static final aBU:Lcom/google/android/gms/common/api/a$g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$g<",
@@ -22,7 +22,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/a$g;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ag;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ag;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/as.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/as.smali
index c17c5d93bd..f4ef39411e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/as.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/as.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -47,7 +47,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -77,7 +77,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/av.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/av.smali
index 829559c9f6..6144bada6d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/av.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/av.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ax.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ax.smali
index 0ea4cc2335..b1f2227cc6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ax.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ax.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -47,7 +47,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -68,7 +68,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -89,7 +89,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -110,7 +110,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -131,7 +131,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ba.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ba.smali
index ade052755a..c80a672d27 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ba.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/ba.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/bd.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/bd.smali
index e559ab79d6..8053726385 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/bd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/bd.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/c.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/c.smali
index 2479937e28..49dfdf347c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/c.smali
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->mH()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/f.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/f.smali
index ec6c55e58f..b838bf4181 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/f.smali
@@ -13,9 +13,9 @@
 
 
 # instance fields
-.field private final aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
-.field final aNz:Lcom/google/android/gms/internal/nearby/bf;
+.field final aNR:Lcom/google/android/gms/internal/nearby/bf;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/nearby/bf<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final ajs:I
+.field private final ajK:I
 
 
 # direct methods
@@ -53,9 +53,9 @@
 
     invoke-direct {p2}, Lcom/google/android/gms/internal/nearby/bf;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object p2, p5, Lcom/google/android/gms/common/internal/d;->ahR:Ljava/lang/String;
+    iget-object p2, p5, Lcom/google/android/gms/common/internal/d;->aij:Ljava/lang/String;
 
     instance-of p3, p1, Landroid/app/Activity;
 
@@ -101,9 +101,9 @@
 
     invoke-direct {v2, p2, v1, v0, p3}, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;-><init>(Ljava/lang/String;Ljava/lang/String;ZI)V
 
-    iput-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
-    iget p2, p6, Lcom/google/android/gms/nearby/messages/b;->ajs:I
+    iget p2, p6, Lcom/google/android/gms/nearby/messages/b;->ajK:I
 
     goto :goto_1
 
@@ -112,12 +112,12 @@
 
     invoke-direct {p6, p2, v1, v0, p3}, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;-><init>(Ljava/lang/String;Ljava/lang/String;ZI)V
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     const/4 p2, -0x1
 
     :goto_1
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->ajs:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->ajK:I
 
     if-ne p3, p5, :cond_5
 
@@ -251,7 +251,7 @@
     invoke-static {v2, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/f;->lY()Landroid/os/IInterface;
+    invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/f;->lW()Landroid/os/IInterface;
 
     move-result-object p1
 
@@ -357,7 +357,7 @@
 
     :cond_0
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
     iget-object v0, v0, Lcom/google/android/gms/internal/nearby/bf;->map:Ljava/util/Map;
 
@@ -368,20 +368,20 @@
     return-void
 .end method
 
-.method public final lX()Landroid/os/Bundle;
+.method public final lV()Landroid/os/Bundle;
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/common/internal/g;->lX()Landroid/os/Bundle;
+    invoke-super {p0}, Lcom/google/android/gms/common/internal/g;->lV()Landroid/os/Bundle;
 
     move-result-object v0
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/f;->ajs:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/f;->ajK:I
 
     const-string v2, "NearbyPermissions"
 
     invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     const-string v2, "ClientAppContext"
 
@@ -390,7 +390,7 @@
     return-object v0
 .end method
 
-.method public final lf()Z
+.method public final ld()Z
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->mContext:Landroid/content/Context;
@@ -402,7 +402,7 @@
     return v0
 .end method
 
-.method public final lh()I
+.method public final lf()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -410,7 +410,7 @@
     return v0
 .end method
 
-.method public final lj()Ljava/lang/String;
+.method public final lh()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.nearby.messages.service.NearbyMessagesService.START"
@@ -418,7 +418,7 @@
     return-object v0
 .end method
 
-.method public final lk()Ljava/lang/String;
+.method public final li()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.nearby.messages.internal.INearbyMessagesService"
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/g.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/g.smali
index b94cf0abcb..0593aa0417 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/g.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field private final aNA:Landroid/app/Activity;
+.field private final aNS:Landroid/app/Activity;
 
-.field private final aNB:Lcom/google/android/gms/nearby/messages/internal/f;
+.field private final aNT:Lcom/google/android/gms/nearby/messages/internal/f;
 
 
 # direct methods
@@ -17,9 +17,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aNA:Landroid/app/Activity;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aNS:Landroid/app/Activity;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aNB:Lcom/google/android/gms/nearby/messages/internal/f;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aNT:Lcom/google/android/gms/nearby/messages/internal/f;
 
     return-void
 .end method
@@ -43,7 +43,7 @@
 .method public final onActivityDestroyed(Landroid/app/Activity;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aNA:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aNS:Landroid/app/Activity;
 
     if-ne p1, v0, :cond_1
 
@@ -115,14 +115,14 @@
 .method public final onActivityStopped(Landroid/app/Activity;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aNA:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aNS:Landroid/app/Activity;
 
     if-ne p1, v0, :cond_0
 
     const/4 v0, 0x1
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aNB:Lcom/google/android/gms/nearby/messages/internal/f;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aNT:Lcom/google/android/gms/nearby/messages/internal/f;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/nearby/messages/internal/f;->cM(I)V
     :try_end_0
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/h.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/h.smali
index fae7a511ba..16fc8cfcb7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/h.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final aBC:Lcom/google/android/gms/common/api/a$g;
+.field private static final aBU:Lcom/google/android/gms/common/api/a$g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$g<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private static final aBD:Lcom/google/android/gms/common/api/a$a;
+.field private static final aBV:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private static final aMh:Lcom/google/android/gms/common/api/a;
+.field private static final aMz:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -36,7 +36,7 @@
 
 
 # instance fields
-.field final aNg:I
+.field final aNy:I
 
 
 # direct methods
@@ -47,25 +47,25 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/a$g;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     new-instance v0, Lcom/google/android/gms/nearby/messages/internal/p;
 
     invoke-direct {v0}, Lcom/google/android/gms/nearby/messages/internal/p;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aBD:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aBV:Lcom/google/android/gms/common/api/a$a;
 
     new-instance v0, Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/h;->aBD:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/h;->aBV:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/nearby/messages/internal/h;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/nearby/messages/internal/h;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     const-string v3, "Nearby.MESSAGES_API"
 
     invoke-direct {v0, v3, v1, v2}, Lcom/google/android/gms/common/api/a;-><init>(Ljava/lang/String;Lcom/google/android/gms/common/api/a$a;Lcom/google/android/gms/common/api/a$g;)V
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aMh:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aMz:Lcom/google/android/gms/common/api/a;
 
     return-void
 .end method
@@ -73,15 +73,15 @@
 .method public constructor <init>(Landroid/app/Activity;Lcom/google/android/gms/nearby/messages/b;)V
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aMh:Lcom/google/android/gms/common/api/a;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aMz:Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/common/api/e$a;->adK:Lcom/google/android/gms/common/api/e$a;
+    sget-object v1, Lcom/google/android/gms/common/api/e$a;->aed:Lcom/google/android/gms/common/api/e$a;
 
     invoke-direct {p0, p1, v0, p2, v1}, Lcom/google/android/gms/nearby/messages/MessagesClient;-><init>(Landroid/app/Activity;Lcom/google/android/gms/common/api/a;Lcom/google/android/gms/nearby/messages/b;Lcom/google/android/gms/common/api/e$a;)V
 
     const/4 p2, 0x1
 
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/h;->aNg:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/h;->aNy:I
 
     invoke-virtual {p1}, Landroid/app/Activity;->getApplication()Landroid/app/Application;
 
@@ -142,7 +142,7 @@
 
     new-instance p2, Lcom/google/android/gms/nearby/messages/internal/w;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-direct {p2, p0, p1, p3}, Lcom/google/android/gms/nearby/messages/internal/w;-><init>(Lcom/google/android/gms/nearby/messages/internal/h;Lcom/google/android/gms/common/api/internal/h$a;Lcom/google/android/gms/nearby/messages/internal/z;)V
 
@@ -178,9 +178,9 @@
 
     invoke-direct {v0, p2}, Lcom/google/android/gms/internal/nearby/az;-><init>(Lcom/google/android/gms/common/api/internal/h;)V
 
-    iget-object p2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {p2, v1}, Lcom/google/android/gms/internal/nearby/bf;->containsKey(Ljava/lang/Object;)Z
 
@@ -201,9 +201,9 @@
     :cond_0
     new-instance p2, Lcom/google/android/gms/nearby/messages/internal/zzcb;
 
-    iget-object v2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {v2, v3}, Lcom/google/android/gms/internal/nearby/bf;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -213,9 +213,9 @@
 
     invoke-direct {p2, v0, v2}, Lcom/google/android/gms/nearby/messages/internal/zzcb;-><init>(Landroid/os/IBinder;Landroid/os/IBinder;)V
 
-    iput-boolean v1, p2, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aOb:Z
+    iput-boolean v1, p2, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aOt:Z
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lY()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lW()Landroid/os/IInterface;
 
     move-result-object v0
 
@@ -223,9 +223,9 @@
 
     invoke-interface {v0, p2}, Lcom/google/android/gms/nearby/messages/internal/aw;->a(Lcom/google/android/gms/nearby/messages/internal/zzcb;)V
 
-    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/internal/nearby/bf;->remove(Ljava/lang/Object;)V
 
@@ -252,7 +252,7 @@
 
     invoke-direct {v0, p0, v1}, Lcom/google/android/gms/nearby/messages/internal/zzce;-><init>(Lcom/google/android/gms/nearby/messages/internal/zzaf;Landroid/os/IBinder;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lY()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lW()Landroid/os/IInterface;
 
     move-result-object p0
 
@@ -318,7 +318,7 @@
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/tasks/Task;->a(Lcom/google/android/gms/tasks/c;)Lcom/google/android/gms/tasks/Task;
 
-    iget-object p1, v0, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v0, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     return-object p1
 .end method
@@ -365,9 +365,9 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/nearby/bf;->containsKey(Ljava/lang/Object;)Z
 
@@ -375,9 +375,9 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     new-instance v2, Lcom/google/android/gms/internal/nearby/bd;
 
@@ -392,9 +392,9 @@
 
     invoke-direct {v1, p2}, Lcom/google/android/gms/internal/nearby/az;-><init>(Lcom/google/android/gms/common/api/internal/h;)V
 
-    iget-object p2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {p2, p0}, Lcom/google/android/gms/internal/nearby/bf;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -406,9 +406,9 @@
 
     const/4 p0, 0x1
 
-    iput-boolean p0, v0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aOb:Z
+    iput-boolean p0, v0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aOt:Z
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lY()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lW()Landroid/os/IInterface;
 
     move-result-object p0
 
@@ -431,9 +431,9 @@
 
     invoke-direct {v0, p2}, Lcom/google/android/gms/internal/nearby/az;-><init>(Lcom/google/android/gms/common/api/internal/h;)V
 
-    iget-object p2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {p2, v1}, Lcom/google/android/gms/internal/nearby/bf;->containsKey(Ljava/lang/Object;)Z
 
@@ -454,9 +454,9 @@
     :cond_0
     new-instance p2, Lcom/google/android/gms/nearby/messages/internal/zzcg;
 
-    iget-object v1, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v1, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/internal/nearby/bf;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -466,7 +466,7 @@
 
     invoke-direct {p2, v1, v0}, Lcom/google/android/gms/nearby/messages/internal/zzcg;-><init>(Landroid/os/IBinder;Landroid/os/IBinder;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lY()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lW()Landroid/os/IInterface;
 
     move-result-object v0
 
@@ -474,9 +474,9 @@
 
     invoke-interface {v0, p2}, Lcom/google/android/gms/nearby/messages/internal/aw;->a(Lcom/google/android/gms/nearby/messages/internal/zzcg;)V
 
-    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/internal/nearby/bf;->remove(Ljava/lang/Object;)V
 
@@ -529,7 +529,7 @@
 
     move-result-object v0
 
-    iget-object v1, p2, Lcom/google/android/gms/nearby/messages/PublishOptions;->aMP:Lcom/google/android/gms/nearby/messages/c;
+    iget-object v1, p2, Lcom/google/android/gms/nearby/messages/PublishOptions;->aNh:Lcom/google/android/gms/nearby/messages/c;
 
     invoke-direct {p0, v1}, Lcom/google/android/gms/nearby/messages/internal/h;->aF(Ljava/lang/Object;)Lcom/google/android/gms/common/api/internal/h;
 
@@ -594,9 +594,9 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v0, p2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iget v0, v0, Lcom/google/android/gms/nearby/messages/Strategy;->ajE:I
+    iget v0, v0, Lcom/google/android/gms/nearby/messages/Strategy;->ajW:I
 
     if-nez v0, :cond_0
 
@@ -616,7 +616,7 @@
 
     move-result-object p1
 
-    iget-object v0, p2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNd:Lcom/google/android/gms/nearby/messages/e;
+    iget-object v0, p2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNv:Lcom/google/android/gms/nearby/messages/e;
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/nearby/messages/internal/h;->aF(Ljava/lang/Object;)Lcom/google/android/gms/common/api/internal/h;
 
@@ -675,10 +675,10 @@
     return-object p1
 .end method
 
-.method public final lm()Lcom/google/android/gms/common/internal/d$a;
+.method public final lk()Lcom/google/android/gms/common/internal/d$a;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/nearby/messages/MessagesClient;->lm()Lcom/google/android/gms/common/internal/d$a;
+    invoke-super {p0}, Lcom/google/android/gms/nearby/messages/MessagesClient;->lk()Lcom/google/android/gms/common/internal/d$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/i.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/i.smali
index f44040ff02..6910a6e092 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/i.smali
@@ -6,13 +6,13 @@
 
 
 # instance fields
-.field private final aNC:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final aNU:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final aND:Lcom/google/android/gms/nearby/messages/Message;
+.field private final aNV:Lcom/google/android/gms/nearby/messages/Message;
 
-.field private final aNE:Lcom/google/android/gms/nearby/messages/internal/aa;
+.field private final aNW:Lcom/google/android/gms/nearby/messages/internal/aa;
 
-.field private final aNF:Lcom/google/android/gms/nearby/messages/PublishOptions;
+.field private final aNX:Lcom/google/android/gms/nearby/messages/PublishOptions;
 
 
 # direct methods
@@ -21,13 +21,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNC:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNU:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aND:Lcom/google/android/gms/nearby/messages/Message;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNV:Lcom/google/android/gms/nearby/messages/Message;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNE:Lcom/google/android/gms/nearby/messages/internal/aa;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNW:Lcom/google/android/gms/nearby/messages/internal/aa;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNF:Lcom/google/android/gms/nearby/messages/PublishOptions;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNX:Lcom/google/android/gms/nearby/messages/PublishOptions;
 
     return-void
 .end method
@@ -37,23 +37,23 @@
 .method public final a(Lcom/google/android/gms/nearby/messages/internal/f;Lcom/google/android/gms/common/api/internal/h;)V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNC:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNU:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aND:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNV:Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object v6, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNE:Lcom/google/android/gms/nearby/messages/internal/aa;
+    iget-object v6, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNW:Lcom/google/android/gms/nearby/messages/internal/aa;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNF:Lcom/google/android/gms/nearby/messages/PublishOptions;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aNX:Lcom/google/android/gms/nearby/messages/PublishOptions;
 
     invoke-static {v1}, Lcom/google/android/gms/nearby/messages/internal/zzaf;->b(Lcom/google/android/gms/nearby/messages/Message;)Lcom/google/android/gms/nearby/messages/internal/zzaf;
 
     move-result-object v3
 
-    iget v7, v0, Lcom/google/android/gms/nearby/messages/internal/h;->aNg:I
+    iget v7, v0, Lcom/google/android/gms/nearby/messages/internal/h;->aNy:I
 
     new-instance v0, Lcom/google/android/gms/nearby/messages/internal/zzbz;
 
-    iget-object v4, v2, Lcom/google/android/gms/nearby/messages/PublishOptions;->aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v4, v2, Lcom/google/android/gms/nearby/messages/PublishOptions;->aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
     new-instance v5, Lcom/google/android/gms/internal/nearby/az;
 
@@ -63,7 +63,7 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/nearby/messages/internal/zzbz;-><init>(Lcom/google/android/gms/nearby/messages/internal/zzaf;Lcom/google/android/gms/nearby/messages/Strategy;Landroid/os/IBinder;Landroid/os/IBinder;I)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lY()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lW()Landroid/os/IInterface;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/j.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/j.smali
index 8356a21915..3d59d6e021 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/j.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private final aNG:Lcom/google/android/gms/nearby/messages/Message;
+.field private final aNY:Lcom/google/android/gms/nearby/messages/Message;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/j;->aNG:Lcom/google/android/gms/nearby/messages/Message;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/j;->aNY:Lcom/google/android/gms/nearby/messages/Message;
 
     return-void
 .end method
@@ -25,7 +25,7 @@
 .method public final a(Lcom/google/android/gms/nearby/messages/internal/f;Lcom/google/android/gms/common/api/internal/h;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/j;->aNG:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/j;->aNY:Lcom/google/android/gms/nearby/messages/Message;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/nearby/messages/internal/h;->a(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/internal/f;Lcom/google/android/gms/common/api/internal/h;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/k.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/k.smali
index 0358e62c38..833ab7f83d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/k.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/k.smali
@@ -6,13 +6,13 @@
 
 
 # instance fields
-.field private final aNC:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final aNU:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final aNH:Lcom/google/android/gms/common/api/internal/h;
+.field private final aNZ:Lcom/google/android/gms/common/api/internal/h;
 
-.field private final aNI:Lcom/google/android/gms/nearby/messages/internal/ac;
+.field private final aOa:Lcom/google/android/gms/nearby/messages/internal/ac;
 
-.field private final aNJ:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+.field private final aOb:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
 
 # direct methods
@@ -21,13 +21,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aNC:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aNU:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aNH:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aNZ:Lcom/google/android/gms/common/api/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aNI:Lcom/google/android/gms/nearby/messages/internal/ac;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aOa:Lcom/google/android/gms/nearby/messages/internal/ac;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aNJ:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aOb:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
     return-void
 .end method
@@ -37,19 +37,19 @@
 .method public final a(Lcom/google/android/gms/nearby/messages/internal/f;Lcom/google/android/gms/common/api/internal/h;)V
     .locals 10
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aNC:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aNU:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aNH:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aNZ:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v7, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aNI:Lcom/google/android/gms/nearby/messages/internal/ac;
+    iget-object v7, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aOa:Lcom/google/android/gms/nearby/messages/internal/ac;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aNJ:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aOb:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
-    iget v9, v0, Lcom/google/android/gms/nearby/messages/internal/h;->aNg:I
+    iget v9, v0, Lcom/google/android/gms/nearby/messages/internal/h;->aNy:I
 
-    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v3, v1, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v3, v1, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {v0, v3}, Lcom/google/android/gms/internal/nearby/bf;->containsKey(Ljava/lang/Object;)Z
 
@@ -57,9 +57,9 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v3, v1, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v3, v1, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     new-instance v4, Lcom/google/android/gms/internal/nearby/ax;
 
@@ -70,9 +70,9 @@
     :cond_0
     new-instance v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNz:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aNR:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {v3, v1}, Lcom/google/android/gms/internal/nearby/bf;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -82,21 +82,21 @@
 
     check-cast v3, Landroid/os/IBinder;
 
-    iget-object v4, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aMO:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v4, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNg:Lcom/google/android/gms/nearby/messages/Strategy;
 
     new-instance v5, Lcom/google/android/gms/internal/nearby/az;
 
     invoke-direct {v5, p2}, Lcom/google/android/gms/internal/nearby/az;-><init>(Lcom/google/android/gms/common/api/internal/h;)V
 
-    iget-object v6, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNc:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v6, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aNu:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-    iget-boolean v8, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->ajM:Z
+    iget-boolean v8, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->ake:Z
 
     move-object v2, v0
 
     invoke-direct/range {v2 .. v9}, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;-><init>(Landroid/os/IBinder;Lcom/google/android/gms/nearby/messages/Strategy;Landroid/os/IBinder;Lcom/google/android/gms/nearby/messages/MessageFilter;Landroid/os/IBinder;ZI)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lY()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->lW()Landroid/os/IInterface;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/l.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/l.smali
index eb4673d270..a497e43687 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/l.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/l.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private final aNK:Lcom/google/android/gms/common/api/internal/h;
+.field private final aOc:Lcom/google/android/gms/common/api/internal/h;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/l;->aNK:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/l;->aOc:Lcom/google/android/gms/common/api/internal/h;
 
     return-void
 .end method
@@ -25,7 +25,7 @@
 .method public final a(Lcom/google/android/gms/nearby/messages/internal/f;Lcom/google/android/gms/common/api/internal/h;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/l;->aNK:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/l;->aOc:Lcom/google/android/gms/common/api/internal/h;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/nearby/messages/internal/h;->c(Lcom/google/android/gms/common/api/internal/h;Lcom/google/android/gms/nearby/messages/internal/f;Lcom/google/android/gms/common/api/internal/h;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/m.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/m.smali
index 5e377ecdce..892aa455cc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/m.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/m.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private final aNK:Lcom/google/android/gms/common/api/internal/h;
+.field private final aOc:Lcom/google/android/gms/common/api/internal/h;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/m;->aNK:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/m;->aOc:Lcom/google/android/gms/common/api/internal/h;
 
     return-void
 .end method
@@ -25,7 +25,7 @@
 .method public final a(Lcom/google/android/gms/nearby/messages/internal/f;Lcom/google/android/gms/common/api/internal/h;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/m;->aNK:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/m;->aOc:Lcom/google/android/gms/common/api/internal/h;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/nearby/messages/internal/h;->b(Lcom/google/android/gms/common/api/internal/h;Lcom/google/android/gms/nearby/messages/internal/f;Lcom/google/android/gms/common/api/internal/h;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/n.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/n.smali
index ffb2a88f29..74ccbe2649 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/n.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private final aNK:Lcom/google/android/gms/common/api/internal/h;
+.field private final aOc:Lcom/google/android/gms/common/api/internal/h;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/n;->aNK:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/n;->aOc:Lcom/google/android/gms/common/api/internal/h;
 
     return-void
 .end method
@@ -25,7 +25,7 @@
 .method public final a(Lcom/google/android/gms/nearby/messages/internal/f;Lcom/google/android/gms/common/api/internal/h;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/n;->aNK:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/n;->aOc:Lcom/google/android/gms/common/api/internal/h;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/nearby/messages/internal/h;->a(Lcom/google/android/gms/common/api/internal/h;Lcom/google/android/gms/nearby/messages/internal/f;Lcom/google/android/gms/common/api/internal/h;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/o.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/o.smali
index 32aebed10b..ed81c3b8d9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/o.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/o.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private final aNL:I
+.field private final aOd:I
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/internal/o;->aNL:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/internal/o;->aOd:I
 
     return-void
 .end method
@@ -27,7 +27,7 @@
 .method public final a(Lcom/google/android/gms/nearby/messages/internal/f;Lcom/google/android/gms/common/api/internal/h;)V
     .locals 0
 
-    iget p2, p0, Lcom/google/android/gms/nearby/messages/internal/o;->aNL:I
+    iget p2, p0, Lcom/google/android/gms/nearby/messages/internal/o;->aOd:I
 
     invoke-static {p2, p1}, Lcom/google/android/gms/nearby/messages/internal/h;->a(ILcom/google/android/gms/nearby/messages/internal/f;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/q.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/q.smali
index d3db5a1be5..cb317ecf6e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/q.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/q.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic aNM:Lcom/google/android/gms/common/api/internal/h;
+.field private final synthetic aOe:Lcom/google/android/gms/common/api/internal/h;
 
-.field private final synthetic aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/nearby/messages/internal/h;Lcom/google/android/gms/common/api/internal/h;Lcom/google/android/gms/common/api/internal/h;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aNM:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aOe:Lcom/google/android/gms/common/api/internal/h;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/nearby/messages/internal/aa;-><init>(Lcom/google/android/gms/common/api/internal/h;)V
 
@@ -26,11 +26,11 @@
 .method public final onExpired()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aNM:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aOe:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/nearby/messages/internal/h;->a(Lcom/google/android/gms/common/api/internal/h$a;)Lcom/google/android/gms/tasks/Task;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/r.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/r.smali
index 917610a3d5..baf02d6d58 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/r.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/r.smali
@@ -3,18 +3,18 @@
 
 
 # instance fields
-.field private final synthetic aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final synthetic aNO:Lcom/google/android/gms/common/api/internal/h;
+.field private final synthetic aOg:Lcom/google/android/gms/common/api/internal/h;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/nearby/messages/internal/h;Lcom/google/android/gms/common/api/internal/h;Lcom/google/android/gms/common/api/internal/h;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aNO:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aOg:Lcom/google/android/gms/common/api/internal/h;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/nearby/messages/internal/ac;-><init>(Lcom/google/android/gms/common/api/internal/h;)V
 
@@ -26,11 +26,11 @@
 .method public final onExpired()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aNO:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aOg:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->afm:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->afE:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/nearby/messages/internal/h;->a(Lcom/google/android/gms/common/api/internal/h$a;)Lcom/google/android/gms/tasks/Task;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/s.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/s.smali
index 3f6be56a01..b30d538826 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/s.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/s.smali
@@ -17,14 +17,14 @@
 
 
 # instance fields
-.field private final synthetic aNP:Lcom/google/android/gms/tasks/h;
+.field private final synthetic aOh:Lcom/google/android/gms/tasks/h;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/tasks/h;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/s;->aNP:Lcom/google/android/gms/tasks/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/s;->aOh:Lcom/google/android/gms/tasks/h;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,7 +36,7 @@
 .method public final c(Lcom/google/android/gms/common/api/Status;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/s;->aNP:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/s;->aOh:Lcom/google/android/gms/tasks/h;
 
     new-instance v1, Lcom/google/android/gms/common/api/b;
 
@@ -50,7 +50,7 @@
 .method public final synthetic k(Ljava/lang/Object;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/s;->aNP:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/s;->aOh:Lcom/google/android/gms/tasks/h;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/t.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/t.smali
index 87d3bdaa47..26417ad0d9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/t.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/t.smali
@@ -17,14 +17,14 @@
 
 
 # instance fields
-.field private final synthetic aNQ:Lcom/google/android/gms/tasks/h;
+.field private final synthetic aOi:Lcom/google/android/gms/tasks/h;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/tasks/h;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aNQ:Lcom/google/android/gms/tasks/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aOi:Lcom/google/android/gms/tasks/h;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -44,13 +44,13 @@
         }
     .end annotation
 
-    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->zW()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->zS()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aNQ:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aOi:Lcom/google/android/gms/tasks/h;
 
     const/4 v0, 0x0
 
@@ -59,7 +59,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aNQ:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aOi:Lcom/google/android/gms/tasks/h;
 
     invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->getException()Ljava/lang/Exception;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/u.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/u.smali
index f03ef38230..df85f289c0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/u.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/u.smali
@@ -13,18 +13,18 @@
 
 
 # instance fields
-.field private final synthetic aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final synthetic aNR:Lcom/google/android/gms/nearby/messages/internal/z;
+.field private final synthetic aOj:Lcom/google/android/gms/nearby/messages/internal/z;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/nearby/messages/internal/h;Lcom/google/android/gms/common/api/internal/h;Lcom/google/android/gms/nearby/messages/internal/z;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aNR:Lcom/google/android/gms/nearby/messages/internal/z;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aOj:Lcom/google/android/gms/nearby/messages/internal/z;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/common/api/internal/j;-><init>(Lcom/google/android/gms/common/api/internal/h;)V
 
@@ -43,9 +43,9 @@
 
     check-cast p1, Lcom/google/android/gms/nearby/messages/internal/f;
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aNR:Lcom/google/android/gms/nearby/messages/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aOj:Lcom/google/android/gms/nearby/messages/internal/z;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
     invoke-static {v1, p2}, Lcom/google/android/gms/nearby/messages/internal/h;->a(Lcom/google/android/gms/nearby/messages/internal/h;Lcom/google/android/gms/tasks/h;)Lcom/google/android/gms/common/api/internal/h;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/w.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/w.smali
index 58fe141f5e..8ed881a267 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/w.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/w.smali
@@ -13,18 +13,18 @@
 
 
 # instance fields
-.field private final synthetic aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final synthetic aNS:Lcom/google/android/gms/nearby/messages/internal/z;
+.field private final synthetic aOk:Lcom/google/android/gms/nearby/messages/internal/z;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/nearby/messages/internal/h;Lcom/google/android/gms/common/api/internal/h$a;Lcom/google/android/gms/nearby/messages/internal/z;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aNS:Lcom/google/android/gms/nearby/messages/internal/z;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aOk:Lcom/google/android/gms/nearby/messages/internal/z;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/common/api/internal/m;-><init>(Lcom/google/android/gms/common/api/internal/h$a;)V
 
@@ -43,9 +43,9 @@
 
     check-cast p1, Lcom/google/android/gms/nearby/messages/internal/f;
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aNS:Lcom/google/android/gms/nearby/messages/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aOk:Lcom/google/android/gms/nearby/messages/internal/z;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
     invoke-static {v1, p2}, Lcom/google/android/gms/nearby/messages/internal/h;->a(Lcom/google/android/gms/nearby/messages/internal/h;Lcom/google/android/gms/tasks/h;)Lcom/google/android/gms/common/api/internal/h;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/x.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/x.smali
index 6c1389297c..c80dacd2ee 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/x.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/x.smali
@@ -14,18 +14,18 @@
 
 
 # instance fields
-.field private final synthetic aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final synthetic aNT:Lcom/google/android/gms/nearby/messages/internal/z;
+.field private final synthetic aOl:Lcom/google/android/gms/nearby/messages/internal/z;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/nearby/messages/internal/h;Lcom/google/android/gms/nearby/messages/internal/z;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aNT:Lcom/google/android/gms/nearby/messages/internal/z;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aOl:Lcom/google/android/gms/nearby/messages/internal/z;
 
     invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/l;-><init>()V
 
@@ -44,9 +44,9 @@
 
     check-cast p1, Lcom/google/android/gms/nearby/messages/internal/f;
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aNT:Lcom/google/android/gms/nearby/messages/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aOl:Lcom/google/android/gms/nearby/messages/internal/z;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aNN:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aOf:Lcom/google/android/gms/nearby/messages/internal/h;
 
     invoke-static {v1, p2}, Lcom/google/android/gms/nearby/messages/internal/h;->a(Lcom/google/android/gms/nearby/messages/internal/h;Lcom/google/android/gms/tasks/h;)Lcom/google/android/gms/common/api/internal/h;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/y.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/y.smali
index 74a971fdd6..26f7b42f53 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/y.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/y.smali
@@ -6,9 +6,9 @@
 
 
 # instance fields
-.field private final aNA:Landroid/app/Activity;
+.field private final aNS:Landroid/app/Activity;
 
-.field private final aNU:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final aOm:Lcom/google/android/gms/nearby/messages/internal/h;
 
 
 # direct methods
@@ -17,9 +17,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aNA:Landroid/app/Activity;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aNS:Landroid/app/Activity;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aNU:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aOm:Lcom/google/android/gms/nearby/messages/internal/h;
 
     return-void
 .end method
@@ -43,7 +43,7 @@
 .method public final onActivityDestroyed(Landroid/app/Activity;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aNA:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aNS:Landroid/app/Activity;
 
     if-ne p1, v0, :cond_0
 
@@ -106,11 +106,11 @@
 .method public final onActivityStopped(Landroid/app/Activity;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aNA:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aNS:Landroid/app/Activity;
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aNU:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aOm:Lcom/google/android/gms/nearby/messages/internal/h;
 
     invoke-static {p1}, Lcom/google/android/gms/nearby/messages/internal/h;->a(Lcom/google/android/gms/nearby/messages/internal/h;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zza.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zza.smali
index f67163b70c..e178209c48 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zza.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zza.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field private final aNx:I
+.field private final aNP:I
 
-.field private final aNy:I
+.field private final aNQ:I
 
 .field private final versionCode:I
 
@@ -45,7 +45,7 @@
 
     iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->versionCode:I
 
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNx:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNP:I
 
     const/16 p1, -0xa9
 
@@ -61,7 +61,7 @@
     const/high16 p3, -0x80000000
 
     :goto_0
-    iput p3, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNy:I
+    iput p3, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNQ:I
 
     return-void
 .end method
@@ -89,7 +89,7 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/nearby/messages/BleSignal;
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNx:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNP:I
 
     invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/BleSignal;->getRssi()I
 
@@ -97,7 +97,7 @@
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNy:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNQ:I
 
     invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/BleSignal;->getTxPower()I
 
@@ -114,7 +114,7 @@
 .method public final getRssi()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNx:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNP:I
 
     return v0
 .end method
@@ -122,7 +122,7 @@
 .method public final getTxPower()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNy:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNQ:I
 
     return v0
 .end method
@@ -134,7 +134,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNx:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNP:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -144,7 +144,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNy:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNQ:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -164,9 +164,9 @@
 .method public final toString()Ljava/lang/String;
     .locals 4
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNx:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNP:I
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNy:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNQ:I
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -212,13 +212,13 @@
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNx:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNP:I
 
     const/4 v1, 0x2
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNy:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aNQ:I
 
     const/4 v1, 0x3
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzad.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzad.smali
index a0e97363da..6fc57f823a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzad.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzad.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final aMy:Ljava/lang/String;
+.field private final aMQ:Ljava/lang/String;
 
 .field private final type:Ljava/lang/String;
 
@@ -42,7 +42,7 @@
 
     iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->versionCode:I
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aMy:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aMQ:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->type:Ljava/lang/String;
 
@@ -82,9 +82,9 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/nearby/messages/internal/zzad;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aMy:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aMQ:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/zzad;->aMy:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/zzad;->aMQ:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -116,7 +116,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aMy:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aMQ:Ljava/lang/String;
 
     const/4 v2, 0x0
 
@@ -138,7 +138,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aMy:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aMQ:Ljava/lang/String;
 
     iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->type:Ljava/lang/String;
 
@@ -194,7 +194,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aMy:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aMQ:Ljava/lang/String;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzaf.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzaf.smali
index 2d04babcf9..73010599d0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzaf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzaf.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final aNs:Lcom/google/android/gms/nearby/messages/Message;
+.field private final aNK:Lcom/google/android/gms/nearby/messages/Message;
 
 .field private final versionCode:I
 
@@ -46,7 +46,7 @@
 
     check-cast p1, Lcom/google/android/gms/nearby/messages/Message;
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
     return-void
 .end method
@@ -86,9 +86,9 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/nearby/messages/internal/zzaf;
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
     invoke-static {v0, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -104,7 +104,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
     const/4 v2, 0x0
 
@@ -120,7 +120,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
     invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Message;->toString()Ljava/lang/String;
 
@@ -166,7 +166,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aNs:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aNK:Lcom/google/android/gms/nearby/messages/Message;
 
     const/4 v2, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzbz.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzbz.smali
index f4b05b6505..010521b916 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzbz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzbz.smali
@@ -15,41 +15,41 @@
 
 
 # instance fields
-.field private final aMJ:Ljava/lang/String;
+.field private final aNA:Lcom/google/android/gms/nearby/messages/Strategy;
+
+.field private final aNB:Lcom/google/android/gms/nearby/messages/internal/at;
+
+.field private final aNG:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aMK:Z
+.field private final aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aMM:Ljava/lang/String;
+.field private final aNb:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aNY:Lcom/google/android/gms/nearby/messages/internal/zzaf;
-
-.field private final aNZ:Lcom/google/android/gms/nearby/messages/internal/ay;
-
-.field private final aNg:I
-
-.field private final aNi:Lcom/google/android/gms/nearby/messages/Strategy;
-
-.field private final aNj:Lcom/google/android/gms/nearby/messages/internal/at;
-
-.field private final aNo:Z
+.field private final aNc:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aNe:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
+.field private final aNy:I
+
+.field private final aOq:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+
+.field private final aOr:Lcom/google/android/gms/nearby/messages/internal/ay;
+
 .field private final versionCode:I
 
 
@@ -73,9 +73,9 @@
 
     iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->versionCode:I
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNY:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aOq:Lcom/google/android/gms/nearby/messages/internal/zzaf;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNi:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNA:Lcom/google/android/gms/nearby/messages/Strategy;
 
     const/4 p1, 0x0
 
@@ -106,13 +106,13 @@
     invoke-direct {p2, p4}, Lcom/google/android/gms/nearby/messages/internal/av;-><init>(Landroid/os/IBinder;)V
 
     :goto_0
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNj:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNB:Lcom/google/android/gms/nearby/messages/internal/at;
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aMJ:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNb:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aMM:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNe:Ljava/lang/String;
 
-    iput-boolean p7, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNo:Z
+    iput-boolean p7, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNG:Z
 
     if-nez p8, :cond_2
 
@@ -144,17 +144,17 @@
     invoke-direct {p1, p8}, Lcom/google/android/gms/nearby/messages/internal/ba;-><init>(Landroid/os/IBinder;)V
 
     :goto_1
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNZ:Lcom/google/android/gms/nearby/messages/internal/ay;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aOr:Lcom/google/android/gms/nearby/messages/internal/ay;
 
-    iput-boolean p9, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aMK:Z
+    iput-boolean p9, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNc:Z
 
     invoke-static {p10, p6, p5, p9}, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->a(Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;Ljava/lang/String;Ljava/lang/String;Z)Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
-    iput p11, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNg:I
+    iput p11, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNy:I
 
     return-void
 .end method
@@ -208,19 +208,19 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNY:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aOq:Lcom/google/android/gms/nearby/messages/internal/zzaf;
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNi:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNA:Lcom/google/android/gms/nearby/messages/Strategy;
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNj:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNB:Lcom/google/android/gms/nearby/messages/internal/at;
 
     invoke-interface {v1}, Lcom/google/android/gms/nearby/messages/internal/at;->asBinder()Landroid/os/IBinder;
 
@@ -230,25 +230,25 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/IBinder;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aMJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNb:Ljava/lang/String;
 
     const/4 v2, 0x5
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aMM:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNe:Ljava/lang/String;
 
     const/4 v2, 0x6
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNo:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNG:Z
 
     const/4 v2, 0x7
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNZ:Lcom/google/android/gms/nearby/messages/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aOr:Lcom/google/android/gms/nearby/messages/internal/ay;
 
     if-nez v1, :cond_0
 
@@ -268,19 +268,19 @@
 
     const/16 v1, 0x9
 
-    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aMK:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNc:Z
 
     invoke-static {p1, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
     const/16 v1, 0xa
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     invoke-static {p1, v1, v2, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
     const/16 p2, 0xb
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNg:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aNy:I
 
     invoke-static {p1, p2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzcb.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzcb.smali
index 5b63a3bdf0..3a3abd1901 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzcb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzcb.smali
@@ -15,21 +15,21 @@
 
 
 # instance fields
-.field private aMJ:Ljava/lang/String;
+.field private final aNB:Lcom/google/android/gms/nearby/messages/internal/at;
+
+.field private final aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aNj:Lcom/google/android/gms/nearby/messages/internal/at;
-
-.field private final aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private aNb:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aOa:Lcom/google/android/gms/nearby/messages/internal/bb;
+.field private final aOs:Lcom/google/android/gms/nearby/messages/internal/bb;
 
-.field public aOb:Z
+.field public aOt:Z
 
 .field private final versionCode:I
 
@@ -87,7 +87,7 @@
     move-object p2, v0
 
     :goto_0
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aNj:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aNB:Lcom/google/android/gms/nearby/messages/internal/at;
 
     if-nez p3, :cond_2
 
@@ -116,11 +116,11 @@
     invoke-direct {p2, p3}, Lcom/google/android/gms/nearby/messages/internal/bd;-><init>(Landroid/os/IBinder;)V
 
     :goto_1
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aOa:Lcom/google/android/gms/nearby/messages/internal/bb;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aOs:Lcom/google/android/gms/nearby/messages/internal/bb;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aOb:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aOt:Z
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aMJ:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aNb:Ljava/lang/String;
 
     const/4 p2, 0x0
 
@@ -128,7 +128,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     return-void
 .end method
@@ -172,7 +172,7 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aNj:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aNB:Lcom/google/android/gms/nearby/messages/internal/at;
 
     invoke-interface {v1}, Lcom/google/android/gms/nearby/messages/internal/at;->asBinder()Landroid/os/IBinder;
 
@@ -182,7 +182,7 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/IBinder;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aOa:Lcom/google/android/gms/nearby/messages/internal/bb;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aOs:Lcom/google/android/gms/nearby/messages/internal/bb;
 
     invoke-interface {v1}, Lcom/google/android/gms/nearby/messages/internal/bb;->asBinder()Landroid/os/IBinder;
 
@@ -192,19 +192,19 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/IBinder;)V
 
-    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aOb:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aOt:Z
 
     const/4 v2, 0x4
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aMJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aNb:Ljava/lang/String;
 
     const/4 v2, 0x5
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     const/4 v2, 0x6
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzce.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzce.smali
index e39dc23541..694274e4ec 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzce.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzce.smali
@@ -15,30 +15,30 @@
 
 
 # instance fields
-.field private final aMJ:Ljava/lang/String;
+.field private final aNB:Lcom/google/android/gms/nearby/messages/internal/at;
+
+.field private final aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aMK:Z
+.field private final aNb:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aMM:Ljava/lang/String;
+.field private final aNc:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aNY:Lcom/google/android/gms/nearby/messages/internal/zzaf;
-
-.field private final aNj:Lcom/google/android/gms/nearby/messages/internal/at;
-
-.field private final aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aNe:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
+.field private final aOq:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+
 .field private final versionCode:I
 
 
@@ -62,7 +62,7 @@
 
     iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->versionCode:I
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNY:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aOq:Lcom/google/android/gms/nearby/messages/internal/zzaf;
 
     if-nez p3, :cond_0
 
@@ -91,19 +91,19 @@
     invoke-direct {p1, p3}, Lcom/google/android/gms/nearby/messages/internal/av;-><init>(Landroid/os/IBinder;)V
 
     :goto_0
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNj:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNB:Lcom/google/android/gms/nearby/messages/internal/at;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aMJ:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNb:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aMM:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNe:Ljava/lang/String;
 
-    iput-boolean p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aMK:Z
+    iput-boolean p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNc:Z
 
     invoke-static {p7, p5, p4, p6}, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->a(Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;Ljava/lang/String;Ljava/lang/String;Z)Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     return-void
 .end method
@@ -149,13 +149,13 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNY:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aOq:Lcom/google/android/gms/nearby/messages/internal/zzaf;
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNj:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNB:Lcom/google/android/gms/nearby/messages/internal/at;
 
     invoke-interface {v1}, Lcom/google/android/gms/nearby/messages/internal/at;->asBinder()Landroid/os/IBinder;
 
@@ -165,25 +165,25 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/IBinder;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aMJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNb:Ljava/lang/String;
 
     const/4 v2, 0x4
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aMM:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNe:Ljava/lang/String;
 
     const/4 v2, 0x5
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aMK:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNc:Z
 
     const/4 v2, 0x6
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     const/4 v2, 0x7
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzcg.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzcg.smali
index 2e34eb3889..ae7bc4b6ea 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzcg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzcg.smali
@@ -15,37 +15,37 @@
 
 
 # instance fields
-.field private final aMJ:Ljava/lang/String;
+.field private final aNB:Lcom/google/android/gms/nearby/messages/internal/at;
+
+.field private final aND:Landroid/app/PendingIntent;
+
+.field private final aNE:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aMK:Z
+.field private final aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aMM:Ljava/lang/String;
+.field private final aNb:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aNh:Lcom/google/android/gms/nearby/messages/internal/aq;
-
-.field private final aNj:Lcom/google/android/gms/nearby/messages/internal/at;
-
-.field private final aNl:Landroid/app/PendingIntent;
-
-.field private final aNm:I
+.field private final aNc:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aNe:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
+.field private final aNz:Lcom/google/android/gms/nearby/messages/internal/aq;
+
 .field private final versionCode:I
 
 
@@ -102,7 +102,7 @@
     move-object p2, v0
 
     :goto_0
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNh:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNz:Lcom/google/android/gms/nearby/messages/internal/aq;
 
     if-nez p3, :cond_2
 
@@ -129,23 +129,23 @@
     invoke-direct {p1, p3}, Lcom/google/android/gms/nearby/messages/internal/av;-><init>(Landroid/os/IBinder;)V
 
     :goto_1
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNj:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNB:Lcom/google/android/gms/nearby/messages/internal/at;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNl:Landroid/app/PendingIntent;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aND:Landroid/app/PendingIntent;
 
-    iput p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNm:I
+    iput p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNE:I
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aMJ:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNb:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aMM:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNe:Ljava/lang/String;
 
-    iput-boolean p8, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aMK:Z
+    iput-boolean p8, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNc:Z
 
     invoke-static {p9, p7, p6, p8}, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->a(Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;Ljava/lang/String;Ljava/lang/String;Z)Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     return-void
 .end method
@@ -195,7 +195,7 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNh:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNz:Lcom/google/android/gms/nearby/messages/internal/aq;
 
     if-nez v1, :cond_0
 
@@ -215,7 +215,7 @@
 
     const/4 v1, 0x3
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNj:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNB:Lcom/google/android/gms/nearby/messages/internal/at;
 
     invoke-interface {v2}, Lcom/google/android/gms/nearby/messages/internal/at;->asBinder()Landroid/os/IBinder;
 
@@ -225,37 +225,37 @@
 
     const/4 v1, 0x4
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNl:Landroid/app/PendingIntent;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aND:Landroid/app/PendingIntent;
 
     invoke-static {p1, v1, v2, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
     const/4 v1, 0x5
 
-    iget v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNm:I
+    iget v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNE:I
 
     invoke-static {p1, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
     const/4 v1, 0x6
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aMJ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNb:Ljava/lang/String;
 
     invoke-static {p1, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
     const/4 v1, 0x7
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aMM:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNe:Ljava/lang/String;
 
     invoke-static {p1, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
     const/16 v1, 0x8
 
-    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aMK:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNc:Z
 
     invoke-static {p1, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IZ)V
 
     const/16 v1, 0x9
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     invoke-static {p1, v1, v2, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zze.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zze.smali
index 27165a55ec..a978c39308 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zze.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zze.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final aOc:D
+.field private final aOu:D
 
 .field private final accuracy:I
 
@@ -59,7 +59,7 @@
 
     iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->accuracy:I
 
-    iput-wide p3, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOc:D
+    iput-wide p3, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOu:D
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 .method private a(Lcom/google/android/gms/nearby/messages/Distance;)I
     .locals 4
 
-    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOc:D
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOu:D
 
     invoke-static {v0, v1}, Ljava/lang/Double;->isNaN(D)Z
 
@@ -75,7 +75,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->zN()D
+    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->zL()D
 
     move-result-wide v0
 
@@ -90,9 +90,9 @@
     return p1
 
     :cond_0
-    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOc:D
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOu:D
 
-    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->zN()D
+    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->zL()D
 
     move-result-wide v2
 
@@ -173,7 +173,7 @@
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOc:D
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOu:D
 
     invoke-static {v1, v2}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
 
@@ -199,7 +199,7 @@
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    iget-wide v2, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOc:D
+    iget-wide v2, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOu:D
 
     invoke-static {v2, v3}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
 
@@ -255,7 +255,7 @@
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOc:D
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOu:D
 
     const/4 v2, 0x3
 
@@ -270,10 +270,10 @@
     return-void
 .end method
 
-.method public final zN()D
+.method public final zL()D
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOc:D
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aOu:D
 
     return-wide v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzj.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzj.smali
index 03d47c4485..99b841aeb4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/zzj.smali
@@ -15,12 +15,12 @@
 
 
 # instance fields
-.field private final aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final akj:I
+.field private final akB:I
 
 .field private final versionCode:I
 
@@ -57,9 +57,9 @@
 
     iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->versionCode:I
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
-    iput p3, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->akj:I
+    iput p3, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->akB:I
 
     return-void
 .end method
@@ -81,13 +81,13 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aNq:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aNI:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->akj:I
+    iget p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->akB:I
 
     const/4 v1, 0x3
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/safetynet/HarmfulAppsData.smali b/com.discord/smali_classes2/com/google/android/gms/safetynet/HarmfulAppsData.smali
index a58f1a768b..b52ff5a097 100644
--- a/com.discord/smali_classes2/com/google/android/gms/safetynet/HarmfulAppsData.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/safetynet/HarmfulAppsData.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field public final aOd:Ljava/lang/String;
+.field public final aOv:Ljava/lang/String;
 
-.field public final aOe:[B
+.field public final aOw:[B
 
-.field public final aOf:I
+.field public final aOx:I
 
 
 # direct methods
@@ -40,11 +40,11 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aOd:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aOv:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aOe:[B
+    iput-object p2, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aOw:[B
 
-    iput p3, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aOf:I
+    iput p3, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aOx:I
 
     return-void
 .end method
@@ -60,19 +60,19 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aOd:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aOv:Ljava/lang/String;
 
     const/4 v1, 0x2
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aOe:[B
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aOw:[B
 
     const/4 v1, 0x3
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;I[B)V
 
-    iget v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aOf:I
+    iget v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aOx:I
 
     const/4 v1, 0x4
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/safetynet/SafeBrowsingData.smali b/com.discord/smali_classes2/com/google/android/gms/safetynet/SafeBrowsingData.smali
index 9e150f4a7b..bd58a3225c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/safetynet/SafeBrowsingData.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/safetynet/SafeBrowsingData.smali
@@ -17,19 +17,19 @@
 
 
 # instance fields
-.field aOg:Ljava/lang/String;
+.field aOA:Landroid/os/ParcelFileDescriptor;
 
-.field aOh:Lcom/google/android/gms/common/data/DataHolder;
+.field aOB:J
 
-.field aOi:Landroid/os/ParcelFileDescriptor;
+.field aOC:[B
 
-.field aOj:J
+.field private aOD:[B
 
-.field aOk:[B
+.field private aOE:Ljava/io/File;
 
-.field private aOl:[B
+.field aOy:Ljava/lang/String;
 
-.field private aOm:Ljava/io/File;
+.field aOz:Lcom/google/android/gms/common/data/DataHolder;
 
 
 # direct methods
@@ -78,15 +78,15 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOg:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOy:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOh:Lcom/google/android/gms/common/data/DataHolder;
+    iput-object p2, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOz:Lcom/google/android/gms/common/data/DataHolder;
 
-    iput-object p3, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOi:Landroid/os/ParcelFileDescriptor;
+    iput-object p3, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOA:Landroid/os/ParcelFileDescriptor;
 
-    iput-wide p4, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOj:J
+    iput-wide p4, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOB:J
 
-    iput-object p6, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOk:[B
+    iput-object p6, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOC:[B
 
     return-void
 .end method
@@ -103,10 +103,10 @@
     return-void
 .end method
 
-.method private final zT()Ljava/io/FileOutputStream;
+.method private final zP()Ljava/io/FileOutputStream;
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOm:Ljava/io/File;
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOE:Ljava/io/File;
 
     const/4 v1, 0x0
 
@@ -138,7 +138,7 @@
 
     move-result-object v3
 
-    iput-object v3, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOi:Landroid/os/ParcelFileDescriptor;
+    iput-object v3, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOA:Landroid/os/ParcelFileDescriptor;
     :try_end_1
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -194,17 +194,17 @@
 .method public writeToParcel(Landroid/os/Parcel;I)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOi:Landroid/os/ParcelFileDescriptor;
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOA:Landroid/os/ParcelFileDescriptor;
 
     const/4 v1, 0x1
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOl:[B
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOD:[B
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/safetynet/SafeBrowsingData;->zT()Ljava/io/FileOutputStream;
+    invoke-direct {p0}, Lcom/google/android/gms/safetynet/SafeBrowsingData;->zP()Ljava/io/FileOutputStream;
 
     move-result-object v0
 
@@ -219,13 +219,13 @@
     invoke-direct {v0, v2}, Ljava/io/DataOutputStream;-><init>(Ljava/io/OutputStream;)V
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOl:[B
+    iget-object v2, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOD:[B
 
     array-length v2, v2
 
     invoke-virtual {v0, v2}, Ljava/io/DataOutputStream;->writeInt(I)V
 
-    iget-object v2, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOl:[B
+    iget-object v2, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOD:[B
 
     invoke-virtual {v0, v2}, Ljava/io/DataOutputStream;->write([B)V
     :try_end_0
@@ -264,7 +264,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOi:Landroid/os/ParcelFileDescriptor;
+    iput-object p1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOA:Landroid/os/ParcelFileDescriptor;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse.smali b/com.discord/smali_classes2/com/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse.smali
index 58a3293c10..f55d0394f2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse.smali
@@ -29,19 +29,3 @@
 
     return-void
 .end method
-
-
-# virtual methods
-.method public final vv()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/common/api/j;->adP:Lcom/google/android/gms/common/api/k;
-
-    check-cast v0, Lcom/google/android/gms/safetynet/SafetyNetApi$a;
-
-    invoke-interface {v0}, Lcom/google/android/gms/safetynet/SafetyNetApi$a;->vv()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/safetynet/SafetyNetApi$a.smali b/com.discord/smali_classes2/com/google/android/gms/safetynet/SafetyNetApi$a.smali
index 3e64059441..1a4096842a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/safetynet/SafetyNetApi$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/safetynet/SafetyNetApi$a.smali
@@ -20,5 +20,5 @@
 
 
 # virtual methods
-.method public abstract vv()Ljava/lang/String;
+.method public abstract vt()Ljava/lang/String;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/safetynet/SafetyNetClient.smali b/com.discord/smali_classes2/com/google/android/gms/safetynet/SafetyNetClient.smali
index 612286d46b..302d436e50 100644
--- a/com.discord/smali_classes2/com/google/android/gms/safetynet/SafetyNetClient.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/safetynet/SafetyNetClient.smali
@@ -16,7 +16,7 @@
 .method constructor <init>(Landroid/app/Activity;)V
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/safetynet/a;->aOn:Lcom/google/android/gms/common/api/a;
+    sget-object v0, Lcom/google/android/gms/safetynet/a;->aOF:Lcom/google/android/gms/common/api/a;
 
     new-instance v1, Lcom/google/android/gms/common/api/internal/a;
 
@@ -26,37 +26,3 @@
 
     return-void
 .end method
-
-
-# virtual methods
-.method public final dp(Ljava/lang/String;)Lcom/google/android/gms/tasks/Task;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            ")",
-            "Lcom/google/android/gms/tasks/Task<",
-            "Lcom/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse;",
-            ">;"
-        }
-    .end annotation
-
-    sget-object v0, Lcom/google/android/gms/safetynet/a;->aOo:Lcom/google/android/gms/safetynet/SafetyNetApi;
-
-    iget-object v1, p0, Lcom/google/android/gms/common/api/e;->adH:Lcom/google/android/gms/common/api/f;
-
-    invoke-interface {v0, v1, p1}, Lcom/google/android/gms/safetynet/SafetyNetApi;->a(Lcom/google/android/gms/common/api/f;Ljava/lang/String;)Lcom/google/android/gms/common/api/g;
-
-    move-result-object p1
-
-    new-instance v0, Lcom/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse;
-
-    invoke-direct {v0}, Lcom/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse;-><init>()V
-
-    invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/q;->a(Lcom/google/android/gms/common/api/g;Lcom/google/android/gms/common/api/j;)Lcom/google/android/gms/tasks/Task;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/safetynet/a.smali b/com.discord/smali_classes2/com/google/android/gms/safetynet/a.smali
index cc03b98f35..88e04d4bdd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/safetynet/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/safetynet/a.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final aBC:Lcom/google/android/gms/common/api/a$g;
+.field private static final aBU:Lcom/google/android/gms/common/api/a$g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$g<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private static final aBD:Lcom/google/android/gms/common/api/a$a;
+.field private static final aBV:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field public static final aOn:Lcom/google/android/gms/common/api/a;
+.field public static final aOF:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -37,12 +37,12 @@
     .end annotation
 .end field
 
-.field public static final aOo:Lcom/google/android/gms/safetynet/SafetyNetApi;
+.field public static final aOG:Lcom/google/android/gms/safetynet/SafetyNetApi;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private static final aOp:Lcom/google/android/gms/safetynet/i;
+.field private static final aOH:Lcom/google/android/gms/safetynet/i;
 
 
 # direct methods
@@ -53,42 +53,42 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/a$g;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/safetynet/a;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     new-instance v0, Lcom/google/android/gms/safetynet/h;
 
     invoke-direct {v0}, Lcom/google/android/gms/safetynet/h;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/safetynet/a;->aBD:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aBV:Lcom/google/android/gms/common/api/a$a;
 
     new-instance v0, Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/safetynet/a;->aBD:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/safetynet/a;->aBV:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/safetynet/a;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/safetynet/a;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     const-string v3, "SafetyNet.API"
 
     invoke-direct {v0, v3, v1, v2}, Lcom/google/android/gms/common/api/a;-><init>(Ljava/lang/String;Lcom/google/android/gms/common/api/a$a;Lcom/google/android/gms/common/api/a$g;)V
 
-    sput-object v0, Lcom/google/android/gms/safetynet/a;->aOn:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aOF:Lcom/google/android/gms/common/api/a;
 
     new-instance v0, Lcom/google/android/gms/internal/f/k;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/f/k;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/safetynet/a;->aOo:Lcom/google/android/gms/safetynet/SafetyNetApi;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aOG:Lcom/google/android/gms/safetynet/SafetyNetApi;
 
     new-instance v0, Lcom/google/android/gms/internal/f/o;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/f/o;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/safetynet/a;->aOp:Lcom/google/android/gms/safetynet/i;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aOH:Lcom/google/android/gms/safetynet/i;
 
     return-void
 .end method
 
-.method public static g(Landroid/app/Activity;)Lcom/google/android/gms/safetynet/SafetyNetClient;
+.method public static f(Landroid/app/Activity;)Lcom/google/android/gms/safetynet/SafetyNetClient;
     .locals 1
 
     new-instance v0, Lcom/google/android/gms/safetynet/SafetyNetClient;
diff --git a/com.discord/smali_classes2/com/google/android/gms/safetynet/g.smali b/com.discord/smali_classes2/com/google/android/gms/safetynet/g.smali
index d6abd7efd3..c09ed28386 100644
--- a/com.discord/smali_classes2/com/google/android/gms/safetynet/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/safetynet/g.smali
@@ -34,31 +34,31 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOy:Ljava/lang/String;
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOh:Lcom/google/android/gms/common/data/DataHolder;
+    iget-object v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOz:Lcom/google/android/gms/common/data/DataHolder;
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOi:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOA:Landroid/os/ParcelFileDescriptor;
 
     const/4 v2, 0x4
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-wide v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOj:J
+    iget-wide v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOB:J
 
     const/4 p2, 0x5
 
     invoke-static {p1, p2, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-object p0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOk:[B
+    iget-object p0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aOC:[B
 
     const/4 p2, 0x6
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/safetynet/zza.smali b/com.discord/smali_classes2/com/google/android/gms/safetynet/zza.smali
index 5c1537a7a4..234efc3539 100644
--- a/com.discord/smali_classes2/com/google/android/gms/safetynet/zza.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/safetynet/zza.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final aOq:Ljava/lang/String;
+.field private final aOI:Ljava/lang/String;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/safetynet/zza;->aOq:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/safetynet/zza;->aOI:Ljava/lang/String;
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/safetynet/zza;->aOq:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/zza;->aOI:Ljava/lang/String;
 
     const/4 v1, 0x2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/safetynet/zzd.smali b/com.discord/smali_classes2/com/google/android/gms/safetynet/zzd.smali
index dec912fb80..aeeb269936 100644
--- a/com.discord/smali_classes2/com/google/android/gms/safetynet/zzd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/safetynet/zzd.smali
@@ -15,13 +15,13 @@
 
 
 # instance fields
-.field public final aOr:J
+.field public final aOJ:J
 
-.field public final aOs:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
+.field public final aOK:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
 
-.field private final aOt:Z
+.field private final aOL:Z
 
-.field public final adn:I
+.field public final adF:I
 
 
 # direct methods
@@ -42,22 +42,22 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-wide p1, p0, Lcom/google/android/gms/safetynet/zzd;->aOr:J
+    iput-wide p1, p0, Lcom/google/android/gms/safetynet/zzd;->aOJ:J
 
-    iput-object p3, p0, Lcom/google/android/gms/safetynet/zzd;->aOs:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
+    iput-object p3, p0, Lcom/google/android/gms/safetynet/zzd;->aOK:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
 
-    iput-boolean p5, p0, Lcom/google/android/gms/safetynet/zzd;->aOt:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/safetynet/zzd;->aOL:Z
 
     if-eqz p5, :cond_0
 
-    iput p4, p0, Lcom/google/android/gms/safetynet/zzd;->adn:I
+    iput p4, p0, Lcom/google/android/gms/safetynet/zzd;->adF:I
 
     return-void
 
     :cond_0
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/google/android/gms/safetynet/zzd;->adn:I
+    iput p1, p0, Lcom/google/android/gms/safetynet/zzd;->adF:I
 
     return-void
 .end method
@@ -73,25 +73,25 @@
 
     move-result v0
 
-    iget-wide v1, p0, Lcom/google/android/gms/safetynet/zzd;->aOr:J
+    iget-wide v1, p0, Lcom/google/android/gms/safetynet/zzd;->aOJ:J
 
     const/4 v3, 0x2
 
     invoke-static {p1, v3, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    iget-object v1, p0, Lcom/google/android/gms/safetynet/zzd;->aOs:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
+    iget-object v1, p0, Lcom/google/android/gms/safetynet/zzd;->aOK:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;I[Landroid/os/Parcelable;I)V
 
-    iget p2, p0, Lcom/google/android/gms/safetynet/zzd;->adn:I
+    iget p2, p0, Lcom/google/android/gms/safetynet/zzd;->adF:I
 
     const/4 v1, 0x4
 
     invoke-static {p1, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-boolean p2, p0, Lcom/google/android/gms/safetynet/zzd;->aOt:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/safetynet/zzd;->aOL:Z
 
     const/4 v1, 0x5
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/safetynet/zzf.smali b/com.discord/smali_classes2/com/google/android/gms/safetynet/zzf.smali
index e09254ccde..260714dc99 100644
--- a/com.discord/smali_classes2/com/google/android/gms/safetynet/zzf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/safetynet/zzf.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public final adp:Ljava/lang/String;
+.field public final adH:Ljava/lang/String;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/safetynet/zzf;->adp:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/safetynet/zzf;->adH:Ljava/lang/String;
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/safetynet/zzf;->adp:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/zzf;->adH:Ljava/lang/String;
 
     const/4 v1, 0x2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/safetynet/zzh.smali b/com.discord/smali_classes2/com/google/android/gms/safetynet/zzh.smali
index 455f3fc33a..cbcd7c25e5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/safetynet/zzh.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/safetynet/zzh.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private final aCZ:Z
+.field private final aDr:Z
 
-.field private final adr:I
+.field private final adJ:I
 
 
 # direct methods
@@ -38,9 +38,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/safetynet/zzh;->adr:I
+    iput p1, p0, Lcom/google/android/gms/safetynet/zzh;->adJ:I
 
-    iput-boolean p2, p0, Lcom/google/android/gms/safetynet/zzh;->aCZ:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/safetynet/zzh;->aDr:Z
 
     return-void
 .end method
@@ -56,13 +56,13 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/safetynet/zzh;->adr:I
+    iget v0, p0, Lcom/google/android/gms/safetynet/zzh;->adJ:I
 
     const/4 v1, 0x2
 
     invoke-static {p1, v1, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/safetynet/zzh;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/safetynet/zzh;->aDr:Z
 
     const/4 v1, 0x3
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/signin/a.smali b/com.discord/smali_classes2/com/google/android/gms/signin/a.smali
index bc4eb1e9a5..aec345b877 100644
--- a/com.discord/smali_classes2/com/google/android/gms/signin/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/signin/a.smali
@@ -14,25 +14,25 @@
 
 
 # static fields
-.field public static final aOw:Lcom/google/android/gms/signin/a;
+.field public static final aOO:Lcom/google/android/gms/signin/a;
 
 
 # instance fields
-.field public final aOA:Z
+.field public final aOP:Z
 
-.field public final aOB:Ljava/lang/String;
+.field public final aOQ:Z
 
-.field public final aOC:Z
+.field public final aOR:Ljava/lang/String;
 
-.field public final aOD:Ljava/lang/Long;
+.field public final aOS:Z
 
-.field public final aOE:Ljava/lang/Long;
+.field public final aOT:Ljava/lang/String;
 
-.field public final aOx:Z
+.field public final aOU:Z
 
-.field public final aOy:Z
+.field public final aOV:Ljava/lang/Long;
 
-.field public final aOz:Ljava/lang/String;
+.field public final aOW:Ljava/lang/Long;
 
 
 # direct methods
@@ -47,7 +47,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/signin/a;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/signin/a;->aOw:Lcom/google/android/gms/signin/a;
+    sput-object v0, Lcom/google/android/gms/signin/a;->aOO:Lcom/google/android/gms/signin/a;
 
     return-void
 .end method
@@ -59,23 +59,23 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aOx:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aOP:Z
 
-    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aOy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aOQ:Z
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aOz:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aOR:Ljava/lang/String;
 
-    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aOA:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aOS:Z
 
-    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aOC:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aOU:Z
 
-    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aOB:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aOT:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aOD:Ljava/lang/Long;
+    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aOV:Ljava/lang/Long;
 
-    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aOE:Ljava/lang/Long;
+    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aOW:Ljava/lang/Long;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/signin/b.smali b/com.discord/smali_classes2/com/google/android/gms/signin/b.smali
index 51e5265b3c..806c453f1e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/signin/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/signin/b.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final aBC:Lcom/google/android/gms/common/api/a$g;
+.field private static final aBU:Lcom/google/android/gms/common/api/a$g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$g<",
@@ -13,7 +13,17 @@
     .end annotation
 .end field
 
-.field private static final aOL:Lcom/google/android/gms/common/api/a$g;
+.field public static final aOF:Lcom/google/android/gms/common/api/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/common/api/a<",
+            "Lcom/google/android/gms/signin/a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final aPd:Lcom/google/android/gms/common/api/a$g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$g<",
@@ -23,7 +33,7 @@
     .end annotation
 .end field
 
-.field public static final aOM:Lcom/google/android/gms/common/api/a$a;
+.field public static final aPe:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -34,7 +44,7 @@
     .end annotation
 .end field
 
-.field private static final aON:Lcom/google/android/gms/common/api/a$a;
+.field private static final aPf:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -45,11 +55,11 @@
     .end annotation
 .end field
 
-.field private static final aOO:Lcom/google/android/gms/common/api/Scope;
+.field private static final aPg:Lcom/google/android/gms/common/api/Scope;
 
-.field private static final aOP:Lcom/google/android/gms/common/api/Scope;
+.field private static final aPh:Lcom/google/android/gms/common/api/Scope;
 
-.field private static final aOQ:Lcom/google/android/gms/common/api/a;
+.field private static final aPi:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -59,16 +69,6 @@
     .end annotation
 .end field
 
-.field public static final aOn:Lcom/google/android/gms/common/api/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/common/api/a<",
-            "Lcom/google/android/gms/signin/a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -78,25 +78,25 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/a$g;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/signin/b;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     new-instance v0, Lcom/google/android/gms/common/api/a$g;
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/a$g;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/signin/b;->aOL:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aPd:Lcom/google/android/gms/common/api/a$g;
 
     new-instance v0, Lcom/google/android/gms/signin/c;
 
     invoke-direct {v0}, Lcom/google/android/gms/signin/c;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/signin/b;->aOM:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aPe:Lcom/google/android/gms/common/api/a$a;
 
     new-instance v0, Lcom/google/android/gms/signin/d;
 
     invoke-direct {v0}, Lcom/google/android/gms/signin/d;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/signin/b;->aON:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aPf:Lcom/google/android/gms/common/api/a$a;
 
     new-instance v0, Lcom/google/android/gms/common/api/Scope;
 
@@ -104,7 +104,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/common/api/Scope;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/android/gms/signin/b;->aOO:Lcom/google/android/gms/common/api/Scope;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aPg:Lcom/google/android/gms/common/api/Scope;
 
     new-instance v0, Lcom/google/android/gms/common/api/Scope;
 
@@ -112,31 +112,31 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/common/api/Scope;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/android/gms/signin/b;->aOP:Lcom/google/android/gms/common/api/Scope;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aPh:Lcom/google/android/gms/common/api/Scope;
 
     new-instance v0, Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/signin/b;->aOM:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/signin/b;->aPe:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/signin/b;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/signin/b;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     const-string v3, "SignIn.API"
 
     invoke-direct {v0, v3, v1, v2}, Lcom/google/android/gms/common/api/a;-><init>(Ljava/lang/String;Lcom/google/android/gms/common/api/a$a;Lcom/google/android/gms/common/api/a$g;)V
 
-    sput-object v0, Lcom/google/android/gms/signin/b;->aOn:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aOF:Lcom/google/android/gms/common/api/a;
 
     new-instance v0, Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/signin/b;->aON:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/signin/b;->aPf:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/signin/b;->aOL:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/signin/b;->aPd:Lcom/google/android/gms/common/api/a$g;
 
     const-string v3, "SignIn.INTERNAL_API"
 
     invoke-direct {v0, v3, v1, v2}, Lcom/google/android/gms/common/api/a;-><init>(Ljava/lang/String;Lcom/google/android/gms/common/api/a$a;Lcom/google/android/gms/common/api/a$g;)V
 
-    sput-object v0, Lcom/google/android/gms/signin/b;->aOQ:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aPi:Lcom/google/android/gms/common/api/a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/signin/c.smali b/com.discord/smali_classes2/com/google/android/gms/signin/c.smali
index cf229b7157..90df94932c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/signin/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/signin/c.smali
@@ -31,7 +31,7 @@
 
     if-nez p4, :cond_0
 
-    sget-object p4, Lcom/google/android/gms/signin/a;->aOw:Lcom/google/android/gms/signin/a;
+    sget-object p4, Lcom/google/android/gms/signin/a;->aOO:Lcom/google/android/gms/signin/a;
 
     :cond_0
     new-instance p4, Lcom/google/android/gms/signin/internal/a;
diff --git a/com.discord/smali_classes2/com/google/android/gms/signin/internal/a.smali b/com.discord/smali_classes2/com/google/android/gms/signin/internal/a.smali
index cd50813898..2ad35696d3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/signin/internal/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/signin/internal/a.smali
@@ -17,13 +17,13 @@
 
 
 # instance fields
-.field private final aOF:Z
+.field private final aOX:Z
 
-.field private final aOG:Landroid/os/Bundle;
+.field private final aOY:Landroid/os/Bundle;
 
-.field private final afR:Lcom/google/android/gms/common/internal/d;
+.field private final agj:Lcom/google/android/gms/common/internal/d;
 
-.field private ahV:Ljava/lang/Integer;
+.field private ain:Ljava/lang/Integer;
 
 
 # direct methods
@@ -48,15 +48,15 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/signin/internal/a;->aOF:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/signin/internal/a;->aOX:Z
 
-    iput-object p3, p0, Lcom/google/android/gms/signin/internal/a;->afR:Lcom/google/android/gms/common/internal/d;
+    iput-object p3, p0, Lcom/google/android/gms/signin/internal/a;->agj:Lcom/google/android/gms/common/internal/d;
 
-    iput-object p4, p0, Lcom/google/android/gms/signin/internal/a;->aOG:Landroid/os/Bundle;
+    iput-object p4, p0, Lcom/google/android/gms/signin/internal/a;->aOY:Landroid/os/Bundle;
 
-    iget-object p1, p3, Lcom/google/android/gms/common/internal/d;->ahV:Ljava/lang/Integer;
+    iget-object p1, p3, Lcom/google/android/gms/common/internal/d;->ain:Ljava/lang/Integer;
 
-    iput-object p1, p0, Lcom/google/android/gms/signin/internal/a;->ahV:Ljava/lang/Integer;
+    iput-object p1, p0, Lcom/google/android/gms/signin/internal/a;->ain:Ljava/lang/Integer;
 
     return-void
 .end method
@@ -64,15 +64,15 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/os/Looper;Lcom/google/android/gms/common/internal/d;Lcom/google/android/gms/common/api/f$a;Lcom/google/android/gms/common/api/f$b;)V
     .locals 9
 
-    iget-object v0, p3, Lcom/google/android/gms/common/internal/d;->ahT:Lcom/google/android/gms/signin/a;
+    iget-object v0, p3, Lcom/google/android/gms/common/internal/d;->ail:Lcom/google/android/gms/signin/a;
 
-    iget-object v1, p3, Lcom/google/android/gms/common/internal/d;->ahV:Ljava/lang/Integer;
+    iget-object v1, p3, Lcom/google/android/gms/common/internal/d;->ain:Ljava/lang/Integer;
 
     new-instance v6, Landroid/os/Bundle;
 
     invoke-direct {v6}, Landroid/os/Bundle;-><init>()V
 
-    iget-object v2, p3, Lcom/google/android/gms/common/internal/d;->ahL:Landroid/accounts/Account;
+    iget-object v2, p3, Lcom/google/android/gms/common/internal/d;->aid:Landroid/accounts/Account;
 
     const-string v3, "com.google.android.gms.signin.internal.clientRequestedAccount"
 
@@ -91,19 +91,19 @@
     :cond_0
     if-eqz v0, :cond_2
 
-    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aOx:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aOP:Z
 
     const-string v2, "com.google.android.gms.signin.internal.offlineAccessRequested"
 
     invoke-virtual {v6, v2, v1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
-    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aOy:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aOQ:Z
 
     const-string v2, "com.google.android.gms.signin.internal.idTokenRequested"
 
     invoke-virtual {v6, v2, v1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
-    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aOz:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aOR:Ljava/lang/String;
 
     const-string v2, "com.google.android.gms.signin.internal.serverClientId"
 
@@ -115,29 +115,29 @@
 
     invoke-virtual {v6, v2, v1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
-    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aOA:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aOS:Z
 
     const-string v2, "com.google.android.gms.signin.internal.forceCodeForRefreshToken"
 
     invoke-virtual {v6, v2, v1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
-    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aOB:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aOT:Ljava/lang/String;
 
     const-string v2, "com.google.android.gms.signin.internal.hostedDomain"
 
     invoke-virtual {v6, v2, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aOC:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aOU:Z
 
     const-string v2, "com.google.android.gms.signin.internal.waitForAccessTokenRefresh"
 
     invoke-virtual {v6, v2, v1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
-    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aOD:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aOV:Ljava/lang/Long;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aOD:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aOV:Ljava/lang/Long;
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -148,11 +148,11 @@
     invoke-virtual {v6, v3, v1, v2}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_1
-    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aOE:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aOW:Ljava/lang/Long;
 
     if-eqz v1, :cond_2
 
-    iget-object v0, v0, Lcom/google/android/gms/signin/a;->aOE:Ljava/lang/Long;
+    iget-object v0, v0, Lcom/google/android/gms/signin/a;->aOW:Ljava/lang/Long;
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -190,9 +190,9 @@
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->afR:Lcom/google/android/gms/common/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->agj:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v1, v0, Lcom/google/android/gms/common/internal/d;->ahL:Landroid/accounts/Account;
+    iget-object v1, v0, Lcom/google/android/gms/common/internal/d;->aid:Landroid/accounts/Account;
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -201,7 +201,7 @@
     if-eqz v1, :cond_0
 
     :try_start_1
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/d;->ahL:Landroid/accounts/Account;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/d;->aid:Landroid/accounts/Account;
 
     goto :goto_0
 
@@ -231,18 +231,18 @@
 
     const-string v2, "defaultGoogleSignInAccount"
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/auth/api/signin/a/a;->aQ(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/auth/api/signin/a/a;->aL(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {v1, v2}, Lcom/google/android/gms/auth/api/signin/a/a;->aP(Ljava/lang/String;)Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    invoke-virtual {v1, v2}, Lcom/google/android/gms/auth/api/signin/a/a;->aK(Ljava/lang/String;)Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
 
     move-result-object v1
 
     :cond_1
     new-instance v2, Lcom/google/android/gms/common/internal/ResolveAccountRequest;
 
-    iget-object v3, p0, Lcom/google/android/gms/signin/internal/a;->ahV:Ljava/lang/Integer;
+    iget-object v3, p0, Lcom/google/android/gms/signin/internal/a;->ain:Ljava/lang/Integer;
 
     invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
 
@@ -250,7 +250,7 @@
 
     invoke-direct {v2, v0, v3, v1}, Lcom/google/android/gms/common/internal/ResolveAccountRequest;-><init>(Landroid/accounts/Account;ILcom/google/android/gms/auth/api/signin/GoogleSignInAccount;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/signin/internal/a;->lY()Landroid/os/IInterface;
+    invoke-virtual {p0}, Lcom/google/android/gms/signin/internal/a;->lW()Landroid/os/IInterface;
 
     move-result-object v0
 
@@ -338,12 +338,12 @@
     return-object v0
 .end method
 
-.method public final lX()Landroid/os/Bundle;
+.method public final lV()Landroid/os/Bundle;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->afR:Lcom/google/android/gms/common/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->agj:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/d;->ahR:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/d;->aij:Ljava/lang/String;
 
     iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->mContext:Landroid/content/Context;
 
@@ -357,31 +357,31 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->aOG:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->aOY:Landroid/os/Bundle;
 
-    iget-object v1, p0, Lcom/google/android/gms/signin/internal/a;->afR:Lcom/google/android/gms/common/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/a;->agj:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/internal/d;->ahR:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/common/internal/d;->aij:Ljava/lang/String;
 
     const-string v2, "com.google.android.gms.signin.internal.realClientPackageName"
 
     invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->aOG:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->aOY:Landroid/os/Bundle;
 
     return-object v0
 .end method
 
-.method public final le()Z
+.method public final lc()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/signin/internal/a;->aOF:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/signin/internal/a;->aOX:Z
 
     return v0
 .end method
 
-.method public final lh()I
+.method public final lf()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -389,7 +389,7 @@
     return v0
 .end method
 
-.method public final lj()Ljava/lang/String;
+.method public final lh()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.signin.service.START"
@@ -397,7 +397,7 @@
     return-object v0
 .end method
 
-.method public final lk()Ljava/lang/String;
+.method public final li()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.signin.internal.ISignInService"
diff --git a/com.discord/smali_classes2/com/google/android/gms/signin/internal/g.smali b/com.discord/smali_classes2/com/google/android/gms/signin/internal/g.smali
index 0f52b949d2..d47a31fdba 100644
--- a/com.discord/smali_classes2/com/google/android/gms/signin/internal/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/signin/internal/g.smali
@@ -30,7 +30,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/b/a;->alv:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/b/a;->alN:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
@@ -43,7 +43,7 @@
     move-result-object p1
 
     :try_start_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/b/a;->alu:Landroid/os/IBinder;
+    iget-object p2, p0, Lcom/google/android/gms/internal/b/a;->alM:Landroid/os/IBinder;
 
     const/16 v1, 0xc
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/signin/internal/zaa.smali b/com.discord/smali_classes2/com/google/android/gms/signin/internal/zaa.smali
index 488de976b6..0b3f26dae5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/signin/internal/zaa.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/signin/internal/zaa.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field private aOH:I
+.field private aOZ:I
 
-.field private aOI:Landroid/content/Intent;
+.field private aPa:Landroid/content/Intent;
 
-.field private final agP:I
+.field private final ahh:I
 
 
 # direct methods
@@ -67,30 +67,30 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/signin/internal/zaa;->agP:I
+    iput p1, p0, Lcom/google/android/gms/signin/internal/zaa;->ahh:I
 
-    iput p2, p0, Lcom/google/android/gms/signin/internal/zaa;->aOH:I
+    iput p2, p0, Lcom/google/android/gms/signin/internal/zaa;->aOZ:I
 
-    iput-object p3, p0, Lcom/google/android/gms/signin/internal/zaa;->aOI:Landroid/content/Intent;
+    iput-object p3, p0, Lcom/google/android/gms/signin/internal/zaa;->aPa:Landroid/content/Intent;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final ls()Lcom/google/android/gms/common/api/Status;
+.method public final lq()Lcom/google/android/gms/common/api/Status;
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/signin/internal/zaa;->aOH:I
+    iget v0, p0, Lcom/google/android/gms/signin/internal/zaa;->aOZ:I
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/common/api/Status;->adR:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/Status;->aek:Lcom/google/android/gms/common/api/Status;
 
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/common/api/Status;->adV:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/Status;->aeo:Lcom/google/android/gms/common/api/Status;
 
     return-object v0
 .end method
@@ -104,19 +104,19 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/signin/internal/zaa;->agP:I
+    iget v1, p0, Lcom/google/android/gms/signin/internal/zaa;->ahh:I
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget v1, p0, Lcom/google/android/gms/signin/internal/zaa;->aOH:I
+    iget v1, p0, Lcom/google/android/gms/signin/internal/zaa;->aOZ:I
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zaa;->aOI:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zaa;->aPa:Landroid/content/Intent;
 
     const/4 v2, 0x3
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/signin/internal/zah.smali b/com.discord/smali_classes2/com/google/android/gms/signin/internal/zah.smali
index a9c8e5b187..17d581e58d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/signin/internal/zah.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/signin/internal/zah.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private final aOJ:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
+.field private final aPb:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
 
-.field private final agP:I
+.field private final ahh:I
 
 
 # direct methods
@@ -38,9 +38,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/signin/internal/zah;->agP:I
+    iput p1, p0, Lcom/google/android/gms/signin/internal/zah;->ahh:I
 
-    iput-object p2, p0, Lcom/google/android/gms/signin/internal/zah;->aOJ:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
+    iput-object p2, p0, Lcom/google/android/gms/signin/internal/zah;->aPb:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
 
     return-void
 .end method
@@ -66,13 +66,13 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/signin/internal/zah;->agP:I
+    iget v1, p0, Lcom/google/android/gms/signin/internal/zah;->ahh:I
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zah;->aOJ:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zah;->aPb:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
 
     const/4 v2, 0x2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/signin/internal/zaj.smali b/com.discord/smali_classes2/com/google/android/gms/signin/internal/zaj.smali
index c270fda3bd..d6c05134ac 100644
--- a/com.discord/smali_classes2/com/google/android/gms/signin/internal/zaj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/signin/internal/zaj.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field public final aOK:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
+.field public final aPc:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
 
-.field private final agP:I
+.field public final agQ:Lcom/google/android/gms/common/ConnectionResult;
 
-.field public final agy:Lcom/google/android/gms/common/ConnectionResult;
+.field private final ahh:I
 
 
 # direct methods
@@ -56,11 +56,11 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/signin/internal/zaj;->agP:I
+    iput p1, p0, Lcom/google/android/gms/signin/internal/zaj;->ahh:I
 
-    iput-object p2, p0, Lcom/google/android/gms/signin/internal/zaj;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p2, p0, Lcom/google/android/gms/signin/internal/zaj;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
-    iput-object p3, p0, Lcom/google/android/gms/signin/internal/zaj;->aOK:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
+    iput-object p3, p0, Lcom/google/android/gms/signin/internal/zaj;->aPc:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
 
     return-void
 .end method
@@ -88,19 +88,19 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/signin/internal/zaj;->agP:I
+    iget v1, p0, Lcom/google/android/gms/signin/internal/zaj;->ahh:I
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zaj;->agy:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zaj;->agQ:Lcom/google/android/gms/common/ConnectionResult;
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zaj;->aOK:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zaj;->aPc:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
 
     const/4 v2, 0x3
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/stats/a.smali b/com.discord/smali_classes2/com/google/android/gms/stats/a.smali
index ba15693fba..0f929fd0a9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/stats/a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/stats/a.smali
@@ -11,25 +11,29 @@
 
 
 # static fields
-.field public static aPb:Ljava/util/concurrent/ScheduledExecutorService;
+.field public static aPt:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private static volatile aPc:Lcom/google/android/gms/stats/a$a;
+.field private static volatile aPu:Lcom/google/android/gms/stats/a$a;
 
 
 # instance fields
-.field public final aOR:Ljava/lang/Object;
+.field public final aOI:Ljava/lang/String;
 
-.field public final aOS:Landroid/os/PowerManager$WakeLock;
+.field public aOL:Z
 
-.field public aOT:Landroid/os/WorkSource;
+.field public final aPj:Ljava/lang/Object;
 
-.field private final aOU:Ljava/lang/String;
+.field public final aPk:Landroid/os/PowerManager$WakeLock;
 
-.field private final aOV:Ljava/lang/String;
+.field public aPl:Landroid/os/WorkSource;
 
-.field public final aOW:Landroid/content/Context;
+.field private final aPm:Ljava/lang/String;
 
-.field public final aOX:Ljava/util/Map;
+.field private final aPn:Ljava/lang/String;
+
+.field public final aPo:Landroid/content/Context;
+
+.field public final aPp:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -41,7 +45,7 @@
     .end annotation
 .end field
 
-.field private final aOY:Ljava/util/Set;
+.field private final aPq:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -51,13 +55,9 @@
     .end annotation
 .end field
 
-.field public aOZ:I
+.field public aPr:I
 
-.field public final aOq:Ljava/lang/String;
-
-.field public aOt:Z
-
-.field public aPa:Ljava/util/concurrent/atomic/AtomicInteger;
+.field public aPs:Ljava/util/concurrent/atomic/AtomicInteger;
 
 .field public final zzd:I
 
@@ -70,7 +70,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/stats/b;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/stats/a;->aPc:Lcom/google/android/gms/stats/a$a;
+    sput-object v0, Lcom/google/android/gms/stats/a;->aPu:Lcom/google/android/gms/stats/a$a;
 
     return-void
 .end method
@@ -100,17 +100,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p0, p0, Lcom/google/android/gms/stats/a;->aOR:Ljava/lang/Object;
+    iput-object p0, p0, Lcom/google/android/gms/stats/a;->aPj:Ljava/lang/Object;
 
     const/4 p5, 0x1
 
-    iput-boolean p5, p0, Lcom/google/android/gms/stats/a;->aOt:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/stats/a;->aOL:Z
 
     new-instance p5, Ljava/util/HashMap;
 
     invoke-direct {p5}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aOX:Ljava/util/Map;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aPp:Ljava/util/Map;
 
     new-instance p5, Ljava/util/HashSet;
 
@@ -120,7 +120,7 @@
 
     move-result-object p5
 
-    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aOY:Ljava/util/Set;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aPq:Ljava/util/Set;
 
     new-instance p5, Ljava/util/concurrent/atomic/AtomicInteger;
 
@@ -128,7 +128,7 @@
 
     invoke-direct {p5, v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aPa:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aPs:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const-string p5, "WakeLock: context must not be null"
 
@@ -142,15 +142,15 @@
 
     const/4 p5, 0x0
 
-    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aOU:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aPm:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aOV:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aPn:Ljava/lang/String;
 
     invoke-virtual {p1}, Landroid/content/Context;->getApplicationContext()Landroid/content/Context;
 
     move-result-object p5
 
-    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aOW:Landroid/content/Context;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aPo:Landroid/content/Context;
 
     invoke-virtual {p1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
@@ -190,12 +190,12 @@
     move-object p5, v0
 
     :goto_0
-    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aOq:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aOI:Ljava/lang/String;
 
     goto :goto_1
 
     :cond_1
-    iput-object p3, p0, Lcom/google/android/gms/stats/a;->aOq:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/stats/a;->aOI:Ljava/lang/String;
 
     :goto_1
     const-string p5, "power"
@@ -210,7 +210,7 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/stats/a;->aOS:Landroid/os/PowerManager$WakeLock;
+    iput-object p2, p0, Lcom/google/android/gms/stats/a;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-static {p1}, Lcom/google/android/gms/common/util/p;->T(Landroid/content/Context;)Z
 
@@ -218,7 +218,7 @@
 
     if-eqz p2, :cond_4
 
-    invoke-static {p4}, Lcom/google/android/gms/common/util/n;->bb(Ljava/lang/String;)Z
+    invoke-static {p4}, Lcom/google/android/gms/common/util/n;->aW(Ljava/lang/String;)Z
 
     move-result p2
 
@@ -233,13 +233,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/stats/a;->aOT:Landroid/os/WorkSource;
+    iput-object p1, p0, Lcom/google/android/gms/stats/a;->aPl:Landroid/os/WorkSource;
 
-    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aOT:Landroid/os/WorkSource;
+    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aPl:Landroid/os/WorkSource;
 
     if-eqz p1, :cond_4
 
-    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aOW:Landroid/content/Context;
+    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aPo:Landroid/content/Context;
 
     invoke-static {p2}, Lcom/google/android/gms/common/util/p;->T(Landroid/content/Context;)Z
 
@@ -247,7 +247,7 @@
 
     if-eqz p2, :cond_4
 
-    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aOT:Landroid/os/WorkSource;
+    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aPl:Landroid/os/WorkSource;
 
     if-eqz p2, :cond_3
 
@@ -256,13 +256,13 @@
     goto :goto_2
 
     :cond_3
-    iput-object p1, p0, Lcom/google/android/gms/stats/a;->aOT:Landroid/os/WorkSource;
+    iput-object p1, p0, Lcom/google/android/gms/stats/a;->aPl:Landroid/os/WorkSource;
 
     :goto_2
-    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aOT:Landroid/os/WorkSource;
+    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aPl:Landroid/os/WorkSource;
 
     :try_start_0
-    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {p2, p1}, Landroid/os/PowerManager$WakeLock;->setWorkSource(Landroid/os/WorkSource;)V
     :try_end_0
@@ -290,11 +290,11 @@
 
     :cond_4
     :goto_4
-    sget-object p1, Lcom/google/android/gms/stats/a;->aPb:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object p1, Lcom/google/android/gms/stats/a;->aPt:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-nez p1, :cond_5
 
-    invoke-static {}, Lcom/google/android/gms/common/b/a;->mm()Lcom/google/android/gms/common/b/a$a;
+    invoke-static {}, Lcom/google/android/gms/common/b/a;->mk()Lcom/google/android/gms/common/b/a$a;
 
     move-result-object p1
 
@@ -302,7 +302,7 @@
 
     move-result-object p1
 
-    sput-object p1, Lcom/google/android/gms/stats/a;->aPb:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object p1, Lcom/google/android/gms/stats/a;->aPt:Ljava/util/concurrent/ScheduledExecutorService;
 
     :cond_5
     return-void
@@ -333,17 +333,17 @@
 .method static synthetic a(Lcom/google/android/gms/stats/a;)V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/stats/a;->zU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/stats/a;->zQ()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final zU()V
+.method public final zQ()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->isHeld()Z
 
@@ -352,7 +352,7 @@
     if-eqz v0, :cond_1
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->release()V
     :try_end_0
@@ -375,7 +375,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aOq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aOI:Ljava/lang/String;
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -392,7 +392,7 @@
     invoke-static {v2, v1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->isHeld()Z
 
@@ -406,10 +406,10 @@
     return-void
 .end method
 
-.method public final zV()Ljava/lang/String;
+.method public final zR()Ljava/lang/String;
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/stats/a;->aOt:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/stats/a;->aOL:Z
 
     if-eqz v0, :cond_1
 
@@ -424,12 +424,12 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aOU:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aPm:Ljava/lang/String;
 
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aOU:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aPm:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/stats/c.smali b/com.discord/smali_classes2/com/google/android/gms/stats/c.smali
index 525f9d40f8..d0dde0ade2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/stats/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/stats/c.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic aPd:Lcom/google/android/gms/stats/a;
+.field private final synthetic aPv:Lcom/google/android/gms/stats/a;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/stats/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/stats/c;->aPd:Lcom/google/android/gms/stats/a;
+    iput-object p1, p0, Lcom/google/android/gms/stats/c;->aPv:Lcom/google/android/gms/stats/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,7 +25,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/stats/c;->aPd:Lcom/google/android/gms/stats/a;
+    iget-object v0, p0, Lcom/google/android/gms/stats/c;->aPv:Lcom/google/android/gms/stats/a;
 
     invoke-static {v0}, Lcom/google/android/gms/stats/a;->a(Lcom/google/android/gms/stats/a;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/Task.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/Task.smali
index c678d279c1..3f25eb7de4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/Task.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/Task.smali
@@ -269,5 +269,5 @@
     .end annotation
 .end method
 
-.method public abstract zW()Z
+.method public abstract zS()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/aa.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/aa.smali
index 658452f329..7482357c59 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/aa.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/aa.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private aPy:Ljava/util/Queue;
+.field private aPQ:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private aPz:Z
+.field private aPR:Z
 
 .field private final mLock:Ljava/lang/Object;
 
@@ -61,7 +61,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aPy:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aPQ:Ljava/util/Queue;
 
     if-nez v1, :cond_0
 
@@ -69,10 +69,10 @@
 
     invoke-direct {v1}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v1, p0, Lcom/google/android/gms/tasks/aa;->aPy:Ljava/util/Queue;
+    iput-object v1, p0, Lcom/google/android/gms/tasks/aa;->aPQ:Ljava/util/Queue;
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aPy:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aPQ:Ljava/util/Queue;
 
     invoke-interface {v1, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
@@ -105,11 +105,11 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aPy:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aPQ:Ljava/util/Queue;
 
     if-eqz v1, :cond_2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/aa;->aPz:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/aa;->aPR:Z
 
     if-eqz v1, :cond_0
 
@@ -118,7 +118,7 @@
     :cond_0
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/aa;->aPz:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/aa;->aPR:Z
 
     monitor-exit v0
     :try_end_0
@@ -130,7 +130,7 @@
     monitor-enter v1
 
     :try_start_1
-    iget-object v0, p0, Lcom/google/android/gms/tasks/aa;->aPy:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/aa;->aPQ:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
@@ -142,7 +142,7 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/tasks/aa;->aPz:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/tasks/aa;->aPR:Z
 
     monitor-exit v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/ac.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/ac.smali
index a91979e4a8..b49fe10ee9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/ac.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/ac.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final aPA:Lcom/google/android/gms/tasks/aa;
+.field private final aPS:Lcom/google/android/gms/tasks/aa;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/aa<",
@@ -24,11 +24,11 @@
     .end annotation
 .end field
 
-.field private aPB:Z
+.field private aPT:Z
 
-.field private volatile aPC:Z
+.field private volatile aPU:Z
 
-.field private aPD:Ljava/lang/Object;
+.field private aPV:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TTResult;"
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private aPE:Ljava/lang/Exception;
+.field private aPW:Ljava/lang/Exception;
 
 .field private final mLock:Ljava/lang/Object;
 
@@ -57,15 +57,41 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/tasks/aa;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iput-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     return-void
 .end method
 
-.method private final Aa()V
+.method private final zU()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aPC:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aPT:Z
+
+    const-string v1, "Task is not yet complete"
+
+    invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method private final zV()V
+    .locals 2
+
+    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aPT:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    const-string v1, "Task is already complete"
+
+    invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method private final zW()V
+    .locals 2
+
+    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aPU:Z
 
     if-nez v0, :cond_0
 
@@ -81,7 +107,7 @@
     throw v0
 .end method
 
-.method private final Ab()V
+.method private final zX()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->mLock:Ljava/lang/Object;
@@ -89,7 +115,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPB:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPT:Z
 
     if-nez v1, :cond_0
 
@@ -102,7 +128,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     invoke-virtual {v0, p0}, Lcom/google/android/gms/tasks/aa;->d(Lcom/google/android/gms/tasks/Task;)V
 
@@ -119,32 +145,6 @@
     throw v1
 .end method
 
-.method private final zY()V
-    .locals 2
-
-    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aPB:Z
-
-    const-string v1, "Task is not yet complete"
-
-    invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
-
-    return-void
-.end method
-
-.method private final zZ()V
-    .locals 2
-
-    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aPB:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    const-string v1, "Task is already complete"
-
-    invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
-
-    return-void
-.end method
-
 
 # virtual methods
 .method public final a(Lcom/google/android/gms/tasks/b;)Lcom/google/android/gms/tasks/Task;
@@ -159,7 +159,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/tasks/i;->aPf:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aPx:Ljava/util/concurrent/Executor;
 
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/tasks/Task;->a(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/b;)Lcom/google/android/gms/tasks/Task;
 
@@ -180,7 +180,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/tasks/i;->aPf:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aPx:Ljava/util/concurrent/Executor;
 
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/tasks/Task;->a(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/c;)Lcom/google/android/gms/tasks/Task;
 
@@ -201,7 +201,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/tasks/i;->aPf:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aPx:Ljava/util/concurrent/Executor;
 
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/tasks/Task;->a(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/d;)Lcom/google/android/gms/tasks/Task;
 
@@ -222,7 +222,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/tasks/i;->aPf:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aPx:Ljava/util/concurrent/Executor;
 
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/tasks/Task;->a(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/e;)Lcom/google/android/gms/tasks/Task;
 
@@ -250,7 +250,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/tasks/ac;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     new-instance v2, Lcom/google/android/gms/tasks/k;
 
@@ -258,7 +258,7 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/tasks/aa;->a(Lcom/google/android/gms/tasks/z;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->Ab()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zX()V
 
     return-object v0
 .end method
@@ -276,7 +276,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     new-instance v1, Lcom/google/android/gms/tasks/o;
 
@@ -284,7 +284,7 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/tasks/aa;->a(Lcom/google/android/gms/tasks/z;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->Ab()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zX()V
 
     return-object p0
 .end method
@@ -302,7 +302,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     new-instance v1, Lcom/google/android/gms/tasks/q;
 
@@ -310,7 +310,7 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/tasks/aa;->a(Lcom/google/android/gms/tasks/z;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->Ab()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zX()V
 
     return-object p0
 .end method
@@ -328,7 +328,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     new-instance v1, Lcom/google/android/gms/tasks/t;
 
@@ -336,7 +336,7 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/tasks/aa;->a(Lcom/google/android/gms/tasks/z;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->Ab()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zX()V
 
     return-object p0
 .end method
@@ -354,7 +354,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     new-instance v1, Lcom/google/android/gms/tasks/v;
 
@@ -362,7 +362,7 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/tasks/aa;->a(Lcom/google/android/gms/tasks/z;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->Ab()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zX()V
 
     return-object p0
 .end method
@@ -386,7 +386,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/tasks/ac;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     new-instance v2, Lcom/google/android/gms/tasks/x;
 
@@ -394,7 +394,7 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/tasks/aa;->a(Lcom/google/android/gms/tasks/z;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->Ab()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zX()V
 
     return-object v0
 .end method
@@ -420,7 +420,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/tasks/ac;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     new-instance v2, Lcom/google/android/gms/tasks/m;
 
@@ -428,7 +428,7 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/tasks/aa;->a(Lcom/google/android/gms/tasks/z;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->Ab()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zX()V
 
     return-object v0
 .end method
@@ -445,19 +445,19 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zZ()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zV()V
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPB:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPT:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPE:Ljava/lang/Exception;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPW:Ljava/lang/Exception;
 
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/tasks/aa;->d(Lcom/google/android/gms/tasks/Task;)V
 
@@ -486,7 +486,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPB:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPT:Z
 
     if-eqz v1, :cond_0
 
@@ -499,15 +499,15 @@
     :cond_0
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPB:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPT:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPE:Ljava/lang/Exception;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPW:Ljava/lang/Exception;
 
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/tasks/aa;->d(Lcom/google/android/gms/tasks/Task;)V
 
@@ -532,7 +532,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPE:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPW:Ljava/lang/Exception;
 
     monitor-exit v0
 
@@ -561,15 +561,15 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zY()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zU()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->Aa()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zW()V
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPE:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPW:Ljava/lang/Exception;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPD:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPV:Ljava/lang/Object;
 
     monitor-exit v0
 
@@ -578,7 +578,7 @@
     :cond_0
     new-instance v1, Lcom/google/android/gms/tasks/f;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/ac;->aPE:Ljava/lang/Exception;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/ac;->aPW:Ljava/lang/Exception;
 
     invoke-direct {v1, v2}, Lcom/google/android/gms/tasks/f;-><init>(Ljava/lang/Throwable;)V
 
@@ -597,7 +597,7 @@
 .method public final isCanceled()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aPC:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aPU:Z
 
     return v0
 .end method
@@ -610,7 +610,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPB:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPT:Z
 
     monitor-exit v0
 
@@ -639,7 +639,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPB:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPT:Z
 
     if-eqz v1, :cond_0
 
@@ -652,15 +652,15 @@
     :cond_0
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPB:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPT:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPD:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPV:Ljava/lang/Object;
 
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/tasks/aa;->d(Lcom/google/android/gms/tasks/Task;)V
 
@@ -690,19 +690,19 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zZ()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zV()V
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPB:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPT:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPD:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPV:Ljava/lang/Object;
 
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/tasks/aa;->d(Lcom/google/android/gms/tasks/Task;)V
 
@@ -742,11 +742,11 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zY()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zU()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->Aa()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->zW()V
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPE:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPW:Ljava/lang/Exception;
 
     invoke-virtual {p1, v1}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
 
@@ -754,11 +754,11 @@
 
     if-nez v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPE:Ljava/lang/Exception;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPW:Ljava/lang/Exception;
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPD:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aPV:Ljava/lang/Object;
 
     monitor-exit v0
 
@@ -767,14 +767,14 @@
     :cond_0
     new-instance p1, Lcom/google/android/gms/tasks/f;
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPE:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPW:Ljava/lang/Exception;
 
     invoke-direct {p1, v1}, Lcom/google/android/gms/tasks/f;-><init>(Ljava/lang/Throwable;)V
 
     throw p1
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPE:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPW:Ljava/lang/Exception;
 
     invoke-virtual {p1, v1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -794,7 +794,7 @@
     throw p1
 .end method
 
-.method public final zW()Z
+.method public final zS()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->mLock:Ljava/lang/Object;
@@ -802,15 +802,15 @@
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPB:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPT:Z
 
     if-eqz v1, :cond_0
 
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPC:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPU:Z
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPE:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aPW:Ljava/lang/Exception;
 
     if-nez v1, :cond_0
 
@@ -836,7 +836,7 @@
     throw v1
 .end method
 
-.method public final zX()Z
+.method public final zT()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->mLock:Ljava/lang/Object;
@@ -844,7 +844,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPB:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPT:Z
 
     if-eqz v1, :cond_0
 
@@ -857,15 +857,15 @@
     :cond_0
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPB:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPT:Z
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPC:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aPU:Z
 
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPA:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aPS:Lcom/google/android/gms/tasks/aa;
 
     invoke-virtual {v0, p0}, Lcom/google/android/gms/tasks/aa;->d(Lcom/google/android/gms/tasks/Task;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/ad.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/ad.smali
index 9878a386f2..559cc058f9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/ad.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/ad.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private final synthetic aPF:Lcom/google/android/gms/tasks/ac;
+.field private final synthetic aPX:Lcom/google/android/gms/tasks/ac;
 
 .field private final synthetic val$callable:Ljava/util/concurrent/Callable;
 
@@ -15,7 +15,7 @@
 .method public constructor <init>(Lcom/google/android/gms/tasks/ac;Ljava/util/concurrent/Callable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/ad;->aPF:Lcom/google/android/gms/tasks/ac;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ad;->aPX:Lcom/google/android/gms/tasks/ac;
 
     iput-object p2, p0, Lcom/google/android/gms/tasks/ad;->val$callable:Ljava/util/concurrent/Callable;
 
@@ -30,7 +30,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ad;->aPF:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ad;->aPX:Lcom/google/android/gms/tasks/ac;
 
     iget-object v1, p0, Lcom/google/android/gms/tasks/ad;->val$callable:Ljava/util/concurrent/Callable;
 
@@ -47,7 +47,7 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ad;->aPF:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ad;->aPX:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/tasks/ac;->f(Ljava/lang/Exception;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/h.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/h.smali
index 7a89e54915..0bad938cf6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/h.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field public final aPe:Lcom/google/android/gms/tasks/ac;
+.field public final aPw:Lcom/google/android/gms/tasks/ac;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/ac<",
@@ -34,7 +34,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/tasks/ac;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iput-object v0, p0, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 .method public final f(Ljava/lang/Exception;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/ac;->f(Ljava/lang/Exception;)V
 
@@ -54,7 +54,7 @@
 .method public final g(Ljava/lang/Exception;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/ac;->g(Ljava/lang/Exception;)Z
 
@@ -71,7 +71,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/ac;->k(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/i.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/i.smali
index 3f4b238939..e7fd085a70 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/i.smali
@@ -11,9 +11,9 @@
 
 
 # static fields
-.field public static final aPf:Ljava/util/concurrent/Executor;
+.field public static final aPx:Ljava/util/concurrent/Executor;
 
-.field static final aPg:Ljava/util/concurrent/Executor;
+.field static final aPy:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -24,13 +24,13 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/tasks/i$a;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/tasks/i;->aPf:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/android/gms/tasks/i;->aPx:Ljava/util/concurrent/Executor;
 
     new-instance v0, Lcom/google/android/gms/tasks/ab;
 
     invoke-direct {v0}, Lcom/google/android/gms/tasks/ab;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/tasks/i;->aPg:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/android/gms/tasks/i;->aPy:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/j$a.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/j$a.smali
index 8ba3fc15b3..9fd03f6f3a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/j$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/j$a.smali
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field public final aPh:Ljava/util/concurrent/CountDownLatch;
+.field public final aPz:Ljava/util/concurrent/CountDownLatch;
 
 
 # direct methods
@@ -32,7 +32,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/gms/tasks/j$a;->aPh:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lcom/google/android/gms/tasks/j$a;->aPz:Ljava/util/concurrent/CountDownLatch;
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 .method public final onCanceled()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/j$a;->aPh:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/j$a;->aPz:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->countDown()V
 
@@ -60,7 +60,7 @@
 .method public final onFailure(Ljava/lang/Exception;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/gms/tasks/j$a;->aPh:Ljava/util/concurrent/CountDownLatch;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/j$a;->aPz:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {p1}, Ljava/util/concurrent/CountDownLatch;->countDown()V
 
@@ -70,7 +70,7 @@
 .method public final onSuccess(Ljava/lang/Object;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/gms/tasks/j$a;->aPh:Ljava/util/concurrent/CountDownLatch;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/j$a;->aPz:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {p1}, Ljava/util/concurrent/CountDownLatch;->countDown()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/j.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/j.smali
index f2a4b123ca..1208629b27 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/j.smali
@@ -36,7 +36,7 @@
 
     const-string v0, "Must not be called on the main application thread"
 
-    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aX(Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aS(Ljava/lang/String;)V
 
     const-string v0, "Task must not be null"
 
@@ -67,7 +67,7 @@
 
     invoke-static {p0, v0}, Lcom/google/android/gms/tasks/j;->a(Lcom/google/android/gms/tasks/Task;Lcom/google/android/gms/tasks/j$b;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/tasks/j$a;->aPh:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/j$a;->aPz:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0, p1, p2, p3}, Ljava/util/concurrent/CountDownLatch;->await(JLjava/util/concurrent/TimeUnit;)Z
 
@@ -103,15 +103,15 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/tasks/i;->aPg:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aPy:Ljava/util/concurrent/Executor;
 
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/tasks/Task;->a(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/e;)Lcom/google/android/gms/tasks/Task;
 
-    sget-object v0, Lcom/google/android/gms/tasks/i;->aPg:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aPy:Ljava/util/concurrent/Executor;
 
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/tasks/Task;->a(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/d;)Lcom/google/android/gms/tasks/Task;
 
-    sget-object v0, Lcom/google/android/gms/tasks/i;->aPg:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aPy:Ljava/util/concurrent/Executor;
 
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/tasks/Task;->a(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/b;)Lcom/google/android/gms/tasks/Task;
 
@@ -157,7 +157,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/tasks/Task;->zW()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/tasks/Task;->zS()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/k.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/k.smali
index b6d488a081..21eb457403 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/k.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/k.smali
@@ -21,9 +21,9 @@
 
 
 # instance fields
-.field private final aPi:Ljava/util/concurrent/Executor;
+.field private final aPA:Ljava/util/concurrent/Executor;
 
-.field final aPj:Lcom/google/android/gms/tasks/a;
+.field final aPB:Lcom/google/android/gms/tasks/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/a<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field final aPk:Lcom/google/android/gms/tasks/ac;
+.field final aPC:Lcom/google/android/gms/tasks/ac;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/ac<",
@@ -58,11 +58,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/k;->aPi:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/k;->aPA:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/k;->aPj:Lcom/google/android/gms/tasks/a;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/k;->aPB:Lcom/google/android/gms/tasks/a;
 
-    iput-object p3, p0, Lcom/google/android/gms/tasks/k;->aPk:Lcom/google/android/gms/tasks/ac;
+    iput-object p3, p0, Lcom/google/android/gms/tasks/k;->aPC:Lcom/google/android/gms/tasks/ac;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/k;->aPi:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/k;->aPA:Ljava/util/concurrent/Executor;
 
     new-instance v1, Lcom/google/android/gms/tasks/l;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/l.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/l.smali
index 79f0ad8333..b73d3e7c5d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/l.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/l.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aPl:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aPD:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aPm:Lcom/google/android/gms/tasks/k;
+.field private final synthetic aPE:Lcom/google/android/gms/tasks/k;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/tasks/k;Lcom/google/android/gms/tasks/Task;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/l;->aPm:Lcom/google/android/gms/tasks/k;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/l;->aPE:Lcom/google/android/gms/tasks/k;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/l;->aPl:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/l;->aPD:Lcom/google/android/gms/tasks/Task;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,7 +29,7 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aPl:Lcom/google/android/gms/tasks/Task;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aPD:Lcom/google/android/gms/tasks/Task;
 
     invoke-virtual {v0}, Lcom/google/android/gms/tasks/Task;->isCanceled()Z
 
@@ -37,21 +37,21 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aPm:Lcom/google/android/gms/tasks/k;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aPE:Lcom/google/android/gms/tasks/k;
 
-    iget-object v0, v0, Lcom/google/android/gms/tasks/k;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/k;->aPC:Lcom/google/android/gms/tasks/ac;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->zX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->zT()Z
 
     return-void
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aPm:Lcom/google/android/gms/tasks/k;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aPE:Lcom/google/android/gms/tasks/k;
 
-    iget-object v0, v0, Lcom/google/android/gms/tasks/k;->aPj:Lcom/google/android/gms/tasks/a;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/k;->aPB:Lcom/google/android/gms/tasks/a;
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aPl:Lcom/google/android/gms/tasks/Task;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aPD:Lcom/google/android/gms/tasks/Task;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/tasks/a;->b(Lcom/google/android/gms/tasks/Task;)Ljava/lang/Object;
 
@@ -60,9 +60,9 @@
     .catch Lcom/google/android/gms/tasks/f; {:try_start_0 .. :try_end_0} :catch_1
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aPm:Lcom/google/android/gms/tasks/k;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aPE:Lcom/google/android/gms/tasks/k;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aPC:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/tasks/ac;->k(Ljava/lang/Object;)V
 
@@ -71,9 +71,9 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aPm:Lcom/google/android/gms/tasks/k;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aPE:Lcom/google/android/gms/tasks/k;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aPC:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/tasks/ac;->f(Ljava/lang/Exception;)V
 
@@ -90,9 +90,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aPm:Lcom/google/android/gms/tasks/k;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aPE:Lcom/google/android/gms/tasks/k;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aPC:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0}, Lcom/google/android/gms/tasks/f;->getCause()Ljava/lang/Throwable;
 
@@ -105,9 +105,9 @@
     return-void
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aPm:Lcom/google/android/gms/tasks/k;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aPE:Lcom/google/android/gms/tasks/k;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aPC:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/tasks/ac;->f(Ljava/lang/Exception;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/m.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/m.smali
index 339fe2a3b4..ea885eb239 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/m.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/m.smali
@@ -28,9 +28,9 @@
 
 
 # instance fields
-.field private final aPi:Ljava/util/concurrent/Executor;
+.field private final aPA:Ljava/util/concurrent/Executor;
 
-.field final aPj:Lcom/google/android/gms/tasks/a;
+.field final aPB:Lcom/google/android/gms/tasks/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/a<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field final aPk:Lcom/google/android/gms/tasks/ac;
+.field final aPC:Lcom/google/android/gms/tasks/ac;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/ac<",
@@ -69,11 +69,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/m;->aPi:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/m;->aPA:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/m;->aPj:Lcom/google/android/gms/tasks/a;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/m;->aPB:Lcom/google/android/gms/tasks/a;
 
-    iput-object p3, p0, Lcom/google/android/gms/tasks/m;->aPk:Lcom/google/android/gms/tasks/ac;
+    iput-object p3, p0, Lcom/google/android/gms/tasks/m;->aPC:Lcom/google/android/gms/tasks/ac;
 
     return-void
 .end method
@@ -90,7 +90,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aPi:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aPA:Ljava/util/concurrent/Executor;
 
     new-instance v1, Lcom/google/android/gms/tasks/n;
 
@@ -104,9 +104,9 @@
 .method public final onCanceled()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aPC:Lcom/google/android/gms/tasks/ac;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->zX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->zT()Z
 
     return-void
 .end method
@@ -114,7 +114,7 @@
 .method public final onFailure(Ljava/lang/Exception;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aPC:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/ac;->f(Ljava/lang/Exception;)V
 
@@ -129,7 +129,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aPC:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/ac;->k(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/n.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/n.smali
index 3829238297..179aab9d7b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/n.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aPl:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aPD:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aPn:Lcom/google/android/gms/tasks/m;
+.field private final synthetic aPF:Lcom/google/android/gms/tasks/m;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/tasks/m;Lcom/google/android/gms/tasks/Task;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/n;->aPn:Lcom/google/android/gms/tasks/m;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/n;->aPF:Lcom/google/android/gms/tasks/m;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/n;->aPl:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/n;->aPD:Lcom/google/android/gms/tasks/Task;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,11 +30,11 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/tasks/n;->aPn:Lcom/google/android/gms/tasks/m;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/n;->aPF:Lcom/google/android/gms/tasks/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/tasks/m;->aPj:Lcom/google/android/gms/tasks/a;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/m;->aPB:Lcom/google/android/gms/tasks/a;
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aPl:Lcom/google/android/gms/tasks/Task;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aPD:Lcom/google/android/gms/tasks/Task;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/tasks/a;->b(Lcom/google/android/gms/tasks/Task;)Ljava/lang/Object;
 
@@ -47,7 +47,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/n;->aPn:Lcom/google/android/gms/tasks/m;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/n;->aPF:Lcom/google/android/gms/tasks/m;
 
     new-instance v1, Ljava/lang/NullPointerException;
 
@@ -60,21 +60,21 @@
     return-void
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/tasks/i;->aPg:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aPy:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aPn:Lcom/google/android/gms/tasks/m;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aPF:Lcom/google/android/gms/tasks/m;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/tasks/Task;->a(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/e;)Lcom/google/android/gms/tasks/Task;
 
-    sget-object v1, Lcom/google/android/gms/tasks/i;->aPg:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aPy:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aPn:Lcom/google/android/gms/tasks/m;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aPF:Lcom/google/android/gms/tasks/m;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/tasks/Task;->a(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/d;)Lcom/google/android/gms/tasks/Task;
 
-    sget-object v1, Lcom/google/android/gms/tasks/i;->aPg:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aPy:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aPn:Lcom/google/android/gms/tasks/m;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aPF:Lcom/google/android/gms/tasks/m;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/tasks/Task;->a(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/b;)Lcom/google/android/gms/tasks/Task;
 
@@ -83,9 +83,9 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aPn:Lcom/google/android/gms/tasks/m;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aPF:Lcom/google/android/gms/tasks/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aPC:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/tasks/ac;->f(Ljava/lang/Exception;)V
 
@@ -102,9 +102,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aPn:Lcom/google/android/gms/tasks/m;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aPF:Lcom/google/android/gms/tasks/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aPC:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0}, Lcom/google/android/gms/tasks/f;->getCause()Ljava/lang/Throwable;
 
@@ -117,9 +117,9 @@
     return-void
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aPn:Lcom/google/android/gms/tasks/m;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aPF:Lcom/google/android/gms/tasks/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aPC:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/tasks/ac;->f(Ljava/lang/Exception;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/o.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/o.smali
index a57e1161b2..b39b11beb2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/o.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/o.smali
@@ -19,9 +19,9 @@
 
 
 # instance fields
-.field private final aPi:Ljava/util/concurrent/Executor;
+.field private final aPA:Ljava/util/concurrent/Executor;
 
-.field aPo:Lcom/google/android/gms/tasks/b;
+.field aPG:Lcom/google/android/gms/tasks/b;
 
 .field final mLock:Ljava/lang/Object;
 
@@ -38,9 +38,9 @@
 
     iput-object v0, p0, Lcom/google/android/gms/tasks/o;->mLock:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/o;->aPi:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/o;->aPA:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/o;->aPo:Lcom/google/android/gms/tasks/b;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/o;->aPG:Lcom/google/android/gms/tasks/b;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
     monitor-enter p1
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/tasks/o;->aPo:Lcom/google/android/gms/tasks/b;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/o;->aPG:Lcom/google/android/gms/tasks/b;
 
     if-nez v0, :cond_0
 
@@ -74,7 +74,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lcom/google/android/gms/tasks/o;->aPi:Ljava/util/concurrent/Executor;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/o;->aPA:Ljava/util/concurrent/Executor;
 
     new-instance v0, Lcom/google/android/gms/tasks/p;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/p.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/p.smali
index d63e960cb8..52965d91c7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/p.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/p.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic aPp:Lcom/google/android/gms/tasks/o;
+.field private final synthetic aPH:Lcom/google/android/gms/tasks/o;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/tasks/o;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/p;->aPp:Lcom/google/android/gms/tasks/o;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/p;->aPH:Lcom/google/android/gms/tasks/o;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,22 +25,22 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/p;->aPp:Lcom/google/android/gms/tasks/o;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/p;->aPH:Lcom/google/android/gms/tasks/o;
 
     iget-object v0, v0, Lcom/google/android/gms/tasks/o;->mLock:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/p;->aPp:Lcom/google/android/gms/tasks/o;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/p;->aPH:Lcom/google/android/gms/tasks/o;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/o;->aPo:Lcom/google/android/gms/tasks/b;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/o;->aPG:Lcom/google/android/gms/tasks/b;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/p;->aPp:Lcom/google/android/gms/tasks/o;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/p;->aPH:Lcom/google/android/gms/tasks/o;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/o;->aPo:Lcom/google/android/gms/tasks/b;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/o;->aPG:Lcom/google/android/gms/tasks/b;
 
     invoke-interface {v1}, Lcom/google/android/gms/tasks/b;->onCanceled()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/q.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/q.smali
index 910bed6920..9ae9e588f9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/q.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/q.smali
@@ -19,9 +19,9 @@
 
 
 # instance fields
-.field private final aPi:Ljava/util/concurrent/Executor;
+.field private final aPA:Ljava/util/concurrent/Executor;
 
-.field aPq:Lcom/google/android/gms/tasks/c;
+.field aPI:Lcom/google/android/gms/tasks/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/c<",
@@ -53,9 +53,9 @@
 
     iput-object v0, p0, Lcom/google/android/gms/tasks/q;->mLock:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/q;->aPi:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/q;->aPA:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/q;->aPq:Lcom/google/android/gms/tasks/c;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/q;->aPI:Lcom/google/android/gms/tasks/c;
 
     return-void
 .end method
@@ -77,7 +77,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/q;->aPq:Lcom/google/android/gms/tasks/c;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/q;->aPI:Lcom/google/android/gms/tasks/c;
 
     if-nez v1, :cond_0
 
@@ -90,7 +90,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/q;->aPi:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/q;->aPA:Ljava/util/concurrent/Executor;
 
     new-instance v1, Lcom/google/android/gms/tasks/s;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/s.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/s.smali
index ab66789476..fadc9140b6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/s.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/s.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aPl:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aPD:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aPr:Lcom/google/android/gms/tasks/q;
+.field private final synthetic aPJ:Lcom/google/android/gms/tasks/q;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/tasks/q;Lcom/google/android/gms/tasks/Task;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/s;->aPr:Lcom/google/android/gms/tasks/q;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/s;->aPJ:Lcom/google/android/gms/tasks/q;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/s;->aPl:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/s;->aPD:Lcom/google/android/gms/tasks/Task;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,24 +29,24 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/s;->aPr:Lcom/google/android/gms/tasks/q;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/s;->aPJ:Lcom/google/android/gms/tasks/q;
 
     iget-object v0, v0, Lcom/google/android/gms/tasks/q;->mLock:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/s;->aPr:Lcom/google/android/gms/tasks/q;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/s;->aPJ:Lcom/google/android/gms/tasks/q;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/q;->aPq:Lcom/google/android/gms/tasks/c;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/q;->aPI:Lcom/google/android/gms/tasks/c;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/s;->aPr:Lcom/google/android/gms/tasks/q;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/s;->aPJ:Lcom/google/android/gms/tasks/q;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/q;->aPq:Lcom/google/android/gms/tasks/c;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/q;->aPI:Lcom/google/android/gms/tasks/c;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/s;->aPl:Lcom/google/android/gms/tasks/Task;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/s;->aPD:Lcom/google/android/gms/tasks/Task;
 
     invoke-interface {v1, v2}, Lcom/google/android/gms/tasks/c;->a(Lcom/google/android/gms/tasks/Task;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/t.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/t.smali
index c12017b816..ee7746252d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/t.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/t.smali
@@ -19,9 +19,9 @@
 
 
 # instance fields
-.field private final aPi:Ljava/util/concurrent/Executor;
+.field private final aPA:Ljava/util/concurrent/Executor;
 
-.field aPs:Lcom/google/android/gms/tasks/d;
+.field aPK:Lcom/google/android/gms/tasks/d;
 
 .field final mLock:Ljava/lang/Object;
 
@@ -38,9 +38,9 @@
 
     iput-object v0, p0, Lcom/google/android/gms/tasks/t;->mLock:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/t;->aPi:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/t;->aPA:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/t;->aPs:Lcom/google/android/gms/tasks/d;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/t;->aPK:Lcom/google/android/gms/tasks/d;
 
     return-void
 .end method
@@ -57,7 +57,7 @@
         }
     .end annotation
 
-    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->zW()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->zS()Z
 
     move-result v0
 
@@ -74,7 +74,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/t;->aPs:Lcom/google/android/gms/tasks/d;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/t;->aPK:Lcom/google/android/gms/tasks/d;
 
     if-nez v1, :cond_0
 
@@ -87,7 +87,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/t;->aPi:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/t;->aPA:Ljava/util/concurrent/Executor;
 
     new-instance v1, Lcom/google/android/gms/tasks/u;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/u.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/u.smali
index c771526379..ba2b9b4400 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/u.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/u.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aPl:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aPD:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aPt:Lcom/google/android/gms/tasks/t;
+.field private final synthetic aPL:Lcom/google/android/gms/tasks/t;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/tasks/t;Lcom/google/android/gms/tasks/Task;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/u;->aPt:Lcom/google/android/gms/tasks/t;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/u;->aPL:Lcom/google/android/gms/tasks/t;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/u;->aPl:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/u;->aPD:Lcom/google/android/gms/tasks/Task;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,24 +29,24 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/u;->aPt:Lcom/google/android/gms/tasks/t;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/u;->aPL:Lcom/google/android/gms/tasks/t;
 
     iget-object v0, v0, Lcom/google/android/gms/tasks/t;->mLock:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/u;->aPt:Lcom/google/android/gms/tasks/t;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/u;->aPL:Lcom/google/android/gms/tasks/t;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/t;->aPs:Lcom/google/android/gms/tasks/d;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/t;->aPK:Lcom/google/android/gms/tasks/d;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/u;->aPt:Lcom/google/android/gms/tasks/t;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/u;->aPL:Lcom/google/android/gms/tasks/t;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/t;->aPs:Lcom/google/android/gms/tasks/d;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/t;->aPK:Lcom/google/android/gms/tasks/d;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/u;->aPl:Lcom/google/android/gms/tasks/Task;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/u;->aPD:Lcom/google/android/gms/tasks/Task;
 
     invoke-virtual {v2}, Lcom/google/android/gms/tasks/Task;->getException()Ljava/lang/Exception;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/v.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/v.smali
index b80c543f0a..7e574be205 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/v.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/v.smali
@@ -19,9 +19,9 @@
 
 
 # instance fields
-.field private final aPi:Ljava/util/concurrent/Executor;
+.field private final aPA:Ljava/util/concurrent/Executor;
 
-.field aPu:Lcom/google/android/gms/tasks/e;
+.field aPM:Lcom/google/android/gms/tasks/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/e<",
@@ -53,9 +53,9 @@
 
     iput-object v0, p0, Lcom/google/android/gms/tasks/v;->mLock:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/v;->aPi:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/v;->aPA:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/v;->aPu:Lcom/google/android/gms/tasks/e;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/v;->aPM:Lcom/google/android/gms/tasks/e;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
         }
     .end annotation
 
-    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->zW()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->zS()Z
 
     move-result v0
 
@@ -83,7 +83,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/v;->aPu:Lcom/google/android/gms/tasks/e;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/v;->aPM:Lcom/google/android/gms/tasks/e;
 
     if-nez v1, :cond_0
 
@@ -96,7 +96,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/v;->aPi:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/v;->aPA:Ljava/util/concurrent/Executor;
 
     new-instance v1, Lcom/google/android/gms/tasks/w;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/w.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/w.smali
index 831b587baa..a355ebdc8e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/w.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/w.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aPl:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aPD:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aPv:Lcom/google/android/gms/tasks/v;
+.field private final synthetic aPN:Lcom/google/android/gms/tasks/v;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/tasks/v;Lcom/google/android/gms/tasks/Task;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/w;->aPv:Lcom/google/android/gms/tasks/v;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/w;->aPN:Lcom/google/android/gms/tasks/v;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/w;->aPl:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/w;->aPD:Lcom/google/android/gms/tasks/Task;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,24 +29,24 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/w;->aPv:Lcom/google/android/gms/tasks/v;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/w;->aPN:Lcom/google/android/gms/tasks/v;
 
     iget-object v0, v0, Lcom/google/android/gms/tasks/v;->mLock:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/w;->aPv:Lcom/google/android/gms/tasks/v;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/w;->aPN:Lcom/google/android/gms/tasks/v;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/v;->aPu:Lcom/google/android/gms/tasks/e;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/v;->aPM:Lcom/google/android/gms/tasks/e;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/w;->aPv:Lcom/google/android/gms/tasks/v;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/w;->aPN:Lcom/google/android/gms/tasks/v;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/v;->aPu:Lcom/google/android/gms/tasks/e;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/v;->aPM:Lcom/google/android/gms/tasks/e;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/w;->aPl:Lcom/google/android/gms/tasks/Task;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/w;->aPD:Lcom/google/android/gms/tasks/Task;
 
     invoke-virtual {v2}, Lcom/google/android/gms/tasks/Task;->getResult()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/x.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/x.smali
index 5e66bcee04..b296fc2595 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/x.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/x.smali
@@ -28,9 +28,9 @@
 
 
 # instance fields
-.field private final aPi:Ljava/util/concurrent/Executor;
+.field private final aPA:Ljava/util/concurrent/Executor;
 
-.field private final aPk:Lcom/google/android/gms/tasks/ac;
+.field private final aPC:Lcom/google/android/gms/tasks/ac;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/ac<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field final aPw:Lcom/google/android/gms/tasks/g;
+.field final aPO:Lcom/google/android/gms/tasks/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/g<",
@@ -65,11 +65,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/x;->aPi:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/x;->aPA:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/x;->aPw:Lcom/google/android/gms/tasks/g;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/x;->aPO:Lcom/google/android/gms/tasks/g;
 
-    iput-object p3, p0, Lcom/google/android/gms/tasks/x;->aPk:Lcom/google/android/gms/tasks/ac;
+    iput-object p3, p0, Lcom/google/android/gms/tasks/x;->aPC:Lcom/google/android/gms/tasks/ac;
 
     return-void
 .end method
@@ -86,7 +86,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aPi:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aPA:Ljava/util/concurrent/Executor;
 
     new-instance v1, Lcom/google/android/gms/tasks/y;
 
@@ -100,9 +100,9 @@
 .method public final onCanceled()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aPC:Lcom/google/android/gms/tasks/ac;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->zX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->zT()Z
 
     return-void
 .end method
@@ -110,7 +110,7 @@
 .method public final onFailure(Ljava/lang/Exception;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aPC:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/ac;->f(Ljava/lang/Exception;)V
 
@@ -125,7 +125,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aPk:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aPC:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/ac;->k(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/tasks/y.smali b/com.discord/smali_classes2/com/google/android/gms/tasks/y.smali
index 78c24806c3..815382b3c8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/tasks/y.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/tasks/y.smali
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aPl:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aPD:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aPx:Lcom/google/android/gms/tasks/x;
+.field private final synthetic aPP:Lcom/google/android/gms/tasks/x;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/tasks/x;Lcom/google/android/gms/tasks/Task;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/y;->aPx:Lcom/google/android/gms/tasks/x;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/y;->aPP:Lcom/google/android/gms/tasks/x;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/y;->aPl:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/y;->aPD:Lcom/google/android/gms/tasks/Task;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,11 +30,11 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/tasks/y;->aPx:Lcom/google/android/gms/tasks/x;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/y;->aPP:Lcom/google/android/gms/tasks/x;
 
-    iget-object v0, v0, Lcom/google/android/gms/tasks/x;->aPw:Lcom/google/android/gms/tasks/g;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/x;->aPO:Lcom/google/android/gms/tasks/g;
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aPl:Lcom/google/android/gms/tasks/Task;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aPD:Lcom/google/android/gms/tasks/Task;
 
     invoke-virtual {v1}, Lcom/google/android/gms/tasks/Task;->getResult()Ljava/lang/Object;
 
@@ -50,7 +50,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/y;->aPx:Lcom/google/android/gms/tasks/x;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/y;->aPP:Lcom/google/android/gms/tasks/x;
 
     new-instance v1, Ljava/lang/NullPointerException;
 
@@ -63,21 +63,21 @@
     return-void
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/tasks/i;->aPg:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aPy:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aPx:Lcom/google/android/gms/tasks/x;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aPP:Lcom/google/android/gms/tasks/x;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/tasks/Task;->a(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/e;)Lcom/google/android/gms/tasks/Task;
 
-    sget-object v1, Lcom/google/android/gms/tasks/i;->aPg:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aPy:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aPx:Lcom/google/android/gms/tasks/x;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aPP:Lcom/google/android/gms/tasks/x;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/tasks/Task;->a(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/d;)Lcom/google/android/gms/tasks/Task;
 
-    sget-object v1, Lcom/google/android/gms/tasks/i;->aPg:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aPy:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aPx:Lcom/google/android/gms/tasks/x;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aPP:Lcom/google/android/gms/tasks/x;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/tasks/Task;->a(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/b;)Lcom/google/android/gms/tasks/Task;
 
@@ -86,14 +86,14 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aPx:Lcom/google/android/gms/tasks/x;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aPP:Lcom/google/android/gms/tasks/x;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/tasks/x;->onFailure(Ljava/lang/Exception;)V
 
     return-void
 
     :catch_1
-    iget-object v0, p0, Lcom/google/android/gms/tasks/y;->aPx:Lcom/google/android/gms/tasks/x;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/y;->aPP:Lcom/google/android/gms/tasks/x;
 
     invoke-virtual {v0}, Lcom/google/android/gms/tasks/x;->onCanceled()V
 
@@ -110,7 +110,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aPx:Lcom/google/android/gms/tasks/x;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aPP:Lcom/google/android/gms/tasks/x;
 
     invoke-virtual {v0}, Lcom/google/android/gms/tasks/f;->getCause()Ljava/lang/Throwable;
 
@@ -123,7 +123,7 @@
     return-void
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aPx:Lcom/google/android/gms/tasks/x;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aPP:Lcom/google/android/gms/tasks/x;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/tasks/x;->onFailure(Ljava/lang/Exception;)V
 
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 c553b7814f..3fee3e1806 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
@@ -137,837 +137,837 @@
 
 .field public static final behavior_skipCollapsed:I = 0x7f04005a
 
-.field public static final borderWidth:I = 0x7f040064
+.field public static final borderWidth:I = 0x7f040065
 
-.field public static final borderlessButtonStyle:I = 0x7f040065
+.field public static final borderlessButtonStyle:I = 0x7f040066
 
-.field public static final bottomAppBarStyle:I = 0x7f040066
+.field public static final bottomAppBarStyle:I = 0x7f040067
 
-.field public static final bottomNavigationStyle:I = 0x7f040067
+.field public static final bottomNavigationStyle:I = 0x7f040068
 
-.field public static final bottomSheetDialogTheme:I = 0x7f040068
+.field public static final bottomSheetDialogTheme:I = 0x7f040069
 
-.field public static final bottomSheetStyle:I = 0x7f040069
+.field public static final bottomSheetStyle:I = 0x7f04006a
 
-.field public static final boxBackgroundColor:I = 0x7f04006a
+.field public static final boxBackgroundColor:I = 0x7f04006b
 
-.field public static final boxBackgroundMode:I = 0x7f04006b
+.field public static final boxBackgroundMode:I = 0x7f04006c
 
-.field public static final boxCollapsedPaddingTop:I = 0x7f04006c
+.field public static final boxCollapsedPaddingTop:I = 0x7f04006d
 
-.field public static final boxCornerRadiusBottomEnd:I = 0x7f04006d
+.field public static final boxCornerRadiusBottomEnd:I = 0x7f04006e
 
-.field public static final boxCornerRadiusBottomStart:I = 0x7f04006e
+.field public static final boxCornerRadiusBottomStart:I = 0x7f04006f
 
-.field public static final boxCornerRadiusTopEnd:I = 0x7f04006f
+.field public static final boxCornerRadiusTopEnd:I = 0x7f040070
 
-.field public static final boxCornerRadiusTopStart:I = 0x7f040070
+.field public static final boxCornerRadiusTopStart:I = 0x7f040071
 
-.field public static final boxStrokeColor:I = 0x7f040071
+.field public static final boxStrokeColor:I = 0x7f040072
 
-.field public static final boxStrokeWidth:I = 0x7f040072
+.field public static final boxStrokeWidth:I = 0x7f040073
 
-.field public static final buttonBarButtonStyle:I = 0x7f040074
+.field public static final buttonBarButtonStyle:I = 0x7f040075
 
-.field public static final buttonBarNegativeButtonStyle:I = 0x7f040075
+.field public static final buttonBarNegativeButtonStyle:I = 0x7f040076
 
-.field public static final buttonBarNeutralButtonStyle:I = 0x7f040076
+.field public static final buttonBarNeutralButtonStyle:I = 0x7f040077
 
-.field public static final buttonBarPositiveButtonStyle:I = 0x7f040077
+.field public static final buttonBarPositiveButtonStyle:I = 0x7f040078
 
-.field public static final buttonBarStyle:I = 0x7f040078
+.field public static final buttonBarStyle:I = 0x7f040079
 
-.field public static final buttonGravity:I = 0x7f040079
+.field public static final buttonGravity:I = 0x7f04007a
 
-.field public static final buttonIconDimen:I = 0x7f04007a
+.field public static final buttonIconDimen:I = 0x7f04007b
 
-.field public static final buttonPanelSideLayout:I = 0x7f04007b
+.field public static final buttonPanelSideLayout:I = 0x7f04007c
 
-.field public static final buttonStyle:I = 0x7f04007d
+.field public static final buttonStyle:I = 0x7f04007e
 
-.field public static final buttonStyleSmall:I = 0x7f04007e
+.field public static final buttonStyleSmall:I = 0x7f04007f
 
-.field public static final buttonTint:I = 0x7f04007f
+.field public static final buttonTint:I = 0x7f040080
 
-.field public static final buttonTintMode:I = 0x7f040080
+.field public static final buttonTintMode:I = 0x7f040081
 
-.field public static final cardBackgroundColor:I = 0x7f040081
+.field public static final cardBackgroundColor:I = 0x7f040082
 
-.field public static final cardCornerRadius:I = 0x7f040082
+.field public static final cardCornerRadius:I = 0x7f040083
 
-.field public static final cardElevation:I = 0x7f040083
+.field public static final cardElevation:I = 0x7f040084
 
-.field public static final cardMaxElevation:I = 0x7f040084
+.field public static final cardMaxElevation:I = 0x7f040085
 
-.field public static final cardPreventCornerOverlap:I = 0x7f040085
+.field public static final cardPreventCornerOverlap:I = 0x7f040086
 
-.field public static final cardUseCompatPadding:I = 0x7f040086
+.field public static final cardUseCompatPadding:I = 0x7f040087
 
-.field public static final cardViewStyle:I = 0x7f040087
+.field public static final cardViewStyle:I = 0x7f040088
 
-.field public static final checkboxStyle:I = 0x7f04008c
+.field public static final checkboxStyle:I = 0x7f04008d
 
-.field public static final checkedChip:I = 0x7f04008d
+.field public static final checkedChip:I = 0x7f04008e
 
-.field public static final checkedIcon:I = 0x7f04008e
+.field public static final checkedIcon:I = 0x7f04008f
 
-.field public static final checkedIconEnabled:I = 0x7f04008f
+.field public static final checkedIconEnabled:I = 0x7f040090
 
-.field public static final checkedIconVisible:I = 0x7f040090
+.field public static final checkedIconVisible:I = 0x7f040091
 
-.field public static final checkedTextViewStyle:I = 0x7f040091
+.field public static final checkedTextViewStyle:I = 0x7f040092
 
-.field public static final chipBackgroundColor:I = 0x7f040092
+.field public static final chipBackgroundColor:I = 0x7f040093
 
-.field public static final chipCornerRadius:I = 0x7f040093
+.field public static final chipCornerRadius:I = 0x7f040094
 
-.field public static final chipEndPadding:I = 0x7f040094
+.field public static final chipEndPadding:I = 0x7f040095
 
-.field public static final chipGroupStyle:I = 0x7f040095
+.field public static final chipGroupStyle:I = 0x7f040096
 
-.field public static final chipIcon:I = 0x7f040096
+.field public static final chipIcon:I = 0x7f040097
 
-.field public static final chipIconEnabled:I = 0x7f040097
+.field public static final chipIconEnabled:I = 0x7f040098
 
-.field public static final chipIconSize:I = 0x7f040098
+.field public static final chipIconSize:I = 0x7f040099
 
-.field public static final chipIconTint:I = 0x7f040099
+.field public static final chipIconTint:I = 0x7f04009a
 
-.field public static final chipIconVisible:I = 0x7f04009a
+.field public static final chipIconVisible:I = 0x7f04009b
 
-.field public static final chipMinHeight:I = 0x7f04009b
+.field public static final chipMinHeight:I = 0x7f04009c
 
-.field public static final chipSpacing:I = 0x7f04009c
+.field public static final chipSpacing:I = 0x7f04009d
 
-.field public static final chipSpacingHorizontal:I = 0x7f04009d
+.field public static final chipSpacingHorizontal:I = 0x7f04009e
 
-.field public static final chipSpacingVertical:I = 0x7f04009e
+.field public static final chipSpacingVertical:I = 0x7f04009f
 
-.field public static final chipStandaloneStyle:I = 0x7f04009f
+.field public static final chipStandaloneStyle:I = 0x7f0400a0
 
-.field public static final chipStartPadding:I = 0x7f0400a0
+.field public static final chipStartPadding:I = 0x7f0400a1
 
-.field public static final chipStrokeColor:I = 0x7f0400a1
+.field public static final chipStrokeColor:I = 0x7f0400a2
 
-.field public static final chipStrokeWidth:I = 0x7f0400a2
+.field public static final chipStrokeWidth:I = 0x7f0400a3
 
-.field public static final chipStyle:I = 0x7f0400a3
+.field public static final chipStyle:I = 0x7f0400a4
 
-.field public static final closeIcon:I = 0x7f0400a5
+.field public static final closeIcon:I = 0x7f0400a6
 
-.field public static final closeIconEnabled:I = 0x7f0400a6
+.field public static final closeIconEnabled:I = 0x7f0400a7
 
-.field public static final closeIconEndPadding:I = 0x7f0400a7
+.field public static final closeIconEndPadding:I = 0x7f0400a8
 
-.field public static final closeIconSize:I = 0x7f0400a8
+.field public static final closeIconSize:I = 0x7f0400a9
 
-.field public static final closeIconStartPadding:I = 0x7f0400a9
+.field public static final closeIconStartPadding:I = 0x7f0400aa
 
-.field public static final closeIconTint:I = 0x7f0400aa
+.field public static final closeIconTint:I = 0x7f0400ab
 
-.field public static final closeIconVisible:I = 0x7f0400ab
+.field public static final closeIconVisible:I = 0x7f0400ac
 
-.field public static final closeItemLayout:I = 0x7f0400ac
+.field public static final closeItemLayout:I = 0x7f0400ad
 
-.field public static final collapseContentDescription:I = 0x7f0400ad
+.field public static final collapseContentDescription:I = 0x7f0400ae
 
-.field public static final collapseIcon:I = 0x7f0400ae
+.field public static final collapseIcon:I = 0x7f0400af
 
-.field public static final collapsedTitleGravity:I = 0x7f0400af
+.field public static final collapsedTitleGravity:I = 0x7f0400b0
 
-.field public static final collapsedTitleTextAppearance:I = 0x7f0400b0
+.field public static final collapsedTitleTextAppearance:I = 0x7f0400b1
 
-.field public static final color:I = 0x7f0400b1
+.field public static final color:I = 0x7f0400b2
 
-.field public static final colorAccent:I = 0x7f0400b2
+.field public static final colorAccent:I = 0x7f0400b3
 
-.field public static final colorBackgroundFloating:I = 0x7f0400b3
+.field public static final colorBackgroundFloating:I = 0x7f0400b4
 
-.field public static final colorButtonNormal:I = 0x7f0400b4
+.field public static final colorButtonNormal:I = 0x7f0400b5
 
-.field public static final colorControlActivated:I = 0x7f0400b5
+.field public static final colorControlActivated:I = 0x7f0400b6
 
-.field public static final colorControlHighlight:I = 0x7f0400b6
+.field public static final colorControlHighlight:I = 0x7f0400b7
 
-.field public static final colorControlNormal:I = 0x7f0400b7
+.field public static final colorControlNormal:I = 0x7f0400b8
 
-.field public static final colorError:I = 0x7f0400b8
+.field public static final colorError:I = 0x7f0400b9
 
-.field public static final colorPrimary:I = 0x7f0400b9
+.field public static final colorPrimary:I = 0x7f0400ba
 
-.field public static final colorPrimaryDark:I = 0x7f0400bc
+.field public static final colorPrimaryDark:I = 0x7f0400bd
 
-.field public static final colorSecondary:I = 0x7f0400c0
+.field public static final colorSecondary:I = 0x7f0400c1
 
-.field public static final colorSwitchThumbNormal:I = 0x7f0400c1
+.field public static final colorSwitchThumbNormal:I = 0x7f0400c2
 
-.field public static final commitIcon:I = 0x7f0400c2
+.field public static final commitIcon:I = 0x7f0400c3
 
-.field public static final contentDescription:I = 0x7f0400c7
+.field public static final contentDescription:I = 0x7f0400c8
 
-.field public static final contentInsetEnd:I = 0x7f0400c8
+.field public static final contentInsetEnd:I = 0x7f0400c9
 
-.field public static final contentInsetEndWithActions:I = 0x7f0400c9
+.field public static final contentInsetEndWithActions:I = 0x7f0400ca
 
-.field public static final contentInsetLeft:I = 0x7f0400ca
+.field public static final contentInsetLeft:I = 0x7f0400cb
 
-.field public static final contentInsetRight:I = 0x7f0400cb
+.field public static final contentInsetRight:I = 0x7f0400cc
 
-.field public static final contentInsetStart:I = 0x7f0400cc
+.field public static final contentInsetStart:I = 0x7f0400cd
 
-.field public static final contentInsetStartWithNavigation:I = 0x7f0400cd
+.field public static final contentInsetStartWithNavigation:I = 0x7f0400ce
 
-.field public static final contentPadding:I = 0x7f0400ce
+.field public static final contentPadding:I = 0x7f0400cf
 
-.field public static final contentPaddingBottom:I = 0x7f0400cf
+.field public static final contentPaddingBottom:I = 0x7f0400d0
 
-.field public static final contentPaddingLeft:I = 0x7f0400d0
+.field public static final contentPaddingLeft:I = 0x7f0400d1
 
-.field public static final contentPaddingRight:I = 0x7f0400d1
+.field public static final contentPaddingRight:I = 0x7f0400d2
 
-.field public static final contentPaddingTop:I = 0x7f0400d2
+.field public static final contentPaddingTop:I = 0x7f0400d3
 
-.field public static final contentScrim:I = 0x7f0400d3
+.field public static final contentScrim:I = 0x7f0400d4
 
-.field public static final controlBackground:I = 0x7f0400d4
+.field public static final controlBackground:I = 0x7f0400d5
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final cornerRadius:I = 0x7f0400d6
+.field public static final cornerRadius:I = 0x7f0400d7
 
-.field public static final counterEnabled:I = 0x7f0400d7
+.field public static final counterEnabled:I = 0x7f0400d8
 
-.field public static final counterMaxLength:I = 0x7f0400d8
+.field public static final counterMaxLength:I = 0x7f0400d9
 
-.field public static final counterOverflowTextAppearance:I = 0x7f0400d9
+.field public static final counterOverflowTextAppearance:I = 0x7f0400da
 
-.field public static final counterTextAppearance:I = 0x7f0400da
+.field public static final counterTextAppearance:I = 0x7f0400db
 
-.field public static final customNavigationLayout:I = 0x7f0400e9
+.field public static final customNavigationLayout:I = 0x7f0400ea
 
-.field public static final defaultQueryHint:I = 0x7f0400ff
+.field public static final defaultQueryHint:I = 0x7f040100
 
-.field public static final dialogCornerRadius:I = 0x7f040100
+.field public static final dialogCornerRadius:I = 0x7f040101
 
-.field public static final dialogPreferredPadding:I = 0x7f040101
+.field public static final dialogPreferredPadding:I = 0x7f040102
 
-.field public static final dialogTheme:I = 0x7f040102
+.field public static final dialogTheme:I = 0x7f040103
 
-.field public static final displayOptions:I = 0x7f040103
+.field public static final displayOptions:I = 0x7f040104
 
-.field public static final divider:I = 0x7f040104
+.field public static final divider:I = 0x7f040105
 
-.field public static final dividerHorizontal:I = 0x7f040108
+.field public static final dividerHorizontal:I = 0x7f040109
 
-.field public static final dividerPadding:I = 0x7f040109
+.field public static final dividerPadding:I = 0x7f04010a
 
-.field public static final dividerVertical:I = 0x7f04010a
+.field public static final dividerVertical:I = 0x7f04010b
 
-.field public static final drawableSize:I = 0x7f04010b
+.field public static final drawableSize:I = 0x7f04010c
 
-.field public static final drawerArrowStyle:I = 0x7f04010c
+.field public static final drawerArrowStyle:I = 0x7f04010d
 
-.field public static final dropDownListViewStyle:I = 0x7f04010d
+.field public static final dropDownListViewStyle:I = 0x7f04010f
 
-.field public static final dropdownListPreferredItemHeight:I = 0x7f04010e
+.field public static final dropdownListPreferredItemHeight:I = 0x7f040110
 
-.field public static final editTextBackground:I = 0x7f04010f
+.field public static final editTextBackground:I = 0x7f040111
 
-.field public static final editTextColor:I = 0x7f040110
+.field public static final editTextColor:I = 0x7f040112
 
-.field public static final editTextStyle:I = 0x7f040111
+.field public static final editTextStyle:I = 0x7f040113
 
-.field public static final elevation:I = 0x7f040112
+.field public static final elevation:I = 0x7f040114
 
-.field public static final enforceMaterialTheme:I = 0x7f040114
+.field public static final enforceMaterialTheme:I = 0x7f040116
 
-.field public static final enforceTextAppearance:I = 0x7f040115
+.field public static final enforceTextAppearance:I = 0x7f040117
 
-.field public static final errorEnabled:I = 0x7f040116
+.field public static final errorEnabled:I = 0x7f040118
 
-.field public static final errorTextAppearance:I = 0x7f040117
+.field public static final errorTextAppearance:I = 0x7f040119
 
-.field public static final expandActivityOverflowButtonDrawable:I = 0x7f040118
+.field public static final expandActivityOverflowButtonDrawable:I = 0x7f04011a
 
-.field public static final expanded:I = 0x7f040119
+.field public static final expanded:I = 0x7f04011b
 
-.field public static final expandedTitleGravity:I = 0x7f04011a
+.field public static final expandedTitleGravity:I = 0x7f04011c
 
-.field public static final expandedTitleMargin:I = 0x7f04011b
+.field public static final expandedTitleMargin:I = 0x7f04011d
 
-.field public static final expandedTitleMarginBottom:I = 0x7f04011c
+.field public static final expandedTitleMarginBottom:I = 0x7f04011e
 
-.field public static final expandedTitleMarginEnd:I = 0x7f04011d
+.field public static final expandedTitleMarginEnd:I = 0x7f04011f
 
-.field public static final expandedTitleMarginStart:I = 0x7f04011e
+.field public static final expandedTitleMarginStart:I = 0x7f040120
 
-.field public static final expandedTitleMarginTop:I = 0x7f04011f
+.field public static final expandedTitleMarginTop:I = 0x7f040121
 
-.field public static final expandedTitleTextAppearance:I = 0x7f040120
+.field public static final expandedTitleTextAppearance:I = 0x7f040122
 
-.field public static final fabAlignmentMode:I = 0x7f040121
+.field public static final fabAlignmentMode:I = 0x7f040123
 
-.field public static final fabCradleMargin:I = 0x7f040122
+.field public static final fabCradleMargin:I = 0x7f040124
 
-.field public static final fabCradleRoundedCornerRadius:I = 0x7f040123
+.field public static final fabCradleRoundedCornerRadius:I = 0x7f040125
 
-.field public static final fabCradleVerticalOffset:I = 0x7f040124
+.field public static final fabCradleVerticalOffset:I = 0x7f040126
 
-.field public static final fabCustomSize:I = 0x7f040125
+.field public static final fabCustomSize:I = 0x7f040127
 
-.field public static final fabSize:I = 0x7f040126
+.field public static final fabSize:I = 0x7f040128
 
-.field public static final fastScrollEnabled:I = 0x7f04012b
+.field public static final fastScrollEnabled:I = 0x7f04012d
 
-.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f04012c
+.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f04012e
 
-.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f04012d
+.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f04012f
 
-.field public static final fastScrollVerticalThumbDrawable:I = 0x7f04012e
+.field public static final fastScrollVerticalThumbDrawable:I = 0x7f040130
 
-.field public static final fastScrollVerticalTrackDrawable:I = 0x7f04012f
+.field public static final fastScrollVerticalTrackDrawable:I = 0x7f040131
 
-.field public static final firstBaselineToTopHeight:I = 0x7f040131
+.field public static final firstBaselineToTopHeight:I = 0x7f040133
 
-.field public static final floatingActionButtonStyle:I = 0x7f04013d
+.field public static final floatingActionButtonStyle:I = 0x7f04013f
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontFamily:I = 0x7f04013f
+.field public static final fontFamily:I = 0x7f040141
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final foregroundInsidePadding:I = 0x7f040149
+.field public static final foregroundInsidePadding:I = 0x7f04014b
 
-.field public static final gapBetweenBars:I = 0x7f04014a
+.field public static final gapBetweenBars:I = 0x7f04014c
 
-.field public static final goIcon:I = 0x7f04014f
+.field public static final goIcon:I = 0x7f040151
 
-.field public static final headerLayout:I = 0x7f040155
+.field public static final headerLayout:I = 0x7f040157
 
-.field public static final height:I = 0x7f040156
+.field public static final height:I = 0x7f040158
 
-.field public static final helperText:I = 0x7f040157
+.field public static final helperText:I = 0x7f040159
 
-.field public static final helperTextEnabled:I = 0x7f040158
+.field public static final helperTextEnabled:I = 0x7f04015a
 
-.field public static final helperTextTextAppearance:I = 0x7f040159
+.field public static final helperTextTextAppearance:I = 0x7f04015b
 
-.field public static final hideMotionSpec:I = 0x7f04015a
+.field public static final hideMotionSpec:I = 0x7f04015c
 
-.field public static final hideOnContentScroll:I = 0x7f04015b
+.field public static final hideOnContentScroll:I = 0x7f04015d
 
-.field public static final hideOnScroll:I = 0x7f04015c
+.field public static final hideOnScroll:I = 0x7f04015e
 
-.field public static final hintAnimationEnabled:I = 0x7f04015e
+.field public static final hintAnimationEnabled:I = 0x7f040160
 
-.field public static final hintEnabled:I = 0x7f040160
+.field public static final hintEnabled:I = 0x7f040162
 
-.field public static final hintTextAppearance:I = 0x7f040161
+.field public static final hintTextAppearance:I = 0x7f040163
 
-.field public static final homeAsUpIndicator:I = 0x7f040162
+.field public static final homeAsUpIndicator:I = 0x7f040164
 
-.field public static final homeLayout:I = 0x7f040163
+.field public static final homeLayout:I = 0x7f040165
 
-.field public static final hoveredFocusedTranslationZ:I = 0x7f040164
+.field public static final hoveredFocusedTranslationZ:I = 0x7f040166
 
-.field public static final icon:I = 0x7f0401c7
+.field public static final icon:I = 0x7f0401c9
 
-.field public static final iconEndPadding:I = 0x7f0401c8
+.field public static final iconEndPadding:I = 0x7f0401ca
 
-.field public static final iconGravity:I = 0x7f0401c9
+.field public static final iconGravity:I = 0x7f0401cb
 
-.field public static final iconPadding:I = 0x7f0401ca
+.field public static final iconPadding:I = 0x7f0401cc
 
-.field public static final iconSize:I = 0x7f0401cb
+.field public static final iconSize:I = 0x7f0401cd
 
-.field public static final iconStartPadding:I = 0x7f0401cc
+.field public static final iconStartPadding:I = 0x7f0401ce
 
-.field public static final iconTint:I = 0x7f0401cd
+.field public static final iconTint:I = 0x7f0401cf
 
-.field public static final iconTintMode:I = 0x7f0401ce
+.field public static final iconTintMode:I = 0x7f0401d0
 
-.field public static final iconifiedByDefault:I = 0x7f0401cf
+.field public static final iconifiedByDefault:I = 0x7f0401d1
 
-.field public static final imageButtonStyle:I = 0x7f0401d2
+.field public static final imageButtonStyle:I = 0x7f0401d4
 
-.field public static final indeterminateProgressStyle:I = 0x7f0401ea
+.field public static final indeterminateProgressStyle:I = 0x7f0401ec
 
-.field public static final initialActivityCount:I = 0x7f0401eb
+.field public static final initialActivityCount:I = 0x7f0401ed
 
-.field public static final insetForeground:I = 0x7f0401ec
+.field public static final insetForeground:I = 0x7f0401ee
 
-.field public static final isLightTheme:I = 0x7f0401ed
+.field public static final isLightTheme:I = 0x7f0401ef
 
-.field public static final itemBackground:I = 0x7f0401ee
+.field public static final itemBackground:I = 0x7f0401f0
 
-.field public static final itemHorizontalPadding:I = 0x7f0401ef
+.field public static final itemHorizontalPadding:I = 0x7f0401f1
 
-.field public static final itemHorizontalTranslationEnabled:I = 0x7f0401f0
+.field public static final itemHorizontalTranslationEnabled:I = 0x7f0401f2
 
-.field public static final itemIconPadding:I = 0x7f0401f1
+.field public static final itemIconPadding:I = 0x7f0401f3
 
-.field public static final itemIconSize:I = 0x7f0401f2
+.field public static final itemIconSize:I = 0x7f0401f4
 
-.field public static final itemIconTint:I = 0x7f0401f3
+.field public static final itemIconTint:I = 0x7f0401f5
 
-.field public static final itemPadding:I = 0x7f0401f4
+.field public static final itemPadding:I = 0x7f0401f6
 
-.field public static final itemSpacing:I = 0x7f0401f5
+.field public static final itemSpacing:I = 0x7f0401f7
 
-.field public static final itemTextAppearance:I = 0x7f0401f6
+.field public static final itemTextAppearance:I = 0x7f0401f8
 
-.field public static final itemTextAppearanceActive:I = 0x7f0401f7
+.field public static final itemTextAppearanceActive:I = 0x7f0401f9
 
-.field public static final itemTextAppearanceInactive:I = 0x7f0401f8
+.field public static final itemTextAppearanceInactive:I = 0x7f0401fa
 
-.field public static final itemTextColor:I = 0x7f0401f9
+.field public static final itemTextColor:I = 0x7f0401fb
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final labelVisibilityMode:I = 0x7f0401fc
+.field public static final labelVisibilityMode:I = 0x7f0401fe
 
-.field public static final lastBaselineToBottomHeight:I = 0x7f0401fd
+.field public static final lastBaselineToBottomHeight:I = 0x7f0401ff
 
-.field public static final layout:I = 0x7f0401fe
+.field public static final layout:I = 0x7f040200
 
-.field public static final layoutManager:I = 0x7f0401ff
+.field public static final layoutManager:I = 0x7f040201
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_collapseMode:I = 0x7f040204
+.field public static final layout_collapseMode:I = 0x7f040206
 
-.field public static final layout_collapseParallaxMultiplier:I = 0x7f040205
+.field public static final layout_collapseParallaxMultiplier:I = 0x7f040207
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final layout_scrollFlags:I = 0x7f040243
+.field public static final layout_scrollFlags:I = 0x7f040245
 
-.field public static final layout_scrollInterpolator:I = 0x7f040244
+.field public static final layout_scrollInterpolator:I = 0x7f040246
 
-.field public static final liftOnScroll:I = 0x7f040249
+.field public static final liftOnScroll:I = 0x7f04024c
 
-.field public static final lineHeight:I = 0x7f04024a
+.field public static final lineHeight:I = 0x7f04024d
 
-.field public static final lineSpacing:I = 0x7f04024b
+.field public static final lineSpacing:I = 0x7f04024e
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04024c
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04024f
 
-.field public static final listDividerAlertDialog:I = 0x7f04024d
+.field public static final listDividerAlertDialog:I = 0x7f040250
 
-.field public static final listItemLayout:I = 0x7f04024e
+.field public static final listItemLayout:I = 0x7f040251
 
-.field public static final listLayout:I = 0x7f04024f
+.field public static final listLayout:I = 0x7f040252
 
-.field public static final listMenuViewStyle:I = 0x7f040250
+.field public static final listMenuViewStyle:I = 0x7f040253
 
-.field public static final listPopupWindowStyle:I = 0x7f040251
+.field public static final listPopupWindowStyle:I = 0x7f040254
 
-.field public static final listPreferredItemHeight:I = 0x7f040252
+.field public static final listPreferredItemHeight:I = 0x7f040255
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040253
+.field public static final listPreferredItemHeightLarge:I = 0x7f040256
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040254
+.field public static final listPreferredItemHeightSmall:I = 0x7f040257
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040255
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040258
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040256
+.field public static final listPreferredItemPaddingRight:I = 0x7f040259
 
-.field public static final logo:I = 0x7f040257
+.field public static final logo:I = 0x7f04025a
 
-.field public static final logoDescription:I = 0x7f040258
+.field public static final logoDescription:I = 0x7f04025b
 
-.field public static final materialButtonStyle:I = 0x7f040268
+.field public static final materialButtonStyle:I = 0x7f04026b
 
-.field public static final materialCardViewStyle:I = 0x7f040269
+.field public static final materialCardViewStyle:I = 0x7f04026c
 
-.field public static final maxActionInlineWidth:I = 0x7f04026a
+.field public static final maxActionInlineWidth:I = 0x7f04026d
 
-.field public static final maxButtonHeight:I = 0x7f04026b
+.field public static final maxButtonHeight:I = 0x7f04026e
 
-.field public static final maxImageSize:I = 0x7f04026c
+.field public static final maxImageSize:I = 0x7f04026f
 
-.field public static final measureWithLargestChild:I = 0x7f04026e
+.field public static final measureWithLargestChild:I = 0x7f040271
 
-.field public static final menu:I = 0x7f04026f
+.field public static final menu:I = 0x7f040272
 
-.field public static final multiChoiceItemLayout:I = 0x7f040270
+.field public static final multiChoiceItemLayout:I = 0x7f040273
 
-.field public static final navigationContentDescription:I = 0x7f040271
+.field public static final navigationContentDescription:I = 0x7f040274
 
-.field public static final navigationIcon:I = 0x7f040272
+.field public static final navigationIcon:I = 0x7f040275
 
-.field public static final navigationMode:I = 0x7f040273
+.field public static final navigationMode:I = 0x7f040276
 
-.field public static final navigationViewStyle:I = 0x7f040274
+.field public static final navigationViewStyle:I = 0x7f040277
 
-.field public static final numericModifiers:I = 0x7f040277
+.field public static final numericModifiers:I = 0x7f04027a
 
-.field public static final overlapAnchor:I = 0x7f040278
+.field public static final overlapAnchor:I = 0x7f04027b
 
-.field public static final paddingBottomNoButtons:I = 0x7f04027c
+.field public static final paddingBottomNoButtons:I = 0x7f04027f
 
-.field public static final paddingEnd:I = 0x7f04027d
+.field public static final paddingEnd:I = 0x7f040280
 
-.field public static final paddingStart:I = 0x7f04027e
+.field public static final paddingStart:I = 0x7f040281
 
-.field public static final paddingTopNoTitle:I = 0x7f04027f
+.field public static final paddingTopNoTitle:I = 0x7f040282
 
-.field public static final panelBackground:I = 0x7f040280
+.field public static final panelBackground:I = 0x7f040283
 
-.field public static final panelMenuListTheme:I = 0x7f040281
+.field public static final panelMenuListTheme:I = 0x7f040284
 
-.field public static final panelMenuListWidth:I = 0x7f040282
+.field public static final panelMenuListWidth:I = 0x7f040285
 
-.field public static final passwordToggleContentDescription:I = 0x7f040283
+.field public static final passwordToggleContentDescription:I = 0x7f040286
 
-.field public static final passwordToggleDrawable:I = 0x7f040284
+.field public static final passwordToggleDrawable:I = 0x7f040287
 
-.field public static final passwordToggleEnabled:I = 0x7f040285
+.field public static final passwordToggleEnabled:I = 0x7f040288
 
-.field public static final passwordToggleTint:I = 0x7f040286
+.field public static final passwordToggleTint:I = 0x7f040289
 
-.field public static final passwordToggleTintMode:I = 0x7f040287
+.field public static final passwordToggleTintMode:I = 0x7f04028a
 
-.field public static final popupMenuStyle:I = 0x7f04028a
+.field public static final popupMenuStyle:I = 0x7f04028d
 
-.field public static final popupTheme:I = 0x7f04028b
+.field public static final popupTheme:I = 0x7f04028e
 
-.field public static final popupWindowStyle:I = 0x7f04028c
+.field public static final popupWindowStyle:I = 0x7f04028f
 
-.field public static final preserveIconSpacing:I = 0x7f04028d
+.field public static final preserveIconSpacing:I = 0x7f040290
 
-.field public static final pressedTranslationZ:I = 0x7f04028f
+.field public static final pressedTranslationZ:I = 0x7f040292
 
-.field public static final progressBarPadding:I = 0x7f0402b9
+.field public static final progressBarPadding:I = 0x7f0402bc
 
-.field public static final progressBarStyle:I = 0x7f0402ba
+.field public static final progressBarStyle:I = 0x7f0402bd
 
-.field public static final queryBackground:I = 0x7f0402bd
+.field public static final queryBackground:I = 0x7f0402c0
 
-.field public static final queryHint:I = 0x7f0402be
+.field public static final queryHint:I = 0x7f0402c1
 
-.field public static final radioButtonStyle:I = 0x7f0402bf
+.field public static final radioButtonStyle:I = 0x7f0402c2
 
-.field public static final ratingBarStyle:I = 0x7f0402c2
+.field public static final ratingBarStyle:I = 0x7f0402c5
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402c3
+.field public static final ratingBarStyleIndicator:I = 0x7f0402c6
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402c4
+.field public static final ratingBarStyleSmall:I = 0x7f0402c7
 
-.field public static final reverseLayout:I = 0x7f0402c7
+.field public static final reverseLayout:I = 0x7f0402ca
 
-.field public static final rippleColor:I = 0x7f0402c8
+.field public static final rippleColor:I = 0x7f0402cb
 
-.field public static final scrimAnimationDuration:I = 0x7f0402e6
+.field public static final scrimAnimationDuration:I = 0x7f0402e9
 
-.field public static final scrimBackground:I = 0x7f0402e7
+.field public static final scrimBackground:I = 0x7f0402ea
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f0402e8
+.field public static final scrimVisibleHeightTrigger:I = 0x7f0402eb
 
-.field public static final searchHintIcon:I = 0x7f0402e9
+.field public static final searchHintIcon:I = 0x7f0402ec
 
-.field public static final searchIcon:I = 0x7f0402ea
+.field public static final searchIcon:I = 0x7f0402ed
 
-.field public static final searchViewStyle:I = 0x7f0402eb
+.field public static final searchViewStyle:I = 0x7f0402ee
 
-.field public static final seekBarStyle:I = 0x7f0402ed
+.field public static final seekBarStyle:I = 0x7f0402f0
 
-.field public static final selectableItemBackground:I = 0x7f0402ee
+.field public static final selectableItemBackground:I = 0x7f0402f1
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ef
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402f2
 
-.field public static final showAsAction:I = 0x7f0402f1
+.field public static final showAsAction:I = 0x7f0402f4
 
-.field public static final showDividers:I = 0x7f0402f5
+.field public static final showDividers:I = 0x7f0402f8
 
-.field public static final showMotionSpec:I = 0x7f0402f6
+.field public static final showMotionSpec:I = 0x7f0402f9
 
-.field public static final showText:I = 0x7f0402f7
+.field public static final showText:I = 0x7f0402fa
 
-.field public static final showTitle:I = 0x7f0402f8
+.field public static final showTitle:I = 0x7f0402fb
 
-.field public static final singleChoiceItemLayout:I = 0x7f0402f9
+.field public static final singleChoiceItemLayout:I = 0x7f0402fc
 
-.field public static final singleLine:I = 0x7f0402fa
+.field public static final singleLine:I = 0x7f0402fd
 
-.field public static final singleSelection:I = 0x7f0402fb
+.field public static final singleSelection:I = 0x7f0402fe
 
-.field public static final snackbarButtonStyle:I = 0x7f0402fc
+.field public static final snackbarButtonStyle:I = 0x7f0402ff
 
-.field public static final snackbarStyle:I = 0x7f0402fd
+.field public static final snackbarStyle:I = 0x7f040300
 
-.field public static final spanCount:I = 0x7f0402fe
+.field public static final spanCount:I = 0x7f040301
 
-.field public static final spinBars:I = 0x7f0402ff
+.field public static final spinBars:I = 0x7f040302
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f040300
+.field public static final spinnerDropDownItemStyle:I = 0x7f040303
 
-.field public static final spinnerStyle:I = 0x7f040301
+.field public static final spinnerStyle:I = 0x7f040304
 
-.field public static final splitTrack:I = 0x7f040302
+.field public static final splitTrack:I = 0x7f040305
 
-.field public static final srcCompat:I = 0x7f040303
+.field public static final srcCompat:I = 0x7f040306
 
-.field public static final stackFromEnd:I = 0x7f040304
+.field public static final stackFromEnd:I = 0x7f040307
 
-.field public static final state_above_anchor:I = 0x7f040305
+.field public static final state_above_anchor:I = 0x7f040308
 
-.field public static final state_collapsed:I = 0x7f040306
+.field public static final state_collapsed:I = 0x7f040309
 
-.field public static final state_collapsible:I = 0x7f040307
+.field public static final state_collapsible:I = 0x7f04030a
 
-.field public static final state_liftable:I = 0x7f040308
+.field public static final state_liftable:I = 0x7f04030b
 
-.field public static final state_lifted:I = 0x7f040309
+.field public static final state_lifted:I = 0x7f04030c
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final statusBarScrim:I = 0x7f04030b
+.field public static final statusBarScrim:I = 0x7f04030e
 
-.field public static final strokeColor:I = 0x7f04030f
+.field public static final strokeColor:I = 0x7f040312
 
-.field public static final strokeWidth:I = 0x7f040310
+.field public static final strokeWidth:I = 0x7f040313
 
-.field public static final subMenuArrow:I = 0x7f040311
+.field public static final subMenuArrow:I = 0x7f040314
 
-.field public static final submitBackground:I = 0x7f040312
+.field public static final submitBackground:I = 0x7f040315
 
-.field public static final subtitle:I = 0x7f040313
+.field public static final subtitle:I = 0x7f040316
 
-.field public static final subtitleTextAppearance:I = 0x7f040314
+.field public static final subtitleTextAppearance:I = 0x7f040317
 
-.field public static final subtitleTextColor:I = 0x7f040315
+.field public static final subtitleTextColor:I = 0x7f040318
 
-.field public static final subtitleTextStyle:I = 0x7f040316
+.field public static final subtitleTextStyle:I = 0x7f040319
 
-.field public static final suggestionRowLayout:I = 0x7f040317
+.field public static final suggestionRowLayout:I = 0x7f04031a
 
-.field public static final switchMinWidth:I = 0x7f040318
+.field public static final switchMinWidth:I = 0x7f04031b
 
-.field public static final switchPadding:I = 0x7f040319
+.field public static final switchPadding:I = 0x7f04031c
 
-.field public static final switchStyle:I = 0x7f04031a
+.field public static final switchStyle:I = 0x7f04031d
 
-.field public static final switchTextAppearance:I = 0x7f04031b
+.field public static final switchTextAppearance:I = 0x7f04031e
 
-.field public static final tabBackground:I = 0x7f04031c
+.field public static final tabBackground:I = 0x7f04031f
 
-.field public static final tabContentStart:I = 0x7f04031d
+.field public static final tabContentStart:I = 0x7f040320
 
-.field public static final tabGravity:I = 0x7f04031e
+.field public static final tabGravity:I = 0x7f040321
 
-.field public static final tabIconTint:I = 0x7f04031f
+.field public static final tabIconTint:I = 0x7f040322
 
-.field public static final tabIconTintMode:I = 0x7f040320
+.field public static final tabIconTintMode:I = 0x7f040323
 
-.field public static final tabIndicator:I = 0x7f040321
+.field public static final tabIndicator:I = 0x7f040324
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f040322
+.field public static final tabIndicatorAnimationDuration:I = 0x7f040325
 
-.field public static final tabIndicatorColor:I = 0x7f040323
+.field public static final tabIndicatorColor:I = 0x7f040326
 
-.field public static final tabIndicatorFullWidth:I = 0x7f040324
+.field public static final tabIndicatorFullWidth:I = 0x7f040327
 
-.field public static final tabIndicatorGravity:I = 0x7f040325
+.field public static final tabIndicatorGravity:I = 0x7f040328
 
-.field public static final tabIndicatorHeight:I = 0x7f040326
+.field public static final tabIndicatorHeight:I = 0x7f040329
 
-.field public static final tabInlineLabel:I = 0x7f040327
+.field public static final tabInlineLabel:I = 0x7f04032a
 
-.field public static final tabMaxWidth:I = 0x7f040328
+.field public static final tabMaxWidth:I = 0x7f04032b
 
-.field public static final tabMinWidth:I = 0x7f040329
+.field public static final tabMinWidth:I = 0x7f04032c
 
-.field public static final tabMode:I = 0x7f04032a
+.field public static final tabMode:I = 0x7f04032d
 
-.field public static final tabPadding:I = 0x7f04032b
+.field public static final tabPadding:I = 0x7f04032e
 
-.field public static final tabPaddingBottom:I = 0x7f04032c
+.field public static final tabPaddingBottom:I = 0x7f04032f
 
-.field public static final tabPaddingEnd:I = 0x7f04032d
+.field public static final tabPaddingEnd:I = 0x7f040330
 
-.field public static final tabPaddingStart:I = 0x7f04032e
+.field public static final tabPaddingStart:I = 0x7f040331
 
-.field public static final tabPaddingTop:I = 0x7f04032f
+.field public static final tabPaddingTop:I = 0x7f040332
 
-.field public static final tabRippleColor:I = 0x7f040330
+.field public static final tabRippleColor:I = 0x7f040333
 
-.field public static final tabSelectedTextColor:I = 0x7f040331
+.field public static final tabSelectedTextColor:I = 0x7f040334
 
-.field public static final tabStyle:I = 0x7f040332
+.field public static final tabStyle:I = 0x7f040335
 
-.field public static final tabTextAppearance:I = 0x7f040333
+.field public static final tabTextAppearance:I = 0x7f040336
 
-.field public static final tabTextColor:I = 0x7f040334
+.field public static final tabTextColor:I = 0x7f040337
 
-.field public static final tabUnboundedRipple:I = 0x7f040335
+.field public static final tabUnboundedRipple:I = 0x7f040338
 
-.field public static final textAllCaps:I = 0x7f040339
+.field public static final textAllCaps:I = 0x7f04033c
 
-.field public static final textAppearanceBody1:I = 0x7f04033a
+.field public static final textAppearanceBody1:I = 0x7f04033d
 
-.field public static final textAppearanceBody2:I = 0x7f04033b
+.field public static final textAppearanceBody2:I = 0x7f04033e
 
-.field public static final textAppearanceButton:I = 0x7f04033c
+.field public static final textAppearanceButton:I = 0x7f04033f
 
-.field public static final textAppearanceCaption:I = 0x7f04033d
+.field public static final textAppearanceCaption:I = 0x7f040340
 
-.field public static final textAppearanceHeadline1:I = 0x7f04033e
+.field public static final textAppearanceHeadline1:I = 0x7f040341
 
-.field public static final textAppearanceHeadline2:I = 0x7f04033f
+.field public static final textAppearanceHeadline2:I = 0x7f040342
 
-.field public static final textAppearanceHeadline3:I = 0x7f040340
+.field public static final textAppearanceHeadline3:I = 0x7f040343
 
-.field public static final textAppearanceHeadline4:I = 0x7f040341
+.field public static final textAppearanceHeadline4:I = 0x7f040344
 
-.field public static final textAppearanceHeadline5:I = 0x7f040342
+.field public static final textAppearanceHeadline5:I = 0x7f040345
 
-.field public static final textAppearanceHeadline6:I = 0x7f040343
+.field public static final textAppearanceHeadline6:I = 0x7f040346
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040344
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040347
 
-.field public static final textAppearanceListItem:I = 0x7f040345
+.field public static final textAppearanceListItem:I = 0x7f040348
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040346
+.field public static final textAppearanceListItemSecondary:I = 0x7f040349
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040347
+.field public static final textAppearanceListItemSmall:I = 0x7f04034a
 
-.field public static final textAppearanceOverline:I = 0x7f040348
+.field public static final textAppearanceOverline:I = 0x7f04034b
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040349
+.field public static final textAppearancePopupMenuHeader:I = 0x7f04034c
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04034a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04034d
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04034b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04034e
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04034c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04034f
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04034d
+.field public static final textAppearanceSubtitle1:I = 0x7f040350
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04034e
+.field public static final textAppearanceSubtitle2:I = 0x7f040351
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04034f
+.field public static final textColorAlertDialogListItem:I = 0x7f040352
 
-.field public static final textColorSearchUrl:I = 0x7f040350
+.field public static final textColorSearchUrl:I = 0x7f040353
 
-.field public static final textEndPadding:I = 0x7f040351
+.field public static final textEndPadding:I = 0x7f040354
 
-.field public static final textInputStyle:I = 0x7f040352
+.field public static final textInputStyle:I = 0x7f040355
 
-.field public static final textStartPadding:I = 0x7f040353
+.field public static final textStartPadding:I = 0x7f040356
 
-.field public static final theme:I = 0x7f040355
+.field public static final theme:I = 0x7f040358
 
-.field public static final thickness:I = 0x7f0403a6
+.field public static final thickness:I = 0x7f0403a9
 
-.field public static final thumbTextPadding:I = 0x7f0403a7
+.field public static final thumbTextPadding:I = 0x7f0403aa
 
-.field public static final thumbTint:I = 0x7f0403a8
+.field public static final thumbTint:I = 0x7f0403ab
 
-.field public static final thumbTintMode:I = 0x7f0403a9
+.field public static final thumbTintMode:I = 0x7f0403ac
 
-.field public static final tickMark:I = 0x7f0403aa
+.field public static final tickMark:I = 0x7f0403ad
 
-.field public static final tickMarkTint:I = 0x7f0403ab
+.field public static final tickMarkTint:I = 0x7f0403ae
 
-.field public static final tickMarkTintMode:I = 0x7f0403ac
+.field public static final tickMarkTintMode:I = 0x7f0403af
 
-.field public static final tint:I = 0x7f0403ad
+.field public static final tint:I = 0x7f0403b0
 
-.field public static final tintMode:I = 0x7f0403ae
+.field public static final tintMode:I = 0x7f0403b1
 
-.field public static final title:I = 0x7f0403af
+.field public static final title:I = 0x7f0403b2
 
-.field public static final titleEnabled:I = 0x7f0403b0
+.field public static final titleEnabled:I = 0x7f0403b3
 
-.field public static final titleMargin:I = 0x7f0403b1
+.field public static final titleMargin:I = 0x7f0403b4
 
-.field public static final titleMarginBottom:I = 0x7f0403b2
+.field public static final titleMarginBottom:I = 0x7f0403b5
 
-.field public static final titleMarginEnd:I = 0x7f0403b3
+.field public static final titleMarginEnd:I = 0x7f0403b6
 
-.field public static final titleMarginStart:I = 0x7f0403b4
+.field public static final titleMarginStart:I = 0x7f0403b7
 
-.field public static final titleMarginTop:I = 0x7f0403b5
+.field public static final titleMarginTop:I = 0x7f0403b8
 
-.field public static final titleMargins:I = 0x7f0403b6
+.field public static final titleMargins:I = 0x7f0403b9
 
-.field public static final titleTextAppearance:I = 0x7f0403b7
+.field public static final titleTextAppearance:I = 0x7f0403ba
 
-.field public static final titleTextColor:I = 0x7f0403b8
+.field public static final titleTextColor:I = 0x7f0403bb
 
-.field public static final titleTextStyle:I = 0x7f0403b9
+.field public static final titleTextStyle:I = 0x7f0403bc
 
-.field public static final toolbarId:I = 0x7f0403ba
+.field public static final toolbarId:I = 0x7f0403bd
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f0403bb
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0403be
 
-.field public static final toolbarStyle:I = 0x7f0403bc
+.field public static final toolbarStyle:I = 0x7f0403bf
 
-.field public static final tooltipForegroundColor:I = 0x7f0403bd
+.field public static final tooltipForegroundColor:I = 0x7f0403c0
 
-.field public static final tooltipFrameBackground:I = 0x7f0403be
+.field public static final tooltipFrameBackground:I = 0x7f0403c1
 
-.field public static final tooltipText:I = 0x7f0403bf
+.field public static final tooltipText:I = 0x7f0403c2
 
-.field public static final track:I = 0x7f0403c0
+.field public static final track:I = 0x7f0403c3
 
-.field public static final trackTint:I = 0x7f0403c1
+.field public static final trackTint:I = 0x7f0403c4
 
-.field public static final trackTintMode:I = 0x7f0403c2
+.field public static final trackTintMode:I = 0x7f0403c5
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
-.field public static final useCompatPadding:I = 0x7f0403d7
+.field public static final useCompatPadding:I = 0x7f0403da
 
-.field public static final viewInflaterClass:I = 0x7f0403dc
+.field public static final viewInflaterClass:I = 0x7f0403e1
 
-.field public static final voiceIcon:I = 0x7f0403dd
+.field public static final voiceIcon:I = 0x7f0403e2
 
-.field public static final windowActionBar:I = 0x7f0403df
+.field public static final windowActionBar:I = 0x7f0403e4
 
-.field public static final windowActionBarOverlay:I = 0x7f0403e0
+.field public static final windowActionBarOverlay:I = 0x7f0403e5
 
-.field public static final windowActionModeOverlay:I = 0x7f0403e1
+.field public static final windowActionModeOverlay:I = 0x7f0403e6
 
-.field public static final windowFixedHeightMajor:I = 0x7f0403e2
+.field public static final windowFixedHeightMajor:I = 0x7f0403e7
 
-.field public static final windowFixedHeightMinor:I = 0x7f0403e3
+.field public static final windowFixedHeightMinor:I = 0x7f0403e8
 
-.field public static final windowFixedWidthMajor:I = 0x7f0403e4
+.field public static final windowFixedWidthMajor:I = 0x7f0403e9
 
-.field public static final windowFixedWidthMinor:I = 0x7f0403e5
+.field public static final windowFixedWidthMinor:I = 0x7f0403ea
 
-.field public static final windowMinWidthMajor:I = 0x7f0403e6
+.field public static final windowMinWidthMajor:I = 0x7f0403eb
 
-.field public static final windowMinWidthMinor:I = 0x7f0403e7
+.field public static final windowMinWidthMinor:I = 0x7f0403ec
 
-.field public static final windowNoTitle:I = 0x7f0403e8
+.field public static final windowNoTitle:I = 0x7f0403ed
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/material/R$color.smali b/com.discord/smali_classes2/com/google/android/material/R$color.smali
index 7ccc013cf5..ea7ec18ab7 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$color.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$color.smali
@@ -75,199 +75,199 @@
 
 .field public static final background_material_light:I = 0x7f06001f
 
-.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060035
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
 
-.field public static final bright_foreground_material_dark:I = 0x7f060038
+.field public static final bright_foreground_material_dark:I = 0x7f060039
 
-.field public static final bright_foreground_material_light:I = 0x7f060039
+.field public static final bright_foreground_material_light:I = 0x7f06003a
 
-.field public static final button_material_dark:I = 0x7f06003f
+.field public static final button_material_dark:I = 0x7f060040
 
-.field public static final button_material_light:I = 0x7f060040
+.field public static final button_material_light:I = 0x7f060041
 
-.field public static final cardview_dark_background:I = 0x7f060041
+.field public static final cardview_dark_background:I = 0x7f060042
 
-.field public static final cardview_light_background:I = 0x7f060042
+.field public static final cardview_light_background:I = 0x7f060043
 
-.field public static final cardview_shadow_end_color:I = 0x7f060043
+.field public static final cardview_shadow_end_color:I = 0x7f060044
 
-.field public static final cardview_shadow_start_color:I = 0x7f060044
+.field public static final cardview_shadow_start_color:I = 0x7f060045
 
-.field public static final design_bottom_navigation_shadow_color:I = 0x7f060059
+.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005c
 
-.field public static final design_default_color_primary:I = 0x7f06005a
+.field public static final design_default_color_primary:I = 0x7f06005d
 
-.field public static final design_default_color_primary_dark:I = 0x7f06005b
+.field public static final design_default_color_primary_dark:I = 0x7f06005e
 
-.field public static final design_error:I = 0x7f06005c
+.field public static final design_error:I = 0x7f06005f
 
-.field public static final design_fab_shadow_end_color:I = 0x7f06005d
+.field public static final design_fab_shadow_end_color:I = 0x7f060060
 
-.field public static final design_fab_shadow_mid_color:I = 0x7f06005e
+.field public static final design_fab_shadow_mid_color:I = 0x7f060061
 
-.field public static final design_fab_shadow_start_color:I = 0x7f06005f
+.field public static final design_fab_shadow_start_color:I = 0x7f060062
 
-.field public static final design_fab_stroke_end_inner_color:I = 0x7f060060
+.field public static final design_fab_stroke_end_inner_color:I = 0x7f060063
 
-.field public static final design_fab_stroke_end_outer_color:I = 0x7f060061
+.field public static final design_fab_stroke_end_outer_color:I = 0x7f060064
 
-.field public static final design_fab_stroke_top_inner_color:I = 0x7f060062
+.field public static final design_fab_stroke_top_inner_color:I = 0x7f060065
 
-.field public static final design_fab_stroke_top_outer_color:I = 0x7f060063
+.field public static final design_fab_stroke_top_outer_color:I = 0x7f060066
 
-.field public static final design_snackbar_background_color:I = 0x7f060064
+.field public static final design_snackbar_background_color:I = 0x7f060067
 
-.field public static final design_tint_password_toggle:I = 0x7f060065
+.field public static final design_tint_password_toggle:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060066
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060067
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f060068
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f060069
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final error_color_material_dark:I = 0x7f06006a
+.field public static final error_color_material_dark:I = 0x7f06006d
 
-.field public static final error_color_material_light:I = 0x7f06006b
+.field public static final error_color_material_light:I = 0x7f06006e
 
-.field public static final foreground_material_dark:I = 0x7f060070
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060071
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060080
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060081
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f06008f
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060090
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060091
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060092
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060093
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060094
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060095
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060096
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060097
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f060098
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f060099
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009a
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009b
+.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009e
 
-.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009c
+.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009f
 
-.field public static final mtrl_btn_bg_color_disabled:I = 0x7f06009d
+.field public static final mtrl_btn_bg_color_disabled:I = 0x7f0600a0
 
-.field public static final mtrl_btn_bg_color_selector:I = 0x7f06009e
+.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a1
 
-.field public static final mtrl_btn_ripple_color:I = 0x7f06009f
+.field public static final mtrl_btn_ripple_color:I = 0x7f0600a2
 
-.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a0
+.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a3
 
-.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a1
+.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a4
 
-.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a2
+.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a5
 
-.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a3
+.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a6
 
-.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a4
+.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a7
 
-.field public static final mtrl_chip_background_color:I = 0x7f0600a5
+.field public static final mtrl_chip_background_color:I = 0x7f0600a8
 
-.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a6
+.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a9
 
-.field public static final mtrl_chip_ripple_color:I = 0x7f0600a7
+.field public static final mtrl_chip_ripple_color:I = 0x7f0600aa
 
-.field public static final mtrl_chip_text_color:I = 0x7f0600a8
+.field public static final mtrl_chip_text_color:I = 0x7f0600ab
 
-.field public static final mtrl_fab_ripple_color:I = 0x7f0600a9
+.field public static final mtrl_fab_ripple_color:I = 0x7f0600ac
 
-.field public static final mtrl_scrim_color:I = 0x7f0600aa
+.field public static final mtrl_scrim_color:I = 0x7f0600ad
 
-.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ab
+.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ae
 
-.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600ac
+.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600af
 
-.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600ad
+.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600b0
 
-.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600ae
+.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b1
 
-.field public static final mtrl_tabs_ripple_color:I = 0x7f0600af
+.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b2
 
-.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b0
+.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b3
 
-.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b1
+.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b4
 
-.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b2
+.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b5
 
-.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b3
+.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b6
 
-.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b4
+.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b7
 
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final primary_dark_material_dark:I = 0x7f0600d9
+.field public static final primary_dark_material_dark:I = 0x7f0600dc
 
-.field public static final primary_dark_material_light:I = 0x7f0600da
+.field public static final primary_dark_material_light:I = 0x7f0600dd
 
-.field public static final primary_material_dark:I = 0x7f0600ea
+.field public static final primary_material_dark:I = 0x7f0600ed
 
-.field public static final primary_material_light:I = 0x7f0600eb
+.field public static final primary_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ec
+.field public static final primary_text_default_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ed
+.field public static final primary_text_default_material_light:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ee
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f1
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f2
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fb
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600ff
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f060100
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060133
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060134
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060136
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060137
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/material/R$dimen.smali b/com.discord/smali_classes2/com/google/android/material/R$dimen.smali
index 58aa0621b0..f15662a781 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$dimen.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$dimen.smali
@@ -185,265 +185,265 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final design_appbar_elevation:I = 0x7f070080
+.field public static final design_appbar_elevation:I = 0x7f070081
 
-.field public static final design_bottom_navigation_active_item_max_width:I = 0x7f070081
+.field public static final design_bottom_navigation_active_item_max_width:I = 0x7f070082
 
-.field public static final design_bottom_navigation_active_item_min_width:I = 0x7f070082
+.field public static final design_bottom_navigation_active_item_min_width:I = 0x7f070083
 
-.field public static final design_bottom_navigation_active_text_size:I = 0x7f070083
+.field public static final design_bottom_navigation_active_text_size:I = 0x7f070084
 
-.field public static final design_bottom_navigation_elevation:I = 0x7f070084
+.field public static final design_bottom_navigation_elevation:I = 0x7f070085
 
-.field public static final design_bottom_navigation_height:I = 0x7f070085
+.field public static final design_bottom_navigation_height:I = 0x7f070086
 
-.field public static final design_bottom_navigation_icon_size:I = 0x7f070086
+.field public static final design_bottom_navigation_icon_size:I = 0x7f070087
 
-.field public static final design_bottom_navigation_item_max_width:I = 0x7f070087
+.field public static final design_bottom_navigation_item_max_width:I = 0x7f070088
 
-.field public static final design_bottom_navigation_item_min_width:I = 0x7f070088
+.field public static final design_bottom_navigation_item_min_width:I = 0x7f070089
 
-.field public static final design_bottom_navigation_margin:I = 0x7f070089
+.field public static final design_bottom_navigation_margin:I = 0x7f07008a
 
-.field public static final design_bottom_navigation_shadow_height:I = 0x7f07008a
+.field public static final design_bottom_navigation_shadow_height:I = 0x7f07008b
 
-.field public static final design_bottom_navigation_text_size:I = 0x7f07008b
+.field public static final design_bottom_navigation_text_size:I = 0x7f07008c
 
-.field public static final design_bottom_sheet_modal_elevation:I = 0x7f07008c
+.field public static final design_bottom_sheet_modal_elevation:I = 0x7f07008d
 
-.field public static final design_bottom_sheet_peek_height_min:I = 0x7f07008d
+.field public static final design_bottom_sheet_peek_height_min:I = 0x7f07008e
 
-.field public static final design_fab_border_width:I = 0x7f07008e
+.field public static final design_fab_border_width:I = 0x7f07008f
 
-.field public static final design_fab_elevation:I = 0x7f07008f
+.field public static final design_fab_elevation:I = 0x7f070090
 
-.field public static final design_fab_image_size:I = 0x7f070090
+.field public static final design_fab_image_size:I = 0x7f070091
 
-.field public static final design_fab_size_mini:I = 0x7f070091
+.field public static final design_fab_size_mini:I = 0x7f070092
 
-.field public static final design_fab_size_normal:I = 0x7f070092
+.field public static final design_fab_size_normal:I = 0x7f070093
 
-.field public static final design_fab_translation_z_hovered_focused:I = 0x7f070093
+.field public static final design_fab_translation_z_hovered_focused:I = 0x7f070094
 
-.field public static final design_fab_translation_z_pressed:I = 0x7f070094
+.field public static final design_fab_translation_z_pressed:I = 0x7f070095
 
-.field public static final design_navigation_elevation:I = 0x7f070095
+.field public static final design_navigation_elevation:I = 0x7f070096
 
-.field public static final design_navigation_icon_padding:I = 0x7f070096
+.field public static final design_navigation_icon_padding:I = 0x7f070097
 
-.field public static final design_navigation_icon_size:I = 0x7f070097
+.field public static final design_navigation_icon_size:I = 0x7f070098
 
-.field public static final design_navigation_item_horizontal_padding:I = 0x7f070098
+.field public static final design_navigation_item_horizontal_padding:I = 0x7f070099
 
-.field public static final design_navigation_item_icon_padding:I = 0x7f070099
+.field public static final design_navigation_item_icon_padding:I = 0x7f07009a
 
-.field public static final design_navigation_max_width:I = 0x7f07009a
+.field public static final design_navigation_max_width:I = 0x7f07009b
 
-.field public static final design_navigation_padding_bottom:I = 0x7f07009b
+.field public static final design_navigation_padding_bottom:I = 0x7f07009c
 
-.field public static final design_navigation_separator_vertical_padding:I = 0x7f07009c
+.field public static final design_navigation_separator_vertical_padding:I = 0x7f07009d
 
-.field public static final design_snackbar_action_inline_max_width:I = 0x7f07009d
+.field public static final design_snackbar_action_inline_max_width:I = 0x7f07009e
 
-.field public static final design_snackbar_background_corner_radius:I = 0x7f07009e
+.field public static final design_snackbar_background_corner_radius:I = 0x7f07009f
 
-.field public static final design_snackbar_elevation:I = 0x7f07009f
+.field public static final design_snackbar_elevation:I = 0x7f0700a0
 
-.field public static final design_snackbar_extra_spacing_horizontal:I = 0x7f0700a0
+.field public static final design_snackbar_extra_spacing_horizontal:I = 0x7f0700a1
 
-.field public static final design_snackbar_max_width:I = 0x7f0700a1
+.field public static final design_snackbar_max_width:I = 0x7f0700a2
 
-.field public static final design_snackbar_min_width:I = 0x7f0700a2
+.field public static final design_snackbar_min_width:I = 0x7f0700a3
 
-.field public static final design_snackbar_padding_horizontal:I = 0x7f0700a3
+.field public static final design_snackbar_padding_horizontal:I = 0x7f0700a4
 
-.field public static final design_snackbar_padding_vertical:I = 0x7f0700a4
+.field public static final design_snackbar_padding_vertical:I = 0x7f0700a5
 
-.field public static final design_snackbar_padding_vertical_2lines:I = 0x7f0700a5
+.field public static final design_snackbar_padding_vertical_2lines:I = 0x7f0700a6
 
-.field public static final design_snackbar_text_size:I = 0x7f0700a6
+.field public static final design_snackbar_text_size:I = 0x7f0700a7
 
-.field public static final design_tab_max_width:I = 0x7f0700a7
+.field public static final design_tab_max_width:I = 0x7f0700a8
 
-.field public static final design_tab_scrollable_min_width:I = 0x7f0700a8
+.field public static final design_tab_scrollable_min_width:I = 0x7f0700a9
 
-.field public static final design_tab_text_size:I = 0x7f0700a9
+.field public static final design_tab_text_size:I = 0x7f0700aa
 
-.field public static final design_tab_text_size_2line:I = 0x7f0700aa
+.field public static final design_tab_text_size_2line:I = 0x7f0700ab
 
-.field public static final design_textinput_caption_translate_y:I = 0x7f0700ab
+.field public static final design_textinput_caption_translate_y:I = 0x7f0700ac
 
-.field public static final disabled_alpha_material_dark:I = 0x7f0700b1
+.field public static final disabled_alpha_material_dark:I = 0x7f0700b2
 
-.field public static final disabled_alpha_material_light:I = 0x7f0700b2
+.field public static final disabled_alpha_material_light:I = 0x7f0700b3
 
-.field public static final fastscroll_default_thickness:I = 0x7f0700b8
+.field public static final fastscroll_default_thickness:I = 0x7f0700ba
 
-.field public static final fastscroll_margin:I = 0x7f0700b9
+.field public static final fastscroll_margin:I = 0x7f0700bb
 
-.field public static final fastscroll_minimum_range:I = 0x7f0700ba
+.field public static final fastscroll_minimum_range:I = 0x7f0700bc
 
-.field public static final highlight_alpha_material_colored:I = 0x7f0700c4
+.field public static final highlight_alpha_material_colored:I = 0x7f0700c6
 
-.field public static final highlight_alpha_material_dark:I = 0x7f0700c5
+.field public static final highlight_alpha_material_dark:I = 0x7f0700c7
 
-.field public static final highlight_alpha_material_light:I = 0x7f0700c6
+.field public static final highlight_alpha_material_light:I = 0x7f0700c8
 
-.field public static final hint_alpha_material_dark:I = 0x7f0700c7
+.field public static final hint_alpha_material_dark:I = 0x7f0700c9
 
-.field public static final hint_alpha_material_light:I = 0x7f0700c8
+.field public static final hint_alpha_material_light:I = 0x7f0700ca
 
-.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700c9
+.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700cb
 
-.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ca
+.field public static final hint_pressed_alpha_material_light:I = 0x7f0700cc
 
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700cc
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700ce
 
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700cd
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700cf
 
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700ce
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d0
 
-.field public static final mtrl_bottomappbar_fabOffsetEndMode:I = 0x7f0700d8
+.field public static final mtrl_bottomappbar_fabOffsetEndMode:I = 0x7f0700da
 
-.field public static final mtrl_bottomappbar_fab_cradle_margin:I = 0x7f0700d9
+.field public static final mtrl_bottomappbar_fab_cradle_margin:I = 0x7f0700db
 
-.field public static final mtrl_bottomappbar_fab_cradle_rounded_corner_radius:I = 0x7f0700da
+.field public static final mtrl_bottomappbar_fab_cradle_rounded_corner_radius:I = 0x7f0700dc
 
-.field public static final mtrl_bottomappbar_fab_cradle_vertical_offset:I = 0x7f0700db
+.field public static final mtrl_bottomappbar_fab_cradle_vertical_offset:I = 0x7f0700dd
 
-.field public static final mtrl_bottomappbar_height:I = 0x7f0700dc
+.field public static final mtrl_bottomappbar_height:I = 0x7f0700de
 
-.field public static final mtrl_btn_corner_radius:I = 0x7f0700dd
+.field public static final mtrl_btn_corner_radius:I = 0x7f0700df
 
-.field public static final mtrl_btn_dialog_btn_min_width:I = 0x7f0700de
+.field public static final mtrl_btn_dialog_btn_min_width:I = 0x7f0700e0
 
-.field public static final mtrl_btn_disabled_elevation:I = 0x7f0700df
+.field public static final mtrl_btn_disabled_elevation:I = 0x7f0700e1
 
-.field public static final mtrl_btn_disabled_z:I = 0x7f0700e0
+.field public static final mtrl_btn_disabled_z:I = 0x7f0700e2
 
-.field public static final mtrl_btn_elevation:I = 0x7f0700e1
+.field public static final mtrl_btn_elevation:I = 0x7f0700e3
 
-.field public static final mtrl_btn_focused_z:I = 0x7f0700e2
+.field public static final mtrl_btn_focused_z:I = 0x7f0700e4
 
-.field public static final mtrl_btn_hovered_z:I = 0x7f0700e3
+.field public static final mtrl_btn_hovered_z:I = 0x7f0700e5
 
-.field public static final mtrl_btn_icon_btn_padding_left:I = 0x7f0700e4
+.field public static final mtrl_btn_icon_btn_padding_left:I = 0x7f0700e6
 
-.field public static final mtrl_btn_icon_padding:I = 0x7f0700e5
+.field public static final mtrl_btn_icon_padding:I = 0x7f0700e7
 
-.field public static final mtrl_btn_inset:I = 0x7f0700e6
+.field public static final mtrl_btn_inset:I = 0x7f0700e8
 
-.field public static final mtrl_btn_letter_spacing:I = 0x7f0700e7
+.field public static final mtrl_btn_letter_spacing:I = 0x7f0700e9
 
-.field public static final mtrl_btn_padding_bottom:I = 0x7f0700e8
+.field public static final mtrl_btn_padding_bottom:I = 0x7f0700ea
 
-.field public static final mtrl_btn_padding_left:I = 0x7f0700e9
+.field public static final mtrl_btn_padding_left:I = 0x7f0700eb
 
-.field public static final mtrl_btn_padding_right:I = 0x7f0700ea
+.field public static final mtrl_btn_padding_right:I = 0x7f0700ec
 
-.field public static final mtrl_btn_padding_top:I = 0x7f0700eb
+.field public static final mtrl_btn_padding_top:I = 0x7f0700ed
 
-.field public static final mtrl_btn_pressed_z:I = 0x7f0700ec
+.field public static final mtrl_btn_pressed_z:I = 0x7f0700ee
 
-.field public static final mtrl_btn_stroke_size:I = 0x7f0700ed
+.field public static final mtrl_btn_stroke_size:I = 0x7f0700ef
 
-.field public static final mtrl_btn_text_btn_icon_padding:I = 0x7f0700ee
+.field public static final mtrl_btn_text_btn_icon_padding:I = 0x7f0700f0
 
-.field public static final mtrl_btn_text_btn_padding_left:I = 0x7f0700ef
+.field public static final mtrl_btn_text_btn_padding_left:I = 0x7f0700f1
 
-.field public static final mtrl_btn_text_btn_padding_right:I = 0x7f0700f0
+.field public static final mtrl_btn_text_btn_padding_right:I = 0x7f0700f2
 
-.field public static final mtrl_btn_text_size:I = 0x7f0700f1
+.field public static final mtrl_btn_text_size:I = 0x7f0700f3
 
-.field public static final mtrl_btn_z:I = 0x7f0700f2
+.field public static final mtrl_btn_z:I = 0x7f0700f4
 
-.field public static final mtrl_card_elevation:I = 0x7f0700f3
+.field public static final mtrl_card_elevation:I = 0x7f0700f5
 
-.field public static final mtrl_card_spacing:I = 0x7f0700f4
+.field public static final mtrl_card_spacing:I = 0x7f0700f6
 
-.field public static final mtrl_chip_pressed_translation_z:I = 0x7f0700f5
+.field public static final mtrl_chip_pressed_translation_z:I = 0x7f0700f7
 
-.field public static final mtrl_chip_text_size:I = 0x7f0700f6
+.field public static final mtrl_chip_text_size:I = 0x7f0700f8
 
-.field public static final mtrl_fab_elevation:I = 0x7f0700f7
+.field public static final mtrl_fab_elevation:I = 0x7f0700f9
 
-.field public static final mtrl_fab_translation_z_hovered_focused:I = 0x7f0700f8
+.field public static final mtrl_fab_translation_z_hovered_focused:I = 0x7f0700fa
 
-.field public static final mtrl_fab_translation_z_pressed:I = 0x7f0700f9
+.field public static final mtrl_fab_translation_z_pressed:I = 0x7f0700fb
 
-.field public static final mtrl_navigation_elevation:I = 0x7f0700fa
+.field public static final mtrl_navigation_elevation:I = 0x7f0700fc
 
-.field public static final mtrl_navigation_item_horizontal_padding:I = 0x7f0700fb
+.field public static final mtrl_navigation_item_horizontal_padding:I = 0x7f0700fd
 
-.field public static final mtrl_navigation_item_icon_padding:I = 0x7f0700fc
+.field public static final mtrl_navigation_item_icon_padding:I = 0x7f0700fe
 
-.field public static final mtrl_snackbar_background_corner_radius:I = 0x7f0700fd
+.field public static final mtrl_snackbar_background_corner_radius:I = 0x7f0700ff
 
-.field public static final mtrl_snackbar_margin:I = 0x7f0700fe
+.field public static final mtrl_snackbar_margin:I = 0x7f070100
 
-.field public static final mtrl_textinput_box_bottom_offset:I = 0x7f0700ff
+.field public static final mtrl_textinput_box_bottom_offset:I = 0x7f070101
 
-.field public static final mtrl_textinput_box_corner_radius_medium:I = 0x7f070100
+.field public static final mtrl_textinput_box_corner_radius_medium:I = 0x7f070102
 
-.field public static final mtrl_textinput_box_corner_radius_small:I = 0x7f070101
+.field public static final mtrl_textinput_box_corner_radius_small:I = 0x7f070103
 
-.field public static final mtrl_textinput_box_label_cutout_padding:I = 0x7f070102
+.field public static final mtrl_textinput_box_label_cutout_padding:I = 0x7f070104
 
-.field public static final mtrl_textinput_box_padding_end:I = 0x7f070103
+.field public static final mtrl_textinput_box_padding_end:I = 0x7f070105
 
-.field public static final mtrl_textinput_box_stroke_width_default:I = 0x7f070104
+.field public static final mtrl_textinput_box_stroke_width_default:I = 0x7f070106
 
-.field public static final mtrl_textinput_box_stroke_width_focused:I = 0x7f070105
+.field public static final mtrl_textinput_box_stroke_width_focused:I = 0x7f070107
 
-.field public static final mtrl_textinput_outline_box_expanded_padding:I = 0x7f070106
+.field public static final mtrl_textinput_outline_box_expanded_padding:I = 0x7f070108
 
-.field public static final mtrl_toolbar_default_height:I = 0x7f070107
+.field public static final mtrl_toolbar_default_height:I = 0x7f070109
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
-.field public static final tooltip_corner_radius:I = 0x7f07012b
+.field public static final tooltip_corner_radius:I = 0x7f07012d
 
-.field public static final tooltip_horizontal_padding:I = 0x7f07012c
+.field public static final tooltip_horizontal_padding:I = 0x7f07012e
 
-.field public static final tooltip_margin:I = 0x7f07012d
+.field public static final tooltip_margin:I = 0x7f07012f
 
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07012e
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f070130
 
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07012f
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f070131
 
-.field public static final tooltip_vertical_padding:I = 0x7f070130
+.field public static final tooltip_vertical_padding:I = 0x7f070132
 
-.field public static final tooltip_y_offset_non_touch:I = 0x7f070131
+.field public static final tooltip_y_offset_non_touch:I = 0x7f070133
 
-.field public static final tooltip_y_offset_touch:I = 0x7f070132
+.field public static final tooltip_y_offset_touch:I = 0x7f070134
 
 
 # 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 924ff79353..50a38ddcce 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
@@ -15,229 +15,229 @@
 
 
 # static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080017
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080017
+.field public static final abc_action_bar_item_background_material:I = 0x7f080018
 
-.field public static final abc_btn_borderless_material:I = 0x7f080018
+.field public static final abc_btn_borderless_material:I = 0x7f080019
 
-.field public static final abc_btn_check_material:I = 0x7f080019
+.field public static final abc_btn_check_material:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
 
-.field public static final abc_btn_colored_material:I = 0x7f08001c
+.field public static final abc_btn_colored_material:I = 0x7f08001d
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
 
-.field public static final abc_btn_radio_material:I = 0x7f08001e
+.field public static final abc_btn_radio_material:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080023
+.field public static final abc_cab_background_internal_bg:I = 0x7f080024
 
-.field public static final abc_cab_background_top_material:I = 0x7f080024
+.field public static final abc_cab_background_top_material:I = 0x7f080025
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
 
-.field public static final abc_control_background_material:I = 0x7f080026
+.field public static final abc_control_background_material:I = 0x7f080027
 
-.field public static final abc_dialog_material_background:I = 0x7f080027
+.field public static final abc_dialog_material_background:I = 0x7f080028
 
-.field public static final abc_edit_text_material:I = 0x7f080028
+.field public static final abc_edit_text_material:I = 0x7f080029
 
-.field public static final abc_ic_ab_back_material:I = 0x7f080029
+.field public static final abc_ic_ab_back_material:I = 0x7f08002a
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
 
-.field public static final abc_ic_clear_material:I = 0x7f08002b
+.field public static final abc_ic_clear_material:I = 0x7f08002c
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
 
-.field public static final abc_ic_search_api_material:I = 0x7f080034
+.field public static final abc_ic_search_api_material:I = 0x7f080035
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080035
+.field public static final abc_ic_star_black_16dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080036
+.field public static final abc_ic_star_black_36dp:I = 0x7f080037
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080037
+.field public static final abc_ic_star_black_48dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003c
+.field public static final abc_item_background_holo_dark:I = 0x7f08003d
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003d
+.field public static final abc_item_background_holo_light:I = 0x7f08003e
 
-.field public static final abc_list_divider_material:I = 0x7f08003e
+.field public static final abc_list_divider_material:I = 0x7f08003f
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
 
-.field public static final abc_list_focused_holo:I = 0x7f080040
+.field public static final abc_list_focused_holo:I = 0x7f080041
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080041
+.field public static final abc_list_longpressed_holo:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080043
+.field public static final abc_list_pressed_holo_light:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080048
+.field public static final abc_list_selector_holo_dark:I = 0x7f080049
 
-.field public static final abc_list_selector_holo_light:I = 0x7f080049
+.field public static final abc_list_selector_holo_light:I = 0x7f08004a
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_material:I = 0x7f08004d
+.field public static final abc_ratingbar_material:I = 0x7f08004e
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004e
+.field public static final abc_ratingbar_small_material:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080054
+.field public static final abc_seekbar_thumb_material:I = 0x7f080055
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
 
-.field public static final abc_seekbar_track_material:I = 0x7f080056
+.field public static final abc_seekbar_track_material:I = 0x7f080057
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
 
-.field public static final abc_switch_thumb_material:I = 0x7f080059
+.field public static final abc_switch_thumb_material:I = 0x7f08005a
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005b
+.field public static final abc_tab_indicator_material:I = 0x7f08005c
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
 
-.field public static final abc_text_cursor_material:I = 0x7f08005d
+.field public static final abc_text_cursor_material:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
 
-.field public static final abc_textfield_search_material:I = 0x7f080068
+.field public static final abc_textfield_search_material:I = 0x7f080069
 
-.field public static final abc_vector_test:I = 0x7f080069
+.field public static final abc_vector_test:I = 0x7f08006a
 
-.field public static final avd_hide_password:I = 0x7f080089
+.field public static final avd_hide_password:I = 0x7f08008a
 
-.field public static final avd_show_password:I = 0x7f08008a
+.field public static final avd_show_password:I = 0x7f08008b
 
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800b2
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
 
-.field public static final design_fab_background:I = 0x7f0800b3
+.field public static final design_fab_background:I = 0x7f0800b6
 
-.field public static final design_ic_visibility:I = 0x7f0800b4
+.field public static final design_ic_visibility:I = 0x7f0800b7
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b5
+.field public static final design_ic_visibility_off:I = 0x7f0800b8
 
-.field public static final design_password_eye:I = 0x7f0800b6
+.field public static final design_password_eye:I = 0x7f0800b9
 
-.field public static final design_snackbar_background:I = 0x7f0800b7
+.field public static final design_snackbar_background:I = 0x7f0800ba
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802f0
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080300
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802f1
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080301
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802f2
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080302
 
-.field public static final mtrl_snackbar_background:I = 0x7f080439
+.field public static final mtrl_snackbar_background:I = 0x7f080454
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f08043a
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080455
 
-.field public static final navigation_empty_icon:I = 0x7f08043b
+.field public static final navigation_empty_icon:I = 0x7f080456
 
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
-.field public static final tooltip_frame_dark:I = 0x7f08044c
+.field public static final tooltip_frame_dark:I = 0x7f08046a
 
-.field public static final tooltip_frame_light:I = 0x7f08044d
+.field public static final tooltip_frame_light:I = 0x7f08046b
 
 
 # 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 013d9ff87b..ab592d30f7 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
@@ -57,267 +57,267 @@
 
 .field public static final alertTitle:I = 0x7f0a0061
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final auto:I = 0x7f0a00b8
+.field public static final auto:I = 0x7f0a00b9
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final buttonPanel:I = 0x7f0a010c
+.field public static final buttonPanel:I = 0x7f0a010d
 
-.field public static final center:I = 0x7f0a0123
+.field public static final center:I = 0x7f0a0124
 
-.field public static final checkbox:I = 0x7f0a0212
+.field public static final checkbox:I = 0x7f0a0213
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final container:I = 0x7f0a0231
+.field public static final container:I = 0x7f0a0232
 
-.field public static final content:I = 0x7f0a0232
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0233
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final coordinator:I = 0x7f0a0237
+.field public static final coordinator:I = 0x7f0a0238
 
-.field public static final custom:I = 0x7f0a0247
+.field public static final custom:I = 0x7f0a0250
 
-.field public static final customPanel:I = 0x7f0a0248
+.field public static final customPanel:I = 0x7f0a0251
 
-.field public static final decor_content_parent:I = 0x7f0a024c
+.field public static final decor_content_parent:I = 0x7f0a0255
 
-.field public static final default_activity_button:I = 0x7f0a024d
+.field public static final default_activity_button:I = 0x7f0a0256
 
-.field public static final design_bottom_sheet:I = 0x7f0a024e
+.field public static final design_bottom_sheet:I = 0x7f0a0257
 
-.field public static final design_menu_item_action_area:I = 0x7f0a024f
+.field public static final design_menu_item_action_area:I = 0x7f0a0258
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a0250
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a0259
 
-.field public static final design_menu_item_text:I = 0x7f0a0251
+.field public static final design_menu_item_text:I = 0x7f0a025a
 
-.field public static final design_navigation_view:I = 0x7f0a0252
+.field public static final design_navigation_view:I = 0x7f0a025b
 
-.field public static final edit_query:I = 0x7f0a02a3
+.field public static final edit_query:I = 0x7f0a02ac
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final expand_activities_button:I = 0x7f0a02c4
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02c5
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final fill:I = 0x7f0a02d9
+.field public static final fill:I = 0x7f0a02e2
 
-.field public static final filled:I = 0x7f0a02dc
+.field public static final filled:I = 0x7f0a02e5
 
-.field public static final fixed:I = 0x7f0a02e2
+.field public static final fixed:I = 0x7f0a02eb
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final ghost_view:I = 0x7f0a030f
+.field public static final ghost_view:I = 0x7f0a0314
 
-.field public static final group_divider:I = 0x7f0a0322
+.field public static final group_divider:I = 0x7f0a032b
 
-.field public static final home:I = 0x7f0a0382
+.field public static final home:I = 0x7f0a0392
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final image:I = 0x7f0a0388
+.field public static final image:I = 0x7f0a0398
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a03fa
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040a
 
-.field public static final labeled:I = 0x7f0a0401
+.field public static final labeled:I = 0x7f0a0411
 
-.field public static final largeLabel:I = 0x7f0a0402
+.field public static final largeLabel:I = 0x7f0a0412
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final listMode:I = 0x7f0a040d
+.field public static final listMode:I = 0x7f0a041d
 
-.field public static final list_item:I = 0x7f0a040e
+.field public static final list_item:I = 0x7f0a041e
 
-.field public static final masked:I = 0x7f0a042b
+.field public static final masked:I = 0x7f0a043b
 
-.field public static final message:I = 0x7f0a046f
+.field public static final message:I = 0x7f0a0482
 
-.field public static final mini:I = 0x7f0a0474
+.field public static final mini:I = 0x7f0a0487
 
-.field public static final mtrl_child_content_container:I = 0x7f0a0475
+.field public static final mtrl_child_content_container:I = 0x7f0a0488
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0476
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0489
 
-.field public static final multiply:I = 0x7f0a0477
+.field public static final multiply:I = 0x7f0a048a
 
-.field public static final navigation_header_container:I = 0x7f0a0479
+.field public static final navigation_header_container:I = 0x7f0a048c
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final outline:I = 0x7f0a04b2
+.field public static final outline:I = 0x7f0a04c8
 
-.field public static final parallax:I = 0x7f0a04c1
+.field public static final parallax:I = 0x7f0a04d7
 
-.field public static final parentPanel:I = 0x7f0a04c3
+.field public static final parentPanel:I = 0x7f0a04d9
 
-.field public static final parent_matrix:I = 0x7f0a04c4
+.field public static final parent_matrix:I = 0x7f0a04da
 
-.field public static final pin:I = 0x7f0a0500
+.field public static final pin:I = 0x7f0a0517
 
-.field public static final progress_circular:I = 0x7f0a0543
+.field public static final progress_circular:I = 0x7f0a0553
 
-.field public static final progress_horizontal:I = 0x7f0a0545
+.field public static final progress_horizontal:I = 0x7f0a0555
 
-.field public static final radio:I = 0x7f0a0550
+.field public static final radio:I = 0x7f0a0560
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final save_image_matrix:I = 0x7f0a0596
+.field public static final save_image_matrix:I = 0x7f0a05b0
 
-.field public static final save_non_transition_alpha:I = 0x7f0a0597
+.field public static final save_non_transition_alpha:I = 0x7f0a05b1
 
-.field public static final save_scale_type:I = 0x7f0a0598
+.field public static final save_scale_type:I = 0x7f0a05b2
 
-.field public static final screen:I = 0x7f0a059a
+.field public static final screen:I = 0x7f0a05b4
 
-.field public static final scrollIndicatorDown:I = 0x7f0a059c
+.field public static final scrollIndicatorDown:I = 0x7f0a05b6
 
-.field public static final scrollIndicatorUp:I = 0x7f0a059d
+.field public static final scrollIndicatorUp:I = 0x7f0a05b7
 
-.field public static final scrollView:I = 0x7f0a059e
+.field public static final scrollView:I = 0x7f0a05b8
 
-.field public static final scrollable:I = 0x7f0a05a0
+.field public static final scrollable:I = 0x7f0a05ba
 
-.field public static final search_badge:I = 0x7f0a05a2
+.field public static final search_badge:I = 0x7f0a05bc
 
-.field public static final search_bar:I = 0x7f0a05a3
+.field public static final search_bar:I = 0x7f0a05bd
 
-.field public static final search_button:I = 0x7f0a05a4
+.field public static final search_button:I = 0x7f0a05be
 
-.field public static final search_close_btn:I = 0x7f0a05a6
+.field public static final search_close_btn:I = 0x7f0a05c0
 
-.field public static final search_edit_frame:I = 0x7f0a05a7
+.field public static final search_edit_frame:I = 0x7f0a05c1
 
-.field public static final search_go_btn:I = 0x7f0a05aa
+.field public static final search_go_btn:I = 0x7f0a05c4
 
-.field public static final search_mag_icon:I = 0x7f0a05ac
+.field public static final search_mag_icon:I = 0x7f0a05c6
 
-.field public static final search_plate:I = 0x7f0a05ad
+.field public static final search_plate:I = 0x7f0a05c7
 
-.field public static final search_src_text:I = 0x7f0a05b0
+.field public static final search_src_text:I = 0x7f0a05ca
 
-.field public static final search_voice_btn:I = 0x7f0a05bc
+.field public static final search_voice_btn:I = 0x7f0a05d6
 
-.field public static final select_dialog_listview:I = 0x7f0a05bd
+.field public static final select_dialog_listview:I = 0x7f0a05d7
 
-.field public static final selected:I = 0x7f0a05be
+.field public static final selected:I = 0x7f0a05d8
 
-.field public static final shortcut:I = 0x7f0a06f7
+.field public static final shortcut:I = 0x7f0a0711
 
-.field public static final smallLabel:I = 0x7f0a06fb
+.field public static final smallLabel:I = 0x7f0a0715
 
-.field public static final snackbar_action:I = 0x7f0a06fc
+.field public static final snackbar_action:I = 0x7f0a0716
 
-.field public static final snackbar_text:I = 0x7f0a06fd
+.field public static final snackbar_text:I = 0x7f0a0717
 
-.field public static final spacer:I = 0x7f0a0703
+.field public static final spacer:I = 0x7f0a071d
 
-.field public static final split_action_bar:I = 0x7f0a0704
+.field public static final split_action_bar:I = 0x7f0a0724
 
-.field public static final src_atop:I = 0x7f0a0707
+.field public static final src_atop:I = 0x7f0a0727
 
-.field public static final src_in:I = 0x7f0a0708
+.field public static final src_in:I = 0x7f0a0728
 
-.field public static final src_over:I = 0x7f0a0709
+.field public static final src_over:I = 0x7f0a0729
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final stretch:I = 0x7f0a0723
+.field public static final stretch:I = 0x7f0a074c
 
-.field public static final submenuarrow:I = 0x7f0a0724
+.field public static final submenuarrow:I = 0x7f0a074d
 
-.field public static final submit_area:I = 0x7f0a0725
+.field public static final submit_area:I = 0x7f0a074e
 
-.field public static final tabMode:I = 0x7f0a0731
+.field public static final tabMode:I = 0x7f0a075a
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0741
+.field public static final textSpacerNoButtons:I = 0x7f0a076a
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0742
+.field public static final textSpacerNoTitle:I = 0x7f0a076b
 
-.field public static final text_input_password_toggle:I = 0x7f0a0745
+.field public static final text_input_password_toggle:I = 0x7f0a076e
 
-.field public static final textinput_counter:I = 0x7f0a0748
+.field public static final textinput_counter:I = 0x7f0a0771
 
-.field public static final textinput_error:I = 0x7f0a0749
+.field public static final textinput_error:I = 0x7f0a0772
 
-.field public static final textinput_helper_text:I = 0x7f0a074a
+.field public static final textinput_helper_text:I = 0x7f0a0773
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0750
+.field public static final titleDividerNoCustom:I = 0x7f0a0779
 
-.field public static final title_template:I = 0x7f0a0751
+.field public static final title_template:I = 0x7f0a077a
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
-.field public static final topPanel:I = 0x7f0a0757
+.field public static final topPanel:I = 0x7f0a0780
 
-.field public static final touch_outside:I = 0x7f0a0759
+.field public static final touch_outside:I = 0x7f0a0782
 
-.field public static final transition_current_scene:I = 0x7f0a075a
+.field public static final transition_current_scene:I = 0x7f0a0783
 
-.field public static final transition_layout_save:I = 0x7f0a075b
+.field public static final transition_layout_save:I = 0x7f0a0784
 
-.field public static final transition_position:I = 0x7f0a075c
+.field public static final transition_position:I = 0x7f0a0785
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a075d
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0786
 
-.field public static final transition_transform:I = 0x7f0a075e
+.field public static final transition_transform:I = 0x7f0a0787
 
-.field public static final uniform:I = 0x7f0a076a
+.field public static final uniform:I = 0x7f0a0793
 
-.field public static final unlabeled:I = 0x7f0a076b
+.field public static final unlabeled:I = 0x7f0a0794
 
-.field public static final up:I = 0x7f0a076d
+.field public static final up:I = 0x7f0a0796
 
-.field public static final view_offset_helper:I = 0x7f0a07db
+.field public static final view_offset_helper:I = 0x7f0a0818
 
-.field public static final visible:I = 0x7f0a07de
+.field public static final visible:I = 0x7f0a081b
 
-.field public static final wrap_content:I = 0x7f0a082e
+.field public static final wrap_content:I = 0x7f0a086b
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/material/R$layout.smali b/com.discord/smali_classes2/com/google/android/material/R$layout.smali
index b94b431aab..83ae439cca 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$layout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$layout.smali
@@ -99,29 +99,29 @@
 
 .field public static final design_text_input_password_icon:I = 0x7f0d0030
 
-.field public static final mtrl_layout_snackbar:I = 0x7f0d003f
+.field public static final mtrl_layout_snackbar:I = 0x7f0d0041
 
-.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0040
+.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0042
 
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
-.field public static final select_dialog_item_material:I = 0x7f0d005d
+.field public static final select_dialog_item_material:I = 0x7f0d005f
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d005e
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0060
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d005f
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d0061
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0066
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0069
 
 
 # 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 36bef027d2..4c89547219 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
@@ -93,35 +93,35 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f12002a
 
-.field public static final appbar_scrolling_view_behavior:I = 0x7f1200dc
+.field public static final appbar_scrolling_view_behavior:I = 0x7f1200df
 
-.field public static final bottom_sheet_behavior:I = 0x7f12032d
+.field public static final bottom_sheet_behavior:I = 0x7f120332
 
-.field public static final character_counter_content_description:I = 0x7f1203b8
+.field public static final character_counter_content_description:I = 0x7f1203bd
 
-.field public static final character_counter_pattern:I = 0x7f1203b9
+.field public static final character_counter_pattern:I = 0x7f1203be
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120594
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205a0
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120595
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205a1
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1208e1
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120901
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120b7f
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120bb0
 
-.field public static final password_toggle_content_description:I = 0x7f120cd9
+.field public static final password_toggle_content_description:I = 0x7f120d13
 
-.field public static final path_password_eye:I = 0x7f120cdc
+.field public static final path_password_eye:I = 0x7f120d16
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120cdd
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120d17
 
-.field public static final path_password_eye_mask_visible:I = 0x7f120cde
+.field public static final path_password_eye_mask_visible:I = 0x7f120d18
 
-.field public static final path_password_strike_through:I = 0x7f120cdf
+.field public static final path_password_strike_through:I = 0x7f120d19
 
-.field public static final search_menu_title:I = 0x7f120fa3
+.field public static final search_menu_title:I = 0x7f120fdd
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
 
 # 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 843390afc2..2b1f028638 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
@@ -27,983 +27,983 @@
 
 .field public static final Animation_Design_BottomSheetDialog:I = 0x7f130005
 
-.field public static final Base_AlertDialog_AppCompat:I = 0x7f130037
+.field public static final Base_AlertDialog_AppCompat:I = 0x7f130038
 
-.field public static final Base_AlertDialog_AppCompat_Light:I = 0x7f130038
+.field public static final Base_AlertDialog_AppCompat_Light:I = 0x7f130039
 
-.field public static final Base_Animation_AppCompat_Dialog:I = 0x7f130039
+.field public static final Base_Animation_AppCompat_Dialog:I = 0x7f13003a
 
-.field public static final Base_Animation_AppCompat_DropDownUp:I = 0x7f13003a
+.field public static final Base_Animation_AppCompat_DropDownUp:I = 0x7f13003b
 
-.field public static final Base_Animation_AppCompat_Tooltip:I = 0x7f13003b
+.field public static final Base_Animation_AppCompat_Tooltip:I = 0x7f13003c
 
-.field public static final Base_CardView:I = 0x7f13003c
+.field public static final Base_CardView:I = 0x7f13003d
 
-.field public static final Base_DialogWindowTitleBackground_AppCompat:I = 0x7f13003e
+.field public static final Base_DialogWindowTitleBackground_AppCompat:I = 0x7f13003f
 
-.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003d
+.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003e
 
-.field public static final Base_TextAppearance_AppCompat:I = 0x7f13003f
+.field public static final Base_TextAppearance_AppCompat:I = 0x7f130040
 
-.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130040
+.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130041
 
-.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130041
+.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130042
 
-.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130042
+.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130043
 
-.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130043
+.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130044
 
-.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130044
+.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130045
 
-.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130045
+.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130046
 
-.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130046
+.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130047
 
-.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130047
+.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130048
 
-.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130048
+.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130049
 
-.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f130049
+.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f13004a
 
-.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004a
+.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004b
 
-.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004b
+.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004c
 
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004c
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004d
 
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004d
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004e
 
-.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004e
+.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004f
 
-.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f13004f
+.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130050
 
-.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130050
+.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130051
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130051
+.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130052
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130052
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130053
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130053
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130054
 
-.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130054
+.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130055
 
-.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130055
+.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130056
 
-.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130056
+.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130057
 
-.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130057
+.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130058
 
-.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130058
+.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130059
 
-.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f130059
+.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f13005a
 
-.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005a
+.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005b
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005b
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005c
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005c
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005d
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005d
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005e
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005e
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005f
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f13005f
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130060
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130060
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130061
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130061
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130062
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130062
+.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130063
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130063
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130064
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130064
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130065
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130065
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130066
 
-.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130066
+.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130067
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130067
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130068
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130068
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130069
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f130069
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13006a
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006a
+.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006b
 
-.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006b
+.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006c
 
-.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006c
+.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006d
 
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006d
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006e
 
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006e
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006f
 
-.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008e
+.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008f
 
-.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f13008f
+.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f130090
 
-.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130090
+.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130091
 
-.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130091
+.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130092
 
-.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130092
+.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130093
 
-.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130093
+.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130094
 
-.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130094
+.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130095
 
-.field public static final Base_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f130095
+.field public static final Base_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f130096
 
-.field public static final Base_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f130096
+.field public static final Base_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f130097
 
-.field public static final Base_Theme_AppCompat:I = 0x7f13006f
+.field public static final Base_Theme_AppCompat:I = 0x7f130070
 
-.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130070
+.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130071
 
-.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130071
+.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130072
 
-.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130075
+.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130076
 
-.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130072
+.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130073
 
-.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130073
+.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130074
 
-.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130074
+.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130075
 
-.field public static final Base_Theme_AppCompat_Light:I = 0x7f130076
+.field public static final Base_Theme_AppCompat_Light:I = 0x7f130077
 
-.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130077
+.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130078
 
-.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130078
+.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130079
 
-.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007c
+.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007d
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f130079
+.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f13007a
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007a
+.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007b
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007b
+.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007c
 
-.field public static final Base_Theme_MaterialComponents:I = 0x7f13007d
+.field public static final Base_Theme_MaterialComponents:I = 0x7f13007e
 
-.field public static final Base_Theme_MaterialComponents_Bridge:I = 0x7f13007e
+.field public static final Base_Theme_MaterialComponents_Bridge:I = 0x7f13007f
 
-.field public static final Base_Theme_MaterialComponents_CompactMenu:I = 0x7f13007f
+.field public static final Base_Theme_MaterialComponents_CompactMenu:I = 0x7f130080
 
-.field public static final Base_Theme_MaterialComponents_Dialog:I = 0x7f130080
+.field public static final Base_Theme_MaterialComponents_Dialog:I = 0x7f130081
 
-.field public static final Base_Theme_MaterialComponents_DialogWhenLarge:I = 0x7f130084
+.field public static final Base_Theme_MaterialComponents_DialogWhenLarge:I = 0x7f130085
 
-.field public static final Base_Theme_MaterialComponents_Dialog_Alert:I = 0x7f130081
+.field public static final Base_Theme_MaterialComponents_Dialog_Alert:I = 0x7f130082
 
-.field public static final Base_Theme_MaterialComponents_Dialog_FixedSize:I = 0x7f130082
+.field public static final Base_Theme_MaterialComponents_Dialog_FixedSize:I = 0x7f130083
 
-.field public static final Base_Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f130083
+.field public static final Base_Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f130084
 
-.field public static final Base_Theme_MaterialComponents_Light:I = 0x7f130085
+.field public static final Base_Theme_MaterialComponents_Light:I = 0x7f130086
 
-.field public static final Base_Theme_MaterialComponents_Light_Bridge:I = 0x7f130086
+.field public static final Base_Theme_MaterialComponents_Light_Bridge:I = 0x7f130087
 
-.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f130087
+.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f130088
 
-.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f130088
+.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f130089
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog:I = 0x7f130089
+.field public static final Base_Theme_MaterialComponents_Light_Dialog:I = 0x7f13008a
 
-.field public static final Base_Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f13008d
+.field public static final Base_Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f13008e
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f13008a
+.field public static final Base_Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f13008b
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog_FixedSize:I = 0x7f13008b
+.field public static final Base_Theme_MaterialComponents_Light_Dialog_FixedSize:I = 0x7f13008c
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f13008c
+.field public static final Base_Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f13008d
 
-.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f13009e
+.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f13009f
 
-.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f13009f
+.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f1300a0
 
-.field public static final Base_V14_Theme_MaterialComponents:I = 0x7f130097
+.field public static final Base_V14_Theme_MaterialComponents:I = 0x7f130098
 
-.field public static final Base_V14_Theme_MaterialComponents_Bridge:I = 0x7f130098
+.field public static final Base_V14_Theme_MaterialComponents_Bridge:I = 0x7f130099
 
-.field public static final Base_V14_Theme_MaterialComponents_Dialog:I = 0x7f130099
+.field public static final Base_V14_Theme_MaterialComponents_Dialog:I = 0x7f13009a
 
-.field public static final Base_V14_Theme_MaterialComponents_Light:I = 0x7f13009a
+.field public static final Base_V14_Theme_MaterialComponents_Light:I = 0x7f13009b
 
-.field public static final Base_V14_Theme_MaterialComponents_Light_Bridge:I = 0x7f13009b
+.field public static final Base_V14_Theme_MaterialComponents_Light_Bridge:I = 0x7f13009c
 
-.field public static final Base_V14_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f13009c
+.field public static final Base_V14_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f13009d
 
-.field public static final Base_V14_Theme_MaterialComponents_Light_Dialog:I = 0x7f13009d
+.field public static final Base_V14_Theme_MaterialComponents_Light_Dialog:I = 0x7f13009e
 
-.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a4
+.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a5
 
-.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a0
+.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a1
 
-.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a1
+.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a2
 
-.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a2
+.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a3
 
-.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a3
+.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a4
 
-.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a5
+.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a6
 
-.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a6
+.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a7
 
-.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a7
+.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a8
 
-.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a8
+.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a9
 
-.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300a9
+.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300aa
 
-.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300aa
+.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300ab
 
-.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ab
+.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ac
 
-.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ac
+.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ad
 
-.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ad
+.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ae
 
-.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b2
+.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b3
 
-.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300ae
+.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300af
 
-.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300af
+.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300b0
 
-.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b0
+.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b1
 
-.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b1
+.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b2
 
-.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b3
+.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b4
 
-.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b4
+.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b5
 
-.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b5
+.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b6
 
-.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b6
+.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b7
 
-.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b7
+.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b8
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b8
+.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b9
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300b9
+.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300ba
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300ba
+.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300bb
 
-.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bb
+.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bc
 
-.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bc
+.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bd
 
-.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300bd
+.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300be
 
-.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300be
+.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300bf
 
-.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300bf
+.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300c0
 
-.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c0
+.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c1
 
-.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c1
+.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c2
 
-.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c7
+.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c8
 
-.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c8
+.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c9
 
-.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c2
+.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c3
 
-.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c3
+.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c4
 
-.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c4
+.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c5
 
-.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c5
+.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c6
 
-.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c6
+.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c7
 
-.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300c9
+.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300ca
 
-.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300ca
+.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300cb
 
-.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cb
+.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cc
 
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cc
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cd
 
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300cd
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300ce
 
-.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300ce
+.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300cf
 
-.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300cf
+.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300d0
 
-.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d0
+.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d1
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d1
+.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d2
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d2
+.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d3
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d3
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d4
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d4
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d5
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d5
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d6
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d6
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d7
 
-.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d7
+.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d8
 
-.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d8
+.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d9
 
-.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300d9
+.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300da
 
-.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300da
+.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300db
 
-.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300db
+.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300dc
 
-.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dc
+.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dd
 
-.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300dd
+.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300de
 
-.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300de
+.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300df
 
-.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300df
+.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300e0
 
-.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e0
+.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e1
 
-.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e1
+.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e2
 
-.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e2
+.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e3
 
-.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e3
+.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e4
 
-.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e4
+.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e5
 
-.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e5
+.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e6
 
-.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e6
+.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e7
 
-.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e7
+.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e8
 
-.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e8
+.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e9
 
-.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300e9
+.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300ea
 
-.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300ea
+.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300eb
 
-.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300eb
+.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300ec
 
-.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ec
+.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ed
 
-.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ed
+.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ee
 
-.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300ee
+.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300ef
 
-.field public static final Base_Widget_Design_TabLayout:I = 0x7f1300ef
+.field public static final Base_Widget_Design_TabLayout:I = 0x7f1300f0
 
-.field public static final Base_Widget_MaterialComponents_Chip:I = 0x7f1300f0
+.field public static final Base_Widget_MaterialComponents_Chip:I = 0x7f1300f1
 
-.field public static final Base_Widget_MaterialComponents_TextInputEditText:I = 0x7f1300f1
+.field public static final Base_Widget_MaterialComponents_TextInputEditText:I = 0x7f1300f2
 
-.field public static final Base_Widget_MaterialComponents_TextInputLayout:I = 0x7f1300f2
+.field public static final Base_Widget_MaterialComponents_TextInputLayout:I = 0x7f1300f3
 
-.field public static final CardView:I = 0x7f1300f3
+.field public static final CardView:I = 0x7f1300f4
 
-.field public static final CardView_Dark:I = 0x7f1300f4
+.field public static final CardView_Dark:I = 0x7f1300f5
 
-.field public static final CardView_Light:I = 0x7f1300f5
+.field public static final CardView_Light:I = 0x7f1300f6
 
-.field public static final Platform_AppCompat:I = 0x7f130131
+.field public static final Platform_AppCompat:I = 0x7f130132
 
-.field public static final Platform_AppCompat_Light:I = 0x7f130132
+.field public static final Platform_AppCompat_Light:I = 0x7f130133
 
-.field public static final Platform_MaterialComponents:I = 0x7f130133
+.field public static final Platform_MaterialComponents:I = 0x7f130134
 
-.field public static final Platform_MaterialComponents_Dialog:I = 0x7f130134
+.field public static final Platform_MaterialComponents_Dialog:I = 0x7f130135
 
-.field public static final Platform_MaterialComponents_Light:I = 0x7f130135
+.field public static final Platform_MaterialComponents_Light:I = 0x7f130136
 
-.field public static final Platform_MaterialComponents_Light_Dialog:I = 0x7f130136
+.field public static final Platform_MaterialComponents_Light_Dialog:I = 0x7f130137
 
-.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130137
+.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130138
 
-.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130138
+.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130139
 
-.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f130139
+.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f13013a
 
-.field public static final Platform_V21_AppCompat:I = 0x7f13013a
+.field public static final Platform_V21_AppCompat:I = 0x7f13013b
 
-.field public static final Platform_V21_AppCompat_Light:I = 0x7f13013b
+.field public static final Platform_V21_AppCompat_Light:I = 0x7f13013c
 
-.field public static final Platform_V25_AppCompat:I = 0x7f13013c
+.field public static final Platform_V25_AppCompat:I = 0x7f13013d
 
-.field public static final Platform_V25_AppCompat_Light:I = 0x7f13013d
+.field public static final Platform_V25_AppCompat_Light:I = 0x7f13013e
 
-.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13013e
+.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13013f
 
-.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f13013f
+.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f130140
 
-.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f130140
+.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f130141
 
-.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f130141
+.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f130142
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f130142
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f130143
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130143
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130144
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130144
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130145
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130145
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130146
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130146
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130147
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130147
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130148
 
-.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13014d
+.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13014e
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130148
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130149
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f130149
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f13014a
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f13014a
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f13014b
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f13014b
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f13014c
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f13014c
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f13014d
 
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13014e
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13014f
 
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f13014f
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f130150
 
-.field public static final TextAppearance_AppCompat:I = 0x7f130152
+.field public static final TextAppearance_AppCompat:I = 0x7f130153
 
-.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130153
+.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130154
 
-.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130154
+.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130155
 
-.field public static final TextAppearance_AppCompat_Button:I = 0x7f130155
+.field public static final TextAppearance_AppCompat_Button:I = 0x7f130156
 
-.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130156
+.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130157
 
-.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130157
+.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130158
 
-.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130158
+.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130159
 
-.field public static final TextAppearance_AppCompat_Display3:I = 0x7f130159
+.field public static final TextAppearance_AppCompat_Display3:I = 0x7f13015a
 
-.field public static final TextAppearance_AppCompat_Display4:I = 0x7f13015a
+.field public static final TextAppearance_AppCompat_Display4:I = 0x7f13015b
 
-.field public static final TextAppearance_AppCompat_Headline:I = 0x7f13015b
+.field public static final TextAppearance_AppCompat_Headline:I = 0x7f13015c
 
-.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13015c
+.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13015d
 
-.field public static final TextAppearance_AppCompat_Large:I = 0x7f13015d
+.field public static final TextAppearance_AppCompat_Large:I = 0x7f13015e
 
-.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13015e
+.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13015f
 
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f13015f
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f130160
 
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f130160
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f130161
 
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130161
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130162
 
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130162
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130163
 
-.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130163
+.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130164
 
-.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130164
+.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130165
 
-.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130165
+.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130166
 
-.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130166
+.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130167
 
-.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130167
+.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130168
 
-.field public static final TextAppearance_AppCompat_Small:I = 0x7f130168
+.field public static final TextAppearance_AppCompat_Small:I = 0x7f130169
 
-.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f130169
+.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f13016a
 
-.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f13016a
+.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f13016b
 
-.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13016b
+.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13016c
 
-.field public static final TextAppearance_AppCompat_Title:I = 0x7f13016c
+.field public static final TextAppearance_AppCompat_Title:I = 0x7f13016d
 
-.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13016d
+.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13016e
 
-.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13016e
+.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13016f
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13016f
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f130170
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130170
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130171
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130171
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130172
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130172
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130173
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130173
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130174
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130174
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130175
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f130175
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f130176
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130176
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130177
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f130177
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f130178
 
-.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f130178
+.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f130179
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130179
+.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f13017a
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f13017a
+.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f13017b
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f13017b
+.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f13017c
 
-.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13017c
+.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13017d
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13017d
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13017e
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13017e
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13017f
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13017f
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f130180
 
-.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f130180
+.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f130181
 
-.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f130181
+.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f130182
 
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final TextAppearance_Design_CollapsingToolbar_Expanded:I = 0x7f13018c
+.field public static final TextAppearance_Design_CollapsingToolbar_Expanded:I = 0x7f13018d
 
-.field public static final TextAppearance_Design_Counter:I = 0x7f13018d
+.field public static final TextAppearance_Design_Counter:I = 0x7f13018e
 
-.field public static final TextAppearance_Design_Counter_Overflow:I = 0x7f13018e
+.field public static final TextAppearance_Design_Counter_Overflow:I = 0x7f13018f
 
-.field public static final TextAppearance_Design_Error:I = 0x7f13018f
+.field public static final TextAppearance_Design_Error:I = 0x7f130190
 
-.field public static final TextAppearance_Design_HelperText:I = 0x7f130190
+.field public static final TextAppearance_Design_HelperText:I = 0x7f130191
 
-.field public static final TextAppearance_Design_Hint:I = 0x7f130191
+.field public static final TextAppearance_Design_Hint:I = 0x7f130192
 
-.field public static final TextAppearance_Design_Snackbar_Message:I = 0x7f130192
+.field public static final TextAppearance_Design_Snackbar_Message:I = 0x7f130193
 
-.field public static final TextAppearance_Design_Tab:I = 0x7f130193
+.field public static final TextAppearance_Design_Tab:I = 0x7f130194
 
-.field public static final TextAppearance_MaterialComponents_Body1:I = 0x7f130195
+.field public static final TextAppearance_MaterialComponents_Body1:I = 0x7f130196
 
-.field public static final TextAppearance_MaterialComponents_Body2:I = 0x7f130196
+.field public static final TextAppearance_MaterialComponents_Body2:I = 0x7f130197
 
-.field public static final TextAppearance_MaterialComponents_Button:I = 0x7f130197
+.field public static final TextAppearance_MaterialComponents_Button:I = 0x7f130198
 
-.field public static final TextAppearance_MaterialComponents_Caption:I = 0x7f130198
+.field public static final TextAppearance_MaterialComponents_Caption:I = 0x7f130199
 
-.field public static final TextAppearance_MaterialComponents_Chip:I = 0x7f130199
+.field public static final TextAppearance_MaterialComponents_Chip:I = 0x7f13019a
 
-.field public static final TextAppearance_MaterialComponents_Headline1:I = 0x7f13019a
+.field public static final TextAppearance_MaterialComponents_Headline1:I = 0x7f13019b
 
-.field public static final TextAppearance_MaterialComponents_Headline2:I = 0x7f13019b
+.field public static final TextAppearance_MaterialComponents_Headline2:I = 0x7f13019c
 
-.field public static final TextAppearance_MaterialComponents_Headline3:I = 0x7f13019c
+.field public static final TextAppearance_MaterialComponents_Headline3:I = 0x7f13019d
 
-.field public static final TextAppearance_MaterialComponents_Headline4:I = 0x7f13019d
+.field public static final TextAppearance_MaterialComponents_Headline4:I = 0x7f13019e
 
-.field public static final TextAppearance_MaterialComponents_Headline5:I = 0x7f13019e
+.field public static final TextAppearance_MaterialComponents_Headline5:I = 0x7f13019f
 
-.field public static final TextAppearance_MaterialComponents_Headline6:I = 0x7f13019f
+.field public static final TextAppearance_MaterialComponents_Headline6:I = 0x7f1301a0
 
-.field public static final TextAppearance_MaterialComponents_Overline:I = 0x7f1301a0
+.field public static final TextAppearance_MaterialComponents_Overline:I = 0x7f1301a1
 
-.field public static final TextAppearance_MaterialComponents_Subtitle1:I = 0x7f1301a1
+.field public static final TextAppearance_MaterialComponents_Subtitle1:I = 0x7f1301a2
 
-.field public static final TextAppearance_MaterialComponents_Subtitle2:I = 0x7f1301a2
+.field public static final TextAppearance_MaterialComponents_Subtitle2:I = 0x7f1301a3
 
-.field public static final TextAppearance_MaterialComponents_Tab:I = 0x7f1301a3
+.field public static final TextAppearance_MaterialComponents_Tab:I = 0x7f1301a4
 
-.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301a4
+.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301a5
 
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301a5
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301a6
 
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301a6
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301a7
 
-.field public static final ThemeOverlay_AppCompat:I = 0x7f1301d9
+.field public static final ThemeOverlay_AppCompat:I = 0x7f1301da
 
-.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f1301da
+.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f1301db
 
-.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f1301db
+.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f1301dc
 
-.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f1301dc
+.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f1301dd
 
-.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f1301dd
+.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f1301de
 
-.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f1301de
+.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f1301df
 
-.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f1301df
+.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f1301e0
 
-.field public static final ThemeOverlay_MaterialComponents:I = 0x7f1301e0
+.field public static final ThemeOverlay_MaterialComponents:I = 0x7f1301e1
 
-.field public static final ThemeOverlay_MaterialComponents_ActionBar:I = 0x7f1301e1
+.field public static final ThemeOverlay_MaterialComponents_ActionBar:I = 0x7f1301e2
 
-.field public static final ThemeOverlay_MaterialComponents_Dark:I = 0x7f1301e2
+.field public static final ThemeOverlay_MaterialComponents_Dark:I = 0x7f1301e3
 
-.field public static final ThemeOverlay_MaterialComponents_Dark_ActionBar:I = 0x7f1301e3
+.field public static final ThemeOverlay_MaterialComponents_Dark_ActionBar:I = 0x7f1301e4
 
-.field public static final ThemeOverlay_MaterialComponents_Dialog:I = 0x7f1301e4
+.field public static final ThemeOverlay_MaterialComponents_Dialog:I = 0x7f1301e5
 
-.field public static final ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f1301e5
+.field public static final ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f1301e6
 
-.field public static final ThemeOverlay_MaterialComponents_Light:I = 0x7f1301e6
+.field public static final ThemeOverlay_MaterialComponents_Light:I = 0x7f1301e7
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText:I = 0x7f1301e7
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText:I = 0x7f1301e8
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f1301e8
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f1301e9
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f1301e9
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f1301ea
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f1301ea
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f1301eb
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f1301eb
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f1301ec
 
-.field public static final Theme_AppCompat:I = 0x7f1301a7
+.field public static final Theme_AppCompat:I = 0x7f1301a8
 
-.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301a8
+.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301a9
 
-.field public static final Theme_AppCompat_DayNight:I = 0x7f1301a9
+.field public static final Theme_AppCompat_DayNight:I = 0x7f1301aa
 
-.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301aa
+.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301ab
 
-.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301ab
+.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301ac
 
-.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301ae
+.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301af
 
-.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301ac
+.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301ad
 
-.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301ad
+.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301ae
 
-.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301af
+.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301b0
 
-.field public static final Theme_AppCompat_Dialog:I = 0x7f1301b0
+.field public static final Theme_AppCompat_Dialog:I = 0x7f1301b1
 
-.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301b3
+.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301b4
 
-.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301b1
+.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301b2
 
-.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301b2
+.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301b3
 
-.field public static final Theme_AppCompat_Light:I = 0x7f1301b4
+.field public static final Theme_AppCompat_Light:I = 0x7f1301b5
 
-.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301b5
+.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301b6
 
-.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301b6
+.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301b7
 
-.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301b9
+.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301ba
 
-.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301b7
+.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301b8
 
-.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301b8
+.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301b9
 
-.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301ba
+.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301bb
 
-.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301bb
+.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301bc
 
-.field public static final Theme_Design:I = 0x7f1301be
+.field public static final Theme_Design:I = 0x7f1301bf
 
-.field public static final Theme_Design_BottomSheetDialog:I = 0x7f1301bf
+.field public static final Theme_Design_BottomSheetDialog:I = 0x7f1301c0
 
-.field public static final Theme_Design_Light:I = 0x7f1301c0
+.field public static final Theme_Design_Light:I = 0x7f1301c1
 
-.field public static final Theme_Design_Light_BottomSheetDialog:I = 0x7f1301c1
+.field public static final Theme_Design_Light_BottomSheetDialog:I = 0x7f1301c2
 
-.field public static final Theme_Design_Light_NoActionBar:I = 0x7f1301c2
+.field public static final Theme_Design_Light_NoActionBar:I = 0x7f1301c3
 
-.field public static final Theme_Design_NoActionBar:I = 0x7f1301c3
+.field public static final Theme_Design_NoActionBar:I = 0x7f1301c4
 
-.field public static final Theme_MaterialComponents:I = 0x7f1301c4
+.field public static final Theme_MaterialComponents:I = 0x7f1301c5
 
-.field public static final Theme_MaterialComponents_BottomSheetDialog:I = 0x7f1301c5
+.field public static final Theme_MaterialComponents_BottomSheetDialog:I = 0x7f1301c6
 
-.field public static final Theme_MaterialComponents_Bridge:I = 0x7f1301c6
+.field public static final Theme_MaterialComponents_Bridge:I = 0x7f1301c7
 
-.field public static final Theme_MaterialComponents_CompactMenu:I = 0x7f1301c7
+.field public static final Theme_MaterialComponents_CompactMenu:I = 0x7f1301c8
 
-.field public static final Theme_MaterialComponents_Dialog:I = 0x7f1301c8
+.field public static final Theme_MaterialComponents_Dialog:I = 0x7f1301c9
 
-.field public static final Theme_MaterialComponents_DialogWhenLarge:I = 0x7f1301cb
+.field public static final Theme_MaterialComponents_DialogWhenLarge:I = 0x7f1301cc
 
-.field public static final Theme_MaterialComponents_Dialog_Alert:I = 0x7f1301c9
+.field public static final Theme_MaterialComponents_Dialog_Alert:I = 0x7f1301ca
 
-.field public static final Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f1301ca
+.field public static final Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f1301cb
 
-.field public static final Theme_MaterialComponents_Light:I = 0x7f1301cc
+.field public static final Theme_MaterialComponents_Light:I = 0x7f1301cd
 
-.field public static final Theme_MaterialComponents_Light_BottomSheetDialog:I = 0x7f1301cd
+.field public static final Theme_MaterialComponents_Light_BottomSheetDialog:I = 0x7f1301ce
 
-.field public static final Theme_MaterialComponents_Light_Bridge:I = 0x7f1301ce
+.field public static final Theme_MaterialComponents_Light_Bridge:I = 0x7f1301cf
 
-.field public static final Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f1301cf
+.field public static final Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f1301d0
 
-.field public static final Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f1301d0
+.field public static final Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f1301d1
 
-.field public static final Theme_MaterialComponents_Light_Dialog:I = 0x7f1301d1
+.field public static final Theme_MaterialComponents_Light_Dialog:I = 0x7f1301d2
 
-.field public static final Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f1301d4
+.field public static final Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f1301d5
 
-.field public static final Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f1301d2
+.field public static final Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f1301d3
 
-.field public static final Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f1301d3
+.field public static final Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f1301d4
 
-.field public static final Theme_MaterialComponents_Light_NoActionBar:I = 0x7f1301d5
+.field public static final Theme_MaterialComponents_Light_NoActionBar:I = 0x7f1301d6
 
-.field public static final Theme_MaterialComponents_Light_NoActionBar_Bridge:I = 0x7f1301d6
+.field public static final Theme_MaterialComponents_Light_NoActionBar_Bridge:I = 0x7f1301d7
 
-.field public static final Theme_MaterialComponents_NoActionBar:I = 0x7f1301d7
+.field public static final Theme_MaterialComponents_NoActionBar:I = 0x7f1301d8
 
-.field public static final Theme_MaterialComponents_NoActionBar_Bridge:I = 0x7f1301d8
+.field public static final Theme_MaterialComponents_NoActionBar_Bridge:I = 0x7f1301d9
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302ac
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302af
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302ad
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302b0
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302ae
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302b1
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302af
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302b2
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302b0
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302b3
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302b1
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302b4
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302b2
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302b5
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302b3
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302b6
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302b4
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302b7
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302b5
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302b8
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302b6
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302b9
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1302b7
+.field public static final Widget_AppCompat_Button:I = 0x7f1302ba
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302bd
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302c0
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302be
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302c1
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302b8
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302bb
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302b9
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302bc
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302ba
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302bd
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302bb
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302be
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302bc
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302bf
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302bf
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302c2
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302c0
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302c3
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302c1
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302c4
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1302c2
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1302c5
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1302c3
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1302c6
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1302c4
+.field public static final Widget_AppCompat_EditText:I = 0x7f1302c7
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1302c5
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1302c8
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1302c6
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1302c9
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1302c7
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1302ca
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1302c8
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1302cb
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1302c9
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1302cc
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1302ca
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1302cd
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1302cb
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1302ce
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1302cc
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1302cf
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1302cd
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1302d0
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1302ce
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1302d1
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1302cf
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1302d2
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1302d0
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1302d3
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1302d1
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1302d4
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1302d2
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1302d5
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1302d3
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1302d6
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1302d4
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1302d7
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1302d5
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1302d8
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1302d6
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1302d9
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1302d7
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1302da
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1302d8
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1302db
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1302d9
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1302dc
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1302da
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1302dd
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1302db
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1302de
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1302dc
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1302df
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1302dd
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1302e0
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1302de
+.field public static final Widget_AppCompat_ListView:I = 0x7f1302e1
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1302df
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1302e2
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1302e0
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1302e3
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1302e1
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1302e4
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1302e2
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1302e5
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1302e3
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1302e6
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1302e4
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1302e7
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1302e5
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1302e8
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1302e6
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1302e9
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1302e7
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1302ea
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1302e8
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1302eb
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1302e9
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1302ec
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1302ea
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1302ed
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1302eb
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1302ee
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1302ec
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1302ef
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1302ed
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1302f0
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1302ee
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1302f1
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1302ef
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1302f2
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1302f0
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1302f3
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1302f1
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1302f4
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1302f2
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1302f5
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1302f3
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1302f6
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Design_AppBarLayout:I = 0x7f1302f7
+.field public static final Widget_Design_AppBarLayout:I = 0x7f1302fa
 
-.field public static final Widget_Design_BottomNavigationView:I = 0x7f1302f8
+.field public static final Widget_Design_BottomNavigationView:I = 0x7f1302fb
 
-.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1302f9
+.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1302fc
 
-.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1302fa
+.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1302fd
 
-.field public static final Widget_Design_FloatingActionButton:I = 0x7f1302fb
+.field public static final Widget_Design_FloatingActionButton:I = 0x7f1302fe
 
-.field public static final Widget_Design_NavigationView:I = 0x7f1302fc
+.field public static final Widget_Design_NavigationView:I = 0x7f1302ff
 
-.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f1302fd
+.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f130300
 
-.field public static final Widget_Design_Snackbar:I = 0x7f1302fe
+.field public static final Widget_Design_Snackbar:I = 0x7f130301
 
-.field public static final Widget_Design_TabLayout:I = 0x7f1302ff
+.field public static final Widget_Design_TabLayout:I = 0x7f130302
 
-.field public static final Widget_Design_TextInputLayout:I = 0x7f130300
+.field public static final Widget_Design_TextInputLayout:I = 0x7f130303
 
-.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f130301
+.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f130304
 
-.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f130302
+.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f130305
 
-.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f130303
+.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f130306
 
-.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f130304
+.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f130307
 
-.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130305
+.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130308
 
-.field public static final Widget_MaterialComponents_Button:I = 0x7f130306
+.field public static final Widget_MaterialComponents_Button:I = 0x7f130309
 
-.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f130307
+.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f13030a
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f130308
+.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f13030b
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f130309
+.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f13030c
 
-.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f13030a
+.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f13030d
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f13030b
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f13030e
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f13030c
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f13030f
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f13030d
+.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f130310
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f13030e
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f130311
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f13030f
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f130312
 
-.field public static final Widget_MaterialComponents_CardView:I = 0x7f130310
+.field public static final Widget_MaterialComponents_CardView:I = 0x7f130313
 
-.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130315
+.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130318
 
-.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f130311
+.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f130314
 
-.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130312
+.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130315
 
-.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130313
+.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130316
 
-.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130314
+.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130317
 
-.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f130316
+.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f130319
 
-.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f130317
+.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f13031a
 
-.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f130318
+.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f13031b
 
-.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f130319
+.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f13031c
 
-.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13031a
+.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13031d
 
-.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13031b
+.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13031e
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f13031c
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f13031f
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f13031d
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f130320
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f13031e
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f130321
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f13031f
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f130322
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130320
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130323
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130321
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130324
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130322
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130325
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130323
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130326
 
-.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f130324
+.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f130327
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # 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 f97dc0cb40..9686228587 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
@@ -1768,7 +1768,7 @@
 
     new-array v2, v1, [I
 
-    const v5, 0x7f040305
+    const v5, 0x7f040308
 
     aput v5, v2, v3
 
@@ -1788,7 +1788,7 @@
 
     new-array v2, v1, [I
 
-    const v5, 0x7f0401ec
+    const v5, 0x7f0401ee
 
     aput v5, v2, v3
 
@@ -1903,60 +1903,60 @@
         0x7f04004c
         0x7f04004e
         0x7f04004f
-        0x7f0400c8
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f0400e9
-        0x7f040103
+        0x7f0400ce
+        0x7f0400ea
         0x7f040104
-        0x7f040112
-        0x7f040156
-        0x7f04015b
-        0x7f040162
-        0x7f040163
-        0x7f0401c7
-        0x7f0401ea
-        0x7f0401f4
-        0x7f040257
-        0x7f040273
-        0x7f04028b
-        0x7f0402b9
-        0x7f0402ba
-        0x7f040313
+        0x7f040105
+        0x7f040114
+        0x7f040158
+        0x7f04015d
+        0x7f040164
+        0x7f040165
+        0x7f0401c9
+        0x7f0401ec
+        0x7f0401f6
+        0x7f04025a
+        0x7f040276
+        0x7f04028e
+        0x7f0402bc
+        0x7f0402bd
         0x7f040316
-        0x7f0403af
-        0x7f0403b9
+        0x7f040319
+        0x7f0403b2
+        0x7f0403bc
     .end array-data
 
     :array_1
     .array-data 4
         0x7f04004c
         0x7f04004e
-        0x7f0400ac
-        0x7f040156
-        0x7f040316
-        0x7f0403b9
+        0x7f0400ad
+        0x7f040158
+        0x7f040319
+        0x7f0403bc
     .end array-data
 
     :array_2
     .array-data 4
-        0x7f040118
-        0x7f0401eb
+        0x7f04011a
+        0x7f0401ed
     .end array-data
 
     :array_3
     .array-data 4
         0x10100f2
-        0x7f04007a
         0x7f04007b
-        0x7f04024e
-        0x7f04024f
-        0x7f040270
-        0x7f0402f8
-        0x7f0402f9
+        0x7f04007c
+        0x7f040251
+        0x7f040252
+        0x7f040273
+        0x7f0402fb
+        0x7f0402fc
     .end array-data
 
     :array_4
@@ -1964,39 +1964,39 @@
         0x10100d4
         0x101048f
         0x1010540
-        0x7f040112
-        0x7f040119
-        0x7f040249
+        0x7f040114
+        0x7f04011b
+        0x7f04024c
     .end array-data
 
     :array_5
     .array-data 4
-        0x7f040306
-        0x7f040307
-        0x7f040308
         0x7f040309
+        0x7f04030a
+        0x7f04030b
+        0x7f04030c
     .end array-data
 
     :array_6
     .array-data 4
-        0x7f040243
-        0x7f040244
+        0x7f040245
+        0x7f040246
     .end array-data
 
     :array_7
     .array-data 4
         0x1010119
-        0x7f040303
-        0x7f0403ad
-        0x7f0403ae
+        0x7f040306
+        0x7f0403b0
+        0x7f0403b1
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f0403aa
-        0x7f0403ab
-        0x7f0403ac
+        0x7f0403ad
+        0x7f0403ae
+        0x7f0403af
     .end array-data
 
     :array_9
@@ -2018,11 +2018,11 @@
         0x7f040048
         0x7f040049
         0x7f04004a
-        0x7f040131
-        0x7f04013f
-        0x7f0401fd
-        0x7f04024a
-        0x7f040339
+        0x7f040133
+        0x7f040141
+        0x7f0401ff
+        0x7f04024d
+        0x7f04033c
     .end array-data
 
     :array_b
@@ -2065,17 +2065,16 @@
         0x7f04002b
         0x7f04002c
         0x7f040044
-        0x7f040065
-        0x7f040074
+        0x7f040066
         0x7f040075
         0x7f040076
         0x7f040077
         0x7f040078
-        0x7f04007d
+        0x7f040079
         0x7f04007e
-        0x7f04008c
-        0x7f040091
-        0x7f0400b2
+        0x7f04007f
+        0x7f04008d
+        0x7f040092
         0x7f0400b3
         0x7f0400b4
         0x7f0400b5
@@ -2083,95 +2082,96 @@
         0x7f0400b7
         0x7f0400b8
         0x7f0400b9
-        0x7f0400bc
-        0x7f0400c1
-        0x7f0400d4
-        0x7f040100
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c2
+        0x7f0400d5
         0x7f040101
         0x7f040102
-        0x7f040108
-        0x7f04010a
-        0x7f04010d
-        0x7f04010e
+        0x7f040103
+        0x7f040109
+        0x7f04010b
         0x7f04010f
         0x7f040110
         0x7f040111
-        0x7f040162
-        0x7f0401d2
-        0x7f04024c
-        0x7f04024d
+        0x7f040112
+        0x7f040113
+        0x7f040164
+        0x7f0401d4
+        0x7f04024f
         0x7f040250
-        0x7f040251
-        0x7f040252
         0x7f040253
         0x7f040254
         0x7f040255
         0x7f040256
-        0x7f040280
-        0x7f040281
-        0x7f040282
-        0x7f04028a
-        0x7f04028c
-        0x7f0402bf
+        0x7f040257
+        0x7f040258
+        0x7f040259
+        0x7f040283
+        0x7f040284
+        0x7f040285
+        0x7f04028d
+        0x7f04028f
         0x7f0402c2
-        0x7f0402c3
-        0x7f0402c4
-        0x7f0402eb
-        0x7f0402ed
+        0x7f0402c5
+        0x7f0402c6
+        0x7f0402c7
         0x7f0402ee
-        0x7f0402ef
-        0x7f040300
-        0x7f040301
-        0x7f04031a
-        0x7f040344
-        0x7f040345
-        0x7f040346
+        0x7f0402f0
+        0x7f0402f1
+        0x7f0402f2
+        0x7f040303
+        0x7f040304
+        0x7f04031d
         0x7f040347
+        0x7f040348
         0x7f040349
         0x7f04034a
-        0x7f04034b
         0x7f04034c
+        0x7f04034d
+        0x7f04034e
         0x7f04034f
-        0x7f040350
-        0x7f0403bb
-        0x7f0403bc
-        0x7f0403bd
+        0x7f040352
+        0x7f040353
         0x7f0403be
-        0x7f0403dc
-        0x7f0403df
-        0x7f0403e0
+        0x7f0403bf
+        0x7f0403c0
+        0x7f0403c1
         0x7f0403e1
-        0x7f0403e2
-        0x7f0403e3
         0x7f0403e4
         0x7f0403e5
         0x7f0403e6
         0x7f0403e7
         0x7f0403e8
+        0x7f0403e9
+        0x7f0403ea
+        0x7f0403eb
+        0x7f0403ec
+        0x7f0403ed
     .end array-data
 
     :array_c
     .array-data 4
         0x7f040050
-        0x7f040121
-        0x7f040122
         0x7f040123
         0x7f040124
-        0x7f04015c
+        0x7f040125
+        0x7f040126
+        0x7f04015e
     .end array-data
 
     :array_d
     .array-data 4
-        0x7f040112
-        0x7f0401ee
+        0x7f040114
         0x7f0401f0
         0x7f0401f2
-        0x7f0401f3
-        0x7f0401f7
-        0x7f0401f8
+        0x7f0401f4
+        0x7f0401f5
         0x7f0401f9
-        0x7f0401fc
-        0x7f04026f
+        0x7f0401fa
+        0x7f0401fb
+        0x7f0401fe
+        0x7f040272
     .end array-data
 
     :array_e
@@ -2186,17 +2186,17 @@
     .array-data 4
         0x101013f
         0x1010140
-        0x7f040081
         0x7f040082
         0x7f040083
         0x7f040084
         0x7f040085
         0x7f040086
-        0x7f0400ce
+        0x7f040087
         0x7f0400cf
         0x7f0400d0
         0x7f0400d1
         0x7f0400d2
+        0x7f0400d3
     .end array-data
 
     :array_10
@@ -2206,71 +2206,71 @@
         0x101011f
         0x101014f
         0x10101e5
-        0x7f04008e
         0x7f04008f
         0x7f040090
-        0x7f040092
+        0x7f040091
         0x7f040093
         0x7f040094
-        0x7f040096
+        0x7f040095
         0x7f040097
         0x7f040098
         0x7f040099
         0x7f04009a
         0x7f04009b
-        0x7f0400a0
+        0x7f04009c
         0x7f0400a1
         0x7f0400a2
-        0x7f0400a5
+        0x7f0400a3
         0x7f0400a6
         0x7f0400a7
         0x7f0400a8
         0x7f0400a9
         0x7f0400aa
         0x7f0400ab
-        0x7f04015a
-        0x7f0401c8
-        0x7f0401cc
-        0x7f0402c8
-        0x7f0402f6
-        0x7f040351
-        0x7f040353
+        0x7f0400ac
+        0x7f04015c
+        0x7f0401ca
+        0x7f0401ce
+        0x7f0402cb
+        0x7f0402f9
+        0x7f040354
+        0x7f040356
     .end array-data
 
     :array_11
     .array-data 4
-        0x7f04008d
-        0x7f04009c
+        0x7f04008e
         0x7f04009d
         0x7f04009e
-        0x7f0402fa
-        0x7f0402fb
+        0x7f04009f
+        0x7f0402fd
+        0x7f0402fe
     .end array-data
 
     :array_12
     .array-data 4
-        0x7f0400af
         0x7f0400b0
-        0x7f0400d3
-        0x7f04011a
-        0x7f04011b
+        0x7f0400b1
+        0x7f0400d4
         0x7f04011c
         0x7f04011d
         0x7f04011e
         0x7f04011f
         0x7f040120
-        0x7f0402e6
-        0x7f0402e8
-        0x7f04030b
-        0x7f0403af
-        0x7f0403b0
-        0x7f0403ba
+        0x7f040121
+        0x7f040122
+        0x7f0402e9
+        0x7f0402eb
+        0x7f04030e
+        0x7f0403b2
+        0x7f0403b3
+        0x7f0403bd
     .end array-data
 
     :array_13
     .array-data 4
-        0x7f040204
-        0x7f040205
+        0x7f040206
+        0x7f040207
     .end array-data
 
     :array_14
@@ -2283,31 +2283,31 @@
     :array_15
     .array-data 4
         0x1010107
-        0x7f04007f
         0x7f040080
+        0x7f040081
     .end array-data
 
     :array_16
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_17
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_18
     .array-data 4
-        0x7f040068
         0x7f040069
+        0x7f04006a
     .end array-data
 
     :array_19
@@ -2315,46 +2315,46 @@
         0x7f04003b
         0x7f04003c
         0x7f040052
-        0x7f0400b1
-        0x7f04010b
-        0x7f04014a
-        0x7f0402ff
-        0x7f0403a6
+        0x7f0400b2
+        0x7f04010c
+        0x7f04014c
+        0x7f040302
+        0x7f0403a9
     .end array-data
 
     :array_1a
     .array-data 4
         0x7f040050
         0x7f040051
-        0x7f040064
-        0x7f040112
-        0x7f040125
-        0x7f040126
-        0x7f04015a
-        0x7f040164
-        0x7f04026c
-        0x7f04028f
-        0x7f0402c8
-        0x7f0402f6
-        0x7f0403d7
+        0x7f040065
+        0x7f040114
+        0x7f040127
+        0x7f040128
+        0x7f04015c
+        0x7f040166
+        0x7f04026f
+        0x7f040292
+        0x7f0402cb
+        0x7f0402f9
+        0x7f0403da
     .end array-data
 
     :array_1b
     .array-data 4
-        0x7f040132
-        0x7f040133
-        0x7f0401f5
-        0x7f04024b
+        0x7f040134
+        0x7f040135
+        0x7f0401f7
+        0x7f04024e
     .end array-data
 
     :array_1c
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_1d
@@ -2364,18 +2364,18 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_1e
     .array-data 4
         0x1010109
         0x1010200
-        0x7f040149
+        0x7f04014b
     .end array-data
 
     :array_1f
@@ -2385,10 +2385,10 @@
         0x1010126
         0x1010127
         0x1010128
-        0x7f040104
-        0x7f040109
-        0x7f04026e
-        0x7f0402f5
+        0x7f040105
+        0x7f04010a
+        0x7f040271
+        0x7f0402f8
     .end array-data
 
     :array_20
@@ -2413,47 +2413,44 @@
         0x10101ba
         0x7f040050
         0x7f040051
-        0x7f0400d6
-        0x7f0401c7
+        0x7f0400d7
         0x7f0401c9
-        0x7f0401ca
         0x7f0401cb
+        0x7f0401cc
         0x7f0401cd
-        0x7f0401ce
-        0x7f0402c8
-        0x7f04030f
-        0x7f040310
+        0x7f0401cf
+        0x7f0401d0
+        0x7f0402cb
+        0x7f040312
+        0x7f040313
     .end array-data
 
     :array_23
     .array-data 4
-        0x7f04030f
-        0x7f040310
+        0x7f040312
+        0x7f040313
     .end array-data
 
     :array_24
     .array-data 4
-        0x7f040068
         0x7f040069
-        0x7f040095
-        0x7f04009f
-        0x7f0400a3
-        0x7f0400b2
+        0x7f04006a
+        0x7f040096
+        0x7f0400a0
+        0x7f0400a4
         0x7f0400b3
-        0x7f0400b9
-        0x7f0400bc
-        0x7f0400c0
-        0x7f040111
-        0x7f04013d
-        0x7f040268
-        0x7f040269
-        0x7f040274
-        0x7f0402e7
-        0x7f0402fc
-        0x7f040332
-        0x7f04033a
-        0x7f04033b
-        0x7f04033c
+        0x7f0400b4
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c1
+        0x7f040113
+        0x7f04013f
+        0x7f04026b
+        0x7f04026c
+        0x7f040277
+        0x7f0402ea
+        0x7f0402ff
+        0x7f040335
         0x7f04033d
         0x7f04033e
         0x7f04033f
@@ -2461,10 +2458,13 @@
         0x7f040341
         0x7f040342
         0x7f040343
-        0x7f040348
-        0x7f04034d
-        0x7f04034e
-        0x7f040352
+        0x7f040344
+        0x7f040345
+        0x7f040346
+        0x7f04034b
+        0x7f040350
+        0x7f040351
+        0x7f040355
     .end array-data
 
     :array_25
@@ -2496,12 +2496,12 @@
         0x7f04001f
         0x7f040020
         0x7f040031
-        0x7f0400c7
-        0x7f0401cd
-        0x7f0401ce
-        0x7f040277
-        0x7f0402f1
-        0x7f0403bf
+        0x7f0400c8
+        0x7f0401cf
+        0x7f0401d0
+        0x7f04027a
+        0x7f0402f4
+        0x7f0403c2
     .end array-data
 
     :array_27
@@ -2513,8 +2513,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04028d
-        0x7f040311
+        0x7f040290
+        0x7f040314
     .end array-data
 
     :array_28
@@ -2522,43 +2522,43 @@
         0x10100d4
         0x10100dd
         0x101011f
-        0x7f040112
-        0x7f040155
-        0x7f0401ee
-        0x7f0401ef
+        0x7f040114
+        0x7f040157
+        0x7f0401f0
         0x7f0401f1
         0x7f0401f3
-        0x7f0401f6
-        0x7f0401f9
-        0x7f04026f
+        0x7f0401f5
+        0x7f0401f8
+        0x7f0401fb
+        0x7f040272
     .end array-data
 
     :array_29
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040278
+        0x7f04027b
     .end array-data
 
     :array_2a
     .array-data 4
-        0x7f04027c
         0x7f04027f
+        0x7f040282
     .end array-data
 
     :array_2b
     .array-data 4
         0x10100c4
         0x10100f1
-        0x7f04012b
-        0x7f04012c
         0x7f04012d
         0x7f04012e
         0x7f04012f
-        0x7f0401ff
-        0x7f0402c7
-        0x7f0402fe
-        0x7f040304
+        0x7f040130
+        0x7f040131
+        0x7f040201
+        0x7f0402ca
+        0x7f040301
+        0x7f040307
     .end array-data
 
     :array_2c
@@ -2567,32 +2567,32 @@
         0x101011f
         0x1010220
         0x1010264
-        0x7f0400a5
-        0x7f0400c2
-        0x7f0400ff
-        0x7f04014f
-        0x7f0401cf
-        0x7f0401fe
-        0x7f0402bd
-        0x7f0402be
-        0x7f0402e9
-        0x7f0402ea
-        0x7f040312
-        0x7f040317
-        0x7f0403dd
+        0x7f0400a6
+        0x7f0400c3
+        0x7f040100
+        0x7f040151
+        0x7f0401d1
+        0x7f040200
+        0x7f0402c0
+        0x7f0402c1
+        0x7f0402ec
+        0x7f0402ed
+        0x7f040315
+        0x7f04031a
+        0x7f0403e2
     .end array-data
 
     :array_2d
     .array-data 4
-        0x7f0402fc
-        0x7f0402fd
+        0x7f0402ff
+        0x7f040300
     .end array-data
 
     :array_2e
     .array-data 4
         0x101011f
-        0x7f040112
-        0x7f04026a
+        0x7f040114
+        0x7f04026d
     .end array-data
 
     :array_2f
@@ -2601,7 +2601,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_30
@@ -2609,17 +2609,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f0402f7
-        0x7f040302
-        0x7f040318
-        0x7f040319
+        0x7f0402fa
+        0x7f040305
         0x7f04031b
-        0x7f0403a7
-        0x7f0403a8
-        0x7f0403a9
-        0x7f0403c0
-        0x7f0403c1
-        0x7f0403c2
+        0x7f04031c
+        0x7f04031e
+        0x7f0403aa
+        0x7f0403ab
+        0x7f0403ac
+        0x7f0403c3
+        0x7f0403c4
+        0x7f0403c5
     .end array-data
 
     :array_31
@@ -2631,9 +2631,6 @@
 
     :array_32
     .array-data 4
-        0x7f04031c
-        0x7f04031d
-        0x7f04031e
         0x7f04031f
         0x7f040320
         0x7f040321
@@ -2653,9 +2650,12 @@
         0x7f04032f
         0x7f040330
         0x7f040331
+        0x7f040332
         0x7f040333
         0x7f040334
-        0x7f040335
+        0x7f040336
+        0x7f040337
+        0x7f040338
     .end array-data
 
     :array_33
@@ -2671,15 +2671,14 @@
         0x1010163
         0x1010164
         0x10103ac
-        0x7f04013f
-        0x7f040339
+        0x7f040141
+        0x7f04033c
     .end array-data
 
     :array_34
     .array-data 4
         0x101009a
         0x1010150
-        0x7f04006a
         0x7f04006b
         0x7f04006c
         0x7f04006d
@@ -2688,72 +2687,73 @@
         0x7f040070
         0x7f040071
         0x7f040072
-        0x7f0400d7
+        0x7f040073
         0x7f0400d8
         0x7f0400d9
         0x7f0400da
-        0x7f040116
-        0x7f040117
-        0x7f040157
-        0x7f040158
+        0x7f0400db
+        0x7f040118
+        0x7f040119
         0x7f040159
-        0x7f04015e
+        0x7f04015a
+        0x7f04015b
         0x7f040160
-        0x7f040161
-        0x7f040283
-        0x7f040284
-        0x7f040285
+        0x7f040162
+        0x7f040163
         0x7f040286
         0x7f040287
+        0x7f040288
+        0x7f040289
+        0x7f04028a
     .end array-data
 
     :array_35
     .array-data 4
         0x1010034
-        0x7f040114
-        0x7f040115
+        0x7f040116
+        0x7f040117
     .end array-data
 
     :array_36
     .array-data 4
         0x10100af
         0x1010140
-        0x7f040079
-        0x7f0400ad
+        0x7f04007a
         0x7f0400ae
-        0x7f0400c8
+        0x7f0400af
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f040257
-        0x7f040258
-        0x7f04026b
-        0x7f040271
-        0x7f040272
-        0x7f04028b
-        0x7f040313
-        0x7f040314
-        0x7f040315
-        0x7f0403af
-        0x7f0403b1
+        0x7f0400ce
+        0x7f04025a
+        0x7f04025b
+        0x7f04026e
+        0x7f040274
+        0x7f040275
+        0x7f04028e
+        0x7f040316
+        0x7f040317
+        0x7f040318
         0x7f0403b2
-        0x7f0403b3
         0x7f0403b4
         0x7f0403b5
         0x7f0403b6
         0x7f0403b7
         0x7f0403b8
+        0x7f0403b9
+        0x7f0403ba
+        0x7f0403bb
     .end array-data
 
     :array_37
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04027d
-        0x7f04027e
-        0x7f040355
+        0x7f040280
+        0x7f040281
+        0x7f040358
     .end array-data
 
     :array_38
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$1.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$1.smali
index bc59f5a562..047fa2d62a 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aPG:Lcom/google/android/material/appbar/AppBarLayout;
+.field final synthetic aPY:Lcom/google/android/material/appbar/AppBarLayout;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/appbar/AppBarLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$1;->aPG:Lcom/google/android/material/appbar/AppBarLayout;
+    iput-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$1;->aPY:Lcom/google/android/material/appbar/AppBarLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$1;->aPG:Lcom/google/android/material/appbar/AppBarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$1;->aPY:Lcom/google/android/material/appbar/AppBarLayout;
 
     invoke-virtual {p1, p2}, Lcom/google/android/material/appbar/AppBarLayout;->onWindowInsetChanged(Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$1.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$1.smali
index 7222b1eebb..1aebf39d65 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$1.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic aPH:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+.field final synthetic aPZ:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-.field final synthetic aPI:Lcom/google/android/material/appbar/AppBarLayout;
+.field final synthetic aQa:Lcom/google/android/material/appbar/AppBarLayout;
 
-.field final synthetic aPJ:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
+.field final synthetic aQb:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
 
 
 # direct methods
 .method 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$1;->aPJ:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
+    iput-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aQb:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aPH:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iput-object p2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aPZ:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iput-object p3, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aPI:Lcom/google/android/material/appbar/AppBarLayout;
+    iput-object p3, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aQa:Lcom/google/android/material/appbar/AppBarLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,11 +45,11 @@
 .method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aPJ:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
+    iget-object v0, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aQb:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aPH:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aPZ:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aPI:Lcom/google/android/material/appbar/AppBarLayout;
+    iget-object v2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aQa: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/CollapsingToolbarLayout$1.smali b/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$1.smali
index a96bdc2d4c..0c48c0c39e 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+.field final synthetic aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/appbar/CollapsingToolbarLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$1;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$1;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$1;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$1;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     invoke-virtual {p1, p2}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->onWindowInsetChanged(Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$2.smali b/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$2.smali
index 613fa36cce..2bad070e7c 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$2.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+.field final synthetic aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/appbar/CollapsingToolbarLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$2;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$2;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$2;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$2;->aQc: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/appbar/CollapsingToolbarLayout$a.smali b/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$a.smali
index 90b3327091..f8a3e5194e 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+.field final synthetic aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/appbar/CollapsingToolbarLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onOffsetChanged(Lcom/google/android/material/appbar/AppBarLayout;I)V
     .locals 8
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     iput p2, p1, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->currentOffset:I
 
@@ -47,7 +47,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     iget-object p1, p1, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->lastInsets:Landroidx/core/view/WindowInsetsCompat;
 
@@ -61,7 +61,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     invoke-virtual {v1}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->getChildCount()I
 
@@ -72,7 +72,7 @@
     :goto_1
     if-ge v2, v1, :cond_3
 
-    iget-object v3, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v3, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     invoke-virtual {v3, v2}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->getChildAt(I)Landroid/view/View;
 
@@ -120,7 +120,7 @@
     :cond_2
     neg-int v4, p2
 
-    iget-object v6, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v6, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     invoke-virtual {v6, v3}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->getMaxOffsetForPinChild(Landroid/view/View;)I
 
@@ -138,11 +138,11 @@
     goto :goto_1
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->updateScrimVisibility()V
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     iget-object v0, v0, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->statusBarScrim:Landroid/graphics/drawable/Drawable;
 
@@ -150,18 +150,18 @@
 
     if-lez p1, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->getHeight()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     invoke-static {v1}, Landroidx/core/view/ViewCompat;->getMinimumHeight(Landroid/view/View;)I
 
@@ -171,7 +171,7 @@
 
     sub-int/2addr v0, p1
 
-    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aPK:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aQc:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     iget-object p1, p1, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout.smali b/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout.smali
index 25f2bdff5b..d33705b62c 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout.smali
@@ -1163,7 +1163,7 @@
 
     move-result v2
 
-    iget v0, v0, Lcom/google/android/material/appbar/d;->aPO:I
+    iget v0, v0, Lcom/google/android/material/appbar/d;->aQg:I
 
     sub-int/2addr v2, v0
 
@@ -1618,7 +1618,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/material/appbar/d;->Ac()V
+    invoke-virtual {p2}, Lcom/google/android/material/appbar/d;->zY()V
 
     add-int/lit8 v0, v0, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/a$a.smali b/com.discord/smali_classes2/com/google/android/material/appbar/a$a.smali
index 1bb8d84e20..7ac7327c85 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/a$a.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field private final aPL:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+.field private final aQd:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-.field private final aPM:Landroid/view/View;
+.field private final aQe:Landroid/view/View;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field final synthetic aPN:Lcom/google/android/material/appbar/a;
+.field final synthetic aQf:Lcom/google/android/material/appbar/a;
 
 
 # direct methods
@@ -42,13 +42,13 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/material/appbar/a$a;->aPN:Lcom/google/android/material/appbar/a;
+    iput-object p1, p0, Lcom/google/android/material/appbar/a$a;->aQf:Lcom/google/android/material/appbar/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/material/appbar/a$a;->aPL:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iput-object p2, p0, Lcom/google/android/material/appbar/a$a;->aQd:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iput-object p3, p0, Lcom/google/android/material/appbar/a$a;->aPM:Landroid/view/View;
+    iput-object p3, p0, Lcom/google/android/material/appbar/a$a;->aQe:Landroid/view/View;
 
     return-void
 .end method
@@ -58,17 +58,17 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aPM:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aQe:Landroid/view/View;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aPN:Lcom/google/android/material/appbar/a;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aQf:Lcom/google/android/material/appbar/a;
 
     iget-object v0, v0, Lcom/google/android/material/appbar/a;->scroller:Landroid/widget/OverScroller;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aPN:Lcom/google/android/material/appbar/a;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aQf:Lcom/google/android/material/appbar/a;
 
     iget-object v0, v0, Lcom/google/android/material/appbar/a;->scroller:Landroid/widget/OverScroller;
 
@@ -78,11 +78,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aPN:Lcom/google/android/material/appbar/a;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aQf:Lcom/google/android/material/appbar/a;
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/a$a;->aPL:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/a$a;->aQd:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/appbar/a$a;->aPM:Landroid/view/View;
+    iget-object v2, p0, Lcom/google/android/material/appbar/a$a;->aQe:Landroid/view/View;
 
     iget-object v3, v0, Lcom/google/android/material/appbar/a;->scroller:Landroid/widget/OverScroller;
 
@@ -92,18 +92,18 @@
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/material/appbar/a;->setHeaderTopBottomOffset(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;I)I
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aPM:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aQe:Landroid/view/View;
 
     invoke-static {v0, p0}, Landroidx/core/view/ViewCompat;->postOnAnimation(Landroid/view/View;Ljava/lang/Runnable;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aPN:Lcom/google/android/material/appbar/a;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aQf:Lcom/google/android/material/appbar/a;
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/a$a;->aPL:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/a$a;->aQd:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/appbar/a$a;->aPM:Landroid/view/View;
+    iget-object v2, p0, Lcom/google/android/material/appbar/a$a;->aQe:Landroid/view/View;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/material/appbar/a;->onFlingFinished(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/c.smali b/com.discord/smali_classes2/com/google/android/material/appbar/c.smali
index b801f07a93..4c61bec532 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/c.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/c.smali
@@ -61,7 +61,7 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, v0, Lcom/google/android/material/appbar/d;->aPR:I
+    iget v0, v0, Lcom/google/android/material/appbar/d;->aQj:I
 
     return v0
 
@@ -78,7 +78,7 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, v0, Lcom/google/android/material/appbar/d;->aPQ:I
+    iget v0, v0, Lcom/google/android/material/appbar/d;->aQi:I
 
     return v0
 
@@ -128,7 +128,7 @@
     :cond_0
     iget-object p1, p0, Lcom/google/android/material/appbar/c;->viewOffsetHelper:Lcom/google/android/material/appbar/d;
 
-    invoke-virtual {p1}, Lcom/google/android/material/appbar/d;->Ac()V
+    invoke-virtual {p1}, Lcom/google/android/material/appbar/d;->zY()V
 
     iget p1, p0, Lcom/google/android/material/appbar/c;->tempTopBottomOffset:I
 
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/d.smali b/com.discord/smali_classes2/com/google/android/material/appbar/d.smali
index 3b0038115b..3b40bf1acf 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/d.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/d.smali
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field aPO:I
+.field aQg:I
 
-.field private aPP:I
+.field private aQh:I
 
-.field aPQ:I
+.field aQi:I
 
-.field aPR:I
+.field aQj:I
 
 .field private final view:Landroid/view/View;
 
@@ -26,18 +26,18 @@
     return-void
 .end method
 
-.method private Ad()V
+.method private zZ()V
     .locals 4
 
     iget-object v0, p0, Lcom/google/android/material/appbar/d;->view:Landroid/view/View;
 
-    iget v1, p0, Lcom/google/android/material/appbar/d;->aPQ:I
+    iget v1, p0, Lcom/google/android/material/appbar/d;->aQi:I
 
     invoke-virtual {v0}, Landroid/view/View;->getTop()I
 
     move-result v2
 
-    iget v3, p0, Lcom/google/android/material/appbar/d;->aPO:I
+    iget v3, p0, Lcom/google/android/material/appbar/d;->aQg:I
 
     sub-int/2addr v2, v3
 
@@ -47,13 +47,13 @@
 
     iget-object v0, p0, Lcom/google/android/material/appbar/d;->view:Landroid/view/View;
 
-    iget v1, p0, Lcom/google/android/material/appbar/d;->aPR:I
+    iget v1, p0, Lcom/google/android/material/appbar/d;->aQj:I
 
     invoke-virtual {v0}, Landroid/view/View;->getLeft()I
 
     move-result v2
 
-    iget v3, p0, Lcom/google/android/material/appbar/d;->aPP:I
+    iget v3, p0, Lcom/google/android/material/appbar/d;->aQh:I
 
     sub-int/2addr v2, v3
 
@@ -66,40 +66,16 @@
 
 
 # virtual methods
-.method public final Ac()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/material/appbar/d;->view:Landroid/view/View;
-
-    invoke-virtual {v0}, Landroid/view/View;->getTop()I
-
-    move-result v0
-
-    iput v0, p0, Lcom/google/android/material/appbar/d;->aPO:I
-
-    iget-object v0, p0, Lcom/google/android/material/appbar/d;->view:Landroid/view/View;
-
-    invoke-virtual {v0}, Landroid/view/View;->getLeft()I
-
-    move-result v0
-
-    iput v0, p0, Lcom/google/android/material/appbar/d;->aPP:I
-
-    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->Ad()V
-
-    return-void
-.end method
-
 .method public final setLeftAndRightOffset(I)Z
     .locals 1
 
-    iget v0, p0, Lcom/google/android/material/appbar/d;->aPR:I
+    iget v0, p0, Lcom/google/android/material/appbar/d;->aQj:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/appbar/d;->aPR:I
+    iput p1, p0, Lcom/google/android/material/appbar/d;->aQj:I
 
-    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->Ad()V
+    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zZ()V
 
     const/4 p1, 0x1
 
@@ -114,13 +90,13 @@
 .method public final setTopAndBottomOffset(I)Z
     .locals 1
 
-    iget v0, p0, Lcom/google/android/material/appbar/d;->aPQ:I
+    iget v0, p0, Lcom/google/android/material/appbar/d;->aQi:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/appbar/d;->aPQ:I
+    iput p1, p0, Lcom/google/android/material/appbar/d;->aQi:I
 
-    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->Ad()V
+    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zZ()V
 
     const/4 p1, 0x1
 
@@ -131,3 +107,27 @@
 
     return p1
 .end method
+
+.method public final zY()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/material/appbar/d;->view:Landroid/view/View;
+
+    invoke-virtual {v0}, Landroid/view/View;->getTop()I
+
+    move-result v0
+
+    iput v0, p0, Lcom/google/android/material/appbar/d;->aQg:I
+
+    iget-object v0, p0, Lcom/google/android/material/appbar/d;->view:Landroid/view/View;
+
+    invoke-virtual {v0}, Landroid/view/View;->getLeft()I
+
+    move-result v0
+
+    iput v0, p0, Lcom/google/android/material/appbar/d;->aQh:I
+
+    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zZ()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/e.smali b/com.discord/smali_classes2/com/google/android/material/appbar/e.smali
index 4170ffb497..e681f5b03d 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/e.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/e.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final aPS:[I
+.field private static final aQk:[I
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     aput v2, v0, v1
 
-    sput-object v0, Lcom/google/android/material/appbar/e;->aPS:[I
+    sput-object v0, Lcom/google/android/material/appbar/e;->aQk:[I
 
     return-void
 .end method
@@ -135,7 +135,7 @@
 
     move-result-object v6
 
-    sget-object v2, Lcom/google/android/material/appbar/e;->aPS:[I
+    sget-object v2, Lcom/google/android/material/appbar/e;->aQk:[I
 
     const/4 v7, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/behavior/HideBottomViewOnScrollBehavior$1.smali b/com.discord/smali_classes2/com/google/android/material/behavior/HideBottomViewOnScrollBehavior$1.smali
index 1b090adeb8..01453c0743 100644
--- a/com.discord/smali_classes2/com/google/android/material/behavior/HideBottomViewOnScrollBehavior$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/behavior/HideBottomViewOnScrollBehavior$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aPT:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
+.field final synthetic aQl:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior$1;->aPT:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
+    iput-object p1, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior$1;->aQl:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior$1;->aPT:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
+    iget-object p1, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior$1;->aQl:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior$1.smali b/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior$1.smali
index fcd37f8206..f933a1cec1 100644
--- a/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior$1.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private aPU:I
+.field private aQm:I
 
-.field final synthetic aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+.field final synthetic aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
 .field private activePointerId:I
 
@@ -26,7 +26,7 @@
 .method constructor <init>(Lcom/google/android/material/behavior/SwipeDismissBehavior;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iput-object p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     invoke-direct {p0}, Landroidx/customview/widget/ViewDragHelper$Callback;-><init>()V
 
@@ -58,7 +58,7 @@
     const/4 p3, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget v1, v1, Lcom/google/android/material/behavior/SwipeDismissBehavior;->swipeDirection:I
 
@@ -66,7 +66,7 @@
 
     if-eqz p3, :cond_1
 
-    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     invoke-virtual {p1}, Landroid/view/View;->getWidth()I
 
@@ -74,12 +74,12 @@
 
     sub-int/2addr p3, p1
 
-    iget p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iget p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     goto :goto_2
 
     :cond_1
-    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     invoke-virtual {p1}, Landroid/view/View;->getWidth()I
 
@@ -91,7 +91,7 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget v1, v1, Lcom/google/android/material/behavior/SwipeDismissBehavior;->swipeDirection:I
 
@@ -99,7 +99,7 @@
 
     if-eqz p3, :cond_3
 
-    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     invoke-virtual {p1}, Landroid/view/View;->getWidth()I
 
@@ -108,7 +108,7 @@
     goto :goto_1
 
     :cond_3
-    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     invoke-virtual {p1}, Landroid/view/View;->getWidth()I
 
@@ -116,12 +116,12 @@
 
     sub-int/2addr p3, p1
 
-    iget p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iget p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     goto :goto_2
 
     :cond_4
-    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     invoke-virtual {p1}, Landroid/view/View;->getWidth()I
 
@@ -129,7 +129,7 @@
 
     sub-int/2addr p3, v0
 
-    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     invoke-virtual {p1}, Landroid/view/View;->getWidth()I
 
@@ -174,7 +174,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iput p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
 
@@ -193,13 +193,13 @@
 .method public final onViewDragStateChanged(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget-object v0, v0, Lcom/google/android/material/behavior/SwipeDismissBehavior;->listener:Lcom/google/android/material/behavior/SwipeDismissBehavior$OnDismissListener;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget-object v0, v0, Lcom/google/android/material/behavior/SwipeDismissBehavior;->listener:Lcom/google/android/material/behavior/SwipeDismissBehavior$OnDismissListener;
 
@@ -212,7 +212,7 @@
 .method public final onViewPositionChanged(Landroid/view/View;IIII)V
     .locals 2
 
-    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     int-to-float p3, p3
 
@@ -222,7 +222,7 @@
 
     int-to-float p4, p4
 
-    iget-object p5, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p5, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget p5, p5, Lcom/google/android/material/behavior/SwipeDismissBehavior;->alphaStartSwipeDistance:F
 
@@ -230,7 +230,7 @@
 
     add-float/2addr p3, p4
 
-    iget p4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iget p4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     int-to-float p4, p4
 
@@ -240,7 +240,7 @@
 
     int-to-float p5, p5
 
-    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget v0, v0, Lcom/google/android/material/behavior/SwipeDismissBehavior;->alphaEndSwipeDistance:F
 
@@ -322,7 +322,7 @@
     const/4 v3, 0x0
 
     :goto_0
-    iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget v4, v4, Lcom/google/android/material/behavior/SwipeDismissBehavior;->swipeDirection:I
 
@@ -333,7 +333,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget v4, v4, Lcom/google/android/material/behavior/SwipeDismissBehavior;->swipeDirection:I
 
@@ -355,7 +355,7 @@
     goto :goto_1
 
     :cond_3
-    iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget v4, v4, Lcom/google/android/material/behavior/SwipeDismissBehavior;->swipeDirection:I
 
@@ -381,7 +381,7 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     sub-int/2addr p2, v0
 
@@ -391,7 +391,7 @@
 
     int-to-float v0, v0
 
-    iget-object v3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget v3, v3, Lcom/google/android/material/behavior/SwipeDismissBehavior;->dragDismissThreshold:F
 
@@ -422,7 +422,7 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     if-ge p2, v0, :cond_7
 
@@ -439,10 +439,10 @@
     goto :goto_4
 
     :cond_8
-    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPU:I
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQm:I
 
     :goto_4
-    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget-object p2, p2, Lcom/google/android/material/behavior/SwipeDismissBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
 
@@ -458,7 +458,7 @@
 
     new-instance p2, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;
 
-    iget-object p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     invoke-direct {p2, p3, p1, v1}, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;-><init>(Lcom/google/android/material/behavior/SwipeDismissBehavior;Landroid/view/View;Z)V
 
@@ -469,13 +469,13 @@
     :cond_9
     if-eqz v1, :cond_a
 
-    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget-object p2, p2, Lcom/google/android/material/behavior/SwipeDismissBehavior;->listener:Lcom/google/android/material/behavior/SwipeDismissBehavior$OnDismissListener;
 
     if-eqz p2, :cond_a
 
-    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget-object p2, p2, Lcom/google/android/material/behavior/SwipeDismissBehavior;->listener:Lcom/google/android/material/behavior/SwipeDismissBehavior$OnDismissListener;
 
@@ -494,7 +494,7 @@
 
     if-ne p2, v0, :cond_0
 
-    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     invoke-virtual {p2, p1}, Lcom/google/android/material/behavior/SwipeDismissBehavior;->canSwipeDismissView(Landroid/view/View;)Z
 
diff --git a/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior$a.smali b/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior$a.smali
index 6ea18b1639..78b353dc22 100644
--- a/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/behavior/SwipeDismissBehavior$a.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field final synthetic aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+.field final synthetic aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
-.field private final aPW:Z
+.field private final aQo:Z
 
 .field private final view:Landroid/view/View;
 
@@ -29,13 +29,13 @@
 .method constructor <init>(Lcom/google/android/material/behavior/SwipeDismissBehavior;Landroid/view/View;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iput-object p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->view:Landroid/view/View;
 
-    iput-boolean p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aPW:Z
+    iput-boolean p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aQo:Z
 
     return-void
 .end method
@@ -45,13 +45,13 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget-object v0, v0, Lcom/google/android/material/behavior/SwipeDismissBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget-object v0, v0, Lcom/google/android/material/behavior/SwipeDismissBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
 
@@ -70,17 +70,17 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aPW:Z
+    iget-boolean v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aQo:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget-object v0, v0, Lcom/google/android/material/behavior/SwipeDismissBehavior;->listener:Lcom/google/android/material/behavior/SwipeDismissBehavior$OnDismissListener;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aPV:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aQn:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
     iget-object v0, v0, Lcom/google/android/material/behavior/SwipeDismissBehavior;->listener:Lcom/google/android/material/behavior/SwipeDismissBehavior$OnDismissListener;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$1.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$1.smali
index 10faabb458..12b7498508 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$1;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$1;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$1;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$1;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$2.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$2.smali
index 79b2f2ea6c..eb9f493b62 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$2.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$2;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$2;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$2;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$2;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {v0}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$100(Lcom/google/android/material/bottomappbar/BottomAppBar;)Lcom/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment;
 
@@ -55,7 +55,7 @@
 
     invoke-virtual {v0, p1}, Lcom/google/android/material/bottomappbar/BottomAppBarTopEdgeTreatment;->setHorizontalOffset(F)V
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$2;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$2;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {p1}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$200(Lcom/google/android/material/bottomappbar/BottomAppBar;)Lcom/google/android/material/shape/MaterialShapeDrawable;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$3.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$3.smali
index 4d8a419fc0..b72b2d1ee1 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$3.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$3.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$3;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$3;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$3;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$3;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$4.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$4.smali
index cc10b04471..6146fa4939 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$4.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$4.smali
@@ -15,13 +15,13 @@
 
 
 # instance fields
-.field final synthetic aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
-.field final synthetic aPY:Landroidx/appcompat/widget/ActionMenuView;
+.field final synthetic aQq:Landroidx/appcompat/widget/ActionMenuView;
 
-.field final synthetic aPZ:I
+.field final synthetic aQr:I
 
-.field final synthetic aQa:Z
+.field final synthetic aQs:Z
 
 .field public cancelled:Z
 
@@ -30,13 +30,13 @@
 .method 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$4;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
-    iput-object p2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aPY:Landroidx/appcompat/widget/ActionMenuView;
+    iput-object p2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aQq:Landroidx/appcompat/widget/ActionMenuView;
 
-    iput p3, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aPZ:I
+    iput p3, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aQr:I
 
-    iput-boolean p4, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aQa:Z
+    iput-boolean p4, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aQs:Z
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -62,13 +62,13 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aPY:Landroidx/appcompat/widget/ActionMenuView;
+    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aQq:Landroidx/appcompat/widget/ActionMenuView;
 
-    iget v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aPZ:I
+    iget v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aQr:I
 
-    iget-boolean v2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aQa:Z
+    iget-boolean v2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aQs:Z
 
     invoke-static {p1, v0, v1, v2}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$400(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$5.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$5.smali
index 297b696f85..14cc59ff1c 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$5.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$5.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$5;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$5;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$5;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$5;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$6.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$6.smali
index da14c61c56..4a333e0622 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$6.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$6.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$6;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$6;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$6;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$6;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {v0}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$200(Lcom/google/android/material/bottomappbar/BottomAppBar;)Lcom/google/android/material/shape/MaterialShapeDrawable;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$7.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$7.smali
index a9a57190f5..5594a41938 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$7.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$7.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final onAnimationStart(Landroid/animation/Animator;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {p1}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$600(Lcom/google/android/material/bottomappbar/BottomAppBar;)Z
 
@@ -42,13 +42,13 @@
 
     invoke-static {p1, v0}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$700(Lcom/google/android/material/bottomappbar/BottomAppBar;Z)V
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {p1}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$800(Lcom/google/android/material/bottomappbar/BottomAppBar;)I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aPX:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aQp:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {v1}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$600(Lcom/google/android/material/bottomappbar/BottomAppBar;)Z
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationMenuView$1.smali b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationMenuView$1.smali
index 1b101a37d7..752d6bcff1 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationMenuView$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationMenuView$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aQb:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+.field final synthetic aQt:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView$1;->aQb:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView$1;->aQt:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,13 +43,13 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView$1;->aQb:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView$1;->aQt:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
 
     invoke-static {v0}, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->access$100(Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;)Landroidx/appcompat/view/menu/MenuBuilder;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView$1;->aQb:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView$1;->aQt:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
 
     invoke-static {v1}, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->access$000(Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;)Lcom/google/android/material/bottomnavigation/BottomNavigationPresenter;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$1.smali b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$1.smali
index c453fd7fb6..e64b2a3335 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aQc:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+.field final synthetic aQu:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomnavigation/BottomNavigationView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aQc:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aQu:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onMenuItemSelected(Landroidx/appcompat/view/menu/MenuBuilder;Landroid/view/MenuItem;)Z
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aQc:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aQu:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
 
     invoke-static {p1}, Lcom/google/android/material/bottomnavigation/BottomNavigationView;->access$000(Lcom/google/android/material/bottomnavigation/BottomNavigationView;)Lcom/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemReselectedListener;
 
@@ -51,7 +51,7 @@
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aQc:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aQu:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
 
     invoke-virtual {v1}, Lcom/google/android/material/bottomnavigation/BottomNavigationView;->getSelectedItemId()I
 
@@ -59,7 +59,7 @@
 
     if-ne p1, v1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aQc:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aQu:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
 
     invoke-static {p1}, Lcom/google/android/material/bottomnavigation/BottomNavigationView;->access$000(Lcom/google/android/material/bottomnavigation/BottomNavigationView;)Lcom/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemReselectedListener;
 
@@ -70,7 +70,7 @@
     return v0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aQc:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aQu:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
 
     invoke-static {p1}, Lcom/google/android/material/bottomnavigation/BottomNavigationView;->access$100(Lcom/google/android/material/bottomnavigation/BottomNavigationView;)Lcom/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemSelectedListener;
 
@@ -78,7 +78,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aQc:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aQu:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
 
     invoke-static {p1}, Lcom/google/android/material/bottomnavigation/BottomNavigationView;->access$100(Lcom/google/android/material/bottomnavigation/BottomNavigationView;)Lcom/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemSelectedListener;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$SavedState.smali b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$SavedState.smali
index e22e32cfbf..852f09dee2 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$SavedState.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView$SavedState.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field aQd:Landroid/os/Bundle;
+.field aQv:Landroid/os/Bundle;
 
 
 # direct methods
@@ -52,7 +52,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aQd:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aQv:Landroid/os/Bundle;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     invoke-super {p0, p1, p2}, Landroidx/customview/view/AbsSavedState;->writeToParcel(Landroid/os/Parcel;I)V
 
-    iget-object p2, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aQd:Landroid/os/Bundle;
+    iget-object p2, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aQv:Landroid/os/Bundle;
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeBundle(Landroid/os/Bundle;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView.smali b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView.smali
index 6d48fc5e89..6490fae98f 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomnavigation/BottomNavigationView.smali
@@ -611,7 +611,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
 
-    iget-object p1, p1, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aQd:Landroid/os/Bundle;
+    iget-object p1, p1, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aQv:Landroid/os/Bundle;
 
     invoke-virtual {v0, p1}, Landroidx/appcompat/view/menu/MenuBuilder;->restorePresenterStates(Landroid/os/Bundle;)V
 
@@ -633,11 +633,11 @@
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
 
-    iput-object v0, v1, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aQd:Landroid/os/Bundle;
+    iput-object v0, v1, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aQv:Landroid/os/Bundle;
 
     iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
 
-    iget-object v2, v1, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aQd:Landroid/os/Bundle;
+    iget-object v2, v1, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aQv:Landroid/os/Bundle;
 
     invoke-virtual {v0, v2}, Landroidx/appcompat/view/menu/MenuBuilder;->savePresenterStates(Landroid/os/Bundle;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$1.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$1.smali
index 3bf48b3147..8d08c84dfb 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$1.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic aQe:Landroid/view/View;
+.field final synthetic aQw:Landroid/view/View;
 
-.field final synthetic aQf:I
+.field final synthetic aQx:I
 
-.field final synthetic aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+.field final synthetic aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;Landroid/view/View;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aQe:Landroid/view/View;
+    iput-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aQw:Landroid/view/View;
 
-    iput p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aQf:I
+    iput p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aQx:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,11 +45,11 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-    iget-object v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aQe:Landroid/view/View;
+    iget-object v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aQw:Landroid/view/View;
 
-    iget v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aQf:I
+    iget v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aQx:I
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->startSettlingAnimation(Landroid/view/View;I)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$2.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$2.smali
index f13f57d16d..aa4fcc4c83 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$2.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$2.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+.field final synthetic aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-direct {p0}, Landroidx/customview/widget/ViewDragHelper$Callback;-><init>()V
 
@@ -44,26 +44,26 @@
 .method public final clampViewPositionVertical(Landroid/view/View;II)I
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-static {p1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->access$100(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)I
 
     move-result p1
 
-    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget-boolean p3, p3, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->hideable:Z
 
     if-eqz p3, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget p3, p3, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->parentHeight:I
 
     goto :goto_0
 
     :cond_0
-    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget p3, p3, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
@@ -78,20 +78,20 @@
 .method public final getViewVerticalDragRange(Landroid/view/View;)I
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget-boolean p1, p1, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->hideable:Z
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget p1, p1, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->parentHeight:I
 
     return p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget p1, p1, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
@@ -105,7 +105,7 @@
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setStateInternal(I)V
 
@@ -116,7 +116,7 @@
 .method public final onViewPositionChanged(Landroid/view/View;IIII)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-virtual {p1, p3}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->dispatchOnSlide(I)V
 
@@ -140,7 +140,7 @@
 
     if-gez v5, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-static {p2}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->access$000(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)Z
 
@@ -148,7 +148,7 @@
 
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->fitToContentsOffset:I
 
@@ -163,13 +163,13 @@
 
     move-result p2
 
-    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget p3, p3, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
 
     if-le p2, p3, :cond_0
 
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
 
@@ -179,13 +179,13 @@
     goto/16 :goto_3
 
     :cond_2
-    iget-object v5, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v5, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget-boolean v5, v5, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->hideable:Z
 
     if-eqz v5, :cond_4
 
-    iget-object v5, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v5, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-virtual {v5, p1, p3}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->shouldHide(Landroid/view/View;F)Z
 
@@ -197,7 +197,7 @@
 
     move-result v5
 
-    iget-object v6, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v6, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v6, v6, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
@@ -216,7 +216,7 @@
     if-gez v5, :cond_4
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->parentHeight:I
 
@@ -244,7 +244,7 @@
     goto :goto_2
 
     :cond_5
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
@@ -256,7 +256,7 @@
 
     move-result p2
 
-    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-static {p3}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->access$000(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)Z
 
@@ -264,7 +264,7 @@
 
     if-eqz p3, :cond_8
 
-    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget p3, p3, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->fitToContentsOffset:I
 
@@ -274,7 +274,7 @@
 
     move-result p3
 
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, v0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
@@ -286,27 +286,27 @@
 
     if-ge p3, p2, :cond_7
 
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->fitToContentsOffset:I
 
     goto :goto_0
 
     :cond_7
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
     goto :goto_3
 
     :cond_8
-    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget p3, p3, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
 
     if-ge p2, p3, :cond_a
 
-    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget p3, p3, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
@@ -321,14 +321,14 @@
     goto/16 :goto_0
 
     :cond_9
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
 
     goto/16 :goto_1
 
     :cond_a
-    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget p3, p3, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
 
@@ -338,7 +338,7 @@
 
     move-result p3
 
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, v0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
@@ -350,19 +350,19 @@
 
     if-ge p3, p2, :cond_b
 
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->halfExpandedOffset:I
 
     goto/16 :goto_1
 
     :cond_b
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->collapsedOffset:I
 
     :goto_3
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget-object p2, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
 
@@ -376,7 +376,7 @@
 
     if-eqz p2, :cond_c
 
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     const/4 p3, 0x2
 
@@ -384,7 +384,7 @@
 
     new-instance p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;
 
-    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-direct {p2, p3, p1, v2}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;-><init>(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;Landroid/view/View;I)V
 
@@ -393,7 +393,7 @@
     return-void
 
     :cond_c
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-virtual {p1, v2}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setStateInternal(I)V
 
@@ -403,7 +403,7 @@
 .method public final tryCaptureView(Landroid/view/View;I)Z
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, v0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->state:I
 
@@ -416,7 +416,7 @@
     return v2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget-boolean v0, v0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->touchingScrollingChild:Z
 
@@ -425,7 +425,7 @@
     return v2
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, v0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->state:I
 
@@ -433,13 +433,13 @@
 
     if-ne v0, v3, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget v0, v0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->activePointerId:I
 
     if-ne v0, p2, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget-object p2, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->nestedScrollingChildRef:Ljava/lang/ref/WeakReference;
 
@@ -462,13 +462,13 @@
     return v2
 
     :cond_2
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget-object p2, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewRef:Ljava/lang/ref/WeakReference;
 
     if-eqz p2, :cond_3
 
-    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget-object p2, p2, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewRef:Ljava/lang/ref/WeakReference;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$a.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$a.smali
index a4cb69e67f..f87ac3a7ae 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$a.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field final synthetic aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+.field final synthetic aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-.field private final aQh:I
+.field private final aQz:I
 
 .field private final view:Landroid/view/View;
 
@@ -29,13 +29,13 @@
 .method constructor <init>(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;Landroid/view/View;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->view:Landroid/view/View;
 
-    iput p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aQh:I
+    iput p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aQz:I
 
     return-void
 .end method
@@ -45,13 +45,13 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget-object v0, v0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     iget-object v0, v0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->viewDragHelper:Landroidx/customview/widget/ViewDragHelper;
 
@@ -70,9 +70,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aQg:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aQy:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-    iget v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aQh:I
+    iget v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aQz:I
 
     invoke-virtual {v0, v1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->setStateInternal(I)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$1.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$1.smali
index 26b74f9758..3327e1e019 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+.field final synthetic aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomsheet/BottomSheetDialog;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,13 +37,13 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
     iget-boolean p1, p1, Lcom/google/android/material/bottomsheet/BottomSheetDialog;->cancelable:Z
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
     invoke-virtual {p1}, Lcom/google/android/material/bottomsheet/BottomSheetDialog;->isShowing()Z
 
@@ -51,7 +51,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
     invoke-virtual {p1}, Lcom/google/android/material/bottomsheet/BottomSheetDialog;->shouldWindowCloseOnTouchOutside()Z
 
@@ -59,7 +59,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
     invoke-virtual {p1}, Lcom/google/android/material/bottomsheet/BottomSheetDialog;->cancel()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$2.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$2.smali
index 69b6d06670..b4db6dcf0e 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$2.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$2.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+.field final synthetic aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomsheet/BottomSheetDialog;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
     invoke-direct {p0}, Landroidx/core/view/AccessibilityDelegateCompat;-><init>()V
 
@@ -36,7 +36,7 @@
 
     invoke-super {p0, p1, p2}, Landroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
 
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
     iget-boolean p1, p1, Lcom/google/android/material/bottomsheet/BottomSheetDialog;->cancelable:Z
 
@@ -67,13 +67,13 @@
 
     if-ne p2, v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
     iget-boolean v0, v0, Lcom/google/android/material/bottomsheet/BottomSheetDialog;->cancelable:Z
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
     invoke-virtual {p1}, Lcom/google/android/material/bottomsheet/BottomSheetDialog;->cancel()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$3.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$3.smali
index b5e9e5bf13..2a054522bc 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$3.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$3.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+.field final synthetic aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomsheet/BottomSheetDialog;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$3;->aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$3;->aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$4.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$4.smali
index 49f58ad72e..a2df954706 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$4.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetDialog$4.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+.field final synthetic aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/bottomsheet/BottomSheetDialog;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$4;->aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$4;->aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
     invoke-direct {p0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$BottomSheetCallback;-><init>()V
 
@@ -44,7 +44,7 @@
 
     if-ne p2, p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$4;->aQi:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$4;->aQA:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
 
     invoke-virtual {p1}, Lcom/google/android/material/bottomsheet/BottomSheetDialog;->cancel()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/button/MaterialButton.smali b/com.discord/smali_classes2/com/google/android/material/button/MaterialButton.smali
index 642376fac9..927e18f1cc 100644
--- a/com.discord/smali_classes2/com/google/android/material/button/MaterialButton.smali
+++ b/com.discord/smali_classes2/com/google/android/material/button/MaterialButton.smali
@@ -217,7 +217,7 @@
 
     iput-object v1, p2, Lcom/google/android/material/button/b;->backgroundTintMode:Landroid/graphics/PorterDuff$Mode;
 
-    iget-object v1, p2, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/button/MaterialButton;->getContext()Landroid/content/Context;
 
@@ -231,7 +231,7 @@
 
     iput-object v1, p2, Lcom/google/android/material/button/b;->backgroundTint:Landroid/content/res/ColorStateList;
 
-    iget-object v1, p2, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/button/MaterialButton;->getContext()Landroid/content/Context;
 
@@ -243,9 +243,9 @@
 
     move-result-object v1
 
-    iput-object v1, p2, Lcom/google/android/material/button/b;->aQl:Landroid/content/res/ColorStateList;
+    iput-object v1, p2, Lcom/google/android/material/button/b;->aQD:Landroid/content/res/ColorStateList;
 
-    iget-object v1, p2, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/button/MaterialButton;->getContext()Landroid/content/Context;
 
@@ -259,13 +259,13 @@
 
     iput-object v1, p2, Lcom/google/android/material/button/b;->rippleColor:Landroid/content/res/ColorStateList;
 
-    iget-object v1, p2, Lcom/google/android/material/button/b;->aQm:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aQE:Landroid/graphics/Paint;
 
     sget-object v2, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style;
 
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
 
-    iget-object v1, p2, Lcom/google/android/material/button/b;->aQm:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aQE:Landroid/graphics/Paint;
 
     iget v2, p2, Lcom/google/android/material/button/b;->strokeWidth:I
 
@@ -273,15 +273,15 @@
 
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    iget-object v1, p2, Lcom/google/android/material/button/b;->aQm:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aQE:Landroid/graphics/Paint;
 
-    iget-object v2, p2, Lcom/google/android/material/button/b;->aQl:Landroid/content/res/ColorStateList;
+    iget-object v2, p2, Lcom/google/android/material/button/b;->aQD:Landroid/content/res/ColorStateList;
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p2, Lcom/google/android/material/button/b;->aQl:Landroid/content/res/ColorStateList;
+    iget-object v2, p2, Lcom/google/android/material/button/b;->aQD:Landroid/content/res/ColorStateList;
 
-    iget-object v3, p2, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v3, p2, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v3}, Lcom/google/android/material/button/MaterialButton;->getDrawableState()[I
 
@@ -299,37 +299,37 @@
     :goto_0
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object v1, p2, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-static {v1}, Landroidx/core/view/ViewCompat;->getPaddingStart(Landroid/view/View;)I
 
     move-result v1
 
-    iget-object v2, p2, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v2, p2, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v2}, Lcom/google/android/material/button/MaterialButton;->getPaddingTop()I
 
     move-result v2
 
-    iget-object v3, p2, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v3, p2, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-static {v3}, Landroidx/core/view/ViewCompat;->getPaddingEnd(Landroid/view/View;)I
 
     move-result v3
 
-    iget-object v4, p2, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v4, p2, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v4}, Lcom/google/android/material/button/MaterialButton;->getPaddingBottom()I
 
     move-result v4
 
-    iget-object v5, p2, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v5, p2, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
-    sget-boolean v7, Lcom/google/android/material/button/b;->aQj:Z
+    sget-boolean v7, Lcom/google/android/material/button/b;->aQB:Z
 
     if-eqz v7, :cond_1
 
-    invoke-virtual {p2}, Lcom/google/android/material/button/b;->Af()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p2}, Lcom/google/android/material/button/b;->Ab()Landroid/graphics/drawable/Drawable;
 
     move-result-object p3
 
@@ -340,9 +340,9 @@
 
     invoke-direct {v7}, Landroid/graphics/drawable/GradientDrawable;-><init>()V
 
-    iput-object v7, p2, Lcom/google/android/material/button/b;->aQn:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v7, p2, Lcom/google/android/material/button/b;->aQF:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v7, p2, Lcom/google/android/material/button/b;->aQn:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aQF:Landroid/graphics/drawable/GradientDrawable;
 
     iget v8, p2, Lcom/google/android/material/button/b;->cornerRadius:I
 
@@ -354,19 +354,19 @@
 
     invoke-virtual {v7, v8}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
-    iget-object v7, p2, Lcom/google/android/material/button/b;->aQn:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aQF:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-virtual {v7, p3}, Landroid/graphics/drawable/GradientDrawable;->setColor(I)V
 
-    iget-object v7, p2, Lcom/google/android/material/button/b;->aQn:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aQF:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-static {v7}, Landroidx/core/graphics/drawable/DrawableCompat;->wrap(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
     move-result-object v7
 
-    iput-object v7, p2, Lcom/google/android/material/button/b;->aQo:Landroid/graphics/drawable/Drawable;
+    iput-object v7, p2, Lcom/google/android/material/button/b;->aQG:Landroid/graphics/drawable/Drawable;
 
-    iget-object v7, p2, Lcom/google/android/material/button/b;->aQo:Landroid/graphics/drawable/Drawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aQG:Landroid/graphics/drawable/Drawable;
 
     iget-object v8, p2, Lcom/google/android/material/button/b;->backgroundTint:Landroid/content/res/ColorStateList;
 
@@ -376,7 +376,7 @@
 
     if-eqz v7, :cond_2
 
-    iget-object v7, p2, Lcom/google/android/material/button/b;->aQo:Landroid/graphics/drawable/Drawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aQG:Landroid/graphics/drawable/Drawable;
 
     iget-object v8, p2, Lcom/google/android/material/button/b;->backgroundTintMode:Landroid/graphics/PorterDuff$Mode;
 
@@ -387,9 +387,9 @@
 
     invoke-direct {v7}, Landroid/graphics/drawable/GradientDrawable;-><init>()V
 
-    iput-object v7, p2, Lcom/google/android/material/button/b;->aQp:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v7, p2, Lcom/google/android/material/button/b;->aQH:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v7, p2, Lcom/google/android/material/button/b;->aQp:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aQH:Landroid/graphics/drawable/GradientDrawable;
 
     iget v8, p2, Lcom/google/android/material/button/b;->cornerRadius:I
 
@@ -399,19 +399,19 @@
 
     invoke-virtual {v7, v8}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
-    iget-object v7, p2, Lcom/google/android/material/button/b;->aQp:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aQH:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-virtual {v7, p3}, Landroid/graphics/drawable/GradientDrawable;->setColor(I)V
 
-    iget-object p3, p2, Lcom/google/android/material/button/b;->aQp:Landroid/graphics/drawable/GradientDrawable;
+    iget-object p3, p2, Lcom/google/android/material/button/b;->aQH:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-static {p3}, Landroidx/core/graphics/drawable/DrawableCompat;->wrap(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
     move-result-object p3
 
-    iput-object p3, p2, Lcom/google/android/material/button/b;->aQq:Landroid/graphics/drawable/Drawable;
+    iput-object p3, p2, Lcom/google/android/material/button/b;->aQI:Landroid/graphics/drawable/Drawable;
 
-    iget-object p3, p2, Lcom/google/android/material/button/b;->aQq:Landroid/graphics/drawable/Drawable;
+    iget-object p3, p2, Lcom/google/android/material/button/b;->aQI:Landroid/graphics/drawable/Drawable;
 
     iget-object v7, p2, Lcom/google/android/material/button/b;->rippleColor:Landroid/content/res/ColorStateList;
 
@@ -423,24 +423,24 @@
 
     new-array v7, v7, [Landroid/graphics/drawable/Drawable;
 
-    iget-object v8, p2, Lcom/google/android/material/button/b;->aQo:Landroid/graphics/drawable/Drawable;
+    iget-object v8, p2, Lcom/google/android/material/button/b;->aQG:Landroid/graphics/drawable/Drawable;
 
     aput-object v8, v7, v6
 
-    iget-object v6, p2, Lcom/google/android/material/button/b;->aQq:Landroid/graphics/drawable/Drawable;
+    iget-object v6, p2, Lcom/google/android/material/button/b;->aQI:Landroid/graphics/drawable/Drawable;
 
     aput-object v6, v7, v0
 
     invoke-direct {p3, v7}, Landroid/graphics/drawable/LayerDrawable;-><init>([Landroid/graphics/drawable/Drawable;)V
 
-    invoke-virtual {p2, p3}, Lcom/google/android/material/button/b;->k(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/InsetDrawable;
+    invoke-virtual {p2, p3}, Lcom/google/android/material/button/b;->j(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/InsetDrawable;
 
     move-result-object p3
 
     :goto_1
     invoke-virtual {v5, p3}, Lcom/google/android/material/button/MaterialButton;->setInternalBackground(Landroid/graphics/drawable/Drawable;)V
 
-    iget-object p3, p2, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object p3, p2, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     iget v0, p2, Lcom/google/android/material/button/b;->insetLeft:I
 
@@ -497,7 +497,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, v0, Lcom/google/android/material/button/b;->aQu:Z
+    iget-boolean v0, v0, Lcom/google/android/material/button/b;->aQM:Z
 
     if-nez v0, :cond_0
 
@@ -710,7 +710,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/button/MaterialButton;->materialButtonHelper:Lcom/google/android/material/button/b;
 
-    iget-object v0, v0, Lcom/google/android/material/button/b;->aQl:Landroid/content/res/ColorStateList;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aQD:Landroid/content/res/ColorStateList;
 
     return-object v0
 
@@ -808,7 +808,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQl:Landroid/content/res/ColorStateList;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQD:Landroid/content/res/ColorStateList;
 
     if-eqz v1, :cond_0
 
@@ -816,9 +816,9 @@
 
     if-lez v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->fP:Landroid/graphics/Rect;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->fO:Landroid/graphics/Rect;
 
-    iget-object v2, v0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v2, v0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v2}, Lcom/google/android/material/button/MaterialButton;->getBackground()Landroid/graphics/drawable/Drawable;
 
@@ -832,7 +832,7 @@
 
     iget-object v1, v0, Lcom/google/android/material/button/b;->rectF:Landroid/graphics/RectF;
 
-    iget-object v2, v0, Lcom/google/android/material/button/b;->fP:Landroid/graphics/Rect;
+    iget-object v2, v0, Lcom/google/android/material/button/b;->fO:Landroid/graphics/Rect;
 
     iget v2, v2, Landroid/graphics/Rect;->left:I
 
@@ -854,7 +854,7 @@
 
     add-float/2addr v2, v3
 
-    iget-object v3, v0, Lcom/google/android/material/button/b;->fP:Landroid/graphics/Rect;
+    iget-object v3, v0, Lcom/google/android/material/button/b;->fO:Landroid/graphics/Rect;
 
     iget v3, v3, Landroid/graphics/Rect;->top:I
 
@@ -874,7 +874,7 @@
 
     add-float/2addr v3, v5
 
-    iget-object v5, v0, Lcom/google/android/material/button/b;->fP:Landroid/graphics/Rect;
+    iget-object v5, v0, Lcom/google/android/material/button/b;->fO:Landroid/graphics/Rect;
 
     iget v5, v5, Landroid/graphics/Rect;->right:I
 
@@ -894,7 +894,7 @@
 
     sub-float/2addr v5, v6
 
-    iget-object v6, v0, Lcom/google/android/material/button/b;->fP:Landroid/graphics/Rect;
+    iget-object v6, v0, Lcom/google/android/material/button/b;->fO:Landroid/graphics/Rect;
 
     iget v6, v6, Landroid/graphics/Rect;->bottom:I
 
@@ -930,7 +930,7 @@
 
     iget-object v2, v0, Lcom/google/android/material/button/b;->rectF:Landroid/graphics/RectF;
 
-    iget-object v0, v0, Lcom/google/android/material/button/b;->aQm:Landroid/graphics/Paint;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aQE:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v2, v1, v1, v0}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
 
@@ -957,11 +957,11 @@
 
     sub-int/2addr p4, p2
 
-    iget-object p2, p1, Lcom/google/android/material/button/b;->aQt:Landroid/graphics/drawable/GradientDrawable;
+    iget-object p2, p1, Lcom/google/android/material/button/b;->aQL:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p1, Lcom/google/android/material/button/b;->aQt:Landroid/graphics/drawable/GradientDrawable;
+    iget-object p2, p1, Lcom/google/android/material/button/b;->aQL:Landroid/graphics/drawable/GradientDrawable;
 
     iget p3, p1, Lcom/google/android/material/button/b;->insetLeft:I
 
@@ -1095,30 +1095,30 @@
 
     iget-object v0, p0, Lcom/google/android/material/button/MaterialButton;->materialButtonHelper:Lcom/google/android/material/button/b;
 
-    sget-boolean v1, Lcom/google/android/material/button/b;->aQj:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aQB:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQr:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQJ:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/button/b;->aQr:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aQJ:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/GradientDrawable;->setColor(I)V
 
     return-void
 
     :cond_0
-    sget-boolean v1, Lcom/google/android/material/button/b;->aQj:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aQB:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQn:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQF:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/google/android/material/button/b;->aQn:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aQF:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/GradientDrawable;->setColor(I)V
 
@@ -1156,15 +1156,15 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/google/android/material/button/b;->aQu:Z
+    iput-boolean v1, v0, Lcom/google/android/material/button/b;->aQM:Z
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     iget-object v2, v0, Lcom/google/android/material/button/b;->backgroundTint:Landroid/content/res/ColorStateList;
 
     invoke-virtual {v1, v2}, Lcom/google/android/material/button/MaterialButton;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     iget-object v0, v0, Lcom/google/android/material/button/b;->backgroundTintMode:Landroid/graphics/PorterDuff$Mode;
 
@@ -1249,21 +1249,21 @@
 
     iput p1, v0, Lcom/google/android/material/button/b;->cornerRadius:I
 
-    sget-boolean v1, Lcom/google/android/material/button/b;->aQj:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aQB:Z
 
     const v2, 0x3727c5ac    # 1.0E-5f
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQr:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQJ:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQs:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQK:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQt:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQL:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_3
 
@@ -1273,7 +1273,7 @@
 
     if-ne v1, v3, :cond_2
 
-    sget-boolean v1, Lcom/google/android/material/button/b;->aQj:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aQB:Z
 
     const/4 v3, 0x0
 
@@ -1281,7 +1281,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/button/MaterialButton;->getBackground()Landroid/graphics/drawable/Drawable;
 
@@ -1289,7 +1289,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/button/MaterialButton;->getBackground()Landroid/graphics/drawable/Drawable;
 
@@ -1327,11 +1327,11 @@
 
     invoke-virtual {v1, v5}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
-    sget-boolean v1, Lcom/google/android/material/button/b;->aQj:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aQB:Z
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/button/MaterialButton;->getBackground()Landroid/graphics/drawable/Drawable;
 
@@ -1339,7 +1339,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/button/MaterialButton;->getBackground()Landroid/graphics/drawable/Drawable;
 
@@ -1373,7 +1373,7 @@
     invoke-virtual {v3, v5}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQr:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQJ:Landroid/graphics/drawable/GradientDrawable;
 
     int-to-float p1, p1
 
@@ -1381,30 +1381,30 @@
 
     invoke-virtual {v1, p1}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQs:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQK:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-virtual {v1, p1}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
-    iget-object v0, v0, Lcom/google/android/material/button/b;->aQt:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aQL:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
     return-void
 
     :cond_3
-    sget-boolean v1, Lcom/google/android/material/button/b;->aQj:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aQB:Z
 
     if-nez v1, :cond_4
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQn:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQF:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQp:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQH:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQn:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQF:Landroid/graphics/drawable/GradientDrawable;
 
     int-to-float p1, p1
 
@@ -1412,11 +1412,11 @@
 
     invoke-virtual {v1, p1}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQp:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQH:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-virtual {v1, p1}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
-    iget-object p1, v0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/button/MaterialButton;->invalidate()V
 
@@ -1606,11 +1606,11 @@
 
     iput-object p1, v0, Lcom/google/android/material/button/b;->rippleColor:Landroid/content/res/ColorStateList;
 
-    sget-boolean v1, Lcom/google/android/material/button/b;->aQj:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aQB:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/button/MaterialButton;->getBackground()Landroid/graphics/drawable/Drawable;
 
@@ -1620,7 +1620,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/button/MaterialButton;->getBackground()Landroid/graphics/drawable/Drawable;
 
@@ -1633,15 +1633,15 @@
     return-void
 
     :cond_0
-    sget-boolean v1, Lcom/google/android/material/button/b;->aQj:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aQB:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQq:Landroid/graphics/drawable/Drawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQI:Landroid/graphics/drawable/Drawable;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/google/android/material/button/b;->aQq:Landroid/graphics/drawable/Drawable;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aQI:Landroid/graphics/drawable/Drawable;
 
     invoke-static {v0, p1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V
 
@@ -1683,19 +1683,19 @@
 
     iget-object v0, p0, Lcom/google/android/material/button/MaterialButton;->materialButtonHelper:Lcom/google/android/material/button/b;
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQl:Landroid/content/res/ColorStateList;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQD:Landroid/content/res/ColorStateList;
 
     if-eq v1, p1, :cond_1
 
-    iput-object p1, v0, Lcom/google/android/material/button/b;->aQl:Landroid/content/res/ColorStateList;
+    iput-object p1, v0, Lcom/google/android/material/button/b;->aQD:Landroid/content/res/ColorStateList;
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQm:Landroid/graphics/Paint;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQE:Landroid/graphics/Paint;
 
     const/4 v2, 0x0
 
     if-eqz p1, :cond_0
 
-    iget-object v3, v0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v3, v0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v3}, Lcom/google/android/material/button/MaterialButton;->getDrawableState()[I
 
@@ -1708,7 +1708,7 @@
     :cond_0
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setColor(I)V
 
-    invoke-virtual {v0}, Lcom/google/android/material/button/b;->Ag()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->Ac()V
 
     :cond_1
     return-void
@@ -1754,13 +1754,13 @@
 
     iput p1, v0, Lcom/google/android/material/button/b;->strokeWidth:I
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aQm:Landroid/graphics/Paint;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aQE:Landroid/graphics/Paint;
 
     int-to-float p1, p1
 
     invoke-virtual {v1, p1}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    invoke-virtual {v0}, Lcom/google/android/material/button/b;->Ag()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->Ac()V
 
     :cond_0
     return-void
@@ -1806,20 +1806,20 @@
 
     iput-object p1, v0, Lcom/google/android/material/button/b;->backgroundTint:Landroid/content/res/ColorStateList;
 
-    sget-boolean p1, Lcom/google/android/material/button/b;->aQj:Z
+    sget-boolean p1, Lcom/google/android/material/button/b;->aQB:Z
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/material/button/b;->Ae()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->Aa()V
 
     return-void
 
     :cond_0
-    iget-object p1, v0, Lcom/google/android/material/button/b;->aQo:Landroid/graphics/drawable/Drawable;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aQG:Landroid/graphics/drawable/Drawable;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, v0, Lcom/google/android/material/button/b;->aQo:Landroid/graphics/drawable/Drawable;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aQG:Landroid/graphics/drawable/Drawable;
 
     iget-object v0, v0, Lcom/google/android/material/button/b;->backgroundTint:Landroid/content/res/ColorStateList;
 
@@ -1856,16 +1856,16 @@
 
     iput-object p1, v0, Lcom/google/android/material/button/b;->backgroundTintMode:Landroid/graphics/PorterDuff$Mode;
 
-    sget-boolean p1, Lcom/google/android/material/button/b;->aQj:Z
+    sget-boolean p1, Lcom/google/android/material/button/b;->aQB:Z
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/material/button/b;->Ae()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->Aa()V
 
     return-void
 
     :cond_0
-    iget-object p1, v0, Lcom/google/android/material/button/b;->aQo:Landroid/graphics/drawable/Drawable;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aQG:Landroid/graphics/drawable/Drawable;
 
     if-eqz p1, :cond_1
 
@@ -1873,7 +1873,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, v0, Lcom/google/android/material/button/b;->aQo:Landroid/graphics/drawable/Drawable;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aQG:Landroid/graphics/drawable/Drawable;
 
     iget-object v0, v0, Lcom/google/android/material/button/b;->backgroundTintMode:Landroid/graphics/PorterDuff$Mode;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/button/b.smali b/com.discord/smali_classes2/com/google/android/material/button/b.smali
index 2c50a54a20..f85e0e6cf9 100644
--- a/com.discord/smali_classes2/com/google/android/material/button/b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/button/b.smali
@@ -4,31 +4,31 @@
 
 
 # static fields
-.field static final aQj:Z
+.field static final aQB:Z
 
 
 # instance fields
-.field final aQk:Lcom/google/android/material/button/MaterialButton;
+.field final aQC:Lcom/google/android/material/button/MaterialButton;
 
-.field aQl:Landroid/content/res/ColorStateList;
+.field aQD:Landroid/content/res/ColorStateList;
 
-.field final aQm:Landroid/graphics/Paint;
+.field final aQE:Landroid/graphics/Paint;
 
-.field aQn:Landroid/graphics/drawable/GradientDrawable;
+.field aQF:Landroid/graphics/drawable/GradientDrawable;
 
-.field aQo:Landroid/graphics/drawable/Drawable;
+.field aQG:Landroid/graphics/drawable/Drawable;
 
-.field aQp:Landroid/graphics/drawable/GradientDrawable;
+.field aQH:Landroid/graphics/drawable/GradientDrawable;
 
-.field aQq:Landroid/graphics/drawable/Drawable;
+.field aQI:Landroid/graphics/drawable/Drawable;
 
-.field aQr:Landroid/graphics/drawable/GradientDrawable;
+.field aQJ:Landroid/graphics/drawable/GradientDrawable;
 
-.field aQs:Landroid/graphics/drawable/GradientDrawable;
+.field aQK:Landroid/graphics/drawable/GradientDrawable;
 
-.field aQt:Landroid/graphics/drawable/GradientDrawable;
+.field aQL:Landroid/graphics/drawable/GradientDrawable;
 
-.field aQu:Z
+.field aQM:Z
 
 .field backgroundTint:Landroid/content/res/ColorStateList;
 
@@ -36,7 +36,7 @@
 
 .field cornerRadius:I
 
-.field final fP:Landroid/graphics/Rect;
+.field final fO:Landroid/graphics/Rect;
 
 .field insetBottom:I
 
@@ -71,7 +71,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lcom/google/android/material/button/b;->aQj:Z
+    sput-boolean v0, Lcom/google/android/material/button/b;->aQB:Z
 
     return-void
 .end method
@@ -87,13 +87,13 @@
 
     invoke-direct {v0, v1}, Landroid/graphics/Paint;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/material/button/b;->aQm:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/google/android/material/button/b;->aQE:Landroid/graphics/Paint;
 
     new-instance v0, Landroid/graphics/Rect;
 
     invoke-direct {v0}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/material/button/b;->fP:Landroid/graphics/Rect;
+    iput-object v0, p0, Lcom/google/android/material/button/b;->fO:Landroid/graphics/Rect;
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -103,19 +103,19 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/material/button/b;->aQu:Z
+    iput-boolean v0, p0, Lcom/google/android/material/button/b;->aQM:Z
 
-    iput-object p1, p0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iput-object p1, p0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final Ae()V
+.method final Aa()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aQr:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aQJ:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v0, :cond_0
 
@@ -127,7 +127,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/button/b;->aQr:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, p0, Lcom/google/android/material/button/b;->aQJ:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-static {v1, v0}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V
 
@@ -135,16 +135,16 @@
     return-void
 .end method
 
-.method final Af()Landroid/graphics/drawable/Drawable;
+.method final Ab()Landroid/graphics/drawable/Drawable;
     .locals 6
 
     new-instance v0, Landroid/graphics/drawable/GradientDrawable;
 
     invoke-direct {v0}, Landroid/graphics/drawable/GradientDrawable;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/material/button/b;->aQr:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v0, p0, Lcom/google/android/material/button/b;->aQJ:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aQr:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aQJ:Landroid/graphics/drawable/GradientDrawable;
 
     iget v1, p0, Lcom/google/android/material/button/b;->cornerRadius:I
 
@@ -156,21 +156,21 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aQr:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aQJ:Landroid/graphics/drawable/GradientDrawable;
 
     const/4 v1, -0x1
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/GradientDrawable;->setColor(I)V
 
-    invoke-virtual {p0}, Lcom/google/android/material/button/b;->Ae()V
+    invoke-virtual {p0}, Lcom/google/android/material/button/b;->Aa()V
 
     new-instance v0, Landroid/graphics/drawable/GradientDrawable;
 
     invoke-direct {v0}, Landroid/graphics/drawable/GradientDrawable;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/material/button/b;->aQs:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v0, p0, Lcom/google/android/material/button/b;->aQK:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aQs:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aQK:Landroid/graphics/drawable/GradientDrawable;
 
     iget v3, p0, Lcom/google/android/material/button/b;->cornerRadius:I
 
@@ -180,17 +180,17 @@
 
     invoke-virtual {v0, v3}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aQs:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aQK:Landroid/graphics/drawable/GradientDrawable;
 
     const/4 v3, 0x0
 
     invoke-virtual {v0, v3}, Landroid/graphics/drawable/GradientDrawable;->setColor(I)V
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aQs:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aQK:Landroid/graphics/drawable/GradientDrawable;
 
     iget v4, p0, Lcom/google/android/material/button/b;->strokeWidth:I
 
-    iget-object v5, p0, Lcom/google/android/material/button/b;->aQl:Landroid/content/res/ColorStateList;
+    iget-object v5, p0, Lcom/google/android/material/button/b;->aQD:Landroid/content/res/ColorStateList;
 
     invoke-virtual {v0, v4, v5}, Landroid/graphics/drawable/GradientDrawable;->setStroke(ILandroid/content/res/ColorStateList;)V
 
@@ -200,11 +200,11 @@
 
     new-array v4, v4, [Landroid/graphics/drawable/Drawable;
 
-    iget-object v5, p0, Lcom/google/android/material/button/b;->aQr:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v5, p0, Lcom/google/android/material/button/b;->aQJ:Landroid/graphics/drawable/GradientDrawable;
 
     aput-object v5, v4, v3
 
-    iget-object v3, p0, Lcom/google/android/material/button/b;->aQs:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v3, p0, Lcom/google/android/material/button/b;->aQK:Landroid/graphics/drawable/GradientDrawable;
 
     const/4 v5, 0x1
 
@@ -212,7 +212,7 @@
 
     invoke-direct {v0, v4}, Landroid/graphics/drawable/LayerDrawable;-><init>([Landroid/graphics/drawable/Drawable;)V
 
-    invoke-virtual {p0, v0}, Lcom/google/android/material/button/b;->k(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/InsetDrawable;
+    invoke-virtual {p0, v0}, Lcom/google/android/material/button/b;->j(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/InsetDrawable;
 
     move-result-object v0
 
@@ -220,9 +220,9 @@
 
     invoke-direct {v3}, Landroid/graphics/drawable/GradientDrawable;-><init>()V
 
-    iput-object v3, p0, Lcom/google/android/material/button/b;->aQt:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v3, p0, Lcom/google/android/material/button/b;->aQL:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v3, p0, Lcom/google/android/material/button/b;->aQt:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v3, p0, Lcom/google/android/material/button/b;->aQL:Landroid/graphics/drawable/GradientDrawable;
 
     iget v4, p0, Lcom/google/android/material/button/b;->cornerRadius:I
 
@@ -232,7 +232,7 @@
 
     invoke-virtual {v3, v4}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
-    iget-object v2, p0, Lcom/google/android/material/button/b;->aQt:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v2, p0, Lcom/google/android/material/button/b;->aQL:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-virtual {v2, v1}, Landroid/graphics/drawable/GradientDrawable;->setColor(I)V
 
@@ -244,27 +244,27 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/material/button/b;->aQt:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v3, p0, Lcom/google/android/material/button/b;->aQL:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-direct {v1, v2, v0, v3}, Lcom/google/android/material/button/a;-><init>(Landroid/content/res/ColorStateList;Landroid/graphics/drawable/InsetDrawable;Landroid/graphics/drawable/Drawable;)V
 
     return-object v1
 .end method
 
-.method final Ag()V
+.method final Ac()V
     .locals 2
 
-    sget-boolean v0, Lcom/google/android/material/button/b;->aQj:Z
+    sget-boolean v0, Lcom/google/android/material/button/b;->aQB:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aQs:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aQK:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
-    invoke-virtual {p0}, Lcom/google/android/material/button/b;->Af()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p0}, Lcom/google/android/material/button/b;->Ab()Landroid/graphics/drawable/Drawable;
 
     move-result-object v1
 
@@ -273,11 +273,11 @@
     return-void
 
     :cond_0
-    sget-boolean v0, Lcom/google/android/material/button/b;->aQj:Z
+    sget-boolean v0, Lcom/google/android/material/button/b;->aQB:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aQk:Lcom/google/android/material/button/MaterialButton;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aQC:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/button/MaterialButton;->invalidate()V
 
@@ -285,7 +285,7 @@
     return-void
 .end method
 
-.method final k(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/InsetDrawable;
+.method final j(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/InsetDrawable;
     .locals 7
 
     new-instance v6, Landroid/graphics/drawable/InsetDrawable;
diff --git a/com.discord/smali_classes2/com/google/android/material/card/MaterialCardView.smali b/com.discord/smali_classes2/com/google/android/material/card/MaterialCardView.smali
index c9c38959b5..878353ffd3 100644
--- a/com.discord/smali_classes2/com/google/android/material/card/MaterialCardView.smali
+++ b/com.discord/smali_classes2/com/google/android/material/card/MaterialCardView.smali
@@ -77,9 +77,9 @@
 
     iput p3, p2, Lcom/google/android/material/card/a;->strokeWidth:I
 
-    invoke-virtual {p2}, Lcom/google/android/material/card/a;->Ah()V
+    invoke-virtual {p2}, Lcom/google/android/material/card/a;->Ad()V
 
-    invoke-virtual {p2}, Lcom/google/android/material/card/a;->Ai()V
+    invoke-virtual {p2}, Lcom/google/android/material/card/a;->Ae()V
 
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
@@ -115,7 +115,7 @@
 
     iget-object p1, p0, Lcom/google/android/material/card/MaterialCardView;->cardViewHelper:Lcom/google/android/material/card/a;
 
-    invoke-virtual {p1}, Lcom/google/android/material/card/a;->Ah()V
+    invoke-virtual {p1}, Lcom/google/android/material/card/a;->Ad()V
 
     return-void
 .end method
@@ -127,7 +127,7 @@
 
     iput p1, v0, Lcom/google/android/material/card/a;->strokeColor:I
 
-    invoke-virtual {v0}, Lcom/google/android/material/card/a;->Ah()V
+    invoke-virtual {v0}, Lcom/google/android/material/card/a;->Ad()V
 
     return-void
 .end method
@@ -139,9 +139,9 @@
 
     iput p1, v0, Lcom/google/android/material/card/a;->strokeWidth:I
 
-    invoke-virtual {v0}, Lcom/google/android/material/card/a;->Ah()V
+    invoke-virtual {v0}, Lcom/google/android/material/card/a;->Ad()V
 
-    invoke-virtual {v0}, Lcom/google/android/material/card/a;->Ai()V
+    invoke-virtual {v0}, Lcom/google/android/material/card/a;->Ae()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/card/a.smali b/com.discord/smali_classes2/com/google/android/material/card/a.smali
index 8112c9563f..2baba7fae2 100644
--- a/com.discord/smali_classes2/com/google/android/material/card/a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/card/a.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final aQv:Lcom/google/android/material/card/MaterialCardView;
+.field private final aQN:Lcom/google/android/material/card/MaterialCardView;
 
 .field strokeColor:I
 
@@ -17,7 +17,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/material/card/a;->aQv:Lcom/google/android/material/card/MaterialCardView;
+    iput-object p1, p0, Lcom/google/android/material/card/a;->aQN:Lcom/google/android/material/card/MaterialCardView;
 
     return-void
 .end method
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Landroid/graphics/drawable/GradientDrawable;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/material/card/a;->aQv:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v1, p0, Lcom/google/android/material/card/a;->aQN:Lcom/google/android/material/card/MaterialCardView;
 
     invoke-virtual {v1}, Lcom/google/android/material/card/MaterialCardView;->getRadius()F
 
@@ -53,10 +53,10 @@
 
 
 # virtual methods
-.method final Ah()V
+.method final Ad()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/card/a;->aQv:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v0, p0, Lcom/google/android/material/card/a;->aQN:Lcom/google/android/material/card/MaterialCardView;
 
     invoke-direct {p0}, Lcom/google/android/material/card/a;->bN()Landroid/graphics/drawable/Drawable;
 
@@ -67,10 +67,10 @@
     return-void
 .end method
 
-.method final Ai()V
+.method final Ae()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/card/a;->aQv:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v0, p0, Lcom/google/android/material/card/a;->aQN:Lcom/google/android/material/card/MaterialCardView;
 
     invoke-virtual {v0}, Lcom/google/android/material/card/MaterialCardView;->getContentPaddingLeft()I
 
@@ -80,7 +80,7 @@
 
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/google/android/material/card/a;->aQv:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v1, p0, Lcom/google/android/material/card/a;->aQN:Lcom/google/android/material/card/MaterialCardView;
 
     invoke-virtual {v1}, Lcom/google/android/material/card/MaterialCardView;->getContentPaddingTop()I
 
@@ -90,7 +90,7 @@
 
     add-int/2addr v1, v2
 
-    iget-object v2, p0, Lcom/google/android/material/card/a;->aQv:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v2, p0, Lcom/google/android/material/card/a;->aQN:Lcom/google/android/material/card/MaterialCardView;
 
     invoke-virtual {v2}, Lcom/google/android/material/card/MaterialCardView;->getContentPaddingRight()I
 
@@ -100,7 +100,7 @@
 
     add-int/2addr v2, v3
 
-    iget-object v3, p0, Lcom/google/android/material/card/a;->aQv:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v3, p0, Lcom/google/android/material/card/a;->aQN:Lcom/google/android/material/card/MaterialCardView;
 
     invoke-virtual {v3}, Lcom/google/android/material/card/MaterialCardView;->getContentPaddingBottom()I
 
@@ -110,7 +110,7 @@
 
     add-int/2addr v3, v4
 
-    iget-object v4, p0, Lcom/google/android/material/card/a;->aQv:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v4, p0, Lcom/google/android/material/card/a;->aQN:Lcom/google/android/material/card/MaterialCardView;
 
     invoke-virtual {v4, v0, v1, v2, v3}, Lcom/google/android/material/card/MaterialCardView;->setContentPadding(IIII)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/chip/Chip$1.smali b/com.discord/smali_classes2/com/google/android/material/chip/Chip$1.smali
index 48a3efa8bc..afd3a41cf1 100644
--- a/com.discord/smali_classes2/com/google/android/material/chip/Chip$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/chip/Chip$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aQw:Lcom/google/android/material/chip/Chip;
+.field final synthetic aQO:Lcom/google/android/material/chip/Chip;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/chip/Chip;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aQw:Lcom/google/android/material/chip/Chip;
+    iput-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-direct {p0}, Landroidx/core/content/res/ResourcesCompat$FontCallback;-><init>()V
 
@@ -40,7 +40,7 @@
 .method public final onFontRetrieved(Landroid/graphics/Typeface;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-virtual {p1}, Lcom/google/android/material/chip/Chip;->getText()Ljava/lang/CharSequence;
 
@@ -48,11 +48,11 @@
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/chip/Chip;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-virtual {p1}, Lcom/google/android/material/chip/Chip;->requestLayout()V
 
-    iget-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-virtual {p1}, Lcom/google/android/material/chip/Chip;->invalidate()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/chip/Chip$2.smali b/com.discord/smali_classes2/com/google/android/material/chip/Chip$2.smali
index 791040e1b3..cf8d1e47d9 100644
--- a/com.discord/smali_classes2/com/google/android/material/chip/Chip$2.smali
+++ b/com.discord/smali_classes2/com/google/android/material/chip/Chip$2.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aQw:Lcom/google/android/material/chip/Chip;
+.field final synthetic aQO:Lcom/google/android/material/chip/Chip;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/chip/Chip;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/chip/Chip$2;->aQw:Lcom/google/android/material/chip/Chip;
+    iput-object p1, p0, Lcom/google/android/material/chip/Chip$2;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-direct {p0}, Landroid/view/ViewOutlineProvider;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final getOutline(Landroid/view/View;Landroid/graphics/Outline;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/chip/Chip$2;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$2;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-static {p1}, Lcom/google/android/material/chip/Chip;->access$000(Lcom/google/android/material/chip/Chip;)Lcom/google/android/material/chip/ChipDrawable;
 
@@ -42,7 +42,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/chip/Chip$2;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$2;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-static {p1}, Lcom/google/android/material/chip/Chip;->access$000(Lcom/google/android/material/chip/Chip;)Lcom/google/android/material/chip/ChipDrawable;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/chip/Chip$a.smali b/com.discord/smali_classes2/com/google/android/material/chip/Chip$a.smali
index 87ad6fa9d6..797c807567 100644
--- a/com.discord/smali_classes2/com/google/android/material/chip/Chip$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/chip/Chip$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aQw:Lcom/google/android/material/chip/Chip;
+.field final synthetic aQO:Lcom/google/android/material/chip/Chip;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/chip/Chip;Lcom/google/android/material/chip/Chip;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iput-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-direct {p0, p2}, Landroidx/customview/widget/ExploreByTouchHelper;-><init>(Landroid/view/View;)V
 
@@ -34,7 +34,7 @@
 .method public final getVirtualViewAt(FF)I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-static {v0}, Lcom/google/android/material/chip/Chip;->access$100(Lcom/google/android/material/chip/Chip;)Z
 
@@ -42,7 +42,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-static {v0}, Lcom/google/android/material/chip/Chip;->access$200(Lcom/google/android/material/chip/Chip;)Landroid/graphics/RectF;
 
@@ -75,7 +75,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-static {v0}, Lcom/google/android/material/chip/Chip;->access$100(Lcom/google/android/material/chip/Chip;)Z
 
@@ -104,7 +104,7 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-virtual {p1}, Lcom/google/android/material/chip/Chip;->performCloseIconClick()Z
 
@@ -121,7 +121,7 @@
 .method public final onPopulateNodeForHost(Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-static {v0}, Lcom/google/android/material/chip/Chip;->access$000(Lcom/google/android/material/chip/Chip;)Lcom/google/android/material/chip/ChipDrawable;
 
@@ -129,7 +129,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-static {v0}, Lcom/google/android/material/chip/Chip;->access$000(Lcom/google/android/material/chip/Chip;)Lcom/google/android/material/chip/ChipDrawable;
 
@@ -159,7 +159,7 @@
 
     invoke-virtual {p1, v0}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setClassName(Ljava/lang/CharSequence;)V
 
-    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-virtual {v0}, Lcom/google/android/material/chip/Chip;->getText()Ljava/lang/CharSequence;
 
@@ -184,7 +184,7 @@
 .method public final onPopulateNodeForVirtualView(ILandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
     .locals 6
 
-    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-static {p1}, Lcom/google/android/material/chip/Chip;->access$100(Lcom/google/android/material/chip/Chip;)Z
 
@@ -194,7 +194,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-virtual {p1}, Lcom/google/android/material/chip/Chip;->getCloseIconContentDescription()Ljava/lang/CharSequence;
 
@@ -207,13 +207,13 @@
     goto :goto_1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-virtual {p1}, Lcom/google/android/material/chip/Chip;->getText()Ljava/lang/CharSequence;
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object v1, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-virtual {v1}, Lcom/google/android/material/chip/Chip;->getContext()Landroid/content/Context;
 
@@ -252,7 +252,7 @@
     invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setContentDescription(Ljava/lang/CharSequence;)V
 
     :goto_1
-    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-static {p1}, Lcom/google/android/material/chip/Chip;->access$300(Lcom/google/android/material/chip/Chip;)Landroid/graphics/Rect;
 
@@ -264,7 +264,7 @@
 
     invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->addAction(Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;)V
 
-    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQw:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aQO:Lcom/google/android/material/chip/Chip;
 
     invoke-virtual {p1}, Lcom/google/android/material/chip/Chip;->isEnabled()Z
 
diff --git a/com.discord/smali_classes2/com/google/android/material/chip/ChipDrawable$1.smali b/com.discord/smali_classes2/com/google/android/material/chip/ChipDrawable$1.smali
index 189d12b93f..7e4bfe5aa3 100644
--- a/com.discord/smali_classes2/com/google/android/material/chip/ChipDrawable$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/chip/ChipDrawable$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aQx:Lcom/google/android/material/chip/ChipDrawable;
+.field final synthetic aQP:Lcom/google/android/material/chip/ChipDrawable;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/chip/ChipDrawable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aQx:Lcom/google/android/material/chip/ChipDrawable;
+    iput-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aQP:Lcom/google/android/material/chip/ChipDrawable;
 
     invoke-direct {p0}, Landroidx/core/content/res/ResourcesCompat$FontCallback;-><init>()V
 
@@ -40,17 +40,17 @@
 .method public final onFontRetrieved(Landroid/graphics/Typeface;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aQx:Lcom/google/android/material/chip/ChipDrawable;
+    iget-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aQP:Lcom/google/android/material/chip/ChipDrawable;
 
     const/4 v0, 0x1
 
     invoke-static {p1, v0}, Lcom/google/android/material/chip/ChipDrawable;->access$002(Lcom/google/android/material/chip/ChipDrawable;Z)Z
 
-    iget-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aQx:Lcom/google/android/material/chip/ChipDrawable;
+    iget-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aQP:Lcom/google/android/material/chip/ChipDrawable;
 
     invoke-virtual {p1}, Lcom/google/android/material/chip/ChipDrawable;->onSizeChange()V
 
-    iget-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aQx:Lcom/google/android/material/chip/ChipDrawable;
+    iget-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aQP:Lcom/google/android/material/chip/ChipDrawable;
 
     invoke-virtual {p1}, Lcom/google/android/material/chip/ChipDrawable;->invalidateSelf()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$a.smali b/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$a.smali
index bdf1837863..bc3a91d532 100644
--- a/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aQy:Lcom/google/android/material/chip/ChipGroup;
+.field final synthetic aQQ:Lcom/google/android/material/chip/ChipGroup;
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/material/chip/ChipGroup;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQy:Lcom/google/android/material/chip/ChipGroup;
+    iput-object p1, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQQ:Lcom/google/android/material/chip/ChipGroup;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,7 +45,7 @@
 .method public final onCheckedChanged(Landroid/widget/CompoundButton;Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQy:Lcom/google/android/material/chip/ChipGroup;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQQ:Lcom/google/android/material/chip/ChipGroup;
 
     invoke-static {v0}, Lcom/google/android/material/chip/ChipGroup;->access$300(Lcom/google/android/material/chip/ChipGroup;)Z
 
@@ -64,7 +64,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQy:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQQ:Lcom/google/android/material/chip/ChipGroup;
 
     invoke-static {p2}, Lcom/google/android/material/chip/ChipGroup;->access$400(Lcom/google/android/material/chip/ChipGroup;)I
 
@@ -72,7 +72,7 @@
 
     if-eq p2, v0, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQy:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQQ:Lcom/google/android/material/chip/ChipGroup;
 
     invoke-static {p2}, Lcom/google/android/material/chip/ChipGroup;->access$400(Lcom/google/android/material/chip/ChipGroup;)I
 
@@ -80,7 +80,7 @@
 
     if-eq p2, p1, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQy:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQQ:Lcom/google/android/material/chip/ChipGroup;
 
     invoke-static {p2}, Lcom/google/android/material/chip/ChipGroup;->access$500(Lcom/google/android/material/chip/ChipGroup;)Z
 
@@ -88,7 +88,7 @@
 
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQy:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQQ:Lcom/google/android/material/chip/ChipGroup;
 
     invoke-static {p2}, Lcom/google/android/material/chip/ChipGroup;->access$400(Lcom/google/android/material/chip/ChipGroup;)I
 
@@ -99,14 +99,14 @@
     invoke-static {p2, v0, v1}, Lcom/google/android/material/chip/ChipGroup;->access$600(Lcom/google/android/material/chip/ChipGroup;IZ)V
 
     :cond_1
-    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQy:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQQ:Lcom/google/android/material/chip/ChipGroup;
 
     invoke-static {p2, p1}, Lcom/google/android/material/chip/ChipGroup;->access$700(Lcom/google/android/material/chip/ChipGroup;I)V
 
     return-void
 
     :cond_2
-    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQy:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQQ:Lcom/google/android/material/chip/ChipGroup;
 
     invoke-static {p2}, Lcom/google/android/material/chip/ChipGroup;->access$400(Lcom/google/android/material/chip/ChipGroup;)I
 
@@ -114,7 +114,7 @@
 
     if-ne p2, p1, :cond_3
 
-    iget-object p1, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQy:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p1, p0, Lcom/google/android/material/chip/ChipGroup$a;->aQQ:Lcom/google/android/material/chip/ChipGroup;
 
     invoke-static {p1, v0}, Lcom/google/android/material/chip/ChipGroup;->access$700(Lcom/google/android/material/chip/ChipGroup;I)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$b.smali b/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$b.smali
index a7a604dfc4..84de4ef795 100644
--- a/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/chip/ChipGroup$b.smali
@@ -18,16 +18,16 @@
 
 
 # instance fields
-.field final synthetic aQy:Lcom/google/android/material/chip/ChipGroup;
+.field final synthetic aQQ:Lcom/google/android/material/chip/ChipGroup;
 
-.field private aQz:Landroid/view/ViewGroup$OnHierarchyChangeListener;
+.field private aQR:Landroid/view/ViewGroup$OnHierarchyChangeListener;
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/material/chip/ChipGroup;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQy:Lcom/google/android/material/chip/ChipGroup;
+    iput-object p1, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQQ:Lcom/google/android/material/chip/ChipGroup;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,7 +45,7 @@
 .method static synthetic a(Lcom/google/android/material/chip/ChipGroup$b;Landroid/view/ViewGroup$OnHierarchyChangeListener;)Landroid/view/ViewGroup$OnHierarchyChangeListener;
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQz:Landroid/view/ViewGroup$OnHierarchyChangeListener;
+    iput-object p1, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQR:Landroid/view/ViewGroup$OnHierarchyChangeListener;
 
     return-object p1
 .end method
@@ -55,7 +55,7 @@
 .method public final onChildViewAdded(Landroid/view/View;Landroid/view/View;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQy:Lcom/google/android/material/chip/ChipGroup;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQQ:Lcom/google/android/material/chip/ChipGroup;
 
     if-ne p1, v0, :cond_2
 
@@ -96,7 +96,7 @@
 
     check-cast v0, Lcom/google/android/material/chip/Chip;
 
-    iget-object v1, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQy:Lcom/google/android/material/chip/ChipGroup;
+    iget-object v1, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQQ:Lcom/google/android/material/chip/ChipGroup;
 
     invoke-static {v1}, Lcom/google/android/material/chip/ChipGroup;->access$800(Lcom/google/android/material/chip/ChipGroup;)Lcom/google/android/material/chip/ChipGroup$a;
 
@@ -105,7 +105,7 @@
     invoke-virtual {v0, v1}, Lcom/google/android/material/chip/Chip;->setOnCheckedChangeListenerInternal(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQz:Landroid/view/ViewGroup$OnHierarchyChangeListener;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQR:Landroid/view/ViewGroup$OnHierarchyChangeListener;
 
     if-eqz v0, :cond_3
 
@@ -118,7 +118,7 @@
 .method public final onChildViewRemoved(Landroid/view/View;Landroid/view/View;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQy:Lcom/google/android/material/chip/ChipGroup;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQQ:Lcom/google/android/material/chip/ChipGroup;
 
     if-ne p1, v0, :cond_0
 
@@ -135,7 +135,7 @@
     invoke-virtual {v0, v1}, Lcom/google/android/material/chip/Chip;->setOnCheckedChangeListenerInternal(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQz:Landroid/view/ViewGroup$OnHierarchyChangeListener;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aQR:Landroid/view/ViewGroup$OnHierarchyChangeListener;
 
     if-eqz v0, :cond_1
 
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealCompat$1.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealCompat$1.smali
index bf1bc7111c..a741205afd 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealCompat$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealCompat$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aQA:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+.field final synthetic aQS:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/circularreveal/CircularRevealWidget;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$1;->aQA:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iput-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$1;->aQS:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$1;->aQA:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$1;->aQS:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
     invoke-interface {p1}, Lcom/google/android/material/circularreveal/CircularRevealWidget;->destroyCircularRevealCache()V
 
@@ -44,7 +44,7 @@
 .method public final onAnimationStart(Landroid/animation/Animator;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$1;->aQA:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$1;->aQS: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/FloatingActionButton$1.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$1.smali
index 053890112b..7bd8a97c0e 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic aQB:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
+.field final synthetic aQT:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
 
-.field final synthetic aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+.field final synthetic aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/floatingactionbutton/FloatingActionButton;Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aQB:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aQT:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,24 +38,24 @@
 
 
 # virtual methods
-.method public final Aj()V
+.method public final Af()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aQB:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aQT:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     invoke-virtual {v0, v1}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;->onShown(Lcom/google/android/material/floatingactionbutton/FloatingActionButton;)V
 
     return-void
 .end method
 
-.method public final Ak()V
+.method public final Ag()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aQB:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aQT:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     invoke-virtual {v0, v1}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;->onHidden(Lcom/google/android/material/floatingactionbutton/FloatingActionButton;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$a.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$a.smali
index e8715ba643..a63bc60d12 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+.field final synthetic aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/floatingactionbutton/FloatingActionButton;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final getRadius()F
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->getSizeDimension()I
 
@@ -55,7 +55,7 @@
 .method public final isCompatPaddingEnabled()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     iget-boolean v0, v0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->compatPadding:Z
 
@@ -65,7 +65,7 @@
 .method public final setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     invoke-static {v0, p1}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->access$101(Lcom/google/android/material/floatingactionbutton/FloatingActionButton;Landroid/graphics/drawable/Drawable;)V
 
@@ -75,13 +75,13 @@
 .method public final setShadowPadding(IIII)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->shadowPadding:Landroid/graphics/Rect;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Landroid/graphics/Rect;->set(IIII)V
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     invoke-static {v0}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->access$000(Lcom/google/android/material/floatingactionbutton/FloatingActionButton;)I
 
@@ -89,7 +89,7 @@
 
     add-int/2addr p1, v1
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     invoke-static {v1}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->access$000(Lcom/google/android/material/floatingactionbutton/FloatingActionButton;)I
 
@@ -97,7 +97,7 @@
 
     add-int/2addr p2, v1
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     invoke-static {v1}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->access$000(Lcom/google/android/material/floatingactionbutton/FloatingActionButton;)I
 
@@ -105,7 +105,7 @@
 
     add-int/2addr p3, v1
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQC:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aQU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     invoke-static {v1}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->access$000(Lcom/google/android/material/floatingactionbutton/FloatingActionButton;)I
 
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton.smali
index 2eec0a70ff..204d0bfe2f 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/FloatingActionButton.smali
@@ -276,13 +276,13 @@
 
     move-result-object p2
 
-    invoke-virtual {p2, v4}, Lcom/google/android/material/floatingactionbutton/a;->s(F)V
+    invoke-virtual {p2, v4}, Lcom/google/android/material/floatingactionbutton/a;->r(F)V
 
     invoke-direct {p0}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->getImpl()Lcom/google/android/material/floatingactionbutton/a;
 
     move-result-object p2
 
-    invoke-virtual {p2, v3}, Lcom/google/android/material/floatingactionbutton/a;->t(F)V
+    invoke-virtual {p2, v3}, Lcom/google/android/material/floatingactionbutton/a;->s(F)V
 
     invoke-direct {p0}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->getImpl()Lcom/google/android/material/floatingactionbutton/a;
 
@@ -296,7 +296,7 @@
 
     iput p3, p2, Lcom/google/android/material/floatingactionbutton/a;->maxImageSize:I
 
-    invoke-virtual {p2}, Lcom/google/android/material/floatingactionbutton/a;->Al()V
+    invoke-virtual {p2}, Lcom/google/android/material/floatingactionbutton/a;->Ah()V
 
     :cond_0
     invoke-direct {p0}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->getImpl()Lcom/google/android/material/floatingactionbutton/a;
@@ -620,7 +620,7 @@
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQS:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRk:Ljava/util/ArrayList;
 
     if-nez v1, :cond_0
 
@@ -628,10 +628,10 @@
 
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQS:Ljava/util/ArrayList;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRk:Ljava/util/ArrayList;
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQS:Ljava/util/ArrayList;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRk:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -645,7 +645,7 @@
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQR:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRj:Ljava/util/ArrayList;
 
     if-nez v1, :cond_0
 
@@ -653,10 +653,10 @@
 
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQR:Ljava/util/ArrayList;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRj:Ljava/util/ArrayList;
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQR:Ljava/util/ArrayList;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRj:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -728,7 +728,7 @@
 
     move-result-object v0
 
-    iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQO:F
+    iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRg:F
 
     return v0
 .end method
@@ -740,7 +740,7 @@
 
     move-result-object v0
 
-    iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQP:F
+    iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRh:F
 
     return v0
 .end method
@@ -752,7 +752,7 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQN:Landroid/graphics/drawable/Drawable;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRf:Landroid/graphics/drawable/Drawable;
 
     return-object v0
 .end method
@@ -984,16 +984,16 @@
 
     if-nez v1, :cond_6
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQF:Landroid/animation/Animator;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQX:Landroid/animation/Animator;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQF:Landroid/animation/Animator;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQX:Landroid/animation/Animator;
 
     invoke-virtual {v1}, Landroid/animation/Animator;->cancel()V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->At()Z
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Ap()Z
 
     move-result v1
 
@@ -1008,11 +1008,11 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQH:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQZ:Lcom/google/android/material/animation/MotionSpec;
 
     if-nez v1, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getContext()Landroid/content/Context;
 
@@ -1024,10 +1024,10 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQH:Lcom/google/android/material/animation/MotionSpec;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQZ:Lcom/google/android/material/animation/MotionSpec;
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQH:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQZ:Lcom/google/android/material/animation/MotionSpec;
 
     :goto_0
     const/4 v2, 0x0
@@ -1042,11 +1042,11 @@
 
     invoke-virtual {v1, v2}, Landroid/animation/AnimatorSet;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
-    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQS:Ljava/util/ArrayList;
+    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRk:Ljava/util/ArrayList;
 
     if-eqz p1, :cond_3
 
-    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQS:Ljava/util/ArrayList;
+    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRk:Ljava/util/ArrayList;
 
     invoke-virtual {p1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
 
@@ -1075,7 +1075,7 @@
     return-void
 
     :cond_4
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     if-eqz p2, :cond_5
 
@@ -1091,7 +1091,7 @@
 
     if-eqz p1, :cond_6
 
-    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Ak()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Ag()V
 
     :cond_6
     return-void
@@ -1146,7 +1146,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Am()V
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Ai()V
 
     return-void
 .end method
@@ -1160,13 +1160,13 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Ap()Z
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Al()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQZ:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRr:Landroid/view/ViewTreeObserver$OnPreDrawListener;
 
     if-nez v1, :cond_0
 
@@ -1174,16 +1174,16 @@
 
     invoke-direct {v1, v0}, Lcom/google/android/material/floatingactionbutton/a$3;-><init>(Lcom/google/android/material/floatingactionbutton/a;)V
 
-    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQZ:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRr:Landroid/view/ViewTreeObserver$OnPreDrawListener;
 
     :cond_0
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getViewTreeObserver()Landroid/view/ViewTreeObserver;
 
     move-result-object v1
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQZ:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRr:Landroid/view/ViewTreeObserver$OnPreDrawListener;
 
     invoke-virtual {v1, v0}, Landroid/view/ViewTreeObserver;->addOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
 
@@ -1200,23 +1200,23 @@
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQZ:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRr:Landroid/view/ViewTreeObserver$OnPreDrawListener;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getViewTreeObserver()Landroid/view/ViewTreeObserver;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/material/floatingactionbutton/a;->aQZ:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iget-object v2, v0, Lcom/google/android/material/floatingactionbutton/a;->aRr:Landroid/view/ViewTreeObserver$OnPreDrawListener;
 
     invoke-virtual {v1, v2}, Landroid/view/ViewTreeObserver;->removeOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQZ:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRr:Landroid/view/ViewTreeObserver$OnPreDrawListener;
 
     :cond_0
     return-void
@@ -1241,7 +1241,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/material/floatingactionbutton/a;->Ao()V
+    invoke-virtual {v1}, Lcom/google/android/material/floatingactionbutton/a;->Ak()V
 
     invoke-static {v0, p1}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->resolveAdjustedSize(II)I
 
@@ -1403,11 +1403,11 @@
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQS:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRk:Ljava/util/ArrayList;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQS:Ljava/util/ArrayList;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRk:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
 
@@ -1422,11 +1422,11 @@
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQR:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRj:Ljava/util/ArrayList;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQR:Ljava/util/ArrayList;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRj:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
 
@@ -1483,20 +1483,20 @@
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQK:Landroid/graphics/drawable/Drawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRc:Landroid/graphics/drawable/Drawable;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQK:Landroid/graphics/drawable/Drawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRc:Landroid/graphics/drawable/Drawable;
 
     invoke-static {v1, p1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V
 
     :cond_0
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQM:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRe:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQM:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRe:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     invoke-virtual {v0, p1}, Lcom/google/android/material/internal/CircularBorderDrawable;->setBorderTint(Landroid/content/res/ColorStateList;)V
 
@@ -1517,11 +1517,11 @@
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQK:Landroid/graphics/drawable/Drawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRc:Landroid/graphics/drawable/Drawable;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRc:Landroid/graphics/drawable/Drawable;
 
     invoke-static {v0, p1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V
 
@@ -1564,7 +1564,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, p1}, Lcom/google/android/material/floatingactionbutton/a;->s(F)V
+    invoke-virtual {v0, p1}, Lcom/google/android/material/floatingactionbutton/a;->r(F)V
 
     return-void
 .end method
@@ -1592,7 +1592,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, p1}, Lcom/google/android/material/floatingactionbutton/a;->t(F)V
+    invoke-virtual {v0, p1}, Lcom/google/android/material/floatingactionbutton/a;->s(F)V
 
     return-void
 .end method
@@ -1691,7 +1691,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->Al()V
+    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->Ah()V
 
     return-void
 .end method
@@ -1845,7 +1845,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->An()V
+    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->Aj()V
 
     :cond_0
     return-void
@@ -1888,16 +1888,16 @@
 
     if-nez v1, :cond_6
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQF:Landroid/animation/Animator;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQX:Landroid/animation/Animator;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQF:Landroid/animation/Animator;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQX:Landroid/animation/Animator;
 
     invoke-virtual {v1}, Landroid/animation/Animator;->cancel()V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->At()Z
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->Ap()Z
 
     move-result v1
 
@@ -1905,7 +1905,7 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getVisibility()I
 
@@ -1913,21 +1913,21 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     const/4 v3, 0x0
 
     invoke-virtual {v1, v3}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setAlpha(F)V
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v1, v3}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setScaleY(F)V
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v1, v3}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setScaleX(F)V
 
-    invoke-virtual {v0, v3}, Lcom/google/android/material/floatingactionbutton/a;->u(F)V
+    invoke-virtual {v0, v3}, Lcom/google/android/material/floatingactionbutton/a;->t(F)V
 
     :cond_1
     iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->showMotionSpec:Lcom/google/android/material/animation/MotionSpec;
@@ -1939,11 +1939,11 @@
     goto :goto_0
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQG:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQY:Lcom/google/android/material/animation/MotionSpec;
 
     if-nez v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getContext()Landroid/content/Context;
 
@@ -1955,10 +1955,10 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQG:Lcom/google/android/material/animation/MotionSpec;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQY:Lcom/google/android/material/animation/MotionSpec;
 
     :cond_3
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQG:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQY:Lcom/google/android/material/animation/MotionSpec;
 
     :goto_0
     invoke-virtual {v0, v1, v2, v2, v2}, Lcom/google/android/material/floatingactionbutton/a;->a(Lcom/google/android/material/animation/MotionSpec;FFF)Landroid/animation/AnimatorSet;
@@ -1971,11 +1971,11 @@
 
     invoke-virtual {v1, v2}, Landroid/animation/AnimatorSet;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
-    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQR:Ljava/util/ArrayList;
+    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRj:Ljava/util/ArrayList;
 
     if-eqz p1, :cond_4
 
-    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQR:Ljava/util/ArrayList;
+    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRj:Ljava/util/ArrayList;
 
     invoke-virtual {p1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
 
@@ -2004,29 +2004,29 @@
     return-void
 
     :cond_5
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     const/4 v3, 0x0
 
     invoke-virtual {v1, v3, p2}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->internalSetVisibility(IZ)V
 
-    iget-object p2, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p2, v2}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setAlpha(F)V
 
-    iget-object p2, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p2, v2}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setScaleY(F)V
 
-    iget-object p2, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p2, v2}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setScaleX(F)V
 
-    invoke-virtual {v0, v2}, Lcom/google/android/material/floatingactionbutton/a;->u(F)V
+    invoke-virtual {v0, v2}, Lcom/google/android/material/floatingactionbutton/a;->t(F)V
 
     if-eqz p1, :cond_6
 
-    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Aj()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Af()V
 
     :cond_6
     return-void
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$1.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$1.smali
index 84853f8b49..171bae704f 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$1.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field final synthetic aRa:Z
+.field final synthetic aRs:Z
 
-.field final synthetic aRb:Lcom/google/android/material/floatingactionbutton/a$d;
+.field final synthetic aRt:Lcom/google/android/material/floatingactionbutton/a$d;
 
-.field final synthetic aRc:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aRu:Lcom/google/android/material/floatingactionbutton/a;
 
 .field private cancelled:Z
 
@@ -28,11 +28,11 @@
 .method constructor <init>(Lcom/google/android/material/floatingactionbutton/a;ZLcom/google/android/material/floatingactionbutton/a$d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
-    iput-boolean p2, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRa:Z
+    iput-boolean p2, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRs:Z
 
-    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRb:Lcom/google/android/material/floatingactionbutton/a$d;
+    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRt:Lcom/google/android/material/floatingactionbutton/a$d;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -54,23 +54,23 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
-    iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aQE:I
+    iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aQW:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aQF:Landroid/animation/Animator;
+    iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aQX:Landroid/animation/Animator;
 
     iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->cancelled:Z
 
     if-nez v0, :cond_1
 
-    iget-object p1, p1, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p1, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRa:Z
+    iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRs:Z
 
     if-eqz v0, :cond_0
 
@@ -82,15 +82,15 @@
     const/4 v0, 0x4
 
     :goto_0
-    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRa:Z
+    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRs:Z
 
     invoke-virtual {p1, v0, v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->internalSetVisibility(IZ)V
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRb:Lcom/google/android/material/floatingactionbutton/a$d;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRt:Lcom/google/android/material/floatingactionbutton/a$d;
 
     if-eqz p1, :cond_1
 
-    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Ak()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Ag()V
 
     :cond_1
     return-void
@@ -99,23 +99,23 @@
 .method public final onAnimationStart(Landroid/animation/Animator;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRa:Z
+    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRs:Z
 
     const/4 v2, 0x0
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->internalSetVisibility(IZ)V
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v1, 0x1
 
-    iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQE:I
+    iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:I
 
-    iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQF:Landroid/animation/Animator;
+    iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQX:Landroid/animation/Animator;
 
     iput-boolean v2, p0, Lcom/google/android/material/floatingactionbutton/a$1;->cancelled:Z
 
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$2.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$2.smali
index f9ae8173b0..1c307fb531 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$2.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$2.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic aRa:Z
+.field final synthetic aRs:Z
 
-.field final synthetic aRb:Lcom/google/android/material/floatingactionbutton/a$d;
+.field final synthetic aRt:Lcom/google/android/material/floatingactionbutton/a$d;
 
-.field final synthetic aRc:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aRu:Lcom/google/android/material/floatingactionbutton/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/floatingactionbutton/a;ZLcom/google/android/material/floatingactionbutton/a$d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
-    iput-boolean p2, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRa:Z
+    iput-boolean p2, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRs:Z
 
-    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRb:Lcom/google/android/material/floatingactionbutton/a$d;
+    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRt:Lcom/google/android/material/floatingactionbutton/a$d;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -42,21 +42,21 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
-    iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aQE:I
+    iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aQW:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aQF:Landroid/animation/Animator;
+    iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aQX:Landroid/animation/Animator;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRb:Lcom/google/android/material/floatingactionbutton/a$d;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRt:Lcom/google/android/material/floatingactionbutton/a$d;
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Aj()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->Af()V
 
     :cond_0
     return-void
@@ -65,23 +65,23 @@
 .method public final onAnimationStart(Landroid/animation/Animator;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRa:Z
+    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRs:Z
 
     const/4 v2, 0x0
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->internalSetVisibility(IZ)V
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v1, 0x2
 
-    iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQE:I
+    iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:I
 
-    iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQF:Landroid/animation/Animator;
+    iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQX:Landroid/animation/Animator;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$3.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$3.smali
index 3fecfba33f..32c61aaa90 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$3.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$3.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRc:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aRu:Lcom/google/android/material/floatingactionbutton/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/floatingactionbutton/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$3;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$3;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onPreDraw()Z
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$3;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$3;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getRotation()F
 
@@ -75,7 +75,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getLayerType()I
 
@@ -83,14 +83,14 @@
 
     if-eq v1, v3, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v1, v3, v4}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setLayerType(ILandroid/graphics/Paint;)V
 
     goto :goto_0
 
     :cond_0
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getLayerType()I
 
@@ -98,7 +98,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     const/4 v2, 0x0
 
@@ -106,11 +106,11 @@
 
     :cond_1
     :goto_0
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQJ:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRb:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQJ:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRb:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
     iget v2, v0, Lcom/google/android/material/floatingactionbutton/a;->rotation:F
 
@@ -119,11 +119,11 @@
     invoke-virtual {v1, v2}, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->setRotation(F)V
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQM:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRe:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aQM:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aRe:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->rotation:F
 
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$a.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$a.smali
index 4a8f474e4e..d20b29f6b7 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aRc:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aRu:Lcom/google/android/material/floatingactionbutton/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/floatingactionbutton/a;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$a;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$a;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
@@ -33,7 +33,7 @@
 
 
 # virtual methods
-.method protected final Au()F
+.method protected final Aq()F
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$b.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$b.smali
index 3599003439..2649943e88 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$b.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aRc:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aRu:Lcom/google/android/material/floatingactionbutton/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/floatingactionbutton/a;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
@@ -33,16 +33,16 @@
 
 
 # virtual methods
-.method protected final Au()F
+.method protected final Aq()F
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
     iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget v1, v1, Lcom/google/android/material/floatingactionbutton/a;->aQO:F
+    iget v1, v1, Lcom/google/android/material/floatingactionbutton/a;->aRg:F
 
     add-float/2addr v0, v1
 
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$c.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$c.smali
index 2bd4113730..96cd5029fe 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$c.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$c.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aRc:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aRu:Lcom/google/android/material/floatingactionbutton/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/floatingactionbutton/a;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
@@ -33,16 +33,16 @@
 
 
 # virtual methods
-.method protected final Au()F
+.method protected final Aq()F
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
     iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget v1, v1, Lcom/google/android/material/floatingactionbutton/a;->aQP:F
+    iget v1, v1, Lcom/google/android/material/floatingactionbutton/a;->aRh:F
 
     add-float/2addr v0, v1
 
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$d.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$d.smali
index 4e335496cd..d3f9fc3970 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$d.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$d.smali
@@ -15,8 +15,8 @@
 
 
 # virtual methods
-.method public abstract Aj()V
+.method public abstract Af()V
 .end method
 
-.method public abstract Ak()V
+.method public abstract Ag()V
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$e.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$e.smali
index fc39951552..4f0abf2418 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$e.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$e.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aRc:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aRu:Lcom/google/android/material/floatingactionbutton/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/floatingactionbutton/a;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$e;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$e;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method protected final Au()F
+.method protected final Aq()F
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$e;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$e;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
     iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
 
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$f.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$f.smali
index 1df8cfc240..90f80de56b 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$f.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a$f.smali
@@ -18,20 +18,20 @@
 
 
 # instance fields
-.field final synthetic aRc:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aRu:Lcom/google/android/material/floatingactionbutton/a;
 
-.field private aRd:Z
+.field private aRv:Z
 
-.field private aRe:F
+.field private aRw:F
 
-.field private aRf:F
+.field private aRx:F
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/material/floatingactionbutton/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -48,23 +48,23 @@
 
 
 # virtual methods
-.method protected abstract Au()F
+.method protected abstract Aq()F
 .end method
 
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object p1, p1, Lcom/google/android/material/floatingactionbutton/a;->aQJ:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object p1, p1, Lcom/google/android/material/floatingactionbutton/a;->aRb:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRf:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRx:F
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->setShadowSize(F)V
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRd:Z
+    iput-boolean p1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRv:Z
 
     return-void
 .end method
@@ -72,38 +72,38 @@
 .method public onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRd:Z
+    iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRv:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQJ:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRb:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
     invoke-virtual {v0}, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->getShadowSize()F
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRe:F
+    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRw:F
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a$f;->Au()F
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a$f;->Aq()F
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRf:F
+    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRx:F
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRd:Z
+    iput-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRv:Z
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRc:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRu:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aQJ:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aRb:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
-    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRe:F
+    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRw:F
 
-    iget v2, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRf:F
+    iget v2, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aRx:F
 
     sub-float/2addr v2, v1
 
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a.smali
index 8f4a5cb3b6..71f8a4a020 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/a.smali
@@ -23,43 +23,43 @@
 
 .field static final PRESSED_ENABLED_STATE_SET:[I
 
-.field static final aQD:Landroid/animation/TimeInterpolator;
+.field static final aQV:Landroid/animation/TimeInterpolator;
 
-.field static final aQT:[I
+.field static final aRl:[I
 
-.field static final aQU:[I
+.field static final aRm:[I
 
-.field static final aQV:[I
+.field static final aRn:[I
 
 
 # instance fields
-.field aQE:I
+.field aQW:I
 
-.field aQF:Landroid/animation/Animator;
+.field aQX:Landroid/animation/Animator;
 
-.field aQG:Lcom/google/android/material/animation/MotionSpec;
+.field aQY:Lcom/google/android/material/animation/MotionSpec;
 
-.field aQH:Lcom/google/android/material/animation/MotionSpec;
+.field aQZ:Lcom/google/android/material/animation/MotionSpec;
 
-.field private final aQI:Lcom/google/android/material/internal/StateListAnimator;
+.field private final aRa:Lcom/google/android/material/internal/StateListAnimator;
 
-.field aQJ:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+.field aRb:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
-.field aQK:Landroid/graphics/drawable/Drawable;
+.field aRc:Landroid/graphics/drawable/Drawable;
 
-.field aQL:Landroid/graphics/drawable/Drawable;
+.field aRd:Landroid/graphics/drawable/Drawable;
 
-.field aQM:Lcom/google/android/material/internal/CircularBorderDrawable;
+.field aRe:Lcom/google/android/material/internal/CircularBorderDrawable;
 
-.field aQN:Landroid/graphics/drawable/Drawable;
+.field aRf:Landroid/graphics/drawable/Drawable;
 
-.field aQO:F
+.field aRg:F
 
-.field aQP:F
+.field aRh:F
 
-.field aQQ:F
+.field aRi:F
 
-.field aQR:Ljava/util/ArrayList;
+.field aRj:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -69,7 +69,7 @@
     .end annotation
 .end field
 
-.field aQS:Ljava/util/ArrayList;
+.field aRk:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -79,13 +79,13 @@
     .end annotation
 .end field
 
-.field final aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+.field final aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-.field final aQX:Lcom/google/android/material/shadow/ShadowViewDelegate;
+.field final aRp:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-.field private final aQY:Landroid/graphics/Matrix;
+.field private final aRq:Landroid/graphics/Matrix;
 
-.field aQZ:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+.field aRr:Landroid/view/ViewTreeObserver$OnPreDrawListener;
 
 .field elevation:F
 
@@ -110,7 +110,7 @@
 
     sget-object v0, Lcom/google/android/material/animation/AnimationUtils;->FAST_OUT_LINEAR_IN_INTERPOLATOR:Landroid/animation/TimeInterpolator;
 
-    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aQD:Landroid/animation/TimeInterpolator;
+    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aQV:Landroid/animation/TimeInterpolator;
 
     const/4 v0, 0x2
 
@@ -126,19 +126,19 @@
 
     fill-array-data v1, :array_1
 
-    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aQT:[I
+    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aRl:[I
 
     new-array v1, v0, [I
 
     fill-array-data v1, :array_2
 
-    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aQU:[I
+    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aRm:[I
 
     new-array v0, v0, [I
 
     fill-array-data v0, :array_3
 
-    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aQV:[I
+    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aRn:[I
 
     const/4 v0, 0x1
 
@@ -191,11 +191,11 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQE:I
+    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:I
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQQ:F
+    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRi:F
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -219,19 +219,19 @@
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQY:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRq:Landroid/graphics/Matrix;
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQX:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRp:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
     new-instance p1, Lcom/google/android/material/internal/StateListAnimator;
 
     invoke-direct {p1}, Lcom/google/android/material/internal/StateListAnimator;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQI:Lcom/google/android/material/internal/StateListAnimator;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRa:Lcom/google/android/material/internal/StateListAnimator;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQI:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRa:Lcom/google/android/material/internal/StateListAnimator;
 
     sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->PRESSED_ENABLED_STATE_SET:[I
 
@@ -245,9 +245,9 @@
 
     invoke-virtual {p1, p2, v0}, Lcom/google/android/material/internal/StateListAnimator;->addState([ILandroid/animation/ValueAnimator;)V
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQI:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRa:Lcom/google/android/material/internal/StateListAnimator;
 
-    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aQT:[I
+    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aRl:[I
 
     new-instance v0, Lcom/google/android/material/floatingactionbutton/a$b;
 
@@ -259,9 +259,9 @@
 
     invoke-virtual {p1, p2, v0}, Lcom/google/android/material/internal/StateListAnimator;->addState([ILandroid/animation/ValueAnimator;)V
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQI:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRa:Lcom/google/android/material/internal/StateListAnimator;
 
-    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aQU:[I
+    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aRm:[I
 
     new-instance v0, Lcom/google/android/material/floatingactionbutton/a$b;
 
@@ -273,9 +273,9 @@
 
     invoke-virtual {p1, p2, v0}, Lcom/google/android/material/internal/StateListAnimator;->addState([ILandroid/animation/ValueAnimator;)V
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQI:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRa:Lcom/google/android/material/internal/StateListAnimator;
 
-    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aQV:[I
+    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aRn:[I
 
     new-instance v0, Lcom/google/android/material/floatingactionbutton/a$b;
 
@@ -287,7 +287,7 @@
 
     invoke-virtual {p1, p2, v0}, Lcom/google/android/material/internal/StateListAnimator;->addState([ILandroid/animation/ValueAnimator;)V
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQI:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRa:Lcom/google/android/material/internal/StateListAnimator;
 
     sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->ENABLED_STATE_SET:[I
 
@@ -301,7 +301,7 @@
 
     invoke-virtual {p1, p2, v0}, Lcom/google/android/material/internal/StateListAnimator;->addState([ILandroid/animation/ValueAnimator;)V
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQI:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRa:Lcom/google/android/material/internal/StateListAnimator;
 
     sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->EMPTY_STATE_SET:[I
 
@@ -315,7 +315,7 @@
 
     invoke-virtual {p1, p2, v0}, Lcom/google/android/material/internal/StateListAnimator;->addState([ILandroid/animation/ValueAnimator;)V
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getRotation()F
 
@@ -333,7 +333,7 @@
 
     invoke-direct {v0}, Landroid/animation/ValueAnimator;-><init>()V
 
-    sget-object v1, Lcom/google/android/material/floatingactionbutton/a;->aQD:Landroid/animation/TimeInterpolator;
+    sget-object v1, Lcom/google/android/material/floatingactionbutton/a;->aQV:Landroid/animation/TimeInterpolator;
 
     invoke-virtual {v0, v1}, Landroid/animation/ValueAnimator;->setInterpolator(Landroid/animation/TimeInterpolator;)V
 
@@ -369,7 +369,7 @@
 
     invoke-virtual {p2}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -433,33 +433,33 @@
 
 
 # virtual methods
-.method final Al()V
+.method final Ah()V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQQ:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRi:F
 
-    invoke-virtual {p0, v0}, Lcom/google/android/material/floatingactionbutton/a;->u(F)V
+    invoke-virtual {p0, v0}, Lcom/google/android/material/floatingactionbutton/a;->t(F)V
 
     return-void
 .end method
 
-.method Am()V
+.method Ai()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQI:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRa:Lcom/google/android/material/internal/StateListAnimator;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/StateListAnimator;->jumpToCurrentState()V
 
     return-void
 .end method
 
-.method An()V
+.method Aj()V
     .locals 0
 
     return-void
 .end method
 
-.method final Ao()V
+.method final Ak()V
     .locals 5
 
     iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->tmpRect:Landroid/graphics/Rect;
@@ -468,7 +468,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/android/material/floatingactionbutton/a;->d(Landroid/graphics/Rect;)V
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQX:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRp:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
     iget v2, v0, Landroid/graphics/Rect;->left:I
 
@@ -483,7 +483,7 @@
     return-void
 .end method
 
-.method Ap()Z
+.method Al()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -491,7 +491,7 @@
     return v0
 .end method
 
-.method Aq()Lcom/google/android/material/internal/CircularBorderDrawable;
+.method Am()Lcom/google/android/material/internal/CircularBorderDrawable;
     .locals 1
 
     new-instance v0, Lcom/google/android/material/internal/CircularBorderDrawable;
@@ -501,10 +501,10 @@
     return-object v0
 .end method
 
-.method final Ar()Landroid/graphics/drawable/GradientDrawable;
+.method final An()Landroid/graphics/drawable/GradientDrawable;
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->As()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Ao()Landroid/graphics/drawable/GradientDrawable;
 
     move-result-object v0
 
@@ -519,7 +519,7 @@
     return-object v0
 .end method
 
-.method As()Landroid/graphics/drawable/GradientDrawable;
+.method Ao()Landroid/graphics/drawable/GradientDrawable;
     .locals 1
 
     new-instance v0, Landroid/graphics/drawable/GradientDrawable;
@@ -529,10 +529,10 @@
     return-object v0
 .end method
 
-.method final At()Z
+.method final Ap()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->isLaidOut(Landroid/view/View;)Z
 
@@ -540,7 +540,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->isInEditMode()Z
 
@@ -565,7 +565,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     sget-object v2, Landroid/view/View;->ALPHA:Landroid/util/Property;
 
@@ -591,7 +591,7 @@
 
     invoke-interface {v0, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     sget-object v1, Landroid/view/View;->SCALE_X:Landroid/util/Property;
 
@@ -613,7 +613,7 @@
 
     invoke-interface {v0, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     sget-object v2, Landroid/view/View;->SCALE_Y:Landroid/util/Property;
 
@@ -633,11 +633,11 @@
 
     invoke-interface {v0, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQY:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRq:Landroid/graphics/Matrix;
 
     invoke-direct {p0, p4, p2}, Lcom/google/android/material/floatingactionbutton/a;->a(FLandroid/graphics/Matrix;)V
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     new-instance p3, Lcom/google/android/material/animation/ImageMatrixProperty;
 
@@ -651,7 +651,7 @@
 
     new-instance v2, Landroid/graphics/Matrix;
 
-    iget-object v3, p0, Lcom/google/android/material/floatingactionbutton/a;->aQY:Landroid/graphics/Matrix;
+    iget-object v3, p0, Lcom/google/android/material/floatingactionbutton/a;->aRq:Landroid/graphics/Matrix;
 
     invoke-direct {v2, v3}, Landroid/graphics/Matrix;-><init>(Landroid/graphics/Matrix;)V
 
@@ -683,13 +683,13 @@
 .method final a(ILandroid/content/res/ColorStateList;)Lcom/google/android/material/internal/CircularBorderDrawable;
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Aq()Lcom/google/android/material/internal/CircularBorderDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Am()Lcom/google/android/material/internal/CircularBorderDrawable;
 
     move-result-object v1
 
@@ -731,7 +731,7 @@
 .method a(Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;Landroid/content/res/ColorStateList;I)V
     .locals 7
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Ar()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->An()Landroid/graphics/drawable/GradientDrawable;
 
     move-result-object v0
 
@@ -739,20 +739,20 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQK:Landroid/graphics/drawable/Drawable;
+    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRc:Landroid/graphics/drawable/Drawable;
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRc:Landroid/graphics/drawable/Drawable;
 
     invoke-static {v0, p1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V
 
     if-eqz p2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRc:Landroid/graphics/drawable/Drawable;
 
     invoke-static {v0, p2}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Ar()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->An()Landroid/graphics/drawable/GradientDrawable;
 
     move-result-object p2
 
@@ -760,9 +760,9 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQL:Landroid/graphics/drawable/Drawable;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRd:Landroid/graphics/drawable/Drawable;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQL:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRd:Landroid/graphics/drawable/Drawable;
 
     invoke-static {p3}, Lcom/google/android/material/ripple/RippleUtils;->convertToRippleDrawableColor(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList;
 
@@ -782,21 +782,21 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQM:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRe:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     const/4 p1, 0x3
 
     new-array p1, p1, [Landroid/graphics/drawable/Drawable;
 
-    iget-object p4, p0, Lcom/google/android/material/floatingactionbutton/a;->aQM:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object p4, p0, Lcom/google/android/material/floatingactionbutton/a;->aRe:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     aput-object p4, p1, v0
 
-    iget-object p4, p0, Lcom/google/android/material/floatingactionbutton/a;->aQK:Landroid/graphics/drawable/Drawable;
+    iget-object p4, p0, Lcom/google/android/material/floatingactionbutton/a;->aRc:Landroid/graphics/drawable/Drawable;
 
     aput-object p4, p1, p2
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQL:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRd:Landroid/graphics/drawable/Drawable;
 
     aput-object p2, p1, p3
 
@@ -805,15 +805,15 @@
     :cond_1
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQM:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRe:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     new-array p1, p3, [Landroid/graphics/drawable/Drawable;
 
-    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aQK:Landroid/graphics/drawable/Drawable;
+    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aRc:Landroid/graphics/drawable/Drawable;
 
     aput-object p3, p1, v0
 
-    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aQL:Landroid/graphics/drawable/Drawable;
+    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aRd:Landroid/graphics/drawable/Drawable;
 
     aput-object p3, p1, p2
 
@@ -822,19 +822,19 @@
 
     invoke-direct {p2, p1}, Landroid/graphics/drawable/LayerDrawable;-><init>([Landroid/graphics/drawable/Drawable;)V
 
-    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQN:Landroid/graphics/drawable/Drawable;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRf:Landroid/graphics/drawable/Drawable;
 
     new-instance p1, Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p2}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getContext()Landroid/content/Context;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/material/floatingactionbutton/a;->aQN:Landroid/graphics/drawable/Drawable;
+    iget-object v3, p0, Lcom/google/android/material/floatingactionbutton/a;->aRf:Landroid/graphics/drawable/Drawable;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQX:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRp:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
     invoke-interface {p2}, Lcom/google/android/material/shadow/ShadowViewDelegate;->getRadius()F
 
@@ -842,7 +842,7 @@
 
     iget v5, p0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
 
-    iget p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQP:F
+    iget p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRh:F
 
     add-float v6, v5, p2
 
@@ -850,15 +850,15 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/material/shadow/ShadowDrawableWrapper;-><init>(Landroid/content/Context;Landroid/graphics/drawable/Drawable;FFF)V
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQJ:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRb:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQJ:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRb:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->setAddPaddingForCorners(Z)V
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQX:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRp:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQJ:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRb:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
     invoke-interface {p1, p2}, Lcom/google/android/material/shadow/ShadowViewDelegate;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
@@ -868,17 +868,17 @@
 .method c(FFF)V
     .locals 0
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aQJ:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aRb:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
     if-eqz p2, :cond_0
 
-    iget p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aQP:F
+    iget p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aRh:F
 
     add-float/2addr p3, p1
 
     invoke-virtual {p2, p1, p3}, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->setShadowSize(FF)V
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Ao()V
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->Ak()V
 
     :cond_0
     return-void
@@ -887,7 +887,7 @@
 .method c(Landroid/graphics/Rect;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQJ:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRb:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
     invoke-virtual {v0, p1}, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->getPadding(Landroid/graphics/Rect;)Z
 
@@ -903,7 +903,7 @@
 .method g([I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQI:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRa:Lcom/google/android/material/internal/StateListAnimator;
 
     invoke-virtual {v0, p1}, Lcom/google/android/material/internal/StateListAnimator;->setState([I)V
 
@@ -921,7 +921,7 @@
 .method final isOrWillBeHidden()Z
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getVisibility()I
 
@@ -933,7 +933,7 @@
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQE:I
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:I
 
     if-ne v0, v2, :cond_0
 
@@ -943,7 +943,7 @@
     return v1
 
     :cond_1
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQE:I
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:I
 
     const/4 v3, 0x2
 
@@ -958,7 +958,7 @@
 .method final isOrWillBeShown()Z
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getVisibility()I
 
@@ -970,7 +970,7 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQE:I
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:I
 
     const/4 v3, 0x2
 
@@ -982,7 +982,7 @@
     return v1
 
     :cond_1
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQE:I
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:I
 
     if-eq v0, v2, :cond_2
 
@@ -992,22 +992,45 @@
     return v1
 .end method
 
-.method final s(F)V
+.method final r(F)V
     .locals 2
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQO:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRg:F
 
     cmpl-float v0, v0, p1
 
     if-eqz v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQO:F
+    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRg:F
 
     iget p1, p0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQO:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRg:F
 
-    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQP:F
+    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRh:F
+
+    invoke-virtual {p0, p1, v0, v1}, Lcom/google/android/material/floatingactionbutton/a;->c(FFF)V
+
+    :cond_0
+    return-void
+.end method
+
+.method final s(F)V
+    .locals 2
+
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRh:F
+
+    cmpl-float v0, v0, p1
+
+    if-eqz v0, :cond_0
+
+    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRh:F
+
+    iget p1, p0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
+
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRg:F
+
+    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRh:F
 
     invoke-virtual {p0, p1, v0, v1}, Lcom/google/android/material/floatingactionbutton/a;->c(FFF)V
 
@@ -1028,9 +1051,9 @@
 
     iget p1, p0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQO:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRg:F
 
-    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQP:F
+    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRh:F
 
     invoke-virtual {p0, p1, v0, v1}, Lcom/google/android/material/floatingactionbutton/a;->c(FFF)V
 
@@ -1041,7 +1064,7 @@
 .method setRippleColor(Landroid/content/res/ColorStateList;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQL:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRd:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_0
 
@@ -1056,38 +1079,15 @@
 .end method
 
 .method final t(F)V
-    .locals 2
-
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQP:F
-
-    cmpl-float v0, v0, p1
-
-    if-eqz v0, :cond_0
-
-    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQP:F
-
-    iget p1, p0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
-
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQO:F
-
-    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQP:F
-
-    invoke-virtual {p0, p1, v0, v1}, Lcom/google/android/material/floatingactionbutton/a;->c(FFF)V
-
-    :cond_0
-    return-void
-.end method
-
-.method final u(F)V
     .locals 1
 
-    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQQ:F
+    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRi:F
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aQY:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aRq:Landroid/graphics/Matrix;
 
     invoke-direct {p0, p1, v0}, Lcom/google/android/material/floatingactionbutton/a;->a(FLandroid/graphics/Matrix;)V
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setImageMatrix(Landroid/graphics/Matrix;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/b.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/b.smali
index f211e4af06..3f98d5a9a5 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/b.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field private aRg:Landroid/graphics/drawable/InsetDrawable;
+.field private aRy:Landroid/graphics/drawable/InsetDrawable;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     invoke-direct {v0}, Landroid/animation/AnimatorSet;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     const/4 v2, 0x1
 
@@ -57,7 +57,7 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     sget-object v3, Landroid/view/View;->TRANSLATION_Z:Landroid/util/Property;
 
@@ -77,7 +77,7 @@
 
     invoke-virtual {p1, p2}, Landroid/animation/AnimatorSet$Builder;->with(Landroid/animation/Animator;)Landroid/animation/AnimatorSet$Builder;
 
-    sget-object p1, Lcom/google/android/material/floatingactionbutton/b;->aQD:Landroid/animation/TimeInterpolator;
+    sget-object p1, Lcom/google/android/material/floatingactionbutton/b;->aQV:Landroid/animation/TimeInterpolator;
 
     invoke-virtual {v0, p1}, Landroid/animation/AnimatorSet;->setInterpolator(Landroid/animation/TimeInterpolator;)V
 
@@ -86,21 +86,21 @@
 
 
 # virtual methods
-.method final Am()V
+.method final Ai()V
     .locals 0
 
     return-void
 .end method
 
-.method final An()V
+.method final Aj()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->Ao()V
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->Ak()V
 
     return-void
 .end method
 
-.method final Ap()Z
+.method final Al()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -108,7 +108,7 @@
     return v0
 .end method
 
-.method final Aq()Lcom/google/android/material/internal/CircularBorderDrawable;
+.method final Am()Lcom/google/android/material/internal/CircularBorderDrawable;
     .locals 1
 
     new-instance v0, Lcom/google/android/material/internal/CircularBorderDrawableLollipop;
@@ -118,7 +118,7 @@
     return-object v0
 .end method
 
-.method final As()Landroid/graphics/drawable/GradientDrawable;
+.method final Ao()Landroid/graphics/drawable/GradientDrawable;
     .locals 1
 
     new-instance v0, Lcom/google/android/material/floatingactionbutton/b$a;
@@ -131,7 +131,7 @@
 .method final a(Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;Landroid/content/res/ColorStateList;I)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->Ar()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->An()Landroid/graphics/drawable/GradientDrawable;
 
     move-result-object v0
 
@@ -139,15 +139,15 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aQK:Landroid/graphics/drawable/Drawable;
+    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRc:Landroid/graphics/drawable/Drawable;
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aQK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRc:Landroid/graphics/drawable/Drawable;
 
     invoke-static {v0, p1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V
 
     if-eqz p2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aQK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRc:Landroid/graphics/drawable/Drawable;
 
     invoke-static {v0, p2}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V
 
@@ -160,7 +160,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQM:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRe:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     new-instance p1, Landroid/graphics/drawable/LayerDrawable;
 
@@ -170,13 +170,13 @@
 
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQM:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRe:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     aput-object v1, p4, v0
 
     const/4 v0, 0x1
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQK:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRc:Landroid/graphics/drawable/Drawable;
 
     aput-object v1, p4, v0
 
@@ -185,9 +185,9 @@
     goto :goto_0
 
     :cond_1
-    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/b;->aQM:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/b;->aRe:Lcom/google/android/material/internal/CircularBorderDrawable;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQK:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRc:Landroid/graphics/drawable/Drawable;
 
     :goto_0
     new-instance p4, Landroid/graphics/drawable/RippleDrawable;
@@ -198,15 +198,15 @@
 
     invoke-direct {p4, p3, p1, p2}, Landroid/graphics/drawable/RippleDrawable;-><init>(Landroid/content/res/ColorStateList;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 
-    iput-object p4, p0, Lcom/google/android/material/floatingactionbutton/b;->aQL:Landroid/graphics/drawable/Drawable;
+    iput-object p4, p0, Lcom/google/android/material/floatingactionbutton/b;->aRd:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQL:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRd:Landroid/graphics/drawable/Drawable;
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQN:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRf:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQX:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRp:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/b;->aQL:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/b;->aRd:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p1, p2}, Lcom/google/android/material/shadow/ShadowViewDelegate;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
@@ -222,7 +222,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->refreshDrawableState()V
 
@@ -241,7 +241,7 @@
 
     invoke-virtual {v0, v1, p3}, Landroid/animation/StateListAnimator;->addState([ILandroid/animation/Animator;)V
 
-    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aQT:[I
+    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aRl:[I
 
     invoke-direct {p0, p1, p2}, Lcom/google/android/material/floatingactionbutton/b;->c(FF)Landroid/animation/Animator;
 
@@ -249,7 +249,7 @@
 
     invoke-virtual {v0, p3, v1}, Landroid/animation/StateListAnimator;->addState([ILandroid/animation/Animator;)V
 
-    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aQU:[I
+    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aRm:[I
 
     invoke-direct {p0, p1, p2}, Lcom/google/android/material/floatingactionbutton/b;->c(FF)Landroid/animation/Animator;
 
@@ -257,7 +257,7 @@
 
     invoke-virtual {v0, p3, v1}, Landroid/animation/StateListAnimator;->addState([ILandroid/animation/Animator;)V
 
-    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aQV:[I
+    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aRn:[I
 
     invoke-direct {p0, p1, p2}, Lcom/google/android/material/floatingactionbutton/b;->c(FF)Landroid/animation/Animator;
 
@@ -273,7 +273,7 @@
 
     invoke-direct {p3}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     const/4 v2, 0x1
 
@@ -311,13 +311,13 @@
 
     if-gt p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     sget-object v1, Landroid/view/View;->TRANSLATION_Z:Landroid/util/Property;
 
     new-array v3, v2, [F
 
-    iget-object v7, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v7, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v7}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getTranslationZ()F
 
@@ -336,7 +336,7 @@
     invoke-interface {p3, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     sget-object v1, Landroid/view/View;->TRANSLATION_Z:Landroid/util/Property;
 
@@ -366,7 +366,7 @@
 
     invoke-virtual {p2, p1}, Landroid/animation/AnimatorSet;->playSequentially([Landroid/animation/Animator;)V
 
-    sget-object p1, Lcom/google/android/material/floatingactionbutton/b;->aQD:Landroid/animation/TimeInterpolator;
+    sget-object p1, Lcom/google/android/material/floatingactionbutton/b;->aQV:Landroid/animation/TimeInterpolator;
 
     invoke-virtual {p2, p1}, Landroid/animation/AnimatorSet;->setInterpolator(Landroid/animation/TimeInterpolator;)V
 
@@ -382,12 +382,12 @@
 
     invoke-virtual {v0, p1, p2}, Landroid/animation/StateListAnimator;->addState([ILandroid/animation/Animator;)V
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setStateListAnimator(Landroid/animation/StateListAnimator;)V
 
     :goto_0
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQX:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRp:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
     invoke-interface {p1}, Lcom/google/android/material/shadow/ShadowViewDelegate;->isCompatPaddingEnabled()Z
 
@@ -395,7 +395,7 @@
 
     if-eqz p1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->Ao()V
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->Ak()V
 
     :cond_2
     return-void
@@ -404,7 +404,7 @@
 .method final c(Landroid/graphics/Rect;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aQX:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRp:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
     invoke-interface {v0}, Lcom/google/android/material/shadow/ShadowViewDelegate;->isCompatPaddingEnabled()Z
 
@@ -414,19 +414,19 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aQX:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRp:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
     invoke-interface {v0}, Lcom/google/android/material/shadow/ShadowViewDelegate;->getRadius()F
 
     move-result v0
 
-    iget-object v2, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v2, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v2}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getElevation()F
 
     move-result v2
 
-    iget v3, p0, Lcom/google/android/material/floatingactionbutton/b;->aQP:F
+    iget v3, p0, Lcom/google/android/material/floatingactionbutton/b;->aRh:F
 
     add-float/2addr v2, v3
 
@@ -467,7 +467,7 @@
 .method final d(Landroid/graphics/Rect;)V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aQX:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRp:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
     invoke-interface {v0}, Lcom/google/android/material/shadow/ShadowViewDelegate;->isCompatPaddingEnabled()Z
 
@@ -477,7 +477,7 @@
 
     new-instance v0, Landroid/graphics/drawable/InsetDrawable;
 
-    iget-object v2, p0, Lcom/google/android/material/floatingactionbutton/b;->aQL:Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/google/android/material/floatingactionbutton/b;->aRd:Landroid/graphics/drawable/Drawable;
 
     iget v3, p1, Landroid/graphics/Rect;->left:I
 
@@ -491,20 +491,20 @@
 
     invoke-direct/range {v1 .. v6}, Landroid/graphics/drawable/InsetDrawable;-><init>(Landroid/graphics/drawable/Drawable;IIII)V
 
-    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRg:Landroid/graphics/drawable/InsetDrawable;
+    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRy:Landroid/graphics/drawable/InsetDrawable;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQX:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRp:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRg:Landroid/graphics/drawable/InsetDrawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRy:Landroid/graphics/drawable/InsetDrawable;
 
     invoke-interface {p1, v0}, Lcom/google/android/material/shadow/ShadowViewDelegate;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQX:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRp:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aQL:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRd:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p1, v0}, Lcom/google/android/material/shadow/ShadowViewDelegate;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
@@ -520,7 +520,7 @@
 
     if-ne p1, v0, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->isEnabled()Z
 
@@ -530,13 +530,13 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     iget v1, p0, Lcom/google/android/material/floatingactionbutton/b;->elevation:F
 
     invoke-virtual {p1, v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setElevation(F)V
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->isPressed()Z
 
@@ -544,16 +544,16 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aQP:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRh:F
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setTranslationZ(F)V
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->isFocused()Z
 
@@ -561,7 +561,7 @@
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->isHovered()Z
 
@@ -572,7 +572,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setTranslationZ(F)V
 
@@ -580,20 +580,20 @@
 
     :cond_2
     :goto_0
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aQO:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRg:F
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setTranslationZ(F)V
 
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setElevation(F)V
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setTranslationZ(F)V
 
@@ -604,7 +604,7 @@
 .method public final getElevation()F
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aQW:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRo:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getElevation()F
 
@@ -616,13 +616,13 @@
 .method final setRippleColor(Landroid/content/res/ColorStateList;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aQL:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRd:Landroid/graphics/drawable/Drawable;
 
     instance-of v0, v0, Landroid/graphics/drawable/RippleDrawable;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aQL:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aRd:Landroid/graphics/drawable/Drawable;
 
     check-cast v0, Landroid/graphics/drawable/RippleDrawable;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/CheckableImageButton$1.smali b/com.discord/smali_classes2/com/google/android/material/internal/CheckableImageButton$1.smali
index 0f69ca95fd..42c8ce5a3e 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/CheckableImageButton$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/CheckableImageButton$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aRh:Lcom/google/android/material/internal/CheckableImageButton;
+.field final synthetic aRz:Lcom/google/android/material/internal/CheckableImageButton;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/internal/CheckableImageButton;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/internal/CheckableImageButton$1;->aRh:Lcom/google/android/material/internal/CheckableImageButton;
+    iput-object p1, p0, Lcom/google/android/material/internal/CheckableImageButton$1;->aRz:Lcom/google/android/material/internal/CheckableImageButton;
 
     invoke-direct {p0}, Landroidx/core/view/AccessibilityDelegateCompat;-><init>()V
 
@@ -36,7 +36,7 @@
 
     invoke-super {p0, p1, p2}, Landroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityEvent(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)V
 
-    iget-object p1, p0, Lcom/google/android/material/internal/CheckableImageButton$1;->aRh:Lcom/google/android/material/internal/CheckableImageButton;
+    iget-object p1, p0, Lcom/google/android/material/internal/CheckableImageButton$1;->aRz:Lcom/google/android/material/internal/CheckableImageButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/CheckableImageButton;->isChecked()Z
 
@@ -56,7 +56,7 @@
 
     invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setCheckable(Z)V
 
-    iget-object p1, p0, Lcom/google/android/material/internal/CheckableImageButton$1;->aRh:Lcom/google/android/material/internal/CheckableImageButton;
+    iget-object p1, p0, Lcom/google/android/material/internal/CheckableImageButton$1;->aRz:Lcom/google/android/material/internal/CheckableImageButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/CheckableImageButton;->isChecked()Z
 
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/CircularBorderDrawable$a.smali b/com.discord/smali_classes2/com/google/android/material/internal/CircularBorderDrawable$a.smali
index 93fd08c245..0edb5fa67e 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/CircularBorderDrawable$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/CircularBorderDrawable$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aRi:Lcom/google/android/material/internal/CircularBorderDrawable;
+.field final synthetic aRA:Lcom/google/android/material/internal/CircularBorderDrawable;
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/material/internal/CircularBorderDrawable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/internal/CircularBorderDrawable$a;->aRi:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p1, p0, Lcom/google/android/material/internal/CircularBorderDrawable$a;->aRA:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     invoke-direct {p0}, Landroid/graphics/drawable/Drawable$ConstantState;-><init>()V
 
@@ -50,7 +50,7 @@
 .method public final newDrawable()Landroid/graphics/drawable/Drawable;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/internal/CircularBorderDrawable$a;->aRi:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v0, p0, Lcom/google/android/material/internal/CircularBorderDrawable$a;->aRA:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuItemView$1.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuItemView$1.smali
index 8197086398..420a7c4ce1 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuItemView$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuItemView$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aRj:Lcom/google/android/material/internal/NavigationMenuItemView;
+.field final synthetic aRB:Lcom/google/android/material/internal/NavigationMenuItemView;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/internal/NavigationMenuItemView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuItemView$1;->aRj:Lcom/google/android/material/internal/NavigationMenuItemView;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuItemView$1;->aRB:Lcom/google/android/material/internal/NavigationMenuItemView;
 
     invoke-direct {p0}, Landroidx/core/view/AccessibilityDelegateCompat;-><init>()V
 
@@ -36,7 +36,7 @@
 
     invoke-super {p0, p1, p2}, Landroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
 
-    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuItemView$1;->aRj:Lcom/google/android/material/internal/NavigationMenuItemView;
+    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuItemView$1;->aRB:Lcom/google/android/material/internal/NavigationMenuItemView;
 
     iget-boolean p1, p1, Lcom/google/android/material/internal/NavigationMenuItemView;->checkable:Z
 
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$1.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$1.smali
index bb1679599c..58ff160abb 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+.field final synthetic aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/internal/NavigationMenuPresenter;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,7 +39,7 @@
 
     check-cast p1, Lcom/google/android/material/internal/NavigationMenuItemView;
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     const/4 v1, 0x1
 
@@ -49,11 +49,11 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
 
-    iget-object v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     const/4 v2, 0x0
 
@@ -71,18 +71,18 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->adapter:Lcom/google/android/material/internal/NavigationMenuPresenter$b;
 
     invoke-virtual {v0, p1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->setCheckedItem(Landroidx/appcompat/view/menu/MenuItemImpl;)V
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     invoke-virtual {p1, v2}, Lcom/google/android/material/internal/NavigationMenuPresenter;->setUpdateSuspended(Z)V
 
-    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     invoke-virtual {p1, v2}, Lcom/google/android/material/internal/NavigationMenuPresenter;->updateMenuView(Z)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$b.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$b.smali
index 9e68dc3ffb..149e1578f5 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$b.smali
@@ -23,9 +23,9 @@
 
 
 # instance fields
-.field final synthetic aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+.field final synthetic aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
-.field final aRl:Ljava/util/ArrayList;
+.field final aRD:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field aRm:Landroidx/appcompat/view/menu/MenuItemImpl;
+.field aRE:Landroidx/appcompat/view/menu/MenuItemImpl;
 
 .field updateSuspended:Z
 
@@ -44,7 +44,7 @@
 .method constructor <init>(Lcom/google/android/material/internal/NavigationMenuPresenter;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
@@ -52,20 +52,20 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
-    invoke-virtual {p0}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Av()V
+    invoke-virtual {p0}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Ar()V
 
     return-void
 .end method
 
-.method private P(II)V
+.method private O(II)V
     .locals 2
 
     :goto_0
     if-ge p1, p2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -87,7 +87,7 @@
 
 
 # virtual methods
-.method final Av()V
+.method final Ar()V
     .locals 16
 
     move-object/from16 v0, p0
@@ -103,11 +103,11 @@
 
     iput-boolean v1, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->updateSuspended:Z
 
-    iget-object v2, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v2, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v2, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v2, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     new-instance v3, Lcom/google/android/material/internal/NavigationMenuPresenter$c;
 
@@ -117,7 +117,7 @@
 
     const/4 v2, -0x1
 
-    iget-object v3, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v3, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v3, v3, Lcom/google/android/material/internal/NavigationMenuPresenter;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
 
@@ -142,7 +142,7 @@
     :goto_0
     if-ge v2, v3, :cond_f
 
-    iget-object v8, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v8, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v8, v8, Lcom/google/android/material/internal/NavigationMenuPresenter;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
 
@@ -192,11 +192,11 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     new-instance v11, Lcom/google/android/material/internal/NavigationMenuPresenter$e;
 
-    iget-object v12, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v12, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget v12, v12, Lcom/google/android/material/internal/NavigationMenuPresenter;->paddingSeparator:I
 
@@ -205,7 +205,7 @@
     invoke-virtual {v10, v11}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_3
-    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     new-instance v11, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
@@ -213,7 +213,7 @@
 
     invoke-virtual {v10, v11}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v10}, Ljava/util/ArrayList;->size()I
 
@@ -271,7 +271,7 @@
     invoke-virtual {v0, v8}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->setCheckedItem(Landroidx/appcompat/view/menu/MenuItemImpl;)V
 
     :cond_6
-    iget-object v15, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v15, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
@@ -289,13 +289,13 @@
     :cond_8
     if-eqz v13, :cond_e
 
-    iget-object v1, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
 
     move-result v1
 
-    invoke-direct {v0, v10, v1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->P(II)V
+    invoke-direct {v0, v10, v1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->O(II)V
 
     goto :goto_4
 
@@ -306,7 +306,7 @@
 
     if-eq v1, v5, :cond_c
 
-    iget-object v5, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v5, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v5}, Ljava/util/ArrayList;->size()I
 
@@ -330,15 +330,15 @@
 
     add-int/lit8 v7, v7, 0x1
 
-    iget-object v6, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v6, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     new-instance v9, Lcom/google/android/material/internal/NavigationMenuPresenter$e;
 
-    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget v10, v10, Lcom/google/android/material/internal/NavigationMenuPresenter;->paddingSeparator:I
 
-    iget-object v11, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v11, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget v11, v11, Lcom/google/android/material/internal/NavigationMenuPresenter;->paddingSeparator:I
 
@@ -360,13 +360,13 @@
 
     if-eqz v5, :cond_d
 
-    iget-object v5, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v5, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v5}, Ljava/util/ArrayList;->size()I
 
     move-result v5
 
-    invoke-direct {v0, v7, v5}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->P(II)V
+    invoke-direct {v0, v7, v5}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->O(II)V
 
     const/4 v6, 0x1
 
@@ -378,7 +378,7 @@
 
     iput-boolean v6, v5, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->needsEmptyIcon:Z
 
-    iget-object v8, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v8, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v8, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -398,14 +398,14 @@
     return-void
 .end method
 
-.method public final Aw()Landroid/os/Bundle;
+.method public final As()Landroid/os/Bundle;
     .locals 7
 
     new-instance v0, Landroid/os/Bundle;
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRm:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRE:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     if-eqz v1, :cond_0
 
@@ -424,7 +424,7 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v3, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v3}, Ljava/util/ArrayList;->size()I
 
@@ -433,7 +433,7 @@
     :goto_0
     if-ge v2, v3, :cond_3
 
-    iget-object v4, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v4, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v4, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -447,7 +447,7 @@
 
     check-cast v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
-    iget-object v4, v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRn:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v4, v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRF:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     if-eqz v4, :cond_1
 
@@ -491,7 +491,7 @@
 .method public final getItemCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
@@ -511,7 +511,7 @@
 .method public final getItemViewType(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -543,7 +543,7 @@
 
     check-cast p1, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
-    iget-object p1, p1, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRn:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object p1, p1, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRF:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     invoke-virtual {p1}, Landroidx/appcompat/view/menu/MenuItemImpl;->hasSubMenu()Z
 
@@ -594,7 +594,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -618,7 +618,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -626,7 +626,7 @@
 
     check-cast p2, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
-    iget-object p2, p2, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRn:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object p2, p2, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRF:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     invoke-virtual {p2}, Landroidx/appcompat/view/menu/MenuItemImpl;->getTitle()Ljava/lang/CharSequence;
 
@@ -641,45 +641,45 @@
 
     check-cast p1, Lcom/google/android/material/internal/NavigationMenuItemView;
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->iconTintList:Landroid/content/res/ColorStateList;
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/NavigationMenuItemView;->setIconTintList(Landroid/content/res/ColorStateList;)V
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-boolean v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->textAppearanceSet:Z
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->textAppearance:I
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/NavigationMenuItemView;->setTextAppearance(I)V
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->textColor:Landroid/content/res/ColorStateList;
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->textColor:Landroid/content/res/ColorStateList;
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/NavigationMenuItemView;->setTextColor(Landroid/content/res/ColorStateList;)V
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->itemBackground:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->itemBackground:Landroid/graphics/drawable/Drawable;
 
@@ -699,7 +699,7 @@
     :goto_1
     invoke-static {p1, v0}, Landroidx/core/view/ViewCompat;->setBackground(Landroid/view/View;Landroid/graphics/drawable/Drawable;)V
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -711,19 +711,19 @@
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/NavigationMenuItemView;->setNeedsEmptyIcon(Z)V
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->itemHorizontalPadding:I
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/NavigationMenuItemView;->setHorizontalPadding(I)V
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->itemIconPadding:I
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/NavigationMenuItemView;->setIconPadding(I)V
 
-    iget-object p2, p2, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRn:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object p2, p2, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRF:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     invoke-virtual {p1, p2, v1}, Lcom/google/android/material/internal/NavigationMenuItemView;->initialize(Landroidx/appcompat/view/menu/MenuItemImpl;I)V
 
@@ -754,7 +754,7 @@
     :cond_0
     new-instance p1, Lcom/google/android/material/internal/NavigationMenuPresenter$a;
 
-    iget-object p2, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object p2, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object p2, p2, Lcom/google/android/material/internal/NavigationMenuPresenter;->headerLayout:Landroid/widget/LinearLayout;
 
@@ -765,7 +765,7 @@
     :cond_1
     new-instance p2, Lcom/google/android/material/internal/NavigationMenuPresenter$h;
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->layoutInflater:Landroid/view/LayoutInflater;
 
@@ -776,7 +776,7 @@
     :cond_2
     new-instance p2, Lcom/google/android/material/internal/NavigationMenuPresenter$i;
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->layoutInflater:Landroid/view/LayoutInflater;
 
@@ -787,11 +787,11 @@
     :cond_3
     new-instance p2, Lcom/google/android/material/internal/NavigationMenuPresenter$g;
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->layoutInflater:Landroid/view/LayoutInflater;
 
-    iget-object v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRk:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRC:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v1, v1, Lcom/google/android/material/internal/NavigationMenuPresenter;->onClickListener:Landroid/view/View$OnClickListener;
 
@@ -822,7 +822,7 @@
 .method public final setCheckedItem(Landroidx/appcompat/view/menu/MenuItemImpl;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRm:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRE:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     if-eq v0, p1, :cond_2
 
@@ -835,7 +835,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRm:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRE:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     if-eqz v0, :cond_1
 
@@ -844,7 +844,7 @@
     invoke-virtual {v0, v1}, Landroidx/appcompat/view/menu/MenuItemImpl;->setChecked(Z)Landroid/view/MenuItem;
 
     :cond_1
-    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRm:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRE:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     const/4 v0, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$f.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$f.smali
index 9b86f5c3aa..b5b39ffa1a 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$f.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter$f.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final aRn:Landroidx/appcompat/view/menu/MenuItemImpl;
+.field final aRF:Landroidx/appcompat/view/menu/MenuItemImpl;
 
 .field needsEmptyIcon:Z
 
@@ -29,7 +29,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRn:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRF:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter.smali b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter.smali
index 5f523935ca..00b642a58a 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/NavigationMenuPresenter.smali
@@ -174,7 +174,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter;->adapter:Lcom/google/android/material/internal/NavigationMenuPresenter$b;
 
-    iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRm:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRE:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     return-object v0
 .end method
@@ -412,7 +412,7 @@
 
     iput-boolean v4, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->updateSuspended:Z
 
-    iget-object v4, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v4, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v4}, Ljava/util/ArrayList;->size()I
 
@@ -423,7 +423,7 @@
     :goto_0
     if-ge v5, v4, :cond_2
 
-    iget-object v6, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v6, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v6, v5}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -437,7 +437,7 @@
 
     check-cast v6, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
-    iget-object v6, v6, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRn:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v6, v6, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRF:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     if-eqz v6, :cond_1
 
@@ -460,7 +460,7 @@
     :goto_1
     iput-boolean v2, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->updateSuspended:Z
 
-    invoke-virtual {v1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Av()V
+    invoke-virtual {v1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Ar()V
 
     :cond_3
     const-string v3, "android:menu:action_views"
@@ -471,7 +471,7 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v3, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v3, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v3}, Ljava/util/ArrayList;->size()I
 
@@ -480,7 +480,7 @@
     :goto_2
     if-ge v2, v3, :cond_5
 
-    iget-object v4, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRl:Ljava/util/ArrayList;
+    iget-object v4, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aRD:Ljava/util/ArrayList;
 
     invoke-virtual {v4, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -494,7 +494,7 @@
 
     check-cast v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
-    iget-object v4, v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRn:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v4, v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aRF:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     if-eqz v4, :cond_4
 
@@ -568,7 +568,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Aw()Landroid/os/Bundle;
+    invoke-virtual {v1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->As()Landroid/os/Bundle;
 
     move-result-object v1
 
@@ -758,7 +758,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Av()V
+    invoke-virtual {p1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->Ar()V
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->notifyDataSetChanged()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/ScrimInsetsFrameLayout$1.smali b/com.discord/smali_classes2/com/google/android/material/internal/ScrimInsetsFrameLayout$1.smali
index e1a0f51988..a0f696c4c1 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/ScrimInsetsFrameLayout$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/ScrimInsetsFrameLayout$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRo:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+.field final synthetic aRG:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/internal/ScrimInsetsFrameLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRo:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iput-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRG:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,13 +37,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 4
 
-    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRo:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRG:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
 
     iget-object p1, p1, Lcom/google/android/material/internal/ScrimInsetsFrameLayout;->insets:Landroid/graphics/Rect;
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRo:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRG:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -52,7 +52,7 @@
     iput-object v0, p1, Lcom/google/android/material/internal/ScrimInsetsFrameLayout;->insets:Landroid/graphics/Rect;
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRo:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRG:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
 
     iget-object p1, p1, Lcom/google/android/material/internal/ScrimInsetsFrameLayout;->insets:Landroid/graphics/Rect;
 
@@ -74,11 +74,11 @@
 
     invoke-virtual {p1, v0, v1, v2, v3}, Landroid/graphics/Rect;->set(IIII)V
 
-    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRo:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRG:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
 
     invoke-virtual {p1, p2}, Lcom/google/android/material/internal/ScrimInsetsFrameLayout;->onInsetsChanged(Landroidx/core/view/WindowInsetsCompat;)V
 
-    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRo:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRG:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->hasSystemWindowInsets()Z
 
@@ -86,7 +86,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRo:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object v0, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRG:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
 
     iget-object v0, v0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout;->insetForeground:Landroid/graphics/drawable/Drawable;
 
@@ -106,7 +106,7 @@
     :goto_1
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/ScrimInsetsFrameLayout;->setWillNotDraw(Z)V
 
-    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRo:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aRG:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
 
     invoke-static {p1}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/StateListAnimator$1.smali b/com.discord/smali_classes2/com/google/android/material/internal/StateListAnimator$1.smali
index 2acf637b4e..4fac094c76 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/StateListAnimator$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/StateListAnimator$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aRp:Lcom/google/android/material/internal/StateListAnimator;
+.field final synthetic aRH:Lcom/google/android/material/internal/StateListAnimator;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/internal/StateListAnimator;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$1;->aRp:Lcom/google/android/material/internal/StateListAnimator;
+    iput-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$1;->aRH:Lcom/google/android/material/internal/StateListAnimator;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,13 +34,13 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/internal/StateListAnimator$1;->aRp:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object v0, p0, Lcom/google/android/material/internal/StateListAnimator$1;->aRH:Lcom/google/android/material/internal/StateListAnimator;
 
     iget-object v0, v0, Lcom/google/android/material/internal/StateListAnimator;->runningAnimator:Landroid/animation/ValueAnimator;
 
     if-ne v0, p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$1;->aRp:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$1;->aRH:Lcom/google/android/material/internal/StateListAnimator;
 
     const/4 v0, 0x0
 
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 17c8239246..5e5fe62af2 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,7 +15,7 @@
 
 
 # instance fields
-.field final aRq:[I
+.field final aRI:[I
 
 .field final animator:Landroid/animation/ValueAnimator;
 
@@ -26,7 +26,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$a;->aRq:[I
+    iput-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$a;->aRI:[I
 
     iput-object p2, p0, Lcom/google/android/material/internal/StateListAnimator$a;->animator:Landroid/animation/ValueAnimator;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/StateListAnimator.smali b/com.discord/smali_classes2/com/google/android/material/internal/StateListAnimator.smali
index 2298e5a8c9..8874bf49d6 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/StateListAnimator.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/StateListAnimator.smali
@@ -146,7 +146,7 @@
 
     check-cast v2, Lcom/google/android/material/internal/StateListAnimator$a;
 
-    iget-object v3, v2, Lcom/google/android/material/internal/StateListAnimator$a;->aRq:[I
+    iget-object v3, v2, Lcom/google/android/material/internal/StateListAnimator$a;->aRI:[I
 
     invoke-static {v3, p1}, Landroid/util/StateSet;->stateSetMatches([I[I)Z
 
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/TextScale$1.smali b/com.discord/smali_classes2/com/google/android/material/internal/TextScale$1.smali
index dd5f923576..1238bd3cb5 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/TextScale$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/TextScale$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic aRr:Landroid/widget/TextView;
+.field final synthetic aRJ:Landroid/widget/TextView;
 
-.field final synthetic aRs:Lcom/google/android/material/internal/TextScale;
+.field final synthetic aRK:Lcom/google/android/material/internal/TextScale;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/internal/TextScale;Landroid/widget/TextView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/internal/TextScale$1;->aRs:Lcom/google/android/material/internal/TextScale;
+    iput-object p1, p0, Lcom/google/android/material/internal/TextScale$1;->aRK:Lcom/google/android/material/internal/TextScale;
 
-    iput-object p2, p0, Lcom/google/android/material/internal/TextScale$1;->aRr:Landroid/widget/TextView;
+    iput-object p2, p0, Lcom/google/android/material/internal/TextScale$1;->aRJ:Landroid/widget/TextView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,11 +51,11 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$1;->aRr:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$1;->aRJ:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setScaleX(F)V
 
-    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$1;->aRr:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$1;->aRJ:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setScaleY(F)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$1.smali b/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$1.smali
index 2ad39d378c..52d0cd1d9c 100644
--- a/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/navigation/NavigationView$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRt:Lcom/google/android/material/navigation/NavigationView;
+.field final synthetic aRL:Lcom/google/android/material/navigation/NavigationView;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/navigation/NavigationView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/navigation/NavigationView$1;->aRt:Lcom/google/android/material/navigation/NavigationView;
+    iput-object p1, p0, Lcom/google/android/material/navigation/NavigationView$1;->aRL:Lcom/google/android/material/navigation/NavigationView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,13 +37,13 @@
 .method public final onMenuItemSelected(Landroidx/appcompat/view/menu/MenuBuilder;Landroid/view/MenuItem;)Z
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/navigation/NavigationView$1;->aRt:Lcom/google/android/material/navigation/NavigationView;
+    iget-object p1, p0, Lcom/google/android/material/navigation/NavigationView$1;->aRL:Lcom/google/android/material/navigation/NavigationView;
 
     iget-object p1, p1, Lcom/google/android/material/navigation/NavigationView;->listener:Lcom/google/android/material/navigation/NavigationView$OnNavigationItemSelectedListener;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/navigation/NavigationView$1;->aRt:Lcom/google/android/material/navigation/NavigationView;
+    iget-object p1, p0, Lcom/google/android/material/navigation/NavigationView$1;->aRL:Lcom/google/android/material/navigation/NavigationView;
 
     iget-object p1, p1, Lcom/google/android/material/navigation/NavigationView;->listener:Lcom/google/android/material/navigation/NavigationView$OnNavigationItemSelectedListener;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/resources/TextAppearance$1.smali b/com.discord/smali_classes2/com/google/android/material/resources/TextAppearance$1.smali
index e8ea5dc414..380e0906ab 100644
--- a/com.discord/smali_classes2/com/google/android/material/resources/TextAppearance$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/resources/TextAppearance$1.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic aRu:Landroid/text/TextPaint;
+.field final synthetic aRM:Landroid/text/TextPaint;
 
-.field final synthetic aRv:Landroidx/core/content/res/ResourcesCompat$FontCallback;
+.field final synthetic aRN:Landroidx/core/content/res/ResourcesCompat$FontCallback;
 
-.field final synthetic aRw:Lcom/google/android/material/resources/TextAppearance;
+.field final synthetic aRO:Lcom/google/android/material/resources/TextAppearance;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/resources/TextAppearance;Landroid/text/TextPaint;Landroidx/core/content/res/ResourcesCompat$FontCallback;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRw:Lcom/google/android/material/resources/TextAppearance;
+    iput-object p1, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRO:Lcom/google/android/material/resources/TextAppearance;
 
-    iput-object p2, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRu:Landroid/text/TextPaint;
+    iput-object p2, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRM:Landroid/text/TextPaint;
 
-    iput-object p3, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRv:Landroidx/core/content/res/ResourcesCompat$FontCallback;
+    iput-object p3, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRN:Landroidx/core/content/res/ResourcesCompat$FontCallback;
 
     invoke-direct {p0}, Landroidx/core/content/res/ResourcesCompat$FontCallback;-><init>()V
 
@@ -42,17 +42,17 @@
 .method public final onFontRetrievalFailed(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRw:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRO:Lcom/google/android/material/resources/TextAppearance;
 
     invoke-static {v0}, Lcom/google/android/material/resources/TextAppearance;->access$200(Lcom/google/android/material/resources/TextAppearance;)V
 
-    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRw:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRO:Lcom/google/android/material/resources/TextAppearance;
 
     const/4 v1, 0x1
 
     invoke-static {v0, v1}, Lcom/google/android/material/resources/TextAppearance;->access$102(Lcom/google/android/material/resources/TextAppearance;Z)Z
 
-    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRv:Landroidx/core/content/res/ResourcesCompat$FontCallback;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRN:Landroidx/core/content/res/ResourcesCompat$FontCallback;
 
     invoke-virtual {v0, p1}, Landroidx/core/content/res/ResourcesCompat$FontCallback;->onFontRetrievalFailed(I)V
 
@@ -62,7 +62,7 @@
 .method public final onFontRetrieved(Landroid/graphics/Typeface;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRw:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRO:Lcom/google/android/material/resources/TextAppearance;
 
     iget v1, v0, Lcom/google/android/material/resources/TextAppearance;->textStyle:I
 
@@ -72,19 +72,19 @@
 
     invoke-static {v0, v1}, Lcom/google/android/material/resources/TextAppearance;->access$002(Lcom/google/android/material/resources/TextAppearance;Landroid/graphics/Typeface;)Landroid/graphics/Typeface;
 
-    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRw:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRO:Lcom/google/android/material/resources/TextAppearance;
 
-    iget-object v1, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRu:Landroid/text/TextPaint;
+    iget-object v1, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRM:Landroid/text/TextPaint;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/android/material/resources/TextAppearance;->updateTextPaintMeasureState(Landroid/text/TextPaint;Landroid/graphics/Typeface;)V
 
-    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRw:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRO:Lcom/google/android/material/resources/TextAppearance;
 
     const/4 v1, 0x1
 
     invoke-static {v0, v1}, Lcom/google/android/material/resources/TextAppearance;->access$102(Lcom/google/android/material/resources/TextAppearance;Z)Z
 
-    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRv:Landroidx/core/content/res/ResourcesCompat$FontCallback;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aRN:Landroidx/core/content/res/ResourcesCompat$FontCallback;
 
     invoke-virtual {v0, p1}, Landroidx/core/content/res/ResourcesCompat$FontCallback;->onFontRetrieved(Landroid/graphics/Typeface;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/shape/InterpolateOnScrollPositionChangeHelper$1.smali b/com.discord/smali_classes2/com/google/android/material/shape/InterpolateOnScrollPositionChangeHelper$1.smali
index fbb026289b..edd1c9a5d1 100644
--- a/com.discord/smali_classes2/com/google/android/material/shape/InterpolateOnScrollPositionChangeHelper$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/shape/InterpolateOnScrollPositionChangeHelper$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRx:Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;
+.field final synthetic aRP:Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper$1;->aRx:Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;
+    iput-object p1, p0, Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper$1;->aRP:Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onScrollChanged()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper$1;->aRx:Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;
+    iget-object v0, p0, Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper$1;->aRP:Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;
 
     invoke-virtual {v0}, Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;->updateInterpolationForScreenPosition()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$10.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$10.smali
index d841ee0ced..d97f5503f0 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$10.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$10.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$10;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$10;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$10;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$10;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-virtual {p1}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->onViewShown()V
 
@@ -44,7 +44,7 @@
 .method public final onAnimationStart(Landroid/animation/Animator;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$10;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$10;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-static {p1}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->access$100(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$11.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$11.smali
index 6637791fe0..6af7fd409d 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$11.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$11.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field private aRA:I
+.field final synthetic aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-.field final synthetic aRC:I
+.field private aRS:I
 
-.field final synthetic aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aRU:I
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRC:I
+    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRU:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRC:I
+    iget p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRU:I
 
-    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRA:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRS:I
 
     return-void
 .end method
@@ -63,11 +63,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRR: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$11;->aRA:I
+    iget v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRS: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$11;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRR: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}, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;->setTranslationY(F)V
 
     :goto_0
-    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRA:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aRS:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$2.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$2.smali
index 9519a6c473..6abbbd89c5 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$2.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$2.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic aRy:I
+.field final synthetic aRQ:I
 
-.field final synthetic aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aRy:I
+    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aRQ:I
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -38,9 +38,9 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iget v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aRy:I
+    iget v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aRQ:I
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->onViewHidden(I)V
 
@@ -50,7 +50,7 @@
 .method public final onAnimationStart(Landroid/animation/Animator;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-static {p1}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->access$100(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$3.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$3.smali
index aeed48332c..cb990e20f5 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$3.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$3.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field private aRA:I
+.field final synthetic aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-.field final synthetic aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field private aRS:I
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aRR: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$3;->aRA:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aRS:I
 
     return-void
 .end method
@@ -59,11 +59,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aRR: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$3;->aRA:I
+    iget v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aRS:I
 
     sub-int v1, p1, v1
 
@@ -72,7 +72,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->view:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
 
@@ -81,7 +81,7 @@
     invoke-virtual {v0, v1}, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;->setTranslationY(F)V
 
     :goto_0
-    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aRA:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aRS:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$4.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$4.smali
index 97167bf559..51b5f54d57 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$4.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$4.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$4;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$4;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$5.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$5.smali
index 61f63e6e36..813badff12 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$5.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$5.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$5;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$5;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-direct {p0}, Landroidx/core/view/AccessibilityDelegateCompat;-><init>()V
 
@@ -54,7 +54,7 @@
 
     if-ne p2, v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$5;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$5;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-virtual {p1}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->dismiss()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$6.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$6.smali
index 7bfe2863eb..f47950e39c 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$6.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$6.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$6;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$6;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,7 +39,7 @@
 
     sget-object v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->handler:Landroid/os/Handler;
 
-    iget-object v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$6;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$6;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     const/4 v2, 0x1
 
@@ -59,7 +59,7 @@
 
     sget-object v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->handler:Landroid/os/Handler;
 
-    iget-object v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$6;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$6;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$7.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$7.smali
index 611bf7bb87..6c44f47ab4 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$7.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$7.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     const/4 v0, 0x0
 
@@ -66,11 +66,11 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Ax()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->At()Lcom/google/android/material/snackbar/a;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->managerCallback:Lcom/google/android/material/snackbar/a$a;
 
@@ -79,11 +79,11 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Ax()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->At()Lcom/google/android/material/snackbar/a;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->managerCallback:Lcom/google/android/material/snackbar/a$a;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$8$1.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$8$1.smali
index 9f06c11c73..11be3ef57d 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$8$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$8$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRB:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
+.field final synthetic aRT:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8$1;->aRB:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8$1;->aRT:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8$1;->aRB:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8$1;->aRT:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
 
-    iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     const/4 v1, 0x3
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$8.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$8.smali
index 453b6e7069..2f13c8cc03 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$8.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$8.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,7 +43,7 @@
 .method public final onViewDetachedFromWindow(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-virtual {p1}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->isShownOrQueued()Z
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$9.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$9.smali
index da4d4b4ed3..87b1b154e4 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$9.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$9.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onLayoutChange(Landroid/view/View;IIII)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     iget-object p1, p1, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->view:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
 
@@ -45,7 +45,7 @@
 
     invoke-virtual {p1, p2}, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;->setOnLayoutChangeListener(Lcom/google/android/material/snackbar/BaseTransientBottomBar$OnLayoutChangeListener;)V
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-virtual {p1}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->shouldAnimate()Z
 
@@ -53,14 +53,14 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aRR:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-virtual {p1}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->animateViewIn()V
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aRz:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aRR: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$BehaviorDelegate.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$BehaviorDelegate.smali
index ee8a6bacf4..f98396a5e1 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$BehaviorDelegate.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$BehaviorDelegate.smali
@@ -76,7 +76,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Ax()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->At()Lcom/google/android/material/snackbar/a;
 
     move-result-object p1
 
@@ -105,7 +105,7 @@
 
     if-eqz p1, :cond_2
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Ax()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->At()Lcom/google/android/material/snackbar/a;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout$1.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout$1.smali
index 1f3c0bf508..cbc51dc692 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRD:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
+.field final synthetic aRV:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout$1;->aRD:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout$1;->aRV:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onTouchExplorationStateChanged(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout$1;->aRD:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout$1;->aRV:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
 
     invoke-static {v0, p1}, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;->access$300(Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;Z)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar.smali
index b0f52287fa..80d6ac07dc 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar.smali
@@ -472,7 +472,7 @@
 .method protected dispatchDismiss(I)V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Ax()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->At()Lcom/google/android/material/snackbar/a;
 
     move-result-object v0
 
@@ -489,7 +489,7 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/android/material/snackbar/a;->a(Lcom/google/android/material/snackbar/a$b;I)Z
 
@@ -502,7 +502,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aRI:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aSa:Lcom/google/android/material/snackbar/a$b;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/android/material/snackbar/a;->a(Lcom/google/android/material/snackbar/a$b;I)Z
 
@@ -653,7 +653,7 @@
 .method public isShown()Z
     .locals 2
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Ax()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->At()Lcom/google/android/material/snackbar/a;
 
     move-result-object v0
 
@@ -669,7 +669,7 @@
 .method public isShownOrQueued()Z
     .locals 2
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Ax()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->At()Lcom/google/android/material/snackbar/a;
 
     move-result-object v0
 
@@ -685,7 +685,7 @@
 .method onViewHidden(I)V
     .locals 3
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Ax()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->At()Lcom/google/android/material/snackbar/a;
 
     move-result-object v0
 
@@ -704,13 +704,13 @@
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iput-object v1, v0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
-    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aRI:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aSa:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->Ay()V
+    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->Au()V
 
     :cond_0
     monitor-exit v2
@@ -784,7 +784,7 @@
 .method onViewShown()V
     .locals 3
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Ax()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->At()Lcom/google/android/material/snackbar/a;
 
     move-result-object v0
 
@@ -801,7 +801,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     invoke-virtual {v0, v1}, Lcom/google/android/material/snackbar/a;->a(Lcom/google/android/material/snackbar/a$b;)V
 
@@ -942,7 +942,7 @@
 .method public show()V
     .locals 5
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->Ax()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->At()Lcom/google/android/material/snackbar/a;
 
     move-result-object v0
 
@@ -963,17 +963,17 @@
 
     if-eqz v4, :cond_0
 
-    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     iput v1, v2, Lcom/google/android/material/snackbar/a$b;->duration:I
 
     iget-object v1, v0, Lcom/google/android/material/snackbar/a;->handler:Landroid/os/Handler;
 
-    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     invoke-virtual {v1, v2}, Landroid/os/Handler;->removeCallbacksAndMessages(Ljava/lang/Object;)V
 
-    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     invoke-virtual {v0, v1}, Lcom/google/android/material/snackbar/a;->a(Lcom/google/android/material/snackbar/a$b;)V
 
@@ -988,7 +988,7 @@
 
     if-eqz v4, :cond_1
 
-    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aRI:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aSa:Lcom/google/android/material/snackbar/a$b;
 
     iput v1, v2, Lcom/google/android/material/snackbar/a$b;->duration:I
 
@@ -999,14 +999,14 @@
 
     invoke-direct {v4, v1, v2}, Lcom/google/android/material/snackbar/a$b;-><init>(ILcom/google/android/material/snackbar/a$a;)V
 
-    iput-object v4, v0, Lcom/google/android/material/snackbar/a;->aRI:Lcom/google/android/material/snackbar/a$b;
+    iput-object v4, v0, Lcom/google/android/material/snackbar/a;->aSa:Lcom/google/android/material/snackbar/a$b;
 
     :goto_0
-    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     const/4 v2, 0x4
 
@@ -1023,9 +1023,9 @@
     :cond_2
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iput-object v1, v0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
-    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->Ay()V
+    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->Au()V
 
     monitor-exit v3
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar$1.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar$1.smali
index 72b38164ba..82d06a6e36 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/Snackbar$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic aRE:Landroid/view/View$OnClickListener;
+.field final synthetic aRW:Landroid/view/View$OnClickListener;
 
-.field final synthetic aRF:Lcom/google/android/material/snackbar/Snackbar;
+.field final synthetic aRX:Lcom/google/android/material/snackbar/Snackbar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/Snackbar;Landroid/view/View$OnClickListener;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aRF:Lcom/google/android/material/snackbar/Snackbar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aRX:Lcom/google/android/material/snackbar/Snackbar;
 
-    iput-object p2, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aRE:Landroid/view/View$OnClickListener;
+    iput-object p2, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aRW:Landroid/view/View$OnClickListener;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,11 +41,11 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aRE:Landroid/view/View$OnClickListener;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aRW:Landroid/view/View$OnClickListener;
 
     invoke-interface {v0, p1}, Landroid/view/View$OnClickListener;->onClick(Landroid/view/View;)V
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aRF:Lcom/google/android/material/snackbar/Snackbar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aRX:Lcom/google/android/material/snackbar/Snackbar;
 
     const/4 v0, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/a$1.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/a$1.smali
index 1a828723fc..7d2283fe20 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/a$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/a$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRJ:Lcom/google/android/material/snackbar/a;
+.field final synthetic aSb:Lcom/google/android/material/snackbar/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/a$1;->aRJ:Lcom/google/android/material/snackbar/a;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/a$1;->aSb:Lcom/google/android/material/snackbar/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +46,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/snackbar/a$1;->aRJ:Lcom/google/android/material/snackbar/a;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a$1;->aSb:Lcom/google/android/material/snackbar/a;
 
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
 
@@ -57,11 +57,11 @@
     monitor-enter v1
 
     :try_start_0
-    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     if-eq v2, p1, :cond_1
 
-    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aRI:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aSa:Lcom/google/android/material/snackbar/a$b;
 
     if-ne v2, p1, :cond_2
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/a$b.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/a$b.smali
index 279132f644..7fb11c7391 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/a$b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/a$b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final aRK:Ljava/lang/ref/WeakReference;
+.field final aSc:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -27,7 +27,7 @@
 
 .field duration:I
 
-.field dy:Z
+.field paused:Z
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0, p2}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lcom/google/android/material/snackbar/a$b;->aRK:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/google/android/material/snackbar/a$b;->aSc:Ljava/lang/ref/WeakReference;
 
     iput p1, p0, Lcom/google/android/material/snackbar/a$b;->duration:I
 
@@ -54,7 +54,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/a$b;->aRK:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a$b;->aSc:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/a.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/a.smali
index fc132905c6..b681eb2a07 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/a.smali
@@ -13,13 +13,13 @@
 
 
 # static fields
-.field private static aRG:Lcom/google/android/material/snackbar/a;
+.field private static aRY:Lcom/google/android/material/snackbar/a;
 
 
 # instance fields
-.field aRH:Lcom/google/android/material/snackbar/a$b;
+.field aRZ:Lcom/google/android/material/snackbar/a$b;
 
-.field aRI:Lcom/google/android/material/snackbar/a$b;
+.field aSa:Lcom/google/android/material/snackbar/a$b;
 
 .field final handler:Landroid/os/Handler;
 
@@ -55,10 +55,10 @@
     return-void
 .end method
 
-.method static Ax()Lcom/google/android/material/snackbar/a;
+.method static At()Lcom/google/android/material/snackbar/a;
     .locals 1
 
-    sget-object v0, Lcom/google/android/material/snackbar/a;->aRG:Lcom/google/android/material/snackbar/a;
+    sget-object v0, Lcom/google/android/material/snackbar/a;->aRY:Lcom/google/android/material/snackbar/a;
 
     if-nez v0, :cond_0
 
@@ -66,32 +66,32 @@
 
     invoke-direct {v0}, Lcom/google/android/material/snackbar/a;-><init>()V
 
-    sput-object v0, Lcom/google/android/material/snackbar/a;->aRG:Lcom/google/android/material/snackbar/a;
+    sput-object v0, Lcom/google/android/material/snackbar/a;->aRY:Lcom/google/android/material/snackbar/a;
 
     :cond_0
-    sget-object v0, Lcom/google/android/material/snackbar/a;->aRG:Lcom/google/android/material/snackbar/a;
+    sget-object v0, Lcom/google/android/material/snackbar/a;->aRY:Lcom/google/android/material/snackbar/a;
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method final Ay()V
+.method final Au()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aRI:Lcom/google/android/material/snackbar/a$b;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aSa:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v0, :cond_1
 
-    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aRI:Lcom/google/android/material/snackbar/a$b;
+    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aSa:Lcom/google/android/material/snackbar/a$b;
 
-    iget-object v1, p0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, p0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
-    iget-object v1, v1, Lcom/google/android/material/snackbar/a$b;->aRK:Ljava/lang/ref/WeakReference;
+    iget-object v1, v1, Lcom/google/android/material/snackbar/a$b;->aSc:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -106,7 +106,7 @@
     return-void
 
     :cond_0
-    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     :cond_1
     return-void
@@ -126,21 +126,21 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
-    iget-boolean p1, p1, Lcom/google/android/material/snackbar/a$b;->dy:Z
+    iget-boolean p1, p1, Lcom/google/android/material/snackbar/a$b;->paused:Z
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p1, Lcom/google/android/material/snackbar/a$b;->dy:Z
+    iput-boolean v1, p1, Lcom/google/android/material/snackbar/a$b;->paused:Z
 
     iget-object p1, p0, Lcom/google/android/material/snackbar/a;->handler:Landroid/os/Handler;
 
-    iget-object v1, p0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, p0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     invoke-virtual {p1, v1}, Landroid/os/Handler;->removeCallbacksAndMessages(Ljava/lang/Object;)V
 
@@ -214,7 +214,7 @@
 .method final a(Lcom/google/android/material/snackbar/a$b;I)Z
     .locals 2
 
-    iget-object v0, p1, Lcom/google/android/material/snackbar/a$b;->aRK:Ljava/lang/ref/WeakReference;
+    iget-object v0, p1, Lcom/google/android/material/snackbar/a$b;->aSc:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -254,19 +254,19 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
-    iget-boolean p1, p1, Lcom/google/android/material/snackbar/a$b;->dy:Z
+    iget-boolean p1, p1, Lcom/google/android/material/snackbar/a$b;->paused:Z
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p1, Lcom/google/android/material/snackbar/a$b;->dy:Z
+    iput-boolean v1, p1, Lcom/google/android/material/snackbar/a$b;->paused:Z
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     invoke-virtual {p0, p1}, Lcom/google/android/material/snackbar/a;->a(Lcom/google/android/material/snackbar/a$b;)V
 
@@ -360,7 +360,7 @@
 .method final e(Lcom/google/android/material/snackbar/a$a;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aRH:Lcom/google/android/material/snackbar/a$b;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aRZ:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v0, :cond_0
 
@@ -383,7 +383,7 @@
 .method final f(Lcom/google/android/material/snackbar/a$a;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aRI:Lcom/google/android/material/snackbar/a$b;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aSa:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$1.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$1.smali
index f73524fdb5..c6595ef89b 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aRL:Lcom/google/android/material/tabs/TabLayout;
+.field final synthetic aSd:Lcom/google/android/material/tabs/TabLayout;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/tabs/TabLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$1;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$1;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$1;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$1;->aSd: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$a.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$a.smali
index 2871202322..de8f9bd312 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,16 +18,16 @@
 
 
 # instance fields
-.field final synthetic aRL:Lcom/google/android/material/tabs/TabLayout;
+.field final synthetic aSd:Lcom/google/android/material/tabs/TabLayout;
 
-.field aRM:Z
+.field aSe:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/tabs/TabLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$a;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$a;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,15 +39,15 @@
 .method public final onAdapterChanged(Landroidx/viewpager/widget/ViewPager;Landroidx/viewpager/widget/PagerAdapter;Landroidx/viewpager/widget/PagerAdapter;)V
     .locals 0
 
-    iget-object p2, p0, Lcom/google/android/material/tabs/TabLayout$a;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p2, p0, Lcom/google/android/material/tabs/TabLayout$a;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object p2, p2, Lcom/google/android/material/tabs/TabLayout;->viewPager:Landroidx/viewpager/widget/ViewPager;
 
     if-ne p2, p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$a;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$a;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
-    iget-boolean p2, p0, Lcom/google/android/material/tabs/TabLayout$a;->aRM:Z
+    iget-boolean p2, p0, Lcom/google/android/material/tabs/TabLayout$a;->aSe:Z
 
     invoke-virtual {p1, p3, p2}, Lcom/google/android/material/tabs/TabLayout;->setPagerAdapter(Landroidx/viewpager/widget/PagerAdapter;Z)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$b.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$b.smali
index 767e5edbc8..783f4ce1cc 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$b.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aRL:Lcom/google/android/material/tabs/TabLayout;
+.field final synthetic aSd:Lcom/google/android/material/tabs/TabLayout;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/tabs/TabLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$b;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$b;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-direct {p0}, Landroid/database/DataSetObserver;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final onChanged()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$b;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$b;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout;->populateFromPagerAdapter()V
 
@@ -44,7 +44,7 @@
 .method public final onInvalidated()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$b;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$b;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout;->populateFromPagerAdapter()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c$1.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c$1.smali
index d5776e7e88..2a936d8a2c 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/google/android/material/tabs/TabLayout$c;->R(II)V
+    value = Lcom/google/android/material/tabs/TabLayout$c;->Q(II)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,30 +18,30 @@
 
 
 # instance fields
-.field final synthetic aRT:I
+.field final synthetic aSl:I
 
-.field final synthetic aRU:I
+.field final synthetic aSm:I
 
-.field final synthetic aRV:I
+.field final synthetic aSn:I
 
-.field final synthetic aRW:I
+.field final synthetic aSo:I
 
-.field final synthetic aRX:Lcom/google/android/material/tabs/TabLayout$c;
+.field final synthetic aSp:Lcom/google/android/material/tabs/TabLayout$c;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/tabs/TabLayout$c;IIII)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aRX:Lcom/google/android/material/tabs/TabLayout$c;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aSp:Lcom/google/android/material/tabs/TabLayout$c;
 
-    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aRT:I
+    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aSl:I
 
-    iput p3, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aRU:I
+    iput p3, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aSm:I
 
-    iput p4, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aRV:I
+    iput p4, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aSn:I
 
-    iput p5, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aRW:I
+    iput p5, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aSo:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,25 +57,25 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aRX:Lcom/google/android/material/tabs/TabLayout$c;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aSp:Lcom/google/android/material/tabs/TabLayout$c;
 
-    iget v1, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aRT:I
+    iget v1, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aSl:I
 
-    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aRU:I
+    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aSm:I
 
     invoke-static {v1, v2, p1}, Lcom/google/android/material/animation/AnimationUtils;->lerp(IIF)I
 
     move-result v1
 
-    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aRV:I
+    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aSn:I
 
-    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aRW:I
+    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aSo:I
 
     invoke-static {v2, v3, p1}, Lcom/google/android/material/animation/AnimationUtils;->lerp(IIF)I
 
     move-result p1
 
-    invoke-virtual {v0, v1, p1}, Lcom/google/android/material/tabs/TabLayout$c;->Q(II)V
+    invoke-virtual {v0, v1, p1}, Lcom/google/android/material/tabs/TabLayout$c;->P(II)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c$2.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c$2.smali
index bf59554ab3..631ef98803 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c$2.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c$2.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/google/android/material/tabs/TabLayout$c;->R(II)V
+    value = Lcom/google/android/material/tabs/TabLayout$c;->Q(II)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic aRX:Lcom/google/android/material/tabs/TabLayout$c;
+.field final synthetic aSp:Lcom/google/android/material/tabs/TabLayout$c;
 
-.field final synthetic aRY:I
+.field final synthetic aSq:I
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/tabs/TabLayout$c;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aRX:Lcom/google/android/material/tabs/TabLayout$c;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aSp:Lcom/google/android/material/tabs/TabLayout$c;
 
-    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aRY:I
+    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aSq:I
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -38,15 +38,15 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aRX:Lcom/google/android/material/tabs/TabLayout$c;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aSp:Lcom/google/android/material/tabs/TabLayout$c;
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aRY:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aSq:I
 
-    iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->aRQ:I
+    iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->aSi:I
 
     const/4 v0, 0x0
 
-    iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->aRR:F
+    iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->aSj:F
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c.smali
index cb4c031796..521d99f685 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c.smali
@@ -15,19 +15,19 @@
 
 
 # instance fields
-.field final synthetic aRL:Lcom/google/android/material/tabs/TabLayout;
+.field final synthetic aSd:Lcom/google/android/material/tabs/TabLayout;
 
-.field private aRN:I
+.field private aSf:I
 
-.field private final aRO:Landroid/graphics/Paint;
+.field private final aSg:Landroid/graphics/Paint;
 
-.field private final aRP:Landroid/graphics/drawable/GradientDrawable;
+.field private final aSh:Landroid/graphics/drawable/GradientDrawable;
 
-.field aRQ:I
+.field aSi:I
 
-.field aRR:F
+.field aSj:F
 
-.field aRS:Landroid/animation/ValueAnimator;
+.field aSk:Landroid/animation/ValueAnimator;
 
 .field private indicatorLeft:I
 
@@ -40,13 +40,13 @@
 .method constructor <init>(Lcom/google/android/material/tabs/TabLayout;Landroid/content/Context;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-direct {p0, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;)V
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRQ:I
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSi:I
 
     iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->layoutDirection:I
 
@@ -62,13 +62,13 @@
 
     invoke-direct {p1}, Landroid/graphics/Paint;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRO:Landroid/graphics/Paint;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSg:Landroid/graphics/Paint;
 
     new-instance p1, Landroid/graphics/drawable/GradientDrawable;
 
     invoke-direct {p1}, Landroid/graphics/drawable/GradientDrawable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRP:Landroid/graphics/drawable/GradientDrawable;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSh:Landroid/graphics/drawable/GradientDrawable;
 
     return-void
 .end method
@@ -76,11 +76,11 @@
 .method private a(Lcom/google/android/material/tabs/TabLayout$d;Landroid/graphics/RectF;)V
     .locals 3
 
-    invoke-virtual {p1}, Lcom/google/android/material/tabs/TabLayout$d;->AA()I
+    invoke-virtual {p1}, Lcom/google/android/material/tabs/TabLayout$d;->Aw()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     const/16 v2, 0x18
 
@@ -90,7 +90,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-virtual {v0, v2}, Lcom/google/android/material/tabs/TabLayout;->dpToPx(I)I
 
@@ -128,10 +128,10 @@
 
 
 # virtual methods
-.method final Az()V
+.method final Av()V
     .locals 7
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRQ:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSi:I
 
     invoke-virtual {p0, v0}, Lcom/google/android/material/tabs/TabLayout$c;->getChildAt(I)Landroid/view/View;
 
@@ -153,7 +153,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-boolean v3, v3, Lcom/google/android/material/tabs/TabLayout;->tabIndicatorFullWidth:Z
 
@@ -165,7 +165,7 @@
 
     check-cast v0, Lcom/google/android/material/tabs/TabLayout$d;
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-static {v1}, Lcom/google/android/material/tabs/TabLayout;->access$400(Lcom/google/android/material/tabs/TabLayout;)Landroid/graphics/RectF;
 
@@ -173,7 +173,7 @@
 
     invoke-direct {p0, v0, v1}, Lcom/google/android/material/tabs/TabLayout$c;->a(Lcom/google/android/material/tabs/TabLayout$d;Landroid/graphics/RectF;)V
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-static {v0}, Lcom/google/android/material/tabs/TabLayout;->access$400(Lcom/google/android/material/tabs/TabLayout;)Landroid/graphics/RectF;
 
@@ -183,7 +183,7 @@
 
     float-to-int v1, v0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-static {v0}, Lcom/google/android/material/tabs/TabLayout;->access$400(Lcom/google/android/material/tabs/TabLayout;)Landroid/graphics/RectF;
 
@@ -194,7 +194,7 @@
     float-to-int v2, v0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRR:F
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSj:F
 
     const/4 v3, 0x0
 
@@ -202,7 +202,7 @@
 
     if-lez v0, :cond_3
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRQ:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSi:I
 
     invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->getChildCount()I
 
@@ -212,7 +212,7 @@
 
     if-ge v0, v3, :cond_3
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRQ:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSi:I
 
     add-int/lit8 v0, v0, 0x1
 
@@ -228,7 +228,7 @@
 
     move-result v4
 
-    iget-object v5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-boolean v5, v5, Lcom/google/android/material/tabs/TabLayout;->tabIndicatorFullWidth:Z
 
@@ -240,7 +240,7 @@
 
     check-cast v0, Lcom/google/android/material/tabs/TabLayout$d;
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-static {v3}, Lcom/google/android/material/tabs/TabLayout;->access$400(Lcom/google/android/material/tabs/TabLayout;)Landroid/graphics/RectF;
 
@@ -248,7 +248,7 @@
 
     invoke-direct {p0, v0, v3}, Lcom/google/android/material/tabs/TabLayout$c;->a(Lcom/google/android/material/tabs/TabLayout$d;Landroid/graphics/RectF;)V
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-static {v0}, Lcom/google/android/material/tabs/TabLayout;->access$400(Lcom/google/android/material/tabs/TabLayout;)Landroid/graphics/RectF;
 
@@ -258,7 +258,7 @@
 
     float-to-int v3, v0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-static {v0}, Lcom/google/android/material/tabs/TabLayout;->access$400(Lcom/google/android/material/tabs/TabLayout;)Landroid/graphics/RectF;
 
@@ -269,7 +269,7 @@
     float-to-int v4, v0
 
     :cond_1
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRR:F
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSj:F
 
     int-to-float v3, v3
 
@@ -310,12 +310,12 @@
 
     :cond_3
     :goto_0
-    invoke-virtual {p0, v1, v2}, Lcom/google/android/material/tabs/TabLayout$c;->Q(II)V
+    invoke-virtual {p0, v1, v2}, Lcom/google/android/material/tabs/TabLayout$c;->P(II)V
 
     return-void
 .end method
 
-.method final Q(II)V
+.method final P(II)V
     .locals 1
 
     iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->indicatorLeft:I
@@ -337,10 +337,10 @@
     return-void
 .end method
 
-.method final R(II)V
+.method final Q(II)V
     .locals 9
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRS:Landroid/animation/ValueAnimator;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSk:Landroid/animation/ValueAnimator;
 
     if-eqz v0, :cond_0
 
@@ -350,7 +350,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRS:Landroid/animation/ValueAnimator;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSk:Landroid/animation/ValueAnimator;
 
     invoke-virtual {v0}, Landroid/animation/ValueAnimator;->cancel()V
 
@@ -361,7 +361,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->Az()V
+    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->Av()V
 
     return-void
 
@@ -374,7 +374,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-boolean v3, v3, Lcom/google/android/material/tabs/TabLayout;->tabIndicatorFullWidth:Z
 
@@ -386,7 +386,7 @@
 
     check-cast v0, Lcom/google/android/material/tabs/TabLayout$d;
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-static {v1}, Lcom/google/android/material/tabs/TabLayout;->access$400(Lcom/google/android/material/tabs/TabLayout;)Landroid/graphics/RectF;
 
@@ -394,7 +394,7 @@
 
     invoke-direct {p0, v0, v1}, Lcom/google/android/material/tabs/TabLayout$c;->a(Lcom/google/android/material/tabs/TabLayout$d;Landroid/graphics/RectF;)V
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-static {v0}, Lcom/google/android/material/tabs/TabLayout;->access$400(Lcom/google/android/material/tabs/TabLayout;)Landroid/graphics/RectF;
 
@@ -404,7 +404,7 @@
 
     float-to-int v1, v0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-static {v0}, Lcom/google/android/material/tabs/TabLayout;->access$400(Lcom/google/android/material/tabs/TabLayout;)Landroid/graphics/RectF;
 
@@ -432,7 +432,7 @@
 
     invoke-direct {v0}, Landroid/animation/ValueAnimator;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRS:Landroid/animation/ValueAnimator;
+    iput-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSk:Landroid/animation/ValueAnimator;
 
     sget-object v1, Lcom/google/android/material/animation/AnimationUtils;->FAST_OUT_SLOW_IN_INTERPOLATOR:Landroid/animation/TimeInterpolator;
 
@@ -483,7 +483,7 @@
 .method final cO(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRO:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSg:Landroid/graphics/Paint;
 
     invoke-virtual {v0}, Landroid/graphics/Paint;->getColor()I
 
@@ -491,7 +491,7 @@
 
     if-eq v0, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRO:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSg:Landroid/graphics/Paint;
 
     invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setColor(I)V
 
@@ -504,11 +504,11 @@
 .method final cP(I)V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRN:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSf:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRN:I
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSf:I
 
     invoke-static {p0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
 
@@ -519,7 +519,7 @@
 .method public final draw(Landroid/graphics/Canvas;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v0, v0, Lcom/google/android/material/tabs/TabLayout;->tabSelectedIndicator:Landroid/graphics/drawable/Drawable;
 
@@ -527,7 +527,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v0, v0, Lcom/google/android/material/tabs/TabLayout;->tabSelectedIndicator:Landroid/graphics/drawable/Drawable;
 
@@ -541,14 +541,14 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRN:I
+    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSf:I
 
     if-ltz v2, :cond_1
 
     move v0, v2
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget v2, v2, Lcom/google/android/material/tabs/TabLayout;->tabIndicatorGravity:I
 
@@ -617,20 +617,20 @@
 
     if-le v3, v2, :cond_9
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v2, v2, Lcom/google/android/material/tabs/TabLayout;->tabSelectedIndicator:Landroid/graphics/drawable/Drawable;
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v2, v2, Lcom/google/android/material/tabs/TabLayout;->tabSelectedIndicator:Landroid/graphics/drawable/Drawable;
 
     goto :goto_2
 
     :cond_6
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRP:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSh:Landroid/graphics/drawable/GradientDrawable;
 
     :goto_2
     invoke-static {v2}, Landroidx/core/graphics/drawable/DrawableCompat;->wrap(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
@@ -643,7 +643,7 @@
 
     invoke-virtual {v2, v3, v1, v4, v0}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRO:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSg:Landroid/graphics/Paint;
 
     if-eqz v0, :cond_8
 
@@ -653,7 +653,7 @@
 
     if-ne v0, v1, :cond_7
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRO:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSg:Landroid/graphics/Paint;
 
     invoke-virtual {v0}, Landroid/graphics/Paint;->getColor()I
 
@@ -666,7 +666,7 @@
     goto :goto_3
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRO:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSg:Landroid/graphics/Paint;
 
     invoke-virtual {v0}, Landroid/graphics/Paint;->getColor()I
 
@@ -689,7 +689,7 @@
 
     invoke-super/range {p0 .. p5}, Landroid/widget/LinearLayout;->onLayout(ZIIII)V
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRS:Landroid/animation/ValueAnimator;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSk:Landroid/animation/ValueAnimator;
 
     if-eqz p1, :cond_0
 
@@ -699,21 +699,21 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRS:Landroid/animation/ValueAnimator;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSk:Landroid/animation/ValueAnimator;
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->cancel()V
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRS:Landroid/animation/ValueAnimator;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSk:Landroid/animation/ValueAnimator;
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getDuration()J
 
     move-result-wide p1
 
-    iget p3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRQ:I
+    iget p3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSi:I
 
     const/high16 p4, 0x3f800000    # 1.0f
 
-    iget-object p5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRS:Landroid/animation/ValueAnimator;
+    iget-object p5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSk:Landroid/animation/ValueAnimator;
 
     invoke-virtual {p5}, Landroid/animation/ValueAnimator;->getAnimatedFraction()F
 
@@ -729,12 +729,12 @@
 
     move-result p1
 
-    invoke-virtual {p0, p3, p1}, Lcom/google/android/material/tabs/TabLayout$c;->R(II)V
+    invoke-virtual {p0, p3, p1}, Lcom/google/android/material/tabs/TabLayout$c;->Q(II)V
 
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->Az()V
+    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->Av()V
 
     return-void
 .end method
@@ -755,7 +755,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget v0, v0, Lcom/google/android/material/tabs/TabLayout;->mode:I
 
@@ -763,7 +763,7 @@
 
     if-ne v0, v1, :cond_8
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget v0, v0, Lcom/google/android/material/tabs/TabLayout;->tabGravity:I
 
@@ -811,7 +811,7 @@
     return-void
 
     :cond_3
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     const/16 v5, 0x10
 
@@ -876,7 +876,7 @@
     goto :goto_2
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iput v2, v0, Lcom/google/android/material/tabs/TabLayout;->tabGravity:I
 
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d.smali
index 9779f67607..6368f20884 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d.smali
@@ -15,19 +15,19 @@
 
 
 # instance fields
-.field final synthetic aRL:Lcom/google/android/material/tabs/TabLayout;
+.field final synthetic aSd:Lcom/google/android/material/tabs/TabLayout;
 
-.field private aRZ:Lcom/google/android/material/tabs/TabLayout$Tab;
+.field private aSr:Lcom/google/android/material/tabs/TabLayout$Tab;
 
-.field aSa:Landroid/widget/ImageView;
+.field aSs:Landroid/widget/ImageView;
 
-.field aSb:Landroid/widget/TextView;
+.field aSt:Landroid/widget/TextView;
 
-.field aSc:Landroid/widget/ImageView;
+.field aSu:Landroid/widget/ImageView;
 
-.field private aSd:Landroid/graphics/drawable/Drawable;
+.field private aSv:Landroid/graphics/drawable/Drawable;
 
-.field private aSe:I
+.field private aSw:I
 
 .field private customView:Landroid/view/View;
 
@@ -38,13 +38,13 @@
 .method public constructor <init>(Lcom/google/android/material/tabs/TabLayout;Landroid/content/Context;)V
     .locals 3
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-direct {p0, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;)V
 
     const/4 v0, 0x2
 
-    iput v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSe:I
+    iput v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSw:I
 
     invoke-direct {p0, p2}, Lcom/google/android/material/tabs/TabLayout$d;->az(Landroid/content/Context;)V
 
@@ -98,7 +98,7 @@
 .method static synthetic a(Lcom/google/android/material/tabs/TabLayout$d;Landroid/graphics/Canvas;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSv:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_0
 
@@ -120,7 +120,7 @@
 
     invoke-virtual {v0, v1, v2, v3, v4}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
-    iget-object p0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Landroid/graphics/drawable/Drawable;
+    iget-object p0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSv:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
@@ -131,7 +131,7 @@
 .method private az(Landroid/content/Context;)V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget v0, v0, Lcom/google/android/material/tabs/TabLayout;->tabBackgroundResId:I
 
@@ -139,7 +139,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget v0, v0, Lcom/google/android/material/tabs/TabLayout;->tabBackgroundResId:I
 
@@ -147,9 +147,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSv:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSv:Landroid/graphics/drawable/Drawable;
 
     if-eqz p1, :cond_1
 
@@ -159,7 +159,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSv:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$d;->getDrawableState()[I
 
@@ -170,7 +170,7 @@
     goto :goto_0
 
     :cond_0
-    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Landroid/graphics/drawable/Drawable;
+    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSv:Landroid/graphics/drawable/Drawable;
 
     :cond_1
     :goto_0
@@ -186,7 +186,7 @@
 
     invoke-virtual {v0, v2}, Landroid/graphics/drawable/GradientDrawable;->setColor(I)V
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v0, v0, Lcom/google/android/material/tabs/TabLayout;->tabRippleColorStateList:Landroid/content/res/ColorStateList;
 
@@ -204,7 +204,7 @@
 
     invoke-virtual {v0, v3}, Landroid/graphics/drawable/GradientDrawable;->setColor(I)V
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v3, v3, Lcom/google/android/material/tabs/TabLayout;->tabRippleColorStateList:Landroid/content/res/ColorStateList;
 
@@ -220,7 +220,7 @@
 
     new-instance v2, Landroid/graphics/drawable/RippleDrawable;
 
-    iget-object v4, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v4, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-boolean v4, v4, Lcom/google/android/material/tabs/TabLayout;->unboundedRipple:Z
 
@@ -229,7 +229,7 @@
     move-object p1, v1
 
     :cond_2
-    iget-object v4, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v4, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-boolean v4, v4, Lcom/google/android/material/tabs/TabLayout;->unboundedRipple:Z
 
@@ -271,7 +271,7 @@
     :goto_1
     invoke-static {p0, p1}, Landroidx/core/view/ViewCompat;->setBackground(Landroid/view/View;Landroid/graphics/drawable/Drawable;)V
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-virtual {p1}, Lcom/google/android/material/tabs/TabLayout;->invalidate()V
 
@@ -280,7 +280,7 @@
 
 
 # virtual methods
-.method final AA()I
+.method final Aw()I
     .locals 9
 
     const/4 v0, 0x3
@@ -293,7 +293,7 @@
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSa:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSs:Landroid/widget/ImageView;
 
     const/4 v4, 0x1
 
@@ -376,7 +376,7 @@
 .method final a(Landroid/widget/TextView;Landroid/widget/ImageView;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRZ:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSr:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     const/4 v1, 0x0
 
@@ -388,7 +388,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRZ:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSr:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout$Tab;->getIcon()Landroid/graphics/drawable/Drawable;
 
@@ -408,7 +408,7 @@
     move-object v0, v1
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRZ:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSr:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     if-eqz v2, :cond_1
 
@@ -486,7 +486,7 @@
 
     if-nez v2, :cond_6
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-virtual {v2, v3}, Lcom/google/android/material/tabs/TabLayout;->dpToPx(I)I
 
@@ -498,7 +498,7 @@
     const/4 v2, 0x0
 
     :goto_4
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-boolean v3, v3, Lcom/google/android/material/tabs/TabLayout;->inlineLabel:Z
 
@@ -535,7 +535,7 @@
 
     :cond_8
     :goto_5
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRZ:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSr:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     if-eqz p1, :cond_9
 
@@ -562,11 +562,11 @@
 .method final a(Lcom/google/android/material/tabs/TabLayout$Tab;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRZ:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSr:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     if-eq p1, v0, :cond_0
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRZ:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSr:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$d;->update()V
 
@@ -583,7 +583,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSv:Landroid/graphics/drawable/Drawable;
 
     const/4 v2, 0x0
 
@@ -595,7 +595,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSv:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v1, v0}, Landroid/graphics/drawable/Drawable;->setState([I)Z
 
@@ -608,7 +608,7 @@
 
     invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$d;->invalidate()V
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout;->invalidate()V
 
@@ -659,7 +659,7 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-virtual {v2}, Lcom/google/android/material/tabs/TabLayout;->getTabMaxWidth()I
 
@@ -672,7 +672,7 @@
     if-le v0, v2, :cond_1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget p1, p1, Lcom/google/android/material/tabs/TabLayout;->tabMaxWidth:I
 
@@ -689,13 +689,13 @@
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget v0, v0, Lcom/google/android/material/tabs/TabLayout;->tabTextSize:F
 
-    iget v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSe:I
+    iget v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSw:I
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSa:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSs:Landroid/widget/ImageView;
 
     const/4 v3, 0x1
 
@@ -722,7 +722,7 @@
 
     if-le v2, v3, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget v0, v0, Lcom/google/android/material/tabs/TabLayout;->tabTextMultiLineSize:F
 
@@ -755,7 +755,7 @@
     if-eq v1, v5, :cond_7
 
     :cond_4
-    iget-object v5, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v5, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget v5, v5, Lcom/google/android/material/tabs/TabLayout;->mode:I
 
@@ -842,7 +842,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRZ:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSr:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     if-eqz v1, :cond_1
 
@@ -853,7 +853,7 @@
     invoke-virtual {p0, v0}, Lcom/google/android/material/tabs/TabLayout$d;->playSoundEffect(I)V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRZ:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSr:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout$Tab;->select()V
 
@@ -904,7 +904,7 @@
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setSelected(Z)V
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSa:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSs:Landroid/widget/ImageView;
 
     if-eqz v0, :cond_3
 
@@ -924,7 +924,7 @@
 .method final update()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRZ:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSr:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     const/4 v1, 0x0
 
@@ -969,13 +969,13 @@
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setVisibility(I)V
 
     :cond_3
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSa:Landroid/widget/ImageView;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSs:Landroid/widget/ImageView;
 
     if-eqz v3, :cond_4
 
     invoke-virtual {v3, v4}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSa:Landroid/widget/ImageView;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSs:Landroid/widget/ImageView;
 
     invoke-virtual {v3, v1}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
@@ -988,9 +988,9 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    iput-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSb:Landroid/widget/TextView;
+    iput-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSt:Landroid/widget/TextView;
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSb:Landroid/widget/TextView;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSt:Landroid/widget/TextView;
 
     if-eqz v3, :cond_5
 
@@ -998,7 +998,7 @@
 
     move-result v3
 
-    iput v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSe:I
+    iput v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSw:I
 
     :cond_5
     const v3, 0x1020006
@@ -1009,7 +1009,7 @@
 
     check-cast v2, Landroid/widget/ImageView;
 
-    iput-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSc:Landroid/widget/ImageView;
+    iput-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSu:Landroid/widget/ImageView;
 
     goto :goto_1
 
@@ -1023,9 +1023,9 @@
     iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->customView:Landroid/view/View;
 
     :cond_7
-    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSb:Landroid/widget/TextView;
+    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSt:Landroid/widget/TextView;
 
-    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSc:Landroid/widget/ImageView;
+    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSu:Landroid/widget/ImageView;
 
     :goto_1
     iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->customView:Landroid/view/View;
@@ -1034,7 +1034,7 @@
 
     if-nez v2, :cond_d
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSa:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSs:Landroid/widget/ImageView;
 
     if-nez v2, :cond_8
 
@@ -1056,7 +1056,7 @@
 
     invoke-virtual {p0, v2, v3}, Lcom/google/android/material/tabs/TabLayout$d;->addView(Landroid/view/View;I)V
 
-    iput-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSa:Landroid/widget/ImageView;
+    iput-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSs:Landroid/widget/ImageView;
 
     :cond_8
     if-eqz v0, :cond_9
@@ -1082,19 +1082,19 @@
     :cond_9
     if-eqz v1, :cond_a
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v2, v2, Lcom/google/android/material/tabs/TabLayout;->tabIconTint:Landroid/content/res/ColorStateList;
 
     invoke-static {v1, v2}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v2, v2, Lcom/google/android/material/tabs/TabLayout;->tabIconTintMode:Landroid/graphics/PorterDuff$Mode;
 
     if-eqz v2, :cond_a
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v2, v2, Lcom/google/android/material/tabs/TabLayout;->tabIconTintMode:Landroid/graphics/PorterDuff$Mode;
 
@@ -1131,18 +1131,18 @@
 
     move-result v1
 
-    iput v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSe:I
+    iput v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSw:I
 
     :cond_b
     iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->textView:Landroid/widget/TextView;
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget v2, v2, Lcom/google/android/material/tabs/TabLayout;->tabTextAppearance:I
 
     invoke-static {v1, v2}, Landroidx/core/widget/TextViewCompat;->setTextAppearance(Landroid/widget/TextView;I)V
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v1, v1, Lcom/google/android/material/tabs/TabLayout;->tabTextColors:Landroid/content/res/ColorStateList;
 
@@ -1150,7 +1150,7 @@
 
     iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->textView:Landroid/widget/TextView;
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v2, v2, Lcom/google/android/material/tabs/TabLayout;->tabTextColors:Landroid/content/res/ColorStateList;
 
@@ -1159,25 +1159,25 @@
     :cond_c
     iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->textView:Landroid/widget/TextView;
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSa:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSs:Landroid/widget/ImageView;
 
     invoke-virtual {p0, v1, v2}, Lcom/google/android/material/tabs/TabLayout$d;->a(Landroid/widget/TextView;Landroid/widget/ImageView;)V
 
     goto :goto_2
 
     :cond_d
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSb:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSt:Landroid/widget/TextView;
 
     if-nez v1, :cond_e
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSc:Landroid/widget/ImageView;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSu:Landroid/widget/ImageView;
 
     if-eqz v1, :cond_f
 
     :cond_e
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSb:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSt:Landroid/widget/TextView;
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSc:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aSu:Landroid/widget/ImageView;
 
     invoke-virtual {p0, v1, v2}, Lcom/google/android/material/tabs/TabLayout$d;->a(Landroid/widget/TextView;Landroid/widget/ImageView;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout.smali
index ae16504b30..4be3dbf76a 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout.smali
@@ -819,7 +819,7 @@
 
     iget v1, p0, Lcom/google/android/material/tabs/TabLayout;->tabIndicatorAnimationDuration:I
 
-    invoke-virtual {v0, p1, v1}, Lcom/google/android/material/tabs/TabLayout$c;->R(II)V
+    invoke-virtual {v0, p1, v1}, Lcom/google/android/material/tabs/TabLayout$c;->Q(II)V
 
     return-void
 
@@ -1593,7 +1593,7 @@
     :cond_5
     iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout;->adapterChangeListener:Lcom/google/android/material/tabs/TabLayout$a;
 
-    iput-boolean p2, v0, Lcom/google/android/material/tabs/TabLayout$a;->aRM:Z
+    iput-boolean p2, v0, Lcom/google/android/material/tabs/TabLayout$a;->aSe:Z
 
     invoke-virtual {p1, v0}, Landroidx/viewpager/widget/ViewPager;->addOnAdapterChangeListener(Landroidx/viewpager/widget/ViewPager$OnAdapterChangeListener;)V
 
@@ -2715,7 +2715,7 @@
 
     check-cast v0, Lcom/google/android/material/tabs/TabLayout$d;
 
-    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aRL:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aSd:Lcom/google/android/material/tabs/TabLayout;
 
     iget-boolean v1, v1, Lcom/google/android/material/tabs/TabLayout;->inlineLabel:Z
 
@@ -2723,11 +2723,11 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/material/tabs/TabLayout$d;->setOrientation(I)V
 
-    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aSb:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aSt:Landroid/widget/TextView;
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aSc:Landroid/widget/ImageView;
+    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aSu:Landroid/widget/ImageView;
 
     if-eqz v1, :cond_0
 
@@ -2736,7 +2736,7 @@
     :cond_0
     iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->textView:Landroid/widget/TextView;
 
-    iget-object v2, v0, Lcom/google/android/material/tabs/TabLayout$d;->aSa:Landroid/widget/ImageView;
+    iget-object v2, v0, Lcom/google/android/material/tabs/TabLayout$d;->aSs:Landroid/widget/ImageView;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/material/tabs/TabLayout$d;->a(Landroid/widget/TextView;Landroid/widget/ImageView;)V
 
@@ -2744,9 +2744,9 @@
 
     :cond_1
     :goto_1
-    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aSb:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aSt:Landroid/widget/TextView;
 
-    iget-object v2, v0, Lcom/google/android/material/tabs/TabLayout$d;->aSc:Landroid/widget/ImageView;
+    iget-object v2, v0, Lcom/google/android/material/tabs/TabLayout$d;->aSu:Landroid/widget/ImageView;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/material/tabs/TabLayout$d;->a(Landroid/widget/TextView;Landroid/widget/ImageView;)V
 
@@ -2892,11 +2892,11 @@
 
     iget-object p4, p0, Lcom/google/android/material/tabs/TabLayout;->slidingTabIndicator:Lcom/google/android/material/tabs/TabLayout$c;
 
-    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aRS:Landroid/animation/ValueAnimator;
+    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aSk:Landroid/animation/ValueAnimator;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aRS:Landroid/animation/ValueAnimator;
+    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aSk:Landroid/animation/ValueAnimator;
 
     invoke-virtual {v1}, Landroid/animation/ValueAnimator;->isRunning()Z
 
@@ -2904,16 +2904,16 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aRS:Landroid/animation/ValueAnimator;
+    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aSk:Landroid/animation/ValueAnimator;
 
     invoke-virtual {v1}, Landroid/animation/ValueAnimator;->cancel()V
 
     :cond_1
-    iput p1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aRQ:I
+    iput p1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aSi:I
 
-    iput p2, p4, Lcom/google/android/material/tabs/TabLayout$c;->aRR:F
+    iput p2, p4, Lcom/google/android/material/tabs/TabLayout$c;->aSj:F
 
-    invoke-virtual {p4}, Lcom/google/android/material/tabs/TabLayout$c;->Az()V
+    invoke-virtual {p4}, Lcom/google/android/material/tabs/TabLayout$c;->Av()V
 
     :cond_2
     iget-object p4, p0, Lcom/google/android/material/tabs/TabLayout;->scrollAnimator:Landroid/animation/ValueAnimator;
diff --git a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$1.smali b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$1.smali
index 4a6712ef89..52baff8721 100644
--- a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aSC:Lcom/google/android/material/textfield/TextInputLayout;
+.field final synthetic aSU:Lcom/google/android/material/textfield/TextInputLayout;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/textfield/TextInputLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aSC:Lcom/google/android/material/textfield/TextInputLayout;
+    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aSU:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final afterTextChanged(Landroid/text/Editable;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aSC:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aSU:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-static {v0}, Lcom/google/android/material/textfield/TextInputLayout;->access$000(Lcom/google/android/material/textfield/TextInputLayout;)Z
 
@@ -47,13 +47,13 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/material/textfield/TextInputLayout;->updateLabelState(Z)V
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aSC:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aSU:Lcom/google/android/material/textfield/TextInputLayout;
 
     iget-boolean v0, v0, Lcom/google/android/material/textfield/TextInputLayout;->counterEnabled:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aSC:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aSU:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-interface {p1}, Landroid/text/Editable;->length()I
 
diff --git a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$2.smali b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$2.smali
index 8935acc622..e5cf3736e1 100644
--- a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$2.smali
+++ b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aSC:Lcom/google/android/material/textfield/TextInputLayout;
+.field final synthetic aSU:Lcom/google/android/material/textfield/TextInputLayout;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/textfield/TextInputLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$2;->aSC:Lcom/google/android/material/textfield/TextInputLayout;
+    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$2;->aSU:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$2;->aSC:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$2;->aSU:Lcom/google/android/material/textfield/TextInputLayout;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$3.smali b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$3.smali
index 491be749c2..aade00b8e7 100644
--- a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$3.smali
+++ b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$3.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aSC:Lcom/google/android/material/textfield/TextInputLayout;
+.field final synthetic aSU:Lcom/google/android/material/textfield/TextInputLayout;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/textfield/TextInputLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$3;->aSC:Lcom/google/android/material/textfield/TextInputLayout;
+    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$3;->aSU:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$3;->aSC:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$3;->aSU: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/textfield/TextInputLayout$SavedState.smali b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$SavedState.smali
index 96355f53b9..6143fd6fde 100644
--- a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$SavedState.smali
+++ b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$SavedState.smali
@@ -27,9 +27,9 @@
 
 
 # instance fields
-.field aSD:Ljava/lang/CharSequence;
+.field aSV:Ljava/lang/CharSequence;
 
-.field aSE:Z
+.field aSW:Z
 
 
 # direct methods
@@ -58,7 +58,7 @@
 
     check-cast p2, Ljava/lang/CharSequence;
 
-    iput-object p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSD:Ljava/lang/CharSequence;
+    iput-object p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSV:Ljava/lang/CharSequence;
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
@@ -74,7 +74,7 @@
     const/4 p2, 0x0
 
     :goto_0
-    iput-boolean p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSE:Z
+    iput-boolean p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSW:Z
 
     return-void
 .end method
@@ -112,7 +112,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSD:Ljava/lang/CharSequence;
+    iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSV:Ljava/lang/CharSequence;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -132,11 +132,11 @@
 
     invoke-super {p0, p1, p2}, Landroidx/customview/view/AbsSavedState;->writeToParcel(Landroid/os/Parcel;I)V
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSD:Ljava/lang/CharSequence;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSV:Ljava/lang/CharSequence;
 
     invoke-static {v0, p1, p2}, Landroid/text/TextUtils;->writeToParcel(Ljava/lang/CharSequence;Landroid/os/Parcel;I)V
 
-    iget-boolean p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSE:Z
+    iget-boolean p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSW:Z
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeInt(I)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout.smali b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout.smali
index 3136ce8dbb..f03609d7df 100644
--- a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout.smali
+++ b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout.smali
@@ -1249,7 +1249,7 @@
 
     check-cast p1, Lcom/google/android/material/textfield/a;
 
-    invoke-virtual {p1}, Lcom/google/android/material/textfield/a;->AB()Z
+    invoke-virtual {p1}, Lcom/google/android/material/textfield/a;->Ax()Z
 
     move-result p1
 
@@ -1692,7 +1692,7 @@
     :cond_5
     iget-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    invoke-virtual {p1}, Lcom/google/android/material/textfield/b;->AE()V
+    invoke-virtual {p1}, Lcom/google/android/material/textfield/b;->AA()V
 
     invoke-direct {p0}, Lcom/google/android/material/textfield/TextInputLayout;->updatePasswordToggleView()V
 
@@ -1929,7 +1929,7 @@
     :goto_1
     iget-object v3, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    invoke-virtual {v3}, Lcom/google/android/material/textfield/b;->AF()Z
+    invoke-virtual {v3}, Lcom/google/android/material/textfield/b;->AB()Z
 
     move-result v3
 
@@ -1979,11 +1979,11 @@
 
     iget-object v4, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget-object v5, v4, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v5, v4, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     if-eqz v5, :cond_4
 
-    iget-object v4, v4, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v4, v4, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     invoke-virtual {v4}, Landroid/widget/TextView;->getTextColors()Landroid/content/res/ColorStateList;
 
@@ -2538,7 +2538,7 @@
 
     check-cast v0, Lcom/google/android/material/textfield/a;
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/a;->AB()Z
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/a;->Ax()Z
 
     move-result v0
 
@@ -2841,13 +2841,13 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aSs:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aSK:Z
 
     if-eqz v0, :cond_0
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSr:Ljava/lang/CharSequence;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSJ:Ljava/lang/CharSequence;
 
     return-object v0
 
@@ -2862,7 +2862,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->AG()I
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->AC()I
 
     move-result v0
 
@@ -2874,7 +2874,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->AG()I
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->AC()I
 
     move-result v0
 
@@ -2886,13 +2886,13 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aSv:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aSN:Z
 
     if-eqz v0, :cond_0
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSu:Ljava/lang/CharSequence;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSM:Ljava/lang/CharSequence;
 
     return-object v0
 
@@ -2907,11 +2907,11 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     invoke-virtual {v0}, Landroid/widget/TextView;->getCurrentTextColor()I
 
@@ -3003,7 +3003,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aSs:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aSK:Z
 
     return v0
 .end method
@@ -3013,17 +3013,17 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget v1, v0, Lcom/google/android/material/textfield/b;->aSp:I
+    iget v1, v0, Lcom/google/android/material/textfield/b;->aSH:I
 
     const/4 v2, 0x2
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSu:Ljava/lang/CharSequence;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSM:Ljava/lang/CharSequence;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -3046,7 +3046,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aSv:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aSN:Z
 
     return v0
 .end method
@@ -3225,11 +3225,11 @@
 
     invoke-super {p0, v0}, Landroid/widget/LinearLayout;->onRestoreInstanceState(Landroid/os/Parcelable;)V
 
-    iget-object v0, p1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSD:Ljava/lang/CharSequence;
+    iget-object v0, p1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSV:Ljava/lang/CharSequence;
 
     invoke-virtual {p0, v0}, Lcom/google/android/material/textfield/TextInputLayout;->setError(Ljava/lang/CharSequence;)V
 
-    iget-boolean p1, p1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSE:Z
+    iget-boolean p1, p1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSW:Z
 
     if-eqz p1, :cond_1
 
@@ -3256,7 +3256,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->AF()Z
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->AB()Z
 
     move-result v0
 
@@ -3266,12 +3266,12 @@
 
     move-result-object v0
 
-    iput-object v0, v1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSD:Ljava/lang/CharSequence;
+    iput-object v0, v1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSV:Ljava/lang/CharSequence;
 
     :cond_0
     iget-boolean v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->passwordToggledVisible:Z
 
-    iput-boolean v0, v1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSE:Z
+    iput-boolean v0, v1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aSW:Z
 
     return-object v1
 .end method
@@ -3679,7 +3679,7 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aSs:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aSK:Z
 
     const/4 v1, 0x1
 
@@ -3705,26 +3705,26 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->AD()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Az()V
 
-    iput-object p1, v0, Lcom/google/android/material/textfield/b;->aSr:Ljava/lang/CharSequence;
+    iput-object p1, v0, Lcom/google/android/material/textfield/b;->aSJ:Ljava/lang/CharSequence;
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aSp:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aSH:I
 
     if-eq v2, v1, :cond_2
 
-    iput v1, v0, Lcom/google/android/material/textfield/b;->aSq:I
+    iput v1, v0, Lcom/google/android/material/textfield/b;->aSI:I
 
     :cond_2
-    iget v1, v0, Lcom/google/android/material/textfield/b;->aSp:I
+    iget v1, v0, Lcom/google/android/material/textfield/b;->aSH:I
 
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aSq:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aSI:I
 
-    iget-object v3, v0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v3, v0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     invoke-virtual {v0, v3, p1}, Lcom/google/android/material/textfield/b;->a(Landroid/widget/TextView;Ljava/lang/CharSequence;)Z
 
@@ -3737,7 +3737,7 @@
     :cond_3
     iget-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    invoke-virtual {p1}, Lcom/google/android/material/textfield/b;->AC()V
+    invoke-virtual {p1}, Lcom/google/android/material/textfield/b;->Ay()V
 
     return-void
 .end method
@@ -3747,11 +3747,11 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget-boolean v1, v0, Lcom/google/android/material/textfield/b;->aSs:Z
+    iget-boolean v1, v0, Lcom/google/android/material/textfield/b;->aSK:Z
 
     if-eq v1, p1, :cond_2
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->AD()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Az()V
 
     const/4 v1, 0x0
 
@@ -3763,9 +3763,9 @@
 
     invoke-direct {v2, v3}, Landroidx/appcompat/widget/AppCompatTextView;-><init>(Landroid/content/Context;)V
 
-    iput-object v2, v0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iput-object v2, v0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     sget v3, Lcom/google/android/material/R$id;->textinput_error:I
 
@@ -3775,7 +3775,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     iget-object v3, v0, Lcom/google/android/material/textfield/b;->typeface:Landroid/graphics/Typeface;
 
@@ -3786,45 +3786,45 @@
 
     invoke-virtual {v0, v2}, Lcom/google/android/material/textfield/b;->setErrorTextAppearance(I)V
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     const/4 v3, 0x4
 
     invoke-virtual {v2, v3}, Landroid/widget/TextView;->setVisibility(I)V
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     const/4 v3, 0x1
 
     invoke-static {v2, v3}, Landroidx/core/view/ViewCompat;->setAccessibilityLiveRegion(Landroid/view/View;I)V
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/material/textfield/b;->a(Landroid/widget/TextView;I)V
 
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->AC()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Ay()V
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/material/textfield/b;->b(Landroid/widget/TextView;I)V
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iput-object v1, v0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v1}, Lcom/google/android/material/textfield/TextInputLayout;->updateEditTextBackground()V
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v1}, Lcom/google/android/material/textfield/TextInputLayout;->updateTextInputBoxState()V
 
     :goto_0
-    iput-boolean p1, v0, Lcom/google/android/material/textfield/b;->aSs:Z
+    iput-boolean p1, v0, Lcom/google/android/material/textfield/b;->aSK:Z
 
     :cond_2
     return-void
@@ -3845,11 +3845,11 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
 
@@ -3892,28 +3892,28 @@
     :cond_1
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->AD()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Az()V
 
-    iput-object p1, v0, Lcom/google/android/material/textfield/b;->aSu:Ljava/lang/CharSequence;
+    iput-object p1, v0, Lcom/google/android/material/textfield/b;->aSM:Ljava/lang/CharSequence;
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     invoke-virtual {v1, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget v1, v0, Lcom/google/android/material/textfield/b;->aSp:I
+    iget v1, v0, Lcom/google/android/material/textfield/b;->aSH:I
 
     const/4 v2, 0x2
 
     if-eq v1, v2, :cond_2
 
-    iput v2, v0, Lcom/google/android/material/textfield/b;->aSq:I
+    iput v2, v0, Lcom/google/android/material/textfield/b;->aSI:I
 
     :cond_2
-    iget v1, v0, Lcom/google/android/material/textfield/b;->aSp:I
+    iget v1, v0, Lcom/google/android/material/textfield/b;->aSH:I
 
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aSq:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aSI:I
 
-    iget-object v3, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v3, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     invoke-virtual {v0, v3, p1}, Lcom/google/android/material/textfield/b;->a(Landroid/widget/TextView;Ljava/lang/CharSequence;)Z
 
@@ -3930,11 +3930,11 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
 
@@ -3947,11 +3947,11 @@
 
     iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    iget-boolean v1, v0, Lcom/google/android/material/textfield/b;->aSv:Z
+    iget-boolean v1, v0, Lcom/google/android/material/textfield/b;->aSN:Z
 
     if-eq v1, p1, :cond_3
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->AD()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Az()V
 
     const/4 v1, 0x1
 
@@ -3963,9 +3963,9 @@
 
     invoke-direct {v2, v3}, Landroidx/appcompat/widget/AppCompatTextView;-><init>(Landroid/content/Context;)V
 
-    iput-object v2, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iput-object v2, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     sget v3, Lcom/google/android/material/R$id;->textinput_helper_text:I
 
@@ -3975,20 +3975,20 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     iget-object v3, v0, Lcom/google/android/material/textfield/b;->typeface:Landroid/graphics/Typeface;
 
     invoke-virtual {v2, v3}, Landroid/widget/TextView;->setTypeface(Landroid/graphics/Typeface;)V
 
     :cond_0
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     const/4 v3, 0x4
 
     invoke-virtual {v2, v3}, Landroid/widget/TextView;->setVisibility(I)V
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     invoke-static {v2, v1}, Landroidx/core/view/ViewCompat;->setAccessibilityLiveRegion(Landroid/view/View;I)V
 
@@ -3996,16 +3996,16 @@
 
     invoke-virtual {v0, v2}, Lcom/google/android/material/textfield/b;->cS(I)V
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/material/textfield/b;->a(Landroid/widget/TextView;I)V
 
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->AD()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->Az()V
 
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aSp:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aSH:I
 
     const/4 v3, 0x2
 
@@ -4013,14 +4013,14 @@
 
     const/4 v2, 0x0
 
-    iput v2, v0, Lcom/google/android/material/textfield/b;->aSq:I
+    iput v2, v0, Lcom/google/android/material/textfield/b;->aSI:I
 
     :cond_2
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aSp:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aSH:I
 
-    iget v3, v0, Lcom/google/android/material/textfield/b;->aSq:I
+    iget v3, v0, Lcom/google/android/material/textfield/b;->aSI:I
 
-    iget-object v4, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v4, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     const/4 v5, 0x0
 
@@ -4030,22 +4030,22 @@
 
     invoke-virtual {v0, v2, v3, v4}, Lcom/google/android/material/textfield/b;->a(IIZ)V
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/material/textfield/b;->b(Landroid/widget/TextView;I)V
 
-    iput-object v5, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iput-object v5, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v1}, Lcom/google/android/material/textfield/TextInputLayout;->updateEditTextBackground()V
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v1}, Lcom/google/android/material/textfield/TextInputLayout;->updateTextInputBoxState()V
 
     :goto_0
-    iput-boolean p1, v0, Lcom/google/android/material/textfield/b;->aSv:Z
+    iput-boolean p1, v0, Lcom/google/android/material/textfield/b;->aSN:Z
 
     :cond_3
     return-void
@@ -4448,11 +4448,11 @@
 
     iput-object p1, v0, Lcom/google/android/material/textfield/b;->typeface:Landroid/graphics/Typeface;
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     invoke-static {v1, p1}, Lcom/google/android/material/textfield/b;->a(Landroid/widget/TextView;Landroid/graphics/Typeface;)V
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     invoke-static {v0, p1}, Lcom/google/android/material/textfield/b;->a(Landroid/widget/TextView;Landroid/graphics/Typeface;)V
 
@@ -4670,7 +4670,7 @@
     :cond_2
     iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    invoke-virtual {v1}, Lcom/google/android/material/textfield/b;->AF()Z
+    invoke-virtual {v1}, Lcom/google/android/material/textfield/b;->AB()Z
 
     move-result v1
 
@@ -4678,7 +4678,7 @@
 
     iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    invoke-virtual {v1}, Lcom/google/android/material/textfield/b;->AG()I
+    invoke-virtual {v1}, Lcom/google/android/material/textfield/b;->AC()I
 
     move-result v1
 
@@ -4808,7 +4808,7 @@
     :cond_3
     iget-object v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    invoke-virtual {v2}, Lcom/google/android/material/textfield/b;->AF()Z
+    invoke-virtual {v2}, Lcom/google/android/material/textfield/b;->AB()Z
 
     move-result v2
 
@@ -4816,7 +4816,7 @@
 
     iget-object v2, p0, Lcom/google/android/material/textfield/TextInputLayout;->indicatorViewController:Lcom/google/android/material/textfield/b;
 
-    invoke-virtual {v2}, Lcom/google/android/material/textfield/b;->AG()I
+    invoke-virtual {v2}, Lcom/google/android/material/textfield/b;->AC()I
 
     move-result v2
 
diff --git a/com.discord/smali_classes2/com/google/android/material/textfield/a.smali b/com.discord/smali_classes2/com/google/android/material/textfield/a.smali
index fe76d02ff2..a7beb95af7 100644
--- a/com.discord/smali_classes2/com/google/android/material/textfield/a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/textfield/a.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final aSf:Landroid/graphics/Paint;
+.field private final aSx:Landroid/graphics/Paint;
 
-.field private final aSg:Landroid/graphics/RectF;
+.field private final aSy:Landroid/graphics/RectF;
 
-.field private aSh:I
+.field private aSz:I
 
 
 # direct methods
@@ -23,21 +23,21 @@
 
     invoke-direct {v0, v1}, Landroid/graphics/Paint;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/material/textfield/a;->aSf:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/google/android/material/textfield/a;->aSx:Landroid/graphics/Paint;
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSf:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSx:Landroid/graphics/Paint;
 
     sget-object v1, Landroid/graphics/Paint$Style;->FILL_AND_STROKE:Landroid/graphics/Paint$Style;
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSf:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSx:Landroid/graphics/Paint;
 
     const/4 v1, -0x1
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSf:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSx:Landroid/graphics/Paint;
 
     new-instance v1, Landroid/graphics/PorterDuffXfermode;
 
@@ -51,17 +51,17 @@
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/material/textfield/a;->aSg:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/google/android/material/textfield/a;->aSy:Landroid/graphics/RectF;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final AB()Z
+.method final Ax()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSg:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSy:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->isEmpty()Z
 
@@ -82,7 +82,7 @@
 .method final b(FFFF)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSg:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSy:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->left:F
 
@@ -90,7 +90,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSg:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSy:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->top:F
 
@@ -98,7 +98,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSg:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSy:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->right:F
 
@@ -106,7 +106,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSg:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSy:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->bottom:F
 
@@ -115,7 +115,7 @@
     if-eqz v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSg:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSy:Landroid/graphics/RectF;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Landroid/graphics/RectF;->set(FFFF)V
 
@@ -177,7 +177,7 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/material/textfield/a;->aSh:I
+    iput v0, p0, Lcom/google/android/material/textfield/a;->aSz:I
 
     goto :goto_0
 
@@ -208,14 +208,14 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/material/textfield/a;->aSh:I
+    iput v0, p0, Lcom/google/android/material/textfield/a;->aSz:I
 
     :goto_0
     invoke-super {p0, p1}, Landroid/graphics/drawable/GradientDrawable;->draw(Landroid/graphics/Canvas;)V
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSg:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aSy:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/a;->aSf:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/google/android/material/textfield/a;->aSx:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->drawRect(Landroid/graphics/RectF;Landroid/graphics/Paint;)V
 
@@ -227,7 +227,7 @@
 
     if-nez v0, :cond_2
 
-    iget v0, p0, Lcom/google/android/material/textfield/a;->aSh:I
+    iget v0, p0, Lcom/google/android/material/textfield/a;->aSz:I
 
     invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/textfield/b$1.smali b/com.discord/smali_classes2/com/google/android/material/textfield/b$1.smali
index 65a2ec8524..ce4e7f3826 100644
--- a/com.discord/smali_classes2/com/google/android/material/textfield/b$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/textfield/b$1.smali
@@ -15,30 +15,30 @@
 
 
 # instance fields
-.field final synthetic aSA:Landroid/widget/TextView;
+.field final synthetic aSP:I
 
-.field final synthetic aSB:Lcom/google/android/material/textfield/b;
+.field final synthetic aSQ:Landroid/widget/TextView;
 
-.field final synthetic aSx:I
+.field final synthetic aSR:I
 
-.field final synthetic aSy:Landroid/widget/TextView;
+.field final synthetic aSS:Landroid/widget/TextView;
 
-.field final synthetic aSz:I
+.field final synthetic aST:Lcom/google/android/material/textfield/b;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/textfield/b;ILandroid/widget/TextView;ILandroid/widget/TextView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/textfield/b$1;->aSB:Lcom/google/android/material/textfield/b;
+    iput-object p1, p0, Lcom/google/android/material/textfield/b$1;->aST:Lcom/google/android/material/textfield/b;
 
-    iput p2, p0, Lcom/google/android/material/textfield/b$1;->aSx:I
+    iput p2, p0, Lcom/google/android/material/textfield/b$1;->aSP:I
 
-    iput-object p3, p0, Lcom/google/android/material/textfield/b$1;->aSy:Landroid/widget/TextView;
+    iput-object p3, p0, Lcom/google/android/material/textfield/b$1;->aSQ:Landroid/widget/TextView;
 
-    iput p4, p0, Lcom/google/android/material/textfield/b$1;->aSz:I
+    iput p4, p0, Lcom/google/android/material/textfield/b$1;->aSR:I
 
-    iput-object p5, p0, Lcom/google/android/material/textfield/b$1;->aSA:Landroid/widget/TextView;
+    iput-object p5, p0, Lcom/google/android/material/textfield/b$1;->aSS:Landroid/widget/TextView;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -50,17 +50,17 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aSB:Lcom/google/android/material/textfield/b;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aST:Lcom/google/android/material/textfield/b;
 
-    iget v0, p0, Lcom/google/android/material/textfield/b$1;->aSx:I
+    iget v0, p0, Lcom/google/android/material/textfield/b$1;->aSP:I
 
-    iput v0, p1, Lcom/google/android/material/textfield/b;->aSp:I
+    iput v0, p1, Lcom/google/android/material/textfield/b;->aSH:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/material/textfield/b;->aSn:Landroid/animation/Animator;
+    iput-object v0, p1, Lcom/google/android/material/textfield/b;->aSF:Landroid/animation/Animator;
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aSy:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aSQ:Landroid/widget/TextView;
 
     if-eqz p1, :cond_0
 
@@ -68,21 +68,21 @@
 
     invoke-virtual {p1, v1}, Landroid/widget/TextView;->setVisibility(I)V
 
-    iget p1, p0, Lcom/google/android/material/textfield/b$1;->aSz:I
+    iget p1, p0, Lcom/google/android/material/textfield/b$1;->aSR:I
 
     const/4 v1, 0x1
 
     if-ne p1, v1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aSB:Lcom/google/android/material/textfield/b;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aST:Lcom/google/android/material/textfield/b;
 
-    iget-object p1, p1, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object p1, p1, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aSB:Lcom/google/android/material/textfield/b;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aST:Lcom/google/android/material/textfield/b;
 
-    iget-object p1, p1, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object p1, p1, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
@@ -93,7 +93,7 @@
 .method public final onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aSA:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aSS:Landroid/widget/TextView;
 
     if-eqz p1, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/textfield/b.smali b/com.discord/smali_classes2/com/google/android/material/textfield/b.smali
index ff97a31bf1..7b275ab1c8 100644
--- a/com.discord/smali_classes2/com/google/android/material/textfield/b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/textfield/b.smali
@@ -4,35 +4,35 @@
 
 
 # instance fields
-.field final aSi:Lcom/google/android/material/textfield/TextInputLayout;
+.field final aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
-.field private aSj:Landroid/widget/LinearLayout;
+.field private aSB:Landroid/widget/LinearLayout;
 
-.field private aSk:I
+.field private aSC:I
 
-.field private aSl:Landroid/widget/FrameLayout;
+.field private aSD:Landroid/widget/FrameLayout;
 
-.field private aSm:I
+.field private aSE:I
 
-.field aSn:Landroid/animation/Animator;
+.field aSF:Landroid/animation/Animator;
 
-.field private final aSo:F
+.field private final aSG:F
 
-.field aSp:I
+.field aSH:I
 
-.field aSq:I
+.field aSI:I
 
-.field aSr:Ljava/lang/CharSequence;
+.field aSJ:Ljava/lang/CharSequence;
 
-.field aSs:Z
+.field aSK:Z
 
-.field aSt:Landroid/widget/TextView;
+.field aSL:Landroid/widget/TextView;
 
-.field aSu:Ljava/lang/CharSequence;
+.field aSM:Ljava/lang/CharSequence;
 
-.field aSv:Z
+.field aSN:Z
 
-.field aSw:Landroid/widget/TextView;
+.field aSO:Landroid/widget/TextView;
 
 .field final context:Landroid/content/Context;
 
@@ -55,7 +55,7 @@
 
     iput-object v0, p0, Lcom/google/android/material/textfield/b;->context:Landroid/content/Context;
 
-    iput-object p1, p0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iput-object p1, p0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     iget-object p1, p0, Lcom/google/android/material/textfield/b;->context:Landroid/content/Context;
 
@@ -71,12 +71,12 @@
 
     int-to-float p1, p1
 
-    iput p1, p0, Lcom/google/android/material/textfield/b;->aSo:F
+    iput p1, p0, Lcom/google/android/material/textfield/b;->aSG:F
 
     return-void
 .end method
 
-.method private S(II)V
+.method private R(II)V
     .locals 2
 
     if-ne p1, p2, :cond_0
@@ -122,7 +122,7 @@
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_2
-    iput p2, p0, Lcom/google/android/material/textfield/b;->aSp:I
+    iput p2, p0, Lcom/google/android/material/textfield/b;->aSH:I
 
     return-void
 .end method
@@ -136,7 +136,7 @@
 
     new-array v1, v1, [F
 
-    iget v2, p0, Lcom/google/android/material/textfield/b;->aSo:F
+    iget v2, p0, Lcom/google/android/material/textfield/b;->aSG:F
 
     neg-float v2, v2
 
@@ -318,96 +318,28 @@
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     return-object p1
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     return-object p1
 .end method
 
 
 # virtual methods
-.method final AC()V
+.method final AA()V
     .locals 4
 
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aSr:Ljava/lang/CharSequence;
-
-    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->AD()V
-
-    iget v1, p0, Lcom/google/android/material/textfield/b;->aSp:I
-
-    const/4 v2, 0x1
-
-    if-ne v1, v2, :cond_1
-
-    iget-boolean v1, p0, Lcom/google/android/material/textfield/b;->aSv:Z
-
-    if-eqz v1, :cond_0
-
-    iget-object v1, p0, Lcom/google/android/material/textfield/b;->aSu:Ljava/lang/CharSequence;
-
-    invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_0
-
-    const/4 v1, 0x2
-
-    iput v1, p0, Lcom/google/android/material/textfield/b;->aSq:I
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    iput v1, p0, Lcom/google/android/material/textfield/b;->aSq:I
-
-    :cond_1
-    :goto_0
-    iget v1, p0, Lcom/google/android/material/textfield/b;->aSp:I
-
-    iget v2, p0, Lcom/google/android/material/textfield/b;->aSq:I
-
-    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
-
-    invoke-virtual {p0, v3, v0}, Lcom/google/android/material/textfield/b;->a(Landroid/widget/TextView;Ljava/lang/CharSequence;)Z
-
-    move-result v0
-
-    invoke-virtual {p0, v1, v2, v0}, Lcom/google/android/material/textfield/b;->a(IIZ)V
-
-    return-void
-.end method
-
-.method final AD()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSn:Landroid/animation/Animator;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Landroid/animation/Animator;->cancel()V
-
-    :cond_0
-    return-void
-.end method
-
-.method final AE()V
-    .locals 4
-
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSj:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSB:Landroid/widget/LinearLayout;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -425,9 +357,9 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSj:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSB:Landroid/widget/LinearLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v2}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -437,7 +369,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v3}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -453,20 +385,20 @@
     return-void
 .end method
 
-.method final AF()Z
+.method final AB()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/android/material/textfield/b;->aSq:I
+    iget v0, p0, Lcom/google/android/material/textfield/b;->aSI:I
 
     const/4 v1, 0x1
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSr:Ljava/lang/CharSequence;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSJ:Ljava/lang/CharSequence;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -482,10 +414,10 @@
     return v0
 .end method
 
-.method final AG()I
+.method final AC()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     if-eqz v0, :cond_0
 
@@ -501,6 +433,74 @@
     return v0
 .end method
 
+.method final Ay()V
+    .locals 4
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aSJ:Ljava/lang/CharSequence;
+
+    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->Az()V
+
+    iget v1, p0, Lcom/google/android/material/textfield/b;->aSH:I
+
+    const/4 v2, 0x1
+
+    if-ne v1, v2, :cond_1
+
+    iget-boolean v1, p0, Lcom/google/android/material/textfield/b;->aSN:Z
+
+    if-eqz v1, :cond_0
+
+    iget-object v1, p0, Lcom/google/android/material/textfield/b;->aSM:Ljava/lang/CharSequence;
+
+    invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_0
+
+    const/4 v1, 0x2
+
+    iput v1, p0, Lcom/google/android/material/textfield/b;->aSI:I
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    iput v1, p0, Lcom/google/android/material/textfield/b;->aSI:I
+
+    :cond_1
+    :goto_0
+    iget v1, p0, Lcom/google/android/material/textfield/b;->aSH:I
+
+    iget v2, p0, Lcom/google/android/material/textfield/b;->aSI:I
+
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
+
+    invoke-virtual {p0, v3, v0}, Lcom/google/android/material/textfield/b;->a(Landroid/widget/TextView;Ljava/lang/CharSequence;)Z
+
+    move-result v0
+
+    invoke-virtual {p0, v1, v2, v0}, Lcom/google/android/material/textfield/b;->a(IIZ)V
+
+    return-void
+.end method
+
+.method final Az()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSF:Landroid/animation/Animator;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Landroid/animation/Animator;->cancel()V
+
+    :cond_0
+    return-void
+.end method
+
 .method final a(IIZ)V
     .locals 9
 
@@ -510,15 +510,15 @@
 
     invoke-direct {v7}, Landroid/animation/AnimatorSet;-><init>()V
 
-    iput-object v7, p0, Lcom/google/android/material/textfield/b;->aSn:Landroid/animation/Animator;
+    iput-object v7, p0, Lcom/google/android/material/textfield/b;->aSF:Landroid/animation/Animator;
 
     new-instance v8, Ljava/util/ArrayList;
 
     invoke-direct {v8}, Ljava/util/ArrayList;-><init>()V
 
-    iget-boolean v2, p0, Lcom/google/android/material/textfield/b;->aSv:Z
+    iget-boolean v2, p0, Lcom/google/android/material/textfield/b;->aSN:Z
 
-    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     const/4 v4, 0x2
 
@@ -532,9 +532,9 @@
 
     invoke-direct/range {v0 .. v6}, Lcom/google/android/material/textfield/b;->a(Ljava/util/List;ZLandroid/widget/TextView;III)V
 
-    iget-boolean v2, p0, Lcom/google/android/material/textfield/b;->aSs:Z
+    iget-boolean v2, p0, Lcom/google/android/material/textfield/b;->aSK:Z
 
-    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     const/4 v4, 0x1
 
@@ -569,18 +569,18 @@
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0, p1, p2}, Lcom/google/android/material/textfield/b;->S(II)V
+    invoke-direct {p0, p1, p2}, Lcom/google/android/material/textfield/b;->R(II)V
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/textfield/TextInputLayout;->updateEditTextBackground()V
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v0, p3}, Lcom/google/android/material/textfield/TextInputLayout;->updateLabelState(Z)V
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/textfield/TextInputLayout;->updateTextInputBoxState()V
 
@@ -590,13 +590,13 @@
 .method final a(Landroid/widget/TextView;I)V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSj:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSB:Landroid/widget/LinearLayout;
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSl:Landroid/widget/FrameLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSD:Landroid/widget/FrameLayout;
 
     if-nez v0, :cond_0
 
@@ -606,15 +606,15 @@
 
     invoke-direct {v0, v2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aSj:Landroid/widget/LinearLayout;
+    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aSB:Landroid/widget/LinearLayout;
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSj:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSB:Landroid/widget/LinearLayout;
 
     invoke-virtual {v0, v1}, Landroid/widget/LinearLayout;->setOrientation(I)V
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aSj:Landroid/widget/LinearLayout;
+    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aSB:Landroid/widget/LinearLayout;
 
     const/4 v3, -0x1
 
@@ -628,11 +628,11 @@
 
     invoke-direct {v0, v2}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aSl:Landroid/widget/FrameLayout;
+    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aSD:Landroid/widget/FrameLayout;
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSj:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSB:Landroid/widget/LinearLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aSl:Landroid/widget/FrameLayout;
+    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aSD:Landroid/widget/FrameLayout;
 
     new-instance v5, Landroid/widget/FrameLayout$LayoutParams;
 
@@ -652,11 +652,11 @@
 
     invoke-direct {v2, v1, v1, v3}, Landroid/widget/LinearLayout$LayoutParams;-><init>(IIF)V
 
-    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aSj:Landroid/widget/LinearLayout;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aSB:Landroid/widget/LinearLayout;
 
     invoke-virtual {v3, v0, v2}, Landroid/widget/LinearLayout;->addView(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -664,7 +664,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->AE()V
+    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->AA()V
 
     :cond_0
     invoke-static {p2}, Lcom/google/android/material/textfield/b;->cQ(I)Z
@@ -673,37 +673,37 @@
 
     if-eqz v0, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aSl:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aSD:Landroid/widget/FrameLayout;
 
     invoke-virtual {p2, v1}, Landroid/widget/FrameLayout;->setVisibility(I)V
 
-    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aSl:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aSD:Landroid/widget/FrameLayout;
 
     invoke-virtual {p2, p1}, Landroid/widget/FrameLayout;->addView(Landroid/view/View;)V
 
-    iget p1, p0, Lcom/google/android/material/textfield/b;->aSm:I
+    iget p1, p0, Lcom/google/android/material/textfield/b;->aSE:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lcom/google/android/material/textfield/b;->aSm:I
+    iput p1, p0, Lcom/google/android/material/textfield/b;->aSE:I
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSj:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSB:Landroid/widget/LinearLayout;
 
     invoke-virtual {v0, p1, p2}, Landroid/widget/LinearLayout;->addView(Landroid/view/View;I)V
 
     :goto_0
-    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aSj:Landroid/widget/LinearLayout;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aSB:Landroid/widget/LinearLayout;
 
     invoke-virtual {p1, v1}, Landroid/widget/LinearLayout;->setVisibility(I)V
 
-    iget p1, p0, Lcom/google/android/material/textfield/b;->aSk:I
+    iget p1, p0, Lcom/google/android/material/textfield/b;->aSC:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lcom/google/android/material/textfield/b;->aSk:I
+    iput p1, p0, Lcom/google/android/material/textfield/b;->aSC:I
 
     return-void
 .end method
@@ -711,7 +711,7 @@
 .method final a(Landroid/widget/TextView;Ljava/lang/CharSequence;)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->isLaidOut(Landroid/view/View;)Z
 
@@ -719,7 +719,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/textfield/TextInputLayout;->isEnabled()Z
 
@@ -727,9 +727,9 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/textfield/b;->aSq:I
+    iget v0, p0, Lcom/google/android/material/textfield/b;->aSI:I
 
-    iget v1, p0, Lcom/google/android/material/textfield/b;->aSp:I
+    iget v1, p0, Lcom/google/android/material/textfield/b;->aSH:I
 
     if-ne v0, v1, :cond_0
 
@@ -759,7 +759,7 @@
 .method final b(Landroid/widget/TextView;I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSj:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSB:Landroid/widget/LinearLayout;
 
     if-nez v0, :cond_0
 
@@ -772,41 +772,41 @@
 
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aSl:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aSD:Landroid/widget/FrameLayout;
 
     if-eqz p2, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/textfield/b;->aSm:I
+    iget v0, p0, Lcom/google/android/material/textfield/b;->aSE:I
 
     add-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lcom/google/android/material/textfield/b;->aSm:I
+    iput v0, p0, Lcom/google/android/material/textfield/b;->aSE:I
 
-    iget v0, p0, Lcom/google/android/material/textfield/b;->aSm:I
+    iget v0, p0, Lcom/google/android/material/textfield/b;->aSE:I
 
     invoke-static {p2, v0}, Lcom/google/android/material/textfield/b;->a(Landroid/view/ViewGroup;I)V
 
-    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aSl:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aSD:Landroid/widget/FrameLayout;
 
     invoke-virtual {p2, p1}, Landroid/widget/FrameLayout;->removeView(Landroid/view/View;)V
 
     goto :goto_0
 
     :cond_1
-    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aSj:Landroid/widget/LinearLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aSB:Landroid/widget/LinearLayout;
 
     invoke-virtual {p2, p1}, Landroid/widget/LinearLayout;->removeView(Landroid/view/View;)V
 
     :goto_0
-    iget p1, p0, Lcom/google/android/material/textfield/b;->aSk:I
+    iget p1, p0, Lcom/google/android/material/textfield/b;->aSC:I
 
     add-int/lit8 p1, p1, -0x1
 
-    iput p1, p0, Lcom/google/android/material/textfield/b;->aSk:I
+    iput p1, p0, Lcom/google/android/material/textfield/b;->aSC:I
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aSj:Landroid/widget/LinearLayout;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aSB:Landroid/widget/LinearLayout;
 
-    iget p2, p0, Lcom/google/android/material/textfield/b;->aSk:I
+    iget p2, p0, Lcom/google/android/material/textfield/b;->aSC:I
 
     invoke-static {p1, p2}, Lcom/google/android/material/textfield/b;->a(Landroid/view/ViewGroup;I)V
 
@@ -818,7 +818,7 @@
 
     iput p1, p0, Lcom/google/android/material/textfield/b;->helperTextTextAppearance:I
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSw:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSO:Landroid/widget/TextView;
 
     if-eqz v0, :cond_0
 
@@ -833,11 +833,11 @@
 
     iput p1, p0, Lcom/google/android/material/textfield/b;->errorTextAppearance:I
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSt:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aSL:Landroid/widget/TextView;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/b;->aSi:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, p0, Lcom/google/android/material/textfield/b;->aSA:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v1, v0, p1}, Lcom/google/android/material/textfield/TextInputLayout;->setTextAppearanceCompatWithErrorFallback(Landroid/widget/TextView;I)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableBehavior$1.smali b/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableBehavior$1.smali
index b49276a486..091d440b0c 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableBehavior$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableBehavior$1.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field final synthetic aQe:Landroid/view/View;
+.field final synthetic aQw:Landroid/view/View;
 
-.field final synthetic aSF:I
+.field final synthetic aSX:I
 
-.field final synthetic aSG:Lcom/google/android/material/expandable/ExpandableWidget;
+.field final synthetic aSY:Lcom/google/android/material/expandable/ExpandableWidget;
 
-.field final synthetic aSH:Lcom/google/android/material/transformation/ExpandableBehavior;
+.field final synthetic aSZ:Lcom/google/android/material/transformation/ExpandableBehavior;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/transformation/ExpandableBehavior;Landroid/view/View;ILcom/google/android/material/expandable/ExpandableWidget;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSH:Lcom/google/android/material/transformation/ExpandableBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSZ:Lcom/google/android/material/transformation/ExpandableBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aQe:Landroid/view/View;
+    iput-object p2, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aQw:Landroid/view/View;
 
-    iput p3, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSF:I
+    iput p3, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSX:I
 
-    iput-object p4, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSG:Lcom/google/android/material/expandable/ExpandableWidget;
+    iput-object p4, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSY:Lcom/google/android/material/expandable/ExpandableWidget;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,7 +49,7 @@
 .method public final onPreDraw()Z
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aQe:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aQw:Landroid/view/View;
 
     invoke-virtual {v0}, Landroid/view/View;->getViewTreeObserver()Landroid/view/ViewTreeObserver;
 
@@ -57,27 +57,27 @@
 
     invoke-virtual {v0, p0}, Landroid/view/ViewTreeObserver;->removeOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
 
-    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSH:Lcom/google/android/material/transformation/ExpandableBehavior;
+    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSZ:Lcom/google/android/material/transformation/ExpandableBehavior;
 
     invoke-static {v0}, Lcom/google/android/material/transformation/ExpandableBehavior;->access$000(Lcom/google/android/material/transformation/ExpandableBehavior;)I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSF:I
+    iget v1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSX:I
 
     const/4 v2, 0x0
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSH:Lcom/google/android/material/transformation/ExpandableBehavior;
+    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSZ:Lcom/google/android/material/transformation/ExpandableBehavior;
 
-    iget-object v1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSG:Lcom/google/android/material/expandable/ExpandableWidget;
+    iget-object v1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aSY:Lcom/google/android/material/expandable/ExpandableWidget;
 
     move-object v3, v1
 
     check-cast v3, Landroid/view/View;
 
-    iget-object v4, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aQe:Landroid/view/View;
+    iget-object v4, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aQw:Landroid/view/View;
 
     invoke-interface {v1}, Lcom/google/android/material/expandable/ExpandableWidget;->isExpanded()Z
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableTransformationBehavior$1.smali b/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableTransformationBehavior$1.smali
index 04bfc95cdd..29e672ce8f 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableTransformationBehavior$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableTransformationBehavior$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aSI:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+.field final synthetic aTa:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/transformation/ExpandableTransformationBehavior;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transformation/ExpandableTransformationBehavior$1;->aSI:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/ExpandableTransformationBehavior$1;->aTa:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/ExpandableTransformationBehavior$1;->aSI:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+    iget-object p1, p0, Lcom/google/android/material/transformation/ExpandableTransformationBehavior$1;->aTa:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$1.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$1.smali
index 98157ddbca..a288011f2a 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$1.smali
@@ -15,26 +15,26 @@
 
 
 # instance fields
-.field final synthetic aQe:Landroid/view/View;
+.field final synthetic aQw:Landroid/view/View;
 
-.field final synthetic aSJ:Z
+.field final synthetic aTb:Z
 
-.field final synthetic aSK:Landroid/view/View;
+.field final synthetic aTc:Landroid/view/View;
 
-.field final synthetic aSL:Lcom/google/android/material/transformation/FabTransformationBehavior;
+.field final synthetic aTd:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/transformation/FabTransformationBehavior;ZLandroid/view/View;Landroid/view/View;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aSL:Lcom/google/android/material/transformation/FabTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aTd:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aSJ:Z
+    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aTb:Z
 
-    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aQe:Landroid/view/View;
+    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aQw:Landroid/view/View;
 
-    iput-object p4, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aSK:Landroid/view/View;
+    iput-object p4, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aTc:Landroid/view/View;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -46,23 +46,23 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aSJ:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aTb:Z
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aQe:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aQw: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$1;->aSK:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aTc: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$1;->aSK:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aTc:Landroid/view/View;
 
     const/4 v0, 0x0
 
@@ -75,23 +75,23 @@
 .method public final onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aSJ:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aTb:Z
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aQe:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aQw: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$1;->aSK:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aTc: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$1;->aSK:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aTc:Landroid/view/View;
 
     const/4 v0, 0x4
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$2.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$2.smali
index bb714aebd7..14843ced25 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$2.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic aQe:Landroid/view/View;
+.field final synthetic aQw:Landroid/view/View;
 
-.field final synthetic aSL:Lcom/google/android/material/transformation/FabTransformationBehavior;
+.field final synthetic aTd:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/transformation/FabTransformationBehavior;Landroid/view/View;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aSL:Lcom/google/android/material/transformation/FabTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aTd:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aQe:Landroid/view/View;
+    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aQw:Landroid/view/View;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aQe:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aQw:Landroid/view/View;
 
     invoke-virtual {p1}, Landroid/view/View;->invalidate()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$3.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$3.smali
index 6cddc633ab..f18dcc4293 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$3.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$3.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic aSL:Lcom/google/android/material/transformation/FabTransformationBehavior;
+.field final synthetic aTd:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-.field final synthetic aSM:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+.field final synthetic aTe:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
-.field final synthetic aSN:Landroid/graphics/drawable/Drawable;
+.field final synthetic aTf:Landroid/graphics/drawable/Drawable;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/transformation/FabTransformationBehavior;Lcom/google/android/material/circularreveal/CircularRevealWidget;Landroid/graphics/drawable/Drawable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aSL:Lcom/google/android/material/transformation/FabTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aTd:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aSM:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aTe:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
-    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aSN:Landroid/graphics/drawable/Drawable;
+    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aTf:Landroid/graphics/drawable/Drawable;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -42,7 +42,7 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aSM:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aTe:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
     const/4 v0, 0x0
 
@@ -54,9 +54,9 @@
 .method public final onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aSM:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aTe:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
-    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aSN:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aTf: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$4.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$4.smali
index 606a694d5f..e7469c8353 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$4.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$4.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic aSL:Lcom/google/android/material/transformation/FabTransformationBehavior;
+.field final synthetic aTd:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-.field final synthetic aSM:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+.field final synthetic aTe:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/transformation/FabTransformationBehavior;Lcom/google/android/material/circularreveal/CircularRevealWidget;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aSL:Lcom/google/android/material/transformation/FabTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aTd:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aSM:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aTe:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -38,7 +38,7 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aSM:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aTe:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
     invoke-interface {p1}, Lcom/google/android/material/circularreveal/CircularRevealWidget;->getRevealInfo()Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;
 
@@ -48,7 +48,7 @@
 
     iput v0, p1, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;->radius:F
 
-    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aSM:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aTe: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$1.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationScrimBehavior$1.smali
index adf5f2d365..bfbed9b279 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationScrimBehavior$1.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationScrimBehavior$1.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic aQe:Landroid/view/View;
+.field final synthetic aQw:Landroid/view/View;
 
-.field final synthetic aSJ:Z
+.field final synthetic aTb:Z
 
-.field final synthetic aSO:Lcom/google/android/material/transformation/FabTransformationScrimBehavior;
+.field final synthetic aTg:Lcom/google/android/material/transformation/FabTransformationScrimBehavior;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/transformation/FabTransformationScrimBehavior;ZLandroid/view/View;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aSO:Lcom/google/android/material/transformation/FabTransformationScrimBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aTg:Lcom/google/android/material/transformation/FabTransformationScrimBehavior;
 
-    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aSJ:Z
+    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aTb:Z
 
-    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aQe:Landroid/view/View;
+    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aQw:Landroid/view/View;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -42,11 +42,11 @@
 .method public final onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aSJ:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aTb:Z
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aQe:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aQw:Landroid/view/View;
 
     const/4 v0, 0x4
 
@@ -59,11 +59,11 @@
 .method public final onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aSJ:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aTb:Z
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aQe:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aQw:Landroid/view/View;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/FirebaseApp$a.smali b/com.discord/smali_classes2/com/google/firebase/FirebaseApp$a.smali
index 8e332d37fe..66be0dcd69 100644
--- a/com.discord/smali_classes2/com/google/firebase/FirebaseApp$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/FirebaseApp$a.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field private static aTb:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static aTt:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -37,7 +37,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/FirebaseApp$a;->aTb:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/firebase/FirebaseApp$a;->aTt:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     check-cast p0, Landroid/app/Application;
 
-    sget-object v0, Lcom/google/firebase/FirebaseApp$a;->aTb:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lcom/google/firebase/FirebaseApp$a;->aTt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -79,7 +79,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/FirebaseApp$a;-><init>()V
 
-    sget-object v1, Lcom/google/firebase/FirebaseApp$a;->aTb:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lcom/google/firebase/FirebaseApp$a;->aTt:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v2, 0x0
 
@@ -91,7 +91,7 @@
 
     invoke-static {p0}, Lcom/google/android/gms/common/api/internal/b;->initialize(Landroid/app/Application;)V
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->lu()Lcom/google/android/gms/common/api/internal/b;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->ls()Lcom/google/android/gms/common/api/internal/b;
 
     move-result-object p0
 
@@ -103,10 +103,10 @@
 
 
 # virtual methods
-.method public final H(Z)V
+.method public final F(Z)V
     .locals 4
 
-    invoke-static {}, Lcom/google/firebase/FirebaseApp;->AL()Ljava/lang/Object;
+    invoke-static {}, Lcom/google/firebase/FirebaseApp;->AH()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -115,7 +115,7 @@
     :try_start_0
     new-instance v1, Ljava/util/ArrayList;
 
-    sget-object v2, Lcom/google/firebase/FirebaseApp;->aSR:Ljava/util/Map;
+    sget-object v2, Lcom/google/firebase/FirebaseApp;->aTj:Ljava/util/Map;
 
     invoke-interface {v2}, Ljava/util/Map;->values()Ljava/util/Collection;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/FirebaseApp$b.smali b/com.discord/smali_classes2/com/google/firebase/FirebaseApp$b.smali
index 57dce6edd5..becd15d871 100644
--- a/com.discord/smali_classes2/com/google/firebase/FirebaseApp$b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/FirebaseApp$b.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field private static final aTc:Landroid/os/Handler;
+.field private static final aTu:Landroid/os/Handler;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     invoke-direct {v0, v1}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
 
-    sput-object v0, Lcom/google/firebase/FirebaseApp$b;->aTc:Landroid/os/Handler;
+    sput-object v0, Lcom/google/firebase/FirebaseApp$b;->aTu:Landroid/os/Handler;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 .method public final execute(Ljava/lang/Runnable;)V
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/FirebaseApp$b;->aTc:Landroid/os/Handler;
+    sget-object v0, Lcom/google/firebase/FirebaseApp$b;->aTu:Landroid/os/Handler;
 
     invoke-virtual {v0, p1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
diff --git a/com.discord/smali_classes2/com/google/firebase/FirebaseApp$c.smali b/com.discord/smali_classes2/com/google/firebase/FirebaseApp$c.smali
index c8278d8995..d37969095b 100644
--- a/com.discord/smali_classes2/com/google/firebase/FirebaseApp$c.smali
+++ b/com.discord/smali_classes2/com/google/firebase/FirebaseApp$c.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field private static aTb:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static aTt:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -38,7 +38,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/FirebaseApp$c;->aTb:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/firebase/FirebaseApp$c;->aTt:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 .method static synthetic aC(Landroid/content/Context;)V
     .locals 3
 
-    sget-object v0, Lcom/google/firebase/FirebaseApp$c;->aTb:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lcom/google/firebase/FirebaseApp$c;->aTt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -68,7 +68,7 @@
 
     invoke-direct {v0, p0}, Lcom/google/firebase/FirebaseApp$c;-><init>(Landroid/content/Context;)V
 
-    sget-object v1, Lcom/google/firebase/FirebaseApp$c;->aTb:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lcom/google/firebase/FirebaseApp$c;->aTt:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v2, 0x0
 
@@ -95,14 +95,14 @@
 .method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/firebase/FirebaseApp;->AL()Ljava/lang/Object;
+    invoke-static {}, Lcom/google/firebase/FirebaseApp;->AH()Ljava/lang/Object;
 
     move-result-object p1
 
     monitor-enter p1
 
     :try_start_0
-    sget-object p2, Lcom/google/firebase/FirebaseApp;->aSR:Ljava/util/Map;
+    sget-object p2, Lcom/google/firebase/FirebaseApp;->aTj:Ljava/util/Map;
 
     invoke-interface {p2}, Ljava/util/Map;->values()Ljava/util/Collection;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/FirebaseApp.smali b/com.discord/smali_classes2/com/google/firebase/FirebaseApp.smali
index d1d257c18c..f89a51a318 100644
--- a/com.discord/smali_classes2/com/google/firebase/FirebaseApp.smali
+++ b/com.discord/smali_classes2/com/google/firebase/FirebaseApp.smali
@@ -14,11 +14,11 @@
 
 
 # static fields
-.field private static final aSP:Ljava/lang/Object;
+.field private static final aTh:Ljava/lang/Object;
 
-.field private static final aSQ:Ljava/util/concurrent/Executor;
+.field private static final aTi:Ljava/util/concurrent/Executor;
 
-.field static final aSR:Ljava/util/Map;
+.field static final aTj:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -31,15 +31,15 @@
 
 
 # instance fields
-.field private final aSS:Lcom/google/firebase/c;
+.field private final aTk:Lcom/google/firebase/c;
 
-.field private final aST:Lcom/google/firebase/components/i;
+.field private final aTl:Lcom/google/firebase/components/i;
 
-.field private final aSU:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final aTm:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final aSV:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final aTn:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final aSW:Lcom/google/firebase/components/s;
+.field private final aTo:Lcom/google/firebase/components/s;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/firebase/components/s<",
@@ -49,7 +49,7 @@
     .end annotation
 .end field
 
-.field private final aSX:Ljava/util/List;
+.field private final aTp:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -59,7 +59,7 @@
     .end annotation
 .end field
 
-.field private final aSY:Ljava/util/List;
+.field private final aTq:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -82,7 +82,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/FirebaseApp;->aSP:Ljava/lang/Object;
+    sput-object v0, Lcom/google/firebase/FirebaseApp;->aTh:Ljava/lang/Object;
 
     new-instance v0, Lcom/google/firebase/FirebaseApp$b;
 
@@ -90,13 +90,13 @@
 
     invoke-direct {v0, v1}, Lcom/google/firebase/FirebaseApp$b;-><init>(B)V
 
-    sput-object v0, Lcom/google/firebase/FirebaseApp;->aSQ:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/FirebaseApp;->aTi:Ljava/util/concurrent/Executor;
 
     new-instance v0, Landroidx/collection/ArrayMap;
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/FirebaseApp;->aSR:Ljava/util/Map;
+    sput-object v0, Lcom/google/firebase/FirebaseApp;->aTj:Ljava/util/Map;
 
     return-void
 .end method
@@ -112,25 +112,25 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
-    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aSU:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aTm:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aSV:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aTn:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     new-instance v0, Ljava/util/concurrent/CopyOnWriteArrayList;
 
     invoke-direct {v0}, Ljava/util/concurrent/CopyOnWriteArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aSX:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aTp:Ljava/util/List;
 
     new-instance v0, Ljava/util/concurrent/CopyOnWriteArrayList;
 
     invoke-direct {v0}, Ljava/util/concurrent/CopyOnWriteArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aSY:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aTq:Ljava/util/List;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -140,7 +140,7 @@
 
     iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->applicationContext:Landroid/content/Context;
 
-    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -152,7 +152,7 @@
 
     check-cast p2, Lcom/google/firebase/c;
 
-    iput-object p2, p0, Lcom/google/firebase/FirebaseApp;->aSS:Lcom/google/firebase/c;
+    iput-object p2, p0, Lcom/google/firebase/FirebaseApp;->aTk:Lcom/google/firebase/c;
 
     new-instance p2, Lcom/google/firebase/components/f;
 
@@ -162,9 +162,9 @@
 
     invoke-direct {p2, p1, v0}, Lcom/google/firebase/components/f;-><init>(Ljava/lang/Object;Lcom/google/firebase/components/f$b;)V
 
-    iget-object v0, p2, Lcom/google/firebase/components/f;->aTG:Lcom/google/firebase/components/f$b;
+    iget-object v0, p2, Lcom/google/firebase/components/f;->aTY:Lcom/google/firebase/components/f$b;
 
-    iget-object p2, p2, Lcom/google/firebase/components/f;->aTF:Ljava/lang/Object;
+    iget-object p2, p2, Lcom/google/firebase/components/f;->aTX:Ljava/lang/Object;
 
     invoke-interface {v0, p2}, Lcom/google/firebase/components/f$b;->aJ(Ljava/lang/Object;)Ljava/util/List;
 
@@ -176,7 +176,7 @@
 
     new-instance v0, Lcom/google/firebase/components/i;
 
-    sget-object v2, Lcom/google/firebase/FirebaseApp;->aSQ:Ljava/util/concurrent/Executor;
+    sget-object v2, Lcom/google/firebase/FirebaseApp;->aTi:Ljava/util/concurrent/Executor;
 
     const/4 v3, 0x6
 
@@ -240,7 +240,7 @@
 
     aput-object p3, v3, v1
 
-    invoke-static {}, Lcom/google/firebase/d/b;->BD()Lcom/google/firebase/components/b;
+    invoke-static {}, Lcom/google/firebase/d/b;->Bs()Lcom/google/firebase/components/b;
 
     move-result-object p3
 
@@ -250,7 +250,7 @@
 
     invoke-direct {v0, v2, p2, v3}, Lcom/google/firebase/components/i;-><init>(Ljava/util/concurrent/Executor;Ljava/lang/Iterable;[Lcom/google/firebase/components/b;)V
 
-    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aST:Lcom/google/firebase/components/i;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aTl:Lcom/google/firebase/components/i;
 
     new-instance p2, Lcom/google/firebase/components/s;
 
@@ -260,15 +260,15 @@
 
     invoke-direct {p2, p3}, Lcom/google/firebase/components/s;-><init>(Lcom/google/firebase/b/a;)V
 
-    iput-object p2, p0, Lcom/google/firebase/FirebaseApp;->aSW:Lcom/google/firebase/components/s;
+    iput-object p2, p0, Lcom/google/firebase/FirebaseApp;->aTo:Lcom/google/firebase/components/s;
 
     return-void
 .end method
 
-.method private AI()V
+.method private AE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aSV:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aTn:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -283,7 +283,7 @@
     return-void
 .end method
 
-.method private AK()V
+.method private AG()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->applicationContext:Landroid/content/Context;
@@ -303,21 +303,21 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aST:Lcom/google/firebase/components/i;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aTl:Lcom/google/firebase/components/i;
 
-    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->AJ()Z
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->AF()Z
 
     move-result v1
 
-    invoke-virtual {v0, v1}, Lcom/google/firebase/components/i;->W(Z)V
+    invoke-virtual {v0, v1}, Lcom/google/firebase/components/i;->U(Z)V
 
     return-void
 .end method
 
-.method static synthetic AL()Ljava/lang/Object;
+.method static synthetic AH()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/FirebaseApp;->aSP:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/FirebaseApp;->aTh:Ljava/lang/Object;
 
     return-object v0
 .end method
@@ -345,12 +345,12 @@
     move-result-object p0
 
     :goto_0
-    sget-object v0, Lcom/google/firebase/FirebaseApp;->aSP:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/FirebaseApp;->aTh:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/FirebaseApp;->aSR:Ljava/util/Map;
+    sget-object v1, Lcom/google/firebase/FirebaseApp;->aTj:Ljava/util/Map;
 
     invoke-interface {v1, p2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -392,7 +392,7 @@
 
     invoke-direct {v1, p0, p2, p1}, Lcom/google/firebase/FirebaseApp;-><init>(Landroid/content/Context;Ljava/lang/String;Lcom/google/firebase/c;)V
 
-    sget-object p0, Lcom/google/firebase/FirebaseApp;->aSR:Ljava/util/Map;
+    sget-object p0, Lcom/google/firebase/FirebaseApp;->aTj:Ljava/util/Map;
 
     invoke-interface {p0, p2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -400,7 +400,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-direct {v1}, Lcom/google/firebase/FirebaseApp;->AK()V
+    invoke-direct {v1}, Lcom/google/firebase/FirebaseApp;->AG()V
 
     return-object v1
 
@@ -446,11 +446,11 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->AH()Lcom/google/firebase/c;
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->AD()Lcom/google/firebase/c;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/firebase/c;->aTd:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/firebase/c;->aTv:Ljava/lang/String;
 
     invoke-static {}, Ljava/nio/charset/Charset;->defaultCharset()Ljava/nio/charset/Charset;
 
@@ -470,7 +470,7 @@
 
     move-result-object v1
 
-    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aST:Lcom/google/firebase/components/i;
+    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aTl:Lcom/google/firebase/components/i;
 
     const-class v2, Lcom/google/firebase/a/c;
 
@@ -488,7 +488,7 @@
 .method static synthetic a(Lcom/google/firebase/FirebaseApp;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->AK()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->AG()V
 
     return-void
 .end method
@@ -502,7 +502,7 @@
 
     invoke-static {p1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aSX:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aTp:Ljava/util/List;
 
     invoke-interface {p0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -526,12 +526,12 @@
 .method public static aA(Landroid/content/Context;)Lcom/google/firebase/FirebaseApp;
     .locals 3
 
-    sget-object v0, Lcom/google/firebase/FirebaseApp;->aSP:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/FirebaseApp;->aTh:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/FirebaseApp;->aSR:Ljava/util/Map;
+    sget-object v1, Lcom/google/firebase/FirebaseApp;->aTj:Ljava/util/Map;
 
     const-string v2, "[DEFAULT]"
 
@@ -592,7 +592,7 @@
 .method static synthetic b(Lcom/google/firebase/FirebaseApp;)Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aSU:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aTm:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-object p0
 .end method
@@ -600,12 +600,12 @@
 .method public static getInstance()Lcom/google/firebase/FirebaseApp;
     .locals 4
 
-    sget-object v0, Lcom/google/firebase/FirebaseApp;->aSP:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/FirebaseApp;->aTh:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/FirebaseApp;->aSR:Ljava/util/Map;
+    sget-object v1, Lcom/google/firebase/FirebaseApp;->aTj:Ljava/util/Map;
 
     const-string v2, "[DEFAULT]"
 
@@ -630,7 +630,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/google/android/gms/common/util/m;->mv()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/util/m;->mt()Ljava/lang/String;
 
     move-result-object v3
 
@@ -672,9 +672,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->AI()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->AE()V
 
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aST:Lcom/google/firebase/components/i;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aTl:Lcom/google/firebase/components/i;
 
     invoke-virtual {v0, p1}, Lcom/google/firebase/components/i;->A(Ljava/lang/Class;)Ljava/lang/Object;
 
@@ -683,17 +683,17 @@
     return-object p1
 .end method
 
-.method public final AH()Lcom/google/firebase/c;
+.method public final AD()Lcom/google/firebase/c;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->AI()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->AE()V
 
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aSS:Lcom/google/firebase/c;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aTk:Lcom/google/firebase/c;
 
     return-object v0
 .end method
 
-.method public final AJ()Z
+.method public final AF()Z
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->getName()Ljava/lang/String;
@@ -739,7 +739,7 @@
 .method public final getApplicationContext()Landroid/content/Context;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->AI()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->AE()V
 
     iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->applicationContext:Landroid/content/Context;
 
@@ -749,7 +749,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->AI()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->AE()V
 
     iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->name:Ljava/lang/String;
 
@@ -771,9 +771,9 @@
 .method public isDataCollectionDefaultEnabled()Z
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->AI()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->AE()V
 
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aSW:Lcom/google/firebase/components/s;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aTo:Lcom/google/firebase/components/s;
 
     invoke-virtual {v0}, Lcom/google/firebase/components/s;->get()Ljava/lang/Object;
 
@@ -781,7 +781,7 @@
 
     check-cast v0, Lcom/google/firebase/c/a;
 
-    iget-object v0, v0, Lcom/google/firebase/c/a;->aVW:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, v0, Lcom/google/firebase/c/a;->aWo:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -805,7 +805,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/FirebaseApp;->aSS:Lcom/google/firebase/c;
+    iget-object v1, p0, Lcom/google/firebase/FirebaseApp;->aTk:Lcom/google/firebase/c;
 
     const-string v2, "options"
 
diff --git a/com.discord/smali_classes2/com/google/firebase/analytics/FirebaseAnalytics.smali b/com.discord/smali_classes2/com/google/firebase/analytics/FirebaseAnalytics.smali
index a77b61b7b9..674273a36e 100644
--- a/com.discord/smali_classes2/com/google/firebase/analytics/FirebaseAnalytics.smali
+++ b/com.discord/smali_classes2/com/google/firebase/analytics/FirebaseAnalytics.smali
@@ -3,17 +3,17 @@
 
 
 # static fields
-.field private static volatile aTj:Lcom/google/firebase/analytics/FirebaseAnalytics;
+.field private static volatile aTB:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
 
 # instance fields
-.field private final aCX:Lcom/google/android/gms/measurement/internal/ek;
+.field public final aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-.field private final aCZ:Z
+.field public final aDr:Z
 
-.field private final aTk:Lcom/google/android/gms/internal/measurement/lw;
+.field public final aTC:Lcom/google/android/gms/internal/measurement/lw;
 
-.field private final aTl:Ljava/lang/Object;
+.field private final aTD:Ljava/lang/Object;
 
 
 # direct methods
@@ -26,19 +26,19 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTk:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTC:Lcom/google/android/gms/internal/measurement/lw;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aCZ:Z
+    iput-boolean p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aDr:Z
 
     new-instance p1, Ljava/lang/Object;
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTl:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTD:Ljava/lang/Object;
 
     return-void
 .end method
@@ -50,21 +50,21 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTk:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTC:Lcom/google/android/gms/internal/measurement/lw;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aCZ:Z
+    iput-boolean p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aDr:Z
 
     new-instance p1, Ljava/lang/Object;
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTl:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTD:Ljava/lang/Object;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 .method public static getInstance(Landroid/content/Context;)Lcom/google/firebase/analytics/FirebaseAnalytics;
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTj:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sget-object v0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTB:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
     if-nez v0, :cond_2
 
@@ -81,7 +81,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTj:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sget-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTB:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
     if-nez v1, :cond_1
 
@@ -99,7 +99,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/firebase/analytics/FirebaseAnalytics;-><init>(Lcom/google/android/gms/internal/measurement/lw;)V
 
-    sput-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTj:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sput-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTB:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
     goto :goto_0
 
@@ -114,7 +114,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/firebase/analytics/FirebaseAnalytics;-><init>(Lcom/google/android/gms/measurement/internal/ek;)V
 
-    sput-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTj:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sput-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTB:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
     :cond_1
     :goto_0
@@ -133,7 +133,7 @@
 
     :cond_2
     :goto_1
-    sget-object p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTj:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sget-object p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTB:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
     return-object p0
 .end method
@@ -170,74 +170,23 @@
 
 
 # virtual methods
-.method public final b(Ljava/lang/String;Landroid/os/Bundle;)V
-    .locals 9
-
-    iget-boolean v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aCZ:Z
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTk:Lcom/google/android/gms/internal/measurement/lw;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v0, v1, p1, p2, v2}, Lcom/google/android/gms/internal/measurement/lw;->a(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;Z)V
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aCX:Lcom/google/android/gms/measurement/internal/ek;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
-
-    move-result-object v1
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x1
-
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fh;->vJ()Lcom/google/android/gms/common/util/e;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
-
-    move-result-wide v7
-
-    const-string v2, "app"
-
-    move-object v3, p1
-
-    move-object v4, p2
-
-    invoke-virtual/range {v1 .. v8}, Lcom/google/android/gms/measurement/internal/fr;->logEvent(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;ZZJ)V
-
-    return-void
-.end method
-
-.method public final dq(Ljava/lang/String;)V
+.method public final cc(Ljava/lang/String;)V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTk:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTC:Lcom/google/android/gms/internal/measurement/lw;
 
-    new-instance v1, Lcom/google/android/gms/internal/measurement/e;
-
-    invoke-direct {v1, v0, p1}, Lcom/google/android/gms/internal/measurement/e;-><init>(Lcom/google/android/gms/internal/measurement/lw;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/lw;->a(Lcom/google/android/gms/internal/measurement/lw$a;)V
+    invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/lw;->cc(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
@@ -253,13 +202,13 @@
 .method public final getFirebaseInstanceId()Ljava/lang/String;
     .locals 1
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AZ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AU()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ba()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->AV()V
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bc()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AX()Ljava/lang/String;
 
     move-result-object v0
 
@@ -269,11 +218,11 @@
 .method public final setCurrentScreen(Landroid/app/Activity;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aCZ:Z
+    iget-boolean v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aDr:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTk:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aTC:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/d;
 
@@ -290,24 +239,24 @@
 
     if-nez v0, :cond_1
 
-    iget-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vN()Lcom/google/android/gms/measurement/internal/dh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ek;->vL()Lcom/google/android/gms/measurement/internal/dh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGi:Lcom/google/android/gms/measurement/internal/dj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dh;->aGA:Lcom/google/android/gms/measurement/internal/dj;
 
     const-string p2, "setCurrentScreen must be called from the main thread"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->co(Ljava/lang/String;)V
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/measurement/internal/dj;->ck(Ljava/lang/String;)V
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vF()Lcom/google/android/gms/measurement/internal/gr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vD()Lcom/google/android/gms/measurement/internal/gr;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/analytics/a.smali b/com.discord/smali_classes2/com/google/firebase/analytics/a.smali
index 9cbadbed5e..821db046b7 100644
--- a/com.discord/smali_classes2/com/google/firebase/analytics/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/analytics/a.smali
@@ -6,14 +6,14 @@
 
 
 # instance fields
-.field private final synthetic aTy:Lcom/google/android/gms/internal/measurement/lw;
+.field private final synthetic aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/lw;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iput-object p1, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,7 +25,7 @@
 .method public final a(Lcom/google/android/gms/measurement/internal/fp;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -41,7 +41,7 @@
 .method public final beginAdUnitExposure(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/g;
 
@@ -55,7 +55,7 @@
 .method public final c(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
     .locals 8
 
-    iget-object v6, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v6, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v7, Lcom/google/android/gms/internal/measurement/u;
 
@@ -81,7 +81,7 @@
 .method public final clearConditionalUserProperty(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/c;
 
@@ -95,7 +95,7 @@
 .method public final endAdUnitExposure(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/f;
 
@@ -109,7 +109,7 @@
 .method public final f(Landroid/os/Bundle;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/t;
 
@@ -123,7 +123,7 @@
 .method public final generateEventId()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lw;->generateEventId()J
 
@@ -146,7 +146,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/jv;
 
@@ -185,7 +185,7 @@
 .method public final getCurrentScreenClass()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/jv;
 
@@ -209,7 +209,7 @@
 .method public final getCurrentScreenName()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/jv;
 
@@ -233,7 +233,7 @@
 .method public final getGmpAppId()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/jv;
 
@@ -257,7 +257,7 @@
 .method public final getMaxUserProperties(Ljava/lang/String;)I
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/jv;
 
@@ -312,7 +312,7 @@
         }
     .end annotation
 
-    iget-object v6, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v6, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v7, Lcom/google/android/gms/internal/measurement/jv;
 
@@ -419,7 +419,7 @@
 .method public final logEventInternal(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     const/4 v1, 0x1
 
@@ -431,7 +431,7 @@
 .method public final setDataCollectionEnabled(Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/q;
 
@@ -442,10 +442,10 @@
     return-void
 .end method
 
-.method public final yJ()Ljava/lang/String;
+.method public final yH()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTy:Lcom/google/android/gms/internal/measurement/lw;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->aTQ:Lcom/google/android/gms/internal/measurement/lw;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/jv;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/analytics/connector/b.smali b/com.discord/smali_classes2/com/google/firebase/analytics/connector/b.smali
index bba13be260..0c33661083 100644
--- a/com.discord/smali_classes2/com/google/firebase/analytics/connector/b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/analytics/connector/b.smali
@@ -6,13 +6,13 @@
 
 
 # static fields
-.field private static volatile aTm:Lcom/google/firebase/analytics/connector/a;
+.field private static volatile aTE:Lcom/google/firebase/analytics/connector/a;
 
 
 # instance fields
-.field private final aTn:Lcom/google/android/gms/measurement/AppMeasurement;
+.field private final aTF:Lcom/google/android/gms/measurement/AppMeasurement;
 
-.field final aTo:Ljava/util/Map;
+.field final aTG:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -32,13 +32,13 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/connector/b;->aTn:Lcom/google/android/gms/measurement/AppMeasurement;
+    iput-object p1, p0, Lcom/google/firebase/analytics/connector/b;->aTF:Lcom/google/android/gms/measurement/AppMeasurement;
 
     new-instance p1, Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-direct {p1}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/connector/b;->aTo:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/firebase/analytics/connector/b;->aTG:Ljava/util/Map;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/google/firebase/analytics/connector/b;->aTm:Lcom/google/firebase/analytics/connector/a;
+    sget-object v0, Lcom/google/firebase/analytics/connector/b;->aTE:Lcom/google/firebase/analytics/connector/a;
 
     if-nez v0, :cond_2
 
@@ -67,7 +67,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/analytics/connector/b;->aTm:Lcom/google/firebase/analytics/connector/a;
+    sget-object v1, Lcom/google/firebase/analytics/connector/b;->aTE:Lcom/google/firebase/analytics/connector/a;
 
     if-nez v1, :cond_1
 
@@ -77,7 +77,7 @@
 
     invoke-direct {v1, v2}, Landroid/os/Bundle;-><init>(I)V
 
-    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->AJ()Z
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->AF()Z
 
     move-result v2
 
@@ -85,9 +85,9 @@
 
     const-class v2, Lcom/google/firebase/a;
 
-    sget-object v3, Lcom/google/firebase/analytics/connector/d;->aTx:Ljava/util/concurrent/Executor;
+    sget-object v3, Lcom/google/firebase/analytics/connector/d;->aTP:Ljava/util/concurrent/Executor;
 
-    sget-object v4, Lcom/google/firebase/analytics/connector/c;->aTw:Lcom/google/firebase/a/b;
+    sget-object v4, Lcom/google/firebase/analytics/connector/c;->aTO:Lcom/google/firebase/a/b;
 
     invoke-interface {p2, v2, v3, v4}, Lcom/google/firebase/a/d;->a(Ljava/lang/Class;Ljava/util/concurrent/Executor;Lcom/google/firebase/a/b;)V
 
@@ -108,7 +108,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/firebase/analytics/connector/b;-><init>(Lcom/google/android/gms/measurement/AppMeasurement;)V
 
-    sput-object p0, Lcom/google/firebase/analytics/connector/b;->aTm:Lcom/google/firebase/analytics/connector/a;
+    sput-object p0, Lcom/google/firebase/analytics/connector/b;->aTE:Lcom/google/firebase/analytics/connector/a;
 
     :cond_1
     monitor-exit v0
@@ -126,7 +126,7 @@
 
     :cond_2
     :goto_0
-    sget-object p0, Lcom/google/firebase/analytics/connector/b;->aTm:Lcom/google/firebase/analytics/connector/a;
+    sget-object p0, Lcom/google/firebase/analytics/connector/b;->aTE:Lcom/google/firebase/analytics/connector/a;
 
     return-object p0
 .end method
@@ -145,26 +145,26 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/analytics/connector/b;->aTm:Lcom/google/firebase/analytics/connector/a;
+    sget-object v1, Lcom/google/firebase/analytics/connector/b;->aTE:Lcom/google/firebase/analytics/connector/a;
 
     check-cast v1, Lcom/google/firebase/analytics/connector/b;
 
-    iget-object v1, v1, Lcom/google/firebase/analytics/connector/b;->aTn:Lcom/google/android/gms/measurement/AppMeasurement;
+    iget-object v1, v1, Lcom/google/firebase/analytics/connector/b;->aTF:Lcom/google/android/gms/measurement/AppMeasurement;
 
-    iget-boolean v2, v1, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v2, v1, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v2, :cond_0
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v1, p0}, Lcom/google/android/gms/measurement/internal/gj;->setDataCollectionEnabled(Z)V
 
     goto :goto_0
 
     :cond_0
-    iget-object v1, v1, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v1
 
@@ -197,7 +197,7 @@
     invoke-direct {p3}, Landroid/os/Bundle;-><init>()V
 
     :cond_0
-    invoke-static {p1}, Lcom/google/firebase/analytics/connector/internal/b;->dr(Ljava/lang/String;)Z
+    invoke-static {p1}, Lcom/google/firebase/analytics/connector/internal/b;->dl(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -224,7 +224,7 @@
     return-void
 
     :cond_3
-    iget-object v0, p0, Lcom/google/firebase/analytics/connector/b;->aTn:Lcom/google/android/gms/measurement/AppMeasurement;
+    iget-object v0, p0, Lcom/google/firebase/analytics/connector/b;->aTF:Lcom/google/android/gms/measurement/AppMeasurement;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/measurement/AppMeasurement;->logEventInternal(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
@@ -234,7 +234,7 @@
 .method public final d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
     .locals 2
 
-    invoke-static {p1}, Lcom/google/firebase/analytics/connector/internal/b;->dr(Ljava/lang/String;)Z
+    invoke-static {p1}, Lcom/google/firebase/analytics/connector/internal/b;->dl(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -252,24 +252,24 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/firebase/analytics/connector/b;->aTn:Lcom/google/android/gms/measurement/AppMeasurement;
+    iget-object v0, p0, Lcom/google/firebase/analytics/connector/b;->aTF:Lcom/google/android/gms/measurement/AppMeasurement;
 
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aQ(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-boolean v1, v0, Lcom/google/android/gms/measurement/AppMeasurement;->aCZ:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/measurement/AppMeasurement;->aDr:Z
 
     if-eqz v1, :cond_2
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/AppMeasurement;->aCY:Lcom/google/android/gms/measurement/internal/gj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/AppMeasurement;->aDq:Lcom/google/android/gms/measurement/internal/gj;
 
     invoke-interface {v0, p1, p2, p3}, Lcom/google/android/gms/measurement/internal/gj;->c(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
 
     return-void
 
     :cond_2
-    iget-object v0, v0, Lcom/google/android/gms/measurement/AppMeasurement;->aCX:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/AppMeasurement;->aDp:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vC()Lcom/google/android/gms/measurement/internal/fr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->vA()Lcom/google/android/gms/measurement/internal/fr;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/analytics/connector/c.smali b/com.discord/smali_classes2/com/google/firebase/analytics/connector/c.smali
index 15a0e2b531..3f019de979 100644
--- a/com.discord/smali_classes2/com/google/firebase/analytics/connector/c.smali
+++ b/com.discord/smali_classes2/com/google/firebase/analytics/connector/c.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aTw:Lcom/google/firebase/a/b;
+.field static final aTO:Lcom/google/firebase/a/b;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/analytics/connector/c;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/c;->aTw:Lcom/google/firebase/a/b;
+    sput-object v0, Lcom/google/firebase/analytics/connector/c;->aTO:Lcom/google/firebase/a/b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/analytics/connector/d.smali b/com.discord/smali_classes2/com/google/firebase/analytics/connector/d.smali
index 8e5c1466d9..b306c756e5 100644
--- a/com.discord/smali_classes2/com/google/firebase/analytics/connector/d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/analytics/connector/d.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aTx:Ljava/util/concurrent/Executor;
+.field static final aTP:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/analytics/connector/d;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/d;->aTx:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/analytics/connector/d;->aTP:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/analytics/connector/internal/AnalyticsConnectorRegistrar.smali b/com.discord/smali_classes2/com/google/firebase/analytics/connector/internal/AnalyticsConnectorRegistrar.smali
index 13f12014f8..305a4c7667 100644
--- a/com.discord/smali_classes2/com/google/firebase/analytics/connector/internal/AnalyticsConnectorRegistrar.smali
+++ b/com.discord/smali_classes2/com/google/firebase/analytics/connector/internal/AnalyticsConnectorRegistrar.smali
@@ -67,7 +67,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/firebase/analytics/connector/internal/a;->aTp:Lcom/google/firebase/components/g;
+    sget-object v3, Lcom/google/firebase/analytics/connector/internal/a;->aTH:Lcom/google/firebase/components/g;
 
     invoke-virtual {v2, v3}, Lcom/google/firebase/components/b$a;->a(Lcom/google/firebase/components/g;)Lcom/google/firebase/components/b$a;
 
@@ -77,7 +77,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->AP()Lcom/google/firebase/components/b;
+    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->AL()Lcom/google/firebase/components/b;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/analytics/connector/internal/a.smali b/com.discord/smali_classes2/com/google/firebase/analytics/connector/internal/a.smali
index b44d62851c..08695a43e0 100644
--- a/com.discord/smali_classes2/com/google/firebase/analytics/connector/internal/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/analytics/connector/internal/a.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aTp:Lcom/google/firebase/components/g;
+.field static final aTH:Lcom/google/firebase/components/g;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/analytics/connector/internal/a;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/internal/a;->aTp:Lcom/google/firebase/components/g;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/a;->aTH:Lcom/google/firebase/components/g;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/analytics/connector/internal/b.smali b/com.discord/smali_classes2/com/google/firebase/analytics/connector/internal/b.smali
index b60534c5a5..aba774da79 100644
--- a/com.discord/smali_classes2/com/google/firebase/analytics/connector/internal/b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/analytics/connector/internal/b.smali
@@ -3,7 +3,7 @@
 
 
 # static fields
-.field private static final aTq:Ljava/util/Set;
+.field private static final aTI:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private static final aTr:Ljava/util/List;
+.field private static final aTJ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field private static final aTs:Ljava/util/List;
+.field private static final aTK:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private static final aTt:Ljava/util/List;
+.field private static final aTL:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field private static final aTu:Ljava/util/List;
+.field private static final aTM:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -53,7 +53,7 @@
     .end annotation
 .end field
 
-.field private static final aTv:Ljava/util/List;
+.field private static final aTN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -170,7 +170,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTq:Ljava/util/Set;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTI:Ljava/util/Set;
 
     new-array v0, v10, [Ljava/lang/String;
 
@@ -210,7 +210,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTr:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTJ:Ljava/util/List;
 
     new-array v0, v5, [Ljava/lang/String;
 
@@ -230,7 +230,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTs:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTK:Ljava/util/List;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -246,15 +246,15 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTt:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTL:Ljava/util/List;
 
     new-array v0, v4, [[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement$a;->aJk:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement$a;->aJC:[Ljava/lang/String;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement$a;->aJl:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement$a;->aJD:[Ljava/lang/String;
 
     aput-object v1, v0, v3
 
@@ -268,7 +268,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTu:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTM:Ljava/util/List;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -284,7 +284,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTv:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTN:Ljava/util/List;
 
     return-void
 .end method
@@ -349,7 +349,7 @@
     return v2
 
     :cond_3
-    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->aTu:Ljava/util/List;
+    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->aTM:Ljava/util/List;
 
     invoke-interface {p0, p1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -360,7 +360,7 @@
     return v3
 
     :cond_4
-    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->aTv:Ljava/util/List;
+    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->aTN:Ljava/util/List;
 
     invoke-interface {p0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -432,7 +432,7 @@
     return v0
 
     :cond_0
-    invoke-static {p0}, Lcom/google/firebase/analytics/connector/internal/b;->dr(Ljava/lang/String;)Z
+    invoke-static {p0}, Lcom/google/firebase/analytics/connector/internal/b;->dl(Ljava/lang/String;)Z
 
     move-result p1
 
@@ -448,7 +448,7 @@
     return v1
 
     :cond_2
-    sget-object p1, Lcom/google/firebase/analytics/connector/internal/b;->aTt:Ljava/util/List;
+    sget-object p1, Lcom/google/firebase/analytics/connector/internal/b;->aTL:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -572,7 +572,7 @@
 .method public static d(Ljava/lang/String;Landroid/os/Bundle;)Z
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTr:Ljava/util/List;
+    sget-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTJ:Ljava/util/List;
 
     invoke-interface {v0, p0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -587,7 +587,7 @@
     :cond_0
     if-eqz p1, :cond_2
 
-    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->aTt:Ljava/util/List;
+    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->aTL:Ljava/util/List;
 
     invoke-interface {p0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -620,10 +620,10 @@
     return p0
 .end method
 
-.method public static dr(Ljava/lang/String;)Z
+.method public static dl(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTs:Ljava/util/List;
+    sget-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aTK:Ljava/util/List;
 
     invoke-interface {v0, p0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/com/google/firebase/b.smali b/com.discord/smali_classes2/com/google/firebase/b.smali
index 07fe2ba889..6dd48f109c 100644
--- a/com.discord/smali_classes2/com/google/firebase/b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/b.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aSZ:Lcom/google/firebase/FirebaseApp;
+.field private final aTr:Lcom/google/firebase/FirebaseApp;
 
-.field private final aTa:Landroid/content/Context;
+.field private final aTs:Landroid/content/Context;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/b;->aSZ:Lcom/google/firebase/FirebaseApp;
+    iput-object p1, p0, Lcom/google/firebase/b;->aTr:Lcom/google/firebase/FirebaseApp;
 
-    iput-object p2, p0, Lcom/google/firebase/b;->aTa:Landroid/content/Context;
+    iput-object p2, p0, Lcom/google/firebase/b;->aTs:Landroid/content/Context;
 
     return-void
 .end method
@@ -30,9 +30,9 @@
 .method public final get()Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/b;->aSZ:Lcom/google/firebase/FirebaseApp;
+    iget-object v0, p0, Lcom/google/firebase/b;->aTr:Lcom/google/firebase/FirebaseApp;
 
-    iget-object v1, p0, Lcom/google/firebase/b;->aTa:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/firebase/b;->aTs:Landroid/content/Context;
 
     invoke-static {v0, v1}, Lcom/google/firebase/FirebaseApp;->a(Lcom/google/firebase/FirebaseApp;Landroid/content/Context;)Lcom/google/firebase/c/a;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/c.smali b/com.discord/smali_classes2/com/google/firebase/c.smali
index 03f0c23efb..fb87236ff3 100644
--- a/com.discord/smali_classes2/com/google/firebase/c.smali
+++ b/com.discord/smali_classes2/com/google/firebase/c.smali
@@ -4,19 +4,19 @@
 
 
 # instance fields
-.field public final aTd:Ljava/lang/String;
+.field private final aTA:Ljava/lang/String;
 
-.field private final aTe:Ljava/lang/String;
+.field public final aTv:Ljava/lang/String;
 
-.field private final aTf:Ljava/lang/String;
+.field private final aTw:Ljava/lang/String;
 
-.field public final aTg:Ljava/lang/String;
+.field private final aTx:Ljava/lang/String;
 
-.field private final aTh:Ljava/lang/String;
+.field public final aTy:Ljava/lang/String;
 
-.field private final aTi:Ljava/lang/String;
+.field private final aTz:Ljava/lang/String;
 
-.field private final pP:Ljava/lang/String;
+.field private final pO:Ljava/lang/String;
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p1}, Lcom/google/android/gms/common/util/n;->bb(Ljava/lang/String;)Z
+    invoke-static {p1}, Lcom/google/android/gms/common/util/n;->aW(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -35,19 +35,19 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/google/firebase/c;->aTd:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/c;->aTv:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/c;->pP:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/c;->pO:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/firebase/c;->aTe:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/firebase/c;->aTw:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/firebase/c;->aTf:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/firebase/c;->aTx:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/firebase/c;->aTg:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/firebase/c;->aTy:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/google/firebase/c;->aTh:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/firebase/c;->aTz:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/google/firebase/c;->aTi:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/firebase/c;->aTA:Ljava/lang/String;
 
     return-void
 .end method
@@ -137,9 +137,9 @@
     :cond_0
     check-cast p1, Lcom/google/firebase/c;
 
-    iget-object v0, p0, Lcom/google/firebase/c;->aTd:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->aTv:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/firebase/c;->aTd:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/firebase/c;->aTv:Ljava/lang/String;
 
     invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -147,9 +147,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/c;->pP:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->pO:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/firebase/c;->pP:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/firebase/c;->pO:Ljava/lang/String;
 
     invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -157,9 +157,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/c;->aTe:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->aTw:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/firebase/c;->aTe:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/firebase/c;->aTw:Ljava/lang/String;
 
     invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -167,9 +167,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/c;->aTf:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->aTx:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/firebase/c;->aTf:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/firebase/c;->aTx:Ljava/lang/String;
 
     invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -177,9 +177,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/c;->aTg:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->aTy:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/firebase/c;->aTg:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/firebase/c;->aTy:Ljava/lang/String;
 
     invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -187,9 +187,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/c;->aTh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->aTz:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/firebase/c;->aTh:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/firebase/c;->aTz:Ljava/lang/String;
 
     invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -197,9 +197,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/c;->aTi:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->aTA:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/firebase/c;->aTi:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/firebase/c;->aTA:Ljava/lang/String;
 
     invoke-static {v0, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -222,43 +222,43 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aTd:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aTv:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->pP:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->pO:Ljava/lang/String;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aTe:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aTw:Ljava/lang/String;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aTf:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aTx:Ljava/lang/String;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aTg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aTy:Ljava/lang/String;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aTh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aTz:Ljava/lang/String;
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aTi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aTA:Ljava/lang/String;
 
     const/4 v2, 0x6
 
@@ -278,7 +278,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aTd:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aTv:Ljava/lang/String;
 
     const-string v2, "applicationId"
 
@@ -286,7 +286,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->pP:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->pO:Ljava/lang/String;
 
     const-string v2, "apiKey"
 
@@ -294,7 +294,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aTe:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aTw:Ljava/lang/String;
 
     const-string v2, "databaseUrl"
 
@@ -302,7 +302,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aTg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aTy:Ljava/lang/String;
 
     const-string v2, "gcmSenderId"
 
@@ -310,7 +310,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aTh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aTz:Ljava/lang/String;
 
     const-string v2, "storageBucket"
 
@@ -318,7 +318,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aTi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aTA:Ljava/lang/String;
 
     const-string v2, "projectId"
 
diff --git a/com.discord/smali_classes2/com/google/firebase/c/a.smali b/com.discord/smali_classes2/com/google/firebase/c/a.smali
index 17005ade9c..d522e4f83f 100644
--- a/com.discord/smali_classes2/com/google/firebase/c/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/c/a.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final aVV:Lcom/google/firebase/a/c;
+.field private final aWn:Lcom/google/firebase/a/c;
 
-.field public final aVW:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field public final aWo:Ljava/util/concurrent/atomic/AtomicBoolean;
 
 .field private final applicationContext:Landroid/content/Context;
 
@@ -65,22 +65,22 @@
 
     iput-object p1, p0, Lcom/google/firebase/c/a;->sharedPreferences:Landroid/content/SharedPreferences;
 
-    iput-object p3, p0, Lcom/google/firebase/c/a;->aVV:Lcom/google/firebase/a/c;
+    iput-object p3, p0, Lcom/google/firebase/c/a;->aWn:Lcom/google/firebase/a/c;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    invoke-direct {p0}, Lcom/google/firebase/c/a;->Bu()Z
+    invoke-direct {p0}, Lcom/google/firebase/c/a;->Bo()Z
 
     move-result p2
 
     invoke-direct {p1, p2}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
-    iput-object p1, p0, Lcom/google/firebase/c/a;->aVW:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lcom/google/firebase/c/a;->aWo:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-void
 .end method
 
-.method private Bu()Z
+.method private Bo()Z
     .locals 5
 
     iget-object v0, p0, Lcom/google/firebase/c/a;->sharedPreferences:Landroid/content/SharedPreferences;
diff --git a/com.discord/smali_classes2/com/google/firebase/components/b$a.smali b/com.discord/smali_classes2/com/google/firebase/components/b$a.smali
index 76aedbfdb4..45154be30f 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/b$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/b$a.smali
@@ -24,7 +24,17 @@
 
 
 # instance fields
-.field private final aTA:Ljava/util/Set;
+.field private final aTR:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/Class<",
+            "-TT;>;>;"
+        }
+    .end annotation
+.end field
+
+.field private final aTS:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -34,9 +44,9 @@
     .end annotation
 .end field
 
-.field private aTB:I
+.field private aTT:I
 
-.field private aTC:Lcom/google/firebase/components/g;
+.field private aTU:Lcom/google/firebase/components/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/firebase/components/g<",
@@ -45,7 +55,7 @@
     .end annotation
 .end field
 
-.field private aTD:Ljava/util/Set;
+.field private aTV:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -55,16 +65,6 @@
     .end annotation
 .end field
 
-.field private final aTz:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ljava/lang/Class<",
-            "-TT;>;>;"
-        }
-    .end annotation
-.end field
-
 .field type:I
 
 
@@ -90,17 +90,17 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/components/b$a;->aTz:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/b$a;->aTR:Ljava/util/Set;
 
     new-instance v0, Ljava/util/HashSet;
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/components/b$a;->aTA:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/b$a;->aTS:Ljava/util/Set;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/firebase/components/b$a;->aTB:I
+    iput v0, p0, Lcom/google/firebase/components/b$a;->aTT:I
 
     iput v0, p0, Lcom/google/firebase/components/b$a;->type:I
 
@@ -108,13 +108,13 @@
 
     invoke-direct {v1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v1, p0, Lcom/google/firebase/components/b$a;->aTD:Ljava/util/Set;
+    iput-object v1, p0, Lcom/google/firebase/components/b$a;->aTV:Ljava/util/Set;
 
     const-string v1, "Null interface"
 
     invoke-static {p1, v1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/google/firebase/components/b$a;->aTz:Ljava/util/Set;
+    iget-object v2, p0, Lcom/google/firebase/components/b$a;->aTR:Ljava/util/Set;
 
     invoke-interface {v2, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -132,7 +132,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/firebase/components/b$a;->aTz:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/firebase/components/b$a;->aTR:Ljava/util/Set;
 
     invoke-static {p1, p2}, Ljava/util/Collections;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
 
@@ -157,7 +157,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aTz:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aTR:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -174,7 +174,7 @@
 
 
 # virtual methods
-.method public final AP()Lcom/google/firebase/components/b;
+.method public final AL()Lcom/google/firebase/components/b;
     .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -184,7 +184,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aTC:Lcom/google/firebase/components/g;
+    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aTU:Lcom/google/firebase/components/g;
 
     if-eqz v0, :cond_0
 
@@ -204,23 +204,23 @@
 
     new-instance v3, Ljava/util/HashSet;
 
-    iget-object v1, p0, Lcom/google/firebase/components/b$a;->aTz:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/b$a;->aTR:Ljava/util/Set;
 
     invoke-direct {v3, v1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
     new-instance v4, Ljava/util/HashSet;
 
-    iget-object v1, p0, Lcom/google/firebase/components/b$a;->aTA:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/b$a;->aTS:Ljava/util/Set;
 
     invoke-direct {v4, v1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    iget v5, p0, Lcom/google/firebase/components/b$a;->aTB:I
+    iget v5, p0, Lcom/google/firebase/components/b$a;->aTT:I
 
     iget v6, p0, Lcom/google/firebase/components/b$a;->type:I
 
-    iget-object v7, p0, Lcom/google/firebase/components/b$a;->aTC:Lcom/google/firebase/components/g;
+    iget-object v7, p0, Lcom/google/firebase/components/b$a;->aTU:Lcom/google/firebase/components/g;
 
-    iget-object v8, p0, Lcom/google/firebase/components/b$a;->aTD:Ljava/util/Set;
+    iget-object v8, p0, Lcom/google/firebase/components/b$a;->aTV:Ljava/util/Set;
 
     const/4 v9, 0x0
 
@@ -251,7 +251,7 @@
 
     check-cast p1, Lcom/google/firebase/components/g;
 
-    iput-object p1, p0, Lcom/google/firebase/components/b$a;->aTC:Lcom/google/firebase/components/g;
+    iput-object p1, p0, Lcom/google/firebase/components/b$a;->aTU:Lcom/google/firebase/components/g;
 
     return-object p0
 .end method
@@ -272,11 +272,11 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p1, Lcom/google/firebase/components/n;->aTS:Ljava/lang/Class;
+    iget-object v0, p1, Lcom/google/firebase/components/n;->aUk:Ljava/lang/Class;
 
     invoke-direct {p0, v0}, Lcom/google/firebase/components/b$a;->D(Ljava/lang/Class;)V
 
-    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aTA:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aTS:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -293,7 +293,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/firebase/components/b$a;->aTB:I
+    iget v0, p0, Lcom/google/firebase/components/b$a;->aTT:I
 
     if-nez v0, :cond_0
 
@@ -309,7 +309,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
-    iput p1, p0, Lcom/google/firebase/components/b$a;->aTB:I
+    iput p1, p0, Lcom/google/firebase/components/b$a;->aTT:I
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/components/b.smali b/com.discord/smali_classes2/com/google/firebase/components/b.smali
index 7d61824fae..3b1ead757f 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/b.smali
@@ -21,7 +21,17 @@
 
 
 # instance fields
-.field final aTA:Ljava/util/Set;
+.field final aTR:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/Class<",
+            "-TT;>;>;"
+        }
+    .end annotation
+.end field
+
+.field final aTS:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -31,9 +41,9 @@
     .end annotation
 .end field
 
-.field private final aTB:I
+.field private final aTT:I
 
-.field final aTC:Lcom/google/firebase/components/g;
+.field final aTU:Lcom/google/firebase/components/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/firebase/components/g<",
@@ -42,7 +52,7 @@
     .end annotation
 .end field
 
-.field final aTD:Ljava/util/Set;
+.field final aTV:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -52,16 +62,6 @@
     .end annotation
 .end field
 
-.field final aTz:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ljava/lang/Class<",
-            "-TT;>;>;"
-        }
-    .end annotation
-.end field
-
 .field private final type:I
 
 
@@ -91,25 +91,25 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/components/b;->aTz:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/b;->aTR:Ljava/util/Set;
 
     invoke-static {p2}, Ljava/util/Collections;->unmodifiableSet(Ljava/util/Set;)Ljava/util/Set;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/components/b;->aTA:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/b;->aTS:Ljava/util/Set;
 
-    iput p3, p0, Lcom/google/firebase/components/b;->aTB:I
+    iput p3, p0, Lcom/google/firebase/components/b;->aTT:I
 
     iput p4, p0, Lcom/google/firebase/components/b;->type:I
 
-    iput-object p5, p0, Lcom/google/firebase/components/b;->aTC:Lcom/google/firebase/components/g;
+    iput-object p5, p0, Lcom/google/firebase/components/b;->aTU:Lcom/google/firebase/components/g;
 
     invoke-static {p6}, Ljava/util/Collections;->unmodifiableSet(Ljava/util/Set;)Ljava/util/Set;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/components/b;->aTD:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/b;->aTV:Ljava/util/Set;
 
     return-void
 .end method
@@ -205,7 +205,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/google/firebase/components/b$a;->AP()Lcom/google/firebase/components/b;
+    invoke-virtual {p0}, Lcom/google/firebase/components/b$a;->AL()Lcom/google/firebase/components/b;
 
     move-result-object p0
 
@@ -243,7 +243,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/google/firebase/components/b$a;->AP()Lcom/google/firebase/components/b;
+    invoke-virtual {p0}, Lcom/google/firebase/components/b$a;->AL()Lcom/google/firebase/components/b;
 
     move-result-object p0
 
@@ -252,10 +252,10 @@
 
 
 # virtual methods
-.method public final AM()Z
+.method public final AI()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/firebase/components/b;->aTB:I
+    iget v0, p0, Lcom/google/firebase/components/b;->aTT:I
 
     const/4 v1, 0x1
 
@@ -269,10 +269,10 @@
     return v0
 .end method
 
-.method public final AN()Z
+.method public final AJ()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/firebase/components/b;->aTB:I
+    iget v0, p0, Lcom/google/firebase/components/b;->aTT:I
 
     const/4 v1, 0x2
 
@@ -288,7 +288,7 @@
     return v0
 .end method
 
-.method public final AO()Z
+.method public final AK()Z
     .locals 1
 
     iget v0, p0, Lcom/google/firebase/components/b;->type:I
@@ -314,7 +314,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/firebase/components/b;->aTz:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/b;->aTR:Ljava/util/Set;
 
     invoke-interface {v1}, Ljava/util/Set;->toArray()[Ljava/lang/Object;
 
@@ -330,7 +330,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/google/firebase/components/b;->aTB:I
+    iget v1, p0, Lcom/google/firebase/components/b;->aTT:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -346,7 +346,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/firebase/components/b;->aTA:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/b;->aTS:Ljava/util/Set;
 
     invoke-interface {v1}, Ljava/util/Set;->toArray()[Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/components/c.smali b/com.discord/smali_classes2/com/google/firebase/components/c.smali
index 0b6d4c70b8..74b50f5872 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/c.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/c.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aTE:Ljava/lang/Object;
+.field private final aTW:Ljava/lang/Object;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/components/c;->aTE:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/components/c;->aTW:Ljava/lang/Object;
 
     return-void
 .end method
@@ -36,7 +36,7 @@
 .method public final a(Lcom/google/firebase/components/e;)Ljava/lang/Object;
     .locals 0
 
-    iget-object p1, p0, Lcom/google/firebase/components/c;->aTE:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/firebase/components/c;->aTW:Ljava/lang/Object;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/components/d.smali b/com.discord/smali_classes2/com/google/firebase/components/d.smali
index 3d0700122b..63e27a8f57 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/d.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aTE:Ljava/lang/Object;
+.field private final aTW:Ljava/lang/Object;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/components/d;->aTE:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/components/d;->aTW:Ljava/lang/Object;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final a(Lcom/google/firebase/components/e;)Ljava/lang/Object;
     .locals 0
 
-    iget-object p1, p0, Lcom/google/firebase/components/d;->aTE:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/firebase/components/d;->aTW:Ljava/lang/Object;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/components/f.smali b/com.discord/smali_classes2/com/google/firebase/components/f.smali
index c5f1e8a851..575e4e9fa2 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/f.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/f.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field public final aTF:Ljava/lang/Object;
+.field public final aTX:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field public final aTG:Lcom/google/firebase/components/f$b;
+.field public final aTY:Lcom/google/firebase/components/f$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/firebase/components/f$b<",
@@ -53,9 +53,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/components/f;->aTF:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/components/f;->aTX:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/google/firebase/components/f;->aTG:Lcom/google/firebase/components/f$b;
+    iput-object p2, p0, Lcom/google/firebase/components/f;->aTY:Lcom/google/firebase/components/f$b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/components/i.smali b/com.discord/smali_classes2/com/google/firebase/components/i.smali
index 680a6cb349..d1c70595f0 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/i.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/i.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final aTH:Lcom/google/firebase/b/a;
+.field private static final aTZ:Lcom/google/firebase/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/firebase/b/a<",
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field private final aTI:Ljava/util/Map;
+.field private final aUa:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field private final aTJ:Ljava/util/Map;
+.field private final aUb:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field private final aTK:Ljava/util/Map;
+.field private final aUc:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -54,18 +54,18 @@
     .end annotation
 .end field
 
-.field private final aTL:Lcom/google/firebase/components/q;
+.field private final aUd:Lcom/google/firebase/components/q;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/firebase/components/l;->AS()Lcom/google/firebase/b/a;
+    invoke-static {}, Lcom/google/firebase/components/l;->AO()Lcom/google/firebase/b/a;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/components/i;->aTH:Lcom/google/firebase/b/a;
+    sput-object v0, Lcom/google/firebase/components/i;->aTZ:Lcom/google/firebase/b/a;
 
     return-void
 .end method
@@ -90,31 +90,31 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/components/i;->aTI:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/components/i;->aUa:Ljava/util/Map;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/components/i;->aTJ:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/components/i;->aUb:Ljava/util/Map;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/components/i;->aTK:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/components/i;->aUc:Ljava/util/Map;
 
     new-instance v0, Lcom/google/firebase/components/q;
 
     invoke-direct {v0, p1}, Lcom/google/firebase/components/q;-><init>(Ljava/util/concurrent/Executor;)V
 
-    iput-object v0, p0, Lcom/google/firebase/components/i;->aTL:Lcom/google/firebase/components/q;
+    iput-object v0, p0, Lcom/google/firebase/components/i;->aUd:Lcom/google/firebase/components/q;
 
     new-instance p1, Ljava/util/ArrayList;
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v0, p0, Lcom/google/firebase/components/i;->aTL:Lcom/google/firebase/components/q;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aUd:Lcom/google/firebase/components/q;
 
     const-class v1, Lcom/google/firebase/components/q;
 
@@ -195,24 +195,24 @@
 
     invoke-direct {p3, v0}, Lcom/google/firebase/components/s;-><init>(Lcom/google/firebase/b/a;)V
 
-    iget-object v0, p0, Lcom/google/firebase/components/i;->aTI:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aUa:Ljava/util/Map;
 
     invoke-interface {v0, p2, p3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_1
 
     :cond_1
-    invoke-direct {p0}, Lcom/google/firebase/components/i;->AQ()V
+    invoke-direct {p0}, Lcom/google/firebase/components/i;->AM()V
 
-    invoke-direct {p0}, Lcom/google/firebase/components/i;->AR()V
+    invoke-direct {p0}, Lcom/google/firebase/components/i;->AN()V
 
     return-void
 .end method
 
-.method private AQ()V
+.method private AM()V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/firebase/components/i;->aTI:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aUa:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -241,7 +241,7 @@
 
     check-cast v2, Lcom/google/firebase/components/b;
 
-    invoke-virtual {v2}, Lcom/google/firebase/components/b;->AO()Z
+    invoke-virtual {v2}, Lcom/google/firebase/components/b;->AK()Z
 
     move-result v3
 
@@ -253,7 +253,7 @@
 
     check-cast v1, Lcom/google/firebase/components/s;
 
-    iget-object v2, v2, Lcom/google/firebase/components/b;->aTz:Ljava/util/Set;
+    iget-object v2, v2, Lcom/google/firebase/components/b;->aTR:Ljava/util/Set;
 
     invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -272,14 +272,14 @@
 
     check-cast v3, Ljava/lang/Class;
 
-    iget-object v4, p0, Lcom/google/firebase/components/i;->aTJ:Ljava/util/Map;
+    iget-object v4, p0, Lcom/google/firebase/components/i;->aUb:Ljava/util/Map;
 
     invoke-interface {v4, v3, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/firebase/components/i;->aTI:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aUa:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -302,7 +302,7 @@
 
     check-cast v1, Lcom/google/firebase/components/b;
 
-    iget-object v2, v1, Lcom/google/firebase/components/b;->aTA:Ljava/util/Set;
+    iget-object v2, v1, Lcom/google/firebase/components/b;->aTS:Ljava/util/Set;
 
     invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -340,9 +340,9 @@
     :goto_2
     if-eqz v4, :cond_3
 
-    iget-object v4, p0, Lcom/google/firebase/components/i;->aTJ:Ljava/util/Map;
+    iget-object v4, p0, Lcom/google/firebase/components/i;->aUb:Ljava/util/Map;
 
-    iget-object v7, v3, Lcom/google/firebase/components/n;->aTS:Ljava/lang/Class;
+    iget-object v7, v3, Lcom/google/firebase/components/n;->aUk:Ljava/lang/Class;
 
     invoke-interface {v4, v7}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -361,7 +361,7 @@
 
     aput-object v1, v2, v5
 
-    iget-object v1, v3, Lcom/google/firebase/components/n;->aTS:Ljava/lang/Class;
+    iget-object v1, v3, Lcom/google/firebase/components/n;->aUk:Ljava/lang/Class;
 
     aput-object v1, v2, v6
 
@@ -379,14 +379,14 @@
     return-void
 .end method
 
-.method private AR()V
+.method private AN()V
     .locals 6
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/firebase/components/i;->aTI:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/firebase/components/i;->aUa:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -415,7 +415,7 @@
 
     check-cast v3, Lcom/google/firebase/components/b;
 
-    invoke-virtual {v3}, Lcom/google/firebase/components/b;->AO()Z
+    invoke-virtual {v3}, Lcom/google/firebase/components/b;->AK()Z
 
     move-result v4
 
@@ -427,7 +427,7 @@
 
     check-cast v2, Lcom/google/firebase/components/s;
 
-    iget-object v3, v3, Lcom/google/firebase/components/b;->aTz:Ljava/util/Set;
+    iget-object v3, v3, Lcom/google/firebase/components/b;->aTR:Ljava/util/Set;
 
     invoke-interface {v3}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -497,7 +497,7 @@
 
     check-cast v2, Ljava/util/Set;
 
-    iget-object v3, p0, Lcom/google/firebase/components/i;->aTK:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/firebase/components/i;->aUc:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -524,7 +524,7 @@
 .method static synthetic a(Lcom/google/firebase/components/i;Lcom/google/firebase/components/b;)Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p1, Lcom/google/firebase/components/b;->aTC:Lcom/google/firebase/components/g;
+    iget-object v0, p1, Lcom/google/firebase/components/b;->aTU:Lcom/google/firebase/components/g;
 
     new-instance v1, Lcom/google/firebase/components/u;
 
@@ -617,7 +617,7 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/firebase/components/i;->aTJ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aUb:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -643,7 +643,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/i;->aTK:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aUc:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -656,15 +656,15 @@
     return-object p1
 
     :cond_0
-    sget-object p1, Lcom/google/firebase/components/i;->aTH:Lcom/google/firebase/b/a;
+    sget-object p1, Lcom/google/firebase/components/i;->aTZ:Lcom/google/firebase/b/a;
 
     return-object p1
 .end method
 
-.method public final W(Z)V
+.method public final U(Z)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/components/i;->aTI:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aUa:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -700,13 +700,13 @@
 
     check-cast v1, Lcom/google/firebase/components/s;
 
-    invoke-virtual {v2}, Lcom/google/firebase/components/b;->AM()Z
+    invoke-virtual {v2}, Lcom/google/firebase/components/b;->AI()Z
 
     move-result v3
 
     if-nez v3, :cond_1
 
-    invoke-virtual {v2}, Lcom/google/firebase/components/b;->AN()Z
+    invoke-virtual {v2}, Lcom/google/firebase/components/b;->AJ()Z
 
     move-result v2
 
@@ -720,9 +720,9 @@
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/google/firebase/components/i;->aTL:Lcom/google/firebase/components/q;
+    iget-object p1, p0, Lcom/google/firebase/components/i;->aUd:Lcom/google/firebase/components/q;
 
-    invoke-virtual {p1}, Lcom/google/firebase/components/q;->AU()V
+    invoke-virtual {p1}, Lcom/google/firebase/components/q;->AQ()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/components/j.smali b/com.discord/smali_classes2/com/google/firebase/components/j.smali
index 41b1de6885..7665e4cb4f 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/j.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/j.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aTM:Lcom/google/firebase/components/i;
+.field private final aUe:Lcom/google/firebase/components/i;
 
-.field private final aTN:Lcom/google/firebase/components/b;
+.field private final aUf:Lcom/google/firebase/components/b;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/components/j;->aTM:Lcom/google/firebase/components/i;
+    iput-object p1, p0, Lcom/google/firebase/components/j;->aUe:Lcom/google/firebase/components/i;
 
-    iput-object p2, p0, Lcom/google/firebase/components/j;->aTN:Lcom/google/firebase/components/b;
+    iput-object p2, p0, Lcom/google/firebase/components/j;->aUf:Lcom/google/firebase/components/b;
 
     return-void
 .end method
@@ -30,9 +30,9 @@
 .method public final get()Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/components/j;->aTM:Lcom/google/firebase/components/i;
+    iget-object v0, p0, Lcom/google/firebase/components/j;->aUe:Lcom/google/firebase/components/i;
 
-    iget-object v1, p0, Lcom/google/firebase/components/j;->aTN:Lcom/google/firebase/components/b;
+    iget-object v1, p0, Lcom/google/firebase/components/j;->aUf:Lcom/google/firebase/components/b;
 
     invoke-static {v0, v1}, Lcom/google/firebase/components/i;->a(Lcom/google/firebase/components/i;Lcom/google/firebase/components/b;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/components/k.smali b/com.discord/smali_classes2/com/google/firebase/components/k.smali
index cea98348ca..fe1531f6e2 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/k.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/k.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aTO:Ljava/util/Set;
+.field private final aUg:Ljava/util/Set;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/components/k;->aTO:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/k;->aUg:Ljava/util/Set;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/components/k;->aTO:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/k;->aUg:Ljava/util/Set;
 
     invoke-static {v0}, Lcom/google/firebase/components/i;->b(Ljava/util/Set;)Ljava/util/Set;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/components/l.smali b/com.discord/smali_classes2/com/google/firebase/components/l.smali
index 044ff95d62..9ac7550f20 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/l.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/l.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aTP:Lcom/google/firebase/components/l;
+.field private static final aUh:Lcom/google/firebase/components/l;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/components/l;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/components/l;->aTP:Lcom/google/firebase/components/l;
+    sput-object v0, Lcom/google/firebase/components/l;->aUh:Lcom/google/firebase/components/l;
 
     return-void
 .end method
@@ -31,10 +31,10 @@
     return-void
 .end method
 
-.method public static AS()Lcom/google/firebase/b/a;
+.method public static AO()Lcom/google/firebase/b/a;
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/components/l;->aTP:Lcom/google/firebase/components/l;
+    sget-object v0, Lcom/google/firebase/components/l;->aUh:Lcom/google/firebase/components/l;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/components/m$a.smali b/com.discord/smali_classes2/com/google/firebase/components/m$a.smali
index c08138d72a..c7e9575bc7 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/m$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/m$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final aTA:Ljava/util/Set;
+.field final aTS:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field final aTQ:Lcom/google/firebase/components/b;
+.field final aUi:Lcom/google/firebase/components/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/firebase/components/b<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field final aTR:Ljava/util/Set;
+.field final aUj:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -62,15 +62,15 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/components/m$a;->aTA:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/m$a;->aTS:Ljava/util/Set;
 
     new-instance v0, Ljava/util/HashSet;
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/components/m$a;->aTR:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/m$a;->aUj:Ljava/util/Set;
 
-    iput-object p1, p0, Lcom/google/firebase/components/m$a;->aTQ:Lcom/google/firebase/components/b;
+    iput-object p1, p0, Lcom/google/firebase/components/m$a;->aUi:Lcom/google/firebase/components/b;
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 .method final isRoot()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/components/m$a;->aTR:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/m$a;->aUj:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->isEmpty()Z
 
diff --git a/com.discord/smali_classes2/com/google/firebase/components/m$b.smali b/com.discord/smali_classes2/com/google/firebase/components/m$b.smali
index 31fcaa8410..4c5214521d 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/m$b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/m$b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final aTS:Ljava/lang/Class;
+.field private final aUk:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field final aTT:Z
+.field final aUl:Z
 
 
 # direct methods
@@ -40,9 +40,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/components/m$b;->aTS:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/firebase/components/m$b;->aUk:Ljava/lang/Class;
 
-    iput-boolean p2, p0, Lcom/google/firebase/components/m$b;->aTT:Z
+    iput-boolean p2, p0, Lcom/google/firebase/components/m$b;->aUl:Z
 
     return-void
 .end method
@@ -68,9 +68,9 @@
 
     check-cast p1, Lcom/google/firebase/components/m$b;
 
-    iget-object v0, p1, Lcom/google/firebase/components/m$b;->aTS:Ljava/lang/Class;
+    iget-object v0, p1, Lcom/google/firebase/components/m$b;->aUk:Ljava/lang/Class;
 
-    iget-object v2, p0, Lcom/google/firebase/components/m$b;->aTS:Ljava/lang/Class;
+    iget-object v2, p0, Lcom/google/firebase/components/m$b;->aUk:Ljava/lang/Class;
 
     invoke-virtual {v0, v2}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -78,9 +78,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-boolean p1, p1, Lcom/google/firebase/components/m$b;->aTT:Z
+    iget-boolean p1, p1, Lcom/google/firebase/components/m$b;->aUl:Z
 
-    iget-boolean v0, p0, Lcom/google/firebase/components/m$b;->aTT:Z
+    iget-boolean v0, p0, Lcom/google/firebase/components/m$b;->aUl:Z
 
     if-ne p1, v0, :cond_0
 
@@ -95,7 +95,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/components/m$b;->aTS:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/firebase/components/m$b;->aUk:Ljava/lang/Class;
 
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
@@ -107,7 +107,7 @@
 
     mul-int v0, v0, v1
 
-    iget-boolean v1, p0, Lcom/google/firebase/components/m$b;->aTT:Z
+    iget-boolean v1, p0, Lcom/google/firebase/components/m$b;->aUl:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/components/m.smali b/com.discord/smali_classes2/com/google/firebase/components/m.smali
index 80068ec3c4..5b4d96a63e 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/m.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/m.smali
@@ -55,7 +55,7 @@
 
     invoke-direct {v4, v2}, Lcom/google/firebase/components/m$a;-><init>(Lcom/google/firebase/components/b;)V
 
-    iget-object v5, v2, Lcom/google/firebase/components/b;->aTz:Ljava/util/Set;
+    iget-object v5, v2, Lcom/google/firebase/components/b;->aTR:Ljava/util/Set;
 
     invoke-interface {v5}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -76,7 +76,7 @@
 
     new-instance v7, Lcom/google/firebase/components/m$b;
 
-    invoke-virtual {v2}, Lcom/google/firebase/components/b;->AO()Z
+    invoke-virtual {v2}, Lcom/google/firebase/components/b;->AK()Z
 
     move-result v8
 
@@ -111,7 +111,7 @@
 
     if-nez v10, :cond_3
 
-    iget-boolean v7, v7, Lcom/google/firebase/components/m$b;->aTT:Z
+    iget-boolean v7, v7, Lcom/google/firebase/components/m$b;->aUl:Z
 
     if-eqz v7, :cond_2
 
@@ -179,9 +179,9 @@
 
     check-cast v4, Lcom/google/firebase/components/m$a;
 
-    iget-object v5, v4, Lcom/google/firebase/components/m$a;->aTQ:Lcom/google/firebase/components/b;
+    iget-object v5, v4, Lcom/google/firebase/components/m$a;->aUi:Lcom/google/firebase/components/b;
 
-    iget-object v5, v5, Lcom/google/firebase/components/b;->aTA:Ljava/util/Set;
+    iget-object v5, v5, Lcom/google/firebase/components/b;->aTS:Ljava/util/Set;
 
     invoke-interface {v5}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -200,7 +200,7 @@
 
     check-cast v6, Lcom/google/firebase/components/n;
 
-    invoke-virtual {v6}, Lcom/google/firebase/components/n;->AT()Z
+    invoke-virtual {v6}, Lcom/google/firebase/components/n;->AP()Z
 
     move-result v7
 
@@ -208,7 +208,7 @@
 
     new-instance v7, Lcom/google/firebase/components/m$b;
 
-    iget-object v8, v6, Lcom/google/firebase/components/n;->aTS:Ljava/lang/Class;
+    iget-object v8, v6, Lcom/google/firebase/components/n;->aUk:Ljava/lang/Class;
 
     invoke-virtual {v6}, Lcom/google/firebase/components/n;->isSet()Z
 
@@ -241,11 +241,11 @@
 
     check-cast v7, Lcom/google/firebase/components/m$a;
 
-    iget-object v8, v4, Lcom/google/firebase/components/m$a;->aTA:Ljava/util/Set;
+    iget-object v8, v4, Lcom/google/firebase/components/m$a;->aTS:Ljava/util/Set;
 
     invoke-interface {v8, v7}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    iget-object v7, v7, Lcom/google/firebase/components/m$a;->aTR:Ljava/util/Set;
+    iget-object v7, v7, Lcom/google/firebase/components/m$a;->aUj:Ljava/util/Set;
 
     invoke-interface {v7, v4}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -307,7 +307,7 @@
 
     add-int/lit8 v3, v3, 0x1
 
-    iget-object v4, v2, Lcom/google/firebase/components/m$a;->aTA:Ljava/util/Set;
+    iget-object v4, v2, Lcom/google/firebase/components/m$a;->aTS:Ljava/util/Set;
 
     invoke-interface {v4}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -327,7 +327,7 @@
 
     check-cast v5, Lcom/google/firebase/components/m$a;
 
-    iget-object v6, v5, Lcom/google/firebase/components/m$a;->aTR:Ljava/util/Set;
+    iget-object v6, v5, Lcom/google/firebase/components/m$a;->aUj:Ljava/util/Set;
 
     invoke-interface {v6, v2}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
@@ -379,7 +379,7 @@
 
     if-nez v2, :cond_e
 
-    iget-object v2, v1, Lcom/google/firebase/components/m$a;->aTA:Ljava/util/Set;
+    iget-object v2, v1, Lcom/google/firebase/components/m$a;->aTS:Ljava/util/Set;
 
     invoke-interface {v2}, Ljava/util/Set;->isEmpty()Z
 
@@ -387,7 +387,7 @@
 
     if-nez v2, :cond_e
 
-    iget-object v1, v1, Lcom/google/firebase/components/m$a;->aTQ:Lcom/google/firebase/components/b;
+    iget-object v1, v1, Lcom/google/firebase/components/m$a;->aUi:Lcom/google/firebase/components/b;
 
     invoke-interface {p0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/com/google/firebase/components/n.smali b/com.discord/smali_classes2/com/google/firebase/components/n.smali
index 77d2a01a7c..5186eceebb 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/n.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/n.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final aTS:Ljava/lang/Class;
+.field final aUk:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private final aTU:I
+.field private final aUm:I
 
 .field final type:I
 
@@ -39,13 +39,13 @@
 
     check-cast p1, Ljava/lang/Class;
 
-    iput-object p1, p0, Lcom/google/firebase/components/n;->aTS:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/firebase/components/n;->aUk:Ljava/lang/Class;
 
     iput p2, p0, Lcom/google/firebase/components/n;->type:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/firebase/components/n;->aTU:I
+    iput p1, p0, Lcom/google/firebase/components/n;->aUm:I
 
     return-void
 .end method
@@ -72,10 +72,10 @@
 
 
 # virtual methods
-.method public final AT()Z
+.method public final AP()Z
     .locals 1
 
-    iget v0, p0, Lcom/google/firebase/components/n;->aTU:I
+    iget v0, p0, Lcom/google/firebase/components/n;->aUm:I
 
     if-nez v0, :cond_0
 
@@ -100,9 +100,9 @@
 
     check-cast p1, Lcom/google/firebase/components/n;
 
-    iget-object v0, p0, Lcom/google/firebase/components/n;->aTS:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/firebase/components/n;->aUk:Ljava/lang/Class;
 
-    iget-object v2, p1, Lcom/google/firebase/components/n;->aTS:Ljava/lang/Class;
+    iget-object v2, p1, Lcom/google/firebase/components/n;->aUk:Ljava/lang/Class;
 
     if-ne v0, v2, :cond_0
 
@@ -112,9 +112,9 @@
 
     if-ne v0, v2, :cond_0
 
-    iget v0, p0, Lcom/google/firebase/components/n;->aTU:I
+    iget v0, p0, Lcom/google/firebase/components/n;->aUm:I
 
-    iget p1, p1, Lcom/google/firebase/components/n;->aTU:I
+    iget p1, p1, Lcom/google/firebase/components/n;->aUm:I
 
     if-ne v0, p1, :cond_0
 
@@ -129,7 +129,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/firebase/components/n;->aTS:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/firebase/components/n;->aUk:Ljava/lang/Class;
 
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
@@ -147,7 +147,7 @@
 
     mul-int v0, v0, v1
 
-    iget v1, p0, Lcom/google/firebase/components/n;->aTU:I
+    iget v1, p0, Lcom/google/firebase/components/n;->aUm:I
 
     xor-int/2addr v0, v1
 
@@ -182,7 +182,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/firebase/components/n;->aTS:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/firebase/components/n;->aUk:Ljava/lang/Class;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -217,7 +217,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/google/firebase/components/n;->aTU:I
+    iget v1, p0, Lcom/google/firebase/components/n;->aUm:I
 
     if-nez v1, :cond_2
 
diff --git a/com.discord/smali_classes2/com/google/firebase/components/q.smali b/com.discord/smali_classes2/com/google/firebase/components/q.smali
index 35722d28d8..efd8a6ddd5 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/q.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/q.smali
@@ -8,7 +8,7 @@
 
 
 # instance fields
-.field private final aTV:Ljava/util/Map;
+.field private final aUn:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private aTW:Ljava/util/Queue;
+.field private aUo:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private final aTX:Ljava/util/concurrent/Executor;
+.field private final aUp:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -47,15 +47,15 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/components/q;->aTV:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/components/q;->aUn:Ljava/util/Map;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/components/q;->aTW:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/google/firebase/components/q;->aUo:Ljava/util/Queue;
 
-    iput-object p1, p0, Lcom/google/firebase/components/q;->aTX:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/firebase/components/q;->aUp:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
@@ -89,11 +89,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aTW:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aUo:Ljava/util/Queue;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aTW:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aUo:Ljava/util/Queue;
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
@@ -181,7 +181,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aTV:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aUn:Ljava/util/Map;
 
     iget-object p1, p1, Lcom/google/firebase/a/a;->type:Ljava/lang/Class;
 
@@ -225,21 +225,21 @@
 
 
 # virtual methods
-.method final AU()V
+.method final AQ()V
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aTW:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aUo:Ljava/util/Queue;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aTW:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aUo:Ljava/util/Queue;
 
-    iput-object v1, p0, Lcom/google/firebase/components/q;->aTW:Ljava/util/Queue;
+    iput-object v1, p0, Lcom/google/firebase/components/q;->aUo:Ljava/util/Queue;
 
     goto :goto_0
 
@@ -308,7 +308,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aTX:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aUp:Ljava/util/concurrent/Executor;
 
     invoke-virtual {p0, p1, v0, p2}, Lcom/google/firebase/components/q;->a(Ljava/lang/Class;Ljava/util/concurrent/Executor;Lcom/google/firebase/a/b;)V
 
@@ -339,7 +339,7 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aTV:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aUn:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -347,7 +347,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aTV:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aUn:Ljava/util/Map;
 
     new-instance v1, Ljava/util/concurrent/ConcurrentHashMap;
 
@@ -356,7 +356,7 @@
     invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aTV:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aUn:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/components/r.smali b/com.discord/smali_classes2/com/google/firebase/components/r.smali
index a3ccb01b2b..647eca13cd 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/r.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/r.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aTY:Ljava/util/Map$Entry;
+.field private final aUq:Ljava/util/Map$Entry;
 
-.field private final aTZ:Lcom/google/firebase/a/a;
+.field private final aUr:Lcom/google/firebase/a/a;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/components/r;->aTY:Ljava/util/Map$Entry;
+    iput-object p1, p0, Lcom/google/firebase/components/r;->aUq:Ljava/util/Map$Entry;
 
-    iput-object p2, p0, Lcom/google/firebase/components/r;->aTZ:Lcom/google/firebase/a/a;
+    iput-object p2, p0, Lcom/google/firebase/components/r;->aUr:Lcom/google/firebase/a/a;
 
     return-void
 .end method
@@ -40,9 +40,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/components/r;->aTY:Ljava/util/Map$Entry;
+    iget-object v0, p0, Lcom/google/firebase/components/r;->aUq:Ljava/util/Map$Entry;
 
-    iget-object v1, p0, Lcom/google/firebase/components/r;->aTZ:Lcom/google/firebase/a/a;
+    iget-object v1, p0, Lcom/google/firebase/components/r;->aUr:Lcom/google/firebase/a/a;
 
     invoke-static {v0, v1}, Lcom/google/firebase/components/q;->a(Ljava/util/Map$Entry;Lcom/google/firebase/a/a;)V
 
diff --git a/com.discord/smali_classes2/com/google/firebase/components/s.smali b/com.discord/smali_classes2/com/google/firebase/components/s.smali
index c516870cd1..5d33db1ad0 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/s.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/s.smali
@@ -20,13 +20,13 @@
 
 
 # static fields
-.field private static final aUa:Ljava/lang/Object;
+.field private static final aUs:Ljava/lang/Object;
 
 
 # instance fields
-.field private volatile aUb:Ljava/lang/Object;
+.field private volatile aUt:Ljava/lang/Object;
 
-.field private volatile aUc:Lcom/google/firebase/b/a;
+.field private volatile aUu:Lcom/google/firebase/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/firebase/b/a<",
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/components/s;->aUa:Ljava/lang/Object;
+    sput-object v0, Lcom/google/firebase/components/s;->aUs:Ljava/lang/Object;
 
     return-void
 .end method
@@ -61,11 +61,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lcom/google/firebase/components/s;->aUa:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/components/s;->aUs:Ljava/lang/Object;
 
-    iput-object v0, p0, Lcom/google/firebase/components/s;->aUb:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/firebase/components/s;->aUt:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/firebase/components/s;->aUc:Lcom/google/firebase/b/a;
+    iput-object p1, p0, Lcom/google/firebase/components/s;->aUu:Lcom/google/firebase/b/a;
 
     return-void
 .end method
@@ -80,32 +80,32 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/s;->aUb:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/firebase/components/s;->aUt:Ljava/lang/Object;
 
-    sget-object v1, Lcom/google/firebase/components/s;->aUa:Ljava/lang/Object;
+    sget-object v1, Lcom/google/firebase/components/s;->aUs:Ljava/lang/Object;
 
     if-ne v0, v1, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/components/s;->aUb:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/firebase/components/s;->aUt:Ljava/lang/Object;
 
-    sget-object v1, Lcom/google/firebase/components/s;->aUa:Ljava/lang/Object;
+    sget-object v1, Lcom/google/firebase/components/s;->aUs:Ljava/lang/Object;
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/s;->aUc:Lcom/google/firebase/b/a;
+    iget-object v0, p0, Lcom/google/firebase/components/s;->aUu:Lcom/google/firebase/b/a;
 
     invoke-interface {v0}, Lcom/google/firebase/b/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/firebase/components/s;->aUb:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/firebase/components/s;->aUt:Ljava/lang/Object;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/google/firebase/components/s;->aUc:Lcom/google/firebase/b/a;
+    iput-object v1, p0, Lcom/google/firebase/components/s;->aUu:Lcom/google/firebase/b/a;
 
     :cond_0
     monitor-exit p0
diff --git a/com.discord/smali_classes2/com/google/firebase/components/u$a.smali b/com.discord/smali_classes2/com/google/firebase/components/u$a.smali
index 699204a931..4cd7ed385c 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/u$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/u$a.smali
@@ -18,7 +18,9 @@
 
 
 # instance fields
-.field private final aUh:Ljava/util/Set;
+.field private final aUB:Lcom/google/firebase/a/c;
+
+.field private final aUz:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -28,8 +30,6 @@
     .end annotation
 .end field
 
-.field private final aUj:Lcom/google/firebase/a/c;
-
 
 # direct methods
 .method public constructor <init>(Ljava/util/Set;Lcom/google/firebase/a/c;)V
@@ -47,9 +47,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/components/u$a;->aUh:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/u$a;->aUz:Ljava/util/Set;
 
-    iput-object p2, p0, Lcom/google/firebase/components/u$a;->aUj:Lcom/google/firebase/a/c;
+    iput-object p2, p0, Lcom/google/firebase/components/u$a;->aUB:Lcom/google/firebase/a/c;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/components/u.smali b/com.discord/smali_classes2/com/google/firebase/components/u.smali
index f7af4aa8c7..6b16a16426 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/u.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/u.smali
@@ -12,7 +12,9 @@
 
 
 # instance fields
-.field private final aUd:Ljava/util/Set;
+.field private final aUA:Lcom/google/firebase/components/e;
+
+.field private final aUv:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -22,7 +24,7 @@
     .end annotation
 .end field
 
-.field private final aUe:Ljava/util/Set;
+.field private final aUw:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -32,7 +34,7 @@
     .end annotation
 .end field
 
-.field private final aUf:Ljava/util/Set;
+.field private final aUx:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -42,7 +44,7 @@
     .end annotation
 .end field
 
-.field private final aUg:Ljava/util/Set;
+.field private final aUy:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -52,7 +54,7 @@
     .end annotation
 .end field
 
-.field private final aUh:Ljava/util/Set;
+.field private final aUz:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -62,8 +64,6 @@
     .end annotation
 .end field
 
-.field private final aUi:Lcom/google/firebase/components/e;
-
 
 # direct methods
 .method constructor <init>(Lcom/google/firebase/components/b;Lcom/google/firebase/components/e;)V
@@ -96,7 +96,7 @@
 
     invoke-direct {v3}, Ljava/util/HashSet;-><init>()V
 
-    iget-object v4, p1, Lcom/google/firebase/components/b;->aTA:Ljava/util/Set;
+    iget-object v4, p1, Lcom/google/firebase/components/b;->aTS:Ljava/util/Set;
 
     invoke-interface {v4}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -115,7 +115,7 @@
 
     check-cast v5, Lcom/google/firebase/components/n;
 
-    invoke-virtual {v5}, Lcom/google/firebase/components/n;->AT()Z
+    invoke-virtual {v5}, Lcom/google/firebase/components/n;->AP()Z
 
     move-result v6
 
@@ -127,14 +127,14 @@
 
     if-eqz v6, :cond_0
 
-    iget-object v5, v5, Lcom/google/firebase/components/n;->aTS:Ljava/lang/Class;
+    iget-object v5, v5, Lcom/google/firebase/components/n;->aUk:Ljava/lang/Class;
 
     invoke-interface {v2, v5}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_0
-    iget-object v5, v5, Lcom/google/firebase/components/n;->aTS:Ljava/lang/Class;
+    iget-object v5, v5, Lcom/google/firebase/components/n;->aUk:Ljava/lang/Class;
 
     invoke-interface {v0, v5}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -147,21 +147,21 @@
 
     if-eqz v6, :cond_2
 
-    iget-object v5, v5, Lcom/google/firebase/components/n;->aTS:Ljava/lang/Class;
+    iget-object v5, v5, Lcom/google/firebase/components/n;->aUk:Ljava/lang/Class;
 
     invoke-interface {v3, v5}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_2
-    iget-object v5, v5, Lcom/google/firebase/components/n;->aTS:Ljava/lang/Class;
+    iget-object v5, v5, Lcom/google/firebase/components/n;->aUk:Ljava/lang/Class;
 
     invoke-interface {v1, v5}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_3
-    iget-object v4, p1, Lcom/google/firebase/components/b;->aTD:Ljava/util/Set;
+    iget-object v4, p1, Lcom/google/firebase/components/b;->aTV:Ljava/util/Set;
 
     invoke-interface {v4}, Ljava/util/Set;->isEmpty()Z
 
@@ -178,31 +178,31 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/firebase/components/u;->aUd:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/u;->aUv:Ljava/util/Set;
 
     invoke-static {v1}, Ljava/util/Collections;->unmodifiableSet(Ljava/util/Set;)Ljava/util/Set;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/firebase/components/u;->aUe:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/u;->aUw:Ljava/util/Set;
 
     invoke-static {v2}, Ljava/util/Collections;->unmodifiableSet(Ljava/util/Set;)Ljava/util/Set;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/firebase/components/u;->aUf:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/u;->aUx:Ljava/util/Set;
 
     invoke-static {v3}, Ljava/util/Collections;->unmodifiableSet(Ljava/util/Set;)Ljava/util/Set;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/firebase/components/u;->aUg:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/u;->aUy:Ljava/util/Set;
 
-    iget-object p1, p1, Lcom/google/firebase/components/b;->aTD:Ljava/util/Set;
+    iget-object p1, p1, Lcom/google/firebase/components/b;->aTV:Ljava/util/Set;
 
-    iput-object p1, p0, Lcom/google/firebase/components/u;->aUh:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/u;->aUz:Ljava/util/Set;
 
-    iput-object p2, p0, Lcom/google/firebase/components/u;->aUi:Lcom/google/firebase/components/e;
+    iput-object p2, p0, Lcom/google/firebase/components/u;->aUA:Lcom/google/firebase/components/e;
 
     return-void
 .end method
@@ -221,7 +221,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aUd:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aUv:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -229,7 +229,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aUi:Lcom/google/firebase/components/e;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aUA:Lcom/google/firebase/components/e;
 
     invoke-interface {v0, p1}, Lcom/google/firebase/components/e;->A(Ljava/lang/Class;)Ljava/lang/Object;
 
@@ -248,7 +248,7 @@
     :cond_0
     new-instance p1, Lcom/google/firebase/components/u$a;
 
-    iget-object v1, p0, Lcom/google/firebase/components/u;->aUh:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/u;->aUz:Ljava/util/Set;
 
     check-cast v0, Lcom/google/firebase/a/c;
 
@@ -292,7 +292,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aUf:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aUx:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -300,7 +300,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aUi:Lcom/google/firebase/components/e;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aUA:Lcom/google/firebase/components/e;
 
     invoke-interface {v0, p1}, Lcom/google/firebase/components/e;->B(Ljava/lang/Class;)Ljava/util/Set;
 
@@ -344,7 +344,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aUe:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aUw:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -352,7 +352,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aUi:Lcom/google/firebase/components/e;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aUA:Lcom/google/firebase/components/e;
 
     invoke-interface {v0, p1}, Lcom/google/firebase/components/e;->E(Ljava/lang/Class;)Lcom/google/firebase/b/a;
 
@@ -397,7 +397,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aUg:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aUy:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -405,7 +405,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aUi:Lcom/google/firebase/components/e;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aUA:Lcom/google/firebase/components/e;
 
     invoke-interface {v0, p1}, Lcom/google/firebase/components/e;->F(Ljava/lang/Class;)Lcom/google/firebase/b/a;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/d/b.smali b/com.discord/smali_classes2/com/google/firebase/d/b.smali
index c2aca64e2b..bc6c8f84a8 100644
--- a/com.discord/smali_classes2/com/google/firebase/d/b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/d/b.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aWi:Ljava/lang/String;
+.field private final aWA:Ljava/lang/String;
 
-.field private final aWj:Lcom/google/firebase/d/d;
+.field private final aWB:Lcom/google/firebase/d/d;
 
 
 # direct methods
@@ -32,14 +32,14 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/d/b;->aWi:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/d/b;->aWA:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/d/b;->aWj:Lcom/google/firebase/d/d;
+    iput-object p2, p0, Lcom/google/firebase/d/b;->aWB:Lcom/google/firebase/d/d;
 
     return-void
 .end method
 
-.method public static BD()Lcom/google/firebase/components/b;
+.method public static Bs()Lcom/google/firebase/components/b;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -68,7 +68,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/firebase/d/c;->BE()Lcom/google/firebase/components/g;
+    invoke-static {}, Lcom/google/firebase/d/c;->Bt()Lcom/google/firebase/components/g;
 
     move-result-object v1
 
@@ -76,7 +76,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->AP()Lcom/google/firebase/components/b;
+    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->AL()Lcom/google/firebase/components/b;
 
     move-result-object v0
 
@@ -94,7 +94,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/google/firebase/d/d;->BG()Lcom/google/firebase/d/d;
+    invoke-static {}, Lcom/google/firebase/d/d;->Bv()Lcom/google/firebase/d/d;
 
     move-result-object v1
 
@@ -137,7 +137,7 @@
 
     check-cast v1, Lcom/google/firebase/d/e;
 
-    invoke-virtual {v1}, Lcom/google/firebase/d/e;->BC()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/firebase/d/e;->Br()Ljava/lang/String;
 
     move-result-object v2
 
@@ -178,9 +178,9 @@
 .method public final getUserAgent()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/d/b;->aWj:Lcom/google/firebase/d/d;
+    iget-object v0, p0, Lcom/google/firebase/d/b;->aWB:Lcom/google/firebase/d/d;
 
-    invoke-virtual {v0}, Lcom/google/firebase/d/d;->BF()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/firebase/d/d;->Bu()Ljava/util/Set;
 
     move-result-object v0
 
@@ -190,7 +190,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/d/b;->aWi:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/d/b;->aWA:Ljava/lang/String;
 
     return-object v0
 
@@ -199,7 +199,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lcom/google/firebase/d/b;->aWi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/b;->aWA:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -207,9 +207,9 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/firebase/d/b;->aWj:Lcom/google/firebase/d/d;
+    iget-object v1, p0, Lcom/google/firebase/d/b;->aWB:Lcom/google/firebase/d/d;
 
-    invoke-virtual {v1}, Lcom/google/firebase/d/d;->BF()Ljava/util/Set;
+    invoke-virtual {v1}, Lcom/google/firebase/d/d;->Bu()Ljava/util/Set;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/firebase/d/c.smali b/com.discord/smali_classes2/com/google/firebase/d/c.smali
index 47e4e62df8..5aa7437cbd 100644
--- a/com.discord/smali_classes2/com/google/firebase/d/c.smali
+++ b/com.discord/smali_classes2/com/google/firebase/d/c.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aWk:Lcom/google/firebase/d/c;
+.field private static final aWC:Lcom/google/firebase/d/c;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/d/c;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/d/c;->aWk:Lcom/google/firebase/d/c;
+    sput-object v0, Lcom/google/firebase/d/c;->aWC:Lcom/google/firebase/d/c;
 
     return-void
 .end method
@@ -31,10 +31,10 @@
     return-void
 .end method
 
-.method public static BE()Lcom/google/firebase/components/g;
+.method public static Bt()Lcom/google/firebase/components/g;
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/d/c;->aWk:Lcom/google/firebase/d/c;
+    sget-object v0, Lcom/google/firebase/d/c;->aWC:Lcom/google/firebase/d/c;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/d/d.smali b/com.discord/smali_classes2/com/google/firebase/d/d.smali
index 2be8b3fdd5..2eb1cc3b73 100644
--- a/com.discord/smali_classes2/com/google/firebase/d/d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/d/d.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static volatile aWm:Lcom/google/firebase/d/d;
+.field private static volatile aWE:Lcom/google/firebase/d/d;
 
 
 # instance fields
-.field private final aWl:Ljava/util/Set;
+.field private final aWD:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -29,15 +29,15 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/d/d;->aWl:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/d/d;->aWD:Ljava/util/Set;
 
     return-void
 .end method
 
-.method public static BG()Lcom/google/firebase/d/d;
+.method public static Bv()Lcom/google/firebase/d/d;
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/d/d;->aWm:Lcom/google/firebase/d/d;
+    sget-object v0, Lcom/google/firebase/d/d;->aWE:Lcom/google/firebase/d/d;
 
     if-nez v0, :cond_1
 
@@ -46,7 +46,7 @@
     monitor-enter v1
 
     :try_start_0
-    sget-object v0, Lcom/google/firebase/d/d;->aWm:Lcom/google/firebase/d/d;
+    sget-object v0, Lcom/google/firebase/d/d;->aWE:Lcom/google/firebase/d/d;
 
     if-nez v0, :cond_0
 
@@ -54,7 +54,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/d/d;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/d/d;->aWm:Lcom/google/firebase/d/d;
+    sput-object v0, Lcom/google/firebase/d/d;->aWE:Lcom/google/firebase/d/d;
 
     :cond_0
     monitor-exit v1
@@ -77,7 +77,7 @@
 
 
 # virtual methods
-.method final BF()Ljava/util/Set;
+.method final Bu()Ljava/util/Set;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -88,12 +88,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/d/d;->aWl:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/d/d;->aWD:Ljava/util/Set;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/d/d;->aWl:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/d/d;->aWD:Ljava/util/Set;
 
     invoke-static {v1}, Ljava/util/Collections;->unmodifiableSet(Ljava/util/Set;)Ljava/util/Set;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/PendingDynamicLinkData.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/PendingDynamicLinkData.smali
index f3fe2379d2..d0f01aaa72 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/PendingDynamicLinkData.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/PendingDynamicLinkData.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aUk:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+.field public final aUC:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
 
 
 # direct methods
@@ -16,12 +16,12 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aUk:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aUC:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
 
     return-void
 
     :cond_0
-    iget-wide v0, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUm:J
+    iget-wide v0, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUE:J
 
     const-wide/16 v2, 0x0
 
@@ -29,7 +29,7 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->mr()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->mp()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -37,38 +37,10 @@
 
     move-result-wide v0
 
-    iput-wide v0, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUm:J
+    iput-wide v0, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUE:J
 
     :cond_1
-    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aUk:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aUC:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
 
     return-void
 .end method
-
-
-# virtual methods
-.method public final AW()Landroid/net/Uri;
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aUk:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    return-object v1
-
-    :cond_0
-    iget-object v0, v0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUl:Ljava/lang/String;
-
-    if-eqz v0, :cond_1
-
-    invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_1
-    return-object v1
-.end method
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/a.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/a.smali
index d35faaec50..6a5babf964 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/a.smali
@@ -11,7 +11,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized AV()Lcom/google/firebase/dynamiclinks/a;
+.method public static declared-synchronized AR()Lcom/google/firebase/dynamiclinks/a;
     .locals 2
 
     const-class v0, Lcom/google/firebase/dynamiclinks/a;
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/DynamicLinkData.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/DynamicLinkData.smali
index bf3ca74621..61b9222b2c 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/DynamicLinkData.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/DynamicLinkData.smali
@@ -15,17 +15,17 @@
 
 
 # instance fields
-.field private aOZ:I
+.field private aPr:I
 
-.field public aUl:Ljava/lang/String;
+.field public aUD:Ljava/lang/String;
 
-.field public aUm:J
+.field public aUE:J
 
-.field private aUn:Landroid/os/Bundle;
+.field private aUF:Landroid/os/Bundle;
 
-.field private aUo:Landroid/net/Uri;
+.field private aUG:Landroid/net/Uri;
 
-.field private adp:Ljava/lang/String;
+.field private adH:Ljava/lang/String;
 
 
 # direct methods
@@ -48,33 +48,33 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUm:J
+    iput-wide v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUE:J
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUn:Landroid/os/Bundle;
+    iput-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUF:Landroid/os/Bundle;
 
-    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->adp:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->adH:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUl:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUD:Ljava/lang/String;
 
-    iput p3, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aOZ:I
+    iput p3, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aPr:I
 
-    iput-wide p4, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUm:J
+    iput-wide p4, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUE:J
 
-    iput-object p6, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUn:Landroid/os/Bundle;
+    iput-object p6, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUF:Landroid/os/Bundle;
 
-    iput-object p7, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUo:Landroid/net/Uri;
+    iput-object p7, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUG:Landroid/net/Uri;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final AX()Landroid/os/Bundle;
+.method public final AS()Landroid/os/Bundle;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUn:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUF:Landroid/os/Bundle;
 
     if-nez v0, :cond_0
 
@@ -95,31 +95,31 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->adp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->adH:Ljava/lang/String;
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUl:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUD:Ljava/lang/String;
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    iget v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aOZ:I
+    iget v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aPr:I
 
     const/4 v2, 0x3
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->d(Landroid/os/Parcel;II)V
 
-    iget-wide v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUm:J
+    iget-wide v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUE:J
 
     const/4 v3, 0x4
 
     invoke-static {p1, v3, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;IJ)V
 
-    invoke-virtual {p0}, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->AX()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->AS()Landroid/os/Bundle;
 
     move-result-object v1
 
@@ -127,7 +127,7 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Bundle;)V
 
-    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUo:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aUG:Landroid/net/Uri;
 
     const/4 v2, 0x6
 
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.smali
index db15991f15..2c16b1e1e0 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.smali
@@ -55,13 +55,13 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/firebase/dynamiclinks/internal/f;->aUs:Lcom/google/firebase/components/g;
+    sget-object v1, Lcom/google/firebase/dynamiclinks/internal/f;->aUK:Lcom/google/firebase/components/g;
 
     invoke-virtual {v0, v1}, Lcom/google/firebase/components/b$a;->a(Lcom/google/firebase/components/g;)Lcom/google/firebase/components/b$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->AP()Lcom/google/firebase/components/b;
+    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->AL()Lcom/google/firebase/components/b;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/c.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/c.smali
index 1743e48e46..15f599b13b 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/c.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/c.smali
@@ -13,7 +13,7 @@
 
 
 # static fields
-.field private static final aBC:Lcom/google/android/gms/common/api/a$g;
+.field private static final aBU:Lcom/google/android/gms/common/api/a$g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$g<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field private static final aOn:Lcom/google/android/gms/common/api/a;
+.field private static final aOF:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private static final aUp:Lcom/google/android/gms/common/api/a$a;
+.field private static final aUH:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -53,25 +53,25 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/a$g;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     new-instance v0, Lcom/google/firebase/dynamiclinks/internal/b;
 
     invoke-direct {v0}, Lcom/google/firebase/dynamiclinks/internal/b;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aUp:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aUH:Lcom/google/android/gms/common/api/a$a;
 
     new-instance v0, Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/firebase/dynamiclinks/internal/c;->aUp:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/firebase/dynamiclinks/internal/c;->aUH:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/firebase/dynamiclinks/internal/c;->aBC:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/firebase/dynamiclinks/internal/c;->aBU:Lcom/google/android/gms/common/api/a$g;
 
     const-string v3, "DynamicLinks.API"
 
     invoke-direct {v0, v3, v1, v2}, Lcom/google/android/gms/common/api/a;-><init>(Ljava/lang/String;Lcom/google/android/gms/common/api/a$a;Lcom/google/android/gms/common/api/a$g;)V
 
-    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aOn:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aOF:Lcom/google/android/gms/common/api/a;
 
     return-void
 .end method
@@ -79,9 +79,9 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aOn:Lcom/google/android/gms/common/api/a;
+    sget-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aOF:Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/common/api/e$a;->adK:Lcom/google/android/gms/common/api/e$a;
+    sget-object v1, Lcom/google/android/gms/common/api/e$a;->aed:Lcom/google/android/gms/common/api/e$a;
 
     invoke-direct {p0, p1, v0, v1}, Lcom/google/android/gms/common/api/e;-><init>(Landroid/content/Context;Lcom/google/android/gms/common/api/a;Lcom/google/android/gms/common/api/e$a;)V
 
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/d.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/d.smali
index 3fd7d4d664..155d03810e 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/d.smali
@@ -69,7 +69,7 @@
     return-object v0
 .end method
 
-.method public final lh()I
+.method public final lf()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -77,7 +77,7 @@
     return v0
 .end method
 
-.method public final lj()Ljava/lang/String;
+.method public final lh()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.firebase.dynamiclinks.service.START"
@@ -85,7 +85,7 @@
     return-object v0
 .end method
 
-.method public final lk()Ljava/lang/String;
+.method public final li()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.firebase.dynamiclinks.internal.IDynamicLinksService"
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/e.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/e.smali
index ea6a984a1b..5005b87791 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/e.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/e.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aUq:Lcom/google/android/gms/common/api/e;
+.field private final aUI:Lcom/google/android/gms/common/api/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/e<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private final aUr:Lcom/google/firebase/analytics/connector/a;
+.field private final aUJ:Lcom/google/firebase/analytics/connector/a;
 
 
 # direct methods
@@ -32,9 +32,9 @@
 
     invoke-direct {p0}, Lcom/google/firebase/dynamiclinks/a;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aUq:Lcom/google/android/gms/common/api/e;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aUI:Lcom/google/android/gms/common/api/e;
 
-    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aUr:Lcom/google/firebase/analytics/connector/a;
+    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aUJ:Lcom/google/firebase/analytics/connector/a;
 
     if-nez p2, :cond_0
 
@@ -79,11 +79,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aUq:Lcom/google/android/gms/common/api/e;
+    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aUI:Lcom/google/android/gms/common/api/e;
 
     new-instance v1, Lcom/google/firebase/dynamiclinks/internal/j;
 
-    iget-object v2, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aUr:Lcom/google/firebase/analytics/connector/a;
+    iget-object v2, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aUJ:Lcom/google/firebase/analytics/connector/a;
 
     invoke-virtual {p1}, Landroid/content/Intent;->getDataString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/f.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/f.smali
index d952c6df19..dd4377105a 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/f.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/f.smali
@@ -6,7 +6,7 @@
 
 
 # static fields
-.field static final aUs:Lcom/google/firebase/components/g;
+.field static final aUK:Lcom/google/firebase/components/g;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/dynamiclinks/internal/f;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/f;->aUs:Lcom/google/firebase/components/g;
+    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/f;->aUK:Lcom/google/firebase/components/g;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/g.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/g.smali
index 3a330ac5c2..c342510aea 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/g.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/g.smali
@@ -13,7 +13,7 @@
 
 
 # virtual methods
-.method public final AY()V
+.method public final AT()V
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/h.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/h.smali
index 4fac74ff96..d21aa08ff0 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/h.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/h.smali
@@ -3,9 +3,9 @@
 
 
 # instance fields
-.field private final aUr:Lcom/google/firebase/analytics/connector/a;
+.field private final aUJ:Lcom/google/firebase/analytics/connector/a;
 
-.field private final aUt:Lcom/google/android/gms/tasks/h;
+.field private final aUL:Lcom/google/android/gms/tasks/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/h<",
@@ -31,9 +31,9 @@
 
     invoke-direct {p0}, Lcom/google/firebase/dynamiclinks/internal/g;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aUr:Lcom/google/firebase/analytics/connector/a;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aUJ:Lcom/google/firebase/analytics/connector/a;
 
-    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aUt:Lcom/google/android/gms/tasks/h;
+    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aUL:Lcom/google/android/gms/tasks/h;
 
     return-void
 .end method
@@ -55,9 +55,9 @@
     invoke-direct {v0, p2}, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;-><init>(Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;)V
 
     :goto_0
-    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aUt:Lcom/google/android/gms/tasks/h;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aUL:Lcom/google/android/gms/tasks/h;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->kX()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->kV()Z
 
     move-result v2
 
@@ -80,7 +80,7 @@
     return-void
 
     :cond_2
-    invoke-virtual {p2}, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->AX()Landroid/os/Bundle;
+    invoke-virtual {p2}, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->AS()Landroid/os/Bundle;
 
     move-result-object p1
 
@@ -101,7 +101,7 @@
     goto :goto_3
 
     :cond_3
-    iget-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aUr:Lcom/google/firebase/analytics/connector/a;
+    iget-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aUJ:Lcom/google/firebase/analytics/connector/a;
 
     if-nez p2, :cond_4
 
@@ -133,7 +133,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aUr:Lcom/google/firebase/analytics/connector/a;
+    iget-object v2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aUJ:Lcom/google/firebase/analytics/connector/a;
 
     const-string v3, "fdl"
 
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/i.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/i.smali
index 2507829d83..463726506e 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/i.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/i.smali
@@ -6,7 +6,7 @@
 
 
 # virtual methods
-.method public abstract AY()V
+.method public abstract AT()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/j.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/j.smali
index ab25b7b642..8cdc195b88 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/j.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/j.smali
@@ -14,9 +14,9 @@
 
 
 # instance fields
-.field private final aUr:Lcom/google/firebase/analytics/connector/a;
+.field private final aUJ:Lcom/google/firebase/analytics/connector/a;
 
-.field private final adp:Ljava/lang/String;
+.field private final adH:Ljava/lang/String;
 
 
 # direct methods
@@ -25,9 +25,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/l;-><init>()V
 
-    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/j;->adp:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/j;->adH:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/j;->aUr:Lcom/google/firebase/analytics/connector/a;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/j;->aUJ:Lcom/google/firebase/analytics/connector/a;
 
     return-void
 .end method
@@ -46,14 +46,14 @@
 
     new-instance v0, Lcom/google/firebase/dynamiclinks/internal/h;
 
-    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/j;->aUr:Lcom/google/firebase/analytics/connector/a;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/j;->aUJ:Lcom/google/firebase/analytics/connector/a;
 
     invoke-direct {v0, v1, p2}, Lcom/google/firebase/dynamiclinks/internal/h;-><init>(Lcom/google/firebase/analytics/connector/a;Lcom/google/android/gms/tasks/h;)V
 
-    iget-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/j;->adp:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/j;->adH:Ljava/lang/String;
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/firebase/dynamiclinks/internal/d;->lY()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/firebase/dynamiclinks/internal/d;->lW()Landroid/os/IInterface;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/l.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/l.smali
index 4b011551e7..042f948f39 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/l.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/l.smali
@@ -47,7 +47,7 @@
 
     invoke-static {p2, p1}, Lcom/google/android/gms/internal/d/d;->b(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Landroid/os/Parcelable;
 
-    invoke-virtual {p0}, Lcom/google/firebase/dynamiclinks/internal/l;->AY()V
+    invoke-virtual {p0}, Lcom/google/firebase/dynamiclinks/internal/l;->AT()V
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/m.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/m.smali
index 903c99b871..f711d873c5 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/m.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/m.smali
@@ -30,7 +30,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/d/b;->alD:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/d/b;->alV:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
@@ -43,7 +43,7 @@
     move-result-object p1
 
     :try_start_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/d/b;->alC:Landroid/os/IBinder;
+    iget-object p2, p0, Lcom/google/android/gms/internal/d/b;->alU:Landroid/os/IBinder;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/zzo.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/zzo.smali
index e36a4db97e..d909b8af6b 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/zzo.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/zzo.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field private final aUu:Landroid/net/Uri;
+.field private final aUM:Landroid/net/Uri;
 
-.field private final aUv:Landroid/net/Uri;
+.field private final aUN:Landroid/net/Uri;
 
-.field private final aUw:Ljava/util/List;
+.field private final aUO:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -58,11 +58,11 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aUu:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aUM:Landroid/net/Uri;
 
-    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aUv:Landroid/net/Uri;
+    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aUN:Landroid/net/Uri;
 
-    iput-object p3, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aUw:Ljava/util/List;
+    iput-object p3, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aUO:Ljava/util/List;
 
     return-void
 .end method
@@ -78,19 +78,19 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aUu:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aUM:Landroid/net/Uri;
 
     const/4 v2, 0x1
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aUv:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aUN:Landroid/net/Uri;
 
     const/4 v2, 0x2
 
     invoke-static {p1, v2, v1, p2}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Parcelable;I)V
 
-    iget-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aUw:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aUO:Ljava/util/List;
 
     const/4 v1, 0x3
 
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/zzr.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/zzr.smali
index b4efe80c45..672c598891 100644
--- a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/zzr.smali
+++ b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/zzr.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final aqn:Ljava/lang/String;
+.field private final aqF:Ljava/lang/String;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/zzr;->aqn:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/zzr;->aqF:Ljava/lang/String;
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/zzr;->aqn:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/zzr;->aqF:Ljava/lang/String;
 
     const/4 v1, 0x2
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceId$a.smali b/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceId$a.smali
index 4c0e18a6e0..864127d116 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceId$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceId$a.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field private final aUF:Z
+.field private final aUX:Z
 
-.field private final aUG:Lcom/google/firebase/a/d;
+.field private final aUY:Lcom/google/firebase/a/d;
 
-.field private aUH:Lcom/google/firebase/a/b;
+.field private aUZ:Lcom/google/firebase/a/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/firebase/a/b<",
@@ -29,38 +29,38 @@
     .end annotation
 .end field
 
-.field private aUI:Ljava/lang/Boolean;
+.field private aVa:Ljava/lang/Boolean;
 
-.field final synthetic aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field final synthetic aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/firebase/iid/FirebaseInstanceId;Lcom/google/firebase/a/d;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUG:Lcom/google/firebase/a/d;
+    iput-object p2, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUY:Lcom/google/firebase/a/d;
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->mL()Z
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->mJ()Z
 
     move-result p1
 
-    iput-boolean p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUF:Z
+    iput-boolean p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUX:Z
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->Bh()Ljava/lang/Boolean;
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->Bb()Ljava/lang/Boolean;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUI:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aVa:Ljava/lang/Boolean;
 
-    iget-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUI:Ljava/lang/Boolean;
+    iget-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aVa:Ljava/lang/Boolean;
 
     if-nez p1, :cond_0
 
-    iget-boolean p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUF:Z
+    iget-boolean p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUX:Z
 
     if-eqz p1, :cond_0
 
@@ -68,11 +68,11 @@
 
     invoke-direct {p1, p0}, Lcom/google/firebase/iid/aj;-><init>(Lcom/google/firebase/iid/FirebaseInstanceId$a;)V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUH:Lcom/google/firebase/a/b;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUZ:Lcom/google/firebase/a/b;
 
     const-class p1, Lcom/google/firebase/a;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUH:Lcom/google/firebase/a/b;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUZ:Lcom/google/firebase/a/b;
 
     invoke-interface {p2, p1, v0}, Lcom/google/firebase/a/d;->a(Ljava/lang/Class;Lcom/google/firebase/a/b;)V
 
@@ -80,12 +80,12 @@
     return-void
 .end method
 
-.method private final Bh()Ljava/lang/Boolean;
+.method private final Bb()Ljava/lang/Boolean;
     .locals 6
 
     const-string v0, "firebase_messaging_auto_init_enabled"
 
-    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-static {v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->a(Lcom/google/firebase/iid/FirebaseInstanceId;)Lcom/google/firebase/FirebaseApp;
 
@@ -174,7 +174,7 @@
     return-object v0
 .end method
 
-.method private final mL()Z
+.method private final mJ()Z
     .locals 4
 
     const/4 v0, 0x1
@@ -191,7 +191,7 @@
     :catch_0
     nop
 
-    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-static {v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->a(Lcom/google/firebase/iid/FirebaseInstanceId;)Lcom/google/firebase/FirebaseApp;
 
@@ -237,17 +237,17 @@
 
 
 # virtual methods
-.method final declared-synchronized zX()Z
+.method final declared-synchronized zT()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUI:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aVa:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUI:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aVa:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -261,11 +261,11 @@
 
     :cond_0
     :try_start_1
-    iget-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUF:Z
+    iget-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUX:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-static {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->a(Lcom/google/firebase/iid/FirebaseInstanceId;)Lcom/google/firebase/FirebaseApp;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceId.smali b/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceId.smali
index 4b52c7a806..1e7b967943 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceId.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceId.smali
@@ -12,27 +12,27 @@
 
 
 # static fields
-.field static aUx:Lcom/google/firebase/iid/s;
+.field static aUP:Lcom/google/firebase/iid/s;
 
-.field private static aUy:Ljava/util/concurrent/ScheduledExecutorService;
+.field private static aUQ:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private static final alL:J
+.field private static final amd:J
 
 
 # instance fields
-.field final aPi:Ljava/util/concurrent/Executor;
+.field final aPA:Ljava/util/concurrent/Executor;
 
-.field final aUA:Lcom/google/firebase/iid/g;
+.field public final aUR:Lcom/google/firebase/FirebaseApp;
 
-.field final aUB:Lcom/google/firebase/iid/ak;
+.field final aUS:Lcom/google/firebase/iid/g;
 
-.field final aUC:Lcom/google/firebase/iid/l;
+.field final aUT:Lcom/google/firebase/iid/ak;
 
-.field private final aUD:Lcom/google/firebase/iid/w;
+.field final aUU:Lcom/google/firebase/iid/l;
 
-.field private final aUE:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+.field private final aUV:Lcom/google/firebase/iid/w;
 
-.field final aUz:Lcom/google/firebase/FirebaseApp;
+.field private final aUW:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
 .field private zzj:Z
 
@@ -49,7 +49,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lcom/google/firebase/iid/FirebaseInstanceId;->alL:J
+    sput-wide v0, Lcom/google/firebase/iid/FirebaseInstanceId;->amd:J
 
     return-void
 .end method
@@ -65,11 +65,11 @@
 
     invoke-direct {v2, v0}, Lcom/google/firebase/iid/g;-><init>(Landroid/content/Context;)V
 
-    invoke-static {}, Lcom/google/firebase/iid/ad;->Bs()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/ad;->Bm()Ljava/util/concurrent/Executor;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/firebase/iid/ad;->Bs()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/ad;->Bm()Ljava/util/concurrent/Executor;
 
     move-result-object v4
 
@@ -106,7 +106,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUx:Lcom/google/firebase/iid/s;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUP:Lcom/google/firebase/iid/s;
 
     if-nez v1, :cond_0
 
@@ -118,54 +118,54 @@
 
     invoke-direct {v1, v2}, Lcom/google/firebase/iid/s;-><init>(Landroid/content/Context;)V
 
-    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUx:Lcom/google/firebase/iid/s;
+    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUP:Lcom/google/firebase/iid/s;
 
     :cond_0
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUz:Lcom/google/firebase/FirebaseApp;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUR:Lcom/google/firebase/FirebaseApp;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUA:Lcom/google/firebase/iid/g;
+    iput-object p2, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUS:Lcom/google/firebase/iid/g;
 
     new-instance v0, Lcom/google/firebase/iid/ak;
 
     invoke-direct {v0, p1, p2, p3, p6}, Lcom/google/firebase/iid/ak;-><init>(Lcom/google/firebase/FirebaseApp;Lcom/google/firebase/iid/g;Ljava/util/concurrent/Executor;Lcom/google/firebase/d/g;)V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUB:Lcom/google/firebase/iid/ak;
+    iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUT:Lcom/google/firebase/iid/ak;
 
-    iput-object p4, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aPi:Ljava/util/concurrent/Executor;
+    iput-object p4, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aPA:Ljava/util/concurrent/Executor;
 
     new-instance p1, Lcom/google/firebase/iid/w;
 
-    sget-object p2, Lcom/google/firebase/iid/FirebaseInstanceId;->aUx:Lcom/google/firebase/iid/s;
+    sget-object p2, Lcom/google/firebase/iid/FirebaseInstanceId;->aUP:Lcom/google/firebase/iid/s;
 
     invoke-direct {p1, p2}, Lcom/google/firebase/iid/w;-><init>(Lcom/google/firebase/iid/s;)V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUD:Lcom/google/firebase/iid/w;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUV:Lcom/google/firebase/iid/w;
 
     new-instance p1, Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
     invoke-direct {p1, p0, p5}, Lcom/google/firebase/iid/FirebaseInstanceId$a;-><init>(Lcom/google/firebase/iid/FirebaseInstanceId;Lcom/google/firebase/a/d;)V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUE:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUW:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
     new-instance p1, Lcom/google/firebase/iid/l;
 
     invoke-direct {p1, p3}, Lcom/google/firebase/iid/l;-><init>(Ljava/util/concurrent/Executor;)V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUC:Lcom/google/firebase/iid/l;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUU:Lcom/google/firebase/iid/l;
 
-    iget-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUE:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iget-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUW:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->zX()Z
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->zT()Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ba()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->AV()V
 
     :cond_1
     return-void
@@ -190,7 +190,7 @@
     throw p1
 .end method
 
-.method public static AZ()Lcom/google/firebase/iid/FirebaseInstanceId;
+.method public static AU()Lcom/google/firebase/iid/FirebaseInstanceId;
     .locals 1
 
     invoke-static {}, Lcom/google/firebase/FirebaseApp;->getInstance()Lcom/google/firebase/FirebaseApp;
@@ -204,7 +204,7 @@
     return-object v0
 .end method
 
-.method private final declared-synchronized Bb()V
+.method private final declared-synchronized AW()V
     .locals 2
 
     monitor-enter p0
@@ -233,23 +233,23 @@
     throw v0
 .end method
 
-.method public static Bc()Ljava/lang/String;
+.method public static AX()Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUx:Lcom/google/firebase/iid/s;
+    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUP:Lcom/google/firebase/iid/s;
 
     const-string v1, ""
 
-    invoke-virtual {v0, v1}, Lcom/google/firebase/iid/s;->dw(Ljava/lang/String;)Lcom/google/firebase/iid/ar;
+    invoke-virtual {v0, v1}, Lcom/google/firebase/iid/s;->dq(Ljava/lang/String;)Lcom/google/firebase/iid/ar;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/firebase/iid/ar;->aVj:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/firebase/iid/ar;->aVB:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method static Bf()Z
+.method static AZ()Z
     .locals 4
 
     const/4 v0, 0x3
@@ -291,7 +291,7 @@
 .method static W(Ljava/lang/String;Ljava/lang/String;)Lcom/google/firebase/iid/q;
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUx:Lcom/google/firebase/iid/s;
+    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUP:Lcom/google/firebase/iid/s;
 
     const-string v1, ""
 
@@ -305,7 +305,7 @@
 .method static synthetic a(Lcom/google/firebase/iid/FirebaseInstanceId;)Lcom/google/firebase/FirebaseApp;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUz:Lcom/google/firebase/FirebaseApp;
+    iget-object p0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUR:Lcom/google/firebase/FirebaseApp;
 
     return-object p0
 .end method
@@ -318,7 +318,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUy:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUQ:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-nez v1, :cond_0
 
@@ -334,10 +334,10 @@
 
     invoke-direct {v1, v2, v3}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;-><init>(ILjava/util/concurrent/ThreadFactory;)V
 
-    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUy:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUQ:Ljava/util/concurrent/ScheduledExecutorService;
 
     :cond_0
-    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUy:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUQ:Ljava/util/concurrent/ScheduledExecutorService;
 
     sget-object v2, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -360,12 +360,12 @@
 .method static synthetic b(Lcom/google/firebase/iid/FirebaseInstanceId;)V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ba()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->AV()V
 
     return-void
 .end method
 
-.method private static ds(Ljava/lang/String;)Ljava/lang/String;
+.method private static dm(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
     invoke-virtual {p0}, Ljava/lang/String;->isEmpty()Z
@@ -418,45 +418,10 @@
 
 
 # virtual methods
-.method final declared-synchronized Ab()V
+.method public final AV()V
     .locals 1
 
-    monitor-enter p0
-
-    :try_start_0
-    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUx:Lcom/google/firebase/iid/s;
-
-    invoke-virtual {v0}, Lcom/google/firebase/iid/s;->zY()V
-
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUE:Lcom/google/firebase/iid/FirebaseInstanceId$a;
-
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->zX()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bb()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_0
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public final Ba()V
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Be()Lcom/google/firebase/iid/q;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->AY()Lcom/google/firebase/iid/q;
 
     move-result-object v0
 
@@ -466,51 +431,25 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUD:Lcom/google/firebase/iid/w;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUV:Lcom/google/firebase/iid/w;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/w;->zX()Z
+    invoke-virtual {v0}, Lcom/google/firebase/iid/w;->zT()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bb()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->AW()V
 
     :cond_1
     return-void
 .end method
 
-.method public final Bd()Lcom/google/android/gms/tasks/Task;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lcom/google/android/gms/tasks/Task<",
-            "Lcom/google/firebase/iid/InstanceIdResult;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUz:Lcom/google/firebase/FirebaseApp;
-
-    invoke-static {v0}, Lcom/google/firebase/iid/g;->c(Lcom/google/firebase/FirebaseApp;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "*"
-
-    invoke-virtual {p0, v0, v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->V(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/tasks/Task;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method final Be()Lcom/google/firebase/iid/q;
+.method final AY()Lcom/google/firebase/iid/q;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUz:Lcom/google/firebase/FirebaseApp;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUR:Lcom/google/firebase/FirebaseApp;
 
     invoke-static {v0}, Lcom/google/firebase/iid/g;->c(Lcom/google/firebase/FirebaseApp;)Ljava/lang/String;
 
@@ -525,21 +464,21 @@
     return-object v0
 .end method
 
-.method final Bg()V
+.method final Ba()V
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUx:Lcom/google/firebase/iid/s;
+    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUP:Lcom/google/firebase/iid/s;
 
     const-string v1, ""
 
-    invoke-virtual {v0, v1}, Lcom/google/firebase/iid/s;->cw(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/google/firebase/iid/s;->cs(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bb()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->AW()V
 
     return-void
 .end method
 
-.method final V(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/tasks/Task;
+.method public final V(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/tasks/Task;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -553,7 +492,7 @@
         }
     .end annotation
 
-    invoke-static {p2}, Lcom/google/firebase/iid/FirebaseInstanceId;->ds(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/google/firebase/iid/FirebaseInstanceId;->dm(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -563,7 +502,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aPi:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aPA:Ljava/util/concurrent/Executor;
 
     new-instance v2, Lcom/google/firebase/iid/ag;
 
@@ -581,13 +520,13 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUA:Lcom/google/firebase/iid/g;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUS:Lcom/google/firebase/iid/g;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/g;->Bk()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/firebase/iid/g;->Be()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p1, v0}, Lcom/google/firebase/iid/q;->dv(Ljava/lang/String;)Z
+    invoke-virtual {p1, v0}, Lcom/google/firebase/iid/q;->dp(Ljava/lang/String;)Z
 
     move-result p1
 
@@ -623,7 +562,7 @@
 
     move-result-wide v0
 
-    sget-wide v3, Lcom/google/firebase/iid/FirebaseInstanceId;->alL:J
+    sget-wide v3, Lcom/google/firebase/iid/FirebaseInstanceId;->amd:J
 
     invoke-static {v0, v1, v3, v4}, Ljava/lang/Math;->min(JJ)J
 
@@ -631,7 +570,7 @@
 
     new-instance v3, Lcom/google/firebase/iid/u;
 
-    iget-object v4, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUD:Lcom/google/firebase/iid/w;
+    iget-object v4, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUV:Lcom/google/firebase/iid/w;
 
     invoke-direct {v3, p0, v4, v0, v1}, Lcom/google/firebase/iid/u;-><init>(Lcom/google/firebase/iid/FirebaseInstanceId;Lcom/google/firebase/iid/w;J)V
 
@@ -718,7 +657,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ab()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->zX()V
 
     :cond_0
     check-cast v0, Ljava/io/IOException;
@@ -742,6 +681,41 @@
     throw v0
 .end method
 
+.method final declared-synchronized zX()V
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUP:Lcom/google/firebase/iid/s;
+
+    invoke-virtual {v0}, Lcom/google/firebase/iid/s;->zU()V
+
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUW:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->zT()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->AW()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_0
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
 .method final declared-synchronized zza(Z)V
     .locals 0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceIdReceiver.smali b/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceIdReceiver.smali
index 1d4006d7c5..36f05d0794 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceIdReceiver.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/FirebaseInstanceIdReceiver.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static aUK:Lcom/google/firebase/iid/aa;
+.field private static aVc:Lcom/google/firebase/iid/aa;
 
 
 # direct methods
@@ -74,7 +74,7 @@
     return p0
 
     :cond_2
-    invoke-static {}, Lcom/google/firebase/iid/o;->Bp()Lcom/google/firebase/iid/o;
+    invoke-static {}, Lcom/google/firebase/iid/o;->Bj()Lcom/google/firebase/iid/o;
 
     move-result-object v0
 
@@ -282,21 +282,21 @@
 
     if-eqz p1, :cond_4
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AZ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AU()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bg()V
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ba()V
 
     goto :goto_1
 
     :cond_3
     :goto_0
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AZ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AU()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ab()V
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->zX()V
 
     :cond_4
     :goto_1
@@ -351,7 +351,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aUK:Lcom/google/firebase/iid/aa;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aVc:Lcom/google/firebase/iid/aa;
 
     if-nez v1, :cond_0
 
@@ -359,10 +359,10 @@
 
     invoke-direct {v1, p0, p1}, Lcom/google/firebase/iid/aa;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aUK:Lcom/google/firebase/iid/aa;
+    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aVc:Lcom/google/firebase/iid/aa;
 
     :cond_0
-    sget-object p0, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aUK:Lcom/google/firebase/iid/aa;
+    sget-object p0, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aVc:Lcom/google/firebase/iid/aa;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/Registrar$a.smali b/com.discord/smali_classes2/com/google/firebase/iid/Registrar$a.smali
index 06145af5a9..1f893d972f 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/Registrar$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/Registrar$a.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/Registrar$a;->aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/Registrar$a;->aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/Registrar.smali b/com.discord/smali_classes2/com/google/firebase/iid/Registrar.smali
index 60bbc360b4..b4dfbeb787 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/Registrar.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/Registrar.smali
@@ -72,7 +72,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/firebase/iid/i;->aUS:Lcom/google/firebase/components/g;
+    sget-object v1, Lcom/google/firebase/iid/i;->aVk:Lcom/google/firebase/components/g;
 
     invoke-virtual {v0, v1}, Lcom/google/firebase/components/b$a;->a(Lcom/google/firebase/components/g;)Lcom/google/firebase/components/b$a;
 
@@ -84,7 +84,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->AP()Lcom/google/firebase/components/b;
+    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->AL()Lcom/google/firebase/components/b;
 
     move-result-object v0
 
@@ -104,13 +104,13 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/firebase/iid/j;->aUS:Lcom/google/firebase/components/g;
+    sget-object v3, Lcom/google/firebase/iid/j;->aVk:Lcom/google/firebase/components/g;
 
     invoke-virtual {v2, v3}, Lcom/google/firebase/components/b$a;->a(Lcom/google/firebase/components/g;)Lcom/google/firebase/components/b$a;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/firebase/components/b$a;->AP()Lcom/google/firebase/components/b;
+    invoke-virtual {v2}, Lcom/google/firebase/components/b$a;->AL()Lcom/google/firebase/components/b;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/a.smali b/com.discord/smali_classes2/com/google/firebase/iid/a.smali
index 8c1094a875..31f4baccbe 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/a.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static Bi()Ljava/security/KeyPair;
+.method public static Bc()Ljava/security/KeyPair;
     .locals 2
 
     :try_start_0
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/aa.smali b/com.discord/smali_classes2/com/google/firebase/iid/aa.smali
index c623b5a4d8..9943f86f7c 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/aa.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/aa.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final aUR:Landroid/content/Context;
+.field private final aUQ:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private final aUy:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final aVR:Landroid/content/Intent;
 
-.field private final aVA:Ljava/util/Queue;
+.field private final aVS:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -21,11 +21,11 @@
     .end annotation
 .end field
 
-.field private aVB:Lcom/google/firebase/iid/v;
+.field private aVT:Lcom/google/firebase/iid/v;
 
-.field private aVC:Z
+.field private aVU:Z
 
-.field private final aVz:Landroid/content/Intent;
+.field private final aVj:Landroid/content/Context;
 
 
 # direct methods
@@ -58,23 +58,23 @@
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/aa;->aVA:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/google/firebase/iid/aa;->aVS:Ljava/util/Queue;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/firebase/iid/aa;->aVC:Z
+    iput-boolean v0, p0, Lcom/google/firebase/iid/aa;->aVU:Z
 
     invoke-virtual {p1}, Landroid/content/Context;->getApplicationContext()Landroid/content/Context;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/aa;->aUR:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/aa;->aVj:Landroid/content/Context;
 
     new-instance p1, Landroid/content/Intent;
 
     invoke-direct {p1, p2}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
 
-    iget-object p2, p0, Lcom/google/firebase/iid/aa;->aUR:Landroid/content/Context;
+    iget-object p2, p0, Lcom/google/firebase/iid/aa;->aVj:Landroid/content/Context;
 
     invoke-virtual {p2}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
@@ -84,18 +84,18 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/aa;->aVz:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/firebase/iid/aa;->aVR:Landroid/content/Intent;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/aa;->aUy:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p3, p0, Lcom/google/firebase/iid/aa;->aUQ:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-void
 .end method
 
-.method private final zY()V
+.method private final zU()V
     .locals 1
 
     :goto_0
-    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVA:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVS:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->isEmpty()Z
 
@@ -103,7 +103,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVA:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVS:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
@@ -143,7 +143,7 @@
 
     :cond_0
     :goto_0
-    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVA:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVS:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->isEmpty()Z
 
@@ -166,11 +166,11 @@
     invoke-static {v0, v2}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_1
-    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVB:Lcom/google/firebase/iid/v;
+    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVT:Lcom/google/firebase/iid/v;
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVB:Lcom/google/firebase/iid/v;
+    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVT:Lcom/google/firebase/iid/v;
 
     invoke-virtual {v0}, Lcom/google/firebase/iid/v;->isBinderAlive()Z
 
@@ -193,7 +193,7 @@
     invoke-static {v0, v2}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_2
-    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVA:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVS:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
@@ -201,7 +201,7 @@
 
     check-cast v0, Lcom/google/firebase/iid/z;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/aa;->aVB:Lcom/google/firebase/iid/v;
+    iget-object v2, p0, Lcom/google/firebase/iid/aa;->aVT:Lcom/google/firebase/iid/v;
 
     invoke-static {}, Landroid/os/Binder;->getCallingUid()I
 
@@ -228,15 +228,15 @@
     invoke-static {v3, v4}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_3
-    iget-object v2, v2, Lcom/google/firebase/iid/v;->aVs:Lcom/google/firebase/iid/x;
+    iget-object v2, v2, Lcom/google/firebase/iid/v;->aVK:Lcom/google/firebase/iid/x;
 
-    iget-object v3, v0, Lcom/google/firebase/iid/z;->aVv:Landroid/content/Intent;
+    iget-object v3, v0, Lcom/google/firebase/iid/z;->aVN:Landroid/content/Intent;
 
     invoke-interface {v2, v3}, Lcom/google/firebase/iid/x;->e(Landroid/content/Intent;)Lcom/google/android/gms/tasks/Task;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/firebase/iid/ad;->Br()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/ad;->Bl()Ljava/util/concurrent/Executor;
 
     move-result-object v3
 
@@ -272,7 +272,7 @@
 
     const-string v0, "FirebaseInstanceId"
 
-    iget-boolean v3, p0, Lcom/google/firebase/iid/aa;->aVC:Z
+    iget-boolean v3, p0, Lcom/google/firebase/iid/aa;->aVU:Z
 
     if-nez v3, :cond_6
 
@@ -303,20 +303,20 @@
     invoke-static {v0, v3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_7
-    iget-boolean v0, p0, Lcom/google/firebase/iid/aa;->aVC:Z
+    iget-boolean v0, p0, Lcom/google/firebase/iid/aa;->aVU:Z
 
     if-nez v0, :cond_9
 
-    iput-boolean v2, p0, Lcom/google/firebase/iid/aa;->aVC:Z
+    iput-boolean v2, p0, Lcom/google/firebase/iid/aa;->aVU:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aUR:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVj:Landroid/content/Context;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/aa;->aVz:Landroid/content/Intent;
+    iget-object v2, p0, Lcom/google/firebase/iid/aa;->aVR:Landroid/content/Intent;
 
     const/16 v3, 0x41
 
@@ -357,9 +357,9 @@
     invoke-static {v2, v3, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
     :goto_2
-    iput-boolean v1, p0, Lcom/google/firebase/iid/aa;->aVC:Z
+    iput-boolean v1, p0, Lcom/google/firebase/iid/aa;->aVU:Z
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/aa;->zY()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/aa;->zU()V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
@@ -412,11 +412,11 @@
     invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVA:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/aa;->aVS:Ljava/util/Queue;
 
     new-instance v1, Lcom/google/firebase/iid/z;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/aa;->aUy:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v2, p0, Lcom/google/firebase/iid/aa;->aUQ:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-direct {v1, p1, p2, v2}, Lcom/google/firebase/iid/z;-><init>(Landroid/content/Intent;Landroid/content/BroadcastReceiver$PendingResult;Ljava/util/concurrent/ScheduledExecutorService;)V
 
@@ -489,7 +489,7 @@
     :cond_0
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/firebase/iid/aa;->aVC:Z
+    iput-boolean p1, p0, Lcom/google/firebase/iid/aa;->aVU:Z
 
     instance-of p1, p2, Lcom/google/firebase/iid/v;
 
@@ -527,7 +527,7 @@
 
     invoke-static {p1, p2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/aa;->zY()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/aa;->zU()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -539,7 +539,7 @@
     :try_start_1
     check-cast p2, Lcom/google/firebase/iid/v;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/aa;->aVB:Lcom/google/firebase/iid/v;
+    iput-object p2, p0, Lcom/google/firebase/iid/aa;->aVT:Lcom/google/firebase/iid/v;
 
     invoke-direct {p0}, Lcom/google/firebase/iid/aa;->zza()V
     :try_end_1
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ab.smali b/com.discord/smali_classes2/com/google/firebase/iid/ab.smali
index 5ae5c9f0d4..b5a08611c8 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ab.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ab.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aVu:Lcom/google/firebase/iid/z;
+.field private final aVM:Lcom/google/firebase/iid/z;
 
-.field private final aVz:Landroid/content/Intent;
+.field private final aVR:Landroid/content/Intent;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ab;->aVu:Lcom/google/firebase/iid/z;
+    iput-object p1, p0, Lcom/google/firebase/iid/ab;->aVM:Lcom/google/firebase/iid/z;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ab;->aVz:Landroid/content/Intent;
+    iput-object p2, p0, Lcom/google/firebase/iid/ab;->aVR:Landroid/content/Intent;
 
     return-void
 .end method
@@ -30,9 +30,9 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ab;->aVu:Lcom/google/firebase/iid/z;
+    iget-object v0, p0, Lcom/google/firebase/iid/ab;->aVM:Lcom/google/firebase/iid/z;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/ab;->aVz:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/firebase/iid/ab;->aVR:Landroid/content/Intent;
 
     invoke-virtual {v1}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ac.smali b/com.discord/smali_classes2/com/google/firebase/iid/ac.smali
index 88bc4c67c2..475d6363cc 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ac.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ac.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aVD:Ljava/util/concurrent/ThreadFactory;
+.field static final aVV:Ljava/util/concurrent/ThreadFactory;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/iid/ac;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/iid/ac;->aVD:Ljava/util/concurrent/ThreadFactory;
+    sput-object v0, Lcom/google/firebase/iid/ac;->aVV:Ljava/util/concurrent/ThreadFactory;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ad.smali b/com.discord/smali_classes2/com/google/firebase/iid/ad.smali
index 4de97476e9..b4710aaa1c 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ad.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ad.smali
@@ -4,29 +4,29 @@
 
 
 # static fields
-.field private static final aUV:Ljava/util/concurrent/Executor;
+.field private static final aVn:Ljava/util/concurrent/Executor;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/iid/ae;->aUV:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/firebase/iid/ae;->aVn:Ljava/util/concurrent/Executor;
 
-    sput-object v0, Lcom/google/firebase/iid/ad;->aUV:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/iid/ad;->aVn:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
 
-.method static Br()Ljava/util/concurrent/Executor;
+.method static Bl()Ljava/util/concurrent/Executor;
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/iid/ad;->aUV:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/firebase/iid/ad;->aVn:Ljava/util/concurrent/Executor;
 
     return-object v0
 .end method
 
-.method static Bs()Ljava/util/concurrent/Executor;
+.method static Bm()Ljava/util/concurrent/Executor;
     .locals 9
 
     new-instance v8, Ljava/util/concurrent/ThreadPoolExecutor;
@@ -37,7 +37,7 @@
 
     invoke-direct {v6}, Ljava/util/concurrent/LinkedBlockingQueue;-><init>()V
 
-    sget-object v7, Lcom/google/firebase/iid/ac;->aVD:Ljava/util/concurrent/ThreadFactory;
+    sget-object v7, Lcom/google/firebase/iid/ac;->aVV:Ljava/util/concurrent/ThreadFactory;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ae.smali b/com.discord/smali_classes2/com/google/firebase/iid/ae.smali
index 3a24faff80..21e3f0e0cb 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ae.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ae.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aUV:Ljava/util/concurrent/Executor;
+.field static final aVn:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/iid/ae;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/iid/ae;->aUV:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/iid/ae;->aVn:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ag.smali b/com.discord/smali_classes2/com/google/firebase/iid/ag.smali
index 5607a66502..b52609098a 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ag.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ag.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private final alD:Ljava/lang/String;
+.field private final alJ:Ljava/lang/String;
 
-.field private final alr:Ljava/lang/String;
+.field private final alV:Ljava/lang/String;
 
 
 # direct methods
@@ -20,11 +20,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ag;->aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/ag;->aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ag;->alr:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/ag;->alJ:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/ag;->alD:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/firebase/iid/ag;->alV:Ljava/lang/String;
 
     return-void
 .end method
@@ -34,13 +34,13 @@
 .method public final b(Lcom/google/android/gms/tasks/Task;)Ljava/lang/Object;
     .locals 5
 
-    iget-object p1, p0, Lcom/google/firebase/iid/ag;->aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object p1, p0, Lcom/google/firebase/iid/ag;->aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ag;->alr:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/ag;->alJ:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/ag;->alD:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/iid/ag;->alV:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bc()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AX()Ljava/lang/String;
 
     move-result-object v2
 
@@ -56,7 +56,7 @@
 
     new-instance p1, Lcom/google/firebase/iid/at;
 
-    iget-object v0, v3, Lcom/google/firebase/iid/q;->aVj:Ljava/lang/String;
+    iget-object v0, v3, Lcom/google/firebase/iid/q;->aVB:Ljava/lang/String;
 
     invoke-direct {p1, v2, v0}, Lcom/google/firebase/iid/at;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
@@ -67,7 +67,7 @@
     return-object p1
 
     :cond_0
-    iget-object v3, p1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUC:Lcom/google/firebase/iid/l;
+    iget-object v3, p1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUU:Lcom/google/firebase/iid/l;
 
     new-instance v4, Lcom/google/firebase/iid/ai;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ah.smali b/com.discord/smali_classes2/com/google/firebase/iid/ah.smali
index 690763a766..36b37eea04 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ah.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ah.smali
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private final aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aVX:Ljava/lang/String;
 
-.field private final aVF:Ljava/lang/String;
+.field private final aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private final alD:Ljava/lang/String;
+.field private final alJ:Ljava/lang/String;
 
-.field private final alr:Ljava/lang/String;
+.field private final alV:Ljava/lang/String;
 
 
 # direct methods
@@ -22,13 +22,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ah;->aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/ah;->aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ah;->alr:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/ah;->alJ:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/ah;->alD:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/firebase/iid/ah;->alV:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/firebase/iid/ah;->aVF:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/firebase/iid/ah;->aVX:Ljava/lang/String;
 
     return-void
 .end method
@@ -38,21 +38,21 @@
 .method public final aG(Ljava/lang/Object;)Lcom/google/android/gms/tasks/Task;
     .locals 8
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ah;->aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/ah;->aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v3, p0, Lcom/google/firebase/iid/ah;->alr:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/firebase/iid/ah;->alJ:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/firebase/iid/ah;->alD:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/firebase/iid/ah;->alV:Ljava/lang/String;
 
-    iget-object v7, p0, Lcom/google/firebase/iid/ah;->aVF:Ljava/lang/String;
+    iget-object v7, p0, Lcom/google/firebase/iid/ah;->aVX:Ljava/lang/String;
 
     check-cast p1, Ljava/lang/String;
 
-    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUx:Lcom/google/firebase/iid/s;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aUP:Lcom/google/firebase/iid/s;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUA:Lcom/google/firebase/iid/g;
+    iget-object v0, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUS:Lcom/google/firebase/iid/g;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/g;->Bk()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/firebase/iid/g;->Be()Ljava/lang/String;
 
     move-result-object v6
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ai.smali b/com.discord/smali_classes2/com/google/firebase/iid/ai.smali
index b554702dfa..05a3e56869 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ai.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ai.smali
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private final aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aVX:Ljava/lang/String;
 
-.field private final aVF:Ljava/lang/String;
+.field private final aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private final alD:Ljava/lang/String;
+.field private final alJ:Ljava/lang/String;
 
-.field private final alr:Ljava/lang/String;
+.field private final alV:Ljava/lang/String;
 
 
 # direct methods
@@ -22,31 +22,31 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ai;->aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/ai;->aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ai;->alr:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/ai;->alJ:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/ai;->alD:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/firebase/iid/ai;->alV:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/firebase/iid/ai;->aVF:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/firebase/iid/ai;->aVX:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Bo()Lcom/google/android/gms/tasks/Task;
+.method public final Bi()Lcom/google/android/gms/tasks/Task;
     .locals 7
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ai;->aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/ai;->aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/ai;->alr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/iid/ai;->alJ:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/ai;->alD:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/firebase/iid/ai;->alV:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/firebase/iid/ai;->aVF:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/firebase/iid/ai;->aVX:Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUB:Lcom/google/firebase/iid/ak;
+    iget-object v4, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUT:Lcom/google/firebase/iid/ak;
 
     new-instance v5, Landroid/os/Bundle;
 
@@ -60,7 +60,7 @@
 
     move-result-object v4
 
-    iget-object v5, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aPi:Ljava/util/concurrent/Executor;
+    iget-object v5, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aPA:Ljava/util/concurrent/Executor;
 
     new-instance v6, Lcom/google/firebase/iid/ah;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/aj.smali b/com.discord/smali_classes2/com/google/firebase/iid/aj.smali
index 518f4d3713..1e1bb0933d 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/aj.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/aj.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aVG:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+.field private final aVY:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/aj;->aVG:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iput-object p1, p0, Lcom/google/firebase/iid/aj;->aVY:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
     return-void
 .end method
@@ -26,18 +26,18 @@
 .method public final b(Lcom/google/firebase/a/a;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/firebase/iid/aj;->aVG:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iget-object p1, p0, Lcom/google/firebase/iid/aj;->aVY:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
     monitor-enter p1
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->zX()Z
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->zT()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aUJ:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p1, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aVb:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-static {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->b(Lcom/google/firebase/iid/FirebaseInstanceId;)V
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ak.smali b/com.discord/smali_classes2/com/google/firebase/iid/ak.smali
index 5248d33854..a6aec9ebc7 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ak.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ak.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field private final aPi:Ljava/util/concurrent/Executor;
+.field private final aPA:Ljava/util/concurrent/Executor;
 
-.field private final aVH:Lcom/google/firebase/FirebaseApp;
+.field private final aVZ:Lcom/google/firebase/FirebaseApp;
 
-.field private final aVI:Lcom/google/firebase/iid/g;
+.field private final aWa:Lcom/google/firebase/iid/g;
 
-.field final aVJ:Lcom/google/firebase/iid/m;
+.field final aWb:Lcom/google/firebase/iid/m;
 
-.field private final aVK:Lcom/google/firebase/d/g;
+.field private final aWc:Lcom/google/firebase/d/g;
 
 
 # direct methods
@@ -47,15 +47,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ak;->aVH:Lcom/google/firebase/FirebaseApp;
+    iput-object p1, p0, Lcom/google/firebase/iid/ak;->aVZ:Lcom/google/firebase/FirebaseApp;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ak;->aVI:Lcom/google/firebase/iid/g;
+    iput-object p2, p0, Lcom/google/firebase/iid/ak;->aWa:Lcom/google/firebase/iid/g;
 
-    iput-object p4, p0, Lcom/google/firebase/iid/ak;->aVJ:Lcom/google/firebase/iid/m;
+    iput-object p4, p0, Lcom/google/firebase/iid/ak;->aWb:Lcom/google/firebase/iid/m;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/ak;->aPi:Ljava/util/concurrent/Executor;
+    iput-object p3, p0, Lcom/google/firebase/iid/ak;->aPA:Ljava/util/concurrent/Executor;
 
-    iput-object p5, p0, Lcom/google/firebase/iid/ak;->aVK:Lcom/google/firebase/d/g;
+    iput-object p5, p0, Lcom/google/firebase/iid/ak;->aWc:Lcom/google/firebase/d/g;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/firebase/iid/ad;->Br()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/ad;->Bl()Ljava/util/concurrent/Executor;
 
     move-result-object v0
 
@@ -124,21 +124,21 @@
 
     invoke-virtual {p4, p2, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/firebase/iid/ak;->aVH:Lcom/google/firebase/FirebaseApp;
+    iget-object p1, p0, Lcom/google/firebase/iid/ak;->aVZ:Lcom/google/firebase/FirebaseApp;
 
-    invoke-virtual {p1}, Lcom/google/firebase/FirebaseApp;->AH()Lcom/google/firebase/c;
+    invoke-virtual {p1}, Lcom/google/firebase/FirebaseApp;->AD()Lcom/google/firebase/c;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/firebase/c;->aTd:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/firebase/c;->aTv:Ljava/lang/String;
 
     const-string p2, "gmp_app_id"
 
     invoke-virtual {p4, p2, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/firebase/iid/ak;->aVI:Lcom/google/firebase/iid/g;
+    iget-object p1, p0, Lcom/google/firebase/iid/ak;->aWa:Lcom/google/firebase/iid/g;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/g;->Bm()I
+    invoke-virtual {p1}, Lcom/google/firebase/iid/g;->Bg()I
 
     move-result p1
 
@@ -160,9 +160,9 @@
 
     invoke-virtual {p4, p2, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/firebase/iid/ak;->aVI:Lcom/google/firebase/iid/g;
+    iget-object p1, p0, Lcom/google/firebase/iid/ak;->aWa:Lcom/google/firebase/iid/g;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/g;->Bk()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/firebase/iid/g;->Be()Ljava/lang/String;
 
     move-result-object p1
 
@@ -170,9 +170,9 @@
 
     invoke-virtual {p4, p2, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/firebase/iid/ak;->aVI:Lcom/google/firebase/iid/g;
+    iget-object p1, p0, Lcom/google/firebase/iid/ak;->aWa:Lcom/google/firebase/iid/g;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/g;->Bl()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/firebase/iid/g;->Bf()Ljava/lang/String;
 
     move-result-object p1
 
@@ -180,13 +180,13 @@
 
     invoke-virtual {p4, p2, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/google/android/gms/common/internal/o;->mg()Lcom/google/android/gms/common/internal/o;
+    invoke-static {}, Lcom/google/android/gms/common/internal/o;->me()Lcom/google/android/gms/common/internal/o;
 
     move-result-object p1
 
     const-string p2, "firebase-iid"
 
-    invoke-virtual {p1, p2}, Lcom/google/android/gms/common/internal/o;->aU(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, p2}, Lcom/google/android/gms/common/internal/o;->aP(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -218,7 +218,7 @@
 
     invoke-virtual {p4, p2, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/firebase/iid/ak;->aVK:Lcom/google/firebase/d/g;
+    iget-object p1, p0, Lcom/google/firebase/iid/ak;->aWc:Lcom/google/firebase/d/g;
 
     invoke-interface {p1}, Lcom/google/firebase/d/g;->getUserAgent()Ljava/lang/String;
 
@@ -232,7 +232,7 @@
 
     invoke-direct {p1}, Lcom/google/android/gms/tasks/h;-><init>()V
 
-    iget-object p2, p0, Lcom/google/firebase/iid/ak;->aPi:Ljava/util/concurrent/Executor;
+    iget-object p2, p0, Lcom/google/firebase/iid/ak;->aPA:Ljava/util/concurrent/Executor;
 
     new-instance p3, Lcom/google/firebase/iid/am;
 
@@ -240,7 +240,7 @@
 
     invoke-interface {p2, p3}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
-    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     return-object p1
 .end method
@@ -259,7 +259,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ak;->aPi:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/firebase/iid/ak;->aPA:Ljava/util/concurrent/Executor;
 
     new-instance v1, Lcom/google/firebase/iid/ao;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/am.smali b/com.discord/smali_classes2/com/google/firebase/iid/am.smali
index 8414838183..93c9da6c3e 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/am.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/am.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final aVL:Lcom/google/firebase/iid/ak;
+.field private final aWd:Lcom/google/firebase/iid/ak;
 
-.field private final aVM:Landroid/os/Bundle;
+.field private final aWe:Landroid/os/Bundle;
 
-.field private final aVN:Lcom/google/android/gms/tasks/h;
+.field private final aWf:Lcom/google/android/gms/tasks/h;
 
 
 # direct methods
@@ -20,11 +20,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/am;->aVL:Lcom/google/firebase/iid/ak;
+    iput-object p1, p0, Lcom/google/firebase/iid/am;->aWd:Lcom/google/firebase/iid/ak;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/am;->aVM:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/google/firebase/iid/am;->aWe:Landroid/os/Bundle;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/am;->aVN:Lcom/google/android/gms/tasks/h;
+    iput-object p3, p0, Lcom/google/firebase/iid/am;->aWf:Lcom/google/android/gms/tasks/h;
 
     return-void
 .end method
@@ -34,14 +34,14 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/firebase/iid/am;->aVL:Lcom/google/firebase/iid/ak;
+    iget-object v0, p0, Lcom/google/firebase/iid/am;->aWd:Lcom/google/firebase/iid/ak;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/am;->aVM:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/firebase/iid/am;->aWe:Landroid/os/Bundle;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/am;->aVN:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/firebase/iid/am;->aWf:Lcom/google/android/gms/tasks/h;
 
     :try_start_0
-    iget-object v0, v0, Lcom/google/firebase/iid/ak;->aVJ:Lcom/google/firebase/iid/m;
+    iget-object v0, v0, Lcom/google/firebase/iid/ak;->aWb:Lcom/google/firebase/iid/m;
 
     invoke-virtual {v0, v1}, Lcom/google/firebase/iid/m;->c(Landroid/os/Bundle;)Landroid/os/Bundle;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ao.smali b/com.discord/smali_classes2/com/google/firebase/iid/ao.smali
index 9a1108ffb5..52f29c177e 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ao.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ao.smali
@@ -19,14 +19,14 @@
 
 
 # instance fields
-.field private final synthetic aVL:Lcom/google/firebase/iid/ak;
+.field private final synthetic aWd:Lcom/google/firebase/iid/ak;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/firebase/iid/ak;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ao;->aVL:Lcom/google/firebase/iid/ak;
+    iput-object p1, p0, Lcom/google/firebase/iid/ao;->aWd:Lcom/google/firebase/iid/ak;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ap.smali b/com.discord/smali_classes2/com/google/firebase/iid/ap.smali
index 76ca4a9893..847a0f4b8c 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ap.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ap.smali
@@ -34,13 +34,13 @@
 
     invoke-direct {v2}, Ljava/util/Properties;-><init>()V
 
-    iget-object v3, p2, Lcom/google/firebase/iid/ar;->aVj:Ljava/lang/String;
+    iget-object v3, p2, Lcom/google/firebase/iid/ar;->aVB:Ljava/lang/String;
 
     const-string v4, "id"
 
     invoke-virtual {v2, v4, v3}, Ljava/util/Properties;->setProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-wide v3, p2, Lcom/google/firebase/iid/ar;->alM:J
+    iget-wide v3, p2, Lcom/google/firebase/iid/ar;->ame:J
 
     invoke-static {v3, v4}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -305,7 +305,7 @@
     return-object v3
 
     :cond_0
-    invoke-static {p0}, Lcom/google/firebase/iid/ap;->dx(Ljava/lang/String;)Ljava/security/PublicKey;
+    invoke-static {p0}, Lcom/google/firebase/iid/ap;->dr(Ljava/lang/String;)Ljava/security/PublicKey;
 
     move-result-object p0
 
@@ -376,7 +376,7 @@
 
     move-result-object v0
 
-    iget-object v1, p2, Lcom/google/firebase/iid/ar;->aVj:Ljava/lang/String;
+    iget-object v1, p2, Lcom/google/firebase/iid/ar;->aVB:Ljava/lang/String;
 
     invoke-interface {p0, v0, v1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
@@ -386,7 +386,7 @@
 
     move-result-object p1
 
-    iget-wide v0, p2, Lcom/google/firebase/iid/ar;->alM:J
+    iget-wide v0, p2, Lcom/google/firebase/iid/ar;->ame:J
 
     invoke-static {v0, v1}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -586,7 +586,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-static {p0}, Lcom/google/firebase/iid/ap;->dx(Ljava/lang/String;)Ljava/security/PublicKey;
+    invoke-static {p0}, Lcom/google/firebase/iid/ap;->dr(Ljava/lang/String;)Ljava/security/PublicKey;
 
     move-result-object p0
 
@@ -623,7 +623,7 @@
     throw v0
 .end method
 
-.method private static dx(Ljava/lang/String;)Ljava/security/PublicKey;
+.method private static dr(Ljava/lang/String;)Ljava/security/PublicKey;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -720,7 +720,7 @@
 .method static r(Landroid/content/Context;Ljava/lang/String;)Lcom/google/firebase/iid/ar;
     .locals 5
 
-    invoke-static {}, Lcom/google/firebase/iid/a;->Bi()Ljava/security/KeyPair;
+    invoke-static {}, Lcom/google/firebase/iid/a;->Bc()Ljava/security/KeyPair;
 
     move-result-object v0
 
@@ -812,7 +812,7 @@
 
     :cond_0
     :try_start_0
-    invoke-static {p0}, Lcom/google/firebase/iid/ap;->u(Ljava/io/File;)Lcom/google/firebase/iid/ar;
+    invoke-static {p0}, Lcom/google/firebase/iid/ap;->t(Ljava/io/File;)Lcom/google/firebase/iid/ar;
 
     move-result-object p0
     :try_end_0
@@ -872,7 +872,7 @@
 
     :cond_1
     :try_start_1
-    invoke-static {p0}, Lcom/google/firebase/iid/ap;->u(Ljava/io/File;)Lcom/google/firebase/iid/ar;
+    invoke-static {p0}, Lcom/google/firebase/iid/ap;->t(Ljava/io/File;)Lcom/google/firebase/iid/ar;
 
     move-result-object p0
     :try_end_1
@@ -920,7 +920,7 @@
     throw p1
 .end method
 
-.method private static u(Ljava/io/File;)Lcom/google/firebase/iid/ar;
+.method private static t(Ljava/io/File;)Lcom/google/firebase/iid/ar;
     .locals 7
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/aq.smali b/com.discord/smali_classes2/com/google/firebase/iid/aq.smali
index 9fe8c54c03..5ecd821672 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/aq.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/aq.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final ait:Landroid/os/IBinder;
+.field private final aiL:Landroid/os/IBinder;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/aq;->ait:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/firebase/iid/aq;->aiL:Landroid/os/IBinder;
 
     return-void
 .end method
@@ -48,7 +48,7 @@
     invoke-virtual {p1, v0, v2}, Landroid/os/Message;->writeToParcel(Landroid/os/Parcel;I)V
 
     :try_start_0
-    iget-object p1, p0, Lcom/google/firebase/iid/aq;->ait:Landroid/os/IBinder;
+    iget-object p1, p0, Lcom/google/firebase/iid/aq;->aiL:Landroid/os/IBinder;
 
     const/4 v2, 0x0
 
@@ -71,7 +71,7 @@
 .method public final asBinder()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/aq;->ait:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/firebase/iid/aq;->aiL:Landroid/os/IBinder;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ar.smali b/com.discord/smali_classes2/com/google/firebase/iid/ar.smali
index 399c6e694e..25ee028b82 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ar.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ar.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final aVj:Ljava/lang/String;
+.field final aVB:Ljava/lang/String;
 
-.field final alM:J
+.field final ame:J
 
 
 # direct methods
@@ -21,9 +21,9 @@
 
     check-cast p1, Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ar;->aVj:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/ar;->aVB:Ljava/lang/String;
 
-    iput-wide p2, p0, Lcom/google/firebase/iid/ar;->alM:J
+    iput-wide p2, p0, Lcom/google/firebase/iid/ar;->ame:J
 
     return-void
 .end method
@@ -44,17 +44,17 @@
     :cond_0
     check-cast p1, Lcom/google/firebase/iid/ar;
 
-    iget-wide v2, p0, Lcom/google/firebase/iid/ar;->alM:J
+    iget-wide v2, p0, Lcom/google/firebase/iid/ar;->ame:J
 
-    iget-wide v4, p1, Lcom/google/firebase/iid/ar;->alM:J
+    iget-wide v4, p1, Lcom/google/firebase/iid/ar;->ame:J
 
     cmp-long v0, v2, v4
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ar;->aVj:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/ar;->aVB:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/firebase/iid/ar;->aVj:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/firebase/iid/ar;->aVB:Ljava/lang/String;
 
     invoke-virtual {v0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -77,13 +77,13 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/ar;->aVj:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/iid/ar;->aVB:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/firebase/iid/ar;->alM:J
+    iget-wide v1, p0, Lcom/google/firebase/iid/ar;->ame:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/at.smali b/com.discord/smali_classes2/com/google/firebase/iid/at.smali
index 798240ca58..30b256ccec 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/at.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/at.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aVj:Ljava/lang/String;
+.field private final aVB:Ljava/lang/String;
 
-.field private final alr:Ljava/lang/String;
+.field private final alJ:Ljava/lang/String;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/at;->aVj:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/at;->aVB:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/at;->alr:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/at;->alJ:Ljava/lang/String;
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 .method public final getToken()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/at;->alr:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/at;->alJ:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/au.smali b/com.discord/smali_classes2/com/google/firebase/iid/au.smali
index a46b547127..39b1494ba3 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/au.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/au.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static aVO:Lcom/google/firebase/iid/au;
+.field private static aWg:Lcom/google/firebase/iid/au;
 
 
 # instance fields
-.field final aUy:Ljava/util/concurrent/ScheduledExecutorService;
+.field final aUQ:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private aVP:Lcom/google/firebase/iid/av;
+.field final aVE:Landroid/content/Context;
 
-.field final aVm:Landroid/content/Context;
+.field private aWh:Lcom/google/firebase/iid/av;
 
 .field private zze:I
 
@@ -29,19 +29,19 @@
 
     invoke-direct {v0, p0, v1}, Lcom/google/firebase/iid/av;-><init>(Lcom/google/firebase/iid/au;B)V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/au;->aVP:Lcom/google/firebase/iid/av;
+    iput-object v0, p0, Lcom/google/firebase/iid/au;->aWh:Lcom/google/firebase/iid/av;
 
     const/4 v0, 0x1
 
     iput v0, p0, Lcom/google/firebase/iid/au;->zze:I
 
-    iput-object p2, p0, Lcom/google/firebase/iid/au;->aUy:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p2, p0, Lcom/google/firebase/iid/au;->aUQ:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-virtual {p1}, Landroid/content/Context;->getApplicationContext()Landroid/content/Context;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/au;->aVm:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/au;->aVE:Landroid/content/Context;
 
     return-void
 .end method
@@ -54,13 +54,13 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/au;->aVO:Lcom/google/firebase/iid/au;
+    sget-object v1, Lcom/google/firebase/iid/au;->aWg:Lcom/google/firebase/iid/au;
 
     if-nez v1, :cond_0
 
     new-instance v1, Lcom/google/firebase/iid/au;
 
-    invoke-static {}, Lcom/google/android/gms/internal/e/a;->mN()Lcom/google/android/gms/internal/e/b;
+    invoke-static {}, Lcom/google/android/gms/internal/e/a;->mL()Lcom/google/android/gms/internal/e/b;
 
     move-result-object v2
 
@@ -78,10 +78,10 @@
 
     invoke-direct {v1, p0, v2}, Lcom/google/firebase/iid/au;-><init>(Landroid/content/Context;Ljava/util/concurrent/ScheduledExecutorService;)V
 
-    sput-object v1, Lcom/google/firebase/iid/au;->aVO:Lcom/google/firebase/iid/au;
+    sput-object v1, Lcom/google/firebase/iid/au;->aWg:Lcom/google/firebase/iid/au;
 
     :cond_0
-    sget-object p0, Lcom/google/firebase/iid/au;->aVO:Lcom/google/firebase/iid/au;
+    sget-object p0, Lcom/google/firebase/iid/au;->aWg:Lcom/google/firebase/iid/au;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -99,7 +99,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized Bj()I
+.method public final declared-synchronized Bd()I
     .locals 2
 
     monitor-enter p0
@@ -185,7 +185,7 @@
     invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/au;->aVP:Lcom/google/firebase/iid/av;
+    iget-object v0, p0, Lcom/google/firebase/iid/au;->aWh:Lcom/google/firebase/iid/av;
 
     invoke-virtual {v0, p1}, Lcom/google/firebase/iid/av;->b(Lcom/google/firebase/iid/f;)Z
 
@@ -199,16 +199,16 @@
 
     invoke-direct {v0, p0, v1}, Lcom/google/firebase/iid/av;-><init>(Lcom/google/firebase/iid/au;B)V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/au;->aVP:Lcom/google/firebase/iid/av;
+    iput-object v0, p0, Lcom/google/firebase/iid/au;->aWh:Lcom/google/firebase/iid/av;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/au;->aVP:Lcom/google/firebase/iid/av;
+    iget-object v0, p0, Lcom/google/firebase/iid/au;->aWh:Lcom/google/firebase/iid/av;
 
     invoke-virtual {v0, p1}, Lcom/google/firebase/iid/av;->b(Lcom/google/firebase/iid/f;)Z
 
     :cond_1
-    iget-object p1, p1, Lcom/google/firebase/iid/f;->aUO:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p1, Lcom/google/firebase/iid/f;->aVg:Lcom/google/android/gms/tasks/h;
 
-    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/av.smali b/com.discord/smali_classes2/com/google/firebase/iid/av.smali
index 3550c3d47d..085aefdffd 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/av.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/av.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field final aVA:Ljava/util/Queue;
+.field final aVS:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -17,11 +17,11 @@
     .end annotation
 .end field
 
-.field final aVQ:Landroid/os/Messenger;
+.field final aWi:Landroid/os/Messenger;
 
-.field aVR:Lcom/google/firebase/iid/d;
+.field aWj:Lcom/google/firebase/iid/d;
 
-.field final aVS:Landroid/util/SparseArray;
+.field final aWk:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field final synthetic aVT:Lcom/google/firebase/iid/au;
+.field final synthetic aWl:Lcom/google/firebase/iid/au;
 
 .field zza:I
 
@@ -40,7 +40,7 @@
 .method private constructor <init>(Lcom/google/firebase/iid/au;)V
     .locals 3
 
-    iput-object p1, p0, Lcom/google/firebase/iid/av;->aVT:Lcom/google/firebase/iid/au;
+    iput-object p1, p0, Lcom/google/firebase/iid/av;->aWl:Lcom/google/firebase/iid/au;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -64,19 +64,19 @@
 
     invoke-direct {p1, v0}, Landroid/os/Messenger;-><init>(Landroid/os/Handler;)V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/av;->aVQ:Landroid/os/Messenger;
+    iput-object p1, p0, Lcom/google/firebase/iid/av;->aWi:Landroid/os/Messenger;
 
     new-instance p1, Ljava/util/ArrayDeque;
 
     invoke-direct {p1}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/av;->aVA:Ljava/util/Queue;
+    iput-object p1, p0, Lcom/google/firebase/iid/av;->aVS:Ljava/util/Queue;
 
     new-instance p1, Landroid/util/SparseArray;
 
     invoke-direct {p1}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/av;->aVS:Landroid/util/SparseArray;
+    iput-object p1, p0, Lcom/google/firebase/iid/av;->aWk:Landroid/util/SparseArray;
 
     return-void
 .end method
@@ -89,12 +89,12 @@
     return-void
 .end method
 
-.method private final zZ()V
+.method private final zV()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVT:Lcom/google/firebase/iid/au;
+    iget-object v0, p0, Lcom/google/firebase/iid/av;->aWl:Lcom/google/firebase/iid/au;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/au;->aUy:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, v0, Lcom/google/firebase/iid/au;->aUQ:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v1, Lcom/google/firebase/iid/b;
 
@@ -179,11 +179,11 @@
 
     :cond_2
     :try_start_1
-    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVA:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVS:Ljava/util/Queue;
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/av;->zZ()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/av;->zV()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -193,7 +193,7 @@
 
     :cond_3
     :try_start_2
-    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVA:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVS:Ljava/util/Queue;
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
     :try_end_2
@@ -205,7 +205,7 @@
 
     :cond_4
     :try_start_3
-    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVA:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVS:Ljava/util/Queue;
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
@@ -250,11 +250,11 @@
 
     invoke-virtual {p1, v0}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVT:Lcom/google/firebase/iid/au;
+    iget-object v0, p0, Lcom/google/firebase/iid/av;->aWl:Lcom/google/firebase/iid/au;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/au;->aVm:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/firebase/iid/au;->aVE:Landroid/content/Context;
 
     invoke-static {v0, p1, p0, v3}, Lcom/google/android/gms/common/stats/a;->b(Landroid/content/Context;Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
 
@@ -269,9 +269,9 @@
     goto :goto_2
 
     :cond_7
-    iget-object p1, p0, Lcom/google/firebase/iid/av;->aVT:Lcom/google/firebase/iid/au;
+    iget-object p1, p0, Lcom/google/firebase/iid/av;->aWl:Lcom/google/firebase/iid/au;
 
-    iget-object p1, p1, Lcom/google/firebase/iid/au;->aUy:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p1, Lcom/google/firebase/iid/au;->aUQ:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v0, Lcom/google/firebase/iid/aw;
 
@@ -337,7 +337,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/iid/av;->aVS:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/google/firebase/iid/av;->aWk:Landroid/util/SparseArray;
 
     invoke-virtual {v1, v0}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -374,7 +374,7 @@
     return v2
 
     :cond_1
-    iget-object v3, p0, Lcom/google/firebase/iid/av;->aVS:Landroid/util/SparseArray;
+    iget-object v3, p0, Lcom/google/firebase/iid/av;->aWk:Landroid/util/SparseArray;
 
     invoke-virtual {v3, v0}, Landroid/util/SparseArray;->remove(I)V
 
@@ -433,7 +433,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVS:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/google/firebase/iid/av;->aWk:Landroid/util/SparseArray;
 
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -463,7 +463,7 @@
 
     invoke-static {v1, v2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget-object v1, p0, Lcom/google/firebase/iid/av;->aVS:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/google/firebase/iid/av;->aWk:Landroid/util/SparseArray;
 
     invoke-virtual {v1, p1}, Landroid/util/SparseArray;->remove(I)V
 
@@ -619,11 +619,11 @@
     :cond_5
     iput v4, p0, Lcom/google/firebase/iid/av;->zza:I
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVT:Lcom/google/firebase/iid/au;
+    iget-object v0, p0, Lcom/google/firebase/iid/av;->aWl:Lcom/google/firebase/iid/au;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/au;->aVm:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/firebase/iid/au;->aVE:Landroid/content/Context;
 
     invoke-static {v0, p0}, Lcom/google/android/gms/common/stats/a;->a(Landroid/content/Context;Landroid/content/ServiceConnection;)V
 
@@ -631,7 +631,7 @@
 
     invoke-direct {v0, p1, p2}, Lcom/google/firebase/iid/e;-><init>(ILjava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/firebase/iid/av;->aVA:Ljava/util/Queue;
+    iget-object p1, p0, Lcom/google/firebase/iid/av;->aVS:Ljava/util/Queue;
 
     invoke-interface {p1}, Ljava/util/Queue;->iterator()Ljava/util/Iterator;
 
@@ -655,14 +655,14 @@
     goto :goto_1
 
     :cond_6
-    iget-object p1, p0, Lcom/google/firebase/iid/av;->aVA:Ljava/util/Queue;
+    iget-object p1, p0, Lcom/google/firebase/iid/av;->aVS:Ljava/util/Queue;
 
     invoke-interface {p1}, Ljava/util/Queue;->clear()V
 
     const/4 p1, 0x0
 
     :goto_2
-    iget-object p2, p0, Lcom/google/firebase/iid/av;->aVS:Landroid/util/SparseArray;
+    iget-object p2, p0, Lcom/google/firebase/iid/av;->aWk:Landroid/util/SparseArray;
 
     invoke-virtual {p2}, Landroid/util/SparseArray;->size()I
 
@@ -670,7 +670,7 @@
 
     if-ge p1, p2, :cond_7
 
-    iget-object p2, p0, Lcom/google/firebase/iid/av;->aVS:Landroid/util/SparseArray;
+    iget-object p2, p0, Lcom/google/firebase/iid/av;->aWk:Landroid/util/SparseArray;
 
     invoke-virtual {p2, p1}, Landroid/util/SparseArray;->valueAt(I)Ljava/lang/Object;
 
@@ -685,7 +685,7 @@
     goto :goto_2
 
     :cond_7
-    iget-object p1, p0, Lcom/google/firebase/iid/av;->aVS:Landroid/util/SparseArray;
+    iget-object p1, p0, Lcom/google/firebase/iid/av;->aWk:Landroid/util/SparseArray;
 
     invoke-virtual {p1}, Landroid/util/SparseArray;->clear()V
     :try_end_2
@@ -762,7 +762,7 @@
 
     invoke-direct {v1, p2}, Lcom/google/firebase/iid/d;-><init>(Landroid/os/IBinder;)V
 
-    iput-object v1, p0, Lcom/google/firebase/iid/av;->aVR:Lcom/google/firebase/iid/d;
+    iput-object v1, p0, Lcom/google/firebase/iid/av;->aWj:Lcom/google/firebase/iid/d;
     :try_end_1
     .catch Landroid/os/RemoteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -770,7 +770,7 @@
     :try_start_2
     iput v0, p0, Lcom/google/firebase/iid/av;->zza:I
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/av;->zZ()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/av;->zV()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -843,7 +843,7 @@
     throw p1
 .end method
 
-.method final declared-synchronized zY()V
+.method final declared-synchronized zU()V
     .locals 2
 
     monitor-enter p0
@@ -886,7 +886,7 @@
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVA:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVS:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->isEmpty()Z
 
@@ -894,7 +894,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVS:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/google/firebase/iid/av;->aWk:Landroid/util/SparseArray;
 
     invoke-virtual {v0}, Landroid/util/SparseArray;->size()I
 
@@ -921,11 +921,11 @@
 
     iput v0, p0, Lcom/google/firebase/iid/av;->zza:I
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->mn()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ml()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/av;->aVT:Lcom/google/firebase/iid/au;
+    iget-object v0, p0, Lcom/google/firebase/iid/av;->aWl:Lcom/google/firebase/iid/au;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/au;->aVm:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/firebase/iid/au;->aVE:Landroid/content/Context;
 
     invoke-static {v0, p0}, Lcom/google/android/gms/common/stats/a;->a(Landroid/content/Context;Landroid/content/ServiceConnection;)V
     :try_end_0
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/aw.smali b/com.discord/smali_classes2/com/google/firebase/iid/aw.smali
index 82016ab3b9..308d322545 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/aw.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/aw.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aUL:Lcom/google/firebase/iid/av;
+.field private final aVd:Lcom/google/firebase/iid/av;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/aw;->aUL:Lcom/google/firebase/iid/av;
+    iput-object p1, p0, Lcom/google/firebase/iid/aw;->aVd:Lcom/google/firebase/iid/av;
 
     return-void
 .end method
@@ -26,9 +26,9 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/aw;->aUL:Lcom/google/firebase/iid/av;
+    iget-object v0, p0, Lcom/google/firebase/iid/aw;->aVd:Lcom/google/firebase/iid/av;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/av;->zY()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/av;->zU()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ax.smali b/com.discord/smali_classes2/com/google/firebase/iid/ax.smali
index da9a09be18..cdb2533a94 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ax.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ax.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aUL:Lcom/google/firebase/iid/av;
+.field private final aVd:Lcom/google/firebase/iid/av;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ax;->aUL:Lcom/google/firebase/iid/av;
+    iput-object p1, p0, Lcom/google/firebase/iid/ax;->aVd:Lcom/google/firebase/iid/av;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final handleMessage(Landroid/os/Message;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ax;->aUL:Lcom/google/firebase/iid/av;
+    iget-object v0, p0, Lcom/google/firebase/iid/ax;->aVd:Lcom/google/firebase/iid/av;
 
     invoke-virtual {v0, p1}, Lcom/google/firebase/iid/av;->c(Landroid/os/Message;)Z
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ay.smali b/com.discord/smali_classes2/com/google/firebase/iid/ay.smali
index 920aec0315..03a2a77b29 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ay.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ay.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aUL:Lcom/google/firebase/iid/av;
+.field private final aVd:Lcom/google/firebase/iid/av;
 
-.field private final aVU:Lcom/google/firebase/iid/f;
+.field private final aWm:Lcom/google/firebase/iid/f;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ay;->aUL:Lcom/google/firebase/iid/av;
+    iput-object p1, p0, Lcom/google/firebase/iid/ay;->aVd:Lcom/google/firebase/iid/av;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ay;->aVU:Lcom/google/firebase/iid/f;
+    iput-object p2, p0, Lcom/google/firebase/iid/ay;->aWm:Lcom/google/firebase/iid/f;
 
     return-void
 .end method
@@ -30,9 +30,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ay;->aUL:Lcom/google/firebase/iid/av;
+    iget-object v0, p0, Lcom/google/firebase/iid/ay;->aVd:Lcom/google/firebase/iid/av;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/ay;->aVU:Lcom/google/firebase/iid/f;
+    iget-object v1, p0, Lcom/google/firebase/iid/ay;->aWm:Lcom/google/firebase/iid/f;
 
     iget v1, v1, Lcom/google/firebase/iid/f;->zza:I
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/b.smali b/com.discord/smali_classes2/com/google/firebase/iid/b.smali
index 116792d631..1104774a5e 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/b.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/b.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aUL:Lcom/google/firebase/iid/av;
+.field private final aVd:Lcom/google/firebase/iid/av;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/b;->aUL:Lcom/google/firebase/iid/av;
+    iput-object p1, p0, Lcom/google/firebase/iid/b;->aVd:Lcom/google/firebase/iid/av;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final run()V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/firebase/iid/b;->aUL:Lcom/google/firebase/iid/av;
+    iget-object v0, p0, Lcom/google/firebase/iid/b;->aVd:Lcom/google/firebase/iid/av;
 
     :goto_0
     monitor-enter v0
@@ -43,7 +43,7 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lcom/google/firebase/iid/av;->aVA:Ljava/util/Queue;
+    iget-object v1, v0, Lcom/google/firebase/iid/av;->aVS:Ljava/util/Queue;
 
     invoke-interface {v1}, Ljava/util/Queue;->isEmpty()Z
 
@@ -58,7 +58,7 @@
     return-void
 
     :cond_1
-    iget-object v1, v0, Lcom/google/firebase/iid/av;->aVA:Ljava/util/Queue;
+    iget-object v1, v0, Lcom/google/firebase/iid/av;->aVS:Ljava/util/Queue;
 
     invoke-interface {v1}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
@@ -66,15 +66,15 @@
 
     check-cast v1, Lcom/google/firebase/iid/f;
 
-    iget-object v3, v0, Lcom/google/firebase/iid/av;->aVS:Landroid/util/SparseArray;
+    iget-object v3, v0, Lcom/google/firebase/iid/av;->aWk:Landroid/util/SparseArray;
 
     iget v4, v1, Lcom/google/firebase/iid/f;->zza:I
 
     invoke-virtual {v3, v4, v1}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
 
-    iget-object v3, v0, Lcom/google/firebase/iid/av;->aVT:Lcom/google/firebase/iid/au;
+    iget-object v3, v0, Lcom/google/firebase/iid/av;->aWl:Lcom/google/firebase/iid/au;
 
-    iget-object v3, v3, Lcom/google/firebase/iid/au;->aUy:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v3, v3, Lcom/google/firebase/iid/au;->aUQ:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v4, Lcom/google/firebase/iid/ay;
 
@@ -133,17 +133,17 @@
     invoke-static {v4, v3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_2
-    iget-object v3, v0, Lcom/google/firebase/iid/av;->aVT:Lcom/google/firebase/iid/au;
+    iget-object v3, v0, Lcom/google/firebase/iid/av;->aWl:Lcom/google/firebase/iid/au;
 
-    iget-object v3, v3, Lcom/google/firebase/iid/au;->aVm:Landroid/content/Context;
+    iget-object v3, v3, Lcom/google/firebase/iid/au;->aVE:Landroid/content/Context;
 
-    iget-object v4, v0, Lcom/google/firebase/iid/av;->aVQ:Landroid/os/Messenger;
+    iget-object v4, v0, Lcom/google/firebase/iid/av;->aWi:Landroid/os/Messenger;
 
     invoke-static {}, Landroid/os/Message;->obtain()Landroid/os/Message;
 
     move-result-object v5
 
-    iget v6, v1, Lcom/google/firebase/iid/f;->aUP:I
+    iget v6, v1, Lcom/google/firebase/iid/f;->aVh:I
 
     iput v6, v5, Landroid/os/Message;->what:I
 
@@ -157,7 +157,7 @@
 
     invoke-direct {v4}, Landroid/os/Bundle;-><init>()V
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/f;->zX()Z
+    invoke-virtual {v1}, Lcom/google/firebase/iid/f;->zT()Z
 
     move-result v6
 
@@ -173,7 +173,7 @@
 
     invoke-virtual {v4, v6, v3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, v1, Lcom/google/firebase/iid/f;->aUQ:Landroid/os/Bundle;
+    iget-object v1, v1, Lcom/google/firebase/iid/f;->aVi:Landroid/os/Bundle;
 
     const-string v3, "data"
 
@@ -182,24 +182,24 @@
     invoke-virtual {v5, v4}, Landroid/os/Message;->setData(Landroid/os/Bundle;)V
 
     :try_start_1
-    iget-object v1, v0, Lcom/google/firebase/iid/av;->aVR:Lcom/google/firebase/iid/d;
+    iget-object v1, v0, Lcom/google/firebase/iid/av;->aWj:Lcom/google/firebase/iid/d;
 
-    iget-object v3, v1, Lcom/google/firebase/iid/d;->aUM:Landroid/os/Messenger;
+    iget-object v3, v1, Lcom/google/firebase/iid/d;->aVe:Landroid/os/Messenger;
 
     if-eqz v3, :cond_3
 
-    iget-object v1, v1, Lcom/google/firebase/iid/d;->aUM:Landroid/os/Messenger;
+    iget-object v1, v1, Lcom/google/firebase/iid/d;->aVe:Landroid/os/Messenger;
 
     invoke-virtual {v1, v5}, Landroid/os/Messenger;->send(Landroid/os/Message;)V
 
     goto/16 :goto_0
 
     :cond_3
-    iget-object v3, v1, Lcom/google/firebase/iid/d;->aUN:Lcom/google/firebase/iid/zzd;
+    iget-object v3, v1, Lcom/google/firebase/iid/d;->aVf:Lcom/google/firebase/iid/zzd;
 
     if-eqz v3, :cond_4
 
-    iget-object v1, v1, Lcom/google/firebase/iid/d;->aUN:Lcom/google/firebase/iid/zzd;
+    iget-object v1, v1, Lcom/google/firebase/iid/d;->aVf:Lcom/google/firebase/iid/zzd;
 
     invoke-virtual {v1, v5}, Lcom/google/firebase/iid/zzd;->a(Landroid/os/Message;)V
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/c.smali b/com.discord/smali_classes2/com/google/firebase/iid/c.smali
index 5882f28ad8..1edf8122bc 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/c.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/c.smali
@@ -59,7 +59,7 @@
     return-void
 .end method
 
-.method final zX()Z
+.method final zT()Z
     .locals 1
 
     const/4 v0, 0x1
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/d.smali b/com.discord/smali_classes2/com/google/firebase/iid/d.smali
index 82ff6805ed..92246a4884 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/d.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final aUM:Landroid/os/Messenger;
+.field final aVe:Landroid/os/Messenger;
 
-.field final aUN:Lcom/google/firebase/iid/zzd;
+.field final aVf:Lcom/google/firebase/iid/zzd;
 
 
 # direct methods
@@ -38,9 +38,9 @@
 
     invoke-direct {v0, p1}, Landroid/os/Messenger;-><init>(Landroid/os/IBinder;)V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/d;->aUM:Landroid/os/Messenger;
+    iput-object v0, p0, Lcom/google/firebase/iid/d;->aVe:Landroid/os/Messenger;
 
-    iput-object v2, p0, Lcom/google/firebase/iid/d;->aUN:Lcom/google/firebase/iid/zzd;
+    iput-object v2, p0, Lcom/google/firebase/iid/d;->aVf:Lcom/google/firebase/iid/zzd;
 
     return-void
 
@@ -57,9 +57,9 @@
 
     invoke-direct {v0, p1}, Lcom/google/firebase/iid/zzd;-><init>(Landroid/os/IBinder;)V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/d;->aUN:Lcom/google/firebase/iid/zzd;
+    iput-object v0, p0, Lcom/google/firebase/iid/d;->aVf:Lcom/google/firebase/iid/zzd;
 
-    iput-object v2, p0, Lcom/google/firebase/iid/d;->aUM:Landroid/os/Messenger;
+    iput-object v2, p0, Lcom/google/firebase/iid/d;->aVe:Landroid/os/Messenger;
 
     return-void
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/f.smali b/com.discord/smali_classes2/com/google/firebase/iid/f.smali
index eb8c3b521b..756d94bf56 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/f.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/f.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final aUO:Lcom/google/android/gms/tasks/h;
+.field final aVg:Lcom/google/android/gms/tasks/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/h<",
@@ -24,9 +24,9 @@
     .end annotation
 .end field
 
-.field final aUP:I
+.field final aVh:I
 
-.field final aUQ:Landroid/os/Bundle;
+.field final aVi:Landroid/os/Bundle;
 
 .field final zza:I
 
@@ -41,13 +41,13 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/tasks/h;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/f;->aUO:Lcom/google/android/gms/tasks/h;
+    iput-object v0, p0, Lcom/google/firebase/iid/f;->aVg:Lcom/google/android/gms/tasks/h;
 
     iput p1, p0, Lcom/google/firebase/iid/f;->zza:I
 
-    iput p2, p0, Lcom/google/firebase/iid/f;->aUP:I
+    iput p2, p0, Lcom/google/firebase/iid/f;->aVh:I
 
-    iput-object p3, p0, Lcom/google/firebase/iid/f;->aUQ:Landroid/os/Bundle;
+    iput-object p3, p0, Lcom/google/firebase/iid/f;->aVi:Landroid/os/Bundle;
 
     return-void
 .end method
@@ -123,7 +123,7 @@
     invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/f;->aUO:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/firebase/iid/f;->aVg:Lcom/google/android/gms/tasks/h;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/h;->k(Ljava/lang/Object;)V
 
@@ -194,7 +194,7 @@
     invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/f;->aUO:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/firebase/iid/f;->aVg:Lcom/google/android/gms/tasks/h;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/h;->f(Ljava/lang/Exception;)V
 
@@ -207,11 +207,11 @@
 .method public toString()Ljava/lang/String;
     .locals 5
 
-    iget v0, p0, Lcom/google/firebase/iid/f;->aUP:I
+    iget v0, p0, Lcom/google/firebase/iid/f;->aVh:I
 
     iget v1, p0, Lcom/google/firebase/iid/f;->zza:I
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/f;->zX()Z
+    invoke-virtual {p0}, Lcom/google/firebase/iid/f;->zT()Z
 
     move-result v2
 
@@ -250,5 +250,5 @@
     return-object v0
 .end method
 
-.method abstract zX()Z
+.method abstract zT()Z
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/g.smali b/com.discord/smali_classes2/com/google/firebase/iid/g.smali
index f8d5620502..f5c9a72f85 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/g.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/g.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final aUR:Landroid/content/Context;
+.field private final aVj:Landroid/content/Context;
 
-.field private alD:Ljava/lang/String;
+.field private alJ:Ljava/lang/String;
 
-.field private alr:Ljava/lang/String;
+.field private alV:Ljava/lang/String;
 
 .field private zzd:I
 
@@ -25,56 +25,11 @@
 
     iput v0, p0, Lcom/google/firebase/iid/g;->zze:I
 
-    iput-object p1, p0, Lcom/google/firebase/iid/g;->aUR:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/g;->aVj:Landroid/content/Context;
 
     return-void
 .end method
 
-.method private final declared-synchronized Ab()V
-    .locals 2
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/g;->aUR:Landroid/content/Context;
-
-    invoke-virtual {v0}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p0, v0}, Lcom/google/firebase/iid/g;->dt(Ljava/lang/String;)Landroid/content/pm/PackageInfo;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    iget v1, v0, Landroid/content/pm/PackageInfo;->versionCode:I
-
-    invoke-static {v1}, Ljava/lang/Integer;->toString(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    iput-object v1, p0, Lcom/google/firebase/iid/g;->alr:Ljava/lang/String;
-
-    iget-object v0, v0, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
-
-    iput-object v0, p0, Lcom/google/firebase/iid/g;->alD:Ljava/lang/String;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_0
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
 .method public static a(Ljava/security/PublicKey;)Ljava/lang/String;
     .locals 3
 
@@ -132,22 +87,22 @@
 .method public static c(Lcom/google/firebase/FirebaseApp;)Ljava/lang/String;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->AH()Lcom/google/firebase/c;
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->AD()Lcom/google/firebase/c;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/firebase/c;->aTg:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/firebase/c;->aTy:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->AH()Lcom/google/firebase/c;
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->AD()Lcom/google/firebase/c;
 
     move-result-object p0
 
-    iget-object p0, p0, Lcom/google/firebase/c;->aTd:Ljava/lang/String;
+    iget-object p0, p0, Lcom/google/firebase/c;->aTv:Ljava/lang/String;
 
     const-string v0, "1:"
 
@@ -193,11 +148,11 @@
     return-object p0
 .end method
 
-.method private final dt(Ljava/lang/String;)Landroid/content/pm/PackageInfo;
+.method private final dn(Ljava/lang/String;)Landroid/content/pm/PackageInfo;
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/g;->aUR:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/g;->aVj:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -253,9 +208,54 @@
     return-object p1
 .end method
 
+.method private final declared-synchronized zX()V
+    .locals 2
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lcom/google/firebase/iid/g;->aVj:Landroid/content/Context;
+
+    invoke-virtual {v0}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p0, v0}, Lcom/google/firebase/iid/g;->dn(Ljava/lang/String;)Landroid/content/pm/PackageInfo;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    iget v1, v0, Landroid/content/pm/PackageInfo;->versionCode:I
+
+    invoke-static {v1}, Ljava/lang/Integer;->toString(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    iput-object v1, p0, Lcom/google/firebase/iid/g;->alJ:Ljava/lang/String;
+
+    iget-object v0, v0, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
+
+    iput-object v0, p0, Lcom/google/firebase/iid/g;->alV:Ljava/lang/String;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_0
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
 
 # virtual methods
-.method public final declared-synchronized Bj()I
+.method public final declared-synchronized Bd()I
     .locals 5
 
     monitor-enter p0
@@ -275,7 +275,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/google/firebase/iid/g;->aUR:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/g;->aVj:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -423,20 +423,20 @@
     throw v0
 .end method
 
-.method public final declared-synchronized Bk()Ljava/lang/String;
+.method public final declared-synchronized Be()Ljava/lang/String;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/g;->alr:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/g;->alJ:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/g;->Ab()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/g;->zX()V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/g;->alr:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/g;->alJ:Ljava/lang/String;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -452,20 +452,20 @@
     throw v0
 .end method
 
-.method public final declared-synchronized Bl()Ljava/lang/String;
+.method public final declared-synchronized Bf()Ljava/lang/String;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/g;->alD:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/g;->alV:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/g;->Ab()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/g;->zX()V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/g;->alD:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/g;->alV:Ljava/lang/String;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -481,7 +481,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized Bm()I
+.method public final declared-synchronized Bg()I
     .locals 1
 
     monitor-enter p0
@@ -493,7 +493,7 @@
 
     const-string v0, "com.google.android.gms"
 
-    invoke-direct {p0, v0}, Lcom/google/firebase/iid/g;->dt(Ljava/lang/String;)Landroid/content/pm/PackageInfo;
+    invoke-direct {p0, v0}, Lcom/google/firebase/iid/g;->dn(Ljava/lang/String;)Landroid/content/pm/PackageInfo;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/h.smali b/com.discord/smali_classes2/com/google/firebase/iid/h.smali
index 0a12917153..5a38ab8fc7 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/h.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/h.smali
@@ -45,7 +45,7 @@
     return-void
 .end method
 
-.method final zX()Z
+.method final zT()Z
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/i.smali b/com.discord/smali_classes2/com/google/firebase/iid/i.smali
index cfc228e232..1b28da29db 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/i.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/i.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aUS:Lcom/google/firebase/components/g;
+.field static final aVk:Lcom/google/firebase/components/g;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/iid/i;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/iid/i;->aUS:Lcom/google/firebase/components/g;
+    sput-object v0, Lcom/google/firebase/iid/i;->aVk:Lcom/google/firebase/components/g;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/j.smali b/com.discord/smali_classes2/com/google/firebase/iid/j.smali
index a7737c4e5a..63b53a82c9 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/j.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/j.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aUS:Lcom/google/firebase/components/g;
+.field static final aVk:Lcom/google/firebase/components/g;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/iid/j;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/iid/j;->aUS:Lcom/google/firebase/components/g;
+    sput-object v0, Lcom/google/firebase/iid/j;->aVk:Lcom/google/firebase/components/g;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/k.smali b/com.discord/smali_classes2/com/google/firebase/iid/k.smali
index 888b9becd4..5c7f57b25f 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/k.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/k.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aUT:Lcom/google/firebase/iid/l;
+.field private final aVl:Lcom/google/firebase/iid/l;
 
-.field private final aUU:Landroid/util/Pair;
+.field private final aVm:Landroid/util/Pair;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/k;->aUT:Lcom/google/firebase/iid/l;
+    iput-object p1, p0, Lcom/google/firebase/iid/k;->aVl:Lcom/google/firebase/iid/l;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/k;->aUU:Landroid/util/Pair;
+    iput-object p2, p0, Lcom/google/firebase/iid/k;->aVm:Landroid/util/Pair;
 
     return-void
 .end method
@@ -30,9 +30,9 @@
 .method public final b(Lcom/google/android/gms/tasks/Task;)Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/iid/k;->aUT:Lcom/google/firebase/iid/l;
+    iget-object v0, p0, Lcom/google/firebase/iid/k;->aVl:Lcom/google/firebase/iid/l;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/k;->aUU:Landroid/util/Pair;
+    iget-object v1, p0, Lcom/google/firebase/iid/k;->aVm:Landroid/util/Pair;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/firebase/iid/l;->a(Landroid/util/Pair;Lcom/google/android/gms/tasks/Task;)Lcom/google/android/gms/tasks/Task;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/l.smali b/com.discord/smali_classes2/com/google/firebase/iid/l.smali
index 6b04f2d3c3..2814a80374 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/l.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/l.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final aUV:Ljava/util/concurrent/Executor;
+.field private final aVn:Ljava/util/concurrent/Executor;
 
-.field private final aUW:Ljava/util/Map;
+.field private final aVo:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -32,9 +32,9 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/l;->aUW:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/iid/l;->aVo:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/l;->aUV:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/firebase/iid/l;->aVn:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
@@ -52,7 +52,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/l;->aUW:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/iid/l;->aVo:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -92,7 +92,7 @@
 
     invoke-direct {v0, p1, p2}, Landroid/util/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/google/firebase/iid/l;->aUW:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/firebase/iid/l;->aVo:Ljava/util/Map;
 
     invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -194,11 +194,11 @@
     invoke-static {p1, p2}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_2
-    invoke-interface {p3}, Lcom/google/firebase/iid/n;->Bo()Lcom/google/android/gms/tasks/Task;
+    invoke-interface {p3}, Lcom/google/firebase/iid/n;->Bi()Lcom/google/android/gms/tasks/Task;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/google/firebase/iid/l;->aUV:Ljava/util/concurrent/Executor;
+    iget-object p2, p0, Lcom/google/firebase/iid/l;->aVn:Ljava/util/concurrent/Executor;
 
     new-instance p3, Lcom/google/firebase/iid/k;
 
@@ -208,7 +208,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/google/firebase/iid/l;->aUW:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/firebase/iid/l;->aVo:Ljava/util/Map;
 
     invoke-interface {p2, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_1
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/m.smali b/com.discord/smali_classes2/com/google/firebase/iid/m.smali
index 939645fc08..cbddca6fda 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/m.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/m.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static aUX:Landroid/app/PendingIntent;
+.field private static aVp:Landroid/app/PendingIntent;
 
 .field private static zza:I
 
 
 # instance fields
-.field private final aUY:Landroidx/collection/SimpleArrayMap;
+.field private final aVq:Landroidx/collection/SimpleArrayMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/SimpleArrayMap<",
@@ -22,15 +22,15 @@
     .end annotation
 .end field
 
-.field private final aUZ:Landroid/content/Context;
+.field private final aVr:Landroid/content/Context;
 
-.field private final aVa:Lcom/google/firebase/iid/g;
+.field private final aVs:Lcom/google/firebase/iid/g;
 
-.field private aVb:Landroid/os/Messenger;
+.field private aVt:Landroid/os/Messenger;
 
-.field private aVc:Landroid/os/Messenger;
+.field private aVu:Landroid/os/Messenger;
 
-.field private aVd:Lcom/google/firebase/iid/zzd;
+.field private aVv:Lcom/google/firebase/iid/zzd;
 
 
 # direct methods
@@ -49,11 +49,11 @@
 
     invoke-direct {v0}, Landroidx/collection/SimpleArrayMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/m;->aUY:Landroidx/collection/SimpleArrayMap;
+    iput-object v0, p0, Lcom/google/firebase/iid/m;->aVq:Landroidx/collection/SimpleArrayMap;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/m;->aUZ:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/m;->aVr:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/m;->aVa:Lcom/google/firebase/iid/g;
+    iput-object p2, p0, Lcom/google/firebase/iid/m;->aVs:Lcom/google/firebase/iid/g;
 
     new-instance p1, Landroid/os/Messenger;
 
@@ -67,12 +67,12 @@
 
     invoke-direct {p1, p2}, Landroid/os/Messenger;-><init>(Landroid/os/Handler;)V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/m;->aVb:Landroid/os/Messenger;
+    iput-object p1, p0, Lcom/google/firebase/iid/m;->aVt:Landroid/os/Messenger;
 
     return-void
 .end method
 
-.method private static declared-synchronized Bn()Ljava/lang/String;
+.method private static declared-synchronized Bh()Ljava/lang/String;
     .locals 3
 
     const-class v0, Lcom/google/firebase/iid/m;
@@ -147,7 +147,7 @@
 
     check-cast v1, Lcom/google/firebase/iid/zzd;
 
-    iput-object v1, p0, Lcom/google/firebase/iid/m;->aVd:Lcom/google/firebase/iid/zzd;
+    iput-object v1, p0, Lcom/google/firebase/iid/m;->aVv:Lcom/google/firebase/iid/zzd;
 
     :cond_0
     instance-of v1, v0, Landroid/os/Messenger;
@@ -156,7 +156,7 @@
 
     check-cast v0, Landroid/os/Messenger;
 
-    iput-object v0, p0, Lcom/google/firebase/iid/m;->aVc:Landroid/os/Messenger;
+    iput-object v0, p0, Lcom/google/firebase/iid/m;->aVu:Landroid/os/Messenger;
 
     :cond_1
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
@@ -423,7 +423,7 @@
     return-void
 
     :cond_d
-    iget-object v4, p0, Lcom/google/firebase/iid/m;->aUY:Landroidx/collection/SimpleArrayMap;
+    iget-object v4, p0, Lcom/google/firebase/iid/m;->aVq:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v4
 
@@ -431,7 +431,7 @@
 
     :goto_4
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/iid/m;->aUY:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/m;->aVq:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v1}, Landroidx/collection/SimpleArrayMap;->size()I
 
@@ -439,7 +439,7 @@
 
     if-ge v0, v1, :cond_e
 
-    iget-object v1, p0, Lcom/google/firebase/iid/m;->aUY:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/m;->aVq:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v1, v0}, Landroidx/collection/SimpleArrayMap;->keyAt(I)Ljava/lang/Object;
 
@@ -568,7 +568,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/m;->aUX:Landroid/app/PendingIntent;
+    sget-object v1, Lcom/google/firebase/iid/m;->aVp:Landroid/app/PendingIntent;
 
     if-nez v1, :cond_0
 
@@ -586,12 +586,12 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/firebase/iid/m;->aUX:Landroid/app/PendingIntent;
+    sput-object p0, Lcom/google/firebase/iid/m;->aVp:Landroid/app/PendingIntent;
 
     :cond_0
     const-string p0, "app"
 
-    sget-object v1, Lcom/google/firebase/iid/m;->aUX:Landroid/app/PendingIntent;
+    sget-object v1, Lcom/google/firebase/iid/m;->aVp:Landroid/app/PendingIntent;
 
     invoke-virtual {p1, p0, v1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
     :try_end_0
@@ -612,12 +612,12 @@
 .method private final e(Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/firebase/iid/m;->aUY:Landroidx/collection/SimpleArrayMap;
+    iget-object v0, p0, Lcom/google/firebase/iid/m;->aVq:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/iid/m;->aUY:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/m;->aVq:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v1, p1}, Landroidx/collection/SimpleArrayMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -724,7 +724,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/firebase/iid/m;->Bn()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/m;->Bh()Ljava/lang/String;
 
     move-result-object v0
 
@@ -732,12 +732,12 @@
 
     invoke-direct {v1}, Lcom/google/android/gms/tasks/h;-><init>()V
 
-    iget-object v2, p0, Lcom/google/firebase/iid/m;->aUY:Landroidx/collection/SimpleArrayMap;
+    iget-object v2, p0, Lcom/google/firebase/iid/m;->aVq:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v2
 
     :try_start_0
-    iget-object v3, p0, Lcom/google/firebase/iid/m;->aUY:Landroidx/collection/SimpleArrayMap;
+    iget-object v3, p0, Lcom/google/firebase/iid/m;->aVq:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v3, v0, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -745,9 +745,9 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
-    iget-object v2, p0, Lcom/google/firebase/iid/m;->aVa:Lcom/google/firebase/iid/g;
+    iget-object v2, p0, Lcom/google/firebase/iid/m;->aVs:Lcom/google/firebase/iid/g;
 
-    invoke-virtual {v2}, Lcom/google/firebase/iid/g;->Bj()I
+    invoke-virtual {v2}, Lcom/google/firebase/iid/g;->Bd()I
 
     move-result v2
 
@@ -761,9 +761,9 @@
 
     invoke-virtual {v2, v3}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
 
-    iget-object v3, p0, Lcom/google/firebase/iid/m;->aVa:Lcom/google/firebase/iid/g;
+    iget-object v3, p0, Lcom/google/firebase/iid/m;->aVs:Lcom/google/firebase/iid/g;
 
-    invoke-virtual {v3}, Lcom/google/firebase/iid/g;->Bj()I
+    invoke-virtual {v3}, Lcom/google/firebase/iid/g;->Bd()I
 
     move-result v3
 
@@ -785,7 +785,7 @@
     :goto_0
     invoke-virtual {v2, p1}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
 
-    iget-object p1, p0, Lcom/google/firebase/iid/m;->aUZ:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/firebase/iid/m;->aVr:Landroid/content/Context;
 
     invoke-static {p1, v2}, Lcom/google/firebase/iid/m;->b(Landroid/content/Context;Landroid/content/Intent;)V
 
@@ -868,17 +868,17 @@
     invoke-static {v5, v3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_1
-    iget-object v3, p0, Lcom/google/firebase/iid/m;->aVb:Landroid/os/Messenger;
+    iget-object v3, p0, Lcom/google/firebase/iid/m;->aVt:Landroid/os/Messenger;
 
     const-string v5, "google.messenger"
 
     invoke-virtual {v2, v5, v3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
 
-    iget-object v3, p0, Lcom/google/firebase/iid/m;->aVc:Landroid/os/Messenger;
+    iget-object v3, p0, Lcom/google/firebase/iid/m;->aVu:Landroid/os/Messenger;
 
     if-nez v3, :cond_2
 
-    iget-object v3, p0, Lcom/google/firebase/iid/m;->aVd:Lcom/google/firebase/iid/zzd;
+    iget-object v3, p0, Lcom/google/firebase/iid/m;->aVv:Lcom/google/firebase/iid/zzd;
 
     if-eqz v3, :cond_4
 
@@ -890,18 +890,18 @@
     iput-object v2, v3, Landroid/os/Message;->obj:Ljava/lang/Object;
 
     :try_start_1
-    iget-object v5, p0, Lcom/google/firebase/iid/m;->aVc:Landroid/os/Messenger;
+    iget-object v5, p0, Lcom/google/firebase/iid/m;->aVu:Landroid/os/Messenger;
 
     if-eqz v5, :cond_3
 
-    iget-object v5, p0, Lcom/google/firebase/iid/m;->aVc:Landroid/os/Messenger;
+    iget-object v5, p0, Lcom/google/firebase/iid/m;->aVu:Landroid/os/Messenger;
 
     invoke-virtual {v5, v3}, Landroid/os/Messenger;->send(Landroid/os/Message;)V
 
     goto :goto_1
 
     :cond_3
-    iget-object v5, p0, Lcom/google/firebase/iid/m;->aVd:Lcom/google/firebase/iid/zzd;
+    iget-object v5, p0, Lcom/google/firebase/iid/m;->aVv:Lcom/google/firebase/iid/zzd;
 
     invoke-virtual {v5, v3}, Lcom/google/firebase/iid/zzd;->a(Landroid/os/Message;)V
     :try_end_1
@@ -927,28 +927,28 @@
     invoke-static {p1, v3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_4
-    iget-object p1, p0, Lcom/google/firebase/iid/m;->aVa:Lcom/google/firebase/iid/g;
+    iget-object p1, p0, Lcom/google/firebase/iid/m;->aVs:Lcom/google/firebase/iid/g;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/g;->Bj()I
+    invoke-virtual {p1}, Lcom/google/firebase/iid/g;->Bd()I
 
     move-result p1
 
     if-ne p1, v4, :cond_5
 
-    iget-object p1, p0, Lcom/google/firebase/iid/m;->aUZ:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/firebase/iid/m;->aVr:Landroid/content/Context;
 
     invoke-virtual {p1, v2}, Landroid/content/Context;->sendBroadcast(Landroid/content/Intent;)V
 
     goto :goto_1
 
     :cond_5
-    iget-object p1, p0, Lcom/google/firebase/iid/m;->aUZ:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/firebase/iid/m;->aVr:Landroid/content/Context;
 
     invoke-virtual {p1, v2}, Landroid/content/Context;->startService(Landroid/content/Intent;)Landroid/content/ComponentName;
 
     :goto_1
     :try_start_2
-    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     const-wide/16 v1, 0x7530
 
@@ -965,12 +965,12 @@
     .catch Ljava/util/concurrent/ExecutionException; {:try_start_2 .. :try_end_2} :catch_1
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
-    iget-object v1, p0, Lcom/google/firebase/iid/m;->aUY:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/m;->aVq:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v1
 
     :try_start_3
-    iget-object v2, p0, Lcom/google/firebase/iid/m;->aUY:Landroidx/collection/SimpleArrayMap;
+    iget-object v2, p0, Lcom/google/firebase/iid/m;->aVq:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v2, v0}, Landroidx/collection/SimpleArrayMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1020,12 +1020,12 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
     :goto_2
-    iget-object v1, p0, Lcom/google/firebase/iid/m;->aUY:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/m;->aVq:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v1
 
     :try_start_5
-    iget-object v2, p0, Lcom/google/firebase/iid/m;->aUY:Landroidx/collection/SimpleArrayMap;
+    iget-object v2, p0, Lcom/google/firebase/iid/m;->aVq:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v2, v0}, Landroidx/collection/SimpleArrayMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1075,9 +1075,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/iid/m;->aVa:Lcom/google/firebase/iid/g;
+    iget-object v0, p0, Lcom/google/firebase/iid/m;->aVs:Lcom/google/firebase/iid/g;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/g;->Bm()I
+    invoke-virtual {v0}, Lcom/google/firebase/iid/g;->Bg()I
 
     move-result v0
 
@@ -1085,7 +1085,7 @@
 
     if-lt v0, v1, :cond_3
 
-    iget-object v0, p0, Lcom/google/firebase/iid/m;->aUZ:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/m;->aVr:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/firebase/iid/au;->aG(Landroid/content/Context;)Lcom/google/firebase/iid/au;
 
@@ -1093,7 +1093,7 @@
 
     new-instance v1, Lcom/google/firebase/iid/h;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/au;->Bj()I
+    invoke-virtual {v0}, Lcom/google/firebase/iid/au;->Bd()I
 
     move-result v2
 
@@ -1106,7 +1106,7 @@
     :try_start_0
     const-string v1, "Must not be called on the main application thread"
 
-    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aX(Ljava/lang/String;)V
+    invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aS(Ljava/lang/String;)V
 
     const-string v1, "Task must not be null"
 
@@ -1133,7 +1133,7 @@
 
     invoke-static {v0, v1}, Lcom/google/android/gms/tasks/j;->a(Lcom/google/android/gms/tasks/Task;Lcom/google/android/gms/tasks/j$b;)V
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/j$a;->aPh:Ljava/util/concurrent/CountDownLatch;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/j$a;->aPz:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v1}, Ljava/util/concurrent/CountDownLatch;->await()V
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/n.smali b/com.discord/smali_classes2/com/google/firebase/iid/n.smali
index b485bfe8ec..f93a62da79 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/n.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/n.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract Bo()Lcom/google/android/gms/tasks/Task;
+.method public abstract Bi()Lcom/google/android/gms/tasks/Task;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/o.smali b/com.discord/smali_classes2/com/google/firebase/iid/o.smali
index 294aa840d7..4a76e922e9 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/o.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/o.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static aVe:Lcom/google/firebase/iid/o;
+.field private static aVw:Lcom/google/firebase/iid/o;
 
 
 # instance fields
-.field aVf:Ljava/lang/Boolean;
+.field aVx:Ljava/lang/Boolean;
 
-.field aVg:Ljava/lang/Boolean;
+.field aVy:Ljava/lang/Boolean;
 
-.field public final aVh:Ljava/util/Queue;
+.field public final aVz:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field private alr:Ljava/lang/String;
+.field private alJ:Ljava/lang/String;
 
 
 # direct methods
@@ -33,22 +33,22 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/firebase/iid/o;->alr:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/firebase/iid/o;->alJ:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/firebase/iid/o;->aVf:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/firebase/iid/o;->aVx:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/firebase/iid/o;->aVg:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/firebase/iid/o;->aVy:Ljava/lang/Boolean;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/o;->aVh:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/google/firebase/iid/o;->aVz:Ljava/util/Queue;
 
     return-void
 .end method
 
-.method public static declared-synchronized Bp()Lcom/google/firebase/iid/o;
+.method public static declared-synchronized Bj()Lcom/google/firebase/iid/o;
     .locals 2
 
     const-class v0, Lcom/google/firebase/iid/o;
@@ -56,7 +56,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/o;->aVe:Lcom/google/firebase/iid/o;
+    sget-object v1, Lcom/google/firebase/iid/o;->aVw:Lcom/google/firebase/iid/o;
 
     if-nez v1, :cond_0
 
@@ -64,10 +64,10 @@
 
     invoke-direct {v1}, Lcom/google/firebase/iid/o;-><init>()V
 
-    sput-object v1, Lcom/google/firebase/iid/o;->aVe:Lcom/google/firebase/iid/o;
+    sput-object v1, Lcom/google/firebase/iid/o;->aVw:Lcom/google/firebase/iid/o;
 
     :cond_0
-    sget-object v1, Lcom/google/firebase/iid/o;->aVe:Lcom/google/firebase/iid/o;
+    sget-object v1, Lcom/google/firebase/iid/o;->aVw:Lcom/google/firebase/iid/o;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -234,11 +234,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/o;->alr:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/o;->alJ:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/firebase/iid/o;->alr:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/firebase/iid/o;->alJ:Ljava/lang/String;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -334,17 +334,17 @@
     move-object p1, p2
 
     :goto_0
-    iput-object p1, p0, Lcom/google/firebase/iid/o;->alr:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/o;->alJ:Ljava/lang/String;
 
     goto :goto_1
 
     :cond_4
     iget-object p1, p2, Landroid/content/pm/ServiceInfo;->name:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/o;->alr:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/o;->alJ:Ljava/lang/String;
 
     :goto_1
-    iget-object p1, p0, Lcom/google/firebase/iid/o;->alr:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/firebase/iid/o;->alJ:Ljava/lang/String;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -437,7 +437,7 @@
 .method final C(Landroid/content/Context;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/o;->aVf:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/firebase/iid/o;->aVx:Ljava/lang/Boolean;
 
     if-nez v0, :cond_1
 
@@ -461,10 +461,10 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/o;->aVf:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/firebase/iid/o;->aVx:Ljava/lang/Boolean;
 
     :cond_1
-    iget-object p1, p0, Lcom/google/firebase/iid/o;->aVf:Ljava/lang/Boolean;
+    iget-object p1, p0, Lcom/google/firebase/iid/o;->aVx:Ljava/lang/Boolean;
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -487,7 +487,7 @@
     invoke-static {v0, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_2
-    iget-object p1, p0, Lcom/google/firebase/iid/o;->aVf:Ljava/lang/Boolean;
+    iget-object p1, p0, Lcom/google/firebase/iid/o;->aVx:Ljava/lang/Boolean;
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -514,7 +514,7 @@
     invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/o;->aVh:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/o;->aVz:Ljava/util/Queue;
 
     invoke-interface {v0, p2}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/p.smali b/com.discord/smali_classes2/com/google/firebase/iid/p.smali
index 5b21df8f2f..be088d24ba 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/p.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/p.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field private final synthetic aVi:Lcom/google/firebase/iid/m;
+.field private final synthetic aVA:Lcom/google/firebase/iid/m;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/firebase/iid/m;Landroid/os/Looper;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/firebase/iid/p;->aVi:Lcom/google/firebase/iid/m;
+    iput-object p1, p0, Lcom/google/firebase/iid/p;->aVA:Lcom/google/firebase/iid/m;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/internal/e/d;-><init>(Landroid/os/Looper;)V
 
@@ -23,7 +23,7 @@
 .method public final handleMessage(Landroid/os/Message;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/p;->aVi:Lcom/google/firebase/iid/m;
+    iget-object v0, p0, Lcom/google/firebase/iid/p;->aVA:Lcom/google/firebase/iid/m;
 
     invoke-static {v0, p1}, Lcom/google/firebase/iid/m;->a(Lcom/google/firebase/iid/m;Landroid/os/Message;)V
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/q.smali b/com.discord/smali_classes2/com/google/firebase/iid/q.smali
index dcb5d505b6..4da0486745 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/q.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/q.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static final alM:J
+.field private static final ame:J
 
 
 # instance fields
-.field final aVj:Ljava/lang/String;
+.field final aVB:Ljava/lang/String;
 
-.field private final aVk:J
+.field private final aVC:J
 
-.field private final alD:Ljava/lang/String;
+.field private final alV:Ljava/lang/String;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lcom/google/firebase/iid/q;->alM:J
+    sput-wide v0, Lcom/google/firebase/iid/q;->ame:J
 
     return-void
 .end method
@@ -37,11 +37,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/q;->aVj:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/q;->aVB:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/q;->alD:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/q;->alV:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/firebase/iid/q;->aVk:J
+    iput-wide p3, p0, Lcom/google/firebase/iid/q;->aVC:J
 
     return-void
 .end method
@@ -114,7 +114,7 @@
     return-object p0
 .end method
 
-.method static du(Ljava/lang/String;)Lcom/google/firebase/iid/q;
+.method static do(Ljava/lang/String;)Lcom/google/firebase/iid/q;
     .locals 6
 
     invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
@@ -216,16 +216,16 @@
 
 
 # virtual methods
-.method final dv(Ljava/lang/String;)Z
+.method final dp(Ljava/lang/String;)Z
     .locals 6
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/firebase/iid/q;->aVk:J
+    iget-wide v2, p0, Lcom/google/firebase/iid/q;->aVC:J
 
-    sget-wide v4, Lcom/google/firebase/iid/q;->alM:J
+    sget-wide v4, Lcom/google/firebase/iid/q;->ame:J
 
     add-long/2addr v2, v4
 
@@ -233,7 +233,7 @@
 
     if-gtz v4, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/q;->alD:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/q;->alV:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/s.smali b/com.discord/smali_classes2/com/google/firebase/iid/s.smali
index edc8ecfed9..4de7c8c7f6 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/s.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/s.smali
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field private final aVl:Landroid/content/SharedPreferences;
+.field private final aVD:Landroid/content/SharedPreferences;
 
-.field private final aVm:Landroid/content/Context;
+.field private final aVE:Landroid/content/Context;
 
-.field private final aVn:Lcom/google/firebase/iid/ap;
+.field private final aVF:Lcom/google/firebase/iid/ap;
 
-.field private final aVo:Ljava/util/Map;
+.field private final aVG:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -46,9 +46,9 @@
 
     invoke-direct {v1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object v1, p0, Lcom/google/firebase/iid/s;->aVo:Ljava/util/Map;
+    iput-object v1, p0, Lcom/google/firebase/iid/s;->aVG:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/s;->aVm:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/s;->aVE:Landroid/content/Context;
 
     const-string v1, "com.google.android.gms.appid"
 
@@ -58,11 +58,11 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/s;->aVl:Landroid/content/SharedPreferences;
+    iput-object p1, p0, Lcom/google/firebase/iid/s;->aVD:Landroid/content/SharedPreferences;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/s;->aVn:Lcom/google/firebase/iid/ap;
+    iput-object p2, p0, Lcom/google/firebase/iid/s;->aVF:Lcom/google/firebase/iid/ap;
 
-    iget-object p1, p0, Lcom/google/firebase/iid/s;->aVm:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/firebase/iid/s;->aVE:Landroid/content/Context;
 
     invoke-static {p1}, Landroidx/core/content/ContextCompat;->getNoBackupFilesDir(Landroid/content/Context;)Ljava/io/File;
 
@@ -87,7 +87,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/s;->mL()Z
+    invoke-direct {p0}, Lcom/google/firebase/iid/s;->mJ()Z
 
     move-result p1
 
@@ -97,13 +97,13 @@
 
     invoke-static {v0, p1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/s;->zY()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/s;->zU()V
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AZ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AU()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ab()V
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->zX()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -255,13 +255,13 @@
     return-object p0
 .end method
 
-.method private final declared-synchronized mL()Z
+.method private final declared-synchronized mJ()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVl:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVD:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->getAll()Ljava/util/Map;
 
@@ -287,13 +287,13 @@
 
 
 # virtual methods
-.method public final declared-synchronized Bn()Ljava/lang/String;
+.method public final declared-synchronized Bh()Ljava/lang/String;
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVl:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVD:Landroid/content/SharedPreferences;
 
     const-string v1, "topic_operation_queue"
 
@@ -341,7 +341,7 @@
 
     :cond_0
     :try_start_1
-    iget-object p5, p0, Lcom/google/firebase/iid/s;->aVl:Landroid/content/SharedPreferences;
+    iget-object p5, p0, Lcom/google/firebase/iid/s;->aVD:Landroid/content/SharedPreferences;
 
     invoke-interface {p5}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -369,13 +369,13 @@
     throw p1
 .end method
 
-.method public final declared-synchronized aM(Ljava/lang/String;)V
+.method public final declared-synchronized aH(Ljava/lang/String;)V
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVl:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVD:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -403,7 +403,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized cw(Ljava/lang/String;)V
+.method public final declared-synchronized cs(Ljava/lang/String;)V
     .locals 4
 
     monitor-enter p0
@@ -419,13 +419,13 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVl:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVD:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/iid/s;->aVl:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/firebase/iid/s;->aVD:Landroid/content/SharedPreferences;
 
     invoke-interface {v1}, Landroid/content/SharedPreferences;->getAll()Ljava/util/Map;
 
@@ -486,13 +486,13 @@
     goto :goto_1
 .end method
 
-.method public final declared-synchronized dw(Ljava/lang/String;)Lcom/google/firebase/iid/ar;
+.method public final declared-synchronized dq(Ljava/lang/String;)Lcom/google/firebase/iid/ar;
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVo:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVG:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -510,9 +510,9 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVn:Lcom/google/firebase/iid/ap;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVF:Lcom/google/firebase/iid/ap;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/s;->aVm:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/firebase/iid/s;->aVE:Landroid/content/Context;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/firebase/iid/ap;->s(Landroid/content/Context;Ljava/lang/String;)Lcom/google/firebase/iid/ar;
 
@@ -540,20 +540,20 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AZ()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AU()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ab()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->zX()V
 
-    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVm:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVE:Landroid/content/Context;
 
     invoke-static {v0, p1}, Lcom/google/firebase/iid/ap;->r(Landroid/content/Context;Ljava/lang/String;)Lcom/google/firebase/iid/ar;
 
     move-result-object v0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/firebase/iid/s;->aVo:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/firebase/iid/s;->aVG:Ljava/util/Map;
 
     invoke-interface {v1, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_2
@@ -577,7 +577,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVl:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVD:Landroid/content/SharedPreferences;
 
     invoke-static {p1, p2, p3}, Lcom/google/firebase/iid/s;->h(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -589,7 +589,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lcom/google/firebase/iid/q;->du(Ljava/lang/String;)Lcom/google/firebase/iid/q;
+    invoke-static {p1}, Lcom/google/firebase/iid/q;->do(Ljava/lang/String;)Lcom/google/firebase/iid/q;
 
     move-result-object p1
     :try_end_0
@@ -607,17 +607,17 @@
     throw p1
 .end method
 
-.method public final declared-synchronized zY()V
+.method public final declared-synchronized zU()V
     .locals 6
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVo:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVG:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->clear()V
 
-    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVm:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVE:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/firebase/iid/ap;->aF(Landroid/content/Context;)Ljava/io/File;
 
@@ -656,7 +656,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVl:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aVD:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/u.smali b/com.discord/smali_classes2/com/google/firebase/iid/u.smali
index 5eb401dbab..bec6b69ecf 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/u.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/u.smali
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private final aOS:Landroid/os/PowerManager$WakeLock;
+.field private final aPk:Landroid/os/PowerManager$WakeLock;
 
-.field private final aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private final aVr:Lcom/google/firebase/iid/w;
+.field private final aVJ:Lcom/google/firebase/iid/w;
 
-.field private final alL:J
+.field private final amd:J
 
 
 # direct methods
@@ -22,13 +22,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/u;->aVr:Lcom/google/firebase/iid/w;
+    iput-object p2, p0, Lcom/google/firebase/iid/u;->aVJ:Lcom/google/firebase/iid/w;
 
-    iput-wide p3, p0, Lcom/google/firebase/iid/u;->alL:J
+    iput-wide p3, p0, Lcom/google/firebase/iid/u;->amd:J
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bk()Landroid/content/Context;
 
     move-result-object p1
 
@@ -48,9 +48,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/u;->aOS:Landroid/os/PowerManager$WakeLock;
+    iput-object p1, p0, Lcom/google/firebase/iid/u;->aPk:Landroid/os/PowerManager$WakeLock;
 
-    iget-object p1, p0, Lcom/google/firebase/iid/u;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object p1, p0, Lcom/google/firebase/iid/u;->aPk:Landroid/os/PowerManager$WakeLock;
 
     const/4 p2, 0x0
 
@@ -59,7 +59,7 @@
     return-void
 .end method
 
-.method private final mL()Z
+.method private final mJ()Z
     .locals 9
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -69,13 +69,13 @@
 
     const-string v0, "FirebaseInstanceId"
 
-    iget-object v1, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v1, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->Be()Lcom/google/firebase/iid/q;
+    invoke-virtual {v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->AY()Lcom/google/firebase/iid/q;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-virtual {v2, v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->a(Lcom/google/firebase/iid/q;)Z
 
@@ -91,9 +91,9 @@
     const/4 v2, 0x0
 
     :try_start_0
-    iget-object v4, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v4, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v5, v4, Lcom/google/firebase/iid/FirebaseInstanceId;->aUz:Lcom/google/firebase/FirebaseApp;
+    iget-object v5, v4, Lcom/google/firebase/iid/FirebaseInstanceId;->aUR:Lcom/google/firebase/FirebaseApp;
 
     invoke-static {v5}, Lcom/google/firebase/iid/g;->c(Lcom/google/firebase/FirebaseApp;)Ljava/lang/String;
 
@@ -151,7 +151,7 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v1, Lcom/google/firebase/iid/q;->aVj:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/firebase/iid/q;->aVB:Ljava/lang/String;
 
     invoke-virtual {v4, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -162,9 +162,9 @@
     :cond_3
     const-string v1, "[DEFAULT]"
 
-    iget-object v6, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v6, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v6, v6, Lcom/google/firebase/iid/FirebaseInstanceId;->aUz:Lcom/google/firebase/FirebaseApp;
+    iget-object v6, v6, Lcom/google/firebase/iid/FirebaseInstanceId;->aUR:Lcom/google/firebase/FirebaseApp;
 
     invoke-virtual {v6}, Lcom/google/firebase/FirebaseApp;->getName()Ljava/lang/String;
 
@@ -184,9 +184,9 @@
 
     const-string v1, "Invoking onNewToken for app: "
 
-    iget-object v5, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v5, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v5, v5, Lcom/google/firebase/iid/FirebaseInstanceId;->aUz:Lcom/google/firebase/FirebaseApp;
+    iget-object v5, v5, Lcom/google/firebase/iid/FirebaseInstanceId;->aUR:Lcom/google/firebase/FirebaseApp;
 
     invoke-virtual {v5}, Lcom/google/firebase/FirebaseApp;->getName()Ljava/lang/String;
 
@@ -229,7 +229,7 @@
 
     invoke-virtual {v1, v5, v4}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bk()Landroid/content/Context;
 
     move-result-object v4
 
@@ -357,12 +357,12 @@
 
 
 # virtual methods
-.method final Bq()Landroid/content/Context;
+.method final Bk()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUz:Lcom/google/firebase/FirebaseApp;
+    iget-object v0, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUR:Lcom/google/firebase/FirebaseApp;
 
     invoke-virtual {v0}, Lcom/google/firebase/FirebaseApp;->getApplicationContext()Landroid/content/Context;
 
@@ -376,11 +376,11 @@
 
     const-string v0, "FirebaseInstanceId"
 
-    invoke-static {}, Lcom/google/firebase/iid/o;->Bp()Lcom/google/firebase/iid/o;
+    invoke-static {}, Lcom/google/firebase/iid/o;->Bj()Lcom/google/firebase/iid/o;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bk()Landroid/content/Context;
 
     move-result-object v2
 
@@ -390,7 +390,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/firebase/iid/u;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object v1, p0, Lcom/google/firebase/iid/u;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v1}, Landroid/os/PowerManager$WakeLock;->acquire()V
 
@@ -398,17 +398,17 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     const/4 v3, 0x1
 
     invoke-virtual {v2, v3}, Lcom/google/firebase/iid/FirebaseInstanceId;->zza(Z)V
 
-    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v2, v2, Lcom/google/firebase/iid/FirebaseInstanceId;->aUA:Lcom/google/firebase/iid/g;
+    iget-object v2, v2, Lcom/google/firebase/iid/FirebaseInstanceId;->aUS:Lcom/google/firebase/iid/g;
 
-    invoke-virtual {v2}, Lcom/google/firebase/iid/g;->Bj()I
+    invoke-virtual {v2}, Lcom/google/firebase/iid/g;->Bd()I
 
     move-result v2
 
@@ -424,18 +424,18 @@
     :goto_0
     if-nez v2, :cond_3
 
-    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-virtual {v2, v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->zza(Z)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
 
-    invoke-static {}, Lcom/google/firebase/iid/o;->Bp()Lcom/google/firebase/iid/o;
+    invoke-static {}, Lcom/google/firebase/iid/o;->Bj()Lcom/google/firebase/iid/o;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bk()Landroid/content/Context;
 
     move-result-object v1
 
@@ -445,7 +445,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/firebase/iid/u;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/firebase/iid/u;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->release()V
 
@@ -454,15 +454,15 @@
 
     :cond_3
     :try_start_1
-    invoke-static {}, Lcom/google/firebase/iid/o;->Bp()Lcom/google/firebase/iid/o;
+    invoke-static {}, Lcom/google/firebase/iid/o;->Bj()Lcom/google/firebase/iid/o;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bk()Landroid/content/Context;
 
     move-result-object v4
 
-    iget-object v5, v2, Lcom/google/firebase/iid/o;->aVg:Ljava/lang/Boolean;
+    iget-object v5, v2, Lcom/google/firebase/iid/o;->aVy:Ljava/lang/Boolean;
 
     if-nez v5, :cond_5
 
@@ -484,10 +484,10 @@
 
     move-result-object v3
 
-    iput-object v3, v2, Lcom/google/firebase/iid/o;->aVg:Ljava/lang/Boolean;
+    iput-object v3, v2, Lcom/google/firebase/iid/o;->aVy:Ljava/lang/Boolean;
 
     :cond_5
-    iget-object v3, v2, Lcom/google/firebase/iid/o;->aVf:Ljava/lang/Boolean;
+    iget-object v3, v2, Lcom/google/firebase/iid/o;->aVx:Ljava/lang/Boolean;
 
     invoke-virtual {v3}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -508,7 +508,7 @@
     invoke-static {v0, v3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_6
-    iget-object v2, v2, Lcom/google/firebase/iid/o;->aVg:Ljava/lang/Boolean;
+    iget-object v2, v2, Lcom/google/firebase/iid/o;->aVy:Ljava/lang/Boolean;
 
     invoke-virtual {v2}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -526,7 +526,7 @@
 
     invoke-direct {v2, p0}, Lcom/google/firebase/iid/t;-><init>(Lcom/google/firebase/iid/u;)V
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bf()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AZ()Z
 
     move-result v3
 
@@ -543,9 +543,9 @@
 
     invoke-direct {v3, v4}, Landroid/content/IntentFilter;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, v2, Lcom/google/firebase/iid/t;->aVp:Lcom/google/firebase/iid/u;
+    iget-object v4, v2, Lcom/google/firebase/iid/t;->aVH:Lcom/google/firebase/iid/u;
 
-    invoke-virtual {v4}, Lcom/google/firebase/iid/u;->Bq()Landroid/content/Context;
+    invoke-virtual {v4}, Lcom/google/firebase/iid/u;->Bk()Landroid/content/Context;
 
     move-result-object v4
 
@@ -554,11 +554,11 @@
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-static {}, Lcom/google/firebase/iid/o;->Bp()Lcom/google/firebase/iid/o;
+    invoke-static {}, Lcom/google/firebase/iid/o;->Bj()Lcom/google/firebase/iid/o;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bk()Landroid/content/Context;
 
     move-result-object v1
 
@@ -568,7 +568,7 @@
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/google/firebase/iid/u;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/firebase/iid/u;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->release()V
 
@@ -577,15 +577,15 @@
 
     :cond_9
     :try_start_2
-    invoke-direct {p0}, Lcom/google/firebase/iid/u;->mL()Z
+    invoke-direct {p0}, Lcom/google/firebase/iid/u;->mJ()Z
 
     move-result v2
 
     if-eqz v2, :cond_a
 
-    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVr:Lcom/google/firebase/iid/w;
+    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVJ:Lcom/google/firebase/iid/w;
 
-    iget-object v3, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v3, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-virtual {v2, v3}, Lcom/google/firebase/iid/w;->c(Lcom/google/firebase/iid/FirebaseInstanceId;)Z
 
@@ -593,16 +593,16 @@
 
     if-eqz v2, :cond_a
 
-    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-virtual {v2, v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->zza(Z)V
 
     goto :goto_2
 
     :cond_a
-    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-wide v3, p0, Lcom/google/firebase/iid/u;->alL:J
+    iget-wide v3, p0, Lcom/google/firebase/iid/u;->amd:J
 
     invoke-virtual {v2, v3, v4}, Lcom/google/firebase/iid/FirebaseInstanceId;->aw(J)V
     :try_end_2
@@ -610,11 +610,11 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :goto_2
-    invoke-static {}, Lcom/google/firebase/iid/o;->Bp()Lcom/google/firebase/iid/o;
+    invoke-static {}, Lcom/google/firebase/iid/o;->Bj()Lcom/google/firebase/iid/o;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bk()Landroid/content/Context;
 
     move-result-object v1
 
@@ -624,7 +624,7 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p0, Lcom/google/firebase/iid/u;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/firebase/iid/u;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->release()V
 
@@ -673,17 +673,17 @@
 
     invoke-static {v0, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget-object v0, p0, Lcom/google/firebase/iid/u;->aVq:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/u;->aVI:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-virtual {v0, v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->zza(Z)V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    invoke-static {}, Lcom/google/firebase/iid/o;->Bp()Lcom/google/firebase/iid/o;
+    invoke-static {}, Lcom/google/firebase/iid/o;->Bj()Lcom/google/firebase/iid/o;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bk()Landroid/content/Context;
 
     move-result-object v1
 
@@ -693,7 +693,7 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p0, Lcom/google/firebase/iid/u;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/firebase/iid/u;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->release()V
 
@@ -701,11 +701,11 @@
     return-void
 
     :goto_3
-    invoke-static {}, Lcom/google/firebase/iid/o;->Bp()Lcom/google/firebase/iid/o;
+    invoke-static {}, Lcom/google/firebase/iid/o;->Bj()Lcom/google/firebase/iid/o;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bk()Landroid/content/Context;
 
     move-result-object v2
 
@@ -715,7 +715,7 @@
 
     if-eqz v1, :cond_c
 
-    iget-object v1, p0, Lcom/google/firebase/iid/u;->aOS:Landroid/os/PowerManager$WakeLock;
+    iget-object v1, p0, Lcom/google/firebase/iid/u;->aPk:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v1}, Landroid/os/PowerManager$WakeLock;->release()V
 
@@ -726,7 +726,7 @@
 .method final zzb()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/u;->Bk()Landroid/content/Context;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/v.smali b/com.discord/smali_classes2/com/google/firebase/iid/v.smali
index b977960ebc..1ffa3f4025 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/v.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/v.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final aVs:Lcom/google/firebase/iid/x;
+.field final aVK:Lcom/google/firebase/iid/x;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Landroid/os/Binder;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/v;->aVs:Lcom/google/firebase/iid/x;
+    iput-object p1, p0, Lcom/google/firebase/iid/v;->aVK:Lcom/google/firebase/iid/x;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/w.smali b/com.discord/smali_classes2/com/google/firebase/iid/w.smali
index fe2309f9c5..f490b1e08a 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/w.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/w.smali
@@ -4,7 +4,9 @@
 
 
 # instance fields
-.field private final aUW:Ljava/util/Map;
+.field private final aVL:Lcom/google/firebase/iid/s;
+
+.field private final aVo:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -16,8 +18,6 @@
     .end annotation
 .end field
 
-.field private final aVt:Lcom/google/firebase/iid/s;
-
 .field private zza:I
 
 
@@ -35,24 +35,24 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/w;->aUW:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/iid/w;->aVo:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/w;->aVt:Lcom/google/firebase/iid/s;
+    iput-object p1, p0, Lcom/google/firebase/iid/w;->aVL:Lcom/google/firebase/iid/s;
 
     return-void
 .end method
 
-.method private final Bk()Ljava/lang/String;
+.method private final Be()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/firebase/iid/w;->aVt:Lcom/google/firebase/iid/s;
+    iget-object v0, p0, Lcom/google/firebase/iid/w;->aVL:Lcom/google/firebase/iid/s;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/iid/w;->aVt:Lcom/google/firebase/iid/s;
+    iget-object v1, p0, Lcom/google/firebase/iid/w;->aVL:Lcom/google/firebase/iid/s;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/s;->Bn()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/firebase/iid/s;->Bh()Ljava/lang/String;
 
     move-result-object v1
 
@@ -195,7 +195,7 @@
 
     :cond_3
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Be()Lcom/google/firebase/iid/q;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->AY()Lcom/google/firebase/iid/q;
 
     move-result-object v4
 
@@ -205,13 +205,13 @@
 
     if-nez v7, :cond_6
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bc()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AX()Ljava/lang/String;
 
     move-result-object v5
 
-    iget-object v7, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUB:Lcom/google/firebase/iid/ak;
+    iget-object v7, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUT:Lcom/google/firebase/iid/ak;
 
-    iget-object v4, v4, Lcom/google/firebase/iid/q;->aVj:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/firebase/iid/q;->aVB:Ljava/lang/String;
 
     new-instance v8, Landroid/os/Bundle;
 
@@ -283,7 +283,7 @@
 
     invoke-virtual {p0, p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->e(Lcom/google/android/gms/tasks/Task;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bf()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AZ()Z
 
     move-result p0
 
@@ -303,7 +303,7 @@
     throw p0
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Be()Lcom/google/firebase/iid/q;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->AY()Lcom/google/firebase/iid/q;
 
     move-result-object v4
 
@@ -313,13 +313,13 @@
 
     if-nez v7, :cond_a
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bc()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AX()Ljava/lang/String;
 
     move-result-object v5
 
-    iget-object v4, v4, Lcom/google/firebase/iid/q;->aVj:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/firebase/iid/q;->aVB:Ljava/lang/String;
 
-    iget-object v7, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUB:Lcom/google/firebase/iid/ak;
+    iget-object v7, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aUT:Lcom/google/firebase/iid/ak;
 
     new-instance v8, Landroid/os/Bundle;
 
@@ -385,7 +385,7 @@
 
     invoke-virtual {p0, p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->e(Lcom/google/android/gms/tasks/Task;)Ljava/lang/Object;
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bf()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AZ()Z
 
     move-result p0
 
@@ -494,22 +494,22 @@
     return v2
 .end method
 
-.method private final declared-synchronized dv(Ljava/lang/String;)Z
+.method private final declared-synchronized dp(Ljava/lang/String;)Z
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/w;->aVt:Lcom/google/firebase/iid/s;
+    iget-object v0, p0, Lcom/google/firebase/iid/w;->aVL:Lcom/google/firebase/iid/s;
 
     monitor-enter v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/firebase/iid/w;->aVt:Lcom/google/firebase/iid/s;
+    iget-object v1, p0, Lcom/google/firebase/iid/w;->aVL:Lcom/google/firebase/iid/s;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/s;->Bn()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/firebase/iid/s;->Bh()Ljava/lang/String;
 
     move-result-object v1
 
@@ -577,9 +577,9 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/firebase/iid/w;->aVt:Lcom/google/firebase/iid/s;
+    iget-object v1, p0, Lcom/google/firebase/iid/w;->aVL:Lcom/google/firebase/iid/s;
 
-    invoke-virtual {v1, p1}, Lcom/google/firebase/iid/s;->aM(Ljava/lang/String;)V
+    invoke-virtual {v1, p1}, Lcom/google/firebase/iid/s;->aH(Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
@@ -639,7 +639,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/w;->Bk()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/firebase/iid/w;->Be()Ljava/lang/String;
 
     move-result-object v0
 
@@ -647,7 +647,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bf()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AZ()Z
 
     move-result p1
 
@@ -683,7 +683,7 @@
     monitor-enter p0
 
     :try_start_1
-    iget-object v2, p0, Lcom/google/firebase/iid/w;->aUW:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/firebase/iid/w;->aVo:Ljava/util/Map;
 
     iget v3, p0, Lcom/google/firebase/iid/w;->zza:I
 
@@ -697,7 +697,7 @@
 
     check-cast v2, Lcom/google/android/gms/tasks/h;
 
-    invoke-direct {p0, v0}, Lcom/google/firebase/iid/w;->dv(Ljava/lang/String;)Z
+    invoke-direct {p0, v0}, Lcom/google/firebase/iid/w;->dp(Ljava/lang/String;)Z
 
     iget v0, p0, Lcom/google/firebase/iid/w;->zza:I
 
@@ -744,13 +744,13 @@
     goto :goto_1
 .end method
 
-.method final declared-synchronized zX()Z
+.method final declared-synchronized zT()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/w;->Bk()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/firebase/iid/w;->Be()Ljava/lang/String;
 
     move-result-object v0
     :try_end_0
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/y.smali b/com.discord/smali_classes2/com/google/firebase/iid/y.smali
index dca8a1459c..020d77a6e1 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/y.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/y.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aVu:Lcom/google/firebase/iid/z;
+.field private final aVM:Lcom/google/firebase/iid/z;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/y;->aVu:Lcom/google/firebase/iid/z;
+    iput-object p1, p0, Lcom/google/firebase/iid/y;->aVM:Lcom/google/firebase/iid/z;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final a(Lcom/google/android/gms/tasks/Task;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/firebase/iid/y;->aVu:Lcom/google/firebase/iid/z;
+    iget-object p1, p0, Lcom/google/firebase/iid/y;->aVM:Lcom/google/firebase/iid/z;
 
     invoke-virtual {p1}, Lcom/google/firebase/iid/z;->zza()V
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/z.smali b/com.discord/smali_classes2/com/google/firebase/iid/z.smali
index 2dc628dc59..61b3b9fc26 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/z.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/z.smali
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field final aVv:Landroid/content/Intent;
+.field final aVN:Landroid/content/Intent;
 
-.field private final aVw:Landroid/content/BroadcastReceiver$PendingResult;
+.field private final aVO:Landroid/content/BroadcastReceiver$PendingResult;
 
-.field private aVx:Z
+.field private aVP:Z
 
-.field private final aVy:Ljava/util/concurrent/ScheduledFuture;
+.field private final aVQ:Ljava/util/concurrent/ScheduledFuture;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ScheduledFuture<",
@@ -28,11 +28,11 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/firebase/iid/z;->aVx:Z
+    iput-boolean v0, p0, Lcom/google/firebase/iid/z;->aVP:Z
 
-    iput-object p1, p0, Lcom/google/firebase/iid/z;->aVv:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/firebase/iid/z;->aVN:Landroid/content/Intent;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/z;->aVw:Landroid/content/BroadcastReceiver$PendingResult;
+    iput-object p2, p0, Lcom/google/firebase/iid/z;->aVO:Landroid/content/BroadcastReceiver$PendingResult;
 
     new-instance p2, Lcom/google/firebase/iid/ab;
 
@@ -46,7 +46,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/z;->aVy:Ljava/util/concurrent/ScheduledFuture;
+    iput-object p1, p0, Lcom/google/firebase/iid/z;->aVQ:Ljava/util/concurrent/ScheduledFuture;
 
     return-void
 .end method
@@ -59,15 +59,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/google/firebase/iid/z;->aVx:Z
+    iget-boolean v0, p0, Lcom/google/firebase/iid/z;->aVP:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/iid/z;->aVw:Landroid/content/BroadcastReceiver$PendingResult;
+    iget-object v0, p0, Lcom/google/firebase/iid/z;->aVO:Landroid/content/BroadcastReceiver$PendingResult;
 
     invoke-virtual {v0}, Landroid/content/BroadcastReceiver$PendingResult;->finish()V
 
-    iget-object v0, p0, Lcom/google/firebase/iid/z;->aVy:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v0, p0, Lcom/google/firebase/iid/z;->aVQ:Ljava/util/concurrent/ScheduledFuture;
 
     const/4 v1, 0x0
 
@@ -75,7 +75,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/firebase/iid/z;->aVx:Z
+    iput-boolean v0, p0, Lcom/google/firebase/iid/z;->aVP:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/zzd$a.smali b/com.discord/smali_classes2/com/google/firebase/iid/zzd$a.smali
index 5a980d9b3d..3d4f6f237e 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/zzd$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/zzd$a.smali
@@ -51,7 +51,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Bf()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->AZ()Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/zzd.smali b/com.discord/smali_classes2/com/google/firebase/iid/zzd.smali
index 2f112d6240..14bc2ec8aa 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/zzd.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/zzd.smali
@@ -27,9 +27,9 @@
 
 
 # instance fields
-.field private aUM:Landroid/os/Messenger;
+.field private aVW:Lcom/google/firebase/iid/an;
 
-.field private aVE:Lcom/google/firebase/iid/an;
+.field private aVe:Landroid/os/Messenger;
 
 
 # direct methods
@@ -60,7 +60,7 @@
 
     invoke-direct {v0, p1}, Landroid/os/Messenger;-><init>(Landroid/os/IBinder;)V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/zzd;->aUM:Landroid/os/Messenger;
+    iput-object v0, p0, Lcom/google/firebase/iid/zzd;->aVe:Landroid/os/Messenger;
 
     return-void
 
@@ -69,15 +69,15 @@
 
     invoke-direct {v0, p1}, Lcom/google/firebase/iid/aq;-><init>(Landroid/os/IBinder;)V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/zzd;->aVE:Lcom/google/firebase/iid/an;
+    iput-object v0, p0, Lcom/google/firebase/iid/zzd;->aVW:Lcom/google/firebase/iid/an;
 
     return-void
 .end method
 
-.method private final Bt()Landroid/os/IBinder;
+.method private final Bn()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/zzd;->aUM:Landroid/os/Messenger;
+    iget-object v0, p0, Lcom/google/firebase/iid/zzd;->aVe:Landroid/os/Messenger;
 
     if-eqz v0, :cond_0
 
@@ -88,7 +88,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/zzd;->aVE:Lcom/google/firebase/iid/an;
+    iget-object v0, p0, Lcom/google/firebase/iid/zzd;->aVW:Lcom/google/firebase/iid/an;
 
     invoke-interface {v0}, Lcom/google/firebase/iid/an;->asBinder()Landroid/os/IBinder;
 
@@ -107,7 +107,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/iid/zzd;->aUM:Landroid/os/Messenger;
+    iget-object v0, p0, Lcom/google/firebase/iid/zzd;->aVe:Landroid/os/Messenger;
 
     if-eqz v0, :cond_0
 
@@ -116,7 +116,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/zzd;->aVE:Lcom/google/firebase/iid/an;
+    iget-object v0, p0, Lcom/google/firebase/iid/zzd;->aVW:Lcom/google/firebase/iid/an;
 
     invoke-interface {v0, p1}, Lcom/google/firebase/iid/an;->a(Landroid/os/Message;)V
 
@@ -142,13 +142,13 @@
 
     :cond_0
     :try_start_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/zzd;->Bt()Landroid/os/IBinder;
+    invoke-direct {p0}, Lcom/google/firebase/iid/zzd;->Bn()Landroid/os/IBinder;
 
     move-result-object v1
 
     check-cast p1, Lcom/google/firebase/iid/zzd;
 
-    invoke-direct {p1}, Lcom/google/firebase/iid/zzd;->Bt()Landroid/os/IBinder;
+    invoke-direct {p1}, Lcom/google/firebase/iid/zzd;->Bn()Landroid/os/IBinder;
 
     move-result-object p1
 
@@ -167,7 +167,7 @@
 .method public hashCode()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/zzd;->Bt()Landroid/os/IBinder;
+    invoke-direct {p0}, Lcom/google/firebase/iid/zzd;->Bn()Landroid/os/IBinder;
 
     move-result-object v0
 
@@ -181,7 +181,7 @@
 .method public writeToParcel(Landroid/os/Parcel;I)V
     .locals 0
 
-    iget-object p2, p0, Lcom/google/firebase/iid/zzd;->aUM:Landroid/os/Messenger;
+    iget-object p2, p0, Lcom/google/firebase/iid/zzd;->aVe:Landroid/os/Messenger;
 
     if-eqz p2, :cond_0
 
@@ -194,7 +194,7 @@
     return-void
 
     :cond_0
-    iget-object p2, p0, Lcom/google/firebase/iid/zzd;->aVE:Lcom/google/firebase/iid/an;
+    iget-object p2, p0, Lcom/google/firebase/iid/zzd;->aVW:Lcom/google/firebase/iid/an;
 
     invoke-interface {p2}, Lcom/google/firebase/iid/an;->asBinder()Landroid/os/IBinder;
 
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 9398ad2f86..8b9ce32aa4 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/FirebaseMessagingService.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/FirebaseMessagingService.smali
@@ -73,11 +73,11 @@
 .method protected final zza(Landroid/content/Intent;)Landroid/content/Intent;
     .locals 0
 
-    invoke-static {}, Lcom/google/firebase/iid/o;->Bp()Lcom/google/firebase/iid/o;
+    invoke-static {}, Lcom/google/firebase/iid/o;->Bj()Lcom/google/firebase/iid/o;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/firebase/iid/o;->aVh:Ljava/util/Queue;
+    iget-object p1, p1, Lcom/google/firebase/iid/o;->aVz:Ljava/util/Queue;
 
     invoke-interface {p1}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
@@ -387,7 +387,7 @@
 
     new-instance v5, Lcom/google/firebase/iid/c;
 
-    invoke-virtual {v4}, Lcom/google/firebase/iid/au;->Bj()I
+    invoke-virtual {v4}, Lcom/google/firebase/iid/au;->Bd()I
 
     move-result v6
 
@@ -686,7 +686,7 @@
     invoke-direct {v4, p0, v0, v1}, Lcom/google/firebase/messaging/e;-><init>(Landroid/content/Context;Landroid/os/Bundle;Ljava/util/concurrent/Executor;)V
 
     :try_start_0
-    invoke-virtual {v4}, Lcom/google/firebase/messaging/e;->zX()Z
+    invoke-virtual {v4}, Lcom/google/firebase/messaging/e;->zT()Z
 
     move-result v4
     :try_end_0
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/RemoteMessage.smali b/com.discord/smali_classes2/com/google/firebase/messaging/RemoteMessage.smali
index 7d2d503506..d0a97e5d0b 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/RemoteMessage.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/RemoteMessage.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field private aUW:Ljava/util/Map;
+.field public aVo:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field aVY:Landroid/os/Bundle;
+.field public aWq:Landroid/os/Bundle;
 
 
 # direct methods
@@ -48,201 +48,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/RemoteMessage;->aVY:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/firebase/messaging/RemoteMessage;->aWq:Landroid/os/Bundle;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Bv()Ljava/lang/String;
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aVY:Landroid/os/Bundle;
-
-    const-string v1, "from"
-
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final Bw()Ljava/util/Map;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aUW:Ljava/util/Map;
-
-    if-nez v0, :cond_2
-
-    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aVY:Landroid/os/Bundle;
-
-    new-instance v1, Landroidx/collection/ArrayMap;
-
-    invoke-direct {v1}, Landroidx/collection/ArrayMap;-><init>()V
-
-    invoke-virtual {v0}, Landroid/os/Bundle;->keySet()Ljava/util/Set;
-
-    move-result-object v2
-
-    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_1
-
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/String;
-
-    invoke-virtual {v0, v3}, Landroid/os/Bundle;->get(Ljava/lang/String;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    instance-of v5, v4, Ljava/lang/String;
-
-    if-eqz v5, :cond_0
-
-    check-cast v4, Ljava/lang/String;
-
-    const-string v5, "google."
-
-    invoke-virtual {v3, v5}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
-
-    move-result v5
-
-    if-nez v5, :cond_0
-
-    const-string v5, "gcm."
-
-    invoke-virtual {v3, v5}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
-
-    move-result v5
-
-    if-nez v5, :cond_0
-
-    const-string v5, "from"
-
-    invoke-virtual {v3, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-nez v5, :cond_0
-
-    const-string v5, "message_type"
-
-    invoke-virtual {v3, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-nez v5, :cond_0
-
-    const-string v5, "collapse_key"
-
-    invoke-virtual {v3, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-nez v5, :cond_0
-
-    invoke-virtual {v1, v3, v4}, Landroidx/collection/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_0
-
-    :cond_1
-    iput-object v1, p0, Lcom/google/firebase/messaging/RemoteMessage;->aUW:Ljava/util/Map;
-
-    :cond_2
-    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aUW:Ljava/util/Map;
-
-    return-object v0
-.end method
-
-.method public final Bx()Ljava/lang/String;
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aVY:Landroid/os/Bundle;
-
-    const-string v1, "collapse_key"
-
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final By()Ljava/lang/String;
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aVY:Landroid/os/Bundle;
-
-    const-string v1, "google.message_id"
-
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aVY:Landroid/os/Bundle;
-
-    const-string v1, "message_id"
-
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    :cond_0
-    return-object v0
-.end method
-
-.method public final Bz()Ljava/lang/String;
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aVY:Landroid/os/Bundle;
-
-    const-string v1, "message_type"
-
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getTo()Ljava/lang/String;
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aVY:Landroid/os/Bundle;
-
-    const-string v1, "google.to"
-
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
 .method public final writeToParcel(Landroid/os/Parcel;I)V
     .locals 2
 
@@ -252,7 +64,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aVY:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aWq:Landroid/os/Bundle;
 
     const/4 v1, 0x2
 
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/a.smali b/com.discord/smali_classes2/com/google/firebase/messaging/a.smali
index 10c5f7b3fc..904c386ce8 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final aVX:Ljava/util/regex/Pattern;
+.field private static final aWp:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/messaging/a;->aVX:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/firebase/messaging/a;->aWp:Ljava/util/regex/Pattern;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/d.smali b/com.discord/smali_classes2/com/google/firebase/messaging/d.smali
index 7708d97c25..63d0f0ba70 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/d.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field static final aVZ:Ljava/util/concurrent/atomic/AtomicInteger;
+.field static final aWr:Ljava/util/concurrent/atomic/AtomicInteger;
 
 
 # instance fields
-.field private aUQ:Landroid/os/Bundle;
+.field final aVE:Landroid/content/Context;
 
-.field final aVm:Landroid/content/Context;
+.field private aVi:Landroid/os/Bundle;
 
-.field final alD:Ljava/lang/String;
+.field final alV:Ljava/lang/String;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0, v2}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    sput-object v0, Lcom/google/firebase/messaging/d;->aVZ:Ljava/util/concurrent/atomic/AtomicInteger;
+    sput-object v0, Lcom/google/firebase/messaging/d;->aWr:Ljava/util/concurrent/atomic/AtomicInteger;
 
     return-void
 .end method
@@ -39,24 +39,24 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/d;->alD:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/messaging/d;->alV:Ljava/lang/String;
 
     return-void
 .end method
 
-.method private final declared-synchronized BA()Landroid/os/Bundle;
+.method private final declared-synchronized Bp()Landroid/os/Bundle;
     .locals 4
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aUQ:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVi:Landroid/os/Bundle;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aUQ:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVi:Landroid/os/Bundle;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -80,9 +80,9 @@
 
     iget-object v0, v0, Landroid/content/pm/ApplicationInfo;->metaData:Landroid/os/Bundle;
 
-    iput-object v0, p0, Lcom/google/firebase/messaging/d;->aUQ:Landroid/os/Bundle;
+    iput-object v0, p0, Lcom/google/firebase/messaging/d;->aVi:Landroid/os/Bundle;
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aUQ:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVi:Landroid/os/Bundle;
     :try_end_1
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -400,7 +400,7 @@
     return v2
 
     :cond_0
-    iget-object v1, p0, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -478,13 +478,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/messaging/d;->alD:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/messaging/d;->alV:Ljava/lang/String;
 
     invoke-virtual {v0, v1, p1}, Landroid/content/pm/PackageManager;->getApplicationInfo(Ljava/lang/String;I)Landroid/content/pm/ApplicationInfo;
 
@@ -537,13 +537,13 @@
     return-object v3
 
     :cond_1
-    iget-object v2, p0, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
+    iget-object v2, p0, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
 
     invoke-virtual {v2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object v2
 
-    iget-object v4, p0, Lcom/google/firebase/messaging/d;->alD:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/firebase/messaging/d;->alV:Ljava/lang/String;
 
     const-string v5, "string"
 
@@ -779,7 +779,7 @@
 .method final a(ILandroid/content/Intent;)Landroid/app/PendingIntent;
     .locals 5
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
 
     new-instance v1, Landroid/content/Intent;
 
@@ -789,7 +789,7 @@
 
     new-instance v2, Landroid/content/ComponentName;
 
-    iget-object v3, p0, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
+    iget-object v3, p0, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
 
     const-string v4, "com.google.firebase.iid.FirebaseInstanceIdReceiver"
 
@@ -837,182 +837,7 @@
     return-object p1
 .end method
 
-.method final dA(Ljava/lang/String;)Ljava/lang/String;
-    .locals 5
-
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->isAtLeastO()Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    return-object v1
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :try_start_0
-    invoke-direct {p0, v0}, Lcom/google/firebase/messaging/d;->cV(I)Landroid/content/pm/ApplicationInfo;
-
-    move-result-object v2
-
-    iget v0, v2, Landroid/content/pm/ApplicationInfo;->targetSdkVersion:I
-    :try_end_0
-    .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    nop
-
-    :goto_0
-    const/16 v2, 0x1a
-
-    if-ge v0, v2, :cond_1
-
-    return-object v1
-
-    :cond_1
-    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
-
-    const-class v1, Landroid/app/NotificationManager;
-
-    invoke-virtual {v0, v1}, Landroid/content/Context;->getSystemService(Ljava/lang/Class;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/app/NotificationManager;
-
-    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
-
-    move-result v1
-
-    const-string v2, "FirebaseMessaging"
-
-    if-nez v1, :cond_3
-
-    invoke-virtual {v0, p1}, Landroid/app/NotificationManager;->getNotificationChannel(Ljava/lang/String;)Landroid/app/NotificationChannel;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_2
-
-    return-object p1
-
-    :cond_2
-    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    add-int/lit8 v1, v1, 0x7a
-
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3, v1}, Ljava/lang/StringBuilder;-><init>(I)V
-
-    const-string v1, "Notification Channel requested ("
-
-    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p1, ") has not been created by the app. Manifest configuration, or default, value will be used."
-
-    invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {v2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
-
-    :cond_3
-    invoke-direct {p0}, Lcom/google/firebase/messaging/d;->BA()Landroid/os/Bundle;
-
-    move-result-object p1
-
-    const-string v1, "com.google.firebase.messaging.default_notification_channel_id"
-
-    invoke-virtual {p1, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_5
-
-    invoke-virtual {v0, p1}, Landroid/app/NotificationManager;->getNotificationChannel(Ljava/lang/String;)Landroid/app/NotificationChannel;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_4
-
-    return-object p1
-
-    :cond_4
-    const-string p1, "Notification Channel set in AndroidManifest.xml has not been created by the app. Default value will be used."
-
-    invoke-static {v2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
-
-    goto :goto_1
-
-    :cond_5
-    const-string p1, "Missing Default Notification Channel metadata in AndroidManifest. Default value will be used."
-
-    invoke-static {v2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
-
-    :goto_1
-    const-string p1, "fcm_fallback_notification_channel"
-
-    invoke-virtual {v0, p1}, Landroid/app/NotificationManager;->getNotificationChannel(Ljava/lang/String;)Landroid/app/NotificationChannel;
-
-    move-result-object v1
-
-    if-nez v1, :cond_6
-
-    iget-object v1, p0, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
-
-    invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lcom/google/firebase/messaging/d;->alD:Ljava/lang/String;
-
-    const-string v3, "fcm_fallback_notification_channel_label"
-
-    const-string v4, "string"
-
-    invoke-virtual {v1, v3, v4, v2}, Landroid/content/res/Resources;->getIdentifier(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
-
-    move-result v1
-
-    new-instance v2, Landroid/app/NotificationChannel;
-
-    iget-object v3, p0, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
-
-    invoke-virtual {v3, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    const/4 v3, 0x3
-
-    invoke-direct {v2, p1, v1, v3}, Landroid/app/NotificationChannel;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;I)V
-
-    invoke-virtual {v0, v2}, Landroid/app/NotificationManager;->createNotificationChannel(Landroid/app/NotificationChannel;)V
-
-    :cond_6
-    return-object p1
-.end method
-
-.method final dy(Ljava/lang/String;)I
+.method final ds(Ljava/lang/String;)I
     .locals 4
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
@@ -1023,13 +848,13 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/firebase/messaging/d;->alD:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/firebase/messaging/d;->alV:Ljava/lang/String;
 
     const-string v3, "drawable"
 
@@ -1048,7 +873,7 @@
     return v2
 
     :cond_0
-    iget-object v2, p0, Lcom/google/firebase/messaging/d;->alD:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/firebase/messaging/d;->alV:Ljava/lang/String;
 
     const-string v3, "mipmap"
 
@@ -1098,7 +923,7 @@
     invoke-static {v1, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_2
-    invoke-direct {p0}, Lcom/google/firebase/messaging/d;->BA()Landroid/os/Bundle;
+    invoke-direct {p0}, Lcom/google/firebase/messaging/d;->Bp()Landroid/os/Bundle;
 
     move-result-object p1
 
@@ -1180,7 +1005,7 @@
     return p1
 .end method
 
-.method final dz(Ljava/lang/String;)Ljava/lang/Integer;
+.method final dt(Ljava/lang/String;)Ljava/lang/Integer;
     .locals 4
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -1247,7 +1072,7 @@
     invoke-static {v2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_1
-    invoke-direct {p0}, Lcom/google/firebase/messaging/d;->BA()Landroid/os/Bundle;
+    invoke-direct {p0}, Lcom/google/firebase/messaging/d;->Bp()Landroid/os/Bundle;
 
     move-result-object p1
 
@@ -1262,7 +1087,7 @@
     if-eqz p1, :cond_2
 
     :try_start_1
-    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
 
     invoke-static {v0, p1}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 
@@ -1285,6 +1110,181 @@
     return-object v1
 .end method
 
+.method final du(Ljava/lang/String;)Ljava/lang/String;
+    .locals 5
+
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->isAtLeastO()Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    return-object v1
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :try_start_0
+    invoke-direct {p0, v0}, Lcom/google/firebase/messaging/d;->cV(I)Landroid/content/pm/ApplicationInfo;
+
+    move-result-object v2
+
+    iget v0, v2, Landroid/content/pm/ApplicationInfo;->targetSdkVersion:I
+    :try_end_0
+    .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    nop
+
+    :goto_0
+    const/16 v2, 0x1a
+
+    if-ge v0, v2, :cond_1
+
+    return-object v1
+
+    :cond_1
+    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
+
+    const-class v1, Landroid/app/NotificationManager;
+
+    invoke-virtual {v0, v1}, Landroid/content/Context;->getSystemService(Ljava/lang/Class;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/app/NotificationManager;
+
+    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+
+    move-result v1
+
+    const-string v2, "FirebaseMessaging"
+
+    if-nez v1, :cond_3
+
+    invoke-virtual {v0, p1}, Landroid/app/NotificationManager;->getNotificationChannel(Ljava/lang/String;)Landroid/app/NotificationChannel;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_2
+
+    return-object p1
+
+    :cond_2
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    add-int/lit8 v1, v1, 0x7a
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3, v1}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    const-string v1, "Notification Channel requested ("
+
+    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, ") has not been created by the app. Manifest configuration, or default, value will be used."
+
+    invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {v2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    :cond_3
+    invoke-direct {p0}, Lcom/google/firebase/messaging/d;->Bp()Landroid/os/Bundle;
+
+    move-result-object p1
+
+    const-string v1, "com.google.firebase.messaging.default_notification_channel_id"
+
+    invoke-virtual {p1, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_5
+
+    invoke-virtual {v0, p1}, Landroid/app/NotificationManager;->getNotificationChannel(Ljava/lang/String;)Landroid/app/NotificationChannel;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_4
+
+    return-object p1
+
+    :cond_4
+    const-string p1, "Notification Channel set in AndroidManifest.xml has not been created by the app. Default value will be used."
+
+    invoke-static {v2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    goto :goto_1
+
+    :cond_5
+    const-string p1, "Missing Default Notification Channel metadata in AndroidManifest. Default value will be used."
+
+    invoke-static {v2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    :goto_1
+    const-string p1, "fcm_fallback_notification_channel"
+
+    invoke-virtual {v0, p1}, Landroid/app/NotificationManager;->getNotificationChannel(Ljava/lang/String;)Landroid/app/NotificationChannel;
+
+    move-result-object v1
+
+    if-nez v1, :cond_6
+
+    iget-object v1, p0, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
+
+    invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/google/firebase/messaging/d;->alV:Ljava/lang/String;
+
+    const-string v3, "fcm_fallback_notification_channel_label"
+
+    const-string v4, "string"
+
+    invoke-virtual {v1, v3, v4, v2}, Landroid/content/res/Resources;->getIdentifier(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
+
+    move-result v1
+
+    new-instance v2, Landroid/app/NotificationChannel;
+
+    iget-object v3, p0, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
+
+    invoke-virtual {v3, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    const/4 v3, 0x3
+
+    invoke-direct {v2, p1, v1, v3}, Landroid/app/NotificationChannel;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;I)V
+
+    invoke-virtual {v0, v2}, Landroid/app/NotificationManager;->createNotificationChannel(Landroid/app/NotificationChannel;)V
+
+    :cond_6
+    return-object p1
+.end method
+
 .method final l(Landroid/os/Bundle;)Ljava/lang/CharSequence;
     .locals 2
 
@@ -1310,7 +1310,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/e.smali b/com.discord/smali_classes2/com/google/firebase/messaging/e.smali
index ae0b82998b..0bc7ea97a7 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/e.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/e.smali
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field private final aUQ:Landroid/os/Bundle;
+.field private final aVE:Landroid/content/Context;
 
-.field private final aUV:Ljava/util/concurrent/Executor;
+.field private final aVi:Landroid/os/Bundle;
 
-.field private final aVm:Landroid/content/Context;
+.field private final aVn:Ljava/util/concurrent/Executor;
 
-.field private final aWa:Lcom/google/firebase/messaging/d;
+.field private final aWs:Lcom/google/firebase/messaging/d;
 
 
 # direct methods
@@ -19,11 +19,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p3, p0, Lcom/google/firebase/messaging/e;->aUV:Ljava/util/concurrent/Executor;
+    iput-object p3, p0, Lcom/google/firebase/messaging/e;->aVn:Ljava/util/concurrent/Executor;
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/e;->aVm:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/messaging/e;->aVE:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/e;->aUQ:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/google/firebase/messaging/e;->aVi:Landroid/os/Bundle;
 
     new-instance p2, Lcom/google/firebase/messaging/d;
 
@@ -33,17 +33,17 @@
 
     invoke-direct {p2, p1, p3}, Lcom/google/firebase/messaging/d;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/e;->aWa:Lcom/google/firebase/messaging/d;
+    iput-object p2, p0, Lcom/google/firebase/messaging/e;->aWs:Lcom/google/firebase/messaging/d;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final zX()Z
+.method final zT()Z
     .locals 13
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/e;->aUQ:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/firebase/messaging/e;->aVi:Landroid/os/Bundle;
 
     const-string v1, "gcm.n.noui"
 
@@ -64,7 +64,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/messaging/e;->aVm:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/messaging/e;->aVE:Landroid/content/Context;
 
     const-string v2, "keyguard"
 
@@ -82,7 +82,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->mu()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->ms()Z
 
     move-result v0
 
@@ -97,7 +97,7 @@
 
     move-result v0
 
-    iget-object v3, p0, Lcom/google/firebase/messaging/e;->aVm:Landroid/content/Context;
+    iget-object v3, p0, Lcom/google/firebase/messaging/e;->aVE:Landroid/content/Context;
 
     const-string v4, "activity"
 
@@ -153,7 +153,7 @@
     return v2
 
     :cond_4
-    iget-object v0, p0, Lcom/google/firebase/messaging/e;->aUQ:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/firebase/messaging/e;->aVi:Landroid/os/Bundle;
 
     const-string v3, "gcm.n.image"
 
@@ -161,13 +161,13 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lcom/google/firebase/messaging/l;->dB(Ljava/lang/String;)Lcom/google/firebase/messaging/l;
+    invoke-static {v0}, Lcom/google/firebase/messaging/l;->dv(Ljava/lang/String;)Lcom/google/firebase/messaging/l;
 
     move-result-object v0
 
     if-eqz v0, :cond_5
 
-    iget-object v3, p0, Lcom/google/firebase/messaging/e;->aUV:Ljava/util/concurrent/Executor;
+    iget-object v3, p0, Lcom/google/firebase/messaging/e;->aVn:Ljava/util/concurrent/Executor;
 
     new-instance v4, Lcom/google/firebase/messaging/m;
 
@@ -191,16 +191,16 @@
 
     invoke-interface {v3, v6}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
-    iput-object v5, v0, Lcom/google/firebase/messaging/l;->aWe:Lcom/google/android/gms/tasks/Task;
+    iput-object v5, v0, Lcom/google/firebase/messaging/l;->aWw:Lcom/google/android/gms/tasks/Task;
 
     :cond_5
-    iget-object v3, p0, Lcom/google/firebase/messaging/e;->aWa:Lcom/google/firebase/messaging/d;
+    iget-object v3, p0, Lcom/google/firebase/messaging/e;->aWs:Lcom/google/firebase/messaging/d;
 
-    iget-object v4, p0, Lcom/google/firebase/messaging/e;->aUQ:Landroid/os/Bundle;
+    iget-object v4, p0, Lcom/google/firebase/messaging/e;->aVi:Landroid/os/Bundle;
 
     new-instance v5, Landroidx/core/app/NotificationCompat$Builder;
 
-    iget-object v6, v3, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
+    iget-object v6, v3, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
 
     const-string v7, "gcm.n.android_channel_id"
 
@@ -208,7 +208,7 @@
 
     move-result-object v7
 
-    invoke-virtual {v3, v7}, Lcom/google/firebase/messaging/d;->dA(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v3, v7}, Lcom/google/firebase/messaging/d;->du(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v7
 
@@ -253,7 +253,7 @@
 
     move-result-object v6
 
-    invoke-virtual {v3, v6}, Lcom/google/firebase/messaging/d;->dy(Ljava/lang/String;)I
+    invoke-virtual {v3, v6}, Lcom/google/firebase/messaging/d;->ds(Ljava/lang/String;)I
 
     move-result v6
 
@@ -299,13 +299,13 @@
 
     if-nez v7, :cond_9
 
-    iget-object v7, v3, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
+    iget-object v7, v3, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
 
     invoke-virtual {v7}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object v7
 
-    iget-object v9, v3, Lcom/google/firebase/messaging/d;->alD:Ljava/lang/String;
+    iget-object v9, v3, Lcom/google/firebase/messaging/d;->alV:Ljava/lang/String;
 
     const-string v10, "raw"
 
@@ -315,7 +315,7 @@
 
     if-eqz v7, :cond_9
 
-    iget-object v7, v3, Lcom/google/firebase/messaging/d;->alD:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/firebase/messaging/d;->alV:Ljava/lang/String;
 
     invoke-static {v7}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -394,7 +394,7 @@
 
     invoke-direct {v7, v6}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
 
-    iget-object v6, v3, Lcom/google/firebase/messaging/d;->alD:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/firebase/messaging/d;->alV:Ljava/lang/String;
 
     invoke-virtual {v7, v6}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
 
@@ -448,7 +448,7 @@
 
     invoke-direct {v7, v10}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
 
-    iget-object v10, v3, Lcom/google/firebase/messaging/d;->alD:Ljava/lang/String;
+    iget-object v10, v3, Lcom/google/firebase/messaging/d;->alV:Ljava/lang/String;
 
     invoke-virtual {v7, v10}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
 
@@ -457,13 +457,13 @@
     goto :goto_3
 
     :cond_e
-    iget-object v6, v3, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
+    iget-object v6, v3, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
 
     invoke-virtual {v6}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
     move-result-object v6
 
-    iget-object v7, v3, Lcom/google/firebase/messaging/d;->alD:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/firebase/messaging/d;->alV:Ljava/lang/String;
 
     invoke-virtual {v6, v7}, Landroid/content/pm/PackageManager;->getLaunchIntentForPackage(Ljava/lang/String;)Landroid/content/Intent;
 
@@ -575,9 +575,9 @@
     goto :goto_5
 
     :cond_15
-    iget-object v6, v3, Lcom/google/firebase/messaging/d;->aVm:Landroid/content/Context;
+    iget-object v6, v3, Lcom/google/firebase/messaging/d;->aVE:Landroid/content/Context;
 
-    sget-object v10, Lcom/google/firebase/messaging/d;->aVZ:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v10, Lcom/google/firebase/messaging/d;->aWr:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v10}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
@@ -607,7 +607,7 @@
 
     invoke-virtual {v7, v10, v6}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
 
-    sget-object v6, Lcom/google/firebase/messaging/d;->aVZ:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v6, Lcom/google/firebase/messaging/d;->aWr:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v6}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
@@ -640,7 +640,7 @@
 
     invoke-static {v6, v4}, Lcom/google/firebase/messaging/d;->a(Landroid/content/Intent;Landroid/os/Bundle;)V
 
-    sget-object v7, Lcom/google/firebase/messaging/d;->aVZ:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v7, Lcom/google/firebase/messaging/d;->aWr:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v7}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
@@ -662,7 +662,7 @@
 
     move-result-object v6
 
-    invoke-virtual {v3, v6}, Lcom/google/firebase/messaging/d;->dz(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-virtual {v3, v6}, Lcom/google/firebase/messaging/d;->dt(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v3
 
@@ -715,12 +715,12 @@
     :goto_8
     invoke-direct {v3, v5, v4}, Lcom/google/firebase/messaging/f;-><init>(Landroidx/core/app/NotificationCompat$Builder;Ljava/lang/String;)V
 
-    iget-object v4, v3, Lcom/google/firebase/messaging/f;->aWb:Landroidx/core/app/NotificationCompat$Builder;
+    iget-object v4, v3, Lcom/google/firebase/messaging/f;->aWt:Landroidx/core/app/NotificationCompat$Builder;
 
     if-eqz v0, :cond_1b
 
     :try_start_0
-    iget-object v5, v0, Lcom/google/firebase/messaging/l;->aWe:Lcom/google/android/gms/tasks/Task;
+    iget-object v5, v0, Lcom/google/firebase/messaging/l;->aWw:Lcom/google/android/gms/tasks/Task;
 
     invoke-static {v5}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -802,7 +802,7 @@
     invoke-static {v9, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_1c
-    iget-object v0, p0, Lcom/google/firebase/messaging/e;->aVm:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/messaging/e;->aVE:Landroid/content/Context;
 
     const-string v4, "notification"
 
@@ -812,9 +812,9 @@
 
     check-cast v0, Landroid/app/NotificationManager;
 
-    iget-object v4, v3, Lcom/google/firebase/messaging/f;->alr:Ljava/lang/String;
+    iget-object v4, v3, Lcom/google/firebase/messaging/f;->alJ:Ljava/lang/String;
 
-    iget-object v3, v3, Lcom/google/firebase/messaging/f;->aWb:Landroidx/core/app/NotificationCompat$Builder;
+    iget-object v3, v3, Lcom/google/firebase/messaging/f;->aWt:Landroidx/core/app/NotificationCompat$Builder;
 
     invoke-virtual {v3}, Landroidx/core/app/NotificationCompat$Builder;->build()Landroid/app/Notification;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/f.smali b/com.discord/smali_classes2/com/google/firebase/messaging/f.smali
index 40fd582155..6da76c4ce5 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/f.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/f.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field public final aUP:I
+.field public final aVh:I
 
-.field public final aWb:Landroidx/core/app/NotificationCompat$Builder;
+.field public final aWt:Landroidx/core/app/NotificationCompat$Builder;
 
-.field public final alr:Ljava/lang/String;
+.field public final alJ:Ljava/lang/String;
 
 
 # direct methods
@@ -17,13 +17,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/f;->aWb:Landroidx/core/app/NotificationCompat$Builder;
+    iput-object p1, p0, Lcom/google/firebase/messaging/f;->aWt:Landroidx/core/app/NotificationCompat$Builder;
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/f;->alr:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/messaging/f;->alJ:Ljava/lang/String;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/firebase/messaging/f;->aUP:I
+    iput p1, p0, Lcom/google/firebase/messaging/f;->aVh:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/g.smali b/com.discord/smali_classes2/com/google/firebase/messaging/g.smali
index 3b295a9e38..90de28fdf2 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/g.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/g.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aWc:Lcom/google/firebase/messaging/h;
+.field private final aWu:Lcom/google/firebase/messaging/h;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/g;->aWc:Lcom/google/firebase/messaging/h;
+    iput-object p1, p0, Lcom/google/firebase/messaging/g;->aWu:Lcom/google/firebase/messaging/h;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final e(Landroid/content/Intent;)Lcom/google/android/gms/tasks/Task;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/g;->aWc:Lcom/google/firebase/messaging/h;
+    iget-object v0, p0, Lcom/google/firebase/messaging/g;->aWu:Lcom/google/firebase/messaging/h;
 
     invoke-virtual {v0, p1}, Lcom/google/firebase/messaging/h;->zzd(Landroid/content/Intent;)Lcom/google/android/gms/tasks/Task;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/h.smali b/com.discord/smali_classes2/com/google/firebase/messaging/h.smali
index 19ad398f78..91a011132e 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/h.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/h.smali
@@ -21,7 +21,7 @@
 
     invoke-direct {p0}, Landroid/app/Service;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/e/a;->mN()Lcom/google/android/gms/internal/e/b;
+    invoke-static {}, Lcom/google/android/gms/internal/e/a;->mL()Lcom/google/android/gms/internal/e/b;
 
     move-result-object v0
 
@@ -122,7 +122,7 @@
 
     invoke-interface {v1, v2}, Ljava/util/concurrent/ExecutorService;->execute(Ljava/lang/Runnable;)V
 
-    iget-object p1, v0, Lcom/google/android/gms/tasks/h;->aPe:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v0, Lcom/google/android/gms/tasks/h;->aPw:Lcom/google/android/gms/tasks/ac;
 
     return-object p1
 .end method
@@ -285,7 +285,7 @@
     return p3
 
     :cond_1
-    sget-object p3, Lcom/google/firebase/messaging/i;->aUV:Ljava/util/concurrent/Executor;
+    sget-object p3, Lcom/google/firebase/messaging/i;->aVn:Ljava/util/concurrent/Executor;
 
     new-instance v0, Lcom/google/firebase/messaging/k;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/i.smali b/com.discord/smali_classes2/com/google/firebase/messaging/i.smali
index 4c02fed970..ad4cc1280d 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/i.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/i.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aUV:Ljava/util/concurrent/Executor;
+.field static final aVn:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/messaging/i;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/messaging/i;->aUV:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/messaging/i;->aVn:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/j.smali b/com.discord/smali_classes2/com/google/firebase/messaging/j.smali
index 381aa52bb7..7c0dd22524 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/j.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/j.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final aVN:Lcom/google/android/gms/tasks/h;
+.field private final aVR:Landroid/content/Intent;
 
-.field private final aVz:Landroid/content/Intent;
+.field private final aWf:Lcom/google/android/gms/tasks/h;
 
-.field private final aWc:Lcom/google/firebase/messaging/h;
+.field private final aWu:Lcom/google/firebase/messaging/h;
 
 
 # direct methods
@@ -20,11 +20,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/j;->aWc:Lcom/google/firebase/messaging/h;
+    iput-object p1, p0, Lcom/google/firebase/messaging/j;->aWu:Lcom/google/firebase/messaging/h;
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/j;->aVz:Landroid/content/Intent;
+    iput-object p2, p0, Lcom/google/firebase/messaging/j;->aVR:Landroid/content/Intent;
 
-    iput-object p3, p0, Lcom/google/firebase/messaging/j;->aVN:Lcom/google/android/gms/tasks/h;
+    iput-object p3, p0, Lcom/google/firebase/messaging/j;->aWf:Lcom/google/android/gms/tasks/h;
 
     return-void
 .end method
@@ -34,11 +34,11 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/j;->aWc:Lcom/google/firebase/messaging/h;
+    iget-object v0, p0, Lcom/google/firebase/messaging/j;->aWu:Lcom/google/firebase/messaging/h;
 
-    iget-object v1, p0, Lcom/google/firebase/messaging/j;->aVz:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/firebase/messaging/j;->aVR:Landroid/content/Intent;
 
-    iget-object v2, p0, Lcom/google/firebase/messaging/j;->aVN:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/firebase/messaging/j;->aWf:Lcom/google/android/gms/tasks/h;
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/k.smali b/com.discord/smali_classes2/com/google/firebase/messaging/k.smali
index d0c755153e..0b58c4e6c9 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/k.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/k.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aVz:Landroid/content/Intent;
+.field private final aVR:Landroid/content/Intent;
 
-.field private final aWc:Lcom/google/firebase/messaging/h;
+.field private final aWu:Lcom/google/firebase/messaging/h;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/k;->aWc:Lcom/google/firebase/messaging/h;
+    iput-object p1, p0, Lcom/google/firebase/messaging/k;->aWu:Lcom/google/firebase/messaging/h;
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/k;->aVz:Landroid/content/Intent;
+    iput-object p2, p0, Lcom/google/firebase/messaging/k;->aVR:Landroid/content/Intent;
 
     return-void
 .end method
@@ -30,9 +30,9 @@
 .method public final a(Lcom/google/android/gms/tasks/Task;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/k;->aWc:Lcom/google/firebase/messaging/h;
+    iget-object v0, p0, Lcom/google/firebase/messaging/k;->aWu:Lcom/google/firebase/messaging/h;
 
-    iget-object v1, p0, Lcom/google/firebase/messaging/k;->aVz:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/firebase/messaging/k;->aVR:Landroid/content/Intent;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/firebase/messaging/h;->zza(Landroid/content/Intent;Lcom/google/android/gms/tasks/Task;)V
 
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/l.smali b/com.discord/smali_classes2/com/google/firebase/messaging/l.smali
index 0ba4ec22d7..6b6a48bc91 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/l.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/l.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aWd:Ljava/net/URL;
+.field private final aWv:Ljava/net/URL;
 
-.field aWe:Lcom/google/android/gms/tasks/Task;
+.field aWw:Lcom/google/android/gms/tasks/Task;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/Task<",
@@ -19,7 +19,7 @@
     .end annotation
 .end field
 
-.field private volatile aWf:Ljava/io/InputStream;
+.field private volatile aWx:Ljava/io/InputStream;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/l;->aWd:Ljava/net/URL;
+    iput-object p1, p0, Lcom/google/firebase/messaging/l;->aWv:Ljava/net/URL;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
     return-void
 .end method
 
-.method public static dB(Ljava/lang/String;)Lcom/google/firebase/messaging/l;
+.method public static dv(Ljava/lang/String;)Lcom/google/firebase/messaging/l;
     .locals 3
 
     invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
@@ -121,7 +121,7 @@
 
 
 # virtual methods
-.method public final BB()Landroid/graphics/Bitmap;
+.method public final Bq()Landroid/graphics/Bitmap;
     .locals 7
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -129,7 +129,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/l;->aWd:Ljava/net/URL;
+    iget-object v0, p0, Lcom/google/firebase/messaging/l;->aWv:Ljava/net/URL;
 
     invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -164,7 +164,7 @@
     invoke-static {v1, v0}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/messaging/l;->aWd:Ljava/net/URL;
+    iget-object v0, p0, Lcom/google/firebase/messaging/l;->aWv:Ljava/net/URL;
 
     invoke-virtual {v0}, Ljava/net/URL;->openConnection()Ljava/net/URLConnection;
 
@@ -184,7 +184,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_2
 
     :try_start_2
-    iput-object v0, p0, Lcom/google/firebase/messaging/l;->aWf:Ljava/io/InputStream;
+    iput-object v0, p0, Lcom/google/firebase/messaging/l;->aWx:Ljava/io/InputStream;
 
     invoke-static {v2}, Landroid/graphics/BitmapFactory;->decodeStream(Ljava/io/InputStream;)Landroid/graphics/Bitmap;
 
@@ -200,7 +200,7 @@
 
     if-eqz v4, :cond_0
 
-    iget-object v4, p0, Lcom/google/firebase/messaging/l;->aWd:Ljava/net/URL;
+    iget-object v4, p0, Lcom/google/firebase/messaging/l;->aWv:Ljava/net/URL;
 
     invoke-static {v4}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -254,7 +254,7 @@
 
     :cond_2
     :try_start_5
-    iget-object v3, p0, Lcom/google/firebase/messaging/l;->aWd:Ljava/net/URL;
+    iget-object v3, p0, Lcom/google/firebase/messaging/l;->aWv:Ljava/net/URL;
 
     invoke-static {v3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -336,7 +336,7 @@
     :catch_0
     move-exception v0
 
-    iget-object v2, p0, Lcom/google/firebase/messaging/l;->aWd:Ljava/net/URL;
+    iget-object v2, p0, Lcom/google/firebase/messaging/l;->aWv:Ljava/net/URL;
 
     invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -374,7 +374,7 @@
 .method public final close()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/l;->aWf:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/google/firebase/messaging/l;->aWx:Ljava/io/InputStream;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/e/j;->s(Ljava/io/InputStream;)V
 
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/m.smali b/com.discord/smali_classes2/com/google/firebase/messaging/m.smali
index 9a39bf4a39..700a9e22ba 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/m.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/m.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aWg:Lcom/google/firebase/messaging/l;
+.field private final aWy:Lcom/google/firebase/messaging/l;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/m;->aWg:Lcom/google/firebase/messaging/l;
+    iput-object p1, p0, Lcom/google/firebase/messaging/m;->aWy:Lcom/google/firebase/messaging/l;
 
     return-void
 .end method
@@ -26,9 +26,9 @@
 .method public final call()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/m;->aWg:Lcom/google/firebase/messaging/l;
+    iget-object v0, p0, Lcom/google/firebase/messaging/m;->aWy:Lcom/google/firebase/messaging/l;
 
-    invoke-virtual {v0}, Lcom/google/firebase/messaging/l;->BB()Landroid/graphics/Bitmap;
+    invoke-virtual {v0}, Lcom/google/firebase/messaging/l;->Bq()Landroid/graphics/Bitmap;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/Gson$1.smali b/com.discord/smali_classes2/com/google/gson/Gson$1.smali
index e723acf454..7ad7ad5439 100644
--- a/com.discord/smali_classes2/com/google/gson/Gson$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/Gson$1.smali
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic aWG:Lcom/google/gson/Gson;
+.field final synthetic aWY:Lcom/google/gson/Gson;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/Gson;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/Gson$1;->aWG:Lcom/google/gson/Gson;
+    iput-object p1, p0, Lcom/google/gson/Gson$1;->aWY:Lcom/google/gson/Gson;
 
     invoke-direct {p0}, Lcom/google/gson/TypeAdapter;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/google/gson/Gson$2.smali b/com.discord/smali_classes2/com/google/gson/Gson$2.smali
index a11a706599..de0c332c80 100644
--- a/com.discord/smali_classes2/com/google/gson/Gson$2.smali
+++ b/com.discord/smali_classes2/com/google/gson/Gson$2.smali
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic aWG:Lcom/google/gson/Gson;
+.field final synthetic aWY:Lcom/google/gson/Gson;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/Gson;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/Gson$2;->aWG:Lcom/google/gson/Gson;
+    iput-object p1, p0, Lcom/google/gson/Gson$2;->aWY:Lcom/google/gson/Gson;
 
     invoke-direct {p0}, Lcom/google/gson/TypeAdapter;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/google/gson/Gson$4.smali b/com.discord/smali_classes2/com/google/gson/Gson$4.smali
index 509c273145..6ac3ce6fb2 100644
--- a/com.discord/smali_classes2/com/google/gson/Gson$4.smali
+++ b/com.discord/smali_classes2/com/google/gson/Gson$4.smali
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic aWH:Lcom/google/gson/TypeAdapter;
+.field final synthetic aWZ:Lcom/google/gson/TypeAdapter;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/TypeAdapter;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/Gson$4;->aWH:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/Gson$4;->aWZ:Lcom/google/gson/TypeAdapter;
 
     invoke-direct {p0}, Lcom/google/gson/TypeAdapter;-><init>()V
 
@@ -47,7 +47,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/Gson$4;->aWH:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/Gson$4;->aWZ:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
@@ -76,7 +76,7 @@
 
     check-cast p2, Ljava/util/concurrent/atomic/AtomicLong;
 
-    iget-object v0, p0, Lcom/google/gson/Gson$4;->aWH:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/Gson$4;->aWZ:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
diff --git a/com.discord/smali_classes2/com/google/gson/Gson$5.smali b/com.discord/smali_classes2/com/google/gson/Gson$5.smali
index dd68773439..8b348bd41e 100644
--- a/com.discord/smali_classes2/com/google/gson/Gson$5.smali
+++ b/com.discord/smali_classes2/com/google/gson/Gson$5.smali
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic aWH:Lcom/google/gson/TypeAdapter;
+.field final synthetic aWZ:Lcom/google/gson/TypeAdapter;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/TypeAdapter;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/Gson$5;->aWH:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/Gson$5;->aWZ:Lcom/google/gson/TypeAdapter;
 
     invoke-direct {p0}, Lcom/google/gson/TypeAdapter;-><init>()V
 
@@ -60,7 +60,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/gson/Gson$5;->aWH:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/Gson$5;->aWZ:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v1, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
@@ -137,7 +137,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v2, p0, Lcom/google/gson/Gson$5;->aWH:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lcom/google/gson/Gson$5;->aWZ:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {p2, v1}, Ljava/util/concurrent/atomic/AtomicLongArray;->get(I)J
 
diff --git a/com.discord/smali_classes2/com/google/gson/Gson$a.smali b/com.discord/smali_classes2/com/google/gson/Gson$a.smali
index f37624c8d6..60d97c6cc1 100644
--- a/com.discord/smali_classes2/com/google/gson/Gson$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/Gson$a.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field aWI:Lcom/google/gson/TypeAdapter;
+.field aXa:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -62,7 +62,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/Gson$a;->aWI:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/Gson$a;->aXa:Lcom/google/gson/TypeAdapter;
 
     if-eqz v0, :cond_0
 
@@ -96,7 +96,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/Gson$a;->aWI:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/Gson$a;->aXa:Lcom/google/gson/TypeAdapter;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/gson/Gson.smali b/com.discord/smali_classes2/com/google/gson/Gson.smali
index 303a8c3039..ba2009e949 100644
--- a/com.discord/smali_classes2/com/google/gson/Gson.smali
+++ b/com.discord/smali_classes2/com/google/gson/Gson.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field private static final aWw:Lcom/google/gson/reflect/TypeToken;
+.field private static final aWO:Lcom/google/gson/reflect/TypeToken;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/reflect/TypeToken<",
@@ -23,19 +23,7 @@
 
 
 # instance fields
-.field private final aWA:Lcom/google/gson/internal/c;
-
-.field private final aWB:Lcom/google/gson/internal/d;
-
-.field private final aWC:Lcom/google/gson/e;
-
-.field private final aWD:Z
-
-.field private final aWE:Z
-
-.field private final aWF:Lcom/google/gson/internal/a/d;
-
-.field private final aWx:Ljava/lang/ThreadLocal;
+.field private final aWP:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -48,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final aWy:Ljava/util/Map;
+.field private final aWQ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -60,7 +48,7 @@
     .end annotation
 .end field
 
-.field private final aWz:Ljava/util/List;
+.field private final aWR:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -70,6 +58,18 @@
     .end annotation
 .end field
 
+.field private final aWS:Lcom/google/gson/internal/c;
+
+.field private final aWT:Lcom/google/gson/internal/d;
+
+.field private final aWU:Lcom/google/gson/e;
+
+.field private final aWV:Z
+
+.field private final aWW:Z
+
+.field private final aWX:Lcom/google/gson/internal/a/d;
+
 .field private final htmlSafe:Z
 
 .field private final lenient:Z
@@ -87,7 +87,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/Gson;->aWw:Lcom/google/gson/reflect/TypeToken;
+    sput-object v0, Lcom/google/gson/Gson;->aWO:Lcom/google/gson/reflect/TypeToken;
 
     return-void
 .end method
@@ -95,15 +95,15 @@
 .method public constructor <init>()V
     .locals 13
 
-    sget-object v1, Lcom/google/gson/internal/d;->aXi:Lcom/google/gson/internal/d;
+    sget-object v1, Lcom/google/gson/internal/d;->aXA:Lcom/google/gson/internal/d;
 
-    sget-object v2, Lcom/google/gson/d;->aWq:Lcom/google/gson/d;
+    sget-object v2, Lcom/google/gson/d;->aWI:Lcom/google/gson/d;
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
 
     move-result-object v3
 
-    sget-object v11, Lcom/google/gson/q;->aWX:Lcom/google/gson/q;
+    sget-object v11, Lcom/google/gson/q;->aXp:Lcom/google/gson/q;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
@@ -154,31 +154,31 @@
 
     invoke-direct {v0}, Ljava/lang/ThreadLocal;-><init>()V
 
-    iput-object v0, p0, Lcom/google/gson/Gson;->aWx:Ljava/lang/ThreadLocal;
+    iput-object v0, p0, Lcom/google/gson/Gson;->aWP:Ljava/lang/ThreadLocal;
 
     new-instance v0, Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/gson/Gson;->aWy:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/gson/Gson;->aWQ:Ljava/util/Map;
 
     new-instance v0, Lcom/google/gson/internal/c;
 
     invoke-direct {v0, p3}, Lcom/google/gson/internal/c;-><init>(Ljava/util/Map;)V
 
-    iput-object v0, p0, Lcom/google/gson/Gson;->aWA:Lcom/google/gson/internal/c;
+    iput-object v0, p0, Lcom/google/gson/Gson;->aWS:Lcom/google/gson/internal/c;
 
-    iput-object p1, p0, Lcom/google/gson/Gson;->aWB:Lcom/google/gson/internal/d;
+    iput-object p1, p0, Lcom/google/gson/Gson;->aWT:Lcom/google/gson/internal/d;
 
-    iput-object p2, p0, Lcom/google/gson/Gson;->aWC:Lcom/google/gson/e;
+    iput-object p2, p0, Lcom/google/gson/Gson;->aWU:Lcom/google/gson/e;
 
     iput-boolean p4, p0, Lcom/google/gson/Gson;->serializeNulls:Z
 
-    iput-boolean p6, p0, Lcom/google/gson/Gson;->aWD:Z
+    iput-boolean p6, p0, Lcom/google/gson/Gson;->aWV:Z
 
     iput-boolean p7, p0, Lcom/google/gson/Gson;->htmlSafe:Z
 
-    iput-boolean p8, p0, Lcom/google/gson/Gson;->aWE:Z
+    iput-boolean p8, p0, Lcom/google/gson/Gson;->aWW:Z
 
     iput-boolean p9, p0, Lcom/google/gson/Gson;->lenient:Z
 
@@ -186,11 +186,11 @@
 
     invoke-direct {p3}, Ljava/util/ArrayList;-><init>()V
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aZv:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZN:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/h;->aXM:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/h;->aYe:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -198,31 +198,31 @@
 
     invoke-interface {p3, p12}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aZa:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZs:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aYJ:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZb:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aYD:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aYV:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aYF:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aYX:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aYH:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aYZ:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/q;->aWX:Lcom/google/gson/q;
+    sget-object p4, Lcom/google/gson/q;->aXp:Lcom/google/gson/q;
 
     if-ne p11, p4, :cond_0
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aYQ:Lcom/google/gson/TypeAdapter;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZi:Lcom/google/gson/TypeAdapter;
 
     goto :goto_0
 
@@ -248,7 +248,7 @@
 
     if-eqz p10, :cond_1
 
-    sget-object p8, Lcom/google/gson/internal/a/n;->aYS:Lcom/google/gson/TypeAdapter;
+    sget-object p8, Lcom/google/gson/internal/a/n;->aZk:Lcom/google/gson/TypeAdapter;
 
     goto :goto_1
 
@@ -270,7 +270,7 @@
 
     if-eqz p10, :cond_2
 
-    sget-object p8, Lcom/google/gson/internal/a/n;->aYR:Lcom/google/gson/TypeAdapter;
+    sget-object p8, Lcom/google/gson/internal/a/n;->aZj:Lcom/google/gson/TypeAdapter;
 
     goto :goto_2
 
@@ -286,15 +286,15 @@
 
     invoke-interface {p3, p6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p6, Lcom/google/gson/internal/a/n;->aYU:Lcom/google/gson/r;
+    sget-object p6, Lcom/google/gson/internal/a/n;->aZm:Lcom/google/gson/r;
 
     invoke-interface {p3, p6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p6, Lcom/google/gson/internal/a/n;->aYL:Lcom/google/gson/r;
+    sget-object p6, Lcom/google/gson/internal/a/n;->aZd:Lcom/google/gson/r;
 
     invoke-interface {p3, p6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p6, Lcom/google/gson/internal/a/n;->aYN:Lcom/google/gson/r;
+    sget-object p6, Lcom/google/gson/internal/a/n;->aZf:Lcom/google/gson/r;
 
     invoke-interface {p3, p6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -330,25 +330,25 @@
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aYP:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZh:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aYW:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZo:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aZc:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZu:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aZe:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZw:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     const-class p4, Ljava/math/BigDecimal;
 
-    sget-object p6, Lcom/google/gson/internal/a/n;->aYY:Lcom/google/gson/TypeAdapter;
+    sget-object p6, Lcom/google/gson/internal/a/n;->aZq:Lcom/google/gson/TypeAdapter;
 
     invoke-static {p4, p6}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
@@ -358,7 +358,7 @@
 
     const-class p4, Ljava/math/BigInteger;
 
-    sget-object p6, Lcom/google/gson/internal/a/n;->aYZ:Lcom/google/gson/TypeAdapter;
+    sget-object p6, Lcom/google/gson/internal/a/n;->aZr:Lcom/google/gson/TypeAdapter;
 
     invoke-static {p4, p6}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
@@ -366,65 +366,65 @@
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aZg:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZy:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aZi:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZA:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aZm:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZE:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aZo:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZG:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aZt:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZL:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aZk:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZC:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aYA:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aYS:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/c;->aXM:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/c;->aYe:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aZr:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZJ:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/k;->aXM:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/k;->aYe:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/j;->aXM:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/j;->aYe:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aZp:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZH:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/a;->aXM:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/a;->aYe:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aYy:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aYQ:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     new-instance p4, Lcom/google/gson/internal/a/b;
 
-    iget-object p6, p0, Lcom/google/gson/Gson;->aWA:Lcom/google/gson/internal/c;
+    iget-object p6, p0, Lcom/google/gson/Gson;->aWS:Lcom/google/gson/internal/c;
 
     invoke-direct {p4, p6}, Lcom/google/gson/internal/a/b;-><init>(Lcom/google/gson/internal/c;)V
 
@@ -432,7 +432,7 @@
 
     new-instance p4, Lcom/google/gson/internal/a/g;
 
-    iget-object p6, p0, Lcom/google/gson/Gson;->aWA:Lcom/google/gson/internal/c;
+    iget-object p6, p0, Lcom/google/gson/Gson;->aWS:Lcom/google/gson/internal/c;
 
     invoke-direct {p4, p6, p5}, Lcom/google/gson/internal/a/g;-><init>(Lcom/google/gson/internal/c;Z)V
 
@@ -440,25 +440,25 @@
 
     new-instance p4, Lcom/google/gson/internal/a/d;
 
-    iget-object p5, p0, Lcom/google/gson/Gson;->aWA:Lcom/google/gson/internal/c;
+    iget-object p5, p0, Lcom/google/gson/Gson;->aWS:Lcom/google/gson/internal/c;
 
     invoke-direct {p4, p5}, Lcom/google/gson/internal/a/d;-><init>(Lcom/google/gson/internal/c;)V
 
-    iput-object p4, p0, Lcom/google/gson/Gson;->aWF:Lcom/google/gson/internal/a/d;
+    iput-object p4, p0, Lcom/google/gson/Gson;->aWX:Lcom/google/gson/internal/a/d;
 
-    iget-object p4, p0, Lcom/google/gson/Gson;->aWF:Lcom/google/gson/internal/a/d;
+    iget-object p4, p0, Lcom/google/gson/Gson;->aWX:Lcom/google/gson/internal/a/d;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aZw:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aZO:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     new-instance p4, Lcom/google/gson/internal/a/i;
 
-    iget-object p5, p0, Lcom/google/gson/Gson;->aWA:Lcom/google/gson/internal/c;
+    iget-object p5, p0, Lcom/google/gson/Gson;->aWS:Lcom/google/gson/internal/c;
 
-    iget-object p6, p0, Lcom/google/gson/Gson;->aWF:Lcom/google/gson/internal/a/d;
+    iget-object p6, p0, Lcom/google/gson/Gson;->aWX:Lcom/google/gson/internal/a/d;
 
     invoke-direct {p4, p5, p2, p1, p6}, Lcom/google/gson/internal/a/i;-><init>(Lcom/google/gson/internal/c;Lcom/google/gson/e;Lcom/google/gson/internal/d;Lcom/google/gson/internal/a/d;)V
 
@@ -468,7 +468,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/gson/Gson;->aWz:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/gson/Gson;->aWR:Ljava/util/List;
 
     return-void
 .end method
@@ -1071,7 +1071,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/Gson;->aWz:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/Gson;->aWR:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -1079,12 +1079,12 @@
 
     if-nez v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/gson/Gson;->aWF:Lcom/google/gson/internal/a/d;
+    iget-object p1, p0, Lcom/google/gson/Gson;->aWX:Lcom/google/gson/internal/a/d;
 
     :cond_0
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lcom/google/gson/Gson;->aWz:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/Gson;->aWR:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -1159,11 +1159,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/Gson;->aWy:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/Gson;->aWQ:Ljava/util/Map;
 
     if-nez p1, :cond_0
 
-    sget-object v1, Lcom/google/gson/Gson;->aWw:Lcom/google/gson/reflect/TypeToken;
+    sget-object v1, Lcom/google/gson/Gson;->aWO:Lcom/google/gson/reflect/TypeToken;
 
     goto :goto_0
 
@@ -1182,7 +1182,7 @@
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/gson/Gson;->aWx:Ljava/lang/ThreadLocal;
+    iget-object v0, p0, Lcom/google/gson/Gson;->aWP:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
 
@@ -1198,7 +1198,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/gson/Gson;->aWx:Ljava/lang/ThreadLocal;
+    iget-object v1, p0, Lcom/google/gson/Gson;->aWP:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
@@ -1223,7 +1223,7 @@
 
     invoke-interface {v0, p1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v3, p0, Lcom/google/gson/Gson;->aWz:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/gson/Gson;->aWR:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -1248,13 +1248,13 @@
 
     if-eqz v4, :cond_4
 
-    iget-object v3, v2, Lcom/google/gson/Gson$a;->aWI:Lcom/google/gson/TypeAdapter;
+    iget-object v3, v2, Lcom/google/gson/Gson$a;->aXa:Lcom/google/gson/TypeAdapter;
 
     if-nez v3, :cond_6
 
-    iput-object v4, v2, Lcom/google/gson/Gson$a;->aWI:Lcom/google/gson/TypeAdapter;
+    iput-object v4, v2, Lcom/google/gson/Gson$a;->aXa:Lcom/google/gson/TypeAdapter;
 
-    iget-object v2, p0, Lcom/google/gson/Gson;->aWy:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/gson/Gson;->aWQ:Ljava/util/Map;
 
     invoke-interface {v2, p1, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
@@ -1264,7 +1264,7 @@
 
     if-eqz v1, :cond_5
 
-    iget-object p1, p0, Lcom/google/gson/Gson;->aWx:Ljava/lang/ThreadLocal;
+    iget-object p1, p0, Lcom/google/gson/Gson;->aWP:Ljava/lang/ThreadLocal;
 
     invoke-virtual {p1}, Ljava/lang/ThreadLocal;->remove()V
 
@@ -1305,7 +1305,7 @@
 
     if-eqz v1, :cond_8
 
-    iget-object p1, p0, Lcom/google/gson/Gson;->aWx:Ljava/lang/ThreadLocal;
+    iget-object p1, p0, Lcom/google/gson/Gson;->aWP:Ljava/lang/ThreadLocal;
 
     invoke-virtual {p1}, Ljava/lang/ThreadLocal;->remove()V
 
@@ -1341,7 +1341,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/gson/Gson;->aWD:Z
+    iget-boolean v0, p0, Lcom/google/gson/Gson;->aWV:Z
 
     if-eqz v0, :cond_0
 
@@ -1354,7 +1354,7 @@
 
     invoke-direct {v0, p1}, Lcom/google/gson/stream/JsonWriter;-><init>(Ljava/io/Writer;)V
 
-    iget-boolean p1, p0, Lcom/google/gson/Gson;->aWE:Z
+    iget-boolean p1, p0, Lcom/google/gson/Gson;->aWW:Z
 
     if-eqz p1, :cond_1
 
@@ -1484,7 +1484,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/google/gson/k;->aWU:Lcom/google/gson/k;
+    sget-object p1, Lcom/google/gson/k;->aXm:Lcom/google/gson/k;
 
     invoke-direct {p0, p1}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;)Ljava/lang/String;
 
@@ -1521,7 +1521,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/gson/Gson;->aWz:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/Gson;->aWR:Ljava/util/List;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1529,7 +1529,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/gson/Gson;->aWA:Lcom/google/gson/internal/c;
+    iget-object v1, p0, Lcom/google/gson/Gson;->aWS:Lcom/google/gson/internal/c;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/google/gson/JsonElement.smali b/com.discord/smali_classes2/com/google/gson/JsonElement.smali
index 52c220c378..acea25b7ff 100644
--- a/com.discord/smali_classes2/com/google/gson/JsonElement.smali
+++ b/com.discord/smali_classes2/com/google/gson/JsonElement.smali
@@ -14,7 +14,7 @@
 
 
 # virtual methods
-.method public BL()Ljava/lang/Number;
+.method public BA()Ljava/lang/Number;
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -32,7 +32,7 @@
     throw v0
 .end method
 
-.method public BM()Ljava/lang/String;
+.method public BB()Ljava/lang/String;
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -50,7 +50,7 @@
     throw v0
 .end method
 
-.method public final BO()Lcom/google/gson/m;
+.method public final BD()Lcom/google/gson/m;
     .locals 3
 
     instance-of v0, p0, Lcom/google/gson/m;
diff --git a/com.discord/smali_classes2/com/google/gson/JsonObject.smali b/com.discord/smali_classes2/com/google/gson/JsonObject.smali
index cdf935955e..9e431c5e28 100644
--- a/com.discord/smali_classes2/com/google/gson/JsonObject.smali
+++ b/com.discord/smali_classes2/com/google/gson/JsonObject.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final aWV:Lcom/google/gson/internal/LinkedTreeMap;
+.field public final aXn:Lcom/google/gson/internal/LinkedTreeMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/internal/LinkedTreeMap<",
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/internal/LinkedTreeMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/gson/JsonObject;->aWV:Lcom/google/gson/internal/LinkedTreeMap;
+    iput-object v0, p0, Lcom/google/gson/JsonObject;->aXn:Lcom/google/gson/internal/LinkedTreeMap;
 
     return-void
 .end method
@@ -36,7 +36,7 @@
 
     if-nez p0, :cond_0
 
-    sget-object p0, Lcom/google/gson/k;->aWU:Lcom/google/gson/k;
+    sget-object p0, Lcom/google/gson/k;->aXm:Lcom/google/gson/k;
 
     return-object p0
 
@@ -55,10 +55,10 @@
 
     if-nez p2, :cond_0
 
-    sget-object p2, Lcom/google/gson/k;->aWU:Lcom/google/gson/k;
+    sget-object p2, Lcom/google/gson/k;->aXm:Lcom/google/gson/k;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/JsonObject;->aWV:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/JsonObject;->aXn:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/gson/internal/LinkedTreeMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -88,9 +88,9 @@
 
     check-cast p1, Lcom/google/gson/JsonObject;
 
-    iget-object p1, p1, Lcom/google/gson/JsonObject;->aWV:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p1, Lcom/google/gson/JsonObject;->aXn:Lcom/google/gson/internal/LinkedTreeMap;
 
-    iget-object v0, p0, Lcom/google/gson/JsonObject;->aWV:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/JsonObject;->aXn:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-virtual {p1, v0}, Lcom/google/gson/internal/LinkedTreeMap;->equals(Ljava/lang/Object;)Z
 
@@ -115,7 +115,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/gson/JsonObject;->aWV:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/JsonObject;->aXn:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-virtual {v0}, Lcom/google/gson/internal/LinkedTreeMap;->hashCode()I
 
diff --git a/com.discord/smali_classes2/com/google/gson/TypeAdapter$1.smali b/com.discord/smali_classes2/com/google/gson/TypeAdapter$1.smali
index a9f324b1d8..ec26e3f165 100644
--- a/com.discord/smali_classes2/com/google/gson/TypeAdapter$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/TypeAdapter$1.smali
@@ -22,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic aXa:Lcom/google/gson/TypeAdapter;
+.field final synthetic aXs:Lcom/google/gson/TypeAdapter;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/TypeAdapter;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/TypeAdapter$1;->aXa:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/TypeAdapter$1;->aXs:Lcom/google/gson/TypeAdapter;
 
     invoke-direct {p0}, Lcom/google/gson/TypeAdapter;-><init>()V
 
@@ -69,7 +69,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/TypeAdapter$1;->aXa:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/TypeAdapter$1;->aXs:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
@@ -101,7 +101,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/TypeAdapter$1;->aXa:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/TypeAdapter$1;->aXs:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/gson/TypeAdapter;->write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/google/gson/TypeAdapter.smali b/com.discord/smali_classes2/com/google/gson/TypeAdapter.smali
index c77c5443f4..18ad839e29 100644
--- a/com.discord/smali_classes2/com/google/gson/TypeAdapter.smali
+++ b/com.discord/smali_classes2/com/google/gson/TypeAdapter.smali
@@ -220,7 +220,7 @@
 
     invoke-virtual {p0, v0, p1}, Lcom/google/gson/TypeAdapter;->write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V
 
-    iget-object p1, v0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iget-object p1, v0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
@@ -228,7 +228,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, v0, Lcom/google/gson/internal/a/f;->aXX:Lcom/google/gson/JsonElement;
+    iget-object p1, v0, Lcom/google/gson/internal/a/f;->aYp:Lcom/google/gson/JsonElement;
 
     return-object p1
 
@@ -241,7 +241,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/google/gson/a.smali b/com.discord/smali_classes2/com/google/gson/a.smali
index 77a64f7ceb..636e75a079 100644
--- a/com.discord/smali_classes2/com/google/gson/a.smali
+++ b/com.discord/smali_classes2/com/google/gson/a.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private final aWn:Ljava/lang/Class;
+.field private final aWF:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,9 +25,9 @@
     .end annotation
 .end field
 
-.field private final aWo:Ljava/text/DateFormat;
+.field private final aWG:Ljava/text/DateFormat;
 
-.field private final aWp:Ljava/text/DateFormat;
+.field private final aWH:Ljava/text/DateFormat;
 
 
 # direct methods
@@ -163,24 +163,24 @@
 
     :cond_1
     :goto_0
-    iput-object p1, p0, Lcom/google/gson/a;->aWn:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/a;->aWF:Ljava/lang/Class;
 
-    iput-object p2, p0, Lcom/google/gson/a;->aWo:Ljava/text/DateFormat;
+    iput-object p2, p0, Lcom/google/gson/a;->aWG:Ljava/text/DateFormat;
 
-    iput-object p3, p0, Lcom/google/gson/a;->aWp:Ljava/text/DateFormat;
+    iput-object p3, p0, Lcom/google/gson/a;->aWH:Ljava/text/DateFormat;
 
     return-void
 .end method
 
-.method private dC(Ljava/lang/String;)Ljava/util/Date;
+.method private dw(Ljava/lang/String;)Ljava/util/Date;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/gson/a;->aWp:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/a;->aWH:Ljava/text/DateFormat;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/gson/a;->aWp:Ljava/text/DateFormat;
+    iget-object v1, p0, Lcom/google/gson/a;->aWH:Ljava/text/DateFormat;
 
     invoke-virtual {v1, p1}, Ljava/text/DateFormat;->parse(Ljava/lang/String;)Ljava/util/Date;
 
@@ -203,7 +203,7 @@
 
     :catch_0
     :try_start_2
-    iget-object v1, p0, Lcom/google/gson/a;->aWo:Ljava/text/DateFormat;
+    iget-object v1, p0, Lcom/google/gson/a;->aWG:Ljava/text/DateFormat;
 
     invoke-virtual {v1, p1}, Ljava/text/DateFormat;->parse(Ljava/lang/String;)Ljava/util/Date;
 
@@ -285,11 +285,11 @@
 
     move-result-object p1
 
-    invoke-direct {p0, p1}, Lcom/google/gson/a;->dC(Ljava/lang/String;)Ljava/util/Date;
+    invoke-direct {p0, p1}, Lcom/google/gson/a;->dw(Ljava/lang/String;)Ljava/util/Date;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/gson/a;->aWn:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/gson/a;->aWF:Ljava/lang/Class;
 
     const-class v1, Ljava/util/Date;
 
@@ -350,7 +350,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/gson/a;->aWp:Ljava/text/DateFormat;
+    iget-object v1, p0, Lcom/google/gson/a;->aWH:Ljava/text/DateFormat;
 
     invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -390,12 +390,12 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/a;->aWp:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/a;->aWH:Ljava/text/DateFormat;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/gson/a;->aWo:Ljava/text/DateFormat;
+    iget-object v1, p0, Lcom/google/gson/a;->aWG:Ljava/text/DateFormat;
 
     invoke-virtual {v1, p2}, Ljava/text/DateFormat;->format(Ljava/util/Date;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/gson/b.smali b/com.discord/smali_classes2/com/google/gson/b.smali
index 88ff8dd362..53959018df 100644
--- a/com.discord/smali_classes2/com/google/gson/b.smali
+++ b/com.discord/smali_classes2/com/google/gson/b.smali
@@ -4,10 +4,10 @@
 
 
 # virtual methods
-.method public abstract BH()Z
+.method public abstract Bw()Z
 .end method
 
-.method public abstract BI()Z
+.method public abstract Bx()Z
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()Z"
diff --git a/com.discord/smali_classes2/com/google/gson/d$2.smali b/com.discord/smali_classes2/com/google/gson/d$2.smali
index 28e0c93898..e17dd065a3 100644
--- a/com.discord/smali_classes2/com/google/gson/d$2.smali
+++ b/com.discord/smali_classes2/com/google/gson/d$2.smali
@@ -36,7 +36,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lcom/google/gson/d$2;->dD(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/gson/d$2;->dx(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/gson/d$3.smali b/com.discord/smali_classes2/com/google/gson/d$3.smali
index d046c02581..c066176f7e 100644
--- a/com.discord/smali_classes2/com/google/gson/d$3.smali
+++ b/com.discord/smali_classes2/com/google/gson/d$3.smali
@@ -42,7 +42,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lcom/google/gson/d$3;->dD(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lcom/google/gson/d$3;->dx(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/gson/d.smali b/com.discord/smali_classes2/com/google/gson/d.smali
index a124094afc..9d1b62eedc 100644
--- a/com.discord/smali_classes2/com/google/gson/d.smali
+++ b/com.discord/smali_classes2/com/google/gson/d.smali
@@ -18,17 +18,17 @@
 
 
 # static fields
-.field public static final enum aWq:Lcom/google/gson/d;
+.field public static final enum aWI:Lcom/google/gson/d;
 
-.field public static final enum aWr:Lcom/google/gson/d;
+.field public static final enum aWJ:Lcom/google/gson/d;
 
-.field public static final enum aWs:Lcom/google/gson/d;
+.field public static final enum aWK:Lcom/google/gson/d;
 
-.field public static final enum aWt:Lcom/google/gson/d;
+.field public static final enum aWL:Lcom/google/gson/d;
 
-.field public static final enum aWu:Lcom/google/gson/d;
+.field public static final enum aWM:Lcom/google/gson/d;
 
-.field private static final synthetic aWv:[Lcom/google/gson/d;
+.field private static final synthetic aWN:[Lcom/google/gson/d;
 
 
 # direct methods
@@ -41,7 +41,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/gson/d$1;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/gson/d;->aWq:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aWI:Lcom/google/gson/d;
 
     new-instance v0, Lcom/google/gson/d$2;
 
@@ -49,7 +49,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/gson/d$2;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/gson/d;->aWr:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aWJ:Lcom/google/gson/d;
 
     new-instance v0, Lcom/google/gson/d$3;
 
@@ -57,7 +57,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/gson/d$3;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/gson/d;->aWs:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aWK:Lcom/google/gson/d;
 
     new-instance v0, Lcom/google/gson/d$4;
 
@@ -65,7 +65,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/gson/d$4;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/gson/d;->aWt:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aWL:Lcom/google/gson/d;
 
     new-instance v0, Lcom/google/gson/d$5;
 
@@ -73,43 +73,43 @@
 
     invoke-direct {v0, v1}, Lcom/google/gson/d$5;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/gson/d;->aWu:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aWM:Lcom/google/gson/d;
 
     const/4 v0, 0x5
 
     new-array v0, v0, [Lcom/google/gson/d;
 
-    sget-object v1, Lcom/google/gson/d;->aWq:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aWI:Lcom/google/gson/d;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/d;->aWr:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aWJ:Lcom/google/gson/d;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/d;->aWs:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aWK:Lcom/google/gson/d;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/d;->aWt:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aWL:Lcom/google/gson/d;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/d;->aWu:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aWM:Lcom/google/gson/d;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/gson/d;->aWv:[Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aWN:[Lcom/google/gson/d;
 
     return-void
 .end method
@@ -184,7 +184,7 @@
     return-object p0
 .end method
 
-.method static dD(Ljava/lang/String;)Ljava/lang/String;
+.method static dx(Ljava/lang/String;)Ljava/lang/String;
     .locals 5
 
     new-instance v0, Ljava/lang/StringBuilder;
@@ -292,7 +292,7 @@
 .method public static values()[Lcom/google/gson/d;
     .locals 1
 
-    sget-object v0, Lcom/google/gson/d;->aWv:[Lcom/google/gson/d;
+    sget-object v0, Lcom/google/gson/d;->aWN:[Lcom/google/gson/d;
 
     invoke-virtual {v0}, [Lcom/google/gson/d;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/gson/f.smali b/com.discord/smali_classes2/com/google/gson/f.smali
index de4f16ef0d..cf3d99849a 100644
--- a/com.discord/smali_classes2/com/google/gson/f.smali
+++ b/com.discord/smali_classes2/com/google/gson/f.smali
@@ -4,17 +4,27 @@
 
 
 # instance fields
-.field private aWB:Lcom/google/gson/internal/d;
+.field public final aWR:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/google/gson/r;",
+            ">;"
+        }
+    .end annotation
+.end field
 
-.field private aWD:Z
+.field private aWT:Lcom/google/gson/internal/d;
 
-.field private aWE:Z
+.field private aWV:Z
 
-.field private aWJ:Lcom/google/gson/q;
+.field private aWW:Z
 
-.field public aWK:Lcom/google/gson/e;
+.field private aXb:Lcom/google/gson/q;
 
-.field private final aWL:Ljava/util/Map;
+.field public aXc:Lcom/google/gson/e;
+
+.field private final aXd:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -25,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final aWM:Ljava/util/List;
+.field private final aXe:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -35,27 +45,17 @@
     .end annotation
 .end field
 
-.field private aWN:Ljava/lang/String;
+.field private aXf:Ljava/lang/String;
 
-.field private aWO:I
+.field private aXg:I
 
-.field private aWP:I
+.field private aXh:I
 
-.field private aWQ:Z
+.field private aXi:Z
 
-.field private aWR:Z
+.field private aXj:Z
 
-.field private aWS:Z
-
-.field public final aWz:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lcom/google/gson/r;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private aXk:Z
 
 .field private lenient:Z
 
@@ -68,35 +68,35 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lcom/google/gson/internal/d;->aXi:Lcom/google/gson/internal/d;
+    sget-object v0, Lcom/google/gson/internal/d;->aXA:Lcom/google/gson/internal/d;
 
-    iput-object v0, p0, Lcom/google/gson/f;->aWB:Lcom/google/gson/internal/d;
+    iput-object v0, p0, Lcom/google/gson/f;->aWT:Lcom/google/gson/internal/d;
 
-    sget-object v0, Lcom/google/gson/q;->aWX:Lcom/google/gson/q;
+    sget-object v0, Lcom/google/gson/q;->aXp:Lcom/google/gson/q;
 
-    iput-object v0, p0, Lcom/google/gson/f;->aWJ:Lcom/google/gson/q;
+    iput-object v0, p0, Lcom/google/gson/f;->aXb:Lcom/google/gson/q;
 
-    sget-object v0, Lcom/google/gson/d;->aWq:Lcom/google/gson/d;
+    sget-object v0, Lcom/google/gson/d;->aWI:Lcom/google/gson/d;
 
-    iput-object v0, p0, Lcom/google/gson/f;->aWK:Lcom/google/gson/e;
+    iput-object v0, p0, Lcom/google/gson/f;->aXc:Lcom/google/gson/e;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/gson/f;->aWL:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/gson/f;->aXd:Ljava/util/Map;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/gson/f;->aWz:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/f;->aWR:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/gson/f;->aWM:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/f;->aXe:Ljava/util/List;
 
     const/4 v0, 0x0
 
@@ -104,21 +104,21 @@
 
     const/4 v1, 0x2
 
-    iput v1, p0, Lcom/google/gson/f;->aWO:I
+    iput v1, p0, Lcom/google/gson/f;->aXg:I
 
-    iput v1, p0, Lcom/google/gson/f;->aWP:I
+    iput v1, p0, Lcom/google/gson/f;->aXh:I
 
-    iput-boolean v0, p0, Lcom/google/gson/f;->aWQ:Z
+    iput-boolean v0, p0, Lcom/google/gson/f;->aXi:Z
 
-    iput-boolean v0, p0, Lcom/google/gson/f;->aWR:Z
+    iput-boolean v0, p0, Lcom/google/gson/f;->aXj:Z
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/gson/f;->aWS:Z
+    iput-boolean v1, p0, Lcom/google/gson/f;->aXk:Z
 
-    iput-boolean v0, p0, Lcom/google/gson/f;->aWE:Z
+    iput-boolean v0, p0, Lcom/google/gson/f;->aWW:Z
 
-    iput-boolean v0, p0, Lcom/google/gson/f;->aWD:Z
+    iput-boolean v0, p0, Lcom/google/gson/f;->aWV:Z
 
     iput-boolean v0, p0, Lcom/google/gson/f;->lenient:Z
 
@@ -234,18 +234,18 @@
 
 
 # virtual methods
-.method public final BJ()Lcom/google/gson/Gson;
+.method public final By()Lcom/google/gson/Gson;
     .locals 14
 
     new-instance v12, Ljava/util/ArrayList;
 
-    iget-object v0, p0, Lcom/google/gson/f;->aWz:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/f;->aWR:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/gson/f;->aWM:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/f;->aXe:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -257,7 +257,7 @@
 
     invoke-direct {v12, v0}, Ljava/util/ArrayList;-><init>(I)V
 
-    iget-object v0, p0, Lcom/google/gson/f;->aWz:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/f;->aWR:Ljava/util/List;
 
     invoke-interface {v12, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
@@ -265,7 +265,7 @@
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lcom/google/gson/f;->aWM:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/f;->aXe:Ljava/util/List;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
@@ -273,37 +273,37 @@
 
     invoke-interface {v12, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p0, Lcom/google/gson/f;->aWN:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/f;->aXf:Ljava/lang/String;
 
-    iget v1, p0, Lcom/google/gson/f;->aWO:I
+    iget v1, p0, Lcom/google/gson/f;->aXg:I
 
-    iget v2, p0, Lcom/google/gson/f;->aWP:I
+    iget v2, p0, Lcom/google/gson/f;->aXh:I
 
     invoke-static {v0, v1, v2, v12}, Lcom/google/gson/f;->a(Ljava/lang/String;IILjava/util/List;)V
 
     new-instance v13, Lcom/google/gson/Gson;
 
-    iget-object v1, p0, Lcom/google/gson/f;->aWB:Lcom/google/gson/internal/d;
+    iget-object v1, p0, Lcom/google/gson/f;->aWT:Lcom/google/gson/internal/d;
 
-    iget-object v2, p0, Lcom/google/gson/f;->aWK:Lcom/google/gson/e;
+    iget-object v2, p0, Lcom/google/gson/f;->aXc:Lcom/google/gson/e;
 
-    iget-object v3, p0, Lcom/google/gson/f;->aWL:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/gson/f;->aXd:Ljava/util/Map;
 
     iget-boolean v4, p0, Lcom/google/gson/f;->serializeNulls:Z
 
-    iget-boolean v5, p0, Lcom/google/gson/f;->aWQ:Z
+    iget-boolean v5, p0, Lcom/google/gson/f;->aXi:Z
 
-    iget-boolean v6, p0, Lcom/google/gson/f;->aWD:Z
+    iget-boolean v6, p0, Lcom/google/gson/f;->aWV:Z
 
-    iget-boolean v7, p0, Lcom/google/gson/f;->aWS:Z
+    iget-boolean v7, p0, Lcom/google/gson/f;->aXk:Z
 
-    iget-boolean v8, p0, Lcom/google/gson/f;->aWE:Z
+    iget-boolean v8, p0, Lcom/google/gson/f;->aWW:Z
 
     iget-boolean v9, p0, Lcom/google/gson/f;->lenient:Z
 
-    iget-boolean v10, p0, Lcom/google/gson/f;->aWR:Z
+    iget-boolean v10, p0, Lcom/google/gson/f;->aXj:Z
 
-    iget-object v11, p0, Lcom/google/gson/f;->aWJ:Lcom/google/gson/q;
+    iget-object v11, p0, Lcom/google/gson/f;->aXb:Lcom/google/gson/q;
 
     move-object v0, v13
 
diff --git a/com.discord/smali_classes2/com/google/gson/g.smali b/com.discord/smali_classes2/com/google/gson/g.smali
index 8558cd19e9..3e86e90f5f 100644
--- a/com.discord/smali_classes2/com/google/gson/g.smali
+++ b/com.discord/smali_classes2/com/google/gson/g.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract BK()Ljava/lang/Object;
+.method public abstract Bz()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali_classes2/com/google/gson/h.smali b/com.discord/smali_classes2/com/google/gson/h.smali
index 4fb8a2d992..78f458844d 100644
--- a/com.discord/smali_classes2/com/google/gson/h.smali
+++ b/com.discord/smali_classes2/com/google/gson/h.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final aWT:Ljava/util/List;
+.field private final aXl:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -39,17 +39,17 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final BL()Ljava/lang/Number;
+.method public final BA()Ljava/lang/Number;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -59,7 +59,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -69,7 +69,7 @@
 
     check-cast v0, Lcom/google/gson/JsonElement;
 
-    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->BL()Ljava/lang/Number;
+    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->BA()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -83,10 +83,10 @@
     throw v0
 .end method
 
-.method public final BM()Ljava/lang/String;
+.method public final BB()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -96,7 +96,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -106,7 +106,7 @@
 
     check-cast v0, Lcom/google/gson/JsonElement;
 
-    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->BM()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->BB()Ljava/lang/String;
 
     move-result-object v0
 
@@ -125,10 +125,10 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/google/gson/k;->aWU:Lcom/google/gson/k;
+    sget-object p1, Lcom/google/gson/k;->aXm:Lcom/google/gson/k;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -146,9 +146,9 @@
 
     check-cast p1, Lcom/google/gson/h;
 
-    iget-object p1, p1, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object p1, p1, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     invoke-interface {p1, v0}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
@@ -173,7 +173,7 @@
 .method public final getAsBoolean()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -183,7 +183,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -210,7 +210,7 @@
 .method public final getAsDouble()D
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -220,7 +220,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -247,7 +247,7 @@
 .method public final getAsInt()I
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -257,7 +257,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -284,7 +284,7 @@
 .method public final getAsLong()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -294,7 +294,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -321,7 +321,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->hashCode()I
 
@@ -341,7 +341,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/h;->aWT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aXl:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/com/google/gson/i.smali b/com.discord/smali_classes2/com/google/gson/i.smali
index 3a7cdf1ec0..c84aaaef6d 100644
--- a/com.discord/smali_classes2/com/google/gson/i.smali
+++ b/com.discord/smali_classes2/com/google/gson/i.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract BN()Ljava/lang/Object;
+.method public abstract BC()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$a$1.smali b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$a$1.smali
index 3d3444d26d..b71e933200 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$a$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$a$1.smali
@@ -24,16 +24,16 @@
 
 
 # instance fields
-.field final synthetic aXv:Lcom/google/gson/internal/LinkedTreeMap$a;
+.field final synthetic aXN:Lcom/google/gson/internal/LinkedTreeMap$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/LinkedTreeMap$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$a$1;->aXv:Lcom/google/gson/internal/LinkedTreeMap$a;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$a$1;->aXN:Lcom/google/gson/internal/LinkedTreeMap$a;
 
-    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$a;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$a;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-direct {p0, p1}, Lcom/google/gson/internal/LinkedTreeMap$c;-><init>(Lcom/google/gson/internal/LinkedTreeMap;)V
 
@@ -45,7 +45,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/gson/internal/LinkedTreeMap$a$1;->BX()Lcom/google/gson/internal/LinkedTreeMap$d;
+    invoke-virtual {p0}, Lcom/google/gson/internal/LinkedTreeMap$a$1;->BM()Lcom/google/gson/internal/LinkedTreeMap$d;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$a.smali b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$a.smali
index fe976890d9..f507174580 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$a.smali
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic aXu:Lcom/google/gson/internal/LinkedTreeMap;
+.field final synthetic aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/LinkedTreeMap;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-direct {p0}, Ljava/util/AbstractSet;-><init>()V
 
@@ -42,7 +42,7 @@
 .method public final clear()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-virtual {v0}, Lcom/google/gson/internal/LinkedTreeMap;->clear()V
 
@@ -56,7 +56,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     check-cast p1, Ljava/util/Map$Entry;
 
@@ -106,7 +106,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     check-cast p1, Ljava/util/Map$Entry;
 
@@ -119,7 +119,7 @@
     return v1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     const/4 v1, 0x1
 
@@ -131,7 +131,7 @@
 .method public final size()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget v0, v0, Lcom/google/gson/internal/LinkedTreeMap;->size:I
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$b$1.smali b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$b$1.smali
index a4b9018647..bd79a8bc9c 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$b$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$b$1.smali
@@ -22,16 +22,16 @@
 
 
 # instance fields
-.field final synthetic aXw:Lcom/google/gson/internal/LinkedTreeMap$b;
+.field final synthetic aXO:Lcom/google/gson/internal/LinkedTreeMap$b;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/LinkedTreeMap$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$b$1;->aXw:Lcom/google/gson/internal/LinkedTreeMap$b;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$b$1;->aXO:Lcom/google/gson/internal/LinkedTreeMap$b;
 
-    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$b;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$b;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-direct {p0, p1}, Lcom/google/gson/internal/LinkedTreeMap$c;-><init>(Lcom/google/gson/internal/LinkedTreeMap;)V
 
@@ -48,7 +48,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/gson/internal/LinkedTreeMap$b$1;->BX()Lcom/google/gson/internal/LinkedTreeMap$d;
+    invoke-virtual {p0}, Lcom/google/gson/internal/LinkedTreeMap$b$1;->BM()Lcom/google/gson/internal/LinkedTreeMap$d;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$b.smali b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$b.smali
index 984ea5b7c6..34340db18e 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$b.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$b.smali
@@ -22,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic aXu:Lcom/google/gson/internal/LinkedTreeMap;
+.field final synthetic aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/LinkedTreeMap;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-direct {p0}, Ljava/util/AbstractSet;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final clear()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-virtual {v0}, Lcom/google/gson/internal/LinkedTreeMap;->clear()V
 
@@ -51,7 +51,7 @@
 .method public final contains(Ljava/lang/Object;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-virtual {v0, p1}, Lcom/google/gson/internal/LinkedTreeMap;->containsKey(Ljava/lang/Object;)Z
 
@@ -80,7 +80,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-virtual {v0, p1}, Lcom/google/gson/internal/LinkedTreeMap;->aO(Ljava/lang/Object;)Lcom/google/gson/internal/LinkedTreeMap$d;
 
@@ -101,7 +101,7 @@
 .method public final size()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget v0, v0, Lcom/google/gson/internal/LinkedTreeMap;->size:I
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$c.smali b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$c.smali
index 77f558209b..e9bea7cec4 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$c.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$c.smali
@@ -29,9 +29,9 @@
 
 
 # instance fields
-.field final synthetic aXu:Lcom/google/gson/internal/LinkedTreeMap;
+.field final synthetic aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
-.field aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/internal/LinkedTreeMap$d<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field aXy:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aXQ:Lcom/google/gson/internal/LinkedTreeMap$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/internal/LinkedTreeMap$d<",
@@ -49,41 +49,41 @@
     .end annotation
 .end field
 
-.field aXz:I
+.field aXR:I
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/LinkedTreeMap;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap;->header:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXy:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXQ:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget p1, p1, Lcom/google/gson/internal/LinkedTreeMap;->modCount:I
 
-    iput p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXz:I
+    iput p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXR:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method final BX()Lcom/google/gson/internal/LinkedTreeMap$d;
+.method final BM()Lcom/google/gson/internal/LinkedTreeMap$d;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -93,27 +93,27 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget-object v1, v1, Lcom/google/gson/internal/LinkedTreeMap;->header:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eq v0, v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget v1, v1, Lcom/google/gson/internal/LinkedTreeMap;->modCount:I
 
-    iget v2, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXz:I
+    iget v2, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXR:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXy:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXQ:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     return-object v0
 
@@ -135,9 +135,9 @@
 .method public final hasNext()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget-object v1, v1, Lcom/google/gson/internal/LinkedTreeMap;->header:Lcom/google/gson/internal/LinkedTreeMap$d;
 
@@ -156,11 +156,11 @@
 .method public final remove()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXy:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXQ:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     const/4 v2, 0x1
 
@@ -168,13 +168,13 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXy:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXQ:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXM:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget v0, v0, Lcom/google/gson/internal/LinkedTreeMap;->modCount:I
 
-    iput v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXz:I
+    iput v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aXR:I
 
     return-void
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$d.smali b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$d.smali
index ab2addde10..40a5fa60bd 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$d.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap$d.smali
@@ -31,7 +31,7 @@
 
 
 # instance fields
-.field aXA:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/internal/LinkedTreeMap$d<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aXS:Lcom/google/gson/internal/LinkedTreeMap$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/internal/LinkedTreeMap$d<",
@@ -49,7 +49,7 @@
     .end annotation
 .end field
 
-.field aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/internal/LinkedTreeMap$d<",
@@ -58,7 +58,7 @@
     .end annotation
 .end field
 
-.field aXD:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/internal/LinkedTreeMap$d<",
@@ -67,7 +67,7 @@
     .end annotation
 .end field
 
-.field aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aXV:Lcom/google/gson/internal/LinkedTreeMap$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/internal/LinkedTreeMap$d<",
@@ -105,9 +105,9 @@
 
     iput-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->key:Ljava/lang/Object;
 
-    iput-object p0, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXD:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p0, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p0, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p0, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     return-void
 .end method
@@ -128,7 +128,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXA:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     iput-object p2, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->key:Ljava/lang/Object;
 
@@ -136,13 +136,13 @@
 
     iput p1, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->height:I
 
-    iput-object p3, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p3, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p4, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXD:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p4, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p0, p4, Lcom/google/gson/internal/LinkedTreeMap$d;->aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p0, p4, Lcom/google/gson/internal/LinkedTreeMap$d;->aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p0, p3, Lcom/google/gson/internal/LinkedTreeMap$d;->aXD:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p0, p3, Lcom/google/gson/internal/LinkedTreeMap$d;->aXV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap.smali b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap.smali
index 05f2f8fd4d..75d383b88b 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/LinkedTreeMap.smali
@@ -33,7 +33,7 @@
 # static fields
 .field static final synthetic $assertionsDisabled:Z
 
-.field private static final aXt:Ljava/util/Comparator;
+.field private static final aXL:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -103,7 +103,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/internal/LinkedTreeMap$1;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/LinkedTreeMap;->aXt:Ljava/util/Comparator;
+    sput-object v0, Lcom/google/gson/internal/LinkedTreeMap;->aXL:Ljava/util/Comparator;
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 .method public constructor <init>()V
     .locals 1
 
-    sget-object v0, Lcom/google/gson/internal/LinkedTreeMap;->aXt:Ljava/util/Comparator;
+    sget-object v0, Lcom/google/gson/internal/LinkedTreeMap;->aXL:Ljava/util/Comparator;
 
     invoke-direct {p0, v0}, Lcom/google/gson/internal/LinkedTreeMap;-><init>(Ljava/util/Comparator;)V
 
@@ -147,7 +147,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lcom/google/gson/internal/LinkedTreeMap;->aXt:Ljava/util/Comparator;
+    sget-object p1, Lcom/google/gson/internal/LinkedTreeMap;->aXL:Ljava/util/Comparator;
 
     :goto_0
     iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap;->comparator:Ljava/util/Comparator;
@@ -165,26 +165,26 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v2, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v2, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz v2, :cond_0
 
-    iput-object p1, v2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXA:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, v2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     :cond_0
     invoke-direct {p0, p1, v1}, Lcom/google/gson/internal/LinkedTreeMap;->a(Lcom/google/gson/internal/LinkedTreeMap$d;Lcom/google/gson/internal/LinkedTreeMap$d;)V
 
-    iput-object p1, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXA:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     const/4 v4, 0x0
 
@@ -246,29 +246,29 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXA:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     const/4 v1, 0x0
 
-    iput-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXA:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz p2, :cond_0
 
-    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXA:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     :cond_0
     if-eqz v0, :cond_2
 
-    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-ne v1, p1, :cond_1
 
-    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     return-void
 
     :cond_1
-    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     return-void
 
@@ -320,26 +320,26 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz v3, :cond_0
 
-    iput-object p1, v3, Lcom/google/gson/internal/LinkedTreeMap$d;->aXA:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, v3, Lcom/google/gson/internal/LinkedTreeMap$d;->aXS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     :cond_0
     invoke-direct {p0, p1, v0}, Lcom/google/gson/internal/LinkedTreeMap;->a(Lcom/google/gson/internal/LinkedTreeMap$d;Lcom/google/gson/internal/LinkedTreeMap$d;)V
 
-    iput-object p1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXA:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     const/4 v4, 0x0
 
@@ -402,9 +402,9 @@
     :goto_0
     if-eqz p1, :cond_e
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     const/4 v2, 0x0
 
@@ -434,9 +434,9 @@
 
     if-ne v5, v6, :cond_6
 
-    iget-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz v3, :cond_2
 
@@ -488,9 +488,9 @@
 
     if-ne v5, v1, :cond_b
 
-    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz v3, :cond_7
 
@@ -557,7 +557,7 @@
 
     :cond_d
     :goto_9
-    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXA:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     goto :goto_0
 
@@ -583,7 +583,7 @@
 
     if-eqz v1, :cond_4
 
-    sget-object v3, Lcom/google/gson/internal/LinkedTreeMap;->aXt:Ljava/util/Comparator;
+    sget-object v3, Lcom/google/gson/internal/LinkedTreeMap;->aXL:Ljava/util/Comparator;
 
     if-ne v0, v3, :cond_0
 
@@ -622,12 +622,12 @@
     :cond_2
     if-gez v4, :cond_3
 
-    iget-object v5, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v5, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     goto :goto_2
 
     :cond_3
-    iget-object v5, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v5, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     :goto_2
     if-eqz v5, :cond_5
@@ -651,7 +651,7 @@
 
     if-nez v1, :cond_9
 
-    sget-object v3, Lcom/google/gson/internal/LinkedTreeMap;->aXt:Ljava/util/Comparator;
+    sget-object v3, Lcom/google/gson/internal/LinkedTreeMap;->aXL:Ljava/util/Comparator;
 
     if-ne v0, v3, :cond_8
 
@@ -694,7 +694,7 @@
     :goto_3
     new-instance v0, Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXD:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     invoke-direct {v0, v1, p1, p2, v3}, Lcom/google/gson/internal/LinkedTreeMap$d;-><init>(Lcom/google/gson/internal/LinkedTreeMap$d;Ljava/lang/Object;Lcom/google/gson/internal/LinkedTreeMap$d;Lcom/google/gson/internal/LinkedTreeMap$d;)V
 
@@ -705,18 +705,18 @@
     :cond_9
     new-instance v0, Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXD:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     invoke-direct {v0, v1, p1, p2, v3}, Lcom/google/gson/internal/LinkedTreeMap$d;-><init>(Lcom/google/gson/internal/LinkedTreeMap$d;Ljava/lang/Object;Lcom/google/gson/internal/LinkedTreeMap$d;Lcom/google/gson/internal/LinkedTreeMap$d;)V
 
     if-gez v4, :cond_a
 
-    iput-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     goto :goto_4
 
     :cond_a
-    iput-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     :goto_4
     invoke-direct {p0, v1, v2}, Lcom/google/gson/internal/LinkedTreeMap;->b(Lcom/google/gson/internal/LinkedTreeMap$d;Z)V
@@ -766,24 +766,24 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXD:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXD:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXD:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     :cond_0
-    iget-object p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXA:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     const/4 v2, 0x0
 
@@ -799,7 +799,7 @@
 
     if-le v1, v4, :cond_2
 
-    iget-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     :goto_0
     move-object v5, v0
@@ -810,7 +810,7 @@
 
     if-eqz p2, :cond_1
 
-    iget-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     goto :goto_0
 
@@ -820,7 +820,7 @@
     goto :goto_2
 
     :cond_2
-    iget-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     :goto_1
     move-object v5, v0
@@ -831,7 +831,7 @@
 
     if-eqz v0, :cond_3
 
-    iget-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     goto :goto_1
 
@@ -839,17 +839,17 @@
     :goto_2
     invoke-virtual {p0, p2, v2}, Lcom/google/gson/internal/LinkedTreeMap;->a(Lcom/google/gson/internal/LinkedTreeMap$d;Z)V
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz v0, :cond_4
 
     iget v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->height:I
 
-    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXA:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     goto :goto_3
 
@@ -857,17 +857,17 @@
     const/4 v1, 0x0
 
     :goto_3
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz v0, :cond_5
 
     iget v2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->height:I
 
-    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXA:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     :cond_5
     invoke-static {v1, v2}, Ljava/lang/Math;->max(II)I
@@ -887,7 +887,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/google/gson/internal/LinkedTreeMap;->a(Lcom/google/gson/internal/LinkedTreeMap$d;Lcom/google/gson/internal/LinkedTreeMap$d;)V
 
-    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXB:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     goto :goto_4
 
@@ -896,7 +896,7 @@
 
     invoke-direct {p0, p1, v0}, Lcom/google/gson/internal/LinkedTreeMap;->a(Lcom/google/gson/internal/LinkedTreeMap$d;Lcom/google/gson/internal/LinkedTreeMap$d;)V
 
-    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXC:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aXU:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     goto :goto_4
 
@@ -966,9 +966,9 @@
 
     iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap;->header:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXD:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXx:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aXP:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/a$1.smali b/com.discord/smali_classes2/com/google/gson/internal/a/a$1.smali
index c5b42f62df..18738976a6 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/a$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/a$1.smali
@@ -43,7 +43,7 @@
         }
     .end annotation
 
-    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
     instance-of v0, p2, Ljava/lang/reflect/GenericArrayType;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/a.smali b/com.discord/smali_classes2/com/google/gson/internal/a/a.smali
index abb4feb093..5079b96bb0 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/a.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/a.smali
@@ -17,11 +17,11 @@
 
 
 # static fields
-.field public static final aXM:Lcom/google/gson/r;
+.field public static final aYe:Lcom/google/gson/r;
 
 
 # instance fields
-.field private final aXN:Lcom/google/gson/TypeAdapter;
+.field private final aYf:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -48,7 +48,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/a$1;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/a;->aXM:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/a;->aYe:Lcom/google/gson/r;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     invoke-direct {v0, p1, p2, p3}, Lcom/google/gson/internal/a/m;-><init>(Lcom/google/gson/Gson;Lcom/google/gson/TypeAdapter;Ljava/lang/reflect/Type;)V
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/a;->aXN:Lcom/google/gson/TypeAdapter;
+    iput-object v0, p0, Lcom/google/gson/internal/a/a;->aYf:Lcom/google/gson/TypeAdapter;
 
     iput-object p3, p0, Lcom/google/gson/internal/a/a;->componentType:Ljava/lang/Class;
 
@@ -117,7 +117,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/a;->aXN:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/a;->aYf:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v1, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
@@ -189,7 +189,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/gson/internal/a/a;->aXN:Lcom/google/gson/TypeAdapter;
+    iget-object v3, p0, Lcom/google/gson/internal/a/a;->aYf:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v3, p1, v2}, Lcom/google/gson/TypeAdapter;->write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/a/a.smali b/com.discord/smali_classes2/com/google/gson/internal/a/a/a.smali
index 71377745c7..0db2e4057e 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/a/a.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/a/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final aZI:Ljava/util/TimeZone;
+.field private static final baa:Ljava/util/TimeZone;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/a/a;->aZI:Ljava/util/TimeZone;
+    sput-object v0, Lcom/google/gson/internal/a/a/a;->baa:Ljava/util/TimeZone;
 
     return-void
 .end method
@@ -473,7 +473,7 @@
 
     if-ne v14, v11, :cond_b
 
-    sget-object v10, Lcom/google/gson/internal/a/a/a;->aZI:Ljava/util/TimeZone;
+    sget-object v10, Lcom/google/gson/internal/a/a/a;->baa:Ljava/util/TimeZone;
 
     add-int/2addr v15, v9
 
@@ -641,7 +641,7 @@
 
     :cond_12
     :goto_7
-    sget-object v10, Lcom/google/gson/internal/a/a/a;->aZI:Ljava/util/TimeZone;
+    sget-object v10, Lcom/google/gson/internal/a/a/a;->baa:Ljava/util/TimeZone;
 
     :goto_8
     new-instance v9, Ljava/util/GregorianCalendar;
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/b$a.smali b/com.discord/smali_classes2/com/google/gson/internal/a/b$a.smali
index c6d3c5c628..c669d3fb5a 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/b$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/b$a.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field private final aXO:Lcom/google/gson/TypeAdapter;
+.field private final aYg:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final aXP:Lcom/google/gson/internal/g;
+.field private final aYh:Lcom/google/gson/internal/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/internal/g<",
@@ -70,9 +70,9 @@
 
     invoke-direct {v0, p1, p3, p2}, Lcom/google/gson/internal/a/m;-><init>(Lcom/google/gson/Gson;Lcom/google/gson/TypeAdapter;Ljava/lang/reflect/Type;)V
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/b$a;->aXO:Lcom/google/gson/TypeAdapter;
+    iput-object v0, p0, Lcom/google/gson/internal/a/b$a;->aYg:Lcom/google/gson/TypeAdapter;
 
-    iput-object p4, p0, Lcom/google/gson/internal/a/b$a;->aXP:Lcom/google/gson/internal/g;
+    iput-object p4, p0, Lcom/google/gson/internal/a/b$a;->aYh:Lcom/google/gson/internal/g;
 
     return-void
 .end method
@@ -102,9 +102,9 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/b$a;->aXP:Lcom/google/gson/internal/g;
+    iget-object v0, p0, Lcom/google/gson/internal/a/b$a;->aYh:Lcom/google/gson/internal/g;
 
-    invoke-interface {v0}, Lcom/google/gson/internal/g;->BU()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/internal/g;->BJ()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -119,7 +119,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/b$a;->aXO:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/b$a;->aYg:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v1, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
@@ -169,7 +169,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/b$a;->aXO:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/b$a;->aYg:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v1, p1, v0}, Lcom/google/gson/TypeAdapter;->write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/b.smali b/com.discord/smali_classes2/com/google/gson/internal/a/b.smali
index 2c9937d972..0f1d16c3f2 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/b.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final aWA:Lcom/google/gson/internal/c;
+.field private final aWS:Lcom/google/gson/internal/c;
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/b;->aWA:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/a/b;->aWS:Lcom/google/gson/internal/c;
 
     return-void
 .end method
@@ -46,9 +46,9 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
-    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     const-class v2, Ljava/util/Collection;
 
@@ -75,7 +75,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/b;->aWA:Lcom/google/gson/internal/c;
+    iget-object v2, p0, Lcom/google/gson/internal/a/b;->aWS:Lcom/google/gson/internal/c;
 
     invoke-virtual {v2, p2}, Lcom/google/gson/internal/c;->b(Lcom/google/gson/reflect/TypeToken;)Lcom/google/gson/internal/g;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/c$1.smali b/com.discord/smali_classes2/com/google/gson/internal/a/c$1.smali
index 56eaa1969e..74f55869b2 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/c$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/c$1.smali
@@ -43,7 +43,7 @@
         }
     .end annotation
 
-    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     const-class p2, Ljava/util/Date;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/c.smali b/com.discord/smali_classes2/com/google/gson/internal/a/c.smali
index a445656377..963b1aa43e 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/c.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/c.smali
@@ -14,13 +14,13 @@
 
 
 # static fields
-.field public static final aXM:Lcom/google/gson/r;
+.field public static final aYe:Lcom/google/gson/r;
 
 
 # instance fields
-.field private final aWo:Ljava/text/DateFormat;
+.field private final aWG:Ljava/text/DateFormat;
 
-.field private final aWp:Ljava/text/DateFormat;
+.field private final aWH:Ljava/text/DateFormat;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/c$1;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/c;->aXM:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/c;->aYe:Lcom/google/gson/r;
 
     return-void
 .end method
@@ -49,13 +49,13 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/c;->aWo:Ljava/text/DateFormat;
+    iput-object v0, p0, Lcom/google/gson/internal/a/c;->aWG:Ljava/text/DateFormat;
 
     invoke-static {v1, v1}, Ljava/text/DateFormat;->getDateTimeInstance(II)Ljava/text/DateFormat;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/c;->aWp:Ljava/text/DateFormat;
+    iput-object v0, p0, Lcom/google/gson/internal/a/c;->aWH:Ljava/text/DateFormat;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/google/gson/internal/a/c;->aWo:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/c;->aWG:Ljava/text/DateFormat;
 
     invoke-virtual {v0, p2}, Ljava/text/DateFormat;->format(Ljava/util/Date;)Ljava/lang/String;
 
@@ -105,13 +105,13 @@
     throw p1
 .end method
 
-.method private declared-synchronized dC(Ljava/lang/String;)Ljava/util/Date;
+.method private declared-synchronized dw(Ljava/lang/String;)Ljava/util/Date;
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/c;->aWp:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/c;->aWH:Ljava/text/DateFormat;
 
     invoke-virtual {v0, p1}, Ljava/text/DateFormat;->parse(Ljava/lang/String;)Ljava/util/Date;
 
@@ -131,7 +131,7 @@
 
     :catch_0
     :try_start_1
-    iget-object v0, p0, Lcom/google/gson/internal/a/c;->aWo:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/c;->aWG:Ljava/text/DateFormat;
 
     invoke-virtual {v0, p1}, Ljava/text/DateFormat;->parse(Ljava/lang/String;)Ljava/util/Date;
 
@@ -210,7 +210,7 @@
 
     move-result-object p1
 
-    invoke-direct {p0, p1}, Lcom/google/gson/internal/a/c;->dC(Ljava/lang/String;)Ljava/util/Date;
+    invoke-direct {p0, p1}, Lcom/google/gson/internal/a/c;->dw(Ljava/lang/String;)Ljava/util/Date;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/d.smali b/com.discord/smali_classes2/com/google/gson/internal/a/d.smali
index 9374d41fb1..ff495574a2 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/d.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/d.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aWA:Lcom/google/gson/internal/c;
+.field private final aWS:Lcom/google/gson/internal/c;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/d;->aWA:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/a/d;->aWS:Lcom/google/gson/internal/c;
 
     return-void
 .end method
@@ -49,7 +49,7 @@
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/google/gson/internal/g;->BU()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/gson/internal/g;->BJ()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -170,7 +170,7 @@
     :goto_2
     if-eqz p0, :cond_6
 
-    invoke-interface {p3}, Lcom/google/gson/a/b;->BR()Z
+    invoke-interface {p3}, Lcom/google/gson/a/b;->BG()Z
 
     move-result p1
 
@@ -201,7 +201,7 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     const-class v1, Lcom/google/gson/a/b;
 
@@ -218,7 +218,7 @@
     return-object p1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/gson/internal/a/d;->aWA:Lcom/google/gson/internal/c;
+    iget-object v1, p0, Lcom/google/gson/internal/a/d;->aWS:Lcom/google/gson/internal/c;
 
     invoke-static {v1, p1, p2, v0}, Lcom/google/gson/internal/a/d;->a(Lcom/google/gson/internal/c;Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken;Lcom/google/gson/a/b;)Lcom/google/gson/TypeAdapter;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/e.smali b/com.discord/smali_classes2/com/google/gson/internal/a/e.smali
index 27728f5287..1c7a4a59fe 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/e.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/e.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static final aXQ:Ljava/io/Reader;
+.field private static final aYi:Ljava/io/Reader;
 
-.field private static final aXR:Ljava/lang/Object;
+.field private static final aYj:Ljava/lang/Object;
 
 
 # instance fields
-.field private aXS:[Ljava/lang/Object;
+.field private aYk:[Ljava/lang/Object;
 
 .field private pathIndices:[I
 
@@ -27,13 +27,13 @@
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/e$1;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/e;->aXQ:Ljava/io/Reader;
+    sput-object v0, Lcom/google/gson/internal/a/e;->aYi:Ljava/io/Reader;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/e;->aXR:Ljava/lang/Object;
+    sput-object v0, Lcom/google/gson/internal/a/e;->aYj:Ljava/lang/Object;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 .method public constructor <init>(Lcom/google/gson/JsonElement;)V
     .locals 2
 
-    sget-object v0, Lcom/google/gson/internal/a/e;->aXQ:Ljava/io/Reader;
+    sget-object v0, Lcom/google/gson/internal/a/e;->aYi:Ljava/io/Reader;
 
     invoke-direct {p0, v0}, Lcom/google/gson/stream/JsonReader;-><init>(Ljava/io/Reader;)V
 
@@ -49,7 +49,7 @@
 
     new-array v1, v0, [Ljava/lang/Object;
 
-    iput-object v1, p0, Lcom/google/gson/internal/a/e;->aXS:[Ljava/lang/Object;
+    iput-object v1, p0, Lcom/google/gson/internal/a/e;->aYk:[Ljava/lang/Object;
 
     const/4 v1, 0x0
 
@@ -68,10 +68,10 @@
     return-void
 .end method
 
-.method private Ca()Ljava/lang/Object;
+.method private BP()Ljava/lang/Object;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aXS:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aYk:[Ljava/lang/Object;
 
     iget v1, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -114,10 +114,10 @@
 
 
 # virtual methods
-.method public final BZ()Ljava/lang/Object;
+.method public final BO()Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aXS:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aYk:[Ljava/lang/Object;
 
     iget v1, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -192,7 +192,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/internal/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BO()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -229,13 +229,13 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/internal/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BO()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/JsonObject;
 
-    iget-object v0, v0, Lcom/google/gson/JsonObject;->aWV:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, v0, Lcom/google/gson/JsonObject;->aXn:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-virtual {v0}, Lcom/google/gson/internal/LinkedTreeMap;->entrySet()Ljava/util/Set;
 
@@ -262,13 +262,13 @@
 
     new-array v1, v0, [Ljava/lang/Object;
 
-    sget-object v2, Lcom/google/gson/internal/a/e;->aXR:Ljava/lang/Object;
+    sget-object v2, Lcom/google/gson/internal/a/e;->aYj:Ljava/lang/Object;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iput-object v1, p0, Lcom/google/gson/internal/a/e;->aXS:[Ljava/lang/Object;
+    iput-object v1, p0, Lcom/google/gson/internal/a/e;->aYk:[Ljava/lang/Object;
 
     iput v0, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -287,9 +287,9 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/internal/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->Ca()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->BP()Ljava/lang/Object;
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->Ca()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->BP()Ljava/lang/Object;
 
     iget v0, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -321,9 +321,9 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/internal/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->Ca()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->BP()Ljava/lang/Object;
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->Ca()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->BP()Ljava/lang/Object;
 
     iget v0, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -359,7 +359,7 @@
 
     if-ge v1, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/e;->aXS:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/gson/internal/a/e;->aYk:[Ljava/lang/Object;
 
     aget-object v3, v2, v1
 
@@ -476,7 +476,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/internal/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->Ca()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->BP()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -561,7 +561,7 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BO()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -610,7 +610,7 @@
 
     :cond_3
     :goto_1
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->Ca()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->BP()Ljava/lang/Object;
 
     iget v2, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -687,7 +687,7 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BO()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -697,7 +697,7 @@
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->Ca()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->BP()Ljava/lang/Object;
 
     iget v1, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -774,7 +774,7 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BO()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -784,7 +784,7 @@
 
     move-result-wide v0
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->Ca()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->BP()Ljava/lang/Object;
 
     iget v2, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -816,7 +816,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/internal/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BO()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -863,7 +863,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/gson/internal/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->Ca()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->BP()Ljava/lang/Object;
 
     iget v0, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -940,13 +940,13 @@
 
     :cond_1
     :goto_0
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->Ca()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->BP()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/m;
 
-    invoke-virtual {v0}, Lcom/google/gson/m;->BM()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/gson/m;->BB()Ljava/lang/String;
 
     move-result-object v0
 
@@ -986,7 +986,7 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->BO()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -994,7 +994,7 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/e;->aXS:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/gson/internal/a/e;->aYk:[Ljava/lang/Object;
 
     iget v2, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -1113,7 +1113,7 @@
     return-object v0
 
     :cond_b
-    sget-object v1, Lcom/google/gson/internal/a/e;->aXR:Ljava/lang/Object;
+    sget-object v1, Lcom/google/gson/internal/a/e;->aYj:Ljava/lang/Object;
 
     if-ne v0, v1, :cond_c
 
@@ -1144,7 +1144,7 @@
 
     iget v0, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/e;->aXS:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/gson/internal/a/e;->aYk:[Ljava/lang/Object;
 
     array-length v2, v1
 
@@ -1178,14 +1178,14 @@
 
     invoke-static {v0, v5, v4, v5, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v2, p0, Lcom/google/gson/internal/a/e;->aXS:[Ljava/lang/Object;
+    iput-object v2, p0, Lcom/google/gson/internal/a/e;->aYk:[Ljava/lang/Object;
 
     iput-object v3, p0, Lcom/google/gson/internal/a/e;->pathIndices:[I
 
     iput-object v4, p0, Lcom/google/gson/internal/a/e;->pathNames:[Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aXS:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aYk:[Ljava/lang/Object;
 
     iget v1, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -1229,7 +1229,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->Ca()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->BP()Ljava/lang/Object;
 
     iget v0, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/f.smali b/com.discord/smali_classes2/com/google/gson/internal/a/f.smali
index b7faae3a95..24ac51c744 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/f.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/f.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static final aXT:Ljava/io/Writer;
+.field private static final aYl:Ljava/io/Writer;
 
-.field private static final aXU:Lcom/google/gson/m;
+.field private static final aYm:Lcom/google/gson/m;
 
 
 # instance fields
-.field public final aXV:Ljava/util/List;
+.field public final aYn:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -20,9 +20,9 @@
     .end annotation
 .end field
 
-.field private aXW:Ljava/lang/String;
+.field private aYo:Ljava/lang/String;
 
-.field public aXX:Lcom/google/gson/JsonElement;
+.field public aYp:Lcom/google/gson/JsonElement;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/f$1;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/f;->aXT:Ljava/io/Writer;
+    sput-object v0, Lcom/google/gson/internal/a/f;->aYl:Ljava/io/Writer;
 
     new-instance v0, Lcom/google/gson/m;
 
@@ -41,7 +41,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/gson/m;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/gson/internal/a/f;->aXU:Lcom/google/gson/m;
+    sput-object v0, Lcom/google/gson/internal/a/f;->aYm:Lcom/google/gson/m;
 
     return-void
 .end method
@@ -49,7 +49,7 @@
 .method public constructor <init>()V
     .locals 1
 
-    sget-object v0, Lcom/google/gson/internal/a/f;->aXT:Ljava/io/Writer;
+    sget-object v0, Lcom/google/gson/internal/a/f;->aYl:Ljava/io/Writer;
 
     invoke-direct {p0, v0}, Lcom/google/gson/stream/JsonWriter;-><init>(Ljava/io/Writer;)V
 
@@ -57,19 +57,19 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
-    sget-object v0, Lcom/google/gson/k;->aWU:Lcom/google/gson/k;
+    sget-object v0, Lcom/google/gson/k;->aXm:Lcom/google/gson/k;
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/f;->aXX:Lcom/google/gson/JsonElement;
+    iput-object v0, p0, Lcom/google/gson/internal/a/f;->aYp:Lcom/google/gson/JsonElement;
 
     return-void
 .end method
 
-.method private Cb()Lcom/google/gson/JsonElement;
+.method private BQ()Lcom/google/gson/JsonElement;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -89,7 +89,7 @@
 .method private c(Lcom/google/gson/JsonElement;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aXW:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aYo:Ljava/lang/String;
 
     if-eqz v0, :cond_2
 
@@ -104,25 +104,25 @@
     if-eqz v0, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->Cb()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->BQ()Lcom/google/gson/JsonElement;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/JsonObject;
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/f;->aXW:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/gson/internal/a/f;->aYo:Ljava/lang/String;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/gson/JsonObject;->a(Ljava/lang/String;Lcom/google/gson/JsonElement;)V
 
     :cond_1
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/f;->aXW:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/gson/internal/a/f;->aYo:Ljava/lang/String;
 
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -130,12 +130,12 @@
 
     if-eqz v0, :cond_3
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/f;->aXX:Lcom/google/gson/JsonElement;
+    iput-object p1, p0, Lcom/google/gson/internal/a/f;->aYp:Lcom/google/gson/JsonElement;
 
     return-void
 
     :cond_3
-    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->Cb()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->BQ()Lcom/google/gson/JsonElement;
 
     move-result-object v0
 
@@ -173,7 +173,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/gson/internal/a/f;->c(Lcom/google/gson/JsonElement;)V
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -194,7 +194,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/gson/internal/a/f;->c(Lcom/google/gson/JsonElement;)V
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -209,7 +209,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -217,9 +217,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
-    sget-object v1, Lcom/google/gson/internal/a/f;->aXU:Lcom/google/gson/m;
+    sget-object v1, Lcom/google/gson/internal/a/f;->aYm:Lcom/google/gson/m;
 
     invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -243,7 +243,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -251,11 +251,11 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aXW:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aYo:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->Cb()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->BQ()Lcom/google/gson/JsonElement;
 
     move-result-object v0
 
@@ -263,7 +263,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -298,7 +298,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -306,11 +306,11 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aXW:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aYo:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->Cb()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->BQ()Lcom/google/gson/JsonElement;
 
     move-result-object v0
 
@@ -318,7 +318,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -364,7 +364,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aXV:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aYn:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -372,11 +372,11 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aXW:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aYo:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->Cb()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->BQ()Lcom/google/gson/JsonElement;
 
     move-result-object v0
 
@@ -384,7 +384,7 @@
 
     if-eqz v0, :cond_0
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/f;->aXW:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/gson/internal/a/f;->aYo:Ljava/lang/String;
 
     return-object p0
 
@@ -411,7 +411,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/gson/k;->aWU:Lcom/google/gson/k;
+    sget-object v0, Lcom/google/gson/k;->aXm:Lcom/google/gson/k;
 
     invoke-direct {p0, v0}, Lcom/google/gson/internal/a/f;->c(Lcom/google/gson/JsonElement;)V
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/g$a.smali b/com.discord/smali_classes2/com/google/gson/internal/a/g$a.smali
index ec35fad868..4199af08f4 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/g$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/g$a.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field private final aXP:Lcom/google/gson/internal/g;
+.field private final aYh:Lcom/google/gson/internal/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/internal/g<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field private final aXY:Lcom/google/gson/TypeAdapter;
+.field private final aYq:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -48,7 +48,7 @@
     .end annotation
 .end field
 
-.field private final aXZ:Lcom/google/gson/TypeAdapter;
+.field private final aYr:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -57,7 +57,7 @@
     .end annotation
 .end field
 
-.field final synthetic aYa:Lcom/google/gson/internal/a/g;
+.field final synthetic aYs:Lcom/google/gson/internal/a/g;
 
 
 # direct methods
@@ -80,7 +80,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/g$a;->aYa:Lcom/google/gson/internal/a/g;
+    iput-object p1, p0, Lcom/google/gson/internal/a/g$a;->aYs:Lcom/google/gson/internal/a/g;
 
     invoke-direct {p0}, Lcom/google/gson/TypeAdapter;-><init>()V
 
@@ -88,15 +88,15 @@
 
     invoke-direct {p1, p2, p4, p3}, Lcom/google/gson/internal/a/m;-><init>(Lcom/google/gson/Gson;Lcom/google/gson/TypeAdapter;Ljava/lang/reflect/Type;)V
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/g$a;->aXY:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/internal/a/g$a;->aYq:Lcom/google/gson/TypeAdapter;
 
     new-instance p1, Lcom/google/gson/internal/a/m;
 
     invoke-direct {p1, p2, p6, p5}, Lcom/google/gson/internal/a/m;-><init>(Lcom/google/gson/Gson;Lcom/google/gson/TypeAdapter;Ljava/lang/reflect/Type;)V
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/g$a;->aXZ:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/internal/a/g$a;->aYr:Lcom/google/gson/TypeAdapter;
 
-    iput-object p7, p0, Lcom/google/gson/internal/a/g$a;->aXP:Lcom/google/gson/internal/g;
+    iput-object p7, p0, Lcom/google/gson/internal/a/g$a;->aYh:Lcom/google/gson/internal/g;
 
     return-void
 .end method
@@ -126,9 +126,9 @@
     return-object p1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/gson/internal/a/g$a;->aXP:Lcom/google/gson/internal/g;
+    iget-object v1, p0, Lcom/google/gson/internal/a/g$a;->aYh:Lcom/google/gson/internal/g;
 
-    invoke-interface {v1}, Lcom/google/gson/internal/g;->BU()Ljava/lang/Object;
+    invoke-interface {v1}, Lcom/google/gson/internal/g;->BJ()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -151,13 +151,13 @@
 
     invoke-virtual {p1}, Lcom/google/gson/stream/JsonReader;->beginArray()V
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/g$a;->aXY:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/g$a;->aYq:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/g$a;->aXZ:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lcom/google/gson/internal/a/g$a;->aYr:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v2, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
@@ -207,13 +207,13 @@
 
     invoke-virtual {v0, p1}, Lcom/google/gson/internal/e;->promoteNameToValue(Lcom/google/gson/stream/JsonReader;)V
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/g$a;->aXY:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/g$a;->aYq:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/g$a;->aXZ:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lcom/google/gson/internal/a/g$a;->aYr:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v2, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
@@ -266,9 +266,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/g$a;->aYa:Lcom/google/gson/internal/a/g;
+    iget-object v0, p0, Lcom/google/gson/internal/a/g$a;->aYs:Lcom/google/gson/internal/a/g;
 
-    iget-boolean v0, v0, Lcom/google/gson/internal/a/g;->aWQ:Z
+    iget-boolean v0, v0, Lcom/google/gson/internal/a/g;->aXi:Z
 
     if-nez v0, :cond_2
 
@@ -305,7 +305,7 @@
 
     invoke-virtual {p1, v1}, Lcom/google/gson/stream/JsonWriter;->name(Ljava/lang/String;)Lcom/google/gson/stream/JsonWriter;
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/g$a;->aXZ:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/g$a;->aYr:Lcom/google/gson/TypeAdapter;
 
     invoke-interface {v0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
@@ -362,7 +362,7 @@
 
     check-cast v4, Ljava/util/Map$Entry;
 
-    iget-object v5, p0, Lcom/google/gson/internal/a/g$a;->aXY:Lcom/google/gson/TypeAdapter;
+    iget-object v5, p0, Lcom/google/gson/internal/a/g$a;->aYq:Lcom/google/gson/TypeAdapter;
 
     invoke-interface {v4}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -426,7 +426,7 @@
 
     invoke-static {v3, p1}, Lcom/google/gson/internal/i;->b(Lcom/google/gson/JsonElement;Lcom/google/gson/stream/JsonWriter;)V
 
-    iget-object v3, p0, Lcom/google/gson/internal/a/g$a;->aXZ:Lcom/google/gson/TypeAdapter;
+    iget-object v3, p0, Lcom/google/gson/internal/a/g$a;->aYr:Lcom/google/gson/TypeAdapter;
 
     invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -465,7 +465,7 @@
 
     if-eqz v4, :cond_b
 
-    invoke-virtual {v3}, Lcom/google/gson/JsonElement;->BO()Lcom/google/gson/m;
+    invoke-virtual {v3}, Lcom/google/gson/JsonElement;->BD()Lcom/google/gson/m;
 
     move-result-object v3
 
@@ -475,7 +475,7 @@
 
     if-eqz v4, :cond_8
 
-    invoke-virtual {v3}, Lcom/google/gson/m;->BL()Ljava/lang/Number;
+    invoke-virtual {v3}, Lcom/google/gson/m;->BA()Ljava/lang/Number;
 
     move-result-object v3
 
@@ -509,7 +509,7 @@
 
     if-eqz v4, :cond_a
 
-    invoke-virtual {v3}, Lcom/google/gson/m;->BM()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/gson/m;->BB()Ljava/lang/String;
 
     move-result-object v3
 
@@ -532,7 +532,7 @@
     :goto_6
     invoke-virtual {p1, v3}, Lcom/google/gson/stream/JsonWriter;->name(Ljava/lang/String;)Lcom/google/gson/stream/JsonWriter;
 
-    iget-object v3, p0, Lcom/google/gson/internal/a/g$a;->aXZ:Lcom/google/gson/TypeAdapter;
+    iget-object v3, p0, Lcom/google/gson/internal/a/g$a;->aYr:Lcom/google/gson/TypeAdapter;
 
     invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/g.smali b/com.discord/smali_classes2/com/google/gson/internal/a/g.smali
index 52a35c7e2b..961b9dfd14 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/g.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/g.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private final aWA:Lcom/google/gson/internal/c;
+.field private final aWS:Lcom/google/gson/internal/c;
 
-.field final aWQ:Z
+.field final aXi:Z
 
 
 # direct methods
@@ -26,9 +26,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/g;->aWA:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/a/g;->aWS:Lcom/google/gson/internal/c;
 
-    iput-boolean p2, p0, Lcom/google/gson/internal/a/g;->aWQ:Z
+    iput-boolean p2, p0, Lcom/google/gson/internal/a/g;->aXi:Z
 
     return-void
 .end method
@@ -50,9 +50,9 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
-    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     const-class v2, Ljava/util/Map;
 
@@ -102,7 +102,7 @@
 
     :cond_2
     :goto_0
-    sget-object v2, Lcom/google/gson/internal/a/n;->aYC:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aYU:Lcom/google/gson/TypeAdapter;
 
     :goto_1
     move-object v7, v2
@@ -119,7 +119,7 @@
 
     move-result-object v9
 
-    iget-object v3, p0, Lcom/google/gson/internal/a/g;->aWA:Lcom/google/gson/internal/c;
+    iget-object v3, p0, Lcom/google/gson/internal/a/g;->aWS:Lcom/google/gson/internal/c;
 
     invoke-virtual {v3, p2}, Lcom/google/gson/internal/c;->b(Lcom/google/gson/reflect/TypeToken;)Lcom/google/gson/internal/g;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/h$1.smali b/com.discord/smali_classes2/com/google/gson/internal/a/h$1.smali
index db7aa39ff1..387ce87f99 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/h$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/h$1.smali
@@ -43,7 +43,7 @@
         }
     .end annotation
 
-    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     const-class v0, Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/h.smali b/com.discord/smali_classes2/com/google/gson/internal/a/h.smali
index 07931ec80e..982728af21 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/h.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/h.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final aXM:Lcom/google/gson/r;
+.field public static final aYe:Lcom/google/gson/r;
 
 
 # instance fields
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/h$1;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/h;->aXM:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/h;->aYe:Lcom/google/gson/r;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/i$1.smali b/com.discord/smali_classes2/com/google/gson/internal/a/i$1.smali
index 0c33650276..fbf9f58443 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/i$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/i$1.smali
@@ -15,38 +15,38 @@
 
 
 # instance fields
-.field final synthetic aYb:Ljava/lang/reflect/Field;
+.field final synthetic aYt:Ljava/lang/reflect/Field;
 
-.field final synthetic aYc:Z
+.field final synthetic aYu:Z
 
-.field final synthetic aYd:Lcom/google/gson/TypeAdapter;
+.field final synthetic aYv:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aYe:Lcom/google/gson/Gson;
+.field final synthetic aYw:Lcom/google/gson/Gson;
 
-.field final synthetic aYf:Lcom/google/gson/reflect/TypeToken;
+.field final synthetic aYx:Lcom/google/gson/reflect/TypeToken;
 
-.field final synthetic aYg:Z
+.field final synthetic aYy:Z
 
-.field final synthetic aYh:Lcom/google/gson/internal/a/i;
+.field final synthetic aYz:Lcom/google/gson/internal/a/i;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/a/i;Ljava/lang/String;ZZLjava/lang/reflect/Field;ZLcom/google/gson/TypeAdapter;Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/i$1;->aYh:Lcom/google/gson/internal/a/i;
+    iput-object p1, p0, Lcom/google/gson/internal/a/i$1;->aYz:Lcom/google/gson/internal/a/i;
 
-    iput-object p5, p0, Lcom/google/gson/internal/a/i$1;->aYb:Ljava/lang/reflect/Field;
+    iput-object p5, p0, Lcom/google/gson/internal/a/i$1;->aYt:Ljava/lang/reflect/Field;
 
-    iput-boolean p6, p0, Lcom/google/gson/internal/a/i$1;->aYc:Z
+    iput-boolean p6, p0, Lcom/google/gson/internal/a/i$1;->aYu:Z
 
-    iput-object p7, p0, Lcom/google/gson/internal/a/i$1;->aYd:Lcom/google/gson/TypeAdapter;
+    iput-object p7, p0, Lcom/google/gson/internal/a/i$1;->aYv:Lcom/google/gson/TypeAdapter;
 
-    iput-object p8, p0, Lcom/google/gson/internal/a/i$1;->aYe:Lcom/google/gson/Gson;
+    iput-object p8, p0, Lcom/google/gson/internal/a/i$1;->aYw:Lcom/google/gson/Gson;
 
-    iput-object p9, p0, Lcom/google/gson/internal/a/i$1;->aYf:Lcom/google/gson/reflect/TypeToken;
+    iput-object p9, p0, Lcom/google/gson/internal/a/i$1;->aYx:Lcom/google/gson/reflect/TypeToken;
 
-    iput-boolean p10, p0, Lcom/google/gson/internal/a/i$1;->aYg:Z
+    iput-boolean p10, p0, Lcom/google/gson/internal/a/i$1;->aYy:Z
 
     invoke-direct {p0, p2, p3, p4}, Lcom/google/gson/internal/a/i$b;-><init>(Ljava/lang/String;ZZ)V
 
@@ -64,7 +64,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aYd:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aYv:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
@@ -72,12 +72,12 @@
 
     if-nez p1, :cond_0
 
-    iget-boolean v0, p0, Lcom/google/gson/internal/a/i$1;->aYg:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/a/i$1;->aYy:Z
 
     if-nez v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aYb:Ljava/lang/reflect/Field;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aYt:Ljava/lang/reflect/Field;
 
     invoke-virtual {v0, p2, p1}, Ljava/lang/reflect/Field;->set(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -94,7 +94,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/gson/internal/a/i$1;->aYj:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/a/i$1;->aYB:Z
 
     const/4 v1, 0x0
 
@@ -103,7 +103,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aYb:Ljava/lang/reflect/Field;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aYt:Ljava/lang/reflect/Field;
 
     invoke-virtual {v0, p1}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -128,30 +128,30 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aYb:Ljava/lang/reflect/Field;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aYt:Ljava/lang/reflect/Field;
 
     invoke-virtual {v0, p2}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p2
 
-    iget-boolean v0, p0, Lcom/google/gson/internal/a/i$1;->aYc:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/a/i$1;->aYu:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aYd:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aYv:Lcom/google/gson/TypeAdapter;
 
     goto :goto_0
 
     :cond_0
     new-instance v0, Lcom/google/gson/internal/a/m;
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/i$1;->aYe:Lcom/google/gson/Gson;
+    iget-object v1, p0, Lcom/google/gson/internal/a/i$1;->aYw:Lcom/google/gson/Gson;
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/i$1;->aYd:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lcom/google/gson/internal/a/i$1;->aYv:Lcom/google/gson/TypeAdapter;
 
-    iget-object v3, p0, Lcom/google/gson/internal/a/i$1;->aYf:Lcom/google/gson/reflect/TypeToken;
+    iget-object v3, p0, Lcom/google/gson/internal/a/i$1;->aYx:Lcom/google/gson/reflect/TypeToken;
 
-    iget-object v3, v3, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v3, v3, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/google/gson/internal/a/m;-><init>(Lcom/google/gson/Gson;Lcom/google/gson/TypeAdapter;Ljava/lang/reflect/Type;)V
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/i$a.smali b/com.discord/smali_classes2/com/google/gson/internal/a/i$a.smali
index 12e3651926..27fd8fde51 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/i$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/i$a.smali
@@ -25,16 +25,7 @@
 
 
 # instance fields
-.field private final aXP:Lcom/google/gson/internal/g;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/internal/g<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field private final aYi:Ljava/util/Map;
+.field private final aYA:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -45,6 +36,15 @@
     .end annotation
 .end field
 
+.field private final aYh:Lcom/google/gson/internal/g;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/internal/g<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/g;Ljava/util/Map;)V
@@ -63,9 +63,9 @@
 
     invoke-direct {p0}, Lcom/google/gson/TypeAdapter;-><init>()V
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/i$a;->aXP:Lcom/google/gson/internal/g;
+    iput-object p1, p0, Lcom/google/gson/internal/a/i$a;->aYh:Lcom/google/gson/internal/g;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/i$a;->aYi:Ljava/util/Map;
+    iput-object p2, p0, Lcom/google/gson/internal/a/i$a;->aYA:Ljava/util/Map;
 
     return-void
 .end method
@@ -103,9 +103,9 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/i$a;->aXP:Lcom/google/gson/internal/g;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$a;->aYh:Lcom/google/gson/internal/g;
 
-    invoke-interface {v0}, Lcom/google/gson/internal/g;->BU()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/internal/g;->BJ()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -123,7 +123,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/i$a;->aYi:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/gson/internal/a/i$a;->aYA:Ljava/util/Map;
 
     invoke-interface {v2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -133,7 +133,7 @@
 
     if-eqz v1, :cond_2
 
-    iget-boolean v2, v1, Lcom/google/gson/internal/a/i$b;->aYk:Z
+    iget-boolean v2, v1, Lcom/google/gson/internal/a/i$b;->aYC:Z
 
     if-nez v2, :cond_1
 
@@ -209,7 +209,7 @@
     invoke-virtual {p1}, Lcom/google/gson/stream/JsonWriter;->beginObject()Lcom/google/gson/stream/JsonWriter;
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/i$a;->aYi:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$a;->aYA:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/i$b.smali b/com.discord/smali_classes2/com/google/gson/internal/a/i$b.smali
index 1204d08f85..c04074efe8 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/i$b.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/i$b.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field final aYj:Z
+.field final aYB:Z
 
-.field final aYk:Z
+.field final aYC:Z
 
 .field final name:Ljava/lang/String;
 
@@ -30,9 +30,9 @@
 
     iput-object p1, p0, Lcom/google/gson/internal/a/i$b;->name:Ljava/lang/String;
 
-    iput-boolean p2, p0, Lcom/google/gson/internal/a/i$b;->aYj:Z
+    iput-boolean p2, p0, Lcom/google/gson/internal/a/i$b;->aYB:Z
 
-    iput-boolean p3, p0, Lcom/google/gson/internal/a/i$b;->aYk:Z
+    iput-boolean p3, p0, Lcom/google/gson/internal/a/i$b;->aYC:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/i.smali b/com.discord/smali_classes2/com/google/gson/internal/a/i.smali
index 4feb1133b1..bd023de261 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/i.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/i.smali
@@ -16,13 +16,13 @@
 
 
 # instance fields
-.field private final aWA:Lcom/google/gson/internal/c;
+.field private final aWS:Lcom/google/gson/internal/c;
 
-.field private final aWB:Lcom/google/gson/internal/d;
+.field private final aWT:Lcom/google/gson/internal/d;
 
-.field private final aWF:Lcom/google/gson/internal/a/d;
+.field private final aWX:Lcom/google/gson/internal/a/d;
 
-.field private final aWK:Lcom/google/gson/e;
+.field private final aXc:Lcom/google/gson/e;
 
 
 # direct methods
@@ -31,13 +31,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/i;->aWA:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/a/i;->aWS:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/i;->aWK:Lcom/google/gson/e;
+    iput-object p2, p0, Lcom/google/gson/internal/a/i;->aXc:Lcom/google/gson/e;
 
-    iput-object p3, p0, Lcom/google/gson/internal/a/i;->aWB:Lcom/google/gson/internal/d;
+    iput-object p3, p0, Lcom/google/gson/internal/a/i;->aWT:Lcom/google/gson/internal/d;
 
-    iput-object p4, p0, Lcom/google/gson/internal/a/i;->aWF:Lcom/google/gson/internal/a/d;
+    iput-object p4, p0, Lcom/google/gson/internal/a/i;->aWX:Lcom/google/gson/internal/a/d;
 
     return-void
 .end method
@@ -78,7 +78,7 @@
     :cond_0
     move-object/from16 v0, p2
 
-    iget-object v14, v0, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v14, v0, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
     move-object/from16 v15, p3
 
@@ -139,7 +139,7 @@
     :goto_2
     invoke-virtual {v5, v4}, Ljava/lang/reflect/Field;->setAccessible(Z)V
 
-    iget-object v1, v10, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v1, v10, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
     invoke-virtual {v5}, Ljava/lang/reflect/Field;->getGenericType()Ljava/lang/reflect/Type;
 
@@ -189,7 +189,7 @@
 
     move-result-object v9
 
-    iget-object v4, v9, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object v4, v9, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     invoke-static {v4}, Lcom/google/gson/internal/h;->g(Ljava/lang/reflect/Type;)Z
 
@@ -205,7 +205,7 @@
 
     if-eqz v4, :cond_4
 
-    iget-object v7, v11, Lcom/google/gson/internal/a/i;->aWA:Lcom/google/gson/internal/c;
+    iget-object v7, v11, Lcom/google/gson/internal/a/i;->aWS:Lcom/google/gson/internal/c;
 
     invoke-static {v7, v12, v9, v4}, Lcom/google/gson/internal/a/d;->a(Lcom/google/gson/internal/c;Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken;Lcom/google/gson/a/b;)Lcom/google/gson/TypeAdapter;
 
@@ -390,7 +390,7 @@
 
     move-object/from16 p2, v15
 
-    iget-object v0, v0, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v0, v0, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
     invoke-virtual/range {p2 .. p2}, Ljava/lang/Class;->getGenericSuperclass()Ljava/lang/reflect/Type;
 
@@ -406,7 +406,7 @@
 
     move-result-object v10
 
-    iget-object v15, v10, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object v15, v10, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     move-object/from16 v11, p0
 
@@ -421,7 +421,7 @@
 .method private a(Ljava/lang/reflect/Field;Z)Z
     .locals 8
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/i;->aWB:Lcom/google/gson/internal/d;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i;->aWT:Lcom/google/gson/internal/d;
 
     invoke-virtual {p1}, Ljava/lang/reflect/Field;->getType()Ljava/lang/Class;
 
@@ -435,7 +435,7 @@
 
     if-nez v1, :cond_b
 
-    iget v1, v0, Lcom/google/gson/internal/d;->aXk:I
+    iget v1, v0, Lcom/google/gson/internal/d;->aXC:I
 
     invoke-virtual {p1}, Ljava/lang/reflect/Field;->getModifiers()I
 
@@ -454,7 +454,7 @@
     goto/16 :goto_3
 
     :cond_1
-    iget-wide v4, v0, Lcom/google/gson/internal/d;->aXj:D
+    iget-wide v4, v0, Lcom/google/gson/internal/d;->aXB:D
 
     const-wide/high16 v6, -0x4010000000000000L    # -1.0
 
@@ -496,7 +496,7 @@
     goto :goto_0
 
     :cond_3
-    iget-boolean v1, v0, Lcom/google/gson/internal/d;->aXm:Z
+    iget-boolean v1, v0, Lcom/google/gson/internal/d;->aXE:Z
 
     if-eqz v1, :cond_5
 
@@ -512,7 +512,7 @@
 
     if-eqz p2, :cond_4
 
-    invoke-interface {v1}, Lcom/google/gson/a/a;->BP()Z
+    invoke-interface {v1}, Lcom/google/gson/a/a;->BE()Z
 
     move-result v1
 
@@ -521,7 +521,7 @@
     goto :goto_1
 
     :cond_4
-    invoke-interface {v1}, Lcom/google/gson/a/a;->BQ()Z
+    invoke-interface {v1}, Lcom/google/gson/a/a;->BF()Z
 
     move-result v1
 
@@ -531,7 +531,7 @@
     goto :goto_0
 
     :cond_5
-    iget-boolean v1, v0, Lcom/google/gson/internal/d;->aXl:Z
+    iget-boolean v1, v0, Lcom/google/gson/internal/d;->aXD:Z
 
     if-nez v1, :cond_6
 
@@ -563,12 +563,12 @@
     :cond_7
     if-eqz p2, :cond_8
 
-    iget-object p2, v0, Lcom/google/gson/internal/d;->aXn:Ljava/util/List;
+    iget-object p2, v0, Lcom/google/gson/internal/d;->aXF:Ljava/util/List;
 
     goto :goto_2
 
     :cond_8
-    iget-object p2, v0, Lcom/google/gson/internal/d;->aXo:Ljava/util/List;
+    iget-object p2, v0, Lcom/google/gson/internal/d;->aXG:Ljava/util/List;
 
     :goto_2
     invoke-interface {p2}, Ljava/util/List;->isEmpty()Z
@@ -598,7 +598,7 @@
 
     check-cast p2, Lcom/google/gson/b;
 
-    invoke-interface {p2}, Lcom/google/gson/b;->BH()Z
+    invoke-interface {p2}, Lcom/google/gson/b;->Bw()Z
 
     move-result p2
 
@@ -641,7 +641,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/i;->aWK:Lcom/google/gson/e;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i;->aXc:Lcom/google/gson/e;
 
     invoke-interface {v0, p1}, Lcom/google/gson/e;->a(Ljava/lang/reflect/Field;)Ljava/lang/String;
 
@@ -658,7 +658,7 @@
 
     move-result-object p1
 
-    invoke-interface {v0}, Lcom/google/gson/a/c;->BS()[Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/gson/a/c;->BH()[Ljava/lang/String;
 
     move-result-object v0
 
@@ -719,7 +719,7 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     const-class v1, Ljava/lang/Object;
 
@@ -734,7 +734,7 @@
     return-object p1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/gson/internal/a/i;->aWA:Lcom/google/gson/internal/c;
+    iget-object v1, p0, Lcom/google/gson/internal/a/i;->aWS:Lcom/google/gson/internal/c;
 
     invoke-virtual {v1, p2}, Lcom/google/gson/internal/c;->b(Lcom/google/gson/reflect/TypeToken;)Lcom/google/gson/internal/g;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/j$1.smali b/com.discord/smali_classes2/com/google/gson/internal/a/j$1.smali
index 47fb2d5583..e246689802 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/j$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/j$1.smali
@@ -43,7 +43,7 @@
         }
     .end annotation
 
-    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     const-class p2, Ljava/sql/Date;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/j.smali b/com.discord/smali_classes2/com/google/gson/internal/a/j.smali
index 667c4ec5bd..78bad9b8b4 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/j.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/j.smali
@@ -14,11 +14,11 @@
 
 
 # static fields
-.field public static final aXM:Lcom/google/gson/r;
+.field public static final aYe:Lcom/google/gson/r;
 
 
 # instance fields
-.field private final aYl:Ljava/text/DateFormat;
+.field private final aYD:Ljava/text/DateFormat;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/j$1;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/j;->aXM:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/j;->aYe:Lcom/google/gson/r;
 
     return-void
 .end method
@@ -45,7 +45,7 @@
 
     invoke-direct {v0, v1}, Ljava/text/SimpleDateFormat;-><init>(Ljava/lang/String;)V
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/j;->aYl:Ljava/text/DateFormat;
+    iput-object v0, p0, Lcom/google/gson/internal/a/j;->aYD:Ljava/text/DateFormat;
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/j;->aYl:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/j;->aYD:Ljava/text/DateFormat;
 
     invoke-virtual {v0, p2}, Ljava/text/DateFormat;->format(Ljava/util/Date;)Ljava/lang/String;
 
@@ -122,7 +122,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/google/gson/internal/a/j;->aYl:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/j;->aYD:Ljava/text/DateFormat;
 
     invoke-virtual {p1}, Lcom/google/gson/stream/JsonReader;->nextString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/k$1.smali b/com.discord/smali_classes2/com/google/gson/internal/a/k$1.smali
index ea2e86962a..6e90366c0c 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/k$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/k$1.smali
@@ -43,7 +43,7 @@
         }
     .end annotation
 
-    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     const-class p2, Ljava/sql/Time;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/k.smali b/com.discord/smali_classes2/com/google/gson/internal/a/k.smali
index c752e57b77..27a14b703d 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/k.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/k.smali
@@ -14,11 +14,11 @@
 
 
 # static fields
-.field public static final aXM:Lcom/google/gson/r;
+.field public static final aYe:Lcom/google/gson/r;
 
 
 # instance fields
-.field private final aYl:Ljava/text/DateFormat;
+.field private final aYD:Ljava/text/DateFormat;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/k$1;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/k;->aXM:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/k;->aYe:Lcom/google/gson/r;
 
     return-void
 .end method
@@ -45,7 +45,7 @@
 
     invoke-direct {v0, v1}, Ljava/text/SimpleDateFormat;-><init>(Ljava/lang/String;)V
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/k;->aYl:Ljava/text/DateFormat;
+    iput-object v0, p0, Lcom/google/gson/internal/a/k;->aYD:Ljava/text/DateFormat;
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/k;->aYl:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/k;->aYD:Ljava/text/DateFormat;
 
     invoke-virtual {v0, p2}, Ljava/text/DateFormat;->format(Ljava/util/Date;)Ljava/lang/String;
 
@@ -122,7 +122,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/google/gson/internal/a/k;->aYl:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/k;->aYD:Ljava/text/DateFormat;
 
     invoke-virtual {p1}, Lcom/google/gson/stream/JsonReader;->nextString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/l$a.smali b/com.discord/smali_classes2/com/google/gson/internal/a/l$a.smali
index f8a8f59cde..d21bb5039d 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/l$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/l$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aYr:Lcom/google/gson/internal/a/l;
+.field final synthetic aYJ:Lcom/google/gson/internal/a/l;
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/gson/internal/a/l;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/l$a;->aYr:Lcom/google/gson/internal/a/l;
+    iput-object p1, p0, Lcom/google/gson/internal/a/l$a;->aYJ:Lcom/google/gson/internal/a/l;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/l$b.smali b/com.discord/smali_classes2/com/google/gson/internal/a/l$b.smali
index 0eb1d6a0e4..32ae913024 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/l$b.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/l$b.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final aYm:Lcom/google/gson/o;
+.field private final aYE:Lcom/google/gson/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/o<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final aYn:Lcom/google/gson/i;
+.field private final aYF:Lcom/google/gson/i;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/i<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final aYs:Lcom/google/gson/reflect/TypeToken;
+.field private final aYK:Lcom/google/gson/reflect/TypeToken;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/reflect/TypeToken<",
@@ -45,9 +45,9 @@
     .end annotation
 .end field
 
-.field private final aYt:Z
+.field private final aYL:Z
 
-.field private final aYu:Ljava/lang/Class;
+.field private final aYM:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -87,7 +87,7 @@
     move-object v0, v1
 
     :goto_0
-    iput-object v0, p0, Lcom/google/gson/internal/a/l$b;->aYm:Lcom/google/gson/o;
+    iput-object v0, p0, Lcom/google/gson/internal/a/l$b;->aYE:Lcom/google/gson/o;
 
     instance-of v0, p1, Lcom/google/gson/i;
 
@@ -101,13 +101,13 @@
     move-object p1, v1
 
     :goto_1
-    iput-object p1, p0, Lcom/google/gson/internal/a/l$b;->aYn:Lcom/google/gson/i;
+    iput-object p1, p0, Lcom/google/gson/internal/a/l$b;->aYF:Lcom/google/gson/i;
 
-    iget-object p1, p0, Lcom/google/gson/internal/a/l$b;->aYm:Lcom/google/gson/o;
+    iget-object p1, p0, Lcom/google/gson/internal/a/l$b;->aYE:Lcom/google/gson/o;
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lcom/google/gson/internal/a/l$b;->aYn:Lcom/google/gson/i;
+    iget-object p1, p0, Lcom/google/gson/internal/a/l$b;->aYF:Lcom/google/gson/i;
 
     if-eqz p1, :cond_2
 
@@ -125,11 +125,11 @@
     :goto_3
     invoke-static {p1}, Lcom/google/gson/internal/a;->checkArgument(Z)V
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/l$b;->aYs:Lcom/google/gson/reflect/TypeToken;
+    iput-object p2, p0, Lcom/google/gson/internal/a/l$b;->aYK:Lcom/google/gson/reflect/TypeToken;
 
-    iput-boolean p3, p0, Lcom/google/gson/internal/a/l$b;->aYt:Z
+    iput-boolean p3, p0, Lcom/google/gson/internal/a/l$b;->aYL:Z
 
-    iput-object v1, p0, Lcom/google/gson/internal/a/l$b;->aYu:Ljava/lang/Class;
+    iput-object v1, p0, Lcom/google/gson/internal/a/l$b;->aYM:Ljava/lang/Class;
 
     return-void
 .end method
@@ -151,7 +151,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aYs:Lcom/google/gson/reflect/TypeToken;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aYK:Lcom/google/gson/reflect/TypeToken;
 
     if-eqz v0, :cond_2
 
@@ -161,15 +161,15 @@
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/google/gson/internal/a/l$b;->aYt:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/a/l$b;->aYL:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aYs:Lcom/google/gson/reflect/TypeToken;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aYK:Lcom/google/gson/reflect/TypeToken;
 
-    iget-object v0, v0, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v0, v0, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
-    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     if-ne v0, v1, :cond_0
 
@@ -187,9 +187,9 @@
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aYu:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aYM:Ljava/lang/Class;
 
-    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     invoke-virtual {v0, v1}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
@@ -200,9 +200,9 @@
 
     new-instance v0, Lcom/google/gson/internal/a/l;
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/l$b;->aYm:Lcom/google/gson/o;
+    iget-object v2, p0, Lcom/google/gson/internal/a/l$b;->aYE:Lcom/google/gson/o;
 
-    iget-object v3, p0, Lcom/google/gson/internal/a/l$b;->aYn:Lcom/google/gson/i;
+    iget-object v3, p0, Lcom/google/gson/internal/a/l$b;->aYF:Lcom/google/gson/i;
 
     move-object v1, v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/l.smali b/com.discord/smali_classes2/com/google/gson/internal/a/l.smali
index 1af393e647..ee72c1a582 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/l.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/l.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field private aWI:Lcom/google/gson/TypeAdapter;
+.field private aXa:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final aYm:Lcom/google/gson/o;
+.field private final aYE:Lcom/google/gson/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/o<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field private final aYn:Lcom/google/gson/i;
+.field private final aYF:Lcom/google/gson/i;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/i<",
@@ -50,7 +50,7 @@
     .end annotation
 .end field
 
-.field private final aYo:Lcom/google/gson/reflect/TypeToken;
+.field private final aYG:Lcom/google/gson/reflect/TypeToken;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/reflect/TypeToken<",
@@ -59,9 +59,9 @@
     .end annotation
 .end field
 
-.field private final aYp:Lcom/google/gson/r;
+.field private final aYH:Lcom/google/gson/r;
 
-.field private final aYq:Lcom/google/gson/internal/a/l$a;
+.field private final aYI:Lcom/google/gson/internal/a/l$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/internal/a/l<",
@@ -99,22 +99,22 @@
 
     invoke-direct {v0, p0, v1}, Lcom/google/gson/internal/a/l$a;-><init>(Lcom/google/gson/internal/a/l;B)V
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/l;->aYq:Lcom/google/gson/internal/a/l$a;
+    iput-object v0, p0, Lcom/google/gson/internal/a/l;->aYI:Lcom/google/gson/internal/a/l$a;
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/l;->aYm:Lcom/google/gson/o;
+    iput-object p1, p0, Lcom/google/gson/internal/a/l;->aYE:Lcom/google/gson/o;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/l;->aYn:Lcom/google/gson/i;
+    iput-object p2, p0, Lcom/google/gson/internal/a/l;->aYF:Lcom/google/gson/i;
 
     iput-object p3, p0, Lcom/google/gson/internal/a/l;->gson:Lcom/google/gson/Gson;
 
-    iput-object p4, p0, Lcom/google/gson/internal/a/l;->aYo:Lcom/google/gson/reflect/TypeToken;
+    iput-object p4, p0, Lcom/google/gson/internal/a/l;->aYG:Lcom/google/gson/reflect/TypeToken;
 
-    iput-object p5, p0, Lcom/google/gson/internal/a/l;->aYp:Lcom/google/gson/r;
+    iput-object p5, p0, Lcom/google/gson/internal/a/l;->aYH:Lcom/google/gson/r;
 
     return-void
 .end method
 
-.method private BW()Lcom/google/gson/TypeAdapter;
+.method private BL()Lcom/google/gson/TypeAdapter;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -124,7 +124,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aWI:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aXa:Lcom/google/gson/TypeAdapter;
 
     if-eqz v0, :cond_0
 
@@ -133,15 +133,15 @@
     :cond_0
     iget-object v0, p0, Lcom/google/gson/internal/a/l;->gson:Lcom/google/gson/Gson;
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/l;->aYp:Lcom/google/gson/r;
+    iget-object v1, p0, Lcom/google/gson/internal/a/l;->aYH:Lcom/google/gson/r;
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/l;->aYo:Lcom/google/gson/reflect/TypeToken;
+    iget-object v2, p0, Lcom/google/gson/internal/a/l;->aYG:Lcom/google/gson/reflect/TypeToken;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/gson/Gson;->a(Lcom/google/gson/r;Lcom/google/gson/reflect/TypeToken;)Lcom/google/gson/TypeAdapter;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/l;->aWI:Lcom/google/gson/TypeAdapter;
+    iput-object v0, p0, Lcom/google/gson/internal/a/l;->aXa:Lcom/google/gson/TypeAdapter;
 
     return-object v0
 .end method
@@ -159,9 +159,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
-    iget-object v1, p0, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     if-ne v0, v1, :cond_0
 
@@ -198,11 +198,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aYn:Lcom/google/gson/i;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aYF:Lcom/google/gson/i;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/l;->BW()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/l;->BL()Lcom/google/gson/TypeAdapter;
 
     move-result-object v0
 
@@ -226,9 +226,9 @@
     return-object p1
 
     :cond_1
-    iget-object p1, p0, Lcom/google/gson/internal/a/l;->aYn:Lcom/google/gson/i;
+    iget-object p1, p0, Lcom/google/gson/internal/a/l;->aYF:Lcom/google/gson/i;
 
-    invoke-interface {p1}, Lcom/google/gson/i;->BN()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/google/gson/i;->BC()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -251,11 +251,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aYm:Lcom/google/gson/o;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aYE:Lcom/google/gson/o;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/l;->BW()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/l;->BL()Lcom/google/gson/TypeAdapter;
 
     move-result-object v0
 
@@ -271,11 +271,11 @@
     return-void
 
     :cond_1
-    iget-object v1, p0, Lcom/google/gson/internal/a/l;->aYo:Lcom/google/gson/reflect/TypeToken;
+    iget-object v1, p0, Lcom/google/gson/internal/a/l;->aYG:Lcom/google/gson/reflect/TypeToken;
 
-    iget-object v1, v1, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v1, v1, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/l;->aYq:Lcom/google/gson/internal/a/l$a;
+    iget-object v2, p0, Lcom/google/gson/internal/a/l;->aYI:Lcom/google/gson/internal/a/l$a;
 
     invoke-interface {v0, p2, v1, v2}, Lcom/google/gson/o;->serialize(Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/n;)Lcom/google/gson/JsonElement;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/m.smali b/com.discord/smali_classes2/com/google/gson/internal/a/m.smali
index 59a7307994..6114aaa129 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/m.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/m.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field private final aWI:Lcom/google/gson/TypeAdapter;
+.field private final aXa:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -25,9 +25,9 @@
     .end annotation
 .end field
 
-.field private final aYv:Lcom/google/gson/Gson;
+.field private final aYN:Lcom/google/gson/Gson;
 
-.field private final aYw:Ljava/lang/reflect/Type;
+.field private final aYO:Ljava/lang/reflect/Type;
 
 
 # direct methods
@@ -46,11 +46,11 @@
 
     invoke-direct {p0}, Lcom/google/gson/TypeAdapter;-><init>()V
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/m;->aYv:Lcom/google/gson/Gson;
+    iput-object p1, p0, Lcom/google/gson/internal/a/m;->aYN:Lcom/google/gson/Gson;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/m;->aWI:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lcom/google/gson/internal/a/m;->aXa:Lcom/google/gson/TypeAdapter;
 
-    iput-object p3, p0, Lcom/google/gson/internal/a/m;->aYw:Ljava/lang/reflect/Type;
+    iput-object p3, p0, Lcom/google/gson/internal/a/m;->aYO:Ljava/lang/reflect/Type;
 
     return-void
 .end method
@@ -73,7 +73,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aWI:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aXa:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
@@ -98,9 +98,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aWI:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aXa:Lcom/google/gson/TypeAdapter;
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/m;->aYw:Ljava/lang/reflect/Type;
+    iget-object v1, p0, Lcom/google/gson/internal/a/m;->aYO:Ljava/lang/reflect/Type;
 
     if-eqz p2, :cond_1
 
@@ -122,11 +122,11 @@
     move-result-object v1
 
     :cond_1
-    iget-object v2, p0, Lcom/google/gson/internal/a/m;->aYw:Ljava/lang/reflect/Type;
+    iget-object v2, p0, Lcom/google/gson/internal/a/m;->aYO:Ljava/lang/reflect/Type;
 
     if-eq v1, v2, :cond_2
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aYv:Lcom/google/gson/Gson;
+    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aYN:Lcom/google/gson/Gson;
 
     invoke-static {v1}, Lcom/google/gson/reflect/TypeToken;->h(Ljava/lang/reflect/Type;)Lcom/google/gson/reflect/TypeToken;
 
@@ -140,7 +140,7 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/m;->aWI:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/m;->aXa:Lcom/google/gson/TypeAdapter;
 
     instance-of v2, v1, Lcom/google/gson/internal/a/i$a;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/n$19$1.smali b/com.discord/smali_classes2/com/google/gson/internal/a/n$19$1.smali
index b6f9513510..6444aa675b 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/n$19$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/n$19$1.smali
@@ -23,18 +23,18 @@
 
 
 # instance fields
-.field final synthetic aZx:Lcom/google/gson/TypeAdapter;
+.field final synthetic aZP:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aZy:Lcom/google/gson/internal/a/n$19;
+.field final synthetic aZQ:Lcom/google/gson/internal/a/n$19;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/a/n$19;Lcom/google/gson/TypeAdapter;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/n$19$1;->aZy:Lcom/google/gson/internal/a/n$19;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$19$1;->aZQ:Lcom/google/gson/internal/a/n$19;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$19$1;->aZx:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$19$1;->aZP:Lcom/google/gson/TypeAdapter;
 
     invoke-direct {p0}, Lcom/google/gson/TypeAdapter;-><init>()V
 
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/n$19$1;->aZx:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$19$1;->aZP:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
@@ -87,7 +87,7 @@
 
     check-cast p2, Ljava/sql/Timestamp;
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/n$19$1;->aZx:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$19$1;->aZP:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/gson/TypeAdapter;->write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/n$19.smali b/com.discord/smali_classes2/com/google/gson/internal/a/n$19.smali
index e9d73c4f15..fccda43a0e 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/n$19.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/n$19.smali
@@ -43,7 +43,7 @@
         }
     .end annotation
 
-    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     const-class v0, Ljava/sql/Timestamp;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/n$22.smali b/com.discord/smali_classes2/com/google/gson/internal/a/n$22.smali
index 2d2a830cc9..1c9b60747a 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/n$22.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/n$22.smali
@@ -52,7 +52,7 @@
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {p2}, Lcom/google/gson/JsonElement;->BO()Lcom/google/gson/m;
+    invoke-virtual {p2}, Lcom/google/gson/JsonElement;->BD()Lcom/google/gson/m;
 
     move-result-object p2
 
@@ -62,7 +62,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p2}, Lcom/google/gson/m;->BL()Ljava/lang/Number;
+    invoke-virtual {p2}, Lcom/google/gson/m;->BA()Ljava/lang/Number;
 
     move-result-object p2
 
@@ -86,7 +86,7 @@
     return-void
 
     :cond_2
-    invoke-virtual {p2}, Lcom/google/gson/m;->BM()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/gson/m;->BB()Ljava/lang/String;
 
     move-result-object p2
 
@@ -159,7 +159,7 @@
 
     check-cast p2, Lcom/google/gson/JsonObject;
 
-    iget-object p2, p2, Lcom/google/gson/JsonObject;->aWV:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p2, p2, Lcom/google/gson/JsonObject;->aXn:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-virtual {p2}, Lcom/google/gson/internal/LinkedTreeMap;->entrySet()Ljava/util/Set;
 
@@ -341,7 +341,7 @@
     :pswitch_2
     invoke-virtual {p1}, Lcom/google/gson/stream/JsonReader;->nextNull()V
 
-    sget-object p1, Lcom/google/gson/k;->aWU:Lcom/google/gson/k;
+    sget-object p1, Lcom/google/gson/k;->aXm:Lcom/google/gson/k;
 
     return-object p1
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/n$24.smali b/com.discord/smali_classes2/com/google/gson/internal/a/n$24.smali
index 962ce2c7ed..287126d1c5 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/n$24.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/n$24.smali
@@ -43,7 +43,7 @@
         }
     .end annotation
 
-    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     const-class p2, Ljava/lang/Enum;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/n$25.smali b/com.discord/smali_classes2/com/google/gson/internal/a/n$25.smali
index 2a988b406e..5211edf006 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/n$25.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/n$25.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic aYd:Lcom/google/gson/TypeAdapter;
+.field final synthetic aYv:Lcom/google/gson/TypeAdapter;
 
 .field final synthetic val$type:Ljava/lang/Class;
 
@@ -29,7 +29,7 @@
 
     iput-object p1, p0, Lcom/google/gson/internal/a/n$25;->val$type:Ljava/lang/Class;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$25;->aYd:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$25;->aYv:Lcom/google/gson/TypeAdapter;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,13 +53,13 @@
         }
     .end annotation
 
-    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     iget-object p2, p0, Lcom/google/gson/internal/a/n$25;->val$type:Ljava/lang/Class;
 
     if-ne p1, p2, :cond_0
 
-    iget-object p1, p0, Lcom/google/gson/internal/a/n$25;->aYd:Lcom/google/gson/TypeAdapter;
+    iget-object p1, p0, Lcom/google/gson/internal/a/n$25;->aYv:Lcom/google/gson/TypeAdapter;
 
     return-object p1
 
@@ -90,7 +90,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/n$25;->aYd:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$25;->aYv:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/n$26.smali b/com.discord/smali_classes2/com/google/gson/internal/a/n$26.smali
index 915f222476..f8ce8a3b0b 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/n$26.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/n$26.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic aYd:Lcom/google/gson/TypeAdapter;
+.field final synthetic aYv:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aZA:Ljava/lang/Class;
+.field final synthetic aZR:Ljava/lang/Class;
 
-.field final synthetic aZz:Ljava/lang/Class;
+.field final synthetic aZS:Ljava/lang/Class;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/Class;Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/n$26;->aZz:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$26;->aZR:Ljava/lang/Class;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$26;->aZA:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$26;->aZS:Ljava/lang/Class;
 
-    iput-object p3, p0, Lcom/google/gson/internal/a/n$26;->aYd:Lcom/google/gson/TypeAdapter;
+    iput-object p3, p0, Lcom/google/gson/internal/a/n$26;->aYv:Lcom/google/gson/TypeAdapter;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,13 +57,13 @@
         }
     .end annotation
 
-    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$26;->aZz:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$26;->aZR:Ljava/lang/Class;
 
     if-eq p1, p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$26;->aZA:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$26;->aZS:Ljava/lang/Class;
 
     if-ne p1, p2, :cond_0
 
@@ -76,7 +76,7 @@
 
     :cond_1
     :goto_0
-    iget-object p1, p0, Lcom/google/gson/internal/a/n$26;->aYd:Lcom/google/gson/TypeAdapter;
+    iget-object p1, p0, Lcom/google/gson/internal/a/n$26;->aYv:Lcom/google/gson/TypeAdapter;
 
     return-object p1
 .end method
@@ -90,7 +90,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/n$26;->aZA:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$26;->aZS:Ljava/lang/Class;
 
     invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
@@ -102,7 +102,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/n$26;->aZz:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$26;->aZR:Ljava/lang/Class;
 
     invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
@@ -114,7 +114,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/n$26;->aYd:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$26;->aYv:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/n$27.smali b/com.discord/smali_classes2/com/google/gson/internal/a/n$27.smali
index 7f0f28c018..75d7713edc 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/n$27.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/n$27.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic aYd:Lcom/google/gson/TypeAdapter;
+.field final synthetic aYv:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aZB:Ljava/lang/Class;
+.field final synthetic aZT:Ljava/lang/Class;
 
-.field final synthetic aZC:Ljava/lang/Class;
+.field final synthetic aZU:Ljava/lang/Class;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/Class;Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/n$27;->aZB:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$27;->aZT:Ljava/lang/Class;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$27;->aZC:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$27;->aZU:Ljava/lang/Class;
 
-    iput-object p3, p0, Lcom/google/gson/internal/a/n$27;->aYd:Lcom/google/gson/TypeAdapter;
+    iput-object p3, p0, Lcom/google/gson/internal/a/n$27;->aYv:Lcom/google/gson/TypeAdapter;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,13 +57,13 @@
         }
     .end annotation
 
-    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$27;->aZB:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$27;->aZT:Ljava/lang/Class;
 
     if-eq p1, p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$27;->aZC:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$27;->aZU:Ljava/lang/Class;
 
     if-ne p1, p2, :cond_0
 
@@ -76,7 +76,7 @@
 
     :cond_1
     :goto_0
-    iget-object p1, p0, Lcom/google/gson/internal/a/n$27;->aYd:Lcom/google/gson/TypeAdapter;
+    iget-object p1, p0, Lcom/google/gson/internal/a/n$27;->aYv:Lcom/google/gson/TypeAdapter;
 
     return-object p1
 .end method
@@ -90,7 +90,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/n$27;->aZB:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$27;->aZT:Ljava/lang/Class;
 
     invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
@@ -102,7 +102,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/n$27;->aZC:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$27;->aZU:Ljava/lang/Class;
 
     invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
@@ -114,7 +114,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/n$27;->aYd:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$27;->aYv:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/n$28$1.smali b/com.discord/smali_classes2/com/google/gson/internal/a/n$28$1.smali
index cb10086a93..f1c6310878 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/n$28$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/n$28$1.smali
@@ -22,18 +22,18 @@
 
 
 # instance fields
-.field final synthetic aZE:Ljava/lang/Class;
+.field final synthetic aZW:Ljava/lang/Class;
 
-.field final synthetic aZF:Lcom/google/gson/internal/a/n$28;
+.field final synthetic aZX:Lcom/google/gson/internal/a/n$28;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/a/n$28;Ljava/lang/Class;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/n$28$1;->aZF:Lcom/google/gson/internal/a/n$28;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$28$1;->aZX:Lcom/google/gson/internal/a/n$28;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$28$1;->aZE:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$28$1;->aZW:Ljava/lang/Class;
 
     invoke-direct {p0}, Lcom/google/gson/TypeAdapter;-><init>()V
 
@@ -58,9 +58,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/n$28$1;->aZF:Lcom/google/gson/internal/a/n$28;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$28$1;->aZX:Lcom/google/gson/internal/a/n$28;
 
-    iget-object v0, v0, Lcom/google/gson/internal/a/n$28;->aYd:Lcom/google/gson/TypeAdapter;
+    iget-object v0, v0, Lcom/google/gson/internal/a/n$28;->aYv:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, p1}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
@@ -68,7 +68,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/n$28$1;->aZE:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$28$1;->aZW:Ljava/lang/Class;
 
     invoke-virtual {v0, p1}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
 
@@ -87,7 +87,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/n$28$1;->aZE:Ljava/lang/Class;
+    iget-object v2, p0, Lcom/google/gson/internal/a/n$28$1;->aZW:Ljava/lang/Class;
 
     invoke-virtual {v2}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
@@ -138,9 +138,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/n$28$1;->aZF:Lcom/google/gson/internal/a/n$28;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$28$1;->aZX:Lcom/google/gson/internal/a/n$28;
 
-    iget-object v0, v0, Lcom/google/gson/internal/a/n$28;->aYd:Lcom/google/gson/TypeAdapter;
+    iget-object v0, v0, Lcom/google/gson/internal/a/n$28;->aYv:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/gson/TypeAdapter;->write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/n$28.smali b/com.discord/smali_classes2/com/google/gson/internal/a/n$28.smali
index 2a93641efd..1148dc5d45 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/n$28.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/n$28.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic aYd:Lcom/google/gson/TypeAdapter;
+.field final synthetic aYv:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aZD:Ljava/lang/Class;
+.field final synthetic aZV:Ljava/lang/Class;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/n$28;->aZD:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$28;->aZV:Ljava/lang/Class;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$28;->aYd:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$28;->aYv:Lcom/google/gson/TypeAdapter;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,9 +53,9 @@
         }
     .end annotation
 
-    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$28;->aZD:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$28;->aZV:Ljava/lang/Class;
 
     invoke-virtual {p2, p1}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
@@ -84,7 +84,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/n$28;->aZD:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$28;->aZV:Ljava/lang/Class;
 
     invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
@@ -96,7 +96,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/n$28;->aYd:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$28;->aYv:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/n$a.smali b/com.discord/smali_classes2/com/google/gson/internal/a/n$a.smali
index c35d9c9f81..dc1dfb10bd 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/n$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/n$a.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final aZG:Ljava/util/Map;
+.field private final aZY:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final aZH:Ljava/util/Map;
+.field private final aZZ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -64,13 +64,13 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/n$a;->aZG:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/gson/internal/a/n$a;->aZY:Ljava/util/Map;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/n$a;->aZH:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/gson/internal/a/n$a;->aZZ:Ljava/util/Map;
 
     :try_start_0
     invoke-virtual {p1}, Ljava/lang/Class;->getEnumConstants()[Ljava/lang/Object;
@@ -112,7 +112,7 @@
 
     move-result-object v5
 
-    invoke-interface {v6}, Lcom/google/gson/a/c;->BS()[Ljava/lang/String;
+    invoke-interface {v6}, Lcom/google/gson/a/c;->BH()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -125,7 +125,7 @@
 
     aget-object v9, v6, v8
 
-    iget-object v10, p0, Lcom/google/gson/internal/a/n$a;->aZG:Ljava/util/Map;
+    iget-object v10, p0, Lcom/google/gson/internal/a/n$a;->aZY:Ljava/util/Map;
 
     invoke-interface {v10, v9, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -134,11 +134,11 @@
     goto :goto_1
 
     :cond_0
-    iget-object v6, p0, Lcom/google/gson/internal/a/n$a;->aZG:Ljava/util/Map;
+    iget-object v6, p0, Lcom/google/gson/internal/a/n$a;->aZY:Ljava/util/Map;
 
     invoke-interface {v6, v5, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v6, p0, Lcom/google/gson/internal/a/n$a;->aZH:Ljava/util/Map;
+    iget-object v6, p0, Lcom/google/gson/internal/a/n$a;->aZZ:Ljava/util/Map;
 
     invoke-interface {v6, v4, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
@@ -192,7 +192,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/n$a;->aZG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$a;->aZY:Ljava/util/Map;
 
     invoke-virtual {p1}, Lcom/google/gson/stream/JsonReader;->nextString()Ljava/lang/String;
 
@@ -224,7 +224,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/n$a;->aZH:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$a;->aZZ:Ljava/util/Map;
 
     invoke-interface {v0, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/a/n.smali b/com.discord/smali_classes2/com/google/gson/internal/a/n.smali
index a19f7cb2ac..7d446a9f3a 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/a/n.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/a/n.smali
@@ -12,187 +12,7 @@
 
 
 # static fields
-.field public static final aYA:Lcom/google/gson/r;
-
-.field public static final aYB:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYC:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYD:Lcom/google/gson/r;
-
-.field public static final aYE:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYF:Lcom/google/gson/r;
-
-.field public static final aYG:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYH:Lcom/google/gson/r;
-
-.field public static final aYI:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYJ:Lcom/google/gson/r;
-
-.field public static final aYK:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/concurrent/atomic/AtomicInteger;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYL:Lcom/google/gson/r;
-
-.field public static final aYM:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/concurrent/atomic/AtomicBoolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYN:Lcom/google/gson/r;
-
-.field public static final aYO:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/concurrent/atomic/AtomicIntegerArray;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYP:Lcom/google/gson/r;
-
-.field public static final aYQ:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYR:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYS:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYT:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYU:Lcom/google/gson/r;
-
-.field public static final aYV:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Character;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYW:Lcom/google/gson/r;
-
-.field public static final aYX:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYY:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/math/BigDecimal;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYZ:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/math/BigInteger;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aYx:Lcom/google/gson/TypeAdapter;
+.field public static final aYP:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -202,9 +22,9 @@
     .end annotation
 .end field
 
-.field public static final aYy:Lcom/google/gson/r;
+.field public static final aYQ:Lcom/google/gson/r;
 
-.field public static final aYz:Lcom/google/gson/TypeAdapter;
+.field public static final aYR:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -214,57 +34,57 @@
     .end annotation
 .end field
 
-.field public static final aZa:Lcom/google/gson/r;
+.field public static final aYS:Lcom/google/gson/r;
 
-.field public static final aZb:Lcom/google/gson/TypeAdapter;
+.field public static final aYT:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/StringBuilder;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aZc:Lcom/google/gson/r;
-
-.field public static final aZd:Lcom/google/gson/TypeAdapter;
+.field public static final aYU:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/StringBuffer;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aZe:Lcom/google/gson/r;
+.field public static final aYV:Lcom/google/gson/r;
 
-.field public static final aZf:Lcom/google/gson/TypeAdapter;
+.field public static final aYW:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/net/URL;",
+            "Ljava/lang/Number;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aZg:Lcom/google/gson/r;
+.field public static final aYX:Lcom/google/gson/r;
 
-.field public static final aZh:Lcom/google/gson/TypeAdapter;
+.field public static final aYY:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/net/URI;",
+            "Ljava/lang/Number;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aZi:Lcom/google/gson/r;
+.field public static final aYZ:Lcom/google/gson/r;
 
-.field public static final aZj:Lcom/google/gson/TypeAdapter;
+.field public static final aZA:Lcom/google/gson/r;
+
+.field public static final aZB:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -274,13 +94,155 @@
     .end annotation
 .end field
 
-.field public static final aZk:Lcom/google/gson/r;
+.field public static final aZC:Lcom/google/gson/r;
+
+.field public static final aZD:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/util/UUID;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final aZE:Lcom/google/gson/r;
+
+.field public static final aZF:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/util/Currency;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final aZG:Lcom/google/gson/r;
+
+.field public static final aZH:Lcom/google/gson/r;
+
+.field public static final aZI:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/util/Calendar;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final aZJ:Lcom/google/gson/r;
+
+.field public static final aZK:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/util/Locale;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final aZL:Lcom/google/gson/r;
+
+.field public static final aZM:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Lcom/google/gson/JsonElement;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final aZN:Lcom/google/gson/r;
+
+.field public static final aZO:Lcom/google/gson/r;
+
+.field public static final aZa:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/lang/Number;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final aZb:Lcom/google/gson/r;
+
+.field public static final aZc:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/util/concurrent/atomic/AtomicInteger;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final aZd:Lcom/google/gson/r;
+
+.field public static final aZe:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/util/concurrent/atomic/AtomicBoolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final aZf:Lcom/google/gson/r;
+
+.field public static final aZg:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/util/concurrent/atomic/AtomicIntegerArray;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final aZh:Lcom/google/gson/r;
+
+.field public static final aZi:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/lang/Number;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final aZj:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/lang/Number;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final aZk:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/lang/Number;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field public static final aZl:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/UUID;",
+            "Ljava/lang/Number;",
             ">;"
         }
     .end annotation
@@ -292,7 +254,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/Currency;",
+            "Ljava/lang/Character;",
             ">;"
         }
     .end annotation
@@ -300,46 +262,84 @@
 
 .field public static final aZo:Lcom/google/gson/r;
 
-.field public static final aZp:Lcom/google/gson/r;
+.field public static final aZp:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field public static final aZq:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/Calendar;",
+            "Ljava/math/BigDecimal;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aZr:Lcom/google/gson/r;
-
-.field public static final aZs:Lcom/google/gson/TypeAdapter;
+.field public static final aZr:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/Locale;",
+            "Ljava/math/BigInteger;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aZt:Lcom/google/gson/r;
+.field public static final aZs:Lcom/google/gson/r;
 
-.field public static final aZu:Lcom/google/gson/TypeAdapter;
+.field public static final aZt:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Lcom/google/gson/JsonElement;",
+            "Ljava/lang/StringBuilder;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aZv:Lcom/google/gson/r;
+.field public static final aZu:Lcom/google/gson/r;
+
+.field public static final aZv:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/lang/StringBuffer;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field public static final aZw:Lcom/google/gson/r;
 
+.field public static final aZx:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/net/URL;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final aZy:Lcom/google/gson/r;
+
+.field public static final aZz:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/net/URI;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -353,17 +353,17 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYx:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aYP:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/lang/Class;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aYx:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aYP:Lcom/google/gson/TypeAdapter;
 
     invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYy:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aYQ:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$12;
 
@@ -373,95 +373,95 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYz:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aYR:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/BitSet;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aYz:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aYR:Lcom/google/gson/TypeAdapter;
 
     invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYA:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aYS:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$23;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$23;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYB:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aYT:Lcom/google/gson/TypeAdapter;
 
     new-instance v0, Lcom/google/gson/internal/a/n$30;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$30;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYC:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aYU:Lcom/google/gson/TypeAdapter;
 
     sget-object v0, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
 
     const-class v1, Ljava/lang/Boolean;
 
-    sget-object v2, Lcom/google/gson/internal/a/n;->aYB:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aYT:Lcom/google/gson/TypeAdapter;
 
     invoke-static {v0, v1, v2}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYD:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aYV:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$31;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$31;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYE:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aYW:Lcom/google/gson/TypeAdapter;
 
     sget-object v0, Ljava/lang/Byte;->TYPE:Ljava/lang/Class;
 
     const-class v1, Ljava/lang/Byte;
 
-    sget-object v2, Lcom/google/gson/internal/a/n;->aYE:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aYW:Lcom/google/gson/TypeAdapter;
 
     invoke-static {v0, v1, v2}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYF:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aYX:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$32;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$32;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYG:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aYY:Lcom/google/gson/TypeAdapter;
 
     sget-object v0, Ljava/lang/Short;->TYPE:Ljava/lang/Class;
 
     const-class v1, Ljava/lang/Short;
 
-    sget-object v2, Lcom/google/gson/internal/a/n;->aYG:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aYY:Lcom/google/gson/TypeAdapter;
 
     invoke-static {v0, v1, v2}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYH:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aYZ:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$33;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$33;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYI:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZa:Lcom/google/gson/TypeAdapter;
 
     sget-object v0, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
 
     const-class v1, Ljava/lang/Integer;
 
-    sget-object v2, Lcom/google/gson/internal/a/n;->aYI:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aZa:Lcom/google/gson/TypeAdapter;
 
     invoke-static {v0, v1, v2}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYJ:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZb:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$34;
 
@@ -471,17 +471,17 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYK:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZc:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/concurrent/atomic/AtomicInteger;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aYK:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZc:Lcom/google/gson/TypeAdapter;
 
     invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYL:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZd:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$35;
 
@@ -491,17 +491,17 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYM:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZe:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aYM:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZe:Lcom/google/gson/TypeAdapter;
 
     invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYN:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZf:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$2;
 
@@ -511,185 +511,43 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYO:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZg:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/concurrent/atomic/AtomicIntegerArray;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aYO:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZg:Lcom/google/gson/TypeAdapter;
 
     invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYP:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZh:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$3;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$3;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYQ:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZi:Lcom/google/gson/TypeAdapter;
 
     new-instance v0, Lcom/google/gson/internal/a/n$4;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$4;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYR:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZj:Lcom/google/gson/TypeAdapter;
 
     new-instance v0, Lcom/google/gson/internal/a/n$5;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$5;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYS:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZk:Lcom/google/gson/TypeAdapter;
 
     new-instance v0, Lcom/google/gson/internal/a/n$6;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$6;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYT:Lcom/google/gson/TypeAdapter;
-
-    const-class v0, Ljava/lang/Number;
-
-    sget-object v1, Lcom/google/gson/internal/a/n;->aYT:Lcom/google/gson/TypeAdapter;
-
-    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYU:Lcom/google/gson/r;
-
-    new-instance v0, Lcom/google/gson/internal/a/n$7;
-
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$7;-><init>()V
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYV:Lcom/google/gson/TypeAdapter;
-
-    sget-object v0, Ljava/lang/Character;->TYPE:Ljava/lang/Class;
-
-    const-class v1, Ljava/lang/Character;
-
-    sget-object v2, Lcom/google/gson/internal/a/n;->aYV:Lcom/google/gson/TypeAdapter;
-
-    invoke-static {v0, v1, v2}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYW:Lcom/google/gson/r;
-
-    new-instance v0, Lcom/google/gson/internal/a/n$8;
-
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$8;-><init>()V
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYX:Lcom/google/gson/TypeAdapter;
-
-    new-instance v0, Lcom/google/gson/internal/a/n$9;
-
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$9;-><init>()V
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYY:Lcom/google/gson/TypeAdapter;
-
-    new-instance v0, Lcom/google/gson/internal/a/n$10;
-
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$10;-><init>()V
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aYZ:Lcom/google/gson/TypeAdapter;
-
-    const-class v0, Ljava/lang/String;
-
-    sget-object v1, Lcom/google/gson/internal/a/n;->aYX:Lcom/google/gson/TypeAdapter;
-
-    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZa:Lcom/google/gson/r;
-
-    new-instance v0, Lcom/google/gson/internal/a/n$11;
-
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$11;-><init>()V
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZb:Lcom/google/gson/TypeAdapter;
-
-    const-class v0, Ljava/lang/StringBuilder;
-
-    sget-object v1, Lcom/google/gson/internal/a/n;->aZb:Lcom/google/gson/TypeAdapter;
-
-    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZc:Lcom/google/gson/r;
-
-    new-instance v0, Lcom/google/gson/internal/a/n$13;
-
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$13;-><init>()V
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZd:Lcom/google/gson/TypeAdapter;
-
-    const-class v0, Ljava/lang/StringBuffer;
-
-    sget-object v1, Lcom/google/gson/internal/a/n;->aZd:Lcom/google/gson/TypeAdapter;
-
-    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZe:Lcom/google/gson/r;
-
-    new-instance v0, Lcom/google/gson/internal/a/n$14;
-
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$14;-><init>()V
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZf:Lcom/google/gson/TypeAdapter;
-
-    const-class v0, Ljava/net/URL;
-
-    sget-object v1, Lcom/google/gson/internal/a/n;->aZf:Lcom/google/gson/TypeAdapter;
-
-    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZg:Lcom/google/gson/r;
-
-    new-instance v0, Lcom/google/gson/internal/a/n$15;
-
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$15;-><init>()V
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZh:Lcom/google/gson/TypeAdapter;
-
-    const-class v0, Ljava/net/URI;
-
-    sget-object v1, Lcom/google/gson/internal/a/n;->aZh:Lcom/google/gson/TypeAdapter;
-
-    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZi:Lcom/google/gson/r;
-
-    new-instance v0, Lcom/google/gson/internal/a/n$16;
-
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$16;-><init>()V
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZj:Lcom/google/gson/TypeAdapter;
-
-    const-class v0, Ljava/net/InetAddress;
-
-    sget-object v1, Lcom/google/gson/internal/a/n;->aZj:Lcom/google/gson/TypeAdapter;
-
-    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->b(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZk:Lcom/google/gson/r;
-
-    new-instance v0, Lcom/google/gson/internal/a/n$17;
-
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$17;-><init>()V
-
     sput-object v0, Lcom/google/gson/internal/a/n;->aZl:Lcom/google/gson/TypeAdapter;
 
-    const-class v0, Ljava/util/UUID;
+    const-class v0, Ljava/lang/Number;
 
     sget-object v1, Lcom/google/gson/internal/a/n;->aZl:Lcom/google/gson/TypeAdapter;
 
@@ -699,6 +557,148 @@
 
     sput-object v0, Lcom/google/gson/internal/a/n;->aZm:Lcom/google/gson/r;
 
+    new-instance v0, Lcom/google/gson/internal/a/n$7;
+
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$7;-><init>()V
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZn:Lcom/google/gson/TypeAdapter;
+
+    sget-object v0, Ljava/lang/Character;->TYPE:Ljava/lang/Class;
+
+    const-class v1, Ljava/lang/Character;
+
+    sget-object v2, Lcom/google/gson/internal/a/n;->aZn:Lcom/google/gson/TypeAdapter;
+
+    invoke-static {v0, v1, v2}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZo:Lcom/google/gson/r;
+
+    new-instance v0, Lcom/google/gson/internal/a/n$8;
+
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$8;-><init>()V
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZp:Lcom/google/gson/TypeAdapter;
+
+    new-instance v0, Lcom/google/gson/internal/a/n$9;
+
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$9;-><init>()V
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZq:Lcom/google/gson/TypeAdapter;
+
+    new-instance v0, Lcom/google/gson/internal/a/n$10;
+
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$10;-><init>()V
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZr:Lcom/google/gson/TypeAdapter;
+
+    const-class v0, Ljava/lang/String;
+
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZp:Lcom/google/gson/TypeAdapter;
+
+    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZs:Lcom/google/gson/r;
+
+    new-instance v0, Lcom/google/gson/internal/a/n$11;
+
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$11;-><init>()V
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZt:Lcom/google/gson/TypeAdapter;
+
+    const-class v0, Ljava/lang/StringBuilder;
+
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZt:Lcom/google/gson/TypeAdapter;
+
+    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZu:Lcom/google/gson/r;
+
+    new-instance v0, Lcom/google/gson/internal/a/n$13;
+
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$13;-><init>()V
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZv:Lcom/google/gson/TypeAdapter;
+
+    const-class v0, Ljava/lang/StringBuffer;
+
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZv:Lcom/google/gson/TypeAdapter;
+
+    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZw:Lcom/google/gson/r;
+
+    new-instance v0, Lcom/google/gson/internal/a/n$14;
+
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$14;-><init>()V
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZx:Lcom/google/gson/TypeAdapter;
+
+    const-class v0, Ljava/net/URL;
+
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZx:Lcom/google/gson/TypeAdapter;
+
+    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZy:Lcom/google/gson/r;
+
+    new-instance v0, Lcom/google/gson/internal/a/n$15;
+
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$15;-><init>()V
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZz:Lcom/google/gson/TypeAdapter;
+
+    const-class v0, Ljava/net/URI;
+
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZz:Lcom/google/gson/TypeAdapter;
+
+    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZA:Lcom/google/gson/r;
+
+    new-instance v0, Lcom/google/gson/internal/a/n$16;
+
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$16;-><init>()V
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZB:Lcom/google/gson/TypeAdapter;
+
+    const-class v0, Ljava/net/InetAddress;
+
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZB:Lcom/google/gson/TypeAdapter;
+
+    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->b(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZC:Lcom/google/gson/r;
+
+    new-instance v0, Lcom/google/gson/internal/a/n$17;
+
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$17;-><init>()V
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZD:Lcom/google/gson/TypeAdapter;
+
+    const-class v0, Ljava/util/UUID;
+
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZD:Lcom/google/gson/TypeAdapter;
+
+    invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZE:Lcom/google/gson/r;
+
     new-instance v0, Lcom/google/gson/internal/a/n$18;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$18;-><init>()V
@@ -707,79 +707,79 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZn:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZF:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/Currency;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aZn:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZF:Lcom/google/gson/TypeAdapter;
 
     invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZo:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZG:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$19;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$19;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZp:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZH:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$20;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$20;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZq:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZI:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/Calendar;
 
     const-class v1, Ljava/util/GregorianCalendar;
 
-    sget-object v2, Lcom/google/gson/internal/a/n;->aZq:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aZI:Lcom/google/gson/TypeAdapter;
 
     new-instance v3, Lcom/google/gson/internal/a/n$27;
 
     invoke-direct {v3, v0, v1, v2}, Lcom/google/gson/internal/a/n$27;-><init>(Ljava/lang/Class;Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)V
 
-    sput-object v3, Lcom/google/gson/internal/a/n;->aZr:Lcom/google/gson/r;
+    sput-object v3, Lcom/google/gson/internal/a/n;->aZJ:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$21;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$21;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZs:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZK:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/Locale;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aZs:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZK:Lcom/google/gson/TypeAdapter;
 
     invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->a(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZt:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZL:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$22;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$22;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZu:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZM:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Lcom/google/gson/JsonElement;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aZu:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZM:Lcom/google/gson/TypeAdapter;
 
     invoke-static {v0, v1}, Lcom/google/gson/internal/a/n;->b(Ljava/lang/Class;Lcom/google/gson/TypeAdapter;)Lcom/google/gson/r;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZv:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZN:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$24;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$24;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aZw:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aZO:Lcom/google/gson/r;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/gson/internal/b$c.smali b/com.discord/smali_classes2/com/google/gson/internal/b$c.smali
index f44d5f1108..e3b62c81f1 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/b$c.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/b$c.smali
@@ -175,7 +175,7 @@
     return-object v1
 
     :cond_0
-    sget-object v0, Lcom/google/gson/internal/b;->aXb:[Ljava/lang/reflect/Type;
+    sget-object v0, Lcom/google/gson/internal/b;->aXt:[Ljava/lang/reflect/Type;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/gson/internal/b.smali b/com.discord/smali_classes2/com/google/gson/internal/b.smali
index 9762e02670..b63b462850 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/b.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/b.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field static final aXb:[Ljava/lang/reflect/Type;
+.field static final aXt:[Ljava/lang/reflect/Type;
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     new-array v0, v0, [Ljava/lang/reflect/Type;
 
-    sput-object v0, Lcom/google/gson/internal/b;->aXb:[Ljava/lang/reflect/Type;
+    sput-object v0, Lcom/google/gson/internal/b;->aXt:[Ljava/lang/reflect/Type;
 
     return-void
 .end method
@@ -598,7 +598,7 @@
     :goto_6
     new-instance p1, Lcom/google/gson/internal/b$c;
 
-    sget-object p2, Lcom/google/gson/internal/b;->aXb:[Ljava/lang/reflect/Type;
+    sget-object p2, Lcom/google/gson/internal/b;->aXt:[Ljava/lang/reflect/Type;
 
     invoke-direct {p1, p0, p2}, Lcom/google/gson/internal/b$c;-><init>([Ljava/lang/reflect/Type;[Ljava/lang/reflect/Type;)V
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$1.smali b/com.discord/smali_classes2/com/google/gson/internal/c$1.smali
index 7684f77a43..8cb64b7770 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$1.smali
@@ -26,22 +26,22 @@
 
 
 # instance fields
-.field final synthetic aXc:Lcom/google/gson/g;
+.field final synthetic aXu:Lcom/google/gson/g;
 
-.field final synthetic aXd:Ljava/lang/reflect/Type;
+.field final synthetic aXv:Ljava/lang/reflect/Type;
 
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/c;Lcom/google/gson/g;Ljava/lang/reflect/Type;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$1;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$1;->aXw:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/c$1;->aXc:Lcom/google/gson/g;
+    iput-object p2, p0, Lcom/google/gson/internal/c$1;->aXu:Lcom/google/gson/g;
 
-    iput-object p3, p0, Lcom/google/gson/internal/c$1;->aXd:Ljava/lang/reflect/Type;
+    iput-object p3, p0, Lcom/google/gson/internal/c$1;->aXv:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +50,7 @@
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -58,9 +58,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/c$1;->aXc:Lcom/google/gson/g;
+    iget-object v0, p0, Lcom/google/gson/internal/c$1;->aXu:Lcom/google/gson/g;
 
-    invoke-interface {v0}, Lcom/google/gson/g;->BK()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/g;->Bz()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$10.smali b/com.discord/smali_classes2/com/google/gson/internal/c$10.smali
index 6c8f9ed179..12436cff84 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$10.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$10.smali
@@ -26,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic aXd:Ljava/lang/reflect/Type;
+.field final synthetic aXv:Ljava/lang/reflect/Type;
 
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/c;Ljava/lang/reflect/Type;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$10;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$10;->aXw:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/c$10;->aXd:Ljava/lang/reflect/Type;
+    iput-object p2, p0, Lcom/google/gson/internal/c$10;->aXv:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +46,7 @@
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -54,7 +54,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/c$10;->aXd:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/internal/c$10;->aXv:Ljava/lang/reflect/Type;
 
     instance-of v1, v0, Ljava/lang/reflect/ParameterizedType;
 
@@ -91,7 +91,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/google/gson/internal/c$10;->aXd:Ljava/lang/reflect/Type;
+    iget-object v2, p0, Lcom/google/gson/internal/c$10;->aXv:Ljava/lang/reflect/Type;
 
     invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
@@ -114,7 +114,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/google/gson/internal/c$10;->aXd:Ljava/lang/reflect/Type;
+    iget-object v2, p0, Lcom/google/gson/internal/c$10;->aXv:Ljava/lang/reflect/Type;
 
     invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$11.smali b/com.discord/smali_classes2/com/google/gson/internal/c$11.smali
index 290741259c..c55df9df4e 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$11.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$11.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$11;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$11;->aXw:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$12.smali b/com.discord/smali_classes2/com/google/gson/internal/c$12.smali
index 22263d8199..1ddb92feb8 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$12.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$12.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$12;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$12;->aXw:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$13.smali b/com.discord/smali_classes2/com/google/gson/internal/c$13.smali
index 2a91881097..9f07379048 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$13.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$13.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$13;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$13;->aXw:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$14.smali b/com.discord/smali_classes2/com/google/gson/internal/c$14.smali
index 60ace551cf..f3c741e24d 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$14.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$14.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$14;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$14;->aXw:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$2.smali b/com.discord/smali_classes2/com/google/gson/internal/c$2.smali
index 319e42ba30..ab2b782dec 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$2.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$2.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$2;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$2;->aXw:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$3.smali b/com.discord/smali_classes2/com/google/gson/internal/c$3.smali
index 879f96287e..a5b33b1290 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$3.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$3.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$3;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$3;->aXw:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$4.smali b/com.discord/smali_classes2/com/google/gson/internal/c$4.smali
index 811997d81c..0013e02ca5 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$4.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$4.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$4;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$4;->aXw:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$5.smali b/com.discord/smali_classes2/com/google/gson/internal/c$5.smali
index 3f8cf9bf83..36b13d4943 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$5.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$5.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$5;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$5;->aXw:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$6.smali b/com.discord/smali_classes2/com/google/gson/internal/c$6.smali
index 0b5637bbea..bb8ca40c0c 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$6.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$6.smali
@@ -26,39 +26,39 @@
 
 
 # instance fields
-.field final synthetic aXd:Ljava/lang/reflect/Type;
+.field final synthetic aXv:Ljava/lang/reflect/Type;
 
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
-.field private final aXf:Lcom/google/gson/internal/j;
+.field private final aXx:Lcom/google/gson/internal/j;
 
-.field final synthetic aXg:Ljava/lang/Class;
+.field final synthetic aXy:Ljava/lang/Class;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/c;Ljava/lang/Class;Ljava/lang/reflect/Type;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$6;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$6;->aXw:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/c$6;->aXg:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/google/gson/internal/c$6;->aXy:Ljava/lang/Class;
 
-    iput-object p3, p0, Lcom/google/gson/internal/c$6;->aXd:Ljava/lang/reflect/Type;
+    iput-object p3, p0, Lcom/google/gson/internal/c$6;->aXv:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/google/gson/internal/j;->BY()Lcom/google/gson/internal/j;
+    invoke-static {}, Lcom/google/gson/internal/j;->BN()Lcom/google/gson/internal/j;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$6;->aXf:Lcom/google/gson/internal/j;
+    iput-object p1, p0, Lcom/google/gson/internal/c$6;->aXx:Lcom/google/gson/internal/j;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -67,9 +67,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/gson/internal/c$6;->aXf:Lcom/google/gson/internal/j;
+    iget-object v0, p0, Lcom/google/gson/internal/c$6;->aXx:Lcom/google/gson/internal/j;
 
-    iget-object v1, p0, Lcom/google/gson/internal/c$6;->aXg:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/c$6;->aXy:Ljava/lang/Class;
 
     invoke-virtual {v0, v1}, Lcom/google/gson/internal/j;->newInstance(Ljava/lang/Class;)Ljava/lang/Object;
 
@@ -90,7 +90,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v3, p0, Lcom/google/gson/internal/c$6;->aXd:Ljava/lang/reflect/Type;
+    iget-object v3, p0, Lcom/google/gson/internal/c$6;->aXv:Ljava/lang/reflect/Type;
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$7.smali b/com.discord/smali_classes2/com/google/gson/internal/c$7.smali
index 680feb2774..ef9c70cce8 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$7.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$7.smali
@@ -26,22 +26,22 @@
 
 
 # instance fields
-.field final synthetic aXd:Ljava/lang/reflect/Type;
+.field final synthetic aXv:Ljava/lang/reflect/Type;
 
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
-.field final synthetic aXh:Lcom/google/gson/g;
+.field final synthetic aXz:Lcom/google/gson/g;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/c;Lcom/google/gson/g;Ljava/lang/reflect/Type;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$7;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$7;->aXw:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/c$7;->aXh:Lcom/google/gson/g;
+    iput-object p2, p0, Lcom/google/gson/internal/c$7;->aXz:Lcom/google/gson/g;
 
-    iput-object p3, p0, Lcom/google/gson/internal/c$7;->aXd:Ljava/lang/reflect/Type;
+    iput-object p3, p0, Lcom/google/gson/internal/c$7;->aXv:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +50,7 @@
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -58,9 +58,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/c$7;->aXh:Lcom/google/gson/g;
+    iget-object v0, p0, Lcom/google/gson/internal/c$7;->aXz:Lcom/google/gson/g;
 
-    invoke-interface {v0}, Lcom/google/gson/g;->BK()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/g;->Bz()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$8.smali b/com.discord/smali_classes2/com/google/gson/internal/c$8.smali
index 45b12dac88..a6408330a1 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$8.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$8.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
 .field final synthetic val$constructor:Ljava/lang/reflect/Constructor;
 
@@ -35,7 +35,7 @@
 .method constructor <init>(Lcom/google/gson/internal/c;Ljava/lang/reflect/Constructor;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$8;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$8;->aXw:Lcom/google/gson/internal/c;
 
     iput-object p2, p0, Lcom/google/gson/internal/c$8;->val$constructor:Ljava/lang/reflect/Constructor;
 
@@ -46,7 +46,7 @@
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c$9.smali b/com.discord/smali_classes2/com/google/gson/internal/c$9.smali
index c2cbefa09c..1f4e03111c 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c$9.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c$9.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic aXe:Lcom/google/gson/internal/c;
+.field final synthetic aXw:Lcom/google/gson/internal/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$9;->aXe:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$9;->aXw:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final BU()Ljava/lang/Object;
+.method public final BJ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/google/gson/internal/c.smali b/com.discord/smali_classes2/com/google/gson/internal/c.smali
index 4ef71a8c67..92b4110ad2 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/c.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/c.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final aWL:Ljava/util/Map;
+.field private final aXd:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -31,7 +31,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/gson/internal/c;->aWL:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/gson/internal/c;->aXd:Ljava/util/Map;
 
     return-void
 .end method
@@ -100,11 +100,11 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v0, p1, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
-    iget-object p1, p1, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object p1, p1, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
-    iget-object v1, p0, Lcom/google/gson/internal/c;->aWL:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/gson/internal/c;->aXd:Ljava/util/Map;
 
     invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -121,7 +121,7 @@
     return-object p1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/gson/internal/c;->aWL:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/gson/internal/c;->aXd:Ljava/util/Map;
 
     invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -297,7 +297,7 @@
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object v2, v2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     invoke-virtual {v1, v2}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
@@ -337,7 +337,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/gson/internal/c;->aWL:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/internal/c;->aXd:Ljava/util/Map;
 
     invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/d$1.smali b/com.discord/smali_classes2/com/google/gson/internal/d$1.smali
index ea7541b3b1..fdcabd8f4d 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/d$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/d$1.smali
@@ -22,7 +22,15 @@
 
 
 # instance fields
-.field private aWI:Lcom/google/gson/TypeAdapter;
+.field final synthetic aXH:Z
+
+.field final synthetic aXI:Z
+
+.field final synthetic aXJ:Lcom/google/gson/Gson;
+
+.field final synthetic aXK:Lcom/google/gson/internal/d;
+
+.field private aXa:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -31,14 +39,6 @@
     .end annotation
 .end field
 
-.field final synthetic aXp:Z
-
-.field final synthetic aXq:Z
-
-.field final synthetic aXr:Lcom/google/gson/Gson;
-
-.field final synthetic aXs:Lcom/google/gson/internal/d;
-
 .field final synthetic val$type:Lcom/google/gson/reflect/TypeToken;
 
 
@@ -46,13 +46,13 @@
 .method constructor <init>(Lcom/google/gson/internal/d;ZZLcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/d$1;->aXs:Lcom/google/gson/internal/d;
+    iput-object p1, p0, Lcom/google/gson/internal/d$1;->aXK:Lcom/google/gson/internal/d;
 
-    iput-boolean p2, p0, Lcom/google/gson/internal/d$1;->aXp:Z
+    iput-boolean p2, p0, Lcom/google/gson/internal/d$1;->aXH:Z
 
-    iput-boolean p3, p0, Lcom/google/gson/internal/d$1;->aXq:Z
+    iput-boolean p3, p0, Lcom/google/gson/internal/d$1;->aXI:Z
 
-    iput-object p4, p0, Lcom/google/gson/internal/d$1;->aXr:Lcom/google/gson/Gson;
+    iput-object p4, p0, Lcom/google/gson/internal/d$1;->aXJ:Lcom/google/gson/Gson;
 
     iput-object p5, p0, Lcom/google/gson/internal/d$1;->val$type:Lcom/google/gson/reflect/TypeToken;
 
@@ -61,7 +61,7 @@
     return-void
 .end method
 
-.method private BW()Lcom/google/gson/TypeAdapter;
+.method private BL()Lcom/google/gson/TypeAdapter;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -71,16 +71,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/d$1;->aWI:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/d$1;->aXa:Lcom/google/gson/TypeAdapter;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/d$1;->aXr:Lcom/google/gson/Gson;
+    iget-object v0, p0, Lcom/google/gson/internal/d$1;->aXJ:Lcom/google/gson/Gson;
 
-    iget-object v1, p0, Lcom/google/gson/internal/d$1;->aXs:Lcom/google/gson/internal/d;
+    iget-object v1, p0, Lcom/google/gson/internal/d$1;->aXK:Lcom/google/gson/internal/d;
 
     iget-object v2, p0, Lcom/google/gson/internal/d$1;->val$type:Lcom/google/gson/reflect/TypeToken;
 
@@ -88,7 +88,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/gson/internal/d$1;->aWI:Lcom/google/gson/TypeAdapter;
+    iput-object v0, p0, Lcom/google/gson/internal/d$1;->aXa:Lcom/google/gson/TypeAdapter;
 
     return-object v0
 .end method
@@ -111,7 +111,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/gson/internal/d$1;->aXp:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/d$1;->aXH:Z
 
     if-eqz v0, :cond_0
 
@@ -122,7 +122,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/gson/internal/d$1;->BW()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/internal/d$1;->BL()Lcom/google/gson/TypeAdapter;
 
     move-result-object v0
 
@@ -149,7 +149,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/gson/internal/d$1;->aXq:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/d$1;->aXI:Z
 
     if-eqz v0, :cond_0
 
@@ -158,7 +158,7 @@
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/gson/internal/d$1;->BW()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/internal/d$1;->BL()Lcom/google/gson/TypeAdapter;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/d.smali b/com.discord/smali_classes2/com/google/gson/internal/d.smali
index bc4019115b..b883f2bec3 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/d.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/d.smali
@@ -8,19 +8,19 @@
 
 
 # static fields
-.field public static final aXi:Lcom/google/gson/internal/d;
+.field public static final aXA:Lcom/google/gson/internal/d;
 
 
 # instance fields
-.field public aXj:D
+.field public aXB:D
 
-.field public aXk:I
+.field public aXC:I
 
-.field public aXl:Z
+.field public aXD:Z
 
-.field public aXm:Z
+.field public aXE:Z
 
-.field public aXn:Ljava/util/List;
+.field public aXF:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field public aXo:Ljava/util/List;
+.field public aXG:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -49,7 +49,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/internal/d;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/d;->aXi:Lcom/google/gson/internal/d;
+    sput-object v0, Lcom/google/gson/internal/d;->aXA:Lcom/google/gson/internal/d;
 
     return-void
 .end method
@@ -61,32 +61,32 @@
 
     const-wide/high16 v0, -0x4010000000000000L    # -1.0
 
-    iput-wide v0, p0, Lcom/google/gson/internal/d;->aXj:D
+    iput-wide v0, p0, Lcom/google/gson/internal/d;->aXB:D
 
     const/16 v0, 0x88
 
-    iput v0, p0, Lcom/google/gson/internal/d;->aXk:I
+    iput v0, p0, Lcom/google/gson/internal/d;->aXC:I
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/gson/internal/d;->aXl:Z
+    iput-boolean v0, p0, Lcom/google/gson/internal/d;->aXD:Z
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/gson/internal/d;->aXn:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/internal/d;->aXF:Ljava/util/List;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/gson/internal/d;->aXo:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/internal/d;->aXG:Ljava/util/List;
 
     return-void
 .end method
 
-.method private BV()Lcom/google/gson/internal/d;
+.method private BK()Lcom/google/gson/internal/d;
     .locals 2
 
     :try_start_0
@@ -216,11 +216,11 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p1}, Lcom/google/gson/a/d;->BT()D
+    invoke-interface {p1}, Lcom/google/gson/a/d;->BI()D
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/gson/internal/d;->aXj:D
+    iget-wide v2, p0, Lcom/google/gson/internal/d;->aXB:D
 
     cmpl-double p1, v0, v2
 
@@ -241,11 +241,11 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p1}, Lcom/google/gson/a/e;->BT()D
+    invoke-interface {p1}, Lcom/google/gson/a/e;->BI()D
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/gson/internal/d;->aXj:D
+    iget-wide v2, p0, Lcom/google/gson/internal/d;->aXB:D
 
     cmpg-double p1, v0, v2
 
@@ -298,7 +298,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/google/gson/internal/d;->aXj:D
+    iget-wide v0, p0, Lcom/google/gson/internal/d;->aXB:D
 
     const/4 v2, 0x1
 
@@ -333,7 +333,7 @@
     return v2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/gson/internal/d;->aXl:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/d;->aXD:Z
 
     if-nez v0, :cond_1
 
@@ -357,12 +357,12 @@
     :cond_2
     if-eqz p2, :cond_3
 
-    iget-object p1, p0, Lcom/google/gson/internal/d;->aXn:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/gson/internal/d;->aXF:Ljava/util/List;
 
     goto :goto_0
 
     :cond_3
-    iget-object p1, p0, Lcom/google/gson/internal/d;->aXo:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/gson/internal/d;->aXG:Ljava/util/List;
 
     :goto_0
     invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
@@ -382,7 +382,7 @@
 
     check-cast p2, Lcom/google/gson/b;
 
-    invoke-interface {p2}, Lcom/google/gson/b;->BI()Z
+    invoke-interface {p2}, Lcom/google/gson/b;->Bx()Z
 
     move-result p2
 
@@ -404,7 +404,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/gson/internal/d;->BV()Lcom/google/gson/internal/d;
+    invoke-direct {p0}, Lcom/google/gson/internal/d;->BK()Lcom/google/gson/internal/d;
 
     move-result-object v0
 
@@ -426,7 +426,7 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/g.smali b/com.discord/smali_classes2/com/google/gson/internal/g.smali
index 7fb40b3c48..7a3e71bca4 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/g.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/g.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract BU()Ljava/lang/Object;
+.method public abstract BJ()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali_classes2/com/google/gson/internal/h.smali b/com.discord/smali_classes2/com/google/gson/internal/h.smali
index eaad81a9e3..2d53414df6 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/h.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/h.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final aXE:Ljava/util/Map;
+.field private static final aXW:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final aXF:Ljava/util/Map;
+.field private static final aXX:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -101,13 +101,13 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/h;->aXE:Ljava/util/Map;
+    sput-object v0, Lcom/google/gson/internal/h;->aXW:Ljava/util/Map;
 
     invoke-static {v2}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/h;->aXF:Ljava/util/Map;
+    sput-object v0, Lcom/google/gson/internal/h;->aXX:Ljava/util/Map;
 
     return-void
 .end method
@@ -126,7 +126,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/gson/internal/h;->aXE:Ljava/util/Map;
+    sget-object v0, Lcom/google/gson/internal/h;->aXW:Ljava/util/Map;
 
     invoke-static {p0}, Lcom/google/gson/internal/a;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -178,7 +178,7 @@
 .method public static g(Ljava/lang/reflect/Type;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/gson/internal/h;->aXE:Ljava/util/Map;
+    sget-object v0, Lcom/google/gson/internal/h;->aXW:Ljava/util/Map;
 
     invoke-interface {v0, p0}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/i$a.smali b/com.discord/smali_classes2/com/google/gson/internal/i$a.smali
index b7ff87ba09..2c8a4ce113 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/i$a.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/i$a.smali
@@ -21,9 +21,9 @@
 
 
 # instance fields
-.field private final aXG:Ljava/lang/Appendable;
+.field private final aXY:Ljava/lang/Appendable;
 
-.field private final aXH:Lcom/google/gson/internal/i$a$a;
+.field private final aXZ:Lcom/google/gson/internal/i$a$a;
 
 
 # direct methods
@@ -36,9 +36,9 @@
 
     invoke-direct {v0}, Lcom/google/gson/internal/i$a$a;-><init>()V
 
-    iput-object v0, p0, Lcom/google/gson/internal/i$a;->aXH:Lcom/google/gson/internal/i$a$a;
+    iput-object v0, p0, Lcom/google/gson/internal/i$a;->aXZ:Lcom/google/gson/internal/i$a$a;
 
-    iput-object p1, p0, Lcom/google/gson/internal/i$a;->aXG:Ljava/lang/Appendable;
+    iput-object p1, p0, Lcom/google/gson/internal/i$a;->aXY:Ljava/lang/Appendable;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/i$a;->aXG:Ljava/lang/Appendable;
+    iget-object v0, p0, Lcom/google/gson/internal/i$a;->aXY:Ljava/lang/Appendable;
 
     int-to-char p1, p1
 
@@ -82,11 +82,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/i$a;->aXH:Lcom/google/gson/internal/i$a$a;
+    iget-object v0, p0, Lcom/google/gson/internal/i$a;->aXZ:Lcom/google/gson/internal/i$a$a;
 
     iput-object p1, v0, Lcom/google/gson/internal/i$a$a;->chars:[C
 
-    iget-object p1, p0, Lcom/google/gson/internal/i$a;->aXG:Ljava/lang/Appendable;
+    iget-object p1, p0, Lcom/google/gson/internal/i$a;->aXY:Ljava/lang/Appendable;
 
     add-int/2addr p3, p2
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/i.smali b/com.discord/smali_classes2/com/google/gson/internal/i.smali
index 4bcd87575f..098c79c555 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/i.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/i.smali
@@ -31,7 +31,7 @@
     const/4 v0, 0x0
 
     :try_start_1
-    sget-object v1, Lcom/google/gson/internal/a/n;->aZu:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aZM:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v1, p0}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 
@@ -86,7 +86,7 @@
     :goto_0
     if-eqz v0, :cond_0
 
-    sget-object p0, Lcom/google/gson/k;->aWU:Lcom/google/gson/k;
+    sget-object p0, Lcom/google/gson/k;->aXm:Lcom/google/gson/k;
 
     return-object p0
 
@@ -125,7 +125,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/gson/internal/a/n;->aZu:Lcom/google/gson/TypeAdapter;
+    sget-object v0, Lcom/google/gson/internal/a/n;->aZM:Lcom/google/gson/TypeAdapter;
 
     invoke-virtual {v0, p1, p0}, Lcom/google/gson/TypeAdapter;->write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/j$1.smali b/com.discord/smali_classes2/com/google/gson/internal/j$1.smali
index 24f4d42ac3..7a95e2bdd3 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/j$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/j$1.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/google/gson/internal/j;->BY()Lcom/google/gson/internal/j;
+    value = Lcom/google/gson/internal/j;->BN()Lcom/google/gson/internal/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic aXI:Ljava/lang/reflect/Method;
+.field final synthetic aYa:Ljava/lang/reflect/Method;
 
-.field final synthetic aXJ:Ljava/lang/Object;
+.field final synthetic aYb:Ljava/lang/Object;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/reflect/Method;Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/j$1;->aXI:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lcom/google/gson/internal/j$1;->aYa:Ljava/lang/reflect/Method;
 
-    iput-object p2, p0, Lcom/google/gson/internal/j$1;->aXJ:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/gson/internal/j$1;->aYb:Ljava/lang/Object;
 
     invoke-direct {p0}, Lcom/google/gson/internal/j;-><init>()V
 
@@ -55,9 +55,9 @@
 
     invoke-static {p1}, Lcom/google/gson/internal/j$1;->N(Ljava/lang/Class;)V
 
-    iget-object v0, p0, Lcom/google/gson/internal/j$1;->aXI:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lcom/google/gson/internal/j$1;->aYa:Ljava/lang/reflect/Method;
 
-    iget-object v1, p0, Lcom/google/gson/internal/j$1;->aXJ:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/gson/internal/j$1;->aYb:Ljava/lang/Object;
 
     const/4 v2, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/j$2.smali b/com.discord/smali_classes2/com/google/gson/internal/j$2.smali
index 94623a355e..91cb691ccb 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/j$2.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/j$2.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/google/gson/internal/j;->BY()Lcom/google/gson/internal/j;
+    value = Lcom/google/gson/internal/j;->BN()Lcom/google/gson/internal/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic aXK:Ljava/lang/reflect/Method;
+.field final synthetic aYc:Ljava/lang/reflect/Method;
 
-.field final synthetic aXL:I
+.field final synthetic aYd:I
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/reflect/Method;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/j$2;->aXK:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lcom/google/gson/internal/j$2;->aYc:Ljava/lang/reflect/Method;
 
-    iput p2, p0, Lcom/google/gson/internal/j$2;->aXL:I
+    iput p2, p0, Lcom/google/gson/internal/j$2;->aYd:I
 
     invoke-direct {p0}, Lcom/google/gson/internal/j;-><init>()V
 
@@ -55,7 +55,7 @@
 
     invoke-static {p1}, Lcom/google/gson/internal/j$2;->N(Ljava/lang/Class;)V
 
-    iget-object v0, p0, Lcom/google/gson/internal/j$2;->aXK:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lcom/google/gson/internal/j$2;->aYc:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x2
 
@@ -65,7 +65,7 @@
 
     aput-object p1, v1, v2
 
-    iget p1, p0, Lcom/google/gson/internal/j$2;->aXL:I
+    iget p1, p0, Lcom/google/gson/internal/j$2;->aYd:I
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/j$3.smali b/com.discord/smali_classes2/com/google/gson/internal/j$3.smali
index c14cf0d6eb..86fb02a7e8 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/j$3.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/j$3.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/google/gson/internal/j;->BY()Lcom/google/gson/internal/j;
+    value = Lcom/google/gson/internal/j;->BN()Lcom/google/gson/internal/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aXK:Ljava/lang/reflect/Method;
+.field final synthetic aYc:Ljava/lang/reflect/Method;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/reflect/Method;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/j$3;->aXK:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lcom/google/gson/internal/j$3;->aYc:Ljava/lang/reflect/Method;
 
     invoke-direct {p0}, Lcom/google/gson/internal/j;-><init>()V
 
@@ -51,7 +51,7 @@
 
     invoke-static {p1}, Lcom/google/gson/internal/j$3;->N(Ljava/lang/Class;)V
 
-    iget-object v0, p0, Lcom/google/gson/internal/j$3;->aXK:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lcom/google/gson/internal/j$3;->aYc:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x2
 
diff --git a/com.discord/smali_classes2/com/google/gson/internal/j$4.smali b/com.discord/smali_classes2/com/google/gson/internal/j$4.smali
index fc8f3e1a11..c0599241f4 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/j$4.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/j$4.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/google/gson/internal/j;->BY()Lcom/google/gson/internal/j;
+    value = Lcom/google/gson/internal/j;->BN()Lcom/google/gson/internal/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali_classes2/com/google/gson/internal/j.smali b/com.discord/smali_classes2/com/google/gson/internal/j.smali
index 8d662c7467..a933a0321c 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/j.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/j.smali
@@ -12,7 +12,7 @@
     return-void
 .end method
 
-.method public static BY()Lcom/google/gson/internal/j;
+.method public static BN()Lcom/google/gson/internal/j;
     .locals 9
 
     const-string v0, "newInstance"
diff --git a/com.discord/smali_classes2/com/google/gson/k.smali b/com.discord/smali_classes2/com/google/gson/k.smali
index 23bd0315ee..5539702724 100644
--- a/com.discord/smali_classes2/com/google/gson/k.smali
+++ b/com.discord/smali_classes2/com/google/gson/k.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final aWU:Lcom/google/gson/k;
+.field public static final aXm:Lcom/google/gson/k;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/k;-><init>()V
 
-    sput-object v0, Lcom/google/gson/k;->aWU:Lcom/google/gson/k;
+    sput-object v0, Lcom/google/gson/k;->aXm:Lcom/google/gson/k;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/gson/m.smali b/com.discord/smali_classes2/com/google/gson/m.smali
index 5c638bb896..4dd24c5cae 100644
--- a/com.discord/smali_classes2/com/google/gson/m.smali
+++ b/com.discord/smali_classes2/com/google/gson/m.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final aWW:[Ljava/lang/Class;
+.field private static final aXo:[Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -123,7 +123,7 @@
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/gson/m;->aWW:[Ljava/lang/Class;
+    sput-object v0, Lcom/google/gson/m;->aXo:[Ljava/lang/Class;
 
     return-void
 .end method
@@ -232,7 +232,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/google/gson/m;->aWW:[Ljava/lang/Class;
+    sget-object v0, Lcom/google/gson/m;->aXo:[Ljava/lang/Class;
 
     array-length v2, v0
 
@@ -315,7 +315,7 @@
 
 
 # virtual methods
-.method public final BL()Ljava/lang/Number;
+.method public final BA()Ljava/lang/Number;
     .locals 2
 
     iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
@@ -338,7 +338,7 @@
     return-object v0
 .end method
 
-.method public final BM()Ljava/lang/String;
+.method public final BB()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
@@ -347,7 +347,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->BL()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->BA()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -431,7 +431,7 @@
 
     if-eqz v2, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->BL()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->BA()Ljava/lang/Number;
 
     move-result-object v2
 
@@ -439,7 +439,7 @@
 
     move-result-wide v2
 
-    invoke-virtual {p1}, Lcom/google/gson/m;->BL()Ljava/lang/Number;
+    invoke-virtual {p1}, Lcom/google/gson/m;->BA()Ljava/lang/Number;
 
     move-result-object p1
 
@@ -469,7 +469,7 @@
 
     if-eqz v2, :cond_8
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->BL()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->BA()Ljava/lang/Number;
 
     move-result-object v2
 
@@ -477,7 +477,7 @@
 
     move-result-wide v2
 
-    invoke-virtual {p1}, Lcom/google/gson/m;->BL()Ljava/lang/Number;
+    invoke-virtual {p1}, Lcom/google/gson/m;->BA()Ljava/lang/Number;
 
     move-result-object p1
 
@@ -544,7 +544,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->BM()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/gson/m;->BB()Ljava/lang/String;
 
     move-result-object v0
 
@@ -564,7 +564,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->BL()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->BA()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -575,7 +575,7 @@
     return-wide v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->BM()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/gson/m;->BB()Ljava/lang/String;
 
     move-result-object v0
 
@@ -595,7 +595,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->BL()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->BA()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -606,7 +606,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->BM()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/gson/m;->BB()Ljava/lang/String;
 
     move-result-object v0
 
@@ -626,7 +626,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->BL()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->BA()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -637,7 +637,7 @@
     return-wide v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->BM()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/gson/m;->BB()Ljava/lang/String;
 
     move-result-object v0
 
@@ -668,7 +668,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->BL()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->BA()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -692,7 +692,7 @@
 
     if-eqz v2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->BL()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->BA()Ljava/lang/Number;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/gson/q.smali b/com.discord/smali_classes2/com/google/gson/q.smali
index 9f1087015c..3347c68737 100644
--- a/com.discord/smali_classes2/com/google/gson/q.smali
+++ b/com.discord/smali_classes2/com/google/gson/q.smali
@@ -14,11 +14,11 @@
 
 
 # static fields
-.field public static final enum aWX:Lcom/google/gson/q;
+.field public static final enum aXp:Lcom/google/gson/q;
 
-.field public static final enum aWY:Lcom/google/gson/q;
+.field public static final enum aXq:Lcom/google/gson/q;
 
-.field private static final synthetic aWZ:[Lcom/google/gson/q;
+.field private static final synthetic aXr:[Lcom/google/gson/q;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/gson/q$1;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/gson/q;->aWX:Lcom/google/gson/q;
+    sput-object v0, Lcom/google/gson/q;->aXp:Lcom/google/gson/q;
 
     new-instance v0, Lcom/google/gson/q$2;
 
@@ -39,25 +39,25 @@
 
     invoke-direct {v0, v1}, Lcom/google/gson/q$2;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/google/gson/q;->aWY:Lcom/google/gson/q;
+    sput-object v0, Lcom/google/gson/q;->aXq:Lcom/google/gson/q;
 
     const/4 v0, 0x2
 
     new-array v0, v0, [Lcom/google/gson/q;
 
-    sget-object v1, Lcom/google/gson/q;->aWX:Lcom/google/gson/q;
+    sget-object v1, Lcom/google/gson/q;->aXp:Lcom/google/gson/q;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/q;->aWY:Lcom/google/gson/q;
+    sget-object v1, Lcom/google/gson/q;->aXq:Lcom/google/gson/q;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/gson/q;->aWZ:[Lcom/google/gson/q;
+    sput-object v0, Lcom/google/gson/q;->aXr:[Lcom/google/gson/q;
 
     return-void
 .end method
@@ -100,7 +100,7 @@
 .method public static values()[Lcom/google/gson/q;
     .locals 1
 
-    sget-object v0, Lcom/google/gson/q;->aWZ:[Lcom/google/gson/q;
+    sget-object v0, Lcom/google/gson/q;->aXr:[Lcom/google/gson/q;
 
     invoke-virtual {v0}, [Lcom/google/gson/q;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/gson/reflect/TypeToken.smali b/com.discord/smali_classes2/com/google/gson/reflect/TypeToken.smali
index e76c2b320f..ff90172eea 100644
--- a/com.discord/smali_classes2/com/google/gson/reflect/TypeToken.smali
+++ b/com.discord/smali_classes2/com/google/gson/reflect/TypeToken.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field public final aYw:Ljava/lang/reflect/Type;
+.field public final aYO:Ljava/lang/reflect/Type;
 
-.field public final aZJ:Ljava/lang/Class;
+.field public final bab:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -61,17 +61,17 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iput-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
-    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
     invoke-static {v0}, Lcom/google/gson/internal/b;->c(Ljava/lang/reflect/Type;)Ljava/lang/Class;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iput-object v0, p0, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
-    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
@@ -106,17 +106,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
-    iget-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
     invoke-static {p1}, Lcom/google/gson/internal/b;->c(Ljava/lang/reflect/Type;)Ljava/lang/Class;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aZJ:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/reflect/TypeToken;->bab:Ljava/lang/Class;
 
-    iget-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
     invoke-virtual {p1}, Ljava/lang/Object;->hashCode()I
 
@@ -176,11 +176,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
     check-cast p1, Lcom/google/gson/reflect/TypeToken;
 
-    iget-object p1, p1, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object p1, p1, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
     invoke-static {v0, p1}, Lcom/google/gson/internal/b;->a(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
 
@@ -209,7 +209,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aYw:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aYO:Ljava/lang/reflect/Type;
 
     invoke-static {v0}, Lcom/google/gson/internal/b;->d(Ljava/lang/reflect/Type;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/gson/stream/JsonReader$1.smali b/com.discord/smali_classes2/com/google/gson/stream/JsonReader$1.smali
index 6d2907e5de..c1099d5ddc 100644
--- a/com.discord/smali_classes2/com/google/gson/stream/JsonReader$1.smali
+++ b/com.discord/smali_classes2/com/google/gson/stream/JsonReader$1.smali
@@ -43,7 +43,7 @@
 
     invoke-virtual {p1, v0}, Lcom/google/gson/internal/a/e;->a(Lcom/google/gson/stream/JsonToken;)V
 
-    invoke-virtual {p1}, Lcom/google/gson/internal/a/e;->BZ()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/google/gson/internal/a/e;->BO()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/BuildConfig.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/BuildConfig.smali
index 1cf9162ecf..0f8aaaae4b 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/BuildConfig.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/BuildConfig.smali
@@ -12,9 +12,9 @@
 
 .field public static final FLAVOR:Ljava/lang/String; = ""
 
-.field public static final VERSION_CODE:I = 0x108
+.field public static final VERSION_CODE:I = 0x10a
 
-.field public static final VERSION_NAME:Ljava/lang/String; = "2.6.4"
+.field public static final VERSION_NAME:Ljava/lang/String; = "2.6.6"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord.smali
index c4e292fee4..7f2d73db94 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord.smali
@@ -62,7 +62,7 @@
 
 
 # virtual methods
-.method public native connectToServer(IJLjava/lang/String;ILcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;)Lco/discord/media_engine/Connection;
+.method public native connectToServer(IJLjava/lang/String;IZLcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;)Lco/discord/media_engine/Connection;
 .end method
 
 .method public native dispose()V
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/FlexInputCoordinator.smali b/com.discord/smali_classes2/com/lytefast/flexinput/FlexInputCoordinator.smali
index 0ab3fc1c39..3703c827f7 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/FlexInputCoordinator.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/FlexInputCoordinator.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract Cc()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.method public abstract BR()Lcom/lytefast/flexinput/utils/SelectionAggregator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
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 8bc0918046..d3d00bf49d 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali
@@ -153,1023 +153,1023 @@
 
 .field public static final behavior_skipCollapsed:I = 0x7f04005a
 
-.field public static final borderWidth:I = 0x7f040064
+.field public static final borderWidth:I = 0x7f040065
 
-.field public static final borderlessButtonStyle:I = 0x7f040065
+.field public static final borderlessButtonStyle:I = 0x7f040066
 
-.field public static final bottomAppBarStyle:I = 0x7f040066
+.field public static final bottomAppBarStyle:I = 0x7f040067
 
-.field public static final bottomNavigationStyle:I = 0x7f040067
+.field public static final bottomNavigationStyle:I = 0x7f040068
 
-.field public static final bottomSheetDialogTheme:I = 0x7f040068
+.field public static final bottomSheetDialogTheme:I = 0x7f040069
 
-.field public static final bottomSheetStyle:I = 0x7f040069
+.field public static final bottomSheetStyle:I = 0x7f04006a
 
-.field public static final boxBackgroundColor:I = 0x7f04006a
+.field public static final boxBackgroundColor:I = 0x7f04006b
 
-.field public static final boxBackgroundMode:I = 0x7f04006b
+.field public static final boxBackgroundMode:I = 0x7f04006c
 
-.field public static final boxCollapsedPaddingTop:I = 0x7f04006c
+.field public static final boxCollapsedPaddingTop:I = 0x7f04006d
 
-.field public static final boxCornerRadiusBottomEnd:I = 0x7f04006d
+.field public static final boxCornerRadiusBottomEnd:I = 0x7f04006e
 
-.field public static final boxCornerRadiusBottomStart:I = 0x7f04006e
+.field public static final boxCornerRadiusBottomStart:I = 0x7f04006f
 
-.field public static final boxCornerRadiusTopEnd:I = 0x7f04006f
+.field public static final boxCornerRadiusTopEnd:I = 0x7f040070
 
-.field public static final boxCornerRadiusTopStart:I = 0x7f040070
+.field public static final boxCornerRadiusTopStart:I = 0x7f040071
 
-.field public static final boxStrokeColor:I = 0x7f040071
+.field public static final boxStrokeColor:I = 0x7f040072
 
-.field public static final boxStrokeWidth:I = 0x7f040072
+.field public static final boxStrokeWidth:I = 0x7f040073
 
-.field public static final buttonBarButtonStyle:I = 0x7f040074
+.field public static final buttonBarButtonStyle:I = 0x7f040075
 
-.field public static final buttonBarNegativeButtonStyle:I = 0x7f040075
+.field public static final buttonBarNegativeButtonStyle:I = 0x7f040076
 
-.field public static final buttonBarNeutralButtonStyle:I = 0x7f040076
+.field public static final buttonBarNeutralButtonStyle:I = 0x7f040077
 
-.field public static final buttonBarPositiveButtonStyle:I = 0x7f040077
+.field public static final buttonBarPositiveButtonStyle:I = 0x7f040078
 
-.field public static final buttonBarStyle:I = 0x7f040078
+.field public static final buttonBarStyle:I = 0x7f040079
 
-.field public static final buttonGravity:I = 0x7f040079
+.field public static final buttonGravity:I = 0x7f04007a
 
-.field public static final buttonIconDimen:I = 0x7f04007a
+.field public static final buttonIconDimen:I = 0x7f04007b
 
-.field public static final buttonPanelSideLayout:I = 0x7f04007b
+.field public static final buttonPanelSideLayout:I = 0x7f04007c
 
-.field public static final buttonStyle:I = 0x7f04007d
+.field public static final buttonStyle:I = 0x7f04007e
 
-.field public static final buttonStyleSmall:I = 0x7f04007e
+.field public static final buttonStyleSmall:I = 0x7f04007f
 
-.field public static final buttonTint:I = 0x7f04007f
+.field public static final buttonTint:I = 0x7f040080
 
-.field public static final buttonTintMode:I = 0x7f040080
+.field public static final buttonTintMode:I = 0x7f040081
 
-.field public static final cardBackgroundColor:I = 0x7f040081
+.field public static final cardBackgroundColor:I = 0x7f040082
 
-.field public static final cardCornerRadius:I = 0x7f040082
+.field public static final cardCornerRadius:I = 0x7f040083
 
-.field public static final cardElevation:I = 0x7f040083
+.field public static final cardElevation:I = 0x7f040084
 
-.field public static final cardMaxElevation:I = 0x7f040084
+.field public static final cardMaxElevation:I = 0x7f040085
 
-.field public static final cardPreventCornerOverlap:I = 0x7f040085
+.field public static final cardPreventCornerOverlap:I = 0x7f040086
 
-.field public static final cardUseCompatPadding:I = 0x7f040086
+.field public static final cardUseCompatPadding:I = 0x7f040087
 
-.field public static final cardViewStyle:I = 0x7f040087
+.field public static final cardViewStyle:I = 0x7f040088
 
-.field public static final chainUseRtl:I = 0x7f040089
+.field public static final chainUseRtl:I = 0x7f04008a
 
-.field public static final checkboxStyle:I = 0x7f04008c
+.field public static final checkboxStyle:I = 0x7f04008d
 
-.field public static final checkedChip:I = 0x7f04008d
+.field public static final checkedChip:I = 0x7f04008e
 
-.field public static final checkedIcon:I = 0x7f04008e
+.field public static final checkedIcon:I = 0x7f04008f
 
-.field public static final checkedIconEnabled:I = 0x7f04008f
+.field public static final checkedIconEnabled:I = 0x7f040090
 
-.field public static final checkedIconVisible:I = 0x7f040090
+.field public static final checkedIconVisible:I = 0x7f040091
 
-.field public static final checkedTextViewStyle:I = 0x7f040091
+.field public static final checkedTextViewStyle:I = 0x7f040092
 
-.field public static final chipBackgroundColor:I = 0x7f040092
+.field public static final chipBackgroundColor:I = 0x7f040093
 
-.field public static final chipCornerRadius:I = 0x7f040093
+.field public static final chipCornerRadius:I = 0x7f040094
 
-.field public static final chipEndPadding:I = 0x7f040094
+.field public static final chipEndPadding:I = 0x7f040095
 
-.field public static final chipGroupStyle:I = 0x7f040095
+.field public static final chipGroupStyle:I = 0x7f040096
 
-.field public static final chipIcon:I = 0x7f040096
+.field public static final chipIcon:I = 0x7f040097
 
-.field public static final chipIconEnabled:I = 0x7f040097
+.field public static final chipIconEnabled:I = 0x7f040098
 
-.field public static final chipIconSize:I = 0x7f040098
+.field public static final chipIconSize:I = 0x7f040099
 
-.field public static final chipIconTint:I = 0x7f040099
+.field public static final chipIconTint:I = 0x7f04009a
 
-.field public static final chipIconVisible:I = 0x7f04009a
+.field public static final chipIconVisible:I = 0x7f04009b
 
-.field public static final chipMinHeight:I = 0x7f04009b
+.field public static final chipMinHeight:I = 0x7f04009c
 
-.field public static final chipSpacing:I = 0x7f04009c
+.field public static final chipSpacing:I = 0x7f04009d
 
-.field public static final chipSpacingHorizontal:I = 0x7f04009d
+.field public static final chipSpacingHorizontal:I = 0x7f04009e
 
-.field public static final chipSpacingVertical:I = 0x7f04009e
+.field public static final chipSpacingVertical:I = 0x7f04009f
 
-.field public static final chipStandaloneStyle:I = 0x7f04009f
+.field public static final chipStandaloneStyle:I = 0x7f0400a0
 
-.field public static final chipStartPadding:I = 0x7f0400a0
+.field public static final chipStartPadding:I = 0x7f0400a1
 
-.field public static final chipStrokeColor:I = 0x7f0400a1
+.field public static final chipStrokeColor:I = 0x7f0400a2
 
-.field public static final chipStrokeWidth:I = 0x7f0400a2
+.field public static final chipStrokeWidth:I = 0x7f0400a3
 
-.field public static final chipStyle:I = 0x7f0400a3
+.field public static final chipStyle:I = 0x7f0400a4
 
-.field public static final closeIcon:I = 0x7f0400a5
+.field public static final closeIcon:I = 0x7f0400a6
 
-.field public static final closeIconEnabled:I = 0x7f0400a6
+.field public static final closeIconEnabled:I = 0x7f0400a7
 
-.field public static final closeIconEndPadding:I = 0x7f0400a7
+.field public static final closeIconEndPadding:I = 0x7f0400a8
 
-.field public static final closeIconSize:I = 0x7f0400a8
+.field public static final closeIconSize:I = 0x7f0400a9
 
-.field public static final closeIconStartPadding:I = 0x7f0400a9
+.field public static final closeIconStartPadding:I = 0x7f0400aa
 
-.field public static final closeIconTint:I = 0x7f0400aa
+.field public static final closeIconTint:I = 0x7f0400ab
 
-.field public static final closeIconVisible:I = 0x7f0400ab
+.field public static final closeIconVisible:I = 0x7f0400ac
 
-.field public static final closeItemLayout:I = 0x7f0400ac
+.field public static final closeItemLayout:I = 0x7f0400ad
 
-.field public static final collapseContentDescription:I = 0x7f0400ad
+.field public static final collapseContentDescription:I = 0x7f0400ae
 
-.field public static final collapseIcon:I = 0x7f0400ae
+.field public static final collapseIcon:I = 0x7f0400af
 
-.field public static final collapsedTitleGravity:I = 0x7f0400af
+.field public static final collapsedTitleGravity:I = 0x7f0400b0
 
-.field public static final collapsedTitleTextAppearance:I = 0x7f0400b0
+.field public static final collapsedTitleTextAppearance:I = 0x7f0400b1
 
-.field public static final color:I = 0x7f0400b1
+.field public static final color:I = 0x7f0400b2
 
-.field public static final colorAccent:I = 0x7f0400b2
+.field public static final colorAccent:I = 0x7f0400b3
 
-.field public static final colorBackgroundFloating:I = 0x7f0400b3
+.field public static final colorBackgroundFloating:I = 0x7f0400b4
 
-.field public static final colorButtonNormal:I = 0x7f0400b4
+.field public static final colorButtonNormal:I = 0x7f0400b5
 
-.field public static final colorControlActivated:I = 0x7f0400b5
+.field public static final colorControlActivated:I = 0x7f0400b6
 
-.field public static final colorControlHighlight:I = 0x7f0400b6
+.field public static final colorControlHighlight:I = 0x7f0400b7
 
-.field public static final colorControlNormal:I = 0x7f0400b7
+.field public static final colorControlNormal:I = 0x7f0400b8
 
-.field public static final colorError:I = 0x7f0400b8
+.field public static final colorError:I = 0x7f0400b9
 
-.field public static final colorPrimary:I = 0x7f0400b9
+.field public static final colorPrimary:I = 0x7f0400ba
 
-.field public static final colorPrimaryDark:I = 0x7f0400bc
+.field public static final colorPrimaryDark:I = 0x7f0400bd
 
-.field public static final colorSecondary:I = 0x7f0400c0
+.field public static final colorSecondary:I = 0x7f0400c1
 
-.field public static final colorSwitchThumbNormal:I = 0x7f0400c1
+.field public static final colorSwitchThumbNormal:I = 0x7f0400c2
 
-.field public static final commitIcon:I = 0x7f0400c2
+.field public static final commitIcon:I = 0x7f0400c3
 
-.field public static final constraintSet:I = 0x7f0400c3
+.field public static final constraintSet:I = 0x7f0400c4
 
-.field public static final constraint_referenced_ids:I = 0x7f0400c4
+.field public static final constraint_referenced_ids:I = 0x7f0400c5
 
-.field public static final content:I = 0x7f0400c6
+.field public static final content:I = 0x7f0400c7
 
-.field public static final contentDescription:I = 0x7f0400c7
+.field public static final contentDescription:I = 0x7f0400c8
 
-.field public static final contentInsetEnd:I = 0x7f0400c8
+.field public static final contentInsetEnd:I = 0x7f0400c9
 
-.field public static final contentInsetEndWithActions:I = 0x7f0400c9
+.field public static final contentInsetEndWithActions:I = 0x7f0400ca
 
-.field public static final contentInsetLeft:I = 0x7f0400ca
+.field public static final contentInsetLeft:I = 0x7f0400cb
 
-.field public static final contentInsetRight:I = 0x7f0400cb
+.field public static final contentInsetRight:I = 0x7f0400cc
 
-.field public static final contentInsetStart:I = 0x7f0400cc
+.field public static final contentInsetStart:I = 0x7f0400cd
 
-.field public static final contentInsetStartWithNavigation:I = 0x7f0400cd
+.field public static final contentInsetStartWithNavigation:I = 0x7f0400ce
 
-.field public static final contentPadding:I = 0x7f0400ce
+.field public static final contentPadding:I = 0x7f0400cf
 
-.field public static final contentPaddingBottom:I = 0x7f0400cf
+.field public static final contentPaddingBottom:I = 0x7f0400d0
 
-.field public static final contentPaddingLeft:I = 0x7f0400d0
+.field public static final contentPaddingLeft:I = 0x7f0400d1
 
-.field public static final contentPaddingRight:I = 0x7f0400d1
+.field public static final contentPaddingRight:I = 0x7f0400d2
 
-.field public static final contentPaddingTop:I = 0x7f0400d2
+.field public static final contentPaddingTop:I = 0x7f0400d3
 
-.field public static final contentScrim:I = 0x7f0400d3
+.field public static final contentScrim:I = 0x7f0400d4
 
-.field public static final controlBackground:I = 0x7f0400d4
+.field public static final controlBackground:I = 0x7f0400d5
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final cornerRadius:I = 0x7f0400d6
+.field public static final cornerRadius:I = 0x7f0400d7
 
-.field public static final counterEnabled:I = 0x7f0400d7
+.field public static final counterEnabled:I = 0x7f0400d8
 
-.field public static final counterMaxLength:I = 0x7f0400d8
+.field public static final counterMaxLength:I = 0x7f0400d9
 
-.field public static final counterOverflowTextAppearance:I = 0x7f0400d9
+.field public static final counterOverflowTextAppearance:I = 0x7f0400da
 
-.field public static final counterTextAppearance:I = 0x7f0400da
+.field public static final counterTextAppearance:I = 0x7f0400db
 
-.field public static final customNavigationLayout:I = 0x7f0400e9
+.field public static final customNavigationLayout:I = 0x7f0400ea
 
-.field public static final defaultQueryHint:I = 0x7f0400ff
+.field public static final defaultQueryHint:I = 0x7f040100
 
-.field public static final dialogCornerRadius:I = 0x7f040100
+.field public static final dialogCornerRadius:I = 0x7f040101
 
-.field public static final dialogPreferredPadding:I = 0x7f040101
+.field public static final dialogPreferredPadding:I = 0x7f040102
 
-.field public static final dialogTheme:I = 0x7f040102
+.field public static final dialogTheme:I = 0x7f040103
 
-.field public static final displayOptions:I = 0x7f040103
+.field public static final displayOptions:I = 0x7f040104
 
-.field public static final divider:I = 0x7f040104
+.field public static final divider:I = 0x7f040105
 
-.field public static final dividerHorizontal:I = 0x7f040108
+.field public static final dividerHorizontal:I = 0x7f040109
 
-.field public static final dividerPadding:I = 0x7f040109
+.field public static final dividerPadding:I = 0x7f04010a
 
-.field public static final dividerVertical:I = 0x7f04010a
+.field public static final dividerVertical:I = 0x7f04010b
 
-.field public static final drawableSize:I = 0x7f04010b
+.field public static final drawableSize:I = 0x7f04010c
 
-.field public static final drawerArrowStyle:I = 0x7f04010c
+.field public static final drawerArrowStyle:I = 0x7f04010d
 
-.field public static final dropDownListViewStyle:I = 0x7f04010d
+.field public static final dropDownListViewStyle:I = 0x7f04010f
 
-.field public static final dropdownListPreferredItemHeight:I = 0x7f04010e
+.field public static final dropdownListPreferredItemHeight:I = 0x7f040110
 
-.field public static final editTextBackground:I = 0x7f04010f
+.field public static final editTextBackground:I = 0x7f040111
 
-.field public static final editTextColor:I = 0x7f040110
+.field public static final editTextColor:I = 0x7f040112
 
-.field public static final editTextStyle:I = 0x7f040111
+.field public static final editTextStyle:I = 0x7f040113
 
-.field public static final elevation:I = 0x7f040112
+.field public static final elevation:I = 0x7f040114
 
-.field public static final emptyVisibility:I = 0x7f040113
+.field public static final emptyVisibility:I = 0x7f040115
 
-.field public static final enforceMaterialTheme:I = 0x7f040114
+.field public static final enforceMaterialTheme:I = 0x7f040116
 
-.field public static final enforceTextAppearance:I = 0x7f040115
+.field public static final enforceTextAppearance:I = 0x7f040117
 
-.field public static final errorEnabled:I = 0x7f040116
+.field public static final errorEnabled:I = 0x7f040118
 
-.field public static final errorTextAppearance:I = 0x7f040117
+.field public static final errorTextAppearance:I = 0x7f040119
 
-.field public static final expandActivityOverflowButtonDrawable:I = 0x7f040118
+.field public static final expandActivityOverflowButtonDrawable:I = 0x7f04011a
 
-.field public static final expanded:I = 0x7f040119
+.field public static final expanded:I = 0x7f04011b
 
-.field public static final expandedTitleGravity:I = 0x7f04011a
+.field public static final expandedTitleGravity:I = 0x7f04011c
 
-.field public static final expandedTitleMargin:I = 0x7f04011b
+.field public static final expandedTitleMargin:I = 0x7f04011d
 
-.field public static final expandedTitleMarginBottom:I = 0x7f04011c
+.field public static final expandedTitleMarginBottom:I = 0x7f04011e
 
-.field public static final expandedTitleMarginEnd:I = 0x7f04011d
+.field public static final expandedTitleMarginEnd:I = 0x7f04011f
 
-.field public static final expandedTitleMarginStart:I = 0x7f04011e
+.field public static final expandedTitleMarginStart:I = 0x7f040120
 
-.field public static final expandedTitleMarginTop:I = 0x7f04011f
+.field public static final expandedTitleMarginTop:I = 0x7f040121
 
-.field public static final expandedTitleTextAppearance:I = 0x7f040120
+.field public static final expandedTitleTextAppearance:I = 0x7f040122
 
-.field public static final fabAlignmentMode:I = 0x7f040121
+.field public static final fabAlignmentMode:I = 0x7f040123
 
-.field public static final fabCradleMargin:I = 0x7f040122
+.field public static final fabCradleMargin:I = 0x7f040124
 
-.field public static final fabCradleRoundedCornerRadius:I = 0x7f040123
+.field public static final fabCradleRoundedCornerRadius:I = 0x7f040125
 
-.field public static final fabCradleVerticalOffset:I = 0x7f040124
+.field public static final fabCradleVerticalOffset:I = 0x7f040126
 
-.field public static final fabCustomSize:I = 0x7f040125
+.field public static final fabCustomSize:I = 0x7f040127
 
-.field public static final fabSize:I = 0x7f040126
+.field public static final fabSize:I = 0x7f040128
 
-.field public static final facing:I = 0x7f040127
+.field public static final facing:I = 0x7f040129
 
-.field public static final fadeDuration:I = 0x7f040128
+.field public static final fadeDuration:I = 0x7f04012a
 
-.field public static final failureImage:I = 0x7f040129
+.field public static final failureImage:I = 0x7f04012b
 
-.field public static final failureImageScaleType:I = 0x7f04012a
+.field public static final failureImageScaleType:I = 0x7f04012c
 
-.field public static final fastScrollEnabled:I = 0x7f04012b
+.field public static final fastScrollEnabled:I = 0x7f04012d
 
-.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f04012c
+.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f04012e
 
-.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f04012d
+.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f04012f
 
-.field public static final fastScrollVerticalThumbDrawable:I = 0x7f04012e
+.field public static final fastScrollVerticalThumbDrawable:I = 0x7f040130
 
-.field public static final fastScrollVerticalTrackDrawable:I = 0x7f04012f
+.field public static final fastScrollVerticalTrackDrawable:I = 0x7f040131
 
-.field public static final firstBaselineToTopHeight:I = 0x7f040131
+.field public static final firstBaselineToTopHeight:I = 0x7f040133
 
-.field public static final flash:I = 0x7f040134
+.field public static final flash:I = 0x7f040136
 
-.field public static final flexInputAddContentLauncherTitle:I = 0x7f040136
+.field public static final flexInputAddContentLauncherTitle:I = 0x7f040138
 
-.field public static final flexInputColorHighlight:I = 0x7f040137
+.field public static final flexInputColorHighlight:I = 0x7f040139
 
-.field public static final flexInputDialogBackground:I = 0x7f040138
+.field public static final flexInputDialogBackground:I = 0x7f04013a
 
-.field public static final flexInputIconColor:I = 0x7f040139
+.field public static final flexInputIconColor:I = 0x7f04013b
 
-.field public static final flexInputIconColorActivated:I = 0x7f04013a
+.field public static final flexInputIconColorActivated:I = 0x7f04013c
 
-.field public static final flexInputIconColorDisabled:I = 0x7f04013b
+.field public static final flexInputIconColorDisabled:I = 0x7f04013d
 
-.field public static final floatingActionButtonStyle:I = 0x7f04013d
+.field public static final floatingActionButtonStyle:I = 0x7f04013f
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontFamily:I = 0x7f04013f
+.field public static final fontFamily:I = 0x7f040141
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final foregroundInsidePadding:I = 0x7f040149
+.field public static final foregroundInsidePadding:I = 0x7f04014b
 
-.field public static final gapBetweenBars:I = 0x7f04014a
+.field public static final gapBetweenBars:I = 0x7f04014c
 
-.field public static final goIcon:I = 0x7f04014f
+.field public static final goIcon:I = 0x7f040151
 
-.field public static final headerLayout:I = 0x7f040155
+.field public static final headerLayout:I = 0x7f040157
 
-.field public static final height:I = 0x7f040156
+.field public static final height:I = 0x7f040158
 
-.field public static final helperText:I = 0x7f040157
+.field public static final helperText:I = 0x7f040159
 
-.field public static final helperTextEnabled:I = 0x7f040158
+.field public static final helperTextEnabled:I = 0x7f04015a
 
-.field public static final helperTextTextAppearance:I = 0x7f040159
+.field public static final helperTextTextAppearance:I = 0x7f04015b
 
-.field public static final hideMotionSpec:I = 0x7f04015a
+.field public static final hideMotionSpec:I = 0x7f04015c
 
-.field public static final hideOnContentScroll:I = 0x7f04015b
+.field public static final hideOnContentScroll:I = 0x7f04015d
 
-.field public static final hideOnScroll:I = 0x7f04015c
+.field public static final hideOnScroll:I = 0x7f04015e
 
-.field public static final hint:I = 0x7f04015d
+.field public static final hint:I = 0x7f04015f
 
-.field public static final hintAnimationEnabled:I = 0x7f04015e
+.field public static final hintAnimationEnabled:I = 0x7f040160
 
-.field public static final hintColor:I = 0x7f04015f
+.field public static final hintColor:I = 0x7f040161
 
-.field public static final hintEnabled:I = 0x7f040160
+.field public static final hintEnabled:I = 0x7f040162
 
-.field public static final hintTextAppearance:I = 0x7f040161
+.field public static final hintTextAppearance:I = 0x7f040163
 
-.field public static final homeAsUpIndicator:I = 0x7f040162
+.field public static final homeAsUpIndicator:I = 0x7f040164
 
-.field public static final homeLayout:I = 0x7f040163
+.field public static final homeLayout:I = 0x7f040165
 
-.field public static final hoveredFocusedTranslationZ:I = 0x7f040164
+.field public static final hoveredFocusedTranslationZ:I = 0x7f040166
 
-.field public static final icon:I = 0x7f0401c7
+.field public static final icon:I = 0x7f0401c9
 
-.field public static final iconEndPadding:I = 0x7f0401c8
+.field public static final iconEndPadding:I = 0x7f0401ca
 
-.field public static final iconGravity:I = 0x7f0401c9
+.field public static final iconGravity:I = 0x7f0401cb
 
-.field public static final iconPadding:I = 0x7f0401ca
+.field public static final iconPadding:I = 0x7f0401cc
 
-.field public static final iconSize:I = 0x7f0401cb
+.field public static final iconSize:I = 0x7f0401cd
 
-.field public static final iconStartPadding:I = 0x7f0401cc
+.field public static final iconStartPadding:I = 0x7f0401ce
 
-.field public static final iconTint:I = 0x7f0401cd
+.field public static final iconTint:I = 0x7f0401cf
 
-.field public static final iconTintMode:I = 0x7f0401ce
+.field public static final iconTintMode:I = 0x7f0401d0
 
-.field public static final iconifiedByDefault:I = 0x7f0401cf
+.field public static final iconifiedByDefault:I = 0x7f0401d1
 
-.field public static final imageButtonStyle:I = 0x7f0401d2
+.field public static final imageButtonStyle:I = 0x7f0401d4
 
-.field public static final indeterminateProgressStyle:I = 0x7f0401ea
+.field public static final indeterminateProgressStyle:I = 0x7f0401ec
 
-.field public static final initialActivityCount:I = 0x7f0401eb
+.field public static final initialActivityCount:I = 0x7f0401ed
 
-.field public static final insetForeground:I = 0x7f0401ec
+.field public static final insetForeground:I = 0x7f0401ee
 
-.field public static final isLightTheme:I = 0x7f0401ed
+.field public static final isLightTheme:I = 0x7f0401ef
 
-.field public static final itemBackground:I = 0x7f0401ee
+.field public static final itemBackground:I = 0x7f0401f0
 
-.field public static final itemHorizontalPadding:I = 0x7f0401ef
+.field public static final itemHorizontalPadding:I = 0x7f0401f1
 
-.field public static final itemHorizontalTranslationEnabled:I = 0x7f0401f0
+.field public static final itemHorizontalTranslationEnabled:I = 0x7f0401f2
 
-.field public static final itemIconPadding:I = 0x7f0401f1
+.field public static final itemIconPadding:I = 0x7f0401f3
 
-.field public static final itemIconSize:I = 0x7f0401f2
+.field public static final itemIconSize:I = 0x7f0401f4
 
-.field public static final itemIconTint:I = 0x7f0401f3
+.field public static final itemIconTint:I = 0x7f0401f5
 
-.field public static final itemPadding:I = 0x7f0401f4
+.field public static final itemPadding:I = 0x7f0401f6
 
-.field public static final itemSpacing:I = 0x7f0401f5
+.field public static final itemSpacing:I = 0x7f0401f7
 
-.field public static final itemTextAppearance:I = 0x7f0401f6
+.field public static final itemTextAppearance:I = 0x7f0401f8
 
-.field public static final itemTextAppearanceActive:I = 0x7f0401f7
+.field public static final itemTextAppearanceActive:I = 0x7f0401f9
 
-.field public static final itemTextAppearanceInactive:I = 0x7f0401f8
+.field public static final itemTextAppearanceInactive:I = 0x7f0401fa
 
-.field public static final itemTextColor:I = 0x7f0401f9
+.field public static final itemTextColor:I = 0x7f0401fb
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final labelVisibilityMode:I = 0x7f0401fc
+.field public static final labelVisibilityMode:I = 0x7f0401fe
 
-.field public static final lastBaselineToBottomHeight:I = 0x7f0401fd
+.field public static final lastBaselineToBottomHeight:I = 0x7f0401ff
 
-.field public static final layout:I = 0x7f0401fe
+.field public static final layout:I = 0x7f040200
 
-.field public static final layoutManager:I = 0x7f0401ff
+.field public static final layoutManager:I = 0x7f040201
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_collapseMode:I = 0x7f040204
+.field public static final layout_collapseMode:I = 0x7f040206
 
-.field public static final layout_collapseParallaxMultiplier:I = 0x7f040205
+.field public static final layout_collapseParallaxMultiplier:I = 0x7f040207
 
-.field public static final layout_constrainedHeight:I = 0x7f040206
+.field public static final layout_constrainedHeight:I = 0x7f040208
 
-.field public static final layout_constrainedWidth:I = 0x7f040207
+.field public static final layout_constrainedWidth:I = 0x7f040209
 
-.field public static final layout_constraintBaseline_creator:I = 0x7f040208
+.field public static final layout_constraintBaseline_creator:I = 0x7f04020a
 
-.field public static final layout_constraintBaseline_toBaselineOf:I = 0x7f040209
+.field public static final layout_constraintBaseline_toBaselineOf:I = 0x7f04020b
 
-.field public static final layout_constraintBottom_creator:I = 0x7f04020a
+.field public static final layout_constraintBottom_creator:I = 0x7f04020c
 
-.field public static final layout_constraintBottom_toBottomOf:I = 0x7f04020b
+.field public static final layout_constraintBottom_toBottomOf:I = 0x7f04020d
 
-.field public static final layout_constraintBottom_toTopOf:I = 0x7f04020c
+.field public static final layout_constraintBottom_toTopOf:I = 0x7f04020e
 
-.field public static final layout_constraintCircle:I = 0x7f04020d
+.field public static final layout_constraintCircle:I = 0x7f04020f
 
-.field public static final layout_constraintCircleAngle:I = 0x7f04020e
+.field public static final layout_constraintCircleAngle:I = 0x7f040210
 
-.field public static final layout_constraintCircleRadius:I = 0x7f04020f
+.field public static final layout_constraintCircleRadius:I = 0x7f040211
 
-.field public static final layout_constraintDimensionRatio:I = 0x7f040210
+.field public static final layout_constraintDimensionRatio:I = 0x7f040212
 
-.field public static final layout_constraintEnd_toEndOf:I = 0x7f040211
+.field public static final layout_constraintEnd_toEndOf:I = 0x7f040213
 
-.field public static final layout_constraintEnd_toStartOf:I = 0x7f040212
+.field public static final layout_constraintEnd_toStartOf:I = 0x7f040214
 
-.field public static final layout_constraintGuide_begin:I = 0x7f040213
+.field public static final layout_constraintGuide_begin:I = 0x7f040215
 
-.field public static final layout_constraintGuide_end:I = 0x7f040214
+.field public static final layout_constraintGuide_end:I = 0x7f040216
 
-.field public static final layout_constraintGuide_percent:I = 0x7f040215
+.field public static final layout_constraintGuide_percent:I = 0x7f040217
 
-.field public static final layout_constraintHeight_default:I = 0x7f040216
+.field public static final layout_constraintHeight_default:I = 0x7f040218
 
-.field public static final layout_constraintHeight_max:I = 0x7f040217
+.field public static final layout_constraintHeight_max:I = 0x7f040219
 
-.field public static final layout_constraintHeight_min:I = 0x7f040218
+.field public static final layout_constraintHeight_min:I = 0x7f04021a
 
-.field public static final layout_constraintHeight_percent:I = 0x7f040219
+.field public static final layout_constraintHeight_percent:I = 0x7f04021b
 
-.field public static final layout_constraintHorizontal_bias:I = 0x7f04021a
+.field public static final layout_constraintHorizontal_bias:I = 0x7f04021c
 
-.field public static final layout_constraintHorizontal_chainStyle:I = 0x7f04021b
+.field public static final layout_constraintHorizontal_chainStyle:I = 0x7f04021d
 
-.field public static final layout_constraintHorizontal_weight:I = 0x7f04021c
+.field public static final layout_constraintHorizontal_weight:I = 0x7f04021e
 
-.field public static final layout_constraintLeft_creator:I = 0x7f04021d
+.field public static final layout_constraintLeft_creator:I = 0x7f04021f
 
-.field public static final layout_constraintLeft_toLeftOf:I = 0x7f04021e
+.field public static final layout_constraintLeft_toLeftOf:I = 0x7f040220
 
-.field public static final layout_constraintLeft_toRightOf:I = 0x7f04021f
+.field public static final layout_constraintLeft_toRightOf:I = 0x7f040221
 
-.field public static final layout_constraintRight_creator:I = 0x7f040220
+.field public static final layout_constraintRight_creator:I = 0x7f040222
 
-.field public static final layout_constraintRight_toLeftOf:I = 0x7f040221
+.field public static final layout_constraintRight_toLeftOf:I = 0x7f040223
 
-.field public static final layout_constraintRight_toRightOf:I = 0x7f040222
+.field public static final layout_constraintRight_toRightOf:I = 0x7f040224
 
-.field public static final layout_constraintStart_toEndOf:I = 0x7f040223
+.field public static final layout_constraintStart_toEndOf:I = 0x7f040225
 
-.field public static final layout_constraintStart_toStartOf:I = 0x7f040224
+.field public static final layout_constraintStart_toStartOf:I = 0x7f040226
 
-.field public static final layout_constraintTop_creator:I = 0x7f040225
+.field public static final layout_constraintTop_creator:I = 0x7f040227
 
-.field public static final layout_constraintTop_toBottomOf:I = 0x7f040226
+.field public static final layout_constraintTop_toBottomOf:I = 0x7f040228
 
-.field public static final layout_constraintTop_toTopOf:I = 0x7f040227
+.field public static final layout_constraintTop_toTopOf:I = 0x7f040229
 
-.field public static final layout_constraintVertical_bias:I = 0x7f040228
+.field public static final layout_constraintVertical_bias:I = 0x7f04022a
 
-.field public static final layout_constraintVertical_chainStyle:I = 0x7f040229
+.field public static final layout_constraintVertical_chainStyle:I = 0x7f04022b
 
-.field public static final layout_constraintVertical_weight:I = 0x7f04022a
+.field public static final layout_constraintVertical_weight:I = 0x7f04022c
 
-.field public static final layout_constraintWidth_default:I = 0x7f04022b
+.field public static final layout_constraintWidth_default:I = 0x7f04022d
 
-.field public static final layout_constraintWidth_max:I = 0x7f04022c
+.field public static final layout_constraintWidth_max:I = 0x7f04022e
 
-.field public static final layout_constraintWidth_min:I = 0x7f04022d
+.field public static final layout_constraintWidth_min:I = 0x7f04022f
 
-.field public static final layout_constraintWidth_percent:I = 0x7f04022e
+.field public static final layout_constraintWidth_percent:I = 0x7f040230
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_editor_absoluteX:I = 0x7f040230
+.field public static final layout_editor_absoluteX:I = 0x7f040232
 
-.field public static final layout_editor_absoluteY:I = 0x7f040231
+.field public static final layout_editor_absoluteY:I = 0x7f040233
 
-.field public static final layout_goneMarginBottom:I = 0x7f040235
+.field public static final layout_goneMarginBottom:I = 0x7f040237
 
-.field public static final layout_goneMarginEnd:I = 0x7f040236
+.field public static final layout_goneMarginEnd:I = 0x7f040238
 
-.field public static final layout_goneMarginLeft:I = 0x7f040237
+.field public static final layout_goneMarginLeft:I = 0x7f040239
 
-.field public static final layout_goneMarginRight:I = 0x7f040238
+.field public static final layout_goneMarginRight:I = 0x7f04023a
 
-.field public static final layout_goneMarginStart:I = 0x7f040239
+.field public static final layout_goneMarginStart:I = 0x7f04023b
 
-.field public static final layout_goneMarginTop:I = 0x7f04023a
+.field public static final layout_goneMarginTop:I = 0x7f04023c
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final layout_optimizationLevel:I = 0x7f040241
+.field public static final layout_optimizationLevel:I = 0x7f040243
 
-.field public static final layout_scrollFlags:I = 0x7f040243
+.field public static final layout_scrollFlags:I = 0x7f040245
 
-.field public static final layout_scrollInterpolator:I = 0x7f040244
+.field public static final layout_scrollInterpolator:I = 0x7f040246
 
-.field public static final liftOnScroll:I = 0x7f040249
+.field public static final liftOnScroll:I = 0x7f04024c
 
-.field public static final lineHeight:I = 0x7f04024a
+.field public static final lineHeight:I = 0x7f04024d
 
-.field public static final lineSpacing:I = 0x7f04024b
+.field public static final lineSpacing:I = 0x7f04024e
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04024c
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04024f
 
-.field public static final listDividerAlertDialog:I = 0x7f04024d
+.field public static final listDividerAlertDialog:I = 0x7f040250
 
-.field public static final listItemLayout:I = 0x7f04024e
+.field public static final listItemLayout:I = 0x7f040251
 
-.field public static final listLayout:I = 0x7f04024f
+.field public static final listLayout:I = 0x7f040252
 
-.field public static final listMenuViewStyle:I = 0x7f040250
+.field public static final listMenuViewStyle:I = 0x7f040253
 
-.field public static final listPopupWindowStyle:I = 0x7f040251
+.field public static final listPopupWindowStyle:I = 0x7f040254
 
-.field public static final listPreferredItemHeight:I = 0x7f040252
+.field public static final listPreferredItemHeight:I = 0x7f040255
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040253
+.field public static final listPreferredItemHeightLarge:I = 0x7f040256
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040254
+.field public static final listPreferredItemHeightSmall:I = 0x7f040257
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040255
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040258
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040256
+.field public static final listPreferredItemPaddingRight:I = 0x7f040259
 
-.field public static final logo:I = 0x7f040257
+.field public static final logo:I = 0x7f04025a
 
-.field public static final logoDescription:I = 0x7f040258
+.field public static final logoDescription:I = 0x7f04025b
 
-.field public static final materialButtonStyle:I = 0x7f040268
+.field public static final materialButtonStyle:I = 0x7f04026b
 
-.field public static final materialCardViewStyle:I = 0x7f040269
+.field public static final materialCardViewStyle:I = 0x7f04026c
 
-.field public static final maxActionInlineWidth:I = 0x7f04026a
+.field public static final maxActionInlineWidth:I = 0x7f04026d
 
-.field public static final maxButtonHeight:I = 0x7f04026b
+.field public static final maxButtonHeight:I = 0x7f04026e
 
-.field public static final maxImageSize:I = 0x7f04026c
+.field public static final maxImageSize:I = 0x7f04026f
 
-.field public static final measureWithLargestChild:I = 0x7f04026e
+.field public static final measureWithLargestChild:I = 0x7f040271
 
-.field public static final menu:I = 0x7f04026f
+.field public static final menu:I = 0x7f040272
 
-.field public static final multiChoiceItemLayout:I = 0x7f040270
+.field public static final multiChoiceItemLayout:I = 0x7f040273
 
-.field public static final navigationContentDescription:I = 0x7f040271
+.field public static final navigationContentDescription:I = 0x7f040274
 
-.field public static final navigationIcon:I = 0x7f040272
+.field public static final navigationIcon:I = 0x7f040275
 
-.field public static final navigationMode:I = 0x7f040273
+.field public static final navigationMode:I = 0x7f040276
 
-.field public static final navigationViewStyle:I = 0x7f040274
+.field public static final navigationViewStyle:I = 0x7f040277
 
-.field public static final numericModifiers:I = 0x7f040277
+.field public static final numericModifiers:I = 0x7f04027a
 
-.field public static final overlapAnchor:I = 0x7f040278
+.field public static final overlapAnchor:I = 0x7f04027b
 
-.field public static final overlayImage:I = 0x7f040279
+.field public static final overlayImage:I = 0x7f04027c
 
-.field public static final paddingBottomNoButtons:I = 0x7f04027c
+.field public static final paddingBottomNoButtons:I = 0x7f04027f
 
-.field public static final paddingEnd:I = 0x7f04027d
+.field public static final paddingEnd:I = 0x7f040280
 
-.field public static final paddingStart:I = 0x7f04027e
+.field public static final paddingStart:I = 0x7f040281
 
-.field public static final paddingTopNoTitle:I = 0x7f04027f
+.field public static final paddingTopNoTitle:I = 0x7f040282
 
-.field public static final panelBackground:I = 0x7f040280
+.field public static final panelBackground:I = 0x7f040283
 
-.field public static final panelMenuListTheme:I = 0x7f040281
+.field public static final panelMenuListTheme:I = 0x7f040284
 
-.field public static final panelMenuListWidth:I = 0x7f040282
+.field public static final panelMenuListWidth:I = 0x7f040285
 
-.field public static final passwordToggleContentDescription:I = 0x7f040283
+.field public static final passwordToggleContentDescription:I = 0x7f040286
 
-.field public static final passwordToggleDrawable:I = 0x7f040284
+.field public static final passwordToggleDrawable:I = 0x7f040287
 
-.field public static final passwordToggleEnabled:I = 0x7f040285
+.field public static final passwordToggleEnabled:I = 0x7f040288
 
-.field public static final passwordToggleTint:I = 0x7f040286
+.field public static final passwordToggleTint:I = 0x7f040289
 
-.field public static final passwordToggleTintMode:I = 0x7f040287
+.field public static final passwordToggleTintMode:I = 0x7f04028a
 
-.field public static final placeholderImage:I = 0x7f040288
+.field public static final placeholderImage:I = 0x7f04028b
 
-.field public static final placeholderImageScaleType:I = 0x7f040289
+.field public static final placeholderImageScaleType:I = 0x7f04028c
 
-.field public static final popupMenuStyle:I = 0x7f04028a
+.field public static final popupMenuStyle:I = 0x7f04028d
 
-.field public static final popupTheme:I = 0x7f04028b
+.field public static final popupTheme:I = 0x7f04028e
 
-.field public static final popupWindowStyle:I = 0x7f04028c
+.field public static final popupWindowStyle:I = 0x7f04028f
 
-.field public static final preserveIconSpacing:I = 0x7f04028d
+.field public static final preserveIconSpacing:I = 0x7f040290
 
-.field public static final pressedStateOverlayImage:I = 0x7f04028e
+.field public static final pressedStateOverlayImage:I = 0x7f040291
 
-.field public static final pressedTranslationZ:I = 0x7f04028f
+.field public static final pressedTranslationZ:I = 0x7f040292
 
-.field public static final previewBackground:I = 0x7f040290
+.field public static final previewBackground:I = 0x7f040293
 
-.field public static final progressBarAutoRotateInterval:I = 0x7f0402b6
+.field public static final progressBarAutoRotateInterval:I = 0x7f0402b9
 
-.field public static final progressBarImage:I = 0x7f0402b7
+.field public static final progressBarImage:I = 0x7f0402ba
 
-.field public static final progressBarImageScaleType:I = 0x7f0402b8
+.field public static final progressBarImageScaleType:I = 0x7f0402bb
 
-.field public static final progressBarPadding:I = 0x7f0402b9
+.field public static final progressBarPadding:I = 0x7f0402bc
 
-.field public static final progressBarStyle:I = 0x7f0402ba
+.field public static final progressBarStyle:I = 0x7f0402bd
 
-.field public static final queryBackground:I = 0x7f0402bd
+.field public static final queryBackground:I = 0x7f0402c0
 
-.field public static final queryHint:I = 0x7f0402be
+.field public static final queryHint:I = 0x7f0402c1
 
-.field public static final radioButtonStyle:I = 0x7f0402bf
+.field public static final radioButtonStyle:I = 0x7f0402c2
 
-.field public static final ratingBarStyle:I = 0x7f0402c2
+.field public static final ratingBarStyle:I = 0x7f0402c5
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402c3
+.field public static final ratingBarStyleIndicator:I = 0x7f0402c6
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402c4
+.field public static final ratingBarStyleSmall:I = 0x7f0402c7
 
-.field public static final retryImage:I = 0x7f0402c5
+.field public static final retryImage:I = 0x7f0402c8
 
-.field public static final retryImageScaleType:I = 0x7f0402c6
+.field public static final retryImageScaleType:I = 0x7f0402c9
 
-.field public static final reverseLayout:I = 0x7f0402c7
+.field public static final reverseLayout:I = 0x7f0402ca
 
-.field public static final rippleColor:I = 0x7f0402c8
+.field public static final rippleColor:I = 0x7f0402cb
 
-.field public static final roundAsCircle:I = 0x7f0402c9
+.field public static final roundAsCircle:I = 0x7f0402cc
 
-.field public static final roundBottomEnd:I = 0x7f0402ca
+.field public static final roundBottomEnd:I = 0x7f0402cd
 
-.field public static final roundBottomLeft:I = 0x7f0402cb
+.field public static final roundBottomLeft:I = 0x7f0402ce
 
-.field public static final roundBottomRight:I = 0x7f0402cc
+.field public static final roundBottomRight:I = 0x7f0402cf
 
-.field public static final roundBottomStart:I = 0x7f0402cd
+.field public static final roundBottomStart:I = 0x7f0402d0
 
-.field public static final roundTopEnd:I = 0x7f0402ce
+.field public static final roundTopEnd:I = 0x7f0402d1
 
-.field public static final roundTopLeft:I = 0x7f0402cf
+.field public static final roundTopLeft:I = 0x7f0402d2
 
-.field public static final roundTopRight:I = 0x7f0402d0
+.field public static final roundTopRight:I = 0x7f0402d3
 
-.field public static final roundTopStart:I = 0x7f0402d1
+.field public static final roundTopStart:I = 0x7f0402d4
 
-.field public static final roundWithOverlayColor:I = 0x7f0402d2
+.field public static final roundWithOverlayColor:I = 0x7f0402d5
 
-.field public static final roundedCornerRadius:I = 0x7f0402d3
+.field public static final roundedCornerRadius:I = 0x7f0402d6
 
-.field public static final roundingBorderColor:I = 0x7f0402d4
+.field public static final roundingBorderColor:I = 0x7f0402d7
 
-.field public static final roundingBorderPadding:I = 0x7f0402d5
+.field public static final roundingBorderPadding:I = 0x7f0402d8
 
-.field public static final roundingBorderWidth:I = 0x7f0402d6
+.field public static final roundingBorderWidth:I = 0x7f0402d9
 
-.field public static final scrimAnimationDuration:I = 0x7f0402e6
+.field public static final scrimAnimationDuration:I = 0x7f0402e9
 
-.field public static final scrimBackground:I = 0x7f0402e7
+.field public static final scrimBackground:I = 0x7f0402ea
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f0402e8
+.field public static final scrimVisibleHeightTrigger:I = 0x7f0402eb
 
-.field public static final searchHintIcon:I = 0x7f0402e9
+.field public static final searchHintIcon:I = 0x7f0402ec
 
-.field public static final searchIcon:I = 0x7f0402ea
+.field public static final searchIcon:I = 0x7f0402ed
 
-.field public static final searchViewStyle:I = 0x7f0402eb
+.field public static final searchViewStyle:I = 0x7f0402ee
 
-.field public static final seekBarStyle:I = 0x7f0402ed
+.field public static final seekBarStyle:I = 0x7f0402f0
 
-.field public static final selectableItemBackground:I = 0x7f0402ee
+.field public static final selectableItemBackground:I = 0x7f0402f1
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ef
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402f2
 
-.field public static final showAsAction:I = 0x7f0402f1
+.field public static final showAsAction:I = 0x7f0402f4
 
-.field public static final showDividers:I = 0x7f0402f5
+.field public static final showDividers:I = 0x7f0402f8
 
-.field public static final showMotionSpec:I = 0x7f0402f6
+.field public static final showMotionSpec:I = 0x7f0402f9
 
-.field public static final showText:I = 0x7f0402f7
+.field public static final showText:I = 0x7f0402fa
 
-.field public static final showTitle:I = 0x7f0402f8
+.field public static final showTitle:I = 0x7f0402fb
 
-.field public static final singleChoiceItemLayout:I = 0x7f0402f9
+.field public static final singleChoiceItemLayout:I = 0x7f0402fc
 
-.field public static final singleLine:I = 0x7f0402fa
+.field public static final singleLine:I = 0x7f0402fd
 
-.field public static final singleSelection:I = 0x7f0402fb
+.field public static final singleSelection:I = 0x7f0402fe
 
-.field public static final snackbarButtonStyle:I = 0x7f0402fc
+.field public static final snackbarButtonStyle:I = 0x7f0402ff
 
-.field public static final snackbarStyle:I = 0x7f0402fd
+.field public static final snackbarStyle:I = 0x7f040300
 
-.field public static final spanCount:I = 0x7f0402fe
+.field public static final spanCount:I = 0x7f040301
 
-.field public static final spinBars:I = 0x7f0402ff
+.field public static final spinBars:I = 0x7f040302
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f040300
+.field public static final spinnerDropDownItemStyle:I = 0x7f040303
 
-.field public static final spinnerStyle:I = 0x7f040301
+.field public static final spinnerStyle:I = 0x7f040304
 
-.field public static final splitTrack:I = 0x7f040302
+.field public static final splitTrack:I = 0x7f040305
 
-.field public static final srcCompat:I = 0x7f040303
+.field public static final srcCompat:I = 0x7f040306
 
-.field public static final stackFromEnd:I = 0x7f040304
+.field public static final stackFromEnd:I = 0x7f040307
 
-.field public static final state_above_anchor:I = 0x7f040305
+.field public static final state_above_anchor:I = 0x7f040308
 
-.field public static final state_collapsed:I = 0x7f040306
+.field public static final state_collapsed:I = 0x7f040309
 
-.field public static final state_collapsible:I = 0x7f040307
+.field public static final state_collapsible:I = 0x7f04030a
 
-.field public static final state_liftable:I = 0x7f040308
+.field public static final state_liftable:I = 0x7f04030b
 
-.field public static final state_lifted:I = 0x7f040309
+.field public static final state_lifted:I = 0x7f04030c
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final statusBarScrim:I = 0x7f04030b
+.field public static final statusBarScrim:I = 0x7f04030e
 
-.field public static final strokeColor:I = 0x7f04030f
+.field public static final strokeColor:I = 0x7f040312
 
-.field public static final strokeWidth:I = 0x7f040310
+.field public static final strokeWidth:I = 0x7f040313
 
-.field public static final subMenuArrow:I = 0x7f040311
+.field public static final subMenuArrow:I = 0x7f040314
 
-.field public static final submitBackground:I = 0x7f040312
+.field public static final submitBackground:I = 0x7f040315
 
-.field public static final subtitle:I = 0x7f040313
+.field public static final subtitle:I = 0x7f040316
 
-.field public static final subtitleTextAppearance:I = 0x7f040314
+.field public static final subtitleTextAppearance:I = 0x7f040317
 
-.field public static final subtitleTextColor:I = 0x7f040315
+.field public static final subtitleTextColor:I = 0x7f040318
 
-.field public static final subtitleTextStyle:I = 0x7f040316
+.field public static final subtitleTextStyle:I = 0x7f040319
 
-.field public static final suggestionRowLayout:I = 0x7f040317
+.field public static final suggestionRowLayout:I = 0x7f04031a
 
-.field public static final switchMinWidth:I = 0x7f040318
+.field public static final switchMinWidth:I = 0x7f04031b
 
-.field public static final switchPadding:I = 0x7f040319
+.field public static final switchPadding:I = 0x7f04031c
 
-.field public static final switchStyle:I = 0x7f04031a
+.field public static final switchStyle:I = 0x7f04031d
 
-.field public static final switchTextAppearance:I = 0x7f04031b
+.field public static final switchTextAppearance:I = 0x7f04031e
 
-.field public static final tabBackground:I = 0x7f04031c
+.field public static final tabBackground:I = 0x7f04031f
 
-.field public static final tabContentStart:I = 0x7f04031d
+.field public static final tabContentStart:I = 0x7f040320
 
-.field public static final tabGravity:I = 0x7f04031e
+.field public static final tabGravity:I = 0x7f040321
 
-.field public static final tabIconTint:I = 0x7f04031f
+.field public static final tabIconTint:I = 0x7f040322
 
-.field public static final tabIconTintMode:I = 0x7f040320
+.field public static final tabIconTintMode:I = 0x7f040323
 
-.field public static final tabIndicator:I = 0x7f040321
+.field public static final tabIndicator:I = 0x7f040324
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f040322
+.field public static final tabIndicatorAnimationDuration:I = 0x7f040325
 
-.field public static final tabIndicatorColor:I = 0x7f040323
+.field public static final tabIndicatorColor:I = 0x7f040326
 
-.field public static final tabIndicatorFullWidth:I = 0x7f040324
+.field public static final tabIndicatorFullWidth:I = 0x7f040327
 
-.field public static final tabIndicatorGravity:I = 0x7f040325
+.field public static final tabIndicatorGravity:I = 0x7f040328
 
-.field public static final tabIndicatorHeight:I = 0x7f040326
+.field public static final tabIndicatorHeight:I = 0x7f040329
 
-.field public static final tabInlineLabel:I = 0x7f040327
+.field public static final tabInlineLabel:I = 0x7f04032a
 
-.field public static final tabMaxWidth:I = 0x7f040328
+.field public static final tabMaxWidth:I = 0x7f04032b
 
-.field public static final tabMinWidth:I = 0x7f040329
+.field public static final tabMinWidth:I = 0x7f04032c
 
-.field public static final tabMode:I = 0x7f04032a
+.field public static final tabMode:I = 0x7f04032d
 
-.field public static final tabPadding:I = 0x7f04032b
+.field public static final tabPadding:I = 0x7f04032e
 
-.field public static final tabPaddingBottom:I = 0x7f04032c
+.field public static final tabPaddingBottom:I = 0x7f04032f
 
-.field public static final tabPaddingEnd:I = 0x7f04032d
+.field public static final tabPaddingEnd:I = 0x7f040330
 
-.field public static final tabPaddingStart:I = 0x7f04032e
+.field public static final tabPaddingStart:I = 0x7f040331
 
-.field public static final tabPaddingTop:I = 0x7f04032f
+.field public static final tabPaddingTop:I = 0x7f040332
 
-.field public static final tabRippleColor:I = 0x7f040330
+.field public static final tabRippleColor:I = 0x7f040333
 
-.field public static final tabSelectedTextColor:I = 0x7f040331
+.field public static final tabSelectedTextColor:I = 0x7f040334
 
-.field public static final tabStyle:I = 0x7f040332
+.field public static final tabStyle:I = 0x7f040335
 
-.field public static final tabTextAppearance:I = 0x7f040333
+.field public static final tabTextAppearance:I = 0x7f040336
 
-.field public static final tabTextColor:I = 0x7f040334
+.field public static final tabTextColor:I = 0x7f040337
 
-.field public static final tabUnboundedRipple:I = 0x7f040335
+.field public static final tabUnboundedRipple:I = 0x7f040338
 
-.field public static final textAllCaps:I = 0x7f040339
+.field public static final textAllCaps:I = 0x7f04033c
 
-.field public static final textAppearanceBody1:I = 0x7f04033a
+.field public static final textAppearanceBody1:I = 0x7f04033d
 
-.field public static final textAppearanceBody2:I = 0x7f04033b
+.field public static final textAppearanceBody2:I = 0x7f04033e
 
-.field public static final textAppearanceButton:I = 0x7f04033c
+.field public static final textAppearanceButton:I = 0x7f04033f
 
-.field public static final textAppearanceCaption:I = 0x7f04033d
+.field public static final textAppearanceCaption:I = 0x7f040340
 
-.field public static final textAppearanceHeadline1:I = 0x7f04033e
+.field public static final textAppearanceHeadline1:I = 0x7f040341
 
-.field public static final textAppearanceHeadline2:I = 0x7f04033f
+.field public static final textAppearanceHeadline2:I = 0x7f040342
 
-.field public static final textAppearanceHeadline3:I = 0x7f040340
+.field public static final textAppearanceHeadline3:I = 0x7f040343
 
-.field public static final textAppearanceHeadline4:I = 0x7f040341
+.field public static final textAppearanceHeadline4:I = 0x7f040344
 
-.field public static final textAppearanceHeadline5:I = 0x7f040342
+.field public static final textAppearanceHeadline5:I = 0x7f040345
 
-.field public static final textAppearanceHeadline6:I = 0x7f040343
+.field public static final textAppearanceHeadline6:I = 0x7f040346
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040344
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040347
 
-.field public static final textAppearanceListItem:I = 0x7f040345
+.field public static final textAppearanceListItem:I = 0x7f040348
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040346
+.field public static final textAppearanceListItemSecondary:I = 0x7f040349
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040347
+.field public static final textAppearanceListItemSmall:I = 0x7f04034a
 
-.field public static final textAppearanceOverline:I = 0x7f040348
+.field public static final textAppearanceOverline:I = 0x7f04034b
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040349
+.field public static final textAppearancePopupMenuHeader:I = 0x7f04034c
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04034a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04034d
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04034b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04034e
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04034c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04034f
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04034d
+.field public static final textAppearanceSubtitle1:I = 0x7f040350
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04034e
+.field public static final textAppearanceSubtitle2:I = 0x7f040351
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04034f
+.field public static final textColorAlertDialogListItem:I = 0x7f040352
 
-.field public static final textColorSearchUrl:I = 0x7f040350
+.field public static final textColorSearchUrl:I = 0x7f040353
 
-.field public static final textEndPadding:I = 0x7f040351
+.field public static final textEndPadding:I = 0x7f040354
 
-.field public static final textInputStyle:I = 0x7f040352
+.field public static final textInputStyle:I = 0x7f040355
 
-.field public static final textStartPadding:I = 0x7f040353
+.field public static final textStartPadding:I = 0x7f040356
 
-.field public static final theme:I = 0x7f040355
+.field public static final theme:I = 0x7f040358
 
-.field public static final thickness:I = 0x7f0403a6
+.field public static final thickness:I = 0x7f0403a9
 
-.field public static final thumbTextPadding:I = 0x7f0403a7
+.field public static final thumbTextPadding:I = 0x7f0403aa
 
-.field public static final thumbTint:I = 0x7f0403a8
+.field public static final thumbTint:I = 0x7f0403ab
 
-.field public static final thumbTintMode:I = 0x7f0403a9
+.field public static final thumbTintMode:I = 0x7f0403ac
 
-.field public static final tickMark:I = 0x7f0403aa
+.field public static final tickMark:I = 0x7f0403ad
 
-.field public static final tickMarkTint:I = 0x7f0403ab
+.field public static final tickMarkTint:I = 0x7f0403ae
 
-.field public static final tickMarkTintMode:I = 0x7f0403ac
+.field public static final tickMarkTintMode:I = 0x7f0403af
 
-.field public static final tint:I = 0x7f0403ad
+.field public static final tint:I = 0x7f0403b0
 
-.field public static final tintMode:I = 0x7f0403ae
+.field public static final tintMode:I = 0x7f0403b1
 
-.field public static final title:I = 0x7f0403af
+.field public static final title:I = 0x7f0403b2
 
-.field public static final titleEnabled:I = 0x7f0403b0
+.field public static final titleEnabled:I = 0x7f0403b3
 
-.field public static final titleMargin:I = 0x7f0403b1
+.field public static final titleMargin:I = 0x7f0403b4
 
-.field public static final titleMarginBottom:I = 0x7f0403b2
+.field public static final titleMarginBottom:I = 0x7f0403b5
 
-.field public static final titleMarginEnd:I = 0x7f0403b3
+.field public static final titleMarginEnd:I = 0x7f0403b6
 
-.field public static final titleMarginStart:I = 0x7f0403b4
+.field public static final titleMarginStart:I = 0x7f0403b7
 
-.field public static final titleMarginTop:I = 0x7f0403b5
+.field public static final titleMarginTop:I = 0x7f0403b8
 
-.field public static final titleMargins:I = 0x7f0403b6
+.field public static final titleMargins:I = 0x7f0403b9
 
-.field public static final titleTextAppearance:I = 0x7f0403b7
+.field public static final titleTextAppearance:I = 0x7f0403ba
 
-.field public static final titleTextColor:I = 0x7f0403b8
+.field public static final titleTextColor:I = 0x7f0403bb
 
-.field public static final titleTextStyle:I = 0x7f0403b9
+.field public static final titleTextStyle:I = 0x7f0403bc
 
-.field public static final toolbarId:I = 0x7f0403ba
+.field public static final toolbarId:I = 0x7f0403bd
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f0403bb
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0403be
 
-.field public static final toolbarStyle:I = 0x7f0403bc
+.field public static final toolbarStyle:I = 0x7f0403bf
 
-.field public static final tooltipForegroundColor:I = 0x7f0403bd
+.field public static final tooltipForegroundColor:I = 0x7f0403c0
 
-.field public static final tooltipFrameBackground:I = 0x7f0403be
+.field public static final tooltipFrameBackground:I = 0x7f0403c1
 
-.field public static final tooltipText:I = 0x7f0403bf
+.field public static final tooltipText:I = 0x7f0403c2
 
-.field public static final track:I = 0x7f0403c0
+.field public static final track:I = 0x7f0403c3
 
-.field public static final trackTint:I = 0x7f0403c1
+.field public static final trackTint:I = 0x7f0403c4
 
-.field public static final trackTintMode:I = 0x7f0403c2
+.field public static final trackTintMode:I = 0x7f0403c5
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
-.field public static final useCompatPadding:I = 0x7f0403d7
+.field public static final useCompatPadding:I = 0x7f0403da
 
-.field public static final viewAspectRatio:I = 0x7f0403db
+.field public static final viewAspectRatio:I = 0x7f0403e0
 
-.field public static final viewInflaterClass:I = 0x7f0403dc
+.field public static final viewInflaterClass:I = 0x7f0403e1
 
-.field public static final voiceIcon:I = 0x7f0403dd
+.field public static final voiceIcon:I = 0x7f0403e2
 
-.field public static final windowActionBar:I = 0x7f0403df
+.field public static final windowActionBar:I = 0x7f0403e4
 
-.field public static final windowActionBarOverlay:I = 0x7f0403e0
+.field public static final windowActionBarOverlay:I = 0x7f0403e5
 
-.field public static final windowActionModeOverlay:I = 0x7f0403e1
+.field public static final windowActionModeOverlay:I = 0x7f0403e6
 
-.field public static final windowFixedHeightMajor:I = 0x7f0403e2
+.field public static final windowFixedHeightMajor:I = 0x7f0403e7
 
-.field public static final windowFixedHeightMinor:I = 0x7f0403e3
+.field public static final windowFixedHeightMinor:I = 0x7f0403e8
 
-.field public static final windowFixedWidthMajor:I = 0x7f0403e4
+.field public static final windowFixedWidthMajor:I = 0x7f0403e9
 
-.field public static final windowFixedWidthMinor:I = 0x7f0403e5
+.field public static final windowFixedWidthMinor:I = 0x7f0403ea
 
-.field public static final windowMinWidthMajor:I = 0x7f0403e6
+.field public static final windowMinWidthMajor:I = 0x7f0403eb
 
-.field public static final windowMinWidthMinor:I = 0x7f0403e7
+.field public static final windowMinWidthMinor:I = 0x7f0403ec
 
-.field public static final windowNoTitle:I = 0x7f0403e8
+.field public static final windowNoTitle:I = 0x7f0403ed
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$c.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$c.smali
index 2a49c74c4b..9d7d3b7f53 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$c.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$c.smali
@@ -75,215 +75,215 @@
 
 .field public static final background_material_light:I = 0x7f06001f
 
-.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060035
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
 
-.field public static final bright_foreground_material_dark:I = 0x7f060038
+.field public static final bright_foreground_material_dark:I = 0x7f060039
 
-.field public static final bright_foreground_material_light:I = 0x7f060039
+.field public static final bright_foreground_material_light:I = 0x7f06003a
 
-.field public static final button_color_selector:I = 0x7f06003e
+.field public static final button_color_selector:I = 0x7f06003f
 
-.field public static final button_material_dark:I = 0x7f06003f
+.field public static final button_material_dark:I = 0x7f060040
 
-.field public static final button_material_light:I = 0x7f060040
+.field public static final button_material_light:I = 0x7f060041
 
-.field public static final cardview_dark_background:I = 0x7f060041
+.field public static final cardview_dark_background:I = 0x7f060042
 
-.field public static final cardview_light_background:I = 0x7f060042
+.field public static final cardview_light_background:I = 0x7f060043
 
-.field public static final cardview_shadow_end_color:I = 0x7f060043
+.field public static final cardview_shadow_end_color:I = 0x7f060044
 
-.field public static final cardview_shadow_start_color:I = 0x7f060044
+.field public static final cardview_shadow_start_color:I = 0x7f060045
 
-.field public static final colorPrimary:I = 0x7f06004a
+.field public static final colorPrimary:I = 0x7f06004b
 
-.field public static final colorPrimaryDark:I = 0x7f06004b
+.field public static final colorPrimaryDark:I = 0x7f06004c
 
-.field public static final design_bottom_navigation_shadow_color:I = 0x7f060059
+.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005c
 
-.field public static final design_default_color_primary:I = 0x7f06005a
+.field public static final design_default_color_primary:I = 0x7f06005d
 
-.field public static final design_default_color_primary_dark:I = 0x7f06005b
+.field public static final design_default_color_primary_dark:I = 0x7f06005e
 
-.field public static final design_error:I = 0x7f06005c
+.field public static final design_error:I = 0x7f06005f
 
-.field public static final design_fab_shadow_end_color:I = 0x7f06005d
+.field public static final design_fab_shadow_end_color:I = 0x7f060060
 
-.field public static final design_fab_shadow_mid_color:I = 0x7f06005e
+.field public static final design_fab_shadow_mid_color:I = 0x7f060061
 
-.field public static final design_fab_shadow_start_color:I = 0x7f06005f
+.field public static final design_fab_shadow_start_color:I = 0x7f060062
 
-.field public static final design_fab_stroke_end_inner_color:I = 0x7f060060
+.field public static final design_fab_stroke_end_inner_color:I = 0x7f060063
 
-.field public static final design_fab_stroke_end_outer_color:I = 0x7f060061
+.field public static final design_fab_stroke_end_outer_color:I = 0x7f060064
 
-.field public static final design_fab_stroke_top_inner_color:I = 0x7f060062
+.field public static final design_fab_stroke_top_inner_color:I = 0x7f060065
 
-.field public static final design_fab_stroke_top_outer_color:I = 0x7f060063
+.field public static final design_fab_stroke_top_outer_color:I = 0x7f060066
 
-.field public static final design_snackbar_background_color:I = 0x7f060064
+.field public static final design_snackbar_background_color:I = 0x7f060067
 
-.field public static final design_tint_password_toggle:I = 0x7f060065
+.field public static final design_tint_password_toggle:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060066
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060067
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f060068
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f060069
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final error_color_material_dark:I = 0x7f06006a
+.field public static final error_color_material_dark:I = 0x7f06006d
 
-.field public static final error_color_material_light:I = 0x7f06006b
+.field public static final error_color_material_light:I = 0x7f06006e
 
-.field public static final flexInputIconColor:I = 0x7f06006d
+.field public static final flexInputIconColor:I = 0x7f060070
 
-.field public static final flexInputIconColorActivated:I = 0x7f06006e
+.field public static final flexInputIconColorActivated:I = 0x7f060071
 
-.field public static final flexInputIconColorDisabled:I = 0x7f06006f
+.field public static final flexInputIconColorDisabled:I = 0x7f060072
 
-.field public static final foreground_material_dark:I = 0x7f060070
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060071
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060080
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060081
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f06008f
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060090
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060091
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060092
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060093
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060094
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060095
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060096
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060097
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f060098
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f060099
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009a
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009b
+.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009e
 
-.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009c
+.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009f
 
-.field public static final mtrl_btn_bg_color_disabled:I = 0x7f06009d
+.field public static final mtrl_btn_bg_color_disabled:I = 0x7f0600a0
 
-.field public static final mtrl_btn_bg_color_selector:I = 0x7f06009e
+.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a1
 
-.field public static final mtrl_btn_ripple_color:I = 0x7f06009f
+.field public static final mtrl_btn_ripple_color:I = 0x7f0600a2
 
-.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a0
+.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a3
 
-.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a1
+.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a4
 
-.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a2
+.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a5
 
-.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a3
+.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a6
 
-.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a4
+.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a7
 
-.field public static final mtrl_chip_background_color:I = 0x7f0600a5
+.field public static final mtrl_chip_background_color:I = 0x7f0600a8
 
-.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a6
+.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a9
 
-.field public static final mtrl_chip_ripple_color:I = 0x7f0600a7
+.field public static final mtrl_chip_ripple_color:I = 0x7f0600aa
 
-.field public static final mtrl_chip_text_color:I = 0x7f0600a8
+.field public static final mtrl_chip_text_color:I = 0x7f0600ab
 
-.field public static final mtrl_fab_ripple_color:I = 0x7f0600a9
+.field public static final mtrl_fab_ripple_color:I = 0x7f0600ac
 
-.field public static final mtrl_scrim_color:I = 0x7f0600aa
+.field public static final mtrl_scrim_color:I = 0x7f0600ad
 
-.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ab
+.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ae
 
-.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600ac
+.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600af
 
-.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600ad
+.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600b0
 
-.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600ae
+.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b1
 
-.field public static final mtrl_tabs_ripple_color:I = 0x7f0600af
+.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b2
 
-.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b0
+.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b3
 
-.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b1
+.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b4
 
-.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b2
+.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b5
 
-.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b3
+.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b6
 
-.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b4
+.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b7
 
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final notification_material_background_media_default_color:I = 0x7f0600b7
+.field public static final notification_material_background_media_default_color:I = 0x7f0600ba
 
-.field public static final primary_dark_material_dark:I = 0x7f0600d9
+.field public static final primary_dark_material_dark:I = 0x7f0600dc
 
-.field public static final primary_dark_material_light:I = 0x7f0600da
+.field public static final primary_dark_material_light:I = 0x7f0600dd
 
-.field public static final primary_material_dark:I = 0x7f0600ea
+.field public static final primary_material_dark:I = 0x7f0600ed
 
-.field public static final primary_material_light:I = 0x7f0600eb
+.field public static final primary_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ec
+.field public static final primary_text_default_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ed
+.field public static final primary_text_default_material_light:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ee
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f1
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f2
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fb
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600ff
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f060100
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060133
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060134
 
-.field public static final tab_color_selector:I = 0x7f060133
+.field public static final tab_color_selector:I = 0x7f060135
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060136
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060137
 
 
 # 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 05100c2ef6..b83b3876bc 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali
@@ -15,275 +15,275 @@
 
 
 # static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080017
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080017
+.field public static final abc_action_bar_item_background_material:I = 0x7f080018
 
-.field public static final abc_btn_borderless_material:I = 0x7f080018
+.field public static final abc_btn_borderless_material:I = 0x7f080019
 
-.field public static final abc_btn_check_material:I = 0x7f080019
+.field public static final abc_btn_check_material:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
 
-.field public static final abc_btn_colored_material:I = 0x7f08001c
+.field public static final abc_btn_colored_material:I = 0x7f08001d
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
 
-.field public static final abc_btn_radio_material:I = 0x7f08001e
+.field public static final abc_btn_radio_material:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080023
+.field public static final abc_cab_background_internal_bg:I = 0x7f080024
 
-.field public static final abc_cab_background_top_material:I = 0x7f080024
+.field public static final abc_cab_background_top_material:I = 0x7f080025
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
 
-.field public static final abc_control_background_material:I = 0x7f080026
+.field public static final abc_control_background_material:I = 0x7f080027
 
-.field public static final abc_dialog_material_background:I = 0x7f080027
+.field public static final abc_dialog_material_background:I = 0x7f080028
 
-.field public static final abc_edit_text_material:I = 0x7f080028
+.field public static final abc_edit_text_material:I = 0x7f080029
 
-.field public static final abc_ic_ab_back_material:I = 0x7f080029
+.field public static final abc_ic_ab_back_material:I = 0x7f08002a
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
 
-.field public static final abc_ic_clear_material:I = 0x7f08002b
+.field public static final abc_ic_clear_material:I = 0x7f08002c
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
 
-.field public static final abc_ic_search_api_material:I = 0x7f080034
+.field public static final abc_ic_search_api_material:I = 0x7f080035
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080035
+.field public static final abc_ic_star_black_16dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080036
+.field public static final abc_ic_star_black_36dp:I = 0x7f080037
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080037
+.field public static final abc_ic_star_black_48dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003c
+.field public static final abc_item_background_holo_dark:I = 0x7f08003d
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003d
+.field public static final abc_item_background_holo_light:I = 0x7f08003e
 
-.field public static final abc_list_divider_material:I = 0x7f08003e
+.field public static final abc_list_divider_material:I = 0x7f08003f
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
 
-.field public static final abc_list_focused_holo:I = 0x7f080040
+.field public static final abc_list_focused_holo:I = 0x7f080041
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080041
+.field public static final abc_list_longpressed_holo:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080043
+.field public static final abc_list_pressed_holo_light:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080048
+.field public static final abc_list_selector_holo_dark:I = 0x7f080049
 
-.field public static final abc_list_selector_holo_light:I = 0x7f080049
+.field public static final abc_list_selector_holo_light:I = 0x7f08004a
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_material:I = 0x7f08004d
+.field public static final abc_ratingbar_material:I = 0x7f08004e
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004e
+.field public static final abc_ratingbar_small_material:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080054
+.field public static final abc_seekbar_thumb_material:I = 0x7f080055
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
 
-.field public static final abc_seekbar_track_material:I = 0x7f080056
+.field public static final abc_seekbar_track_material:I = 0x7f080057
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
 
-.field public static final abc_switch_thumb_material:I = 0x7f080059
+.field public static final abc_switch_thumb_material:I = 0x7f08005a
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005b
+.field public static final abc_tab_indicator_material:I = 0x7f08005c
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
 
-.field public static final abc_text_cursor_material:I = 0x7f08005d
+.field public static final abc_text_cursor_material:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
 
-.field public static final abc_textfield_search_material:I = 0x7f080068
+.field public static final abc_textfield_search_material:I = 0x7f080069
 
-.field public static final abc_vector_test:I = 0x7f080069
+.field public static final abc_vector_test:I = 0x7f08006a
 
-.field public static final avd_hide_password:I = 0x7f080089
+.field public static final avd_hide_password:I = 0x7f08008a
 
-.field public static final avd_show_password:I = 0x7f08008a
+.field public static final avd_show_password:I = 0x7f08008b
 
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800b2
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
 
-.field public static final design_fab_background:I = 0x7f0800b3
+.field public static final design_fab_background:I = 0x7f0800b6
 
-.field public static final design_ic_visibility:I = 0x7f0800b4
+.field public static final design_ic_visibility:I = 0x7f0800b7
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b5
+.field public static final design_ic_visibility_off:I = 0x7f0800b8
 
-.field public static final design_password_eye:I = 0x7f0800b6
+.field public static final design_password_eye:I = 0x7f0800b9
 
-.field public static final design_snackbar_background:I = 0x7f0800b7
+.field public static final design_snackbar_background:I = 0x7f0800ba
 
-.field public static final file_item_selection_indicator_btn:I = 0x7f0801ab
+.field public static final file_item_selection_indicator_btn:I = 0x7f0801ba
 
-.field public static final ic_add_24dp:I = 0x7f0801c2
+.field public static final ic_add_24dp:I = 0x7f0801d1
 
-.field public static final ic_add_a_photo_24dp:I = 0x7f0801c3
+.field public static final ic_add_a_photo_24dp:I = 0x7f0801d2
 
-.field public static final ic_arrow_back_24dp:I = 0x7f0801cf
+.field public static final ic_arrow_back_24dp:I = 0x7f0801de
 
-.field public static final ic_attach_file_24dp:I = 0x7f0801d6
+.field public static final ic_attach_file_24dp:I = 0x7f0801e5
 
-.field public static final ic_camera_front_white_24dp:I = 0x7f080209
+.field public static final ic_camera_front_white_24dp:I = 0x7f080218
 
-.field public static final ic_camera_rear_white_24dp:I = 0x7f08020a
+.field public static final ic_camera_rear_white_24dp:I = 0x7f080219
 
-.field public static final ic_check_circle_24dp:I = 0x7f080222
+.field public static final ic_check_circle_24dp:I = 0x7f080231
 
-.field public static final ic_clear_24dp:I = 0x7f08022e
+.field public static final ic_clear_24dp:I = 0x7f08023e
 
-.field public static final ic_done_activated_24dp:I = 0x7f080247
+.field public static final ic_done_activated_24dp:I = 0x7f080257
 
-.field public static final ic_file_24dp:I = 0x7f08026d
+.field public static final ic_file_24dp:I = 0x7f08027d
 
-.field public static final ic_file_upload_24dp:I = 0x7f08027c
+.field public static final ic_file_upload_24dp:I = 0x7f08028c
 
-.field public static final ic_flash_auto_24dp:I = 0x7f080281
+.field public static final ic_flash_auto_24dp:I = 0x7f080291
 
-.field public static final ic_flash_off_24dp:I = 0x7f080282
+.field public static final ic_flash_off_24dp:I = 0x7f080292
 
-.field public static final ic_flash_on_24dp:I = 0x7f080283
+.field public static final ic_flash_on_24dp:I = 0x7f080293
 
-.field public static final ic_gif_24dp:I = 0x7f08028a
+.field public static final ic_gif_24dp:I = 0x7f08029a
 
-.field public static final ic_image_24dp:I = 0x7f0802bc
+.field public static final ic_image_24dp:I = 0x7f0802cc
 
-.field public static final ic_insert_emoticon_24dp:I = 0x7f0802c5
+.field public static final ic_insert_emoticon_24dp:I = 0x7f0802d5
 
-.field public static final ic_keyboard_24dp:I = 0x7f0802cb
+.field public static final ic_keyboard_24dp:I = 0x7f0802db
 
-.field public static final ic_launch_24dp:I = 0x7f0802cc
+.field public static final ic_launch_24dp:I = 0x7f0802dc
 
-.field public static final ic_movie_24dp:I = 0x7f0802ef
+.field public static final ic_movie_24dp:I = 0x7f0802ff
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802f0
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080300
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802f1
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080301
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802f2
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080302
 
-.field public static final ic_send_24dp:I = 0x7f080353
+.field public static final ic_send_24dp:I = 0x7f080364
 
-.field public static final ic_take_photo:I = 0x7f080374
+.field public static final ic_take_photo:I = 0x7f080386
 
-.field public static final mtrl_snackbar_background:I = 0x7f080439
+.field public static final mtrl_snackbar_background:I = 0x7f080454
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f08043a
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080455
 
-.field public static final navigation_empty_icon:I = 0x7f08043b
+.field public static final navigation_empty_icon:I = 0x7f080456
 
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
-.field public static final tooltip_frame_dark:I = 0x7f08044c
+.field public static final tooltip_frame_dark:I = 0x7f08046a
 
-.field public static final tooltip_frame_light:I = 0x7f08044d
+.field public static final tooltip_frame_light:I = 0x7f08046b
 
 
 # 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 09c6e24280..1d2632a0f7 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$e.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$e.smali
@@ -65,385 +65,385 @@
 
 .field public static final alertTitle:I = 0x7f0a0061
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final attachment_clear_btn:I = 0x7f0a0081
+.field public static final attachment_clear_btn:I = 0x7f0a0082
 
-.field public static final attachment_preview_container:I = 0x7f0a0082
+.field public static final attachment_preview_container:I = 0x7f0a0083
 
-.field public static final attachment_preview_list:I = 0x7f0a0083
+.field public static final attachment_preview_list:I = 0x7f0a0084
 
-.field public static final auto:I = 0x7f0a00b8
+.field public static final auto:I = 0x7f0a00b9
 
-.field public static final back:I = 0x7f0a00ba
+.field public static final back:I = 0x7f0a00bb
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final buttonPanel:I = 0x7f0a010c
+.field public static final buttonPanel:I = 0x7f0a010d
 
-.field public static final camera_container:I = 0x7f0a0112
+.field public static final camera_container:I = 0x7f0a0113
 
-.field public static final camera_facing_btn:I = 0x7f0a0113
+.field public static final camera_facing_btn:I = 0x7f0a0114
 
-.field public static final camera_flash_btn:I = 0x7f0a0114
+.field public static final camera_flash_btn:I = 0x7f0a0115
 
-.field public static final camera_view:I = 0x7f0a0115
+.field public static final camera_view:I = 0x7f0a0116
 
-.field public static final camera_view_cropper:I = 0x7f0a0116
+.field public static final camera_view_cropper:I = 0x7f0a0117
 
-.field public static final cancel_action:I = 0x7f0a0117
+.field public static final cancel_action:I = 0x7f0a0118
 
-.field public static final center:I = 0x7f0a0123
+.field public static final center:I = 0x7f0a0124
 
-.field public static final centerCrop:I = 0x7f0a0124
+.field public static final centerCrop:I = 0x7f0a0125
 
-.field public static final centerInside:I = 0x7f0a0125
+.field public static final centerInside:I = 0x7f0a0126
 
-.field public static final checkbox:I = 0x7f0a0212
+.field public static final checkbox:I = 0x7f0a0213
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final container:I = 0x7f0a0231
+.field public static final container:I = 0x7f0a0232
 
-.field public static final content:I = 0x7f0a0232
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0233
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final content_iv:I = 0x7f0a0234
+.field public static final content_iv:I = 0x7f0a0235
 
-.field public static final content_pager:I = 0x7f0a0235
+.field public static final content_pager:I = 0x7f0a0236
 
-.field public static final content_tabs:I = 0x7f0a0236
+.field public static final content_tabs:I = 0x7f0a0237
 
-.field public static final coordinator:I = 0x7f0a0237
+.field public static final coordinator:I = 0x7f0a0238
 
-.field public static final custom:I = 0x7f0a0247
+.field public static final custom:I = 0x7f0a0250
 
-.field public static final customPanel:I = 0x7f0a0248
+.field public static final customPanel:I = 0x7f0a0251
 
-.field public static final decor_content_parent:I = 0x7f0a024c
+.field public static final decor_content_parent:I = 0x7f0a0255
 
-.field public static final default_activity_button:I = 0x7f0a024d
+.field public static final default_activity_button:I = 0x7f0a0256
 
-.field public static final design_bottom_sheet:I = 0x7f0a024e
+.field public static final design_bottom_sheet:I = 0x7f0a0257
 
-.field public static final design_menu_item_action_area:I = 0x7f0a024f
+.field public static final design_menu_item_action_area:I = 0x7f0a0258
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a0250
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a0259
 
-.field public static final design_menu_item_text:I = 0x7f0a0251
+.field public static final design_menu_item_text:I = 0x7f0a025a
 
-.field public static final design_navigation_view:I = 0x7f0a0252
+.field public static final design_navigation_view:I = 0x7f0a025b
 
-.field public static final edit_query:I = 0x7f0a02a3
+.field public static final edit_query:I = 0x7f0a02ac
 
-.field public static final emoji_btn:I = 0x7f0a02a9
+.field public static final emoji_btn:I = 0x7f0a02b2
 
-.field public static final emoji_container:I = 0x7f0a02aa
+.field public static final emoji_container:I = 0x7f0a02b3
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final end_padder:I = 0x7f0a02bf
+.field public static final end_padder:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02c4
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02c5
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final file_name_tv:I = 0x7f0a02d7
+.field public static final file_name_tv:I = 0x7f0a02e0
 
-.field public static final file_subtitle_tv:I = 0x7f0a02d8
+.field public static final file_subtitle_tv:I = 0x7f0a02e1
 
-.field public static final fill:I = 0x7f0a02d9
+.field public static final fill:I = 0x7f0a02e2
 
-.field public static final filled:I = 0x7f0a02dc
+.field public static final filled:I = 0x7f0a02e5
 
-.field public static final fitBottomStart:I = 0x7f0a02dd
+.field public static final fitBottomStart:I = 0x7f0a02e6
 
-.field public static final fitCenter:I = 0x7f0a02de
+.field public static final fitCenter:I = 0x7f0a02e7
 
-.field public static final fitEnd:I = 0x7f0a02df
+.field public static final fitEnd:I = 0x7f0a02e8
 
-.field public static final fitStart:I = 0x7f0a02e0
+.field public static final fitStart:I = 0x7f0a02e9
 
-.field public static final fitXY:I = 0x7f0a02e1
+.field public static final fitXY:I = 0x7f0a02ea
 
-.field public static final fixed:I = 0x7f0a02e2
+.field public static final fixed:I = 0x7f0a02eb
 
-.field public static final focusCrop:I = 0x7f0a02e5
+.field public static final focusCrop:I = 0x7f0a02ee
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final front:I = 0x7f0a030e
+.field public static final front:I = 0x7f0a0313
 
-.field public static final ghost_view:I = 0x7f0a030f
+.field public static final ghost_view:I = 0x7f0a0314
 
-.field public static final gone:I = 0x7f0a0321
+.field public static final gone:I = 0x7f0a032a
 
-.field public static final group_divider:I = 0x7f0a0322
+.field public static final group_divider:I = 0x7f0a032b
 
-.field public static final home:I = 0x7f0a0382
+.field public static final home:I = 0x7f0a0392
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final image:I = 0x7f0a0388
+.field public static final image:I = 0x7f0a0398
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final invisible:I = 0x7f0a03a8
+.field public static final invisible:I = 0x7f0a03b8
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final item_check_indicator:I = 0x7f0a03c9
+.field public static final item_check_indicator:I = 0x7f0a03d9
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a03fa
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040a
 
-.field public static final labeled:I = 0x7f0a0401
+.field public static final labeled:I = 0x7f0a0411
 
-.field public static final largeLabel:I = 0x7f0a0402
+.field public static final largeLabel:I = 0x7f0a0412
 
-.field public static final launch_btn:I = 0x7f0a0403
+.field public static final launch_btn:I = 0x7f0a0413
 
-.field public static final launch_camera_btn:I = 0x7f0a0404
+.field public static final launch_camera_btn:I = 0x7f0a0414
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final list:I = 0x7f0a040c
+.field public static final list:I = 0x7f0a041c
 
-.field public static final listMode:I = 0x7f0a040d
+.field public static final listMode:I = 0x7f0a041d
 
-.field public static final list_item:I = 0x7f0a040e
+.field public static final list_item:I = 0x7f0a041e
 
-.field public static final main_input_container:I = 0x7f0a0413
+.field public static final main_input_container:I = 0x7f0a0423
 
-.field public static final masked:I = 0x7f0a042b
+.field public static final masked:I = 0x7f0a043b
 
-.field public static final media_actions:I = 0x7f0a042c
+.field public static final media_actions:I = 0x7f0a043c
 
-.field public static final message:I = 0x7f0a046f
+.field public static final message:I = 0x7f0a0482
 
-.field public static final mini:I = 0x7f0a0474
+.field public static final mini:I = 0x7f0a0487
 
-.field public static final mtrl_child_content_container:I = 0x7f0a0475
+.field public static final mtrl_child_content_container:I = 0x7f0a0488
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0476
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0489
 
-.field public static final multiply:I = 0x7f0a0477
+.field public static final multiply:I = 0x7f0a048a
 
-.field public static final navigation_header_container:I = 0x7f0a0479
+.field public static final navigation_header_container:I = 0x7f0a048c
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final off:I = 0x7f0a04af
+.field public static final off:I = 0x7f0a04c5
 
-.field public static final on:I = 0x7f0a04b1
+.field public static final on:I = 0x7f0a04c7
 
-.field public static final outline:I = 0x7f0a04b2
+.field public static final outline:I = 0x7f0a04c8
 
-.field public static final packed:I = 0x7f0a04bf
+.field public static final packed:I = 0x7f0a04d5
 
-.field public static final page_tabs:I = 0x7f0a04c0
+.field public static final page_tabs:I = 0x7f0a04d6
 
-.field public static final parallax:I = 0x7f0a04c1
+.field public static final parallax:I = 0x7f0a04d7
 
-.field public static final parent:I = 0x7f0a04c2
+.field public static final parent:I = 0x7f0a04d8
 
-.field public static final parentPanel:I = 0x7f0a04c3
+.field public static final parentPanel:I = 0x7f0a04d9
 
-.field public static final parent_matrix:I = 0x7f0a04c4
+.field public static final parent_matrix:I = 0x7f0a04da
 
-.field public static final percent:I = 0x7f0a04f5
+.field public static final percent:I = 0x7f0a050c
 
-.field public static final permissions_container:I = 0x7f0a04fe
+.field public static final permissions_container:I = 0x7f0a0515
 
-.field public static final permissions_req_btn:I = 0x7f0a04ff
+.field public static final permissions_req_btn:I = 0x7f0a0516
 
-.field public static final pin:I = 0x7f0a0500
+.field public static final pin:I = 0x7f0a0517
 
-.field public static final progress_circular:I = 0x7f0a0543
+.field public static final progress_circular:I = 0x7f0a0553
 
-.field public static final progress_horizontal:I = 0x7f0a0545
+.field public static final progress_horizontal:I = 0x7f0a0555
 
-.field public static final radio:I = 0x7f0a0550
+.field public static final radio:I = 0x7f0a0560
 
-.field public static final redEye:I = 0x7f0a0556
+.field public static final redEye:I = 0x7f0a0566
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final save_image_matrix:I = 0x7f0a0596
+.field public static final save_image_matrix:I = 0x7f0a05b0
 
-.field public static final save_non_transition_alpha:I = 0x7f0a0597
+.field public static final save_non_transition_alpha:I = 0x7f0a05b1
 
-.field public static final save_scale_type:I = 0x7f0a0598
+.field public static final save_scale_type:I = 0x7f0a05b2
 
-.field public static final screen:I = 0x7f0a059a
+.field public static final screen:I = 0x7f0a05b4
 
-.field public static final scrollIndicatorDown:I = 0x7f0a059c
+.field public static final scrollIndicatorDown:I = 0x7f0a05b6
 
-.field public static final scrollIndicatorUp:I = 0x7f0a059d
+.field public static final scrollIndicatorUp:I = 0x7f0a05b7
 
-.field public static final scrollView:I = 0x7f0a059e
+.field public static final scrollView:I = 0x7f0a05b8
 
-.field public static final scrollable:I = 0x7f0a05a0
+.field public static final scrollable:I = 0x7f0a05ba
 
-.field public static final search_badge:I = 0x7f0a05a2
+.field public static final search_badge:I = 0x7f0a05bc
 
-.field public static final search_bar:I = 0x7f0a05a3
+.field public static final search_bar:I = 0x7f0a05bd
 
-.field public static final search_button:I = 0x7f0a05a4
+.field public static final search_button:I = 0x7f0a05be
 
-.field public static final search_close_btn:I = 0x7f0a05a6
+.field public static final search_close_btn:I = 0x7f0a05c0
 
-.field public static final search_edit_frame:I = 0x7f0a05a7
+.field public static final search_edit_frame:I = 0x7f0a05c1
 
-.field public static final search_go_btn:I = 0x7f0a05aa
+.field public static final search_go_btn:I = 0x7f0a05c4
 
-.field public static final search_mag_icon:I = 0x7f0a05ac
+.field public static final search_mag_icon:I = 0x7f0a05c6
 
-.field public static final search_plate:I = 0x7f0a05ad
+.field public static final search_plate:I = 0x7f0a05c7
 
-.field public static final search_src_text:I = 0x7f0a05b0
+.field public static final search_src_text:I = 0x7f0a05ca
 
-.field public static final search_voice_btn:I = 0x7f0a05bc
+.field public static final search_voice_btn:I = 0x7f0a05d6
 
-.field public static final select_dialog_listview:I = 0x7f0a05bd
+.field public static final select_dialog_listview:I = 0x7f0a05d7
 
-.field public static final selected:I = 0x7f0a05be
+.field public static final selected:I = 0x7f0a05d8
 
-.field public static final selection_indicator:I = 0x7f0a05c0
+.field public static final selection_indicator:I = 0x7f0a05da
 
-.field public static final send_btn:I = 0x7f0a05c1
+.field public static final send_btn:I = 0x7f0a05db
 
-.field public static final shortcut:I = 0x7f0a06f7
+.field public static final shortcut:I = 0x7f0a0711
 
-.field public static final smallLabel:I = 0x7f0a06fb
+.field public static final smallLabel:I = 0x7f0a0715
 
-.field public static final snackbar_action:I = 0x7f0a06fc
+.field public static final snackbar_action:I = 0x7f0a0716
 
-.field public static final snackbar_text:I = 0x7f0a06fd
+.field public static final snackbar_text:I = 0x7f0a0717
 
-.field public static final spacer:I = 0x7f0a0703
+.field public static final spacer:I = 0x7f0a071d
 
-.field public static final split_action_bar:I = 0x7f0a0704
+.field public static final split_action_bar:I = 0x7f0a0724
 
-.field public static final spread:I = 0x7f0a0705
+.field public static final spread:I = 0x7f0a0725
 
-.field public static final spread_inside:I = 0x7f0a0706
+.field public static final spread_inside:I = 0x7f0a0726
 
-.field public static final src_atop:I = 0x7f0a0707
+.field public static final src_atop:I = 0x7f0a0727
 
-.field public static final src_in:I = 0x7f0a0708
+.field public static final src_in:I = 0x7f0a0728
 
-.field public static final src_over:I = 0x7f0a0709
+.field public static final src_over:I = 0x7f0a0729
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0710
+.field public static final status_bar_latest_event_content:I = 0x7f0a0730
 
-.field public static final stretch:I = 0x7f0a0723
+.field public static final stretch:I = 0x7f0a074c
 
-.field public static final submenuarrow:I = 0x7f0a0724
+.field public static final submenuarrow:I = 0x7f0a074d
 
-.field public static final submit_area:I = 0x7f0a0725
+.field public static final submit_area:I = 0x7f0a074e
 
-.field public static final surface_view:I = 0x7f0a072e
+.field public static final surface_view:I = 0x7f0a0757
 
-.field public static final swipeRefreshLayout:I = 0x7f0a072f
+.field public static final swipeRefreshLayout:I = 0x7f0a0758
 
-.field public static final tabMode:I = 0x7f0a0731
+.field public static final tabMode:I = 0x7f0a075a
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final take_photo_btn:I = 0x7f0a073a
+.field public static final take_photo_btn:I = 0x7f0a0763
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0741
+.field public static final textSpacerNoButtons:I = 0x7f0a076a
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0742
+.field public static final textSpacerNoTitle:I = 0x7f0a076b
 
-.field public static final text_input:I = 0x7f0a0744
+.field public static final text_input:I = 0x7f0a076d
 
-.field public static final text_input_password_toggle:I = 0x7f0a0745
+.field public static final text_input_password_toggle:I = 0x7f0a076e
 
-.field public static final textinput_counter:I = 0x7f0a0748
+.field public static final textinput_counter:I = 0x7f0a0771
 
-.field public static final textinput_error:I = 0x7f0a0749
+.field public static final textinput_error:I = 0x7f0a0772
 
-.field public static final textinput_helper_text:I = 0x7f0a074a
+.field public static final textinput_helper_text:I = 0x7f0a0773
 
-.field public static final texture_view:I = 0x7f0a074b
+.field public static final texture_view:I = 0x7f0a0774
 
-.field public static final thumb_iv:I = 0x7f0a074c
+.field public static final thumb_iv:I = 0x7f0a0775
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0750
+.field public static final titleDividerNoCustom:I = 0x7f0a0779
 
-.field public static final title_template:I = 0x7f0a0751
+.field public static final title_template:I = 0x7f0a077a
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
-.field public static final topPanel:I = 0x7f0a0757
+.field public static final topPanel:I = 0x7f0a0780
 
-.field public static final torch:I = 0x7f0a0758
+.field public static final torch:I = 0x7f0a0781
 
-.field public static final touch_outside:I = 0x7f0a0759
+.field public static final touch_outside:I = 0x7f0a0782
 
-.field public static final transition_current_scene:I = 0x7f0a075a
+.field public static final transition_current_scene:I = 0x7f0a0783
 
-.field public static final transition_layout_save:I = 0x7f0a075b
+.field public static final transition_layout_save:I = 0x7f0a0784
 
-.field public static final transition_position:I = 0x7f0a075c
+.field public static final transition_position:I = 0x7f0a0785
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a075d
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0786
 
-.field public static final transition_transform:I = 0x7f0a075e
+.field public static final transition_transform:I = 0x7f0a0787
 
-.field public static final type_iv:I = 0x7f0a0762
+.field public static final type_iv:I = 0x7f0a078b
 
-.field public static final uniform:I = 0x7f0a076a
+.field public static final uniform:I = 0x7f0a0793
 
-.field public static final unlabeled:I = 0x7f0a076b
+.field public static final unlabeled:I = 0x7f0a0794
 
-.field public static final up:I = 0x7f0a076d
+.field public static final up:I = 0x7f0a0796
 
-.field public static final view_offset_helper:I = 0x7f0a07db
+.field public static final view_offset_helper:I = 0x7f0a0818
 
-.field public static final view_pager:I = 0x7f0a07dd
+.field public static final view_pager:I = 0x7f0a081a
 
-.field public static final visible:I = 0x7f0a07de
+.field public static final visible:I = 0x7f0a081b
 
-.field public static final wrap:I = 0x7f0a082d
+.field public static final wrap:I = 0x7f0a086a
 
-.field public static final wrap_content:I = 0x7f0a082e
+.field public static final wrap_content:I = 0x7f0a086b
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$f.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$f.smali
index 5b4eadac40..62266a1b0f 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$f.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$f.smali
@@ -109,63 +109,63 @@
 
 .field public static final fragment_recycler_view:I = 0x7f0d0039
 
-.field public static final item_permission_storage:I = 0x7f0d003b
+.field public static final item_permission_storage:I = 0x7f0d003c
 
-.field public static final mtrl_layout_snackbar:I = 0x7f0d003f
+.field public static final mtrl_layout_snackbar:I = 0x7f0d0041
 
-.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0040
+.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0042
 
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_media_action:I = 0x7f0d0043
+.field public static final notification_media_action:I = 0x7f0d0045
 
-.field public static final notification_media_cancel_action:I = 0x7f0d0044
+.field public static final notification_media_cancel_action:I = 0x7f0d0046
 
-.field public static final notification_template_big_media:I = 0x7f0d0045
+.field public static final notification_template_big_media:I = 0x7f0d0047
 
-.field public static final notification_template_big_media_custom:I = 0x7f0d0046
+.field public static final notification_template_big_media_custom:I = 0x7f0d0048
 
-.field public static final notification_template_big_media_narrow:I = 0x7f0d0047
+.field public static final notification_template_big_media_narrow:I = 0x7f0d0049
 
-.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d0048
+.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d004a
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_lines_media:I = 0x7f0d004b
+.field public static final notification_template_lines_media:I = 0x7f0d004d
 
-.field public static final notification_template_media:I = 0x7f0d004c
+.field public static final notification_template_media:I = 0x7f0d004e
 
-.field public static final notification_template_media_custom:I = 0x7f0d004d
+.field public static final notification_template_media_custom:I = 0x7f0d004f
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
-.field public static final select_dialog_item_material:I = 0x7f0d005d
+.field public static final select_dialog_item_material:I = 0x7f0d005f
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d005e
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0060
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d005f
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d0061
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0066
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0069
 
-.field public static final surface_view:I = 0x7f0d0067
+.field public static final surface_view:I = 0x7f0d006a
 
-.field public static final texture_view:I = 0x7f0d0068
+.field public static final texture_view:I = 0x7f0d006b
 
-.field public static final view_attachment_preview_item:I = 0x7f0d0074
+.field public static final view_attachment_preview_item:I = 0x7f0d007b
 
-.field public static final view_camera_permissions:I = 0x7f0d0079
+.field public static final view_camera_permissions:I = 0x7f0d0080
 
-.field public static final view_emoji_item:I = 0x7f0d0085
+.field public static final view_emoji_item:I = 0x7f0d008c
 
-.field public static final view_file_item:I = 0x7f0d0086
+.field public static final view_file_item:I = 0x7f0d008d
 
-.field public static final view_grid_image:I = 0x7f0d008a
+.field public static final view_grid_image:I = 0x7f0d0092
 
 
 # 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 9fdfd7bf74..32d72ca9ba 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
@@ -93,77 +93,77 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f12002a
 
-.field public static final add_content:I = 0x7f12008f
+.field public static final add_content:I = 0x7f120091
 
-.field public static final app_name:I = 0x7f1200d2
+.field public static final app_name:I = 0x7f1200d5
 
-.field public static final appbar_scrolling_view_behavior:I = 0x7f1200dc
+.field public static final appbar_scrolling_view_behavior:I = 0x7f1200df
 
-.field public static final attachment_camera:I = 0x7f12025e
+.field public static final attachment_camera:I = 0x7f120261
 
-.field public static final attachment_files:I = 0x7f120260
+.field public static final attachment_files:I = 0x7f120264
 
-.field public static final attachment_photos:I = 0x7f120262
+.field public static final attachment_photos:I = 0x7f120266
 
-.field public static final attachments_keyboard:I = 0x7f120264
+.field public static final attachments_keyboard:I = 0x7f120268
 
-.field public static final bottom_sheet_behavior:I = 0x7f12032d
+.field public static final bottom_sheet_behavior:I = 0x7f120332
 
-.field public static final camera_intent_result_error:I = 0x7f12035c
+.field public static final camera_intent_result_error:I = 0x7f120361
 
-.field public static final camera_permission_denied_msg:I = 0x7f120362
+.field public static final camera_permission_denied_msg:I = 0x7f120367
 
-.field public static final camera_switched:I = 0x7f120365
+.field public static final camera_switched:I = 0x7f12036a
 
-.field public static final camera_unknown_error:I = 0x7f120367
+.field public static final camera_unknown_error:I = 0x7f12036c
 
-.field public static final character_counter_content_description:I = 0x7f1203b8
+.field public static final character_counter_content_description:I = 0x7f1203bd
 
-.field public static final character_counter_pattern:I = 0x7f1203b9
+.field public static final character_counter_pattern:I = 0x7f1203be
 
-.field public static final choose_an_application:I = 0x7f1203c4
+.field public static final choose_an_application:I = 0x7f1203ca
 
-.field public static final clear_attachments:I = 0x7f1203cc
+.field public static final clear_attachments:I = 0x7f1203d2
 
-.field public static final emoji_keyboard_toggle:I = 0x7f120566
+.field public static final emoji_keyboard_toggle:I = 0x7f120571
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120594
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205a0
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120595
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205a1
 
-.field public static final files_permission_reason_msg:I = 0x7f1205a1
+.field public static final files_permission_reason_msg:I = 0x7f1205ad
 
-.field public static final flash_auto:I = 0x7f1205a6
+.field public static final flash_auto:I = 0x7f1205b2
 
-.field public static final flash_off:I = 0x7f1205a7
+.field public static final flash_off:I = 0x7f1205b3
 
-.field public static final flash_on:I = 0x7f1205a8
+.field public static final flash_on:I = 0x7f1205b4
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1208e1
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120901
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120b7f
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120bb0
 
-.field public static final password_toggle_content_description:I = 0x7f120cd9
+.field public static final password_toggle_content_description:I = 0x7f120d13
 
-.field public static final path_password_eye:I = 0x7f120cdc
+.field public static final path_password_eye:I = 0x7f120d16
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120cdd
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120d17
 
-.field public static final path_password_eye_mask_visible:I = 0x7f120cde
+.field public static final path_password_eye_mask_visible:I = 0x7f120d18
 
-.field public static final path_password_strike_through:I = 0x7f120cdf
+.field public static final path_password_strike_through:I = 0x7f120d19
 
-.field public static final request_permission_msg:I = 0x7f120ed8
+.field public static final request_permission_msg:I = 0x7f120f0f
 
-.field public static final search_menu_title:I = 0x7f120fa3
+.field public static final search_menu_title:I = 0x7f120fdd
 
-.field public static final selection_shrink_scale:I = 0x7f120fbd
+.field public static final selection_shrink_scale:I = 0x7f120ff7
 
-.field public static final send_contents:I = 0x7f120fc8
+.field public static final send_contents:I = 0x7f121002
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
-.field public static final storage_permission_denied_msg:I = 0x7f12107d
+.field public static final storage_permission_denied_msg:I = 0x7f1210ba
 
 
 # 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 cafc0f4cf0..202b2f0d85 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$h.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$h.smali
@@ -29,1085 +29,1085 @@
 
 .field public static final AppTheme:I = 0x7f13000f
 
-.field public static final Base_AlertDialog_AppCompat:I = 0x7f130037
+.field public static final Base_AlertDialog_AppCompat:I = 0x7f130038
 
-.field public static final Base_AlertDialog_AppCompat_Light:I = 0x7f130038
+.field public static final Base_AlertDialog_AppCompat_Light:I = 0x7f130039
 
-.field public static final Base_Animation_AppCompat_Dialog:I = 0x7f130039
+.field public static final Base_Animation_AppCompat_Dialog:I = 0x7f13003a
 
-.field public static final Base_Animation_AppCompat_DropDownUp:I = 0x7f13003a
+.field public static final Base_Animation_AppCompat_DropDownUp:I = 0x7f13003b
 
-.field public static final Base_Animation_AppCompat_Tooltip:I = 0x7f13003b
+.field public static final Base_Animation_AppCompat_Tooltip:I = 0x7f13003c
 
-.field public static final Base_CardView:I = 0x7f13003c
+.field public static final Base_CardView:I = 0x7f13003d
 
-.field public static final Base_DialogWindowTitleBackground_AppCompat:I = 0x7f13003e
+.field public static final Base_DialogWindowTitleBackground_AppCompat:I = 0x7f13003f
 
-.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003d
+.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003e
 
-.field public static final Base_TextAppearance_AppCompat:I = 0x7f13003f
+.field public static final Base_TextAppearance_AppCompat:I = 0x7f130040
 
-.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130040
+.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130041
 
-.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130041
+.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130042
 
-.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130042
+.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130043
 
-.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130043
+.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130044
 
-.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130044
+.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130045
 
-.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130045
+.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130046
 
-.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130046
+.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130047
 
-.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130047
+.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130048
 
-.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130048
+.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130049
 
-.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f130049
+.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f13004a
 
-.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004a
+.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004b
 
-.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004b
+.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004c
 
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004c
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004d
 
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004d
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004e
 
-.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004e
+.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004f
 
-.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f13004f
+.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130050
 
-.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130050
+.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130051
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130051
+.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130052
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130052
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130053
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130053
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130054
 
-.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130054
+.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130055
 
-.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130055
+.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130056
 
-.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130056
+.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130057
 
-.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130057
+.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130058
 
-.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130058
+.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130059
 
-.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f130059
+.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f13005a
 
-.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005a
+.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005b
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005b
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005c
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005c
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005d
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005d
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005e
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005e
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005f
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f13005f
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130060
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130060
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130061
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130061
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130062
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130062
+.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130063
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130063
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130064
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130064
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130065
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130065
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130066
 
-.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130066
+.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130067
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130067
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130068
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130068
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130069
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f130069
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13006a
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006a
+.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006b
 
-.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006b
+.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006c
 
-.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006c
+.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006d
 
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006d
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006e
 
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006e
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006f
 
-.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008e
+.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008f
 
-.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f13008f
+.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f130090
 
-.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130090
+.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130091
 
-.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130091
+.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130092
 
-.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130092
+.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130093
 
-.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130093
+.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130094
 
-.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130094
+.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130095
 
-.field public static final Base_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f130095
+.field public static final Base_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f130096
 
-.field public static final Base_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f130096
+.field public static final Base_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f130097
 
-.field public static final Base_Theme_AppCompat:I = 0x7f13006f
+.field public static final Base_Theme_AppCompat:I = 0x7f130070
 
-.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130070
+.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130071
 
-.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130071
+.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130072
 
-.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130075
+.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130076
 
-.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130072
+.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130073
 
-.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130073
+.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130074
 
-.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130074
+.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130075
 
-.field public static final Base_Theme_AppCompat_Light:I = 0x7f130076
+.field public static final Base_Theme_AppCompat_Light:I = 0x7f130077
 
-.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130077
+.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130078
 
-.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130078
+.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130079
 
-.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007c
+.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007d
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f130079
+.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f13007a
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007a
+.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007b
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007b
+.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007c
 
-.field public static final Base_Theme_MaterialComponents:I = 0x7f13007d
+.field public static final Base_Theme_MaterialComponents:I = 0x7f13007e
 
-.field public static final Base_Theme_MaterialComponents_Bridge:I = 0x7f13007e
+.field public static final Base_Theme_MaterialComponents_Bridge:I = 0x7f13007f
 
-.field public static final Base_Theme_MaterialComponents_CompactMenu:I = 0x7f13007f
+.field public static final Base_Theme_MaterialComponents_CompactMenu:I = 0x7f130080
 
-.field public static final Base_Theme_MaterialComponents_Dialog:I = 0x7f130080
+.field public static final Base_Theme_MaterialComponents_Dialog:I = 0x7f130081
 
-.field public static final Base_Theme_MaterialComponents_DialogWhenLarge:I = 0x7f130084
+.field public static final Base_Theme_MaterialComponents_DialogWhenLarge:I = 0x7f130085
 
-.field public static final Base_Theme_MaterialComponents_Dialog_Alert:I = 0x7f130081
+.field public static final Base_Theme_MaterialComponents_Dialog_Alert:I = 0x7f130082
 
-.field public static final Base_Theme_MaterialComponents_Dialog_FixedSize:I = 0x7f130082
+.field public static final Base_Theme_MaterialComponents_Dialog_FixedSize:I = 0x7f130083
 
-.field public static final Base_Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f130083
+.field public static final Base_Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f130084
 
-.field public static final Base_Theme_MaterialComponents_Light:I = 0x7f130085
+.field public static final Base_Theme_MaterialComponents_Light:I = 0x7f130086
 
-.field public static final Base_Theme_MaterialComponents_Light_Bridge:I = 0x7f130086
+.field public static final Base_Theme_MaterialComponents_Light_Bridge:I = 0x7f130087
 
-.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f130087
+.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f130088
 
-.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f130088
+.field public static final Base_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f130089
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog:I = 0x7f130089
+.field public static final Base_Theme_MaterialComponents_Light_Dialog:I = 0x7f13008a
 
-.field public static final Base_Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f13008d
+.field public static final Base_Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f13008e
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f13008a
+.field public static final Base_Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f13008b
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog_FixedSize:I = 0x7f13008b
+.field public static final Base_Theme_MaterialComponents_Light_Dialog_FixedSize:I = 0x7f13008c
 
-.field public static final Base_Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f13008c
+.field public static final Base_Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f13008d
 
-.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f13009e
+.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog:I = 0x7f13009f
 
-.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f13009f
+.field public static final Base_V14_ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f1300a0
 
-.field public static final Base_V14_Theme_MaterialComponents:I = 0x7f130097
+.field public static final Base_V14_Theme_MaterialComponents:I = 0x7f130098
 
-.field public static final Base_V14_Theme_MaterialComponents_Bridge:I = 0x7f130098
+.field public static final Base_V14_Theme_MaterialComponents_Bridge:I = 0x7f130099
 
-.field public static final Base_V14_Theme_MaterialComponents_Dialog:I = 0x7f130099
+.field public static final Base_V14_Theme_MaterialComponents_Dialog:I = 0x7f13009a
 
-.field public static final Base_V14_Theme_MaterialComponents_Light:I = 0x7f13009a
+.field public static final Base_V14_Theme_MaterialComponents_Light:I = 0x7f13009b
 
-.field public static final Base_V14_Theme_MaterialComponents_Light_Bridge:I = 0x7f13009b
+.field public static final Base_V14_Theme_MaterialComponents_Light_Bridge:I = 0x7f13009c
 
-.field public static final Base_V14_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f13009c
+.field public static final Base_V14_Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f13009d
 
-.field public static final Base_V14_Theme_MaterialComponents_Light_Dialog:I = 0x7f13009d
+.field public static final Base_V14_Theme_MaterialComponents_Light_Dialog:I = 0x7f13009e
 
-.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a4
+.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a5
 
-.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a0
+.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a1
 
-.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a1
+.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a2
 
-.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a2
+.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a3
 
-.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a3
+.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a4
 
-.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a5
+.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a6
 
-.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a6
+.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a7
 
-.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a7
+.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a8
 
-.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a8
+.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a9
 
-.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300a9
+.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300aa
 
-.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300aa
+.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300ab
 
-.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ab
+.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ac
 
-.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ac
+.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ad
 
-.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ad
+.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ae
 
-.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b2
+.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b3
 
-.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300ae
+.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300af
 
-.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300af
+.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300b0
 
-.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b0
+.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b1
 
-.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b1
+.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b2
 
-.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b3
+.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b4
 
-.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b4
+.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b5
 
-.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b5
+.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b6
 
-.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b6
+.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b7
 
-.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b7
+.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b8
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b8
+.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b9
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300b9
+.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300ba
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300ba
+.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300bb
 
-.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bb
+.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bc
 
-.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bc
+.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bd
 
-.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300bd
+.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300be
 
-.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300be
+.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300bf
 
-.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300bf
+.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300c0
 
-.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c0
+.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c1
 
-.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c1
+.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c2
 
-.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c7
+.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c8
 
-.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c8
+.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c9
 
-.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c2
+.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c3
 
-.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c3
+.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c4
 
-.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c4
+.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c5
 
-.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c5
+.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c6
 
-.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c6
+.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c7
 
-.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300c9
+.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300ca
 
-.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300ca
+.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300cb
 
-.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cb
+.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cc
 
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cc
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cd
 
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300cd
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300ce
 
-.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300ce
+.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300cf
 
-.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300cf
+.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300d0
 
-.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d0
+.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d1
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d1
+.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d2
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d2
+.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d3
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d3
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d4
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d4
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d5
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d5
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d6
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d6
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d7
 
-.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d7
+.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d8
 
-.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d8
+.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d9
 
-.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300d9
+.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300da
 
-.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300da
+.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300db
 
-.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300db
+.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300dc
 
-.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dc
+.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dd
 
-.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300dd
+.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300de
 
-.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300de
+.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300df
 
-.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300df
+.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300e0
 
-.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e0
+.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e1
 
-.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e1
+.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e2
 
-.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e2
+.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e3
 
-.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e3
+.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e4
 
-.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e4
+.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e5
 
-.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e5
+.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e6
 
-.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e6
+.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e7
 
-.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e7
+.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e8
 
-.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e8
+.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e9
 
-.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300e9
+.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300ea
 
-.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300ea
+.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300eb
 
-.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300eb
+.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300ec
 
-.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ec
+.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ed
 
-.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ed
+.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ee
 
-.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300ee
+.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300ef
 
-.field public static final Base_Widget_Design_TabLayout:I = 0x7f1300ef
+.field public static final Base_Widget_Design_TabLayout:I = 0x7f1300f0
 
-.field public static final Base_Widget_MaterialComponents_Chip:I = 0x7f1300f0
+.field public static final Base_Widget_MaterialComponents_Chip:I = 0x7f1300f1
 
-.field public static final Base_Widget_MaterialComponents_TextInputEditText:I = 0x7f1300f1
+.field public static final Base_Widget_MaterialComponents_TextInputEditText:I = 0x7f1300f2
 
-.field public static final Base_Widget_MaterialComponents_TextInputLayout:I = 0x7f1300f2
+.field public static final Base_Widget_MaterialComponents_TextInputLayout:I = 0x7f1300f3
 
-.field public static final CardView:I = 0x7f1300f3
+.field public static final CardView:I = 0x7f1300f4
 
-.field public static final CardView_Dark:I = 0x7f1300f4
+.field public static final CardView_Dark:I = 0x7f1300f5
 
-.field public static final CardView_Light:I = 0x7f1300f5
+.field public static final CardView_Light:I = 0x7f1300f6
 
-.field public static final FlexInput:I = 0x7f1300f9
+.field public static final FlexInput:I = 0x7f1300fa
 
-.field public static final FlexInput_AddContent:I = 0x7f1300fa
+.field public static final FlexInput_AddContent:I = 0x7f1300fb
 
-.field public static final FlexInput_AddContent_Base_Container_TabLayout:I = 0x7f1300fb
+.field public static final FlexInput_AddContent_Base_Container_TabLayout:I = 0x7f1300fc
 
-.field public static final FlexInput_AddContent_Base_Page:I = 0x7f1300fc
+.field public static final FlexInput_AddContent_Base_Page:I = 0x7f1300fd
 
-.field public static final FlexInput_AddContent_Base_TabLayout:I = 0x7f1300fd
+.field public static final FlexInput_AddContent_Base_TabLayout:I = 0x7f1300fe
 
-.field public static final FlexInput_AddContent_Button:I = 0x7f1300fe
+.field public static final FlexInput_AddContent_Button:I = 0x7f1300ff
 
-.field public static final FlexInput_AddContent_Button_Base_Send:I = 0x7f1300ff
+.field public static final FlexInput_AddContent_Button_Base_Send:I = 0x7f130100
 
-.field public static final FlexInput_AddContent_Button_Launcher:I = 0x7f130100
+.field public static final FlexInput_AddContent_Button_Launcher:I = 0x7f130101
 
-.field public static final FlexInput_AddContent_Button_Send:I = 0x7f130101
+.field public static final FlexInput_AddContent_Button_Send:I = 0x7f130102
 
-.field public static final FlexInput_AddContent_Container_TabLayout:I = 0x7f130102
+.field public static final FlexInput_AddContent_Container_TabLayout:I = 0x7f130103
 
-.field public static final FlexInput_AddContent_Page:I = 0x7f130103
+.field public static final FlexInput_AddContent_Page:I = 0x7f130104
 
-.field public static final FlexInput_AddContent_Permissions:I = 0x7f130104
+.field public static final FlexInput_AddContent_Permissions:I = 0x7f130105
 
-.field public static final FlexInput_AddContent_TabLayout:I = 0x7f130105
+.field public static final FlexInput_AddContent_TabLayout:I = 0x7f130106
 
-.field public static final FlexInput_DialogWhenLarge:I = 0x7f130106
+.field public static final FlexInput_DialogWhenLarge:I = 0x7f130107
 
-.field public static final FlexInput_Emoji_Base_Page:I = 0x7f130107
+.field public static final FlexInput_Emoji_Base_Page:I = 0x7f130108
 
-.field public static final FlexInput_Emoji_Page:I = 0x7f130108
+.field public static final FlexInput_Emoji_Page:I = 0x7f130109
 
-.field public static final FlexInput_Input:I = 0x7f130109
+.field public static final FlexInput_Input:I = 0x7f13010a
 
-.field public static final FlexInput_Input_Base_Widget:I = 0x7f13010a
+.field public static final FlexInput_Input_Base_Widget:I = 0x7f13010b
 
-.field public static final FlexInput_Input_Button:I = 0x7f13010b
+.field public static final FlexInput_Input_Button:I = 0x7f13010c
 
-.field public static final FlexInput_Input_Button_AddContent:I = 0x7f13010c
+.field public static final FlexInput_Input_Button_AddContent:I = 0x7f13010d
 
-.field public static final FlexInput_Input_Button_Camera_Capture:I = 0x7f13010d
+.field public static final FlexInput_Input_Button_Camera_Capture:I = 0x7f13010e
 
-.field public static final FlexInput_Input_Button_Camera_Facing:I = 0x7f13010e
+.field public static final FlexInput_Input_Button_Camera_Facing:I = 0x7f13010f
 
-.field public static final FlexInput_Input_Button_Camera_Flash:I = 0x7f13010f
+.field public static final FlexInput_Input_Button_Camera_Flash:I = 0x7f130110
 
-.field public static final FlexInput_Input_Button_Camera_Launcher:I = 0x7f130110
+.field public static final FlexInput_Input_Button_Camera_Launcher:I = 0x7f130111
 
-.field public static final FlexInput_Input_Button_Emoji:I = 0x7f130111
+.field public static final FlexInput_Input_Button_Emoji:I = 0x7f130112
 
-.field public static final FlexInput_Input_Button_Send:I = 0x7f130112
+.field public static final FlexInput_Input_Button_Send:I = 0x7f130113
 
-.field public static final FlexInput_Input_Button_Tab:I = 0x7f130113
+.field public static final FlexInput_Input_Button_Tab:I = 0x7f130114
 
-.field public static final FlexInput_Input_Widget:I = 0x7f130114
+.field public static final FlexInput_Input_Widget:I = 0x7f130115
 
-.field public static final FlexInput_Items:I = 0x7f130115
+.field public static final FlexInput_Items:I = 0x7f130116
 
-.field public static final FlexInput_Items_Base_File:I = 0x7f130116
+.field public static final FlexInput_Items_Base_File:I = 0x7f130117
 
-.field public static final FlexInput_Items_Base_File_Image:I = 0x7f130117
+.field public static final FlexInput_Items_Base_File_Image:I = 0x7f130118
 
-.field public static final FlexInput_Items_Base_File_Selection:I = 0x7f130118
+.field public static final FlexInput_Items_Base_File_Selection:I = 0x7f130119
 
-.field public static final FlexInput_Items_Base_Photo:I = 0x7f130119
+.field public static final FlexInput_Items_Base_Photo:I = 0x7f13011a
 
-.field public static final FlexInput_Items_Base_Photo_Image:I = 0x7f13011a
+.field public static final FlexInput_Items_Base_Photo_Image:I = 0x7f13011b
 
-.field public static final FlexInput_Items_Base_Photo_Selection:I = 0x7f13011b
+.field public static final FlexInput_Items_Base_Photo_Selection:I = 0x7f13011c
 
-.field public static final FlexInput_Items_File:I = 0x7f13011c
+.field public static final FlexInput_Items_File:I = 0x7f13011d
 
-.field public static final FlexInput_Items_File_Image:I = 0x7f13011d
+.field public static final FlexInput_Items_File_Image:I = 0x7f13011e
 
-.field public static final FlexInput_Items_File_Name:I = 0x7f13011e
+.field public static final FlexInput_Items_File_Name:I = 0x7f13011f
 
-.field public static final FlexInput_Items_File_Selection:I = 0x7f13011f
+.field public static final FlexInput_Items_File_Selection:I = 0x7f130120
 
-.field public static final FlexInput_Items_File_Subtitle:I = 0x7f130120
+.field public static final FlexInput_Items_File_Subtitle:I = 0x7f130121
 
-.field public static final FlexInput_Items_Photo:I = 0x7f130121
+.field public static final FlexInput_Items_Photo:I = 0x7f130122
 
-.field public static final FlexInput_Items_Photo_Image:I = 0x7f130122
+.field public static final FlexInput_Items_Photo_Image:I = 0x7f130123
 
-.field public static final FlexInput_Items_Photo_Selection:I = 0x7f130123
+.field public static final FlexInput_Items_Photo_Selection:I = 0x7f130124
 
-.field public static final FlexInput_Main:I = 0x7f130124
+.field public static final FlexInput_Main:I = 0x7f130125
 
-.field public static final FlexInput_Main_Widget:I = 0x7f130125
+.field public static final FlexInput_Main_Widget:I = 0x7f130126
 
-.field public static final Platform_AppCompat:I = 0x7f130131
+.field public static final Platform_AppCompat:I = 0x7f130132
 
-.field public static final Platform_AppCompat_Light:I = 0x7f130132
+.field public static final Platform_AppCompat_Light:I = 0x7f130133
 
-.field public static final Platform_MaterialComponents:I = 0x7f130133
+.field public static final Platform_MaterialComponents:I = 0x7f130134
 
-.field public static final Platform_MaterialComponents_Dialog:I = 0x7f130134
+.field public static final Platform_MaterialComponents_Dialog:I = 0x7f130135
 
-.field public static final Platform_MaterialComponents_Light:I = 0x7f130135
+.field public static final Platform_MaterialComponents_Light:I = 0x7f130136
 
-.field public static final Platform_MaterialComponents_Light_Dialog:I = 0x7f130136
+.field public static final Platform_MaterialComponents_Light_Dialog:I = 0x7f130137
 
-.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130137
+.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130138
 
-.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130138
+.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130139
 
-.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f130139
+.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f13013a
 
-.field public static final Platform_V21_AppCompat:I = 0x7f13013a
+.field public static final Platform_V21_AppCompat:I = 0x7f13013b
 
-.field public static final Platform_V21_AppCompat_Light:I = 0x7f13013b
+.field public static final Platform_V21_AppCompat_Light:I = 0x7f13013c
 
-.field public static final Platform_V25_AppCompat:I = 0x7f13013c
+.field public static final Platform_V25_AppCompat:I = 0x7f13013d
 
-.field public static final Platform_V25_AppCompat_Light:I = 0x7f13013d
+.field public static final Platform_V25_AppCompat_Light:I = 0x7f13013e
 
-.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13013e
+.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13013f
 
-.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f13013f
+.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f130140
 
-.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f130140
+.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f130141
 
-.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f130141
+.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f130142
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f130142
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f130143
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130143
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130144
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130144
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130145
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130145
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130146
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130146
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130147
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130147
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130148
 
-.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13014d
+.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13014e
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130148
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130149
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f130149
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f13014a
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f13014a
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f13014b
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f13014b
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f13014c
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f13014c
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f13014d
 
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13014e
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13014f
 
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f13014f
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f130150
 
-.field public static final TextAppearance_AppCompat:I = 0x7f130152
+.field public static final TextAppearance_AppCompat:I = 0x7f130153
 
-.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130153
+.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130154
 
-.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130154
+.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130155
 
-.field public static final TextAppearance_AppCompat_Button:I = 0x7f130155
+.field public static final TextAppearance_AppCompat_Button:I = 0x7f130156
 
-.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130156
+.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130157
 
-.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130157
+.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130158
 
-.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130158
+.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130159
 
-.field public static final TextAppearance_AppCompat_Display3:I = 0x7f130159
+.field public static final TextAppearance_AppCompat_Display3:I = 0x7f13015a
 
-.field public static final TextAppearance_AppCompat_Display4:I = 0x7f13015a
+.field public static final TextAppearance_AppCompat_Display4:I = 0x7f13015b
 
-.field public static final TextAppearance_AppCompat_Headline:I = 0x7f13015b
+.field public static final TextAppearance_AppCompat_Headline:I = 0x7f13015c
 
-.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13015c
+.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13015d
 
-.field public static final TextAppearance_AppCompat_Large:I = 0x7f13015d
+.field public static final TextAppearance_AppCompat_Large:I = 0x7f13015e
 
-.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13015e
+.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13015f
 
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f13015f
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f130160
 
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f130160
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f130161
 
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130161
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130162
 
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130162
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130163
 
-.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130163
+.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130164
 
-.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130164
+.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130165
 
-.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130165
+.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130166
 
-.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130166
+.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130167
 
-.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130167
+.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130168
 
-.field public static final TextAppearance_AppCompat_Small:I = 0x7f130168
+.field public static final TextAppearance_AppCompat_Small:I = 0x7f130169
 
-.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f130169
+.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f13016a
 
-.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f13016a
+.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f13016b
 
-.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13016b
+.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13016c
 
-.field public static final TextAppearance_AppCompat_Title:I = 0x7f13016c
+.field public static final TextAppearance_AppCompat_Title:I = 0x7f13016d
 
-.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13016d
+.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13016e
 
-.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13016e
+.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13016f
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13016f
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f130170
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130170
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130171
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130171
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130172
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130172
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130173
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130173
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130174
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130174
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130175
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f130175
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f130176
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130176
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130177
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f130177
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f130178
 
-.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f130178
+.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f130179
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130179
+.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f13017a
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f13017a
+.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f13017b
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f13017b
+.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f13017c
 
-.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13017c
+.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13017d
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13017d
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13017e
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13017e
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13017f
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13017f
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f130180
 
-.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f130180
+.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f130181
 
-.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f130181
+.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f130182
 
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f130184
+.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f130185
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f130186
+.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f130187
 
-.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f130187
+.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f130188
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f130189
+.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f13018a
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f13018b
+.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f13018c
 
-.field public static final TextAppearance_Design_CollapsingToolbar_Expanded:I = 0x7f13018c
+.field public static final TextAppearance_Design_CollapsingToolbar_Expanded:I = 0x7f13018d
 
-.field public static final TextAppearance_Design_Counter:I = 0x7f13018d
+.field public static final TextAppearance_Design_Counter:I = 0x7f13018e
 
-.field public static final TextAppearance_Design_Counter_Overflow:I = 0x7f13018e
+.field public static final TextAppearance_Design_Counter_Overflow:I = 0x7f13018f
 
-.field public static final TextAppearance_Design_Error:I = 0x7f13018f
+.field public static final TextAppearance_Design_Error:I = 0x7f130190
 
-.field public static final TextAppearance_Design_HelperText:I = 0x7f130190
+.field public static final TextAppearance_Design_HelperText:I = 0x7f130191
 
-.field public static final TextAppearance_Design_Hint:I = 0x7f130191
+.field public static final TextAppearance_Design_Hint:I = 0x7f130192
 
-.field public static final TextAppearance_Design_Snackbar_Message:I = 0x7f130192
+.field public static final TextAppearance_Design_Snackbar_Message:I = 0x7f130193
 
-.field public static final TextAppearance_Design_Tab:I = 0x7f130193
+.field public static final TextAppearance_Design_Tab:I = 0x7f130194
 
-.field public static final TextAppearance_MaterialComponents_Body1:I = 0x7f130195
+.field public static final TextAppearance_MaterialComponents_Body1:I = 0x7f130196
 
-.field public static final TextAppearance_MaterialComponents_Body2:I = 0x7f130196
+.field public static final TextAppearance_MaterialComponents_Body2:I = 0x7f130197
 
-.field public static final TextAppearance_MaterialComponents_Button:I = 0x7f130197
+.field public static final TextAppearance_MaterialComponents_Button:I = 0x7f130198
 
-.field public static final TextAppearance_MaterialComponents_Caption:I = 0x7f130198
+.field public static final TextAppearance_MaterialComponents_Caption:I = 0x7f130199
 
-.field public static final TextAppearance_MaterialComponents_Chip:I = 0x7f130199
+.field public static final TextAppearance_MaterialComponents_Chip:I = 0x7f13019a
 
-.field public static final TextAppearance_MaterialComponents_Headline1:I = 0x7f13019a
+.field public static final TextAppearance_MaterialComponents_Headline1:I = 0x7f13019b
 
-.field public static final TextAppearance_MaterialComponents_Headline2:I = 0x7f13019b
+.field public static final TextAppearance_MaterialComponents_Headline2:I = 0x7f13019c
 
-.field public static final TextAppearance_MaterialComponents_Headline3:I = 0x7f13019c
+.field public static final TextAppearance_MaterialComponents_Headline3:I = 0x7f13019d
 
-.field public static final TextAppearance_MaterialComponents_Headline4:I = 0x7f13019d
+.field public static final TextAppearance_MaterialComponents_Headline4:I = 0x7f13019e
 
-.field public static final TextAppearance_MaterialComponents_Headline5:I = 0x7f13019e
+.field public static final TextAppearance_MaterialComponents_Headline5:I = 0x7f13019f
 
-.field public static final TextAppearance_MaterialComponents_Headline6:I = 0x7f13019f
+.field public static final TextAppearance_MaterialComponents_Headline6:I = 0x7f1301a0
 
-.field public static final TextAppearance_MaterialComponents_Overline:I = 0x7f1301a0
+.field public static final TextAppearance_MaterialComponents_Overline:I = 0x7f1301a1
 
-.field public static final TextAppearance_MaterialComponents_Subtitle1:I = 0x7f1301a1
+.field public static final TextAppearance_MaterialComponents_Subtitle1:I = 0x7f1301a2
 
-.field public static final TextAppearance_MaterialComponents_Subtitle2:I = 0x7f1301a2
+.field public static final TextAppearance_MaterialComponents_Subtitle2:I = 0x7f1301a3
 
-.field public static final TextAppearance_MaterialComponents_Tab:I = 0x7f1301a3
+.field public static final TextAppearance_MaterialComponents_Tab:I = 0x7f1301a4
 
-.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301a4
+.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301a5
 
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301a5
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301a6
 
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301a6
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301a7
 
-.field public static final ThemeOverlay_AppCompat:I = 0x7f1301d9
+.field public static final ThemeOverlay_AppCompat:I = 0x7f1301da
 
-.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f1301da
+.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f1301db
 
-.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f1301db
+.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f1301dc
 
-.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f1301dc
+.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f1301dd
 
-.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f1301dd
+.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f1301de
 
-.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f1301de
+.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f1301df
 
-.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f1301df
+.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f1301e0
 
-.field public static final ThemeOverlay_MaterialComponents:I = 0x7f1301e0
+.field public static final ThemeOverlay_MaterialComponents:I = 0x7f1301e1
 
-.field public static final ThemeOverlay_MaterialComponents_ActionBar:I = 0x7f1301e1
+.field public static final ThemeOverlay_MaterialComponents_ActionBar:I = 0x7f1301e2
 
-.field public static final ThemeOverlay_MaterialComponents_Dark:I = 0x7f1301e2
+.field public static final ThemeOverlay_MaterialComponents_Dark:I = 0x7f1301e3
 
-.field public static final ThemeOverlay_MaterialComponents_Dark_ActionBar:I = 0x7f1301e3
+.field public static final ThemeOverlay_MaterialComponents_Dark_ActionBar:I = 0x7f1301e4
 
-.field public static final ThemeOverlay_MaterialComponents_Dialog:I = 0x7f1301e4
+.field public static final ThemeOverlay_MaterialComponents_Dialog:I = 0x7f1301e5
 
-.field public static final ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f1301e5
+.field public static final ThemeOverlay_MaterialComponents_Dialog_Alert:I = 0x7f1301e6
 
-.field public static final ThemeOverlay_MaterialComponents_Light:I = 0x7f1301e6
+.field public static final ThemeOverlay_MaterialComponents_Light:I = 0x7f1301e7
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText:I = 0x7f1301e7
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText:I = 0x7f1301e8
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f1301e8
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f1301e9
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f1301e9
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f1301ea
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f1301ea
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f1301eb
 
-.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f1301eb
+.field public static final ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f1301ec
 
-.field public static final Theme_AppCompat:I = 0x7f1301a7
+.field public static final Theme_AppCompat:I = 0x7f1301a8
 
-.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301a8
+.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301a9
 
-.field public static final Theme_AppCompat_DayNight:I = 0x7f1301a9
+.field public static final Theme_AppCompat_DayNight:I = 0x7f1301aa
 
-.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301aa
+.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301ab
 
-.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301ab
+.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301ac
 
-.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301ae
+.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301af
 
-.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301ac
+.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301ad
 
-.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301ad
+.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301ae
 
-.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301af
+.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301b0
 
-.field public static final Theme_AppCompat_Dialog:I = 0x7f1301b0
+.field public static final Theme_AppCompat_Dialog:I = 0x7f1301b1
 
-.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301b3
+.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301b4
 
-.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301b1
+.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301b2
 
-.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301b2
+.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301b3
 
-.field public static final Theme_AppCompat_Light:I = 0x7f1301b4
+.field public static final Theme_AppCompat_Light:I = 0x7f1301b5
 
-.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301b5
+.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301b6
 
-.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301b6
+.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301b7
 
-.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301b9
+.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301ba
 
-.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301b7
+.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301b8
 
-.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301b8
+.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301b9
 
-.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301ba
+.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301bb
 
-.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301bb
+.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301bc
 
-.field public static final Theme_Design:I = 0x7f1301be
+.field public static final Theme_Design:I = 0x7f1301bf
 
-.field public static final Theme_Design_BottomSheetDialog:I = 0x7f1301bf
+.field public static final Theme_Design_BottomSheetDialog:I = 0x7f1301c0
 
-.field public static final Theme_Design_Light:I = 0x7f1301c0
+.field public static final Theme_Design_Light:I = 0x7f1301c1
 
-.field public static final Theme_Design_Light_BottomSheetDialog:I = 0x7f1301c1
+.field public static final Theme_Design_Light_BottomSheetDialog:I = 0x7f1301c2
 
-.field public static final Theme_Design_Light_NoActionBar:I = 0x7f1301c2
+.field public static final Theme_Design_Light_NoActionBar:I = 0x7f1301c3
 
-.field public static final Theme_Design_NoActionBar:I = 0x7f1301c3
+.field public static final Theme_Design_NoActionBar:I = 0x7f1301c4
 
-.field public static final Theme_MaterialComponents:I = 0x7f1301c4
+.field public static final Theme_MaterialComponents:I = 0x7f1301c5
 
-.field public static final Theme_MaterialComponents_BottomSheetDialog:I = 0x7f1301c5
+.field public static final Theme_MaterialComponents_BottomSheetDialog:I = 0x7f1301c6
 
-.field public static final Theme_MaterialComponents_Bridge:I = 0x7f1301c6
+.field public static final Theme_MaterialComponents_Bridge:I = 0x7f1301c7
 
-.field public static final Theme_MaterialComponents_CompactMenu:I = 0x7f1301c7
+.field public static final Theme_MaterialComponents_CompactMenu:I = 0x7f1301c8
 
-.field public static final Theme_MaterialComponents_Dialog:I = 0x7f1301c8
+.field public static final Theme_MaterialComponents_Dialog:I = 0x7f1301c9
 
-.field public static final Theme_MaterialComponents_DialogWhenLarge:I = 0x7f1301cb
+.field public static final Theme_MaterialComponents_DialogWhenLarge:I = 0x7f1301cc
 
-.field public static final Theme_MaterialComponents_Dialog_Alert:I = 0x7f1301c9
+.field public static final Theme_MaterialComponents_Dialog_Alert:I = 0x7f1301ca
 
-.field public static final Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f1301ca
+.field public static final Theme_MaterialComponents_Dialog_MinWidth:I = 0x7f1301cb
 
-.field public static final Theme_MaterialComponents_Light:I = 0x7f1301cc
+.field public static final Theme_MaterialComponents_Light:I = 0x7f1301cd
 
-.field public static final Theme_MaterialComponents_Light_BottomSheetDialog:I = 0x7f1301cd
+.field public static final Theme_MaterialComponents_Light_BottomSheetDialog:I = 0x7f1301ce
 
-.field public static final Theme_MaterialComponents_Light_Bridge:I = 0x7f1301ce
+.field public static final Theme_MaterialComponents_Light_Bridge:I = 0x7f1301cf
 
-.field public static final Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f1301cf
+.field public static final Theme_MaterialComponents_Light_DarkActionBar:I = 0x7f1301d0
 
-.field public static final Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f1301d0
+.field public static final Theme_MaterialComponents_Light_DarkActionBar_Bridge:I = 0x7f1301d1
 
-.field public static final Theme_MaterialComponents_Light_Dialog:I = 0x7f1301d1
+.field public static final Theme_MaterialComponents_Light_Dialog:I = 0x7f1301d2
 
-.field public static final Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f1301d4
+.field public static final Theme_MaterialComponents_Light_DialogWhenLarge:I = 0x7f1301d5
 
-.field public static final Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f1301d2
+.field public static final Theme_MaterialComponents_Light_Dialog_Alert:I = 0x7f1301d3
 
-.field public static final Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f1301d3
+.field public static final Theme_MaterialComponents_Light_Dialog_MinWidth:I = 0x7f1301d4
 
-.field public static final Theme_MaterialComponents_Light_NoActionBar:I = 0x7f1301d5
+.field public static final Theme_MaterialComponents_Light_NoActionBar:I = 0x7f1301d6
 
-.field public static final Theme_MaterialComponents_Light_NoActionBar_Bridge:I = 0x7f1301d6
+.field public static final Theme_MaterialComponents_Light_NoActionBar_Bridge:I = 0x7f1301d7
 
-.field public static final Theme_MaterialComponents_NoActionBar:I = 0x7f1301d7
+.field public static final Theme_MaterialComponents_NoActionBar:I = 0x7f1301d8
 
-.field public static final Theme_MaterialComponents_NoActionBar_Bridge:I = 0x7f1301d8
+.field public static final Theme_MaterialComponents_NoActionBar_Bridge:I = 0x7f1301d9
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302ac
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302af
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302ad
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302b0
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302ae
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302b1
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302af
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302b2
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302b0
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302b3
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302b1
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302b4
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302b2
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302b5
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302b3
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302b6
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302b4
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302b7
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302b5
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302b8
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302b6
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302b9
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1302b7
+.field public static final Widget_AppCompat_Button:I = 0x7f1302ba
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302bd
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302c0
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302be
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302c1
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302b8
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302bb
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302b9
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302bc
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302ba
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302bd
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302bb
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302be
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302bc
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302bf
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302bf
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302c2
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302c0
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302c3
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302c1
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302c4
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1302c2
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1302c5
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1302c3
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1302c6
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1302c4
+.field public static final Widget_AppCompat_EditText:I = 0x7f1302c7
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1302c5
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1302c8
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1302c6
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1302c9
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1302c7
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1302ca
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1302c8
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1302cb
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1302c9
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1302cc
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1302ca
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1302cd
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1302cb
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1302ce
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1302cc
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1302cf
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1302cd
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1302d0
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1302ce
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1302d1
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1302cf
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1302d2
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1302d0
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1302d3
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1302d1
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1302d4
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1302d2
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1302d5
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1302d3
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1302d6
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1302d4
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1302d7
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1302d5
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1302d8
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1302d6
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1302d9
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1302d7
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1302da
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1302d8
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1302db
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1302d9
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1302dc
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1302da
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1302dd
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1302db
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1302de
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1302dc
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1302df
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1302dd
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1302e0
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1302de
+.field public static final Widget_AppCompat_ListView:I = 0x7f1302e1
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1302df
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1302e2
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1302e0
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1302e3
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1302e1
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1302e4
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1302e2
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1302e5
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1302e3
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1302e6
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1302e4
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1302e7
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1302e5
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1302e8
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1302e6
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1302e9
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1302e7
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1302ea
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1302e8
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1302eb
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1302e9
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1302ec
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1302ea
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1302ed
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1302eb
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1302ee
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1302ec
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1302ef
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1302ed
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1302f0
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1302ee
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1302f1
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1302ef
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1302f2
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1302f0
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1302f3
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1302f1
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1302f4
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1302f2
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1302f5
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1302f3
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1302f6
 
-.field public static final Widget_CameraView:I = 0x7f1302f4
+.field public static final Widget_CameraView:I = 0x7f1302f7
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Design_AppBarLayout:I = 0x7f1302f7
+.field public static final Widget_Design_AppBarLayout:I = 0x7f1302fa
 
-.field public static final Widget_Design_BottomNavigationView:I = 0x7f1302f8
+.field public static final Widget_Design_BottomNavigationView:I = 0x7f1302fb
 
-.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1302f9
+.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1302fc
 
-.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1302fa
+.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1302fd
 
-.field public static final Widget_Design_FloatingActionButton:I = 0x7f1302fb
+.field public static final Widget_Design_FloatingActionButton:I = 0x7f1302fe
 
-.field public static final Widget_Design_NavigationView:I = 0x7f1302fc
+.field public static final Widget_Design_NavigationView:I = 0x7f1302ff
 
-.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f1302fd
+.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f130300
 
-.field public static final Widget_Design_Snackbar:I = 0x7f1302fe
+.field public static final Widget_Design_Snackbar:I = 0x7f130301
 
-.field public static final Widget_Design_TabLayout:I = 0x7f1302ff
+.field public static final Widget_Design_TabLayout:I = 0x7f130302
 
-.field public static final Widget_Design_TextInputLayout:I = 0x7f130300
+.field public static final Widget_Design_TextInputLayout:I = 0x7f130303
 
-.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f130301
+.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f130304
 
-.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f130302
+.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f130305
 
-.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f130303
+.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f130306
 
-.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f130304
+.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f130307
 
-.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130305
+.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130308
 
-.field public static final Widget_MaterialComponents_Button:I = 0x7f130306
+.field public static final Widget_MaterialComponents_Button:I = 0x7f130309
 
-.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f130307
+.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f13030a
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f130308
+.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f13030b
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f130309
+.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f13030c
 
-.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f13030a
+.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f13030d
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f13030b
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f13030e
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f13030c
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f13030f
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f13030d
+.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f130310
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f13030e
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f130311
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f13030f
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f130312
 
-.field public static final Widget_MaterialComponents_CardView:I = 0x7f130310
+.field public static final Widget_MaterialComponents_CardView:I = 0x7f130313
 
-.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130315
+.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130318
 
-.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f130311
+.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f130314
 
-.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130312
+.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130315
 
-.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130313
+.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130316
 
-.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130314
+.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130317
 
-.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f130316
+.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f130319
 
-.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f130317
+.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f13031a
 
-.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f130318
+.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f13031b
 
-.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f130319
+.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f13031c
 
-.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13031a
+.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13031d
 
-.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13031b
+.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13031e
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f13031c
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f13031f
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f13031d
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f130320
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f13031e
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f130321
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f13031f
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f130322
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130320
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130323
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130321
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130324
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130322
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130325
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130323
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130326
 
-.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f130324
+.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f130327
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$i.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$i.smali
index 8262c0de23..c1a6a462ff 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$i.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$i.smali
@@ -2374,7 +2374,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040305
+    const v6, 0x7f040308
 
     aput v6, v5, v3
 
@@ -2394,7 +2394,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f0401ec
+    const v6, 0x7f0401ee
 
     aput v6, v5, v3
 
@@ -2531,60 +2531,60 @@
         0x7f04004c
         0x7f04004e
         0x7f04004f
-        0x7f0400c8
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f0400e9
-        0x7f040103
+        0x7f0400ce
+        0x7f0400ea
         0x7f040104
-        0x7f040112
-        0x7f040156
-        0x7f04015b
-        0x7f040162
-        0x7f040163
-        0x7f0401c7
-        0x7f0401ea
-        0x7f0401f4
-        0x7f040257
-        0x7f040273
-        0x7f04028b
-        0x7f0402b9
-        0x7f0402ba
-        0x7f040313
+        0x7f040105
+        0x7f040114
+        0x7f040158
+        0x7f04015d
+        0x7f040164
+        0x7f040165
+        0x7f0401c9
+        0x7f0401ec
+        0x7f0401f6
+        0x7f04025a
+        0x7f040276
+        0x7f04028e
+        0x7f0402bc
+        0x7f0402bd
         0x7f040316
-        0x7f0403af
-        0x7f0403b9
+        0x7f040319
+        0x7f0403b2
+        0x7f0403bc
     .end array-data
 
     :array_1
     .array-data 4
         0x7f04004c
         0x7f04004e
-        0x7f0400ac
-        0x7f040156
-        0x7f040316
-        0x7f0403b9
+        0x7f0400ad
+        0x7f040158
+        0x7f040319
+        0x7f0403bc
     .end array-data
 
     :array_2
     .array-data 4
-        0x7f040118
-        0x7f0401eb
+        0x7f04011a
+        0x7f0401ed
     .end array-data
 
     :array_3
     .array-data 4
         0x10100f2
-        0x7f04007a
         0x7f04007b
-        0x7f04024e
-        0x7f04024f
-        0x7f040270
-        0x7f0402f8
-        0x7f0402f9
+        0x7f04007c
+        0x7f040251
+        0x7f040252
+        0x7f040273
+        0x7f0402fb
+        0x7f0402fc
     .end array-data
 
     :array_4
@@ -2616,39 +2616,39 @@
         0x10100d4
         0x101048f
         0x1010540
-        0x7f040112
-        0x7f040119
-        0x7f040249
+        0x7f040114
+        0x7f04011b
+        0x7f04024c
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f040306
-        0x7f040307
-        0x7f040308
         0x7f040309
+        0x7f04030a
+        0x7f04030b
+        0x7f04030c
     .end array-data
 
     :array_9
     .array-data 4
-        0x7f040243
-        0x7f040244
+        0x7f040245
+        0x7f040246
     .end array-data
 
     :array_a
     .array-data 4
         0x1010119
-        0x7f040303
-        0x7f0403ad
-        0x7f0403ae
+        0x7f040306
+        0x7f0403b0
+        0x7f0403b1
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f0403aa
-        0x7f0403ab
-        0x7f0403ac
+        0x7f0403ad
+        0x7f0403ae
+        0x7f0403af
     .end array-data
 
     :array_c
@@ -2670,11 +2670,11 @@
         0x7f040048
         0x7f040049
         0x7f04004a
-        0x7f040131
-        0x7f04013f
-        0x7f0401fd
-        0x7f04024a
-        0x7f040339
+        0x7f040133
+        0x7f040141
+        0x7f0401ff
+        0x7f04024d
+        0x7f04033c
     .end array-data
 
     :array_e
@@ -2717,17 +2717,16 @@
         0x7f04002b
         0x7f04002c
         0x7f040044
-        0x7f040065
-        0x7f040074
+        0x7f040066
         0x7f040075
         0x7f040076
         0x7f040077
         0x7f040078
-        0x7f04007d
+        0x7f040079
         0x7f04007e
-        0x7f04008c
-        0x7f040091
-        0x7f0400b2
+        0x7f04007f
+        0x7f04008d
+        0x7f040092
         0x7f0400b3
         0x7f0400b4
         0x7f0400b5
@@ -2735,95 +2734,96 @@
         0x7f0400b7
         0x7f0400b8
         0x7f0400b9
-        0x7f0400bc
-        0x7f0400c1
-        0x7f0400d4
-        0x7f040100
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c2
+        0x7f0400d5
         0x7f040101
         0x7f040102
-        0x7f040108
-        0x7f04010a
-        0x7f04010d
-        0x7f04010e
+        0x7f040103
+        0x7f040109
+        0x7f04010b
         0x7f04010f
         0x7f040110
         0x7f040111
-        0x7f040162
-        0x7f0401d2
-        0x7f04024c
-        0x7f04024d
+        0x7f040112
+        0x7f040113
+        0x7f040164
+        0x7f0401d4
+        0x7f04024f
         0x7f040250
-        0x7f040251
-        0x7f040252
         0x7f040253
         0x7f040254
         0x7f040255
         0x7f040256
-        0x7f040280
-        0x7f040281
-        0x7f040282
-        0x7f04028a
-        0x7f04028c
-        0x7f0402bf
+        0x7f040257
+        0x7f040258
+        0x7f040259
+        0x7f040283
+        0x7f040284
+        0x7f040285
+        0x7f04028d
+        0x7f04028f
         0x7f0402c2
-        0x7f0402c3
-        0x7f0402c4
-        0x7f0402eb
-        0x7f0402ed
+        0x7f0402c5
+        0x7f0402c6
+        0x7f0402c7
         0x7f0402ee
-        0x7f0402ef
-        0x7f040300
-        0x7f040301
-        0x7f04031a
-        0x7f040344
-        0x7f040345
-        0x7f040346
+        0x7f0402f0
+        0x7f0402f1
+        0x7f0402f2
+        0x7f040303
+        0x7f040304
+        0x7f04031d
         0x7f040347
+        0x7f040348
         0x7f040349
         0x7f04034a
-        0x7f04034b
         0x7f04034c
+        0x7f04034d
+        0x7f04034e
         0x7f04034f
-        0x7f040350
-        0x7f0403bb
-        0x7f0403bc
-        0x7f0403bd
+        0x7f040352
+        0x7f040353
         0x7f0403be
-        0x7f0403dc
-        0x7f0403df
-        0x7f0403e0
+        0x7f0403bf
+        0x7f0403c0
+        0x7f0403c1
         0x7f0403e1
-        0x7f0403e2
-        0x7f0403e3
         0x7f0403e4
         0x7f0403e5
         0x7f0403e6
         0x7f0403e7
         0x7f0403e8
+        0x7f0403e9
+        0x7f0403ea
+        0x7f0403eb
+        0x7f0403ec
+        0x7f0403ed
     .end array-data
 
     :array_f
     .array-data 4
         0x7f040050
-        0x7f040121
-        0x7f040122
         0x7f040123
         0x7f040124
-        0x7f04015c
+        0x7f040125
+        0x7f040126
+        0x7f04015e
     .end array-data
 
     :array_10
     .array-data 4
-        0x7f040112
-        0x7f0401ee
+        0x7f040114
         0x7f0401f0
         0x7f0401f2
-        0x7f0401f3
-        0x7f0401f7
-        0x7f0401f8
+        0x7f0401f4
+        0x7f0401f5
         0x7f0401f9
-        0x7f0401fc
-        0x7f04026f
+        0x7f0401fa
+        0x7f0401fb
+        0x7f0401fe
+        0x7f040272
     .end array-data
 
     :array_11
@@ -2839,25 +2839,25 @@
         0x101011e
         0x7f04003e
         0x7f040045
-        0x7f040127
-        0x7f040134
+        0x7f040129
+        0x7f040136
     .end array-data
 
     :array_13
     .array-data 4
         0x101013f
         0x1010140
-        0x7f040081
         0x7f040082
         0x7f040083
         0x7f040084
         0x7f040085
         0x7f040086
-        0x7f0400ce
+        0x7f040087
         0x7f0400cf
         0x7f0400d0
         0x7f0400d1
         0x7f0400d2
+        0x7f0400d3
     .end array-data
 
     :array_14
@@ -2867,71 +2867,71 @@
         0x101011f
         0x101014f
         0x10101e5
-        0x7f04008e
         0x7f04008f
         0x7f040090
-        0x7f040092
+        0x7f040091
         0x7f040093
         0x7f040094
-        0x7f040096
+        0x7f040095
         0x7f040097
         0x7f040098
         0x7f040099
         0x7f04009a
         0x7f04009b
-        0x7f0400a0
+        0x7f04009c
         0x7f0400a1
         0x7f0400a2
-        0x7f0400a5
+        0x7f0400a3
         0x7f0400a6
         0x7f0400a7
         0x7f0400a8
         0x7f0400a9
         0x7f0400aa
         0x7f0400ab
-        0x7f04015a
-        0x7f0401c8
-        0x7f0401cc
-        0x7f0402c8
-        0x7f0402f6
-        0x7f040351
-        0x7f040353
+        0x7f0400ac
+        0x7f04015c
+        0x7f0401ca
+        0x7f0401ce
+        0x7f0402cb
+        0x7f0402f9
+        0x7f040354
+        0x7f040356
     .end array-data
 
     :array_15
     .array-data 4
-        0x7f04008d
-        0x7f04009c
+        0x7f04008e
         0x7f04009d
         0x7f04009e
-        0x7f0402fa
-        0x7f0402fb
+        0x7f04009f
+        0x7f0402fd
+        0x7f0402fe
     .end array-data
 
     :array_16
     .array-data 4
-        0x7f0400af
         0x7f0400b0
-        0x7f0400d3
-        0x7f04011a
-        0x7f04011b
+        0x7f0400b1
+        0x7f0400d4
         0x7f04011c
         0x7f04011d
         0x7f04011e
         0x7f04011f
         0x7f040120
-        0x7f0402e6
-        0x7f0402e8
-        0x7f04030b
-        0x7f0403af
-        0x7f0403b0
-        0x7f0403ba
+        0x7f040121
+        0x7f040122
+        0x7f0402e9
+        0x7f0402eb
+        0x7f04030e
+        0x7f0403b2
+        0x7f0403b3
+        0x7f0403bd
     .end array-data
 
     :array_17
     .array-data 4
-        0x7f040204
-        0x7f040205
+        0x7f040206
+        0x7f040207
     .end array-data
 
     :array_18
@@ -2944,8 +2944,8 @@
     :array_19
     .array-data 4
         0x1010107
-        0x7f04007f
         0x7f040080
+        0x7f040081
     .end array-data
 
     :array_1a
@@ -2957,11 +2957,9 @@
         0x1010140
         0x7f040053
         0x7f040054
-        0x7f040089
-        0x7f0400c3
+        0x7f04008a
         0x7f0400c4
-        0x7f040206
-        0x7f040207
+        0x7f0400c5
         0x7f040208
         0x7f040209
         0x7f04020a
@@ -3001,21 +2999,23 @@
         0x7f04022c
         0x7f04022d
         0x7f04022e
+        0x7f04022f
         0x7f040230
-        0x7f040231
-        0x7f040235
-        0x7f040236
+        0x7f040232
+        0x7f040233
         0x7f040237
         0x7f040238
         0x7f040239
         0x7f04023a
-        0x7f040241
+        0x7f04023b
+        0x7f04023c
+        0x7f040243
     .end array-data
 
     :array_1b
     .array-data 4
-        0x7f0400c6
-        0x7f040113
+        0x7f0400c7
+        0x7f040115
     .end array-data
 
     :array_1c
@@ -3049,10 +3049,8 @@
         0x1010440
         0x7f040053
         0x7f040054
-        0x7f040089
-        0x7f0400c4
-        0x7f040206
-        0x7f040207
+        0x7f04008a
+        0x7f0400c5
         0x7f040208
         0x7f040209
         0x7f04020a
@@ -3092,37 +3090,39 @@
         0x7f04022c
         0x7f04022d
         0x7f04022e
+        0x7f04022f
         0x7f040230
-        0x7f040231
-        0x7f040235
-        0x7f040236
+        0x7f040232
+        0x7f040233
         0x7f040237
         0x7f040238
         0x7f040239
         0x7f04023a
+        0x7f04023b
+        0x7f04023c
     .end array-data
 
     :array_1d
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_1e
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_1f
     .array-data 4
-        0x7f040068
         0x7f040069
+        0x7f04006a
     .end array-data
 
     :array_20
@@ -3130,53 +3130,53 @@
         0x7f04003b
         0x7f04003c
         0x7f040052
-        0x7f0400b1
-        0x7f04010b
-        0x7f04014a
-        0x7f0402ff
-        0x7f0403a6
+        0x7f0400b2
+        0x7f04010c
+        0x7f04014c
+        0x7f040302
+        0x7f0403a9
     .end array-data
 
     :array_21
     .array-data 4
-        0x7f04015d
         0x7f04015f
-        0x7f040290
+        0x7f040161
+        0x7f040293
     .end array-data
 
     :array_22
     .array-data 4
         0x7f040050
         0x7f040051
-        0x7f040064
-        0x7f040112
-        0x7f040125
-        0x7f040126
-        0x7f04015a
-        0x7f040164
-        0x7f04026c
-        0x7f04028f
-        0x7f0402c8
-        0x7f0402f6
-        0x7f0403d7
+        0x7f040065
+        0x7f040114
+        0x7f040127
+        0x7f040128
+        0x7f04015c
+        0x7f040166
+        0x7f04026f
+        0x7f040292
+        0x7f0402cb
+        0x7f0402f9
+        0x7f0403da
     .end array-data
 
     :array_23
     .array-data 4
-        0x7f040132
-        0x7f040133
-        0x7f0401f5
-        0x7f04024b
+        0x7f040134
+        0x7f040135
+        0x7f0401f7
+        0x7f04024e
     .end array-data
 
     :array_24
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_25
@@ -3186,39 +3186,36 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_26
     .array-data 4
         0x1010109
         0x1010200
-        0x7f040149
+        0x7f04014b
     .end array-data
 
     :array_27
     .array-data 4
         0x7f040027
         0x7f04004d
-        0x7f040128
-        0x7f040129
         0x7f04012a
-        0x7f040279
-        0x7f040288
-        0x7f040289
-        0x7f04028e
-        0x7f0402b6
-        0x7f0402b7
-        0x7f0402b8
-        0x7f0402c5
-        0x7f0402c6
+        0x7f04012b
+        0x7f04012c
+        0x7f04027c
+        0x7f04028b
+        0x7f04028c
+        0x7f040291
+        0x7f0402b9
+        0x7f0402ba
+        0x7f0402bb
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f0402cb
         0x7f0402cc
         0x7f0402cd
         0x7f0402ce
@@ -3230,7 +3227,10 @@
         0x7f0402d4
         0x7f0402d5
         0x7f0402d6
-        0x7f0403db
+        0x7f0402d7
+        0x7f0402d8
+        0x7f0402d9
+        0x7f0403e0
     .end array-data
 
     :array_28
@@ -3262,10 +3262,10 @@
         0x1010126
         0x1010127
         0x1010128
-        0x7f040104
-        0x7f040109
-        0x7f04026e
-        0x7f0402f5
+        0x7f040105
+        0x7f04010a
+        0x7f040271
+        0x7f0402f8
     .end array-data
 
     :array_2b
@@ -3290,47 +3290,44 @@
         0x10101ba
         0x7f040050
         0x7f040051
-        0x7f0400d6
-        0x7f0401c7
+        0x7f0400d7
         0x7f0401c9
-        0x7f0401ca
         0x7f0401cb
+        0x7f0401cc
         0x7f0401cd
-        0x7f0401ce
-        0x7f0402c8
-        0x7f04030f
-        0x7f040310
+        0x7f0401cf
+        0x7f0401d0
+        0x7f0402cb
+        0x7f040312
+        0x7f040313
     .end array-data
 
     :array_2e
     .array-data 4
-        0x7f04030f
-        0x7f040310
+        0x7f040312
+        0x7f040313
     .end array-data
 
     :array_2f
     .array-data 4
-        0x7f040068
         0x7f040069
-        0x7f040095
-        0x7f04009f
-        0x7f0400a3
-        0x7f0400b2
+        0x7f04006a
+        0x7f040096
+        0x7f0400a0
+        0x7f0400a4
         0x7f0400b3
-        0x7f0400b9
-        0x7f0400bc
-        0x7f0400c0
-        0x7f040111
-        0x7f04013d
-        0x7f040268
-        0x7f040269
-        0x7f040274
-        0x7f0402e7
-        0x7f0402fc
-        0x7f040332
-        0x7f04033a
-        0x7f04033b
-        0x7f04033c
+        0x7f0400b4
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c1
+        0x7f040113
+        0x7f04013f
+        0x7f04026b
+        0x7f04026c
+        0x7f040277
+        0x7f0402ea
+        0x7f0402ff
+        0x7f040335
         0x7f04033d
         0x7f04033e
         0x7f04033f
@@ -3338,10 +3335,13 @@
         0x7f040341
         0x7f040342
         0x7f040343
-        0x7f040348
-        0x7f04034d
-        0x7f04034e
-        0x7f040352
+        0x7f040344
+        0x7f040345
+        0x7f040346
+        0x7f04034b
+        0x7f040350
+        0x7f040351
+        0x7f040355
     .end array-data
 
     :array_30
@@ -3373,12 +3373,12 @@
         0x7f04001f
         0x7f040020
         0x7f040031
-        0x7f0400c7
-        0x7f0401cd
-        0x7f0401ce
-        0x7f040277
-        0x7f0402f1
-        0x7f0403bf
+        0x7f0400c8
+        0x7f0401cf
+        0x7f0401d0
+        0x7f04027a
+        0x7f0402f4
+        0x7f0403c2
     .end array-data
 
     :array_32
@@ -3390,8 +3390,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04028d
-        0x7f040311
+        0x7f040290
+        0x7f040314
     .end array-data
 
     :array_33
@@ -3399,43 +3399,43 @@
         0x10100d4
         0x10100dd
         0x101011f
-        0x7f040112
-        0x7f040155
-        0x7f0401ee
-        0x7f0401ef
+        0x7f040114
+        0x7f040157
+        0x7f0401f0
         0x7f0401f1
         0x7f0401f3
-        0x7f0401f6
-        0x7f0401f9
-        0x7f04026f
+        0x7f0401f5
+        0x7f0401f8
+        0x7f0401fb
+        0x7f040272
     .end array-data
 
     :array_34
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040278
+        0x7f04027b
     .end array-data
 
     :array_35
     .array-data 4
-        0x7f04027c
         0x7f04027f
+        0x7f040282
     .end array-data
 
     :array_36
     .array-data 4
         0x10100c4
         0x10100f1
-        0x7f04012b
-        0x7f04012c
         0x7f04012d
         0x7f04012e
         0x7f04012f
-        0x7f0401ff
-        0x7f0402c7
-        0x7f0402fe
-        0x7f040304
+        0x7f040130
+        0x7f040131
+        0x7f040201
+        0x7f0402ca
+        0x7f040301
+        0x7f040307
     .end array-data
 
     :array_37
@@ -3444,19 +3444,19 @@
         0x101011f
         0x1010220
         0x1010264
-        0x7f0400a5
-        0x7f0400c2
-        0x7f0400ff
-        0x7f04014f
-        0x7f0401cf
-        0x7f0401fe
-        0x7f0402bd
-        0x7f0402be
-        0x7f0402e9
-        0x7f0402ea
-        0x7f040312
-        0x7f040317
-        0x7f0403dd
+        0x7f0400a6
+        0x7f0400c3
+        0x7f040100
+        0x7f040151
+        0x7f0401d1
+        0x7f040200
+        0x7f0402c0
+        0x7f0402c1
+        0x7f0402ec
+        0x7f0402ed
+        0x7f040315
+        0x7f04031a
+        0x7f0403e2
     .end array-data
 
     :array_38
@@ -3465,21 +3465,18 @@
         0x7f040027
         0x7f040028
         0x7f04004d
-        0x7f040128
-        0x7f040129
         0x7f04012a
-        0x7f040279
-        0x7f040288
-        0x7f040289
-        0x7f04028e
-        0x7f0402b6
-        0x7f0402b7
-        0x7f0402b8
-        0x7f0402c5
-        0x7f0402c6
+        0x7f04012b
+        0x7f04012c
+        0x7f04027c
+        0x7f04028b
+        0x7f04028c
+        0x7f040291
+        0x7f0402b9
+        0x7f0402ba
+        0x7f0402bb
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f0402cb
         0x7f0402cc
         0x7f0402cd
         0x7f0402ce
@@ -3491,20 +3488,23 @@
         0x7f0402d4
         0x7f0402d5
         0x7f0402d6
-        0x7f0403db
+        0x7f0402d7
+        0x7f0402d8
+        0x7f0402d9
+        0x7f0403e0
     .end array-data
 
     :array_39
     .array-data 4
-        0x7f0402fc
-        0x7f0402fd
+        0x7f0402ff
+        0x7f040300
     .end array-data
 
     :array_3a
     .array-data 4
         0x101011f
-        0x7f040112
-        0x7f04026a
+        0x7f040114
+        0x7f04026d
     .end array-data
 
     :array_3b
@@ -3513,7 +3513,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_3c
@@ -3531,17 +3531,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f0402f7
-        0x7f040302
-        0x7f040318
-        0x7f040319
+        0x7f0402fa
+        0x7f040305
         0x7f04031b
-        0x7f0403a7
-        0x7f0403a8
-        0x7f0403a9
-        0x7f0403c0
-        0x7f0403c1
-        0x7f0403c2
+        0x7f04031c
+        0x7f04031e
+        0x7f0403aa
+        0x7f0403ab
+        0x7f0403ac
+        0x7f0403c3
+        0x7f0403c4
+        0x7f0403c5
     .end array-data
 
     :array_3e
@@ -3553,9 +3553,6 @@
 
     :array_3f
     .array-data 4
-        0x7f04031c
-        0x7f04031d
-        0x7f04031e
         0x7f04031f
         0x7f040320
         0x7f040321
@@ -3575,9 +3572,12 @@
         0x7f04032f
         0x7f040330
         0x7f040331
+        0x7f040332
         0x7f040333
         0x7f040334
-        0x7f040335
+        0x7f040336
+        0x7f040337
+        0x7f040338
     .end array-data
 
     :array_40
@@ -3593,15 +3593,14 @@
         0x1010163
         0x1010164
         0x10103ac
-        0x7f04013f
-        0x7f040339
+        0x7f040141
+        0x7f04033c
     .end array-data
 
     :array_41
     .array-data 4
         0x101009a
         0x1010150
-        0x7f04006a
         0x7f04006b
         0x7f04006c
         0x7f04006d
@@ -3610,72 +3609,73 @@
         0x7f040070
         0x7f040071
         0x7f040072
-        0x7f0400d7
+        0x7f040073
         0x7f0400d8
         0x7f0400d9
         0x7f0400da
-        0x7f040116
-        0x7f040117
-        0x7f040157
-        0x7f040158
+        0x7f0400db
+        0x7f040118
+        0x7f040119
         0x7f040159
-        0x7f04015e
+        0x7f04015a
+        0x7f04015b
         0x7f040160
-        0x7f040161
-        0x7f040283
-        0x7f040284
-        0x7f040285
+        0x7f040162
+        0x7f040163
         0x7f040286
         0x7f040287
+        0x7f040288
+        0x7f040289
+        0x7f04028a
     .end array-data
 
     :array_42
     .array-data 4
         0x1010034
-        0x7f040114
-        0x7f040115
+        0x7f040116
+        0x7f040117
     .end array-data
 
     :array_43
     .array-data 4
         0x10100af
         0x1010140
-        0x7f040079
-        0x7f0400ad
+        0x7f04007a
         0x7f0400ae
-        0x7f0400c8
+        0x7f0400af
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f040257
-        0x7f040258
-        0x7f04026b
-        0x7f040271
-        0x7f040272
-        0x7f04028b
-        0x7f040313
-        0x7f040314
-        0x7f040315
-        0x7f0403af
-        0x7f0403b1
+        0x7f0400ce
+        0x7f04025a
+        0x7f04025b
+        0x7f04026e
+        0x7f040274
+        0x7f040275
+        0x7f04028e
+        0x7f040316
+        0x7f040317
+        0x7f040318
         0x7f0403b2
-        0x7f0403b3
         0x7f0403b4
         0x7f0403b5
         0x7f0403b6
         0x7f0403b7
         0x7f0403b8
+        0x7f0403b9
+        0x7f0403ba
+        0x7f0403bb
     .end array-data
 
     :array_44
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04027d
-        0x7f04027e
-        0x7f040355
+        0x7f040280
+        0x7f040281
+        0x7f040358
     .end array-data
 
     :array_45
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a.smali
index 4c7298b901..df0fa946d7 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic aZO:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
+.field final synthetic bag:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
 
-.field final synthetic aZP:Lcom/lytefast/flexinput/model/Attachment;
+.field final synthetic bah:Lcom/lytefast/flexinput/model/Attachment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;Lcom/lytefast/flexinput/model/Attachment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aZO:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->bag:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aZP:Lcom/lytefast/flexinput/model/Attachment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->bah:Lcom/lytefast/flexinput/model/Attachment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,13 +41,13 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aZO:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->bag:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->aZN:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->baf:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aZP:Lcom/lytefast/flexinput/model/Attachment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->bah:Lcom/lytefast/flexinput/model/Attachment;
 
     invoke-virtual {p1, v0}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->unselectItem(Lcom/lytefast/flexinput/model/Attachment;)V
 
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 547242ea1c..ac81d3a77b 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
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final synthetic aZN:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+.field final synthetic baf:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
 .field final draweeView:Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -35,7 +35,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->aZN:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->baf:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
     invoke-direct {p0, p2}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
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 ad00d9bb6f..84285ab0df 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field public final aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.field public final bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/lytefast/flexinput/utils/SelectionAggregator<",
@@ -109,7 +109,7 @@
     invoke-direct/range {v0 .. v6}, Lcom/lytefast/flexinput/utils/SelectionAggregator;-><init>(Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/util/ArrayList;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     :cond_1
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     return-void
 .end method
@@ -123,7 +123,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-virtual {v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->clear()V
 
@@ -137,7 +137,7 @@
 .method public final getItemCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->getSize()I
 
@@ -155,7 +155,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-virtual {v0, p2}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->get(I)Lcom/lytefast/flexinput/model/Attachment;
 
@@ -175,7 +175,7 @@
 
     check-cast v1, Lcom/lytefast/flexinput/model/Photo;
 
-    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->aZN:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->baf:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
     iget-object v2, v2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->contentResolver:Landroid/content/ContentResolver;
 
@@ -204,7 +204,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hK()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->hN()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object v2
 
@@ -220,7 +220,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gi()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gm()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v1
 
@@ -238,13 +238,13 @@
 
     const/4 v2, 0x1
 
-    invoke-virtual {v1, v2}, Lcom/facebook/drawee/backends/pipeline/e;->w(Z)Lcom/facebook/drawee/controller/a;
+    invoke-virtual {v1, v2}, Lcom/facebook/drawee/backends/pipeline/e;->u(Z)Lcom/facebook/drawee/controller/a;
 
     move-result-object v1
 
     check-cast v1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jS()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->jQ()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
@@ -254,7 +254,7 @@
 
     check-cast v0, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->gF()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->gJ()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object v0
 
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 16a08b2474..c769359ed1 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
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field final aZQ:Landroid/view/View;
+.field final bai:Landroid/view/View;
 
-.field final synthetic aZR:Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
+.field final synthetic baj:Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->aZR:Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->baj:Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
 
     invoke-direct {p0, p2}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
@@ -51,7 +51,7 @@
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->aZQ:Landroid/view/View;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->bai:Landroid/view/View;
 
     return-void
 .end method
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 44190d21dd..08aaee50c0 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/EmptyListAdapter.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/EmptyListAdapter.smali
@@ -81,7 +81,7 @@
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->aZQ:Landroid/view/View;
+    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->bai:Landroid/view/View;
 
     iget-object p2, p0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter;->onClickListener:Landroid/view/View$OnClickListener;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a$b.smali
index 3d342f21b7..4f1eacb115 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a$b.smali
@@ -29,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic aZT:Lcom/lytefast/flexinput/adapters/FileListAdapter$a;
+.field final synthetic bal:Lcom/lytefast/flexinput/adapters/FileListAdapter$a;
 
 
 # direct methods
 .method public constructor <init>(Lcom/lytefast/flexinput/adapters/FileListAdapter$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$b;->aZT:Lcom/lytefast/flexinput/adapters/FileListAdapter$a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$b;->bal:Lcom/lytefast/flexinput/adapters/FileListAdapter$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a$c.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a$c.smali
index 2da0518877..17d971c070 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a$c.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a$c.smali
@@ -30,7 +30,7 @@
 
 
 # static fields
-.field public static final aZU:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
+.field public static final bam:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
 
 
 # direct methods
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;-><init>()V
 
-    sput-object v0, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->aZU:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
+    sput-object v0, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->bam:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
 
     return-void
 .end method
@@ -56,7 +56,7 @@
     return-void
 .end method
 
-.method public static v(Ljava/io/File;)Lkotlin/sequences/Sequence;
+.method public static u(Ljava/io/File;)Lkotlin/sequences/Sequence;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -79,14 +79,14 @@
 
     if-eqz p0, :cond_0
 
-    invoke-static {p0}, Lkotlin/a/g;->j([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    invoke-static {p0}, Lkotlin/a/g;->i([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
 
     move-result-object p0
 
     if-nez p0, :cond_1
 
     :cond_0
-    sget-object p0, Lkotlin/sequences/e;->blj:Lkotlin/sequences/e;
+    sget-object p0, Lkotlin/sequences/e;->blD:Lkotlin/sequences/e;
 
     check-cast p0, Lkotlin/sequences/Sequence;
 
@@ -101,7 +101,7 @@
 
     check-cast p1, Ljava/io/File;
 
-    invoke-static {p1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->v(Ljava/io/File;)Lkotlin/sequences/Sequence;
+    invoke-static {p1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->u(Ljava/io/File;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
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 4ad96445e5..d39c77090a 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
@@ -85,7 +85,7 @@
 
     aget-object p1, p1, v0
 
-    sget-object v0, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->aZU:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
+    sget-object v0, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->bam:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -99,7 +99,7 @@
 
     check-cast v2, Ljava/util/Collection;
 
-    invoke-static {p1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->v(Ljava/io/File;)Lkotlin/sequences/Sequence;
+    invoke-static {p1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->u(Ljava/io/File;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
@@ -135,7 +135,7 @@
 
     if-eqz v3, :cond_1
 
-    invoke-static {p1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->v(Ljava/io/File;)Lkotlin/sequences/Sequence;
+    invoke-static {p1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->u(Ljava/io/File;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
@@ -144,7 +144,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {p1}, Lcom/lytefast/flexinput/utils/a;->w(Ljava/io/File;)Lcom/lytefast/flexinput/model/Attachment;
+    invoke-static {p1}, Lcom/lytefast/flexinput/utils/a;->v(Ljava/io/File;)Lcom/lytefast/flexinput/model/Attachment;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b$1.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b$1.smali
index 478002b4ac..a92531d295 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b$1.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bad:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+.field final synthetic bav:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/adapters/FileListAdapter$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->bad:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->bav:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,21 +37,21 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->bad:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->bav:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bac:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bau:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/adapters/FileListAdapter;->a(Lcom/lytefast/flexinput/adapters/FileListAdapter;)Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->bad:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->bav:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
 
     invoke-static {v1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->a(Lcom/lytefast/flexinput/adapters/FileListAdapter$b;)Lcom/lytefast/flexinput/model/Attachment;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->bad:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+    iget-object v2, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->bav:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
 
     invoke-virtual {v2}, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->getAdapterPosition()I
 
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 0e58e6f862..627de0794d 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
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0, p1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$a;->a(Landroid/animation/AnimatorSet;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 ad90bf08ad..0ccdee69ad 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
@@ -15,19 +15,19 @@
 
 
 # instance fields
-.field private final aZV:Landroid/animation/AnimatorSet;
+.field private final ban:Landroid/animation/AnimatorSet;
 
-.field private final aZW:Landroid/animation/AnimatorSet;
+.field private final bao:Landroid/animation/AnimatorSet;
 
-.field aZX:Lcom/facebook/drawee/view/SimpleDraweeView;
+.field bap:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-.field aZY:Landroid/widget/ImageView;
+.field baq:Landroid/widget/ImageView;
 
-.field aZZ:Landroid/widget/TextView;
+.field bar:Landroid/widget/TextView;
 
-.field baa:Landroid/widget/TextView;
+.field bas:Landroid/widget/TextView;
 
-.field bab:Lcom/lytefast/flexinput/model/Attachment;
+.field bat:Lcom/lytefast/flexinput/model/Attachment;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/lytefast/flexinput/model/Attachment<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field final synthetic bac:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+.field final synthetic bau:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
 
 # direct methods
@@ -56,7 +56,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bac:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bau:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     invoke-direct {p0, p2}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
@@ -72,7 +72,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZX:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bap:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     sget p1, Lcom/lytefast/flexinput/R$e;->type_iv:I
 
@@ -86,7 +86,7 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZY:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->baq:Landroid/widget/ImageView;
 
     sget p1, Lcom/lytefast/flexinput/R$e;->file_name_tv:I
 
@@ -100,7 +100,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZZ:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bar:Landroid/widget/TextView;
 
     sget p1, Lcom/lytefast/flexinput/R$e;->file_subtitle_tv:I
 
@@ -114,7 +114,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->baa:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bas:Landroid/widget/TextView;
 
     iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->itemView:Landroid/view/View;
 
@@ -152,11 +152,11 @@
 
     check-cast p1, Landroid/animation/AnimatorSet;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZV:Landroid/animation/AnimatorSet;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->ban:Landroid/animation/AnimatorSet;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZV:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->ban:Landroid/animation/AnimatorSet;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZX:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bap:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1, v1}, Landroid/animation/AnimatorSet;->setTarget(Ljava/lang/Object;)V
 
@@ -174,11 +174,11 @@
 
     check-cast p1, Landroid/animation/AnimatorSet;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZW:Landroid/animation/AnimatorSet;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bao:Landroid/animation/AnimatorSet;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZW:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bao:Landroid/animation/AnimatorSet;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZX:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p2, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bap:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1, p2}, Landroid/animation/AnimatorSet;->setTarget(Ljava/lang/Object;)V
 
@@ -202,7 +202,7 @@
 .method public static final synthetic a(Lcom/lytefast/flexinput/adapters/FileListAdapter$b;)Lcom/lytefast/flexinput/model/Attachment;
     .locals 0
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bab:Lcom/lytefast/flexinput/model/Attachment;
+    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bat:Lcom/lytefast/flexinput/model/Attachment;
 
     return-object p0
 .end method
@@ -228,7 +228,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZX:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bap:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getScaleX()F
 
@@ -238,14 +238,14 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZV:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->ban:Landroid/animation/AnimatorSet;
 
     invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$a;->a(Landroid/animation/AnimatorSet;)V
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZX:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bap:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getScaleX()F
 
@@ -255,7 +255,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZW:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bao:Landroid/animation/AnimatorSet;
 
     invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$a;->a(Landroid/animation/AnimatorSet;)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 ae69f40db5..6cea5512fa 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field private aZS:Ljava/util/List;
+.field private bak:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -87,11 +87,11 @@
 
     iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
-    sget-object p1, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object p1, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast p1, Ljava/util/List;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aZS:Ljava/util/List;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->bak:Ljava/util/List;
 
     return-void
 .end method
@@ -107,7 +107,7 @@
 .method public static final synthetic a(Lcom/lytefast/flexinput/adapters/FileListAdapter;Ljava/util/List;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aZS:Ljava/util/List;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->bak:Ljava/util/List;
 
     return-void
 .end method
@@ -117,7 +117,7 @@
 .method public final getItemCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aZS:Ljava/util/List;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->bak:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -135,7 +135,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aZS:Ljava/util/List;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->bak:Ljava/util/List;
 
     invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -147,9 +147,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bab:Lcom/lytefast/flexinput/model/Attachment;
+    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bat:Lcom/lytefast/flexinput/model/Attachment;
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bac:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bau:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     iget-object v0, v0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
@@ -175,7 +175,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZZ:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bar:Landroid/widget/TextView;
 
     invoke-virtual {p2}, Ljava/io/File;->getName()Ljava/lang/String;
 
@@ -185,9 +185,9 @@
 
     invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->baa:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bas:Landroid/widget/TextView;
 
-    invoke-static {p2}, Lcom/lytefast/flexinput/utils/a;->x(Ljava/io/File;)Ljava/lang/String;
+    invoke-static {p2}, Lcom/lytefast/flexinput/utils/a;->w(Ljava/io/File;)Ljava/lang/String;
 
     move-result-object v3
 
@@ -198,20 +198,20 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZZ:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bar:Landroid/widget/TextView;
 
     invoke-virtual {v2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->baa:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bas:Landroid/widget/TextView;
 
     invoke-virtual {v2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :goto_0
-    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZX:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bap:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {v2, v0}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Landroid/net/Uri;)V
 
-    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZY:Landroid/widget/ImageView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->baq:Landroid/widget/ImageView;
 
     const/16 v3, 0x8
 
@@ -312,7 +312,7 @@
 
     if-nez v3, :cond_5
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_5
     const-string v4, "image"
@@ -323,17 +323,17 @@
 
     if-eqz v4, :cond_b
 
-    iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZY:Landroid/widget/ImageView;
+    iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->baq:Landroid/widget/ImageView;
 
     sget v4, Lcom/lytefast/flexinput/R$d;->ic_image_24dp:I
 
     invoke-virtual {v3, v4}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZY:Landroid/widget/ImageView;
+    iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->baq:Landroid/widget/ImageView;
 
     invoke-virtual {v3, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bac:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bau:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     iget-object v4, v3, Lcom/lytefast/flexinput/adapters/FileListAdapter;->contentResolver:Landroid/content/ContentResolver;
 
@@ -404,7 +404,7 @@
 
     if-nez v4, :cond_7
 
-    iget-object v4, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bac:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v4, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bau:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     iget-object v4, v4, Lcom/lytefast/flexinput/adapters/FileListAdapter;->contentResolver:Landroid/content/ContentResolver;
 
@@ -417,7 +417,7 @@
     invoke-virtual {v4}, Landroid/graphics/Bitmap;->recycle()V
 
     :cond_7
-    iget-object v4, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bac:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v4, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bau:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     iget-object v7, v4, Lcom/lytefast/flexinput/adapters/FileListAdapter;->contentResolver:Landroid/content/ContentResolver;
 
@@ -477,13 +477,13 @@
 
     move-result-object v1
 
-    iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZX:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bap:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gi()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gm()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v4
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZX:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bap:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getController()Lcom/facebook/drawee/d/a;
 
@@ -505,13 +505,13 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gE()Lcom/facebook/drawee/controller/a;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gI()Lcom/facebook/drawee/controller/a;
 
     move-result-object p1
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gF()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->gJ()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
@@ -519,7 +519,7 @@
 
     invoke-virtual {v3, p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setController(Lcom/facebook/drawee/d/a;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
@@ -581,17 +581,17 @@
 
     if-eqz v0, :cond_c
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZY:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->baq:Landroid/widget/ImageView;
 
     sget v2, Lcom/lytefast/flexinput/R$d;->ic_movie_24dp:I
 
     invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZY:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->baq:Landroid/widget/ImageView;
 
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aZX:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->bap:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-static {p2}, Landroid/net/Uri;->fromFile(Ljava/io/File;)Landroid/net/Uri;
 
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 f313707039..8f80fe3e78 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
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0, p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a$a;->a(Landroid/animation/AnimatorSet;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
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 6bc0d2dabd..da41836e09 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
@@ -18,17 +18,17 @@
 
 
 # instance fields
-.field private final aZV:Landroid/animation/AnimatorSet;
+.field final baA:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-.field private final aZW:Landroid/animation/AnimatorSet;
+.field private final baB:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-.field final bai:Lcom/facebook/drawee/view/SimpleDraweeView;
+.field baC:Lcom/lytefast/flexinput/model/Photo;
 
-.field private final baj:Lcom/facebook/drawee/view/SimpleDraweeView;
+.field final synthetic baD:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-.field bak:Lcom/lytefast/flexinput/model/Photo;
+.field private final ban:Landroid/animation/AnimatorSet;
 
-.field final synthetic bal:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field private final bao:Landroid/animation/AnimatorSet;
 
 
 # direct methods
@@ -46,7 +46,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bal:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baD:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     invoke-direct {p0, p2}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
@@ -62,7 +62,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bai:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baA:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     sget p1, Lcom/lytefast/flexinput/R$e;->item_check_indicator:I
 
@@ -76,7 +76,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baj:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baB:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->itemView:Landroid/view/View;
 
@@ -102,11 +102,11 @@
 
     check-cast p1, Landroid/animation/AnimatorSet;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->aZV:Landroid/animation/AnimatorSet;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->ban:Landroid/animation/AnimatorSet;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->aZV:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->ban:Landroid/animation/AnimatorSet;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bai:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baA:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1, v1}, Landroid/animation/AnimatorSet;->setTarget(Ljava/lang/Object;)V
 
@@ -124,11 +124,11 @@
 
     check-cast p1, Landroid/animation/AnimatorSet;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->aZW:Landroid/animation/AnimatorSet;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bao:Landroid/animation/AnimatorSet;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->aZW:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bao:Landroid/animation/AnimatorSet;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bai:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p2, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baA:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1, p2}, Landroid/animation/AnimatorSet;->setTarget(Ljava/lang/Object;)V
 
@@ -170,13 +170,13 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baj:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baB:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const/4 v1, 0x0
 
     invoke-virtual {p1, v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bai:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baA:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getScaleX()F
 
@@ -186,20 +186,20 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->aZV:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->ban:Landroid/animation/AnimatorSet;
 
     invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a$a;->a(Landroid/animation/AnimatorSet;)V
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baj:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baB:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const/16 v1, 0x8
 
     invoke-virtual {p1, v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bai:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baA:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getScaleX()F
 
@@ -209,7 +209,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->aZW:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bao:Landroid/animation/AnimatorSet;
 
     invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a$a;->a(Landroid/animation/AnimatorSet;)V
 
@@ -224,13 +224,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bal:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baD:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     invoke-static {p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->a(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;)Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bak:Lcom/lytefast/flexinput/model/Photo;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baC:Lcom/lytefast/flexinput/model/Photo;
 
     invoke-virtual {p0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->getAdapterPosition()I
 
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 ea86dc965f..7fa8f73a0f 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
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->Cd()V
+    value = Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->BS()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final synthetic bal:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic baD:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
 
 # direct methods
@@ -27,7 +27,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->bal:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->baD:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     invoke-static {p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->b(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;)Landroid/content/ContentResolver;
 
@@ -52,7 +52,7 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->bal:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->baD:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     const-string p2, "_id"
 
@@ -80,7 +80,7 @@
 
     invoke-static {p1, p3}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->a(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;Landroid/database/Cursor;)V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->bal:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->baD:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->notifyDataSetChanged()V
 
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 958a849818..b73eefe29d 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter.smali
@@ -20,13 +20,13 @@
 
 
 # instance fields
-.field private bae:Landroid/database/Cursor;
+.field private baw:Landroid/database/Cursor;
 
-.field private baf:I
+.field private bax:I
 
-.field private bag:I
+.field private bay:I
 
-.field private bah:I
+.field private baz:I
 
 .field private final contentResolver:Landroid/content/ContentResolver;
 
@@ -96,7 +96,7 @@
 .method public static final synthetic a(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;I)V
     .locals 0
 
-    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->baf:I
+    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->bax:I
 
     return-void
 .end method
@@ -104,7 +104,7 @@
 .method public static final synthetic a(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;Landroid/database/Cursor;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->bae:Landroid/database/Cursor;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->baw:Landroid/database/Cursor;
 
     return-void
 .end method
@@ -120,7 +120,7 @@
 .method public static final synthetic b(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;I)V
     .locals 0
 
-    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->bag:I
+    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->bay:I
 
     return-void
 .end method
@@ -128,7 +128,7 @@
 .method public static final synthetic c(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;I)V
     .locals 0
 
-    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->bah:I
+    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->baz:I
 
     return-void
 .end method
@@ -136,13 +136,13 @@
 .method private final cW(I)Lcom/lytefast/flexinput/model/Photo;
     .locals 7
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->bae:Landroid/database/Cursor;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->baw:Landroid/database/Cursor;
 
     if-eqz v0, :cond_1
 
     invoke-interface {v0, p1}, Landroid/database/Cursor;->moveToPosition(I)Z
 
-    iget p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->baf:I
+    iget p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->bax:I
 
     invoke-interface {v0, p1}, Landroid/database/Cursor;->getLong(I)J
 
@@ -164,7 +164,7 @@
 
     invoke-static {v4, v1}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->bah:I
+    iget v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->baz:I
 
     invoke-interface {v0, v1}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
@@ -185,7 +185,7 @@
     :cond_0
     move-object v5, v1
 
-    iget v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->bag:I
+    iget v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->bay:I
 
     invoke-interface {v0, v1}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
@@ -205,7 +205,7 @@
 
 
 # virtual methods
-.method public final Cd()V
+.method public final BS()V
     .locals 8
 
     new-instance v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;
@@ -254,7 +254,7 @@
 .method public final getItemCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->bae:Landroid/database/Cursor;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->baw:Landroid/database/Cursor;
 
     if-eqz v0, :cond_0
 
@@ -300,7 +300,7 @@
 
     invoke-super {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    invoke-virtual {p0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->Cd()V
+    invoke-virtual {p0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->BS()V
 
     return-void
 .end method
@@ -318,11 +318,11 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bak:Lcom/lytefast/flexinput/model/Photo;
+    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baC:Lcom/lytefast/flexinput/model/Photo;
 
     if-eqz p2, :cond_0
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bal:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baD:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     iget-object v0, v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
@@ -338,7 +338,7 @@
 
     invoke-virtual {p1, v0, v1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->d(ZZ)V
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bal:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baD:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     iget-object v0, v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->contentResolver:Landroid/content/ContentResolver;
 
@@ -352,7 +352,7 @@
     const/4 p2, 0x0
 
     :goto_0
-    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->bai:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->baA:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Landroid/net/Uri;)V
 
@@ -475,7 +475,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->bae:Landroid/database/Cursor;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->baw:Landroid/database/Cursor;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a.smali
index a64407ed58..3f428d888b 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/a.smali
@@ -13,11 +13,11 @@
 
 
 # static fields
-.field public static final aZL:Lcom/lytefast/flexinput/adapters/a$a;
+.field public static final bad:Lcom/lytefast/flexinput/adapters/a$a;
 
 
 # instance fields
-.field public final aZK:[Lcom/lytefast/flexinput/adapters/a$b;
+.field public final bac:[Lcom/lytefast/flexinput/adapters/a$b;
 
 
 # direct methods
@@ -30,7 +30,7 @@
 
     invoke-direct {v0, v1}, Lcom/lytefast/flexinput/adapters/a$a;-><init>(B)V
 
-    sput-object v0, Lcom/lytefast/flexinput/adapters/a;->aZL:Lcom/lytefast/flexinput/adapters/a$a;
+    sput-object v0, Lcom/lytefast/flexinput/adapters/a;->bad:Lcom/lytefast/flexinput/adapters/a$a;
 
     return-void
 .end method
@@ -48,7 +48,7 @@
 
     invoke-direct {p0, p1}, Landroidx/fragment/app/FragmentPagerAdapter;-><init>(Landroidx/fragment/app/FragmentManager;)V
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/adapters/a;->aZK:[Lcom/lytefast/flexinput/adapters/a$b;
+    iput-object p2, p0, Lcom/lytefast/flexinput/adapters/a;->bac:[Lcom/lytefast/flexinput/adapters/a$b;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 .method public final getCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/a;->aZK:[Lcom/lytefast/flexinput/adapters/a$b;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/a;->bac:[Lcom/lytefast/flexinput/adapters/a$b;
 
     array-length v0, v0
 
@@ -89,7 +89,7 @@
 .method public final getItem(I)Landroidx/fragment/app/Fragment;
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/a;->aZK:[Lcom/lytefast/flexinput/adapters/a$b;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/a;->bac:[Lcom/lytefast/flexinput/adapters/a$b;
 
     aget-object p1, v0, p1
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$b.smali
index 523b9dfee6..cfbfa90ca2 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$b.smali
@@ -84,7 +84,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     const-string v3, "camera"
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$c.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$c.smali
index 853bf4400d..9b3a026aae 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$c.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$c.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final baA:Lcom/lytefast/flexinput/fragment/CameraFragment$c;
+.field public static final baS:Lcom/lytefast/flexinput/fragment/CameraFragment$c;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/lytefast/flexinput/fragment/CameraFragment$c;-><init>()V
 
-    sput-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$c;->baA:Lcom/lytefast/flexinput/fragment/CameraFragment$c;
+    sput-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$c;->baS:Lcom/lytefast/flexinput/fragment/CameraFragment$c;
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 
     invoke-virtual {p1}, Landroid/widget/Toast;->show()V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a.smali
index 09844264a8..323e9646d3 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bay:Ljava/io/File;
+.field final synthetic baQ:Ljava/io/File;
 
-.field final synthetic baz:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;
+.field final synthetic baR:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;
 
 
 # direct methods
 .method constructor <init>(Ljava/io/File;Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a;->bay:Ljava/io/File;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a;->baQ:Ljava/io/File;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a;->baz:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a;->baR:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a;->baz:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a;->baR:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->baw:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->baO:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
 
     iget-object v0, v0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
@@ -55,14 +55,14 @@
 
     sget-object v1, Lcom/lytefast/flexinput/fragment/CameraFragment;->Companion:Lcom/lytefast/flexinput/fragment/CameraFragment$Companion;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a;->bay:Ljava/io/File;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a;->baQ:Ljava/io/File;
 
     invoke-static {v0, v1}, Lcom/lytefast/flexinput/fragment/CameraFragment$Companion;->a(Landroid/content/Context;Ljava/io/File;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a;->baz:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a;->baR:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->baw:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->baO:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
 
     iget-object v0, v0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
@@ -72,9 +72,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a;->bay:Ljava/io/File;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a$a;->baQ:Ljava/io/File;
 
-    invoke-static {v1}, Lcom/lytefast/flexinput/utils/a;->w(Ljava/io/File;)Lcom/lytefast/flexinput/model/Attachment;
+    invoke-static {v1}, Lcom/lytefast/flexinput/utils/a;->v(Ljava/io/File;)Lcom/lytefast/flexinput/model/Attachment;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a.smali
index ff3fda5c4c..3faf55123e 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic baw:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
+.field final synthetic baO:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
 
-.field final synthetic bax:[B
+.field final synthetic baP:[B
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;[B)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->baw:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->baO:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->bax:[B
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->baP:[B
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->baw:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->baO:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
 
     iget-object v0, v0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
@@ -57,7 +57,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/lytefast/flexinput/managers/FileManager;->Cp()Ljava/io/File;
+    invoke-interface {v0}, Lcom/lytefast/flexinput/managers/FileManager;->Ce()Ljava/io/File;
 
     move-result-object v0
 
@@ -75,11 +75,11 @@
 
     check-cast v2, Ljava/io/FileOutputStream;
 
-    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->bax:[B
+    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->baP:[B
 
     invoke-virtual {v2, v3}, Ljava/io/FileOutputStream;->write([B)V
 
-    sget-object v2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -88,7 +88,7 @@
     :try_start_2
     invoke-static {v1, v2}, Lkotlin/d/a;->a(Ljava/io/Closeable;Ljava/lang/Throwable;)V
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->baw:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1$a;->baO:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
 
     iget-object v1, v1, Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$i.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$i.smali
index 86cb0097c0..8ba00553bd 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$i.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$i.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final baB:Lcom/lytefast/flexinput/fragment/CameraFragment$i;
+.field public static final baT:Lcom/lytefast/flexinput/fragment/CameraFragment$i;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/lytefast/flexinput/fragment/CameraFragment$i;-><init>()V
 
-    sput-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$i;->baB:Lcom/lytefast/flexinput/fragment/CameraFragment$i;
+    sput-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$i;->baT:Lcom/lytefast/flexinput/fragment/CameraFragment$i;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$j$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$j$a.smali
index 83b785401d..5b8b521520 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$j$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$j$a.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/lytefast/flexinput/fragment/CameraFragment$j;->Ch()V
+    value = Lcom/lytefast/flexinput/fragment/CameraFragment$j;->BW()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final baC:Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;
+.field public static final baU:Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;-><init>()V
 
-    sput-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;->baC:Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;
+    sput-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;->baU:Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$j.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$j.smali
index d868829069..6520a0af04 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$j.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$j.smali
@@ -39,7 +39,7 @@
 
 
 # virtual methods
-.method public final Ch()V
+.method public final BW()V
     .locals 2
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$j;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
@@ -48,7 +48,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;->baC:Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;
+    sget-object v1, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;->baU:Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;
 
     check-cast v1, Ljava/lang/Runnable;
 
@@ -57,7 +57,7 @@
     return-void
 .end method
 
-.method public final Ci()V
+.method public final BX()V
     .locals 0
 
     return-void
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 e790f9ff05..061c0394c4 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment.smali
@@ -172,7 +172,7 @@
 
     invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/PermissionsFragment;-><init>()V
 
-    sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$c;->baA:Lcom/lytefast/flexinput/fragment/CameraFragment$c;
+    sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$c;->baS:Lcom/lytefast/flexinput/fragment/CameraFragment$c;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
@@ -216,7 +216,7 @@
 
     const-string v0, "handler"
 
-    invoke-static {v0}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v0}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object p0
@@ -343,7 +343,7 @@
 
     const-string v1, "cameraView"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/google/android/cameraview/CameraView;->getFacing()I
@@ -440,7 +440,7 @@
 
     const-string v1, "cameraView"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/google/android/cameraview/CameraView;->getFlash()I
@@ -560,7 +560,7 @@
 
     const-string v2, "cameraView"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {v1}, Lcom/google/android/cameraview/CameraView;->stop()V
@@ -578,7 +578,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-interface {v1}, Lcom/lytefast/flexinput/managers/FileManager;->Cp()Ljava/io/File;
+    invoke-interface {v1}, Lcom/lytefast/flexinput/managers/FileManager;->Ce()Ljava/io/File;
 
     move-result-object v2
 
@@ -644,7 +644,7 @@
 
     const-string v1, "cameraView"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/google/android/cameraview/CameraView;->isCameraOpened()Z
@@ -697,7 +697,7 @@
 
     const-string v2, "cameraView"
 
-    invoke-static {v2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v1}, Lcom/google/android/cameraview/CameraView;->getFacing()I
@@ -774,7 +774,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     invoke-virtual {v0}, Lcom/google/android/cameraview/CameraView;->getFlash()I
@@ -793,7 +793,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     invoke-virtual {v0, p2}, Lcom/google/android/cameraview/CameraView;->setFlash(I)V
@@ -802,7 +802,7 @@
 
     if-nez p2, :cond_3
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-virtual {p2}, Lcom/google/android/cameraview/CameraView;->getFlash()I
@@ -838,7 +838,7 @@
 
     if-nez p3, :cond_6
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_6
     invoke-virtual {p3}, Lcom/google/android/cameraview/CameraView;->getFlash()I
@@ -1012,7 +1012,7 @@
 
     const-string v1, "cameraContainer"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -1027,7 +1027,7 @@
 
     const-string v1, "cameraFacingBtn"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -1042,7 +1042,7 @@
 
     const-string v1, "cameraView"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -1075,7 +1075,7 @@
 
     const-string v1, "permissionsContainer"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     return-object v0
@@ -1181,7 +1181,7 @@
 
     if-eqz p2, :cond_4
 
-    invoke-static {p1}, Lcom/lytefast/flexinput/utils/a;->w(Ljava/io/File;)Lcom/lytefast/flexinput/model/Attachment;
+    invoke-static {p1}, Lcom/lytefast/flexinput/utils/a;->v(Ljava/io/File;)Lcom/lytefast/flexinput/model/Attachment;
 
     move-result-object p1
 
@@ -1194,7 +1194,7 @@
 
     const-string p2, "cameraView"
 
-    invoke-static {p2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {p2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_5
     invoke-virtual {p1}, Lcom/google/android/cameraview/CameraView;->stop()V
@@ -1297,7 +1297,7 @@
 
     const-string v1, "handler"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_0
     const/4 v1, 0x0
@@ -1310,7 +1310,7 @@
 
     const-string v1, "cameraView"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {v0}, Lcom/google/android/cameraview/CameraView;->stop()V
@@ -1381,7 +1381,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_2
     invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
@@ -1390,7 +1390,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_3
     invoke-virtual {v0, v4}, Landroid/widget/FrameLayout;->setVisibility(I)V
@@ -1401,7 +1401,7 @@
 
     const-string v1, "handler"
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     new-instance v1, Lcom/lytefast/flexinput/fragment/CameraFragment$d;
@@ -1422,7 +1422,7 @@
 
     if-nez v0, :cond_6
 
-    invoke-static {v3}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v3}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_6
     invoke-virtual {v0, v4}, Landroid/view/View;->setVisibility(I)V
@@ -1431,7 +1431,7 @@
 
     if-nez v0, :cond_7
 
-    invoke-static {v1}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {v1}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_7
     invoke-virtual {v0, v2}, Landroid/widget/FrameLayout;->setVisibility(I)V
@@ -1505,7 +1505,7 @@
 
     if-eqz p2, :cond_0
 
-    sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$i;->baB:Lcom/lytefast/flexinput/fragment/CameraFragment$i;
+    sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$i;->baT:Lcom/lytefast/flexinput/fragment/CameraFragment$i;
 
     check-cast v0, Landroid/view/View$OnTouchListener;
 
@@ -1597,7 +1597,7 @@
 
     if-nez p1, :cond_4
 
-    invoke-static {p2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {p2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_4
     new-instance v0, Lcom/lytefast/flexinput/fragment/CameraFragment$h;
@@ -1618,7 +1618,7 @@
 
     if-nez p1, :cond_5
 
-    invoke-static {p2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {p2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_5
     const/16 p2, 0x8
@@ -1632,7 +1632,7 @@
 
     const-string p2, "cameraView"
 
-    invoke-static {p2}, Lkotlin/jvm/internal/k;->dT(Ljava/lang/String;)V
+    invoke-static {p2}, Lkotlin/jvm/internal/k;->dN(Ljava/lang/String;)V
 
     :cond_7
     iget-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment;->cameraCallback:Lcom/lytefast/flexinput/fragment/CameraFragment$cameraCallback$1;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$a.smali
index ceae47b067..3c0020cb80 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic baD:Lcom/lytefast/flexinput/fragment/FilesFragment;
+.field final synthetic baV:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FilesFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$a;->baD:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$a;->baV:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
     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/lytefast/flexinput/fragment/FilesFragment$a;->baD:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$a;->baV:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
     invoke-static {p1}, Lcom/lytefast/flexinput/fragment/FilesFragment;->access$requestPermissions(Lcom/lytefast/flexinput/fragment/FilesFragment;)V
 
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 d6db1fe08b..2854ee0fe5 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
@@ -76,7 +76,7 @@
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/FilesFragment;->access$loadDownloadFolder(Lcom/lytefast/flexinput/fragment/FilesFragment;)V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object v0
 .end method
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 2f51485b8a..e03da2fa24 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
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic baD:Lcom/lytefast/flexinput/fragment/FilesFragment;
+.field final synthetic baV:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baD:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baV:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,10 +39,10 @@
 
 
 # virtual methods
-.method public final Ch()V
+.method public final BW()V
     .locals 4
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baD:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baV:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FilesFragment;->getContext()Landroid/content/Context;
 
@@ -56,7 +56,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baD:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baV:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
     new-instance v2, Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
@@ -66,14 +66,14 @@
 
     if-nez v3, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-direct {v2, v0, v3}, Lcom/lytefast/flexinput/adapters/FileListAdapter;-><init>(Landroid/content/ContentResolver;Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
 
     invoke-static {v1, v2}, Lcom/lytefast/flexinput/fragment/FilesFragment;->access$setAdapter$p(Lcom/lytefast/flexinput/fragment/FilesFragment;Lcom/lytefast/flexinput/adapters/FileListAdapter;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baD:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baV:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FilesFragment;->getRecyclerView$flexinput_debug()Landroidx/recyclerview/widget/RecyclerView;
 
@@ -81,7 +81,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baD:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baV:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
     invoke-static {v1}, Lcom/lytefast/flexinput/fragment/FilesFragment;->access$getAdapter$p(Lcom/lytefast/flexinput/fragment/FilesFragment;)Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
@@ -92,7 +92,7 @@
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
     :cond_1
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baD:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baV:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/FilesFragment;->access$loadDownloadFolder(Lcom/lytefast/flexinput/fragment/FilesFragment;)V
 
@@ -100,10 +100,10 @@
     return-void
 .end method
 
-.method public final Ci()V
+.method public final BX()V
     .locals 3
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baD:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->baV:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FilesFragment;->getContext()Landroid/content/Context;
 
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 0406f548b4..a72ac296bb 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment.smali
@@ -123,7 +123,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-virtual {v0, v1}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setRefreshing(Z)V
@@ -141,7 +141,7 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     const-string v3, "downloadFolder"
@@ -168,7 +168,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     invoke-virtual {v0, v1}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setRefreshing(Z)V
@@ -278,7 +278,7 @@
 
     if-eqz p3, :cond_3
 
-    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->Cc()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->BR()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object p3
 
@@ -286,7 +286,7 @@
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     invoke-virtual {p3, v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinator(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
@@ -348,7 +348,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_4
     invoke-direct {p2, p3, v0}, Lcom/lytefast/flexinput/adapters/FileListAdapter;-><init>(Landroid/content/ContentResolver;Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$1.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$1.smali
index 029e32c91d..b2a6cb0b72 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$1.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$1.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field final synthetic baS:Landroid/util/AttributeSet;
+.field final synthetic bbk:Landroid/util/AttributeSet;
 
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
 .field final synthetic val$context:Landroid/content/Context;
 
@@ -29,11 +29,11 @@
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->val$context:Landroid/content/Context;
 
-    iput-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->baS:Landroid/util/AttributeSet;
+    iput-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->bbk:Landroid/util/AttributeSet;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,7 +47,7 @@
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->val$context:Landroid/content/Context;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->baS:Landroid/util/AttributeSet;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->bbk:Landroid/util/AttributeSet;
 
     sget-object v2, Lcom/lytefast/flexinput/R$i;->FlexInput:[I
 
@@ -56,7 +56,7 @@
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v1, v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Landroid/content/res/TypedArray;)V
     :try_end_0
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$10.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$10.smali
index ea979de11b..85630bbf6c 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$10.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$10.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$10;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$10;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$10;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$10;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Ck()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->BZ()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$11.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$11.smali
index 48c27c12c2..aeb134a3c1 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$11.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$11.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$11;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$11;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,11 +37,11 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$11;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$11;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cm()Z
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cb()Z
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baO:Lcom/lytefast/flexinput/managers/a;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbg:Lcom/lytefast/flexinput/managers/a;
 
     invoke-interface {v0}, Lcom/lytefast/flexinput/managers/a;->requestHide()V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$12.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$12.smali
index ce12f233cb..0732466e1b 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$12.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$12.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$12;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$12;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onLongClick(Landroid/view/View;)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$12;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$12;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$13.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$13.smali
index ee762f531d..4e28777ace 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$13.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$13.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$13;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$13;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final afterTextChanged(Landroid/text/Editable;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$13;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$13;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Landroid/text/Editable;)V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$14.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$14.smali
index 7cc08ac3fb..164c43a262 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$14.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$14.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$14;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$14;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onTouch(Landroid/view/View;Landroid/view/MotionEvent;)Z
     .locals 1
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$14;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$14;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-virtual {p2}, Landroid/view/MotionEvent;->getAction()I
 
@@ -50,7 +50,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cm()Z
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cb()Z
 
     :goto_0
     const/4 p1, 0x0
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$2.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$2.smali
index 6eb35ca6b9..2ddadf5d3d 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$2.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$2.smali
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$2;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$2;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,7 +49,7 @@
 
     check-cast p1, Landroidx/core/view/inputmethod/InputContentInfoCompat;
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$2;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$2;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$3.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$3.smali
index ad52136056..5e32b8b314 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$3.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$3.smali
@@ -1,4 +1,4 @@
-.class final Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;
+.class public final Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;
 .super Ljava/lang/Object;
 .source "FlexInputFragment.java"
 
@@ -7,29 +7,29 @@
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/lytefast/flexinput/fragment/FlexInputFragment;->b(Landroidx/appcompat/widget/AppCompatEditText;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x0
+    accessFlags = 0x1
     name = null
 .end annotation
 
 
 # instance fields
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-.field final synthetic baU:Landroidx/appcompat/widget/AppCompatEditText;
+.field final synthetic bbm:Landroidx/appcompat/widget/AppCompatEditText;
 
 
 # direct methods
-.method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Landroidx/appcompat/widget/AppCompatEditText;)V
+.method public constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Landroidx/appcompat/widget/AppCompatEditText;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baU:Landroidx/appcompat/widget/AppCompatEditText;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbm:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->d(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroid/widget/LinearLayout;
 
@@ -52,7 +52,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cn()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cc()Ljava/lang/String;
 
     move-result-object v0
 
@@ -60,7 +60,7 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baU:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbm:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->getText()Landroid/text/Editable;
 
@@ -72,7 +72,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroidx/appcompat/widget/AppCompatEditText;
 
@@ -82,11 +82,11 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baU:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbm:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v1, v0}, Landroidx/appcompat/widget/AppCompatEditText;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cn()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cc()Ljava/lang/String;
 
     move-result-object v0
 
@@ -95,13 +95,13 @@
     invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_1
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->d(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroid/widget/LinearLayout;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroidx/appcompat/widget/AppCompatEditText;
 
@@ -111,13 +111,13 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->d(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroid/widget/LinearLayout;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroidx/appcompat/widget/AppCompatEditText;
 
@@ -125,23 +125,23 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/LinearLayout;->removeView(Landroid/view/View;)V
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->d(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroid/widget/LinearLayout;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baU:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbm:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v1, v2, v0}, Landroid/widget/LinearLayout;->addView(Landroid/view/View;I)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baU:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbm:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-static {v0, v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Landroidx/appcompat/widget/AppCompatEditText;)Landroidx/appcompat/widget/AppCompatEditText;
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baU:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbm:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -151,7 +151,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baU:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbm:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -173,15 +173,15 @@
     invoke-direct {v0, v1, v2, v3}, Landroid/widget/LinearLayout$LayoutParams;-><init>(IIF)V
 
     :goto_0
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baU:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbm:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v1, v0}, Landroidx/appcompat/widget/AppCompatEditText;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baU:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbm:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->requestLayout()V
 
-    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cn()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cc()Ljava/lang/String;
 
     move-result-object v0
 
@@ -189,15 +189,15 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baU:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbm:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-static {v0, v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->b(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Landroidx/appcompat/widget/AppCompatEditText;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->baU:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->bbm:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v1}, Landroidx/appcompat/widget/AppCompatEditText;->getText()Landroid/text/Editable;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$4.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$4.smali
index acb91a3adf..7f51c612a3 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$4.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$4.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,13 +37,13 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->e(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Lcom/lytefast/flexinput/managers/a;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroidx/appcompat/widget/AppCompatEditText;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$5.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$5.smali
index 3b8c5f56d8..226cf16a33 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$5.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$5.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-.field final synthetic baV:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic bbn:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Lcom/lytefast/flexinput/fragment/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->baV:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->bbn:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final onDismiss(Landroid/content/DialogInterface;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->baV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->bbn:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->isAdded()Z
 
@@ -49,7 +49,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->baV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->bbn:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->isDetached()Z
 
@@ -57,12 +57,12 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->baV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->bbn:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->dismissAllowingStateLoss()V
 
     :cond_0
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->isAdded()Z
 
@@ -70,7 +70,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->isHidden()Z
 
@@ -81,13 +81,13 @@
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->requestFocus()Z
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baH:Landroid/view/View;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baZ:Landroid/view/View;
 
     invoke-virtual {v0}, Landroid/view/View;->getVisibility()I
 
@@ -95,7 +95,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     new-instance v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;
 
@@ -104,7 +104,7 @@
     invoke-virtual {v0, v1}, Landroidx/appcompat/widget/AppCompatEditText;->post(Ljava/lang/Runnable;)Z
 
     :cond_2
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->c(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$6.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$6.smali
index 62727742fc..b7641ea186 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$6.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$6.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-.field final synthetic baW:Landroidx/fragment/app/DialogFragment;
+.field final synthetic bbo:Landroidx/fragment/app/DialogFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Landroidx/fragment/app/DialogFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->baW:Landroidx/fragment/app/DialogFragment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->bbo:Landroidx/fragment/app/DialogFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->baW:Landroidx/fragment/app/DialogFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->bbo:Landroidx/fragment/app/DialogFragment;
 
     if-eqz v0, :cond_0
 
@@ -51,7 +51,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->baW:Landroidx/fragment/app/DialogFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->bbo:Landroidx/fragment/app/DialogFragment;
 
     invoke-virtual {v0}, Landroidx/fragment/app/DialogFragment;->isRemoving()Z
 
@@ -59,7 +59,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->baW:Landroidx/fragment/app/DialogFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->bbo:Landroidx/fragment/app/DialogFragment;
 
     invoke-virtual {v0}, Landroidx/fragment/app/DialogFragment;->isDetached()Z
 
@@ -68,7 +68,7 @@
     if-nez v0, :cond_0
 
     :try_start_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->baW:Landroidx/fragment/app/DialogFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->bbo:Landroidx/fragment/app/DialogFragment;
 
     invoke-virtual {v0}, Landroidx/fragment/app/DialogFragment;->dismiss()V
     :try_end_0
@@ -79,7 +79,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cn()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cc()Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$7$1.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$7$1.smali
index 71e7fcb1cd..620c2ff9d1 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$7$1.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$7$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Co()V
+    value = Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Cd()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic baX:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+.field final synthetic bbp:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->baX:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->bbp:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->baX:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->bbp:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroidx/appcompat/widget/AppCompatEditText;
 
@@ -47,13 +47,13 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->baX:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->bbp:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->baX:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->bbp:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v1, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroidx/appcompat/widget/AppCompatEditText;
 
@@ -66,9 +66,9 @@
     invoke-virtual {v0, v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Landroid/text/Editable;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->baX:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->bbp:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->b(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroid/view/View;
 
@@ -76,9 +76,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->baX:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->bbp:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->c(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$7.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$7.smali
index af74e24d91..4996b7daac 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$7.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$7.smali
@@ -28,24 +28,24 @@
 
 
 # instance fields
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
-.method private Co()V
+.method private Cd()V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->getView()Landroid/view/View;
 
@@ -70,7 +70,7 @@
 .method public final synthetic onItemSelected(Ljava/lang/Object;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Co()V
+    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Cd()V
 
     return-void
 .end method
@@ -78,7 +78,7 @@
 .method public final synthetic onItemUnselected(Ljava/lang/Object;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Co()V
+    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Cd()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$8.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$8.smali
index ca5f9071e6..bce389dd1b 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$8.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$8.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$8;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$8;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$8;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$8;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cl()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Ca()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$9.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$9.smali
index d14e4329ff..c8c3aa1430 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$9.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$9.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$9;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$9;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$9;->baT:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$9;->bbl:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baH:Landroid/view/View;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baZ:Landroid/view/View;
 
     invoke-virtual {v0}, Landroid/view/View;->getVisibility()I
 
@@ -47,28 +47,28 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cm()Z
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cb()Z
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baO:Lcom/lytefast/flexinput/managers/a;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbg:Lcom/lytefast/flexinput/managers/a;
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p1, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-interface {v0, p1}, Lcom/lytefast/flexinput/managers/a;->requestDisplay(Landroid/widget/EditText;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baH:Landroid/view/View;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baZ:Landroid/view/View;
 
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baO:Lcom/lytefast/flexinput/managers/a;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbg:Lcom/lytefast/flexinput/managers/a;
 
     invoke-interface {v0}, Lcom/lytefast/flexinput/managers/a;->requestHide()V
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baK:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbc:Landroidx/appcompat/widget/AppCompatImageButton;
 
     sget v1, Lcom/lytefast/flexinput/R$d;->ic_keyboard_24dp:I
 
@@ -76,7 +76,7 @@
 
     const/4 v0, 0x1
 
-    invoke-virtual {p1, v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Y(Z)V
+    invoke-virtual {p1, v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->V(Z)V
 
     return-void
 .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 fa262df58b..aa0d9e58e9 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
@@ -22,35 +22,35 @@
 
 
 # instance fields
-.field protected aZK:[Lcom/lytefast/flexinput/adapters/a$b;
+.field private baW:Landroid/view/View;
 
-.field private baE:Landroid/view/View;
+.field private baX:Landroid/view/View;
 
-.field private baF:Landroid/view/View;
+.field public baY:Landroid/widget/LinearLayout;
 
-.field private baG:Landroid/widget/LinearLayout;
+.field baZ:Landroid/view/View;
 
-.field baH:Landroid/view/View;
+.field protected bac:[Lcom/lytefast/flexinput/adapters/a$b;
 
-.field private baI:Landroidx/recyclerview/widget/RecyclerView;
+.field private bba:Landroidx/recyclerview/widget/RecyclerView;
 
-.field baJ:Landroidx/appcompat/widget/AppCompatEditText;
+.field public bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
-.field baK:Landroidx/appcompat/widget/AppCompatImageButton;
+.field public bbc:Landroidx/appcompat/widget/AppCompatImageButton;
 
-.field private baL:Landroidx/appcompat/widget/AppCompatImageButton;
+.field private bbd:Landroidx/appcompat/widget/AppCompatImageButton;
 
-.field private baM:Landroid/view/View;
+.field private bbe:Landroid/view/View;
 
-.field private baN:Ljava/lang/Runnable;
+.field private bbf:Ljava/lang/Runnable;
 
-.field baO:Lcom/lytefast/flexinput/managers/a;
+.field public bbg:Lcom/lytefast/flexinput/managers/a;
 
-.field private baP:Lcom/lytefast/flexinput/InputListener;
+.field public bbh:Lcom/lytefast/flexinput/InputListener;
 
-.field protected baQ:Lcom/lytefast/flexinput/managers/FileManager;
+.field protected bbi:Lcom/lytefast/flexinput/managers/FileManager;
 
-.field protected baR:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+.field protected bbj:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter<",
@@ -61,7 +61,7 @@
     .end annotation
 .end field
 
-.field private isEnabled:Z
+.field public isEnabled:Z
 
 
 # direct methods
@@ -91,7 +91,7 @@
     return-void
 .end method
 
-.method static synthetic Cn()Ljava/lang/String;
+.method static synthetic Cc()Ljava/lang/String;
     .locals 1
 
     sget-object v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->TAG:Ljava/lang/String;
@@ -102,7 +102,7 @@
 .method static synthetic a(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroidx/appcompat/widget/AppCompatEditText;
     .locals 0
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     return-object p0
 .end method
@@ -110,7 +110,7 @@
 .method static synthetic a(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Landroidx/appcompat/widget/AppCompatEditText;)Landroidx/appcompat/widget/AppCompatEditText;
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     return-object p1
 .end method
@@ -167,7 +167,7 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v1, v0}, Landroidx/appcompat/widget/AppCompatEditText;->setHint(Ljava/lang/CharSequence;)V
 
@@ -188,7 +188,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v1, v0}, Landroidx/appcompat/widget/AppCompatEditText;->setHintTextColor(I)V
 
@@ -207,7 +207,7 @@
 
     invoke-virtual {p1, v0}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baE:Landroid/view/View;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baW:Landroid/view/View;
 
     invoke-virtual {p0, p1}, Landroid/view/View;->setBackground(Landroid/graphics/drawable/Drawable;)V
 
@@ -218,7 +218,7 @@
 .method static synthetic b(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroid/view/View;
     .locals 0
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baE:Landroid/view/View;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baW:Landroid/view/View;
 
     return-object p0
 .end method
@@ -234,9 +234,9 @@
 .method static synthetic c(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baE:Landroid/view/View;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baW:Landroid/view/View;
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baR:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbj:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
     invoke-virtual {p0}, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->getItemCount()I
 
@@ -260,7 +260,7 @@
 .method static synthetic d(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Landroid/widget/LinearLayout;
     .locals 0
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baG:Landroid/widget/LinearLayout;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baY:Landroid/widget/LinearLayout;
 
     return-object p0
 .end method
@@ -268,14 +268,14 @@
 .method static synthetic e(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)Lcom/lytefast/flexinput/managers/a;
     .locals 0
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baO:Lcom/lytefast/flexinput/managers/a;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbg:Lcom/lytefast/flexinput/managers/a;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method public final Cc()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.method public final BR()Lcom/lytefast/flexinput/utils/SelectionAggregator;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -287,17 +287,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baR:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbj:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     return-object v0
 .end method
 
-.method public final Cj()[Lcom/lytefast/flexinput/adapters/a$b;
+.method public final BY()[Lcom/lytefast/flexinput/adapters/a$b;
     .locals 5
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aZK:[Lcom/lytefast/flexinput/adapters/a$b;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bac:[Lcom/lytefast/flexinput/adapters/a$b;
 
     if-eqz v0, :cond_1
 
@@ -312,7 +312,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/lytefast/flexinput/adapters/a;->aZL:Lcom/lytefast/flexinput/adapters/a$a;
+    sget-object v0, Lcom/lytefast/flexinput/adapters/a;->bad:Lcom/lytefast/flexinput/adapters/a$a;
 
     const/4 v0, 0x3
 
@@ -363,20 +363,20 @@
     return-object v0
 .end method
 
-.method public final Ck()V
+.method public final BZ()V
     .locals 3
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baP:Lcom/lytefast/flexinput/InputListener;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbh:Lcom/lytefast/flexinput/InputListener;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v1}, Landroidx/appcompat/widget/AppCompatEditText;->getText()Landroid/text/Editable;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baR:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbj:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v2, v2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v2, v2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-virtual {v2}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->getAttachments()Ljava/util/ArrayList;
 
@@ -388,32 +388,32 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     const-string v1, ""
 
     invoke-virtual {v0, v1}, Landroidx/appcompat/widget/AppCompatEditText;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cl()V
+    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Ca()V
 
     :cond_0
     return-void
 .end method
 
-.method public final Cl()V
+.method public final Ca()V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baR:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbj:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->clear()V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baE:Landroid/view/View;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baW:Landroid/view/View;
 
     const/16 v1, 0x8
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->getText()Landroid/text/Editable;
 
@@ -424,10 +424,10 @@
     return-void
 .end method
 
-.method public final Cm()Z
+.method public final Cb()Z
     .locals 3
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baH:Landroid/view/View;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baZ:Landroid/view/View;
 
     invoke-virtual {v0}, Landroid/view/View;->isShown()Z
 
@@ -440,69 +440,26 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baH:Landroid/view/View;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baZ:Landroid/view/View;
 
     const/16 v2, 0x8
 
     invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baK:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbc:Landroidx/appcompat/widget/AppCompatImageButton;
 
     sget v2, Lcom/lytefast/flexinput/R$d;->ic_insert_emoticon_24dp:I
 
     invoke-virtual {v0, v2}, Landroidx/appcompat/widget/AppCompatImageButton;->setImageResource(I)V
 
-    invoke-virtual {p0, v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Y(Z)V
+    invoke-virtual {p0, v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->V(Z)V
 
     const/4 v0, 0x1
 
     return v0
 .end method
 
-.method public final X(Z)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
-    .locals 2
-
-    iput-boolean p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->isEnabled:Z
-
-    const/4 v0, 0x0
-
-    :goto_0
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baG:Landroid/widget/LinearLayout;
-
-    invoke-virtual {v1}, Landroid/widget/LinearLayout;->getChildCount()I
-
-    move-result v1
-
-    if-ge v0, v1, :cond_0
-
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baG:Landroid/widget/LinearLayout;
-
-    invoke-virtual {v1, v0}, Landroid/widget/LinearLayout;->getChildAt(I)Landroid/view/View;
-
-    move-result-object v1
-
-    invoke-virtual {v1, p1}, Landroid/view/View;->setEnabled(Z)V
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    if-eqz p1, :cond_1
-
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
-
-    invoke-virtual {p1}, Landroidx/appcompat/widget/AppCompatEditText;->getText()Landroid/text/Editable;
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Landroid/text/Editable;)V
-
-    :cond_1
-    return-object p0
-.end method
-
-.method Y(Z)V
+.method V(Z)V
     .locals 2
 
     invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
@@ -529,42 +486,6 @@
     return-void
 .end method
 
-.method public final a(Landroidx/fragment/app/Fragment;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
-    .locals 2
-
-    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Landroidx/fragment/app/FragmentManager;->beginTransaction()Landroidx/fragment/app/FragmentTransaction;
-
-    move-result-object v0
-
-    sget v1, Lcom/lytefast/flexinput/R$e;->emoji_container:I
-
-    invoke-virtual {v0, v1, p1}, Landroidx/fragment/app/FragmentTransaction;->replace(ILandroidx/fragment/app/Fragment;)Landroidx/fragment/app/FragmentTransaction;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Landroidx/fragment/app/FragmentTransaction;->commit()I
-
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baK:Landroidx/appcompat/widget/AppCompatImageButton;
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, v0}, Landroidx/appcompat/widget/AppCompatImageButton;->setVisibility(I)V
-
-    return-object p0
-.end method
-
-.method public final a(Lcom/lytefast/flexinput/InputListener;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
-    .locals 0
-
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baP:Lcom/lytefast/flexinput/InputListener;
-
-    return-object p0
-.end method
-
 .method public final a(Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
@@ -578,19 +499,19 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baR:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbj:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v1, v1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v1, v1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-virtual {v0, v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->initFrom(Lcom/lytefast/flexinput/utils/SelectionAggregator;)Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baR:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbj:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baI:Landroidx/recyclerview/widget/RecyclerView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bba:Landroidx/recyclerview/widget/RecyclerView;
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baR:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbj:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
     invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
@@ -600,15 +521,7 @@
 .method public final a(Lcom/lytefast/flexinput/managers/FileManager;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baQ:Lcom/lytefast/flexinput/managers/FileManager;
-
-    return-object p0
-.end method
-
-.method public final a(Lcom/lytefast/flexinput/managers/a;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
-    .locals 0
-
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baO:Lcom/lytefast/flexinput/managers/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbi:Lcom/lytefast/flexinput/managers/FileManager;
 
     return-object p0
 .end method
@@ -616,7 +529,7 @@
 .method public final varargs a([Lcom/lytefast/flexinput/adapters/a$b;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aZK:[Lcom/lytefast/flexinput/adapters/a$b;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bac:[Lcom/lytefast/flexinput/adapters/a$b;
 
     return-object p0
 .end method
@@ -624,7 +537,7 @@
 .method public final a(Landroid/text/Editable;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baL:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbd:Landroidx/appcompat/widget/AppCompatImageButton;
 
     iget-boolean v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->isEnabled:Z
 
@@ -636,7 +549,7 @@
 
     if-gtz p1, :cond_0
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baR:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbj:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->getItemCount()I
 
@@ -686,9 +599,9 @@
 
     invoke-direct {v1, v2}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;-><init>(B)V
 
-    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baR:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbj:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v3, v3, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v3, v3, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-virtual {v3, v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinator(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
 
@@ -696,7 +609,7 @@
 
     invoke-virtual {v1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->close()V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baI:Landroidx/recyclerview/widget/RecyclerView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bba:Landroidx/recyclerview/widget/RecyclerView;
 
     new-instance v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;
 
@@ -707,46 +620,14 @@
     return-void
 .end method
 
-.method public final b(Landroidx/appcompat/widget/AppCompatEditText;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
-    .locals 2
-
-    sget v0, Lcom/lytefast/flexinput/R$e;->text_input:I
-
-    invoke-virtual {p1, v0}, Landroidx/appcompat/widget/AppCompatEditText;->setId(I)V
-
-    const/4 v0, 0x1
-
-    invoke-virtual {p1, v0}, Landroidx/appcompat/widget/AppCompatEditText;->setFocusable(Z)V
-
-    invoke-virtual {p1, v0}, Landroidx/appcompat/widget/AppCompatEditText;->setFocusableInTouchMode(Z)V
-
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baG:Landroid/widget/LinearLayout;
-
-    new-instance v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;
-
-    invoke-direct {v1, p0, p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;-><init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Landroidx/appcompat/widget/AppCompatEditText;)V
-
-    invoke-virtual {v0, v1}, Landroid/widget/LinearLayout;->post(Ljava/lang/Runnable;)Z
-
-    return-object p0
-.end method
-
 .method public final getFileManager()Lcom/lytefast/flexinput/managers/FileManager;
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baQ:Lcom/lytefast/flexinput/managers/FileManager;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbi:Lcom/lytefast/flexinput/managers/FileManager;
 
     return-object v0
 .end method
 
-.method public final isEnabled()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->isEnabled:Z
-
-    return v0
-.end method
-
 .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
     .locals 2
 
@@ -766,7 +647,7 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baE:Landroid/view/View;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baW:Landroid/view/View;
 
     sget p2, Lcom/lytefast/flexinput/R$e;->attachment_clear_btn:I
 
@@ -774,9 +655,9 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baF:Landroid/view/View;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baX:Landroid/view/View;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baF:Landroid/view/View;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baX:Landroid/view/View;
 
     new-instance p3, Lcom/lytefast/flexinput/fragment/FlexInputFragment$8;
 
@@ -792,7 +673,7 @@
 
     check-cast p2, Landroid/widget/LinearLayout;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baG:Landroid/widget/LinearLayout;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baY:Landroid/widget/LinearLayout;
 
     sget p2, Lcom/lytefast/flexinput/R$e;->emoji_container:I
 
@@ -800,7 +681,7 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baH:Landroid/view/View;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baZ:Landroid/view/View;
 
     sget p2, Lcom/lytefast/flexinput/R$e;->attachment_preview_list:I
 
@@ -810,7 +691,7 @@
 
     check-cast p2, Landroidx/recyclerview/widget/RecyclerView;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baI:Landroidx/recyclerview/widget/RecyclerView;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bba:Landroidx/recyclerview/widget/RecyclerView;
 
     sget p2, Lcom/lytefast/flexinput/R$e;->text_input:I
 
@@ -820,9 +701,9 @@
 
     check-cast p2, Landroidx/appcompat/widget/AppCompatEditText;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-direct {p0, p2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Landroidx/appcompat/widget/AppCompatEditText;)V
 
@@ -834,9 +715,9 @@
 
     check-cast p2, Landroidx/appcompat/widget/AppCompatImageButton;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baK:Landroidx/appcompat/widget/AppCompatImageButton;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbc:Landroidx/appcompat/widget/AppCompatImageButton;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baK:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbc:Landroidx/appcompat/widget/AppCompatImageButton;
 
     new-instance p3, Lcom/lytefast/flexinput/fragment/FlexInputFragment$9;
 
@@ -852,9 +733,9 @@
 
     check-cast p2, Landroidx/appcompat/widget/AppCompatImageButton;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baL:Landroidx/appcompat/widget/AppCompatImageButton;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbd:Landroidx/appcompat/widget/AppCompatImageButton;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baL:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbd:Landroidx/appcompat/widget/AppCompatImageButton;
 
     new-instance p3, Lcom/lytefast/flexinput/fragment/FlexInputFragment$10;
 
@@ -868,9 +749,9 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baM:Landroid/view/View;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbe:Landroid/view/View;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baM:Landroid/view/View;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbe:Landroid/view/View;
 
     new-instance p3, Lcom/lytefast/flexinput/fragment/FlexInputFragment$11;
 
@@ -882,23 +763,23 @@
 
     new-array p2, p2, [Landroid/view/View;
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baF:Landroid/view/View;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baX:Landroid/view/View;
 
     aput-object p3, p2, v0
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baM:Landroid/view/View;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbe:Landroid/view/View;
 
     const/4 v1, 0x1
 
     aput-object p3, p2, v1
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baK:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbc:Landroidx/appcompat/widget/AppCompatImageButton;
 
     const/4 v1, 0x2
 
     aput-object p3, p2, v1
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baL:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbd:Landroidx/appcompat/widget/AppCompatImageButton;
 
     const/4 v1, 0x3
 
@@ -946,18 +827,18 @@
 
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baK:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbc:Landroidx/appcompat/widget/AppCompatImageButton;
 
     invoke-virtual {p2, v0}, Landroidx/appcompat/widget/AppCompatImageButton;->setVisibility(I)V
 
     :cond_1
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baN:Ljava/lang/Runnable;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbf:Ljava/lang/Runnable;
 
     invoke-interface {p2}, Ljava/lang/Runnable;->run()V
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baN:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbf:Ljava/lang/Runnable;
 
     new-instance p2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
@@ -985,7 +866,7 @@
 
     invoke-direct {p3, p0, p1, p2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;-><init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    iput-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baN:Ljava/lang/Runnable;
+    iput-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbf:Ljava/lang/Runnable;
 
     new-instance p2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
@@ -997,7 +878,7 @@
 
     invoke-direct {p2, p1, p3}, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;-><init>(Landroid/content/ContentResolver;B)V
 
-    iget-object p1, p2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object p1, p2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     new-instance p3, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
@@ -1005,7 +886,7 @@
 
     invoke-virtual {p1, p3}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->addItemSelectionListener(Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;)Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baR:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbj:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
     return-void
 .end method
@@ -1013,9 +894,9 @@
 .method public onPause()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cm()Z
+    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cb()Z
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baO:Lcom/lytefast/flexinput/managers/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbg:Lcom/lytefast/flexinput/managers/a;
 
     invoke-interface {v0}, Lcom/lytefast/flexinput/managers/a;->requestHide()V
 
@@ -1029,9 +910,9 @@
 
     invoke-super {p0, p1}, Landroidx/fragment/app/Fragment;->onSaveInstanceState(Landroid/os/Bundle;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baR:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbj:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->getAttachments()Ljava/util/ArrayList;
 
@@ -1041,7 +922,7 @@
 
     invoke-virtual {p1, v1, v0}, Landroid/os/Bundle;->putParcelableArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->getText()Landroid/text/Editable;
 
@@ -1077,9 +958,9 @@
 
     if-lez v0, :cond_0
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baR:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbj:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->initFrom(Ljava/util/ArrayList;)Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
@@ -1090,7 +971,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {p2, p1}, Landroidx/appcompat/widget/AppCompatEditText;->setText(Ljava/lang/CharSequence;)V
 
@@ -1100,7 +981,7 @@
 
     if-nez p2, :cond_1
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->baJ:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->bbb:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback.smali
index 405baf86c1..db1cc0a622 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback.smali
@@ -15,8 +15,8 @@
 
 
 # virtual methods
-.method public abstract Ch()V
+.method public abstract BW()V
 .end method
 
-.method public abstract Ci()V
+.method public abstract BX()V
 .end method
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 86549126cb..78e8477a06 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment.smali
@@ -204,12 +204,12 @@
 
     if-eqz p2, :cond_1
 
-    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Ch()V
+    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->BW()V
 
     goto :goto_0
 
     :cond_1
-    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Ci()V
+    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->BX()V
 
     :cond_2
     :goto_0
@@ -254,7 +254,7 @@
     return p1
 
     :cond_0
-    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Ch()V
+    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->BW()V
 
     const/4 p1, 0x1
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$a.smali
index 4111cbf8b6..46d4381737 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$a.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic baY:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic bbq:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-.field final synthetic baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+.field final synthetic bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;Lcom/lytefast/flexinput/fragment/PhotosFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->baY:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->bbq:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->baY:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->bbq:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     invoke-static {p1, v0}, Lcom/lytefast/flexinput/fragment/PhotosFragment;->access$requestPermissions(Lcom/lytefast/flexinput/fragment/PhotosFragment;Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;)V
 
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 0b75aa1422..3ced117045 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
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic baY:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic bbq:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-.field final synthetic baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+.field final synthetic bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;Lcom/lytefast/flexinput/fragment/PhotosFragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->baY:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->bbq:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final onRefresh()V
     .locals 4
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     const/4 v1, 0x1
 
@@ -61,12 +61,12 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->baY:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->bbq:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    invoke-virtual {v0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->Cd()V
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->BS()V
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/PhotosFragment;->getSwipeRefreshLayout$flexinput_debug()Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;
 
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 5509e505b0..307f555111 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
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field final synthetic baY:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic bbq:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-.field final synthetic baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+.field final synthetic bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
 
 # direct methods
@@ -34,9 +34,9 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->baY:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->bbq:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,10 +45,10 @@
 
 
 # virtual methods
-.method public final Ch()V
+.method public final BW()V
     .locals 4
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/PhotosFragment;->getRecyclerView$flexinput_debug()Landroidx/recyclerview/widget/RecyclerView;
 
@@ -56,12 +56,12 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     new-instance v1, Landroidx/recyclerview/widget/GridLayoutManager;
 
-    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/PhotosFragment;->getContext()Landroid/content/Context;
 
@@ -75,7 +75,7 @@
 
     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;->baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/PhotosFragment;->getRecyclerView$flexinput_debug()Landroidx/recyclerview/widget/RecyclerView;
 
@@ -83,16 +83,16 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->baY:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->bbq:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     check-cast v1, Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     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;->baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/PhotosFragment;->getRecyclerView$flexinput_debug()Landroidx/recyclerview/widget/RecyclerView;
 
@@ -100,7 +100,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->invalidateItemDecorations()V
@@ -108,10 +108,10 @@
     return-void
 .end method
 
-.method public final Ci()V
+.method public final BX()V
     .locals 3
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->baZ:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->bbr:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/PhotosFragment;->getContext()Landroid/content/Context;
 
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 b555c76ee1..5d85daad16 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment.smali
@@ -182,7 +182,7 @@
 
     if-eqz p3, :cond_3
 
-    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->Cc()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->BR()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object p3
 
@@ -190,7 +190,7 @@
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     invoke-virtual {p3, v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinator(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
@@ -238,7 +238,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_4
     invoke-direct {p2, p3, v0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;-><init>(Landroid/content/ContentResolver;Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
@@ -345,7 +345,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-virtual {v0}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->close()V
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$b.smali
index 41f3dad9e3..0c67eafd70 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$b.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/lytefast/flexinput/fragment/a;->Cg()V
+    value = Lcom/lytefast/flexinput/fragment/a;->BV()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic bau:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic baM:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$b;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$b;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +46,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$b;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$b;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->dismissAllowingStateLoss()V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$c.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$c.smali
index 1a59f73924..2298d8333f 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$c.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$c.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field final synthetic bau:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic baM:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -39,7 +39,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,7 +57,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-static {p1}, Lcom/lytefast/flexinput/fragment/a;->a(Lcom/lytefast/flexinput/fragment/a;)V
 
@@ -73,7 +73,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-static {p1}, Lcom/lytefast/flexinput/fragment/a;->a(Lcom/lytefast/flexinput/fragment/a;)V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$d.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$d.smali
index 27446a8969..df892389f8 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$d.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$d.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final synthetic bau:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic baM:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -29,7 +29,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$d;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$d;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-direct {p0, p2, p3}, Landroidx/appcompat/app/AppCompatDialog;-><init>(Landroid/content/Context;I)V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$e.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$e.smali
index d830119ee2..864a686f51 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$e.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$e.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bau:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic baM:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$e;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$e;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$e;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$e;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->isCancelable()Z
 
@@ -45,7 +45,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Cg()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->BV()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$f.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$f.smali
index 6f9cbdaec4..b397b6a731 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$f.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$f.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bau:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic baM:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$f;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$f;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 6
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$f;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$f;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     new-instance v0, Landroid/content/Intent;
 
@@ -138,7 +138,7 @@
     :cond_4
     if-nez v4, :cond_5
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_5
     :goto_2
@@ -146,7 +146,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Ce()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->BT()Ljava/util/List;
 
     move-result-object v1
 
@@ -170,7 +170,7 @@
 
     move-result-object v0
 
-    sget v1, Lcom/lytefast/flexinput/fragment/a;->bar:I
+    sget v1, Lcom/lytefast/flexinput/fragment/a;->baJ:I
 
     invoke-virtual {p1, v0, v1}, Lcom/lytefast/flexinput/fragment/a;->startActivityForResult(Landroid/content/Intent;I)V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$g.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$g.smali
index 73739ca3c2..207009eb3b 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$g.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$g.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bau:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic baM:Lcom/lytefast/flexinput/fragment/a;
 
-.field final synthetic bav:Landroidx/fragment/app/Fragment;
+.field final synthetic baN:Landroidx/fragment/app/Fragment;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/a;Landroidx/fragment/app/Fragment;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->baM:Lcom/lytefast/flexinput/fragment/a;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a$g;->bav:Landroidx/fragment/app/Fragment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a$g;->baN:Landroidx/fragment/app/Fragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,15 +41,15 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->baM:Lcom/lytefast/flexinput/fragment/a;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Cg()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->BV()V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->bav:Landroidx/fragment/app/Fragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->baN:Landroidx/fragment/app/Fragment;
 
     check-cast p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Ck()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->BZ()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$h.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$h.smali
index fee479d249..0366aff221 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$h.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$h.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bau:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic baM:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$h;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$h;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$h;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$h;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/a;->a(Lcom/lytefast/flexinput/fragment/a;)V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$i.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$i.smali
index e9160d4fa7..89e9417cd0 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$i.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$i.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic bau:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic baM:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$i;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$i;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -62,14 +62,14 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$i;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$i;->baM:Lcom/lytefast/flexinput/fragment/a;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Cg()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->BV()V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$i;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$i;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/a;->b(Lcom/lytefast/flexinput/fragment/a;)Landroidx/viewpager/widget/ViewPager;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$j.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$j.smali
index 39d2c7ec83..13f04ff8ed 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$j.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$j.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic bau:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic baM:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$j;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$j;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,7 +54,7 @@
 .method public final onPageSelected(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$j;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$j;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/a;->c(Lcom/lytefast/flexinput/fragment/a;)Lcom/google/android/material/tabs/TabLayout;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$k.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$k.smali
index bb217cb61a..d6bdcdd0e3 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$k.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a$k.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bau:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic baM:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$k;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$k;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$k;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$k;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/a;->d(Lcom/lytefast/flexinput/fragment/a;)Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
@@ -57,7 +57,7 @@
     :goto_0
     if-lez v0, :cond_2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$k;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$k;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/a;->e(Lcom/lytefast/flexinput/fragment/a;)Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
@@ -71,7 +71,7 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$k;->bau:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$k;->baM:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/a;->e(Lcom/lytefast/flexinput/fragment/a;)Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a.smali
index cb9c3c23eb..418756fad9 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a.smali
@@ -13,16 +13,26 @@
 
 # static fields
 # The value of this static final field might be set in the static constructor
-.field static final bar:I = 0x1750
+.field static final baJ:I = 0x1750
 
 # The value of this static final field might be set in the static constructor
-.field private static final bas:Ljava/lang/String; = "com.google.android.apps.docs"
+.field private static final baK:Ljava/lang/String; = "com.google.android.apps.docs"
 
-.field public static final bat:Lcom/lytefast/flexinput/fragment/a$a;
+.field public static final baL:Lcom/lytefast/flexinput/fragment/a$a;
 
 
 # instance fields
-.field private aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.field private baE:Landroidx/viewpager/widget/ViewPager;
+
+.field private baF:Lcom/google/android/material/tabs/TabLayout;
+
+.field private baG:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+
+.field private baH:Landroid/widget/ImageView;
+
+.field private final baI:Lcom/lytefast/flexinput/fragment/a$c;
+
+.field private bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/lytefast/flexinput/utils/SelectionAggregator<",
@@ -33,16 +43,6 @@
     .end annotation
 .end field
 
-.field private bam:Landroidx/viewpager/widget/ViewPager;
-
-.field private ban:Lcom/google/android/material/tabs/TabLayout;
-
-.field private bao:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
-
-.field private bap:Landroid/widget/ImageView;
-
-.field private final baq:Lcom/lytefast/flexinput/fragment/a$c;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -54,15 +54,15 @@
 
     invoke-direct {v0, v1}, Lcom/lytefast/flexinput/fragment/a$a;-><init>(B)V
 
-    sput-object v0, Lcom/lytefast/flexinput/fragment/a;->bat:Lcom/lytefast/flexinput/fragment/a$a;
+    sput-object v0, Lcom/lytefast/flexinput/fragment/a;->baL:Lcom/lytefast/flexinput/fragment/a$a;
 
     const/16 v0, 0x1750
 
-    sput v0, Lcom/lytefast/flexinput/fragment/a;->bar:I
+    sput v0, Lcom/lytefast/flexinput/fragment/a;->baJ:I
 
     const-string v0, "com.google.android.apps.docs"
 
-    sput-object v0, Lcom/lytefast/flexinput/fragment/a;->bas:Ljava/lang/String;
+    sput-object v0, Lcom/lytefast/flexinput/fragment/a;->baK:Ljava/lang/String;
 
     return-void
 .end method
@@ -76,12 +76,12 @@
 
     invoke-direct {v0, p0}, Lcom/lytefast/flexinput/fragment/a$c;-><init>(Lcom/lytefast/flexinput/fragment/a;)V
 
-    iput-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->baq:Lcom/lytefast/flexinput/fragment/a$c;
+    iput-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->baI:Lcom/lytefast/flexinput/fragment/a$c;
 
     return-void
 .end method
 
-.method private final Cf()Landroid/content/Intent;
+.method private final BU()Landroid/content/Intent;
     .locals 8
 
     invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/a;->getContext()Landroid/content/Context;
@@ -160,7 +160,7 @@
 
     invoke-direct {v6}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v7, Lcom/lytefast/flexinput/fragment/a;->bas:Ljava/lang/String;
+    sget-object v7, Lcom/lytefast/flexinput/fragment/a;->baK:Ljava/lang/String;
 
     invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -203,7 +203,7 @@
 .method public static final synthetic a(Lcom/lytefast/flexinput/fragment/a;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->bao:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->baG:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     if-eqz v0, :cond_0
 
@@ -222,7 +222,7 @@
 .method public static final synthetic b(Lcom/lytefast/flexinput/fragment/a;)Landroidx/viewpager/widget/ViewPager;
     .locals 0
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->bam:Landroidx/viewpager/widget/ViewPager;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->baE:Landroidx/viewpager/widget/ViewPager;
 
     return-object p0
 .end method
@@ -230,7 +230,7 @@
 .method public static final synthetic c(Lcom/lytefast/flexinput/fragment/a;)Lcom/google/android/material/tabs/TabLayout;
     .locals 0
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->ban:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->baF:Lcom/google/android/material/tabs/TabLayout;
 
     return-object p0
 .end method
@@ -238,7 +238,7 @@
 .method public static final synthetic d(Lcom/lytefast/flexinput/fragment/a;)Lcom/lytefast/flexinput/utils/SelectionAggregator;
     .locals 0
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     return-object p0
 .end method
@@ -246,14 +246,14 @@
 .method public static final synthetic e(Lcom/lytefast/flexinput/fragment/a;)Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
     .locals 0
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->bao:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->baG:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method Ce()Ljava/util/List;
+.method BT()Ljava/util/List;
     .locals 12
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -464,7 +464,7 @@
 
     move-result-object v1
 
-    sget-object v4, Lcom/lytefast/flexinput/fragment/a;->bas:Ljava/lang/String;
+    sget-object v4, Lcom/lytefast/flexinput/fragment/a;->baK:Ljava/lang/String;
 
     invoke-static {v1, v4}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -477,7 +477,7 @@
     :cond_3
     if-nez v2, :cond_4
 
-    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/a;->Cf()Landroid/content/Intent;
+    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/a;->BU()Landroid/content/Intent;
 
     move-result-object v0
 
@@ -492,14 +492,14 @@
 
     :cond_5
     :goto_1
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v0, Ljava/util/List;
 
     return-object v0
 .end method
 
-.method public final Cg()V
+.method public final BV()V
     .locals 4
 
     invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/a;->getContext()Landroid/content/Context;
@@ -545,28 +545,28 @@
 
     invoke-virtual {v1, v0, v2}, Landroid/view/animation/Animation;->setInterpolator(Landroid/content/Context;I)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->bao:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->baG:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->hide()V
 
     :cond_1
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->ban:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->baF:Lcom/google/android/material/tabs/TabLayout;
 
     if-eqz v0, :cond_2
 
     invoke-virtual {v0, v1}, Lcom/google/android/material/tabs/TabLayout;->startAnimation(Landroid/view/animation/Animation;)V
 
     :cond_2
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->bam:Landroidx/viewpager/widget/ViewPager;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->baE:Landroidx/viewpager/widget/ViewPager;
 
     if-eqz v0, :cond_3
 
     invoke-virtual {v0, v1}, Landroidx/viewpager/widget/ViewPager;->startAnimation(Landroid/view/animation/Animation;)V
 
     :cond_3
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->bap:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->baH:Landroid/widget/ImageView;
 
     if-eqz v0, :cond_4
 
@@ -589,7 +589,7 @@
 
     invoke-super {p0, p1, p2, p3}, Landroidx/appcompat/app/AppCompatDialogFragment;->onActivityResult(IILandroid/content/Intent;)V
 
-    sget v0, Lcom/lytefast/flexinput/fragment/a;->bar:I
+    sget v0, Lcom/lytefast/flexinput/fragment/a;->baJ:I
 
     if-ne v0, p1, :cond_a
 
@@ -660,7 +660,7 @@
 
     move-result p3
 
-    invoke-static {v0, p3}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, p3}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object p3
 
@@ -856,7 +856,7 @@
 
     check-cast p2, Landroidx/viewpager/widget/ViewPager;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->bam:Landroidx/viewpager/widget/ViewPager;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->baE:Landroidx/viewpager/widget/ViewPager;
 
     sget p2, Lcom/lytefast/flexinput/R$e;->content_tabs:I
 
@@ -866,7 +866,7 @@
 
     check-cast p2, Lcom/google/android/material/tabs/TabLayout;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->ban:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->baF:Lcom/google/android/material/tabs/TabLayout;
 
     sget p2, Lcom/lytefast/flexinput/R$e;->action_btn:I
 
@@ -876,7 +876,7 @@
 
     check-cast p2, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->bao:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->baG:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     sget p2, Lcom/lytefast/flexinput/R$e;->launch_btn:I
 
@@ -886,9 +886,9 @@
 
     check-cast p2, Landroid/widget/ImageView;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->bap:Landroid/widget/ImageView;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->baH:Landroid/widget/ImageView;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->bap:Landroid/widget/ImageView;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->baH:Landroid/widget/ImageView;
 
     if-eqz p2, :cond_0
 
@@ -923,7 +923,7 @@
 
     check-cast v2, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cj()[Lcom/lytefast/flexinput/adapters/a$b;
+    invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->BY()[Lcom/lytefast/flexinput/adapters/a$b;
 
     move-result-object v3
 
@@ -951,7 +951,7 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/a;->ban:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/a;->baF:Lcom/google/android/material/tabs/TabLayout;
 
     if-eqz v3, :cond_8
 
@@ -998,7 +998,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v4, p3, Lcom/lytefast/flexinput/adapters/a;->aZK:[Lcom/lytefast/flexinput/adapters/a$b;
+    iget-object v4, p3, Lcom/lytefast/flexinput/adapters/a;->bac:[Lcom/lytefast/flexinput/adapters/a$b;
 
     new-instance v5, Ljava/util/ArrayList;
 
@@ -1078,7 +1078,7 @@
     goto :goto_2
 
     :cond_4
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->bam:Landroidx/viewpager/widget/ViewPager;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->baE:Landroidx/viewpager/widget/ViewPager;
 
     if-eqz v0, :cond_5
 
@@ -1087,7 +1087,7 @@
     invoke-virtual {v0, p3}, Landroidx/viewpager/widget/ViewPager;->setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
 
     :cond_5
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->ban:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->baF:Lcom/google/android/material/tabs/TabLayout;
 
     if-eqz p3, :cond_6
 
@@ -1100,7 +1100,7 @@
     invoke-virtual {p3, v0}, Lcom/google/android/material/tabs/TabLayout;->addOnTabSelectedListener(Lcom/google/android/material/tabs/TabLayout$BaseOnTabSelectedListener;)V
 
     :cond_6
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->bam:Landroidx/viewpager/widget/ViewPager;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->baE:Landroidx/viewpager/widget/ViewPager;
 
     if-eqz p3, :cond_7
 
@@ -1113,7 +1113,7 @@
     invoke-virtual {p3, v0}, Landroidx/viewpager/widget/ViewPager;->addOnPageChangeListener(Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;)V
 
     :cond_7
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->ban:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->baF:Lcom/google/android/material/tabs/TabLayout;
 
     if-eqz p3, :cond_8
 
@@ -1128,7 +1128,7 @@
     invoke-virtual {p3}, Lcom/google/android/material/tabs/TabLayout$Tab;->select()V
 
     :cond_8
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->bao:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->baG:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     if-eqz p3, :cond_9
 
@@ -1141,11 +1141,11 @@
     invoke-virtual {p3, v0}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :cond_9
-    invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Cc()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->BR()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object p2
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->baq:Lcom/lytefast/flexinput/fragment/a$c;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->baI:Lcom/lytefast/flexinput/fragment/a$c;
 
     check-cast p3, Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
@@ -1153,7 +1153,7 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     :cond_a
     return-object p1
@@ -1162,11 +1162,11 @@
 .method public final onDestroyView()V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aZM:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->bae:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/a;->baq:Lcom/lytefast/flexinput/fragment/a$c;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/a;->baI:Lcom/lytefast/flexinput/fragment/a$c;
 
     check-cast v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
@@ -1183,7 +1183,7 @@
 
     invoke-super {p0}, Landroidx/appcompat/app/AppCompatDialogFragment;->onResume()V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->bao:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->baG:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     if-eqz v0, :cond_0
 
@@ -1242,21 +1242,21 @@
 
     invoke-virtual {v1, v0, v2}, Landroid/view/animation/Animation;->setInterpolator(Landroid/content/Context;I)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->ban:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->baF:Lcom/google/android/material/tabs/TabLayout;
 
     if-eqz v0, :cond_0
 
     invoke-virtual {v0, v1}, Lcom/google/android/material/tabs/TabLayout;->startAnimation(Landroid/view/animation/Animation;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->bam:Landroidx/viewpager/widget/ViewPager;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->baE:Landroidx/viewpager/widget/ViewPager;
 
     if-eqz v0, :cond_1
 
     invoke-virtual {v0, v1}, Landroidx/viewpager/widget/ViewPager;->startAnimation(Landroid/view/animation/Animation;)V
 
     :cond_1
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->bap:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->baH:Landroid/widget/ImageView;
 
     if-eqz v0, :cond_2
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/managers/FileManager.smali b/com.discord/smali_classes2/com/lytefast/flexinput/managers/FileManager.smali
index d3b9bb226d..b6b3705d0a 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/managers/FileManager.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/managers/FileManager.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract Cp()Ljava/io/File;
+.method public abstract Ce()Ljava/io/File;
 .end method
 
 .method public abstract b(Landroid/content/Context;Ljava/io/File;)Landroid/net/Uri;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/managers/b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/managers/b.smali
index 0853a6fab9..033197384e 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/managers/b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/managers/b.smali
@@ -17,15 +17,15 @@
 # static fields
 .field private static final TAG:Ljava/lang/String;
 
-.field public static final bbd:Lcom/lytefast/flexinput/managers/b$a;
+.field public static final bbv:Lcom/lytefast/flexinput/managers/b$a;
 
 
 # instance fields
-.field private final bba:Ljava/lang/String;
+.field private final bbs:Ljava/lang/String;
 
-.field private final bbb:Ljava/lang/String;
+.field private final bbt:Ljava/lang/String;
 
-.field private final bbc:Ljava/lang/String;
+.field private final bbu:Ljava/lang/String;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     invoke-direct {v0, v1}, Lcom/lytefast/flexinput/managers/b$a;-><init>(B)V
 
-    sput-object v0, Lcom/lytefast/flexinput/managers/b;->bbd:Lcom/lytefast/flexinput/managers/b$a;
+    sput-object v0, Lcom/lytefast/flexinput/managers/b;->bbv:Lcom/lytefast/flexinput/managers/b$a;
 
     const-class v0, Lcom/lytefast/flexinput/managers/b;
 
@@ -78,18 +78,18 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/managers/b;->bba:Ljava/lang/String;
+    iput-object p1, p0, Lcom/lytefast/flexinput/managers/b;->bbs:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/managers/b;->bbb:Ljava/lang/String;
+    iput-object p2, p0, Lcom/lytefast/flexinput/managers/b;->bbt:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/lytefast/flexinput/managers/b;->bbc:Ljava/lang/String;
+    iput-object p3, p0, Lcom/lytefast/flexinput/managers/b;->bbu:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Cp()Ljava/io/File;
+.method public final Ce()Ljava/io/File;
     .locals 5
 
     new-instance v0, Ljava/text/SimpleDateFormat;
@@ -110,7 +110,7 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v2, p0, Lcom/lytefast/flexinput/managers/b;->bbc:Ljava/lang/String;
+    iget-object v2, p0, Lcom/lytefast/flexinput/managers/b;->bbu:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -134,7 +134,7 @@
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/lytefast/flexinput/managers/b;->bbb:Ljava/lang/String;
+    iget-object v4, p0, Lcom/lytefast/flexinput/managers/b;->bbt:Ljava/lang/String;
 
     invoke-direct {v2, v3, v4}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
@@ -173,7 +173,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/managers/b;->bba:Ljava/lang/String;
+    iget-object v0, p0, Lcom/lytefast/flexinput/managers/b;->bbs:Ljava/lang/String;
 
     invoke-static {p1, v0, p2}, Landroidx/core/content/FileProvider;->getUriForFile(Landroid/content/Context;Ljava/lang/String;Ljava/io/File;)Landroid/net/Uri;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$c.smali b/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$c.smali
index d386afbf88..e22dc82f95 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$c.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$c.smali
@@ -20,14 +20,14 @@
 # instance fields
 .field final synthetic $contentResolver:Landroid/content/ContentResolver;
 
-.field final synthetic bbf:Lcom/lytefast/flexinput/model/Photo;
+.field final synthetic bbx:Lcom/lytefast/flexinput/model/Photo;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/model/Photo;Landroid/content/ContentResolver;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/model/Photo$c;->bbf:Lcom/lytefast/flexinput/model/Photo;
+    iput-object p1, p0, Lcom/lytefast/flexinput/model/Photo$c;->bbx:Lcom/lytefast/flexinput/model/Photo;
 
     iput-object p2, p0, Lcom/lytefast/flexinput/model/Photo$c;->$contentResolver:Landroid/content/ContentResolver;
 
@@ -44,7 +44,7 @@
     :try_start_0
     iget-object v0, p0, Lcom/lytefast/flexinput/model/Photo$c;->$contentResolver:Landroid/content/ContentResolver;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/model/Photo$c;->bbf:Lcom/lytefast/flexinput/model/Photo;
+    iget-object v1, p0, Lcom/lytefast/flexinput/model/Photo$c;->bbx:Lcom/lytefast/flexinput/model/Photo;
 
     invoke-virtual {v1}, Lcom/lytefast/flexinput/model/Photo;->getId()J
 
@@ -73,7 +73,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/lytefast/flexinput/model/Photo$c;->bbf:Lcom/lytefast/flexinput/model/Photo;
+    iget-object v2, p0, Lcom/lytefast/flexinput/model/Photo$c;->bbx:Lcom/lytefast/flexinput/model/Photo;
 
     invoke-virtual {v2}, Lcom/lytefast/flexinput/model/Photo;->getId()J
 
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 bb3ba5bf98..783852bd5b 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo.smali
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field public static final bbe:Lcom/lytefast/flexinput/model/Photo$a;
+.field public static final bbw:Lcom/lytefast/flexinput/model/Photo$a;
 
 
 # direct methods
@@ -43,7 +43,7 @@
 
     invoke-direct {v0, v1}, Lcom/lytefast/flexinput/model/Photo$a;-><init>(B)V
 
-    sput-object v0, Lcom/lytefast/flexinput/model/Photo;->bbe:Lcom/lytefast/flexinput/model/Photo$a;
+    sput-object v0, Lcom/lytefast/flexinput/model/Photo;->bbw:Lcom/lytefast/flexinput/model/Photo$a;
 
     new-instance v0, Lcom/lytefast/flexinput/model/Photo$b;
 
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 388994e687..176055f84f 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
@@ -26,9 +26,9 @@
 
 
 # instance fields
-.field final synthetic bbh:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.field final synthetic bbA:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
-.field final synthetic bbi:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+.field final synthetic bbz:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
 
 # direct methods
@@ -42,9 +42,9 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->bbh:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->bbz:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->bbi:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    iput-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->bbA:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -62,7 +62,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->bbh:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->bbz: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
 
@@ -78,7 +78,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->bbh:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->bbz: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
 
@@ -88,13 +88,13 @@
 .method public final unregister()V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->bbh:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->bbz:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->getChildSelectionCoordinators()Ljava/util/ArrayList;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->bbi:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    iget-object v1, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->bbA:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
     invoke-virtual {v0, v1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
 
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 b270dd1692..8e3d7ade99 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator.smali
@@ -88,7 +88,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     sput-object v0, Lcom/lytefast/flexinput/utils/SelectionAggregator;->TAG:Ljava/lang/String;
@@ -484,7 +484,7 @@
 
     new-instance v2, Ljava/util/ArrayList;
 
-    iget-object v3, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbk:Landroidx/collection/ArrayMap;
+    iget-object v3, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbC:Landroidx/collection/ArrayMap;
 
     invoke-virtual {v3}, Landroidx/collection/ArrayMap;->values()Ljava/util/Collection;
 
@@ -492,11 +492,11 @@
 
     invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget-object v3, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbk:Landroidx/collection/ArrayMap;
+    iget-object v3, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbC:Landroidx/collection/ArrayMap;
 
     invoke-virtual {v3}, Landroidx/collection/ArrayMap;->clear()V
 
-    iget-object v1, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbj:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iget-object v1, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbB:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     if-eqz v1, :cond_0
 
@@ -802,7 +802,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbj:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iget-object v1, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbB:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     if-nez v1, :cond_3
 
@@ -831,7 +831,7 @@
     :cond_1
     if-eqz v1, :cond_0
 
-    iget-object v2, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbk:Landroidx/collection/ArrayMap;
+    iget-object v2, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbC:Landroidx/collection/ArrayMap;
 
     const/4 v3, -0x1
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$b.smali
index 821b50ad5f..27d55549c9 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$b.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private final bbm:Ljava/lang/Object;
+.field private final bbE:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -46,7 +46,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->bbm:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->bbE:Ljava/lang/Object;
 
     iput-boolean p2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->isSelected:Z
 
@@ -70,9 +70,9 @@
 
     check-cast p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->bbm:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->bbE:Ljava/lang/Object;
 
-    iget-object v3, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->bbm:Ljava/lang/Object;
+    iget-object v3, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->bbE:Ljava/lang/Object;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -109,7 +109,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->bbm:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->bbE:Ljava/lang/Object;
 
     if-eqz v0, :cond_0
 
@@ -146,7 +146,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->bbm:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->bbE:Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
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 d5820386cc..ad28c7f890 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field bbj:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.field bbB:Landroidx/recyclerview/widget/RecyclerView$Adapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/recyclerview/widget/RecyclerView$Adapter<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field final bbk:Landroidx/collection/ArrayMap;
+.field final bbC:Landroidx/collection/ArrayMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/ArrayMap<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field public bbl:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+.field public bbD:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener<",
@@ -106,9 +106,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbk:Landroidx/collection/ArrayMap;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbC:Landroidx/collection/ArrayMap;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbl:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iput-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbD:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
     return-void
 .end method
@@ -131,7 +131,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbj:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbB:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     return-object p0
 .end method
@@ -150,7 +150,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbl:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbD:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
     return-void
 .end method
@@ -163,7 +163,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbk:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbC:Landroidx/collection/ArrayMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -187,7 +187,7 @@
 
     move-result v0
 
-    iget-object v2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbj:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iget-object v2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbB:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     if-eqz v2, :cond_0
 
@@ -198,7 +198,7 @@
     invoke-virtual {v2, v0, v3}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->notifyItemChanged(ILjava/lang/Object;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbl:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbD:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
     invoke-interface {v0, p1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;->onItemUnselected(Ljava/lang/Object;)V
 
@@ -222,7 +222,7 @@
 .method public final close()V
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbl:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbD:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
     invoke-interface {v0}, Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;->unregister()V
 
@@ -237,7 +237,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbk:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbC:Landroidx/collection/ArrayMap;
 
     invoke-virtual {v0, p1}, Landroidx/collection/ArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -253,7 +253,7 @@
 
     if-eq p2, v0, :cond_0
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbk:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbC:Landroidx/collection/ArrayMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -313,7 +313,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbk:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbC:Landroidx/collection/ArrayMap;
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -321,7 +321,7 @@
 
     invoke-virtual {v0, p1, v1}, Landroidx/collection/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbj:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbB:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     if-eqz v0, :cond_0
 
@@ -334,7 +334,7 @@
     invoke-virtual {v0, p2, v1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->notifyItemChanged(ILjava/lang/Object;)V
 
     :cond_0
-    iget-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbl:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iget-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->bbD:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
     invoke-interface {p2, p1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;->onItemSelected(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/a.smali
index 6241c4d0ac..a5450239b1 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bbg:Lcom/lytefast/flexinput/utils/a;
+.field public static final bby:Lcom/lytefast/flexinput/utils/a;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/lytefast/flexinput/utils/a;-><init>()V
 
-    sput-object v0, Lcom/lytefast/flexinput/utils/a;->bbg:Lcom/lytefast/flexinput/utils/a;
+    sput-object v0, Lcom/lytefast/flexinput/utils/a;->bby:Lcom/lytefast/flexinput/utils/a;
 
     return-void
 .end method
@@ -140,7 +140,7 @@
 
     :cond_3
     :try_start_1
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -211,7 +211,7 @@
     return-object p0
 .end method
 
-.method public static final w(Ljava/io/File;)Lcom/lytefast/flexinput/model/Attachment;
+.method public static final v(Ljava/io/File;)Lcom/lytefast/flexinput/model/Attachment;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -261,7 +261,7 @@
     return-object v0
 .end method
 
-.method public static final x(Ljava/io/File;)Ljava/lang/String;
+.method public static final w(Ljava/io/File;)Ljava/lang/String;
     .locals 4
 
     const-string v0, "receiver$0"
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 9267388ec2..d07d8b3c03 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
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bbn:Lcom/lytefast/flexinput/widget/FlexEditText;
+.field final synthetic bbF:Lcom/lytefast/flexinput/widget/FlexEditText;
 
-.field final synthetic bbo:Landroid/view/inputmethod/EditorInfo;
+.field final synthetic bbG:Landroid/view/inputmethod/EditorInfo;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/widget/FlexEditText;Landroid/view/inputmethod/EditorInfo;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->bbn:Lcom/lytefast/flexinput/widget/FlexEditText;
+    iput-object p1, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->bbF:Lcom/lytefast/flexinput/widget/FlexEditText;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->bbo:Landroid/view/inputmethod/EditorInfo;
+    iput-object p2, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->bbG:Landroid/view/inputmethod/EditorInfo;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -67,7 +67,7 @@
 
     :cond_0
     :goto_0
-    iget-object p2, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->bbn:Lcom/lytefast/flexinput/widget/FlexEditText;
+    iget-object p2, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->bbF:Lcom/lytefast/flexinput/widget/FlexEditText;
 
     invoke-virtual {p2}, Lcom/lytefast/flexinput/widget/FlexEditText;->getInputContentHandler()Lkotlin/jvm/functions/Function1;
 
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker.smali
index 421c057015..932bbc2518 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/MediaPicker.smali
@@ -711,7 +711,7 @@
     invoke-direct {p5}, Lcom/yalantis/ucrop/a$a;-><init>()V
 
     :goto_0
-    iget-object v1, p5, Lcom/yalantis/ucrop/a$a;->bbr:Landroid/os/Bundle;
+    iget-object v1, p5, Lcom/yalantis/ucrop/a$a;->bbL:Landroid/os/Bundle;
 
     invoke-virtual {v1, v0}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
@@ -721,7 +721,7 @@
 
     sget-object v1, Landroid/graphics/Bitmap$CompressFormat;->PNG:Landroid/graphics/Bitmap$CompressFormat;
 
-    iget-object v2, p5, Lcom/yalantis/ucrop/a$a;->bbr:Landroid/os/Bundle;
+    iget-object v2, p5, Lcom/yalantis/ucrop/a$a;->bbL:Landroid/os/Bundle;
 
     invoke-virtual {v1}, Landroid/graphics/Bitmap$CompressFormat;->name()Ljava/lang/String;
 
@@ -746,9 +746,9 @@
 
     invoke-direct {v2, p1, v1}, Lcom/yalantis/ucrop/a;-><init>(Landroid/net/Uri;Landroid/net/Uri;)V
 
-    iget-object p1, v2, Lcom/yalantis/ucrop/a;->bbq:Landroid/os/Bundle;
+    iget-object p1, v2, Lcom/yalantis/ucrop/a;->bbK:Landroid/os/Bundle;
 
-    iget-object p5, p5, Lcom/yalantis/ucrop/a$a;->bbr:Landroid/os/Bundle;
+    iget-object p5, p5, Lcom/yalantis/ucrop/a$a;->bbL:Landroid/os/Bundle;
 
     invoke-virtual {p1, p5}, Landroid/os/Bundle;->putAll(Landroid/os/Bundle;)V
 
@@ -767,31 +767,31 @@
     move p1, p3
 
     :goto_1
-    iget-object p3, v2, Lcom/yalantis/ucrop/a;->bbq:Landroid/os/Bundle;
+    iget-object p3, v2, Lcom/yalantis/ucrop/a;->bbK:Landroid/os/Bundle;
 
     const-string p5, "com.yalantis.ucrop.MaxSizeX"
 
     invoke-virtual {p3, p5, p2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
-    iget-object p2, v2, Lcom/yalantis/ucrop/a;->bbq:Landroid/os/Bundle;
+    iget-object p2, v2, Lcom/yalantis/ucrop/a;->bbK:Landroid/os/Bundle;
 
     const-string p3, "com.yalantis.ucrop.MaxSizeY"
 
     invoke-virtual {p2, p3, p1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
-    iget-object p1, v2, Lcom/yalantis/ucrop/a;->bbp:Landroid/content/Intent;
+    iget-object p1, v2, Lcom/yalantis/ucrop/a;->bbJ:Landroid/content/Intent;
 
     const-class p2, Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-virtual {p1, v0, p2}, Landroid/content/Intent;->setClass(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;
 
-    iget-object p1, v2, Lcom/yalantis/ucrop/a;->bbp:Landroid/content/Intent;
+    iget-object p1, v2, Lcom/yalantis/ucrop/a;->bbJ:Landroid/content/Intent;
 
-    iget-object p2, v2, Lcom/yalantis/ucrop/a;->bbq:Landroid/os/Bundle;
+    iget-object p2, v2, Lcom/yalantis/ucrop/a;->bbK:Landroid/os/Bundle;
 
     invoke-virtual {p1, p2}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
 
-    iget-object p1, v2, Lcom/yalantis/ucrop/a;->bbp:Landroid/content/Intent;
+    iget-object p1, v2, Lcom/yalantis/ucrop/a;->bbJ:Landroid/content/Intent;
 
     invoke-static {v0, p1, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->grantWriteAccessToURI(Landroid/content/Context;Landroid/content/Intent;Landroid/net/Uri;)V
 
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 b8d478f9ba..50c7f52f45 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
@@ -125,471 +125,471 @@
 
 .field public static final barLength:I = 0x7f040052
 
-.field public static final borderlessButtonStyle:I = 0x7f040065
+.field public static final borderlessButtonStyle:I = 0x7f040066
 
-.field public static final buttonBarButtonStyle:I = 0x7f040074
+.field public static final buttonBarButtonStyle:I = 0x7f040075
 
-.field public static final buttonBarNegativeButtonStyle:I = 0x7f040075
+.field public static final buttonBarNegativeButtonStyle:I = 0x7f040076
 
-.field public static final buttonBarNeutralButtonStyle:I = 0x7f040076
+.field public static final buttonBarNeutralButtonStyle:I = 0x7f040077
 
-.field public static final buttonBarPositiveButtonStyle:I = 0x7f040077
+.field public static final buttonBarPositiveButtonStyle:I = 0x7f040078
 
-.field public static final buttonBarStyle:I = 0x7f040078
+.field public static final buttonBarStyle:I = 0x7f040079
 
-.field public static final buttonGravity:I = 0x7f040079
+.field public static final buttonGravity:I = 0x7f04007a
 
-.field public static final buttonIconDimen:I = 0x7f04007a
+.field public static final buttonIconDimen:I = 0x7f04007b
 
-.field public static final buttonPanelSideLayout:I = 0x7f04007b
+.field public static final buttonPanelSideLayout:I = 0x7f04007c
 
-.field public static final buttonStyle:I = 0x7f04007d
+.field public static final buttonStyle:I = 0x7f04007e
 
-.field public static final buttonStyleSmall:I = 0x7f04007e
+.field public static final buttonStyleSmall:I = 0x7f04007f
 
-.field public static final buttonTint:I = 0x7f04007f
+.field public static final buttonTint:I = 0x7f040080
 
-.field public static final buttonTintMode:I = 0x7f040080
+.field public static final buttonTintMode:I = 0x7f040081
 
-.field public static final checkboxStyle:I = 0x7f04008c
+.field public static final checkboxStyle:I = 0x7f04008d
 
-.field public static final checkedTextViewStyle:I = 0x7f040091
+.field public static final checkedTextViewStyle:I = 0x7f040092
 
-.field public static final closeIcon:I = 0x7f0400a5
+.field public static final closeIcon:I = 0x7f0400a6
 
-.field public static final closeItemLayout:I = 0x7f0400ac
+.field public static final closeItemLayout:I = 0x7f0400ad
 
-.field public static final collapseContentDescription:I = 0x7f0400ad
+.field public static final collapseContentDescription:I = 0x7f0400ae
 
-.field public static final collapseIcon:I = 0x7f0400ae
+.field public static final collapseIcon:I = 0x7f0400af
 
-.field public static final color:I = 0x7f0400b1
+.field public static final color:I = 0x7f0400b2
 
-.field public static final colorAccent:I = 0x7f0400b2
+.field public static final colorAccent:I = 0x7f0400b3
 
-.field public static final colorBackgroundFloating:I = 0x7f0400b3
+.field public static final colorBackgroundFloating:I = 0x7f0400b4
 
-.field public static final colorButtonNormal:I = 0x7f0400b4
+.field public static final colorButtonNormal:I = 0x7f0400b5
 
-.field public static final colorControlActivated:I = 0x7f0400b5
+.field public static final colorControlActivated:I = 0x7f0400b6
 
-.field public static final colorControlHighlight:I = 0x7f0400b6
+.field public static final colorControlHighlight:I = 0x7f0400b7
 
-.field public static final colorControlNormal:I = 0x7f0400b7
+.field public static final colorControlNormal:I = 0x7f0400b8
 
-.field public static final colorError:I = 0x7f0400b8
+.field public static final colorError:I = 0x7f0400b9
 
-.field public static final colorPrimary:I = 0x7f0400b9
+.field public static final colorPrimary:I = 0x7f0400ba
 
-.field public static final colorPrimaryDark:I = 0x7f0400bc
+.field public static final colorPrimaryDark:I = 0x7f0400bd
 
-.field public static final colorSwitchThumbNormal:I = 0x7f0400c1
+.field public static final colorSwitchThumbNormal:I = 0x7f0400c2
 
-.field public static final commitIcon:I = 0x7f0400c2
+.field public static final commitIcon:I = 0x7f0400c3
 
-.field public static final contentDescription:I = 0x7f0400c7
+.field public static final contentDescription:I = 0x7f0400c8
 
-.field public static final contentInsetEnd:I = 0x7f0400c8
+.field public static final contentInsetEnd:I = 0x7f0400c9
 
-.field public static final contentInsetEndWithActions:I = 0x7f0400c9
+.field public static final contentInsetEndWithActions:I = 0x7f0400ca
 
-.field public static final contentInsetLeft:I = 0x7f0400ca
+.field public static final contentInsetLeft:I = 0x7f0400cb
 
-.field public static final contentInsetRight:I = 0x7f0400cb
+.field public static final contentInsetRight:I = 0x7f0400cc
 
-.field public static final contentInsetStart:I = 0x7f0400cc
+.field public static final contentInsetStart:I = 0x7f0400cd
 
-.field public static final contentInsetStartWithNavigation:I = 0x7f0400cd
+.field public static final contentInsetStartWithNavigation:I = 0x7f0400ce
 
-.field public static final controlBackground:I = 0x7f0400d4
+.field public static final controlBackground:I = 0x7f0400d5
 
-.field public static final coordinatorLayoutStyle:I = 0x7f0400d5
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d6
 
-.field public static final customNavigationLayout:I = 0x7f0400e9
+.field public static final customNavigationLayout:I = 0x7f0400ea
 
-.field public static final defaultQueryHint:I = 0x7f0400ff
+.field public static final defaultQueryHint:I = 0x7f040100
 
-.field public static final dialogCornerRadius:I = 0x7f040100
+.field public static final dialogCornerRadius:I = 0x7f040101
 
-.field public static final dialogPreferredPadding:I = 0x7f040101
+.field public static final dialogPreferredPadding:I = 0x7f040102
 
-.field public static final dialogTheme:I = 0x7f040102
+.field public static final dialogTheme:I = 0x7f040103
 
-.field public static final displayOptions:I = 0x7f040103
+.field public static final displayOptions:I = 0x7f040104
 
-.field public static final divider:I = 0x7f040104
+.field public static final divider:I = 0x7f040105
 
-.field public static final dividerHorizontal:I = 0x7f040108
+.field public static final dividerHorizontal:I = 0x7f040109
 
-.field public static final dividerPadding:I = 0x7f040109
+.field public static final dividerPadding:I = 0x7f04010a
 
-.field public static final dividerVertical:I = 0x7f04010a
+.field public static final dividerVertical:I = 0x7f04010b
 
-.field public static final drawableSize:I = 0x7f04010b
+.field public static final drawableSize:I = 0x7f04010c
 
-.field public static final drawerArrowStyle:I = 0x7f04010c
+.field public static final drawerArrowStyle:I = 0x7f04010d
 
-.field public static final dropDownListViewStyle:I = 0x7f04010d
+.field public static final dropDownListViewStyle:I = 0x7f04010f
 
-.field public static final dropdownListPreferredItemHeight:I = 0x7f04010e
+.field public static final dropdownListPreferredItemHeight:I = 0x7f040110
 
-.field public static final editTextBackground:I = 0x7f04010f
+.field public static final editTextBackground:I = 0x7f040111
 
-.field public static final editTextColor:I = 0x7f040110
+.field public static final editTextColor:I = 0x7f040112
 
-.field public static final editTextStyle:I = 0x7f040111
+.field public static final editTextStyle:I = 0x7f040113
 
-.field public static final elevation:I = 0x7f040112
+.field public static final elevation:I = 0x7f040114
 
-.field public static final expandActivityOverflowButtonDrawable:I = 0x7f040118
+.field public static final expandActivityOverflowButtonDrawable:I = 0x7f04011a
 
-.field public static final firstBaselineToTopHeight:I = 0x7f040131
+.field public static final firstBaselineToTopHeight:I = 0x7f040133
 
-.field public static final font:I = 0x7f04013e
+.field public static final font:I = 0x7f040140
 
-.field public static final fontFamily:I = 0x7f04013f
+.field public static final fontFamily:I = 0x7f040141
 
-.field public static final fontProviderAuthority:I = 0x7f040140
+.field public static final fontProviderAuthority:I = 0x7f040142
 
-.field public static final fontProviderCerts:I = 0x7f040141
+.field public static final fontProviderCerts:I = 0x7f040143
 
-.field public static final fontProviderFetchStrategy:I = 0x7f040142
+.field public static final fontProviderFetchStrategy:I = 0x7f040144
 
-.field public static final fontProviderFetchTimeout:I = 0x7f040143
+.field public static final fontProviderFetchTimeout:I = 0x7f040145
 
-.field public static final fontProviderPackage:I = 0x7f040144
+.field public static final fontProviderPackage:I = 0x7f040146
 
-.field public static final fontProviderQuery:I = 0x7f040145
+.field public static final fontProviderQuery:I = 0x7f040147
 
-.field public static final fontStyle:I = 0x7f040146
+.field public static final fontStyle:I = 0x7f040148
 
-.field public static final fontVariationSettings:I = 0x7f040147
+.field public static final fontVariationSettings:I = 0x7f040149
 
-.field public static final fontWeight:I = 0x7f040148
+.field public static final fontWeight:I = 0x7f04014a
 
-.field public static final gapBetweenBars:I = 0x7f04014a
+.field public static final gapBetweenBars:I = 0x7f04014c
 
-.field public static final goIcon:I = 0x7f04014f
+.field public static final goIcon:I = 0x7f040151
 
-.field public static final height:I = 0x7f040156
+.field public static final height:I = 0x7f040158
 
-.field public static final hideOnContentScroll:I = 0x7f04015b
+.field public static final hideOnContentScroll:I = 0x7f04015d
 
-.field public static final homeAsUpIndicator:I = 0x7f040162
+.field public static final homeAsUpIndicator:I = 0x7f040164
 
-.field public static final homeLayout:I = 0x7f040163
+.field public static final homeLayout:I = 0x7f040165
 
-.field public static final icon:I = 0x7f0401c7
+.field public static final icon:I = 0x7f0401c9
 
-.field public static final iconTint:I = 0x7f0401cd
+.field public static final iconTint:I = 0x7f0401cf
 
-.field public static final iconTintMode:I = 0x7f0401ce
+.field public static final iconTintMode:I = 0x7f0401d0
 
-.field public static final iconifiedByDefault:I = 0x7f0401cf
+.field public static final iconifiedByDefault:I = 0x7f0401d1
 
-.field public static final imageButtonStyle:I = 0x7f0401d2
+.field public static final imageButtonStyle:I = 0x7f0401d4
 
-.field public static final indeterminateProgressStyle:I = 0x7f0401ea
+.field public static final indeterminateProgressStyle:I = 0x7f0401ec
 
-.field public static final initialActivityCount:I = 0x7f0401eb
+.field public static final initialActivityCount:I = 0x7f0401ed
 
-.field public static final isLightTheme:I = 0x7f0401ed
+.field public static final isLightTheme:I = 0x7f0401ef
 
-.field public static final itemPadding:I = 0x7f0401f4
+.field public static final itemPadding:I = 0x7f0401f6
 
-.field public static final keylines:I = 0x7f0401fb
+.field public static final keylines:I = 0x7f0401fd
 
-.field public static final lastBaselineToBottomHeight:I = 0x7f0401fd
+.field public static final lastBaselineToBottomHeight:I = 0x7f0401ff
 
-.field public static final layout:I = 0x7f0401fe
+.field public static final layout:I = 0x7f040200
 
-.field public static final layout_anchor:I = 0x7f040201
+.field public static final layout_anchor:I = 0x7f040203
 
-.field public static final layout_anchorGravity:I = 0x7f040202
+.field public static final layout_anchorGravity:I = 0x7f040204
 
-.field public static final layout_behavior:I = 0x7f040203
+.field public static final layout_behavior:I = 0x7f040205
 
-.field public static final layout_dodgeInsetEdges:I = 0x7f04022f
+.field public static final layout_dodgeInsetEdges:I = 0x7f040231
 
-.field public static final layout_insetEdge:I = 0x7f04023b
+.field public static final layout_insetEdge:I = 0x7f04023d
 
-.field public static final layout_keyline:I = 0x7f04023c
+.field public static final layout_keyline:I = 0x7f04023e
 
-.field public static final lineHeight:I = 0x7f04024a
+.field public static final lineHeight:I = 0x7f04024d
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04024c
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04024f
 
-.field public static final listDividerAlertDialog:I = 0x7f04024d
+.field public static final listDividerAlertDialog:I = 0x7f040250
 
-.field public static final listItemLayout:I = 0x7f04024e
+.field public static final listItemLayout:I = 0x7f040251
 
-.field public static final listLayout:I = 0x7f04024f
+.field public static final listLayout:I = 0x7f040252
 
-.field public static final listMenuViewStyle:I = 0x7f040250
+.field public static final listMenuViewStyle:I = 0x7f040253
 
-.field public static final listPopupWindowStyle:I = 0x7f040251
+.field public static final listPopupWindowStyle:I = 0x7f040254
 
-.field public static final listPreferredItemHeight:I = 0x7f040252
+.field public static final listPreferredItemHeight:I = 0x7f040255
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040253
+.field public static final listPreferredItemHeightLarge:I = 0x7f040256
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040254
+.field public static final listPreferredItemHeightSmall:I = 0x7f040257
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040255
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040258
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040256
+.field public static final listPreferredItemPaddingRight:I = 0x7f040259
 
-.field public static final logo:I = 0x7f040257
+.field public static final logo:I = 0x7f04025a
 
-.field public static final logoDescription:I = 0x7f040258
+.field public static final logoDescription:I = 0x7f04025b
 
-.field public static final maxButtonHeight:I = 0x7f04026b
+.field public static final maxButtonHeight:I = 0x7f04026e
 
-.field public static final measureWithLargestChild:I = 0x7f04026e
+.field public static final measureWithLargestChild:I = 0x7f040271
 
-.field public static final multiChoiceItemLayout:I = 0x7f040270
+.field public static final multiChoiceItemLayout:I = 0x7f040273
 
-.field public static final navigationContentDescription:I = 0x7f040271
+.field public static final navigationContentDescription:I = 0x7f040274
 
-.field public static final navigationIcon:I = 0x7f040272
+.field public static final navigationIcon:I = 0x7f040275
 
-.field public static final navigationMode:I = 0x7f040273
+.field public static final navigationMode:I = 0x7f040276
 
-.field public static final numericModifiers:I = 0x7f040277
+.field public static final numericModifiers:I = 0x7f04027a
 
-.field public static final overlapAnchor:I = 0x7f040278
+.field public static final overlapAnchor:I = 0x7f04027b
 
-.field public static final paddingBottomNoButtons:I = 0x7f04027c
+.field public static final paddingBottomNoButtons:I = 0x7f04027f
 
-.field public static final paddingEnd:I = 0x7f04027d
+.field public static final paddingEnd:I = 0x7f040280
 
-.field public static final paddingStart:I = 0x7f04027e
+.field public static final paddingStart:I = 0x7f040281
 
-.field public static final paddingTopNoTitle:I = 0x7f04027f
+.field public static final paddingTopNoTitle:I = 0x7f040282
 
-.field public static final panelBackground:I = 0x7f040280
+.field public static final panelBackground:I = 0x7f040283
 
-.field public static final panelMenuListTheme:I = 0x7f040281
+.field public static final panelMenuListTheme:I = 0x7f040284
 
-.field public static final panelMenuListWidth:I = 0x7f040282
+.field public static final panelMenuListWidth:I = 0x7f040285
 
-.field public static final popupMenuStyle:I = 0x7f04028a
+.field public static final popupMenuStyle:I = 0x7f04028d
 
-.field public static final popupTheme:I = 0x7f04028b
+.field public static final popupTheme:I = 0x7f04028e
 
-.field public static final popupWindowStyle:I = 0x7f04028c
+.field public static final popupWindowStyle:I = 0x7f04028f
 
-.field public static final preserveIconSpacing:I = 0x7f04028d
+.field public static final preserveIconSpacing:I = 0x7f040290
 
-.field public static final progressBarPadding:I = 0x7f0402b9
+.field public static final progressBarPadding:I = 0x7f0402bc
 
-.field public static final progressBarStyle:I = 0x7f0402ba
+.field public static final progressBarStyle:I = 0x7f0402bd
 
-.field public static final queryBackground:I = 0x7f0402bd
+.field public static final queryBackground:I = 0x7f0402c0
 
-.field public static final queryHint:I = 0x7f0402be
+.field public static final queryHint:I = 0x7f0402c1
 
-.field public static final radioButtonStyle:I = 0x7f0402bf
+.field public static final radioButtonStyle:I = 0x7f0402c2
 
-.field public static final ratingBarStyle:I = 0x7f0402c2
+.field public static final ratingBarStyle:I = 0x7f0402c5
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402c3
+.field public static final ratingBarStyleIndicator:I = 0x7f0402c6
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402c4
+.field public static final ratingBarStyleSmall:I = 0x7f0402c7
 
-.field public static final searchHintIcon:I = 0x7f0402e9
+.field public static final searchHintIcon:I = 0x7f0402ec
 
-.field public static final searchIcon:I = 0x7f0402ea
+.field public static final searchIcon:I = 0x7f0402ed
 
-.field public static final searchViewStyle:I = 0x7f0402eb
+.field public static final searchViewStyle:I = 0x7f0402ee
 
-.field public static final seekBarStyle:I = 0x7f0402ed
+.field public static final seekBarStyle:I = 0x7f0402f0
 
-.field public static final selectableItemBackground:I = 0x7f0402ee
+.field public static final selectableItemBackground:I = 0x7f0402f1
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ef
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402f2
 
-.field public static final showAsAction:I = 0x7f0402f1
+.field public static final showAsAction:I = 0x7f0402f4
 
-.field public static final showDividers:I = 0x7f0402f5
+.field public static final showDividers:I = 0x7f0402f8
 
-.field public static final showText:I = 0x7f0402f7
+.field public static final showText:I = 0x7f0402fa
 
-.field public static final showTitle:I = 0x7f0402f8
+.field public static final showTitle:I = 0x7f0402fb
 
-.field public static final singleChoiceItemLayout:I = 0x7f0402f9
+.field public static final singleChoiceItemLayout:I = 0x7f0402fc
 
-.field public static final spinBars:I = 0x7f0402ff
+.field public static final spinBars:I = 0x7f040302
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f040300
+.field public static final spinnerDropDownItemStyle:I = 0x7f040303
 
-.field public static final spinnerStyle:I = 0x7f040301
+.field public static final spinnerStyle:I = 0x7f040304
 
-.field public static final splitTrack:I = 0x7f040302
+.field public static final splitTrack:I = 0x7f040305
 
-.field public static final srcCompat:I = 0x7f040303
+.field public static final srcCompat:I = 0x7f040306
 
-.field public static final state_above_anchor:I = 0x7f040305
+.field public static final state_above_anchor:I = 0x7f040308
 
-.field public static final statusBarBackground:I = 0x7f04030a
+.field public static final statusBarBackground:I = 0x7f04030d
 
-.field public static final subMenuArrow:I = 0x7f040311
+.field public static final subMenuArrow:I = 0x7f040314
 
-.field public static final submitBackground:I = 0x7f040312
+.field public static final submitBackground:I = 0x7f040315
 
-.field public static final subtitle:I = 0x7f040313
+.field public static final subtitle:I = 0x7f040316
 
-.field public static final subtitleTextAppearance:I = 0x7f040314
+.field public static final subtitleTextAppearance:I = 0x7f040317
 
-.field public static final subtitleTextColor:I = 0x7f040315
+.field public static final subtitleTextColor:I = 0x7f040318
 
-.field public static final subtitleTextStyle:I = 0x7f040316
+.field public static final subtitleTextStyle:I = 0x7f040319
 
-.field public static final suggestionRowLayout:I = 0x7f040317
+.field public static final suggestionRowLayout:I = 0x7f04031a
 
-.field public static final switchMinWidth:I = 0x7f040318
+.field public static final switchMinWidth:I = 0x7f04031b
 
-.field public static final switchPadding:I = 0x7f040319
+.field public static final switchPadding:I = 0x7f04031c
 
-.field public static final switchStyle:I = 0x7f04031a
+.field public static final switchStyle:I = 0x7f04031d
 
-.field public static final switchTextAppearance:I = 0x7f04031b
+.field public static final switchTextAppearance:I = 0x7f04031e
 
-.field public static final textAllCaps:I = 0x7f040339
+.field public static final textAllCaps:I = 0x7f04033c
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040344
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040347
 
-.field public static final textAppearanceListItem:I = 0x7f040345
+.field public static final textAppearanceListItem:I = 0x7f040348
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040346
+.field public static final textAppearanceListItemSecondary:I = 0x7f040349
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040347
+.field public static final textAppearanceListItemSmall:I = 0x7f04034a
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040349
+.field public static final textAppearancePopupMenuHeader:I = 0x7f04034c
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04034a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04034d
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04034b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04034e
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04034c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04034f
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04034f
+.field public static final textColorAlertDialogListItem:I = 0x7f040352
 
-.field public static final textColorSearchUrl:I = 0x7f040350
+.field public static final textColorSearchUrl:I = 0x7f040353
 
-.field public static final theme:I = 0x7f040355
+.field public static final theme:I = 0x7f040358
 
-.field public static final thickness:I = 0x7f0403a6
+.field public static final thickness:I = 0x7f0403a9
 
-.field public static final thumbTextPadding:I = 0x7f0403a7
+.field public static final thumbTextPadding:I = 0x7f0403aa
 
-.field public static final thumbTint:I = 0x7f0403a8
+.field public static final thumbTint:I = 0x7f0403ab
 
-.field public static final thumbTintMode:I = 0x7f0403a9
+.field public static final thumbTintMode:I = 0x7f0403ac
 
-.field public static final tickMark:I = 0x7f0403aa
+.field public static final tickMark:I = 0x7f0403ad
 
-.field public static final tickMarkTint:I = 0x7f0403ab
+.field public static final tickMarkTint:I = 0x7f0403ae
 
-.field public static final tickMarkTintMode:I = 0x7f0403ac
+.field public static final tickMarkTintMode:I = 0x7f0403af
 
-.field public static final tint:I = 0x7f0403ad
+.field public static final tint:I = 0x7f0403b0
 
-.field public static final tintMode:I = 0x7f0403ae
+.field public static final tintMode:I = 0x7f0403b1
 
-.field public static final title:I = 0x7f0403af
+.field public static final title:I = 0x7f0403b2
 
-.field public static final titleMargin:I = 0x7f0403b1
+.field public static final titleMargin:I = 0x7f0403b4
 
-.field public static final titleMarginBottom:I = 0x7f0403b2
+.field public static final titleMarginBottom:I = 0x7f0403b5
 
-.field public static final titleMarginEnd:I = 0x7f0403b3
+.field public static final titleMarginEnd:I = 0x7f0403b6
 
-.field public static final titleMarginStart:I = 0x7f0403b4
+.field public static final titleMarginStart:I = 0x7f0403b7
 
-.field public static final titleMarginTop:I = 0x7f0403b5
+.field public static final titleMarginTop:I = 0x7f0403b8
 
-.field public static final titleMargins:I = 0x7f0403b6
+.field public static final titleMargins:I = 0x7f0403b9
 
-.field public static final titleTextAppearance:I = 0x7f0403b7
+.field public static final titleTextAppearance:I = 0x7f0403ba
 
-.field public static final titleTextColor:I = 0x7f0403b8
+.field public static final titleTextColor:I = 0x7f0403bb
 
-.field public static final titleTextStyle:I = 0x7f0403b9
+.field public static final titleTextStyle:I = 0x7f0403bc
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f0403bb
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0403be
 
-.field public static final toolbarStyle:I = 0x7f0403bc
+.field public static final toolbarStyle:I = 0x7f0403bf
 
-.field public static final tooltipForegroundColor:I = 0x7f0403bd
+.field public static final tooltipForegroundColor:I = 0x7f0403c0
 
-.field public static final tooltipFrameBackground:I = 0x7f0403be
+.field public static final tooltipFrameBackground:I = 0x7f0403c1
 
-.field public static final tooltipText:I = 0x7f0403bf
+.field public static final tooltipText:I = 0x7f0403c2
 
-.field public static final track:I = 0x7f0403c0
+.field public static final track:I = 0x7f0403c3
 
-.field public static final trackTint:I = 0x7f0403c1
+.field public static final trackTint:I = 0x7f0403c4
 
-.field public static final trackTintMode:I = 0x7f0403c2
+.field public static final trackTintMode:I = 0x7f0403c5
 
-.field public static final ttcIndex:I = 0x7f0403c3
+.field public static final ttcIndex:I = 0x7f0403c6
 
-.field public static final ucrop_artv_ratio_title:I = 0x7f0403c7
+.field public static final ucrop_artv_ratio_title:I = 0x7f0403ca
 
-.field public static final ucrop_artv_ratio_x:I = 0x7f0403c8
+.field public static final ucrop_artv_ratio_x:I = 0x7f0403cb
 
-.field public static final ucrop_artv_ratio_y:I = 0x7f0403c9
+.field public static final ucrop_artv_ratio_y:I = 0x7f0403cc
 
-.field public static final ucrop_aspect_ratio_x:I = 0x7f0403ca
+.field public static final ucrop_aspect_ratio_x:I = 0x7f0403cd
 
-.field public static final ucrop_aspect_ratio_y:I = 0x7f0403cb
+.field public static final ucrop_aspect_ratio_y:I = 0x7f0403ce
 
-.field public static final ucrop_circle_dimmed_layer:I = 0x7f0403cc
+.field public static final ucrop_circle_dimmed_layer:I = 0x7f0403cf
 
-.field public static final ucrop_dimmed_color:I = 0x7f0403cd
+.field public static final ucrop_dimmed_color:I = 0x7f0403d0
 
-.field public static final ucrop_frame_color:I = 0x7f0403ce
+.field public static final ucrop_frame_color:I = 0x7f0403d1
 
-.field public static final ucrop_frame_stroke_size:I = 0x7f0403cf
+.field public static final ucrop_frame_stroke_size:I = 0x7f0403d2
 
-.field public static final ucrop_grid_color:I = 0x7f0403d0
+.field public static final ucrop_grid_color:I = 0x7f0403d3
 
-.field public static final ucrop_grid_column_count:I = 0x7f0403d1
+.field public static final ucrop_grid_column_count:I = 0x7f0403d4
 
-.field public static final ucrop_grid_row_count:I = 0x7f0403d2
+.field public static final ucrop_grid_row_count:I = 0x7f0403d5
 
-.field public static final ucrop_grid_stroke_size:I = 0x7f0403d3
+.field public static final ucrop_grid_stroke_size:I = 0x7f0403d6
 
-.field public static final ucrop_show_frame:I = 0x7f0403d4
+.field public static final ucrop_show_frame:I = 0x7f0403d7
 
-.field public static final ucrop_show_grid:I = 0x7f0403d5
+.field public static final ucrop_show_grid:I = 0x7f0403d8
 
-.field public static final ucrop_show_oval_crop_frame:I = 0x7f0403d6
+.field public static final ucrop_show_oval_crop_frame:I = 0x7f0403d9
 
-.field public static final viewInflaterClass:I = 0x7f0403dc
+.field public static final viewInflaterClass:I = 0x7f0403e1
 
-.field public static final voiceIcon:I = 0x7f0403dd
+.field public static final voiceIcon:I = 0x7f0403e2
 
-.field public static final windowActionBar:I = 0x7f0403df
+.field public static final windowActionBar:I = 0x7f0403e4
 
-.field public static final windowActionBarOverlay:I = 0x7f0403e0
+.field public static final windowActionBarOverlay:I = 0x7f0403e5
 
-.field public static final windowActionModeOverlay:I = 0x7f0403e1
+.field public static final windowActionModeOverlay:I = 0x7f0403e6
 
-.field public static final windowFixedHeightMajor:I = 0x7f0403e2
+.field public static final windowFixedHeightMajor:I = 0x7f0403e7
 
-.field public static final windowFixedHeightMinor:I = 0x7f0403e3
+.field public static final windowFixedHeightMinor:I = 0x7f0403e8
 
-.field public static final windowFixedWidthMajor:I = 0x7f0403e4
+.field public static final windowFixedWidthMajor:I = 0x7f0403e9
 
-.field public static final windowFixedWidthMinor:I = 0x7f0403e5
+.field public static final windowFixedWidthMinor:I = 0x7f0403ea
 
-.field public static final windowMinWidthMajor:I = 0x7f0403e6
+.field public static final windowMinWidthMajor:I = 0x7f0403eb
 
-.field public static final windowMinWidthMinor:I = 0x7f0403e7
+.field public static final windowMinWidthMinor:I = 0x7f0403ec
 
-.field public static final windowNoTitle:I = 0x7f0403e8
+.field public static final windowNoTitle:I = 0x7f0403ed
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$color.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$color.smali
index 7195cedf6c..2103664557 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$color.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$color.smali
@@ -75,141 +75,141 @@
 
 .field public static final background_material_light:I = 0x7f06001f
 
-.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060035
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
 
-.field public static final bright_foreground_material_dark:I = 0x7f060038
+.field public static final bright_foreground_material_dark:I = 0x7f060039
 
-.field public static final bright_foreground_material_light:I = 0x7f060039
+.field public static final bright_foreground_material_light:I = 0x7f06003a
 
-.field public static final button_material_dark:I = 0x7f06003f
+.field public static final button_material_dark:I = 0x7f060040
 
-.field public static final button_material_light:I = 0x7f060040
+.field public static final button_material_light:I = 0x7f060041
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060066
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060067
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f060068
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f060069
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final error_color_material_dark:I = 0x7f06006a
+.field public static final error_color_material_dark:I = 0x7f06006d
 
-.field public static final error_color_material_light:I = 0x7f06006b
+.field public static final error_color_material_light:I = 0x7f06006e
 
-.field public static final foreground_material_dark:I = 0x7f060070
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060071
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060080
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060081
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f06008f
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060090
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060091
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060092
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060093
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060094
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060095
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060096
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060097
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f060098
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f060099
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009a
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final primary_dark_material_dark:I = 0x7f0600d9
+.field public static final primary_dark_material_dark:I = 0x7f0600dc
 
-.field public static final primary_dark_material_light:I = 0x7f0600da
+.field public static final primary_dark_material_light:I = 0x7f0600dd
 
-.field public static final primary_material_dark:I = 0x7f0600ea
+.field public static final primary_material_dark:I = 0x7f0600ed
 
-.field public static final primary_material_light:I = 0x7f0600eb
+.field public static final primary_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ec
+.field public static final primary_text_default_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ed
+.field public static final primary_text_default_material_light:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ee
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f1
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f2
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fb
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600ff
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f060100
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060133
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060134
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060136
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060137
 
-.field public static final ucrop_color_crop_background:I = 0x7f060139
+.field public static final ucrop_color_crop_background:I = 0x7f06013b
 
-.field public static final ucrop_color_default_crop_frame:I = 0x7f06013a
+.field public static final ucrop_color_default_crop_frame:I = 0x7f06013c
 
-.field public static final ucrop_color_default_crop_grid:I = 0x7f06013b
+.field public static final ucrop_color_default_crop_grid:I = 0x7f06013d
 
-.field public static final ucrop_color_default_dimmed:I = 0x7f06013c
+.field public static final ucrop_color_default_dimmed:I = 0x7f06013e
 
-.field public static final ucrop_color_default_logo:I = 0x7f06013d
+.field public static final ucrop_color_default_logo:I = 0x7f06013f
 
-.field public static final ucrop_color_progress_wheel_line:I = 0x7f06013e
+.field public static final ucrop_color_progress_wheel_line:I = 0x7f060140
 
-.field public static final ucrop_color_statusbar:I = 0x7f06013f
+.field public static final ucrop_color_statusbar:I = 0x7f060141
 
-.field public static final ucrop_color_toolbar:I = 0x7f060140
+.field public static final ucrop_color_toolbar:I = 0x7f060142
 
-.field public static final ucrop_color_toolbar_widget:I = 0x7f060141
+.field public static final ucrop_color_toolbar_widget:I = 0x7f060143
 
-.field public static final ucrop_color_widget:I = 0x7f060142
+.field public static final ucrop_color_widget:I = 0x7f060144
 
-.field public static final ucrop_color_widget_active:I = 0x7f060143
+.field public static final ucrop_color_widget_active:I = 0x7f060145
 
-.field public static final ucrop_color_widget_background:I = 0x7f060144
+.field public static final ucrop_color_widget_background:I = 0x7f060146
 
-.field public static final ucrop_color_widget_text:I = 0x7f060145
+.field public static final ucrop_color_widget_text:I = 0x7f060147
 
-.field public static final ucrop_scale_text_view_selector:I = 0x7f060146
+.field public static final ucrop_scale_text_view_selector:I = 0x7f060148
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$dimen.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$dimen.smali
index 570954053d..dd5bcb8a7c 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$dimen.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$dimen.smali
@@ -179,107 +179,107 @@
 
 .field public static final compat_notification_large_icon_max_width:I = 0x7f07007d
 
-.field public static final disabled_alpha_material_dark:I = 0x7f0700b1
+.field public static final disabled_alpha_material_dark:I = 0x7f0700b2
 
-.field public static final disabled_alpha_material_light:I = 0x7f0700b2
+.field public static final disabled_alpha_material_light:I = 0x7f0700b3
 
-.field public static final highlight_alpha_material_colored:I = 0x7f0700c4
+.field public static final highlight_alpha_material_colored:I = 0x7f0700c6
 
-.field public static final highlight_alpha_material_dark:I = 0x7f0700c5
+.field public static final highlight_alpha_material_dark:I = 0x7f0700c7
 
-.field public static final highlight_alpha_material_light:I = 0x7f0700c6
+.field public static final highlight_alpha_material_light:I = 0x7f0700c8
 
-.field public static final hint_alpha_material_dark:I = 0x7f0700c7
+.field public static final hint_alpha_material_dark:I = 0x7f0700c9
 
-.field public static final hint_alpha_material_light:I = 0x7f0700c8
+.field public static final hint_alpha_material_light:I = 0x7f0700ca
 
-.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700c9
+.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700cb
 
-.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ca
+.field public static final hint_pressed_alpha_material_light:I = 0x7f0700cc
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
-.field public static final tooltip_corner_radius:I = 0x7f07012b
+.field public static final tooltip_corner_radius:I = 0x7f07012d
 
-.field public static final tooltip_horizontal_padding:I = 0x7f07012c
+.field public static final tooltip_horizontal_padding:I = 0x7f07012e
 
-.field public static final tooltip_margin:I = 0x7f07012d
+.field public static final tooltip_margin:I = 0x7f07012f
 
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07012e
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f070130
 
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07012f
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f070131
 
-.field public static final tooltip_vertical_padding:I = 0x7f070130
+.field public static final tooltip_vertical_padding:I = 0x7f070132
 
-.field public static final tooltip_y_offset_non_touch:I = 0x7f070131
+.field public static final tooltip_y_offset_non_touch:I = 0x7f070133
 
-.field public static final tooltip_y_offset_touch:I = 0x7f070132
+.field public static final tooltip_y_offset_touch:I = 0x7f070134
 
-.field public static final ucrop_default_crop_frame_stoke_width:I = 0x7f070134
+.field public static final ucrop_default_crop_frame_stoke_width:I = 0x7f070136
 
-.field public static final ucrop_default_crop_grid_stoke_width:I = 0x7f070135
+.field public static final ucrop_default_crop_grid_stoke_width:I = 0x7f070137
 
-.field public static final ucrop_default_crop_logo_size:I = 0x7f070136
+.field public static final ucrop_default_crop_logo_size:I = 0x7f070138
 
-.field public static final ucrop_default_crop_rect_corner_touch_area_line_length:I = 0x7f070137
+.field public static final ucrop_default_crop_rect_corner_touch_area_line_length:I = 0x7f070139
 
-.field public static final ucrop_default_crop_rect_corner_touch_threshold:I = 0x7f070138
+.field public static final ucrop_default_crop_rect_corner_touch_threshold:I = 0x7f07013a
 
-.field public static final ucrop_default_crop_rect_min_size:I = 0x7f070139
+.field public static final ucrop_default_crop_rect_min_size:I = 0x7f07013b
 
-.field public static final ucrop_height_crop_aspect_ratio_text:I = 0x7f07013a
+.field public static final ucrop_height_crop_aspect_ratio_text:I = 0x7f07013c
 
-.field public static final ucrop_height_divider_shadow:I = 0x7f07013b
+.field public static final ucrop_height_divider_shadow:I = 0x7f07013d
 
-.field public static final ucrop_height_horizontal_wheel_progress_line:I = 0x7f07013c
+.field public static final ucrop_height_horizontal_wheel_progress_line:I = 0x7f07013e
 
-.field public static final ucrop_height_wrapper_controls:I = 0x7f07013d
+.field public static final ucrop_height_wrapper_controls:I = 0x7f07013f
 
-.field public static final ucrop_height_wrapper_states:I = 0x7f07013e
+.field public static final ucrop_height_wrapper_states:I = 0x7f070140
 
-.field public static final ucrop_margin_horizontal_wheel_progress_line:I = 0x7f07013f
+.field public static final ucrop_margin_horizontal_wheel_progress_line:I = 0x7f070141
 
-.field public static final ucrop_margit_top_widget_text:I = 0x7f070140
+.field public static final ucrop_margit_top_widget_text:I = 0x7f070142
 
-.field public static final ucrop_padding_crop_frame:I = 0x7f070141
+.field public static final ucrop_padding_crop_frame:I = 0x7f070143
 
-.field public static final ucrop_progress_size:I = 0x7f070142
+.field public static final ucrop_progress_size:I = 0x7f070144
 
-.field public static final ucrop_size_dot_scale_text_view:I = 0x7f070143
+.field public static final ucrop_size_dot_scale_text_view:I = 0x7f070145
 
-.field public static final ucrop_size_wrapper_rotate_button:I = 0x7f070144
+.field public static final ucrop_size_wrapper_rotate_button:I = 0x7f070146
 
-.field public static final ucrop_text_size_widget_text:I = 0x7f070145
+.field public static final ucrop_text_size_widget_text:I = 0x7f070147
 
-.field public static final ucrop_width_horizontal_wheel_progress_line:I = 0x7f070146
+.field public static final ucrop_width_horizontal_wheel_progress_line:I = 0x7f070148
 
 
 # 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 48e7c3df50..6322bca689 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
@@ -15,225 +15,225 @@
 
 
 # static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080017
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080017
+.field public static final abc_action_bar_item_background_material:I = 0x7f080018
 
-.field public static final abc_btn_borderless_material:I = 0x7f080018
+.field public static final abc_btn_borderless_material:I = 0x7f080019
 
-.field public static final abc_btn_check_material:I = 0x7f080019
+.field public static final abc_btn_check_material:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
 
-.field public static final abc_btn_colored_material:I = 0x7f08001c
+.field public static final abc_btn_colored_material:I = 0x7f08001d
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
 
-.field public static final abc_btn_radio_material:I = 0x7f08001e
+.field public static final abc_btn_radio_material:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080023
+.field public static final abc_cab_background_internal_bg:I = 0x7f080024
 
-.field public static final abc_cab_background_top_material:I = 0x7f080024
+.field public static final abc_cab_background_top_material:I = 0x7f080025
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
 
-.field public static final abc_control_background_material:I = 0x7f080026
+.field public static final abc_control_background_material:I = 0x7f080027
 
-.field public static final abc_dialog_material_background:I = 0x7f080027
+.field public static final abc_dialog_material_background:I = 0x7f080028
 
-.field public static final abc_edit_text_material:I = 0x7f080028
+.field public static final abc_edit_text_material:I = 0x7f080029
 
-.field public static final abc_ic_ab_back_material:I = 0x7f080029
+.field public static final abc_ic_ab_back_material:I = 0x7f08002a
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
 
-.field public static final abc_ic_clear_material:I = 0x7f08002b
+.field public static final abc_ic_clear_material:I = 0x7f08002c
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
 
-.field public static final abc_ic_search_api_material:I = 0x7f080034
+.field public static final abc_ic_search_api_material:I = 0x7f080035
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080035
+.field public static final abc_ic_star_black_16dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080036
+.field public static final abc_ic_star_black_36dp:I = 0x7f080037
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080037
+.field public static final abc_ic_star_black_48dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003c
+.field public static final abc_item_background_holo_dark:I = 0x7f08003d
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003d
+.field public static final abc_item_background_holo_light:I = 0x7f08003e
 
-.field public static final abc_list_divider_material:I = 0x7f08003e
+.field public static final abc_list_divider_material:I = 0x7f08003f
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
 
-.field public static final abc_list_focused_holo:I = 0x7f080040
+.field public static final abc_list_focused_holo:I = 0x7f080041
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080041
+.field public static final abc_list_longpressed_holo:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080043
+.field public static final abc_list_pressed_holo_light:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080048
+.field public static final abc_list_selector_holo_dark:I = 0x7f080049
 
-.field public static final abc_list_selector_holo_light:I = 0x7f080049
+.field public static final abc_list_selector_holo_light:I = 0x7f08004a
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_material:I = 0x7f08004d
+.field public static final abc_ratingbar_material:I = 0x7f08004e
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004e
+.field public static final abc_ratingbar_small_material:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080054
+.field public static final abc_seekbar_thumb_material:I = 0x7f080055
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
 
-.field public static final abc_seekbar_track_material:I = 0x7f080056
+.field public static final abc_seekbar_track_material:I = 0x7f080057
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
 
-.field public static final abc_switch_thumb_material:I = 0x7f080059
+.field public static final abc_switch_thumb_material:I = 0x7f08005a
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005b
+.field public static final abc_tab_indicator_material:I = 0x7f08005c
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
 
-.field public static final abc_text_cursor_material:I = 0x7f08005d
+.field public static final abc_text_cursor_material:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
 
-.field public static final abc_textfield_search_material:I = 0x7f080068
+.field public static final abc_textfield_search_material:I = 0x7f080069
 
-.field public static final abc_vector_test:I = 0x7f080069
+.field public static final abc_vector_test:I = 0x7f08006a
 
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
-.field public static final tooltip_frame_dark:I = 0x7f08044c
+.field public static final tooltip_frame_dark:I = 0x7f08046a
 
-.field public static final tooltip_frame_light:I = 0x7f08044d
+.field public static final tooltip_frame_light:I = 0x7f08046b
 
-.field public static final ucrop_ic_angle:I = 0x7f08044f
+.field public static final ucrop_ic_angle:I = 0x7f08046d
 
-.field public static final ucrop_ic_crop:I = 0x7f080450
+.field public static final ucrop_ic_crop:I = 0x7f08046e
 
-.field public static final ucrop_ic_cross:I = 0x7f080451
+.field public static final ucrop_ic_cross:I = 0x7f08046f
 
-.field public static final ucrop_ic_done:I = 0x7f080452
+.field public static final ucrop_ic_done:I = 0x7f080470
 
-.field public static final ucrop_ic_next:I = 0x7f080453
+.field public static final ucrop_ic_next:I = 0x7f080471
 
-.field public static final ucrop_ic_reset:I = 0x7f080454
+.field public static final ucrop_ic_reset:I = 0x7f080472
 
-.field public static final ucrop_ic_rotate:I = 0x7f080455
+.field public static final ucrop_ic_rotate:I = 0x7f080473
 
-.field public static final ucrop_ic_scale:I = 0x7f080456
+.field public static final ucrop_ic_scale:I = 0x7f080474
 
-.field public static final ucrop_shadow_upside:I = 0x7f080457
+.field public static final ucrop_shadow_upside:I = 0x7f080475
 
-.field public static final ucrop_vector_ic_crop:I = 0x7f080458
+.field public static final ucrop_vector_ic_crop:I = 0x7f080476
 
-.field public static final ucrop_vector_loader:I = 0x7f080459
+.field public static final ucrop_vector_loader:I = 0x7f080477
 
-.field public static final ucrop_vector_loader_animated:I = 0x7f08045a
+.field public static final ucrop_vector_loader_animated:I = 0x7f080478
 
 
 # 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 760f46deee..02802fe6bd 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
@@ -57,227 +57,227 @@
 
 .field public static final alertTitle:I = 0x7f0a0061
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final buttonPanel:I = 0x7f0a010c
+.field public static final buttonPanel:I = 0x7f0a010d
 
-.field public static final checkbox:I = 0x7f0a0212
+.field public static final checkbox:I = 0x7f0a0213
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final content:I = 0x7f0a0232
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0233
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final custom:I = 0x7f0a0247
+.field public static final custom:I = 0x7f0a0250
 
-.field public static final customPanel:I = 0x7f0a0248
+.field public static final customPanel:I = 0x7f0a0251
 
-.field public static final decor_content_parent:I = 0x7f0a024c
+.field public static final decor_content_parent:I = 0x7f0a0255
 
-.field public static final default_activity_button:I = 0x7f0a024d
+.field public static final default_activity_button:I = 0x7f0a0256
 
-.field public static final edit_query:I = 0x7f0a02a3
+.field public static final edit_query:I = 0x7f0a02ac
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final expand_activities_button:I = 0x7f0a02c4
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02c5
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final group_divider:I = 0x7f0a0322
+.field public static final group_divider:I = 0x7f0a032b
 
-.field public static final home:I = 0x7f0a0382
+.field public static final home:I = 0x7f0a0392
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final image:I = 0x7f0a0388
+.field public static final image:I = 0x7f0a0398
 
-.field public static final image_view_crop:I = 0x7f0a038a
+.field public static final image_view_crop:I = 0x7f0a039a
 
-.field public static final image_view_logo:I = 0x7f0a038b
+.field public static final image_view_logo:I = 0x7f0a039b
 
-.field public static final image_view_state_aspect_ratio:I = 0x7f0a038c
+.field public static final image_view_state_aspect_ratio:I = 0x7f0a039c
 
-.field public static final image_view_state_rotate:I = 0x7f0a038d
+.field public static final image_view_state_rotate:I = 0x7f0a039d
 
-.field public static final image_view_state_scale:I = 0x7f0a038e
+.field public static final image_view_state_scale:I = 0x7f0a039e
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final layout_aspect_ratio:I = 0x7f0a0405
+.field public static final layout_aspect_ratio:I = 0x7f0a0415
 
-.field public static final layout_rotate_wheel:I = 0x7f0a0406
+.field public static final layout_rotate_wheel:I = 0x7f0a0416
 
-.field public static final layout_scale_wheel:I = 0x7f0a0407
+.field public static final layout_scale_wheel:I = 0x7f0a0417
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final listMode:I = 0x7f0a040d
+.field public static final listMode:I = 0x7f0a041d
 
-.field public static final list_item:I = 0x7f0a040e
+.field public static final list_item:I = 0x7f0a041e
 
-.field public static final menu_crop:I = 0x7f0a044b
+.field public static final menu_crop:I = 0x7f0a045b
 
-.field public static final menu_loader:I = 0x7f0a0457
+.field public static final menu_loader:I = 0x7f0a0467
 
-.field public static final message:I = 0x7f0a046f
+.field public static final message:I = 0x7f0a0482
 
-.field public static final multiply:I = 0x7f0a0477
+.field public static final multiply:I = 0x7f0a048a
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final parentPanel:I = 0x7f0a04c3
+.field public static final parentPanel:I = 0x7f0a04d9
 
-.field public static final progress_circular:I = 0x7f0a0543
+.field public static final progress_circular:I = 0x7f0a0553
 
-.field public static final progress_horizontal:I = 0x7f0a0545
+.field public static final progress_horizontal:I = 0x7f0a0555
 
-.field public static final radio:I = 0x7f0a0550
+.field public static final radio:I = 0x7f0a0560
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final rotate_scroll_wheel:I = 0x7f0a0593
+.field public static final rotate_scroll_wheel:I = 0x7f0a05ad
 
-.field public static final scale_scroll_wheel:I = 0x7f0a0599
+.field public static final scale_scroll_wheel:I = 0x7f0a05b3
 
-.field public static final screen:I = 0x7f0a059a
+.field public static final screen:I = 0x7f0a05b4
 
-.field public static final scrollIndicatorDown:I = 0x7f0a059c
+.field public static final scrollIndicatorDown:I = 0x7f0a05b6
 
-.field public static final scrollIndicatorUp:I = 0x7f0a059d
+.field public static final scrollIndicatorUp:I = 0x7f0a05b7
 
-.field public static final scrollView:I = 0x7f0a059e
+.field public static final scrollView:I = 0x7f0a05b8
 
-.field public static final search_badge:I = 0x7f0a05a2
+.field public static final search_badge:I = 0x7f0a05bc
 
-.field public static final search_bar:I = 0x7f0a05a3
+.field public static final search_bar:I = 0x7f0a05bd
 
-.field public static final search_button:I = 0x7f0a05a4
+.field public static final search_button:I = 0x7f0a05be
 
-.field public static final search_close_btn:I = 0x7f0a05a6
+.field public static final search_close_btn:I = 0x7f0a05c0
 
-.field public static final search_edit_frame:I = 0x7f0a05a7
+.field public static final search_edit_frame:I = 0x7f0a05c1
 
-.field public static final search_go_btn:I = 0x7f0a05aa
+.field public static final search_go_btn:I = 0x7f0a05c4
 
-.field public static final search_mag_icon:I = 0x7f0a05ac
+.field public static final search_mag_icon:I = 0x7f0a05c6
 
-.field public static final search_plate:I = 0x7f0a05ad
+.field public static final search_plate:I = 0x7f0a05c7
 
-.field public static final search_src_text:I = 0x7f0a05b0
+.field public static final search_src_text:I = 0x7f0a05ca
 
-.field public static final search_voice_btn:I = 0x7f0a05bc
+.field public static final search_voice_btn:I = 0x7f0a05d6
 
-.field public static final select_dialog_listview:I = 0x7f0a05bd
+.field public static final select_dialog_listview:I = 0x7f0a05d7
 
-.field public static final shortcut:I = 0x7f0a06f7
+.field public static final shortcut:I = 0x7f0a0711
 
-.field public static final spacer:I = 0x7f0a0703
+.field public static final spacer:I = 0x7f0a071d
 
-.field public static final split_action_bar:I = 0x7f0a0704
+.field public static final split_action_bar:I = 0x7f0a0724
 
-.field public static final src_atop:I = 0x7f0a0707
+.field public static final src_atop:I = 0x7f0a0727
 
-.field public static final src_in:I = 0x7f0a0708
+.field public static final src_in:I = 0x7f0a0728
 
-.field public static final src_over:I = 0x7f0a0709
+.field public static final src_over:I = 0x7f0a0729
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final state_aspect_ratio:I = 0x7f0a070d
+.field public static final state_aspect_ratio:I = 0x7f0a072d
 
-.field public static final state_rotate:I = 0x7f0a070e
+.field public static final state_rotate:I = 0x7f0a072e
 
-.field public static final state_scale:I = 0x7f0a070f
+.field public static final state_scale:I = 0x7f0a072f
 
-.field public static final submenuarrow:I = 0x7f0a0724
+.field public static final submenuarrow:I = 0x7f0a074d
 
-.field public static final submit_area:I = 0x7f0a0725
+.field public static final submit_area:I = 0x7f0a074e
 
-.field public static final tabMode:I = 0x7f0a0731
+.field public static final tabMode:I = 0x7f0a075a
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0738
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0761
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0739
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0762
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0741
+.field public static final textSpacerNoButtons:I = 0x7f0a076a
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0742
+.field public static final textSpacerNoTitle:I = 0x7f0a076b
 
-.field public static final text_view_rotate:I = 0x7f0a0746
+.field public static final text_view_rotate:I = 0x7f0a076f
 
-.field public static final text_view_scale:I = 0x7f0a0747
+.field public static final text_view_scale:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0750
+.field public static final titleDividerNoCustom:I = 0x7f0a0779
 
-.field public static final title_template:I = 0x7f0a0751
+.field public static final title_template:I = 0x7f0a077a
 
-.field public static final toolbar:I = 0x7f0a0752
+.field public static final toolbar:I = 0x7f0a077b
 
-.field public static final toolbar_title:I = 0x7f0a0754
+.field public static final toolbar_title:I = 0x7f0a077d
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
-.field public static final topPanel:I = 0x7f0a0757
+.field public static final topPanel:I = 0x7f0a0780
 
-.field public static final ucrop:I = 0x7f0a0763
+.field public static final ucrop:I = 0x7f0a078c
 
-.field public static final ucrop_frame:I = 0x7f0a0764
+.field public static final ucrop_frame:I = 0x7f0a078d
 
-.field public static final ucrop_photobox:I = 0x7f0a0765
+.field public static final ucrop_photobox:I = 0x7f0a078e
 
-.field public static final uniform:I = 0x7f0a076a
+.field public static final uniform:I = 0x7f0a0793
 
-.field public static final up:I = 0x7f0a076d
+.field public static final up:I = 0x7f0a0796
 
-.field public static final view_overlay:I = 0x7f0a07dc
+.field public static final view_overlay:I = 0x7f0a0819
 
-.field public static final wrap_content:I = 0x7f0a082e
+.field public static final wrap_content:I = 0x7f0a086b
 
-.field public static final wrapper_controls:I = 0x7f0a0830
+.field public static final wrapper_controls:I = 0x7f0a086d
 
-.field public static final wrapper_reset_rotate:I = 0x7f0a0831
+.field public static final wrapper_reset_rotate:I = 0x7f0a086e
 
-.field public static final wrapper_rotate_by_angle:I = 0x7f0a0832
+.field public static final wrapper_rotate_by_angle:I = 0x7f0a086f
 
-.field public static final wrapper_states:I = 0x7f0a0833
+.field public static final wrapper_states:I = 0x7f0a0870
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$layout.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$layout.smali
index b879fe97a3..ee9084a894 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$layout.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$layout.smali
@@ -71,39 +71,39 @@
 
 .field public static final abc_tooltip:I = 0x7f0d001b
 
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
-.field public static final select_dialog_item_material:I = 0x7f0d005d
+.field public static final select_dialog_item_material:I = 0x7f0d005f
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d005e
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0060
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d005f
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d0061
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0066
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0069
 
-.field public static final ucrop_activity_photobox:I = 0x7f0d006a
+.field public static final ucrop_activity_photobox:I = 0x7f0d006d
 
-.field public static final ucrop_aspect_ratio:I = 0x7f0d006b
+.field public static final ucrop_aspect_ratio:I = 0x7f0d006e
 
-.field public static final ucrop_controls:I = 0x7f0d006c
+.field public static final ucrop_controls:I = 0x7f0d006f
 
-.field public static final ucrop_fragment_photobox:I = 0x7f0d006d
+.field public static final ucrop_fragment_photobox:I = 0x7f0d0070
 
-.field public static final ucrop_layout_rotate_wheel:I = 0x7f0d006e
+.field public static final ucrop_layout_rotate_wheel:I = 0x7f0d0071
 
-.field public static final ucrop_layout_scale_wheel:I = 0x7f0d006f
+.field public static final ucrop_layout_scale_wheel:I = 0x7f0d0072
 
-.field public static final ucrop_view:I = 0x7f0d0070
+.field public static final ucrop_view:I = 0x7f0d0073
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$menu.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$menu.smali
index a79e4350c7..ca890ed89b 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$menu.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$menu.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final ucrop_menu_activity:I = 0x7f0e0020
+.field public static final ucrop_menu_activity:I = 0x7f0e0021
 
 
 # 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 9706f1b052..43c6afbf31 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$string.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$string.smali
@@ -93,19 +93,19 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f12002a
 
-.field public static final search_menu_title:I = 0x7f120fa3
+.field public static final search_menu_title:I = 0x7f120fdd
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
-.field public static final ucrop_error_input_data_is_absent:I = 0x7f121195
+.field public static final ucrop_error_input_data_is_absent:I = 0x7f1211d9
 
-.field public static final ucrop_label_edit_photo:I = 0x7f121196
+.field public static final ucrop_label_edit_photo:I = 0x7f1211da
 
-.field public static final ucrop_label_original:I = 0x7f121197
+.field public static final ucrop_label_original:I = 0x7f1211db
 
-.field public static final ucrop_menu_crop:I = 0x7f121198
+.field public static final ucrop_menu_crop:I = 0x7f1211dc
 
-.field public static final ucrop_mutate_exception_hint:I = 0x7f121199
+.field public static final ucrop_mutate_exception_hint:I = 0x7f1211dd
 
 
 # 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 a727c15359..e3d95fe5b8 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
@@ -25,697 +25,697 @@
 
 .field public static final Animation_AppCompat_Tooltip:I = 0x7f130004
 
-.field public static final Base_AlertDialog_AppCompat:I = 0x7f130037
+.field public static final Base_AlertDialog_AppCompat:I = 0x7f130038
 
-.field public static final Base_AlertDialog_AppCompat_Light:I = 0x7f130038
+.field public static final Base_AlertDialog_AppCompat_Light:I = 0x7f130039
 
-.field public static final Base_Animation_AppCompat_Dialog:I = 0x7f130039
+.field public static final Base_Animation_AppCompat_Dialog:I = 0x7f13003a
 
-.field public static final Base_Animation_AppCompat_DropDownUp:I = 0x7f13003a
+.field public static final Base_Animation_AppCompat_DropDownUp:I = 0x7f13003b
 
-.field public static final Base_Animation_AppCompat_Tooltip:I = 0x7f13003b
+.field public static final Base_Animation_AppCompat_Tooltip:I = 0x7f13003c
 
-.field public static final Base_DialogWindowTitleBackground_AppCompat:I = 0x7f13003e
+.field public static final Base_DialogWindowTitleBackground_AppCompat:I = 0x7f13003f
 
-.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003d
+.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003e
 
-.field public static final Base_TextAppearance_AppCompat:I = 0x7f13003f
+.field public static final Base_TextAppearance_AppCompat:I = 0x7f130040
 
-.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130040
+.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130041
 
-.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130041
+.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130042
 
-.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130042
+.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130043
 
-.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130043
+.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130044
 
-.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130044
+.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130045
 
-.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130045
+.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130046
 
-.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130046
+.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130047
 
-.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130047
+.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130048
 
-.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130048
+.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130049
 
-.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f130049
+.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f13004a
 
-.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004a
+.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004b
 
-.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004b
+.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004c
 
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004c
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004d
 
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004d
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004e
 
-.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004e
+.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004f
 
-.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f13004f
+.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130050
 
-.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130050
+.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130051
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130051
+.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130052
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130052
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130053
 
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130053
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130054
 
-.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130054
+.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130055
 
-.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130055
+.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130056
 
-.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130056
+.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130057
 
-.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130057
+.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130058
 
-.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130058
+.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130059
 
-.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f130059
+.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f13005a
 
-.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005a
+.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005b
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005b
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005c
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005c
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005d
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005d
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005e
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005e
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005f
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f13005f
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130060
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130060
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130061
 
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130061
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130062
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130062
+.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130063
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130063
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130064
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130064
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130065
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130065
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130066
 
-.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130066
+.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130067
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130067
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130068
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130068
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130069
 
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f130069
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13006a
 
-.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006a
+.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006b
 
-.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006b
+.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006c
 
-.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006c
+.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006d
 
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006d
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006e
 
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006e
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006f
 
-.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008e
+.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008f
 
-.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f13008f
+.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f130090
 
-.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130090
+.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130091
 
-.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130091
+.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130092
 
-.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130092
+.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130093
 
-.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130093
+.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130094
 
-.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130094
+.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130095
 
-.field public static final Base_Theme_AppCompat:I = 0x7f13006f
+.field public static final Base_Theme_AppCompat:I = 0x7f130070
 
-.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130070
+.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130071
 
-.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130071
+.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130072
 
-.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130075
+.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130076
 
-.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130072
+.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130073
 
-.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130073
+.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130074
 
-.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130074
+.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130075
 
-.field public static final Base_Theme_AppCompat_Light:I = 0x7f130076
+.field public static final Base_Theme_AppCompat_Light:I = 0x7f130077
 
-.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130077
+.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130078
 
-.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130078
+.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130079
 
-.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007c
+.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007d
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f130079
+.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f13007a
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007a
+.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007b
 
-.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007b
+.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007c
 
-.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a4
+.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a5
 
-.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a0
+.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a1
 
-.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a1
+.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a2
 
-.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a2
+.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a3
 
-.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a3
+.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a4
 
-.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a5
+.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a6
 
-.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a6
+.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a7
 
-.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a7
+.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a8
 
-.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a8
+.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a9
 
-.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300a9
+.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300aa
 
-.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300aa
+.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300ab
 
-.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ab
+.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ac
 
-.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ac
+.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ad
 
-.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ad
+.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ae
 
-.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b2
+.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b3
 
-.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300ae
+.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300af
 
-.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300af
+.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300b0
 
-.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b0
+.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b1
 
-.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b1
+.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b2
 
-.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b3
+.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b4
 
-.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b4
+.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b5
 
-.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b5
+.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b6
 
-.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b6
+.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b7
 
-.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b7
+.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b8
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b8
+.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b9
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300b9
+.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300ba
 
-.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300ba
+.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300bb
 
-.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bb
+.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bc
 
-.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bc
+.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bd
 
-.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300bd
+.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300be
 
-.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300be
+.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300bf
 
-.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300bf
+.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300c0
 
-.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c0
+.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c1
 
-.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c1
+.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c2
 
-.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c7
+.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c8
 
-.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c8
+.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c9
 
-.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c2
+.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c3
 
-.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c3
+.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c4
 
-.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c4
+.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c5
 
-.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c5
+.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c6
 
-.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c6
+.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c7
 
-.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300c9
+.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300ca
 
-.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300ca
+.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300cb
 
-.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cb
+.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cc
 
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cc
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cd
 
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300cd
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300ce
 
-.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300ce
+.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300cf
 
-.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300cf
+.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300d0
 
-.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d0
+.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d1
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d1
+.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d2
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d2
+.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d3
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d3
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d4
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d4
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d5
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d5
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d6
 
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d6
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d7
 
-.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d7
+.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d8
 
-.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d8
+.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d9
 
-.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300d9
+.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300da
 
-.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300da
+.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300db
 
-.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300db
+.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300dc
 
-.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dc
+.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dd
 
-.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300dd
+.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300de
 
-.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300de
+.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300df
 
-.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300df
+.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300e0
 
-.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e0
+.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e1
 
-.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e1
+.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e2
 
-.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e2
+.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e3
 
-.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e3
+.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e4
 
-.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e4
+.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e5
 
-.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e5
+.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e6
 
-.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e6
+.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e7
 
-.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e7
+.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e8
 
-.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e8
+.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e9
 
-.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300e9
+.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300ea
 
-.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300ea
+.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300eb
 
-.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300eb
+.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300ec
 
-.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ec
+.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ed
 
-.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ed
+.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ee
 
-.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300ee
+.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300ef
 
-.field public static final Platform_AppCompat:I = 0x7f130131
+.field public static final Platform_AppCompat:I = 0x7f130132
 
-.field public static final Platform_AppCompat_Light:I = 0x7f130132
+.field public static final Platform_AppCompat_Light:I = 0x7f130133
 
-.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130137
+.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130138
 
-.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130138
+.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130139
 
-.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f130139
+.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f13013a
 
-.field public static final Platform_V21_AppCompat:I = 0x7f13013a
+.field public static final Platform_V21_AppCompat:I = 0x7f13013b
 
-.field public static final Platform_V21_AppCompat_Light:I = 0x7f13013b
+.field public static final Platform_V21_AppCompat_Light:I = 0x7f13013c
 
-.field public static final Platform_V25_AppCompat:I = 0x7f13013c
+.field public static final Platform_V25_AppCompat:I = 0x7f13013d
 
-.field public static final Platform_V25_AppCompat_Light:I = 0x7f13013d
+.field public static final Platform_V25_AppCompat_Light:I = 0x7f13013e
 
-.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13013e
+.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13013f
 
-.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f13013f
+.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f130140
 
-.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f130140
+.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f130141
 
-.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f130141
+.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f130142
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f130142
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f130143
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130143
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130144
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130144
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130145
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130145
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130146
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130146
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130147
 
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130147
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130148
 
-.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13014d
+.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13014e
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130148
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130149
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f130149
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f13014a
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f13014a
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f13014b
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f13014b
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f13014c
 
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f13014c
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f13014d
 
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13014e
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13014f
 
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f13014f
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f130150
 
-.field public static final TextAppearance_AppCompat:I = 0x7f130152
+.field public static final TextAppearance_AppCompat:I = 0x7f130153
 
-.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130153
+.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130154
 
-.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130154
+.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130155
 
-.field public static final TextAppearance_AppCompat_Button:I = 0x7f130155
+.field public static final TextAppearance_AppCompat_Button:I = 0x7f130156
 
-.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130156
+.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130157
 
-.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130157
+.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130158
 
-.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130158
+.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130159
 
-.field public static final TextAppearance_AppCompat_Display3:I = 0x7f130159
+.field public static final TextAppearance_AppCompat_Display3:I = 0x7f13015a
 
-.field public static final TextAppearance_AppCompat_Display4:I = 0x7f13015a
+.field public static final TextAppearance_AppCompat_Display4:I = 0x7f13015b
 
-.field public static final TextAppearance_AppCompat_Headline:I = 0x7f13015b
+.field public static final TextAppearance_AppCompat_Headline:I = 0x7f13015c
 
-.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13015c
+.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13015d
 
-.field public static final TextAppearance_AppCompat_Large:I = 0x7f13015d
+.field public static final TextAppearance_AppCompat_Large:I = 0x7f13015e
 
-.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13015e
+.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13015f
 
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f13015f
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f130160
 
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f130160
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f130161
 
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130161
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130162
 
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130162
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130163
 
-.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130163
+.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130164
 
-.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130164
+.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130165
 
-.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130165
+.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130166
 
-.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130166
+.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130167
 
-.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130167
+.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130168
 
-.field public static final TextAppearance_AppCompat_Small:I = 0x7f130168
+.field public static final TextAppearance_AppCompat_Small:I = 0x7f130169
 
-.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f130169
+.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f13016a
 
-.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f13016a
+.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f13016b
 
-.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13016b
+.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13016c
 
-.field public static final TextAppearance_AppCompat_Title:I = 0x7f13016c
+.field public static final TextAppearance_AppCompat_Title:I = 0x7f13016d
 
-.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13016d
+.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13016e
 
-.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13016e
+.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13016f
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13016f
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f130170
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130170
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130171
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130171
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130172
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130172
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130173
 
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130173
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130174
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130174
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130175
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f130175
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f130176
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130176
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130177
 
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f130177
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f130178
 
-.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f130178
+.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f130179
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130179
+.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f13017a
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f13017a
+.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f13017b
 
-.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f13017b
+.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f13017c
 
-.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13017c
+.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13017d
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13017d
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13017e
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13017e
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13017f
 
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13017f
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f130180
 
-.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f130180
+.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f130181
 
-.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f130181
+.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f130182
 
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130183
 
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130184
 
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130186
 
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130189
 
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018b
 
-.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301a4
+.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301a5
 
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301a5
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301a6
 
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301a6
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301a7
 
-.field public static final ThemeOverlay_AppCompat:I = 0x7f1301d9
+.field public static final ThemeOverlay_AppCompat:I = 0x7f1301da
 
-.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f1301da
+.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f1301db
 
-.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f1301db
+.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f1301dc
 
-.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f1301dc
+.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f1301dd
 
-.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f1301dd
+.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f1301de
 
-.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f1301de
+.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f1301df
 
-.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f1301df
+.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f1301e0
 
-.field public static final Theme_AppCompat:I = 0x7f1301a7
+.field public static final Theme_AppCompat:I = 0x7f1301a8
 
-.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301a8
+.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301a9
 
-.field public static final Theme_AppCompat_DayNight:I = 0x7f1301a9
+.field public static final Theme_AppCompat_DayNight:I = 0x7f1301aa
 
-.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301aa
+.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301ab
 
-.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301ab
+.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301ac
 
-.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301ae
+.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301af
 
-.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301ac
+.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301ad
 
-.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301ad
+.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301ae
 
-.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301af
+.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301b0
 
-.field public static final Theme_AppCompat_Dialog:I = 0x7f1301b0
+.field public static final Theme_AppCompat_Dialog:I = 0x7f1301b1
 
-.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301b3
+.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301b4
 
-.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301b1
+.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301b2
 
-.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301b2
+.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301b3
 
-.field public static final Theme_AppCompat_Light:I = 0x7f1301b4
+.field public static final Theme_AppCompat_Light:I = 0x7f1301b5
 
-.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301b5
+.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301b6
 
-.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301b6
+.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301b7
 
-.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301b9
+.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301ba
 
-.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301b7
+.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301b8
 
-.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301b8
+.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301b9
 
-.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301ba
+.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301bb
 
-.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301bb
+.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301bc
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302ac
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302af
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302ad
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302b0
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302ae
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302b1
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302af
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302b2
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302b0
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302b3
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302b1
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302b4
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302b2
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302b5
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302b3
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302b6
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302b4
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302b7
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302b5
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302b8
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302b6
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302b9
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1302b7
+.field public static final Widget_AppCompat_Button:I = 0x7f1302ba
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302bd
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302c0
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302be
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302c1
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302b8
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302bb
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302b9
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302bc
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302ba
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302bd
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302bb
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302be
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302bc
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302bf
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302bf
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302c2
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302c0
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302c3
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302c1
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302c4
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1302c2
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1302c5
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1302c3
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1302c6
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1302c4
+.field public static final Widget_AppCompat_EditText:I = 0x7f1302c7
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1302c5
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1302c8
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1302c6
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1302c9
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1302c7
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1302ca
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1302c8
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1302cb
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1302c9
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1302cc
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1302ca
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1302cd
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1302cb
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1302ce
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1302cc
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1302cf
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1302cd
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1302d0
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1302ce
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1302d1
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1302cf
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1302d2
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1302d0
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1302d3
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1302d1
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1302d4
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1302d2
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1302d5
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1302d3
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1302d6
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1302d4
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1302d7
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1302d5
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1302d8
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1302d6
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1302d9
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1302d7
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1302da
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1302d8
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1302db
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1302d9
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1302dc
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1302da
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1302dd
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1302db
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1302de
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1302dc
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1302df
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1302dd
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1302e0
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1302de
+.field public static final Widget_AppCompat_ListView:I = 0x7f1302e1
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1302df
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1302e2
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1302e0
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1302e3
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1302e1
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1302e4
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1302e2
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1302e5
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1302e3
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1302e6
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1302e4
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1302e7
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1302e5
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1302e8
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1302e6
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1302e9
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1302e7
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1302ea
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1302e8
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1302eb
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1302e9
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1302ec
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1302ea
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1302ed
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1302eb
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1302ee
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1302ec
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1302ef
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1302ed
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1302f0
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1302ee
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1302f1
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1302ef
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1302f2
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1302f0
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1302f3
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1302f1
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1302f4
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1302f2
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1302f5
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1302f3
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1302f6
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f8
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f9
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130328
 
-.field public static final ucrop_ImageViewWidgetIcon:I = 0x7f130326
+.field public static final ucrop_ImageViewWidgetIcon:I = 0x7f130329
 
-.field public static final ucrop_TextViewCropAspectRatio:I = 0x7f130327
+.field public static final ucrop_TextViewCropAspectRatio:I = 0x7f13032a
 
-.field public static final ucrop_TextViewWidgetText:I = 0x7f130328
+.field public static final ucrop_TextViewWidgetText:I = 0x7f13032b
 
-.field public static final ucrop_WrapperIconState:I = 0x7f130329
+.field public static final ucrop_WrapperIconState:I = 0x7f13032c
 
-.field public static final ucrop_WrapperRotateButton:I = 0x7f13032a
+.field public static final ucrop_WrapperRotateButton:I = 0x7f13032d
 
 
 # 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 479b92fac0..d0188b8b23 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
@@ -1202,7 +1202,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040305
+    const v6, 0x7f040308
 
     aput v6, v5, v3
 
@@ -1303,60 +1303,60 @@
         0x7f04004c
         0x7f04004e
         0x7f04004f
-        0x7f0400c8
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f0400e9
-        0x7f040103
+        0x7f0400ce
+        0x7f0400ea
         0x7f040104
-        0x7f040112
-        0x7f040156
-        0x7f04015b
-        0x7f040162
-        0x7f040163
-        0x7f0401c7
-        0x7f0401ea
-        0x7f0401f4
-        0x7f040257
-        0x7f040273
-        0x7f04028b
-        0x7f0402b9
-        0x7f0402ba
-        0x7f040313
+        0x7f040105
+        0x7f040114
+        0x7f040158
+        0x7f04015d
+        0x7f040164
+        0x7f040165
+        0x7f0401c9
+        0x7f0401ec
+        0x7f0401f6
+        0x7f04025a
+        0x7f040276
+        0x7f04028e
+        0x7f0402bc
+        0x7f0402bd
         0x7f040316
-        0x7f0403af
-        0x7f0403b9
+        0x7f040319
+        0x7f0403b2
+        0x7f0403bc
     .end array-data
 
     :array_1
     .array-data 4
         0x7f04004c
         0x7f04004e
-        0x7f0400ac
-        0x7f040156
-        0x7f040316
-        0x7f0403b9
+        0x7f0400ad
+        0x7f040158
+        0x7f040319
+        0x7f0403bc
     .end array-data
 
     :array_2
     .array-data 4
-        0x7f040118
-        0x7f0401eb
+        0x7f04011a
+        0x7f0401ed
     .end array-data
 
     :array_3
     .array-data 4
         0x10100f2
-        0x7f04007a
         0x7f04007b
-        0x7f04024e
-        0x7f04024f
-        0x7f040270
-        0x7f0402f8
-        0x7f0402f9
+        0x7f04007c
+        0x7f040251
+        0x7f040252
+        0x7f040273
+        0x7f0402fb
+        0x7f0402fc
     .end array-data
 
     :array_4
@@ -1386,17 +1386,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f040303
-        0x7f0403ad
-        0x7f0403ae
+        0x7f040306
+        0x7f0403b0
+        0x7f0403b1
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f0403aa
-        0x7f0403ab
-        0x7f0403ac
+        0x7f0403ad
+        0x7f0403ae
+        0x7f0403af
     .end array-data
 
     :array_9
@@ -1418,11 +1418,11 @@
         0x7f040048
         0x7f040049
         0x7f04004a
-        0x7f040131
-        0x7f04013f
-        0x7f0401fd
-        0x7f04024a
-        0x7f040339
+        0x7f040133
+        0x7f040141
+        0x7f0401ff
+        0x7f04024d
+        0x7f04033c
     .end array-data
 
     :array_b
@@ -1465,17 +1465,16 @@
         0x7f04002b
         0x7f04002c
         0x7f040044
-        0x7f040065
-        0x7f040074
+        0x7f040066
         0x7f040075
         0x7f040076
         0x7f040077
         0x7f040078
-        0x7f04007d
+        0x7f040079
         0x7f04007e
-        0x7f04008c
-        0x7f040091
-        0x7f0400b2
+        0x7f04007f
+        0x7f04008d
+        0x7f040092
         0x7f0400b3
         0x7f0400b4
         0x7f0400b5
@@ -1483,71 +1482,72 @@
         0x7f0400b7
         0x7f0400b8
         0x7f0400b9
-        0x7f0400bc
-        0x7f0400c1
-        0x7f0400d4
-        0x7f040100
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c2
+        0x7f0400d5
         0x7f040101
         0x7f040102
-        0x7f040108
-        0x7f04010a
-        0x7f04010d
-        0x7f04010e
+        0x7f040103
+        0x7f040109
+        0x7f04010b
         0x7f04010f
         0x7f040110
         0x7f040111
-        0x7f040162
-        0x7f0401d2
-        0x7f04024c
-        0x7f04024d
+        0x7f040112
+        0x7f040113
+        0x7f040164
+        0x7f0401d4
+        0x7f04024f
         0x7f040250
-        0x7f040251
-        0x7f040252
         0x7f040253
         0x7f040254
         0x7f040255
         0x7f040256
-        0x7f040280
-        0x7f040281
-        0x7f040282
-        0x7f04028a
-        0x7f04028c
-        0x7f0402bf
+        0x7f040257
+        0x7f040258
+        0x7f040259
+        0x7f040283
+        0x7f040284
+        0x7f040285
+        0x7f04028d
+        0x7f04028f
         0x7f0402c2
-        0x7f0402c3
-        0x7f0402c4
-        0x7f0402eb
-        0x7f0402ed
+        0x7f0402c5
+        0x7f0402c6
+        0x7f0402c7
         0x7f0402ee
-        0x7f0402ef
-        0x7f040300
-        0x7f040301
-        0x7f04031a
-        0x7f040344
-        0x7f040345
-        0x7f040346
+        0x7f0402f0
+        0x7f0402f1
+        0x7f0402f2
+        0x7f040303
+        0x7f040304
+        0x7f04031d
         0x7f040347
+        0x7f040348
         0x7f040349
         0x7f04034a
-        0x7f04034b
         0x7f04034c
+        0x7f04034d
+        0x7f04034e
         0x7f04034f
-        0x7f040350
-        0x7f0403bb
-        0x7f0403bc
-        0x7f0403bd
+        0x7f040352
+        0x7f040353
         0x7f0403be
-        0x7f0403dc
-        0x7f0403df
-        0x7f0403e0
+        0x7f0403bf
+        0x7f0403c0
+        0x7f0403c1
         0x7f0403e1
-        0x7f0403e2
-        0x7f0403e3
         0x7f0403e4
         0x7f0403e5
         0x7f0403e6
         0x7f0403e7
         0x7f0403e8
+        0x7f0403e9
+        0x7f0403ea
+        0x7f0403eb
+        0x7f0403ec
+        0x7f0403ed
     .end array-data
 
     :array_c
@@ -1560,25 +1560,25 @@
     :array_d
     .array-data 4
         0x1010107
-        0x7f04007f
         0x7f040080
+        0x7f040081
     .end array-data
 
     :array_e
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_f
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_10
@@ -1586,21 +1586,21 @@
         0x7f04003b
         0x7f04003c
         0x7f040052
-        0x7f0400b1
-        0x7f04010b
-        0x7f04014a
-        0x7f0402ff
-        0x7f0403a6
+        0x7f0400b2
+        0x7f04010c
+        0x7f04014c
+        0x7f040302
+        0x7f0403a9
     .end array-data
 
     :array_11
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_12
@@ -1610,11 +1610,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_13
@@ -1646,10 +1646,10 @@
         0x1010126
         0x1010127
         0x1010128
-        0x7f040104
-        0x7f040109
-        0x7f04026e
-        0x7f0402f5
+        0x7f040105
+        0x7f04010a
+        0x7f040271
+        0x7f0402f8
     .end array-data
 
     :array_16
@@ -1695,12 +1695,12 @@
         0x7f04001f
         0x7f040020
         0x7f040031
-        0x7f0400c7
-        0x7f0401cd
-        0x7f0401ce
-        0x7f040277
-        0x7f0402f1
-        0x7f0403bf
+        0x7f0400c8
+        0x7f0401cf
+        0x7f0401d0
+        0x7f04027a
+        0x7f0402f4
+        0x7f0403c2
     .end array-data
 
     :array_1a
@@ -1712,21 +1712,21 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04028d
-        0x7f040311
+        0x7f040290
+        0x7f040314
     .end array-data
 
     :array_1b
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040278
+        0x7f04027b
     .end array-data
 
     :array_1c
     .array-data 4
-        0x7f04027c
         0x7f04027f
+        0x7f040282
     .end array-data
 
     :array_1d
@@ -1735,19 +1735,19 @@
         0x101011f
         0x1010220
         0x1010264
-        0x7f0400a5
-        0x7f0400c2
-        0x7f0400ff
-        0x7f04014f
-        0x7f0401cf
-        0x7f0401fe
-        0x7f0402bd
-        0x7f0402be
-        0x7f0402e9
-        0x7f0402ea
-        0x7f040312
-        0x7f040317
-        0x7f0403dd
+        0x7f0400a6
+        0x7f0400c3
+        0x7f040100
+        0x7f040151
+        0x7f0401d1
+        0x7f040200
+        0x7f0402c0
+        0x7f0402c1
+        0x7f0402ec
+        0x7f0402ed
+        0x7f040315
+        0x7f04031a
+        0x7f0403e2
     .end array-data
 
     :array_1e
@@ -1756,7 +1756,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_1f
@@ -1774,17 +1774,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f0402f7
-        0x7f040302
-        0x7f040318
-        0x7f040319
+        0x7f0402fa
+        0x7f040305
         0x7f04031b
-        0x7f0403a7
-        0x7f0403a8
-        0x7f0403a9
-        0x7f0403c0
-        0x7f0403c1
-        0x7f0403c2
+        0x7f04031c
+        0x7f04031e
+        0x7f0403aa
+        0x7f0403ab
+        0x7f0403ac
+        0x7f0403c3
+        0x7f0403c4
+        0x7f0403c5
     .end array-data
 
     :array_21
@@ -1800,50 +1800,50 @@
         0x1010163
         0x1010164
         0x10103ac
-        0x7f04013f
-        0x7f040339
+        0x7f040141
+        0x7f04033c
     .end array-data
 
     :array_22
     .array-data 4
         0x10100af
         0x1010140
-        0x7f040079
-        0x7f0400ad
+        0x7f04007a
         0x7f0400ae
-        0x7f0400c8
+        0x7f0400af
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f040257
-        0x7f040258
-        0x7f04026b
-        0x7f040271
-        0x7f040272
-        0x7f04028b
-        0x7f040313
-        0x7f040314
-        0x7f040315
-        0x7f0403af
-        0x7f0403b1
+        0x7f0400ce
+        0x7f04025a
+        0x7f04025b
+        0x7f04026e
+        0x7f040274
+        0x7f040275
+        0x7f04028e
+        0x7f040316
+        0x7f040317
+        0x7f040318
         0x7f0403b2
-        0x7f0403b3
         0x7f0403b4
         0x7f0403b5
         0x7f0403b6
         0x7f0403b7
         0x7f0403b8
+        0x7f0403b9
+        0x7f0403ba
+        0x7f0403bb
     .end array-data
 
     :array_23
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04027d
-        0x7f04027e
-        0x7f040355
+        0x7f040280
+        0x7f040281
+        0x7f040358
     .end array-data
 
     :array_24
@@ -1862,16 +1862,13 @@
 
     :array_26
     .array-data 4
-        0x7f0403c7
-        0x7f0403c8
-        0x7f0403c9
+        0x7f0403ca
+        0x7f0403cb
+        0x7f0403cc
     .end array-data
 
     :array_27
     .array-data 4
-        0x7f0403ca
-        0x7f0403cb
-        0x7f0403cc
         0x7f0403cd
         0x7f0403ce
         0x7f0403cf
@@ -1882,6 +1879,9 @@
         0x7f0403d4
         0x7f0403d5
         0x7f0403d6
+        0x7f0403d7
+        0x7f0403d8
+        0x7f0403d9
     .end array-data
 .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
index 07eddfabb2..15730b5bc1 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/R$attr.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/R$attr.smali
@@ -15,33 +15,33 @@
 
 
 # static fields
-.field public static final sb_barBackgroundColor:I = 0x7f0402d7
+.field public static final sb_barBackgroundColor:I = 0x7f0402da
 
-.field public static final sb_barColor:I = 0x7f0402d8
+.field public static final sb_barColor:I = 0x7f0402db
 
-.field public static final sb_barControlColor:I = 0x7f0402d9
+.field public static final sb_barControlColor:I = 0x7f0402dc
 
-.field public static final sb_barControlRadius:I = 0x7f0402da
+.field public static final sb_barControlRadius:I = 0x7f0402dd
 
-.field public static final sb_barControlShadowColor:I = 0x7f0402db
+.field public static final sb_barControlShadowColor:I = 0x7f0402de
 
-.field public static final sb_barControlShadowRadius:I = 0x7f0402dc
+.field public static final sb_barControlShadowRadius:I = 0x7f0402df
 
-.field public static final sb_barHeight:I = 0x7f0402dd
+.field public static final sb_barHeight:I = 0x7f0402e0
 
-.field public static final sb_barInterval:I = 0x7f0402de
+.field public static final sb_barInterval:I = 0x7f0402e1
 
-.field public static final sb_barOverlayColor:I = 0x7f0402df
+.field public static final sb_barOverlayColor:I = 0x7f0402e2
 
-.field public static final sb_barOverlayValue:I = 0x7f0402e0
+.field public static final sb_barOverlayValue:I = 0x7f0402e3
 
-.field public static final sb_barTouchEnabled:I = 0x7f0402e1
+.field public static final sb_barTouchEnabled:I = 0x7f0402e4
 
-.field public static final sb_barValue:I = 0x7f0402e2
+.field public static final sb_barValue:I = 0x7f0402e5
 
-.field public static final sb_barValueMax:I = 0x7f0402e3
+.field public static final sb_barValueMax:I = 0x7f0402e6
 
-.field public static final sb_barValueMin:I = 0x7f0402e4
+.field public static final sb_barValueMin:I = 0x7f0402e7
 
 
 # direct methods
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
index 65ea9b209e..069c1eece2 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/R$styleable.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/super_bar/R$styleable.smali
@@ -62,9 +62,6 @@
 
     :array_0
     .array-data 4
-        0x7f0402d7
-        0x7f0402d8
-        0x7f0402d9
         0x7f0402da
         0x7f0402db
         0x7f0402dc
@@ -76,6 +73,9 @@
         0x7f0402e2
         0x7f0402e3
         0x7f0402e4
+        0x7f0402e5
+        0x7f0402e6
+        0x7f0402e7
     .end array-data
 .end method
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$a.smali
index 1175932f0d..c4909d69df 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$a.smali
@@ -75,137 +75,137 @@
 
 .field public static final background_material_light:I = 0x7f06001f
 
-.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060035
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
 
-.field public static final bright_foreground_material_dark:I = 0x7f060038
+.field public static final bright_foreground_material_dark:I = 0x7f060039
 
-.field public static final bright_foreground_material_light:I = 0x7f060039
+.field public static final bright_foreground_material_light:I = 0x7f06003a
 
-.field public static final button_material_dark:I = 0x7f06003f
+.field public static final button_material_dark:I = 0x7f060040
 
-.field public static final button_material_light:I = 0x7f060040
+.field public static final button_material_light:I = 0x7f060041
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060066
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060067
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f060068
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f060069
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final foreground_material_dark:I = 0x7f060070
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060071
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060080
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060081
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f06008f
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060090
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060091
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060092
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060093
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060094
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060095
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060096
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060097
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f060098
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f060099
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009a
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final notification_action_color_filter:I = 0x7f0600b5
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b6
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final primary_dark_material_dark:I = 0x7f0600d9
+.field public static final primary_dark_material_dark:I = 0x7f0600dc
 
-.field public static final primary_dark_material_light:I = 0x7f0600da
+.field public static final primary_dark_material_light:I = 0x7f0600dd
 
-.field public static final primary_material_dark:I = 0x7f0600ea
+.field public static final primary_material_dark:I = 0x7f0600ed
 
-.field public static final primary_material_light:I = 0x7f0600eb
+.field public static final primary_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ec
+.field public static final primary_text_default_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ed
+.field public static final primary_text_default_material_light:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ee
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f1
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f2
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fb
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600ff
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f060100
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060133
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060134
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060136
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060137
 
-.field public static final ucrop_color_crop_background:I = 0x7f060139
+.field public static final ucrop_color_crop_background:I = 0x7f06013b
 
-.field public static final ucrop_color_default_crop_frame:I = 0x7f06013a
+.field public static final ucrop_color_default_crop_frame:I = 0x7f06013c
 
-.field public static final ucrop_color_default_crop_grid:I = 0x7f06013b
+.field public static final ucrop_color_default_crop_grid:I = 0x7f06013d
 
-.field public static final ucrop_color_default_dimmed:I = 0x7f06013c
+.field public static final ucrop_color_default_dimmed:I = 0x7f06013e
 
-.field public static final ucrop_color_default_logo:I = 0x7f06013d
+.field public static final ucrop_color_default_logo:I = 0x7f06013f
 
-.field public static final ucrop_color_progress_wheel_line:I = 0x7f06013e
+.field public static final ucrop_color_progress_wheel_line:I = 0x7f060140
 
-.field public static final ucrop_color_statusbar:I = 0x7f06013f
+.field public static final ucrop_color_statusbar:I = 0x7f060141
 
-.field public static final ucrop_color_toolbar:I = 0x7f060140
+.field public static final ucrop_color_toolbar:I = 0x7f060142
 
-.field public static final ucrop_color_toolbar_widget:I = 0x7f060141
+.field public static final ucrop_color_toolbar_widget:I = 0x7f060143
 
-.field public static final ucrop_color_widget:I = 0x7f060142
+.field public static final ucrop_color_widget:I = 0x7f060144
 
-.field public static final ucrop_color_widget_active:I = 0x7f060143
+.field public static final ucrop_color_widget_active:I = 0x7f060145
 
-.field public static final ucrop_color_widget_background:I = 0x7f060144
+.field public static final ucrop_color_widget_background:I = 0x7f060146
 
-.field public static final ucrop_color_widget_text:I = 0x7f060145
+.field public static final ucrop_color_widget_text:I = 0x7f060147
 
-.field public static final ucrop_scale_text_view_selector:I = 0x7f060146
+.field public static final ucrop_scale_text_view_selector:I = 0x7f060148
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$b.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$b.smali
index 35aaca23ac..addf504d04 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$b.smali
@@ -173,107 +173,107 @@
 
 .field public static final compat_control_corner_material:I = 0x7f07007b
 
-.field public static final disabled_alpha_material_dark:I = 0x7f0700b1
+.field public static final disabled_alpha_material_dark:I = 0x7f0700b2
 
-.field public static final disabled_alpha_material_light:I = 0x7f0700b2
+.field public static final disabled_alpha_material_light:I = 0x7f0700b3
 
-.field public static final highlight_alpha_material_colored:I = 0x7f0700c4
+.field public static final highlight_alpha_material_colored:I = 0x7f0700c6
 
-.field public static final highlight_alpha_material_dark:I = 0x7f0700c5
+.field public static final highlight_alpha_material_dark:I = 0x7f0700c7
 
-.field public static final highlight_alpha_material_light:I = 0x7f0700c6
+.field public static final highlight_alpha_material_light:I = 0x7f0700c8
 
-.field public static final hint_alpha_material_dark:I = 0x7f0700c7
+.field public static final hint_alpha_material_dark:I = 0x7f0700c9
 
-.field public static final hint_alpha_material_light:I = 0x7f0700c8
+.field public static final hint_alpha_material_light:I = 0x7f0700ca
 
-.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700c9
+.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700cb
 
-.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ca
+.field public static final hint_pressed_alpha_material_light:I = 0x7f0700cc
 
-.field public static final notification_action_icon_size:I = 0x7f070109
+.field public static final notification_action_icon_size:I = 0x7f07010b
 
-.field public static final notification_action_text_size:I = 0x7f07010a
+.field public static final notification_action_text_size:I = 0x7f07010c
 
-.field public static final notification_big_circle_margin:I = 0x7f07010b
+.field public static final notification_big_circle_margin:I = 0x7f07010d
 
-.field public static final notification_content_margin_start:I = 0x7f07010c
+.field public static final notification_content_margin_start:I = 0x7f07010e
 
-.field public static final notification_large_icon_height:I = 0x7f07010d
+.field public static final notification_large_icon_height:I = 0x7f07010f
 
-.field public static final notification_large_icon_width:I = 0x7f07010e
+.field public static final notification_large_icon_width:I = 0x7f070110
 
-.field public static final notification_main_column_padding_top:I = 0x7f07010f
+.field public static final notification_main_column_padding_top:I = 0x7f070111
 
-.field public static final notification_media_narrow_margin:I = 0x7f070110
+.field public static final notification_media_narrow_margin:I = 0x7f070112
 
-.field public static final notification_right_icon_size:I = 0x7f070111
+.field public static final notification_right_icon_size:I = 0x7f070113
 
-.field public static final notification_right_side_padding_top:I = 0x7f070112
+.field public static final notification_right_side_padding_top:I = 0x7f070114
 
-.field public static final notification_small_icon_background_padding:I = 0x7f070113
+.field public static final notification_small_icon_background_padding:I = 0x7f070115
 
-.field public static final notification_small_icon_size_as_large:I = 0x7f070114
+.field public static final notification_small_icon_size_as_large:I = 0x7f070116
 
-.field public static final notification_subtext_size:I = 0x7f070115
+.field public static final notification_subtext_size:I = 0x7f070117
 
-.field public static final notification_top_pad:I = 0x7f070116
+.field public static final notification_top_pad:I = 0x7f070118
 
-.field public static final notification_top_pad_large_text:I = 0x7f070117
+.field public static final notification_top_pad_large_text:I = 0x7f070119
 
-.field public static final tooltip_corner_radius:I = 0x7f07012b
+.field public static final tooltip_corner_radius:I = 0x7f07012d
 
-.field public static final tooltip_horizontal_padding:I = 0x7f07012c
+.field public static final tooltip_horizontal_padding:I = 0x7f07012e
 
-.field public static final tooltip_margin:I = 0x7f07012d
+.field public static final tooltip_margin:I = 0x7f07012f
 
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07012e
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f070130
 
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07012f
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f070131
 
-.field public static final tooltip_vertical_padding:I = 0x7f070130
+.field public static final tooltip_vertical_padding:I = 0x7f070132
 
-.field public static final tooltip_y_offset_non_touch:I = 0x7f070131
+.field public static final tooltip_y_offset_non_touch:I = 0x7f070133
 
-.field public static final tooltip_y_offset_touch:I = 0x7f070132
+.field public static final tooltip_y_offset_touch:I = 0x7f070134
 
-.field public static final ucrop_default_crop_frame_stoke_width:I = 0x7f070134
+.field public static final ucrop_default_crop_frame_stoke_width:I = 0x7f070136
 
-.field public static final ucrop_default_crop_grid_stoke_width:I = 0x7f070135
+.field public static final ucrop_default_crop_grid_stoke_width:I = 0x7f070137
 
-.field public static final ucrop_default_crop_logo_size:I = 0x7f070136
+.field public static final ucrop_default_crop_logo_size:I = 0x7f070138
 
-.field public static final ucrop_default_crop_rect_corner_touch_area_line_length:I = 0x7f070137
+.field public static final ucrop_default_crop_rect_corner_touch_area_line_length:I = 0x7f070139
 
-.field public static final ucrop_default_crop_rect_corner_touch_threshold:I = 0x7f070138
+.field public static final ucrop_default_crop_rect_corner_touch_threshold:I = 0x7f07013a
 
-.field public static final ucrop_default_crop_rect_min_size:I = 0x7f070139
+.field public static final ucrop_default_crop_rect_min_size:I = 0x7f07013b
 
-.field public static final ucrop_height_crop_aspect_ratio_text:I = 0x7f07013a
+.field public static final ucrop_height_crop_aspect_ratio_text:I = 0x7f07013c
 
-.field public static final ucrop_height_divider_shadow:I = 0x7f07013b
+.field public static final ucrop_height_divider_shadow:I = 0x7f07013d
 
-.field public static final ucrop_height_horizontal_wheel_progress_line:I = 0x7f07013c
+.field public static final ucrop_height_horizontal_wheel_progress_line:I = 0x7f07013e
 
-.field public static final ucrop_height_wrapper_controls:I = 0x7f07013d
+.field public static final ucrop_height_wrapper_controls:I = 0x7f07013f
 
-.field public static final ucrop_height_wrapper_states:I = 0x7f07013e
+.field public static final ucrop_height_wrapper_states:I = 0x7f070140
 
-.field public static final ucrop_margin_horizontal_wheel_progress_line:I = 0x7f07013f
+.field public static final ucrop_margin_horizontal_wheel_progress_line:I = 0x7f070141
 
-.field public static final ucrop_margit_top_widget_text:I = 0x7f070140
+.field public static final ucrop_margit_top_widget_text:I = 0x7f070142
 
-.field public static final ucrop_padding_crop_frame:I = 0x7f070141
+.field public static final ucrop_padding_crop_frame:I = 0x7f070143
 
-.field public static final ucrop_progress_size:I = 0x7f070142
+.field public static final ucrop_progress_size:I = 0x7f070144
 
-.field public static final ucrop_size_dot_scale_text_view:I = 0x7f070143
+.field public static final ucrop_size_dot_scale_text_view:I = 0x7f070145
 
-.field public static final ucrop_size_wrapper_rotate_button:I = 0x7f070144
+.field public static final ucrop_size_wrapper_rotate_button:I = 0x7f070146
 
-.field public static final ucrop_text_size_widget_text:I = 0x7f070145
+.field public static final ucrop_text_size_widget_text:I = 0x7f070147
 
-.field public static final ucrop_width_horizontal_wheel_progress_line:I = 0x7f070146
+.field public static final ucrop_width_horizontal_wheel_progress_line:I = 0x7f070148
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali
index 27c13beb2b..8e1c7b9ce7 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali
@@ -15,223 +15,223 @@
 
 
 # static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080017
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080017
+.field public static final abc_action_bar_item_background_material:I = 0x7f080018
 
-.field public static final abc_btn_borderless_material:I = 0x7f080018
+.field public static final abc_btn_borderless_material:I = 0x7f080019
 
-.field public static final abc_btn_check_material:I = 0x7f080019
+.field public static final abc_btn_check_material:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
 
-.field public static final abc_btn_colored_material:I = 0x7f08001c
+.field public static final abc_btn_colored_material:I = 0x7f08001d
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
 
-.field public static final abc_btn_radio_material:I = 0x7f08001e
+.field public static final abc_btn_radio_material:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080023
+.field public static final abc_cab_background_internal_bg:I = 0x7f080024
 
-.field public static final abc_cab_background_top_material:I = 0x7f080024
+.field public static final abc_cab_background_top_material:I = 0x7f080025
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
 
-.field public static final abc_control_background_material:I = 0x7f080026
+.field public static final abc_control_background_material:I = 0x7f080027
 
-.field public static final abc_dialog_material_background:I = 0x7f080027
+.field public static final abc_dialog_material_background:I = 0x7f080028
 
-.field public static final abc_edit_text_material:I = 0x7f080028
+.field public static final abc_edit_text_material:I = 0x7f080029
 
-.field public static final abc_ic_ab_back_material:I = 0x7f080029
+.field public static final abc_ic_ab_back_material:I = 0x7f08002a
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
 
-.field public static final abc_ic_clear_material:I = 0x7f08002b
+.field public static final abc_ic_clear_material:I = 0x7f08002c
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
 
-.field public static final abc_ic_search_api_material:I = 0x7f080034
+.field public static final abc_ic_search_api_material:I = 0x7f080035
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080035
+.field public static final abc_ic_star_black_16dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080036
+.field public static final abc_ic_star_black_36dp:I = 0x7f080037
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080037
+.field public static final abc_ic_star_black_48dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003c
+.field public static final abc_item_background_holo_dark:I = 0x7f08003d
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003d
+.field public static final abc_item_background_holo_light:I = 0x7f08003e
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
 
-.field public static final abc_list_focused_holo:I = 0x7f080040
+.field public static final abc_list_focused_holo:I = 0x7f080041
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080041
+.field public static final abc_list_longpressed_holo:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080043
+.field public static final abc_list_pressed_holo_light:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080048
+.field public static final abc_list_selector_holo_dark:I = 0x7f080049
 
-.field public static final abc_list_selector_holo_light:I = 0x7f080049
+.field public static final abc_list_selector_holo_light:I = 0x7f08004a
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_material:I = 0x7f08004d
+.field public static final abc_ratingbar_material:I = 0x7f08004e
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004e
+.field public static final abc_ratingbar_small_material:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080054
+.field public static final abc_seekbar_thumb_material:I = 0x7f080055
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
 
-.field public static final abc_seekbar_track_material:I = 0x7f080056
+.field public static final abc_seekbar_track_material:I = 0x7f080057
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
 
-.field public static final abc_switch_thumb_material:I = 0x7f080059
+.field public static final abc_switch_thumb_material:I = 0x7f08005a
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005b
+.field public static final abc_tab_indicator_material:I = 0x7f08005c
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
 
-.field public static final abc_text_cursor_material:I = 0x7f08005d
+.field public static final abc_text_cursor_material:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
 
-.field public static final abc_textfield_search_material:I = 0x7f080068
+.field public static final abc_textfield_search_material:I = 0x7f080069
 
-.field public static final abc_vector_test:I = 0x7f080069
+.field public static final abc_vector_test:I = 0x7f08006a
 
-.field public static final notification_action_background:I = 0x7f08043c
+.field public static final notification_action_background:I = 0x7f080457
 
-.field public static final notification_bg:I = 0x7f08043d
+.field public static final notification_bg:I = 0x7f080458
 
-.field public static final notification_bg_low:I = 0x7f08043e
+.field public static final notification_bg_low:I = 0x7f080459
 
-.field public static final notification_bg_low_normal:I = 0x7f08043f
+.field public static final notification_bg_low_normal:I = 0x7f08045a
 
-.field public static final notification_bg_low_pressed:I = 0x7f080440
+.field public static final notification_bg_low_pressed:I = 0x7f08045b
 
-.field public static final notification_bg_normal:I = 0x7f080441
+.field public static final notification_bg_normal:I = 0x7f08045c
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080442
+.field public static final notification_bg_normal_pressed:I = 0x7f08045d
 
-.field public static final notification_icon_background:I = 0x7f080443
+.field public static final notification_icon_background:I = 0x7f08045e
 
-.field public static final notification_template_icon_bg:I = 0x7f080444
+.field public static final notification_template_icon_bg:I = 0x7f08045f
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080445
+.field public static final notification_template_icon_low_bg:I = 0x7f080460
 
-.field public static final notification_tile_bg:I = 0x7f080446
+.field public static final notification_tile_bg:I = 0x7f080461
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080447
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080462
 
-.field public static final tooltip_frame_dark:I = 0x7f08044c
+.field public static final tooltip_frame_dark:I = 0x7f08046a
 
-.field public static final tooltip_frame_light:I = 0x7f08044d
+.field public static final tooltip_frame_light:I = 0x7f08046b
 
-.field public static final ucrop_ic_angle:I = 0x7f08044f
+.field public static final ucrop_ic_angle:I = 0x7f08046d
 
-.field public static final ucrop_ic_crop:I = 0x7f080450
+.field public static final ucrop_ic_crop:I = 0x7f08046e
 
-.field public static final ucrop_ic_cross:I = 0x7f080451
+.field public static final ucrop_ic_cross:I = 0x7f08046f
 
-.field public static final ucrop_ic_done:I = 0x7f080452
+.field public static final ucrop_ic_done:I = 0x7f080470
 
-.field public static final ucrop_ic_next:I = 0x7f080453
+.field public static final ucrop_ic_next:I = 0x7f080471
 
-.field public static final ucrop_ic_reset:I = 0x7f080454
+.field public static final ucrop_ic_reset:I = 0x7f080472
 
-.field public static final ucrop_ic_rotate:I = 0x7f080455
+.field public static final ucrop_ic_rotate:I = 0x7f080473
 
-.field public static final ucrop_ic_scale:I = 0x7f080456
+.field public static final ucrop_ic_scale:I = 0x7f080474
 
-.field public static final ucrop_shadow_upside:I = 0x7f080457
+.field public static final ucrop_shadow_upside:I = 0x7f080475
 
-.field public static final ucrop_vector_ic_crop:I = 0x7f080458
+.field public static final ucrop_vector_ic_crop:I = 0x7f080476
 
-.field public static final ucrop_vector_loader:I = 0x7f080459
+.field public static final ucrop_vector_loader:I = 0x7f080477
 
-.field public static final ucrop_vector_loader_animated:I = 0x7f08045a
+.field public static final ucrop_vector_loader_animated:I = 0x7f080478
 
 
 # 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 2f2e78ede9..d48ef3258b 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$d.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$d.smali
@@ -57,219 +57,219 @@
 
 .field public static final alertTitle:I = 0x7f0a0061
 
-.field public static final async:I = 0x7f0a0080
+.field public static final async:I = 0x7f0a0081
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
-.field public static final bottom:I = 0x7f0a0105
+.field public static final bottom:I = 0x7f0a0106
 
-.field public static final buttonPanel:I = 0x7f0a010c
+.field public static final buttonPanel:I = 0x7f0a010d
 
-.field public static final checkbox:I = 0x7f0a0212
+.field public static final checkbox:I = 0x7f0a0213
 
-.field public static final chronometer:I = 0x7f0a0216
+.field public static final chronometer:I = 0x7f0a0217
 
-.field public static final contentPanel:I = 0x7f0a0233
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final custom:I = 0x7f0a0247
+.field public static final custom:I = 0x7f0a0250
 
-.field public static final customPanel:I = 0x7f0a0248
+.field public static final customPanel:I = 0x7f0a0251
 
-.field public static final decor_content_parent:I = 0x7f0a024c
+.field public static final decor_content_parent:I = 0x7f0a0255
 
-.field public static final default_activity_button:I = 0x7f0a024d
+.field public static final default_activity_button:I = 0x7f0a0256
 
-.field public static final edit_query:I = 0x7f0a02a3
+.field public static final edit_query:I = 0x7f0a02ac
 
-.field public static final end:I = 0x7f0a02be
+.field public static final end:I = 0x7f0a02c7
 
-.field public static final expand_activities_button:I = 0x7f0a02c4
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02c5
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final forever:I = 0x7f0a02e7
+.field public static final forever:I = 0x7f0a02f0
 
-.field public static final home:I = 0x7f0a0382
+.field public static final home:I = 0x7f0a0392
 
-.field public static final icon:I = 0x7f0a0384
+.field public static final icon:I = 0x7f0a0394
 
-.field public static final icon_group:I = 0x7f0a0385
+.field public static final icon_group:I = 0x7f0a0395
 
-.field public static final image:I = 0x7f0a0388
+.field public static final image:I = 0x7f0a0398
 
-.field public static final image_view_crop:I = 0x7f0a038a
+.field public static final image_view_crop:I = 0x7f0a039a
 
-.field public static final image_view_logo:I = 0x7f0a038b
+.field public static final image_view_logo:I = 0x7f0a039b
 
-.field public static final image_view_state_aspect_ratio:I = 0x7f0a038c
+.field public static final image_view_state_aspect_ratio:I = 0x7f0a039c
 
-.field public static final image_view_state_rotate:I = 0x7f0a038d
+.field public static final image_view_state_rotate:I = 0x7f0a039d
 
-.field public static final image_view_state_scale:I = 0x7f0a038e
+.field public static final image_view_state_scale:I = 0x7f0a039e
 
-.field public static final info:I = 0x7f0a039a
+.field public static final info:I = 0x7f0a03aa
 
-.field public static final italic:I = 0x7f0a03c7
+.field public static final italic:I = 0x7f0a03d7
 
-.field public static final layout_aspect_ratio:I = 0x7f0a0405
+.field public static final layout_aspect_ratio:I = 0x7f0a0415
 
-.field public static final layout_rotate_wheel:I = 0x7f0a0406
+.field public static final layout_rotate_wheel:I = 0x7f0a0416
 
-.field public static final layout_scale_wheel:I = 0x7f0a0407
+.field public static final layout_scale_wheel:I = 0x7f0a0417
 
-.field public static final left:I = 0x7f0a0408
+.field public static final left:I = 0x7f0a0418
 
-.field public static final line1:I = 0x7f0a040a
+.field public static final line1:I = 0x7f0a041a
 
-.field public static final line3:I = 0x7f0a040b
+.field public static final line3:I = 0x7f0a041b
 
-.field public static final listMode:I = 0x7f0a040d
+.field public static final listMode:I = 0x7f0a041d
 
-.field public static final list_item:I = 0x7f0a040e
+.field public static final list_item:I = 0x7f0a041e
 
-.field public static final menu_crop:I = 0x7f0a044b
+.field public static final menu_crop:I = 0x7f0a045b
 
-.field public static final menu_loader:I = 0x7f0a0457
+.field public static final menu_loader:I = 0x7f0a0467
 
-.field public static final message:I = 0x7f0a046f
+.field public static final message:I = 0x7f0a0482
 
-.field public static final multiply:I = 0x7f0a0477
+.field public static final multiply:I = 0x7f0a048a
 
-.field public static final none:I = 0x7f0a048c
+.field public static final none:I = 0x7f0a049f
 
-.field public static final normal:I = 0x7f0a048d
+.field public static final normal:I = 0x7f0a04a0
 
-.field public static final notification_background:I = 0x7f0a0494
+.field public static final notification_background:I = 0x7f0a04aa
 
-.field public static final notification_main_column:I = 0x7f0a0495
+.field public static final notification_main_column:I = 0x7f0a04ab
 
-.field public static final notification_main_column_container:I = 0x7f0a0496
+.field public static final notification_main_column_container:I = 0x7f0a04ac
 
-.field public static final parentPanel:I = 0x7f0a04c3
+.field public static final parentPanel:I = 0x7f0a04d9
 
-.field public static final progress_circular:I = 0x7f0a0543
+.field public static final progress_circular:I = 0x7f0a0553
 
-.field public static final progress_horizontal:I = 0x7f0a0545
+.field public static final progress_horizontal:I = 0x7f0a0555
 
-.field public static final radio:I = 0x7f0a0550
+.field public static final radio:I = 0x7f0a0560
 
-.field public static final right:I = 0x7f0a056a
+.field public static final right:I = 0x7f0a0584
 
-.field public static final right_icon:I = 0x7f0a056b
+.field public static final right_icon:I = 0x7f0a0585
 
-.field public static final right_side:I = 0x7f0a056c
+.field public static final right_side:I = 0x7f0a0586
 
-.field public static final rotate_scroll_wheel:I = 0x7f0a0593
+.field public static final rotate_scroll_wheel:I = 0x7f0a05ad
 
-.field public static final scale_scroll_wheel:I = 0x7f0a0599
+.field public static final scale_scroll_wheel:I = 0x7f0a05b3
 
-.field public static final screen:I = 0x7f0a059a
+.field public static final screen:I = 0x7f0a05b4
 
-.field public static final scrollIndicatorDown:I = 0x7f0a059c
+.field public static final scrollIndicatorDown:I = 0x7f0a05b6
 
-.field public static final scrollIndicatorUp:I = 0x7f0a059d
+.field public static final scrollIndicatorUp:I = 0x7f0a05b7
 
-.field public static final scrollView:I = 0x7f0a059e
+.field public static final scrollView:I = 0x7f0a05b8
 
-.field public static final search_badge:I = 0x7f0a05a2
+.field public static final search_badge:I = 0x7f0a05bc
 
-.field public static final search_bar:I = 0x7f0a05a3
+.field public static final search_bar:I = 0x7f0a05bd
 
-.field public static final search_button:I = 0x7f0a05a4
+.field public static final search_button:I = 0x7f0a05be
 
-.field public static final search_close_btn:I = 0x7f0a05a6
+.field public static final search_close_btn:I = 0x7f0a05c0
 
-.field public static final search_edit_frame:I = 0x7f0a05a7
+.field public static final search_edit_frame:I = 0x7f0a05c1
 
-.field public static final search_go_btn:I = 0x7f0a05aa
+.field public static final search_go_btn:I = 0x7f0a05c4
 
-.field public static final search_mag_icon:I = 0x7f0a05ac
+.field public static final search_mag_icon:I = 0x7f0a05c6
 
-.field public static final search_plate:I = 0x7f0a05ad
+.field public static final search_plate:I = 0x7f0a05c7
 
-.field public static final search_src_text:I = 0x7f0a05b0
+.field public static final search_src_text:I = 0x7f0a05ca
 
-.field public static final search_voice_btn:I = 0x7f0a05bc
+.field public static final search_voice_btn:I = 0x7f0a05d6
 
-.field public static final select_dialog_listview:I = 0x7f0a05bd
+.field public static final select_dialog_listview:I = 0x7f0a05d7
 
-.field public static final shortcut:I = 0x7f0a06f7
+.field public static final shortcut:I = 0x7f0a0711
 
-.field public static final spacer:I = 0x7f0a0703
+.field public static final spacer:I = 0x7f0a071d
 
-.field public static final split_action_bar:I = 0x7f0a0704
+.field public static final split_action_bar:I = 0x7f0a0724
 
-.field public static final src_atop:I = 0x7f0a0707
+.field public static final src_atop:I = 0x7f0a0727
 
-.field public static final src_in:I = 0x7f0a0708
+.field public static final src_in:I = 0x7f0a0728
 
-.field public static final src_over:I = 0x7f0a0709
+.field public static final src_over:I = 0x7f0a0729
 
-.field public static final start:I = 0x7f0a070c
+.field public static final start:I = 0x7f0a072c
 
-.field public static final state_aspect_ratio:I = 0x7f0a070d
+.field public static final state_aspect_ratio:I = 0x7f0a072d
 
-.field public static final state_rotate:I = 0x7f0a070e
+.field public static final state_rotate:I = 0x7f0a072e
 
-.field public static final state_scale:I = 0x7f0a070f
+.field public static final state_scale:I = 0x7f0a072f
 
-.field public static final submenuarrow:I = 0x7f0a0724
+.field public static final submenuarrow:I = 0x7f0a074d
 
-.field public static final submit_area:I = 0x7f0a0725
+.field public static final submit_area:I = 0x7f0a074e
 
-.field public static final tabMode:I = 0x7f0a0731
+.field public static final tabMode:I = 0x7f0a075a
 
-.field public static final tag_transition_group:I = 0x7f0a0737
+.field public static final tag_transition_group:I = 0x7f0a0760
 
-.field public static final text:I = 0x7f0a073f
+.field public static final text:I = 0x7f0a0768
 
-.field public static final text2:I = 0x7f0a0740
+.field public static final text2:I = 0x7f0a0769
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0741
+.field public static final textSpacerNoButtons:I = 0x7f0a076a
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0742
+.field public static final textSpacerNoTitle:I = 0x7f0a076b
 
-.field public static final text_view_rotate:I = 0x7f0a0746
+.field public static final text_view_rotate:I = 0x7f0a076f
 
-.field public static final text_view_scale:I = 0x7f0a0747
+.field public static final text_view_scale:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a074e
+.field public static final time:I = 0x7f0a0777
 
-.field public static final title:I = 0x7f0a074f
+.field public static final title:I = 0x7f0a0778
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0750
+.field public static final titleDividerNoCustom:I = 0x7f0a0779
 
-.field public static final title_template:I = 0x7f0a0751
+.field public static final title_template:I = 0x7f0a077a
 
-.field public static final toolbar:I = 0x7f0a0752
+.field public static final toolbar:I = 0x7f0a077b
 
-.field public static final toolbar_title:I = 0x7f0a0754
+.field public static final toolbar_title:I = 0x7f0a077d
 
-.field public static final top:I = 0x7f0a0756
+.field public static final top:I = 0x7f0a077f
 
-.field public static final topPanel:I = 0x7f0a0757
+.field public static final topPanel:I = 0x7f0a0780
 
-.field public static final ucrop:I = 0x7f0a0763
+.field public static final ucrop:I = 0x7f0a078c
 
-.field public static final ucrop_frame:I = 0x7f0a0764
+.field public static final ucrop_frame:I = 0x7f0a078d
 
-.field public static final ucrop_photobox:I = 0x7f0a0765
+.field public static final ucrop_photobox:I = 0x7f0a078e
 
-.field public static final uniform:I = 0x7f0a076a
+.field public static final uniform:I = 0x7f0a0793
 
-.field public static final up:I = 0x7f0a076d
+.field public static final up:I = 0x7f0a0796
 
-.field public static final view_overlay:I = 0x7f0a07dc
+.field public static final view_overlay:I = 0x7f0a0819
 
-.field public static final wrap_content:I = 0x7f0a082e
+.field public static final wrap_content:I = 0x7f0a086b
 
-.field public static final wrapper_controls:I = 0x7f0a0830
+.field public static final wrapper_controls:I = 0x7f0a086d
 
-.field public static final wrapper_reset_rotate:I = 0x7f0a0831
+.field public static final wrapper_reset_rotate:I = 0x7f0a086e
 
-.field public static final wrapper_rotate_by_angle:I = 0x7f0a0832
+.field public static final wrapper_rotate_by_angle:I = 0x7f0a086f
 
-.field public static final wrapper_states:I = 0x7f0a0833
+.field public static final wrapper_states:I = 0x7f0a0870
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$e.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$e.smali
index 8cd8fc620c..304b4fa430 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$e.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$e.smali
@@ -69,39 +69,39 @@
 
 .field public static final abc_tooltip:I = 0x7f0d001b
 
-.field public static final notification_action:I = 0x7f0d0041
+.field public static final notification_action:I = 0x7f0d0043
 
-.field public static final notification_action_tombstone:I = 0x7f0d0042
+.field public static final notification_action_tombstone:I = 0x7f0d0044
 
-.field public static final notification_template_custom_big:I = 0x7f0d0049
+.field public static final notification_template_custom_big:I = 0x7f0d004b
 
-.field public static final notification_template_icon_group:I = 0x7f0d004a
+.field public static final notification_template_icon_group:I = 0x7f0d004c
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d004e
+.field public static final notification_template_part_chronometer:I = 0x7f0d0050
 
-.field public static final notification_template_part_time:I = 0x7f0d004f
+.field public static final notification_template_part_time:I = 0x7f0d0051
 
-.field public static final select_dialog_item_material:I = 0x7f0d005d
+.field public static final select_dialog_item_material:I = 0x7f0d005f
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d005e
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0060
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d005f
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d0061
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0066
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0069
 
-.field public static final ucrop_activity_photobox:I = 0x7f0d006a
+.field public static final ucrop_activity_photobox:I = 0x7f0d006d
 
-.field public static final ucrop_aspect_ratio:I = 0x7f0d006b
+.field public static final ucrop_aspect_ratio:I = 0x7f0d006e
 
-.field public static final ucrop_controls:I = 0x7f0d006c
+.field public static final ucrop_controls:I = 0x7f0d006f
 
-.field public static final ucrop_fragment_photobox:I = 0x7f0d006d
+.field public static final ucrop_fragment_photobox:I = 0x7f0d0070
 
-.field public static final ucrop_layout_rotate_wheel:I = 0x7f0d006e
+.field public static final ucrop_layout_rotate_wheel:I = 0x7f0d0071
 
-.field public static final ucrop_layout_scale_wheel:I = 0x7f0d006f
+.field public static final ucrop_layout_scale_wheel:I = 0x7f0d0072
 
-.field public static final ucrop_view:I = 0x7f0d0070
+.field public static final ucrop_view:I = 0x7f0d0073
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$f.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$f.smali
index 0340ed18bd..5ed88c5389 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$f.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$f.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final ucrop_menu_activity:I = 0x7f0e0020
+.field public static final ucrop_menu_activity:I = 0x7f0e0021
 
 
 # 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 2b278071c4..2a602c9e76 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali
@@ -73,19 +73,19 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f12002a
 
-.field public static final search_menu_title:I = 0x7f120fa3
+.field public static final search_menu_title:I = 0x7f120fdd
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f12106c
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210a9
 
-.field public static final ucrop_error_input_data_is_absent:I = 0x7f121195
+.field public static final ucrop_error_input_data_is_absent:I = 0x7f1211d9
 
-.field public static final ucrop_label_edit_photo:I = 0x7f121196
+.field public static final ucrop_label_edit_photo:I = 0x7f1211da
 
-.field public static final ucrop_label_original:I = 0x7f121197
+.field public static final ucrop_label_original:I = 0x7f1211db
 
-.field public static final ucrop_menu_crop:I = 0x7f121198
+.field public static final ucrop_menu_crop:I = 0x7f1211dc
 
-.field public static final ucrop_mutate_exception_hint:I = 0x7f121199
+.field public static final ucrop_mutate_exception_hint:I = 0x7f1211dd
 
 
 # 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 53530f5a22..ec295f7d5b 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$h.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$h.smali
@@ -1084,7 +1084,7 @@
 
     new-array v1, v1, [I
 
-    const v2, 0x7f040305
+    const v2, 0x7f040308
 
     aput v2, v1, v3
 
@@ -1173,76 +1173,76 @@
         0x7f04004c
         0x7f04004e
         0x7f04004f
-        0x7f0400c8
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f0400e9
-        0x7f040103
+        0x7f0400ce
+        0x7f0400ea
         0x7f040104
-        0x7f040112
-        0x7f040156
-        0x7f04015b
-        0x7f040162
-        0x7f040163
-        0x7f0401c7
-        0x7f0401ea
-        0x7f0401f4
-        0x7f040257
-        0x7f040273
-        0x7f04028b
-        0x7f0402b9
-        0x7f0402ba
-        0x7f040313
+        0x7f040105
+        0x7f040114
+        0x7f040158
+        0x7f04015d
+        0x7f040164
+        0x7f040165
+        0x7f0401c9
+        0x7f0401ec
+        0x7f0401f6
+        0x7f04025a
+        0x7f040276
+        0x7f04028e
+        0x7f0402bc
+        0x7f0402bd
         0x7f040316
-        0x7f0403af
-        0x7f0403b9
+        0x7f040319
+        0x7f0403b2
+        0x7f0403bc
     .end array-data
 
     :array_1
     .array-data 4
         0x7f04004c
         0x7f04004e
-        0x7f0400ac
-        0x7f040156
-        0x7f040316
-        0x7f0403b9
+        0x7f0400ad
+        0x7f040158
+        0x7f040319
+        0x7f0403bc
     .end array-data
 
     :array_2
     .array-data 4
-        0x7f040118
-        0x7f0401eb
+        0x7f04011a
+        0x7f0401ed
     .end array-data
 
     :array_3
     .array-data 4
         0x10100f2
-        0x7f04007a
         0x7f04007b
-        0x7f04024e
-        0x7f04024f
-        0x7f040270
-        0x7f0402f8
-        0x7f0402f9
+        0x7f04007c
+        0x7f040251
+        0x7f040252
+        0x7f040273
+        0x7f0402fb
+        0x7f0402fc
     .end array-data
 
     :array_4
     .array-data 4
         0x1010119
-        0x7f040303
-        0x7f0403ad
-        0x7f0403ae
+        0x7f040306
+        0x7f0403b0
+        0x7f0403b1
     .end array-data
 
     :array_5
     .array-data 4
         0x1010142
-        0x7f0403aa
-        0x7f0403ab
-        0x7f0403ac
+        0x7f0403ad
+        0x7f0403ae
+        0x7f0403af
     .end array-data
 
     :array_6
@@ -1264,11 +1264,11 @@
         0x7f040048
         0x7f040049
         0x7f04004a
-        0x7f040131
-        0x7f04013f
-        0x7f0401fd
-        0x7f04024a
-        0x7f040339
+        0x7f040133
+        0x7f040141
+        0x7f0401ff
+        0x7f04024d
+        0x7f04033c
     .end array-data
 
     :array_8
@@ -1311,17 +1311,16 @@
         0x7f04002b
         0x7f04002c
         0x7f040044
-        0x7f040065
-        0x7f040074
+        0x7f040066
         0x7f040075
         0x7f040076
         0x7f040077
         0x7f040078
-        0x7f04007d
+        0x7f040079
         0x7f04007e
-        0x7f04008c
-        0x7f040091
-        0x7f0400b2
+        0x7f04007f
+        0x7f04008d
+        0x7f040092
         0x7f0400b3
         0x7f0400b4
         0x7f0400b5
@@ -1329,71 +1328,72 @@
         0x7f0400b7
         0x7f0400b8
         0x7f0400b9
-        0x7f0400bc
-        0x7f0400c1
-        0x7f0400d4
-        0x7f040100
+        0x7f0400ba
+        0x7f0400bd
+        0x7f0400c2
+        0x7f0400d5
         0x7f040101
         0x7f040102
-        0x7f040108
-        0x7f04010a
-        0x7f04010d
-        0x7f04010e
+        0x7f040103
+        0x7f040109
+        0x7f04010b
         0x7f04010f
         0x7f040110
         0x7f040111
-        0x7f040162
-        0x7f0401d2
-        0x7f04024c
-        0x7f04024d
+        0x7f040112
+        0x7f040113
+        0x7f040164
+        0x7f0401d4
+        0x7f04024f
         0x7f040250
-        0x7f040251
-        0x7f040252
         0x7f040253
         0x7f040254
         0x7f040255
         0x7f040256
-        0x7f040280
-        0x7f040281
-        0x7f040282
-        0x7f04028a
-        0x7f04028c
-        0x7f0402bf
+        0x7f040257
+        0x7f040258
+        0x7f040259
+        0x7f040283
+        0x7f040284
+        0x7f040285
+        0x7f04028d
+        0x7f04028f
         0x7f0402c2
-        0x7f0402c3
-        0x7f0402c4
-        0x7f0402eb
-        0x7f0402ed
+        0x7f0402c5
+        0x7f0402c6
+        0x7f0402c7
         0x7f0402ee
-        0x7f0402ef
-        0x7f040300
-        0x7f040301
-        0x7f04031a
-        0x7f040344
-        0x7f040345
-        0x7f040346
+        0x7f0402f0
+        0x7f0402f1
+        0x7f0402f2
+        0x7f040303
+        0x7f040304
+        0x7f04031d
         0x7f040347
+        0x7f040348
         0x7f040349
         0x7f04034a
-        0x7f04034b
         0x7f04034c
+        0x7f04034d
+        0x7f04034e
         0x7f04034f
-        0x7f040350
-        0x7f0403bb
-        0x7f0403bc
-        0x7f0403bd
+        0x7f040352
+        0x7f040353
         0x7f0403be
-        0x7f0403dc
-        0x7f0403df
-        0x7f0403e0
+        0x7f0403bf
+        0x7f0403c0
+        0x7f0403c1
         0x7f0403e1
-        0x7f0403e2
-        0x7f0403e3
         0x7f0403e4
         0x7f0403e5
         0x7f0403e6
         0x7f0403e7
         0x7f0403e8
+        0x7f0403e9
+        0x7f0403ea
+        0x7f0403eb
+        0x7f0403ec
+        0x7f0403ed
     .end array-data
 
     :array_9
@@ -1406,25 +1406,25 @@
     :array_a
     .array-data 4
         0x1010107
-        0x7f04007f
         0x7f040080
+        0x7f040081
     .end array-data
 
     :array_b
     .array-data 4
-        0x7f0401fb
-        0x7f04030a
+        0x7f0401fd
+        0x7f04030d
     .end array-data
 
     :array_c
     .array-data 4
         0x10100b3
-        0x7f040201
-        0x7f040202
         0x7f040203
-        0x7f04022f
-        0x7f04023b
-        0x7f04023c
+        0x7f040204
+        0x7f040205
+        0x7f040231
+        0x7f04023d
+        0x7f04023e
     .end array-data
 
     :array_d
@@ -1432,21 +1432,21 @@
         0x7f04003b
         0x7f04003c
         0x7f040052
-        0x7f0400b1
-        0x7f04010b
-        0x7f04014a
-        0x7f0402ff
-        0x7f0403a6
+        0x7f0400b2
+        0x7f04010c
+        0x7f04014c
+        0x7f040302
+        0x7f0403a9
     .end array-data
 
     :array_e
     .array-data 4
-        0x7f040140
-        0x7f040141
         0x7f040142
         0x7f040143
         0x7f040144
         0x7f040145
+        0x7f040146
+        0x7f040147
     .end array-data
 
     :array_f
@@ -1456,11 +1456,11 @@
         0x101053f
         0x101056f
         0x1010570
-        0x7f04013e
-        0x7f040146
-        0x7f040147
+        0x7f040140
         0x7f040148
-        0x7f0403c3
+        0x7f040149
+        0x7f04014a
+        0x7f0403c6
     .end array-data
 
     :array_10
@@ -1470,10 +1470,10 @@
         0x1010126
         0x1010127
         0x1010128
-        0x7f040104
-        0x7f040109
-        0x7f04026e
-        0x7f0402f5
+        0x7f040105
+        0x7f04010a
+        0x7f040271
+        0x7f0402f8
     .end array-data
 
     :array_11
@@ -1519,12 +1519,12 @@
         0x7f04001f
         0x7f040020
         0x7f040031
-        0x7f0400c7
-        0x7f0401cd
-        0x7f0401ce
-        0x7f040277
-        0x7f0402f1
-        0x7f0403bf
+        0x7f0400c8
+        0x7f0401cf
+        0x7f0401d0
+        0x7f04027a
+        0x7f0402f4
+        0x7f0403c2
     .end array-data
 
     :array_15
@@ -1536,21 +1536,21 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04028d
-        0x7f040311
+        0x7f040290
+        0x7f040314
     .end array-data
 
     :array_16
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040278
+        0x7f04027b
     .end array-data
 
     :array_17
     .array-data 4
-        0x7f04027c
         0x7f04027f
+        0x7f040282
     .end array-data
 
     :array_18
@@ -1559,19 +1559,19 @@
         0x101011f
         0x1010220
         0x1010264
-        0x7f0400a5
-        0x7f0400c2
-        0x7f0400ff
-        0x7f04014f
-        0x7f0401cf
-        0x7f0401fe
-        0x7f0402bd
-        0x7f0402be
-        0x7f0402e9
-        0x7f0402ea
-        0x7f040312
-        0x7f040317
-        0x7f0403dd
+        0x7f0400a6
+        0x7f0400c3
+        0x7f040100
+        0x7f040151
+        0x7f0401d1
+        0x7f040200
+        0x7f0402c0
+        0x7f0402c1
+        0x7f0402ec
+        0x7f0402ed
+        0x7f040315
+        0x7f04031a
+        0x7f0403e2
     .end array-data
 
     :array_19
@@ -1580,7 +1580,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_1a
@@ -1588,17 +1588,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f0402f7
-        0x7f040302
-        0x7f040318
-        0x7f040319
+        0x7f0402fa
+        0x7f040305
         0x7f04031b
-        0x7f0403a7
-        0x7f0403a8
-        0x7f0403a9
-        0x7f0403c0
-        0x7f0403c1
-        0x7f0403c2
+        0x7f04031c
+        0x7f04031e
+        0x7f0403aa
+        0x7f0403ab
+        0x7f0403ac
+        0x7f0403c3
+        0x7f0403c4
+        0x7f0403c5
     .end array-data
 
     :array_1b
@@ -1614,50 +1614,50 @@
         0x1010163
         0x1010164
         0x10103ac
-        0x7f04013f
-        0x7f040339
+        0x7f040141
+        0x7f04033c
     .end array-data
 
     :array_1c
     .array-data 4
         0x10100af
         0x1010140
-        0x7f040079
-        0x7f0400ad
+        0x7f04007a
         0x7f0400ae
-        0x7f0400c8
+        0x7f0400af
         0x7f0400c9
         0x7f0400ca
         0x7f0400cb
         0x7f0400cc
         0x7f0400cd
-        0x7f040257
-        0x7f040258
-        0x7f04026b
-        0x7f040271
-        0x7f040272
-        0x7f04028b
-        0x7f040313
-        0x7f040314
-        0x7f040315
-        0x7f0403af
-        0x7f0403b1
+        0x7f0400ce
+        0x7f04025a
+        0x7f04025b
+        0x7f04026e
+        0x7f040274
+        0x7f040275
+        0x7f04028e
+        0x7f040316
+        0x7f040317
+        0x7f040318
         0x7f0403b2
-        0x7f0403b3
         0x7f0403b4
         0x7f0403b5
         0x7f0403b6
         0x7f0403b7
         0x7f0403b8
+        0x7f0403b9
+        0x7f0403ba
+        0x7f0403bb
     .end array-data
 
     :array_1d
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04027d
-        0x7f04027e
-        0x7f040355
+        0x7f040280
+        0x7f040281
+        0x7f040358
     .end array-data
 
     :array_1e
@@ -1676,16 +1676,13 @@
 
     :array_20
     .array-data 4
-        0x7f0403c7
-        0x7f0403c8
-        0x7f0403c9
+        0x7f0403ca
+        0x7f0403cb
+        0x7f0403cc
     .end array-data
 
     :array_21
     .array-data 4
-        0x7f0403ca
-        0x7f0403cb
-        0x7f0403cc
         0x7f0403cd
         0x7f0403ce
         0x7f0403cf
@@ -1696,6 +1693,9 @@
         0x7f0403d4
         0x7f0403d5
         0x7f0403d6
+        0x7f0403d7
+        0x7f0403d8
+        0x7f0403d9
     .end array-data
 .end method
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$1.smali b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$1.smali
index a452226d5d..7a37509bc8 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$1.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bbW:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic bcq:Lcom/yalantis/ucrop/UCropActivity;
 
 
 # direct methods
 .method constructor <init>(Lcom/yalantis/ucrop/UCropActivity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,10 +34,10 @@
 
 
 # virtual methods
-.method public final Cq()V
+.method public final Ch()V
     .locals 3
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->a(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/UCropView;
 
@@ -65,7 +65,7 @@
 
     invoke-virtual {v0, v1}, Landroid/view/ViewPropertyAnimator;->setInterpolator(Landroid/animation/TimeInterpolator;)Landroid/view/ViewPropertyAnimator;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->b(Lcom/yalantis/ucrop/UCropActivity;)Landroid/view/View;
 
@@ -75,11 +75,11 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setClickable(Z)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->c(Lcom/yalantis/ucrop/UCropActivity;)Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-virtual {v0}, Lcom/yalantis/ucrop/UCropActivity;->supportInvalidateOptionsMenu()V
 
@@ -89,31 +89,31 @@
 .method public final h(Ljava/lang/Exception;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-virtual {v0, p1}, Lcom/yalantis/ucrop/UCropActivity;->l(Ljava/lang/Throwable;)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-virtual {p1}, Lcom/yalantis/ucrop/UCropActivity;->finish()V
 
     return-void
 .end method
 
+.method public final u(F)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bcq:Lcom/yalantis/ucrop/UCropActivity;
+
+    invoke-static {v0, p1}, Lcom/yalantis/ucrop/UCropActivity;->a(Lcom/yalantis/ucrop/UCropActivity;F)V
+
+    return-void
+.end method
+
 .method public final v(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bbW:Lcom/yalantis/ucrop/UCropActivity;
-
-    invoke-static {v0, p1}, Lcom/yalantis/ucrop/UCropActivity;->a(Lcom/yalantis/ucrop/UCropActivity;F)V
-
-    return-void
-.end method
-
-.method public final w(F)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0, p1}, Lcom/yalantis/ucrop/UCropActivity;->b(Lcom/yalantis/ucrop/UCropActivity;F)V
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$2.smali b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$2.smali
index 6bf46f7b5a..ea4ee3ed0d 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$2.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bbW:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic bcq:Lcom/yalantis/ucrop/UCropActivity;
 
 
 # direct methods
 .method constructor <init>(Lcom/yalantis/ucrop/UCropActivity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$2;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$2;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -61,7 +61,7 @@
 
     if-eqz v3, :cond_1
 
-    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->NS:F
+    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->Ok:F
 
     const/4 v4, 0x0
 
@@ -69,31 +69,31 @@
 
     if-eqz v3, :cond_0
 
-    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbY:F
+    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bcs:F
 
-    iget v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbZ:F
+    iget v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bct:F
 
-    iput v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbY:F
+    iput v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bcs:F
 
-    iput v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbZ:F
+    iput v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bct:F
 
-    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbY:F
+    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bcs:F
 
-    iget v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbZ:F
+    iget v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bct:F
 
     div-float/2addr v3, v4
 
-    iput v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->NS:F
+    iput v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->Ok:F
 
     :cond_0
-    invoke-virtual {v1}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->CD()V
+    invoke-virtual {v1}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->Cu()V
 
     :cond_1
-    iget v1, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->NS:F
+    iget v1, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->Ok:F
 
     invoke-virtual {v0, v1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setTargetAspectRatio(F)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -109,7 +109,7 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->e(Lcom/yalantis/ucrop/UCropActivity;)Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$3.smali b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$3.smali
index 70bc4bd899..824f5d2525 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$3.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$3.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bbW:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic bcq:Lcom/yalantis/ucrop/UCropActivity;
 
 
 # direct methods
 .method constructor <init>(Lcom/yalantis/ucrop/UCropActivity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$3;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$3;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,28 +34,10 @@
 
 
 # virtual methods
-.method public final A(F)V
+.method public final Ci()V
     .locals 2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->bbW:Lcom/yalantis/ucrop/UCropActivity;
-
-    invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
-
-    move-result-object v0
-
-    const/high16 v1, 0x42280000    # 42.0f
-
-    div-float/2addr p1, v1
-
-    invoke-virtual {v0, p1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->C(F)V
-
-    return-void
-.end method
-
-.method public final Cr()V
-    .locals 2
-
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -68,16 +50,34 @@
     return-void
 .end method
 
-.method public final Cs()V
+.method public final Cj()V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->Cz()V
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->Cq()V
+
+    return-void
+.end method
+
+.method public final w(F)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->bcq:Lcom/yalantis/ucrop/UCropActivity;
+
+    invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
+
+    move-result-object v0
+
+    const/high16 v1, 0x42280000    # 42.0f
+
+    div-float/2addr p1, v1
+
+    invoke-virtual {v0, p1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->B(F)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$4.smali b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$4.smali
index 47851a4504..7926fb2946 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$4.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$4.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bbW:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic bcq:Lcom/yalantis/ucrop/UCropActivity;
 
 
 # direct methods
 .method constructor <init>(Lcom/yalantis/ucrop/UCropActivity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$4;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$4;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     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/yalantis/ucrop/UCropActivity$4;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$4;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {p1}, Lcom/yalantis/ucrop/UCropActivity;->f(Lcom/yalantis/ucrop/UCropActivity;)V
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$5.smali b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$5.smali
index 0139b04519..0ed43200a5 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$5.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$5.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bbW:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic bcq:Lcom/yalantis/ucrop/UCropActivity;
 
 
 # direct methods
 .method constructor <init>(Lcom/yalantis/ucrop/UCropActivity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$5;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$5;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     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/yalantis/ucrop/UCropActivity$5;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$5;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {p1}, Lcom/yalantis/ucrop/UCropActivity;->g(Lcom/yalantis/ucrop/UCropActivity;)V
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$6.smali b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$6.smali
index f41766a2af..36df376eb0 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$6.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$6.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bbW:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic bcq:Lcom/yalantis/ucrop/UCropActivity;
 
 
 # direct methods
 .method constructor <init>(Lcom/yalantis/ucrop/UCropActivity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,7 +34,37 @@
 
 
 # virtual methods
-.method public final A(F)V
+.method public final Ci()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bcq:Lcom/yalantis/ucrop/UCropActivity;
+
+    invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v0, v1}, Lcom/yalantis/ucrop/view/a;->setImageToWrapCropBounds(Z)V
+
+    return-void
+.end method
+
+.method public final Cj()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bcq:Lcom/yalantis/ucrop/UCropActivity;
+
+    invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->Cq()V
+
+    return-void
+.end method
+
+.method public final w(F)V
     .locals 5
 
     const v0, 0x466a6000    # 15000.0f
@@ -45,13 +75,13 @@
 
     if-lez v1, :cond_0
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v1}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v2, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v2}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -61,7 +91,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v3, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v3}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -71,7 +101,7 @@
 
     move-result v3
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v4, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v4}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -89,13 +119,13 @@
 
     add-float/2addr v2, p1
 
-    iget-object p1, v1, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object p1, v1, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {p1}, Landroid/graphics/RectF;->centerX()F
 
     move-result p1
 
-    iget-object v0, v1, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, v1, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerY()F
 
@@ -106,13 +136,13 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v1}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v2, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v2}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -122,7 +152,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v3, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v3}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -132,7 +162,7 @@
 
     move-result v3
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v4, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v4}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -150,13 +180,13 @@
 
     add-float/2addr v2, p1
 
-    iget-object p1, v1, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object p1, v1, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {p1}, Landroid/graphics/RectF;->centerX()F
 
     move-result p1
 
-    iget-object v0, v1, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, v1, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerY()F
 
@@ -181,33 +211,3 @@
     :cond_1
     return-void
 .end method
-
-.method public final Cr()V
-    .locals 2
-
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bbW:Lcom/yalantis/ucrop/UCropActivity;
-
-    invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    invoke-virtual {v0, v1}, Lcom/yalantis/ucrop/view/a;->setImageToWrapCropBounds(Z)V
-
-    return-void
-.end method
-
-.method public final Cs()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->bbW:Lcom/yalantis/ucrop/UCropActivity;
-
-    invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->Cz()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$7.smali b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$7.smali
index 266382a815..263fec4c0a 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$7.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$7.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bbW:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic bcq:Lcom/yalantis/ucrop/UCropActivity;
 
 
 # direct methods
 .method constructor <init>(Lcom/yalantis/ucrop/UCropActivity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$7;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$7;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,7 +43,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$7;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$7;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-virtual {p1}, Landroid/view/View;->getId()I
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$8.smali b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$8.smali
index e3269ff418..840026910d 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$8.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity$8.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bbW:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic bcq:Lcom/yalantis/ucrop/UCropActivity;
 
 
 # direct methods
 .method constructor <init>(Lcom/yalantis/ucrop/UCropActivity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$8;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$8;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final a(Landroid/net/Uri;IIII)V
     .locals 4
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$8;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$8;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -91,7 +91,7 @@
 
     invoke-virtual {v0, p2, p1}, Lcom/yalantis/ucrop/UCropActivity;->setResult(ILandroid/content/Intent;)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$8;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$8;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-virtual {p1}, Lcom/yalantis/ucrop/UCropActivity;->finish()V
 
@@ -101,11 +101,11 @@
 .method public final m(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$8;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$8;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-virtual {v0, p1}, Lcom/yalantis/ucrop/UCropActivity;->l(Ljava/lang/Throwable;)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$8;->bbW:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$8;->bcq:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-virtual {p1}, Lcom/yalantis/ucrop/UCropActivity;->finish()V
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali
index c5aac67573..c7447ebe71 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali
@@ -4,37 +4,51 @@
 
 
 # static fields
-.field public static final bbs:Landroid/graphics/Bitmap$CompressFormat;
+.field public static final bbM:Landroid/graphics/Bitmap$CompressFormat;
 
 
 # instance fields
-.field private bbA:I
+.field private bbN:Ljava/lang/String;
 
-.field private bbB:I
+.field private bbO:I
 
-.field private bbC:Z
+.field private bbP:I
 
-.field private bbD:Z
+.field private bbQ:I
 
-.field private bbE:Lcom/yalantis/ucrop/view/UCropView;
+.field private bbR:I
 
-.field private bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field private bbS:I
 
-.field private bbG:Lcom/yalantis/ucrop/view/OverlayView;
+.field private bbT:I
 
-.field private bbH:Landroid/view/ViewGroup;
+.field private bbU:I
 
-.field private bbI:Landroid/view/ViewGroup;
+.field private bbV:I
 
-.field private bbJ:Landroid/view/ViewGroup;
+.field private bbW:Z
 
-.field private bbK:Landroid/view/ViewGroup;
+.field private bbX:Z
 
-.field private bbL:Landroid/view/ViewGroup;
+.field private bbY:Lcom/yalantis/ucrop/view/UCropView;
 
-.field private bbM:Landroid/view/ViewGroup;
+.field private bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-.field private bbN:Ljava/util/List;
+.field private bca:Lcom/yalantis/ucrop/view/OverlayView;
+
+.field private bcb:Landroid/view/ViewGroup;
+
+.field private bcc:Landroid/view/ViewGroup;
+
+.field private bcd:Landroid/view/ViewGroup;
+
+.field private bce:Landroid/view/ViewGroup;
+
+.field private bcf:Landroid/view/ViewGroup;
+
+.field private bcg:Landroid/view/ViewGroup;
+
+.field private bch:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -44,35 +58,21 @@
     .end annotation
 .end field
 
-.field private bbO:Landroid/widget/TextView;
+.field private bci:Landroid/widget/TextView;
 
-.field private bbP:Landroid/widget/TextView;
+.field private bcj:Landroid/widget/TextView;
 
-.field private bbQ:Landroid/view/View;
+.field private bck:Landroid/view/View;
 
-.field private bbR:Landroid/graphics/Bitmap$CompressFormat;
+.field private bcl:Landroid/graphics/Bitmap$CompressFormat;
 
-.field private bbS:I
+.field private bcm:I
 
-.field private bbT:[I
+.field private bcn:[I
 
-.field private bbU:Lcom/yalantis/ucrop/view/b$a;
+.field private bco:Lcom/yalantis/ucrop/view/b$a;
 
-.field private final bbV:Landroid/view/View$OnClickListener;
-
-.field private bbt:Ljava/lang/String;
-
-.field private bbu:I
-
-.field private bbv:I
-
-.field private bbw:I
-
-.field private bbx:I
-
-.field private bby:I
-
-.field private bbz:I
+.field private final bcp:Landroid/view/View$OnClickListener;
 
 
 # direct methods
@@ -81,7 +81,7 @@
 
     sget-object v0, Landroid/graphics/Bitmap$CompressFormat;->JPEG:Landroid/graphics/Bitmap$CompressFormat;
 
-    sput-object v0, Lcom/yalantis/ucrop/UCropActivity;->bbs:Landroid/graphics/Bitmap$CompressFormat;
+    sput-object v0, Lcom/yalantis/ucrop/UCropActivity;->bbM:Landroid/graphics/Bitmap$CompressFormat;
 
     return-void
 .end method
@@ -93,21 +93,21 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbD:Z
+    iput-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbX:Z
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbN:Ljava/util/List;
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bch:Ljava/util/List;
 
-    sget-object v0, Lcom/yalantis/ucrop/UCropActivity;->bbs:Landroid/graphics/Bitmap$CompressFormat;
+    sget-object v0, Lcom/yalantis/ucrop/UCropActivity;->bbM:Landroid/graphics/Bitmap$CompressFormat;
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbR:Landroid/graphics/Bitmap$CompressFormat;
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bcl:Landroid/graphics/Bitmap$CompressFormat;
 
     const/16 v0, 0x5a
 
-    iput v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbS:I
+    iput v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bcm:I
 
     const/4 v0, 0x3
 
@@ -115,19 +115,19 @@
 
     fill-array-data v0, :array_0
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbT:[I
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bcn:[I
 
     new-instance v0, Lcom/yalantis/ucrop/UCropActivity$1;
 
     invoke-direct {v0, p0}, Lcom/yalantis/ucrop/UCropActivity$1;-><init>(Lcom/yalantis/ucrop/UCropActivity;)V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbU:Lcom/yalantis/ucrop/view/b$a;
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bco:Lcom/yalantis/ucrop/view/b$a;
 
     new-instance v0, Lcom/yalantis/ucrop/UCropActivity$7;
 
     invoke-direct {v0, p0}, Lcom/yalantis/ucrop/UCropActivity$7;-><init>(Lcom/yalantis/ucrop/UCropActivity;)V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbV:Landroid/view/View$OnClickListener;
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bcp:Landroid/view/View$OnClickListener;
 
     return-void
 
@@ -142,7 +142,7 @@
 .method static synthetic a(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/UCropView;
     .locals 0
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbE:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbY:Lcom/yalantis/ucrop/view/UCropView;
 
     return-object p0
 .end method
@@ -150,7 +150,7 @@
 .method static synthetic a(Lcom/yalantis/ucrop/UCropActivity;F)V
     .locals 3
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbO:Landroid/widget/TextView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bci:Landroid/widget/TextView;
 
     if-eqz p0, :cond_0
 
@@ -185,7 +185,7 @@
 .method static synthetic a(Lcom/yalantis/ucrop/UCropActivity;I)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/yalantis/ucrop/UCropActivity;->da(I)V
+    invoke-direct {p0, p1}, Lcom/yalantis/ucrop/UCropActivity;->cX(I)V
 
     return-void
 .end method
@@ -193,7 +193,7 @@
 .method static synthetic b(Lcom/yalantis/ucrop/UCropActivity;)Landroid/view/View;
     .locals 0
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbQ:Landroid/view/View;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bck:Landroid/view/View;
 
     return-object p0
 .end method
@@ -201,7 +201,7 @@
 .method static synthetic b(Lcom/yalantis/ucrop/UCropActivity;F)V
     .locals 4
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbP:Landroid/widget/TextView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bcj:Landroid/widget/TextView;
 
     if-eqz p0, :cond_0
 
@@ -244,30 +244,22 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbD:Z
+    iput-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbX:Z
 
     return v0
 .end method
 
-.method static synthetic d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
-    .locals 0
-
-    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
-
-    return-object p0
-.end method
-
-.method private da(I)V
+.method private cX(I)V
     .locals 5
 
-    iget-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbC:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbW:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbH:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bcb:Landroid/view/ViewGroup;
 
     sget v1, Lcom/yalantis/ucrop/R$d;->state_aspect_ratio:I
 
@@ -287,7 +279,7 @@
     :goto_0
     invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setSelected(Z)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbI:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bcc:Landroid/view/ViewGroup;
 
     sget v1, Lcom/yalantis/ucrop/R$d;->state_rotate:I
 
@@ -303,7 +295,7 @@
     :goto_1
     invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setSelected(Z)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbJ:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bcd:Landroid/view/ViewGroup;
 
     sget v1, Lcom/yalantis/ucrop/R$d;->state_scale:I
 
@@ -319,7 +311,7 @@
     :goto_2
     invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setSelected(Z)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbK:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bce:Landroid/view/ViewGroup;
 
     sget v1, Lcom/yalantis/ucrop/R$d;->state_aspect_ratio:I
 
@@ -337,7 +329,7 @@
     :goto_3
     invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbL:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bcf:Landroid/view/ViewGroup;
 
     sget v1, Lcom/yalantis/ucrop/R$d;->state_rotate:I
 
@@ -353,7 +345,7 @@
     :goto_4
     invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbM:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bcg:Landroid/view/ViewGroup;
 
     sget v1, Lcom/yalantis/ucrop/R$d;->state_scale:I
 
@@ -368,7 +360,7 @@
 
     if-ne p1, v0, :cond_7
 
-    invoke-direct {p0, v3}, Lcom/yalantis/ucrop/UCropActivity;->db(I)V
+    invoke-direct {p0, v3}, Lcom/yalantis/ucrop/UCropActivity;->cY(I)V
 
     return-void
 
@@ -377,24 +369,24 @@
 
     if-ne p1, v0, :cond_8
 
-    invoke-direct {p0, v2}, Lcom/yalantis/ucrop/UCropActivity;->db(I)V
+    invoke-direct {p0, v2}, Lcom/yalantis/ucrop/UCropActivity;->cY(I)V
 
     return-void
 
     :cond_8
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lcom/yalantis/ucrop/UCropActivity;->db(I)V
+    invoke-direct {p0, p1}, Lcom/yalantis/ucrop/UCropActivity;->cY(I)V
 
     return-void
 .end method
 
-.method private db(I)V
+.method private cY(I)V
     .locals 6
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bbT:[I
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bcn:[I
 
     aget v2, v1, p1
 
@@ -424,9 +416,9 @@
     :goto_1
     invoke-virtual {v0, v1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setScaleEnabled(Z)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bbT:[I
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bcn:[I
 
     aget v2, v1, p1
 
@@ -447,10 +439,18 @@
     return-void
 .end method
 
+.method static synthetic d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
+    .locals 0
+
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
+
+    return-object p0
+.end method
+
 .method static synthetic e(Lcom/yalantis/ucrop/UCropActivity;)Ljava/util/List;
     .locals 0
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbN:Ljava/util/List;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bch:Ljava/util/List;
 
     return-object p0
 .end method
@@ -458,7 +458,7 @@
 .method static synthetic f(Lcom/yalantis/ucrop/UCropActivity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->getCurrentAngle()F
 
@@ -466,9 +466,9 @@
 
     neg-float v1, v1
 
-    invoke-virtual {v0, v1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->C(F)V
+    invoke-virtual {v0, v1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->B(F)V
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     const/4 v0, 0x1
 
@@ -480,13 +480,13 @@
 .method static synthetic g(Lcom/yalantis/ucrop/UCropActivity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     const/high16 v1, 0x42b40000    # 90.0f
 
-    invoke-virtual {v0, v1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->C(F)V
+    invoke-virtual {v0, v1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->B(F)V
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     const/4 v0, 0x1
 
@@ -544,7 +544,7 @@
 
     move-result v2
 
-    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbv:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbP:I
 
     sget v2, Lcom/yalantis/ucrop/R$a;->ucrop_color_toolbar:I
 
@@ -558,7 +558,7 @@
 
     move-result v2
 
-    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbu:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbO:I
 
     sget v2, Lcom/yalantis/ucrop/R$a;->ucrop_color_widget_active:I
 
@@ -572,7 +572,7 @@
 
     move-result v2
 
-    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbw:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbQ:I
 
     sget v2, Lcom/yalantis/ucrop/R$a;->ucrop_color_toolbar_widget:I
 
@@ -586,7 +586,7 @@
 
     move-result v2
 
-    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbx:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbR:I
 
     sget v2, Lcom/yalantis/ucrop/R$c;->ucrop_ic_cross:I
 
@@ -596,7 +596,7 @@
 
     move-result v2
 
-    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbz:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbT:I
 
     sget v2, Lcom/yalantis/ucrop/R$c;->ucrop_ic_done:I
 
@@ -606,7 +606,7 @@
 
     move-result v2
 
-    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbA:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbU:I
 
     const-string v2, "com.yalantis.ucrop.UcropToolbarTitleText"
 
@@ -614,9 +614,9 @@
 
     move-result-object v2
 
-    iput-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbt:Ljava/lang/String;
+    iput-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbN:Ljava/lang/String;
 
-    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbt:Ljava/lang/String;
+    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbN:Ljava/lang/String;
 
     if-eqz v2, :cond_0
 
@@ -634,7 +634,7 @@
     move-result-object v2
 
     :goto_0
-    iput-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbt:Ljava/lang/String;
+    iput-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbN:Ljava/lang/String;
 
     sget v2, Lcom/yalantis/ucrop/R$a;->ucrop_color_default_logo:I
 
@@ -648,7 +648,7 @@
 
     move-result v2
 
-    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbB:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbV:I
 
     const/4 v2, 0x0
 
@@ -662,7 +662,7 @@
 
     xor-int/2addr v3, v4
 
-    iput-boolean v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbC:Z
+    iput-boolean v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbW:Z
 
     sget v3, Lcom/yalantis/ucrop/R$a;->ucrop_color_crop_background:I
 
@@ -676,9 +676,9 @@
 
     move-result v3
 
-    iput v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bby:I
+    iput v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbS:I
 
-    iget v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbv:I
+    iget v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbP:I
 
     sget v5, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -707,11 +707,11 @@
 
     check-cast v3, Landroidx/appcompat/widget/Toolbar;
 
-    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbu:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbO:I
 
     invoke-virtual {v3, v5}, Landroidx/appcompat/widget/Toolbar;->setBackgroundColor(I)V
 
-    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbx:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbR:I
 
     invoke-virtual {v3, v5}, Landroidx/appcompat/widget/Toolbar;->setTitleTextColor(I)V
 
@@ -723,15 +723,15 @@
 
     check-cast v5, Landroid/widget/TextView;
 
-    iget v6, v1, Lcom/yalantis/ucrop/UCropActivity;->bbx:I
+    iget v6, v1, Lcom/yalantis/ucrop/UCropActivity;->bbR:I
 
     invoke-virtual {v5, v6}, Landroid/widget/TextView;->setTextColor(I)V
 
-    iget-object v6, v1, Lcom/yalantis/ucrop/UCropActivity;->bbt:Ljava/lang/String;
+    iget-object v6, v1, Lcom/yalantis/ucrop/UCropActivity;->bbN:Ljava/lang/String;
 
     invoke-virtual {v5, v6}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbz:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbT:I
 
     invoke-static {v1, v5}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -741,7 +741,7 @@
 
     move-result-object v5
 
-    iget v6, v1, Lcom/yalantis/ucrop/UCropActivity;->bbx:I
+    iget v6, v1, Lcom/yalantis/ucrop/UCropActivity;->bbR:I
 
     sget-object v7, Landroid/graphics/PorterDuff$Mode;->SRC_ATOP:Landroid/graphics/PorterDuff$Mode;
 
@@ -768,27 +768,27 @@
 
     check-cast v3, Lcom/yalantis/ucrop/view/UCropView;
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbE:Lcom/yalantis/ucrop/view/UCropView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbY:Lcom/yalantis/ucrop/view/UCropView;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbE:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbY:Lcom/yalantis/ucrop/view/UCropView;
 
     invoke-virtual {v3}, Lcom/yalantis/ucrop/view/UCropView;->getCropImageView()Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     move-result-object v3
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbE:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbY:Lcom/yalantis/ucrop/view/UCropView;
 
     invoke-virtual {v3}, Lcom/yalantis/ucrop/view/UCropView;->getOverlayView()Lcom/yalantis/ucrop/view/OverlayView;
 
     move-result-object v3
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbG:Lcom/yalantis/ucrop/view/OverlayView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bca:Lcom/yalantis/ucrop/view/OverlayView;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbU:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bco:Lcom/yalantis/ucrop/view/b$a;
 
     invoke-virtual {v3, v5}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setTransformImageListener(Lcom/yalantis/ucrop/view/b$a;)V
 
@@ -800,7 +800,7 @@
 
     check-cast v3, Landroid/widget/ImageView;
 
-    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbB:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbV:I
 
     sget-object v6, Landroid/graphics/PorterDuff$Mode;->SRC_ATOP:Landroid/graphics/PorterDuff$Mode;
 
@@ -812,11 +812,11 @@
 
     move-result-object v3
 
-    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bby:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbS:I
 
     invoke-virtual {v3, v5}, Landroid/view/View;->setBackgroundColor(I)V
 
-    iget-boolean v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbC:Z
+    iget-boolean v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbW:Z
 
     const-string v5, "com.yalantis.ucrop.AspectRatioOptions"
 
@@ -852,11 +852,11 @@
 
     check-cast v3, Landroid/view/ViewGroup;
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbH:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bcb:Landroid/view/ViewGroup;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbH:Landroid/view/ViewGroup;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bcb:Landroid/view/ViewGroup;
 
-    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->bbV:Landroid/view/View$OnClickListener;
+    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->bcp:Landroid/view/View$OnClickListener;
 
     invoke-virtual {v3, v11}, Landroid/view/ViewGroup;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
@@ -868,11 +868,11 @@
 
     check-cast v3, Landroid/view/ViewGroup;
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbI:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bcc:Landroid/view/ViewGroup;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbI:Landroid/view/ViewGroup;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bcc:Landroid/view/ViewGroup;
 
-    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->bbV:Landroid/view/View$OnClickListener;
+    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->bcp:Landroid/view/View$OnClickListener;
 
     invoke-virtual {v3, v11}, Landroid/view/ViewGroup;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
@@ -884,11 +884,11 @@
 
     check-cast v3, Landroid/view/ViewGroup;
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbJ:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bcd:Landroid/view/ViewGroup;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbJ:Landroid/view/ViewGroup;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bcd:Landroid/view/ViewGroup;
 
-    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->bbV:Landroid/view/View$OnClickListener;
+    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->bcp:Landroid/view/View$OnClickListener;
 
     invoke-virtual {v3, v11}, Landroid/view/ViewGroup;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
@@ -900,7 +900,7 @@
 
     check-cast v3, Landroid/view/ViewGroup;
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbK:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bce:Landroid/view/ViewGroup;
 
     sget v3, Lcom/yalantis/ucrop/R$d;->layout_rotate_wheel:I
 
@@ -910,7 +910,7 @@
 
     check-cast v3, Landroid/view/ViewGroup;
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbL:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bcf:Landroid/view/ViewGroup;
 
     sget v3, Lcom/yalantis/ucrop/R$d;->layout_scale_wheel:I
 
@@ -920,7 +920,7 @@
 
     check-cast v3, Landroid/view/ViewGroup;
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbM:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bcg:Landroid/view/ViewGroup;
 
     invoke-virtual {v0, v6, v2}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
 
@@ -1049,7 +1049,7 @@
 
     check-cast v15, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;
 
-    iget v9, v1, Lcom/yalantis/ucrop/UCropActivity;->bbw:I
+    iget v9, v1, Lcom/yalantis/ucrop/UCropActivity;->bbQ:I
 
     invoke-virtual {v15, v9}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->setActiveColor(I)V
 
@@ -1057,7 +1057,7 @@
 
     invoke-virtual {v13, v7}, Landroid/widget/LinearLayout;->addView(Landroid/view/View;)V
 
-    iget-object v9, v1, Lcom/yalantis/ucrop/UCropActivity;->bbN:Ljava/util/List;
+    iget-object v9, v1, Lcom/yalantis/ucrop/UCropActivity;->bch:Ljava/util/List;
 
     invoke-interface {v9, v7}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -1068,7 +1068,7 @@
     goto :goto_1
 
     :cond_5
-    iget-object v7, v1, Lcom/yalantis/ucrop/UCropActivity;->bbN:Ljava/util/List;
+    iget-object v7, v1, Lcom/yalantis/ucrop/UCropActivity;->bch:Ljava/util/List;
 
     invoke-interface {v7, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1078,7 +1078,7 @@
 
     invoke-virtual {v3, v4}, Landroid/view/ViewGroup;->setSelected(Z)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbN:Ljava/util/List;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bch:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -1114,7 +1114,7 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbO:Landroid/widget/TextView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bci:Landroid/widget/TextView;
 
     sget v3, Lcom/yalantis/ucrop/R$d;->rotate_scroll_wheel:I
 
@@ -1138,7 +1138,7 @@
 
     check-cast v3, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;
 
-    iget v7, v1, Lcom/yalantis/ucrop/UCropActivity;->bbw:I
+    iget v7, v1, Lcom/yalantis/ucrop/UCropActivity;->bbQ:I
 
     invoke-virtual {v3, v7}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->setMiddleLineColor(I)V
 
@@ -1174,7 +1174,7 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbP:Landroid/widget/TextView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bcj:Landroid/widget/TextView;
 
     sget v3, Lcom/yalantis/ucrop/R$d;->scale_scroll_wheel:I
 
@@ -1198,7 +1198,7 @@
 
     check-cast v3, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;
 
-    iget v7, v1, Lcom/yalantis/ucrop/UCropActivity;->bbw:I
+    iget v7, v1, Lcom/yalantis/ucrop/UCropActivity;->bbQ:I
 
     invoke-virtual {v3, v7}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->setMiddleLineColor(I)V
 
@@ -1232,7 +1232,7 @@
 
     move-result-object v12
 
-    iget v13, v1, Lcom/yalantis/ucrop/UCropActivity;->bbw:I
+    iget v13, v1, Lcom/yalantis/ucrop/UCropActivity;->bbQ:I
 
     invoke-direct {v11, v12, v13}, Lcom/yalantis/ucrop/c/i;-><init>(Landroid/graphics/drawable/Drawable;I)V
 
@@ -1244,7 +1244,7 @@
 
     move-result-object v11
 
-    iget v12, v1, Lcom/yalantis/ucrop/UCropActivity;->bbw:I
+    iget v12, v1, Lcom/yalantis/ucrop/UCropActivity;->bbQ:I
 
     invoke-direct {v3, v11, v12}, Lcom/yalantis/ucrop/c/i;-><init>(Landroid/graphics/drawable/Drawable;I)V
 
@@ -1256,7 +1256,7 @@
 
     move-result-object v7
 
-    iget v11, v1, Lcom/yalantis/ucrop/UCropActivity;->bbw:I
+    iget v11, v1, Lcom/yalantis/ucrop/UCropActivity;->bbQ:I
 
     invoke-direct {v3, v7, v11}, Lcom/yalantis/ucrop/c/i;-><init>(Landroid/graphics/drawable/Drawable;I)V
 
@@ -1309,12 +1309,12 @@
     :goto_3
     if-nez v16, :cond_9
 
-    sget-object v16, Lcom/yalantis/ucrop/UCropActivity;->bbs:Landroid/graphics/Bitmap$CompressFormat;
+    sget-object v16, Lcom/yalantis/ucrop/UCropActivity;->bbM:Landroid/graphics/Bitmap$CompressFormat;
 
     :cond_9
     move-object/from16 v3, v16
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbR:Landroid/graphics/Bitmap$CompressFormat;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bcl:Landroid/graphics/Bitmap$CompressFormat;
 
     const/16 v3, 0x5a
 
@@ -1324,7 +1324,7 @@
 
     move-result v3
 
-    iput v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbS:I
+    iput v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bcm:I
 
     const-string v3, "com.yalantis.ucrop.AllowedGestures"
 
@@ -1340,10 +1340,10 @@
 
     if-ne v9, v7, :cond_a
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbT:[I
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bcn:[I
 
     :cond_a
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     const-string v9, "com.yalantis.ucrop.MaxBitmapSize"
 
@@ -1353,7 +1353,7 @@
 
     invoke-virtual {v3, v9}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setMaxBitmapSize(I)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     const/high16 v9, 0x41200000    # 10.0f
 
@@ -1365,7 +1365,7 @@
 
     invoke-virtual {v3, v9}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setMaxScaleMultiplier(F)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     const/16 v9, 0x1f4
 
@@ -1379,7 +1379,7 @@
 
     invoke-virtual {v3, v11, v12}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setImageToWrapCropBoundsAnimDuration(J)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbG:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bca:Lcom/yalantis/ucrop/view/OverlayView;
 
     const-string v9, "com.yalantis.ucrop.FreeStyleCrop"
 
@@ -1389,7 +1389,7 @@
 
     invoke-virtual {v3, v9}, Lcom/yalantis/ucrop/view/OverlayView;->setFreestyleCropEnabled(Z)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbG:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bca:Lcom/yalantis/ucrop/view/OverlayView;
 
     invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/UCropActivity;->getResources()Landroid/content/res/Resources;
 
@@ -1409,7 +1409,7 @@
 
     invoke-virtual {v3, v9}, Lcom/yalantis/ucrop/view/OverlayView;->setDimmedColor(I)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbG:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bca:Lcom/yalantis/ucrop/view/OverlayView;
 
     const-string v9, "com.yalantis.ucrop.CircleDimmedLayer"
 
@@ -1419,7 +1419,7 @@
 
     invoke-virtual {v3, v9}, Lcom/yalantis/ucrop/view/OverlayView;->setCircleDimmedLayer(Z)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbG:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bca:Lcom/yalantis/ucrop/view/OverlayView;
 
     const-string v9, "com.yalantis.ucrop.ShowCropFrame"
 
@@ -1429,7 +1429,7 @@
 
     invoke-virtual {v3, v9}, Lcom/yalantis/ucrop/view/OverlayView;->setShowCropFrame(Z)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbG:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bca:Lcom/yalantis/ucrop/view/OverlayView;
 
     invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/UCropActivity;->getResources()Landroid/content/res/Resources;
 
@@ -1449,7 +1449,7 @@
 
     invoke-virtual {v3, v9}, Lcom/yalantis/ucrop/view/OverlayView;->setCropFrameColor(I)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbG:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bca:Lcom/yalantis/ucrop/view/OverlayView;
 
     invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/UCropActivity;->getResources()Landroid/content/res/Resources;
 
@@ -1469,7 +1469,7 @@
 
     invoke-virtual {v3, v9}, Lcom/yalantis/ucrop/view/OverlayView;->setCropFrameStrokeWidth(I)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbG:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bca:Lcom/yalantis/ucrop/view/OverlayView;
 
     const-string v9, "com.yalantis.ucrop.ShowCropGrid"
 
@@ -1479,7 +1479,7 @@
 
     invoke-virtual {v3, v9}, Lcom/yalantis/ucrop/view/OverlayView;->setShowCropGrid(Z)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbG:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bca:Lcom/yalantis/ucrop/view/OverlayView;
 
     const-string v9, "com.yalantis.ucrop.CropGridRowCount"
 
@@ -1489,7 +1489,7 @@
 
     invoke-virtual {v3, v9}, Lcom/yalantis/ucrop/view/OverlayView;->setCropGridRowCount(I)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbG:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bca:Lcom/yalantis/ucrop/view/OverlayView;
 
     const-string v9, "com.yalantis.ucrop.CropGridColumnCount"
 
@@ -1499,7 +1499,7 @@
 
     invoke-virtual {v3, v8}, Lcom/yalantis/ucrop/view/OverlayView;->setCropGridColumnCount(I)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbG:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bca:Lcom/yalantis/ucrop/view/OverlayView;
 
     invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/UCropActivity;->getResources()Landroid/content/res/Resources;
 
@@ -1519,7 +1519,7 @@
 
     invoke-virtual {v3, v8}, Lcom/yalantis/ucrop/view/OverlayView;->setCropGridColor(I)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbG:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bca:Lcom/yalantis/ucrop/view/OverlayView;
 
     invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/UCropActivity;->getResources()Landroid/content/res/Resources;
 
@@ -1567,7 +1567,7 @@
 
     if-lez v9, :cond_c
 
-    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbH:Landroid/view/ViewGroup;
+    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bcb:Landroid/view/ViewGroup;
 
     if-eqz v5, :cond_b
 
@@ -1576,7 +1576,7 @@
     invoke-virtual {v5, v6}, Landroid/view/ViewGroup;->setVisibility(I)V
 
     :cond_b
-    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     div-float/2addr v3, v8
 
@@ -1593,7 +1593,7 @@
 
     if-ge v6, v3, :cond_d
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-virtual {v5, v6}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -1601,7 +1601,7 @@
 
     check-cast v8, Lcom/yalantis/ucrop/model/AspectRatio;
 
-    iget v8, v8, Lcom/yalantis/ucrop/model/AspectRatio;->bbY:F
+    iget v8, v8, Lcom/yalantis/ucrop/model/AspectRatio;->bcs:F
 
     invoke-virtual {v5, v6}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -1609,7 +1609,7 @@
 
     check-cast v5, Lcom/yalantis/ucrop/model/AspectRatio;
 
-    iget v5, v5, Lcom/yalantis/ucrop/model/AspectRatio;->bbZ:F
+    iget v5, v5, Lcom/yalantis/ucrop/model/AspectRatio;->bct:F
 
     div-float/2addr v8, v5
 
@@ -1618,7 +1618,7 @@
     goto :goto_4
 
     :cond_d
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-virtual {v3, v10}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setTargetAspectRatio(F)V
 
@@ -1639,11 +1639,11 @@
 
     if-lez v0, :cond_e
 
-    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-virtual {v5, v3}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setMaxResultImageSizeX(I)V
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-virtual {v3, v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setMaxResultImageSizeY(I)V
 
@@ -1653,7 +1653,7 @@
     if-eqz v20, :cond_f
 
     :try_start_0
-    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-virtual {v0}, Lcom/yalantis/ucrop/view/b;->getMaxBitmapSize()I
 
@@ -1710,11 +1710,11 @@
     invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/UCropActivity;->finish()V
 
     :goto_5
-    iget-boolean v0, v1, Lcom/yalantis/ucrop/UCropActivity;->bbC:Z
+    iget-boolean v0, v1, Lcom/yalantis/ucrop/UCropActivity;->bbW:Z
 
     if-eqz v0, :cond_11
 
-    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->bbH:Landroid/view/ViewGroup;
+    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->bcb:Landroid/view/ViewGroup;
 
     invoke-virtual {v0}, Landroid/view/ViewGroup;->getVisibility()I
 
@@ -1724,22 +1724,22 @@
 
     sget v0, Lcom/yalantis/ucrop/R$d;->state_aspect_ratio:I
 
-    invoke-direct {v1, v0}, Lcom/yalantis/ucrop/UCropActivity;->da(I)V
+    invoke-direct {v1, v0}, Lcom/yalantis/ucrop/UCropActivity;->cX(I)V
 
     goto :goto_6
 
     :cond_10
     sget v0, Lcom/yalantis/ucrop/R$d;->state_scale:I
 
-    invoke-direct {v1, v0}, Lcom/yalantis/ucrop/UCropActivity;->da(I)V
+    invoke-direct {v1, v0}, Lcom/yalantis/ucrop/UCropActivity;->cX(I)V
 
     goto :goto_6
 
     :cond_11
-    invoke-direct {v1, v2}, Lcom/yalantis/ucrop/UCropActivity;->db(I)V
+    invoke-direct {v1, v2}, Lcom/yalantis/ucrop/UCropActivity;->cY(I)V
 
     :goto_6
-    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->bbQ:Landroid/view/View;
+    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->bck:Landroid/view/View;
 
     if-nez v0, :cond_12
 
@@ -1747,7 +1747,7 @@
 
     invoke-direct {v0, v1}, Landroid/view/View;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->bbQ:Landroid/view/View;
+    iput-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->bck:Landroid/view/View;
 
     new-instance v0, Landroid/widget/RelativeLayout$LayoutParams;
 
@@ -1759,11 +1759,11 @@
 
     invoke-virtual {v0, v7, v2}, Landroid/widget/RelativeLayout$LayoutParams;->addRule(II)V
 
-    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbQ:Landroid/view/View;
+    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bck:Landroid/view/View;
 
     invoke-virtual {v2, v0}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
-    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->bbQ:Landroid/view/View;
+    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->bck:Landroid/view/View;
 
     invoke-virtual {v0, v4}, Landroid/view/View;->setClickable(Z)V
 
@@ -1776,7 +1776,7 @@
 
     check-cast v0, Landroid/widget/RelativeLayout;
 
-    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bbQ:Landroid/view/View;
+    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->bck:Landroid/view/View;
 
     invoke-virtual {v0, v2}, Landroid/widget/RelativeLayout;->addView(Landroid/view/View;)V
 
@@ -1811,7 +1811,7 @@
     :try_start_0
     invoke-virtual {v1}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable;
 
-    iget v3, p0, Lcom/yalantis/ucrop/UCropActivity;->bbx:I
+    iget v3, p0, Lcom/yalantis/ucrop/UCropActivity;->bbR:I
 
     sget-object v4, Landroid/graphics/PorterDuff$Mode;->SRC_ATOP:Landroid/graphics/PorterDuff$Mode;
 
@@ -1872,7 +1872,7 @@
 
     move-result-object p1
 
-    iget v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbA:I
+    iget v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbU:I
 
     invoke-static {p0, v0}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -1882,7 +1882,7 @@
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable;
 
-    iget v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bbx:I
+    iget v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bbR:I
 
     sget-object v3, Landroid/graphics/PorterDuff$Mode;->SRC_ATOP:Landroid/graphics/PorterDuff$Mode;
 
@@ -1905,21 +1905,21 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbQ:Landroid/view/View;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bck:Landroid/view/View;
 
     const/4 v1, 0x1
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setClickable(Z)V
 
-    iput-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bbD:Z
+    iput-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bbX:Z
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/UCropActivity;->supportInvalidateOptionsMenu()V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bbR:Landroid/graphics/Bitmap$CompressFormat;
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bcl:Landroid/graphics/Bitmap$CompressFormat;
 
-    iget v2, p0, Lcom/yalantis/ucrop/UCropActivity;->bbS:I
+    iget v2, p0, Lcom/yalantis/ucrop/UCropActivity;->bcm:I
 
     new-instance v3, Lcom/yalantis/ucrop/UCropActivity$8;
 
@@ -1958,7 +1958,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bbD:Z
+    iget-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bbX:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1970,7 +1970,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bbD:Z
+    iget-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->bbX:Z
 
     invoke-interface {v0, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
@@ -1986,11 +1986,11 @@
 
     invoke-super {p0}, Landroidx/appcompat/app/AppCompatActivity;->onStop()V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->Cz()V
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->Cq()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/a$a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/a$a.smali
index a6eccad020..14481c159a 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/a$a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/a$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public final bbr:Landroid/os/Bundle;
+.field public final bbL:Landroid/os/Bundle;
 
 
 # direct methods
@@ -28,57 +28,7 @@
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/a$a;->bbr:Landroid/os/Bundle;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final cX(I)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/yalantis/ucrop/a$a;->bbr:Landroid/os/Bundle;
-
-    const-string v1, "com.yalantis.ucrop.ToolbarColor"
-
-    invoke-virtual {v0, v1, p1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public final cY(I)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/yalantis/ucrop/a$a;->bbr:Landroid/os/Bundle;
-
-    const-string v1, "com.yalantis.ucrop.UcropColorWidgetActive"
-
-    invoke-virtual {v0, v1, p1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public final cZ(I)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/yalantis/ucrop/a$a;->bbr:Landroid/os/Bundle;
-
-    const-string v1, "com.yalantis.ucrop.UcropToolbarWidgetColor"
-
-    invoke-virtual {v0, v1, p1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public final setStatusBarColor(I)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/yalantis/ucrop/a$a;->bbr:Landroid/os/Bundle;
-
-    const-string v1, "com.yalantis.ucrop.StatusBarColor"
-
-    invoke-virtual {v0, v1, p1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    iput-object v0, p0, Lcom/yalantis/ucrop/a$a;->bbL:Landroid/os/Bundle;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/a.smali
index 64502abe75..df3eb8ac19 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/a.smali
@@ -12,9 +12,9 @@
 
 
 # instance fields
-.field public bbp:Landroid/content/Intent;
+.field public bbJ:Landroid/content/Intent;
 
-.field public bbq:Landroid/os/Bundle;
+.field public bbK:Landroid/os/Bundle;
 
 
 # direct methods
@@ -27,21 +27,21 @@
 
     invoke-direct {v0}, Landroid/content/Intent;-><init>()V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/a;->bbp:Landroid/content/Intent;
+    iput-object v0, p0, Lcom/yalantis/ucrop/a;->bbJ:Landroid/content/Intent;
 
     new-instance v0, Landroid/os/Bundle;
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/a;->bbq:Landroid/os/Bundle;
+    iput-object v0, p0, Lcom/yalantis/ucrop/a;->bbK:Landroid/os/Bundle;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/a;->bbq:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/yalantis/ucrop/a;->bbK:Landroid/os/Bundle;
 
     const-string v1, "com.yalantis.ucrop.InputUri"
 
     invoke-virtual {v0, v1, p1}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/a;->bbq:Landroid/os/Bundle;
+    iget-object p1, p0, Lcom/yalantis/ucrop/a;->bbK:Landroid/os/Bundle;
 
     const-string v0, "com.yalantis.ucrop.OutputUri"
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/a/c.smali b/com.discord/smali_classes2/com/yalantis/ucrop/a/c.smali
index db53607da0..5f94874c75 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/a/c.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/a/c.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract B(F)V
+.method public abstract A(F)V
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/b/a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/b/a.smali
index 5766141025..34b761bed0 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/b/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/b/a.smali
@@ -16,29 +16,15 @@
 
 
 # instance fields
-.field private final bbR:Landroid/graphics/Bitmap$CompressFormat;
+.field private final bcB:Landroid/graphics/RectF;
 
-.field private final bbS:I
+.field private final bcC:Landroid/graphics/RectF;
 
-.field private final bca:I
+.field private bcD:F
 
-.field private final bcb:I
+.field private bcE:F
 
-.field private final bcc:Ljava/lang/String;
-
-.field private final bcd:Ljava/lang/String;
-
-.field private final bce:Lcom/yalantis/ucrop/model/b;
-
-.field private final bch:Landroid/graphics/RectF;
-
-.field private final bci:Landroid/graphics/RectF;
-
-.field private bcj:F
-
-.field private bck:F
-
-.field private final bcl:Ljava/lang/ref/WeakReference;
+.field private final bcF:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -48,17 +34,31 @@
     .end annotation
 .end field
 
-.field private bcm:Landroid/graphics/Bitmap;
+.field private bcG:Landroid/graphics/Bitmap;
 
-.field private final bcn:Lcom/yalantis/ucrop/a/a;
+.field private final bcH:Lcom/yalantis/ucrop/a/a;
 
-.field private bco:I
+.field private bcI:I
 
-.field private bcp:I
+.field private bcJ:I
 
-.field private bcq:I
+.field private bcK:I
 
-.field private bcr:I
+.field private bcL:I
+
+.field private final bcl:Landroid/graphics/Bitmap$CompressFormat;
+
+.field private final bcm:I
+
+.field private final bcu:I
+
+.field private final bcv:I
+
+.field private final bcw:Ljava/lang/String;
+
+.field private final bcx:Ljava/lang/String;
+
+.field private final bcy:Lcom/yalantis/ucrop/model/b;
 
 
 # direct methods
@@ -71,63 +71,63 @@
 
     invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcl:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcF:Ljava/lang/ref/WeakReference;
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iput-object p2, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
-    iget-object p1, p3, Lcom/yalantis/ucrop/model/c;->bch:Landroid/graphics/RectF;
+    iget-object p1, p3, Lcom/yalantis/ucrop/model/c;->bcB:Landroid/graphics/RectF;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->bch:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->bcB:Landroid/graphics/RectF;
 
-    iget-object p1, p3, Lcom/yalantis/ucrop/model/c;->bci:Landroid/graphics/RectF;
+    iget-object p1, p3, Lcom/yalantis/ucrop/model/c;->bcC:Landroid/graphics/RectF;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->bci:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->bcC:Landroid/graphics/RectF;
 
-    iget p1, p3, Lcom/yalantis/ucrop/model/c;->bcj:F
+    iget p1, p3, Lcom/yalantis/ucrop/model/c;->bcD:F
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->bcj:F
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->bcD:F
 
-    iget p1, p3, Lcom/yalantis/ucrop/model/c;->bck:F
+    iget p1, p3, Lcom/yalantis/ucrop/model/c;->bcE:F
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->bck:F
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->bcE:F
 
-    iget p1, p4, Lcom/yalantis/ucrop/model/a;->bca:I
+    iget p1, p4, Lcom/yalantis/ucrop/model/a;->bcu:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->bca:I
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->bcu:I
 
-    iget p1, p4, Lcom/yalantis/ucrop/model/a;->bcb:I
+    iget p1, p4, Lcom/yalantis/ucrop/model/a;->bcv:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->bcb:I
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->bcv:I
 
-    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->bbR:Landroid/graphics/Bitmap$CompressFormat;
+    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->bcl:Landroid/graphics/Bitmap$CompressFormat;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->bbR:Landroid/graphics/Bitmap$CompressFormat;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->bcl:Landroid/graphics/Bitmap$CompressFormat;
 
-    iget p1, p4, Lcom/yalantis/ucrop/model/a;->bbS:I
+    iget p1, p4, Lcom/yalantis/ucrop/model/a;->bcm:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->bbS:I
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->bcm:I
 
-    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->bcc:Ljava/lang/String;
+    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->bcw:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->bcc:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->bcw:Ljava/lang/String;
 
-    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->bcd:Ljava/lang/String;
+    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->bcx:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->bcd:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->bcx:Ljava/lang/String;
 
-    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->bce:Lcom/yalantis/ucrop/model/b;
+    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->bcy:Lcom/yalantis/ucrop/model/b;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->bce:Lcom/yalantis/ucrop/model/b;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->bcy:Lcom/yalantis/ucrop/model/b;
 
-    iput-object p5, p0, Lcom/yalantis/ucrop/b/a;->bcn:Lcom/yalantis/ucrop/a/a;
+    iput-object p5, p0, Lcom/yalantis/ucrop/b/a;->bcH:Lcom/yalantis/ucrop/a/a;
 
     return-void
 .end method
 
-.method private varargs Ct()Ljava/lang/Throwable;
+.method private varargs Ck()Ljava/lang/Throwable;
     .locals 12
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
     if-nez v0, :cond_0
 
@@ -155,7 +155,7 @@
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bci:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcC:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->isEmpty()Z
 
@@ -173,37 +173,37 @@
 
     :cond_2
     :try_start_0
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->bca:I
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->bcu:I
 
     const/4 v1, 0x0
 
     if-lez v0, :cond_5
 
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->bcb:I
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->bcv:I
 
     if-lez v0, :cond_5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcj:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcD:F
 
     div-float/2addr v0, v2
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bch:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->height()F
 
     move-result v2
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcj:F
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcD:F
 
     div-float/2addr v2, v3
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bca:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcu:I
 
     int-to-float v3, v3
 
@@ -211,7 +211,7 @@
 
     if-gtz v3, :cond_3
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcb:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcv:I
 
     int-to-float v3, v3
 
@@ -220,13 +220,13 @@
     if-lez v3, :cond_5
 
     :cond_3
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bca:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcu:I
 
     int-to-float v3, v3
 
     div-float/2addr v3, v0
 
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->bcb:I
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->bcv:I
 
     int-to-float v0, v0
 
@@ -236,9 +236,9 @@
 
     move-result v0
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
     invoke-virtual {v3}, Landroid/graphics/Bitmap;->getWidth()I
 
@@ -252,7 +252,7 @@
 
     move-result v3
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
     invoke-virtual {v4}, Landroid/graphics/Bitmap;->getHeight()I
 
@@ -270,25 +270,25 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
     if-eq v3, v2, :cond_4
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
     invoke-virtual {v3}, Landroid/graphics/Bitmap;->recycle()V
 
     :cond_4
-    iput-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iput-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcj:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcD:F
 
     div-float/2addr v2, v0
 
-    iput v2, p0, Lcom/yalantis/ucrop/b/a;->bcj:F
+    iput v2, p0, Lcom/yalantis/ucrop/b/a;->bcD:F
 
     :cond_5
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->bck:F
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->bcE:F
 
     const/4 v2, 0x0
 
@@ -300,9 +300,9 @@
 
     invoke-direct {v7}, Landroid/graphics/Matrix;-><init>()V
 
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->bck:F
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->bcE:F
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
     invoke-virtual {v2}, Landroid/graphics/Bitmap;->getWidth()I
 
@@ -312,7 +312,7 @@
 
     int-to-float v2, v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
     invoke-virtual {v3}, Landroid/graphics/Bitmap;->getHeight()I
 
@@ -324,19 +324,19 @@
 
     invoke-virtual {v7, v0, v2, v3}, Landroid/graphics/Matrix;->setRotate(FFF)V
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->getWidth()I
 
     move-result v5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->getHeight()I
 
@@ -348,29 +348,29 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
     if-eq v2, v0, :cond_6
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
     invoke-virtual {v2}, Landroid/graphics/Bitmap;->recycle()V
 
     :cond_6
-    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
     :cond_7
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcB:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->left:F
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bci:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcC:Landroid/graphics/RectF;
 
     iget v2, v2, Landroid/graphics/RectF;->left:F
 
     sub-float/2addr v0, v2
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcj:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcD:F
 
     div-float/2addr v0, v2
 
@@ -378,19 +378,19 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/b/a;->bcq:I
+    iput v0, p0, Lcom/yalantis/ucrop/b/a;->bcK:I
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcB:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->top:F
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bci:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcC:Landroid/graphics/RectF;
 
     iget v2, v2, Landroid/graphics/RectF;->top:F
 
     sub-float/2addr v0, v2
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcj:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcD:F
 
     div-float/2addr v0, v2
 
@@ -398,15 +398,15 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/b/a;->bcr:I
+    iput v0, p0, Lcom/yalantis/ucrop/b/a;->bcL:I
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcj:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcD:F
 
     div-float/2addr v0, v2
 
@@ -414,15 +414,15 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/b/a;->bco:I
+    iput v0, p0, Lcom/yalantis/ucrop/b/a;->bcI:I
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->height()F
 
     move-result v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcj:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcD:F
 
     div-float/2addr v0, v2
 
@@ -430,11 +430,11 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/b/a;->bcp:I
+    iput v0, p0, Lcom/yalantis/ucrop/b/a;->bcJ:I
 
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->bco:I
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->bcI:I
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcp:I
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcJ:I
 
     invoke-static {v0, v2}, Ljava/lang/Math;->max(II)I
 
@@ -454,20 +454,20 @@
 
     add-int/2addr v0, v2
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bca:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcu:I
 
     if-lez v3, :cond_8
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcb:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcv:I
 
     if-gtz v3, :cond_9
 
     :cond_8
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bch:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcB:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->left:F
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bci:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bcC:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->left:F
 
@@ -483,11 +483,11 @@
 
     if-gtz v3, :cond_9
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bch:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcB:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->top:F
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bci:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bcC:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->top:F
 
@@ -501,11 +501,11 @@
 
     if-gtz v3, :cond_9
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bch:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcB:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bci:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bcC:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->bottom:F
 
@@ -519,11 +519,11 @@
 
     if-gtz v3, :cond_9
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bch:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcB:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->right:F
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bci:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bcC:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->right:F
 
@@ -561,25 +561,25 @@
 
     new-instance v1, Landroid/media/ExifInterface;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcc:Ljava/lang/String;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcw:Ljava/lang/String;
 
     invoke-direct {v1, v2}, Landroid/media/ExifInterface;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcq:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcK:I
 
-    iget v4, p0, Lcom/yalantis/ucrop/b/a;->bcr:I
+    iget v4, p0, Lcom/yalantis/ucrop/b/a;->bcL:I
 
-    iget v5, p0, Lcom/yalantis/ucrop/b/a;->bco:I
+    iget v5, p0, Lcom/yalantis/ucrop/b/a;->bcI:I
 
-    iget v6, p0, Lcom/yalantis/ucrop/b/a;->bcp:I
+    iget v6, p0, Lcom/yalantis/ucrop/b/a;->bcJ:I
 
     invoke-static {v2, v3, v4, v5, v6}, Landroid/graphics/Bitmap;->createBitmap(Landroid/graphics/Bitmap;IIII)Landroid/graphics/Bitmap;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcl:Ljava/lang/ref/WeakReference;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->bcF:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v3}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -598,7 +598,7 @@
 
     new-instance v4, Ljava/io/File;
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/b/a;->bcd:Ljava/lang/String;
+    iget-object v5, p0, Lcom/yalantis/ucrop/b/a;->bcx:Ljava/lang/String;
 
     invoke-direct {v4, v5}, Ljava/io/File;-><init>(Ljava/lang/String;)V
 
@@ -613,9 +613,9 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bbR:Landroid/graphics/Bitmap$CompressFormat;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bcl:Landroid/graphics/Bitmap$CompressFormat;
 
-    iget v5, p0, Lcom/yalantis/ucrop/b/a;->bbS:I
+    iget v5, p0, Lcom/yalantis/ucrop/b/a;->bcm:I
 
     invoke-virtual {v2, v4, v5, v3}, Landroid/graphics/Bitmap;->compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z
 
@@ -647,7 +647,7 @@
 
     :cond_b
     :goto_1
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bbR:Landroid/graphics/Bitmap$CompressFormat;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcl:Landroid/graphics/Bitmap$CompressFormat;
 
     sget-object v3, Landroid/graphics/Bitmap$CompressFormat;->JPEG:Landroid/graphics/Bitmap$CompressFormat;
 
@@ -657,20 +657,20 @@
 
     if-eqz v2, :cond_10
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bco:I
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->bcI:I
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcp:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcJ:I
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bcd:Ljava/lang/String;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->bcx:Ljava/lang/String;
 
     invoke-static {v1, v2, v3, v4}, Lcom/yalantis/ucrop/c/f;->a(Landroid/media/ExifInterface;IILjava/lang/String;)V
 
     goto :goto_3
 
     :cond_c
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/a;->bcc:Ljava/lang/String;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/a;->bcw:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcd:Ljava/lang/String;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->bcx:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
 
@@ -783,7 +783,7 @@
 
     :cond_10
     :goto_3
-    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcm:Landroid/graphics/Bitmap;
+    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcG:Landroid/graphics/Bitmap;
     :try_end_7
     .catchall {:try_start_7 .. :try_end_7} :catchall_5
 
@@ -800,7 +800,7 @@
 .method protected final synthetic doInBackground([Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-direct {p0}, Lcom/yalantis/ucrop/b/a;->Ct()Ljava/lang/Throwable;
+    invoke-direct {p0}, Lcom/yalantis/ucrop/b/a;->Ck()Ljava/lang/Throwable;
 
     move-result-object p1
 
@@ -812,7 +812,7 @@
 
     check-cast p1, Ljava/lang/Throwable;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcn:Lcom/yalantis/ucrop/a/a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcH:Lcom/yalantis/ucrop/a/a;
 
     if-eqz v0, :cond_1
 
@@ -820,7 +820,7 @@
 
     new-instance p1, Ljava/io/File;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcd:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->bcx:Ljava/lang/String;
 
     invoke-direct {p1, v0}, Ljava/io/File;-><init>(Ljava/lang/String;)V
 
@@ -828,15 +828,15 @@
 
     move-result-object v2
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/a;->bcn:Lcom/yalantis/ucrop/a/a;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/a;->bcH:Lcom/yalantis/ucrop/a/a;
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcq:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->bcK:I
 
-    iget v4, p0, Lcom/yalantis/ucrop/b/a;->bcr:I
+    iget v4, p0, Lcom/yalantis/ucrop/b/a;->bcL:I
 
-    iget v5, p0, Lcom/yalantis/ucrop/b/a;->bco:I
+    iget v5, p0, Lcom/yalantis/ucrop/b/a;->bcI:I
 
-    iget v6, p0, Lcom/yalantis/ucrop/b/a;->bcp:I
+    iget v6, p0, Lcom/yalantis/ucrop/b/a;->bcJ:I
 
     invoke-interface/range {v1 .. v6}, Lcom/yalantis/ucrop/a/a;->a(Landroid/net/Uri;IIII)V
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/b/b$a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/b/b$a.smali
index 8610505ca7..c9de9283ad 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/b/b$a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/b/b$a.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field bce:Lcom/yalantis/ucrop/model/b;
+.field bcR:Landroid/graphics/Bitmap;
 
-.field bcx:Landroid/graphics/Bitmap;
+.field bcS:Ljava/lang/Exception;
 
-.field bcy:Ljava/lang/Exception;
+.field bcy:Lcom/yalantis/ucrop/model/b;
 
 
 # direct methods
@@ -28,9 +28,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/b$a;->bcx:Landroid/graphics/Bitmap;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/b$a;->bcR:Landroid/graphics/Bitmap;
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/b/b$a;->bce:Lcom/yalantis/ucrop/model/b;
+    iput-object p2, p0, Lcom/yalantis/ucrop/b/b$a;->bcy:Lcom/yalantis/ucrop/model/b;
 
     return-void
 .end method
@@ -40,7 +40,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/b$a;->bcy:Ljava/lang/Exception;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/b$a;->bcS:Ljava/lang/Exception;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/b/b.smali b/com.discord/smali_classes2/com/yalantis/ucrop/b/b.smali
index 90321c0a36..7a8c6f203a 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/b/b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/b/b.smali
@@ -22,15 +22,15 @@
 
 
 # instance fields
-.field private bcs:Landroid/net/Uri;
+.field private bcM:Landroid/net/Uri;
 
-.field private bct:Landroid/net/Uri;
+.field private bcN:Landroid/net/Uri;
 
-.field private final bcu:I
+.field private final bcO:I
 
-.field private final bcv:I
+.field private final bcP:I
 
-.field private final bcw:Lcom/yalantis/ucrop/a/b;
+.field private final bcQ:Lcom/yalantis/ucrop/a/b;
 
 .field private final mContext:Landroid/content/Context;
 
@@ -43,25 +43,25 @@
 
     iput-object p1, p0, Lcom/yalantis/ucrop/b/b;->mContext:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iput-object p2, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/b/b;->bct:Landroid/net/Uri;
+    iput-object p3, p0, Lcom/yalantis/ucrop/b/b;->bcN:Landroid/net/Uri;
 
-    iput p4, p0, Lcom/yalantis/ucrop/b/b;->bcu:I
+    iput p4, p0, Lcom/yalantis/ucrop/b/b;->bcO:I
 
-    iput p5, p0, Lcom/yalantis/ucrop/b/b;->bcv:I
+    iput p5, p0, Lcom/yalantis/ucrop/b/b;->bcP:I
 
-    iput-object p6, p0, Lcom/yalantis/ucrop/b/b;->bcw:Lcom/yalantis/ucrop/a/b;
+    iput-object p6, p0, Lcom/yalantis/ucrop/b/b;->bcQ:Lcom/yalantis/ucrop/a/b;
 
     return-void
 .end method
 
-.method private varargs Cu()Lcom/yalantis/ucrop/b/b$a;
+.method private varargs Cl()Lcom/yalantis/ucrop/b/b$a;
     .locals 14
 
     const-string v0, "BitmapWorkerTask"
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
     if-nez v1, :cond_0
 
@@ -138,7 +138,7 @@
 
     iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->mContext:Landroid/content/Context;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
     invoke-static {v1, v2}, Lcom/yalantis/ucrop/c/e;->getPath(Landroid/content/Context;Landroid/net/Uri;)Ljava/lang/String;
 
@@ -174,7 +174,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
     :try_end_0
     .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_7
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_6
@@ -183,9 +183,9 @@
 
     :cond_3
     :try_start_1
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->bct:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->bcN:Landroid/net/Uri;
 
     invoke-direct {p0, v1, v2}, Lcom/yalantis/ucrop/b/b;->a(Landroid/net/Uri;Landroid/net/Uri;)V
     :try_end_1
@@ -256,9 +256,9 @@
     :cond_6
     :goto_2
     :try_start_3
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->bct:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->bcN:Landroid/net/Uri;
 
     const-string v5, "downloadFile"
 
@@ -282,11 +282,11 @@
 
     move-result-object v1
 
-    invoke-virtual {v6, v1}, Lokhttp3/w$a;->eq(Ljava/lang/String;)Lokhttp3/w$a;
+    invoke-virtual {v6, v1}, Lokhttp3/w$a;->ek(Ljava/lang/String;)Lokhttp3/w$a;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {v1}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object v1
 
@@ -294,16 +294,16 @@
 
     move-result-object v1
 
-    invoke-interface {v1}, Lokhttp3/e;->Gr()Lokhttp3/Response;
+    invoke-interface {v1}, Lokhttp3/e;->Gg()Lokhttp3/Response;
 
     move-result-object v1
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_3
 
     :try_start_5
-    iget-object v6, v1, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v6, v1, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
-    invoke-virtual {v6}, Lokhttp3/x;->Hf()Lokio/d;
+    invoke-virtual {v6}, Lokhttp3/x;->GS()Lokio/d;
 
     move-result-object v6
     :try_end_5
@@ -340,18 +340,18 @@
 
     if-eqz v1, :cond_7
 
-    iget-object v1, v1, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v1, v1, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     invoke-static {v1}, Lcom/yalantis/ucrop/c/a;->f(Ljava/io/Closeable;)V
 
     :cond_7
-    iget-object v1, v5, Lokhttp3/t;->bun:Lokhttp3/n;
+    iget-object v1, v5, Lokhttp3/t;->buH:Lokhttp3/n;
 
     invoke-virtual {v1}, Lokhttp3/n;->cancelAll()V
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->bct:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcN:Landroid/net/Uri;
 
-    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
     :try_end_8
     .catch Ljava/lang/NullPointerException; {:try_start_8 .. :try_end_8} :catch_5
     .catch Ljava/io/IOException; {:try_start_8 .. :try_end_8} :catch_4
@@ -364,7 +364,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
     const-string v5, "r"
 
@@ -405,9 +405,9 @@
     goto/16 :goto_6
 
     :cond_8
-    iget v8, p0, Lcom/yalantis/ucrop/b/b;->bcu:I
+    iget v8, p0, Lcom/yalantis/ucrop/b/b;->bcO:I
 
-    iget v10, p0, Lcom/yalantis/ucrop/b/b;->bcv:I
+    iget v10, p0, Lcom/yalantis/ucrop/b/b;->bcP:I
 
     invoke-static {v6, v8, v10}, Lcom/yalantis/ucrop/c/a;->a(Landroid/graphics/BitmapFactory$Options;II)I
 
@@ -465,7 +465,7 @@
 
     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -493,7 +493,7 @@
     :cond_b
     iget-object v0, p0, Lcom/yalantis/ucrop/b/b;->mContext:Landroid/content/Context;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
     invoke-static {v0, v1}, Lcom/yalantis/ucrop/c/a;->b(Landroid/content/Context;Landroid/net/Uri;)I
 
@@ -593,7 +593,7 @@
 
     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -620,7 +620,7 @@
 
     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -694,18 +694,18 @@
 
     if-eqz v1, :cond_13
 
-    iget-object v1, v1, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v1, v1, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     invoke-static {v1}, Lcom/yalantis/ucrop/c/a;->f(Ljava/io/Closeable;)V
 
     :cond_13
-    iget-object v1, v5, Lokhttp3/t;->bun:Lokhttp3/n;
+    iget-object v1, v5, Lokhttp3/t;->buH:Lokhttp3/n;
 
     invoke-virtual {v1}, Lokhttp3/n;->cancelAll()V
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->bct:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcN:Landroid/net/Uri;
 
-    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
     throw v3
 
@@ -842,9 +842,9 @@
 
     invoke-static {p1}, Lcom/yalantis/ucrop/c/a;->f(Ljava/io/Closeable;)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/b/b;->bct:Landroid/net/Uri;
+    iget-object p1, p0, Lcom/yalantis/ucrop/b/b;->bcN:Landroid/net/Uri;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
     return-void
 
@@ -882,9 +882,9 @@
 
     invoke-static {p1}, Lcom/yalantis/ucrop/c/a;->f(Ljava/io/Closeable;)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/b/b;->bct:Landroid/net/Uri;
+    iget-object p1, p0, Lcom/yalantis/ucrop/b/b;->bcN:Landroid/net/Uri;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
     throw p2
 
@@ -909,7 +909,7 @@
 .method protected final synthetic doInBackground([Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-direct {p0}, Lcom/yalantis/ucrop/b/b;->Cu()Lcom/yalantis/ucrop/b/b$a;
+    invoke-direct {p0}, Lcom/yalantis/ucrop/b/b;->Cl()Lcom/yalantis/ucrop/b/b$a;
 
     move-result-object p1
 
@@ -921,23 +921,23 @@
 
     check-cast p1, Lcom/yalantis/ucrop/b/b$a;
 
-    iget-object v0, p1, Lcom/yalantis/ucrop/b/b$a;->bcy:Ljava/lang/Exception;
+    iget-object v0, p1, Lcom/yalantis/ucrop/b/b$a;->bcS:Ljava/lang/Exception;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/b;->bcw:Lcom/yalantis/ucrop/a/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/b;->bcQ:Lcom/yalantis/ucrop/a/b;
 
-    iget-object v1, p1, Lcom/yalantis/ucrop/b/b$a;->bcx:Landroid/graphics/Bitmap;
+    iget-object v1, p1, Lcom/yalantis/ucrop/b/b$a;->bcR:Landroid/graphics/Bitmap;
 
-    iget-object p1, p1, Lcom/yalantis/ucrop/b/b$a;->bce:Lcom/yalantis/ucrop/model/b;
+    iget-object p1, p1, Lcom/yalantis/ucrop/b/b$a;->bcy:Lcom/yalantis/ucrop/model/b;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->bcs:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->bcM:Landroid/net/Uri;
 
     invoke-virtual {v2}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/b;->bct:Landroid/net/Uri;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/b;->bcN:Landroid/net/Uri;
 
     if-nez v3, :cond_0
 
@@ -956,9 +956,9 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/b;->bcw:Lcom/yalantis/ucrop/a/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/b;->bcQ:Lcom/yalantis/ucrop/a/b;
 
-    iget-object p1, p1, Lcom/yalantis/ucrop/b/b$a;->bcy:Ljava/lang/Exception;
+    iget-object p1, p1, Lcom/yalantis/ucrop/b/b$a;->bcS:Ljava/lang/Exception;
 
     invoke-interface {v0, p1}, Lcom/yalantis/ucrop/a/b;->onFailure(Ljava/lang/Exception;)V
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/a.smali
index a0015870a9..9a12ec9f2b 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/a.smali
@@ -114,13 +114,13 @@
 
     invoke-direct {v1, p0}, Lcom/yalantis/ucrop/c/f;-><init>(Ljava/io/InputStream;)V
 
-    iget-object v2, v1, Lcom/yalantis/ucrop/c/f;->bcB:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v2, v1, Lcom/yalantis/ucrop/c/f;->bcV:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v2}, Lcom/yalantis/ucrop/c/f$b;->Cx()I
+    invoke-interface {v2}, Lcom/yalantis/ucrop/c/f$b;->Co()I
 
     move-result v2
 
-    invoke-static {v2}, Lcom/yalantis/ucrop/c/f;->dc(I)Z
+    invoke-static {v2}, Lcom/yalantis/ucrop/c/f;->cZ(I)Z
 
     move-result v3
     :try_end_0
@@ -160,7 +160,7 @@
     goto :goto_1
 
     :cond_2
-    invoke-virtual {v1}, Lcom/yalantis/ucrop/c/f;->Cw()I
+    invoke-virtual {v1}, Lcom/yalantis/ucrop/c/f;->Cn()I
 
     move-result v2
 
@@ -181,7 +181,7 @@
     :cond_3
     new-array v3, v2, [B
 
-    iget-object v1, v1, Lcom/yalantis/ucrop/c/f;->bcB:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v1, v1, Lcom/yalantis/ucrop/c/f;->bcV:Lcom/yalantis/ucrop/c/f$b;
 
     invoke-interface {v1, v3, v2}, Lcom/yalantis/ucrop/c/f$b;->k([BI)I
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/c.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/c.smali
index c44235beea..951cce02e9 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/c.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/c.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static Cv()I
+.method public static Cm()I
     .locals 24
 
     const/4 v1, 0x0
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/f$a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/f$a.smali
index 50889047d3..81b038b783 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/f$a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/f$a.smali
@@ -47,7 +47,7 @@
 
 
 # virtual methods
-.method public final dd(I)I
+.method public final da(I)I
     .locals 1
 
     iget-object v0, p0, Lcom/yalantis/ucrop/c/f$a;->data:Ljava/nio/ByteBuffer;
@@ -59,7 +59,7 @@
     return p1
 .end method
 
-.method public final de(I)S
+.method public final db(I)S
     .locals 1
 
     iget-object v0, p0, Lcom/yalantis/ucrop/c/f$a;->data:Ljava/nio/ByteBuffer;
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/f$b.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/f$b.smali
index 6b3969700b..6670a819b7 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/f$b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/f$b.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract Cx()I
+.method public abstract Co()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -23,7 +23,7 @@
     .end annotation
 .end method
 
-.method public abstract Cy()S
+.method public abstract Cp()S
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/f$c.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/f$c.smali
index 51daa107e1..ce6767180b 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/f$c.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/f$c.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final bcC:Ljava/io/InputStream;
+.field private final bcW:Ljava/io/InputStream;
 
 
 # direct methods
@@ -27,14 +27,14 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/c/f$c;->bcC:Ljava/io/InputStream;
+    iput-object p1, p0, Lcom/yalantis/ucrop/c/f$c;->bcW:Ljava/io/InputStream;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Cx()I
+.method public final Co()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -42,7 +42,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/c/f$c;->bcC:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/yalantis/ucrop/c/f$c;->bcW:Ljava/io/InputStream;
 
     invoke-virtual {v0}, Ljava/io/InputStream;->read()I
 
@@ -54,7 +54,7 @@
 
     and-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/c/f$c;->bcC:Ljava/io/InputStream;
+    iget-object v1, p0, Lcom/yalantis/ucrop/c/f$c;->bcW:Ljava/io/InputStream;
 
     invoke-virtual {v1}, Ljava/io/InputStream;->read()I
 
@@ -67,7 +67,7 @@
     return v0
 .end method
 
-.method public final Cy()S
+.method public final Cp()S
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -75,7 +75,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/c/f$c;->bcC:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/yalantis/ucrop/c/f$c;->bcW:Ljava/io/InputStream;
 
     invoke-virtual {v0}, Ljava/io/InputStream;->read()I
 
@@ -101,7 +101,7 @@
     :goto_0
     if-lez v0, :cond_0
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/c/f$c;->bcC:Ljava/io/InputStream;
+    iget-object v1, p0, Lcom/yalantis/ucrop/c/f$c;->bcW:Ljava/io/InputStream;
 
     sub-int v2, p2, v0
 
@@ -147,7 +147,7 @@
 
     if-lez v4, :cond_2
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/c/f$c;->bcC:Ljava/io/InputStream;
+    iget-object v4, p0, Lcom/yalantis/ucrop/c/f$c;->bcW:Ljava/io/InputStream;
 
     invoke-virtual {v4, v2, v3}, Ljava/io/InputStream;->skip(J)J
 
@@ -163,7 +163,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v4, p0, Lcom/yalantis/ucrop/c/f$c;->bcC:Ljava/io/InputStream;
+    iget-object v4, p0, Lcom/yalantis/ucrop/c/f$c;->bcW:Ljava/io/InputStream;
 
     invoke-virtual {v4}, Ljava/io/InputStream;->read()I
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/f.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/f.smali
index 330a7aa22f..ed85b4ed82 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/f.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/f.smali
@@ -14,13 +14,13 @@
 
 
 # static fields
-.field private static final bcA:[I
+.field private static final bcT:[B
 
-.field private static final bcz:[B
+.field private static final bcU:[I
 
 
 # instance fields
-.field final bcB:Lcom/yalantis/ucrop/c/f$b;
+.field final bcV:Lcom/yalantis/ucrop/c/f$b;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/yalantis/ucrop/c/f;->bcz:[B
+    sput-object v0, Lcom/yalantis/ucrop/c/f;->bcT:[B
 
     const/16 v0, 0xd
 
@@ -47,7 +47,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/yalantis/ucrop/c/f;->bcA:[I
+    sput-object v0, Lcom/yalantis/ucrop/c/f;->bcU:[I
 
     return-void
 
@@ -78,7 +78,7 @@
 
     invoke-direct {v0, p1}, Lcom/yalantis/ucrop/c/f$c;-><init>(Ljava/io/InputStream;)V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/c/f;->bcB:Lcom/yalantis/ucrop/c/f$b;
+    iput-object v0, p0, Lcom/yalantis/ucrop/c/f;->bcV:Lcom/yalantis/ucrop/c/f$b;
 
     return-void
 .end method
@@ -88,7 +88,7 @@
 
     const/4 v0, 0x6
 
-    invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/c/f$a;->de(I)S
+    invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/c/f$a;->db(I)S
 
     move-result v1
 
@@ -137,13 +137,13 @@
 
     const/16 v1, 0xa
 
-    invoke-virtual {p0, v1}, Lcom/yalantis/ucrop/c/f$a;->dd(I)I
+    invoke-virtual {p0, v1}, Lcom/yalantis/ucrop/c/f$a;->da(I)I
 
     move-result v1
 
     add-int/2addr v1, v0
 
-    invoke-virtual {p0, v1}, Lcom/yalantis/ucrop/c/f$a;->de(I)S
+    invoke-virtual {p0, v1}, Lcom/yalantis/ucrop/c/f$a;->db(I)S
 
     move-result v0
 
@@ -158,7 +158,7 @@
 
     add-int/2addr v5, v6
 
-    invoke-virtual {p0, v5}, Lcom/yalantis/ucrop/c/f$a;->de(I)S
+    invoke-virtual {p0, v5}, Lcom/yalantis/ucrop/c/f$a;->db(I)S
 
     move-result v6
 
@@ -168,7 +168,7 @@
 
     add-int/lit8 v7, v5, 0x2
 
-    invoke-virtual {p0, v7}, Lcom/yalantis/ucrop/c/f$a;->de(I)S
+    invoke-virtual {p0, v7}, Lcom/yalantis/ucrop/c/f$a;->db(I)S
 
     move-result v7
 
@@ -183,7 +183,7 @@
     :cond_2
     add-int/lit8 v8, v5, 0x4
 
-    invoke-virtual {p0, v8}, Lcom/yalantis/ucrop/c/f$a;->dd(I)I
+    invoke-virtual {p0, v8}, Lcom/yalantis/ucrop/c/f$a;->da(I)I
 
     move-result v8
 
@@ -241,7 +241,7 @@
     invoke-static {v3, v9}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_4
-    sget-object v9, Lcom/yalantis/ucrop/c/f;->bcA:[I
+    sget-object v9, Lcom/yalantis/ucrop/c/f;->bcU:[I
 
     aget v9, v9, v7
 
@@ -302,7 +302,7 @@
     goto :goto_2
 
     :cond_7
-    invoke-virtual {p0, v5}, Lcom/yalantis/ucrop/c/f$a;->de(I)S
+    invoke-virtual {p0, v5}, Lcom/yalantis/ucrop/c/f$a;->db(I)S
 
     move-result p0
 
@@ -599,7 +599,7 @@
     return-void
 .end method
 
-.method static dc(I)Z
+.method static cZ(I)Z
     .locals 2
 
     const v0, 0xffd8
@@ -633,7 +633,7 @@
 .method static j([BI)Z
     .locals 4
 
-    sget-object v0, Lcom/yalantis/ucrop/c/f;->bcz:[B
+    sget-object v0, Lcom/yalantis/ucrop/c/f;->bcT:[B
 
     array-length v0, v0
 
@@ -654,7 +654,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    sget-object v2, Lcom/yalantis/ucrop/c/f;->bcz:[B
+    sget-object v2, Lcom/yalantis/ucrop/c/f;->bcT:[B
 
     array-length v3, v2
 
@@ -682,7 +682,7 @@
 
 
 # virtual methods
-.method final Cw()I
+.method final Cn()I
     .locals 10
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -691,9 +691,9 @@
     .end annotation
 
     :cond_0
-    iget-object v0, p0, Lcom/yalantis/ucrop/c/f;->bcB:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/c/f;->bcV:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Cy()S
+    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Cp()S
 
     move-result v0
 
@@ -729,9 +729,9 @@
     return v3
 
     :cond_2
-    iget-object v0, p0, Lcom/yalantis/ucrop/c/f;->bcB:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/c/f;->bcV:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Cy()S
+    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Cp()S
 
     move-result v0
 
@@ -760,9 +760,9 @@
     return v3
 
     :cond_5
-    iget-object v1, p0, Lcom/yalantis/ucrop/c/f;->bcB:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v1, p0, Lcom/yalantis/ucrop/c/f;->bcV:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v1}, Lcom/yalantis/ucrop/c/f$b;->Cx()I
+    invoke-interface {v1}, Lcom/yalantis/ucrop/c/f$b;->Co()I
 
     move-result v1
 
@@ -772,7 +772,7 @@
 
     if-eq v0, v5, :cond_7
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/c/f;->bcB:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v5, p0, Lcom/yalantis/ucrop/c/f;->bcV:Lcom/yalantis/ucrop/c/f$b;
 
     int-to-long v6, v1
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/h.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/h.smali
index 50e5ab2ccc..bad572836e 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/h.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/h.smali
@@ -13,23 +13,23 @@
 
 
 # instance fields
-.field public bcD:F
+.field public bcX:F
 
-.field public bcE:F
+.field public bcY:F
 
-.field public bcF:F
+.field public bcZ:F
 
-.field public bcG:F
+.field public bda:F
 
-.field public bcH:I
+.field public bdb:I
 
-.field public bcI:I
+.field public bdc:I
 
-.field public bcJ:F
+.field public bdd:F
 
-.field public bcK:Z
+.field public bde:Z
 
-.field public bcL:Lcom/yalantis/ucrop/c/h$a;
+.field public bdf:Lcom/yalantis/ucrop/c/h$a;
 
 
 # direct methods
@@ -38,13 +38,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/c/h;->bcL:Lcom/yalantis/ucrop/c/h$a;
+    iput-object p1, p0, Lcom/yalantis/ucrop/c/h;->bdf:Lcom/yalantis/ucrop/c/h$a;
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/yalantis/ucrop/c/h;->bcH:I
+    iput p1, p0, Lcom/yalantis/ucrop/c/h;->bdb:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/c/h;->bcI:I
+    iput p1, p0, Lcom/yalantis/ucrop/c/h;->bdc:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/c/i.smali b/com.discord/smali_classes2/com/yalantis/ucrop/c/i.smali
index 3b8fcdce38..805f037a10 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/i.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/i.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private bcM:I
+.field private bdg:I
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Landroid/graphics/drawable/StateListDrawable;-><init>()V
 
-    iput p2, p0, Lcom/yalantis/ucrop/c/i;->bcM:I
+    iput p2, p0, Lcom/yalantis/ucrop/c/i;->bdg:I
 
     const/4 p2, 0x1
 
@@ -72,7 +72,7 @@
     :cond_1
     if-eqz v2, :cond_2
 
-    iget v0, p0, Lcom/yalantis/ucrop/c/i;->bcM:I
+    iget v0, p0, Lcom/yalantis/ucrop/c/i;->bdg:I
 
     sget-object v1, Landroid/graphics/PorterDuff$Mode;->SRC_ATOP:Landroid/graphics/PorterDuff$Mode;
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/model/AspectRatio.smali b/com.discord/smali_classes2/com/yalantis/ucrop/model/AspectRatio.smali
index aed077c0ed..6e1496d8ca 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/model/AspectRatio.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/model/AspectRatio.smali
@@ -19,11 +19,11 @@
 
 
 # instance fields
-.field public final bbX:Ljava/lang/String;
+.field public final bcr:Ljava/lang/String;
 
-.field public final bbY:F
+.field public final bcs:F
 
-.field public final bbZ:F
+.field public final bct:F
 
 
 # direct methods
@@ -48,19 +48,19 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bbX:Ljava/lang/String;
+    iput-object v0, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bcr:Ljava/lang/String;
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bbY:F
+    iput v0, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bcs:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bbZ:F
+    iput p1, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bct:F
 
     return-void
 .end method
@@ -70,11 +70,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bbX:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bcr:Ljava/lang/String;
 
-    iput p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bbY:F
+    iput p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bcs:F
 
-    iput p3, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bbZ:F
+    iput p3, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bct:F
 
     return-void
 .end method
@@ -92,15 +92,15 @@
 .method public writeToParcel(Landroid/os/Parcel;I)V
     .locals 0
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bbX:Ljava/lang/String;
+    iget-object p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bcr:Ljava/lang/String;
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    iget p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bbY:F
+    iget p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bcs:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bbZ:F
+    iget p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->bct:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/model/a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/model/a.smali
index d67d28db65..e71fdaa4b5 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/model/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/model/a.smali
@@ -4,19 +4,19 @@
 
 
 # instance fields
-.field public bbR:Landroid/graphics/Bitmap$CompressFormat;
+.field public bcl:Landroid/graphics/Bitmap$CompressFormat;
 
-.field public bbS:I
+.field public bcm:I
 
-.field public bca:I
+.field public bcu:I
 
-.field public bcb:I
+.field public bcv:I
 
-.field public bcc:Ljava/lang/String;
+.field public bcw:Ljava/lang/String;
 
-.field public bcd:Ljava/lang/String;
+.field public bcx:Ljava/lang/String;
 
-.field public bce:Lcom/yalantis/ucrop/model/b;
+.field public bcy:Lcom/yalantis/ucrop/model/b;
 
 
 # direct methods
@@ -25,19 +25,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/yalantis/ucrop/model/a;->bca:I
+    iput p1, p0, Lcom/yalantis/ucrop/model/a;->bcu:I
 
-    iput p2, p0, Lcom/yalantis/ucrop/model/a;->bcb:I
+    iput p2, p0, Lcom/yalantis/ucrop/model/a;->bcv:I
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/model/a;->bbR:Landroid/graphics/Bitmap$CompressFormat;
+    iput-object p3, p0, Lcom/yalantis/ucrop/model/a;->bcl:Landroid/graphics/Bitmap$CompressFormat;
 
-    iput p4, p0, Lcom/yalantis/ucrop/model/a;->bbS:I
+    iput p4, p0, Lcom/yalantis/ucrop/model/a;->bcm:I
 
-    iput-object p5, p0, Lcom/yalantis/ucrop/model/a;->bcc:Ljava/lang/String;
+    iput-object p5, p0, Lcom/yalantis/ucrop/model/a;->bcw:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/yalantis/ucrop/model/a;->bcd:Ljava/lang/String;
+    iput-object p6, p0, Lcom/yalantis/ucrop/model/a;->bcx:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/yalantis/ucrop/model/a;->bce:Lcom/yalantis/ucrop/model/b;
+    iput-object p7, p0, Lcom/yalantis/ucrop/model/a;->bcy:Lcom/yalantis/ucrop/model/b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/model/b.smali b/com.discord/smali_classes2/com/yalantis/ucrop/model/b.smali
index c850ad9fb8..eb606342e9 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/model/b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/model/b.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private LQ:I
+.field private Mi:I
 
-.field private bcf:I
+.field private bcA:I
 
-.field private bcg:I
+.field private bcz:I
 
 
 # direct methods
@@ -17,11 +17,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/yalantis/ucrop/model/b;->LQ:I
+    iput p1, p0, Lcom/yalantis/ucrop/model/b;->Mi:I
 
-    iput p2, p0, Lcom/yalantis/ucrop/model/b;->bcf:I
+    iput p2, p0, Lcom/yalantis/ucrop/model/b;->bcz:I
 
-    iput p3, p0, Lcom/yalantis/ucrop/model/b;->bcg:I
+    iput p3, p0, Lcom/yalantis/ucrop/model/b;->bcA:I
 
     return-void
 .end method
@@ -57,27 +57,27 @@
     :cond_1
     check-cast p1, Lcom/yalantis/ucrop/model/b;
 
-    iget v2, p0, Lcom/yalantis/ucrop/model/b;->LQ:I
+    iget v2, p0, Lcom/yalantis/ucrop/model/b;->Mi:I
 
-    iget v3, p1, Lcom/yalantis/ucrop/model/b;->LQ:I
+    iget v3, p1, Lcom/yalantis/ucrop/model/b;->Mi:I
 
     if-eq v2, v3, :cond_2
 
     return v1
 
     :cond_2
-    iget v2, p0, Lcom/yalantis/ucrop/model/b;->bcf:I
+    iget v2, p0, Lcom/yalantis/ucrop/model/b;->bcz:I
 
-    iget v3, p1, Lcom/yalantis/ucrop/model/b;->bcf:I
+    iget v3, p1, Lcom/yalantis/ucrop/model/b;->bcz:I
 
     if-eq v2, v3, :cond_3
 
     return v1
 
     :cond_3
-    iget v2, p0, Lcom/yalantis/ucrop/model/b;->bcg:I
+    iget v2, p0, Lcom/yalantis/ucrop/model/b;->bcA:I
 
-    iget p1, p1, Lcom/yalantis/ucrop/model/b;->bcg:I
+    iget p1, p1, Lcom/yalantis/ucrop/model/b;->bcA:I
 
     if-ne v2, p1, :cond_4
 
@@ -91,17 +91,17 @@
 .method public final hashCode()I
     .locals 2
 
-    iget v0, p0, Lcom/yalantis/ucrop/model/b;->LQ:I
+    iget v0, p0, Lcom/yalantis/ucrop/model/b;->Mi:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/yalantis/ucrop/model/b;->bcf:I
+    iget v1, p0, Lcom/yalantis/ucrop/model/b;->bcz:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/yalantis/ucrop/model/b;->bcg:I
+    iget v1, p0, Lcom/yalantis/ucrop/model/b;->bcA:I
 
     add-int/2addr v0, v1
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/model/c.smali b/com.discord/smali_classes2/com/yalantis/ucrop/model/c.smali
index 1c59363061..47be46d6b0 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/model/c.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/model/c.smali
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field public bch:Landroid/graphics/RectF;
+.field public bcB:Landroid/graphics/RectF;
 
-.field public bci:Landroid/graphics/RectF;
+.field public bcC:Landroid/graphics/RectF;
 
-.field public bcj:F
+.field public bcD:F
 
-.field public bck:F
+.field public bcE:F
 
 
 # direct methods
@@ -19,13 +19,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/model/c;->bch:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/model/c;->bcB:Landroid/graphics/RectF;
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/model/c;->bci:Landroid/graphics/RectF;
+    iput-object p2, p0, Lcom/yalantis/ucrop/model/c;->bcC:Landroid/graphics/RectF;
 
-    iput p3, p0, Lcom/yalantis/ucrop/model/c;->bcj:F
+    iput p3, p0, Lcom/yalantis/ucrop/model/c;->bcD:F
 
-    iput p4, p0, Lcom/yalantis/ucrop/model/c;->bck:F
+    iput p4, p0, Lcom/yalantis/ucrop/model/c;->bcE:F
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView$a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView$a.smali
index 0325a6ab4e..dca442469c 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView$a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field final synthetic bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
 
 # direct methods
 .method private constructor <init>(Lcom/yalantis/ucrop/view/GestureCropImageView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-direct {p0}, Landroid/view/GestureDetector$SimpleOnGestureListener;-><init>()V
 
@@ -42,7 +42,7 @@
 .method public final onDoubleTap(Landroid/view/MotionEvent;)Z
     .locals 10
 
-    iget-object v8, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v8, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-virtual {v8}, Lcom/yalantis/ucrop/view/GestureCropImageView;->getDoubleTapTargetScale()F
 
@@ -85,7 +85,7 @@
 
     invoke-direct/range {v0 .. v7}, Lcom/yalantis/ucrop/view/a$b;-><init>(Lcom/yalantis/ucrop/view/a;JFFFF)V
 
-    iput-object v9, v8, Lcom/yalantis/ucrop/view/a;->bcR:Ljava/lang/Runnable;
+    iput-object v9, v8, Lcom/yalantis/ucrop/view/a;->bdl:Ljava/lang/Runnable;
 
     invoke-virtual {v8, v9}, Lcom/yalantis/ucrop/view/a;->post(Ljava/lang/Runnable;)Z
 
@@ -99,7 +99,7 @@
 .method public final onScroll(Landroid/view/MotionEvent;Landroid/view/MotionEvent;FF)Z
     .locals 0
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     neg-float p2, p3
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView$b.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView$b.smali
index a62fcba176..fbf23b72da 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView$b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView$b.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field final synthetic bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
 
 # direct methods
 .method private constructor <init>(Lcom/yalantis/ucrop/view/GestureCropImageView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-direct {p0}, Lcom/yalantis/ucrop/c/h$b;-><init>()V
 
@@ -42,17 +42,17 @@
 .method public final a(Lcom/yalantis/ucrop/c/h;)Z
     .locals 3
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget p1, p1, Lcom/yalantis/ucrop/c/h;->bcJ:F
+    iget p1, p1, Lcom/yalantis/ucrop/c/h;->bdd:F
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-static {v1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->a(Lcom/yalantis/ucrop/view/GestureCropImageView;)F
 
     move-result v1
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-static {v2}, Lcom/yalantis/ucrop/view/GestureCropImageView;->b(Lcom/yalantis/ucrop/view/GestureCropImageView;)F
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView$c.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView$c.smali
index a3369a824d..ea496eade7 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView$c.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView$c.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field final synthetic bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
 
 # direct methods
 .method private constructor <init>(Lcom/yalantis/ucrop/view/GestureCropImageView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-direct {p0}, Landroid/view/ScaleGestureDetector$SimpleOnScaleGestureListener;-><init>()V
 
@@ -42,19 +42,19 @@
 .method public final onScale(Landroid/view/ScaleGestureDetector;)Z
     .locals 3
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-virtual {p1}, Landroid/view/ScaleGestureDetector;->getScaleFactor()F
 
     move-result p1
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-static {v1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->a(Lcom/yalantis/ucrop/view/GestureCropImageView;)F
 
     move-result v1
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->bdn:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->bdH:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-static {v2}, Lcom/yalantis/ucrop/view/GestureCropImageView;->b(Lcom/yalantis/ucrop/view/GestureCropImageView;)F
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView.smali
index 1939672846..649852bb79 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/GestureCropImageView.smali
@@ -14,21 +14,21 @@
 
 
 # instance fields
-.field private Zo:Z
+.field private ZG:Z
 
-.field private bdg:Landroid/view/ScaleGestureDetector;
+.field private bdA:Landroid/view/ScaleGestureDetector;
 
-.field private bdh:Lcom/yalantis/ucrop/c/h;
+.field private bdB:Lcom/yalantis/ucrop/c/h;
 
-.field private bdi:Landroid/view/GestureDetector;
+.field private bdC:Landroid/view/GestureDetector;
 
-.field private bdj:F
+.field private bdD:F
 
-.field private bdk:F
+.field private bdE:F
 
-.field private bdl:Z
+.field private bdF:Z
 
-.field private bdm:I
+.field private bdG:I
 
 
 # direct methods
@@ -39,13 +39,13 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdl:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdF:Z
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->Zo:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->ZG:Z
 
     const/4 p1, 0x5
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdm:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdG:I
 
     return-void
 .end method
@@ -67,13 +67,13 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdl:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdF:Z
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->Zo:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->ZG:Z
 
     const/4 p1, 0x5
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdm:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdG:I
 
     return-void
 .end method
@@ -81,7 +81,7 @@
 .method static synthetic a(Lcom/yalantis/ucrop/view/GestureCropImageView;)F
     .locals 0
 
-    iget p0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdj:F
+    iget p0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdD:F
 
     return p0
 .end method
@@ -89,7 +89,7 @@
 .method static synthetic b(Lcom/yalantis/ucrop/view/GestureCropImageView;)F
     .locals 0
 
-    iget p0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdk:F
+    iget p0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdE:F
 
     return p0
 .end method
@@ -99,7 +99,7 @@
 .method public getDoubleTapScaleSteps()I
     .locals 1
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdm:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdG:I
 
     return v0
 .end method
@@ -123,7 +123,7 @@
 
     float-to-double v1, v1
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdm:I
+    iget v3, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdG:I
 
     int-to-float v3, v3
 
@@ -167,7 +167,7 @@
 
     invoke-direct {v0, v1, v2, v4, v5}, Landroid/view/GestureDetector;-><init>(Landroid/content/Context;Landroid/view/GestureDetector$OnGestureListener;Landroid/os/Handler;Z)V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdi:Landroid/view/GestureDetector;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdC:Landroid/view/GestureDetector;
 
     new-instance v0, Landroid/view/ScaleGestureDetector;
 
@@ -181,7 +181,7 @@
 
     invoke-direct {v0, v1, v2}, Landroid/view/ScaleGestureDetector;-><init>(Landroid/content/Context;Landroid/view/ScaleGestureDetector$OnScaleGestureListener;)V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdg:Landroid/view/ScaleGestureDetector;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdA:Landroid/view/ScaleGestureDetector;
 
     new-instance v0, Lcom/yalantis/ucrop/c/h;
 
@@ -191,7 +191,7 @@
 
     invoke-direct {v0, v1}, Lcom/yalantis/ucrop/c/h;-><init>(Lcom/yalantis/ucrop/c/h$a;)V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdh:Lcom/yalantis/ucrop/c/h;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdB:Lcom/yalantis/ucrop/c/h;
 
     return-void
 .end method
@@ -207,7 +207,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->Cz()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->Cq()V
 
     :cond_0
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getPointerCount()I
@@ -234,7 +234,7 @@
 
     div-float/2addr v0, v3
 
-    iput v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdj:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdD:F
 
     invoke-virtual {p1, v1}, Landroid/view/MotionEvent;->getY(I)F
 
@@ -248,27 +248,27 @@
 
     div-float/2addr v0, v3
 
-    iput v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdk:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdE:F
 
     :cond_1
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdi:Landroid/view/GestureDetector;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdC:Landroid/view/GestureDetector;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
-    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->Zo:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->ZG:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdg:Landroid/view/ScaleGestureDetector;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdA:Landroid/view/ScaleGestureDetector;
 
     invoke-virtual {v0, p1}, Landroid/view/ScaleGestureDetector;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
     :cond_2
-    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdl:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdF:Z
 
     if-eqz v0, :cond_c
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdh:Lcom/yalantis/ucrop/c/h;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdB:Lcom/yalantis/ucrop/c/h;
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionMasked()I
 
@@ -297,7 +297,7 @@
     goto/16 :goto_1
 
     :cond_3
-    iput v5, v0, Lcom/yalantis/ucrop/c/h;->bcI:I
+    iput v5, v0, Lcom/yalantis/ucrop/c/h;->bdc:I
 
     goto/16 :goto_1
 
@@ -306,13 +306,13 @@
 
     move-result v1
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->bcD:F
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->bcX:F
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getY()F
 
     move-result v1
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->bcE:F
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->bcY:F
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionIndex()I
 
@@ -326,20 +326,20 @@
 
     move-result v1
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->bcI:I
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->bdc:I
 
-    iput v4, v0, Lcom/yalantis/ucrop/c/h;->bcJ:F
+    iput v4, v0, Lcom/yalantis/ucrop/c/h;->bdd:F
 
-    iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->bcK:Z
+    iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->bde:Z
 
     goto/16 :goto_1
 
     :cond_5
-    iget v3, v0, Lcom/yalantis/ucrop/c/h;->bcH:I
+    iget v3, v0, Lcom/yalantis/ucrop/c/h;->bdb:I
 
     if-eq v3, v5, :cond_c
 
-    iget v3, v0, Lcom/yalantis/ucrop/c/h;->bcI:I
+    iget v3, v0, Lcom/yalantis/ucrop/c/h;->bdc:I
 
     if-eq v3, v5, :cond_c
 
@@ -347,52 +347,52 @@
 
     move-result v3
 
-    iget v5, v0, Lcom/yalantis/ucrop/c/h;->bcI:I
+    iget v5, v0, Lcom/yalantis/ucrop/c/h;->bdc:I
 
     if-le v3, v5, :cond_c
 
-    iget v3, v0, Lcom/yalantis/ucrop/c/h;->bcH:I
+    iget v3, v0, Lcom/yalantis/ucrop/c/h;->bdb:I
 
     invoke-virtual {p1, v3}, Landroid/view/MotionEvent;->getX(I)F
 
     move-result v3
 
-    iget v5, v0, Lcom/yalantis/ucrop/c/h;->bcH:I
+    iget v5, v0, Lcom/yalantis/ucrop/c/h;->bdb:I
 
     invoke-virtual {p1, v5}, Landroid/view/MotionEvent;->getY(I)F
 
     move-result v5
 
-    iget v6, v0, Lcom/yalantis/ucrop/c/h;->bcI:I
+    iget v6, v0, Lcom/yalantis/ucrop/c/h;->bdc:I
 
     invoke-virtual {p1, v6}, Landroid/view/MotionEvent;->getX(I)F
 
     move-result v6
 
-    iget v7, v0, Lcom/yalantis/ucrop/c/h;->bcI:I
+    iget v7, v0, Lcom/yalantis/ucrop/c/h;->bdc:I
 
     invoke-virtual {p1, v7}, Landroid/view/MotionEvent;->getY(I)F
 
     move-result v7
 
-    iget-boolean v8, v0, Lcom/yalantis/ucrop/c/h;->bcK:Z
+    iget-boolean v8, v0, Lcom/yalantis/ucrop/c/h;->bde:Z
 
     if-eqz v8, :cond_6
 
-    iput v4, v0, Lcom/yalantis/ucrop/c/h;->bcJ:F
+    iput v4, v0, Lcom/yalantis/ucrop/c/h;->bdd:F
 
-    iput-boolean v1, v0, Lcom/yalantis/ucrop/c/h;->bcK:Z
+    iput-boolean v1, v0, Lcom/yalantis/ucrop/c/h;->bde:Z
 
     goto :goto_0
 
     :cond_6
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->bcD:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->bcX:F
 
-    iget v4, v0, Lcom/yalantis/ucrop/c/h;->bcE:F
+    iget v4, v0, Lcom/yalantis/ucrop/c/h;->bcY:F
 
-    iget v8, v0, Lcom/yalantis/ucrop/c/h;->bcF:F
+    iget v8, v0, Lcom/yalantis/ucrop/c/h;->bcZ:F
 
-    iget v9, v0, Lcom/yalantis/ucrop/c/h;->bcG:F
+    iget v9, v0, Lcom/yalantis/ucrop/c/h;->bda:F
 
     sub-float/2addr v4, v9
 
@@ -446,9 +446,9 @@
 
     sub-float/2addr v4, v1
 
-    iput v4, v0, Lcom/yalantis/ucrop/c/h;->bcJ:F
+    iput v4, v0, Lcom/yalantis/ucrop/c/h;->bdd:F
 
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->bcJ:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->bdd:F
 
     const/high16 v4, -0x3ccc0000    # -180.0f
 
@@ -456,16 +456,16 @@
 
     if-gez v1, :cond_7
 
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->bcJ:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->bdd:F
 
     add-float/2addr v1, v8
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->bcJ:F
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->bdd:F
 
     goto :goto_0
 
     :cond_7
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->bcJ:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->bdd:F
 
     const/high16 v4, 0x43340000    # 180.0f
 
@@ -473,35 +473,35 @@
 
     if-lez v1, :cond_8
 
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->bcJ:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->bdd:F
 
     sub-float/2addr v1, v8
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->bcJ:F
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->bdd:F
 
     :cond_8
     :goto_0
-    iget-object v1, v0, Lcom/yalantis/ucrop/c/h;->bcL:Lcom/yalantis/ucrop/c/h$a;
+    iget-object v1, v0, Lcom/yalantis/ucrop/c/h;->bdf:Lcom/yalantis/ucrop/c/h$a;
 
     if-eqz v1, :cond_9
 
-    iget-object v1, v0, Lcom/yalantis/ucrop/c/h;->bcL:Lcom/yalantis/ucrop/c/h$a;
+    iget-object v1, v0, Lcom/yalantis/ucrop/c/h;->bdf:Lcom/yalantis/ucrop/c/h$a;
 
     invoke-interface {v1, v0}, Lcom/yalantis/ucrop/c/h$a;->a(Lcom/yalantis/ucrop/c/h;)Z
 
     :cond_9
-    iput v6, v0, Lcom/yalantis/ucrop/c/h;->bcD:F
+    iput v6, v0, Lcom/yalantis/ucrop/c/h;->bcX:F
 
-    iput v7, v0, Lcom/yalantis/ucrop/c/h;->bcE:F
+    iput v7, v0, Lcom/yalantis/ucrop/c/h;->bcY:F
 
-    iput v3, v0, Lcom/yalantis/ucrop/c/h;->bcF:F
+    iput v3, v0, Lcom/yalantis/ucrop/c/h;->bcZ:F
 
-    iput v5, v0, Lcom/yalantis/ucrop/c/h;->bcG:F
+    iput v5, v0, Lcom/yalantis/ucrop/c/h;->bda:F
 
     goto :goto_1
 
     :cond_a
-    iput v5, v0, Lcom/yalantis/ucrop/c/h;->bcH:I
+    iput v5, v0, Lcom/yalantis/ucrop/c/h;->bdb:I
 
     goto :goto_1
 
@@ -510,13 +510,13 @@
 
     move-result v3
 
-    iput v3, v0, Lcom/yalantis/ucrop/c/h;->bcF:F
+    iput v3, v0, Lcom/yalantis/ucrop/c/h;->bcZ:F
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getY()F
 
     move-result v3
 
-    iput v3, v0, Lcom/yalantis/ucrop/c/h;->bcG:F
+    iput v3, v0, Lcom/yalantis/ucrop/c/h;->bda:F
 
     invoke-virtual {p1, v1}, Landroid/view/MotionEvent;->getPointerId(I)I
 
@@ -526,11 +526,11 @@
 
     move-result v1
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->bcH:I
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->bdb:I
 
-    iput v4, v0, Lcom/yalantis/ucrop/c/h;->bcJ:F
+    iput v4, v0, Lcom/yalantis/ucrop/c/h;->bdd:F
 
-    iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->bcK:Z
+    iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->bde:Z
 
     :cond_c
     :goto_1
@@ -551,7 +551,7 @@
 .method public setDoubleTapScaleSteps(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdm:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdG:I
 
     return-void
 .end method
@@ -559,7 +559,7 @@
 .method public setRotateEnabled(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdl:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->bdF:Z
 
     return-void
 .end method
@@ -567,7 +567,7 @@
 .method public setScaleEnabled(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->Zo:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->ZG:Z
 
     return-void
 .end method
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 f509700533..e2371deb69 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/OverlayView.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/OverlayView.smali
@@ -4,61 +4,61 @@
 
 
 # instance fields
-.field private final Mc:Landroid/graphics/RectF;
+.field private final Mt:Landroid/graphics/RectF;
 
-.field private bcN:F
+.field private final bdI:Landroid/graphics/RectF;
 
-.field private bdA:Landroid/graphics/Path;
+.field protected bdJ:I
 
-.field bdB:Landroid/graphics/Paint;
+.field protected bdK:I
 
-.field bdC:Landroid/graphics/Paint;
+.field protected bdL:[F
 
-.field bdD:Landroid/graphics/Paint;
+.field protected bdM:[F
 
-.field bdE:Landroid/graphics/Paint;
+.field bdN:I
 
-.field private bdF:I
+.field bdO:I
 
-.field private bdG:F
+.field private bdP:[F
 
-.field private bdH:F
+.field bdQ:Z
 
-.field private bdI:I
+.field bdR:Z
 
-.field private bdJ:I
+.field bdS:Z
 
-.field private bdK:I
+.field bdT:I
 
-.field private bdL:I
+.field private bdU:Landroid/graphics/Path;
 
-.field private bdM:Lcom/yalantis/ucrop/a/d;
+.field bdV:Landroid/graphics/Paint;
 
-.field private bdN:Z
+.field bdW:Landroid/graphics/Paint;
 
-.field private final bdo:Landroid/graphics/RectF;
+.field bdX:Landroid/graphics/Paint;
 
-.field protected bdp:I
+.field bdY:Landroid/graphics/Paint;
 
-.field protected bdq:I
+.field private bdZ:I
 
-.field protected bdr:[F
+.field private bdh:F
 
-.field protected bds:[F
+.field private bea:F
 
-.field bdt:I
+.field private beb:F
 
-.field bdu:I
+.field private bec:I
 
-.field private bdv:[F
+.field private bed:I
 
-.field bdw:Z
+.field private bee:I
 
-.field bdx:Z
+.field private bef:I
 
-.field bdy:Z
+.field private beg:Lcom/yalantis/ucrop/a/d;
 
-.field bdz:I
+.field private beh:Z
 
 
 # direct methods
@@ -91,23 +91,23 @@
 
     invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     new-instance p1, Landroid/graphics/RectF;
 
     invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     new-instance p2, Landroid/graphics/Path;
 
     invoke-direct {p2}, Landroid/graphics/Path;-><init>()V
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdA:Landroid/graphics/Path;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdU:Landroid/graphics/Path;
 
     new-instance p2, Landroid/graphics/Paint;
 
@@ -115,39 +115,39 @@
 
     invoke-direct {p2, p3}, Landroid/graphics/Paint;-><init>(I)V
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdB:Landroid/graphics/Paint;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdV:Landroid/graphics/Paint;
 
     new-instance p2, Landroid/graphics/Paint;
 
     invoke-direct {p2, p3}, Landroid/graphics/Paint;-><init>(I)V
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdC:Landroid/graphics/Paint;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdW:Landroid/graphics/Paint;
 
     new-instance p2, Landroid/graphics/Paint;
 
     invoke-direct {p2, p3}, Landroid/graphics/Paint;-><init>(I)V
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdD:Landroid/graphics/Paint;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdX:Landroid/graphics/Paint;
 
     new-instance p2, Landroid/graphics/Paint;
 
     invoke-direct {p2, p3}, Landroid/graphics/Paint;-><init>(I)V
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdE:Landroid/graphics/Paint;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdY:Landroid/graphics/Paint;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdF:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdZ:I
 
     const/high16 p2, -0x40800000    # -1.0f
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdG:F
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bea:F
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdH:F
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->beb:F
 
     const/4 p2, -0x1
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bec:I
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/OverlayView;->getResources()Landroid/content/res/Resources;
 
@@ -159,7 +159,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdJ:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bed:I
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/OverlayView;->getResources()Landroid/content/res/Resources;
 
@@ -171,7 +171,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdK:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bee:I
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/OverlayView;->getResources()Landroid/content/res/Resources;
 
@@ -183,7 +183,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdL:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bef:I
 
     sget p2, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -197,54 +197,54 @@
     return-void
 .end method
 
-.method private CC()V
+.method private Ct()V
     .locals 5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/c/g;->h(Landroid/graphics/RectF;)[F
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdr:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdL:[F
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/c/g;->i(Landroid/graphics/RectF;)[F
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bds:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdM:[F
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdA:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdU:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdA:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdU:Landroid/graphics/Path;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->centerX()F
 
     move-result v1
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->centerY()F
 
     move-result v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->width()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->height()F
 
@@ -270,7 +270,7 @@
 .method public getCropViewRect()Landroid/graphics/RectF;
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     return-object v0
 .end method
@@ -278,7 +278,7 @@
 .method public getFreestyleCropMode()I
     .locals 1
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdF:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdZ:I
 
     return v0
 .end method
@@ -286,7 +286,7 @@
 .method public getOverlayViewChangeListener()Lcom/yalantis/ucrop/a/d;
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdM:Lcom/yalantis/ucrop/a/d;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->beg:Lcom/yalantis/ucrop/a/d;
 
     return-object v0
 .end method
@@ -298,11 +298,11 @@
 
     invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
 
-    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdy:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdS:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdA:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdU:Landroid/graphics/Path;
 
     sget-object v1, Landroid/graphics/Region$Op;->DIFFERENCE:Landroid/graphics/Region$Op;
 
@@ -311,42 +311,42 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     sget-object v1, Landroid/graphics/Region$Op;->DIFFERENCE:Landroid/graphics/Region$Op;
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->clipRect(Landroid/graphics/RectF;Landroid/graphics/Region$Op;)Z
 
     :goto_0
-    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdz:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdT:I
 
     invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->drawColor(I)V
 
     invoke-virtual {p1}, Landroid/graphics/Canvas;->restore()V
 
-    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdy:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdS:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerX()F
 
     move-result v0
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->centerY()F
 
     move-result v1
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->width()F
 
     move-result v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
@@ -360,20 +360,20 @@
 
     div-float/2addr v2, v3
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdB:Landroid/graphics/Paint;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdV:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v0, v1, v2, v3}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
 
     :cond_1
-    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdx:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdR:Z
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->isEmpty()Z
 
@@ -381,11 +381,11 @@
 
     if-nez v0, :cond_3
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdt:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdN:I
 
     mul-int/lit8 v0, v0, 0x4
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdu:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdO:I
 
     mul-int/lit8 v1, v1, 0x4
 
@@ -393,7 +393,7 @@
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     const/4 v0, 0x0
 
@@ -402,27 +402,27 @@
     const/4 v2, 0x0
 
     :goto_1
-    iget v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdt:I
+    iget v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdN:I
 
     const/high16 v4, 0x3f800000    # 1.0f
 
     if-ge v1, v3, :cond_2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     add-int/lit8 v5, v2, 0x1
 
-    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v6, v6, Landroid/graphics/RectF;->left:F
 
     aput v6, v3, v2
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     add-int/lit8 v3, v5, 0x1
 
-    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v6}, Landroid/graphics/RectF;->height()F
 
@@ -432,7 +432,7 @@
 
     add-float/2addr v7, v4
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdt:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdN:I
 
     add-int/lit8 v4, v4, 0x1
 
@@ -442,7 +442,7 @@
 
     mul-float v6, v6, v4
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->top:F
 
@@ -450,27 +450,27 @@
 
     aput v6, v2, v5
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     add-int/lit8 v4, v3, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->right:F
 
     aput v5, v2, v3
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     add-int/lit8 v3, v4, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->height()F
 
     move-result v5
 
-    iget v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdt:I
+    iget v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdN:I
 
     add-int/lit8 v6, v6, 0x1
 
@@ -480,7 +480,7 @@
 
     mul-float v5, v5, v7
 
-    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v6, v6, Landroid/graphics/RectF;->top:F
 
@@ -496,15 +496,15 @@
 
     :cond_2
     :goto_2
-    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdu:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdO:I
 
     if-ge v0, v1, :cond_3
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     add-int/lit8 v3, v2, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->width()F
 
@@ -514,7 +514,7 @@
 
     add-float/2addr v6, v4
 
-    iget v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdu:I
+    iget v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdO:I
 
     add-int/lit8 v7, v7, 0x1
 
@@ -524,7 +524,7 @@
 
     mul-float v5, v5, v7
 
-    iget-object v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v7, v7, Landroid/graphics/RectF;->left:F
 
@@ -532,27 +532,27 @@
 
     aput v5, v1, v2
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     add-int/lit8 v2, v3, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->top:F
 
     aput v5, v1, v3
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     add-int/lit8 v3, v2, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->width()F
 
     move-result v5
 
-    iget v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdu:I
+    iget v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdO:I
 
     add-int/lit8 v7, v7, 0x1
 
@@ -562,7 +562,7 @@
 
     mul-float v5, v5, v6
 
-    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v6, v6, Landroid/graphics/RectF;->left:F
 
@@ -570,11 +570,11 @@
 
     aput v5, v1, v2
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     add-int/lit8 v2, v3, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->bottom:F
 
@@ -585,41 +585,41 @@
     goto :goto_2
 
     :cond_3
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     if-eqz v0, :cond_4
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdC:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdW:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->drawLines([FLandroid/graphics/Paint;)V
 
     :cond_4
-    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdw:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdQ:Z
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdD:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdX:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->drawRect(Landroid/graphics/RectF;Landroid/graphics/Paint;)V
 
     :cond_5
-    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdF:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdZ:I
 
     if-eqz v0, :cond_6
 
     invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdL:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bef:I
 
     int-to-float v2, v1
 
@@ -629,21 +629,21 @@
 
     invoke-virtual {v0, v2, v1}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     sget-object v1, Landroid/graphics/Region$Op;->DIFFERENCE:Landroid/graphics/Region$Op;
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->clipRect(Landroid/graphics/RectF;Landroid/graphics/Region$Op;)Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdL:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bef:I
 
     neg-int v2, v1
 
@@ -653,15 +653,15 @@
 
     invoke-virtual {v0, v2, v1}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     sget-object v1, Landroid/graphics/Region$Op;->DIFFERENCE:Landroid/graphics/Region$Op;
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->clipRect(Landroid/graphics/RectF;Landroid/graphics/Region$Op;)Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdE:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdY:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->drawRect(Landroid/graphics/RectF;Landroid/graphics/Paint;)V
 
@@ -708,21 +708,21 @@
 
     sub-int/2addr p3, p1
 
-    iput p3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdp:I
+    iput p3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdJ:I
 
     sub-int/2addr p4, p2
 
-    iput p4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdq:I
+    iput p4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdK:I
 
-    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdN:Z
+    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->beh:Z
 
     if-eqz p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdN:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->beh:Z
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bcN:F
+    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdh:F
 
     invoke-virtual {p0, p1}, Lcom/yalantis/ucrop/view/OverlayView;->setTargetAspectRatio(F)V
 
@@ -735,7 +735,7 @@
 
     move-object/from16 v0, p0
 
-    iget-object v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->isEmpty()Z
 
@@ -743,7 +743,7 @@
 
     if-nez v1, :cond_17
 
-    iget v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdF:I
+    iget v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdZ:I
 
     if-nez v1, :cond_0
 
@@ -770,7 +770,7 @@
 
     if-nez v4, :cond_7
 
-    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdJ:I
+    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bed:I
 
     int-to-double v9, v4
 
@@ -783,7 +783,7 @@
 
     if-ge v4, v12, :cond_2
 
-    iget-object v12, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdr:[F
+    iget-object v12, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdL:[F
 
     aget v12, v12, v4
 
@@ -797,7 +797,7 @@
 
     move-result-wide v12
 
-    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdr:[F
+    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdL:[F
 
     add-int/lit8 v17, v4, 0x1
 
@@ -831,13 +831,13 @@
     goto :goto_0
 
     :cond_2
-    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdF:I
+    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdZ:I
 
     if-ne v2, v8, :cond_3
 
     if-gez v11, :cond_3
 
-    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v2, v1, v3}, Landroid/graphics/RectF;->contains(FF)Z
 
@@ -848,9 +848,9 @@
     const/4 v11, 0x4
 
     :cond_3
-    iput v11, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:I
+    iput v11, v0, Lcom/yalantis/ucrop/view/OverlayView;->bec:I
 
-    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:I
+    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bec:I
 
     if-eq v2, v7, :cond_4
 
@@ -866,14 +866,14 @@
 
     const/high16 v2, -0x40800000    # -1.0f
 
-    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdG:F
+    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bea:F
 
-    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdH:F
+    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->beb:F
 
     goto :goto_2
 
     :cond_5
-    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdG:F
+    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bea:F
 
     const/4 v4, 0x0
 
@@ -881,9 +881,9 @@
 
     if-gez v2, :cond_6
 
-    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdG:F
+    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bea:F
 
-    iput v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdH:F
+    iput v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->beb:F
 
     :cond_6
     :goto_2
@@ -906,7 +906,7 @@
 
     if-ne v2, v8, :cond_15
 
-    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:I
+    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bec:I
 
     if-eq v2, v7, :cond_15
 
@@ -962,13 +962,13 @@
 
     move-result v2
 
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {v3, v5}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    iget v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:I
+    iget v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->bec:I
 
     if-eqz v3, :cond_c
 
@@ -987,19 +987,19 @@
     goto/16 :goto_3
 
     :cond_8
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
-    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdG:F
+    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bea:F
 
     sub-float v4, v1, v4
 
-    iget v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdH:F
+    iget v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->beb:F
 
     sub-float v5, v2, v5
 
     invoke-virtual {v3, v4, v5}, Landroid/graphics/RectF;->offset(FF)V
 
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->left:F
 
@@ -1013,7 +1013,7 @@
 
     if-lez v3, :cond_14
 
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->top:F
 
@@ -1027,7 +1027,7 @@
 
     if-lez v3, :cond_14
 
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->right:F
 
@@ -1041,7 +1041,7 @@
 
     if-gez v3, :cond_14
 
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->bottom:F
 
@@ -1055,26 +1055,26 @@
 
     if-gez v3, :cond_14
 
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     invoke-virtual {v3, v4}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/yalantis/ucrop/view/OverlayView;->CC()V
+    invoke-direct/range {p0 .. p0}, Lcom/yalantis/ucrop/view/OverlayView;->Ct()V
 
     invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/view/OverlayView;->postInvalidate()V
 
     goto/16 :goto_a
 
     :cond_9
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->top:F
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->right:F
 
@@ -1083,13 +1083,13 @@
     goto :goto_3
 
     :cond_a
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->left:F
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->top:F
 
@@ -1098,13 +1098,13 @@
     goto :goto_3
 
     :cond_b
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->left:F
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->bottom:F
 
@@ -1113,26 +1113,26 @@
     goto :goto_3
 
     :cond_c
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->right:F
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->bottom:F
 
     invoke-virtual {v3, v1, v2, v4, v5}, Landroid/graphics/RectF;->set(FFFF)V
 
     :goto_3
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
     move-result v3
 
-    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdK:I
+    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bee:I
 
     int-to-float v4, v4
 
@@ -1148,13 +1148,13 @@
     const/4 v3, 0x0
 
     :goto_4
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->width()F
 
     move-result v4
 
-    iget v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdK:I
+    iget v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bee:I
 
     int-to-float v5, v5
 
@@ -1170,11 +1170,11 @@
     const/16 v16, 0x0
 
     :goto_5
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     if-eqz v16, :cond_f
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->left:F
 
@@ -1186,36 +1186,36 @@
     :goto_6
     if-eqz v3, :cond_10
 
-    iget-object v6, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v6, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     goto :goto_7
 
     :cond_10
-    iget-object v6, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v6, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     :goto_7
     iget v6, v6, Landroid/graphics/RectF;->top:F
 
     if-eqz v16, :cond_11
 
-    iget-object v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     goto :goto_8
 
     :cond_11
-    iget-object v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     :goto_8
     iget v7, v7, Landroid/graphics/RectF;->right:F
 
     if-eqz v3, :cond_12
 
-    iget-object v9, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mc:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/yalantis/ucrop/view/OverlayView;->Mt:Landroid/graphics/RectF;
 
     goto :goto_9
 
     :cond_12
-    iget-object v9, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     :goto_9
     iget v9, v9, Landroid/graphics/RectF;->bottom:F
@@ -1227,15 +1227,15 @@
     if-eqz v16, :cond_14
 
     :cond_13
-    invoke-direct/range {p0 .. p0}, Lcom/yalantis/ucrop/view/OverlayView;->CC()V
+    invoke-direct/range {p0 .. p0}, Lcom/yalantis/ucrop/view/OverlayView;->Ct()V
 
     invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/view/OverlayView;->postInvalidate()V
 
     :cond_14
     :goto_a
-    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdG:F
+    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bea:F
 
-    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdH:F
+    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->beb:F
 
     return v8
 
@@ -1250,17 +1250,17 @@
 
     const/high16 v1, -0x40800000    # -1.0f
 
-    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdG:F
+    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bea:F
 
-    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdH:F
+    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->beb:F
 
-    iput v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:I
+    iput v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->bec:I
 
-    iget-object v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdM:Lcom/yalantis/ucrop/a/d;
+    iget-object v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->beg:Lcom/yalantis/ucrop/a/d;
 
     if-eqz v1, :cond_16
 
-    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-interface {v1, v2}, Lcom/yalantis/ucrop/a/d;->g(Landroid/graphics/RectF;)V
 
@@ -1279,7 +1279,7 @@
 .method public setCircleDimmedLayer(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdy:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdS:Z
 
     return-void
 .end method
@@ -1287,7 +1287,7 @@
 .method public setCropFrameColor(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdD:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdX:Landroid/graphics/Paint;
 
     invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setColor(I)V
 
@@ -1297,7 +1297,7 @@
 .method public setCropFrameStrokeWidth(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdD:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdX:Landroid/graphics/Paint;
 
     int-to-float p1, p1
 
@@ -1309,7 +1309,7 @@
 .method public setCropGridColor(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdC:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdW:Landroid/graphics/Paint;
 
     invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setColor(I)V
 
@@ -1319,11 +1319,11 @@
 .method public setCropGridColumnCount(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdu:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdO:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     return-void
 .end method
@@ -1331,11 +1331,11 @@
 .method public setCropGridRowCount(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdt:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdN:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdv:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdP:[F
 
     return-void
 .end method
@@ -1343,7 +1343,7 @@
 .method public setCropGridStrokeWidth(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdC:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdW:Landroid/graphics/Paint;
 
     int-to-float p1, p1
 
@@ -1355,7 +1355,7 @@
 .method public setDimmedColor(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdz:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdT:I
 
     return-void
 .end method
@@ -1365,7 +1365,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdF:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdZ:I
 
     return-void
 .end method
@@ -1373,7 +1373,7 @@
 .method public setFreestyleCropMode(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdF:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdZ:I
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/OverlayView;->postInvalidate()V
 
@@ -1383,7 +1383,7 @@
 .method public setOverlayViewChangeListener(Lcom/yalantis/ucrop/a/d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdM:Lcom/yalantis/ucrop/a/d;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->beg:Lcom/yalantis/ucrop/a/d;
 
     return-void
 .end method
@@ -1391,7 +1391,7 @@
 .method public setShowCropFrame(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdw:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdQ:Z
 
     return-void
 .end method
@@ -1399,7 +1399,7 @@
 .method public setShowCropGrid(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdx:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdR:Z
 
     return-void
 .end method
@@ -1407,21 +1407,21 @@
 .method public setTargetAspectRatio(F)V
     .locals 6
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bcN:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdh:F
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdp:I
+    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdJ:I
 
     if-lez p1, :cond_2
 
     int-to-float v0, p1
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bcN:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdh:F
 
     div-float/2addr v0, v1
 
     float-to-int v0, v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdq:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdK:I
 
     if-le v0, v2, :cond_0
 
@@ -1435,7 +1435,7 @@
 
     div-int/lit8 p1, p1, 0x2
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/OverlayView;->getPaddingLeft()I
 
@@ -1465,7 +1465,7 @@
 
     move-result v0
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdq:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdK:I
 
     add-int/2addr v0, v4
 
@@ -1480,7 +1480,7 @@
 
     div-int/lit8 v2, v2, 0x2
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/OverlayView;->getPaddingLeft()I
 
@@ -1500,7 +1500,7 @@
 
     move-result v4
 
-    iget v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdp:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdJ:I
 
     add-int/2addr v4, v5
 
@@ -1519,16 +1519,16 @@
     invoke-virtual {p1, v1, v3, v4, v0}, Landroid/graphics/RectF;->set(FFFF)V
 
     :goto_0
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdM:Lcom/yalantis/ucrop/a/d;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->beg:Lcom/yalantis/ucrop/a/d;
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdo:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdI:Landroid/graphics/RectF;
 
     invoke-interface {p1, v0}, Lcom/yalantis/ucrop/a/d;->g(Landroid/graphics/RectF;)V
 
     :cond_1
-    invoke-direct {p0}, Lcom/yalantis/ucrop/view/OverlayView;->CC()V
+    invoke-direct {p0}, Lcom/yalantis/ucrop/view/OverlayView;->Ct()V
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/OverlayView;->postInvalidate()V
 
@@ -1537,7 +1537,7 @@
     :cond_2
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bdN:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->beh:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView$1.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView$1.smali
index b06ddae622..059d4ebe75 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView$1.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bdY:Lcom/yalantis/ucrop/view/UCropView;
+.field final synthetic bes:Lcom/yalantis/ucrop/view/UCropView;
 
 
 # direct methods
 .method constructor <init>(Lcom/yalantis/ucrop/view/UCropView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/UCropView$1;->bdY:Lcom/yalantis/ucrop/view/UCropView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/UCropView$1;->bes:Lcom/yalantis/ucrop/view/UCropView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,10 +34,10 @@
 
 
 # virtual methods
-.method public final B(F)V
+.method public final A(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView$1;->bdY:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView$1;->bes:Lcom/yalantis/ucrop/view/UCropView;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/view/UCropView;->a(Lcom/yalantis/ucrop/view/UCropView;)Lcom/yalantis/ucrop/view/OverlayView;
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView$2.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView$2.smali
index 30956c02f9..25e52b55b2 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView$2.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bdY:Lcom/yalantis/ucrop/view/UCropView;
+.field final synthetic bes:Lcom/yalantis/ucrop/view/UCropView;
 
 
 # direct methods
 .method constructor <init>(Lcom/yalantis/ucrop/view/UCropView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/UCropView$2;->bdY:Lcom/yalantis/ucrop/view/UCropView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/UCropView$2;->bes:Lcom/yalantis/ucrop/view/UCropView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final g(Landroid/graphics/RectF;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView$2;->bdY:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView$2;->bes:Lcom/yalantis/ucrop/view/UCropView;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/view/UCropView;->b(Lcom/yalantis/ucrop/view/UCropView;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView.smali
index d3a219bd4e..15051eb317 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/UCropView.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field private bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-.field private final bdX:Lcom/yalantis/ucrop/view/OverlayView;
+.field private final ber:Lcom/yalantis/ucrop/view/OverlayView;
 
 
 # direct methods
@@ -43,7 +43,7 @@
 
     check-cast p3, Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/view/UCropView;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/UCropView;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     sget p3, Lcom/yalantis/ucrop/R$d;->view_overlay:I
 
@@ -53,7 +53,7 @@
 
     check-cast p3, Lcom/yalantis/ucrop/view/OverlayView;
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/view/UCropView;->bdX:Lcom/yalantis/ucrop/view/OverlayView;
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/UCropView;->ber:Lcom/yalantis/ucrop/view/OverlayView;
 
     sget-object p3, Lcom/yalantis/ucrop/R$h;->ucrop_UCropView:[I
 
@@ -61,7 +61,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/view/UCropView;->bdX:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/UCropView;->ber:Lcom/yalantis/ucrop/view/OverlayView;
 
     sget p3, Lcom/yalantis/ucrop/R$h;->ucrop_UCropView_ucrop_circle_dimmed_layer:I
 
@@ -71,7 +71,7 @@
 
     move-result p3
 
-    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdy:Z
+    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdS:Z
 
     sget p3, Lcom/yalantis/ucrop/R$h;->ucrop_UCropView_ucrop_dimmed_color:I
 
@@ -89,21 +89,21 @@
 
     move-result p3
 
-    iput p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdz:I
+    iput p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdT:I
 
-    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdB:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdV:Landroid/graphics/Paint;
 
-    iget v0, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdz:I
+    iget v0, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdT:I
 
     invoke-virtual {p3, v0}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdB:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdV:Landroid/graphics/Paint;
 
     sget-object v0, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style;
 
     invoke-virtual {p3, v0}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
 
-    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdB:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdV:Landroid/graphics/Paint;
 
     const/high16 v0, 0x3f800000    # 1.0f
 
@@ -141,23 +141,23 @@
 
     move-result v0
 
-    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdD:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdX:Landroid/graphics/Paint;
 
     int-to-float v3, p3
 
     invoke-virtual {v2, v3}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdD:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdX:Landroid/graphics/Paint;
 
     invoke-virtual {v2, v0}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdD:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdX:Landroid/graphics/Paint;
 
     sget-object v3, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style;
 
     invoke-virtual {v2, v3}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
 
-    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdE:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdY:Landroid/graphics/Paint;
 
     mul-int/lit8 p3, p3, 0x3
 
@@ -165,11 +165,11 @@
 
     invoke-virtual {v2, p3}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdE:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdY:Landroid/graphics/Paint;
 
     invoke-virtual {p3, v0}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdE:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdY:Landroid/graphics/Paint;
 
     sget-object v0, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style;
 
@@ -181,7 +181,7 @@
 
     move-result p3
 
-    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdw:Z
+    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdQ:Z
 
     sget p3, Lcom/yalantis/ucrop/R$h;->ucrop_UCropView_ucrop_grid_stroke_size:I
 
@@ -215,13 +215,13 @@
 
     move-result v0
 
-    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdC:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdW:Landroid/graphics/Paint;
 
     int-to-float p3, p3
 
     invoke-virtual {v2, p3}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdC:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdW:Landroid/graphics/Paint;
 
     invoke-virtual {p3, v0}, Landroid/graphics/Paint;->setColor(I)V
 
@@ -233,7 +233,7 @@
 
     move-result p3
 
-    iput p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdt:I
+    iput p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdN:I
 
     sget p3, Lcom/yalantis/ucrop/R$h;->ucrop_UCropView_ucrop_grid_column_count:I
 
@@ -241,7 +241,7 @@
 
     move-result p3
 
-    iput p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdu:I
+    iput p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdO:I
 
     sget p3, Lcom/yalantis/ucrop/R$h;->ucrop_UCropView_ucrop_show_grid:I
 
@@ -249,9 +249,9 @@
 
     move-result p3
 
-    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdx:Z
+    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bdR:Z
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/view/UCropView;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/UCropView;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     sget p3, Lcom/yalantis/ucrop/R$h;->ucrop_UCropView_ucrop_aspect_ratio_x:I
 
@@ -288,18 +288,18 @@
     :cond_0
     div-float/2addr p3, v1
 
-    iput p3, p2, Lcom/yalantis/ucrop/view/a;->bcN:F
+    iput p3, p2, Lcom/yalantis/ucrop/view/a;->bdh:F
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iput v0, p2, Lcom/yalantis/ucrop/view/a;->bcN:F
+    iput v0, p2, Lcom/yalantis/ucrop/view/a;->bdh:F
 
     :goto_1
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/UCropView;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/UCropView;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     new-instance p2, Lcom/yalantis/ucrop/view/UCropView$1;
 
@@ -307,7 +307,7 @@
 
     invoke-virtual {p1, p2}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setCropBoundsChangeListener(Lcom/yalantis/ucrop/a/c;)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/UCropView;->bdX:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/UCropView;->ber:Lcom/yalantis/ucrop/view/OverlayView;
 
     new-instance p2, Lcom/yalantis/ucrop/view/UCropView$2;
 
@@ -321,7 +321,7 @@
 .method static synthetic a(Lcom/yalantis/ucrop/view/UCropView;)Lcom/yalantis/ucrop/view/OverlayView;
     .locals 0
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/view/UCropView;->bdX:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/view/UCropView;->ber:Lcom/yalantis/ucrop/view/OverlayView;
 
     return-object p0
 .end method
@@ -329,7 +329,7 @@
 .method static synthetic b(Lcom/yalantis/ucrop/view/UCropView;)Lcom/yalantis/ucrop/view/GestureCropImageView;
     .locals 0
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/view/UCropView;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/view/UCropView;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     return-object p0
 .end method
@@ -339,7 +339,7 @@
 .method public getCropImageView()Lcom/yalantis/ucrop/view/GestureCropImageView;
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView;->bbF:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView;->bbZ:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     return-object v0
 .end method
@@ -347,7 +347,7 @@
 .method public getOverlayView()Lcom/yalantis/ucrop/view/OverlayView;
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView;->bdX:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView;->ber:Lcom/yalantis/ucrop/view/OverlayView;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/a$a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/a$a.smali
index e10f5178fc..5fa0f5fca7 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/a$a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/a$a.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final bcV:Ljava/lang/ref/WeakReference;
+.field private final bdp:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -28,21 +28,21 @@
     .end annotation
 .end field
 
-.field private final bcW:J
+.field private final bdq:J
 
-.field private final bcX:F
+.field private final bdr:F
 
-.field private final bcY:F
+.field private final bds:F
 
-.field private final bcZ:F
+.field private final bdt:F
 
-.field private final bda:F
+.field private final bdu:F
 
-.field private final bdb:F
+.field private final bdv:F
 
-.field private final bdc:F
+.field private final bdw:F
 
-.field private final bdd:Z
+.field private final bdx:Z
 
 .field private final mStartTime:J
 
@@ -57,9 +57,9 @@
 
     invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/a$a;->bcV:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/a$a;->bdp:Ljava/lang/ref/WeakReference;
 
-    iput-wide p2, p0, Lcom/yalantis/ucrop/view/a$a;->bcW:J
+    iput-wide p2, p0, Lcom/yalantis/ucrop/view/a$a;->bdq:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
@@ -67,19 +67,19 @@
 
     iput-wide p1, p0, Lcom/yalantis/ucrop/view/a$a;->mStartTime:J
 
-    iput p4, p0, Lcom/yalantis/ucrop/view/a$a;->bcX:F
+    iput p4, p0, Lcom/yalantis/ucrop/view/a$a;->bdr:F
 
-    iput p5, p0, Lcom/yalantis/ucrop/view/a$a;->bcY:F
+    iput p5, p0, Lcom/yalantis/ucrop/view/a$a;->bds:F
 
-    iput p6, p0, Lcom/yalantis/ucrop/view/a$a;->bcZ:F
+    iput p6, p0, Lcom/yalantis/ucrop/view/a$a;->bdt:F
 
-    iput p7, p0, Lcom/yalantis/ucrop/view/a$a;->bda:F
+    iput p7, p0, Lcom/yalantis/ucrop/view/a$a;->bdu:F
 
-    iput p8, p0, Lcom/yalantis/ucrop/view/a$a;->bdb:F
+    iput p8, p0, Lcom/yalantis/ucrop/view/a$a;->bdv:F
 
-    iput p9, p0, Lcom/yalantis/ucrop/view/a$a;->bdc:F
+    iput p9, p0, Lcom/yalantis/ucrop/view/a$a;->bdw:F
 
-    iput-boolean p10, p0, Lcom/yalantis/ucrop/view/a$a;->bdd:Z
+    iput-boolean p10, p0, Lcom/yalantis/ucrop/view/a$a;->bdx:Z
 
     return-void
 .end method
@@ -89,7 +89,7 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a$a;->bcV:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a$a;->bdp:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -106,7 +106,7 @@
 
     move-result-wide v1
 
-    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$a;->bcW:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$a;->bdq:J
 
     iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$a;->mStartTime:J
 
@@ -118,9 +118,9 @@
 
     long-to-float v1, v1
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/a$a;->bcZ:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/a$a;->bdt:F
 
-    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$a;->bcW:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$a;->bdq:J
 
     long-to-float v3, v3
 
@@ -128,9 +128,9 @@
 
     move-result v2
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/a$a;->bda:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/a$a;->bdu:F
 
-    iget-wide v4, p0, Lcom/yalantis/ucrop/view/a$a;->bcW:J
+    iget-wide v4, p0, Lcom/yalantis/ucrop/view/a$a;->bdq:J
 
     long-to-float v4, v4
 
@@ -138,9 +138,9 @@
 
     move-result v3
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a$a;->bdc:F
+    iget v4, p0, Lcom/yalantis/ucrop/view/a$a;->bdw:F
 
-    iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$a;->bcW:J
+    iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$a;->bdq:J
 
     long-to-float v5, v5
 
@@ -148,7 +148,7 @@
 
     move-result v4
 
-    iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$a;->bcW:J
+    iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$a;->bdq:J
 
     long-to-float v5, v5
 
@@ -156,25 +156,25 @@
 
     if-gez v1, :cond_2
 
-    iget-object v1, v0, Lcom/yalantis/ucrop/view/a;->bdP:[F
+    iget-object v1, v0, Lcom/yalantis/ucrop/view/a;->bej:[F
 
     const/4 v5, 0x0
 
     aget v1, v1, v5
 
-    iget v5, p0, Lcom/yalantis/ucrop/view/a$a;->bcX:F
+    iget v5, p0, Lcom/yalantis/ucrop/view/a$a;->bdr:F
 
     sub-float/2addr v1, v5
 
     sub-float/2addr v2, v1
 
-    iget-object v1, v0, Lcom/yalantis/ucrop/view/a;->bdP:[F
+    iget-object v1, v0, Lcom/yalantis/ucrop/view/a;->bej:[F
 
     const/4 v5, 0x1
 
     aget v1, v1, v5
 
-    iget v5, p0, Lcom/yalantis/ucrop/view/a$a;->bcY:F
+    iget v5, p0, Lcom/yalantis/ucrop/view/a$a;->bds:F
 
     sub-float/2addr v1, v5
 
@@ -182,11 +182,11 @@
 
     invoke-virtual {v0, v2, v3}, Lcom/yalantis/ucrop/view/a;->e(FF)V
 
-    iget-boolean v1, p0, Lcom/yalantis/ucrop/view/a$a;->bdd:Z
+    iget-boolean v1, p0, Lcom/yalantis/ucrop/view/a$a;->bdx:Z
 
     if-nez v1, :cond_1
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/a$a;->bdb:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/a$a;->bdv:F
 
     add-float/2addr v1, v4
 
@@ -209,7 +209,7 @@
     invoke-virtual {v0, v1, v2, v3}, Lcom/yalantis/ucrop/view/a;->f(FFF)V
 
     :cond_1
-    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/a;->CB()Z
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/a;->Cs()Z
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/a$b.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/a$b.smali
index 8ca9d70c23..251d034671 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/a$b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/a$b.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final bcV:Ljava/lang/ref/WeakReference;
+.field private final bdp:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -28,15 +28,15 @@
     .end annotation
 .end field
 
-.field private final bcW:J
+.field private final bdq:J
 
-.field private final bdb:F
+.field private final bdv:F
 
-.field private final bdc:F
+.field private final bdw:F
 
-.field private final bde:F
+.field private final bdy:F
 
-.field private final bdf:F
+.field private final bdz:F
 
 .field private final mStartTime:J
 
@@ -51,7 +51,7 @@
 
     invoke-direct {p2, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/view/a$b;->bcV:Ljava/lang/ref/WeakReference;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/a$b;->bdp:Ljava/lang/ref/WeakReference;
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
@@ -61,15 +61,15 @@
 
     const-wide/16 p1, 0xc8
 
-    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a$b;->bcW:J
+    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a$b;->bdq:J
 
-    iput p4, p0, Lcom/yalantis/ucrop/view/a$b;->bdb:F
+    iput p4, p0, Lcom/yalantis/ucrop/view/a$b;->bdv:F
 
-    iput p5, p0, Lcom/yalantis/ucrop/view/a$b;->bdc:F
+    iput p5, p0, Lcom/yalantis/ucrop/view/a$b;->bdw:F
 
-    iput p6, p0, Lcom/yalantis/ucrop/view/a$b;->bde:F
+    iput p6, p0, Lcom/yalantis/ucrop/view/a$b;->bdy:F
 
-    iput p7, p0, Lcom/yalantis/ucrop/view/a$b;->bdf:F
+    iput p7, p0, Lcom/yalantis/ucrop/view/a$b;->bdz:F
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a$b;->bcV:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a$b;->bdp:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -96,7 +96,7 @@
 
     move-result-wide v1
 
-    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->bcW:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->bdq:J
 
     iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$b;->mStartTime:J
 
@@ -108,9 +108,9 @@
 
     long-to-float v1, v1
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/a$b;->bdc:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/a$b;->bdw:F
 
-    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->bcW:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->bdq:J
 
     long-to-float v3, v3
 
@@ -118,7 +118,7 @@
 
     move-result v2
 
-    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->bcW:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->bdq:J
 
     long-to-float v3, v3
 
@@ -126,13 +126,13 @@
 
     if-gez v1, :cond_1
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/a$b;->bdb:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/a$b;->bdv:F
 
     add-float/2addr v1, v2
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/a$b;->bde:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/a$b;->bdy:F
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/a$b;->bdf:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/a$b;->bdz:F
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/yalantis/ucrop/view/a;->f(FFF)V
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/a.smali
index 878b23a516..cbb1be1202 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/a.smali
@@ -13,27 +13,27 @@
 
 
 # instance fields
-.field bcN:F
+.field public final bcB:Landroid/graphics/RectF;
 
-.field private bcO:F
+.field private bcu:I
 
-.field private bcP:Lcom/yalantis/ucrop/a/c;
+.field private bcv:I
 
-.field private bcQ:Ljava/lang/Runnable;
+.field bdh:F
 
-.field bcR:Ljava/lang/Runnable;
+.field private bdi:F
 
-.field private bcS:F
+.field private bdj:Lcom/yalantis/ucrop/a/c;
 
-.field private bcT:F
+.field private bdk:Ljava/lang/Runnable;
 
-.field private bcU:J
+.field bdl:Ljava/lang/Runnable;
 
-.field private bca:I
+.field private bdm:F
 
-.field private bcb:I
+.field private bdn:F
 
-.field public final bch:Landroid/graphics/RectF;
+.field private bdo:J
 
 .field private final mTempMatrix:Landroid/graphics/Matrix;
 
@@ -68,7 +68,7 @@
 
     invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     new-instance p1, Landroid/graphics/Matrix;
 
@@ -78,21 +78,21 @@
 
     const/high16 p1, 0x41200000    # 10.0f
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bcO:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bdi:F
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->bcR:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->bdl:Ljava/lang/Runnable;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bca:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bcu:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bcb:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bcv:I
 
     const-wide/16 p1, 0x1f4
 
-    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a;->bcU:J
+    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a;->bdo:J
 
     return-void
 .end method
@@ -100,7 +100,7 @@
 .method static synthetic a(Lcom/yalantis/ucrop/view/a;)Landroid/graphics/RectF;
     .locals 0
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object p0, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     return-object p0
 .end method
@@ -132,7 +132,7 @@
 
     invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->mapPoints([F)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/c/g;->h(Landroid/graphics/RectF;)[F
 
@@ -160,7 +160,7 @@
 .method private d(FF)V
     .locals 2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
@@ -168,7 +168,7 @@
 
     div-float/2addr v0, p1
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->width()F
 
@@ -180,7 +180,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->height()F
 
@@ -188,7 +188,7 @@
 
     div-float/2addr v1, p2
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {p2}, Landroid/graphics/RectF;->height()F
 
@@ -204,31 +204,31 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bcT:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bdn:F
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/a;->bcT:F
+    iget p1, p0, Lcom/yalantis/ucrop/view/a;->bdn:F
 
-    iget p2, p0, Lcom/yalantis/ucrop/view/a;->bcO:F
+    iget p2, p0, Lcom/yalantis/ucrop/view/a;->bdi:F
 
     mul-float p1, p1, p2
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bcS:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bdm:F
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final C(F)V
+.method public final B(F)V
     .locals 2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerX()F
 
     move-result v0
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->centerY()F
 
@@ -239,10 +239,24 @@
     return-void
 .end method
 
-.method protected final CA()V
+.method public final Cq()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bdk:Ljava/lang/Runnable;
+
+    invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/view/a;->removeCallbacks(Ljava/lang/Runnable;)Z
+
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bdl:Ljava/lang/Runnable;
+
+    invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/view/a;->removeCallbacks(Ljava/lang/Runnable;)Z
+
+    return-void
+.end method
+
+.method protected final Cr()V
     .locals 8
 
-    invoke-super {p0}, Lcom/yalantis/ucrop/view/b;->CA()V
+    invoke-super {p0}, Lcom/yalantis/ucrop/view/b;->Cr()V
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->getDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -265,7 +279,7 @@
 
     int-to-float v0, v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/a;->bcN:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/a;->bdh:F
 
     const/4 v3, 0x0
 
@@ -275,40 +289,40 @@
 
     div-float v2, v1, v0
 
-    iput v2, p0, Lcom/yalantis/ucrop/view/a;->bcN:F
+    iput v2, p0, Lcom/yalantis/ucrop/view/a;->bdh:F
 
     :cond_1
-    iget v2, p0, Lcom/yalantis/ucrop/view/a;->bdp:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/a;->bdJ:I
 
     int-to-float v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bcN:F
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bdh:F
 
     div-float/2addr v2, v4
 
     float-to-int v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bdq:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bdK:I
 
     if-le v2, v4, :cond_2
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/a;->bdq:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/a;->bdK:I
 
     int-to-float v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bcN:F
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bdh:F
 
     mul-float v2, v2, v4
 
     float-to-int v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bdp:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bdJ:I
 
     sub-int/2addr v4, v2
 
     div-int/lit8 v4, v4, 0x2
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     int-to-float v6, v4
 
@@ -316,7 +330,7 @@
 
     int-to-float v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bdq:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bdK:I
 
     int-to-float v4, v4
 
@@ -325,17 +339,17 @@
     goto :goto_0
 
     :cond_2
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bdq:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bdK:I
 
     sub-int/2addr v4, v2
 
     div-int/lit8 v4, v4, 0x2
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     int-to-float v6, v4
 
-    iget v7, p0, Lcom/yalantis/ucrop/view/a;->bdp:I
+    iget v7, p0, Lcom/yalantis/ucrop/view/a;->bdJ:I
 
     int-to-float v7, v7
 
@@ -348,19 +362,19 @@
     :goto_0
     invoke-direct {p0, v1, v0}, Lcom/yalantis/ucrop/view/a;->d(FF)V
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->width()F
 
     move-result v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->width()F
 
@@ -368,7 +382,7 @@
 
     div-float/2addr v4, v1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->height()F
 
@@ -388,7 +402,7 @@
 
     div-float/2addr v2, v1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->left:F
 
@@ -400,65 +414,65 @@
 
     div-float/2addr v3, v1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->top:F
 
     add-float/2addr v3, v0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bdQ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bek:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bdQ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bek:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v4, v4}, Landroid/graphics/Matrix;->postScale(FF)Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bdQ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bek:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2, v3}, Landroid/graphics/Matrix;->postTranslate(FF)Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bdQ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bek:Landroid/graphics/Matrix;
 
     invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/view/a;->setImageMatrix(Landroid/graphics/Matrix;)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bcP:Lcom/yalantis/ucrop/a/c;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bdj:Lcom/yalantis/ucrop/a/c;
 
     if-eqz v0, :cond_3
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/a;->bcN:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/a;->bdh:F
 
-    invoke-interface {v0, v1}, Lcom/yalantis/ucrop/a/c;->B(F)V
+    invoke-interface {v0, v1}, Lcom/yalantis/ucrop/a/c;->A(F)V
 
     :cond_3
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bdR:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bel:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bdR:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bel:Lcom/yalantis/ucrop/view/b$a;
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->getCurrentScale()F
 
     move-result v1
 
-    invoke-interface {v0, v1}, Lcom/yalantis/ucrop/view/b$a;->w(F)V
+    invoke-interface {v0, v1}, Lcom/yalantis/ucrop/view/b$a;->v(F)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bdR:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bel:Lcom/yalantis/ucrop/view/b$a;
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->getCurrentAngle()F
 
     move-result v1
 
-    invoke-interface {v0, v1}, Lcom/yalantis/ucrop/view/b$a;->v(F)V
+    invoke-interface {v0, v1}, Lcom/yalantis/ucrop/view/b$a;->u(F)V
 
     :cond_4
     return-void
 .end method
 
-.method protected final CB()Z
+.method protected final Cs()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bdO:[F
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bei:[F
 
     invoke-direct {p0, v0}, Lcom/yalantis/ucrop/view/a;->c([F)Z
 
@@ -467,26 +481,12 @@
     return v0
 .end method
 
-.method public final Cz()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bcQ:Ljava/lang/Runnable;
-
-    invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/view/a;->removeCallbacks(Ljava/lang/Runnable;)Z
-
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bcR:Ljava/lang/Runnable;
-
-    invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/view/a;->removeCallbacks(Ljava/lang/Runnable;)Z
-
-    return-void
-.end method
-
 .method public final a(Landroid/graphics/Bitmap$CompressFormat;ILcom/yalantis/ucrop/a/a;)V
     .locals 15
 
     move-object v0, p0
 
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->Cz()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->Cq()V
 
     const/4 v1, 0x0
 
@@ -494,9 +494,9 @@
 
     new-instance v5, Lcom/yalantis/ucrop/model/c;
 
-    iget-object v2, v0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v2, v0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/a;->bdO:[F
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/a;->bei:[F
 
     invoke-static {v3}, Lcom/yalantis/ucrop/c/g;->b([F)Landroid/graphics/RectF;
 
@@ -514,9 +514,9 @@
 
     new-instance v6, Lcom/yalantis/ucrop/model/a;
 
-    iget v8, v0, Lcom/yalantis/ucrop/view/a;->bca:I
+    iget v8, v0, Lcom/yalantis/ucrop/view/a;->bcu:I
 
-    iget v9, v0, Lcom/yalantis/ucrop/view/a;->bcb:I
+    iget v9, v0, Lcom/yalantis/ucrop/view/a;->bcv:I
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->getImageInputPath()Ljava/lang/String;
 
@@ -639,7 +639,7 @@
 .method public getCropBoundsChangeListener()Lcom/yalantis/ucrop/a/c;
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bcP:Lcom/yalantis/ucrop/a/c;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bdj:Lcom/yalantis/ucrop/a/c;
 
     return-object v0
 .end method
@@ -647,7 +647,7 @@
 .method public getMaxScale()F
     .locals 1
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/a;->bcS:F
+    iget v0, p0, Lcom/yalantis/ucrop/view/a;->bdm:F
 
     return v0
 .end method
@@ -655,7 +655,7 @@
 .method public getMinScale()F
     .locals 1
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/a;->bcT:F
+    iget v0, p0, Lcom/yalantis/ucrop/view/a;->bdn:F
 
     return v0
 .end method
@@ -663,7 +663,7 @@
 .method public getTargetAspectRatio()F
     .locals 1
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/a;->bcN:F
+    iget v0, p0, Lcom/yalantis/ucrop/view/a;->bdh:F
 
     return v0
 .end method
@@ -671,7 +671,7 @@
 .method public setCropBoundsChangeListener(Lcom/yalantis/ucrop/a/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->bcP:Lcom/yalantis/ucrop/a/c;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->bdj:Lcom/yalantis/ucrop/a/c;
 
     return-void
 .end method
@@ -689,9 +689,9 @@
 
     div-float/2addr v0, v1
 
-    iput v0, p0, Lcom/yalantis/ucrop/view/a;->bcN:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/a;->bdh:F
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     iget v1, p1, Landroid/graphics/RectF;->left:F
 
@@ -768,23 +768,23 @@
 
     move-object/from16 v11, p0
 
-    iget-boolean v0, v11, Lcom/yalantis/ucrop/view/a;->bdV:Z
+    iget-boolean v0, v11, Lcom/yalantis/ucrop/view/a;->bep:Z
 
     if-eqz v0, :cond_6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/view/a;->CB()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/view/a;->Cs()Z
 
     move-result v0
 
     if-nez v0, :cond_6
 
-    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->bdP:[F
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->bej:[F
 
     const/4 v1, 0x0
 
     aget v4, v0, v1
 
-    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->bdP:[F
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->bej:[F
 
     const/4 v2, 0x1
 
@@ -794,7 +794,7 @@
 
     move-result v8
 
-    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerX()F
 
@@ -802,7 +802,7 @@
 
     sub-float/2addr v0, v4
 
-    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->centerY()F
 
@@ -818,9 +818,9 @@
 
     invoke-virtual {v6, v0, v3}, Landroid/graphics/Matrix;->setTranslate(FF)V
 
-    iget-object v6, v11, Lcom/yalantis/ucrop/view/a;->bdO:[F
+    iget-object v6, v11, Lcom/yalantis/ucrop/view/a;->bei:[F
 
-    iget-object v7, v11, Lcom/yalantis/ucrop/view/a;->bdO:[F
+    iget-object v7, v11, Lcom/yalantis/ucrop/view/a;->bei:[F
 
     array-length v7, v7
 
@@ -858,9 +858,9 @@
 
     invoke-virtual {v0, v3}, Landroid/graphics/Matrix;->setRotate(F)V
 
-    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->bdO:[F
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->bei:[F
 
-    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->bdO:[F
+    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->bei:[F
 
     array-length v3, v3
 
@@ -868,7 +868,7 @@
 
     move-result-object v0
 
-    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-static {v3}, Lcom/yalantis/ucrop/c/g;->h(Landroid/graphics/RectF;)[F
 
@@ -1013,7 +1013,7 @@
     :cond_4
     new-instance v7, Landroid/graphics/RectF;
 
-    iget-object v12, v11, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v12, v11, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-direct {v7, v12}, Landroid/graphics/RectF;-><init>(Landroid/graphics/RectF;)V
 
@@ -1033,7 +1033,7 @@
 
     invoke-virtual {v12, v7}, Landroid/graphics/Matrix;->mapRect(Landroid/graphics/RectF;)Z
 
-    iget-object v12, v11, Lcom/yalantis/ucrop/view/a;->bdO:[F
+    iget-object v12, v11, Lcom/yalantis/ucrop/view/a;->bei:[F
 
     new-array v13, v9, [F
 
@@ -1158,7 +1158,7 @@
 
     new-instance v12, Lcom/yalantis/ucrop/view/a$a;
 
-    iget-wide v2, v11, Lcom/yalantis/ucrop/view/a;->bcU:J
+    iget-wide v2, v11, Lcom/yalantis/ucrop/view/a;->bdo:J
 
     move-object v0, v12
 
@@ -1168,7 +1168,7 @@
 
     invoke-direct/range {v0 .. v10}, Lcom/yalantis/ucrop/view/a$a;-><init>(Lcom/yalantis/ucrop/view/a;JFFFFFFZ)V
 
-    iput-object v12, v11, Lcom/yalantis/ucrop/view/a;->bcQ:Ljava/lang/Runnable;
+    iput-object v12, v11, Lcom/yalantis/ucrop/view/a;->bdk:Ljava/lang/Runnable;
 
     invoke-virtual {v11, v12}, Lcom/yalantis/ucrop/view/a;->post(Ljava/lang/Runnable;)Z
 
@@ -1181,13 +1181,13 @@
 
     add-float/2addr v8, v9
 
-    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerX()F
 
     move-result v0
 
-    iget-object v1, v11, Lcom/yalantis/ucrop/view/a;->bch:Landroid/graphics/RectF;
+    iget-object v1, v11, Lcom/yalantis/ucrop/view/a;->bcB:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->centerY()F
 
@@ -1208,7 +1208,7 @@
 
     if-lez v2, :cond_0
 
-    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a;->bcU:J
+    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a;->bdo:J
 
     return-void
 
@@ -1225,7 +1225,7 @@
 .method public setMaxResultImageSizeX(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bca:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bcu:I
 
     return-void
 .end method
@@ -1233,7 +1233,7 @@
 .method public setMaxResultImageSizeY(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bcb:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bcv:I
 
     return-void
 .end method
@@ -1241,7 +1241,7 @@
 .method public setMaxScaleMultiplier(F)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bcO:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bdi:F
 
     return-void
 .end method
@@ -1255,7 +1255,7 @@
 
     if-nez v0, :cond_0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bcN:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bdh:F
 
     return-void
 
@@ -1280,21 +1280,21 @@
 
     div-float/2addr p1, v0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bcN:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bdh:F
 
     goto :goto_0
 
     :cond_1
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bcN:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->bdh:F
 
     :goto_0
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/a;->bcP:Lcom/yalantis/ucrop/a/c;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/a;->bdj:Lcom/yalantis/ucrop/a/c;
 
     if-eqz p1, :cond_2
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/a;->bcN:F
+    iget v0, p0, Lcom/yalantis/ucrop/view/a;->bdh:F
 
-    invoke-interface {p1, v0}, Lcom/yalantis/ucrop/a/c;->B(F)V
+    invoke-interface {p1, v0}, Lcom/yalantis/ucrop/a/c;->A(F)V
 
     :cond_2
     return-void
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/b$1.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/b$1.smali
index bf003db03a..b8114acf76 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/b$1.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/b$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bdW:Lcom/yalantis/ucrop/view/b;
+.field final synthetic beq:Lcom/yalantis/ucrop/view/b;
 
 
 # direct methods
 .method public constructor <init>(Lcom/yalantis/ucrop/view/b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/b$1;->bdW:Lcom/yalantis/ucrop/view/b;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b$1;->beq:Lcom/yalantis/ucrop/view/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,23 +37,23 @@
 .method public final a(Landroid/graphics/Bitmap;Lcom/yalantis/ucrop/model/b;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->bdW:Lcom/yalantis/ucrop/view/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->beq:Lcom/yalantis/ucrop/view/b;
 
     invoke-static {v0, p3}, Lcom/yalantis/ucrop/view/b;->a(Lcom/yalantis/ucrop/view/b;Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object p3, p0, Lcom/yalantis/ucrop/view/b$1;->bdW:Lcom/yalantis/ucrop/view/b;
+    iget-object p3, p0, Lcom/yalantis/ucrop/view/b$1;->beq:Lcom/yalantis/ucrop/view/b;
 
     invoke-static {p3, p4}, Lcom/yalantis/ucrop/view/b;->b(Lcom/yalantis/ucrop/view/b;Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object p3, p0, Lcom/yalantis/ucrop/view/b$1;->bdW:Lcom/yalantis/ucrop/view/b;
+    iget-object p3, p0, Lcom/yalantis/ucrop/view/b$1;->beq:Lcom/yalantis/ucrop/view/b;
 
     invoke-static {p3, p2}, Lcom/yalantis/ucrop/view/b;->a(Lcom/yalantis/ucrop/view/b;Lcom/yalantis/ucrop/model/b;)Lcom/yalantis/ucrop/model/b;
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/view/b$1;->bdW:Lcom/yalantis/ucrop/view/b;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/b$1;->beq:Lcom/yalantis/ucrop/view/b;
 
     const/4 p3, 0x1
 
-    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/b;->bdU:Z
+    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/b;->beo:Z
 
     invoke-virtual {p2, p1}, Lcom/yalantis/ucrop/view/b;->setImageBitmap(Landroid/graphics/Bitmap;)V
 
@@ -69,15 +69,15 @@
 
     invoke-static {v0, v1, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->bdW:Lcom/yalantis/ucrop/view/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->beq:Lcom/yalantis/ucrop/view/b;
 
-    iget-object v0, v0, Lcom/yalantis/ucrop/view/b;->bdR:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, v0, Lcom/yalantis/ucrop/view/b;->bel:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->bdW:Lcom/yalantis/ucrop/view/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->beq:Lcom/yalantis/ucrop/view/b;
 
-    iget-object v0, v0, Lcom/yalantis/ucrop/view/b;->bdR:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, v0, Lcom/yalantis/ucrop/view/b;->bel:Lcom/yalantis/ucrop/view/b$a;
 
     invoke-interface {v0, p1}, Lcom/yalantis/ucrop/view/b$a;->h(Ljava/lang/Exception;)V
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/b$a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/b$a.smali
index 1c566a0358..00f0eacaa8 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/b$a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/b$a.smali
@@ -15,14 +15,14 @@
 
 
 # virtual methods
-.method public abstract Cq()V
+.method public abstract Ch()V
 .end method
 
 .method public abstract h(Ljava/lang/Exception;)V
 .end method
 
-.method public abstract v(F)V
+.method public abstract u(F)V
 .end method
 
-.method public abstract w(F)V
+.method public abstract v(F)V
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/b.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/b.smali
index d0f005bc52..f56be10db5 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/b.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/b.smali
@@ -12,33 +12,33 @@
 
 
 # instance fields
-.field private Tn:I
+.field private TF:I
 
-.field private bcc:Ljava/lang/String;
+.field private bcw:Ljava/lang/String;
 
-.field private bcd:Ljava/lang/String;
+.field private bcx:Ljava/lang/String;
 
-.field private bce:Lcom/yalantis/ucrop/model/b;
+.field private bcy:Lcom/yalantis/ucrop/model/b;
 
-.field protected final bdO:[F
+.field protected bdJ:I
 
-.field protected final bdP:[F
+.field protected bdK:I
 
-.field protected bdQ:Landroid/graphics/Matrix;
+.field protected final bei:[F
 
-.field protected bdR:Lcom/yalantis/ucrop/view/b$a;
+.field protected final bej:[F
 
-.field private bdS:[F
+.field protected bek:Landroid/graphics/Matrix;
 
-.field private bdT:[F
+.field protected bel:Lcom/yalantis/ucrop/view/b$a;
 
-.field protected bdU:Z
+.field private bem:[F
 
-.field protected bdV:Z
+.field private ben:[F
 
-.field protected bdp:I
+.field protected beo:Z
 
-.field protected bdq:I
+.field protected bep:Z
 
 .field private final mMatrixValues:[F
 
@@ -73,13 +73,13 @@
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bdO:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bei:[F
 
     const/4 p1, 0x2
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bdP:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bej:[F
 
     const/16 p1, 0x9
 
@@ -91,15 +91,15 @@
 
     invoke-direct {p1}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->bdU:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->beo:Z
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->bdV:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->bep:Z
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/b;->Tn:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/b;->TF:I
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/b;->init()V
 
@@ -109,7 +109,7 @@
 .method static synthetic a(Lcom/yalantis/ucrop/view/b;Lcom/yalantis/ucrop/model/b;)Lcom/yalantis/ucrop/model/b;
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bce:Lcom/yalantis/ucrop/model/b;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bcy:Lcom/yalantis/ucrop/model/b;
 
     return-object p1
 .end method
@@ -117,7 +117,7 @@
 .method static synthetic a(Lcom/yalantis/ucrop/view/b;Ljava/lang/String;)Ljava/lang/String;
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bcc:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bcw:Ljava/lang/String;
 
     return-object p1
 .end method
@@ -139,7 +139,7 @@
 .method static synthetic b(Lcom/yalantis/ucrop/view/b;Ljava/lang/String;)Ljava/lang/String;
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bcd:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bcx:Ljava/lang/String;
 
     return-object p1
 .end method
@@ -220,7 +220,7 @@
 
 
 # virtual methods
-.method protected CA()V
+.method protected Cr()V
     .locals 5
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/b;->getDrawable()Landroid/graphics/drawable/Drawable;
@@ -288,21 +288,21 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/b;->bdS:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/b;->bem:[F
 
     invoke-static {v2}, Lcom/yalantis/ucrop/c/g;->i(Landroid/graphics/RectF;)[F
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/b;->bdT:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/b;->ben:[F
 
-    iput-boolean v4, p0, Lcom/yalantis/ucrop/view/b;->bdV:Z
+    iput-boolean v4, p0, Lcom/yalantis/ucrop/view/b;->bep:Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bdR:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bel:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz v0, :cond_1
 
-    invoke-interface {v0}, Lcom/yalantis/ucrop/view/b$a;->Cq()V
+    invoke-interface {v0}, Lcom/yalantis/ucrop/view/b$a;->Ch()V
 
     :cond_1
     return-void
@@ -322,11 +322,11 @@
     if-eqz v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1, p2}, Landroid/graphics/Matrix;->postTranslate(FF)Z
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
     invoke-virtual {p0, p1}, Lcom/yalantis/ucrop/view/b;->setImageMatrix(Landroid/graphics/Matrix;)V
 
@@ -343,25 +343,25 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1, p1, p2, p3}, Landroid/graphics/Matrix;->postScale(FFFF)Z
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
     invoke-virtual {p0, p1}, Lcom/yalantis/ucrop/view/b;->setImageMatrix(Landroid/graphics/Matrix;)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bdR:Lcom/yalantis/ucrop/view/b$a;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bel:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz p1, :cond_0
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
     invoke-direct {p0, p2}, Lcom/yalantis/ucrop/view/b;->getMatrixScale(Landroid/graphics/Matrix;)F
 
     move-result p2
 
-    invoke-interface {p1, p2}, Lcom/yalantis/ucrop/view/b$a;->w(F)V
+    invoke-interface {p1, p2}, Lcom/yalantis/ucrop/view/b$a;->v(F)V
 
     :cond_0
     return-void
@@ -370,7 +370,7 @@
 .method public getCurrentAngle()F
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
     invoke-direct {p0, v0}, Lcom/yalantis/ucrop/view/b;->h(Landroid/graphics/Matrix;)F
 
@@ -382,7 +382,7 @@
 .method public getCurrentScale()F
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
     invoke-direct {p0, v0}, Lcom/yalantis/ucrop/view/b;->getMatrixScale(Landroid/graphics/Matrix;)F
 
@@ -394,7 +394,7 @@
 .method public getExifInfo()Lcom/yalantis/ucrop/model/b;
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bce:Lcom/yalantis/ucrop/model/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bcy:Lcom/yalantis/ucrop/model/b;
 
     return-object v0
 .end method
@@ -402,7 +402,7 @@
 .method public getImageInputPath()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bcc:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bcw:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -410,7 +410,7 @@
 .method public getImageOutputPath()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bcd:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bcx:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -418,7 +418,7 @@
 .method public getMaxBitmapSize()I
     .locals 6
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/b;->Tn:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/b;->TF:I
 
     if-gtz v0, :cond_3
 
@@ -496,7 +496,7 @@
     move-result v0
 
     :cond_1
-    invoke-static {}, Lcom/yalantis/ucrop/c/c;->Cv()I
+    invoke-static {}, Lcom/yalantis/ucrop/c/c;->Cm()I
 
     move-result v1
 
@@ -521,10 +521,10 @@
 
     invoke-static {v2, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    iput v0, p0, Lcom/yalantis/ucrop/view/b;->Tn:I
+    iput v0, p0, Lcom/yalantis/ucrop/view/b;->TF:I
 
     :cond_3
-    iget v0, p0, Lcom/yalantis/ucrop/view/b;->Tn:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/b;->TF:I
 
     return v0
 .end method
@@ -575,25 +575,25 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1, p2, p3}, Landroid/graphics/Matrix;->postRotate(FFF)Z
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
     invoke-virtual {p0, p1}, Lcom/yalantis/ucrop/view/b;->setImageMatrix(Landroid/graphics/Matrix;)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bdR:Lcom/yalantis/ucrop/view/b$a;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bel:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz p1, :cond_0
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
     invoke-direct {p0, p2}, Lcom/yalantis/ucrop/view/b;->h(Landroid/graphics/Matrix;)F
 
     move-result p2
 
-    invoke-interface {p1, p2}, Lcom/yalantis/ucrop/view/b$a;->v(F)V
+    invoke-interface {p1, p2}, Lcom/yalantis/ucrop/view/b$a;->u(F)V
 
     :cond_0
     return-void
@@ -616,11 +616,11 @@
 
     if-nez p1, :cond_0
 
-    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->bdU:Z
+    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->beo:Z
 
     if-eqz p1, :cond_1
 
-    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->bdV:Z
+    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->bep:Z
 
     if-nez p1, :cond_1
 
@@ -655,13 +655,13 @@
 
     sub-int/2addr p3, p1
 
-    iput p3, p0, Lcom/yalantis/ucrop/view/b;->bdp:I
+    iput p3, p0, Lcom/yalantis/ucrop/view/b;->bdJ:I
 
     sub-int/2addr p4, p2
 
-    iput p4, p0, Lcom/yalantis/ucrop/view/b;->bdq:I
+    iput p4, p0, Lcom/yalantis/ucrop/view/b;->bdK:I
 
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/b;->CA()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/b;->Cr()V
 
     :cond_1
     return-void
@@ -684,23 +684,23 @@
 
     invoke-super {p0, p1}, Landroid/widget/ImageView;->setImageMatrix(Landroid/graphics/Matrix;)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bdO:[F
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bei:[F
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/b;->bdS:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/b;->bem:[F
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Matrix;->mapPoints([F[F)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bdQ:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bek:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bdP:[F
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bej:[F
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/b;->bdT:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/b;->ben:[F
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Matrix;->mapPoints([F[F)V
 
@@ -710,7 +710,7 @@
 .method public setMaxBitmapSize(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/b;->Tn:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/b;->TF:I
 
     return-void
 .end method
@@ -739,7 +739,7 @@
 .method public setTransformImageListener(Lcom/yalantis/ucrop/view/b$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bdR:Lcom/yalantis/ucrop/view/b$a;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bel:Lcom/yalantis/ucrop/view/b$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/widget/AspectRatioTextView.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/widget/AspectRatioTextView.smali
index 45fd7630f8..e40a637b10 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/widget/AspectRatioTextView.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/widget/AspectRatioTextView.smali
@@ -4,19 +4,19 @@
 
 
 # instance fields
-.field public NS:F
+.field public Ok:F
 
-.field private bbX:Ljava/lang/String;
+.field private bcr:Ljava/lang/String;
 
-.field public bbY:F
+.field public bcs:F
 
-.field public bbZ:F
+.field public bct:F
 
-.field private final bdZ:Landroid/graphics/Rect;
+.field private final bet:Landroid/graphics/Rect;
 
-.field private bea:Landroid/graphics/Paint;
+.field private beu:Landroid/graphics/Paint;
 
-.field private beb:I
+.field private bev:I
 
 
 # direct methods
@@ -49,7 +49,7 @@
 
     invoke-direct {p3}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bdZ:Landroid/graphics/Rect;
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bet:Landroid/graphics/Rect;
 
     sget-object p3, Lcom/yalantis/ucrop/R$h;->ucrop_AspectRatioTextView:[I
 
@@ -71,7 +71,7 @@
 
     invoke-direct {p3}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bdZ:Landroid/graphics/Rect;
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bet:Landroid/graphics/Rect;
 
     sget-object p3, Lcom/yalantis/ucrop/R$h;->ucrop_AspectRatioTextView:[I
 
@@ -97,7 +97,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbX:Ljava/lang/String;
+    iput-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bcr:Ljava/lang/String;
 
     sget v1, Lcom/yalantis/ucrop/R$h;->ucrop_AspectRatioTextView_ucrop_artv_ratio_x:I
 
@@ -107,7 +107,7 @@
 
     move-result v1
 
-    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbY:F
+    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bcs:F
 
     sget v1, Lcom/yalantis/ucrop/R$h;->ucrop_AspectRatioTextView_ucrop_artv_ratio_y:I
 
@@ -115,15 +115,15 @@
 
     move-result v1
 
-    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbZ:F
+    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bct:F
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbY:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bcs:F
 
     cmpl-float v3, v1, v2
 
     if-eqz v3, :cond_1
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbZ:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bct:F
 
     cmpl-float v4, v3, v2
 
@@ -134,13 +134,13 @@
     :cond_0
     div-float/2addr v1, v3
 
-    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->NS:F
+    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->Ok:F
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iput v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->NS:F
+    iput v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->Ok:F
 
     :goto_1
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->getContext()Landroid/content/Context;
@@ -157,21 +157,21 @@
 
     move-result v1
 
-    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->beb:I
+    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bev:I
 
     new-instance v1, Landroid/graphics/Paint;
 
     invoke-direct {v1, v0}, Landroid/graphics/Paint;-><init>(I)V
 
-    iput-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bea:Landroid/graphics/Paint;
+    iput-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->beu:Landroid/graphics/Paint;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bea:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->beu:Landroid/graphics/Paint;
 
     sget-object v1, Landroid/graphics/Paint$Style;->FILL:Landroid/graphics/Paint$Style;
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
 
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->CD()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->Cu()V
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->getResources()Landroid/content/res/Resources;
 
@@ -183,17 +183,17 @@
 
     move-result v0
 
-    invoke-direct {p0, v0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->df(I)V
+    invoke-direct {p0, v0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->dc(I)V
 
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
     return-void
 .end method
 
-.method private df(I)V
+.method private dc(I)V
     .locals 7
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bea:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->beu:Landroid/graphics/Paint;
 
     if-eqz v0, :cond_0
 
@@ -249,10 +249,10 @@
 
 
 # virtual methods
-.method public final CD()V
+.method public final Cu()V
     .locals 4
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbX:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bcr:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -260,7 +260,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbX:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bcr:Ljava/lang/String;
 
     invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->setText(Ljava/lang/CharSequence;)V
 
@@ -275,7 +275,7 @@
 
     const/4 v2, 0x0
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbY:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bcs:F
 
     float-to-int v3, v3
 
@@ -287,7 +287,7 @@
 
     const/4 v2, 0x1
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbZ:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bct:F
 
     float-to-int v3, v3
 
@@ -319,15 +319,15 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bdZ:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bet:Landroid/graphics/Rect;
 
     invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->getClipBounds(Landroid/graphics/Rect;)Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bdZ:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bet:Landroid/graphics/Rect;
 
     iget v0, v0, Landroid/graphics/Rect;->right:I
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bdZ:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bet:Landroid/graphics/Rect;
 
     iget v1, v1, Landroid/graphics/Rect;->left:I
 
@@ -339,11 +339,11 @@
 
     div-float/2addr v0, v1
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bdZ:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bet:Landroid/graphics/Rect;
 
     iget v1, v1, Landroid/graphics/Rect;->bottom:I
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->beb:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bev:I
 
     sub-int/2addr v1, v2
 
@@ -353,7 +353,7 @@
 
     int-to-float v2, v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bea:Landroid/graphics/Paint;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->beu:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v0, v1, v2, v3}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
 
@@ -364,7 +364,7 @@
 .method public setActiveColor(I)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->df(I)V
+    invoke-direct {p0, p1}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->dc(I)V
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->invalidate()V
 
@@ -374,19 +374,19 @@
 .method public setAspectRatio(Lcom/yalantis/ucrop/model/AspectRatio;)V
     .locals 3
 
-    iget-object v0, p1, Lcom/yalantis/ucrop/model/AspectRatio;->bbX:Ljava/lang/String;
+    iget-object v0, p1, Lcom/yalantis/ucrop/model/AspectRatio;->bcr:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbX:Ljava/lang/String;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bcr:Ljava/lang/String;
 
-    iget v0, p1, Lcom/yalantis/ucrop/model/AspectRatio;->bbY:F
+    iget v0, p1, Lcom/yalantis/ucrop/model/AspectRatio;->bcs:F
 
-    iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbY:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bcs:F
 
-    iget p1, p1, Lcom/yalantis/ucrop/model/AspectRatio;->bbZ:F
+    iget p1, p1, Lcom/yalantis/ucrop/model/AspectRatio;->bct:F
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbZ:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bct:F
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbY:F
+    iget p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bcs:F
 
     const/4 v0, 0x0
 
@@ -394,7 +394,7 @@
 
     if-eqz v1, :cond_1
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bbZ:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->bct:F
 
     cmpl-float v2, v1, v0
 
@@ -405,16 +405,16 @@
     :cond_0
     div-float/2addr p1, v1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->NS:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->Ok:F
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->NS:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->Ok:F
 
     :goto_1
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->CD()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->Cu()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a.smali
index 67e05f92ee..f2f6bd33a4 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a.smali
@@ -15,11 +15,11 @@
 
 
 # virtual methods
-.method public abstract A(F)V
+.method public abstract Ci()V
 .end method
 
-.method public abstract Cr()V
+.method public abstract Cj()V
 .end method
 
-.method public abstract Cs()V
+.method public abstract w(F)V
 .end method
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView.smali
index 3267609c63..4960c48e0a 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView.smali
@@ -12,25 +12,25 @@
 
 
 # instance fields
-.field private final bdZ:Landroid/graphics/Rect;
+.field private beA:I
 
-.field private bec:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+.field private beB:I
 
-.field private bed:F
+.field private beC:Z
 
-.field private bee:Landroid/graphics/Paint;
+.field private beD:F
 
-.field private bef:I
+.field private beE:I
 
-.field private beg:I
+.field private final bet:Landroid/graphics/Rect;
 
-.field private beh:I
+.field private bew:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
 
-.field private bei:Z
+.field private bex:F
 
-.field private bej:F
+.field private bey:Landroid/graphics/Paint;
 
-.field private bek:I
+.field private bez:I
 
 
 # direct methods
@@ -63,7 +63,7 @@
 
     invoke-direct {p1}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bdZ:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bet:Landroid/graphics/Rect;
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->getContext()Landroid/content/Context;
 
@@ -75,7 +75,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bek:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beE:I
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->getContext()Landroid/content/Context;
 
@@ -91,7 +91,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bef:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bez:I
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->getContext()Landroid/content/Context;
 
@@ -107,7 +107,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beg:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beA:I
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->getContext()Landroid/content/Context;
 
@@ -123,7 +123,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beh:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beB:I
 
     new-instance p1, Landroid/graphics/Paint;
 
@@ -131,17 +131,17 @@
 
     invoke-direct {p1, p2}, Landroid/graphics/Paint;-><init>(I)V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bee:Landroid/graphics/Paint;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bey:Landroid/graphics/Paint;
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bee:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bey:Landroid/graphics/Paint;
 
     sget-object p2, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style;
 
     invoke-virtual {p1, p2}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bee:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bey:Landroid/graphics/Paint;
 
-    iget p2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bef:I
+    iget p2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bez:I
 
     int-to-float p2, p2
 
@@ -159,7 +159,7 @@
 
     invoke-direct {p1}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bdZ:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bet:Landroid/graphics/Rect;
 
     return-void
 .end method
@@ -171,25 +171,25 @@
 
     invoke-super {p0, p1}, Landroid/view/View;->onDraw(Landroid/graphics/Canvas;)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bdZ:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bet:Landroid/graphics/Rect;
 
     invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->getClipBounds(Landroid/graphics/Rect;)Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bdZ:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bet:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bef:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bez:I
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beh:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beB:I
 
     add-int v3, v1, v2
 
     div-int/2addr v0, v3
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bej:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beD:F
 
     add-int/2addr v2, v1
 
@@ -197,7 +197,7 @@
 
     rem-float/2addr v3, v1
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bee:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bey:Landroid/graphics/Paint;
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->getResources()Landroid/content/res/Resources;
 
@@ -222,7 +222,7 @@
 
     if-ge v1, v2, :cond_0
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bee:Landroid/graphics/Paint;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bey:Landroid/graphics/Paint;
 
     int-to-float v6, v1
 
@@ -245,7 +245,7 @@
 
     if-le v1, v5, :cond_1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bee:Landroid/graphics/Paint;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bey:Landroid/graphics/Paint;
 
     sub-int v6, v0, v1
 
@@ -264,7 +264,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bee:Landroid/graphics/Paint;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bey:Landroid/graphics/Paint;
 
     const/16 v4, 0xff
 
@@ -273,7 +273,7 @@
     :goto_1
     neg-float v2, v3
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bdZ:Landroid/graphics/Rect;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bet:Landroid/graphics/Rect;
 
     iget v4, v4, Landroid/graphics/Rect;->left:I
 
@@ -281,9 +281,9 @@
 
     add-float/2addr v4, v2
 
-    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bef:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bez:I
 
-    iget v6, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beh:I
+    iget v6, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beB:I
 
     add-int/2addr v5, v6
 
@@ -293,7 +293,7 @@
 
     add-float v7, v4, v5
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bdZ:Landroid/graphics/Rect;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bet:Landroid/graphics/Rect;
 
     invoke-virtual {v4}, Landroid/graphics/Rect;->centerY()I
 
@@ -301,7 +301,7 @@
 
     int-to-float v4, v4
 
-    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beg:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beA:I
 
     int-to-float v5, v5
 
@@ -311,7 +311,7 @@
 
     sub-float v8, v4, v5
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bdZ:Landroid/graphics/Rect;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bet:Landroid/graphics/Rect;
 
     iget v4, v4, Landroid/graphics/Rect;->left:I
 
@@ -319,9 +319,9 @@
 
     add-float/2addr v2, v4
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bef:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bez:I
 
-    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beh:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beB:I
 
     add-int/2addr v4, v5
 
@@ -331,7 +331,7 @@
 
     add-float v9, v2, v4
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bdZ:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bet:Landroid/graphics/Rect;
 
     invoke-virtual {v2}, Landroid/graphics/Rect;->centerY()I
 
@@ -339,7 +339,7 @@
 
     int-to-float v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beg:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beA:I
 
     int-to-float v4, v4
 
@@ -347,7 +347,7 @@
 
     add-float v10, v2, v4
 
-    iget-object v11, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bee:Landroid/graphics/Paint;
+    iget-object v11, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bey:Landroid/graphics/Paint;
 
     move-object v6, p1
 
@@ -358,13 +358,13 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bee:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bey:Landroid/graphics/Paint;
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bek:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beE:I
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bdZ:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bet:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->centerX()I
 
@@ -372,7 +372,7 @@
 
     int-to-float v2, v0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bdZ:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bet:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->centerY()I
 
@@ -380,7 +380,7 @@
 
     int-to-float v0, v0
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beg:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beA:I
 
     int-to-float v1, v1
 
@@ -390,7 +390,7 @@
 
     sub-float/2addr v0, v1
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bdZ:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bet:Landroid/graphics/Rect;
 
     invoke-virtual {v1}, Landroid/graphics/Rect;->centerX()I
 
@@ -398,7 +398,7 @@
 
     int-to-float v4, v1
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bdZ:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bet:Landroid/graphics/Rect;
 
     invoke-virtual {v1}, Landroid/graphics/Rect;->centerY()I
 
@@ -406,7 +406,7 @@
 
     int-to-float v1, v1
 
-    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beg:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beA:I
 
     int-to-float v5, v5
 
@@ -414,7 +414,7 @@
 
     add-float/2addr v5, v1
 
-    iget-object v6, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bee:Landroid/graphics/Paint;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bey:Landroid/graphics/Paint;
 
     move-object v1, p1
 
@@ -449,7 +449,7 @@
 
     move-result v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bed:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bex:F
 
     sub-float/2addr v0, v2
 
@@ -459,24 +459,24 @@
 
     if-eqz v2, :cond_4
 
-    iget-boolean v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bei:Z
+    iget-boolean v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beC:Z
 
     if-nez v2, :cond_1
 
-    iput-boolean v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bei:Z
+    iput-boolean v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beC:Z
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bec:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bew:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
 
     if-eqz v2, :cond_1
 
-    invoke-interface {v2}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Cs()V
+    invoke-interface {v2}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Cj()V
 
     :cond_1
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bej:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beD:F
 
     sub-float/2addr v2, v0
 
-    iput v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bej:F
+    iput v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beD:F
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->postInvalidate()V
 
@@ -484,28 +484,28 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bed:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bex:F
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bec:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bew:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
 
     if-eqz p1, :cond_4
 
     neg-float v0, v0
 
-    invoke-interface {p1, v0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->A(F)V
+    invoke-interface {p1, v0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->w(F)V
 
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bec:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bew:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
 
     if-eqz p1, :cond_4
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bei:Z
+    iput-boolean v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beC:Z
 
-    invoke-interface {p1}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Cr()V
+    invoke-interface {p1}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Ci()V
 
     goto :goto_0
 
@@ -514,7 +514,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bed:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bex:F
 
     :cond_4
     :goto_0
@@ -524,7 +524,7 @@
 .method public setMiddleLineColor(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bek:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->beE:I
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->invalidate()V
 
@@ -534,7 +534,7 @@
 .method public setScrollingListener(Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bec:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->bew:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a$a$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a$a$1.smali
index ceef7a1af2..edc21fd43a 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a$a$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a$a$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic beo:Lio/fabric/sdk/android/a$b;
+.field final synthetic beI:Lio/fabric/sdk/android/a$b;
 
-.field final synthetic bep:Lio/fabric/sdk/android/a$a;
+.field final synthetic beJ:Lio/fabric/sdk/android/a$a;
 
 
 # direct methods
 .method constructor <init>(Lio/fabric/sdk/android/a$a;Lio/fabric/sdk/android/a$b;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a$a$1;->bep:Lio/fabric/sdk/android/a$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a$a$1;->beJ:Lio/fabric/sdk/android/a$a;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a$a$1;->beo:Lio/fabric/sdk/android/a$b;
+    iput-object p2, p0, Lio/fabric/sdk/android/a$a$1;->beI:Lio/fabric/sdk/android/a$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
     .locals 0
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a$a$1;->beo:Lio/fabric/sdk/android/a$b;
+    iget-object p2, p0, Lio/fabric/sdk/android/a$a$1;->beI:Lio/fabric/sdk/android/a$b;
 
     invoke-virtual {p2, p1}, Lio/fabric/sdk/android/a$b;->a(Landroid/app/Activity;)V
 
@@ -57,7 +57,7 @@
 .method public final onActivityPaused(Landroid/app/Activity;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->beo:Lio/fabric/sdk/android/a$b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->beI:Lio/fabric/sdk/android/a$b;
 
     invoke-virtual {v0, p1}, Lio/fabric/sdk/android/a$b;->onActivityPaused(Landroid/app/Activity;)V
 
@@ -67,7 +67,7 @@
 .method public final onActivityResumed(Landroid/app/Activity;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->beo:Lio/fabric/sdk/android/a$b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->beI:Lio/fabric/sdk/android/a$b;
 
     invoke-virtual {v0, p1}, Lio/fabric/sdk/android/a$b;->onActivityResumed(Landroid/app/Activity;)V
 
@@ -83,7 +83,7 @@
 .method public final onActivityStarted(Landroid/app/Activity;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->beo:Lio/fabric/sdk/android/a$b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->beI:Lio/fabric/sdk/android/a$b;
 
     invoke-virtual {v0, p1}, Lio/fabric/sdk/android/a$b;->onActivityStarted(Landroid/app/Activity;)V
 
@@ -93,7 +93,7 @@
 .method public final onActivityStopped(Landroid/app/Activity;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->beo:Lio/fabric/sdk/android/a$b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->beI:Lio/fabric/sdk/android/a$b;
 
     invoke-virtual {v0, p1}, Lio/fabric/sdk/android/a$b;->onActivityStopped(Landroid/app/Activity;)V
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a$a.smali
index b3cec591e5..cc9d269a7e 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private final bel:Landroid/app/Application;
+.field private final beF:Landroid/app/Application;
 
-.field private final ben:Ljava/util/Set;
+.field private final beH:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -38,9 +38,9 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a$a;->ben:Ljava/util/Set;
+    iput-object v0, p0, Lio/fabric/sdk/android/a$a;->beH:Ljava/util/Set;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a$a;->bel:Landroid/app/Application;
+    iput-object p1, p0, Lio/fabric/sdk/android/a$a;->beF:Landroid/app/Application;
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 .method final b(Lio/fabric/sdk/android/a$b;)Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a$a;->bel:Landroid/app/Application;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a;->beF:Landroid/app/Application;
 
     if-eqz v0, :cond_0
 
@@ -58,11 +58,11 @@
 
     invoke-direct {v0, p0, p1}, Lio/fabric/sdk/android/a$a$1;-><init>(Lio/fabric/sdk/android/a$a;Lio/fabric/sdk/android/a$b;)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a$a;->bel:Landroid/app/Application;
+    iget-object p1, p0, Lio/fabric/sdk/android/a$a;->beF:Landroid/app/Application;
 
     invoke-virtual {p1, v0}, Landroid/app/Application;->registerActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a$a;->ben:Ljava/util/Set;
+    iget-object p1, p0, Lio/fabric/sdk/android/a$a;->beH:Ljava/util/Set;
 
     invoke-interface {p1, v0}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -79,7 +79,7 @@
 .method final clearCallbacks()V
     .locals 3
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a$a;->ben:Ljava/util/Set;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a;->beH:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -98,7 +98,7 @@
 
     check-cast v1, Landroid/app/Application$ActivityLifecycleCallbacks;
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a$a;->bel:Landroid/app/Application;
+    iget-object v2, p0, Lio/fabric/sdk/android/a$a;->beF:Landroid/app/Application;
 
     invoke-virtual {v2, v1}, Landroid/app/Application;->unregisterActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a.smali
index 31d838b6f3..37fb0ef7e6 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a.smali
@@ -13,9 +13,9 @@
 
 
 # instance fields
-.field private final bel:Landroid/app/Application;
+.field private final beF:Landroid/app/Application;
 
-.field private bem:Lio/fabric/sdk/android/a$a;
+.field private beG:Lio/fabric/sdk/android/a$a;
 
 
 # direct methods
@@ -30,7 +30,7 @@
 
     check-cast p1, Landroid/app/Application;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a;->bel:Landroid/app/Application;
+    iput-object p1, p0, Lio/fabric/sdk/android/a;->beF:Landroid/app/Application;
 
     sget p1, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -40,11 +40,11 @@
 
     new-instance p1, Lio/fabric/sdk/android/a$a;
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a;->bel:Landroid/app/Application;
+    iget-object v0, p0, Lio/fabric/sdk/android/a;->beF:Landroid/app/Application;
 
     invoke-direct {p1, v0}, Lio/fabric/sdk/android/a$a;-><init>(Landroid/app/Application;)V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a;->bem:Lio/fabric/sdk/android/a$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a;->beG:Lio/fabric/sdk/android/a$a;
 
     :cond_0
     return-void
@@ -52,10 +52,10 @@
 
 
 # virtual methods
-.method public final CE()V
+.method public final Cv()V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a;->bem:Lio/fabric/sdk/android/a$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a;->beG:Lio/fabric/sdk/android/a$a;
 
     if-eqz v0, :cond_0
 
@@ -68,7 +68,7 @@
 .method public final a(Lio/fabric/sdk/android/a$b;)Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a;->bem:Lio/fabric/sdk/android/a$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a;->beG:Lio/fabric/sdk/android/a$a;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/a/a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/a/a.smali
index 7d8d21900e..6403be2332 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/a/a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/a/a.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final beW:Lio/fabric/sdk/android/a/a/c;
+.field private final bfq:Lio/fabric/sdk/android/a/a/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/a/a/c<",
@@ -45,14 +45,14 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/a/a;->beW:Lio/fabric/sdk/android/a/a/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/a/a;->bfq:Lio/fabric/sdk/android/a/a/c;
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected abstract CQ()Ljava/lang/Object;
+.method protected abstract CH()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
@@ -80,17 +80,17 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/a/a;->CQ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/a/a;->CH()Ljava/lang/Object;
 
     move-result-object v0
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/a/a;->beW:Lio/fabric/sdk/android/a/a/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/a/a;->bfq:Lio/fabric/sdk/android/a/a/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/a/a;->beW:Lio/fabric/sdk/android/a/a/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/a/a;->bfq:Lio/fabric/sdk/android/a/a/c;
 
     invoke-interface {v0, p1, p2}, Lio/fabric/sdk/android/a/a/c;->a(Landroid/content/Context;Lio/fabric/sdk/android/a/a/d;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/a/b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/a/b.smali
index fde7a96e32..0dd75be46d 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/a/b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/a/b.smali
@@ -53,7 +53,7 @@
 
 
 # virtual methods
-.method protected final CQ()Ljava/lang/Object;
+.method protected final CH()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/a.smali
index 30887f3ead..c0fa3bf8c6 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/a.smali
@@ -4,17 +4,17 @@
 
 
 # static fields
-.field private static final beX:Ljava/util/regex/Pattern;
+.field private static final bfr:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final beY:I
+.field private final bft:I
 
-.field private final beZ:Ljava/lang/String;
+.field private final bfu:Ljava/lang/String;
 
-.field protected final oS:Lio/fabric/sdk/android/i;
+.field protected final oR:Lio/fabric/sdk/android/i;
 
-.field private final oV:Lio/fabric/sdk/android/a/e/e;
+.field private final oU:Lio/fabric/sdk/android/a/e/e;
 
 .field protected final url:Ljava/lang/String;
 
@@ -31,7 +31,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/a;->beX:Ljava/util/regex/Pattern;
+    sput-object v0, Lio/fabric/sdk/android/a/b/a;->bfr:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -45,25 +45,25 @@
 
     if-eqz p4, :cond_1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/a;->oS:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/a;->oR:Lio/fabric/sdk/android/i;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/a;->beZ:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/a;->bfu:Ljava/lang/String;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/a;->beZ:Ljava/lang/String;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/a;->bfu:Ljava/lang/String;
 
-    invoke-static {p1}, Lio/fabric/sdk/android/a/b/i;->S(Ljava/lang/String;)Z
+    invoke-static {p1}, Lio/fabric/sdk/android/a/b/i;->O(Ljava/lang/String;)Z
 
     move-result p1
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lio/fabric/sdk/android/a/b/a;->beX:Ljava/util/regex/Pattern;
+    sget-object p1, Lio/fabric/sdk/android/a/b/a;->bfr:Ljava/util/regex/Pattern;
 
     invoke-virtual {p1, p3}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
     move-result-object p1
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/b/a;->beZ:Ljava/lang/String;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/b/a;->bfu:Ljava/lang/String;
 
     invoke-virtual {p1, p2}, Ljava/util/regex/Matcher;->replaceFirst(Ljava/lang/String;)Ljava/lang/String;
 
@@ -72,9 +72,9 @@
     :cond_0
     iput-object p3, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/b/a;->oV:Lio/fabric/sdk/android/a/e/e;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/b/a;->oU:Lio/fabric/sdk/android/a/e/e;
 
-    iput p5, p0, Lio/fabric/sdk/android/a/b/a;->beY:I
+    iput p5, p0, Lio/fabric/sdk/android/a/b/a;->bft:I
 
     return-void
 
@@ -99,7 +99,7 @@
 
 
 # virtual methods
-.method protected final CR()Lio/fabric/sdk/android/a/e/d;
+.method protected final CI()Lio/fabric/sdk/android/a/e/d;
     .locals 1
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
@@ -126,9 +126,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/a;->oV:Lio/fabric/sdk/android/a/e/e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/a;->oU:Lio/fabric/sdk/android/a/e/e;
 
-    iget v1, p0, Lio/fabric/sdk/android/a/b/a;->beY:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/a;->bft:I
 
     iget-object v2, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String;
 
@@ -136,11 +136,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->DJ()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->Dz()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->DI()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->Dy()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object p1
 
@@ -150,7 +150,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/a;->oS:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/a;->oR:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/b.smali
index 8686f4e11d..5da884d598 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/b.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field public final bfa:Ljava/lang/String;
+.field public final bfv:Ljava/lang/String;
 
-.field public final bfb:Z
+.field public final bfw:Z
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/b;->bfa:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/b;->bfv:Ljava/lang/String;
 
-    iput-boolean p2, p0, Lio/fabric/sdk/android/a/b/b;->bfb:Z
+    iput-boolean p2, p0, Lio/fabric/sdk/android/a/b/b;->bfw:Z
 
     return-void
 .end method
@@ -53,18 +53,18 @@
     :cond_1
     check-cast p1, Lio/fabric/sdk/android/a/b/b;
 
-    iget-boolean v2, p0, Lio/fabric/sdk/android/a/b/b;->bfb:Z
+    iget-boolean v2, p0, Lio/fabric/sdk/android/a/b/b;->bfw:Z
 
-    iget-boolean v3, p1, Lio/fabric/sdk/android/a/b/b;->bfb:Z
+    iget-boolean v3, p1, Lio/fabric/sdk/android/a/b/b;->bfw:Z
 
     if-eq v2, v3, :cond_2
 
     return v1
 
     :cond_2
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/b;->bfa:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/b;->bfv:Ljava/lang/String;
 
-    iget-object p1, p1, Lio/fabric/sdk/android/a/b/b;->bfa:Ljava/lang/String;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/b/b;->bfv:Ljava/lang/String;
 
     if-eqz v2, :cond_3
 
@@ -93,7 +93,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/b;->bfa:Ljava/lang/String;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/b;->bfv:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -109,7 +109,7 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lio/fabric/sdk/android/a/b/b;->bfb:Z
+    iget-boolean v1, p0, Lio/fabric/sdk/android/a/b/b;->bfw:Z
 
     add-int/2addr v0, v1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/c$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/c$1.smali
index 27f996ff37..1f4ed2bb58 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/c$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/c$1.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic bfc:Lio/fabric/sdk/android/a/b/b;
+.field final synthetic bfx:Lio/fabric/sdk/android/a/b/b;
 
-.field final synthetic bfd:Lio/fabric/sdk/android/a/b/c;
+.field final synthetic bfy:Lio/fabric/sdk/android/a/b/c;
 
 
 # direct methods
 .method constructor <init>(Lio/fabric/sdk/android/a/b/c;Lio/fabric/sdk/android/a/b/b;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/c$1;->bfd:Lio/fabric/sdk/android/a/b/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/c$1;->bfy:Lio/fabric/sdk/android/a/b/c;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/c$1;->bfc:Lio/fabric/sdk/android/a/b/b;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/c$1;->bfx:Lio/fabric/sdk/android/a/b/b;
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a/b/h;-><init>()V
 
@@ -35,16 +35,16 @@
 
 
 # virtual methods
-.method public final df()V
+.method public final de()V
     .locals 4
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/c$1;->bfd:Lio/fabric/sdk/android/a/b/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/c$1;->bfy:Lio/fabric/sdk/android/a/b/c;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->CU()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->CL()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v0
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/c$1;->bfc:Lio/fabric/sdk/android/a/b/b;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/c$1;->bfx:Lio/fabric/sdk/android/a/b/b;
 
     invoke-virtual {v1, v0}, Lio/fabric/sdk/android/a/b/b;->equals(Ljava/lang/Object;)Z
 
@@ -52,7 +52,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -62,7 +62,7 @@
 
     invoke-interface {v1, v2, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/c$1;->bfd:Lio/fabric/sdk/android/a/b/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/c$1;->bfy:Lio/fabric/sdk/android/a/b/c;
 
     invoke-virtual {v1, v0}, Lio/fabric/sdk/android/a/b/c;->a(Lio/fabric/sdk/android/a/b/b;)V
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/c.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/c.smali
index 2283770d20..8ac6c5755c 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/c.smali
@@ -6,7 +6,7 @@
 # instance fields
 .field private final context:Landroid/content/Context;
 
-.field final sU:Lio/fabric/sdk/android/a/f/c;
+.field final sT:Lio/fabric/sdk/android/a/f/c;
 
 
 # direct methods
@@ -27,12 +27,12 @@
 
     invoke-direct {v0, p1, v1}, Lio/fabric/sdk/android/a/f/d;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/b/c;->sU:Lio/fabric/sdk/android/a/f/c;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/c;->sT:Lio/fabric/sdk/android/a/f/c;
 
     return-void
 .end method
 
-.method private CS()Lio/fabric/sdk/android/a/b/f;
+.method private CJ()Lio/fabric/sdk/android/a/b/f;
     .locals 2
 
     new-instance v0, Lio/fabric/sdk/android/a/b/d;
@@ -44,7 +44,7 @@
     return-object v0
 .end method
 
-.method private CT()Lio/fabric/sdk/android/a/b/f;
+.method private CK()Lio/fabric/sdk/android/a/b/f;
     .locals 2
 
     new-instance v0, Lio/fabric/sdk/android/a/b/e;
@@ -61,7 +61,7 @@
 
     if-eqz p0, :cond_0
 
-    iget-object p0, p0, Lio/fabric/sdk/android/a/b/b;->bfa:Ljava/lang/String;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/b/b;->bfv:Ljava/lang/String;
 
     invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -81,14 +81,14 @@
 
 
 # virtual methods
-.method final CU()Lio/fabric/sdk/android/a/b/b;
+.method final CL()Lio/fabric/sdk/android/a/b/b;
     .locals 4
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->CS()Lio/fabric/sdk/android/a/b/f;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->CJ()Lio/fabric/sdk/android/a/b/f;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->CV()Lio/fabric/sdk/android/a/b/b;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->CM()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v0
 
@@ -100,11 +100,11 @@
 
     if-nez v1, :cond_1
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->CT()Lio/fabric/sdk/android/a/b/f;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->CK()Lio/fabric/sdk/android/a/b/f;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->CV()Lio/fabric/sdk/android/a/b/b;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->CM()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v0
 
@@ -114,7 +114,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -125,7 +125,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -136,7 +136,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -161,19 +161,19 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/c;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/c;->sT:Lio/fabric/sdk/android/a/f/c;
 
     invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->edit()Landroid/content/SharedPreferences$Editor;
 
     move-result-object v3
 
-    iget-object v4, p1, Lio/fabric/sdk/android/a/b/b;->bfa:Ljava/lang/String;
+    iget-object v4, p1, Lio/fabric/sdk/android/a/b/b;->bfv:Ljava/lang/String;
 
     invoke-interface {v3, v2, v4}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
     move-result-object v2
 
-    iget-boolean p1, p1, Lio/fabric/sdk/android/a/b/b;->bfb:Z
+    iget-boolean p1, p1, Lio/fabric/sdk/android/a/b/b;->bfw:Z
 
     invoke-interface {v2, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
@@ -184,7 +184,7 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/c;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/c;->sT:Lio/fabric/sdk/android/a/f/c;
 
     invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->edit()Landroid/content/SharedPreferences$Editor;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/d.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/d.smali
index 3f7c4acc5a..09de7918dd 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/d.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/d.smali
@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method private CW()Ljava/lang/String;
+.method private CN()Ljava/lang/String;
     .locals 4
 
     :try_start_0
@@ -62,7 +62,7 @@
     return-object v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -173,7 +173,7 @@
     return-object v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -227,7 +227,7 @@
     return v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -242,7 +242,7 @@
 
 
 # virtual methods
-.method public final CV()Lio/fabric/sdk/android/a/b/b;
+.method public final CM()Lio/fabric/sdk/android/a/b/b;
     .locals 3
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/b/d;->context:Landroid/content/Context;
@@ -255,7 +255,7 @@
 
     new-instance v0, Lio/fabric/sdk/android/a/b/b;
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/d;->CW()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/d;->CN()Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/e$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/e$a.smali
index 1c2399bb87..6e69626a7c 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/e$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/e$a.smali
@@ -18,9 +18,7 @@
 
 
 # instance fields
-.field private bfe:Z
-
-.field private final bff:Ljava/util/concurrent/LinkedBlockingQueue;
+.field private final bfA:Ljava/util/concurrent/LinkedBlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/LinkedBlockingQueue<",
@@ -30,6 +28,8 @@
     .end annotation
 .end field
 
+.field private bfz:Z
+
 
 # direct methods
 .method private constructor <init>()V
@@ -39,7 +39,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bfe:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bfz:Z
 
     new-instance v0, Ljava/util/concurrent/LinkedBlockingQueue;
 
@@ -47,7 +47,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/LinkedBlockingQueue;-><init>(I)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bff:Ljava/util/concurrent/LinkedBlockingQueue;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bfA:Ljava/util/concurrent/LinkedBlockingQueue;
 
     return-void
 .end method
@@ -65,11 +65,11 @@
 .method public final getBinder()Landroid/os/IBinder;
     .locals 4
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bfe:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bfz:Z
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -82,10 +82,10 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bfe:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bfz:Z
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bff:Ljava/util/concurrent/LinkedBlockingQueue;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bfA:Ljava/util/concurrent/LinkedBlockingQueue;
 
     const-wide/16 v1, 0xc8
 
@@ -111,7 +111,7 @@
     .locals 0
 
     :try_start_0
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/e$a;->bff:Ljava/util/concurrent/LinkedBlockingQueue;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/e$a;->bfA:Ljava/util/concurrent/LinkedBlockingQueue;
 
     invoke-virtual {p1, p2}, Ljava/util/concurrent/LinkedBlockingQueue;->put(Ljava/lang/Object;)V
     :try_end_0
@@ -124,7 +124,7 @@
 .method public final onServiceDisconnected(Landroid/content/ComponentName;)V
     .locals 0
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/e$a;->bff:Ljava/util/concurrent/LinkedBlockingQueue;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/e$a;->bfA:Ljava/util/concurrent/LinkedBlockingQueue;
 
     invoke-virtual {p1}, Ljava/util/concurrent/LinkedBlockingQueue;->clear()V
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/e$b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/e$b.smali
index b3fef3de52..c5225df433 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/e$b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/e$b.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final bfg:Landroid/os/IBinder;
+.field private final bfB:Landroid/os/IBinder;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/e$b;->bfg:Landroid/os/IBinder;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/e$b;->bfB:Landroid/os/IBinder;
 
     return-void
 .end method
@@ -37,7 +37,7 @@
 .method public final asBinder()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/e$b;->bfg:Landroid/os/IBinder;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/e$b;->bfB:Landroid/os/IBinder;
 
     return-object v0
 .end method
@@ -63,7 +63,7 @@
 
     invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/e$b;->bfg:Landroid/os/IBinder;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/e$b;->bfB:Landroid/os/IBinder;
 
     const/4 v3, 0x1
 
@@ -93,7 +93,7 @@
 
     :catch_0
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -149,7 +149,7 @@
 
     invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/b/e$b;->bfg:Landroid/os/IBinder;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/b/e$b;->bfB:Landroid/os/IBinder;
 
     const/4 v5, 0x2
 
@@ -177,7 +177,7 @@
 
     :catch_0
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/e.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/e.smali
index ddd2ed7c29..e47d8b315e 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/e.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/e.smali
@@ -36,7 +36,7 @@
 
 
 # virtual methods
-.method public final CV()Lio/fabric/sdk/android/a/b/b;
+.method public final CM()Lio/fabric/sdk/android/a/b/b;
     .locals 7
 
     const-string v0, "Could not bind to Google Play Service to capture AdvertisingId"
@@ -55,7 +55,7 @@
 
     if-ne v1, v2, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -151,7 +151,7 @@
     move-exception v2
 
     :try_start_4
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -176,7 +176,7 @@
     throw v2
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -189,7 +189,7 @@
     :catchall_1
     move-exception v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -201,7 +201,7 @@
     :catch_1
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -212,7 +212,7 @@
     return-object v3
 
     :catch_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/f.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/f.smali
index 856d9543cc..3613138745 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/f.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/f.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract CV()Lio/fabric/sdk/android/a/b/b;
+.method public abstract CM()Lio/fabric/sdk/android/a/b/b;
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/g.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/g.smali
index a13d9f61b7..e823cd7967 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/g.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/g.smali
@@ -55,7 +55,7 @@
 
     if-eqz v3, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -74,7 +74,7 @@
     if-nez v1, :cond_1
 
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -103,7 +103,7 @@
     move-exception p0
 
     :goto_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -137,7 +137,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -215,7 +215,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -256,7 +256,7 @@
 
     if-eqz v1, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CG()Z
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cx()Z
 
     move-result v1
 
@@ -270,7 +270,7 @@
 
     if-nez p1, :cond_3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/h.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/h.smali
index fa9e38ca95..02952a4f03 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/h.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/h.smali
@@ -17,7 +17,7 @@
 
 
 # virtual methods
-.method protected abstract df()V
+.method protected abstract de()V
 .end method
 
 .method public final run()V
@@ -27,7 +27,7 @@
 
     invoke-static {v0}, Landroid/os/Process;->setThreadPriority(I)V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/h;->df()V
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/h;->de()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/i$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/i$a.smali
index acd11ab556..378b16af8d 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/i$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/i$a.smali
@@ -23,27 +23,27 @@
 
 
 # static fields
-.field public static final enum bfl:Lio/fabric/sdk/android/a/b/i$a;
+.field public static final enum bfG:Lio/fabric/sdk/android/a/b/i$a;
 
-.field public static final enum bfm:Lio/fabric/sdk/android/a/b/i$a;
+.field public static final enum bfH:Lio/fabric/sdk/android/a/b/i$a;
 
-.field public static final enum bfn:Lio/fabric/sdk/android/a/b/i$a;
+.field public static final enum bfI:Lio/fabric/sdk/android/a/b/i$a;
 
-.field public static final enum bfo:Lio/fabric/sdk/android/a/b/i$a;
+.field public static final enum bfJ:Lio/fabric/sdk/android/a/b/i$a;
 
-.field public static final enum bfp:Lio/fabric/sdk/android/a/b/i$a;
+.field public static final enum bfK:Lio/fabric/sdk/android/a/b/i$a;
 
-.field public static final enum bfq:Lio/fabric/sdk/android/a/b/i$a;
+.field public static final enum bfL:Lio/fabric/sdk/android/a/b/i$a;
 
-.field public static final enum bfr:Lio/fabric/sdk/android/a/b/i$a;
+.field public static final enum bfM:Lio/fabric/sdk/android/a/b/i$a;
 
-.field public static final enum bft:Lio/fabric/sdk/android/a/b/i$a;
+.field public static final enum bfN:Lio/fabric/sdk/android/a/b/i$a;
 
-.field public static final enum bfu:Lio/fabric/sdk/android/a/b/i$a;
+.field public static final enum bfO:Lio/fabric/sdk/android/a/b/i$a;
 
-.field public static final enum bfv:Lio/fabric/sdk/android/a/b/i$a;
+.field public static final enum bfP:Lio/fabric/sdk/android/a/b/i$a;
 
-.field private static final bfw:Ljava/util/Map;
+.field private static final bfQ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -54,7 +54,7 @@
     .end annotation
 .end field
 
-.field private static final synthetic bfx:[Lio/fabric/sdk/android/a/b/i$a;
+.field private static final synthetic bfR:[Lio/fabric/sdk/android/a/b/i$a;
 
 
 # direct methods
@@ -69,7 +69,7 @@
 
     invoke-direct {v0, v2, v1}, Lio/fabric/sdk/android/a/b/i$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfl:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfG:Lio/fabric/sdk/android/a/b/i$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/i$a;
 
@@ -79,7 +79,7 @@
 
     invoke-direct {v0, v3, v2}, Lio/fabric/sdk/android/a/b/i$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfm:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfH:Lio/fabric/sdk/android/a/b/i$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/i$a;
 
@@ -89,7 +89,7 @@
 
     invoke-direct {v0, v4, v3}, Lio/fabric/sdk/android/a/b/i$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfn:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfI:Lio/fabric/sdk/android/a/b/i$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/i$a;
 
@@ -99,7 +99,7 @@
 
     invoke-direct {v0, v5, v4}, Lio/fabric/sdk/android/a/b/i$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfo:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfJ:Lio/fabric/sdk/android/a/b/i$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/i$a;
 
@@ -109,7 +109,7 @@
 
     invoke-direct {v0, v6, v5}, Lio/fabric/sdk/android/a/b/i$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfp:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfK:Lio/fabric/sdk/android/a/b/i$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/i$a;
 
@@ -119,7 +119,7 @@
 
     invoke-direct {v0, v7, v6}, Lio/fabric/sdk/android/a/b/i$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfq:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfL:Lio/fabric/sdk/android/a/b/i$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/i$a;
 
@@ -129,7 +129,7 @@
 
     invoke-direct {v0, v8, v7}, Lio/fabric/sdk/android/a/b/i$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfr:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfM:Lio/fabric/sdk/android/a/b/i$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/i$a;
 
@@ -139,7 +139,7 @@
 
     invoke-direct {v0, v9, v8}, Lio/fabric/sdk/android/a/b/i$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bft:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfN:Lio/fabric/sdk/android/a/b/i$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/i$a;
 
@@ -149,7 +149,7 @@
 
     invoke-direct {v0, v10, v9}, Lio/fabric/sdk/android/a/b/i$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfu:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfO:Lio/fabric/sdk/android/a/b/i$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/i$a;
 
@@ -159,85 +159,85 @@
 
     invoke-direct {v0, v11, v10}, Lio/fabric/sdk/android/a/b/i$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfv:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfP:Lio/fabric/sdk/android/a/b/i$a;
 
     const/16 v0, 0xa
 
     new-array v0, v0, [Lio/fabric/sdk/android/a/b/i$a;
 
-    sget-object v11, Lio/fabric/sdk/android/a/b/i$a;->bfl:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v11, Lio/fabric/sdk/android/a/b/i$a;->bfG:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v11, v0, v1
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfm:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfH:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfn:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfI:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfo:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfJ:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfp:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfK:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfq:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfL:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfr:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfM:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bft:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfN:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfu:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfO:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfv:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfP:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v10
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfx:[Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfR:[Lio/fabric/sdk/android/a/b/i$a;
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0, v5}, Ljava/util/HashMap;-><init>(I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfw:Ljava/util/Map;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfQ:Ljava/util/Map;
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfr:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfM:Lio/fabric/sdk/android/a/b/i$a;
 
     const-string v2, "armeabi-v7a"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfw:Ljava/util/Map;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfQ:Ljava/util/Map;
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfq:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfL:Lio/fabric/sdk/android/a/b/i$a;
 
     const-string v2, "armeabi"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfw:Ljava/util/Map;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfQ:Ljava/util/Map;
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfv:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfP:Lio/fabric/sdk/android/a/b/i$a;
 
     const-string v2, "arm64-v8a"
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfw:Ljava/util/Map;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfQ:Ljava/util/Map;
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfl:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfG:Lio/fabric/sdk/android/a/b/i$a;
 
     const-string v2, "x86"
 
@@ -259,7 +259,7 @@
     return-void
 .end method
 
-.method static CZ()Lio/fabric/sdk/android/a/b/i$a;
+.method static CQ()Lio/fabric/sdk/android/a/b/i$a;
     .locals 3
 
     sget-object v0, Landroid/os/Build;->CPU_ABI:Ljava/lang/String;
@@ -270,7 +270,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -280,7 +280,7 @@
 
     invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bft:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfN:Lio/fabric/sdk/android/a/b/i$a;
 
     return-object v0
 
@@ -291,7 +291,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfw:Ljava/util/Map;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bfQ:Ljava/util/Map;
 
     invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -301,7 +301,7 @@
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bft:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfN:Lio/fabric/sdk/android/a/b/i$a;
 
     :cond_1
     return-object v0
@@ -324,7 +324,7 @@
 .method public static values()[Lio/fabric/sdk/android/a/b/i$a;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfx:[Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bfR:[Lio/fabric/sdk/android/a/b/i$a;
 
     invoke-virtual {v0}, [Lio/fabric/sdk/android/a/b/i$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/i.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/i.smali
index 481a4b216f..9e93bfc555 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/i.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/i.smali
@@ -12,13 +12,13 @@
 
 
 # static fields
-.field private static bfh:Ljava/lang/Boolean;
+.field private static bfC:Ljava/lang/Boolean;
 
-.field private static final bfi:[C
+.field private static final bfD:[C
 
-.field private static bfj:J
+.field private static bfE:J
 
-.field public static final bfk:Ljava/util/Comparator;
+.field public static final bfF:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -39,17 +39,17 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i;->bfi:[C
+    sput-object v0, Lio/fabric/sdk/android/a/b/i;->bfD:[C
 
     const-wide/16 v0, -0x1
 
-    sput-wide v0, Lio/fabric/sdk/android/a/b/i;->bfj:J
+    sput-wide v0, Lio/fabric/sdk/android/a/b/i;->bfE:J
 
     new-instance v0, Lio/fabric/sdk/android/a/b/i$1;
 
     invoke-direct {v0}, Lio/fabric/sdk/android/a/b/i$1;-><init>()V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i;->bfk:Ljava/util/Comparator;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i;->bfF:Ljava/util/Comparator;
 
     return-void
 
@@ -76,10 +76,10 @@
     .end array-data
 .end method
 
-.method public static CX()I
+.method public static CO()I
     .locals 1
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/i$a;->CZ()Lio/fabric/sdk/android/a/b/i$a;
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i$a;->CQ()Lio/fabric/sdk/android/a/b/i$a;
 
     move-result-object v0
 
@@ -90,7 +90,7 @@
     return v0
 .end method
 
-.method public static declared-synchronized CY()J
+.method public static declared-synchronized CP()J
     .locals 8
 
     const-class v0, Lio/fabric/sdk/android/a/b/i;
@@ -98,7 +98,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-wide v1, Lio/fabric/sdk/android/a/b/i;->bfj:J
+    sget-wide v1, Lio/fabric/sdk/android/a/b/i;->bfE:J
 
     const-wide/16 v3, -0x1
 
@@ -192,7 +192,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -219,7 +219,7 @@
     move-exception v4
 
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -239,10 +239,10 @@
 
     :cond_3
     :goto_0
-    sput-wide v1, Lio/fabric/sdk/android/a/b/i;->bfj:J
+    sput-wide v1, Lio/fabric/sdk/android/a/b/i;->bfE:J
 
     :cond_4
-    sget-wide v1, Lio/fabric/sdk/android/a/b/i;->bfj:J
+    sget-wide v1, Lio/fabric/sdk/android/a/b/i;->bfE:J
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -258,7 +258,7 @@
     throw v1
 .end method
 
-.method public static S(Ljava/lang/String;)Z
+.method public static O(Ljava/lang/String;)Z
     .locals 0
 
     if-eqz p0, :cond_1
@@ -375,7 +375,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -402,7 +402,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -565,7 +565,7 @@
 .method private static aR(Landroid/content/Context;)Z
     .locals 2
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/i;->bfh:Ljava/lang/Boolean;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i;->bfC:Ljava/lang/Boolean;
 
     if-nez v0, :cond_0
 
@@ -581,10 +581,10 @@
 
     move-result-object p0
 
-    sput-object p0, Lio/fabric/sdk/android/a/b/i;->bfh:Ljava/lang/Boolean;
+    sput-object p0, Lio/fabric/sdk/android/a/b/i;->bfC:Ljava/lang/Boolean;
 
     :cond_0
-    sget-object p0, Lio/fabric/sdk/android/a/b/i;->bfh:Ljava/lang/Boolean;
+    sget-object p0, Lio/fabric/sdk/android/a/b/i;->bfC:Ljava/lang/Boolean;
 
     invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -844,7 +844,7 @@
 
     move-result-object v2
 
-    invoke-static {v2}, Lio/fabric/sdk/android/a/b/i;->S(Ljava/lang/String;)Z
+    invoke-static {v2}, Lio/fabric/sdk/android/a/b/i;->O(Ljava/lang/String;)Z
 
     move-result v3
     :try_end_1
@@ -886,7 +886,7 @@
 
     :goto_1
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -971,7 +971,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -1168,7 +1168,7 @@
 
     :goto_1
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -1228,7 +1228,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -1370,7 +1370,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -1494,7 +1494,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -1546,7 +1546,7 @@
     return-void
 .end method
 
-.method public static dG(Ljava/lang/String;)J
+.method public static dA(Ljava/lang/String;)J
     .locals 7
 
     new-instance v0, Landroid/os/StatFs;
@@ -1580,7 +1580,7 @@
     return-wide v3
 .end method
 
-.method public static dg(I)Ljava/lang/String;
+.method public static dd(I)Ljava/lang/String;
     .locals 3
 
     if-ltz p0, :cond_0
@@ -1625,7 +1625,7 @@
     throw p0
 .end method
 
-.method public static dh(I)Ljava/lang/String;
+.method public static de(I)Ljava/lang/String;
     .locals 0
 
     packed-switch p0, :pswitch_data_0
@@ -1804,7 +1804,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1825,7 +1825,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1846,7 +1846,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1905,7 +1905,7 @@
 
     mul-int/lit8 v3, v1, 0x2
 
-    sget-object v4, Lio/fabric/sdk/android/a/b/i;->bfi:[C
+    sget-object v4, Lio/fabric/sdk/android/a/b/i;->bfD:[C
 
     ushr-int/lit8 v5, v2, 0x4
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/j.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/j.smali
index 81db0de055..d32c7d8e76 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/j.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/j.smali
@@ -13,7 +13,7 @@
 
 
 # instance fields
-.field public final bfy:Ljava/lang/String;
+.field public final bfS:Ljava/lang/String;
 
 .field public final sessionId:Ljava/lang/String;
 
@@ -26,7 +26,7 @@
 
     iput-object p1, p0, Lio/fabric/sdk/android/a/b/j;->sessionId:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/j;->bfy:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/j;->bfS:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/k.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/k.smali
index 89aee30c58..734b35c49f 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/k.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/k.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract Da()J
+.method public abstract CR()J
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/l.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/l.smali
index 72ad3632ca..46d670c3d8 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/l.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/l.smali
@@ -4,19 +4,19 @@
 
 
 # static fields
-.field private static bfA:Ljava/lang/Object;
+.field private static bfT:Lio/fabric/sdk/android/a/b/l;
 
-.field private static bfz:Lio/fabric/sdk/android/a/b/l;
+.field private static bfU:Ljava/lang/Object;
 
 
 # instance fields
-.field private volatile bfB:Z
+.field private volatile bfV:Z
 
-.field public volatile bfC:Z
+.field public volatile bfW:Z
 
-.field private final bfD:Lio/fabric/sdk/android/a/b/p;
+.field private final bfX:Lio/fabric/sdk/android/a/b/p;
 
-.field private bfE:Z
+.field private bfY:Z
 
 .field private final sharedPreferences:Landroid/content/SharedPreferences;
 
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/l;->bfA:Ljava/lang/Object;
+    sput-object v0, Lio/fabric/sdk/android/a/b/l;->bfU:Ljava/lang/Object;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bfE:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bfY:Z
 
     if-eqz p1, :cond_3
 
@@ -57,7 +57,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lio/fabric/sdk/android/a/b/l;->bfD:Lio/fabric/sdk/android/a/b/p;
+    iput-object v1, p0, Lio/fabric/sdk/android/a/b/l;->bfX:Lio/fabric/sdk/android/a/b/p;
 
     iget-object v1, p0, Lio/fabric/sdk/android/a/b/l;->sharedPreferences:Landroid/content/SharedPreferences;
 
@@ -127,7 +127,7 @@
     :catch_0
     move-exception v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -143,9 +143,9 @@
     const/4 v2, 0x0
 
     :goto_1
-    iput-boolean v1, p0, Lio/fabric/sdk/android/a/b/l;->bfC:Z
+    iput-boolean v1, p0, Lio/fabric/sdk/android/a/b/l;->bfW:Z
 
-    iput-boolean v2, p0, Lio/fabric/sdk/android/a/b/l;->bfB:Z
+    iput-boolean v2, p0, Lio/fabric/sdk/android/a/b/l;->bfV:Z
 
     invoke-static {p1}, Lio/fabric/sdk/android/a/b/i;->ba(Landroid/content/Context;)Ljava/lang/String;
 
@@ -156,7 +156,7 @@
     const/4 v0, 0x1
 
     :cond_2
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bfE:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bfY:Z
 
     return-void
 
@@ -179,12 +179,12 @@
 .method public static bc(Landroid/content/Context;)Lio/fabric/sdk/android/a/b/l;
     .locals 2
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/l;->bfA:Ljava/lang/Object;
+    sget-object v0, Lio/fabric/sdk/android/a/b/l;->bfU:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lio/fabric/sdk/android/a/b/l;->bfz:Lio/fabric/sdk/android/a/b/l;
+    sget-object v1, Lio/fabric/sdk/android/a/b/l;->bfT:Lio/fabric/sdk/android/a/b/l;
 
     if-nez v1, :cond_0
 
@@ -192,10 +192,10 @@
 
     invoke-direct {v1, p0}, Lio/fabric/sdk/android/a/b/l;-><init>(Landroid/content/Context;)V
 
-    sput-object v1, Lio/fabric/sdk/android/a/b/l;->bfz:Lio/fabric/sdk/android/a/b/l;
+    sput-object v1, Lio/fabric/sdk/android/a/b/l;->bfT:Lio/fabric/sdk/android/a/b/l;
 
     :cond_0
-    sget-object p0, Lio/fabric/sdk/android/a/b/l;->bfz:Lio/fabric/sdk/android/a/b/l;
+    sget-object p0, Lio/fabric/sdk/android/a/b/l;->bfT:Lio/fabric/sdk/android/a/b/l;
 
     monitor-exit v0
 
@@ -213,23 +213,23 @@
 
 
 # virtual methods
-.method public final Db()Z
+.method public final CS()Z
     .locals 1
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bfE:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bfY:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bfB:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bfV:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bfC:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bfW:Z
 
     return v0
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/l;->bfD:Lio/fabric/sdk/android/a/b/p;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/l;->bfX:Lio/fabric/sdk/android/a/b/p;
 
     if-eqz v0, :cond_1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/m.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/m.smali
index 2b2696d9e9..62b51c3225 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/m.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/m.smali
@@ -14,15 +14,15 @@
 
 
 # static fields
-.field public static final enum bfF:Lio/fabric/sdk/android/a/b/m;
+.field public static final enum bfZ:Lio/fabric/sdk/android/a/b/m;
 
-.field public static final enum bfG:Lio/fabric/sdk/android/a/b/m;
+.field public static final enum bga:Lio/fabric/sdk/android/a/b/m;
 
-.field public static final enum bfH:Lio/fabric/sdk/android/a/b/m;
+.field public static final enum bgb:Lio/fabric/sdk/android/a/b/m;
 
-.field public static final enum bfI:Lio/fabric/sdk/android/a/b/m;
+.field public static final enum bgc:Lio/fabric/sdk/android/a/b/m;
 
-.field private static final synthetic bfJ:[Lio/fabric/sdk/android/a/b/m;
+.field private static final synthetic bgd:[Lio/fabric/sdk/android/a/b/m;
 
 
 # instance fields
@@ -43,7 +43,7 @@
 
     invoke-direct {v0, v3, v1, v2}, Lio/fabric/sdk/android/a/b/m;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bfF:Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bfZ:Lio/fabric/sdk/android/a/b/m;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/m;
 
@@ -53,7 +53,7 @@
 
     invoke-direct {v0, v4, v2, v3}, Lio/fabric/sdk/android/a/b/m;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bfG:Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bga:Lio/fabric/sdk/android/a/b/m;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/m;
 
@@ -63,7 +63,7 @@
 
     invoke-direct {v0, v5, v3, v4}, Lio/fabric/sdk/android/a/b/m;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bfH:Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bgb:Lio/fabric/sdk/android/a/b/m;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/m;
 
@@ -73,27 +73,27 @@
 
     invoke-direct {v0, v6, v4, v5}, Lio/fabric/sdk/android/a/b/m;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bfI:Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bgc:Lio/fabric/sdk/android/a/b/m;
 
     new-array v0, v5, [Lio/fabric/sdk/android/a/b/m;
 
-    sget-object v5, Lio/fabric/sdk/android/a/b/m;->bfF:Lio/fabric/sdk/android/a/b/m;
+    sget-object v5, Lio/fabric/sdk/android/a/b/m;->bfZ:Lio/fabric/sdk/android/a/b/m;
 
     aput-object v5, v0, v1
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bfG:Lio/fabric/sdk/android/a/b/m;
+    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bga:Lio/fabric/sdk/android/a/b/m;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bfH:Lio/fabric/sdk/android/a/b/m;
+    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bgb:Lio/fabric/sdk/android/a/b/m;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bfI:Lio/fabric/sdk/android/a/b/m;
+    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bgc:Lio/fabric/sdk/android/a/b/m;
 
     aput-object v1, v0, v4
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bfJ:[Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bgd:[Lio/fabric/sdk/android/a/b/m;
 
     return-void
 .end method
@@ -113,7 +113,7 @@
     return-void
 .end method
 
-.method public static dH(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/m;
+.method public static dB(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/m;
     .locals 1
 
     const-string v0, "io.crash.air"
@@ -124,19 +124,19 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bfH:Lio/fabric/sdk/android/a/b/m;
+    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bgb:Lio/fabric/sdk/android/a/b/m;
 
     return-object p0
 
     :cond_0
     if-eqz p0, :cond_1
 
-    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bfI:Lio/fabric/sdk/android/a/b/m;
+    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bgc:Lio/fabric/sdk/android/a/b/m;
 
     return-object p0
 
     :cond_1
-    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bfF:Lio/fabric/sdk/android/a/b/m;
+    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bfZ:Lio/fabric/sdk/android/a/b/m;
 
     return-object p0
 .end method
@@ -158,7 +158,7 @@
 .method public static values()[Lio/fabric/sdk/android/a/b/m;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/m;->bfJ:[Lio/fabric/sdk/android/a/b/m;
+    sget-object v0, Lio/fabric/sdk/android/a/b/m;->bgd:[Lio/fabric/sdk/android/a/b/m;
 
     invoke-virtual {v0}, [Lio/fabric/sdk/android/a/b/m;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o$1$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o$1$1.smali
index 0500c2e049..2984e6b2b6 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o$1$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o$1$1.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic bfM:Lio/fabric/sdk/android/a/b/o$1;
+.field final synthetic bgg:Lio/fabric/sdk/android/a/b/o$1;
 
-.field final synthetic qR:Ljava/lang/Runnable;
+.field final synthetic qQ:Ljava/lang/Runnable;
 
 
 # direct methods
 .method constructor <init>(Lio/fabric/sdk/android/a/b/o$1;Ljava/lang/Runnable;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/o$1$1;->bfM:Lio/fabric/sdk/android/a/b/o$1;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/o$1$1;->bgg:Lio/fabric/sdk/android/a/b/o$1;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$1$1;->qR:Ljava/lang/Runnable;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$1$1;->qQ:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a/b/h;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final df()V
+.method public final de()V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/o$1$1;->qR:Ljava/lang/Runnable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/o$1$1;->qQ:Ljava/lang/Runnable;
 
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o$1.smali
index 3b77667130..06ab538523 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lio/fabric/sdk/android/a/b/o;->dI(Ljava/lang/String;)Ljava/util/concurrent/ThreadFactory;
+    value = Lio/fabric/sdk/android/a/b/o;->dC(Ljava/lang/String;)Ljava/util/concurrent/ThreadFactory;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bfK:Ljava/lang/String;
+.field final synthetic bge:Ljava/lang/String;
 
-.field final synthetic bfL:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic bgf:Ljava/util/concurrent/atomic/AtomicLong;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/String;Ljava/util/concurrent/atomic/AtomicLong;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/o$1;->bfK:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/o$1;->bge:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$1;->bfL:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$1;->bgf:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,11 +57,11 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$1;->bfK:Ljava/lang/String;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$1;->bge:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$1;->bfL:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$1;->bgf:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o$2.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o$2.smali
index c0b1ad814f..1b7060234c 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o$2.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o$2.smali
@@ -15,28 +15,28 @@
 
 
 # instance fields
-.field final synthetic bfN:Ljava/lang/String;
+.field final synthetic bgh:Ljava/lang/String;
 
-.field final synthetic bfO:Ljava/util/concurrent/ExecutorService;
+.field final synthetic bgi:Ljava/util/concurrent/ExecutorService;
 
-.field final synthetic bfP:J
+.field final synthetic bgj:J
 
-.field final synthetic bfQ:Ljava/util/concurrent/TimeUnit;
+.field final synthetic bgk:Ljava/util/concurrent/TimeUnit;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/String;Ljava/util/concurrent/ExecutorService;JLjava/util/concurrent/TimeUnit;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/o$2;->bfN:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/o$2;->bgh:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$2;->bfO:Ljava/util/concurrent/ExecutorService;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$2;->bgi:Ljava/util/concurrent/ExecutorService;
 
     const-wide/16 p1, 0x2
 
-    iput-wide p1, p0, Lio/fabric/sdk/android/a/b/o$2;->bfP:J
+    iput-wide p1, p0, Lio/fabric/sdk/android/a/b/o$2;->bgj:J
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/b/o$2;->bfQ:Ljava/util/concurrent/TimeUnit;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/b/o$2;->bgk:Ljava/util/concurrent/TimeUnit;
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a/b/h;-><init>()V
 
@@ -45,13 +45,13 @@
 
 
 # virtual methods
-.method public final df()V
+.method public final de()V
     .locals 6
 
     const-string v0, "Fabric"
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -61,7 +61,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v3, p0, Lio/fabric/sdk/android/a/b/o$2;->bfN:Ljava/lang/String;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/b/o$2;->bgh:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -71,15 +71,15 @@
 
     invoke-interface {v1, v0, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$2;->bfO:Ljava/util/concurrent/ExecutorService;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$2;->bgi:Ljava/util/concurrent/ExecutorService;
 
     invoke-interface {v1}, Ljava/util/concurrent/ExecutorService;->shutdown()V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$2;->bfO:Ljava/util/concurrent/ExecutorService;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$2;->bgi:Ljava/util/concurrent/ExecutorService;
 
-    iget-wide v2, p0, Lio/fabric/sdk/android/a/b/o$2;->bfP:J
+    iget-wide v2, p0, Lio/fabric/sdk/android/a/b/o$2;->bgj:J
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/b/o$2;->bfQ:Ljava/util/concurrent/TimeUnit;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/b/o$2;->bgk:Ljava/util/concurrent/TimeUnit;
 
     invoke-interface {v1, v2, v3, v4}, Ljava/util/concurrent/ExecutorService;->awaitTermination(JLjava/util/concurrent/TimeUnit;)Z
 
@@ -87,7 +87,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -95,7 +95,7 @@
 
     invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v3, p0, Lio/fabric/sdk/android/a/b/o$2;->bfN:Ljava/lang/String;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/b/o$2;->bgh:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -109,7 +109,7 @@
 
     invoke-interface {v1, v0, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$2;->bfO:Ljava/util/concurrent/ExecutorService;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$2;->bgi:Ljava/util/concurrent/ExecutorService;
 
     invoke-interface {v1}, Ljava/util/concurrent/ExecutorService;->shutdownNow()Ljava/util/List;
     :try_end_0
@@ -119,7 +119,7 @@
     return-void
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -131,7 +131,7 @@
 
     const/4 v4, 0x0
 
-    iget-object v5, p0, Lio/fabric/sdk/android/a/b/o$2;->bfN:Ljava/lang/String;
+    iget-object v5, p0, Lio/fabric/sdk/android/a/b/o$2;->bgh:Ljava/lang/String;
 
     aput-object v5, v3, v4
 
@@ -143,7 +143,7 @@
 
     invoke-interface {v1, v0, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/o$2;->bfO:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/o$2;->bgi:Ljava/util/concurrent/ExecutorService;
 
     invoke-interface {v0}, Ljava/util/concurrent/ExecutorService;->shutdownNow()Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o.smali
index 0b3c2203c8..a94fec4f62 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/o.smali
@@ -54,7 +54,7 @@
     return-void
 .end method
 
-.method public static final dI(Ljava/lang/String;)Ljava/util/concurrent/ThreadFactory;
+.method public static final dC(Ljava/lang/String;)Ljava/util/concurrent/ThreadFactory;
     .locals 3
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicLong;
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/q.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/q.smali
index 5c3512308d..4269216312 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/q.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/q.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final bfR:Ljava/lang/reflect/Method;
+.field private final bgl:Ljava/lang/reflect/Method;
 
-.field private final bfS:Ljava/lang/Object;
+.field private final bgm:Ljava/lang/Object;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/q;->bfS:Ljava/lang/Object;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/q;->bgm:Ljava/lang/Object;
 
     const/4 p2, 0x0
 
@@ -35,7 +35,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/q;->bfR:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/q;->bgl:Ljava/lang/reflect/Method;
 
     return-void
 .end method
@@ -85,7 +85,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -98,7 +98,7 @@
     :catch_1
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -123,7 +123,7 @@
     goto :goto_0
 
     :catch_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -145,9 +145,9 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/q;->bfR:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/q;->bgl:Ljava/lang/reflect/Method;
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/q;->bfS:Ljava/lang/Object;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/q;->bgm:Ljava/lang/Object;
 
     new-array v3, v0, [Ljava/lang/Object;
 
@@ -168,7 +168,7 @@
     :catch_0
     move-exception v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/s$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/s$a.smali
index 515fecb561..aae919f168 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/s$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/s$a.smali
@@ -23,21 +23,21 @@
 
 
 # static fields
-.field public static final enum bgd:Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bgA:Lio/fabric/sdk/android/a/b/s$a;
 
-.field public static final enum bge:Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bgB:Lio/fabric/sdk/android/a/b/s$a;
 
-.field public static final enum bgf:Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bgC:Lio/fabric/sdk/android/a/b/s$a;
 
-.field public static final enum bgg:Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bgD:Lio/fabric/sdk/android/a/b/s$a;
 
-.field public static final enum bgh:Lio/fabric/sdk/android/a/b/s$a;
+.field private static final synthetic bgE:[Lio/fabric/sdk/android/a/b/s$a;
 
-.field public static final enum bgi:Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bgx:Lio/fabric/sdk/android/a/b/s$a;
 
-.field public static final enum bgj:Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bgy:Lio/fabric/sdk/android/a/b/s$a;
 
-.field private static final synthetic bgk:[Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bgz:Lio/fabric/sdk/android/a/b/s$a;
 
 
 # instance fields
@@ -58,7 +58,7 @@
 
     invoke-direct {v0, v3, v1, v2}, Lio/fabric/sdk/android/a/b/s$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgd:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgx:Lio/fabric/sdk/android/a/b/s$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/s$a;
 
@@ -68,7 +68,7 @@
 
     invoke-direct {v0, v4, v2, v3}, Lio/fabric/sdk/android/a/b/s$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bge:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgy:Lio/fabric/sdk/android/a/b/s$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/s$a;
 
@@ -78,7 +78,7 @@
 
     invoke-direct {v0, v4, v3, v5}, Lio/fabric/sdk/android/a/b/s$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgf:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgz:Lio/fabric/sdk/android/a/b/s$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/s$a;
 
@@ -90,7 +90,7 @@
 
     invoke-direct {v0, v5, v4, v6}, Lio/fabric/sdk/android/a/b/s$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgg:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgA:Lio/fabric/sdk/android/a/b/s$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/s$a;
 
@@ -102,7 +102,7 @@
 
     invoke-direct {v0, v6, v5, v7}, Lio/fabric/sdk/android/a/b/s$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgh:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgB:Lio/fabric/sdk/android/a/b/s$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/s$a;
 
@@ -114,7 +114,7 @@
 
     invoke-direct {v0, v7, v6, v8}, Lio/fabric/sdk/android/a/b/s$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgi:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgC:Lio/fabric/sdk/android/a/b/s$a;
 
     new-instance v0, Lio/fabric/sdk/android/a/b/s$a;
 
@@ -126,41 +126,41 @@
 
     invoke-direct {v0, v8, v7, v9}, Lio/fabric/sdk/android/a/b/s$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgj:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgD:Lio/fabric/sdk/android/a/b/s$a;
 
     const/4 v0, 0x7
 
     new-array v0, v0, [Lio/fabric/sdk/android/a/b/s$a;
 
-    sget-object v8, Lio/fabric/sdk/android/a/b/s$a;->bgd:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v8, Lio/fabric/sdk/android/a/b/s$a;->bgx:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v8, v0, v1
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bge:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bgy:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bgf:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bgz:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bgg:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bgA:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bgh:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bgB:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bgi:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bgC:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bgj:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bgD:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v7
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgk:[Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgE:[Lio/fabric/sdk/android/a/b/s$a;
 
     return-void
 .end method
@@ -197,7 +197,7 @@
 .method public static values()[Lio/fabric/sdk/android/a/b/s$a;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgk:[Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/s$a;->bgE:[Lio/fabric/sdk/android/a/b/s$a;
 
     invoke-virtual {v0}, [Lio/fabric/sdk/android/a/b/s$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/s.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/s.smali
index 3a2af6de4c..331e1e6382 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/s.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/s.smali
@@ -12,35 +12,35 @@
 
 
 # static fields
-.field private static final bfT:Ljava/util/regex/Pattern;
+.field private static final bgn:Ljava/util/regex/Pattern;
 
-.field private static final bfU:Ljava/lang/String;
+.field private static final bgo:Ljava/lang/String;
 
 
 # instance fields
-.field private final beG:Ljava/lang/String;
+.field private final bfa:Ljava/lang/String;
 
-.field public final beH:Ljava/lang/String;
+.field public final bfb:Ljava/lang/String;
 
-.field private final bfV:Ljava/util/concurrent/locks/ReentrantLock;
+.field private final bgp:Ljava/util/concurrent/locks/ReentrantLock;
 
-.field private final bfW:Lio/fabric/sdk/android/a/b/t;
+.field private final bgq:Lio/fabric/sdk/android/a/b/t;
 
-.field public final bfX:Z
+.field public final bgr:Z
 
-.field public final bfY:Z
+.field public final bgs:Z
 
-.field bfZ:Lio/fabric/sdk/android/a/b/c;
+.field bgt:Lio/fabric/sdk/android/a/b/c;
 
-.field bga:Lio/fabric/sdk/android/a/b/b;
+.field bgu:Lio/fabric/sdk/android/a/b/b;
 
-.field bgb:Z
+.field bgv:Z
 
-.field bgc:Lio/fabric/sdk/android/a/b/r;
+.field bgw:Lio/fabric/sdk/android/a/b/r;
 
-.field public final mN:Landroid/content/Context;
+.field public final mM:Landroid/content/Context;
 
-.field private final oI:Ljava/util/Collection;
+.field private final oH:Ljava/util/Collection;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Collection<",
@@ -61,7 +61,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/s;->bfT:Ljava/util/regex/Pattern;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s;->bgn:Ljava/util/regex/Pattern;
 
     const-string v0, "/"
 
@@ -69,7 +69,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/s;->bfU:Ljava/lang/String;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s;->bgo:Ljava/lang/String;
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/locks/ReentrantLock;-><init>()V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bfV:Ljava/util/concurrent/locks/ReentrantLock;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bgp:Ljava/util/concurrent/locks/ReentrantLock;
 
     if-eqz p1, :cond_4
 
@@ -102,31 +102,31 @@
 
     if-eqz p4, :cond_2
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/s;->mN:Landroid/content/Context;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/s;->mM:Landroid/content/Context;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->beH:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bfb:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/b/s;->beG:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/b/s;->bfa:Ljava/lang/String;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/b/s;->oI:Ljava/util/Collection;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/b/s;->oH:Ljava/util/Collection;
 
     new-instance p2, Lio/fabric/sdk/android/a/b/t;
 
     invoke-direct {p2}, Lio/fabric/sdk/android/a/b/t;-><init>()V
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bfW:Lio/fabric/sdk/android/a/b/t;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bgq:Lio/fabric/sdk/android/a/b/t;
 
     new-instance p2, Lio/fabric/sdk/android/a/b/c;
 
     invoke-direct {p2, p1}, Lio/fabric/sdk/android/a/b/c;-><init>(Landroid/content/Context;)V
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bfZ:Lio/fabric/sdk/android/a/b/c;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bgt:Lio/fabric/sdk/android/a/b/c;
 
     new-instance p2, Lio/fabric/sdk/android/a/b/r;
 
     invoke-direct {p2}, Lio/fabric/sdk/android/a/b/r;-><init>()V
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bgc:Lio/fabric/sdk/android/a/b/r;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bgw:Lio/fabric/sdk/android/a/b/r;
 
     const/4 p2, 0x1
 
@@ -136,15 +136,15 @@
 
     move-result p3
 
-    iput-boolean p3, p0, Lio/fabric/sdk/android/a/b/s;->bfX:Z
+    iput-boolean p3, p0, Lio/fabric/sdk/android/a/b/s;->bgr:Z
 
-    iget-boolean p3, p0, Lio/fabric/sdk/android/a/b/s;->bfX:Z
+    iget-boolean p3, p0, Lio/fabric/sdk/android/a/b/s;->bgr:Z
 
     const-string p4, "Fabric"
 
     if-nez p3, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p3
 
@@ -173,13 +173,13 @@
 
     move-result p2
 
-    iput-boolean p2, p0, Lio/fabric/sdk/android/a/b/s;->bfY:Z
+    iput-boolean p2, p0, Lio/fabric/sdk/android/a/b/s;->bgs:Z
 
-    iget-boolean p2, p0, Lio/fabric/sdk/android/a/b/s;->bfY:Z
+    iget-boolean p2, p0, Lio/fabric/sdk/android/a/b/s;->bgs:Z
 
     if-nez p2, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -232,50 +232,12 @@
     throw p1
 .end method
 
-.method public static Dd()Ljava/lang/String;
-    .locals 4
-
-    sget-object v0, Ljava/util/Locale;->US:Ljava/util/Locale;
-
-    const/4 v1, 0x2
-
-    new-array v1, v1, [Ljava/lang/Object;
-
-    sget-object v2, Landroid/os/Build;->MANUFACTURER:Ljava/lang/String;
-
-    invoke-static {v2}, Lio/fabric/sdk/android/a/b/s;->dJ(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v2
-
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    sget-object v2, Landroid/os/Build;->MODEL:Ljava/lang/String;
-
-    invoke-static {v2}, Lio/fabric/sdk/android/a/b/s;->dJ(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v2
-
-    const/4 v3, 0x1
-
-    aput-object v2, v1, v3
-
-    const-string v2, "%s/%s"
-
-    invoke-static {v0, v2, v1}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
 .method private a(Landroid/content/SharedPreferences;)Ljava/lang/String;
     .locals 3
 
     const-string v0, "crashlytics.installation.id"
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->bfV:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->bgp:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
 
@@ -304,7 +266,7 @@
     goto :goto_1
 
     :cond_0
-    sget-object v1, Lio/fabric/sdk/android/a/b/s;->bfT:Ljava/util/regex/Pattern;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s;->bgn:Ljava/util/regex/Pattern;
 
     invoke-virtual {v1, v2}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -338,7 +300,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :cond_1
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/s;->bfV:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/s;->bgp:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
@@ -347,7 +309,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bfV:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bgp:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
@@ -386,13 +348,13 @@
 .method private b(Landroid/content/SharedPreferences;)V
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/s;->CV()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/s;->CM()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lio/fabric/sdk/android/a/b/b;->bfa:Ljava/lang/String;
+    iget-object v0, v0, Lio/fabric/sdk/android/a/b/b;->bfv:Ljava/lang/String;
 
     invoke-direct {p0, p1, v0}, Lio/fabric/sdk/android/a/b/s;->c(Landroid/content/SharedPreferences;Ljava/lang/String;)V
 
@@ -405,7 +367,7 @@
 
     const-string v0, "crashlytics.advertising.id"
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->bfV:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->bgp:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
 
@@ -420,7 +382,7 @@
 
     :cond_0
     :goto_0
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/s;->bfV:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/s;->bgp:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
@@ -482,7 +444,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bfV:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bgp:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {p2}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
@@ -495,10 +457,10 @@
     goto :goto_1
 .end method
 
-.method public static dJ(Ljava/lang/String;)Ljava/lang/String;
+.method public static dD(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/s;->bfU:Ljava/lang/String;
+    sget-object v0, Lio/fabric/sdk/android/a/b/s;->bgo:Ljava/lang/String;
 
     const-string v1, ""
 
@@ -509,23 +471,61 @@
     return-object p0
 .end method
 
+.method public static getModelName()Ljava/lang/String;
+    .locals 4
+
+    sget-object v0, Ljava/util/Locale;->US:Ljava/util/Locale;
+
+    const/4 v1, 0x2
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    sget-object v2, Landroid/os/Build;->MANUFACTURER:Ljava/lang/String;
+
+    invoke-static {v2}, Lio/fabric/sdk/android/a/b/s;->dD(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    sget-object v2, Landroid/os/Build;->MODEL:Ljava/lang/String;
+
+    invoke-static {v2}, Lio/fabric/sdk/android/a/b/s;->dD(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    const/4 v3, 0x1
+
+    aput-object v2, v1, v3
+
+    const-string v2, "%s/%s"
+
+    invoke-static {v0, v2, v1}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 
 # virtual methods
-.method public declared-synchronized CV()Lio/fabric/sdk/android/a/b/b;
+.method public declared-synchronized CM()Lio/fabric/sdk/android/a/b/b;
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/s;->bgb:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/s;->bgv:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bfZ:Lio/fabric/sdk/android/a/b/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bgt:Lio/fabric/sdk/android/a/b/c;
 
-    iget-object v1, v0, Lio/fabric/sdk/android/a/b/c;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, v0, Lio/fabric/sdk/android/a/b/c;->sT:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->DO()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->DE()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -537,9 +537,9 @@
 
     move-result-object v1
 
-    iget-object v2, v0, Lio/fabric/sdk/android/a/b/c;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object v2, v0, Lio/fabric/sdk/android/a/b/c;->sT:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->DO()Landroid/content/SharedPreferences;
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->DE()Landroid/content/SharedPreferences;
 
     move-result-object v2
 
@@ -561,7 +561,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -584,21 +584,21 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->CU()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->CL()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v3
 
     invoke-virtual {v0, v3}, Lio/fabric/sdk/android/a/b/c;->a(Lio/fabric/sdk/android/a/b/b;)V
 
     :goto_0
-    iput-object v3, p0, Lio/fabric/sdk/android/a/b/s;->bga:Lio/fabric/sdk/android/a/b/b;
+    iput-object v3, p0, Lio/fabric/sdk/android/a/b/s;->bgu:Lio/fabric/sdk/android/a/b/b;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/s;->bgb:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/s;->bgv:Z
 
     :cond_1
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bga:Lio/fabric/sdk/android/a/b/b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bgu:Lio/fabric/sdk/android/a/b/b;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -614,14 +614,14 @@
     throw v0
 .end method
 
-.method public final Dc()Ljava/lang/String;
+.method public final CT()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->beG:Ljava/lang/String;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bfa:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->mN:Landroid/content/Context;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->mM:Landroid/content/Context;
 
     invoke-static {v0}, Lio/fabric/sdk/android/a/b/i;->aN(Landroid/content/Context;)Landroid/content/SharedPreferences;
 
@@ -669,7 +669,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->oI:Ljava/util/Collection;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->oH:Ljava/util/Collection;
 
     invoke-interface {v1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
 
@@ -746,9 +746,9 @@
 .method public final getInstallerPackageName()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bfW:Lio/fabric/sdk/android/a/b/t;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bgq:Lio/fabric/sdk/android/a/b/t;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->mN:Landroid/content/Context;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->mM:Landroid/content/Context;
 
     invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/b/t;->bh(Landroid/content/Context;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/t$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/t$1.smali
index 9acb11ec44..60c352fd8f 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/t$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/t$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic bgn:Lio/fabric/sdk/android/a/b/t;
+.field final synthetic bgH:Lio/fabric/sdk/android/a/b/t;
 
 
 # direct methods
 .method constructor <init>(Lio/fabric/sdk/android/a/b/t;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/t$1;->bgn:Lio/fabric/sdk/android/a/b/t;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/t$1;->bgH:Lio/fabric/sdk/android/a/b/t;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/t.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/t.smali
index 575fab2e90..a6e15d1afc 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/t.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/t.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final bgl:Lio/fabric/sdk/android/a/a/d;
+.field private final bgF:Lio/fabric/sdk/android/a/a/d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/a/a/d<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private final bgm:Lio/fabric/sdk/android/a/a/b;
+.field private final bgG:Lio/fabric/sdk/android/a/a/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/a/a/b<",
@@ -35,13 +35,13 @@
 
     invoke-direct {v0, p0}, Lio/fabric/sdk/android/a/b/t$1;-><init>(Lio/fabric/sdk/android/a/b/t;)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/b/t;->bgl:Lio/fabric/sdk/android/a/a/d;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/t;->bgF:Lio/fabric/sdk/android/a/a/d;
 
     new-instance v0, Lio/fabric/sdk/android/a/a/b;
 
     invoke-direct {v0}, Lio/fabric/sdk/android/a/a/b;-><init>()V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/b/t;->bgm:Lio/fabric/sdk/android/a/a/b;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/t;->bgG:Lio/fabric/sdk/android/a/a/b;
 
     return-void
 .end method
@@ -54,9 +54,9 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/t;->bgm:Lio/fabric/sdk/android/a/a/b;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/t;->bgG:Lio/fabric/sdk/android/a/a/b;
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/t;->bgl:Lio/fabric/sdk/android/a/a/d;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/t;->bgF:Lio/fabric/sdk/android/a/a/d;
 
     invoke-virtual {v1, p1, v2}, Lio/fabric/sdk/android/a/a/b;->a(Landroid/content/Context;Lio/fabric/sdk/android/a/a/d;)Ljava/lang/Object;
 
@@ -82,7 +82,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u$1.smali
index 98cc68f00b..d52114eb93 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u$1.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field bgt:Z
+.field bgN:Z
 
-.field final synthetic bgu:Ljava/lang/StringBuilder;
+.field final synthetic bgO:Ljava/lang/StringBuilder;
 
-.field final synthetic bgv:Lio/fabric/sdk/android/a/b/u;
+.field final synthetic bgP:Lio/fabric/sdk/android/a/b/u;
 
 
 # direct methods
 .method constructor <init>(Lio/fabric/sdk/android/a/b/u;Ljava/lang/StringBuilder;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bgv:Lio/fabric/sdk/android/a/b/u;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bgP:Lio/fabric/sdk/android/a/b/u;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/u$1;->bgu:Ljava/lang/StringBuilder;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/u$1;->bgO:Ljava/lang/StringBuilder;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bgt:Z
+    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bgN:Z
 
     return-void
 .end method
@@ -52,25 +52,25 @@
         }
     .end annotation
 
-    iget-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bgt:Z
+    iget-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bgN:Z
 
     if-eqz p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bgt:Z
+    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bgN:Z
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bgu:Ljava/lang/StringBuilder;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bgO:Ljava/lang/StringBuilder;
 
     const-string v0, ", "
 
     invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :goto_0
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bgu:Ljava/lang/StringBuilder;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bgO:Ljava/lang/StringBuilder;
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u$a.smali
index a76c38bc23..44e39c3d35 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u$a.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final bgw:Lio/fabric/sdk/android/a/b/u$a;
+.field static final bgQ:Lio/fabric/sdk/android/a/b/u$a;
 
 
 # instance fields
@@ -34,7 +34,7 @@
 
     invoke-direct {v0, v1, v1}, Lio/fabric/sdk/android/a/b/u$a;-><init>(II)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/u$a;->bgw:Lio/fabric/sdk/android/a/b/u$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/u$a;->bgQ:Lio/fabric/sdk/android/a/b/u$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u$b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u$b.smali
index a81ab329fb..d36eed0a37 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u$b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u$b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final synthetic bgv:Lio/fabric/sdk/android/a/b/u;
+.field final synthetic bgP:Lio/fabric/sdk/android/a/b/u;
 
 .field private position:I
 
@@ -26,7 +26,7 @@
 .method private constructor <init>(Lio/fabric/sdk/android/a/b/u;Lio/fabric/sdk/android/a/b/u$a;)V
     .locals 1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u$b;->bgv:Lio/fabric/sdk/android/a/b/u;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u$b;->bgP:Lio/fabric/sdk/android/a/b/u;
 
     invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
 
@@ -74,7 +74,7 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bgv:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bgP:Lio/fabric/sdk/android/a/b/u;
 
     invoke-static {v0}, Lio/fabric/sdk/android/a/b/u;->a(Lio/fabric/sdk/android/a/b/u;)Ljava/io/RandomAccessFile;
 
@@ -86,7 +86,7 @@
 
     invoke-virtual {v0, v1, v2}, Ljava/io/RandomAccessFile;->seek(J)V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bgv:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bgP:Lio/fabric/sdk/android/a/b/u;
 
     invoke-static {v0}, Lio/fabric/sdk/android/a/b/u;->a(Lio/fabric/sdk/android/a/b/u;)Ljava/io/RandomAccessFile;
 
@@ -96,7 +96,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u$b;->bgv:Lio/fabric/sdk/android/a/b/u;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u$b;->bgP:Lio/fabric/sdk/android/a/b/u;
 
     iget v2, p0, Lio/fabric/sdk/android/a/b/u$b;->position:I
 
@@ -148,13 +148,13 @@
     move p3, v0
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bgv:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bgP:Lio/fabric/sdk/android/a/b/u;
 
     iget v1, p0, Lio/fabric/sdk/android/a/b/u$b;->position:I
 
     invoke-static {v0, v1, p1, p2, p3}, Lio/fabric/sdk/android/a/b/u;->a(Lio/fabric/sdk/android/a/b/u;I[BII)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$b;->bgv:Lio/fabric/sdk/android/a/b/u;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$b;->bgP:Lio/fabric/sdk/android/a/b/u;
 
     iget p2, p0, Lio/fabric/sdk/android/a/b/u$b;->position:I
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u.smali
index 17a5a2310e..cf304a6d6c 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/u.smali
@@ -17,17 +17,17 @@
 
 
 # static fields
-.field private static final bgo:Ljava/util/logging/Logger;
+.field private static final bgI:Ljava/util/logging/Logger;
 
 
 # instance fields
-.field private final bgp:Ljava/io/RandomAccessFile;
+.field private final bgJ:Ljava/io/RandomAccessFile;
 
-.field bgq:I
+.field bgK:I
 
-.field private bgr:Lio/fabric/sdk/android/a/b/u$a;
+.field private bgL:Lio/fabric/sdk/android/a/b/u$a;
 
-.field private bgs:Lio/fabric/sdk/android/a/b/u$a;
+.field private bgM:Lio/fabric/sdk/android/a/b/u$a;
 
 .field private final buffer:[B
 
@@ -48,7 +48,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/u;->bgo:Ljava/util/logging/Logger;
+    sput-object v0, Lio/fabric/sdk/android/a/b/u;->bgI:Ljava/util/logging/Logger;
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 
     invoke-direct {v1, v6}, Ljava/io/File;-><init>(Ljava/lang/String;)V
 
-    invoke-static {v1}, Lio/fabric/sdk/android/a/b/u;->y(Ljava/io/File;)Ljava/io/RandomAccessFile;
+    invoke-static {v1}, Lio/fabric/sdk/android/a/b/u;->x(Ljava/io/File;)Ljava/io/RandomAccessFile;
 
     move-result-object v6
 
@@ -168,17 +168,17 @@
 
     :cond_1
     :goto_0
-    invoke-static {p1}, Lio/fabric/sdk/android/a/b/u;->y(Ljava/io/File;)Ljava/io/RandomAccessFile;
+    invoke-static {p1}, Lio/fabric/sdk/android/a/b/u;->x(Ljava/io/File;)Ljava/io/RandomAccessFile;
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     invoke-virtual {p1, v3, v4}, Ljava/io/RandomAccessFile;->seek(J)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->buffer:[B
 
@@ -190,13 +190,13 @@
 
     move-result p1
 
-    iput p1, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iput p1, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
-    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
     int-to-long v0, p1
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     invoke-virtual {p1}, Ljava/io/RandomAccessFile;->length()J
 
@@ -230,17 +230,17 @@
 
     move-result v0
 
-    invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/b/u;->di(I)Lio/fabric/sdk/android/a/b/u$a;
+    invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/b/u;->df(I)Lio/fabric/sdk/android/a/b/u$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
-    invoke-direct {p0, v0}, Lio/fabric/sdk/android/a/b/u;->di(I)Lio/fabric/sdk/android/a/b/u$a;
+    invoke-direct {p0, v0}, Lio/fabric/sdk/android/a/b/u;->df(I)Lio/fabric/sdk/android/a/b/u$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     return-void
 
@@ -253,7 +253,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -261,7 +261,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     invoke-virtual {v1}, Ljava/io/RandomAccessFile;->length()J
 
@@ -281,7 +281,7 @@
 .method static synthetic a(Lio/fabric/sdk/android/a/b/u;I)I
     .locals 0
 
-    invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/b/u;->dj(I)I
+    invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/b/u;->dg(I)I
 
     move-result p0
 
@@ -291,7 +291,7 @@
 .method static synthetic a(Lio/fabric/sdk/android/a/b/u;)Ljava/io/RandomAccessFile;
     .locals 0
 
-    iget-object p0, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     return-object p0
 .end method
@@ -367,13 +367,13 @@
 
     invoke-static {v0, v1}, Lio/fabric/sdk/android/a/b/u;->a([B[I)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     const-wide/16 p2, 0x0
 
     invoke-virtual {p1, p2, p3}, Ljava/io/RandomAccessFile;->seek(J)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     iget-object p2, p0, Lio/fabric/sdk/android/a/b/u;->buffer:[B
 
@@ -401,22 +401,22 @@
 
     iput v0, p0, Lio/fabric/sdk/android/a/b/u;->elementCount:I
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/u$a;->bgw:Lio/fabric/sdk/android/a/b/u$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/u$a;->bgQ:Lio/fabric/sdk/android/a/b/u$a;
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/u$a;->bgw:Lio/fabric/sdk/android/a/b/u$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/u$a;->bgQ:Lio/fabric/sdk/android/a/b/u$a;
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
     if-le v0, v1, :cond_0
 
     invoke-direct {p0, v1}, Lio/fabric/sdk/android/a/b/u;->setLength(I)V
 
     :cond_0
-    iput v1, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iput v1, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -440,25 +440,25 @@
         }
     .end annotation
 
-    invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/b/u;->dj(I)I
+    invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/b/u;->dg(I)I
 
     move-result p1
 
     add-int p3, p1, p4
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
     const/4 v1, 0x0
 
     if-gt p3, v0, :cond_0
 
-    iget-object p3, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p3, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     int-to-long v2, p1
 
     invoke-virtual {p3, v2, v3}, Ljava/io/RandomAccessFile;->seek(J)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     invoke-virtual {p1, p2, v1, p4}, Ljava/io/RandomAccessFile;->write([BII)V
 
@@ -467,23 +467,23 @@
     :cond_0
     sub-int/2addr v0, p1
 
-    iget-object p3, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p3, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     int-to-long v2, p1
 
     invoke-virtual {p3, v2, v3}, Ljava/io/RandomAccessFile;->seek(J)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     invoke-virtual {p1, p2, v1, v0}, Ljava/io/RandomAccessFile;->write([BII)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     const-wide/16 v1, 0x10
 
     invoke-virtual {p1, v1, v2}, Ljava/io/RandomAccessFile;->seek(J)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     add-int/lit8 p3, v0, 0x0
 
@@ -494,7 +494,7 @@
     return-void
 .end method
 
-.method private di(I)Lio/fabric/sdk/android/a/b/u$a;
+.method private df(I)Lio/fabric/sdk/android/a/b/u$a;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -504,12 +504,12 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lio/fabric/sdk/android/a/b/u$a;->bgw:Lio/fabric/sdk/android/a/b/u$a;
+    sget-object p1, Lio/fabric/sdk/android/a/b/u$a;->bgQ:Lio/fabric/sdk/android/a/b/u$a;
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     int-to-long v1, p1
 
@@ -517,7 +517,7 @@
 
     new-instance v0, Lio/fabric/sdk/android/a/b/u$a;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     invoke-virtual {v1}, Ljava/io/RandomAccessFile;->readInt()I
 
@@ -528,10 +528,10 @@
     return-object v0
 .end method
 
-.method private dj(I)I
+.method private dg(I)I
     .locals 1
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
     if-ge p1, v0, :cond_0
 
@@ -545,7 +545,7 @@
     return p1
 .end method
 
-.method private dk(I)V
+.method private dh(I)V
     .locals 10
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -555,9 +555,9 @@
 
     add-int/lit8 p1, p1, 0x4
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/u;->De()I
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/u;->CU()I
 
     move-result v1
 
@@ -568,7 +568,7 @@
     return-void
 
     :cond_0
-    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
     :cond_1
     add-int/2addr v0, v1
@@ -579,35 +579,35 @@
 
     invoke-direct {p0, v1}, Lio/fabric/sdk/android/a/b/u;->setLength(I)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget p1, p1, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
     add-int/lit8 p1, p1, 0x4
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->length:I
 
     add-int/2addr p1, v0
 
-    invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/b/u;->dj(I)I
+    invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/b/u;->dg(I)I
 
     move-result p1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
     if-ge p1, v0, :cond_3
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     invoke-virtual {v0}, Ljava/io/RandomAccessFile;->getChannel()Ljava/nio/channels/FileChannel;
 
     move-result-object v7
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
     int-to-long v2, v0
 
@@ -644,19 +644,19 @@
 
     :cond_3
     :goto_0
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget p1, p1, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
     if-ge p1, v0, :cond_4
 
-    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
@@ -666,7 +666,7 @@
 
     iget v0, p0, Lio/fabric/sdk/android/a/b/u;->elementCount:I
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v2, v2, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
@@ -674,31 +674,31 @@
 
     new-instance v0, Lio/fabric/sdk/android/a/b/u$a;
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v2, v2, Lio/fabric/sdk/android/a/b/u$a;->length:I
 
     invoke-direct {v0, p1, v2}, Lio/fabric/sdk/android/a/b/u$a;-><init>(II)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     goto :goto_1
 
     :cond_4
     iget p1, p0, Lio/fabric/sdk/android/a/b/u;->elementCount:I
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v2, v2, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
     invoke-direct {p0, v1, p1, v0, v2}, Lio/fabric/sdk/android/a/b/u;->b(IIII)V
 
     :goto_1
-    iput v1, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iput v1, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
     return-void
 .end method
@@ -735,23 +735,23 @@
         }
     .end annotation
 
-    invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/b/u;->dj(I)I
+    invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/b/u;->dg(I)I
 
     move-result p1
 
     add-int v0, p1, p4
 
-    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
     if-gt v0, v1, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     int-to-long v1, p1
 
     invoke-virtual {v0, v1, v2}, Ljava/io/RandomAccessFile;->seek(J)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     invoke-virtual {p1, p2, p3, p4}, Ljava/io/RandomAccessFile;->readFully([BII)V
 
@@ -760,23 +760,23 @@
     :cond_0
     sub-int/2addr v1, p1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     int-to-long v2, p1
 
     invoke-virtual {v0, v2, v3}, Ljava/io/RandomAccessFile;->seek(J)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     invoke-virtual {p1, p2, p3, v1}, Ljava/io/RandomAccessFile;->readFully([BII)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     const-wide/16 v2, 0x10
 
     invoke-virtual {p1, v2, v3}, Ljava/io/RandomAccessFile;->seek(J)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     add-int/2addr p3, v1
 
@@ -879,13 +879,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     int-to-long v1, p1
 
     invoke-virtual {v0, v1, v2}, Ljava/io/RandomAccessFile;->setLength(J)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     invoke-virtual {p1}, Ljava/io/RandomAccessFile;->getChannel()Ljava/nio/channels/FileChannel;
 
@@ -898,7 +898,7 @@
     return-void
 .end method
 
-.method private static y(Ljava/io/File;)Ljava/io/RandomAccessFile;
+.method private static x(Ljava/io/File;)Ljava/io/RandomAccessFile;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -917,7 +917,7 @@
 
 
 # virtual methods
-.method public final De()I
+.method public final CU()I
     .locals 3
 
     iget v0, p0, Lio/fabric/sdk/android/a/b/u;->elementCount:I
@@ -929,21 +929,21 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v2, v2, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
     if-lt v0, v2, :cond_1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v2, v2, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
@@ -951,7 +951,7 @@
 
     add-int/lit8 v0, v0, 0x4
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v2, v2, Lio/fabric/sdk/android/a/b/u$a;->length:I
 
@@ -962,23 +962,23 @@
     return v0
 
     :cond_1
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
     add-int/lit8 v0, v0, 0x4
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v1, v1, Lio/fabric/sdk/android/a/b/u$a;->length:I
 
     add-int/2addr v0, v1
 
-    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v1, v1, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
@@ -998,7 +998,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
@@ -1013,7 +1013,7 @@
 
     if-ge v0, v3, :cond_0
 
-    invoke-direct {p0, v2}, Lio/fabric/sdk/android/a/b/u;->di(I)Lio/fabric/sdk/android/a/b/u$a;
+    invoke-direct {p0, v2}, Lio/fabric/sdk/android/a/b/u;->df(I)Lio/fabric/sdk/android/a/b/u$a;
 
     move-result-object v2
 
@@ -1033,7 +1033,7 @@
 
     add-int/2addr v3, v2
 
-    invoke-direct {p0, v3}, Lio/fabric/sdk/android/a/b/u;->dj(I)I
+    invoke-direct {p0, v3}, Lio/fabric/sdk/android/a/b/u;->dg(I)I
 
     move-result v2
     :try_end_0
@@ -1073,7 +1073,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgp:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgJ:Ljava/io/RandomAccessFile;
 
     invoke-virtual {v0}, Ljava/io/RandomAccessFile;->close()V
     :try_end_0
@@ -1156,7 +1156,7 @@
 
     if-gt p2, v0, :cond_3
 
-    invoke-direct {p0, p2}, Lio/fabric/sdk/android/a/b/u;->dk(I)V
+    invoke-direct {p0, p2}, Lio/fabric/sdk/android/a/b/u;->dh(I)V
 
     invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/u;->isEmpty()Z
 
@@ -1171,19 +1171,19 @@
     goto :goto_0
 
     :cond_0
-    iget-object v3, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v3, v3, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
     add-int/2addr v3, v2
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v4, v4, Lio/fabric/sdk/android/a/b/u$a;->length:I
 
     add-int/2addr v3, v4
 
-    invoke-direct {p0, v3}, Lio/fabric/sdk/android/a/b/u;->dj(I)I
+    invoke-direct {p0, v3}, Lio/fabric/sdk/android/a/b/u;->dg(I)I
 
     move-result v3
 
@@ -1215,12 +1215,12 @@
     goto :goto_1
 
     :cond_1
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
     iget p1, p1, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
     :goto_1
-    iget p2, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget p2, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
     iget v1, p0, Lio/fabric/sdk/android/a/b/u;->elementCount:I
 
@@ -1230,7 +1230,7 @@
 
     invoke-direct {p0, p2, v1, p1, v2}, Lio/fabric/sdk/android/a/b/u;->b(IIII)V
 
-    iput-object v4, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object v4, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget p1, p0, Lio/fabric/sdk/android/a/b/u;->elementCount:I
 
@@ -1240,9 +1240,9 @@
 
     if-eqz v0, :cond_2
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1302,7 +1302,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
@@ -1310,13 +1310,13 @@
 
     add-int/2addr v0, v2
 
-    iget-object v3, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v3, v3, Lio/fabric/sdk/android/a/b/u$a;->length:I
 
     add-int/2addr v0, v3
 
-    invoke-direct {p0, v0}, Lio/fabric/sdk/android/a/b/u;->dj(I)I
+    invoke-direct {p0, v0}, Lio/fabric/sdk/android/a/b/u;->dg(I)I
 
     move-result v0
 
@@ -1332,13 +1332,13 @@
 
     move-result v2
 
-    iget v3, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget v3, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
     iget v4, p0, Lio/fabric/sdk/android/a/b/u;->elementCount:I
 
     sub-int/2addr v4, v1
 
-    iget-object v5, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v5, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v5, v5, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
@@ -1354,7 +1354,7 @@
 
     invoke-direct {v1, v0, v2}, Lio/fabric/sdk/android/a/b/u$a;-><init>(II)V
 
-    iput-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -1405,7 +1405,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bgq:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bgK:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -1421,7 +1421,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgr:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgL:Lio/fabric/sdk/android/a/b/u$a;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1429,7 +1429,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgs:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bgM:Lio/fabric/sdk/android/a/b/u$a;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1451,7 +1451,7 @@
     :catch_0
     move-exception v1
 
-    sget-object v2, Lio/fabric/sdk/android/a/b/u;->bgo:Ljava/util/logging/Logger;
+    sget-object v2, Lio/fabric/sdk/android/a/b/u;->bgI:Ljava/util/logging/Logger;
 
     sget-object v3, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/v.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/v.smali
index 25a3cc6a3c..bf121cc07b 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/v.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/v.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static dl(I)I
+.method public static di(I)I
     .locals 3
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/w.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/w.smali
index a6a54c1f33..1bf037bb9b 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/w.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/w.smali
@@ -17,7 +17,7 @@
 
 
 # virtual methods
-.method public final Da()J
+.method public final CR()J
     .locals 2
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/x.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/x.smali
index 58b3aeccfe..4d0aa60356 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/b/x.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/x.smali
@@ -6,9 +6,9 @@
 # instance fields
 .field private duration:J
 
-.field private final pq:Ljava/lang/String;
+.field private final pp:Ljava/lang/String;
 
-.field private final sl:Z
+.field private final sk:Z
 
 .field private start:J
 
@@ -21,7 +21,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/x;->pq:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/x;->pp:Ljava/lang/String;
 
     iput-object p2, p0, Lio/fabric/sdk/android/a/b/x;->tag:Ljava/lang/String;
 
@@ -33,20 +33,20 @@
 
     xor-int/lit8 p1, p1, 0x1
 
-    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/x;->sl:Z
+    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/x;->sk:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final declared-synchronized Df()V
+.method public final declared-synchronized CV()V
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/x;->sl:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/x;->sk:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -82,13 +82,13 @@
     throw v0
 .end method
 
-.method public final declared-synchronized Dg()V
+.method public final declared-synchronized CW()V
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/x;->sl:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/x;->sk:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -132,7 +132,7 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/x;->pq:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/x;->pp:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$1.smali
index 8d9d7cff90..fd9f9d8025 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$1.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final bgF:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final bgZ:Ljava/util/concurrent/atomic/AtomicInteger;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a$1;->bgF:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a$1;->bgZ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/c/a$1;->bgF:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/c/a$1;->bgZ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$2.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$2.smali
index 54680c68b3..bafb504323 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$2.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$2.smali
@@ -22,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic bgG:Lio/fabric/sdk/android/a/c/a;
+.field final synthetic bha:Lio/fabric/sdk/android/a/c/a;
 
 
 # direct methods
 .method constructor <init>(Lio/fabric/sdk/android/a/c/a;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$2;->bgG:Lio/fabric/sdk/android/a/c/a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$2;->bha:Lio/fabric/sdk/android/a/c/a;
 
     const/4 p1, 0x0
 
@@ -54,7 +54,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$2;->bgG:Lio/fabric/sdk/android/a/c/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$2;->bha:Lio/fabric/sdk/android/a/c/a;
 
     invoke-static {v0}, Lio/fabric/sdk/android/a/c/a;->a(Lio/fabric/sdk/android/a/c/a;)Ljava/util/concurrent/atomic/AtomicBoolean;
 
@@ -68,9 +68,9 @@
 
     invoke-static {v0}, Landroid/os/Process;->setThreadPriority(I)V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$2;->bgG:Lio/fabric/sdk/android/a/c/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$2;->bha:Lio/fabric/sdk/android/a/c/a;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/a;->CM()Ljava/lang/Object;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/a;->CD()Ljava/lang/Object;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$3.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$3.smali
index 002690aced..ed4d587fde 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$3.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$3.smali
@@ -22,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic bgG:Lio/fabric/sdk/android/a/c/a;
+.field final synthetic bha:Lio/fabric/sdk/android/a/c/a;
 
 
 # direct methods
 .method constructor <init>(Lio/fabric/sdk/android/a/c/a;Ljava/util/concurrent/Callable;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$3;->bgG:Lio/fabric/sdk/android/a/c/a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$3;->bha:Lio/fabric/sdk/android/a/c/a;
 
     invoke-direct {p0, p2}, Ljava/util/concurrent/FutureTask;-><init>(Ljava/util/concurrent/Callable;)V
 
@@ -42,7 +42,7 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$3;->bgG:Lio/fabric/sdk/android/a/c/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$3;->bha:Lio/fabric/sdk/android/a/c/a;
 
     invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a$3;->get()Ljava/lang/Object;
 
@@ -57,7 +57,7 @@
     return-void
 
     :catch_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$3;->bgG:Lio/fabric/sdk/android/a/c/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$3;->bha:Lio/fabric/sdk/android/a/c/a;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$4.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$4.smali
index 84844d09d1..1d8c033708 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$4.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$4.smali
@@ -15,14 +15,14 @@
 
 
 # static fields
-.field static final synthetic bgH:[I
+.field static final synthetic bhb:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/a/c/a$d;->Dj()[I
+    invoke-static {}, Lio/fabric/sdk/android/a/c/a$d;->CZ()[I
 
     move-result-object v0
 
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/a$4;->bgH:[I
+    sput-object v0, Lio/fabric/sdk/android/a/c/a$4;->bhb:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lio/fabric/sdk/android/a/c/a$4;->bgH:[I
+    sget-object v1, Lio/fabric/sdk/android/a/c/a$4;->bhb:[I
 
-    sget v2, Lio/fabric/sdk/android/a/c/a$d;->bgP:I
+    sget v2, Lio/fabric/sdk/android/a/c/a$d;->bhj:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lio/fabric/sdk/android/a/c/a$4;->bgH:[I
+    sget-object v1, Lio/fabric/sdk/android/a/c/a$4;->bhb:[I
 
-    sget v2, Lio/fabric/sdk/android/a/c/a$d;->bgQ:I
+    sget v2, Lio/fabric/sdk/android/a/c/a$d;->bhk:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$a.smali
index 29340ce9de..ae0ee92439 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$a.smali
@@ -24,9 +24,9 @@
 
 
 # instance fields
-.field final bgI:Lio/fabric/sdk/android/a/c/a;
+.field final bhc:Lio/fabric/sdk/android/a/c/a;
 
-.field final bgJ:[Ljava/lang/Object;
+.field final bhd:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TData;"
@@ -48,9 +48,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$a;->bgI:Lio/fabric/sdk/android/a/c/a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$a;->bhc:Lio/fabric/sdk/android/a/c/a;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a$a;->bgJ:[Ljava/lang/Object;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a$a;->bhd:[Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$b.smali
index 9fc01bbcb8..7d49ed90da 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$b.smali
@@ -45,9 +45,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, v0, Lio/fabric/sdk/android/a/c/a$a;->bgI:Lio/fabric/sdk/android/a/c/a;
+    iget-object p1, v0, Lio/fabric/sdk/android/a/c/a$a;->bhc:Lio/fabric/sdk/android/a/c/a;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a$a;->bgJ:[Ljava/lang/Object;
+    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a$a;->bhd:[Ljava/lang/Object;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$c$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$c$1.smali
index 242010b6e9..5576869a8b 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$c$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$c$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bgM:Ljava/lang/Runnable;
+.field final synthetic bhg:Ljava/lang/Runnable;
 
-.field final synthetic bgN:Lio/fabric/sdk/android/a/c/a$c;
+.field final synthetic bhh:Lio/fabric/sdk/android/a/c/a$c;
 
 
 # direct methods
 .method constructor <init>(Lio/fabric/sdk/android/a/c/a$c;Ljava/lang/Runnable;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bgN:Lio/fabric/sdk/android/a/c/a$c;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bhh:Lio/fabric/sdk/android/a/c/a$c;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bgM:Ljava/lang/Runnable;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bhg:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,24 +42,24 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bgM:Ljava/lang/Runnable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bhg: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, Lio/fabric/sdk/android/a/c/a$c$1;->bgN:Lio/fabric/sdk/android/a/c/a$c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bhh:Lio/fabric/sdk/android/a/c/a$c;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/a$c;->Di()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/a$c;->CY()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bgN:Lio/fabric/sdk/android/a/c/a$c;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bhh:Lio/fabric/sdk/android/a/c/a$c;
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/c/a$c;->Di()V
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/c/a$c;->CY()V
 
     throw v0
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$c.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$c.smali
index b0aff91986..df9f452b5b 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$c.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final bgK:Ljava/util/LinkedList;
+.field final bhe:Ljava/util/LinkedList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedList<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field bgL:Ljava/lang/Runnable;
+.field bhf:Ljava/lang/Runnable;
 
 
 # direct methods
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bgK:Ljava/util/LinkedList;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bhe:Ljava/util/LinkedList;
 
     return-void
 .end method
@@ -56,13 +56,13 @@
 
 
 # virtual methods
-.method protected final declared-synchronized Di()V
+.method protected final declared-synchronized CY()V
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bgK:Ljava/util/LinkedList;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bhe:Ljava/util/LinkedList;
 
     invoke-virtual {v0}, Ljava/util/LinkedList;->poll()Ljava/lang/Object;
 
@@ -70,13 +70,13 @@
 
     check-cast v0, Ljava/lang/Runnable;
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bgL:Ljava/lang/Runnable;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bhf:Ljava/lang/Runnable;
 
     if-eqz v0, :cond_0
 
     sget-object v0, Lio/fabric/sdk/android/a/c/a;->THREAD_POOL_EXECUTOR:Ljava/util/concurrent/Executor;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a$c;->bgL:Ljava/lang/Runnable;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a$c;->bhf:Ljava/lang/Runnable;
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
     :try_end_0
@@ -101,7 +101,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bgK:Ljava/util/LinkedList;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bhe:Ljava/util/LinkedList;
 
     new-instance v1, Lio/fabric/sdk/android/a/c/a$c$1;
 
@@ -109,11 +109,11 @@
 
     invoke-virtual {v0, v1}, Ljava/util/LinkedList;->offer(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/c/a$c;->bgL:Ljava/lang/Runnable;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/c/a$c;->bhf:Ljava/lang/Runnable;
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a$c;->Di()V
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a$c;->CY()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$d.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$d.smali
index e2c2e2c694..082d10c050 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$d.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$d.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
-.field public static final bgO:I = 0x1
+.field public static final bhi:I = 0x1
 
-.field public static final bgP:I = 0x2
+.field public static final bhj:I = 0x2
 
-.field public static final bgQ:I = 0x3
+.field public static final bhk:I = 0x3
 
-.field private static final synthetic bgR:[I
+.field private static final synthetic bhl:[I
 
 
 # direct methods
@@ -40,33 +40,33 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bgO:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bhi:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bgP:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bhj:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bgQ:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bhk:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/a$d;->bgR:[I
+    sput-object v0, Lio/fabric/sdk/android/a/c/a$d;->bhl:[I
 
     return-void
 .end method
 
-.method public static Dj()[I
+.method public static CZ()[I
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/c/a$d;->bgR:[I
+    sget-object v0, Lio/fabric/sdk/android/a/c/a$d;->bhl:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$e.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$e.smali
index 860763d70f..2b79a84b50 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$e.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a$e.smali
@@ -31,7 +31,7 @@
 
 
 # instance fields
-.field bgS:[Ljava/lang/Object;
+.field bhm:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TParams;"
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a.smali
index 27fe3b1871..47a92855cd 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a.smali
@@ -37,13 +37,13 @@
 
 .field public static final THREAD_POOL_EXECUTOR:Ljava/util/concurrent/Executor;
 
-.field private static volatile aTX:Ljava/util/concurrent/Executor;
+.field private static volatile aUp:Ljava/util/concurrent/Executor;
 
 .field private static final be:I
 
-.field private static final bgx:Ljava/util/concurrent/ThreadFactory;
+.field private static final bgR:Ljava/util/concurrent/ThreadFactory;
 
-.field private static final bgy:Ljava/util/concurrent/BlockingQueue;
+.field private static final bgS:Ljava/util/concurrent/BlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/BlockingQueue<",
@@ -53,11 +53,11 @@
     .end annotation
 .end field
 
-.field private static final bgz:Lio/fabric/sdk/android/a/c/a$b;
+.field private static final bgT:Lio/fabric/sdk/android/a/c/a$b;
 
 
 # instance fields
-.field private final bgA:Lio/fabric/sdk/android/a/c/a$e;
+.field private final bgU:Lio/fabric/sdk/android/a/c/a$e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/a/c/a$e<",
@@ -66,7 +66,7 @@
     .end annotation
 .end field
 
-.field private final bgB:Ljava/util/concurrent/FutureTask;
+.field private final bgV:Ljava/util/concurrent/FutureTask;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/FutureTask<",
@@ -75,11 +75,11 @@
     .end annotation
 .end field
 
-.field volatile bgC:I
+.field volatile bgW:I
 
-.field protected final bgD:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field protected final bgX:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final bgE:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final bgY:Ljava/util/concurrent/atomic/AtomicBoolean;
 
 
 # direct methods
@@ -112,7 +112,7 @@
 
     invoke-direct {v0}, Lio/fabric/sdk/android/a/c/a$1;-><init>()V
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bgx:Ljava/util/concurrent/ThreadFactory;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bgR:Ljava/util/concurrent/ThreadFactory;
 
     new-instance v0, Ljava/util/concurrent/LinkedBlockingQueue;
 
@@ -120,7 +120,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/LinkedBlockingQueue;-><init>(I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bgy:Ljava/util/concurrent/BlockingQueue;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bgS:Ljava/util/concurrent/BlockingQueue;
 
     new-instance v0, Ljava/util/concurrent/ThreadPoolExecutor;
 
@@ -130,9 +130,9 @@
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-object v8, Lio/fabric/sdk/android/a/c/a;->bgy:Ljava/util/concurrent/BlockingQueue;
+    sget-object v8, Lio/fabric/sdk/android/a/c/a;->bgS:Ljava/util/concurrent/BlockingQueue;
 
-    sget-object v9, Lio/fabric/sdk/android/a/c/a;->bgx:Ljava/util/concurrent/ThreadFactory;
+    sget-object v9, Lio/fabric/sdk/android/a/c/a;->bgR:Ljava/util/concurrent/ThreadFactory;
 
     const-wide/16 v5, 0x1
 
@@ -154,11 +154,11 @@
 
     invoke-direct {v0}, Lio/fabric/sdk/android/a/c/a$b;-><init>()V
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bgz:Lio/fabric/sdk/android/a/c/a$b;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bgT:Lio/fabric/sdk/android/a/c/a$b;
 
     sget-object v0, Lio/fabric/sdk/android/a/c/a;->SERIAL_EXECUTOR:Ljava/util/concurrent/Executor;
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/a;->aTX:Ljava/util/concurrent/Executor;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->aUp:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
@@ -168,35 +168,35 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget v0, Lio/fabric/sdk/android/a/c/a$d;->bgO:I
+    sget v0, Lio/fabric/sdk/android/a/c/a$d;->bhi:I
 
-    iput v0, p0, Lio/fabric/sdk/android/a/c/a;->bgC:I
+    iput v0, p0, Lio/fabric/sdk/android/a/c/a;->bgW:I
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgD:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgX:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgE:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgY:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     new-instance v0, Lio/fabric/sdk/android/a/c/a$2;
 
     invoke-direct {v0, p0}, Lio/fabric/sdk/android/a/c/a$2;-><init>(Lio/fabric/sdk/android/a/c/a;)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgA:Lio/fabric/sdk/android/a/c/a$e;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgU:Lio/fabric/sdk/android/a/c/a$e;
 
     new-instance v0, Lio/fabric/sdk/android/a/c/a$3;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a;->bgA:Lio/fabric/sdk/android/a/c/a$e;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a;->bgU:Lio/fabric/sdk/android/a/c/a$e;
 
     invoke-direct {v0, p0, v1}, Lio/fabric/sdk/android/a/c/a$3;-><init>(Lio/fabric/sdk/android/a/c/a;Ljava/util/concurrent/Callable;)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgB:Ljava/util/concurrent/FutureTask;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgV:Ljava/util/concurrent/FutureTask;
 
     return-void
 .end method
@@ -214,7 +214,7 @@
 .method static synthetic a(Lio/fabric/sdk/android/a/c/a;)Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 0
 
-    iget-object p0, p0, Lio/fabric/sdk/android/a/c/a;->bgE:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/c/a;->bgY:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-object p0
 .end method
@@ -222,7 +222,7 @@
 .method static synthetic b(Lio/fabric/sdk/android/a/c/a;Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgE:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgY:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -239,7 +239,7 @@
 .method static synthetic c(Lio/fabric/sdk/android/a/c/a;Ljava/lang/Object;)V
     .locals 0
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/c/a;->bgD:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/c/a;->bgX:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -247,17 +247,17 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->CL()V
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->CC()V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->CK()V
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->CB()V
 
     :goto_0
-    sget p1, Lio/fabric/sdk/android/a/c/a$d;->bgQ:I
+    sget p1, Lio/fabric/sdk/android/a/c/a$d;->bhk:I
 
-    iput p1, p0, Lio/fabric/sdk/android/a/c/a;->bgC:I
+    iput p1, p0, Lio/fabric/sdk/android/a/c/a;->bgW:I
 
     return-void
 .end method
@@ -270,7 +270,7 @@
         }
     .end annotation
 
-    sget-object v0, Lio/fabric/sdk/android/a/c/a;->bgz:Lio/fabric/sdk/android/a/c/a$b;
+    sget-object v0, Lio/fabric/sdk/android/a/c/a;->bgT:Lio/fabric/sdk/android/a/c/a$b;
 
     new-instance v1, Lio/fabric/sdk/android/a/c/a$a;
 
@@ -295,7 +295,7 @@
 
 
 # virtual methods
-.method protected CK()V
+.method protected CB()V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -306,7 +306,7 @@
     return-void
 .end method
 
-.method protected CL()V
+.method protected CC()V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -317,7 +317,7 @@
     return-void
 .end method
 
-.method protected varargs abstract CM()Ljava/lang/Object;
+.method protected varargs abstract CD()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TResult;"
@@ -325,16 +325,16 @@
     .end annotation
 .end method
 
-.method public final Dh()Z
+.method public final CX()Z
     .locals 2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgD:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgX:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v1, 0x1
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgB:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgV:Ljava/util/concurrent/FutureTask;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/FutureTask;->cancel(Z)Z
 
@@ -355,15 +355,15 @@
         }
     .end annotation
 
-    iget v0, p0, Lio/fabric/sdk/android/a/c/a;->bgC:I
+    iget v0, p0, Lio/fabric/sdk/android/a/c/a;->bgW:I
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bgO:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bhi:I
 
     if-eq v0, v1, :cond_2
 
-    sget-object v0, Lio/fabric/sdk/android/a/c/a$4;->bgH:[I
+    sget-object v0, Lio/fabric/sdk/android/a/c/a$4;->bhb:[I
 
-    iget v1, p0, Lio/fabric/sdk/android/a/c/a;->bgC:I
+    iget v1, p0, Lio/fabric/sdk/android/a/c/a;->bgW:I
 
     const/4 v2, 0x1
 
@@ -399,17 +399,17 @@
 
     :cond_2
     :goto_0
-    sget v0, Lio/fabric/sdk/android/a/c/a$d;->bgP:I
+    sget v0, Lio/fabric/sdk/android/a/c/a$d;->bhj:I
 
-    iput v0, p0, Lio/fabric/sdk/android/a/c/a;->bgC:I
+    iput v0, p0, Lio/fabric/sdk/android/a/c/a;->bgW:I
 
     invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->onPreExecute()V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgA:Lio/fabric/sdk/android/a/c/a$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bgU:Lio/fabric/sdk/android/a/c/a$e;
 
-    iput-object p2, v0, Lio/fabric/sdk/android/a/c/a$e;->bgS:[Ljava/lang/Object;
+    iput-object p2, v0, Lio/fabric/sdk/android/a/c/a$e;->bhm:[Ljava/lang/Object;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/c/a;->bgB:Ljava/util/concurrent/FutureTask;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/c/a;->bgV:Ljava/util/concurrent/FutureTask;
 
     invoke-interface {p1, p2}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a/b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a/b.smali
index f7fa47b188..065cd47684 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a/b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a/b.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final bhg:I
+.field private final bhA:I
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lio/fabric/sdk/android/a/c/a/b;->bhg:I
+    iput p1, p0, Lio/fabric/sdk/android/a/c/a/b;->bhA:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a/c.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a/c.smali
index 702a21a679..a5510528df 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a/c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a/c.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final bhh:J
+.field private final bhB:J
 
-.field private final bhi:I
+.field private final bhC:I
 
 
 # direct methods
@@ -20,11 +20,11 @@
 
     const-wide/16 v0, 0x3e8
 
-    iput-wide v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bhh:J
+    iput-wide v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bhB:J
 
     const/16 v0, 0x8
 
-    iput v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bhi:I
+    iput v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bhC:I
 
     return-void
 .end method
@@ -34,11 +34,11 @@
 .method public final q(I)J
     .locals 6
 
-    iget-wide v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bhh:J
+    iget-wide v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bhB:J
 
     long-to-double v0, v0
 
-    iget v2, p0, Lio/fabric/sdk/android/a/c/a/c;->bhi:I
+    iget v2, p0, Lio/fabric/sdk/android/a/c/a/c;->bhC:I
 
     int-to-double v2, v2
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a/e.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a/e.smali
index 27a36508c8..735320af4a 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a/e.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/a/e.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field public final bhj:Lio/fabric/sdk/android/a/c/a/d;
+.field public final bhD:Lio/fabric/sdk/android/a/c/a/d;
 
-.field public final pI:Lio/fabric/sdk/android/a/c/a/a;
+.field public final pH:Lio/fabric/sdk/android/a/c/a/a;
 
 .field public final retryCount:I
 
@@ -19,9 +19,9 @@
 
     iput p1, p0, Lio/fabric/sdk/android/a/c/a/e;->retryCount:I
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a/e;->pI:Lio/fabric/sdk/android/a/c/a/a;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a/e;->pH:Lio/fabric/sdk/android/a/c/a/a;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/c/a/e;->bhj:Lio/fabric/sdk/android/a/c/a/d;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/c/a/e;->bhD:Lio/fabric/sdk/android/a/c/a/d;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/b.smali
index 401695c943..c4c3531ec9 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/b.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract Dk()Ljava/util/Collection;
+.method public abstract Da()Ljava/util/Collection;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -25,7 +25,7 @@
     .end annotation
 .end method
 
-.method public abstract Dl()Z
+.method public abstract Db()Z
 .end method
 
 .method public abstract aS(Ljava/lang/Object;)V
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/c.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/c.smali
index 8857517b1c..35ef8da722 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/c.smali
@@ -53,7 +53,7 @@
     return-void
 .end method
 
-.method private Dm()Lio/fabric/sdk/android/a/c/b;
+.method private Dc()Lio/fabric/sdk/android/a/c/b;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -78,7 +78,7 @@
     return-object v1
 .end method
 
-.method private Dn()Lio/fabric/sdk/android/a/c/b;
+.method private Dd()Lio/fabric/sdk/android/a/c/b;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -289,7 +289,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Dl()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Db()Z
 
     move-result v1
 
@@ -305,7 +305,7 @@
 
 
 # virtual methods
-.method public final Do()V
+.method public final De()V
     .locals 3
 
     :try_start_0
@@ -333,7 +333,7 @@
 
     check-cast v1, Lio/fabric/sdk/android/a/c/b;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/c/b;->Dl()Z
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/c/b;->Db()Z
 
     move-result v2
 
@@ -595,7 +595,7 @@
 .method public final synthetic peek()Ljava/lang/Object;
     .locals 1
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/c/c;->Dm()Lio/fabric/sdk/android/a/c/b;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/c/c;->Dc()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -605,7 +605,7 @@
 .method public final synthetic poll()Ljava/lang/Object;
     .locals 1
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/c/c;->Dn()Lio/fabric/sdk/android/a/c/b;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/c/c;->Dd()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/e.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/e.smali
index 6ef26dfc5a..b4cf52a5a8 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/e.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/e.smali
@@ -14,15 +14,15 @@
 
 
 # static fields
-.field public static final bgT:I = 0x1
+.field public static final bhn:I = 0x1
 
-.field public static final bgU:I = 0x2
+.field public static final bho:I = 0x2
 
-.field public static final bgV:I = 0x3
+.field public static final bhp:I = 0x3
 
-.field public static final bgW:I = 0x4
+.field public static final bhq:I = 0x4
 
-.field private static final synthetic bgX:[I
+.field private static final synthetic bhr:[I
 
 
 # direct methods
@@ -33,31 +33,31 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lio/fabric/sdk/android/a/c/e;->bgT:I
+    sget v1, Lio/fabric/sdk/android/a/c/e;->bhn:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/e;->bgU:I
+    sget v1, Lio/fabric/sdk/android/a/c/e;->bho:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/e;->bgV:I
+    sget v1, Lio/fabric/sdk/android/a/c/e;->bhp:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/e;->bgW:I
+    sget v1, Lio/fabric/sdk/android/a/c/e;->bhq:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/e;->bgX:[I
+    sput-object v0, Lio/fabric/sdk/android/a/c/e;->bhr:[I
 
     return-void
 .end method
@@ -87,7 +87,7 @@
     goto :goto_0
 
     :cond_0
-    sget p1, Lio/fabric/sdk/android/a/c/e;->bgU:I
+    sget p1, Lio/fabric/sdk/android/a/c/e;->bho:I
 
     :goto_0
     add-int/lit8 p1, p1, -0x1
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/f$a$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/f$a$1.smali
index 474ad0f7a2..0bfb94d246 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/f$a$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/f$a$1.smali
@@ -22,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic bha:Lio/fabric/sdk/android/a/c/f$a;
+.field final synthetic bhu:Lio/fabric/sdk/android/a/c/f$a;
 
 
 # direct methods
 .method constructor <init>(Lio/fabric/sdk/android/a/c/f$a;Ljava/lang/Runnable;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/c/f$a$1;->bha:Lio/fabric/sdk/android/a/c/f$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/f$a$1;->bhu:Lio/fabric/sdk/android/a/c/f$a;
 
     const/4 p1, 0x0
 
@@ -40,7 +40,7 @@
 
 
 # virtual methods
-.method public final Dp()Lio/fabric/sdk/android/a/c/b;
+.method public final Df()Lio/fabric/sdk/android/a/c/b;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -55,7 +55,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f$a$1;->bha:Lio/fabric/sdk/android/a/c/f$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f$a$1;->bhu:Lio/fabric/sdk/android/a/c/f$a;
 
     invoke-static {v0}, Lio/fabric/sdk/android/a/c/f$a;->a(Lio/fabric/sdk/android/a/c/f$a;)Lio/fabric/sdk/android/a/c/f;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/f$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/f$a.smali
index 16c9f3ac0a..d725a251ca 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/f$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/f$a.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field private final bgZ:Lio/fabric/sdk/android/a/c/f;
+.field private final bht:Lio/fabric/sdk/android/a/c/f;
 
 .field private final executor:Ljava/util/concurrent/Executor;
 
@@ -41,7 +41,7 @@
 
     iput-object p1, p0, Lio/fabric/sdk/android/a/c/f$a;->executor:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/c/f$a;->bgZ:Lio/fabric/sdk/android/a/c/f;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/c/f$a;->bht:Lio/fabric/sdk/android/a/c/f;
 
     return-void
 .end method
@@ -49,7 +49,7 @@
 .method static synthetic a(Lio/fabric/sdk/android/a/c/f$a;)Lio/fabric/sdk/android/a/c/f;
     .locals 0
 
-    iget-object p0, p0, Lio/fabric/sdk/android/a/c/f$a;->bgZ:Lio/fabric/sdk/android/a/c/f;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/c/f$a;->bht:Lio/fabric/sdk/android/a/c/f;
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/f.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/f.smali
index 40823b9164..8ebb322e2b 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/f.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/f.smali
@@ -36,7 +36,7 @@
 
 
 # instance fields
-.field private final bgY:Lio/fabric/sdk/android/a/c/j;
+.field private final bhs:Lio/fabric/sdk/android/a/c/j;
 
 
 # direct methods
@@ -49,14 +49,14 @@
 
     invoke-direct {v0}, Lio/fabric/sdk/android/a/c/j;-><init>()V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bgY:Lio/fabric/sdk/android/a/c/j;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bhs:Lio/fabric/sdk/android/a/c/j;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Dk()Ljava/util/Collection;
+.method public final Da()Ljava/util/Collection;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -67,45 +67,45 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bgY:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bhs:Lio/fabric/sdk/android/a/c/j;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/i;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/b;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Dk()Ljava/util/Collection;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Da()Ljava/util/Collection;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Dl()Z
+.method public final Db()Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bgY:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bhs:Lio/fabric/sdk/android/a/c/j;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/i;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/b;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Dl()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Db()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final Z(Z)V
+.method public final W(Z)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bgY:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bhs:Lio/fabric/sdk/android/a/c/j;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/i;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/l;
 
-    invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/c/l;->Z(Z)V
+    invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/c/l;->W(Z)V
 
     return-void
 .end method
@@ -113,13 +113,13 @@
 .method public final a(Lio/fabric/sdk/android/a/c/l;)V
     .locals 2
 
-    iget v0, p0, Lio/fabric/sdk/android/a/c/a;->bgC:I
+    iget v0, p0, Lio/fabric/sdk/android/a/c/a;->bgW:I
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bgO:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bhi:I
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bgY:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bhs:Lio/fabric/sdk/android/a/c/j;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/i;
 
@@ -171,7 +171,7 @@
 .method public cI()I
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bgY:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bhs:Lio/fabric/sdk/android/a/c/j;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/i;
 
@@ -195,7 +195,7 @@
 .method public final isFinished()Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bgY:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bhs:Lio/fabric/sdk/android/a/c/j;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/i;
 
@@ -211,7 +211,7 @@
 .method public final n(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bgY:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bhs:Lio/fabric/sdk/android/a/c/j;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/i;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/h.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/h.smali
index cda463ec17..1dbdd23211 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/h.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/h.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field final bhb:Ljava/lang/Object;
+.field final bhv:Ljava/lang/Object;
 
 
 # direct methods
@@ -46,7 +46,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/c/h;->bhb:Ljava/lang/Object;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/h;->bhv:Ljava/lang/Object;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/c/h;->bhb:Ljava/lang/Object;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/h;->bhv:Ljava/lang/Object;
 
     return-void
 .end method
@@ -109,7 +109,7 @@
 
 
 # virtual methods
-.method public final Dk()Ljava/util/Collection;
+.method public final Da()Ljava/util/Collection;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -120,7 +120,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Dp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Df()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -128,17 +128,17 @@
 
     check-cast v0, Lio/fabric/sdk/android/a/c/b;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Dk()Ljava/util/Collection;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Da()Ljava/util/Collection;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Dl()Z
+.method public final Db()Z
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Dp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Df()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -146,14 +146,14 @@
 
     check-cast v0, Lio/fabric/sdk/android/a/c/b;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Dl()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Db()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public Dp()Lio/fabric/sdk/android/a/c/b;
+.method public Df()Lio/fabric/sdk/android/a/c/b;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -168,17 +168,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/h;->bhb:Ljava/lang/Object;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/h;->bhv:Ljava/lang/Object;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/b;
 
     return-object v0
 .end method
 
-.method public final Z(Z)V
+.method public final W(Z)V
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Dp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Df()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -186,7 +186,7 @@
 
     check-cast v0, Lio/fabric/sdk/android/a/c/l;
 
-    invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/c/l;->Z(Z)V
+    invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/c/l;->W(Z)V
 
     return-void
 .end method
@@ -196,7 +196,7 @@
 
     check-cast p1, Lio/fabric/sdk/android/a/c/l;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Dp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Df()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -212,7 +212,7 @@
 .method public final cI()I
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Dp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Df()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -228,7 +228,7 @@
 .method public compareTo(Ljava/lang/Object;)I
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Dp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Df()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -244,7 +244,7 @@
 .method public final isFinished()Z
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Dp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Df()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -262,7 +262,7 @@
 .method public final n(Ljava/lang/Throwable;)V
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Dp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Df()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/j.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/j.smali
index da6d7bcff0..69745d1ea1 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/j.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/j.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field private final bhc:Ljava/util/List;
+.field private final bhw:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -32,9 +32,9 @@
     .end annotation
 .end field
 
-.field private final bhd:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final bhx:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final bhe:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bhy:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -55,7 +55,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhc:Ljava/util/List;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhw:Ljava/util/List;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
 
@@ -63,7 +63,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhx:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
 
@@ -71,7 +71,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhe:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhy:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized Dk()Ljava/util/Collection;
+.method public final declared-synchronized Da()Ljava/util/Collection;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -125,7 +125,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhc:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhw:Ljava/util/List;
 
     invoke-static {v0}, Ljava/util/Collections;->unmodifiableCollection(Ljava/util/Collection;)Ljava/util/Collection;
 
@@ -145,10 +145,10 @@
     throw v0
 .end method
 
-.method public final Dl()Z
+.method public final Db()Z
     .locals 2
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/j;->Dk()Ljava/util/Collection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/j;->Da()Ljava/util/Collection;
 
     move-result-object v0
 
@@ -185,13 +185,13 @@
     return v0
 .end method
 
-.method public final declared-synchronized Z(Z)V
+.method public final declared-synchronized W(Z)V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhx:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
     :try_end_0
@@ -215,7 +215,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhc:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhw:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -246,7 +246,7 @@
 .method public cI()I
     .locals 1
 
-    sget v0, Lio/fabric/sdk/android/a/c/e;->bgU:I
+    sget v0, Lio/fabric/sdk/android/a/c/e;->bho:I
 
     return v0
 .end method
@@ -264,7 +264,7 @@
 .method public final isFinished()Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhx:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -276,7 +276,7 @@
 .method public final n(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhe:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bhy:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/k$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/k$a.smali
index cbcb70ba38..5379c412c5 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/k$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/k$a.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final bhf:I
+.field private final bhz:I
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lio/fabric/sdk/android/a/c/k$a;->bhf:I
+    iput v0, p0, Lio/fabric/sdk/android/a/c/k$a;->bhz:I
 
     return-void
 .end method
@@ -43,7 +43,7 @@
 
     invoke-direct {v0, p1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;)V
 
-    iget p1, p0, Lio/fabric/sdk/android/a/c/k$a;->bhf:I
+    iget p1, p0, Lio/fabric/sdk/android/a/c/k$a;->bhz:I
 
     invoke-virtual {v0, p1}, Ljava/lang/Thread;->setPriority(I)V
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/k.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/k.smali
index f7746f958b..3207e122c7 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/k.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/k.smali
@@ -90,7 +90,7 @@
     return-void
 .end method
 
-.method public static Dq()Lio/fabric/sdk/android/a/c/k;
+.method public static Dg()Lio/fabric/sdk/android/a/c/k;
     .locals 7
 
     sget v1, Lio/fabric/sdk/android/a/c/k;->CORE_POOL_SIZE:I
@@ -127,7 +127,7 @@
 
     const/4 v1, 0x1
 
-    invoke-interface {v0, v1}, Lio/fabric/sdk/android/a/c/l;->Z(Z)V
+    invoke-interface {v0, v1}, Lio/fabric/sdk/android/a/c/l;->W(Z)V
 
     invoke-interface {v0, p2}, Lio/fabric/sdk/android/a/c/l;->n(Ljava/lang/Throwable;)V
 
@@ -137,7 +137,7 @@
 
     check-cast v0, Lio/fabric/sdk/android/a/c/c;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/c;->Do()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/c;->De()V
 
     invoke-super {p0, p1, p2}, Ljava/util/concurrent/ThreadPoolExecutor;->afterExecute(Ljava/lang/Runnable;Ljava/lang/Throwable;)V
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/l.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/l.smali
index b0b1c40779..aed99c8d27 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/c/l.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/l.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract Z(Z)V
+.method public abstract W(Z)V
 .end method
 
 .method public abstract isFinished()Z
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/b$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/b$1.smali
index 70cd523094..5356eebc1b 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/b$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/b$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lio/fabric/sdk/android/a/d/b;->Du()V
+    value = Lio/fabric/sdk/android/a/d/b;->Dk()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic bhq:Lio/fabric/sdk/android/a/d/b;
+.field final synthetic bhK:Lio/fabric/sdk/android/a/d/b;
 
 
 # direct methods
 .method constructor <init>(Lio/fabric/sdk/android/a/d/b;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/d/b$1;->bhq:Lio/fabric/sdk/android/a/d/b;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/b$1;->bhK:Lio/fabric/sdk/android/a/d/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/b.smali
index 69dee12fc3..299f67f9d9 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/b.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field protected final bhk:Lio/fabric/sdk/android/a/d/a;
+.field protected final bhE:Lio/fabric/sdk/android/a/d/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/a/d/a<",
@@ -30,15 +30,15 @@
     .end annotation
 .end field
 
-.field protected final bhl:Lio/fabric/sdk/android/a/b/k;
+.field protected final bhF:Lio/fabric/sdk/android/a/b/k;
 
-.field protected final bhm:Lio/fabric/sdk/android/a/d/c;
+.field protected final bhG:Lio/fabric/sdk/android/a/d/c;
 
-.field private final bhn:I
+.field private final bhH:I
 
-.field protected volatile bho:J
+.field protected volatile bhI:J
 
-.field protected final bhp:Ljava/util/List;
+.field protected final bhJ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -78,7 +78,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/CopyOnWriteArrayList;-><init>()V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhp:Ljava/util/List;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhJ:Ljava/util/List;
 
     invoke-virtual {p1}, Landroid/content/Context;->getApplicationContext()Landroid/content/Context;
 
@@ -86,31 +86,31 @@
 
     iput-object p1, p0, Lio/fabric/sdk/android/a/d/b;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/d/b;->bhk:Lio/fabric/sdk/android/a/d/a;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/d/b;->bhE:Lio/fabric/sdk/android/a/d/a;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/d/b;->bhm:Lio/fabric/sdk/android/a/d/c;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/d/b;->bhG:Lio/fabric/sdk/android/a/d/c;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/d/b;->bhl:Lio/fabric/sdk/android/a/b/k;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/d/b;->bhF:Lio/fabric/sdk/android/a/b/k;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/d/b;->bhl:Lio/fabric/sdk/android/a/b/k;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/d/b;->bhF:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {p1}, Lio/fabric/sdk/android/a/b/k;->Da()J
+    invoke-interface {p1}, Lio/fabric/sdk/android/a/b/k;->CR()J
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lio/fabric/sdk/android/a/d/b;->bho:J
+    iput-wide p1, p0, Lio/fabric/sdk/android/a/d/b;->bhI:J
 
     const/16 p1, 0x64
 
-    iput p1, p0, Lio/fabric/sdk/android/a/d/b;->bhn:I
+    iput p1, p0, Lio/fabric/sdk/android/a/d/b;->bhH:I
 
     return-void
 .end method
 
-.method private Dr()V
+.method private Dh()V
     .locals 3
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhp:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhJ:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -149,7 +149,7 @@
     return-void
 .end method
 
-.method private static dK(Ljava/lang/String;)J
+.method private static dE(Ljava/lang/String;)J
     .locals 4
 
     const-string v0, "_"
@@ -192,7 +192,7 @@
 
 
 # virtual methods
-.method public final Ds()Ljava/util/List;
+.method public final Di()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -203,39 +203,39 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhm:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhG:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Dx()Ljava/util/List;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Dn()Ljava/util/List;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Dt()V
+.method public final Dj()V
     .locals 2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhm:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhG:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Dy()Ljava/util/List;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Do()Ljava/util/List;
 
     move-result-object v1
 
     invoke-interface {v0, v1}, Lio/fabric/sdk/android/a/d/c;->X(Ljava/util/List;)V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhm:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhG:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Dz()V
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Dp()V
 
     return-void
 .end method
 
-.method public final Du()V
+.method public final Dk()V
     .locals 8
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhm:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhG:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Dy()Ljava/util/List;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Do()Ljava/util/List;
 
     move-result-object v0
 
@@ -331,7 +331,7 @@
 
     move-result-object v4
 
-    invoke-static {v4}, Lio/fabric/sdk/android/a/d/b;->dK(Ljava/lang/String;)J
+    invoke-static {v4}, Lio/fabric/sdk/android/a/d/b;->dE(Ljava/lang/String;)J
 
     move-result-wide v4
 
@@ -376,7 +376,7 @@
     if-ne v3, v2, :cond_2
 
     :cond_3
-    iget-object v1, p0, Lio/fabric/sdk/android/a/d/b;->bhm:Lio/fabric/sdk/android/a/d/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/d/b;->bhG:Lio/fabric/sdk/android/a/d/c;
 
     invoke-interface {v1, v0}, Lio/fabric/sdk/android/a/d/c;->X(Ljava/util/List;)V
 
@@ -394,7 +394,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhm:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhG:Lio/fabric/sdk/android/a/d/c;
 
     invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/d/c;->X(Ljava/util/List;)V
 
@@ -406,7 +406,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhp:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhJ:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -428,7 +428,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhk:Lio/fabric/sdk/android/a/d/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhE:Lio/fabric/sdk/android/a/d/a;
 
     invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/d/a;->t(Ljava/lang/Object;)[B
 
@@ -436,13 +436,13 @@
 
     array-length v0, p1
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/d/b;->bhm:Lio/fabric/sdk/android/a/d/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/d/b;->bhG:Lio/fabric/sdk/android/a/d/c;
 
     invoke-virtual {p0}, Lio/fabric/sdk/android/a/d/b;->cf()I
 
     move-result v2
 
-    invoke-interface {v1, v0, v2}, Lio/fabric/sdk/android/a/d/c;->T(II)Z
+    invoke-interface {v1, v0, v2}, Lio/fabric/sdk/android/a/d/c;->S(II)Z
 
     move-result v1
 
@@ -456,9 +456,9 @@
 
     const/4 v3, 0x0
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/d/b;->bhm:Lio/fabric/sdk/android/a/d/c;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/d/b;->bhG:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v4}, Lio/fabric/sdk/android/a/d/c;->Dv()I
+    invoke-interface {v4}, Lio/fabric/sdk/android/a/d/c;->Dl()I
 
     move-result v4
 
@@ -501,7 +501,7 @@
     invoke-virtual {p0}, Lio/fabric/sdk/android/a/d/b;->cb()Z
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhm:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhG:Lio/fabric/sdk/android/a/d/c;
 
     invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/d/c;->z([B)V
 
@@ -516,9 +516,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhm:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhG:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Dw()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Dm()Z
 
     move-result v0
 
@@ -532,9 +532,9 @@
 
     move-result-object v0
 
-    iget-object v3, p0, Lio/fabric/sdk/android/a/d/b;->bhm:Lio/fabric/sdk/android/a/d/c;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/d/b;->bhG:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v3, v0}, Lio/fabric/sdk/android/a/d/c;->dL(Ljava/lang/String;)V
+    invoke-interface {v3, v0}, Lio/fabric/sdk/android/a/d/c;->dF(Ljava/lang/String;)V
 
     iget-object v3, p0, Lio/fabric/sdk/android/a/d/b;->context:Landroid/content/Context;
 
@@ -552,13 +552,13 @@
 
     invoke-static {v3, v0}, Lio/fabric/sdk/android/a/b/i;->x(Landroid/content/Context;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhl:Lio/fabric/sdk/android/a/b/k;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bhF:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->Da()J
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->CR()J
 
     move-result-wide v2
 
-    iput-wide v2, p0, Lio/fabric/sdk/android/a/d/b;->bho:J
+    iput-wide v2, p0, Lio/fabric/sdk/android/a/d/b;->bhI:J
 
     goto :goto_0
 
@@ -566,7 +566,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/d/b;->Dr()V
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/d/b;->Dh()V
 
     return v1
 .end method
@@ -577,7 +577,7 @@
 .method protected ce()I
     .locals 1
 
-    iget v0, p0, Lio/fabric/sdk/android/a/d/b;->bhn:I
+    iget v0, p0, Lio/fabric/sdk/android/a/d/b;->bhH:I
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/c.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/c.smali
index 1f4519e007..1b2fd6d27c 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/c.smali
@@ -4,13 +4,13 @@
 
 
 # virtual methods
-.method public abstract Dv()I
+.method public abstract Dl()I
 .end method
 
-.method public abstract Dw()Z
+.method public abstract Dm()Z
 .end method
 
-.method public abstract Dx()Ljava/util/List;
+.method public abstract Dn()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -21,7 +21,7 @@
     .end annotation
 .end method
 
-.method public abstract Dy()Ljava/util/List;
+.method public abstract Do()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -32,10 +32,10 @@
     .end annotation
 .end method
 
-.method public abstract Dz()V
+.method public abstract Dp()V
 .end method
 
-.method public abstract T(II)Z
+.method public abstract S(II)Z
 .end method
 
 .method public abstract X(Ljava/util/List;)V
@@ -49,7 +49,7 @@
     .end annotation
 .end method
 
-.method public abstract dL(Ljava/lang/String;)V
+.method public abstract dF(Ljava/lang/String;)V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/g.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/g.smali
index 1fdab7af53..385a078805 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/g.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/g.smali
@@ -19,7 +19,7 @@
 
 
 # virtual methods
-.method public final z(Ljava/io/File;)Ljava/io/OutputStream;
+.method public final y(Ljava/io/File;)Ljava/io/OutputStream;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/h.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/h.smali
index aa3693a0f0..bfe6fd1da4 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/h.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/h.smali
@@ -7,17 +7,17 @@
 
 
 # instance fields
-.field private final bhr:Ljava/io/File;
+.field private final bhL:Ljava/io/File;
 
-.field private final bhs:Ljava/lang/String;
+.field private final bhM:Ljava/lang/String;
 
-.field private bht:Lio/fabric/sdk/android/a/b/u;
+.field private bhN:Lio/fabric/sdk/android/a/b/u;
 
-.field private bhu:Ljava/io/File;
+.field private bhO:Ljava/io/File;
 
 .field private final context:Landroid/content/Context;
 
-.field private final sZ:Ljava/io/File;
+.field private final sY:Ljava/io/File;
 
 
 # direct methods
@@ -33,37 +33,37 @@
 
     iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/d/h;->bhr:Ljava/io/File;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/d/h;->bhL:Ljava/io/File;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/d/h;->bhs:Ljava/lang/String;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/d/h;->bhM:Ljava/lang/String;
 
     new-instance p1, Ljava/io/File;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->bhr:Ljava/io/File;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->bhL:Ljava/io/File;
 
     invoke-direct {p1, p2, p3}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->sZ:Ljava/io/File;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->sY:Ljava/io/File;
 
     new-instance p1, Lio/fabric/sdk/android/a/b/u;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->sZ:Ljava/io/File;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->sY:Ljava/io/File;
 
     invoke-direct {p1, p2}, Lio/fabric/sdk/android/a/b/u;-><init>(Ljava/io/File;)V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bht:Lio/fabric/sdk/android/a/b/u;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bhN:Lio/fabric/sdk/android/a/b/u;
 
     new-instance p1, Ljava/io/File;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->bhr:Ljava/io/File;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->bhL:Ljava/io/File;
 
-    iget-object p3, p0, Lio/fabric/sdk/android/a/d/h;->bhs:Ljava/lang/String;
+    iget-object p3, p0, Lio/fabric/sdk/android/a/d/h;->bhM:Ljava/lang/String;
 
     invoke-direct {p1, p2, p3}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bhu:Ljava/io/File;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bhO:Ljava/io/File;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bhu:Ljava/io/File;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bhO:Ljava/io/File;
 
     invoke-virtual {p1}, Ljava/io/File;->exists()Z
 
@@ -71,7 +71,7 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bhu:Ljava/io/File;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bhO:Ljava/io/File;
 
     invoke-virtual {p1}, Ljava/io/File;->mkdirs()Z
 
@@ -81,22 +81,22 @@
 
 
 # virtual methods
-.method public final Dv()I
+.method public final Dl()I
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bht:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bhN:Lio/fabric/sdk/android/a/b/u;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->De()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->CU()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final Dw()Z
+.method public final Dm()Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bht:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bhN:Lio/fabric/sdk/android/a/b/u;
 
     invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->isEmpty()Z
 
@@ -105,7 +105,7 @@
     return v0
 .end method
 
-.method public final Dx()Ljava/util/List;
+.method public final Dn()Ljava/util/List;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -120,7 +120,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/d/h;->bhu:Ljava/io/File;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/d/h;->bhO:Ljava/io/File;
 
     invoke-virtual {v1}, Ljava/io/File;->listFiles()[Ljava/io/File;
 
@@ -151,7 +151,7 @@
     return-object v0
 .end method
 
-.method public final Dy()Ljava/util/List;
+.method public final Do()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -162,7 +162,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bhu:Ljava/io/File;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bhO:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->listFiles()[Ljava/io/File;
 
@@ -175,30 +175,30 @@
     return-object v0
 .end method
 
-.method public final Dz()V
+.method public final Dp()V
     .locals 1
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bht:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bhN:Lio/fabric/sdk/android/a/b/u;
 
     invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->close()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->sZ:Ljava/io/File;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->sY:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->delete()Z
 
     return-void
 .end method
 
-.method public final T(II)Z
+.method public final S(II)Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bht:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bhN:Lio/fabric/sdk/android/a/b/u;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->De()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->CU()I
 
     move-result v0
 
@@ -276,7 +276,7 @@
     return-void
 .end method
 
-.method public final dL(Ljava/lang/String;)V
+.method public final dF(Ljava/lang/String;)V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -288,15 +288,15 @@
 
     const-string v1, "Failed to close file input stream"
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/d/h;->bht:Lio/fabric/sdk/android/a/b/u;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/d/h;->bhN:Lio/fabric/sdk/android/a/b/u;
 
     invoke-virtual {v2}, Lio/fabric/sdk/android/a/b/u;->close()V
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/d/h;->sZ:Ljava/io/File;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/d/h;->sY:Ljava/io/File;
 
     new-instance v3, Ljava/io/File;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/d/h;->bhu:Ljava/io/File;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/d/h;->bhO:Ljava/io/File;
 
     invoke-direct {v3, v4, p1}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
@@ -310,7 +310,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    invoke-virtual {p0, v3}, Lio/fabric/sdk/android/a/d/h;->z(Ljava/io/File;)Ljava/io/OutputStream;
+    invoke-virtual {p0, v3}, Lio/fabric/sdk/android/a/d/h;->y(Ljava/io/File;)Ljava/io/OutputStream;
 
     move-result-object p1
 
@@ -330,11 +330,11 @@
 
     new-instance p1, Lio/fabric/sdk/android/a/b/u;
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->sZ:Ljava/io/File;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->sY:Ljava/io/File;
 
     invoke-direct {p1, v0}, Lio/fabric/sdk/android/a/b/u;-><init>(Ljava/io/File;)V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bht:Lio/fabric/sdk/android/a/b/u;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bhN:Lio/fabric/sdk/android/a/b/u;
 
     return-void
 
@@ -358,7 +358,7 @@
     throw v3
 .end method
 
-.method public z(Ljava/io/File;)Ljava/io/OutputStream;
+.method public y(Ljava/io/File;)Ljava/io/OutputStream;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -381,7 +381,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bht:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bhN:Lio/fabric/sdk/android/a/b/u;
 
     array-length v1, p1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/i.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/i.smali
index c9701fd88d..9375b6c590 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/i.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/i.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final bhv:Lio/fabric/sdk/android/a/d/e;
+.field private final bhP:Lio/fabric/sdk/android/a/d/e;
 
 .field private final context:Landroid/content/Context;
 
@@ -20,7 +20,7 @@
 
     iput-object p1, p0, Lio/fabric/sdk/android/a/d/i;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/d/i;->bhv:Lio/fabric/sdk/android/a/d/e;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/d/i;->bhP:Lio/fabric/sdk/android/a/d/e;
 
     return-void
 .end method
@@ -37,7 +37,7 @@
 
     invoke-static {v0, v1}, Lio/fabric/sdk/android/a/b/i;->v(Landroid/content/Context;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/i;->bhv:Lio/fabric/sdk/android/a/d/e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/i;->bhP:Lio/fabric/sdk/android/a/d/e;
 
     invoke-interface {v0}, Lio/fabric/sdk/android/a/d/e;->cb()Z
 
@@ -45,7 +45,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/i;->bhv:Lio/fabric/sdk/android/a/d/e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/i;->bhP:Lio/fabric/sdk/android/a/d/e;
 
     invoke-interface {v0}, Lio/fabric/sdk/android/a/d/e;->cc()V
     :try_end_0
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/b$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/b$1.smali
index e44dc42a48..0c362e4580 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/b$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/b$1.smali
@@ -15,14 +15,14 @@
 
 
 # static fields
-.field static final synthetic bhy:[I
+.field static final synthetic bhS:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lio/fabric/sdk/android/a/e/c;->DC()[I
+    invoke-static {}, Lio/fabric/sdk/android/a/e/c;->Ds()[I
 
     move-result-object v0
 
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lio/fabric/sdk/android/a/e/b$1;->bhy:[I
+    sput-object v0, Lio/fabric/sdk/android/a/e/b$1;->bhS:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->bhy:[I
+    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->bhS:[I
 
-    sget v2, Lio/fabric/sdk/android/a/e/c;->bhz:I
+    sget v2, Lio/fabric/sdk/android/a/e/c;->bhT:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->bhy:[I
+    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->bhS:[I
 
-    sget v2, Lio/fabric/sdk/android/a/e/c;->bhA:I
+    sget v2, Lio/fabric/sdk/android/a/e/c;->bhU:I
 
     sub-int/2addr v2, v0
 
@@ -61,9 +61,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->bhy:[I
+    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->bhS:[I
 
-    sget v2, Lio/fabric/sdk/android/a/e/c;->bhB:I
+    sget v2, Lio/fabric/sdk/android/a/e/c;->bhV:I
 
     sub-int/2addr v2, v0
 
@@ -75,9 +75,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->bhy:[I
+    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->bhS:[I
 
-    sget v2, Lio/fabric/sdk/android/a/e/c;->bhC:I
+    sget v2, Lio/fabric/sdk/android/a/e/c;->bhW:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/b.smali
index ccc4970168..4b9412a36e 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/b.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final bez:Lio/fabric/sdk/android/l;
+.field private final beT:Lio/fabric/sdk/android/l;
 
-.field private bhw:Lio/fabric/sdk/android/a/e/f;
+.field private bhQ:Lio/fabric/sdk/android/a/e/f;
 
-.field private bhx:Z
+.field private bhR:Z
 
 .field private sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
@@ -36,12 +36,12 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/b;->bez:Lio/fabric/sdk/android/l;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/b;->beT:Lio/fabric/sdk/android/l;
 
     return-void
 .end method
 
-.method private declared-synchronized DA()V
+.method private declared-synchronized Dq()V
     .locals 1
 
     monitor-enter p0
@@ -49,7 +49,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->bhx:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->bhR:Z
 
     const/4 v0, 0x0
 
@@ -69,7 +69,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized DB()Ljavax/net/ssl/SSLSocketFactory;
+.method private declared-synchronized Dr()Ljavax/net/ssl/SSLSocketFactory;
     .locals 7
 
     monitor-enter p0
@@ -77,14 +77,14 @@
     const/4 v0, 0x1
 
     :try_start_0
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->bhx:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->bhR:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     const/4 v1, 0x0
 
     :try_start_1
-    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->bhw:Lio/fabric/sdk/android/a/e/f;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->bhQ:Lio/fabric/sdk/android/a/e/f;
 
     const-string v3, "TLS"
 
@@ -120,7 +120,7 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->bez:Lio/fabric/sdk/android/l;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->beT:Lio/fabric/sdk/android/l;
 
     const-string v3, "Fabric"
 
@@ -139,7 +139,7 @@
     move-exception v0
 
     :try_start_2
-    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->bez:Lio/fabric/sdk/android/l;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->beT:Lio/fabric/sdk/android/l;
 
     const-string v3, "Fabric"
 
@@ -171,11 +171,11 @@
 
     if-nez v0, :cond_0
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->bhx:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->bhR:Z
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->DB()Ljavax/net/ssl/SSLSocketFactory;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->Dr()Ljavax/net/ssl/SSLSocketFactory;
 
     move-result-object v0
 
@@ -214,7 +214,7 @@
         }
     .end annotation
 
-    sget-object v0, Lio/fabric/sdk/android/a/e/b$1;->bhy:[I
+    sget-object v0, Lio/fabric/sdk/android/a/e/b$1;->bhS:[I
 
     const/4 v1, 0x1
 
@@ -295,7 +295,7 @@
     :goto_1
     if-eqz v1, :cond_5
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/e/b;->bhw:Lio/fabric/sdk/android/a/e/f;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/e/b;->bhQ:Lio/fabric/sdk/android/a/e/f;
 
     if-eqz p2, :cond_5
 
@@ -305,7 +305,7 @@
 
     if-eqz p2, :cond_5
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
 
     move-result-object p3
 
@@ -320,13 +320,13 @@
 .method public final a(Lio/fabric/sdk/android/a/e/f;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/b;->bhw:Lio/fabric/sdk/android/a/e/f;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/b;->bhQ:Lio/fabric/sdk/android/a/e/f;
 
     if-eq v0, p1, :cond_0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/b;->bhw:Lio/fabric/sdk/android/a/e/f;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/b;->bhQ:Lio/fabric/sdk/android/a/e/f;
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->DA()V
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->Dq()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/c.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/c.smali
index d9a644a4eb..4c6263d749 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/c.smali
@@ -14,15 +14,15 @@
 
 
 # static fields
-.field public static final bhA:I = 0x2
+.field public static final bhT:I = 0x1
 
-.field public static final bhB:I = 0x3
+.field public static final bhU:I = 0x2
 
-.field public static final bhC:I = 0x4
+.field public static final bhV:I = 0x3
 
-.field private static final synthetic bhD:[I
+.field public static final bhW:I = 0x4
 
-.field public static final bhz:I = 0x1
+.field private static final synthetic bhX:[I
 
 
 # direct methods
@@ -33,39 +33,39 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lio/fabric/sdk/android/a/e/c;->bhz:I
+    sget v1, Lio/fabric/sdk/android/a/e/c;->bhT:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/e/c;->bhA:I
+    sget v1, Lio/fabric/sdk/android/a/e/c;->bhU:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/e/c;->bhB:I
+    sget v1, Lio/fabric/sdk/android/a/e/c;->bhV:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/e/c;->bhC:I
+    sget v1, Lio/fabric/sdk/android/a/e/c;->bhW:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lio/fabric/sdk/android/a/e/c;->bhD:[I
+    sput-object v0, Lio/fabric/sdk/android/a/e/c;->bhX:[I
 
     return-void
 .end method
 
-.method public static DC()[I
+.method public static Ds()[I
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/e/c;->bhD:[I
+    sget-object v0, Lio/fabric/sdk/android/a/e/c;->bhX:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$1.smali
index ad29de0936..23363fb3c8 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$1.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lio/fabric/sdk/android/a/e/d;->d(Ljava/io/InputStream;Ljava/io/OutputStream;)Lio/fabric/sdk/android/a/e/d;
+    value = Lio/fabric/sdk/android/a/e/d;->c(Ljava/io/InputStream;Ljava/io/OutputStream;)Lio/fabric/sdk/android/a/e/d;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -23,22 +23,22 @@
 
 
 # instance fields
-.field final synthetic bhO:Ljava/io/InputStream;
+.field final synthetic bii:Ljava/io/InputStream;
 
-.field final synthetic bhP:Ljava/io/OutputStream;
+.field final synthetic bij:Ljava/io/OutputStream;
 
-.field final synthetic bhQ:Lio/fabric/sdk/android/a/e/d;
+.field final synthetic bik:Lio/fabric/sdk/android/a/e/d;
 
 
 # direct methods
 .method constructor <init>(Lio/fabric/sdk/android/a/e/d;Ljava/io/Closeable;ZLjava/io/InputStream;Ljava/io/OutputStream;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/d$1;->bhQ:Lio/fabric/sdk/android/a/e/d;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/d$1;->bik:Lio/fabric/sdk/android/a/e/d;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/e/d$1;->bhO:Ljava/io/InputStream;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/e/d$1;->bii:Ljava/io/InputStream;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/e/d$1;->bhP:Ljava/io/OutputStream;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/e/d$1;->bij:Ljava/io/OutputStream;
 
     invoke-direct {p0, p2, p3}, Lio/fabric/sdk/android/a/e/d$a;-><init>(Ljava/io/Closeable;Z)V
 
@@ -56,7 +56,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$1;->bhQ:Lio/fabric/sdk/android/a/e/d;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$1;->bik:Lio/fabric/sdk/android/a/e/d;
 
     invoke-static {v0}, Lio/fabric/sdk/android/a/e/d;->a(Lio/fabric/sdk/android/a/e/d;)I
 
@@ -65,7 +65,7 @@
     new-array v0, v0, [B
 
     :goto_0
-    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d$1;->bhO:Ljava/io/InputStream;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d$1;->bii:Ljava/io/InputStream;
 
     invoke-virtual {v1, v0}, Ljava/io/InputStream;->read([B)I
 
@@ -75,7 +75,7 @@
 
     if-eq v1, v2, :cond_0
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/e/d$1;->bhP:Ljava/io/OutputStream;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/d$1;->bij:Ljava/io/OutputStream;
 
     const/4 v3, 0x0
 
@@ -84,7 +84,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$1;->bhQ:Lio/fabric/sdk/android/a/e/d;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$1;->bik:Lio/fabric/sdk/android/a/e/d;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$a.smali
index 063f7f72e8..5d731abbc7 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$a.smali
@@ -25,9 +25,9 @@
 
 
 # instance fields
-.field private final bhK:Z
+.field private final bie:Z
 
-.field private final bhR:Ljava/io/Closeable;
+.field private final bil:Ljava/io/Closeable;
 
 
 # direct methods
@@ -36,9 +36,9 @@
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d$d;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/d$a;->bhR:Ljava/io/Closeable;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/d$a;->bil:Ljava/io/Closeable;
 
-    iput-boolean p2, p0, Lio/fabric/sdk/android/a/e/d$a;->bhK:Z
+    iput-boolean p2, p0, Lio/fabric/sdk/android/a/e/d$a;->bie:Z
 
     return-void
 .end method
@@ -53,7 +53,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->bhR:Ljava/io/Closeable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->bil:Ljava/io/Closeable;
 
     instance-of v1, v0, Ljava/io/Flushable;
 
@@ -64,12 +64,12 @@
     invoke-interface {v0}, Ljava/io/Flushable;->flush()V
 
     :cond_0
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d$a;->bhK:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d$a;->bie:Z
 
     if-eqz v0, :cond_1
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->bhR:Ljava/io/Closeable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->bil:Ljava/io/Closeable;
 
     invoke-interface {v0}, Ljava/io/Closeable;->close()V
     :try_end_0
@@ -79,7 +79,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->bhR:Ljava/io/Closeable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->bil:Ljava/io/Closeable;
 
     invoke-interface {v0}, Ljava/io/Closeable;->close()V
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$b.smali
index 51bc4af11f..1e6106d259 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$b.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final bhS:Lio/fabric/sdk/android/a/e/d$b;
+.field public static final bim:Lio/fabric/sdk/android/a/e/d$b;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lio/fabric/sdk/android/a/e/d$b$1;-><init>()V
 
-    sput-object v0, Lio/fabric/sdk/android/a/e/d$b;->bhS:Lio/fabric/sdk/android/a/e/d$b;
+    sput-object v0, Lio/fabric/sdk/android/a/e/d$b;->bim:Lio/fabric/sdk/android/a/e/d$b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$e.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$e.smali
index 2781a0cfe1..febedcd28a 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$e.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d$e.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final bhT:Ljava/nio/charset/CharsetEncoder;
+.field private final bin:Ljava/nio/charset/CharsetEncoder;
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {p0, p1, p3}, Ljava/io/BufferedOutputStream;-><init>(Ljava/io/OutputStream;I)V
 
-    invoke-static {p2}, Lio/fabric/sdk/android/a/e/d;->dP(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2}, Lio/fabric/sdk/android/a/e/d;->dJ(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -36,14 +36,14 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/d$e;->bhT:Ljava/nio/charset/CharsetEncoder;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/d$e;->bin:Ljava/nio/charset/CharsetEncoder;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final dQ(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
+.method public final dK(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$e;->bhT:Ljava/nio/charset/CharsetEncoder;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$e;->bin:Ljava/nio/charset/CharsetEncoder;
 
     invoke-static {p1}, Ljava/nio/CharBuffer;->wrap(Ljava/lang/CharSequence;)Ljava/nio/CharBuffer;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d.smali
index 2ef7c3eca9..cd1f2b5af9 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/d.smali
@@ -16,27 +16,27 @@
 
 
 # static fields
-.field private static final bhE:[Ljava/lang/String;
+.field private static final bhY:[Ljava/lang/String;
 
-.field private static bhF:Lio/fabric/sdk/android/a/e/d$b;
+.field private static bhZ:Lio/fabric/sdk/android/a/e/d$b;
 
 
 # instance fields
-.field private bhG:Ljava/net/HttpURLConnection;
+.field private bia:Ljava/net/HttpURLConnection;
 
-.field private final bhH:Ljava/lang/String;
+.field private final bib:Ljava/lang/String;
 
-.field private bhI:Lio/fabric/sdk/android/a/e/d$e;
+.field private bic:Lio/fabric/sdk/android/a/e/d$e;
 
-.field private bhJ:Z
+.field private bid:Z
 
-.field private bhK:Z
+.field private bie:Z
 
-.field private bhL:Z
+.field private bif:Z
 
-.field private bhM:Ljava/lang/String;
+.field private big:Ljava/lang/String;
 
-.field private bhN:I
+.field private bih:I
 
 .field private bufferSize:I
 
@@ -51,11 +51,11 @@
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lio/fabric/sdk/android/a/e/d;->bhE:[Ljava/lang/String;
+    sput-object v0, Lio/fabric/sdk/android/a/e/d;->bhY:[Ljava/lang/String;
 
-    sget-object v0, Lio/fabric/sdk/android/a/e/d$b;->bhS:Lio/fabric/sdk/android/a/e/d$b;
+    sget-object v0, Lio/fabric/sdk/android/a/e/d$b;->bim:Lio/fabric/sdk/android/a/e/d$b;
 
-    sput-object v0, Lio/fabric/sdk/android/a/e/d;->bhF:Lio/fabric/sdk/android/a/e/d$b;
+    sput-object v0, Lio/fabric/sdk/android/a/e/d;->bhZ:Lio/fabric/sdk/android/a/e/d$b;
 
     return-void
 .end method
@@ -72,15 +72,15 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bhG:Ljava/net/HttpURLConnection;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bia:Ljava/net/HttpURLConnection;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bhK:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bie:Z
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bhL:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bif:Z
 
     const/16 v0, 0x2000
 
@@ -99,7 +99,7 @@
     :try_end_0
     .catch Ljava/net/MalformedURLException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/e/d;->bhH:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/e/d;->bib:Ljava/lang/String;
 
     return-void
 
@@ -113,15 +113,196 @@
     throw p2
 .end method
 
-.method private DD()Ljava/net/HttpURLConnection;
-    .locals 7
+.method private DA()Lio/fabric/sdk/android/a/e/d;
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bic:Lio/fabric/sdk/android/a/e/d$e;
+
+    if-nez v0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    iget-boolean v1, p0, Lio/fabric/sdk/android/a/e/d;->bid:Z
+
+    if-eqz v1, :cond_1
+
+    const-string v1, "\r\n--00content0boundary00--\r\n"
+
+    invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/e/d$e;->dK(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
+
+    :cond_1
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bie:Z
+
+    if-eqz v0, :cond_2
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bhM:Ljava/lang/String;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bic:Lio/fabric/sdk/android/a/e/d$e;
+
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d$e;->close()V
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :cond_2
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bic:Lio/fabric/sdk/android/a/e/d$e;
+
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d$e;->close()V
+
+    :catch_0
+    :goto_0
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bic:Lio/fabric/sdk/android/a/e/d$e;
+
+    return-object p0
+.end method
+
+.method private DB()Lio/fabric/sdk/android/a/e/d;
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Lio/fabric/sdk/android/a/e/d$c;
+        }
+    .end annotation
+
+    :try_start_0
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DA()Lio/fabric/sdk/android/a/e/d;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Lio/fabric/sdk/android/a/e/d$c;
+
+    invoke-direct {v1, v0}, Lio/fabric/sdk/android/a/e/d$c;-><init>(Ljava/io/IOException;)V
+
+    throw v1
+.end method
+
+.method private DC()Lio/fabric/sdk/android/a/e/d;
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bic:Lio/fabric/sdk/android/a/e/d$e;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lio/fabric/sdk/android/a/e/d;->bhF:Lio/fabric/sdk/android/a/e/d$b;
+    return-object p0
+
+    :cond_0
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v0, v1}, Ljava/net/HttpURLConnection;->setDoOutput(Z)V
+
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
+
+    move-result-object v0
+
+    const-string v1, "Content-Type"
+
+    invoke-virtual {v0, v1}, Ljava/net/HttpURLConnection;->getRequestProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "charset"
+
+    invoke-static {v0, v1}, Lio/fabric/sdk/android/a/e/d;->ad(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Lio/fabric/sdk/android/a/e/d$e;
+
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Ljava/net/HttpURLConnection;->getOutputStream()Ljava/io/OutputStream;
+
+    move-result-object v2
+
+    iget v3, p0, Lio/fabric/sdk/android/a/e/d;->bufferSize:I
+
+    invoke-direct {v1, v2, v0, v3}, Lio/fabric/sdk/android/a/e/d$e;-><init>(Ljava/io/OutputStream;Ljava/lang/String;I)V
+
+    iput-object v1, p0, Lio/fabric/sdk/android/a/e/d;->bic:Lio/fabric/sdk/android/a/e/d$e;
+
+    return-object p0
+.end method
+
+.method private DD()Lio/fabric/sdk/android/a/e/d;
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bid:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bid:Z
+
+    const-string v0, "multipart/form-data; boundary=00content0boundary00"
+
+    const-string v1, "Content-Type"
+
+    invoke-virtual {p0, v1, v0}, Lio/fabric/sdk/android/a/e/d;->ac(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+
+    move-result-object v0
+
+    invoke-direct {v0}, Lio/fabric/sdk/android/a/e/d;->DC()Lio/fabric/sdk/android/a/e/d;
+
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bic:Lio/fabric/sdk/android/a/e/d$e;
+
+    const-string v1, "--00content0boundary00\r\n"
+
+    invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/e/d$e;->dK(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bic:Lio/fabric/sdk/android/a/e/d$e;
+
+    const-string v1, "\r\n--00content0boundary00\r\n"
+
+    invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/e/d$e;->dK(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
+
+    :goto_0
+    return-object p0
+.end method
+
+.method private Dt()Ljava/net/HttpURLConnection;
+    .locals 7
+
+    :try_start_0
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->big:Ljava/lang/String;
+
+    if-eqz v0, :cond_0
+
+    sget-object v0, Lio/fabric/sdk/android/a/e/d;->bhZ:Lio/fabric/sdk/android/a/e/d$b;
 
     iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->url:Ljava/net/URL;
 
@@ -131,9 +312,9 @@
 
     new-instance v4, Ljava/net/InetSocketAddress;
 
-    iget-object v5, p0, Lio/fabric/sdk/android/a/e/d;->bhM:Ljava/lang/String;
+    iget-object v5, p0, Lio/fabric/sdk/android/a/e/d;->big:Ljava/lang/String;
 
-    iget v6, p0, Lio/fabric/sdk/android/a/e/d;->bhN:I
+    iget v6, p0, Lio/fabric/sdk/android/a/e/d;->bih:I
 
     invoke-direct {v4, v5, v6}, Ljava/net/InetSocketAddress;-><init>(Ljava/lang/String;I)V
 
@@ -146,7 +327,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lio/fabric/sdk/android/a/e/d;->bhF:Lio/fabric/sdk/android/a/e/d$b;
+    sget-object v0, Lio/fabric/sdk/android/a/e/d;->bhZ:Lio/fabric/sdk/android/a/e/d$b;
 
     iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->url:Ljava/net/URL;
 
@@ -155,7 +336,7 @@
     move-result-object v0
 
     :goto_0
-    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->bhH:Ljava/lang/String;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->bib:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/net/HttpURLConnection;->setRequestMethod(Ljava/lang/String;)V
     :try_end_0
@@ -173,7 +354,7 @@
     throw v1
 .end method
 
-.method private DH()Ljava/io/InputStream;
+.method private Dx()Ljava/io/InputStream;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -181,7 +362,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DF()I
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Dv()I
 
     move-result v0
 
@@ -190,7 +371,7 @@
     if-ge v0, v1, :cond_0
 
     :try_start_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -212,7 +393,7 @@
     throw v1
 
     :cond_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -223,7 +404,7 @@
     if-nez v0, :cond_1
 
     :try_start_1
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -246,13 +427,13 @@
 
     :cond_1
     :goto_0
-    iget-boolean v1, p0, Lio/fabric/sdk/android/a/e/d;->bhL:Z
+    iget-boolean v1, p0, Lio/fabric/sdk/android/a/e/d;->bif:Z
 
     if-eqz v1, :cond_3
 
     const-string v1, "Content-Encoding"
 
-    invoke-virtual {p0, v1}, Lio/fabric/sdk/android/a/e/d;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p0, v1}, Lio/fabric/sdk/android/a/e/d;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -290,187 +471,6 @@
     return-object v0
 .end method
 
-.method private DK()Lio/fabric/sdk/android/a/e/d;
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bhI:Lio/fabric/sdk/android/a/e/d$e;
-
-    if-nez v0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    iget-boolean v1, p0, Lio/fabric/sdk/android/a/e/d;->bhJ:Z
-
-    if-eqz v1, :cond_1
-
-    const-string v1, "\r\n--00content0boundary00--\r\n"
-
-    invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/e/d$e;->dQ(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
-
-    :cond_1
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bhK:Z
-
-    if-eqz v0, :cond_2
-
-    :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bhI:Lio/fabric/sdk/android/a/e/d$e;
-
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d$e;->close()V
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :cond_2
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bhI:Lio/fabric/sdk/android/a/e/d$e;
-
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d$e;->close()V
-
-    :catch_0
-    :goto_0
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bhI:Lio/fabric/sdk/android/a/e/d$e;
-
-    return-object p0
-.end method
-
-.method private DL()Lio/fabric/sdk/android/a/e/d;
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Lio/fabric/sdk/android/a/e/d$c;
-        }
-    .end annotation
-
-    :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DK()Lio/fabric/sdk/android/a/e/d;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Lio/fabric/sdk/android/a/e/d$c;
-
-    invoke-direct {v1, v0}, Lio/fabric/sdk/android/a/e/d$c;-><init>(Ljava/io/IOException;)V
-
-    throw v1
-.end method
-
-.method private DM()Lio/fabric/sdk/android/a/e/d;
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bhI:Lio/fabric/sdk/android/a/e/d$e;
-
-    if-eqz v0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    invoke-virtual {v0, v1}, Ljava/net/HttpURLConnection;->setDoOutput(Z)V
-
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
-
-    move-result-object v0
-
-    const-string v1, "Content-Type"
-
-    invoke-virtual {v0, v1}, Ljava/net/HttpURLConnection;->getRequestProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "charset"
-
-    invoke-static {v0, v1}, Lio/fabric/sdk/android/a/e/d;->ad(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Lio/fabric/sdk/android/a/e/d$e;
-
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Ljava/net/HttpURLConnection;->getOutputStream()Ljava/io/OutputStream;
-
-    move-result-object v2
-
-    iget v3, p0, Lio/fabric/sdk/android/a/e/d;->bufferSize:I
-
-    invoke-direct {v1, v2, v0, v3}, Lio/fabric/sdk/android/a/e/d$e;-><init>(Ljava/io/OutputStream;Ljava/lang/String;I)V
-
-    iput-object v1, p0, Lio/fabric/sdk/android/a/e/d;->bhI:Lio/fabric/sdk/android/a/e/d$e;
-
-    return-object p0
-.end method
-
-.method private DN()Lio/fabric/sdk/android/a/e/d;
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bhJ:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bhJ:Z
-
-    const-string v0, "multipart/form-data; boundary=00content0boundary00"
-
-    const-string v1, "Content-Type"
-
-    invoke-virtual {p0, v1, v0}, Lio/fabric/sdk/android/a/e/d;->ac(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
-
-    move-result-object v0
-
-    invoke-direct {v0}, Lio/fabric/sdk/android/a/e/d;->DM()Lio/fabric/sdk/android/a/e/d;
-
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bhI:Lio/fabric/sdk/android/a/e/d$e;
-
-    const-string v1, "--00content0boundary00\r\n"
-
-    invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/e/d$e;->dQ(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bhI:Lio/fabric/sdk/android/a/e/d$e;
-
-    const-string v1, "\r\n--00content0boundary00\r\n"
-
-    invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/e/d$e;->dQ(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
-
-    :goto_0
-    return-object p0
-.end method
-
 .method static synthetic a(Lio/fabric/sdk/android/a/e/d;)I
     .locals 0
 
@@ -846,6 +846,39 @@
     return-object p1
 .end method
 
+.method private c(Ljava/io/InputStream;Ljava/io/OutputStream;)Lio/fabric/sdk/android/a/e/d;
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v6, Lio/fabric/sdk/android/a/e/d$1;
+
+    iget-boolean v3, p0, Lio/fabric/sdk/android/a/e/d;->bie:Z
+
+    move-object v0, v6
+
+    move-object v1, p0
+
+    move-object v2, p1
+
+    move-object v4, p1
+
+    move-object v5, p2
+
+    invoke-direct/range {v0 .. v5}, Lio/fabric/sdk/android/a/e/d$1;-><init>(Lio/fabric/sdk/android/a/e/d;Ljava/io/Closeable;ZLjava/io/InputStream;Ljava/io/OutputStream;)V
+
+    invoke-virtual {v6}, Lio/fabric/sdk/android/a/e/d$1;->call()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lio/fabric/sdk/android/a/e/d;
+
+    return-object p1
+.end method
+
 .method public static c(Ljava/lang/CharSequence;Ljava/util/Map;)Lio/fabric/sdk/android/a/e/d;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -1042,39 +1075,6 @@
     throw v0
 .end method
 
-.method private d(Ljava/io/InputStream;Ljava/io/OutputStream;)Lio/fabric/sdk/android/a/e/d;
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    new-instance v6, Lio/fabric/sdk/android/a/e/d$1;
-
-    iget-boolean v3, p0, Lio/fabric/sdk/android/a/e/d;->bhK:Z
-
-    move-object v0, v6
-
-    move-object v1, p0
-
-    move-object v2, p1
-
-    move-object v4, p1
-
-    move-object v5, p2
-
-    invoke-direct/range {v0 .. v5}, Lio/fabric/sdk/android/a/e/d$1;-><init>(Lio/fabric/sdk/android/a/e/d;Ljava/io/Closeable;ZLjava/io/InputStream;Ljava/io/OutputStream;)V
-
-    invoke-virtual {v6}, Lio/fabric/sdk/android/a/e/d$1;->call()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lio/fabric/sdk/android/a/e/d;
-
-    return-object p1
-.end method
-
 .method public static d(Ljava/lang/CharSequence;)Lio/fabric/sdk/android/a/e/d;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
@@ -1092,7 +1092,7 @@
     return-object v0
 .end method
 
-.method private static dM(Ljava/lang/String;)Ljava/lang/String;
+.method private static dG(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
     if-eqz p0, :cond_0
@@ -1111,7 +1111,7 @@
     return-object p0
 .end method
 
-.method private dN(Ljava/lang/String;)Ljava/lang/String;
+.method private dH(Ljava/lang/String;)Ljava/lang/String;
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1119,9 +1119,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DL()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DB()Lio/fabric/sdk/android/a/e/d;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1150,7 +1150,7 @@
     :try_start_0
     new-instance v0, Ljava/io/BufferedInputStream;
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DH()Ljava/io/InputStream;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->Dx()Ljava/io/InputStream;
 
     move-result-object v2
 
@@ -1158,9 +1158,9 @@
 
     invoke-direct {v0, v2, v3}, Ljava/io/BufferedInputStream;-><init>(Ljava/io/InputStream;I)V
 
-    invoke-direct {p0, v0, v1}, Lio/fabric/sdk/android/a/e/d;->d(Ljava/io/InputStream;Ljava/io/OutputStream;)Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0, v0, v1}, Lio/fabric/sdk/android/a/e/d;->c(Ljava/io/InputStream;Ljava/io/OutputStream;)Lio/fabric/sdk/android/a/e/d;
 
-    invoke-static {p1}, Lio/fabric/sdk/android/a/e/d;->dM(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1}, Lio/fabric/sdk/android/a/e/d;->dG(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -1182,10 +1182,10 @@
     throw v0
 .end method
 
-.method static synthetic dP(Ljava/lang/String;)Ljava/lang/String;
+.method static synthetic dJ(Ljava/lang/String;)Ljava/lang/String;
     .locals 0
 
-    invoke-static {p0}, Lio/fabric/sdk/android/a/e/d;->dM(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lio/fabric/sdk/android/a/e/d;->dG(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
@@ -1218,15 +1218,15 @@
     .end annotation
 
     :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DM()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DC()Lio/fabric/sdk/android/a/e/d;
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bhI:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bic:Lio/fabric/sdk/android/a/e/d$e;
 
     invoke-interface {p1}, Ljava/lang/CharSequence;->toString()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-virtual {v0, p1}, Lio/fabric/sdk/android/a/e/d$e;->dQ(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
+    invoke-virtual {v0, p1}, Lio/fabric/sdk/android/a/e/d$e;->dK(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1299,26 +1299,26 @@
 
 
 # virtual methods
-.method public final DE()Ljava/net/HttpURLConnection;
+.method public final Du()Ljava/net/HttpURLConnection;
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bhG:Ljava/net/HttpURLConnection;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bia:Ljava/net/HttpURLConnection;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DD()Ljava/net/HttpURLConnection;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->Dt()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bhG:Ljava/net/HttpURLConnection;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bia:Ljava/net/HttpURLConnection;
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bhG:Ljava/net/HttpURLConnection;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bia:Ljava/net/HttpURLConnection;
 
     return-object v0
 .end method
 
-.method public final DF()I
+.method public final Dv()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1327,9 +1327,9 @@
     .end annotation
 
     :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DK()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DA()Lio/fabric/sdk/android/a/e/d;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1351,7 +1351,7 @@
     throw v1
 .end method
 
-.method public final DG()Ljava/lang/String;
+.method public final Dw()Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1361,7 +1361,7 @@
 
     const-string v0, "Content-Type"
 
-    invoke-virtual {p0, v0}, Lio/fabric/sdk/android/a/e/d;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p0, v0}, Lio/fabric/sdk/android/a/e/d;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -1371,17 +1371,17 @@
 
     move-result-object v0
 
-    invoke-direct {p0, v0}, Lio/fabric/sdk/android/a/e/d;->dN(Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {p0, v0}, Lio/fabric/sdk/android/a/e/d;->dH(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final DI()Lio/fabric/sdk/android/a/e/d;
+.method public final Dy()Lio/fabric/sdk/android/a/e/d;
     .locals 2
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1392,10 +1392,10 @@
     return-object p0
 .end method
 
-.method public final DJ()Lio/fabric/sdk/android/a/e/d;
+.method public final Dz()Lio/fabric/sdk/android/a/e/d;
     .locals 2
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1498,13 +1498,13 @@
     .end annotation
 
     :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DN()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DD()Lio/fabric/sdk/android/a/e/d;
 
     invoke-direct {p0, p1, p2, p3}, Lio/fabric/sdk/android/a/e/d;->j(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/e/d;->bhI:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/e/d;->bic:Lio/fabric/sdk/android/a/e/d$e;
 
-    invoke-direct {p0, p4, p1}, Lio/fabric/sdk/android/a/e/d;->d(Ljava/io/InputStream;Ljava/io/OutputStream;)Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0, p4, p1}, Lio/fabric/sdk/android/a/e/d;->c(Ljava/io/InputStream;Ljava/io/OutputStream;)Lio/fabric/sdk/android/a/e/d;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1523,7 +1523,7 @@
 .method public final ac(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1561,7 +1561,7 @@
     return-object p1
 .end method
 
-.method public final dO(Ljava/lang/String;)Ljava/lang/String;
+.method public final dI(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1569,9 +1569,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DL()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DB()Lio/fabric/sdk/android/a/e/d;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1591,15 +1591,15 @@
     .end annotation
 
     :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DN()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->DD()Lio/fabric/sdk/android/a/e/d;
 
     const/4 v0, 0x0
 
     invoke-direct {p0, p1, p2, v0}, Lio/fabric/sdk/android/a/e/d;->j(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/e/d;->bhI:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/e/d;->bic:Lio/fabric/sdk/android/a/e/d$e;
 
-    invoke-virtual {p1, p3}, Lio/fabric/sdk/android/a/e/d$e;->dQ(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
+    invoke-virtual {p1, p3}, Lio/fabric/sdk/android/a/e/d$e;->dK(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1622,7 +1622,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
 
     move-result-object v1
 
@@ -1636,7 +1636,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/g.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/g.smali
index 4454ec3082..a794b8501c 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/g.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/g.smali
@@ -7,17 +7,17 @@
 
 
 # static fields
-.field private static final bhU:[Ljava/security/cert/X509Certificate;
+.field private static final bio:[Ljava/security/cert/X509Certificate;
 
 
 # instance fields
-.field private final bhV:[Ljavax/net/ssl/TrustManager;
+.field private final bip:[Ljavax/net/ssl/TrustManager;
 
-.field private final bhW:Lio/fabric/sdk/android/a/e/h;
+.field private final biq:Lio/fabric/sdk/android/a/e/h;
 
-.field private final bhX:J
+.field private final bir:J
 
-.field private final bhY:Ljava/util/List;
+.field private final bis:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final bhZ:Ljava/util/Set;
+.field private final bit:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -45,7 +45,7 @@
 
     new-array v0, v0, [Ljava/security/cert/X509Certificate;
 
-    sput-object v0, Lio/fabric/sdk/android/a/e/g;->bhU:[Ljava/security/cert/X509Certificate;
+    sput-object v0, Lio/fabric/sdk/android/a/e/g;->bio:[Ljava/security/cert/X509Certificate;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 
     invoke-direct {v0}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/e/g;->bhY:Ljava/util/List;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/g;->bis:Ljava/util/List;
 
     new-instance v0, Ljava/util/HashSet;
 
@@ -69,19 +69,19 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/e/g;->bhZ:Ljava/util/Set;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/g;->bit:Ljava/util/Set;
 
     invoke-static {p1}, Lio/fabric/sdk/android/a/e/g;->a(Lio/fabric/sdk/android/a/e/h;)[Ljavax/net/ssl/TrustManager;
 
     move-result-object v0
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/e/g;->bhV:[Ljavax/net/ssl/TrustManager;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/g;->bip:[Ljavax/net/ssl/TrustManager;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/g;->bhW:Lio/fabric/sdk/android/a/e/h;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/g;->biq:Lio/fabric/sdk/android/a/e/h;
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lio/fabric/sdk/android/a/e/g;->bhX:J
+    iput-wide v0, p0, Lio/fabric/sdk/android/a/e/g;->bir:J
 
     invoke-interface {p2}, Lio/fabric/sdk/android/a/e/f;->cP()[Ljava/lang/String;
 
@@ -96,9 +96,9 @@
 
     aget-object v1, p1, v0
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/e/g;->bhY:Ljava/util/List;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/g;->bis:Ljava/util/List;
 
-    invoke-static {v1}, Lio/fabric/sdk/android/a/e/g;->dR(Ljava/lang/String;)[B
+    invoke-static {v1}, Lio/fabric/sdk/android/a/e/g;->dL(Ljava/lang/String;)[B
 
     move-result-object v1
 
@@ -139,7 +139,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->bhY:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->bis:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -201,7 +201,7 @@
 
     move-result-object v0
 
-    iget-object p0, p0, Lio/fabric/sdk/android/a/e/h;->bia:Ljava/security/KeyStore;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/e/h;->biu:Ljava/security/KeyStore;
 
     invoke-virtual {v0, p0}, Ljavax/net/ssl/TrustManagerFactory;->init(Ljava/security/KeyStore;)V
 
@@ -233,7 +233,7 @@
     throw v0
 .end method
 
-.method private static dR(Ljava/lang/String;)[B
+.method private static dL(Ljava/lang/String;)[B
     .locals 7
 
     invoke-virtual {p0}, Ljava/lang/String;->length()I
@@ -314,7 +314,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->bhZ:Ljava/util/Set;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->bit:Ljava/util/Set;
 
     const/4 v1, 0x0
 
@@ -329,7 +329,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->bhV:[Ljavax/net/ssl/TrustManager;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->bip:[Ljavax/net/ssl/TrustManager;
 
     array-length v2, v0
 
@@ -349,7 +349,7 @@
     goto :goto_0
 
     :cond_1
-    iget-wide v2, p0, Lio/fabric/sdk/android/a/e/g;->bhX:J
+    iget-wide v2, p0, Lio/fabric/sdk/android/a/e/g;->bir:J
 
     const-wide/16 v4, -0x1
 
@@ -361,7 +361,7 @@
 
     move-result-wide v2
 
-    iget-wide v4, p0, Lio/fabric/sdk/android/a/e/g;->bhX:J
+    iget-wide v4, p0, Lio/fabric/sdk/android/a/e/g;->bir:J
 
     sub-long/2addr v2, v4
 
@@ -371,7 +371,7 @@
 
     if-lez p2, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -385,7 +385,7 @@
 
     move-result-wide v2
 
-    iget-wide v4, p0, Lio/fabric/sdk/android/a/e/g;->bhX:J
+    iget-wide v4, p0, Lio/fabric/sdk/android/a/e/g;->bir:J
 
     sub-long/2addr v2, v4
 
@@ -406,7 +406,7 @@
     goto :goto_2
 
     :cond_2
-    iget-object p2, p0, Lio/fabric/sdk/android/a/e/g;->bhW:Lio/fabric/sdk/android/a/e/h;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/e/g;->biq:Lio/fabric/sdk/android/a/e/h;
 
     invoke-static {p1, p2}, Lio/fabric/sdk/android/a/e/a;->a([Ljava/security/cert/X509Certificate;Lio/fabric/sdk/android/a/e/h;)[Ljava/security/cert/X509Certificate;
 
@@ -433,7 +433,7 @@
 
     :cond_3
     :goto_2
-    iget-object p2, p0, Lio/fabric/sdk/android/a/e/g;->bhZ:Ljava/util/Set;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/e/g;->bit:Ljava/util/Set;
 
     aget-object p1, p1, v1
 
@@ -460,7 +460,7 @@
 .method public final getAcceptedIssuers()[Ljava/security/cert/X509Certificate;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/e/g;->bhU:[Ljava/security/cert/X509Certificate;
+    sget-object v0, Lio/fabric/sdk/android/a/e/g;->bio:[Ljava/security/cert/X509Certificate;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/h.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/h.smali
index 134bc6ebc0..203c8f6a02 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/e/h.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/e/h.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final bia:Ljava/security/KeyStore;
+.field final biu:Ljava/security/KeyStore;
 
-.field private final bib:Ljava/util/HashMap;
+.field private final biv:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -32,9 +32,9 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/e/h;->bib:Ljava/util/HashMap;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/e/h;->biv:Ljava/util/HashMap;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/h;->bia:Ljava/security/KeyStore;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/h;->biu:Ljava/security/KeyStore;
 
     return-void
 .end method
@@ -200,7 +200,7 @@
 .method public final b(Ljava/security/cert/X509Certificate;)Z
     .locals 2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/h;->bib:Ljava/util/HashMap;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/h;->biv:Ljava/util/HashMap;
 
     invoke-virtual {p1}, Ljava/security/cert/X509Certificate;->getSubjectX500Principal()Ljavax/security/auth/x500/X500Principal;
 
@@ -241,7 +241,7 @@
 .method public final c(Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509Certificate;
     .locals 4
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/h;->bib:Ljava/util/HashMap;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/h;->biv:Ljava/util/HashMap;
 
     invoke-virtual {p1}, Ljava/security/cert/X509Certificate;->getIssuerX500Principal()Ljavax/security/auth/x500/X500Principal;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/f/b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/f/b.smali
index 4462d8b741..1a02e0ed0c 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/f/b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/f/b.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final bic:Ljava/lang/String;
+.field private final biw:Ljava/lang/String;
 
-.field private final bid:Ljava/lang/String;
+.field private final bix:Ljava/lang/String;
 
 .field private final context:Landroid/content/Context;
 
@@ -32,7 +32,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/f/b;->bic:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/f/b;->biw:Ljava/lang/String;
 
     new-instance p1, Ljava/lang/StringBuilder;
 
@@ -52,7 +52,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/f/b;->bid:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/f/b;->bix:Ljava/lang/String;
 
     return-void
 
@@ -96,7 +96,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -111,7 +111,7 @@
     return-object v0
 
     :cond_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/f/c.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/f/c.smali
index 8dcde4217e..b0ce49d0d9 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/f/c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/f/c.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract DO()Landroid/content/SharedPreferences;
+.method public abstract DE()Landroid/content/SharedPreferences;
 .end method
 
 .method public abstract a(Landroid/content/SharedPreferences$Editor;)Z
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/f/d.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/f/d.smali
index a2c7ee5249..856d4dc891 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/f/d.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/f/d.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final bie:Ljava/lang/String;
+.field private final biy:Ljava/lang/String;
 
 .field private final context:Landroid/content/Context;
 
@@ -24,11 +24,11 @@
 
     iput-object p1, p0, Lio/fabric/sdk/android/a/f/d;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/f/d;->bie:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/f/d;->biy:Ljava/lang/String;
 
     iget-object p1, p0, Lio/fabric/sdk/android/a/f/d;->context:Landroid/content/Context;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/f/d;->bie:Ljava/lang/String;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/f/d;->biy:Ljava/lang/String;
 
     const/4 v0, 0x0
 
@@ -72,7 +72,7 @@
 
 
 # virtual methods
-.method public final DO()Landroid/content/SharedPreferences;
+.method public final DE()Landroid/content/SharedPreferences;
     .locals 1
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/f/d;->sharedPreferences:Landroid/content/SharedPreferences;
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/a.smali
index 64b9cc0f0b..1c5b36a404 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/a.smali
@@ -17,7 +17,7 @@
 
     const-string v0, "Failed to close app icon InputStream."
 
-    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bin:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->biH:Ljava/lang/String;
 
     const/4 v2, 0x0
 
@@ -35,7 +35,7 @@
 
     move-result-object p1
 
-    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bio:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->biI:Ljava/lang/String;
 
     const-string v3, "app[display_version]"
 
@@ -43,7 +43,7 @@
 
     move-result-object p1
 
-    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bip:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->biJ:Ljava/lang/String;
 
     const-string v3, "app[build_version]"
 
@@ -51,7 +51,7 @@
 
     move-result-object p1
 
-    iget v1, p2, Lio/fabric/sdk/android/a/g/d;->bir:I
+    iget v1, p2, Lio/fabric/sdk/android/a/g/d;->biL:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -63,7 +63,7 @@
 
     move-result-object p1
 
-    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bis:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->biM:Ljava/lang/String;
 
     const-string v3, "app[minimum_sdk_version]"
 
@@ -71,7 +71,7 @@
 
     move-result-object p1
 
-    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bit:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->biN:Ljava/lang/String;
 
     const-string v3, "app[built_sdk_version]"
 
@@ -79,27 +79,27 @@
 
     move-result-object p1
 
-    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->biq:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->biK:Ljava/lang/String;
 
-    invoke-static {v1}, Lio/fabric/sdk/android/a/b/i;->S(Ljava/lang/String;)Z
+    invoke-static {v1}, Lio/fabric/sdk/android/a/b/i;->O(Ljava/lang/String;)Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->biq:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->biK:Ljava/lang/String;
 
     const-string v3, "app[instance_identifier]"
 
     invoke-virtual {p1, v3, v2, v1}, Lio/fabric/sdk/android/a/e/d;->k(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
 
     :cond_0
-    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->biu:Lio/fabric/sdk/android/a/g/n;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->biO:Lio/fabric/sdk/android/a/g/n;
 
     if-eqz v1, :cond_1
 
     :try_start_0
-    iget-object v1, p0, Lio/fabric/sdk/android/a/g/a;->oS:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/g/a;->oR:Lio/fabric/sdk/android/i;
 
     iget-object v1, v1, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -107,9 +107,9 @@
 
     move-result-object v1
 
-    iget-object v3, p2, Lio/fabric/sdk/android/a/g/d;->biu:Lio/fabric/sdk/android/a/g/n;
+    iget-object v3, p2, Lio/fabric/sdk/android/a/g/d;->biO:Lio/fabric/sdk/android/a/g/n;
 
-    iget v3, v3, Lio/fabric/sdk/android/a/g/n;->biM:I
+    iget v3, v3, Lio/fabric/sdk/android/a/g/n;->bjg:I
 
     invoke-virtual {v1, v3}, Landroid/content/res/Resources;->openRawResource(I)Ljava/io/InputStream;
 
@@ -121,9 +121,9 @@
     :try_start_1
     const-string v3, "app[icon][hash]"
 
-    iget-object v4, p2, Lio/fabric/sdk/android/a/g/d;->biu:Lio/fabric/sdk/android/a/g/n;
+    iget-object v4, p2, Lio/fabric/sdk/android/a/g/d;->biO:Lio/fabric/sdk/android/a/g/n;
 
-    iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->aaE:Ljava/lang/String;
+    iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->aaW:Ljava/lang/String;
 
     invoke-virtual {p1, v3, v2, v4}, Lio/fabric/sdk/android/a/e/d;->k(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
 
@@ -141,7 +141,7 @@
 
     const-string v4, "app[icon][width]"
 
-    iget-object v5, p2, Lio/fabric/sdk/android/a/g/d;->biu:Lio/fabric/sdk/android/a/g/n;
+    iget-object v5, p2, Lio/fabric/sdk/android/a/g/d;->biO:Lio/fabric/sdk/android/a/g/n;
 
     iget v5, v5, Lio/fabric/sdk/android/a/g/n;->width:I
 
@@ -155,7 +155,7 @@
 
     const-string v4, "app[icon][height]"
 
-    iget-object v5, p2, Lio/fabric/sdk/android/a/g/d;->biu:Lio/fabric/sdk/android/a/g/n;
+    iget-object v5, p2, Lio/fabric/sdk/android/a/g/d;->biO:Lio/fabric/sdk/android/a/g/n;
 
     iget v5, v5, Lio/fabric/sdk/android/a/g/n;->height:I
 
@@ -189,7 +189,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -201,9 +201,9 @@
 
     invoke-direct {v6, v7}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v7, p2, Lio/fabric/sdk/android/a/g/d;->biu:Lio/fabric/sdk/android/a/g/n;
+    iget-object v7, p2, Lio/fabric/sdk/android/a/g/d;->biO:Lio/fabric/sdk/android/a/g/n;
 
-    iget v7, v7, Lio/fabric/sdk/android/a/g/n;->biM:I
+    iget v7, v7, Lio/fabric/sdk/android/a/g/n;->bjg:I
 
     invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -230,11 +230,11 @@
 
     :cond_1
     :goto_3
-    iget-object v0, p2, Lio/fabric/sdk/android/a/g/d;->biv:Ljava/util/Collection;
+    iget-object v0, p2, Lio/fabric/sdk/android/a/g/d;->biP:Ljava/util/Collection;
 
     if-eqz v0, :cond_2
 
-    iget-object p2, p2, Lio/fabric/sdk/android/a/g/d;->biv:Ljava/util/Collection;
+    iget-object p2, p2, Lio/fabric/sdk/android/a/g/d;->biP:Ljava/util/Collection;
 
     invoke-interface {p2}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
 
@@ -259,7 +259,7 @@
 
     new-array v4, v3, [Ljava/lang/Object;
 
-    iget-object v5, v0, Lio/fabric/sdk/android/k;->sJ:Ljava/lang/String;
+    iget-object v5, v0, Lio/fabric/sdk/android/k;->sI:Ljava/lang/String;
 
     const/4 v6, 0x0
 
@@ -279,7 +279,7 @@
 
     new-array v3, v3, [Ljava/lang/Object;
 
-    iget-object v4, v0, Lio/fabric/sdk/android/k;->sJ:Ljava/lang/String;
+    iget-object v4, v0, Lio/fabric/sdk/android/k;->sI:Ljava/lang/String;
 
     aput-object v4, v3, v6
 
@@ -289,7 +289,7 @@
 
     move-result-object v1
 
-    iget-object v0, v0, Lio/fabric/sdk/android/k;->beP:Ljava/lang/String;
+    iget-object v0, v0, Lio/fabric/sdk/android/k;->bfj:Ljava/lang/String;
 
     invoke-virtual {p1, v1, v2, v0}, Lio/fabric/sdk/android/a/e/d;->k(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
 
@@ -304,11 +304,11 @@
 .method public a(Lio/fabric/sdk/android/a/g/d;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/g/a;->CR()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/g/a;->CI()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
-    iget-object v1, p1, Lio/fabric/sdk/android/a/g/d;->pP:Ljava/lang/String;
+    iget-object v1, p1, Lio/fabric/sdk/android/a/g/d;->pO:Ljava/lang/String;
 
     const-string v2, "X-CRASHLYTICS-API-KEY"
 
@@ -324,7 +324,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/g/a;->oS:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/g/a;->oR:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String;
 
@@ -340,7 +340,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -362,11 +362,11 @@
 
     invoke-interface {v1, v3, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p1, Lio/fabric/sdk/android/a/g/d;->biu:Lio/fabric/sdk/android/a/g/n;
+    iget-object v1, p1, Lio/fabric/sdk/android/a/g/d;->biO:Lio/fabric/sdk/android/a/g/n;
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -376,9 +376,9 @@
 
     invoke-direct {v2, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->biu:Lio/fabric/sdk/android/a/g/n;
+    iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->biO:Lio/fabric/sdk/android/a/g/n;
 
-    iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->aaE:Ljava/lang/String;
+    iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->aaW:Ljava/lang/String;
 
     invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -388,7 +388,7 @@
 
     invoke-interface {v1, v3, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -398,7 +398,7 @@
 
     invoke-direct {v2, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->biu:Lio/fabric/sdk/android/a/g/n;
+    iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->biO:Lio/fabric/sdk/android/a/g/n;
 
     iget v4, v4, Lio/fabric/sdk/android/a/g/n;->width:I
 
@@ -408,7 +408,7 @@
 
     invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p1, p1, Lio/fabric/sdk/android/a/g/d;->biu:Lio/fabric/sdk/android/a/g/n;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/d;->biO:Lio/fabric/sdk/android/a/g/n;
 
     iget p1, p1, Lio/fabric/sdk/android/a/g/n;->height:I
 
@@ -421,11 +421,11 @@
     invoke-interface {v1, v3, p1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->DF()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->Dv()I
 
     move-result p1
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->DE()Ljava/net/HttpURLConnection;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->Du()Ljava/net/HttpURLConnection;
 
     move-result-object v1
 
@@ -449,7 +449,7 @@
     const-string v1, "Update"
 
     :goto_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -465,7 +465,7 @@
 
     const-string v1, "X-REQUEST-ID"
 
-    invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/e/d;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/e/d;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -477,7 +477,7 @@
 
     invoke-interface {v2, v3, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -493,7 +493,7 @@
 
     invoke-interface {v0, v3, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lio/fabric/sdk/android/a/b/v;->dl(I)I
+    invoke-static {p1}, Lio/fabric/sdk/android/a/b/v;->di(I)I
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/b.smali
index abf7914fec..f9b300e133 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/b.smali
@@ -4,27 +4,27 @@
 
 
 # instance fields
-.field public final bif:Ljava/lang/String;
+.field public final biA:I
 
-.field public final big:I
+.field public final biB:I
 
-.field public final bih:I
+.field public final biC:I
 
-.field public final bii:I
+.field public final biD:I
 
-.field public final bij:I
+.field public final biE:Z
 
-.field public final bik:Z
+.field public final biF:Z
 
-.field public final bil:Z
+.field public final biG:Z
 
-.field public final bim:Z
+.field public final biz:Ljava/lang/String;
 
-.field public final pC:Z
+.field public final pB:Z
 
-.field public final pM:I
+.field public final pL:I
 
-.field public final pm:Z
+.field public final pl:Z
 
 
 # direct methods
@@ -33,27 +33,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/g/b;->bif:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/b;->biz:Ljava/lang/String;
 
-    iput p2, p0, Lio/fabric/sdk/android/a/g/b;->big:I
+    iput p2, p0, Lio/fabric/sdk/android/a/g/b;->biA:I
 
-    iput p3, p0, Lio/fabric/sdk/android/a/g/b;->bih:I
+    iput p3, p0, Lio/fabric/sdk/android/a/g/b;->biB:I
 
-    iput p4, p0, Lio/fabric/sdk/android/a/g/b;->bii:I
+    iput p4, p0, Lio/fabric/sdk/android/a/g/b;->biC:I
 
-    iput p5, p0, Lio/fabric/sdk/android/a/g/b;->bij:I
+    iput p5, p0, Lio/fabric/sdk/android/a/g/b;->biD:I
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/b;->bik:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/b;->biE:Z
 
-    iput-boolean p7, p0, Lio/fabric/sdk/android/a/g/b;->pC:Z
+    iput-boolean p7, p0, Lio/fabric/sdk/android/a/g/b;->pB:Z
 
-    iput-boolean p8, p0, Lio/fabric/sdk/android/a/g/b;->bil:Z
+    iput-boolean p8, p0, Lio/fabric/sdk/android/a/g/b;->biF:Z
 
-    iput-boolean p9, p0, Lio/fabric/sdk/android/a/g/b;->bim:Z
+    iput-boolean p9, p0, Lio/fabric/sdk/android/a/g/b;->biG:Z
 
-    iput p10, p0, Lio/fabric/sdk/android/a/g/b;->pM:I
+    iput p10, p0, Lio/fabric/sdk/android/a/g/b;->pL:I
 
-    iput-boolean p11, p0, Lio/fabric/sdk/android/a/g/b;->pm:Z
+    iput-boolean p11, p0, Lio/fabric/sdk/android/a/g/b;->pl:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/c.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/c.smali
index 954254f438..41e7390073 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/c.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final aaE:Ljava/lang/String;
+.field public final aaW:Ljava/lang/String;
 
 .field public final height:I
 
@@ -17,7 +17,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/g/c;->aaE:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/c;->aaW:Ljava/lang/String;
 
     iput p2, p0, Lio/fabric/sdk/android/a/g/c;->width:I
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/d.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/d.smali
index 045a8bb59e..f0357f5674 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/d.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/d.smali
@@ -4,23 +4,23 @@
 
 
 # instance fields
-.field public final bin:Ljava/lang/String;
+.field public final biH:Ljava/lang/String;
 
-.field public final bio:Ljava/lang/String;
+.field public final biI:Ljava/lang/String;
 
-.field public final bip:Ljava/lang/String;
+.field public final biJ:Ljava/lang/String;
 
-.field public final biq:Ljava/lang/String;
+.field public final biK:Ljava/lang/String;
 
-.field public final bir:I
+.field public final biL:I
 
-.field public final bis:Ljava/lang/String;
+.field public final biM:Ljava/lang/String;
 
-.field public final bit:Ljava/lang/String;
+.field public final biN:Ljava/lang/String;
 
-.field public final biu:Lio/fabric/sdk/android/a/g/n;
+.field public final biO:Lio/fabric/sdk/android/a/g/n;
 
-.field public final biv:Ljava/util/Collection;
+.field public final biP:Ljava/util/Collection;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Collection<",
@@ -32,7 +32,7 @@
 
 .field public final name:Ljava/lang/String;
 
-.field public final pP:Ljava/lang/String;
+.field public final pO:Ljava/lang/String;
 
 
 # direct methods
@@ -59,27 +59,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/g/d;->pP:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/d;->pO:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/g/d;->bin:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/g/d;->biH:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/g/d;->bio:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/d;->biI:Ljava/lang/String;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/g/d;->bip:Ljava/lang/String;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/d;->biJ:Ljava/lang/String;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/d;->biq:Ljava/lang/String;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/d;->biK:Ljava/lang/String;
 
     iput-object p6, p0, Lio/fabric/sdk/android/a/g/d;->name:Ljava/lang/String;
 
-    iput p7, p0, Lio/fabric/sdk/android/a/g/d;->bir:I
+    iput p7, p0, Lio/fabric/sdk/android/a/g/d;->biL:I
 
-    iput-object p8, p0, Lio/fabric/sdk/android/a/g/d;->bis:Ljava/lang/String;
+    iput-object p8, p0, Lio/fabric/sdk/android/a/g/d;->biM:Ljava/lang/String;
 
-    iput-object p9, p0, Lio/fabric/sdk/android/a/g/d;->bit:Ljava/lang/String;
+    iput-object p9, p0, Lio/fabric/sdk/android/a/g/d;->biN:Ljava/lang/String;
 
-    iput-object p10, p0, Lio/fabric/sdk/android/a/g/d;->biu:Lio/fabric/sdk/android/a/g/n;
+    iput-object p10, p0, Lio/fabric/sdk/android/a/g/d;->biO:Lio/fabric/sdk/android/a/g/n;
 
-    iput-object p11, p0, Lio/fabric/sdk/android/a/g/d;->biv:Ljava/util/Collection;
+    iput-object p11, p0, Lio/fabric/sdk/android/a/g/d;->biP:Ljava/util/Collection;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/e.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/e.smali
index 74613d80fd..75f41b964e 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/e.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/e.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field public final biw:Ljava/lang/String;
+.field public final biQ:Ljava/lang/String;
 
-.field public final bix:Ljava/lang/String;
+.field public final biR:Ljava/lang/String;
 
-.field public final biy:Z
+.field public final biS:Z
 
-.field public final biz:Lio/fabric/sdk/android/a/g/c;
+.field public final biT:Lio/fabric/sdk/android/a/g/c;
 
-.field public final sJ:Ljava/lang/String;
+.field public final sI:Ljava/lang/String;
 
 .field public final status:Ljava/lang/String;
 
@@ -25,19 +25,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/g/e;->sJ:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/e;->sI:Ljava/lang/String;
 
     iput-object p2, p0, Lio/fabric/sdk/android/a/g/e;->status:Ljava/lang/String;
 
     iput-object p3, p0, Lio/fabric/sdk/android/a/g/e;->url:Ljava/lang/String;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/g/e;->biw:Ljava/lang/String;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/e;->biQ:Ljava/lang/String;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/e;->bix:Ljava/lang/String;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/e;->biR:Ljava/lang/String;
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/e;->biy:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/e;->biS:Z
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/e;->biz:Lio/fabric/sdk/android/a/g/c;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/e;->biT:Lio/fabric/sdk/android/a/g/c;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/f.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/f.smali
index dff9dc333a..6ccacc2a51 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/f.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/f.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field public final biA:Ljava/lang/String;
+.field public final biU:Ljava/lang/String;
 
-.field public final biB:I
+.field public final biV:I
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/g/f;->biA:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/f;->biU:Ljava/lang/String;
 
-    iput p2, p0, Lio/fabric/sdk/android/a/g/f;->biB:I
+    iput p2, p0, Lio/fabric/sdk/android/a/g/f;->biV:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/g.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/g.smali
index e5bd009592..16f4cfc3b9 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/g.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/g.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract DP()Lorg/json/JSONObject;
+.method public abstract DF()Lorg/json/JSONObject;
 .end method
 
 .method public abstract a(JLorg/json/JSONObject;)V
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/h.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/h.smali
index 8f123a483a..505336d081 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/h.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/h.smali
@@ -7,7 +7,7 @@
 .method public constructor <init>(Lio/fabric/sdk/android/i;Ljava/lang/String;Ljava/lang/String;Lio/fabric/sdk/android/a/e/e;)V
     .locals 6
 
-    sget v5, Lio/fabric/sdk/android/a/e/c;->bhA:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->bhU:I
 
     move-object v0, p0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/i.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/i.smali
index 1377f879f3..cdb5af3b18 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/i.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/i.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final oS:Lio/fabric/sdk/android/i;
+.field private final oR:Lio/fabric/sdk/android/i;
 
 
 # direct methods
@@ -16,19 +16,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/g/i;->oS:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/i;->oR:Lio/fabric/sdk/android/i;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final DP()Lorg/json/JSONObject;
+.method public final DF()Lorg/json/JSONObject;
     .locals 7
 
     const-string v0, "Error while closing settings cache file."
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -45,7 +45,7 @@
 
     new-instance v4, Lio/fabric/sdk/android/a/f/b;
 
-    iget-object v5, p0, Lio/fabric/sdk/android/a/g/i;->oS:Lio/fabric/sdk/android/i;
+    iget-object v5, p0, Lio/fabric/sdk/android/a/g/i;->oR:Lio/fabric/sdk/android/i;
 
     invoke-direct {v4, v5}, Lio/fabric/sdk/android/a/f/b;-><init>(Lio/fabric/sdk/android/i;)V
 
@@ -93,7 +93,7 @@
 
     :cond_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -125,7 +125,7 @@
 
     :goto_1
     :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -158,7 +158,7 @@
 
     const-string v0, "Failed to close settings writer."
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -183,7 +183,7 @@
 
     new-instance v3, Lio/fabric/sdk/android/a/f/b;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/g/i;->oS:Lio/fabric/sdk/android/i;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/g/i;->oR:Lio/fabric/sdk/android/i;
 
     invoke-direct {v3, v4}, Lio/fabric/sdk/android/a/f/b;-><init>(Lio/fabric/sdk/android/i;)V
 
@@ -240,7 +240,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/j.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/j.smali
index 511aedbe1e..fb249dae13 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/j.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/j.smali
@@ -7,21 +7,21 @@
 
 
 # instance fields
-.field private final bhl:Lio/fabric/sdk/android/a/b/k;
+.field private final bhF:Lio/fabric/sdk/android/a/b/k;
 
-.field private final biC:Lio/fabric/sdk/android/a/g/w;
+.field private final biW:Lio/fabric/sdk/android/a/g/w;
 
-.field private final biD:Lio/fabric/sdk/android/a/g/v;
+.field private final biX:Lio/fabric/sdk/android/a/g/v;
 
-.field private final biE:Lio/fabric/sdk/android/a/g/g;
+.field private final biY:Lio/fabric/sdk/android/a/g/g;
 
-.field private final biF:Lio/fabric/sdk/android/a/g/x;
+.field private final biZ:Lio/fabric/sdk/android/a/g/x;
 
-.field private final biG:Lio/fabric/sdk/android/a/b/l;
+.field private final bja:Lio/fabric/sdk/android/a/b/l;
 
-.field private final oS:Lio/fabric/sdk/android/i;
+.field private final oR:Lio/fabric/sdk/android/i;
 
-.field private final sU:Lio/fabric/sdk/android/a/f/c;
+.field private final sT:Lio/fabric/sdk/android/a/f/c;
 
 
 # direct methods
@@ -30,39 +30,39 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/g/j;->oS:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/j;->oR:Lio/fabric/sdk/android/i;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/g/j;->biC:Lio/fabric/sdk/android/a/g/w;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/g/j;->biW:Lio/fabric/sdk/android/a/g/w;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/g/j;->bhl:Lio/fabric/sdk/android/a/b/k;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/j;->bhF:Lio/fabric/sdk/android/a/b/k;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/g/j;->biD:Lio/fabric/sdk/android/a/g/v;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/j;->biX:Lio/fabric/sdk/android/a/g/v;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/j;->biE:Lio/fabric/sdk/android/a/g/g;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/j;->biY:Lio/fabric/sdk/android/a/g/g;
 
-    iput-object p6, p0, Lio/fabric/sdk/android/a/g/j;->biF:Lio/fabric/sdk/android/a/g/x;
+    iput-object p6, p0, Lio/fabric/sdk/android/a/g/j;->biZ:Lio/fabric/sdk/android/a/g/x;
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/j;->biG:Lio/fabric/sdk/android/a/b/l;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/j;->bja:Lio/fabric/sdk/android/a/b/l;
 
     new-instance p1, Lio/fabric/sdk/android/a/f/d;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/g/j;->oS:Lio/fabric/sdk/android/i;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/g/j;->oR:Lio/fabric/sdk/android/i;
 
     invoke-direct {p1, p2}, Lio/fabric/sdk/android/a/f/d;-><init>(Lio/fabric/sdk/android/i;)V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/g/j;->sU:Lio/fabric/sdk/android/a/f/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/j;->sT:Lio/fabric/sdk/android/a/f/c;
 
     return-void
 .end method
 
-.method private DR()Ljava/lang/String;
+.method private DH()Ljava/lang/String;
     .locals 3
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Ljava/lang/String;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/g/j;->oS:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/g/j;->oR:Lio/fabric/sdk/android/i;
 
     iget-object v1, v1, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -89,7 +89,7 @@
     const/4 v1, 0x0
 
     :try_start_0
-    sget-object v2, Lio/fabric/sdk/android/a/g/r;->bje:Lio/fabric/sdk/android/a/g/r;
+    sget-object v2, Lio/fabric/sdk/android/a/g/r;->bjy:Lio/fabric/sdk/android/a/g/r;
 
     invoke-virtual {v2, p1}, Lio/fabric/sdk/android/a/g/r;->equals(Ljava/lang/Object;)Z
 
@@ -97,17 +97,17 @@
 
     if-nez v2, :cond_4
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/g/j;->biE:Lio/fabric/sdk/android/a/g/g;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/g/j;->biY:Lio/fabric/sdk/android/a/g/g;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/g/g;->DP()Lorg/json/JSONObject;
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/g/g;->DF()Lorg/json/JSONObject;
 
     move-result-object v2
 
     if-eqz v2, :cond_3
 
-    iget-object v3, p0, Lio/fabric/sdk/android/a/g/j;->biD:Lio/fabric/sdk/android/a/g/v;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/g/j;->biX:Lio/fabric/sdk/android/a/g/v;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/g/j;->bhl:Lio/fabric/sdk/android/a/b/k;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/g/j;->bhF:Lio/fabric/sdk/android/a/b/k;
 
     invoke-interface {v3, v4, v2}, Lio/fabric/sdk/android/a/g/v;->a(Lio/fabric/sdk/android/a/b/k;Lorg/json/JSONObject;)Lio/fabric/sdk/android/a/g/t;
 
@@ -117,13 +117,13 @@
 
     invoke-static {v2, v4}, Lio/fabric/sdk/android/a/g/j;->c(Lorg/json/JSONObject;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/g/j;->bhl:Lio/fabric/sdk/android/a/b/k;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/g/j;->bhF:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/b/k;->Da()J
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/b/k;->CR()J
 
     move-result-wide v4
 
-    sget-object v2, Lio/fabric/sdk/android/a/g/r;->bjf:Lio/fabric/sdk/android/a/g/r;
+    sget-object v2, Lio/fabric/sdk/android/a/g/r;->bjz:Lio/fabric/sdk/android/a/g/r;
 
     invoke-virtual {v2, p1}, Lio/fabric/sdk/android/a/g/r;->equals(Ljava/lang/Object;)Z
 
@@ -131,7 +131,7 @@
 
     if-nez p1, :cond_2
 
-    iget-wide v6, v3, Lio/fabric/sdk/android/a/g/t;->bjl:J
+    iget-wide v6, v3, Lio/fabric/sdk/android/a/g/t;->bjF:J
 
     cmp-long p1, v6, v4
 
@@ -150,7 +150,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -165,7 +165,7 @@
     :cond_2
     :goto_1
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -188,7 +188,7 @@
 
     :cond_3
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -204,7 +204,7 @@
     move-exception p1
 
     :goto_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -225,7 +225,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -254,10 +254,10 @@
 
 
 # virtual methods
-.method public final DQ()Lio/fabric/sdk/android/a/g/t;
+.method public final DG()Lio/fabric/sdk/android/a/g/t;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/g/r;->bjd:Lio/fabric/sdk/android/a/g/r;
+    sget-object v0, Lio/fabric/sdk/android/a/g/r;->bjx:Lio/fabric/sdk/android/a/g/r;
 
     invoke-virtual {p0, v0}, Lio/fabric/sdk/android/a/g/j;->a(Lio/fabric/sdk/android/a/g/r;)Lio/fabric/sdk/android/a/g/t;
 
@@ -269,9 +269,9 @@
 .method public final a(Lio/fabric/sdk/android/a/g/r;)Lio/fabric/sdk/android/a/g/t;
     .locals 6
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->biG:Lio/fabric/sdk/android/a/b/l;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->bja:Lio/fabric/sdk/android/a/b/l;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/l;->Db()Z
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/l;->CS()Z
 
     move-result v0
 
@@ -281,7 +281,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -293,7 +293,7 @@
 
     :cond_0
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CG()Z
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cx()Z
 
     move-result v0
     :try_end_0
@@ -304,9 +304,9 @@
     if-nez v0, :cond_1
 
     :try_start_1
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->sT:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->DO()Landroid/content/SharedPreferences;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->DE()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -316,7 +316,7 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/g/j;->DR()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/g/j;->DH()Ljava/lang/String;
 
     move-result-object v4
 
@@ -335,9 +335,9 @@
     :cond_1
     if-nez v2, :cond_2
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/g/j;->biF:Lio/fabric/sdk/android/a/g/x;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/g/j;->biZ:Lio/fabric/sdk/android/a/g/x;
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->biC:Lio/fabric/sdk/android/a/g/w;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->biW:Lio/fabric/sdk/android/a/g/w;
 
     invoke-interface {p1, v0}, Lio/fabric/sdk/android/a/g/x;->a(Lio/fabric/sdk/android/a/g/w;)Lorg/json/JSONObject;
 
@@ -345,17 +345,17 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->biD:Lio/fabric/sdk/android/a/g/v;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->biX:Lio/fabric/sdk/android/a/g/v;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/g/j;->bhl:Lio/fabric/sdk/android/a/b/k;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/g/j;->bhF:Lio/fabric/sdk/android/a/b/k;
 
     invoke-interface {v0, v4, p1}, Lio/fabric/sdk/android/a/g/v;->a(Lio/fabric/sdk/android/a/b/k;Lorg/json/JSONObject;)Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->biE:Lio/fabric/sdk/android/a/g/g;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->biY:Lio/fabric/sdk/android/a/g/g;
 
-    iget-wide v4, v2, Lio/fabric/sdk/android/a/g/t;->bjl:J
+    iget-wide v4, v2, Lio/fabric/sdk/android/a/g/t;->bjF:J
 
     invoke-interface {v0, v4, v5, p1}, Lio/fabric/sdk/android/a/g/g;->a(JLorg/json/JSONObject;)V
 
@@ -363,11 +363,11 @@
 
     invoke-static {p1, v0}, Lio/fabric/sdk/android/a/g/j;->c(Lorg/json/JSONObject;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/g/j;->DR()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/g/j;->DH()Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->sT:Lio/fabric/sdk/android/a/f/c;
 
     invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -375,14 +375,14 @@
 
     invoke-interface {v0, v3, p1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/g/j;->sU:Lio/fabric/sdk/android/a/f/c;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/g/j;->sT:Lio/fabric/sdk/android/a/f/c;
 
     invoke-interface {p1, v0}, Lio/fabric/sdk/android/a/f/c;->a(Landroid/content/SharedPreferences$Editor;)Z
 
     :cond_2
     if-nez v2, :cond_3
 
-    sget-object p1, Lio/fabric/sdk/android/a/g/r;->bjf:Lio/fabric/sdk/android/a/g/r;
+    sget-object p1, Lio/fabric/sdk/android/a/g/r;->bjz:Lio/fabric/sdk/android/a/g/r;
 
     invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/g/j;->b(Lio/fabric/sdk/android/a/g/r;)Lio/fabric/sdk/android/a/g/t;
 
@@ -395,7 +395,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/k.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/k.smali
index 2e6d29895f..035dce5b0c 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/k.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/k.smali
@@ -407,7 +407,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lio/fabric/sdk/android/a/g/u;->bjo:Ljava/lang/String;
+    sget-object v4, Lio/fabric/sdk/android/a/g/u;->bjI:Ljava/lang/String;
 
     const-string v5, "update_endpoint"
 
@@ -444,7 +444,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-interface/range {p1 .. p1}, Lio/fabric/sdk/android/a/b/k;->Da()J
+    invoke-interface/range {p1 .. p1}, Lio/fabric/sdk/android/a/b/k;->CR()J
 
     move-result-wide v4
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/l.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/l.smali
index 3e2b383c4e..8633492129 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/l.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/l.smali
@@ -10,7 +10,7 @@
 .method public constructor <init>(Lio/fabric/sdk/android/i;Ljava/lang/String;Ljava/lang/String;Lio/fabric/sdk/android/a/e/e;)V
     .locals 6
 
-    sget v5, Lio/fabric/sdk/android/a/e/c;->bhz:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->bhT:I
 
     move-object v0, p0
 
@@ -46,7 +46,7 @@
     return-void
 .end method
 
-.method private dS(Ljava/lang/String;)Lorg/json/JSONObject;
+.method private dM(Ljava/lang/String;)Lorg/json/JSONObject;
     .locals 4
 
     :try_start_0
@@ -61,7 +61,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -83,7 +83,7 @@
 
     invoke-interface {v1, v3, v2, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -124,19 +124,19 @@
 
     const-string v5, "build_version"
 
-    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->bip:Ljava/lang/String;
+    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->biJ:Ljava/lang/String;
 
     invoke-interface {v4, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     const-string v5, "display_version"
 
-    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->bio:Ljava/lang/String;
+    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->biI:Ljava/lang/String;
 
     invoke-interface {v4, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     const-string v5, "source"
 
-    iget v6, p1, Lio/fabric/sdk/android/a/g/w;->bir:I
+    iget v6, p1, Lio/fabric/sdk/android/a/g/w;->biL:I
 
     invoke-static {v6}, Ljava/lang/Integer;->toString(I)Ljava/lang/String;
 
@@ -144,20 +144,20 @@
 
     invoke-interface {v4, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v5, p1, Lio/fabric/sdk/android/a/g/w;->bjs:Ljava/lang/String;
+    iget-object v5, p1, Lio/fabric/sdk/android/a/g/w;->bjM:Ljava/lang/String;
 
     if-eqz v5, :cond_0
 
     const-string v5, "icon_hash"
 
-    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->bjs:Ljava/lang/String;
+    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->bjM:Ljava/lang/String;
 
     invoke-interface {v4, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    iget-object v5, p1, Lio/fabric/sdk/android/a/g/w;->bjr:Ljava/lang/String;
+    iget-object v5, p1, Lio/fabric/sdk/android/a/g/w;->bjL:Ljava/lang/String;
 
-    invoke-static {v5}, Lio/fabric/sdk/android/a/b/i;->S(Ljava/lang/String;)Z
+    invoke-static {v5}, Lio/fabric/sdk/android/a/b/i;->O(Ljava/lang/String;)Z
 
     move-result v6
 
@@ -178,7 +178,7 @@
     :try_start_1
     const-string v6, "X-CRASHLYTICS-API-KEY"
 
-    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->pP:Ljava/lang/String;
+    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->pO:Ljava/lang/String;
 
     invoke-static {v5, v6, v7}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -190,7 +190,7 @@
 
     const-string v6, "X-CRASHLYTICS-API-CLIENT-VERSION"
 
-    iget-object v7, p0, Lio/fabric/sdk/android/a/g/l;->oS:Lio/fabric/sdk/android/i;
+    iget-object v7, p0, Lio/fabric/sdk/android/a/g/l;->oR:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v7}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String;
 
@@ -206,29 +206,29 @@
 
     const-string v6, "X-CRASHLYTICS-DEVICE-MODEL"
 
-    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->qs:Ljava/lang/String;
+    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->qr:Ljava/lang/String;
 
     invoke-static {v5, v6, v7}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v6, "X-CRASHLYTICS-OS-BUILD-VERSION"
 
-    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->bjp:Ljava/lang/String;
+    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->bjJ:Ljava/lang/String;
 
     invoke-static {v5, v6, v7}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v6, "X-CRASHLYTICS-OS-DISPLAY-VERSION"
 
-    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->bjq:Ljava/lang/String;
+    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->bjK:Ljava/lang/String;
 
     invoke-static {v5, v6, v7}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v6, "X-CRASHLYTICS-INSTALLATION-ID"
 
-    iget-object p1, p1, Lio/fabric/sdk/android/a/g/w;->qn:Ljava/lang/String;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/w;->qm:Ljava/lang/String;
 
     invoke-static {v5, v6, p1}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -248,7 +248,7 @@
 
     invoke-interface {p1, v2, v6}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -264,11 +264,11 @@
 
     invoke-interface {p1, v2, v4}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v5}, Lio/fabric/sdk/android/a/e/d;->DF()I
+    invoke-virtual {v5}, Lio/fabric/sdk/android/a/e/d;->Dv()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -314,11 +314,11 @@
     :goto_1
     if-eqz p1, :cond_4
 
-    invoke-virtual {v5}, Lio/fabric/sdk/android/a/e/d;->DG()Ljava/lang/String;
+    invoke-virtual {v5}, Lio/fabric/sdk/android/a/e/d;->Dw()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/g/l;->dS(Ljava/lang/String;)Lorg/json/JSONObject;
+    invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/g/l;->dM(Ljava/lang/String;)Lorg/json/JSONObject;
 
     move-result-object p1
 
@@ -327,7 +327,7 @@
     goto :goto_2
 
     :cond_4
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -353,7 +353,7 @@
     :goto_2
     if-eqz v5, :cond_5
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -362,7 +362,7 @@
     invoke-direct {v4, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
     :goto_3
-    invoke-virtual {v5, v0}, Lio/fabric/sdk/android/a/e/d;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v5, v0}, Lio/fabric/sdk/android/a/e/d;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -395,7 +395,7 @@
 
     :goto_4
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -407,7 +407,7 @@
 
     if-eqz v5, :cond_5
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -427,7 +427,7 @@
     :goto_6
     if-eqz v5, :cond_6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -435,7 +435,7 @@
 
     invoke-direct {v4, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v5, v0}, Lio/fabric/sdk/android/a/e/d;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v5, v0}, Lio/fabric/sdk/android/a/e/d;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/m.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/m.smali
index c0327751f0..a7a3b0cfe0 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/m.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/m.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field public final biH:Z
+.field public final bjb:Z
 
-.field public final biI:Z
+.field public final bjc:Z
 
-.field public final biJ:Z
+.field public final bjd:Z
 
-.field public final biK:Z
+.field public final bje:Z
 
-.field public final biL:Z
+.field public final bjf:Z
 
 
 # direct methods
@@ -21,15 +21,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lio/fabric/sdk/android/a/g/m;->biH:Z
+    iput-boolean p1, p0, Lio/fabric/sdk/android/a/g/m;->bjb:Z
 
-    iput-boolean p2, p0, Lio/fabric/sdk/android/a/g/m;->biI:Z
+    iput-boolean p2, p0, Lio/fabric/sdk/android/a/g/m;->bjc:Z
 
-    iput-boolean p3, p0, Lio/fabric/sdk/android/a/g/m;->biJ:Z
+    iput-boolean p3, p0, Lio/fabric/sdk/android/a/g/m;->bjd:Z
 
-    iput-boolean p4, p0, Lio/fabric/sdk/android/a/g/m;->biK:Z
+    iput-boolean p4, p0, Lio/fabric/sdk/android/a/g/m;->bje:Z
 
-    iput-boolean p5, p0, Lio/fabric/sdk/android/a/g/m;->biL:Z
+    iput-boolean p5, p0, Lio/fabric/sdk/android/a/g/m;->bjf:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/n.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/n.smali
index 736f3c8b9d..025886b6a1 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/n.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/n.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field public final aaE:Ljava/lang/String;
+.field public final aaW:Ljava/lang/String;
 
-.field public final biM:I
+.field public final bjg:I
 
 .field public final height:I
 
@@ -19,9 +19,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/g/n;->aaE:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/n;->aaW:Ljava/lang/String;
 
-    iput p2, p0, Lio/fabric/sdk/android/a/g/n;->biM:I
+    iput p2, p0, Lio/fabric/sdk/android/a/g/n;->bjg:I
 
     iput p3, p0, Lio/fabric/sdk/android/a/g/n;->width:I
 
@@ -42,7 +42,7 @@
 
     move-result v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -87,7 +87,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/o.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/o.smali
index 7e6a0c563f..b321384d16 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/o.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/o.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field public final biN:Ljava/lang/String;
+.field public final bjh:Ljava/lang/String;
 
-.field public final biO:Z
+.field public final bji:Z
 
-.field public final biP:Ljava/lang/String;
+.field public final bjj:Ljava/lang/String;
 
-.field public final biQ:Z
+.field public final bjk:Z
 
-.field public final biR:Ljava/lang/String;
+.field public final bjl:Ljava/lang/String;
 
 .field public final message:Ljava/lang/String;
 
@@ -29,15 +29,15 @@
 
     iput-object p2, p0, Lio/fabric/sdk/android/a/g/o;->message:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/g/o;->biN:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/o;->bjh:Ljava/lang/String;
 
-    iput-boolean p4, p0, Lio/fabric/sdk/android/a/g/o;->biO:Z
+    iput-boolean p4, p0, Lio/fabric/sdk/android/a/g/o;->bji:Z
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/o;->biP:Ljava/lang/String;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/o;->bjj:Ljava/lang/String;
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/o;->biQ:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/o;->bjk:Z
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/o;->biR:Ljava/lang/String;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/o;->bjl:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/p.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/p.smali
index 90235c70b0..9a2f9a644d 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/p.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/p.smali
@@ -4,19 +4,19 @@
 
 
 # instance fields
-.field public final biS:I
+.field public final bjm:I
 
-.field public final biT:I
+.field public final bjn:I
 
-.field public final biU:I
+.field public final bjo:I
 
-.field public final biV:I
+.field public final bjp:I
 
-.field public final biW:I
+.field public final bjq:I
 
-.field public final biX:Z
+.field public final bjr:Z
 
-.field public final biY:I
+.field public final bjs:I
 
 
 # direct methods
@@ -25,19 +25,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lio/fabric/sdk/android/a/g/p;->biS:I
+    iput p1, p0, Lio/fabric/sdk/android/a/g/p;->bjm:I
 
-    iput p2, p0, Lio/fabric/sdk/android/a/g/p;->biT:I
+    iput p2, p0, Lio/fabric/sdk/android/a/g/p;->bjn:I
 
-    iput p3, p0, Lio/fabric/sdk/android/a/g/p;->biU:I
+    iput p3, p0, Lio/fabric/sdk/android/a/g/p;->bjo:I
 
-    iput p4, p0, Lio/fabric/sdk/android/a/g/p;->biV:I
+    iput p4, p0, Lio/fabric/sdk/android/a/g/p;->bjp:I
 
-    iput p5, p0, Lio/fabric/sdk/android/a/g/p;->biW:I
+    iput p5, p0, Lio/fabric/sdk/android/a/g/p;->bjq:I
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/p;->biX:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/p;->bjr:Z
 
-    iput p7, p0, Lio/fabric/sdk/android/a/g/p;->biY:I
+    iput p7, p0, Lio/fabric/sdk/android/a/g/p;->bjs:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/q$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/q$a.smali
index 47b217da41..c7b1807b2d 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/q$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/q$a.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field private static final bjc:Lio/fabric/sdk/android/a/g/q;
+.field private static final bjw:Lio/fabric/sdk/android/a/g/q;
 
 
 # direct methods
@@ -28,15 +28,15 @@
 
     invoke-direct {v0, v1}, Lio/fabric/sdk/android/a/g/q;-><init>(B)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/g/q$a;->bjc:Lio/fabric/sdk/android/a/g/q;
+    sput-object v0, Lio/fabric/sdk/android/a/g/q$a;->bjw:Lio/fabric/sdk/android/a/g/q;
 
     return-void
 .end method
 
-.method public static synthetic DV()Lio/fabric/sdk/android/a/g/q;
+.method public static synthetic DL()Lio/fabric/sdk/android/a/g/q;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/g/q$a;->bjc:Lio/fabric/sdk/android/a/g/q;
+    sget-object v0, Lio/fabric/sdk/android/a/g/q$a;->bjw:Lio/fabric/sdk/android/a/g/q;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/q.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/q.smali
index a8d4608582..1d44717ed5 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/q.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/q.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field private final biZ:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bjt:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -22,9 +22,9 @@
     .end annotation
 .end field
 
-.field private final bja:Ljava/util/concurrent/CountDownLatch;
+.field private final bju:Ljava/util/concurrent/CountDownLatch;
 
-.field private bjb:Lio/fabric/sdk/android/a/g/s;
+.field private bjv:Lio/fabric/sdk/android/a/g/s;
 
 .field private initialized:Z
 
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/g/q;->biZ:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bjt:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance v0, Ljava/util/concurrent/CountDownLatch;
 
@@ -47,7 +47,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bja:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bju:Ljava/util/concurrent/CountDownLatch;
 
     const/4 v0, 0x0
 
@@ -67,11 +67,11 @@
 .method private b(Lio/fabric/sdk/android/a/g/t;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->biZ:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bjt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/g/q;->bja:Ljava/util/concurrent/CountDownLatch;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/g/q;->bju:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {p1}, Ljava/util/concurrent/CountDownLatch;->countDown()V
 
@@ -80,15 +80,15 @@
 
 
 # virtual methods
-.method public final DS()Lio/fabric/sdk/android/a/g/t;
+.method public final DI()Lio/fabric/sdk/android/a/g/t;
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bja:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bju:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->await()V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->biZ:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bjt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -101,7 +101,7 @@
     return-object v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -116,15 +116,15 @@
     return-object v0
 .end method
 
-.method public final declared-synchronized DT()Z
+.method public final declared-synchronized DJ()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bjb:Lio/fabric/sdk/android/a/g/s;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bjv:Lio/fabric/sdk/android/a/g/s;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/g/s;->DQ()Lio/fabric/sdk/android/a/g/t;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/g/s;->DG()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v0
 
@@ -160,15 +160,15 @@
     goto :goto_1
 .end method
 
-.method public final declared-synchronized DU()Z
+.method public final declared-synchronized DK()Z
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bjb:Lio/fabric/sdk/android/a/g/s;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bjv:Lio/fabric/sdk/android/a/g/s;
 
-    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bje:Lio/fabric/sdk/android/a/g/r;
+    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bjy:Lio/fabric/sdk/android/a/g/r;
 
     invoke-interface {v0, v1}, Lio/fabric/sdk/android/a/g/s;->a(Lio/fabric/sdk/android/a/g/r;)Lio/fabric/sdk/android/a/g/t;
 
@@ -178,7 +178,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -243,7 +243,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v2, v1, Lio/fabric/sdk/android/a/g/q;->bjb:Lio/fabric/sdk/android/a/g/s;
+    iget-object v2, v1, Lio/fabric/sdk/android/a/g/q;->bjv:Lio/fabric/sdk/android/a/g/s;
 
     const/4 v10, 0x1
 
@@ -253,7 +253,7 @@
 
     move-object/from16 v3, p2
 
-    iget-object v4, v3, Lio/fabric/sdk/android/a/b/s;->beH:Ljava/lang/String;
+    iget-object v4, v3, Lio/fabric/sdk/android/a/b/s;->bfb:Ljava/lang/String;
 
     new-instance v5, Lio/fabric/sdk/android/a/b/g;
 
@@ -305,23 +305,23 @@
 
     invoke-direct {v9, v0, v13, v4, v11}, Lio/fabric/sdk/android/a/g/l;-><init>(Lio/fabric/sdk/android/i;Ljava/lang/String;Ljava/lang/String;Lio/fabric/sdk/android/a/e/e;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/s;->Dd()Ljava/lang/String;
+    invoke-static {}, Lio/fabric/sdk/android/a/b/s;->getModelName()Ljava/lang/String;
 
     move-result-object v13
 
     sget-object v4, Landroid/os/Build$VERSION;->INCREMENTAL:Ljava/lang/String;
 
-    invoke-static {v4}, Lio/fabric/sdk/android/a/b/s;->dJ(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v4}, Lio/fabric/sdk/android/a/b/s;->dD(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
     sget-object v11, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
-    invoke-static {v11}, Lio/fabric/sdk/android/a/b/s;->dJ(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v11}, Lio/fabric/sdk/android/a/b/s;->dD(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v15
 
-    invoke-virtual/range {p2 .. p2}, Lio/fabric/sdk/android/a/b/s;->Dc()Ljava/lang/String;
+    invoke-virtual/range {p2 .. p2}, Lio/fabric/sdk/android/a/b/s;->CT()Ljava/lang/String;
 
     move-result-object v16
 
@@ -337,7 +337,7 @@
 
     move-result-object v17
 
-    invoke-static {v5}, Lio/fabric/sdk/android/a/b/m;->dH(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/m;
+    invoke-static {v5}, Lio/fabric/sdk/android/a/b/m;->dB(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/m;
 
     move-result-object v2
 
@@ -377,7 +377,7 @@
 
     invoke-direct/range {v2 .. v9}, Lio/fabric/sdk/android/a/g/j;-><init>(Lio/fabric/sdk/android/i;Lio/fabric/sdk/android/a/g/w;Lio/fabric/sdk/android/a/b/k;Lio/fabric/sdk/android/a/g/v;Lio/fabric/sdk/android/a/g/g;Lio/fabric/sdk/android/a/g/x;Lio/fabric/sdk/android/a/b/l;)V
 
-    iput-object v11, v1, Lio/fabric/sdk/android/a/g/q;->bjb:Lio/fabric/sdk/android/a/g/s;
+    iput-object v11, v1, Lio/fabric/sdk/android/a/g/q;->bjv:Lio/fabric/sdk/android/a/g/s;
 
     :cond_1
     iput-boolean v10, v1, Lio/fabric/sdk/android/a/g/q;->initialized:Z
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/r.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/r.smali
index 170b00294e..cdd3c39ffa 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/r.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/r.smali
@@ -14,13 +14,13 @@
 
 
 # static fields
-.field public static final enum bjd:Lio/fabric/sdk/android/a/g/r;
+.field private static final synthetic bjA:[Lio/fabric/sdk/android/a/g/r;
 
-.field public static final enum bje:Lio/fabric/sdk/android/a/g/r;
+.field public static final enum bjx:Lio/fabric/sdk/android/a/g/r;
 
-.field public static final enum bjf:Lio/fabric/sdk/android/a/g/r;
+.field public static final enum bjy:Lio/fabric/sdk/android/a/g/r;
 
-.field private static final synthetic bjg:[Lio/fabric/sdk/android/a/g/r;
+.field public static final enum bjz:Lio/fabric/sdk/android/a/g/r;
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     invoke-direct {v0, v2, v1}, Lio/fabric/sdk/android/a/g/r;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bjd:Lio/fabric/sdk/android/a/g/r;
+    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bjx:Lio/fabric/sdk/android/a/g/r;
 
     new-instance v0, Lio/fabric/sdk/android/a/g/r;
 
@@ -45,7 +45,7 @@
 
     invoke-direct {v0, v3, v2}, Lio/fabric/sdk/android/a/g/r;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bje:Lio/fabric/sdk/android/a/g/r;
+    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bjy:Lio/fabric/sdk/android/a/g/r;
 
     new-instance v0, Lio/fabric/sdk/android/a/g/r;
 
@@ -55,25 +55,25 @@
 
     invoke-direct {v0, v4, v3}, Lio/fabric/sdk/android/a/g/r;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bjf:Lio/fabric/sdk/android/a/g/r;
+    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bjz:Lio/fabric/sdk/android/a/g/r;
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lio/fabric/sdk/android/a/g/r;
 
-    sget-object v4, Lio/fabric/sdk/android/a/g/r;->bjd:Lio/fabric/sdk/android/a/g/r;
+    sget-object v4, Lio/fabric/sdk/android/a/g/r;->bjx:Lio/fabric/sdk/android/a/g/r;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bje:Lio/fabric/sdk/android/a/g/r;
+    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bjy:Lio/fabric/sdk/android/a/g/r;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bjf:Lio/fabric/sdk/android/a/g/r;
+    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bjz:Lio/fabric/sdk/android/a/g/r;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bjg:[Lio/fabric/sdk/android/a/g/r;
+    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bjA:[Lio/fabric/sdk/android/a/g/r;
 
     return-void
 .end method
@@ -108,7 +108,7 @@
 .method public static values()[Lio/fabric/sdk/android/a/g/r;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/g/r;->bjg:[Lio/fabric/sdk/android/a/g/r;
+    sget-object v0, Lio/fabric/sdk/android/a/g/r;->bjA:[Lio/fabric/sdk/android/a/g/r;
 
     invoke-virtual {v0}, [Lio/fabric/sdk/android/a/g/r;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/s.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/s.smali
index c60021dfea..ee1c4286aa 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/s.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/s.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract DQ()Lio/fabric/sdk/android/a/g/t;
+.method public abstract DG()Lio/fabric/sdk/android/a/g/t;
 .end method
 
 .method public abstract a(Lio/fabric/sdk/android/a/g/r;)Lio/fabric/sdk/android/a/g/t;
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/t.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/t.smali
index 4f2a36e28f..d05f670291 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/t.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/t.smali
@@ -4,23 +4,23 @@
 
 
 # instance fields
-.field public final bjh:Lio/fabric/sdk/android/a/g/e;
+.field public final bjB:Lio/fabric/sdk/android/a/g/e;
 
-.field public final bji:Lio/fabric/sdk/android/a/g/p;
+.field public final bjC:Lio/fabric/sdk/android/a/g/p;
 
-.field public final bjj:Lio/fabric/sdk/android/a/g/m;
+.field public final bjD:Lio/fabric/sdk/android/a/g/m;
 
-.field public final bjk:Lio/fabric/sdk/android/a/g/f;
+.field public final bjE:Lio/fabric/sdk/android/a/g/f;
 
-.field public final bjl:J
+.field public final bjF:J
 
-.field public final bjm:I
+.field public final bjG:I
 
-.field public final bjn:I
+.field public final bjH:I
 
-.field public final pO:Lio/fabric/sdk/android/a/g/b;
+.field public final pN:Lio/fabric/sdk/android/a/g/b;
 
-.field public final rX:Lio/fabric/sdk/android/a/g/o;
+.field public final rW:Lio/fabric/sdk/android/a/g/o;
 
 
 # direct methods
@@ -29,23 +29,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide p1, p0, Lio/fabric/sdk/android/a/g/t;->bjl:J
+    iput-wide p1, p0, Lio/fabric/sdk/android/a/g/t;->bjF:J
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/g/t;->bjh:Lio/fabric/sdk/android/a/g/e;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/t;->bjB:Lio/fabric/sdk/android/a/g/e;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/g/t;->bji:Lio/fabric/sdk/android/a/g/p;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/t;->bjC:Lio/fabric/sdk/android/a/g/p;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/t;->rX:Lio/fabric/sdk/android/a/g/o;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/t;->rW:Lio/fabric/sdk/android/a/g/o;
 
-    iput-object p6, p0, Lio/fabric/sdk/android/a/g/t;->bjj:Lio/fabric/sdk/android/a/g/m;
+    iput-object p6, p0, Lio/fabric/sdk/android/a/g/t;->bjD:Lio/fabric/sdk/android/a/g/m;
 
-    iput p9, p0, Lio/fabric/sdk/android/a/g/t;->bjm:I
+    iput p9, p0, Lio/fabric/sdk/android/a/g/t;->bjG:I
 
-    iput p10, p0, Lio/fabric/sdk/android/a/g/t;->bjn:I
+    iput p10, p0, Lio/fabric/sdk/android/a/g/t;->bjH:I
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/t;->pO:Lio/fabric/sdk/android/a/g/b;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/t;->pN:Lio/fabric/sdk/android/a/g/b;
 
-    iput-object p8, p0, Lio/fabric/sdk/android/a/g/t;->bjk:Lio/fabric/sdk/android/a/g/f;
+    iput-object p8, p0, Lio/fabric/sdk/android/a/g/t;->bjE:Lio/fabric/sdk/android/a/g/f;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/u.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/u.smali
index aed69c0bb1..3a7227dd6e 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/u.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/u.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bjo:Ljava/lang/String;
+.field public static final bjI:Ljava/lang/String;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/w.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/w.smali
index 5e0ad4b9a0..8925eb1906 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/w.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/w.smali
@@ -4,25 +4,25 @@
 
 
 # instance fields
-.field public final bio:Ljava/lang/String;
+.field public final biI:Ljava/lang/String;
 
-.field public final bip:Ljava/lang/String;
+.field public final biJ:Ljava/lang/String;
 
-.field public final bir:I
+.field public final biL:I
 
-.field public final bjp:Ljava/lang/String;
+.field public final bjJ:Ljava/lang/String;
 
-.field public final bjq:Ljava/lang/String;
+.field public final bjK:Ljava/lang/String;
 
-.field public final bjr:Ljava/lang/String;
+.field public final bjL:Ljava/lang/String;
 
-.field public final bjs:Ljava/lang/String;
+.field public final bjM:Ljava/lang/String;
 
-.field public final pP:Ljava/lang/String;
+.field public final pO:Ljava/lang/String;
 
-.field public final qn:Ljava/lang/String;
+.field public final qm:Ljava/lang/String;
 
-.field public final qs:Ljava/lang/String;
+.field public final qr:Ljava/lang/String;
 
 
 # direct methods
@@ -31,25 +31,25 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/g/w;->pP:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/w;->pO:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/g/w;->qs:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/g/w;->qr:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/g/w;->bjp:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/w;->bjJ:Ljava/lang/String;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/g/w;->bjq:Ljava/lang/String;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/w;->bjK:Ljava/lang/String;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/w;->qn:Ljava/lang/String;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/w;->qm:Ljava/lang/String;
 
-    iput-object p6, p0, Lio/fabric/sdk/android/a/g/w;->bjr:Ljava/lang/String;
+    iput-object p6, p0, Lio/fabric/sdk/android/a/g/w;->bjL:Ljava/lang/String;
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/w;->bio:Ljava/lang/String;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/w;->biI:Ljava/lang/String;
 
-    iput-object p8, p0, Lio/fabric/sdk/android/a/g/w;->bip:Ljava/lang/String;
+    iput-object p8, p0, Lio/fabric/sdk/android/a/g/w;->biJ:Ljava/lang/String;
 
-    iput p9, p0, Lio/fabric/sdk/android/a/g/w;->bir:I
+    iput p9, p0, Lio/fabric/sdk/android/a/g/w;->biL:I
 
-    iput-object p10, p0, Lio/fabric/sdk/android/a/g/w;->bjs:Ljava/lang/String;
+    iput-object p10, p0, Lio/fabric/sdk/android/a/g/w;->bjM:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/y.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/y.smali
index 9f2d484686..5ae5fe9fe9 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/g/y.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/g/y.smali
@@ -7,7 +7,7 @@
 .method public constructor <init>(Lio/fabric/sdk/android/i;Ljava/lang/String;Ljava/lang/String;Lio/fabric/sdk/android/a/e/e;)V
     .locals 6
 
-    sget v5, Lio/fabric/sdk/android/a/e/c;->bhB:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->bhV:I
 
     move-object v0, p0
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/b.smali b/com.discord/smali_classes2/io/fabric/sdk/android/b.smali
index 4490bb6257..2a7d018b83 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/b.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/b.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private beq:I
+.field private beK:I
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     const/4 v0, 0x3
 
-    iput v0, p0, Lio/fabric/sdk/android/b;->beq:I
+    iput v0, p0, Lio/fabric/sdk/android/b;->beK:I
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x4
 
-    iput p1, p0, Lio/fabric/sdk/android/b;->beq:I
+    iput p1, p0, Lio/fabric/sdk/android/b;->beK:I
 
     return-void
 .end method
@@ -128,7 +128,7 @@
 .method public final isLoggable(Ljava/lang/String;I)Z
     .locals 1
 
-    iget v0, p0, Lio/fabric/sdk/android/b;->beq:I
+    iget v0, p0, Lio/fabric/sdk/android/b;->beK:I
 
     if-le v0, p2, :cond_1
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/c$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/c$1.smali
index 0920ecbec8..dbf19c811c 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/c$1.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/c$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic beB:Lio/fabric/sdk/android/c;
+.field final synthetic beV:Lio/fabric/sdk/android/c;
 
 
 # direct methods
 .method constructor <init>(Lio/fabric/sdk/android/c;)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/c$1;->beB:Lio/fabric/sdk/android/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/c$1;->beV:Lio/fabric/sdk/android/c;
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a$b;-><init>()V
 
@@ -34,9 +34,9 @@
 .method public final a(Landroid/app/Activity;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->beB:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->beV:Lio/fabric/sdk/android/c;
 
-    invoke-virtual {v0, p1}, Lio/fabric/sdk/android/c;->h(Landroid/app/Activity;)Lio/fabric/sdk/android/c;
+    invoke-virtual {v0, p1}, Lio/fabric/sdk/android/c;->g(Landroid/app/Activity;)Lio/fabric/sdk/android/c;
 
     return-void
 .end method
@@ -44,9 +44,9 @@
 .method public final onActivityResumed(Landroid/app/Activity;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->beB:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->beV:Lio/fabric/sdk/android/c;
 
-    invoke-virtual {v0, p1}, Lio/fabric/sdk/android/c;->h(Landroid/app/Activity;)Lio/fabric/sdk/android/c;
+    invoke-virtual {v0, p1}, Lio/fabric/sdk/android/c;->g(Landroid/app/Activity;)Lio/fabric/sdk/android/c;
 
     return-void
 .end method
@@ -54,9 +54,9 @@
 .method public final onActivityStarted(Landroid/app/Activity;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->beB:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->beV:Lio/fabric/sdk/android/c;
 
-    invoke-virtual {v0, p1}, Lio/fabric/sdk/android/c;->h(Landroid/app/Activity;)Lio/fabric/sdk/android/c;
+    invoke-virtual {v0, p1}, Lio/fabric/sdk/android/c;->g(Landroid/app/Activity;)Lio/fabric/sdk/android/c;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/c$2.smali b/com.discord/smali_classes2/io/fabric/sdk/android/c$2.smali
index f0bfd80ae9..095df494f8 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/c$2.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/c$2.smali
@@ -18,44 +18,44 @@
 
 
 # instance fields
-.field final synthetic beB:Lio/fabric/sdk/android/c;
+.field final synthetic beV:Lio/fabric/sdk/android/c;
 
-.field final beC:Ljava/util/concurrent/CountDownLatch;
+.field final beW:Ljava/util/concurrent/CountDownLatch;
 
-.field final synthetic beD:I
+.field final synthetic beX:I
 
 
 # direct methods
 .method constructor <init>(Lio/fabric/sdk/android/c;I)V
     .locals 0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/c$2;->beB:Lio/fabric/sdk/android/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/c$2;->beV:Lio/fabric/sdk/android/c;
 
-    iput p2, p0, Lio/fabric/sdk/android/c$2;->beD:I
+    iput p2, p0, Lio/fabric/sdk/android/c$2;->beX:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     new-instance p1, Ljava/util/concurrent/CountDownLatch;
 
-    iget p2, p0, Lio/fabric/sdk/android/c$2;->beD:I
+    iget p2, p0, Lio/fabric/sdk/android/c$2;->beX:I
 
     invoke-direct {p1, p2}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/c$2;->beC:Ljava/util/concurrent/CountDownLatch;
+    iput-object p1, p0, Lio/fabric/sdk/android/c$2;->beW:Ljava/util/concurrent/CountDownLatch;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final CH()V
+.method public final Cy()V
     .locals 5
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->beC:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->beW:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->countDown()V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->beC:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->beW:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->getCount()J
 
@@ -67,7 +67,7 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->beB:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->beV:Lio/fabric/sdk/android/c;
 
     invoke-static {v0}, Lio/fabric/sdk/android/c;->a(Lio/fabric/sdk/android/c;)Ljava/util/concurrent/atomic/AtomicBoolean;
 
@@ -77,13 +77,13 @@
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->beB:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->beV:Lio/fabric/sdk/android/c;
 
     invoke-static {v0}, Lio/fabric/sdk/android/c;->b(Lio/fabric/sdk/android/c;)Lio/fabric/sdk/android/f;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/f;->CH()V
+    invoke-interface {v0}, Lio/fabric/sdk/android/f;->Cy()V
 
     :cond_0
     return-void
@@ -92,7 +92,7 @@
 .method public final i(Ljava/lang/Exception;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->beB:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->beV:Lio/fabric/sdk/android/c;
 
     invoke-static {v0}, Lio/fabric/sdk/android/c;->b(Lio/fabric/sdk/android/c;)Lio/fabric/sdk/android/f;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/c$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/c$a.smali
index 9e8045414d..182dfcc4d5 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/c$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/c$a.smali
@@ -15,17 +15,7 @@
 
 
 # instance fields
-.field beA:Z
-
-.field beE:[Lio/fabric/sdk/android/i;
-
-.field beF:Lio/fabric/sdk/android/a/c/k;
-
-.field beG:Ljava/lang/String;
-
-.field beH:Ljava/lang/String;
-
-.field beu:Lio/fabric/sdk/android/f;
+.field beO:Lio/fabric/sdk/android/f;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/f<",
@@ -35,7 +25,17 @@
     .end annotation
 .end field
 
-.field bez:Lio/fabric/sdk/android/l;
+.field beT:Lio/fabric/sdk/android/l;
+
+.field beU:Z
+
+.field beY:[Lio/fabric/sdk/android/i;
+
+.field beZ:Lio/fabric/sdk/android/a/c/k;
+
+.field bfa:Ljava/lang/String;
+
+.field bfb:Ljava/lang/String;
 
 .field final context:Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/c.smali b/com.discord/smali_classes2/io/fabric/sdk/android/c.smali
index 95942ab7f7..ea626a884b 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/c.smali
@@ -12,15 +12,13 @@
 
 
 # static fields
-.field static volatile ber:Lio/fabric/sdk/android/c;
+.field static volatile beL:Lio/fabric/sdk/android/c;
 
-.field static final bes:Lio/fabric/sdk/android/l;
+.field static final beM:Lio/fabric/sdk/android/l;
 
 
 # instance fields
-.field final beA:Z
-
-.field private final bet:Ljava/util/Map;
+.field private final beN:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -34,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final beu:Lio/fabric/sdk/android/f;
+.field private final beO:Lio/fabric/sdk/android/f;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/f<",
@@ -44,7 +42,7 @@
     .end annotation
 .end field
 
-.field private final bev:Lio/fabric/sdk/android/f;
+.field private final beP:Lio/fabric/sdk/android/f;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/f<",
@@ -53,9 +51,9 @@
     .end annotation
 .end field
 
-.field private bew:Lio/fabric/sdk/android/a;
+.field private beQ:Lio/fabric/sdk/android/a;
 
-.field public bex:Ljava/lang/ref/WeakReference;
+.field public beR:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -65,9 +63,11 @@
     .end annotation
 .end field
 
-.field private bey:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private beS:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final bez:Lio/fabric/sdk/android/l;
+.field final beT:Lio/fabric/sdk/android/l;
+
+.field final beU:Z
 
 .field private final context:Landroid/content/Context;
 
@@ -75,7 +75,7 @@
 
 .field private final mainHandler:Landroid/os/Handler;
 
-.field private final qv:Lio/fabric/sdk/android/a/b/s;
+.field private final qu:Lio/fabric/sdk/android/a/b/s;
 
 
 # direct methods
@@ -88,7 +88,7 @@
 
     invoke-direct {v0, v1}, Lio/fabric/sdk/android/b;-><init>(B)V
 
-    sput-object v0, Lio/fabric/sdk/android/c;->bes:Lio/fabric/sdk/android/l;
+    sput-object v0, Lio/fabric/sdk/android/c;->beM:Lio/fabric/sdk/android/l;
 
     return-void
 .end method
@@ -121,17 +121,17 @@
 
     iput-object p1, p0, Lio/fabric/sdk/android/c;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/c;->bet:Ljava/util/Map;
+    iput-object p2, p0, Lio/fabric/sdk/android/c;->beN:Ljava/util/Map;
 
     iput-object p3, p0, Lio/fabric/sdk/android/c;->executorService:Ljava/util/concurrent/ExecutorService;
 
     iput-object p4, p0, Lio/fabric/sdk/android/c;->mainHandler:Landroid/os/Handler;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/c;->bez:Lio/fabric/sdk/android/l;
+    iput-object p5, p0, Lio/fabric/sdk/android/c;->beT:Lio/fabric/sdk/android/l;
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/c;->beA:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/c;->beU:Z
 
-    iput-object p7, p0, Lio/fabric/sdk/android/c;->beu:Lio/fabric/sdk/android/f;
+    iput-object p7, p0, Lio/fabric/sdk/android/c;->beO:Lio/fabric/sdk/android/f;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicBoolean;
 
@@ -139,7 +139,7 @@
 
     invoke-direct {p1, p3}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/c;->bey:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lio/fabric/sdk/android/c;->beS:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-interface {p2}, Ljava/util/Map;->size()I
 
@@ -149,38 +149,38 @@
 
     invoke-direct {p2, p0, p1}, Lio/fabric/sdk/android/c$2;-><init>(Lio/fabric/sdk/android/c;I)V
 
-    iput-object p2, p0, Lio/fabric/sdk/android/c;->bev:Lio/fabric/sdk/android/f;
+    iput-object p2, p0, Lio/fabric/sdk/android/c;->beP:Lio/fabric/sdk/android/f;
 
-    iput-object p8, p0, Lio/fabric/sdk/android/c;->qv:Lio/fabric/sdk/android/a/b/s;
+    iput-object p8, p0, Lio/fabric/sdk/android/c;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    invoke-virtual {p0, p9}, Lio/fabric/sdk/android/c;->h(Landroid/app/Activity;)Lio/fabric/sdk/android/c;
+    invoke-virtual {p0, p9}, Lio/fabric/sdk/android/c;->g(Landroid/app/Activity;)Lio/fabric/sdk/android/c;
 
     return-void
 .end method
 
-.method public static CF()Lio/fabric/sdk/android/l;
+.method public static Cw()Lio/fabric/sdk/android/l;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/c;->ber:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->beL:Lio/fabric/sdk/android/c;
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lio/fabric/sdk/android/c;->bes:Lio/fabric/sdk/android/l;
+    sget-object v0, Lio/fabric/sdk/android/c;->beM:Lio/fabric/sdk/android/l;
 
     return-object v0
 
     :cond_0
-    sget-object v0, Lio/fabric/sdk/android/c;->ber:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->beL:Lio/fabric/sdk/android/c;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/c;->bez:Lio/fabric/sdk/android/l;
+    iget-object v0, v0, Lio/fabric/sdk/android/c;->beT:Lio/fabric/sdk/android/l;
 
     return-object v0
 .end method
 
-.method public static CG()Z
+.method public static Cx()Z
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/c;->ber:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->beL:Lio/fabric/sdk/android/c;
 
     if-nez v0, :cond_0
 
@@ -189,9 +189,9 @@
     return v0
 
     :cond_0
-    sget-object v0, Lio/fabric/sdk/android/c;->ber:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->beL:Lio/fabric/sdk/android/c;
 
-    iget-boolean v0, v0, Lio/fabric/sdk/android/c;->beA:Z
+    iget-boolean v0, v0, Lio/fabric/sdk/android/c;->beU:Z
 
     return v0
 .end method
@@ -208,13 +208,13 @@
         }
     .end annotation
 
-    sget-object v0, Lio/fabric/sdk/android/c;->ber:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->beL:Lio/fabric/sdk/android/c;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lio/fabric/sdk/android/c;->ber:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->beL:Lio/fabric/sdk/android/c;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/c;->bet:Ljava/util/Map;
+    iget-object v0, v0, Lio/fabric/sdk/android/c;->beN:Ljava/util/Map;
 
     invoke-interface {v0, p0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -237,7 +237,7 @@
 .method public static varargs a(Landroid/content/Context;[Lio/fabric/sdk/android/i;)Lio/fabric/sdk/android/c;
     .locals 13
 
-    sget-object v0, Lio/fabric/sdk/android/c;->ber:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->beL:Lio/fabric/sdk/android/c;
 
     if-nez v0, :cond_11
 
@@ -246,7 +246,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lio/fabric/sdk/android/c;->ber:Lio/fabric/sdk/android/c;
+    sget-object v1, Lio/fabric/sdk/android/c;->beL:Lio/fabric/sdk/android/c;
 
     if-nez v1, :cond_10
 
@@ -254,7 +254,7 @@
 
     invoke-direct {v1, p0}, Lio/fabric/sdk/android/c$a;-><init>(Landroid/content/Context;)V
 
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->beE:[Lio/fabric/sdk/android/i;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->beY:[Lio/fabric/sdk/android/i;
 
     if-nez p0, :cond_f
 
@@ -264,7 +264,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/l;->Db()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/l;->CS()Z
 
     move-result p0
 
@@ -341,7 +341,7 @@
 
     if-nez v5, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -376,17 +376,17 @@
     check-cast p1, [Lio/fabric/sdk/android/i;
 
     :cond_6
-    iput-object p1, v1, Lio/fabric/sdk/android/c$a;->beE:[Lio/fabric/sdk/android/i;
+    iput-object p1, v1, Lio/fabric/sdk/android/c$a;->beY:[Lio/fabric/sdk/android/i;
 
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->beF:Lio/fabric/sdk/android/a/c/k;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->beZ:Lio/fabric/sdk/android/a/c/k;
 
     if-nez p0, :cond_7
 
-    invoke-static {}, Lio/fabric/sdk/android/a/c/k;->Dq()Lio/fabric/sdk/android/a/c/k;
+    invoke-static {}, Lio/fabric/sdk/android/a/c/k;->Dg()Lio/fabric/sdk/android/a/c/k;
 
     move-result-object p0
 
-    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->beF:Lio/fabric/sdk/android/a/c/k;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->beZ:Lio/fabric/sdk/android/a/c/k;
 
     :cond_7
     iget-object p0, v1, Lio/fabric/sdk/android/c$a;->handler:Landroid/os/Handler;
@@ -404,11 +404,11 @@
     iput-object p0, v1, Lio/fabric/sdk/android/c$a;->handler:Landroid/os/Handler;
 
     :cond_8
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bez:Lio/fabric/sdk/android/l;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->beT:Lio/fabric/sdk/android/l;
 
     if-nez p0, :cond_a
 
-    iget-boolean p0, v1, Lio/fabric/sdk/android/c$a;->beA:Z
+    iget-boolean p0, v1, Lio/fabric/sdk/android/c$a;->beU:Z
 
     if-eqz p0, :cond_9
 
@@ -416,7 +416,7 @@
 
     invoke-direct {p0}, Lio/fabric/sdk/android/b;-><init>()V
 
-    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bez:Lio/fabric/sdk/android/l;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->beT:Lio/fabric/sdk/android/l;
 
     goto :goto_3
 
@@ -425,11 +425,11 @@
 
     invoke-direct {p0, v2}, Lio/fabric/sdk/android/b;-><init>(B)V
 
-    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bez:Lio/fabric/sdk/android/l;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->beT:Lio/fabric/sdk/android/l;
 
     :cond_a
     :goto_3
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->beH:Ljava/lang/String;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bfb:Ljava/lang/String;
 
     if-nez p0, :cond_b
 
@@ -439,19 +439,19 @@
 
     move-result-object p0
 
-    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->beH:Ljava/lang/String;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bfb:Ljava/lang/String;
 
     :cond_b
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->beu:Lio/fabric/sdk/android/f;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->beO:Lio/fabric/sdk/android/f;
 
     if-nez p0, :cond_c
 
-    sget-object p0, Lio/fabric/sdk/android/f;->beL:Lio/fabric/sdk/android/f;
+    sget-object p0, Lio/fabric/sdk/android/f;->bff:Lio/fabric/sdk/android/f;
 
-    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->beu:Lio/fabric/sdk/android/f;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->beO:Lio/fabric/sdk/android/f;
 
     :cond_c
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->beE:[Lio/fabric/sdk/android/i;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->beY:[Lio/fabric/sdk/android/i;
 
     if-nez p0, :cond_d
 
@@ -464,7 +464,7 @@
     goto :goto_4
 
     :cond_d
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->beE:[Lio/fabric/sdk/android/i;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->beY:[Lio/fabric/sdk/android/i;
 
     invoke-static {p0}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
 
@@ -491,9 +491,9 @@
 
     new-instance v11, Lio/fabric/sdk/android/a/b/s;
 
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->beH:Ljava/lang/String;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bfb:Ljava/lang/String;
 
-    iget-object p1, v1, Lio/fabric/sdk/android/c$a;->beG:Ljava/lang/String;
+    iget-object p1, v1, Lio/fabric/sdk/android/c$a;->bfa:Ljava/lang/String;
 
     invoke-interface {v5}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -503,15 +503,15 @@
 
     new-instance p0, Lio/fabric/sdk/android/c;
 
-    iget-object v6, v1, Lio/fabric/sdk/android/c$a;->beF:Lio/fabric/sdk/android/a/c/k;
+    iget-object v6, v1, Lio/fabric/sdk/android/c$a;->beZ:Lio/fabric/sdk/android/a/c/k;
 
     iget-object v7, v1, Lio/fabric/sdk/android/c$a;->handler:Landroid/os/Handler;
 
-    iget-object v8, v1, Lio/fabric/sdk/android/c$a;->bez:Lio/fabric/sdk/android/l;
+    iget-object v8, v1, Lio/fabric/sdk/android/c$a;->beT:Lio/fabric/sdk/android/l;
 
-    iget-boolean v9, v1, Lio/fabric/sdk/android/c$a;->beA:Z
+    iget-boolean v9, v1, Lio/fabric/sdk/android/c$a;->beU:Z
 
-    iget-object v10, v1, Lio/fabric/sdk/android/c$a;->beu:Lio/fabric/sdk/android/f;
+    iget-object v10, v1, Lio/fabric/sdk/android/c$a;->beO:Lio/fabric/sdk/android/f;
 
     iget-object p1, v1, Lio/fabric/sdk/android/c$a;->context:Landroid/content/Context;
 
@@ -533,7 +533,7 @@
 
     invoke-direct/range {v3 .. v12}, Lio/fabric/sdk/android/c;-><init>(Landroid/content/Context;Ljava/util/Map;Lio/fabric/sdk/android/a/c/k;Landroid/os/Handler;Lio/fabric/sdk/android/l;ZLio/fabric/sdk/android/f;Lio/fabric/sdk/android/a/b/s;Landroid/app/Activity;)V
 
-    sput-object p0, Lio/fabric/sdk/android/c;->ber:Lio/fabric/sdk/android/c;
+    sput-object p0, Lio/fabric/sdk/android/c;->beL:Lio/fabric/sdk/android/c;
 
     new-instance p1, Lio/fabric/sdk/android/a;
 
@@ -541,9 +541,9 @@
 
     invoke-direct {p1, v1}, Lio/fabric/sdk/android/a;-><init>(Landroid/content/Context;)V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/c;->bew:Lio/fabric/sdk/android/a;
+    iput-object p1, p0, Lio/fabric/sdk/android/c;->beQ:Lio/fabric/sdk/android/a;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/c;->bew:Lio/fabric/sdk/android/a;
+    iget-object p1, p0, Lio/fabric/sdk/android/c;->beQ:Lio/fabric/sdk/android/a;
 
     new-instance v1, Lio/fabric/sdk/android/c$1;
 
@@ -583,7 +583,7 @@
 
     :cond_11
     :goto_7
-    sget-object p0, Lio/fabric/sdk/android/c;->ber:Lio/fabric/sdk/android/c;
+    sget-object p0, Lio/fabric/sdk/android/c;->beL:Lio/fabric/sdk/android/c;
 
     return-object p0
 .end method
@@ -591,7 +591,7 @@
 .method static synthetic a(Lio/fabric/sdk/android/c;)Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 0
 
-    iget-object p0, p0, Lio/fabric/sdk/android/c;->bey:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p0, p0, Lio/fabric/sdk/android/c;->beS:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-object p0
 .end method
@@ -613,7 +613,7 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lio/fabric/sdk/android/i;->beO:Lio/fabric/sdk/android/a/c/d;
+    iget-object v0, p1, Lio/fabric/sdk/android/i;->bfi:Lio/fabric/sdk/android/a/c/d;
 
     if-eqz v0, :cond_4
 
@@ -668,9 +668,9 @@
 
     if-eqz v6, :cond_0
 
-    iget-object v6, p1, Lio/fabric/sdk/android/i;->beN:Lio/fabric/sdk/android/h;
+    iget-object v6, p1, Lio/fabric/sdk/android/i;->bfh:Lio/fabric/sdk/android/h;
 
-    iget-object v5, v5, Lio/fabric/sdk/android/i;->beN:Lio/fabric/sdk/android/h;
+    iget-object v5, v5, Lio/fabric/sdk/android/i;->bfh:Lio/fabric/sdk/android/h;
 
     invoke-virtual {v6, v5}, Lio/fabric/sdk/android/h;->a(Lio/fabric/sdk/android/a/c/l;)V
 
@@ -685,7 +685,7 @@
 
     if-eqz v4, :cond_3
 
-    iget-object v4, p1, Lio/fabric/sdk/android/i;->beN:Lio/fabric/sdk/android/h;
+    iget-object v4, p1, Lio/fabric/sdk/android/i;->bfh:Lio/fabric/sdk/android/h;
 
     invoke-interface {p0, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -693,7 +693,7 @@
 
     check-cast v3, Lio/fabric/sdk/android/i;
 
-    iget-object v3, v3, Lio/fabric/sdk/android/i;->beN:Lio/fabric/sdk/android/h;
+    iget-object v3, v3, Lio/fabric/sdk/android/i;->bfh:Lio/fabric/sdk/android/h;
 
     invoke-virtual {v4, v3}, Lio/fabric/sdk/android/h;->a(Lio/fabric/sdk/android/a/c/l;)V
 
@@ -793,7 +793,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lio/fabric/sdk/android/c;->bet:Ljava/util/Map;
+    iget-object v1, p0, Lio/fabric/sdk/android/c;->beN:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -809,9 +809,9 @@
 
     invoke-static {v0}, Ljava/util/Collections;->sort(Ljava/util/List;)V
 
-    sget-object v1, Lio/fabric/sdk/android/f;->beL:Lio/fabric/sdk/android/f;
+    sget-object v1, Lio/fabric/sdk/android/f;->bff:Lio/fabric/sdk/android/f;
 
-    iget-object v3, p0, Lio/fabric/sdk/android/c;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v3, p0, Lio/fabric/sdk/android/c;->qu:Lio/fabric/sdk/android/a/b/s;
 
     invoke-virtual {v2, p1, p0, v1, v3}, Lio/fabric/sdk/android/m;->a(Landroid/content/Context;Lio/fabric/sdk/android/c;Lio/fabric/sdk/android/f;Lio/fabric/sdk/android/a/b/s;)V
 
@@ -832,9 +832,9 @@
 
     check-cast v3, Lio/fabric/sdk/android/i;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/c;->bev:Lio/fabric/sdk/android/f;
+    iget-object v4, p0, Lio/fabric/sdk/android/c;->beP:Lio/fabric/sdk/android/f;
 
-    iget-object v5, p0, Lio/fabric/sdk/android/c;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v5, p0, Lio/fabric/sdk/android/c;->qu:Lio/fabric/sdk/android/a/b/s;
 
     invoke-virtual {v3, p1, p0, v4, v5}, Lio/fabric/sdk/android/i;->a(Landroid/content/Context;Lio/fabric/sdk/android/c;Lio/fabric/sdk/android/f;Lio/fabric/sdk/android/a/b/s;)V
 
@@ -843,7 +843,7 @@
     :cond_0
     invoke-virtual {v2}, Lio/fabric/sdk/android/m;->initialize()V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -891,13 +891,13 @@
 
     check-cast v1, Lio/fabric/sdk/android/i;
 
-    iget-object v4, v1, Lio/fabric/sdk/android/i;->beN:Lio/fabric/sdk/android/h;
+    iget-object v4, v1, Lio/fabric/sdk/android/i;->bfh:Lio/fabric/sdk/android/h;
 
-    iget-object v5, v2, Lio/fabric/sdk/android/m;->beN:Lio/fabric/sdk/android/h;
+    iget-object v5, v2, Lio/fabric/sdk/android/m;->bfh:Lio/fabric/sdk/android/h;
 
     invoke-virtual {v4, v5}, Lio/fabric/sdk/android/h;->a(Lio/fabric/sdk/android/a/c/l;)V
 
-    iget-object v4, p0, Lio/fabric/sdk/android/c;->bet:Ljava/util/Map;
+    iget-object v4, p0, Lio/fabric/sdk/android/c;->beN:Ljava/util/Map;
 
     invoke-static {v4, v1}, Lio/fabric/sdk/android/c;->a(Ljava/util/Map;Lio/fabric/sdk/android/i;)V
 
@@ -930,7 +930,7 @@
     :cond_3
     if-eqz p1, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -947,21 +947,21 @@
 .method static synthetic b(Lio/fabric/sdk/android/c;)Lio/fabric/sdk/android/f;
     .locals 0
 
-    iget-object p0, p0, Lio/fabric/sdk/android/c;->beu:Lio/fabric/sdk/android/f;
+    iget-object p0, p0, Lio/fabric/sdk/android/c;->beO:Lio/fabric/sdk/android/f;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method public final h(Landroid/app/Activity;)Lio/fabric/sdk/android/c;
+.method public final g(Landroid/app/Activity;)Lio/fabric/sdk/android/c;
     .locals 1
 
     new-instance v0, Ljava/lang/ref/WeakReference;
 
     invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/c;->bex:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lio/fabric/sdk/android/c;->beR:Ljava/lang/ref/WeakReference;
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/d.smali b/com.discord/smali_classes2/io/fabric/sdk/android/d.smali
index f517d24f3a..23374dcdf9 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/d.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/d.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final beI:Ljava/lang/String;
+.field private final bfc:Ljava/lang/String;
 
-.field private final beJ:Ljava/lang/String;
+.field private final bfd:Ljava/lang/String;
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0, p1}, Landroid/content/ContextWrapper;-><init>(Landroid/content/Context;)V
 
-    iput-object p2, p0, Lio/fabric/sdk/android/d;->beJ:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/d;->bfd:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/d;->beI:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/d;->bfc:Ljava/lang/String;
 
     return-void
 .end method
@@ -33,7 +33,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lio/fabric/sdk/android/d;->beI:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/d;->bfc:Ljava/lang/String;
 
     invoke-direct {v0, v1, v2}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
@@ -53,7 +53,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lio/fabric/sdk/android/d;->beI:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/d;->bfc:Ljava/lang/String;
 
     invoke-direct {v0, v1, v2}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
@@ -75,7 +75,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lio/fabric/sdk/android/d;->beI:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/d;->bfc:Ljava/lang/String;
 
     invoke-direct {v0, v1, v2}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
@@ -91,7 +91,7 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lio/fabric/sdk/android/d;->beI:Ljava/lang/String;
+    iget-object v1, p0, Lio/fabric/sdk/android/d;->bfc:Ljava/lang/String;
 
     invoke-direct {v0, p1, v1}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
@@ -107,7 +107,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lio/fabric/sdk/android/d;->beI:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/d;->bfc:Ljava/lang/String;
 
     invoke-direct {v0, v1, v2}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
@@ -121,7 +121,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/d;->beJ:Ljava/lang/String;
+    iget-object v1, p0, Lio/fabric/sdk/android/d;->bfd:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/e.smali b/com.discord/smali_classes2/io/fabric/sdk/android/e.smali
index a7d2d0613c..6052957244 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/e.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/e.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field final beK:Ljava/lang/String;
+.field final bfe:Ljava/lang/String;
 
 
 # direct methods
@@ -29,63 +29,12 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/e;->beK:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/e;->bfe:Ljava/lang/String;
 
     return-void
 .end method
 
-.method private static CI()Ljava/util/Map;
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Lio/fabric/sdk/android/k;",
-            ">;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/util/HashMap;
-
-    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
-
-    :try_start_0
-    const-string v1, "com.google.android.gms.ads.AdView"
-
-    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    new-instance v1, Lio/fabric/sdk/android/k;
-
-    const-string v2, "com.google.firebase.firebase-ads"
-
-    const-string v3, "0.0.0"
-
-    const-string v4, "binary"
-
-    invoke-direct {v1, v2, v3, v4}, Lio/fabric/sdk/android/k;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-
-    iget-object v2, v1, Lio/fabric/sdk/android/k;->sJ:Ljava/lang/String;
-
-    invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
-
-    move-result-object v1
-
-    const-string v2, "Fabric"
-
-    const-string v3, "Found kit: com.google.firebase.firebase-ads"
-
-    invoke-interface {v1, v2, v3}, Lio/fabric/sdk/android/l;->v(Ljava/lang/String;Ljava/lang/String;)V
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    return-object v0
-.end method
-
-.method private CJ()Ljava/util/Map;
+.method private CA()Ljava/util/Map;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -109,7 +58,7 @@
 
     new-instance v1, Ljava/util/zip/ZipFile;
 
-    iget-object v2, p0, Lio/fabric/sdk/android/e;->beK:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/e;->bfe:Ljava/lang/String;
 
     invoke-direct {v1, v2}, Ljava/util/zip/ZipFile;-><init>(Ljava/lang/String;)V
 
@@ -161,11 +110,11 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v4, v3, Lio/fabric/sdk/android/k;->sJ:Ljava/lang/String;
+    iget-object v4, v3, Lio/fabric/sdk/android/k;->sI:Ljava/lang/String;
 
     invoke-interface {v0, v4, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -175,7 +124,7 @@
 
     const/4 v6, 0x0
 
-    iget-object v7, v3, Lio/fabric/sdk/android/k;->sJ:Ljava/lang/String;
+    iget-object v7, v3, Lio/fabric/sdk/android/k;->sI:Ljava/lang/String;
 
     aput-object v7, v5, v6
 
@@ -207,6 +156,57 @@
     return-object v0
 .end method
 
+.method private static Cz()Ljava/util/Map;
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Lio/fabric/sdk/android/k;",
+            ">;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/util/HashMap;
+
+    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
+
+    :try_start_0
+    const-string v1, "com.google.android.gms.ads.AdView"
+
+    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    new-instance v1, Lio/fabric/sdk/android/k;
+
+    const-string v2, "com.google.firebase.firebase-ads"
+
+    const-string v3, "0.0.0"
+
+    const-string v4, "binary"
+
+    invoke-direct {v1, v2, v3, v4}, Lio/fabric/sdk/android/k;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    iget-object v2, v1, Lio/fabric/sdk/android/k;->sI:Ljava/lang/String;
+
+    invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
+
+    move-result-object v1
+
+    const-string v2, "Fabric"
+
+    const-string v3, "Found kit: com.google.firebase.firebase-ads"
+
+    invoke-interface {v1, v2, v3}, Lio/fabric/sdk/android/l;->v(Ljava/lang/String;Ljava/lang/String;)V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    return-object v0
+.end method
+
 .method private static a(Ljava/util/zip/ZipEntry;Ljava/util/zip/ZipFile;)Lio/fabric/sdk/android/k;
     .locals 6
 
@@ -319,7 +319,7 @@
 
     :goto_0
     :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -373,19 +373,19 @@
 
     move-result-wide v1
 
-    invoke-static {}, Lio/fabric/sdk/android/e;->CI()Ljava/util/Map;
+    invoke-static {}, Lio/fabric/sdk/android/e;->Cz()Ljava/util/Map;
 
     move-result-object v3
 
     invoke-interface {v0, v3}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/e;->CJ()Ljava/util/Map;
+    invoke-direct {p0}, Lio/fabric/sdk/android/e;->CA()Ljava/util/Map;
 
     move-result-object v3
 
     invoke-interface {v0, v3}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/f$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/f$a.smali
index ca796d4a5b..3c36c6deb2 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/f$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/f$a.smali
@@ -45,7 +45,7 @@
 
 
 # virtual methods
-.method public final CH()V
+.method public final Cy()V
     .locals 0
 
     return-void
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/f.smali b/com.discord/smali_classes2/io/fabric/sdk/android/f.smali
index 791b4565fa..76bd692f73 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/f.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/f.smali
@@ -21,7 +21,7 @@
 
 
 # static fields
-.field public static final beL:Lio/fabric/sdk/android/f;
+.field public static final bff:Lio/fabric/sdk/android/f;
 
 
 # direct methods
@@ -34,14 +34,14 @@
 
     invoke-direct {v0, v1}, Lio/fabric/sdk/android/f$a;-><init>(B)V
 
-    sput-object v0, Lio/fabric/sdk/android/f;->beL:Lio/fabric/sdk/android/f;
+    sput-object v0, Lio/fabric/sdk/android/f;->bff:Lio/fabric/sdk/android/f;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public abstract CH()V
+.method public abstract Cy()V
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()V"
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/h.smali b/com.discord/smali_classes2/io/fabric/sdk/android/h.smali
index 123d73d323..6ad2b39d20 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/h.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/h.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final oS:Lio/fabric/sdk/android/i;
+.field final oR:Lio/fabric/sdk/android/i;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/i<",
@@ -41,12 +41,12 @@
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a/c/f;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/h;->oS:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lio/fabric/sdk/android/h;->oR:Lio/fabric/sdk/android/i;
 
     return-void
 .end method
 
-.method private dF(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/x;
+.method private dz(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/x;
     .locals 3
 
     new-instance v0, Lio/fabric/sdk/android/a/b/x;
@@ -55,7 +55,7 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v2, p0, Lio/fabric/sdk/android/h;->oS:Lio/fabric/sdk/android/i;
+    iget-object v2, p0, Lio/fabric/sdk/android/h;->oR:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v2}, Lio/fabric/sdk/android/i;->getIdentifier()Ljava/lang/String;
 
@@ -77,14 +77,14 @@
 
     invoke-direct {v0, p1, v1}, Lio/fabric/sdk/android/a/b/x;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Df()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->CV()V
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method public final CK()V
+.method public final CB()V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -92,16 +92,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/h;->oS:Lio/fabric/sdk/android/i;
+    iget-object v0, p0, Lio/fabric/sdk/android/h;->oR:Lio/fabric/sdk/android/i;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/i;->beu:Lio/fabric/sdk/android/f;
+    iget-object v0, v0, Lio/fabric/sdk/android/i;->beO:Lio/fabric/sdk/android/f;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/f;->CH()V
+    invoke-interface {v0}, Lio/fabric/sdk/android/f;->Cy()V
 
     return-void
 .end method
 
-.method public final CL()V
+.method public final CC()V
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -113,7 +113,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/h;->oS:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/h;->oR:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->getIdentifier()Ljava/lang/String;
 
@@ -133,25 +133,25 @@
 
     invoke-direct {v1, v0}, Lio/fabric/sdk/android/g;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/h;->oS:Lio/fabric/sdk/android/i;
+    iget-object v0, p0, Lio/fabric/sdk/android/h;->oR:Lio/fabric/sdk/android/i;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/i;->beu:Lio/fabric/sdk/android/f;
+    iget-object v0, v0, Lio/fabric/sdk/android/i;->beO:Lio/fabric/sdk/android/f;
 
     invoke-interface {v0, v1}, Lio/fabric/sdk/android/f;->i(Ljava/lang/Exception;)V
 
     return-void
 .end method
 
-.method public final synthetic CM()Ljava/lang/Object;
+.method public final synthetic CD()Ljava/lang/Object;
     .locals 2
 
     const-string v0, "doInBackground"
 
-    invoke-direct {p0, v0}, Lio/fabric/sdk/android/h;->dF(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/x;
+    invoke-direct {p0, v0}, Lio/fabric/sdk/android/h;->dz(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/x;
 
     move-result-object v0
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a;->bgD:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a;->bgX:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -159,7 +159,7 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lio/fabric/sdk/android/h;->oS:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/h;->oR:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->bS()Ljava/lang/Object;
 
@@ -171,7 +171,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Dg()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->CW()V
 
     return-object v1
 .end method
@@ -179,7 +179,7 @@
 .method public final cI()I
     .locals 1
 
-    sget v0, Lio/fabric/sdk/android/a/c/e;->bgV:I
+    sget v0, Lio/fabric/sdk/android/a/c/e;->bhp:I
 
     return v0
 .end method
@@ -191,12 +191,12 @@
 
     const-string v0, "onPreExecute"
 
-    invoke-direct {p0, v0}, Lio/fabric/sdk/android/h;->dF(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/x;
+    invoke-direct {p0, v0}, Lio/fabric/sdk/android/h;->dz(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/x;
 
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lio/fabric/sdk/android/h;->oS:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/h;->oR:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->bV()Z
 
@@ -206,11 +206,11 @@
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Dg()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->CW()V
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Dh()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->CX()Z
 
     :cond_0
     return-void
@@ -224,7 +224,7 @@
     move-exception v1
 
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -236,9 +236,9 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Dg()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->CW()V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Dh()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->CX()Z
 
     return-void
 
@@ -251,9 +251,9 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :goto_0
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Dg()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->CW()V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Dh()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->CX()Z
 
     throw v1
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/i.smali b/com.discord/smali_classes2/io/fabric/sdk/android/i.smali
index 5af9394e97..c158e31a65 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/i.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/i.smali
@@ -21,20 +21,7 @@
 
 
 # instance fields
-.field public beM:Lio/fabric/sdk/android/c;
-
-.field protected beN:Lio/fabric/sdk/android/h;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lio/fabric/sdk/android/h<",
-            "TResult;>;"
-        }
-    .end annotation
-.end field
-
-.field final beO:Lio/fabric/sdk/android/a/c/d;
-
-.field beu:Lio/fabric/sdk/android/f;
+.field beO:Lio/fabric/sdk/android/f;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/f<",
@@ -43,9 +30,22 @@
     .end annotation
 .end field
 
+.field public bfg:Lio/fabric/sdk/android/c;
+
+.field protected bfh:Lio/fabric/sdk/android/h;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lio/fabric/sdk/android/h<",
+            "TResult;>;"
+        }
+    .end annotation
+.end field
+
+.field final bfi:Lio/fabric/sdk/android/a/c/d;
+
 .field public context:Landroid/content/Context;
 
-.field protected qv:Lio/fabric/sdk/android/a/b/s;
+.field protected qu:Lio/fabric/sdk/android/a/b/s;
 
 
 # direct methods
@@ -58,7 +58,7 @@
 
     invoke-direct {v0, p0}, Lio/fabric/sdk/android/h;-><init>(Lio/fabric/sdk/android/i;)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/i;->beN:Lio/fabric/sdk/android/h;
+    iput-object v0, p0, Lio/fabric/sdk/android/i;->bfh:Lio/fabric/sdk/android/h;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -72,15 +72,15 @@
 
     check-cast v0, Lio/fabric/sdk/android/a/c/d;
 
-    iput-object v0, p0, Lio/fabric/sdk/android/i;->beO:Lio/fabric/sdk/android/a/c/d;
+    iput-object v0, p0, Lio/fabric/sdk/android/i;->bfi:Lio/fabric/sdk/android/a/c/d;
 
     return-void
 .end method
 
-.method private CN()Z
+.method private CE()Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/i;->beO:Lio/fabric/sdk/android/a/c/d;
+    iget-object v0, p0, Lio/fabric/sdk/android/i;->bfi:Lio/fabric/sdk/android/a/c/d;
 
     if-eqz v0, :cond_0
 
@@ -97,7 +97,7 @@
 .method private a(Lio/fabric/sdk/android/i;)Z
     .locals 6
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/i;->CN()Z
+    invoke-direct {p0}, Lio/fabric/sdk/android/i;->CE()Z
 
     move-result v0
 
@@ -105,7 +105,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/i;->beO:Lio/fabric/sdk/android/a/c/d;
+    iget-object v0, p0, Lio/fabric/sdk/android/i;->bfi:Lio/fabric/sdk/android/a/c/d;
 
     invoke-interface {v0}, Lio/fabric/sdk/android/a/c/d;->value()[Ljava/lang/Class;
 
@@ -159,7 +159,7 @@
         }
     .end annotation
 
-    iput-object p2, p0, Lio/fabric/sdk/android/i;->beM:Lio/fabric/sdk/android/c;
+    iput-object p2, p0, Lio/fabric/sdk/android/i;->bfg:Lio/fabric/sdk/android/c;
 
     new-instance p2, Lio/fabric/sdk/android/d;
 
@@ -175,9 +175,9 @@
 
     iput-object p2, p0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/i;->beu:Lio/fabric/sdk/android/f;
+    iput-object p3, p0, Lio/fabric/sdk/android/i;->beO:Lio/fabric/sdk/android/f;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/i;->qv:Lio/fabric/sdk/android/a/b/s;
+    iput-object p4, p0, Lio/fabric/sdk/android/i;->qu:Lio/fabric/sdk/android/a/b/s;
 
     return-void
 .end method
@@ -225,13 +225,13 @@
     return v2
 
     :cond_1
-    invoke-direct {p0}, Lio/fabric/sdk/android/i;->CN()Z
+    invoke-direct {p0}, Lio/fabric/sdk/android/i;->CE()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    invoke-direct {p1}, Lio/fabric/sdk/android/i;->CN()Z
+    invoke-direct {p1}, Lio/fabric/sdk/android/i;->CE()Z
 
     move-result v0
 
@@ -240,13 +240,13 @@
     return v1
 
     :cond_2
-    invoke-direct {p0}, Lio/fabric/sdk/android/i;->CN()Z
+    invoke-direct {p0}, Lio/fabric/sdk/android/i;->CE()Z
 
     move-result v0
 
     if-nez v0, :cond_3
 
-    invoke-direct {p1}, Lio/fabric/sdk/android/i;->CN()Z
+    invoke-direct {p1}, Lio/fabric/sdk/android/i;->CE()Z
 
     move-result p1
 
@@ -295,9 +295,9 @@
 .method final initialize()V
     .locals 5
 
-    iget-object v0, p0, Lio/fabric/sdk/android/i;->beN:Lio/fabric/sdk/android/h;
+    iget-object v0, p0, Lio/fabric/sdk/android/i;->bfh:Lio/fabric/sdk/android/h;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/i;->beM:Lio/fabric/sdk/android/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/i;->bfg:Lio/fabric/sdk/android/c;
 
     iget-object v1, v1, Lio/fabric/sdk/android/c;->executorService:Ljava/util/concurrent/ExecutorService;
 
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/k.smali b/com.discord/smali_classes2/io/fabric/sdk/android/k.smali
index 91c96f2a48..43b4b7c5c4 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/k.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/k.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field public final beP:Ljava/lang/String;
+.field public final bfj:Ljava/lang/String;
 
-.field public final sJ:Ljava/lang/String;
+.field public final sI:Ljava/lang/String;
 
 .field public final version:Ljava/lang/String;
 
@@ -17,11 +17,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/k;->sJ:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/k;->sI:Ljava/lang/String;
 
     iput-object p2, p0, Lio/fabric/sdk/android/k;->version:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/k;->beP:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/k;->bfj:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/io/fabric/sdk/android/m.smali b/com.discord/smali_classes2/io/fabric/sdk/android/m.smali
index 85a003ff37..f41f2b65e1 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/m.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/m.smali
@@ -14,15 +14,15 @@
 
 
 # instance fields
-.field private beQ:Landroid/content/pm/PackageManager;
+.field private bfk:Landroid/content/pm/PackageManager;
 
-.field private beR:Landroid/content/pm/PackageInfo;
+.field private bfl:Landroid/content/pm/PackageInfo;
 
-.field private beS:Ljava/lang/String;
+.field private bfm:Ljava/lang/String;
 
-.field private beT:Ljava/lang/String;
+.field private bfn:Ljava/lang/String;
 
-.field private final beU:Ljava/util/concurrent/Future;
+.field private final bfo:Ljava/util/concurrent/Future;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/Future<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private final beV:Ljava/util/Collection;
+.field private final bfp:Ljava/util/Collection;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Collection<",
@@ -46,11 +46,11 @@
 
 .field private installerPackageName:Ljava/lang/String;
 
-.field private final oV:Lio/fabric/sdk/android/a/e/e;
+.field private final oU:Lio/fabric/sdk/android/a/e/e;
 
 .field private packageName:Ljava/lang/String;
 
-.field private qw:Ljava/lang/String;
+.field private qv:Ljava/lang/String;
 
 .field private versionName:Ljava/lang/String;
 
@@ -78,32 +78,32 @@
 
     invoke-direct {v0}, Lio/fabric/sdk/android/a/e/b;-><init>()V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/m;->oV:Lio/fabric/sdk/android/a/e/e;
+    iput-object v0, p0, Lio/fabric/sdk/android/m;->oU:Lio/fabric/sdk/android/a/e/e;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/m;->beU:Ljava/util/concurrent/Future;
+    iput-object p1, p0, Lio/fabric/sdk/android/m;->bfo:Ljava/util/concurrent/Future;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/m;->beV:Ljava/util/Collection;
+    iput-object p2, p0, Lio/fabric/sdk/android/m;->bfp:Ljava/util/Collection;
 
     return-void
 .end method
 
-.method private CO()Lio/fabric/sdk/android/a/g/t;
+.method private CF()Lio/fabric/sdk/android/a/g/t;
     .locals 8
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DV()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DL()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    iget-object v2, p0, Lio/fabric/sdk/android/m;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v2, p0, Lio/fabric/sdk/android/m;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v3, p0, Lio/fabric/sdk/android/m;->oV:Lio/fabric/sdk/android/a/e/e;
+    iget-object v3, p0, Lio/fabric/sdk/android/m;->oU:Lio/fabric/sdk/android/a/e/e;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/m;->qw:Ljava/lang/String;
+    iget-object v4, p0, Lio/fabric/sdk/android/m;->qv:Ljava/lang/String;
 
     iget-object v5, p0, Lio/fabric/sdk/android/m;->versionName:Ljava/lang/String;
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/m;->CP()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/m;->CG()Ljava/lang/String;
 
     move-result-object v6
 
@@ -119,13 +119,13 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->DT()Z
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->DJ()Z
 
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DV()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DL()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->DS()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->DI()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v0
     :try_end_0
@@ -136,7 +136,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -151,7 +151,7 @@
     return-object v0
 .end method
 
-.method private CP()Ljava/lang/String;
+.method private CG()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
@@ -208,25 +208,25 @@
 
     iget-object v1, v0, Lio/fabric/sdk/android/m;->installerPackageName:Ljava/lang/String;
 
-    invoke-static {v1}, Lio/fabric/sdk/android/a/b/m;->dH(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/m;
+    invoke-static {v1}, Lio/fabric/sdk/android/a/b/m;->dB(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/m;
 
     move-result-object v1
 
     iget v10, v1, Lio/fabric/sdk/android/a/b/m;->id:I
 
-    iget-object v1, v0, Lio/fabric/sdk/android/i;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, v0, Lio/fabric/sdk/android/i;->qu:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v5, v1, Lio/fabric/sdk/android/a/b/s;->beH:Ljava/lang/String;
+    iget-object v5, v1, Lio/fabric/sdk/android/a/b/s;->bfb:Ljava/lang/String;
 
     new-instance v1, Lio/fabric/sdk/android/a/g/d;
 
     iget-object v6, v0, Lio/fabric/sdk/android/m;->versionName:Ljava/lang/String;
 
-    iget-object v7, v0, Lio/fabric/sdk/android/m;->qw:Ljava/lang/String;
+    iget-object v7, v0, Lio/fabric/sdk/android/m;->qv:Ljava/lang/String;
 
-    iget-object v9, v0, Lio/fabric/sdk/android/m;->beS:Ljava/lang/String;
+    iget-object v9, v0, Lio/fabric/sdk/android/m;->bfm:Ljava/lang/String;
 
-    iget-object v11, v0, Lio/fabric/sdk/android/m;->beT:Ljava/lang/String;
+    iget-object v11, v0, Lio/fabric/sdk/android/m;->bfn:Ljava/lang/String;
 
     const-string v12, "0"
 
@@ -325,7 +325,7 @@
 
     move-result-object v1
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/m;->CO()Lio/fabric/sdk/android/a/g/t;
+    invoke-direct {p0}, Lio/fabric/sdk/android/m;->CF()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v2
 
@@ -334,11 +334,11 @@
     if-eqz v2, :cond_5
 
     :try_start_0
-    iget-object v4, p0, Lio/fabric/sdk/android/m;->beU:Ljava/util/concurrent/Future;
+    iget-object v4, p0, Lio/fabric/sdk/android/m;->bfo:Ljava/util/concurrent/Future;
 
     if-eqz v4, :cond_0
 
-    iget-object v4, p0, Lio/fabric/sdk/android/m;->beU:Ljava/util/concurrent/Future;
+    iget-object v4, p0, Lio/fabric/sdk/android/m;->bfo:Ljava/util/concurrent/Future;
 
     invoke-interface {v4}, Ljava/util/concurrent/Future;->get()Ljava/lang/Object;
 
@@ -354,13 +354,13 @@
     invoke-direct {v4}, Ljava/util/HashMap;-><init>()V
 
     :goto_0
-    iget-object v5, p0, Lio/fabric/sdk/android/m;->beV:Ljava/util/Collection;
+    iget-object v5, p0, Lio/fabric/sdk/android/m;->bfp:Ljava/util/Collection;
 
     invoke-static {v4, v5}, Lio/fabric/sdk/android/m;->b(Ljava/util/Map;Ljava/util/Collection;)Ljava/util/Map;
 
     move-result-object v4
 
-    iget-object v2, v2, Lio/fabric/sdk/android/a/g/t;->bjh:Lio/fabric/sdk/android/a/g/e;
+    iget-object v2, v2, Lio/fabric/sdk/android/a/g/t;->bjB:Lio/fabric/sdk/android/a/g/e;
 
     invoke-interface {v4}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -390,13 +390,13 @@
 
     new-instance v4, Lio/fabric/sdk/android/a/g/h;
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/m;->CP()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/m;->CG()Ljava/lang/String;
 
     move-result-object v5
 
     iget-object v2, v2, Lio/fabric/sdk/android/a/g/e;->url:Ljava/lang/String;
 
-    iget-object v6, p0, Lio/fabric/sdk/android/m;->oV:Lio/fabric/sdk/android/a/e/e;
+    iget-object v6, p0, Lio/fabric/sdk/android/m;->oU:Lio/fabric/sdk/android/a/e/e;
 
     invoke-direct {v4, p0, v5, v2, v6}, Lio/fabric/sdk/android/a/g/h;-><init>(Lio/fabric/sdk/android/i;Ljava/lang/String;Ljava/lang/String;Lio/fabric/sdk/android/a/e/e;)V
 
@@ -406,18 +406,18 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DV()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DL()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->DU()Z
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->DK()Z
 
     move-result v0
 
     goto :goto_1
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -440,11 +440,11 @@
 
     if-eqz v6, :cond_3
 
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DV()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->DL()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->DU()Z
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->DK()Z
 
     move-result v0
 
@@ -454,11 +454,11 @@
     goto :goto_2
 
     :cond_3
-    iget-boolean v6, v2, Lio/fabric/sdk/android/a/g/e;->biy:Z
+    iget-boolean v6, v2, Lio/fabric/sdk/android/a/g/e;->biS:Z
 
     if-eqz v6, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v6
 
@@ -478,13 +478,13 @@
 
     new-instance v4, Lio/fabric/sdk/android/a/g/y;
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/m;->CP()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/m;->CG()Ljava/lang/String;
 
     move-result-object v6
 
     iget-object v2, v2, Lio/fabric/sdk/android/a/g/e;->url:Ljava/lang/String;
 
-    iget-object v7, p0, Lio/fabric/sdk/android/m;->oV:Lio/fabric/sdk/android/a/e/e;
+    iget-object v7, p0, Lio/fabric/sdk/android/m;->oU:Lio/fabric/sdk/android/a/e/e;
 
     invoke-direct {v4, p0, v6, v2, v7}, Lio/fabric/sdk/android/a/g/y;-><init>(Lio/fabric/sdk/android/i;Ljava/lang/String;Ljava/lang/String;Lio/fabric/sdk/android/a/e/e;)V
 
@@ -500,7 +500,7 @@
     :catch_0
     move-exception v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -535,7 +535,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lio/fabric/sdk/android/i;->qv:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, p0, Lio/fabric/sdk/android/i;->qu:Lio/fabric/sdk/android/a/b/s;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/s;->getInstallerPackageName()Ljava/lang/String;
 
@@ -549,7 +549,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lio/fabric/sdk/android/m;->beQ:Landroid/content/pm/PackageManager;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->bfk:Landroid/content/pm/PackageManager;
 
     iget-object v1, p0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -559,7 +559,7 @@
 
     iput-object v1, p0, Lio/fabric/sdk/android/m;->packageName:Ljava/lang/String;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/m;->beQ:Landroid/content/pm/PackageManager;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bfk:Landroid/content/pm/PackageManager;
 
     iget-object v2, p0, Lio/fabric/sdk/android/m;->packageName:Ljava/lang/String;
 
@@ -567,9 +567,9 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lio/fabric/sdk/android/m;->beR:Landroid/content/pm/PackageInfo;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->bfl:Landroid/content/pm/PackageInfo;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/m;->beR:Landroid/content/pm/PackageInfo;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bfl:Landroid/content/pm/PackageInfo;
 
     iget v1, v1, Landroid/content/pm/PackageInfo;->versionCode:I
 
@@ -577,9 +577,9 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lio/fabric/sdk/android/m;->qw:Ljava/lang/String;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->qv:Ljava/lang/String;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/m;->beR:Landroid/content/pm/PackageInfo;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bfl:Landroid/content/pm/PackageInfo;
 
     iget-object v1, v1, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
 
@@ -590,14 +590,14 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lio/fabric/sdk/android/m;->beR:Landroid/content/pm/PackageInfo;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bfl:Landroid/content/pm/PackageInfo;
 
     iget-object v1, v1, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
 
     :goto_0
     iput-object v1, p0, Lio/fabric/sdk/android/m;->versionName:Ljava/lang/String;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/m;->beQ:Landroid/content/pm/PackageManager;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bfk:Landroid/content/pm/PackageManager;
 
     iget-object v2, p0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -613,7 +613,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lio/fabric/sdk/android/m;->beS:Ljava/lang/String;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->bfm:Ljava/lang/String;
 
     iget-object v1, p0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -627,7 +627,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lio/fabric/sdk/android/m;->beT:Ljava/lang/String;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->bfn:Ljava/lang/String;
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -638,7 +638,7 @@
     :catch_0
     move-exception v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->CF()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->Cw()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/jp/wasabeef/fresco/a/a.smali b/com.discord/smali_classes2/jp/wasabeef/fresco/a/a.smali
index 25162dd783..cb21cd77df 100644
--- a/com.discord/smali_classes2/jp/wasabeef/fresco/a/a.smali
+++ b/com.discord/smali_classes2/jp/wasabeef/fresco/a/a.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static bjt:I = 0x19
+.field private static bjN:I = 0x19
 
-.field private static bju:I = 0x1
+.field private static bjO:I = 0x1
 
 
 # instance fields
-.field private bjv:I
+.field private bjP:I
 
 .field private context:Landroid/content/Context;
 
@@ -27,7 +27,7 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 2
 
-    sget v0, Ljp/wasabeef/fresco/a/a;->bju:I
+    sget v0, Ljp/wasabeef/fresco/a/a;->bjO:I
 
     const/16 v1, 0xa
 
@@ -51,7 +51,7 @@
 
     iput p1, p0, Ljp/wasabeef/fresco/a/a;->radius:I
 
-    iput p3, p0, Ljp/wasabeef/fresco/a/a;->bjv:I
+    iput p3, p0, Ljp/wasabeef/fresco/a/a;->bjP:I
 
     return-void
 .end method
@@ -91,7 +91,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bjv:I
+    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bjP:I
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -115,7 +115,7 @@
 
     move-result v1
 
-    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bjv:I
+    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bjP:I
 
     div-int/2addr v0, v2
 
@@ -131,7 +131,7 @@
 
     invoke-direct {v1, v0}, Landroid/graphics/Canvas;-><init>(Landroid/graphics/Bitmap;)V
 
-    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bjv:I
+    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bjP:I
 
     int-to-float v3, v2
 
diff --git a/com.discord/smali_classes2/jp/wasabeef/fresco/a/c$a.smali b/com.discord/smali_classes2/jp/wasabeef/fresco/a/c$a.smali
index 4a005581cf..7fef7c1755 100644
--- a/com.discord/smali_classes2/jp/wasabeef/fresco/a/c$a.smali
+++ b/com.discord/smali_classes2/jp/wasabeef/fresco/a/c$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private bjx:Ljava/util/List;
+.field public bjR:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -36,31 +36,17 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Ljp/wasabeef/fresco/a/c$a;->bjx:Ljava/util/List;
+    iput-object v0, p0, Ljp/wasabeef/fresco/a/c$a;->bjR:Ljava/util/List;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final DW()Ljp/wasabeef/fresco/a/c;
-    .locals 3
-
-    new-instance v0, Ljp/wasabeef/fresco/a/c;
-
-    iget-object v1, p0, Ljp/wasabeef/fresco/a/c$a;->bjx:Ljava/util/List;
-
-    const/4 v2, 0x0
-
-    invoke-direct {v0, v1, v2}, Ljp/wasabeef/fresco/a/c;-><init>(Ljava/util/List;B)V
-
-    return-object v0
-.end method
-
 .method public final a(Lcom/facebook/imagepipeline/request/a;)Ljp/wasabeef/fresco/a/c$a;
     .locals 1
 
-    iget-object v0, p0, Ljp/wasabeef/fresco/a/c$a;->bjx:Ljava/util/List;
+    iget-object v0, p0, Ljp/wasabeef/fresco/a/c$a;->bjR:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/jp/wasabeef/fresco/a/c.smali b/com.discord/smali_classes2/jp/wasabeef/fresco/a/c.smali
index 0a135da668..3cf7d8681d 100644
--- a/com.discord/smali_classes2/jp/wasabeef/fresco/a/c.smali
+++ b/com.discord/smali_classes2/jp/wasabeef/fresco/a/c.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field private bjw:Ljava/util/List;
+.field private bjQ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,12 +37,12 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/request/a;-><init>()V
 
-    iput-object p1, p0, Ljp/wasabeef/fresco/a/c;->bjw:Ljava/util/List;
+    iput-object p1, p0, Ljp/wasabeef/fresco/a/c;->bjQ:Ljava/util/List;
 
     return-void
 .end method
 
-.method synthetic constructor <init>(Ljava/util/List;B)V
+.method public synthetic constructor <init>(Ljava/util/List;B)V
     .locals 0
 
     invoke-direct {p0, p1}, Ljp/wasabeef/fresco/a/c;-><init>(Ljava/util/List;)V
@@ -67,7 +67,7 @@
 
     invoke-virtual {v0, p2, v2, v2, v1}, Landroid/graphics/Canvas;->drawBitmap(Landroid/graphics/Bitmap;FFLandroid/graphics/Paint;)V
 
-    iget-object p2, p0, Ljp/wasabeef/fresco/a/c;->bjw:Ljava/util/List;
+    iget-object p2, p0, Ljp/wasabeef/fresco/a/c;->bjQ:Ljava/util/List;
 
     invoke-interface {p2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/kotlin/a/aa.smali b/com.discord/smali_classes2/kotlin/a/aa.smali
index 93aa59d82d..a2ffa4c50f 100644
--- a/com.discord/smali_classes2/kotlin/a/aa.smali
+++ b/com.discord/smali_classes2/kotlin/a/aa.smali
@@ -9,7 +9,7 @@
 
 
 # static fields
-.field public static final bjW:Lkotlin/a/aa;
+.field public static final bkq:Lkotlin/a/aa;
 
 .field private static final serialVersionUID:J = 0x2f46b01576d7e2f4L
 
@@ -22,7 +22,7 @@
 
     invoke-direct {v0}, Lkotlin/a/aa;-><init>()V
 
-    sput-object v0, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sput-object v0, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     return-void
 .end method
@@ -38,7 +38,7 @@
 .method private final readResolve()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     return-object v0
 .end method
@@ -160,7 +160,7 @@
 .method public final iterator()Ljava/util/Iterator;
     .locals 1
 
-    sget-object v0, Lkotlin/a/x;->bjT:Lkotlin/a/x;
+    sget-object v0, Lkotlin/a/x;->bkn:Lkotlin/a/x;
 
     check-cast v0, Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/kotlin/a/ag.smali b/com.discord/smali_classes2/kotlin/a/ag.smali
index f3b264749d..a385373e21 100644
--- a/com.discord/smali_classes2/kotlin/a/ag.smali
+++ b/com.discord/smali_classes2/kotlin/a/ag.smali
@@ -123,7 +123,7 @@
 
     array-length v1, p0
 
-    invoke-static {v1}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v1}, Lkotlin/a/ad;->dj(I)I
 
     move-result v1
 
@@ -245,7 +245,7 @@
 
     array-length v1, p0
 
-    invoke-static {v1}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v1}, Lkotlin/a/ad;->dj(I)I
 
     move-result v1
 
@@ -258,7 +258,7 @@
     return-object v0
 .end method
 
-.method public static final dm(I)I
+.method public static final dj(I)I
     .locals 1
 
     const/4 v0, 0x3
@@ -300,7 +300,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/a/z;->bjV:Lkotlin/a/z;
+    sget-object v0, Lkotlin/a/z;->bkp:Lkotlin/a/z;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlin/a/ai.smali b/com.discord/smali_classes2/kotlin/a/ai.smali
index 83c4c88877..4ac9b36a71 100644
--- a/com.discord/smali_classes2/kotlin/a/ai.smali
+++ b/com.discord/smali_classes2/kotlin/a/ai.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field private final bjX:Ljava/util/List;
+.field private final bkr:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -43,7 +43,7 @@
 
     invoke-direct {p0}, Lkotlin/a/e;-><init>()V
 
-    iput-object p1, p0, Lkotlin/a/ai;->bjX:Ljava/util/List;
+    iput-object p1, p0, Lkotlin/a/ai;->bkr:Ljava/util/List;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/ai;->bjX:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bkr:Ljava/util/List;
 
     invoke-interface {p0}, Ljava/util/List;->size()I
 
@@ -123,7 +123,7 @@
 .method public final clear()V
     .locals 1
 
-    iget-object v0, p0, Lkotlin/a/ai;->bjX:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bkr:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
@@ -138,7 +138,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/ai;->bjX:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bkr:Ljava/util/List;
 
     invoke-static {p0, p1}, Lkotlin/a/u;->c(Ljava/util/List;I)I
 
@@ -154,7 +154,7 @@
 .method public final getSize()I
     .locals 1
 
-    iget-object v0, p0, Lkotlin/a/ai;->bjX:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bkr:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -171,7 +171,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/ai;->bjX:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bkr:Ljava/util/List;
 
     invoke-static {p0, p1}, Lkotlin/a/u;->c(Ljava/util/List;I)I
 
@@ -192,7 +192,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/ai;->bjX:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bkr:Ljava/util/List;
 
     invoke-static {p0, p1}, Lkotlin/a/u;->c(Ljava/util/List;I)I
 
diff --git a/com.discord/smali_classes2/kotlin/a/aj.smali b/com.discord/smali_classes2/kotlin/a/aj.smali
index 76936ee948..7ee78f3d8e 100644
--- a/com.discord/smali_classes2/kotlin/a/aj.smali
+++ b/com.discord/smali_classes2/kotlin/a/aj.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field private final bjX:Ljava/util/List;
+.field private final bkr:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -43,7 +43,7 @@
 
     invoke-direct {p0}, Lkotlin/a/d;-><init>()V
 
-    iput-object p1, p0, Lkotlin/a/aj;->bjX:Ljava/util/List;
+    iput-object p1, p0, Lkotlin/a/aj;->bkr:Ljava/util/List;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/aj;->bjX:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/aj;->bkr:Ljava/util/List;
 
     invoke-static {p0, p1}, Lkotlin/a/u;->c(Ljava/util/List;I)I
 
@@ -74,7 +74,7 @@
 .method public final getSize()I
     .locals 1
 
-    iget-object v0, p0, Lkotlin/a/aj;->bjX:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/aj;->bkr:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
diff --git a/com.discord/smali_classes2/kotlin/a/am.smali b/com.discord/smali_classes2/kotlin/a/am.smali
index 9de25858f5..5641a00341 100644
--- a/com.discord/smali_classes2/kotlin/a/am.smali
+++ b/com.discord/smali_classes2/kotlin/a/am.smali
@@ -50,14 +50,14 @@
     return-object p0
 
     :cond_1
-    sget-object p0, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p0, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast p0, Ljava/util/Set;
 
     return-object p0
 .end method
 
-.method public static final varargs p([Ljava/lang/Object;)Ljava/util/Set;
+.method public static final varargs o([Ljava/lang/Object;)Ljava/util/Set;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -77,14 +77,14 @@
 
     if-lez v0, :cond_0
 
-    invoke-static {p0}, Lkotlin/a/g;->i([Ljava/lang/Object;)Ljava/util/Set;
+    invoke-static {p0}, Lkotlin/a/g;->h([Ljava/lang/Object;)Ljava/util/Set;
 
     move-result-object p0
 
     return-object p0
 
     :cond_0
-    sget-object p0, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object p0, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast p0, Ljava/util/Set;
 
diff --git a/com.discord/smali_classes2/kotlin/a/an.smali b/com.discord/smali_classes2/kotlin/a/an.smali
index 51d51fec96..4d4f3870c4 100644
--- a/com.discord/smali_classes2/kotlin/a/an.smali
+++ b/com.discord/smali_classes2/kotlin/a/an.smali
@@ -130,7 +130,7 @@
 
     add-int/lit8 v1, v1, 0x1
 
-    invoke-static {v1}, Lkotlin/a/ad;->dm(I)I
+    invoke-static {v1}, Lkotlin/a/ad;->dj(I)I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/kotlin/a/ap.smali b/com.discord/smali_classes2/kotlin/a/ap.smali
index 2b6bb96944..0de60f8c93 100644
--- a/com.discord/smali_classes2/kotlin/a/ap.smali
+++ b/com.discord/smali_classes2/kotlin/a/ap.smali
@@ -14,15 +14,15 @@
 
 
 # static fields
-.field public static final bjY:I
+.field public static final bks:I
 
-.field public static final bjZ:I
+.field public static final bkt:I
 
-.field public static final bka:I
+.field public static final bku:I
 
-.field public static final bkb:I
+.field public static final bkv:I
 
-.field private static final synthetic bkc:[I
+.field private static final synthetic bkw:[I
 
 
 # direct methods
@@ -37,19 +37,19 @@
 
     const/4 v2, 0x1
 
-    sput v2, Lkotlin/a/ap;->bjY:I
+    sput v2, Lkotlin/a/ap;->bks:I
 
     const/4 v2, 0x2
 
-    sput v2, Lkotlin/a/ap;->bjZ:I
+    sput v2, Lkotlin/a/ap;->bkt:I
 
     const/4 v2, 0x3
 
-    sput v2, Lkotlin/a/ap;->bka:I
+    sput v2, Lkotlin/a/ap;->bku:I
 
-    sput v0, Lkotlin/a/ap;->bkb:I
+    sput v0, Lkotlin/a/ap;->bkv:I
 
-    sput-object v1, Lkotlin/a/ap;->bkc:[I
+    sput-object v1, Lkotlin/a/ap;->bkw:[I
 
     return-void
 
@@ -62,10 +62,10 @@
     .end array-data
 .end method
 
-.method public static Ea()[I
+.method public static DP()[I
     .locals 1
 
-    sget-object v0, Lkotlin/a/ap;->bkc:[I
+    sget-object v0, Lkotlin/a/ap;->bkw:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/a/b.smali b/com.discord/smali_classes2/kotlin/a/b.smali
index 0aea89d5bc..d65b4beabb 100644
--- a/com.discord/smali_classes2/kotlin/a/b.smali
+++ b/com.discord/smali_classes2/kotlin/a/b.smali
@@ -22,9 +22,9 @@
 
 
 # instance fields
-.field protected bjI:I
+.field protected bkc:I
 
-.field protected bjJ:Ljava/lang/Object;
+.field protected bkd:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -39,24 +39,24 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget v0, Lkotlin/a/ap;->bjZ:I
+    sget v0, Lkotlin/a/ap;->bkt:I
 
-    iput v0, p0, Lkotlin/a/b;->bjI:I
+    iput v0, p0, Lkotlin/a/b;->bkc:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected abstract DX()V
+.method protected abstract DM()V
 .end method
 
 .method public hasNext()Z
     .locals 4
 
-    iget v0, p0, Lkotlin/a/b;->bjI:I
+    iget v0, p0, Lkotlin/a/b;->bkc:I
 
-    sget v1, Lkotlin/a/ap;->bkb:I
+    sget v1, Lkotlin/a/ap;->bkv:I
 
     const/4 v2, 0x0
 
@@ -74,7 +74,7 @@
     :goto_0
     if-eqz v0, :cond_4
 
-    iget v0, p0, Lkotlin/a/b;->bjI:I
+    iget v0, p0, Lkotlin/a/b;->bkc:I
 
     sget-object v1, Lkotlin/a/c;->$EnumSwitchMapping$0:[I
 
@@ -88,15 +88,15 @@
 
     if-eq v0, v1, :cond_2
 
-    sget v0, Lkotlin/a/ap;->bkb:I
+    sget v0, Lkotlin/a/ap;->bkv:I
 
-    iput v0, p0, Lkotlin/a/b;->bjI:I
+    iput v0, p0, Lkotlin/a/b;->bkc:I
 
-    invoke-virtual {p0}, Lkotlin/a/b;->DX()V
+    invoke-virtual {p0}, Lkotlin/a/b;->DM()V
 
-    iget v0, p0, Lkotlin/a/b;->bjI:I
+    iget v0, p0, Lkotlin/a/b;->bkc:I
 
-    sget v1, Lkotlin/a/ap;->bjY:I
+    sget v1, Lkotlin/a/ap;->bks:I
 
     if-ne v0, v1, :cond_1
 
@@ -141,11 +141,11 @@
 
     if-eqz v0, :cond_0
 
-    sget v0, Lkotlin/a/ap;->bjZ:I
+    sget v0, Lkotlin/a/ap;->bkt:I
 
-    iput v0, p0, Lkotlin/a/b;->bjI:I
+    iput v0, p0, Lkotlin/a/b;->bkc:I
 
-    iget-object v0, p0, Lkotlin/a/b;->bjJ:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/b;->bkd:Ljava/lang/Object;
 
     return-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/a/c.smali b/com.discord/smali_classes2/kotlin/a/c.smali
index 0506cd610a..9a9f287c2f 100644
--- a/com.discord/smali_classes2/kotlin/a/c.smali
+++ b/com.discord/smali_classes2/kotlin/a/c.smali
@@ -10,7 +10,7 @@
 .method static synthetic constructor <clinit>()V
     .locals 3
 
-    invoke-static {}, Lkotlin/a/ap;->Ea()[I
+    invoke-static {}, Lkotlin/a/ap;->DP()[I
 
     move-result-object v0
 
@@ -20,7 +20,7 @@
 
     sput-object v0, Lkotlin/a/c;->$EnumSwitchMapping$0:[I
 
-    sget v1, Lkotlin/a/ap;->bka:I
+    sget v1, Lkotlin/a/ap;->bku:I
 
     const/4 v2, 0x1
 
@@ -30,7 +30,7 @@
 
     sget-object v0, Lkotlin/a/c;->$EnumSwitchMapping$0:[I
 
-    sget v1, Lkotlin/a/ap;->bjY:I
+    sget v1, Lkotlin/a/ap;->bks:I
 
     sub-int/2addr v1, v2
 
diff --git a/com.discord/smali_classes2/kotlin/a/d$b.smali b/com.discord/smali_classes2/kotlin/a/d$b.smali
index e4b00c2612..de348fe9e5 100644
--- a/com.discord/smali_classes2/kotlin/a/d$b.smali
+++ b/com.discord/smali_classes2/kotlin/a/d$b.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field final synthetic bjL:Lkotlin/a/d;
+.field final synthetic bkf:Lkotlin/a/d;
 
 .field index:I
 
@@ -42,7 +42,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/a/d$b;->bjL:Lkotlin/a/d;
+    iput-object p1, p0, Lkotlin/a/d$b;->bkf:Lkotlin/a/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,7 +56,7 @@
 
     iget v0, p0, Lkotlin/a/d$b;->index:I
 
-    iget-object v1, p0, Lkotlin/a/d$b;->bjL:Lkotlin/a/d;
+    iget-object v1, p0, Lkotlin/a/d$b;->bkf:Lkotlin/a/d;
 
     invoke-virtual {v1}, Lkotlin/a/d;->size()I
 
@@ -88,7 +88,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/a/d$b;->bjL:Lkotlin/a/d;
+    iget-object v0, p0, Lkotlin/a/d$b;->bkf:Lkotlin/a/d;
 
     iget v1, p0, Lkotlin/a/d$b;->index:I
 
diff --git a/com.discord/smali_classes2/kotlin/a/d$c.smali b/com.discord/smali_classes2/kotlin/a/d$c.smali
index 001fe244a7..da47c7d122 100644
--- a/com.discord/smali_classes2/kotlin/a/d$c.smali
+++ b/com.discord/smali_classes2/kotlin/a/d$c.smali
@@ -29,7 +29,7 @@
 
 
 # instance fields
-.field final synthetic bjL:Lkotlin/a/d;
+.field final synthetic bkf:Lkotlin/a/d;
 
 
 # direct methods
@@ -41,11 +41,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/a/d$c;->bjL:Lkotlin/a/d;
+    iput-object p1, p0, Lkotlin/a/d$c;->bkf:Lkotlin/a/d;
 
     invoke-direct {p0, p1}, Lkotlin/a/d$b;-><init>(Lkotlin/a/d;)V
 
-    sget-object v0, Lkotlin/a/d;->bjK:Lkotlin/a/d$a;
+    sget-object v0, Lkotlin/a/d;->bke:Lkotlin/a/d$a;
 
     invoke-virtual {p1}, Lkotlin/a/d;->size()I
 
@@ -145,7 +145,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/a/d$c;->bjL:Lkotlin/a/d;
+    iget-object v0, p0, Lkotlin/a/d$c;->bkf:Lkotlin/a/d;
 
     iget v1, p0, Lkotlin/a/d$b;->index:I
 
diff --git a/com.discord/smali_classes2/kotlin/a/d$d.smali b/com.discord/smali_classes2/kotlin/a/d$d.smali
index 5d060b8816..ddafe40d48 100644
--- a/com.discord/smali_classes2/kotlin/a/d$d.smali
+++ b/com.discord/smali_classes2/kotlin/a/d$d.smali
@@ -29,9 +29,9 @@
 
 
 # instance fields
-.field private bjM:I
+.field private bkg:I
 
-.field private final bjN:Lkotlin/a/d;
+.field private final bkh:Lkotlin/a/d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/a/d<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field private final bjO:I
+.field private final bki:I
 
 
 # direct methods
@@ -60,13 +60,13 @@
 
     invoke-direct {p0}, Lkotlin/a/d;-><init>()V
 
-    iput-object p1, p0, Lkotlin/a/d$d;->bjN:Lkotlin/a/d;
+    iput-object p1, p0, Lkotlin/a/d$d;->bkh:Lkotlin/a/d;
 
-    iput p2, p0, Lkotlin/a/d$d;->bjO:I
+    iput p2, p0, Lkotlin/a/d$d;->bki:I
 
-    iget p1, p0, Lkotlin/a/d$d;->bjO:I
+    iget p1, p0, Lkotlin/a/d$d;->bki:I
 
-    iget-object p2, p0, Lkotlin/a/d$d;->bjN:Lkotlin/a/d;
+    iget-object p2, p0, Lkotlin/a/d$d;->bkh:Lkotlin/a/d;
 
     invoke-virtual {p2}, Lkotlin/a/d;->size()I
 
@@ -80,11 +80,11 @@
 
     if-gt p1, p3, :cond_0
 
-    iget p1, p0, Lkotlin/a/d$d;->bjO:I
+    iget p1, p0, Lkotlin/a/d$d;->bki:I
 
     sub-int/2addr p3, p1
 
-    iput p3, p0, Lkotlin/a/d$d;->bjM:I
+    iput p3, p0, Lkotlin/a/d$d;->bkg:I
 
     return-void
 
@@ -155,15 +155,15 @@
         }
     .end annotation
 
-    iget v0, p0, Lkotlin/a/d$d;->bjM:I
+    iget v0, p0, Lkotlin/a/d$d;->bkg:I
 
     if-ltz p1, :cond_0
 
     if-ge p1, v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/a/d$d;->bjN:Lkotlin/a/d;
+    iget-object v0, p0, Lkotlin/a/d$d;->bkh:Lkotlin/a/d;
 
-    iget v1, p0, Lkotlin/a/d$d;->bjO:I
+    iget v1, p0, Lkotlin/a/d$d;->bki:I
 
     add-int/2addr v1, p1
 
@@ -204,7 +204,7 @@
 .method public final getSize()I
     .locals 1
 
-    iget v0, p0, Lkotlin/a/d$d;->bjM:I
+    iget v0, p0, Lkotlin/a/d$d;->bkg:I
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/a/d.smali b/com.discord/smali_classes2/kotlin/a/d.smali
index bac155a947..d4dc20e9dc 100644
--- a/com.discord/smali_classes2/kotlin/a/d.smali
+++ b/com.discord/smali_classes2/kotlin/a/d.smali
@@ -32,7 +32,7 @@
 
 
 # static fields
-.field public static final bjK:Lkotlin/a/d$a;
+.field public static final bke:Lkotlin/a/d$a;
 
 
 # direct methods
@@ -45,7 +45,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/a/d$a;-><init>(B)V
 
-    sput-object v0, Lkotlin/a/d;->bjK:Lkotlin/a/d$a;
+    sput-object v0, Lkotlin/a/d;->bke:Lkotlin/a/d$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/a/f.smali b/com.discord/smali_classes2/kotlin/a/f.smali
index f61ce3454c..a7e720a0e7 100644
--- a/com.discord/smali_classes2/kotlin/a/f.smali
+++ b/com.discord/smali_classes2/kotlin/a/f.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field private final bjP:[Ljava/lang/Object;
+.field private final bkj:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TT;"
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field private final bjQ:Z
+.field private final bkk:Z
 
 
 # direct methods
@@ -48,9 +48,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/a/f;->bjP:[Ljava/lang/Object;
+    iput-object p1, p0, Lkotlin/a/f;->bkj:[Ljava/lang/Object;
 
-    iput-boolean p2, p0, Lkotlin/a/f;->bjQ:Z
+    iput-boolean p2, p0, Lkotlin/a/f;->bkk:Z
 
     return-void
 .end method
@@ -108,7 +108,7 @@
 .method public final contains(Ljava/lang/Object;)Z
     .locals 2
 
-    iget-object v0, p0, Lkotlin/a/f;->bjP:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bkj:[Ljava/lang/Object;
 
     const-string v1, "$this$contains"
 
@@ -192,7 +192,7 @@
 .method public final isEmpty()Z
     .locals 1
 
-    iget-object v0, p0, Lkotlin/a/f;->bjP:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bkj:[Ljava/lang/Object;
 
     array-length v0, v0
 
@@ -218,9 +218,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/f;->bjP:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bkj:[Ljava/lang/Object;
 
-    invoke-static {v0}, Lkotlin/jvm/internal/b;->q([Ljava/lang/Object;)Ljava/util/Iterator;
+    invoke-static {v0}, Lkotlin/jvm/internal/b;->p([Ljava/lang/Object;)Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -284,7 +284,7 @@
 .method public final bridge size()I
     .locals 1
 
-    iget-object v0, p0, Lkotlin/a/f;->bjP:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bkj:[Ljava/lang/Object;
 
     array-length v0, v0
 
@@ -294,9 +294,9 @@
 .method public final toArray()[Ljava/lang/Object;
     .locals 3
 
-    iget-object v0, p0, Lkotlin/a/f;->bjP:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bkj:[Ljava/lang/Object;
 
-    iget-boolean v1, p0, Lkotlin/a/f;->bjQ:Z
+    iget-boolean v1, p0, Lkotlin/a/f;->bkk:Z
 
     const-string v2, "$this$copyToArrayOfAny"
 
diff --git a/com.discord/smali_classes2/kotlin/a/k$a.smali b/com.discord/smali_classes2/kotlin/a/k$a.smali
index a60937d703..01993188d8 100644
--- a/com.discord/smali_classes2/kotlin/a/k$a.smali
+++ b/com.discord/smali_classes2/kotlin/a/k$a.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lkotlin/a/k;->j([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    value = Lkotlin/a/k;->i([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bjR:[Ljava/lang/Object;
+.field final synthetic bkl:[Ljava/lang/Object;
 
 
 # direct methods
 .method public constructor <init>([Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/a/k$a;->bjR:[Ljava/lang/Object;
+    iput-object p1, p0, Lkotlin/a/k$a;->bkl:[Ljava/lang/Object;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,9 +52,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/k$a;->bjR:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/k$a;->bkl:[Ljava/lang/Object;
 
-    invoke-static {v0}, Lkotlin/jvm/internal/b;->q([Ljava/lang/Object;)Ljava/util/Iterator;
+    invoke-static {v0}, Lkotlin/jvm/internal/b;->p([Ljava/lang/Object;)Ljava/util/Iterator;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/a/w$a.smali b/com.discord/smali_classes2/kotlin/a/w$a.smali
index 7fae70690a..7fc9839c12 100644
--- a/com.discord/smali_classes2/kotlin/a/w$a.smali
+++ b/com.discord/smali_classes2/kotlin/a/w$a.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bjS:Ljava/lang/Iterable;
+.field final synthetic bkm:Ljava/lang/Iterable;
 
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Iterable;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/a/w$a;->bjS:Ljava/lang/Iterable;
+    iput-object p1, p0, Lkotlin/a/w$a;->bkm:Ljava/lang/Iterable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,7 +52,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/w$a;->bjS:Ljava/lang/Iterable;
+    iget-object v0, p0, Lkotlin/a/w$a;->bkm:Ljava/lang/Iterable;
 
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/kotlin/a/x.smali b/com.discord/smali_classes2/kotlin/a/x.smali
index 9d80fb0e62..d8a0fb5599 100644
--- a/com.discord/smali_classes2/kotlin/a/x.smali
+++ b/com.discord/smali_classes2/kotlin/a/x.smali
@@ -8,7 +8,7 @@
 
 
 # static fields
-.field public static final bjT:Lkotlin/a/x;
+.field public static final bkn:Lkotlin/a/x;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0}, Lkotlin/a/x;-><init>()V
 
-    sput-object v0, Lkotlin/a/x;->bjT:Lkotlin/a/x;
+    sput-object v0, Lkotlin/a/x;->bkn:Lkotlin/a/x;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/a/y.smali b/com.discord/smali_classes2/kotlin/a/y.smali
index c31d1893b6..b5fff699c7 100644
--- a/com.discord/smali_classes2/kotlin/a/y.smali
+++ b/com.discord/smali_classes2/kotlin/a/y.smali
@@ -10,7 +10,7 @@
 
 
 # static fields
-.field public static final bjU:Lkotlin/a/y;
+.field public static final bko:Lkotlin/a/y;
 
 .field private static final serialVersionUID:J = -0x6690382f581f9fceL
 
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Lkotlin/a/y;-><init>()V
 
-    sput-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sput-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     return-void
 .end method
@@ -39,7 +39,7 @@
 .method private final readResolve()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     return-object v0
 .end method
@@ -234,7 +234,7 @@
 .method public final iterator()Ljava/util/Iterator;
     .locals 1
 
-    sget-object v0, Lkotlin/a/x;->bjT:Lkotlin/a/x;
+    sget-object v0, Lkotlin/a/x;->bkn:Lkotlin/a/x;
 
     check-cast v0, Ljava/util/Iterator;
 
@@ -265,7 +265,7 @@
 .method public final listIterator()Ljava/util/ListIterator;
     .locals 1
 
-    sget-object v0, Lkotlin/a/x;->bjT:Lkotlin/a/x;
+    sget-object v0, Lkotlin/a/x;->bkn:Lkotlin/a/x;
 
     check-cast v0, Ljava/util/ListIterator;
 
@@ -277,7 +277,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lkotlin/a/x;->bjT:Lkotlin/a/x;
+    sget-object p1, Lkotlin/a/x;->bkn:Lkotlin/a/x;
 
     check-cast p1, Ljava/util/ListIterator;
 
diff --git a/com.discord/smali_classes2/kotlin/a/z.smali b/com.discord/smali_classes2/kotlin/a/z.smali
index 5a3de460b0..13ae5eb56c 100644
--- a/com.discord/smali_classes2/kotlin/a/z.smali
+++ b/com.discord/smali_classes2/kotlin/a/z.smali
@@ -9,7 +9,7 @@
 
 
 # static fields
-.field public static final bjV:Lkotlin/a/z;
+.field public static final bkp:Lkotlin/a/z;
 
 .field private static final serialVersionUID:J = 0x72723771cb044cd2L
 
@@ -22,7 +22,7 @@
 
     invoke-direct {v0}, Lkotlin/a/z;-><init>()V
 
-    sput-object v0, Lkotlin/a/z;->bjV:Lkotlin/a/z;
+    sput-object v0, Lkotlin/a/z;->bkp:Lkotlin/a/z;
 
     return-void
 .end method
@@ -38,7 +38,7 @@
 .method private final readResolve()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlin/a/z;->bjV:Lkotlin/a/z;
+    sget-object v0, Lkotlin/a/z;->bkp:Lkotlin/a/z;
 
     return-object v0
 .end method
@@ -97,7 +97,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast v0, Ljava/util/Set;
 
@@ -164,7 +164,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/a/aa;->bjW:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bkq:Lkotlin/a/aa;
 
     check-cast v0, Ljava/util/Set;
 
@@ -226,7 +226,7 @@
 .method public final bridge values()Ljava/util/Collection;
     .locals 1
 
-    sget-object v0, Lkotlin/a/y;->bjU:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bko:Lkotlin/a/y;
 
     check-cast v0, Ljava/util/Collection;
 
diff --git a/com.discord/smali_classes2/kotlin/b.smali b/com.discord/smali_classes2/kotlin/b.smali
index 00d43534fc..2add632afb 100644
--- a/com.discord/smali_classes2/kotlin/b.smali
+++ b/com.discord/smali_classes2/kotlin/b.smali
@@ -15,7 +15,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/c/b;->bky:Lkotlin/c/a;
+    sget-object v0, Lkotlin/c/b;->bkS:Lkotlin/c/a;
 
     invoke-virtual {v0, p0, p1}, Lkotlin/c/a;->b(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
 
diff --git a/com.discord/smali_classes2/kotlin/b/b$a.smali b/com.discord/smali_classes2/kotlin/b/b$a.smali
index 0e5a119f03..29965ae129 100644
--- a/com.discord/smali_classes2/kotlin/b/b$a.smali
+++ b/com.discord/smali_classes2/kotlin/b/b$a.smali
@@ -29,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic bkd:[Lkotlin/jvm/functions/Function1;
+.field final synthetic bkx:[Lkotlin/jvm/functions/Function1;
 
 
 # direct methods
 .method public constructor <init>([Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/b/b$a;->bkd:[Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lkotlin/b/b$a;->bkx:[Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,7 +53,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/b/b$a;->bkd:[Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lkotlin/b/b$a;->bkx:[Lkotlin/jvm/functions/Function1;
 
     array-length v1, v0
 
diff --git a/com.discord/smali_classes2/kotlin/b/b$b.smali b/com.discord/smali_classes2/kotlin/b/b$b.smali
index bf5ef6301c..67cff6feb9 100644
--- a/com.discord/smali_classes2/kotlin/b/b$b.smali
+++ b/com.discord/smali_classes2/kotlin/b/b$b.smali
@@ -31,14 +31,14 @@
 # instance fields
 .field final synthetic $comparator:Ljava/util/Comparator;
 
-.field final synthetic bke:Ljava/util/Comparator;
+.field final synthetic bky:Ljava/util/Comparator;
 
 
 # direct methods
 .method public constructor <init>(Ljava/util/Comparator;Ljava/util/Comparator;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/b/b$b;->bke:Ljava/util/Comparator;
+    iput-object p1, p0, Lkotlin/b/b$b;->bky:Ljava/util/Comparator;
 
     iput-object p2, p0, Lkotlin/b/b$b;->$comparator:Ljava/util/Comparator;
 
@@ -57,7 +57,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/b/b$b;->bke:Ljava/util/Comparator;
+    iget-object v0, p0, Lkotlin/b/b$b;->bky:Ljava/util/Comparator;
 
     invoke-interface {v0, p1, p2}, Ljava/util/Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
 
diff --git a/com.discord/smali_classes2/kotlin/c/a$a.smali b/com.discord/smali_classes2/kotlin/c/a$a.smali
index 9de61a198d..99fa361a8c 100644
--- a/com.discord/smali_classes2/kotlin/c/a$a.smali
+++ b/com.discord/smali_classes2/kotlin/c/a$a.smali
@@ -15,9 +15,9 @@
 
 
 # static fields
-.field public static final bkw:Ljava/lang/reflect/Method;
+.field public static final bkQ:Ljava/lang/reflect/Method;
 
-.field public static final bkx:Lkotlin/c/a$a;
+.field public static final bkR:Lkotlin/c/a$a;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     invoke-direct {v0}, Lkotlin/c/a$a;-><init>()V
 
-    sput-object v0, Lkotlin/c/a$a;->bkx:Lkotlin/c/a$a;
+    sput-object v0, Lkotlin/c/a$a;->bkR:Lkotlin/c/a$a;
 
     const-class v0, Ljava/lang/Throwable;
 
@@ -117,7 +117,7 @@
 
     :cond_3
     :goto_2
-    sput-object v5, Lkotlin/c/a$a;->bkw:Ljava/lang/reflect/Method;
+    sput-object v5, Lkotlin/c/a$a;->bkQ:Ljava/lang/reflect/Method;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/c/a.smali b/com.discord/smali_classes2/kotlin/c/a.smali
index 20a857e45e..ac6ec446ec 100644
--- a/com.discord/smali_classes2/kotlin/c/a.smali
+++ b/com.discord/smali_classes2/kotlin/c/a.smali
@@ -20,7 +20,7 @@
     return-void
 .end method
 
-.method public static Eg()Lkotlin/f/c;
+.method public static DV()Lkotlin/f/c;
     .locals 1
 
     new-instance v0, Lkotlin/f/b;
@@ -45,7 +45,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/c/a$a;->bkw:Ljava/lang/reflect/Method;
+    sget-object v0, Lkotlin/c/a$a;->bkQ:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlin/c/b.smali b/com.discord/smali_classes2/kotlin/c/b.smali
index d939013e16..b6349a7c7d 100644
--- a/com.discord/smali_classes2/kotlin/c/b.smali
+++ b/com.discord/smali_classes2/kotlin/c/b.smali
@@ -4,14 +4,14 @@
 
 
 # static fields
-.field public static final bky:Lkotlin/c/a;
+.field public static final bkS:Lkotlin/c/a;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 11
 
-    invoke-static {}, Lkotlin/c/b;->Eh()I
+    invoke-static {}, Lkotlin/c/b;->DW()I
 
     move-result v0
 
@@ -382,12 +382,12 @@
     invoke-direct {v6}, Lkotlin/c/a;-><init>()V
 
     :goto_4
-    sput-object v6, Lkotlin/c/b;->bky:Lkotlin/c/a;
+    sput-object v6, Lkotlin/c/b;->bkS:Lkotlin/c/a;
 
     return-void
 .end method
 
-.method private static final Eh()I
+.method private static final DW()I
     .locals 9
 
     const-string v0, "java.specification.version"
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 9b5e52effa..a474caaa5c 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$a$a.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$a$a.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final bkj:Lkotlin/coroutines/CoroutineContext$a$a;
+.field public static final bkD:Lkotlin/coroutines/CoroutineContext$a$a;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotlin/coroutines/CoroutineContext$a$a;-><init>()V
 
-    sput-object v0, Lkotlin/coroutines/CoroutineContext$a$a;->bkj:Lkotlin/coroutines/CoroutineContext$a$a;
+    sput-object v0, Lkotlin/coroutines/CoroutineContext$a$a;->bkD:Lkotlin/coroutines/CoroutineContext$a$a;
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sget-object v0, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     if-ne p1, v0, :cond_0
 
@@ -89,7 +89,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lkotlin/coroutines/c;->bkh:Lkotlin/coroutines/c$a;
+    sget-object v0, Lkotlin/coroutines/c;->bkB:Lkotlin/coroutines/c$a;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -110,7 +110,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object v1, Lkotlin/coroutines/c;->bkh:Lkotlin/coroutines/c$a;
+    sget-object v1, Lkotlin/coroutines/c;->bkB:Lkotlin/coroutines/c$a;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -118,7 +118,7 @@
 
     move-result-object p1
 
-    sget-object v1, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sget-object v1, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     if-ne p1, v1, :cond_2
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$a.smali b/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$a.smali
index 44018846ed..79a4f57a5e 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$a.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$a.smali
@@ -22,14 +22,14 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sget-object v0, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     if-ne p1, v0, :cond_0
 
     return-object p0
 
     :cond_0
-    sget-object v0, Lkotlin/coroutines/CoroutineContext$a$a;->bkj:Lkotlin/coroutines/CoroutineContext$a$a;
+    sget-object v0, Lkotlin/coroutines/CoroutineContext$a$a;->bkD:Lkotlin/coroutines/CoroutineContext$a$a;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$b$a.smali b/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$b$a.smali
index 41750a121a..d7a92e6571 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$b$a.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$b$a.smali
@@ -119,7 +119,7 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p0, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sget-object p0, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     check-cast p0, Lkotlin/coroutines/CoroutineContext;
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/a/a.smali b/com.discord/smali_classes2/kotlin/coroutines/a/a.smali
index 1965440bec..fcbfaec1e4 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/a/a.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/a/a.smali
@@ -14,13 +14,13 @@
 
 
 # static fields
-.field public static final enum bkl:Lkotlin/coroutines/a/a;
+.field public static final enum bkF:Lkotlin/coroutines/a/a;
 
-.field public static final enum bkm:Lkotlin/coroutines/a/a;
+.field public static final enum bkG:Lkotlin/coroutines/a/a;
 
-.field public static final enum bkn:Lkotlin/coroutines/a/a;
+.field public static final enum bkH:Lkotlin/coroutines/a/a;
 
-.field private static final synthetic bko:[Lkotlin/coroutines/a/a;
+.field private static final synthetic bkI:[Lkotlin/coroutines/a/a;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlin/coroutines/a/a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sput-object v1, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     aput-object v1, v0, v2
 
@@ -51,7 +51,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlin/coroutines/a/a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlin/coroutines/a/a;->bkm:Lkotlin/coroutines/a/a;
+    sput-object v1, Lkotlin/coroutines/a/a;->bkG:Lkotlin/coroutines/a/a;
 
     aput-object v1, v0, v2
 
@@ -63,11 +63,11 @@
 
     invoke-direct {v1, v3, v2}, Lkotlin/coroutines/a/a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlin/coroutines/a/a;->bkn:Lkotlin/coroutines/a/a;
+    sput-object v1, Lkotlin/coroutines/a/a;->bkH:Lkotlin/coroutines/a/a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlin/coroutines/a/a;->bko:[Lkotlin/coroutines/a/a;
+    sput-object v0, Lkotlin/coroutines/a/a;->bkI:[Lkotlin/coroutines/a/a;
 
     return-void
 .end method
@@ -102,7 +102,7 @@
 .method public static values()[Lkotlin/coroutines/a/a;
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/a/a;->bko:[Lkotlin/coroutines/a/a;
+    sget-object v0, Lkotlin/coroutines/a/a;->bkI:[Lkotlin/coroutines/a/a;
 
     invoke-virtual {v0}, [Lkotlin/coroutines/a/a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/a/c.smali b/com.discord/smali_classes2/kotlin/coroutines/a/c.smali
index 2b6e34fdd1..17b847df53 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/a/c.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/a/c.smali
@@ -54,7 +54,7 @@
 
     move-result-object v4
 
-    sget-object v0, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sget-object v0, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     const-string v1, "null cannot be cast to non-null type kotlin.coroutines.Continuation<kotlin.Any?>"
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/b$a.smali b/com.discord/smali_classes2/kotlin/coroutines/b$a.smali
index ee9da5cac0..715628069d 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/b$a.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/b$a.smali
@@ -24,7 +24,7 @@
 
 
 # static fields
-.field public static final bkf:Lkotlin/coroutines/b$a$a;
+.field public static final bkz:Lkotlin/coroutines/b$a$a;
 
 .field private static final serialVersionUID:J
 
@@ -43,7 +43,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/coroutines/b$a$a;-><init>(B)V
 
-    sput-object v0, Lkotlin/coroutines/b$a;->bkf:Lkotlin/coroutines/b$a$a;
+    sput-object v0, Lkotlin/coroutines/b$a;->bkz:Lkotlin/coroutines/b$a$a;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     iget-object v0, p0, Lkotlin/coroutines/b$a;->elements:[Lkotlin/coroutines/CoroutineContext;
 
-    sget-object v1, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sget-object v1, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     array-length v2, v0
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/b$b.smali b/com.discord/smali_classes2/kotlin/coroutines/b$b.smali
index 93b913e3b3..76e389e497 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/b$b.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/b$b.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final bkg:Lkotlin/coroutines/b$b;
+.field public static final bkA:Lkotlin/coroutines/b$b;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotlin/coroutines/b$b;-><init>()V
 
-    sput-object v0, Lkotlin/coroutines/b$b;->bkg:Lkotlin/coroutines/b$b;
+    sput-object v0, Lkotlin/coroutines/b$b;->bkA:Lkotlin/coroutines/b$b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/coroutines/b$c.smali b/com.discord/smali_classes2/kotlin/coroutines/b$c.smali
index 1288759727..217913d929 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/b$c.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/b$c.smali
@@ -80,7 +80,7 @@
 
     aput-object p2, p1, v1
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/kotlin/coroutines/b.smali b/com.discord/smali_classes2/kotlin/coroutines/b.smali
index 67893cbccd..a598d9c339 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/b.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/b.smali
@@ -108,7 +108,7 @@
 
     iput v3, v2, Lkotlin/jvm/internal/Ref$IntRef;->element:I
 
-    sget-object v4, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v4, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     new-instance v5, Lkotlin/coroutines/b$c;
 
@@ -385,7 +385,7 @@
     return-object p1
 
     :cond_1
-    sget-object v0, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sget-object v0, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     if-ne p1, v0, :cond_2
 
@@ -430,7 +430,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    sget-object v1, Lkotlin/coroutines/b$b;->bkg:Lkotlin/coroutines/b$b;
+    sget-object v1, Lkotlin/coroutines/b$b;->bkA:Lkotlin/coroutines/b$b;
 
     check-cast v1, Lkotlin/jvm/functions/Function2;
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/c$a.smali b/com.discord/smali_classes2/kotlin/coroutines/c$a.smali
index c696df2452..e3f7719ec8 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/c$a.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/c$a.smali
@@ -27,7 +27,7 @@
 
 
 # static fields
-.field static final synthetic bki:Lkotlin/coroutines/c$a;
+.field static final synthetic bkC:Lkotlin/coroutines/c$a;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     invoke-direct {v0}, Lkotlin/coroutines/c$a;-><init>()V
 
-    sput-object v0, Lkotlin/coroutines/c$a;->bki:Lkotlin/coroutines/c$a;
+    sput-object v0, Lkotlin/coroutines/c$a;->bkC:Lkotlin/coroutines/c$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/coroutines/c.smali b/com.discord/smali_classes2/kotlin/coroutines/c.smali
index 86ab15fdfc..a0b03e79eb 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/c.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/c.smali
@@ -15,16 +15,16 @@
 
 
 # static fields
-.field public static final bkh:Lkotlin/coroutines/c$a;
+.field public static final bkB:Lkotlin/coroutines/c$a;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/c$a;->bki:Lkotlin/coroutines/c$a;
+    sget-object v0, Lkotlin/coroutines/c$a;->bkC:Lkotlin/coroutines/c$a;
 
-    sput-object v0, Lkotlin/coroutines/c;->bkh:Lkotlin/coroutines/c$a;
+    sput-object v0, Lkotlin/coroutines/c;->bkB:Lkotlin/coroutines/c$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/coroutines/d.smali b/com.discord/smali_classes2/kotlin/coroutines/d.smali
index e428eee3a7..31e622a150 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/d.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/d.smali
@@ -8,7 +8,7 @@
 
 
 # static fields
-.field public static final bkk:Lkotlin/coroutines/d;
+.field public static final bkE:Lkotlin/coroutines/d;
 
 .field private static final serialVersionUID:J
 
@@ -21,7 +21,7 @@
 
     invoke-direct {v0}, Lkotlin/coroutines/d;-><init>()V
 
-    sput-object v0, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sput-object v0, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     return-void
 .end method
@@ -37,7 +37,7 @@
 .method private final readResolve()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sget-object v0, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/a.smali b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/a.smali
index ce22f356f1..aef7ae4f4e 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/a.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/a.smali
@@ -170,7 +170,7 @@
     return-object v1
 
     :cond_0
-    invoke-interface {v0}, Lkotlin/coroutines/jvm/internal/d;->Eb()I
+    invoke-interface {v0}, Lkotlin/coroutines/jvm/internal/d;->DQ()I
 
     move-result v2
 
@@ -189,20 +189,20 @@
     goto :goto_0
 
     :cond_1
-    invoke-interface {v0}, Lkotlin/coroutines/jvm/internal/d;->Ed()[I
+    invoke-interface {v0}, Lkotlin/coroutines/jvm/internal/d;->DS()[I
 
     move-result-object v3
 
     aget v2, v3, v2
 
     :goto_0
-    sget-object v3, Lkotlin/coroutines/jvm/internal/f;->bks:Lkotlin/coroutines/jvm/internal/f;
+    sget-object v3, Lkotlin/coroutines/jvm/internal/f;->bkM:Lkotlin/coroutines/jvm/internal/f;
 
     const-string v3, "continuation"
 
     invoke-static {p0, v3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v3, Lkotlin/coroutines/jvm/internal/f;->bkr:Lkotlin/coroutines/jvm/internal/f$a;
+    sget-object v3, Lkotlin/coroutines/jvm/internal/f;->bkL:Lkotlin/coroutines/jvm/internal/f$a;
 
     if-nez v3, :cond_2
 
@@ -211,14 +211,14 @@
     move-result-object v3
 
     :cond_2
-    sget-object v4, Lkotlin/coroutines/jvm/internal/f;->bkq:Lkotlin/coroutines/jvm/internal/f$a;
+    sget-object v4, Lkotlin/coroutines/jvm/internal/f;->bkK:Lkotlin/coroutines/jvm/internal/f$a;
 
     if-ne v3, v4, :cond_3
 
     goto :goto_3
 
     :cond_3
-    iget-object v4, v3, Lkotlin/coroutines/jvm/internal/f$a;->bkt:Ljava/lang/reflect/Method;
+    iget-object v4, v3, Lkotlin/coroutines/jvm/internal/f$a;->bkN:Ljava/lang/reflect/Method;
 
     if-eqz v4, :cond_8
 
@@ -239,7 +239,7 @@
     goto :goto_3
 
     :cond_4
-    iget-object v5, v3, Lkotlin/coroutines/jvm/internal/f$a;->bku:Ljava/lang/reflect/Method;
+    iget-object v5, v3, Lkotlin/coroutines/jvm/internal/f$a;->bkO:Ljava/lang/reflect/Method;
 
     if-eqz v5, :cond_8
 
@@ -254,7 +254,7 @@
     goto :goto_3
 
     :cond_5
-    iget-object v3, v3, Lkotlin/coroutines/jvm/internal/f$a;->bkv:Ljava/lang/reflect/Method;
+    iget-object v3, v3, Lkotlin/coroutines/jvm/internal/f$a;->bkP:Ljava/lang/reflect/Method;
 
     if-eqz v3, :cond_6
 
@@ -286,7 +286,7 @@
     :goto_3
     if-nez v1, :cond_9
 
-    invoke-interface {v0}, Lkotlin/coroutines/jvm/internal/d;->Ef()Ljava/lang/String;
+    invoke-interface {v0}, Lkotlin/coroutines/jvm/internal/d;->DU()Ljava/lang/String;
 
     move-result-object v1
 
@@ -303,7 +303,7 @@
 
     invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-interface {v0}, Lkotlin/coroutines/jvm/internal/d;->Ef()Ljava/lang/String;
+    invoke-interface {v0}, Lkotlin/coroutines/jvm/internal/d;->DU()Ljava/lang/String;
 
     move-result-object v1
 
@@ -316,11 +316,11 @@
     :goto_4
     new-instance v3, Ljava/lang/StackTraceElement;
 
-    invoke-interface {v0}, Lkotlin/coroutines/jvm/internal/d;->Ee()Ljava/lang/String;
+    invoke-interface {v0}, Lkotlin/coroutines/jvm/internal/d;->DT()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-interface {v0}, Lkotlin/coroutines/jvm/internal/d;->Ec()Ljava/lang/String;
+    invoke-interface {v0}, Lkotlin/coroutines/jvm/internal/d;->DR()Ljava/lang/String;
 
     move-result-object v0
 
@@ -391,7 +391,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     :try_start_0
@@ -399,14 +399,14 @@
 
     move-result-object p1
 
-    sget-object v2, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object v2, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     if-ne p1, v2, :cond_1
 
     return-void
 
     :cond_1
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -419,7 +419,7 @@
     :catchall_0
     move-exception p1
 
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/b.smali b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/b.smali
index 8010de7d05..77303e10f6 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/b.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/b.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final bkp:Lkotlin/coroutines/jvm/internal/b;
+.field public static final bkJ:Lkotlin/coroutines/jvm/internal/b;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lkotlin/coroutines/jvm/internal/b;-><init>()V
 
-    sput-object v0, Lkotlin/coroutines/jvm/internal/b;->bkp:Lkotlin/coroutines/jvm/internal/b;
+    sput-object v0, Lkotlin/coroutines/jvm/internal/b;->bkJ:Lkotlin/coroutines/jvm/internal/b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/c.smali b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/c.smali
index ac426aab78..ddfc017290 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/c.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/c.smali
@@ -75,7 +75,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     return-object v0
@@ -100,7 +100,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlin/coroutines/c;->bkh:Lkotlin/coroutines/c$a;
+    sget-object v1, Lkotlin/coroutines/c;->bkB:Lkotlin/coroutines/c$a;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -151,7 +151,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lkotlin/coroutines/c;->bkh:Lkotlin/coroutines/c$a;
+    sget-object v2, Lkotlin/coroutines/c;->bkB:Lkotlin/coroutines/c$a;
 
     check-cast v2, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -161,7 +161,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     check-cast v1, Lkotlin/coroutines/c;
@@ -169,7 +169,7 @@
     invoke-interface {v1, v0}, Lkotlin/coroutines/c;->b(Lkotlin/coroutines/Continuation;)V
 
     :cond_1
-    sget-object v0, Lkotlin/coroutines/jvm/internal/b;->bkp:Lkotlin/coroutines/jvm/internal/b;
+    sget-object v0, Lkotlin/coroutines/jvm/internal/b;->bkJ:Lkotlin/coroutines/jvm/internal/b;
 
     check-cast v0, Lkotlin/coroutines/Continuation;
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/f$a.smali b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/f$a.smali
index d86702bb3a..6872d65350 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/f$a.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/f$a.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field public final bkt:Ljava/lang/reflect/Method;
+.field public final bkN:Ljava/lang/reflect/Method;
 
-.field public final bku:Ljava/lang/reflect/Method;
+.field public final bkO:Ljava/lang/reflect/Method;
 
-.field public final bkv:Ljava/lang/reflect/Method;
+.field public final bkP:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -28,11 +28,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/coroutines/jvm/internal/f$a;->bkt:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lkotlin/coroutines/jvm/internal/f$a;->bkN:Ljava/lang/reflect/Method;
 
-    iput-object p2, p0, Lkotlin/coroutines/jvm/internal/f$a;->bku:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lkotlin/coroutines/jvm/internal/f$a;->bkO:Ljava/lang/reflect/Method;
 
-    iput-object p3, p0, Lkotlin/coroutines/jvm/internal/f$a;->bkv:Ljava/lang/reflect/Method;
+    iput-object p3, p0, Lkotlin/coroutines/jvm/internal/f$a;->bkP:Ljava/lang/reflect/Method;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/f.smali b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/f.smali
index ac8fed8375..1fad6f9e65 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/f.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/f.smali
@@ -12,11 +12,11 @@
 
 
 # static fields
-.field static final bkq:Lkotlin/coroutines/jvm/internal/f$a;
+.field static final bkK:Lkotlin/coroutines/jvm/internal/f$a;
 
-.field public static bkr:Lkotlin/coroutines/jvm/internal/f$a;
+.field public static bkL:Lkotlin/coroutines/jvm/internal/f$a;
 
-.field public static final bks:Lkotlin/coroutines/jvm/internal/f;
+.field public static final bkM:Lkotlin/coroutines/jvm/internal/f;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {v0}, Lkotlin/coroutines/jvm/internal/f;-><init>()V
 
-    sput-object v0, Lkotlin/coroutines/jvm/internal/f;->bks:Lkotlin/coroutines/jvm/internal/f;
+    sput-object v0, Lkotlin/coroutines/jvm/internal/f;->bkM:Lkotlin/coroutines/jvm/internal/f;
 
     new-instance v0, Lkotlin/coroutines/jvm/internal/f$a;
 
@@ -35,7 +35,7 @@
 
     invoke-direct {v0, v1, v1, v1}, Lkotlin/coroutines/jvm/internal/f$a;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
 
-    sput-object v0, Lkotlin/coroutines/jvm/internal/f;->bkq:Lkotlin/coroutines/jvm/internal/f$a;
+    sput-object v0, Lkotlin/coroutines/jvm/internal/f;->bkK:Lkotlin/coroutines/jvm/internal/f$a;
 
     return-void
 .end method
@@ -112,16 +112,16 @@
 
     invoke-direct {v2, v0, v1, p0}, Lkotlin/coroutines/jvm/internal/f$a;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
 
-    sput-object v2, Lkotlin/coroutines/jvm/internal/f;->bkr:Lkotlin/coroutines/jvm/internal/f$a;
+    sput-object v2, Lkotlin/coroutines/jvm/internal/f;->bkL:Lkotlin/coroutines/jvm/internal/f$a;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
     return-object v2
 
     :catch_0
-    sget-object p0, Lkotlin/coroutines/jvm/internal/f;->bkq:Lkotlin/coroutines/jvm/internal/f$a;
+    sget-object p0, Lkotlin/coroutines/jvm/internal/f;->bkK:Lkotlin/coroutines/jvm/internal/f$a;
 
-    sput-object p0, Lkotlin/coroutines/jvm/internal/f;->bkr:Lkotlin/coroutines/jvm/internal/f$a;
+    sput-object p0, Lkotlin/coroutines/jvm/internal/f;->bkL:Lkotlin/coroutines/jvm/internal/f$a;
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/g.smali b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/g.smali
index bbb2a5a685..f6a238b4fc 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/g.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/g.smali
@@ -23,7 +23,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sget-object v0, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     if-ne p1, v0, :cond_0
 
@@ -63,7 +63,7 @@
 .method public getContext()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sget-object v0, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext;
 
diff --git a/com.discord/smali_classes2/kotlin/e/c.smali b/com.discord/smali_classes2/kotlin/e/c.smali
index 13a5a09a36..fe8590996d 100644
--- a/com.discord/smali_classes2/kotlin/e/c.smali
+++ b/com.discord/smali_classes2/kotlin/e/c.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final D(F)I
+.method public static final C(F)I
     .locals 1
 
     invoke-static {p0}, Ljava/lang/Float;->isNaN(F)Z
diff --git a/com.discord/smali_classes2/kotlin/f/a.smali b/com.discord/smali_classes2/kotlin/f/a.smali
index 3c37ba262d..9f90bc998d 100644
--- a/com.discord/smali_classes2/kotlin/f/a.smali
+++ b/com.discord/smali_classes2/kotlin/f/a.smali
@@ -21,7 +21,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lkotlin/f/a;->Er()Ljava/util/Random;
+    invoke-virtual {p0}, Lkotlin/f/a;->Eg()Ljava/util/Random;
 
     move-result-object v0
 
@@ -30,13 +30,13 @@
     return-object p1
 .end method
 
-.method public abstract Er()Ljava/util/Random;
+.method public abstract Eg()Ljava/util/Random;
 .end method
 
-.method public final dn(I)I
+.method public final dk(I)I
     .locals 1
 
-    invoke-virtual {p0}, Lkotlin/f/a;->Er()Ljava/util/Random;
+    invoke-virtual {p0}, Lkotlin/f/a;->Eg()Ljava/util/Random;
 
     move-result-object v0
 
@@ -44,7 +44,7 @@
 
     move-result v0
 
-    invoke-static {v0, p1}, Lkotlin/f/d;->W(II)I
+    invoke-static {v0, p1}, Lkotlin/f/d;->V(II)I
 
     move-result p1
 
@@ -54,7 +54,7 @@
 .method public final nextInt()I
     .locals 1
 
-    invoke-virtual {p0}, Lkotlin/f/a;->Er()Ljava/util/Random;
+    invoke-virtual {p0}, Lkotlin/f/a;->Eg()Ljava/util/Random;
 
     move-result-object v0
 
@@ -68,7 +68,7 @@
 .method public final nextLong()J
     .locals 2
 
-    invoke-virtual {p0}, Lkotlin/f/a;->Er()Ljava/util/Random;
+    invoke-virtual {p0}, Lkotlin/f/a;->Eg()Ljava/util/Random;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/f/b.smali b/com.discord/smali_classes2/kotlin/f/b.smali
index fa383df453..014b1706a6 100644
--- a/com.discord/smali_classes2/kotlin/f/b.smali
+++ b/com.discord/smali_classes2/kotlin/f/b.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final bkK:Lkotlin/f/b$a;
+.field private final ble:Lkotlin/f/b$a;
 
 
 # direct methods
@@ -17,17 +17,17 @@
 
     invoke-direct {v0}, Lkotlin/f/b$a;-><init>()V
 
-    iput-object v0, p0, Lkotlin/f/b;->bkK:Lkotlin/f/b$a;
+    iput-object v0, p0, Lkotlin/f/b;->ble:Lkotlin/f/b$a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Er()Ljava/util/Random;
+.method public final Eg()Ljava/util/Random;
     .locals 2
 
-    iget-object v0, p0, Lkotlin/f/b;->bkK:Lkotlin/f/b$a;
+    iget-object v0, p0, Lkotlin/f/b;->ble:Lkotlin/f/b$a;
 
     invoke-virtual {v0}, Lkotlin/f/b$a;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/f/c$a.smali b/com.discord/smali_classes2/kotlin/f/c$a.smali
index 8729f9d511..64744f606c 100644
--- a/com.discord/smali_classes2/kotlin/f/c$a.smali
+++ b/com.discord/smali_classes2/kotlin/f/c$a.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final bkO:Lkotlin/f/c$a;
+.field public static final bli:Lkotlin/f/c$a;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lkotlin/f/c$a;-><init>()V
 
-    sput-object v0, Lkotlin/f/c$a;->bkO:Lkotlin/f/c$a;
+    sput-object v0, Lkotlin/f/c$a;->bli:Lkotlin/f/c$a;
 
     return-void
 .end method
@@ -41,12 +41,12 @@
 
 
 # virtual methods
-.method public final dn(I)I
+.method public final dk(I)I
     .locals 1
 
-    sget-object v0, Lkotlin/f/c;->bkL:Lkotlin/f/c;
+    sget-object v0, Lkotlin/f/c;->blf:Lkotlin/f/c;
 
-    invoke-virtual {v0, p1}, Lkotlin/f/c;->dn(I)I
+    invoke-virtual {v0, p1}, Lkotlin/f/c;->dk(I)I
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/kotlin/f/c$b.smali b/com.discord/smali_classes2/kotlin/f/c$b.smali
index 86b57e5818..83649491b3 100644
--- a/com.discord/smali_classes2/kotlin/f/c$b.smali
+++ b/com.discord/smali_classes2/kotlin/f/c$b.smali
@@ -40,7 +40,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/f/c;->bkL:Lkotlin/f/c;
+    sget-object v0, Lkotlin/f/c;->blf:Lkotlin/f/c;
 
     invoke-virtual {v0, p1}, Lkotlin/f/c;->A([B)[B
 
@@ -49,24 +49,24 @@
     return-object p1
 .end method
 
-.method public final dn(I)I
+.method public final dk(I)I
     .locals 1
 
-    sget-object v0, Lkotlin/f/c;->bkL:Lkotlin/f/c;
+    sget-object v0, Lkotlin/f/c;->blf:Lkotlin/f/c;
 
-    invoke-virtual {v0, p1}, Lkotlin/f/c;->dn(I)I
+    invoke-virtual {v0, p1}, Lkotlin/f/c;->dk(I)I
 
     move-result p1
 
     return p1
 .end method
 
-.method public final do(I)[B
+.method public final dl(I)[B
     .locals 1
 
-    sget-object v0, Lkotlin/f/c;->bkL:Lkotlin/f/c;
+    sget-object v0, Lkotlin/f/c;->blf:Lkotlin/f/c;
 
-    invoke-virtual {v0, p1}, Lkotlin/f/c;->do(I)[B
+    invoke-virtual {v0, p1}, Lkotlin/f/c;->dl(I)[B
 
     move-result-object p1
 
@@ -80,7 +80,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/f/c;->bkL:Lkotlin/f/c;
+    sget-object v0, Lkotlin/f/c;->blf:Lkotlin/f/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lkotlin/f/c;->l([BII)[B
 
@@ -92,7 +92,7 @@
 .method public final nextInt()I
     .locals 1
 
-    sget-object v0, Lkotlin/f/c;->bkL:Lkotlin/f/c;
+    sget-object v0, Lkotlin/f/c;->blf:Lkotlin/f/c;
 
     invoke-virtual {v0}, Lkotlin/f/c;->nextInt()I
 
@@ -104,7 +104,7 @@
 .method public final nextLong()J
     .locals 2
 
-    sget-object v0, Lkotlin/f/c;->bkL:Lkotlin/f/c;
+    sget-object v0, Lkotlin/f/c;->blf:Lkotlin/f/c;
 
     invoke-virtual {v0}, Lkotlin/f/c;->nextLong()J
 
diff --git a/com.discord/smali_classes2/kotlin/f/c.smali b/com.discord/smali_classes2/kotlin/f/c.smali
index 6db91f22e4..0e8af09303 100644
--- a/com.discord/smali_classes2/kotlin/f/c.smali
+++ b/com.discord/smali_classes2/kotlin/f/c.smali
@@ -13,11 +13,11 @@
 
 
 # static fields
-.field static final bkL:Lkotlin/f/c;
+.field static final blf:Lkotlin/f/c;
 
-.field public static final bkM:Lkotlin/f/c$a;
+.field public static final blg:Lkotlin/f/c$a;
 
-.field public static final bkN:Lkotlin/f/c$b;
+.field public static final blh:Lkotlin/f/c$b;
 
 
 # direct methods
@@ -30,19 +30,19 @@
 
     invoke-direct {v0, v1}, Lkotlin/f/c$b;-><init>(B)V
 
-    sput-object v0, Lkotlin/f/c;->bkN:Lkotlin/f/c$b;
+    sput-object v0, Lkotlin/f/c;->blh:Lkotlin/f/c$b;
 
-    sget-object v0, Lkotlin/c/b;->bky:Lkotlin/c/a;
+    sget-object v0, Lkotlin/c/b;->bkS:Lkotlin/c/a;
 
-    invoke-static {}, Lkotlin/c/a;->Eg()Lkotlin/f/c;
+    invoke-static {}, Lkotlin/c/a;->DV()Lkotlin/f/c;
 
     move-result-object v0
 
-    sput-object v0, Lkotlin/f/c;->bkL:Lkotlin/f/c;
+    sput-object v0, Lkotlin/f/c;->blf:Lkotlin/f/c;
 
-    sget-object v0, Lkotlin/f/c$a;->bkO:Lkotlin/f/c$a;
+    sget-object v0, Lkotlin/f/c$a;->bli:Lkotlin/f/c$a;
 
-    sput-object v0, Lkotlin/f/c;->bkM:Lkotlin/f/c$a;
+    sput-object v0, Lkotlin/f/c;->blg:Lkotlin/f/c$a;
 
     return-void
 .end method
@@ -55,10 +55,10 @@
     return-void
 .end method
 
-.method public static final synthetic Es()Lkotlin/f/c;
+.method public static final synthetic Eh()Lkotlin/f/c;
     .locals 1
 
-    sget-object v0, Lkotlin/f/c;->bkL:Lkotlin/f/c;
+    sget-object v0, Lkotlin/f/c;->blf:Lkotlin/f/c;
 
     return-object v0
 .end method
@@ -83,10 +83,10 @@
     return-object p1
 .end method
 
-.method public abstract dn(I)I
+.method public abstract dk(I)I
 .end method
 
-.method public do(I)[B
+.method public dl(I)[B
     .locals 0
 
     new-array p1, p1, [B
@@ -204,7 +204,7 @@
 
     mul-int/lit8 p2, p3, 0x8
 
-    invoke-virtual {p0, p2}, Lkotlin/f/c;->dn(I)I
+    invoke-virtual {p0, p2}, Lkotlin/f/c;->dk(I)I
 
     move-result p2
 
@@ -314,7 +314,7 @@
 
     const/16 v0, 0x20
 
-    invoke-virtual {p0, v0}, Lkotlin/f/c;->dn(I)I
+    invoke-virtual {p0, v0}, Lkotlin/f/c;->dk(I)I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/kotlin/f/d.smali b/com.discord/smali_classes2/kotlin/f/d.smali
index 9d06070d7c..411a37c92a 100644
--- a/com.discord/smali_classes2/kotlin/f/d.smali
+++ b/com.discord/smali_classes2/kotlin/f/d.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final W(II)I
+.method public static final V(II)I
     .locals 1
 
     rsub-int/lit8 v0, p1, 0x20
diff --git a/com.discord/smali_classes2/kotlin/f/e.smali b/com.discord/smali_classes2/kotlin/f/e.smali
index e317c18b05..d922004cf4 100644
--- a/com.discord/smali_classes2/kotlin/f/e.smali
+++ b/com.discord/smali_classes2/kotlin/f/e.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private bkP:I
+.field private blj:I
 
 .field private v:I
 
@@ -51,7 +51,7 @@
 
     iput p3, p0, Lkotlin/f/e;->v:I
 
-    iput p4, p0, Lkotlin/f/e;->bkP:I
+    iput p4, p0, Lkotlin/f/e;->blj:I
 
     iget p2, p0, Lkotlin/f/e;->x:I
 
@@ -121,14 +121,14 @@
 
 
 # virtual methods
-.method public final dn(I)I
+.method public final dk(I)I
     .locals 1
 
     invoke-virtual {p0}, Lkotlin/f/e;->nextInt()I
 
     move-result v0
 
-    invoke-static {v0, p1}, Lkotlin/f/d;->W(II)I
+    invoke-static {v0, p1}, Lkotlin/f/d;->V(II)I
 
     move-result p1
 
@@ -172,15 +172,15 @@
 
     iput v0, p0, Lkotlin/f/e;->v:I
 
-    iget v1, p0, Lkotlin/f/e;->bkP:I
+    iget v1, p0, Lkotlin/f/e;->blj:I
 
     const v2, 0x587c5
 
     add-int/2addr v1, v2
 
-    iput v1, p0, Lkotlin/f/e;->bkP:I
+    iput v1, p0, Lkotlin/f/e;->blj:I
 
-    iget v1, p0, Lkotlin/f/e;->bkP:I
+    iget v1, p0, Lkotlin/f/e;->blj:I
 
     add-int/2addr v0, v1
 
diff --git a/com.discord/smali_classes2/kotlin/g.smali b/com.discord/smali_classes2/kotlin/g.smali
index 767307722b..201d9cf31e 100644
--- a/com.discord/smali_classes2/kotlin/g.smali
+++ b/com.discord/smali_classes2/kotlin/g.smali
@@ -20,7 +20,7 @@
 
     sput-object v0, Lkotlin/g;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlin/j;->bjy:Lkotlin/j;
+    sget-object v1, Lkotlin/j;->bjS:Lkotlin/j;
 
     invoke-virtual {v1}, Lkotlin/j;->ordinal()I
 
@@ -32,7 +32,7 @@
 
     sget-object v0, Lkotlin/g;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlin/j;->bjz:Lkotlin/j;
+    sget-object v1, Lkotlin/j;->bjT:Lkotlin/j;
 
     invoke-virtual {v1}, Lkotlin/j;->ordinal()I
 
@@ -44,7 +44,7 @@
 
     sget-object v0, Lkotlin/g;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlin/j;->bjA:Lkotlin/j;
+    sget-object v1, Lkotlin/j;->bjU:Lkotlin/j;
 
     invoke-virtual {v1}, Lkotlin/j;->ordinal()I
 
diff --git a/com.discord/smali_classes2/kotlin/j.smali b/com.discord/smali_classes2/kotlin/j.smali
index 92b09b7df8..dc5ffd5e2d 100644
--- a/com.discord/smali_classes2/kotlin/j.smali
+++ b/com.discord/smali_classes2/kotlin/j.smali
@@ -14,13 +14,13 @@
 
 
 # static fields
-.field public static final enum bjA:Lkotlin/j;
+.field public static final enum bjS:Lkotlin/j;
 
-.field private static final synthetic bjB:[Lkotlin/j;
+.field public static final enum bjT:Lkotlin/j;
 
-.field public static final enum bjy:Lkotlin/j;
+.field public static final enum bjU:Lkotlin/j;
 
-.field public static final enum bjz:Lkotlin/j;
+.field private static final synthetic bjV:[Lkotlin/j;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlin/j;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlin/j;->bjy:Lkotlin/j;
+    sput-object v1, Lkotlin/j;->bjS:Lkotlin/j;
 
     aput-object v1, v0, v2
 
@@ -51,7 +51,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlin/j;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlin/j;->bjz:Lkotlin/j;
+    sput-object v1, Lkotlin/j;->bjT:Lkotlin/j;
 
     aput-object v1, v0, v2
 
@@ -63,11 +63,11 @@
 
     invoke-direct {v1, v3, v2}, Lkotlin/j;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlin/j;->bjA:Lkotlin/j;
+    sput-object v1, Lkotlin/j;->bjU:Lkotlin/j;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlin/j;->bjB:[Lkotlin/j;
+    sput-object v0, Lkotlin/j;->bjV:[Lkotlin/j;
 
     return-void
 .end method
@@ -102,7 +102,7 @@
 .method public static values()[Lkotlin/j;
     .locals 1
 
-    sget-object v0, Lkotlin/j;->bjB:[Lkotlin/j;
+    sget-object v0, Lkotlin/j;->bjV:[Lkotlin/j;
 
     invoke-virtual {v0}, [Lkotlin/j;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/a.smali b/com.discord/smali_classes2/kotlin/jvm/a.smali
index 9082a68ffb..21533c46fa 100644
--- a/com.discord/smali_classes2/kotlin/jvm/a.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/a.smali
@@ -24,7 +24,7 @@
 
     check-cast p0, Lkotlin/jvm/internal/d;
 
-    invoke-interface {p0}, Lkotlin/jvm/internal/d;->Ej()Ljava/lang/Class;
+    invoke-interface {p0}, Lkotlin/jvm/internal/d;->DY()Ljava/lang/Class;
 
     move-result-object p0
 
@@ -62,7 +62,7 @@
 
     check-cast p0, Lkotlin/jvm/internal/d;
 
-    invoke-interface {p0}, Lkotlin/jvm/internal/d;->Ej()Ljava/lang/Class;
+    invoke-interface {p0}, Lkotlin/jvm/internal/d;->DY()Ljava/lang/Class;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/Ref$BooleanRef.smali b/com.discord/smali_classes2/kotlin/jvm/internal/Ref$BooleanRef.smali
new file mode 100644
index 0000000000..be3a8a1c71
--- /dev/null
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/Ref$BooleanRef.smali
@@ -0,0 +1,45 @@
+.class public final Lkotlin/jvm/internal/Ref$BooleanRef;
+.super Ljava/lang/Object;
+.source "Ref.java"
+
+# interfaces
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lkotlin/jvm/internal/Ref;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "BooleanRef"
+.end annotation
+
+
+# instance fields
+.field public element:Z
+
+
+# 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 toString()Ljava/lang/String;
+    .locals 1
+
+    iget-boolean v0, p0, Lkotlin/jvm/internal/Ref$BooleanRef;->element:Z
+
+    invoke-static {v0}, Ljava/lang/String;->valueOf(Z)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/Ref.smali b/com.discord/smali_classes2/kotlin/jvm/internal/Ref.smali
index 189ec7329f..670a17c66c 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/Ref.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/Ref.smali
@@ -6,6 +6,7 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
+        Lkotlin/jvm/internal/Ref$BooleanRef;,
         Lkotlin/jvm/internal/Ref$LongRef;,
         Lkotlin/jvm/internal/Ref$IntRef;,
         Lkotlin/jvm/internal/Ref$ObjectRef;
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/b.smali b/com.discord/smali_classes2/kotlin/jvm/internal/b.smali
index 2f5daed996..79e5b499e4 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/b.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/b.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final q([Ljava/lang/Object;)Ljava/util/Iterator;
+.method public static final p([Ljava/lang/Object;)Ljava/util/Iterator;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/c$a.smali b/com.discord/smali_classes2/kotlin/jvm/internal/c$a.smali
index 50fbeea2a9..449c03fedb 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/c$a.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/c$a.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field private static final bkz:Lkotlin/jvm/internal/c$a;
+.field private static final bkT:Lkotlin/jvm/internal/c$a;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lkotlin/jvm/internal/c$a;-><init>()V
 
-    sput-object v0, Lkotlin/jvm/internal/c$a;->bkz:Lkotlin/jvm/internal/c$a;
+    sput-object v0, Lkotlin/jvm/internal/c$a;->bkT:Lkotlin/jvm/internal/c$a;
 
     return-void
 .end method
@@ -42,10 +42,10 @@
     return-void
 .end method
 
-.method static synthetic Ei()Lkotlin/jvm/internal/c$a;
+.method static synthetic DX()Lkotlin/jvm/internal/c$a;
     .locals 1
 
-    sget-object v0, Lkotlin/jvm/internal/c$a;->bkz:Lkotlin/jvm/internal/c$a;
+    sget-object v0, Lkotlin/jvm/internal/c$a;->bkT:Lkotlin/jvm/internal/c$a;
 
     return-object v0
 .end method
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/jvm/internal/c$a;->bkz:Lkotlin/jvm/internal/c$a;
+    sget-object v0, Lkotlin/jvm/internal/c$a;->bkT:Lkotlin/jvm/internal/c$a;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/d.smali b/com.discord/smali_classes2/kotlin/jvm/internal/d.smali
index 2751797e1f..37d79f805e 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/d.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/d.smali
@@ -7,7 +7,7 @@
 
 
 # virtual methods
-.method public abstract Ej()Ljava/lang/Class;
+.method public abstract DY()Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/e.smali b/com.discord/smali_classes2/kotlin/jvm/internal/e.smali
index 420104e3e1..4cc8c16b2a 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/e.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/e.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final bkA:Ljava/lang/Class;
+.field private final bkU:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -47,14 +47,14 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/jvm/internal/e;->bkA:Ljava/lang/Class;
+    iput-object p1, p0, Lkotlin/jvm/internal/e;->bkU:Ljava/lang/Class;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Ej()Ljava/lang/Class;
+.method public final DY()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -64,7 +64,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/jvm/internal/e;->bkA:Ljava/lang/Class;
+    iget-object v0, p0, Lkotlin/jvm/internal/e;->bkU:Ljava/lang/Class;
 
     return-object v0
 .end method
@@ -143,7 +143,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lkotlin/jvm/internal/e;->bkA:Ljava/lang/Class;
+    iget-object v1, p0, Lkotlin/jvm/internal/e;->bkU:Ljava/lang/Class;
 
     invoke-virtual {v1}, Ljava/lang/Class;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/f.smali b/com.discord/smali_classes2/kotlin/jvm/internal/f.smali
index c450f3f1a8..80c13da579 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/f.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/f.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bkB:[Ljava/lang/Object;
+.field private static final bkV:[Ljava/lang/Object;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    sput-object v0, Lkotlin/jvm/internal/f;->bkB:[Ljava/lang/Object;
+    sput-object v0, Lkotlin/jvm/internal/f;->bkV:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -239,7 +239,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object p0, Lkotlin/jvm/internal/f;->bkB:[Ljava/lang/Object;
+    sget-object p0, Lkotlin/jvm/internal/f;->bkV:[Ljava/lang/Object;
 
     return-object p0
 
@@ -254,7 +254,7 @@
 
     if-nez v1, :cond_1
 
-    sget-object p0, Lkotlin/jvm/internal/f;->bkB:[Ljava/lang/Object;
+    sget-object p0, Lkotlin/jvm/internal/f;->bkV:[Ljava/lang/Object;
 
     return-object p0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/g.smali b/com.discord/smali_classes2/kotlin/jvm/internal/g.smali
index f4e541ddda..65766bac61 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/g.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/g.smali
@@ -19,7 +19,7 @@
 # The value of this static final field might be set in the static constructor
 .field private static final POSITIVE_INFINITY:D = Infinity
 
-.field public static final bkC:Lkotlin/jvm/internal/g;
+.field public static final bkW:Lkotlin/jvm/internal/g;
 
 
 # direct methods
@@ -30,7 +30,7 @@
 
     invoke-direct {v0}, Lkotlin/jvm/internal/g;-><init>()V
 
-    sput-object v0, Lkotlin/jvm/internal/g;->bkC:Lkotlin/jvm/internal/g;
+    sput-object v0, Lkotlin/jvm/internal/g;->bkW:Lkotlin/jvm/internal/g;
 
     const-wide/16 v0, 0x1
 
@@ -63,7 +63,7 @@
     return-void
 .end method
 
-.method public static Ek()D
+.method public static DZ()D
     .locals 2
 
     sget-wide v0, Lkotlin/jvm/internal/g;->NaN:D
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/h.smali b/com.discord/smali_classes2/kotlin/jvm/internal/h.smali
index ba58e71411..4e5b5e598f 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/h.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/h.smali
@@ -19,7 +19,7 @@
 # The value of this static final field might be set in the static constructor
 .field private static final POSITIVE_INFINITY:F = Infinityf
 
-.field public static final bkD:Lkotlin/jvm/internal/h;
+.field public static final bkX:Lkotlin/jvm/internal/h;
 
 
 # direct methods
@@ -30,7 +30,7 @@
 
     invoke-direct {v0}, Lkotlin/jvm/internal/h;-><init>()V
 
-    sput-object v0, Lkotlin/jvm/internal/h;->bkD:Lkotlin/jvm/internal/h;
+    sput-object v0, Lkotlin/jvm/internal/h;->bkX:Lkotlin/jvm/internal/h;
 
     const/4 v0, 0x1
 
@@ -63,7 +63,7 @@
     return-void
 .end method
 
-.method public static El()F
+.method public static Ea()F
     .locals 1
 
     sget v0, Lkotlin/jvm/internal/h;->MAX_VALUE:F
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/o.smali b/com.discord/smali_classes2/kotlin/jvm/internal/o.smali
index 60660e90a2..2c6a698197 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/o.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/o.smali
@@ -17,7 +17,7 @@
 
 
 # virtual methods
-.method public final Eq()Lkotlin/reflect/d$a;
+.method public final Ef()Lkotlin/reflect/d$a;
     .locals 1
 
     invoke-virtual {p0}, Lkotlin/jvm/internal/o;->getReflected()Lkotlin/reflect/KProperty;
@@ -26,7 +26,7 @@
 
     check-cast v0, Lkotlin/reflect/c;
 
-    invoke-interface {v0}, Lkotlin/reflect/c;->Eq()Lkotlin/reflect/d$a;
+    invoke-interface {v0}, Lkotlin/reflect/c;->Ef()Lkotlin/reflect/d$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/p.smali b/com.discord/smali_classes2/kotlin/jvm/internal/p.smali
index fc61128a50..d6c7728f04 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/p.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/p.smali
@@ -31,7 +31,7 @@
 .method public final get(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 3
 
-    invoke-virtual {p0}, Lkotlin/jvm/internal/p;->Eq()Lkotlin/reflect/d$a;
+    invoke-virtual {p0}, Lkotlin/jvm/internal/p;->Ef()Lkotlin/reflect/d$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/q.smali b/com.discord/smali_classes2/kotlin/jvm/internal/q.smali
index 9a652d96c6..13c463d62a 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/q.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/q.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final bkA:Ljava/lang/Class;
+.field private final bkU:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private final bkE:Ljava/lang/String;
+.field private final bkY:Ljava/lang/String;
 
 
 # direct methods
@@ -42,16 +42,16 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/jvm/internal/q;->bkA:Ljava/lang/Class;
+    iput-object p1, p0, Lkotlin/jvm/internal/q;->bkU:Ljava/lang/Class;
 
-    iput-object p2, p0, Lkotlin/jvm/internal/q;->bkE:Ljava/lang/String;
+    iput-object p2, p0, Lkotlin/jvm/internal/q;->bkY:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Ej()Ljava/lang/Class;
+.method public final DY()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -61,7 +61,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/jvm/internal/q;->bkA:Ljava/lang/Class;
+    iget-object v0, p0, Lkotlin/jvm/internal/q;->bkU:Ljava/lang/Class;
 
     return-object v0
 .end method
@@ -73,11 +73,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/jvm/internal/q;->bkA:Ljava/lang/Class;
+    iget-object v0, p0, Lkotlin/jvm/internal/q;->bkU:Ljava/lang/Class;
 
     check-cast p1, Lkotlin/jvm/internal/q;
 
-    iget-object p1, p1, Lkotlin/jvm/internal/q;->bkA:Ljava/lang/Class;
+    iget-object p1, p1, Lkotlin/jvm/internal/q;->bkU:Ljava/lang/Class;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -98,7 +98,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lkotlin/jvm/internal/q;->bkA:Ljava/lang/Class;
+    iget-object v0, p0, Lkotlin/jvm/internal/q;->bkU:Ljava/lang/Class;
 
     invoke-virtual {v0}, Ljava/lang/Class;->hashCode()I
 
@@ -114,7 +114,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lkotlin/jvm/internal/q;->bkA:Ljava/lang/Class;
+    iget-object v1, p0, Lkotlin/jvm/internal/q;->bkU:Ljava/lang/Class;
 
     invoke-virtual {v1}, Ljava/lang/Class;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/u.smali b/com.discord/smali_classes2/kotlin/jvm/internal/u.smali
index b9d2305c02..f263a71e71 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/u.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/u.smali
@@ -17,7 +17,7 @@
 
 
 # virtual methods
-.method public final Eq()Lkotlin/reflect/d$a;
+.method public final Ef()Lkotlin/reflect/d$a;
     .locals 1
 
     invoke-virtual {p0}, Lkotlin/jvm/internal/u;->getReflected()Lkotlin/reflect/KProperty;
@@ -26,7 +26,7 @@
 
     check-cast v0, Lkotlin/reflect/d;
 
-    invoke-interface {v0}, Lkotlin/reflect/d;->Eq()Lkotlin/reflect/d$a;
+    invoke-interface {v0}, Lkotlin/reflect/d;->Ef()Lkotlin/reflect/d$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/v.smali b/com.discord/smali_classes2/kotlin/jvm/internal/v.smali
index 6605ae130b..6b0c45b3ae 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/v.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/v.smali
@@ -31,7 +31,7 @@
 .method public final get(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 3
 
-    invoke-virtual {p0}, Lkotlin/jvm/internal/v;->Eq()Lkotlin/reflect/d$a;
+    invoke-virtual {p0}, Lkotlin/jvm/internal/v;->Ef()Lkotlin/reflect/d$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/w.smali b/com.discord/smali_classes2/kotlin/jvm/internal/w.smali
index 518b9a21eb..afbcda2981 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/w.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/w.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final bkF:Lkotlin/jvm/internal/x;
+.field private static final bkZ:Lkotlin/jvm/internal/x;
 
-.field private static final bkG:[Lkotlin/reflect/b;
+.field private static final bla:[Lkotlin/reflect/b;
 
 
 # direct methods
@@ -51,13 +51,13 @@
     invoke-direct {v0}, Lkotlin/jvm/internal/x;-><init>()V
 
     :goto_1
-    sput-object v0, Lkotlin/jvm/internal/w;->bkF:Lkotlin/jvm/internal/x;
+    sput-object v0, Lkotlin/jvm/internal/w;->bkZ:Lkotlin/jvm/internal/x;
 
     const/4 v0, 0x0
 
     new-array v0, v0, [Lkotlin/reflect/b;
 
-    sput-object v0, Lkotlin/jvm/internal/w;->bkG:[Lkotlin/reflect/b;
+    sput-object v0, Lkotlin/jvm/internal/w;->bla:[Lkotlin/reflect/b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/y.smali b/com.discord/smali_classes2/kotlin/jvm/internal/y.smali
index 1060ca2e4e..79ebe3b1f7 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/y.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/y.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final bkH:Ljava/util/ArrayList;
+.field public final blb:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -27,7 +27,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object v0, p0, Lkotlin/jvm/internal/y;->bkH:Ljava/util/ArrayList;
+    iput-object v0, p0, Lkotlin/jvm/internal/y;->blb:Ljava/util/ArrayList;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/z.smali b/com.discord/smali_classes2/kotlin/jvm/internal/z.smali
index a7a87ae314..29801d92cb 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/z.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/z.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bkI:Lkotlin/jvm/internal/z;
+.field public static final blc:Lkotlin/jvm/internal/z;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlin/jvm/internal/z;-><init>()V
 
-    sput-object v0, Lkotlin/jvm/internal/z;->bkI:Lkotlin/jvm/internal/z;
+    sput-object v0, Lkotlin/jvm/internal/z;->blc:Lkotlin/jvm/internal/z;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/m.smali b/com.discord/smali_classes2/kotlin/m.smali
index 816520f64d..56d5bb0204 100644
--- a/com.discord/smali_classes2/kotlin/m.smali
+++ b/com.discord/smali_classes2/kotlin/m.smali
@@ -26,7 +26,7 @@
 
 
 # static fields
-.field public static final bjC:Lkotlin/m$a;
+.field public static final bjW:Lkotlin/m$a;
 
 
 # instance fields
@@ -43,7 +43,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/m$a;-><init>(B)V
 
-    sput-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sput-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/o.smali b/com.discord/smali_classes2/kotlin/o.smali
index a921cc0f9a..72a5a0fb91 100644
--- a/com.discord/smali_classes2/kotlin/o.smali
+++ b/com.discord/smali_classes2/kotlin/o.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final bjD:Lkotlin/o$a;
+.field public static final bjX:Lkotlin/o$a;
 
 .field private static final valueUpdater:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
     .annotation system Ldalvik/annotation/Signature;
@@ -68,7 +68,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/o$a;-><init>(B)V
 
-    sput-object v0, Lkotlin/o;->bjD:Lkotlin/o$a;
+    sput-object v0, Lkotlin/o;->bjX:Lkotlin/o$a;
 
     const-class v0, Lkotlin/o;
 
@@ -103,11 +103,11 @@
 
     iput-object p1, p0, Lkotlin/o;->initializer:Lkotlin/jvm/functions/Function0;
 
-    sget-object p1, Lkotlin/s;->bjE:Lkotlin/s;
+    sget-object p1, Lkotlin/s;->bjY:Lkotlin/s;
 
     iput-object p1, p0, Lkotlin/o;->_value:Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/s;->bjE:Lkotlin/s;
+    sget-object p1, Lkotlin/s;->bjY:Lkotlin/s;
 
     iput-object p1, p0, Lkotlin/o;->final:Ljava/lang/Object;
 
@@ -140,7 +140,7 @@
 
     iget-object v0, p0, Lkotlin/o;->_value:Ljava/lang/Object;
 
-    sget-object v1, Lkotlin/s;->bjE:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bjY:Lkotlin/s;
 
     if-eq v0, v1, :cond_0
 
@@ -157,7 +157,7 @@
 
     sget-object v1, Lkotlin/o;->valueUpdater:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    sget-object v2, Lkotlin/s;->bjE:Lkotlin/s;
+    sget-object v2, Lkotlin/s;->bjY:Lkotlin/s;
 
     invoke-virtual {v1, p0, v2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -182,7 +182,7 @@
 
     iget-object v0, p0, Lkotlin/o;->_value:Ljava/lang/Object;
 
-    sget-object v1, Lkotlin/s;->bjE:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bjY:Lkotlin/s;
 
     if-eq v0, v1, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlin/p.smali b/com.discord/smali_classes2/kotlin/p.smali
index 322c95e015..53c92c017d 100644
--- a/com.discord/smali_classes2/kotlin/p.smali
+++ b/com.discord/smali_classes2/kotlin/p.smali
@@ -67,7 +67,7 @@
 
     iput-object p1, p0, Lkotlin/p;->initializer:Lkotlin/jvm/functions/Function0;
 
-    sget-object p1, Lkotlin/s;->bjE:Lkotlin/s;
+    sget-object p1, Lkotlin/s;->bjY:Lkotlin/s;
 
     iput-object p1, p0, Lkotlin/p;->_value:Ljava/lang/Object;
 
@@ -102,7 +102,7 @@
 
     iget-object v0, p0, Lkotlin/p;->_value:Ljava/lang/Object;
 
-    sget-object v1, Lkotlin/s;->bjE:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bjY:Lkotlin/s;
 
     if-eq v0, v1, :cond_0
 
@@ -116,7 +116,7 @@
     :try_start_0
     iget-object v1, p0, Lkotlin/p;->_value:Ljava/lang/Object;
 
-    sget-object v2, Lkotlin/s;->bjE:Lkotlin/s;
+    sget-object v2, Lkotlin/s;->bjY:Lkotlin/s;
 
     if-eq v1, v2, :cond_1
 
@@ -127,7 +127,7 @@
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     invoke-interface {v1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
@@ -160,7 +160,7 @@
 
     iget-object v0, p0, Lkotlin/p;->_value:Ljava/lang/Object;
 
-    sget-object v1, Lkotlin/s;->bjE:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bjY:Lkotlin/s;
 
     if-eq v0, v1, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlin/properties/a.smali b/com.discord/smali_classes2/kotlin/properties/a.smali
index 3e486ea408..39b18bb5b3 100644
--- a/com.discord/smali_classes2/kotlin/properties/a.smali
+++ b/com.discord/smali_classes2/kotlin/properties/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bkJ:Lkotlin/properties/a;
+.field public static final bld:Lkotlin/properties/a;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlin/properties/a;-><init>()V
 
-    sput-object v0, Lkotlin/properties/a;->bkJ:Lkotlin/properties/a;
+    sput-object v0, Lkotlin/properties/a;->bld:Lkotlin/properties/a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/reflect/KVisibility.smali b/com.discord/smali_classes2/kotlin/reflect/KVisibility.smali
index 7ff4dd2cbf..9e66fb5e2a 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KVisibility.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KVisibility.smali
@@ -14,15 +14,15 @@
 
 
 # static fields
-.field public static final enum bkY:Lkotlin/reflect/KVisibility;
+.field public static final enum bls:Lkotlin/reflect/KVisibility;
 
-.field public static final enum bkZ:Lkotlin/reflect/KVisibility;
+.field public static final enum blt:Lkotlin/reflect/KVisibility;
 
-.field public static final enum bla:Lkotlin/reflect/KVisibility;
+.field public static final enum blu:Lkotlin/reflect/KVisibility;
 
-.field public static final enum blb:Lkotlin/reflect/KVisibility;
+.field public static final enum blv:Lkotlin/reflect/KVisibility;
 
-.field private static final synthetic blc:[Lkotlin/reflect/KVisibility;
+.field private static final synthetic blw:[Lkotlin/reflect/KVisibility;
 
 
 # direct methods
@@ -41,7 +41,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlin/reflect/KVisibility;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlin/reflect/KVisibility;->bkY:Lkotlin/reflect/KVisibility;
+    sput-object v1, Lkotlin/reflect/KVisibility;->bls:Lkotlin/reflect/KVisibility;
 
     aput-object v1, v0, v2
 
@@ -53,7 +53,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlin/reflect/KVisibility;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlin/reflect/KVisibility;->bkZ:Lkotlin/reflect/KVisibility;
+    sput-object v1, Lkotlin/reflect/KVisibility;->blt:Lkotlin/reflect/KVisibility;
 
     aput-object v1, v0, v2
 
@@ -65,7 +65,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlin/reflect/KVisibility;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlin/reflect/KVisibility;->bla:Lkotlin/reflect/KVisibility;
+    sput-object v1, Lkotlin/reflect/KVisibility;->blu:Lkotlin/reflect/KVisibility;
 
     aput-object v1, v0, v2
 
@@ -77,11 +77,11 @@
 
     invoke-direct {v1, v3, v2}, Lkotlin/reflect/KVisibility;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlin/reflect/KVisibility;->blb:Lkotlin/reflect/KVisibility;
+    sput-object v1, Lkotlin/reflect/KVisibility;->blv:Lkotlin/reflect/KVisibility;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlin/reflect/KVisibility;->blc:[Lkotlin/reflect/KVisibility;
+    sput-object v0, Lkotlin/reflect/KVisibility;->blw:[Lkotlin/reflect/KVisibility;
 
     return-void
 .end method
@@ -116,7 +116,7 @@
 .method public static values()[Lkotlin/reflect/KVisibility;
     .locals 1
 
-    sget-object v0, Lkotlin/reflect/KVisibility;->blc:[Lkotlin/reflect/KVisibility;
+    sget-object v0, Lkotlin/reflect/KVisibility;->blw:[Lkotlin/reflect/KVisibility;
 
     invoke-virtual {v0}, [Lkotlin/reflect/KVisibility;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/reflect/d.smali b/com.discord/smali_classes2/kotlin/reflect/d.smali
index 8e3f9da2e3..000b0994db 100644
--- a/com.discord/smali_classes2/kotlin/reflect/d.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/d.smali
@@ -31,7 +31,7 @@
 
 
 # virtual methods
-.method public abstract Eq()Lkotlin/reflect/d$a;
+.method public abstract Ef()Lkotlin/reflect/d$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/kotlin/s.smali b/com.discord/smali_classes2/kotlin/s.smali
index cc9be9c7d0..3d06288f3e 100644
--- a/com.discord/smali_classes2/kotlin/s.smali
+++ b/com.discord/smali_classes2/kotlin/s.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bjE:Lkotlin/s;
+.field public static final bjY:Lkotlin/s;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlin/s;-><init>()V
 
-    sput-object v0, Lkotlin/s;->bjE:Lkotlin/s;
+    sput-object v0, Lkotlin/s;->bjY:Lkotlin/s;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/sequences/a.smali b/com.discord/smali_classes2/kotlin/sequences/a.smali
index d6349581f7..4bf63926b7 100644
--- a/com.discord/smali_classes2/kotlin/sequences/a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/a.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final bld:Ljava/util/HashSet;
+.field private final blx:Ljava/util/HashSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashSet<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final ble:Ljava/util/Iterator;
+.field private final bly:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final blf:Lkotlin/jvm/functions/Function1;
+.field private final blz:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -69,26 +69,26 @@
 
     invoke-direct {p0}, Lkotlin/a/b;-><init>()V
 
-    iput-object p1, p0, Lkotlin/sequences/a;->ble:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/a;->bly:Ljava/util/Iterator;
 
-    iput-object p2, p0, Lkotlin/sequences/a;->blf:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/a;->blz:Lkotlin/jvm/functions/Function1;
 
     new-instance p1, Ljava/util/HashSet;
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lkotlin/sequences/a;->bld:Ljava/util/HashSet;
+    iput-object p1, p0, Lkotlin/sequences/a;->blx:Ljava/util/HashSet;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final DX()V
+.method public final DM()V
     .locals 3
 
     :cond_0
-    iget-object v0, p0, Lkotlin/sequences/a;->ble:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/a;->bly:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -96,19 +96,19 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lkotlin/sequences/a;->ble:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/a;->bly:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v1, p0, Lkotlin/sequences/a;->blf:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lkotlin/sequences/a;->blz: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, Lkotlin/sequences/a;->bld:Ljava/util/HashSet;
+    iget-object v2, p0, Lkotlin/sequences/a;->blx:Ljava/util/HashSet;
 
     invoke-virtual {v2, v1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
 
@@ -116,18 +116,18 @@
 
     if-eqz v1, :cond_0
 
-    iput-object v0, p0, Lkotlin/a/b;->bjJ:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlin/a/b;->bkd:Ljava/lang/Object;
 
-    sget v0, Lkotlin/a/ap;->bjY:I
+    sget v0, Lkotlin/a/ap;->bks:I
 
-    iput v0, p0, Lkotlin/a/b;->bjI:I
+    iput v0, p0, Lkotlin/a/b;->bkc:I
 
     return-void
 
     :cond_1
-    sget v0, Lkotlin/a/ap;->bka:I
+    sget v0, Lkotlin/a/ap;->bku:I
 
-    iput v0, p0, Lkotlin/a/b;->bjI:I
+    iput v0, p0, Lkotlin/a/b;->bkc:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/sequences/b.smali b/com.discord/smali_classes2/kotlin/sequences/b.smali
index 31ee721486..3a0c180628 100644
--- a/com.discord/smali_classes2/kotlin/sequences/b.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/b.smali
@@ -22,16 +22,7 @@
 
 
 # instance fields
-.field private final blf:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "TT;TK;>;"
-        }
-    .end annotation
-.end field
-
-.field private final blg:Lkotlin/sequences/Sequence;
+.field private final blA:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -40,6 +31,15 @@
     .end annotation
 .end field
 
+.field private final blz: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
@@ -64,9 +64,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/sequences/b;->blg:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/b;->blA:Lkotlin/sequences/Sequence;
 
-    iput-object p2, p0, Lkotlin/sequences/b;->blf:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/b;->blz:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -85,13 +85,13 @@
 
     new-instance v0, Lkotlin/sequences/a;
 
-    iget-object v1, p0, Lkotlin/sequences/b;->blg:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/b;->blA:Lkotlin/sequences/Sequence;
 
     invoke-interface {v1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
 
     move-result-object v1
 
-    iget-object v2, p0, Lkotlin/sequences/b;->blf:Lkotlin/jvm/functions/Function1;
+    iget-object v2, p0, Lkotlin/sequences/b;->blz:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {v0, v1, v2}, Lkotlin/sequences/a;-><init>(Ljava/util/Iterator;Lkotlin/jvm/functions/Function1;)V
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/c$a.smali b/com.discord/smali_classes2/kotlin/sequences/c$a.smali
index ea4ea83d95..3d945cf3b0 100644
--- a/com.discord/smali_classes2/kotlin/sequences/c$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/c$a.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field private final aaQ:Ljava/util/Iterator;
+.field private final abi:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final synthetic bli:Lkotlin/sequences/c;
+.field final synthetic blC:Lkotlin/sequences/c;
 
 .field private left:I
 
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/c$a;->bli:Lkotlin/sequences/c;
+    iput-object p1, p0, Lkotlin/sequences/c$a;->blC:Lkotlin/sequences/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,7 +63,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lkotlin/sequences/c$a;->aaQ:Ljava/util/Iterator;
+    iput-object v0, p0, Lkotlin/sequences/c$a;->abi:Ljava/util/Iterator;
 
     invoke-static {p1}, Lkotlin/sequences/c;->b(Lkotlin/sequences/c;)I
 
@@ -82,7 +82,7 @@
 
     if-lez v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/c$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/c$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -90,7 +90,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/c$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/c$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -113,7 +113,7 @@
 
     invoke-direct {p0}, Lkotlin/sequences/c$a;->drop()V
 
-    iget-object v0, p0, Lkotlin/sequences/c$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/c$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -132,7 +132,7 @@
 
     invoke-direct {p0}, Lkotlin/sequences/c$a;->drop()V
 
-    iget-object v0, p0, Lkotlin/sequences/c$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/c$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/c.smali b/com.discord/smali_classes2/kotlin/sequences/c.smali
index 375ca78f4b..78091615fd 100644
--- a/com.discord/smali_classes2/kotlin/sequences/c.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/c.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field private final blh:Lkotlin/sequences/Sequence;
+.field private final blB:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -52,7 +52,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/sequences/c;->blh:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/c;->blB:Lkotlin/sequences/Sequence;
 
     iput p2, p0, Lkotlin/sequences/c;->count:I
 
@@ -107,7 +107,7 @@
 .method public static final synthetic a(Lkotlin/sequences/c;)Lkotlin/sequences/Sequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/c;->blh:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/c;->blB:Lkotlin/sequences/Sequence;
 
     return-object p0
 .end method
@@ -122,7 +122,7 @@
 
 
 # virtual methods
-.method public final dp(I)Lkotlin/sequences/Sequence;
+.method public final dm(I)Lkotlin/sequences/Sequence;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -155,7 +155,7 @@
     :cond_0
     new-instance v0, Lkotlin/sequences/c;
 
-    iget-object v1, p0, Lkotlin/sequences/c;->blh:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/c;->blB:Lkotlin/sequences/Sequence;
 
     invoke-direct {v0, v1, p1}, Lkotlin/sequences/c;-><init>(Lkotlin/sequences/Sequence;I)V
 
@@ -164,7 +164,7 @@
     return-object v0
 .end method
 
-.method public final dq(I)Lkotlin/sequences/Sequence;
+.method public final dn(I)Lkotlin/sequences/Sequence;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -195,7 +195,7 @@
     :cond_0
     new-instance p1, Lkotlin/sequences/o;
 
-    iget-object v2, p0, Lkotlin/sequences/c;->blh:Lkotlin/sequences/Sequence;
+    iget-object v2, p0, Lkotlin/sequences/c;->blB:Lkotlin/sequences/Sequence;
 
     invoke-direct {p1, v2, v0, v1}, Lkotlin/sequences/o;-><init>(Lkotlin/sequences/Sequence;II)V
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/d.smali b/com.discord/smali_classes2/kotlin/sequences/d.smali
index 526086e670..fecf3101bd 100644
--- a/com.discord/smali_classes2/kotlin/sequences/d.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/d.smali
@@ -20,7 +20,7 @@
 
 
 # virtual methods
-.method public abstract dp(I)Lkotlin/sequences/Sequence;
+.method public abstract dm(I)Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(I)",
@@ -30,7 +30,7 @@
     .end annotation
 .end method
 
-.method public abstract dq(I)Lkotlin/sequences/Sequence;
+.method public abstract dn(I)Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(I)",
diff --git a/com.discord/smali_classes2/kotlin/sequences/e.smali b/com.discord/smali_classes2/kotlin/sequences/e.smali
index 912d695ee8..9469441132 100644
--- a/com.discord/smali_classes2/kotlin/sequences/e.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/e.smali
@@ -8,7 +8,7 @@
 
 
 # static fields
-.field public static final blj:Lkotlin/sequences/e;
+.field public static final blD:Lkotlin/sequences/e;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0}, Lkotlin/sequences/e;-><init>()V
 
-    sput-object v0, Lkotlin/sequences/e;->blj:Lkotlin/sequences/e;
+    sput-object v0, Lkotlin/sequences/e;->blD:Lkotlin/sequences/e;
 
     return-void
 .end method
@@ -34,20 +34,20 @@
 
 
 # virtual methods
-.method public final bridge synthetic dp(I)Lkotlin/sequences/Sequence;
+.method public final bridge synthetic dm(I)Lkotlin/sequences/Sequence;
     .locals 0
 
-    sget-object p1, Lkotlin/sequences/e;->blj:Lkotlin/sequences/e;
+    sget-object p1, Lkotlin/sequences/e;->blD:Lkotlin/sequences/e;
 
     check-cast p1, Lkotlin/sequences/Sequence;
 
     return-object p1
 .end method
 
-.method public final bridge synthetic dq(I)Lkotlin/sequences/Sequence;
+.method public final bridge synthetic dn(I)Lkotlin/sequences/Sequence;
     .locals 0
 
-    sget-object p1, Lkotlin/sequences/e;->blj:Lkotlin/sequences/e;
+    sget-object p1, Lkotlin/sequences/e;->blD:Lkotlin/sequences/e;
 
     check-cast p1, Lkotlin/sequences/Sequence;
 
@@ -57,7 +57,7 @@
 .method public final iterator()Ljava/util/Iterator;
     .locals 1
 
-    sget-object v0, Lkotlin/a/x;->bjT:Lkotlin/a/x;
+    sget-object v0, Lkotlin/a/x;->bkn:Lkotlin/a/x;
 
     check-cast v0, Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/f$a.smali b/com.discord/smali_classes2/kotlin/sequences/f$a.smali
index c21ab201a1..34d9d02c85 100644
--- a/com.discord/smali_classes2/kotlin/sequences/f$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/f$a.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field private final aaQ:Ljava/util/Iterator;
+.field private final abi:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,9 +37,9 @@
     .end annotation
 .end field
 
-.field private blm:I
+.field private blG:I
 
-.field private bln:Ljava/lang/Object;
+.field private blH:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -47,7 +47,7 @@
     .end annotation
 .end field
 
-.field final synthetic blo:Lkotlin/sequences/f;
+.field final synthetic blI:Lkotlin/sequences/f;
 
 
 # direct methods
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/f$a;->blo:Lkotlin/sequences/f;
+    iput-object p1, p0, Lkotlin/sequences/f$a;->blI:Lkotlin/sequences/f;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -71,20 +71,20 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlin/sequences/f$a;->aaQ:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/f$a;->abi:Ljava/util/Iterator;
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lkotlin/sequences/f$a;->blm:I
+    iput p1, p0, Lkotlin/sequences/f$a;->blG:I
 
     return-void
 .end method
 
-.method private final Eu()V
+.method private final Ej()V
     .locals 3
 
     :cond_0
-    iget-object v0, p0, Lkotlin/sequences/f$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/f$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -92,13 +92,13 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lkotlin/sequences/f$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/f$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v1, p0, Lkotlin/sequences/f$a;->blo:Lkotlin/sequences/f;
+    iget-object v1, p0, Lkotlin/sequences/f$a;->blI:Lkotlin/sequences/f;
 
     invoke-static {v1}, Lkotlin/sequences/f;->b(Lkotlin/sequences/f;)Lkotlin/jvm/functions/Function1;
 
@@ -114,7 +114,7 @@
 
     move-result v1
 
-    iget-object v2, p0, Lkotlin/sequences/f$a;->blo:Lkotlin/sequences/f;
+    iget-object v2, p0, Lkotlin/sequences/f$a;->blI:Lkotlin/sequences/f;
 
     invoke-static {v2}, Lkotlin/sequences/f;->a(Lkotlin/sequences/f;)Z
 
@@ -122,18 +122,18 @@
 
     if-ne v1, v2, :cond_0
 
-    iput-object v0, p0, Lkotlin/sequences/f$a;->bln:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlin/sequences/f$a;->blH:Ljava/lang/Object;
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lkotlin/sequences/f$a;->blm:I
+    iput v0, p0, Lkotlin/sequences/f$a;->blG:I
 
     return-void
 
     :cond_1
     const/4 v0, 0x0
 
-    iput v0, p0, Lkotlin/sequences/f$a;->blm:I
+    iput v0, p0, Lkotlin/sequences/f$a;->blG:I
 
     return-void
 .end method
@@ -143,16 +143,16 @@
 .method public final hasNext()Z
     .locals 2
 
-    iget v0, p0, Lkotlin/sequences/f$a;->blm:I
+    iget v0, p0, Lkotlin/sequences/f$a;->blG:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/f$a;->Eu()V
+    invoke-direct {p0}, Lkotlin/sequences/f$a;->Ej()V
 
     :cond_0
-    iget v0, p0, Lkotlin/sequences/f$a;->blm:I
+    iget v0, p0, Lkotlin/sequences/f$a;->blG:I
 
     const/4 v1, 0x1
 
@@ -174,26 +174,26 @@
         }
     .end annotation
 
-    iget v0, p0, Lkotlin/sequences/f$a;->blm:I
+    iget v0, p0, Lkotlin/sequences/f$a;->blG:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/f$a;->Eu()V
+    invoke-direct {p0}, Lkotlin/sequences/f$a;->Ej()V
 
     :cond_0
-    iget v0, p0, Lkotlin/sequences/f$a;->blm:I
+    iget v0, p0, Lkotlin/sequences/f$a;->blG:I
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lkotlin/sequences/f$a;->bln:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/sequences/f$a;->blH:Ljava/lang/Object;
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lkotlin/sequences/f$a;->bln:Ljava/lang/Object;
+    iput-object v2, p0, Lkotlin/sequences/f$a;->blH:Ljava/lang/Object;
 
-    iput v1, p0, Lkotlin/sequences/f$a;->blm:I
+    iput v1, p0, Lkotlin/sequences/f$a;->blG:I
 
     return-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/f.smali b/com.discord/smali_classes2/kotlin/sequences/f.smali
index 017fd111b2..08b737fe6a 100644
--- a/com.discord/smali_classes2/kotlin/sequences/f.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/f.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final blh:Lkotlin/sequences/Sequence;
+.field private final blB:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -29,9 +29,9 @@
     .end annotation
 .end field
 
-.field private final blk:Z
+.field private final blE:Z
 
-.field private final bll:Lkotlin/jvm/functions/Function1;
+.field private final blF:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -68,11 +68,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/sequences/f;->blh:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/f;->blB:Lkotlin/sequences/Sequence;
 
-    iput-boolean p2, p0, Lkotlin/sequences/f;->blk:Z
+    iput-boolean p2, p0, Lkotlin/sequences/f;->blE:Z
 
-    iput-object p3, p0, Lkotlin/sequences/f;->bll:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lkotlin/sequences/f;->blF:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 .method public static final synthetic a(Lkotlin/sequences/f;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lkotlin/sequences/f;->blk:Z
+    iget-boolean p0, p0, Lkotlin/sequences/f;->blE:Z
 
     return p0
 .end method
@@ -88,7 +88,7 @@
 .method public static final synthetic b(Lkotlin/sequences/f;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/f;->bll:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/f;->blF:Lkotlin/jvm/functions/Function1;
 
     return-object p0
 .end method
@@ -96,7 +96,7 @@
 .method public static final synthetic c(Lkotlin/sequences/f;)Lkotlin/sequences/Sequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/f;->blh:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/f;->blB:Lkotlin/sequences/Sequence;
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/sequences/g$a.smali b/com.discord/smali_classes2/kotlin/sequences/g$a.smali
index 682ecf26ef..046ef85dce 100644
--- a/com.discord/smali_classes2/kotlin/sequences/g$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/g$a.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field private final aaQ:Ljava/util/Iterator;
+.field private final abi:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private blr:Ljava/util/Iterator;
+.field private blL:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -46,7 +46,7 @@
     .end annotation
 .end field
 
-.field final synthetic bls:Lkotlin/sequences/g;
+.field final synthetic blM:Lkotlin/sequences/g;
 
 
 # direct methods
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/g$a;->bls:Lkotlin/sequences/g;
+    iput-object p1, p0, Lkotlin/sequences/g$a;->blM:Lkotlin/sequences/g;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -70,15 +70,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlin/sequences/g$a;->aaQ:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/g$a;->abi:Ljava/util/Iterator;
 
     return-void
 .end method
 
-.method private final Ev()Z
+.method private final Ek()Z
     .locals 4
 
-    iget-object v0, p0, Lkotlin/sequences/g$a;->blr:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->blL:Ljava/util/Iterator;
 
     if-eqz v0, :cond_0
 
@@ -90,16 +90,16 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lkotlin/sequences/g$a;->blr:Ljava/util/Iterator;
+    iput-object v0, p0, Lkotlin/sequences/g$a;->blL:Ljava/util/Iterator;
 
     :cond_0
-    iget-object v0, p0, Lkotlin/sequences/g$a;->blr:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->blL:Ljava/util/Iterator;
 
     const/4 v1, 0x1
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lkotlin/sequences/g$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -112,19 +112,19 @@
     return v0
 
     :cond_1
-    iget-object v0, p0, Lkotlin/sequences/g$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v2, p0, Lkotlin/sequences/g$a;->bls:Lkotlin/sequences/g;
+    iget-object v2, p0, Lkotlin/sequences/g$a;->blM:Lkotlin/sequences/g;
 
     invoke-static {v2}, Lkotlin/sequences/g;->a(Lkotlin/sequences/g;)Lkotlin/jvm/functions/Function1;
 
     move-result-object v2
 
-    iget-object v3, p0, Lkotlin/sequences/g$a;->bls:Lkotlin/sequences/g;
+    iget-object v3, p0, Lkotlin/sequences/g$a;->blM:Lkotlin/sequences/g;
 
     invoke-static {v3}, Lkotlin/sequences/g;->b(Lkotlin/sequences/g;)Lkotlin/jvm/functions/Function1;
 
@@ -146,7 +146,7 @@
 
     if-eqz v2, :cond_0
 
-    iput-object v0, p0, Lkotlin/sequences/g$a;->blr:Ljava/util/Iterator;
+    iput-object v0, p0, Lkotlin/sequences/g$a;->blL:Ljava/util/Iterator;
 
     :cond_2
     return v1
@@ -157,7 +157,7 @@
 .method public final hasNext()Z
     .locals 1
 
-    invoke-direct {p0}, Lkotlin/sequences/g$a;->Ev()Z
+    invoke-direct {p0}, Lkotlin/sequences/g$a;->Ek()Z
 
     move-result v0
 
@@ -172,17 +172,17 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lkotlin/sequences/g$a;->Ev()Z
+    invoke-direct {p0}, Lkotlin/sequences/g$a;->Ek()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lkotlin/sequences/g$a;->blr:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->blL:Ljava/util/Iterator;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/kotlin/sequences/g.smali b/com.discord/smali_classes2/kotlin/sequences/g.smali
index 444d3f2386..5120afa89a 100644
--- a/com.discord/smali_classes2/kotlin/sequences/g.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/g.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private final blh:Lkotlin/sequences/Sequence;
+.field private final blB:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private final blp:Lkotlin/jvm/functions/Function1;
+.field private final blJ:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -42,7 +42,7 @@
     .end annotation
 .end field
 
-.field private final blq:Lkotlin/jvm/functions/Function1;
+.field private final blK:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -85,11 +85,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/sequences/g;->blh:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/g;->blB:Lkotlin/sequences/Sequence;
 
-    iput-object p2, p0, Lkotlin/sequences/g;->blp:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/g;->blJ:Lkotlin/jvm/functions/Function1;
 
-    iput-object p3, p0, Lkotlin/sequences/g;->blq:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lkotlin/sequences/g;->blK:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -97,7 +97,7 @@
 .method public static final synthetic a(Lkotlin/sequences/g;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/g;->blq:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/g;->blK:Lkotlin/jvm/functions/Function1;
 
     return-object p0
 .end method
@@ -105,7 +105,7 @@
 .method public static final synthetic b(Lkotlin/sequences/g;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/g;->blp:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/g;->blJ:Lkotlin/jvm/functions/Function1;
 
     return-object p0
 .end method
@@ -113,7 +113,7 @@
 .method public static final synthetic c(Lkotlin/sequences/g;)Lkotlin/sequences/Sequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/g;->blh:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/g;->blB:Lkotlin/sequences/Sequence;
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/sequences/h$a.smali b/com.discord/smali_classes2/kotlin/sequences/h$a.smali
index 0b16a5628b..b9c4f3e452 100644
--- a/com.discord/smali_classes2/kotlin/sequences/h$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/h$a.smali
@@ -28,9 +28,9 @@
 
 
 # instance fields
-.field private blm:I
+.field private blG:I
 
-.field private bln:Ljava/lang/Object;
+.field private blH:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field final synthetic blv:Lkotlin/sequences/h;
+.field final synthetic blP:Lkotlin/sequences/h;
 
 
 # direct methods
@@ -50,27 +50,27 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/h$a;->blv:Lkotlin/sequences/h;
+    iput-object p1, p0, Lkotlin/sequences/h$a;->blP:Lkotlin/sequences/h;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     const/4 p1, -0x2
 
-    iput p1, p0, Lkotlin/sequences/h$a;->blm:I
+    iput p1, p0, Lkotlin/sequences/h$a;->blG:I
 
     return-void
 .end method
 
-.method private final Eu()V
+.method private final Ej()V
     .locals 2
 
-    iget v0, p0, Lkotlin/sequences/h$a;->blm:I
+    iget v0, p0, Lkotlin/sequences/h$a;->blG:I
 
     const/4 v1, -0x2
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/h$a;->blv:Lkotlin/sequences/h;
+    iget-object v0, p0, Lkotlin/sequences/h$a;->blP:Lkotlin/sequences/h;
 
     invoke-static {v0}, Lkotlin/sequences/h;->a(Lkotlin/sequences/h;)Lkotlin/jvm/functions/Function0;
 
@@ -83,17 +83,17 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lkotlin/sequences/h$a;->blv:Lkotlin/sequences/h;
+    iget-object v0, p0, Lkotlin/sequences/h$a;->blP:Lkotlin/sequences/h;
 
     invoke-static {v0}, Lkotlin/sequences/h;->b(Lkotlin/sequences/h;)Lkotlin/jvm/functions/Function1;
 
     move-result-object v0
 
-    iget-object v1, p0, Lkotlin/sequences/h$a;->bln:Ljava/lang/Object;
+    iget-object v1, p0, Lkotlin/sequences/h$a;->blH:Ljava/lang/Object;
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
     invoke-interface {v0, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -101,9 +101,9 @@
     move-result-object v0
 
     :goto_0
-    iput-object v0, p0, Lkotlin/sequences/h$a;->bln:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlin/sequences/h$a;->blH:Ljava/lang/Object;
 
-    iget-object v0, p0, Lkotlin/sequences/h$a;->bln:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/sequences/h$a;->blH:Ljava/lang/Object;
 
     if-nez v0, :cond_2
 
@@ -115,7 +115,7 @@
     const/4 v0, 0x1
 
     :goto_1
-    iput v0, p0, Lkotlin/sequences/h$a;->blm:I
+    iput v0, p0, Lkotlin/sequences/h$a;->blG:I
 
     return-void
 .end method
@@ -125,14 +125,14 @@
 .method public final hasNext()Z
     .locals 2
 
-    iget v0, p0, Lkotlin/sequences/h$a;->blm:I
+    iget v0, p0, Lkotlin/sequences/h$a;->blG:I
 
     if-gez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/h$a;->Eu()V
+    invoke-direct {p0}, Lkotlin/sequences/h$a;->Ej()V
 
     :cond_0
-    iget v0, p0, Lkotlin/sequences/h$a;->blm:I
+    iget v0, p0, Lkotlin/sequences/h$a;->blG:I
 
     const/4 v1, 0x1
 
@@ -154,24 +154,24 @@
         }
     .end annotation
 
-    iget v0, p0, Lkotlin/sequences/h$a;->blm:I
+    iget v0, p0, Lkotlin/sequences/h$a;->blG:I
 
     if-gez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/h$a;->Eu()V
+    invoke-direct {p0}, Lkotlin/sequences/h$a;->Ej()V
 
     :cond_0
-    iget v0, p0, Lkotlin/sequences/h$a;->blm:I
+    iget v0, p0, Lkotlin/sequences/h$a;->blG:I
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lkotlin/sequences/h$a;->bln:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/sequences/h$a;->blH:Ljava/lang/Object;
 
     if-eqz v0, :cond_1
 
     const/4 v1, -0x1
 
-    iput v1, p0, Lkotlin/sequences/h$a;->blm:I
+    iput v1, p0, Lkotlin/sequences/h$a;->blG:I
 
     return-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/h.smali b/com.discord/smali_classes2/kotlin/sequences/h.smali
index b5bf642f4d..eee72b19cc 100644
--- a/com.discord/smali_classes2/kotlin/sequences/h.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/h.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final blt:Lkotlin/jvm/functions/Function0;
+.field private final blN:Lkotlin/jvm/functions/Function0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function0<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field private final blu:Lkotlin/jvm/functions/Function1;
+.field private final blO:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -62,9 +62,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/sequences/h;->blt:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lkotlin/sequences/h;->blN:Lkotlin/jvm/functions/Function0;
 
-    iput-object p2, p0, Lkotlin/sequences/h;->blu:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/h;->blO:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 .method public static final synthetic a(Lkotlin/sequences/h;)Lkotlin/jvm/functions/Function0;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/h;->blt:Lkotlin/jvm/functions/Function0;
+    iget-object p0, p0, Lkotlin/sequences/h;->blN:Lkotlin/jvm/functions/Function0;
 
     return-object p0
 .end method
@@ -80,7 +80,7 @@
 .method public static final synthetic b(Lkotlin/sequences/h;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/h;->blu:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/h;->blO:Lkotlin/jvm/functions/Function1;
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/sequences/l$a.smali b/com.discord/smali_classes2/kotlin/sequences/l$a.smali
index 67abb2cec0..d865bc9c70 100644
--- a/com.discord/smali_classes2/kotlin/sequences/l$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/l$a.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final blw:Lkotlin/sequences/l$a;
+.field public static final blQ:Lkotlin/sequences/l$a;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotlin/sequences/l$a;-><init>()V
 
-    sput-object v0, Lkotlin/sequences/l$a;->blw:Lkotlin/sequences/l$a;
+    sput-object v0, Lkotlin/sequences/l$a;->blQ:Lkotlin/sequences/l$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/sequences/l$b.smali b/com.discord/smali_classes2/kotlin/sequences/l$b.smali
index 9e395c7c51..9167a42713 100644
--- a/com.discord/smali_classes2/kotlin/sequences/l$b.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/l$b.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final blx:Lkotlin/sequences/l$b;
+.field public static final blR:Lkotlin/sequences/l$b;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotlin/sequences/l$b;-><init>()V
 
-    sput-object v0, Lkotlin/sequences/l$b;->blx:Lkotlin/sequences/l$b;
+    sput-object v0, Lkotlin/sequences/l$b;->blR:Lkotlin/sequences/l$b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/sequences/l$c.smali b/com.discord/smali_classes2/kotlin/sequences/l$c.smali
index 9cb5eeeb69..c178c2d5d0 100644
--- a/com.discord/smali_classes2/kotlin/sequences/l$c.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/l$c.smali
@@ -26,7 +26,7 @@
 
 
 # static fields
-.field public static final bly:Lkotlin/sequences/l$c;
+.field public static final blS:Lkotlin/sequences/l$c;
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     invoke-direct {v0}, Lkotlin/sequences/l$c;-><init>()V
 
-    sput-object v0, Lkotlin/sequences/l$c;->bly:Lkotlin/sequences/l$c;
+    sput-object v0, Lkotlin/sequences/l$c;->blS:Lkotlin/sequences/l$c;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/sequences/n$a.smali b/com.discord/smali_classes2/kotlin/sequences/n$a.smali
index 7102f80791..cbc3108171 100644
--- a/com.discord/smali_classes2/kotlin/sequences/n$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/n$a.smali
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic blz:Lkotlin/sequences/Sequence;
+.field final synthetic blT:Lkotlin/sequences/Sequence;
 
 
 # direct methods
 .method public constructor <init>(Lkotlin/sequences/Sequence;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/sequences/n$a;->blz:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/n$a;->blT:Lkotlin/sequences/Sequence;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,7 +54,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/sequences/n$a;->blz:Lkotlin/sequences/Sequence;
+    iget-object v0, p0, Lkotlin/sequences/n$a;->blT:Lkotlin/sequences/Sequence;
 
     invoke-interface {v0}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/n$b.smali b/com.discord/smali_classes2/kotlin/sequences/n$b.smali
index 514ab203f6..d62a884668 100644
--- a/com.discord/smali_classes2/kotlin/sequences/n$b.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/n$b.smali
@@ -26,7 +26,7 @@
 
 
 # static fields
-.field public static final blA:Lkotlin/sequences/n$b;
+.field public static final blU:Lkotlin/sequences/n$b;
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     invoke-direct {v0}, Lkotlin/sequences/n$b;-><init>()V
 
-    sput-object v0, Lkotlin/sequences/n$b;->blA:Lkotlin/sequences/n$b;
+    sput-object v0, Lkotlin/sequences/n$b;->blU:Lkotlin/sequences/n$b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/sequences/n$c.smali b/com.discord/smali_classes2/kotlin/sequences/n$c.smali
index 8bf9d4dce7..f4cd4d4985 100644
--- a/com.discord/smali_classes2/kotlin/sequences/n$c.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/n$c.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final blB:Lkotlin/sequences/n$c;
+.field public static final blV:Lkotlin/sequences/n$c;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lkotlin/sequences/n$c;-><init>()V
 
-    sput-object v0, Lkotlin/sequences/n$c;->blB:Lkotlin/sequences/n$c;
+    sput-object v0, Lkotlin/sequences/n$c;->blV:Lkotlin/sequences/n$c;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/sequences/n$d.smali b/com.discord/smali_classes2/kotlin/sequences/n$d.smali
index 8b4d97c708..40c3ed9aad 100644
--- a/com.discord/smali_classes2/kotlin/sequences/n$d.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/n$d.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field final synthetic blC:Lkotlin/sequences/Sequence;
+.field final synthetic blW:Lkotlin/sequences/Sequence;
 
 
 # direct methods
@@ -40,7 +40,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/n$d;->blC:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/n$d;->blW:Lkotlin/sequences/Sequence;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/sequences/n$d;->blC:Lkotlin/sequences/Sequence;
+    iget-object v0, p0, Lkotlin/sequences/n$d;->blW:Lkotlin/sequences/Sequence;
 
     invoke-static {v0}, Lkotlin/sequences/i;->g(Lkotlin/sequences/Sequence;)Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/n$e.smali b/com.discord/smali_classes2/kotlin/sequences/n$e.smali
index 2f5d447024..80bbb3ad59 100644
--- a/com.discord/smali_classes2/kotlin/sequences/n$e.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/n$e.smali
@@ -28,7 +28,7 @@
 # instance fields
 .field final synthetic $comparator:Ljava/util/Comparator;
 
-.field final synthetic blD:Lkotlin/sequences/Sequence;
+.field final synthetic blX:Lkotlin/sequences/Sequence;
 
 
 # direct methods
@@ -44,7 +44,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/n$e;->blD:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/n$e;->blX:Lkotlin/sequences/Sequence;
 
     iput-object p2, p0, Lkotlin/sequences/n$e;->$comparator:Ljava/util/Comparator;
 
@@ -65,7 +65,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/sequences/n$e;->blD:Lkotlin/sequences/Sequence;
+    iget-object v0, p0, Lkotlin/sequences/n$e;->blX:Lkotlin/sequences/Sequence;
 
     invoke-static {v0}, Lkotlin/sequences/i;->g(Lkotlin/sequences/Sequence;)Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/o$a.smali b/com.discord/smali_classes2/kotlin/sequences/o$a.smali
index 315873c96e..63a487fa51 100644
--- a/com.discord/smali_classes2/kotlin/sequences/o$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/o$a.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field private final aaQ:Ljava/util/Iterator;
+.field private final abi:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final synthetic blE:Lkotlin/sequences/o;
+.field final synthetic blY:Lkotlin/sequences/o;
 
 .field private position:I
 
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/o$a;->blE:Lkotlin/sequences/o;
+    iput-object p1, p0, Lkotlin/sequences/o$a;->blY:Lkotlin/sequences/o;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,7 +63,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlin/sequences/o$a;->aaQ:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/o$a;->abi:Ljava/util/Iterator;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
     :goto_0
     iget v0, p0, Lkotlin/sequences/o$a;->position:I
 
-    iget-object v1, p0, Lkotlin/sequences/o$a;->blE:Lkotlin/sequences/o;
+    iget-object v1, p0, Lkotlin/sequences/o$a;->blY:Lkotlin/sequences/o;
 
     invoke-static {v1}, Lkotlin/sequences/o;->a(Lkotlin/sequences/o;)I
 
@@ -82,7 +82,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/o$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/o$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -90,7 +90,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/o$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/o$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -115,7 +115,7 @@
 
     iget v0, p0, Lkotlin/sequences/o$a;->position:I
 
-    iget-object v1, p0, Lkotlin/sequences/o$a;->blE:Lkotlin/sequences/o;
+    iget-object v1, p0, Lkotlin/sequences/o$a;->blY:Lkotlin/sequences/o;
 
     invoke-static {v1}, Lkotlin/sequences/o;->b(Lkotlin/sequences/o;)I
 
@@ -123,7 +123,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/o$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/o$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -153,7 +153,7 @@
 
     iget v0, p0, Lkotlin/sequences/o$a;->position:I
 
-    iget-object v1, p0, Lkotlin/sequences/o$a;->blE:Lkotlin/sequences/o;
+    iget-object v1, p0, Lkotlin/sequences/o$a;->blY:Lkotlin/sequences/o;
 
     invoke-static {v1}, Lkotlin/sequences/o;->b(Lkotlin/sequences/o;)I
 
@@ -167,7 +167,7 @@
 
     iput v0, p0, Lkotlin/sequences/o$a;->position:I
 
-    iget-object v0, p0, Lkotlin/sequences/o$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/o$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/o.smali b/com.discord/smali_classes2/kotlin/sequences/o.smali
index bc9be5047d..43ef99ca43 100644
--- a/com.discord/smali_classes2/kotlin/sequences/o.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/o.smali
@@ -23,7 +23,9 @@
 
 
 # instance fields
-.field private final blh:Lkotlin/sequences/Sequence;
+.field private final Ag:I
+
+.field private final blB:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -34,8 +36,6 @@
 
 .field private final startIndex:I
 
-.field private final zX:I
-
 
 # direct methods
 .method public constructor <init>(Lkotlin/sequences/Sequence;II)V
@@ -54,11 +54,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/sequences/o;->blh:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/o;->blB:Lkotlin/sequences/Sequence;
 
     iput p2, p0, Lkotlin/sequences/o;->startIndex:I
 
-    iput p3, p0, Lkotlin/sequences/o;->zX:I
+    iput p3, p0, Lkotlin/sequences/o;->Ag:I
 
     iget p1, p0, Lkotlin/sequences/o;->startIndex:I
 
@@ -78,7 +78,7 @@
     :goto_0
     if-eqz p1, :cond_5
 
-    iget p1, p0, Lkotlin/sequences/o;->zX:I
+    iget p1, p0, Lkotlin/sequences/o;->Ag:I
 
     if-ltz p1, :cond_1
 
@@ -92,7 +92,7 @@
     :goto_1
     if-eqz p1, :cond_4
 
-    iget p1, p0, Lkotlin/sequences/o;->zX:I
+    iget p1, p0, Lkotlin/sequences/o;->Ag:I
 
     iget v0, p0, Lkotlin/sequences/o;->startIndex:I
 
@@ -115,7 +115,7 @@
 
     invoke-direct {p1, p2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget p2, p0, Lkotlin/sequences/o;->zX:I
+    iget p2, p0, Lkotlin/sequences/o;->Ag:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -150,7 +150,7 @@
 
     invoke-direct {p1, p2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget p2, p0, Lkotlin/sequences/o;->zX:I
+    iget p2, p0, Lkotlin/sequences/o;->Ag:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -209,7 +209,7 @@
 .method public static final synthetic b(Lkotlin/sequences/o;)I
     .locals 0
 
-    iget p0, p0, Lkotlin/sequences/o;->zX:I
+    iget p0, p0, Lkotlin/sequences/o;->Ag:I
 
     return p0
 .end method
@@ -217,7 +217,7 @@
 .method public static final synthetic c(Lkotlin/sequences/o;)Lkotlin/sequences/Sequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/o;->blh:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/o;->blB:Lkotlin/sequences/Sequence;
 
     return-object p0
 .end method
@@ -225,7 +225,7 @@
 .method private final getCount()I
     .locals 2
 
-    iget v0, p0, Lkotlin/sequences/o;->zX:I
+    iget v0, p0, Lkotlin/sequences/o;->Ag:I
 
     iget v1, p0, Lkotlin/sequences/o;->startIndex:I
 
@@ -236,7 +236,7 @@
 
 
 # virtual methods
-.method public final dp(I)Lkotlin/sequences/Sequence;
+.method public final dm(I)Lkotlin/sequences/Sequence;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -254,7 +254,7 @@
 
     if-lt v0, p1, :cond_0
 
-    sget-object p1, Lkotlin/sequences/e;->blj:Lkotlin/sequences/e;
+    sget-object p1, Lkotlin/sequences/e;->blD:Lkotlin/sequences/e;
 
     check-cast p1, Lkotlin/sequences/Sequence;
 
@@ -263,13 +263,13 @@
     :cond_0
     new-instance p1, Lkotlin/sequences/o;
 
-    iget-object v1, p0, Lkotlin/sequences/o;->blh:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/o;->blB:Lkotlin/sequences/Sequence;
 
     iget v2, p0, Lkotlin/sequences/o;->startIndex:I
 
     add-int/2addr v2, v0
 
-    iget v0, p0, Lkotlin/sequences/o;->zX:I
+    iget v0, p0, Lkotlin/sequences/o;->Ag:I
 
     invoke-direct {p1, v1, v2, v0}, Lkotlin/sequences/o;-><init>(Lkotlin/sequences/Sequence;II)V
 
@@ -278,7 +278,7 @@
     return-object p1
 .end method
 
-.method public final dq(I)Lkotlin/sequences/Sequence;
+.method public final dn(I)Lkotlin/sequences/Sequence;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -303,7 +303,7 @@
     :cond_0
     new-instance v0, Lkotlin/sequences/o;
 
-    iget-object v1, p0, Lkotlin/sequences/o;->blh:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/o;->blB:Lkotlin/sequences/Sequence;
 
     iget v2, p0, Lkotlin/sequences/o;->startIndex:I
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/p$a.smali b/com.discord/smali_classes2/kotlin/sequences/p$a.smali
index a36ad23b17..9552408b9b 100644
--- a/com.discord/smali_classes2/kotlin/sequences/p$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/p$a.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field private final aaQ:Ljava/util/Iterator;
+.field private final abi:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final synthetic blF:Lkotlin/sequences/p;
+.field final synthetic blZ:Lkotlin/sequences/p;
 
 .field private left:I
 
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/p$a;->blF:Lkotlin/sequences/p;
+    iput-object p1, p0, Lkotlin/sequences/p$a;->blZ:Lkotlin/sequences/p;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -69,7 +69,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlin/sequences/p$a;->aaQ:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/p$a;->abi:Ljava/util/Iterator;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     if-lez v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/p$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/p$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -117,7 +117,7 @@
 
     iput v0, p0, Lkotlin/sequences/p$a;->left:I
 
-    iget-object v0, p0, Lkotlin/sequences/p$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/p$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/p.smali b/com.discord/smali_classes2/kotlin/sequences/p.smali
index 786d5fee25..02f4e01a1d 100644
--- a/com.discord/smali_classes2/kotlin/sequences/p.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/p.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field private final blh:Lkotlin/sequences/Sequence;
+.field private final blB:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -52,7 +52,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/sequences/p;->blh:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/p;->blB:Lkotlin/sequences/Sequence;
 
     iput p2, p0, Lkotlin/sequences/p;->count:I
 
@@ -115,14 +115,14 @@
 .method public static final synthetic b(Lkotlin/sequences/p;)Lkotlin/sequences/Sequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/p;->blh:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/p;->blB:Lkotlin/sequences/Sequence;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method public final dp(I)Lkotlin/sequences/Sequence;
+.method public final dm(I)Lkotlin/sequences/Sequence;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -138,7 +138,7 @@
 
     if-lt v0, p1, :cond_0
 
-    sget-object p1, Lkotlin/sequences/e;->blj:Lkotlin/sequences/e;
+    sget-object p1, Lkotlin/sequences/e;->blD:Lkotlin/sequences/e;
 
     check-cast p1, Lkotlin/sequences/Sequence;
 
@@ -147,7 +147,7 @@
     :cond_0
     new-instance v1, Lkotlin/sequences/o;
 
-    iget-object v2, p0, Lkotlin/sequences/p;->blh:Lkotlin/sequences/Sequence;
+    iget-object v2, p0, Lkotlin/sequences/p;->blB:Lkotlin/sequences/Sequence;
 
     invoke-direct {v1, v2, v0, p1}, Lkotlin/sequences/o;-><init>(Lkotlin/sequences/Sequence;II)V
 
@@ -156,7 +156,7 @@
     return-object v1
 .end method
 
-.method public final dq(I)Lkotlin/sequences/Sequence;
+.method public final dn(I)Lkotlin/sequences/Sequence;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -179,7 +179,7 @@
     :cond_0
     new-instance v0, Lkotlin/sequences/p;
 
-    iget-object v1, p0, Lkotlin/sequences/p;->blh:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/p;->blB:Lkotlin/sequences/Sequence;
 
     invoke-direct {v0, v1, p1}, Lkotlin/sequences/p;-><init>(Lkotlin/sequences/Sequence;I)V
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/q$a.smali b/com.discord/smali_classes2/kotlin/sequences/q$a.smali
index 7439fa160a..8b0cb013ec 100644
--- a/com.discord/smali_classes2/kotlin/sequences/q$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/q$a.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field private final aaQ:Ljava/util/Iterator;
+.field private final abi:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final synthetic blG:Lkotlin/sequences/q;
+.field final synthetic bma:Lkotlin/sequences/q;
 
 
 # direct methods
@@ -49,7 +49,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/q$a;->blG:Lkotlin/sequences/q;
+    iput-object p1, p0, Lkotlin/sequences/q$a;->bma:Lkotlin/sequences/q;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -61,7 +61,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlin/sequences/q$a;->aaQ:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/q$a;->abi:Ljava/util/Iterator;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 .method public final hasNext()Z
     .locals 1
 
-    iget-object v0, p0, Lkotlin/sequences/q$a;->aaQ:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/q$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -88,13 +88,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/sequences/q$a;->blG:Lkotlin/sequences/q;
+    iget-object v0, p0, Lkotlin/sequences/q$a;->bma:Lkotlin/sequences/q;
 
     invoke-static {v0}, Lkotlin/sequences/q;->a(Lkotlin/sequences/q;)Lkotlin/jvm/functions/Function1;
 
     move-result-object v0
 
-    iget-object v1, p0, Lkotlin/sequences/q$a;->aaQ:Ljava/util/Iterator;
+    iget-object v1, p0, Lkotlin/sequences/q$a;->abi:Ljava/util/Iterator;
 
     invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/q.smali b/com.discord/smali_classes2/kotlin/sequences/q.smali
index aab91e04ca..bee6a3cac0 100644
--- a/com.discord/smali_classes2/kotlin/sequences/q.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/q.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field private final blh:Lkotlin/sequences/Sequence;
+.field private final blB:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field private final blp:Lkotlin/jvm/functions/Function1;
+.field private final blJ:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -64,9 +64,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/sequences/q;->blh:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/q;->blB:Lkotlin/sequences/Sequence;
 
-    iput-object p2, p0, Lkotlin/sequences/q;->blp:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/q;->blJ:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 .method public static final synthetic a(Lkotlin/sequences/q;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/q;->blp:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/q;->blJ:Lkotlin/jvm/functions/Function1;
 
     return-object p0
 .end method
@@ -82,7 +82,7 @@
 .method public static final synthetic b(Lkotlin/sequences/q;)Lkotlin/sequences/Sequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/q;->blh:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/q;->blB:Lkotlin/sequences/Sequence;
 
     return-object p0
 .end method
@@ -111,9 +111,9 @@
 
     new-instance v0, Lkotlin/sequences/g;
 
-    iget-object v1, p0, Lkotlin/sequences/q;->blh:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/q;->blB:Lkotlin/sequences/Sequence;
 
-    iget-object v2, p0, Lkotlin/sequences/q;->blp:Lkotlin/jvm/functions/Function1;
+    iget-object v2, p0, Lkotlin/sequences/q;->blJ:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {v0, v1, v2, p1}, Lkotlin/sequences/g;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
 
diff --git a/com.discord/smali_classes2/kotlin/text/MatchResult.smali b/com.discord/smali_classes2/kotlin/text/MatchResult.smali
index bc5d69d186..c7f69c6bc7 100644
--- a/com.discord/smali_classes2/kotlin/text/MatchResult.smali
+++ b/com.discord/smali_classes2/kotlin/text/MatchResult.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract Ew()Ljava/util/List;
+.method public abstract El()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -15,7 +15,7 @@
     .end annotation
 .end method
 
-.method public abstract Ex()Lkotlin/text/MatchResult;
+.method public abstract Em()Lkotlin/text/MatchResult;
 .end method
 
 .method public abstract getRange()Lkotlin/ranges/IntRange;
diff --git a/com.discord/smali_classes2/kotlin/text/Regex$b.smali b/com.discord/smali_classes2/kotlin/text/Regex$b.smali
index c1894e8688..b1397eb431 100644
--- a/com.discord/smali_classes2/kotlin/text/Regex$b.smali
+++ b/com.discord/smali_classes2/kotlin/text/Regex$b.smali
@@ -24,7 +24,7 @@
 
 
 # static fields
-.field public static final blT:Lkotlin/text/Regex$b$a;
+.field public static final bmn:Lkotlin/text/Regex$b$a;
 
 .field private static final serialVersionUID:J
 
@@ -45,7 +45,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/text/Regex$b$a;-><init>(B)V
 
-    sput-object v0, Lkotlin/text/Regex$b;->blT:Lkotlin/text/Regex$b$a;
+    sput-object v0, Lkotlin/text/Regex$b;->bmn:Lkotlin/text/Regex$b$a;
 
     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 fc82bf26a9..755aaa43e3 100644
--- a/com.discord/smali_classes2/kotlin/text/Regex$d.smali
+++ b/com.discord/smali_classes2/kotlin/text/Regex$d.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final blU:Lkotlin/text/Regex$d;
+.field public static final bmo:Lkotlin/text/Regex$d;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lkotlin/text/Regex$d;-><init>()V
 
-    sput-object v0, Lkotlin/text/Regex$d;->blU:Lkotlin/text/Regex$d;
+    sput-object v0, Lkotlin/text/Regex$d;->bmo:Lkotlin/text/Regex$d;
 
     return-void
 .end method
@@ -93,7 +93,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lkotlin/text/MatchResult;->Ex()Lkotlin/text/MatchResult;
+    invoke-interface {p1}, Lkotlin/text/MatchResult;->Em()Lkotlin/text/MatchResult;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/kotlin/text/Regex.smali b/com.discord/smali_classes2/kotlin/text/Regex.smali
index a71b7ca0f2..0183845d5f 100644
--- a/com.discord/smali_classes2/kotlin/text/Regex.smali
+++ b/com.discord/smali_classes2/kotlin/text/Regex.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field public static final blS:Lkotlin/text/Regex$a;
+.field public static final bmm:Lkotlin/text/Regex$a;
 
 
 # instance fields
@@ -44,7 +44,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/text/Regex$a;-><init>(B)V
 
-    sput-object v0, Lkotlin/text/Regex;->blS:Lkotlin/text/Regex$a;
+    sput-object v0, Lkotlin/text/Regex;->bmm:Lkotlin/text/Regex$a;
 
     return-void
 .end method
@@ -253,7 +253,7 @@
 
     check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    sget-object p1, Lkotlin/text/Regex$d;->blU:Lkotlin/text/Regex$d;
+    sget-object p1, Lkotlin/text/Regex$d;->bmo:Lkotlin/text/Regex$d;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
diff --git a/com.discord/smali_classes2/kotlin/text/d.smali b/com.discord/smali_classes2/kotlin/text/d.smali
index 33ed81585e..7da28f77d4 100644
--- a/com.discord/smali_classes2/kotlin/text/d.smali
+++ b/com.discord/smali_classes2/kotlin/text/d.smali
@@ -16,7 +16,7 @@
 
 .field public static final UTF_8:Ljava/nio/charset/Charset;
 
-.field public static final blH:Lkotlin/text/d;
+.field public static final bmb:Lkotlin/text/d;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {v0}, Lkotlin/text/d;-><init>()V
 
-    sput-object v0, Lkotlin/text/d;->blH:Lkotlin/text/d;
+    sput-object v0, Lkotlin/text/d;->bmb:Lkotlin/text/d;
 
     const-string v0, "UTF-8"
 
diff --git a/com.discord/smali_classes2/kotlin/text/e$a.smali b/com.discord/smali_classes2/kotlin/text/e$a.smali
index fcaf1e3d27..dd6ce1ffd6 100644
--- a/com.discord/smali_classes2/kotlin/text/e$a.smali
+++ b/com.discord/smali_classes2/kotlin/text/e$a.smali
@@ -29,17 +29,17 @@
 
 
 # instance fields
-.field private blK:I
+.field private blG:I
 
-.field private blL:I
+.field private bme:I
 
-.field private blM:Lkotlin/ranges/IntRange;
+.field private bmf:I
 
-.field private blN:I
+.field private bmg:Lkotlin/ranges/IntRange;
 
-.field final synthetic blO:Lkotlin/text/e;
+.field private bmh:I
 
-.field private blm:I
+.field final synthetic bmi:Lkotlin/text/e;
 
 
 # direct methods
@@ -51,13 +51,13 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/text/e$a;->blO:Lkotlin/text/e;
+    iput-object p1, p0, Lkotlin/text/e$a;->bmi:Lkotlin/text/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lkotlin/text/e$a;->blm:I
+    iput v0, p0, Lkotlin/text/e$a;->blG:I
 
     invoke-static {p1}, Lkotlin/text/e;->d(Lkotlin/text/e;)I
 
@@ -77,34 +77,34 @@
 
     move-result p1
 
-    iput p1, p0, Lkotlin/text/e$a;->blK:I
+    iput p1, p0, Lkotlin/text/e$a;->bme:I
 
-    iget p1, p0, Lkotlin/text/e$a;->blK:I
+    iget p1, p0, Lkotlin/text/e$a;->bme:I
 
-    iput p1, p0, Lkotlin/text/e$a;->blL:I
+    iput p1, p0, Lkotlin/text/e$a;->bmf:I
 
     return-void
 .end method
 
-.method private final Eu()V
+.method private final Ej()V
     .locals 6
 
-    iget v0, p0, Lkotlin/text/e$a;->blL:I
+    iget v0, p0, Lkotlin/text/e$a;->bmf:I
 
     const/4 v1, 0x0
 
     if-gez v0, :cond_0
 
-    iput v1, p0, Lkotlin/text/e$a;->blm:I
+    iput v1, p0, Lkotlin/text/e$a;->blG:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lkotlin/text/e$a;->blM:Lkotlin/ranges/IntRange;
+    iput-object v0, p0, Lkotlin/text/e$a;->bmg:Lkotlin/ranges/IntRange;
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lkotlin/text/e$a;->blO:Lkotlin/text/e;
+    iget-object v0, p0, Lkotlin/text/e$a;->bmi:Lkotlin/text/e;
 
     invoke-static {v0}, Lkotlin/text/e;->a(Lkotlin/text/e;)I
 
@@ -116,15 +116,15 @@
 
     if-lez v0, :cond_1
 
-    iget v0, p0, Lkotlin/text/e$a;->blN:I
+    iget v0, p0, Lkotlin/text/e$a;->bmh:I
 
     add-int/2addr v0, v3
 
-    iput v0, p0, Lkotlin/text/e$a;->blN:I
+    iput v0, p0, Lkotlin/text/e$a;->bmh:I
 
-    iget v0, p0, Lkotlin/text/e$a;->blN:I
+    iget v0, p0, Lkotlin/text/e$a;->bmh:I
 
-    iget-object v4, p0, Lkotlin/text/e$a;->blO:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->bmi:Lkotlin/text/e;
 
     invoke-static {v4}, Lkotlin/text/e;->a(Lkotlin/text/e;)I
 
@@ -133,9 +133,9 @@
     if-ge v0, v4, :cond_2
 
     :cond_1
-    iget v0, p0, Lkotlin/text/e$a;->blL:I
+    iget v0, p0, Lkotlin/text/e$a;->bmf:I
 
-    iget-object v4, p0, Lkotlin/text/e$a;->blO:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->bmi:Lkotlin/text/e;
 
     invoke-static {v4}, Lkotlin/text/e;->b(Lkotlin/text/e;)Ljava/lang/CharSequence;
 
@@ -148,11 +148,11 @@
     if-le v0, v4, :cond_3
 
     :cond_2
-    iget v0, p0, Lkotlin/text/e$a;->blK:I
+    iget v0, p0, Lkotlin/text/e$a;->bme:I
 
     new-instance v1, Lkotlin/ranges/IntRange;
 
-    iget-object v4, p0, Lkotlin/text/e$a;->blO:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->bmi:Lkotlin/text/e;
 
     invoke-static {v4}, Lkotlin/text/e;->b(Lkotlin/text/e;)Ljava/lang/CharSequence;
 
@@ -164,26 +164,26 @@
 
     invoke-direct {v1, v0, v4}, Lkotlin/ranges/IntRange;-><init>(II)V
 
-    iput-object v1, p0, Lkotlin/text/e$a;->blM:Lkotlin/ranges/IntRange;
+    iput-object v1, p0, Lkotlin/text/e$a;->bmg:Lkotlin/ranges/IntRange;
 
-    iput v2, p0, Lkotlin/text/e$a;->blL:I
+    iput v2, p0, Lkotlin/text/e$a;->bmf:I
 
     goto :goto_0
 
     :cond_3
-    iget-object v0, p0, Lkotlin/text/e$a;->blO:Lkotlin/text/e;
+    iget-object v0, p0, Lkotlin/text/e$a;->bmi:Lkotlin/text/e;
 
     invoke-static {v0}, Lkotlin/text/e;->c(Lkotlin/text/e;)Lkotlin/jvm/functions/Function2;
 
     move-result-object v0
 
-    iget-object v4, p0, Lkotlin/text/e$a;->blO:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->bmi:Lkotlin/text/e;
 
     invoke-static {v4}, Lkotlin/text/e;->b(Lkotlin/text/e;)Ljava/lang/CharSequence;
 
     move-result-object v4
 
-    iget v5, p0, Lkotlin/text/e$a;->blL:I
+    iget v5, p0, Lkotlin/text/e$a;->bmf:I
 
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -197,11 +197,11 @@
 
     if-nez v0, :cond_4
 
-    iget v0, p0, Lkotlin/text/e$a;->blK:I
+    iget v0, p0, Lkotlin/text/e$a;->bme:I
 
     new-instance v1, Lkotlin/ranges/IntRange;
 
-    iget-object v4, p0, Lkotlin/text/e$a;->blO:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->bmi:Lkotlin/text/e;
 
     invoke-static {v4}, Lkotlin/text/e;->b(Lkotlin/text/e;)Ljava/lang/CharSequence;
 
@@ -213,9 +213,9 @@
 
     invoke-direct {v1, v0, v4}, Lkotlin/ranges/IntRange;-><init>(II)V
 
-    iput-object v1, p0, Lkotlin/text/e$a;->blM:Lkotlin/ranges/IntRange;
+    iput-object v1, p0, Lkotlin/text/e$a;->bmg:Lkotlin/ranges/IntRange;
 
-    iput v2, p0, Lkotlin/text/e$a;->blL:I
+    iput v2, p0, Lkotlin/text/e$a;->bmf:I
 
     goto :goto_0
 
@@ -236,19 +236,19 @@
 
     move-result v0
 
-    iget v4, p0, Lkotlin/text/e$a;->blK:I
+    iget v4, p0, Lkotlin/text/e$a;->bme:I
 
-    invoke-static {v4, v2}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v4, v2}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object v4
 
-    iput-object v4, p0, Lkotlin/text/e$a;->blM:Lkotlin/ranges/IntRange;
+    iput-object v4, p0, Lkotlin/text/e$a;->bmg:Lkotlin/ranges/IntRange;
 
     add-int/2addr v2, v0
 
-    iput v2, p0, Lkotlin/text/e$a;->blK:I
+    iput v2, p0, Lkotlin/text/e$a;->bme:I
 
-    iget v2, p0, Lkotlin/text/e$a;->blK:I
+    iget v2, p0, Lkotlin/text/e$a;->bme:I
 
     if-nez v0, :cond_5
 
@@ -257,10 +257,10 @@
     :cond_5
     add-int/2addr v2, v1
 
-    iput v2, p0, Lkotlin/text/e$a;->blL:I
+    iput v2, p0, Lkotlin/text/e$a;->bmf:I
 
     :goto_0
-    iput v3, p0, Lkotlin/text/e$a;->blm:I
+    iput v3, p0, Lkotlin/text/e$a;->blG:I
 
     return-void
 .end method
@@ -270,16 +270,16 @@
 .method public final hasNext()Z
     .locals 2
 
-    iget v0, p0, Lkotlin/text/e$a;->blm:I
+    iget v0, p0, Lkotlin/text/e$a;->blG:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/text/e$a;->Eu()V
+    invoke-direct {p0}, Lkotlin/text/e$a;->Ej()V
 
     :cond_0
-    iget v0, p0, Lkotlin/text/e$a;->blm:I
+    iget v0, p0, Lkotlin/text/e$a;->blG:I
 
     const/4 v1, 0x1
 
@@ -296,28 +296,28 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 3
 
-    iget v0, p0, Lkotlin/text/e$a;->blm:I
+    iget v0, p0, Lkotlin/text/e$a;->blG:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/text/e$a;->Eu()V
+    invoke-direct {p0}, Lkotlin/text/e$a;->Ej()V
 
     :cond_0
-    iget v0, p0, Lkotlin/text/e$a;->blm:I
+    iget v0, p0, Lkotlin/text/e$a;->blG:I
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lkotlin/text/e$a;->blM:Lkotlin/ranges/IntRange;
+    iget-object v0, p0, Lkotlin/text/e$a;->bmg:Lkotlin/ranges/IntRange;
 
     if-eqz v0, :cond_1
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lkotlin/text/e$a;->blM:Lkotlin/ranges/IntRange;
+    iput-object v2, p0, Lkotlin/text/e$a;->bmg:Lkotlin/ranges/IntRange;
 
-    iput v1, p0, Lkotlin/text/e$a;->blm:I
+    iput v1, p0, Lkotlin/text/e$a;->blG:I
 
     return-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/text/i$a.smali b/com.discord/smali_classes2/kotlin/text/i$a.smali
index 62cbe23b24..f3bc288c42 100644
--- a/com.discord/smali_classes2/kotlin/text/i$a.smali
+++ b/com.discord/smali_classes2/kotlin/text/i$a.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lkotlin/text/i;->Ew()Ljava/util/List;
+    value = Lkotlin/text/i;->El()Ljava/util/List;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field final synthetic blR:Lkotlin/text/i;
+.field final synthetic bml:Lkotlin/text/i;
 
 
 # direct methods
@@ -35,7 +35,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/text/i$a;->blR:Lkotlin/text/i;
+    iput-object p1, p0, Lkotlin/text/i$a;->bml:Lkotlin/text/i;
 
     invoke-direct {p0}, Lkotlin/a/d;-><init>()V
 
@@ -68,7 +68,7 @@
 .method public final synthetic get(I)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lkotlin/text/i$a;->blR:Lkotlin/text/i;
+    iget-object v0, p0, Lkotlin/text/i$a;->bml:Lkotlin/text/i;
 
     invoke-static {v0}, Lkotlin/text/i;->a(Lkotlin/text/i;)Ljava/util/regex/MatchResult;
 
@@ -89,7 +89,7 @@
 .method public final getSize()I
     .locals 1
 
-    iget-object v0, p0, Lkotlin/text/i$a;->blR:Lkotlin/text/i;
+    iget-object v0, p0, Lkotlin/text/i$a;->bml:Lkotlin/text/i;
 
     invoke-static {v0}, Lkotlin/text/i;->a(Lkotlin/text/i;)Ljava/util/regex/MatchResult;
 
diff --git a/com.discord/smali_classes2/kotlin/text/i$b$a.smali b/com.discord/smali_classes2/kotlin/text/i$b$a.smali
index 5d116c48d6..170cac08fc 100644
--- a/com.discord/smali_classes2/kotlin/text/i$b$a.smali
+++ b/com.discord/smali_classes2/kotlin/text/i$b$a.smali
@@ -57,7 +57,7 @@
 
     iget-object v0, p0, Lkotlin/text/i$b$a;->this$0:Lkotlin/text/i$b;
 
-    iget-object v1, v0, Lkotlin/text/i$b;->blR:Lkotlin/text/i;
+    iget-object v1, v0, Lkotlin/text/i$b;->bml:Lkotlin/text/i;
 
     invoke-static {v1}, Lkotlin/text/i;->a(Lkotlin/text/i;)Ljava/util/regex/MatchResult;
 
@@ -71,17 +71,17 @@
 
     move-result v1
 
-    invoke-static {v2, v1}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v2, v1}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object v1
 
-    iget v2, v1, Lkotlin/ranges/IntProgression;->bkQ:I
+    iget v2, v1, Lkotlin/ranges/IntProgression;->blk:I
 
     if-ltz v2, :cond_0
 
     new-instance v2, Lkotlin/text/f;
 
-    iget-object v0, v0, Lkotlin/text/i$b;->blR:Lkotlin/text/i;
+    iget-object v0, v0, Lkotlin/text/i$b;->bml:Lkotlin/text/i;
 
     invoke-static {v0}, Lkotlin/text/i;->a(Lkotlin/text/i;)Ljava/util/regex/MatchResult;
 
diff --git a/com.discord/smali_classes2/kotlin/text/i$b.smali b/com.discord/smali_classes2/kotlin/text/i$b.smali
index 4b6bb06eab..dbe3b10294 100644
--- a/com.discord/smali_classes2/kotlin/text/i$b.smali
+++ b/com.discord/smali_classes2/kotlin/text/i$b.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field final synthetic blR:Lkotlin/text/i;
+.field final synthetic bml:Lkotlin/text/i;
 
 
 # direct methods
@@ -39,7 +39,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/text/i$b;->blR:Lkotlin/text/i;
+    iput-object p1, p0, Lkotlin/text/i$b;->bml:Lkotlin/text/i;
 
     invoke-direct {p0}, Lkotlin/a/a;-><init>()V
 
@@ -80,7 +80,7 @@
 .method public final getSize()I
     .locals 1
 
-    iget-object v0, p0, Lkotlin/text/i$b;->blR:Lkotlin/text/i;
+    iget-object v0, p0, Lkotlin/text/i$b;->bml:Lkotlin/text/i;
 
     invoke-static {v0}, Lkotlin/text/i;->a(Lkotlin/text/i;)Ljava/util/regex/MatchResult;
 
diff --git a/com.discord/smali_classes2/kotlin/text/i.smali b/com.discord/smali_classes2/kotlin/text/i.smali
index c34457852d..28859f7fa8 100644
--- a/com.discord/smali_classes2/kotlin/text/i.smali
+++ b/com.discord/smali_classes2/kotlin/text/i.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final blI:Ljava/lang/CharSequence;
+.field private final bmc:Ljava/lang/CharSequence;
 
-.field private final blP:Lkotlin/text/g;
+.field private final bmj:Lkotlin/text/g;
 
-.field private blQ:Ljava/util/List;
+.field private bmk:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -40,7 +40,7 @@
 
     iput-object p1, p0, Lkotlin/text/i;->matcher:Ljava/util/regex/Matcher;
 
-    iput-object p2, p0, Lkotlin/text/i;->blI:Ljava/lang/CharSequence;
+    iput-object p2, p0, Lkotlin/text/i;->bmc:Ljava/lang/CharSequence;
 
     new-instance p1, Lkotlin/text/i$b;
 
@@ -48,7 +48,7 @@
 
     check-cast p1, Lkotlin/text/g;
 
-    iput-object p1, p0, Lkotlin/text/i;->blP:Lkotlin/text/g;
+    iput-object p1, p0, Lkotlin/text/i;->bmj:Lkotlin/text/g;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
 
 # virtual methods
-.method public final Ew()Ljava/util/List;
+.method public final El()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -76,7 +76,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/text/i;->blQ:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/text/i;->bmk:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -86,20 +86,20 @@
 
     check-cast v0, Ljava/util/List;
 
-    iput-object v0, p0, Lkotlin/text/i;->blQ:Ljava/util/List;
+    iput-object v0, p0, Lkotlin/text/i;->bmk:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lkotlin/text/i;->blQ:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/text/i;->bmk:Ljava/util/List;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
     return-object v0
 .end method
 
-.method public final Ex()Lkotlin/text/MatchResult;
+.method public final Em()Lkotlin/text/MatchResult;
     .locals 3
 
     iget-object v0, p0, Lkotlin/text/i;->matcher:Ljava/util/regex/Matcher;
@@ -138,7 +138,7 @@
     :goto_0
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lkotlin/text/i;->blI:Ljava/lang/CharSequence;
+    iget-object v1, p0, Lkotlin/text/i;->bmc:Ljava/lang/CharSequence;
 
     invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
 
@@ -152,7 +152,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lkotlin/text/i;->blI:Ljava/lang/CharSequence;
+    iget-object v2, p0, Lkotlin/text/i;->bmc:Ljava/lang/CharSequence;
 
     invoke-virtual {v1, v2}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -162,7 +162,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lkotlin/text/i;->blI:Ljava/lang/CharSequence;
+    iget-object v2, p0, Lkotlin/text/i;->bmc:Ljava/lang/CharSequence;
 
     invoke-static {v1, v0, v2}, Lkotlin/text/j;->a(Ljava/util/regex/Matcher;ILjava/lang/CharSequence;)Lkotlin/text/MatchResult;
 
@@ -191,7 +191,7 @@
 
     move-result v0
 
-    invoke-static {v1, v0}, Lkotlin/ranges/c;->Y(II)Lkotlin/ranges/IntRange;
+    invoke-static {v1, v0}, Lkotlin/ranges/c;->X(II)Lkotlin/ranges/IntRange;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlin/text/k.smali b/com.discord/smali_classes2/kotlin/text/k.smali
index 4492ee4766..ab9a4fb4f4 100644
--- a/com.discord/smali_classes2/kotlin/text/k.smali
+++ b/com.discord/smali_classes2/kotlin/text/k.smali
@@ -14,21 +14,21 @@
 
 
 # static fields
-.field public static final enum blV:Lkotlin/text/k;
+.field public static final enum bmp:Lkotlin/text/k;
 
-.field public static final enum blW:Lkotlin/text/k;
+.field public static final enum bmq:Lkotlin/text/k;
 
-.field public static final enum blX:Lkotlin/text/k;
+.field public static final enum bmr:Lkotlin/text/k;
 
-.field public static final enum blY:Lkotlin/text/k;
+.field public static final enum bms:Lkotlin/text/k;
 
-.field public static final enum blZ:Lkotlin/text/k;
+.field public static final enum bmt:Lkotlin/text/k;
 
-.field public static final enum bma:Lkotlin/text/k;
+.field public static final enum bmu:Lkotlin/text/k;
 
-.field public static final enum bmb:Lkotlin/text/k;
+.field public static final enum bmv:Lkotlin/text/k;
 
-.field private static final synthetic bmc:[Lkotlin/text/k;
+.field private static final synthetic bmw:[Lkotlin/text/k;
 
 
 # instance fields
@@ -55,7 +55,7 @@
 
     invoke-direct {v1, v4, v2, v3}, Lkotlin/text/k;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lkotlin/text/k;->blV:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bmp:Lkotlin/text/k;
 
     aput-object v1, v0, v2
 
@@ -69,7 +69,7 @@
 
     invoke-direct {v1, v4, v2, v5}, Lkotlin/text/k;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lkotlin/text/k;->blW:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bmq:Lkotlin/text/k;
 
     aput-object v1, v0, v2
 
@@ -81,7 +81,7 @@
 
     invoke-direct {v1, v4, v3, v5}, Lkotlin/text/k;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lkotlin/text/k;->blX:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bmr:Lkotlin/text/k;
 
     aput-object v1, v0, v3
 
@@ -93,7 +93,7 @@
 
     invoke-direct {v1, v4, v3, v2}, Lkotlin/text/k;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lkotlin/text/k;->blY:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bms:Lkotlin/text/k;
 
     aput-object v1, v0, v3
 
@@ -105,7 +105,7 @@
 
     invoke-direct {v1, v3, v2, v2}, Lkotlin/text/k;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lkotlin/text/k;->blZ:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bmt:Lkotlin/text/k;
 
     aput-object v1, v0, v2
 
@@ -119,7 +119,7 @@
 
     invoke-direct {v1, v3, v2, v4}, Lkotlin/text/k;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lkotlin/text/k;->bma:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bmu:Lkotlin/text/k;
 
     aput-object v1, v0, v2
 
@@ -133,11 +133,11 @@
 
     invoke-direct {v1, v3, v2, v4}, Lkotlin/text/k;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lkotlin/text/k;->bmb:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bmv:Lkotlin/text/k;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlin/text/k;->bmc:[Lkotlin/text/k;
+    sput-object v0, Lkotlin/text/k;->bmw:[Lkotlin/text/k;
 
     return-void
 .end method
@@ -184,7 +184,7 @@
 .method public static values()[Lkotlin/text/k;
     .locals 1
 
-    sget-object v0, Lkotlin/text/k;->bmc:[Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bmw:[Lkotlin/text/k;
 
     invoke-virtual {v0}, [Lkotlin/text/k;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/u.smali b/com.discord/smali_classes2/kotlin/u.smali
index c1fa27c48f..2f4329f6ef 100644
--- a/com.discord/smali_classes2/kotlin/u.smali
+++ b/com.discord/smali_classes2/kotlin/u.smali
@@ -53,7 +53,7 @@
 
     iput-object p1, p0, Lkotlin/u;->initializer:Lkotlin/jvm/functions/Function0;
 
-    sget-object p1, Lkotlin/s;->bjE:Lkotlin/s;
+    sget-object p1, Lkotlin/s;->bjY:Lkotlin/s;
 
     iput-object p1, p0, Lkotlin/u;->_value:Ljava/lang/Object;
 
@@ -86,7 +86,7 @@
 
     iget-object v0, p0, Lkotlin/u;->_value:Ljava/lang/Object;
 
-    sget-object v1, Lkotlin/s;->bjE:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bjY:Lkotlin/s;
 
     if-ne v0, v1, :cond_1
 
@@ -94,7 +94,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
@@ -118,7 +118,7 @@
 
     iget-object v0, p0, Lkotlin/u;->_value:Ljava/lang/Object;
 
-    sget-object v1, Lkotlin/s;->bjE:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bjY:Lkotlin/s;
 
     if-eq v0, v1, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlin/v.smali b/com.discord/smali_classes2/kotlin/v.smali
index 2444d4cc16..25ce7c126e 100644
--- a/com.discord/smali_classes2/kotlin/v.smali
+++ b/com.discord/smali_classes2/kotlin/v.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field public static final bjG:Z
+.field public static final bka:Z
 
-.field public static final bjH:Lkotlin/v;
+.field public static final bkb:Lkotlin/v;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lkotlin/v;-><init>()V
 
-    sput-object v0, Lkotlin/v;->bjH:Lkotlin/v;
+    sput-object v0, Lkotlin/v;->bkb:Lkotlin/v;
 
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -27,7 +27,7 @@
 
     move-result v0
 
-    sput-boolean v0, Lkotlin/v;->bjG:Z
+    sput-boolean v0, Lkotlin/v;->bka:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/CoroutineExceptionHandler$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/CoroutineExceptionHandler$a.smali
index 10f567bfb6..ee33821ef4 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/CoroutineExceptionHandler$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/CoroutineExceptionHandler$a.smali
@@ -27,7 +27,7 @@
 
 
 # static fields
-.field static final synthetic bmx:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+.field static final synthetic bmR:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/CoroutineExceptionHandler$a;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler$a;->bmx:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sput-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler$a;->bmR:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/CoroutineExceptionHandler.smali b/com.discord/smali_classes2/kotlinx/coroutines/CoroutineExceptionHandler.smali
index fcc4912204..1ebd46bff0 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/CoroutineExceptionHandler.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/CoroutineExceptionHandler.smali
@@ -15,16 +15,16 @@
 
 
 # static fields
-.field public static final bmw:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+.field public static final bmQ:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler$a;->bmx:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler$a;->bmR:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
-    sput-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bmw:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sput-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bmQ:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/CoroutineScope.smali b/com.discord/smali_classes2/kotlinx/coroutines/CoroutineScope.smali
index 192223a81d..ce2ff399af 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/CoroutineScope.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/CoroutineScope.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract Ey()Lkotlin/coroutines/CoroutineContext;
+.method public abstract En()Lkotlin/coroutines/CoroutineContext;
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/Job$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/Job$b.smali
index 271f619803..0484ebf8ef 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/Job$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/Job$b.smali
@@ -27,7 +27,7 @@
 
 
 # static fields
-.field static final synthetic bnn:Lkotlinx/coroutines/Job$b;
+.field static final synthetic bnH:Lkotlinx/coroutines/Job$b;
 
 
 # direct methods
@@ -38,9 +38,9 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/Job$b;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/Job$b;->bnn:Lkotlinx/coroutines/Job$b;
+    sput-object v0, Lkotlinx/coroutines/Job$b;->bnH:Lkotlinx/coroutines/Job$b;
 
-    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bmw:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bmQ:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/Job.smali b/com.discord/smali_classes2/kotlinx/coroutines/Job.smali
index 4f273e03d8..aaebcd903f 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/Job.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/Job.smali
@@ -16,23 +16,23 @@
 
 
 # static fields
-.field public static final bnm:Lkotlinx/coroutines/Job$b;
+.field public static final bnG:Lkotlinx/coroutines/Job$b;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/Job$b;->bnn:Lkotlinx/coroutines/Job$b;
+    sget-object v0, Lkotlinx/coroutines/Job$b;->bnH:Lkotlinx/coroutines/Job$b;
 
-    sput-object v0, Lkotlinx/coroutines/Job;->bnm:Lkotlinx/coroutines/Job$b;
+    sput-object v0, Lkotlinx/coroutines/Job;->bnG:Lkotlinx/coroutines/Job$b;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public abstract Fl()Ljava/util/concurrent/CancellationException;
+.method public abstract Fa()Ljava/util/concurrent/CancellationException;
 .end method
 
 .method public abstract a(ZZLkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/aq;
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a.smali b/com.discord/smali_classes2/kotlinx/coroutines/a.smali
index d0059868af..4d4adcafde 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a.smali
@@ -24,9 +24,9 @@
 
 
 # instance fields
-.field private final bme:Lkotlin/coroutines/CoroutineContext;
+.field private final bmy:Lkotlin/coroutines/CoroutineContext;
 
-.field protected final bmf:Lkotlin/coroutines/CoroutineContext;
+.field protected final bmz:Lkotlin/coroutines/CoroutineContext;
 
 
 # direct methods
@@ -39,9 +39,9 @@
 
     invoke-direct {p0, p2}, Lkotlinx/coroutines/bj;-><init>(Z)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/a;->bmf:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/a;->bmz:Lkotlin/coroutines/CoroutineContext;
 
-    iget-object p1, p0, Lkotlinx/coroutines/a;->bmf:Lkotlin/coroutines/CoroutineContext;
+    iget-object p1, p0, Lkotlinx/coroutines/a;->bmz:Lkotlin/coroutines/CoroutineContext;
 
     move-object p2, p0
 
@@ -51,14 +51,42 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlinx/coroutines/a;->bme:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/a;->bmy:Lkotlin/coroutines/CoroutineContext;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final EA()V
+.method public final En()Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bmy:Lkotlin/coroutines/CoroutineContext;
+
+    return-object v0
+.end method
+
+.method public final Eo()V
+    .locals 2
+
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bmz:Lkotlin/coroutines/CoroutineContext;
+
+    sget-object v1, Lkotlinx/coroutines/Job;->bnG:Lkotlinx/coroutines/Job$b;
+
+    check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
+
+    invoke-interface {v0, v1}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$c;)Lkotlin/coroutines/CoroutineContext$b;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlinx/coroutines/Job;
+
+    invoke-virtual {p0, v0}, Lkotlinx/coroutines/a;->c(Lkotlinx/coroutines/Job;)V
+
+    return-void
+.end method
+
+.method public final Ep()V
     .locals 0
 
     invoke-virtual {p0}, Lkotlinx/coroutines/a;->onStart()V
@@ -66,7 +94,7 @@
     return-void
 .end method
 
-.method public EB()I
+.method public Eq()I
     .locals 1
 
     const/4 v0, 0x0
@@ -74,10 +102,10 @@
     return v0
 .end method
 
-.method public final EC()Ljava/lang/String;
+.method public final Er()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bme:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bmy:Lkotlin/coroutines/CoroutineContext;
 
     invoke-static {v0}, Lkotlinx/coroutines/x;->a(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/String;
 
@@ -85,7 +113,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-super {p0}, Lkotlinx/coroutines/bj;->EC()Ljava/lang/String;
+    invoke-super {p0}, Lkotlinx/coroutines/bj;->Er()Ljava/lang/String;
 
     move-result-object v0
 
@@ -104,7 +132,7 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-super {p0}, Lkotlinx/coroutines/bj;->EC()Ljava/lang/String;
+    invoke-super {p0}, Lkotlinx/coroutines/bj;->Er()Ljava/lang/String;
 
     move-result-object v0
 
@@ -117,34 +145,6 @@
     return-object v0
 .end method
 
-.method public final Ey()Lkotlin/coroutines/CoroutineContext;
-    .locals 1
-
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bme:Lkotlin/coroutines/CoroutineContext;
-
-    return-object v0
-.end method
-
-.method public final Ez()V
-    .locals 2
-
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bmf:Lkotlin/coroutines/CoroutineContext;
-
-    sget-object v1, Lkotlinx/coroutines/Job;->bnm:Lkotlinx/coroutines/Job$b;
-
-    check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
-
-    invoke-interface {v0, v1}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$c;)Lkotlin/coroutines/CoroutineContext$b;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlinx/coroutines/Job;
-
-    invoke-virtual {p0, v0}, Lkotlinx/coroutines/a;->c(Lkotlinx/coroutines/Job;)V
-
-    return-void
-.end method
-
 .method public final a(Lkotlinx/coroutines/ad;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)V
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
@@ -171,7 +171,7 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/a;->Ez()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/a;->Eo()V
 
     move-object v1, p0
 
@@ -256,11 +256,11 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
-    sget-object p1, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object p1, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     if-eq p2, p1, :cond_2
 
-    sget-object p1, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object p1, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p2}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -284,7 +284,7 @@
     :catchall_1
     move-exception p1
 
-    sget-object p2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -313,9 +313,9 @@
 
     move-result-object p1
 
-    sget-object p2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
-    sget-object p3, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object p3, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p2}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -353,7 +353,7 @@
 .method public final getContext()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bme:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bmy:Lkotlin/coroutines/CoroutineContext;
 
     return-object v0
 .end method
@@ -381,7 +381,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bme:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bmy:Lkotlin/coroutines/CoroutineContext;
 
     invoke-static {v0, p1}, Lkotlinx/coroutines/aa;->b(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
 
@@ -395,7 +395,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/a;->EB()I
+    invoke-virtual {p0}, Lkotlinx/coroutines/a;->Eq()I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/a.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/a.smali
index 98044a3913..b4d8ecbf14 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/a.smali
@@ -41,7 +41,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-static {p0, p1}, Lkotlinx/coroutines/an;->a(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
     :try_end_0
@@ -52,7 +52,7 @@
     :catchall_0
     move-exception p0
 
-    sget-object p1, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object p1, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p0}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a/b.smali b/com.discord/smali_classes2/kotlinx/coroutines/a/b.smali
index 53de4260a1..097630c400 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/a/b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/a/b.smali
@@ -33,7 +33,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/a;->Ez()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/a;->Eo()V
 
     :try_start_0
     move-object v0, p0
@@ -64,7 +64,7 @@
     move-object p1, p2
 
     :goto_0
-    sget-object p2, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object p2, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     if-eq p1, p2, :cond_2
 
@@ -76,7 +76,7 @@
 
     if-eqz p1, :cond_2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/a;->Fo()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/a;->Fd()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -98,7 +98,7 @@
 
     check-cast p0, Lkotlinx/coroutines/internal/t;
 
-    iget-object p0, p0, Lkotlinx/coroutines/internal/t;->bop:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/internal/t;->boK:Lkotlin/coroutines/Continuation;
 
     if-nez p0, :cond_0
 
@@ -120,7 +120,7 @@
     return-object p0
 
     :cond_2
-    sget-object p0, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object p0, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/aa.smali b/com.discord/smali_classes2/kotlinx/coroutines/aa.smali
index 4ebe9285f8..72a6b553b4 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/aa.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/aa.smali
@@ -16,7 +16,7 @@
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bmw:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bmQ:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ab.smali b/com.discord/smali_classes2/kotlinx/coroutines/ab.smali
index 494eafdb86..a8ea049738 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ab.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ab.smali
@@ -24,7 +24,7 @@
 
 
 # static fields
-.field public static final bmz:Lkotlinx/coroutines/ab$a;
+.field public static final bmT:Lkotlinx/coroutines/ab$a;
 
 
 # instance fields
@@ -41,7 +41,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/ab$a;-><init>(B)V
 
-    sput-object v0, Lkotlinx/coroutines/ab;->bmz:Lkotlinx/coroutines/ab$a;
+    sput-object v0, Lkotlinx/coroutines/ab;->bmT:Lkotlinx/coroutines/ab$a;
 
     return-void
 .end method
@@ -49,7 +49,7 @@
 .method public constructor <init>(J)V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ab;->bmz:Lkotlinx/coroutines/ab$a;
+    sget-object v0, Lkotlinx/coroutines/ab;->bmT:Lkotlinx/coroutines/ab$a;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -95,7 +95,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/ac;->bmA:Lkotlinx/coroutines/ac$a;
+    sget-object v0, Lkotlinx/coroutines/ac;->bmU:Lkotlinx/coroutines/ac$a;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ac.smali b/com.discord/smali_classes2/kotlinx/coroutines/ac.smali
index c0aeb62f39..4bb9c96da5 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ac.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ac.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field public static final bmA:Lkotlinx/coroutines/ac$a;
+.field public static final bmU:Lkotlinx/coroutines/ac$a;
 
 
 # instance fields
@@ -29,7 +29,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/ac$a;-><init>(B)V
 
-    sput-object v0, Lkotlinx/coroutines/ac;->bmA:Lkotlinx/coroutines/ac$a;
+    sput-object v0, Lkotlinx/coroutines/ac;->bmU:Lkotlinx/coroutines/ac$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ad.smali b/com.discord/smali_classes2/kotlinx/coroutines/ad.smali
index e8f3703701..434ad94212 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ad.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ad.smali
@@ -14,15 +14,15 @@
 
 
 # static fields
-.field public static final enum bmB:Lkotlinx/coroutines/ad;
+.field public static final enum bmV:Lkotlinx/coroutines/ad;
 
-.field public static final enum bmC:Lkotlinx/coroutines/ad;
+.field public static final enum bmW:Lkotlinx/coroutines/ad;
 
-.field public static final enum bmD:Lkotlinx/coroutines/ad;
+.field public static final enum bmX:Lkotlinx/coroutines/ad;
 
-.field public static final enum bmE:Lkotlinx/coroutines/ad;
+.field public static final enum bmY:Lkotlinx/coroutines/ad;
 
-.field private static final synthetic bmF:[Lkotlinx/coroutines/ad;
+.field private static final synthetic bmZ:[Lkotlinx/coroutines/ad;
 
 
 # direct methods
@@ -41,7 +41,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/ad;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/ad;->bmB:Lkotlinx/coroutines/ad;
+    sput-object v1, Lkotlinx/coroutines/ad;->bmV:Lkotlinx/coroutines/ad;
 
     aput-object v1, v0, v2
 
@@ -53,7 +53,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/ad;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/ad;->bmC:Lkotlinx/coroutines/ad;
+    sput-object v1, Lkotlinx/coroutines/ad;->bmW:Lkotlinx/coroutines/ad;
 
     aput-object v1, v0, v2
 
@@ -65,7 +65,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/ad;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/ad;->bmD:Lkotlinx/coroutines/ad;
+    sput-object v1, Lkotlinx/coroutines/ad;->bmX:Lkotlinx/coroutines/ad;
 
     aput-object v1, v0, v2
 
@@ -77,11 +77,11 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/ad;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/ad;->bmE:Lkotlinx/coroutines/ad;
+    sput-object v1, Lkotlinx/coroutines/ad;->bmY:Lkotlinx/coroutines/ad;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlinx/coroutines/ad;->bmF:[Lkotlinx/coroutines/ad;
+    sput-object v0, Lkotlinx/coroutines/ad;->bmZ:[Lkotlinx/coroutines/ad;
 
     return-void
 .end method
@@ -116,7 +116,7 @@
 .method public static values()[Lkotlinx/coroutines/ad;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ad;->bmF:[Lkotlinx/coroutines/ad;
+    sget-object v0, Lkotlinx/coroutines/ad;->bmZ:[Lkotlinx/coroutines/ad;
 
     invoke-virtual {v0}, [Lkotlinx/coroutines/ad;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ae.smali b/com.discord/smali_classes2/kotlinx/coroutines/ae.smali
index 030319bf0b..44d283245b 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ae.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ae.smali
@@ -22,7 +22,7 @@
 
     sput-object v0, Lkotlinx/coroutines/ae;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/ad;->bmB:Lkotlinx/coroutines/ad;
+    sget-object v1, Lkotlinx/coroutines/ad;->bmV:Lkotlinx/coroutines/ad;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ad;->ordinal()I
 
@@ -34,7 +34,7 @@
 
     sget-object v0, Lkotlinx/coroutines/ae;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/ad;->bmD:Lkotlinx/coroutines/ad;
+    sget-object v1, Lkotlinx/coroutines/ad;->bmX:Lkotlinx/coroutines/ad;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ad;->ordinal()I
 
@@ -46,7 +46,7 @@
 
     sget-object v0, Lkotlinx/coroutines/ae;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/ad;->bmE:Lkotlinx/coroutines/ad;
+    sget-object v1, Lkotlinx/coroutines/ad;->bmY:Lkotlinx/coroutines/ad;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ad;->ordinal()I
 
@@ -58,7 +58,7 @@
 
     sget-object v0, Lkotlinx/coroutines/ae;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/ad;->bmC:Lkotlinx/coroutines/ad;
+    sget-object v1, Lkotlinx/coroutines/ad;->bmW:Lkotlinx/coroutines/ad;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ad;->ordinal()I
 
@@ -78,7 +78,7 @@
 
     sput-object v0, Lkotlinx/coroutines/ae;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lkotlinx/coroutines/ad;->bmB:Lkotlinx/coroutines/ad;
+    sget-object v1, Lkotlinx/coroutines/ad;->bmV:Lkotlinx/coroutines/ad;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ad;->ordinal()I
 
@@ -88,7 +88,7 @@
 
     sget-object v0, Lkotlinx/coroutines/ae;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lkotlinx/coroutines/ad;->bmD:Lkotlinx/coroutines/ad;
+    sget-object v1, Lkotlinx/coroutines/ad;->bmX:Lkotlinx/coroutines/ad;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ad;->ordinal()I
 
@@ -98,7 +98,7 @@
 
     sget-object v0, Lkotlinx/coroutines/ae;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lkotlinx/coroutines/ad;->bmE:Lkotlinx/coroutines/ad;
+    sget-object v1, Lkotlinx/coroutines/ad;->bmY:Lkotlinx/coroutines/ad;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ad;->ordinal()I
 
@@ -108,7 +108,7 @@
 
     sget-object v0, Lkotlinx/coroutines/ae;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lkotlinx/coroutines/ad;->bmC:Lkotlinx/coroutines/ad;
+    sget-object v1, Lkotlinx/coroutines/ad;->bmW:Lkotlinx/coroutines/ad;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ad;->ordinal()I
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ag.smali b/com.discord/smali_classes2/kotlinx/coroutines/ag.smali
index f70b4c79eb..2cfd954434 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ag.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ag.smali
@@ -6,7 +6,7 @@
 # static fields
 .field public static final DEBUG:Z
 
-.field public static final bmG:Z
+.field public static final bna:Z
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     const-string v0, "kotlinx.coroutines.debug"
 
-    invoke-static {v0}, Lkotlinx/coroutines/internal/x;->dZ(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lkotlinx/coroutines/internal/x;->dT(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -115,7 +115,7 @@
     const/4 v1, 0x1
 
     :cond_4
-    sput-boolean v1, Lkotlinx/coroutines/ag;->bmG:Z
+    sput-boolean v1, Lkotlinx/coroutines/ag;->bna:Z
 
     return-void
 
@@ -222,7 +222,7 @@
     const/16 v0, 0x40
 
     :try_start_0
-    sget-object v1, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -253,7 +253,7 @@
     :catchall_0
     move-exception v1
 
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ah.smali b/com.discord/smali_classes2/kotlinx/coroutines/ah.smali
index e2d2b535b1..a05c5e5680 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ah.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ah.smali
@@ -9,9 +9,9 @@
 # static fields
 .field private static volatile _thread:Ljava/lang/Thread;
 
-.field private static final bmH:J
+.field private static final bnb:J
 
-.field public static final bmI:Lkotlinx/coroutines/ah;
+.field public static final bnc:Lkotlinx/coroutines/ah;
 
 .field private static volatile debugStatus:I
 
@@ -24,11 +24,11 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/ah;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/ah;->bmI:Lkotlinx/coroutines/ah;
+    sput-object v0, Lkotlinx/coroutines/ah;->bnc:Lkotlinx/coroutines/ah;
 
     const/4 v1, 0x0
 
-    invoke-virtual {v0, v1}, Lkotlinx/coroutines/at;->ab(Z)V
+    invoke-virtual {v0, v1}, Lkotlinx/coroutines/at;->Y(Z)V
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -63,7 +63,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lkotlinx/coroutines/ah;->bmH:J
+    sput-wide v0, Lkotlinx/coroutines/ah;->bnb:J
 
     return-void
 .end method
@@ -76,7 +76,7 @@
     return-void
 .end method
 
-.method private static EQ()Z
+.method private static EF()Z
     .locals 2
 
     sget v0, Lkotlinx/coroutines/ah;->debugStatus:I
@@ -103,7 +103,7 @@
     return v0
 .end method
 
-.method private final declared-synchronized ER()Ljava/lang/Thread;
+.method private final declared-synchronized EG()Ljava/lang/Thread;
     .locals 3
 
     monitor-enter p0
@@ -146,13 +146,13 @@
     throw v0
 .end method
 
-.method private final declared-synchronized ES()Z
+.method private final declared-synchronized EH()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    invoke-static {}, Lkotlinx/coroutines/ah;->EQ()Z
+    invoke-static {}, Lkotlinx/coroutines/ah;->EF()Z
 
     move-result v0
     :try_end_0
@@ -192,13 +192,13 @@
     throw v0
 .end method
 
-.method private final declared-synchronized ET()V
+.method private final declared-synchronized EI()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-static {}, Lkotlinx/coroutines/ah;->EQ()Z
+    invoke-static {}, Lkotlinx/coroutines/ah;->EF()Z
 
     move-result v0
     :try_end_0
@@ -251,7 +251,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ah;->ER()Ljava/lang/Thread;
+    invoke-direct {p0}, Lkotlinx/coroutines/ah;->EG()Ljava/lang/Thread;
 
     move-result-object v0
 
@@ -262,7 +262,7 @@
 .method public final run()V
     .locals 12
 
-    sget-object v0, Lkotlinx/coroutines/bu;->bnB:Lkotlinx/coroutines/bu;
+    sget-object v0, Lkotlinx/coroutines/bu;->bnV:Lkotlinx/coroutines/bu;
 
     move-object v0, p0
 
@@ -270,12 +270,12 @@
 
     invoke-static {v0}, Lkotlinx/coroutines/bu;->a(Lkotlinx/coroutines/at;)V
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-direct {p0}, Lkotlinx/coroutines/ah;->ES()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/ah;->EH()Z
 
     move-result v1
     :try_end_0
@@ -285,9 +285,9 @@
 
     sput-object v0, Lkotlinx/coroutines/ah;->_thread:Ljava/lang/Thread;
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ah;->ET()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ah;->EI()V
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/ah;->isEmpty()Z
 
@@ -310,7 +310,7 @@
     :try_start_1
     invoke-static {}, Ljava/lang/Thread;->interrupted()Z
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ah;->Fa()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/ah;->EP()J
 
     move-result-wide v5
 
@@ -324,7 +324,7 @@
 
     if-nez v9, :cond_6
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     move-result-object v9
 
@@ -336,7 +336,7 @@
 
     if-nez v11, :cond_3
 
-    sget-wide v3, Lkotlinx/coroutines/ah;->bmH:J
+    sget-wide v3, Lkotlinx/coroutines/ah;->bnb:J
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -351,9 +351,9 @@
 
     sput-object v0, Lkotlinx/coroutines/ah;->_thread:Ljava/lang/Thread;
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ah;->ET()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ah;->EI()V
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/ah;->isEmpty()Z
 
@@ -375,7 +375,7 @@
     goto :goto_1
 
     :cond_6
-    sget-wide v9, Lkotlinx/coroutines/ah;->bmH:J
+    sget-wide v9, Lkotlinx/coroutines/ah;->bnb:J
 
     invoke-static {v5, v6, v9, v10}, Lkotlin/ranges/c;->g(JJ)J
 
@@ -387,7 +387,7 @@
 
     if-lez v9, :cond_2
 
-    invoke-static {}, Lkotlinx/coroutines/ah;->EQ()Z
+    invoke-static {}, Lkotlinx/coroutines/ah;->EF()Z
 
     move-result v7
     :try_end_2
@@ -397,9 +397,9 @@
 
     sput-object v0, Lkotlinx/coroutines/ah;->_thread:Ljava/lang/Thread;
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ah;->ET()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ah;->EI()V
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/ah;->isEmpty()Z
 
@@ -414,7 +414,7 @@
 
     :cond_9
     :try_start_3
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     move-result-object v7
 
@@ -429,9 +429,9 @@
 
     sput-object v0, Lkotlinx/coroutines/ah;->_thread:Ljava/lang/Thread;
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ah;->ET()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ah;->EI()V
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/ah;->isEmpty()Z
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ai.smali b/com.discord/smali_classes2/kotlinx/coroutines/ai.smali
index 8efc10b966..3d21f673bd 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ai.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ai.smali
@@ -4,26 +4,26 @@
 
 
 # static fields
-.field private static final bmJ:Lkotlinx/coroutines/ak;
+.field private static final bnd:Lkotlinx/coroutines/ak;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ah;->bmI:Lkotlinx/coroutines/ah;
+    sget-object v0, Lkotlinx/coroutines/ah;->bnc:Lkotlinx/coroutines/ah;
 
     check-cast v0, Lkotlinx/coroutines/ak;
 
-    sput-object v0, Lkotlinx/coroutines/ai;->bmJ:Lkotlinx/coroutines/ak;
+    sput-object v0, Lkotlinx/coroutines/ai;->bnd:Lkotlinx/coroutines/ak;
 
     return-void
 .end method
 
-.method public static final EU()Lkotlinx/coroutines/ak;
+.method public static final EJ()Lkotlinx/coroutines/ak;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ai;->bmJ:Lkotlinx/coroutines/ak;
+    sget-object v0, Lkotlinx/coroutines/ai;->bnd:Lkotlinx/coroutines/ak;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/aj.smali b/com.discord/smali_classes2/kotlinx/coroutines/aj.smali
index 08b40c4c62..0bc439aa0c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/aj.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/aj.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field public static final bmK:Lkotlinx/coroutines/aj;
+.field public static final bne:Lkotlinx/coroutines/aj;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/aj;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/aj;->bmK:Lkotlinx/coroutines/aj;
+    sput-object v0, Lkotlinx/coroutines/aj;->bne:Lkotlinx/coroutines/aj;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/al.smali b/com.discord/smali_classes2/kotlinx/coroutines/al.smali
index d9ab4e95dc..a4fe92b5e5 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/al.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/al.smali
@@ -25,13 +25,13 @@
 # instance fields
 .field public _state:Ljava/lang/Object;
 
-.field private final bmL:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+.field private final bnf:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
 
-.field public final bmM:Ljava/lang/Object;
+.field public final bng:Ljava/lang/Object;
 
-.field public final bmN:Lkotlinx/coroutines/y;
+.field public final bnh:Lkotlinx/coroutines/y;
 
-.field public final bmO:Lkotlin/coroutines/Continuation;
+.field public final bni:Lkotlin/coroutines/Continuation;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/coroutines/Continuation<",
@@ -65,17 +65,17 @@
 
     invoke-direct {p0, v0}, Lkotlinx/coroutines/ao;-><init>(I)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/al;->bmN:Lkotlinx/coroutines/y;
+    iput-object p1, p0, Lkotlinx/coroutines/al;->bnh:Lkotlinx/coroutines/y;
 
-    iput-object p2, p0, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iput-object p2, p0, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
-    invoke-static {}, Lkotlinx/coroutines/an;->EV()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/an;->EK()Lkotlinx/coroutines/internal/v;
 
     move-result-object p1
 
     iput-object p1, p0, Lkotlinx/coroutines/al;->_state:Ljava/lang/Object;
 
-    iget-object p1, p0, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iget-object p1, p0, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
     instance-of p2, p1, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
 
@@ -86,7 +86,7 @@
     :cond_0
     check-cast p1, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
 
-    iput-object p1, p0, Lkotlinx/coroutines/al;->bmL:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+    iput-object p1, p0, Lkotlinx/coroutines/al;->bnf:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/al;->getContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -96,19 +96,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlinx/coroutines/al;->bmM:Ljava/lang/Object;
+    iput-object p1, p0, Lkotlinx/coroutines/al;->bng:Ljava/lang/Object;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final EE()Ljava/lang/Object;
+.method public final Et()Ljava/lang/Object;
     .locals 2
 
     iget-object v0, p0, Lkotlinx/coroutines/al;->_state:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/an;->EV()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/an;->EK()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
 
@@ -124,7 +124,7 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lkotlinx/coroutines/an;->EV()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/an;->EK()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
 
@@ -148,7 +148,7 @@
     throw v0
 .end method
 
-.method public final EI()Lkotlin/coroutines/Continuation;
+.method public final Ex()Lkotlin/coroutines/Continuation;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -168,7 +168,7 @@
 .method public final getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/al;->bmL:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+    iget-object v0, p0, Lkotlinx/coroutines/al;->bnf:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
 
     return-object v0
 .end method
@@ -176,7 +176,7 @@
 .method public final getContext()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -196,7 +196,7 @@
 .method public final resumeWith(Ljava/lang/Object;)V
     .locals 5
 
-    iget-object v0, p0, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -206,7 +206,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lkotlinx/coroutines/al;->bmN:Lkotlinx/coroutines/y;
+    iget-object v2, p0, Lkotlinx/coroutines/al;->bnh:Lkotlinx/coroutines/y;
 
     invoke-virtual {v2, v0}, Lkotlinx/coroutines/y;->b(Lkotlin/coroutines/CoroutineContext;)Z
 
@@ -218,9 +218,9 @@
 
     iput-object v1, p0, Lkotlinx/coroutines/al;->_state:Ljava/lang/Object;
 
-    iput v3, p0, Lkotlinx/coroutines/al;->bmQ:I
+    iput v3, p0, Lkotlinx/coroutines/al;->bnk:I
 
-    iget-object p1, p0, Lkotlinx/coroutines/al;->bmN:Lkotlinx/coroutines/y;
+    iget-object p1, p0, Lkotlinx/coroutines/al;->bnh:Lkotlinx/coroutines/y;
 
     move-object v1, p0
 
@@ -231,13 +231,13 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/bu;->bnB:Lkotlinx/coroutines/bu;
+    sget-object v0, Lkotlinx/coroutines/bu;->bnV:Lkotlinx/coroutines/bu;
 
-    invoke-static {}, Lkotlinx/coroutines/bu;->Fx()Lkotlinx/coroutines/at;
+    invoke-static {}, Lkotlinx/coroutines/bu;->Fm()Lkotlinx/coroutines/at;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Fd()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->ES()Z
 
     move-result v2
 
@@ -245,7 +245,7 @@
 
     iput-object v1, p0, Lkotlinx/coroutines/al;->_state:Ljava/lang/Object;
 
-    iput v3, p0, Lkotlinx/coroutines/al;->bmQ:I
+    iput v3, p0, Lkotlinx/coroutines/al;->bnk:I
 
     move-object p1, p0
 
@@ -262,14 +262,14 @@
 
     const/4 v2, 0x1
 
-    invoke-virtual {v0, v2}, Lkotlinx/coroutines/at;->ab(Z)V
+    invoke-virtual {v0, v2}, Lkotlinx/coroutines/at;->Y(Z)V
 
     :try_start_0
     invoke-virtual {p0}, Lkotlinx/coroutines/al;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v2
 
-    iget-object v3, p0, Lkotlinx/coroutines/al;->bmM:Ljava/lang/Object;
+    iget-object v3, p0, Lkotlinx/coroutines/al;->bng:Ljava/lang/Object;
 
     invoke-static {v2, v3}, Lkotlinx/coroutines/internal/z;->b(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -278,11 +278,11 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object v4, p0, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iget-object v4, p0, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v4, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -290,7 +290,7 @@
     invoke-static {v2, v3}, Lkotlinx/coroutines/internal/z;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
 
     :cond_2
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Fc()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->ER()Z
 
     move-result p1
     :try_end_2
@@ -298,7 +298,7 @@
 
     if-nez p1, :cond_2
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Ff()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->EU()V
 
     return-void
 
@@ -322,14 +322,14 @@
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_2
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Ff()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->EU()V
 
     return-void
 
     :catchall_2
     move-exception p1
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Ff()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->EU()V
 
     goto :goto_1
 
@@ -349,7 +349,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/al;->bmN:Lkotlinx/coroutines/y;
+    iget-object v1, p0, Lkotlinx/coroutines/al;->bnh:Lkotlinx/coroutines/y;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -357,7 +357,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iget-object v1, p0, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
     invoke-static {v1}, Lkotlinx/coroutines/ag;->d(Lkotlin/coroutines/Continuation;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/am.smali b/com.discord/smali_classes2/kotlinx/coroutines/am.smali
index 15577e670b..0a2ee48157 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/am.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/am.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field static final bmh:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field static final bmB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/am;->bmh:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/am;->bmB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
 
 # virtual methods
-.method public final EB()I
+.method public final Eq()I
     .locals 1
 
     const/4 v0, 0x0
@@ -110,7 +110,7 @@
     throw p1
 
     :cond_2
-    sget-object v0, Lkotlinx/coroutines/am;->bmh:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/am;->bmB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v3, 0x2
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/an.smali b/com.discord/smali_classes2/kotlinx/coroutines/an.smali
index 00622fd0d8..85e014e88c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/an.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/an.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bmP:Lkotlinx/coroutines/internal/v;
+.field private static final bnj:Lkotlinx/coroutines/internal/v;
 
 
 # direct methods
@@ -17,15 +17,15 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/internal/v;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/an;->bmP:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/an;->bnj:Lkotlinx/coroutines/internal/v;
 
     return-void
 .end method
 
-.method public static final synthetic EV()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic EK()Lkotlinx/coroutines/internal/v;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/an;->bmP:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/an;->bnj:Lkotlinx/coroutines/internal/v;
 
     return-object v0
 .end method
@@ -52,7 +52,7 @@
 
     check-cast p0, Lkotlinx/coroutines/al;
 
-    iget-object v0, p0, Lkotlinx/coroutines/al;->bmN:Lkotlinx/coroutines/y;
+    iget-object v0, p0, Lkotlinx/coroutines/al;->bnh:Lkotlinx/coroutines/y;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/al;->getContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -68,9 +68,9 @@
 
     iput-object p1, p0, Lkotlinx/coroutines/al;->_state:Ljava/lang/Object;
 
-    iput v1, p0, Lkotlinx/coroutines/al;->bmQ:I
+    iput v1, p0, Lkotlinx/coroutines/al;->bnk:I
 
-    iget-object p1, p0, Lkotlinx/coroutines/al;->bmN:Lkotlinx/coroutines/y;
+    iget-object p1, p0, Lkotlinx/coroutines/al;->bnh:Lkotlinx/coroutines/y;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/al;->getContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -83,13 +83,13 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/bu;->bnB:Lkotlinx/coroutines/bu;
+    sget-object v0, Lkotlinx/coroutines/bu;->bnV:Lkotlinx/coroutines/bu;
 
-    invoke-static {}, Lkotlinx/coroutines/bu;->Fx()Lkotlinx/coroutines/at;
+    invoke-static {}, Lkotlinx/coroutines/bu;->Fm()Lkotlinx/coroutines/at;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Fd()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->ES()Z
 
     move-result v2
 
@@ -97,7 +97,7 @@
 
     iput-object p1, p0, Lkotlinx/coroutines/al;->_state:Ljava/lang/Object;
 
-    iput v1, p0, Lkotlinx/coroutines/al;->bmQ:I
+    iput v1, p0, Lkotlinx/coroutines/al;->bnk:I
 
     check-cast p0, Lkotlinx/coroutines/ao;
 
@@ -110,14 +110,14 @@
 
     check-cast v2, Lkotlinx/coroutines/ao;
 
-    invoke-virtual {v0, v1}, Lkotlinx/coroutines/at;->ab(Z)V
+    invoke-virtual {v0, v1}, Lkotlinx/coroutines/at;->Y(Z)V
 
     :try_start_0
     invoke-virtual {p0}, Lkotlinx/coroutines/al;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v3
 
-    sget-object v4, Lkotlinx/coroutines/Job;->bnm:Lkotlinx/coroutines/Job$b;
+    sget-object v4, Lkotlinx/coroutines/Job;->bnG:Lkotlinx/coroutines/Job$b;
 
     check-cast v4, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -135,13 +135,13 @@
 
     if-nez v4, :cond_2
 
-    invoke-interface {v3}, Lkotlinx/coroutines/Job;->Fl()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v3}, Lkotlinx/coroutines/Job;->Fa()Ljava/util/concurrent/CancellationException;
 
     move-result-object v3
 
     check-cast v3, Ljava/lang/Throwable;
 
-    sget-object v4, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v4, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v3}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -165,7 +165,7 @@
 
     move-result-object v1
 
-    iget-object v3, p0, Lkotlinx/coroutines/al;->bmM:Ljava/lang/Object;
+    iget-object v3, p0, Lkotlinx/coroutines/al;->bng:Ljava/lang/Object;
 
     invoke-static {v1, v3}, Lkotlinx/coroutines/internal/z;->b(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -174,9 +174,9 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object p0, p0, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
-    sget-object v4, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v4, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -184,7 +184,7 @@
 
     invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
 
-    sget-object p0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -202,7 +202,7 @@
 
     :cond_3
     :goto_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Fc()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->ER()Z
 
     move-result p0
     :try_end_2
@@ -210,7 +210,7 @@
 
     if-nez p0, :cond_3
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Ff()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->EU()V
 
     return-void
 
@@ -224,19 +224,19 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_2
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Ff()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->EU()V
 
     return-void
 
     :catchall_2
     move-exception p0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Ff()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->EU()V
 
     throw p0
 
     :cond_4
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -275,7 +275,7 @@
 
     check-cast p0, Lkotlinx/coroutines/al;
 
-    iget-object v0, p0, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -285,7 +285,7 @@
 
     invoke-direct {v1, p1}, Lkotlinx/coroutines/q;-><init>(Ljava/lang/Throwable;)V
 
-    iget-object v2, p0, Lkotlinx/coroutines/al;->bmN:Lkotlinx/coroutines/y;
+    iget-object v2, p0, Lkotlinx/coroutines/al;->bnh:Lkotlinx/coroutines/y;
 
     invoke-virtual {v2, v0}, Lkotlinx/coroutines/y;->b(Lkotlin/coroutines/CoroutineContext;)Z
 
@@ -301,9 +301,9 @@
 
     iput-object v1, p0, Lkotlinx/coroutines/al;->_state:Ljava/lang/Object;
 
-    iput v3, p0, Lkotlinx/coroutines/al;->bmQ:I
+    iput v3, p0, Lkotlinx/coroutines/al;->bnk:I
 
-    iget-object p1, p0, Lkotlinx/coroutines/al;->bmN:Lkotlinx/coroutines/y;
+    iget-object p1, p0, Lkotlinx/coroutines/al;->bnh:Lkotlinx/coroutines/y;
 
     check-cast p0, Ljava/lang/Runnable;
 
@@ -312,13 +312,13 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/bu;->bnB:Lkotlinx/coroutines/bu;
+    sget-object v0, Lkotlinx/coroutines/bu;->bnV:Lkotlinx/coroutines/bu;
 
-    invoke-static {}, Lkotlinx/coroutines/bu;->Fx()Lkotlinx/coroutines/at;
+    invoke-static {}, Lkotlinx/coroutines/bu;->Fm()Lkotlinx/coroutines/at;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Fd()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->ES()Z
 
     move-result v2
 
@@ -326,7 +326,7 @@
 
     iput-object v1, p0, Lkotlinx/coroutines/al;->_state:Ljava/lang/Object;
 
-    iput v3, p0, Lkotlinx/coroutines/al;->bmQ:I
+    iput v3, p0, Lkotlinx/coroutines/al;->bnk:I
 
     check-cast p0, Lkotlinx/coroutines/ao;
 
@@ -339,14 +339,14 @@
 
     check-cast v1, Lkotlinx/coroutines/ao;
 
-    invoke-virtual {v0, v3}, Lkotlinx/coroutines/at;->ab(Z)V
+    invoke-virtual {v0, v3}, Lkotlinx/coroutines/at;->Y(Z)V
 
     :try_start_0
     invoke-virtual {p0}, Lkotlinx/coroutines/al;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v2
 
-    sget-object v4, Lkotlinx/coroutines/Job;->bnm:Lkotlinx/coroutines/Job$b;
+    sget-object v4, Lkotlinx/coroutines/Job;->bnG:Lkotlinx/coroutines/Job$b;
 
     check-cast v4, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -364,13 +364,13 @@
 
     if-nez v4, :cond_2
 
-    invoke-interface {v2}, Lkotlinx/coroutines/Job;->Fl()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v2}, Lkotlinx/coroutines/Job;->Fa()Ljava/util/concurrent/CancellationException;
 
     move-result-object v2
 
     check-cast v2, Ljava/lang/Throwable;
 
-    sget-object v4, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v4, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v2}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -394,7 +394,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lkotlinx/coroutines/al;->bmM:Ljava/lang/Object;
+    iget-object v3, p0, Lkotlinx/coroutines/al;->bng:Ljava/lang/Object;
 
     invoke-static {v2, v3}, Lkotlinx/coroutines/internal/z;->b(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -403,9 +403,9 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object p0, p0, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
-    sget-object v4, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v4, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1, p0}, Lkotlinx/coroutines/internal/u;->a(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
 
@@ -421,7 +421,7 @@
 
     invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
 
-    sget-object p0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -439,7 +439,7 @@
 
     :cond_3
     :goto_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Fc()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->ER()Z
 
     move-result p0
     :try_end_2
@@ -447,7 +447,7 @@
 
     if-nez p0, :cond_3
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Ff()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->EU()V
 
     return-void
 
@@ -461,19 +461,19 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_2
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Ff()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->EU()V
 
     return-void
 
     :catchall_2
     move-exception p0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/at;->Ff()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/at;->EU()V
 
     throw p0
 
     :cond_4
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1, p0}, Lkotlinx/coroutines/internal/u;->a(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
 
@@ -508,7 +508,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ao;->EI()Lkotlin/coroutines/Continuation;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ao;->Ex()Lkotlin/coroutines/Continuation;
 
     move-result-object v0
 
@@ -536,13 +536,13 @@
 
     if-eqz v2, :cond_5
 
-    invoke-static {p1}, Lkotlinx/coroutines/br;->ds(I)Z
+    invoke-static {p1}, Lkotlinx/coroutines/br;->dp(I)Z
 
     move-result v2
 
-    iget v3, p0, Lkotlinx/coroutines/ao;->bmQ:I
+    iget v3, p0, Lkotlinx/coroutines/ao;->bnk:I
 
-    invoke-static {v3}, Lkotlinx/coroutines/br;->ds(I)Z
+    invoke-static {v3}, Lkotlinx/coroutines/br;->dp(I)Z
 
     move-result v3
 
@@ -552,7 +552,7 @@
 
     check-cast p1, Lkotlinx/coroutines/al;
 
-    iget-object p1, p1, Lkotlinx/coroutines/al;->bmN:Lkotlinx/coroutines/y;
+    iget-object p1, p1, Lkotlinx/coroutines/al;->bnh:Lkotlinx/coroutines/y;
 
     invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -571,13 +571,13 @@
     return-void
 
     :cond_2
-    sget-object p1, Lkotlinx/coroutines/bu;->bnB:Lkotlinx/coroutines/bu;
+    sget-object p1, Lkotlinx/coroutines/bu;->bnV:Lkotlinx/coroutines/bu;
 
-    invoke-static {}, Lkotlinx/coroutines/bu;->Fx()Lkotlinx/coroutines/at;
+    invoke-static {}, Lkotlinx/coroutines/bu;->Fm()Lkotlinx/coroutines/at;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/at;->Fd()Z
+    invoke-virtual {p1}, Lkotlinx/coroutines/at;->ES()Z
 
     move-result v0
 
@@ -588,10 +588,10 @@
     return-void
 
     :cond_3
-    invoke-virtual {p1, v1}, Lkotlinx/coroutines/at;->ab(Z)V
+    invoke-virtual {p1, v1}, Lkotlinx/coroutines/at;->Y(Z)V
 
     :try_start_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/ao;->EI()Lkotlin/coroutines/Continuation;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ao;->Ex()Lkotlin/coroutines/Continuation;
 
     move-result-object v0
 
@@ -600,7 +600,7 @@
     invoke-static {p0, v0, v1}, Lkotlinx/coroutines/an;->a(Lkotlinx/coroutines/ao;Lkotlin/coroutines/Continuation;I)V
 
     :cond_4
-    invoke-virtual {p1}, Lkotlinx/coroutines/at;->Fc()Z
+    invoke-virtual {p1}, Lkotlinx/coroutines/at;->ER()Z
 
     move-result v0
     :try_end_0
@@ -608,7 +608,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/at;->Ff()V
+    invoke-virtual {p1}, Lkotlinx/coroutines/at;->EU()V
 
     return-void
 
@@ -622,14 +622,14 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/at;->Ff()V
+    invoke-virtual {p1}, Lkotlinx/coroutines/at;->EU()V
 
     return-void
 
     :catchall_1
     move-exception p0
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/at;->Ff()V
+    invoke-virtual {p1}, Lkotlinx/coroutines/at;->EU()V
 
     throw p0
 
@@ -661,7 +661,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ao;->EE()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ao;->Et()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -707,9 +707,9 @@
 
     check-cast p0, Lkotlinx/coroutines/al;
 
-    iget-object p0, p0, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -720,7 +720,7 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -759,9 +759,9 @@
 
     check-cast p0, Lkotlinx/coroutines/al;
 
-    iget-object p0, p0, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1, p0}, Lkotlinx/coroutines/internal/u;->a(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
 
@@ -780,7 +780,7 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1, p0}, Lkotlinx/coroutines/internal/u;->a(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali
index f119a60ae7..5b3eba6014 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali
@@ -67,7 +67,7 @@
 .method public constructor <init>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bmw:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bmQ:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/a$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/a$a.smali
index 5e66eb6f43..72399c8e69 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/a$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/a$a.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic bnG:Lkotlinx/coroutines/h;
+.field final synthetic boa:Lkotlinx/coroutines/h;
 
 .field final synthetic this$0:Lkotlinx/coroutines/android/a;
 
@@ -29,7 +29,7 @@
 
     iput-object p1, p0, Lkotlinx/coroutines/android/a$a;->this$0:Lkotlinx/coroutines/android/a;
 
-    iput-object p2, p0, Lkotlinx/coroutines/android/a$a;->bnG:Lkotlinx/coroutines/h;
+    iput-object p2, p0, Lkotlinx/coroutines/android/a$a;->boa:Lkotlinx/coroutines/h;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,11 +41,11 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/android/a$a;->bnG:Lkotlinx/coroutines/h;
+    iget-object v0, p0, Lkotlinx/coroutines/android/a$a;->boa:Lkotlinx/coroutines/h;
 
     iget-object v1, p0, Lkotlinx/coroutines/android/a$a;->this$0:Lkotlinx/coroutines/android/a;
 
-    sget-object v2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-interface {v0, v1, v2}, Lkotlinx/coroutines/h;->a(Lkotlinx/coroutines/y;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/a$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/a$b.smali
index b59d6269d3..707abf78a4 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/a$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/a$b.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p1, v0}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/a.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/a.smali
index 26f29673f9..7f2ca8a84e 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/a.smali
@@ -9,9 +9,9 @@
 # instance fields
 .field private volatile _immediate:Lkotlinx/coroutines/android/a;
 
-.field private final bnE:Lkotlinx/coroutines/android/a;
+.field private final bnY:Lkotlinx/coroutines/android/a;
 
-.field private final bnF:Z
+.field private final bnZ:Z
 
 .field private final handler:Landroid/os/Handler;
 
@@ -44,9 +44,9 @@
 
     iput-object p2, p0, Lkotlinx/coroutines/android/a;->name:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lkotlinx/coroutines/android/a;->bnF:Z
+    iput-boolean p3, p0, Lkotlinx/coroutines/android/a;->bnZ:Z
 
-    iget-boolean p1, p0, Lkotlinx/coroutines/android/a;->bnF:Z
+    iget-boolean p1, p0, Lkotlinx/coroutines/android/a;->bnZ:Z
 
     if-eqz p1, :cond_0
 
@@ -77,7 +77,7 @@
     iput-object p1, p0, Lkotlinx/coroutines/android/a;->_immediate:Lkotlinx/coroutines/android/a;
 
     :cond_1
-    iput-object p1, p0, Lkotlinx/coroutines/android/a;->bnE:Lkotlinx/coroutines/android/a;
+    iput-object p1, p0, Lkotlinx/coroutines/android/a;->bnY:Lkotlinx/coroutines/android/a;
 
     return-void
 .end method
@@ -160,7 +160,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean p1, p0, Lkotlinx/coroutines/android/a;->bnF:Z
+    iget-boolean p1, p0, Lkotlinx/coroutines/android/a;->bnZ:Z
 
     const/4 v0, 0x1
 
@@ -240,7 +240,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-boolean v1, p0, Lkotlinx/coroutines/android/a;->bnF:Z
+    iget-boolean v1, p0, Lkotlinx/coroutines/android/a;->bnZ:Z
 
     if-eqz v1, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/c.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/c.smali
index a949a49df5..a91cb3cdc8 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/c.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bnH:Lkotlinx/coroutines/android/b;
+.field public static final bob:Lkotlinx/coroutines/android/b;
 
 
 # direct methods
@@ -12,7 +12,7 @@
     .locals 3
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     new-instance v0, Lkotlinx/coroutines/android/a;
 
@@ -43,7 +43,7 @@
     :catchall_0
     move-exception v0
 
-    sget-object v1, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v0}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -65,7 +65,7 @@
     :cond_0
     check-cast v0, Lkotlinx/coroutines/android/b;
 
-    sput-object v0, Lkotlinx/coroutines/android/c;->bnH:Lkotlinx/coroutines/android/b;
+    sput-object v0, Lkotlinx/coroutines/android/c;->bob:Lkotlinx/coroutines/android/b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ao.smali b/com.discord/smali_classes2/kotlinx/coroutines/ao.smali
index 987a1019a9..db2b496c5c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ao.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ao.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public bmQ:I
+.field public bnk:I
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/b/i;-><init>()V
 
-    iput p1, p0, Lkotlinx/coroutines/ao;->bmQ:I
+    iput p1, p0, Lkotlinx/coroutines/ao;->bnk:I
 
     return-void
 .end method
@@ -55,10 +55,10 @@
 
 
 # virtual methods
-.method public abstract EE()Ljava/lang/Object;
+.method public abstract Et()Ljava/lang/Object;
 .end method
 
-.method public abstract EI()Lkotlin/coroutines/Continuation;
+.method public abstract Ex()Lkotlin/coroutines/Continuation;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -135,12 +135,12 @@
 
     if-nez p1, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     invoke-direct {p2, v0, p1}, Lkotlinx/coroutines/af;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ao;->EI()Lkotlin/coroutines/Continuation;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ao;->Ex()Lkotlin/coroutines/Continuation;
 
     move-result-object p1
 
@@ -158,10 +158,10 @@
 .method public final run()V
     .locals 8
 
-    iget-object v0, p0, Lkotlinx/coroutines/ao;->bpt:Lkotlinx/coroutines/b/j;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bpN:Lkotlinx/coroutines/b/j;
 
     :try_start_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/ao;->EI()Lkotlin/coroutines/Continuation;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ao;->Ex()Lkotlin/coroutines/Continuation;
 
     move-result-object v1
 
@@ -169,15 +169,15 @@
 
     check-cast v1, Lkotlinx/coroutines/al;
 
-    iget-object v2, v1, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iget-object v2, v1, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v2}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v3
 
-    iget v4, p0, Lkotlinx/coroutines/ao;->bmQ:I
+    iget v4, p0, Lkotlinx/coroutines/ao;->bnk:I
 
-    invoke-static {v4}, Lkotlinx/coroutines/br;->ds(I)Z
+    invoke-static {v4}, Lkotlinx/coroutines/br;->dp(I)Z
 
     move-result v4
 
@@ -185,7 +185,7 @@
 
     if-eqz v4, :cond_0
 
-    sget-object v4, Lkotlinx/coroutines/Job;->bnm:Lkotlinx/coroutines/Job$b;
+    sget-object v4, Lkotlinx/coroutines/Job;->bnG:Lkotlinx/coroutines/Job$b;
 
     check-cast v4, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -201,11 +201,11 @@
     move-object v4, v5
 
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/ao;->EE()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ao;->Et()Ljava/lang/Object;
 
     move-result-object v6
 
-    iget-object v1, v1, Lkotlinx/coroutines/al;->bmM:Ljava/lang/Object;
+    iget-object v1, v1, Lkotlinx/coroutines/al;->bng:Ljava/lang/Object;
 
     invoke-static {v3, v1}, Lkotlinx/coroutines/internal/z;->b(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -222,7 +222,7 @@
 
     if-nez v7, :cond_1
 
-    invoke-interface {v4}, Lkotlinx/coroutines/Job;->Fl()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v4}, Lkotlinx/coroutines/Job;->Fa()Ljava/util/concurrent/CancellationException;
 
     move-result-object v4
 
@@ -232,7 +232,7 @@
 
     invoke-virtual {p0, v6, v7}, Lkotlinx/coroutines/ao;->a(Ljava/lang/Object;Ljava/lang/Throwable;)V
 
-    sget-object v6, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v6, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     check-cast v4, Ljava/lang/Throwable;
 
@@ -259,7 +259,7 @@
 
     if-eqz v4, :cond_2
 
-    sget-object v6, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v6, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v4, v2}, Lkotlinx/coroutines/internal/u;->a(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
 
@@ -282,7 +282,7 @@
 
     move-result-object v4
 
-    sget-object v6, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v6, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v4}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -291,7 +291,7 @@
     invoke-interface {v2, v4}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
 
     :goto_1
-    sget-object v2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
@@ -301,11 +301,11 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_2
 
     :try_start_3
-    sget-object v1, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bjW:Lkotlin/m$a;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->Gl()V
+    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->Ga()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-static {v0}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -318,7 +318,7 @@
     :catchall_0
     move-exception v0
 
-    sget-object v1, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v0}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -360,11 +360,11 @@
     move-exception v1
 
     :try_start_5
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->Gl()V
+    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->Ga()V
 
-    sget-object v0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-static {v0}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -377,7 +377,7 @@
     :catchall_3
     move-exception v0
 
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {v0}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ap.smali b/com.discord/smali_classes2/kotlinx/coroutines/ap.smali
index da033b0db1..9095ce298a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ap.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ap.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static final bmR:Lkotlinx/coroutines/y;
+.field private static final bnl:Lkotlinx/coroutines/y;
 
-.field private static final bmS:Lkotlinx/coroutines/y;
+.field private static final bnm:Lkotlinx/coroutines/y;
 
-.field private static final bmT:Lkotlinx/coroutines/y;
+.field private static final bnn:Lkotlinx/coroutines/y;
 
-.field public static final bmU:Lkotlinx/coroutines/ap;
+.field public static final bno:Lkotlinx/coroutines/ap;
 
 
 # direct methods
@@ -21,27 +21,27 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/ap;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/ap;->bmU:Lkotlinx/coroutines/ap;
+    sput-object v0, Lkotlinx/coroutines/ap;->bno:Lkotlinx/coroutines/ap;
 
-    invoke-static {}, Lkotlinx/coroutines/x;->EP()Lkotlinx/coroutines/y;
+    invoke-static {}, Lkotlinx/coroutines/x;->EE()Lkotlinx/coroutines/y;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/ap;->bmR:Lkotlinx/coroutines/y;
+    sput-object v0, Lkotlinx/coroutines/ap;->bnl:Lkotlinx/coroutines/y;
 
-    sget-object v0, Lkotlinx/coroutines/bx;->bnD:Lkotlinx/coroutines/bx;
+    sget-object v0, Lkotlinx/coroutines/bx;->bnX:Lkotlinx/coroutines/bx;
 
     check-cast v0, Lkotlinx/coroutines/y;
 
-    sput-object v0, Lkotlinx/coroutines/ap;->bmS:Lkotlinx/coroutines/y;
+    sput-object v0, Lkotlinx/coroutines/ap;->bnm:Lkotlinx/coroutines/y;
 
-    sget-object v0, Lkotlinx/coroutines/b/c;->bpj:Lkotlinx/coroutines/b/c;
+    sget-object v0, Lkotlinx/coroutines/b/c;->bpD:Lkotlinx/coroutines/b/c;
 
-    invoke-static {}, Lkotlinx/coroutines/b/c;->EY()Lkotlinx/coroutines/y;
+    invoke-static {}, Lkotlinx/coroutines/b/c;->EN()Lkotlinx/coroutines/y;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/ap;->bmT:Lkotlinx/coroutines/y;
+    sput-object v0, Lkotlinx/coroutines/ap;->bnn:Lkotlinx/coroutines/y;
 
     return-void
 .end method
@@ -54,26 +54,26 @@
     return-void
 .end method
 
-.method public static final EW()Lkotlinx/coroutines/y;
+.method public static final EL()Lkotlinx/coroutines/y;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ap;->bmR:Lkotlinx/coroutines/y;
+    sget-object v0, Lkotlinx/coroutines/ap;->bnl:Lkotlinx/coroutines/y;
 
     return-object v0
 .end method
 
-.method public static final EX()Lkotlinx/coroutines/bm;
+.method public static final EM()Lkotlinx/coroutines/bm;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/internal/n;->bol:Lkotlinx/coroutines/bm;
+    sget-object v0, Lkotlinx/coroutines/internal/n;->boG:Lkotlinx/coroutines/bm;
 
     return-object v0
 .end method
 
-.method public static final EY()Lkotlinx/coroutines/y;
+.method public static final EN()Lkotlinx/coroutines/y;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ap;->bmT:Lkotlinx/coroutines/y;
+    sget-object v0, Lkotlinx/coroutines/ap;->bnn:Lkotlinx/coroutines/y;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ar.smali b/com.discord/smali_classes2/kotlinx/coroutines/ar.smali
index f12f9b0629..2dc1af52b4 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ar.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ar.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final bmV:Lkotlinx/coroutines/aq;
+.field private final bnp:Lkotlinx/coroutines/aq;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/f;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/ar;->bmV:Lkotlinx/coroutines/aq;
+    iput-object p1, p0, Lkotlinx/coroutines/ar;->bnp:Lkotlinx/coroutines/aq;
 
     return-void
 .end method
@@ -31,7 +31,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/ar;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -39,7 +39,7 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 0
 
-    iget-object p1, p0, Lkotlinx/coroutines/ar;->bmV:Lkotlinx/coroutines/aq;
+    iget-object p1, p0, Lkotlinx/coroutines/ar;->bnp:Lkotlinx/coroutines/aq;
 
     invoke-interface {p1}, Lkotlinx/coroutines/aq;->dispose()V
 
@@ -55,7 +55,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/ar;->bmV:Lkotlinx/coroutines/aq;
+    iget-object v1, p0, Lkotlinx/coroutines/ar;->bnp:Lkotlinx/coroutines/aq;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/as.smali b/com.discord/smali_classes2/kotlinx/coroutines/as.smali
index 08583e537f..b3be3b33bc 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/as.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/as.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field final bmW:Z
+.field final bnq:Z
 
 
 # direct methods
@@ -16,14 +16,14 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lkotlinx/coroutines/as;->bmW:Z
+    iput-boolean p1, p0, Lkotlinx/coroutines/as;->bnq:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final EZ()Lkotlinx/coroutines/bn;
+.method public final EO()Lkotlinx/coroutines/bn;
     .locals 1
 
     const/4 v0, 0x0
@@ -34,7 +34,7 @@
 .method public final isActive()Z
     .locals 1
 
-    iget-boolean v0, p0, Lkotlinx/coroutines/as;->bmW:Z
+    iget-boolean v0, p0, Lkotlinx/coroutines/as;->bnq:Z
 
     return v0
 .end method
@@ -48,7 +48,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-boolean v1, p0, Lkotlinx/coroutines/as;->bmW:Z
+    iget-boolean v1, p0, Lkotlinx/coroutines/as;->bnq:Z
 
     if-eqz v1, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/at.smali b/com.discord/smali_classes2/kotlinx/coroutines/at.smali
index 55c6fa0036..53906f577e 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/at.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/at.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private bmX:J
+.field private bnr:J
 
-.field private bmY:Z
+.field private bns:Z
 
-.field private bmZ:Lkotlinx/coroutines/internal/b;
+.field private bnt:Lkotlinx/coroutines/internal/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlinx/coroutines/internal/b<",
@@ -28,7 +28,7 @@
     return-void
 .end method
 
-.method private static aa(Z)J
+.method private static X(Z)J
     .locals 2
 
     if-eqz p0, :cond_0
@@ -45,10 +45,10 @@
 
 
 # virtual methods
-.method public Fa()J
+.method public EP()J
     .locals 2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/at;->Fc()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/at;->ER()Z
 
     move-result v0
 
@@ -59,17 +59,17 @@
     return-wide v0
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/at;->Fb()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/at;->EQ()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method protected Fb()J
+.method protected EQ()J
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/at;->bmZ:Lkotlinx/coroutines/internal/b;
+    iget-object v0, p0, Lkotlinx/coroutines/at;->bnt:Lkotlinx/coroutines/internal/b;
 
     const-wide v1, 0x7fffffffffffffffL
 
@@ -92,10 +92,10 @@
     return-wide v0
 .end method
 
-.method public final Fc()Z
+.method public final ER()Z
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/at;->bmZ:Lkotlinx/coroutines/internal/b;
+    iget-object v0, p0, Lkotlinx/coroutines/at;->bnt:Lkotlinx/coroutines/internal/b;
 
     const/4 v1, 0x0
 
@@ -104,7 +104,7 @@
     return v1
 
     :cond_0
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/b;->FA()Ljava/lang/Object;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/b;->Fp()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -122,14 +122,14 @@
     return v0
 .end method
 
-.method public final Fd()Z
+.method public final ES()Z
     .locals 6
 
-    iget-wide v0, p0, Lkotlinx/coroutines/at;->bmX:J
+    iget-wide v0, p0, Lkotlinx/coroutines/at;->bnr:J
 
     const/4 v2, 0x1
 
-    invoke-static {v2}, Lkotlinx/coroutines/at;->aa(Z)J
+    invoke-static {v2}, Lkotlinx/coroutines/at;->X(Z)J
 
     move-result-wide v3
 
@@ -145,10 +145,10 @@
     return v0
 .end method
 
-.method public final Fe()Z
+.method public final ET()Z
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/at;->bmZ:Lkotlinx/coroutines/internal/b;
+    iget-object v0, p0, Lkotlinx/coroutines/at;->bnt:Lkotlinx/coroutines/internal/b;
 
     if-eqz v0, :cond_0
 
@@ -164,22 +164,22 @@
     return v0
 .end method
 
-.method public final Ff()V
+.method public final EU()V
     .locals 6
 
-    iget-wide v0, p0, Lkotlinx/coroutines/at;->bmX:J
+    iget-wide v0, p0, Lkotlinx/coroutines/at;->bnr:J
 
     const/4 v2, 0x1
 
-    invoke-static {v2}, Lkotlinx/coroutines/at;->aa(Z)J
+    invoke-static {v2}, Lkotlinx/coroutines/at;->X(Z)J
 
     move-result-wide v3
 
     sub-long/2addr v0, v3
 
-    iput-wide v0, p0, Lkotlinx/coroutines/at;->bmX:J
+    iput-wide v0, p0, Lkotlinx/coroutines/at;->bnr:J
 
-    iget-wide v0, p0, Lkotlinx/coroutines/at;->bmX:J
+    iget-wide v0, p0, Lkotlinx/coroutines/at;->bnr:J
 
     const-wide/16 v3, 0x0
 
@@ -202,7 +202,7 @@
     :goto_0
     if-eqz v2, :cond_3
 
-    iget-boolean v0, p0, Lkotlinx/coroutines/at;->bmY:Z
+    iget-boolean v0, p0, Lkotlinx/coroutines/at;->bns:Z
 
     if-eqz v0, :cond_2
 
@@ -227,6 +227,29 @@
     throw v0
 .end method
 
+.method public final Y(Z)V
+    .locals 4
+
+    iget-wide v0, p0, Lkotlinx/coroutines/at;->bnr:J
+
+    invoke-static {p1}, Lkotlinx/coroutines/at;->X(Z)J
+
+    move-result-wide v2
+
+    add-long/2addr v0, v2
+
+    iput-wide v0, p0, Lkotlinx/coroutines/at;->bnr:J
+
+    if-nez p1, :cond_0
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Lkotlinx/coroutines/at;->bns:Z
+
+    :cond_0
+    return-void
+.end method
+
 .method public final a(Lkotlinx/coroutines/ao;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -241,7 +264,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/at;->bmZ:Lkotlinx/coroutines/internal/b;
+    iget-object v0, p0, Lkotlinx/coroutines/at;->bnt:Lkotlinx/coroutines/internal/b;
 
     if-nez v0, :cond_0
 
@@ -249,7 +272,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/internal/b;-><init>()V
 
-    iput-object v0, p0, Lkotlinx/coroutines/at;->bmZ:Lkotlinx/coroutines/internal/b;
+    iput-object v0, p0, Lkotlinx/coroutines/at;->bnt:Lkotlinx/coroutines/internal/b;
 
     :cond_0
     invoke-virtual {v0, p1}, Lkotlinx/coroutines/internal/b;->addLast(Ljava/lang/Object;)V
@@ -257,33 +280,10 @@
     return-void
 .end method
 
-.method public final ab(Z)V
-    .locals 4
-
-    iget-wide v0, p0, Lkotlinx/coroutines/at;->bmX:J
-
-    invoke-static {p1}, Lkotlinx/coroutines/at;->aa(Z)J
-
-    move-result-wide v2
-
-    add-long/2addr v0, v2
-
-    iput-wide v0, p0, Lkotlinx/coroutines/at;->bmX:J
-
-    if-nez p1, :cond_0
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lkotlinx/coroutines/at;->bmY:Z
-
-    :cond_0
-    return-void
-.end method
-
 .method protected isEmpty()Z
     .locals 1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/at;->Fe()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/at;->ET()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/au$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/au$a.smali
index 2bed00efe8..d942597a0d 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/au$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/au$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final bnc:Lkotlinx/coroutines/h;
+.field private final bnw:Lkotlinx/coroutines/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlinx/coroutines/h<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field final synthetic bnd:Lkotlinx/coroutines/au;
+.field final synthetic bnx:Lkotlinx/coroutines/au;
 
 
 # direct methods
@@ -45,13 +45,13 @@
 
     invoke-static {p4, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/au$a;->bnd:Lkotlinx/coroutines/au;
+    iput-object p1, p0, Lkotlinx/coroutines/au$a;->bnx:Lkotlinx/coroutines/au;
 
     invoke-direct {p0, p2, p3}, Lkotlinx/coroutines/au$b;-><init>(J)V
 
-    iput-object p4, p0, Lkotlinx/coroutines/au$a;->bnc:Lkotlinx/coroutines/h;
+    iput-object p4, p0, Lkotlinx/coroutines/au$a;->bnw:Lkotlinx/coroutines/h;
 
-    iget-object p1, p0, Lkotlinx/coroutines/au$a;->bnc:Lkotlinx/coroutines/h;
+    iget-object p1, p0, Lkotlinx/coroutines/au$a;->bnw:Lkotlinx/coroutines/h;
 
     move-object p2, p0
 
@@ -83,11 +83,11 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/au$a;->bnc:Lkotlinx/coroutines/h;
+    iget-object v0, p0, Lkotlinx/coroutines/au$a;->bnw:Lkotlinx/coroutines/h;
 
-    iget-object v1, p0, Lkotlinx/coroutines/au$a;->bnd:Lkotlinx/coroutines/au;
+    iget-object v1, p0, Lkotlinx/coroutines/au$a;->bnx:Lkotlinx/coroutines/au;
 
-    sget-object v2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     invoke-interface {v0, v1, v2}, Lkotlinx/coroutines/h;->a(Lkotlinx/coroutines/y;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/au$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/au$b.smali
index 5f84267560..78279cb4bb 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/au$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/au$b.smali
@@ -33,7 +33,7 @@
 
 
 # instance fields
-.field private bne:Ljava/lang/Object;
+.field private bny:Ljava/lang/Object;
 
 .field private index:I
 
@@ -50,7 +50,7 @@
 
     iput v0, p0, Lkotlinx/coroutines/au$b;->index:I
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     move-result-object v0
 
@@ -71,7 +71,7 @@
 
 
 # virtual methods
-.method public final Fh()Lkotlinx/coroutines/internal/aa;
+.method public final EW()Lkotlinx/coroutines/internal/aa;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -81,7 +81,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/au$b;->bne:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/au$b;->bny:Ljava/lang/Object;
 
     instance-of v1, v0, Lkotlinx/coroutines/internal/aa;
 
@@ -119,9 +119,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/au$b;->bne:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/au$b;->bny:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/av;->Fj()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/av;->EY()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
     :try_end_0
@@ -162,7 +162,7 @@
 
     invoke-static {v0, p2}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {v0}, Lkotlinx/coroutines/internal/ab;->Fh()Lkotlinx/coroutines/internal/aa;
+    invoke-interface {v0}, Lkotlinx/coroutines/internal/ab;->EW()Lkotlinx/coroutines/internal/aa;
 
     move-result-object p2
 
@@ -184,7 +184,7 @@
 
     invoke-interface {v0, p2}, Lkotlinx/coroutines/internal/ab;->a(Lkotlinx/coroutines/internal/aa;)V
 
-    iget-object p2, p1, Lkotlinx/coroutines/internal/aa;->boC:[Lkotlinx/coroutines/internal/ab;
+    iget-object p2, p1, Lkotlinx/coroutines/internal/aa;->boW:[Lkotlinx/coroutines/internal/ab;
 
     if-nez p2, :cond_2
 
@@ -192,7 +192,7 @@
 
     new-array p2, p2, [Lkotlinx/coroutines/internal/ab;
 
-    iput-object p2, p1, Lkotlinx/coroutines/internal/aa;->boC:[Lkotlinx/coroutines/internal/ab;
+    iput-object p2, p1, Lkotlinx/coroutines/internal/aa;->boW:[Lkotlinx/coroutines/internal/ab;
 
     goto :goto_1
 
@@ -219,7 +219,7 @@
 
     check-cast v2, [Lkotlinx/coroutines/internal/ab;
 
-    iput-object v2, p1, Lkotlinx/coroutines/internal/aa;->boC:[Lkotlinx/coroutines/internal/ab;
+    iput-object v2, p1, Lkotlinx/coroutines/internal/aa;->boW:[Lkotlinx/coroutines/internal/ab;
 
     check-cast p2, [Lkotlinx/coroutines/internal/ab;
 
@@ -235,7 +235,7 @@
 
     invoke-interface {v0, v2}, Lkotlinx/coroutines/internal/ab;->setIndex(I)V
 
-    invoke-virtual {p1, v2}, Lkotlinx/coroutines/internal/aa;->dv(I)V
+    invoke-virtual {p1, v2}, Lkotlinx/coroutines/internal/aa;->ds(I)V
 
     const/4 p2, 0x1
 
@@ -306,9 +306,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/au$b;->bne:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/au$b;->bny:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/av;->Fj()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/av;->EY()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
 
@@ -324,7 +324,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iput-object p1, p0, Lkotlinx/coroutines/au$b;->bne:Ljava/lang/Object;
+    iput-object p1, p0, Lkotlinx/coroutines/au$b;->bny:Ljava/lang/Object;
 
     return-void
 
@@ -390,9 +390,9 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/au$b;->bne:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/au$b;->bny:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/av;->Fj()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/av;->EY()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
     :try_end_0
@@ -424,11 +424,11 @@
     invoke-virtual {v0, v1}, Lkotlinx/coroutines/internal/aa;->a(Lkotlinx/coroutines/internal/ab;)Z
 
     :cond_2
-    invoke-static {}, Lkotlinx/coroutines/av;->Fj()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/av;->EY()Lkotlinx/coroutines/internal/v;
 
     move-result-object v0
 
-    iput-object v0, p0, Lkotlinx/coroutines/au$b;->bne:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/au$b;->bny:Ljava/lang/Object;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/au.smali b/com.discord/smali_classes2/kotlinx/coroutines/au.smali
index 9c72c82481..665776d655 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/au.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/au.smali
@@ -16,9 +16,9 @@
 
 
 # static fields
-.field private static final bna:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bnu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field private static final bnb:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bnv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -43,7 +43,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/au;->bna:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/au;->bnu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const-class v1, Ljava/lang/Object;
 
@@ -53,7 +53,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/au;->bnb:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/au;->bnv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
     return-void
 .end method
 
-.method private final Fg()V
+.method private final EV()V
     .locals 2
 
     :goto_0
@@ -82,7 +82,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->FR()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->FG()Lkotlinx/coroutines/internal/ab;
 
     move-result-object v0
 
@@ -93,7 +93,7 @@
     goto :goto_1
 
     :cond_0
-    sget-object v1, Lkotlinx/coroutines/ah;->bmI:Lkotlinx/coroutines/ah;
+    sget-object v1, Lkotlinx/coroutines/ah;->bnc:Lkotlinx/coroutines/ah;
 
     invoke-virtual {v1, v0}, Lkotlinx/coroutines/ah;->a(Lkotlinx/coroutines/au$b;)V
 
@@ -121,7 +121,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->FQ()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->FF()Lkotlinx/coroutines/internal/ab;
 
     move-result-object v0
 
@@ -167,7 +167,7 @@
 
     check-cast v0, Lkotlinx/coroutines/au;
 
-    sget-object v1, Lkotlinx/coroutines/au;->bnb:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/au;->bnv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v2, 0x0
 
@@ -181,7 +181,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
     check-cast v0, Lkotlinx/coroutines/internal/aa;
@@ -214,7 +214,7 @@
 
     if-nez v0, :cond_2
 
-    sget-object v0, Lkotlinx/coroutines/au;->bna:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/au;->bnu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v2, 0x0
 
@@ -255,9 +255,9 @@
     return v2
 
     :cond_4
-    sget-object v1, Lkotlinx/coroutines/au;->bna:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/au;->bnu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/internal/m;->FL()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v3}, Lkotlinx/coroutines/internal/m;->FA()Lkotlinx/coroutines/internal/m;
 
     move-result-object v2
 
@@ -278,7 +278,7 @@
     throw p1
 
     :cond_7
-    invoke-static {}, Lkotlinx/coroutines/av;->Fk()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/av;->EZ()Lkotlinx/coroutines/internal/v;
 
     move-result-object v3
 
@@ -303,7 +303,7 @@
 
     invoke-virtual {v2, p1}, Lkotlinx/coroutines/internal/m;->bC(Ljava/lang/Object;)I
 
-    sget-object v3, Lkotlinx/coroutines/au;->bna:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/au;->bnu: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
 
@@ -342,7 +342,7 @@
 
     if-eq v1, v0, :cond_0
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     move-result-object v1
 
@@ -354,16 +354,16 @@
 
 
 # virtual methods
-.method public final Fa()J
+.method public final EP()J
     .locals 15
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/au;->Fc()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/au;->ER()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/au;->Fb()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/au;->EQ()J
 
     move-result-wide v0
 
@@ -388,7 +388,7 @@
 
     if-nez v5, :cond_5
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     move-result-object v5
 
@@ -400,7 +400,7 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->FS()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->FH()Lkotlinx/coroutines/internal/ab;
 
     move-result-object v7
     :try_end_0
@@ -450,7 +450,7 @@
     :goto_2
     if-eqz v7, :cond_4
 
-    invoke-virtual {v0, v3}, Lkotlinx/coroutines/internal/aa;->du(I)Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {v0, v3}, Lkotlinx/coroutines/internal/aa;->dr(I)Lkotlinx/coroutines/internal/ab;
 
     move-result-object v7
     :try_end_1
@@ -508,7 +508,7 @@
 
     if-eqz v10, :cond_8
 
-    sget-object v6, Lkotlinx/coroutines/internal/m;->boj:Lkotlinx/coroutines/internal/v;
+    sget-object v6, Lkotlinx/coroutines/internal/m;->boE:Lkotlinx/coroutines/internal/v;
 
     goto/16 :goto_8
 
@@ -589,9 +589,9 @@
 
     and-int v14, v6, v7
 
-    sget-object v6, Lkotlinx/coroutines/internal/m;->bog:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v6, Lkotlinx/coroutines/internal/m;->boB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-    sget-object v7, Lkotlinx/coroutines/internal/m;->bok:Lkotlinx/coroutines/internal/m$a;
+    sget-object v7, Lkotlinx/coroutines/internal/m;->boF:Lkotlinx/coroutines/internal/m$a;
 
     invoke-static {v8, v9, v14}, Lkotlinx/coroutines/internal/m$a;->c(JI)J
 
@@ -641,7 +641,7 @@
     move-object v6, v13
 
     :goto_8
-    sget-object v7, Lkotlinx/coroutines/internal/m;->boj:Lkotlinx/coroutines/internal/v;
+    sget-object v7, Lkotlinx/coroutines/internal/m;->boE:Lkotlinx/coroutines/internal/v;
 
     if-eq v6, v7, :cond_e
 
@@ -652,9 +652,9 @@
     goto :goto_9
 
     :cond_e
-    sget-object v6, Lkotlinx/coroutines/au;->bna:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v6, Lkotlinx/coroutines/au;->bnu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v5}, Lkotlinx/coroutines/internal/m;->FL()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v5}, Lkotlinx/coroutines/internal/m;->FA()Lkotlinx/coroutines/internal/m;
 
     move-result-object v5
 
@@ -672,7 +672,7 @@
     throw v0
 
     :cond_10
-    invoke-static {}, Lkotlinx/coroutines/av;->Fk()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/av;->EZ()Lkotlinx/coroutines/internal/v;
 
     move-result-object v5
 
@@ -681,7 +681,7 @@
     goto :goto_9
 
     :cond_11
-    sget-object v5, Lkotlinx/coroutines/au;->bna:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/au;->bnu: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
 
@@ -701,7 +701,7 @@
     invoke-interface {v4}, Ljava/lang/Runnable;->run()V
 
     :cond_12
-    invoke-virtual {p0}, Lkotlinx/coroutines/au;->Fb()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/au;->EQ()J
 
     move-result-wide v0
 
@@ -723,10 +723,10 @@
     goto :goto_a
 .end method
 
-.method protected final Fb()J
+.method protected final EQ()J
     .locals 6
 
-    invoke-super {p0}, Lkotlinx/coroutines/at;->Fb()J
+    invoke-super {p0}, Lkotlinx/coroutines/at;->EQ()J
 
     move-result-wide v0
 
@@ -760,7 +760,7 @@
     return-wide v2
 
     :cond_1
-    invoke-static {}, Lkotlinx/coroutines/av;->Fk()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/av;->EZ()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
 
@@ -781,7 +781,7 @@
     return-wide v4
 
     :cond_4
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->FQ()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->FF()Lkotlinx/coroutines/internal/ab;
 
     move-result-object v0
 
@@ -794,7 +794,7 @@
     :cond_5
     iget-wide v0, v0, Lkotlinx/coroutines/au$b;->nanoTime:J
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     move-result-object v4
 
@@ -896,7 +896,7 @@
     throw p1
 
     :cond_1
-    sget-object v0, Lkotlinx/coroutines/ah;->bmI:Lkotlinx/coroutines/ah;
+    sget-object v0, Lkotlinx/coroutines/ah;->bnc:Lkotlinx/coroutines/ah;
 
     goto :goto_0
 
@@ -919,7 +919,7 @@
 .method protected final isEmpty()Z
     .locals 4
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/au;->Fe()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/au;->ET()Z
 
     move-result v0
 
@@ -967,7 +967,7 @@
     return v0
 
     :cond_3
-    invoke-static {}, Lkotlinx/coroutines/av;->Fk()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/av;->EZ()Lkotlinx/coroutines/internal/v;
 
     move-result-object v3
 
@@ -1000,7 +1000,7 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/ah;->bmI:Lkotlinx/coroutines/ah;
+    sget-object v0, Lkotlinx/coroutines/ah;->bnc:Lkotlinx/coroutines/ah;
 
     goto :goto_0
 .end method
@@ -1008,9 +1008,9 @@
 .method protected final shutdown()V
     .locals 5
 
-    sget-object v0, Lkotlinx/coroutines/bu;->bnB:Lkotlinx/coroutines/bu;
+    sget-object v0, Lkotlinx/coroutines/bu;->bnV:Lkotlinx/coroutines/bu;
 
-    invoke-static {}, Lkotlinx/coroutines/bu;->Fy()V
+    invoke-static {}, Lkotlinx/coroutines/bu;->Fn()V
 
     const/4 v0, 0x1
 
@@ -1018,7 +1018,7 @@
 
     iget-boolean v1, p0, Lkotlinx/coroutines/au;->isCompleted:Z
 
-    sget-boolean v2, Lkotlin/v;->bjG:Z
+    sget-boolean v2, Lkotlin/v;->bka:Z
 
     if-eqz v2, :cond_1
 
@@ -1043,11 +1043,11 @@
 
     if-nez v1, :cond_2
 
-    sget-object v1, Lkotlinx/coroutines/au;->bna:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/au;->bnu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v2, 0x0
 
-    invoke-static {}, Lkotlinx/coroutines/av;->Fk()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/av;->EZ()Lkotlinx/coroutines/internal/v;
 
     move-result-object v3
 
@@ -1066,12 +1066,12 @@
 
     check-cast v1, Lkotlinx/coroutines/internal/m;
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/internal/m;->fX()Z
+    invoke-virtual {v1}, Lkotlinx/coroutines/internal/m;->gb()Z
 
     goto :goto_1
 
     :cond_3
-    invoke-static {}, Lkotlinx/coroutines/av;->Fk()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/av;->EZ()Lkotlinx/coroutines/internal/v;
 
     move-result-object v2
 
@@ -1091,7 +1091,7 @@
 
     invoke-virtual {v2, v3}, Lkotlinx/coroutines/internal/m;->bC(Ljava/lang/Object;)I
 
-    sget-object v3, Lkotlinx/coroutines/au;->bna:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/au;->bnu:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v3, p0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -1112,7 +1112,7 @@
 
     :cond_5
     :goto_1
-    invoke-virtual {p0}, Lkotlinx/coroutines/au;->Fa()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/au;->EP()J
 
     move-result-wide v0
 
@@ -1122,7 +1122,7 @@
 
     if-lez v4, :cond_5
 
-    invoke-direct {p0}, Lkotlinx/coroutines/au;->Fg()V
+    invoke-direct {p0}, Lkotlinx/coroutines/au;->EV()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/av.smali b/com.discord/smali_classes2/kotlinx/coroutines/av.smali
index a744bf9ae5..a5b0fd73c4 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/av.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/av.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final bnf:Lkotlinx/coroutines/internal/v;
+.field private static final bnA:Lkotlinx/coroutines/internal/v;
 
-.field private static final bng:Lkotlinx/coroutines/internal/v;
+.field private static final bnz:Lkotlinx/coroutines/internal/v;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/internal/v;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/av;->bnf:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/av;->bnz:Lkotlinx/coroutines/internal/v;
 
     new-instance v0, Lkotlinx/coroutines/internal/v;
 
@@ -27,12 +27,12 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/internal/v;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/av;->bng:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/av;->bnA:Lkotlinx/coroutines/internal/v;
 
     return-void
 .end method
 
-.method public static final Fi()Lkotlinx/coroutines/at;
+.method public static final EX()Lkotlinx/coroutines/at;
     .locals 3
 
     new-instance v0, Lkotlinx/coroutines/c;
@@ -52,18 +52,18 @@
     return-object v0
 .end method
 
-.method public static final synthetic Fj()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic EY()Lkotlinx/coroutines/internal/v;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/av;->bnf:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/av;->bnz:Lkotlinx/coroutines/internal/v;
 
     return-object v0
 .end method
 
-.method public static final synthetic Fk()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic EZ()Lkotlinx/coroutines/internal/v;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/av;->bng:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/av;->bnA:Lkotlinx/coroutines/internal/v;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ax.smali b/com.discord/smali_classes2/kotlinx/coroutines/ax.smali
index 8645033e4d..450354025a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ax.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ax.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field public static final bnh:Lkotlinx/coroutines/ax;
+.field public static final bnB:Lkotlinx/coroutines/ax;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/ax;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/ax;->bnh:Lkotlinx/coroutines/ax;
+    sput-object v0, Lkotlinx/coroutines/ax;->bnB:Lkotlinx/coroutines/ax;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final Ey()Lkotlin/coroutines/CoroutineContext;
+.method public final En()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sget-object v0, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ay.smali b/com.discord/smali_classes2/kotlinx/coroutines/ay.smali
index 5a2c8ca343..3c1470d6c1 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ay.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ay.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field final bni:Lkotlinx/coroutines/bn;
+.field final bnC:Lkotlinx/coroutines/bn;
 
 
 # direct methods
@@ -20,17 +20,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/ay;->bni:Lkotlinx/coroutines/bn;
+    iput-object p1, p0, Lkotlinx/coroutines/ay;->bnC:Lkotlinx/coroutines/bn;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final EZ()Lkotlinx/coroutines/bn;
+.method public final EO()Lkotlinx/coroutines/bn;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/ay;->bni:Lkotlinx/coroutines/bn;
+    iget-object v0, p0, Lkotlinx/coroutines/ay;->bnC:Lkotlinx/coroutines/bn;
 
     return-object v0
 .end method
@@ -46,7 +46,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/ay;->bni:Lkotlinx/coroutines/bn;
+    iget-object v0, p0, Lkotlinx/coroutines/ay;->bnC:Lkotlinx/coroutines/bn;
 
     const-string v1, "New"
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/az.smali b/com.discord/smali_classes2/kotlinx/coroutines/az.smali
index acc0466197..4b7078dc1f 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/az.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/az.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract EZ()Lkotlinx/coroutines/bn;
+.method public abstract EO()Lkotlinx/coroutines/bn;
 .end method
 
 .method public abstract isActive()Z
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b.smali b/com.discord/smali_classes2/kotlinx/coroutines/b.smali
index dc179e251c..8a37bdbab8 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field public static final bmg:Lkotlinx/coroutines/b;
+.field public static final bmA:Lkotlinx/coroutines/b;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/b;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/b;->bmg:Lkotlinx/coroutines/b;
+    sput-object v0, Lkotlinx/coroutines/b;->bmA:Lkotlinx/coroutines/b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/a$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/a$b.smali
index cfca0d0f7b..3803e42062 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/a$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/a$b.smali
@@ -15,23 +15,23 @@
 
 
 # static fields
-.field private static final boW:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bpq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
-.field final boV:Lkotlinx/coroutines/b/o;
+.field final bpp:Lkotlinx/coroutines/b/o;
 
-.field private boX:J
+.field private bpr:J
 
-.field private boY:J
+.field private bps:J
 
-.field private boZ:I
+.field private bpt:I
 
-.field private bpa:I
+.field private bpu:I
 
-.field private bpb:I
+.field private bpv:I
 
-.field final synthetic bpc:Lkotlinx/coroutines/b/a;
+.field final synthetic bpw:Lkotlinx/coroutines/b/a;
 
 .field volatile indexInArray:I
 
@@ -56,7 +56,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/b/a$b;->boW:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/b/a$b;->bpq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iput-object p1, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-direct {p0}, Ljava/lang/Thread;-><init>()V
 
@@ -81,9 +81,9 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/b/o;-><init>()V
 
-    iput-object v0, p0, Lkotlinx/coroutines/b/a$b;->boV:Lkotlinx/coroutines/b/o;
+    iput-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpp:Lkotlinx/coroutines/b/o;
 
-    sget-object v0, Lkotlinx/coroutines/b/a$c;->bpg:Lkotlinx/coroutines/b/a$c;
+    sget-object v0, Lkotlinx/coroutines/b/a$c;->bpA:Lkotlinx/coroutines/b/a$c;
 
     iput-object v0, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
@@ -91,17 +91,17 @@
 
     iput v0, p0, Lkotlinx/coroutines/b/a$b;->terminationState:I
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->Gc()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/b/a;->FR()Lkotlinx/coroutines/internal/v;
 
     move-result-object v0
 
     iput-object v0, p0, Lkotlinx/coroutines/b/a$b;->nextParkedWorker:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->Gb()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->FQ()I
 
     move-result v0
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->boZ:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bpt:I
 
     invoke-static {p1}, Lkotlinx/coroutines/b/a;->j(Lkotlinx/coroutines/b/a;)Ljava/util/Random;
 
@@ -111,7 +111,7 @@
 
     move-result p1
 
-    iput p1, p0, Lkotlinx/coroutines/b/a$b;->bpa:I
+    iput p1, p0, Lkotlinx/coroutines/b/a$b;->bpu:I
 
     return-void
 .end method
@@ -126,21 +126,21 @@
 
     invoke-direct {p0, p1}, Lkotlinx/coroutines/b/a$b;-><init>(Lkotlinx/coroutines/b/a;)V
 
-    invoke-direct {p0, p2}, Lkotlinx/coroutines/b/a$b;->dx(I)V
+    invoke-direct {p0, p2}, Lkotlinx/coroutines/b/a$b;->du(I)V
 
     return-void
 .end method
 
-.method private final Gg()Z
+.method private final FV()Z
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/b/a;->i(Lkotlinx/coroutines/b/a;)Lkotlinx/coroutines/b/e;
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/b/l;->bpw:Lkotlinx/coroutines/b/l;
+    sget-object v1, Lkotlinx/coroutines/b/l;->bpQ:Lkotlinx/coroutines/b/l;
 
     invoke-virtual {v0, v1}, Lkotlinx/coroutines/b/e;->a(Lkotlinx/coroutines/b/l;)Lkotlinx/coroutines/b/i;
 
@@ -148,9 +148,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->boV:Lkotlinx/coroutines/b/o;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bpp:Lkotlinx/coroutines/b/o;
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v2}, Lkotlinx/coroutines/b/a;->i(Lkotlinx/coroutines/b/a;)Lkotlinx/coroutines/b/e;
 
@@ -168,10 +168,10 @@
     return v0
 .end method
 
-.method private final Gj()Lkotlinx/coroutines/b/i;
+.method private final FY()Lkotlinx/coroutines/b/i;
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/b/a;->h(Lkotlinx/coroutines/b/a;)I
 
@@ -179,7 +179,7 @@
 
     mul-int/lit8 v0, v0, 0x2
 
-    invoke-direct {p0, v0}, Lkotlinx/coroutines/b/a$b;->dy(I)I
+    invoke-direct {p0, v0}, Lkotlinx/coroutines/b/a$b;->dv(I)I
 
     move-result v0
 
@@ -195,13 +195,13 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v1}, Lkotlinx/coroutines/b/a;->i(Lkotlinx/coroutines/b/a;)Lkotlinx/coroutines/b/e;
 
     move-result-object v1
 
-    sget-object v2, Lkotlinx/coroutines/b/l;->bpv:Lkotlinx/coroutines/b/l;
+    sget-object v2, Lkotlinx/coroutines/b/l;->bpP:Lkotlinx/coroutines/b/l;
 
     invoke-virtual {v1, v2}, Lkotlinx/coroutines/b/e;->a(Lkotlinx/coroutines/b/l;)Lkotlinx/coroutines/b/i;
 
@@ -212,9 +212,9 @@
     return-object v1
 
     :cond_1
-    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->boV:Lkotlinx/coroutines/b/o;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bpp:Lkotlinx/coroutines/b/o;
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/b/o;->Gp()Lkotlinx/coroutines/b/i;
+    invoke-virtual {v1}, Lkotlinx/coroutines/b/o;->Ge()Lkotlinx/coroutines/b/i;
 
     move-result-object v1
 
@@ -225,13 +225,13 @@
     :cond_2
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/b/a;->i(Lkotlinx/coroutines/b/a;)Lkotlinx/coroutines/b/e;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/e;->FA()Ljava/lang/Object;
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/e;->Fp()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -242,17 +242,17 @@
     return-object v0
 
     :cond_3
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->Gk()Lkotlinx/coroutines/b/i;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->FZ()Lkotlinx/coroutines/b/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method private final Gk()Lkotlinx/coroutines/b/i;
+.method private final FZ()Lkotlinx/coroutines/b/i;
     .locals 4
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/b/a;->g(Lkotlinx/coroutines/b/a;)I
 
@@ -267,11 +267,11 @@
     return-object v1
 
     :cond_0
-    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bpb:I
+    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bpv:I
 
     if-nez v2, :cond_1
 
-    invoke-direct {p0, v0}, Lkotlinx/coroutines/b/a$b;->dy(I)I
+    invoke-direct {p0, v0}, Lkotlinx/coroutines/b/a$b;->dv(I)I
 
     move-result v2
 
@@ -285,9 +285,9 @@
     const/4 v2, 0x1
 
     :cond_2
-    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bpb:I
+    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bpv:I
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/b/a;->f(Lkotlinx/coroutines/b/a;)[Lkotlinx/coroutines/b/a$b;
 
@@ -303,11 +303,11 @@
 
     if-eq v0, v2, :cond_3
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->boV:Lkotlinx/coroutines/b/o;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bpp:Lkotlinx/coroutines/b/o;
 
-    iget-object v0, v0, Lkotlinx/coroutines/b/a$b;->boV:Lkotlinx/coroutines/b/o;
+    iget-object v0, v0, Lkotlinx/coroutines/b/a$b;->bpp:Lkotlinx/coroutines/b/o;
 
-    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v3}, Lkotlinx/coroutines/b/a;->i(Lkotlinx/coroutines/b/a;)Lkotlinx/coroutines/b/e;
 
@@ -319,9 +319,9 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->boV:Lkotlinx/coroutines/b/o;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpp:Lkotlinx/coroutines/b/o;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/o;->Gp()Lkotlinx/coroutines/b/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/o;->Ge()Lkotlinx/coroutines/b/i;
 
     move-result-object v0
 
@@ -334,11 +334,11 @@
 .method private final aB(J)Z
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v0, p0}, Lkotlinx/coroutines/b/a;->a(Lkotlinx/coroutines/b/a;Lkotlinx/coroutines/b/a$b;)V
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->Gg()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->FV()Z
 
     move-result v0
 
@@ -356,14 +356,14 @@
     return p1
 .end method
 
-.method private dx(I)V
+.method private du(I)V
     .locals 2
 
     new-instance v0, Ljava/lang/StringBuilder;
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v1}, Lkotlinx/coroutines/b/a;->a(Lkotlinx/coroutines/b/a;)Ljava/lang/String;
 
@@ -400,32 +400,32 @@
     return-void
 .end method
 
-.method private dy(I)I
+.method private dv(I)I
     .locals 2
 
-    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bpa:I
+    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bpu:I
 
     shl-int/lit8 v1, v0, 0xd
 
     xor-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bpa:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bpu:I
 
-    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bpa:I
+    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bpu:I
 
     shr-int/lit8 v1, v0, 0x11
 
     xor-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bpa:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bpu:I
 
-    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bpa:I
+    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bpu:I
 
     shl-int/lit8 v1, v0, 0x5
 
     xor-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bpa:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bpu:I
 
     add-int/lit8 v0, p1, -0x1
 
@@ -433,14 +433,14 @@
 
     if-nez v1, :cond_0
 
-    iget p1, p0, Lkotlinx/coroutines/b/a$b;->bpa:I
+    iget p1, p0, Lkotlinx/coroutines/b/a$b;->bpu:I
 
     and-int/2addr p1, v0
 
     return p1
 
     :cond_0
-    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bpa:I
+    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bpu:I
 
     const v1, 0x7fffffff
 
@@ -453,12 +453,12 @@
 
 
 # virtual methods
-.method public final Gd()Z
+.method public final FS()Z
     .locals 2
 
     iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
-    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpf:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpz:Lkotlinx/coroutines/b/a$c;
 
     if-ne v0, v1, :cond_0
 
@@ -472,7 +472,7 @@
     return v0
 .end method
 
-.method public final Ge()Z
+.method public final FT()Z
     .locals 3
 
     iget v0, p0, Lkotlinx/coroutines/b/a$b;->terminationState:I
@@ -515,7 +515,7 @@
     throw v1
 
     :cond_1
-    sget-object v0, Lkotlinx/coroutines/b/a$b;->boW:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/a$b;->bpq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     invoke-virtual {v0, p0, v2, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
 
@@ -527,12 +527,12 @@
     return v2
 .end method
 
-.method public final Gf()Z
+.method public final FU()Z
     .locals 3
 
     iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
-    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpd:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpx:Lkotlinx/coroutines/b/a$c;
 
     const/4 v2, 0x1
 
@@ -541,7 +541,7 @@
     return v2
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/b/a;->b(Lkotlinx/coroutines/b/a;)Ljava/util/concurrent/Semaphore;
 
@@ -553,7 +553,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lkotlinx/coroutines/b/a$c;->bpd:Lkotlinx/coroutines/b/a$c;
+    sget-object v0, Lkotlinx/coroutines/b/a$c;->bpx:Lkotlinx/coroutines/b/a$c;
 
     iput-object v0, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
@@ -565,14 +565,14 @@
     return v0
 .end method
 
-.method public final Gh()V
+.method public final FW()V
     .locals 1
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->Gb()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->FQ()I
 
     move-result v0
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->boZ:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bpt:I
 
     const/4 v0, 0x0
 
@@ -581,37 +581,37 @@
     return-void
 .end method
 
-.method public final Gi()Lkotlinx/coroutines/b/i;
+.method public final FX()Lkotlinx/coroutines/b/i;
     .locals 2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/b/a$b;->Gf()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/b/a$b;->FU()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->Gj()Lkotlinx/coroutines/b/i;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->FY()Lkotlinx/coroutines/b/i;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->boV:Lkotlinx/coroutines/b/o;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpp:Lkotlinx/coroutines/b/o;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/o;->Gp()Lkotlinx/coroutines/b/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/o;->Ge()Lkotlinx/coroutines/b/i;
 
     move-result-object v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/b/a;->i(Lkotlinx/coroutines/b/a;)Lkotlinx/coroutines/b/e;
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/b/l;->bpw:Lkotlinx/coroutines/b/l;
+    sget-object v1, Lkotlinx/coroutines/b/l;->bpQ:Lkotlinx/coroutines/b/l;
 
     invoke-virtual {v0, v1}, Lkotlinx/coroutines/b/e;->a(Lkotlinx/coroutines/b/l;)Lkotlinx/coroutines/b/i;
 
@@ -630,7 +630,7 @@
 
     iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
-    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpd:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpx:Lkotlinx/coroutines/b/a$c;
 
     if-ne v0, v1, :cond_0
 
@@ -644,7 +644,7 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v2}, Lkotlinx/coroutines/b/a;->b(Lkotlinx/coroutines/b/a;)Ljava/util/concurrent/Semaphore;
 
@@ -672,7 +672,7 @@
 
     :cond_0
     :goto_0
-    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v3}, Lkotlinx/coroutines/b/a;->c(Lkotlinx/coroutines/b/a;)Z
 
@@ -682,11 +682,11 @@
 
     iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
-    sget-object v4, Lkotlinx/coroutines/b/a$c;->bph:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bpB:Lkotlinx/coroutines/b/a$c;
 
     if-eq v3, v4, :cond_17
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/b/a$b;->Gi()Lkotlinx/coroutines/b/i;
+    invoke-virtual {p0}, Lkotlinx/coroutines/b/a$b;->FX()Lkotlinx/coroutines/b/i;
 
     move-result-object v3
 
@@ -696,13 +696,13 @@
 
     iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
-    sget-object v3, Lkotlinx/coroutines/b/a$c;->bpd:Lkotlinx/coroutines/b/a$c;
+    sget-object v3, Lkotlinx/coroutines/b/a$c;->bpx:Lkotlinx/coroutines/b/a$c;
 
     if-ne v2, v3, :cond_3
 
     iget v2, p0, Lkotlinx/coroutines/b/a$b;->spins:I
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->FY()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->FN()I
 
     move-result v3
 
@@ -712,7 +712,7 @@
 
     iput v3, p0, Lkotlinx/coroutines/b/a$b;->spins:I
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->FZ()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->FO()I
 
     move-result v3
 
@@ -723,36 +723,36 @@
     goto/16 :goto_1
 
     :cond_1
-    iget v2, p0, Lkotlinx/coroutines/b/a$b;->boZ:I
+    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bpt:I
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->Ga()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->FP()I
 
     move-result v3
 
     if-ge v2, v3, :cond_2
 
-    iget v2, p0, Lkotlinx/coroutines/b/a$b;->boZ:I
+    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bpt:I
 
     mul-int/lit8 v2, v2, 0x3
 
     ushr-int/2addr v2, v0
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->Ga()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->FP()I
 
     move-result v3
 
-    invoke-static {v2, v3}, Lkotlin/ranges/c;->aa(II)I
+    invoke-static {v2, v3}, Lkotlin/ranges/c;->Z(II)I
 
     move-result v2
 
-    iput v2, p0, Lkotlinx/coroutines/b/a$b;->boZ:I
+    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bpt:I
 
     :cond_2
-    sget-object v2, Lkotlinx/coroutines/b/a$c;->bpf:Lkotlinx/coroutines/b/a$c;
+    sget-object v2, Lkotlinx/coroutines/b/a$c;->bpz:Lkotlinx/coroutines/b/a$c;
 
     invoke-virtual {p0, v2}, Lkotlinx/coroutines/b/a$b;->a(Lkotlinx/coroutines/b/a$c;)Z
 
-    iget v2, p0, Lkotlinx/coroutines/b/a$b;->boZ:I
+    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bpt:I
 
     int-to-long v2, v2
 
@@ -761,11 +761,11 @@
     goto/16 :goto_1
 
     :cond_3
-    sget-object v2, Lkotlinx/coroutines/b/a$c;->bpf:Lkotlinx/coroutines/b/a$c;
+    sget-object v2, Lkotlinx/coroutines/b/a$c;->bpz:Lkotlinx/coroutines/b/a$c;
 
     invoke-virtual {p0, v2}, Lkotlinx/coroutines/b/a$b;->a(Lkotlinx/coroutines/b/a$c;)Z
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->Gg()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->FV()Z
 
     move-result v2
 
@@ -773,7 +773,7 @@
 
     iput v1, p0, Lkotlinx/coroutines/b/a$b;->terminationState:I
 
-    iget-wide v2, p0, Lkotlinx/coroutines/b/a$b;->boX:J
+    iget-wide v2, p0, Lkotlinx/coroutines/b/a$b;->bpr:J
 
     cmp-long v6, v2, v4
 
@@ -783,7 +783,7 @@
 
     move-result-wide v2
 
-    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v6}, Lkotlinx/coroutines/b/a;->e(Lkotlinx/coroutines/b/a;)J
 
@@ -791,10 +791,10 @@
 
     add-long/2addr v2, v6
 
-    iput-wide v2, p0, Lkotlinx/coroutines/b/a$b;->boX:J
+    iput-wide v2, p0, Lkotlinx/coroutines/b/a$b;->bpr:J
 
     :cond_4
-    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v2}, Lkotlinx/coroutines/b/a;->e(Lkotlinx/coroutines/b/a;)J
 
@@ -810,7 +810,7 @@
 
     move-result-wide v2
 
-    iget-wide v6, p0, Lkotlinx/coroutines/b/a$b;->boX:J
+    iget-wide v6, p0, Lkotlinx/coroutines/b/a$b;->bpr:J
 
     sub-long/2addr v2, v6
 
@@ -818,9 +818,9 @@
 
     if-ltz v6, :cond_b
 
-    iput-wide v4, p0, Lkotlinx/coroutines/b/a$b;->boX:J
+    iput-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bpr:J
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v2}, Lkotlinx/coroutines/b/a;->f(Lkotlinx/coroutines/b/a;)[Lkotlinx/coroutines/b/a$b;
 
@@ -829,7 +829,7 @@
     monitor-enter v2
 
     :try_start_0
-    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v3}, Lkotlinx/coroutines/b/a;->c(Lkotlinx/coroutines/b/a;)Z
 
@@ -845,13 +845,13 @@
 
     :cond_5
     :try_start_1
-    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v3}, Lkotlinx/coroutines/b/a;->g(Lkotlinx/coroutines/b/a;)I
 
     move-result v3
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v4}, Lkotlinx/coroutines/b/a;->h(Lkotlinx/coroutines/b/a;)I
 
@@ -867,7 +867,7 @@
 
     :cond_6
     :try_start_2
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->Gg()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->FV()Z
 
     move-result v3
     :try_end_2
@@ -881,7 +881,7 @@
 
     :cond_7
     :try_start_3
-    sget-object v3, Lkotlinx/coroutines/b/a$b;->boW:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/b/a$b;->bpq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     invoke-virtual {v3, p0, v1, v0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
 
@@ -899,15 +899,15 @@
     :try_start_4
     iget v3, p0, Lkotlinx/coroutines/b/a$b;->indexInArray:I
 
-    invoke-direct {p0, v1}, Lkotlinx/coroutines/b/a$b;->dx(I)V
+    invoke-direct {p0, v1}, Lkotlinx/coroutines/b/a$b;->du(I)V
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v4, p0, v3, v1}, Lkotlinx/coroutines/b/a;->a(Lkotlinx/coroutines/b/a;Lkotlinx/coroutines/b/a$b;II)V
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
-    sget-object v5, Lkotlinx/coroutines/b/a;->boJ:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/b/a;->bpd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     invoke-virtual {v5, v4}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->getAndDecrement(Ljava/lang/Object;)J
 
@@ -921,7 +921,7 @@
 
     if-eq v5, v3, :cond_a
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v4}, Lkotlinx/coroutines/b/a;->f(Lkotlinx/coroutines/b/a;)[Lkotlinx/coroutines/b/a$b;
 
@@ -931,10 +931,10 @@
 
     if-nez v4, :cond_9
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_9
-    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v6}, Lkotlinx/coroutines/b/a;->f(Lkotlinx/coroutines/b/a;)[Lkotlinx/coroutines/b/a$b;
 
@@ -942,14 +942,14 @@
 
     aput-object v4, v6, v3
 
-    invoke-direct {v4, v3}, Lkotlinx/coroutines/b/a$b;->dx(I)V
+    invoke-direct {v4, v3}, Lkotlinx/coroutines/b/a$b;->du(I)V
 
-    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v6, v4, v5, v3}, Lkotlinx/coroutines/b/a;->a(Lkotlinx/coroutines/b/a;Lkotlinx/coroutines/b/a$b;II)V
 
     :cond_a
-    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v3}, Lkotlinx/coroutines/b/a;->f(Lkotlinx/coroutines/b/a;)[Lkotlinx/coroutines/b/a$b;
 
@@ -959,13 +959,13 @@
 
     aput-object v4, v3, v5
 
-    sget-object v3, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v3, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     monitor-exit v2
 
-    sget-object v2, Lkotlinx/coroutines/b/a$c;->bph:Lkotlinx/coroutines/b/a$c;
+    sget-object v2, Lkotlinx/coroutines/b/a$c;->bpB:Lkotlinx/coroutines/b/a$c;
 
     iput-object v2, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
@@ -985,23 +985,23 @@
     goto/16 :goto_0
 
     :cond_c
-    invoke-virtual {v3}, Lkotlinx/coroutines/b/i;->Gn()Lkotlinx/coroutines/b/l;
+    invoke-virtual {v3}, Lkotlinx/coroutines/b/i;->Gc()Lkotlinx/coroutines/b/l;
 
     move-result-object v6
 
     if-eqz v2, :cond_11
 
-    iput-wide v4, p0, Lkotlinx/coroutines/b/a$b;->boX:J
+    iput-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bpr:J
 
-    iput v1, p0, Lkotlinx/coroutines/b/a$b;->bpb:I
+    iput v1, p0, Lkotlinx/coroutines/b/a$b;->bpv:I
 
     iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
-    sget-object v4, Lkotlinx/coroutines/b/a$c;->bpf:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bpz:Lkotlinx/coroutines/b/a$c;
 
     if-ne v2, v4, :cond_10
 
-    sget-object v2, Lkotlinx/coroutines/b/l;->bpw:Lkotlinx/coroutines/b/l;
+    sget-object v2, Lkotlinx/coroutines/b/l;->bpQ:Lkotlinx/coroutines/b/l;
 
     if-ne v6, v2, :cond_d
 
@@ -1013,7 +1013,7 @@
     const/4 v2, 0x0
 
     :goto_2
-    sget-boolean v4, Lkotlin/v;->bjG:Z
+    sget-boolean v4, Lkotlin/v;->bka:Z
 
     if-eqz v4, :cond_f
 
@@ -1034,15 +1034,15 @@
 
     :cond_f
     :goto_3
-    sget-object v2, Lkotlinx/coroutines/b/a$c;->bpe:Lkotlinx/coroutines/b/a$c;
+    sget-object v2, Lkotlinx/coroutines/b/a$c;->bpy:Lkotlinx/coroutines/b/a$c;
 
     iput-object v2, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->Gb()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->FQ()I
 
     move-result v2
 
-    iput v2, p0, Lkotlinx/coroutines/b/a$b;->boZ:I
+    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bpt:I
 
     :cond_10
     iput v1, p0, Lkotlinx/coroutines/b/a$b;->spins:I
@@ -1050,21 +1050,21 @@
     const/4 v2, 0x0
 
     :cond_11
-    iget-wide v4, v3, Lkotlinx/coroutines/b/i;->bps:J
+    iget-wide v4, v3, Lkotlinx/coroutines/b/i;->bpM:J
 
-    sget-object v7, Lkotlinx/coroutines/b/l;->bpv:Lkotlinx/coroutines/b/l;
+    sget-object v7, Lkotlinx/coroutines/b/l;->bpP:Lkotlinx/coroutines/b/l;
 
     if-eq v6, v7, :cond_12
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
-    sget-object v5, Lkotlinx/coroutines/b/a;->boJ:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/b/a;->bpd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     const-wide/32 v7, 0x200000
 
     invoke-virtual {v5, v4, v7, v8}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->addAndGet(Ljava/lang/Object;J)J
 
-    sget-object v4, Lkotlinx/coroutines/b/a$c;->bpe:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bpy:Lkotlinx/coroutines/b/a$c;
 
     invoke-virtual {p0, v4}, Lkotlinx/coroutines/b/a$b;->a(Lkotlinx/coroutines/b/a$c;)Z
 
@@ -1072,14 +1072,14 @@
 
     if-eqz v4, :cond_13
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v4}, Lkotlinx/coroutines/b/a;->d(Lkotlinx/coroutines/b/a;)V
 
     goto :goto_4
 
     :cond_12
-    iget-object v7, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v7, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v7}, Lkotlinx/coroutines/b/a;->b(Lkotlinx/coroutines/b/a;)Ljava/util/concurrent/Semaphore;
 
@@ -1091,7 +1091,7 @@
 
     if-eqz v7, :cond_13
 
-    sget-object v7, Lkotlinx/coroutines/b/m;->bpC:Lkotlinx/coroutines/b/n;
+    sget-object v7, Lkotlinx/coroutines/b/m;->bpW:Lkotlinx/coroutines/b/n;
 
     invoke-virtual {v7}, Lkotlinx/coroutines/b/n;->nanoTime()J
 
@@ -1099,17 +1099,17 @@
 
     sub-long v4, v7, v4
 
-    sget-wide v9, Lkotlinx/coroutines/b/m;->bpy:J
+    sget-wide v9, Lkotlinx/coroutines/b/m;->bpS:J
 
     cmp-long v11, v4, v9
 
     if-ltz v11, :cond_13
 
-    iget-wide v4, p0, Lkotlinx/coroutines/b/a$b;->boY:J
+    iget-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bps:J
 
     sub-long v4, v7, v4
 
-    sget-wide v9, Lkotlinx/coroutines/b/m;->bpy:J
+    sget-wide v9, Lkotlinx/coroutines/b/m;->bpS:J
 
     const-wide/16 v11, 0x5
 
@@ -1119,9 +1119,9 @@
 
     if-ltz v11, :cond_13
 
-    iput-wide v7, p0, Lkotlinx/coroutines/b/a$b;->boY:J
+    iput-wide v7, p0, Lkotlinx/coroutines/b/a$b;->bps:J
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v4}, Lkotlinx/coroutines/b/a;->d(Lkotlinx/coroutines/b/a;)V
 
@@ -1129,13 +1129,13 @@
     :goto_4
     invoke-static {v3}, Lkotlinx/coroutines/b/a;->b(Lkotlinx/coroutines/b/i;)V
 
-    sget-object v3, Lkotlinx/coroutines/b/l;->bpv:Lkotlinx/coroutines/b/l;
+    sget-object v3, Lkotlinx/coroutines/b/l;->bpP:Lkotlinx/coroutines/b/l;
 
     if-eq v6, v3, :cond_0
 
-    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
-    sget-object v4, Lkotlinx/coroutines/b/a;->boJ:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v4, Lkotlinx/coroutines/b/a;->bpd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     const-wide/32 v5, -0x200000
 
@@ -1143,11 +1143,11 @@
 
     iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
-    sget-object v4, Lkotlinx/coroutines/b/a$c;->bph:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bpB:Lkotlinx/coroutines/b/a$c;
 
     if-eq v3, v4, :cond_0
 
-    sget-object v4, Lkotlinx/coroutines/b/a$c;->bpe:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bpy:Lkotlinx/coroutines/b/a$c;
 
     if-ne v3, v4, :cond_14
 
@@ -1159,7 +1159,7 @@
     const/4 v4, 0x0
 
     :goto_5
-    sget-boolean v5, Lkotlin/v;->bjG:Z
+    sget-boolean v5, Lkotlin/v;->bka:Z
 
     if-eqz v5, :cond_16
 
@@ -1188,14 +1188,14 @@
 
     :cond_16
     :goto_6
-    sget-object v3, Lkotlinx/coroutines/b/a$c;->bpg:Lkotlinx/coroutines/b/a$c;
+    sget-object v3, Lkotlinx/coroutines/b/a$c;->bpA:Lkotlinx/coroutines/b/a$c;
 
     iput-object v3, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
     goto/16 :goto_0
 
     :cond_17
-    sget-object v0, Lkotlinx/coroutines/b/a$c;->bph:Lkotlinx/coroutines/b/a$c;
+    sget-object v0, Lkotlinx/coroutines/b/a$c;->bpB:Lkotlinx/coroutines/b/a$c;
 
     invoke-virtual {p0, v0}, Lkotlinx/coroutines/b/a$b;->a(Lkotlinx/coroutines/b/a$c;)Z
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/a$c.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/a$c.smali
index fedb261e87..79b6a06cbc 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/a$c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/a$c.smali
@@ -23,17 +23,17 @@
 
 
 # static fields
-.field public static final enum bpd:Lkotlinx/coroutines/b/a$c;
+.field public static final enum bpA:Lkotlinx/coroutines/b/a$c;
 
-.field public static final enum bpe:Lkotlinx/coroutines/b/a$c;
+.field public static final enum bpB:Lkotlinx/coroutines/b/a$c;
 
-.field public static final enum bpf:Lkotlinx/coroutines/b/a$c;
+.field private static final synthetic bpC:[Lkotlinx/coroutines/b/a$c;
 
-.field public static final enum bpg:Lkotlinx/coroutines/b/a$c;
+.field public static final enum bpx:Lkotlinx/coroutines/b/a$c;
 
-.field public static final enum bph:Lkotlinx/coroutines/b/a$c;
+.field public static final enum bpy:Lkotlinx/coroutines/b/a$c;
 
-.field private static final synthetic bpi:[Lkotlinx/coroutines/b/a$c;
+.field public static final enum bpz:Lkotlinx/coroutines/b/a$c;
 
 
 # direct methods
@@ -52,7 +52,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/b/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/b/a$c;->bpd:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bpx:Lkotlinx/coroutines/b/a$c;
 
     aput-object v1, v0, v2
 
@@ -64,7 +64,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/b/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/b/a$c;->bpe:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bpy:Lkotlinx/coroutines/b/a$c;
 
     aput-object v1, v0, v2
 
@@ -76,7 +76,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/b/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/b/a$c;->bpf:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bpz:Lkotlinx/coroutines/b/a$c;
 
     aput-object v1, v0, v2
 
@@ -88,7 +88,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/b/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/b/a$c;->bpg:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bpA:Lkotlinx/coroutines/b/a$c;
 
     aput-object v1, v0, v2
 
@@ -100,11 +100,11 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/b/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/b/a$c;->bph:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bpB:Lkotlinx/coroutines/b/a$c;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlinx/coroutines/b/a$c;->bpi:[Lkotlinx/coroutines/b/a$c;
+    sput-object v0, Lkotlinx/coroutines/b/a$c;->bpC:[Lkotlinx/coroutines/b/a$c;
 
     return-void
 .end method
@@ -139,7 +139,7 @@
 .method public static values()[Lkotlinx/coroutines/b/a$c;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/b/a$c;->bpi:[Lkotlinx/coroutines/b/a$c;
+    sget-object v0, Lkotlinx/coroutines/b/a$c;->bpC:[Lkotlinx/coroutines/b/a$c;
 
     invoke-virtual {v0}, [Lkotlinx/coroutines/b/a$c;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/a.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/a.smali
index bcfec9a915..954da372dd 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/a.smali
@@ -18,41 +18,41 @@
 
 
 # static fields
-.field private static final boH:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+.field private static final bpb:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-.field static final boJ:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+.field static final bpd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-.field private static final boK:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bpe:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
-.field private static final boP:I
+.field private static final bpj:I
 
-.field private static final boQ:I
+.field private static final bpk:I
 
-.field private static final boR:I
+.field private static final bpl:I
 
-.field private static final boS:I
+.field private static final bpm:I
 
-.field private static final boT:Lkotlinx/coroutines/internal/v;
+.field private static final bpn:Lkotlinx/coroutines/internal/v;
 
-.field public static final boU:Lkotlinx/coroutines/b/a$a;
+.field public static final bpo:Lkotlinx/coroutines/b/a$a;
 
 
 # instance fields
 .field private volatile _isTerminated:I
 
-.field private final boF:Lkotlinx/coroutines/b/e;
+.field private final boZ:Lkotlinx/coroutines/b/e;
 
-.field private final boG:Ljava/util/concurrent/Semaphore;
+.field private final bpa:Ljava/util/concurrent/Semaphore;
 
-.field private final boI:[Lkotlinx/coroutines/b/a$b;
+.field private final bpc:[Lkotlinx/coroutines/b/a$b;
 
-.field private final boL:I
+.field private final bpf:I
 
-.field private final boM:I
+.field private final bpg:I
 
-.field private final boN:J
+.field private final bph:J
 
-.field private final boO:Ljava/lang/String;
+.field private final bpi:Ljava/lang/String;
 
 .field volatile controlState:J
 
@@ -73,7 +73,7 @@
 
     invoke-direct {v1, v2}, Lkotlinx/coroutines/b/a$a;-><init>(B)V
 
-    sput-object v1, Lkotlinx/coroutines/b/a;->boU:Lkotlinx/coroutines/b/a$a;
+    sput-object v1, Lkotlinx/coroutines/b/a;->bpo:Lkotlinx/coroutines/b/a$a;
 
     const/16 v1, 0x8
 
@@ -87,7 +87,7 @@
 
     move-result v3
 
-    sput v3, Lkotlinx/coroutines/b/a;->boP:I
+    sput v3, Lkotlinx/coroutines/b/a;->bpj:I
 
     const-string v4, "kotlinx.coroutines.scheduler.yields"
 
@@ -97,7 +97,7 @@
 
     add-int/2addr v3, v1
 
-    sput v3, Lkotlinx/coroutines/b/a;->boQ:I
+    sput v3, Lkotlinx/coroutines/b/a;->bpk:I
 
     sget-object v1, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -109,9 +109,9 @@
 
     long-to-int v2, v1
 
-    sput v2, Lkotlinx/coroutines/b/a;->boR:I
+    sput v2, Lkotlinx/coroutines/b/a;->bpl:I
 
-    sget-wide v1, Lkotlinx/coroutines/b/m;->bpy:J
+    sget-wide v1, Lkotlinx/coroutines/b/m;->bpS:J
 
     const-wide/16 v3, 0x4
 
@@ -123,7 +123,7 @@
 
     move-result-wide v1
 
-    sget v3, Lkotlinx/coroutines/b/a;->boR:I
+    sget v3, Lkotlinx/coroutines/b/a;->bpl:I
 
     int-to-long v3, v3
 
@@ -133,7 +133,7 @@
 
     long-to-int v2, v1
 
-    sput v2, Lkotlinx/coroutines/b/a;->boS:I
+    sput v2, Lkotlinx/coroutines/b/a;->bpm:I
 
     new-instance v1, Lkotlinx/coroutines/internal/v;
 
@@ -141,7 +141,7 @@
 
     invoke-direct {v1, v2}, Lkotlinx/coroutines/internal/v;-><init>(Ljava/lang/String;)V
 
-    sput-object v1, Lkotlinx/coroutines/b/a;->boT:Lkotlinx/coroutines/internal/v;
+    sput-object v1, Lkotlinx/coroutines/b/a;->bpn:Lkotlinx/coroutines/internal/v;
 
     const-string v1, "parkedWorkersStack"
 
@@ -149,7 +149,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/b/a;->boH:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/b/a;->bpb:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     const-string v1, "controlState"
 
@@ -157,7 +157,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/b/a;->boJ:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/b/a;->bpd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     const-string v1, "_isTerminated"
 
@@ -165,7 +165,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/b/a;->boK:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/b/a;->bpe:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -179,15 +179,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lkotlinx/coroutines/b/a;->boL:I
+    iput p1, p0, Lkotlinx/coroutines/b/a;->bpf:I
 
-    iput p2, p0, Lkotlinx/coroutines/b/a;->boM:I
+    iput p2, p0, Lkotlinx/coroutines/b/a;->bpg:I
 
-    iput-wide p3, p0, Lkotlinx/coroutines/b/a;->boN:J
+    iput-wide p3, p0, Lkotlinx/coroutines/b/a;->bph:J
 
-    iput-object p5, p0, Lkotlinx/coroutines/b/a;->boO:Ljava/lang/String;
+    iput-object p5, p0, Lkotlinx/coroutines/b/a;->bpi:Ljava/lang/String;
 
-    iget p1, p0, Lkotlinx/coroutines/b/a;->boL:I
+    iget p1, p0, Lkotlinx/coroutines/b/a;->bpf:I
 
     const/4 p2, 0x1
 
@@ -205,9 +205,9 @@
     :goto_0
     if-eqz p1, :cond_7
 
-    iget p1, p0, Lkotlinx/coroutines/b/a;->boM:I
+    iget p1, p0, Lkotlinx/coroutines/b/a;->bpg:I
 
-    iget p4, p0, Lkotlinx/coroutines/b/a;->boL:I
+    iget p4, p0, Lkotlinx/coroutines/b/a;->bpf:I
 
     if-lt p1, p4, :cond_1
 
@@ -223,7 +223,7 @@
 
     if-eqz p1, :cond_6
 
-    iget p1, p0, Lkotlinx/coroutines/b/a;->boM:I
+    iget p1, p0, Lkotlinx/coroutines/b/a;->bpg:I
 
     const p5, 0x1ffffe
 
@@ -239,7 +239,7 @@
     :goto_2
     if-eqz p1, :cond_5
 
-    iget-wide p4, p0, Lkotlinx/coroutines/b/a;->boN:J
+    iget-wide p4, p0, Lkotlinx/coroutines/b/a;->bph:J
 
     const-wide/16 v0, 0x0
 
@@ -261,25 +261,25 @@
 
     invoke-direct {p1}, Lkotlinx/coroutines/b/e;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/a;->boF:Lkotlinx/coroutines/b/e;
+    iput-object p1, p0, Lkotlinx/coroutines/b/a;->boZ:Lkotlinx/coroutines/b/e;
 
     new-instance p1, Ljava/util/concurrent/Semaphore;
 
-    iget p4, p0, Lkotlinx/coroutines/b/a;->boL:I
+    iget p4, p0, Lkotlinx/coroutines/b/a;->bpf:I
 
     invoke-direct {p1, p4, p3}, Ljava/util/concurrent/Semaphore;-><init>(IZ)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/a;->boG:Ljava/util/concurrent/Semaphore;
+    iput-object p1, p0, Lkotlinx/coroutines/b/a;->bpa:Ljava/util/concurrent/Semaphore;
 
     iput-wide v0, p0, Lkotlinx/coroutines/b/a;->parkedWorkersStack:J
 
-    iget p1, p0, Lkotlinx/coroutines/b/a;->boM:I
+    iget p1, p0, Lkotlinx/coroutines/b/a;->bpg:I
 
     add-int/2addr p1, p2
 
     new-array p1, p1, [Lkotlinx/coroutines/b/a$b;
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/a;->boI:[Lkotlinx/coroutines/b/a$b;
+    iput-object p1, p0, Lkotlinx/coroutines/b/a;->bpc:[Lkotlinx/coroutines/b/a$b;
 
     iput-wide v0, p0, Lkotlinx/coroutines/b/a;->controlState:J
 
@@ -300,7 +300,7 @@
 
     invoke-direct {p1, p2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide p2, p0, Lkotlinx/coroutines/b/a;->boN:J
+    iget-wide p2, p0, Lkotlinx/coroutines/b/a;->bph:J
 
     invoke-virtual {p1, p2, p3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
@@ -329,7 +329,7 @@
 
     invoke-direct {p1, p4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget p2, p0, Lkotlinx/coroutines/b/a;->boM:I
+    iget p2, p0, Lkotlinx/coroutines/b/a;->bpg:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -358,7 +358,7 @@
 
     invoke-direct {p1, p4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget p2, p0, Lkotlinx/coroutines/b/a;->boM:I
+    iget p2, p0, Lkotlinx/coroutines/b/a;->bpg:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -366,7 +366,7 @@
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget p2, p0, Lkotlinx/coroutines/b/a;->boL:I
+    iget p2, p0, Lkotlinx/coroutines/b/a;->bpf:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -393,7 +393,7 @@
 
     invoke-direct {p1, p2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget p2, p0, Lkotlinx/coroutines/b/a;->boL:I
+    iget p2, p0, Lkotlinx/coroutines/b/a;->bpf:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -418,7 +418,7 @@
     throw p2
 .end method
 
-.method private final FT()Lkotlinx/coroutines/b/a$b;
+.method private final FI()Lkotlinx/coroutines/b/a$b;
     .locals 9
 
     :cond_0
@@ -430,7 +430,7 @@
 
     long-to-int v1, v0
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a;->boI:[Lkotlinx/coroutines/b/a$b;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->bpc:[Lkotlinx/coroutines/b/a$b;
 
     aget-object v6, v0, v1
 
@@ -455,7 +455,7 @@
 
     if-ltz v4, :cond_0
 
-    sget-object v5, Lkotlinx/coroutines/b/a;->boH:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/b/a;->bpb:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     int-to-long v7, v4
 
@@ -473,17 +473,17 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lkotlinx/coroutines/b/a;->boT:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/b/a;->bpn:Lkotlinx/coroutines/internal/v;
 
     iput-object v0, v6, Lkotlinx/coroutines/b/a$b;->nextParkedWorker:Ljava/lang/Object;
 
     return-object v6
 .end method
 
-.method private final FU()V
+.method private final FJ()V
     .locals 6
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a;->boG:Ljava/util/concurrent/Semaphore;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->bpa:Ljava/util/concurrent/Semaphore;
 
     invoke-virtual {v0}, Ljava/util/concurrent/Semaphore;->availablePermits()I
 
@@ -491,12 +491,12 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FV()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FK()Z
 
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FV()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FK()Z
 
     move-result v0
 
@@ -525,11 +525,11 @@
 
     sub-int/2addr v3, v1
 
-    iget v0, p0, Lkotlinx/coroutines/b/a;->boL:I
+    iget v0, p0, Lkotlinx/coroutines/b/a;->bpf:I
 
     if-ge v3, v0, :cond_3
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FW()I
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FL()I
 
     move-result v0
 
@@ -537,11 +537,11 @@
 
     if-ne v0, v1, :cond_2
 
-    iget v2, p0, Lkotlinx/coroutines/b/a;->boL:I
+    iget v2, p0, Lkotlinx/coroutines/b/a;->bpf:I
 
     if-le v2, v1, :cond_2
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FW()I
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FL()I
 
     :cond_2
     if-lez v0, :cond_3
@@ -549,16 +549,16 @@
     return-void
 
     :cond_3
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FV()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FK()Z
 
     return-void
 .end method
 
-.method private final FV()Z
+.method private final FK()Z
     .locals 3
 
     :cond_0
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FT()Lkotlinx/coroutines/b/a$b;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FI()Lkotlinx/coroutines/b/a$b;
 
     move-result-object v0
 
@@ -569,9 +569,9 @@
     return v0
 
     :cond_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->Gh()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->FW()V
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->Gd()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->FS()Z
 
     move-result v1
 
@@ -583,7 +583,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->Ge()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->FT()Z
 
     move-result v0
 
@@ -594,10 +594,10 @@
     return v0
 .end method
 
-.method private final FW()I
+.method private final FL()I
     .locals 10
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a;->boI:[Lkotlinx/coroutines/b/a$b;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->bpc:[Lkotlinx/coroutines/b/a$b;
 
     monitor-enter v0
 
@@ -638,7 +638,7 @@
 
     sub-int v1, v6, v2
 
-    iget v2, p0, Lkotlinx/coroutines/b/a;->boL:I
+    iget v2, p0, Lkotlinx/coroutines/b/a;->bpf:I
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -652,11 +652,11 @@
 
     :cond_1
     :try_start_2
-    iget v2, p0, Lkotlinx/coroutines/b/a;->boM:I
+    iget v2, p0, Lkotlinx/coroutines/b/a;->bpg:I
 
     if-ge v6, v2, :cond_7
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/a;->boG:Ljava/util/concurrent/Semaphore;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a;->bpa:Ljava/util/concurrent/Semaphore;
 
     invoke-virtual {v2}, Ljava/util/concurrent/Semaphore;->availablePermits()I
 
@@ -679,7 +679,7 @@
 
     if-lez v2, :cond_3
 
-    iget-object v7, p0, Lkotlinx/coroutines/b/a;->boI:[Lkotlinx/coroutines/b/a$b;
+    iget-object v7, p0, Lkotlinx/coroutines/b/a;->bpc:[Lkotlinx/coroutines/b/a$b;
 
     aget-object v7, v7, v2
 
@@ -701,7 +701,7 @@
 
     invoke-virtual {v7}, Lkotlinx/coroutines/b/a$b;->start()V
 
-    sget-object v8, Lkotlinx/coroutines/b/a;->boJ:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v8, Lkotlinx/coroutines/b/a;->bpd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     invoke-virtual {v8, p0}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->incrementAndGet(Ljava/lang/Object;)J
 
@@ -718,7 +718,7 @@
     :cond_4
     if-eqz v5, :cond_5
 
-    iget-object v3, p0, Lkotlinx/coroutines/b/a;->boI:[Lkotlinx/coroutines/b/a$b;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a;->bpc:[Lkotlinx/coroutines/b/a$b;
 
     aput-object v7, v3, v2
     :try_end_2
@@ -777,7 +777,7 @@
     throw v1
 .end method
 
-.method private final FX()Lkotlinx/coroutines/b/a$b;
+.method private final FM()Lkotlinx/coroutines/b/a$b;
     .locals 4
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
@@ -797,7 +797,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v1, v0, Lkotlinx/coroutines/b/a$b;->bpc:Lkotlinx/coroutines/b/a;
+    iget-object v1, v0, Lkotlinx/coroutines/b/a$b;->bpw:Lkotlinx/coroutines/b/a;
 
     move-object v3, p0
 
@@ -815,42 +815,42 @@
     return-object v2
 .end method
 
-.method public static final synthetic FY()I
+.method public static final synthetic FN()I
     .locals 1
 
-    sget v0, Lkotlinx/coroutines/b/a;->boQ:I
+    sget v0, Lkotlinx/coroutines/b/a;->bpk:I
 
     return v0
 .end method
 
-.method public static final synthetic FZ()I
+.method public static final synthetic FO()I
     .locals 1
 
-    sget v0, Lkotlinx/coroutines/b/a;->boP:I
+    sget v0, Lkotlinx/coroutines/b/a;->bpj:I
 
     return v0
 .end method
 
-.method public static final synthetic Ga()I
+.method public static final synthetic FP()I
     .locals 1
 
-    sget v0, Lkotlinx/coroutines/b/a;->boR:I
+    sget v0, Lkotlinx/coroutines/b/a;->bpl:I
 
     return v0
 .end method
 
-.method public static final synthetic Gb()I
+.method public static final synthetic FQ()I
     .locals 1
 
-    sget v0, Lkotlinx/coroutines/b/a;->boS:I
+    sget v0, Lkotlinx/coroutines/b/a;->bpm:I
 
     return v0
 .end method
 
-.method public static final synthetic Gc()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic FR()Lkotlinx/coroutines/internal/v;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/b/a;->boT:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/b/a;->bpn:Lkotlinx/coroutines/internal/v;
 
     return-object v0
 .end method
@@ -861,7 +861,7 @@
     iget-object p0, p0, Lkotlinx/coroutines/b/a$b;->nextParkedWorker:Ljava/lang/Object;
 
     :goto_0
-    sget-object v0, Lkotlinx/coroutines/b/a;->boT:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/b/a;->bpn:Lkotlinx/coroutines/internal/v;
 
     if-ne p0, v0, :cond_0
 
@@ -894,7 +894,7 @@
 .method public static final synthetic a(Lkotlinx/coroutines/b/a;)Ljava/lang/String;
     .locals 0
 
-    iget-object p0, p0, Lkotlinx/coroutines/b/a;->boO:Ljava/lang/String;
+    iget-object p0, p0, Lkotlinx/coroutines/b/a;->bpi:Ljava/lang/String;
 
     return-object p0
 .end method
@@ -910,7 +910,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/b/m;->bpC:Lkotlinx/coroutines/b/n;
+    sget-object v0, Lkotlinx/coroutines/b/m;->bpW:Lkotlinx/coroutines/b/n;
 
     invoke-virtual {v0}, Lkotlinx/coroutines/b/n;->nanoTime()J
 
@@ -922,9 +922,9 @@
 
     check-cast p0, Lkotlinx/coroutines/b/i;
 
-    iput-wide v0, p0, Lkotlinx/coroutines/b/i;->bps:J
+    iput-wide v0, p0, Lkotlinx/coroutines/b/i;->bpM:J
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/i;->bpt:Lkotlinx/coroutines/b/j;
+    iput-object p1, p0, Lkotlinx/coroutines/b/i;->bpN:Lkotlinx/coroutines/b/j;
 
     return-object p0
 
@@ -941,7 +941,7 @@
 .method public static synthetic a(Lkotlinx/coroutines/b/a;Ljava/lang/Runnable;)V
     .locals 2
 
-    sget-object v0, Lkotlinx/coroutines/b/h;->bpr:Lkotlinx/coroutines/b/h;
+    sget-object v0, Lkotlinx/coroutines/b/h;->bpL:Lkotlinx/coroutines/b/h;
 
     check-cast v0, Lkotlinx/coroutines/b/j;
 
@@ -957,7 +957,7 @@
 
     iget-object v0, p1, Lkotlinx/coroutines/b/a$b;->nextParkedWorker:Ljava/lang/Object;
 
-    sget-object v1, Lkotlinx/coroutines/b/a;->boT:Lkotlinx/coroutines/internal/v;
+    sget-object v1, Lkotlinx/coroutines/b/a;->bpn:Lkotlinx/coroutines/internal/v;
 
     if-ne v0, v1, :cond_4
 
@@ -990,7 +990,7 @@
     const/4 v6, 0x0
 
     :goto_0
-    sget-boolean v7, Lkotlin/v;->bjG:Z
+    sget-boolean v7, Lkotlin/v;->bka:Z
 
     if-eqz v7, :cond_3
 
@@ -1011,13 +1011,13 @@
 
     :cond_3
     :goto_1
-    iget-object v6, p0, Lkotlinx/coroutines/b/a;->boI:[Lkotlinx/coroutines/b/a$b;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a;->bpc:[Lkotlinx/coroutines/b/a$b;
 
     aget-object v1, v6, v1
 
     iput-object v1, p1, Lkotlinx/coroutines/b/a$b;->nextParkedWorker:Ljava/lang/Object;
 
-    sget-object v1, Lkotlinx/coroutines/b/a;->boH:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/b/a;->bpb:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     int-to-long v6, v0
 
@@ -1079,7 +1079,7 @@
     :goto_1
     if-ltz v0, :cond_0
 
-    sget-object v1, Lkotlinx/coroutines/b/a;->boH:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/b/a;->bpb:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     int-to-long v6, v0
 
@@ -1109,7 +1109,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     return-void
 
@@ -1133,14 +1133,14 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     return-void
 
     :catchall_1
     move-exception p0
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     throw p0
 .end method
@@ -1148,7 +1148,7 @@
 .method public static final synthetic b(Lkotlinx/coroutines/b/a;)Ljava/util/concurrent/Semaphore;
     .locals 0
 
-    iget-object p0, p0, Lkotlinx/coroutines/b/a;->boG:Ljava/util/concurrent/Semaphore;
+    iget-object p0, p0, Lkotlinx/coroutines/b/a;->bpa:Ljava/util/concurrent/Semaphore;
 
     return-object p0
 .end method
@@ -1174,7 +1174,7 @@
 .method public static final synthetic d(Lkotlinx/coroutines/b/a;)V
     .locals 0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FU()V
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FJ()V
 
     return-void
 .end method
@@ -1182,7 +1182,7 @@
 .method public static final synthetic e(Lkotlinx/coroutines/b/a;)J
     .locals 2
 
-    iget-wide v0, p0, Lkotlinx/coroutines/b/a;->boN:J
+    iget-wide v0, p0, Lkotlinx/coroutines/b/a;->bph:J
 
     return-wide v0
 .end method
@@ -1190,7 +1190,7 @@
 .method public static final synthetic f(Lkotlinx/coroutines/b/a;)[Lkotlinx/coroutines/b/a$b;
     .locals 0
 
-    iget-object p0, p0, Lkotlinx/coroutines/b/a;->boI:[Lkotlinx/coroutines/b/a$b;
+    iget-object p0, p0, Lkotlinx/coroutines/b/a;->bpc:[Lkotlinx/coroutines/b/a$b;
 
     return-object p0
 .end method
@@ -1212,7 +1212,7 @@
 .method public static final synthetic h(Lkotlinx/coroutines/b/a;)I
     .locals 0
 
-    iget p0, p0, Lkotlinx/coroutines/b/a;->boL:I
+    iget p0, p0, Lkotlinx/coroutines/b/a;->bpf:I
 
     return p0
 .end method
@@ -1220,7 +1220,7 @@
 .method public static final synthetic i(Lkotlinx/coroutines/b/a;)Lkotlinx/coroutines/b/e;
     .locals 0
 
-    iget-object p0, p0, Lkotlinx/coroutines/b/a;->boF:Lkotlinx/coroutines/b/e;
+    iget-object p0, p0, Lkotlinx/coroutines/b/a;->boZ:Lkotlinx/coroutines/b/e;
 
     return-object p0
 .end method
@@ -1263,13 +1263,13 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     invoke-static {p1, p2}, Lkotlinx/coroutines/b/a;->a(Ljava/lang/Runnable;Lkotlinx/coroutines/b/j;)Lkotlinx/coroutines/b/i;
 
     move-result-object p1
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FX()Lkotlinx/coroutines/b/a$b;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FM()Lkotlinx/coroutines/b/a$b;
 
     move-result-object p2
 
@@ -1289,24 +1289,24 @@
     :cond_0
     iget-object v3, p2, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
-    sget-object v4, Lkotlinx/coroutines/b/a$c;->bph:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bpB:Lkotlinx/coroutines/b/a$c;
 
     if-ne v3, v4, :cond_1
 
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p1}, Lkotlinx/coroutines/b/i;->Gn()Lkotlinx/coroutines/b/l;
+    invoke-virtual {p1}, Lkotlinx/coroutines/b/i;->Gc()Lkotlinx/coroutines/b/l;
 
     move-result-object v3
 
-    sget-object v4, Lkotlinx/coroutines/b/l;->bpv:Lkotlinx/coroutines/b/l;
+    sget-object v4, Lkotlinx/coroutines/b/l;->bpP:Lkotlinx/coroutines/b/l;
 
     if-ne v3, v4, :cond_4
 
     iget-object v3, p2, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
-    sget-object v4, Lkotlinx/coroutines/b/a$c;->bpe:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bpy:Lkotlinx/coroutines/b/a$c;
 
     if-ne v3, v4, :cond_2
 
@@ -1325,7 +1325,7 @@
     goto :goto_2
 
     :cond_3
-    invoke-virtual {p2}, Lkotlinx/coroutines/b/a$b;->Gf()Z
+    invoke-virtual {p2}, Lkotlinx/coroutines/b/a$b;->FU()Z
 
     move-result v3
 
@@ -1339,9 +1339,9 @@
     :goto_2
     if-eqz p3, :cond_5
 
-    iget-object p3, p2, Lkotlinx/coroutines/b/a$b;->boV:Lkotlinx/coroutines/b/o;
+    iget-object p3, p2, Lkotlinx/coroutines/b/a$b;->bpp:Lkotlinx/coroutines/b/o;
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a;->boF:Lkotlinx/coroutines/b/e;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a;->boZ:Lkotlinx/coroutines/b/e;
 
     invoke-virtual {p3, p1, v4}, Lkotlinx/coroutines/b/o;->b(Lkotlinx/coroutines/b/i;Lkotlinx/coroutines/b/e;)Z
 
@@ -1350,9 +1350,9 @@
     goto :goto_3
 
     :cond_5
-    iget-object p3, p2, Lkotlinx/coroutines/b/a$b;->boV:Lkotlinx/coroutines/b/o;
+    iget-object p3, p2, Lkotlinx/coroutines/b/a$b;->bpp:Lkotlinx/coroutines/b/o;
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a;->boF:Lkotlinx/coroutines/b/e;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a;->boZ:Lkotlinx/coroutines/b/e;
 
     invoke-virtual {p3, p1, v4}, Lkotlinx/coroutines/b/o;->a(Lkotlinx/coroutines/b/i;Lkotlinx/coroutines/b/e;)Z
 
@@ -1361,13 +1361,13 @@
     :goto_3
     if-eqz p3, :cond_6
 
-    iget-object p2, p2, Lkotlinx/coroutines/b/a$b;->boV:Lkotlinx/coroutines/b/o;
+    iget-object p2, p2, Lkotlinx/coroutines/b/a$b;->bpp:Lkotlinx/coroutines/b/o;
 
-    invoke-virtual {p2}, Lkotlinx/coroutines/b/o;->Go()I
+    invoke-virtual {p2}, Lkotlinx/coroutines/b/o;->Gd()I
 
     move-result p2
 
-    sget p3, Lkotlinx/coroutines/b/m;->bpz:I
+    sget p3, Lkotlinx/coroutines/b/m;->bpT:I
 
     if-gt p2, p3, :cond_6
 
@@ -1379,12 +1379,12 @@
 
     if-eq v1, v2, :cond_7
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FU()V
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FJ()V
 
     return-void
 
     :cond_7
-    iget-object p2, p0, Lkotlinx/coroutines/b/a;->boF:Lkotlinx/coroutines/b/e;
+    iget-object p2, p0, Lkotlinx/coroutines/b/a;->boZ:Lkotlinx/coroutines/b/e;
 
     invoke-virtual {p2, p1}, Lkotlinx/coroutines/b/e;->bB(Ljava/lang/Object;)Z
 
@@ -1392,7 +1392,7 @@
 
     if-eqz p1, :cond_8
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FU()V
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FJ()V
 
     return-void
 
@@ -1403,7 +1403,7 @@
 
     invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object p3, p0, Lkotlinx/coroutines/b/a;->boO:Ljava/lang/String;
+    iget-object p3, p0, Lkotlinx/coroutines/b/a;->bpi:Ljava/lang/String;
 
     invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1428,7 +1428,7 @@
 .method public final close()V
     .locals 8
 
-    sget-object v0, Lkotlinx/coroutines/b/a;->boK:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/a;->bpe:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v1, 0x0
 
@@ -1440,11 +1440,11 @@
 
     if-eqz v0, :cond_d
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FX()Lkotlinx/coroutines/b/a$b;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->FM()Lkotlinx/coroutines/b/a$b;
 
     move-result-object v0
 
-    iget-object v3, p0, Lkotlinx/coroutines/b/a;->boI:[Lkotlinx/coroutines/b/a$b;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a;->bpc:[Lkotlinx/coroutines/b/a$b;
 
     monitor-enter v3
 
@@ -1466,13 +1466,13 @@
     const/4 v3, 0x1
 
     :goto_0
-    iget-object v4, p0, Lkotlinx/coroutines/b/a;->boI:[Lkotlinx/coroutines/b/a$b;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a;->bpc:[Lkotlinx/coroutines/b/a$b;
 
     aget-object v4, v4, v3
 
     if-nez v4, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     if-eq v4, v0, :cond_4
@@ -1499,7 +1499,7 @@
     :cond_1
     iget-object v6, v4, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
-    sget-object v7, Lkotlinx/coroutines/b/a$c;->bph:Lkotlinx/coroutines/b/a$c;
+    sget-object v7, Lkotlinx/coroutines/b/a$c;->bpB:Lkotlinx/coroutines/b/a$c;
 
     if-ne v6, v7, :cond_2
 
@@ -1513,9 +1513,9 @@
     :goto_2
     if-eqz v7, :cond_3
 
-    iget-object v4, v4, Lkotlinx/coroutines/b/a$b;->boV:Lkotlinx/coroutines/b/o;
+    iget-object v4, v4, Lkotlinx/coroutines/b/a$b;->bpp:Lkotlinx/coroutines/b/o;
 
-    iget-object v6, p0, Lkotlinx/coroutines/b/a;->boF:Lkotlinx/coroutines/b/e;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a;->boZ:Lkotlinx/coroutines/b/e;
 
     invoke-virtual {v4, v6}, Lkotlinx/coroutines/b/o;->b(Lkotlinx/coroutines/b/e;)V
 
@@ -1553,23 +1553,23 @@
     goto :goto_0
 
     :cond_5
-    iget-object v3, p0, Lkotlinx/coroutines/b/a;->boF:Lkotlinx/coroutines/b/e;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a;->boZ:Lkotlinx/coroutines/b/e;
 
     invoke-virtual {v3}, Lkotlinx/coroutines/b/e;->close()V
 
     :goto_4
     if-eqz v0, :cond_6
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->Gi()Lkotlinx/coroutines/b/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->FX()Lkotlinx/coroutines/b/i;
 
     move-result-object v3
 
     if-nez v3, :cond_7
 
     :cond_6
-    iget-object v3, p0, Lkotlinx/coroutines/b/a;->boF:Lkotlinx/coroutines/b/e;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a;->boZ:Lkotlinx/coroutines/b/e;
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/b/e;->FA()Ljava/lang/Object;
+    invoke-virtual {v3}, Lkotlinx/coroutines/b/e;->Fp()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -1580,25 +1580,25 @@
 
     if-eqz v0, :cond_8
 
-    sget-object v3, Lkotlinx/coroutines/b/a$c;->bph:Lkotlinx/coroutines/b/a$c;
+    sget-object v3, Lkotlinx/coroutines/b/a$c;->bpB:Lkotlinx/coroutines/b/a$c;
 
     invoke-virtual {v0, v3}, Lkotlinx/coroutines/b/a$b;->a(Lkotlinx/coroutines/b/a$c;)Z
 
     :cond_8
-    iget-object v0, p0, Lkotlinx/coroutines/b/a;->boG:Ljava/util/concurrent/Semaphore;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->bpa:Ljava/util/concurrent/Semaphore;
 
     invoke-virtual {v0}, Ljava/util/concurrent/Semaphore;->availablePermits()I
 
     move-result v0
 
-    iget v3, p0, Lkotlinx/coroutines/b/a;->boL:I
+    iget v3, p0, Lkotlinx/coroutines/b/a;->bpf:I
 
     if-ne v0, v3, :cond_9
 
     const/4 v1, 0x1
 
     :cond_9
-    sget-boolean v0, Lkotlin/v;->bjG:Z
+    sget-boolean v0, Lkotlin/v;->bka:Z
 
     if-eqz v0, :cond_b
 
@@ -1663,7 +1663,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/a;->boI:[Lkotlinx/coroutines/b/a$b;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a;->bpc:[Lkotlinx/coroutines/b/a$b;
 
     array-length v2, v1
 
@@ -1688,13 +1688,13 @@
 
     if-eqz v10, :cond_6
 
-    iget-object v11, v10, Lkotlinx/coroutines/b/a$b;->boV:Lkotlinx/coroutines/b/o;
+    iget-object v11, v10, Lkotlinx/coroutines/b/a$b;->bpp:Lkotlinx/coroutines/b/o;
 
     iget-object v12, v11, Lkotlinx/coroutines/b/o;->lastScheduledTask:Ljava/lang/Object;
 
     const/4 v13, 0x1
 
-    invoke-virtual {v11}, Lkotlinx/coroutines/b/o;->Go()I
+    invoke-virtual {v11}, Lkotlinx/coroutines/b/o;->Gd()I
 
     move-result v11
 
@@ -1843,7 +1843,7 @@
 
     invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v10, p0, Lkotlinx/coroutines/b/a;->boO:Ljava/lang/String;
+    iget-object v10, p0, Lkotlinx/coroutines/b/a;->bpi:Ljava/lang/String;
 
     invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1865,7 +1865,7 @@
 
     invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v10, p0, Lkotlinx/coroutines/b/a;->boL:I
+    iget v10, p0, Lkotlinx/coroutines/b/a;->bpf:I
 
     invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -1873,7 +1873,7 @@
 
     invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v10, p0, Lkotlinx/coroutines/b/a;->boM:I
+    iget v10, p0, Lkotlinx/coroutines/b/a;->bpg:I
 
     invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -1917,7 +1917,7 @@
 
     invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a;->boF:Lkotlinx/coroutines/b/e;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->boZ:Lkotlinx/coroutines/b/e;
 
     iget-object v0, v0, Lkotlinx/coroutines/internal/l;->_cur$internal:Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/b.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/b.smali
index bc0f6b51d2..806a352a08 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/b.smali
@@ -20,7 +20,7 @@
 
     sput-object v0, Lkotlinx/coroutines/b/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpf:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpz:Lkotlinx/coroutines/b/a$c;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/b/a$c;->ordinal()I
 
@@ -32,7 +32,7 @@
 
     sget-object v0, Lkotlinx/coroutines/b/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpe:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpy:Lkotlinx/coroutines/b/a$c;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/b/a$c;->ordinal()I
 
@@ -44,7 +44,7 @@
 
     sget-object v0, Lkotlinx/coroutines/b/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpd:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpx:Lkotlinx/coroutines/b/a$c;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/b/a$c;->ordinal()I
 
@@ -56,7 +56,7 @@
 
     sget-object v0, Lkotlinx/coroutines/b/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpg:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpA:Lkotlinx/coroutines/b/a$c;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/b/a$c;->ordinal()I
 
@@ -68,7 +68,7 @@
 
     sget-object v0, Lkotlinx/coroutines/b/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/b/a$c;->bph:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bpB:Lkotlinx/coroutines/b/a$c;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/b/a$c;->ordinal()I
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/c.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/c.smali
index f191552acb..ba7cfddf27 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/c.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final bmT:Lkotlinx/coroutines/y;
+.field private static final bnn:Lkotlinx/coroutines/y;
 
-.field public static final bpj:Lkotlinx/coroutines/b/c;
+.field public static final bpD:Lkotlinx/coroutines/b/c;
 
 
 # direct methods
@@ -17,15 +17,15 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/b/c;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/b/c;->bpj:Lkotlinx/coroutines/b/c;
+    sput-object v0, Lkotlinx/coroutines/b/c;->bpD:Lkotlinx/coroutines/b/c;
 
-    invoke-static {}, Lkotlinx/coroutines/internal/x;->FP()I
+    invoke-static {}, Lkotlinx/coroutines/internal/x;->FE()I
 
     move-result v1
 
     const/16 v2, 0x40
 
-    invoke-static {v2, v1}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v2, v1}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v1
 
@@ -48,13 +48,13 @@
 
     new-instance v2, Lkotlinx/coroutines/b/f;
 
-    sget-object v3, Lkotlinx/coroutines/b/l;->bpw:Lkotlinx/coroutines/b/l;
+    sget-object v3, Lkotlinx/coroutines/b/l;->bpQ:Lkotlinx/coroutines/b/l;
 
     invoke-direct {v2, v0, v1, v3}, Lkotlinx/coroutines/b/f;-><init>(Lkotlinx/coroutines/b/d;ILkotlinx/coroutines/b/l;)V
 
     check-cast v2, Lkotlinx/coroutines/y;
 
-    sput-object v2, Lkotlinx/coroutines/b/c;->bmT:Lkotlinx/coroutines/y;
+    sput-object v2, Lkotlinx/coroutines/b/c;->bnn:Lkotlinx/coroutines/y;
 
     return-void
 
@@ -90,10 +90,10 @@
     return-void
 .end method
 
-.method public static EY()Lkotlinx/coroutines/y;
+.method public static EN()Lkotlinx/coroutines/y;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/b/c;->bmT:Lkotlinx/coroutines/y;
+    sget-object v0, Lkotlinx/coroutines/b/c;->bnn:Lkotlinx/coroutines/y;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/d.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/d.smali
index 1c694c76e7..6bd8d032d2 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/d.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/d.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field private final boL:I
+.field private bpE:Lkotlinx/coroutines/b/a;
 
-.field private final boM:I
+.field private final bpf:I
 
-.field private final boN:J
+.field private final bpg:I
 
-.field private final boO:Ljava/lang/String;
+.field private final bph:J
 
-.field private bpk:Lkotlinx/coroutines/b/a;
+.field private final bpi:Ljava/lang/String;
 
 
 # direct methods
@@ -39,29 +39,29 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/aw;-><init>()V
 
-    iput p1, p0, Lkotlinx/coroutines/b/d;->boL:I
+    iput p1, p0, Lkotlinx/coroutines/b/d;->bpf:I
 
-    iput p2, p0, Lkotlinx/coroutines/b/d;->boM:I
+    iput p2, p0, Lkotlinx/coroutines/b/d;->bpg:I
 
-    iput-wide p3, p0, Lkotlinx/coroutines/b/d;->boN:J
+    iput-wide p3, p0, Lkotlinx/coroutines/b/d;->bph:J
 
-    iput-object p5, p0, Lkotlinx/coroutines/b/d;->boO:Ljava/lang/String;
+    iput-object p5, p0, Lkotlinx/coroutines/b/d;->bpi:Ljava/lang/String;
 
     new-instance p1, Lkotlinx/coroutines/b/a;
 
-    iget v2, p0, Lkotlinx/coroutines/b/d;->boL:I
+    iget v2, p0, Lkotlinx/coroutines/b/d;->bpf:I
 
-    iget v3, p0, Lkotlinx/coroutines/b/d;->boM:I
+    iget v3, p0, Lkotlinx/coroutines/b/d;->bpg:I
 
-    iget-wide v4, p0, Lkotlinx/coroutines/b/d;->boN:J
+    iget-wide v4, p0, Lkotlinx/coroutines/b/d;->bph:J
 
-    iget-object v6, p0, Lkotlinx/coroutines/b/d;->boO:Ljava/lang/String;
+    iget-object v6, p0, Lkotlinx/coroutines/b/d;->bpi:Ljava/lang/String;
 
     move-object v1, p1
 
     invoke-direct/range {v1 .. v6}, Lkotlinx/coroutines/b/a;-><init>(IIJLjava/lang/String;)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/d;->bpk:Lkotlinx/coroutines/b/a;
+    iput-object p1, p0, Lkotlinx/coroutines/b/d;->bpE:Lkotlinx/coroutines/b/a;
 
     return-void
 .end method
@@ -73,7 +73,7 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-wide v4, Lkotlinx/coroutines/b/m;->bpB:J
+    sget-wide v4, Lkotlinx/coroutines/b/m;->bpV:J
 
     move-object v1, p0
 
@@ -102,7 +102,7 @@
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bpk:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bpE:Lkotlinx/coroutines/b/a;
 
     invoke-static {v0, p2}, Lkotlinx/coroutines/b/a;->a(Lkotlinx/coroutines/b/a;Ljava/lang/Runnable;)V
     :try_end_0
@@ -111,7 +111,7 @@
     return-void
 
     :catch_0
-    sget-object v0, Lkotlinx/coroutines/ah;->bmI:Lkotlinx/coroutines/ah;
+    sget-object v0, Lkotlinx/coroutines/ah;->bnc:Lkotlinx/coroutines/ah;
 
     invoke-virtual {v0, p1, p2}, Lkotlinx/coroutines/ah;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
 
@@ -130,7 +130,7 @@
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bpk:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bpE:Lkotlinx/coroutines/b/a;
 
     invoke-virtual {v0, p1, p2, p3}, Lkotlinx/coroutines/b/a;->a(Ljava/lang/Runnable;Lkotlinx/coroutines/b/j;Z)V
     :try_end_0
@@ -139,7 +139,7 @@
     return-void
 
     :catch_0
-    sget-object p3, Lkotlinx/coroutines/ah;->bmI:Lkotlinx/coroutines/ah;
+    sget-object p3, Lkotlinx/coroutines/ah;->bnc:Lkotlinx/coroutines/ah;
 
     invoke-static {p1, p2}, Lkotlinx/coroutines/b/a;->a(Ljava/lang/Runnable;Lkotlinx/coroutines/b/j;)Lkotlinx/coroutines/b/i;
 
@@ -155,7 +155,7 @@
 .method public close()V
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bpk:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bpE:Lkotlinx/coroutines/b/a;
 
     invoke-virtual {v0}, Lkotlinx/coroutines/b/a;->close()V
 
@@ -179,7 +179,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/d;->bpk:Lkotlinx/coroutines/b/a;
+    iget-object v1, p0, Lkotlinx/coroutines/b/d;->bpE:Lkotlinx/coroutines/b/a;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/e.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/e.smali
index 7d9e63f7f5..3be828d40d 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/e.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/e.smali
@@ -51,12 +51,12 @@
 
     if-eqz v8, :cond_1
 
-    sget-object v7, Lkotlinx/coroutines/internal/m;->boj:Lkotlinx/coroutines/internal/v;
+    sget-object v7, Lkotlinx/coroutines/internal/m;->boE:Lkotlinx/coroutines/internal/v;
 
     goto/16 :goto_2
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/internal/m;->bok:Lkotlinx/coroutines/internal/m$a;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->boF:Lkotlinx/coroutines/internal/m$a;
 
     const-wide/32 v1, 0x3fffffff
 
@@ -131,7 +131,7 @@
 
     check-cast v1, Lkotlinx/coroutines/b/i;
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/b/i;->Gn()Lkotlinx/coroutines/b/l;
+    invoke-virtual {v1}, Lkotlinx/coroutines/b/i;->Gc()Lkotlinx/coroutines/b/l;
 
     move-result-object v1
 
@@ -151,9 +151,9 @@
 
     and-int v10, v1, v2
 
-    sget-object v1, Lkotlinx/coroutines/internal/m;->bog:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->boB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-    sget-object v2, Lkotlinx/coroutines/internal/m;->bok:Lkotlinx/coroutines/internal/m$a;
+    sget-object v2, Lkotlinx/coroutines/internal/m;->boF:Lkotlinx/coroutines/internal/m$a;
 
     invoke-static {v3, v4, v10}, Lkotlinx/coroutines/internal/m$a;->c(JI)J
 
@@ -201,7 +201,7 @@
     move-object v7, v9
 
     :goto_2
-    sget-object v1, Lkotlinx/coroutines/internal/m;->boj:Lkotlinx/coroutines/internal/v;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->boE:Lkotlinx/coroutines/internal/v;
 
     if-eq v7, v1, :cond_9
 
@@ -210,9 +210,9 @@
     return-object v7
 
     :cond_9
-    sget-object v1, Lkotlinx/coroutines/internal/l;->bof:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/l;->boA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->FL()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->FA()Lkotlinx/coroutines/internal/m;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/f.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/f.smali
index 75e53b950e..de9c62333b 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/f.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/f.smali
@@ -8,11 +8,11 @@
 
 
 # static fields
-.field private static final bpm:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bpG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
-.field private final bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field private final bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -22,11 +22,11 @@
     .end annotation
 .end field
 
-.field private final bpn:Lkotlinx/coroutines/b/d;
+.field private final bpH:Lkotlinx/coroutines/b/d;
 
-.field private final bpo:I
+.field private final bpI:I
 
-.field private final bpp:Lkotlinx/coroutines/b/l;
+.field private final bpJ:Lkotlinx/coroutines/b/l;
 
 .field private volatile inFlightTasks:I
 
@@ -43,7 +43,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/b/f;->bpm:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/b/f;->bpG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -61,17 +61,17 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/aw;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/f;->bpn:Lkotlinx/coroutines/b/d;
+    iput-object p1, p0, Lkotlinx/coroutines/b/f;->bpH:Lkotlinx/coroutines/b/d;
 
-    iput p2, p0, Lkotlinx/coroutines/b/f;->bpo:I
+    iput p2, p0, Lkotlinx/coroutines/b/f;->bpI:I
 
-    iput-object p3, p0, Lkotlinx/coroutines/b/f;->bpp:Lkotlinx/coroutines/b/l;
+    iput-object p3, p0, Lkotlinx/coroutines/b/f;->bpJ:Lkotlinx/coroutines/b/l;
 
     new-instance p1, Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-direct {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/f;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p1, p0, Lkotlinx/coroutines/b/f;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     const/4 p1, 0x0
 
@@ -84,17 +84,17 @@
     .locals 2
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/b/f;->bpm:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/f;->bpG: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, Lkotlinx/coroutines/b/f;->bpo:I
+    iget v1, p0, Lkotlinx/coroutines/b/f;->bpI:I
 
     if-gt v0, v1, :cond_1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bpn:Lkotlinx/coroutines/b/d;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bpH:Lkotlinx/coroutines/b/d;
 
     move-object v1, p0
 
@@ -105,24 +105,24 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->add(Ljava/lang/Object;)Z
 
-    sget-object p1, Lkotlinx/coroutines/b/f;->bpm:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/b/f;->bpG: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, Lkotlinx/coroutines/b/f;->bpo:I
+    iget v0, p0, Lkotlinx/coroutines/b/f;->bpI:I
 
     if-lt p1, v0, :cond_2
 
     return-void
 
     :cond_2
-    iget-object p1, p0, Lkotlinx/coroutines/b/f;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object p1, p0, Lkotlinx/coroutines/b/f;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
@@ -137,10 +137,10 @@
 
 
 # virtual methods
-.method public final Gl()V
+.method public final Ga()V
     .locals 4
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
@@ -152,7 +152,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/f;->bpn:Lkotlinx/coroutines/b/d;
+    iget-object v2, p0, Lkotlinx/coroutines/b/f;->bpH:Lkotlinx/coroutines/b/d;
 
     move-object v3, p0
 
@@ -163,11 +163,11 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/b/f;->bpm:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/f;->bpG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     invoke-virtual {v0, p0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->decrementAndGet(Ljava/lang/Object;)I
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
@@ -185,10 +185,10 @@
     return-void
 .end method
 
-.method public final Gm()Lkotlinx/coroutines/b/l;
+.method public final Gb()Lkotlinx/coroutines/b/l;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bpp:Lkotlinx/coroutines/b/l;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bpJ:Lkotlinx/coroutines/b/l;
 
     return-object v0
 .end method
@@ -260,7 +260,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/f;->bpn:Lkotlinx/coroutines/b/d;
+    iget-object v1, p0, Lkotlinx/coroutines/b/f;->bpH:Lkotlinx/coroutines/b/d;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/g.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/g.smali
index 3b2f623e34..1cbfcbf603 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/g.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/g.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bpq:Lkotlinx/coroutines/b/g;
+.field public static final bpK:Lkotlinx/coroutines/b/g;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/b/g;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/b/g;->bpq:Lkotlinx/coroutines/b/g;
+    sput-object v0, Lkotlinx/coroutines/b/g;->bpK:Lkotlinx/coroutines/b/g;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/h.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/h.smali
index fe4e12c4e7..a8593a3461 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/h.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/h.smali
@@ -7,9 +7,9 @@
 
 
 # static fields
-.field private static final bpp:Lkotlinx/coroutines/b/l;
+.field private static final bpJ:Lkotlinx/coroutines/b/l;
 
-.field public static final bpr:Lkotlinx/coroutines/b/h;
+.field public static final bpL:Lkotlinx/coroutines/b/h;
 
 
 # direct methods
@@ -20,11 +20,11 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/b/h;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/b/h;->bpr:Lkotlinx/coroutines/b/h;
+    sput-object v0, Lkotlinx/coroutines/b/h;->bpL:Lkotlinx/coroutines/b/h;
 
-    sget-object v0, Lkotlinx/coroutines/b/l;->bpv:Lkotlinx/coroutines/b/l;
+    sget-object v0, Lkotlinx/coroutines/b/l;->bpP:Lkotlinx/coroutines/b/l;
 
-    sput-object v0, Lkotlinx/coroutines/b/h;->bpp:Lkotlinx/coroutines/b/l;
+    sput-object v0, Lkotlinx/coroutines/b/h;->bpJ:Lkotlinx/coroutines/b/l;
 
     return-void
 .end method
@@ -39,16 +39,16 @@
 
 
 # virtual methods
-.method public final Gl()V
+.method public final Ga()V
     .locals 0
 
     return-void
 .end method
 
-.method public final Gm()Lkotlinx/coroutines/b/l;
+.method public final Gb()Lkotlinx/coroutines/b/l;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/b/h;->bpp:Lkotlinx/coroutines/b/l;
+    sget-object v0, Lkotlinx/coroutines/b/h;->bpJ:Lkotlinx/coroutines/b/l;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/i.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/i.smali
index 4d17d7a48d..93d7205a20 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/i.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/i.smali
@@ -7,16 +7,16 @@
 
 
 # instance fields
-.field public bps:J
+.field public bpM:J
 
-.field public bpt:Lkotlinx/coroutines/b/j;
+.field public bpN:Lkotlinx/coroutines/b/j;
 
 
 # direct methods
 .method public constructor <init>()V
     .locals 3
 
-    sget-object v0, Lkotlinx/coroutines/b/h;->bpr:Lkotlinx/coroutines/b/h;
+    sget-object v0, Lkotlinx/coroutines/b/h;->bpL:Lkotlinx/coroutines/b/h;
 
     check-cast v0, Lkotlinx/coroutines/b/j;
 
@@ -36,21 +36,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide p1, p0, Lkotlinx/coroutines/b/i;->bps:J
+    iput-wide p1, p0, Lkotlinx/coroutines/b/i;->bpM:J
 
-    iput-object p3, p0, Lkotlinx/coroutines/b/i;->bpt:Lkotlinx/coroutines/b/j;
+    iput-object p3, p0, Lkotlinx/coroutines/b/i;->bpN:Lkotlinx/coroutines/b/j;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Gn()Lkotlinx/coroutines/b/l;
+.method public final Gc()Lkotlinx/coroutines/b/l;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/i;->bpt:Lkotlinx/coroutines/b/j;
+    iget-object v0, p0, Lkotlinx/coroutines/b/i;->bpN:Lkotlinx/coroutines/b/j;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->Gm()Lkotlinx/coroutines/b/l;
+    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->Gb()Lkotlinx/coroutines/b/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/j.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/j.smali
index d3a3bc61c5..9aa51e9b65 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/j.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/j.smali
@@ -4,8 +4,8 @@
 
 
 # virtual methods
-.method public abstract Gl()V
+.method public abstract Ga()V
 .end method
 
-.method public abstract Gm()Lkotlinx/coroutines/b/l;
+.method public abstract Gb()Lkotlinx/coroutines/b/l;
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/k.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/k.smali
index 790eb82be7..1514189870 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/k.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/k.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final bpu:Ljava/lang/Runnable;
+.field public final bpO:Ljava/lang/Runnable;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     invoke-direct {p0, p2, p3, p4}, Lkotlinx/coroutines/b/i;-><init>(JLkotlinx/coroutines/b/j;)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/k;->bpu:Ljava/lang/Runnable;
+    iput-object p1, p0, Lkotlinx/coroutines/b/k;->bpO:Ljava/lang/Runnable;
 
     return-void
 .end method
@@ -32,24 +32,24 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/b/k;->bpu:Ljava/lang/Runnable;
+    iget-object v0, p0, Lkotlinx/coroutines/b/k;->bpO: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, Lkotlinx/coroutines/b/k;->bpt:Lkotlinx/coroutines/b/j;
+    iget-object v0, p0, Lkotlinx/coroutines/b/k;->bpN:Lkotlinx/coroutines/b/j;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->Gl()V
+    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->Ga()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bpt:Lkotlinx/coroutines/b/j;
+    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bpN:Lkotlinx/coroutines/b/j;
 
-    invoke-interface {v1}, Lkotlinx/coroutines/b/j;->Gl()V
+    invoke-interface {v1}, Lkotlinx/coroutines/b/j;->Ga()V
 
     throw v0
 .end method
@@ -63,7 +63,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bpu:Ljava/lang/Runnable;
+    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bpO:Ljava/lang/Runnable;
 
     invoke-static {v1}, Lkotlinx/coroutines/ag;->bo(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -75,7 +75,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bpu:Ljava/lang/Runnable;
+    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bpO:Ljava/lang/Runnable;
 
     invoke-static {v1}, Lkotlinx/coroutines/ag;->bn(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -87,13 +87,13 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-wide v2, p0, Lkotlinx/coroutines/b/k;->bps:J
+    iget-wide v2, p0, Lkotlinx/coroutines/b/k;->bpM: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, Lkotlinx/coroutines/b/k;->bpt:Lkotlinx/coroutines/b/j;
+    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bpN:Lkotlinx/coroutines/b/j;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/l.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/l.smali
index 14244ded52..65f1c38a16 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/l.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/l.smali
@@ -14,11 +14,11 @@
 
 
 # static fields
-.field public static final enum bpv:Lkotlinx/coroutines/b/l;
+.field public static final enum bpP:Lkotlinx/coroutines/b/l;
 
-.field public static final enum bpw:Lkotlinx/coroutines/b/l;
+.field public static final enum bpQ:Lkotlinx/coroutines/b/l;
 
-.field private static final synthetic bpx:[Lkotlinx/coroutines/b/l;
+.field private static final synthetic bpR:[Lkotlinx/coroutines/b/l;
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/b/l;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/b/l;->bpv:Lkotlinx/coroutines/b/l;
+    sput-object v1, Lkotlinx/coroutines/b/l;->bpP:Lkotlinx/coroutines/b/l;
 
     aput-object v1, v0, v2
 
@@ -49,11 +49,11 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/b/l;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/b/l;->bpw:Lkotlinx/coroutines/b/l;
+    sput-object v1, Lkotlinx/coroutines/b/l;->bpQ:Lkotlinx/coroutines/b/l;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlinx/coroutines/b/l;->bpx:[Lkotlinx/coroutines/b/l;
+    sput-object v0, Lkotlinx/coroutines/b/l;->bpR:[Lkotlinx/coroutines/b/l;
 
     return-void
 .end method
@@ -88,7 +88,7 @@
 .method public static values()[Lkotlinx/coroutines/b/l;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/b/l;->bpx:[Lkotlinx/coroutines/b/l;
+    sget-object v0, Lkotlinx/coroutines/b/l;->bpR:[Lkotlinx/coroutines/b/l;
 
     invoke-virtual {v0}, [Lkotlinx/coroutines/b/l;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/m.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/m.smali
index 9149b954bb..924e880de3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/m.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/m.smali
@@ -8,15 +8,15 @@
 
 .field public static final bf:I
 
-.field public static final bpA:I
+.field public static final bpS:J
 
-.field public static final bpB:J
+.field public static final bpT:I
 
-.field public static bpC:Lkotlinx/coroutines/b/n;
+.field public static final bpU:I
 
-.field public static final bpy:J
+.field public static final bpV:J
 
-.field public static final bpz:I
+.field public static bpW:Lkotlinx/coroutines/b/n;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lkotlinx/coroutines/b/m;->bpy:J
+    sput-wide v0, Lkotlinx/coroutines/b/m;->bpS:J
 
     const/4 v0, 0x4
 
@@ -47,7 +47,7 @@
 
     move-result v3
 
-    sput v3, Lkotlinx/coroutines/b/m;->bpz:I
+    sput v3, Lkotlinx/coroutines/b/m;->bpT:I
 
     const-string v3, "kotlinx.coroutines.scheduler.blocking.parallelism"
 
@@ -59,15 +59,15 @@
 
     move-result v3
 
-    sput v3, Lkotlinx/coroutines/b/m;->bpA:I
+    sput v3, Lkotlinx/coroutines/b/m;->bpU:I
 
-    invoke-static {}, Lkotlinx/coroutines/internal/x;->FP()I
+    invoke-static {}, Lkotlinx/coroutines/internal/x;->FE()I
 
     move-result v3
 
     const/4 v4, 0x2
 
-    invoke-static {v3, v4}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v3, v4}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v3
 
@@ -83,7 +83,7 @@
 
     sput v3, Lkotlinx/coroutines/b/m;->CORE_POOL_SIZE:I
 
-    invoke-static {}, Lkotlinx/coroutines/internal/x;->FP()I
+    invoke-static {}, Lkotlinx/coroutines/internal/x;->FE()I
 
     move-result v3
 
@@ -119,13 +119,13 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lkotlinx/coroutines/b/m;->bpB:J
+    sput-wide v0, Lkotlinx/coroutines/b/m;->bpV:J
 
-    sget-object v0, Lkotlinx/coroutines/b/g;->bpq:Lkotlinx/coroutines/b/g;
+    sget-object v0, Lkotlinx/coroutines/b/g;->bpK:Lkotlinx/coroutines/b/g;
 
     check-cast v0, Lkotlinx/coroutines/b/n;
 
-    sput-object v0, Lkotlinx/coroutines/b/m;->bpC:Lkotlinx/coroutines/b/n;
+    sput-object v0, Lkotlinx/coroutines/b/m;->bpW:Lkotlinx/coroutines/b/n;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/o.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/o.smali
index 82c556cad9..d1729c1e5d 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/o.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/o.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static final bpE:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bpY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field static final bpF:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field static final bpZ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
-.field static final bpG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field static final bqa:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
-.field private final bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field private final bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -43,7 +43,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/b/o;->bpE:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/b/o;->bpY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const-string v1, "producerIndex"
 
@@ -51,7 +51,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/b/o;->bpF:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/b/o;->bpZ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const-string v1, "consumerIndex"
 
@@ -59,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/b/o;->bpG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/b/o;->bqa:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v0, p0, Lkotlinx/coroutines/b/o;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lkotlinx/coroutines/b/o;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     const/4 v0, 0x0
 
@@ -93,7 +93,7 @@
 .method private final a(Lkotlinx/coroutines/b/e;)V
     .locals 7
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/b/o;->Go()I
+    invoke-virtual {p0}, Lkotlinx/coroutines/b/o;->Gd()I
 
     move-result v0
 
@@ -101,7 +101,7 @@
 
     const/4 v1, 0x1
 
-    invoke-static {v0, v1}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v0, v1}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v0
 
@@ -126,7 +126,7 @@
     :cond_1
     and-int/lit8 v3, v2, 0x7f
 
-    iget-object v5, p0, Lkotlinx/coroutines/b/o;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v5, p0, Lkotlinx/coroutines/b/o;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v5, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -136,7 +136,7 @@
 
     if-eqz v5, :cond_0
 
-    sget-object v5, Lkotlinx/coroutines/b/o;->bpG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/b/o;->bqa:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     add-int/lit8 v6, v2, 0x1
 
@@ -146,7 +146,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/o;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v2, p0, Lkotlinx/coroutines/b/o;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v2, v3, v4}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -213,11 +213,11 @@
     return v1
 
     :cond_0
-    iget-wide v2, v0, Lkotlinx/coroutines/b/i;->bps:J
+    iget-wide v2, v0, Lkotlinx/coroutines/b/i;->bpM:J
 
     sub-long/2addr p1, v2
 
-    sget-wide v2, Lkotlinx/coroutines/b/m;->bpy:J
+    sget-wide v2, Lkotlinx/coroutines/b/m;->bpS:J
 
     cmp-long v4, p1, v2
 
@@ -226,7 +226,7 @@
     return v1
 
     :cond_1
-    sget-object p1, Lkotlinx/coroutines/b/o;->bpE:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/b/o;->bpY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 p2, 0x0
 
@@ -249,7 +249,7 @@
 .method private final c(Lkotlinx/coroutines/b/i;)Z
     .locals 3
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/b/o;->Go()I
+    invoke-virtual {p0}, Lkotlinx/coroutines/b/o;->Gd()I
 
     move-result v0
 
@@ -266,7 +266,7 @@
 
     and-int/2addr v0, v2
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/o;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v2, p0, Lkotlinx/coroutines/b/o;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -277,11 +277,11 @@
     return v1
 
     :cond_1
-    iget-object v1, p0, Lkotlinx/coroutines/b/o;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lkotlinx/coroutines/b/o;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v1, v0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
 
-    sget-object p1, Lkotlinx/coroutines/b/o;->bpF:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/b/o;->bpZ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     invoke-virtual {p1, p0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->incrementAndGet(Ljava/lang/Object;)I
 
@@ -292,7 +292,7 @@
 
 
 # virtual methods
-.method public final Go()I
+.method public final Gd()I
     .locals 2
 
     iget v0, p0, Lkotlinx/coroutines/b/o;->producerIndex:I
@@ -304,10 +304,10 @@
     return v0
 .end method
 
-.method public final Gp()Lkotlinx/coroutines/b/i;
+.method public final Ge()Lkotlinx/coroutines/b/i;
     .locals 5
 
-    sget-object v0, Lkotlinx/coroutines/b/o;->bpE:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/o;->bpY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v1, 0x0
 
@@ -333,7 +333,7 @@
     :cond_1
     and-int/lit8 v2, v0, 0x7f
 
-    iget-object v3, p0, Lkotlinx/coroutines/b/o;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v3, p0, Lkotlinx/coroutines/b/o;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -343,7 +343,7 @@
 
     if-eqz v3, :cond_0
 
-    sget-object v3, Lkotlinx/coroutines/b/o;->bpG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/b/o;->bqa:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     add-int/lit8 v4, v0, 0x1
 
@@ -353,7 +353,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/o;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/b/o;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v0, v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -376,7 +376,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/b/o;->bpE:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/o;->bpY: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;
 
@@ -415,13 +415,13 @@
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v3, Lkotlinx/coroutines/b/m;->bpC:Lkotlinx/coroutines/b/n;
+    sget-object v3, Lkotlinx/coroutines/b/m;->bpW:Lkotlinx/coroutines/b/n;
 
     invoke-virtual {v3}, Lkotlinx/coroutines/b/n;->nanoTime()J
 
     move-result-wide v3
 
-    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/b/o;->Go()I
+    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/b/o;->Gd()I
 
     move-result v5
 
@@ -438,7 +438,7 @@
 
     const/4 v6, 0x1
 
-    invoke-static {v5, v6}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v5, v6}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v5
 
@@ -468,7 +468,7 @@
     :cond_2
     and-int/lit8 v11, v10, 0x7f
 
-    iget-object v13, v1, Lkotlinx/coroutines/b/o;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v13, v1, Lkotlinx/coroutines/b/o;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v13, v11}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -481,21 +481,21 @@
     goto :goto_1
 
     :cond_3
-    iget-wide v13, v13, Lkotlinx/coroutines/b/i;->bps:J
+    iget-wide v13, v13, Lkotlinx/coroutines/b/i;->bpM:J
 
     sub-long v13, v3, v13
 
-    sget-wide v15, Lkotlinx/coroutines/b/m;->bpy:J
+    sget-wide v15, Lkotlinx/coroutines/b/m;->bpS:J
 
     cmp-long v17, v13, v15
 
     if-gez v17, :cond_5
 
-    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/b/o;->Go()I
+    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/b/o;->Gd()I
 
     move-result v13
 
-    sget v14, Lkotlinx/coroutines/b/m;->bpz:I
+    sget v14, Lkotlinx/coroutines/b/m;->bpT:I
 
     if-le v13, v14, :cond_4
 
@@ -516,7 +516,7 @@
     goto :goto_4
 
     :cond_6
-    sget-object v13, Lkotlinx/coroutines/b/o;->bpG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v13, Lkotlinx/coroutines/b/o;->bqa:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     add-int/lit8 v14, v10, 0x1
 
@@ -526,7 +526,7 @@
 
     if-eqz v10, :cond_1
 
-    iget-object v10, v1, Lkotlinx/coroutines/b/o;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v10, v1, Lkotlinx/coroutines/b/o;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v10, v11, v12}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -561,7 +561,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/b/o;->bpE:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/o;->bpY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v1, 0x0
 
@@ -592,7 +592,7 @@
     :cond_1
     and-int/lit8 v2, v0, 0x7f
 
-    iget-object v3, p0, Lkotlinx/coroutines/b/o;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v3, p0, Lkotlinx/coroutines/b/o;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -602,7 +602,7 @@
 
     if-eqz v3, :cond_0
 
-    sget-object v3, Lkotlinx/coroutines/b/o;->bpG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/b/o;->bqa:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     add-int/lit8 v4, v0, 0x1
 
@@ -612,7 +612,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/o;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/b/o;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v0, v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ba.smali b/com.discord/smali_classes2/kotlinx/coroutines/ba.smali
index 4627123af5..9b89268101 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ba.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ba.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final bnj:Lkotlinx/coroutines/az;
+.field public final bnD:Lkotlinx/coroutines/az;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/ba;->bnj:Lkotlinx/coroutines/az;
+    iput-object p1, p0, Lkotlinx/coroutines/ba;->bnD:Lkotlinx/coroutines/az;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bb.smali b/com.discord/smali_classes2/kotlinx/coroutines/bb.smali
index f76a23e909..5edd01903c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bb.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bb.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final bnk:Lkotlin/jvm/functions/Function1;
+.field private final bnE:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -36,7 +36,7 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/f;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/bb;->bnk:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lkotlinx/coroutines/bb;->bnE:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/bb;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -58,7 +58,7 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/bb;->bnk:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lkotlinx/coroutines/bb;->bnE:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -74,7 +74,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/bb;->bnk:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lkotlinx/coroutines/bb;->bnE:Lkotlin/jvm/functions/Function1;
 
     invoke-static {v1}, Lkotlinx/coroutines/ag;->bo(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bc.smali b/com.discord/smali_classes2/kotlinx/coroutines/bc.smali
index a2ea9c8c64..d2fb5a1381 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bc.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bc.smali
@@ -14,13 +14,13 @@
 
 
 # static fields
-.field private static final bnl:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bnF:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
 .field private volatile _invoked:I
 
-.field private final bnk:Lkotlin/jvm/functions/Function1;
+.field private final bnE:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -44,7 +44,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/bc;->bnl:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/bc;->bnF:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -73,7 +73,7 @@
 
     invoke-direct {p0, p1}, Lkotlinx/coroutines/bf;-><init>(Lkotlinx/coroutines/Job;)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/bc;->bnk:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlinx/coroutines/bc;->bnE:Lkotlin/jvm/functions/Function1;
 
     const/4 p1, 0x0
 
@@ -91,7 +91,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/bc;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -99,7 +99,7 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 3
 
-    sget-object v0, Lkotlinx/coroutines/bc;->bnl:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/bc;->bnF:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v1, 0x0
 
@@ -111,7 +111,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlinx/coroutines/bc;->bnk:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lkotlinx/coroutines/bc;->bnE:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bd.smali b/com.discord/smali_classes2/kotlinx/coroutines/bd.smali
index 199532225f..622e17497f 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bd.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bd.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private final bnk:Lkotlin/jvm/functions/Function1;
+.field private final bnE:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -51,7 +51,7 @@
 
     invoke-direct {p0, p1}, Lkotlinx/coroutines/bi;-><init>(Lkotlinx/coroutines/Job;)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/bd;->bnk:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlinx/coroutines/bd;->bnE:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/bd;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -73,7 +73,7 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/bd;->bnk:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lkotlinx/coroutines/bd;->bnE:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/be.smali b/com.discord/smali_classes2/kotlinx/coroutines/be.smali
index 81e2ad5b88..222b95ab12 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/be.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/be.smali
@@ -47,7 +47,7 @@
 
 
 # virtual methods
-.method public final synthetic EO()Ljava/lang/Throwable;
+.method public final synthetic ED()Ljava/lang/Throwable;
     .locals 4
 
     sget-boolean v0, Lkotlinx/coroutines/ag;->DEBUG:Z
@@ -62,7 +62,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     move-object v2, p0
@@ -185,7 +185,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bg.smali b/com.discord/smali_classes2/kotlinx/coroutines/bg.smali
index 7df3c1ae44..99fac09bea 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bg.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bg.smali
@@ -21,7 +21,7 @@
 
 
 # virtual methods
-.method public final Fm()Z
+.method public final Fb()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -29,7 +29,7 @@
     return v0
 .end method
 
-.method protected final Fn()Z
+.method protected final Fc()Z
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bi.smali b/com.discord/smali_classes2/kotlinx/coroutines/bi.smali
index ca9cecb089..188f043c1f 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bi.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bi.smali
@@ -52,7 +52,7 @@
 
 
 # virtual methods
-.method public final EZ()Lkotlinx/coroutines/bn;
+.method public final EO()Lkotlinx/coroutines/bn;
     .locals 1
 
     const/4 v0, 0x0
@@ -74,7 +74,7 @@
     invoke-static {p0, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
-    invoke-virtual {v0}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {v0}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -84,9 +84,9 @@
 
     if-ne v1, p0, :cond_1
 
-    sget-object v2, Lkotlinx/coroutines/bj;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/bj;->bmC:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-static {}, Lkotlinx/coroutines/bk;->Fv()Lkotlinx/coroutines/as;
+    invoke-static {}, Lkotlinx/coroutines/bk;->Fk()Lkotlinx/coroutines/as;
 
     move-result-object v3
 
@@ -106,13 +106,13 @@
 
     check-cast v1, Lkotlinx/coroutines/az;
 
-    invoke-interface {v1}, Lkotlinx/coroutines/az;->EZ()Lkotlinx/coroutines/bn;
+    invoke-interface {v1}, Lkotlinx/coroutines/az;->EO()Lkotlinx/coroutines/bn;
 
     move-result-object v0
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bi;->FD()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bi;->Fs()Z
 
     :cond_3
     return-void
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bj$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/bj$a.smali
index bc72ec0437..3a6eb79974 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bj$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bj$a.smali
@@ -23,13 +23,13 @@
 
 
 # instance fields
-.field private final bno:Lkotlinx/coroutines/bj;
+.field private final bnI:Lkotlinx/coroutines/bj;
 
-.field private final bnp:Lkotlinx/coroutines/bj$b;
+.field private final bnJ:Lkotlinx/coroutines/bj$b;
 
-.field private final bnq:Lkotlinx/coroutines/m;
+.field private final bnK:Lkotlinx/coroutines/m;
 
-.field private final bnr:Ljava/lang/Object;
+.field private final bnL:Ljava/lang/Object;
 
 
 # direct methods
@@ -48,19 +48,19 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p3, Lkotlinx/coroutines/m;->bmm:Lkotlinx/coroutines/n;
+    iget-object v0, p3, Lkotlinx/coroutines/m;->bmG:Lkotlinx/coroutines/n;
 
     check-cast v0, Lkotlinx/coroutines/Job;
 
     invoke-direct {p0, v0}, Lkotlinx/coroutines/bi;-><init>(Lkotlinx/coroutines/Job;)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/bj$a;->bno:Lkotlinx/coroutines/bj;
+    iput-object p1, p0, Lkotlinx/coroutines/bj$a;->bnI:Lkotlinx/coroutines/bj;
 
-    iput-object p2, p0, Lkotlinx/coroutines/bj$a;->bnp:Lkotlinx/coroutines/bj$b;
+    iput-object p2, p0, Lkotlinx/coroutines/bj$a;->bnJ:Lkotlinx/coroutines/bj$b;
 
-    iput-object p3, p0, Lkotlinx/coroutines/bj$a;->bnq:Lkotlinx/coroutines/m;
+    iput-object p3, p0, Lkotlinx/coroutines/bj$a;->bnK:Lkotlinx/coroutines/m;
 
-    iput-object p4, p0, Lkotlinx/coroutines/bj$a;->bnr:Ljava/lang/Object;
+    iput-object p4, p0, Lkotlinx/coroutines/bj$a;->bnL:Ljava/lang/Object;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/bj$a;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -82,13 +82,13 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 3
 
-    iget-object p1, p0, Lkotlinx/coroutines/bj$a;->bno:Lkotlinx/coroutines/bj;
+    iget-object p1, p0, Lkotlinx/coroutines/bj$a;->bnI:Lkotlinx/coroutines/bj;
 
-    iget-object v0, p0, Lkotlinx/coroutines/bj$a;->bnp:Lkotlinx/coroutines/bj$b;
+    iget-object v0, p0, Lkotlinx/coroutines/bj$a;->bnJ:Lkotlinx/coroutines/bj$b;
 
-    iget-object v1, p0, Lkotlinx/coroutines/bj$a;->bnq:Lkotlinx/coroutines/m;
+    iget-object v1, p0, Lkotlinx/coroutines/bj$a;->bnK:Lkotlinx/coroutines/m;
 
-    iget-object v2, p0, Lkotlinx/coroutines/bj$a;->bnr:Ljava/lang/Object;
+    iget-object v2, p0, Lkotlinx/coroutines/bj$a;->bnL:Ljava/lang/Object;
 
     invoke-static {p1, v0, v1, v2}, Lkotlinx/coroutines/bj;->a(Lkotlinx/coroutines/bj;Lkotlinx/coroutines/bj$b;Lkotlinx/coroutines/m;Ljava/lang/Object;)V
 
@@ -104,7 +104,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/bj$a;->bnq:Lkotlinx/coroutines/m;
+    iget-object v1, p0, Lkotlinx/coroutines/bj$a;->bnK:Lkotlinx/coroutines/m;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -112,7 +112,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/bj$a;->bnr:Ljava/lang/Object;
+    iget-object v1, p0, Lkotlinx/coroutines/bj$a;->bnL:Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bj$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/bj$b.smali
index 3ce28d2ab8..a854976863 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bj$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bj$b.smali
@@ -20,7 +20,7 @@
 # instance fields
 .field volatile _exceptionsHolder:Ljava/lang/Object;
 
-.field final bni:Lkotlinx/coroutines/bn;
+.field final bnC:Lkotlinx/coroutines/bn;
 
 .field public volatile isCompleting:Z
 
@@ -37,7 +37,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/bj$b;->bni:Lkotlinx/coroutines/bn;
+    iput-object p1, p0, Lkotlinx/coroutines/bj$b;->bnC:Lkotlinx/coroutines/bn;
 
     const/4 p1, 0x0
 
@@ -48,7 +48,7 @@
     return-void
 .end method
 
-.method static Ft()Ljava/util/ArrayList;
+.method static Fi()Ljava/util/ArrayList;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -70,15 +70,15 @@
 
 
 # virtual methods
-.method public final EZ()Lkotlinx/coroutines/bn;
+.method public final EO()Lkotlinx/coroutines/bn;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/bj$b;->bni:Lkotlinx/coroutines/bn;
+    iget-object v0, p0, Lkotlinx/coroutines/bj$b;->bnC:Lkotlinx/coroutines/bn;
 
     return-object v0
 .end method
 
-.method public final Fs()Z
+.method public final Fh()Z
     .locals 1
 
     iget-object v0, p0, Lkotlinx/coroutines/bj$b;->rootCause:Ljava/lang/Throwable;
@@ -117,7 +117,7 @@
 
     iget-object v0, p0, Lkotlinx/coroutines/bj$b;->_exceptionsHolder:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/bk;->Fu()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/bk;->Fj()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
 
@@ -142,7 +142,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj$b;->Fs()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj$b;->Fh()Z
 
     move-result v1
 
@@ -176,7 +176,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/bj$b;->bni:Lkotlinx/coroutines/bn;
+    iget-object v1, p0, Lkotlinx/coroutines/bj$b;->bnC:Lkotlinx/coroutines/bn;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -230,7 +230,7 @@
     return-void
 
     :cond_3
-    invoke-static {}, Lkotlinx/coroutines/bj$b;->Ft()Ljava/util/ArrayList;
+    invoke-static {}, Lkotlinx/coroutines/bj$b;->Fi()Ljava/util/ArrayList;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bj$c.smali b/com.discord/smali_classes2/kotlinx/coroutines/bj$c.smali
index d799c8a790..a124ea4e49 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bj$c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bj$c.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic bns:Lkotlinx/coroutines/internal/k;
+.field final synthetic bnM:Lkotlinx/coroutines/internal/k;
 
-.field final synthetic bnt:Lkotlinx/coroutines/bj;
+.field final synthetic bnN:Lkotlinx/coroutines/bj;
 
-.field final synthetic bnu:Ljava/lang/Object;
+.field final synthetic bnO:Ljava/lang/Object;
 
 
 # direct methods
 .method public constructor <init>(Lkotlinx/coroutines/internal/k;Lkotlinx/coroutines/internal/k;Lkotlinx/coroutines/bj;Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlinx/coroutines/bj$c;->bns:Lkotlinx/coroutines/internal/k;
+    iput-object p1, p0, Lkotlinx/coroutines/bj$c;->bnM:Lkotlinx/coroutines/internal/k;
 
-    iput-object p3, p0, Lkotlinx/coroutines/bj$c;->bnt:Lkotlinx/coroutines/bj;
+    iput-object p3, p0, Lkotlinx/coroutines/bj$c;->bnN:Lkotlinx/coroutines/bj;
 
-    iput-object p4, p0, Lkotlinx/coroutines/bj$c;->bnu:Ljava/lang/Object;
+    iput-object p4, p0, Lkotlinx/coroutines/bj$c;->bnO:Ljava/lang/Object;
 
     invoke-direct {p0, p2}, Lkotlinx/coroutines/internal/k$a;-><init>(Lkotlinx/coroutines/internal/k;)V
 
@@ -48,13 +48,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lkotlinx/coroutines/bj$c;->bnt:Lkotlinx/coroutines/bj;
+    iget-object p1, p0, Lkotlinx/coroutines/bj$c;->bnN:Lkotlinx/coroutines/bj;
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {p1}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object p1
 
-    iget-object v0, p0, Lkotlinx/coroutines/bj$c;->bnu:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/bj$c;->bnO:Ljava/lang/Object;
 
     if-ne p1, v0, :cond_0
 
@@ -73,7 +73,7 @@
     return-object p1
 
     :cond_1
-    invoke-static {}, Lkotlinx/coroutines/internal/j;->FE()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/j;->Ft()Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bj.smali b/com.discord/smali_classes2/kotlinx/coroutines/bj.smali
index ddbeb96455..4e3efad820 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bj.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bj.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field static final bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field static final bmC:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -41,7 +41,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/bj;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/bj;->bmC:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -53,14 +53,14 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lkotlinx/coroutines/bk;->Fv()Lkotlinx/coroutines/as;
+    invoke-static {}, Lkotlinx/coroutines/bk;->Fk()Lkotlinx/coroutines/as;
 
     move-result-object p1
 
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lkotlinx/coroutines/bk;->Fw()Lkotlinx/coroutines/as;
+    invoke-static {}, Lkotlinx/coroutines/bk;->Fl()Lkotlinx/coroutines/as;
 
     move-result-object p1
 
@@ -70,7 +70,7 @@
     return-void
 .end method
 
-.method private final Fp()Lkotlinx/coroutines/be;
+.method private final Fe()Lkotlinx/coroutines/be;
     .locals 4
 
     new-instance v0, Lkotlinx/coroutines/be;
@@ -110,13 +110,13 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/bj$b;->Fs()Z
+    invoke-virtual {p1}, Lkotlinx/coroutines/bj$b;->Fh()Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/bj;->Fp()Lkotlinx/coroutines/be;
+    invoke-direct {p0}, Lkotlinx/coroutines/bj;->Fe()Lkotlinx/coroutines/be;
 
     move-result-object p1
 
@@ -341,7 +341,7 @@
 .method private final a(Lkotlinx/coroutines/az;)Lkotlinx/coroutines/bn;
     .locals 1
 
-    invoke-interface {p1}, Lkotlinx/coroutines/az;->EZ()Lkotlinx/coroutines/bn;
+    invoke-interface {p1}, Lkotlinx/coroutines/az;->EO()Lkotlinx/coroutines/bn;
 
     move-result-object v0
 
@@ -401,7 +401,7 @@
     .locals 1
 
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->FG()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Fv()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -409,7 +409,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->FI()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Fx()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -420,7 +420,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->FG()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Fv()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -428,7 +428,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->FG()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Fv()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -482,7 +482,7 @@
 
     move-result v0
 
-    invoke-static {v0}, Lkotlinx/coroutines/internal/e;->dt(I)Ljava/util/Set;
+    invoke-static {v0}, Lkotlinx/coroutines/internal/e;->dq(I)Ljava/util/Set;
 
     move-result-object v0
 
@@ -552,7 +552,7 @@
 
     invoke-virtual {p1, v0}, Lkotlinx/coroutines/bi;->b(Lkotlinx/coroutines/internal/k;)Z
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/internal/k;->FG()Ljava/lang/Object;
+    invoke-virtual {p1}, Lkotlinx/coroutines/internal/k;->Fv()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -560,7 +560,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/bj;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/bj;->bmC: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
 
@@ -570,7 +570,7 @@
 .method public static final synthetic a(Lkotlinx/coroutines/bj;Lkotlinx/coroutines/bj$b;Lkotlinx/coroutines/m;Ljava/lang/Object;)V
     .locals 2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -627,7 +627,7 @@
 .method private final a(Lkotlinx/coroutines/bn;Ljava/lang/Throwable;)V
     .locals 7
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/internal/i;->FG()Ljava/lang/Object;
+    invoke-virtual {p1}, Lkotlinx/coroutines/internal/i;->Fv()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -705,11 +705,11 @@
 
     check-cast v1, Ljava/lang/Throwable;
 
-    sget-object v2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     :cond_1
     :goto_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/k;->FH()Lkotlinx/coroutines/internal/k;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/k;->Fw()Lkotlinx/coroutines/internal/k;
 
     move-result-object v0
 
@@ -762,7 +762,7 @@
     check-cast v0, Lkotlinx/coroutines/internal/k$a;
 
     :goto_0
-    invoke-virtual {p2}, Lkotlinx/coroutines/internal/k;->FI()Ljava/lang/Object;
+    invoke-virtual {p2}, Lkotlinx/coroutines/internal/k;->Fx()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -845,7 +845,7 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lkotlinx/coroutines/bj;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/bj;->bmC:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-static {p2}, Lkotlinx/coroutines/bk;->by(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -896,7 +896,7 @@
 .method private final a(Lkotlinx/coroutines/bj$b;Ljava/lang/Object;I)Z
     .locals 5
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -956,7 +956,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lkotlinx/coroutines/bj$b;->Ft()Ljava/util/ArrayList;
+    invoke-static {}, Lkotlinx/coroutines/bj$b;->Fi()Ljava/util/ArrayList;
 
     move-result-object v0
 
@@ -967,7 +967,7 @@
 
     if-eqz v4, :cond_4
 
-    invoke-static {}, Lkotlinx/coroutines/bj$b;->Ft()Ljava/util/ArrayList;
+    invoke-static {}, Lkotlinx/coroutines/bj$b;->Fi()Ljava/util/ArrayList;
 
     move-result-object v4
 
@@ -1007,7 +1007,7 @@
     invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_6
-    invoke-static {}, Lkotlinx/coroutines/bk;->Fu()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/bk;->Fj()Lkotlinx/coroutines/internal/v;
 
     move-result-object v4
 
@@ -1069,7 +1069,7 @@
 
     check-cast v0, Lkotlinx/coroutines/q;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/q;->EN()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/q;->EC()Z
 
     goto :goto_4
 
@@ -1086,7 +1086,7 @@
     :goto_4
     invoke-virtual {p0, p2}, Lkotlinx/coroutines/bj;->bj(Ljava/lang/Object;)V
 
-    sget-object v0, Lkotlinx/coroutines/bj;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/bj;->bmC:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-static {p2}, Lkotlinx/coroutines/bk;->by(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1235,7 +1235,7 @@
     .locals 4
 
     :cond_0
-    iget-object v0, p2, Lkotlinx/coroutines/m;->bmm:Lkotlinx/coroutines/n;
+    iget-object v0, p2, Lkotlinx/coroutines/m;->bmG:Lkotlinx/coroutines/n;
 
     new-instance v1, Lkotlinx/coroutines/bj$a;
 
@@ -1253,7 +1253,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/bo;->bnz:Lkotlinx/coroutines/bo;
+    sget-object v1, Lkotlinx/coroutines/bo;->bnT:Lkotlinx/coroutines/bo;
 
     if-eq v0, v1, :cond_1
 
@@ -1338,7 +1338,7 @@
 
     invoke-interface {v0}, Lkotlinx/coroutines/l;->dispose()V
 
-    sget-object v0, Lkotlinx/coroutines/bo;->bnz:Lkotlinx/coroutines/bo;
+    sget-object v0, Lkotlinx/coroutines/bo;->bnT:Lkotlinx/coroutines/bo;
 
     check-cast v0, Lkotlinx/coroutines/l;
 
@@ -1413,7 +1413,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-interface {p1}, Lkotlinx/coroutines/az;->EZ()Lkotlinx/coroutines/bn;
+    invoke-interface {p1}, Lkotlinx/coroutines/az;->EO()Lkotlinx/coroutines/bn;
 
     move-result-object p1
 
@@ -1431,7 +1431,7 @@
 .method private final b(Lkotlinx/coroutines/bn;Ljava/lang/Throwable;)V
     .locals 7
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/internal/i;->FG()Ljava/lang/Object;
+    invoke-virtual {p1}, Lkotlinx/coroutines/internal/i;->Fv()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1509,11 +1509,11 @@
 
     check-cast v1, Ljava/lang/Throwable;
 
-    sget-object v2, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     :cond_1
     :goto_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/k;->FH()Lkotlinx/coroutines/internal/k;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/k;->Fw()Lkotlinx/coroutines/internal/k;
 
     move-result-object v0
 
@@ -1546,7 +1546,7 @@
 .method private final bq(Ljava/lang/Object;)Z
     .locals 1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fm()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fb()Z
 
     move-result v0
 
@@ -1574,7 +1574,7 @@
     .locals 4
 
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1672,7 +1672,7 @@
     return-object p1
 
     :cond_1
-    invoke-direct {p0}, Lkotlinx/coroutines/bj;->Fp()Lkotlinx/coroutines/be;
+    invoke-direct {p0}, Lkotlinx/coroutines/bj;->Fe()Lkotlinx/coroutines/be;
 
     move-result-object p1
 
@@ -1685,7 +1685,7 @@
 
     check-cast p1, Lkotlinx/coroutines/bq;
 
-    invoke-interface {p1}, Lkotlinx/coroutines/bq;->Fq()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lkotlinx/coroutines/bq;->Ff()Ljava/lang/Throwable;
 
     move-result-object p1
 
@@ -1710,7 +1710,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -1747,7 +1747,7 @@
 
     check-cast v3, Lkotlinx/coroutines/bj$b;
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/bj$b;->Fs()Z
+    invoke-virtual {v3}, Lkotlinx/coroutines/bj$b;->Fh()Z
 
     move-result v3
 
@@ -1794,7 +1794,7 @@
 
     check-cast v2, Lkotlinx/coroutines/bj$b;
 
-    iget-object v0, v2, Lkotlinx/coroutines/bj$b;->bni:Lkotlinx/coroutines/bn;
+    iget-object v0, v2, Lkotlinx/coroutines/bj$b;->bnC:Lkotlinx/coroutines/bn;
 
     invoke-direct {p0, v0, p1}, Lkotlinx/coroutines/bj;->a(Lkotlinx/coroutines/bn;Ljava/lang/Throwable;)V
 
@@ -1855,7 +1855,7 @@
 
     invoke-direct {v6, v2, v1}, Lkotlinx/coroutines/bj$b;-><init>(Lkotlinx/coroutines/bn;Ljava/lang/Throwable;)V
 
-    sget-object v7, Lkotlinx/coroutines/bj;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v7, Lkotlinx/coroutines/bj;->bmC:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v7, p0, v3, v6}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -2008,7 +2008,7 @@
 
     check-cast p0, Lkotlinx/coroutines/bj$b;
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj$b;->Fs()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj$b;->Fh()Z
 
     move-result v0
 
@@ -2167,7 +2167,7 @@
 
     if-eq v5, p1, :cond_8
 
-    sget-object v1, Lkotlinx/coroutines/bj;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/bj;->bmC:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v1, p0, p1, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -2191,7 +2191,7 @@
 
     if-eqz p1, :cond_11
 
-    invoke-virtual {v5}, Lkotlinx/coroutines/bj$b;->Fs()Z
+    invoke-virtual {v5}, Lkotlinx/coroutines/bj$b;->Fh()Z
 
     move-result p1
 
@@ -2228,7 +2228,7 @@
     move-object v1, v6
 
     :goto_2
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -2255,7 +2255,7 @@
 
     if-nez p1, :cond_e
 
-    invoke-interface {v0}, Lkotlinx/coroutines/az;->EZ()Lkotlinx/coroutines/bn;
+    invoke-interface {v0}, Lkotlinx/coroutines/az;->EO()Lkotlinx/coroutines/bn;
 
     move-result-object p1
 
@@ -2320,7 +2320,7 @@
 .method private isCompleted()Z
     .locals 1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2350,7 +2350,7 @@
     return v1
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fr()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fg()Z
 
     move-result v0
 
@@ -2379,13 +2379,13 @@
 
 
 # virtual methods
-.method public EA()V
+.method public Ep()V
     .locals 0
 
     return-void
 .end method
 
-.method public EC()Ljava/lang/String;
+.method public Er()Ljava/lang/String;
     .locals 1
 
     invoke-static {p0}, Lkotlinx/coroutines/ag;->bo(Ljava/lang/Object;)Ljava/lang/String;
@@ -2395,10 +2395,10 @@
     return-object v0
 .end method
 
-.method public final Fl()Ljava/util/concurrent/CancellationException;
+.method public final Fa()Ljava/util/concurrent/CancellationException;
     .locals 4
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2536,7 +2536,7 @@
     throw v1
 .end method
 
-.method public Fm()Z
+.method public Fb()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -2544,7 +2544,7 @@
     return v0
 .end method
 
-.method protected Fn()Z
+.method protected Fc()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -2552,7 +2552,7 @@
     return v0
 .end method
 
-.method public final Fo()Ljava/lang/Object;
+.method public final Fd()Ljava/lang/Object;
     .locals 2
 
     :goto_0
@@ -2572,10 +2572,10 @@
     goto :goto_0
 .end method
 
-.method public final Fq()Ljava/lang/Throwable;
+.method public final Ff()Ljava/lang/Throwable;
     .locals 5
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2614,7 +2614,7 @@
     :goto_0
     if-eqz v1, :cond_3
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fn()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fc()Z
 
     move-result v2
 
@@ -2683,7 +2683,7 @@
     throw v1
 .end method
 
-.method protected Fr()Z
+.method protected Fg()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -2715,7 +2715,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -2727,7 +2727,7 @@
 
     check-cast v3, Lkotlinx/coroutines/as;
 
-    iget-boolean v4, v3, Lkotlinx/coroutines/as;->bmW:Z
+    iget-boolean v4, v3, Lkotlinx/coroutines/as;->bnq:Z
 
     if-eqz v4, :cond_2
 
@@ -2738,7 +2738,7 @@
     move-result-object v1
 
     :cond_1
-    sget-object v3, Lkotlinx/coroutines/bj;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/bj;->bmC: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
 
@@ -2755,7 +2755,7 @@
 
     invoke-direct {v2}, Lkotlinx/coroutines/bn;-><init>()V
 
-    iget-boolean v4, v3, Lkotlinx/coroutines/as;->bmW:Z
+    iget-boolean v4, v3, Lkotlinx/coroutines/as;->bnq:Z
 
     if-eqz v4, :cond_3
 
@@ -2773,7 +2773,7 @@
     check-cast v2, Lkotlinx/coroutines/az;
 
     :goto_1
-    sget-object v4, Lkotlinx/coroutines/bj;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v4, Lkotlinx/coroutines/bj;->bmC: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
 
@@ -2788,7 +2788,7 @@
 
     check-cast v3, Lkotlinx/coroutines/az;
 
-    invoke-interface {v3}, Lkotlinx/coroutines/az;->EZ()Lkotlinx/coroutines/bn;
+    invoke-interface {v3}, Lkotlinx/coroutines/az;->EO()Lkotlinx/coroutines/bn;
 
     move-result-object v3
 
@@ -2812,7 +2812,7 @@
     throw p1
 
     :cond_6
-    sget-object v4, Lkotlinx/coroutines/bo;->bnz:Lkotlinx/coroutines/bo;
+    sget-object v4, Lkotlinx/coroutines/bo;->bnT:Lkotlinx/coroutines/bo;
 
     check-cast v4, Lkotlinx/coroutines/aq;
 
@@ -2884,7 +2884,7 @@
     check-cast v4, Lkotlinx/coroutines/aq;
 
     :cond_b
-    sget-object v6, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v6, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -2950,7 +2950,7 @@
     invoke-interface {p3, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_13
-    sget-object p1, Lkotlinx/coroutines/bo;->bnz:Lkotlinx/coroutines/bo;
+    sget-object p1, Lkotlinx/coroutines/bo;->bnT:Lkotlinx/coroutines/bo;
 
     check-cast p1, Lkotlinx/coroutines/aq;
 
@@ -3045,7 +3045,7 @@
 
     if-nez p1, :cond_1
 
-    sget-object p1, Lkotlinx/coroutines/bo;->bnz:Lkotlinx/coroutines/bo;
+    sget-object p1, Lkotlinx/coroutines/bo;->bnT:Lkotlinx/coroutines/bo;
 
     check-cast p1, Lkotlinx/coroutines/l;
 
@@ -3074,7 +3074,7 @@
 
     invoke-interface {p1}, Lkotlinx/coroutines/l;->dispose()V
 
-    sget-object p1, Lkotlinx/coroutines/bo;->bnz:Lkotlinx/coroutines/bo;
+    sget-object p1, Lkotlinx/coroutines/bo;->bnT:Lkotlinx/coroutines/bo;
 
     check-cast p1, Lkotlinx/coroutines/l;
 
@@ -3179,7 +3179,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlinx/coroutines/Job;->bnm:Lkotlinx/coroutines/Job$b;
+    sget-object v0, Lkotlinx/coroutines/Job;->bnG:Lkotlinx/coroutines/Job$b;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -3189,7 +3189,7 @@
 .method public isActive()Z
     .locals 2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -3254,7 +3254,7 @@
     .locals 2
 
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -3410,7 +3410,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fn()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fc()Z
 
     move-result p1
 
@@ -3430,7 +3430,7 @@
     .locals 6
 
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -3448,13 +3448,13 @@
 
     check-cast v1, Lkotlinx/coroutines/as;
 
-    iget-boolean v1, v1, Lkotlinx/coroutines/as;->bmW:Z
+    iget-boolean v1, v1, Lkotlinx/coroutines/as;->bnq:Z
 
     if-nez v1, :cond_3
 
-    sget-object v1, Lkotlinx/coroutines/bj;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/bj;->bmC:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-static {}, Lkotlinx/coroutines/bk;->Fv()Lkotlinx/coroutines/as;
+    invoke-static {}, Lkotlinx/coroutines/bk;->Fk()Lkotlinx/coroutines/as;
 
     move-result-object v5
 
@@ -3467,7 +3467,7 @@
     goto :goto_2
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->EA()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Ep()V
 
     goto :goto_1
 
@@ -3476,13 +3476,13 @@
 
     if-eqz v1, :cond_3
 
-    sget-object v1, Lkotlinx/coroutines/bj;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/bj;->bmC:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     move-object v5, v0
 
     check-cast v5, Lkotlinx/coroutines/ay;
 
-    iget-object v5, v5, Lkotlinx/coroutines/ay;->bni:Lkotlinx/coroutines/bn;
+    iget-object v5, v5, Lkotlinx/coroutines/ay;->bnC:Lkotlinx/coroutines/bn;
 
     invoke-virtual {v1, p0, v0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -3493,7 +3493,7 @@
     goto :goto_2
 
     :cond_2
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->EA()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Ep()V
 
     :goto_1
     const/4 v2, 0x1
@@ -3540,7 +3540,7 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->EC()Ljava/lang/String;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Er()Ljava/lang/String;
 
     move-result-object v2
 
@@ -3550,7 +3550,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fo()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bj;->Fd()Ljava/lang/Object;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bk.smali b/com.discord/smali_classes2/kotlinx/coroutines/bk.smali
index 4efce707d2..43b2c5a91b 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bk.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bk.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static final bnv:Lkotlinx/coroutines/internal/v;
+.field private static final bnP:Lkotlinx/coroutines/internal/v;
 
-.field private static final bnw:Lkotlinx/coroutines/as;
+.field private static final bnQ:Lkotlinx/coroutines/as;
 
-.field private static final bnx:Lkotlinx/coroutines/as;
+.field private static final bnR:Lkotlinx/coroutines/as;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/internal/v;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/bk;->bnv:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/bk;->bnP:Lkotlinx/coroutines/internal/v;
 
     new-instance v0, Lkotlinx/coroutines/as;
 
@@ -29,7 +29,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/as;-><init>(Z)V
 
-    sput-object v0, Lkotlinx/coroutines/bk;->bnw:Lkotlinx/coroutines/as;
+    sput-object v0, Lkotlinx/coroutines/bk;->bnQ:Lkotlinx/coroutines/as;
 
     new-instance v0, Lkotlinx/coroutines/as;
 
@@ -37,31 +37,31 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/as;-><init>(Z)V
 
-    sput-object v0, Lkotlinx/coroutines/bk;->bnx:Lkotlinx/coroutines/as;
+    sput-object v0, Lkotlinx/coroutines/bk;->bnR:Lkotlinx/coroutines/as;
 
     return-void
 .end method
 
-.method public static final synthetic Fu()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic Fj()Lkotlinx/coroutines/internal/v;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/bk;->bnv:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/bk;->bnP:Lkotlinx/coroutines/internal/v;
 
     return-object v0
 .end method
 
-.method public static final synthetic Fv()Lkotlinx/coroutines/as;
+.method public static final synthetic Fk()Lkotlinx/coroutines/as;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/bk;->bnx:Lkotlinx/coroutines/as;
+    sget-object v0, Lkotlinx/coroutines/bk;->bnR:Lkotlinx/coroutines/as;
 
     return-object v0
 .end method
 
-.method public static final synthetic Fw()Lkotlinx/coroutines/as;
+.method public static final synthetic Fl()Lkotlinx/coroutines/as;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/bk;->bnw:Lkotlinx/coroutines/as;
+    sget-object v0, Lkotlinx/coroutines/bk;->bnQ:Lkotlinx/coroutines/as;
 
     return-object v0
 .end method
@@ -85,7 +85,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, v0, Lkotlinx/coroutines/ba;->bnj:Lkotlinx/coroutines/az;
+    iget-object v0, v0, Lkotlinx/coroutines/ba;->bnD:Lkotlinx/coroutines/az;
 
     if-nez v0, :cond_1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bl.smali b/com.discord/smali_classes2/kotlinx/coroutines/bl.smali
index ddb6c73ca7..67e6de67c1 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bl.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bl.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private bny:Lkotlin/jvm/functions/Function2;
+.field private bnS:Lkotlin/jvm/functions/Function2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function2<",
@@ -54,7 +54,7 @@
 
     invoke-direct {p0, p1, v0}, Lkotlinx/coroutines/bs;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/bl;->bny:Lkotlin/jvm/functions/Function2;
+    iput-object p2, p0, Lkotlinx/coroutines/bl;->bnS:Lkotlin/jvm/functions/Function2;
 
     return-void
 .end method
@@ -64,13 +64,13 @@
 .method protected final onStart()V
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/bl;->bny:Lkotlin/jvm/functions/Function2;
+    iget-object v0, p0, Lkotlinx/coroutines/bl;->bnS:Lkotlin/jvm/functions/Function2;
 
     if-eqz v0, :cond_0
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lkotlinx/coroutines/bl;->bny:Lkotlin/jvm/functions/Function2;
+    iput-object v1, p0, Lkotlinx/coroutines/bl;->bnS:Lkotlin/jvm/functions/Function2;
 
     move-object v1, p0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bn.smali b/com.discord/smali_classes2/kotlinx/coroutines/bn.smali
index 041691ece7..fee8266d6c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bn.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bn.smali
@@ -17,7 +17,7 @@
 
 
 # virtual methods
-.method public final EZ()Lkotlinx/coroutines/bn;
+.method public final EO()Lkotlinx/coroutines/bn;
     .locals 0
 
     return-object p0
@@ -44,7 +44,7 @@
 
     invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/i;->FG()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/i;->Fv()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -92,7 +92,7 @@
     invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     :cond_1
-    invoke-virtual {p1}, Lkotlinx/coroutines/internal/k;->FH()Lkotlinx/coroutines/internal/k;
+    invoke-virtual {p1}, Lkotlinx/coroutines/internal/k;->Fw()Lkotlinx/coroutines/internal/k;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bo.smali b/com.discord/smali_classes2/kotlinx/coroutines/bo.smali
index 70707f2add..f3771a0afd 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bo.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bo.smali
@@ -8,7 +8,7 @@
 
 
 # static fields
-.field public static final bnz:Lkotlinx/coroutines/bo;
+.field public static final bnT:Lkotlinx/coroutines/bo;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/bo;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/bo;->bnz:Lkotlinx/coroutines/bo;
+    sput-object v0, Lkotlinx/coroutines/bo;->bnT:Lkotlinx/coroutines/bo;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bq.smali b/com.discord/smali_classes2/kotlinx/coroutines/bq.smali
index e9400c5013..8673874c2a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bq.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bq.smali
@@ -7,5 +7,5 @@
 
 
 # virtual methods
-.method public abstract Fq()Ljava/lang/Throwable;
+.method public abstract Ff()Ljava/lang/Throwable;
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/br.smali b/com.discord/smali_classes2/kotlinx/coroutines/br.smali
index 825b521685..0b071186fe 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/br.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/br.smali
@@ -70,16 +70,16 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lkotlinx/coroutines/al;->bmM:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/al;->bng:Ljava/lang/Object;
 
     invoke-static {p2, v0}, Lkotlinx/coroutines/internal/z;->b(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     :try_start_0
-    iget-object p0, p0, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
-    sget-object v1, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -87,7 +87,7 @@
 
     invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
 
-    sget-object p0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -113,7 +113,7 @@
     return-void
 
     :cond_4
-    sget-object p2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -196,16 +196,16 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lkotlinx/coroutines/al;->bmM:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/al;->bng:Ljava/lang/Object;
 
     invoke-static {p2, v0}, Lkotlinx/coroutines/internal/z;->b(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     :try_start_0
-    iget-object p0, p0, Lkotlinx/coroutines/al;->bmO:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/al;->bni:Lkotlin/coroutines/Continuation;
 
-    sget-object v1, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1, p0}, Lkotlinx/coroutines/internal/u;->a(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
 
@@ -221,7 +221,7 @@
 
     invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
 
-    sget-object p0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -247,7 +247,7 @@
     return-void
 
     :cond_4
-    sget-object p2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -262,7 +262,7 @@
     return-void
 .end method
 
-.method public static final ds(I)Z
+.method public static final dp(I)Z
     .locals 1
 
     const/4 v0, 0x1
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bu.smali b/com.discord/smali_classes2/kotlinx/coroutines/bu.smali
index ca9de6d13f..094e44c0f4 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bu.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bu.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bnA:Ljava/lang/ThreadLocal;
+.field private static final bnU:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field public static final bnB:Lkotlinx/coroutines/bu;
+.field public static final bnV:Lkotlinx/coroutines/bu;
 
 
 # direct methods
@@ -25,13 +25,13 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/bu;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/bu;->bnB:Lkotlinx/coroutines/bu;
+    sput-object v0, Lkotlinx/coroutines/bu;->bnV:Lkotlinx/coroutines/bu;
 
     new-instance v0, Ljava/lang/ThreadLocal;
 
     invoke-direct {v0}, Ljava/lang/ThreadLocal;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/bu;->bnA:Ljava/lang/ThreadLocal;
+    sput-object v0, Lkotlinx/coroutines/bu;->bnU:Ljava/lang/ThreadLocal;
 
     return-void
 .end method
@@ -44,10 +44,10 @@
     return-void
 .end method
 
-.method public static Fx()Lkotlinx/coroutines/at;
+.method public static Fm()Lkotlinx/coroutines/at;
     .locals 2
 
-    sget-object v0, Lkotlinx/coroutines/bu;->bnA:Ljava/lang/ThreadLocal;
+    sget-object v0, Lkotlinx/coroutines/bu;->bnU:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
 
@@ -57,11 +57,11 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlinx/coroutines/av;->Fi()Lkotlinx/coroutines/at;
+    invoke-static {}, Lkotlinx/coroutines/av;->EX()Lkotlinx/coroutines/at;
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/bu;->bnA:Ljava/lang/ThreadLocal;
+    sget-object v1, Lkotlinx/coroutines/bu;->bnU:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
@@ -69,10 +69,10 @@
     return-object v0
 .end method
 
-.method public static Fy()V
+.method public static Fn()V
     .locals 2
 
-    sget-object v0, Lkotlinx/coroutines/bu;->bnA:Ljava/lang/ThreadLocal;
+    sget-object v0, Lkotlinx/coroutines/bu;->bnU:Ljava/lang/ThreadLocal;
 
     const/4 v1, 0x0
 
@@ -88,7 +88,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/bu;->bnA:Ljava/lang/ThreadLocal;
+    sget-object v0, Lkotlinx/coroutines/bu;->bnU:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v0, p0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bw.smali b/com.discord/smali_classes2/kotlinx/coroutines/bw.smali
index 020c07f935..6721723eb4 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bw.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bw.smali
@@ -4,26 +4,26 @@
 
 
 # static fields
-.field private static bnC:Lkotlinx/coroutines/bv;
+.field private static bnW:Lkotlinx/coroutines/bv;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/aj;->bmK:Lkotlinx/coroutines/aj;
+    sget-object v0, Lkotlinx/coroutines/aj;->bne:Lkotlinx/coroutines/aj;
 
     check-cast v0, Lkotlinx/coroutines/bv;
 
-    sput-object v0, Lkotlinx/coroutines/bw;->bnC:Lkotlinx/coroutines/bv;
+    sput-object v0, Lkotlinx/coroutines/bw;->bnW:Lkotlinx/coroutines/bv;
 
     return-void
 .end method
 
-.method public static final Fz()Lkotlinx/coroutines/bv;
+.method public static final Fo()Lkotlinx/coroutines/bv;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/bw;->bnC:Lkotlinx/coroutines/bv;
+    sget-object v0, Lkotlinx/coroutines/bw;->bnW:Lkotlinx/coroutines/bv;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bx.smali b/com.discord/smali_classes2/kotlinx/coroutines/bx.smali
index 023d793c9b..be03b6b7a8 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bx.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bx.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bnD:Lkotlinx/coroutines/bx;
+.field public static final bnX:Lkotlinx/coroutines/bx;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/bx;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/bx;->bnD:Lkotlinx/coroutines/bx;
+    sput-object v0, Lkotlinx/coroutines/bx;->bnX:Lkotlinx/coroutines/bx;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/by.smali b/com.discord/smali_classes2/kotlinx/coroutines/by.smali
index 5fdbda3cbe..a29cac7c42 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/by.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/by.smali
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final EB()I
+.method public final Eq()I
     .locals 1
 
     const/4 v0, 0x3
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/d.smali b/com.discord/smali_classes2/kotlinx/coroutines/d.smali
index 037b806c50..bf55b0b3d6 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/d.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/d.smali
@@ -61,7 +61,7 @@
 
     check-cast p1, Lkotlinx/coroutines/ad;
 
-    sget-object v0, Lkotlinx/coroutines/ad;->bmC:Lkotlinx/coroutines/ad;
+    sget-object v0, Lkotlinx/coroutines/ad;->bmW:Lkotlinx/coroutines/ad;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/e.smali b/com.discord/smali_classes2/kotlinx/coroutines/e.smali
index e8adecbe22..e13ca9962c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/e.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/e.smali
@@ -38,7 +38,7 @@
 
     invoke-static {p0, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lkotlinx/coroutines/Job;->bnm:Lkotlinx/coroutines/Job$b;
+    sget-object v1, Lkotlinx/coroutines/Job;->bnG:Lkotlinx/coroutines/Job$b;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -59,7 +59,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-interface {v1}, Lkotlinx/coroutines/Job;->Fl()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v1}, Lkotlinx/coroutines/Job;->Fa()Ljava/util/concurrent/CancellationException;
 
     move-result-object p0
 
@@ -86,7 +86,7 @@
     goto/16 :goto_2
 
     :cond_2
-    sget-object v1, Lkotlin/coroutines/c;->bkh:Lkotlin/coroutines/c$a;
+    sget-object v1, Lkotlin/coroutines/c;->bkB:Lkotlin/coroutines/c$a;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -96,7 +96,7 @@
 
     check-cast v1, Lkotlin/coroutines/c;
 
-    sget-object v2, Lkotlin/coroutines/c;->bkh:Lkotlin/coroutines/c$a;
+    sget-object v2, Lkotlin/coroutines/c;->bkB:Lkotlin/coroutines/c$a;
 
     check-cast v2, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -151,7 +151,7 @@
 
     invoke-direct {v0, p0, p2}, Lkotlinx/coroutines/am;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/am;->Ez()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/am;->Eo()V
 
     move-object p0, v0
 
@@ -192,7 +192,7 @@
     throw p0
 
     :cond_6
-    sget-object p0, Lkotlinx/coroutines/am;->bmh:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object p0, Lkotlinx/coroutines/am;->bmB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     invoke-virtual {p0, v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
 
@@ -203,12 +203,12 @@
     :goto_1
     if-eqz p1, :cond_7
 
-    sget-object p0, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object p0, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     goto :goto_2
 
     :cond_7
-    invoke-virtual {v0}, Lkotlinx/coroutines/am;->Fo()Ljava/lang/Object;
+    invoke-virtual {v0}, Lkotlinx/coroutines/am;->Fd()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -221,7 +221,7 @@
     if-nez p1, :cond_9
 
     :goto_2
-    sget-object p1, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object p1, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     if-ne p0, p1, :cond_8
 
@@ -253,7 +253,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sget-object p1, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     check-cast p1, Lkotlin/coroutines/CoroutineContext;
 
@@ -262,7 +262,7 @@
 
     if-eqz p4, :cond_1
 
-    sget-object p2, Lkotlinx/coroutines/ad;->bmB:Lkotlinx/coroutines/ad;
+    sget-object p2, Lkotlinx/coroutines/ad;->bmV:Lkotlinx/coroutines/ad;
 
     :cond_1
     invoke-static {p0, p1, p2, p3}, Lkotlinx/coroutines/d;->a(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/ad;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/i.smali b/com.discord/smali_classes2/kotlinx/coroutines/i.smali
index 4369b36843..d13454b2eb 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/i.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/i.smali
@@ -23,9 +23,9 @@
 
 
 # static fields
-.field private static final bmh:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bmB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
-.field private static final bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bmC:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -33,9 +33,7 @@
 
 .field private volatile _state:Ljava/lang/Object;
 
-.field private final bme:Lkotlin/coroutines/CoroutineContext;
-
-.field private final bmj:Lkotlin/coroutines/Continuation;
+.field private final bmD:Lkotlin/coroutines/Continuation;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/coroutines/Continuation<",
@@ -44,6 +42,8 @@
     .end annotation
 .end field
 
+.field private final bmy:Lkotlin/coroutines/CoroutineContext;
+
 .field private volatile parentHandle:Lkotlinx/coroutines/aq;
 
 
@@ -59,7 +59,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/i;->bmh:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/i;->bmB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const-class v1, Ljava/lang/Object;
 
@@ -69,7 +69,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/i;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/i;->bmC:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -92,28 +92,28 @@
 
     invoke-direct {p0, v0}, Lkotlinx/coroutines/ao;-><init>(I)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/i;->bmj:Lkotlin/coroutines/Continuation;
+    iput-object p1, p0, Lkotlinx/coroutines/i;->bmD:Lkotlin/coroutines/Continuation;
 
-    iget-object p1, p0, Lkotlinx/coroutines/i;->bmj:Lkotlin/coroutines/Continuation;
+    iget-object p1, p0, Lkotlinx/coroutines/i;->bmD:Lkotlin/coroutines/Continuation;
 
     invoke-interface {p1}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlinx/coroutines/i;->bme:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/i;->bmy:Lkotlin/coroutines/CoroutineContext;
 
     const/4 p1, 0x0
 
     iput p1, p0, Lkotlinx/coroutines/i;->_decision:I
 
-    sget-object p1, Lkotlinx/coroutines/b;->bmg:Lkotlinx/coroutines/b;
+    sget-object p1, Lkotlinx/coroutines/b;->bmA:Lkotlinx/coroutines/b;
 
     iput-object p1, p0, Lkotlinx/coroutines/i;->_state:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private final ED()V
+.method private final Es()V
     .locals 5
 
     invoke-direct {p0}, Lkotlinx/coroutines/i;->isCompleted()Z
@@ -125,13 +125,13 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/i;->bmj:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/i;->bmD:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/Job;->bnm:Lkotlinx/coroutines/Job$b;
+    sget-object v1, Lkotlinx/coroutines/Job;->bnG:Lkotlinx/coroutines/Job$b;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -176,7 +176,7 @@
 
     invoke-interface {v0}, Lkotlinx/coroutines/aq;->dispose()V
 
-    sget-object v0, Lkotlinx/coroutines/bo;->bnz:Lkotlinx/coroutines/bo;
+    sget-object v0, Lkotlinx/coroutines/bo;->bnT:Lkotlinx/coroutines/bo;
 
     check-cast v0, Lkotlinx/coroutines/aq;
 
@@ -186,7 +186,7 @@
     return-void
 .end method
 
-.method private final EF()Z
+.method private final Eu()Z
     .locals 3
 
     :cond_0
@@ -218,7 +218,7 @@
     throw v0
 
     :cond_2
-    sget-object v0, Lkotlinx/coroutines/i;->bmh:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/i;->bmB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v2, 0x1
 
@@ -231,7 +231,7 @@
     return v2
 .end method
 
-.method private final EG()Z
+.method private final Ev()Z
     .locals 4
 
     :cond_0
@@ -263,7 +263,7 @@
     throw v0
 
     :cond_2
-    sget-object v0, Lkotlinx/coroutines/i;->bmh:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/i;->bmB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v3, 0x2
 
@@ -276,7 +276,7 @@
     return v2
 .end method
 
-.method private final EH()V
+.method private final Ew()V
     .locals 1
 
     iget-object v0, p0, Lkotlinx/coroutines/i;->parentHandle:Lkotlinx/coroutines/aq;
@@ -285,7 +285,7 @@
 
     invoke-interface {v0}, Lkotlinx/coroutines/aq;->dispose()V
 
-    sget-object v0, Lkotlinx/coroutines/bo;->bnz:Lkotlinx/coroutines/bo;
+    sget-object v0, Lkotlinx/coroutines/bo;->bnT:Lkotlinx/coroutines/bo;
 
     check-cast v0, Lkotlinx/coroutines/aq;
 
@@ -302,7 +302,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p0}, Lkotlinx/coroutines/Job;->Fl()Ljava/util/concurrent/CancellationException;
+    invoke-interface {p0}, Lkotlinx/coroutines/Job;->Fa()Ljava/util/concurrent/CancellationException;
 
     move-result-object p0
 
@@ -383,10 +383,10 @@
     throw v0
 .end method
 
-.method private final dr(I)V
+.method private final do(I)V
     .locals 1
 
-    invoke-direct {p0}, Lkotlinx/coroutines/i;->EG()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/i;->Ev()Z
 
     move-result v0
 
@@ -411,7 +411,7 @@
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lkotlinx/coroutines/i;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/i;->bmC: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
 
@@ -419,9 +419,9 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/i;->EH()V
+    invoke-direct {p0}, Lkotlinx/coroutines/i;->Ew()V
 
-    invoke-direct {p0, p2}, Lkotlinx/coroutines/i;->dr(I)V
+    invoke-direct {p0, p2}, Lkotlinx/coroutines/i;->do(I)V
 
     const/4 p1, 0x0
 
@@ -434,7 +434,7 @@
 
     check-cast v0, Lkotlinx/coroutines/j;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/j;->EJ()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/j;->Ey()Z
 
     move-result v1
 
@@ -469,7 +469,7 @@
 
 
 # virtual methods
-.method public final EE()Ljava/lang/Object;
+.method public final Et()Ljava/lang/Object;
     .locals 1
 
     iget-object v0, p0, Lkotlinx/coroutines/i;->_state:Ljava/lang/Object;
@@ -477,7 +477,7 @@
     return-object v0
 .end method
 
-.method public final EI()Lkotlin/coroutines/Continuation;
+.method public final Ex()Lkotlin/coroutines/Continuation;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -487,7 +487,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/i;->bmj:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/i;->bmD:Lkotlin/coroutines/Continuation;
 
     return-object v0
 .end method
@@ -506,7 +506,7 @@
     :try_start_0
     check-cast p1, Lkotlinx/coroutines/t;
 
-    iget-object p1, p1, Lkotlinx/coroutines/t;->bmt:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p1, Lkotlinx/coroutines/t;->bmN:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
@@ -557,7 +557,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/i;->bmj:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/i;->bmD:Lkotlin/coroutines/Continuation;
 
     instance-of v1, v0, Lkotlinx/coroutines/al;
 
@@ -572,7 +572,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v2, v0, Lkotlinx/coroutines/al;->bmN:Lkotlinx/coroutines/y;
+    iget-object v2, v0, Lkotlinx/coroutines/al;->bnh:Lkotlinx/coroutines/y;
 
     :cond_1
     if-ne v2, p1, :cond_2
@@ -582,7 +582,7 @@
     goto :goto_0
 
     :cond_2
-    iget p1, p0, Lkotlinx/coroutines/i;->bmQ:I
+    iget p1, p0, Lkotlinx/coroutines/i;->bnk:I
 
     :goto_0
     invoke-direct {p0, p2, p1}, Lkotlinx/coroutines/i;->i(Ljava/lang/Object;I)Lkotlinx/coroutines/j;
@@ -628,7 +628,7 @@
 .method public getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/i;->bmj:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/i;->bmD:Lkotlin/coroutines/Continuation;
 
     instance-of v1, v0, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
 
@@ -645,7 +645,7 @@
 .method public getContext()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/i;->bme:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/i;->bmy:Lkotlin/coroutines/CoroutineContext;
 
     return-object v0
 .end method
@@ -653,15 +653,15 @@
 .method public final getResult()Ljava/lang/Object;
     .locals 3
 
-    invoke-direct {p0}, Lkotlinx/coroutines/i;->ED()V
+    invoke-direct {p0}, Lkotlinx/coroutines/i;->Es()V
 
-    invoke-direct {p0}, Lkotlinx/coroutines/i;->EF()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/i;->Eu()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lkotlin/coroutines/a/a;->bkl:Lkotlin/coroutines/a/a;
+    sget-object v0, Lkotlin/coroutines/a/a;->bkF:Lkotlin/coroutines/a/a;
 
     return-object v0
 
@@ -672,7 +672,7 @@
 
     if-nez v1, :cond_3
 
-    iget v1, p0, Lkotlinx/coroutines/i;->bmQ:I
+    iget v1, p0, Lkotlinx/coroutines/i;->bnk:I
 
     const/4 v2, 0x1
 
@@ -682,7 +682,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lkotlinx/coroutines/Job;->bnm:Lkotlinx/coroutines/Job$b;
+    sget-object v2, Lkotlinx/coroutines/Job;->bnG:Lkotlinx/coroutines/Job$b;
 
     check-cast v2, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -703,7 +703,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-interface {v1}, Lkotlinx/coroutines/Job;->Fl()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v1}, Lkotlinx/coroutines/Job;->Fa()Ljava/util/concurrent/CancellationException;
 
     move-result-object v1
 
@@ -803,7 +803,7 @@
 
     :cond_2
     :goto_1
-    sget-object v3, Lkotlinx/coroutines/i;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/i;->bmC: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
 
@@ -831,7 +831,7 @@
 
     check-cast v1, Lkotlinx/coroutines/j;
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/j;->EN()Z
+    invoke-virtual {v1}, Lkotlinx/coroutines/j;->EC()Z
 
     move-result v1
 
@@ -915,7 +915,7 @@
 
     invoke-direct {v1, v3, p1, v4}, Lkotlinx/coroutines/j;-><init>(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;Z)V
 
-    sget-object v3, Lkotlinx/coroutines/i;->bmi:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/i;->bmC:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v3, p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -961,9 +961,9 @@
 
     :cond_2
     :goto_0
-    invoke-direct {p0}, Lkotlinx/coroutines/i;->EH()V
+    invoke-direct {p0}, Lkotlinx/coroutines/i;->Ew()V
 
-    invoke-direct {p0, v2}, Lkotlinx/coroutines/i;->dr(I)V
+    invoke-direct {p0, v2}, Lkotlinx/coroutines/i;->do(I)V
 
     const/4 p1, 0x1
 
@@ -977,7 +977,7 @@
 
     move-result-object p1
 
-    iget v0, p0, Lkotlinx/coroutines/i;->bmQ:I
+    iget v0, p0, Lkotlinx/coroutines/i;->bnk:I
 
     invoke-direct {p0, p1, v0}, Lkotlinx/coroutines/i;->i(Ljava/lang/Object;I)Lkotlinx/coroutines/j;
 
@@ -993,7 +993,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/i;->bmj:Lkotlin/coroutines/Continuation;
+    iget-object v1, p0, Lkotlinx/coroutines/i;->bmD:Lkotlin/coroutines/Continuation;
 
     invoke-static {v1}, Lkotlinx/coroutines/ag;->d(Lkotlin/coroutines/Continuation;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/aa.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/aa.smali
index d4a317e7ab..ed8878aad1 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/aa.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/aa.smali
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field public boC:[Lkotlinx/coroutines/internal/ab;
+.field public boW:[Lkotlinx/coroutines/internal/ab;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TT;"
@@ -37,7 +37,7 @@
     return-void
 .end method
 
-.method private final dw(I)V
+.method private final dt(I)V
     .locals 5
 
     :goto_0
@@ -52,11 +52,11 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lkotlinx/coroutines/internal/aa;->boC:[Lkotlinx/coroutines/internal/ab;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/aa;->boW:[Lkotlinx/coroutines/internal/ab;
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
     add-int/lit8 v2, v0, 0x1
@@ -69,7 +69,7 @@
 
     if-nez v3, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     check-cast v3, Ljava/lang/Comparable;
@@ -78,7 +78,7 @@
 
     if-nez v4, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     invoke-interface {v3, v4}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
@@ -94,7 +94,7 @@
 
     if-nez v2, :cond_5
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_5
     check-cast v2, Ljava/lang/Comparable;
@@ -103,7 +103,7 @@
 
     if-nez v1, :cond_6
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_6
     invoke-interface {v2, v1}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
@@ -125,25 +125,25 @@
 .method private final swap(II)V
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->boC:[Lkotlinx/coroutines/internal/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->boW:[Lkotlinx/coroutines/internal/ab;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     aget-object v1, v0, p2
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
     aget-object v2, v0, p1
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     aput-object v1, v0, p1
@@ -159,7 +159,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized FQ()Lkotlinx/coroutines/internal/ab;
+.method public final declared-synchronized FF()Lkotlinx/coroutines/internal/ab;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -170,7 +170,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/aa;->FS()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/aa;->FH()Lkotlinx/coroutines/internal/ab;
 
     move-result-object v0
     :try_end_0
@@ -188,7 +188,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized FR()Lkotlinx/coroutines/internal/ab;
+.method public final declared-synchronized FG()Lkotlinx/coroutines/internal/ab;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -205,7 +205,7 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, v0}, Lkotlinx/coroutines/internal/aa;->du(I)Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {p0, v0}, Lkotlinx/coroutines/internal/aa;->dr(I)Lkotlinx/coroutines/internal/ab;
 
     move-result-object v0
     :try_end_0
@@ -230,7 +230,7 @@
     throw v0
 .end method
 
-.method public final FS()Lkotlinx/coroutines/internal/ab;
+.method public final FH()Lkotlinx/coroutines/internal/ab;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -238,7 +238,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->boC:[Lkotlinx/coroutines/internal/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->boW:[Lkotlinx/coroutines/internal/ab;
 
     if-eqz v0, :cond_0
 
@@ -269,7 +269,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lkotlinx/coroutines/internal/ab;->Fh()Lkotlinx/coroutines/internal/aa;
+    invoke-interface {p1}, Lkotlinx/coroutines/internal/ab;->EW()Lkotlinx/coroutines/internal/aa;
 
     move-result-object v0
     :try_end_0
@@ -298,7 +298,7 @@
     :cond_1
     if-eqz v1, :cond_2
 
-    invoke-virtual {p0, p1}, Lkotlinx/coroutines/internal/aa;->du(I)Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {p0, p1}, Lkotlinx/coroutines/internal/aa;->dr(I)Lkotlinx/coroutines/internal/ab;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -332,7 +332,7 @@
     throw p1
 .end method
 
-.method public final du(I)Lkotlinx/coroutines/internal/ab;
+.method public final dr(I)Lkotlinx/coroutines/internal/ab;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -360,11 +360,11 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->boC:[Lkotlinx/coroutines/internal/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->boW:[Lkotlinx/coroutines/internal/ab;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
     iget v4, p0, Lkotlinx/coroutines/internal/aa;->size:I
@@ -393,7 +393,7 @@
 
     if-nez v6, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     check-cast v6, Ljava/lang/Comparable;
@@ -402,7 +402,7 @@
 
     if-nez v7, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     invoke-interface {v6, v7}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
@@ -413,12 +413,12 @@
 
     invoke-direct {p0, p1, v4}, Lkotlinx/coroutines/internal/aa;->swap(II)V
 
-    invoke-virtual {p0, v4}, Lkotlinx/coroutines/internal/aa;->dv(I)V
+    invoke-virtual {p0, v4}, Lkotlinx/coroutines/internal/aa;->ds(I)V
 
     goto :goto_1
 
     :cond_4
-    invoke-direct {p0, p1}, Lkotlinx/coroutines/internal/aa;->dw(I)V
+    invoke-direct {p0, p1}, Lkotlinx/coroutines/internal/aa;->dt(I)V
 
     :cond_5
     :goto_1
@@ -428,10 +428,10 @@
 
     if-nez p1, :cond_6
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_6
-    invoke-interface {p1}, Lkotlinx/coroutines/internal/ab;->Fh()Lkotlinx/coroutines/internal/aa;
+    invoke-interface {p1}, Lkotlinx/coroutines/internal/ab;->EW()Lkotlinx/coroutines/internal/aa;
 
     move-result-object v4
 
@@ -485,7 +485,7 @@
     throw p1
 .end method
 
-.method public final dv(I)V
+.method public final ds(I)V
     .locals 3
 
     :goto_0
@@ -494,11 +494,11 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->boC:[Lkotlinx/coroutines/internal/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->boW:[Lkotlinx/coroutines/internal/ab;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
     add-int/lit8 v1, p1, -0x1
@@ -509,7 +509,7 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     check-cast v2, Ljava/lang/Comparable;
@@ -518,7 +518,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_3
     invoke-interface {v2, v0}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/ab.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/ab.smali
index bb6915f7a6..8686198688 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/ab.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/ab.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract Fh()Lkotlinx/coroutines/internal/aa;
+.method public abstract EW()Lkotlinx/coroutines/internal/aa;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/ac.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/ac.smali
index 599612a01d..298de31789 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/ac.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/ac.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field final bme:Lkotlin/coroutines/CoroutineContext;
+.field final bmy:Lkotlin/coroutines/CoroutineContext;
 
-.field boD:[Ljava/lang/Object;
+.field boX:[Ljava/lang/Object;
 
-.field boE:I
+.field boY:I
 
 
 # direct methods
@@ -21,11 +21,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/internal/ac;->bme:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/ac;->bmy:Lkotlin/coroutines/CoroutineContext;
 
     new-array p1, p2, [Ljava/lang/Object;
 
-    iput-object p1, p0, Lkotlinx/coroutines/internal/ac;->boD:[Ljava/lang/Object;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/ac;->boX:[Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/b.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/b.smali
index fa0d10925c..4f402ac581 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/b.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field private bnI:[Ljava/lang/Object;
+.field private boc:[Ljava/lang/Object;
 
-.field private bnJ:I
+.field private bod:I
 
-.field private bnK:I
+.field private boe:I
 
 
 # direct methods
@@ -32,15 +32,15 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iput-object v0, p0, Lkotlinx/coroutines/internal/b;->bnI:[Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/internal/b;->boc:[Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private final FB()V
+.method private final Fq()V
     .locals 6
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->bnI:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->boc:[Ljava/lang/Object;
 
     array-length v1, v0
 
@@ -50,7 +50,7 @@
 
     array-length v3, v0
 
-    iget v4, p0, Lkotlinx/coroutines/internal/b;->bnJ:I
+    iget v4, p0, Lkotlinx/coroutines/internal/b;->bod:I
 
     sub-int/2addr v3, v4
 
@@ -58,24 +58,24 @@
 
     invoke-static {v0, v4, v2, v5, v3}, Lkotlinx/coroutines/internal/a;->a([Ljava/lang/Object;I[Ljava/lang/Object;II)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->bnI:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->boc:[Ljava/lang/Object;
 
-    iget v4, p0, Lkotlinx/coroutines/internal/b;->bnJ:I
+    iget v4, p0, Lkotlinx/coroutines/internal/b;->bod:I
 
     invoke-static {v0, v5, v2, v3, v4}, Lkotlinx/coroutines/internal/a;->a([Ljava/lang/Object;I[Ljava/lang/Object;II)V
 
-    iput-object v2, p0, Lkotlinx/coroutines/internal/b;->bnI:[Ljava/lang/Object;
+    iput-object v2, p0, Lkotlinx/coroutines/internal/b;->boc:[Ljava/lang/Object;
 
-    iput v5, p0, Lkotlinx/coroutines/internal/b;->bnJ:I
+    iput v5, p0, Lkotlinx/coroutines/internal/b;->bod:I
 
-    iput v1, p0, Lkotlinx/coroutines/internal/b;->bnK:I
+    iput v1, p0, Lkotlinx/coroutines/internal/b;->boe:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FA()Ljava/lang/Object;
+.method public final Fp()Ljava/lang/Object;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -83,9 +83,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lkotlinx/coroutines/internal/b;->bnJ:I
+    iget v0, p0, Lkotlinx/coroutines/internal/b;->bod:I
 
-    iget v1, p0, Lkotlinx/coroutines/internal/b;->bnK:I
+    iget v1, p0, Lkotlinx/coroutines/internal/b;->boe:I
 
     const/4 v2, 0x0
 
@@ -94,7 +94,7 @@
     return-object v2
 
     :cond_0
-    iget-object v1, p0, Lkotlinx/coroutines/internal/b;->bnI:[Ljava/lang/Object;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/b;->boc:[Ljava/lang/Object;
 
     aget-object v3, v1, v0
 
@@ -108,7 +108,7 @@
 
     and-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/internal/b;->bnJ:I
+    iput v0, p0, Lkotlinx/coroutines/internal/b;->bod:I
 
     if-eqz v3, :cond_1
 
@@ -136,9 +136,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->bnI:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->boc:[Ljava/lang/Object;
 
-    iget v1, p0, Lkotlinx/coroutines/internal/b;->bnK:I
+    iget v1, p0, Lkotlinx/coroutines/internal/b;->boe:I
 
     aput-object p1, v0, v1
 
@@ -150,15 +150,15 @@
 
     and-int/2addr p1, v1
 
-    iput p1, p0, Lkotlinx/coroutines/internal/b;->bnK:I
+    iput p1, p0, Lkotlinx/coroutines/internal/b;->boe:I
 
-    iget p1, p0, Lkotlinx/coroutines/internal/b;->bnK:I
+    iget p1, p0, Lkotlinx/coroutines/internal/b;->boe:I
 
-    iget v0, p0, Lkotlinx/coroutines/internal/b;->bnJ:I
+    iget v0, p0, Lkotlinx/coroutines/internal/b;->bod:I
 
     if-ne p1, v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/b;->FB()V
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/b;->Fq()V
 
     :cond_0
     return-void
@@ -167,9 +167,9 @@
 .method public final isEmpty()Z
     .locals 2
 
-    iget v0, p0, Lkotlinx/coroutines/internal/b;->bnJ:I
+    iget v0, p0, Lkotlinx/coroutines/internal/b;->bod:I
 
-    iget v1, p0, Lkotlinx/coroutines/internal/b;->bnK:I
+    iget v1, p0, Lkotlinx/coroutines/internal/b;->boe:I
 
     if-ne v0, v1, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/c.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/c.smali
index 851ccab456..2189f2dff1 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/c.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bnL:Ljava/lang/Object;
+.field private static final bof:Ljava/lang/Object;
 
 
 # direct methods
@@ -17,15 +17,15 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/internal/v;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/internal/c;->bnL:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/c;->bof:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method public static final synthetic FC()Ljava/lang/Object;
+.method public static final synthetic Fr()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/internal/c;->bnL:Ljava/lang/Object;
+    sget-object v0, Lkotlinx/coroutines/internal/c;->bof:Ljava/lang/Object;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/d.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/d.smali
index cea38b6f74..2eb1672d0c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/d.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/d.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field private static final bnM:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bog:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -36,7 +36,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/internal/d;->bnM:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/internal/d;->bog:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -46,7 +46,7 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/internal/r;-><init>()V
 
-    invoke-static {}, Lkotlinx/coroutines/internal/c;->FC()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/c;->Fr()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -71,7 +71,7 @@
 
     iget-object v0, p0, Lkotlinx/coroutines/internal/d;->_consensus:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/internal/c;->FC()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/c;->Fr()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -81,7 +81,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lkotlinx/coroutines/internal/c;->FC()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/c;->Fr()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -97,9 +97,9 @@
     :goto_0
     if-eqz v1, :cond_2
 
-    sget-object v1, Lkotlinx/coroutines/internal/d;->bnM:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/d;->bog:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-static {}, Lkotlinx/coroutines/internal/c;->FC()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/c;->Fr()Ljava/lang/Object;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/e.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/e.smali
index a95d43e8e4..649e71e7a1 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/e.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/e.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bnN:Ljava/lang/reflect/Method;
+.field private static final boh:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -38,12 +38,12 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-object v0, Lkotlinx/coroutines/internal/e;->bnN:Ljava/lang/reflect/Method;
+    sput-object v0, Lkotlinx/coroutines/internal/e;->boh:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method public static final dt(I)Ljava/util/Set;
+.method public static final dq(I)Ljava/util/Set;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/f.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/f.smali
index b83d418083..5b56b58d97 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/f.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/f.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final bnO:Lkotlin/coroutines/CoroutineContext;
+.field private final boi:Lkotlin/coroutines/CoroutineContext;
 
 
 # direct methods
@@ -20,17 +20,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/internal/f;->bnO:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/f;->boi:Lkotlin/coroutines/CoroutineContext;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Ey()Lkotlin/coroutines/CoroutineContext;
+.method public final En()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/f;->bnO:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/f;->boi:Lkotlin/coroutines/CoroutineContext;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/g$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/g$a.smali
index 2c249293f7..12f211c465 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/g$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/g$a.smali
@@ -52,7 +52,7 @@
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     iget-object v0, p0, Lkotlinx/coroutines/internal/g$a;->$constructor$inlined:Ljava/lang/reflect/Constructor;
 
@@ -100,7 +100,7 @@
     :catchall_0
     move-exception p1
 
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/g$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/g$b.smali
index 19b38c605f..d5885b112e 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/g$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/g$b.smali
@@ -52,7 +52,7 @@
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     iget-object v0, p0, Lkotlinx/coroutines/internal/g$b;->$constructor$inlined:Ljava/lang/reflect/Constructor;
 
@@ -92,7 +92,7 @@
     :catchall_0
     move-exception p1
 
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/g$c.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/g$c.smali
index ccbe6de502..4b1f61dd81 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/g$c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/g$c.smali
@@ -52,7 +52,7 @@
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     iget-object v0, p0, Lkotlinx/coroutines/internal/g$c;->$constructor$inlined:Ljava/lang/reflect/Constructor;
 
@@ -98,7 +98,7 @@
     :catchall_0
     move-exception p1
 
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/g$d.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/g$d.smali
index e7ab9722d8..289baa9cf8 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/g$d.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/g$d.smali
@@ -52,7 +52,7 @@
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     iget-object v0, p0, Lkotlinx/coroutines/internal/g$d;->$constructor$inlined:Ljava/lang/reflect/Constructor;
 
@@ -90,7 +90,7 @@
     :catchall_0
     move-exception p1
 
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/g$f.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/g$f.smali
index 69de49ac52..0922c45b5c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/g$f.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/g$f.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final bnS:Lkotlinx/coroutines/internal/g$f;
+.field public static final bom:Lkotlinx/coroutines/internal/g$f;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/internal/g$f;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/internal/g$f;->bnS:Lkotlinx/coroutines/internal/g$f;
+    sput-object v0, Lkotlinx/coroutines/internal/g$f;->bom:Lkotlinx/coroutines/internal/g$f;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/g$g.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/g$g.smali
index 57944687ed..bc8e9060b2 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/g$g.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/g$g.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final bnT:Lkotlinx/coroutines/internal/g$g;
+.field public static final bon:Lkotlinx/coroutines/internal/g$g;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/internal/g$g;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/internal/g$g;->bnT:Lkotlinx/coroutines/internal/g$g;
+    sput-object v0, Lkotlinx/coroutines/internal/g$g;->bon:Lkotlinx/coroutines/internal/g$g;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/g.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/g.smali
index ed6b67124f..bf534337a3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/g.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/g.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static final bnP:I
+.field private static final boj:I
 
-.field private static final bnQ:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+.field private static final bok:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
-.field private static final bnR:Ljava/util/WeakHashMap;
+.field private static final bol:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -37,19 +37,19 @@
 
     move-result v0
 
-    sput v0, Lkotlinx/coroutines/internal/g;->bnP:I
+    sput v0, Lkotlinx/coroutines/internal/g;->boj:I
 
     new-instance v0, Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-direct {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/internal/g;->bnQ:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sput-object v0, Lkotlinx/coroutines/internal/g;->bok:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     new-instance v0, Ljava/util/WeakHashMap;
 
     invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/internal/g;->bnR:Ljava/util/WeakHashMap;
+    sput-object v0, Lkotlinx/coroutines/internal/g;->bol:Ljava/util/WeakHashMap;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
     invoke-static {p0}, Lkotlin/jvm/internal/w;->Q(Ljava/lang/Class;)Lkotlin/reflect/b;
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     const/4 v0, 0x0
 
@@ -144,7 +144,7 @@
     :catchall_0
     move-exception p0
 
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p0}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -198,11 +198,11 @@
     if-eqz v0, :cond_1
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     check-cast p0, Lkotlinx/coroutines/w;
 
-    invoke-interface {p0}, Lkotlinx/coroutines/w;->EO()Ljava/lang/Throwable;
+    invoke-interface {p0}, Lkotlinx/coroutines/w;->ED()Ljava/lang/Throwable;
 
     move-result-object p0
 
@@ -217,7 +217,7 @@
     :catchall_0
     move-exception p0
 
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p0}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -242,7 +242,7 @@
     return-object p0
 
     :cond_1
-    sget-object v0, Lkotlinx/coroutines/internal/g;->bnQ:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lkotlinx/coroutines/internal/g;->bok:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -251,7 +251,7 @@
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
 
     :try_start_1
-    sget-object v2, Lkotlinx/coroutines/internal/g;->bnR:Ljava/util/WeakHashMap;
+    sget-object v2, Lkotlinx/coroutines/internal/g;->bol:Ljava/util/WeakHashMap;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -278,7 +278,7 @@
     return-object p0
 
     :cond_2
-    sget v0, Lkotlinx/coroutines/internal/g;->bnP:I
+    sget v0, Lkotlinx/coroutines/internal/g;->boj:I
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -292,7 +292,7 @@
 
     if-eq v0, v2, :cond_7
 
-    sget-object v0, Lkotlinx/coroutines/internal/g;->bnQ:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lkotlinx/coroutines/internal/g;->bok:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -333,7 +333,7 @@
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->lock()V
 
     :try_start_2
-    sget-object v5, Lkotlinx/coroutines/internal/g;->bnR:Ljava/util/WeakHashMap;
+    sget-object v5, Lkotlinx/coroutines/internal/g;->bol:Ljava/util/WeakHashMap;
 
     check-cast v5, Ljava/util/Map;
 
@@ -341,11 +341,11 @@
 
     move-result-object p0
 
-    sget-object v6, Lkotlinx/coroutines/internal/g$f;->bnS:Lkotlinx/coroutines/internal/g$f;
+    sget-object v6, Lkotlinx/coroutines/internal/g$f;->bom:Lkotlinx/coroutines/internal/g$f;
 
     invoke-interface {v5, p0, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object p0, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
@@ -570,7 +570,7 @@
     if-eqz v2, :cond_a
 
     :cond_10
-    sget-object v0, Lkotlinx/coroutines/internal/g;->bnQ:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lkotlinx/coroutines/internal/g;->bok:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -611,7 +611,7 @@
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->lock()V
 
     :try_start_3
-    sget-object v6, Lkotlinx/coroutines/internal/g;->bnR:Ljava/util/WeakHashMap;
+    sget-object v6, Lkotlinx/coroutines/internal/g;->bol:Ljava/util/WeakHashMap;
 
     check-cast v6, Ljava/util/Map;
 
@@ -621,7 +621,7 @@
 
     if-nez v2, :cond_13
 
-    sget-object v8, Lkotlinx/coroutines/internal/g$g;->bnT:Lkotlinx/coroutines/internal/g$g;
+    sget-object v8, Lkotlinx/coroutines/internal/g$g;->bon:Lkotlinx/coroutines/internal/g$g;
 
     check-cast v8, Lkotlin/jvm/functions/Function1;
 
@@ -633,7 +633,7 @@
     :goto_b
     invoke-interface {v6, v7, v8}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v6, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object v6, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_2
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/h.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/h.smali
index a930602113..8d44da035e 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/h.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/h.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final bnU:Z
+.field private static final boo:Z
 
-.field public static final bnV:Lkotlinx/coroutines/internal/h;
+.field public static final bop:Lkotlinx/coroutines/internal/h;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/internal/h;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/internal/h;->bnV:Lkotlinx/coroutines/internal/h;
+    sput-object v0, Lkotlinx/coroutines/internal/h;->bop:Lkotlinx/coroutines/internal/h;
 
     const-string v0, "kotlinx.coroutines.fast.service.loader"
 
@@ -27,7 +27,7 @@
 
     move-result v0
 
-    sput-boolean v0, Lkotlinx/coroutines/internal/h;->bnU:Z
+    sput-boolean v0, Lkotlinx/coroutines/internal/h;->boo:Z
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-boolean v2, Lkotlinx/coroutines/internal/h;->bnU:Z
+    sget-boolean v2, Lkotlinx/coroutines/internal/h;->boo:Z
 
     const-string v3, "ServiceLoader.load(service, loader)"
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/i.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/i.smali
index d0afeed4cd..4c0dfa3288 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/i.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/i.smali
@@ -14,7 +14,7 @@
 
 
 # virtual methods
-.method public final FD()Z
+.method public final Fs()Z
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/j.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/j.smali
index 5facafe010..fc2bc22756 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/j.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/j.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static final bnW:Ljava/lang/Object;
+.field private static final boq:Ljava/lang/Object;
 
-.field private static final bnX:Ljava/lang/Object;
+.field private static final bor:Ljava/lang/Object;
 
-.field private static final bnY:Ljava/lang/Object;
+.field private static final bos:Ljava/lang/Object;
 
-.field private static final bnZ:Ljava/lang/Object;
+.field private static final bou:Ljava/lang/Object;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/internal/v;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/internal/j;->bnW:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/j;->boq:Ljava/lang/Object;
 
     new-instance v0, Lkotlinx/coroutines/internal/v;
 
@@ -31,7 +31,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/internal/v;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/internal/j;->bnX:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/j;->bor:Ljava/lang/Object;
 
     new-instance v0, Lkotlinx/coroutines/internal/v;
 
@@ -39,7 +39,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/internal/v;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/internal/j;->bnY:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/j;->bos:Ljava/lang/Object;
 
     new-instance v0, Lkotlinx/coroutines/internal/v;
 
@@ -47,15 +47,15 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/internal/v;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/internal/j;->bnZ:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/j;->bou:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method public static final FE()Ljava/lang/Object;
+.method public static final Ft()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/internal/j;->bnW:Ljava/lang/Object;
+    sget-object v0, Lkotlinx/coroutines/internal/j;->boq:Ljava/lang/Object;
 
     return-object v0
 .end method
@@ -83,7 +83,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, v0, Lkotlinx/coroutines/internal/s;->boo:Lkotlinx/coroutines/internal/k;
+    iget-object v0, v0, Lkotlinx/coroutines/internal/s;->boJ:Lkotlinx/coroutines/internal/k;
 
     if-nez v0, :cond_2
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/k$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/k$a.smali
index fd78b8d06c..30ecb351d3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/k$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/k$a.smali
@@ -23,9 +23,9 @@
 
 
 # instance fields
-.field public bod:Lkotlinx/coroutines/internal/k;
+.field public boy:Lkotlinx/coroutines/internal/k;
 
-.field public final boe:Lkotlinx/coroutines/internal/k;
+.field public final boz:Lkotlinx/coroutines/internal/k;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/internal/d;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/internal/k$a;->boe:Lkotlinx/coroutines/internal/k;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/k$a;->boz:Lkotlinx/coroutines/internal/k;
 
     return-void
 .end method
@@ -66,17 +66,17 @@
     :goto_0
     if-eqz p2, :cond_1
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/k$a;->boe:Lkotlinx/coroutines/internal/k;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/k$a;->boz:Lkotlinx/coroutines/internal/k;
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lkotlinx/coroutines/internal/k$a;->bod:Lkotlinx/coroutines/internal/k;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/k$a;->boy:Lkotlinx/coroutines/internal/k;
 
     :goto_1
     if-eqz v0, :cond_3
 
-    sget-object v1, Lkotlinx/coroutines/internal/k;->boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/k;->bov:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v1, p1, p0, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -86,13 +86,13 @@
 
     if-eqz p2, :cond_3
 
-    iget-object p1, p0, Lkotlinx/coroutines/internal/k$a;->boe:Lkotlinx/coroutines/internal/k;
+    iget-object p1, p0, Lkotlinx/coroutines/internal/k$a;->boz:Lkotlinx/coroutines/internal/k;
 
-    iget-object p2, p0, Lkotlinx/coroutines/internal/k$a;->bod:Lkotlinx/coroutines/internal/k;
+    iget-object p2, p0, Lkotlinx/coroutines/internal/k$a;->boy:Lkotlinx/coroutines/internal/k;
 
     if-nez p2, :cond_2
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_2
     invoke-static {p1, p2}, Lkotlinx/coroutines/internal/k;->a(Lkotlinx/coroutines/internal/k;Lkotlinx/coroutines/internal/k;)V
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/k.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/k.smali
index ac9154d1c6..fd222f6a57 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/k.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/k.smali
@@ -12,11 +12,11 @@
 
 
 # static fields
-.field static final boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field static final bov:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field static final bob:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field static final bow:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field private static final boc:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final box:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -41,7 +41,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/internal/k;->boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/internal/k;->bov:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const-class v1, Ljava/lang/Object;
 
@@ -51,7 +51,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/internal/k;->bob:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/internal/k;->bow:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const-class v1, Ljava/lang/Object;
 
@@ -61,7 +61,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/internal/k;->boc:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/internal/k;->box:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -82,7 +82,7 @@
     return-void
 .end method
 
-.method private final FF()Lkotlinx/coroutines/internal/s;
+.method private final Fu()Lkotlinx/coroutines/internal/s;
     .locals 2
 
     iget-object v0, p0, Lkotlinx/coroutines/internal/k;->_removedRef:Ljava/lang/Object;
@@ -95,7 +95,7 @@
 
     invoke-direct {v0, p0}, Lkotlinx/coroutines/internal/s;-><init>(Lkotlinx/coroutines/internal/k;)V
 
-    sget-object v1, Lkotlinx/coroutines/internal/k;->boc:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/k;->box:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v1, p0, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -103,7 +103,7 @@
     return-object v0
 .end method
 
-.method private final FJ()Lkotlinx/coroutines/internal/k;
+.method private final Fy()Lkotlinx/coroutines/internal/k;
     .locals 3
 
     :cond_0
@@ -115,7 +115,7 @@
 
     check-cast v0, Lkotlinx/coroutines/internal/s;
 
-    iget-object v0, v0, Lkotlinx/coroutines/internal/s;->boo:Lkotlinx/coroutines/internal/k;
+    iget-object v0, v0, Lkotlinx/coroutines/internal/s;->boJ:Lkotlinx/coroutines/internal/k;
 
     return-object v0
 
@@ -126,7 +126,7 @@
 
     if-ne v0, v1, :cond_2
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/k;->FK()Lkotlinx/coroutines/internal/k;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/k;->Fz()Lkotlinx/coroutines/internal/k;
 
     move-result-object v1
 
@@ -140,11 +140,11 @@
     check-cast v1, Lkotlinx/coroutines/internal/k;
 
     :goto_0
-    invoke-direct {v1}, Lkotlinx/coroutines/internal/k;->FF()Lkotlinx/coroutines/internal/s;
+    invoke-direct {v1}, Lkotlinx/coroutines/internal/k;->Fu()Lkotlinx/coroutines/internal/s;
 
     move-result-object v1
 
-    sget-object v2, Lkotlinx/coroutines/internal/k;->bob:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/internal/k;->bow:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v2, p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -172,7 +172,7 @@
     goto :goto_1
 .end method
 
-.method private final FK()Lkotlinx/coroutines/internal/k;
+.method private final Fz()Lkotlinx/coroutines/internal/k;
     .locals 3
 
     move-object v0, p0
@@ -189,7 +189,7 @@
     return-object v1
 
     :cond_0
-    invoke-virtual {v1}, Lkotlinx/coroutines/internal/k;->FG()Ljava/lang/Object;
+    invoke-virtual {v1}, Lkotlinx/coroutines/internal/k;->Fv()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -251,7 +251,7 @@
 
     if-nez v1, :cond_3
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->FG()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Fv()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -260,7 +260,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/internal/k;->bob:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/k;->bow: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
 
@@ -268,7 +268,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->FG()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Fv()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -332,13 +332,13 @@
 
     if-eqz v1, :cond_3
 
-    invoke-direct {p1}, Lkotlinx/coroutines/internal/k;->FJ()Lkotlinx/coroutines/internal/k;
+    invoke-direct {p1}, Lkotlinx/coroutines/internal/k;->Fy()Lkotlinx/coroutines/internal/k;
 
-    sget-object v3, Lkotlinx/coroutines/internal/k;->boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/internal/k;->bov:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     check-cast v2, Lkotlinx/coroutines/internal/s;
 
-    iget-object v2, v2, Lkotlinx/coroutines/internal/s;->boo:Lkotlinx/coroutines/internal/k;
+    iget-object v2, v2, Lkotlinx/coroutines/internal/s;->boJ:Lkotlinx/coroutines/internal/k;
 
     invoke-virtual {v3, v1, p1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -400,7 +400,7 @@
     return-object v0
 
     :cond_8
-    sget-object v2, Lkotlinx/coroutines/internal/k;->bob:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/internal/k;->bow:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v2, p0, v3, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -419,11 +419,11 @@
 
 
 # virtual methods
-.method public FD()Z
+.method public Fs()Z
     .locals 10
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->FG()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Fv()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -453,11 +453,11 @@
 
     check-cast v3, Lkotlinx/coroutines/internal/k;
 
-    invoke-direct {v3}, Lkotlinx/coroutines/internal/k;->FF()Lkotlinx/coroutines/internal/s;
+    invoke-direct {v3}, Lkotlinx/coroutines/internal/k;->Fu()Lkotlinx/coroutines/internal/s;
 
     move-result-object v4
 
-    sget-object v5, Lkotlinx/coroutines/internal/k;->boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/internal/k;->bov: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
 
@@ -465,7 +465,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/k;->FJ()Lkotlinx/coroutines/internal/k;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/k;->Fy()Lkotlinx/coroutines/internal/k;
 
     move-result-object v0
 
@@ -482,11 +482,11 @@
     :goto_0
     check-cast v4, Lkotlinx/coroutines/internal/s;
 
-    iget-object v4, v4, Lkotlinx/coroutines/internal/s;->boo:Lkotlinx/coroutines/internal/k;
+    iget-object v4, v4, Lkotlinx/coroutines/internal/s;->boJ:Lkotlinx/coroutines/internal/k;
 
     :cond_3
     :goto_1
-    invoke-virtual {v4}, Lkotlinx/coroutines/internal/k;->FG()Ljava/lang/Object;
+    invoke-virtual {v4}, Lkotlinx/coroutines/internal/k;->Fv()Ljava/lang/Object;
 
     move-result-object v7
 
@@ -494,14 +494,14 @@
 
     if-eqz v8, :cond_4
 
-    invoke-direct {v4}, Lkotlinx/coroutines/internal/k;->FJ()Lkotlinx/coroutines/internal/k;
+    invoke-direct {v4}, Lkotlinx/coroutines/internal/k;->Fy()Lkotlinx/coroutines/internal/k;
 
     move-object v4, v7
 
     goto :goto_0
 
     :cond_4
-    invoke-virtual {v6}, Lkotlinx/coroutines/internal/k;->FG()Ljava/lang/Object;
+    invoke-virtual {v6}, Lkotlinx/coroutines/internal/k;->Fv()Ljava/lang/Object;
 
     move-result-object v7
 
@@ -511,13 +511,13 @@
 
     if-eqz v0, :cond_5
 
-    invoke-direct {v6}, Lkotlinx/coroutines/internal/k;->FJ()Lkotlinx/coroutines/internal/k;
+    invoke-direct {v6}, Lkotlinx/coroutines/internal/k;->Fy()Lkotlinx/coroutines/internal/k;
 
-    sget-object v8, Lkotlinx/coroutines/internal/k;->boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v8, Lkotlinx/coroutines/internal/k;->bov:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     check-cast v7, Lkotlinx/coroutines/internal/s;
 
-    iget-object v7, v7, Lkotlinx/coroutines/internal/s;->boo:Lkotlinx/coroutines/internal/k;
+    iget-object v7, v7, Lkotlinx/coroutines/internal/s;->boJ:Lkotlinx/coroutines/internal/k;
 
     invoke-virtual {v8, v0, v6, v7}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -563,7 +563,7 @@
     throw v0
 
     :cond_8
-    sget-object v7, Lkotlinx/coroutines/internal/k;->boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v7, Lkotlinx/coroutines/internal/k;->bov:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v7, v6, p0, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -607,7 +607,7 @@
     goto :goto_2
 .end method
 
-.method public final FG()Ljava/lang/Object;
+.method public final Fv()Ljava/lang/Object;
     .locals 2
 
     :goto_0
@@ -627,10 +627,10 @@
     goto :goto_0
 .end method
 
-.method public final FH()Lkotlinx/coroutines/internal/k;
+.method public final Fw()Lkotlinx/coroutines/internal/k;
     .locals 1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->FG()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Fv()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -641,7 +641,7 @@
     return-object v0
 .end method
 
-.method public final FI()Ljava/lang/Object;
+.method public final Fx()Ljava/lang/Object;
     .locals 4
 
     :goto_0
@@ -660,7 +660,7 @@
 
     check-cast v1, Lkotlinx/coroutines/internal/k;
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/internal/k;->FG()Ljava/lang/Object;
+    invoke-virtual {v1}, Lkotlinx/coroutines/internal/k;->Fv()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -708,17 +708,17 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/internal/k;->bob:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->bow:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v0, p1, p0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    sget-object v0, Lkotlinx/coroutines/internal/k;->boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->bov:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v0, p1, p2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iput-object p2, p3, Lkotlinx/coroutines/internal/k$a;->bod:Lkotlinx/coroutines/internal/k;
+    iput-object p2, p3, Lkotlinx/coroutines/internal/k$a;->boy:Lkotlinx/coroutines/internal/k;
 
-    sget-object p1, Lkotlinx/coroutines/internal/k;->boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/internal/k;->bov:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {p1, p0, p2, p3}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -754,16 +754,16 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/internal/k;->bob:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->bow:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v0, p1, p0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    sget-object v0, Lkotlinx/coroutines/internal/k;->boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->bov:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v0, p1, p0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->FG()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Fv()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -778,7 +778,7 @@
     return p1
 
     :cond_1
-    sget-object v0, Lkotlinx/coroutines/internal/k;->boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->bov:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-virtual {v0, p0, p0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/l.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/l.smali
index 9180b4ddb3..e8b23730f7 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/l.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/l.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final synthetic bof:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field public static final synthetic boA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -36,7 +36,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/internal/l;->bof:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/internal/l;->boA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
 
 # virtual methods
-.method public final FA()Ljava/lang/Object;
+.method public final Fp()Ljava/lang/Object;
     .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -89,12 +89,12 @@
 
     if-eqz v8, :cond_1
 
-    sget-object v7, Lkotlinx/coroutines/internal/m;->boj:Lkotlinx/coroutines/internal/v;
+    sget-object v7, Lkotlinx/coroutines/internal/m;->boE:Lkotlinx/coroutines/internal/v;
 
     goto/16 :goto_2
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/internal/m;->bok:Lkotlinx/coroutines/internal/m$a;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->boF:Lkotlinx/coroutines/internal/m$a;
 
     const-wide/32 v1, 0x3fffffff
 
@@ -171,9 +171,9 @@
 
     and-int v10, v1, v2
 
-    sget-object v1, Lkotlinx/coroutines/internal/m;->bog:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->boB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-    sget-object v2, Lkotlinx/coroutines/internal/m;->bok:Lkotlinx/coroutines/internal/m$a;
+    sget-object v2, Lkotlinx/coroutines/internal/m;->boF:Lkotlinx/coroutines/internal/m$a;
 
     invoke-static {v3, v4, v10}, Lkotlinx/coroutines/internal/m$a;->c(JI)J
 
@@ -221,16 +221,16 @@
     move-object v7, v9
 
     :goto_2
-    sget-object v1, Lkotlinx/coroutines/internal/m;->boj:Lkotlinx/coroutines/internal/v;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->boE:Lkotlinx/coroutines/internal/v;
 
     if-eq v7, v1, :cond_7
 
     return-object v7
 
     :cond_7
-    sget-object v1, Lkotlinx/coroutines/internal/l;->bof:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/l;->boA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->FL()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->FA()Lkotlinx/coroutines/internal/m;
 
     move-result-object v2
 
@@ -278,9 +278,9 @@
     return p1
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/internal/l;->bof:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/l;->boA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->FL()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->FA()Lkotlinx/coroutines/internal/m;
 
     move-result-object v2
 
@@ -300,7 +300,7 @@
 
     check-cast v0, Lkotlinx/coroutines/internal/m;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->fX()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->gb()Z
 
     move-result v1
 
@@ -309,9 +309,9 @@
     return-void
 
     :cond_0
-    sget-object v1, Lkotlinx/coroutines/internal/l;->bof:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/l;->boA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->FL()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->FA()Lkotlinx/coroutines/internal/m;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/m.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/m.smali
index 449096ed0f..023984c1de 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/m.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/m.smali
@@ -22,13 +22,13 @@
 
 
 # static fields
-.field private static final boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field public static final synthetic boB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-.field public static final synthetic bog:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+.field public static final boE:Lkotlinx/coroutines/internal/v;
 
-.field public static final boj:Lkotlinx/coroutines/internal/v;
+.field public static final boF:Lkotlinx/coroutines/internal/m$a;
 
-.field public static final bok:Lkotlinx/coroutines/internal/m$a;
+.field private static final bov:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -36,7 +36,7 @@
 
 .field public volatile synthetic _state$internal:J
 
-.field private final boh:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field private final boC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -46,7 +46,7 @@
     .end annotation
 .end field
 
-.field private final boi:Z
+.field private final boD:Z
 
 .field private final capacity:I
 
@@ -65,7 +65,7 @@
 
     invoke-direct {v1, v2}, Lkotlinx/coroutines/internal/m$a;-><init>(B)V
 
-    sput-object v1, Lkotlinx/coroutines/internal/m;->bok:Lkotlinx/coroutines/internal/m$a;
+    sput-object v1, Lkotlinx/coroutines/internal/m;->boF:Lkotlinx/coroutines/internal/m$a;
 
     new-instance v1, Lkotlinx/coroutines/internal/v;
 
@@ -73,7 +73,7 @@
 
     invoke-direct {v1, v2}, Lkotlinx/coroutines/internal/v;-><init>(Ljava/lang/String;)V
 
-    sput-object v1, Lkotlinx/coroutines/internal/m;->boj:Lkotlinx/coroutines/internal/v;
+    sput-object v1, Lkotlinx/coroutines/internal/m;->boE:Lkotlinx/coroutines/internal/v;
 
     const-class v1, Ljava/lang/Object;
 
@@ -83,7 +83,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/internal/m;->boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/internal/m;->bov:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const-string v1, "_state$internal"
 
@@ -91,7 +91,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/internal/m;->bog:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/internal/m;->boB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 
     iput p1, p0, Lkotlinx/coroutines/internal/m;->capacity:I
 
-    iput-boolean p2, p0, Lkotlinx/coroutines/internal/m;->boi:Z
+    iput-boolean p2, p0, Lkotlinx/coroutines/internal/m;->boD:Z
 
     iget p1, p0, Lkotlinx/coroutines/internal/m;->capacity:I
 
@@ -123,7 +123,7 @@
 
     invoke-direct {p2, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/internal/m;->boh:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object p2, p0, Lkotlinx/coroutines/internal/m;->boC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget p1, p0, Lkotlinx/coroutines/internal/m;->mask:I
 
@@ -189,7 +189,7 @@
     throw p1
 .end method
 
-.method private final FM()J
+.method private final FB()J
     .locals 9
 
     :cond_0
@@ -210,7 +210,7 @@
     :cond_1
     or-long v6, v2, v0
 
-    sget-object v0, Lkotlinx/coroutines/internal/m;->bog:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/m;->boB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     move-object v1, p0
 
@@ -266,14 +266,14 @@
 
     if-eqz v7, :cond_2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/m;->FL()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/m;->FA()Lkotlinx/coroutines/internal/m;
 
     move-result-object p0
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lkotlinx/coroutines/internal/m;->bog:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/m;->boB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     invoke-static {v2, v3, p2}, Lkotlinx/coroutines/internal/m$a;->c(JI)J
 
@@ -287,7 +287,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lkotlinx/coroutines/internal/m;->boh:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object p1, p0, Lkotlinx/coroutines/internal/m;->boC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget p0, p0, Lkotlinx/coroutines/internal/m;->mask:I
 
@@ -341,7 +341,7 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/internal/m;->boa:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/m;->bov:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v1, 0x0
 
@@ -370,7 +370,7 @@
 
     mul-int/lit8 v1, v1, 0x2
 
-    iget-boolean v2, p0, Lkotlinx/coroutines/internal/m;->boi:Z
+    iget-boolean v2, p0, Lkotlinx/coroutines/internal/m;->boD:Z
 
     invoke-direct {v0, v1, v2}, Lkotlinx/coroutines/internal/m;-><init>(IZ)V
 
@@ -403,13 +403,13 @@
 
     if-eq v4, v5, :cond_1
 
-    iget-object v4, v0, Lkotlinx/coroutines/internal/m;->boh:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v4, v0, Lkotlinx/coroutines/internal/m;->boC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget v5, v0, Lkotlinx/coroutines/internal/m;->mask:I
 
     and-int/2addr v5, v2
 
-    iget-object v6, p0, Lkotlinx/coroutines/internal/m;->boh:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v6, p0, Lkotlinx/coroutines/internal/m;->boC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     and-int/2addr v3, v2
 
@@ -443,7 +443,7 @@
 .method public static final synthetic b(Lkotlinx/coroutines/internal/m;)Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .locals 0
 
-    iget-object p0, p0, Lkotlinx/coroutines/internal/m;->boh:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object p0, p0, Lkotlinx/coroutines/internal/m;->boC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     return-object p0
 .end method
@@ -451,7 +451,7 @@
 .method public static final synthetic c(Lkotlinx/coroutines/internal/m;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lkotlinx/coroutines/internal/m;->boi:Z
+    iget-boolean p0, p0, Lkotlinx/coroutines/internal/m;->boD:Z
 
     return p0
 .end method
@@ -466,7 +466,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/m;->boh:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/m;->boC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget v1, p0, Lkotlinx/coroutines/internal/m;->mask:I
 
@@ -486,7 +486,7 @@
 
     if-ne v0, p1, :cond_0
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/m;->boh:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/m;->boC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget v1, p0, Lkotlinx/coroutines/internal/m;->mask:I
 
@@ -504,7 +504,7 @@
 
 
 # virtual methods
-.method public final FL()Lkotlinx/coroutines/internal/m;
+.method public final FA()Lkotlinx/coroutines/internal/m;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -514,7 +514,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/m;->FM()J
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/m;->FB()J
 
     move-result-wide v0
 
@@ -592,13 +592,13 @@
     return v6
 
     :cond_2
-    iget-boolean v2, p0, Lkotlinx/coroutines/internal/m;->boi:Z
+    iget-boolean v2, p0, Lkotlinx/coroutines/internal/m;->boD:Z
 
     const v5, 0x3fffffff    # 1.9999999f
 
     if-nez v2, :cond_4
 
-    iget-object v2, p0, Lkotlinx/coroutines/internal/m;->boh:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v2, p0, Lkotlinx/coroutines/internal/m;->boC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     and-int v11, v0, v10
 
@@ -630,7 +630,7 @@
 
     and-int/2addr v1, v5
 
-    sget-object v2, Lkotlinx/coroutines/internal/m;->bog:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/internal/m;->boB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     invoke-static {v3, v4, v1}, Lkotlinx/coroutines/internal/m$a;->d(JI)J
 
@@ -646,7 +646,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lkotlinx/coroutines/internal/m;->boh:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/m;->boC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     and-int v2, v0, v10
 
@@ -667,7 +667,7 @@
 
     if-eqz v4, :cond_6
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/internal/m;->FL()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v1}, Lkotlinx/coroutines/internal/m;->FA()Lkotlinx/coroutines/internal/m;
 
     move-result-object v1
 
@@ -681,7 +681,7 @@
     return v9
 .end method
 
-.method public final fX()Z
+.method public final gb()Z
     .locals 10
 
     :cond_0
@@ -717,7 +717,7 @@
     :cond_2
     or-long v4, v2, v0
 
-    sget-object v0, Lkotlinx/coroutines/internal/m;->bog:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/m;->boB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     move-object v1, p0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/n.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/n.smali
index 4a05511b7a..d4e7b3773a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/n.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/n.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field public static final bol:Lkotlinx/coroutines/bm;
+.field public static final boG:Lkotlinx/coroutines/bm;
 
-.field public static final bom:Lkotlinx/coroutines/internal/n;
+.field public static final boH:Lkotlinx/coroutines/internal/n;
 
 
 # direct methods
@@ -17,13 +17,13 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/internal/n;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/internal/n;->bom:Lkotlinx/coroutines/internal/n;
+    sput-object v0, Lkotlinx/coroutines/internal/n;->boH:Lkotlinx/coroutines/internal/n;
 
-    invoke-static {}, Lkotlinx/coroutines/internal/n;->FN()Lkotlinx/coroutines/bm;
+    invoke-static {}, Lkotlinx/coroutines/internal/n;->FC()Lkotlinx/coroutines/bm;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/internal/n;->bol:Lkotlinx/coroutines/bm;
+    sput-object v0, Lkotlinx/coroutines/internal/n;->boG:Lkotlinx/coroutines/bm;
 
     return-void
 .end method
@@ -36,13 +36,13 @@
     return-void
 .end method
 
-.method private static FN()Lkotlinx/coroutines/bm;
+.method private static FC()Lkotlinx/coroutines/bm;
     .locals 7
 
     :try_start_0
     const-class v0, Lkotlinx/coroutines/internal/MainDispatcherFactory;
 
-    sget-object v1, Lkotlinx/coroutines/internal/h;->bnV:Lkotlinx/coroutines/internal/h;
+    sget-object v1, Lkotlinx/coroutines/internal/h;->bop:Lkotlinx/coroutines/internal/h;
 
     invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/p.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/p.smali
index 725c7bccb0..87f9adf6a5 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/p.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/p.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final bon:Ljava/lang/String;
+.field private final boI:Ljava/lang/String;
 
 .field private final cause:Ljava/lang/Throwable;
 
@@ -30,12 +30,12 @@
 
     iput-object p1, p0, Lkotlinx/coroutines/internal/p;->cause:Ljava/lang/Throwable;
 
-    iput-object p2, p0, Lkotlinx/coroutines/internal/p;->bon:Ljava/lang/String;
+    iput-object p2, p0, Lkotlinx/coroutines/internal/p;->boI:Ljava/lang/String;
 
     return-void
 .end method
 
-.method private final FO()Ljava/lang/Void;
+.method private final FD()Ljava/lang/Void;
     .locals 3
 
     iget-object v0, p0, Lkotlinx/coroutines/internal/p;->cause:Ljava/lang/Throwable;
@@ -48,7 +48,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/internal/p;->bon:Ljava/lang/String;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/p;->boI:Ljava/lang/String;
 
     if-eqz v1, :cond_0
 
@@ -105,7 +105,7 @@
 
     invoke-static {p3, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->FO()Ljava/lang/Void;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->FD()Ljava/lang/Void;
 
     const/4 p1, 0x0
 
@@ -123,7 +123,7 @@
 
     invoke-static {p2, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->FO()Ljava/lang/Void;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->FD()Ljava/lang/Void;
 
     const/4 p1, 0x0
 
@@ -137,7 +137,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->FO()Ljava/lang/Void;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->FD()Ljava/lang/Void;
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/s.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/s.smali
index 7e0ee1dcae..34a2071cd6 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/s.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/s.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final boo:Lkotlinx/coroutines/internal/k;
+.field public final boJ:Lkotlinx/coroutines/internal/k;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/internal/s;->boo:Lkotlinx/coroutines/internal/k;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/s;->boJ:Lkotlinx/coroutines/internal/k;
 
     return-void
 .end method
@@ -33,7 +33,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/internal/s;->boo:Lkotlinx/coroutines/internal/k;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/s;->boJ:Lkotlinx/coroutines/internal/k;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/t.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/t.smali
index f6f3f89aed..1acfbebf56 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/t.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/t.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field public final bop:Lkotlin/coroutines/Continuation;
+.field public final boK:Lkotlin/coroutines/Continuation;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/coroutines/Continuation<",
@@ -54,14 +54,14 @@
 
     invoke-direct {p0, p1, v0}, Lkotlinx/coroutines/a;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/internal/t;->bop:Lkotlin/coroutines/Continuation;
+    iput-object p2, p0, Lkotlinx/coroutines/internal/t;->boK:Lkotlin/coroutines/Continuation;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public EB()I
+.method public Eq()I
     .locals 1
 
     const/4 v0, 0x2
@@ -69,7 +69,7 @@
     return v0
 .end method
 
-.method public final Fr()Z
+.method public final Fg()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -80,7 +80,7 @@
 .method public final getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->bop:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->boK:Lkotlin/coroutines/Continuation;
 
     check-cast v0, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
 
@@ -123,14 +123,14 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->bop:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->boK:Lkotlin/coroutines/Continuation;
 
     invoke-static {p1, v0}, Lkotlinx/coroutines/internal/u;->a(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
 
     move-result-object p1
 
     :goto_0
-    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->bop:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->boK:Lkotlin/coroutines/Continuation;
 
     const-string v7, "$this$resumeUninterceptedWithExceptionMode"
 
@@ -183,7 +183,7 @@
     move-result-object v1
 
     :try_start_0
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -195,7 +195,7 @@
 
     invoke-interface {v0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -211,7 +211,7 @@
     throw p1
 
     :cond_3
-    sget-object p2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -239,7 +239,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->o(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -254,7 +254,7 @@
     return-void
 
     :cond_6
-    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->bop:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->boK:Lkotlin/coroutines/Continuation;
 
     const-string v7, "$this$resumeUninterceptedMode"
 
@@ -303,7 +303,7 @@
     move-result-object v1
 
     :try_start_1
-    sget-object v2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -311,7 +311,7 @@
 
     invoke-interface {v0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
@@ -327,7 +327,7 @@
     throw p1
 
     :cond_9
-    sget-object p2, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -351,7 +351,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lkotlin/m;->bjC:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bjW:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->aZ(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/u.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/u.smali
index 7976280c7b..7d4708dbe8 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/u.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/u.smali
@@ -14,7 +14,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lkotlinx/coroutines/ag;->bmG:Z
+    sget-boolean v0, Lkotlinx/coroutines/ag;->bna:Z
 
     if-eqz v0, :cond_1
 
@@ -147,7 +147,7 @@
 
     const-string v0, "Coroutine boundary"
 
-    invoke-static {v0}, Lkotlinx/coroutines/internal/u;->dY(Ljava/lang/String;)Ljava/lang/StackTraceElement;
+    invoke-static {v0}, Lkotlinx/coroutines/internal/u;->dS(Ljava/lang/String;)Ljava/lang/StackTraceElement;
 
     move-result-object v0
 
@@ -608,7 +608,7 @@
     return p0
 .end method
 
-.method private static dY(Ljava/lang/String;)Ljava/lang/StackTraceElement;
+.method private static dS(Ljava/lang/String;)Ljava/lang/StackTraceElement;
     .locals 3
 
     const-string v0, "message"
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/v.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/v.smali
index 8049671f5f..7668566599 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/v.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/v.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final boq:Ljava/lang/String;
+.field private final boL:Ljava/lang/String;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/internal/v;->boq:Ljava/lang/String;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/v;->boL:Ljava/lang/String;
 
     return-void
 .end method
@@ -27,7 +27,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/v;->boq:Ljava/lang/String;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/v;->boL:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/x.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/x.smali
index 47cdf70258..7fafa5a69f 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/x.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/x.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bor:I
+.field private static final boM:I
 
 
 # direct methods
@@ -19,20 +19,20 @@
 
     move-result v0
 
-    sput v0, Lkotlinx/coroutines/internal/x;->bor:I
+    sput v0, Lkotlinx/coroutines/internal/x;->boM:I
 
     return-void
 .end method
 
-.method public static final FP()I
+.method public static final FE()I
     .locals 1
 
-    sget v0, Lkotlinx/coroutines/internal/x;->bor:I
+    sget v0, Lkotlinx/coroutines/internal/x;->boM:I
 
     return v0
 .end method
 
-.method public static final dZ(Ljava/lang/String;)Ljava/lang/String;
+.method public static final dT(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
     const-string v0, "propertyName"
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/y.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/y.smali
index f28df725fa..c3bf3621d6 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/y.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/y.smali
@@ -11,7 +11,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p0}, Lkotlinx/coroutines/internal/x;->dZ(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lkotlinx/coroutines/internal/x;->dT(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -20,7 +20,7 @@
     return-wide p1
 
     :cond_0
-    invoke-static {v0}, Lkotlin/text/l;->dW(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v0}, Lkotlin/text/l;->dQ(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p1
 
@@ -126,7 +126,7 @@
 
     invoke-static {p0, p1}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p0}, Lkotlinx/coroutines/internal/x;->dZ(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lkotlinx/coroutines/internal/x;->dT(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/z$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/z$a.smali
index a9d449460f..d675f99b64 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/z$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/z$a.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final boy:Lkotlinx/coroutines/internal/z$a;
+.field public static final boS:Lkotlinx/coroutines/internal/z$a;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/internal/z$a;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/internal/z$a;->boy:Lkotlinx/coroutines/internal/z$a;
+    sput-object v0, Lkotlinx/coroutines/internal/z$a;->boS:Lkotlinx/coroutines/internal/z$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/z$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/z$b.smali
index 9f28944632..5c01c07772 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/z$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/z$b.smali
@@ -30,7 +30,7 @@
 
 
 # static fields
-.field public static final boz:Lkotlinx/coroutines/internal/z$b;
+.field public static final boT:Lkotlinx/coroutines/internal/z$b;
 
 
 # direct methods
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/internal/z$b;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/internal/z$b;->boz:Lkotlinx/coroutines/internal/z$b;
+    sput-object v0, Lkotlinx/coroutines/internal/z$b;->boT:Lkotlinx/coroutines/internal/z$b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/z$c.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/z$c.smali
index e6d97ed9b8..a642dca22f 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/z$c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/z$c.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final boA:Lkotlinx/coroutines/internal/z$c;
+.field public static final boU:Lkotlinx/coroutines/internal/z$c;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/internal/z$c;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/internal/z$c;->boA:Lkotlinx/coroutines/internal/z$c;
+    sput-object v0, Lkotlinx/coroutines/internal/z$c;->boU:Lkotlinx/coroutines/internal/z$c;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     check-cast p2, Lkotlinx/coroutines/bt;
 
-    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->bme:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->bmy:Lkotlin/coroutines/CoroutineContext;
 
-    iget-object v1, p1, Lkotlinx/coroutines/internal/ac;->boD:[Ljava/lang/Object;
+    iget-object v1, p1, Lkotlinx/coroutines/internal/ac;->boX:[Ljava/lang/Object;
 
-    iget v2, p1, Lkotlinx/coroutines/internal/ac;->boE:I
+    iget v2, p1, Lkotlinx/coroutines/internal/ac;->boY:I
 
     add-int/lit8 v3, v2, 0x1
 
-    iput v3, p1, Lkotlinx/coroutines/internal/ac;->boE:I
+    iput v3, p1, Lkotlinx/coroutines/internal/ac;->boY:I
 
     aget-object v1, v1, v2
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/z$d.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/z$d.smali
index 93b5a796b6..6396a1e0c9 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/z$d.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/z$d.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final boB:Lkotlinx/coroutines/internal/z$d;
+.field public static final boV:Lkotlinx/coroutines/internal/z$d;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/internal/z$d;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/internal/z$d;->boB:Lkotlinx/coroutines/internal/z$d;
+    sput-object v0, Lkotlinx/coroutines/internal/z$d;->boV:Lkotlinx/coroutines/internal/z$d;
 
     return-void
 .end method
@@ -78,19 +78,19 @@
 
     check-cast p2, Lkotlinx/coroutines/bt;
 
-    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->bme:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->bmy:Lkotlin/coroutines/CoroutineContext;
 
     invoke-interface {p2, v0}, Lkotlinx/coroutines/bt;->c(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
 
     move-result-object p2
 
-    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->boD:[Ljava/lang/Object;
+    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->boX:[Ljava/lang/Object;
 
-    iget v1, p1, Lkotlinx/coroutines/internal/ac;->boE:I
+    iget v1, p1, Lkotlinx/coroutines/internal/ac;->boY:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p1, Lkotlinx/coroutines/internal/ac;->boE:I
+    iput v2, p1, Lkotlinx/coroutines/internal/ac;->boY:I
 
     aput-object p2, v0, v1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/z.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/z.smali
index 13ec7e06db..ba60253991 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/z.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/z.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final bos:Lkotlinx/coroutines/internal/v;
+.field private static final boN:Lkotlinx/coroutines/internal/v;
 
-.field private static final bou:Lkotlin/jvm/functions/Function2;
+.field private static final boO:Lkotlin/jvm/functions/Function2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function2<",
@@ -18,7 +18,7 @@
     .end annotation
 .end field
 
-.field private static final bov:Lkotlin/jvm/functions/Function2;
+.field private static final boP:Lkotlin/jvm/functions/Function2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function2<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field private static final bow:Lkotlin/jvm/functions/Function2;
+.field private static final boQ:Lkotlin/jvm/functions/Function2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function2<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field private static final box:Lkotlin/jvm/functions/Function2;
+.field private static final boR:Lkotlin/jvm/functions/Function2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function2<",
@@ -66,31 +66,31 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/internal/v;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/internal/z;->bos:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->boN:Lkotlinx/coroutines/internal/v;
 
-    sget-object v0, Lkotlinx/coroutines/internal/z$a;->boy:Lkotlinx/coroutines/internal/z$a;
+    sget-object v0, Lkotlinx/coroutines/internal/z$a;->boS:Lkotlinx/coroutines/internal/z$a;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/internal/z;->bou:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->boO:Lkotlin/jvm/functions/Function2;
 
-    sget-object v0, Lkotlinx/coroutines/internal/z$b;->boz:Lkotlinx/coroutines/internal/z$b;
+    sget-object v0, Lkotlinx/coroutines/internal/z$b;->boT:Lkotlinx/coroutines/internal/z$b;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/internal/z;->bov:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->boP:Lkotlin/jvm/functions/Function2;
 
-    sget-object v0, Lkotlinx/coroutines/internal/z$d;->boB:Lkotlinx/coroutines/internal/z$d;
+    sget-object v0, Lkotlinx/coroutines/internal/z$d;->boV:Lkotlinx/coroutines/internal/z$d;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/internal/z;->bow:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->boQ:Lkotlin/jvm/functions/Function2;
 
-    sget-object v0, Lkotlinx/coroutines/internal/z$c;->boA:Lkotlinx/coroutines/internal/z$c;
+    sget-object v0, Lkotlinx/coroutines/internal/z$c;->boU:Lkotlinx/coroutines/internal/z$c;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/internal/z;->box:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->boR:Lkotlin/jvm/functions/Function2;
 
     return-void
 .end method
@@ -102,7 +102,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/internal/z;->bos:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/internal/z;->boN:Lkotlinx/coroutines/internal/v;
 
     if-ne p1, v0, :cond_0
 
@@ -119,9 +119,9 @@
 
     const/4 v1, 0x0
 
-    iput v1, v0, Lkotlinx/coroutines/internal/ac;->boE:I
+    iput v1, v0, Lkotlinx/coroutines/internal/ac;->boY:I
 
-    sget-object v0, Lkotlinx/coroutines/internal/z;->box:Lkotlin/jvm/functions/Function2;
+    sget-object v0, Lkotlinx/coroutines/internal/z;->boR:Lkotlin/jvm/functions/Function2;
 
     invoke-interface {p0, p1, v0}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 
@@ -130,7 +130,7 @@
     :cond_1
     const/4 v0, 0x0
 
-    sget-object v1, Lkotlinx/coroutines/internal/z;->bov:Lkotlin/jvm/functions/Function2;
+    sget-object v1, Lkotlinx/coroutines/internal/z;->boP:Lkotlin/jvm/functions/Function2;
 
     invoke-interface {p0, v0, v1}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 
@@ -176,7 +176,7 @@
 
     if-ne p1, v0, :cond_1
 
-    sget-object p0, Lkotlinx/coroutines/internal/z;->bos:Lkotlinx/coroutines/internal/v;
+    sget-object p0, Lkotlinx/coroutines/internal/z;->boN:Lkotlinx/coroutines/internal/v;
 
     return-object p0
 
@@ -195,7 +195,7 @@
 
     invoke-direct {v0, p0, p1}, Lkotlinx/coroutines/internal/ac;-><init>(Lkotlin/coroutines/CoroutineContext;I)V
 
-    sget-object p1, Lkotlinx/coroutines/internal/z;->bow:Lkotlin/jvm/functions/Function2;
+    sget-object p1, Lkotlinx/coroutines/internal/z;->boQ:Lkotlin/jvm/functions/Function2;
 
     invoke-interface {p0, v0, p1}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 
@@ -237,7 +237,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/internal/z;->bou:Lkotlin/jvm/functions/Function2;
+    sget-object v1, Lkotlinx/coroutines/internal/z;->boO:Lkotlin/jvm/functions/Function2;
 
     invoke-interface {p0, v0, v1}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 
@@ -245,7 +245,7 @@
 
     if-nez p0, :cond_0
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_0
     return-object p0
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/j.smali b/com.discord/smali_classes2/kotlinx/coroutines/j.smali
index c3ac1cc1ef..16446178eb 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/j.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/j.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bmk:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bmE:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
@@ -23,7 +23,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/j;->bmk:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/j;->bmE:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -80,10 +80,10 @@
 
 
 # virtual methods
-.method public final EJ()Z
+.method public final Ey()Z
     .locals 3
 
-    sget-object v0, Lkotlinx/coroutines/j;->bmk:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/j;->bmE:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/k.smali b/com.discord/smali_classes2/kotlinx/coroutines/k.smali
index 5cf531419e..c06638604a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/k.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/k.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field public final bml:Lkotlinx/coroutines/i;
+.field public final bmF:Lkotlinx/coroutines/i;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlinx/coroutines/i<",
@@ -46,7 +46,7 @@
 
     invoke-direct {p0, p1}, Lkotlinx/coroutines/bf;-><init>(Lkotlinx/coroutines/Job;)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/k;->bml:Lkotlinx/coroutines/i;
+    iput-object p2, p0, Lkotlinx/coroutines/k;->bmF:Lkotlinx/coroutines/i;
 
     return-void
 .end method
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/k;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -68,7 +68,7 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object p1, p0, Lkotlinx/coroutines/k;->bml:Lkotlinx/coroutines/i;
+    iget-object p1, p0, Lkotlinx/coroutines/k;->bmF:Lkotlinx/coroutines/i;
 
     iget-object v0, p0, Lkotlinx/coroutines/k;->job:Lkotlinx/coroutines/Job;
 
@@ -90,7 +90,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/k;->bml:Lkotlinx/coroutines/i;
+    iget-object v1, p0, Lkotlinx/coroutines/k;->bmF:Lkotlinx/coroutines/i;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/m.smali b/com.discord/smali_classes2/kotlinx/coroutines/m.smali
index 711b6db52e..7650ea5dda 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/m.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/m.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field public final bmm:Lkotlinx/coroutines/n;
+.field public final bmG:Lkotlinx/coroutines/n;
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     invoke-direct {p0, p1}, Lkotlinx/coroutines/bf;-><init>(Lkotlinx/coroutines/Job;)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/m;->bmm:Lkotlinx/coroutines/n;
+    iput-object p2, p0, Lkotlinx/coroutines/m;->bmG:Lkotlinx/coroutines/n;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/m;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bjF:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bjZ:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -59,7 +59,7 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object p1, p0, Lkotlinx/coroutines/m;->bmm:Lkotlinx/coroutines/n;
+    iget-object p1, p0, Lkotlinx/coroutines/m;->bmG:Lkotlinx/coroutines/n;
 
     iget-object v0, p0, Lkotlinx/coroutines/m;->job:Lkotlinx/coroutines/Job;
 
@@ -97,7 +97,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/m;->bmm:Lkotlinx/coroutines/n;
+    iget-object v1, p0, Lkotlinx/coroutines/m;->bmG:Lkotlinx/coroutines/n;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/o$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/o$a.smali
index ac75620831..3e96032f2a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/o$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/o$a.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lkotlinx/coroutines/o;->EL()Ljava/util/concurrent/ExecutorService;
+    value = Lkotlinx/coroutines/o;->EA()Ljava/util/concurrent/ExecutorService;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bmq:Ljava/util/concurrent/atomic/AtomicInteger;
+.field final synthetic bmK:Ljava/util/concurrent/atomic/AtomicInteger;
 
 
 # direct methods
 .method constructor <init>(Ljava/util/concurrent/atomic/AtomicInteger;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlinx/coroutines/o$a;->bmq:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lkotlinx/coroutines/o$a;->bmK:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,7 +45,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lkotlinx/coroutines/o$a;->bmq:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lkotlinx/coroutines/o$a;->bmK:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/o$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/o$b.smali
index 4ee8747583..eb7c401d08 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/o$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/o$b.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final bmr:Lkotlinx/coroutines/o$b;
+.field public static final bmL:Lkotlinx/coroutines/o$b;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/o$b;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/o$b;->bmr:Lkotlinx/coroutines/o$b;
+    sput-object v0, Lkotlinx/coroutines/o$b;->bmL:Lkotlinx/coroutines/o$b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/o.smali b/com.discord/smali_classes2/kotlinx/coroutines/o.smali
index 7a6e968b3b..b2d8f65221 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/o.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/o.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static final bmn:I
+.field private static final bmH:I
 
-.field private static bmo:Z
+.field private static bmI:Z
 
-.field public static final bmp:Lkotlinx/coroutines/o;
+.field public static final bmJ:Lkotlinx/coroutines/o;
 
 .field private static volatile pool:Ljava/util/concurrent/Executor;
 
@@ -21,7 +21,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/o;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/o;->bmp:Lkotlinx/coroutines/o;
+    sput-object v0, Lkotlinx/coroutines/o;->bmJ:Lkotlinx/coroutines/o;
 
     :try_start_0
     const-string v0, "kotlinx.coroutines.default.parallelism"
@@ -45,7 +45,7 @@
     goto :goto_1
 
     :cond_0
-    invoke-static {v0}, Lkotlin/text/l;->dU(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v0}, Lkotlin/text/l;->dO(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v1
 
@@ -62,7 +62,7 @@
     move-result v0
 
     :goto_1
-    sput v0, Lkotlinx/coroutines/o;->bmn:I
+    sput v0, Lkotlinx/coroutines/o;->bmH:I
 
     return-void
 
@@ -98,7 +98,72 @@
     return-void
 .end method
 
-.method private final EK()Ljava/util/concurrent/ExecutorService;
+.method private static EA()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-static {}, Lkotlinx/coroutines/o;->getParallelism()I
+
+    move-result v1
+
+    new-instance v2, Lkotlinx/coroutines/o$a;
+
+    invoke-direct {v2, v0}, Lkotlinx/coroutines/o$a;-><init>(Ljava/util/concurrent/atomic/AtomicInteger;)V
+
+    check-cast v2, Ljava/util/concurrent/ThreadFactory;
+
+    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}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method private final declared-synchronized EB()Ljava/util/concurrent/Executor;
+    .locals 2
+
+    monitor-enter p0
+
+    :try_start_0
+    sget-object v0, Lkotlinx/coroutines/o;->pool:Ljava/util/concurrent/Executor;
+
+    if-nez v0, :cond_0
+
+    invoke-direct {p0}, Lkotlinx/coroutines/o;->Ez()Ljava/util/concurrent/ExecutorService;
+
+    move-result-object v0
+
+    move-object v1, v0
+
+    check-cast v1, Ljava/util/concurrent/Executor;
+
+    sput-object v1, Lkotlinx/coroutines/o;->pool:Ljava/util/concurrent/Executor;
+
+    check-cast v0, Ljava/util/concurrent/Executor;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_0
+    monitor-exit p0
+
+    return-object v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method private final Ez()Ljava/util/concurrent/ExecutorService;
     .locals 6
 
     invoke-static {}, Ljava/lang/System;->getSecurityManager()Ljava/lang/SecurityManager;
@@ -107,7 +172,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lkotlinx/coroutines/o;->EL()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lkotlinx/coroutines/o;->EA()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
@@ -133,20 +198,20 @@
     :goto_0
     if-nez v1, :cond_1
 
-    invoke-static {}, Lkotlinx/coroutines/o;->EL()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lkotlinx/coroutines/o;->EA()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
     return-object v0
 
     :cond_1
-    sget-boolean v2, Lkotlinx/coroutines/o;->bmo:Z
+    sget-boolean v2, Lkotlinx/coroutines/o;->bmI:Z
 
     const/4 v3, 0x0
 
     if-nez v2, :cond_5
 
-    sget v2, Lkotlinx/coroutines/o;->bmn:I
+    sget v2, Lkotlinx/coroutines/o;->bmH:I
 
     if-gez v2, :cond_5
 
@@ -262,78 +327,13 @@
     return-object v0
 
     :cond_7
-    invoke-static {}, Lkotlinx/coroutines/o;->EL()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lkotlinx/coroutines/o;->EA()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method private static EL()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-static {}, Lkotlinx/coroutines/o;->getParallelism()I
-
-    move-result v1
-
-    new-instance v2, Lkotlinx/coroutines/o$a;
-
-    invoke-direct {v2, v0}, Lkotlinx/coroutines/o$a;-><init>(Ljava/util/concurrent/atomic/AtomicInteger;)V
-
-    check-cast v2, Ljava/util/concurrent/ThreadFactory;
-
-    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}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
-
-.method private final declared-synchronized EM()Ljava/util/concurrent/Executor;
-    .locals 2
-
-    monitor-enter p0
-
-    :try_start_0
-    sget-object v0, Lkotlinx/coroutines/o;->pool:Ljava/util/concurrent/Executor;
-
-    if-nez v0, :cond_0
-
-    invoke-direct {p0}, Lkotlinx/coroutines/o;->EK()Ljava/util/concurrent/ExecutorService;
-
-    move-result-object v0
-
-    move-object v1, v0
-
-    check-cast v1, Ljava/util/concurrent/Executor;
-
-    sput-object v1, Lkotlinx/coroutines/o;->pool:Ljava/util/concurrent/Executor;
-
-    check-cast v0, Ljava/util/concurrent/Executor;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_0
-    monitor-exit p0
-
-    return-object v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
 .method private static a(Ljava/lang/Class;Ljava/util/concurrent/ExecutorService;)Z
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
@@ -354,7 +354,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/o$b;->bmr:Lkotlinx/coroutines/o$b;
+    sget-object v0, Lkotlinx/coroutines/o$b;->bmL:Lkotlinx/coroutines/o$b;
 
     check-cast v0, Ljava/lang/Runnable;
 
@@ -415,7 +415,7 @@
 .method private static getParallelism()I
     .locals 3
 
-    sget v0, Lkotlinx/coroutines/o;->bmn:I
+    sget v0, Lkotlinx/coroutines/o;->bmH:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -468,7 +468,7 @@
 
     sub-int/2addr v0, v2
 
-    invoke-static {v0, v2}, Lkotlin/ranges/c;->Z(II)I
+    invoke-static {v0, v2}, Lkotlin/ranges/c;->Y(II)I
 
     move-result v0
 
@@ -493,12 +493,12 @@
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/o;->EM()Ljava/util/concurrent/Executor;
+    invoke-direct {p0}, Lkotlinx/coroutines/o;->EB()Ljava/util/concurrent/Executor;
 
     move-result-object p1
 
     :cond_0
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
     move-result-object v0
 
@@ -513,9 +513,9 @@
     return-void
 
     :catch_0
-    invoke-static {}, Lkotlinx/coroutines/bw;->Fz()Lkotlinx/coroutines/bv;
+    invoke-static {}, Lkotlinx/coroutines/bw;->Fo()Lkotlinx/coroutines/bv;
 
-    sget-object p1, Lkotlinx/coroutines/ah;->bmI:Lkotlinx/coroutines/ah;
+    sget-object p1, Lkotlinx/coroutines/ah;->bnc:Lkotlinx/coroutines/ah;
 
     invoke-virtual {p1, p2}, Lkotlinx/coroutines/ah;->m(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/q.smali b/com.discord/smali_classes2/kotlinx/coroutines/q.smali
index ad08d1ea03..a5eb4ba653 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/q.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/q.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bms:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bmM:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
@@ -25,7 +25,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/q;->bms:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/q;->bmM:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -58,10 +58,10 @@
 
 
 # virtual methods
-.method public final EN()Z
+.method public final EC()Z
     .locals 3
 
-    sget-object v0, Lkotlinx/coroutines/q;->bms:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/q;->bmM:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/r.smali b/com.discord/smali_classes2/kotlinx/coroutines/r.smali
index ce24142e68..59841b1791 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/r.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/r.smali
@@ -34,7 +34,7 @@
 
     if-nez p0, :cond_1
 
-    invoke-static {}, Lkotlin/jvm/internal/k;->Em()V
+    invoke-static {}, Lkotlin/jvm/internal/k;->Eb()V
 
     :cond_1
     invoke-direct {v0, p0}, Lkotlinx/coroutines/q;-><init>(Ljava/lang/Throwable;)V
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/t.smali b/com.discord/smali_classes2/kotlinx/coroutines/t.smali
index 16759ed23a..89d01ae381 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/t.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/t.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final bmt:Lkotlin/jvm/functions/Function1;
+.field public final bmN:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/w.smali b/com.discord/smali_classes2/kotlinx/coroutines/w.smali
index 493150addf..ad1323f860 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/w.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/w.smali
@@ -17,7 +17,7 @@
 
 
 # virtual methods
-.method public abstract EO()Ljava/lang/Throwable;
+.method public abstract ED()Ljava/lang/Throwable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/x.smali b/com.discord/smali_classes2/kotlinx/coroutines/x.smali
index 34fea755be..a03318bf3b 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/x.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/x.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final bmu:Ljava/util/concurrent/atomic/AtomicLong;
+.field private static final bmO:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private static final bmv:Z
+.field private static final bmP:Z
 
 
 # direct methods
@@ -17,11 +17,11 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/x;->bmu:Ljava/util/concurrent/atomic/AtomicLong;
+    sput-object v0, Lkotlinx/coroutines/x;->bmO:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-string v0, "kotlinx.coroutines.scheduler"
 
-    invoke-static {v0}, Lkotlinx/coroutines/internal/x;->dZ(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Lkotlinx/coroutines/internal/x;->dT(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -80,7 +80,7 @@
     const/4 v0, 0x1
 
     :goto_1
-    sput-boolean v0, Lkotlinx/coroutines/x;->bmv:Z
+    sput-boolean v0, Lkotlinx/coroutines/x;->bmP:Z
 
     return-void
 
@@ -114,14 +114,14 @@
     throw v1
 .end method
 
-.method public static final EP()Lkotlinx/coroutines/y;
+.method public static final EE()Lkotlinx/coroutines/y;
     .locals 1
 
-    sget-boolean v0, Lkotlinx/coroutines/x;->bmv:Z
+    sget-boolean v0, Lkotlinx/coroutines/x;->bmP:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lkotlinx/coroutines/b/c;->bpj:Lkotlinx/coroutines/b/c;
+    sget-object v0, Lkotlinx/coroutines/b/c;->bpD:Lkotlinx/coroutines/b/c;
 
     :goto_0
     check-cast v0, Lkotlinx/coroutines/y;
@@ -129,7 +129,7 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/o;->bmp:Lkotlinx/coroutines/o;
+    sget-object v0, Lkotlinx/coroutines/o;->bmJ:Lkotlinx/coroutines/o;
 
     goto :goto_0
 .end method
@@ -150,7 +150,7 @@
     return-object v1
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/ab;->bmz:Lkotlinx/coroutines/ab$a;
+    sget-object v0, Lkotlinx/coroutines/ab;->bmT:Lkotlinx/coroutines/ab$a;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -165,7 +165,7 @@
     return-object v1
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/ac;->bmA:Lkotlinx/coroutines/ac$a;
+    sget-object v1, Lkotlinx/coroutines/ac;->bmU:Lkotlinx/coroutines/ac$a;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -217,7 +217,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p0}, Lkotlinx/coroutines/CoroutineScope;->Ey()Lkotlin/coroutines/CoroutineContext;
+    invoke-interface {p0}, Lkotlinx/coroutines/CoroutineScope;->En()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object p0
 
@@ -231,7 +231,7 @@
 
     new-instance p1, Lkotlinx/coroutines/ab;
 
-    sget-object v0, Lkotlinx/coroutines/x;->bmu:Ljava/util/concurrent/atomic/AtomicLong;
+    sget-object v0, Lkotlinx/coroutines/x;->bmO:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
 
@@ -251,13 +251,13 @@
     move-object p1, p0
 
     :goto_0
-    invoke-static {}, Lkotlinx/coroutines/ap;->EW()Lkotlinx/coroutines/y;
+    invoke-static {}, Lkotlinx/coroutines/ap;->EL()Lkotlinx/coroutines/y;
 
     move-result-object v0
 
     if-eq p0, v0, :cond_1
 
-    sget-object v0, Lkotlin/coroutines/c;->bkh:Lkotlin/coroutines/c$a;
+    sget-object v0, Lkotlin/coroutines/c;->bkB:Lkotlin/coroutines/c$a;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -267,7 +267,7 @@
 
     if-nez p0, :cond_1
 
-    invoke-static {}, Lkotlinx/coroutines/ap;->EW()Lkotlinx/coroutines/y;
+    invoke-static {}, Lkotlinx/coroutines/ap;->EL()Lkotlinx/coroutines/y;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/y.smali b/com.discord/smali_classes2/kotlinx/coroutines/y.smali
index 337d4eb941..d0c16037e0 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/y.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/y.smali
@@ -10,7 +10,7 @@
 .method public constructor <init>()V
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/c;->bkh:Lkotlin/coroutines/c$a;
+    sget-object v0, Lkotlin/coroutines/c;->bkB:Lkotlin/coroutines/c$a;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -100,7 +100,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/coroutines/c;->bkh:Lkotlin/coroutines/c$a;
+    sget-object v0, Lkotlin/coroutines/c;->bkB:Lkotlin/coroutines/c$a;
 
     if-ne p1, v0, :cond_0
 
@@ -133,11 +133,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/coroutines/c;->bkh:Lkotlin/coroutines/c$a;
+    sget-object v0, Lkotlin/coroutines/c;->bkB:Lkotlin/coroutines/c$a;
 
     if-ne p1, v0, :cond_0
 
-    sget-object p1, Lkotlin/coroutines/d;->bkk:Lkotlin/coroutines/d;
+    sget-object p1, Lkotlin/coroutines/d;->bkE:Lkotlin/coroutines/d;
 
     check-cast p1, Lkotlin/coroutines/CoroutineContext;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/z.smali b/com.discord/smali_classes2/kotlinx/coroutines/z.smali
index 42ad27fb53..d98adbd3cd 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/z.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/z.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bmy:Ljava/util/List;
+.field private static final bmS:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/z;->bmy:Ljava/util/List;
+    sput-object v0, Lkotlinx/coroutines/z;->bmS:Ljava/util/List;
 
     return-void
 .end method
@@ -55,7 +55,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/z;->bmy:Ljava/util/List;
+    sget-object v0, Lkotlinx/coroutines/z;->bmS:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/kotterknife/a.smali b/com.discord/smali_classes2/kotterknife/a.smali
index bc24f09487..34c88e2bb0 100644
--- a/com.discord/smali_classes2/kotterknife/a.smali
+++ b/com.discord/smali_classes2/kotterknife/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bpH:Lkotterknife/a;
+.field public static final bqb:Lkotterknife/a;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotterknife/a;-><init>()V
 
-    sput-object v0, Lkotterknife/a;->bpH:Lkotterknife/a;
+    sput-object v0, Lkotterknife/a;->bqb:Lkotterknife/a;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotterknife/d;->bpP:Lkotterknife/d;
+    sget-object v0, Lkotterknife/d;->bqj:Lkotterknife/d;
 
     invoke-static {p0}, Lkotterknife/d;->reset(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/kotterknife/b$d.smali b/com.discord/smali_classes2/kotterknife/b$d.smali
index f42469ffd0..45f21b9e20 100644
--- a/com.discord/smali_classes2/kotterknife/b$d.smali
+++ b/com.discord/smali_classes2/kotterknife/b$d.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final bpI:Lkotterknife/b$d;
+.field public static final bqc:Lkotterknife/b$d;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$d;-><init>()V
 
-    sput-object v0, Lkotterknife/b$d;->bpI:Lkotterknife/b$d;
+    sput-object v0, Lkotterknife/b$d;->bqc:Lkotterknife/b$d;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotterknife/b$e.smali b/com.discord/smali_classes2/kotterknife/b$e.smali
index 8e69a1fd21..0b2d9f2daf 100644
--- a/com.discord/smali_classes2/kotterknife/b$e.smali
+++ b/com.discord/smali_classes2/kotterknife/b$e.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final bpJ:Lkotterknife/b$e;
+.field public static final bqd:Lkotterknife/b$e;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$e;-><init>()V
 
-    sput-object v0, Lkotterknife/b$e;->bpJ:Lkotterknife/b$e;
+    sput-object v0, Lkotterknife/b$e;->bqd:Lkotterknife/b$e;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotterknife/b$f.smali b/com.discord/smali_classes2/kotterknife/b$f.smali
index f5be9bd53d..5a6ec0b8be 100644
--- a/com.discord/smali_classes2/kotterknife/b$f.smali
+++ b/com.discord/smali_classes2/kotterknife/b$f.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final bpK:Lkotterknife/b$f;
+.field public static final bqe:Lkotterknife/b$f;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$f;-><init>()V
 
-    sput-object v0, Lkotterknife/b$f;->bpK:Lkotterknife/b$f;
+    sput-object v0, Lkotterknife/b$f;->bqe:Lkotterknife/b$f;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotterknife/b$g.smali b/com.discord/smali_classes2/kotterknife/b$g.smali
index 5dc4951ea9..7658c99f3c 100644
--- a/com.discord/smali_classes2/kotterknife/b$g.smali
+++ b/com.discord/smali_classes2/kotterknife/b$g.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final bpL:Lkotterknife/b$g;
+.field public static final bqf:Lkotterknife/b$g;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$g;-><init>()V
 
-    sput-object v0, Lkotterknife/b$g;->bpL:Lkotterknife/b$g;
+    sput-object v0, Lkotterknife/b$g;->bqf:Lkotterknife/b$g;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotterknife/b.smali b/com.discord/smali_classes2/kotterknife/b.smali
index a0e811133a..51deaf619f 100644
--- a/com.discord/smali_classes2/kotterknife/b.smali
+++ b/com.discord/smali_classes2/kotterknife/b.smali
@@ -61,7 +61,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$e;->bpJ:Lkotterknife/b$e;
+    sget-object p0, Lkotterknife/b$e;->bqd:Lkotterknife/b$e;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -98,7 +98,7 @@
 
     invoke-static {p1, p0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$e;->bpJ:Lkotterknife/b$e;
+    sget-object p0, Lkotterknife/b$e;->bqd:Lkotterknife/b$e;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -135,7 +135,7 @@
 
     invoke-static {p1, p0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$f;->bpK:Lkotterknife/b$f;
+    sget-object p0, Lkotterknife/b$f;->bqe:Lkotterknife/b$f;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -167,7 +167,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$g;->bpL:Lkotterknife/b$g;
+    sget-object p0, Lkotterknife/b$g;->bqf:Lkotterknife/b$g;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -204,7 +204,7 @@
 
     invoke-static {p1, p0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$g;->bpL:Lkotterknife/b$g;
+    sget-object p0, Lkotterknife/b$g;->bqf:Lkotterknife/b$g;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -337,7 +337,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$f;->bpK:Lkotterknife/b$f;
+    sget-object p0, Lkotterknife/b$f;->bqe:Lkotterknife/b$f;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -369,7 +369,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$d;->bpI:Lkotterknife/b$d;
+    sget-object p0, Lkotterknife/b$d;->bqc:Lkotterknife/b$d;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -401,7 +401,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$f;->bpK:Lkotterknife/b$f;
+    sget-object p0, Lkotterknife/b$f;->bqe:Lkotterknife/b$f;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
diff --git a/com.discord/smali_classes2/kotterknife/c$a.smali b/com.discord/smali_classes2/kotterknife/c$a.smali
index 4cae4aa302..e2c7a77ad4 100644
--- a/com.discord/smali_classes2/kotterknife/c$a.smali
+++ b/com.discord/smali_classes2/kotterknife/c$a.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final bpN:Lkotterknife/c$a;
+.field public static final bqh:Lkotterknife/c$a;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lkotterknife/c$a;-><init>()V
 
-    sput-object v0, Lkotterknife/c$a;->bpN:Lkotterknife/c$a;
+    sput-object v0, Lkotterknife/c$a;->bqh:Lkotterknife/c$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotterknife/c.smali b/com.discord/smali_classes2/kotterknife/c.smali
index 55ef727dc8..f2dc03abd3 100644
--- a/com.discord/smali_classes2/kotterknife/c.smali
+++ b/com.discord/smali_classes2/kotterknife/c.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field private final bpM:Lkotlin/jvm/functions/Function2;
+.field private final bqg:Lkotlin/jvm/functions/Function2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function2<",
@@ -61,9 +61,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotterknife/c;->bpM:Lkotlin/jvm/functions/Function2;
+    iput-object p1, p0, Lkotterknife/c;->bqg:Lkotlin/jvm/functions/Function2;
 
-    sget-object p1, Lkotterknife/c$a;->bpN:Lkotterknife/c$a;
+    sget-object p1, Lkotterknife/c$a;->bqh:Lkotterknife/c$a;
 
     iput-object p1, p0, Lkotterknife/c;->value:Ljava/lang/Object;
 
@@ -88,7 +88,7 @@
 
     iget-object v0, p0, Lkotterknife/c;->value:Ljava/lang/Object;
 
-    sget-object v1, Lkotterknife/c$a;->bpN:Lkotterknife/c$a;
+    sget-object v1, Lkotterknife/c$a;->bqh:Lkotterknife/c$a;
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/k;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -96,7 +96,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotterknife/c;->bpM:Lkotlin/jvm/functions/Function2;
+    iget-object v0, p0, Lkotterknife/c;->bqg:Lkotlin/jvm/functions/Function2;
 
     invoke-interface {v0, p1, p2}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -104,7 +104,7 @@
 
     iput-object p2, p0, Lkotterknife/c;->value:Ljava/lang/Object;
 
-    sget-object p2, Lkotterknife/d;->bpP:Lkotterknife/d;
+    sget-object p2, Lkotterknife/d;->bqj:Lkotterknife/d;
 
     invoke-static {p1, p0}, Lkotterknife/d;->a(Ljava/lang/Object;Lkotterknife/c;)V
 
diff --git a/com.discord/smali_classes2/kotterknife/d.smali b/com.discord/smali_classes2/kotterknife/d.smali
index 51ee9a7236..dee721e763 100644
--- a/com.discord/smali_classes2/kotterknife/d.smali
+++ b/com.discord/smali_classes2/kotterknife/d.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bpO:Ljava/util/WeakHashMap;
+.field private static final bqi:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field public static final bpP:Lkotterknife/d;
+.field public static final bqj:Lkotterknife/d;
 
 
 # direct methods
@@ -27,13 +27,13 @@
 
     invoke-direct {v0}, Lkotterknife/d;-><init>()V
 
-    sput-object v0, Lkotterknife/d;->bpP:Lkotterknife/d;
+    sput-object v0, Lkotterknife/d;->bqj:Lkotterknife/d;
 
     new-instance v0, Ljava/util/WeakHashMap;
 
     invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
 
-    sput-object v0, Lkotterknife/d;->bpO:Ljava/util/WeakHashMap;
+    sput-object v0, Lkotterknife/d;->bqi:Ljava/util/WeakHashMap;
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotterknife/d;->bpO:Ljava/util/WeakHashMap;
+    sget-object v0, Lkotterknife/d;->bqi:Ljava/util/WeakHashMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -99,7 +99,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/k;->h(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotterknife/d;->bpO:Ljava/util/WeakHashMap;
+    sget-object v0, Lkotterknife/d;->bqi:Ljava/util/WeakHashMap;
 
     invoke-virtual {v0, p0}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -128,14 +128,14 @@
 
     check-cast v1, Lkotterknife/c;
 
-    sget-object v2, Lkotterknife/c$a;->bpN:Lkotterknife/c$a;
+    sget-object v2, Lkotterknife/c$a;->bqh:Lkotterknife/c$a;
 
     iput-object v2, v1, Lkotterknife/c;->value:Ljava/lang/Object;
 
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lkotterknife/d;->bpO:Ljava/util/WeakHashMap;
+    sget-object v0, Lkotterknife/d;->bqi:Ljava/util/WeakHashMap;
 
     invoke-virtual {v0, p0}, Ljava/util/WeakHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/okhttp3/Headers$a.smali b/com.discord/smali_classes2/okhttp3/Headers$a.smali
index 21e59c25a3..0243a9a2ff 100644
--- a/com.discord/smali_classes2/okhttp3/Headers$a.smali
+++ b/com.discord/smali_classes2/okhttp3/Headers$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final btG:Ljava/util/List;
+.field final bua:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -38,14 +38,14 @@
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object v0, p0, Lokhttp3/Headers$a;->btG:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/Headers$a;->bua:Ljava/util/List;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final GA()Lokhttp3/Headers;
+.method public final Gp()Lokhttp3/Headers;
     .locals 1
 
     new-instance v0, Lokhttp3/Headers;
@@ -58,7 +58,7 @@
 .method public final ak(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
     .locals 0
 
-    invoke-static {p1}, Lokhttp3/Headers;->ee(Ljava/lang/String;)V
+    invoke-static {p1}, Lokhttp3/Headers;->dY(Ljava/lang/String;)V
 
     invoke-static {p2, p1}, Lokhttp3/Headers;->aj(Ljava/lang/String;Ljava/lang/String;)V
 
@@ -72,11 +72,11 @@
 .method final al(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Headers$a;->btG:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/Headers$a;->bua:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lokhttp3/Headers$a;->btG:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/Headers$a;->bua:Ljava/util/List;
 
     invoke-virtual {p2}, Ljava/lang/String;->trim()Ljava/lang/String;
 
@@ -90,24 +90,24 @@
 .method public final am(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
     .locals 0
 
-    invoke-static {p1}, Lokhttp3/Headers;->ee(Ljava/lang/String;)V
+    invoke-static {p1}, Lokhttp3/Headers;->dY(Ljava/lang/String;)V
 
     invoke-static {p2, p1}, Lokhttp3/Headers;->aj(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p0, p1}, Lokhttp3/Headers$a;->ef(Ljava/lang/String;)Lokhttp3/Headers$a;
+    invoke-virtual {p0, p1}, Lokhttp3/Headers$a;->dZ(Ljava/lang/String;)Lokhttp3/Headers$a;
 
     invoke-virtual {p0, p1, p2}, Lokhttp3/Headers$a;->al(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
     return-object p0
 .end method
 
-.method public final ef(Ljava/lang/String;)Lokhttp3/Headers$a;
+.method public final dZ(Ljava/lang/String;)Lokhttp3/Headers$a;
     .locals 2
 
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/Headers$a;->btG:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->bua:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -115,7 +115,7 @@
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/Headers$a;->btG:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->bua:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -129,11 +129,11 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/Headers$a;->btG:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->bua:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
-    iget-object v1, p0, Lokhttp3/Headers$a;->btG:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->bua:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/okhttp3/a/a$a.smali b/com.discord/smali_classes2/okhttp3/a/a$a.smali
index 5d8c05130f..4ba3b3fc68 100644
--- a/com.discord/smali_classes2/okhttp3/a/a$a.smali
+++ b/com.discord/smali_classes2/okhttp3/a/a$a.smali
@@ -23,15 +23,15 @@
 
 
 # static fields
-.field public static final bAW:I = 0x1
+.field public static final bBq:I = 0x1
 
-.field public static final bAX:I = 0x2
+.field public static final bBr:I = 0x2
 
-.field public static final bAY:I = 0x3
+.field public static final bBs:I = 0x3
 
-.field public static final bAZ:I = 0x4
+.field public static final bBt:I = 0x4
 
-.field private static final synthetic bBa:[I
+.field private static final synthetic bBu:[I
 
 
 # direct methods
@@ -42,31 +42,31 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lokhttp3/a/a$a;->bAW:I
+    sget v1, Lokhttp3/a/a$a;->bBq:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lokhttp3/a/a$a;->bAX:I
+    sget v1, Lokhttp3/a/a$a;->bBr:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lokhttp3/a/a$a;->bAY:I
+    sget v1, Lokhttp3/a/a$a;->bBs:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lokhttp3/a/a$a;->bAZ:I
+    sget v1, Lokhttp3/a/a$a;->bBt:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lokhttp3/a/a$a;->bBa:[I
+    sput-object v0, Lokhttp3/a/a$a;->bBu:[I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/a/a$b$1.smali b/com.discord/smali_classes2/okhttp3/a/a$b$1.smali
index 5db514b8b3..98526a627b 100644
--- a/com.discord/smali_classes2/okhttp3/a/a$b$1.smali
+++ b/com.discord/smali_classes2/okhttp3/a/a$b$1.smali
@@ -31,7 +31,7 @@
 .method public final log(Ljava/lang/String;)V
     .locals 3
 
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/okhttp3/a/a$b.smali b/com.discord/smali_classes2/okhttp3/a/a$b.smali
index 145f558c22..e99e37b9b6 100644
--- a/com.discord/smali_classes2/okhttp3/a/a$b.smali
+++ b/com.discord/smali_classes2/okhttp3/a/a$b.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final bBb:Lokhttp3/a/a$b;
+.field public static final bBv:Lokhttp3/a/a$b;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lokhttp3/a/a$b$1;-><init>()V
 
-    sput-object v0, Lokhttp3/a/a$b;->bBb:Lokhttp3/a/a$b;
+    sput-object v0, Lokhttp3/a/a$b;->bBv:Lokhttp3/a/a$b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/a/a.smali b/com.discord/smali_classes2/okhttp3/a/a.smali
index 1aa24e3824..3f38cc80c0 100644
--- a/com.discord/smali_classes2/okhttp3/a/a.smali
+++ b/com.discord/smali_classes2/okhttp3/a/a.smali
@@ -16,13 +16,13 @@
 
 
 # static fields
-.field private static final bAS:Ljava/nio/charset/Charset;
+.field private static final bBm:Ljava/nio/charset/Charset;
 
 
 # instance fields
-.field private final bAT:Lokhttp3/a/a$b;
+.field private final bBn:Lokhttp3/a/a$b;
 
-.field private volatile bAU:Ljava/util/Set;
+.field private volatile bBo:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private volatile bAV:I
+.field public volatile bBp:I
 
 
 # direct methods
@@ -45,7 +45,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/a/a;->bAS:Ljava/nio/charset/Charset;
+    sput-object v0, Lokhttp3/a/a;->bBm:Ljava/nio/charset/Charset;
 
     return-void
 .end method
@@ -53,7 +53,7 @@
 .method public constructor <init>()V
     .locals 1
 
-    sget-object v0, Lokhttp3/a/a$b;->bBb:Lokhttp3/a/a$b;
+    sget-object v0, Lokhttp3/a/a$b;->bBv:Lokhttp3/a/a$b;
 
     invoke-direct {p0, v0}, Lokhttp3/a/a;-><init>(Lokhttp3/a/a$b;)V
 
@@ -69,13 +69,13 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/a/a;->bAU:Ljava/util/Set;
+    iput-object v0, p0, Lokhttp3/a/a;->bBo:Ljava/util/Set;
 
-    sget v0, Lokhttp3/a/a$a;->bAW:I
+    sget v0, Lokhttp3/a/a$a;->bBq:I
 
-    iput v0, p0, Lokhttp3/a/a;->bAV:I
+    iput v0, p0, Lokhttp3/a/a;->bBp:I
 
-    iput-object p1, p0, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iput-object p1, p0, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     return-void
 .end method
@@ -83,9 +83,9 @@
 .method private a(Lokhttp3/Headers;I)V
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/a/a;->bAU:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/a/a;->bBo:Ljava/util/Set;
 
-    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dz(I)Ljava/lang/String;
+    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dw(I)Ljava/lang/String;
 
     move-result-object v1
 
@@ -100,18 +100,18 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dA(I)Ljava/lang/String;
+    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dx(I)Ljava/lang/String;
 
     move-result-object v0
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v1, p0, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
     invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dz(I)Ljava/lang/String;
+    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dw(I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -177,7 +177,7 @@
 
     if-ge p0, v1, :cond_d
 
-    invoke-virtual {v7}, Lokio/c;->Iu()Z
+    invoke-virtual {v7}, Lokio/c;->Ih()Z
 
     move-result v1
 
@@ -442,25 +442,6 @@
 
 
 # virtual methods
-.method public final dO(I)Lokhttp3/a/a;
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iput p1, p0, Lokhttp3/a/a;->bAV:I
-
-    return-object p0
-
-    :cond_0
-    new-instance p1, Ljava/lang/NullPointerException;
-
-    const-string v0, "level == null. Use Level.NONE instead."
-
-    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
 .method public final intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
     .locals 20
     .annotation system Ldalvik/annotation/Throws;
@@ -473,13 +454,13 @@
 
     move-object/from16 v0, p1
 
-    iget v2, v1, Lokhttp3/a/a;->bAV:I
+    iget v2, v1, Lokhttp3/a/a;->bBp:I
 
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GL()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GA()Lokhttp3/w;
 
     move-result-object v3
 
-    sget v4, Lokhttp3/a/a$a;->bAW:I
+    sget v4, Lokhttp3/a/a$a;->bBq:I
 
     if-ne v2, v4, :cond_0
 
@@ -490,7 +471,7 @@
     return-object v0
 
     :cond_0
-    sget v4, Lokhttp3/a/a$a;->bAZ:I
+    sget v4, Lokhttp3/a/a$a;->bBt:I
 
     const/4 v5, 0x1
 
@@ -506,7 +487,7 @@
     :goto_0
     if-nez v4, :cond_3
 
-    sget v7, Lokhttp3/a/a$a;->bAY:I
+    sget v7, Lokhttp3/a/a$a;->bBs:I
 
     if-ne v2, v7, :cond_2
 
@@ -522,7 +503,7 @@
     const/4 v2, 0x1
 
     :goto_2
-    iget-object v7, v3, Lokhttp3/w;->buk:Lokhttp3/RequestBody;
+    iget-object v7, v3, Lokhttp3/w;->buE:Lokhttp3/RequestBody;
 
     if-eqz v7, :cond_4
 
@@ -532,7 +513,7 @@
     const/4 v5, 0x0
 
     :goto_3
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GM()Lokhttp3/i;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GB()Lokhttp3/i;
 
     move-result-object v8
 
@@ -550,7 +531,7 @@
 
     invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v11, v3, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v11, v3, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-virtual {v9, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -564,7 +545,7 @@
 
     invoke-direct {v13, v11}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-interface {v8}, Lokhttp3/i;->Gs()Lokhttp3/u;
+    invoke-interface {v8}, Lokhttp3/i;->Gh()Lokhttp3/u;
 
     move-result-object v8
 
@@ -622,7 +603,7 @@
     move-object/from16 v16, v11
 
     :goto_5
-    iget-object v10, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v10, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     invoke-interface {v10, v8}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
@@ -640,7 +621,7 @@
 
     if-eqz v14, :cond_7
 
-    iget-object v14, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v14, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     new-instance v6, Ljava/lang/StringBuilder;
 
@@ -669,7 +650,7 @@
 
     if-eqz v6, :cond_8
 
-    iget-object v6, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v6, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     new-instance v14, Ljava/lang/StringBuilder;
 
@@ -690,9 +671,9 @@
     invoke-interface {v6, v10}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
     :cond_8
-    iget-object v6, v3, Lokhttp3/w;->buj:Lokhttp3/Headers;
+    iget-object v6, v3, Lokhttp3/w;->buD:Lokhttp3/Headers;
 
-    iget-object v10, v6, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v10, v6, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     array-length v10, v10
 
@@ -703,7 +684,7 @@
     :goto_6
     if-ge v11, v10, :cond_a
 
-    invoke-virtual {v6, v11}, Lokhttp3/Headers;->dz(I)Ljava/lang/String;
+    invoke-virtual {v6, v11}, Lokhttp3/Headers;->dw(I)Ljava/lang/String;
 
     move-result-object v14
 
@@ -740,7 +721,7 @@
     goto/16 :goto_7
 
     :cond_b
-    iget-object v5, v3, Lokhttp3/w;->buj:Lokhttp3/Headers;
+    iget-object v5, v3, Lokhttp3/w;->buD:Lokhttp3/Headers;
 
     invoke-static {v5}, Lokhttp3/a/a;->d(Lokhttp3/Headers;)Z
 
@@ -748,7 +729,7 @@
 
     if-eqz v5, :cond_c
 
-    iget-object v5, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     new-instance v7, Ljava/lang/StringBuilder;
 
@@ -777,7 +758,7 @@
 
     invoke-virtual {v7, v5}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
 
-    sget-object v10, Lokhttp3/a/a;->bAS:Ljava/nio/charset/Charset;
+    sget-object v10, Lokhttp3/a/a;->bBm:Ljava/nio/charset/Charset;
 
     invoke-virtual {v7}, Lokhttp3/RequestBody;->contentType()Lokhttp3/MediaType;
 
@@ -785,14 +766,14 @@
 
     if-eqz v11, :cond_d
 
-    sget-object v10, Lokhttp3/a/a;->bAS:Ljava/nio/charset/Charset;
+    sget-object v10, Lokhttp3/a/a;->bBm:Ljava/nio/charset/Charset;
 
     invoke-virtual {v11, v10}, Lokhttp3/MediaType;->b(Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
 
     move-result-object v10
 
     :cond_d
-    iget-object v11, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v11, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     invoke-interface {v11, v12}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
@@ -802,7 +783,7 @@
 
     if-eqz v11, :cond_e
 
-    iget-object v11, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v11, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     invoke-virtual {v5, v10}, Lokio/c;->c(Ljava/nio/charset/Charset;)Ljava/lang/String;
 
@@ -810,7 +791,7 @@
 
     invoke-interface {v11, v5}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
-    iget-object v5, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     new-instance v10, Ljava/lang/StringBuilder;
 
@@ -839,7 +820,7 @@
     goto :goto_8
 
     :cond_e
-    iget-object v5, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     new-instance v10, Ljava/lang/StringBuilder;
 
@@ -871,7 +852,7 @@
 
     :cond_f
     :goto_7
-    iget-object v5, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     new-instance v7, Ljava/lang/StringBuilder;
 
@@ -912,7 +893,7 @@
 
     move-result-wide v5
 
-    iget-object v3, v0, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v3, v0, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     invoke-virtual {v3}, Lokhttp3/x;->contentLength()J
 
@@ -944,7 +925,7 @@
     const-string v7, "unknown-length"
 
     :goto_9
-    iget-object v14, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v14, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     new-instance v15, Ljava/lang/StringBuilder;
 
@@ -996,9 +977,9 @@
 
     invoke-virtual {v15, v9}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v9, v0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v9, v0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    iget-object v9, v9, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v9, v9, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-virtual {v15, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1048,9 +1029,9 @@
 
     if-eqz v2, :cond_1e
 
-    iget-object v2, v0, Lokhttp3/Response;->buj:Lokhttp3/Headers;
+    iget-object v2, v0, Lokhttp3/Response;->buD:Lokhttp3/Headers;
 
-    iget-object v5, v2, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v5, v2, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     array-length v5, v5
 
@@ -1079,7 +1060,7 @@
     goto/16 :goto_f
 
     :cond_15
-    iget-object v4, v0, Lokhttp3/Response;->buj:Lokhttp3/Headers;
+    iget-object v4, v0, Lokhttp3/Response;->buD:Lokhttp3/Headers;
 
     invoke-static {v4}, Lokhttp3/a/a;->d(Lokhttp3/Headers;)Z
 
@@ -1087,7 +1068,7 @@
 
     if-eqz v4, :cond_16
 
-    iget-object v2, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     const-string v3, "<-- END HTTP (encoded body omitted)"
 
@@ -1096,7 +1077,7 @@
     goto/16 :goto_10
 
     :cond_16
-    invoke-virtual {v3}, Lokhttp3/x;->Hf()Lokio/d;
+    invoke-virtual {v3}, Lokhttp3/x;->GS()Lokio/d;
 
     move-result-object v4
 
@@ -1104,7 +1085,7 @@
 
     invoke-interface {v4, v5, v6}, Lokio/d;->request(J)Z
 
-    invoke-interface {v4}, Lokio/d;->Ir()Lokio/c;
+    invoke-interface {v4}, Lokio/d;->Ie()Lokio/c;
 
     move-result-object v4
 
@@ -1133,7 +1114,7 @@
     :try_start_1
     new-instance v6, Lokio/h;
 
-    invoke-virtual {v4}, Lokio/c;->ID()Lokio/c;
+    invoke-virtual {v4}, Lokio/c;->Iq()Lokio/c;
 
     move-result-object v4
 
@@ -1176,7 +1157,7 @@
     move-object v2, v5
 
     :goto_e
-    sget-object v5, Lokhttp3/a/a;->bAS:Ljava/nio/charset/Charset;
+    sget-object v5, Lokhttp3/a/a;->bBm:Ljava/nio/charset/Charset;
 
     invoke-virtual {v3}, Lokhttp3/x;->contentType()Lokhttp3/MediaType;
 
@@ -1184,7 +1165,7 @@
 
     if-eqz v3, :cond_19
 
-    sget-object v5, Lokhttp3/a/a;->bAS:Ljava/nio/charset/Charset;
+    sget-object v5, Lokhttp3/a/a;->bBm:Ljava/nio/charset/Charset;
 
     invoke-virtual {v3, v5}, Lokhttp3/MediaType;->b(Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
 
@@ -1197,11 +1178,11 @@
 
     if-nez v3, :cond_1a
 
-    iget-object v2, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     invoke-interface {v2, v12}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
-    iget-object v2, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -1230,13 +1211,13 @@
 
     if-eqz v3, :cond_1b
 
-    iget-object v3, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v3, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     invoke-interface {v3, v12}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
-    iget-object v3, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v3, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
-    invoke-virtual {v4}, Lokio/c;->ID()Lokio/c;
+    invoke-virtual {v4}, Lokio/c;->Iq()Lokio/c;
 
     move-result-object v6
 
@@ -1251,7 +1232,7 @@
 
     if-eqz v2, :cond_1c
 
-    iget-object v5, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     new-instance v6, Ljava/lang/StringBuilder;
 
@@ -1280,7 +1261,7 @@
     goto :goto_10
 
     :cond_1c
-    iget-object v2, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     new-instance v5, Ljava/lang/StringBuilder;
 
@@ -1304,7 +1285,7 @@
 
     :cond_1d
     :goto_f
-    iget-object v2, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     const-string v3, "<-- END HTTP"
 
@@ -1319,7 +1300,7 @@
 
     move-object v2, v0
 
-    iget-object v0, v1, Lokhttp3/a/a;->bAT:Lokhttp3/a/a$b;
+    iget-object v0, v1, Lokhttp3/a/a;->bBn:Lokhttp3/a/a$b;
 
     invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/okhttp3/b.smali b/com.discord/smali_classes2/okhttp3/b.smali
index 306f89f866..6e7aedbbdc 100644
--- a/com.discord/smali_classes2/okhttp3/b.smali
+++ b/com.discord/smali_classes2/okhttp3/b.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bpY:Lokhttp3/b;
+.field public static final bqs:Lokhttp3/b;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/b$1;-><init>()V
 
-    sput-object v0, Lokhttp3/b;->bpY:Lokhttp3/b;
+    sput-object v0, Lokhttp3/b;->bqs:Lokhttp3/b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/c.smali b/com.discord/smali_classes2/okhttp3/c.smali
index 36062d0cb8..ba3814c8f3 100644
--- a/com.discord/smali_classes2/okhttp3/c.smali
+++ b/com.discord/smali_classes2/okhttp3/c.smali
@@ -8,9 +8,9 @@
 
 
 # instance fields
-.field final bpZ:Lokhttp3/internal/a/e;
+.field final bqt:Lokhttp3/internal/a/e;
 
-.field final bqa:Lokhttp3/internal/a/d;
+.field final bqu:Lokhttp3/internal/a/d;
 
 
 # virtual methods
@@ -22,7 +22,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/c;->bqa:Lokhttp3/internal/a/d;
+    iget-object v0, p0, Lokhttp3/c;->bqu:Lokhttp3/internal/a/d;
 
     invoke-virtual {v0}, Lokhttp3/internal/a/d;->close()V
 
@@ -37,7 +37,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/c;->bqa:Lokhttp3/internal/a/d;
+    iget-object v0, p0, Lokhttp3/c;->bqu:Lokhttp3/internal/a/d;
 
     invoke-virtual {v0}, Lokhttp3/internal/a/d;->flush()V
 
diff --git a/com.discord/smali_classes2/okhttp3/d$a.smali b/com.discord/smali_classes2/okhttp3/d$a.smali
index c8c420ebcb..56b6bdc7dd 100644
--- a/com.discord/smali_classes2/okhttp3/d$a.smali
+++ b/com.discord/smali_classes2/okhttp3/d$a.smali
@@ -15,19 +15,19 @@
 
 
 # instance fields
-.field bqd:Z
+.field bqE:I
 
-.field bqe:Z
+.field bqF:I
 
-.field bqf:I
+.field bqG:Z
 
-.field bqk:I
+.field bqH:Z
 
-.field bql:I
+.field bqx:Z
 
-.field bqm:Z
+.field bqy:Z
 
-.field bqn:Z
+.field bqz:I
 
 .field immutable:Z
 
@@ -40,18 +40,18 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lokhttp3/d$a;->bqf:I
+    iput v0, p0, Lokhttp3/d$a;->bqz:I
 
-    iput v0, p0, Lokhttp3/d$a;->bqk:I
+    iput v0, p0, Lokhttp3/d$a;->bqE:I
 
-    iput v0, p0, Lokhttp3/d$a;->bql:I
+    iput v0, p0, Lokhttp3/d$a;->bqF:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Gq()Lokhttp3/d;
+.method public final Gf()Lokhttp3/d;
     .locals 1
 
     new-instance v0, Lokhttp3/d;
diff --git a/com.discord/smali_classes2/okhttp3/g$a.smali b/com.discord/smali_classes2/okhttp3/g$a.smali
index 9d04041712..3c6f111305 100644
--- a/com.discord/smali_classes2/okhttp3/g$a.smali
+++ b/com.discord/smali_classes2/okhttp3/g$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final bhY:Ljava/util/List;
+.field final bis:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -36,7 +36,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/g$a;->bhY:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/g$a;->bis:Ljava/util/List;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/g$b.smali b/com.discord/smali_classes2/okhttp3/g$b.smali
index ed7f316a91..67b430043e 100644
--- a/com.discord/smali_classes2/okhttp3/g$b.smali
+++ b/com.discord/smali_classes2/okhttp3/g$b.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field final bqs:Ljava/lang/String;
+.field final bqM:Ljava/lang/String;
 
-.field final bqt:Ljava/lang/String;
+.field final bqN:Ljava/lang/String;
 
-.field final bqu:Lokio/ByteString;
+.field final bqO:Lokio/ByteString;
 
 .field final pattern:Ljava/lang/String;
 
@@ -44,9 +44,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/g$b;->bqt:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/g$b;->bqN:Ljava/lang/String;
 
-    iget-object v1, p1, Lokhttp3/g$b;->bqt:Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/g$b;->bqN:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -54,9 +54,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/g$b;->bqu:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/g$b;->bqO:Lokio/ByteString;
 
-    iget-object p1, p1, Lokhttp3/g$b;->bqu:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/g$b;->bqO:Lokio/ByteString;
 
     invoke-virtual {v0, p1}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -87,7 +87,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/g$b;->bqt:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/g$b;->bqN:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
@@ -97,7 +97,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/g$b;->bqu:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/g$b;->bqO:Lokio/ByteString;
 
     invoke-virtual {v1}, Lokio/ByteString;->hashCode()I
 
@@ -115,13 +115,13 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/g$b;->bqt:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/g$b;->bqN:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/g$b;->bqu:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/g$b;->bqO:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->IG()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->It()Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/okhttp3/h.smali b/com.discord/smali_classes2/okhttp3/h.smali
index 69b8fc5aab..ad359e98d1 100644
--- a/com.discord/smali_classes2/okhttp3/h.smali
+++ b/com.discord/smali_classes2/okhttp3/h.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final aSR:Ljava/util/Map;
+.field private static final aTj:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,37 +15,15 @@
     .end annotation
 .end field
 
-.field public static final bqA:Lokhttp3/h;
-
-.field public static final bqB:Lokhttp3/h;
-
-.field public static final bqC:Lokhttp3/h;
-
-.field public static final bqD:Lokhttp3/h;
-
-.field public static final bqE:Lokhttp3/h;
-
-.field public static final bqF:Lokhttp3/h;
-
-.field public static final bqG:Lokhttp3/h;
-
-.field public static final bqH:Lokhttp3/h;
-
-.field public static final bqI:Lokhttp3/h;
-
-.field public static final bqJ:Lokhttp3/h;
-
-.field public static final bqK:Lokhttp3/h;
-
-.field public static final bqL:Lokhttp3/h;
-
-.field public static final bqM:Lokhttp3/h;
-
-.field public static final bqN:Lokhttp3/h;
-
-.field public static final bqO:Lokhttp3/h;
-
-.field public static final bqP:Lokhttp3/h;
+.field static final bqP:Ljava/util/Comparator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Comparator<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field public static final bqQ:Lokhttp3/h;
 
@@ -67,24 +45,6 @@
 
 .field public static final bqZ:Lokhttp3/h;
 
-.field static final bqv:Ljava/util/Comparator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Comparator<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final bqw:Lokhttp3/h;
-
-.field public static final bqx:Lokhttp3/h;
-
-.field public static final bqy:Lokhttp3/h;
-
-.field public static final bqz:Lokhttp3/h;
-
 .field public static final brA:Lokhttp3/h;
 
 .field public static final brB:Lokhttp3/h;
@@ -211,6 +171,36 @@
 
 .field public static final bsK:Lokhttp3/h;
 
+.field public static final bsL:Lokhttp3/h;
+
+.field public static final bsM:Lokhttp3/h;
+
+.field public static final bsN:Lokhttp3/h;
+
+.field public static final bsO:Lokhttp3/h;
+
+.field public static final bsP:Lokhttp3/h;
+
+.field public static final bsQ:Lokhttp3/h;
+
+.field public static final bsR:Lokhttp3/h;
+
+.field public static final bsS:Lokhttp3/h;
+
+.field public static final bsT:Lokhttp3/h;
+
+.field public static final bsU:Lokhttp3/h;
+
+.field public static final bsV:Lokhttp3/h;
+
+.field public static final bsW:Lokhttp3/h;
+
+.field public static final bsX:Lokhttp3/h;
+
+.field public static final bsY:Lokhttp3/h;
+
+.field public static final bsZ:Lokhttp3/h;
+
 .field public static final bsa:Lokhttp3/h;
 
 .field public static final bsb:Lokhttp3/h;
@@ -263,6 +253,16 @@
 
 .field public static final bsz:Lokhttp3/h;
 
+.field public static final bta:Lokhttp3/h;
+
+.field public static final btb:Lokhttp3/h;
+
+.field public static final btc:Lokhttp3/h;
+
+.field public static final btd:Lokhttp3/h;
+
+.field public static final bte:Lokhttp3/h;
+
 
 # instance fields
 .field final javaName:Ljava/lang/String;
@@ -276,966 +276,966 @@
 
     invoke-direct {v0}, Lokhttp3/h$1;-><init>()V
 
-    sput-object v0, Lokhttp3/h;->bqv:Ljava/util/Comparator;
+    sput-object v0, Lokhttp3/h;->bqP:Ljava/util/Comparator;
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
     invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
 
-    sput-object v0, Lokhttp3/h;->aSR:Ljava/util/Map;
+    sput-object v0, Lokhttp3/h;->aTj:Ljava/util/Map;
 
     const-string v0, "SSL_RSA_WITH_NULL_MD5"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqw:Lokhttp3/h;
-
-    const-string v0, "SSL_RSA_WITH_NULL_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqx:Lokhttp3/h;
-
-    const-string v0, "SSL_RSA_EXPORT_WITH_RC4_40_MD5"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqy:Lokhttp3/h;
-
-    const-string v0, "SSL_RSA_WITH_RC4_128_MD5"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqz:Lokhttp3/h;
-
-    const-string v0, "SSL_RSA_WITH_RC4_128_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqA:Lokhttp3/h;
-
-    const-string v0, "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqB:Lokhttp3/h;
-
-    const-string v0, "SSL_RSA_WITH_DES_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqC:Lokhttp3/h;
-
-    const-string v0, "SSL_RSA_WITH_3DES_EDE_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqD:Lokhttp3/h;
-
-    const-string v0, "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqE:Lokhttp3/h;
-
-    const-string v0, "SSL_DHE_DSS_WITH_DES_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqF:Lokhttp3/h;
-
-    const-string v0, "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqG:Lokhttp3/h;
-
-    const-string v0, "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqH:Lokhttp3/h;
-
-    const-string v0, "SSL_DHE_RSA_WITH_DES_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqI:Lokhttp3/h;
-
-    const-string v0, "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqJ:Lokhttp3/h;
-
-    const-string v0, "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqK:Lokhttp3/h;
-
-    const-string v0, "SSL_DH_anon_WITH_RC4_128_MD5"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqL:Lokhttp3/h;
-
-    const-string v0, "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqM:Lokhttp3/h;
-
-    const-string v0, "SSL_DH_anon_WITH_DES_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqN:Lokhttp3/h;
-
-    const-string v0, "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqO:Lokhttp3/h;
-
-    const-string v0, "TLS_KRB5_WITH_DES_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
-
-    move-result-object v0
-
-    sput-object v0, Lokhttp3/h;->bqP:Lokhttp3/h;
-
-    const-string v0, "TLS_KRB5_WITH_3DES_EDE_CBC_SHA"
-
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bqQ:Lokhttp3/h;
 
-    const-string v0, "TLS_KRB5_WITH_RC4_128_SHA"
+    const-string v0, "SSL_RSA_WITH_NULL_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bqR:Lokhttp3/h;
 
-    const-string v0, "TLS_KRB5_WITH_DES_CBC_MD5"
+    const-string v0, "SSL_RSA_EXPORT_WITH_RC4_40_MD5"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bqS:Lokhttp3/h;
 
-    const-string v0, "TLS_KRB5_WITH_3DES_EDE_CBC_MD5"
+    const-string v0, "SSL_RSA_WITH_RC4_128_MD5"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bqT:Lokhttp3/h;
 
-    const-string v0, "TLS_KRB5_WITH_RC4_128_MD5"
+    const-string v0, "SSL_RSA_WITH_RC4_128_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bqU:Lokhttp3/h;
 
-    const-string v0, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA"
+    const-string v0, "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bqV:Lokhttp3/h;
 
-    const-string v0, "TLS_KRB5_EXPORT_WITH_RC4_40_SHA"
+    const-string v0, "SSL_RSA_WITH_DES_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bqW:Lokhttp3/h;
 
-    const-string v0, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5"
+    const-string v0, "SSL_RSA_WITH_3DES_EDE_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bqX:Lokhttp3/h;
 
-    const-string v0, "TLS_KRB5_EXPORT_WITH_RC4_40_MD5"
+    const-string v0, "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bqY:Lokhttp3/h;
 
-    const-string v0, "TLS_RSA_WITH_AES_128_CBC_SHA"
+    const-string v0, "SSL_DHE_DSS_WITH_DES_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bqZ:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA"
+    const-string v0, "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bra:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA"
+    const-string v0, "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brb:Lokhttp3/h;
 
-    const-string v0, "TLS_DH_anon_WITH_AES_128_CBC_SHA"
+    const-string v0, "SSL_DHE_RSA_WITH_DES_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brc:Lokhttp3/h;
 
-    const-string v0, "TLS_RSA_WITH_AES_256_CBC_SHA"
+    const-string v0, "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brd:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA"
+    const-string v0, "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bre:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA"
+    const-string v0, "SSL_DH_anon_WITH_RC4_128_MD5"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brf:Lokhttp3/h;
 
-    const-string v0, "TLS_DH_anon_WITH_AES_256_CBC_SHA"
+    const-string v0, "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brg:Lokhttp3/h;
 
-    const-string v0, "TLS_RSA_WITH_NULL_SHA256"
+    const-string v0, "SSL_DH_anon_WITH_DES_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brh:Lokhttp3/h;
 
-    const-string v0, "TLS_RSA_WITH_AES_128_CBC_SHA256"
+    const-string v0, "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bri:Lokhttp3/h;
 
-    const-string v0, "TLS_RSA_WITH_AES_256_CBC_SHA256"
+    const-string v0, "TLS_KRB5_WITH_DES_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brj:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256"
+    const-string v0, "TLS_KRB5_WITH_3DES_EDE_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brk:Lokhttp3/h;
 
-    const-string v0, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA"
+    const-string v0, "TLS_KRB5_WITH_RC4_128_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brl:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA"
+    const-string v0, "TLS_KRB5_WITH_DES_CBC_MD5"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brm:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA"
+    const-string v0, "TLS_KRB5_WITH_3DES_EDE_CBC_MD5"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brn:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
+    const-string v0, "TLS_KRB5_WITH_RC4_128_MD5"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bro:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256"
+    const-string v0, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brp:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"
+    const-string v0, "TLS_KRB5_EXPORT_WITH_RC4_40_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brq:Lokhttp3/h;
 
-    const-string v0, "TLS_DH_anon_WITH_AES_128_CBC_SHA256"
+    const-string v0, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brr:Lokhttp3/h;
 
-    const-string v0, "TLS_DH_anon_WITH_AES_256_CBC_SHA256"
+    const-string v0, "TLS_KRB5_EXPORT_WITH_RC4_40_MD5"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brs:Lokhttp3/h;
 
-    const-string v0, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA"
+    const-string v0, "TLS_RSA_WITH_AES_128_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brt:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA"
+    const-string v0, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bru:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA"
+    const-string v0, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brv:Lokhttp3/h;
 
-    const-string v0, "TLS_PSK_WITH_RC4_128_SHA"
+    const-string v0, "TLS_DH_anon_WITH_AES_128_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brw:Lokhttp3/h;
 
-    const-string v0, "TLS_PSK_WITH_3DES_EDE_CBC_SHA"
+    const-string v0, "TLS_RSA_WITH_AES_256_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brx:Lokhttp3/h;
 
-    const-string v0, "TLS_PSK_WITH_AES_128_CBC_SHA"
+    const-string v0, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bry:Lokhttp3/h;
 
-    const-string v0, "TLS_PSK_WITH_AES_256_CBC_SHA"
+    const-string v0, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brz:Lokhttp3/h;
 
-    const-string v0, "TLS_RSA_WITH_SEED_CBC_SHA"
+    const-string v0, "TLS_DH_anon_WITH_AES_256_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brA:Lokhttp3/h;
 
-    const-string v0, "TLS_RSA_WITH_AES_128_GCM_SHA256"
+    const-string v0, "TLS_RSA_WITH_NULL_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brB:Lokhttp3/h;
 
-    const-string v0, "TLS_RSA_WITH_AES_256_GCM_SHA384"
+    const-string v0, "TLS_RSA_WITH_AES_128_CBC_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brC:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
+    const-string v0, "TLS_RSA_WITH_AES_256_CBC_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brD:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"
+    const-string v0, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brE:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256"
+    const-string v0, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brF:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384"
+    const-string v0, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brG:Lokhttp3/h;
 
-    const-string v0, "TLS_DH_anon_WITH_AES_128_GCM_SHA256"
+    const-string v0, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brH:Lokhttp3/h;
 
-    const-string v0, "TLS_DH_anon_WITH_AES_256_GCM_SHA384"
+    const-string v0, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brI:Lokhttp3/h;
 
-    const-string v0, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"
+    const-string v0, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brJ:Lokhttp3/h;
 
-    const-string v0, "TLS_FALLBACK_SCSV"
+    const-string v0, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brK:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_ECDSA_WITH_NULL_SHA"
+    const-string v0, "TLS_DH_anon_WITH_AES_128_CBC_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brL:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA"
+    const-string v0, "TLS_DH_anon_WITH_AES_256_CBC_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brM:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"
+    const-string v0, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brN:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA"
+    const-string v0, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brO:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"
+    const-string v0, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brP:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_ECDSA_WITH_NULL_SHA"
+    const-string v0, "TLS_PSK_WITH_RC4_128_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brQ:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA"
+    const-string v0, "TLS_PSK_WITH_3DES_EDE_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brR:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"
+    const-string v0, "TLS_PSK_WITH_AES_128_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brS:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"
+    const-string v0, "TLS_PSK_WITH_AES_256_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brT:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
+    const-string v0, "TLS_RSA_WITH_SEED_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brU:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_RSA_WITH_NULL_SHA"
+    const-string v0, "TLS_RSA_WITH_AES_128_GCM_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brV:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_RSA_WITH_RC4_128_SHA"
+    const-string v0, "TLS_RSA_WITH_AES_256_GCM_SHA384"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brW:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA"
+    const-string v0, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brX:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA"
+    const-string v0, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brY:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA"
+    const-string v0, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->brZ:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_RSA_WITH_NULL_SHA"
+    const-string v0, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsa:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_RSA_WITH_RC4_128_SHA"
+    const-string v0, "TLS_DH_anon_WITH_AES_128_GCM_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsb:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"
+    const-string v0, "TLS_DH_anon_WITH_AES_256_GCM_SHA384"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsc:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"
+    const-string v0, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsd:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"
+    const-string v0, "TLS_FALLBACK_SCSV"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bse:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_anon_WITH_NULL_SHA"
+    const-string v0, "TLS_ECDH_ECDSA_WITH_NULL_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsf:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_anon_WITH_RC4_128_SHA"
+    const-string v0, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsg:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"
+    const-string v0, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsh:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"
+    const-string v0, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsi:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"
+    const-string v0, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsj:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"
+    const-string v0, "TLS_ECDHE_ECDSA_WITH_NULL_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsk:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"
+    const-string v0, "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsl:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256"
+    const-string v0, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsm:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384"
+    const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsn:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
+    const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bso:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"
+    const-string v0, "TLS_ECDH_RSA_WITH_NULL_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsp:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256"
+    const-string v0, "TLS_ECDH_RSA_WITH_RC4_128_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsq:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384"
+    const-string v0, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsr:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
+    const-string v0, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bss:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
+    const-string v0, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bst:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256"
+    const-string v0, "TLS_ECDHE_RSA_WITH_NULL_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsu:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384"
+    const-string v0, "TLS_ECDHE_RSA_WITH_RC4_128_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsv:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
+    const-string v0, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsw:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
+    const-string v0, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsx:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"
+    const-string v0, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsy:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384"
+    const-string v0, "TLS_ECDH_anon_WITH_NULL_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsz:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA"
+    const-string v0, "TLS_ECDH_anon_WITH_RC4_128_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsA:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA"
+    const-string v0, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsB:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
+    const-string v0, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsC:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"
+    const-string v0, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsD:Lokhttp3/h;
 
-    const-string v0, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
+    const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsE:Lokhttp3/h;
 
-    const-string v0, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
+    const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsF:Lokhttp3/h;
 
-    const-string v0, "TLS_AES_128_GCM_SHA256"
+    const-string v0, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsG:Lokhttp3/h;
 
-    const-string v0, "TLS_AES_256_GCM_SHA384"
+    const-string v0, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsH:Lokhttp3/h;
 
-    const-string v0, "TLS_CHACHA20_POLY1305_SHA256"
+    const-string v0, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsI:Lokhttp3/h;
 
-    const-string v0, "TLS_AES_128_CCM_SHA256"
+    const-string v0, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsJ:Lokhttp3/h;
 
-    const-string v0, "TLS_AES_256_CCM_8_SHA256"
+    const-string v0, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256"
 
-    invoke-static {v0}, Lokhttp3/h;->eb(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v0
 
     sput-object v0, Lokhttp3/h;->bsK:Lokhttp3/h;
 
+    const-string v0, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsL:Lokhttp3/h;
+
+    const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsM:Lokhttp3/h;
+
+    const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsN:Lokhttp3/h;
+
+    const-string v0, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsO:Lokhttp3/h;
+
+    const-string v0, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsP:Lokhttp3/h;
+
+    const-string v0, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsQ:Lokhttp3/h;
+
+    const-string v0, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsR:Lokhttp3/h;
+
+    const-string v0, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsS:Lokhttp3/h;
+
+    const-string v0, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsT:Lokhttp3/h;
+
+    const-string v0, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsU:Lokhttp3/h;
+
+    const-string v0, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsV:Lokhttp3/h;
+
+    const-string v0, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsW:Lokhttp3/h;
+
+    const-string v0, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsX:Lokhttp3/h;
+
+    const-string v0, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsY:Lokhttp3/h;
+
+    const-string v0, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bsZ:Lokhttp3/h;
+
+    const-string v0, "TLS_AES_128_GCM_SHA256"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bta:Lokhttp3/h;
+
+    const-string v0, "TLS_AES_256_GCM_SHA384"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->btb:Lokhttp3/h;
+
+    const-string v0, "TLS_CHACHA20_POLY1305_SHA256"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->btc:Lokhttp3/h;
+
+    const-string v0, "TLS_AES_128_CCM_SHA256"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->btd:Lokhttp3/h;
+
+    const-string v0, "TLS_AES_256_CCM_8_SHA256"
+
+    invoke-static {v0}, Lokhttp3/h;->dV(Ljava/lang/String;)Lokhttp3/h;
+
+    move-result-object v0
+
+    sput-object v0, Lokhttp3/h;->bte:Lokhttp3/h;
+
     return-void
 .end method
 
@@ -1286,7 +1286,7 @@
 
     aget-object v3, p0, v2
 
-    invoke-static {v3}, Lokhttp3/h;->ea(Ljava/lang/String;)Lokhttp3/h;
+    invoke-static {v3}, Lokhttp3/h;->dU(Ljava/lang/String;)Lokhttp3/h;
 
     move-result-object v3
 
@@ -1304,7 +1304,7 @@
     return-object p0
 .end method
 
-.method public static declared-synchronized ea(Ljava/lang/String;)Lokhttp3/h;
+.method public static declared-synchronized dU(Ljava/lang/String;)Lokhttp3/h;
     .locals 5
 
     const-class v0, Lokhttp3/h;
@@ -1312,7 +1312,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokhttp3/h;->aSR:Ljava/util/Map;
+    sget-object v1, Lokhttp3/h;->aTj:Ljava/util/Map;
 
     invoke-interface {v1, p0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1322,7 +1322,7 @@
 
     if-nez v1, :cond_3
 
-    sget-object v1, Lokhttp3/h;->aSR:Ljava/util/Map;
+    sget-object v1, Lokhttp3/h;->aTj:Ljava/util/Map;
 
     const-string v2, "TLS_"
 
@@ -1396,7 +1396,7 @@
     invoke-direct {v1, p0}, Lokhttp3/h;-><init>(Ljava/lang/String;)V
 
     :cond_2
-    sget-object v2, Lokhttp3/h;->aSR:Ljava/util/Map;
+    sget-object v2, Lokhttp3/h;->aTj:Ljava/util/Map;
 
     invoke-interface {v2, p0, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
@@ -1415,14 +1415,14 @@
     throw p0
 .end method
 
-.method private static eb(Ljava/lang/String;)Lokhttp3/h;
+.method private static dV(Ljava/lang/String;)Lokhttp3/h;
     .locals 2
 
     new-instance v0, Lokhttp3/h;
 
     invoke-direct {v0, p0}, Lokhttp3/h;-><init>(Ljava/lang/String;)V
 
-    sget-object v1, Lokhttp3/h;->aSR:Ljava/util/Map;
+    sget-object v1, Lokhttp3/h;->aTj:Ljava/util/Map;
 
     invoke-interface {v1, p0, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/a/a$1.smali b/com.discord/smali_classes2/okhttp3/internal/a/a$1.smali
index ee0803812b..e49c607f9c 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/a$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/a$1.smali
@@ -18,28 +18,28 @@
 
 
 # instance fields
-.field bvO:Z
+.field bwi:Z
 
-.field final synthetic bvP:Lokio/d;
+.field final synthetic bwj:Lokio/d;
 
-.field final synthetic bvQ:Lokhttp3/internal/a/b;
+.field final synthetic bwk:Lokhttp3/internal/a/b;
 
-.field final synthetic bvR:Lokio/BufferedSink;
+.field final synthetic bwl:Lokio/BufferedSink;
 
-.field final synthetic bvS:Lokhttp3/internal/a/a;
+.field final synthetic bwm:Lokhttp3/internal/a/a;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/a/a;Lokio/d;Lokhttp3/internal/a/b;Lokio/BufferedSink;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/a/a$1;->bvS:Lokhttp3/internal/a/a;
+    iput-object p1, p0, Lokhttp3/internal/a/a$1;->bwm:Lokhttp3/internal/a/a;
 
-    iput-object p2, p0, Lokhttp3/internal/a/a$1;->bvP:Lokio/d;
+    iput-object p2, p0, Lokhttp3/internal/a/a$1;->bwj:Lokio/d;
 
-    iput-object p3, p0, Lokhttp3/internal/a/a$1;->bvQ:Lokhttp3/internal/a/b;
+    iput-object p3, p0, Lokhttp3/internal/a/a$1;->bwk:Lokhttp3/internal/a/b;
 
-    iput-object p4, p0, Lokhttp3/internal/a/a$1;->bvR:Lokio/BufferedSink;
+    iput-object p4, p0, Lokhttp3/internal/a/a$1;->bwl:Lokio/BufferedSink;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,7 +59,7 @@
     const/4 v0, 0x1
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/a/a$1;->bvP:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/a/a$1;->bwj:Lokio/d;
 
     invoke-interface {v1, p1, p2, p3}, Lokio/d;->a(Lokio/c;J)J
 
@@ -73,13 +73,13 @@
 
     if-nez v3, :cond_1
 
-    iget-boolean p1, p0, Lokhttp3/internal/a/a$1;->bvO:Z
+    iget-boolean p1, p0, Lokhttp3/internal/a/a$1;->bwi:Z
 
     if-nez p1, :cond_0
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->bvO:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->bwi:Z
 
-    iget-object p1, p0, Lokhttp3/internal/a/a$1;->bvR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/a$1;->bwl:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->close()V
 
@@ -87,9 +87,9 @@
     return-wide v1
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/a/a$1;->bvR:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/a$1;->bwl:Lokio/BufferedSink;
 
-    invoke-interface {v0}, Lokio/BufferedSink;->Ir()Lokio/c;
+    invoke-interface {v0}, Lokio/BufferedSink;->Ie()Lokio/c;
 
     move-result-object v3
 
@@ -103,20 +103,20 @@
 
     invoke-virtual/range {v2 .. v7}, Lokio/c;->a(Lokio/c;JJ)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/a/a$1;->bvR:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/a$1;->bwl:Lokio/BufferedSink;
 
-    invoke-interface {p1}, Lokio/BufferedSink;->IE()Lokio/BufferedSink;
+    invoke-interface {p1}, Lokio/BufferedSink;->Ir()Lokio/BufferedSink;
 
     return-wide p2
 
     :catch_0
     move-exception p1
 
-    iget-boolean p2, p0, Lokhttp3/internal/a/a$1;->bvO:Z
+    iget-boolean p2, p0, Lokhttp3/internal/a/a$1;->bwi:Z
 
     if-nez p2, :cond_2
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->bvO:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->bwi:Z
 
     :cond_2
     throw p1
@@ -130,7 +130,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/a/a$1;->bvO:Z
+    iget-boolean v0, p0, Lokhttp3/internal/a/a$1;->bwi:Z
 
     if-nez v0, :cond_0
 
@@ -144,10 +144,10 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->bvO:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->bwi:Z
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/a/a$1;->bvP:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/a/a$1;->bwj:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->close()V
 
@@ -157,7 +157,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/a/a$1;->bvP:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/a/a$1;->bwj:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/s;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/a/a.smali b/com.discord/smali_classes2/okhttp3/internal/a/a.smali
index 921ae953a5..7aec4673f6 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/a.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field final bvN:Lokhttp3/internal/a/e;
+.field final bwh:Lokhttp3/internal/a/e;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/a/a;->bvN:Lokhttp3/internal/a/e;
+    iput-object p1, p0, Lokhttp3/internal/a/a;->bwh:Lokhttp3/internal/a/e;
 
     return-void
 .end method
@@ -28,7 +28,7 @@
 
     invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     array-length v1, v1
 
@@ -41,11 +41,11 @@
     :goto_0
     if-ge v3, v1, :cond_3
 
-    invoke-virtual {p0, v3}, Lokhttp3/Headers;->dz(I)Ljava/lang/String;
+    invoke-virtual {p0, v3}, Lokhttp3/Headers;->dw(I)Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {p0, v3}, Lokhttp3/Headers;->dA(I)Ljava/lang/String;
+    invoke-virtual {p0, v3}, Lokhttp3/Headers;->dx(I)Ljava/lang/String;
 
     move-result-object v5
 
@@ -66,13 +66,13 @@
     if-nez v6, :cond_2
 
     :cond_0
-    invoke-static {v4}, Lokhttp3/internal/a/a;->ez(Ljava/lang/String;)Z
+    invoke-static {v4}, Lokhttp3/internal/a/a;->eu(Ljava/lang/String;)Z
 
     move-result v6
 
     if-nez v6, :cond_1
 
-    invoke-static {v4}, Lokhttp3/internal/a/a;->ey(Ljava/lang/String;)Z
+    invoke-static {v4}, Lokhttp3/internal/a/a;->et(Ljava/lang/String;)Z
 
     move-result v6
 
@@ -85,7 +85,7 @@
     if-nez v6, :cond_2
 
     :cond_1
-    sget-object v6, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v6, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
     invoke-virtual {v6, v0, v4, v5}, Lokhttp3/internal/a;->a(Lokhttp3/Headers$a;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -95,7 +95,7 @@
     goto :goto_0
 
     :cond_3
-    iget-object p0, p1, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object p0, p1, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     array-length p0, p0
 
@@ -104,25 +104,25 @@
     :goto_1
     if-ge v2, p0, :cond_5
 
-    invoke-virtual {p1, v2}, Lokhttp3/Headers;->dz(I)Ljava/lang/String;
+    invoke-virtual {p1, v2}, Lokhttp3/Headers;->dw(I)Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-static {v1}, Lokhttp3/internal/a/a;->ez(Ljava/lang/String;)Z
+    invoke-static {v1}, Lokhttp3/internal/a/a;->eu(Ljava/lang/String;)Z
 
     move-result v3
 
     if-nez v3, :cond_4
 
-    invoke-static {v1}, Lokhttp3/internal/a/a;->ey(Ljava/lang/String;)Z
+    invoke-static {v1}, Lokhttp3/internal/a/a;->et(Ljava/lang/String;)Z
 
     move-result v3
 
     if-eqz v3, :cond_4
 
-    sget-object v3, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v3, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
-    invoke-virtual {p1, v2}, Lokhttp3/Headers;->dA(I)Ljava/lang/String;
+    invoke-virtual {p1, v2}, Lokhttp3/Headers;->dx(I)Ljava/lang/String;
 
     move-result-object v4
 
@@ -134,7 +134,7 @@
     goto :goto_1
 
     :cond_5
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->GA()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Gp()Lokhttp3/Headers;
 
     move-result-object p0
 
@@ -146,19 +146,19 @@
 
     if-eqz p0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v0, p0, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/Response;->Hd()Lokhttp3/Response$a;
+    invoke-virtual {p0}, Lokhttp3/Response;->GQ()Lokhttp3/Response$a;
 
     move-result-object p0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bve:Lokhttp3/x;
+    iput-object v0, p0, Lokhttp3/Response$a;->bvy:Lokhttp3/x;
 
-    invoke-virtual {p0}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {p0}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object p0
 
@@ -166,7 +166,7 @@
     return-object p0
 .end method
 
-.method private static ey(Ljava/lang/String;)Z
+.method private static et(Ljava/lang/String;)Z
     .locals 1
 
     const-string v0, "Connection"
@@ -243,7 +243,7 @@
     return p0
 .end method
 
-.method private static ez(Ljava/lang/String;)Z
+.method private static eu(Ljava/lang/String;)Z
     .locals 1
 
     const-string v0, "Content-Length"
@@ -296,13 +296,13 @@
 
     move-object/from16 v1, p0
 
-    iget-object v0, v1, Lokhttp3/internal/a/a;->bvN:Lokhttp3/internal/a/e;
+    iget-object v0, v1, Lokhttp3/internal/a/a;->bwh:Lokhttp3/internal/a/e;
 
     const/4 v2, 0x0
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lokhttp3/internal/a/e;->Hm()Lokhttp3/Response;
+    invoke-interface {v0}, Lokhttp3/internal/a/e;->GZ()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -320,19 +320,19 @@
 
     new-instance v0, Lokhttp3/internal/a/c$a;
 
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GL()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GA()Lokhttp3/w;
 
     move-result-object v6
 
     invoke-direct {v0, v4, v5, v6, v3}, Lokhttp3/internal/a/c$a;-><init>(JLokhttp3/w;Lokhttp3/Response;)V
 
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bvg:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bvA:Lokhttp3/Response;
 
     if-nez v4, :cond_1
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bvb:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bvv:Lokhttp3/w;
 
     invoke-direct {v4, v5, v2}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
@@ -344,34 +344,34 @@
     goto/16 :goto_11
 
     :cond_1
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bvb:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bvv:Lokhttp3/w;
 
-    iget-object v4, v4, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v4, v4, Lokhttp3/w;->bqk:Lokhttp3/s;
 
-    invoke-virtual {v4}, Lokhttp3/s;->GC()Z
+    invoke-virtual {v4}, Lokhttp3/s;->Gr()Z
 
     move-result v4
 
     if-eqz v4, :cond_2
 
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bvg:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bvA:Lokhttp3/Response;
 
-    iget-object v4, v4, Lokhttp3/Response;->bvd:Lokhttp3/r;
+    iget-object v4, v4, Lokhttp3/Response;->bvx:Lokhttp3/r;
 
     if-nez v4, :cond_2
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bvb:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bvv:Lokhttp3/w;
 
     invoke-direct {v4, v5, v2}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
     goto :goto_1
 
     :cond_2
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bvg:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bvA:Lokhttp3/Response;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bvb:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bvv:Lokhttp3/w;
 
     invoke-static {v4, v5}, Lokhttp3/internal/a/c;->a(Lokhttp3/Response;Lokhttp3/w;)Z
 
@@ -381,28 +381,28 @@
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bvb:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bvv:Lokhttp3/w;
 
     invoke-direct {v4, v5, v2}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
     goto :goto_1
 
     :cond_3
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bvb:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bvv:Lokhttp3/w;
 
-    invoke-virtual {v4}, Lokhttp3/w;->Ha()Lokhttp3/d;
+    invoke-virtual {v4}, Lokhttp3/w;->GO()Lokhttp3/d;
 
     move-result-object v4
 
-    iget-boolean v5, v4, Lokhttp3/d;->bqd:Z
+    iget-boolean v5, v4, Lokhttp3/d;->bqx:Z
 
     if-nez v5, :cond_1b
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bvb:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bvv:Lokhttp3/w;
 
     const-string v6, "If-Modified-Since"
 
-    invoke-virtual {v5, v6}, Lokhttp3/w;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v5, v6}, Lokhttp3/w;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v7
 
@@ -410,7 +410,7 @@
 
     if-nez v7, :cond_5
 
-    invoke-virtual {v5, v9}, Lokhttp3/w;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v5, v9}, Lokhttp3/w;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v5
 
@@ -433,21 +433,21 @@
     goto/16 :goto_10
 
     :cond_6
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bvg:Lokhttp3/Response;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bvA:Lokhttp3/Response;
 
-    invoke-virtual {v5}, Lokhttp3/Response;->Ha()Lokhttp3/d;
+    invoke-virtual {v5}, Lokhttp3/Response;->GO()Lokhttp3/d;
 
     move-result-object v5
 
-    iget-object v7, v0, Lokhttp3/internal/a/c$a;->bvV:Ljava/util/Date;
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->bwp:Ljava/util/Date;
 
     const-wide/16 v11, 0x0
 
     if-eqz v7, :cond_7
 
-    iget-wide v13, v0, Lokhttp3/internal/a/c$a;->bwb:J
+    iget-wide v13, v0, Lokhttp3/internal/a/c$a;->bwv:J
 
-    iget-object v7, v0, Lokhttp3/internal/a/c$a;->bvV:Ljava/util/Date;
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->bwp:Ljava/util/Date;
 
     invoke-virtual {v7}, Ljava/util/Date;->getTime()J
 
@@ -465,7 +465,7 @@
     move-wide v13, v11
 
     :goto_4
-    iget v7, v0, Lokhttp3/internal/a/c$a;->bwd:I
+    iget v7, v0, Lokhttp3/internal/a/c$a;->bwx:I
 
     const/4 v15, -0x1
 
@@ -473,7 +473,7 @@
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v8, v0, Lokhttp3/internal/a/c$a;->bwd:I
+    iget v8, v0, Lokhttp3/internal/a/c$a;->bwx:I
 
     move-object/from16 v17, v3
 
@@ -493,15 +493,15 @@
     move-object/from16 v17, v3
 
     :goto_5
-    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->bwb:J
+    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->bwv:J
 
-    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->bwa:J
+    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->bwu:J
 
     sub-long/2addr v2, v7
 
-    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->bvU:J
+    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->bwo:J
 
-    iget-wide v10, v0, Lokhttp3/internal/a/c$a;->bwb:J
+    iget-wide v10, v0, Lokhttp3/internal/a/c$a;->bwv:J
 
     sub-long/2addr v7, v10
 
@@ -509,19 +509,19 @@
 
     add-long/2addr v13, v7
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvg:Lokhttp3/Response;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvA:Lokhttp3/Response;
 
-    invoke-virtual {v2}, Lokhttp3/Response;->Ha()Lokhttp3/d;
+    invoke-virtual {v2}, Lokhttp3/Response;->GO()Lokhttp3/d;
 
     move-result-object v2
 
-    iget v3, v2, Lokhttp3/d;->bqf:I
+    iget v3, v2, Lokhttp3/d;->bqz:I
 
     if-eq v3, v15, :cond_9
 
     sget-object v3, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v2, v2, Lokhttp3/d;->bqf:I
+    iget v2, v2, Lokhttp3/d;->bqz:I
 
     int-to-long v7, v2
 
@@ -538,15 +538,15 @@
     goto :goto_b
 
     :cond_9
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvZ:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bwt:Ljava/util/Date;
 
     if-eqz v2, :cond_c
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvV:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bwp:Ljava/util/Date;
 
     if-eqz v2, :cond_a
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvV:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bwp:Ljava/util/Date;
 
     invoke-virtual {v2}, Ljava/util/Date;->getTime()J
 
@@ -555,10 +555,10 @@
     goto :goto_8
 
     :cond_a
-    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->bwb:J
+    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->bwv:J
 
     :goto_8
-    iget-object v7, v0, Lokhttp3/internal/a/c$a;->bvZ:Ljava/util/Date;
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->bwt:Ljava/util/Date;
 
     invoke-virtual {v7}, Ljava/util/Date;->getTime()J
 
@@ -580,17 +580,17 @@
     goto :goto_7
 
     :cond_c
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvX:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bwr:Ljava/util/Date;
 
     if-eqz v2, :cond_f
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvg:Lokhttp3/Response;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvA:Lokhttp3/Response;
 
-    iget-object v2, v2, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v2, v2, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    iget-object v2, v2, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v2, v2, Lokhttp3/w;->bqk:Lokhttp3/s;
 
-    iget-object v3, v2, Lokhttp3/s;->btL:Ljava/util/List;
+    iget-object v3, v2, Lokhttp3/s;->buf:Ljava/util/List;
 
     if-nez v3, :cond_d
 
@@ -603,7 +603,7 @@
 
     invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v2, v2, Lokhttp3/s;->btL:Ljava/util/List;
+    iget-object v2, v2, Lokhttp3/s;->buf:Ljava/util/List;
 
     invoke-static {v3, v2}, Lokhttp3/s;->b(Ljava/lang/StringBuilder;Ljava/util/List;)V
 
@@ -614,11 +614,11 @@
     :goto_9
     if-nez v2, :cond_f
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvV:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bwp:Ljava/util/Date;
 
     if-eqz v2, :cond_e
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvV:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bwp:Ljava/util/Date;
 
     invoke-virtual {v2}, Ljava/util/Date;->getTime()J
 
@@ -627,10 +627,10 @@
     goto :goto_a
 
     :cond_e
-    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->bwa:J
+    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->bwu:J
 
     :goto_a
-    iget-object v7, v0, Lokhttp3/internal/a/c$a;->bvX:Ljava/util/Date;
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->bwr:Ljava/util/Date;
 
     invoke-virtual {v7}, Ljava/util/Date;->getTime()J
 
@@ -657,13 +657,13 @@
     move-wide v2, v11
 
     :goto_b
-    iget v7, v4, Lokhttp3/d;->bqf:I
+    iget v7, v4, Lokhttp3/d;->bqz:I
 
     if-eq v7, v15, :cond_11
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v8, v4, Lokhttp3/d;->bqf:I
+    iget v8, v4, Lokhttp3/d;->bqz:I
 
     int-to-long v11, v8
 
@@ -676,13 +676,13 @@
     move-result-wide v2
 
     :cond_11
-    iget v7, v4, Lokhttp3/d;->bql:I
+    iget v7, v4, Lokhttp3/d;->bqF:I
 
     if-eq v7, v15, :cond_12
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v8, v4, Lokhttp3/d;->bql:I
+    iget v8, v4, Lokhttp3/d;->bqF:I
 
     int-to-long v10, v8
 
@@ -696,17 +696,17 @@
     const-wide/16 v11, 0x0
 
     :goto_c
-    iget-boolean v7, v5, Lokhttp3/d;->bqj:Z
+    iget-boolean v7, v5, Lokhttp3/d;->bqD:Z
 
     if-nez v7, :cond_13
 
-    iget v7, v4, Lokhttp3/d;->bqk:I
+    iget v7, v4, Lokhttp3/d;->bqE:I
 
     if-eq v7, v15, :cond_13
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v4, v4, Lokhttp3/d;->bqk:I
+    iget v4, v4, Lokhttp3/d;->bqE:I
 
     move-object v10, v9
 
@@ -726,7 +726,7 @@
     const-wide/16 v18, 0x0
 
     :goto_d
-    iget-boolean v4, v5, Lokhttp3/d;->bqd:Z
+    iget-boolean v4, v5, Lokhttp3/d;->bqx:Z
 
     if-nez v4, :cond_17
 
@@ -738,9 +738,9 @@
 
     if-gez v4, :cond_17
 
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bvg:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bvA:Lokhttp3/Response;
 
-    invoke-virtual {v4}, Lokhttp3/Response;->Hd()Lokhttp3/Response$a;
+    invoke-virtual {v4}, Lokhttp3/Response;->GQ()Lokhttp3/Response$a;
 
     move-result-object v4
 
@@ -761,17 +761,17 @@
 
     if-lez v6, :cond_16
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvg:Lokhttp3/Response;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvA:Lokhttp3/Response;
 
-    invoke-virtual {v2}, Lokhttp3/Response;->Ha()Lokhttp3/d;
+    invoke-virtual {v2}, Lokhttp3/Response;->GO()Lokhttp3/d;
 
     move-result-object v2
 
-    iget v2, v2, Lokhttp3/d;->bqf:I
+    iget v2, v2, Lokhttp3/d;->bqz:I
 
     if-ne v2, v15, :cond_15
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvZ:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bwt:Ljava/util/Date;
 
     if-nez v2, :cond_15
 
@@ -792,7 +792,7 @@
     :cond_16
     new-instance v2, Lokhttp3/internal/a/c;
 
-    invoke-virtual {v4}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {v4}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object v3
 
@@ -807,52 +807,52 @@
     goto :goto_11
 
     :cond_17
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bwc:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bww:Ljava/lang/String;
 
     if-eqz v2, :cond_18
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bwc:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bww:Ljava/lang/String;
 
     move-object v6, v10
 
     goto :goto_f
 
     :cond_18
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvX:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bwr:Ljava/util/Date;
 
     if-eqz v2, :cond_19
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvY:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bws:Ljava/lang/String;
 
     goto :goto_f
 
     :cond_19
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvV:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bwp:Ljava/util/Date;
 
     if-eqz v2, :cond_1a
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvW:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bwq:Ljava/lang/String;
 
     :goto_f
-    iget-object v3, v0, Lokhttp3/internal/a/c$a;->bvb:Lokhttp3/w;
+    iget-object v3, v0, Lokhttp3/internal/a/c$a;->bvv:Lokhttp3/w;
 
-    iget-object v3, v3, Lokhttp3/w;->buj:Lokhttp3/Headers;
+    iget-object v3, v3, Lokhttp3/w;->buD:Lokhttp3/Headers;
 
-    invoke-virtual {v3}, Lokhttp3/Headers;->Gz()Lokhttp3/Headers$a;
+    invoke-virtual {v3}, Lokhttp3/Headers;->Go()Lokhttp3/Headers$a;
 
     move-result-object v3
 
-    sget-object v4, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v4, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
     invoke-virtual {v4, v3, v6, v2}, Lokhttp3/internal/a;->a(Lokhttp3/Headers$a;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvb:Lokhttp3/w;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvv:Lokhttp3/w;
 
-    invoke-virtual {v2}, Lokhttp3/w;->GZ()Lokhttp3/w$a;
+    invoke-virtual {v2}, Lokhttp3/w;->GN()Lokhttp3/w$a;
 
     move-result-object v2
 
-    invoke-virtual {v3}, Lokhttp3/Headers$a;->GA()Lokhttp3/Headers;
+    invoke-virtual {v3}, Lokhttp3/Headers$a;->Gp()Lokhttp3/Headers;
 
     move-result-object v3
 
@@ -860,13 +860,13 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {v2}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object v2
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v3, v0, Lokhttp3/internal/a/c$a;->bvg:Lokhttp3/Response;
+    iget-object v3, v0, Lokhttp3/internal/a/c$a;->bvA:Lokhttp3/Response;
 
     invoke-direct {v4, v2, v3}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
@@ -877,7 +877,7 @@
     :cond_1a
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvb:Lokhttp3/w;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvv:Lokhttp3/w;
 
     const/4 v3, 0x0
 
@@ -893,22 +893,22 @@
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvb:Lokhttp3/w;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bvv:Lokhttp3/w;
 
     invoke-direct {v4, v2, v3}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
     :goto_11
-    iget-object v2, v4, Lokhttp3/internal/a/c;->bvT:Lokhttp3/w;
+    iget-object v2, v4, Lokhttp3/internal/a/c;->bwn:Lokhttp3/w;
 
     if-eqz v2, :cond_1c
 
-    iget-object v0, v0, Lokhttp3/internal/a/c$a;->bvb:Lokhttp3/w;
+    iget-object v0, v0, Lokhttp3/internal/a/c$a;->bvv:Lokhttp3/w;
 
-    invoke-virtual {v0}, Lokhttp3/w;->Ha()Lokhttp3/d;
+    invoke-virtual {v0}, Lokhttp3/w;->GO()Lokhttp3/d;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lokhttp3/d;->bqm:Z
+    iget-boolean v0, v0, Lokhttp3/d;->bqG:Z
 
     if-eqz v0, :cond_1c
 
@@ -917,9 +917,9 @@
     invoke-direct {v4, v3, v3}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
     :cond_1c
-    iget-object v0, v4, Lokhttp3/internal/a/c;->bvT:Lokhttp3/w;
+    iget-object v0, v4, Lokhttp3/internal/a/c;->bwn:Lokhttp3/w;
 
-    iget-object v2, v4, Lokhttp3/internal/a/c;->bvg:Lokhttp3/Response;
+    iget-object v2, v4, Lokhttp3/internal/a/c;->bvA:Lokhttp3/Response;
 
     if-eqz v17, :cond_1d
 
@@ -927,7 +927,7 @@
 
     move-object/from16 v3, v17
 
-    iget-object v4, v3, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v4, v3, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     invoke-static {v4}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
@@ -945,15 +945,15 @@
 
     invoke-direct {v0}, Lokhttp3/Response$a;-><init>()V
 
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GL()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GA()Lokhttp3/w;
 
     move-result-object v2
 
-    iput-object v2, v0, Lokhttp3/Response$a;->bvb:Lokhttp3/w;
+    iput-object v2, v0, Lokhttp3/Response$a;->bvv:Lokhttp3/w;
 
-    sget-object v2, Lokhttp3/u;->buD:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->buX:Lokhttp3/u;
 
-    iput-object v2, v0, Lokhttp3/Response$a;->bvc:Lokhttp3/u;
+    iput-object v2, v0, Lokhttp3/Response$a;->bvw:Lokhttp3/u;
 
     const/16 v2, 0x1f8
 
@@ -963,21 +963,21 @@
 
     iput-object v2, v0, Lokhttp3/Response$a;->message:Ljava/lang/String;
 
-    sget-object v2, Lokhttp3/internal/c;->bvy:Lokhttp3/x;
+    sget-object v2, Lokhttp3/internal/c;->bvS:Lokhttp3/x;
 
-    iput-object v2, v0, Lokhttp3/Response$a;->bve:Lokhttp3/x;
+    iput-object v2, v0, Lokhttp3/Response$a;->bvy:Lokhttp3/x;
 
     const-wide/16 v2, -0x1
 
-    iput-wide v2, v0, Lokhttp3/Response$a;->bvi:J
+    iput-wide v2, v0, Lokhttp3/Response$a;->bvC:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v2
 
-    iput-wide v2, v0, Lokhttp3/Response$a;->bvj:J
+    iput-wide v2, v0, Lokhttp3/Response$a;->bvD:J
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -986,7 +986,7 @@
     :cond_1e
     if-nez v0, :cond_1f
 
-    invoke-virtual {v2}, Lokhttp3/Response;->Hd()Lokhttp3/Response$a;
+    invoke-virtual {v2}, Lokhttp3/Response;->GQ()Lokhttp3/Response$a;
 
     move-result-object v0
 
@@ -998,7 +998,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -1018,7 +1018,7 @@
 
     if-eqz v3, :cond_20
 
-    iget-object v3, v3, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v3, v3, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     invoke-static {v3}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
@@ -1031,13 +1031,13 @@
 
     if-ne v3, v5, :cond_21
 
-    invoke-virtual {v2}, Lokhttp3/Response;->Hd()Lokhttp3/Response$a;
+    invoke-virtual {v2}, Lokhttp3/Response;->GQ()Lokhttp3/Response$a;
 
     move-result-object v0
 
-    iget-object v3, v2, Lokhttp3/Response;->buj:Lokhttp3/Headers;
+    iget-object v3, v2, Lokhttp3/Response;->buD:Lokhttp3/Headers;
 
-    iget-object v5, v4, Lokhttp3/Response;->buj:Lokhttp3/Headers;
+    iget-object v5, v4, Lokhttp3/Response;->buD:Lokhttp3/Headers;
 
     invoke-static {v3, v5}, Lokhttp3/internal/a/a;->a(Lokhttp3/Headers;Lokhttp3/Headers;)Lokhttp3/Headers;
 
@@ -1047,13 +1047,13 @@
 
     move-result-object v0
 
-    iget-wide v5, v4, Lokhttp3/Response;->bvi:J
+    iget-wide v5, v4, Lokhttp3/Response;->bvC:J
 
-    iput-wide v5, v0, Lokhttp3/Response$a;->bvi:J
+    iput-wide v5, v0, Lokhttp3/Response$a;->bvC:J
 
-    iget-wide v5, v4, Lokhttp3/Response;->bvj:J
+    iget-wide v5, v4, Lokhttp3/Response;->bvD:J
 
-    iput-wide v5, v0, Lokhttp3/Response$a;->bvj:J
+    iput-wide v5, v0, Lokhttp3/Response$a;->bvD:J
 
     invoke-static {v2}, Lokhttp3/internal/a/a;->d(Lokhttp3/Response;)Lokhttp3/Response;
 
@@ -1071,23 +1071,23 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object v0
 
-    iget-object v2, v4, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v2, v4, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     invoke-virtual {v2}, Lokhttp3/x;->close()V
 
     return-object v0
 
     :cond_21
-    iget-object v3, v2, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v3, v2, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     invoke-static {v3}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
     :cond_22
-    invoke-virtual {v4}, Lokhttp3/Response;->Hd()Lokhttp3/Response$a;
+    invoke-virtual {v4}, Lokhttp3/Response;->GQ()Lokhttp3/Response$a;
 
     move-result-object v3
 
@@ -1107,11 +1107,11 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object v2
 
-    iget-object v3, v1, Lokhttp3/internal/a/a;->bvN:Lokhttp3/internal/a/e;
+    iget-object v3, v1, Lokhttp3/internal/a/a;->bwh:Lokhttp3/internal/a/e;
 
     if-eqz v3, :cond_26
 
@@ -1127,9 +1127,9 @@
 
     if-eqz v3, :cond_25
 
-    iget-object v0, v1, Lokhttp3/internal/a/a;->bvN:Lokhttp3/internal/a/e;
+    iget-object v0, v1, Lokhttp3/internal/a/a;->bwh:Lokhttp3/internal/a/e;
 
-    invoke-interface {v0}, Lokhttp3/internal/a/e;->Hn()Lokhttp3/internal/a/b;
+    invoke-interface {v0}, Lokhttp3/internal/a/e;->Ha()Lokhttp3/internal/a/b;
 
     move-result-object v0
 
@@ -1138,7 +1138,7 @@
     return-object v2
 
     :cond_23
-    invoke-interface {v0}, Lokhttp3/internal/a/b;->Hj()Lokio/q;
+    invoke-interface {v0}, Lokhttp3/internal/a/b;->GW()Lokio/q;
 
     move-result-object v3
 
@@ -1147,9 +1147,9 @@
     return-object v2
 
     :cond_24
-    iget-object v4, v2, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v4, v2, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
-    invoke-virtual {v4}, Lokhttp3/x;->Hf()Lokio/d;
+    invoke-virtual {v4}, Lokhttp3/x;->GS()Lokio/d;
 
     move-result-object v4
 
@@ -1163,17 +1163,17 @@
 
     const-string v0, "Content-Type"
 
-    invoke-virtual {v2, v0}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v2, v0}, Lokhttp3/Response;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
-    iget-object v3, v2, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v3, v2, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     invoke-virtual {v3}, Lokhttp3/x;->contentLength()J
 
     move-result-wide v3
 
-    invoke-virtual {v2}, Lokhttp3/Response;->Hd()Lokhttp3/Response$a;
+    invoke-virtual {v2}, Lokhttp3/Response;->GQ()Lokhttp3/Response$a;
 
     move-result-object v2
 
@@ -1185,9 +1185,9 @@
 
     invoke-direct {v6, v0, v3, v4, v5}, Lokhttp3/internal/c/h;-><init>(Ljava/lang/String;JLokio/d;)V
 
-    iput-object v6, v2, Lokhttp3/Response$a;->bve:Lokhttp3/x;
+    iput-object v6, v2, Lokhttp3/Response$a;->bvy:Lokhttp3/x;
 
-    invoke-virtual {v2}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -1242,7 +1242,7 @@
 
     if-eqz v3, :cond_27
 
-    iget-object v0, v3, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v0, v3, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     invoke-static {v0}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/a/b.smali b/com.discord/smali_classes2/okhttp3/internal/a/b.smali
index 41c71c443b..f393d1f4d8 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/b.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract Hj()Lokio/q;
+.method public abstract GW()Lokio/q;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/okhttp3/internal/a/c$a.smali b/com.discord/smali_classes2/okhttp3/internal/a/c$a.smali
index 7f8103d4ef..25ecfe97a9 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/c$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/c$a.smali
@@ -15,29 +15,29 @@
 
 
 # instance fields
-.field final bvU:J
+.field final bvA:Lokhttp3/Response;
 
-.field bvV:Ljava/util/Date;
+.field final bvv:Lokhttp3/w;
 
-.field bvW:Ljava/lang/String;
+.field final bwo:J
 
-.field bvX:Ljava/util/Date;
+.field bwp:Ljava/util/Date;
 
-.field bvY:Ljava/lang/String;
+.field bwq:Ljava/lang/String;
 
-.field bvZ:Ljava/util/Date;
+.field bwr:Ljava/util/Date;
 
-.field final bvb:Lokhttp3/w;
+.field bws:Ljava/lang/String;
 
-.field final bvg:Lokhttp3/Response;
+.field bwt:Ljava/util/Date;
 
-.field bwa:J
+.field bwu:J
 
-.field bwb:J
+.field bwv:J
 
-.field bwc:Ljava/lang/String;
+.field bww:Ljava/lang/String;
 
-.field bwd:I
+.field bwx:I
 
 
 # direct methods
@@ -48,29 +48,29 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/a/c$a;->bwd:I
+    iput v0, p0, Lokhttp3/internal/a/c$a;->bwx:I
 
-    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->bvU:J
+    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->bwo:J
 
-    iput-object p3, p0, Lokhttp3/internal/a/c$a;->bvb:Lokhttp3/w;
+    iput-object p3, p0, Lokhttp3/internal/a/c$a;->bvv:Lokhttp3/w;
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bvg:Lokhttp3/Response;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bvA:Lokhttp3/Response;
 
     if-eqz p4, :cond_5
 
-    iget-wide p1, p4, Lokhttp3/Response;->bvi:J
+    iget-wide p1, p4, Lokhttp3/Response;->bvC:J
 
-    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->bwa:J
+    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->bwu:J
 
-    iget-wide p1, p4, Lokhttp3/Response;->bvj:J
+    iget-wide p1, p4, Lokhttp3/Response;->bvD:J
 
-    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->bwb:J
+    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->bwv:J
 
-    iget-object p1, p4, Lokhttp3/Response;->buj:Lokhttp3/Headers;
+    iget-object p1, p4, Lokhttp3/Response;->buD:Lokhttp3/Headers;
 
     const/4 p2, 0x0
 
-    iget-object p3, p1, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     array-length p3, p3
 
@@ -79,11 +79,11 @@
     :goto_0
     if-ge p2, p3, :cond_5
 
-    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dz(I)Ljava/lang/String;
+    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dw(I)Ljava/lang/String;
 
     move-result-object p4
 
-    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dA(I)Ljava/lang/String;
+    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dx(I)Ljava/lang/String;
 
     move-result-object v1
 
@@ -99,9 +99,9 @@
 
     move-result-object p4
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bvV:Ljava/util/Date;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bwp:Ljava/util/Date;
 
-    iput-object v1, p0, Lokhttp3/internal/a/c$a;->bvW:Ljava/lang/String;
+    iput-object v1, p0, Lokhttp3/internal/a/c$a;->bwq:Ljava/lang/String;
 
     goto :goto_1
 
@@ -118,7 +118,7 @@
 
     move-result-object p4
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bvZ:Ljava/util/Date;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bwt:Ljava/util/Date;
 
     goto :goto_1
 
@@ -135,9 +135,9 @@
 
     move-result-object p4
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bvX:Ljava/util/Date;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bwr:Ljava/util/Date;
 
-    iput-object v1, p0, Lokhttp3/internal/a/c$a;->bvY:Ljava/lang/String;
+    iput-object v1, p0, Lokhttp3/internal/a/c$a;->bws:Ljava/lang/String;
 
     goto :goto_1
 
@@ -150,7 +150,7 @@
 
     if-eqz v2, :cond_3
 
-    iput-object v1, p0, Lokhttp3/internal/a/c$a;->bwc:Ljava/lang/String;
+    iput-object v1, p0, Lokhttp3/internal/a/c$a;->bww:Ljava/lang/String;
 
     goto :goto_1
 
@@ -167,7 +167,7 @@
 
     move-result p4
 
-    iput p4, p0, Lokhttp3/internal/a/c$a;->bwd:I
+    iput p4, p0, Lokhttp3/internal/a/c$a;->bwx:I
 
     :cond_4
     :goto_1
diff --git a/com.discord/smali_classes2/okhttp3/internal/a/d$a.smali b/com.discord/smali_classes2/okhttp3/internal/a/d$a.smali
index ab43f64d6f..a146d29fad 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/d$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/d$a.smali
@@ -15,8 +15,8 @@
 
 
 # instance fields
-.field final bwm:Lokhttp3/internal/a/d$b;
+.field final bwG:Lokhttp3/internal/a/d$b;
 
-.field final synthetic bwn:Lokhttp3/internal/a/d;
+.field final synthetic bwH:Lokhttp3/internal/a/d;
 
 .field done:Z
diff --git a/com.discord/smali_classes2/okhttp3/internal/a/d$b.smali b/com.discord/smali_classes2/okhttp3/internal/a/d$b.smali
index 0dbe2b4915..7c012e0abc 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/d$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/d$b.smali
@@ -15,15 +15,15 @@
 
 
 # instance fields
-.field final bwo:[J
+.field final bwI:[J
 
-.field final bwp:[Ljava/io/File;
+.field final bwJ:[Ljava/io/File;
 
-.field final bwq:[Ljava/io/File;
+.field final bwK:[Ljava/io/File;
 
-.field bwr:Z
+.field bwL:Z
 
-.field bws:Lokhttp3/internal/a/d$a;
+.field bwM:Lokhttp3/internal/a/d$a;
 
 .field final key:Ljava/lang/String;
 
@@ -37,7 +37,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/a/d$b;->bwo:[J
+    iget-object v0, p0, Lokhttp3/internal/a/d$b;->bwI:[J
 
     array-length v1, v0
 
@@ -50,7 +50,7 @@
 
     const/16 v5, 0x20
 
-    invoke-interface {p1, v5}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p1, v5}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
     move-result-object v5
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/a/d.smali b/com.discord/smali_classes2/okhttp3/internal/a/d.smali
index 3a641cd92c..c2cc150c4c 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/d.smali
@@ -19,21 +19,19 @@
 # static fields
 .field static final synthetic $assertionsDisabled:Z
 
-.field static final bwe:Ljava/util/regex/Pattern;
+.field static final bwy:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final bsN:Ljava/lang/Runnable;
+.field private final bth:Ljava/lang/Runnable;
 
-.field final bwf:Lokhttp3/internal/f/a;
+.field private bwA:J
 
-.field private bwg:J
+.field final bwB:I
 
-.field final bwh:I
+.field bwC:Lokio/BufferedSink;
 
-.field bwi:Lokio/BufferedSink;
-
-.field final bwj:Ljava/util/LinkedHashMap;
+.field final bwD:Ljava/util/LinkedHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedHashMap<",
@@ -44,9 +42,11 @@
     .end annotation
 .end field
 
-.field bwk:I
+.field bwE:I
 
-.field bwl:Z
+.field bwF:Z
+
+.field final bwz:Lokhttp3/internal/f/a;
 
 .field closed:Z
 
@@ -67,21 +67,21 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/a/d;->bwe:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/internal/a/d;->bwy:Ljava/util/regex/Pattern;
 
     return-void
 .end method
 
-.method private Hk()Z
+.method private GX()Z
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/a/d;->bwk:I
+    iget v0, p0, Lokhttp3/internal/a/d;->bwE:I
 
     const/16 v1, 0x7d0
 
     if-lt v0, v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/a/d;->bwj:Ljava/util/LinkedHashMap;
+    iget-object v1, p0, Lokhttp3/internal/a/d;->bwD:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v1}, Ljava/util/LinkedHashMap;->size()I
 
@@ -99,7 +99,7 @@
     return v0
 .end method
 
-.method private declared-synchronized Hl()V
+.method private declared-synchronized GY()V
     .locals 2
 
     monitor-enter p0
@@ -148,9 +148,9 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p1, Lokhttp3/internal/a/d$a;->bwm:Lokhttp3/internal/a/d$b;
+    iget-object v0, p1, Lokhttp3/internal/a/d$a;->bwG:Lokhttp3/internal/a/d$b;
 
-    iget-object v1, v0, Lokhttp3/internal/a/d$b;->bws:Lokhttp3/internal/a/d$a;
+    iget-object v1, v0, Lokhttp3/internal/a/d$b;->bwM:Lokhttp3/internal/a/d$a;
 
     if-ne v1, p1, :cond_4
 
@@ -159,36 +159,36 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget v2, p0, Lokhttp3/internal/a/d;->bwh:I
+    iget v2, p0, Lokhttp3/internal/a/d;->bwB:I
 
     if-ge v1, v2, :cond_0
 
-    iget-object v2, v0, Lokhttp3/internal/a/d$b;->bwq:[Ljava/io/File;
+    iget-object v2, v0, Lokhttp3/internal/a/d$b;->bwK:[Ljava/io/File;
 
     aget-object v2, v2, v1
 
-    iget-object v3, p0, Lokhttp3/internal/a/d;->bwf:Lokhttp3/internal/f/a;
+    iget-object v3, p0, Lokhttp3/internal/a/d;->bwz:Lokhttp3/internal/f/a;
 
-    invoke-interface {v3, v2}, Lokhttp3/internal/f/a;->A(Ljava/io/File;)V
+    invoke-interface {v3, v2}, Lokhttp3/internal/f/a;->z(Ljava/io/File;)V
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
-    iget v1, p0, Lokhttp3/internal/a/d;->bwk:I
+    iget v1, p0, Lokhttp3/internal/a/d;->bwE:I
 
     const/4 v2, 0x1
 
     add-int/2addr v1, v2
 
-    iput v1, p0, Lokhttp3/internal/a/d;->bwk:I
+    iput v1, p0, Lokhttp3/internal/a/d;->bwE:I
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lokhttp3/internal/a/d$b;->bws:Lokhttp3/internal/a/d$a;
+    iput-object v1, v0, Lokhttp3/internal/a/d$b;->bwM:Lokhttp3/internal/a/d$a;
 
-    iget-boolean v1, v0, Lokhttp3/internal/a/d$b;->bwr:Z
+    iget-boolean v1, v0, Lokhttp3/internal/a/d$b;->bwL:Z
 
     or-int/2addr p1, v1
 
@@ -198,75 +198,75 @@
 
     if-eqz p1, :cond_1
 
-    iput-boolean v2, v0, Lokhttp3/internal/a/d$b;->bwr:Z
+    iput-boolean v2, v0, Lokhttp3/internal/a/d$b;->bwL:Z
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->bwi:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->bwC:Lokio/BufferedSink;
 
     const-string v2, "CLEAN"
 
-    invoke-interface {p1, v2}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {p1, v2}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     move-result-object p1
 
-    invoke-interface {p1, v3}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p1, v3}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->bwi:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->bwC:Lokio/BufferedSink;
 
     iget-object v2, v0, Lokhttp3/internal/a/d$b;->key:Ljava/lang/String;
 
-    invoke-interface {p1, v2}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {p1, v2}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->bwi:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->bwC:Lokio/BufferedSink;
 
     invoke-virtual {v0, p1}, Lokhttp3/internal/a/d$b;->a(Lokio/BufferedSink;)V
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->bwi:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->bwC:Lokio/BufferedSink;
 
-    invoke-interface {p1, v1}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p1, v1}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
     goto :goto_1
 
     :cond_1
-    iget-object p1, p0, Lokhttp3/internal/a/d;->bwj:Ljava/util/LinkedHashMap;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->bwD:Ljava/util/LinkedHashMap;
 
     iget-object v2, v0, Lokhttp3/internal/a/d$b;->key:Ljava/lang/String;
 
     invoke-virtual {p1, v2}, Ljava/util/LinkedHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->bwi:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->bwC:Lokio/BufferedSink;
 
     const-string v2, "REMOVE"
 
-    invoke-interface {p1, v2}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {p1, v2}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     move-result-object p1
 
-    invoke-interface {p1, v3}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p1, v3}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->bwi:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->bwC:Lokio/BufferedSink;
 
     iget-object v0, v0, Lokhttp3/internal/a/d$b;->key:Ljava/lang/String;
 
-    invoke-interface {p1, v0}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {p1, v0}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->bwi:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->bwC:Lokio/BufferedSink;
 
-    invoke-interface {p1, v1}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p1, v1}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
     :goto_1
-    iget-object p1, p0, Lokhttp3/internal/a/d;->bwi:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->bwC:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->flush()V
 
     iget-wide v0, p0, Lokhttp3/internal/a/d;->size:J
 
-    iget-wide v2, p0, Lokhttp3/internal/a/d;->bwg:J
+    iget-wide v2, p0, Lokhttp3/internal/a/d;->bwA:J
 
     cmp-long p1, v0, v2
 
     if-gtz p1, :cond_2
 
-    invoke-direct {p0}, Lokhttp3/internal/a/d;->Hk()Z
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->GX()Z
 
     move-result p1
 
@@ -275,7 +275,7 @@
     :cond_2
     iget-object p1, p0, Lokhttp3/internal/a/d;->executor:Ljava/util/concurrent/Executor;
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bsN:Ljava/lang/Runnable;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bth:Ljava/lang/Runnable;
 
     invoke-interface {p1, v0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
     :try_end_0
@@ -318,41 +318,41 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lokhttp3/internal/a/d$b;->bws:Lokhttp3/internal/a/d$a;
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->bwM:Lokhttp3/internal/a/d$a;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/internal/a/d$b;->bws:Lokhttp3/internal/a/d$a;
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->bwM:Lokhttp3/internal/a/d$a;
 
-    iget-object v2, v0, Lokhttp3/internal/a/d$a;->bwm:Lokhttp3/internal/a/d$b;
+    iget-object v2, v0, Lokhttp3/internal/a/d$a;->bwG:Lokhttp3/internal/a/d$b;
 
-    iget-object v2, v2, Lokhttp3/internal/a/d$b;->bws:Lokhttp3/internal/a/d$a;
+    iget-object v2, v2, Lokhttp3/internal/a/d$b;->bwM:Lokhttp3/internal/a/d$a;
 
     if-ne v2, v0, :cond_1
 
     const/4 v2, 0x0
 
     :goto_0
-    iget-object v3, v0, Lokhttp3/internal/a/d$a;->bwn:Lokhttp3/internal/a/d;
+    iget-object v3, v0, Lokhttp3/internal/a/d$a;->bwH:Lokhttp3/internal/a/d;
 
-    iget v3, v3, Lokhttp3/internal/a/d;->bwh:I
+    iget v3, v3, Lokhttp3/internal/a/d;->bwB:I
 
     if-ge v2, v3, :cond_0
 
     :try_start_0
-    iget-object v3, v0, Lokhttp3/internal/a/d$a;->bwn:Lokhttp3/internal/a/d;
+    iget-object v3, v0, Lokhttp3/internal/a/d$a;->bwH:Lokhttp3/internal/a/d;
 
-    iget-object v3, v3, Lokhttp3/internal/a/d;->bwf:Lokhttp3/internal/f/a;
+    iget-object v3, v3, Lokhttp3/internal/a/d;->bwz:Lokhttp3/internal/f/a;
 
-    iget-object v4, v0, Lokhttp3/internal/a/d$a;->bwm:Lokhttp3/internal/a/d$b;
+    iget-object v4, v0, Lokhttp3/internal/a/d$a;->bwG:Lokhttp3/internal/a/d$b;
 
-    iget-object v4, v4, Lokhttp3/internal/a/d$b;->bwq:[Ljava/io/File;
+    iget-object v4, v4, Lokhttp3/internal/a/d$b;->bwK:[Ljava/io/File;
 
     aget-object v4, v4, v2
 
-    invoke-interface {v3, v4}, Lokhttp3/internal/f/a;->A(Ljava/io/File;)V
+    invoke-interface {v3, v4}, Lokhttp3/internal/f/a;->z(Ljava/io/File;)V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -362,29 +362,29 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, v0, Lokhttp3/internal/a/d$a;->bwm:Lokhttp3/internal/a/d$b;
+    iget-object v0, v0, Lokhttp3/internal/a/d$a;->bwG:Lokhttp3/internal/a/d$b;
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lokhttp3/internal/a/d$b;->bws:Lokhttp3/internal/a/d$a;
+    iput-object v2, v0, Lokhttp3/internal/a/d$b;->bwM:Lokhttp3/internal/a/d$a;
 
     :cond_1
     :goto_1
-    iget v0, p0, Lokhttp3/internal/a/d;->bwh:I
+    iget v0, p0, Lokhttp3/internal/a/d;->bwB:I
 
     if-ge v1, v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bwf:Lokhttp3/internal/f/a;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bwz:Lokhttp3/internal/f/a;
 
-    iget-object v2, p1, Lokhttp3/internal/a/d$b;->bwp:[Ljava/io/File;
+    iget-object v2, p1, Lokhttp3/internal/a/d$b;->bwJ:[Ljava/io/File;
 
     aget-object v2, v2, v1
 
-    invoke-interface {v0, v2}, Lokhttp3/internal/f/a;->A(Ljava/io/File;)V
+    invoke-interface {v0, v2}, Lokhttp3/internal/f/a;->z(Ljava/io/File;)V
 
     iget-wide v2, p0, Lokhttp3/internal/a/d;->size:J
 
-    iget-object v0, p1, Lokhttp3/internal/a/d$b;->bwo:[J
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->bwI:[J
 
     aget-wide v4, v0, v1
 
@@ -392,7 +392,7 @@
 
     iput-wide v2, p0, Lokhttp3/internal/a/d;->size:J
 
-    iget-object v0, p1, Lokhttp3/internal/a/d$b;->bwo:[J
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->bwI:[J
 
     const-wide/16 v2, 0x0
 
@@ -403,45 +403,45 @@
     goto :goto_1
 
     :cond_2
-    iget v0, p0, Lokhttp3/internal/a/d;->bwk:I
+    iget v0, p0, Lokhttp3/internal/a/d;->bwE:I
 
     const/4 v1, 0x1
 
     add-int/2addr v0, v1
 
-    iput v0, p0, Lokhttp3/internal/a/d;->bwk:I
+    iput v0, p0, Lokhttp3/internal/a/d;->bwE:I
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bwi:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bwC:Lokio/BufferedSink;
 
     const-string v2, "REMOVE"
 
-    invoke-interface {v0, v2}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {v0, v2}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     move-result-object v0
 
     const/16 v2, 0x20
 
-    invoke-interface {v0, v2}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {v0, v2}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
     move-result-object v0
 
     iget-object v2, p1, Lokhttp3/internal/a/d$b;->key:Ljava/lang/String;
 
-    invoke-interface {v0, v2}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {v0, v2}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     move-result-object v0
 
     const/16 v2, 0xa
 
-    invoke-interface {v0, v2}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {v0, v2}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bwj:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bwD:Ljava/util/LinkedHashMap;
 
     iget-object p1, p1, Lokhttp3/internal/a/d$b;->key:Ljava/lang/String;
 
     invoke-virtual {v0, p1}, Ljava/util/LinkedHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-direct {p0}, Lokhttp3/internal/a/d;->Hk()Z
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->GX()Z
 
     move-result p1
 
@@ -449,7 +449,7 @@
 
     iget-object p1, p0, Lokhttp3/internal/a/d;->executor:Ljava/util/concurrent/Executor;
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bsN:Ljava/lang/Runnable;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bth:Ljava/lang/Runnable;
 
     invoke-interface {p1, v0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
@@ -490,13 +490,13 @@
     :goto_0
     iget-wide v0, p0, Lokhttp3/internal/a/d;->size:J
 
-    iget-wide v2, p0, Lokhttp3/internal/a/d;->bwg:J
+    iget-wide v2, p0, Lokhttp3/internal/a/d;->bwA:J
 
     cmp-long v4, v0, v2
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bwj:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bwD:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0}, Ljava/util/LinkedHashMap;->values()Ljava/util/Collection;
 
@@ -519,7 +519,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/d;->bwl:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/d;->bwF:Z
 
     return-void
 .end method
@@ -550,13 +550,13 @@
     goto :goto_2
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bwj:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bwD:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0}, Ljava/util/LinkedHashMap;->values()Ljava/util/Collection;
 
     move-result-object v0
 
-    iget-object v2, p0, Lokhttp3/internal/a/d;->bwj:Ljava/util/LinkedHashMap;
+    iget-object v2, p0, Lokhttp3/internal/a/d;->bwD:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v2}, Ljava/util/LinkedHashMap;->size()I
 
@@ -579,13 +579,13 @@
 
     aget-object v4, v0, v3
 
-    iget-object v5, v4, Lokhttp3/internal/a/d$b;->bws:Lokhttp3/internal/a/d$a;
+    iget-object v5, v4, Lokhttp3/internal/a/d$b;->bwM:Lokhttp3/internal/a/d$a;
 
     if-eqz v5, :cond_3
 
-    iget-object v4, v4, Lokhttp3/internal/a/d$b;->bws:Lokhttp3/internal/a/d$a;
+    iget-object v4, v4, Lokhttp3/internal/a/d$b;->bwM:Lokhttp3/internal/a/d$a;
 
-    iget-object v5, v4, Lokhttp3/internal/a/d$a;->bwn:Lokhttp3/internal/a/d;
+    iget-object v5, v4, Lokhttp3/internal/a/d$a;->bwH:Lokhttp3/internal/a/d;
 
     monitor-enter v5
     :try_end_0
@@ -596,13 +596,13 @@
 
     if-nez v6, :cond_2
 
-    iget-object v6, v4, Lokhttp3/internal/a/d$a;->bwm:Lokhttp3/internal/a/d$b;
+    iget-object v6, v4, Lokhttp3/internal/a/d$a;->bwG:Lokhttp3/internal/a/d$b;
 
-    iget-object v6, v6, Lokhttp3/internal/a/d$b;->bws:Lokhttp3/internal/a/d$a;
+    iget-object v6, v6, Lokhttp3/internal/a/d$b;->bwM:Lokhttp3/internal/a/d$a;
 
     if-ne v6, v4, :cond_1
 
-    iget-object v6, v4, Lokhttp3/internal/a/d$a;->bwn:Lokhttp3/internal/a/d;
+    iget-object v6, v4, Lokhttp3/internal/a/d$a;->bwH:Lokhttp3/internal/a/d;
 
     invoke-direct {v6, v4}, Lokhttp3/internal/a/d;->a(Lokhttp3/internal/a/d$a;)V
 
@@ -639,13 +639,13 @@
     :cond_4
     invoke-direct {p0}, Lokhttp3/internal/a/d;->trimToSize()V
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bwi:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bwC:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->close()V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokhttp3/internal/a/d;->bwi:Lokio/BufferedSink;
+    iput-object v0, p0, Lokhttp3/internal/a/d;->bwC:Lokio/BufferedSink;
 
     iput-boolean v1, p0, Lokhttp3/internal/a/d;->closed:Z
     :try_end_2
@@ -703,11 +703,11 @@
 
     :cond_0
     :try_start_1
-    invoke-direct {p0}, Lokhttp3/internal/a/d;->Hl()V
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->GY()V
 
     invoke-direct {p0}, Lokhttp3/internal/a/d;->trimToSize()V
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bwi:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bwC:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
     :try_end_1
diff --git a/com.discord/smali_classes2/okhttp3/internal/a/e.smali b/com.discord/smali_classes2/okhttp3/internal/a/e.smali
index aa69f9496d..ca9f2ec650 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/e.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract Hm()Lokhttp3/Response;
+.method public abstract GZ()Lokhttp3/Response;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -12,7 +12,7 @@
     .end annotation
 .end method
 
-.method public abstract Hn()Lokhttp3/internal/a/b;
+.method public abstract Ha()Lokhttp3/internal/a/b;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/okhttp3/internal/b/a.smali b/com.discord/smali_classes2/okhttp3/internal/b/a.smali
index 169e37549e..4b7205f74e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/a.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field public final buJ:Lokhttp3/t;
+.field public final bvd:Lokhttp3/t;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/b/a;->buJ:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/internal/b/a;->bvd:Lokhttp3/t;
 
     return-void
 .end method
@@ -35,9 +35,9 @@
 
     check-cast v0, Lokhttp3/internal/c/g;
 
-    iget-object v1, v0, Lokhttp3/internal/c/g;->bvb:Lokhttp3/w;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->bvv:Lokhttp3/w;
 
-    iget-object v2, v0, Lokhttp3/internal/c/g;->bxe:Lokhttp3/internal/b/g;
+    iget-object v2, v0, Lokhttp3/internal/c/g;->bxy:Lokhttp3/internal/b/g;
 
     iget-object v3, v1, Lokhttp3/w;->method:Ljava/lang/String;
 
@@ -49,13 +49,13 @@
 
     xor-int/lit8 v3, v3, 0x1
 
-    iget-object v4, p0, Lokhttp3/internal/b/a;->buJ:Lokhttp3/t;
+    iget-object v4, p0, Lokhttp3/internal/b/a;->bvd:Lokhttp3/t;
 
     invoke-virtual {v2, v4, p1, v3}, Lokhttp3/internal/b/g;->a(Lokhttp3/t;Lokhttp3/Interceptor$Chain;Z)Lokhttp3/internal/c/c;
 
     move-result-object p1
 
-    invoke-virtual {v2}, Lokhttp3/internal/b/g;->Ht()Lokhttp3/internal/b/c;
+    invoke-virtual {v2}, Lokhttp3/internal/b/g;->Hg()Lokhttp3/internal/b/c;
 
     move-result-object v3
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/b/b.smali b/com.discord/smali_classes2/okhttp3/internal/b/b.smali
index d7bddf5c76..90695129a7 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/b.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final bpV:Ljava/util/List;
+.field private final bqp:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,11 +14,11 @@
     .end annotation
 .end field
 
-.field private bwt:I
+.field private bwN:I
 
-.field bwu:Z
+.field bwO:Z
 
-.field bwv:Z
+.field bwP:Z
 
 
 # direct methods
@@ -37,9 +37,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/b/b;->bwt:I
+    iput v0, p0, Lokhttp3/internal/b/b;->bwN:I
 
-    iput-object p1, p0, Lokhttp3/internal/b/b;->bpV:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/b/b;->bqp:Ljava/util/List;
 
     return-void
 .end method
@@ -47,10 +47,10 @@
 .method private d(Ljavax/net/ssl/SSLSocket;)Z
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/b/b;->bwt:I
+    iget v0, p0, Lokhttp3/internal/b/b;->bwN:I
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/internal/b/b;->bpV:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/b;->bqp:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -58,7 +58,7 @@
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/b/b;->bpV:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/b;->bqp:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -97,9 +97,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lokhttp3/internal/b/b;->bwt:I
+    iget v0, p0, Lokhttp3/internal/b/b;->bwN:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/b;->bpV:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/b;->bqp:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -108,7 +108,7 @@
     :goto_0
     if-ge v0, v1, :cond_1
 
-    iget-object v2, p0, Lokhttp3/internal/b/b;->bpV:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/b/b;->bqp:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -124,7 +124,7 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lokhttp3/internal/b/b;->bwt:I
+    iput v0, p0, Lokhttp3/internal/b/b;->bwN:I
 
     goto :goto_1
 
@@ -143,11 +143,11 @@
 
     move-result v0
 
-    iput-boolean v0, p0, Lokhttp3/internal/b/b;->bwu:Z
+    iput-boolean v0, p0, Lokhttp3/internal/b/b;->bwO:Z
 
-    sget-object v0, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
-    iget-boolean v1, p0, Lokhttp3/internal/b/b;->bwv:Z
+    iget-boolean v1, p0, Lokhttp3/internal/b/b;->bwP:Z
 
     invoke-virtual {v0, v2, p1, v1}, Lokhttp3/internal/a;->a(Lokhttp3/k;Ljavax/net/ssl/SSLSocket;Z)V
 
@@ -162,7 +162,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-boolean v2, p0, Lokhttp3/internal/b/b;->bwv:Z
+    iget-boolean v2, p0, Lokhttp3/internal/b/b;->bwP:Z
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -170,7 +170,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lokhttp3/internal/b/b;->bpV:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/b/b;->bqp:Ljava/util/List;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/b/c$1.smali b/com.discord/smali_classes2/okhttp3/internal/b/c$1.smali
index 116976ff54..d867d61acf 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/c$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/c$1.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic bwG:Lokhttp3/internal/b/g;
+.field final synthetic bxa:Lokhttp3/internal/b/g;
 
-.field final synthetic bwH:Lokhttp3/internal/b/c;
+.field final synthetic bxb:Lokhttp3/internal/b/c;
 
 
 # direct methods
 .method public constructor <init>(Lokhttp3/internal/b/c;Lokio/d;Lokio/BufferedSink;Lokhttp3/internal/b/g;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/b/c$1;->bwH:Lokhttp3/internal/b/c;
+    iput-object p1, p0, Lokhttp3/internal/b/c$1;->bxb:Lokhttp3/internal/b/c;
 
-    iput-object p4, p0, Lokhttp3/internal/b/c$1;->bwG:Lokhttp3/internal/b/g;
+    iput-object p4, p0, Lokhttp3/internal/b/c$1;->bxa:Lokhttp3/internal/b/g;
 
     const/4 p1, 0x1
 
@@ -45,9 +45,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/b/c$1;->bwG:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c$1;->bxa:Lokhttp3/internal/b/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Hr()Lokhttp3/internal/c/c;
+    invoke-virtual {v0}, Lokhttp3/internal/b/g;->He()Lokhttp3/internal/c/c;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/b/d.smali b/com.discord/smali_classes2/okhttp3/internal/b/d.smali
index 9cd2b45edf..aebbf29690 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/d.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final bwI:Ljava/util/Set;
+.field private final bxc:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -25,7 +25,7 @@
 
     invoke-direct {v0}, Ljava/util/LinkedHashSet;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/b/d;->bwI:Ljava/util/Set;
+    iput-object v0, p0, Lokhttp3/internal/b/d;->bxc:Ljava/util/Set;
 
     return-void
 .end method
@@ -38,7 +38,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/b/d;->bwI:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/internal/b/d;->bxc:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -62,7 +62,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/b/d;->bwI:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/internal/b/d;->bxc:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
     :try_end_0
@@ -86,7 +86,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/b/d;->bwI:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/internal/b/d;->bxc:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/b/f$a.smali b/com.discord/smali_classes2/okhttp3/internal/b/f$a.smali
index 19f9d76c73..b00daf45ef 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/f$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/f$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final bwO:Ljava/util/List;
+.field final bxi:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field bwP:I
+.field bxj:I
 
 
 # direct methods
@@ -44,9 +44,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/b/f$a;->bwP:I
+    iput v0, p0, Lokhttp3/internal/b/f$a;->bxj:I
 
-    iput-object p1, p0, Lokhttp3/internal/b/f$a;->bwO:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/b/f$a;->bxi:Ljava/util/List;
 
     return-void
 .end method
@@ -56,9 +56,9 @@
 .method public final hasNext()Z
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/b/f$a;->bwP:I
+    iget v0, p0, Lokhttp3/internal/b/f$a;->bxj:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/f$a;->bwO:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f$a;->bxi:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/b/f.smali b/com.discord/smali_classes2/okhttp3/internal/b/f.smali
index d65f373919..a56d0d77ff 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/f.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/f.smali
@@ -12,15 +12,15 @@
 
 
 # instance fields
-.field final bsP:Lokhttp3/internal/b/d;
+.field final btj:Lokhttp3/internal/b/d;
 
-.field private final buM:Lokhttp3/p;
+.field final bvI:Lokhttp3/a;
 
-.field final bvo:Lokhttp3/a;
+.field private final bvg:Lokhttp3/p;
 
-.field private final bwJ:Lokhttp3/e;
+.field private final bxd:Lokhttp3/e;
 
-.field private bwK:Ljava/util/List;
+.field private bxe:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -30,9 +30,9 @@
     .end annotation
 .end field
 
-.field private bwL:I
+.field private bxf:I
 
-.field private bwM:Ljava/util/List;
+.field private bxg:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -42,7 +42,7 @@
     .end annotation
 .end field
 
-.field private final bwN:Ljava/util/List;
+.field private final bxh:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -63,31 +63,31 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/internal/b/f;->bwK:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->bxe:Ljava/util/List;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/internal/b/f;->bwM:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->bxg:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/b/f;->bwN:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->bxh:Ljava/util/List;
 
-    iput-object p1, p0, Lokhttp3/internal/b/f;->bvo:Lokhttp3/a;
+    iput-object p1, p0, Lokhttp3/internal/b/f;->bvI:Lokhttp3/a;
 
-    iput-object p2, p0, Lokhttp3/internal/b/f;->bsP:Lokhttp3/internal/b/d;
+    iput-object p2, p0, Lokhttp3/internal/b/f;->btj:Lokhttp3/internal/b/d;
 
-    iput-object p3, p0, Lokhttp3/internal/b/f;->bwJ:Lokhttp3/e;
+    iput-object p3, p0, Lokhttp3/internal/b/f;->bxd:Lokhttp3/e;
 
-    iput-object p4, p0, Lokhttp3/internal/b/f;->buM:Lokhttp3/p;
+    iput-object p4, p0, Lokhttp3/internal/b/f;->bvg:Lokhttp3/p;
 
-    iget-object p2, p1, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object p2, p1, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object p1, p1, Lokhttp3/a;->bpW:Ljava/net/Proxy;
+    iget-object p1, p1, Lokhttp3/a;->bqq:Ljava/net/Proxy;
 
     const/4 p3, 0x0
 
@@ -100,11 +100,11 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/b/f;->bvo:Lokhttp3/a;
+    iget-object p1, p0, Lokhttp3/internal/b/f;->bvI:Lokhttp3/a;
 
     iget-object p1, p1, Lokhttp3/a;->proxySelector:Ljava/net/ProxySelector;
 
-    invoke-virtual {p2}, Lokhttp3/s;->GB()Ljava/net/URI;
+    invoke-virtual {p2}, Lokhttp3/s;->Gq()Ljava/net/URI;
 
     move-result-object p2
 
@@ -135,24 +135,24 @@
 
     aput-object p2, p1, p3
 
-    invoke-static {p1}, Lokhttp3/internal/c;->s([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {p1}, Lokhttp3/internal/c;->r([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p1
 
     :goto_0
-    iput-object p1, p0, Lokhttp3/internal/b/f;->bwK:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/b/f;->bxe:Ljava/util/List;
 
-    iput p3, p0, Lokhttp3/internal/b/f;->bwL:I
+    iput p3, p0, Lokhttp3/internal/b/f;->bxf:I
 
     return-void
 .end method
 
-.method private Hq()Z
+.method private Hd()Z
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/b/f;->bwL:I
+    iget v0, p0, Lokhttp3/internal/b/f;->bxf:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->bwK:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->bxe:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -182,7 +182,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/b/f;->bwM:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->bxg:Ljava/util/List;
 
     invoke-virtual {p1}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -262,15 +262,15 @@
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lokhttp3/internal/b/f;->bvo:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/internal/b/f;->bvI:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v1, v0, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/internal/b/f;->bvo:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/internal/b/f;->bvI:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     iget v0, v0, Lokhttp3/s;->port:I
 
@@ -289,7 +289,7 @@
 
     if-ne p1, v2, :cond_4
 
-    iget-object p1, p0, Lokhttp3/internal/b/f;->bwM:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/internal/b/f;->bxg:Ljava/util/List;
 
     invoke-static {v1, v0}, Ljava/net/InetSocketAddress;->createUnresolved(Ljava/lang/String;I)Ljava/net/InetSocketAddress;
 
@@ -300,11 +300,11 @@
     return-void
 
     :cond_4
-    iget-object p1, p0, Lokhttp3/internal/b/f;->bvo:Lokhttp3/a;
+    iget-object p1, p0, Lokhttp3/internal/b/f;->bvI:Lokhttp3/a;
 
-    iget-object p1, p1, Lokhttp3/a;->bpR:Lokhttp3/o;
+    iget-object p1, p1, Lokhttp3/a;->bql:Lokhttp3/o;
 
-    invoke-interface {p1, v1}, Lokhttp3/o;->ed(Ljava/lang/String;)Ljava/util/List;
+    invoke-interface {p1, v1}, Lokhttp3/o;->dX(Ljava/lang/String;)Ljava/util/List;
 
     move-result-object p1
 
@@ -329,7 +329,7 @@
 
     check-cast v3, Ljava/net/InetAddress;
 
-    iget-object v4, p0, Lokhttp3/internal/b/f;->bwM:Ljava/util/List;
+    iget-object v4, p0, Lokhttp3/internal/b/f;->bxg:Ljava/util/List;
 
     new-instance v5, Ljava/net/InetSocketAddress;
 
@@ -351,9 +351,9 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v2, p0, Lokhttp3/internal/b/f;->bvo:Lokhttp3/a;
+    iget-object v2, p0, Lokhttp3/internal/b/f;->bvI:Lokhttp3/a;
 
-    iget-object v2, v2, Lokhttp3/a;->bpR:Lokhttp3/o;
+    iget-object v2, v2, Lokhttp3/a;->bql:Lokhttp3/o;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -409,7 +409,7 @@
 
 
 # virtual methods
-.method public final Hp()Lokhttp3/internal/b/f$a;
+.method public final Hc()Lokhttp3/internal/b/f$a;
     .locals 7
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -428,25 +428,25 @@
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
     :cond_0
-    invoke-direct {p0}, Lokhttp3/internal/b/f;->Hq()Z
+    invoke-direct {p0}, Lokhttp3/internal/b/f;->Hd()Z
 
     move-result v1
 
     if-eqz v1, :cond_4
 
-    invoke-direct {p0}, Lokhttp3/internal/b/f;->Hq()Z
+    invoke-direct {p0}, Lokhttp3/internal/b/f;->Hd()Z
 
     move-result v1
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->bwK:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->bxe:Ljava/util/List;
 
-    iget v2, p0, Lokhttp3/internal/b/f;->bwL:I
+    iget v2, p0, Lokhttp3/internal/b/f;->bxf:I
 
     add-int/lit8 v3, v2, 0x1
 
-    iput v3, p0, Lokhttp3/internal/b/f;->bwL:I
+    iput v3, p0, Lokhttp3/internal/b/f;->bxf:I
 
     invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -458,7 +458,7 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lokhttp3/internal/b/f;->bwM:Ljava/util/List;
+    iget-object v3, p0, Lokhttp3/internal/b/f;->bxg:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
@@ -469,9 +469,9 @@
 
     new-instance v4, Lokhttp3/y;
 
-    iget-object v5, p0, Lokhttp3/internal/b/f;->bvo:Lokhttp3/a;
+    iget-object v5, p0, Lokhttp3/internal/b/f;->bvI:Lokhttp3/a;
 
-    iget-object v6, p0, Lokhttp3/internal/b/f;->bwM:Ljava/util/List;
+    iget-object v6, p0, Lokhttp3/internal/b/f;->bxg:Ljava/util/List;
 
     invoke-interface {v6, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -481,7 +481,7 @@
 
     invoke-direct {v4, v5, v1, v6}, Lokhttp3/y;-><init>(Lokhttp3/a;Ljava/net/Proxy;Ljava/net/InetSocketAddress;)V
 
-    iget-object v5, p0, Lokhttp3/internal/b/f;->bsP:Lokhttp3/internal/b/d;
+    iget-object v5, p0, Lokhttp3/internal/b/f;->btj:Lokhttp3/internal/b/d;
 
     invoke-virtual {v5, v4}, Lokhttp3/internal/b/d;->c(Lokhttp3/y;)Z
 
@@ -489,7 +489,7 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v5, p0, Lokhttp3/internal/b/f;->bwN:Ljava/util/List;
+    iget-object v5, p0, Lokhttp3/internal/b/f;->bxh:Ljava/util/List;
 
     invoke-interface {v5, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -521,11 +521,11 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lokhttp3/internal/b/f;->bvo:Lokhttp3/a;
+    iget-object v2, p0, Lokhttp3/internal/b/f;->bvI:Lokhttp3/a;
 
-    iget-object v2, v2, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v2, v2, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    iget-object v2, v2, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v2, v2, Lokhttp3/s;->bud:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -533,7 +533,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lokhttp3/internal/b/f;->bwK:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/b/f;->bxe:Ljava/util/List;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -553,11 +553,11 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->bwN:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->bxh:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->bwN:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->bxh:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->clear()V
 
@@ -585,13 +585,13 @@
 .method public final hasNext()Z
     .locals 1
 
-    invoke-direct {p0}, Lokhttp3/internal/b/f;->Hq()Z
+    invoke-direct {p0}, Lokhttp3/internal/b/f;->Hd()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/b/f;->bwN:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/b/f;->bxh:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/b/g$a.smali b/com.discord/smali_classes2/okhttp3/internal/b/g$a.smali
index 3e04839d26..458b9f44c8 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/g$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/g$a.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field public final bwR:Ljava/lang/Object;
+.field public final bxl:Ljava/lang/Object;
 
 
 # direct methods
@@ -32,7 +32,7 @@
 
     invoke-direct {p0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object p2, p0, Lokhttp3/internal/b/g$a;->bwR:Ljava/lang/Object;
+    iput-object p2, p0, Lokhttp3/internal/b/g$a;->bxl:Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/b/g.smali b/com.discord/smali_classes2/okhttp3/internal/b/g.smali
index 0170de7cd2..670df7c77f 100644
--- a/com.discord/smali_classes2/okhttp3/internal/b/g.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/b/g.smali
@@ -16,31 +16,31 @@
 
 
 # instance fields
-.field public final buM:Lokhttp3/p;
+.field public final buN:Lokhttp3/j;
 
-.field public final but:Lokhttp3/j;
+.field public final bvI:Lokhttp3/a;
 
-.field public final bvo:Lokhttp3/a;
+.field public final bvg:Lokhttp3/p;
 
-.field public final bwJ:Lokhttp3/e;
+.field public bwQ:Lokhttp3/y;
 
-.field private bwQ:Lokhttp3/internal/b/f$a;
+.field public final bxd:Lokhttp3/e;
 
-.field private final bwR:Ljava/lang/Object;
+.field private bxk:Lokhttp3/internal/b/f$a;
 
-.field private final bwS:Lokhttp3/internal/b/f;
+.field private final bxl:Ljava/lang/Object;
 
-.field private bwT:I
+.field private final bxm:Lokhttp3/internal/b/f;
 
-.field public bwU:Lokhttp3/internal/b/c;
+.field private bxn:I
 
-.field private bwV:Z
+.field public bxo:Lokhttp3/internal/b/c;
 
-.field private bwW:Z
+.field private bxp:Z
 
-.field public bwX:Lokhttp3/internal/c/c;
+.field private bxq:Z
 
-.field public bww:Lokhttp3/y;
+.field public bxr:Lokhttp3/internal/c/c;
 
 .field private released:Z
 
@@ -57,35 +57,35 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iput-object p1, p0, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
-    iput-object p2, p0, Lokhttp3/internal/b/g;->bvo:Lokhttp3/a;
+    iput-object p2, p0, Lokhttp3/internal/b/g;->bvI:Lokhttp3/a;
 
-    iput-object p3, p0, Lokhttp3/internal/b/g;->bwJ:Lokhttp3/e;
+    iput-object p3, p0, Lokhttp3/internal/b/g;->bxd:Lokhttp3/e;
 
-    iput-object p4, p0, Lokhttp3/internal/b/g;->buM:Lokhttp3/p;
+    iput-object p4, p0, Lokhttp3/internal/b/g;->bvg:Lokhttp3/p;
 
     new-instance p1, Lokhttp3/internal/b/f;
 
-    invoke-direct {p0}, Lokhttp3/internal/b/g;->Hs()Lokhttp3/internal/b/d;
+    invoke-direct {p0}, Lokhttp3/internal/b/g;->Hf()Lokhttp3/internal/b/d;
 
     move-result-object v0
 
     invoke-direct {p1, p2, v0, p3, p4}, Lokhttp3/internal/b/f;-><init>(Lokhttp3/a;Lokhttp3/internal/b/d;Lokhttp3/e;Lokhttp3/p;)V
 
-    iput-object p1, p0, Lokhttp3/internal/b/g;->bwS:Lokhttp3/internal/b/f;
+    iput-object p1, p0, Lokhttp3/internal/b/g;->bxm:Lokhttp3/internal/b/f;
 
-    iput-object p5, p0, Lokhttp3/internal/b/g;->bwR:Ljava/lang/Object;
+    iput-object p5, p0, Lokhttp3/internal/b/g;->bxl:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private Hs()Lokhttp3/internal/b/d;
+.method private Hf()Lokhttp3/internal/b/d;
     .locals 2
 
-    sget-object v0, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/a;->a(Lokhttp3/j;)Lokhttp3/internal/b/d;
 
@@ -104,7 +104,7 @@
 
     move-object/from16 v1, p0
 
-    iget-object v2, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     monitor-enter v2
 
@@ -113,15 +113,15 @@
 
     if-nez v0, :cond_11
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->bwX:Lokhttp3/internal/c/c;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bxr:Lokhttp3/internal/c/c;
 
     if-nez v0, :cond_10
 
-    iget-boolean v0, v1, Lokhttp3/internal/b/g;->bwW:Z
+    iget-boolean v0, v1, Lokhttp3/internal/b/g;->bxq:Z
 
     if-nez v0, :cond_f
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     const/4 v3, 0x0
 
@@ -131,7 +131,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, v0, Lokhttp3/internal/b/c;->bwB:Z
+    iget-boolean v0, v0, Lokhttp3/internal/b/c;->bwV:Z
 
     if-eqz v0, :cond_0
 
@@ -145,11 +145,11 @@
     move-object v0, v3
 
     :goto_0
-    iget-object v6, v1, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     if-eqz v6, :cond_1
 
-    iget-object v6, v1, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     goto :goto_1
 
@@ -159,19 +159,19 @@
     :goto_1
     if-nez v6, :cond_3
 
-    sget-object v7, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v7, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
-    iget-object v8, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v8, v1, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
-    iget-object v9, v1, Lokhttp3/internal/b/g;->bvo:Lokhttp3/a;
+    iget-object v9, v1, Lokhttp3/internal/b/g;->bvI:Lokhttp3/a;
 
     invoke-virtual {v7, v8, v9, v1, v3}, Lokhttp3/internal/a;->a(Lokhttp3/j;Lokhttp3/a;Lokhttp3/internal/b/g;Lokhttp3/y;)Lokhttp3/internal/b/c;
 
-    iget-object v7, v1, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v7, v1, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     if-eqz v7, :cond_2
 
-    iget-object v6, v1, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     move-object v7, v3
 
@@ -180,7 +180,7 @@
     goto :goto_3
 
     :cond_2
-    iget-object v7, v1, Lokhttp3/internal/b/g;->bww:Lokhttp3/y;
+    iget-object v7, v1, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/y;
 
     goto :goto_2
 
@@ -204,7 +204,7 @@
     :cond_4
     if-nez v7, :cond_6
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/internal/b/f$a;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bxk:Lokhttp3/internal/b/f$a;
 
     if-eqz v0, :cond_5
 
@@ -215,13 +215,13 @@
     if-nez v0, :cond_6
 
     :cond_5
-    iget-object v0, v1, Lokhttp3/internal/b/g;->bwS:Lokhttp3/internal/b/f;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bxm:Lokhttp3/internal/b/f;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/f;->Hp()Lokhttp3/internal/b/f$a;
+    invoke-virtual {v0}, Lokhttp3/internal/b/f;->Hc()Lokhttp3/internal/b/f$a;
 
     move-result-object v0
 
-    iput-object v0, v1, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/internal/b/f$a;
+    iput-object v0, v1, Lokhttp3/internal/b/g;->bxk:Lokhttp3/internal/b/f$a;
 
     const/4 v0, 0x1
 
@@ -231,22 +231,22 @@
     const/4 v0, 0x0
 
     :goto_4
-    iget-object v9, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v9, v1, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     monitor-enter v9
 
     :try_start_1
-    iget-boolean v2, v1, Lokhttp3/internal/b/g;->bwW:Z
+    iget-boolean v2, v1, Lokhttp3/internal/b/g;->bxq:Z
 
     if-nez v2, :cond_e
 
     if-eqz v0, :cond_8
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/internal/b/f$a;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bxk:Lokhttp3/internal/b/f$a;
 
     new-instance v2, Ljava/util/ArrayList;
 
-    iget-object v0, v0, Lokhttp3/internal/b/f$a;->bwO:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/internal/b/f$a;->bxi:Ljava/util/List;
 
     invoke-direct {v2, v0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
@@ -265,21 +265,21 @@
 
     check-cast v11, Lokhttp3/y;
 
-    sget-object v12, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v12, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
-    iget-object v13, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v13, v1, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
-    iget-object v14, v1, Lokhttp3/internal/b/g;->bvo:Lokhttp3/a;
+    iget-object v14, v1, Lokhttp3/internal/b/g;->bvI:Lokhttp3/a;
 
     invoke-virtual {v12, v13, v14, v1, v11}, Lokhttp3/internal/a;->a(Lokhttp3/j;Lokhttp3/a;Lokhttp3/internal/b/g;Lokhttp3/y;)Lokhttp3/internal/b/c;
 
-    iget-object v12, v1, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v12, v1, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     if-eqz v12, :cond_7
 
-    iget-object v6, v1, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
-    iput-object v11, v1, Lokhttp3/internal/b/g;->bww:Lokhttp3/y;
+    iput-object v11, v1, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/y;
 
     const/4 v8, 0x1
 
@@ -296,7 +296,7 @@
 
     if-nez v7, :cond_a
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/internal/b/f$a;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bxk:Lokhttp3/internal/b/f$a;
 
     invoke-virtual {v0}, Lokhttp3/internal/b/f$a;->hasNext()Z
 
@@ -304,13 +304,13 @@
 
     if-eqz v2, :cond_9
 
-    iget-object v2, v0, Lokhttp3/internal/b/f$a;->bwO:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/internal/b/f$a;->bxi:Ljava/util/List;
 
-    iget v6, v0, Lokhttp3/internal/b/f$a;->bwP:I
+    iget v6, v0, Lokhttp3/internal/b/f$a;->bxj:I
 
     add-int/lit8 v7, v6, 0x1
 
-    iput v7, v0, Lokhttp3/internal/b/f$a;->bwP:I
+    iput v7, v0, Lokhttp3/internal/b/f$a;->bxj:I
 
     invoke-interface {v2, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -331,13 +331,13 @@
 
     :cond_a
     :goto_7
-    iput-object v7, v1, Lokhttp3/internal/b/g;->bww:Lokhttp3/y;
+    iput-object v7, v1, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/y;
 
-    iput v5, v1, Lokhttp3/internal/b/g;->bwT:I
+    iput v5, v1, Lokhttp3/internal/b/g;->bxn:I
 
     new-instance v6, Lokhttp3/internal/b/c;
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     invoke-direct {v6, v0, v7}, Lokhttp3/internal/b/c;-><init>(Lokhttp3/j;Lokhttp3/y;)V
 
@@ -353,9 +353,9 @@
     return-object v6
 
     :cond_c
-    iget-object v0, v1, Lokhttp3/internal/b/g;->bwJ:Lokhttp3/e;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bxd:Lokhttp3/e;
 
-    iget-object v2, v1, Lokhttp3/internal/b/g;->buM:Lokhttp3/p;
+    iget-object v2, v1, Lokhttp3/internal/b/g;->bvg:Lokhttp3/p;
 
     move-object v10, v6
 
@@ -375,44 +375,44 @@
 
     invoke-virtual/range {v10 .. v17}, Lokhttp3/internal/b/c;->a(IIIIZLokhttp3/e;Lokhttp3/p;)V
 
-    invoke-direct/range {p0 .. p0}, Lokhttp3/internal/b/g;->Hs()Lokhttp3/internal/b/d;
+    invoke-direct/range {p0 .. p0}, Lokhttp3/internal/b/g;->Hf()Lokhttp3/internal/b/d;
 
     move-result-object v0
 
-    iget-object v2, v6, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v2, v6, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
     invoke-virtual {v0, v2}, Lokhttp3/internal/b/d;->b(Lokhttp3/y;)V
 
-    iget-object v2, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     monitor-enter v2
 
     :try_start_2
-    iput-boolean v4, v1, Lokhttp3/internal/b/g;->bwV:Z
+    iput-boolean v4, v1, Lokhttp3/internal/b/g;->bxp:Z
 
-    sget-object v0, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
-    iget-object v4, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v4, v1, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     invoke-virtual {v0, v4, v6}, Lokhttp3/internal/a;->b(Lokhttp3/j;Lokhttp3/internal/b/c;)V
 
-    invoke-virtual {v6}, Lokhttp3/internal/b/c;->Ho()Z
+    invoke-virtual {v6}, Lokhttp3/internal/b/c;->Hb()Z
 
     move-result v0
 
     if-eqz v0, :cond_d
 
-    sget-object v0, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
-    iget-object v3, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v3, v1, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
-    iget-object v4, v1, Lokhttp3/internal/b/g;->bvo:Lokhttp3/a;
+    iget-object v4, v1, Lokhttp3/internal/b/g;->bvI:Lokhttp3/a;
 
     invoke-virtual {v0, v3, v4, v1}, Lokhttp3/internal/a;->a(Lokhttp3/j;Lokhttp3/a;Lokhttp3/internal/b/g;)Ljava/net/Socket;
 
     move-result-object v3
 
-    iget-object v6, v1, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     :cond_d
     monitor-exit v2
@@ -509,12 +509,12 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     monitor-enter v1
 
     :try_start_0
-    iget v2, v0, Lokhttp3/internal/b/c;->bwC:I
+    iget v2, v0, Lokhttp3/internal/b/c;->bwW:I
 
     if-nez v2, :cond_0
 
@@ -527,13 +527,13 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {v0, p6}, Lokhttp3/internal/b/c;->ac(Z)Z
+    invoke-virtual {v0, p6}, Lokhttp3/internal/b/c;->Z(Z)Z
 
     move-result v1
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/internal/b/g;->Hu()V
+    invoke-virtual {p0}, Lokhttp3/internal/b/g;->Hh()V
 
     goto :goto_0
 
@@ -560,7 +560,7 @@
 .method private a(Lokhttp3/internal/b/c;)V
     .locals 3
 
-    iget-object v0, p1, Lokhttp3/internal/b/c;->bwE:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/internal/b/c;->bwY:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -571,7 +571,7 @@
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v2, p1, Lokhttp3/internal/b/c;->bwE:Ljava/util/List;
+    iget-object v2, p1, Lokhttp3/internal/b/c;->bwY:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -585,7 +585,7 @@
 
     if-ne v2, p0, :cond_0
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bwE:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bwY:Ljava/util/List;
 
     invoke-interface {p1, v1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
@@ -612,15 +612,15 @@
 
 
 # virtual methods
-.method public final Hr()Lokhttp3/internal/c/c;
+.method public final He()Lokhttp3/internal/c/c;
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bwX:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bxr:Lokhttp3/internal/c/c;
 
     monitor-exit v0
 
@@ -636,13 +636,13 @@
     throw v1
 .end method
 
-.method public final declared-synchronized Ht()Lokhttp3/internal/b/c;
+.method public final declared-synchronized Hg()Lokhttp3/internal/b/c;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -658,10 +658,10 @@
     throw v0
 .end method
 
-.method public final Hu()V
+.method public final Hh()V
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     monitor-enter v0
 
@@ -693,14 +693,14 @@
     throw v1
 .end method
 
-.method public final Hv()Z
+.method public final Hi()Z
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bww:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/y;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/internal/b/f$a;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bxk:Lokhttp3/internal/b/f$a;
 
     if-eqz v0, :cond_0
 
@@ -711,7 +711,7 @@
     if-nez v0, :cond_2
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bwS:Lokhttp3/internal/b/f;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bxm:Lokhttp3/internal/b/f;
 
     invoke-virtual {v0}, Lokhttp3/internal/b/f;->hasNext()Z
 
@@ -736,21 +736,21 @@
 .method public final a(Lokhttp3/t;Lokhttp3/Interceptor$Chain;Z)Lokhttp3/internal/c/c;
     .locals 7
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->GN()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->GC()I
 
     move-result v1
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->GO()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->GD()I
 
     move-result v2
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->GP()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->GE()I
 
     move-result v3
 
-    iget v4, p1, Lokhttp3/t;->buB:I
+    iget v4, p1, Lokhttp3/t;->buV:I
 
-    iget-boolean v5, p1, Lokhttp3/t;->buw:Z
+    iget-boolean v5, p1, Lokhttp3/t;->buQ:Z
 
     move-object v0, p0
 
@@ -761,34 +761,34 @@
 
     move-result-object p3
 
-    iget-object v0, p3, Lokhttp3/internal/b/c;->bwz:Lokhttp3/internal/e/g;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->bwT:Lokhttp3/internal/e/g;
 
     if-eqz v0, :cond_0
 
     new-instance v0, Lokhttp3/internal/e/f;
 
-    iget-object p3, p3, Lokhttp3/internal/b/c;->bwz:Lokhttp3/internal/e/g;
+    iget-object p3, p3, Lokhttp3/internal/b/c;->bwT:Lokhttp3/internal/e/g;
 
     invoke-direct {v0, p1, p2, p0, p3}, Lokhttp3/internal/e/f;-><init>(Lokhttp3/t;Lokhttp3/Interceptor$Chain;Lokhttp3/internal/b/g;Lokhttp3/internal/e/g;)V
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p3, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->GO()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->GD()I
 
     move-result v1
 
     invoke-virtual {v0, v1}, Ljava/net/Socket;->setSoTimeout(I)V
 
-    iget-object v0, p3, Lokhttp3/internal/b/c;->nJ:Lokio/d;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/s;
 
     move-result-object v0
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->GO()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->GD()I
 
     move-result v1
 
@@ -798,13 +798,13 @@
 
     invoke-virtual {v0, v1, v2, v3}, Lokio/s;->d(JLjava/util/concurrent/TimeUnit;)Lokio/s;
 
-    iget-object v0, p3, Lokhttp3/internal/b/c;->bwA:Lokio/BufferedSink;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->timeout()Lokio/s;
 
     move-result-object v0
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->GP()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->GE()I
 
     move-result p2
 
@@ -816,21 +816,21 @@
 
     new-instance v0, Lokhttp3/internal/d/a;
 
-    iget-object p2, p3, Lokhttp3/internal/b/c;->nJ:Lokio/d;
+    iget-object p2, p3, Lokhttp3/internal/b/c;->nI:Lokio/d;
 
-    iget-object p3, p3, Lokhttp3/internal/b/c;->bwA:Lokio/BufferedSink;
+    iget-object p3, p3, Lokhttp3/internal/b/c;->bwU:Lokio/BufferedSink;
 
     invoke-direct {v0, p1, p0, p2, p3}, Lokhttp3/internal/d/a;-><init>(Lokhttp3/t;Lokhttp3/internal/b/g;Lokio/d;Lokio/BufferedSink;)V
 
     :goto_0
-    iget-object p1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     monitor-enter p1
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    iput-object v0, p0, Lokhttp3/internal/b/g;->bwX:Lokhttp3/internal/c/c;
+    iput-object v0, p0, Lokhttp3/internal/b/g;->bxr:Lokhttp3/internal/c/c;
 
     monitor-exit p1
 
@@ -861,19 +861,19 @@
 .method public final a(Lokhttp3/internal/b/c;Z)V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     if-nez v0, :cond_0
 
-    iput-object p1, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iput-object p1, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
-    iput-boolean p2, p0, Lokhttp3/internal/b/g;->bwV:Z
+    iput-boolean p2, p0, Lokhttp3/internal/b/g;->bxp:Z
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bwE:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bwY:Ljava/util/List;
 
     new-instance p2, Lokhttp3/internal/b/g$a;
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bwR:Ljava/lang/Object;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bxl:Ljava/lang/Object;
 
     invoke-direct {p2, p0, v0}, Lokhttp3/internal/b/g$a;-><init>(Lokhttp3/internal/b/g;Ljava/lang/Object;)V
 
@@ -892,14 +892,14 @@
 .method public final a(ZLokhttp3/internal/c/c;Ljava/io/IOException;)V
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     monitor-enter v0
 
     if-eqz p2, :cond_3
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bwX:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bxr:Lokhttp3/internal/c/c;
 
     if-ne p2, v1, :cond_3
 
@@ -907,13 +907,13 @@
 
     if-nez p1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
-    iget v2, v1, Lokhttp3/internal/b/c;->bwC:I
+    iget v2, v1, Lokhttp3/internal/b/c;->bwW:I
 
     add-int/2addr v2, p2
 
-    iput v2, v1, Lokhttp3/internal/b/c;->bwC:I
+    iput v2, v1, Lokhttp3/internal/b/c;->bwW:I
 
     :cond_0
     const/4 v1, 0x0
@@ -932,9 +932,9 @@
 
     if-eqz p3, :cond_1
 
-    sget-object p1, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
-    iget-object p2, p0, Lokhttp3/internal/b/g;->bwJ:Lokhttp3/e;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->bxd:Lokhttp3/e;
 
     invoke-virtual {p1, p2, p3}, Lokhttp3/internal/a;->a(Lokhttp3/e;Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -943,9 +943,9 @@
     :cond_1
     if-eqz p2, :cond_2
 
-    sget-object p1, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
-    iget-object p2, p0, Lokhttp3/internal/b/g;->bwJ:Lokhttp3/e;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->bxd:Lokhttp3/e;
 
     const/4 p3, 0x0
 
@@ -964,7 +964,7 @@
 
     invoke-direct {p3, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bwX:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bxr:Lokhttp3/internal/c/c;
 
     invoke-virtual {p3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -999,7 +999,7 @@
 
     if-eqz p3, :cond_0
 
-    iput-object v0, p0, Lokhttp3/internal/b/g;->bwX:Lokhttp3/internal/c/c;
+    iput-object v0, p0, Lokhttp3/internal/b/g;->bxr:Lokhttp3/internal/c/c;
 
     :cond_0
     const/4 p3, 0x1
@@ -1009,16 +1009,16 @@
     iput-boolean p3, p0, Lokhttp3/internal/b/g;->released:Z
 
     :cond_1
-    iget-object p2, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     if-eqz p2, :cond_5
 
     if-eqz p1, :cond_2
 
-    iput-boolean p3, p2, Lokhttp3/internal/b/c;->bwB:Z
+    iput-boolean p3, p2, Lokhttp3/internal/b/c;->bwV:Z
 
     :cond_2
-    iget-object p1, p0, Lokhttp3/internal/b/g;->bwX:Lokhttp3/internal/c/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->bxr:Lokhttp3/internal/c/c;
 
     if-nez p1, :cond_5
 
@@ -1026,20 +1026,20 @@
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
-    iget-boolean p1, p1, Lokhttp3/internal/b/c;->bwB:Z
+    iget-boolean p1, p1, Lokhttp3/internal/b/c;->bwV:Z
 
     if-eqz p1, :cond_5
 
     :cond_3
-    iget-object p1, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     invoke-direct {p0, p1}, Lokhttp3/internal/b/g;->a(Lokhttp3/internal/b/c;)V
 
-    iget-object p1, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bwE:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bwY:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
@@ -1047,19 +1047,19 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
     move-result-wide p2
 
-    iput-wide p2, p1, Lokhttp3/internal/b/c;->bwF:J
+    iput-wide p2, p1, Lokhttp3/internal/b/c;->bwZ:J
 
-    sget-object p1, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
-    iget-object p2, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
-    iget-object p3, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object p3, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     invoke-virtual {p1, p2, p3}, Lokhttp3/internal/a;->a(Lokhttp3/j;Lokhttp3/internal/b/c;)Z
 
@@ -1067,9 +1067,9 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
 
     goto :goto_0
 
@@ -1077,7 +1077,7 @@
     move-object p1, v0
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iput-object v0, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     goto :goto_1
 
@@ -1091,7 +1091,7 @@
 .method public final c(Ljava/io/IOException;)V
     .locals 9
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     monitor-enter v0
 
@@ -1110,39 +1110,39 @@
 
     iget-object p1, p1, Lokhttp3/internal/e/n;->errorCode:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxu:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxO:Lokhttp3/internal/e/b;
 
     if-ne p1, v1, :cond_0
 
-    iget p1, p0, Lokhttp3/internal/b/g;->bwT:I
+    iget p1, p0, Lokhttp3/internal/b/g;->bxn:I
 
     add-int/2addr p1, v4
 
-    iput p1, p0, Lokhttp3/internal/b/g;->bwT:I
+    iput p1, p0, Lokhttp3/internal/b/g;->bxn:I
 
-    iget p1, p0, Lokhttp3/internal/b/g;->bwT:I
+    iget p1, p0, Lokhttp3/internal/b/g;->bxn:I
 
     if-le p1, v4, :cond_6
 
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lokhttp3/internal/e/b;->bxv:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxP:Lokhttp3/internal/e/b;
 
     if-eq p1, v1, :cond_6
 
-    iput-object v2, p0, Lokhttp3/internal/b/g;->bww:Lokhttp3/y;
+    iput-object v2, p0, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/y;
 
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/c;->Ho()Z
+    invoke-virtual {v1}, Lokhttp3/internal/b/c;->Hb()Z
 
     move-result v1
 
@@ -1153,23 +1153,23 @@
     if-eqz v1, :cond_6
 
     :cond_2
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
-    iget v1, v1, Lokhttp3/internal/b/c;->bwC:I
+    iget v1, v1, Lokhttp3/internal/b/c;->bwW:I
 
     if-nez v1, :cond_5
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bww:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/y;
 
     if-eqz v1, :cond_4
 
     if-eqz p1, :cond_4
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bwS:Lokhttp3/internal/b/f;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bxm:Lokhttp3/internal/b/f;
 
-    iget-object v5, p0, Lokhttp3/internal/b/g;->bww:Lokhttp3/y;
+    iget-object v5, p0, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/y;
 
-    iget-object v6, v5, Lokhttp3/y;->bpW:Ljava/net/Proxy;
+    iget-object v6, v5, Lokhttp3/y;->bqq:Ljava/net/Proxy;
 
     invoke-virtual {v6}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -1179,25 +1179,25 @@
 
     if-eq v6, v7, :cond_3
 
-    iget-object v6, v1, Lokhttp3/internal/b/f;->bvo:Lokhttp3/a;
+    iget-object v6, v1, Lokhttp3/internal/b/f;->bvI:Lokhttp3/a;
 
     iget-object v6, v6, Lokhttp3/a;->proxySelector:Ljava/net/ProxySelector;
 
     if-eqz v6, :cond_3
 
-    iget-object v6, v1, Lokhttp3/internal/b/f;->bvo:Lokhttp3/a;
+    iget-object v6, v1, Lokhttp3/internal/b/f;->bvI:Lokhttp3/a;
 
     iget-object v6, v6, Lokhttp3/a;->proxySelector:Ljava/net/ProxySelector;
 
-    iget-object v7, v1, Lokhttp3/internal/b/f;->bvo:Lokhttp3/a;
+    iget-object v7, v1, Lokhttp3/internal/b/f;->bvI:Lokhttp3/a;
 
-    iget-object v7, v7, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v7, v7, Lokhttp3/a;->bqk:Lokhttp3/s;
 
-    invoke-virtual {v7}, Lokhttp3/s;->GB()Ljava/net/URI;
+    invoke-virtual {v7}, Lokhttp3/s;->Gq()Ljava/net/URI;
 
     move-result-object v7
 
-    iget-object v8, v5, Lokhttp3/y;->bpW:Ljava/net/Proxy;
+    iget-object v8, v5, Lokhttp3/y;->bqq:Ljava/net/Proxy;
 
     invoke-virtual {v8}, Ljava/net/Proxy;->address()Ljava/net/SocketAddress;
 
@@ -1206,13 +1206,13 @@
     invoke-virtual {v6, v7, v8, p1}, Ljava/net/ProxySelector;->connectFailed(Ljava/net/URI;Ljava/net/SocketAddress;Ljava/io/IOException;)V
 
     :cond_3
-    iget-object p1, v1, Lokhttp3/internal/b/f;->bsP:Lokhttp3/internal/b/d;
+    iget-object p1, v1, Lokhttp3/internal/b/f;->btj:Lokhttp3/internal/b/d;
 
     invoke-virtual {p1, v5}, Lokhttp3/internal/b/d;->a(Lokhttp3/y;)V
 
     :cond_4
     :goto_0
-    iput-object v2, p0, Lokhttp3/internal/b/g;->bww:Lokhttp3/y;
+    iput-object v2, p0, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/y;
 
     :cond_5
     :goto_1
@@ -1250,18 +1250,18 @@
 .method public final cancel()V
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     monitor-enter v0
 
     const/4 v1, 0x1
 
     :try_start_0
-    iput-boolean v1, p0, Lokhttp3/internal/b/g;->bwW:Z
+    iput-boolean v1, p0, Lokhttp3/internal/b/g;->bxq:Z
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bwX:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bxr:Lokhttp3/internal/c/c;
 
-    iget-object v2, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v2, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     monitor-exit v0
     :try_end_0
@@ -1276,7 +1276,7 @@
     :cond_0
     if-eqz v2, :cond_1
 
-    iget-object v0, v2, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iget-object v0, v2, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
     invoke-static {v0}, Lokhttp3/internal/c;->a(Ljava/net/Socket;)V
 
@@ -1297,12 +1297,12 @@
 .method public final release()V
     .locals 5
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->buN:Lokhttp3/j;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     const/4 v2, 0x1
 
@@ -1312,7 +1312,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lokhttp3/internal/b/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v3, p0, Lokhttp3/internal/b/g;->bxo:Lokhttp3/internal/b/c;
 
     const/4 v4, 0x0
 
@@ -1329,9 +1329,9 @@
 
     if-eqz v1, :cond_1
 
-    sget-object v0, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bwJ:Lokhttp3/e;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bxd:Lokhttp3/e;
 
     invoke-virtual {v0, v1, v4}, Lokhttp3/internal/a;->a(Lokhttp3/e;Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -1352,7 +1352,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lokhttp3/internal/b/g;->Ht()Lokhttp3/internal/b/c;
+    invoke-virtual {p0}, Lokhttp3/internal/b/g;->Hg()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
@@ -1365,7 +1365,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bvo:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bvI:Lokhttp3/a;
 
     invoke-virtual {v0}, Lokhttp3/a;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c$2.smali b/com.discord/smali_classes2/okhttp3/internal/c$2.smali
index 5baffaf56d..140120ece8 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c$2.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c$2.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic bvM:Z
+.field final synthetic bwg:Z
 
 .field final synthetic val$name:Ljava/lang/String;
 
@@ -29,7 +29,7 @@
 
     iput-object p1, p0, Lokhttp3/internal/c$2;->val$name:Ljava/lang/String;
 
-    iput-boolean p2, p0, Lokhttp3/internal/c$2;->bvM:Z
+    iput-boolean p2, p0, Lokhttp3/internal/c$2;->bwg:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,7 +47,7 @@
 
     invoke-direct {v0, p1, v1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
 
-    iget-boolean p1, p0, Lokhttp3/internal/c$2;->bvM:Z
+    iget-boolean p1, p0, Lokhttp3/internal/c$2;->bwg:Z
 
     invoke-virtual {v0, p1}, Ljava/lang/Thread;->setDaemon(Z)V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/a.smali b/com.discord/smali_classes2/okhttp3/internal/c/a.smali
index efb36ab585..9070bb7a98 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/a.smali
@@ -31,15 +31,15 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GL()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->GA()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->GZ()Lokhttp3/w$a;
+    invoke-virtual {v0}, Lokhttp3/w;->GN()Lokhttp3/w$a;
 
     move-result-object v1
 
-    iget-object v2, v0, Lokhttp3/w;->buk:Lokhttp3/RequestBody;
+    iget-object v2, v0, Lokhttp3/w;->buE:Lokhttp3/RequestBody;
 
     const-string v3, "Content-Type"
 
@@ -78,7 +78,7 @@
 
     invoke-virtual {v1, v6, v7}, Lokhttp3/w$a;->ap(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
-    invoke-virtual {v1, v2}, Lokhttp3/w$a;->er(Ljava/lang/String;)Lokhttp3/w$a;
+    invoke-virtual {v1, v2}, Lokhttp3/w$a;->el(Ljava/lang/String;)Lokhttp3/w$a;
 
     goto :goto_0
 
@@ -87,13 +87,13 @@
 
     invoke-virtual {v1, v2, v7}, Lokhttp3/w$a;->ap(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
-    invoke-virtual {v1, v6}, Lokhttp3/w$a;->er(Ljava/lang/String;)Lokhttp3/w$a;
+    invoke-virtual {v1, v6}, Lokhttp3/w$a;->el(Ljava/lang/String;)Lokhttp3/w$a;
 
     :cond_2
     :goto_0
     const-string v2, "Host"
 
-    invoke-virtual {v0, v2}, Lokhttp3/w;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v2}, Lokhttp3/w;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v7
 
@@ -101,7 +101,7 @@
 
     if-nez v7, :cond_3
 
-    iget-object v7, v0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v7, v0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-static {v7, v8}, Lokhttp3/internal/c;->a(Lokhttp3/s;Z)Ljava/lang/String;
 
@@ -112,7 +112,7 @@
     :cond_3
     const-string v2, "Connection"
 
-    invoke-virtual {v0, v2}, Lokhttp3/w;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v2}, Lokhttp3/w;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v7
 
@@ -125,7 +125,7 @@
     :cond_4
     const-string v2, "Accept-Encoding"
 
-    invoke-virtual {v0, v2}, Lokhttp3/w;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v2}, Lokhttp3/w;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v7
 
@@ -135,7 +135,7 @@
 
     const-string v7, "Range"
 
-    invoke-virtual {v0, v7}, Lokhttp3/w;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v7}, Lokhttp3/w;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v7
 
@@ -153,7 +153,7 @@
     :goto_1
     iget-object v7, p0, Lokhttp3/internal/c/a;->cookieJar:Lokhttp3/m;
 
-    iget-object v10, v0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v10, v0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-interface {v7, v10}, Lokhttp3/m;->a(Lokhttp3/s;)Ljava/util/List;
 
@@ -217,7 +217,7 @@
     :cond_8
     const-string v7, "User-Agent"
 
-    invoke-virtual {v0, v7}, Lokhttp3/w;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v7}, Lokhttp3/w;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v8
 
@@ -228,7 +228,7 @@
     invoke-virtual {v1, v7, v8}, Lokhttp3/w$a;->ap(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
     :cond_9
-    invoke-virtual {v1}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {v1}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object v1
 
@@ -238,23 +238,23 @@
 
     iget-object v1, p0, Lokhttp3/internal/c/a;->cookieJar:Lokhttp3/m;
 
-    iget-object v7, v0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v7, v0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
-    iget-object v8, p1, Lokhttp3/Response;->buj:Lokhttp3/Headers;
+    iget-object v8, p1, Lokhttp3/Response;->buD:Lokhttp3/Headers;
 
     invoke-static {v1, v7, v8}, Lokhttp3/internal/c/e;->a(Lokhttp3/m;Lokhttp3/s;Lokhttp3/Headers;)V
 
-    invoke-virtual {p1}, Lokhttp3/Response;->Hd()Lokhttp3/Response$a;
+    invoke-virtual {p1}, Lokhttp3/Response;->GQ()Lokhttp3/Response$a;
 
     move-result-object v1
 
-    iput-object v0, v1, Lokhttp3/Response$a;->bvb:Lokhttp3/w;
+    iput-object v0, v1, Lokhttp3/Response$a;->bvv:Lokhttp3/w;
 
     if-eqz v2, :cond_a
 
     const-string v0, "Content-Encoding"
 
-    invoke-virtual {p1, v0}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Lokhttp3/Response;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -272,35 +272,35 @@
 
     new-instance v2, Lokio/h;
 
-    iget-object v7, p1, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v7, p1, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
-    invoke-virtual {v7}, Lokhttp3/x;->Hf()Lokio/d;
+    invoke-virtual {v7}, Lokhttp3/x;->GS()Lokio/d;
 
     move-result-object v7
 
     invoke-direct {v2, v7}, Lokio/h;-><init>(Lokio/r;)V
 
-    iget-object v7, p1, Lokhttp3/Response;->buj:Lokhttp3/Headers;
+    iget-object v7, p1, Lokhttp3/Response;->buD:Lokhttp3/Headers;
 
-    invoke-virtual {v7}, Lokhttp3/Headers;->Gz()Lokhttp3/Headers$a;
+    invoke-virtual {v7}, Lokhttp3/Headers;->Go()Lokhttp3/Headers$a;
 
     move-result-object v7
 
-    invoke-virtual {v7, v0}, Lokhttp3/Headers$a;->ef(Ljava/lang/String;)Lokhttp3/Headers$a;
+    invoke-virtual {v7, v0}, Lokhttp3/Headers$a;->dZ(Ljava/lang/String;)Lokhttp3/Headers$a;
 
     move-result-object v0
 
-    invoke-virtual {v0, v6}, Lokhttp3/Headers$a;->ef(Ljava/lang/String;)Lokhttp3/Headers$a;
+    invoke-virtual {v0, v6}, Lokhttp3/Headers$a;->dZ(Ljava/lang/String;)Lokhttp3/Headers$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->GA()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Gp()Lokhttp3/Headers;
 
     move-result-object v0
 
     invoke-virtual {v1, v0}, Lokhttp3/Response$a;->c(Lokhttp3/Headers;)Lokhttp3/Response$a;
 
-    invoke-virtual {p1, v3}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v3}, Lokhttp3/Response;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -312,10 +312,10 @@
 
     invoke-direct {v0, p1, v4, v5, v2}, Lokhttp3/internal/c/h;-><init>(Ljava/lang/String;JLokio/d;)V
 
-    iput-object v0, v1, Lokhttp3/Response$a;->bve:Lokhttp3/x;
+    iput-object v0, v1, Lokhttp3/Response$a;->bvy:Lokhttp3/x;
 
     :cond_a
-    invoke-virtual {v1}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {v1}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/b$a.smali b/com.discord/smali_classes2/okhttp3/internal/c/b$a.smali
index 9b85a7e019..4acbc1bed2 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/b$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/b$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field bwY:J
+.field bxs:J
 
 
 # direct methods
@@ -39,11 +39,11 @@
 
     invoke-super {p0, p1, p2, p3}, Lokio/e;->write(Lokio/c;J)V
 
-    iget-wide v0, p0, Lokhttp3/internal/c/b$a;->bwY:J
+    iget-wide v0, p0, Lokhttp3/internal/c/b$a;->bxs:J
 
     add-long/2addr v0, p2
 
-    iput-wide v0, p0, Lokhttp3/internal/c/b$a;->bwY:J
+    iput-wide v0, p0, Lokhttp3/internal/c/b$a;->bxs:J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/b.smali b/com.discord/smali_classes2/okhttp3/internal/c/b.smali
index 55e424e306..68b409b145 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final buO:Z
+.field private final bvi:Z
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lokhttp3/internal/c/b;->buO:Z
+    iput-boolean p1, p0, Lokhttp3/internal/c/b;->bvi:Z
 
     return-void
 .end method
@@ -41,15 +41,15 @@
 
     check-cast p1, Lokhttp3/internal/c/g;
 
-    iget-object v0, p1, Lokhttp3/internal/c/g;->bxf:Lokhttp3/internal/c/c;
+    iget-object v0, p1, Lokhttp3/internal/c/g;->bxz:Lokhttp3/internal/c/c;
 
-    iget-object v1, p1, Lokhttp3/internal/c/g;->bxe:Lokhttp3/internal/b/g;
+    iget-object v1, p1, Lokhttp3/internal/c/g;->bxy:Lokhttp3/internal/b/g;
 
-    iget-object v2, p1, Lokhttp3/internal/c/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v2, p1, Lokhttp3/internal/c/g;->bxo:Lokhttp3/internal/b/c;
 
     check-cast v2, Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/c/g;->bvb:Lokhttp3/w;
+    iget-object p1, p1, Lokhttp3/internal/c/g;->bvv:Lokhttp3/w;
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
@@ -59,7 +59,7 @@
 
     iget-object v5, p1, Lokhttp3/w;->method:Ljava/lang/String;
 
-    invoke-static {v5}, Lokhttp3/internal/c/f;->eC(Ljava/lang/String;)Z
+    invoke-static {v5}, Lokhttp3/internal/c/f;->ex(Ljava/lang/String;)Z
 
     move-result v5
 
@@ -67,13 +67,13 @@
 
     if-eqz v5, :cond_2
 
-    iget-object v5, p1, Lokhttp3/w;->buk:Lokhttp3/RequestBody;
+    iget-object v5, p1, Lokhttp3/w;->buE:Lokhttp3/RequestBody;
 
     if-eqz v5, :cond_2
 
     const-string v5, "Expect"
 
-    invoke-virtual {p1, v5}, Lokhttp3/w;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v5}, Lokhttp3/w;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v5
 
@@ -85,18 +85,18 @@
 
     if-eqz v5, :cond_0
 
-    invoke-interface {v0}, Lokhttp3/internal/c/c;->Hw()V
+    invoke-interface {v0}, Lokhttp3/internal/c/c;->Hj()V
 
     const/4 v5, 0x1
 
-    invoke-interface {v0, v5}, Lokhttp3/internal/c/c;->ad(Z)Lokhttp3/Response$a;
+    invoke-interface {v0, v5}, Lokhttp3/internal/c/c;->aa(Z)Lokhttp3/Response$a;
 
     move-result-object v6
 
     :cond_0
     if-nez v6, :cond_1
 
-    iget-object v2, p1, Lokhttp3/w;->buk:Lokhttp3/RequestBody;
+    iget-object v2, p1, Lokhttp3/w;->buE:Lokhttp3/RequestBody;
 
     invoke-virtual {v2}, Lokhttp3/RequestBody;->contentLength()J
 
@@ -114,7 +114,7 @@
 
     move-result-object v2
 
-    iget-object v5, p1, Lokhttp3/w;->buk:Lokhttp3/RequestBody;
+    iget-object v5, p1, Lokhttp3/w;->buE:Lokhttp3/RequestBody;
 
     invoke-virtual {v5, v2}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
 
@@ -123,46 +123,46 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v2}, Lokhttp3/internal/b/c;->Ho()Z
+    invoke-virtual {v2}, Lokhttp3/internal/b/c;->Hb()Z
 
     move-result v2
 
     if-nez v2, :cond_2
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Hu()V
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Hh()V
 
     :cond_2
     :goto_0
-    invoke-interface {v0}, Lokhttp3/internal/c/c;->Hx()V
+    invoke-interface {v0}, Lokhttp3/internal/c/c;->Hk()V
 
     const/4 v2, 0x0
 
     if-nez v6, :cond_3
 
-    invoke-interface {v0, v2}, Lokhttp3/internal/c/c;->ad(Z)Lokhttp3/Response$a;
+    invoke-interface {v0, v2}, Lokhttp3/internal/c/c;->aa(Z)Lokhttp3/Response$a;
 
     move-result-object v6
 
     :cond_3
-    iput-object p1, v6, Lokhttp3/Response$a;->bvb:Lokhttp3/w;
+    iput-object p1, v6, Lokhttp3/Response$a;->bvv:Lokhttp3/w;
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Ht()Lokhttp3/internal/b/c;
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Hg()Lokhttp3/internal/b/c;
 
     move-result-object v5
 
-    iget-object v5, v5, Lokhttp3/internal/b/c;->bvd:Lokhttp3/r;
+    iget-object v5, v5, Lokhttp3/internal/b/c;->bvx:Lokhttp3/r;
 
-    iput-object v5, v6, Lokhttp3/Response$a;->bvd:Lokhttp3/r;
+    iput-object v5, v6, Lokhttp3/Response$a;->bvx:Lokhttp3/r;
 
-    iput-wide v3, v6, Lokhttp3/Response$a;->bvi:J
+    iput-wide v3, v6, Lokhttp3/Response$a;->bvC:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v7
 
-    iput-wide v7, v6, Lokhttp3/Response$a;->bvj:J
+    iput-wide v7, v6, Lokhttp3/Response$a;->bvD:J
 
-    invoke-virtual {v6}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {v6}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object v5
 
@@ -172,36 +172,36 @@
 
     if-ne v6, v7, :cond_4
 
-    invoke-interface {v0, v2}, Lokhttp3/internal/c/c;->ad(Z)Lokhttp3/Response$a;
+    invoke-interface {v0, v2}, Lokhttp3/internal/c/c;->aa(Z)Lokhttp3/Response$a;
 
     move-result-object v2
 
-    iput-object p1, v2, Lokhttp3/Response$a;->bvb:Lokhttp3/w;
+    iput-object p1, v2, Lokhttp3/Response$a;->bvv:Lokhttp3/w;
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Ht()Lokhttp3/internal/b/c;
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Hg()Lokhttp3/internal/b/c;
 
     move-result-object p1
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bvd:Lokhttp3/r;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bvx:Lokhttp3/r;
 
-    iput-object p1, v2, Lokhttp3/Response$a;->bvd:Lokhttp3/r;
+    iput-object p1, v2, Lokhttp3/Response$a;->bvx:Lokhttp3/r;
 
-    iput-wide v3, v2, Lokhttp3/Response$a;->bvi:J
+    iput-wide v3, v2, Lokhttp3/Response$a;->bvC:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v3
 
-    iput-wide v3, v2, Lokhttp3/Response$a;->bvj:J
+    iput-wide v3, v2, Lokhttp3/Response$a;->bvD:J
 
-    invoke-virtual {v2}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object v5
 
     iget v6, v5, Lokhttp3/Response;->code:I
 
     :cond_4
-    iget-boolean p1, p0, Lokhttp3/internal/c/b;->buO:Z
+    iget-boolean p1, p0, Lokhttp3/internal/c/b;->bvi:Z
 
     if-eqz p1, :cond_5
 
@@ -209,22 +209,22 @@
 
     if-ne v6, p1, :cond_5
 
-    invoke-virtual {v5}, Lokhttp3/Response;->Hd()Lokhttp3/Response$a;
+    invoke-virtual {v5}, Lokhttp3/Response;->GQ()Lokhttp3/Response$a;
 
     move-result-object p1
 
-    sget-object v0, Lokhttp3/internal/c;->bvy:Lokhttp3/x;
+    sget-object v0, Lokhttp3/internal/c;->bvS:Lokhttp3/x;
 
-    iput-object v0, p1, Lokhttp3/Response$a;->bve:Lokhttp3/x;
+    iput-object v0, p1, Lokhttp3/Response$a;->bvy:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {p1}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object p1
 
     goto :goto_1
 
     :cond_5
-    invoke-virtual {v5}, Lokhttp3/Response;->Hd()Lokhttp3/Response$a;
+    invoke-virtual {v5}, Lokhttp3/Response;->GQ()Lokhttp3/Response$a;
 
     move-result-object p1
 
@@ -232,18 +232,18 @@
 
     move-result-object v0
 
-    iput-object v0, p1, Lokhttp3/Response$a;->bve:Lokhttp3/x;
+    iput-object v0, p1, Lokhttp3/Response$a;->bvy:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {p1}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object p1
 
     :goto_1
-    iget-object v0, p1, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v0, p1, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
     const-string v2, "Connection"
 
-    invoke-virtual {v0, v2}, Lokhttp3/w;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v2}, Lokhttp3/w;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -255,7 +255,7 @@
 
     if-nez v0, :cond_6
 
-    invoke-virtual {p1, v2}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v2}, Lokhttp3/Response;->em(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -266,7 +266,7 @@
     if-eqz v0, :cond_7
 
     :cond_6
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Hu()V
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Hh()V
 
     :cond_7
     const/16 v0, 0xcc
@@ -278,7 +278,7 @@
     if-ne v6, v0, :cond_9
 
     :cond_8
-    iget-object v0, p1, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     invoke-virtual {v0}, Lokhttp3/x;->contentLength()J
 
@@ -308,7 +308,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p1, p1, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object p1, p1, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     invoke-virtual {p1}, Lokhttp3/x;->contentLength()J
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/c.smali b/com.discord/smali_classes2/okhttp3/internal/c/c.smali
index 71d70da4e4..6fec5a206a 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/c.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract Hw()V
+.method public abstract Hj()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -12,7 +12,7 @@
     .end annotation
 .end method
 
-.method public abstract Hx()V
+.method public abstract Hk()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -23,7 +23,7 @@
 .method public abstract a(Lokhttp3/w;J)Lokio/q;
 .end method
 
-.method public abstract ad(Z)Lokhttp3/Response$a;
+.method public abstract aa(Z)Lokhttp3/Response$a;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/d$1.smali b/com.discord/smali_classes2/okhttp3/internal/c/d$1.smali
index 13073f1933..39849990f8 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/d$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/d$1.smali
@@ -48,7 +48,7 @@
 
     invoke-virtual {v0, v1}, Ljava/text/DateFormat;->setLenient(Z)V
 
-    sget-object v1, Lokhttp3/internal/c;->bvJ:Ljava/util/TimeZone;
+    sget-object v1, Lokhttp3/internal/c;->bwd:Ljava/util/TimeZone;
 
     invoke-virtual {v0, v1}, Ljava/text/DateFormat;->setTimeZone(Ljava/util/TimeZone;)V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/d.smali b/com.discord/smali_classes2/okhttp3/internal/c/d.smali
index 903fad3ddf..34a9eae2cb 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/d.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bwZ:Ljava/lang/ThreadLocal;
+.field private static final bxt:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -14,9 +14,9 @@
     .end annotation
 .end field
 
-.field private static final bxa:[Ljava/lang/String;
+.field private static final bxu:[Ljava/lang/String;
 
-.field private static final bxb:[Ljava/text/DateFormat;
+.field private static final bxv:[Ljava/text/DateFormat;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {v0}, Lokhttp3/internal/c/d$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/c/d;->bwZ:Ljava/lang/ThreadLocal;
+    sput-object v0, Lokhttp3/internal/c/d;->bxt:Ljava/lang/ThreadLocal;
 
     const/16 v0, 0xf
 
@@ -123,11 +123,11 @@
 
     aput-object v3, v1, v2
 
-    sput-object v1, Lokhttp3/internal/c/d;->bxa:[Ljava/lang/String;
+    sput-object v1, Lokhttp3/internal/c/d;->bxu:[Ljava/lang/String;
 
     new-array v0, v0, [Ljava/text/DateFormat;
 
-    sput-object v0, Lokhttp3/internal/c/d;->bxb:[Ljava/text/DateFormat;
+    sput-object v0, Lokhttp3/internal/c/d;->bxv:[Ljava/text/DateFormat;
 
     return-void
 .end method
@@ -135,7 +135,7 @@
 .method public static format(Ljava/util/Date;)Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/c/d;->bwZ:Ljava/lang/ThreadLocal;
+    sget-object v0, Lokhttp3/internal/c/d;->bxt:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
 
@@ -170,7 +170,7 @@
 
     invoke-direct {v0, v2}, Ljava/text/ParsePosition;-><init>(I)V
 
-    sget-object v3, Lokhttp3/internal/c/d;->bwZ:Ljava/lang/ThreadLocal;
+    sget-object v3, Lokhttp3/internal/c/d;->bxt:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v3}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
 
@@ -195,12 +195,12 @@
     return-object v3
 
     :cond_1
-    sget-object v3, Lokhttp3/internal/c/d;->bxa:[Ljava/lang/String;
+    sget-object v3, Lokhttp3/internal/c/d;->bxu:[Ljava/lang/String;
 
     monitor-enter v3
 
     :try_start_0
-    sget-object v4, Lokhttp3/internal/c/d;->bxa:[Ljava/lang/String;
+    sget-object v4, Lokhttp3/internal/c/d;->bxu:[Ljava/lang/String;
 
     array-length v4, v4
 
@@ -209,7 +209,7 @@
     :goto_0
     if-ge v5, v4, :cond_4
 
-    sget-object v6, Lokhttp3/internal/c/d;->bxb:[Ljava/text/DateFormat;
+    sget-object v6, Lokhttp3/internal/c/d;->bxv:[Ljava/text/DateFormat;
 
     aget-object v6, v6, v5
 
@@ -217,7 +217,7 @@
 
     new-instance v6, Ljava/text/SimpleDateFormat;
 
-    sget-object v7, Lokhttp3/internal/c/d;->bxa:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/c/d;->bxu:[Ljava/lang/String;
 
     aget-object v7, v7, v5
 
@@ -225,11 +225,11 @@
 
     invoke-direct {v6, v7, v8}, Ljava/text/SimpleDateFormat;-><init>(Ljava/lang/String;Ljava/util/Locale;)V
 
-    sget-object v7, Lokhttp3/internal/c;->bvJ:Ljava/util/TimeZone;
+    sget-object v7, Lokhttp3/internal/c;->bwd:Ljava/util/TimeZone;
 
     invoke-virtual {v6, v7}, Ljava/text/DateFormat;->setTimeZone(Ljava/util/TimeZone;)V
 
-    sget-object v7, Lokhttp3/internal/c/d;->bxb:[Ljava/text/DateFormat;
+    sget-object v7, Lokhttp3/internal/c/d;->bxv:[Ljava/text/DateFormat;
 
     aput-object v6, v7, v5
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/e.smali b/com.discord/smali_classes2/okhttp3/internal/c/e.smali
index f9e03c817d..2b7a0eda8c 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/e.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final bxc:Lokio/ByteString;
+.field private static final bxw:Lokio/ByteString;
 
-.field private static final bxd:Lokio/ByteString;
+.field private static final bxx:Lokio/ByteString;
 
 
 # direct methods
@@ -15,19 +15,19 @@
 
     const-string v0, "\"\\"
 
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/c/e;->bxc:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/c/e;->bxw:Lokio/ByteString;
 
     const-string v0, "\t ,="
 
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/c/e;->bxd:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/c/e;->bxx:Lokio/ByteString;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public static a(Lokhttp3/m;Lokhttp3/s;Lokhttp3/Headers;)V
     .locals 1
 
-    sget-object v0, Lokhttp3/m;->btm:Lokhttp3/m;
+    sget-object v0, Lokhttp3/m;->btG:Lokhttp3/m;
 
     if-ne p0, v0, :cond_0
 
@@ -90,7 +90,7 @@
     return p1
 .end method
 
-.method private static eA(Ljava/lang/String;)J
+.method private static ev(Ljava/lang/String;)J
     .locals 2
 
     const-wide/16 v0, -0x1
@@ -114,7 +114,7 @@
 .method public static f(Lokhttp3/Response;)J
     .locals 2
 
-    iget-object p0, p0, Lokhttp3/Response;->buj:Lokhttp3/Headers;
+    iget-object p0, p0, Lokhttp3/Response;->buD:Lokhttp3/Headers;
 
     const-string v0, "Content-Length"
 
@@ -122,7 +122,7 @@
 
     move-result-object p0
 
-    invoke-static {p0}, Lokhttp3/internal/c/e;->eA(Ljava/lang/String;)J
+    invoke-static {p0}, Lokhttp3/internal/c/e;->ev(Ljava/lang/String;)J
 
     move-result-wide v0
 
@@ -132,7 +132,7 @@
 .method public static g(Lokhttp3/Response;)Z
     .locals 8
 
-    iget-object v0, p0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
     iget-object v0, v0, Lokhttp3/w;->method:Ljava/lang/String;
 
@@ -185,7 +185,7 @@
 
     const-string v0, "Transfer-Encoding"
 
-    invoke-virtual {p0, v0}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p0, v0}, Lokhttp3/Response;->em(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/f.smali b/com.discord/smali_classes2/okhttp3/internal/c/f.smali
index da361e1b84..8356744092 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/f.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/f.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static eB(Ljava/lang/String;)Z
+.method public static ew(Ljava/lang/String;)Z
     .locals 1
 
     const-string v0, "POST"
@@ -61,7 +61,7 @@
     return p0
 .end method
 
-.method public static eC(Ljava/lang/String;)Z
+.method public static ex(Ljava/lang/String;)Z
     .locals 1
 
     const-string v0, "GET"
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/g.smali b/com.discord/smali_classes2/okhttp3/internal/c/g.smali
index fe83b418a7..107770d651 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/g.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/g.smali
@@ -7,11 +7,7 @@
 
 
 # instance fields
-.field private final buA:I
-
-.field final buM:Lokhttp3/p;
-
-.field private final buo:Ljava/util/List;
+.field private final buI:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -21,21 +17,25 @@
     .end annotation
 .end field
 
-.field private final buy:I
+.field private final buS:I
 
-.field private final buz:I
+.field private final buT:I
 
-.field public final bvb:Lokhttp3/w;
+.field private final buU:I
 
-.field final bwJ:Lokhttp3/e;
+.field final bvg:Lokhttp3/p;
 
-.field final bwU:Lokhttp3/internal/b/c;
+.field public final bvv:Lokhttp3/w;
 
-.field public final bxe:Lokhttp3/internal/b/g;
+.field private bxA:I
 
-.field final bxf:Lokhttp3/internal/c/c;
+.field final bxd:Lokhttp3/e;
 
-.field private bxg:I
+.field final bxo:Lokhttp3/internal/b/c;
+
+.field public final bxy:Lokhttp3/internal/b/g;
+
+.field final bxz:Lokhttp3/internal/c/c;
 
 .field private final index:I
 
@@ -62,69 +62,69 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/c/g;->buo:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/c/g;->buI:Ljava/util/List;
 
-    iput-object p4, p0, Lokhttp3/internal/c/g;->bwU:Lokhttp3/internal/b/c;
+    iput-object p4, p0, Lokhttp3/internal/c/g;->bxo:Lokhttp3/internal/b/c;
 
-    iput-object p2, p0, Lokhttp3/internal/c/g;->bxe:Lokhttp3/internal/b/g;
+    iput-object p2, p0, Lokhttp3/internal/c/g;->bxy:Lokhttp3/internal/b/g;
 
-    iput-object p3, p0, Lokhttp3/internal/c/g;->bxf:Lokhttp3/internal/c/c;
+    iput-object p3, p0, Lokhttp3/internal/c/g;->bxz:Lokhttp3/internal/c/c;
 
     iput p5, p0, Lokhttp3/internal/c/g;->index:I
 
-    iput-object p6, p0, Lokhttp3/internal/c/g;->bvb:Lokhttp3/w;
+    iput-object p6, p0, Lokhttp3/internal/c/g;->bvv:Lokhttp3/w;
 
-    iput-object p7, p0, Lokhttp3/internal/c/g;->bwJ:Lokhttp3/e;
+    iput-object p7, p0, Lokhttp3/internal/c/g;->bxd:Lokhttp3/e;
 
-    iput-object p8, p0, Lokhttp3/internal/c/g;->buM:Lokhttp3/p;
+    iput-object p8, p0, Lokhttp3/internal/c/g;->bvg:Lokhttp3/p;
 
-    iput p9, p0, Lokhttp3/internal/c/g;->buy:I
+    iput p9, p0, Lokhttp3/internal/c/g;->buS:I
 
-    iput p10, p0, Lokhttp3/internal/c/g;->buz:I
+    iput p10, p0, Lokhttp3/internal/c/g;->buT:I
 
-    iput p11, p0, Lokhttp3/internal/c/g;->buA:I
+    iput p11, p0, Lokhttp3/internal/c/g;->buU:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final GL()Lokhttp3/w;
+.method public final GA()Lokhttp3/w;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/c/g;->bvb:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/internal/c/g;->bvv:Lokhttp3/w;
 
     return-object v0
 .end method
 
-.method public final GM()Lokhttp3/i;
+.method public final GB()Lokhttp3/i;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/c/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v0, p0, Lokhttp3/internal/c/g;->bxo:Lokhttp3/internal/b/c;
 
     return-object v0
 .end method
 
-.method public final GN()I
+.method public final GC()I
     .locals 1
 
-    iget v0, p0, Lokhttp3/internal/c/g;->buy:I
+    iget v0, p0, Lokhttp3/internal/c/g;->buS:I
 
     return v0
 .end method
 
-.method public final GO()I
+.method public final GD()I
     .locals 1
 
-    iget v0, p0, Lokhttp3/internal/c/g;->buz:I
+    iget v0, p0, Lokhttp3/internal/c/g;->buT:I
 
     return v0
 .end method
 
-.method public final GP()I
+.method public final GE()I
     .locals 1
 
-    iget v0, p0, Lokhttp3/internal/c/g;->buA:I
+    iget v0, p0, Lokhttp3/internal/c/g;->buU:I
 
     return v0
 .end method
@@ -141,7 +141,7 @@
 
     iget v1, v0, Lokhttp3/internal/c/g;->index:I
 
-    iget-object v2, v0, Lokhttp3/internal/c/g;->buo:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/internal/c/g;->buI:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -149,25 +149,25 @@
 
     if-ge v1, v2, :cond_8
 
-    iget v1, v0, Lokhttp3/internal/c/g;->bxg:I
+    iget v1, v0, Lokhttp3/internal/c/g;->bxA:I
 
     const/4 v2, 0x1
 
     add-int/2addr v1, v2
 
-    iput v1, v0, Lokhttp3/internal/c/g;->bxg:I
+    iput v1, v0, Lokhttp3/internal/c/g;->bxA:I
 
-    iget-object v1, v0, Lokhttp3/internal/c/g;->bxf:Lokhttp3/internal/c/c;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->bxz:Lokhttp3/internal/c/c;
 
     const-string v3, "network interceptor "
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lokhttp3/internal/c/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->bxo:Lokhttp3/internal/b/c;
 
     move-object/from16 v10, p1
 
-    iget-object v4, v10, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v4, v10, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-virtual {v1, v4}, Lokhttp3/internal/b/c;->c(Lokhttp3/s;)Z
 
@@ -184,7 +184,7 @@
 
     invoke-direct {v4, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v3, v0, Lokhttp3/internal/c/g;->buo:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/internal/c/g;->buI:Ljava/util/List;
 
     iget v5, v0, Lokhttp3/internal/c/g;->index:I
 
@@ -212,13 +212,13 @@
     move-object/from16 v10, p1
 
     :goto_0
-    iget-object v1, v0, Lokhttp3/internal/c/g;->bxf:Lokhttp3/internal/c/c;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->bxz:Lokhttp3/internal/c/c;
 
     const-string v15, " must call proceed() exactly once"
 
     if-eqz v1, :cond_3
 
-    iget v1, v0, Lokhttp3/internal/c/g;->bxg:I
+    iget v1, v0, Lokhttp3/internal/c/g;->bxA:I
 
     if-gt v1, v2, :cond_2
 
@@ -231,7 +231,7 @@
 
     invoke-direct {v4, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v3, v0, Lokhttp3/internal/c/g;->buo:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/internal/c/g;->buI:Ljava/util/List;
 
     iget v5, v0, Lokhttp3/internal/c/g;->index:I
 
@@ -257,21 +257,21 @@
     :goto_1
     new-instance v1, Lokhttp3/internal/c/g;
 
-    iget-object v5, v0, Lokhttp3/internal/c/g;->buo:Ljava/util/List;
+    iget-object v5, v0, Lokhttp3/internal/c/g;->buI:Ljava/util/List;
 
     iget v4, v0, Lokhttp3/internal/c/g;->index:I
 
     add-int/lit8 v9, v4, 0x1
 
-    iget-object v11, v0, Lokhttp3/internal/c/g;->bwJ:Lokhttp3/e;
+    iget-object v11, v0, Lokhttp3/internal/c/g;->bxd:Lokhttp3/e;
 
-    iget-object v12, v0, Lokhttp3/internal/c/g;->buM:Lokhttp3/p;
+    iget-object v12, v0, Lokhttp3/internal/c/g;->bvg:Lokhttp3/p;
 
-    iget v13, v0, Lokhttp3/internal/c/g;->buy:I
+    iget v13, v0, Lokhttp3/internal/c/g;->buS:I
 
-    iget v14, v0, Lokhttp3/internal/c/g;->buz:I
+    iget v14, v0, Lokhttp3/internal/c/g;->buT:I
 
-    iget v8, v0, Lokhttp3/internal/c/g;->buA:I
+    iget v8, v0, Lokhttp3/internal/c/g;->buU:I
 
     move-object v4, v1
 
@@ -291,7 +291,7 @@
 
     invoke-direct/range {v4 .. v15}, Lokhttp3/internal/c/g;-><init>(Ljava/util/List;Lokhttp3/internal/b/g;Lokhttp3/internal/c/c;Lokhttp3/internal/b/c;ILokhttp3/w;Lokhttp3/e;Lokhttp3/p;III)V
 
-    iget-object v4, v0, Lokhttp3/internal/c/g;->buo:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/internal/c/g;->buI:Ljava/util/List;
 
     iget v5, v0, Lokhttp3/internal/c/g;->index:I
 
@@ -311,7 +311,7 @@
 
     add-int/2addr v6, v2
 
-    iget-object v7, v0, Lokhttp3/internal/c/g;->buo:Ljava/util/List;
+    iget-object v7, v0, Lokhttp3/internal/c/g;->buI:Ljava/util/List;
 
     invoke-interface {v7}, Ljava/util/List;->size()I
 
@@ -319,7 +319,7 @@
 
     if-ge v6, v7, :cond_5
 
-    iget v1, v1, Lokhttp3/internal/c/g;->bxg:I
+    iget v1, v1, Lokhttp3/internal/c/g;->bxA:I
 
     if-ne v1, v2, :cond_4
 
@@ -352,7 +352,7 @@
 
     if-eqz v5, :cond_7
 
-    iget-object v2, v5, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v2, v5, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     if-eqz v2, :cond_6
 
@@ -416,11 +416,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/c/g;->bxe:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/c/g;->bxy:Lokhttp3/internal/b/g;
 
-    iget-object v1, p0, Lokhttp3/internal/c/g;->bxf:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/c/g;->bxz:Lokhttp3/internal/c/c;
 
-    iget-object v2, p0, Lokhttp3/internal/c/g;->bwU:Lokhttp3/internal/b/c;
+    iget-object v2, p0, Lokhttp3/internal/c/g;->bxo:Lokhttp3/internal/b/c;
 
     invoke-virtual {p0, p1, v0, v1, v2}, Lokhttp3/internal/c/g;->a(Lokhttp3/w;Lokhttp3/internal/b/g;Lokhttp3/internal/c/c;Lokhttp3/internal/b/c;)Lokhttp3/Response;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/i.smali b/com.discord/smali_classes2/okhttp3/internal/c/i.smali
index abf18acbe5..6fe08ae4d0 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/i.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/i.smali
@@ -7,11 +7,11 @@
 .method public static d(Lokhttp3/s;)Ljava/lang/String;
     .locals 2
 
-    invoke-virtual {p0}, Lokhttp3/s;->GF()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Gu()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lokhttp3/s;->GH()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Gw()Ljava/lang/String;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/j.smali b/com.discord/smali_classes2/okhttp3/internal/c/j.smali
index 1330ca230a..32f2b7f53b 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/j.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/j.smali
@@ -7,15 +7,15 @@
 
 
 # instance fields
-.field private final buJ:Lokhttp3/t;
+.field private final bvd:Lokhttp3/t;
 
-.field private final buO:Z
+.field private final bvi:Z
 
-.field public bwR:Ljava/lang/Object;
+.field public bxl:Ljava/lang/Object;
 
-.field public volatile bwW:Z
+.field public volatile bxq:Z
 
-.field public volatile bxe:Lokhttp3/internal/b/g;
+.field public volatile bxy:Lokhttp3/internal/b/g;
 
 
 # direct methods
@@ -24,9 +24,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iput-boolean p2, p0, Lokhttp3/internal/c/j;->buO:Z
+    iput-boolean p2, p0, Lokhttp3/internal/c/j;->bvi:Z
 
     return-void
 .end method
@@ -36,7 +36,7 @@
 
     const-string v0, "Retry-After"
 
-    invoke-virtual {p0, v0}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p0, v0}, Lokhttp3/Response;->em(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
@@ -74,9 +74,9 @@
 
     invoke-virtual {p2, p1}, Lokhttp3/internal/b/g;->c(Ljava/io/IOException;)V
 
-    iget-object v0, p0, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-boolean v0, v0, Lokhttp3/t;->buw:Z
+    iget-boolean v0, v0, Lokhttp3/t;->buQ:Z
 
     const/4 v1, 0x0
 
@@ -87,7 +87,7 @@
     :cond_0
     if-eqz p3, :cond_1
 
-    iget-object p4, p4, Lokhttp3/w;->buk:Lokhttp3/RequestBody;
+    iget-object p4, p4, Lokhttp3/w;->buE:Lokhttp3/RequestBody;
 
     instance-of p4, p4, Lokhttp3/internal/c/l;
 
@@ -105,7 +105,7 @@
     return v1
 
     :cond_2
-    invoke-virtual {p2}, Lokhttp3/internal/b/g;->Hv()Z
+    invoke-virtual {p2}, Lokhttp3/internal/b/g;->Hi()Z
 
     move-result p1
 
@@ -177,13 +177,13 @@
 .method private static a(Lokhttp3/Response;Lokhttp3/s;)Z
     .locals 2
 
-    iget-object p0, p0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object p0, p0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    iget-object p0, p0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object p0, p0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
-    iget-object v0, p0, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->bud:Ljava/lang/String;
 
-    iget-object v1, p1, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/s;->bud:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -197,9 +197,9 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object p0, p0, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object p0, p0, Lokhttp3/s;->buc:Ljava/lang/String;
 
-    iget-object p1, p1, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->buc:Ljava/lang/String;
 
     invoke-virtual {p0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -224,7 +224,7 @@
 
     move-object/from16 v1, p1
 
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->GC()Z
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Gr()Z
 
     move-result v2
 
@@ -232,17 +232,17 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, v0, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v2, v0, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
     iget-object v3, v2, Lokhttp3/t;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    iget-object v2, v0, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v2, v0, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
     iget-object v2, v2, Lokhttp3/t;->hostnameVerifier:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v4, v0, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v4, v0, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-object v4, v4, Lokhttp3/t;->bpX:Lokhttp3/g;
+    iget-object v4, v4, Lokhttp3/t;->bqr:Lokhttp3/g;
 
     move-object v11, v2
 
@@ -262,35 +262,35 @@
     :goto_0
     new-instance v2, Lokhttp3/a;
 
-    iget-object v6, v1, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v6, v1, Lokhttp3/s;->bud:Ljava/lang/String;
 
     iget v7, v1, Lokhttp3/s;->port:I
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-object v8, v1, Lokhttp3/t;->bpR:Lokhttp3/o;
+    iget-object v8, v1, Lokhttp3/t;->bql:Lokhttp3/o;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-object v9, v1, Lokhttp3/t;->bpS:Ljavax/net/SocketFactory;
+    iget-object v9, v1, Lokhttp3/t;->bqm:Ljavax/net/SocketFactory;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-object v13, v1, Lokhttp3/t;->bpT:Lokhttp3/b;
+    iget-object v13, v1, Lokhttp3/t;->bqn:Lokhttp3/b;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-object v14, v1, Lokhttp3/t;->bpW:Ljava/net/Proxy;
+    iget-object v14, v1, Lokhttp3/t;->bqq:Ljava/net/Proxy;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-object v15, v1, Lokhttp3/t;->bpU:Ljava/util/List;
+    iget-object v15, v1, Lokhttp3/t;->bqo:Ljava/util/List;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->bpV:Ljava/util/List;
+    iget-object v1, v1, Lokhttp3/t;->bqp:Ljava/util/List;
 
-    iget-object v3, v0, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v3, v0, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
     iget-object v3, v3, Lokhttp3/t;->proxySelector:Ljava/net/ProxySelector;
 
@@ -312,9 +312,9 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/c/j;->bwW:Z
+    iput-boolean v0, p0, Lokhttp3/internal/c/j;->bxq:Z
 
-    iget-object v0, p0, Lokhttp3/internal/c/j;->bxe:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/c/j;->bxy:Lokhttp3/internal/b/g;
 
     if-eqz v0, :cond_0
 
@@ -336,7 +336,7 @@
 
     const-string v2, "PROPFIND"
 
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GL()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->GA()Lokhttp3/w;
 
     move-result-object v0
 
@@ -344,23 +344,23 @@
 
     check-cast v3, Lokhttp3/internal/c/g;
 
-    iget-object v10, v3, Lokhttp3/internal/c/g;->bwJ:Lokhttp3/e;
+    iget-object v10, v3, Lokhttp3/internal/c/g;->bxd:Lokhttp3/e;
 
-    iget-object v11, v3, Lokhttp3/internal/c/g;->buM:Lokhttp3/p;
+    iget-object v11, v3, Lokhttp3/internal/c/g;->bvg:Lokhttp3/p;
 
     new-instance v12, Lokhttp3/internal/b/g;
 
-    iget-object v4, v1, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v4, v1, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-object v5, v4, Lokhttp3/t;->but:Lokhttp3/j;
+    iget-object v5, v4, Lokhttp3/t;->buN:Lokhttp3/j;
 
-    iget-object v4, v0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v4, v0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-direct {v1, v4}, Lokhttp3/internal/c/j;->e(Lokhttp3/s;)Lokhttp3/a;
 
     move-result-object v6
 
-    iget-object v9, v1, Lokhttp3/internal/c/j;->bwR:Ljava/lang/Object;
+    iget-object v9, v1, Lokhttp3/internal/c/j;->bxl:Ljava/lang/Object;
 
     move-object v4, v12
 
@@ -370,7 +370,7 @@
 
     invoke-direct/range {v4 .. v9}, Lokhttp3/internal/b/g;-><init>(Lokhttp3/j;Lokhttp3/a;Lokhttp3/e;Lokhttp3/p;Ljava/lang/Object;)V
 
-    iput-object v12, v1, Lokhttp3/internal/c/j;->bxe:Lokhttp3/internal/b/g;
+    iput-object v12, v1, Lokhttp3/internal/c/j;->bxy:Lokhttp3/internal/b/g;
 
     const/4 v13, 0x0
 
@@ -383,7 +383,7 @@
     const/4 v6, 0x0
 
     :goto_0
-    iget-boolean v0, v1, Lokhttp3/internal/c/j;->bwW:Z
+    iget-boolean v0, v1, Lokhttp3/internal/c/j;->bxq:Z
 
     if-nez v0, :cond_1a
 
@@ -400,27 +400,27 @@
 
     if-eqz v5, :cond_1
 
-    invoke-virtual {v0}, Lokhttp3/Response;->Hd()Lokhttp3/Response$a;
+    invoke-virtual {v0}, Lokhttp3/Response;->GQ()Lokhttp3/Response$a;
 
     move-result-object v0
 
-    invoke-virtual {v5}, Lokhttp3/Response;->Hd()Lokhttp3/Response$a;
+    invoke-virtual {v5}, Lokhttp3/Response;->GQ()Lokhttp3/Response$a;
 
     move-result-object v4
 
-    iput-object v14, v4, Lokhttp3/Response$a;->bve:Lokhttp3/x;
+    iput-object v14, v4, Lokhttp3/Response$a;->bvy:Lokhttp3/x;
 
-    invoke-virtual {v4}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {v4}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object v4
 
-    iget-object v5, v4, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v5, v4, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     if-nez v5, :cond_0
 
-    iput-object v4, v0, Lokhttp3/Response$a;->bvh:Lokhttp3/Response;
+    iput-object v4, v0, Lokhttp3/Response$a;->bvB:Lokhttp3/Response;
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->He()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->GR()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -438,13 +438,13 @@
     :cond_1
     :goto_1
     :try_start_1
-    iget-object v4, v12, Lokhttp3/internal/b/g;->bww:Lokhttp3/y;
+    iget-object v4, v12, Lokhttp3/internal/b/g;->bwQ:Lokhttp3/y;
 
     if-eqz v0, :cond_16
 
     iget v5, v0, Lokhttp3/Response;->code:I
 
-    iget-object v8, v0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v8, v0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
     iget-object v8, v8, Lokhttp3/w;->method:Ljava/lang/String;
     :try_end_1
@@ -482,25 +482,25 @@
 
     :cond_2
     :try_start_2
-    iget-object v5, v1, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v5, v1, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-boolean v5, v5, Lokhttp3/t;->buw:Z
+    iget-boolean v5, v5, Lokhttp3/t;->buQ:Z
 
     if-eqz v5, :cond_10
 
-    iget-object v5, v0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    iget-object v5, v5, Lokhttp3/w;->buk:Lokhttp3/RequestBody;
+    iget-object v5, v5, Lokhttp3/w;->buE:Lokhttp3/RequestBody;
 
     instance-of v5, v5, Lokhttp3/internal/c/l;
 
     if-nez v5, :cond_10
 
-    iget-object v5, v0, Lokhttp3/Response;->bvh:Lokhttp3/Response;
+    iget-object v5, v0, Lokhttp3/Response;->bvB:Lokhttp3/Response;
 
     if-eqz v5, :cond_3
 
-    iget-object v5, v0, Lokhttp3/Response;->bvh:Lokhttp3/Response;
+    iget-object v5, v0, Lokhttp3/Response;->bvB:Lokhttp3/Response;
 
     iget v5, v5, Lokhttp3/Response;->code:I
 
@@ -513,21 +513,21 @@
 
     if-gtz v4, :cond_10
 
-    iget-object v4, v0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
     goto :goto_3
 
     :cond_4
     if-eqz v4, :cond_5
 
-    iget-object v4, v4, Lokhttp3/y;->bpW:Ljava/net/Proxy;
+    iget-object v4, v4, Lokhttp3/y;->bqq:Ljava/net/Proxy;
 
     goto :goto_2
 
     :cond_5
-    iget-object v4, v1, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v4, v1, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-object v4, v4, Lokhttp3/t;->bpW:Ljava/net/Proxy;
+    iget-object v4, v4, Lokhttp3/t;->bqq:Ljava/net/Proxy;
 
     :goto_2
     invoke-virtual {v4}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
@@ -550,11 +550,11 @@
     throw v0
 
     :cond_7
-    iget-object v4, v0, Lokhttp3/Response;->bvh:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/Response;->bvB:Lokhttp3/Response;
 
     if-eqz v4, :cond_8
 
-    iget-object v4, v0, Lokhttp3/Response;->bvh:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/Response;->bvB:Lokhttp3/Response;
 
     iget v4, v4, Lokhttp3/Response;->code:I
 
@@ -569,7 +569,7 @@
 
     if-nez v4, :cond_10
 
-    iget-object v4, v0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
     :goto_3
     move-object v15, v4
@@ -593,37 +593,37 @@
 
     :cond_a
     :pswitch_0
-    iget-object v4, v1, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v4, v1, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-boolean v4, v4, Lokhttp3/t;->buv:Z
+    iget-boolean v4, v4, Lokhttp3/t;->buP:Z
 
     if-eqz v4, :cond_10
 
     const-string v4, "Location"
 
-    invoke-virtual {v0, v4}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v4}, Lokhttp3/Response;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
     if-eqz v4, :cond_10
 
-    iget-object v5, v0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    iget-object v5, v5, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v5, v5, Lokhttp3/w;->bqk:Lokhttp3/s;
 
-    invoke-virtual {v5, v4}, Lokhttp3/s;->ei(Ljava/lang/String;)Lokhttp3/s;
+    invoke-virtual {v5, v4}, Lokhttp3/s;->ec(Ljava/lang/String;)Lokhttp3/s;
 
     move-result-object v4
 
     if-eqz v4, :cond_10
 
-    iget-object v5, v4, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object v5, v4, Lokhttp3/s;->buc:Ljava/lang/String;
 
-    iget-object v9, v0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v9, v0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    iget-object v9, v9, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v9, v9, Lokhttp3/w;->bqk:Lokhttp3/s;
 
-    iget-object v9, v9, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object v9, v9, Lokhttp3/s;->buc:Ljava/lang/String;
 
     invoke-virtual {v5, v9}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -631,20 +631,20 @@
 
     if-nez v5, :cond_b
 
-    iget-object v5, v1, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v5, v1, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-boolean v5, v5, Lokhttp3/t;->buu:Z
+    iget-boolean v5, v5, Lokhttp3/t;->buO:Z
 
     if-eqz v5, :cond_10
 
     :cond_b
-    iget-object v5, v0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    invoke-virtual {v5}, Lokhttp3/w;->GZ()Lokhttp3/w$a;
+    invoke-virtual {v5}, Lokhttp3/w;->GN()Lokhttp3/w$a;
 
     move-result-object v5
 
-    invoke-static {v8}, Lokhttp3/internal/c/f;->eC(Ljava/lang/String;)Z
+    invoke-static {v8}, Lokhttp3/internal/c/f;->ex(Ljava/lang/String;)Z
 
     move-result v9
 
@@ -669,9 +669,9 @@
     :cond_c
     if-eqz v9, :cond_d
 
-    iget-object v7, v0, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object v7, v0, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    iget-object v7, v7, Lokhttp3/w;->buk:Lokhttp3/RequestBody;
+    iget-object v7, v7, Lokhttp3/w;->buE:Lokhttp3/RequestBody;
 
     goto :goto_4
 
@@ -686,15 +686,15 @@
 
     const-string v7, "Transfer-Encoding"
 
-    invoke-virtual {v5, v7}, Lokhttp3/w$a;->er(Ljava/lang/String;)Lokhttp3/w$a;
+    invoke-virtual {v5, v7}, Lokhttp3/w$a;->el(Ljava/lang/String;)Lokhttp3/w$a;
 
     const-string v7, "Content-Length"
 
-    invoke-virtual {v5, v7}, Lokhttp3/w$a;->er(Ljava/lang/String;)Lokhttp3/w$a;
+    invoke-virtual {v5, v7}, Lokhttp3/w$a;->el(Ljava/lang/String;)Lokhttp3/w$a;
 
     const-string v7, "Content-Type"
 
-    invoke-virtual {v5, v7}, Lokhttp3/w$a;->er(Ljava/lang/String;)Lokhttp3/w$a;
+    invoke-virtual {v5, v7}, Lokhttp3/w$a;->el(Ljava/lang/String;)Lokhttp3/w$a;
 
     :cond_e
     invoke-static {v0, v4}, Lokhttp3/internal/c/j;->a(Lokhttp3/Response;Lokhttp3/s;)Z
@@ -705,14 +705,14 @@
 
     const-string v7, "Authorization"
 
-    invoke-virtual {v5, v7}, Lokhttp3/w$a;->er(Ljava/lang/String;)Lokhttp3/w$a;
+    invoke-virtual {v5, v7}, Lokhttp3/w$a;->el(Ljava/lang/String;)Lokhttp3/w$a;
 
     :cond_f
     invoke-virtual {v5, v4}, Lokhttp3/w$a;->b(Lokhttp3/s;)Lokhttp3/w$a;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lokhttp3/w$a;->Hc()Lokhttp3/w;
+    invoke-virtual {v4}, Lokhttp3/w$a;->GP()Lokhttp3/w;
 
     move-result-object v4
     :try_end_2
@@ -732,7 +732,7 @@
     return-object v0
 
     :cond_11
-    iget-object v4, v0, Lokhttp3/Response;->bve:Lokhttp3/x;
+    iget-object v4, v0, Lokhttp3/Response;->bvy:Lokhttp3/x;
 
     invoke-static {v4}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
@@ -742,13 +742,13 @@
 
     if-gt v9, v4, :cond_15
 
-    iget-object v4, v15, Lokhttp3/w;->buk:Lokhttp3/RequestBody;
+    iget-object v4, v15, Lokhttp3/w;->buE:Lokhttp3/RequestBody;
 
     instance-of v4, v4, Lokhttp3/internal/c/l;
 
     if-nez v4, :cond_14
 
-    iget-object v4, v15, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v4, v15, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-static {v0, v4}, Lokhttp3/internal/c/j;->a(Lokhttp3/Response;Lokhttp3/s;)Z
 
@@ -760,17 +760,17 @@
 
     new-instance v12, Lokhttp3/internal/b/g;
 
-    iget-object v4, v1, Lokhttp3/internal/c/j;->buJ:Lokhttp3/t;
+    iget-object v4, v1, Lokhttp3/internal/c/j;->bvd:Lokhttp3/t;
 
-    iget-object v5, v4, Lokhttp3/t;->but:Lokhttp3/j;
+    iget-object v5, v4, Lokhttp3/t;->buN:Lokhttp3/j;
 
-    iget-object v4, v15, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v4, v15, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-direct {v1, v4}, Lokhttp3/internal/c/j;->e(Lokhttp3/s;)Lokhttp3/a;
 
     move-result-object v6
 
-    iget-object v8, v1, Lokhttp3/internal/c/j;->bwR:Ljava/lang/Object;
+    iget-object v8, v1, Lokhttp3/internal/c/j;->bxl:Ljava/lang/Object;
 
     move-object v4, v12
 
@@ -786,14 +786,14 @@
 
     invoke-direct/range {v4 .. v9}, Lokhttp3/internal/b/g;-><init>(Lokhttp3/j;Lokhttp3/a;Lokhttp3/e;Lokhttp3/p;Ljava/lang/Object;)V
 
-    iput-object v12, v1, Lokhttp3/internal/c/j;->bxe:Lokhttp3/internal/b/g;
+    iput-object v12, v1, Lokhttp3/internal/c/j;->bxy:Lokhttp3/internal/b/g;
 
     goto :goto_8
 
     :cond_12
     move/from16 v17, v9
 
-    invoke-virtual {v12}, Lokhttp3/internal/b/g;->Hr()Lokhttp3/internal/c/c;
+    invoke-virtual {v12}, Lokhttp3/internal/b/g;->He()Lokhttp3/internal/c/c;
 
     move-result-object v4
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/k.smali b/com.discord/smali_classes2/okhttp3/internal/c/k.smali
index 78f2056ea5..a8fb81c2b3 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/k.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/k.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final bvc:Lokhttp3/u;
+.field public final bvw:Lokhttp3/u;
 
 .field public final code:I
 
@@ -17,7 +17,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/c/k;->bvc:Lokhttp3/u;
+    iput-object p1, p0, Lokhttp3/internal/c/k;->bvw:Lokhttp3/u;
 
     iput p2, p0, Lokhttp3/internal/c/k;->code:I
 
@@ -26,7 +26,7 @@
     return-void
 .end method
 
-.method public static eD(Ljava/lang/String;)Lokhttp3/internal/c/k;
+.method public static ey(Ljava/lang/String;)Lokhttp3/internal/c/k;
     .locals 8
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -74,7 +74,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lokhttp3/u;->buC:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->buW:Lokhttp3/u;
 
     goto :goto_0
 
@@ -83,7 +83,7 @@
 
     if-ne v0, v5, :cond_1
 
-    sget-object v0, Lokhttp3/u;->buD:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->buX:Lokhttp3/u;
 
     goto :goto_0
 
@@ -126,7 +126,7 @@
 
     if-eqz v0, :cond_7
 
-    sget-object v0, Lokhttp3/u;->buC:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->buW:Lokhttp3/u;
 
     const/4 v3, 0x4
 
@@ -250,9 +250,9 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/internal/c/k;->bvc:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/internal/c/k;->bvw:Lokhttp3/u;
 
-    sget-object v2, Lokhttp3/u;->buC:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->buW:Lokhttp3/u;
 
     if-ne v1, v2, :cond_0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/d/a$a.smali b/com.discord/smali_classes2/okhttp3/internal/d/a$a.smali
index 4ecf5c1968..c5e80c000e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$a.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field protected final bxj:Lokio/g;
+.field protected final bxD:Lokio/g;
 
-.field protected bxk:J
+.field protected bxE:J
 
-.field final synthetic bxl:Lokhttp3/internal/d/a;
+.field final synthetic bxF:Lokhttp3/internal/d/a;
 
 .field protected closed:Z
 
@@ -31,15 +31,15 @@
 .method private constructor <init>(Lokhttp3/internal/d/a;)V
     .locals 2
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$a;->bxl:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$a;->bxF:Lokhttp3/internal/d/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     new-instance p1, Lokio/g;
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->nJ:Lokio/d;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/s;
 
@@ -47,11 +47,11 @@
 
     invoke-direct {p1, v0}, Lokio/g;-><init>(Lokio/s;)V
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$a;->bxj:Lokio/g;
+    iput-object p1, p0, Lokhttp3/internal/d/a$a;->bxD:Lokio/g;
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->bxk:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->bxE:J
 
     return-void
 .end method
@@ -75,9 +75,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->nJ:Lokio/d;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->nI:Lokio/d;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/d;->a(Lokio/c;J)J
 
@@ -89,11 +89,11 @@
 
     if-lez p3, :cond_0
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$a;->bxk:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$a;->bxE:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->bxk:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->bxE:J
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -118,7 +118,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxF:Lokhttp3/internal/d/a;
 
     iget v0, v0, Lokhttp3/internal/d/a;->state:I
 
@@ -129,7 +129,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxF:Lokhttp3/internal/d/a;
 
     iget v0, v0, Lokhttp3/internal/d/a;->state:I
 
@@ -137,25 +137,25 @@
 
     if-ne v0, v2, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxj:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxD:Lokio/g;
 
     invoke-static {v0}, Lokhttp3/internal/d/a;->a(Lokio/g;)V
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxF:Lokhttp3/internal/d/a;
 
     iput v1, v0, Lokhttp3/internal/d/a;->state:I
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->bxe:Lokhttp3/internal/b/g;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bxy:Lokhttp3/internal/b/g;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->bxe:Lokhttp3/internal/b/g;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bxy:Lokhttp3/internal/b/g;
 
     xor-int/lit8 p1, p1, 0x1
 
-    iget-object v1, p0, Lokhttp3/internal/d/a$a;->bxl:Lokhttp3/internal/d/a;
+    iget-object v1, p0, Lokhttp3/internal/d/a$a;->bxF:Lokhttp3/internal/d/a;
 
     invoke-virtual {v0, p1, v1, p2}, Lokhttp3/internal/b/g;->a(ZLokhttp3/internal/c/c;Ljava/io/IOException;)V
 
@@ -171,7 +171,7 @@
 
     invoke-direct {p2, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxF:Lokhttp3/internal/d/a;
 
     iget v0, v0, Lokhttp3/internal/d/a;->state:I
 
@@ -189,7 +189,7 @@
 .method public timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxj:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->bxD:Lokio/g;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/d/a$b.smali b/com.discord/smali_classes2/okhttp3/internal/d/a$b.smali
index a5bd50fe54..11dfe0e637 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$b.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field private final bxj:Lokio/g;
+.field private final bxD:Lokio/g;
 
-.field final synthetic bxl:Lokhttp3/internal/d/a;
+.field final synthetic bxF:Lokhttp3/internal/d/a;
 
 .field private closed:Z
 
@@ -29,15 +29,15 @@
 .method constructor <init>(Lokhttp3/internal/d/a;)V
     .locals 1
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$b;->bxl:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$b;->bxF:Lokhttp3/internal/d/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     new-instance p1, Lokio/g;
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->timeout()Lokio/s;
 
@@ -45,7 +45,7 @@
 
     invoke-direct {p1, v0}, Lokio/g;-><init>(Lokio/s;)V
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$b;->bxj:Lokio/g;
+    iput-object p1, p0, Lokhttp3/internal/d/a$b;->bxD:Lokio/g;
 
     return-void
 .end method
@@ -79,19 +79,19 @@
     :try_start_1
     iput-boolean v0, p0, Lokhttp3/internal/d/a$b;->closed:Z
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
     const-string v1, "0\r\n\r\n"
 
-    invoke-interface {v0, v1}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {v0, v1}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxj:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxD:Lokio/g;
 
     invoke-static {v0}, Lokhttp3/internal/d/a;->a(Lokio/g;)V
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxF:Lokhttp3/internal/d/a;
 
     const/4 v1, 0x3
 
@@ -134,9 +134,9 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
     :try_end_1
@@ -157,7 +157,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxj:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxD:Lokio/g;
 
     return-object v0
 .end method
@@ -183,31 +183,31 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0, p2, p3}, Lokio/BufferedSink;->aQ(J)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
     const-string v1, "\r\n"
 
-    invoke-interface {v0, v1}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {v0, v1}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/BufferedSink;->write(Lokio/c;J)V
 
-    iget-object p1, p0, Lokhttp3/internal/d/a$b;->bxl:Lokhttp3/internal/d/a;
+    iget-object p1, p0, Lokhttp3/internal/d/a$b;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object p1, p1, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object p1, p1, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
-    invoke-interface {p1, v1}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {p1, v1}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     return-void
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/d/a$c.smali b/com.discord/smali_classes2/okhttp3/internal/d/a$c.smali
index 701bd74f7a..2efd6860b4 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$c.smali
@@ -15,20 +15,20 @@
 
 
 # instance fields
-.field private final bpQ:Lokhttp3/s;
+.field private final bqk:Lokhttp3/s;
 
-.field final synthetic bxl:Lokhttp3/internal/d/a;
+.field final synthetic bxF:Lokhttp3/internal/d/a;
 
-.field private bxm:J
+.field private bxG:J
 
-.field private bxn:Z
+.field private bxH:Z
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/d/a;Lokhttp3/s;)V
     .locals 2
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$c;->bxl:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$c;->bxF:Lokhttp3/internal/d/a;
 
     const/4 v0, 0x0
 
@@ -36,13 +36,13 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->bxm:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->bxG:J
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lokhttp3/internal/d/a$c;->bxn:Z
+    iput-boolean p1, p0, Lokhttp3/internal/d/a$c;->bxH:Z
 
-    iput-object p2, p0, Lokhttp3/internal/d/a$c;->bpQ:Lokhttp3/s;
+    iput-object p2, p0, Lokhttp3/internal/d/a$c;->bqk:Lokhttp3/s;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     if-nez v2, :cond_8
 
-    iget-boolean v2, p0, Lokhttp3/internal/d/a$c;->bxn:Z
+    iget-boolean v2, p0, Lokhttp3/internal/d/a$c;->bxH:Z
 
     const-wide/16 v3, -0x1
 
@@ -76,7 +76,7 @@
     return-wide v3
 
     :cond_0
-    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->bxm:J
+    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->bxG:J
 
     const/4 v2, 0x0
 
@@ -89,35 +89,35 @@
     if-nez v7, :cond_5
 
     :cond_1
-    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->bxm:J
+    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->bxG:J
 
     cmp-long v7, v5, v3
 
     if-eqz v7, :cond_2
 
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->bxl:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v5, v5, Lokhttp3/internal/d/a;->nJ:Lokio/d;
+    iget-object v5, v5, Lokhttp3/internal/d/a;->nI:Lokio/d;
 
-    invoke-interface {v5}, Lokio/d;->IB()Ljava/lang/String;
+    invoke-interface {v5}, Lokio/d;->Io()Ljava/lang/String;
 
     :cond_2
     :try_start_0
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->bxl:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v5, v5, Lokhttp3/internal/d/a;->nJ:Lokio/d;
+    iget-object v5, v5, Lokhttp3/internal/d/a;->nI:Lokio/d;
 
-    invoke-interface {v5}, Lokio/d;->Iz()J
+    invoke-interface {v5}, Lokio/d;->Im()J
 
     move-result-wide v5
 
-    iput-wide v5, p0, Lokhttp3/internal/d/a$c;->bxm:J
+    iput-wide v5, p0, Lokhttp3/internal/d/a$c;->bxG:J
 
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->bxl:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v5, v5, Lokhttp3/internal/d/a;->nJ:Lokio/d;
+    iget-object v5, v5, Lokhttp3/internal/d/a;->nI:Lokio/d;
 
-    invoke-interface {v5}, Lokio/d;->IB()Ljava/lang/String;
+    invoke-interface {v5}, Lokio/d;->Io()Ljava/lang/String;
 
     move-result-object v5
 
@@ -125,7 +125,7 @@
 
     move-result-object v5
 
-    iget-wide v6, p0, Lokhttp3/internal/d/a$c;->bxm:J
+    iget-wide v6, p0, Lokhttp3/internal/d/a$c;->bxG:J
 
     cmp-long v8, v6, v0
 
@@ -148,25 +148,25 @@
     if-eqz v6, :cond_7
 
     :cond_3
-    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->bxm:J
+    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->bxG:J
 
     cmp-long v7, v5, v0
 
     if-nez v7, :cond_4
 
-    iput-boolean v2, p0, Lokhttp3/internal/d/a$c;->bxn:Z
+    iput-boolean v2, p0, Lokhttp3/internal/d/a$c;->bxH:Z
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$c;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$c;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->buJ:Lokhttp3/t;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bvd:Lokhttp3/t;
 
     iget-object v0, v0, Lokhttp3/t;->cookieJar:Lokhttp3/m;
 
-    iget-object v1, p0, Lokhttp3/internal/d/a$c;->bpQ:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/internal/d/a$c;->bqk:Lokhttp3/s;
 
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->bxl:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->bxF:Lokhttp3/internal/d/a;
 
-    invoke-virtual {v5}, Lokhttp3/internal/d/a;->Hz()Lokhttp3/Headers;
+    invoke-virtual {v5}, Lokhttp3/internal/d/a;->Hm()Lokhttp3/Headers;
 
     move-result-object v5
 
@@ -179,14 +179,14 @@
     invoke-virtual {p0, v0, v1}, Lokhttp3/internal/d/a$c;->a(ZLjava/io/IOException;)V
 
     :cond_4
-    iget-boolean v0, p0, Lokhttp3/internal/d/a$c;->bxn:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$c;->bxH:Z
 
     if-nez v0, :cond_5
 
     return-wide v3
 
     :cond_5
-    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->bxm:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->bxG:J
 
     invoke-static {p2, p3, v0, v1}, Ljava/lang/Math;->min(JJ)J
 
@@ -200,11 +200,11 @@
 
     if-eqz p3, :cond_6
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->bxm:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->bxG:J
 
     sub-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->bxm:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->bxG:J
 
     return-wide p1
 
@@ -229,7 +229,7 @@
 
     invoke-direct {p2, p3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->bxm:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->bxG:J
 
     invoke-virtual {p2, v0, v1}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
@@ -304,7 +304,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lokhttp3/internal/d/a$c;->bxn:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$c;->bxH:Z
 
     if-eqz v0, :cond_1
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/d/a$d.smali b/com.discord/smali_classes2/okhttp3/internal/d/a$d.smali
index 2a4e8fe8ac..b1c13b204e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$d.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field private final bxj:Lokio/g;
+.field private final bxD:Lokio/g;
 
-.field final synthetic bxl:Lokhttp3/internal/d/a;
+.field final synthetic bxF:Lokhttp3/internal/d/a;
 
-.field private bxo:J
+.field private bxI:J
 
 .field private closed:Z
 
@@ -31,15 +31,15 @@
 .method constructor <init>(Lokhttp3/internal/d/a;J)V
     .locals 1
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$d;->bxl:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$d;->bxF:Lokhttp3/internal/d/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     new-instance p1, Lokio/g;
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->timeout()Lokio/s;
 
@@ -47,9 +47,9 @@
 
     invoke-direct {p1, v0}, Lokio/g;-><init>(Lokio/s;)V
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$d;->bxj:Lokio/g;
+    iput-object p1, p0, Lokhttp3/internal/d/a$d;->bxD:Lokio/g;
 
-    iput-wide p2, p0, Lokhttp3/internal/d/a$d;->bxo:J
+    iput-wide p2, p0, Lokhttp3/internal/d/a$d;->bxI:J
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 
     iput-boolean v0, p0, Lokhttp3/internal/d/a$d;->closed:Z
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->bxo:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->bxI:J
 
     const-wide/16 v2, 0x0
 
@@ -83,11 +83,11 @@
 
     if-gtz v4, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->bxj:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->bxD:Lokio/g;
 
     invoke-static {v0}, Lokhttp3/internal/d/a;->a(Lokio/g;)V
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->bxF:Lokhttp3/internal/d/a;
 
     const/4 v1, 0x3
 
@@ -120,9 +120,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
 
@@ -132,7 +132,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->bxj:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->bxD:Lokio/g;
 
     return-object v0
 .end method
@@ -157,23 +157,23 @@
 
     invoke-static/range {v1 .. v6}, Lokhttp3/internal/c;->a(JJJ)V
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->bxo:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->bxI:J
 
     cmp-long v2, p2, v0
 
     if-gtz v2, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->bxl:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->bxF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/BufferedSink;->write(Lokio/c;J)V
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->bxo:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->bxI:J
 
     sub-long/2addr v0, p2
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$d;->bxo:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$d;->bxI:J
 
     return-void
 
@@ -186,7 +186,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide v1, p0, Lokhttp3/internal/d/a$d;->bxo:J
+    iget-wide v1, p0, Lokhttp3/internal/d/a$d;->bxI:J
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/d/a$e.smali b/com.discord/smali_classes2/okhttp3/internal/d/a$e.smali
index bc0dceefce..cf7499a13e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$e.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field final synthetic bxl:Lokhttp3/internal/d/a;
+.field final synthetic bxF:Lokhttp3/internal/d/a;
 
-.field private bxo:J
+.field private bxI:J
 
 
 # direct methods
@@ -29,15 +29,15 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$e;->bxl:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$e;->bxF:Lokhttp3/internal/d/a;
 
     const/4 v0, 0x0
 
     invoke-direct {p0, p1, v0}, Lokhttp3/internal/d/a$a;-><init>(Lokhttp3/internal/d/a;B)V
 
-    iput-wide p2, p0, Lokhttp3/internal/d/a$e;->bxo:J
+    iput-wide p2, p0, Lokhttp3/internal/d/a$e;->bxI:J
 
-    iget-wide p1, p0, Lokhttp3/internal/d/a$e;->bxo:J
+    iget-wide p1, p0, Lokhttp3/internal/d/a$e;->bxI:J
 
     const-wide/16 v0, 0x0
 
@@ -75,7 +75,7 @@
 
     if-nez v2, :cond_3
 
-    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->bxo:J
+    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->bxI:J
 
     const-wide/16 v4, -0x1
 
@@ -98,13 +98,13 @@
 
     if-eqz p3, :cond_2
 
-    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->bxo:J
+    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->bxI:J
 
     sub-long/2addr v2, p1
 
-    iput-wide v2, p0, Lokhttp3/internal/d/a$e;->bxo:J
+    iput-wide v2, p0, Lokhttp3/internal/d/a$e;->bxI:J
 
-    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->bxo:J
+    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->bxI:J
 
     cmp-long p3, v2, v0
 
@@ -174,7 +174,7 @@
     return-void
 
     :cond_0
-    iget-wide v0, p0, Lokhttp3/internal/d/a$e;->bxo:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$e;->bxI:J
 
     const-wide/16 v2, 0x0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/d/a$f.smali b/com.discord/smali_classes2/okhttp3/internal/d/a$f.smali
index e255f82812..0cda5daf43 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$f.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$f.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field final synthetic bxl:Lokhttp3/internal/d/a;
+.field final synthetic bxF:Lokhttp3/internal/d/a;
 
-.field private bxp:Z
+.field private bxJ:Z
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/d/a;)V
     .locals 1
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$f;->bxl:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$f;->bxF:Lokhttp3/internal/d/a;
 
     const/4 v0, 0x0
 
@@ -53,7 +53,7 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->bxp:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->bxJ:Z
 
     const-wide/16 v1, -0x1
 
@@ -72,7 +72,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lokhttp3/internal/d/a$f;->bxp:Z
+    iput-boolean p1, p0, Lokhttp3/internal/d/a$f;->bxJ:Z
 
     const/4 p2, 0x0
 
@@ -125,7 +125,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->bxp:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->bxJ:Z
 
     if-nez v0, :cond_1
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/d/a.smali b/com.discord/smali_classes2/okhttp3/internal/d/a.smali
index 065f5c3139..32858c3aa4 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a.smali
@@ -20,15 +20,15 @@
 
 
 # instance fields
-.field final buJ:Lokhttp3/t;
+.field final bvd:Lokhttp3/t;
 
-.field final bwA:Lokio/BufferedSink;
+.field final bwU:Lokio/BufferedSink;
 
-.field final bxe:Lokhttp3/internal/b/g;
+.field private bxC:J
 
-.field private bxi:J
+.field final bxy:Lokhttp3/internal/b/g;
 
-.field final nJ:Lokio/d;
+.field final nI:Lokio/d;
 
 .field state:I
 
@@ -45,20 +45,20 @@
 
     const-wide/32 v0, 0x40000
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a;->bxi:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a;->bxC:J
 
-    iput-object p1, p0, Lokhttp3/internal/d/a;->buJ:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/internal/d/a;->bvd:Lokhttp3/t;
 
-    iput-object p2, p0, Lokhttp3/internal/d/a;->bxe:Lokhttp3/internal/b/g;
+    iput-object p2, p0, Lokhttp3/internal/d/a;->bxy:Lokhttp3/internal/b/g;
 
-    iput-object p3, p0, Lokhttp3/internal/d/a;->nJ:Lokio/d;
+    iput-object p3, p0, Lokhttp3/internal/d/a;->nI:Lokio/d;
 
-    iput-object p4, p0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iput-object p4, p0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
     return-void
 .end method
 
-.method private Hy()Ljava/lang/String;
+.method private Hl()Ljava/lang/String;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -66,15 +66,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->nI:Lokio/d;
 
-    iget-wide v1, p0, Lokhttp3/internal/d/a;->bxi:J
+    iget-wide v1, p0, Lokhttp3/internal/d/a;->bxC:J
 
     invoke-interface {v0, v1, v2}, Lokio/d;->aK(J)Ljava/lang/String;
 
     move-result-object v0
 
-    iget-wide v1, p0, Lokhttp3/internal/d/a;->bxi:J
+    iget-wide v1, p0, Lokhttp3/internal/d/a;->bxC:J
 
     invoke-virtual {v0}, Ljava/lang/String;->length()I
 
@@ -84,7 +84,7 @@
 
     sub-long/2addr v1, v3
 
-    iput-wide v1, p0, Lokhttp3/internal/d/a;->bxi:J
+    iput-wide v1, p0, Lokhttp3/internal/d/a;->bxC:J
 
     return-object v0
 .end method
@@ -92,17 +92,17 @@
 .method static a(Lokio/g;)V
     .locals 2
 
-    iget-object v0, p0, Lokio/g;->bBv:Lokio/s;
+    iget-object v0, p0, Lokio/g;->bBP:Lokio/s;
 
-    sget-object v1, Lokio/s;->bBN:Lokio/s;
+    sget-object v1, Lokio/s;->bCh:Lokio/s;
 
     if-eqz v1, :cond_0
 
-    iput-object v1, p0, Lokio/g;->bBv:Lokio/s;
+    iput-object v1, p0, Lokio/g;->bBP:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->IQ()Lokio/s;
+    invoke-virtual {v0}, Lokio/s;->ID()Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->IP()Lokio/s;
+    invoke-virtual {v0}, Lokio/s;->IC()Lokio/s;
 
     return-void
 
@@ -118,7 +118,7 @@
 
 
 # virtual methods
-.method public final Hw()V
+.method public final Hj()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -126,14 +126,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
 
     return-void
 .end method
 
-.method public final Hx()V
+.method public final Hk()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -141,14 +141,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
 
     return-void
 .end method
 
-.method public final Hz()Lokhttp3/Headers;
+.method public final Hm()Lokhttp3/Headers;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -161,7 +161,7 @@
     invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
 
     :goto_0
-    invoke-direct {p0}, Lokhttp3/internal/d/a;->Hy()Ljava/lang/String;
+    invoke-direct {p0}, Lokhttp3/internal/d/a;->Hl()Ljava/lang/String;
 
     move-result-object v1
 
@@ -171,14 +171,14 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v2, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
     invoke-virtual {v2, v0, v1}, Lokhttp3/internal/a;->a(Lokhttp3/Headers$a;Ljava/lang/String;)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->GA()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Gp()Lokhttp3/Headers;
 
     move-result-object v0
 
@@ -190,7 +190,7 @@
 
     const-string v0, "Transfer-Encoding"
 
-    invoke-virtual {p1, v0}, Lokhttp3/w;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Lokhttp3/w;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -299,19 +299,19 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
-    invoke-interface {v0, p2}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {v0, p2}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     move-result-object p2
 
     const-string v0, "\r\n"
 
-    invoke-interface {p2, v0}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {p2, v0}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     const/4 p2, 0x0
 
-    iget-object v1, p1, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     array-length v1, v1
 
@@ -320,40 +320,40 @@
     :goto_0
     if-ge p2, v1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object v2, p0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
-    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dz(I)Ljava/lang/String;
+    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dw(I)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-interface {v2, v3}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {v2, v3}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     move-result-object v2
 
     const-string v3, ": "
 
-    invoke-interface {v2, v3}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {v2, v3}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     move-result-object v2
 
-    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dA(I)Ljava/lang/String;
+    invoke-virtual {p1, p2}, Lokhttp3/Headers;->dx(I)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-interface {v2, v3}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {v2, v3}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     move-result-object v2
 
-    invoke-interface {v2, v0}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {v2, v0}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     add-int/lit8 p2, p2, 0x1
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/d/a;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/d/a;->bwU:Lokio/BufferedSink;
 
-    invoke-interface {p1, v0}, Lokio/BufferedSink;->eJ(Ljava/lang/String;)Lokio/BufferedSink;
+    invoke-interface {p1, v0}, Lokio/BufferedSink;->eE(Ljava/lang/String;)Lokio/BufferedSink;
 
     const/4 p1, 0x1
 
@@ -435,7 +435,7 @@
     throw p1
 .end method
 
-.method public final ad(Z)Lokhttp3/Response$a;
+.method public final aa(Z)Lokhttp3/Response$a;
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -479,11 +479,11 @@
     :cond_1
     :goto_0
     :try_start_0
-    invoke-direct {p0}, Lokhttp3/internal/d/a;->Hy()Ljava/lang/String;
+    invoke-direct {p0}, Lokhttp3/internal/d/a;->Hl()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-static {v0}, Lokhttp3/internal/c/k;->eD(Ljava/lang/String;)Lokhttp3/internal/c/k;
+    invoke-static {v0}, Lokhttp3/internal/c/k;->ey(Ljava/lang/String;)Lokhttp3/internal/c/k;
 
     move-result-object v0
 
@@ -491,9 +491,9 @@
 
     invoke-direct {v2}, Lokhttp3/Response$a;-><init>()V
 
-    iget-object v3, v0, Lokhttp3/internal/c/k;->bvc:Lokhttp3/u;
+    iget-object v3, v0, Lokhttp3/internal/c/k;->bvw:Lokhttp3/u;
 
-    iput-object v3, v2, Lokhttp3/Response$a;->bvc:Lokhttp3/u;
+    iput-object v3, v2, Lokhttp3/Response$a;->bvw:Lokhttp3/u;
 
     iget v3, v0, Lokhttp3/internal/c/k;->code:I
 
@@ -503,7 +503,7 @@
 
     iput-object v3, v2, Lokhttp3/Response$a;->message:Ljava/lang/String;
 
-    invoke-virtual {p0}, Lokhttp3/internal/d/a;->Hz()Lokhttp3/Headers;
+    invoke-virtual {p0}, Lokhttp3/internal/d/a;->Hm()Lokhttp3/Headers;
 
     move-result-object v3
 
@@ -552,7 +552,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lokhttp3/internal/d/a;->bxe:Lokhttp3/internal/b/g;
+    iget-object v2, p0, Lokhttp3/internal/d/a;->bxy:Lokhttp3/internal/b/g;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -575,15 +575,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->bxe:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->bxy:Lokhttp3/internal/b/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Ht()Lokhttp3/internal/b/c;
+    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Hg()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
-    iget-object v0, v0, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v0, v0, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bpW:Ljava/net/Proxy;
+    iget-object v0, v0, Lokhttp3/y;->bqq:Ljava/net/Proxy;
 
     invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -601,9 +601,9 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v2, p1, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v2, p1, Lokhttp3/w;->bqk:Lokhttp3/s;
 
-    invoke-virtual {v2}, Lokhttp3/s;->GC()Z
+    invoke-virtual {v2}, Lokhttp3/s;->Gr()Z
 
     move-result v2
 
@@ -623,14 +623,14 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p1, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-static {v0}, Lokhttp3/internal/c/i;->d(Lokhttp3/s;)Ljava/lang/String;
 
@@ -647,7 +647,7 @@
 
     move-result-object v0
 
-    iget-object p1, p1, Lokhttp3/w;->buj:Lokhttp3/Headers;
+    iget-object p1, p1, Lokhttp3/w;->buD:Lokhttp3/Headers;
 
     invoke-virtual {p0, p1, v0}, Lokhttp3/internal/d/a;->a(Lokhttp3/Headers;Ljava/lang/String;)V
 
@@ -657,15 +657,15 @@
 .method public final cancel()V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->bxe:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->bxy:Lokhttp3/internal/b/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Ht()Lokhttp3/internal/b/c;
+    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Hg()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lokhttp3/internal/b/c;->bwx:Ljava/net/Socket;
+    iget-object v0, v0, Lokhttp3/internal/b/c;->bwR:Ljava/net/Socket;
 
     invoke-static {v0}, Lokhttp3/internal/c;->a(Ljava/net/Socket;)V
 
@@ -683,7 +683,7 @@
 
     const-string v0, "Content-Type"
 
-    invoke-virtual {p1, v0}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Lokhttp3/Response;->em(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -712,7 +712,7 @@
     :cond_0
     const-string v1, "Transfer-Encoding"
 
-    invoke-virtual {p1, v1}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v1}, Lokhttp3/Response;->em(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -732,9 +732,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object p1, p1, Lokhttp3/Response;->bvb:Lokhttp3/w;
+    iget-object p1, p1, Lokhttp3/Response;->bvv:Lokhttp3/w;
 
-    iget-object p1, p1, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     iget v1, p0, Lokhttp3/internal/d/a;->state:I
 
@@ -805,13 +805,13 @@
 
     if-ne v1, v4, :cond_5
 
-    iget-object v1, p0, Lokhttp3/internal/d/a;->bxe:Lokhttp3/internal/b/g;
+    iget-object v1, p0, Lokhttp3/internal/d/a;->bxy:Lokhttp3/internal/b/g;
 
     if-eqz v1, :cond_4
 
     iput v3, p0, Lokhttp3/internal/d/a;->state:I
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Hu()V
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Hh()V
 
     new-instance v1, Lokhttp3/internal/d/a$f;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/b.smali b/com.discord/smali_classes2/okhttp3/internal/e/b.smali
index 7f8cde0ae6..1e25877cae 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/b.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final enum bxA:Lokhttp3/internal/e/b;
+.field public static final enum bxK:Lokhttp3/internal/e/b;
 
-.field private static final synthetic bxB:[Lokhttp3/internal/e/b;
+.field public static final enum bxL:Lokhttp3/internal/e/b;
 
-.field public static final enum bxq:Lokhttp3/internal/e/b;
+.field public static final enum bxM:Lokhttp3/internal/e/b;
 
-.field public static final enum bxr:Lokhttp3/internal/e/b;
+.field public static final enum bxN:Lokhttp3/internal/e/b;
 
-.field public static final enum bxs:Lokhttp3/internal/e/b;
+.field public static final enum bxO:Lokhttp3/internal/e/b;
 
-.field public static final enum bxt:Lokhttp3/internal/e/b;
+.field public static final enum bxP:Lokhttp3/internal/e/b;
 
-.field public static final enum bxu:Lokhttp3/internal/e/b;
+.field public static final enum bxQ:Lokhttp3/internal/e/b;
 
-.field public static final enum bxv:Lokhttp3/internal/e/b;
+.field public static final enum bxR:Lokhttp3/internal/e/b;
 
-.field public static final enum bxw:Lokhttp3/internal/e/b;
+.field public static final enum bxS:Lokhttp3/internal/e/b;
 
-.field public static final enum bxx:Lokhttp3/internal/e/b;
+.field public static final enum bxT:Lokhttp3/internal/e/b;
 
-.field public static final enum bxy:Lokhttp3/internal/e/b;
+.field public static final enum bxU:Lokhttp3/internal/e/b;
 
-.field public static final enum bxz:Lokhttp3/internal/e/b;
+.field private static final synthetic bxV:[Lokhttp3/internal/e/b;
 
 
 # instance fields
@@ -55,7 +55,7 @@
 
     invoke-direct {v0, v2, v1, v1}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->bxq:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->bxK:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -65,7 +65,7 @@
 
     invoke-direct {v0, v3, v2, v2}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->bxr:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->bxL:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -75,7 +75,7 @@
 
     invoke-direct {v0, v4, v3, v3}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->bxs:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->bxM:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -85,7 +85,7 @@
 
     invoke-direct {v0, v5, v4, v4}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->bxt:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->bxN:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -97,7 +97,7 @@
 
     invoke-direct {v0, v7, v5, v6}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->bxu:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->bxO:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -109,7 +109,7 @@
 
     invoke-direct {v0, v9, v7, v8}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->bxv:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->bxP:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -121,7 +121,7 @@
 
     invoke-direct {v0, v11, v9, v10}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->bxw:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->bxQ:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -131,7 +131,7 @@
 
     invoke-direct {v0, v12, v6, v11}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->bxx:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->bxR:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -141,7 +141,7 @@
 
     invoke-direct {v0, v13, v8, v12}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->bxy:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->bxS:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -151,7 +151,7 @@
 
     invoke-direct {v0, v13, v10, v14}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->bxz:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->bxT:Lokhttp3/internal/e/b;
 
     new-instance v0, Lokhttp3/internal/e/b;
 
@@ -161,55 +161,55 @@
 
     invoke-direct {v0, v13, v11, v14}, Lokhttp3/internal/e/b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lokhttp3/internal/e/b;->bxA:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->bxU:Lokhttp3/internal/e/b;
 
     new-array v0, v12, [Lokhttp3/internal/e/b;
 
-    sget-object v12, Lokhttp3/internal/e/b;->bxq:Lokhttp3/internal/e/b;
+    sget-object v12, Lokhttp3/internal/e/b;->bxK:Lokhttp3/internal/e/b;
 
     aput-object v12, v0, v1
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxr:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxL:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxs:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxM:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxt:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxN:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxu:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxO:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxv:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxP:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxw:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxQ:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxx:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxR:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxy:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxS:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxz:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxT:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v10
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxA:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxU:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v11
 
-    sput-object v0, Lokhttp3/internal/e/b;->bxB:[Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->bxV:[Lokhttp3/internal/e/b;
 
     return-void
 .end method
@@ -229,7 +229,7 @@
     return-void
 .end method
 
-.method public static dC(I)Lokhttp3/internal/e/b;
+.method public static dz(I)Lokhttp3/internal/e/b;
     .locals 5
 
     invoke-static {}, Lokhttp3/internal/e/b;->values()[Lokhttp3/internal/e/b;
@@ -279,7 +279,7 @@
 .method public static values()[Lokhttp3/internal/e/b;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/e/b;->bxB:[Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->bxV:[Lokhttp3/internal/e/b;
 
     invoke-virtual {v0}, [Lokhttp3/internal/e/b;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/c.smali b/com.discord/smali_classes2/okhttp3/internal/e/c.smali
index df7a33aacd..397f9b90ff 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/c.smali
@@ -12,25 +12,25 @@
 
 
 # static fields
-.field public static final bxC:Lokio/ByteString;
+.field public static final bxW:Lokio/ByteString;
 
-.field public static final bxD:Lokio/ByteString;
+.field public static final bxX:Lokio/ByteString;
 
-.field public static final bxE:Lokio/ByteString;
+.field public static final bxY:Lokio/ByteString;
 
-.field public static final bxF:Lokio/ByteString;
+.field public static final bxZ:Lokio/ByteString;
 
-.field public static final bxG:Lokio/ByteString;
+.field public static final bya:Lokio/ByteString;
 
-.field public static final bxH:Lokio/ByteString;
+.field public static final byb:Lokio/ByteString;
 
 
 # instance fields
-.field public final bxI:Lokio/ByteString;
+.field public final byc:Lokio/ByteString;
 
-.field public final bxJ:Lokio/ByteString;
+.field public final byd:Lokio/ByteString;
 
-.field final bxK:I
+.field final bye:I
 
 
 # direct methods
@@ -39,51 +39,51 @@
 
     const-string v0, ":"
 
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->bxC:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->bxW:Lokio/ByteString;
 
     const-string v0, ":status"
 
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->bxD:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->bxX:Lokio/ByteString;
 
     const-string v0, ":method"
 
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->bxE:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->bxY:Lokio/ByteString;
 
     const-string v0, ":path"
 
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->bxF:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->bxZ:Lokio/ByteString;
 
     const-string v0, ":scheme"
 
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->bxG:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->bya:Lokio/ByteString;
 
     const-string v0, ":authority"
 
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->bxH:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->byb:Lokio/ByteString;
 
     return-void
 .end method
@@ -91,11 +91,11 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    invoke-static {p1}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {p1}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object p1
 
-    invoke-static {p2}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {p2}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object p2
 
@@ -107,7 +107,7 @@
 .method public constructor <init>(Lokio/ByteString;Ljava/lang/String;)V
     .locals 0
 
-    invoke-static {p2}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {p2}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object p2
 
@@ -121,9 +121,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/c;->bxI:Lokio/ByteString;
+    iput-object p1, p0, Lokhttp3/internal/e/c;->byc:Lokio/ByteString;
 
-    iput-object p2, p0, Lokhttp3/internal/e/c;->bxJ:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/internal/e/c;->byd:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -137,7 +137,7 @@
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lokhttp3/internal/e/c;->bxK:I
+    iput p1, p0, Lokhttp3/internal/e/c;->bye:I
 
     return-void
 .end method
@@ -155,9 +155,9 @@
 
     check-cast p1, Lokhttp3/internal/e/c;
 
-    iget-object v0, p0, Lokhttp3/internal/e/c;->bxI:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/internal/e/c;->byc:Lokio/ByteString;
 
-    iget-object v2, p1, Lokhttp3/internal/e/c;->bxI:Lokio/ByteString;
+    iget-object v2, p1, Lokhttp3/internal/e/c;->byc:Lokio/ByteString;
 
     invoke-virtual {v0, v2}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -165,9 +165,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/c;->bxJ:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/internal/e/c;->byd:Lokio/ByteString;
 
-    iget-object p1, p1, Lokhttp3/internal/e/c;->bxJ:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/internal/e/c;->byd:Lokio/ByteString;
 
     invoke-virtual {v0, p1}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -186,7 +186,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/c;->bxI:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/internal/e/c;->byc:Lokio/ByteString;
 
     invoke-virtual {v0}, Lokio/ByteString;->hashCode()I
 
@@ -196,7 +196,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/internal/e/c;->bxJ:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/internal/e/c;->byd:Lokio/ByteString;
 
     invoke-virtual {v1}, Lokio/ByteString;->hashCode()I
 
@@ -214,9 +214,9 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lokhttp3/internal/e/c;->bxI:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/internal/e/c;->byc:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->IF()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Is()Ljava/lang/String;
 
     move-result-object v1
 
@@ -224,9 +224,9 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lokhttp3/internal/e/c;->bxJ:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/internal/e/c;->byd:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->IF()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Is()Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/d$a.smali b/com.discord/smali_classes2/okhttp3/internal/e/d$a.smali
index cb50aa007b..470c873572 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/d$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/d$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final bxN:Ljava/util/List;
+.field private final byh:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,19 +25,19 @@
     .end annotation
 .end field
 
-.field private final bxO:I
+.field private final byi:I
 
-.field private bxP:I
+.field private byj:I
 
-.field bxQ:[Lokhttp3/internal/e/c;
+.field byk:[Lokhttp3/internal/e/c;
 
-.field bxR:I
+.field byl:I
 
-.field bxS:I
+.field bym:I
 
-.field bxT:I
+.field byn:I
 
-.field private final nJ:Lokio/d;
+.field private final nI:Lokio/d;
 
 
 # direct methods
@@ -50,39 +50,39 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$a;->bxN:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/e/d$a;->byh:Ljava/util/List;
 
     const/16 p1, 0x8
 
     new-array p1, p1, [Lokhttp3/internal/e/c;
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iput-object p1, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
-    iget-object p1, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
     array-length p1, p1
 
     add-int/lit8 p1, p1, -0x1
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bxR:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->byl:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bxS:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bym:I
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bxT:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->byn:I
 
     const/16 p1, 0x1000
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bxO:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->byi:I
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bxP:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->byj:I
 
     invoke-static {p3}, Lokio/j;->b(Lokio/r;)Lokio/d;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$a;->nJ:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/e/d$a;->nI:Lokio/d;
 
     return-void
 .end method
@@ -97,57 +97,57 @@
     return-void
 .end method
 
-.method private HA()V
+.method private Hn()V
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->bxP:I
+    iget v0, p0, Lokhttp3/internal/e/d$a;->byj:I
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bxT:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->byn:I
 
     if-ge v0, v1, :cond_1
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->HB()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ho()V
 
     return-void
 
     :cond_0
     sub-int/2addr v1, v0
 
-    invoke-direct {p0, v1}, Lokhttp3/internal/e/d$a;->dD(I)I
+    invoke-direct {p0, v1}, Lokhttp3/internal/e/d$a;->dA(I)I
 
     :cond_1
     return-void
 .end method
 
-.method private HB()V
+.method private Ho()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
     const/4 v1, 0x0
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
     array-length v0, v0
 
     add-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->bxR:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->byl:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->bxS:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->bym:I
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->bxT:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->byn:I
 
     return-void
 .end method
 
-.method private HE()I
+.method private Hr()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -155,7 +155,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -166,7 +166,7 @@
     return v0
 .end method
 
-.method private HF()Lokio/ByteString;
+.method private Hs()Lokio/ByteString;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -174,7 +174,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->HE()I
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Hr()I
 
     move-result v0
 
@@ -200,11 +200,11 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lokhttp3/internal/e/k;->HV()Lokhttp3/internal/e/k;
+    invoke-static {}, Lokhttp3/internal/e/k;->HI()Lokhttp3/internal/e/k;
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->nJ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->nI:Lokio/d;
 
     int-to-long v3, v0
 
@@ -223,7 +223,7 @@
     return-object v0
 
     :cond_1
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->nJ:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->nI:Lokio/d;
 
     int-to-long v2, v0
 
@@ -237,34 +237,34 @@
 .method private a(Lokhttp3/internal/e/c;)V
     .locals 6
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bxN:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->byh:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget v0, p1, Lokhttp3/internal/e/c;->bxK:I
+    iget v0, p1, Lokhttp3/internal/e/c;->bye:I
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bxP:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->byj:I
 
     if-le v0, v1, :cond_0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->HB()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Ho()V
 
     return-void
 
     :cond_0
-    iget v2, p0, Lokhttp3/internal/e/d$a;->bxT:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->byn:I
 
     add-int/2addr v2, v0
 
     sub-int/2addr v2, v1
 
-    invoke-direct {p0, v2}, Lokhttp3/internal/e/d$a;->dD(I)I
+    invoke-direct {p0, v2}, Lokhttp3/internal/e/d$a;->dA(I)I
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bxS:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->bym:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
     array-length v3, v2
 
@@ -284,87 +284,87 @@
 
     invoke-static {v2, v3, v1, v4, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
     array-length v2, v2
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->bxR:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->byl:I
 
-    iput-object v1, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iput-object v1, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
     :cond_1
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bxR:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->byl:I
 
     add-int/lit8 v2, v1, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->bxR:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->byl:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
     aput-object p1, v2, v1
 
-    iget p1, p0, Lokhttp3/internal/e/d$a;->bxS:I
+    iget p1, p0, Lokhttp3/internal/e/d$a;->bym:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bxS:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bym:I
 
-    iget p1, p0, Lokhttp3/internal/e/d$a;->bxT:I
+    iget p1, p0, Lokhttp3/internal/e/d$a;->byn:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bxT:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->byn:I
 
     return-void
 .end method
 
-.method private dD(I)I
+.method private dA(I)I
     .locals 4
 
     const/4 v0, 0x0
 
     if-lez p1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
     array-length v1, v1
 
     add-int/lit8 v1, v1, -0x1
 
     :goto_0
-    iget v2, p0, Lokhttp3/internal/e/d$a;->bxR:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->byl:I
 
     if-lt v1, v2, :cond_0
 
     if-lez p1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
     aget-object v2, v2, v1
 
-    iget v2, v2, Lokhttp3/internal/e/c;->bxK:I
+    iget v2, v2, Lokhttp3/internal/e/c;->bye:I
 
     sub-int/2addr p1, v2
 
-    iget v2, p0, Lokhttp3/internal/e/d$a;->bxT:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->byn:I
 
-    iget-object v3, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v3, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
     aget-object v3, v3, v1
 
-    iget v3, v3, Lokhttp3/internal/e/c;->bxK:I
+    iget v3, v3, Lokhttp3/internal/e/c;->bye:I
 
     sub-int/2addr v2, v3
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->bxT:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->byn:I
 
-    iget v2, p0, Lokhttp3/internal/e/d$a;->bxS:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->bym:I
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->bxS:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->bym:I
 
     add-int/lit8 v0, v0, 0x1
 
@@ -373,9 +373,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bxR:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->byl:I
 
     add-int/lit8 v2, v1, 0x1
 
@@ -383,24 +383,24 @@
 
     add-int/2addr v1, v0
 
-    iget v3, p0, Lokhttp3/internal/e/d$a;->bxS:I
+    iget v3, p0, Lokhttp3/internal/e/d$a;->bym:I
 
     invoke-static {p1, v2, p1, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget p1, p0, Lokhttp3/internal/e/d$a;->bxR:I
+    iget p1, p0, Lokhttp3/internal/e/d$a;->byl:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bxR:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->byl:I
 
     :cond_1
     return v0
 .end method
 
-.method private dE(I)I
+.method private dB(I)I
     .locals 1
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->bxR:I
+    iget v0, p0, Lokhttp3/internal/e/d$a;->byl:I
 
     add-int/lit8 v0, v0, 0x1
 
@@ -409,7 +409,7 @@
     return v0
 .end method
 
-.method private dF(I)Lokio/ByteString;
+.method private dC(I)Lokio/ByteString;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -417,34 +417,34 @@
         }
     .end annotation
 
-    invoke-static {p1}, Lokhttp3/internal/e/d$a;->dG(I)Z
+    invoke-static {p1}, Lokhttp3/internal/e/d$a;->dD(I)Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lokhttp3/internal/e/d;->bxL:[Lokhttp3/internal/e/c;
+    sget-object v0, Lokhttp3/internal/e/d;->byf:[Lokhttp3/internal/e/c;
 
     aget-object p1, v0, p1
 
-    iget-object p1, p1, Lokhttp3/internal/e/c;->bxI:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/internal/e/c;->byc:Lokio/ByteString;
 
     return-object p1
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/e/d;->bxL:[Lokhttp3/internal/e/c;
+    sget-object v0, Lokhttp3/internal/e/d;->byf:[Lokhttp3/internal/e/c;
 
     array-length v0, v0
 
     sub-int v0, p1, v0
 
-    invoke-direct {p0, v0}, Lokhttp3/internal/e/d$a;->dE(I)I
+    invoke-direct {p0, v0}, Lokhttp3/internal/e/d$a;->dB(I)I
 
     move-result v0
 
     if-ltz v0, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
     array-length v2, v1
 
@@ -452,7 +452,7 @@
 
     aget-object p1, v1, v0
 
-    iget-object p1, p1, Lokhttp3/internal/e/c;->bxI:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/internal/e/c;->byc:Lokio/ByteString;
 
     return-object p1
 
@@ -478,12 +478,12 @@
     throw v0
 .end method
 
-.method private static dG(I)Z
+.method private static dD(I)Z
     .locals 2
 
     if-ltz p0, :cond_0
 
-    sget-object v0, Lokhttp3/internal/e/d;->bxL:[Lokhttp3/internal/e/c;
+    sget-object v0, Lokhttp3/internal/e/d;->byf:[Lokhttp3/internal/e/c;
 
     array-length v0, v0
 
@@ -519,7 +519,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->HE()I
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Hr()I
 
     move-result v0
 
@@ -547,7 +547,7 @@
 
 
 # virtual methods
-.method final HC()V
+.method final Hp()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -556,15 +556,15 @@
     .end annotation
 
     :goto_0
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Iu()Z
+    invoke-interface {v0}, Lokio/d;->Ih()Z
 
     move-result v0
 
     if-nez v0, :cond_a
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -588,42 +588,42 @@
 
     add-int/lit8 v0, v0, -0x1
 
-    invoke-static {v0}, Lokhttp3/internal/e/d$a;->dG(I)Z
+    invoke-static {v0}, Lokhttp3/internal/e/d$a;->dD(I)Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lokhttp3/internal/e/d;->bxL:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->byf:[Lokhttp3/internal/e/c;
 
     aget-object v0, v1, v0
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bxN:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->byh:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lokhttp3/internal/e/d;->bxL:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->byf:[Lokhttp3/internal/e/c;
 
     array-length v1, v1
 
     sub-int v1, v0, v1
 
-    invoke-direct {p0, v1}, Lokhttp3/internal/e/d$a;->dE(I)I
+    invoke-direct {p0, v1}, Lokhttp3/internal/e/d$a;->dB(I)I
 
     move-result v1
 
     if-ltz v1, :cond_1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->byk:[Lokhttp3/internal/e/c;
 
     array-length v3, v2
 
     if-ge v1, v3, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bxN:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->byh:Ljava/util/List;
 
     aget-object v1, v2, v1
 
@@ -657,7 +657,7 @@
 
     if-ne v0, v1, :cond_3
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->HF()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Hs()Lokio/ByteString;
 
     move-result-object v0
 
@@ -665,7 +665,7 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->HF()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Hs()Lokio/ByteString;
 
     move-result-object v1
 
@@ -690,11 +690,11 @@
 
     add-int/lit8 v0, v0, -0x1
 
-    invoke-direct {p0, v0}, Lokhttp3/internal/e/d$a;->dF(I)Lokio/ByteString;
+    invoke-direct {p0, v0}, Lokhttp3/internal/e/d$a;->dC(I)Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->HF()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Hs()Lokio/ByteString;
 
     move-result-object v1
 
@@ -719,17 +719,17 @@
 
     move-result v0
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->bxP:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->byj:I
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->bxP:I
+    iget v0, p0, Lokhttp3/internal/e/d$a;->byj:I
 
     if-ltz v0, :cond_5
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bxO:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->byi:I
 
     if-gt v0, v1, :cond_5
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->HA()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Hn()V
 
     goto/16 :goto_0
 
@@ -742,7 +742,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v2, p0, Lokhttp3/internal/e/d$a;->bxP:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->byj:I
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -772,15 +772,15 @@
 
     add-int/lit8 v0, v0, -0x1
 
-    invoke-direct {p0, v0}, Lokhttp3/internal/e/d$a;->dF(I)Lokio/ByteString;
+    invoke-direct {p0, v0}, Lokhttp3/internal/e/d$a;->dC(I)Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->HF()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Hs()Lokio/ByteString;
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bxN:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->byh:Ljava/util/List;
 
     new-instance v3, Lokhttp3/internal/e/c;
 
@@ -792,7 +792,7 @@
 
     :cond_8
     :goto_1
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->HF()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Hs()Lokio/ByteString;
 
     move-result-object v0
 
@@ -800,11 +800,11 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->HF()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Hs()Lokio/ByteString;
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bxN:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->byh:Ljava/util/List;
 
     new-instance v3, Lokhttp3/internal/e/c;
 
@@ -827,7 +827,7 @@
     return-void
 .end method
 
-.method public final HD()Ljava/util/List;
+.method public final Hq()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -840,11 +840,11 @@
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bxN:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->byh:Ljava/util/List;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bxN:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->byh:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->clear()V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/d$b.smali b/com.discord/smali_classes2/okhttp3/internal/e/d$b.smali
index 96624edc90..33c8594285 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/d$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/d$b.smali
@@ -15,25 +15,25 @@
 
 
 # instance fields
-.field bxO:I
+.field byi:I
 
-.field bxP:I
+.field byj:I
 
-.field bxQ:[Lokhttp3/internal/e/c;
+.field byk:[Lokhttp3/internal/e/c;
 
-.field bxR:I
+.field byl:I
 
-.field bxS:I
+.field bym:I
 
-.field bxT:I
+.field byn:I
 
-.field private final bxU:Lokio/c;
+.field private final byo:Lokio/c;
 
-.field private final bxV:Z
+.field private final byp:Z
 
-.field private bxW:I
+.field private byq:I
 
-.field private bxX:Z
+.field private byr:Z
 
 
 # direct methods
@@ -54,15 +54,15 @@
 
     const p2, 0x7fffffff
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bxW:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->byq:I
 
     const/16 p2, 0x8
 
     new-array p2, p2, [Lokhttp3/internal/e/c;
 
-    iput-object p2, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iput-object p2, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
-    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object p2, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
     array-length p2, p2
 
@@ -70,49 +70,49 @@
 
     sub-int/2addr p2, v0
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bxR:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->byl:I
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bxS:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->bym:I
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bxT:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->byn:I
 
     const/16 p2, 0x1000
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bxO:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->byi:I
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bxP:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->byj:I
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->bxV:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->byp:Z
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$b;->bxU:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/d$b;->byo:Lokio/c;
 
     return-void
 .end method
 
-.method private HB()V
+.method private Ho()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
     const/4 v1, 0x0
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
     array-length v0, v0
 
     add-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bxR:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->byl:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bxS:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->bym:I
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bxT:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->byn:I
 
     return-void
 .end method
@@ -120,30 +120,30 @@
 .method private b(Lokhttp3/internal/e/c;)V
     .locals 6
 
-    iget v0, p1, Lokhttp3/internal/e/c;->bxK:I
+    iget v0, p1, Lokhttp3/internal/e/c;->bye:I
 
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bxP:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->byj:I
 
     if-le v0, v1, :cond_0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->HB()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->Ho()V
 
     return-void
 
     :cond_0
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bxT:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->byn:I
 
     add-int/2addr v2, v0
 
     sub-int/2addr v2, v1
 
-    invoke-direct {p0, v2}, Lokhttp3/internal/e/d$b;->dD(I)I
+    invoke-direct {p0, v2}, Lokhttp3/internal/e/d$b;->dA(I)I
 
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bxS:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->bym:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
     array-length v3, v2
 
@@ -163,38 +163,38 @@
 
     invoke-static {v2, v3, v1, v4, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
     array-length v2, v2
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->bxR:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->byl:I
 
-    iput-object v1, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iput-object v1, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
     :cond_1
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bxR:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->byl:I
 
     add-int/lit8 v2, v1, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->bxR:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->byl:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
     aput-object p1, v2, v1
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->bxS:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->bym:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bxS:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->bym:I
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->bxT:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->byn:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bxT:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->byn:I
 
     return-void
 .end method
@@ -207,13 +207,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->bxV:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->byp:Z
 
     const/16 v1, 0x7f
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lokhttp3/internal/e/k;->HV()Lokhttp3/internal/e/k;
+    invoke-static {}, Lokhttp3/internal/e/k;->HI()Lokhttp3/internal/e/k;
 
     invoke-static {p1}, Lokhttp3/internal/e/k;->e(Lokio/ByteString;)I
 
@@ -229,11 +229,11 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    invoke-static {}, Lokhttp3/internal/e/k;->HV()Lokhttp3/internal/e/k;
+    invoke-static {}, Lokhttp3/internal/e/k;->HI()Lokhttp3/internal/e/k;
 
     invoke-static {p1, v0}, Lokhttp3/internal/e/k;->a(Lokio/ByteString;Lokio/BufferedSink;)V
 
-    invoke-virtual {v0}, Lokio/c;->HF()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/c;->Hs()Lokio/ByteString;
 
     move-result-object p1
 
@@ -245,7 +245,7 @@
 
     invoke-direct {p0, v0, v1, v2}, Lokhttp3/internal/e/d$b;->n(III)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bxU:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->byo:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->i(Lokio/ByteString;)Lokio/c;
 
@@ -260,58 +260,58 @@
 
     invoke-direct {p0, v0, v1, v2}, Lokhttp3/internal/e/d$b;->n(III)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bxU:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->byo:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->i(Lokio/ByteString;)Lokio/c;
 
     return-void
 .end method
 
-.method private dD(I)I
+.method private dA(I)I
     .locals 4
 
     const/4 v0, 0x0
 
     if-lez p1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v1, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
     array-length v1, v1
 
     add-int/lit8 v1, v1, -0x1
 
     :goto_0
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bxR:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->byl:I
 
     if-lt v1, v2, :cond_0
 
     if-lez p1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
     aget-object v2, v2, v1
 
-    iget v2, v2, Lokhttp3/internal/e/c;->bxK:I
+    iget v2, v2, Lokhttp3/internal/e/c;->bye:I
 
     sub-int/2addr p1, v2
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bxT:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->byn:I
 
-    iget-object v3, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v3, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
     aget-object v3, v3, v1
 
-    iget v3, v3, Lokhttp3/internal/e/c;->bxK:I
+    iget v3, v3, Lokhttp3/internal/e/c;->bye:I
 
     sub-int/2addr v2, v3
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->bxT:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->byn:I
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bxS:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->bym:I
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->bxS:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->bym:I
 
     add-int/lit8 v0, v0, 0x1
 
@@ -320,9 +320,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bxR:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->byl:I
 
     add-int/lit8 v2, v1, 0x1
 
@@ -330,13 +330,13 @@
 
     add-int/2addr v1, v0
 
-    iget v3, p0, Lokhttp3/internal/e/d$b;->bxS:I
+    iget v3, p0, Lokhttp3/internal/e/d$b;->bym:I
 
     invoke-static {p1, v2, p1, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bxR:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->byl:I
 
     add-int/lit8 v2, v1, 0x1
 
@@ -348,11 +348,11 @@
 
     invoke-static {p1, v2, v1, v3}, Ljava/util/Arrays;->fill([Ljava/lang/Object;IILjava/lang/Object;)V
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->bxR:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->byl:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bxR:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->byl:I
 
     :cond_1
     return v0
@@ -363,20 +363,20 @@
 
     if-ge p1, p2, :cond_0
 
-    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bxU:Lokio/c;
+    iget-object p2, p0, Lokhttp3/internal/e/d$b;->byo:Lokio/c;
 
     or-int/2addr p1, p3
 
-    invoke-virtual {p2, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p2, p1}, Lokio/c;->dM(I)Lokio/c;
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bxU:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->byo:Lokio/c;
 
     or-int/2addr p3, p2
 
-    invoke-virtual {v0, p3}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v0, p3}, Lokio/c;->dM(I)Lokio/c;
 
     sub-int/2addr p1, p2
 
@@ -387,20 +387,20 @@
 
     and-int/lit8 p3, p1, 0x7f
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bxU:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->byo:Lokio/c;
 
     or-int/2addr p2, p3
 
-    invoke-virtual {v0, p2}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v0, p2}, Lokio/c;->dM(I)Lokio/c;
 
     ushr-int/lit8 p1, p1, 0x7
 
     goto :goto_0
 
     :cond_1
-    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bxU:Lokio/c;
+    iget-object p2, p0, Lokhttp3/internal/e/d$b;->byo:Lokio/c;
 
-    invoke-virtual {p2, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p2, p1}, Lokio/c;->dM(I)Lokio/c;
 
     return-void
 .end method
@@ -424,15 +424,15 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->bxX:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->byr:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bxW:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->byq:I
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bxP:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->byj:I
 
     const/16 v3, 0x20
 
@@ -443,13 +443,13 @@
     invoke-direct {p0, v0, v4, v3}, Lokhttp3/internal/e/d$b;->n(III)V
 
     :cond_0
-    iput-boolean v1, p0, Lokhttp3/internal/e/d$b;->bxX:Z
+    iput-boolean v1, p0, Lokhttp3/internal/e/d$b;->byr:Z
 
     const v0, 0x7fffffff
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bxW:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->byq:I
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bxP:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->byj:I
 
     invoke-direct {p0, v0, v4, v3}, Lokhttp3/internal/e/d$b;->n(III)V
 
@@ -469,15 +469,15 @@
 
     check-cast v3, Lokhttp3/internal/e/c;
 
-    iget-object v4, v3, Lokhttp3/internal/e/c;->bxI:Lokio/ByteString;
+    iget-object v4, v3, Lokhttp3/internal/e/c;->byc:Lokio/ByteString;
 
-    invoke-virtual {v4}, Lokio/ByteString;->IK()Lokio/ByteString;
+    invoke-virtual {v4}, Lokio/ByteString;->Ix()Lokio/ByteString;
 
     move-result-object v4
 
-    iget-object v5, v3, Lokhttp3/internal/e/c;->bxJ:Lokio/ByteString;
+    iget-object v5, v3, Lokhttp3/internal/e/c;->byd:Lokio/ByteString;
 
-    sget-object v6, Lokhttp3/internal/e/d;->bxM:Ljava/util/Map;
+    sget-object v6, Lokhttp3/internal/e/d;->byg:Ljava/util/Map;
 
     invoke-interface {v6, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -503,13 +503,13 @@
 
     if-ge v6, v9, :cond_3
 
-    sget-object v9, Lokhttp3/internal/e/d;->bxL:[Lokhttp3/internal/e/c;
+    sget-object v9, Lokhttp3/internal/e/d;->byf:[Lokhttp3/internal/e/c;
 
     add-int/lit8 v10, v6, -0x1
 
     aget-object v9, v9, v10
 
-    iget-object v9, v9, Lokhttp3/internal/e/c;->bxJ:Lokio/ByteString;
+    iget-object v9, v9, Lokhttp3/internal/e/c;->byd:Lokio/ByteString;
 
     invoke-static {v9, v5}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -522,11 +522,11 @@
     goto :goto_1
 
     :cond_2
-    sget-object v9, Lokhttp3/internal/e/d;->bxL:[Lokhttp3/internal/e/c;
+    sget-object v9, Lokhttp3/internal/e/d;->byf:[Lokhttp3/internal/e/c;
 
     aget-object v9, v9, v6
 
-    iget-object v9, v9, Lokhttp3/internal/e/c;->bxJ:Lokio/ByteString;
+    iget-object v9, v9, Lokhttp3/internal/e/c;->byd:Lokio/ByteString;
 
     invoke-static {v9, v5}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -559,22 +559,22 @@
     :goto_1
     if-ne v6, v7, :cond_7
 
-    iget v10, p0, Lokhttp3/internal/e/d$b;->bxR:I
+    iget v10, p0, Lokhttp3/internal/e/d$b;->byl:I
 
     add-int/2addr v10, v8
 
-    iget-object v8, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v8, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
     array-length v8, v8
 
     :goto_2
     if-ge v10, v8, :cond_7
 
-    iget-object v11, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v11, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
     aget-object v11, v11, v10
 
-    iget-object v11, v11, Lokhttp3/internal/e/c;->bxI:Lokio/ByteString;
+    iget-object v11, v11, Lokhttp3/internal/e/c;->byc:Lokio/ByteString;
 
     invoke-static {v11, v4}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -582,11 +582,11 @@
 
     if-eqz v11, :cond_6
 
-    iget-object v11, p0, Lokhttp3/internal/e/d$b;->bxQ:[Lokhttp3/internal/e/c;
+    iget-object v11, p0, Lokhttp3/internal/e/d$b;->byk:[Lokhttp3/internal/e/c;
 
     aget-object v11, v11, v10
 
-    iget-object v11, v11, Lokhttp3/internal/e/c;->bxJ:Lokio/ByteString;
+    iget-object v11, v11, Lokhttp3/internal/e/c;->byd:Lokio/ByteString;
 
     invoke-static {v11, v5}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -594,11 +594,11 @@
 
     if-eqz v11, :cond_5
 
-    iget v6, p0, Lokhttp3/internal/e/d$b;->bxR:I
+    iget v6, p0, Lokhttp3/internal/e/d$b;->byl:I
 
     sub-int/2addr v10, v6
 
-    sget-object v6, Lokhttp3/internal/e/d;->bxL:[Lokhttp3/internal/e/c;
+    sget-object v6, Lokhttp3/internal/e/d;->byf:[Lokhttp3/internal/e/c;
 
     array-length v6, v6
 
@@ -609,11 +609,11 @@
     :cond_5
     if-ne v9, v7, :cond_6
 
-    iget v9, p0, Lokhttp3/internal/e/d$b;->bxR:I
+    iget v9, p0, Lokhttp3/internal/e/d$b;->byl:I
 
     sub-int v9, v10, v9
 
-    sget-object v11, Lokhttp3/internal/e/d;->bxL:[Lokhttp3/internal/e/c;
+    sget-object v11, Lokhttp3/internal/e/d;->byf:[Lokhttp3/internal/e/c;
 
     array-length v11, v11
 
@@ -641,9 +641,9 @@
 
     if-ne v9, v7, :cond_9
 
-    iget-object v7, p0, Lokhttp3/internal/e/d$b;->bxU:Lokio/c;
+    iget-object v7, p0, Lokhttp3/internal/e/d$b;->byo:Lokio/c;
 
-    invoke-virtual {v7, v6}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v7, v6}, Lokio/c;->dM(I)Lokio/c;
 
     invoke-direct {p0, v4}, Lokhttp3/internal/e/d$b;->d(Lokio/ByteString;)V
 
@@ -654,7 +654,7 @@
     goto :goto_4
 
     :cond_9
-    sget-object v7, Lokhttp3/internal/e/c;->bxC:Lokio/ByteString;
+    sget-object v7, Lokhttp3/internal/e/c;->bxW:Lokio/ByteString;
 
     invoke-virtual {v4, v7}, Lokio/ByteString;->n(Lokio/ByteString;)Z
 
@@ -662,7 +662,7 @@
 
     if-eqz v7, :cond_a
 
-    sget-object v7, Lokhttp3/internal/e/c;->bxH:Lokio/ByteString;
+    sget-object v7, Lokhttp3/internal/e/c;->byb:Lokio/ByteString;
 
     invoke-virtual {v7, v4}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -696,10 +696,10 @@
     return-void
 .end method
 
-.method final dH(I)V
+.method final dE(I)V
     .locals 1
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bxO:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->byi:I
 
     const/16 v0, 0x4000
 
@@ -707,7 +707,7 @@
 
     move-result p1
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bxP:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->byj:I
 
     if-ne v0, p1, :cond_0
 
@@ -716,37 +716,37 @@
     :cond_0
     if-ge p1, v0, :cond_1
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bxW:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->byq:I
 
     invoke-static {v0, p1}, Ljava/lang/Math;->min(II)I
 
     move-result v0
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bxW:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->byq:I
 
     :cond_1
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->bxX:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->byr:Z
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bxP:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->byj:I
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->bxP:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->byj:I
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bxT:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->byn:I
 
     if-ge p1, v0, :cond_3
 
     if-nez p1, :cond_2
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->HB()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->Ho()V
 
     return-void
 
     :cond_2
     sub-int/2addr v0, p1
 
-    invoke-direct {p0, v0}, Lokhttp3/internal/e/d$b;->dD(I)I
+    invoke-direct {p0, v0}, Lokhttp3/internal/e/d$b;->dA(I)I
 
     :cond_3
     return-void
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/d.smali b/com.discord/smali_classes2/okhttp3/internal/e/d.smali
index 558e599255..a2a1f35c66 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/d.smali
@@ -13,9 +13,9 @@
 
 
 # static fields
-.field static final bxL:[Lokhttp3/internal/e/c;
+.field static final byf:[Lokhttp3/internal/e/c;
 
-.field static final bxM:Ljava/util/Map;
+.field static final byg:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -37,7 +37,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v2, Lokhttp3/internal/e/c;->bxH:Lokio/ByteString;
+    sget-object v2, Lokhttp3/internal/e/c;->byb:Lokio/ByteString;
 
     const-string v3, ""
 
@@ -49,7 +49,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bxE:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bxY:Lokio/ByteString;
 
     const-string v5, "GET"
 
@@ -61,7 +61,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bxE:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bxY:Lokio/ByteString;
 
     const-string v5, "POST"
 
@@ -73,7 +73,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bxF:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bxZ:Lokio/ByteString;
 
     const-string v5, "/"
 
@@ -85,7 +85,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bxF:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bxZ:Lokio/ByteString;
 
     const-string v5, "/index.html"
 
@@ -97,7 +97,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bxG:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bya:Lokio/ByteString;
 
     const-string v5, "http"
 
@@ -109,7 +109,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bxG:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bya:Lokio/ByteString;
 
     const-string v5, "https"
 
@@ -121,7 +121,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bxD:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bxX:Lokio/ByteString;
 
     const-string v5, "200"
 
@@ -133,7 +133,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bxD:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bxX:Lokio/ByteString;
 
     const-string v5, "204"
 
@@ -145,7 +145,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bxD:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bxX:Lokio/ByteString;
 
     const-string v5, "206"
 
@@ -157,7 +157,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bxD:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bxX:Lokio/ByteString;
 
     const-string v5, "304"
 
@@ -169,7 +169,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bxD:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bxX:Lokio/ByteString;
 
     const-string v5, "400"
 
@@ -181,7 +181,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bxD:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bxX:Lokio/ByteString;
 
     const-string v5, "404"
 
@@ -193,7 +193,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bxD:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bxX:Lokio/ByteString;
 
     const-string v5, "500"
 
@@ -675,18 +675,18 @@
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lokhttp3/internal/e/d;->bxL:[Lokhttp3/internal/e/c;
+    sput-object v0, Lokhttp3/internal/e/d;->byf:[Lokhttp3/internal/e/c;
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
-    sget-object v1, Lokhttp3/internal/e/d;->bxL:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->byf:[Lokhttp3/internal/e/c;
 
     array-length v1, v1
 
     invoke-direct {v0, v1}, Ljava/util/LinkedHashMap;-><init>(I)V
 
     :goto_0
-    sget-object v1, Lokhttp3/internal/e/d;->bxL:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->byf:[Lokhttp3/internal/e/c;
 
     array-length v3, v1
 
@@ -694,7 +694,7 @@
 
     aget-object v1, v1, v2
 
-    iget-object v1, v1, Lokhttp3/internal/e/c;->bxI:Lokio/ByteString;
+    iget-object v1, v1, Lokhttp3/internal/e/c;->byc:Lokio/ByteString;
 
     invoke-interface {v0, v1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -702,11 +702,11 @@
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lokhttp3/internal/e/d;->bxL:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->byf:[Lokhttp3/internal/e/c;
 
     aget-object v1, v1, v2
 
-    iget-object v1, v1, Lokhttp3/internal/e/c;->bxI:Lokio/ByteString;
+    iget-object v1, v1, Lokhttp3/internal/e/c;->byc:Lokio/ByteString;
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -724,7 +724,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/d;->bxM:Ljava/util/Map;
+    sput-object v0, Lokhttp3/internal/e/d;->byg:Ljava/util/Map;
 
     return-void
 .end method
@@ -769,7 +769,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lokio/ByteString;->IF()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Is()Ljava/lang/String;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/e.smali b/com.discord/smali_classes2/okhttp3/internal/e/e.smali
index 188fb285a2..835b97c06a 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/e.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field static final bxY:Lokio/ByteString;
+.field static final bys:Lokio/ByteString;
 
-.field private static final bxZ:[Ljava/lang/String;
+.field private static final byt:[Ljava/lang/String;
 
-.field static final bya:[Ljava/lang/String;
+.field static final byu:[Ljava/lang/String;
 
-.field static final byb:[Ljava/lang/String;
+.field static final byv:[Ljava/lang/String;
 
 
 # direct methods
@@ -19,11 +19,11 @@
 
     const-string v0, "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
 
-    invoke-static {v0}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/e;->bxY:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/e;->bys:Lokio/ByteString;
 
     const/16 v0, 0xa
 
@@ -89,24 +89,24 @@
 
     aput-object v8, v0, v7
 
-    sput-object v0, Lokhttp3/internal/e/e;->bxZ:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/e/e;->byt:[Ljava/lang/String;
 
     const/16 v0, 0x40
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lokhttp3/internal/e/e;->bya:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/e/e;->byu:[Ljava/lang/String;
 
     const/16 v0, 0x100
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lokhttp3/internal/e/e;->byb:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/e/e;->byv:[Ljava/lang/String;
 
     const/4 v0, 0x0
 
     :goto_0
-    sget-object v7, Lokhttp3/internal/e/e;->byb:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/e/e;->byv:[Ljava/lang/String;
 
     array-length v8, v7
 
@@ -141,7 +141,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/e/e;->bya:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->byu:[Ljava/lang/String;
 
     const-string v7, ""
 
@@ -168,7 +168,7 @@
 
     aget v8, v7, v0
 
-    sget-object v10, Lokhttp3/internal/e/e;->bya:[Ljava/lang/String;
+    sget-object v10, Lokhttp3/internal/e/e;->byu:[Ljava/lang/String;
 
     or-int/lit8 v11, v8, 0x8
 
@@ -176,7 +176,7 @@
 
     invoke-direct {v12}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v13, Lokhttp3/internal/e/e;->bya:[Ljava/lang/String;
+    sget-object v13, Lokhttp3/internal/e/e;->byu:[Ljava/lang/String;
 
     aget-object v8, v13, v8
 
@@ -195,7 +195,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object v0, Lokhttp3/internal/e/e;->bya:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->byu:[Ljava/lang/String;
 
     const-string v8, "END_HEADERS"
 
@@ -227,7 +227,7 @@
 
     aget v9, v7, v8
 
-    sget-object v10, Lokhttp3/internal/e/e;->bya:[Ljava/lang/String;
+    sget-object v10, Lokhttp3/internal/e/e;->byu:[Ljava/lang/String;
 
     or-int v11, v9, v5
 
@@ -235,7 +235,7 @@
 
     invoke-direct {v12}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v13, Lokhttp3/internal/e/e;->bya:[Ljava/lang/String;
+    sget-object v13, Lokhttp3/internal/e/e;->byu:[Ljava/lang/String;
 
     aget-object v13, v13, v9
 
@@ -245,7 +245,7 @@
 
     invoke-virtual {v12, v13}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget-object v14, Lokhttp3/internal/e/e;->bya:[Ljava/lang/String;
+    sget-object v14, Lokhttp3/internal/e/e;->byu:[Ljava/lang/String;
 
     aget-object v14, v14, v5
 
@@ -257,7 +257,7 @@
 
     aput-object v12, v10, v11
 
-    sget-object v10, Lokhttp3/internal/e/e;->bya:[Ljava/lang/String;
+    sget-object v10, Lokhttp3/internal/e/e;->byu:[Ljava/lang/String;
 
     or-int/2addr v11, v6
 
@@ -265,7 +265,7 @@
 
     invoke-direct {v12}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v14, Lokhttp3/internal/e/e;->bya:[Ljava/lang/String;
+    sget-object v14, Lokhttp3/internal/e/e;->byu:[Ljava/lang/String;
 
     aget-object v9, v14, v9
 
@@ -273,7 +273,7 @@
 
     invoke-virtual {v12, v13}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget-object v9, Lokhttp3/internal/e/e;->bya:[Ljava/lang/String;
+    sget-object v9, Lokhttp3/internal/e/e;->byu:[Ljava/lang/String;
 
     aget-object v9, v9, v5
 
@@ -298,7 +298,7 @@
 
     :cond_3
     :goto_4
-    sget-object v0, Lokhttp3/internal/e/e;->bya:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->byu:[Ljava/lang/String;
 
     array-length v2, v0
 
@@ -308,7 +308,7 @@
 
     if-nez v2, :cond_4
 
-    sget-object v2, Lokhttp3/internal/e/e;->byb:[Ljava/lang/String;
+    sget-object v2, Lokhttp3/internal/e/e;->byv:[Ljava/lang/String;
 
     aget-object v2, v2, v1
 
@@ -341,7 +341,7 @@
 .method static a(ZIIBB)Ljava/lang/String;
     .locals 9
 
-    sget-object v0, Lokhttp3/internal/e/e;->bxZ:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->byt:[Ljava/lang/String;
 
     array-length v1, v0
 
@@ -404,7 +404,7 @@
 
     if-eq p3, v7, :cond_7
 
-    sget-object v7, Lokhttp3/internal/e/e;->bya:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/e/e;->byu:[Ljava/lang/String;
 
     array-length v8, v7
 
@@ -415,7 +415,7 @@
     goto :goto_1
 
     :cond_2
-    sget-object v7, Lokhttp3/internal/e/e;->byb:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/e/e;->byv:[Ljava/lang/String;
 
     aget-object v7, v7, p4
 
@@ -466,14 +466,14 @@
     goto :goto_2
 
     :cond_6
-    sget-object p3, Lokhttp3/internal/e/e;->byb:[Ljava/lang/String;
+    sget-object p3, Lokhttp3/internal/e/e;->byv:[Ljava/lang/String;
 
     aget-object p3, p3, p4
 
     goto :goto_2
 
     :cond_7
-    sget-object p3, Lokhttp3/internal/e/e;->byb:[Ljava/lang/String;
+    sget-object p3, Lokhttp3/internal/e/e;->byv:[Ljava/lang/String;
 
     aget-object p3, p3, p4
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/f$a.smali b/com.discord/smali_classes2/okhttp3/internal/e/f$a.smali
index 5e473d3fca..6b107469f4 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/f$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/f$a.smali
@@ -15,28 +15,28 @@
 
 
 # instance fields
-.field bxk:J
+.field bxE:J
 
-.field byh:Z
+.field byB:Z
 
-.field final synthetic byi:Lokhttp3/internal/e/f;
+.field final synthetic byC:Lokhttp3/internal/e/f;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/e/f;Lokio/r;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/f$a;->byi:Lokhttp3/internal/e/f;
+    iput-object p1, p0, Lokhttp3/internal/e/f$a;->byC:Lokhttp3/internal/e/f;
 
     invoke-direct {p0, p2}, Lokio/f;-><init>(Lokio/r;)V
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lokhttp3/internal/e/f$a;->byh:Z
+    iput-boolean p1, p0, Lokhttp3/internal/e/f$a;->byB:Z
 
     const-wide/16 p1, 0x0
 
-    iput-wide p1, p0, Lokhttp3/internal/e/f$a;->bxk:J
+    iput-wide p1, p0, Lokhttp3/internal/e/f$a;->bxE:J
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 .method private d(Ljava/io/IOException;)V
     .locals 3
 
-    iget-boolean v0, p0, Lokhttp3/internal/e/f$a;->byh:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/f$a;->byB:Z
 
     if-eqz v0, :cond_0
 
@@ -53,15 +53,15 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/f$a;->byh:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/f$a;->byB:Z
 
-    iget-object v0, p0, Lokhttp3/internal/e/f$a;->byi:Lokhttp3/internal/e/f;
+    iget-object v0, p0, Lokhttp3/internal/e/f$a;->byC:Lokhttp3/internal/e/f;
 
-    iget-object v0, v0, Lokhttp3/internal/e/f;->bxe:Lokhttp3/internal/b/g;
+    iget-object v0, v0, Lokhttp3/internal/e/f;->bxy:Lokhttp3/internal/b/g;
 
     const/4 v1, 0x0
 
-    iget-object v2, p0, Lokhttp3/internal/e/f$a;->byi:Lokhttp3/internal/e/f;
+    iget-object v2, p0, Lokhttp3/internal/e/f$a;->byC:Lokhttp3/internal/e/f;
 
     invoke-virtual {v0, v1, v2, p1}, Lokhttp3/internal/b/g;->a(ZLokhttp3/internal/c/c;Ljava/io/IOException;)V
 
@@ -79,7 +79,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lokio/f;->bBu:Lokio/r;
+    iget-object v0, p0, Lokio/f;->bBO:Lokio/r;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/r;->a(Lokio/c;J)J
 
@@ -91,11 +91,11 @@
 
     if-lez p3, :cond_0
 
-    iget-wide v0, p0, Lokhttp3/internal/e/f$a;->bxk:J
+    iget-wide v0, p0, Lokhttp3/internal/e/f$a;->bxE:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/f$a;->bxk:J
+    iput-wide v0, p0, Lokhttp3/internal/e/f$a;->bxE:J
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/f.smali b/com.discord/smali_classes2/okhttp3/internal/e/f.smali
index 2eb0494456..6c4701ece8 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/f.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/f.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field private static final byc:Ljava/util/List;
+.field private static final byw:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private static final byd:Ljava/util/List;
+.field private static final byx:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,15 +37,15 @@
 
 
 # instance fields
-.field private final bvc:Lokhttp3/u;
+.field private final bvw:Lokhttp3/u;
 
-.field final bxe:Lokhttp3/internal/b/g;
+.field final bxy:Lokhttp3/internal/b/g;
 
-.field private final bye:Lokhttp3/Interceptor$Chain;
+.field private byA:Lokhttp3/internal/e/i;
 
-.field private final byf:Lokhttp3/internal/e/g;
+.field private final byy:Lokhttp3/Interceptor$Chain;
 
-.field private byg:Lokhttp3/internal/e/i;
+.field private final byz:Lokhttp3/internal/e/g;
 
 
 # direct methods
@@ -128,11 +128,11 @@
 
     aput-object v17, v0, v16
 
-    invoke-static {v0}, Lokhttp3/internal/c;->s([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lokhttp3/internal/c;->r([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->byc:Ljava/util/List;
+    sput-object v0, Lokhttp3/internal/e/f;->byw:Ljava/util/List;
 
     const/16 v0, 0x8
 
@@ -156,11 +156,11 @@
 
     aput-object v1, v0, v15
 
-    invoke-static {v0}, Lokhttp3/internal/c;->s([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lokhttp3/internal/c;->r([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->byd:Ljava/util/List;
+    sput-object v0, Lokhttp3/internal/e/f;->byx:Ljava/util/List;
 
     return-void
 .end method
@@ -170,15 +170,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lokhttp3/internal/e/f;->bye:Lokhttp3/Interceptor$Chain;
+    iput-object p2, p0, Lokhttp3/internal/e/f;->byy:Lokhttp3/Interceptor$Chain;
 
-    iput-object p3, p0, Lokhttp3/internal/e/f;->bxe:Lokhttp3/internal/b/g;
+    iput-object p3, p0, Lokhttp3/internal/e/f;->bxy:Lokhttp3/internal/b/g;
 
-    iput-object p4, p0, Lokhttp3/internal/e/f;->byf:Lokhttp3/internal/e/g;
+    iput-object p4, p0, Lokhttp3/internal/e/f;->byz:Lokhttp3/internal/e/g;
 
-    iget-object p1, p1, Lokhttp3/t;->bpU:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/t;->bqo:Ljava/util/List;
 
-    sget-object p2, Lokhttp3/u;->buG:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bva:Lokhttp3/u;
 
     invoke-interface {p1, p2}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -186,22 +186,22 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lokhttp3/u;->buG:Lokhttp3/u;
+    sget-object p1, Lokhttp3/u;->bva:Lokhttp3/u;
 
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lokhttp3/u;->buF:Lokhttp3/u;
+    sget-object p1, Lokhttp3/u;->buZ:Lokhttp3/u;
 
     :goto_0
-    iput-object p1, p0, Lokhttp3/internal/e/f;->bvc:Lokhttp3/u;
+    iput-object p1, p0, Lokhttp3/internal/e/f;->bvw:Lokhttp3/u;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Hw()V
+.method public final Hj()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -209,16 +209,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->byf:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->byz:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/j;->flush()V
 
     return-void
 .end method
 
-.method public final Hx()V
+.method public final Hk()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -226,9 +226,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->byg:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->byA:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->HO()Lokio/q;
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->HB()Lokio/q;
 
     move-result-object v0
 
@@ -240,16 +240,16 @@
 .method public final a(Lokhttp3/w;J)Lokio/q;
     .locals 0
 
-    iget-object p1, p0, Lokhttp3/internal/e/f;->byg:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->byA:Lokhttp3/internal/e/i;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/i;->HO()Lokio/q;
+    invoke-virtual {p1}, Lokhttp3/internal/e/i;->HB()Lokio/q;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final ad(Z)Lokhttp3/Response$a;
+.method public final aa(Z)Lokhttp3/Response$a;
     .locals 10
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -257,19 +257,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->byg:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->byA:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->HN()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->HA()Lokhttp3/Headers;
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/internal/e/f;->bvc:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/internal/e/f;->bvw:Lokhttp3/u;
 
     new-instance v2, Lokhttp3/Headers$a;
 
     invoke-direct {v2}, Lokhttp3/Headers$a;-><init>()V
 
-    iget-object v3, v0, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     array-length v3, v3
 
@@ -284,11 +284,11 @@
     :goto_0
     if-ge v5, v3, :cond_2
 
-    invoke-virtual {v0, v5}, Lokhttp3/Headers;->dz(I)Ljava/lang/String;
+    invoke-virtual {v0, v5}, Lokhttp3/Headers;->dw(I)Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-virtual {v0, v5}, Lokhttp3/Headers;->dA(I)Ljava/lang/String;
+    invoke-virtual {v0, v5}, Lokhttp3/Headers;->dx(I)Ljava/lang/String;
 
     move-result-object v8
 
@@ -310,14 +310,14 @@
 
     move-result-object v6
 
-    invoke-static {v6}, Lokhttp3/internal/c/k;->eD(Ljava/lang/String;)Lokhttp3/internal/c/k;
+    invoke-static {v6}, Lokhttp3/internal/c/k;->ey(Ljava/lang/String;)Lokhttp3/internal/c/k;
 
     move-result-object v6
 
     goto :goto_1
 
     :cond_0
-    sget-object v9, Lokhttp3/internal/e/f;->byd:Ljava/util/List;
+    sget-object v9, Lokhttp3/internal/e/f;->byx:Ljava/util/List;
 
     invoke-interface {v9, v7}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -325,7 +325,7 @@
 
     if-nez v9, :cond_1
 
-    sget-object v9, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v9, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
     invoke-virtual {v9, v2, v7, v8}, Lokhttp3/internal/a;->a(Lokhttp3/Headers$a;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -342,7 +342,7 @@
 
     invoke-direct {v0}, Lokhttp3/Response$a;-><init>()V
 
-    iput-object v1, v0, Lokhttp3/Response$a;->bvc:Lokhttp3/u;
+    iput-object v1, v0, Lokhttp3/Response$a;->bvw:Lokhttp3/u;
 
     iget v1, v6, Lokhttp3/internal/c/k;->code:I
 
@@ -352,7 +352,7 @@
 
     iput-object v1, v0, Lokhttp3/Response$a;->message:Ljava/lang/String;
 
-    invoke-virtual {v2}, Lokhttp3/Headers$a;->GA()Lokhttp3/Headers;
+    invoke-virtual {v2}, Lokhttp3/Headers$a;->Gp()Lokhttp3/Headers;
 
     move-result-object v1
 
@@ -362,7 +362,7 @@
 
     if-eqz p1, :cond_3
 
-    sget-object p1, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
     invoke-virtual {p1, v0}, Lokhttp3/internal/a;->a(Lokhttp3/Response$a;)I
 
@@ -401,14 +401,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->byg:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->byA:Lokhttp3/internal/e/i;
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p1, Lokhttp3/w;->buk:Lokhttp3/RequestBody;
+    iget-object v0, p1, Lokhttp3/w;->buE:Lokhttp3/RequestBody;
 
     const/4 v1, 0x0
 
@@ -422,11 +422,11 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v2, p1, Lokhttp3/w;->buj:Lokhttp3/Headers;
+    iget-object v2, p1, Lokhttp3/w;->buD:Lokhttp3/Headers;
 
     new-instance v3, Ljava/util/ArrayList;
 
-    iget-object v4, v2, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object v4, v2, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     array-length v4, v4
 
@@ -438,7 +438,7 @@
 
     new-instance v4, Lokhttp3/internal/e/c;
 
-    sget-object v5, Lokhttp3/internal/e/c;->bxE:Lokio/ByteString;
+    sget-object v5, Lokhttp3/internal/e/c;->bxY:Lokio/ByteString;
 
     iget-object v6, p1, Lokhttp3/w;->method:Ljava/lang/String;
 
@@ -448,9 +448,9 @@
 
     new-instance v4, Lokhttp3/internal/e/c;
 
-    sget-object v5, Lokhttp3/internal/e/c;->bxF:Lokio/ByteString;
+    sget-object v5, Lokhttp3/internal/e/c;->bxZ:Lokio/ByteString;
 
-    iget-object v6, p1, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v6, p1, Lokhttp3/w;->bqk:Lokhttp3/s;
 
     invoke-static {v6}, Lokhttp3/internal/c/i;->d(Lokhttp3/s;)Ljava/lang/String;
 
@@ -462,7 +462,7 @@
 
     const-string v4, "Host"
 
-    invoke-virtual {p1, v4}, Lokhttp3/w;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v4}, Lokhttp3/w;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -470,7 +470,7 @@
 
     new-instance v5, Lokhttp3/internal/e/c;
 
-    sget-object v6, Lokhttp3/internal/e/c;->bxH:Lokio/ByteString;
+    sget-object v6, Lokhttp3/internal/e/c;->byb:Lokio/ByteString;
 
     invoke-direct {v5, v6, v4}, Lokhttp3/internal/e/c;-><init>(Lokio/ByteString;Ljava/lang/String;)V
 
@@ -479,17 +479,17 @@
     :cond_2
     new-instance v4, Lokhttp3/internal/e/c;
 
-    sget-object v5, Lokhttp3/internal/e/c;->bxG:Lokio/ByteString;
+    sget-object v5, Lokhttp3/internal/e/c;->bya:Lokio/ByteString;
 
-    iget-object p1, p1, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/w;->bqk:Lokhttp3/s;
 
-    iget-object p1, p1, Lokhttp3/s;->btI:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->buc:Ljava/lang/String;
 
     invoke-direct {v4, v5, p1}, Lokhttp3/internal/e/c;-><init>(Lokio/ByteString;Ljava/lang/String;)V
 
     invoke-interface {v3, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, v2, Lokhttp3/Headers;->btF:[Ljava/lang/String;
+    iget-object p1, v2, Lokhttp3/Headers;->btZ:[Ljava/lang/String;
 
     array-length p1, p1
 
@@ -498,7 +498,7 @@
     :goto_1
     if-ge v1, p1, :cond_4
 
-    invoke-virtual {v2, v1}, Lokhttp3/Headers;->dz(I)Ljava/lang/String;
+    invoke-virtual {v2, v1}, Lokhttp3/Headers;->dw(I)Ljava/lang/String;
 
     move-result-object v4
 
@@ -508,13 +508,13 @@
 
     move-result-object v4
 
-    invoke-static {v4}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v4}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v4
 
-    sget-object v5, Lokhttp3/internal/e/f;->byc:Ljava/util/List;
+    sget-object v5, Lokhttp3/internal/e/f;->byw:Ljava/util/List;
 
-    invoke-virtual {v4}, Lokio/ByteString;->IF()Ljava/lang/String;
+    invoke-virtual {v4}, Lokio/ByteString;->Is()Ljava/lang/String;
 
     move-result-object v6
 
@@ -526,7 +526,7 @@
 
     new-instance v5, Lokhttp3/internal/e/c;
 
-    invoke-virtual {v2, v1}, Lokhttp3/Headers;->dA(I)Ljava/lang/String;
+    invoke-virtual {v2, v1}, Lokhttp3/Headers;->dx(I)Ljava/lang/String;
 
     move-result-object v6
 
@@ -540,21 +540,21 @@
     goto :goto_1
 
     :cond_4
-    iget-object p1, p0, Lokhttp3/internal/e/f;->byf:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->byz:Lokhttp3/internal/e/g;
 
     invoke-virtual {p1, v3, v0}, Lokhttp3/internal/e/g;->c(Ljava/util/List;Z)Lokhttp3/internal/e/i;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/internal/e/f;->byg:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/f;->byA:Lokhttp3/internal/e/i;
 
-    iget-object p1, p0, Lokhttp3/internal/e/f;->byg:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->byA:Lokhttp3/internal/e/i;
 
-    iget-object p1, p1, Lokhttp3/internal/e/i;->bzb:Lokhttp3/internal/e/i$c;
+    iget-object p1, p1, Lokhttp3/internal/e/i;->bzv:Lokhttp3/internal/e/i$c;
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bye:Lokhttp3/Interceptor$Chain;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->byy:Lokhttp3/Interceptor$Chain;
 
-    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->GO()I
+    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->GD()I
 
     move-result v0
 
@@ -564,13 +564,13 @@
 
     invoke-virtual {p1, v0, v1, v2}, Lokio/s;->d(JLjava/util/concurrent/TimeUnit;)Lokio/s;
 
-    iget-object p1, p0, Lokhttp3/internal/e/f;->byg:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->byA:Lokhttp3/internal/e/i;
 
-    iget-object p1, p1, Lokhttp3/internal/e/i;->bzc:Lokhttp3/internal/e/i$c;
+    iget-object p1, p1, Lokhttp3/internal/e/i;->bzw:Lokhttp3/internal/e/i$c;
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bye:Lokhttp3/Interceptor$Chain;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->byy:Lokhttp3/Interceptor$Chain;
 
-    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->GP()I
+    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->GE()I
 
     move-result v0
 
@@ -586,11 +586,11 @@
 .method public final cancel()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->byg:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->byA:Lokhttp3/internal/e/i;
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxv:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxP:Lokhttp3/internal/e/b;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/e/i;->c(Lokhttp3/internal/e/b;)V
 
@@ -608,7 +608,7 @@
 
     const-string v0, "Content-Type"
 
-    invoke-virtual {p1, v0}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Lokhttp3/Response;->em(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -618,9 +618,9 @@
 
     new-instance p1, Lokhttp3/internal/e/f$a;
 
-    iget-object v3, p0, Lokhttp3/internal/e/f;->byg:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/f;->byA:Lokhttp3/internal/e/i;
 
-    iget-object v3, v3, Lokhttp3/internal/e/i;->byZ:Lokhttp3/internal/e/i$b;
+    iget-object v3, v3, Lokhttp3/internal/e/i;->bzt:Lokhttp3/internal/e/i$b;
 
     invoke-direct {p1, p0, v3}, Lokhttp3/internal/e/f$a;-><init>(Lokhttp3/internal/e/f;Lokio/r;)V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g$1.smali b/com.discord/smali_classes2/okhttp3/internal/e/g$1.smali
index 8f107be4c8..d25bdafab8 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$1.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic byB:I
+.field final synthetic byV:I
 
-.field final synthetic byC:Lokhttp3/internal/e/b;
+.field final synthetic byW:Lokhttp3/internal/e/b;
 
-.field final synthetic byD:Lokhttp3/internal/e/g;
+.field final synthetic byX:Lokhttp3/internal/e/g;
 
 
 # direct methods
 .method varargs constructor <init>(Lokhttp3/internal/e/g;Ljava/lang/String;[Ljava/lang/Object;ILokhttp3/internal/e/b;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$1;->byD:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$1;->byX:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$1;->byB:I
+    iput p4, p0, Lokhttp3/internal/e/g$1;->byV:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$1;->byC:Lokhttp3/internal/e/b;
+    iput-object p5, p0, Lokhttp3/internal/e/g$1;->byW:Lokhttp3/internal/e/b;
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -43,11 +43,11 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$1;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$1;->byX:Lokhttp3/internal/e/g;
 
-    iget v1, p0, Lokhttp3/internal/e/g$1;->byB:I
+    iget v1, p0, Lokhttp3/internal/e/g$1;->byV:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/g$1;->byC:Lokhttp3/internal/e/b;
+    iget-object v2, p0, Lokhttp3/internal/e/g$1;->byW:Lokhttp3/internal/e/b;
 
     invoke-virtual {v0, v1, v2}, Lokhttp3/internal/e/g;->b(ILokhttp3/internal/e/b;)V
     :try_end_0
@@ -56,7 +56,7 @@
     return-void
 
     :catch_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$1;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$1;->byX:Lokhttp3/internal/e/g;
 
     invoke-static {v0}, Lokhttp3/internal/e/g;->b(Lokhttp3/internal/e/g;)V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g$2.smali b/com.discord/smali_classes2/okhttp3/internal/e/g$2.smali
index 015cb0b755..4de0c65715 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$2.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$2.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic byB:I
+.field final synthetic byV:I
 
-.field final synthetic byD:Lokhttp3/internal/e/g;
+.field final synthetic byX:Lokhttp3/internal/e/g;
 
-.field final synthetic byE:J
+.field final synthetic byY:J
 
 
 # direct methods
 .method varargs constructor <init>(Lokhttp3/internal/e/g;Ljava/lang/String;[Ljava/lang/Object;IJ)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$2;->byD:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$2;->byX:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$2;->byB:I
+    iput p4, p0, Lokhttp3/internal/e/g$2;->byV:I
 
-    iput-wide p5, p0, Lokhttp3/internal/e/g$2;->byE:J
+    iput-wide p5, p0, Lokhttp3/internal/e/g$2;->byY:J
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -43,13 +43,13 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$2;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$2;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$2;->byB:I
+    iget v1, p0, Lokhttp3/internal/e/g$2;->byV:I
 
-    iget-wide v2, p0, Lokhttp3/internal/e/g$2;->byE:J
+    iget-wide v2, p0, Lokhttp3/internal/e/g$2;->byY:J
 
     invoke-virtual {v0, v1, v2, v3}, Lokhttp3/internal/e/j;->m(IJ)V
     :try_end_0
@@ -58,7 +58,7 @@
     return-void
 
     :catch_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$2;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$2;->byX:Lokhttp3/internal/e/g;
 
     invoke-static {v0}, Lokhttp3/internal/e/g;->b(Lokhttp3/internal/e/g;)V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g$3.smali b/com.discord/smali_classes2/okhttp3/internal/e/g$3.smali
index 5eb55f74e7..f2ca8122c0 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$3.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$3.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic byB:I
+.field final synthetic byV:I
 
-.field final synthetic byD:Lokhttp3/internal/e/g;
+.field final synthetic byX:Lokhttp3/internal/e/g;
 
-.field final synthetic byF:Ljava/util/List;
+.field final synthetic byZ:Ljava/util/List;
 
 
 # direct methods
 .method varargs constructor <init>(Lokhttp3/internal/e/g;Ljava/lang/String;[Ljava/lang/Object;ILjava/util/List;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$3;->byD:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$3;->byX:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$3;->byB:I
+    iput p4, p0, Lokhttp3/internal/e/g$3;->byV:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$3;->byF:Ljava/util/List;
+    iput-object p5, p0, Lokhttp3/internal/e/g$3;->byZ:Ljava/util/List;
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -43,28 +43,28 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$3;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$3;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$3;->byB:I
+    iget v1, p0, Lokhttp3/internal/e/g$3;->byV:I
 
-    sget-object v2, Lokhttp3/internal/e/b;->bxv:Lokhttp3/internal/e/b;
+    sget-object v2, Lokhttp3/internal/e/b;->bxP:Lokhttp3/internal/e/b;
 
     invoke-virtual {v0, v1, v2}, Lokhttp3/internal/e/j;->c(ILokhttp3/internal/e/b;)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$3;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$3;->byX:Lokhttp3/internal/e/g;
 
     monitor-enter v0
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    iget-object v1, p0, Lokhttp3/internal/e/g$3;->byD:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$3;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->byA:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->byU:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$3;->byB:I
+    iget v2, p0, Lokhttp3/internal/e/g$3;->byV:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g$4.smali b/com.discord/smali_classes2/okhttp3/internal/e/g$4.smali
index 6b61875408..ab159d2cbd 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$4.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$4.smali
@@ -15,26 +15,26 @@
 
 
 # instance fields
-.field final synthetic byB:I
+.field final synthetic byV:I
 
-.field final synthetic byD:Lokhttp3/internal/e/g;
+.field final synthetic byX:Lokhttp3/internal/e/g;
 
-.field final synthetic byF:Ljava/util/List;
+.field final synthetic byZ:Ljava/util/List;
 
-.field final synthetic byG:Z
+.field final synthetic bza:Z
 
 
 # direct methods
 .method varargs constructor <init>(Lokhttp3/internal/e/g;Ljava/lang/String;[Ljava/lang/Object;ILjava/util/List;Z)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$4;->byD:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$4;->byX:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$4;->byB:I
+    iput p4, p0, Lokhttp3/internal/e/g$4;->byV:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$4;->byF:Ljava/util/List;
+    iput-object p5, p0, Lokhttp3/internal/e/g$4;->byZ:Ljava/util/List;
 
-    iput-boolean p6, p0, Lokhttp3/internal/e/g$4;->byG:Z
+    iput-boolean p6, p0, Lokhttp3/internal/e/g$4;->bza:Z
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -47,28 +47,28 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$4;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$4;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$4;->byB:I
+    iget v1, p0, Lokhttp3/internal/e/g$4;->byV:I
 
-    sget-object v2, Lokhttp3/internal/e/b;->bxv:Lokhttp3/internal/e/b;
+    sget-object v2, Lokhttp3/internal/e/b;->bxP:Lokhttp3/internal/e/b;
 
     invoke-virtual {v0, v1, v2}, Lokhttp3/internal/e/j;->c(ILokhttp3/internal/e/b;)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$4;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$4;->byX:Lokhttp3/internal/e/g;
 
     monitor-enter v0
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    iget-object v1, p0, Lokhttp3/internal/e/g$4;->byD:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$4;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->byA:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->byU:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$4;->byB:I
+    iget v2, p0, Lokhttp3/internal/e/g$4;->byV:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g$5.smali b/com.discord/smali_classes2/okhttp3/internal/e/g$5.smali
index 0a0d35adaa..de58d1c5e0 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$5.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$5.smali
@@ -15,30 +15,30 @@
 
 
 # instance fields
-.field final synthetic buX:I
+.field final synthetic bvr:I
 
-.field final synthetic byB:I
+.field final synthetic byV:I
 
-.field final synthetic byD:Lokhttp3/internal/e/g;
+.field final synthetic byX:Lokhttp3/internal/e/g;
 
-.field final synthetic byG:Z
+.field final synthetic bza:Z
 
-.field final synthetic byH:Lokio/c;
+.field final synthetic bzb:Lokio/c;
 
 
 # direct methods
 .method varargs constructor <init>(Lokhttp3/internal/e/g;Ljava/lang/String;[Ljava/lang/Object;ILokio/c;IZ)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$5;->byD:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$5;->byX:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$5;->byB:I
+    iput p4, p0, Lokhttp3/internal/e/g$5;->byV:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$5;->byH:Lokio/c;
+    iput-object p5, p0, Lokhttp3/internal/e/g$5;->bzb:Lokio/c;
 
-    iput p6, p0, Lokhttp3/internal/e/g$5;->buX:I
+    iput p6, p0, Lokhttp3/internal/e/g$5;->bvr:I
 
-    iput-boolean p7, p0, Lokhttp3/internal/e/g$5;->byG:Z
+    iput-boolean p7, p0, Lokhttp3/internal/e/g$5;->bza:Z
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -51,38 +51,38 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$5;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$5;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->byr:Lokhttp3/internal/e/l;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->byL:Lokhttp3/internal/e/l;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$5;->byH:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/g$5;->bzb:Lokio/c;
 
-    iget v2, p0, Lokhttp3/internal/e/g$5;->buX:I
+    iget v2, p0, Lokhttp3/internal/e/g$5;->bvr:I
 
     invoke-interface {v0, v1, v2}, Lokhttp3/internal/e/l;->a(Lokio/d;I)Z
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$5;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$5;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$5;->byB:I
+    iget v1, p0, Lokhttp3/internal/e/g$5;->byV:I
 
-    sget-object v2, Lokhttp3/internal/e/b;->bxv:Lokhttp3/internal/e/b;
+    sget-object v2, Lokhttp3/internal/e/b;->bxP:Lokhttp3/internal/e/b;
 
     invoke-virtual {v0, v1, v2}, Lokhttp3/internal/e/j;->c(ILokhttp3/internal/e/b;)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$5;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$5;->byX:Lokhttp3/internal/e/g;
 
     monitor-enter v0
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    iget-object v1, p0, Lokhttp3/internal/e/g$5;->byD:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$5;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->byA:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->byU:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$5;->byB:I
+    iget v2, p0, Lokhttp3/internal/e/g$5;->byV:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g$6.smali b/com.discord/smali_classes2/okhttp3/internal/e/g$6.smali
index 08bee98c1f..8a6434213d 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$6.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$6.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic byB:I
+.field final synthetic byV:I
 
-.field final synthetic byC:Lokhttp3/internal/e/b;
+.field final synthetic byW:Lokhttp3/internal/e/b;
 
-.field final synthetic byD:Lokhttp3/internal/e/g;
+.field final synthetic byX:Lokhttp3/internal/e/g;
 
 
 # direct methods
 .method varargs constructor <init>(Lokhttp3/internal/e/g;Ljava/lang/String;[Ljava/lang/Object;ILokhttp3/internal/e/b;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$6;->byD:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$6;->byX:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$6;->byB:I
+    iput p4, p0, Lokhttp3/internal/e/g$6;->byV:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$6;->byC:Lokhttp3/internal/e/b;
+    iput-object p5, p0, Lokhttp3/internal/e/g$6;->byW:Lokhttp3/internal/e/b;
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -42,16 +42,16 @@
 .method public final execute()V
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$6;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$6;->byX:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/g$6;->byD:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$6;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->byA:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->byU:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$6;->byB:I
+    iget v2, p0, Lokhttp3/internal/e/g$6;->byV:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g$a.smali b/com.discord/smali_classes2/okhttp3/internal/e/g$a.smali
index e7d997bcc5..62519d8ffd 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$a.smali
@@ -15,21 +15,21 @@
 
 
 # instance fields
-.field bwA:Lokio/BufferedSink;
+.field bwS:Ljava/net/Socket;
 
-.field bwy:Ljava/net/Socket;
+.field bwU:Lokio/BufferedSink;
 
-.field public byI:I
+.field byE:Z
 
-.field byk:Z
+.field public byF:Lokhttp3/internal/e/g$b;
 
-.field public byl:Lokhttp3/internal/e/g$b;
+.field byL:Lokhttp3/internal/e/l;
 
-.field byr:Lokhttp3/internal/e/l;
+.field public bzc:I
 
 .field hostname:Ljava/lang/String;
 
-.field nJ:Lokio/d;
+.field nI:Lokio/d;
 
 
 # direct methods
@@ -38,24 +38,24 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lokhttp3/internal/e/g$b;->byJ:Lokhttp3/internal/e/g$b;
+    sget-object v0, Lokhttp3/internal/e/g$b;->bzd:Lokhttp3/internal/e/g$b;
 
-    iput-object v0, p0, Lokhttp3/internal/e/g$a;->byl:Lokhttp3/internal/e/g$b;
+    iput-object v0, p0, Lokhttp3/internal/e/g$a;->byF:Lokhttp3/internal/e/g$b;
 
-    sget-object v0, Lokhttp3/internal/e/l;->bzt:Lokhttp3/internal/e/l;
+    sget-object v0, Lokhttp3/internal/e/l;->bzN:Lokhttp3/internal/e/l;
 
-    iput-object v0, p0, Lokhttp3/internal/e/g$a;->byr:Lokhttp3/internal/e/l;
+    iput-object v0, p0, Lokhttp3/internal/e/g$a;->byL:Lokhttp3/internal/e/l;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/g$a;->byk:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/g$a;->byE:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final HK()Lokhttp3/internal/e/g;
+.method public final Hx()Lokhttp3/internal/e/g;
     .locals 1
 
     new-instance v0, Lokhttp3/internal/e/g;
@@ -68,13 +68,13 @@
 .method public final a(Ljava/net/Socket;Ljava/lang/String;Lokio/d;Lokio/BufferedSink;)Lokhttp3/internal/e/g$a;
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$a;->bwy:Ljava/net/Socket;
+    iput-object p1, p0, Lokhttp3/internal/e/g$a;->bwS:Ljava/net/Socket;
 
     iput-object p2, p0, Lokhttp3/internal/e/g$a;->hostname:Ljava/lang/String;
 
-    iput-object p3, p0, Lokhttp3/internal/e/g$a;->nJ:Lokio/d;
+    iput-object p3, p0, Lokhttp3/internal/e/g$a;->nI:Lokio/d;
 
-    iput-object p4, p0, Lokhttp3/internal/e/g$a;->bwA:Lokio/BufferedSink;
+    iput-object p4, p0, Lokhttp3/internal/e/g$a;->bwU:Lokio/BufferedSink;
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g$b$1.smali b/com.discord/smali_classes2/okhttp3/internal/e/g$b$1.smali
index 6514ef1dc7..0f2da59593 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$b$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$b$1.smali
@@ -33,7 +33,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/e/b;->bxu:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->bxO:Lokhttp3/internal/e/b;
 
     invoke-virtual {p1, v0}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/b;)V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g$c.smali b/com.discord/smali_classes2/okhttp3/internal/e/g$c.smali
index 6e04b813bd..1e99089ab3 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$c.smali
@@ -15,20 +15,20 @@
 
 
 # instance fields
-.field final synthetic byD:Lokhttp3/internal/e/g;
+.field final synthetic byX:Lokhttp3/internal/e/g;
 
-.field final byK:Z
+.field final bze:Z
 
-.field final byL:I
+.field final bzf:I
 
-.field final byM:I
+.field final bzg:I
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/e/g;ZII)V
     .locals 2
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$c;->byD:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$c;->byX:Lokhttp3/internal/e/g;
 
     const/4 v0, 0x3
 
@@ -60,11 +60,11 @@
 
     invoke-direct {p0, p1, v0}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iput-boolean p2, p0, Lokhttp3/internal/e/g$c;->byK:Z
+    iput-boolean p2, p0, Lokhttp3/internal/e/g$c;->bze:Z
 
-    iput p3, p0, Lokhttp3/internal/e/g$c;->byL:I
+    iput p3, p0, Lokhttp3/internal/e/g$c;->bzf:I
 
-    iput p4, p0, Lokhttp3/internal/e/g$c;->byM:I
+    iput p4, p0, Lokhttp3/internal/e/g$c;->bzg:I
 
     return-void
 .end method
@@ -74,24 +74,24 @@
 .method public final execute()V
     .locals 6
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$c;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$c;->byX:Lokhttp3/internal/e/g;
 
-    iget-boolean v1, p0, Lokhttp3/internal/e/g$c;->byK:Z
+    iget-boolean v1, p0, Lokhttp3/internal/e/g$c;->bze:Z
 
-    iget v2, p0, Lokhttp3/internal/e/g$c;->byL:I
+    iget v2, p0, Lokhttp3/internal/e/g$c;->bzf:I
 
-    iget v3, p0, Lokhttp3/internal/e/g$c;->byM:I
+    iget v3, p0, Lokhttp3/internal/e/g$c;->bzg:I
 
     if-nez v1, :cond_0
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v4, v0, Lokhttp3/internal/e/g;->bys:Z
+    iget-boolean v4, v0, Lokhttp3/internal/e/g;->byM:Z
 
     const/4 v5, 0x1
 
-    iput-boolean v5, v0, Lokhttp3/internal/e/g;->bys:Z
+    iput-boolean v5, v0, Lokhttp3/internal/e/g;->byM:Z
 
     monitor-exit v0
     :try_end_0
@@ -99,7 +99,7 @@
 
     if-eqz v4, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/g;->HH()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Hu()V
 
     return-void
 
@@ -115,7 +115,7 @@
 
     :cond_0
     :try_start_2
-    iget-object v4, v0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v4, v0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     invoke-virtual {v4, v1, v2, v3}, Lokhttp3/internal/e/j;->a(ZII)V
     :try_end_2
@@ -124,7 +124,7 @@
     return-void
 
     :catch_0
-    invoke-virtual {v0}, Lokhttp3/internal/e/g;->HH()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Hu()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g$d$1.smali b/com.discord/smali_classes2/okhttp3/internal/e/g$d$1.smali
index 6c4a9bad51..275fc74209 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$d$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$d$1.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic byO:Lokhttp3/internal/e/i;
+.field final synthetic bzi:Lokhttp3/internal/e/i;
 
-.field final synthetic byP:Lokhttp3/internal/e/g$d;
+.field final synthetic bzj:Lokhttp3/internal/e/g$d;
 
 
 # direct methods
 .method varargs constructor <init>(Lokhttp3/internal/e/g$d;Ljava/lang/String;[Ljava/lang/Object;Lokhttp3/internal/e/i;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$d$1;->byP:Lokhttp3/internal/e/g$d;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d$1;->bzj:Lokhttp3/internal/e/g$d;
 
-    iput-object p4, p0, Lokhttp3/internal/e/g$d$1;->byO:Lokhttp3/internal/e/i;
+    iput-object p4, p0, Lokhttp3/internal/e/g$d$1;->bzi:Lokhttp3/internal/e/i;
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -39,13 +39,13 @@
     .locals 5
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d$1;->byP:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$1;->bzj:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->byl:Lokhttp3/internal/e/g$b;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->byF:Lokhttp3/internal/e/g$b;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d$1;->byO:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d$1;->bzi:Lokhttp3/internal/e/i;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/e/g$b;->a(Lokhttp3/internal/e/i;)V
     :try_end_0
@@ -56,7 +56,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v1
 
@@ -68,9 +68,9 @@
 
     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, p0, Lokhttp3/internal/e/g$d$1;->byP:Lokhttp3/internal/e/g$d;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d$1;->bzj:Lokhttp3/internal/e/g$d;
 
-    iget-object v4, v4, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v4, v4, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     iget-object v4, v4, Lokhttp3/internal/e/g;->hostname:Ljava/lang/String;
 
@@ -83,9 +83,9 @@
     invoke-virtual {v1, v2, v3, v0}, Lokhttp3/internal/g/f;->a(ILjava/lang/String;Ljava/lang/Throwable;)V
 
     :try_start_1
-    iget-object v0, p0, Lokhttp3/internal/e/g$d$1;->byO:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$1;->bzi:Lokhttp3/internal/e/i;
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxr:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxL:Lokhttp3/internal/e/b;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/b;)V
     :try_end_1
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g$d$2.smali b/com.discord/smali_classes2/okhttp3/internal/e/g$d$2.smali
index d25cd755c6..f80106afe1 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$d$2.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$d$2.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic byP:Lokhttp3/internal/e/g$d;
+.field final synthetic bzj:Lokhttp3/internal/e/g$d;
 
 
 # direct methods
 .method varargs constructor <init>(Lokhttp3/internal/e/g$d;Ljava/lang/String;[Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$d$2;->byP:Lokhttp3/internal/e/g$d;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d$2;->bzj:Lokhttp3/internal/e/g$d;
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -34,15 +34,15 @@
 .method public final execute()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d$2;->byP:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$2;->bzj:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->byl:Lokhttp3/internal/e/g$b;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->byF:Lokhttp3/internal/e/g$b;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d$2;->byP:Lokhttp3/internal/e/g$d;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d$2;->bzj:Lokhttp3/internal/e/g$d;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v1, v1, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/e/g$b;->a(Lokhttp3/internal/e/g;)V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g$d$3.smali b/com.discord/smali_classes2/okhttp3/internal/e/g$d$3.smali
index 098cea8a16..8e4830d7c6 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$d$3.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$d$3.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic byP:Lokhttp3/internal/e/g$d;
+.field final synthetic bzj:Lokhttp3/internal/e/g$d;
 
-.field final synthetic byQ:Lokhttp3/internal/e/m;
+.field final synthetic bzk:Lokhttp3/internal/e/m;
 
 
 # direct methods
 .method varargs constructor <init>(Lokhttp3/internal/e/g$d;Ljava/lang/String;[Ljava/lang/Object;Lokhttp3/internal/e/m;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$d$3;->byP:Lokhttp3/internal/e/g$d;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d$3;->bzj:Lokhttp3/internal/e/g$d;
 
-    iput-object p4, p0, Lokhttp3/internal/e/g$d$3;->byQ:Lokhttp3/internal/e/m;
+    iput-object p4, p0, Lokhttp3/internal/e/g$d$3;->bzk:Lokhttp3/internal/e/m;
 
     invoke-direct {p0, p2, p3}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -39,13 +39,13 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d$3;->byP:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$3;->bzj:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d$3;->byQ:Lokhttp3/internal/e/m;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d$3;->bzk:Lokhttp3/internal/e/m;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/e/j;->b(Lokhttp3/internal/e/m;)V
     :try_end_0
@@ -54,9 +54,9 @@
     return-void
 
     :catch_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d$3;->byP:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$3;->bzj:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     invoke-static {v0}, Lokhttp3/internal/e/g;->b(Lokhttp3/internal/e/g;)V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g$d.smali b/com.discord/smali_classes2/okhttp3/internal/e/g$d.smali
index 17539e3319..7a8d331065 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g$d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g$d.smali
@@ -18,16 +18,16 @@
 
 
 # instance fields
-.field final synthetic byD:Lokhttp3/internal/e/g;
+.field final synthetic byX:Lokhttp3/internal/e/g;
 
-.field final byN:Lokhttp3/internal/e/h;
+.field final bzh:Lokhttp3/internal/e/h;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/e/g;Lokhttp3/internal/e/h;)V
     .locals 2
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     const/4 v0, 0x1
 
@@ -43,7 +43,7 @@
 
     invoke-direct {p0, p1, v0}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iput-object p2, p0, Lokhttp3/internal/e/g$d;->byN:Lokhttp3/internal/e/h;
+    iput-object p2, p0, Lokhttp3/internal/e/g$d;->bzh:Lokhttp3/internal/e/h;
 
     return-void
 .end method
@@ -53,22 +53,22 @@
 .method public final a(Lokhttp3/internal/e/m;)V
     .locals 11
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->byw:Lokhttp3/internal/e/m;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->byQ:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/m;->HY()I
+    invoke-virtual {v1}, Lokhttp3/internal/e/m;->HL()I
 
     move-result v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    iget-object v2, v2, Lokhttp3/internal/e/g;->byw:Lokhttp3/internal/e/m;
+    iget-object v2, v2, Lokhttp3/internal/e/g;->byQ:Lokhttp3/internal/e/m;
 
     const/4 v3, 0x0
 
@@ -85,11 +85,11 @@
 
     if-eqz v5, :cond_0
 
-    iget-object v5, p1, Lokhttp3/internal/e/m;->bzv:[I
+    iget-object v5, p1, Lokhttp3/internal/e/m;->bzP:[I
 
     aget v5, v5, v4
 
-    invoke-virtual {v2, v4, v5}, Lokhttp3/internal/e/m;->ac(II)Lokhttp3/internal/e/m;
+    invoke-virtual {v2, v4, v5}, Lokhttp3/internal/e/m;->ab(II)Lokhttp3/internal/e/m;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
@@ -102,7 +102,7 @@
     const/4 v2, 0x1
 
     :try_start_1
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     invoke-static {v4}, Lokhttp3/internal/e/g;->c(Lokhttp3/internal/e/g;)Ljava/util/concurrent/ScheduledExecutorService;
 
@@ -114,7 +114,7 @@
 
     new-array v7, v2, [Ljava/lang/Object;
 
-    iget-object v8, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v8, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     iget-object v8, v8, Lokhttp3/internal/e/g;->hostname:Ljava/lang/String;
 
@@ -129,11 +129,11 @@
 
     :catch_0
     :try_start_2
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    iget-object p1, p1, Lokhttp3/internal/e/g;->byw:Lokhttp3/internal/e/m;
+    iget-object p1, p1, Lokhttp3/internal/e/g;->byQ:Lokhttp3/internal/e/m;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->HY()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->HL()I
 
     move-result p1
 
@@ -151,18 +151,18 @@
 
     int-to-long v8, p1
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    iget-boolean p1, p1, Lokhttp3/internal/e/g;->byx:Z
+    iget-boolean p1, p1, Lokhttp3/internal/e/g;->byR:Z
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    iput-boolean v2, p1, Lokhttp3/internal/e/g;->byx:Z
+    iput-boolean v2, p1, Lokhttp3/internal/e/g;->byR:Z
 
     :cond_2
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     iget-object p1, p1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -172,7 +172,7 @@
 
     if-nez p1, :cond_4
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     iget-object p1, p1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -180,7 +180,7 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     iget-object v1, v1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -205,7 +205,7 @@
 
     :cond_4
     :goto_1
-    invoke-static {}, Lokhttp3/internal/e/g;->HJ()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lokhttp3/internal/e/g;->Hw()Ljava/util/concurrent/ExecutorService;
 
     move-result-object p1
 
@@ -215,7 +215,7 @@
 
     new-array v2, v2, [Ljava/lang/Object;
 
-    iget-object v10, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v10, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     iget-object v10, v10, Lokhttp3/internal/e/g;->hostname:Ljava/lang/String;
 
@@ -287,16 +287,16 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     monitor-enter p1
 
     :try_start_0
-    iget-object p2, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p2, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     invoke-static {p2}, Lokhttp3/internal/e/g;->d(Lokhttp3/internal/e/g;)Z
 
-    iget-object p2, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p2, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     invoke-virtual {p2}, Ljava/lang/Object;->notifyAll()V
 
@@ -315,7 +315,7 @@
 
     :cond_0
     :try_start_1
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     invoke-static {p1}, Lokhttp3/internal/e/g;->c(Lokhttp3/internal/e/g;)Ljava/util/concurrent/ScheduledExecutorService;
 
@@ -323,7 +323,7 @@
 
     new-instance v0, Lokhttp3/internal/e/g$c;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     const/4 v2, 0x1
 
@@ -348,7 +348,7 @@
         }
     .end annotation
 
-    invoke-static {p2}, Lokhttp3/internal/e/g;->dK(I)Z
+    invoke-static {p2}, Lokhttp3/internal/e/g;->dH(I)Z
 
     move-result v0
 
@@ -360,7 +360,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     :try_start_0
     new-instance v11, Lokhttp3/internal/e/g$4;
@@ -399,22 +399,22 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_1
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    invoke-virtual {v4, p2}, Lokhttp3/internal/e/g;->dI(I)Lokhttp3/internal/e/i;
+    invoke-virtual {v4, p2}, Lokhttp3/internal/e/g;->dF(I)Lokhttp3/internal/e/i;
 
     move-result-object v4
 
     if-nez v4, :cond_4
 
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    iget-boolean v4, v4, Lokhttp3/internal/e/g;->byo:Z
+    iget-boolean v4, v4, Lokhttp3/internal/e/g;->byI:Z
 
     if-eqz v4, :cond_1
 
@@ -423,9 +423,9 @@
     return-void
 
     :cond_1
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    iget v4, v4, Lokhttp3/internal/e/g;->bym:I
+    iget v4, v4, Lokhttp3/internal/e/g;->byG:I
 
     if-gt p2, v4, :cond_2
 
@@ -436,9 +436,9 @@
     :cond_2
     rem-int/lit8 v4, p2, 0x2
 
-    iget-object v5, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v5, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    iget v5, v5, Lokhttp3/internal/e/g;->byn:I
+    iget v5, v5, Lokhttp3/internal/e/g;->byH:I
 
     rem-int/2addr v5, v3
 
@@ -455,7 +455,7 @@
 
     new-instance p3, Lokhttp3/internal/e/i;
 
-    iget-object v6, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v6, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     const/4 v7, 0x0
 
@@ -467,11 +467,11 @@
 
     invoke-direct/range {v4 .. v9}, Lokhttp3/internal/e/i;-><init>(ILokhttp3/internal/e/g;ZZLokhttp3/Headers;)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    iput p2, p1, Lokhttp3/internal/e/g;->bym:I
+    iput p2, p1, Lokhttp3/internal/e/g;->byG:I
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     iget-object p1, p1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -481,7 +481,7 @@
 
     invoke-interface {p1, v4, p3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {}, Lokhttp3/internal/e/g;->HJ()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lokhttp3/internal/e/g;->Hw()Ljava/util/concurrent/ExecutorService;
 
     move-result-object p1
 
@@ -491,7 +491,7 @@
 
     new-array v3, v3, [Ljava/lang/Object;
 
-    iget-object v6, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v6, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     iget-object v6, v6, Lokhttp3/internal/e/g;->hostname:Ljava/lang/String;
 
@@ -540,9 +540,9 @@
     monitor-enter v4
 
     :try_start_2
-    iput-boolean v2, v4, Lokhttp3/internal/e/i;->byY:Z
+    iput-boolean v2, v4, Lokhttp3/internal/e/i;->bzs:Z
 
-    iget-object p2, v4, Lokhttp3/internal/e/i;->byW:Ljava/util/Deque;
+    iget-object p2, v4, Lokhttp3/internal/e/i;->bzq:Ljava/util/Deque;
 
     invoke-static {p3}, Lokhttp3/internal/c;->ag(Ljava/util/List;)Lokhttp3/Headers;
 
@@ -562,16 +562,16 @@
 
     if-nez p2, :cond_7
 
-    iget-object p2, v4, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iget-object p2, v4, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
     iget p3, v4, Lokhttp3/internal/e/i;->id:I
 
-    invoke-virtual {p2, p3}, Lokhttp3/internal/e/g;->dJ(I)Lokhttp3/internal/e/i;
+    invoke-virtual {p2, p3}, Lokhttp3/internal/e/g;->dG(I)Lokhttp3/internal/e/i;
 
     :cond_7
     if-eqz p1, :cond_8
 
-    invoke-virtual {v4}, Lokhttp3/internal/e/i;->HP()V
+    invoke-virtual {v4}, Lokhttp3/internal/e/i;->HC()V
 
     :cond_8
     return-void
@@ -605,13 +605,13 @@
         }
     .end annotation
 
-    invoke-static {p2}, Lokhttp3/internal/e/g;->dK(I)Z
+    invoke-static {p2}, Lokhttp3/internal/e/g;->dH(I)Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     new-instance v6, Lokio/c;
 
@@ -693,21 +693,21 @@
     throw p1
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    invoke-virtual {v0, p2}, Lokhttp3/internal/e/g;->dI(I)Lokhttp3/internal/e/i;
+    invoke-virtual {v0, p2}, Lokhttp3/internal/e/g;->dF(I)Lokhttp3/internal/e/i;
 
     move-result-object v0
 
     if-nez v0, :cond_2
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    sget-object v0, Lokhttp3/internal/e/b;->bxr:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->bxL:Lokhttp3/internal/e/b;
 
     invoke-virtual {p1, p2, v0}, Lokhttp3/internal/e/g;->a(ILokhttp3/internal/e/b;)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     int-to-long v0, p4
 
@@ -739,7 +739,7 @@
 
     :cond_4
     :goto_0
-    iget-object p2, v0, Lokhttp3/internal/e/i;->byZ:Lokhttp3/internal/e/i$b;
+    iget-object p2, v0, Lokhttp3/internal/e/i;->bzt:Lokhttp3/internal/e/i$b;
 
     int-to-long v1, p4
 
@@ -747,7 +747,7 @@
 
     if-eqz p1, :cond_5
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->HP()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->HC()V
 
     :cond_5
     return-void
@@ -756,13 +756,13 @@
 .method public final c(ILokhttp3/internal/e/b;)V
     .locals 8
 
-    invoke-static {p1}, Lokhttp3/internal/e/g;->dK(I)Z
+    invoke-static {p1}, Lokhttp3/internal/e/g;->dH(I)Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     new-instance v7, Lokhttp3/internal/e/g$6;
 
@@ -801,9 +801,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    invoke-virtual {v0, p1}, Lokhttp3/internal/e/g;->dJ(I)Lokhttp3/internal/e/i;
+    invoke-virtual {v0, p1}, Lokhttp3/internal/e/g;->dG(I)Lokhttp3/internal/e/i;
 
     move-result-object p1
 
@@ -815,15 +815,15 @@
     return-void
 .end method
 
-.method public final dL(I)V
+.method public final dI(I)V
     .locals 5
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     iget-object v1, v1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -831,7 +831,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     iget-object v2, v2, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -847,11 +847,11 @@
 
     check-cast v1, [Lokhttp3/internal/e/i;
 
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     const/4 v3, 0x1
 
-    iput-boolean v3, v2, Lokhttp3/internal/e/g;->byo:Z
+    iput-boolean v3, v2, Lokhttp3/internal/e/g;->byI:Z
 
     monitor-exit v0
     :try_end_0
@@ -870,21 +870,21 @@
 
     if-le v4, p1, :cond_0
 
-    invoke-virtual {v3}, Lokhttp3/internal/e/i;->HM()Z
+    invoke-virtual {v3}, Lokhttp3/internal/e/i;->Hz()Z
 
     move-result v4
 
     if-eqz v4, :cond_0
 
-    sget-object v4, Lokhttp3/internal/e/b;->bxu:Lokhttp3/internal/e/b;
+    sget-object v4, Lokhttp3/internal/e/b;->bxO:Lokhttp3/internal/e/b;
 
     invoke-virtual {v3, v4}, Lokhttp3/internal/e/i;->e(Lokhttp3/internal/e/b;)V
 
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     iget v3, v3, Lokhttp3/internal/e/i;->id:I
 
-    invoke-virtual {v4, v3}, Lokhttp3/internal/e/g;->dJ(I)Lokhttp3/internal/e/i;
+    invoke-virtual {v4, v3}, Lokhttp3/internal/e/g;->dG(I)Lokhttp3/internal/e/i;
 
     :cond_0
     add-int/lit8 v2, v2, 0x1
@@ -914,14 +914,14 @@
 .method public final execute()V
     .locals 9
 
-    sget-object v0, Lokhttp3/internal/e/b;->bxs:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->bxM:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxs:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxM:Lokhttp3/internal/e/b;
 
     :try_start_0
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->byN:Lokhttp3/internal/e/h;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bzh:Lokhttp3/internal/e/h;
 
-    iget-boolean v3, v2, Lokhttp3/internal/e/h;->byk:Z
+    iget-boolean v3, v2, Lokhttp3/internal/e/h;->byE:Z
 
     const/4 v4, 0x1
 
@@ -949,9 +949,9 @@
     throw v2
 
     :cond_1
-    iget-object v2, v2, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v2, v2, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
-    sget-object v3, Lokhttp3/internal/e/e;->bxY:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/e;->bys:Lokio/ByteString;
 
     invoke-virtual {v3}, Lokio/ByteString;->size()I
 
@@ -979,7 +979,7 @@
 
     new-array v7, v4, [Ljava/lang/Object;
 
-    invoke-virtual {v2}, Lokio/ByteString;->IJ()Ljava/lang/String;
+    invoke-virtual {v2}, Lokio/ByteString;->Iw()Ljava/lang/String;
 
     move-result-object v8
 
@@ -992,7 +992,7 @@
     invoke-virtual {v3, v6}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
 
     :cond_2
-    sget-object v3, Lokhttp3/internal/e/e;->bxY:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/e;->bys:Lokio/ByteString;
 
     invoke-virtual {v3, v2}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -1002,7 +1002,7 @@
 
     :cond_3
     :goto_0
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->byN:Lokhttp3/internal/e/h;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bzh:Lokhttp3/internal/e/h;
 
     invoke-virtual {v2, v5, p0}, Lokhttp3/internal/e/h;->a(ZLokhttp3/internal/e/h$b;)Z
 
@@ -1010,15 +1010,15 @@
 
     if-nez v2, :cond_3
 
-    sget-object v0, Lokhttp3/internal/e/b;->bxq:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->bxK:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxv:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxP:Lokhttp3/internal/e/b;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     :goto_1
     invoke-virtual {v2, v0, v1}, Lokhttp3/internal/e/g;->a(Lokhttp3/internal/e/b;Lokhttp3/internal/e/b;)V
@@ -1026,7 +1026,7 @@
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
 
     :catch_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byN:Lokhttp3/internal/e/h;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bzh:Lokhttp3/internal/e/h;
 
     invoke-static {v0}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
@@ -1038,7 +1038,7 @@
 
     new-array v4, v4, [Ljava/lang/Object;
 
-    invoke-virtual {v2}, Lokio/ByteString;->IF()Ljava/lang/String;
+    invoke-virtual {v2}, Lokio/ByteString;->Is()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1060,14 +1060,14 @@
 
     :catch_1
     :try_start_3
-    sget-object v0, Lokhttp3/internal/e/b;->bxr:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->bxL:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxr:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxL:Lokhttp3/internal/e/b;
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     :try_start_4
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
     :try_end_4
     .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_0
 
@@ -1075,14 +1075,14 @@
 
     :goto_2
     :try_start_5
-    iget-object v3, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v3, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     invoke-virtual {v3, v0, v1}, Lokhttp3/internal/e/g;->a(Lokhttp3/internal/e/b;Lokhttp3/internal/e/b;)V
     :try_end_5
     .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_2
 
     :catch_2
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byN:Lokhttp3/internal/e/h;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bzh:Lokhttp3/internal/e/h;
 
     invoke-static {v0}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
@@ -1100,20 +1100,20 @@
 
     if-nez p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    iget-wide v1, p1, Lokhttp3/internal/e/g;->byu:J
+    iget-wide v1, p1, Lokhttp3/internal/e/g;->byO:J
 
     add-long/2addr v1, p2
 
-    iput-wide v1, p1, Lokhttp3/internal/e/g;->byu:J
+    iput-wide v1, p1, Lokhttp3/internal/e/g;->byO:J
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     invoke-virtual {p1}, Ljava/lang/Object;->notifyAll()V
 
@@ -1131,9 +1131,9 @@
     throw p1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
-    invoke-virtual {v0, p1}, Lokhttp3/internal/e/g;->dI(I)Lokhttp3/internal/e/i;
+    invoke-virtual {v0, p1}, Lokhttp3/internal/e/g;->dF(I)Lokhttp3/internal/e/i;
 
     move-result-object p1
 
@@ -1172,12 +1172,12 @@
         }
     .end annotation
 
-    iget-object v6, p0, Lokhttp3/internal/e/g$d;->byD:Lokhttp3/internal/e/g;
+    iget-object v6, p0, Lokhttp3/internal/e/g$d;->byX:Lokhttp3/internal/e/g;
 
     monitor-enter v6
 
     :try_start_0
-    iget-object v0, v6, Lokhttp3/internal/e/g;->byA:Ljava/util/Set;
+    iget-object v0, v6, Lokhttp3/internal/e/g;->byU:Ljava/util/Set;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1189,7 +1189,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p2, Lokhttp3/internal/e/b;->bxr:Lokhttp3/internal/e/b;
+    sget-object p2, Lokhttp3/internal/e/b;->bxL:Lokhttp3/internal/e/b;
 
     invoke-virtual {v6, p1, p2}, Lokhttp3/internal/e/g;->a(ILokhttp3/internal/e/b;)V
 
@@ -1198,7 +1198,7 @@
     return-void
 
     :cond_0
-    iget-object v0, v6, Lokhttp3/internal/e/g;->byA:Ljava/util/Set;
+    iget-object v0, v6, Lokhttp3/internal/e/g;->byU:Ljava/util/Set;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g.smali b/com.discord/smali_classes2/okhttp3/internal/e/g.smali
index 91239d76bd..57b6fe7756 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g.smali
@@ -20,13 +20,45 @@
 # static fields
 .field static final synthetic $assertionsDisabled:Z
 
-.field private static final byj:Ljava/util/concurrent/ExecutorService;
+.field private static final byD:Ljava/util/concurrent/ExecutorService;
 
 
 # instance fields
-.field final bwy:Ljava/net/Socket;
+.field final bwS:Ljava/net/Socket;
 
-.field final byA:Ljava/util/Set;
+.field final byE:Z
+
+.field final byF:Lokhttp3/internal/e/g$b;
+
+.field byG:I
+
+.field byH:I
+
+.field byI:Z
+
+.field private final byJ:Ljava/util/concurrent/ScheduledExecutorService;
+
+.field private final byK:Ljava/util/concurrent/ExecutorService;
+
+.field final byL:Lokhttp3/internal/e/l;
+
+.field byM:Z
+
+.field byN:J
+
+.field byO:J
+
+.field byP:Lokhttp3/internal/e/m;
+
+.field final byQ:Lokhttp3/internal/e/m;
+
+.field byR:Z
+
+.field final byS:Lokhttp3/internal/e/j;
+
+.field final byT:Lokhttp3/internal/e/g$d;
+
+.field final byU:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -36,38 +68,6 @@
     .end annotation
 .end field
 
-.field final byk:Z
-
-.field final byl:Lokhttp3/internal/e/g$b;
-
-.field bym:I
-
-.field byn:I
-
-.field byo:Z
-
-.field private final byp:Ljava/util/concurrent/ScheduledExecutorService;
-
-.field private final byq:Ljava/util/concurrent/ExecutorService;
-
-.field final byr:Lokhttp3/internal/e/l;
-
-.field bys:Z
-
-.field byt:J
-
-.field byu:J
-
-.field byv:Lokhttp3/internal/e/m;
-
-.field final byw:Lokhttp3/internal/e/m;
-
-.field byx:Z
-
-.field final byy:Lokhttp3/internal/e/j;
-
-.field final byz:Lokhttp3/internal/e/g$d;
-
 .field final hostname:Ljava/lang/String;
 
 .field final streams:Ljava/util/Map;
@@ -112,7 +112,7 @@
 
     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, Lokhttp3/internal/e/g;->byj:Ljava/util/concurrent/ExecutorService;
+    sput-object v8, Lokhttp3/internal/e/g;->byD:Ljava/util/concurrent/ExecutorService;
 
     return-void
 .end method
@@ -134,43 +134,43 @@
 
     const-wide/16 v2, 0x0
 
-    iput-wide v2, v0, Lokhttp3/internal/e/g;->byt:J
+    iput-wide v2, v0, Lokhttp3/internal/e/g;->byN:J
 
     new-instance v2, Lokhttp3/internal/e/m;
 
     invoke-direct {v2}, Lokhttp3/internal/e/m;-><init>()V
 
-    iput-object v2, v0, Lokhttp3/internal/e/g;->byv:Lokhttp3/internal/e/m;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->byP:Lokhttp3/internal/e/m;
 
     new-instance v2, Lokhttp3/internal/e/m;
 
     invoke-direct {v2}, Lokhttp3/internal/e/m;-><init>()V
 
-    iput-object v2, v0, Lokhttp3/internal/e/g;->byw:Lokhttp3/internal/e/m;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->byQ:Lokhttp3/internal/e/m;
 
     const/4 v2, 0x0
 
-    iput-boolean v2, v0, Lokhttp3/internal/e/g;->byx:Z
+    iput-boolean v2, v0, Lokhttp3/internal/e/g;->byR:Z
 
     new-instance v3, Ljava/util/LinkedHashSet;
 
     invoke-direct {v3}, Ljava/util/LinkedHashSet;-><init>()V
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->byA:Ljava/util/Set;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->byU:Ljava/util/Set;
 
-    iget-object v3, v1, Lokhttp3/internal/e/g$a;->byr:Lokhttp3/internal/e/l;
+    iget-object v3, v1, Lokhttp3/internal/e/g$a;->byL:Lokhttp3/internal/e/l;
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->byr:Lokhttp3/internal/e/l;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->byL:Lokhttp3/internal/e/l;
 
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->byk:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->byE:Z
 
-    iput-boolean v3, v0, Lokhttp3/internal/e/g;->byk:Z
+    iput-boolean v3, v0, Lokhttp3/internal/e/g;->byE:Z
 
-    iget-object v3, v1, Lokhttp3/internal/e/g$a;->byl:Lokhttp3/internal/e/g$b;
+    iget-object v3, v1, Lokhttp3/internal/e/g$a;->byF:Lokhttp3/internal/e/g$b;
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->byl:Lokhttp3/internal/e/g$b;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->byF:Lokhttp3/internal/e/g$b;
 
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->byk:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->byE:Z
 
     const/4 v4, 0x2
 
@@ -186,30 +186,30 @@
     const/4 v3, 0x2
 
     :goto_0
-    iput v3, v0, Lokhttp3/internal/e/g;->byn:I
+    iput v3, v0, Lokhttp3/internal/e/g;->byH:I
 
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->byk:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->byE:Z
 
     if-eqz v3, :cond_1
 
-    iget v3, v0, Lokhttp3/internal/e/g;->byn:I
+    iget v3, v0, Lokhttp3/internal/e/g;->byH:I
 
     add-int/2addr v3, v4
 
-    iput v3, v0, Lokhttp3/internal/e/g;->byn:I
+    iput v3, v0, Lokhttp3/internal/e/g;->byH:I
 
     :cond_1
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->byk:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->byE:Z
 
     const/4 v4, 0x7
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v0, Lokhttp3/internal/e/g;->byv:Lokhttp3/internal/e/m;
+    iget-object v3, v0, Lokhttp3/internal/e/g;->byP:Lokhttp3/internal/e/m;
 
     const/high16 v6, 0x1000000
 
-    invoke-virtual {v3, v4, v6}, Lokhttp3/internal/e/m;->ac(II)Lokhttp3/internal/e/m;
+    invoke-virtual {v3, v4, v6}, Lokhttp3/internal/e/m;->ab(II)Lokhttp3/internal/e/m;
 
     :cond_2
     iget-object v3, v1, Lokhttp3/internal/e/g$a;->hostname:Ljava/lang/String;
@@ -236,23 +236,23 @@
 
     invoke-direct {v3, v5, v6}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;-><init>(ILjava/util/concurrent/ThreadFactory;)V
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->byp:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->byJ:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget v3, v1, Lokhttp3/internal/e/g$a;->byI:I
+    iget v3, v1, Lokhttp3/internal/e/g$a;->bzc:I
 
     if-eqz v3, :cond_3
 
-    iget-object v6, v0, Lokhttp3/internal/e/g;->byp:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v6, v0, Lokhttp3/internal/e/g;->byJ:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v7, Lokhttp3/internal/e/g$c;
 
     invoke-direct {v7, v0, v2, v2, v2}, Lokhttp3/internal/e/g$c;-><init>(Lokhttp3/internal/e/g;ZII)V
 
-    iget v3, v1, Lokhttp3/internal/e/g$a;->byI:I
+    iget v3, v1, Lokhttp3/internal/e/g$a;->bzc:I
 
     int-to-long v8, v3
 
-    iget v3, v1, Lokhttp3/internal/e/g$a;->byI:I
+    iget v3, v1, Lokhttp3/internal/e/g$a;->bzc:I
 
     int-to-long v10, v3
 
@@ -295,67 +295,67 @@
 
     invoke-direct/range {v13 .. v20}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/ThreadFactory;)V
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->byq:Ljava/util/concurrent/ExecutorService;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->byK:Ljava/util/concurrent/ExecutorService;
 
-    iget-object v2, v0, Lokhttp3/internal/e/g;->byw:Lokhttp3/internal/e/m;
+    iget-object v2, v0, Lokhttp3/internal/e/g;->byQ:Lokhttp3/internal/e/m;
 
     const v3, 0xffff
 
-    invoke-virtual {v2, v4, v3}, Lokhttp3/internal/e/m;->ac(II)Lokhttp3/internal/e/m;
+    invoke-virtual {v2, v4, v3}, Lokhttp3/internal/e/m;->ab(II)Lokhttp3/internal/e/m;
 
-    iget-object v2, v0, Lokhttp3/internal/e/g;->byw:Lokhttp3/internal/e/m;
+    iget-object v2, v0, Lokhttp3/internal/e/g;->byQ:Lokhttp3/internal/e/m;
 
     const/4 v3, 0x5
 
     const/16 v4, 0x4000
 
-    invoke-virtual {v2, v3, v4}, Lokhttp3/internal/e/m;->ac(II)Lokhttp3/internal/e/m;
+    invoke-virtual {v2, v3, v4}, Lokhttp3/internal/e/m;->ab(II)Lokhttp3/internal/e/m;
 
-    iget-object v2, v0, Lokhttp3/internal/e/g;->byw:Lokhttp3/internal/e/m;
+    iget-object v2, v0, Lokhttp3/internal/e/g;->byQ:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v2}, Lokhttp3/internal/e/m;->HY()I
+    invoke-virtual {v2}, Lokhttp3/internal/e/m;->HL()I
 
     move-result v2
 
     int-to-long v2, v2
 
-    iput-wide v2, v0, Lokhttp3/internal/e/g;->byu:J
+    iput-wide v2, v0, Lokhttp3/internal/e/g;->byO:J
 
-    iget-object v2, v1, Lokhttp3/internal/e/g$a;->bwy:Ljava/net/Socket;
+    iget-object v2, v1, Lokhttp3/internal/e/g$a;->bwS:Ljava/net/Socket;
 
-    iput-object v2, v0, Lokhttp3/internal/e/g;->bwy:Ljava/net/Socket;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->bwS:Ljava/net/Socket;
 
     new-instance v2, Lokhttp3/internal/e/j;
 
-    iget-object v3, v1, Lokhttp3/internal/e/g$a;->bwA:Lokio/BufferedSink;
+    iget-object v3, v1, Lokhttp3/internal/e/g$a;->bwU:Lokio/BufferedSink;
 
-    iget-boolean v4, v0, Lokhttp3/internal/e/g;->byk:Z
+    iget-boolean v4, v0, Lokhttp3/internal/e/g;->byE:Z
 
     invoke-direct {v2, v3, v4}, Lokhttp3/internal/e/j;-><init>(Lokio/BufferedSink;Z)V
 
-    iput-object v2, v0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     new-instance v2, Lokhttp3/internal/e/g$d;
 
     new-instance v3, Lokhttp3/internal/e/h;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g$a;->nJ:Lokio/d;
+    iget-object v1, v1, Lokhttp3/internal/e/g$a;->nI:Lokio/d;
 
-    iget-boolean v4, v0, Lokhttp3/internal/e/g;->byk:Z
+    iget-boolean v4, v0, Lokhttp3/internal/e/g;->byE:Z
 
     invoke-direct {v3, v1, v4}, Lokhttp3/internal/e/h;-><init>(Lokio/d;Z)V
 
     invoke-direct {v2, v0, v3}, Lokhttp3/internal/e/g$d;-><init>(Lokhttp3/internal/e/g;Lokhttp3/internal/e/h;)V
 
-    iput-object v2, v0, Lokhttp3/internal/e/g;->byz:Lokhttp3/internal/e/g$d;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->byT:Lokhttp3/internal/e/g$d;
 
     return-void
 .end method
 
-.method static synthetic HJ()Ljava/util/concurrent/ExecutorService;
+.method static synthetic Hw()Ljava/util/concurrent/ExecutorService;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/e/g;->byj:Ljava/util/concurrent/ExecutorService;
+    sget-object v0, Lokhttp3/internal/e/g;->byD:Ljava/util/concurrent/ExecutorService;
 
     return-object v0
 .end method
@@ -368,7 +368,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     monitor-enter v0
 
@@ -378,7 +378,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-boolean v1, p0, Lokhttp3/internal/e/g;->byo:Z
+    iget-boolean v1, p0, Lokhttp3/internal/e/g;->byI:Z
 
     if-eqz v1, :cond_0
 
@@ -397,18 +397,18 @@
     const/4 v1, 0x1
 
     :try_start_3
-    iput-boolean v1, p0, Lokhttp3/internal/e/g;->byo:Z
+    iput-boolean v1, p0, Lokhttp3/internal/e/g;->byI:Z
 
-    iget v1, p0, Lokhttp3/internal/e/g;->bym:I
+    iget v1, p0, Lokhttp3/internal/e/g;->byG:I
 
     monitor-exit p0
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     :try_start_4
-    iget-object v2, p0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v2, p0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
-    sget-object v3, Lokhttp3/internal/c;->bvx:[B
+    sget-object v3, Lokhttp3/internal/c;->bvR:[B
 
     invoke-virtual {v2, v1, p1, v3}, Lokhttp3/internal/e/j;->a(ILokhttp3/internal/e/b;[B)V
 
@@ -442,7 +442,7 @@
 .method static synthetic b(Lokhttp3/internal/e/g;)V
     .locals 0
 
-    invoke-virtual {p0}, Lokhttp3/internal/e/g;->HH()V
+    invoke-virtual {p0}, Lokhttp3/internal/e/g;->Hu()V
 
     return-void
 .end method
@@ -450,7 +450,7 @@
 .method static synthetic c(Lokhttp3/internal/e/g;)Ljava/util/concurrent/ScheduledExecutorService;
     .locals 0
 
-    iget-object p0, p0, Lokhttp3/internal/e/g;->byp:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p0, p0, Lokhttp3/internal/e/g;->byJ:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-object p0
 .end method
@@ -460,12 +460,12 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/g;->bys:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/g;->byM:Z
 
     return v0
 .end method
 
-.method static dK(I)Z
+.method static dH(I)Z
     .locals 1
 
     if-eqz p0, :cond_0
@@ -486,21 +486,21 @@
 
 
 # virtual methods
-.method public final declared-synchronized HG()I
+.method public final declared-synchronized Ht()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g;->byw:Lokhttp3/internal/e/m;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->byQ:Lokhttp3/internal/e/m;
 
-    iget v1, v0, Lokhttp3/internal/e/m;->bzu:I
+    iget v1, v0, Lokhttp3/internal/e/m;->bzO:I
 
     and-int/lit8 v1, v1, 0x10
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lokhttp3/internal/e/m;->bzv:[I
+    iget-object v0, v0, Lokhttp3/internal/e/m;->bzP:[I
 
     const/4 v1, 0x4
 
@@ -527,11 +527,11 @@
     throw v0
 .end method
 
-.method final HH()V
+.method final Hu()V
     .locals 1
 
     :try_start_0
-    sget-object v0, Lokhttp3/internal/e/b;->bxr:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->bxL:Lokhttp3/internal/e/b;
 
     invoke-virtual {p0, v0, v0}, Lokhttp3/internal/e/g;->a(Lokhttp3/internal/e/b;Lokhttp3/internal/e/b;)V
     :try_end_0
@@ -541,7 +541,7 @@
     return-void
 .end method
 
-.method public final HI()V
+.method public final Hv()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -549,19 +549,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/j;->HU()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/j;->HH()V
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g;->byv:Lokhttp3/internal/e/m;
+    iget-object v1, p0, Lokhttp3/internal/e/g;->byP:Lokhttp3/internal/e/m;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/e/j;->c(Lokhttp3/internal/e/m;)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->byv:Lokhttp3/internal/e/m;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->byP:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/m;->HY()I
+    invoke-virtual {v0}, Lokhttp3/internal/e/m;->HL()I
 
     move-result v0
 
@@ -569,7 +569,7 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v2, p0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     const/4 v3, 0x0
 
@@ -582,7 +582,7 @@
     :cond_0
     new-instance v0, Ljava/lang/Thread;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g;->byz:Lokhttp3/internal/e/g$d;
+    iget-object v1, p0, Lokhttp3/internal/e/g;->byT:Lokhttp3/internal/e/g$d;
 
     invoke-direct {v0, v1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;)V
 
@@ -595,7 +595,7 @@
     .locals 8
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g;->byp:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->byJ:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v7, Lokhttp3/internal/e/g$1;
 
@@ -653,7 +653,7 @@
 
     if-nez v3, :cond_0
 
-    iget-object p4, p0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object p4, p0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     invoke-virtual {p4, p2, p1, p3, v0}, Lokhttp3/internal/e/j;->a(ZILokio/c;I)V
 
@@ -669,7 +669,7 @@
 
     :goto_1
     :try_start_0
-    iget-wide v3, p0, Lokhttp3/internal/e/g;->byu:J
+    iget-wide v3, p0, Lokhttp3/internal/e/g;->byO:J
 
     cmp-long v5, v3, v1
 
@@ -705,7 +705,7 @@
 
     :cond_2
     :try_start_1
-    iget-wide v3, p0, Lokhttp3/internal/e/g;->byu:J
+    iget-wide v3, p0, Lokhttp3/internal/e/g;->byO:J
 
     invoke-static {p4, p5, v3, v4}, Ljava/lang/Math;->min(JJ)J
 
@@ -713,21 +713,21 @@
 
     long-to-int v4, v3
 
-    iget-object v3, p0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v3, p0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
-    iget v3, v3, Lokhttp3/internal/e/j;->bzk:I
+    iget v3, v3, Lokhttp3/internal/e/j;->bzE:I
 
     invoke-static {v4, v3}, Ljava/lang/Math;->min(II)I
 
     move-result v3
 
-    iget-wide v4, p0, Lokhttp3/internal/e/g;->byu:J
+    iget-wide v4, p0, Lokhttp3/internal/e/g;->byO:J
 
     int-to-long v6, v3
 
     sub-long/2addr v4, v6
 
-    iput-wide v4, p0, Lokhttp3/internal/e/g;->byu:J
+    iput-wide v4, p0, Lokhttp3/internal/e/g;->byO:J
 
     monitor-exit p0
     :try_end_1
@@ -735,7 +735,7 @@
 
     sub-long/2addr p4, v6
 
-    iget-object v4, p0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v4, p0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     if-eqz p2, :cond_3
 
@@ -797,7 +797,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->byq:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->byK:Ljava/util/concurrent/ExecutorService;
 
     invoke-interface {v0, p1}, Ljava/util/concurrent/ExecutorService;->execute(Ljava/lang/Runnable;)V
     :try_end_0
@@ -912,7 +912,7 @@
 
     :cond_2
     :try_start_3
-    iget-object p2, p0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     invoke-virtual {p2}, Lokhttp3/internal/e/j;->close()V
     :try_end_3
@@ -930,7 +930,7 @@
     :cond_3
     :goto_3
     :try_start_4
-    iget-object p2, p0, Lokhttp3/internal/e/g;->bwy:Ljava/net/Socket;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->bwS:Ljava/net/Socket;
 
     invoke-virtual {p2}, Ljava/net/Socket;->close()V
     :try_end_4
@@ -942,11 +942,11 @@
     move-exception p1
 
     :goto_4
-    iget-object p2, p0, Lokhttp3/internal/e/g;->byp:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->byJ:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {p2}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
 
-    iget-object p2, p0, Lokhttp3/internal/e/g;->byq:Ljava/util/concurrent/ExecutorService;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->byK:Ljava/util/concurrent/ExecutorService;
 
     invoke-interface {p2}, Ljava/util/concurrent/ExecutorService;->shutdown()V
 
@@ -980,17 +980,17 @@
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lokhttp3/internal/e/g;->byt:J
+    iget-wide v0, p0, Lokhttp3/internal/e/g;->byN:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/g;->byt:J
+    iput-wide v0, p0, Lokhttp3/internal/e/g;->byN:J
 
-    iget-wide p1, p0, Lokhttp3/internal/e/g;->byt:J
+    iget-wide p1, p0, Lokhttp3/internal/e/g;->byN:J
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->byv:Lokhttp3/internal/e/m;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->byP:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/m;->HY()I
+    invoke-virtual {v0}, Lokhttp3/internal/e/m;->HL()I
 
     move-result v0
 
@@ -1004,13 +1004,13 @@
 
     const/4 p1, 0x0
 
-    iget-wide v0, p0, Lokhttp3/internal/e/g;->byt:J
+    iget-wide v0, p0, Lokhttp3/internal/e/g;->byN:J
 
     invoke-virtual {p0, p1, v0, v1}, Lokhttp3/internal/e/g;->l(IJ)V
 
     const-wide/16 p1, 0x0
 
-    iput-wide p1, p0, Lokhttp3/internal/e/g;->byt:J
+    iput-wide p1, p0, Lokhttp3/internal/e/g;->byN:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1035,7 +1035,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/internal/e/j;->c(ILokhttp3/internal/e/b;)V
 
@@ -1062,7 +1062,7 @@
 
     xor-int/lit8 v6, p2, 0x1
 
-    iget-object v7, p0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v7, p0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     monitor-enter v7
 
@@ -1072,28 +1072,28 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget v0, p0, Lokhttp3/internal/e/g;->byn:I
+    iget v0, p0, Lokhttp3/internal/e/g;->byH:I
 
     const v1, 0x3fffffff    # 1.9999999f
 
     if-le v0, v1, :cond_0
 
-    sget-object v0, Lokhttp3/internal/e/b;->bxu:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->bxO:Lokhttp3/internal/e/b;
 
     invoke-direct {p0, v0}, Lokhttp3/internal/e/g;->a(Lokhttp3/internal/e/b;)V
 
     :cond_0
-    iget-boolean v0, p0, Lokhttp3/internal/e/g;->byo:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/g;->byI:Z
 
     if-nez v0, :cond_5
 
-    iget v8, p0, Lokhttp3/internal/e/g;->byn:I
+    iget v8, p0, Lokhttp3/internal/e/g;->byH:I
 
-    iget v0, p0, Lokhttp3/internal/e/g;->byn:I
+    iget v0, p0, Lokhttp3/internal/e/g;->byH:I
 
     add-int/lit8 v0, v0, 0x2
 
-    iput v0, p0, Lokhttp3/internal/e/g;->byn:I
+    iput v0, p0, Lokhttp3/internal/e/g;->byH:I
 
     new-instance v9, Lokhttp3/internal/e/i;
 
@@ -1113,7 +1113,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-wide v0, p0, Lokhttp3/internal/e/g;->byu:J
+    iget-wide v0, p0, Lokhttp3/internal/e/g;->byO:J
 
     const-wide/16 v2, 0x0
 
@@ -1121,7 +1121,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-wide v0, v9, Lokhttp3/internal/e/i;->byu:J
+    iget-wide v0, v9, Lokhttp3/internal/e/i;->byO:J
 
     cmp-long p2, v0, v2
 
@@ -1159,7 +1159,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    iget-object v0, p0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     invoke-virtual {v0, v6, v8, p1}, Lokhttp3/internal/e/j;->b(ZILjava/util/List;)V
 
@@ -1169,7 +1169,7 @@
 
     if-eqz p2, :cond_4
 
-    iget-object p1, p0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object p1, p0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     invoke-virtual {p1}, Lokhttp3/internal/e/j;->flush()V
 
@@ -1212,16 +1212,16 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/e/b;->bxq:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->bxK:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxv:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxP:Lokhttp3/internal/e/b;
 
     invoke-virtual {p0, v0, v1}, Lokhttp3/internal/e/g;->a(Lokhttp3/internal/e/b;Lokhttp3/internal/e/b;)V
 
     return-void
 .end method
 
-.method final declared-synchronized dI(I)Lokhttp3/internal/e/i;
+.method final declared-synchronized dF(I)Lokhttp3/internal/e/i;
     .locals 1
 
     monitor-enter p0
@@ -1253,7 +1253,7 @@
     throw p1
 .end method
 
-.method final declared-synchronized dJ(I)Lokhttp3/internal/e/i;
+.method final declared-synchronized dG(I)Lokhttp3/internal/e/i;
     .locals 1
 
     monitor-enter p0
@@ -1293,7 +1293,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/e/g;->byo:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/g;->byI:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1313,7 +1313,7 @@
     .locals 9
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g;->byp:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->byJ:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v8, Lokhttp3/internal/e/g$2;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/h$a.smali b/com.discord/smali_classes2/okhttp3/internal/e/h$a.smali
index 0d00af5eb9..2cb75f5b0e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/h$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/h$a.smali
@@ -18,17 +18,17 @@
 
 
 # instance fields
-.field byT:B
+.field bzn:B
 
-.field byU:I
+.field bzo:I
 
-.field byV:S
+.field bzp:S
 
 .field left:I
 
 .field length:I
 
-.field private final nJ:Lokio/d;
+.field private final nI:Lokio/d;
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/h$a;->nJ:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/e/h$a;->nI:Lokio/d;
 
     return-void
 .end method
@@ -59,9 +59,9 @@
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lokhttp3/internal/e/h$a;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h$a;->nI:Lokio/d;
 
-    iget-short v3, p0, Lokhttp3/internal/e/h$a;->byV:S
+    iget-short v3, p0, Lokhttp3/internal/e/h$a;->bzp:S
 
     int-to-long v3, v3
 
@@ -69,9 +69,9 @@
 
     const/4 v0, 0x0
 
-    iput-short v0, p0, Lokhttp3/internal/e/h$a;->byV:S
+    iput-short v0, p0, Lokhttp3/internal/e/h$a;->bzp:S
 
-    iget-byte v3, p0, Lokhttp3/internal/e/h$a;->byT:B
+    iget-byte v3, p0, Lokhttp3/internal/e/h$a;->bzn:B
 
     and-int/lit8 v3, v3, 0x4
 
@@ -80,9 +80,9 @@
     return-wide v1
 
     :cond_0
-    iget v1, p0, Lokhttp3/internal/e/h$a;->byU:I
+    iget v1, p0, Lokhttp3/internal/e/h$a;->bzo:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/h$a;->nJ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/e/h$a;->nI:Lokio/d;
 
     invoke-static {v2}, Lokhttp3/internal/e/h;->b(Lokio/d;)I
 
@@ -92,7 +92,7 @@
 
     iput v2, p0, Lokhttp3/internal/e/h$a;->length:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/h$a;->nJ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/e/h$a;->nI:Lokio/d;
 
     invoke-interface {v2}, Lokio/d;->readByte()B
 
@@ -102,7 +102,7 @@
 
     int-to-byte v2, v2
 
-    iget-object v3, p0, Lokhttp3/internal/e/h$a;->nJ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h$a;->nI:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readByte()B
 
@@ -112,7 +112,7 @@
 
     int-to-byte v3, v3
 
-    iput-byte v3, p0, Lokhttp3/internal/e/h$a;->byT:B
+    iput-byte v3, p0, Lokhttp3/internal/e/h$a;->bzn:B
 
     sget-object v3, Lokhttp3/internal/e/h;->logger:Ljava/util/logging/Logger;
 
@@ -128,11 +128,11 @@
 
     sget-object v3, Lokhttp3/internal/e/h;->logger:Ljava/util/logging/Logger;
 
-    iget v5, p0, Lokhttp3/internal/e/h$a;->byU:I
+    iget v5, p0, Lokhttp3/internal/e/h$a;->bzo:I
 
     iget v6, p0, Lokhttp3/internal/e/h$a;->length:I
 
-    iget-byte v7, p0, Lokhttp3/internal/e/h$a;->byT:B
+    iget-byte v7, p0, Lokhttp3/internal/e/h$a;->bzn:B
 
     invoke-static {v4, v5, v6, v2, v7}, Lokhttp3/internal/e/e;->a(ZIIBB)Ljava/lang/String;
 
@@ -141,7 +141,7 @@
     invoke-virtual {v3, v5}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
 
     :cond_1
-    iget-object v3, p0, Lokhttp3/internal/e/h$a;->nJ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h$a;->nI:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readInt()I
 
@@ -151,13 +151,13 @@
 
     and-int/2addr v3, v5
 
-    iput v3, p0, Lokhttp3/internal/e/h$a;->byU:I
+    iput v3, p0, Lokhttp3/internal/e/h$a;->bzo:I
 
     const/16 v3, 0x9
 
     if-ne v2, v3, :cond_3
 
-    iget v2, p0, Lokhttp3/internal/e/h$a;->byU:I
+    iget v2, p0, Lokhttp3/internal/e/h$a;->bzo:I
 
     if-ne v2, v1, :cond_2
 
@@ -192,7 +192,7 @@
     throw p1
 
     :cond_4
-    iget-object v3, p0, Lokhttp3/internal/e/h$a;->nJ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h$a;->nI:Lokio/d;
 
     int-to-long v4, v0
 
@@ -238,7 +238,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/e/h$a;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h$a;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/s;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/h$b.smali b/com.discord/smali_classes2/okhttp3/internal/e/h$b.smali
index a927af4765..74c71cc342 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/h$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/h$b.smali
@@ -43,7 +43,7 @@
 .method public abstract c(ILokhttp3/internal/e/b;)V
 .end method
 
-.method public abstract dL(I)V
+.method public abstract dI(I)V
 .end method
 
 .method public abstract m(IJ)V
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/h.smali b/com.discord/smali_classes2/okhttp3/internal/e/h.smali
index 427bb43678..33950fccb6 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/h.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/h.smali
@@ -20,13 +20,13 @@
 
 
 # instance fields
-.field private final byR:Lokhttp3/internal/e/h$a;
+.field final byE:Z
 
-.field final byS:Lokhttp3/internal/e/d$a;
+.field private final bzl:Lokhttp3/internal/e/h$a;
 
-.field final byk:Z
+.field final bzm:Lokhttp3/internal/e/d$a;
 
-.field final nJ:Lokio/d;
+.field final nI:Lokio/d;
 
 
 # direct methods
@@ -53,30 +53,30 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
-    iput-boolean p2, p0, Lokhttp3/internal/e/h;->byk:Z
+    iput-boolean p2, p0, Lokhttp3/internal/e/h;->byE:Z
 
     new-instance p1, Lokhttp3/internal/e/h$a;
 
-    iget-object p2, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object p2, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-direct {p1, p2}, Lokhttp3/internal/e/h$a;-><init>(Lokio/d;)V
 
-    iput-object p1, p0, Lokhttp3/internal/e/h;->byR:Lokhttp3/internal/e/h$a;
+    iput-object p1, p0, Lokhttp3/internal/e/h;->bzl:Lokhttp3/internal/e/h$a;
 
     new-instance p1, Lokhttp3/internal/e/d$a;
 
-    iget-object p2, p0, Lokhttp3/internal/e/h;->byR:Lokhttp3/internal/e/h$a;
+    iget-object p2, p0, Lokhttp3/internal/e/h;->bzl:Lokhttp3/internal/e/h$a;
 
     invoke-direct {p1, p2}, Lokhttp3/internal/e/d$a;-><init>(Lokio/r;)V
 
-    iput-object p1, p0, Lokhttp3/internal/e/h;->byS:Lokhttp3/internal/e/d$a;
+    iput-object p1, p0, Lokhttp3/internal/e/h;->bzm:Lokhttp3/internal/e/d$a;
 
     return-void
 .end method
 
-.method private HL()V
+.method private Hy()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -84,11 +84,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readInt()I
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -165,25 +165,25 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->byR:Lokhttp3/internal/e/h$a;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->bzl:Lokhttp3/internal/e/h$a;
 
     iput p1, v0, Lokhttp3/internal/e/h$a;->left:I
 
     iput p1, v0, Lokhttp3/internal/e/h$a;->length:I
 
-    iput-short p2, v0, Lokhttp3/internal/e/h$a;->byV:S
+    iput-short p2, v0, Lokhttp3/internal/e/h$a;->bzp:S
 
-    iput-byte p3, v0, Lokhttp3/internal/e/h$a;->byT:B
+    iput-byte p3, v0, Lokhttp3/internal/e/h$a;->bzn:B
 
-    iput p4, v0, Lokhttp3/internal/e/h$a;->byU:I
+    iput p4, v0, Lokhttp3/internal/e/h$a;->bzo:I
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->byS:Lokhttp3/internal/e/d$a;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->bzm:Lokhttp3/internal/e/d$a;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->HC()V
+    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Hp()V
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->byS:Lokhttp3/internal/e/d$a;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->bzm:Lokhttp3/internal/e/d$a;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->HD()Ljava/util/List;
+    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Hq()Ljava/util/List;
 
     move-result-object p1
 
@@ -240,7 +240,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     const-wide/16 v2, 0x9
 
@@ -248,7 +248,7 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object v1, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-static {v1}, Lokhttp3/internal/e/h;->b(Lokio/d;)I
 
@@ -262,7 +262,7 @@
 
     if-gt v1, v3, :cond_29
 
-    iget-object v4, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v4, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v4}, Lokio/d;->readByte()B
 
@@ -299,7 +299,7 @@
 
     :cond_1
     :goto_0
-    iget-object p1, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {p1}, Lokio/d;->readByte()B
 
@@ -309,7 +309,7 @@
 
     int-to-byte p1, p1
 
-    iget-object v6, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v6, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v6}, Lokio/d;->readInt()I
 
@@ -344,7 +344,7 @@
 
     packed-switch v4, :pswitch_data_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     int-to-long v0, v1
 
@@ -355,7 +355,7 @@
     :pswitch_0
     if-ne v1, v5, :cond_4
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {p1}, Lokio/d;->readInt()I
 
@@ -416,13 +416,13 @@
 
     if-nez v6, :cond_7
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {p1}, Lokio/d;->readInt()I
 
     move-result p1
 
-    iget-object v3, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readInt()I
 
@@ -430,24 +430,24 @@
 
     sub-int/2addr v1, v9
 
-    invoke-static {v3}, Lokhttp3/internal/e/b;->dC(I)Lokhttp3/internal/e/b;
+    invoke-static {v3}, Lokhttp3/internal/e/b;->dz(I)Lokhttp3/internal/e/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_6
 
-    sget-object v0, Lokio/ByteString;->bBs:Lokio/ByteString;
+    sget-object v0, Lokio/ByteString;->bBM:Lokio/ByteString;
 
     if-lez v1, :cond_5
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     int-to-long v3, v1
 
     invoke-interface {v0, v3, v4}, Lokio/d;->aI(J)Lokio/ByteString;
 
     :cond_5
-    invoke-interface {p2, p1}, Lokhttp3/internal/e/h$b;->dL(I)V
+    invoke-interface {p2, p1}, Lokhttp3/internal/e/h$b;->dI(I)V
 
     goto/16 :goto_6
 
@@ -501,13 +501,13 @@
 
     if-nez v6, :cond_a
 
-    iget-object v1, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v1}, Lokio/d;->readInt()I
 
     move-result v1
 
-    iget-object v3, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readInt()I
 
@@ -559,7 +559,7 @@
 
     if-eqz v3, :cond_c
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -570,7 +570,7 @@
     int-to-short v0, v0
 
     :cond_c
-    iget-object v3, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readInt()I
 
@@ -639,7 +639,7 @@
     :goto_1
     if-ge v4, v1, :cond_18
 
-    iget-object v6, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v6, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v6}, Lokio/d;->readShort()S
 
@@ -649,7 +649,7 @@
 
     and-int/2addr v6, v7
 
-    iget-object v7, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v7, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v7}, Lokio/d;->readInt()I
 
@@ -740,7 +740,7 @@
 
     :cond_17
     :goto_2
-    invoke-virtual {p1, v6, v7}, Lokhttp3/internal/e/m;->ac(II)Lokhttp3/internal/e/m;
+    invoke-virtual {p1, v6, v7}, Lokhttp3/internal/e/m;->ab(II)Lokhttp3/internal/e/m;
 
     add-int/lit8 v4, v4, 0x6
 
@@ -784,13 +784,13 @@
 
     if-eqz v6, :cond_1c
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {p1}, Lokio/d;->readInt()I
 
     move-result p1
 
-    invoke-static {p1}, Lokhttp3/internal/e/b;->dC(I)Lokhttp3/internal/e/b;
+    invoke-static {p1}, Lokhttp3/internal/e/b;->dz(I)Lokhttp3/internal/e/b;
 
     move-result-object v1
 
@@ -850,7 +850,7 @@
 
     if-eqz v6, :cond_1e
 
-    invoke-direct {p0}, Lokhttp3/internal/e/h;->HL()V
+    invoke-direct {p0}, Lokhttp3/internal/e/h;->Hy()V
 
     goto/16 :goto_6
 
@@ -901,7 +901,7 @@
 
     if-eqz v4, :cond_21
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -916,7 +916,7 @@
 
     if-eqz v4, :cond_22
 
-    invoke-direct {p0}, Lokhttp3/internal/e/h;->HL()V
+    invoke-direct {p0}, Lokhttp3/internal/e/h;->Hy()V
 
     add-int/lit8 v1, v1, -0x5
 
@@ -977,7 +977,7 @@
 
     if-eqz v4, :cond_26
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -992,11 +992,11 @@
 
     move-result p1
 
-    iget-object v1, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {p2, v3, v6, v1, p1}, Lokhttp3/internal/e/h$b;->a(ZILokio/d;I)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     int-to-long v0, v0
 
@@ -1071,7 +1071,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->close()V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/i$a.smali b/com.discord/smali_classes2/okhttp3/internal/e/i$a.smali
index 13bdbce03a..b5dfdd36fe 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/i$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/i$a.smali
@@ -22,11 +22,11 @@
 
 
 # instance fields
-.field private final bzd:Lokio/c;
+.field private final bzx:Lokio/c;
 
-.field bze:Z
+.field bzy:Z
 
-.field final synthetic bzf:Lokhttp3/internal/e/i;
+.field final synthetic bzz:Lokhttp3/internal/e/i;
 
 .field closed:Z
 
@@ -43,7 +43,7 @@
 .method constructor <init>(Lokhttp3/internal/e/i;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,12 +51,12 @@
 
     invoke-direct {p1}, Lokio/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$a;->bzd:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/i$a;->bzx:Lokio/c;
 
     return-void
 .end method
 
-.method private ae(Z)V
+.method private ab(Z)V
     .locals 11
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -64,14 +64,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v1, v1, Lokhttp3/internal/e/i;->bzc:Lokhttp3/internal/e/i$c;
+    iget-object v1, v1, Lokhttp3/internal/e/i;->bzw:Lokhttp3/internal/e/i$c;
 
     invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->enter()V
     :try_end_0
@@ -79,9 +79,9 @@
 
     :goto_0
     :try_start_1
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-wide v1, v1, Lokhttp3/internal/e/i;->byu:J
+    iget-wide v1, v1, Lokhttp3/internal/e/i;->byO:J
 
     const-wide/16 v3, 0x0
 
@@ -89,7 +89,7 @@
 
     if-gtz v5, :cond_0
 
-    iget-boolean v1, p0, Lokhttp3/internal/e/i$a;->bze:Z
+    iget-boolean v1, p0, Lokhttp3/internal/e/i$a;->bzy:Z
 
     if-nez v1, :cond_0
 
@@ -97,15 +97,15 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
     iget-object v1, v1, Lokhttp3/internal/e/i;->errorCode:Lokhttp3/internal/e/b;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i;->HS()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i;->HF()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
@@ -113,21 +113,21 @@
 
     :cond_0
     :try_start_2
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v1, v1, Lokhttp3/internal/e/i;->bzc:Lokhttp3/internal/e/i$c;
+    iget-object v1, v1, Lokhttp3/internal/e/i;->bzw:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->HT()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->HG()V
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i;->HR()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i;->HE()V
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-wide v1, v1, Lokhttp3/internal/e/i;->byu:J
+    iget-wide v1, v1, Lokhttp3/internal/e/i;->byO:J
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$a;->bzd:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/e/i$a;->bzx:Lokio/c;
 
     iget-wide v3, v3, Lokio/c;->size:J
 
@@ -135,36 +135,36 @@
 
     move-result-wide v9
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-wide v2, v1, Lokhttp3/internal/e/i;->byu:J
+    iget-wide v2, v1, Lokhttp3/internal/e/i;->byO:J
 
     sub-long/2addr v2, v9
 
-    iput-wide v2, v1, Lokhttp3/internal/e/i;->byu:J
+    iput-wide v2, v1, Lokhttp3/internal/e/i;->byO:J
 
     monitor-exit v0
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bzc:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bzw:Lokhttp3/internal/e/i$c;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->enter()V
 
     :try_start_3
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v5, v0, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iget-object v5, v0, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
     iget v6, v0, Lokhttp3/internal/e/i;->id:I
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lokhttp3/internal/e/i$a;->bzd:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/e/i$a;->bzx:Lokio/c;
 
     iget-wide v0, p1, Lokio/c;->size:J
 
@@ -184,28 +184,28 @@
     const/4 v7, 0x0
 
     :goto_1
-    iget-object v8, p0, Lokhttp3/internal/e/i$a;->bzd:Lokio/c;
+    iget-object v8, p0, Lokhttp3/internal/e/i$a;->bzx:Lokio/c;
 
     invoke-virtual/range {v5 .. v10}, Lokhttp3/internal/e/g;->a(IZLokio/c;J)V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object p1, p1, Lokhttp3/internal/e/i;->bzc:Lokhttp3/internal/e/i$c;
+    iget-object p1, p1, Lokhttp3/internal/e/i;->bzw:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/i$c;->HT()V
+    invoke-virtual {p1}, Lokhttp3/internal/e/i$c;->HG()V
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bzc:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bzw:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->HT()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->HG()V
 
     throw p1
 
@@ -213,11 +213,11 @@
     move-exception p1
 
     :try_start_4
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v1, v1, Lokhttp3/internal/e/i;->bzc:Lokhttp3/internal/e/i$c;
+    iget-object v1, v1, Lokhttp3/internal/e/i;->bzw:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->HT()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->HG()V
 
     throw p1
 
@@ -247,7 +247,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
     monitor-enter v0
 
@@ -265,17 +265,17 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bza:Lokhttp3/internal/e/i$a;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bzu:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bze:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bzy:Z
 
     const/4 v1, 0x1
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzd:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzx:Lokio/c;
 
     iget-wide v2, v0, Lokio/c;->size:J
 
@@ -286,7 +286,7 @@
     if-lez v0, :cond_1
 
     :goto_0
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzd:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzx:Lokio/c;
 
     iget-wide v2, v0, Lokio/c;->size:J
 
@@ -294,16 +294,16 @@
 
     if-lez v0, :cond_2
 
-    invoke-direct {p0, v1}, Lokhttp3/internal/e/i$a;->ae(Z)V
+    invoke-direct {p0, v1}, Lokhttp3/internal/e/i$a;->ab(Z)V
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v2, v0, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iget-object v2, v0, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
     iget v3, v0, Lokhttp3/internal/e/i;->id:I
 
@@ -316,7 +316,7 @@
     invoke-virtual/range {v2 .. v7}, Lokhttp3/internal/e/g;->a(IZLokio/c;J)V
 
     :cond_2
-    iget-object v2, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v2, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
     monitor-enter v2
 
@@ -327,17 +327,17 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/j;->flush()V
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->HQ()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->HD()V
 
     return-void
 
@@ -376,21 +376,21 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i;->HR()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i;->HE()V
 
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :goto_0
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzd:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzx:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -402,13 +402,13 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lokhttp3/internal/e/i$a;->ae(Z)V
+    invoke-direct {p0, v0}, Lokhttp3/internal/e/i$a;->ab(Z)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->byy:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->byS:Lokhttp3/internal/e/j;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/j;->flush()V
 
@@ -437,9 +437,9 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bzc:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bzw:Lokhttp3/internal/e/i$c;
 
     return-object v0
 .end method
@@ -452,12 +452,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzd:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bzx:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
     :goto_0
-    iget-object p1, p0, Lokhttp3/internal/e/i$a;->bzd:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/e/i$a;->bzx:Lokio/c;
 
     iget-wide p1, p1, Lokio/c;->size:J
 
@@ -469,7 +469,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lokhttp3/internal/e/i$a;->ae(Z)V
+    invoke-direct {p0, p1}, Lokhttp3/internal/e/i$a;->ab(Z)V
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/i$b.smali b/com.discord/smali_classes2/okhttp3/internal/e/i$b.smali
index 05da90a88f..5508ca4c89 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/i$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/i$b.smali
@@ -22,15 +22,15 @@
 
 
 # instance fields
-.field bze:Z
+.field private final bzA:Lokio/c;
 
-.field final synthetic bzf:Lokhttp3/internal/e/i;
+.field private final bzB:Lokio/c;
 
-.field private final bzg:Lokio/c;
+.field private final bzC:J
 
-.field private final bzh:Lokio/c;
+.field bzy:Z
 
-.field private final bzi:J
+.field final synthetic bzz:Lokhttp3/internal/e/i;
 
 .field closed:Z
 
@@ -47,7 +47,7 @@
 .method constructor <init>(Lokhttp3/internal/e/i;J)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,15 +55,15 @@
 
     invoke-direct {p1}, Lokio/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bzg:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bzA:Lokio/c;
 
     new-instance p1, Lokio/c;
 
     invoke-direct {p1}, Lokio/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bzh:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bzB:Lokio/c;
 
-    iput-wide p2, p0, Lokhttp3/internal/e/i$b;->bzi:J
+    iput-wide p2, p0, Lokhttp3/internal/e/i$b;->bzC:J
 
     return-void
 .end method
@@ -71,9 +71,9 @@
 .method private aE(J)V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/internal/e/g;->aE(J)V
 
@@ -102,27 +102,27 @@
 
     :cond_0
     :goto_0
-    iget-object v6, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v6, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     monitor-enter v6
 
     :try_start_0
-    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bzb:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bzv:Lokhttp3/internal/e/i$c;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->enter()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     iget-object v0, v0, Lokhttp3/internal/e/i;->errorCode:Lokhttp3/internal/e/b;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     iget-object v0, v0, Lokhttp3/internal/e/i;->errorCode:Lokhttp3/internal/e/b;
 
@@ -136,7 +136,7 @@
 
     if-nez v8, :cond_9
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     invoke-static {v8}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/i;)Ljava/util/Deque;
 
@@ -150,7 +150,7 @@
 
     if-nez v8, :cond_2
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     invoke-static {v8}, Lokhttp3/internal/e/i;->c(Lokhttp3/internal/e/i;)Lokhttp3/internal/e/c$a;
 
@@ -158,7 +158,7 @@
 
     if-eqz v8, :cond_2
 
-    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     invoke-static {v7}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/i;)Ljava/util/Deque;
 
@@ -170,7 +170,7 @@
 
     check-cast v7, Lokhttp3/Headers;
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     invoke-static {v8}, Lokhttp3/internal/e/i;->c(Lokhttp3/internal/e/i;)Lokhttp3/internal/e/c$a;
 
@@ -185,7 +185,7 @@
     goto :goto_3
 
     :cond_2
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzh:Lokio/c;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzB:Lokio/c;
 
     iget-wide v11, v8, Lokio/c;->size:J
 
@@ -193,9 +193,9 @@
 
     if-lez v8, :cond_3
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzh:Lokio/c;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzB:Lokio/c;
 
-    iget-object v11, v1, Lokhttp3/internal/e/i$b;->bzh:Lokio/c;
+    iget-object v11, v1, Lokhttp3/internal/e/i$b;->bzB:Lokio/c;
 
     iget-wide v11, v11, Lokio/c;->size:J
 
@@ -209,27 +209,27 @@
 
     move-result-wide v11
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    iget-wide v14, v8, Lokhttp3/internal/e/i;->byt:J
+    iget-wide v14, v8, Lokhttp3/internal/e/i;->byN:J
 
     add-long/2addr v14, v11
 
-    iput-wide v14, v8, Lokhttp3/internal/e/i;->byt:J
+    iput-wide v14, v8, Lokhttp3/internal/e/i;->byN:J
 
     if-nez v0, :cond_5
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    iget-wide v14, v8, Lokhttp3/internal/e/i;->byt:J
+    iget-wide v14, v8, Lokhttp3/internal/e/i;->byN:J
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v8, v8, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iget-object v8, v8, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
-    iget-object v8, v8, Lokhttp3/internal/e/g;->byv:Lokhttp3/internal/e/m;
+    iget-object v8, v8, Lokhttp3/internal/e/g;->byP:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v8}, Lokhttp3/internal/e/m;->HY()I
+    invoke-virtual {v8}, Lokhttp3/internal/e/m;->HL()I
 
     move-result v8
 
@@ -241,47 +241,47 @@
 
     if-ltz v17, :cond_5
 
-    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v7, v7, Lokhttp3/internal/e/i;->byf:Lokhttp3/internal/e/g;
+    iget-object v7, v7, Lokhttp3/internal/e/i;->byz:Lokhttp3/internal/e/g;
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     iget v8, v8, Lokhttp3/internal/e/i;->id:I
 
-    iget-object v14, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v14, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    iget-wide v14, v14, Lokhttp3/internal/e/i;->byt:J
+    iget-wide v14, v14, Lokhttp3/internal/e/i;->byN:J
 
     invoke-virtual {v7, v8, v14, v15}, Lokhttp3/internal/e/g;->l(IJ)V
 
-    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    iput-wide v4, v7, Lokhttp3/internal/e/i;->byt:J
+    iput-wide v4, v7, Lokhttp3/internal/e/i;->byN:J
 
     goto :goto_2
 
     :cond_3
     move-object/from16 v13, p1
 
-    iget-boolean v7, v1, Lokhttp3/internal/e/i$b;->bze:Z
+    iget-boolean v7, v1, Lokhttp3/internal/e/i$b;->bzy:Z
 
     if-nez v7, :cond_4
 
     if-nez v0, :cond_4
 
-    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->HS()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->HF()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bzb:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bzv:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->HT()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->HG()V
 
     monitor-exit v6
 
@@ -297,11 +297,11 @@
     const/16 v16, 0x0
 
     :goto_3
-    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v7, v7, Lokhttp3/internal/e/i;->bzb:Lokhttp3/internal/e/i$c;
+    iget-object v7, v7, Lokhttp3/internal/e/i;->bzv:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v7}, Lokhttp3/internal/e/i$c;->HT()V
+    invoke-virtual {v7}, Lokhttp3/internal/e/i$c;->HG()V
 
     monitor-exit v6
     :try_end_2
@@ -348,11 +348,11 @@
     move-exception v0
 
     :try_start_4
-    iget-object v2, v1, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v2, v1, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v2, v2, Lokhttp3/internal/e/i;->bzb:Lokhttp3/internal/e/i$c;
+    iget-object v2, v2, Lokhttp3/internal/e/i;->bzv:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v2}, Lokhttp3/internal/e/i$c;->HT()V
+    invoke-virtual {v2}, Lokhttp3/internal/e/i$c;->HG()V
 
     throw v0
 
@@ -404,20 +404,20 @@
 
     if-lez v2, :cond_6
 
-    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     monitor-enter v2
 
     :try_start_0
-    iget-boolean v3, p0, Lokhttp3/internal/e/i$b;->bze:Z
+    iget-boolean v3, p0, Lokhttp3/internal/e/i$b;->bzy:Z
 
-    iget-object v4, p0, Lokhttp3/internal/e/i$b;->bzh:Lokio/c;
+    iget-object v4, p0, Lokhttp3/internal/e/i$b;->bzB:Lokio/c;
 
     iget-wide v4, v4, Lokio/c;->size:J
 
     add-long/2addr v4, p2
 
-    iget-wide v6, p0, Lokhttp3/internal/e/i$b;->bzi:J
+    iget-wide v6, p0, Lokhttp3/internal/e/i$b;->bzC:J
 
     const/4 v8, 0x1
 
@@ -443,9 +443,9 @@
 
     invoke-interface {p1, p2, p3}, Lokio/d;->aN(J)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    sget-object p2, Lokhttp3/internal/e/b;->bxt:Lokhttp3/internal/e/b;
+    sget-object p2, Lokhttp3/internal/e/b;->bxN:Lokhttp3/internal/e/b;
 
     invoke-virtual {p1, p2}, Lokhttp3/internal/e/i;->c(Lokhttp3/internal/e/b;)V
 
@@ -459,7 +459,7 @@
     return-void
 
     :cond_2
-    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bzg:Lokio/c;
+    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bzA:Lokio/c;
 
     invoke-interface {p1, v2, p2, p3}, Lokio/d;->a(Lokio/c;J)J
 
@@ -473,12 +473,12 @@
 
     sub-long/2addr p2, v2
 
-    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     monitor-enter v2
 
     :try_start_1
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzh:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzB:Lokio/c;
 
     iget-wide v3, v3, Lokio/c;->size:J
 
@@ -492,15 +492,15 @@
     const/4 v8, 0x0
 
     :goto_2
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bzh:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bzB:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$b;->bzg:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/i$b;->bzA:Lokio/c;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/r;)J
 
     if-eqz v8, :cond_4
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     invoke-virtual {v0}, Ljava/lang/Object;->notifyAll()V
 
@@ -547,7 +547,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     monitor-enter v0
 
@@ -556,15 +556,15 @@
     :try_start_0
     iput-boolean v1, p0, Lokhttp3/internal/e/i$b;->closed:Z
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$b;->bzh:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/i$b;->bzB:Lokio/c;
 
     iget-wide v1, v1, Lokio/c;->size:J
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzh:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzB:Lokio/c;
 
     invoke-virtual {v3}, Lokio/c;->clear()V
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     invoke-static {v3}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/i;)Ljava/util/Deque;
 
@@ -578,7 +578,7 @@
 
     if-nez v3, :cond_0
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     invoke-static {v3}, Lokhttp3/internal/e/i;->c(Lokhttp3/internal/e/i;)Lokhttp3/internal/e/c$a;
 
@@ -588,7 +588,7 @@
 
     new-instance v4, Ljava/util/ArrayList;
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     invoke-static {v3}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/i;)Ljava/util/Deque;
 
@@ -596,7 +596,7 @@
 
     invoke-direct {v4, v3}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     invoke-static {v3}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/i;)Ljava/util/Deque;
 
@@ -604,7 +604,7 @@
 
     invoke-interface {v3}, Ljava/util/Deque;->clear()V
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     invoke-static {v3}, Lokhttp3/internal/e/i;->c(Lokhttp3/internal/e/i;)Lokhttp3/internal/e/c$a;
 
@@ -616,7 +616,7 @@
     move-object v3, v4
 
     :goto_0
-    iget-object v5, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v5, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
     invoke-virtual {v5}, Ljava/lang/Object;->notifyAll()V
 
@@ -633,9 +633,9 @@
     invoke-direct {p0, v1, v2}, Lokhttp3/internal/e/i$b;->aE(J)V
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->HQ()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->HD()V
 
     if-eqz v3, :cond_2
 
@@ -677,9 +677,9 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bzz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bzb:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bzv:Lokhttp3/internal/e/i$c;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/i$c.smali b/com.discord/smali_classes2/okhttp3/internal/e/i$c.smali
index db98a46885..199b3bba8d 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/i$c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/i$c.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bzf:Lokhttp3/internal/e/i;
+.field final synthetic bzz:Lokhttp3/internal/e/i;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/e/i;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$c;->bzf:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/i$c;->bzz:Lokhttp3/internal/e/i;
 
     invoke-direct {p0}, Lokio/a;-><init>()V
 
@@ -31,19 +31,19 @@
 
 
 # virtual methods
-.method public final GW()V
+.method public final GK()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$c;->bzf:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$c;->bzz:Lokhttp3/internal/e/i;
 
-    sget-object v1, Lokhttp3/internal/e/b;->bxv:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->bxP:Lokhttp3/internal/e/b;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/e/i;->c(Lokhttp3/internal/e/b;)V
 
     return-void
 .end method
 
-.method public final HT()V
+.method public final HG()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokhttp3/internal/e/i$c;->Ip()Z
+    invoke-virtual {p0}, Lokhttp3/internal/e/i$c;->Ic()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/j.smali b/com.discord/smali_classes2/okhttp3/internal/e/j.smali
index 19a9cf4f8f..1fe2b6fc03 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/j.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/j.smali
@@ -11,15 +11,15 @@
 
 
 # instance fields
-.field private final bwA:Lokio/BufferedSink;
+.field private final bwU:Lokio/BufferedSink;
 
-.field private final byk:Z
+.field private final byE:Z
 
-.field private final bzj:Lokio/c;
+.field private final bzD:Lokio/c;
 
-.field bzk:I
+.field bzE:I
 
-.field final bzl:Lokhttp3/internal/e/d$b;
+.field final bzF:Lokhttp3/internal/e/d$b;
 
 .field private closed:Z
 
@@ -48,27 +48,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iput-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
-    iput-boolean p2, p0, Lokhttp3/internal/e/j;->byk:Z
+    iput-boolean p2, p0, Lokhttp3/internal/e/j;->byE:Z
 
     new-instance p1, Lokio/c;
 
     invoke-direct {p1}, Lokio/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/j;->bzj:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/j;->bzD:Lokio/c;
 
     new-instance p1, Lokhttp3/internal/e/d$b;
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->bzj:Lokio/c;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->bzD:Lokio/c;
 
     invoke-direct {p1, p2}, Lokhttp3/internal/e/d$b;-><init>(Lokio/c;)V
 
-    iput-object p1, p0, Lokhttp3/internal/e/j;->bzl:Lokhttp3/internal/e/d$b;
+    iput-object p1, p0, Lokhttp3/internal/e/j;->bzF:Lokhttp3/internal/e/d$b;
 
     const/16 p1, 0x4000
 
-    iput p1, p0, Lokhttp3/internal/e/j;->bzk:I
+    iput p1, p0, Lokhttp3/internal/e/j;->bzE:I
 
     return-void
 .end method
@@ -102,7 +102,7 @@
     invoke-virtual {v0, v2}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
 
     :cond_0
-    iget v0, p0, Lokhttp3/internal/e/j;->bzk:I
+    iget v0, p0, Lokhttp3/internal/e/j;->bzE:I
 
     const/4 v2, 0x1
 
@@ -114,29 +114,29 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     invoke-static {v0, p2}, Lokhttp3/internal/e/j;->a(Lokio/BufferedSink;I)V
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     and-int/lit16 p3, p3, 0xff
 
-    invoke-interface {p2, p3}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p2, p3}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     and-int/lit16 p3, p4, 0xff
 
-    invoke-interface {p2, p3}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p2, p3}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     const p3, 0x7fffffff
 
     and-int/2addr p1, p3
 
-    invoke-interface {p2, p1}, Lokio/BufferedSink;->dU(I)Lokio/BufferedSink;
+    invoke-interface {p2, p1}, Lokio/BufferedSink;->dQ(I)Lokio/BufferedSink;
 
     return-void
 
@@ -195,17 +195,17 @@
 
     and-int/lit16 v0, v0, 0xff
 
-    invoke-interface {p0, v0}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p0, v0}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
     ushr-int/lit8 v0, p1, 0x8
 
     and-int/lit16 v0, v0, 0xff
 
-    invoke-interface {p0, v0}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p0, v0}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
     and-int/lit16 p1, p1, 0xff
 
-    invoke-interface {p0, p1}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p0, p1}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
     return-void
 .end method
@@ -225,7 +225,7 @@
 
     if-lez v2, :cond_1
 
-    iget v2, p0, Lokhttp3/internal/e/j;->bzk:I
+    iget v2, p0, Lokhttp3/internal/e/j;->bzE:I
 
     int-to-long v2, v2
 
@@ -255,9 +255,9 @@
     :goto_1
     invoke-direct {p0, p1, v3, v2, v0}, Lokhttp3/internal/e/j;->a(IIBB)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
-    iget-object v1, p0, Lokhttp3/internal/e/j;->bzj:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/j;->bzD:Lokio/c;
 
     invoke-interface {v0, v1, v4, v5}, Lokio/BufferedSink;->write(Lokio/c;J)V
 
@@ -269,7 +269,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized HU()V
+.method public final declared-synchronized HH()V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -284,7 +284,7 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokhttp3/internal/e/j;->byk:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/j;->byE:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -316,9 +316,9 @@
 
     const/4 v3, 0x0
 
-    sget-object v4, Lokhttp3/internal/e/e;->bxY:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/e;->bys:Lokio/ByteString;
 
-    invoke-virtual {v4}, Lokio/ByteString;->IJ()Ljava/lang/String;
+    invoke-virtual {v4}, Lokio/ByteString;->Iw()Ljava/lang/String;
 
     move-result-object v4
 
@@ -331,9 +331,9 @@
     invoke-virtual {v0, v1}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
-    sget-object v1, Lokhttp3/internal/e/e;->bxY:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/e;->bys:Lokio/ByteString;
 
     invoke-virtual {v1}, Lokio/ByteString;->toByteArray()[B
 
@@ -341,7 +341,7 @@
 
     invoke-interface {v0, v1}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
     :try_end_1
@@ -402,26 +402,26 @@
 
     invoke-direct {p0, v2, v0, v1, v2}, Lokhttp3/internal/e/j;->a(IIBB)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
-    invoke-interface {v0, p1}, Lokio/BufferedSink;->dU(I)Lokio/BufferedSink;
+    invoke-interface {v0, p1}, Lokio/BufferedSink;->dQ(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     iget p2, p2, Lokhttp3/internal/e/b;->httpCode:I
 
-    invoke-interface {p1, p2}, Lokio/BufferedSink;->dU(I)Lokio/BufferedSink;
+    invoke-interface {p1, p2}, Lokio/BufferedSink;->dQ(I)Lokio/BufferedSink;
 
     array-length p1, p3
 
     if-lez p1, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     invoke-interface {p1, p3}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->flush()V
     :try_end_0
@@ -495,15 +495,15 @@
 
     invoke-direct {p0, v0, v1, v2, p1}, Lokhttp3/internal/e/j;->a(IIBB)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
-    invoke-interface {p1, p2}, Lokio/BufferedSink;->dU(I)Lokio/BufferedSink;
+    invoke-interface {p1, p2}, Lokio/BufferedSink;->dQ(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
-    invoke-interface {p1, p3}, Lokio/BufferedSink;->dU(I)Lokio/BufferedSink;
+    invoke-interface {p1, p3}, Lokio/BufferedSink;->dQ(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->flush()V
     :try_end_0
@@ -554,7 +554,7 @@
 
     if-lez p4, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     int-to-long v0, p4
 
@@ -602,24 +602,24 @@
 
     if-nez v0, :cond_2
 
-    iget v0, p0, Lokhttp3/internal/e/j;->bzk:I
+    iget v0, p0, Lokhttp3/internal/e/j;->bzE:I
 
-    iget v1, p1, Lokhttp3/internal/e/m;->bzu:I
+    iget v1, p1, Lokhttp3/internal/e/m;->bzO:I
 
     and-int/lit8 v1, v1, 0x20
 
     if-eqz v1, :cond_0
 
-    iget-object v0, p1, Lokhttp3/internal/e/m;->bzv:[I
+    iget-object v0, p1, Lokhttp3/internal/e/m;->bzP:[I
 
     const/4 v1, 0x5
 
     aget v0, v0, v1
 
     :cond_0
-    iput v0, p0, Lokhttp3/internal/e/j;->bzk:I
+    iput v0, p0, Lokhttp3/internal/e/j;->bzE:I
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->HX()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->HK()I
 
     move-result v0
 
@@ -627,13 +627,13 @@
 
     if-eq v0, v1, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->bzl:Lokhttp3/internal/e/d$b;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bzF:Lokhttp3/internal/e/d$b;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->HX()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->HK()I
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lokhttp3/internal/e/d$b;->dH(I)V
+    invoke-virtual {v0, p1}, Lokhttp3/internal/e/d$b;->dE(I)V
 
     :cond_1
     const/4 p1, 0x4
@@ -644,7 +644,7 @@
 
     invoke-direct {p0, v1, v1, p1, v0}, Lokhttp3/internal/e/j;->a(IIBB)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->flush()V
     :try_end_0
@@ -702,15 +702,15 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->bzl:Lokhttp3/internal/e/d$b;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bzF:Lokhttp3/internal/e/d$b;
 
     invoke-virtual {v0, p3}, Lokhttp3/internal/e/d$b;->ah(Ljava/util/List;)V
 
-    iget-object p3, p0, Lokhttp3/internal/e/j;->bzj:Lokio/c;
+    iget-object p3, p0, Lokhttp3/internal/e/j;->bzD:Lokio/c;
 
     iget-wide v0, p3, Lokio/c;->size:J
 
-    iget p3, p0, Lokhttp3/internal/e/j;->bzk:I
+    iget p3, p0, Lokhttp3/internal/e/j;->bzE:I
 
     int-to-long v2, p3
 
@@ -745,9 +745,9 @@
 
     invoke-direct {p0, p2, p3, p1, v4}, Lokhttp3/internal/e/j;->a(IIBB)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
-    iget-object p3, p0, Lokhttp3/internal/e/j;->bzj:Lokio/c;
+    iget-object p3, p0, Lokhttp3/internal/e/j;->bzD:Lokio/c;
 
     invoke-interface {p1, p3, v2, v3}, Lokio/BufferedSink;->write(Lokio/c;J)V
 
@@ -824,13 +824,13 @@
 
     invoke-direct {p0, p1, v0, v1, v2}, Lokhttp3/internal/e/j;->a(IIBB)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     iget p2, p2, Lokhttp3/internal/e/b;->httpCode:I
 
-    invoke-interface {p1, p2}, Lokio/BufferedSink;->dU(I)Lokio/BufferedSink;
+    invoke-interface {p1, p2}, Lokio/BufferedSink;->dQ(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->flush()V
     :try_end_0
@@ -882,7 +882,7 @@
 
     if-nez v0, :cond_4
 
-    iget v0, p1, Lokhttp3/internal/e/m;->bzu:I
+    iget v0, p1, Lokhttp3/internal/e/m;->bzO:I
 
     invoke-static {v0}, Ljava/lang/Integer;->bitCount(I)I
 
@@ -926,17 +926,17 @@
     move v0, v2
 
     :goto_1
-    iget-object v3, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object v3, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
-    invoke-interface {v3, v0}, Lokio/BufferedSink;->dV(I)Lokio/BufferedSink;
+    invoke-interface {v3, v0}, Lokio/BufferedSink;->dR(I)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
-    iget-object v3, p1, Lokhttp3/internal/e/m;->bzv:[I
+    iget-object v3, p1, Lokhttp3/internal/e/m;->bzP:[I
 
     aget v3, v3, v2
 
-    invoke-interface {v0, v3}, Lokio/BufferedSink;->dU(I)Lokio/BufferedSink;
+    invoke-interface {v0, v3}, Lokio/BufferedSink;->dQ(I)Lokio/BufferedSink;
 
     :cond_2
     add-int/lit8 v2, v2, 0x1
@@ -944,7 +944,7 @@
     goto :goto_0
 
     :cond_3
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->flush()V
     :try_end_0
@@ -995,7 +995,7 @@
     :try_start_0
     iput-boolean v0, p0, Lokhttp3/internal/e/j;->closed:Z
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->close()V
     :try_end_0
@@ -1028,7 +1028,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
     :try_end_0
@@ -1093,13 +1093,13 @@
 
     invoke-direct {p0, p1, v0, v1, v2}, Lokhttp3/internal/e/j;->a(IIBB)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     long-to-int p3, p2
 
-    invoke-interface {p1, p3}, Lokio/BufferedSink;->dU(I)Lokio/BufferedSink;
+    invoke-interface {p1, p3}, Lokio/BufferedSink;->dQ(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->bwU:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->flush()V
     :try_end_0
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/k$a.smali b/com.discord/smali_classes2/okhttp3/internal/e/k$a.smali
index 0dbf267eca..f5ac1e49a0 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/k$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/k$a.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field final bzq:[Lokhttp3/internal/e/k$a;
+.field final bzK:[Lokhttp3/internal/e/k$a;
 
-.field final bzr:I
+.field final bzL:I
 
-.field final bzs:I
+.field final bzM:I
 
 
 # direct methods
@@ -32,13 +32,13 @@
 
     new-array v0, v0, [Lokhttp3/internal/e/k$a;
 
-    iput-object v0, p0, Lokhttp3/internal/e/k$a;->bzq:[Lokhttp3/internal/e/k$a;
+    iput-object v0, p0, Lokhttp3/internal/e/k$a;->bzK:[Lokhttp3/internal/e/k$a;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/e/k$a;->bzr:I
+    iput v0, p0, Lokhttp3/internal/e/k$a;->bzL:I
 
-    iput v0, p0, Lokhttp3/internal/e/k$a;->bzs:I
+    iput v0, p0, Lokhttp3/internal/e/k$a;->bzM:I
 
     return-void
 .end method
@@ -50,9 +50,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokhttp3/internal/e/k$a;->bzq:[Lokhttp3/internal/e/k$a;
+    iput-object v0, p0, Lokhttp3/internal/e/k$a;->bzK:[Lokhttp3/internal/e/k$a;
 
-    iput p1, p0, Lokhttp3/internal/e/k$a;->bzr:I
+    iput p1, p0, Lokhttp3/internal/e/k$a;->bzL:I
 
     and-int/lit8 p1, p2, 0x7
 
@@ -61,7 +61,7 @@
     const/16 p1, 0x8
 
     :cond_0
-    iput p1, p0, Lokhttp3/internal/e/k$a;->bzs:I
+    iput p1, p0, Lokhttp3/internal/e/k$a;->bzM:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/k.smali b/com.discord/smali_classes2/okhttp3/internal/e/k.smali
index 895e03af2d..33571d353e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/k.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/k.smali
@@ -12,15 +12,15 @@
 
 
 # static fields
-.field private static final bzm:[I
+.field private static final bzG:[I
 
-.field private static final bzn:[B
+.field private static final bzH:[B
 
-.field private static final bzo:Lokhttp3/internal/e/k;
+.field private static final bzI:Lokhttp3/internal/e/k;
 
 
 # instance fields
-.field private final bzp:Lokhttp3/internal/e/k$a;
+.field private final bzJ:Lokhttp3/internal/e/k$a;
 
 
 # direct methods
@@ -33,19 +33,19 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lokhttp3/internal/e/k;->bzm:[I
+    sput-object v1, Lokhttp3/internal/e/k;->bzG:[I
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lokhttp3/internal/e/k;->bzn:[B
+    sput-object v0, Lokhttp3/internal/e/k;->bzH:[B
 
     new-instance v0, Lokhttp3/internal/e/k;
 
     invoke-direct {v0}, Lokhttp3/internal/e/k;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/e/k;->bzo:Lokhttp3/internal/e/k;
+    sput-object v0, Lokhttp3/internal/e/k;->bzI:Lokhttp3/internal/e/k;
 
     return-void
 
@@ -579,34 +579,34 @@
 
     invoke-direct {v0}, Lokhttp3/internal/e/k$a;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/e/k;->bzp:Lokhttp3/internal/e/k$a;
+    iput-object v0, p0, Lokhttp3/internal/e/k;->bzJ:Lokhttp3/internal/e/k$a;
 
-    invoke-direct {p0}, Lokhttp3/internal/e/k;->HW()V
+    invoke-direct {p0}, Lokhttp3/internal/e/k;->HJ()V
 
     return-void
 .end method
 
-.method public static HV()Lokhttp3/internal/e/k;
+.method public static HI()Lokhttp3/internal/e/k;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/e/k;->bzo:Lokhttp3/internal/e/k;
+    sget-object v0, Lokhttp3/internal/e/k;->bzI:Lokhttp3/internal/e/k;
 
     return-object v0
 .end method
 
-.method private HW()V
+.method private HJ()V
     .locals 8
 
     const/4 v0, 0x0
 
     :goto_0
-    sget-object v1, Lokhttp3/internal/e/k;->bzn:[B
+    sget-object v1, Lokhttp3/internal/e/k;->bzH:[B
 
     array-length v2, v1
 
     if-ge v0, v2, :cond_4
 
-    sget-object v2, Lokhttp3/internal/e/k;->bzm:[I
+    sget-object v2, Lokhttp3/internal/e/k;->bzG:[I
 
     aget v2, v2, v0
 
@@ -616,7 +616,7 @@
 
     invoke-direct {v3, v0, v1}, Lokhttp3/internal/e/k$a;-><init>(II)V
 
-    iget-object v4, p0, Lokhttp3/internal/e/k;->bzp:Lokhttp3/internal/e/k$a;
+    iget-object v4, p0, Lokhttp3/internal/e/k;->bzJ:Lokhttp3/internal/e/k$a;
 
     :goto_1
     const/16 v5, 0x8
@@ -631,17 +631,17 @@
 
     and-int/lit16 v5, v5, 0xff
 
-    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bzq:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bzK:[Lokhttp3/internal/e/k$a;
 
     if-eqz v6, :cond_1
 
-    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bzq:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bzK:[Lokhttp3/internal/e/k$a;
 
     aget-object v6, v6, v5
 
     if-nez v6, :cond_0
 
-    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bzq:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bzK:[Lokhttp3/internal/e/k$a;
 
     new-instance v7, Lokhttp3/internal/e/k$a;
 
@@ -650,7 +650,7 @@
     aput-object v7, v6, v5
 
     :cond_0
-    iget-object v4, v4, Lokhttp3/internal/e/k$a;->bzq:[Lokhttp3/internal/e/k$a;
+    iget-object v4, v4, Lokhttp3/internal/e/k$a;->bzK:[Lokhttp3/internal/e/k$a;
 
     aget-object v4, v4, v5
 
@@ -683,7 +683,7 @@
 
     if-ge v5, v6, :cond_3
 
-    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bzq:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bzK:[Lokhttp3/internal/e/k$a;
 
     aput-object v3, v6, v5
 
@@ -733,11 +733,11 @@
 
     and-int/2addr v4, v6
 
-    sget-object v6, Lokhttp3/internal/e/k;->bzm:[I
+    sget-object v6, Lokhttp3/internal/e/k;->bzG:[I
 
     aget v6, v6, v4
 
-    sget-object v7, Lokhttp3/internal/e/k;->bzn:[B
+    sget-object v7, Lokhttp3/internal/e/k;->bzH:[B
 
     aget-byte v4, v7, v4
 
@@ -758,7 +758,7 @@
 
     long-to-int v4, v6
 
-    invoke-interface {p1, v4}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p1, v4}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
     goto :goto_1
 
@@ -782,7 +782,7 @@
 
     long-to-int p0, v0
 
-    invoke-interface {p1, p0}, Lokio/BufferedSink;->dW(I)Lokio/BufferedSink;
+    invoke-interface {p1, p0}, Lokio/BufferedSink;->dS(I)Lokio/BufferedSink;
 
     :cond_2
     return-void
@@ -808,7 +808,7 @@
 
     and-int/lit16 v3, v3, 0xff
 
-    sget-object v4, Lokhttp3/internal/e/k;->bzn:[B
+    sget-object v4, Lokhttp3/internal/e/k;->bzH:[B
 
     aget-byte v3, v4, v3
 
@@ -843,7 +843,7 @@
 
     invoke-direct {v0}, Ljava/io/ByteArrayOutputStream;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/internal/e/k;->bzp:Lokhttp3/internal/e/k$a;
+    iget-object v1, p0, Lokhttp3/internal/e/k;->bzJ:Lokhttp3/internal/e/k$a;
 
     const/4 v2, 0x0
 
@@ -879,23 +879,23 @@
 
     and-int/lit16 v5, v5, 0xff
 
-    iget-object v4, v4, Lokhttp3/internal/e/k$a;->bzq:[Lokhttp3/internal/e/k$a;
+    iget-object v4, v4, Lokhttp3/internal/e/k$a;->bzK:[Lokhttp3/internal/e/k$a;
 
     aget-object v4, v4, v5
 
-    iget-object v5, v4, Lokhttp3/internal/e/k$a;->bzq:[Lokhttp3/internal/e/k$a;
+    iget-object v5, v4, Lokhttp3/internal/e/k$a;->bzK:[Lokhttp3/internal/e/k$a;
 
     if-nez v5, :cond_0
 
-    iget v5, v4, Lokhttp3/internal/e/k$a;->bzr:I
+    iget v5, v4, Lokhttp3/internal/e/k$a;->bzL:I
 
     invoke-virtual {v0, v5}, Ljava/io/ByteArrayOutputStream;->write(I)V
 
-    iget v4, v4, Lokhttp3/internal/e/k$a;->bzs:I
+    iget v4, v4, Lokhttp3/internal/e/k$a;->bzM:I
 
     sub-int/2addr v3, v4
 
-    iget-object v4, p0, Lokhttp3/internal/e/k;->bzp:Lokhttp3/internal/e/k$a;
+    iget-object v4, p0, Lokhttp3/internal/e/k;->bzJ:Lokhttp3/internal/e/k$a;
 
     goto :goto_1
 
@@ -919,27 +919,27 @@
 
     and-int/lit16 p1, p1, 0xff
 
-    iget-object v2, v4, Lokhttp3/internal/e/k$a;->bzq:[Lokhttp3/internal/e/k$a;
+    iget-object v2, v4, Lokhttp3/internal/e/k$a;->bzK:[Lokhttp3/internal/e/k$a;
 
     aget-object p1, v2, p1
 
-    iget-object v2, p1, Lokhttp3/internal/e/k$a;->bzq:[Lokhttp3/internal/e/k$a;
+    iget-object v2, p1, Lokhttp3/internal/e/k$a;->bzK:[Lokhttp3/internal/e/k$a;
 
     if-nez v2, :cond_3
 
-    iget v2, p1, Lokhttp3/internal/e/k$a;->bzs:I
+    iget v2, p1, Lokhttp3/internal/e/k$a;->bzM:I
 
     if-gt v2, v3, :cond_3
 
-    iget v2, p1, Lokhttp3/internal/e/k$a;->bzr:I
+    iget v2, p1, Lokhttp3/internal/e/k$a;->bzL:I
 
     invoke-virtual {v0, v2}, Ljava/io/ByteArrayOutputStream;->write(I)V
 
-    iget p1, p1, Lokhttp3/internal/e/k$a;->bzs:I
+    iget p1, p1, Lokhttp3/internal/e/k$a;->bzM:I
 
     sub-int/2addr v3, p1
 
-    iget-object v4, p0, Lokhttp3/internal/e/k;->bzp:Lokhttp3/internal/e/k$a;
+    iget-object v4, p0, Lokhttp3/internal/e/k;->bzJ:Lokhttp3/internal/e/k$a;
 
     goto :goto_2
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/l.smali b/com.discord/smali_classes2/okhttp3/internal/e/l.smali
index 0be3ed838b..7148dd6a5c 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/l.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/l.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bzt:Lokhttp3/internal/e/l;
+.field public static final bzN:Lokhttp3/internal/e/l;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/internal/e/l$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/e/l;->bzt:Lokhttp3/internal/e/l;
+    sput-object v0, Lokhttp3/internal/e/l;->bzN:Lokhttp3/internal/e/l;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/m.smali b/com.discord/smali_classes2/okhttp3/internal/e/m.smali
index def250dcb5..ddd176fa31 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/m.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/m.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field bzu:I
+.field bzO:I
 
-.field final bzv:[I
+.field final bzP:[I
 
 
 # direct methods
@@ -19,23 +19,23 @@
 
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lokhttp3/internal/e/m;->bzv:[I
+    iput-object v0, p0, Lokhttp3/internal/e/m;->bzP:[I
 
     return-void
 .end method
 
 
 # virtual methods
-.method final HX()I
+.method final HK()I
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/e/m;->bzu:I
+    iget v0, p0, Lokhttp3/internal/e/m;->bzO:I
 
     and-int/lit8 v0, v0, 0x2
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/m;->bzv:[I
+    iget-object v0, p0, Lokhttp3/internal/e/m;->bzP:[I
 
     const/4 v1, 0x1
 
@@ -49,16 +49,16 @@
     return v0
 .end method
 
-.method final HY()I
+.method final HL()I
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/e/m;->bzu:I
+    iget v0, p0, Lokhttp3/internal/e/m;->bzO:I
 
     and-int/lit16 v0, v0, 0x80
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/m;->bzv:[I
+    iget-object v0, p0, Lokhttp3/internal/e/m;->bzP:[I
 
     const/4 v1, 0x7
 
@@ -72,12 +72,12 @@
     return v0
 .end method
 
-.method final ac(II)Lokhttp3/internal/e/m;
+.method final ab(II)Lokhttp3/internal/e/m;
     .locals 3
 
     if-ltz p1, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/m;->bzv:[I
+    iget-object v0, p0, Lokhttp3/internal/e/m;->bzP:[I
 
     array-length v1, v0
 
@@ -90,11 +90,11 @@
 
     shl-int/2addr v1, p1
 
-    iget v2, p0, Lokhttp3/internal/e/m;->bzu:I
+    iget v2, p0, Lokhttp3/internal/e/m;->bzO:I
 
     or-int/2addr v1, v2
 
-    iput v1, p0, Lokhttp3/internal/e/m;->bzu:I
+    iput v1, p0, Lokhttp3/internal/e/m;->bzO:I
 
     aput p2, v0, p1
 
@@ -110,7 +110,7 @@
 
     shl-int p1, v0, p1
 
-    iget v1, p0, Lokhttp3/internal/e/m;->bzu:I
+    iget v1, p0, Lokhttp3/internal/e/m;->bzO:I
 
     and-int/2addr p1, v1
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/f/a$1.smali b/com.discord/smali_classes2/okhttp3/internal/f/a$1.smali
index b9ec7e24ee..79c9578001 100644
--- a/com.discord/smali_classes2/okhttp3/internal/f/a$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/f/a$1.smali
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public final A(Ljava/io/File;)V
+.method public final z(Ljava/io/File;)V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/okhttp3/internal/f/a.smali b/com.discord/smali_classes2/okhttp3/internal/f/a.smali
index 30d62f2d4c..551b9141b2 100644
--- a/com.discord/smali_classes2/okhttp3/internal/f/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/f/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bzw:Lokhttp3/internal/f/a;
+.field public static final bzQ:Lokhttp3/internal/f/a;
 
 
 # direct methods
@@ -15,14 +15,14 @@
 
     invoke-direct {v0}, Lokhttp3/internal/f/a$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/f/a;->bzw:Lokhttp3/internal/f/a;
+    sput-object v0, Lokhttp3/internal/f/a;->bzQ:Lokhttp3/internal/f/a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public abstract A(Ljava/io/File;)V
+.method public abstract z(Ljava/io/File;)V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/okhttp3/internal/g/a$a.smali b/com.discord/smali_classes2/okhttp3/internal/g/a$a.smali
index 0969aa8098..ecdef556eb 100644
--- a/com.discord/smali_classes2/okhttp3/internal/g/a$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/g/a$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private final bzD:Ljava/lang/Object;
+.field private final bzX:Ljava/lang/Object;
 
-.field private final bzE:Ljava/lang/reflect/Method;
+.field private final bzY:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -26,9 +26,9 @@
 
     invoke-direct {p0}, Lokhttp3/internal/i/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/g/a$a;->bzD:Ljava/lang/Object;
+    iput-object p1, p0, Lokhttp3/internal/g/a$a;->bzX:Ljava/lang/Object;
 
-    iput-object p2, p0, Lokhttp3/internal/g/a$a;->bzE:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/a$a;->bzY:Ljava/lang/reflect/Method;
 
     return-void
 .end method
@@ -70,9 +70,9 @@
 
     check-cast p1, [Ljava/security/cert/X509Certificate;
 
-    iget-object v0, p0, Lokhttp3/internal/g/a$a;->bzE:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/a$a;->bzY:Ljava/lang/reflect/Method;
 
-    iget-object v1, p0, Lokhttp3/internal/g/a$a;->bzD:Ljava/lang/Object;
+    iget-object v1, p0, Lokhttp3/internal/g/a$a;->bzX:Ljava/lang/Object;
 
     const/4 v2, 0x3
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/g/a$b.smali b/com.discord/smali_classes2/okhttp3/internal/g/a$b.smali
index b1e7d2fd14..4fdece16bf 100644
--- a/com.discord/smali_classes2/okhttp3/internal/g/a$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/g/a$b.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field private final bzF:Ljavax/net/ssl/X509TrustManager;
+.field private final bAa:Ljava/lang/reflect/Method;
 
-.field private final bzG:Ljava/lang/reflect/Method;
+.field private final bzZ:Ljavax/net/ssl/X509TrustManager;
 
 
 # direct methods
@@ -29,9 +29,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lokhttp3/internal/g/a$b;->bzG:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/a$b;->bAa:Ljava/lang/reflect/Method;
 
-    iput-object p1, p0, Lokhttp3/internal/g/a$b;->bzF:Ljavax/net/ssl/X509TrustManager;
+    iput-object p1, p0, Lokhttp3/internal/g/a$b;->bzZ:Ljavax/net/ssl/X509TrustManager;
 
     return-void
 .end method
@@ -44,9 +44,9 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bzG:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bAa:Ljava/lang/reflect/Method;
 
-    iget-object v2, p0, Lokhttp3/internal/g/a$b;->bzF:Ljavax/net/ssl/X509TrustManager;
+    iget-object v2, p0, Lokhttp3/internal/g/a$b;->bzZ:Ljavax/net/ssl/X509TrustManager;
 
     const/4 v3, 0x1
 
@@ -110,9 +110,9 @@
     :cond_1
     check-cast p1, Lokhttp3/internal/g/a$b;
 
-    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bzF:Ljavax/net/ssl/X509TrustManager;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bzZ:Ljavax/net/ssl/X509TrustManager;
 
-    iget-object v3, p1, Lokhttp3/internal/g/a$b;->bzF:Ljavax/net/ssl/X509TrustManager;
+    iget-object v3, p1, Lokhttp3/internal/g/a$b;->bzZ:Ljavax/net/ssl/X509TrustManager;
 
     invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -120,9 +120,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bzG:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bAa:Ljava/lang/reflect/Method;
 
-    iget-object p1, p1, Lokhttp3/internal/g/a$b;->bzG:Ljava/lang/reflect/Method;
+    iget-object p1, p1, Lokhttp3/internal/g/a$b;->bAa:Ljava/lang/reflect/Method;
 
     invoke-virtual {v1, p1}, Ljava/lang/reflect/Method;->equals(Ljava/lang/Object;)Z
 
@@ -139,13 +139,13 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/g/a$b;->bzF:Ljavax/net/ssl/X509TrustManager;
+    iget-object v0, p0, Lokhttp3/internal/g/a$b;->bzZ:Ljavax/net/ssl/X509TrustManager;
 
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
 
-    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bzG:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bAa:Ljava/lang/reflect/Method;
 
     invoke-virtual {v1}, Ljava/lang/reflect/Method;->hashCode()I
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/g/a$c.smali b/com.discord/smali_classes2/okhttp3/internal/g/a$c.smali
index 5696bc7353..c902a72e66 100644
--- a/com.discord/smali_classes2/okhttp3/internal/g/a$c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/g/a$c.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private final bzH:Ljava/lang/reflect/Method;
+.field private final bAb:Ljava/lang/reflect/Method;
 
-.field private final bzI:Ljava/lang/reflect/Method;
+.field private final bAc:Ljava/lang/reflect/Method;
 
 .field private final getMethod:Ljava/lang/reflect/Method;
 
@@ -30,14 +30,14 @@
 
     iput-object p1, p0, Lokhttp3/internal/g/a$c;->getMethod:Ljava/lang/reflect/Method;
 
-    iput-object p2, p0, Lokhttp3/internal/g/a$c;->bzH:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/a$c;->bAb:Ljava/lang/reflect/Method;
 
-    iput-object p3, p0, Lokhttp3/internal/g/a$c;->bzI:Ljava/lang/reflect/Method;
+    iput-object p3, p0, Lokhttp3/internal/g/a$c;->bAc:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method static Ic()Lokhttp3/internal/g/a$c;
+.method static HP()Lokhttp3/internal/g/a$c;
     .locals 7
 
     const/4 v0, 0x0
@@ -112,7 +112,7 @@
     if-eqz p1, :cond_0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/g/a$c;->bzI:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$c;->bAc:Ljava/lang/reflect/Method;
 
     new-array v2, v0, [Ljava/lang/Object;
 
@@ -127,7 +127,7 @@
     return v0
 .end method
 
-.method final eF(Ljava/lang/String;)Ljava/lang/Object;
+.method final eA(Ljava/lang/String;)Ljava/lang/Object;
     .locals 5
 
     iget-object v0, p0, Lokhttp3/internal/g/a$c;->getMethod:Ljava/lang/reflect/Method;
@@ -145,7 +145,7 @@
 
     move-result-object v0
 
-    iget-object v3, p0, Lokhttp3/internal/g/a$c;->bzH:Ljava/lang/reflect/Method;
+    iget-object v3, p0, Lokhttp3/internal/g/a$c;->bAb:Ljava/lang/reflect/Method;
 
     const/4 v4, 0x1
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/g/d$a.smali b/com.discord/smali_classes2/okhttp3/internal/g/d$a.smali
index 2f0814a18c..8b998aeb21 100644
--- a/com.discord/smali_classes2/okhttp3/internal/g/d$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/g/d$a.smali
@@ -18,7 +18,11 @@
 
 
 # instance fields
-.field private final bpU:Ljava/util/List;
+.field bAj:Z
+
+.field bAk:Ljava/lang/String;
+
+.field private final bqo:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -28,10 +32,6 @@
     .end annotation
 .end field
 
-.field bzP:Z
-
-.field bzQ:Ljava/lang/String;
-
 
 # direct methods
 .method constructor <init>(Ljava/util/List;)V
@@ -47,7 +47,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bpU:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bqo:Ljava/util/List;
 
     return-void
 .end method
@@ -108,7 +108,7 @@
 
     if-ne v1, v0, :cond_2
 
-    iput-boolean v3, p0, Lokhttp3/internal/g/d$a;->bzP:Z
+    iput-boolean v3, p0, Lokhttp3/internal/g/d$a;->bAj:Z
 
     return-object v2
 
@@ -125,7 +125,7 @@
 
     if-nez v1, :cond_3
 
-    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bpU:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bqo:Ljava/util/List;
 
     return-object p1
 
@@ -176,7 +176,7 @@
     :goto_0
     if-ge p3, p2, :cond_6
 
-    iget-object v0, p0, Lokhttp3/internal/g/d$a;->bpU:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/g/d$a;->bqo:Ljava/util/List;
 
     invoke-interface {p1, p3}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -194,7 +194,7 @@
 
     check-cast p1, Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bzQ:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bAk:Ljava/lang/String;
 
     return-object p1
 
@@ -204,7 +204,7 @@
     goto :goto_0
 
     :cond_6
-    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bpU:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bqo:Ljava/util/List;
 
     invoke-interface {p1, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -212,7 +212,7 @@
 
     check-cast p1, Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bzQ:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bAk:Ljava/lang/String;
 
     return-object p1
 
@@ -242,7 +242,7 @@
 
     check-cast p1, Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bzQ:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bAk:Ljava/lang/String;
 
     return-object v2
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/g/e.smali b/com.discord/smali_classes2/okhttp3/internal/g/e.smali
index 1bf8dd1760..4495aa8bfb 100644
--- a/com.discord/smali_classes2/okhttp3/internal/g/e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/g/e.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final bzR:Ljava/lang/Class;
+.field private final bAl:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private final bzS:[Ljava/lang/Class;
+.field private final bAm:[Ljava/lang/Class;
 
 .field private final methodName:Ljava/lang/String;
 
@@ -46,11 +46,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/g/e;->bzR:Ljava/lang/Class;
+    iput-object p1, p0, Lokhttp3/internal/g/e;->bAl:Ljava/lang/Class;
 
     iput-object p2, p0, Lokhttp3/internal/g/e;->methodName:Ljava/lang/String;
 
-    iput-object p3, p0, Lokhttp3/internal/g/e;->bzS:[Ljava/lang/Class;
+    iput-object p3, p0, Lokhttp3/internal/g/e;->bAm:[Ljava/lang/Class;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v2, p0, Lokhttp3/internal/g/e;->bzS:[Ljava/lang/Class;
+    iget-object v2, p0, Lokhttp3/internal/g/e;->bAm:[Ljava/lang/Class;
 
     invoke-static {p1, v0, v2}, Lokhttp3/internal/g/e;->a(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
@@ -80,7 +80,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/g/e;->bzR:Ljava/lang/Class;
+    iget-object v0, p0, Lokhttp3/internal/g/e;->bAl:Ljava/lang/Class;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/a.smali b/com.discord/smali_classes2/okhttp3/internal/i/a.smali
index ed749af71a..4c646a69ce 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/a.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final bAc:Lokhttp3/internal/i/e;
+.field private final bAw:Lokhttp3/internal/i/e;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Lokhttp3/internal/i/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/i/a;->bAc:Lokhttp3/internal/i/e;
+    iput-object p1, p0, Lokhttp3/internal/i/a;->bAw:Lokhttp3/internal/i/e;
 
     return-void
 .end method
@@ -118,7 +118,7 @@
 
     check-cast v2, Ljava/security/cert/X509Certificate;
 
-    iget-object v4, p0, Lokhttp3/internal/i/a;->bAc:Lokhttp3/internal/i/e;
+    iget-object v4, p0, Lokhttp3/internal/i/a;->bAw:Lokhttp3/internal/i/e;
 
     invoke-interface {v4, v2}, Lokhttp3/internal/i/e;->e(Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509Certificate;
 
@@ -250,9 +250,9 @@
 
     check-cast p1, Lokhttp3/internal/i/a;
 
-    iget-object p1, p1, Lokhttp3/internal/i/a;->bAc:Lokhttp3/internal/i/e;
+    iget-object p1, p1, Lokhttp3/internal/i/a;->bAw:Lokhttp3/internal/i/e;
 
-    iget-object v1, p0, Lokhttp3/internal/i/a;->bAc:Lokhttp3/internal/i/e;
+    iget-object v1, p0, Lokhttp3/internal/i/a;->bAw:Lokhttp3/internal/i/e;
 
     invoke-virtual {p1, v1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -271,7 +271,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/i/a;->bAc:Lokhttp3/internal/i/e;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->bAw:Lokhttp3/internal/i/e;
 
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/b.smali b/com.discord/smali_classes2/okhttp3/internal/i/b.smali
index 79211f389b..d58242b19b 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/b.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final bAd:Ljava/util/Map;
+.field private final bAx:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -30,7 +30,7 @@
 
     invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/i/b;->bAd:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/internal/i/b;->bAx:Ljava/util/Map;
 
     array-length v0, p1
 
@@ -45,7 +45,7 @@
 
     move-result-object v3
 
-    iget-object v4, p0, Lokhttp3/internal/i/b;->bAd:Ljava/util/Map;
+    iget-object v4, p0, Lokhttp3/internal/i/b;->bAx:Ljava/util/Map;
 
     invoke-interface {v4, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -61,7 +61,7 @@
 
     invoke-direct {v4, v5}, Ljava/util/LinkedHashSet;-><init>(I)V
 
-    iget-object v5, p0, Lokhttp3/internal/i/b;->bAd:Ljava/util/Map;
+    iget-object v5, p0, Lokhttp3/internal/i/b;->bAx:Ljava/util/Map;
 
     invoke-interface {v5, v3, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -85,7 +85,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/internal/i/b;->bAd:Ljava/util/Map;
+    iget-object v1, p0, Lokhttp3/internal/i/b;->bAx:Ljava/util/Map;
 
     invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -153,9 +153,9 @@
 
     check-cast p1, Lokhttp3/internal/i/b;
 
-    iget-object p1, p1, Lokhttp3/internal/i/b;->bAd:Ljava/util/Map;
+    iget-object p1, p1, Lokhttp3/internal/i/b;->bAx:Ljava/util/Map;
 
-    iget-object v1, p0, Lokhttp3/internal/i/b;->bAd:Ljava/util/Map;
+    iget-object v1, p0, Lokhttp3/internal/i/b;->bAx:Ljava/util/Map;
 
     invoke-interface {p1, v1}, Ljava/util/Map;->equals(Ljava/lang/Object;)Z
 
@@ -174,7 +174,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/i/b;->bAd:Ljava/util/Map;
+    iget-object v0, p0, Lokhttp3/internal/i/b;->bAx:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->hashCode()I
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/i/d.smali b/com.discord/smali_classes2/okhttp3/internal/i/d.smali
index b97ee2008e..8abc4135ea 100644
--- a/com.discord/smali_classes2/okhttp3/internal/i/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/i/d.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field public static final bAe:Lokhttp3/internal/i/d;
+.field public static final bAy:Lokhttp3/internal/i/d;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lokhttp3/internal/i/d;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/i/d;->bAe:Lokhttp3/internal/i/d;
+    sput-object v0, Lokhttp3/internal/i/d;->bAy:Lokhttp3/internal/i/d;
 
     return-void
 .end method
@@ -481,7 +481,7 @@
 .method public final a(Ljava/lang/String;Ljava/security/cert/X509Certificate;)Z
     .locals 1
 
-    invoke-static {p1}, Lokhttp3/internal/c;->ex(Ljava/lang/String;)Z
+    invoke-static {p1}, Lokhttp3/internal/c;->es(Ljava/lang/String;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/j/a$1.smali b/com.discord/smali_classes2/okhttp3/internal/j/a$1.smali
index 05c6c8c07c..bc501b8ef3 100644
--- a/com.discord/smali_classes2/okhttp3/internal/j/a$1.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/j/a$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bAx:Lokhttp3/internal/j/a;
+.field final synthetic bAR:Lokhttp3/internal/j/a;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/j/a;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/j/a$1;->bAx:Lokhttp3/internal/j/a;
+    iput-object p1, p0, Lokhttp3/internal/j/a$1;->bAR:Lokhttp3/internal/j/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,9 +39,9 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/j/a$1;->bAx:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$1;->bAR:Lokhttp3/internal/j/a;
 
-    invoke-virtual {v0}, Lokhttp3/internal/j/a;->Ik()Z
+    invoke-virtual {v0}, Lokhttp3/internal/j/a;->HX()Z
 
     move-result v0
     :try_end_0
@@ -54,7 +54,7 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lokhttp3/internal/j/a$1;->bAx:Lokhttp3/internal/j/a;
+    iget-object v1, p0, Lokhttp3/internal/j/a$1;->bAR:Lokhttp3/internal/j/a;
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/j/a$2.smali b/com.discord/smali_classes2/okhttp3/internal/j/a$2.smali
index af273115e8..9b6119d408 100644
--- a/com.discord/smali_classes2/okhttp3/internal/j/a$2.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/j/a$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bAx:Lokhttp3/internal/j/a;
+.field final synthetic bAR:Lokhttp3/internal/j/a;
 
-.field final synthetic bAy:Lokhttp3/w;
+.field final synthetic bAS:Lokhttp3/w;
 
 
 # direct methods
 .method public constructor <init>(Lokhttp3/internal/j/a;Lokhttp3/w;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/j/a$2;->bAx:Lokhttp3/internal/j/a;
+    iput-object p1, p0, Lokhttp3/internal/j/a$2;->bAR:Lokhttp3/internal/j/a;
 
-    iput-object p2, p0, Lokhttp3/internal/j/a$2;->bAy:Lokhttp3/w;
+    iput-object p2, p0, Lokhttp3/internal/j/a$2;->bAS:Lokhttp3/w;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final a(Ljava/io/IOException;)V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bAx:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bAR:Lokhttp3/internal/j/a;
 
     const/4 v1, 0x0
 
@@ -56,7 +56,7 @@
     const-string v0, "Upgrade"
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/j/a$2;->bAx:Lokhttp3/internal/j/a;
+    iget-object v1, p0, Lokhttp3/internal/j/a$2;->bAR:Lokhttp3/internal/j/a;
 
     iget v2, p2, Lokhttp3/Response;->code:I
     :try_end_0
@@ -71,7 +71,7 @@
     :try_start_1
     const-string v2, "Connection"
 
-    invoke-virtual {p2, v2}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p2, v2}, Lokhttp3/Response;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -81,7 +81,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {p2, v0}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p2, v0}, Lokhttp3/Response;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -95,7 +95,7 @@
 
     const-string v0, "Sec-WebSocket-Accept"
 
-    invoke-virtual {p2, v0}, Lokhttp3/Response;->dO(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p2, v0}, Lokhttp3/Response;->dI(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -115,15 +115,15 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Lokio/ByteString;->eK(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v1}, Lokio/ByteString;->eF(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokio/ByteString;->IH()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/ByteString;->Iu()Lokio/ByteString;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokio/ByteString;->IG()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->It()Ljava/lang/String;
 
     move-result-object v1
 
@@ -135,32 +135,32 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v0, Lokhttp3/internal/a;->bvw:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bvQ:Lokhttp3/internal/a;
 
     invoke-virtual {v0, p1}, Lokhttp3/internal/a;->a(Lokhttp3/e;)Lokhttp3/internal/b/g;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Hu()V
+    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Hh()V
 
-    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Ht()Lokhttp3/internal/b/c;
+    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Hg()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
     new-instance v1, Lokhttp3/internal/b/c$1;
 
-    iget-object v2, v0, Lokhttp3/internal/b/c;->nJ:Lokio/d;
+    iget-object v2, v0, Lokhttp3/internal/b/c;->nI:Lokio/d;
 
-    iget-object v3, v0, Lokhttp3/internal/b/c;->bwA:Lokio/BufferedSink;
+    iget-object v3, v0, Lokhttp3/internal/b/c;->bwU:Lokio/BufferedSink;
 
     invoke-direct {v1, v0, v2, v3, p1}, Lokhttp3/internal/b/c$1;-><init>(Lokhttp3/internal/b/c;Lokio/d;Lokio/BufferedSink;Lokhttp3/internal/b/g;)V
 
     :try_start_2
-    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bAx:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bAR:Lokhttp3/internal/j/a;
 
-    iget-object v0, v0, Lokhttp3/internal/j/a;->bAg:Lokhttp3/WebSocketListener;
+    iget-object v0, v0, Lokhttp3/internal/j/a;->bAA:Lokhttp3/WebSocketListener;
 
-    iget-object v2, p0, Lokhttp3/internal/j/a$2;->bAx:Lokhttp3/internal/j/a;
+    iget-object v2, p0, Lokhttp3/internal/j/a$2;->bAR:Lokhttp3/internal/j/a;
 
     invoke-virtual {v0, v2, p2}, Lokhttp3/WebSocketListener;->onOpen(Lokhttp3/WebSocket;Lokhttp3/Response;)V
 
@@ -170,11 +170,11 @@
 
     invoke-direct {p2, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bAy:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bAS:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
-    invoke-virtual {v0}, Lokhttp3/s;->GI()Ljava/lang/String;
+    invoke-virtual {v0}, Lokhttp3/s;->Gx()Ljava/lang/String;
 
     move-result-object v0
 
@@ -184,23 +184,23 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bAx:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bAR:Lokhttp3/internal/j/a;
 
     invoke-virtual {v0, p2, v1}, Lokhttp3/internal/j/a;->a(Ljava/lang/String;Lokhttp3/internal/j/a$e;)V
 
-    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Ht()Lokhttp3/internal/b/c;
+    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Hg()Lokhttp3/internal/b/c;
 
     move-result-object p1
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
 
     const/4 p2, 0x0
 
     invoke-virtual {p1, p2}, Ljava/net/Socket;->setSoTimeout(I)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/a$2;->bAx:Lokhttp3/internal/j/a;
+    iget-object p1, p0, Lokhttp3/internal/j/a$2;->bAR:Lokhttp3/internal/j/a;
 
-    invoke-virtual {p1}, Lokhttp3/internal/j/a;->Ih()V
+    invoke-virtual {p1}, Lokhttp3/internal/j/a;->HU()V
     :try_end_2
     .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
 
@@ -209,7 +209,7 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lokhttp3/internal/j/a$2;->bAx:Lokhttp3/internal/j/a;
+    iget-object p2, p0, Lokhttp3/internal/j/a$2;->bAR:Lokhttp3/internal/j/a;
 
     const/4 v0, 0x0
 
@@ -323,7 +323,7 @@
     :catch_1
     move-exception p1
 
-    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bAx:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bAR:Lokhttp3/internal/j/a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/internal/j/a;->a(Ljava/lang/Exception;Lokhttp3/Response;)V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/j/a$a.smali b/com.discord/smali_classes2/okhttp3/internal/j/a$a.smali
index 402341268e..a9f94d665c 100644
--- a/com.discord/smali_classes2/okhttp3/internal/j/a$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/j/a$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bAx:Lokhttp3/internal/j/a;
+.field final synthetic bAR:Lokhttp3/internal/j/a;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/j/a;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/j/a$a;->bAx:Lokhttp3/internal/j/a;
+    iput-object p1, p0, Lokhttp3/internal/j/a$a;->bAR:Lokhttp3/internal/j/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/j/a$a;->bAx:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$a;->bAR:Lokhttp3/internal/j/a;
 
     invoke-virtual {v0}, Lokhttp3/internal/j/a;->cancel()V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/j/a$b.smali b/com.discord/smali_classes2/okhttp3/internal/j/a$b.smali
index b29668b864..39401fbe47 100644
--- a/com.discord/smali_classes2/okhttp3/internal/j/a$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/j/a$b.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field final bAA:J
+.field final bAT:Lokio/ByteString;
 
-.field final bAz:Lokio/ByteString;
+.field final bAU:J
 
 .field final code:I
 
@@ -30,11 +30,11 @@
 
     iput p1, p0, Lokhttp3/internal/j/a$b;->code:I
 
-    iput-object p2, p0, Lokhttp3/internal/j/a$b;->bAz:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/internal/j/a$b;->bAT:Lokio/ByteString;
 
     const-wide/32 p1, 0xea60
 
-    iput-wide p1, p0, Lokhttp3/internal/j/a$b;->bAA:J
+    iput-wide p1, p0, Lokhttp3/internal/j/a$b;->bAU:J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/j/a$c.smali b/com.discord/smali_classes2/okhttp3/internal/j/a$c.smali
index c9ccb085eb..f1c5f01e89 100644
--- a/com.discord/smali_classes2/okhttp3/internal/j/a$c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/j/a$c.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field final bAB:I
+.field final bAV:I
 
-.field final bAC:Lokio/ByteString;
+.field final bAW:Lokio/ByteString;
 
 
 # direct methods
@@ -28,9 +28,9 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/j/a$c;->bAB:I
+    iput p1, p0, Lokhttp3/internal/j/a$c;->bAV:I
 
-    iput-object p2, p0, Lokhttp3/internal/j/a$c;->bAC:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/internal/j/a$c;->bAW:Lokio/ByteString;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/j/a$d.smali b/com.discord/smali_classes2/okhttp3/internal/j/a$d.smali
index 03f2044bc4..fa738042af 100644
--- a/com.discord/smali_classes2/okhttp3/internal/j/a$d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/j/a$d.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bAx:Lokhttp3/internal/j/a;
+.field final synthetic bAR:Lokhttp3/internal/j/a;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/j/a;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/j/a$d;->bAx:Lokhttp3/internal/j/a;
+    iput-object p1, p0, Lokhttp3/internal/j/a$d;->bAR:Lokhttp3/internal/j/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,12 +37,12 @@
 .method public final run()V
     .locals 8
 
-    iget-object v0, p0, Lokhttp3/internal/j/a$d;->bAx:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$d;->bAR:Lokhttp3/internal/j/a;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, v0, Lokhttp3/internal/j/a;->bAt:Z
+    iget-boolean v1, v0, Lokhttp3/internal/j/a;->bAN:Z
 
     if-eqz v1, :cond_0
 
@@ -51,15 +51,15 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lokhttp3/internal/j/a;->bAk:Lokhttp3/internal/j/d;
+    iget-object v1, v0, Lokhttp3/internal/j/a;->bAE:Lokhttp3/internal/j/d;
 
-    iget-boolean v2, v0, Lokhttp3/internal/j/a;->bys:Z
+    iget-boolean v2, v0, Lokhttp3/internal/j/a;->byM:Z
 
     const/4 v3, -0x1
 
     if-eqz v2, :cond_1
 
-    iget v2, v0, Lokhttp3/internal/j/a;->bAu:I
+    iget v2, v0, Lokhttp3/internal/j/a;->bAO:I
 
     goto :goto_0
 
@@ -67,15 +67,15 @@
     const/4 v2, -0x1
 
     :goto_0
-    iget v4, v0, Lokhttp3/internal/j/a;->bAu:I
+    iget v4, v0, Lokhttp3/internal/j/a;->bAO:I
 
     const/4 v5, 0x1
 
     add-int/2addr v4, v5
 
-    iput v4, v0, Lokhttp3/internal/j/a;->bAu:I
+    iput v4, v0, Lokhttp3/internal/j/a;->bAO:I
 
-    iput-boolean v5, v0, Lokhttp3/internal/j/a;->bys:Z
+    iput-boolean v5, v0, Lokhttp3/internal/j/a;->byM:Z
 
     monitor-exit v0
     :try_end_0
@@ -93,7 +93,7 @@
 
     invoke-direct {v3, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide v6, v0, Lokhttp3/internal/j/a;->bAh:J
+    iget-wide v6, v0, Lokhttp3/internal/j/a;->bAB:J
 
     invoke-virtual {v3, v6, v7}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
@@ -121,7 +121,7 @@
 
     :cond_2
     :try_start_1
-    sget-object v2, Lokio/ByteString;->bBs:Lokio/ByteString;
+    sget-object v2, Lokio/ByteString;->bBM:Lokio/ByteString;
 
     const/16 v3, 0x9
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/j/a$e.smali b/com.discord/smali_classes2/okhttp3/internal/j/a$e.smali
index d6dfd08eb5..247e2f6317 100644
--- a/com.discord/smali_classes2/okhttp3/internal/j/a$e.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/j/a$e.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field public final bwA:Lokio/BufferedSink;
+.field public final bwU:Lokio/BufferedSink;
 
-.field public final byk:Z
+.field public final byE:Z
 
-.field public final nJ:Lokio/d;
+.field public final nI:Lokio/d;
 
 
 # direct methods
@@ -33,11 +33,11 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lokhttp3/internal/j/a$e;->byk:Z
+    iput-boolean p1, p0, Lokhttp3/internal/j/a$e;->byE:Z
 
-    iput-object p2, p0, Lokhttp3/internal/j/a$e;->nJ:Lokio/d;
+    iput-object p2, p0, Lokhttp3/internal/j/a$e;->nI:Lokio/d;
 
-    iput-object p3, p0, Lokhttp3/internal/j/a$e;->bwA:Lokio/BufferedSink;
+    iput-object p3, p0, Lokhttp3/internal/j/a$e;->bwU:Lokio/BufferedSink;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/j/b.smali b/com.discord/smali_classes2/okhttp3/internal/j/b.smali
index bcf2dd9345..1eb9c4ef6c 100644
--- a/com.discord/smali_classes2/okhttp3/internal/j/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/j/b.smali
@@ -42,7 +42,7 @@
     :cond_1
     iget-wide v2, p0, Lokio/c$a;->offset:J
 
-    iget-object v4, p0, Lokio/c$a;->nK:Lokio/c;
+    iget-object v4, p0, Lokio/c$a;->nJ:Lokio/c;
 
     iget-wide v4, v4, Lokio/c;->size:J
 
@@ -104,7 +104,7 @@
     goto :goto_2
 .end method
 
-.method static dM(I)Ljava/lang/String;
+.method static dJ(I)Ljava/lang/String;
     .locals 2
 
     const/16 v0, 0x3e8
@@ -174,10 +174,10 @@
     return-object p0
 .end method
 
-.method static dN(I)V
+.method static dK(I)V
     .locals 1
 
-    invoke-static {p0}, Lokhttp3/internal/j/b;->dM(I)Ljava/lang/String;
+    invoke-static {p0}, Lokhttp3/internal/j/b;->dJ(I)Ljava/lang/String;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/j/c.smali b/com.discord/smali_classes2/okhttp3/internal/j/c.smali
index a6ddc24f9c..939623335f 100644
--- a/com.discord/smali_classes2/okhttp3/internal/j/c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/j/c.smali
@@ -12,27 +12,27 @@
 
 
 # instance fields
-.field final bAD:Z
+.field final bAX:Z
 
-.field final bAE:Lokhttp3/internal/j/c$a;
+.field final bAY:Lokhttp3/internal/j/c$a;
 
-.field bAF:J
+.field bAZ:J
 
-.field bAG:Z
+.field bBa:Z
 
-.field bAH:Z
+.field bBb:Z
 
-.field private final bAI:Lokio/c;
+.field private final bBc:Lokio/c;
 
-.field final bAJ:Lokio/c;
+.field final bBd:Lokio/c;
 
-.field private final bAK:[B
+.field private final bBe:[B
 
-.field private final bAL:Lokio/c$a;
+.field private final bBf:Lokio/c$a;
 
 .field closed:Z
 
-.field final nJ:Lokio/d;
+.field final nI:Lokio/d;
 
 .field opcode:I
 
@@ -47,21 +47,21 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/j/c;->bAI:Lokio/c;
+    iput-object v0, p0, Lokhttp3/internal/j/c;->bBc:Lokio/c;
 
     new-instance v0, Lokio/c;
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/j/c;->bAJ:Lokio/c;
+    iput-object v0, p0, Lokhttp3/internal/j/c;->bBd:Lokio/c;
 
     if-eqz p2, :cond_2
 
-    iput-boolean p1, p0, Lokhttp3/internal/j/c;->bAD:Z
+    iput-boolean p1, p0, Lokhttp3/internal/j/c;->bAX:Z
 
-    iput-object p2, p0, Lokhttp3/internal/j/c;->nJ:Lokio/d;
+    iput-object p2, p0, Lokhttp3/internal/j/c;->nI:Lokio/d;
 
-    iput-object p3, p0, Lokhttp3/internal/j/c;->bAE:Lokhttp3/internal/j/c$a;
+    iput-object p3, p0, Lokhttp3/internal/j/c;->bAY:Lokhttp3/internal/j/c$a;
 
     const/4 p2, 0x0
 
@@ -77,7 +77,7 @@
     new-array p3, p3, [B
 
     :goto_0
-    iput-object p3, p0, Lokhttp3/internal/j/c;->bAK:[B
+    iput-object p3, p0, Lokhttp3/internal/j/c;->bBe:[B
 
     if-eqz p1, :cond_1
 
@@ -89,7 +89,7 @@
     invoke-direct {p2}, Lokio/c$a;-><init>()V
 
     :goto_1
-    iput-object p2, p0, Lokhttp3/internal/j/c;->bAL:Lokio/c$a;
+    iput-object p2, p0, Lokhttp3/internal/j/c;->bBf:Lokio/c$a;
 
     return-void
 
@@ -103,7 +103,7 @@
     throw p1
 .end method
 
-.method private In()V
+.method private Ia()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -116,13 +116,13 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/internal/j/c;->Il()V
+    invoke-virtual {p0}, Lokhttp3/internal/j/c;->HY()V
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bAH:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bBb:Z
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/internal/j/c;->Im()V
+    invoke-virtual {p0}, Lokhttp3/internal/j/c;->HZ()V
 
     goto :goto_0
 
@@ -132,7 +132,7 @@
 
 
 # virtual methods
-.method final Il()V
+.method final HY()V
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -144,26 +144,26 @@
 
     if-nez v0, :cond_11
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/s;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/s;->IM()J
+    invoke-virtual {v0}, Lokio/s;->Iz()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lokhttp3/internal/j/c;->nJ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/j/c;->nI:Lokio/d;
 
     invoke-interface {v2}, Lokio/d;->timeout()Lokio/s;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/s;->IP()Lokio/s;
+    invoke-virtual {v2}, Lokio/s;->IC()Lokio/s;
 
     :try_start_0
-    iget-object v2, p0, Lokhttp3/internal/j/c;->nJ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/j/c;->nI:Lokio/d;
 
     invoke-interface {v2}, Lokio/d;->readByte()B
 
@@ -173,7 +173,7 @@
 
     and-int/lit16 v2, v2, 0xff
 
-    iget-object v3, p0, Lokhttp3/internal/j/c;->nJ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/j/c;->nI:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->timeout()Lokio/s;
 
@@ -203,7 +203,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput-boolean v0, p0, Lokhttp3/internal/j/c;->bAG:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/c;->bBa:Z
 
     and-int/lit8 v0, v2, 0x8
 
@@ -217,13 +217,13 @@
     const/4 v0, 0x0
 
     :goto_1
-    iput-boolean v0, p0, Lokhttp3/internal/j/c;->bAH:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/c;->bBb:Z
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bAH:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bBb:Z
 
     if-eqz v0, :cond_3
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bAG:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bBa:Z
 
     if-eqz v0, :cond_2
 
@@ -282,7 +282,7 @@
 
     if-nez v2, :cond_10
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -300,7 +300,7 @@
     const/4 v1, 0x0
 
     :goto_6
-    iget-boolean v2, p0, Lokhttp3/internal/j/c;->bAD:Z
+    iget-boolean v2, p0, Lokhttp3/internal/j/c;->bAX:Z
 
     if-ne v1, v2, :cond_9
 
@@ -325,9 +325,9 @@
 
     int-to-long v2, v0
 
-    iput-wide v2, p0, Lokhttp3/internal/j/c;->bAF:J
+    iput-wide v2, p0, Lokhttp3/internal/j/c;->bAZ:J
 
-    iget-wide v2, p0, Lokhttp3/internal/j/c;->bAF:J
+    iget-wide v2, p0, Lokhttp3/internal/j/c;->bAZ:J
 
     const-wide/16 v4, 0x7e
 
@@ -335,7 +335,7 @@
 
     if-nez v0, :cond_a
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readShort()S
 
@@ -347,7 +347,7 @@
 
     and-long/2addr v2, v4
 
-    iput-wide v2, p0, Lokhttp3/internal/j/c;->bAF:J
+    iput-wide v2, p0, Lokhttp3/internal/j/c;->bAZ:J
 
     goto :goto_8
 
@@ -358,15 +358,15 @@
 
     if-nez v0, :cond_c
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readLong()J
 
     move-result-wide v2
 
-    iput-wide v2, p0, Lokhttp3/internal/j/c;->bAF:J
+    iput-wide v2, p0, Lokhttp3/internal/j/c;->bAZ:J
 
-    iget-wide v2, p0, Lokhttp3/internal/j/c;->bAF:J
+    iget-wide v2, p0, Lokhttp3/internal/j/c;->bAZ:J
 
     const-wide/16 v4, 0x0
 
@@ -385,7 +385,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide v2, p0, Lokhttp3/internal/j/c;->bAF:J
+    iget-wide v2, p0, Lokhttp3/internal/j/c;->bAZ:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->toHexString(J)Ljava/lang/String;
 
@@ -407,11 +407,11 @@
 
     :cond_c
     :goto_8
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bAH:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bBb:Z
 
     if-eqz v0, :cond_e
 
-    iget-wide v2, p0, Lokhttp3/internal/j/c;->bAF:J
+    iget-wide v2, p0, Lokhttp3/internal/j/c;->bAZ:J
 
     const-wide/16 v4, 0x7d
 
@@ -434,9 +434,9 @@
     :goto_9
     if-eqz v1, :cond_f
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->nJ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->nI:Lokio/d;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bAK:[B
+    iget-object v1, p0, Lokhttp3/internal/j/c;->bBe:[B
 
     invoke-interface {v0, v1}, Lokio/d;->readFully([B)V
 
@@ -455,7 +455,7 @@
     :catchall_0
     move-exception v2
 
-    iget-object v3, p0, Lokhttp3/internal/j/c;->nJ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/j/c;->nI:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->timeout()Lokio/s;
 
@@ -477,7 +477,7 @@
     throw v0
 .end method
 
-.method final Im()V
+.method final HZ()V
     .locals 8
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -485,7 +485,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lokhttp3/internal/j/c;->bAF:J
+    iget-wide v0, p0, Lokhttp3/internal/j/c;->bAZ:J
 
     const-wide/16 v2, 0x0
 
@@ -493,33 +493,33 @@
 
     if-lez v4, :cond_0
 
-    iget-object v4, p0, Lokhttp3/internal/j/c;->nJ:Lokio/d;
+    iget-object v4, p0, Lokhttp3/internal/j/c;->nI:Lokio/d;
 
-    iget-object v5, p0, Lokhttp3/internal/j/c;->bAI:Lokio/c;
+    iget-object v5, p0, Lokhttp3/internal/j/c;->bBc:Lokio/c;
 
     invoke-interface {v4, v5, v0, v1}, Lokio/d;->b(Lokio/c;J)V
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bAD:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bAX:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bAI:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->bBc:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bAL:Lokio/c$a;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->bBf:Lokio/c$a;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bAL:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->bBf:Lokio/c$a;
 
     invoke-virtual {v0, v2, v3}, Lokio/c$a;->aS(J)I
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bAL:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->bBf:Lokio/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bAK:[B
+    iget-object v1, p0, Lokhttp3/internal/j/c;->bBe:[B
 
     invoke-static {v0, v1}, Lokhttp3/internal/j/b;->a(Lokio/c$a;[B)V
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bAL:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->bBf:Lokio/c$a;
 
     invoke-virtual {v0}, Lokio/c$a;->close()V
 
@@ -553,22 +553,22 @@
     throw v0
 
     :pswitch_0
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bAE:Lokhttp3/internal/j/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->bAY:Lokhttp3/internal/j/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bAI:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->bBc:Lokio/c;
 
-    invoke-virtual {v1}, Lokio/c;->HF()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/c;->Hs()Lokio/ByteString;
 
-    invoke-interface {v0}, Lokhttp3/internal/j/c$a;->Ii()V
+    invoke-interface {v0}, Lokhttp3/internal/j/c$a;->HV()V
 
     return-void
 
     :pswitch_1
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bAE:Lokhttp3/internal/j/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->bAY:Lokhttp3/internal/j/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bAI:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->bBc:Lokio/c;
 
-    invoke-virtual {v1}, Lokio/c;->HF()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/c;->Hs()Lokio/ByteString;
 
     move-result-object v1
 
@@ -579,7 +579,7 @@
     :pswitch_2
     const/16 v0, 0x3ed
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bAI:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->bBc:Lokio/c;
 
     iget-wide v4, v1, Lokio/c;->size:J
 
@@ -593,19 +593,19 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bAI:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->bBc:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readShort()S
 
     move-result v0
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bAI:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->bBc:Lokio/c;
 
-    invoke-virtual {v1}, Lokio/c;->IA()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/c;->In()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-static {v0}, Lokhttp3/internal/j/b;->dM(I)Ljava/lang/String;
+    invoke-static {v0}, Lokhttp3/internal/j/b;->dJ(I)Ljava/lang/String;
 
     move-result-object v2
 
@@ -624,7 +624,7 @@
     const-string v1, ""
 
     :goto_0
-    iget-object v2, p0, Lokhttp3/internal/j/c;->bAE:Lokhttp3/internal/j/c$a;
+    iget-object v2, p0, Lokhttp3/internal/j/c;->bAY:Lokhttp3/internal/j/c$a;
 
     invoke-interface {v2, v0, v1}, Lokhttp3/internal/j/c$a;->g(ILjava/lang/String;)V
 
@@ -653,7 +653,7 @@
     .end packed-switch
 .end method
 
-.method final Io()V
+.method final Ib()V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -666,7 +666,7 @@
 
     if-nez v0, :cond_3
 
-    iget-wide v0, p0, Lokhttp3/internal/j/c;->bAF:J
+    iget-wide v0, p0, Lokhttp3/internal/j/c;->bAZ:J
 
     const-wide/16 v2, 0x0
 
@@ -674,50 +674,50 @@
 
     if-lez v4, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/j/c;->nJ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/j/c;->nI:Lokio/d;
 
-    iget-object v3, p0, Lokhttp3/internal/j/c;->bAJ:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/j/c;->bBd:Lokio/c;
 
     invoke-interface {v2, v3, v0, v1}, Lokio/d;->b(Lokio/c;J)V
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bAD:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bAX:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bAJ:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->bBd:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bAL:Lokio/c$a;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->bBf:Lokio/c$a;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bAL:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->bBf:Lokio/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bAJ:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->bBd:Lokio/c;
 
     iget-wide v1, v1, Lokio/c;->size:J
 
-    iget-wide v3, p0, Lokhttp3/internal/j/c;->bAF:J
+    iget-wide v3, p0, Lokhttp3/internal/j/c;->bAZ:J
 
     sub-long/2addr v1, v3
 
     invoke-virtual {v0, v1, v2}, Lokio/c$a;->aS(J)I
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bAL:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->bBf:Lokio/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bAK:[B
+    iget-object v1, p0, Lokhttp3/internal/j/c;->bBe:[B
 
     invoke-static {v0, v1}, Lokhttp3/internal/j/b;->a(Lokio/c$a;[B)V
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bAL:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->bBf:Lokio/c$a;
 
     invoke-virtual {v0}, Lokio/c$a;->close()V
 
     :cond_0
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bAG:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bBa:Z
 
     if-nez v0, :cond_2
 
-    invoke-direct {p0}, Lokhttp3/internal/j/c;->In()V
+    invoke-direct {p0}, Lokhttp3/internal/j/c;->Ia()V
 
     iget v0, p0, Lokhttp3/internal/j/c;->opcode:I
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/j/d$a.smali b/com.discord/smali_classes2/okhttp3/internal/j/d$a.smali
index 720825202b..2fc543cdd8 100644
--- a/com.discord/smali_classes2/okhttp3/internal/j/d$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/j/d$a.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field bAB:I
+.field bAV:I
 
-.field bAQ:Z
+.field bBk:Z
 
-.field final synthetic bAR:Lokhttp3/internal/j/d;
+.field final synthetic bBl:Lokhttp3/internal/j/d;
 
 .field closed:Z
 
@@ -33,7 +33,7 @@
 .method constructor <init>(Lokhttp3/internal/j/d;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/j/d$a;->bAR:Lokhttp3/internal/j/d;
+    iput-object p1, p0, Lokhttp3/internal/j/d$a;->bBl:Lokhttp3/internal/j/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,15 +54,15 @@
 
     if-nez v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/j/d$a;->bAR:Lokhttp3/internal/j/d;
+    iget-object v1, p0, Lokhttp3/internal/j/d$a;->bBl:Lokhttp3/internal/j/d;
 
-    iget v2, p0, Lokhttp3/internal/j/d$a;->bAB:I
+    iget v2, p0, Lokhttp3/internal/j/d$a;->bAV:I
 
-    iget-object v0, v1, Lokhttp3/internal/j/d;->nK:Lokio/c;
+    iget-object v0, v1, Lokhttp3/internal/j/d;->nJ:Lokio/c;
 
     iget-wide v3, v0, Lokio/c;->size:J
 
-    iget-boolean v5, p0, Lokhttp3/internal/j/d$a;->bAQ:Z
+    iget-boolean v5, p0, Lokhttp3/internal/j/d$a;->bBk:Z
 
     const/4 v6, 0x1
 
@@ -72,11 +72,11 @@
 
     iput-boolean v0, p0, Lokhttp3/internal/j/d$a;->closed:Z
 
-    iget-object v0, p0, Lokhttp3/internal/j/d$a;->bAR:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/d$a;->bBl:Lokhttp3/internal/j/d;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, v0, Lokhttp3/internal/j/d;->bAP:Z
+    iput-boolean v1, v0, Lokhttp3/internal/j/d;->bBj:Z
 
     return-void
 
@@ -102,15 +102,15 @@
 
     if-nez v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/j/d$a;->bAR:Lokhttp3/internal/j/d;
+    iget-object v1, p0, Lokhttp3/internal/j/d$a;->bBl:Lokhttp3/internal/j/d;
 
-    iget v2, p0, Lokhttp3/internal/j/d$a;->bAB:I
+    iget v2, p0, Lokhttp3/internal/j/d$a;->bAV:I
 
-    iget-object v0, v1, Lokhttp3/internal/j/d;->nK:Lokio/c;
+    iget-object v0, v1, Lokhttp3/internal/j/d;->nJ:Lokio/c;
 
     iget-wide v3, v0, Lokio/c;->size:J
 
-    iget-boolean v5, p0, Lokhttp3/internal/j/d$a;->bAQ:Z
+    iget-boolean v5, p0, Lokhttp3/internal/j/d$a;->bBk:Z
 
     const/4 v6, 0x0
 
@@ -118,7 +118,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/j/d$a;->bAQ:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/d$a;->bBk:Z
 
     return-void
 
@@ -135,9 +135,9 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/j/d$a;->bAR:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/d$a;->bBl:Lokhttp3/internal/j/d;
 
-    iget-object v0, v0, Lokhttp3/internal/j/d;->bwA:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/j/d;->bwU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->timeout()Lokio/s;
 
@@ -158,13 +158,13 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/j/d$a;->bAR:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/d$a;->bBl:Lokhttp3/internal/j/d;
 
-    iget-object v0, v0, Lokhttp3/internal/j/d;->nK:Lokio/c;
+    iget-object v0, v0, Lokhttp3/internal/j/d;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
-    iget-boolean p1, p0, Lokhttp3/internal/j/d$a;->bAQ:Z
+    iget-boolean p1, p0, Lokhttp3/internal/j/d$a;->bBk:Z
 
     const/4 p2, 0x0
 
@@ -178,9 +178,9 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/j/d$a;->bAR:Lokhttp3/internal/j/d;
+    iget-object p1, p0, Lokhttp3/internal/j/d$a;->bBl:Lokhttp3/internal/j/d;
 
-    iget-object p1, p1, Lokhttp3/internal/j/d;->nK:Lokio/c;
+    iget-object p1, p1, Lokhttp3/internal/j/d;->nJ:Lokio/c;
 
     iget-wide v0, p1, Lokio/c;->size:J
 
@@ -202,11 +202,11 @@
     const/4 p1, 0x0
 
     :goto_0
-    iget-object p3, p0, Lokhttp3/internal/j/d$a;->bAR:Lokhttp3/internal/j/d;
+    iget-object p3, p0, Lokhttp3/internal/j/d$a;->bBl:Lokhttp3/internal/j/d;
 
-    iget-object p3, p3, Lokhttp3/internal/j/d;->nK:Lokio/c;
+    iget-object p3, p3, Lokhttp3/internal/j/d;->nJ:Lokio/c;
 
-    invoke-virtual {p3}, Lokio/c;->Iw()J
+    invoke-virtual {p3}, Lokio/c;->Ij()J
 
     move-result-wide v2
 
@@ -218,17 +218,17 @@
 
     if-nez p1, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/j/d$a;->bAR:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/d$a;->bBl:Lokhttp3/internal/j/d;
 
-    iget v1, p0, Lokhttp3/internal/j/d$a;->bAB:I
+    iget v1, p0, Lokhttp3/internal/j/d$a;->bAV:I
 
-    iget-boolean v4, p0, Lokhttp3/internal/j/d$a;->bAQ:Z
+    iget-boolean v4, p0, Lokhttp3/internal/j/d$a;->bBk:Z
 
     const/4 v5, 0x0
 
     invoke-virtual/range {v0 .. v5}, Lokhttp3/internal/j/d;->a(IJZZ)V
 
-    iput-boolean p2, p0, Lokhttp3/internal/j/d$a;->bAQ:Z
+    iput-boolean p2, p0, Lokhttp3/internal/j/d$a;->bBk:Z
 
     :cond_1
     return-void
diff --git a/com.discord/smali_classes2/okhttp3/internal/j/d.smali b/com.discord/smali_classes2/okhttp3/internal/j/d.smali
index 3fa764e498..d3b7c3f14e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/j/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/j/d.smali
@@ -12,23 +12,23 @@
 
 
 # instance fields
-.field final bAD:Z
+.field final bAX:Z
 
-.field private final bAK:[B
+.field private final bBe:[B
 
-.field private final bAL:Lokio/c$a;
+.field private final bBf:Lokio/c$a;
 
-.field final bAM:Lokio/c;
+.field final bBg:Lokio/c;
 
-.field bAN:Z
+.field bBh:Z
 
-.field final bAO:Lokhttp3/internal/j/d$a;
+.field final bBi:Lokhttp3/internal/j/d$a;
 
-.field bAP:Z
+.field bBj:Z
 
-.field final bwA:Lokio/BufferedSink;
+.field final bwU:Lokio/BufferedSink;
 
-.field final nK:Lokio/c;
+.field final nJ:Lokio/c;
 
 .field final random:Ljava/util/Random;
 
@@ -43,27 +43,27 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/j/d;->nK:Lokio/c;
+    iput-object v0, p0, Lokhttp3/internal/j/d;->nJ:Lokio/c;
 
     new-instance v0, Lokhttp3/internal/j/d$a;
 
     invoke-direct {v0, p0}, Lokhttp3/internal/j/d$a;-><init>(Lokhttp3/internal/j/d;)V
 
-    iput-object v0, p0, Lokhttp3/internal/j/d;->bAO:Lokhttp3/internal/j/d$a;
+    iput-object v0, p0, Lokhttp3/internal/j/d;->bBi:Lokhttp3/internal/j/d$a;
 
     if-eqz p2, :cond_3
 
     if-eqz p3, :cond_2
 
-    iput-boolean p1, p0, Lokhttp3/internal/j/d;->bAD:Z
+    iput-boolean p1, p0, Lokhttp3/internal/j/d;->bAX:Z
 
-    iput-object p2, p0, Lokhttp3/internal/j/d;->bwA:Lokio/BufferedSink;
+    iput-object p2, p0, Lokhttp3/internal/j/d;->bwU:Lokio/BufferedSink;
 
-    invoke-interface {p2}, Lokio/BufferedSink;->Ir()Lokio/c;
+    invoke-interface {p2}, Lokio/BufferedSink;->Ie()Lokio/c;
 
     move-result-object p2
 
-    iput-object p2, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iput-object p2, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
     iput-object p3, p0, Lokhttp3/internal/j/d;->random:Ljava/util/Random;
 
@@ -81,7 +81,7 @@
     move-object p3, p2
 
     :goto_0
-    iput-object p3, p0, Lokhttp3/internal/j/d;->bAK:[B
+    iput-object p3, p0, Lokhttp3/internal/j/d;->bBe:[B
 
     if-eqz p1, :cond_1
 
@@ -90,7 +90,7 @@
     invoke-direct {p2}, Lokio/c$a;-><init>()V
 
     :cond_1
-    iput-object p2, p0, Lokhttp3/internal/j/d;->bAL:Lokio/c$a;
+    iput-object p2, p0, Lokhttp3/internal/j/d;->bBf:Lokio/c$a;
 
     return-void
 
@@ -123,7 +123,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/d;->bAN:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/d;->bBh:Z
 
     if-nez v0, :cond_7
 
@@ -142,11 +142,11 @@
     or-int/lit16 p1, p1, 0x80
 
     :cond_1
-    iget-object p4, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
-    invoke-virtual {p4, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p4, p1}, Lokio/c;->dM(I)Lokio/c;
 
-    iget-boolean p1, p0, Lokhttp3/internal/j/d;->bAD:Z
+    iget-boolean p1, p0, Lokhttp3/internal/j/d;->bAX:Z
 
     if-eqz p1, :cond_2
 
@@ -163,9 +163,9 @@
 
     or-int/2addr p1, v0
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
-    invoke-virtual {p4, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p4, p1}, Lokio/c;->dM(I)Lokio/c;
 
     goto/16 :goto_1
 
@@ -178,30 +178,30 @@
 
     or-int/lit8 p1, v0, 0x7e
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
-    invoke-virtual {p4, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p4, p1}, Lokio/c;->dM(I)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
     long-to-int p4, p2
 
-    invoke-virtual {p1, p4}, Lokio/c;->dR(I)Lokio/c;
+    invoke-virtual {p1, p4}, Lokio/c;->dN(I)Lokio/c;
 
     goto :goto_1
 
     :cond_4
     or-int/lit8 p1, v0, 0x7f
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
-    invoke-virtual {p4, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p4, p1}, Lokio/c;->dM(I)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
     const/16 p4, 0x8
 
-    invoke-virtual {p1, p4}, Lokio/c;->dT(I)Lokio/n;
+    invoke-virtual {p1, p4}, Lokio/c;->dP(I)Lokio/n;
 
     move-result-object p5
 
@@ -328,19 +328,19 @@
     iput-wide p4, p1, Lokio/c;->size:J
 
     :goto_1
-    iget-boolean p1, p0, Lokhttp3/internal/j/d;->bAD:Z
+    iget-boolean p1, p0, Lokhttp3/internal/j/d;->bAX:Z
 
     if-eqz p1, :cond_5
 
     iget-object p1, p0, Lokhttp3/internal/j/d;->random:Ljava/util/Random;
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->bAK:[B
+    iget-object p4, p0, Lokhttp3/internal/j/d;->bBe:[B
 
     invoke-virtual {p1, p4}, Ljava/util/Random;->nextBytes([B)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->bAK:[B
+    iget-object p4, p0, Lokhttp3/internal/j/d;->bBe:[B
 
     invoke-virtual {p1, p4}, Lokio/c;->D([B)Lokio/c;
 
@@ -350,50 +350,50 @@
 
     if-lez p1, :cond_6
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
     iget-wide p4, p1, Lokio/c;->size:J
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
-    iget-object v0, p0, Lokhttp3/internal/j/d;->nK:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/j/d;->nJ:Lokio/c;
 
     invoke-virtual {p1, v0, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
-    iget-object p2, p0, Lokhttp3/internal/j/d;->bAL:Lokio/c$a;
+    iget-object p2, p0, Lokhttp3/internal/j/d;->bBf:Lokio/c$a;
 
     invoke-virtual {p1, p2}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAL:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBf:Lokio/c$a;
 
     invoke-virtual {p1, p4, p5}, Lokio/c$a;->aS(J)I
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAL:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBf:Lokio/c$a;
 
-    iget-object p2, p0, Lokhttp3/internal/j/d;->bAK:[B
+    iget-object p2, p0, Lokhttp3/internal/j/d;->bBe:[B
 
     invoke-static {p1, p2}, Lokhttp3/internal/j/b;->a(Lokio/c$a;[B)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAL:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBf:Lokio/c$a;
 
     invoke-virtual {p1}, Lokio/c$a;->close()V
 
     goto :goto_2
 
     :cond_5
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->nK:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->nJ:Lokio/c;
 
     invoke-virtual {p1, p4, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
     :cond_6
     :goto_2
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bwU:Lokio/BufferedSink;
 
-    invoke-interface {p1}, Lokio/BufferedSink;->It()Lokio/BufferedSink;
+    invoke-interface {p1}, Lokio/BufferedSink;->Ig()Lokio/BufferedSink;
 
     return-void
 
@@ -415,7 +415,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/d;->bAN:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/d;->bBh:Z
 
     if-nez v0, :cond_3
 
@@ -433,76 +433,76 @@
 
     or-int/lit16 p1, p1, 0x80
 
-    iget-object v1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
-    invoke-virtual {v1, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v1, p1}, Lokio/c;->dM(I)Lokio/c;
 
-    iget-boolean p1, p0, Lokhttp3/internal/j/d;->bAD:Z
+    iget-boolean p1, p0, Lokhttp3/internal/j/d;->bAX:Z
 
     if-eqz p1, :cond_0
 
     or-int/lit16 p1, v0, 0x80
 
-    iget-object v1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
-    invoke-virtual {v1, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v1, p1}, Lokio/c;->dM(I)Lokio/c;
 
     iget-object p1, p0, Lokhttp3/internal/j/d;->random:Ljava/util/Random;
 
-    iget-object v1, p0, Lokhttp3/internal/j/d;->bAK:[B
+    iget-object v1, p0, Lokhttp3/internal/j/d;->bBe:[B
 
     invoke-virtual {p1, v1}, Ljava/util/Random;->nextBytes([B)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/j/d;->bAK:[B
+    iget-object v1, p0, Lokhttp3/internal/j/d;->bBe:[B
 
     invoke-virtual {p1, v1}, Lokio/c;->D([B)Lokio/c;
 
     if-lez v0, :cond_1
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
     iget-wide v0, p1, Lokio/c;->size:J
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
     invoke-virtual {p1, p2}, Lokio/c;->i(Lokio/ByteString;)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
-    iget-object p2, p0, Lokhttp3/internal/j/d;->bAL:Lokio/c$a;
+    iget-object p2, p0, Lokhttp3/internal/j/d;->bBf:Lokio/c$a;
 
     invoke-virtual {p1, p2}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAL:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBf:Lokio/c$a;
 
     invoke-virtual {p1, v0, v1}, Lokio/c$a;->aS(J)I
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAL:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBf:Lokio/c$a;
 
-    iget-object p2, p0, Lokhttp3/internal/j/d;->bAK:[B
+    iget-object p2, p0, Lokhttp3/internal/j/d;->bBe:[B
 
     invoke-static {p1, p2}, Lokhttp3/internal/j/b;->a(Lokio/c$a;[B)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAL:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBf:Lokio/c$a;
 
     invoke-virtual {p1}, Lokio/c$a;->close()V
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
-    invoke-virtual {p1, v0}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {p1, v0}, Lokio/c;->dM(I)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bAM:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bBg:Lokio/c;
 
     invoke-virtual {p1, p2}, Lokio/c;->i(Lokio/ByteString;)Lokio/c;
 
     :cond_1
     :goto_0
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bwA:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->bwU:Lokio/BufferedSink;
 
     invoke-interface {p1}, Lokio/BufferedSink;->flush()V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase.smali b/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase.smali
index 8a4ad2613d..38cba95d8e 100644
--- a/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase.smali
@@ -4,23 +4,23 @@
 
 
 # static fields
-.field private static final bzU:[B
+.field private static final bAo:[B
 
-.field private static final bzV:[Ljava/lang/String;
+.field private static final bAp:[Ljava/lang/String;
 
-.field private static final bzW:[Ljava/lang/String;
+.field private static final bAq:[Ljava/lang/String;
 
-.field private static final bzX:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+.field private static final bAr:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
 
 # instance fields
-.field private bAa:[B
+.field private final bAs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private bAb:[B
+.field private final bAt:Ljava/util/concurrent/CountDownLatch;
 
-.field private final bzY:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private bAu:[B
 
-.field private final bzZ:Ljava/util/concurrent/CountDownLatch;
+.field private bAv:[B
 
 
 # direct methods
@@ -37,11 +37,11 @@
 
     aput-byte v3, v1, v2
 
-    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzU:[B
+    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAo:[B
 
     new-array v1, v2, [Ljava/lang/String;
 
-    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzV:[Ljava/lang/String;
+    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAp:[Ljava/lang/String;
 
     new-array v0, v0, [Ljava/lang/String;
 
@@ -49,13 +49,13 @@
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzW:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAq:[Ljava/lang/String;
 
     new-instance v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
     invoke-direct {v0}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzX:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+    sput-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAr:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
-    iput-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzY:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     new-instance v0, Ljava/util/concurrent/CountDownLatch;
 
@@ -79,15 +79,15 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzZ:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAt:Ljava/util/concurrent/CountDownLatch;
 
     return-void
 .end method
 
-.method public static Ig()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+.method public static HT()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzX:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAr:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
     return-object v0
 .end method
@@ -283,7 +283,7 @@
 .method private g([Ljava/lang/String;)[Ljava/lang/String;
     .locals 7
 
-    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzY:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -295,7 +295,7 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzY:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
 
@@ -362,16 +362,16 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_2
 
     :try_start_3
-    iput-object v4, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAa:[B
+    iput-object v4, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAu:[B
 
-    iput-object v5, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAb:[B
+    iput-object v5, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAv:[B
 
     monitor-exit p0
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     :try_start_4
-    iget-object v3, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzZ:Ljava/util/concurrent/CountDownLatch;
+    iget-object v3, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAt:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v3}, Ljava/util/concurrent/CountDownLatch;->countDown()V
     :try_end_4
@@ -425,7 +425,7 @@
     move-exception v3
 
     :try_start_7
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v4
 
@@ -462,7 +462,7 @@
 
     :cond_2
     :try_start_8
-    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzZ:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAt:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->await()V
     :try_end_8
@@ -482,7 +482,7 @@
     monitor-enter p0
 
     :try_start_9
-    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAa:[B
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAu:[B
 
     if-eqz v0, :cond_10
 
@@ -525,7 +525,7 @@
 
     if-ge p1, v3, :cond_6
 
-    iget-object v3, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAa:[B
+    iget-object v3, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAu:[B
 
     invoke-static {v3, v0, p1}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->a([B[[BI)Ljava/lang/String;
 
@@ -563,11 +563,11 @@
 
     if-ge v5, v6, :cond_8
 
-    sget-object v6, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzU:[B
+    sget-object v6, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAo:[B
 
     aput-object v6, p1, v5
 
-    iget-object v6, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAa:[B
+    iget-object v6, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAu:[B
 
     invoke-static {v6, p1, v5}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->a([B[[BI)Ljava/lang/String;
 
@@ -595,7 +595,7 @@
 
     if-ge v1, p1, :cond_a
 
-    iget-object p1, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAb:[B
+    iget-object p1, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAv:[B
 
     invoke-static {p1, v0, v1}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->a([B[[BI)Ljava/lang/String;
 
@@ -639,7 +639,7 @@
 
     if-nez v6, :cond_c
 
-    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzW:[Ljava/lang/String;
+    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAq:[Ljava/lang/String;
 
     return-object p1
 
@@ -655,7 +655,7 @@
     goto :goto_c
 
     :cond_d
-    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzV:[Ljava/lang/String;
+    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAp:[Ljava/lang/String;
 
     :goto_c
     if-eqz v6, :cond_e
@@ -669,7 +669,7 @@
     goto :goto_d
 
     :cond_e
-    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bzV:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bAp:[Ljava/lang/String;
 
     :goto_d
     array-length v1, p1
@@ -711,7 +711,7 @@
 
 
 # virtual methods
-.method public final eG(Ljava/lang/String;)Ljava/lang/String;
+.method public final eB(Ljava/lang/String;)Ljava/lang/String;
     .locals 7
 
     if-eqz p1, :cond_3
diff --git a/com.discord/smali_classes2/okhttp3/j$1.smali b/com.discord/smali_classes2/okhttp3/j$1.smali
index ef138ce01f..f611033227 100644
--- a/com.discord/smali_classes2/okhttp3/j$1.smali
+++ b/com.discord/smali_classes2/okhttp3/j$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bsR:Lokhttp3/j;
+.field final synthetic btl:Lokhttp3/j;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/j;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/j$1;->bsR:Lokhttp3/j;
+    iput-object p1, p0, Lokhttp3/j$1;->btl:Lokhttp3/j;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,7 +39,7 @@
 
     :cond_0
     :goto_0
-    iget-object v0, p0, Lokhttp3/j$1;->bsR:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/j$1;->btl:Lokhttp3/j;
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
@@ -72,12 +72,12 @@
 
     sub-long/2addr v0, v2
 
-    iget-object v2, p0, Lokhttp3/j$1;->bsR:Lokhttp3/j;
+    iget-object v2, p0, Lokhttp3/j$1;->btl:Lokhttp3/j;
 
     monitor-enter v2
 
     :try_start_0
-    iget-object v3, p0, Lokhttp3/j$1;->bsR:Lokhttp3/j;
+    iget-object v3, p0, Lokhttp3/j$1;->btl:Lokhttp3/j;
 
     long-to-int v1, v0
 
diff --git a/com.discord/smali_classes2/okhttp3/j.smali b/com.discord/smali_classes2/okhttp3/j.smali
index 8ef86b6276..ff29e52714 100644
--- a/com.discord/smali_classes2/okhttp3/j.smali
+++ b/com.discord/smali_classes2/okhttp3/j.smali
@@ -10,13 +10,13 @@
 
 
 # instance fields
-.field final bsL:I
+.field final btf:I
 
-.field private final bsM:J
+.field private final btg:J
 
-.field final bsN:Ljava/lang/Runnable;
+.field final bth:Ljava/lang/Runnable;
 
-.field final bsO:Ljava/util/Deque;
+.field final bti:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -26,9 +26,9 @@
     .end annotation
 .end field
 
-.field final bsP:Lokhttp3/internal/b/d;
+.field final btj:Lokhttp3/internal/b/d;
 
-.field bsQ:Z
+.field btk:Z
 
 
 # direct methods
@@ -85,23 +85,23 @@
 
     invoke-direct {v0, p0}, Lokhttp3/j$1;-><init>(Lokhttp3/j;)V
 
-    iput-object v0, p0, Lokhttp3/j;->bsN:Ljava/lang/Runnable;
+    iput-object v0, p0, Lokhttp3/j;->bth:Ljava/lang/Runnable;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/j;->bsO:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/j;->bti:Ljava/util/Deque;
 
     new-instance v0, Lokhttp3/internal/b/d;
 
     invoke-direct {v0}, Lokhttp3/internal/b/d;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/j;->bsP:Lokhttp3/internal/b/d;
+    iput-object v0, p0, Lokhttp3/j;->btj:Lokhttp3/internal/b/d;
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lokhttp3/j;->bsL:I
+    iput v0, p0, Lokhttp3/j;->btf:I
 
     const-wide/16 v0, 0x5
 
@@ -109,7 +109,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lokhttp3/j;->bsM:J
+    iput-wide v0, p0, Lokhttp3/j;->btg:J
 
     return-void
 .end method
@@ -122,7 +122,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/j;->bsO:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/j;->bti:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
 
@@ -154,7 +154,7 @@
 
     check-cast v7, Lokhttp3/internal/b/c;
 
-    iget-object v8, v7, Lokhttp3/internal/b/c;->bwE:Ljava/util/List;
+    iget-object v8, v7, Lokhttp3/internal/b/c;->bwY:Ljava/util/List;
 
     const/4 v9, 0x0
 
@@ -191,11 +191,11 @@
 
     invoke-direct {v11, v12}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v12, v7, Lokhttp3/internal/b/c;->bww:Lokhttp3/y;
+    iget-object v12, v7, Lokhttp3/internal/b/c;->bwQ:Lokhttp3/y;
 
-    iget-object v12, v12, Lokhttp3/y;->bvo:Lokhttp3/a;
+    iget-object v12, v12, Lokhttp3/y;->bvI:Lokhttp3/a;
 
-    iget-object v12, v12, Lokhttp3/a;->bpQ:Lokhttp3/s;
+    iget-object v12, v12, Lokhttp3/a;->bqk:Lokhttp3/s;
 
     invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -207,11 +207,11 @@
 
     move-result-object v11
 
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v12
 
-    iget-object v10, v10, Lokhttp3/internal/b/g$a;->bwR:Ljava/lang/Object;
+    iget-object v10, v10, Lokhttp3/internal/b/g$a;->bxl:Ljava/lang/Object;
 
     invoke-virtual {v12, v11, v10}, Lokhttp3/internal/g/f;->t(Ljava/lang/String;Ljava/lang/Object;)V
 
@@ -219,7 +219,7 @@
 
     const/4 v10, 0x1
 
-    iput-boolean v10, v7, Lokhttp3/internal/b/c;->bwB:Z
+    iput-boolean v10, v7, Lokhttp3/internal/b/c;->bwV:Z
 
     invoke-interface {v8}, Ljava/util/List;->isEmpty()Z
 
@@ -227,11 +227,11 @@
 
     if-eqz v10, :cond_1
 
-    iget-wide v8, p0, Lokhttp3/j;->bsM:J
+    iget-wide v8, p0, Lokhttp3/j;->btg:J
 
     sub-long v8, p1, v8
 
-    iput-wide v8, v7, Lokhttp3/internal/b/c;->bwF:J
+    iput-wide v8, v7, Lokhttp3/internal/b/c;->bwZ:J
 
     const/4 v8, 0x0
 
@@ -252,7 +252,7 @@
     :cond_4
     add-int/lit8 v2, v2, 0x1
 
-    iget-wide v8, v7, Lokhttp3/internal/b/c;->bwF:J
+    iget-wide v8, v7, Lokhttp3/internal/b/c;->bwZ:J
 
     sub-long v8, p1, v8
 
@@ -267,13 +267,13 @@
     goto :goto_0
 
     :cond_5
-    iget-wide p1, p0, Lokhttp3/j;->bsM:J
+    iget-wide p1, p0, Lokhttp3/j;->btg:J
 
     cmp-long v0, v3, p1
 
     if-gez v0, :cond_9
 
-    iget p1, p0, Lokhttp3/j;->bsL:I
+    iget p1, p0, Lokhttp3/j;->btf:I
 
     if-le v2, p1, :cond_6
 
@@ -282,7 +282,7 @@
     :cond_6
     if-lez v2, :cond_7
 
-    iget-wide p1, p0, Lokhttp3/j;->bsM:J
+    iget-wide p1, p0, Lokhttp3/j;->btg:J
 
     sub-long/2addr p1, v3
 
@@ -293,14 +293,14 @@
     :cond_7
     if-lez v6, :cond_8
 
-    iget-wide p1, p0, Lokhttp3/j;->bsM:J
+    iget-wide p1, p0, Lokhttp3/j;->btg:J
 
     monitor-exit p0
 
     return-wide p1
 
     :cond_8
-    iput-boolean v1, p0, Lokhttp3/j;->bsQ:Z
+    iput-boolean v1, p0, Lokhttp3/j;->btk:Z
 
     const-wide/16 p1, -0x1
 
@@ -310,7 +310,7 @@
 
     :cond_9
     :goto_3
-    iget-object p1, p0, Lokhttp3/j;->bsO:Ljava/util/Deque;
+    iget-object p1, p0, Lokhttp3/j;->bti:Ljava/util/Deque;
 
     invoke-interface {p1, v5}, Ljava/util/Deque;->remove(Ljava/lang/Object;)Z
 
@@ -318,7 +318,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, v5, Lokhttp3/internal/b/c;->bwy:Ljava/net/Socket;
+    iget-object p1, v5, Lokhttp3/internal/b/c;->bwS:Ljava/net/Socket;
 
     invoke-static {p1}, Lokhttp3/internal/c;->a(Ljava/net/Socket;)V
 
diff --git a/com.discord/smali_classes2/okhttp3/m.smali b/com.discord/smali_classes2/okhttp3/m.smali
index d7eb9698fb..cfffaae212 100644
--- a/com.discord/smali_classes2/okhttp3/m.smali
+++ b/com.discord/smali_classes2/okhttp3/m.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final btm:Lokhttp3/m;
+.field public static final btG:Lokhttp3/m;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/m$1;-><init>()V
 
-    sput-object v0, Lokhttp3/m;->btm:Lokhttp3/m;
+    sput-object v0, Lokhttp3/m;->btG:Lokhttp3/m;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/o$1.smali b/com.discord/smali_classes2/okhttp3/o$1.smali
index 22b0f48125..044d25e968 100644
--- a/com.discord/smali_classes2/okhttp3/o$1.smali
+++ b/com.discord/smali_classes2/okhttp3/o$1.smali
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public final ed(Ljava/lang/String;)Ljava/util/List;
+.method public final dX(Ljava/lang/String;)Ljava/util/List;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/okhttp3/o.smali b/com.discord/smali_classes2/okhttp3/o.smali
index da53f2eb59..b11bcd62ac 100644
--- a/com.discord/smali_classes2/okhttp3/o.smali
+++ b/com.discord/smali_classes2/okhttp3/o.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final btt:Lokhttp3/o;
+.field public static final btN:Lokhttp3/o;
 
 
 # direct methods
@@ -15,14 +15,14 @@
 
     invoke-direct {v0}, Lokhttp3/o$1;-><init>()V
 
-    sput-object v0, Lokhttp3/o;->btt:Lokhttp3/o;
+    sput-object v0, Lokhttp3/o;->btN:Lokhttp3/o;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public abstract ed(Ljava/lang/String;)Ljava/util/List;
+.method public abstract dX(Ljava/lang/String;)Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
diff --git a/com.discord/smali_classes2/okhttp3/p$2.smali b/com.discord/smali_classes2/okhttp3/p$2.smali
index 3ee6dc398d..1d61654e7d 100644
--- a/com.discord/smali_classes2/okhttp3/p$2.smali
+++ b/com.discord/smali_classes2/okhttp3/p$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic btv:Lokhttp3/p;
+.field final synthetic btP:Lokhttp3/p;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/p;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/p$2;->btv:Lokhttp3/p;
+    iput-object p1, p0, Lokhttp3/p$2;->btP:Lokhttp3/p;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,10 +34,10 @@
 
 
 # virtual methods
-.method public final Gy()Lokhttp3/p;
+.method public final Gn()Lokhttp3/p;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/p$2;->btv:Lokhttp3/p;
+    iget-object v0, p0, Lokhttp3/p$2;->btP:Lokhttp3/p;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/p$a.smali b/com.discord/smali_classes2/okhttp3/p$a.smali
index bfbd141830..9ceffdd343 100644
--- a/com.discord/smali_classes2/okhttp3/p$a.smali
+++ b/com.discord/smali_classes2/okhttp3/p$a.smali
@@ -15,5 +15,5 @@
 
 
 # virtual methods
-.method public abstract Gy()Lokhttp3/p;
+.method public abstract Gn()Lokhttp3/p;
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/p.smali b/com.discord/smali_classes2/okhttp3/p.smali
index 7244e98515..d1dd83ea6e 100644
--- a/com.discord/smali_classes2/okhttp3/p.smali
+++ b/com.discord/smali_classes2/okhttp3/p.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field public static final btu:Lokhttp3/p;
+.field public static final btO:Lokhttp3/p;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Lokhttp3/p$1;-><init>()V
 
-    sput-object v0, Lokhttp3/p;->btu:Lokhttp3/p;
+    sput-object v0, Lokhttp3/p;->btO:Lokhttp3/p;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/q$a.smali b/com.discord/smali_classes2/okhttp3/q$a.smali
index 70fb467fd4..a0f224d0ac 100644
--- a/com.discord/smali_classes2/okhttp3/q$a.smali
+++ b/com.discord/smali_classes2/okhttp3/q$a.smali
@@ -15,9 +15,7 @@
 
 
 # instance fields
-.field private final btA:Ljava/nio/charset/Charset;
-
-.field public final btz:Ljava/util/List;
+.field public final btT:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -27,6 +25,8 @@
     .end annotation
 .end field
 
+.field private final btU:Ljava/nio/charset/Charset;
+
 .field public final names:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -64,11 +64,11 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/q$a;->btz:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/q$a;->btT:Ljava/util/List;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lokhttp3/q$a;->btA:Ljava/nio/charset/Charset;
+    iput-object p1, p0, Lokhttp3/q$a;->btU:Ljava/nio/charset/Charset;
 
     return-void
 .end method
@@ -84,7 +84,7 @@
 
     iget-object v0, p0, Lokhttp3/q$a;->names:Ljava/util/List;
 
-    iget-object v1, p0, Lokhttp3/q$a;->btA:Ljava/nio/charset/Charset;
+    iget-object v1, p0, Lokhttp3/q$a;->btU:Ljava/nio/charset/Charset;
 
     const/4 v2, 0x0
 
@@ -96,9 +96,9 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lokhttp3/q$a;->btz:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/q$a;->btT:Ljava/util/List;
 
-    iget-object v0, p0, Lokhttp3/q$a;->btA:Ljava/nio/charset/Charset;
+    iget-object v0, p0, Lokhttp3/q$a;->btU:Ljava/nio/charset/Charset;
 
     invoke-static {p2, v3, v2, v0}, Lokhttp3/s;->a(Ljava/lang/String;Ljava/lang/String;ZLjava/nio/charset/Charset;)Ljava/lang/String;
 
@@ -136,7 +136,7 @@
 
     iget-object v0, p0, Lokhttp3/q$a;->names:Ljava/util/List;
 
-    iget-object v1, p0, Lokhttp3/q$a;->btA:Ljava/nio/charset/Charset;
+    iget-object v1, p0, Lokhttp3/q$a;->btU:Ljava/nio/charset/Charset;
 
     const/4 v2, 0x1
 
@@ -148,9 +148,9 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lokhttp3/q$a;->btz:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/q$a;->btT:Ljava/util/List;
 
-    iget-object v0, p0, Lokhttp3/q$a;->btA:Ljava/nio/charset/Charset;
+    iget-object v0, p0, Lokhttp3/q$a;->btU:Ljava/nio/charset/Charset;
 
     invoke-static {p2, v3, v2, v0}, Lokhttp3/s;->a(Ljava/lang/String;Ljava/lang/String;ZLjava/nio/charset/Charset;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/okhttp3/u.smali b/com.discord/smali_classes2/okhttp3/u.smali
index 9fa819c41c..e7c2160bf1 100644
--- a/com.discord/smali_classes2/okhttp3/u.smali
+++ b/com.discord/smali_classes2/okhttp3/u.smali
@@ -14,19 +14,19 @@
 
 
 # static fields
-.field public static final enum buC:Lokhttp3/u;
+.field public static final enum buW:Lokhttp3/u;
 
-.field public static final enum buD:Lokhttp3/u;
+.field public static final enum buX:Lokhttp3/u;
 
-.field public static final enum buE:Lokhttp3/u;
+.field public static final enum buY:Lokhttp3/u;
 
-.field public static final enum buF:Lokhttp3/u;
+.field public static final enum buZ:Lokhttp3/u;
 
-.field public static final enum buG:Lokhttp3/u;
+.field public static final enum bva:Lokhttp3/u;
 
-.field public static final enum buH:Lokhttp3/u;
+.field public static final enum bvb:Lokhttp3/u;
 
-.field private static final synthetic buI:[Lokhttp3/u;
+.field private static final synthetic bvc:[Lokhttp3/u;
 
 
 # instance fields
@@ -47,7 +47,7 @@
 
     invoke-direct {v0, v2, v1, v3}, Lokhttp3/u;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/u;->buC:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->buW:Lokhttp3/u;
 
     new-instance v0, Lokhttp3/u;
 
@@ -59,7 +59,7 @@
 
     invoke-direct {v0, v3, v2, v4}, Lokhttp3/u;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/u;->buD:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->buX:Lokhttp3/u;
 
     new-instance v0, Lokhttp3/u;
 
@@ -71,7 +71,7 @@
 
     invoke-direct {v0, v4, v3, v5}, Lokhttp3/u;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/u;->buE:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->buY:Lokhttp3/u;
 
     new-instance v0, Lokhttp3/u;
 
@@ -83,7 +83,7 @@
 
     invoke-direct {v0, v5, v4, v6}, Lokhttp3/u;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/u;->buF:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->buZ:Lokhttp3/u;
 
     new-instance v0, Lokhttp3/u;
 
@@ -95,7 +95,7 @@
 
     invoke-direct {v0, v6, v5, v7}, Lokhttp3/u;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/u;->buG:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bva:Lokhttp3/u;
 
     new-instance v0, Lokhttp3/u;
 
@@ -107,37 +107,37 @@
 
     invoke-direct {v0, v7, v6, v8}, Lokhttp3/u;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/u;->buH:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bvb:Lokhttp3/u;
 
     const/4 v0, 0x6
 
     new-array v0, v0, [Lokhttp3/u;
 
-    sget-object v7, Lokhttp3/u;->buC:Lokhttp3/u;
+    sget-object v7, Lokhttp3/u;->buW:Lokhttp3/u;
 
     aput-object v7, v0, v1
 
-    sget-object v1, Lokhttp3/u;->buD:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->buX:Lokhttp3/u;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lokhttp3/u;->buE:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->buY:Lokhttp3/u;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/u;->buF:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->buZ:Lokhttp3/u;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/u;->buG:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bva:Lokhttp3/u;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lokhttp3/u;->buH:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bvb:Lokhttp3/u;
 
     aput-object v1, v0, v6
 
-    sput-object v0, Lokhttp3/u;->buI:[Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bvc:[Lokhttp3/u;
 
     return-void
 .end method
@@ -159,7 +159,7 @@
     return-void
 .end method
 
-.method public static ep(Ljava/lang/String;)Lokhttp3/u;
+.method public static ej(Ljava/lang/String;)Lokhttp3/u;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -167,7 +167,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/u;->buC:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->buW:Lokhttp3/u;
 
     iget-object v0, v0, Lokhttp3/u;->protocol:Ljava/lang/String;
 
@@ -177,12 +177,12 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p0, Lokhttp3/u;->buC:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->buW:Lokhttp3/u;
 
     return-object p0
 
     :cond_0
-    sget-object v0, Lokhttp3/u;->buD:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->buX:Lokhttp3/u;
 
     iget-object v0, v0, Lokhttp3/u;->protocol:Ljava/lang/String;
 
@@ -192,12 +192,12 @@
 
     if-eqz v0, :cond_1
 
-    sget-object p0, Lokhttp3/u;->buD:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->buX:Lokhttp3/u;
 
     return-object p0
 
     :cond_1
-    sget-object v0, Lokhttp3/u;->buG:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bva:Lokhttp3/u;
 
     iget-object v0, v0, Lokhttp3/u;->protocol:Ljava/lang/String;
 
@@ -207,12 +207,12 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p0, Lokhttp3/u;->buG:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bva:Lokhttp3/u;
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lokhttp3/u;->buF:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->buZ:Lokhttp3/u;
 
     iget-object v0, v0, Lokhttp3/u;->protocol:Ljava/lang/String;
 
@@ -222,12 +222,12 @@
 
     if-eqz v0, :cond_3
 
-    sget-object p0, Lokhttp3/u;->buF:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->buZ:Lokhttp3/u;
 
     return-object p0
 
     :cond_3
-    sget-object v0, Lokhttp3/u;->buE:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->buY:Lokhttp3/u;
 
     iget-object v0, v0, Lokhttp3/u;->protocol:Ljava/lang/String;
 
@@ -237,12 +237,12 @@
 
     if-eqz v0, :cond_4
 
-    sget-object p0, Lokhttp3/u;->buE:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->buY:Lokhttp3/u;
 
     return-object p0
 
     :cond_4
-    sget-object v0, Lokhttp3/u;->buH:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bvb:Lokhttp3/u;
 
     iget-object v0, v0, Lokhttp3/u;->protocol:Ljava/lang/String;
 
@@ -252,7 +252,7 @@
 
     if-eqz v0, :cond_5
 
-    sget-object p0, Lokhttp3/u;->buH:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bvb:Lokhttp3/u;
 
     return-object p0
 
@@ -291,7 +291,7 @@
 .method public static values()[Lokhttp3/u;
     .locals 1
 
-    sget-object v0, Lokhttp3/u;->buI:[Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bvc:[Lokhttp3/u;
 
     invoke-virtual {v0}, [Lokhttp3/u;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/okhttp3/v$1.smali b/com.discord/smali_classes2/okhttp3/v$1.smali
index 71bdd60875..a3f7b4baf4 100644
--- a/com.discord/smali_classes2/okhttp3/v$1.smali
+++ b/com.discord/smali_classes2/okhttp3/v$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic buQ:Lokhttp3/v;
+.field final synthetic bvk:Lokhttp3/v;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/v;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/v$1;->buQ:Lokhttp3/v;
+    iput-object p1, p0, Lokhttp3/v$1;->bvk:Lokhttp3/v;
 
     invoke-direct {p0}, Lokio/a;-><init>()V
 
@@ -31,12 +31,12 @@
 
 
 # virtual methods
-.method public final GW()V
+.method public final GK()V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v$1;->buQ:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$1;->bvk:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->buK:Lokhttp3/internal/c/j;
+    iget-object v0, v0, Lokhttp3/v;->bve:Lokhttp3/internal/c/j;
 
     invoke-virtual {v0}, Lokhttp3/internal/c/j;->cancel()V
 
diff --git a/com.discord/smali_classes2/okhttp3/v$a.smali b/com.discord/smali_classes2/okhttp3/v$a.smali
index 1a7bc04896..4a5145df10 100644
--- a/com.discord/smali_classes2/okhttp3/v$a.smali
+++ b/com.discord/smali_classes2/okhttp3/v$a.smali
@@ -19,9 +19,9 @@
 
 
 # instance fields
-.field final synthetic buQ:Lokhttp3/v;
+.field final synthetic bvk:Lokhttp3/v;
 
-.field final buR:Lokhttp3/f;
+.field final bvl:Lokhttp3/f;
 
 
 # direct methods
@@ -36,13 +36,13 @@
 .method constructor <init>(Lokhttp3/v;Lokhttp3/f;)V
     .locals 2
 
-    iput-object p1, p0, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iput-object p1, p0, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lokhttp3/v;->GU()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/v;->GI()Ljava/lang/String;
 
     move-result-object p1
 
@@ -54,23 +54,23 @@
 
     invoke-direct {p0, p1, v0}, Lokhttp3/internal/b;-><init>(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    iput-object p2, p0, Lokhttp3/v$a;->buR:Lokhttp3/f;
+    iput-object p2, p0, Lokhttp3/v$a;->bvl:Lokhttp3/f;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final GX()Ljava/lang/String;
+.method final GL()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->buN:Lokhttp3/w;
+    iget-object v0, v0, Lokhttp3/v;->bvh:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bpQ:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bqk:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->btJ:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->bud:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -78,9 +78,9 @@
 .method public final execute()V
     .locals 7
 
-    iget-object v0, p0, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->buL:Lokio/a;
+    iget-object v0, v0, Lokhttp3/v;->bvf:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
@@ -89,17 +89,17 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v2, p0, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
-    invoke-virtual {v2}, Lokhttp3/v;->GV()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/v;->GJ()Lokhttp3/Response;
 
     move-result-object v2
 
-    iget-object v3, p0, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v3, p0, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
-    iget-object v3, v3, Lokhttp3/v;->buK:Lokhttp3/internal/c/j;
+    iget-object v3, v3, Lokhttp3/v;->bve:Lokhttp3/internal/c/j;
 
-    iget-boolean v1, v3, Lokhttp3/internal/c/j;->bwW:Z
+    iget-boolean v1, v3, Lokhttp3/internal/c/j;->bxq:Z
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -107,7 +107,7 @@
     if-eqz v1, :cond_0
 
     :try_start_1
-    iget-object v1, p0, Lokhttp3/v$a;->buR:Lokhttp3/f;
+    iget-object v1, p0, Lokhttp3/v$a;->bvl:Lokhttp3/f;
 
     new-instance v2, Ljava/io/IOException;
 
@@ -120,9 +120,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lokhttp3/v$a;->buR:Lokhttp3/f;
+    iget-object v1, p0, Lokhttp3/v$a;->bvl:Lokhttp3/f;
 
-    iget-object v3, p0, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v3, p0, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
     invoke-interface {v1, v3, v2}, Lokhttp3/f;->a(Lokhttp3/e;Lokhttp3/Response;)V
     :try_end_1
@@ -130,11 +130,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object v0, p0, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v0, v0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->bun:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->buH:Lokhttp3/n;
 
     :goto_1
     invoke-virtual {v0, p0}, Lokhttp3/n;->b(Lokhttp3/v$a;)V
@@ -160,7 +160,7 @@
 
     :goto_2
     :try_start_2
-    iget-object v2, p0, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v2, p0, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
     invoke-virtual {v2, v1}, Lokhttp3/v;->b(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -168,7 +168,7 @@
 
     if-eqz v0, :cond_3
 
-    invoke-static {}, Lokhttp3/internal/g/f;->If()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->HS()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -180,15 +180,15 @@
 
     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, p0, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v4, p0, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
     new-instance v5, Ljava/lang/StringBuilder;
 
     invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v6, v4, Lokhttp3/v;->buK:Lokhttp3/internal/c/j;
+    iget-object v6, v4, Lokhttp3/v;->bve:Lokhttp3/internal/c/j;
 
-    iget-boolean v6, v6, Lokhttp3/internal/c/j;->bwW:Z
+    iget-boolean v6, v6, Lokhttp3/internal/c/j;->bxq:Z
 
     if-eqz v6, :cond_1
 
@@ -202,7 +202,7 @@
     :goto_3
     invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v6, v4, Lokhttp3/v;->buO:Z
+    iget-boolean v6, v4, Lokhttp3/v;->bvi:Z
 
     if-eqz v6, :cond_2
 
@@ -220,7 +220,7 @@
 
     invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v4}, Lokhttp3/v;->GU()Ljava/lang/String;
+    invoke-virtual {v4}, Lokhttp3/v;->GI()Ljava/lang/String;
 
     move-result-object v4
 
@@ -241,31 +241,31 @@
     goto :goto_5
 
     :cond_3
-    iget-object v0, p0, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
     invoke-static {v0}, Lokhttp3/v;->c(Lokhttp3/v;)Lokhttp3/p;
 
-    iget-object v0, p0, Lokhttp3/v$a;->buR:Lokhttp3/f;
+    iget-object v0, p0, Lokhttp3/v$a;->bvl:Lokhttp3/f;
 
     invoke-interface {v0, v1}, Lokhttp3/f;->a(Ljava/io/IOException;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :goto_5
-    iget-object v0, p0, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v0, v0, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->bun:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->buH:Lokhttp3/n;
 
     goto :goto_1
 
     :goto_6
-    iget-object v1, p0, Lokhttp3/v$a;->buQ:Lokhttp3/v;
+    iget-object v1, p0, Lokhttp3/v$a;->bvk:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->buJ:Lokhttp3/t;
+    iget-object v1, v1, Lokhttp3/v;->bvd:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->bun:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->buH:Lokhttp3/n;
 
     invoke-virtual {v1, p0}, Lokhttp3/n;->b(Lokhttp3/v$a;)V
 
diff --git a/com.discord/smali_classes2/okhttp3/z.smali b/com.discord/smali_classes2/okhttp3/z.smali
index efd6e6cbb4..f5445f57d2 100644
--- a/com.discord/smali_classes2/okhttp3/z.smali
+++ b/com.discord/smali_classes2/okhttp3/z.smali
@@ -14,17 +14,17 @@
 
 
 # static fields
-.field public static final enum bvq:Lokhttp3/z;
+.field public static final enum bvK:Lokhttp3/z;
 
-.field public static final enum bvr:Lokhttp3/z;
+.field public static final enum bvL:Lokhttp3/z;
 
-.field public static final enum bvs:Lokhttp3/z;
+.field public static final enum bvM:Lokhttp3/z;
 
-.field public static final enum bvt:Lokhttp3/z;
+.field public static final enum bvN:Lokhttp3/z;
 
-.field public static final enum bvu:Lokhttp3/z;
+.field public static final enum bvO:Lokhttp3/z;
 
-.field private static final synthetic bvv:[Lokhttp3/z;
+.field private static final synthetic bvP:[Lokhttp3/z;
 
 
 # instance fields
@@ -45,7 +45,7 @@
 
     invoke-direct {v0, v2, v1, v3}, Lokhttp3/z;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/z;->bvq:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bvK:Lokhttp3/z;
 
     new-instance v0, Lokhttp3/z;
 
@@ -57,7 +57,7 @@
 
     invoke-direct {v0, v3, v2, v4}, Lokhttp3/z;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/z;->bvr:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bvL:Lokhttp3/z;
 
     new-instance v0, Lokhttp3/z;
 
@@ -69,7 +69,7 @@
 
     invoke-direct {v0, v4, v3, v5}, Lokhttp3/z;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/z;->bvs:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bvM:Lokhttp3/z;
 
     new-instance v0, Lokhttp3/z;
 
@@ -81,7 +81,7 @@
 
     invoke-direct {v0, v5, v4, v6}, Lokhttp3/z;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/z;->bvt:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bvN:Lokhttp3/z;
 
     new-instance v0, Lokhttp3/z;
 
@@ -93,33 +93,33 @@
 
     invoke-direct {v0, v6, v5, v7}, Lokhttp3/z;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
-    sput-object v0, Lokhttp3/z;->bvu:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bvO:Lokhttp3/z;
 
     const/4 v0, 0x5
 
     new-array v0, v0, [Lokhttp3/z;
 
-    sget-object v6, Lokhttp3/z;->bvq:Lokhttp3/z;
+    sget-object v6, Lokhttp3/z;->bvK:Lokhttp3/z;
 
     aput-object v6, v0, v1
 
-    sget-object v1, Lokhttp3/z;->bvr:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->bvL:Lokhttp3/z;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lokhttp3/z;->bvs:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->bvM:Lokhttp3/z;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/z;->bvt:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->bvN:Lokhttp3/z;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/z;->bvu:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->bvO:Lokhttp3/z;
 
     aput-object v1, v0, v5
 
-    sput-object v0, Lokhttp3/z;->bvv:[Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bvP:[Lokhttp3/z;
 
     return-void
 .end method
@@ -169,7 +169,7 @@
 
     aget-object v3, p0, v2
 
-    invoke-static {v3}, Lokhttp3/z;->es(Ljava/lang/String;)Lokhttp3/z;
+    invoke-static {v3}, Lokhttp3/z;->en(Ljava/lang/String;)Lokhttp3/z;
 
     move-result-object v3
 
@@ -187,7 +187,7 @@
     return-object p0
 .end method
 
-.method public static es(Ljava/lang/String;)Lokhttp3/z;
+.method public static en(Ljava/lang/String;)Lokhttp3/z;
     .locals 6
 
     invoke-virtual {p0}, Ljava/lang/String;->hashCode()I
@@ -294,7 +294,7 @@
 
     if-ne v0, v2, :cond_3
 
-    sget-object p0, Lokhttp3/z;->bvu:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bvO:Lokhttp3/z;
 
     return-object p0
 
@@ -316,22 +316,22 @@
     throw v0
 
     :cond_4
-    sget-object p0, Lokhttp3/z;->bvt:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bvN:Lokhttp3/z;
 
     return-object p0
 
     :cond_5
-    sget-object p0, Lokhttp3/z;->bvs:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bvM:Lokhttp3/z;
 
     return-object p0
 
     :cond_6
-    sget-object p0, Lokhttp3/z;->bvr:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bvL:Lokhttp3/z;
 
     return-object p0
 
     :cond_7
-    sget-object p0, Lokhttp3/z;->bvq:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bvK:Lokhttp3/z;
 
     return-object p0
 
@@ -360,7 +360,7 @@
 .method public static values()[Lokhttp3/z;
     .locals 1
 
-    sget-object v0, Lokhttp3/z;->bvv:[Lokhttp3/z;
+    sget-object v0, Lokhttp3/z;->bvP:[Lokhttp3/z;
 
     invoke-virtual {v0}, [Lokhttp3/z;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/okio/ByteString.smali b/com.discord/smali_classes2/okio/ByteString.smali
index 9323e64ea2..d297d03c99 100644
--- a/com.discord/smali_classes2/okio/ByteString.smali
+++ b/com.discord/smali_classes2/okio/ByteString.smali
@@ -20,15 +20,15 @@
 
 
 # static fields
-.field public static final bBs:Lokio/ByteString;
+.field public static final bBM:Lokio/ByteString;
 
-.field static final btH:[C
+.field static final bub:[C
 
 .field private static final serialVersionUID:J = 0x1L
 
 
 # instance fields
-.field transient bBt:Ljava/lang/String;
+.field transient bBN:Ljava/lang/String;
 
 .field transient cG:I
 
@@ -45,7 +45,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lokio/ByteString;->btH:[C
+    sput-object v0, Lokio/ByteString;->bub:[C
 
     const/4 v0, 0x0
 
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokio/ByteString;->bBs:Lokio/ByteString;
+    sput-object v0, Lokio/ByteString;->bBM:Lokio/ByteString;
 
     return-void
 
@@ -185,7 +185,7 @@
     goto :goto_1
 .end method
 
-.method public static eK(Ljava/lang/String;)Lokio/ByteString;
+.method public static eF(Ljava/lang/String;)Lokio/ByteString;
     .locals 2
 
     if-eqz p0, :cond_0
@@ -200,7 +200,7 @@
 
     invoke-direct {v0, v1}, Lokio/ByteString;-><init>([B)V
 
-    iput-object p0, v0, Lokio/ByteString;->bBt:Ljava/lang/String;
+    iput-object p0, v0, Lokio/ByteString;->bBN:Ljava/lang/String;
 
     return-object v0
 
@@ -214,7 +214,7 @@
     throw p0
 .end method
 
-.method private eL(Ljava/lang/String;)Lokio/ByteString;
+.method private eG(Ljava/lang/String;)Lokio/ByteString;
     .locals 1
 
     :try_start_0
@@ -246,7 +246,7 @@
     throw v0
 .end method
 
-.method public static eM(Ljava/lang/String;)Lokio/ByteString;
+.method public static eH(Ljava/lang/String;)Lokio/ByteString;
     .locals 4
 
     invoke-virtual {p0}, Ljava/lang/String;->length()I
@@ -476,10 +476,10 @@
 
 
 # virtual methods
-.method public IF()Ljava/lang/String;
+.method public Is()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lokio/ByteString;->bBt:Ljava/lang/String;
+    iget-object v0, p0, Lokio/ByteString;->bBN:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -494,12 +494,12 @@
 
     invoke-direct {v0, v1, v2}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
 
-    iput-object v0, p0, Lokio/ByteString;->bBt:Ljava/lang/String;
+    iput-object v0, p0, Lokio/ByteString;->bBN:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public IG()Ljava/lang/String;
+.method public It()Ljava/lang/String;
     .locals 1
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
@@ -511,31 +511,31 @@
     return-object v0
 .end method
 
-.method public IH()Lokio/ByteString;
+.method public Iu()Lokio/ByteString;
     .locals 1
 
     const-string v0, "SHA-1"
 
-    invoke-direct {p0, v0}, Lokio/ByteString;->eL(Ljava/lang/String;)Lokio/ByteString;
+    invoke-direct {p0, v0}, Lokio/ByteString;->eG(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public II()Lokio/ByteString;
+.method public Iv()Lokio/ByteString;
     .locals 1
 
     const-string v0, "SHA-256"
 
-    invoke-direct {p0, v0}, Lokio/ByteString;->eL(Ljava/lang/String;)Lokio/ByteString;
+    invoke-direct {p0, v0}, Lokio/ByteString;->eG(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public IJ()Ljava/lang/String;
+.method public Iw()Ljava/lang/String;
     .locals 9
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
@@ -559,7 +559,7 @@
 
     add-int/lit8 v6, v4, 0x1
 
-    sget-object v7, Lokio/ByteString;->btH:[C
+    sget-object v7, Lokio/ByteString;->bub:[C
 
     shr-int/lit8 v8, v5, 0x4
 
@@ -589,7 +589,7 @@
     return-object v0
 .end method
 
-.method public IK()Lokio/ByteString;
+.method public Ix()Lokio/ByteString;
     .locals 6
 
     const/4 v0, 0x0
@@ -663,7 +663,7 @@
     return-object p0
 .end method
 
-.method IL()[B
+.method Iy()[B
     .locals 1
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
@@ -685,7 +685,7 @@
     return p1
 .end method
 
-.method public ad(II)Lokio/ByteString;
+.method public ac(II)Lokio/ByteString;
     .locals 3
 
     if-ltz p1, :cond_3
@@ -1015,7 +1015,7 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lokio/ByteString;->IF()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Is()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1106,7 +1106,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lokio/ByteString;->IJ()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Iw()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1135,11 +1135,11 @@
 
     invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p0, v2, v6}, Lokio/ByteString;->ad(II)Lokio/ByteString;
+    invoke-virtual {p0, v2, v6}, Lokio/ByteString;->ac(II)Lokio/ByteString;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/ByteString;->IJ()Ljava/lang/String;
+    invoke-virtual {v2}, Lokio/ByteString;->Iw()Ljava/lang/String;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/okio/a$1.smali b/com.discord/smali_classes2/okio/a$1.smali
index cf89f644be..88b389da7f 100644
--- a/com.discord/smali_classes2/okio/a$1.smali
+++ b/com.discord/smali_classes2/okio/a$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bBi:Lokio/q;
+.field final synthetic bBC:Lokio/q;
 
-.field final synthetic bBj:Lokio/a;
+.field final synthetic bBD:Lokio/a;
 
 
 # direct methods
 .method constructor <init>(Lokio/a;Lokio/q;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/a$1;->bBj:Lokio/a;
+    iput-object p1, p0, Lokio/a$1;->bBD:Lokio/a;
 
-    iput-object p2, p0, Lokio/a$1;->bBi:Lokio/q;
+    iput-object p2, p0, Lokio/a$1;->bBC:Lokio/q;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,23 +46,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$1;->bBj:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->bBD:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$1;->bBi:Lokio/q;
+    iget-object v0, p0, Lokio/a$1;->bBC:Lokio/q;
 
     invoke-interface {v0}, Lokio/q;->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
 
-    iget-object v0, p0, Lokio/a$1;->bBj:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->bBD:Lokio/a;
 
     const/4 v1, 0x1
 
-    invoke-virtual {v0, v1}, Lokio/a;->af(Z)V
+    invoke-virtual {v0, v1}, Lokio/a;->ac(Z)V
 
     return-void
 
@@ -75,7 +75,7 @@
     move-exception v0
 
     :try_start_1
-    iget-object v1, p0, Lokio/a$1;->bBj:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->bBD:Lokio/a;
 
     invoke-virtual {v1, v0}, Lokio/a;->f(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -86,11 +86,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object v1, p0, Lokio/a$1;->bBj:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->bBD:Lokio/a;
 
     const/4 v2, 0x0
 
-    invoke-virtual {v1, v2}, Lokio/a;->af(Z)V
+    invoke-virtual {v1, v2}, Lokio/a;->ac(Z)V
 
     throw v0
 .end method
@@ -103,23 +103,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$1;->bBj:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->bBD:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$1;->bBi:Lokio/q;
+    iget-object v0, p0, Lokio/a$1;->bBC:Lokio/q;
 
     invoke-interface {v0}, Lokio/q;->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
 
-    iget-object v0, p0, Lokio/a$1;->bBj:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->bBD:Lokio/a;
 
     const/4 v1, 0x1
 
-    invoke-virtual {v0, v1}, Lokio/a;->af(Z)V
+    invoke-virtual {v0, v1}, Lokio/a;->ac(Z)V
 
     return-void
 
@@ -132,7 +132,7 @@
     move-exception v0
 
     :try_start_1
-    iget-object v1, p0, Lokio/a$1;->bBj:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->bBD:Lokio/a;
 
     invoke-virtual {v1, v0}, Lokio/a;->f(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -143,11 +143,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object v1, p0, Lokio/a$1;->bBj:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->bBD:Lokio/a;
 
     const/4 v2, 0x0
 
-    invoke-virtual {v1, v2}, Lokio/a;->af(Z)V
+    invoke-virtual {v1, v2}, Lokio/a;->ac(Z)V
 
     throw v0
 .end method
@@ -155,7 +155,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/a$1;->bBj:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->bBD:Lokio/a;
 
     return-object v0
 .end method
@@ -169,7 +169,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokio/a$1;->bBi:Lokio/q;
+    iget-object v1, p0, Lokio/a$1;->bBC:Lokio/q;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -207,7 +207,7 @@
 
     if-lez v2, :cond_2
 
-    iget-object v2, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object v2, p1, Lokio/c;->bBI:Lokio/n;
 
     :goto_1
     const-wide/32 v3, 0x10000
@@ -235,18 +235,18 @@
     goto :goto_2
 
     :cond_0
-    iget-object v2, v2, Lokio/n;->bBI:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bCc:Lokio/n;
 
     goto :goto_1
 
     :cond_1
     :goto_2
-    iget-object v2, p0, Lokio/a$1;->bBj:Lokio/a;
+    iget-object v2, p0, Lokio/a$1;->bBD:Lokio/a;
 
     invoke-virtual {v2}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v2, p0, Lokio/a$1;->bBi:Lokio/q;
+    iget-object v2, p0, Lokio/a$1;->bBC:Lokio/q;
 
     invoke-interface {v2, p1, v0, v1}, Lokio/q;->write(Lokio/c;J)V
     :try_end_0
@@ -255,11 +255,11 @@
 
     sub-long/2addr p2, v0
 
-    iget-object v0, p0, Lokio/a$1;->bBj:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->bBD:Lokio/a;
 
     const/4 v1, 0x1
 
-    invoke-virtual {v0, v1}, Lokio/a;->af(Z)V
+    invoke-virtual {v0, v1}, Lokio/a;->ac(Z)V
 
     goto :goto_0
 
@@ -272,7 +272,7 @@
     move-exception p1
 
     :try_start_1
-    iget-object p2, p0, Lokio/a$1;->bBj:Lokio/a;
+    iget-object p2, p0, Lokio/a$1;->bBD:Lokio/a;
 
     invoke-virtual {p2, p1}, Lokio/a;->f(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -283,11 +283,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_3
-    iget-object p2, p0, Lokio/a$1;->bBj:Lokio/a;
+    iget-object p2, p0, Lokio/a$1;->bBD:Lokio/a;
 
     const/4 p3, 0x0
 
-    invoke-virtual {p2, p3}, Lokio/a;->af(Z)V
+    invoke-virtual {p2, p3}, Lokio/a;->ac(Z)V
 
     throw p1
 
diff --git a/com.discord/smali_classes2/okio/a$2.smali b/com.discord/smali_classes2/okio/a$2.smali
index fa22d308e8..7fcb764ebe 100644
--- a/com.discord/smali_classes2/okio/a$2.smali
+++ b/com.discord/smali_classes2/okio/a$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bBj:Lokio/a;
+.field final synthetic bBD:Lokio/a;
 
-.field final synthetic bBk:Lokio/r;
+.field final synthetic bBE:Lokio/r;
 
 
 # direct methods
 .method constructor <init>(Lokio/a;Lokio/r;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/a$2;->bBj:Lokio/a;
+    iput-object p1, p0, Lokio/a$2;->bBD:Lokio/a;
 
-    iput-object p2, p0, Lokio/a$2;->bBk:Lokio/r;
+    iput-object p2, p0, Lokio/a$2;->bBE:Lokio/r;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,12 +46,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$2;->bBj:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->bBD:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$2;->bBk:Lokio/r;
+    iget-object v0, p0, Lokio/a$2;->bBE:Lokio/r;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/r;->a(Lokio/c;J)J
 
@@ -60,11 +60,11 @@
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p3, p0, Lokio/a$2;->bBj:Lokio/a;
+    iget-object p3, p0, Lokio/a$2;->bBD:Lokio/a;
 
     const/4 v0, 0x1
 
-    invoke-virtual {p3, v0}, Lokio/a;->af(Z)V
+    invoke-virtual {p3, v0}, Lokio/a;->ac(Z)V
 
     return-wide p1
 
@@ -77,7 +77,7 @@
     move-exception p1
 
     :try_start_1
-    iget-object p2, p0, Lokio/a$2;->bBj:Lokio/a;
+    iget-object p2, p0, Lokio/a$2;->bBD:Lokio/a;
 
     invoke-virtual {p2, p1}, Lokio/a;->f(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -88,11 +88,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object p2, p0, Lokio/a$2;->bBj:Lokio/a;
+    iget-object p2, p0, Lokio/a$2;->bBD:Lokio/a;
 
     const/4 p3, 0x0
 
-    invoke-virtual {p2, p3}, Lokio/a;->af(Z)V
+    invoke-virtual {p2, p3}, Lokio/a;->ac(Z)V
 
     throw p1
 .end method
@@ -105,23 +105,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$2;->bBj:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->bBD:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$2;->bBk:Lokio/r;
+    iget-object v0, p0, Lokio/a$2;->bBE:Lokio/r;
 
     invoke-interface {v0}, Lokio/r;->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
 
-    iget-object v0, p0, Lokio/a$2;->bBj:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->bBD:Lokio/a;
 
     const/4 v1, 0x1
 
-    invoke-virtual {v0, v1}, Lokio/a;->af(Z)V
+    invoke-virtual {v0, v1}, Lokio/a;->ac(Z)V
 
     return-void
 
@@ -134,7 +134,7 @@
     move-exception v0
 
     :try_start_1
-    iget-object v1, p0, Lokio/a$2;->bBj:Lokio/a;
+    iget-object v1, p0, Lokio/a$2;->bBD:Lokio/a;
 
     invoke-virtual {v1, v0}, Lokio/a;->f(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -145,11 +145,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object v1, p0, Lokio/a$2;->bBj:Lokio/a;
+    iget-object v1, p0, Lokio/a$2;->bBD:Lokio/a;
 
     const/4 v2, 0x0
 
-    invoke-virtual {v1, v2}, Lokio/a;->af(Z)V
+    invoke-virtual {v1, v2}, Lokio/a;->ac(Z)V
 
     throw v0
 .end method
@@ -157,7 +157,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/a$2;->bBj:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->bBD:Lokio/a;
 
     return-object v0
 .end method
@@ -171,7 +171,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokio/a$2;->bBk:Lokio/r;
+    iget-object v1, p0, Lokio/a$2;->bBE:Lokio/r;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/okio/a$a.smali b/com.discord/smali_classes2/okio/a$a.smali
index d65a3d82ce..8cded5207b 100644
--- a/com.discord/smali_classes2/okio/a$a.smali
+++ b/com.discord/smali_classes2/okio/a$a.smali
@@ -44,7 +44,7 @@
     .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    invoke-static {}, Lokio/a;->Iq()Lokio/a;
+    invoke-static {}, Lokio/a;->Id()Lokio/a;
 
     move-result-object v1
 
@@ -55,13 +55,13 @@
     goto :goto_0
 
     :cond_0
-    sget-object v2, Lokio/a;->bBe:Lokio/a;
+    sget-object v2, Lokio/a;->bBy:Lokio/a;
 
     if-ne v1, v2, :cond_1
 
     const/4 v1, 0x0
 
-    sput-object v1, Lokio/a;->bBe:Lokio/a;
+    sput-object v1, Lokio/a;->bBy:Lokio/a;
 
     monitor-exit v0
 
@@ -73,7 +73,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-virtual {v1}, Lokio/a;->GW()V
+    invoke-virtual {v1}, Lokio/a;->GK()V
     :try_end_2
     .catch Ljava/lang/InterruptedException; {:try_start_2 .. :try_end_2} :catch_0
 
diff --git a/com.discord/smali_classes2/okio/b.smali b/com.discord/smali_classes2/okio/b.smali
index a0cdd48c1d..b8b09beb2a 100644
--- a/com.discord/smali_classes2/okio/b.smali
+++ b/com.discord/smali_classes2/okio/b.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final bBl:[B
+.field private static final bBF:[B
 
-.field private static final bBm:[B
+.field private static final bBG:[B
 
 
 # direct methods
@@ -19,13 +19,13 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lokio/b;->bBl:[B
+    sput-object v1, Lokio/b;->bBF:[B
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lokio/b;->bBm:[B
+    sput-object v0, Lokio/b;->bBG:[B
 
     return-void
 
@@ -171,7 +171,7 @@
 .method public static C([B)Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lokio/b;->bBl:[B
+    sget-object v0, Lokio/b;->bBF:[B
 
     invoke-static {p0, v0}, Lokio/b;->b([B[B)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/okio/c$1.smali b/com.discord/smali_classes2/okio/c$1.smali
index 6bcea731fb..51e0cb6c24 100644
--- a/com.discord/smali_classes2/okio/c$1.smali
+++ b/com.discord/smali_classes2/okio/c$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bBp:Lokio/c;
+.field final synthetic bBJ:Lokio/c;
 
 
 # direct methods
 .method public constructor <init>(Lokio/c;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/c$1;->bBp:Lokio/c;
+    iput-object p1, p0, Lokio/c$1;->bBJ:Lokio/c;
 
     invoke-direct {p0}, Ljava/io/OutputStream;-><init>()V
 
@@ -50,7 +50,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokio/c$1;->bBp:Lokio/c;
+    iget-object v1, p0, Lokio/c$1;->bBJ:Lokio/c;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -68,11 +68,11 @@
 .method public final write(I)V
     .locals 1
 
-    iget-object v0, p0, Lokio/c$1;->bBp:Lokio/c;
+    iget-object v0, p0, Lokio/c$1;->bBJ:Lokio/c;
 
     int-to-byte p1, p1
 
-    invoke-virtual {v0, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v0, p1}, Lokio/c;->dM(I)Lokio/c;
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 .method public final write([BII)V
     .locals 1
 
-    iget-object v0, p0, Lokio/c$1;->bBp:Lokio/c;
+    iget-object v0, p0, Lokio/c$1;->bBJ:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->m([BII)Lokio/c;
 
diff --git a/com.discord/smali_classes2/okio/c$2.smali b/com.discord/smali_classes2/okio/c$2.smali
index fe7cb82ee4..c35f3ffb53 100644
--- a/com.discord/smali_classes2/okio/c$2.smali
+++ b/com.discord/smali_classes2/okio/c$2.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lokio/c;->Iv()Ljava/io/InputStream;
+    value = Lokio/c;->Ii()Ljava/io/InputStream;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bBp:Lokio/c;
+.field final synthetic bBJ:Lokio/c;
 
 
 # direct methods
 .method constructor <init>(Lokio/c;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/c$2;->bBp:Lokio/c;
+    iput-object p1, p0, Lokio/c$2;->bBJ:Lokio/c;
 
     invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final available()I
     .locals 4
 
-    iget-object v0, p0, Lokio/c$2;->bBp:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->bBJ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -58,7 +58,7 @@
 .method public final read()I
     .locals 5
 
-    iget-object v0, p0, Lokio/c$2;->bBp:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->bBJ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -68,7 +68,7 @@
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lokio/c$2;->bBp:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->bBJ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readByte()B
 
@@ -87,7 +87,7 @@
 .method public final read([BII)I
     .locals 1
 
-    iget-object v0, p0, Lokio/c$2;->bBp:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->bBJ:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->read([BII)I
 
@@ -103,7 +103,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokio/c$2;->bBp:Lokio/c;
+    iget-object v1, p0, Lokio/c$2;->bBJ:Lokio/c;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/okio/c$a.smali b/com.discord/smali_classes2/okio/c$a.smali
index 4bfdfbbdd7..4cbc89755f 100644
--- a/com.discord/smali_classes2/okio/c$a.smali
+++ b/com.discord/smali_classes2/okio/c$a.smali
@@ -18,15 +18,15 @@
 
 
 # instance fields
-.field public bBq:Z
+.field public bBK:Z
 
-.field private bBr:Lokio/n;
+.field private bBL:Lokio/n;
 
 .field public data:[B
 
 .field public end:I
 
-.field public nK:Lokio/c;
+.field public nJ:Lokio/c;
 
 .field public offset:J
 
@@ -63,7 +63,7 @@
 
     if-ltz v2, :cond_8
 
-    iget-object v2, p0, Lokio/c$a;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/c$a;->nJ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -75,7 +75,7 @@
 
     if-eqz v2, :cond_7
 
-    iget-object v0, p0, Lokio/c$a;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/c$a;->nJ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -88,19 +88,19 @@
     :cond_0
     const-wide/16 v0, 0x0
 
-    iget-object v2, p0, Lokio/c$a;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/c$a;->nJ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
-    iget-object v4, p0, Lokio/c$a;->nK:Lokio/c;
+    iget-object v4, p0, Lokio/c$a;->nJ:Lokio/c;
 
-    iget-object v4, v4, Lokio/c;->bBo:Lokio/n;
+    iget-object v4, v4, Lokio/c;->bBI:Lokio/n;
 
-    iget-object v5, p0, Lokio/c$a;->nK:Lokio/c;
+    iget-object v5, p0, Lokio/c$a;->nJ:Lokio/c;
 
-    iget-object v5, v5, Lokio/c;->bBo:Lokio/n;
+    iget-object v5, v5, Lokio/c;->bBI:Lokio/n;
 
-    iget-object v6, p0, Lokio/c$a;->bBr:Lokio/n;
+    iget-object v6, p0, Lokio/c$a;->bBL:Lokio/n;
 
     if-eqz v6, :cond_2
 
@@ -120,14 +120,14 @@
 
     if-lez v6, :cond_1
 
-    iget-object v5, p0, Lokio/c$a;->bBr:Lokio/n;
+    iget-object v5, p0, Lokio/c$a;->bBL:Lokio/n;
 
     move-wide v2, v7
 
     goto :goto_0
 
     :cond_1
-    iget-object v4, p0, Lokio/c$a;->bBr:Lokio/n;
+    iget-object v4, p0, Lokio/c$a;->bBL:Lokio/n;
 
     move-wide v0, v7
 
@@ -166,7 +166,7 @@
 
     add-long/2addr v0, v2
 
-    iget-object v4, v4, Lokio/n;->bBI:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bCc:Lokio/n;
 
     goto :goto_1
 
@@ -180,7 +180,7 @@
 
     if-lez v2, :cond_4
 
-    iget-object v4, v4, Lokio/n;->bBJ:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bCd:Lokio/n;
 
     iget v2, v4, Lokio/n;->limit:I
 
@@ -195,39 +195,39 @@
     goto :goto_2
 
     :cond_4
-    iget-boolean v2, p0, Lokio/c$a;->bBq:Z
+    iget-boolean v2, p0, Lokio/c$a;->bBK:Z
 
     if-eqz v2, :cond_6
 
-    iget-boolean v2, v4, Lokio/n;->bmY:Z
+    iget-boolean v2, v4, Lokio/n;->bns:Z
 
     if-eqz v2, :cond_6
 
-    invoke-virtual {v4}, Lokio/n;->IU()Lokio/n;
+    invoke-virtual {v4}, Lokio/n;->IH()Lokio/n;
 
     move-result-object v2
 
-    iget-object v3, p0, Lokio/c$a;->nK:Lokio/c;
+    iget-object v3, p0, Lokio/c$a;->nJ:Lokio/c;
 
-    iget-object v3, v3, Lokio/c;->bBo:Lokio/n;
+    iget-object v3, v3, Lokio/c;->bBI:Lokio/n;
 
     if-ne v3, v4, :cond_5
 
-    iget-object v3, p0, Lokio/c$a;->nK:Lokio/c;
+    iget-object v3, p0, Lokio/c$a;->nJ:Lokio/c;
 
-    iput-object v2, v3, Lokio/c;->bBo:Lokio/n;
+    iput-object v2, v3, Lokio/c;->bBI:Lokio/n;
 
     :cond_5
     invoke-virtual {v4, v2}, Lokio/n;->a(Lokio/n;)Lokio/n;
 
     move-result-object v4
 
-    iget-object v2, v4, Lokio/n;->bBJ:Lokio/n;
+    iget-object v2, v4, Lokio/n;->bCd:Lokio/n;
 
-    invoke-virtual {v2}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v2}, Lokio/n;->II()Lokio/n;
 
     :cond_6
-    iput-object v4, p0, Lokio/c$a;->bBr:Lokio/n;
+    iput-object v4, p0, Lokio/c$a;->bBL:Lokio/n;
 
     iput-wide p1, p0, Lokio/c$a;->offset:J
 
@@ -261,7 +261,7 @@
     :goto_3
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokio/c$a;->bBr:Lokio/n;
+    iput-object v0, p0, Lokio/c$a;->bBL:Lokio/n;
 
     iput-wide p1, p0, Lokio/c$a;->offset:J
 
@@ -292,7 +292,7 @@
 
     const/4 p1, 0x1
 
-    iget-object p2, p0, Lokio/c$a;->nK:Lokio/c;
+    iget-object p2, p0, Lokio/c$a;->nJ:Lokio/c;
 
     iget-wide v2, p2, Lokio/c;->size:J
 
@@ -322,15 +322,15 @@
 .method public final close()V
     .locals 3
 
-    iget-object v0, p0, Lokio/c$a;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/c$a;->nJ:Lokio/c;
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokio/c$a;->nK:Lokio/c;
+    iput-object v0, p0, Lokio/c$a;->nJ:Lokio/c;
 
-    iput-object v0, p0, Lokio/c$a;->bBr:Lokio/n;
+    iput-object v0, p0, Lokio/c$a;->bBL:Lokio/n;
 
     const-wide/16 v1, -0x1
 
diff --git a/com.discord/smali_classes2/okio/f.smali b/com.discord/smali_classes2/okio/f.smali
index f6f20d936c..37973d2368 100644
--- a/com.discord/smali_classes2/okio/f.smali
+++ b/com.discord/smali_classes2/okio/f.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field protected final bBu:Lokio/r;
+.field protected final bBO:Lokio/r;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/f;->bBu:Lokio/r;
+    iput-object p1, p0, Lokio/f;->bBO:Lokio/r;
 
     return-void
 
@@ -42,7 +42,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/f;->bBu:Lokio/r;
+    iget-object v0, p0, Lokio/f;->bBO:Lokio/r;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/r;->a(Lokio/c;J)J
 
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/f;->bBu:Lokio/r;
+    iget-object v0, p0, Lokio/f;->bBO:Lokio/r;
 
     invoke-interface {v0}, Lokio/r;->close()V
 
@@ -69,7 +69,7 @@
 .method public timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/f;->bBu:Lokio/r;
+    iget-object v0, p0, Lokio/f;->bBO:Lokio/r;
 
     invoke-interface {v0}, Lokio/r;->timeout()Lokio/s;
 
@@ -99,7 +99,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokio/f;->bBu:Lokio/r;
+    iget-object v1, p0, Lokio/f;->bBO:Lokio/r;
 
     invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/okio/g.smali b/com.discord/smali_classes2/okio/g.smali
index fd6843392c..ef45cf3d11 100644
--- a/com.discord/smali_classes2/okio/g.smali
+++ b/com.discord/smali_classes2/okio/g.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public bBv:Lokio/s;
+.field public bBP:Lokio/s;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/g;->bBv:Lokio/s;
+    iput-object p1, p0, Lokio/g;->bBP:Lokio/s;
 
     return-void
 
@@ -31,67 +31,55 @@
 
 
 # virtual methods
-.method public final IM()J
-    .locals 2
-
-    iget-object v0, p0, Lokio/g;->bBv:Lokio/s;
-
-    invoke-virtual {v0}, Lokio/s;->IM()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final IN()Z
+.method public final IA()Z
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->bBv:Lokio/s;
+    iget-object v0, p0, Lokio/g;->bBP:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->IN()Z
+    invoke-virtual {v0}, Lokio/s;->IA()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final IO()J
+.method public final IB()J
     .locals 2
 
-    iget-object v0, p0, Lokio/g;->bBv:Lokio/s;
+    iget-object v0, p0, Lokio/g;->bBP:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->IO()J
+    invoke-virtual {v0}, Lokio/s;->IB()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final IP()Lokio/s;
+.method public final IC()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->bBv:Lokio/s;
+    iget-object v0, p0, Lokio/g;->bBP:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->IP()Lokio/s;
+    invoke-virtual {v0}, Lokio/s;->IC()Lokio/s;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final IQ()Lokio/s;
+.method public final ID()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->bBv:Lokio/s;
+    iget-object v0, p0, Lokio/g;->bBP:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->IQ()Lokio/s;
+    invoke-virtual {v0}, Lokio/s;->ID()Lokio/s;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final IR()V
+.method public final IE()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -99,17 +87,29 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/g;->bBv:Lokio/s;
+    iget-object v0, p0, Lokio/g;->bBP:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->IR()V
+    invoke-virtual {v0}, Lokio/s;->IE()V
 
     return-void
 .end method
 
+.method public final Iz()J
+    .locals 2
+
+    iget-object v0, p0, Lokio/g;->bBP:Lokio/s;
+
+    invoke-virtual {v0}, Lokio/s;->Iz()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
 .method public final aT(J)Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->bBv:Lokio/s;
+    iget-object v0, p0, Lokio/g;->bBP:Lokio/s;
 
     invoke-virtual {v0, p1, p2}, Lokio/s;->aT(J)Lokio/s;
 
@@ -121,7 +121,7 @@
 .method public final d(JLjava/util/concurrent/TimeUnit;)Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->bBv:Lokio/s;
+    iget-object v0, p0, Lokio/g;->bBP:Lokio/s;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/s;->d(JLjava/util/concurrent/TimeUnit;)Lokio/s;
 
diff --git a/com.discord/smali_classes2/okio/h.smali b/com.discord/smali_classes2/okio/h.smali
index 6046b3f597..cb1c68a512 100644
--- a/com.discord/smali_classes2/okio/h.smali
+++ b/com.discord/smali_classes2/okio/h.smali
@@ -7,15 +7,15 @@
 
 
 # instance fields
-.field private bBw:I
+.field private bBQ:I
 
-.field private final bBx:Lokio/i;
+.field private final bBR:Lokio/i;
 
 .field private final crc:Ljava/util/zip/CRC32;
 
 .field private final inflater:Ljava/util/zip/Inflater;
 
-.field private final nJ:Lokio/d;
+.field private final nI:Lokio/d;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokio/h;->bBw:I
+    iput v0, p0, Lokio/h;->bBQ:I
 
     new-instance v0, Ljava/util/zip/CRC32;
 
@@ -48,17 +48,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/h;->nJ:Lokio/d;
+    iput-object p1, p0, Lokio/h;->nI:Lokio/d;
 
     new-instance p1, Lokio/i;
 
-    iget-object v0, p0, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, p0, Lokio/h;->nI:Lokio/d;
 
     iget-object v1, p0, Lokio/h;->inflater:Ljava/util/zip/Inflater;
 
     invoke-direct {p1, v0, v1}, Lokio/i;-><init>(Lokio/d;Ljava/util/zip/Inflater;)V
 
-    iput-object p1, p0, Lokio/h;->bBx:Lokio/i;
+    iput-object p1, p0, Lokio/h;->bBR:Lokio/i;
 
     return-void
 
@@ -75,7 +75,7 @@
 .method private b(Lokio/c;JJ)V
     .locals 4
 
-    iget-object p1, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object p1, p1, Lokio/c;->bBI:Lokio/n;
 
     :goto_0
     iget v0, p1, Lokio/n;->limit:I
@@ -100,7 +100,7 @@
 
     sub-long/2addr p2, v0
 
-    iget-object p1, p1, Lokio/n;->bBI:Lokio/n;
+    iget-object p1, p1, Lokio/n;->bCc:Lokio/n;
 
     goto :goto_0
 
@@ -142,7 +142,7 @@
 
     sub-long/2addr p4, p2
 
-    iget-object p1, p1, Lokio/n;->bBI:Lokio/n;
+    iget-object p1, p1, Lokio/n;->bCc:Lokio/n;
 
     move-wide p2, v0
 
@@ -231,7 +231,7 @@
     return-wide v0
 
     :cond_0
-    iget v0, v6, Lokio/h;->bBw:I
+    iget v0, v6, Lokio/h;->bBQ:I
 
     const-wide/16 v10, -0x1
 
@@ -239,15 +239,15 @@
 
     if-nez v0, :cond_d
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
     const-wide/16 v1, 0xa
 
     invoke-interface {v0, v1, v2}, Lokio/d;->aG(J)V
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Ir()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Ie()Lokio/c;
 
     move-result-object v0
 
@@ -275,9 +275,9 @@
     :goto_0
     if-eqz v14, :cond_2
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Ir()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Ie()Lokio/c;
 
     move-result-object v1
 
@@ -290,7 +290,7 @@
     invoke-direct/range {v0 .. v5}, Lokio/h;->b(Lokio/c;JJ)V
 
     :cond_2
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readShort()S
 
@@ -302,7 +302,7 @@
 
     invoke-static {v2, v1, v0}, Lokio/h;->q(Ljava/lang/String;II)V
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
     const-wide/16 v1, 0x8
 
@@ -314,7 +314,7 @@
 
     if-ne v0, v12, :cond_5
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
     const-wide/16 v1, 0x2
 
@@ -322,9 +322,9 @@
 
     if-eqz v14, :cond_3
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Ir()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Ie()Lokio/c;
 
     move-result-object v1
 
@@ -337,17 +337,17 @@
     invoke-direct/range {v0 .. v5}, Lokio/h;->b(Lokio/c;JJ)V
 
     :cond_3
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Ir()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Ie()Lokio/c;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/c;->Ix()S
+    invoke-virtual {v0}, Lokio/c;->Ik()S
 
     move-result v0
 
-    iget-object v1, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v1, v6, Lokio/h;->nI:Lokio/d;
 
     int-to-long v4, v0
 
@@ -355,9 +355,9 @@
 
     if-eqz v14, :cond_4
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Ir()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Ie()Lokio/c;
 
     move-result-object v1
 
@@ -375,7 +375,7 @@
     move-wide v15, v4
 
     :goto_1
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
     move-wide v1, v15
 
@@ -390,9 +390,9 @@
 
     if-ne v0, v12, :cond_8
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IC()J
+    invoke-interface {v0}, Lokio/d;->Ip()J
 
     move-result-wide v17
 
@@ -402,9 +402,9 @@
 
     if-eqz v14, :cond_6
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Ir()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Ie()Lokio/c;
 
     move-result-object v1
 
@@ -417,7 +417,7 @@
     invoke-direct/range {v0 .. v5}, Lokio/h;->b(Lokio/c;JJ)V
 
     :cond_6
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
     add-long v1, v17, v15
 
@@ -440,9 +440,9 @@
 
     if-ne v0, v12, :cond_b
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->IC()J
+    invoke-interface {v0}, Lokio/d;->Ip()J
 
     move-result-wide v17
 
@@ -452,9 +452,9 @@
 
     if-eqz v14, :cond_9
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Ir()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Ie()Lokio/c;
 
     move-result-object v1
 
@@ -467,7 +467,7 @@
     invoke-direct/range {v0 .. v5}, Lokio/h;->b(Lokio/c;JJ)V
 
     :cond_9
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
     add-long v1, v17, v15
 
@@ -486,9 +486,9 @@
     :goto_3
     if-eqz v14, :cond_c
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Ix()S
+    invoke-interface {v0}, Lokio/d;->Ik()S
 
     move-result v0
 
@@ -511,10 +511,10 @@
     invoke-virtual {v0}, Ljava/util/zip/CRC32;->reset()V
 
     :cond_c
-    iput v12, v6, Lokio/h;->bBw:I
+    iput v12, v6, Lokio/h;->bBQ:I
 
     :cond_d
-    iget v0, v6, Lokio/h;->bBw:I
+    iget v0, v6, Lokio/h;->bBQ:I
 
     const/4 v1, 0x2
 
@@ -522,7 +522,7 @@
 
     iget-wide v2, v7, Lokio/c;->size:J
 
-    iget-object v0, v6, Lokio/h;->bBx:Lokio/i;
+    iget-object v0, v6, Lokio/h;->bBR:Lokio/i;
 
     invoke-virtual {v0, v7, v8, v9}, Lokio/i;->a(Lokio/c;J)J
 
@@ -543,16 +543,16 @@
     return-wide v8
 
     :cond_e
-    iput v1, v6, Lokio/h;->bBw:I
+    iput v1, v6, Lokio/h;->bBQ:I
 
     :cond_f
-    iget v0, v6, Lokio/h;->bBw:I
+    iget v0, v6, Lokio/h;->bBQ:I
 
     if-ne v0, v1, :cond_11
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Iy()I
+    invoke-interface {v0}, Lokio/d;->Il()I
 
     move-result v0
 
@@ -568,9 +568,9 @@
 
     invoke-static {v1, v0, v2}, Lokio/h;->q(Ljava/lang/String;II)V
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Iy()I
+    invoke-interface {v0}, Lokio/d;->Il()I
 
     move-result v0
 
@@ -588,11 +588,11 @@
 
     const/4 v0, 0x3
 
-    iput v0, v6, Lokio/h;->bBw:I
+    iput v0, v6, Lokio/h;->bBQ:I
 
-    iget-object v0, v6, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Iu()Z
+    invoke-interface {v0}, Lokio/d;->Ih()Z
 
     move-result v0
 
@@ -639,7 +639,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/h;->bBx:Lokio/i;
+    iget-object v0, p0, Lokio/h;->bBR:Lokio/i;
 
     invoke-virtual {v0}, Lokio/i;->close()V
 
@@ -649,7 +649,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/h;->nJ:Lokio/d;
+    iget-object v0, p0, Lokio/h;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/s;
 
diff --git a/com.discord/smali_classes2/okio/i.smali b/com.discord/smali_classes2/okio/i.smali
index d0b7bc7790..0bbe96e1df 100644
--- a/com.discord/smali_classes2/okio/i.smali
+++ b/com.discord/smali_classes2/okio/i.smali
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private bBy:I
+.field private bBS:I
 
 .field private closed:Z
 
 .field private final inflater:Ljava/util/zip/Inflater;
 
-.field private final nJ:Lokio/d;
+.field private final nI:Lokio/d;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     if-eqz p2, :cond_0
 
-    iput-object p1, p0, Lokio/i;->nJ:Lokio/d;
+    iput-object p1, p0, Lokio/i;->nI:Lokio/d;
 
     iput-object p2, p0, Lokio/i;->inflater:Ljava/util/zip/Inflater;
 
@@ -51,7 +51,7 @@
     throw p1
 .end method
 
-.method private IS()V
+.method private IF()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lokio/i;->bBy:I
+    iget v0, p0, Lokio/i;->bBS:I
 
     if-nez v0, :cond_0
 
@@ -74,13 +74,13 @@
 
     sub-int/2addr v0, v1
 
-    iget v1, p0, Lokio/i;->bBy:I
+    iget v1, p0, Lokio/i;->bBS:I
 
     sub-int/2addr v1, v0
 
-    iput v1, p0, Lokio/i;->bBy:I
+    iput v1, p0, Lokio/i;->bBS:I
 
-    iget-object v1, p0, Lokio/i;->nJ:Lokio/d;
+    iget-object v1, p0, Lokio/i;->nI:Lokio/d;
 
     int-to-long v2, v0
 
@@ -132,7 +132,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-direct {p0}, Lokio/i;->IS()V
+    invoke-direct {p0}, Lokio/i;->IF()V
 
     iget-object v0, p0, Lokio/i;->inflater:Ljava/util/zip/Inflater;
 
@@ -142,9 +142,9 @@
 
     if-nez v0, :cond_8
 
-    iget-object v0, p0, Lokio/i;->nJ:Lokio/d;
+    iget-object v0, p0, Lokio/i;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Iu()Z
+    invoke-interface {v0}, Lokio/d;->Ih()Z
 
     move-result v0
 
@@ -155,13 +155,13 @@
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lokio/i;->nJ:Lokio/d;
+    iget-object v0, p0, Lokio/i;->nI:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Ir()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Ie()Lokio/c;
 
     move-result-object v0
 
-    iget-object v0, v0, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, v0, Lokio/c;->bBI:Lokio/n;
 
     iget v3, v0, Lokio/n;->limit:I
 
@@ -169,7 +169,7 @@
 
     sub-int/2addr v3, v4
 
-    iput v3, p0, Lokio/i;->bBy:I
+    iput v3, p0, Lokio/i;->bBS:I
 
     iget-object v3, p0, Lokio/i;->inflater:Ljava/util/zip/Inflater;
 
@@ -177,13 +177,13 @@
 
     iget v0, v0, Lokio/n;->pos:I
 
-    iget v5, p0, Lokio/i;->bBy:I
+    iget v5, p0, Lokio/i;->bBS:I
 
     invoke-virtual {v3, v4, v0, v5}, Ljava/util/zip/Inflater;->setInput([BII)V
 
     :goto_1
     :try_start_0
-    invoke-virtual {p1, v1}, Lokio/c;->dT(I)Lokio/n;
+    invoke-virtual {p1, v1}, Lokio/c;->dP(I)Lokio/n;
 
     move-result-object v0
 
@@ -262,7 +262,7 @@
 
     :cond_6
     :goto_2
-    invoke-direct {p0}, Lokio/i;->IS()V
+    invoke-direct {p0}, Lokio/i;->IF()V
 
     iget p2, v0, Lokio/n;->pos:I
 
@@ -270,11 +270,11 @@
 
     if-ne p2, p3, :cond_7
 
-    invoke-virtual {v0}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->II()Lokio/n;
 
     move-result-object p2
 
-    iput-object p2, p1, Lokio/c;->bBo:Lokio/n;
+    iput-object p2, p1, Lokio/c;->bBI:Lokio/n;
 
     invoke-static {v0}, Lokio/o;->b(Lokio/n;)V
     :try_end_0
@@ -359,7 +359,7 @@
 
     iput-boolean v0, p0, Lokio/i;->closed:Z
 
-    iget-object v0, p0, Lokio/i;->nJ:Lokio/d;
+    iget-object v0, p0, Lokio/i;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->close()V
 
@@ -369,7 +369,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/i;->nJ:Lokio/d;
+    iget-object v0, p0, Lokio/i;->nI:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/s;
 
diff --git a/com.discord/smali_classes2/okio/j$1.smali b/com.discord/smali_classes2/okio/j$1.smali
index 9a0172a20d..b331d6792b 100644
--- a/com.discord/smali_classes2/okio/j$1.smali
+++ b/com.discord/smali_classes2/okio/j$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bBA:Ljava/io/OutputStream;
+.field final synthetic bBT:Lokio/s;
 
-.field final synthetic bBz:Lokio/s;
+.field final synthetic bBU:Ljava/io/OutputStream;
 
 
 # direct methods
 .method constructor <init>(Lokio/s;Ljava/io/OutputStream;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/j$1;->bBz:Lokio/s;
+    iput-object p1, p0, Lokio/j$1;->bBT:Lokio/s;
 
-    iput-object p2, p0, Lokio/j$1;->bBA:Ljava/io/OutputStream;
+    iput-object p2, p0, Lokio/j$1;->bBU:Ljava/io/OutputStream;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/j$1;->bBA:Ljava/io/OutputStream;
+    iget-object v0, p0, Lokio/j$1;->bBU:Ljava/io/OutputStream;
 
     invoke-virtual {v0}, Ljava/io/OutputStream;->close()V
 
@@ -61,7 +61,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/j$1;->bBA:Ljava/io/OutputStream;
+    iget-object v0, p0, Lokio/j$1;->bBU:Ljava/io/OutputStream;
 
     invoke-virtual {v0}, Ljava/io/OutputStream;->flush()V
 
@@ -71,7 +71,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/j$1;->bBz:Lokio/s;
+    iget-object v0, p0, Lokio/j$1;->bBT:Lokio/s;
 
     return-object v0
 .end method
@@ -85,7 +85,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokio/j$1;->bBA:Ljava/io/OutputStream;
+    iget-object v1, p0, Lokio/j$1;->bBU:Ljava/io/OutputStream;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -124,11 +124,11 @@
 
     if-lez v2, :cond_1
 
-    iget-object v0, p0, Lokio/j$1;->bBz:Lokio/s;
+    iget-object v0, p0, Lokio/j$1;->bBT:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->IR()V
+    invoke-virtual {v0}, Lokio/s;->IE()V
 
-    iget-object v0, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p1, Lokio/c;->bBI:Lokio/n;
 
     iget v1, v0, Lokio/n;->limit:I
 
@@ -144,7 +144,7 @@
 
     long-to-int v2, v1
 
-    iget-object v1, p0, Lokio/j$1;->bBA:Ljava/io/OutputStream;
+    iget-object v1, p0, Lokio/j$1;->bBU:Ljava/io/OutputStream;
 
     iget-object v3, v0, Lokio/n;->data:[B
 
@@ -174,11 +174,11 @@
 
     if-ne v1, v2, :cond_0
 
-    invoke-virtual {v0}, Lokio/n;->IV()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->II()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, p1, Lokio/c;->bBo:Lokio/n;
+    iput-object v1, p1, Lokio/c;->bBI:Lokio/n;
 
     invoke-static {v0}, Lokio/o;->b(Lokio/n;)V
 
diff --git a/com.discord/smali_classes2/okio/j$2.smali b/com.discord/smali_classes2/okio/j$2.smali
index 683feb67de..cc29dd8195 100644
--- a/com.discord/smali_classes2/okio/j$2.smali
+++ b/com.discord/smali_classes2/okio/j$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bBB:Ljava/io/InputStream;
+.field final synthetic bBT:Lokio/s;
 
-.field final synthetic bBz:Lokio/s;
+.field final synthetic bBV:Ljava/io/InputStream;
 
 
 # direct methods
 .method constructor <init>(Lokio/s;Ljava/io/InputStream;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/j$2;->bBz:Lokio/s;
+    iput-object p1, p0, Lokio/j$2;->bBT:Lokio/s;
 
-    iput-object p2, p0, Lokio/j$2;->bBB:Ljava/io/InputStream;
+    iput-object p2, p0, Lokio/j$2;->bBV:Ljava/io/InputStream;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,13 +60,13 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lokio/j$2;->bBz:Lokio/s;
+    iget-object v0, p0, Lokio/j$2;->bBT:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->IR()V
+    invoke-virtual {v0}, Lokio/s;->IE()V
 
     const/4 v0, 0x1
 
-    invoke-virtual {p1, v0}, Lokio/c;->dT(I)Lokio/n;
+    invoke-virtual {p1, v0}, Lokio/c;->dP(I)Lokio/n;
 
     move-result-object v0
 
@@ -82,7 +82,7 @@
 
     long-to-int p3, p2
 
-    iget-object p2, p0, Lokio/j$2;->bBB:Ljava/io/InputStream;
+    iget-object p2, p0, Lokio/j$2;->bBV:Ljava/io/InputStream;
 
     iget-object v1, v0, Lokio/n;->data:[B
 
@@ -163,7 +163,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/j$2;->bBB:Ljava/io/InputStream;
+    iget-object v0, p0, Lokio/j$2;->bBV:Ljava/io/InputStream;
 
     invoke-virtual {v0}, Ljava/io/InputStream;->close()V
 
@@ -173,7 +173,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/j$2;->bBz:Lokio/s;
+    iget-object v0, p0, Lokio/j$2;->bBT:Lokio/s;
 
     return-object v0
 .end method
@@ -187,7 +187,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokio/j$2;->bBB:Ljava/io/InputStream;
+    iget-object v1, p0, Lokio/j$2;->bBV:Ljava/io/InputStream;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/okio/j.smali b/com.discord/smali_classes2/okio/j.smali
index 5e399fbc95..094526b5e4 100644
--- a/com.discord/smali_classes2/okio/j.smali
+++ b/com.discord/smali_classes2/okio/j.smali
@@ -34,7 +34,7 @@
     return-void
 .end method
 
-.method public static B(Ljava/io/File;)Lokio/r;
+.method public static A(Ljava/io/File;)Lokio/r;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/okio/k.smali b/com.discord/smali_classes2/okio/k.smali
index 2d1447a491..62a8f01085 100644
--- a/com.discord/smali_classes2/okio/k.smali
+++ b/com.discord/smali_classes2/okio/k.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field final bBD:[Lokio/ByteString;
+.field final bBX:[Lokio/ByteString;
 
-.field final bBE:[I
+.field final bBY:[I
 
 
 # direct methods
@@ -29,9 +29,9 @@
 
     invoke-direct {p0}, Ljava/util/AbstractList;-><init>()V
 
-    iput-object p1, p0, Lokio/k;->bBD:[Lokio/ByteString;
+    iput-object p1, p0, Lokio/k;->bBX:[Lokio/ByteString;
 
-    iput-object p2, p0, Lokio/k;->bBE:[I
+    iput-object p2, p0, Lokio/k;->bBY:[I
 
     return-void
 .end method
@@ -278,7 +278,7 @@
     goto :goto_4
 
     :cond_7
-    invoke-virtual {v0}, Lokio/c;->Iu()Z
+    invoke-virtual {v0}, Lokio/c;->Ih()Z
 
     move-result v0
 
@@ -496,9 +496,9 @@
 
     add-long/2addr v13, v7
 
-    invoke-virtual {v0, v3}, Lokio/c;->dS(I)Lokio/c;
+    invoke-virtual {v0, v3}, Lokio/c;->dO(I)Lokio/c;
 
-    invoke-virtual {v0, v5}, Lokio/c;->dS(I)Lokio/c;
+    invoke-virtual {v0, v5}, Lokio/c;->dO(I)Lokio/c;
 
     move v2, v6
 
@@ -534,7 +534,7 @@
     :cond_5
     and-int/lit16 v3, v3, 0xff
 
-    invoke-virtual {v0, v3}, Lokio/c;->dS(I)Lokio/c;
+    invoke-virtual {v0, v3}, Lokio/c;->dO(I)Lokio/c;
 
     :cond_6
     add-int/lit8 v2, v2, 0x1
@@ -619,7 +619,7 @@
 
     move-result v2
 
-    invoke-virtual {v0, v2}, Lokio/c;->dS(I)Lokio/c;
+    invoke-virtual {v0, v2}, Lokio/c;->dO(I)Lokio/c;
 
     move/from16 v16, v8
 
@@ -642,7 +642,7 @@
 
     long-to-int v3, v2
 
-    invoke-virtual {v0, v3}, Lokio/c;->dS(I)Lokio/c;
+    invoke-virtual {v0, v3}, Lokio/c;->dO(I)Lokio/c;
 
     add-int/lit8 v5, v1, 0x1
 
@@ -735,9 +735,9 @@
 
     neg-int v2, v13
 
-    invoke-virtual {v0, v2}, Lokio/c;->dS(I)Lokio/c;
+    invoke-virtual {v0, v2}, Lokio/c;->dO(I)Lokio/c;
 
-    invoke-virtual {v0, v5}, Lokio/c;->dS(I)Lokio/c;
+    invoke-virtual {v0, v5}, Lokio/c;->dO(I)Lokio/c;
 
     move v2, v1
 
@@ -752,7 +752,7 @@
 
     and-int/lit16 v4, v4, 0xff
 
-    invoke-virtual {v0, v4}, Lokio/c;->dS(I)Lokio/c;
+    invoke-virtual {v0, v4}, Lokio/c;->dO(I)Lokio/c;
 
     add-int/lit8 v2, v2, 0x1
 
@@ -785,7 +785,7 @@
 
     move-result v1
 
-    invoke-virtual {v0, v1}, Lokio/c;->dS(I)Lokio/c;
+    invoke-virtual {v0, v1}, Lokio/c;->dO(I)Lokio/c;
 
     return-void
 
@@ -815,7 +815,7 @@
 
     long-to-int v2, v1
 
-    invoke-virtual {v0, v2}, Lokio/c;->dS(I)Lokio/c;
+    invoke-virtual {v0, v2}, Lokio/c;->dO(I)Lokio/c;
 
     move-wide v1, v7
 
@@ -868,7 +868,7 @@
 .method public final bridge synthetic get(I)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lokio/k;->bBD:[Lokio/ByteString;
+    iget-object v0, p0, Lokio/k;->bBX:[Lokio/ByteString;
 
     aget-object p1, v0, p1
 
@@ -878,7 +878,7 @@
 .method public final size()I
     .locals 1
 
-    iget-object v0, p0, Lokio/k;->bBD:[Lokio/ByteString;
+    iget-object v0, p0, Lokio/k;->bBX:[Lokio/ByteString;
 
     array-length v0, v0
 
diff --git a/com.discord/smali_classes2/okio/l.smali b/com.discord/smali_classes2/okio/l.smali
index 4f7753cc9d..9d9bc9fcd6 100644
--- a/com.discord/smali_classes2/okio/l.smali
+++ b/com.discord/smali_classes2/okio/l.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field public final bBF:Lokio/q;
+.field public final bBZ:Lokio/q;
 
 .field closed:Z
 
-.field public final nK:Lokio/c;
+.field public final nJ:Lokio/c;
 
 
 # direct methods
@@ -24,11 +24,11 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iput-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/l;->bBF:Lokio/q;
+    iput-object p1, p0, Lokio/l;->bBZ:Lokio/q;
 
     return-void
 
@@ -56,11 +56,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->D([B)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->IE()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Ir()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -76,7 +76,15 @@
     throw p1
 .end method
 
-.method public final IE()Lokio/BufferedSink;
+.method public final Ie()Lokio/c;
+    .locals 1
+
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
+
+    return-object v0
+.end method
+
+.method public final Ig()Lokio/BufferedSink;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -88,11 +96,9 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Iw()J
-
-    move-result-wide v0
+    iget-wide v0, v0, Lokio/c;->size:J
 
     const-wide/16 v2, 0x0
 
@@ -100,9 +106,9 @@
 
     if-lez v4, :cond_0
 
-    iget-object v2, p0, Lokio/l;->bBF:Lokio/q;
+    iget-object v2, p0, Lokio/l;->bBZ:Lokio/q;
 
-    iget-object v3, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v3, p0, Lokio/l;->nJ:Lokio/c;
 
     invoke-interface {v2, v3, v0, v1}, Lokio/q;->write(Lokio/c;J)V
 
@@ -119,15 +125,7 @@
     throw v0
 .end method
 
-.method public final Ir()Lokio/c;
-    .locals 1
-
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
-
-    return-object v0
-.end method
-
-.method public final It()Lokio/BufferedSink;
+.method public final Ir()Lokio/BufferedSink;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -139,9 +137,11 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
-    iget-wide v0, v0, Lokio/c;->size:J
+    invoke-virtual {v0}, Lokio/c;->Ij()J
+
+    move-result-wide v0
 
     const-wide/16 v2, 0x0
 
@@ -149,9 +149,9 @@
 
     if-lez v4, :cond_0
 
-    iget-object v2, p0, Lokio/l;->bBF:Lokio/q;
+    iget-object v2, p0, Lokio/l;->bBZ:Lokio/q;
 
-    iget-object v3, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v3, p0, Lokio/l;->nJ:Lokio/c;
 
     invoke-interface {v2, v3, v0, v1}, Lokio/q;->write(Lokio/c;J)V
 
@@ -181,7 +181,7 @@
     const-wide/16 v0, 0x0
 
     :goto_0
-    iget-object v2, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/l;->nJ:Lokio/c;
 
     const-wide/16 v3, 0x2000
 
@@ -197,7 +197,7 @@
 
     add-long/2addr v0, v2
 
-    invoke-virtual {p0}, Lokio/l;->IE()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Ir()Lokio/BufferedSink;
 
     goto :goto_0
 
@@ -232,11 +232,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->aP(J)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->IE()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Ir()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -264,11 +264,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->aO(J)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->IE()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Ir()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -302,7 +302,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v1, p0, Lokio/l;->nJ:Lokio/c;
 
     iget-wide v1, v1, Lokio/c;->size:J
 
@@ -312,11 +312,11 @@
 
     if-lez v5, :cond_1
 
-    iget-object v1, p0, Lokio/l;->bBF:Lokio/q;
+    iget-object v1, p0, Lokio/l;->bBZ:Lokio/q;
 
-    iget-object v2, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/l;->nJ:Lokio/c;
 
-    iget-object v3, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v3, p0, Lokio/l;->nJ:Lokio/c;
 
     iget-wide v3, v3, Lokio/c;->size:J
 
@@ -332,7 +332,7 @@
     :cond_1
     :goto_0
     :try_start_1
-    iget-object v1, p0, Lokio/l;->bBF:Lokio/q;
+    iget-object v1, p0, Lokio/l;->bBZ:Lokio/q;
 
     invoke-interface {v1}, Lokio/q;->close()V
     :try_end_1
@@ -361,7 +361,7 @@
     return-void
 .end method
 
-.method public final dU(I)Lokio/BufferedSink;
+.method public final dQ(I)Lokio/BufferedSink;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -373,11 +373,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
-    invoke-virtual {v0, p1}, Lokio/c;->dS(I)Lokio/c;
+    invoke-virtual {v0, p1}, Lokio/c;->dO(I)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->IE()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Ir()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -393,7 +393,7 @@
     throw p1
 .end method
 
-.method public final dV(I)Lokio/BufferedSink;
+.method public final dR(I)Lokio/BufferedSink;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -405,11 +405,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
-    invoke-virtual {v0, p1}, Lokio/c;->dR(I)Lokio/c;
+    invoke-virtual {v0, p1}, Lokio/c;->dN(I)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->IE()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Ir()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -425,7 +425,7 @@
     throw p1
 .end method
 
-.method public final dW(I)Lokio/BufferedSink;
+.method public final dS(I)Lokio/BufferedSink;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -437,11 +437,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
-    invoke-virtual {v0, p1}, Lokio/c;->dQ(I)Lokio/c;
+    invoke-virtual {v0, p1}, Lokio/c;->dM(I)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->IE()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Ir()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -457,7 +457,7 @@
     throw p1
 .end method
 
-.method public final eJ(Ljava/lang/String;)Lokio/BufferedSink;
+.method public final eE(Ljava/lang/String;)Lokio/BufferedSink;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -469,11 +469,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
-    invoke-virtual {v0, p1}, Lokio/c;->eI(Ljava/lang/String;)Lokio/c;
+    invoke-virtual {v0, p1}, Lokio/c;->eD(Ljava/lang/String;)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->IE()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Ir()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -501,7 +501,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -511,16 +511,16 @@
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lokio/l;->bBF:Lokio/q;
+    iget-object v0, p0, Lokio/l;->bBZ:Lokio/q;
 
-    iget-object v1, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v1, p0, Lokio/l;->nJ:Lokio/c;
 
     iget-wide v2, v1, Lokio/c;->size:J
 
     invoke-interface {v0, v1, v2, v3}, Lokio/q;->write(Lokio/c;J)V
 
     :cond_0
-    iget-object v0, p0, Lokio/l;->bBF:Lokio/q;
+    iget-object v0, p0, Lokio/l;->bBZ:Lokio/q;
 
     invoke-interface {v0}, Lokio/q;->flush()V
 
@@ -565,11 +565,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->i(Lokio/ByteString;)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->IE()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Ir()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -597,11 +597,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->m([BII)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->IE()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Ir()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -629,11 +629,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->o(Ljava/lang/String;II)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->IE()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Ir()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -652,7 +652,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/l;->bBF:Lokio/q;
+    iget-object v0, p0, Lokio/l;->bBZ:Lokio/q;
 
     invoke-interface {v0}, Lokio/q;->timeout()Lokio/s;
 
@@ -670,7 +670,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokio/l;->bBF:Lokio/q;
+    iget-object v1, p0, Lokio/l;->bBZ:Lokio/q;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -697,13 +697,13 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->write(Ljava/nio/ByteBuffer;)I
 
     move-result p1
 
-    invoke-virtual {p0}, Lokio/l;->IE()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Ir()Lokio/BufferedSink;
 
     return p1
 
@@ -729,11 +729,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/l;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
-    invoke-virtual {p0}, Lokio/l;->IE()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Ir()Lokio/BufferedSink;
 
     return-void
 
diff --git a/com.discord/smali_classes2/okio/m$1.smali b/com.discord/smali_classes2/okio/m$1.smali
index 1501653b6f..964dfd0dee 100644
--- a/com.discord/smali_classes2/okio/m$1.smali
+++ b/com.discord/smali_classes2/okio/m$1.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lokio/m;->Iv()Ljava/io/InputStream;
+    value = Lokio/m;->Ii()Ljava/io/InputStream;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bBH:Lokio/m;
+.field final synthetic bCb:Lokio/m;
 
 
 # direct methods
 .method constructor <init>(Lokio/m;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/m$1;->bBH:Lokio/m;
+    iput-object p1, p0, Lokio/m$1;->bCb:Lokio/m;
 
     invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
 
@@ -39,15 +39,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bCb:Lokio/m;
 
     iget-boolean v0, v0, Lokio/m;->closed:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bCb:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, v0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -79,7 +79,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bCb:Lokio/m;
 
     invoke-virtual {v0}, Lokio/m;->close()V
 
@@ -94,15 +94,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bCb:Lokio/m;
 
     iget-boolean v0, v0, Lokio/m;->closed:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bCb:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, v0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -112,13 +112,13 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bCb:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->bBG:Lokio/r;
+    iget-object v0, v0, Lokio/m;->bCa:Lokio/r;
 
-    iget-object v1, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v1, p0, Lokio/m$1;->bCb:Lokio/m;
 
-    iget-object v1, v1, Lokio/m;->nK:Lokio/c;
+    iget-object v1, v1, Lokio/m;->nJ:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -137,9 +137,9 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bCb:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, v0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readByte()B
 
@@ -167,7 +167,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bCb:Lokio/m;
 
     iget-boolean v0, v0, Lokio/m;->closed:Z
 
@@ -183,9 +183,9 @@
 
     invoke-static/range {v1 .. v6}, Lokio/t;->a(JJJ)V
 
-    iget-object v0, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bCb:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, v0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -195,13 +195,13 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bCb:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->bBG:Lokio/r;
+    iget-object v0, v0, Lokio/m;->bCa:Lokio/r;
 
-    iget-object v1, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v1, p0, Lokio/m$1;->bCb:Lokio/m;
 
-    iget-object v1, v1, Lokio/m;->nK:Lokio/c;
+    iget-object v1, v1, Lokio/m;->nJ:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -220,9 +220,9 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bCb:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, v0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->read([BII)I
 
@@ -247,7 +247,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lokio/m$1;->bBH:Lokio/m;
+    iget-object v1, p0, Lokio/m$1;->bCb:Lokio/m;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/okio/m.smali b/com.discord/smali_classes2/okio/m.smali
index d023996916..fb80790225 100644
--- a/com.discord/smali_classes2/okio/m.smali
+++ b/com.discord/smali_classes2/okio/m.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field public final bBG:Lokio/r;
+.field public final bCa:Lokio/r;
 
 .field closed:Z
 
-.field public final nK:Lokio/c;
+.field public final nJ:Lokio/c;
 
 
 # direct methods
@@ -24,11 +24,11 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iput-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/m;->bBG:Lokio/r;
+    iput-object p1, p0, Lokio/m;->bCa:Lokio/r;
 
     return-void
 
@@ -67,7 +67,7 @@
 
     if-gez v2, :cond_2
 
-    iget-object v3, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v3, p0, Lokio/m;->nJ:Lokio/c;
 
     move v4, p1
 
@@ -86,7 +86,7 @@
     return-wide v2
 
     :cond_0
-    iget-object v2, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -94,9 +94,9 @@
 
     if-gez v4, :cond_2
 
-    iget-object v4, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v4, p0, Lokio/m;->bCa:Lokio/r;
 
-    iget-object v5, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v5, p0, Lokio/m;->nJ:Lokio/c;
 
     const-wide/16 v6, 0x2000
 
@@ -172,63 +172,23 @@
 
 
 # virtual methods
-.method public final IB()Ljava/lang/String;
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-virtual {p0, v0, v1}, Lokio/m;->aK(J)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final IC()J
-    .locals 6
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v1, 0x0
-
-    const-wide/16 v2, 0x0
-
-    const-wide v4, 0x7fffffffffffffffL
-
-    move-object v0, p0
-
-    invoke-direct/range {v0 .. v5}, Lokio/m;->a(BJJ)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final Ir()Lokio/c;
+.method public final Ie()Lokio/c;
     .locals 1
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     return-object v0
 .end method
 
-.method public final Is()Lokio/c;
+.method public final If()Lokio/c;
     .locals 1
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     return-object v0
 .end method
 
-.method public final Iu()Z
+.method public final Ih()Z
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -240,17 +200,17 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Iu()Z
+    invoke-virtual {v0}, Lokio/c;->Ih()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bCa:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v1, p0, Lokio/m;->nJ:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -283,7 +243,7 @@
     throw v0
 .end method
 
-.method public final Iv()Ljava/io/InputStream;
+.method public final Ii()Ljava/io/InputStream;
     .locals 1
 
     new-instance v0, Lokio/m$1;
@@ -293,7 +253,7 @@
     return-object v0
 .end method
 
-.method public final Ix()S
+.method public final Ik()S
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -305,7 +265,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/m;->aG(J)V
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readShort()S
 
@@ -318,7 +278,7 @@
     return v0
 .end method
 
-.method public final Iy()I
+.method public final Il()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -330,20 +290,20 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/m;->aG(J)V
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readInt()I
 
     move-result v0
 
-    invoke-static {v0}, Lokio/t;->dY(I)I
+    invoke-static {v0}, Lokio/t;->dU(I)I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final Iz()J
+.method public final Im()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -370,7 +330,7 @@
 
     if-eqz v3, :cond_5
 
-    iget-object v3, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v3, p0, Lokio/m;->nJ:Lokio/c;
 
     int-to-long v4, v1
 
@@ -442,9 +402,49 @@
 
     :cond_5
     :goto_2
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Iz()J
+    invoke-virtual {v0}, Lokio/c;->Im()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final Io()Ljava/lang/String;
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-virtual {p0, v0, v1}, Lokio/m;->aK(J)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final Ip()J
+    .locals 6
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v1, 0x0
+
+    const-wide/16 v2, 0x0
+
+    const-wide v4, 0x7fffffffffffffffL
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lokio/m;->a(BJJ)J
 
     move-result-wide v0
 
@@ -464,7 +464,7 @@
     if-nez v0, :cond_3
 
     :cond_0
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     const/4 v1, 0x1
 
@@ -483,9 +483,9 @@
 
     if-ne v0, v2, :cond_2
 
-    iget-object v0, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bCa:Lokio/r;
 
-    iget-object v2, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/m;->nJ:Lokio/c;
 
     const-wide/16 v3, 0x2000
 
@@ -502,7 +502,7 @@
     return v1
 
     :cond_2
-    iget-object p1, p1, Lokio/k;->bBD:[Lokio/ByteString;
+    iget-object p1, p1, Lokio/k;->bBX:[Lokio/ByteString;
 
     aget-object p1, p1, v0
 
@@ -510,7 +510,7 @@
 
     move-result p1
 
-    iget-object v1, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v1, p0, Lokio/m;->nJ:Lokio/c;
 
     int-to-long v2, p1
 
@@ -554,7 +554,7 @@
 
     if-nez v2, :cond_1
 
-    iget-object v2, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -562,9 +562,9 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bCa:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v1, p0, Lokio/m;->nJ:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -581,7 +581,7 @@
     return-wide v2
 
     :cond_0
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -589,7 +589,7 @@
 
     move-result-wide p2
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->a(Lokio/c;J)J
 
@@ -649,9 +649,9 @@
 
     :cond_0
     :goto_0
-    iget-object v4, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v4, p0, Lokio/m;->bCa:Lokio/r;
 
-    iget-object v5, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v5, p0, Lokio/m;->nJ:Lokio/c;
 
     const-wide/16 v6, 0x2000
 
@@ -665,9 +665,9 @@
 
     if-eqz v8, :cond_1
 
-    iget-object v4, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v4, p0, Lokio/m;->nJ:Lokio/c;
 
-    invoke-virtual {v4}, Lokio/c;->Iw()J
+    invoke-virtual {v4}, Lokio/c;->Ij()J
 
     move-result-wide v4
 
@@ -677,14 +677,14 @@
 
     add-long/2addr v2, v4
 
-    iget-object v6, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v6, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-interface {p1, v6, v4, v5}, Lokio/q;->write(Lokio/c;J)V
 
     goto :goto_0
 
     :cond_1
-    iget-object v4, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v4, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v4, v4, Lokio/c;->size:J
 
@@ -692,13 +692,13 @@
 
     if-lez v6, :cond_2
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
     add-long/2addr v2, v0
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v4, v0, Lokio/c;->size:J
 
@@ -757,7 +757,7 @@
 
     invoke-virtual {p0, p1, p2}, Lokio/m;->aG(J)V
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->aI(J)Lokio/ByteString;
 
@@ -814,7 +814,7 @@
 
     if-eqz v10, :cond_1
 
-    iget-object p1, p0, Lokio/m;->nK:Lokio/c;
+    iget-object p1, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {p1, v6, v7}, Lokio/c;->aL(J)Ljava/lang/String;
 
@@ -833,7 +833,7 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/m;->nJ:Lokio/c;
 
     sub-long v6, v4, v0
 
@@ -853,7 +853,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0, v4, v5}, Lokio/c;->aH(J)B
 
@@ -863,7 +863,7 @@
 
     if-ne v0, v1, :cond_2
 
-    iget-object p1, p0, Lokio/m;->nK:Lokio/c;
+    iget-object p1, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {p1, v4, v5}, Lokio/c;->aL(J)Ljava/lang/String;
 
@@ -876,7 +876,7 @@
 
     invoke-direct {v6}, Lokio/c;-><init>()V
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     const-wide/16 v2, 0x0
 
@@ -900,7 +900,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -914,11 +914,11 @@
 
     invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v6}, Lokio/c;->HF()Lokio/ByteString;
+    invoke-virtual {v6}, Lokio/c;->Hs()Lokio/ByteString;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/ByteString;->IJ()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Iw()Ljava/lang/String;
 
     move-result-object p1
 
@@ -964,7 +964,7 @@
 
     invoke-virtual {p0, p1, p2}, Lokio/m;->aG(J)V
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->aM(J)[B
 
@@ -992,7 +992,7 @@
 
     if-lez v2, :cond_2
 
-    iget-object v2, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -1000,9 +1000,9 @@
 
     if-nez v4, :cond_1
 
-    iget-object v0, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bCa:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v1, p0, Lokio/m;->nJ:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -1027,7 +1027,7 @@
 
     :cond_1
     :goto_1
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -1035,7 +1035,7 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v2, v0, v1}, Lokio/c;->aN(J)V
 
@@ -1075,7 +1075,7 @@
     :try_end_0
     .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->b(Lokio/c;J)V
 
@@ -1084,7 +1084,7 @@
     :catch_0
     move-exception p2
 
-    iget-object p3, p0, Lokio/m;->nK:Lokio/c;
+    iget-object p3, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {p1, p3}, Lokio/c;->a(Lokio/r;)J
 
@@ -1101,13 +1101,13 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
-    iget-object v1, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v1, p0, Lokio/m;->bCa:Lokio/r;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/r;)J
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->c(Ljava/nio/charset/Charset;)Ljava/lang/String;
 
@@ -1144,11 +1144,11 @@
 
     iput-boolean v0, p0, Lokio/m;->closed:Z
 
-    iget-object v0, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bCa:Lokio/r;
 
     invoke-interface {v0}, Lokio/r;->close()V
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->clear()V
 
@@ -1187,7 +1187,7 @@
     const-wide/16 v0, 0x0
 
     :goto_0
-    iget-object v2, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v2, p1, v0, v1}, Lokio/c;->a(Lokio/ByteString;J)J
 
@@ -1202,13 +1202,13 @@
     return-wide v2
 
     :cond_0
-    iget-object v2, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
-    iget-object v6, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v6, p0, Lokio/m;->bCa:Lokio/r;
 
-    iget-object v7, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v7, p0, Lokio/m;->nJ:Lokio/c;
 
     const-wide/16 v8, 0x2000
 
@@ -1272,7 +1272,7 @@
     const-wide/16 v0, 0x0
 
     :goto_0
-    iget-object v2, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v2, p1, v0, v1}, Lokio/c;->b(Lokio/ByteString;J)J
 
@@ -1287,13 +1287,13 @@
     return-wide v2
 
     :cond_0
-    iget-object v2, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
-    iget-object v6, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v6, p0, Lokio/m;->bCa:Lokio/r;
 
-    iget-object v7, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v7, p0, Lokio/m;->nJ:Lokio/c;
 
     const-wide/16 v8, 0x2000
 
@@ -1385,7 +1385,7 @@
     return v1
 
     :cond_1
-    iget-object v3, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v3, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v3, v5, v6}, Lokio/c;->aH(J)B
 
@@ -1439,7 +1439,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -1449,9 +1449,9 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bCa:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v1, p0, Lokio/m;->nJ:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -1470,7 +1470,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->read(Ljava/nio/ByteBuffer;)I
 
@@ -1491,7 +1491,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/m;->aG(J)V
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readByte()B
 
@@ -1517,7 +1517,7 @@
     :try_end_0
     .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->readFully([B)V
 
@@ -1529,7 +1529,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -1539,7 +1539,7 @@
 
     if-lez v6, :cond_1
 
-    iget-object v2, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v2, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v3, v2, Lokio/c;->size:J
 
@@ -1586,7 +1586,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/m;->aG(J)V
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readInt()I
 
@@ -1607,7 +1607,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/m;->aG(J)V
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readLong()J
 
@@ -1628,7 +1628,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/m;->aG(J)V
 
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readShort()S
 
@@ -1656,7 +1656,7 @@
     if-nez v0, :cond_2
 
     :cond_0
-    iget-object v0, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v0, p0, Lokio/m;->nJ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -1664,9 +1664,9 @@
 
     if-gez v2, :cond_1
 
-    iget-object v0, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bCa:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->nK:Lokio/c;
+    iget-object v1, p0, Lokio/m;->nJ:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -1725,7 +1725,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bCa:Lokio/r;
 
     invoke-interface {v0}, Lokio/r;->timeout()Lokio/s;
 
@@ -1743,7 +1743,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokio/m;->bBG:Lokio/r;
+    iget-object v1, p0, Lokio/m;->bCa:Lokio/r;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/okio/p.smali b/com.discord/smali_classes2/okio/p.smali
index c826982c7c..c679007932 100644
--- a/com.discord/smali_classes2/okio/p.smali
+++ b/com.discord/smali_classes2/okio/p.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final transient bBL:[[B
+.field final transient bCf:[[B
 
-.field final transient bBM:[I
+.field final transient bCg:[I
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     invoke-static/range {v1 .. v6}, Lokio/t;->a(JJJ)V
 
-    iget-object v0, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object v0, p1, Lokio/c;->bBI:Lokio/n;
 
     const/4 v1, 0x0
 
@@ -54,7 +54,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    iget-object v3, v3, Lokio/n;->bBI:Lokio/n;
+    iget-object v3, v3, Lokio/n;->bCc:Lokio/n;
 
     goto :goto_0
 
@@ -70,15 +70,15 @@
     :cond_1
     new-array v0, v2, [[B
 
-    iput-object v0, p0, Lokio/p;->bBL:[[B
+    iput-object v0, p0, Lokio/p;->bCf:[[B
 
     mul-int/lit8 v2, v2, 0x2
 
     new-array v0, v2, [I
 
-    iput-object v0, p0, Lokio/p;->bBM:[I
+    iput-object v0, p0, Lokio/p;->bCg:[I
 
-    iget-object p1, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object p1, p1, Lokio/c;->bBI:Lokio/n;
 
     move-object v0, p1
 
@@ -87,7 +87,7 @@
     :goto_1
     if-ge v1, p2, :cond_3
 
-    iget-object v2, p0, Lokio/p;->bBL:[[B
+    iget-object v2, p0, Lokio/p;->bCf:[[B
 
     iget-object v3, v0, Lokio/n;->data:[B
 
@@ -106,11 +106,11 @@
     move v1, p2
 
     :cond_2
-    iget-object v2, p0, Lokio/p;->bBM:[I
+    iget-object v2, p0, Lokio/p;->bCg:[I
 
     aput v1, v2, p1
 
-    iget-object v3, p0, Lokio/p;->bBL:[[B
+    iget-object v3, p0, Lokio/p;->bCf:[[B
 
     array-length v3, v3
 
@@ -122,11 +122,11 @@
 
     const/4 v2, 0x1
 
-    iput-boolean v2, v0, Lokio/n;->bmY:Z
+    iput-boolean v2, v0, Lokio/n;->bns:Z
 
     add-int/lit8 p1, p1, 0x1
 
-    iget-object v0, v0, Lokio/n;->bBI:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bCc:Lokio/n;
 
     goto :goto_1
 
@@ -134,7 +134,7 @@
     return-void
 .end method
 
-.method private IX()Lokio/ByteString;
+.method private IK()Lokio/ByteString;
     .locals 2
 
     new-instance v0, Lokio/ByteString;
@@ -148,12 +148,12 @@
     return-object v0
 .end method
 
-.method private dX(I)I
+.method private dT(I)I
     .locals 3
 
-    iget-object v0, p0, Lokio/p;->bBM:[I
+    iget-object v0, p0, Lokio/p;->bCg:[I
 
-    iget-object v1, p0, Lokio/p;->bBL:[[B
+    iget-object v1, p0, Lokio/p;->bCf:[[B
 
     array-length v1, v1
 
@@ -178,7 +178,7 @@
 .method private writeReplace()Ljava/lang/Object;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->IX()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->IK()Lokio/ByteString;
 
     move-result-object v0
 
@@ -187,91 +187,91 @@
 
 
 # virtual methods
-.method public final IF()Ljava/lang/String;
+.method public final Is()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->IX()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->IK()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->IF()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/ByteString;->Is()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final IG()Ljava/lang/String;
+.method public final It()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->IX()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->IK()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->IG()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/ByteString;->It()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final IH()Lokio/ByteString;
+.method public final Iu()Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->IX()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->IK()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->IH()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/ByteString;->Iu()Lokio/ByteString;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final II()Lokio/ByteString;
+.method public final Iv()Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->IX()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->IK()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->II()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/ByteString;->Iv()Lokio/ByteString;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final IJ()Ljava/lang/String;
+.method public final Iw()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->IX()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->IK()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->IJ()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/ByteString;->Iw()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final IK()Lokio/ByteString;
+.method public final Ix()Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->IX()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->IK()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->IK()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/ByteString;->Ix()Lokio/ByteString;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final IL()[B
+.method final Iy()[B
     .locals 1
 
     invoke-virtual {p0}, Lokio/p;->toByteArray()[B
@@ -297,7 +297,7 @@
     return v1
 
     :cond_0
-    invoke-direct {p0, v1}, Lokio/p;->dX(I)I
+    invoke-direct {p0, v1}, Lokio/p;->dT(I)I
 
     move-result v0
 
@@ -311,14 +311,14 @@
     goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Lokio/p;->bBM:[I
+    iget-object v2, p0, Lokio/p;->bCg:[I
 
     add-int/lit8 v3, v0, -0x1
 
     aget v2, v2, v3
 
     :goto_1
-    iget-object v3, p0, Lokio/p;->bBM:[I
+    iget-object v3, p0, Lokio/p;->bCg:[I
 
     aget v3, v3, v0
 
@@ -332,9 +332,9 @@
 
     move-result v3
 
-    iget-object v4, p0, Lokio/p;->bBM:[I
+    iget-object v4, p0, Lokio/p;->bCg:[I
 
-    iget-object v5, p0, Lokio/p;->bBL:[[B
+    iget-object v5, p0, Lokio/p;->bCf:[[B
 
     array-length v6, v5
 
@@ -373,14 +373,14 @@
     return p1
 .end method
 
-.method public final ad(II)Lokio/ByteString;
+.method public final ac(II)Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->IX()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->IK()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0, p1, p2}, Lokio/ByteString;->ad(II)Lokio/ByteString;
+    invoke-virtual {v0, p1, p2}, Lokio/ByteString;->ac(II)Lokio/ByteString;
 
     move-result-object p1
 
@@ -390,7 +390,7 @@
 .method final b(Lokio/c;)V
     .locals 11
 
-    iget-object v0, p0, Lokio/p;->bBL:[[B
+    iget-object v0, p0, Lokio/p;->bCf:[[B
 
     array-length v0, v0
 
@@ -401,7 +401,7 @@
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v3, p0, Lokio/p;->bBM:[I
+    iget-object v3, p0, Lokio/p;->bCg:[I
 
     add-int v4, v0, v1
 
@@ -411,7 +411,7 @@
 
     new-instance v4, Lokio/n;
 
-    iget-object v5, p0, Lokio/p;->bBL:[[B
+    iget-object v5, p0, Lokio/p;->bCf:[[B
 
     aget-object v6, v5, v1
 
@@ -427,22 +427,22 @@
 
     invoke-direct/range {v5 .. v10}, Lokio/n;-><init>([BIIZZ)V
 
-    iget-object v2, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object v2, p1, Lokio/c;->bBI:Lokio/n;
 
     if-nez v2, :cond_0
 
-    iput-object v4, v4, Lokio/n;->bBJ:Lokio/n;
+    iput-object v4, v4, Lokio/n;->bCd:Lokio/n;
 
-    iput-object v4, v4, Lokio/n;->bBI:Lokio/n;
+    iput-object v4, v4, Lokio/n;->bCc:Lokio/n;
 
-    iput-object v4, p1, Lokio/c;->bBo:Lokio/n;
+    iput-object v4, p1, Lokio/c;->bBI:Lokio/n;
 
     goto :goto_1
 
     :cond_0
-    iget-object v2, p1, Lokio/c;->bBo:Lokio/n;
+    iget-object v2, p1, Lokio/c;->bBI:Lokio/n;
 
-    iget-object v2, v2, Lokio/n;->bBJ:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bCd:Lokio/n;
 
     invoke-virtual {v2, v4}, Lokio/n;->a(Lokio/n;)Lokio/n;
 
@@ -535,7 +535,7 @@
     goto :goto_2
 
     :cond_0
-    invoke-direct {p0, p1}, Lokio/p;->dX(I)I
+    invoke-direct {p0, p1}, Lokio/p;->dT(I)I
 
     move-result v1
 
@@ -549,14 +549,14 @@
     goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Lokio/p;->bBM:[I
+    iget-object v2, p0, Lokio/p;->bCg:[I
 
     add-int/lit8 v3, v1, -0x1
 
     aget v2, v2, v3
 
     :goto_1
-    iget-object v3, p0, Lokio/p;->bBM:[I
+    iget-object v3, p0, Lokio/p;->bCg:[I
 
     aget v3, v3, v1
 
@@ -570,9 +570,9 @@
 
     move-result v3
 
-    iget-object v4, p0, Lokio/p;->bBM:[I
+    iget-object v4, p0, Lokio/p;->bCg:[I
 
-    iget-object v5, p0, Lokio/p;->bBL:[[B
+    iget-object v5, p0, Lokio/p;->bCf:[[B
 
     array-length v6, v5
 
@@ -618,9 +618,9 @@
 .method public final getByte(I)B
     .locals 7
 
-    iget-object v0, p0, Lokio/p;->bBM:[I
+    iget-object v0, p0, Lokio/p;->bCg:[I
 
-    iget-object v1, p0, Lokio/p;->bBL:[[B
+    iget-object v1, p0, Lokio/p;->bCf:[[B
 
     array-length v1, v1
 
@@ -636,7 +636,7 @@
 
     invoke-static/range {v1 .. v6}, Lokio/t;->a(JJJ)V
 
-    invoke-direct {p0, p1}, Lokio/p;->dX(I)I
+    invoke-direct {p0, p1}, Lokio/p;->dT(I)I
 
     move-result v0
 
@@ -647,16 +647,16 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lokio/p;->bBM:[I
+    iget-object v1, p0, Lokio/p;->bCg:[I
 
     add-int/lit8 v2, v0, -0x1
 
     aget v1, v1, v2
 
     :goto_0
-    iget-object v2, p0, Lokio/p;->bBM:[I
+    iget-object v2, p0, Lokio/p;->bCg:[I
 
-    iget-object v3, p0, Lokio/p;->bBL:[[B
+    iget-object v3, p0, Lokio/p;->bCf:[[B
 
     array-length v4, v3
 
@@ -685,7 +685,7 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lokio/p;->bBL:[[B
+    iget-object v0, p0, Lokio/p;->bCf:[[B
 
     array-length v0, v0
 
@@ -698,11 +698,11 @@
     :goto_0
     if-ge v1, v0, :cond_2
 
-    iget-object v4, p0, Lokio/p;->bBL:[[B
+    iget-object v4, p0, Lokio/p;->bCf:[[B
 
     aget-object v4, v4, v1
 
-    iget-object v5, p0, Lokio/p;->bBM:[I
+    iget-object v5, p0, Lokio/p;->bCg:[I
 
     add-int v6, v0, v1
 
@@ -743,9 +743,9 @@
 .method public final size()I
     .locals 2
 
-    iget-object v0, p0, Lokio/p;->bBM:[I
+    iget-object v0, p0, Lokio/p;->bCg:[I
 
-    iget-object v1, p0, Lokio/p;->bBL:[[B
+    iget-object v1, p0, Lokio/p;->bCf:[[B
 
     array-length v1, v1
 
@@ -759,9 +759,9 @@
 .method public final toByteArray()[B
     .locals 8
 
-    iget-object v0, p0, Lokio/p;->bBM:[I
+    iget-object v0, p0, Lokio/p;->bCg:[I
 
-    iget-object v1, p0, Lokio/p;->bBL:[[B
+    iget-object v1, p0, Lokio/p;->bCf:[[B
 
     array-length v2, v1
 
@@ -780,7 +780,7 @@
     :goto_0
     if-ge v2, v1, :cond_0
 
-    iget-object v4, p0, Lokio/p;->bBM:[I
+    iget-object v4, p0, Lokio/p;->bCg:[I
 
     add-int v5, v1, v2
 
@@ -788,7 +788,7 @@
 
     aget v4, v4, v2
 
-    iget-object v6, p0, Lokio/p;->bBL:[[B
+    iget-object v6, p0, Lokio/p;->bCf:[[B
 
     aget-object v6, v6, v2
 
@@ -809,7 +809,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->IX()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->IK()Lokio/ByteString;
 
     move-result-object v0
 
@@ -828,7 +828,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/p;->bBL:[[B
+    iget-object v0, p0, Lokio/p;->bCf:[[B
 
     array-length v0, v0
 
@@ -839,7 +839,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v3, p0, Lokio/p;->bBM:[I
+    iget-object v3, p0, Lokio/p;->bCg:[I
 
     add-int v4, v0, v1
 
@@ -847,7 +847,7 @@
 
     aget v3, v3, v1
 
-    iget-object v5, p0, Lokio/p;->bBL:[[B
+    iget-object v5, p0, Lokio/p;->bCf:[[B
 
     aget-object v5, v5, v1
 
diff --git a/com.discord/smali_classes2/okio/s$1.smali b/com.discord/smali_classes2/okio/s$1.smali
index 7aa7a9ea49..0a6744ba41 100644
--- a/com.discord/smali_classes2/okio/s$1.smali
+++ b/com.discord/smali_classes2/okio/s$1.smali
@@ -25,7 +25,7 @@
 
 
 # virtual methods
-.method public final IR()V
+.method public final IE()V
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/okio/t.smali b/com.discord/smali_classes2/okio/t.smali
index a19eb514cb..b183e13526 100644
--- a/com.discord/smali_classes2/okio/t.smali
+++ b/com.discord/smali_classes2/okio/t.smali
@@ -150,7 +150,7 @@
     return p0
 .end method
 
-.method public static dY(I)I
+.method public static dU(I)I
     .locals 2
 
     const/high16 v0, -0x1000000
diff --git a/com.discord/smali_classes2/org/a/a/a.smali b/com.discord/smali_classes2/org/a/a/a.smali
index 826b810d06..c87cd9c275 100644
--- a/com.discord/smali_classes2/org/a/a/a.smali
+++ b/com.discord/smali_classes2/org/a/a/a.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field protected final bCl:I
+.field protected final bCF:I
 
-.field protected bCm:Lorg/a/a/a;
+.field protected bCG:Lorg/a/a/a;
 
 
 # direct methods
@@ -27,25 +27,25 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/a;->bCl:I
+    iput p1, p0, Lorg/a/a/a;->bCF:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/a;->bCm:Lorg/a/a/a;
+    iput-object p1, p0, Lorg/a/a/a;->bCG:Lorg/a/a/a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public IY()V
+.method public IL()V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->bCm:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bCG:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lorg/a/a/a;->IY()V
+    invoke-virtual {v0}, Lorg/a/a/a;->IL()V
 
     :cond_0
     return-void
@@ -54,7 +54,7 @@
 .method public at(Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->bCm:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bCG:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
@@ -70,14 +70,14 @@
     return-object p1
 .end method
 
-.method public eN(Ljava/lang/String;)Lorg/a/a/a;
+.method public eI(Ljava/lang/String;)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->bCm:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bCG:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1}, Lorg/a/a/a;->eN(Ljava/lang/String;)Lorg/a/a/a;
+    invoke-virtual {v0, p1}, Lorg/a/a/a;->eI(Ljava/lang/String;)Lorg/a/a/a;
 
     move-result-object p1
 
@@ -92,7 +92,7 @@
 .method public l(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->bCm:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bCG:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
@@ -105,7 +105,7 @@
 .method public u(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->bCm:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bCG:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/org/a/a/aa.smali b/com.discord/smali_classes2/org/a/a/aa.smali
index 2582bdceee..3ec4e63085 100644
--- a/com.discord/smali_classes2/org/a/a/aa.smali
+++ b/com.discord/smali_classes2/org/a/a/aa.smali
@@ -4,33 +4,33 @@
 
 
 # static fields
-.field public static final bFI:Lorg/a/a/aa;
+.field public static final bGc:Lorg/a/a/aa;
 
-.field public static final bFJ:Lorg/a/a/aa;
+.field public static final bGd:Lorg/a/a/aa;
 
-.field public static final bFK:Lorg/a/a/aa;
+.field public static final bGe:Lorg/a/a/aa;
 
-.field public static final bFL:Lorg/a/a/aa;
+.field public static final bGf:Lorg/a/a/aa;
 
-.field public static final bFM:Lorg/a/a/aa;
+.field public static final bGg:Lorg/a/a/aa;
 
-.field public static final bFN:Lorg/a/a/aa;
+.field public static final bGh:Lorg/a/a/aa;
 
-.field public static final bFO:Lorg/a/a/aa;
+.field public static final bGi:Lorg/a/a/aa;
 
-.field public static final bFP:Lorg/a/a/aa;
+.field public static final bGj:Lorg/a/a/aa;
 
-.field public static final bFQ:Lorg/a/a/aa;
+.field public static final bGk:Lorg/a/a/aa;
 
 
 # instance fields
-.field private final bFR:I
+.field private final bGl:I
 
-.field private final bFS:Ljava/lang/String;
+.field private final bGm:Ljava/lang/String;
 
-.field private final bFT:I
+.field private final bGn:I
 
-.field private final bFU:I
+.field private final bGo:I
 
 
 # direct methods
@@ -47,7 +47,7 @@
 
     invoke-direct {v0, v1, v3, v1, v2}, Lorg/a/a/aa;-><init>(ILjava/lang/String;II)V
 
-    sput-object v0, Lorg/a/a/aa;->bFI:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bGc:Lorg/a/a/aa;
 
     new-instance v0, Lorg/a/a/aa;
 
@@ -55,7 +55,7 @@
 
     invoke-direct {v0, v2, v3, v2, v1}, Lorg/a/a/aa;-><init>(ILjava/lang/String;II)V
 
-    sput-object v0, Lorg/a/a/aa;->bFJ:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bGd:Lorg/a/a/aa;
 
     new-instance v0, Lorg/a/a/aa;
 
@@ -63,7 +63,7 @@
 
     invoke-direct {v0, v1, v3, v1, v2}, Lorg/a/a/aa;-><init>(ILjava/lang/String;II)V
 
-    sput-object v0, Lorg/a/a/aa;->bFK:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bGe:Lorg/a/a/aa;
 
     new-instance v0, Lorg/a/a/aa;
 
@@ -71,7 +71,7 @@
 
     invoke-direct {v0, v2, v3, v2, v1}, Lorg/a/a/aa;-><init>(ILjava/lang/String;II)V
 
-    sput-object v0, Lorg/a/a/aa;->bFL:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bGf:Lorg/a/a/aa;
 
     new-instance v0, Lorg/a/a/aa;
 
@@ -79,7 +79,7 @@
 
     invoke-direct {v0, v1, v3, v1, v2}, Lorg/a/a/aa;-><init>(ILjava/lang/String;II)V
 
-    sput-object v0, Lorg/a/a/aa;->bFM:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bGg:Lorg/a/a/aa;
 
     new-instance v0, Lorg/a/a/aa;
 
@@ -87,7 +87,7 @@
 
     invoke-direct {v0, v2, v3, v2, v1}, Lorg/a/a/aa;-><init>(ILjava/lang/String;II)V
 
-    sput-object v0, Lorg/a/a/aa;->bFN:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bGh:Lorg/a/a/aa;
 
     new-instance v0, Lorg/a/a/aa;
 
@@ -95,7 +95,7 @@
 
     invoke-direct {v0, v1, v3, v1, v2}, Lorg/a/a/aa;-><init>(ILjava/lang/String;II)V
 
-    sput-object v0, Lorg/a/a/aa;->bFO:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bGi:Lorg/a/a/aa;
 
     new-instance v0, Lorg/a/a/aa;
 
@@ -103,7 +103,7 @@
 
     invoke-direct {v0, v2, v3, v2, v1}, Lorg/a/a/aa;-><init>(ILjava/lang/String;II)V
 
-    sput-object v0, Lorg/a/a/aa;->bFP:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bGj:Lorg/a/a/aa;
 
     new-instance v0, Lorg/a/a/aa;
 
@@ -111,7 +111,7 @@
 
     invoke-direct {v0, v1, v3, v1, v2}, Lorg/a/a/aa;-><init>(ILjava/lang/String;II)V
 
-    sput-object v0, Lorg/a/a/aa;->bFQ:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bGk:Lorg/a/a/aa;
 
     return-void
 .end method
@@ -121,31 +121,31 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lorg/a/a/aa;->bFR:I
+    iput p1, p0, Lorg/a/a/aa;->bGl:I
 
-    iput-object p2, p0, Lorg/a/a/aa;->bFS:Ljava/lang/String;
+    iput-object p2, p0, Lorg/a/a/aa;->bGm:Ljava/lang/String;
 
-    iput p3, p0, Lorg/a/a/aa;->bFT:I
+    iput p3, p0, Lorg/a/a/aa;->bGn:I
 
-    iput p4, p0, Lorg/a/a/aa;->bFU:I
+    iput p4, p0, Lorg/a/a/aa;->bGo:I
 
     return-void
 .end method
 
-.method private Ji()Lorg/a/a/aa;
+.method private IV()Lorg/a/a/aa;
     .locals 3
 
-    invoke-direct {p0}, Lorg/a/a/aa;->Jl()I
+    invoke-direct {p0}, Lorg/a/a/aa;->IY()I
 
     move-result v0
 
-    iget-object v1, p0, Lorg/a/a/aa;->bFS:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/aa;->bGm:Ljava/lang/String;
 
-    iget v2, p0, Lorg/a/a/aa;->bFT:I
+    iget v2, p0, Lorg/a/a/aa;->bGn:I
 
     add-int/2addr v2, v0
 
-    iget v0, p0, Lorg/a/a/aa;->bFU:I
+    iget v0, p0, Lorg/a/a/aa;->bGo:I
 
     invoke-static {v1, v2, v0}, Lorg/a/a/aa;->s(Ljava/lang/String;II)Lorg/a/a/aa;
 
@@ -154,15 +154,15 @@
     return-object v0
 .end method
 
-.method private Jl()I
+.method private IY()I
     .locals 3
 
     const/4 v0, 0x1
 
     :goto_0
-    iget-object v1, p0, Lorg/a/a/aa;->bFS:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/aa;->bGm:Ljava/lang/String;
 
-    iget v2, p0, Lorg/a/a/aa;->bFT:I
+    iget v2, p0, Lorg/a/a/aa;->bGn:I
 
     add-int/2addr v2, v0
 
@@ -203,7 +203,7 @@
 
     if-ne p0, v0, :cond_0
 
-    sget-object p0, Lorg/a/a/aa;->bFN:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGh:Lorg/a/a/aa;
 
     return-object p0
 
@@ -212,7 +212,7 @@
 
     if-ne p0, v0, :cond_1
 
-    sget-object p0, Lorg/a/a/aa;->bFI:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGc:Lorg/a/a/aa;
 
     return-object p0
 
@@ -221,7 +221,7 @@
 
     if-ne p0, v0, :cond_2
 
-    sget-object p0, Lorg/a/a/aa;->bFJ:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGd:Lorg/a/a/aa;
 
     return-object p0
 
@@ -230,7 +230,7 @@
 
     if-ne p0, v0, :cond_3
 
-    sget-object p0, Lorg/a/a/aa;->bFL:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGf:Lorg/a/a/aa;
 
     return-object p0
 
@@ -239,7 +239,7 @@
 
     if-ne p0, v0, :cond_4
 
-    sget-object p0, Lorg/a/a/aa;->bFK:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGe:Lorg/a/a/aa;
 
     return-object p0
 
@@ -248,7 +248,7 @@
 
     if-ne p0, v0, :cond_5
 
-    sget-object p0, Lorg/a/a/aa;->bFM:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGg:Lorg/a/a/aa;
 
     return-object p0
 
@@ -257,7 +257,7 @@
 
     if-ne p0, v0, :cond_6
 
-    sget-object p0, Lorg/a/a/aa;->bFQ:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGk:Lorg/a/a/aa;
 
     return-object p0
 
@@ -266,7 +266,7 @@
 
     if-ne p0, v0, :cond_7
 
-    sget-object p0, Lorg/a/a/aa;->bFO:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGi:Lorg/a/a/aa;
 
     return-object p0
 
@@ -275,7 +275,7 @@
 
     if-ne p0, v0, :cond_8
 
-    sget-object p0, Lorg/a/a/aa;->bFP:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGj:Lorg/a/a/aa;
 
     return-object p0
 
@@ -291,7 +291,7 @@
 
     move-result-object p0
 
-    invoke-static {p0}, Lorg/a/a/aa;->eZ(Ljava/lang/String;)Lorg/a/a/aa;
+    invoke-static {p0}, Lorg/a/a/aa;->eU(Ljava/lang/String;)Lorg/a/a/aa;
 
     move-result-object p0
 
@@ -491,7 +491,7 @@
     return-void
 .end method
 
-.method public static eZ(Ljava/lang/String;)Lorg/a/a/aa;
+.method public static eU(Ljava/lang/String;)Lorg/a/a/aa;
     .locals 2
 
     invoke-virtual {p0}, Ljava/lang/String;->length()I
@@ -507,7 +507,7 @@
     return-object p0
 .end method
 
-.method public static fa(Ljava/lang/String;)Lorg/a/a/aa;
+.method public static eV(Ljava/lang/String;)Lorg/a/a/aa;
     .locals 4
 
     new-instance v0, Lorg/a/a/aa;
@@ -539,7 +539,7 @@
     return-object v0
 .end method
 
-.method public static fb(Ljava/lang/String;)Lorg/a/a/aa;
+.method public static eW(Ljava/lang/String;)Lorg/a/a/aa;
     .locals 4
 
     new-instance v0, Lorg/a/a/aa;
@@ -557,7 +557,7 @@
     return-object v0
 .end method
 
-.method public static fc(Ljava/lang/String;)[Lorg/a/a/aa;
+.method public static eX(Ljava/lang/String;)[Lorg/a/a/aa;
     .locals 10
 
     const/4 v0, 0x0
@@ -685,7 +685,7 @@
     return-object v2
 .end method
 
-.method public static fd(Ljava/lang/String;)I
+.method public static eY(Ljava/lang/String;)I
     .locals 7
 
     const/4 v0, 0x1
@@ -851,17 +851,17 @@
     throw p0
 
     :pswitch_0
-    sget-object p0, Lorg/a/a/aa;->bFQ:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGk:Lorg/a/a/aa;
 
     return-object p0
 
     :pswitch_1
-    sget-object p0, Lorg/a/a/aa;->bFK:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGe:Lorg/a/a/aa;
 
     return-object p0
 
     :pswitch_2
-    sget-object p0, Lorg/a/a/aa;->bFL:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGf:Lorg/a/a/aa;
 
     return-object p0
 
@@ -875,27 +875,27 @@
     return-object v0
 
     :cond_1
-    sget-object p0, Lorg/a/a/aa;->bFJ:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGd:Lorg/a/a/aa;
 
     return-object p0
 
     :cond_2
-    sget-object p0, Lorg/a/a/aa;->bFP:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGj:Lorg/a/a/aa;
 
     return-object p0
 
     :cond_3
-    sget-object p0, Lorg/a/a/aa;->bFN:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGh:Lorg/a/a/aa;
 
     return-object p0
 
     :cond_4
-    sget-object p0, Lorg/a/a/aa;->bFI:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGc:Lorg/a/a/aa;
 
     return-object p0
 
     :cond_5
-    sget-object p0, Lorg/a/a/aa;->bFM:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGg:Lorg/a/a/aa;
 
     return-object p0
 
@@ -913,7 +913,7 @@
     return-object v0
 
     :cond_7
-    sget-object p0, Lorg/a/a/aa;->bFO:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bGi:Lorg/a/a/aa;
 
     return-object p0
 
@@ -936,14 +936,14 @@
 
 
 # virtual methods
-.method public final Jj()Ljava/lang/String;
+.method public final IW()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/aa;->bFS:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/aa;->bGm:Ljava/lang/String;
 
-    iget v1, p0, Lorg/a/a/aa;->bFT:I
+    iget v1, p0, Lorg/a/a/aa;->bGn:I
 
-    iget v2, p0, Lorg/a/a/aa;->bFU:I
+    iget v2, p0, Lorg/a/a/aa;->bGo:I
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
@@ -952,10 +952,10 @@
     return-object v0
 .end method
 
-.method public final Jk()I
+.method public final IX()I
     .locals 2
 
-    iget v0, p0, Lorg/a/a/aa;->bFR:I
+    iget v0, p0, Lorg/a/a/aa;->bGl:I
 
     const/16 v1, 0xc
 
@@ -988,7 +988,7 @@
     :cond_1
     check-cast p1, Lorg/a/a/aa;
 
-    iget v1, p0, Lorg/a/a/aa;->bFR:I
+    iget v1, p0, Lorg/a/a/aa;->bGl:I
 
     const/16 v3, 0xa
 
@@ -999,7 +999,7 @@
     const/16 v1, 0xa
 
     :cond_2
-    iget v5, p1, Lorg/a/a/aa;->bFR:I
+    iget v5, p1, Lorg/a/a/aa;->bGl:I
 
     if-ne v5, v4, :cond_3
 
@@ -1014,13 +1014,13 @@
     return v2
 
     :cond_4
-    iget v1, p0, Lorg/a/a/aa;->bFT:I
+    iget v1, p0, Lorg/a/a/aa;->bGn:I
 
-    iget v3, p0, Lorg/a/a/aa;->bFU:I
+    iget v3, p0, Lorg/a/a/aa;->bGo:I
 
-    iget v4, p1, Lorg/a/a/aa;->bFT:I
+    iget v4, p1, Lorg/a/a/aa;->bGn:I
 
-    iget v5, p1, Lorg/a/a/aa;->bFU:I
+    iget v5, p1, Lorg/a/a/aa;->bGo:I
 
     sub-int v6, v3, v1
 
@@ -1034,13 +1034,13 @@
     :goto_1
     if-ge v1, v3, :cond_7
 
-    iget-object v5, p0, Lorg/a/a/aa;->bFS:Ljava/lang/String;
+    iget-object v5, p0, Lorg/a/a/aa;->bGm:Ljava/lang/String;
 
     invoke-virtual {v5, v1}, Ljava/lang/String;->charAt(I)C
 
     move-result v5
 
-    iget-object v6, p1, Lorg/a/a/aa;->bFS:Ljava/lang/String;
+    iget-object v6, p1, Lorg/a/a/aa;->bGm:Ljava/lang/String;
 
     invoke-virtual {v6, v4}, Ljava/lang/String;->charAt(I)C
 
@@ -1064,7 +1064,7 @@
 .method public final getClassName()Ljava/lang/String;
     .locals 3
 
-    iget v0, p0, Lorg/a/a/aa;->bFR:I
+    iget v0, p0, Lorg/a/a/aa;->bGl:I
 
     packed-switch v0, :pswitch_data_0
 
@@ -1076,11 +1076,11 @@
     throw v0
 
     :pswitch_1
-    iget-object v0, p0, Lorg/a/a/aa;->bFS:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/aa;->bGm:Ljava/lang/String;
 
-    iget v1, p0, Lorg/a/a/aa;->bFT:I
+    iget v1, p0, Lorg/a/a/aa;->bGn:I
 
-    iget v2, p0, Lorg/a/a/aa;->bFU:I
+    iget v2, p0, Lorg/a/a/aa;->bGo:I
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
@@ -1099,7 +1099,7 @@
     :pswitch_2
     new-instance v0, Ljava/lang/StringBuilder;
 
-    invoke-direct {p0}, Lorg/a/a/aa;->Ji()Lorg/a/a/aa;
+    invoke-direct {p0}, Lorg/a/a/aa;->IV()Lorg/a/a/aa;
 
     move-result-object v1
 
@@ -1109,7 +1109,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lorg/a/a/aa;->Jl()I
+    invoke-direct {p0}, Lorg/a/a/aa;->IY()I
 
     move-result v1
 
@@ -1199,19 +1199,19 @@
 .method public final getDescriptor()Ljava/lang/String;
     .locals 4
 
-    iget v0, p0, Lorg/a/a/aa;->bFR:I
+    iget v0, p0, Lorg/a/a/aa;->bGl:I
 
     const/16 v1, 0xa
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/aa;->bFS:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/aa;->bGm:Ljava/lang/String;
 
-    iget v1, p0, Lorg/a/a/aa;->bFT:I
+    iget v1, p0, Lorg/a/a/aa;->bGn:I
 
     add-int/lit8 v1, v1, -0x1
 
-    iget v2, p0, Lorg/a/a/aa;->bFU:I
+    iget v2, p0, Lorg/a/a/aa;->bGo:I
 
     add-int/lit8 v2, v2, 0x1
 
@@ -1232,11 +1232,11 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lorg/a/a/aa;->bFS:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/aa;->bGm:Ljava/lang/String;
 
-    iget v2, p0, Lorg/a/a/aa;->bFT:I
+    iget v2, p0, Lorg/a/a/aa;->bGn:I
 
-    iget v3, p0, Lorg/a/a/aa;->bFU:I
+    iget v3, p0, Lorg/a/a/aa;->bGo:I
 
     invoke-virtual {v0, v1, v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;II)Ljava/lang/StringBuilder;
 
@@ -1251,11 +1251,11 @@
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/aa;->bFS:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/aa;->bGm:Ljava/lang/String;
 
-    iget v1, p0, Lorg/a/a/aa;->bFT:I
+    iget v1, p0, Lorg/a/a/aa;->bGn:I
 
-    iget v2, p0, Lorg/a/a/aa;->bFU:I
+    iget v2, p0, Lorg/a/a/aa;->bGo:I
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
@@ -1267,7 +1267,7 @@
 .method public final hashCode()I
     .locals 4
 
-    iget v0, p0, Lorg/a/a/aa;->bFR:I
+    iget v0, p0, Lorg/a/a/aa;->bGl:I
 
     const/16 v1, 0xc
 
@@ -1278,20 +1278,20 @@
     :cond_0
     mul-int/lit8 v0, v0, 0xd
 
-    iget v1, p0, Lorg/a/a/aa;->bFR:I
+    iget v1, p0, Lorg/a/a/aa;->bGl:I
 
     const/16 v2, 0x9
 
     if-lt v1, v2, :cond_1
 
-    iget v1, p0, Lorg/a/a/aa;->bFT:I
+    iget v1, p0, Lorg/a/a/aa;->bGn:I
 
-    iget v2, p0, Lorg/a/a/aa;->bFU:I
+    iget v2, p0, Lorg/a/a/aa;->bGo:I
 
     :goto_0
     if-ge v1, v2, :cond_1
 
-    iget-object v3, p0, Lorg/a/a/aa;->bFS:Ljava/lang/String;
+    iget-object v3, p0, Lorg/a/a/aa;->bGm:Ljava/lang/String;
 
     invoke-virtual {v3, v1}, Ljava/lang/String;->charAt(I)C
 
diff --git a/com.discord/smali_classes2/org/a/a/ab.smali b/com.discord/smali_classes2/org/a/a/ab.smali
index 21ff71fc80..d5952f7dc4 100644
--- a/com.discord/smali_classes2/org/a/a/ab.smali
+++ b/com.discord/smali_classes2/org/a/a/ab.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final bFV:[B
+.field private final bGp:[B
 
-.field private final bFW:I
+.field private final bGq:I
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/ab;->bFV:[B
+    iput-object p1, p0, Lorg/a/a/ab;->bGp:[B
 
-    iput p2, p0, Lorg/a/a/ab;->bFW:I
+    iput p2, p0, Lorg/a/a/ab;->bGq:I
 
     return-void
 .end method
@@ -29,14 +29,14 @@
 
     const/4 p0, 0x0
 
-    invoke-virtual {p1, p0}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, p0}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/ab;->bFV:[B
+    iget-object v0, p0, Lorg/a/a/ab;->bGp:[B
 
-    iget p0, p0, Lorg/a/a/ab;->bFW:I
+    iget p0, p0, Lorg/a/a/ab;->bGq:I
 
     aget-byte v1, v0, p0
 
@@ -54,9 +54,9 @@
 .method public final toString()Ljava/lang/String;
     .locals 9
 
-    iget-object v0, p0, Lorg/a/a/ab;->bFV:[B
+    iget-object v0, p0, Lorg/a/a/ab;->bGp:[B
 
-    iget v1, p0, Lorg/a/a/ab;->bFW:I
+    iget v1, p0, Lorg/a/a/ab;->bGq:I
 
     aget-byte v0, v0, v1
 
@@ -71,9 +71,9 @@
     :goto_0
     if-ge v2, v0, :cond_4
 
-    iget-object v3, p0, Lorg/a/a/ab;->bFV:[B
+    iget-object v3, p0, Lorg/a/a/ab;->bGp:[B
 
-    iget v4, p0, Lorg/a/a/ab;->bFW:I
+    iget v4, p0, Lorg/a/a/ab;->bGq:I
 
     mul-int/lit8 v5, v2, 0x2
 
diff --git a/com.discord/smali_classes2/org/a/a/ac.smali b/com.discord/smali_classes2/org/a/a/ac.smali
index 8ba784721e..d103935a8e 100644
--- a/com.discord/smali_classes2/org/a/a/ac.smali
+++ b/com.discord/smali_classes2/org/a/a/ac.smali
@@ -26,12 +26,12 @@
     throw p0
 
     :pswitch_0
-    invoke-virtual {p1, p0}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {p1, p0}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     return-void
 
     :pswitch_1
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     return-void
 
@@ -42,7 +42,7 @@
 
     shr-int/lit8 p0, p0, 0x8
 
-    invoke-virtual {p1, v0, p0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v0, p0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     return-void
 
@@ -50,7 +50,7 @@
     :pswitch_3
     ushr-int/lit8 p0, p0, 0x10
 
-    invoke-virtual {p1, p0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 
diff --git a/com.discord/smali_classes2/org/a/a/b.smali b/com.discord/smali_classes2/org/a/a/b.smali
index bad559ad6e..46e63ac2bb 100644
--- a/com.discord/smali_classes2/org/a/a/b.smali
+++ b/com.discord/smali_classes2/org/a/a/b.smali
@@ -4,19 +4,19 @@
 
 
 # instance fields
-.field private final bCn:Lorg/a/a/z;
+.field private final bCH:Lorg/a/a/z;
 
-.field private final bCo:Z
+.field private final bCI:Z
 
-.field private final bCp:Lorg/a/a/d;
+.field private final bCJ:Lorg/a/a/d;
 
-.field private final bCq:I
+.field private final bCK:I
 
-.field private bCr:I
+.field private bCL:I
 
-.field private final bCs:Lorg/a/a/b;
+.field private final bCM:Lorg/a/a/b;
 
-.field private bCt:Lorg/a/a/b;
+.field private bCN:Lorg/a/a/b;
 
 
 # direct methods
@@ -35,11 +35,11 @@
 
     invoke-direct {p0}, Lorg/a/a/a;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iput-object p1, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    iput-boolean p2, p0, Lorg/a/a/b;->bCo:Z
+    iput-boolean p2, p0, Lorg/a/a/b;->bCI:Z
 
-    iput-object p3, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iput-object p3, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     iget p1, p3, Lorg/a/a/d;->length:I
 
@@ -55,13 +55,13 @@
     add-int/lit8 p1, p1, -0x2
 
     :goto_0
-    iput p1, p0, Lorg/a/a/b;->bCq:I
+    iput p1, p0, Lorg/a/a/b;->bCK:I
 
-    iput-object p4, p0, Lorg/a/a/b;->bCs:Lorg/a/a/b;
+    iput-object p4, p0, Lorg/a/a/b;->bCM:Lorg/a/a/b;
 
     if-eqz p4, :cond_1
 
-    iput-object p0, p4, Lorg/a/a/b;->bCt:Lorg/a/a/b;
+    iput-object p0, p4, Lorg/a/a/b;->bCN:Lorg/a/a/b;
 
     :cond_1
     return-void
@@ -92,7 +92,7 @@
     goto :goto_1
 
     :cond_0
-    invoke-virtual {v3, p0}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v3, p0}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v3
 
@@ -136,7 +136,7 @@
     goto :goto_1
 
     :cond_0
-    invoke-virtual {v4, v3}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v4, v3}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v3
 
@@ -150,11 +150,11 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p3, p0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p3, p0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    invoke-virtual {p3, v2}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {p3, v2}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
-    invoke-virtual {p3, p2}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p3, p2}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     const/4 p0, 0x0
 
@@ -170,11 +170,11 @@
     :goto_3
     if-eqz v0, :cond_2
 
-    invoke-virtual {v0}, Lorg/a/a/b;->IY()V
+    invoke-virtual {v0}, Lorg/a/a/b;->IL()V
 
     add-int/lit8 v2, v2, 0x1
 
-    iget-object v4, v0, Lorg/a/a/b;->bCs:Lorg/a/a/b;
+    iget-object v4, v0, Lorg/a/a/b;->bCM:Lorg/a/a/b;
 
     move-object v5, v4
 
@@ -185,22 +185,22 @@
     goto :goto_3
 
     :cond_2
-    invoke-virtual {p3, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p3, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :goto_4
     if-eqz v4, :cond_3
 
-    iget-object v0, v4, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v0, v4, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     iget-object v0, v0, Lorg/a/a/d;->data:[B
 
-    iget-object v2, v4, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v2, v4, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     iget v2, v2, Lorg/a/a/d;->length:I
 
     invoke-virtual {p3, v0, v1, v2}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
-    iget-object v4, v4, Lorg/a/a/b;->bCt:Lorg/a/a/b;
+    iget-object v4, v4, Lorg/a/a/b;->bCN:Lorg/a/a/b;
 
     goto :goto_4
 
@@ -215,22 +215,22 @@
 
 
 # virtual methods
-.method public final IY()V
+.method public final IL()V
     .locals 4
 
-    iget v0, p0, Lorg/a/a/b;->bCq:I
+    iget v0, p0, Lorg/a/a/b;->bCK:I
 
     const/4 v1, -0x1
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     iget-object v0, v0, Lorg/a/a/d;->data:[B
 
-    iget v1, p0, Lorg/a/a/b;->bCq:I
+    iget v1, p0, Lorg/a/a/b;->bCK:I
 
-    iget v2, p0, Lorg/a/a/b;->bCr:I
+    iget v2, p0, Lorg/a/a/b;->bCL:I
 
     ushr-int/lit8 v3, v2, 0x8
 
@@ -266,9 +266,9 @@
     :goto_0
     if-eqz v2, :cond_0
 
-    invoke-virtual {v2}, Lorg/a/a/b;->IY()V
+    invoke-virtual {v2}, Lorg/a/a/b;->IL()V
 
-    iget-object v4, v2, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v4, v2, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     iget v4, v4, Lorg/a/a/d;->length:I
 
@@ -276,7 +276,7 @@
 
     add-int/lit8 v3, v3, 0x1
 
-    iget-object v4, v2, Lorg/a/a/b;->bCs:Lorg/a/a/b;
+    iget-object v4, v2, Lorg/a/a/b;->bCM:Lorg/a/a/b;
 
     move-object v5, v4
 
@@ -287,26 +287,26 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p2, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p2, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    invoke-virtual {p2, v1}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {p2, v1}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
-    invoke-virtual {p2, v3}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p2, v3}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :goto_1
     if-eqz v4, :cond_1
 
-    iget-object p1, v4, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, v4, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     iget-object p1, p1, Lorg/a/a/d;->data:[B
 
-    iget-object v1, v4, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v1, v4, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     iget v1, v1, Lorg/a/a/d;->length:I
 
     invoke-virtual {p2, p1, v0, v1}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
-    iget-object v4, v4, Lorg/a/a/b;->bCt:Lorg/a/a/b;
+    iget-object v4, v4, Lorg/a/a/b;->bCN:Lorg/a/a/b;
 
     goto :goto_1
 
@@ -317,50 +317,50 @@
 .method public final at(Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/a;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/b;->bCr:I
+    iget v0, p0, Lorg/a/a/b;->bCL:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->bCr:I
+    iput v0, p0, Lorg/a/a/b;->bCL:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->bCo:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->bCI:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, p1}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, p1}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     const/16 v0, 0x40
 
-    iget-object v1, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, p2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, p2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p2
 
-    invoke-virtual {p1, v0, p2}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v0, p2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    iget-object v0, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     const/4 v1, 0x0
 
@@ -369,43 +369,43 @@
     return-object p1
 .end method
 
-.method public final eN(Ljava/lang/String;)Lorg/a/a/a;
+.method public final eI(Ljava/lang/String;)Lorg/a/a/a;
     .locals 4
 
-    iget v0, p0, Lorg/a/a/b;->bCr:I
+    iget v0, p0, Lorg/a/a/b;->bCL:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->bCr:I
+    iput v0, p0, Lorg/a/a/b;->bCL:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->bCo:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->bCI:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, p1}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, p1}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     const/16 v0, 0x5b
 
     const/4 v1, 0x0
 
-    invoke-virtual {p1, v0, v1}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v0, v1}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object v0, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    iget-object v2, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     const/4 v3, 0x0
 
@@ -414,14 +414,14 @@
     return-object p1
 .end method
 
-.method final eO(Ljava/lang/String;)I
+.method final eJ(Ljava/lang/String;)I
     .locals 2
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v0, p1}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v0, p1}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     :cond_0
     const/16 p1, 0x8
@@ -433,13 +433,13 @@
     :goto_0
     if-eqz p1, :cond_1
 
-    iget-object v1, p1, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v1, p1, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     iget v1, v1, Lorg/a/a/d;->length:I
 
     add-int/2addr v0, v1
 
-    iget-object p1, p1, Lorg/a/a/b;->bCs:Lorg/a/a/b;
+    iget-object p1, p1, Lorg/a/a/b;->bCM:Lorg/a/a/b;
 
     goto :goto_0
 
@@ -450,48 +450,48 @@
 .method public final l(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    iget v0, p0, Lorg/a/a/b;->bCr:I
+    iget v0, p0, Lorg/a/a/b;->bCL:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->bCr:I
+    iput v0, p0, Lorg/a/a/b;->bCL:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->bCo:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->bCI:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, p1}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, p1}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     const/16 v0, 0x65
 
-    iget-object v1, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, p2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, p2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p2
 
-    invoke-virtual {p1, v0, p2}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v0, p2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     move-result-object p1
 
-    iget-object p2, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {p2, p3}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p2, p3}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p2
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 .end method
@@ -499,44 +499,44 @@
 .method public final u(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 7
 
-    iget v0, p0, Lorg/a/a/b;->bCr:I
+    iget v0, p0, Lorg/a/a/b;->bCL:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->bCr:I
+    iput v0, p0, Lorg/a/a/b;->bCL:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->bCo:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->bCI:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, p1}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, p1}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :cond_0
     instance-of p1, p2, Ljava/lang/String;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     const/16 v0, 0x73
 
-    iget-object v1, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {v1, p2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, p2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p2
 
-    invoke-virtual {p1, v0, p2}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v0, p2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     return-void
 
@@ -549,9 +549,9 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
-    iget-object v2, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
     check-cast p2, Ljava/lang/Byte;
 
@@ -559,13 +559,13 @@
 
     move-result p2
 
-    invoke-virtual {v2, v1, p2}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {v2, v1, p2}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object p2
 
     iget p2, p2, Lorg/a/a/y;->index:I
 
-    invoke-virtual {p1, v0, p2}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v0, p2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     return-void
 
@@ -582,17 +582,17 @@
 
     move-result p1
 
-    iget-object p2, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v0, v1, p1}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {v0, v1, p1}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object p1
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    invoke-virtual {p2, v2, p1}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p2, v2, p1}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     return-void
 
@@ -603,9 +603,9 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
     check-cast p2, Ljava/lang/Character;
 
@@ -613,13 +613,13 @@
 
     move-result p2
 
-    invoke-virtual {v0, v1, p2}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {v0, v1, p2}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object p2
 
     iget p2, p2, Lorg/a/a/y;->index:I
 
-    invoke-virtual {p1, v3, p2}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v3, p2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     return-void
 
@@ -630,9 +630,9 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
     check-cast p2, Ljava/lang/Short;
 
@@ -640,13 +640,13 @@
 
     move-result p2
 
-    invoke-virtual {v0, v1, p2}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {v0, v1, p2}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object p2
 
     iget p2, p2, Lorg/a/a/y;->index:I
 
-    invoke-virtual {p1, v4, p2}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v4, p2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     return-void
 
@@ -655,11 +655,11 @@
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     const/16 v0, 0x63
 
-    iget-object v1, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
     check-cast p2, Lorg/a/a/aa;
 
@@ -667,11 +667,11 @@
 
     move-result-object p2
 
-    invoke-virtual {v1, p2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, p2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p2
 
-    invoke-virtual {p1, v0, p2}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v0, p2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     return-void
 
@@ -688,11 +688,11 @@
 
     check-cast p2, [B
 
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     array-length v2, p2
 
-    invoke-virtual {p1, v6, v2}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v6, v2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     array-length p1, p2
 
@@ -701,17 +701,17 @@
 
     aget-byte v2, p2, v5
 
-    iget-object v3, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
-    iget-object v4, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v4, v1, v2}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {v4, v1, v2}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object v2
 
     iget v2, v2, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v3, v0, v2}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v3, v0, v2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     add-int/lit8 v5, v5, 0x1
 
@@ -729,11 +729,11 @@
 
     check-cast p2, [Z
 
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     array-length v0, p2
 
-    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     array-length p1, p2
 
@@ -742,17 +742,17 @@
 
     aget-boolean v0, p2, v5
 
-    iget-object v3, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
-    iget-object v4, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v4, v1, v0}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {v4, v1, v0}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object v0
 
     iget v0, v0, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v3, v2, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v3, v2, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     add-int/lit8 v5, v5, 0x1
 
@@ -770,11 +770,11 @@
 
     check-cast p2, [S
 
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     array-length v0, p2
 
-    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     array-length p1, p2
 
@@ -783,17 +783,17 @@
 
     aget-short v0, p2, v5
 
-    iget-object v2, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
-    iget-object v3, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v3, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v3, v1, v0}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {v3, v1, v0}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object v0
 
     iget v0, v0, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v2, v4, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v2, v4, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     add-int/lit8 v5, v5, 0x1
 
@@ -811,11 +811,11 @@
 
     check-cast p2, [C
 
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     array-length v0, p2
 
-    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     array-length p1, p2
 
@@ -824,17 +824,17 @@
 
     aget-char v0, p2, v5
 
-    iget-object v2, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
-    iget-object v4, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v4, v1, v0}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {v4, v1, v0}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object v0
 
     iget v0, v0, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v2, v3, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v2, v3, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     add-int/lit8 v5, v5, 0x1
 
@@ -852,11 +852,11 @@
 
     check-cast p2, [I
 
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     array-length v0, p2
 
-    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     array-length p1, p2
 
@@ -865,19 +865,19 @@
 
     aget v0, p2, v5
 
-    iget-object v2, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     const/16 v3, 0x49
 
-    iget-object v4, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v4, v1, v0}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {v4, v1, v0}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object v0
 
     iget v0, v0, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v2, v3, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v2, v3, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     add-int/lit8 v5, v5, 0x1
 
@@ -895,11 +895,11 @@
 
     check-cast p2, [J
 
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     array-length v0, p2
 
-    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     array-length p1, p2
 
@@ -908,11 +908,11 @@
 
     aget-wide v0, p2, v5
 
-    iget-object v2, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     const/16 v3, 0x4a
 
-    iget-object v4, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
     const/4 v6, 0x5
 
@@ -922,7 +922,7 @@
 
     iget v0, v0, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v2, v3, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v2, v3, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     add-int/lit8 v5, v5, 0x1
 
@@ -940,11 +940,11 @@
 
     check-cast p2, [F
 
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     array-length v0, p2
 
-    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     array-length p1, p2
 
@@ -953,19 +953,19 @@
 
     aget v0, p2, v5
 
-    iget-object v1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     const/16 v2, 0x46
 
-    iget-object v3, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v3, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v3, v0}, Lorg/a/a/z;->E(F)Lorg/a/a/y;
+    invoke-virtual {v3, v0}, Lorg/a/a/z;->D(F)Lorg/a/a/y;
 
     move-result-object v0
 
     iget v0, v0, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v1, v2, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v1, v2, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     add-int/lit8 v5, v5, 0x1
 
@@ -983,11 +983,11 @@
 
     check-cast p2, [D
 
-    iget-object p1, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     array-length v0, p2
 
-    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p1, v6, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     array-length p1, p2
 
@@ -996,11 +996,11 @@
 
     aget-wide v0, p2, v5
 
-    iget-object v2, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     const/16 v3, 0x44
 
-    iget-object v4, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v4, v0, v1}, Lorg/a/a/z;->h(D)Lorg/a/a/y;
 
@@ -1008,7 +1008,7 @@
 
     iget v0, v0, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v2, v3, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v2, v3, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     add-int/lit8 v5, v5, 0x1
 
@@ -1018,13 +1018,13 @@
     return-void
 
     :cond_16
-    iget-object p1, p0, Lorg/a/a/b;->bCn:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/b;->bCH:Lorg/a/a/z;
 
     invoke-virtual {p1, p2}, Lorg/a/a/z;->bH(Ljava/lang/Object;)Lorg/a/a/y;
 
     move-result-object p1
 
-    iget-object p2, p0, Lorg/a/a/b;->bCp:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/b;->bCJ:Lorg/a/a/d;
 
     iget v0, p1, Lorg/a/a/y;->tag:I
 
@@ -1036,7 +1036,7 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    invoke-virtual {p2, v0, p1}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p2, v0, p1}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/org/a/a/c$a.smali b/com.discord/smali_classes2/org/a/a/c$a.smali
index 2b8dc5cac6..1f3a1d433d 100644
--- a/com.discord/smali_classes2/org/a/a/c$a.smali
+++ b/com.discord/smali_classes2/org/a/a/c$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field bCv:[Lorg/a/a/c;
+.field bCP:[Lorg/a/a/c;
 
 .field size:I
 
@@ -30,7 +30,7 @@
 
     new-array v0, v0, [Lorg/a/a/c;
 
-    iput-object v0, p0, Lorg/a/a/c$a;->bCv:[Lorg/a/a/c;
+    iput-object v0, p0, Lorg/a/a/c$a;->bCP:[Lorg/a/a/c;
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lorg/a/a/c$a;->bCv:[Lorg/a/a/c;
+    iget-object v2, p0, Lorg/a/a/c$a;->bCP:[Lorg/a/a/c;
 
     aget-object v2, v2, v1
 
@@ -83,7 +83,7 @@
 
     iget v1, p0, Lorg/a/a/c$a;->size:I
 
-    iget-object v2, p0, Lorg/a/a/c$a;->bCv:[Lorg/a/a/c;
+    iget-object v2, p0, Lorg/a/a/c$a;->bCP:[Lorg/a/a/c;
 
     array-length v3, v2
 
@@ -97,10 +97,10 @@
 
     invoke-static {v2, v0, v3, v0, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v3, p0, Lorg/a/a/c$a;->bCv:[Lorg/a/a/c;
+    iput-object v3, p0, Lorg/a/a/c$a;->bCP:[Lorg/a/a/c;
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/c$a;->bCv:[Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/c$a;->bCP:[Lorg/a/a/c;
 
     iget v1, p0, Lorg/a/a/c$a;->size:I
 
@@ -111,7 +111,7 @@
     aput-object p1, v0, v1
 
     :cond_3
-    iget-object p1, p1, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iget-object p1, p1, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/org/a/a/c.smali b/com.discord/smali_classes2/org/a/a/c.smali
index e0e2944f49..d21eab0e13 100644
--- a/com.discord/smali_classes2/org/a/a/c.smali
+++ b/com.discord/smali_classes2/org/a/a/c.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field bCu:Lorg/a/a/c;
+.field bCO:Lorg/a/a/c;
 
 .field private content:[B
 
@@ -30,7 +30,7 @@
     return-void
 .end method
 
-.method private IZ()Lorg/a/a/d;
+.method private IM()Lorg/a/a/d;
     .locals 2
 
     new-instance v0, Lorg/a/a/d;
@@ -58,9 +58,9 @@
 
     iget-object v2, v0, Lorg/a/a/c;->type:Ljava/lang/String;
 
-    invoke-virtual {p1, v2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p1, v2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
-    invoke-direct {v0}, Lorg/a/a/c;->IZ()Lorg/a/a/d;
+    invoke-direct {v0}, Lorg/a/a/c;->IM()Lorg/a/a/d;
 
     move-result-object v2
 
@@ -70,7 +70,7 @@
 
     add-int/2addr v1, v2
 
-    iget-object v0, v0, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iget-object v0, v0, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     goto :goto_0
 
@@ -91,7 +91,7 @@
 
     iput-object v1, v0, Lorg/a/a/c;->content:[B
 
-    iget-object p1, p1, Lorg/a/a/e;->bCw:[B
+    iget-object p1, p1, Lorg/a/a/e;->bCQ:[B
 
     iget-object v1, v0, Lorg/a/a/c;->content:[B
 
@@ -110,23 +110,23 @@
     :goto_0
     if-eqz v0, :cond_0
 
-    invoke-direct {v0}, Lorg/a/a/c;->IZ()Lorg/a/a/d;
+    invoke-direct {v0}, Lorg/a/a/c;->IM()Lorg/a/a/d;
 
     move-result-object v1
 
     iget-object v2, v0, Lorg/a/a/c;->type:Ljava/lang/String;
 
-    invoke-virtual {p1, v2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p1, v2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v2
 
-    invoke-virtual {p2, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p2, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
     iget v3, v1, Lorg/a/a/d;->length:I
 
-    invoke-virtual {v2, v3}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v2, v3}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     iget-object v2, v1, Lorg/a/a/d;->data:[B
 
@@ -136,7 +136,7 @@
 
     invoke-virtual {p2, v2, v3, v1}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
-    iget-object v0, v0, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iget-object v0, v0, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     goto :goto_0
 
@@ -158,7 +158,7 @@
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v0, v0, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iget-object v0, v0, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/org/a/a/d.smali b/com.discord/smali_classes2/org/a/a/d.smali
index 299941a1ce..126cdf8770 100644
--- a/com.discord/smali_classes2/org/a/a/d.smali
+++ b/com.discord/smali_classes2/org/a/a/d.smali
@@ -50,7 +50,7 @@
     return-void
 .end method
 
-.method private ec(I)V
+.method private dY(I)V
     .locals 3
 
     iget-object v0, p0, Lorg/a/a/d;->data:[B
@@ -100,7 +100,7 @@
 
     const/16 v1, 0x8
 
-    invoke-direct {p0, v1}, Lorg/a/a/d;->ec(I)V
+    invoke-direct {p0, v1}, Lorg/a/a/d;->dY(I)V
 
     :cond_0
     iget-object v1, p0, Lorg/a/a/d;->data:[B
@@ -178,7 +178,7 @@
     return-object p0
 .end method
 
-.method final ae(II)Lorg/a/a/d;
+.method final ad(II)Lorg/a/a/d;
     .locals 3
 
     iget v0, p0, Lorg/a/a/d;->length:I
@@ -193,7 +193,7 @@
 
     const/4 v1, 0x2
 
-    invoke-direct {p0, v1}, Lorg/a/a/d;->ec(I)V
+    invoke-direct {p0, v1}, Lorg/a/a/d;->dY(I)V
 
     :cond_0
     iget-object v1, p0, Lorg/a/a/d;->data:[B
@@ -215,7 +215,7 @@
     return-object p0
 .end method
 
-.method final af(II)Lorg/a/a/d;
+.method final ae(II)Lorg/a/a/d;
     .locals 3
 
     iget v0, p0, Lorg/a/a/d;->length:I
@@ -230,7 +230,7 @@
 
     const/4 v1, 0x3
 
-    invoke-direct {p0, v1}, Lorg/a/a/d;->ec(I)V
+    invoke-direct {p0, v1}, Lorg/a/a/d;->dY(I)V
 
     :cond_0
     iget-object v1, p0, Lorg/a/a/d;->data:[B
@@ -260,7 +260,7 @@
     return-object p0
 .end method
 
-.method final ag(II)Lorg/a/a/d;
+.method final af(II)Lorg/a/a/d;
     .locals 4
 
     iget v0, p0, Lorg/a/a/d;->length:I
@@ -275,7 +275,7 @@
 
     const/4 v1, 0x4
 
-    invoke-direct {p0, v1}, Lorg/a/a/d;->ec(I)V
+    invoke-direct {p0, v1}, Lorg/a/a/d;->dY(I)V
 
     :cond_0
     iget-object v1, p0, Lorg/a/a/d;->data:[B
@@ -311,7 +311,7 @@
     return-object p0
 .end method
 
-.method public final dZ(I)Lorg/a/a/d;
+.method public final dV(I)Lorg/a/a/d;
     .locals 3
 
     iget v0, p0, Lorg/a/a/d;->length:I
@@ -326,7 +326,7 @@
 
     const/4 v2, 0x1
 
-    invoke-direct {p0, v2}, Lorg/a/a/d;->ec(I)V
+    invoke-direct {p0, v2}, Lorg/a/a/d;->dY(I)V
 
     :cond_0
     iget-object v2, p0, Lorg/a/a/d;->data:[B
@@ -340,7 +340,101 @@
     return-object p0
 .end method
 
-.method public final eP(Ljava/lang/String;)Lorg/a/a/d;
+.method public final dW(I)Lorg/a/a/d;
+    .locals 4
+
+    iget v0, p0, Lorg/a/a/d;->length:I
+
+    add-int/lit8 v1, v0, 0x2
+
+    iget-object v2, p0, Lorg/a/a/d;->data:[B
+
+    array-length v2, v2
+
+    if-le v1, v2, :cond_0
+
+    const/4 v1, 0x2
+
+    invoke-direct {p0, v1}, Lorg/a/a/d;->dY(I)V
+
+    :cond_0
+    iget-object v1, p0, Lorg/a/a/d;->data:[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, Lorg/a/a/d;->length:I
+
+    return-object p0
+.end method
+
+.method public final dX(I)Lorg/a/a/d;
+    .locals 4
+
+    iget v0, p0, Lorg/a/a/d;->length:I
+
+    add-int/lit8 v1, v0, 0x4
+
+    iget-object v2, p0, Lorg/a/a/d;->data:[B
+
+    array-length v2, v2
+
+    if-le v1, v2, :cond_0
+
+    const/4 v1, 0x4
+
+    invoke-direct {p0, v1}, Lorg/a/a/d;->dY(I)V
+
+    :cond_0
+    iget-object v1, p0, Lorg/a/a/d;->data:[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, Lorg/a/a/d;->length:I
+
+    return-object p0
+.end method
+
+.method public final eK(Ljava/lang/String;)Lorg/a/a/d;
     .locals 7
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
@@ -365,7 +459,7 @@
 
     add-int/lit8 v3, v0, 0x2
 
-    invoke-direct {p0, v3}, Lorg/a/a/d;->ec(I)V
+    invoke-direct {p0, v3}, Lorg/a/a/d;->dY(I)V
 
     :cond_0
     iget-object v3, p0, Lorg/a/a/d;->data:[B
@@ -441,100 +535,6 @@
     goto :goto_1
 .end method
 
-.method public final ea(I)Lorg/a/a/d;
-    .locals 4
-
-    iget v0, p0, Lorg/a/a/d;->length:I
-
-    add-int/lit8 v1, v0, 0x2
-
-    iget-object v2, p0, Lorg/a/a/d;->data:[B
-
-    array-length v2, v2
-
-    if-le v1, v2, :cond_0
-
-    const/4 v1, 0x2
-
-    invoke-direct {p0, v1}, Lorg/a/a/d;->ec(I)V
-
-    :cond_0
-    iget-object v1, p0, Lorg/a/a/d;->data:[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, Lorg/a/a/d;->length:I
-
-    return-object p0
-.end method
-
-.method public final eb(I)Lorg/a/a/d;
-    .locals 4
-
-    iget v0, p0, Lorg/a/a/d;->length:I
-
-    add-int/lit8 v1, v0, 0x4
-
-    iget-object v2, p0, Lorg/a/a/d;->data:[B
-
-    array-length v2, v2
-
-    if-le v1, v2, :cond_0
-
-    const/4 v1, 0x4
-
-    invoke-direct {p0, v1}, Lorg/a/a/d;->ec(I)V
-
-    :cond_0
-    iget-object v1, p0, Lorg/a/a/d;->data:[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, Lorg/a/a/d;->length:I
-
-    return-object p0
-.end method
-
 .method final o(III)Lorg/a/a/d;
     .locals 3
 
@@ -550,7 +550,7 @@
 
     const/4 v1, 0x5
 
-    invoke-direct {p0, v1}, Lorg/a/a/d;->ec(I)V
+    invoke-direct {p0, v1}, Lorg/a/a/d;->dY(I)V
 
     :cond_0
     iget-object v1, p0, Lorg/a/a/d;->data:[B
@@ -607,7 +607,7 @@
 
     if-le v0, v1, :cond_0
 
-    invoke-direct {p0, p3}, Lorg/a/a/d;->ec(I)V
+    invoke-direct {p0, p3}, Lorg/a/a/d;->dY(I)V
 
     :cond_0
     if-eqz p1, :cond_1
@@ -713,7 +713,7 @@
 
     sub-int/2addr v2, p2
 
-    invoke-direct {p0, v2}, Lorg/a/a/d;->ec(I)V
+    invoke-direct {p0, v2}, Lorg/a/a/d;->dY(I)V
 
     :cond_4
     iget p3, p0, Lorg/a/a/d;->length:I
diff --git a/com.discord/smali_classes2/org/a/a/e.smali b/com.discord/smali_classes2/org/a/a/e.smali
index c5a684ba2c..2d938f7f51 100644
--- a/com.discord/smali_classes2/org/a/a/e.smali
+++ b/com.discord/smali_classes2/org/a/a/e.smali
@@ -4,19 +4,19 @@
 
 
 # instance fields
-.field private final bCA:[I
+.field public final bCQ:[B
 
-.field public final bCB:I
+.field final bCR:[I
 
-.field public final bCw:[B
+.field private final bCS:[Ljava/lang/String;
 
-.field final bCx:[I
+.field private final bCT:[Lorg/a/a/i;
 
-.field private final bCy:[Ljava/lang/String;
+.field private final bCU:[I
 
-.field private final bCz:[Lorg/a/a/i;
+.field public final bCV:I
 
-.field final oQ:I
+.field final oP:I
 
 
 # direct methods
@@ -25,21 +25,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/e;->bCw:[B
+    iput-object p1, p0, Lorg/a/a/e;->bCQ:[B
 
     const/16 v0, 0x8
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->eb(I)I
 
     move-result v0
 
     new-array v1, v0, [I
 
-    iput-object v1, p0, Lorg/a/a/e;->bCx:[I
+    iput-object v1, p0, Lorg/a/a/e;->bCR:[I
 
     new-array v1, v0, [Ljava/lang/String;
 
-    iput-object v1, p0, Lorg/a/a/e;->bCy:[Ljava/lang/String;
+    iput-object v1, p0, Lorg/a/a/e;->bCS:[Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -60,7 +60,7 @@
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v7, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v7, p0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v8, v1, 0x1
 
@@ -118,7 +118,7 @@
     goto :goto_3
 
     :pswitch_6
-    invoke-direct {p0, v9}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v9}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -139,9 +139,9 @@
     goto :goto_0
 
     :cond_1
-    iput v3, p0, Lorg/a/a/e;->oQ:I
+    iput v3, p0, Lorg/a/a/e;->oP:I
 
-    iput v4, p0, Lorg/a/a/e;->bCB:I
+    iput v4, p0, Lorg/a/a/e;->bCV:I
 
     const/4 p1, 0x0
 
@@ -155,18 +155,18 @@
     move-object v0, p1
 
     :goto_4
-    iput-object v0, p0, Lorg/a/a/e;->bCz:[Lorg/a/a/i;
+    iput-object v0, p0, Lorg/a/a/e;->bCT:[Lorg/a/a/i;
 
     or-int v0, v5, v6
 
     if-eqz v0, :cond_3
 
-    invoke-direct {p0, v3}, Lorg/a/a/e;->ed(I)[I
+    invoke-direct {p0, v3}, Lorg/a/a/e;->dZ(I)[I
 
     move-result-object p1
 
     :cond_3
-    iput-object p1, p0, Lorg/a/a/e;->bCA:[I
+    iput-object p1, p0, Lorg/a/a/e;->bCU:[I
 
     return-void
 
@@ -197,16 +197,16 @@
     .end packed-switch
 .end method
 
-.method private Ja()I
+.method private IN()I
     .locals 4
 
-    iget v0, p0, Lorg/a/a/e;->bCB:I
+    iget v0, p0, Lorg/a/a/e;->bCV:I
 
     add-int/lit8 v1, v0, 0x8
 
     add-int/lit8 v0, v0, 0x6
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->eb(I)I
 
     move-result v0
 
@@ -214,7 +214,7 @@
 
     add-int/2addr v1, v0
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v0
 
@@ -227,7 +227,7 @@
 
     add-int/lit8 v0, v1, 0x6
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->eb(I)I
 
     move-result v0
 
@@ -240,7 +240,7 @@
 
     add-int/lit8 v0, v1, 0x2
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ed(I)I
 
     move-result v0
 
@@ -258,7 +258,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v0
 
@@ -271,7 +271,7 @@
 
     add-int/lit8 v0, v1, 0x6
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->eb(I)I
 
     move-result v0
 
@@ -284,7 +284,7 @@
 
     add-int/lit8 v0, v1, 0x2
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ed(I)I
 
     move-result v0
 
@@ -310,15 +310,15 @@
 .method private a(IZZLorg/a/a/j;)I
     .locals 11
 
-    iget-object v6, p4, Lorg/a/a/j;->bDh:[C
+    iget-object v6, p4, Lorg/a/a/j;->bDB:[C
 
-    iget-object v7, p4, Lorg/a/a/j;->bDl:[Lorg/a/a/r;
+    iget-object v7, p4, Lorg/a/a/j;->bDF:[Lorg/a/a/r;
 
     const/16 v0, 0xff
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/e;->bCw:[B
+    iget-object p2, p0, Lorg/a/a/e;->bCQ:[B
 
     add-int/lit8 v1, p1, 0x1
 
@@ -331,7 +331,7 @@
     :cond_0
     const/4 p2, -0x1
 
-    iput p2, p4, Lorg/a/a/j;->bDr:I
+    iput p2, p4, Lorg/a/a/j;->bDL:I
 
     move v1, p1
 
@@ -340,7 +340,7 @@
     :goto_0
     const/4 p2, 0x0
 
-    iput p2, p4, Lorg/a/a/j;->bDu:I
+    iput p2, p4, Lorg/a/a/j;->bDO:I
 
     const/4 v2, 0x3
 
@@ -350,9 +350,9 @@
 
     if-ge p1, v3, :cond_1
 
-    iput v2, p4, Lorg/a/a/j;->bDs:I
+    iput v2, p4, Lorg/a/a/j;->bDM:I
 
-    iput p2, p4, Lorg/a/a/j;->bDw:I
+    iput p2, p4, Lorg/a/a/j;->bDQ:I
 
     :goto_1
     move v10, p1
@@ -368,7 +368,7 @@
 
     add-int/lit8 p1, p1, -0x40
 
-    iget-object v2, p4, Lorg/a/a/j;->bDx:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bDR:[Ljava/lang/Object;
 
     const/4 v3, 0x0
 
@@ -382,9 +382,9 @@
 
     move-result v1
 
-    iput v9, p4, Lorg/a/a/j;->bDs:I
+    iput v9, p4, Lorg/a/a/j;->bDM:I
 
-    iput v8, p4, Lorg/a/a/j;->bDw:I
+    iput v8, p4, Lorg/a/a/j;->bDQ:I
 
     goto :goto_1
 
@@ -393,7 +393,7 @@
 
     if-lt p1, v3, :cond_b
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v10
 
@@ -401,7 +401,7 @@
 
     if-ne p1, v3, :cond_3
 
-    iget-object v2, p4, Lorg/a/a/j;->bDx:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bDR:[Ljava/lang/Object;
 
     const/4 v3, 0x0
 
@@ -415,9 +415,9 @@
 
     move-result v1
 
-    iput v9, p4, Lorg/a/a/j;->bDs:I
+    iput v9, p4, Lorg/a/a/j;->bDM:I
 
-    iput v8, p4, Lorg/a/a/j;->bDw:I
+    iput v8, p4, Lorg/a/a/j;->bDQ:I
 
     goto/16 :goto_6
 
@@ -432,30 +432,30 @@
 
     if-ge p1, v4, :cond_4
 
-    iput v9, p4, Lorg/a/a/j;->bDs:I
+    iput v9, p4, Lorg/a/a/j;->bDM:I
 
     sub-int/2addr v4, p1
 
-    iput v4, p4, Lorg/a/a/j;->bDu:I
+    iput v4, p4, Lorg/a/a/j;->bDO:I
 
-    iget p1, p4, Lorg/a/a/j;->bDt:I
+    iget p1, p4, Lorg/a/a/j;->bDN:I
 
-    iget p3, p4, Lorg/a/a/j;->bDu:I
+    iget p3, p4, Lorg/a/a/j;->bDO:I
 
     sub-int/2addr p1, p3
 
-    iput p1, p4, Lorg/a/a/j;->bDt:I
+    iput p1, p4, Lorg/a/a/j;->bDN:I
 
-    iput p2, p4, Lorg/a/a/j;->bDw:I
+    iput p2, p4, Lorg/a/a/j;->bDQ:I
 
     goto/16 :goto_6
 
     :cond_4
     if-ne p1, v4, :cond_5
 
-    iput v2, p4, Lorg/a/a/j;->bDs:I
+    iput v2, p4, Lorg/a/a/j;->bDM:I
 
-    iput p2, p4, Lorg/a/a/j;->bDw:I
+    iput p2, p4, Lorg/a/a/j;->bDQ:I
 
     goto/16 :goto_6
 
@@ -464,7 +464,7 @@
 
     if-eqz p3, :cond_6
 
-    iget p3, p4, Lorg/a/a/j;->bDt:I
+    iget p3, p4, Lorg/a/a/j;->bDN:I
 
     goto :goto_2
 
@@ -481,7 +481,7 @@
     :goto_3
     if-lez p3, :cond_7
 
-    iget-object v2, p4, Lorg/a/a/j;->bDv:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bDP:[Ljava/lang/Object;
 
     add-int/lit8 v9, v3, 0x1
 
@@ -502,41 +502,41 @@
     goto :goto_3
 
     :cond_7
-    iput v8, p4, Lorg/a/a/j;->bDs:I
+    iput v8, p4, Lorg/a/a/j;->bDM:I
 
-    iput p1, p4, Lorg/a/a/j;->bDu:I
+    iput p1, p4, Lorg/a/a/j;->bDO:I
 
-    iget p1, p4, Lorg/a/a/j;->bDt:I
+    iget p1, p4, Lorg/a/a/j;->bDN:I
 
-    iget p3, p4, Lorg/a/a/j;->bDu:I
+    iget p3, p4, Lorg/a/a/j;->bDO:I
 
     add-int/2addr p1, p3
 
-    iput p1, p4, Lorg/a/a/j;->bDt:I
+    iput p1, p4, Lorg/a/a/j;->bDN:I
 
-    iput p2, p4, Lorg/a/a/j;->bDw:I
+    iput p2, p4, Lorg/a/a/j;->bDQ:I
 
     goto :goto_6
 
     :cond_8
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result p1
 
     add-int/lit8 v1, v1, 0x2
 
-    iput p2, p4, Lorg/a/a/j;->bDs:I
+    iput p2, p4, Lorg/a/a/j;->bDM:I
 
-    iput p1, p4, Lorg/a/a/j;->bDu:I
+    iput p1, p4, Lorg/a/a/j;->bDO:I
 
-    iput p1, p4, Lorg/a/a/j;->bDt:I
+    iput p1, p4, Lorg/a/a/j;->bDN:I
 
     const/4 p3, 0x0
 
     :goto_4
     if-ge p3, p1, :cond_9
 
-    iget-object v2, p4, Lorg/a/a/j;->bDv:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bDP:[Ljava/lang/Object;
 
     move-object v0, p0
 
@@ -555,18 +555,18 @@
     goto :goto_4
 
     :cond_9
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result p1
 
     add-int/2addr v1, v9
 
-    iput p1, p4, Lorg/a/a/j;->bDw:I
+    iput p1, p4, Lorg/a/a/j;->bDQ:I
 
     :goto_5
     if-ge p2, p1, :cond_a
 
-    iget-object v2, p4, Lorg/a/a/j;->bDx:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bDR:[Ljava/lang/Object;
 
     move-object v0, p0
 
@@ -586,15 +586,15 @@
 
     :cond_a
     :goto_6
-    iget p1, p4, Lorg/a/a/j;->bDr:I
+    iget p1, p4, Lorg/a/a/j;->bDL:I
 
     add-int/2addr v10, v8
 
     add-int/2addr p1, v10
 
-    iput p1, p4, Lorg/a/a/j;->bDr:I
+    iput p1, p4, Lorg/a/a/j;->bDL:I
 
-    iget p1, p4, Lorg/a/a/j;->bDr:I
+    iget p1, p4, Lorg/a/a/j;->bDL:I
 
     invoke-static {p1, v7}, Lorg/a/a/e;->b(I[Lorg/a/a/r;)Lorg/a/a/r;
 
@@ -617,7 +617,7 @@
 .method private a(I[Ljava/lang/Object;I[C[Lorg/a/a/r;)I
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/e;->bCw:[B
+    iget-object v0, p0, Lorg/a/a/e;->bCQ:[B
 
     add-int/lit8 v1, p1, 0x1
 
@@ -634,7 +634,7 @@
     throw p1
 
     :pswitch_0
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result p1
 
@@ -659,49 +659,49 @@
     goto :goto_1
 
     :pswitch_2
-    sget-object p1, Lorg/a/a/x;->bFv:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bFP:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
     goto :goto_1
 
     :pswitch_3
-    sget-object p1, Lorg/a/a/x;->bFu:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bFO:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
     goto :goto_1
 
     :pswitch_4
-    sget-object p1, Lorg/a/a/x;->bFt:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bFN:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
     goto :goto_1
 
     :pswitch_5
-    sget-object p1, Lorg/a/a/x;->bFs:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bFM:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
     goto :goto_1
 
     :pswitch_6
-    sget-object p1, Lorg/a/a/x;->bFr:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bFL:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
     goto :goto_1
 
     :pswitch_7
-    sget-object p1, Lorg/a/a/x;->bFq:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bFK:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
     goto :goto_1
 
     :pswitch_8
-    sget-object p1, Lorg/a/a/x;->bFp:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bFJ:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
@@ -737,7 +737,7 @@
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lorg/a/a/e;->bCw:[B
+    iget-object p1, p0, Lorg/a/a/e;->bCQ:[B
 
     aget-byte p1, p1, p2
 
@@ -779,7 +779,7 @@
     return p1
 
     :cond_3
-    iget-object v5, p0, Lorg/a/a/e;->bCw:[B
+    iget-object v5, p0, Lorg/a/a/e;->bCQ:[B
 
     add-int/lit8 v6, p2, 0x1
 
@@ -830,15 +830,15 @@
     throw p1
 
     :pswitch_0
-    iget-object p2, p0, Lorg/a/a/e;->bCx:[I
+    iget-object p2, p0, Lorg/a/a/e;->bCR:[I
 
-    invoke-direct {p0, v6}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v6}, Lorg/a/a/e;->eb(I)I
 
     move-result p4
 
     aget p2, p2, p4
 
-    invoke-direct {p0, p2}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, p2}, Lorg/a/a/e;->ed(I)I
 
     move-result p2
 
@@ -853,15 +853,15 @@
     goto :goto_0
 
     :pswitch_1
-    iget-object p2, p0, Lorg/a/a/e;->bCx:[I
+    iget-object p2, p0, Lorg/a/a/e;->bCR:[I
 
-    invoke-direct {p0, v6}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v6}, Lorg/a/a/e;->eb(I)I
 
     move-result p4
 
     aget p2, p2, p4
 
-    invoke-direct {p0, p2}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, p2}, Lorg/a/a/e;->ed(I)I
 
     move-result p2
 
@@ -879,7 +879,7 @@
     goto/16 :goto_b
 
     :cond_4
-    invoke-direct {p0, v6}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v6}, Lorg/a/a/e;->eb(I)I
 
     move-result p2
 
@@ -887,7 +887,7 @@
 
     if-nez p2, :cond_5
 
-    invoke-virtual {p1, p3}, Lorg/a/a/a;->eN(Ljava/lang/String;)Lorg/a/a/a;
+    invoke-virtual {p1, p3}, Lorg/a/a/a;->eI(Ljava/lang/String;)Lorg/a/a/a;
 
     move-result-object p1
 
@@ -900,7 +900,7 @@
     return p1
 
     :cond_5
-    iget-object v0, p0, Lorg/a/a/e;->bCw:[B
+    iget-object v0, p0, Lorg/a/a/e;->bCQ:[B
 
     aget-byte v0, v0, v6
 
@@ -918,7 +918,7 @@
 
     packed-switch v0, :pswitch_data_1
 
-    invoke-virtual {p1, p3}, Lorg/a/a/a;->eN(Ljava/lang/String;)Lorg/a/a/a;
+    invoke-virtual {p1, p3}, Lorg/a/a/a;->eI(Ljava/lang/String;)Lorg/a/a/a;
 
     move-result-object p1
 
@@ -936,17 +936,17 @@
     :goto_1
     if-ge v3, p2, :cond_6
 
-    iget-object v0, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v0, p0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v1, v6, 0x1
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
     aget v0, v0, v1
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->ei(I)J
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ee(I)J
 
     move-result-wide v0
 
@@ -973,17 +973,17 @@
     :goto_2
     if-ge v3, p2, :cond_7
 
-    iget-object v0, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v0, p0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v1, v6, 0x1
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
     aget v0, v0, v1
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ed(I)I
 
     move-result v0
 
@@ -1008,17 +1008,17 @@
     :goto_3
     if-ge v3, p2, :cond_8
 
-    iget-object v0, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v0, p0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v1, v6, 0x1
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
     aget v0, v0, v1
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ed(I)I
 
     move-result v0
 
@@ -1043,17 +1043,17 @@
     :goto_4
     if-ge v3, p2, :cond_a
 
-    iget-object v0, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v0, p0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v1, v6, 0x1
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
     aget v0, v0, v1
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->ei(I)J
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ee(I)J
 
     move-result-wide v0
 
@@ -1076,17 +1076,17 @@
     :goto_5
     if-ge v3, p2, :cond_c
 
-    iget-object v0, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v0, p0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v1, v6, 0x1
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
     aget v0, v0, v1
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ed(I)I
 
     move-result v0
 
@@ -1111,17 +1111,17 @@
     :goto_6
     if-ge v0, p2, :cond_f
 
-    iget-object v1, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v1, p0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v2, v6, 0x1
 
-    invoke-direct {p0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
     aget v1, v1, v2
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->ed(I)I
 
     move-result v1
 
@@ -1154,17 +1154,17 @@
     :goto_8
     if-ge v3, p2, :cond_11
 
-    iget-object v0, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v0, p0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v1, v6, 0x1
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
     aget v0, v0, v1
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ed(I)I
 
     move-result v0
 
@@ -1189,17 +1189,17 @@
     :goto_9
     if-ge v3, p2, :cond_13
 
-    iget-object v0, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v0, p0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v1, v6, 0x1
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
     aget v0, v0, v1
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ed(I)I
 
     move-result v0
 
@@ -1221,15 +1221,15 @@
     goto :goto_b
 
     :cond_14
-    iget-object p2, p0, Lorg/a/a/e;->bCx:[I
+    iget-object p2, p0, Lorg/a/a/e;->bCR:[I
 
-    invoke-direct {p0, v6}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v6}, Lorg/a/a/e;->eb(I)I
 
     move-result p4
 
     aget p2, p2, p4
 
-    invoke-direct {p0, p2}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, p2}, Lorg/a/a/e;->ed(I)I
 
     move-result p2
 
@@ -1278,7 +1278,7 @@
 
     move-result-object p2
 
-    invoke-static {p2}, Lorg/a/a/aa;->eZ(Ljava/lang/String;)Lorg/a/a/aa;
+    invoke-static {p2}, Lorg/a/a/aa;->eU(Ljava/lang/String;)Lorg/a/a/aa;
 
     move-result-object p2
 
@@ -1287,15 +1287,15 @@
     goto/16 :goto_0
 
     :cond_19
-    iget-object p2, p0, Lorg/a/a/e;->bCx:[I
+    iget-object p2, p0, Lorg/a/a/e;->bCR:[I
 
-    invoke-direct {p0, v6}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v6}, Lorg/a/a/e;->eb(I)I
 
     move-result p4
 
     aget p2, p2, p4
 
-    invoke-direct {p0, p2}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, p2}, Lorg/a/a/e;->ed(I)I
 
     move-result p2
 
@@ -1311,7 +1311,7 @@
 
     :cond_1a
     :pswitch_5
-    invoke-direct {p0, v6}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v6}, Lorg/a/a/e;->eb(I)I
 
     move-result p2
 
@@ -1359,7 +1359,7 @@
 .method private a(Lorg/a/a/a;IZ[C)I
     .locals 1
 
-    invoke-direct {p0, p2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, p2}, Lorg/a/a/e;->eb(I)I
 
     move-result v0
 
@@ -1405,7 +1405,7 @@
     :cond_1
     if-eqz p1, :cond_2
 
-    invoke-virtual {p1}, Lorg/a/a/a;->IY()V
+    invoke-virtual {p1}, Lorg/a/a/a;->IL()V
 
     :cond_2
     return p2
@@ -1414,7 +1414,7 @@
 .method private a(Lorg/a/a/j;I)I
     .locals 9
 
-    invoke-direct {p0, p2}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, p2}, Lorg/a/a/e;->ed(I)I
 
     move-result v0
 
@@ -1457,7 +1457,7 @@
 
     add-int/lit8 v1, p2, 0x1
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -1465,42 +1465,42 @@
 
     new-array v3, v1, [Lorg/a/a/r;
 
-    iput-object v3, p1, Lorg/a/a/j;->bDo:[Lorg/a/a/r;
+    iput-object v3, p1, Lorg/a/a/j;->bDI:[Lorg/a/a/r;
 
     new-array v3, v1, [Lorg/a/a/r;
 
-    iput-object v3, p1, Lorg/a/a/j;->bDp:[Lorg/a/a/r;
+    iput-object v3, p1, Lorg/a/a/j;->bDJ:[Lorg/a/a/r;
 
     new-array v3, v1, [I
 
-    iput-object v3, p1, Lorg/a/a/j;->bDq:[I
+    iput-object v3, p1, Lorg/a/a/j;->bDK:[I
 
     const/4 v3, 0x0
 
     :goto_0
     if-ge v3, v1, :cond_1
 
-    invoke-direct {p0, p2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, p2}, Lorg/a/a/e;->eb(I)I
 
     move-result v4
 
     add-int/lit8 v5, p2, 0x2
 
-    invoke-direct {p0, v5}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v5}, Lorg/a/a/e;->eb(I)I
 
     move-result v5
 
     add-int/lit8 v6, p2, 0x4
 
-    invoke-direct {p0, v6}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v6}, Lorg/a/a/e;->eb(I)I
 
     move-result v6
 
     add-int/lit8 p2, p2, 0x6
 
-    iget-object v7, p1, Lorg/a/a/j;->bDo:[Lorg/a/a/r;
+    iget-object v7, p1, Lorg/a/a/j;->bDI:[Lorg/a/a/r;
 
-    iget-object v8, p1, Lorg/a/a/j;->bDl:[Lorg/a/a/r;
+    iget-object v8, p1, Lorg/a/a/j;->bDF:[Lorg/a/a/r;
 
     invoke-static {v4, v8}, Lorg/a/a/e;->b(I[Lorg/a/a/r;)Lorg/a/a/r;
 
@@ -1508,11 +1508,11 @@
 
     aput-object v8, v7, v3
 
-    iget-object v7, p1, Lorg/a/a/j;->bDp:[Lorg/a/a/r;
+    iget-object v7, p1, Lorg/a/a/j;->bDJ:[Lorg/a/a/r;
 
     add-int/2addr v4, v5
 
-    iget-object v5, p1, Lorg/a/a/j;->bDl:[Lorg/a/a/r;
+    iget-object v5, p1, Lorg/a/a/j;->bDF:[Lorg/a/a/r;
 
     invoke-static {v4, v5}, Lorg/a/a/e;->b(I[Lorg/a/a/r;)Lorg/a/a/r;
 
@@ -1520,7 +1520,7 @@
 
     aput-object v4, v7, v3
 
-    iget-object v4, p1, Lorg/a/a/j;->bDq:[I
+    iget-object v4, p1, Lorg/a/a/j;->bDK:[I
 
     aput v6, v4, v3
 
@@ -1553,9 +1553,9 @@
 
     :cond_1
     :goto_2
-    iput v0, p1, Lorg/a/a/j;->bDm:I
+    iput v0, p1, Lorg/a/a/j;->bDG:I
 
-    invoke-direct {p0, p2}, Lorg/a/a/e;->ee(I)I
+    invoke-direct {p0, p2}, Lorg/a/a/e;->ea(I)I
 
     move-result v0
 
@@ -1568,12 +1568,12 @@
     :cond_2
     new-instance v1, Lorg/a/a/ab;
 
-    iget-object v3, p0, Lorg/a/a/e;->bCw:[B
+    iget-object v3, p0, Lorg/a/a/e;->bCQ:[B
 
     invoke-direct {v1, v3, p2}, Lorg/a/a/ab;-><init>([BI)V
 
     :goto_3
-    iput-object v1, p1, Lorg/a/a/j;->bDn:Lorg/a/a/ab;
+    iput-object v1, p1, Lorg/a/a/j;->bDH:Lorg/a/a/ab;
 
     add-int/2addr p2, v2
 
@@ -1625,7 +1625,7 @@
 
     aget v0, p1, p2
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->ee(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ea(I)I
 
     move-result v0
 
@@ -1640,7 +1640,7 @@
 
     add-int/lit8 p1, p1, 0x1
 
-    invoke-direct {p0, p1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, p1}, Lorg/a/a/e;->eb(I)I
 
     move-result p1
 
@@ -1658,7 +1658,7 @@
 
     add-int/2addr p2, p1
 
-    iget-object v0, p0, Lorg/a/a/e;->bCw:[B
+    iget-object v0, p0, Lorg/a/a/e;->bCQ:[B
 
     const/4 v1, 0x0
 
@@ -1763,7 +1763,7 @@
 .method private a(I[C)Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0, p1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, p1}, Lorg/a/a/e;->eb(I)I
 
     move-result v0
 
@@ -1852,11 +1852,11 @@
 .method private a(Lorg/a/a/j;)V
     .locals 10
 
-    iget-object v0, p1, Lorg/a/a/j;->bDk:Ljava/lang/String;
+    iget-object v0, p1, Lorg/a/a/j;->bDE:Ljava/lang/String;
 
-    iget-object v1, p1, Lorg/a/a/j;->bDv:[Ljava/lang/Object;
+    iget-object v1, p1, Lorg/a/a/j;->bDP:[Ljava/lang/Object;
 
-    iget v2, p1, Lorg/a/a/j;->bDi:I
+    iget v2, p1, Lorg/a/a/j;->bDC:I
 
     and-int/lit8 v2, v2, 0x8
 
@@ -1866,7 +1866,7 @@
 
     if-nez v2, :cond_1
 
-    iget-object v2, p1, Lorg/a/a/j;->bDj:Ljava/lang/String;
+    iget-object v2, p1, Lorg/a/a/j;->bDD:Ljava/lang/String;
 
     const-string v5, "<init>"
 
@@ -1876,18 +1876,18 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lorg/a/a/x;->bFv:Ljava/lang/Integer;
+    sget-object v2, Lorg/a/a/x;->bFP:Ljava/lang/Integer;
 
     aput-object v2, v1, v3
 
     goto :goto_0
 
     :cond_0
-    iget v2, p0, Lorg/a/a/e;->bCB:I
+    iget v2, p0, Lorg/a/a/e;->bCV:I
 
     add-int/lit8 v2, v2, 0x2
 
-    iget-object v5, p1, Lorg/a/a/j;->bDh:[C
+    iget-object v5, p1, Lorg/a/a/j;->bDB:[C
 
     invoke-direct {p0, v2, v5}, Lorg/a/a/e;->c(I[C)Ljava/lang/String;
 
@@ -1940,14 +1940,14 @@
 
     packed-switch v6, :pswitch_data_0
 
-    iput v3, p1, Lorg/a/a/j;->bDt:I
+    iput v3, p1, Lorg/a/a/j;->bDN:I
 
     return-void
 
     :pswitch_0
     add-int/lit8 v2, v3, 0x1
 
-    sget-object v6, Lorg/a/a/x;->bFs:Ljava/lang/Integer;
+    sget-object v6, Lorg/a/a/x;->bFM:Ljava/lang/Integer;
 
     aput-object v6, v1, v3
 
@@ -2003,7 +2003,7 @@
     :cond_5
     add-int/lit8 v2, v3, 0x1
 
-    sget-object v6, Lorg/a/a/x;->bFt:Ljava/lang/Integer;
+    sget-object v6, Lorg/a/a/x;->bFN:Ljava/lang/Integer;
 
     aput-object v6, v1, v3
 
@@ -2013,7 +2013,7 @@
     :pswitch_1
     add-int/lit8 v2, v3, 0x1
 
-    sget-object v6, Lorg/a/a/x;->bFq:Ljava/lang/Integer;
+    sget-object v6, Lorg/a/a/x;->bFK:Ljava/lang/Integer;
 
     aput-object v6, v1, v3
 
@@ -2058,7 +2058,7 @@
     :cond_9
     add-int/lit8 v2, v3, 0x1
 
-    sget-object v6, Lorg/a/a/x;->bFr:Ljava/lang/Integer;
+    sget-object v6, Lorg/a/a/x;->bFL:Ljava/lang/Integer;
 
     aput-object v6, v1, v3
 
@@ -2083,23 +2083,23 @@
 
     move/from16 v1, p3
 
-    iget-object v7, v0, Lorg/a/a/e;->bCw:[B
+    iget-object v7, v0, Lorg/a/a/e;->bCQ:[B
 
-    iget-object v11, v10, Lorg/a/a/j;->bDh:[C
+    iget-object v11, v10, Lorg/a/a/j;->bDB:[C
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v12
 
     add-int/lit8 v2, v1, 0x2
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v13
 
     add-int/lit8 v2, v1, 0x4
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->ed(I)I
 
     move-result v8
 
@@ -2113,7 +2113,7 @@
 
     new-array v5, v1, [Lorg/a/a/r;
 
-    iput-object v5, v10, Lorg/a/a/j;->bDl:[Lorg/a/a/r;
+    iput-object v5, v10, Lorg/a/a/j;->bDF:[Lorg/a/a/r;
 
     move v1, v15
 
@@ -2140,7 +2140,7 @@
     :pswitch_0
     add-int/lit8 v3, v1, 0x1
 
-    invoke-direct {v0, v3}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v3}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
@@ -2153,7 +2153,7 @@
     :pswitch_1
     add-int/lit8 v3, v1, 0x1
 
-    invoke-direct {v0, v3}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v3}, Lorg/a/a/e;->ed(I)I
 
     move-result v3
 
@@ -2210,7 +2210,7 @@
 
     add-int/2addr v1, v3
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->ed(I)I
 
     move-result v3
 
@@ -2220,7 +2220,7 @@
 
     add-int/lit8 v3, v1, 0x4
 
-    invoke-direct {v0, v3}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v3}, Lorg/a/a/e;->ed(I)I
 
     move-result v3
 
@@ -2233,7 +2233,7 @@
 
     add-int/lit8 v3, v1, 0x4
 
-    invoke-direct {v0, v3}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v3}, Lorg/a/a/e;->ed(I)I
 
     move-result v3
 
@@ -2254,7 +2254,7 @@
 
     add-int/2addr v1, v3
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->ed(I)I
 
     move-result v3
 
@@ -2264,13 +2264,13 @@
 
     add-int/lit8 v3, v1, 0x8
 
-    invoke-direct {v0, v3}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v3}, Lorg/a/a/e;->ed(I)I
 
     move-result v3
 
     add-int/lit8 v4, v1, 0x4
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->ed(I)I
 
     move-result v4
 
@@ -2287,7 +2287,7 @@
 
     if-lez v3, :cond_0
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->ed(I)I
 
     move-result v3
 
@@ -2304,7 +2304,7 @@
     :pswitch_7
     add-int/lit8 v3, v1, 0x1
 
-    invoke-direct {v0, v3}, Lorg/a/a/e;->eg(I)S
+    invoke-direct {v0, v3}, Lorg/a/a/e;->ec(I)S
 
     move-result v3
 
@@ -2329,7 +2329,7 @@
     goto/16 :goto_0
 
     :cond_3
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -2340,7 +2340,7 @@
 
     if-lez v2, :cond_4
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -2350,7 +2350,7 @@
 
     add-int/lit8 v4, v1, 0x2
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->eb(I)I
 
     move-result v4
 
@@ -2360,7 +2360,7 @@
 
     add-int/lit8 v14, v1, 0x4
 
-    invoke-direct {v0, v14}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v14}, Lorg/a/a/e;->eb(I)I
 
     move-result v14
 
@@ -2370,13 +2370,13 @@
 
     move/from16 v18, v3
 
-    iget-object v3, v0, Lorg/a/a/e;->bCx:[I
+    iget-object v3, v0, Lorg/a/a/e;->bCR:[I
 
     move/from16 v19, v6
 
     add-int/lit8 v6, v1, 0x6
 
-    invoke-direct {v0, v6}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v6}, Lorg/a/a/e;->eb(I)I
 
     move-result v6
 
@@ -2403,7 +2403,7 @@
     :cond_4
     move/from16 v19, v6
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -2436,7 +2436,7 @@
 
     add-int/lit8 v6, v1, 0x2
 
-    invoke-direct {v0, v6}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v6}, Lorg/a/a/e;->ed(I)I
 
     move-result v6
 
@@ -2452,13 +2452,13 @@
 
     if-eqz v3, :cond_7
 
-    iget v2, v10, Lorg/a/a/j;->bDg:I
+    iget v2, v10, Lorg/a/a/j;->bDA:I
 
     and-int/lit8 v2, v2, 0x2
 
     if-nez v2, :cond_6
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -2469,7 +2469,7 @@
 
     if-lez v2, :cond_5
 
-    invoke-direct {v0, v3}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v3}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -2479,7 +2479,7 @@
 
     add-int/lit8 v11, v3, 0x2
 
-    invoke-direct {v0, v11}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v11}, Lorg/a/a/e;->eb(I)I
 
     move-result v11
 
@@ -2535,13 +2535,13 @@
 
     if-eqz v3, :cond_a
 
-    iget v2, v10, Lorg/a/a/j;->bDg:I
+    iget v2, v10, Lorg/a/a/j;->bDA:I
 
     and-int/lit8 v2, v2, 0x2
 
     if-nez v2, :cond_8
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -2552,7 +2552,7 @@
 
     if-lez v2, :cond_8
 
-    invoke-direct {v0, v3}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v3}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -2560,7 +2560,7 @@
 
     add-int/lit8 v11, v3, 0x2
 
-    invoke-direct {v0, v11}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v11}, Lorg/a/a/e;->eb(I)I
 
     move-result v11
 
@@ -2570,7 +2570,7 @@
 
     aget-object v2, v5, v2
 
-    invoke-virtual {v2, v11}, Lorg/a/a/r;->el(I)V
+    invoke-virtual {v2, v11}, Lorg/a/a/r;->eh(I)V
 
     move/from16 v2, v28
 
@@ -2625,7 +2625,7 @@
 
     if-eqz v11, :cond_d
 
-    iget v2, v10, Lorg/a/a/j;->bDg:I
+    iget v2, v10, Lorg/a/a/j;->bDA:I
 
     and-int/lit8 v2, v2, 0x4
 
@@ -2650,7 +2650,7 @@
 
     if-eqz v11, :cond_e
 
-    iget v2, v10, Lorg/a/a/j;->bDg:I
+    iget v2, v10, Lorg/a/a/j;->bDA:I
 
     and-int/lit8 v2, v2, 0x4
 
@@ -2669,13 +2669,13 @@
     goto :goto_a
 
     :cond_e
-    iget-object v11, v10, Lorg/a/a/j;->bDf:[Lorg/a/a/c;
+    iget-object v11, v10, Lorg/a/a/j;->bDz:[Lorg/a/a/c;
 
     invoke-direct {v0, v11, v2, v1, v6}, Lorg/a/a/e;->a([Lorg/a/a/c;Ljava/lang/String;II)Lorg/a/a/c;
 
     move-result-object v2
 
-    iput-object v4, v2, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iput-object v4, v2, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     move-object v4, v2
 
@@ -2698,7 +2698,7 @@
 
     const/4 v3, 0x1
 
-    iget v1, v10, Lorg/a/a/j;->bDg:I
+    iget v1, v10, Lorg/a/a/j;->bDA:I
 
     const/16 v2, 0x8
 
@@ -2718,25 +2718,25 @@
 
     if-eqz v18, :cond_14
 
-    iput v6, v10, Lorg/a/a/j;->bDr:I
+    iput v6, v10, Lorg/a/a/j;->bDL:I
 
     const/4 v2, 0x0
 
-    iput v2, v10, Lorg/a/a/j;->bDs:I
+    iput v2, v10, Lorg/a/a/j;->bDM:I
 
-    iput v2, v10, Lorg/a/a/j;->bDt:I
+    iput v2, v10, Lorg/a/a/j;->bDN:I
 
-    iput v2, v10, Lorg/a/a/j;->bDu:I
+    iput v2, v10, Lorg/a/a/j;->bDO:I
 
     new-array v1, v13, [Ljava/lang/Object;
 
-    iput-object v1, v10, Lorg/a/a/j;->bDv:[Ljava/lang/Object;
+    iput-object v1, v10, Lorg/a/a/j;->bDP:[Ljava/lang/Object;
 
-    iput v2, v10, Lorg/a/a/j;->bDw:I
+    iput v2, v10, Lorg/a/a/j;->bDQ:I
 
     new-array v1, v12, [Ljava/lang/Object;
 
-    iput-object v1, v10, Lorg/a/a/j;->bDx:[Ljava/lang/Object;
+    iput-object v1, v10, Lorg/a/a/j;->bDR:[Ljava/lang/Object;
 
     if-eqz v11, :cond_12
 
@@ -2758,7 +2758,7 @@
 
     add-int/lit8 v2, v1, 0x1
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -2792,7 +2792,7 @@
     :cond_14
     if-eqz v11, :cond_15
 
-    iget v1, v10, Lorg/a/a/j;->bDg:I
+    iget v1, v10, Lorg/a/a/j;->bDA:I
 
     and-int/lit16 v1, v1, 0x100
 
@@ -2874,7 +2874,7 @@
 
     move-result v2
 
-    iget v3, v10, Lorg/a/a/j;->bDg:I
+    iget v3, v10, Lorg/a/a/j;->bDA:I
 
     and-int/lit16 v3, v3, 0x100
 
@@ -2911,7 +2911,7 @@
 
     if-eqz v2, :cond_18
 
-    iget v8, v10, Lorg/a/a/j;->bDg:I
+    iget v8, v10, Lorg/a/a/j;->bDA:I
 
     and-int/lit8 v8, v8, 0x2
 
@@ -2933,11 +2933,11 @@
     :goto_11
     if-eqz v8, :cond_1f
 
-    iget v2, v10, Lorg/a/a/j;->bDr:I
+    iget v2, v10, Lorg/a/a/j;->bDL:I
 
     if-eq v2, v3, :cond_1a
 
-    iget v2, v10, Lorg/a/a/j;->bDr:I
+    iget v2, v10, Lorg/a/a/j;->bDL:I
 
     move/from16 v18, v3
 
@@ -2968,7 +2968,7 @@
     const/4 v3, -0x1
 
     :goto_12
-    iget v2, v10, Lorg/a/a/j;->bDr:I
+    iget v2, v10, Lorg/a/a/j;->bDL:I
 
     if-eq v2, v3, :cond_1d
 
@@ -2981,21 +2981,21 @@
     goto :goto_13
 
     :cond_1b
-    iget v2, v10, Lorg/a/a/j;->bDs:I
+    iget v2, v10, Lorg/a/a/j;->bDM:I
 
-    iget v1, v10, Lorg/a/a/j;->bDu:I
+    iget v1, v10, Lorg/a/a/j;->bDO:I
 
     move/from16 v21, v4
 
-    iget-object v4, v10, Lorg/a/a/j;->bDv:[Ljava/lang/Object;
+    iget-object v4, v10, Lorg/a/a/j;->bDP:[Ljava/lang/Object;
 
     move-object/from16 v33, v5
 
-    iget v5, v10, Lorg/a/a/j;->bDw:I
+    iget v5, v10, Lorg/a/a/j;->bDQ:I
 
     move-object/from16 v34, v6
 
-    iget-object v6, v10, Lorg/a/a/j;->bDx:[Ljava/lang/Object;
+    iget-object v6, v10, Lorg/a/a/j;->bDR:[Ljava/lang/Object;
 
     move/from16 v35, v1
 
@@ -3037,13 +3037,13 @@
 
     const/4 v2, -0x1
 
-    iget v3, v10, Lorg/a/a/j;->bDt:I
+    iget v3, v10, Lorg/a/a/j;->bDN:I
 
-    iget-object v4, v10, Lorg/a/a/j;->bDv:[Ljava/lang/Object;
+    iget-object v4, v10, Lorg/a/a/j;->bDP:[Ljava/lang/Object;
 
-    iget v5, v10, Lorg/a/a/j;->bDw:I
+    iget v5, v10, Lorg/a/a/j;->bDQ:I
 
-    iget-object v6, v10, Lorg/a/a/j;->bDx:[Ljava/lang/Object;
+    iget-object v6, v10, Lorg/a/a/j;->bDR:[Ljava/lang/Object;
 
     move-object/from16 v1, p1
 
@@ -3126,7 +3126,7 @@
 
     if-eqz v1, :cond_21
 
-    iget v1, v10, Lorg/a/a/j;->bDg:I
+    iget v1, v10, Lorg/a/a/j;->bDA:I
 
     const/16 v2, 0x8
 
@@ -3174,7 +3174,7 @@
 
     add-int/lit8 v4, v21, 0x1
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->ed(I)I
 
     move-result v2
 
@@ -3225,7 +3225,7 @@
     :goto_19
     add-int/lit8 v4, v21, 0x1
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -3304,7 +3304,7 @@
 
     add-int/lit8 v4, v21, 0x1
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->ed(I)I
 
     move-result v1
 
@@ -3382,17 +3382,17 @@
 
     add-int/lit8 v1, v21, 0x2
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
     add-int/lit8 v2, v21, 0x4
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->eg(I)S
+    invoke-direct {v0, v2}, Lorg/a/a/e;->ec(I)S
 
     move-result v2
 
-    invoke-virtual {v9, v1, v2}, Lorg/a/a/t;->ak(II)V
+    invoke-virtual {v9, v1, v2}, Lorg/a/a/t;->aj(II)V
 
     add-int/lit8 v1, v21, 0x6
 
@@ -3401,11 +3401,11 @@
     :cond_26
     add-int/lit8 v2, v21, 0x2
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
-    invoke-virtual {v9, v1, v2}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v9, v1, v2}, Lorg/a/a/t;->ai(II)V
 
     add-int/lit8 v1, v21, 0x4
 
@@ -3465,21 +3465,21 @@
 
     const/4 v5, 0x1
 
-    iget-object v1, v0, Lorg/a/a/e;->bCx:[I
+    iget-object v1, v0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v2, v21, 0x1
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
     aget v1, v1, v2
 
-    iget-object v2, v0, Lorg/a/a/e;->bCx:[I
+    iget-object v2, v0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v6, v1, 0x2
 
-    invoke-direct {v0, v6}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v6}, Lorg/a/a/e;->eb(I)I
 
     move-result v6
 
@@ -3495,15 +3495,15 @@
 
     move-result-object v2
 
-    iget-object v4, v0, Lorg/a/a/e;->bCA:[I
+    iget-object v4, v0, Lorg/a/a/e;->bCU:[I
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
     aget v1, v4, v1
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v4
 
@@ -3515,7 +3515,7 @@
 
     add-int/lit8 v5, v1, 0x2
 
-    invoke-direct {v0, v5}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v5}, Lorg/a/a/e;->eb(I)I
 
     move-result v5
 
@@ -3536,7 +3536,7 @@
 
     if-ge v1, v11, :cond_27
 
-    invoke-direct {v0, v8}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v8}, Lorg/a/a/e;->eb(I)I
 
     move-result v11
 
@@ -3566,21 +3566,21 @@
 
     move/from16 v27, v8
 
-    iget-object v1, v0, Lorg/a/a/e;->bCx:[I
+    iget-object v1, v0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v4, v21, 0x1
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
     aget v1, v1, v2
 
-    iget-object v2, v0, Lorg/a/a/e;->bCx:[I
+    iget-object v2, v0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v4, v1, 0x2
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->eb(I)I
 
     move-result v4
 
@@ -3705,7 +3705,7 @@
 
     add-int v4, v21, v1
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->ed(I)I
 
     move-result v1
 
@@ -3715,7 +3715,7 @@
 
     add-int/lit8 v2, v4, 0x4
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->ed(I)I
 
     move-result v2
 
@@ -3734,7 +3734,7 @@
     :goto_27
     if-ge v4, v2, :cond_2b
 
-    invoke-direct {v0, v8}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v8}, Lorg/a/a/e;->ed(I)I
 
     move-result v11
 
@@ -3742,7 +3742,7 @@
 
     add-int/lit8 v11, v8, 0x4
 
-    invoke-direct {v0, v11}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v11}, Lorg/a/a/e;->ed(I)I
 
     move-result v11
 
@@ -3786,7 +3786,7 @@
 
     add-int v4, v21, v1
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->ed(I)I
 
     move-result v1
 
@@ -3796,13 +3796,13 @@
 
     add-int/lit8 v2, v4, 0x4
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->ed(I)I
 
     move-result v2
 
     add-int/lit8 v5, v4, 0x8
 
-    invoke-direct {v0, v5}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v5}, Lorg/a/a/e;->ed(I)I
 
     move-result v5
 
@@ -3823,7 +3823,7 @@
 
     if-ge v4, v11, :cond_2c
 
-    invoke-direct {v0, v8}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v8}, Lorg/a/a/e;->ed(I)I
 
     move-result v11
 
@@ -3868,7 +3868,7 @@
 
     add-int/lit8 v4, v21, 0x1
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->eg(I)S
+    invoke-direct {v0, v4}, Lorg/a/a/e;->ec(I)S
 
     move-result v1
 
@@ -3907,7 +3907,7 @@
 
     aget-byte v2, v7, v4
 
-    invoke-virtual {v9, v1, v2}, Lorg/a/a/t;->ak(II)V
+    invoke-virtual {v9, v1, v2}, Lorg/a/a/t;->aj(II)V
 
     goto/16 :goto_2a
 
@@ -3938,7 +3938,7 @@
 
     and-int/lit8 v2, v6, 0x3
 
-    invoke-virtual {v9, v1, v2}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v9, v1, v2}, Lorg/a/a/t;->ai(II)V
 
     goto/16 :goto_2c
 
@@ -3969,7 +3969,7 @@
 
     and-int/lit8 v2, v6, 0x3
 
-    invoke-virtual {v9, v1, v2}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v9, v1, v2}, Lorg/a/a/t;->ai(II)V
 
     goto/16 :goto_2c
 
@@ -3998,7 +3998,7 @@
 
     and-int/lit16 v1, v1, 0xff
 
-    invoke-virtual {v9, v8, v1}, Lorg/a/a/t;->aj(II)V
+    invoke-virtual {v9, v8, v1}, Lorg/a/a/t;->ai(II)V
 
     goto/16 :goto_2b
 
@@ -4021,7 +4021,7 @@
 
     add-int/lit8 v4, v21, 0x1
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -4085,11 +4085,11 @@
 
     add-int/lit8 v4, v21, 0x1
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->eg(I)S
+    invoke-direct {v0, v4}, Lorg/a/a/e;->ec(I)S
 
     move-result v1
 
-    invoke-virtual {v9, v8, v1}, Lorg/a/a/t;->ai(II)V
+    invoke-virtual {v9, v8, v1}, Lorg/a/a/t;->ah(II)V
 
     :goto_2a
     add-int/lit8 v4, v21, 0x3
@@ -4119,7 +4119,7 @@
 
     aget-byte v1, v7, v4
 
-    invoke-virtual {v9, v8, v1}, Lorg/a/a/t;->ai(II)V
+    invoke-virtual {v9, v8, v1}, Lorg/a/a/t;->ah(II)V
 
     :goto_2b
     add-int/lit8 v4, v21, 0x2
@@ -4145,7 +4145,7 @@
 
     move v8, v6
 
-    invoke-virtual {v9, v8}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v9, v8}, Lorg/a/a/t;->ei(I)V
 
     :goto_2c
     add-int/lit8 v4, v21, 0x1
@@ -4180,9 +4180,9 @@
 
     add-int/lit8 v2, v2, 0x2
 
-    iget v6, v10, Lorg/a/a/j;->bDm:I
+    iget v6, v10, Lorg/a/a/j;->bDG:I
 
-    iget-object v8, v10, Lorg/a/a/j;->bDn:Lorg/a/a/ab;
+    iget-object v8, v10, Lorg/a/a/j;->bDH:Lorg/a/a/ab;
 
     invoke-virtual {v9, v6, v8, v5, v15}, Lorg/a/a/t;->b(ILorg/a/a/ab;Ljava/lang/String;Z)Lorg/a/a/a;
 
@@ -4229,11 +4229,11 @@
 
     add-int/lit8 v3, v3, 0x2
 
-    iget v15, v10, Lorg/a/a/j;->bDm:I
+    iget v15, v10, Lorg/a/a/j;->bDG:I
 
     move/from16 v21, v1
 
-    iget-object v1, v10, Lorg/a/a/j;->bDn:Lorg/a/a/ab;
+    iget-object v1, v10, Lorg/a/a/j;->bDH:Lorg/a/a/ab;
 
     move/from16 v28, v12
 
@@ -4332,7 +4332,7 @@
 
     if-eqz v6, :cond_37
 
-    iget v1, v10, Lorg/a/a/j;->bDg:I
+    iget v1, v10, Lorg/a/a/j;->bDA:I
 
     and-int/lit8 v1, v1, 0x2
 
@@ -4342,7 +4342,7 @@
 
     if-eqz v1, :cond_34
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -4371,7 +4371,7 @@
 
     add-int/lit8 v5, v3, 0x8
 
-    invoke-direct {v0, v5}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v5}, Lorg/a/a/e;->eb(I)I
 
     move-result v5
 
@@ -4379,7 +4379,7 @@
 
     add-int/2addr v1, v4
 
-    invoke-direct {v0, v3}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v3}, Lorg/a/a/e;->eb(I)I
 
     move-result v5
 
@@ -4398,7 +4398,7 @@
     const/4 v15, 0x0
 
     :goto_32
-    invoke-direct {v0, v6}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v6}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -4411,13 +4411,13 @@
 
     if-lez v1, :cond_37
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
     add-int/lit8 v3, v2, 0x2
 
-    invoke-direct {v0, v3}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v3}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
@@ -4435,7 +4435,7 @@
 
     add-int/lit8 v6, v2, 0x8
 
-    invoke-direct {v0, v6}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v6}, Lorg/a/a/e;->eb(I)I
 
     move-result v7
 
@@ -4519,7 +4519,7 @@
 
     aget v1, v11, v15
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ee(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->ea(I)I
 
     move-result v2
 
@@ -4554,15 +4554,15 @@
 
     add-int/lit8 v6, v1, 0x2
 
-    iget v2, v10, Lorg/a/a/j;->bDm:I
+    iget v2, v10, Lorg/a/a/j;->bDG:I
 
-    iget-object v3, v10, Lorg/a/a/j;->bDn:Lorg/a/a/ab;
+    iget-object v3, v10, Lorg/a/a/j;->bDH:Lorg/a/a/ab;
 
-    iget-object v4, v10, Lorg/a/a/j;->bDo:[Lorg/a/a/r;
+    iget-object v4, v10, Lorg/a/a/j;->bDI:[Lorg/a/a/r;
 
-    iget-object v5, v10, Lorg/a/a/j;->bDp:[Lorg/a/a/r;
+    iget-object v5, v10, Lorg/a/a/j;->bDJ:[Lorg/a/a/r;
 
-    iget-object v1, v10, Lorg/a/a/j;->bDq:[I
+    iget-object v1, v10, Lorg/a/a/j;->bDK:[I
 
     const/16 v17, 0x1
 
@@ -4617,7 +4617,7 @@
 
     aget v1, v11, v13
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ee(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->ea(I)I
 
     move-result v2
 
@@ -4648,15 +4648,15 @@
 
     add-int/lit8 v15, v1, 0x2
 
-    iget v2, v10, Lorg/a/a/j;->bDm:I
+    iget v2, v10, Lorg/a/a/j;->bDG:I
 
-    iget-object v3, v10, Lorg/a/a/j;->bDn:Lorg/a/a/ab;
+    iget-object v3, v10, Lorg/a/a/j;->bDH:Lorg/a/a/ab;
 
-    iget-object v4, v10, Lorg/a/a/j;->bDo:[Lorg/a/a/r;
+    iget-object v4, v10, Lorg/a/a/j;->bDI:[Lorg/a/a/r;
 
-    iget-object v5, v10, Lorg/a/a/j;->bDp:[Lorg/a/a/r;
+    iget-object v5, v10, Lorg/a/a/j;->bDJ:[Lorg/a/a/r;
 
-    iget-object v6, v10, Lorg/a/a/j;->bDq:[I
+    iget-object v6, v10, Lorg/a/a/j;->bDK:[I
 
     const/4 v8, 0x0
 
@@ -4681,11 +4681,11 @@
     :goto_3c
     if-eqz v1, :cond_3e
 
-    iget-object v2, v1, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iget-object v2, v1, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     const/4 v3, 0x0
 
-    iput-object v3, v1, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iput-object v3, v1, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     invoke-virtual {v9, v1}, Lorg/a/a/t;->b(Lorg/a/a/c;)V
 
@@ -4698,7 +4698,7 @@
 
     move/from16 v1, v20
 
-    invoke-virtual {v9, v1, v2}, Lorg/a/a/t;->al(II)V
+    invoke-virtual {v9, v1, v2}, Lorg/a/a/t;->ak(II)V
 
     return-void
 
@@ -5176,9 +5176,9 @@
 .method private a(Lorg/a/a/t;Lorg/a/a/j;IZ)[I
     .locals 9
 
-    iget-object v0, p2, Lorg/a/a/j;->bDh:[C
+    iget-object v0, p2, Lorg/a/a/j;->bDB:[C
 
-    invoke-direct {p0, p3}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, p3}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -5195,7 +5195,7 @@
 
     aput p3, v1, v2
 
-    invoke-direct {p0, p3}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, p3}, Lorg/a/a/e;->ed(I)I
 
     move-result v3
 
@@ -5223,7 +5223,7 @@
     :pswitch_1
     add-int/lit8 v5, p3, 0x1
 
-    invoke-direct {p0, v5}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v5}, Lorg/a/a/e;->eb(I)I
 
     move-result v5
 
@@ -5234,25 +5234,25 @@
 
     if-lez v5, :cond_1
 
-    invoke-direct {p0, p3}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, p3}, Lorg/a/a/e;->eb(I)I
 
     move-result v5
 
     add-int/lit8 v7, p3, 0x2
 
-    invoke-direct {p0, v7}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v7}, Lorg/a/a/e;->eb(I)I
 
     move-result v7
 
     add-int/lit8 p3, p3, 0x6
 
-    iget-object v8, p2, Lorg/a/a/j;->bDl:[Lorg/a/a/r;
+    iget-object v8, p2, Lorg/a/a/j;->bDF:[Lorg/a/a/r;
 
     invoke-static {v5, v8}, Lorg/a/a/e;->b(I[Lorg/a/a/r;)Lorg/a/a/r;
 
     add-int/2addr v5, v7
 
-    iget-object v7, p2, Lorg/a/a/j;->bDl:[Lorg/a/a/r;
+    iget-object v7, p2, Lorg/a/a/j;->bDF:[Lorg/a/a/r;
 
     invoke-static {v5, v7}, Lorg/a/a/e;->b(I[Lorg/a/a/r;)Lorg/a/a/r;
 
@@ -5266,7 +5266,7 @@
 
     :cond_1
     :goto_2
-    invoke-direct {p0, p3}, Lorg/a/a/e;->ee(I)I
+    invoke-direct {p0, p3}, Lorg/a/a/e;->ea(I)I
 
     move-result v5
 
@@ -5285,7 +5285,7 @@
     :cond_2
     new-instance v7, Lorg/a/a/ab;
 
-    iget-object v4, p0, Lorg/a/a/e;->bCw:[B
+    iget-object v4, p0, Lorg/a/a/e;->bCQ:[B
 
     invoke-direct {v7, v4, p3}, Lorg/a/a/ab;-><init>([BI)V
 
@@ -5360,7 +5360,7 @@
 .method private b(I[C)Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/e;->bCy:[Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/e;->bCS:[Ljava/lang/String;
 
     aget-object v1, v0, p1
 
@@ -5369,13 +5369,13 @@
     return-object v1
 
     :cond_0
-    iget-object v1, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v1, p0, Lorg/a/a/e;->bCR:[I
 
     aget v1, v1, p1
 
     add-int/lit8 v2, v1, 0x2
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -5395,13 +5395,13 @@
 
     move-result-object p0
 
-    iget-short p1, p0, Lorg/a/a/r;->bDW:S
+    iget-short p1, p0, Lorg/a/a/r;->bEq:S
 
     and-int/lit8 p1, p1, -0x2
 
     int-to-short p1, p1
 
-    iput-short p1, p0, Lorg/a/a/r;->bDW:S
+    iput-short p1, p0, Lorg/a/a/r;->bEq:S
 
     return-object p0
 .end method
@@ -5409,7 +5409,7 @@
 .method private b(Lorg/a/a/t;Lorg/a/a/j;IZ)V
     .locals 5
 
-    iget-object v0, p0, Lorg/a/a/e;->bCw:[B
+    iget-object v0, p0, Lorg/a/a/e;->bCQ:[B
 
     add-int/lit8 v1, p3, 0x1
 
@@ -5419,14 +5419,14 @@
 
     invoke-virtual {p1, p3, p4}, Lorg/a/a/t;->f(IZ)V
 
-    iget-object p2, p2, Lorg/a/a/j;->bDh:[C
+    iget-object p2, p2, Lorg/a/a/j;->bDB:[C
 
     const/4 v0, 0x0
 
     :goto_0
     if-ge v0, p3, :cond_1
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -5469,9 +5469,9 @@
 .method private c(I[C)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v0, p0, Lorg/a/a/e;->bCR:[I
 
-    invoke-direct {p0, p1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, p1}, Lorg/a/a/e;->eb(I)I
 
     move-result p1
 
@@ -5495,13 +5495,13 @@
 
     move-result-object p0
 
-    iget-short p1, p0, Lorg/a/a/r;->bDW:S
+    iget-short p1, p0, Lorg/a/a/r;->bEq:S
 
     or-int/lit8 p1, p1, 0x1
 
     int-to-short p1, p1
 
-    iput-short p1, p0, Lorg/a/a/r;->bDW:S
+    iput-short p1, p0, Lorg/a/a/r;->bEq:S
 
     :cond_0
     return-void
@@ -5510,7 +5510,7 @@
 .method private d(I[C)Lorg/a/a/i;
     .locals 7
 
-    iget-object v0, p0, Lorg/a/a/e;->bCz:[Lorg/a/a/i;
+    iget-object v0, p0, Lorg/a/a/e;->bCT:[Lorg/a/a/i;
 
     aget-object v0, v0, p1
 
@@ -5519,13 +5519,13 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v0, p0, Lorg/a/a/e;->bCR:[I
 
     aget v1, v0, p1
 
     add-int/lit8 v2, v1, 0x2
 
-    invoke-direct {p0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -5541,15 +5541,15 @@
 
     move-result-object v0
 
-    iget-object v3, p0, Lorg/a/a/e;->bCA:[I
+    iget-object v3, p0, Lorg/a/a/e;->bCU:[I
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
     aget v1, v3, v1
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
@@ -5561,7 +5561,7 @@
 
     add-int/lit8 v4, v1, 0x2
 
-    invoke-direct {p0, v4}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v4}, Lorg/a/a/e;->eb(I)I
 
     move-result v4
 
@@ -5576,7 +5576,7 @@
 
     if-ge v5, v6, :cond_1
 
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v6
 
@@ -5593,7 +5593,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p2, p0, Lorg/a/a/e;->bCz:[Lorg/a/a/i;
+    iget-object p2, p0, Lorg/a/a/e;->bCT:[Lorg/a/a/i;
 
     new-instance v1, Lorg/a/a/i;
 
@@ -5604,14 +5604,101 @@
     return-object v1
 .end method
 
+.method private dZ(I)[I
+    .locals 5
+
+    new-array p1, p1, [C
+
+    invoke-direct {p0}, Lorg/a/a/e;->IN()I
+
+    move-result v0
+
+    add-int/lit8 v1, v0, -0x2
+
+    invoke-direct {p0, v1}, Lorg/a/a/e;->eb(I)I
+
+    move-result v1
+
+    :goto_0
+    if-lez v1, :cond_2
+
+    invoke-direct {p0, v0, p1}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    add-int/lit8 v3, v0, 0x2
+
+    invoke-direct {p0, v3}, Lorg/a/a/e;->ed(I)I
+
+    move-result v3
+
+    add-int/lit8 v0, v0, 0x6
+
+    const-string v4, "BootstrapMethods"
+
+    invoke-virtual {v4, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    invoke-direct {p0, v0}, Lorg/a/a/e;->eb(I)I
+
+    move-result p1
+
+    new-array p1, p1, [I
+
+    add-int/lit8 v0, v0, 0x2
+
+    const/4 v1, 0x0
+
+    :goto_1
+    array-length v2, p1
+
+    if-ge v1, v2, :cond_0
+
+    aput v0, p1, v1
+
+    add-int/lit8 v2, v0, 0x2
+
+    invoke-direct {p0, v2}, Lorg/a/a/e;->eb(I)I
+
+    move-result v2
+
+    mul-int/lit8 v2, v2, 0x2
+
+    add-int/lit8 v2, v2, 0x4
+
+    add-int/2addr v0, v2
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_1
+
+    :cond_0
+    return-object p1
+
+    :cond_1
+    add-int/2addr v0, v3
+
+    add-int/lit8 v1, v1, -0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
+
 .method private e(I[C)Ljava/lang/Object;
     .locals 6
 
-    iget-object v0, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v0, p0, Lorg/a/a/e;->bCR:[I
 
     aget v0, v0, p1
 
-    iget-object v1, p0, Lorg/a/a/e;->bCw:[B
+    iget-object v1, p0, Lorg/a/a/e;->bCQ:[B
 
     add-int/lit8 v2, v0, -0x1
 
@@ -5639,34 +5726,34 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lorg/a/a/aa;->fb(Ljava/lang/String;)Lorg/a/a/aa;
+    invoke-static {p1}, Lorg/a/a/aa;->eW(Ljava/lang/String;)Lorg/a/a/aa;
 
     move-result-object p1
 
     return-object p1
 
     :pswitch_2
-    invoke-direct {p0, v0}, Lorg/a/a/e;->ee(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ea(I)I
 
     move-result v1
 
-    iget-object p1, p0, Lorg/a/a/e;->bCx:[I
+    iget-object p1, p0, Lorg/a/a/e;->bCR:[I
 
     const/4 v2, 0x1
 
     add-int/2addr v0, v2
 
-    invoke-direct {p0, v0}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->eb(I)I
 
     move-result v0
 
     aget p1, p1, v0
 
-    iget-object v0, p0, Lorg/a/a/e;->bCx:[I
+    iget-object v0, p0, Lorg/a/a/e;->bCR:[I
 
     add-int/lit8 v3, p1, 0x2
 
-    invoke-direct {p0, v3}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {p0, v3}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
@@ -5686,7 +5773,7 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lorg/a/a/e;->bCw:[B
+    iget-object v0, p0, Lorg/a/a/e;->bCQ:[B
 
     sub-int/2addr p1, v2
 
@@ -5732,14 +5819,14 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lorg/a/a/aa;->fa(Ljava/lang/String;)Lorg/a/a/aa;
+    invoke-static {p1}, Lorg/a/a/aa;->eV(Ljava/lang/String;)Lorg/a/a/aa;
 
     move-result-object p1
 
     return-object p1
 
     :pswitch_5
-    invoke-direct {p0, v0}, Lorg/a/a/e;->ei(I)J
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ee(I)J
 
     move-result-wide p1
 
@@ -5754,7 +5841,7 @@
     return-object p1
 
     :pswitch_6
-    invoke-direct {p0, v0}, Lorg/a/a/e;->ei(I)J
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ee(I)J
 
     move-result-wide p1
 
@@ -5765,7 +5852,7 @@
     return-object p1
 
     :pswitch_7
-    invoke-direct {p0, v0}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ed(I)I
 
     move-result p1
 
@@ -5780,7 +5867,7 @@
     return-object p1
 
     :pswitch_8
-    invoke-direct {p0, v0}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, v0}, Lorg/a/a/e;->ed(I)I
 
     move-result p1
 
@@ -5810,97 +5897,10 @@
     .end packed-switch
 .end method
 
-.method private ed(I)[I
-    .locals 5
-
-    new-array p1, p1, [C
-
-    invoke-direct {p0}, Lorg/a/a/e;->Ja()I
-
-    move-result v0
-
-    add-int/lit8 v1, v0, -0x2
-
-    invoke-direct {p0, v1}, Lorg/a/a/e;->ef(I)I
-
-    move-result v1
-
-    :goto_0
-    if-lez v1, :cond_2
-
-    invoke-direct {p0, v0, p1}, Lorg/a/a/e;->a(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    add-int/lit8 v3, v0, 0x2
-
-    invoke-direct {p0, v3}, Lorg/a/a/e;->eh(I)I
-
-    move-result v3
-
-    add-int/lit8 v0, v0, 0x6
-
-    const-string v4, "BootstrapMethods"
-
-    invoke-virtual {v4, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    invoke-direct {p0, v0}, Lorg/a/a/e;->ef(I)I
-
-    move-result p1
-
-    new-array p1, p1, [I
-
-    add-int/lit8 v0, v0, 0x2
-
-    const/4 v1, 0x0
-
-    :goto_1
-    array-length v2, p1
-
-    if-ge v1, v2, :cond_0
-
-    aput v0, p1, v1
-
-    add-int/lit8 v2, v0, 0x2
-
-    invoke-direct {p0, v2}, Lorg/a/a/e;->ef(I)I
-
-    move-result v2
-
-    mul-int/lit8 v2, v2, 0x2
-
-    add-int/lit8 v2, v2, 0x4
-
-    add-int/2addr v0, v2
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_1
-
-    :cond_0
-    return-object p1
-
-    :cond_1
-    add-int/2addr v0, v3
-
-    add-int/lit8 v1, v1, -0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/4 p1, 0x0
-
-    return-object p1
-.end method
-
-.method private ee(I)I
+.method private ea(I)I
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/e;->bCw:[B
+    iget-object v0, p0, Lorg/a/a/e;->bCQ:[B
 
     aget-byte p1, v0, p1
 
@@ -5909,10 +5909,10 @@
     return p1
 .end method
 
-.method private ef(I)I
+.method private eb(I)I
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/e;->bCw:[B
+    iget-object v0, p0, Lorg/a/a/e;->bCQ:[B
 
     aget-byte v1, v0, p1
 
@@ -5931,10 +5931,10 @@
     return p1
 .end method
 
-.method private eg(I)S
+.method private ec(I)S
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/e;->bCw:[B
+    iget-object v0, p0, Lorg/a/a/e;->bCQ:[B
 
     aget-byte v1, v0, p1
 
@@ -5955,10 +5955,10 @@
     return p1
 .end method
 
-.method private eh(I)I
+.method private ed(I)I
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/e;->bCw:[B
+    iget-object v0, p0, Lorg/a/a/e;->bCQ:[B
 
     aget-byte v1, v0, p1
 
@@ -5997,10 +5997,10 @@
     return p1
 .end method
 
-.method private ei(I)J
+.method private ee(I)J
     .locals 6
 
-    invoke-direct {p0, p1}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, p1}, Lorg/a/a/e;->ed(I)I
 
     move-result v0
 
@@ -6008,7 +6008,7 @@
 
     add-int/lit8 p1, p1, 0x4
 
-    invoke-direct {p0, p1}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {p0, p1}, Lorg/a/a/e;->ed(I)I
 
     move-result p1
 
@@ -6044,21 +6044,21 @@
 
     invoke-direct {v10}, Lorg/a/a/j;-><init>()V
 
-    iput-object v1, v10, Lorg/a/a/j;->bDf:[Lorg/a/a/c;
+    iput-object v1, v10, Lorg/a/a/j;->bDz:[Lorg/a/a/c;
 
-    iput v9, v10, Lorg/a/a/j;->bDg:I
+    iput v9, v10, Lorg/a/a/j;->bDA:I
 
-    iget v2, v0, Lorg/a/a/e;->oQ:I
+    iget v2, v0, Lorg/a/a/e;->oP:I
 
     new-array v2, v2, [C
 
-    iput-object v2, v10, Lorg/a/a/j;->bDh:[C
+    iput-object v2, v10, Lorg/a/a/j;->bDB:[C
 
-    iget-object v11, v10, Lorg/a/a/j;->bDh:[C
+    iget-object v11, v10, Lorg/a/a/j;->bDB:[C
 
-    iget v2, v0, Lorg/a/a/e;->bCB:I
+    iget v2, v0, Lorg/a/a/e;->bCV:I
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
@@ -6076,7 +6076,7 @@
 
     add-int/lit8 v5, v2, 0x6
 
-    invoke-direct {v0, v5}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v5}, Lorg/a/a/e;->eb(I)I
 
     move-result v5
 
@@ -6106,13 +6106,13 @@
     goto :goto_0
 
     :cond_0
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/e;->Ja()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/e;->IN()I
 
     move-result v2
 
     add-int/lit8 v5, v2, -0x2
 
-    invoke-direct {v0, v5}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v5}, Lorg/a/a/e;->eb(I)I
 
     move-result v5
 
@@ -6183,7 +6183,7 @@
 
     add-int/lit8 v15, v2, 0x2
 
-    invoke-direct {v0, v15}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v15}, Lorg/a/a/e;->ed(I)I
 
     move-result v15
 
@@ -6430,7 +6430,7 @@
 
     move-result-object v4
 
-    iput-object v10, v4, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iput-object v10, v4, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     move-object v10, v4
 
@@ -6462,7 +6462,7 @@
 
     move-object/from16 v34, v15
 
-    iget-object v1, v0, Lorg/a/a/e;->bCx:[I
+    iget-object v1, v0, Lorg/a/a/e;->bCR:[I
 
     const/4 v15, 0x1
 
@@ -6470,7 +6470,7 @@
 
     add-int/lit8 v1, v1, -0x7
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->ed(I)I
 
     move-result v2
 
@@ -6517,7 +6517,7 @@
 
     move-object/from16 v6, v26
 
-    iget-object v1, v6, Lorg/a/a/j;->bDh:[C
+    iget-object v1, v6, Lorg/a/a/j;->bDB:[C
 
     move/from16 v2, v28
 
@@ -6527,7 +6527,7 @@
 
     add-int/lit8 v4, v2, 0x2
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->eb(I)I
 
     move-result v4
 
@@ -6549,14 +6549,14 @@
 
     move-object/from16 v4, v17
 
-    invoke-virtual {v3, v4}, Lorg/a/a/v;->eT(Ljava/lang/String;)V
+    invoke-virtual {v3, v4}, Lorg/a/a/v;->eO(Ljava/lang/String;)V
 
     :cond_15
     move/from16 v4, v18
 
     if-eqz v4, :cond_16
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->eb(I)I
 
     move-result v5
 
@@ -6573,7 +6573,7 @@
 
     move-result-object v5
 
-    invoke-virtual {v3, v5}, Lorg/a/a/v;->eU(Ljava/lang/String;)V
+    invoke-virtual {v3, v5}, Lorg/a/a/v;->eP(Ljava/lang/String;)V
 
     add-int/lit8 v4, v4, 0x2
 
@@ -6582,7 +6582,7 @@
     goto :goto_6
 
     :cond_16
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v4
 
@@ -6599,7 +6599,7 @@
 
     add-int/lit8 v15, v2, 0x2
 
-    invoke-direct {v0, v15}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v15}, Lorg/a/a/e;->eb(I)I
 
     move-result v15
 
@@ -6622,7 +6622,7 @@
     goto :goto_7
 
     :cond_17
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v4
 
@@ -6639,7 +6639,7 @@
 
     add-int/lit8 v15, v2, 0x2
 
-    invoke-direct {v0, v15}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v15}, Lorg/a/a/e;->eb(I)I
 
     move-result v15
 
@@ -6647,7 +6647,7 @@
 
     add-int/lit8 v5, v2, 0x4
 
-    invoke-direct {v0, v5}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v5}, Lorg/a/a/e;->eb(I)I
 
     move-result v5
 
@@ -6709,7 +6709,7 @@
 
     move-object/from16 v26, v13
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v4
 
@@ -6726,13 +6726,13 @@
 
     add-int/lit8 v10, v2, 0x2
 
-    invoke-direct {v0, v10}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v10}, Lorg/a/a/e;->eb(I)I
 
     move-result v10
 
     add-int/lit8 v13, v2, 0x4
 
-    invoke-direct {v0, v13}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v13}, Lorg/a/a/e;->eb(I)I
 
     move-result v13
 
@@ -6781,7 +6781,7 @@
     goto :goto_a
 
     :cond_1d
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v4
 
@@ -6796,7 +6796,7 @@
 
     move-result-object v4
 
-    invoke-virtual {v3, v4}, Lorg/a/a/v;->eV(Ljava/lang/String;)V
+    invoke-virtual {v3, v4}, Lorg/a/a/v;->eQ(Ljava/lang/String;)V
 
     add-int/lit8 v2, v2, 0x2
 
@@ -6805,7 +6805,7 @@
     goto :goto_d
 
     :cond_1e
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v4
 
@@ -6822,7 +6822,7 @@
 
     add-int/lit8 v10, v2, 0x2
 
-    invoke-direct {v0, v10}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v10}, Lorg/a/a/e;->eb(I)I
 
     move-result v10
 
@@ -6876,7 +6876,7 @@
 
     if-eqz v1, :cond_23
 
-    invoke-virtual {v8, v1}, Lorg/a/a/g;->eQ(Ljava/lang/String;)V
+    invoke-virtual {v8, v1}, Lorg/a/a/g;->eL(Ljava/lang/String;)V
 
     :cond_23
     move/from16 v1, v20
@@ -6889,7 +6889,7 @@
 
     add-int/lit8 v1, v1, 0x2
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -6900,7 +6900,7 @@
     goto :goto_11
 
     :cond_24
-    iget-object v3, v0, Lorg/a/a/e;->bCx:[I
+    iget-object v3, v0, Lorg/a/a/e;->bCR:[I
 
     aget v3, v3, v1
 
@@ -6916,7 +6916,7 @@
     goto :goto_12
 
     :cond_25
-    iget-object v4, v0, Lorg/a/a/e;->bCx:[I
+    iget-object v4, v0, Lorg/a/a/e;->bCR:[I
 
     aget v1, v4, v1
 
@@ -6934,7 +6934,7 @@
 
     if-eqz v1, :cond_27
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -6972,7 +6972,7 @@
 
     if-eqz v1, :cond_28
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -7012,7 +7012,7 @@
 
     if-eqz v1, :cond_29
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -7035,9 +7035,9 @@
 
     add-int/lit8 v1, v1, 0x2
 
-    iget v4, v6, Lorg/a/a/j;->bDm:I
+    iget v4, v6, Lorg/a/a/j;->bDG:I
 
-    iget-object v5, v6, Lorg/a/a/j;->bDn:Lorg/a/a/ab;
+    iget-object v5, v6, Lorg/a/a/j;->bDH:Lorg/a/a/ab;
 
     const/4 v10, 0x1
 
@@ -7058,7 +7058,7 @@
 
     if-eqz v1, :cond_2a
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -7081,9 +7081,9 @@
 
     add-int/lit8 v1, v1, 0x2
 
-    iget v4, v6, Lorg/a/a/j;->bDm:I
+    iget v4, v6, Lorg/a/a/j;->bDG:I
 
-    iget-object v5, v6, Lorg/a/a/j;->bDn:Lorg/a/a/ab;
+    iget-object v5, v6, Lorg/a/a/j;->bDH:Lorg/a/a/ab;
 
     const/4 v10, 0x0
 
@@ -7107,11 +7107,11 @@
     :goto_17
     if-eqz v1, :cond_2b
 
-    iget-object v2, v1, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iget-object v2, v1, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     const/4 v3, 0x0
 
-    iput-object v3, v1, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iput-object v3, v1, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     invoke-virtual {v8, v1}, Lorg/a/a/g;->b(Lorg/a/a/c;)V
 
@@ -7124,7 +7124,7 @@
 
     if-eqz v1, :cond_2c
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -7141,7 +7141,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v8, v2}, Lorg/a/a/g;->eR(Ljava/lang/String;)V
+    invoke-virtual {v8, v2}, Lorg/a/a/g;->eM(Ljava/lang/String;)V
 
     add-int/lit8 v1, v1, 0x2
 
@@ -7154,7 +7154,7 @@
 
     if-eqz v1, :cond_2d
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -7185,7 +7185,7 @@
 
     add-int/lit8 v10, v1, 0x6
 
-    invoke-direct {v0, v10}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v10}, Lorg/a/a/e;->eb(I)I
 
     move-result v10
 
@@ -7200,7 +7200,7 @@
     :cond_2d
     move/from16 v13, v16
 
-    invoke-direct {v0, v13}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v13}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -7211,9 +7211,9 @@
 
     if-lez v1, :cond_3d
 
-    iget-object v11, v6, Lorg/a/a/j;->bDh:[C
+    iget-object v11, v6, Lorg/a/a/j;->bDB:[C
 
-    invoke-direct {v0, v13}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v13}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -7231,7 +7231,7 @@
 
     add-int/lit8 v13, v13, 0x6
 
-    invoke-direct {v0, v13}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v13}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -7270,7 +7270,7 @@
 
     add-int/lit8 v8, v1, 0x2
 
-    invoke-direct {v0, v8}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v8}, Lorg/a/a/e;->ed(I)I
 
     move-result v8
 
@@ -7286,7 +7286,7 @@
 
     if-eqz v15, :cond_2f
 
-    invoke-direct {v0, v1}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/e;->eb(I)I
 
     move-result v2
 
@@ -7407,13 +7407,13 @@
     goto :goto_1e
 
     :cond_36
-    iget-object v9, v6, Lorg/a/a/j;->bDf:[Lorg/a/a/c;
+    iget-object v9, v6, Lorg/a/a/j;->bDz:[Lorg/a/a/c;
 
     invoke-direct {v0, v9, v2, v1, v8}, Lorg/a/a/e;->a([Lorg/a/a/c;Ljava/lang/String;II)Lorg/a/a/c;
 
     move-result-object v2
 
-    iput-object v10, v2, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iput-object v10, v2, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     move-object v10, v2
 
@@ -7463,7 +7463,7 @@
 
     move/from16 v2, v18
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
@@ -7499,7 +7499,7 @@
 
     move/from16 v2, v16
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
@@ -7539,7 +7539,7 @@
 
     if-eqz v2, :cond_3a
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
@@ -7562,9 +7562,9 @@
 
     add-int/lit8 v2, v2, 0x2
 
-    iget v5, v9, Lorg/a/a/j;->bDm:I
+    iget v5, v9, Lorg/a/a/j;->bDG:I
 
-    iget-object v6, v9, Lorg/a/a/j;->bDn:Lorg/a/a/ab;
+    iget-object v6, v9, Lorg/a/a/j;->bDH:Lorg/a/a/ab;
 
     const/4 v13, 0x1
 
@@ -7585,7 +7585,7 @@
 
     if-eqz v2, :cond_3b
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
@@ -7608,9 +7608,9 @@
 
     add-int/lit8 v2, v2, 0x2
 
-    iget v5, v9, Lorg/a/a/j;->bDm:I
+    iget v5, v9, Lorg/a/a/j;->bDG:I
 
-    iget-object v6, v9, Lorg/a/a/j;->bDn:Lorg/a/a/ab;
+    iget-object v6, v9, Lorg/a/a/j;->bDH:Lorg/a/a/ab;
 
     const/4 v13, 0x0
 
@@ -7632,11 +7632,11 @@
     :goto_23
     if-eqz v10, :cond_3c
 
-    iget-object v2, v10, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iget-object v2, v10, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     const/4 v3, 0x0
 
-    iput-object v3, v10, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iput-object v3, v10, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     invoke-virtual {v1, v10}, Lorg/a/a/m;->b(Lorg/a/a/c;)V
 
@@ -7666,7 +7666,7 @@
 
     move-object v9, v6
 
-    invoke-direct {v0, v13}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v13}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -7677,13 +7677,13 @@
 
     if-lez v1, :cond_64
 
-    iget-object v10, v9, Lorg/a/a/j;->bDh:[C
+    iget-object v10, v9, Lorg/a/a/j;->bDB:[C
 
-    invoke-direct {v0, v13}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v13}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
-    iput v1, v9, Lorg/a/a/j;->bDi:I
+    iput v1, v9, Lorg/a/a/j;->bDC:I
 
     add-int/lit8 v1, v13, 0x2
 
@@ -7691,7 +7691,7 @@
 
     move-result-object v1
 
-    iput-object v1, v9, Lorg/a/a/j;->bDj:Ljava/lang/String;
+    iput-object v1, v9, Lorg/a/a/j;->bDD:Ljava/lang/String;
 
     add-int/lit8 v11, v13, 0x4
 
@@ -7699,11 +7699,11 @@
 
     move-result-object v1
 
-    iput-object v1, v9, Lorg/a/a/j;->bDk:Ljava/lang/String;
+    iput-object v1, v9, Lorg/a/a/j;->bDE:Ljava/lang/String;
 
     add-int/lit8 v6, v13, 0x6
 
-    invoke-direct {v0, v6}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v6}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -7754,7 +7754,7 @@
 
     add-int/lit8 v2, v4, 0x2
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->eh(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->ed(I)I
 
     move-result v2
 
@@ -7770,7 +7770,7 @@
 
     if-eqz v3, :cond_3f
 
-    iget v1, v9, Lorg/a/a/j;->bDg:I
+    iget v1, v9, Lorg/a/a/j;->bDA:I
 
     const/4 v3, 0x1
 
@@ -7796,7 +7796,7 @@
 
     if-eqz v3, :cond_41
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -7847,7 +7847,7 @@
 
     if-eqz v3, :cond_42
 
-    invoke-direct {v0, v4}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v4}, Lorg/a/a/e;->eb(I)I
 
     move-result v1
 
@@ -7862,11 +7862,11 @@
 
     if-eqz v3, :cond_43
 
-    iget v1, v9, Lorg/a/a/j;->bDi:I
+    iget v1, v9, Lorg/a/a/j;->bDC:I
 
     or-int v1, v1, v32
 
-    iput v1, v9, Lorg/a/a/j;->bDi:I
+    iput v1, v9, Lorg/a/a/j;->bDC:I
 
     :goto_27
     move-object/from16 v11, v20
@@ -7921,11 +7921,11 @@
 
     if-eqz v3, :cond_47
 
-    iget v1, v9, Lorg/a/a/j;->bDi:I
+    iget v1, v9, Lorg/a/a/j;->bDC:I
 
     or-int/lit16 v1, v1, 0x1000
 
-    iput v1, v9, Lorg/a/a/j;->bDi:I
+    iput v1, v9, Lorg/a/a/j;->bDC:I
 
     move-object/from16 v6, v26
 
@@ -8002,13 +8002,13 @@
     goto :goto_28
 
     :cond_4c
-    iget-object v3, v9, Lorg/a/a/j;->bDf:[Lorg/a/a/c;
+    iget-object v3, v9, Lorg/a/a/j;->bDz:[Lorg/a/a/c;
 
     invoke-direct {v0, v3, v1, v4, v2}, Lorg/a/a/e;->a([Lorg/a/a/c;Ljava/lang/String;II)Lorg/a/a/c;
 
     move-result-object v1
 
-    iput-object v8, v1, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iput-object v8, v1, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     move-object v8, v1
 
@@ -8044,11 +8044,11 @@
 
     move-object/from16 v6, v26
 
-    iget v2, v9, Lorg/a/a/j;->bDi:I
+    iget v2, v9, Lorg/a/a/j;->bDC:I
 
-    iget-object v3, v9, Lorg/a/a/j;->bDj:Ljava/lang/String;
+    iget-object v3, v9, Lorg/a/a/j;->bDD:Ljava/lang/String;
 
-    iget-object v1, v9, Lorg/a/a/j;->bDk:Ljava/lang/String;
+    iget-object v1, v9, Lorg/a/a/j;->bDE:Ljava/lang/String;
 
     if-nez v5, :cond_4e
 
@@ -8112,7 +8112,7 @@
 
     sub-int v4, v23, v13
 
-    iget v3, v9, Lorg/a/a/j;->bDi:I
+    iget v3, v9, Lorg/a/a/j;->bDC:I
 
     and-int v3, v3, v32
 
@@ -8128,25 +8128,25 @@
     const/4 v3, 0x0
 
     :goto_2b
-    invoke-direct {v0, v13}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v13}, Lorg/a/a/e;->eb(I)I
 
     move-result v5
 
-    iget-object v6, v2, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v6, v2, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object v6, v6, Lorg/a/a/z;->bFy:Lorg/a/a/e;
+    iget-object v6, v6, Lorg/a/a/z;->bFS:Lorg/a/a/e;
 
     if-ne v0, v6, :cond_57
 
-    iget v6, v2, Lorg/a/a/u;->bDC:I
+    iget v6, v2, Lorg/a/a/u;->bDW:I
 
     if-ne v5, v6, :cond_57
 
-    iget v5, v2, Lorg/a/a/u;->bCQ:I
+    iget v5, v2, Lorg/a/a/u;->bDk:I
 
     if-ne v11, v5, :cond_57
 
-    iget v5, v2, Lorg/a/a/u;->bCD:I
+    iget v5, v2, Lorg/a/a/u;->bCX:I
 
     and-int v5, v5, v32
 
@@ -8165,15 +8165,15 @@
     goto :goto_2f
 
     :cond_51
-    iget-object v3, v2, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v3, v2, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget v3, v3, Lorg/a/a/z;->bFz:I
+    iget v3, v3, Lorg/a/a/z;->bFT:I
 
     const/16 v5, 0x31
 
     if-ge v3, v5, :cond_52
 
-    iget v3, v2, Lorg/a/a/u;->bCD:I
+    iget v3, v2, Lorg/a/a/u;->bCX:I
 
     and-int/lit16 v3, v3, 0x1000
 
@@ -8194,18 +8194,18 @@
     :cond_53
     if-nez v7, :cond_54
 
-    iget v3, v2, Lorg/a/a/u;->bEB:I
+    iget v3, v2, Lorg/a/a/u;->bEV:I
 
     if-eqz v3, :cond_56
 
     goto :goto_2f
 
     :cond_54
-    invoke-direct {v0, v7}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v7}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
-    iget v5, v2, Lorg/a/a/u;->bEB:I
+    iget v5, v2, Lorg/a/a/u;->bEV:I
 
     if-ne v3, v5, :cond_56
 
@@ -8216,15 +8216,15 @@
     const/4 v3, 0x0
 
     :goto_2e
-    iget v6, v2, Lorg/a/a/u;->bEB:I
+    iget v6, v2, Lorg/a/a/u;->bEV:I
 
     if-ge v3, v6, :cond_56
 
-    invoke-direct {v0, v5}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v5}, Lorg/a/a/e;->eb(I)I
 
     move-result v6
 
-    iget-object v7, v2, Lorg/a/a/u;->bEC:[I
+    iget-object v7, v2, Lorg/a/a/u;->bEW:[I
 
     aget v7, v7, v3
 
@@ -8240,11 +8240,11 @@
     goto :goto_2e
 
     :cond_56
-    iput v12, v2, Lorg/a/a/u;->bEW:I
+    iput v12, v2, Lorg/a/a/u;->bFq:I
 
     add-int/lit8 v4, v4, -0x6
 
-    iput v4, v2, Lorg/a/a/u;->bEX:I
+    iput v4, v2, Lorg/a/a/u;->bFr:I
 
     const/4 v2, 0x1
 
@@ -8262,7 +8262,7 @@
 
     move/from16 v2, v19
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ee(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->ea(I)I
 
     move-result v3
 
@@ -8281,7 +8281,7 @@
 
     add-int/lit8 v5, v2, 0x2
 
-    invoke-direct {v0, v5}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v5}, Lorg/a/a/e;->eb(I)I
 
     move-result v5
 
@@ -8296,7 +8296,7 @@
     :cond_59
     if-eqz v18, :cond_5a
 
-    invoke-virtual {v1}, Lorg/a/a/t;->Jc()Lorg/a/a/a;
+    invoke-virtual {v1}, Lorg/a/a/t;->IP()Lorg/a/a/a;
 
     move-result-object v2
 
@@ -8308,14 +8308,14 @@
 
     if-eqz v2, :cond_5a
 
-    invoke-virtual {v2}, Lorg/a/a/a;->IY()V
+    invoke-virtual {v2}, Lorg/a/a/a;->IL()V
 
     :cond_5a
     if-eqz v17, :cond_5b
 
     move/from16 v2, v17
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
@@ -8353,7 +8353,7 @@
 
     if-eqz v2, :cond_5c
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
@@ -8393,7 +8393,7 @@
 
     if-eqz v2, :cond_5d
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
@@ -8416,9 +8416,9 @@
 
     add-int/lit8 v2, v2, 0x2
 
-    iget v5, v9, Lorg/a/a/j;->bDm:I
+    iget v5, v9, Lorg/a/a/j;->bDG:I
 
-    iget-object v6, v9, Lorg/a/a/j;->bDn:Lorg/a/a/ab;
+    iget-object v6, v9, Lorg/a/a/j;->bDH:Lorg/a/a/ab;
 
     const/4 v7, 0x1
 
@@ -8439,7 +8439,7 @@
 
     if-eqz v2, :cond_5e
 
-    invoke-direct {v0, v2}, Lorg/a/a/e;->ef(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/e;->eb(I)I
 
     move-result v3
 
@@ -8462,9 +8462,9 @@
 
     add-int/lit8 v2, v2, 0x2
 
-    iget v5, v9, Lorg/a/a/j;->bDm:I
+    iget v5, v9, Lorg/a/a/j;->bDG:I
 
-    iget-object v6, v9, Lorg/a/a/j;->bDn:Lorg/a/a/ab;
+    iget-object v6, v9, Lorg/a/a/j;->bDH:Lorg/a/a/ab;
 
     const/4 v7, 0x0
 
@@ -8506,11 +8506,11 @@
     :goto_36
     if-eqz v2, :cond_61
 
-    iget-object v3, v2, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iget-object v3, v2, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     const/4 v4, 0x0
 
-    iput-object v4, v2, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iput-object v4, v2, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
     invoke-virtual {v1, v2}, Lorg/a/a/t;->b(Lorg/a/a/c;)V
 
diff --git a/com.discord/smali_classes2/org/a/a/g.smali b/com.discord/smali_classes2/org/a/a/g.smali
index 32cde0ccdb..fac4289114 100644
--- a/com.discord/smali_classes2/org/a/a/g.smali
+++ b/com.discord/smali_classes2/org/a/a/g.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field protected bCC:Lorg/a/a/g;
+.field protected final bCF:I
 
-.field protected final bCl:I
+.field protected bCW:Lorg/a/a/g;
 
 
 # direct methods
@@ -27,11 +27,11 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/g;->bCl:I
+    iput p1, p0, Lorg/a/a/g;->bCF:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/g;->bCC:Lorg/a/a/g;
+    iput-object p1, p0, Lorg/a/a/g;->bCW:Lorg/a/a/g;
 
     return-void
 .end method
@@ -41,13 +41,13 @@
 .method public a(ILorg/a/a/ab;Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/g;->bCl:I
+    iget v0, p0, Lorg/a/a/g;->bCF:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/g;->bCC:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bCW:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -75,7 +75,7 @@
 .method public a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lorg/a/a/m;
     .locals 6
 
-    iget-object v0, p0, Lorg/a/a/g;->bCC:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bCW:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -104,7 +104,7 @@
 .method public a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/a/a/t;
     .locals 6
 
-    iget-object v0, p0, Lorg/a/a/g;->bCC:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bCW:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -133,7 +133,7 @@
 .method public a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
     .locals 7
 
-    iget-object v0, p0, Lorg/a/a/g;->bCC:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bCW:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -158,7 +158,7 @@
 .method public a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/g;->bCC:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bCW:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -171,7 +171,7 @@
 .method public au(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/g;->bCC:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bCW:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -184,7 +184,7 @@
 .method public b(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/g;->bCC:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bCW:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -197,13 +197,13 @@
 .method public d(Ljava/lang/String;ILjava/lang/String;)Lorg/a/a/v;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/g;->bCl:I
+    iget v0, p0, Lorg/a/a/g;->bCF:I
 
     const/high16 v1, 0x60000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/g;->bCC:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bCW:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -228,20 +228,20 @@
     throw p1
 .end method
 
-.method public eQ(Ljava/lang/String;)V
+.method public eL(Ljava/lang/String;)V
     .locals 2
 
-    iget v0, p0, Lorg/a/a/g;->bCl:I
+    iget v0, p0, Lorg/a/a/g;->bCF:I
 
     const/high16 v1, 0x70000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/g;->bCC:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bCW:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1}, Lorg/a/a/g;->eQ(Ljava/lang/String;)V
+    invoke-virtual {v0, p1}, Lorg/a/a/g;->eL(Ljava/lang/String;)V
 
     :cond_0
     return-void
@@ -256,20 +256,20 @@
     throw p1
 .end method
 
-.method public eR(Ljava/lang/String;)V
+.method public eM(Ljava/lang/String;)V
     .locals 2
 
-    iget v0, p0, Lorg/a/a/g;->bCl:I
+    iget v0, p0, Lorg/a/a/g;->bCF:I
 
     const/high16 v1, 0x70000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/g;->bCC:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bCW:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1}, Lorg/a/a/g;->eR(Ljava/lang/String;)V
+    invoke-virtual {v0, p1}, Lorg/a/a/g;->eM(Ljava/lang/String;)V
 
     :cond_0
     return-void
@@ -287,7 +287,7 @@
 .method public j(Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/g;->bCC:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bCW:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -306,7 +306,7 @@
 .method public m(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/g;->bCC:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bCW:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/org/a/a/h.smali b/com.discord/smali_classes2/org/a/a/h.smali
index 7f1e81d5f8..f92b7fae47 100644
--- a/com.discord/smali_classes2/org/a/a/h.smali
+++ b/com.discord/smali_classes2/org/a/a/h.smali
@@ -4,59 +4,59 @@
 
 
 # instance fields
-.field private bCD:I
+.field private final bCH:Lorg/a/a/z;
 
-.field private bCE:I
-
-.field private bCF:I
-
-.field private bCG:I
-
-.field private bCH:[I
-
-.field private bCI:Lorg/a/a/n;
-
-.field private bCJ:Lorg/a/a/n;
-
-.field private bCK:Lorg/a/a/u;
-
-.field private bCL:Lorg/a/a/u;
-
-.field private bCM:I
-
-.field private bCN:Lorg/a/a/d;
-
-.field private bCO:I
-
-.field private bCP:I
-
-.field private bCQ:I
-
-.field private bCR:I
-
-.field private bCS:Lorg/a/a/d;
-
-.field private bCT:Lorg/a/a/b;
-
-.field private bCU:Lorg/a/a/b;
-
-.field private bCV:Lorg/a/a/b;
-
-.field private bCW:Lorg/a/a/b;
-
-.field private bCX:Lorg/a/a/w;
+.field private bCX:I
 
 .field private bCY:I
 
 .field private bCZ:I
 
-.field private final bCn:Lorg/a/a/z;
+.field private bDa:I
 
-.field private bDa:Lorg/a/a/d;
+.field private bDb:[I
 
-.field private bDb:Lorg/a/a/c;
+.field private bDc:Lorg/a/a/n;
 
-.field private bDc:I
+.field private bDd:Lorg/a/a/n;
+
+.field private bDe:Lorg/a/a/u;
+
+.field private bDf:Lorg/a/a/u;
+
+.field private bDg:I
+
+.field private bDh:Lorg/a/a/d;
+
+.field private bDi:I
+
+.field private bDj:I
+
+.field private bDk:I
+
+.field private bDl:I
+
+.field private bDm:Lorg/a/a/d;
+
+.field private bDn:Lorg/a/a/b;
+
+.field private bDo:Lorg/a/a/b;
+
+.field private bDp:Lorg/a/a/b;
+
+.field private bDq:Lorg/a/a/b;
+
+.field private bDr:Lorg/a/a/w;
+
+.field private bDs:I
+
+.field private bDt:I
+
+.field private bDu:Lorg/a/a/d;
+
+.field private bDv:Lorg/a/a/c;
+
+.field private bDw:I
 
 .field private version:I
 
@@ -81,7 +81,7 @@
 
     invoke-direct {p2, p0}, Lorg/a/a/z;-><init>(Lorg/a/a/h;)V
 
-    iput-object p2, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iput-object p2, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     and-int/lit8 p2, p1, 0x2
 
@@ -89,7 +89,7 @@
 
     const/4 p1, 0x4
 
-    iput p1, p0, Lorg/a/a/h;->bDc:I
+    iput p1, p0, Lorg/a/a/h;->bDw:I
 
     return-void
 
@@ -100,14 +100,14 @@
 
     if-eqz p1, :cond_1
 
-    iput p2, p0, Lorg/a/a/h;->bDc:I
+    iput p2, p0, Lorg/a/a/h;->bDw:I
 
     return-void
 
     :cond_1
     const/4 p1, 0x0
 
-    iput p1, p0, Lorg/a/a/h;->bDc:I
+    iput p1, p0, Lorg/a/a/h;->bDw:I
 
     return-void
 .end method
@@ -125,44 +125,44 @@
 
     invoke-static {p2, v0}, Lorg/a/a/ab;->a(Lorg/a/a/ab;Lorg/a/a/d;)V
 
-    iget-object p1, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {p1, p3}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p1, p3}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     if-eqz p4, :cond_0
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/h;->bCV:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/h;->bDp:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, p3}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/h;->bCV:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/h;->bDp:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/h;->bCW:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/h;->bDq:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, p3}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/h;->bCW:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/h;->bDq:Lorg/a/a/b;
 
     return-object p1
 .end method
@@ -172,7 +172,7 @@
 
     new-instance v7, Lorg/a/a/n;
 
-    iget-object v1, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     move-object v0, v7
 
@@ -188,21 +188,21 @@
 
     invoke-direct/range {v0 .. v6}, Lorg/a/a/n;-><init>(Lorg/a/a/z;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lorg/a/a/h;->bCI:Lorg/a/a/n;
+    iget-object p1, p0, Lorg/a/a/h;->bDc:Lorg/a/a/n;
 
     if-nez p1, :cond_0
 
-    iput-object v7, p0, Lorg/a/a/h;->bCI:Lorg/a/a/n;
+    iput-object v7, p0, Lorg/a/a/h;->bDc:Lorg/a/a/n;
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/h;->bCJ:Lorg/a/a/n;
+    iget-object p1, p0, Lorg/a/a/h;->bDd:Lorg/a/a/n;
 
-    iput-object v7, p1, Lorg/a/a/n;->bDA:Lorg/a/a/m;
+    iput-object v7, p1, Lorg/a/a/n;->bDU:Lorg/a/a/m;
 
     :goto_0
-    iput-object v7, p0, Lorg/a/a/h;->bCJ:Lorg/a/a/n;
+    iput-object v7, p0, Lorg/a/a/h;->bDd:Lorg/a/a/n;
 
     return-object v7
 .end method
@@ -212,9 +212,9 @@
 
     new-instance v8, Lorg/a/a/u;
 
-    iget-object v1, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    iget v7, p0, Lorg/a/a/h;->bDc:I
+    iget v7, p0, Lorg/a/a/h;->bDw:I
 
     move-object v0, v8
 
@@ -230,21 +230,21 @@
 
     invoke-direct/range {v0 .. v7}, Lorg/a/a/u;-><init>(Lorg/a/a/z;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;I)V
 
-    iget-object p1, p0, Lorg/a/a/h;->bCK:Lorg/a/a/u;
+    iget-object p1, p0, Lorg/a/a/h;->bDe:Lorg/a/a/u;
 
     if-nez p1, :cond_0
 
-    iput-object v8, p0, Lorg/a/a/h;->bCK:Lorg/a/a/u;
+    iput-object v8, p0, Lorg/a/a/h;->bDe:Lorg/a/a/u;
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/h;->bCL:Lorg/a/a/u;
+    iget-object p1, p0, Lorg/a/a/h;->bDf:Lorg/a/a/u;
 
-    iput-object v8, p1, Lorg/a/a/u;->bEj:Lorg/a/a/t;
+    iput-object v8, p1, Lorg/a/a/u;->bED:Lorg/a/a/t;
 
     :goto_0
-    iput-object v8, p0, Lorg/a/a/h;->bCL:Lorg/a/a/u;
+    iput-object v8, p0, Lorg/a/a/h;->bDf:Lorg/a/a/u;
 
     return-object v8
 .end method
@@ -254,15 +254,15 @@
 
     iput p1, p0, Lorg/a/a/h;->version:I
 
-    iput p2, p0, Lorg/a/a/h;->bCD:I
+    iput p2, p0, Lorg/a/a/h;->bCX:I
 
-    iget-object p2, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const v0, 0xffff
 
     and-int/2addr p1, v0
 
-    iput p1, p2, Lorg/a/a/z;->bFz:I
+    iput p1, p2, Lorg/a/a/z;->bFT:I
 
     iput-object p3, p2, Lorg/a/a/z;->className:Ljava/lang/String;
 
@@ -274,17 +274,17 @@
 
     iget p2, p2, Lorg/a/a/y;->index:I
 
-    iput p2, p0, Lorg/a/a/h;->bCE:I
+    iput p2, p0, Lorg/a/a/h;->bCY:I
 
     if-eqz p4, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {p2, p4}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p2, p4}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/h;->bCQ:I
+    iput p2, p0, Lorg/a/a/h;->bDk:I
 
     :cond_0
     const/4 p2, 0x0
@@ -296,7 +296,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p3, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object p3, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     invoke-virtual {p3, v0, p5}, Lorg/a/a/z;->j(ILjava/lang/String;)Lorg/a/a/y;
 
@@ -305,7 +305,7 @@
     iget p3, p3, Lorg/a/a/y;->index:I
 
     :goto_0
-    iput p3, p0, Lorg/a/a/h;->bCF:I
+    iput p3, p0, Lorg/a/a/h;->bCZ:I
 
     if-eqz p6, :cond_2
 
@@ -315,22 +315,22 @@
 
     array-length p3, p6
 
-    iput p3, p0, Lorg/a/a/h;->bCG:I
+    iput p3, p0, Lorg/a/a/h;->bDa:I
 
-    iget p3, p0, Lorg/a/a/h;->bCG:I
+    iget p3, p0, Lorg/a/a/h;->bDa:I
 
     new-array p3, p3, [I
 
-    iput-object p3, p0, Lorg/a/a/h;->bCH:[I
+    iput-object p3, p0, Lorg/a/a/h;->bDb:[I
 
     :goto_1
-    iget p3, p0, Lorg/a/a/h;->bCG:I
+    iget p3, p0, Lorg/a/a/h;->bDa:I
 
     if-ge p2, p3, :cond_2
 
-    iget-object p3, p0, Lorg/a/a/h;->bCH:[I
+    iget-object p3, p0, Lorg/a/a/h;->bDb:[I
 
-    iget-object p4, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object p4, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     aget-object p5, p6, p2
 
@@ -347,7 +347,7 @@
     goto :goto_1
 
     :cond_2
-    iget p2, p0, Lorg/a/a/h;->bDc:I
+    iget p2, p0, Lorg/a/a/h;->bDw:I
 
     const/4 p3, 0x1
 
@@ -359,7 +359,7 @@
 
     const/4 p1, 0x2
 
-    iput p1, p0, Lorg/a/a/h;->bDc:I
+    iput p1, p0, Lorg/a/a/h;->bDw:I
 
     :cond_3
     return-void
@@ -368,7 +368,7 @@
 .method public final a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/h;->bCN:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bDh:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -376,10 +376,10 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/h;->bCN:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/h;->bDh:Lorg/a/a/d;
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -391,19 +391,19 @@
 
     if-nez v0, :cond_3
 
-    iget v0, p0, Lorg/a/a/h;->bCM:I
+    iget v0, p0, Lorg/a/a/h;->bDg:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/h;->bCM:I
+    iput v0, p0, Lorg/a/a/h;->bDg:I
 
-    iget-object v0, p0, Lorg/a/a/h;->bCN:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bDh:Lorg/a/a/d;
 
     iget v2, p1, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v0, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/h;->bCN:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bDh:Lorg/a/a/d;
 
     const/4 v2, 0x0
 
@@ -414,7 +414,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v3, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v3, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v3, v1, p2}, Lorg/a/a/z;->j(ILjava/lang/String;)Lorg/a/a/y;
 
@@ -423,29 +423,29 @@
     iget p2, p2, Lorg/a/a/y;->index:I
 
     :goto_0
-    invoke-virtual {v0, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/h;->bCN:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/h;->bDh:Lorg/a/a/d;
 
     if-nez p3, :cond_2
 
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v0, p3}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v0, p3}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v2
 
     :goto_1
-    invoke-virtual {p2, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p2, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/h;->bCN:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/h;->bDh:Lorg/a/a/d;
 
-    invoke-virtual {p2, p4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p2, p4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget p2, p0, Lorg/a/a/h;->bCM:I
+    iget p2, p0, Lorg/a/a/h;->bDg:I
 
     iput p2, p1, Lorg/a/a/y;->info:I
 
@@ -458,13 +458,13 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v0, p1}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v0, p1}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/h;->bCR:I
+    iput p1, p0, Lorg/a/a/h;->bDl:I
 
     :cond_0
     if-eqz p2, :cond_1
@@ -481,7 +481,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/a/a/h;->bCS:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/h;->bDm:Lorg/a/a/d;
 
     :cond_1
     return-void
@@ -613,11 +613,11 @@
 .method public final b(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/h;->bDb:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/h;->bDv:Lorg/a/a/c;
 
-    iput-object v0, p1, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iput-object v0, p1, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
-    iput-object p1, p0, Lorg/a/a/h;->bDb:Lorg/a/a/c;
+    iput-object p1, p0, Lorg/a/a/h;->bDv:Lorg/a/a/c;
 
     return-void
 .end method
@@ -627,7 +627,7 @@
 
     new-instance v0, Lorg/a/a/w;
 
-    iget-object v1, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const/16 v2, 0x13
 
@@ -644,24 +644,24 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v2, p3}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v2, p3}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p3
 
     :goto_0
     invoke-direct {v0, v1, p1, p2, p3}, Lorg/a/a/w;-><init>(Lorg/a/a/z;III)V
 
-    iput-object v0, p0, Lorg/a/a/h;->bCX:Lorg/a/a/w;
+    iput-object v0, p0, Lorg/a/a/h;->bDr:Lorg/a/a/w;
 
     return-object v0
 .end method
 
-.method public final eQ(Ljava/lang/String;)V
+.method public final eL(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -671,15 +671,15 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    iput p1, p0, Lorg/a/a/h;->bCY:I
+    iput p1, p0, Lorg/a/a/h;->bDs:I
 
     return-void
 .end method
 
-.method public final eR(Ljava/lang/String;)V
+.method public final eM(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/h;->bDa:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bDu:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -687,18 +687,18 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/h;->bDa:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/h;->bDu:Lorg/a/a/d;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/h;->bCZ:I
+    iget v0, p0, Lorg/a/a/h;->bDt:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/h;->bCZ:I
+    iput v0, p0, Lorg/a/a/h;->bDt:I
 
-    iget-object v0, p0, Lorg/a/a/h;->bDa:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bDu:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const/4 v2, 0x7
 
@@ -708,7 +708,7 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 .end method
@@ -720,44 +720,44 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iget-object v1, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, p1}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, p1}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
     const/4 v1, 0x0
 
-    invoke-virtual {p1, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     if-eqz p2, :cond_0
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/h;->bCT:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/h;->bDn:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, v1}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/h;->bCT:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/h;->bDn:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/h;->bCU:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/h;->bDo:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, v1}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/h;->bCU:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/h;->bDo:Lorg/a/a/b;
 
     return-object p1
 .end method
@@ -765,7 +765,7 @@
 .method public final m(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -775,19 +775,19 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    iput p1, p0, Lorg/a/a/h;->bCO:I
+    iput p1, p0, Lorg/a/a/h;->bDi:I
 
     if-eqz p2, :cond_0
 
     if-eqz p3, :cond_0
 
-    iget-object p1, p0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     invoke-virtual {p1, p2, p3}, Lorg/a/a/z;->aw(Ljava/lang/String;Ljava/lang/String;)I
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/h;->bCP:I
+    iput p1, p0, Lorg/a/a/h;->bDj:I
 
     :cond_0
     return-void
@@ -805,7 +805,7 @@
     move-object/from16 v0, p0
 
     :goto_0
-    iget v1, v0, Lorg/a/a/h;->bCG:I
+    iget v1, v0, Lorg/a/a/h;->bDa:I
 
     const/4 v2, 0x2
 
@@ -813,7 +813,7 @@
 
     add-int/lit8 v1, v1, 0x18
 
-    iget-object v3, v0, Lorg/a/a/h;->bCI:Lorg/a/a/n;
+    iget-object v3, v0, Lorg/a/a/h;->bDc:Lorg/a/a/n;
 
     move v5, v1
 
@@ -844,123 +844,123 @@
 
     add-int/lit8 v1, v1, 0x1
 
-    iget v4, v3, Lorg/a/a/n;->bDD:I
+    iget v4, v3, Lorg/a/a/n;->bDX:I
 
     if-eqz v4, :cond_0
 
-    iget-object v4, v3, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
     const-string v15, "ConstantValue"
 
-    invoke-virtual {v4, v15}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v15}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     const/16 v15, 0x10
 
     :cond_0
-    iget v4, v3, Lorg/a/a/n;->bCD:I
+    iget v4, v3, Lorg/a/a/n;->bCX:I
 
     and-int/2addr v4, v14
 
     if-eqz v4, :cond_1
 
-    iget-object v4, v3, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    iget v4, v4, Lorg/a/a/z;->bFz:I
+    iget v4, v4, Lorg/a/a/z;->bFT:I
 
     if-ge v4, v10, :cond_1
 
-    iget-object v4, v3, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v4, v8}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v8}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     add-int/lit8 v15, v15, 0x6
 
     :cond_1
-    iget v4, v3, Lorg/a/a/n;->bCQ:I
+    iget v4, v3, Lorg/a/a/n;->bDk:I
 
     if-eqz v4, :cond_2
 
-    iget-object v4, v3, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v4, v9}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v9}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     add-int/lit8 v15, v15, 0x8
 
     :cond_2
-    iget v4, v3, Lorg/a/a/n;->bCD:I
+    iget v4, v3, Lorg/a/a/n;->bCX:I
 
     and-int/2addr v4, v11
 
     if-eqz v4, :cond_3
 
-    iget-object v4, v3, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v4, v7}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v7}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     add-int/lit8 v15, v15, 0x6
 
     :cond_3
-    iget-object v4, v3, Lorg/a/a/n;->bCT:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bDn:Lorg/a/a/b;
 
     if-eqz v4, :cond_4
 
-    iget-object v4, v3, Lorg/a/a/n;->bCT:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bDn:Lorg/a/a/b;
 
-    invoke-virtual {v4, v6}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v4, v6}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v4
 
     add-int/2addr v15, v4
 
     :cond_4
-    iget-object v4, v3, Lorg/a/a/n;->bCU:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bDo:Lorg/a/a/b;
 
     if-eqz v4, :cond_5
 
-    iget-object v4, v3, Lorg/a/a/n;->bCU:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bDo:Lorg/a/a/b;
 
     const-string v6, "RuntimeInvisibleAnnotations"
 
-    invoke-virtual {v4, v6}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v4, v6}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v4
 
     add-int/2addr v15, v4
 
     :cond_5
-    iget-object v4, v3, Lorg/a/a/n;->bCV:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bDp:Lorg/a/a/b;
 
     if-eqz v4, :cond_6
 
-    iget-object v4, v3, Lorg/a/a/n;->bCV:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bDp:Lorg/a/a/b;
 
-    invoke-virtual {v4, v13}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v4, v13}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v4
 
     add-int/2addr v15, v4
 
     :cond_6
-    iget-object v4, v3, Lorg/a/a/n;->bCW:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bDq:Lorg/a/a/b;
 
     if-eqz v4, :cond_7
 
-    iget-object v4, v3, Lorg/a/a/n;->bCW:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bDq:Lorg/a/a/b;
 
-    invoke-virtual {v4, v12}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v4, v12}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v4
 
     add-int/2addr v15, v4
 
     :cond_7
-    iget-object v4, v3, Lorg/a/a/n;->bDb:Lorg/a/a/c;
+    iget-object v4, v3, Lorg/a/a/n;->bDv:Lorg/a/a/c;
 
     if-eqz v4, :cond_8
 
-    iget-object v4, v3, Lorg/a/a/n;->bDb:Lorg/a/a/c;
+    iget-object v4, v3, Lorg/a/a/n;->bDv:Lorg/a/a/c;
 
-    iget-object v6, v3, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v6, v3, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v4, v6}, Lorg/a/a/c;->a(Lorg/a/a/z;)I
 
@@ -971,14 +971,14 @@
     :cond_8
     add-int/2addr v5, v15
 
-    iget-object v3, v3, Lorg/a/a/n;->bDA:Lorg/a/a/m;
+    iget-object v3, v3, Lorg/a/a/n;->bDU:Lorg/a/a/m;
 
     check-cast v3, Lorg/a/a/n;
 
     goto/16 :goto_1
 
     :cond_9
-    iget-object v3, v0, Lorg/a/a/h;->bCK:Lorg/a/a/u;
+    iget-object v3, v0, Lorg/a/a/h;->bDe:Lorg/a/a/u;
 
     const/4 v4, 0x0
 
@@ -989,24 +989,24 @@
 
     add-int/lit8 v4, v4, 0x1
 
-    iget v11, v3, Lorg/a/a/u;->bEW:I
+    iget v11, v3, Lorg/a/a/u;->bFq:I
 
     if-eqz v11, :cond_a
 
-    iget v11, v3, Lorg/a/a/u;->bEX:I
+    iget v11, v3, Lorg/a/a/u;->bFr:I
 
     add-int/lit8 v11, v11, 0x6
 
     goto/16 :goto_9
 
     :cond_a
-    iget-object v11, v3, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
     if-lez v11, :cond_15
 
-    iget-object v11, v3, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -1014,19 +1014,19 @@
 
     if-gt v11, v14, :cond_14
 
-    iget-object v11, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v14, "Code"
 
-    invoke-virtual {v11, v14}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v11, v14}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
-    iget-object v11, v3, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
     add-int/lit8 v11, v11, 0x10
 
-    iget-object v14, v3, Lorg/a/a/u;->bEo:Lorg/a/a/q;
+    iget-object v14, v3, Lorg/a/a/u;->bEI:Lorg/a/a/q;
 
     invoke-static {v14}, Lorg/a/a/q;->b(Lorg/a/a/q;)I
 
@@ -1036,13 +1036,13 @@
 
     add-int/2addr v11, v15
 
-    iget-object v14, v3, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v14, v3, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     if-eqz v14, :cond_d
 
-    iget-object v14, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v14, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget v14, v14, Lorg/a/a/z;->bFz:I
+    iget v14, v14, Lorg/a/a/z;->bFT:I
 
     const/16 v10, 0x32
 
@@ -1056,7 +1056,7 @@
     const/4 v10, 0x0
 
     :goto_3
-    iget-object v14, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v14, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     if-eqz v10, :cond_c
 
@@ -1068,9 +1068,9 @@
     const-string v10, "StackMap"
 
     :goto_4
-    invoke-virtual {v14, v10}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v14, v10}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
-    iget-object v10, v3, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -1079,17 +1079,17 @@
     add-int/2addr v11, v10
 
     :cond_d
-    iget-object v10, v3, Lorg/a/a/u;->bEr:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bEL:Lorg/a/a/d;
 
     if-eqz v10, :cond_e
 
-    iget-object v10, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v10, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v14, "LineNumberTable"
 
-    invoke-virtual {v10, v14}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v10, v14}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
-    iget-object v10, v3, Lorg/a/a/u;->bEr:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bEL:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -1098,17 +1098,17 @@
     add-int/2addr v11, v10
 
     :cond_e
-    iget-object v10, v3, Lorg/a/a/u;->bEt:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bEN:Lorg/a/a/d;
 
     if-eqz v10, :cond_f
 
-    iget-object v10, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v10, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v14, "LocalVariableTable"
 
-    invoke-virtual {v10, v14}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v10, v14}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
-    iget-object v10, v3, Lorg/a/a/u;->bEt:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bEN:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -1117,17 +1117,17 @@
     add-int/2addr v11, v10
 
     :cond_f
-    iget-object v10, v3, Lorg/a/a/u;->bEv:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bEP:Lorg/a/a/d;
 
     if-eqz v10, :cond_10
 
-    iget-object v10, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v10, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v14, "LocalVariableTypeTable"
 
-    invoke-virtual {v10, v14}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v10, v14}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
-    iget-object v10, v3, Lorg/a/a/u;->bEv:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bEP:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -1136,39 +1136,39 @@
     add-int/2addr v11, v10
 
     :cond_10
-    iget-object v10, v3, Lorg/a/a/u;->bEy:Lorg/a/a/b;
+    iget-object v10, v3, Lorg/a/a/u;->bES:Lorg/a/a/b;
 
     if-eqz v10, :cond_11
 
-    iget-object v10, v3, Lorg/a/a/u;->bEy:Lorg/a/a/b;
+    iget-object v10, v3, Lorg/a/a/u;->bES:Lorg/a/a/b;
 
-    invoke-virtual {v10, v13}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v10, v13}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v10
 
     add-int/2addr v11, v10
 
     :cond_11
-    iget-object v10, v3, Lorg/a/a/u;->bEz:Lorg/a/a/b;
+    iget-object v10, v3, Lorg/a/a/u;->bET:Lorg/a/a/b;
 
     if-eqz v10, :cond_12
 
-    iget-object v10, v3, Lorg/a/a/u;->bEz:Lorg/a/a/b;
+    iget-object v10, v3, Lorg/a/a/u;->bET:Lorg/a/a/b;
 
-    invoke-virtual {v10, v12}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v10, v12}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v10
 
     add-int/2addr v11, v10
 
     :cond_12
-    iget-object v10, v3, Lorg/a/a/u;->bEA:Lorg/a/a/c;
+    iget-object v10, v3, Lorg/a/a/u;->bEU:Lorg/a/a/c;
 
     if-eqz v10, :cond_13
 
-    iget-object v10, v3, Lorg/a/a/u;->bEA:Lorg/a/a/c;
+    iget-object v10, v3, Lorg/a/a/u;->bEU:Lorg/a/a/c;
 
-    iget-object v14, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v14, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v10, v14}, Lorg/a/a/c;->a(Lorg/a/a/z;)I
 
@@ -1186,7 +1186,7 @@
     :cond_14
     new-instance v1, Lorg/a/a/s;
 
-    iget-object v2, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v2, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     iget-object v2, v2, Lorg/a/a/z;->className:Ljava/lang/String;
 
@@ -1194,7 +1194,7 @@
 
     iget-object v5, v3, Lorg/a/a/u;->descriptor:Ljava/lang/String;
 
-    iget-object v3, v3, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v3, v3, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v3, v3, Lorg/a/a/d;->length:I
 
@@ -1206,17 +1206,17 @@
     const/16 v10, 0x8
 
     :goto_5
-    iget v11, v3, Lorg/a/a/u;->bEB:I
+    iget v11, v3, Lorg/a/a/u;->bEV:I
 
     if-lez v11, :cond_16
 
-    iget-object v11, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v14, "Exceptions"
 
-    invoke-virtual {v11, v14}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v11, v14}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
-    iget v11, v3, Lorg/a/a/u;->bEB:I
+    iget v11, v3, Lorg/a/a/u;->bEV:I
 
     mul-int/lit8 v11, v11, 0x2
 
@@ -1225,9 +1225,9 @@
     add-int/2addr v10, v11
 
     :cond_16
-    iget-object v11, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget v11, v11, Lorg/a/a/z;->bFz:I
+    iget v11, v11, Lorg/a/a/z;->bFT:I
 
     const/16 v14, 0x31
 
@@ -1239,7 +1239,7 @@
     const/16 v16, 0x0
 
     :goto_6
-    iget v11, v3, Lorg/a/a/u;->bCD:I
+    iget v11, v3, Lorg/a/a/u;->bCX:I
 
     const/16 v14, 0x1000
 
@@ -1249,25 +1249,25 @@
 
     if-eqz v16, :cond_18
 
-    iget-object v11, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v11, v8}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v11, v8}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     add-int/lit8 v10, v10, 0x6
 
     :cond_18
-    iget v11, v3, Lorg/a/a/u;->bCQ:I
+    iget v11, v3, Lorg/a/a/u;->bDk:I
 
     if-eqz v11, :cond_19
 
-    iget-object v11, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v11, v9}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v11, v9}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     add-int/lit8 v10, v10, 0x8
 
     :cond_19
-    iget v11, v3, Lorg/a/a/u;->bCD:I
+    iget v11, v3, Lorg/a/a/u;->bCX:I
 
     const/high16 v14, 0x20000
 
@@ -1275,59 +1275,59 @@
 
     if-eqz v11, :cond_1a
 
-    iget-object v11, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v11, v7}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v11, v7}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     add-int/lit8 v10, v10, 0x6
 
     :cond_1a
-    iget-object v11, v3, Lorg/a/a/u;->bCT:Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bDn:Lorg/a/a/b;
 
     if-eqz v11, :cond_1b
 
-    iget-object v11, v3, Lorg/a/a/u;->bCT:Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bDn:Lorg/a/a/b;
 
-    invoke-virtual {v11, v6}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v11, v6}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v11
 
     add-int/2addr v10, v11
 
     :cond_1b
-    iget-object v11, v3, Lorg/a/a/u;->bCU:Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bDo:Lorg/a/a/b;
 
     if-eqz v11, :cond_1c
 
-    iget-object v11, v3, Lorg/a/a/u;->bCU:Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bDo:Lorg/a/a/b;
 
     const-string v14, "RuntimeInvisibleAnnotations"
 
-    invoke-virtual {v11, v14}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v11, v14}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v11
 
     add-int/2addr v10, v11
 
     :cond_1c
-    iget-object v11, v3, Lorg/a/a/u;->bEE:[Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bEY:[Lorg/a/a/b;
 
     if-eqz v11, :cond_1e
 
-    iget-object v11, v3, Lorg/a/a/u;->bEE:[Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bEY:[Lorg/a/a/b;
 
-    iget v14, v3, Lorg/a/a/u;->bED:I
+    iget v14, v3, Lorg/a/a/u;->bEX:I
 
     if-nez v14, :cond_1d
 
-    iget-object v14, v3, Lorg/a/a/u;->bEE:[Lorg/a/a/b;
+    iget-object v14, v3, Lorg/a/a/u;->bEY:[Lorg/a/a/b;
 
     array-length v14, v14
 
     goto :goto_7
 
     :cond_1d
-    iget v14, v3, Lorg/a/a/u;->bED:I
+    iget v14, v3, Lorg/a/a/u;->bEX:I
 
     :goto_7
     const-string v2, "RuntimeVisibleParameterAnnotations"
@@ -1339,24 +1339,24 @@
     add-int/2addr v10, v2
 
     :cond_1e
-    iget-object v2, v3, Lorg/a/a/u;->bEG:[Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bFa:[Lorg/a/a/b;
 
     if-eqz v2, :cond_20
 
-    iget-object v2, v3, Lorg/a/a/u;->bEG:[Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bFa:[Lorg/a/a/b;
 
-    iget v11, v3, Lorg/a/a/u;->bEF:I
+    iget v11, v3, Lorg/a/a/u;->bEZ:I
 
     if-nez v11, :cond_1f
 
-    iget-object v11, v3, Lorg/a/a/u;->bEG:[Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bFa:[Lorg/a/a/b;
 
     array-length v11, v11
 
     goto :goto_8
 
     :cond_1f
-    iget v11, v3, Lorg/a/a/u;->bEF:I
+    iget v11, v3, Lorg/a/a/u;->bEZ:I
 
     :goto_8
     const-string v14, "RuntimeInvisibleParameterAnnotations"
@@ -1368,43 +1368,43 @@
     add-int/2addr v10, v2
 
     :cond_20
-    iget-object v2, v3, Lorg/a/a/u;->bCV:Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bDp:Lorg/a/a/b;
 
     if-eqz v2, :cond_21
 
-    iget-object v2, v3, Lorg/a/a/u;->bCV:Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bDp:Lorg/a/a/b;
 
-    invoke-virtual {v2, v13}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v2, v13}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v2
 
     add-int/2addr v10, v2
 
     :cond_21
-    iget-object v2, v3, Lorg/a/a/u;->bCW:Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bDq:Lorg/a/a/b;
 
     if-eqz v2, :cond_22
 
-    iget-object v2, v3, Lorg/a/a/u;->bCW:Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bDq:Lorg/a/a/b;
 
-    invoke-virtual {v2, v12}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v2, v12}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v2
 
     add-int/2addr v10, v2
 
     :cond_22
-    iget-object v2, v3, Lorg/a/a/u;->bEH:Lorg/a/a/d;
+    iget-object v2, v3, Lorg/a/a/u;->bFb:Lorg/a/a/d;
 
     if-eqz v2, :cond_23
 
-    iget-object v2, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v2, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v11, "AnnotationDefault"
 
-    invoke-virtual {v2, v11}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v2, v11}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
-    iget-object v2, v3, Lorg/a/a/u;->bEH:Lorg/a/a/d;
+    iget-object v2, v3, Lorg/a/a/u;->bFb:Lorg/a/a/d;
 
     iget v2, v2, Lorg/a/a/d;->length:I
 
@@ -1413,17 +1413,17 @@
     add-int/2addr v10, v2
 
     :cond_23
-    iget-object v2, v3, Lorg/a/a/u;->bEJ:Lorg/a/a/d;
+    iget-object v2, v3, Lorg/a/a/u;->bFd:Lorg/a/a/d;
 
     if-eqz v2, :cond_24
 
-    iget-object v2, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v2, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v11, "MethodParameters"
 
-    invoke-virtual {v2, v11}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v2, v11}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
-    iget-object v2, v3, Lorg/a/a/u;->bEJ:Lorg/a/a/d;
+    iget-object v2, v3, Lorg/a/a/u;->bFd:Lorg/a/a/d;
 
     iget v2, v2, Lorg/a/a/d;->length:I
 
@@ -1432,13 +1432,13 @@
     add-int/2addr v10, v2
 
     :cond_24
-    iget-object v2, v3, Lorg/a/a/u;->bDb:Lorg/a/a/c;
+    iget-object v2, v3, Lorg/a/a/u;->bDv:Lorg/a/a/c;
 
     if-eqz v2, :cond_25
 
-    iget-object v2, v3, Lorg/a/a/u;->bDb:Lorg/a/a/c;
+    iget-object v2, v3, Lorg/a/a/u;->bDv:Lorg/a/a/c;
 
-    iget-object v11, v3, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v2, v11}, Lorg/a/a/c;->a(Lorg/a/a/z;)I
 
@@ -1452,7 +1452,7 @@
     :goto_9
     add-int/2addr v5, v11
 
-    iget-object v2, v3, Lorg/a/a/u;->bEj:Lorg/a/a/t;
+    iget-object v2, v3, Lorg/a/a/u;->bED:Lorg/a/a/t;
 
     move-object v3, v2
 
@@ -1469,7 +1469,7 @@
     goto/16 :goto_2
 
     :cond_26
-    iget-object v2, v0, Lorg/a/a/h;->bCN:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bDh:Lorg/a/a/d;
 
     if-eqz v2, :cond_27
 
@@ -1479,11 +1479,11 @@
 
     add-int/2addr v5, v2
 
-    iget-object v2, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const-string v3, "InnerClasses"
 
-    invoke-virtual {v2, v3}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v2, v3}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     const/4 v2, 0x1
 
@@ -1493,7 +1493,7 @@
     const/4 v2, 0x0
 
     :goto_a
-    iget v3, v0, Lorg/a/a/h;->bCO:I
+    iget v3, v0, Lorg/a/a/h;->bDi:I
 
     if-eqz v3, :cond_28
 
@@ -1501,14 +1501,14 @@
 
     add-int/lit8 v5, v5, 0xa
 
-    iget-object v3, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const-string v10, "EnclosingMethod"
 
-    invoke-virtual {v3, v10}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v3, v10}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     :cond_28
-    iget v3, v0, Lorg/a/a/h;->bCD:I
+    iget v3, v0, Lorg/a/a/h;->bCX:I
 
     const/16 v10, 0x1000
 
@@ -1530,12 +1530,12 @@
 
     add-int/lit8 v5, v5, 0x6
 
-    iget-object v3, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v3, v8}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v3, v8}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     :cond_29
-    iget v3, v0, Lorg/a/a/h;->bCQ:I
+    iget v3, v0, Lorg/a/a/h;->bDk:I
 
     if-eqz v3, :cond_2a
 
@@ -1543,12 +1543,12 @@
 
     add-int/lit8 v5, v5, 0x8
 
-    iget-object v3, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v3, v9}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v3, v9}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     :cond_2a
-    iget v3, v0, Lorg/a/a/h;->bCR:I
+    iget v3, v0, Lorg/a/a/h;->bDl:I
 
     if-eqz v3, :cond_2b
 
@@ -1556,14 +1556,14 @@
 
     add-int/lit8 v5, v5, 0x8
 
-    iget-object v3, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const-string v10, "SourceFile"
 
-    invoke-virtual {v3, v10}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v3, v10}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     :cond_2b
-    iget-object v3, v0, Lorg/a/a/h;->bCS:Lorg/a/a/d;
+    iget-object v3, v0, Lorg/a/a/h;->bDm:Lorg/a/a/d;
 
     if-eqz v3, :cond_2c
 
@@ -1575,14 +1575,14 @@
 
     add-int/2addr v5, v3
 
-    iget-object v3, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const-string v10, "SourceDebugExtension"
 
-    invoke-virtual {v3, v10}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v3, v10}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     :cond_2c
-    iget v3, v0, Lorg/a/a/h;->bCD:I
+    iget v3, v0, Lorg/a/a/h;->bCX:I
 
     const/high16 v10, 0x20000
 
@@ -1594,25 +1594,25 @@
 
     add-int/lit8 v5, v5, 0x6
 
-    iget-object v3, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v3, v7}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v3, v7}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     :cond_2d
-    iget-object v3, v0, Lorg/a/a/h;->bCT:Lorg/a/a/b;
+    iget-object v3, v0, Lorg/a/a/h;->bDn:Lorg/a/a/b;
 
     if-eqz v3, :cond_2e
 
     add-int/lit8 v2, v2, 0x1
 
-    invoke-virtual {v3, v6}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v3, v6}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v3
 
     add-int/2addr v5, v3
 
     :cond_2e
-    iget-object v3, v0, Lorg/a/a/h;->bCU:Lorg/a/a/b;
+    iget-object v3, v0, Lorg/a/a/h;->bDo:Lorg/a/a/b;
 
     if-eqz v3, :cond_2f
 
@@ -1620,42 +1620,42 @@
 
     const-string v10, "RuntimeInvisibleAnnotations"
 
-    invoke-virtual {v3, v10}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v3, v10}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v3
 
     add-int/2addr v5, v3
 
     :cond_2f
-    iget-object v3, v0, Lorg/a/a/h;->bCV:Lorg/a/a/b;
+    iget-object v3, v0, Lorg/a/a/h;->bDp:Lorg/a/a/b;
 
     if-eqz v3, :cond_30
 
     add-int/lit8 v2, v2, 0x1
 
-    invoke-virtual {v3, v13}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v3, v13}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v3
 
     add-int/2addr v5, v3
 
     :cond_30
-    iget-object v3, v0, Lorg/a/a/h;->bCW:Lorg/a/a/b;
+    iget-object v3, v0, Lorg/a/a/h;->bDq:Lorg/a/a/b;
 
     if-eqz v3, :cond_31
 
     add-int/lit8 v2, v2, 0x1
 
-    invoke-virtual {v3, v12}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v3, v12}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v3
 
     add-int/2addr v5, v3
 
     :cond_31
-    iget-object v3, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v3}, Lorg/a/a/z;->Jh()I
+    invoke-virtual {v3}, Lorg/a/a/z;->IU()I
 
     move-result v3
 
@@ -1663,20 +1663,20 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    iget-object v3, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v3}, Lorg/a/a/z;->Jh()I
+    invoke-virtual {v3}, Lorg/a/a/z;->IU()I
 
     move-result v3
 
     add-int/2addr v5, v3
 
     :cond_32
-    iget-object v3, v0, Lorg/a/a/h;->bCX:Lorg/a/a/w;
+    iget-object v3, v0, Lorg/a/a/h;->bDr:Lorg/a/a/w;
 
     if-eqz v3, :cond_37
 
-    iget v10, v3, Lorg/a/a/w;->bFm:I
+    iget v10, v3, Lorg/a/a/w;->bFG:I
 
     if-lez v10, :cond_33
 
@@ -1690,7 +1690,7 @@
     :goto_b
     add-int/lit8 v10, v10, 0x1
 
-    iget v3, v3, Lorg/a/a/w;->bFo:I
+    iget v3, v3, Lorg/a/a/w;->bFI:I
 
     if-lez v3, :cond_34
 
@@ -1706,55 +1706,55 @@
 
     add-int/2addr v2, v10
 
-    iget-object v3, v0, Lorg/a/a/h;->bCX:Lorg/a/a/w;
+    iget-object v3, v0, Lorg/a/a/h;->bDr:Lorg/a/a/w;
 
-    iget-object v10, v3, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v10, v3, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const-string v11, "Module"
 
-    invoke-virtual {v10, v11}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v10, v11}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
-    iget-object v10, v3, Lorg/a/a/w;->bFd:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/w;->bFx:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
     add-int/lit8 v10, v10, 0x16
 
-    iget-object v11, v3, Lorg/a/a/w;->bFf:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bFz:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
     add-int/2addr v10, v11
 
-    iget-object v11, v3, Lorg/a/a/w;->bFh:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bFB:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
     add-int/2addr v10, v11
 
-    iget-object v11, v3, Lorg/a/a/w;->bFj:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bFD:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
     add-int/2addr v10, v11
 
-    iget-object v11, v3, Lorg/a/a/w;->bFl:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bFF:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
     add-int/2addr v10, v11
 
-    iget v11, v3, Lorg/a/a/w;->bFm:I
+    iget v11, v3, Lorg/a/a/w;->bFG:I
 
     if-lez v11, :cond_35
 
-    iget-object v11, v3, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const-string v14, "ModulePackages"
 
-    invoke-virtual {v11, v14}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v11, v14}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
-    iget-object v11, v3, Lorg/a/a/w;->bFn:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bFH:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -1763,15 +1763,15 @@
     add-int/2addr v10, v11
 
     :cond_35
-    iget v11, v3, Lorg/a/a/w;->bFo:I
+    iget v11, v3, Lorg/a/a/w;->bFI:I
 
     if-lez v11, :cond_36
 
-    iget-object v3, v3, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v3, v3, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const-string v11, "ModuleMainClass"
 
-    invoke-virtual {v3, v11}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v3, v11}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     add-int/lit8 v10, v10, 0x8
 
@@ -1779,7 +1779,7 @@
     add-int/2addr v5, v10
 
     :cond_37
-    iget v3, v0, Lorg/a/a/h;->bCY:I
+    iget v3, v0, Lorg/a/a/h;->bDs:I
 
     if-eqz v3, :cond_38
 
@@ -1787,14 +1787,14 @@
 
     add-int/lit8 v5, v5, 0x8
 
-    iget-object v3, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const-string v10, "NestHost"
 
-    invoke-virtual {v3, v10}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v3, v10}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     :cond_38
-    iget-object v3, v0, Lorg/a/a/h;->bDa:Lorg/a/a/d;
+    iget-object v3, v0, Lorg/a/a/h;->bDu:Lorg/a/a/d;
 
     if-eqz v3, :cond_39
 
@@ -1806,14 +1806,14 @@
 
     add-int/2addr v5, v3
 
-    iget-object v3, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const-string v10, "NestMembers"
 
-    invoke-virtual {v3, v10}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v3, v10}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     :cond_39
-    iget-object v3, v0, Lorg/a/a/h;->bDb:Lorg/a/a/c;
+    iget-object v3, v0, Lorg/a/a/h;->bDv:Lorg/a/a/c;
 
     if-eqz v3, :cond_3a
 
@@ -1823,9 +1823,9 @@
 
     add-int/2addr v2, v3
 
-    iget-object v3, v0, Lorg/a/a/h;->bDb:Lorg/a/a/c;
+    iget-object v3, v0, Lorg/a/a/h;->bDv:Lorg/a/a/c;
 
-    iget-object v10, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v10, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v3, v10}, Lorg/a/a/c;->a(Lorg/a/a/z;)I
 
@@ -1834,15 +1834,15 @@
     add-int/2addr v5, v3
 
     :cond_3a
-    iget-object v3, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    iget-object v3, v3, Lorg/a/a/z;->bFC:Lorg/a/a/d;
+    iget-object v3, v3, Lorg/a/a/z;->bFW:Lorg/a/a/d;
 
     iget v3, v3, Lorg/a/a/d;->length:I
 
     add-int/2addr v5, v3
 
-    iget-object v3, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     iget v3, v3, Lorg/a/a/z;->constantPoolCount:I
 
@@ -1856,27 +1856,27 @@
 
     const v5, -0x35014542    # -8346975.0f
 
-    invoke-virtual {v3, v5}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v3, v5}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v5
 
     iget v10, v0, Lorg/a/a/h;->version:I
 
-    invoke-virtual {v5, v10}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v5, v10}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
-    iget-object v5, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v5, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     iget v10, v5, Lorg/a/a/z;->constantPoolCount:I
 
-    invoke-virtual {v3, v10}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v10}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v10
 
-    iget-object v11, v5, Lorg/a/a/z;->bFC:Lorg/a/a/d;
+    iget-object v11, v5, Lorg/a/a/z;->bFW:Lorg/a/a/d;
 
     iget-object v11, v11, Lorg/a/a/d;->data:[B
 
-    iget-object v5, v5, Lorg/a/a/z;->bFC:Lorg/a/a/d;
+    iget-object v5, v5, Lorg/a/a/z;->bFW:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
@@ -1902,58 +1902,58 @@
     const/4 v5, 0x0
 
     :goto_d
-    iget v10, v0, Lorg/a/a/h;->bCD:I
+    iget v10, v0, Lorg/a/a/h;->bCX:I
 
     xor-int/lit8 v5, v5, -0x1
 
     and-int/2addr v5, v10
 
-    invoke-virtual {v3, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v5
 
-    iget v10, v0, Lorg/a/a/h;->bCE:I
+    iget v10, v0, Lorg/a/a/h;->bCY:I
 
-    invoke-virtual {v5, v10}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v5, v10}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v5
 
-    iget v10, v0, Lorg/a/a/h;->bCF:I
+    iget v10, v0, Lorg/a/a/h;->bCZ:I
 
-    invoke-virtual {v5, v10}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v5, v10}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget v5, v0, Lorg/a/a/h;->bCG:I
+    iget v5, v0, Lorg/a/a/h;->bDa:I
 
-    invoke-virtual {v3, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     const/4 v5, 0x0
 
     :goto_e
-    iget v10, v0, Lorg/a/a/h;->bCG:I
+    iget v10, v0, Lorg/a/a/h;->bDa:I
 
     if-ge v5, v10, :cond_3c
 
-    iget-object v10, v0, Lorg/a/a/h;->bCH:[I
+    iget-object v10, v0, Lorg/a/a/h;->bDb:[I
 
     aget v10, v10, v5
 
-    invoke-virtual {v3, v10}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v10}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     add-int/lit8 v5, v5, 0x1
 
     goto :goto_e
 
     :cond_3c
-    invoke-virtual {v3, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object v1, v0, Lorg/a/a/h;->bCI:Lorg/a/a/n;
+    iget-object v1, v0, Lorg/a/a/h;->bDc:Lorg/a/a/n;
 
     :goto_f
     if-eqz v1, :cond_51
 
-    iget-object v5, v1, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    iget v5, v5, Lorg/a/a/z;->bFz:I
+    iget v5, v5, Lorg/a/a/z;->bFT:I
 
     const/16 v10, 0x31
 
@@ -1977,27 +1977,27 @@
     const/4 v10, 0x0
 
     :goto_11
-    iget v11, v1, Lorg/a/a/n;->bCD:I
+    iget v11, v1, Lorg/a/a/n;->bCX:I
 
     xor-int/lit8 v10, v10, -0x1
 
     and-int/2addr v10, v11
 
-    invoke-virtual {v3, v10}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v10}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v10
 
-    iget v11, v1, Lorg/a/a/n;->bDB:I
+    iget v11, v1, Lorg/a/a/n;->bDV:I
 
-    invoke-virtual {v10, v11}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v10, v11}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v10
 
-    iget v11, v1, Lorg/a/a/n;->bDC:I
+    iget v11, v1, Lorg/a/a/n;->bDW:I
 
-    invoke-virtual {v10, v11}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v10, v11}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget v10, v1, Lorg/a/a/n;->bDD:I
+    iget v10, v1, Lorg/a/a/n;->bDX:I
 
     if-eqz v10, :cond_3f
 
@@ -2009,7 +2009,7 @@
     const/4 v10, 0x0
 
     :goto_12
-    iget v11, v1, Lorg/a/a/n;->bCD:I
+    iget v11, v1, Lorg/a/a/n;->bCX:I
 
     const/16 v14, 0x1000
 
@@ -2022,14 +2022,14 @@
     add-int/lit8 v10, v10, 0x1
 
     :cond_40
-    iget v11, v1, Lorg/a/a/n;->bCQ:I
+    iget v11, v1, Lorg/a/a/n;->bDk:I
 
     if-eqz v11, :cond_41
 
     add-int/lit8 v10, v10, 0x1
 
     :cond_41
-    iget v11, v1, Lorg/a/a/n;->bCD:I
+    iget v11, v1, Lorg/a/a/n;->bCX:I
 
     const/high16 v14, 0x20000
 
@@ -2040,39 +2040,39 @@
     add-int/lit8 v10, v10, 0x1
 
     :cond_42
-    iget-object v11, v1, Lorg/a/a/n;->bCT:Lorg/a/a/b;
+    iget-object v11, v1, Lorg/a/a/n;->bDn:Lorg/a/a/b;
 
     if-eqz v11, :cond_43
 
     add-int/lit8 v10, v10, 0x1
 
     :cond_43
-    iget-object v11, v1, Lorg/a/a/n;->bCU:Lorg/a/a/b;
+    iget-object v11, v1, Lorg/a/a/n;->bDo:Lorg/a/a/b;
 
     if-eqz v11, :cond_44
 
     add-int/lit8 v10, v10, 0x1
 
     :cond_44
-    iget-object v11, v1, Lorg/a/a/n;->bCV:Lorg/a/a/b;
+    iget-object v11, v1, Lorg/a/a/n;->bDp:Lorg/a/a/b;
 
     if-eqz v11, :cond_45
 
     add-int/lit8 v10, v10, 0x1
 
     :cond_45
-    iget-object v11, v1, Lorg/a/a/n;->bCW:Lorg/a/a/b;
+    iget-object v11, v1, Lorg/a/a/n;->bDq:Lorg/a/a/b;
 
     if-eqz v11, :cond_46
 
     add-int/lit8 v10, v10, 0x1
 
     :cond_46
-    iget-object v11, v1, Lorg/a/a/n;->bDb:Lorg/a/a/c;
+    iget-object v11, v1, Lorg/a/a/n;->bDv:Lorg/a/a/c;
 
     if-eqz v11, :cond_47
 
-    iget-object v11, v1, Lorg/a/a/n;->bDb:Lorg/a/a/c;
+    iget-object v11, v1, Lorg/a/a/n;->bDv:Lorg/a/a/c;
 
     invoke-virtual {v11}, Lorg/a/a/c;->getAttributeCount()I
 
@@ -2081,36 +2081,36 @@
     add-int/2addr v10, v11
 
     :cond_47
-    invoke-virtual {v3, v10}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v10}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget v10, v1, Lorg/a/a/n;->bDD:I
+    iget v10, v1, Lorg/a/a/n;->bDX:I
 
     if-eqz v10, :cond_48
 
-    iget-object v10, v1, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
     const-string v11, "ConstantValue"
 
-    invoke-virtual {v10, v11}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v10, v11}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v10
 
-    invoke-virtual {v3, v10}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v10}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v10
 
     const/4 v11, 0x2
 
-    invoke-virtual {v10, v11}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v10, v11}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v10
 
-    iget v11, v1, Lorg/a/a/n;->bDD:I
+    iget v11, v1, Lorg/a/a/n;->bDX:I
 
-    invoke-virtual {v10, v11}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v10, v11}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :cond_48
-    iget v10, v1, Lorg/a/a/n;->bCD:I
+    iget v10, v1, Lorg/a/a/n;->bCX:I
 
     const/16 v11, 0x1000
 
@@ -2120,47 +2120,47 @@
 
     if-eqz v5, :cond_49
 
-    iget-object v5, v1, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v5, v8}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v5, v8}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v5
 
-    invoke-virtual {v3, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v5
 
     const/4 v10, 0x0
 
-    invoke-virtual {v5, v10}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v5, v10}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     :cond_49
-    iget v5, v1, Lorg/a/a/n;->bCQ:I
+    iget v5, v1, Lorg/a/a/n;->bDk:I
 
     if-eqz v5, :cond_4a
 
-    iget-object v5, v1, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v5, v9}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v5, v9}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v5
 
-    invoke-virtual {v3, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v5
 
     const/4 v10, 0x2
 
-    invoke-virtual {v5, v10}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v5, v10}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v5
 
-    iget v10, v1, Lorg/a/a/n;->bCQ:I
+    iget v10, v1, Lorg/a/a/n;->bDk:I
 
-    invoke-virtual {v5, v10}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v5, v10}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :cond_4a
-    iget v5, v1, Lorg/a/a/n;->bCD:I
+    iget v5, v1, Lorg/a/a/n;->bCX:I
 
     const/high16 v10, 0x20000
 
@@ -2168,104 +2168,104 @@
 
     if-eqz v5, :cond_4b
 
-    iget-object v5, v1, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v5, v7}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v5, v7}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v5
 
-    invoke-virtual {v3, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v5
 
     const/4 v10, 0x0
 
-    invoke-virtual {v5, v10}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v5, v10}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     :cond_4b
-    iget-object v5, v1, Lorg/a/a/n;->bCT:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bDn:Lorg/a/a/b;
 
     if-eqz v5, :cond_4c
 
-    iget-object v5, v1, Lorg/a/a/n;->bCT:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bDn:Lorg/a/a/b;
 
-    iget-object v10, v1, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v10, v6}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v10, v6}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v10
 
     invoke-virtual {v5, v10, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_4c
-    iget-object v5, v1, Lorg/a/a/n;->bCU:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bDo:Lorg/a/a/b;
 
     if-eqz v5, :cond_4d
 
-    iget-object v5, v1, Lorg/a/a/n;->bCU:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bDo:Lorg/a/a/b;
 
-    iget-object v10, v1, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
     const-string v11, "RuntimeInvisibleAnnotations"
 
-    invoke-virtual {v10, v11}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v10, v11}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v10
 
     invoke-virtual {v5, v10, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_4d
-    iget-object v5, v1, Lorg/a/a/n;->bCV:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bDp:Lorg/a/a/b;
 
     if-eqz v5, :cond_4e
 
-    iget-object v5, v1, Lorg/a/a/n;->bCV:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bDp:Lorg/a/a/b;
 
-    iget-object v10, v1, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v10, v13}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v10, v13}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v10
 
     invoke-virtual {v5, v10, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_4e
-    iget-object v5, v1, Lorg/a/a/n;->bCW:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bDq:Lorg/a/a/b;
 
     if-eqz v5, :cond_4f
 
-    iget-object v5, v1, Lorg/a/a/n;->bCW:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bDq:Lorg/a/a/b;
 
-    iget-object v10, v1, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v10, v12}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v10, v12}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v10
 
     invoke-virtual {v5, v10, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_4f
-    iget-object v5, v1, Lorg/a/a/n;->bDb:Lorg/a/a/c;
+    iget-object v5, v1, Lorg/a/a/n;->bDv:Lorg/a/a/c;
 
     if-eqz v5, :cond_50
 
-    iget-object v5, v1, Lorg/a/a/n;->bDb:Lorg/a/a/c;
+    iget-object v5, v1, Lorg/a/a/n;->bDv:Lorg/a/a/c;
 
-    iget-object v10, v1, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v5, v10, v3}, Lorg/a/a/c;->a(Lorg/a/a/z;Lorg/a/a/d;)V
 
     :cond_50
-    iget-object v1, v1, Lorg/a/a/n;->bDA:Lorg/a/a/m;
+    iget-object v1, v1, Lorg/a/a/n;->bDU:Lorg/a/a/m;
 
     check-cast v1, Lorg/a/a/n;
 
     goto/16 :goto_f
 
     :cond_51
-    invoke-virtual {v3, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object v1, v0, Lorg/a/a/h;->bCK:Lorg/a/a/u;
+    iget-object v1, v0, Lorg/a/a/h;->bDe:Lorg/a/a/u;
 
     const/4 v4, 0x0
 
@@ -2274,7 +2274,7 @@
     :goto_13
     if-eqz v1, :cond_85
 
-    iget v10, v1, Lorg/a/a/u;->bEw:I
+    iget v10, v1, Lorg/a/a/u;->bEQ:I
 
     if-lez v10, :cond_52
 
@@ -2288,13 +2288,13 @@
     :goto_14
     or-int/2addr v4, v10
 
-    iget-boolean v10, v1, Lorg/a/a/u;->bEU:Z
+    iget-boolean v10, v1, Lorg/a/a/u;->bFo:Z
 
     or-int/2addr v5, v10
 
-    iget-object v10, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget v10, v10, Lorg/a/a/z;->bFz:I
+    iget v10, v10, Lorg/a/a/z;->bFT:I
 
     const/16 v11, 0x31
 
@@ -2318,39 +2318,39 @@
     const/4 v11, 0x0
 
     :goto_16
-    iget v14, v1, Lorg/a/a/u;->bCD:I
+    iget v14, v1, Lorg/a/a/u;->bCX:I
 
     xor-int/lit8 v11, v11, -0x1
 
     and-int/2addr v11, v14
 
-    invoke-virtual {v3, v11}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v11}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v11
 
-    iget v14, v1, Lorg/a/a/u;->bDB:I
+    iget v14, v1, Lorg/a/a/u;->bDV:I
 
-    invoke-virtual {v11, v14}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v11, v14}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v11
 
-    iget v14, v1, Lorg/a/a/u;->bDC:I
+    iget v14, v1, Lorg/a/a/u;->bDW:I
 
-    invoke-virtual {v11, v14}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v11, v14}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget v11, v1, Lorg/a/a/u;->bEW:I
+    iget v11, v1, Lorg/a/a/u;->bFq:I
 
     if-eqz v11, :cond_55
 
-    iget-object v10, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object v10, v10, Lorg/a/a/z;->bFy:Lorg/a/a/e;
+    iget-object v10, v10, Lorg/a/a/z;->bFS:Lorg/a/a/e;
 
-    iget-object v10, v10, Lorg/a/a/e;->bCw:[B
+    iget-object v10, v10, Lorg/a/a/e;->bCQ:[B
 
-    iget v11, v1, Lorg/a/a/u;->bEW:I
+    iget v11, v1, Lorg/a/a/u;->bFq:I
 
-    iget v14, v1, Lorg/a/a/u;->bEX:I
+    iget v14, v1, Lorg/a/a/u;->bFr:I
 
     invoke-virtual {v3, v10, v11, v14}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
@@ -2363,7 +2363,7 @@
     goto/16 :goto_22
 
     :cond_55
-    iget-object v11, v1, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -2377,14 +2377,14 @@
     const/4 v11, 0x0
 
     :goto_17
-    iget v14, v1, Lorg/a/a/u;->bEB:I
+    iget v14, v1, Lorg/a/a/u;->bEV:I
 
     if-lez v14, :cond_57
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_57
-    iget v14, v1, Lorg/a/a/u;->bCD:I
+    iget v14, v1, Lorg/a/a/u;->bCX:I
 
     const/16 v15, 0x1000
 
@@ -2397,14 +2397,14 @@
     add-int/lit8 v11, v11, 0x1
 
     :cond_58
-    iget v14, v1, Lorg/a/a/u;->bCQ:I
+    iget v14, v1, Lorg/a/a/u;->bDk:I
 
     if-eqz v14, :cond_59
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_59
-    iget v14, v1, Lorg/a/a/u;->bCD:I
+    iget v14, v1, Lorg/a/a/u;->bCX:I
 
     const/high16 v15, 0x20000
 
@@ -2415,67 +2415,67 @@
     add-int/lit8 v11, v11, 0x1
 
     :cond_5a
-    iget-object v14, v1, Lorg/a/a/u;->bCT:Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bDn:Lorg/a/a/b;
 
     if-eqz v14, :cond_5b
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_5b
-    iget-object v14, v1, Lorg/a/a/u;->bCU:Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bDo:Lorg/a/a/b;
 
     if-eqz v14, :cond_5c
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_5c
-    iget-object v14, v1, Lorg/a/a/u;->bEE:[Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bEY:[Lorg/a/a/b;
 
     if-eqz v14, :cond_5d
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_5d
-    iget-object v14, v1, Lorg/a/a/u;->bEG:[Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bFa:[Lorg/a/a/b;
 
     if-eqz v14, :cond_5e
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_5e
-    iget-object v14, v1, Lorg/a/a/u;->bCV:Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bDp:Lorg/a/a/b;
 
     if-eqz v14, :cond_5f
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_5f
-    iget-object v14, v1, Lorg/a/a/u;->bCW:Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bDq:Lorg/a/a/b;
 
     if-eqz v14, :cond_60
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_60
-    iget-object v14, v1, Lorg/a/a/u;->bEH:Lorg/a/a/d;
+    iget-object v14, v1, Lorg/a/a/u;->bFb:Lorg/a/a/d;
 
     if-eqz v14, :cond_61
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_61
-    iget-object v14, v1, Lorg/a/a/u;->bEJ:Lorg/a/a/d;
+    iget-object v14, v1, Lorg/a/a/u;->bFd:Lorg/a/a/d;
 
     if-eqz v14, :cond_62
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_62
-    iget-object v14, v1, Lorg/a/a/u;->bDb:Lorg/a/a/c;
+    iget-object v14, v1, Lorg/a/a/u;->bDv:Lorg/a/a/c;
 
     if-eqz v14, :cond_63
 
-    iget-object v14, v1, Lorg/a/a/u;->bDb:Lorg/a/a/c;
+    iget-object v14, v1, Lorg/a/a/u;->bDv:Lorg/a/a/c;
 
     invoke-virtual {v14}, Lorg/a/a/c;->getAttributeCount()I
 
@@ -2484,21 +2484,21 @@
     add-int/2addr v11, v14
 
     :cond_63
-    invoke-virtual {v3, v11}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v11}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object v11, v1, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
     if-lez v11, :cond_74
 
-    iget-object v11, v1, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
     add-int/lit8 v11, v11, 0xa
 
-    iget-object v14, v1, Lorg/a/a/u;->bEo:Lorg/a/a/q;
+    iget-object v14, v1, Lorg/a/a/u;->bEI:Lorg/a/a/q;
 
     invoke-static {v14}, Lorg/a/a/q;->b(Lorg/a/a/q;)I
 
@@ -2506,11 +2506,11 @@
 
     add-int/2addr v11, v14
 
-    iget-object v14, v1, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v14, v1, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     if-eqz v14, :cond_64
 
-    iget-object v14, v1, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v14, v1, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     iget v14, v14, Lorg/a/a/d;->length:I
 
@@ -2528,11 +2528,11 @@
     const/4 v14, 0x0
 
     :goto_18
-    iget-object v15, v1, Lorg/a/a/u;->bEr:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bEL:Lorg/a/a/d;
 
     if-eqz v15, :cond_65
 
-    iget-object v15, v1, Lorg/a/a/u;->bEr:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bEL:Lorg/a/a/d;
 
     iget v15, v15, Lorg/a/a/d;->length:I
 
@@ -2550,11 +2550,11 @@
     const/16 v17, 0x8
 
     :goto_19
-    iget-object v15, v1, Lorg/a/a/u;->bEt:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bEN:Lorg/a/a/d;
 
     if-eqz v15, :cond_66
 
-    iget-object v15, v1, Lorg/a/a/u;->bEt:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bEN:Lorg/a/a/d;
 
     iget v15, v15, Lorg/a/a/d;->length:I
 
@@ -2565,11 +2565,11 @@
     add-int/lit8 v14, v14, 0x1
 
     :cond_66
-    iget-object v15, v1, Lorg/a/a/u;->bEv:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bEP:Lorg/a/a/d;
 
     if-eqz v15, :cond_67
 
-    iget-object v15, v1, Lorg/a/a/u;->bEv:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bEP:Lorg/a/a/d;
 
     iget v15, v15, Lorg/a/a/d;->length:I
 
@@ -2580,13 +2580,13 @@
     add-int/lit8 v14, v14, 0x1
 
     :cond_67
-    iget-object v15, v1, Lorg/a/a/u;->bEy:Lorg/a/a/b;
+    iget-object v15, v1, Lorg/a/a/u;->bES:Lorg/a/a/b;
 
     if-eqz v15, :cond_68
 
-    iget-object v15, v1, Lorg/a/a/u;->bEy:Lorg/a/a/b;
+    iget-object v15, v1, Lorg/a/a/u;->bES:Lorg/a/a/b;
 
-    invoke-virtual {v15, v13}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v15, v13}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v15
 
@@ -2595,13 +2595,13 @@
     add-int/lit8 v14, v14, 0x1
 
     :cond_68
-    iget-object v15, v1, Lorg/a/a/u;->bEz:Lorg/a/a/b;
+    iget-object v15, v1, Lorg/a/a/u;->bET:Lorg/a/a/b;
 
     if-eqz v15, :cond_69
 
-    iget-object v15, v1, Lorg/a/a/u;->bEz:Lorg/a/a/b;
+    iget-object v15, v1, Lorg/a/a/u;->bET:Lorg/a/a/b;
 
-    invoke-virtual {v15, v12}, Lorg/a/a/b;->eO(Ljava/lang/String;)I
+    invoke-virtual {v15, v12}, Lorg/a/a/b;->eJ(Ljava/lang/String;)I
 
     move-result v15
 
@@ -2610,15 +2610,15 @@
     add-int/lit8 v14, v14, 0x1
 
     :cond_69
-    iget-object v15, v1, Lorg/a/a/u;->bEA:Lorg/a/a/c;
+    iget-object v15, v1, Lorg/a/a/u;->bEU:Lorg/a/a/c;
 
     if-eqz v15, :cond_6a
 
-    iget-object v15, v1, Lorg/a/a/u;->bEA:Lorg/a/a/c;
+    iget-object v15, v1, Lorg/a/a/u;->bEU:Lorg/a/a/c;
 
     move/from16 v18, v4
 
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v15, v4}, Lorg/a/a/c;->a(Lorg/a/a/z;)I
 
@@ -2626,7 +2626,7 @@
 
     add-int/2addr v11, v4
 
-    iget-object v4, v1, Lorg/a/a/u;->bEA:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bEU:Lorg/a/a/c;
 
     invoke-virtual {v4}, Lorg/a/a/c;->getAttributeCount()I
 
@@ -2640,47 +2640,47 @@
     move/from16 v18, v4
 
     :goto_1a
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v15, "Code"
 
-    invoke-virtual {v4, v15}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v15}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
-    invoke-virtual {v3, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    invoke-virtual {v4, v11}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v4, v11}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget v11, v1, Lorg/a/a/u;->bEl:I
+    iget v11, v1, Lorg/a/a/u;->bEF:I
 
-    invoke-virtual {v4, v11}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v4, v11}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget v11, v1, Lorg/a/a/u;->bEm:I
+    iget v11, v1, Lorg/a/a/u;->bEG:I
 
-    invoke-virtual {v4, v11}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v4, v11}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v11, v1, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
-    invoke-virtual {v4, v11}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v4, v11}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v11, v1, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget-object v11, v11, Lorg/a/a/d;->data:[B
 
-    iget-object v15, v1, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v15, v15, Lorg/a/a/d;->length:I
 
@@ -2690,59 +2690,59 @@
 
     invoke-virtual {v4, v11, v5, v15}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
-    iget-object v4, v1, Lorg/a/a/u;->bEo:Lorg/a/a/q;
+    iget-object v4, v1, Lorg/a/a/u;->bEI:Lorg/a/a/q;
 
     invoke-static {v4}, Lorg/a/a/q;->a(Lorg/a/a/q;)I
 
     move-result v5
 
-    invoke-virtual {v3, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :goto_1b
     if-eqz v4, :cond_6b
 
-    iget-object v5, v4, Lorg/a/a/q;->bDP:Lorg/a/a/r;
+    iget-object v5, v4, Lorg/a/a/q;->bEj:Lorg/a/a/r;
 
-    iget v5, v5, Lorg/a/a/r;->bDZ:I
+    iget v5, v5, Lorg/a/a/r;->bEt:I
 
-    invoke-virtual {v3, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v5
 
-    iget-object v11, v4, Lorg/a/a/q;->bDQ:Lorg/a/a/r;
+    iget-object v11, v4, Lorg/a/a/q;->bEk:Lorg/a/a/r;
 
-    iget v11, v11, Lorg/a/a/r;->bDZ:I
+    iget v11, v11, Lorg/a/a/r;->bEt:I
 
-    invoke-virtual {v5, v11}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v5, v11}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v5
 
-    iget-object v11, v4, Lorg/a/a/q;->bDR:Lorg/a/a/r;
+    iget-object v11, v4, Lorg/a/a/q;->bEl:Lorg/a/a/r;
 
-    iget v11, v11, Lorg/a/a/r;->bDZ:I
+    iget v11, v11, Lorg/a/a/r;->bEt:I
 
-    invoke-virtual {v5, v11}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v5, v11}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v5
 
-    iget v11, v4, Lorg/a/a/q;->bDS:I
+    iget v11, v4, Lorg/a/a/q;->bEm:I
 
-    invoke-virtual {v5, v11}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v5, v11}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object v4, v4, Lorg/a/a/q;->bDU:Lorg/a/a/q;
+    iget-object v4, v4, Lorg/a/a/q;->bEo:Lorg/a/a/q;
 
     goto :goto_1b
 
     :cond_6b
-    invoke-virtual {v3, v14}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v14}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object v4, v1, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     if-eqz v4, :cond_6e
 
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget v4, v4, Lorg/a/a/z;->bFz:I
+    iget v4, v4, Lorg/a/a/z;->bFT:I
 
     const/16 v5, 0x32
 
@@ -2756,7 +2756,7 @@
     const/4 v4, 0x0
 
     :goto_1c
-    iget-object v5, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     if-eqz v4, :cond_6d
 
@@ -2768,15 +2768,15 @@
     const-string v4, "StackMap"
 
     :goto_1d
-    invoke-virtual {v5, v4}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v5, v4}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
-    invoke-virtual {v3, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
@@ -2784,21 +2784,21 @@
 
     add-int/2addr v5, v11
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bEw:I
+    iget v5, v1, Lorg/a/a/u;->bEQ:I
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v11, v1, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -2807,23 +2807,23 @@
     invoke-virtual {v4, v5, v14, v11}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
     :cond_6e
-    iget-object v4, v1, Lorg/a/a/u;->bEr:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bEL:Lorg/a/a/d;
 
     if-eqz v4, :cond_6f
 
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v5, "LineNumberTable"
 
-    invoke-virtual {v4, v5}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v5}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
-    invoke-virtual {v3, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEr:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bEL:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
@@ -2831,21 +2831,21 @@
 
     add-int/2addr v5, v11
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bEq:I
+    iget v5, v1, Lorg/a/a/u;->bEK:I
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEr:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bEL:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v11, v1, Lorg/a/a/u;->bEr:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bEL:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -2854,23 +2854,23 @@
     invoke-virtual {v4, v5, v14, v11}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
     :cond_6f
-    iget-object v4, v1, Lorg/a/a/u;->bEt:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bEN:Lorg/a/a/d;
 
     if-eqz v4, :cond_70
 
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v5, "LocalVariableTable"
 
-    invoke-virtual {v4, v5}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v5}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
-    invoke-virtual {v3, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEt:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bEN:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
@@ -2878,21 +2878,21 @@
 
     add-int/2addr v5, v11
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bEs:I
+    iget v5, v1, Lorg/a/a/u;->bEM:I
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEt:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bEN:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v11, v1, Lorg/a/a/u;->bEt:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bEN:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -2901,23 +2901,23 @@
     invoke-virtual {v4, v5, v14, v11}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
     :cond_70
-    iget-object v4, v1, Lorg/a/a/u;->bEv:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bEP:Lorg/a/a/d;
 
     if-eqz v4, :cond_71
 
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v5, "LocalVariableTypeTable"
 
-    invoke-virtual {v4, v5}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v5}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
-    invoke-virtual {v3, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEv:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bEP:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
@@ -2925,21 +2925,21 @@
 
     add-int/2addr v5, v11
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bEu:I
+    iget v5, v1, Lorg/a/a/u;->bEO:I
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEv:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bEP:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v11, v1, Lorg/a/a/u;->bEv:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bEP:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -2948,43 +2948,43 @@
     invoke-virtual {v4, v5, v14, v11}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
     :cond_71
-    iget-object v4, v1, Lorg/a/a/u;->bEy:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bES:Lorg/a/a/b;
 
     if-eqz v4, :cond_72
 
-    iget-object v4, v1, Lorg/a/a/u;->bEy:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bES:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v5, v13}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v5, v13}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v5
 
     invoke-virtual {v4, v5, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_72
-    iget-object v4, v1, Lorg/a/a/u;->bEz:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bET:Lorg/a/a/b;
 
     if-eqz v4, :cond_73
 
-    iget-object v4, v1, Lorg/a/a/u;->bEz:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bET:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v5, v12}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v5, v12}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v5
 
     invoke-virtual {v4, v5, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_73
-    iget-object v4, v1, Lorg/a/a/u;->bEA:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bEU:Lorg/a/a/c;
 
     if-eqz v4, :cond_75
 
-    iget-object v4, v1, Lorg/a/a/u;->bEA:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bEU:Lorg/a/a/c;
 
-    iget-object v5, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v4, v5, v3}, Lorg/a/a/c;->a(Lorg/a/a/z;Lorg/a/a/d;)V
 
@@ -2999,23 +2999,23 @@
 
     :cond_75
     :goto_1e
-    iget v4, v1, Lorg/a/a/u;->bEB:I
+    iget v4, v1, Lorg/a/a/u;->bEV:I
 
     if-lez v4, :cond_76
 
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v5, "Exceptions"
 
-    invoke-virtual {v4, v5}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v5}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
-    invoke-virtual {v3, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bEB:I
+    iget v5, v1, Lorg/a/a/u;->bEV:I
 
     const/4 v11, 0x2
 
@@ -3023,15 +3023,15 @@
 
     add-int/2addr v5, v11
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bEB:I
+    iget v5, v1, Lorg/a/a/u;->bEV:I
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object v4, v1, Lorg/a/a/u;->bEC:[I
+    iget-object v4, v1, Lorg/a/a/u;->bEW:[I
 
     array-length v5, v4
 
@@ -3042,14 +3042,14 @@
 
     aget v14, v4, v11
 
-    invoke-virtual {v3, v14}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v14}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     add-int/lit8 v11, v11, 0x1
 
     goto :goto_1f
 
     :cond_76
-    iget v4, v1, Lorg/a/a/u;->bCD:I
+    iget v4, v1, Lorg/a/a/u;->bCX:I
 
     const/16 v5, 0x1000
 
@@ -3059,47 +3059,47 @@
 
     if-eqz v10, :cond_77
 
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v4, v8}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v8}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
-    invoke-virtual {v3, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
     const/4 v5, 0x0
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     :cond_77
-    iget v4, v1, Lorg/a/a/u;->bCQ:I
+    iget v4, v1, Lorg/a/a/u;->bDk:I
 
     if-eqz v4, :cond_78
 
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v4, v9}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v9}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
-    invoke-virtual {v3, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
     const/4 v5, 0x2
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bCQ:I
+    iget v5, v1, Lorg/a/a/u;->bDk:I
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :cond_78
-    iget v4, v1, Lorg/a/a/u;->bCD:I
+    iget v4, v1, Lorg/a/a/u;->bCX:I
 
     const/high16 v5, 0x20000
 
@@ -3107,174 +3107,174 @@
 
     if-eqz v4, :cond_79
 
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v4, v7}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v7}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
-    invoke-virtual {v3, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
     const/4 v5, 0x0
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     :cond_79
-    iget-object v4, v1, Lorg/a/a/u;->bCT:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bDn:Lorg/a/a/b;
 
     if-eqz v4, :cond_7a
 
-    iget-object v4, v1, Lorg/a/a/u;->bCT:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bDn:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v5, v6}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v5, v6}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v5
 
     invoke-virtual {v4, v5, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_7a
-    iget-object v4, v1, Lorg/a/a/u;->bCU:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bDo:Lorg/a/a/b;
 
     if-eqz v4, :cond_7b
 
-    iget-object v4, v1, Lorg/a/a/u;->bCU:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bDo:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v10, "RuntimeInvisibleAnnotations"
 
-    invoke-virtual {v5, v10}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v5, v10}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v5
 
     invoke-virtual {v4, v5, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_7b
-    iget-object v4, v1, Lorg/a/a/u;->bEE:[Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bEY:[Lorg/a/a/b;
 
     if-eqz v4, :cond_7d
 
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v5, "RuntimeVisibleParameterAnnotations"
 
-    invoke-virtual {v4, v5}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v5}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEE:[Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/u;->bEY:[Lorg/a/a/b;
 
-    iget v10, v1, Lorg/a/a/u;->bED:I
+    iget v10, v1, Lorg/a/a/u;->bEX:I
 
     if-nez v10, :cond_7c
 
-    iget-object v10, v1, Lorg/a/a/u;->bEE:[Lorg/a/a/b;
+    iget-object v10, v1, Lorg/a/a/u;->bEY:[Lorg/a/a/b;
 
     array-length v10, v10
 
     goto :goto_20
 
     :cond_7c
-    iget v10, v1, Lorg/a/a/u;->bED:I
+    iget v10, v1, Lorg/a/a/u;->bEX:I
 
     :goto_20
     invoke-static {v4, v5, v10, v3}, Lorg/a/a/b;->a(I[Lorg/a/a/b;ILorg/a/a/d;)V
 
     :cond_7d
-    iget-object v4, v1, Lorg/a/a/u;->bEG:[Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bFa:[Lorg/a/a/b;
 
     if-eqz v4, :cond_7f
 
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v5, "RuntimeInvisibleParameterAnnotations"
 
-    invoke-virtual {v4, v5}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v5}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEG:[Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/u;->bFa:[Lorg/a/a/b;
 
-    iget v10, v1, Lorg/a/a/u;->bEF:I
+    iget v10, v1, Lorg/a/a/u;->bEZ:I
 
     if-nez v10, :cond_7e
 
-    iget-object v10, v1, Lorg/a/a/u;->bEG:[Lorg/a/a/b;
+    iget-object v10, v1, Lorg/a/a/u;->bFa:[Lorg/a/a/b;
 
     array-length v10, v10
 
     goto :goto_21
 
     :cond_7e
-    iget v10, v1, Lorg/a/a/u;->bEF:I
+    iget v10, v1, Lorg/a/a/u;->bEZ:I
 
     :goto_21
     invoke-static {v4, v5, v10, v3}, Lorg/a/a/b;->a(I[Lorg/a/a/b;ILorg/a/a/d;)V
 
     :cond_7f
-    iget-object v4, v1, Lorg/a/a/u;->bCV:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bDp:Lorg/a/a/b;
 
     if-eqz v4, :cond_80
 
-    iget-object v4, v1, Lorg/a/a/u;->bCV:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bDp:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v5, v13}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v5, v13}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v5
 
     invoke-virtual {v4, v5, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_80
-    iget-object v4, v1, Lorg/a/a/u;->bCW:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bDq:Lorg/a/a/b;
 
     if-eqz v4, :cond_81
 
-    iget-object v4, v1, Lorg/a/a/u;->bCW:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bDq:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v5, v12}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v5, v12}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v5
 
     invoke-virtual {v4, v5, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_81
-    iget-object v4, v1, Lorg/a/a/u;->bEH:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bFb:Lorg/a/a/d;
 
     if-eqz v4, :cond_82
 
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v5, "AnnotationDefault"
 
-    invoke-virtual {v4, v5}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v5}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
-    invoke-virtual {v3, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEH:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bFb:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEH:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bFb:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v10, v1, Lorg/a/a/u;->bEH:Lorg/a/a/d;
+    iget-object v10, v1, Lorg/a/a/u;->bFb:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -3283,43 +3283,43 @@
     invoke-virtual {v4, v5, v11, v10}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
     :cond_82
-    iget-object v4, v1, Lorg/a/a/u;->bEJ:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bFd:Lorg/a/a/d;
 
     if-eqz v4, :cond_83
 
-    iget-object v4, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v5, "MethodParameters"
 
-    invoke-virtual {v4, v5}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v4, v5}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
-    invoke-virtual {v3, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEJ:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bFd:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
     add-int/lit8 v5, v5, 0x1
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bEI:I
+    iget v5, v1, Lorg/a/a/u;->bFc:I
 
-    invoke-virtual {v4, v5}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v4, v5}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bEJ:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bFd:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v10, v1, Lorg/a/a/u;->bEJ:Lorg/a/a/d;
+    iget-object v10, v1, Lorg/a/a/u;->bFd:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -3328,19 +3328,19 @@
     invoke-virtual {v4, v5, v11, v10}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
     :cond_83
-    iget-object v4, v1, Lorg/a/a/u;->bDb:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bDv:Lorg/a/a/c;
 
     if-eqz v4, :cond_84
 
-    iget-object v4, v1, Lorg/a/a/u;->bDb:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bDv:Lorg/a/a/c;
 
-    iget-object v5, v1, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v4, v5, v3}, Lorg/a/a/c;->a(Lorg/a/a/z;Lorg/a/a/d;)V
 
     :cond_84
     :goto_22
-    iget-object v1, v1, Lorg/a/a/u;->bEj:Lorg/a/a/t;
+    iget-object v1, v1, Lorg/a/a/u;->bED:Lorg/a/a/t;
 
     check-cast v1, Lorg/a/a/u;
 
@@ -3355,25 +3355,25 @@
     :cond_85
     const/16 v17, 0x8
 
-    invoke-virtual {v3, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object v1, v0, Lorg/a/a/h;->bCN:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/h;->bDh:Lorg/a/a/d;
 
     if-eqz v1, :cond_86
 
-    iget-object v1, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const-string v2, "InnerClasses"
 
-    invoke-virtual {v1, v2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, v2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v1
 
-    invoke-virtual {v3, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget-object v2, v0, Lorg/a/a/h;->bCN:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bDh:Lorg/a/a/d;
 
     iget v2, v2, Lorg/a/a/d;->length:I
 
@@ -3381,21 +3381,21 @@
 
     add-int/2addr v2, v10
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bCM:I
+    iget v2, v0, Lorg/a/a/h;->bDg:I
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget-object v2, v0, Lorg/a/a/h;->bCN:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bDh:Lorg/a/a/d;
 
     iget-object v2, v2, Lorg/a/a/d;->data:[B
 
-    iget-object v10, v0, Lorg/a/a/h;->bCN:Lorg/a/a/d;
+    iget-object v10, v0, Lorg/a/a/h;->bDh:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -3404,40 +3404,40 @@
     invoke-virtual {v1, v2, v11, v10}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
     :cond_86
-    iget v1, v0, Lorg/a/a/h;->bCO:I
+    iget v1, v0, Lorg/a/a/h;->bDi:I
 
     if-eqz v1, :cond_87
 
-    iget-object v1, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const-string v2, "EnclosingMethod"
 
-    invoke-virtual {v1, v2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, v2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v1
 
-    invoke-virtual {v3, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
     const/4 v2, 0x4
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bCO:I
+    iget v2, v0, Lorg/a/a/h;->bDi:I
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bCP:I
+    iget v2, v0, Lorg/a/a/h;->bDj:I
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :cond_87
-    iget v1, v0, Lorg/a/a/h;->bCD:I
+    iget v1, v0, Lorg/a/a/h;->bCX:I
 
     const/16 v2, 0x1000
 
@@ -3455,44 +3455,44 @@
 
     if-ge v1, v2, :cond_88
 
-    iget-object v1, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, v8}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, v8}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v1
 
-    invoke-virtual {v3, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
     const/4 v2, 0x0
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     :cond_88
-    iget v1, v0, Lorg/a/a/h;->bCQ:I
+    iget v1, v0, Lorg/a/a/h;->bDk:I
 
     if-eqz v1, :cond_89
 
-    iget-object v1, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, v9}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, v9}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v1
 
-    invoke-virtual {v3, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
     const/4 v2, 0x2
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget v8, v0, Lorg/a/a/h;->bCQ:I
+    iget v8, v0, Lorg/a/a/h;->bDk:I
 
-    invoke-virtual {v1, v8}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v8}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     goto :goto_23
 
@@ -3500,54 +3500,54 @@
     const/4 v2, 0x2
 
     :goto_23
-    iget v1, v0, Lorg/a/a/h;->bCR:I
+    iget v1, v0, Lorg/a/a/h;->bDl:I
 
     if-eqz v1, :cond_8a
 
-    iget-object v1, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const-string v8, "SourceFile"
 
-    invoke-virtual {v1, v8}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, v8}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v1
 
-    invoke-virtual {v3, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bCR:I
+    iget v2, v0, Lorg/a/a/h;->bDl:I
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :cond_8a
-    iget-object v1, v0, Lorg/a/a/h;->bCS:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/h;->bDm:Lorg/a/a/d;
 
     if-eqz v1, :cond_8b
 
     iget v1, v1, Lorg/a/a/d;->length:I
 
-    iget-object v2, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const-string v8, "SourceDebugExtension"
 
-    invoke-virtual {v2, v8}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v2, v8}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v2
 
-    invoke-virtual {v3, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    invoke-virtual {v2, v1}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v2, v1}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget-object v8, v0, Lorg/a/a/h;->bCS:Lorg/a/a/d;
+    iget-object v8, v0, Lorg/a/a/h;->bDm:Lorg/a/a/d;
 
     iget-object v8, v8, Lorg/a/a/d;->data:[B
 
@@ -3561,7 +3561,7 @@
     const/4 v9, 0x0
 
     :goto_24
-    iget v1, v0, Lorg/a/a/h;->bCD:I
+    iget v1, v0, Lorg/a/a/h;->bCX:I
 
     const/high16 v2, 0x20000
 
@@ -3569,90 +3569,90 @@
 
     if-eqz v1, :cond_8c
 
-    iget-object v1, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, v7}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, v7}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v1
 
-    invoke-virtual {v3, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    invoke-virtual {v1, v9}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v1, v9}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     :cond_8c
-    iget-object v1, v0, Lorg/a/a/h;->bCT:Lorg/a/a/b;
+    iget-object v1, v0, Lorg/a/a/h;->bDn:Lorg/a/a/b;
 
     if-eqz v1, :cond_8d
 
-    iget-object v2, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v2, v6}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v2, v6}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v2
 
     invoke-virtual {v1, v2, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_8d
-    iget-object v1, v0, Lorg/a/a/h;->bCU:Lorg/a/a/b;
+    iget-object v1, v0, Lorg/a/a/h;->bDo:Lorg/a/a/b;
 
     if-eqz v1, :cond_8e
 
-    iget-object v2, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const-string v6, "RuntimeInvisibleAnnotations"
 
-    invoke-virtual {v2, v6}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v2, v6}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v2
 
     invoke-virtual {v1, v2, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_8e
-    iget-object v1, v0, Lorg/a/a/h;->bCV:Lorg/a/a/b;
+    iget-object v1, v0, Lorg/a/a/h;->bDp:Lorg/a/a/b;
 
     if-eqz v1, :cond_8f
 
-    iget-object v2, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v2, v13}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v2, v13}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v2
 
     invoke-virtual {v1, v2, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_8f
-    iget-object v1, v0, Lorg/a/a/h;->bCW:Lorg/a/a/b;
+    iget-object v1, v0, Lorg/a/a/h;->bDq:Lorg/a/a/b;
 
     if-eqz v1, :cond_90
 
-    iget-object v2, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v2, v12}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v2, v12}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v2
 
     invoke-virtual {v1, v2, v3}, Lorg/a/a/b;->a(ILorg/a/a/d;)V
 
     :cond_90
-    iget-object v1, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
-    iget-object v2, v1, Lorg/a/a/z;->bFE:Lorg/a/a/d;
+    iget-object v2, v1, Lorg/a/a/z;->bFY:Lorg/a/a/d;
 
     if-eqz v2, :cond_91
 
     const-string v2, "BootstrapMethods"
 
-    invoke-virtual {v1, v2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, v2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v2
 
-    invoke-virtual {v3, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget-object v6, v1, Lorg/a/a/z;->bFE:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/z;->bFY:Lorg/a/a/d;
 
     iget v6, v6, Lorg/a/a/d;->length:I
 
@@ -3660,21 +3660,21 @@
 
     add-int/2addr v6, v7
 
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/z;->bFD:I
+    iget v6, v1, Lorg/a/a/z;->bFX:I
 
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget-object v6, v1, Lorg/a/a/z;->bFE:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/z;->bFY:Lorg/a/a/d;
 
     iget-object v6, v6, Lorg/a/a/d;->data:[B
 
-    iget-object v1, v1, Lorg/a/a/z;->bFE:Lorg/a/a/d;
+    iget-object v1, v1, Lorg/a/a/z;->bFY:Lorg/a/a/d;
 
     iget v1, v1, Lorg/a/a/d;->length:I
 
@@ -3683,85 +3683,85 @@
     invoke-virtual {v2, v6, v7, v1}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
     :cond_91
-    iget-object v1, v0, Lorg/a/a/h;->bCX:Lorg/a/a/w;
+    iget-object v1, v0, Lorg/a/a/h;->bDr:Lorg/a/a/w;
 
     if-eqz v1, :cond_93
 
-    iget-object v2, v1, Lorg/a/a/w;->bFd:Lorg/a/a/d;
+    iget-object v2, v1, Lorg/a/a/w;->bFx:Lorg/a/a/d;
 
     iget v2, v2, Lorg/a/a/d;->length:I
 
     add-int/lit8 v2, v2, 0x10
 
-    iget-object v6, v1, Lorg/a/a/w;->bFf:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bFz:Lorg/a/a/d;
 
     iget v6, v6, Lorg/a/a/d;->length:I
 
     add-int/2addr v2, v6
 
-    iget-object v6, v1, Lorg/a/a/w;->bFh:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bFB:Lorg/a/a/d;
 
     iget v6, v6, Lorg/a/a/d;->length:I
 
     add-int/2addr v2, v6
 
-    iget-object v6, v1, Lorg/a/a/w;->bFj:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bFD:Lorg/a/a/d;
 
     iget v6, v6, Lorg/a/a/d;->length:I
 
     add-int/2addr v2, v6
 
-    iget-object v6, v1, Lorg/a/a/w;->bFl:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bFF:Lorg/a/a/d;
 
     iget v6, v6, Lorg/a/a/d;->length:I
 
     add-int/2addr v2, v6
 
-    iget-object v6, v1, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v6, v1, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const-string v7, "Module"
 
-    invoke-virtual {v6, v7}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v6, v7}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v6
 
-    invoke-virtual {v3, v6}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v6}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v6
 
-    invoke-virtual {v6, v2}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v6, v2}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bEZ:I
+    iget v6, v1, Lorg/a/a/w;->bFt:I
 
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bFa:I
+    iget v6, v1, Lorg/a/a/w;->bFu:I
 
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bFb:I
+    iget v6, v1, Lorg/a/a/w;->bFv:I
 
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bFc:I
+    iget v6, v1, Lorg/a/a/w;->bFw:I
 
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget-object v6, v1, Lorg/a/a/w;->bFd:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bFx:Lorg/a/a/d;
 
     iget-object v6, v6, Lorg/a/a/d;->data:[B
 
-    iget-object v7, v1, Lorg/a/a/w;->bFd:Lorg/a/a/d;
+    iget-object v7, v1, Lorg/a/a/w;->bFx:Lorg/a/a/d;
 
     iget v7, v7, Lorg/a/a/d;->length:I
 
@@ -3771,17 +3771,17 @@
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bFe:I
+    iget v6, v1, Lorg/a/a/w;->bFy:I
 
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget-object v6, v1, Lorg/a/a/w;->bFf:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bFz:Lorg/a/a/d;
 
     iget-object v6, v6, Lorg/a/a/d;->data:[B
 
-    iget-object v7, v1, Lorg/a/a/w;->bFf:Lorg/a/a/d;
+    iget-object v7, v1, Lorg/a/a/w;->bFz:Lorg/a/a/d;
 
     iget v7, v7, Lorg/a/a/d;->length:I
 
@@ -3789,17 +3789,17 @@
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bFg:I
+    iget v6, v1, Lorg/a/a/w;->bFA:I
 
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget-object v6, v1, Lorg/a/a/w;->bFh:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bFB:Lorg/a/a/d;
 
     iget-object v6, v6, Lorg/a/a/d;->data:[B
 
-    iget-object v7, v1, Lorg/a/a/w;->bFh:Lorg/a/a/d;
+    iget-object v7, v1, Lorg/a/a/w;->bFB:Lorg/a/a/d;
 
     iget v7, v7, Lorg/a/a/d;->length:I
 
@@ -3807,17 +3807,17 @@
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bFi:I
+    iget v6, v1, Lorg/a/a/w;->bFC:I
 
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget-object v6, v1, Lorg/a/a/w;->bFj:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bFD:Lorg/a/a/d;
 
     iget-object v6, v6, Lorg/a/a/d;->data:[B
 
-    iget-object v7, v1, Lorg/a/a/w;->bFj:Lorg/a/a/d;
+    iget-object v7, v1, Lorg/a/a/w;->bFD:Lorg/a/a/d;
 
     iget v7, v7, Lorg/a/a/d;->length:I
 
@@ -3825,39 +3825,39 @@
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bFk:I
+    iget v6, v1, Lorg/a/a/w;->bFE:I
 
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget-object v6, v1, Lorg/a/a/w;->bFl:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bFF:Lorg/a/a/d;
 
     iget-object v6, v6, Lorg/a/a/d;->data:[B
 
-    iget-object v7, v1, Lorg/a/a/w;->bFl:Lorg/a/a/d;
+    iget-object v7, v1, Lorg/a/a/w;->bFF:Lorg/a/a/d;
 
     iget v7, v7, Lorg/a/a/d;->length:I
 
     invoke-virtual {v2, v6, v8, v7}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
-    iget v2, v1, Lorg/a/a/w;->bFm:I
+    iget v2, v1, Lorg/a/a/w;->bFG:I
 
     if-lez v2, :cond_92
 
-    iget-object v2, v1, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v2, v1, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const-string v6, "ModulePackages"
 
-    invoke-virtual {v2, v6}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v2, v6}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v2
 
-    invoke-virtual {v3, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget-object v6, v1, Lorg/a/a/w;->bFn:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bFH:Lorg/a/a/d;
 
     iget v6, v6, Lorg/a/a/d;->length:I
 
@@ -3865,21 +3865,21 @@
 
     add-int/2addr v6, v7
 
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bFm:I
+    iget v6, v1, Lorg/a/a/w;->bFG:I
 
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget-object v6, v1, Lorg/a/a/w;->bFn:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bFH:Lorg/a/a/d;
 
     iget-object v6, v6, Lorg/a/a/d;->data:[B
 
-    iget-object v7, v1, Lorg/a/a/w;->bFn:Lorg/a/a/d;
+    iget-object v7, v1, Lorg/a/a/w;->bFH:Lorg/a/a/d;
 
     iget v7, v7, Lorg/a/a/d;->length:I
 
@@ -3888,77 +3888,77 @@
     invoke-virtual {v2, v6, v8, v7}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
     :cond_92
-    iget v2, v1, Lorg/a/a/w;->bFo:I
+    iget v2, v1, Lorg/a/a/w;->bFI:I
 
     if-lez v2, :cond_93
 
-    iget-object v2, v1, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v2, v1, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const-string v6, "ModuleMainClass"
 
-    invoke-virtual {v2, v6}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v2, v6}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v2
 
-    invoke-virtual {v3, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
     const/4 v6, 0x2
 
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget v1, v1, Lorg/a/a/w;->bFo:I
+    iget v1, v1, Lorg/a/a/w;->bFI:I
 
-    invoke-virtual {v2, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :cond_93
-    iget v1, v0, Lorg/a/a/h;->bCY:I
+    iget v1, v0, Lorg/a/a/h;->bDs:I
 
     if-eqz v1, :cond_94
 
-    iget-object v1, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const-string v2, "NestHost"
 
-    invoke-virtual {v1, v2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, v2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v1
 
-    invoke-virtual {v3, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
     const/4 v2, 0x2
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bCY:I
+    iget v2, v0, Lorg/a/a/h;->bDs:I
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :cond_94
-    iget-object v1, v0, Lorg/a/a/h;->bDa:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/h;->bDu:Lorg/a/a/d;
 
     if-eqz v1, :cond_95
 
-    iget-object v1, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     const-string v2, "NestMembers"
 
-    invoke-virtual {v1, v2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, v2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v1
 
-    invoke-virtual {v3, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget-object v2, v0, Lorg/a/a/h;->bDa:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bDu:Lorg/a/a/d;
 
     iget v2, v2, Lorg/a/a/d;->length:I
 
@@ -3966,21 +3966,21 @@
 
     add-int/2addr v2, v6
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bCZ:I
+    iget v2, v0, Lorg/a/a/h;->bDt:I
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget-object v2, v0, Lorg/a/a/h;->bDa:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bDu:Lorg/a/a/d;
 
     iget-object v2, v2, Lorg/a/a/d;->data:[B
 
-    iget-object v6, v0, Lorg/a/a/h;->bDa:Lorg/a/a/d;
+    iget-object v6, v0, Lorg/a/a/h;->bDu:Lorg/a/a/d;
 
     iget v6, v6, Lorg/a/a/d;->length:I
 
@@ -3989,11 +3989,11 @@
     invoke-virtual {v1, v2, v7, v6}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
     :cond_95
-    iget-object v1, v0, Lorg/a/a/h;->bDb:Lorg/a/a/c;
+    iget-object v1, v0, Lorg/a/a/h;->bDv:Lorg/a/a/c;
 
     if-eqz v1, :cond_96
 
-    iget-object v2, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v1, v2, v3}, Lorg/a/a/c;->a(Lorg/a/a/z;Lorg/a/a/d;)V
 
@@ -4006,40 +4006,40 @@
 
     invoke-direct {v2}, Lorg/a/a/c$a;-><init>()V
 
-    iget-object v3, v0, Lorg/a/a/h;->bDb:Lorg/a/a/c;
+    iget-object v3, v0, Lorg/a/a/h;->bDv:Lorg/a/a/c;
 
     invoke-virtual {v2, v3}, Lorg/a/a/c$a;->a(Lorg/a/a/c;)V
 
-    iget-object v3, v0, Lorg/a/a/h;->bCI:Lorg/a/a/n;
+    iget-object v3, v0, Lorg/a/a/h;->bDc:Lorg/a/a/n;
 
     :goto_25
     if-eqz v3, :cond_97
 
-    iget-object v5, v3, Lorg/a/a/n;->bDb:Lorg/a/a/c;
+    iget-object v5, v3, Lorg/a/a/n;->bDv:Lorg/a/a/c;
 
     invoke-virtual {v2, v5}, Lorg/a/a/c$a;->a(Lorg/a/a/c;)V
 
-    iget-object v3, v3, Lorg/a/a/n;->bDA:Lorg/a/a/m;
+    iget-object v3, v3, Lorg/a/a/n;->bDU:Lorg/a/a/m;
 
     check-cast v3, Lorg/a/a/n;
 
     goto :goto_25
 
     :cond_97
-    iget-object v3, v0, Lorg/a/a/h;->bCK:Lorg/a/a/u;
+    iget-object v3, v0, Lorg/a/a/h;->bDe:Lorg/a/a/u;
 
     :goto_26
     if-eqz v3, :cond_98
 
-    iget-object v5, v3, Lorg/a/a/u;->bDb:Lorg/a/a/c;
+    iget-object v5, v3, Lorg/a/a/u;->bDv:Lorg/a/a/c;
 
     invoke-virtual {v2, v5}, Lorg/a/a/c$a;->a(Lorg/a/a/c;)V
 
-    iget-object v5, v3, Lorg/a/a/u;->bEA:Lorg/a/a/c;
+    iget-object v5, v3, Lorg/a/a/u;->bEU:Lorg/a/a/c;
 
     invoke-virtual {v2, v5}, Lorg/a/a/c$a;->a(Lorg/a/a/c;)V
 
-    iget-object v3, v3, Lorg/a/a/u;->bEj:Lorg/a/a/t;
+    iget-object v3, v3, Lorg/a/a/u;->bED:Lorg/a/a/t;
 
     check-cast v3, Lorg/a/a/u;
 
@@ -4050,7 +4050,7 @@
 
     new-array v3, v3, [Lorg/a/a/c;
 
-    iget-object v5, v2, Lorg/a/a/c$a;->bCv:[Lorg/a/a/c;
+    iget-object v5, v2, Lorg/a/a/c$a;->bCP:[Lorg/a/a/c;
 
     iget v2, v2, Lorg/a/a/c$a;->size:I
 
@@ -4060,31 +4060,31 @@
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lorg/a/a/h;->bCI:Lorg/a/a/n;
+    iput-object v2, v0, Lorg/a/a/h;->bDc:Lorg/a/a/n;
 
-    iput-object v2, v0, Lorg/a/a/h;->bCJ:Lorg/a/a/n;
+    iput-object v2, v0, Lorg/a/a/h;->bDd:Lorg/a/a/n;
 
-    iput-object v2, v0, Lorg/a/a/h;->bCK:Lorg/a/a/u;
+    iput-object v2, v0, Lorg/a/a/h;->bDe:Lorg/a/a/u;
 
-    iput-object v2, v0, Lorg/a/a/h;->bCL:Lorg/a/a/u;
+    iput-object v2, v0, Lorg/a/a/h;->bDf:Lorg/a/a/u;
 
-    iput-object v2, v0, Lorg/a/a/h;->bCT:Lorg/a/a/b;
+    iput-object v2, v0, Lorg/a/a/h;->bDn:Lorg/a/a/b;
 
-    iput-object v2, v0, Lorg/a/a/h;->bCU:Lorg/a/a/b;
+    iput-object v2, v0, Lorg/a/a/h;->bDo:Lorg/a/a/b;
 
-    iput-object v2, v0, Lorg/a/a/h;->bCV:Lorg/a/a/b;
+    iput-object v2, v0, Lorg/a/a/h;->bDp:Lorg/a/a/b;
 
-    iput-object v2, v0, Lorg/a/a/h;->bCW:Lorg/a/a/b;
+    iput-object v2, v0, Lorg/a/a/h;->bDq:Lorg/a/a/b;
 
-    iput-object v2, v0, Lorg/a/a/h;->bCX:Lorg/a/a/w;
+    iput-object v2, v0, Lorg/a/a/h;->bDr:Lorg/a/a/w;
 
-    iput v14, v0, Lorg/a/a/h;->bCY:I
+    iput v14, v0, Lorg/a/a/h;->bDs:I
 
-    iput v14, v0, Lorg/a/a/h;->bCZ:I
+    iput v14, v0, Lorg/a/a/h;->bDt:I
 
-    iput-object v2, v0, Lorg/a/a/h;->bDa:Lorg/a/a/d;
+    iput-object v2, v0, Lorg/a/a/h;->bDu:Lorg/a/a/d;
 
-    iput-object v2, v0, Lorg/a/a/h;->bDb:Lorg/a/a/c;
+    iput-object v2, v0, Lorg/a/a/h;->bDv:Lorg/a/a/c;
 
     if-eqz v4, :cond_99
 
@@ -4096,7 +4096,7 @@
     const/4 v2, 0x0
 
     :goto_27
-    iput v2, v0, Lorg/a/a/h;->bDc:I
+    iput v2, v0, Lorg/a/a/h;->bDw:I
 
     new-instance v2, Lorg/a/a/e;
 
@@ -4121,7 +4121,7 @@
     :cond_9c
     new-instance v1, Lorg/a/a/f;
 
-    iget-object v2, v0, Lorg/a/a/h;->bCn:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bCH:Lorg/a/a/z;
 
     iget-object v2, v2, Lorg/a/a/z;->className:Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/org/a/a/i.smali b/com.discord/smali_classes2/org/a/a/i.smali
index 597a5fde7f..c9081a28e3 100644
--- a/com.discord/smali_classes2/org/a/a/i.smali
+++ b/com.discord/smali_classes2/org/a/a/i.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final bDd:Lorg/a/a/p;
+.field final bDx:Lorg/a/a/p;
 
-.field final bDe:[Ljava/lang/Object;
+.field final bDy:[Ljava/lang/Object;
 
 .field final descriptor:Ljava/lang/String;
 
@@ -23,9 +23,9 @@
 
     iput-object p2, p0, Lorg/a/a/i;->descriptor:Ljava/lang/String;
 
-    iput-object p3, p0, Lorg/a/a/i;->bDd:Lorg/a/a/p;
+    iput-object p3, p0, Lorg/a/a/i;->bDx:Lorg/a/a/p;
 
-    iput-object p4, p0, Lorg/a/a/i;->bDe:[Ljava/lang/Object;
+    iput-object p4, p0, Lorg/a/a/i;->bDy:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -73,9 +73,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lorg/a/a/i;->bDd:Lorg/a/a/p;
+    iget-object v1, p0, Lorg/a/a/i;->bDx:Lorg/a/a/p;
 
-    iget-object v3, p1, Lorg/a/a/i;->bDd:Lorg/a/a/p;
+    iget-object v3, p1, Lorg/a/a/i;->bDx:Lorg/a/a/p;
 
     invoke-virtual {v1, v3}, Lorg/a/a/p;->equals(Ljava/lang/Object;)Z
 
@@ -83,9 +83,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lorg/a/a/i;->bDe:[Ljava/lang/Object;
+    iget-object v1, p0, Lorg/a/a/i;->bDy:[Ljava/lang/Object;
 
-    iget-object p1, p1, Lorg/a/a/i;->bDe:[Ljava/lang/Object;
+    iget-object p1, p1, Lorg/a/a/i;->bDy:[Ljava/lang/Object;
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
 
@@ -122,7 +122,7 @@
 
     xor-int/2addr v0, v1
 
-    iget-object v1, p0, Lorg/a/a/i;->bDd:Lorg/a/a/p;
+    iget-object v1, p0, Lorg/a/a/i;->bDx:Lorg/a/a/p;
 
     invoke-virtual {v1}, Lorg/a/a/p;->hashCode()I
 
@@ -136,7 +136,7 @@
 
     xor-int/2addr v0, v1
 
-    iget-object v1, p0, Lorg/a/a/i;->bDe:[Ljava/lang/Object;
+    iget-object v1, p0, Lorg/a/a/i;->bDy:[Ljava/lang/Object;
 
     invoke-static {v1}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
 
@@ -176,13 +176,13 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lorg/a/a/i;->bDd:Lorg/a/a/p;
+    iget-object v2, p0, Lorg/a/a/i;->bDx:Lorg/a/a/p;
 
     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, Lorg/a/a/i;->bDe:[Ljava/lang/Object;
+    iget-object v1, p0, Lorg/a/a/i;->bDy:[Ljava/lang/Object;
 
     invoke-static {v1}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/org/a/a/j.smali b/com.discord/smali_classes2/org/a/a/j.smali
index 2733be95c5..b5be8cc666 100644
--- a/com.discord/smali_classes2/org/a/a/j.smali
+++ b/com.discord/smali_classes2/org/a/a/j.smali
@@ -4,43 +4,43 @@
 
 
 # instance fields
-.field bDf:[Lorg/a/a/c;
+.field bDA:I
 
-.field bDg:I
+.field bDB:[C
 
-.field bDh:[C
+.field bDC:I
 
-.field bDi:I
+.field bDD:Ljava/lang/String;
 
-.field bDj:Ljava/lang/String;
+.field bDE:Ljava/lang/String;
 
-.field bDk:Ljava/lang/String;
+.field bDF:[Lorg/a/a/r;
 
-.field bDl:[Lorg/a/a/r;
+.field bDG:I
 
-.field bDm:I
+.field bDH:Lorg/a/a/ab;
 
-.field bDn:Lorg/a/a/ab;
+.field bDI:[Lorg/a/a/r;
 
-.field bDo:[Lorg/a/a/r;
+.field bDJ:[Lorg/a/a/r;
 
-.field bDp:[Lorg/a/a/r;
+.field bDK:[I
 
-.field bDq:[I
+.field bDL:I
 
-.field bDr:I
+.field bDM:I
 
-.field bDs:I
+.field bDN:I
 
-.field bDt:I
+.field bDO:I
 
-.field bDu:I
+.field bDP:[Ljava/lang/Object;
 
-.field bDv:[Ljava/lang/Object;
+.field bDQ:I
 
-.field bDw:I
+.field bDR:[Ljava/lang/Object;
 
-.field bDx:[Ljava/lang/Object;
+.field bDz:[Lorg/a/a/c;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/org/a/a/k.smali b/com.discord/smali_classes2/org/a/a/k.smali
index 536504f5f4..1ae0c349a7 100644
--- a/com.discord/smali_classes2/org/a/a/k.smali
+++ b/com.discord/smali_classes2/org/a/a/k.smali
@@ -29,35 +29,35 @@
 
     invoke-virtual {p0, p4, p1, p2}, Lorg/a/a/k;->a(Lorg/a/a/z;Lorg/a/a/o;I)Z
 
-    iget-object p3, p1, Lorg/a/a/o;->bDF:[I
+    iget-object p3, p1, Lorg/a/a/o;->bDZ:[I
 
-    iput-object p3, p0, Lorg/a/a/o;->bDF:[I
+    iput-object p3, p0, Lorg/a/a/o;->bDZ:[I
 
-    iget-object p3, p1, Lorg/a/a/o;->bDG:[I
+    iget-object p3, p1, Lorg/a/a/o;->bEa:[I
 
-    iput-object p3, p0, Lorg/a/a/o;->bDG:[I
+    iput-object p3, p0, Lorg/a/a/o;->bEa:[I
 
-    iput-short p2, p0, Lorg/a/a/o;->bDJ:S
+    iput-short p2, p0, Lorg/a/a/o;->bEd:S
 
-    iget-object p2, p1, Lorg/a/a/o;->bDH:[I
+    iget-object p2, p1, Lorg/a/a/o;->bEb:[I
 
-    iput-object p2, p0, Lorg/a/a/o;->bDH:[I
+    iput-object p2, p0, Lorg/a/a/o;->bEb:[I
 
-    iget-object p2, p1, Lorg/a/a/o;->bDI:[I
+    iget-object p2, p1, Lorg/a/a/o;->bEc:[I
 
-    iput-object p2, p0, Lorg/a/a/o;->bDI:[I
+    iput-object p2, p0, Lorg/a/a/o;->bEc:[I
 
-    iget-short p2, p1, Lorg/a/a/o;->bDK:S
+    iget-short p2, p1, Lorg/a/a/o;->bEe:S
 
-    iput-short p2, p0, Lorg/a/a/o;->bDK:S
+    iput-short p2, p0, Lorg/a/a/o;->bEe:S
 
-    iget p2, p1, Lorg/a/a/o;->bDL:I
+    iget p2, p1, Lorg/a/a/o;->bEf:I
 
-    iput p2, p0, Lorg/a/a/o;->bDL:I
+    iput p2, p0, Lorg/a/a/o;->bEf:I
 
-    iget-object p1, p1, Lorg/a/a/o;->bDM:[I
+    iget-object p1, p1, Lorg/a/a/o;->bEg:[I
 
-    iput-object p1, p0, Lorg/a/a/o;->bDM:[I
+    iput-object p1, p0, Lorg/a/a/o;->bEg:[I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/org/a/a/l.smali b/com.discord/smali_classes2/org/a/a/l.smali
index 680942103f..62ae05055d 100644
--- a/com.discord/smali_classes2/org/a/a/l.smali
+++ b/com.discord/smali_classes2/org/a/a/l.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final bDy:Lorg/a/a/r;
+.field final bDS:Lorg/a/a/r;
 
-.field bDz:Lorg/a/a/l;
+.field bDT:Lorg/a/a/l;
 
 .field final info:I
 
@@ -19,9 +19,9 @@
 
     iput p1, p0, Lorg/a/a/l;->info:I
 
-    iput-object p2, p0, Lorg/a/a/l;->bDy:Lorg/a/a/r;
+    iput-object p2, p0, Lorg/a/a/l;->bDS:Lorg/a/a/r;
 
-    iput-object p3, p0, Lorg/a/a/l;->bDz:Lorg/a/a/l;
+    iput-object p3, p0, Lorg/a/a/l;->bDT:Lorg/a/a/l;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/org/a/a/m.smali b/com.discord/smali_classes2/org/a/a/m.smali
index 844dc49ed4..cbe80aa708 100644
--- a/com.discord/smali_classes2/org/a/a/m.smali
+++ b/com.discord/smali_classes2/org/a/a/m.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field protected final bCl:I
+.field protected final bCF:I
 
-.field protected bDA:Lorg/a/a/m;
+.field protected bDU:Lorg/a/a/m;
 
 
 # direct methods
@@ -27,11 +27,11 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/m;->bCl:I
+    iput p1, p0, Lorg/a/a/m;->bCF:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/m;->bDA:Lorg/a/a/m;
+    iput-object p1, p0, Lorg/a/a/m;->bDU:Lorg/a/a/m;
 
     return-void
 .end method
@@ -41,13 +41,13 @@
 .method public a(ILorg/a/a/ab;Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/m;->bCl:I
+    iget v0, p0, Lorg/a/a/m;->bCF:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/m;->bDA:Lorg/a/a/m;
+    iget-object v0, p0, Lorg/a/a/m;->bDU:Lorg/a/a/m;
 
     if-eqz v0, :cond_0
 
@@ -75,7 +75,7 @@
 .method public b(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/m;->bDA:Lorg/a/a/m;
+    iget-object v0, p0, Lorg/a/a/m;->bDU:Lorg/a/a/m;
 
     if-eqz v0, :cond_0
 
@@ -88,7 +88,7 @@
 .method public j(Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/m;->bDA:Lorg/a/a/m;
+    iget-object v0, p0, Lorg/a/a/m;->bDU:Lorg/a/a/m;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/org/a/a/n.smali b/com.discord/smali_classes2/org/a/a/n.smali
index 064c4187b3..8a1b84e2dc 100644
--- a/com.discord/smali_classes2/org/a/a/n.smali
+++ b/com.discord/smali_classes2/org/a/a/n.smali
@@ -4,27 +4,27 @@
 
 
 # instance fields
-.field final bCD:I
+.field final bCH:Lorg/a/a/z;
 
-.field bCQ:I
+.field final bCX:I
 
-.field bCT:Lorg/a/a/b;
+.field final bDV:I
 
-.field bCU:Lorg/a/a/b;
+.field final bDW:I
 
-.field bCV:Lorg/a/a/b;
+.field bDX:I
 
-.field bCW:Lorg/a/a/b;
+.field bDk:I
 
-.field final bCn:Lorg/a/a/z;
+.field bDn:Lorg/a/a/b;
 
-.field final bDB:I
+.field bDo:Lorg/a/a/b;
 
-.field final bDC:I
+.field bDp:Lorg/a/a/b;
 
-.field bDD:I
+.field bDq:Lorg/a/a/b;
 
-.field bDb:Lorg/a/a/c;
+.field bDv:Lorg/a/a/c;
 
 
 # direct methods
@@ -33,29 +33,29 @@
 
     invoke-direct {p0}, Lorg/a/a/m;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iput-object p1, p0, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    iput p2, p0, Lorg/a/a/n;->bCD:I
+    iput p2, p0, Lorg/a/a/n;->bCX:I
 
-    invoke-virtual {p1, p3}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p1, p3}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/n;->bDB:I
+    iput p2, p0, Lorg/a/a/n;->bDV:I
 
-    invoke-virtual {p1, p4}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p1, p4}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/n;->bDC:I
+    iput p2, p0, Lorg/a/a/n;->bDW:I
 
     if-eqz p5, :cond_0
 
-    invoke-virtual {p1, p5}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p1, p5}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/n;->bCQ:I
+    iput p2, p0, Lorg/a/a/n;->bDk:I
 
     :cond_0
     if-eqz p6, :cond_1
@@ -66,7 +66,7 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    iput p1, p0, Lorg/a/a/n;->bDD:I
+    iput p1, p0, Lorg/a/a/n;->bDX:I
 
     :cond_1
     return-void
@@ -85,44 +85,44 @@
 
     invoke-static {p2, v0}, Lorg/a/a/ab;->a(Lorg/a/a/ab;Lorg/a/a/d;)V
 
-    iget-object p1, p0, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {p1, p3}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p1, p3}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     if-eqz p4, :cond_0
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/n;->bCV:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/n;->bDp:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, p3}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/n;->bCV:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/n;->bDp:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/n;->bCW:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/n;->bDq:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, p3}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/n;->bCW:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/n;->bDq:Lorg/a/a/b;
 
     return-object p1
 .end method
@@ -130,11 +130,11 @@
 .method public final b(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/n;->bDb:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/n;->bDv:Lorg/a/a/c;
 
-    iput-object v0, p1, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iput-object v0, p1, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
-    iput-object p1, p0, Lorg/a/a/n;->bDb:Lorg/a/a/c;
+    iput-object p1, p0, Lorg/a/a/n;->bDv:Lorg/a/a/c;
 
     return-void
 .end method
@@ -146,44 +146,44 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iget-object v1, p0, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, p1}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, p1}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
     const/4 v1, 0x0
 
-    invoke-virtual {p1, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     if-eqz p2, :cond_0
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/n;->bCT:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/n;->bDn:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, v1}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/n;->bCT:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/n;->bDn:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/n;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/n;->bCH:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/n;->bCU:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/n;->bDo:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, v1}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/n;->bCU:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/n;->bDo:Lorg/a/a/b;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/org/a/a/o.smali b/com.discord/smali_classes2/org/a/a/o.smali
index 87f33a4518..a3944b3db7 100644
--- a/com.discord/smali_classes2/org/a/a/o.smali
+++ b/com.discord/smali_classes2/org/a/a/o.smali
@@ -4,23 +4,23 @@
 
 
 # instance fields
-.field bDE:Lorg/a/a/r;
+.field bDY:Lorg/a/a/r;
 
-.field bDF:[I
+.field bDZ:[I
 
-.field bDG:[I
+.field bEa:[I
 
-.field bDH:[I
+.field bEb:[I
 
-.field bDI:[I
+.field bEc:[I
 
-.field bDJ:S
+.field bEd:S
 
-.field bDK:S
+.field bEe:S
 
-.field bDL:I
+.field bEf:I
 
-.field bDM:[I
+.field bEg:[I
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/o;->bDE:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/o;->bDY:Lorg/a/a/r;
 
     return-void
 .end method
@@ -53,11 +53,11 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget v2, p0, Lorg/a/a/o;->bDL:I
+    iget v2, p0, Lorg/a/a/o;->bEf:I
 
     if-ge v1, v2, :cond_5
 
-    iget-object v2, p0, Lorg/a/a/o;->bDM:[I
+    iget-object v2, p0, Lorg/a/a/o;->bEg:[I
 
     aget v2, v2, v1
 
@@ -77,7 +77,7 @@
 
     if-ne v4, v7, :cond_1
 
-    iget-object v2, p0, Lorg/a/a/o;->bDF:[I
+    iget-object v2, p0, Lorg/a/a/o;->bDZ:[I
 
     aget v2, v2, v6
 
@@ -91,7 +91,7 @@
 
     if-ne v4, v7, :cond_2
 
-    iget-object v2, p0, Lorg/a/a/o;->bDG:[I
+    iget-object v2, p0, Lorg/a/a/o;->bEa:[I
 
     array-length v4, v2
 
@@ -111,7 +111,7 @@
 
     iget-object p2, p1, Lorg/a/a/z;->className:Ljava/lang/String;
 
-    invoke-virtual {p1, p2}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {p1, p2}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result p1
 
@@ -123,13 +123,13 @@
     :cond_3
     and-int/2addr p2, v5
 
-    iget-object v0, p1, Lorg/a/a/z;->bFG:[Lorg/a/a/z$a;
+    iget-object v0, p1, Lorg/a/a/z;->bGa:[Lorg/a/a/z$a;
 
     aget-object p2, v0, p2
 
     iget-object p2, p2, Lorg/a/a/y;->value:Ljava/lang/String;
 
-    invoke-virtual {p1, p2}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {p1, p2}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result p1
 
@@ -170,7 +170,7 @@
 
     check-cast p1, Ljava/lang/String;
 
-    invoke-static {p1}, Lorg/a/a/aa;->fa(Ljava/lang/String;)Lorg/a/a/aa;
+    invoke-static {p1}, Lorg/a/a/aa;->eV(Ljava/lang/String;)Lorg/a/a/aa;
 
     move-result-object p1
 
@@ -191,7 +191,7 @@
 
     check-cast p1, Lorg/a/a/r;
 
-    iget p1, p1, Lorg/a/a/r;->bDZ:I
+    iget p1, p1, Lorg/a/a/r;->bEt:I
 
     const-string v1, ""
 
@@ -207,7 +207,7 @@
 .method static a(Lorg/a/a/z;Ljava/lang/String;)I
     .locals 0
 
-    invoke-virtual {p0, p1}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {p0, p1}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result p0
 
@@ -369,7 +369,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {v0, v1}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result v0
 
@@ -410,7 +410,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {v0, v1}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result v0
 
@@ -473,19 +473,19 @@
 
     const/16 p1, 0x8
 
-    invoke-virtual {p2, p1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p2, p1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    iget-object p0, p0, Lorg/a/a/z;->bFG:[Lorg/a/a/z$a;
+    iget-object p0, p0, Lorg/a/a/z;->bGa:[Lorg/a/a/z$a;
 
     aget-object p0, p0, v0
 
-    iget-wide v0, p0, Lorg/a/a/y;->bFw:J
+    iget-wide v0, p0, Lorg/a/a/y;->bFQ:J
 
     long-to-int p0, v0
 
-    invoke-virtual {p1, p0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 
@@ -497,11 +497,11 @@
     throw p0
 
     :cond_1
-    invoke-virtual {p2, v3}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p2, v3}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    iget-object p2, p0, Lorg/a/a/z;->bFG:[Lorg/a/a/z$a;
+    iget-object p2, p0, Lorg/a/a/z;->bGa:[Lorg/a/a/z$a;
 
     aget-object p2, p2, v0
 
@@ -513,12 +513,12 @@
 
     iget p0, p0, Lorg/a/a/y;->index:I
 
-    invoke-virtual {p1, p0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 
     :cond_2
-    invoke-virtual {p2, v0}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p2, v0}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     return-void
 
@@ -551,7 +551,7 @@
 
     and-int/2addr p1, v4
 
-    iget-object v0, p0, Lorg/a/a/z;->bFG:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bGa:[Lorg/a/a/z$a;
 
     aget-object p1, v0, p1
 
@@ -647,7 +647,7 @@
     invoke-virtual {v5, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
     :goto_1
-    invoke-virtual {p2, v3}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p2, v3}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object p1
 
@@ -655,13 +655,13 @@
 
     move-result-object p2
 
-    invoke-virtual {p0, p2}, Lorg/a/a/z;->eW(Ljava/lang/String;)Lorg/a/a/y;
+    invoke-virtual {p0, p2}, Lorg/a/a/z;->eR(Ljava/lang/String;)Lorg/a/a/y;
 
     move-result-object p0
 
     iget p0, p0, Lorg/a/a/y;->index:I
 
-    invoke-virtual {p1, p0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 
@@ -778,7 +778,7 @@
 
     and-int/2addr v4, v0
 
-    invoke-virtual {p0, p1, v4}, Lorg/a/a/z;->ao(II)I
+    invoke-virtual {p0, p1, v4}, Lorg/a/a/z;->an(II)I
 
     move-result p0
 
@@ -793,7 +793,7 @@
 
     or-int/2addr p1, v8
 
-    invoke-virtual {p0, v10}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {p0, v10}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result p0
 
@@ -836,7 +836,7 @@
 
     or-int/2addr p1, v8
 
-    invoke-virtual {p0, v10}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {p0, v10}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result p0
 
@@ -854,10 +854,10 @@
     return v1
 .end method
 
-.method private ah(II)V
+.method private ag(II)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/o;->bDH:[I
+    iget-object v0, p0, Lorg/a/a/o;->bEb:[I
 
     if-nez v0, :cond_0
 
@@ -865,10 +865,10 @@
 
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lorg/a/a/o;->bDH:[I
+    iput-object v0, p0, Lorg/a/a/o;->bEb:[I
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/o;->bDH:[I
+    iget-object v0, p0, Lorg/a/a/o;->bEb:[I
 
     array-length v0, v0
 
@@ -884,16 +884,16 @@
 
     new-array v1, v1, [I
 
-    iget-object v2, p0, Lorg/a/a/o;->bDH:[I
+    iget-object v2, p0, Lorg/a/a/o;->bEb:[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, Lorg/a/a/o;->bDH:[I
+    iput-object v1, p0, Lorg/a/a/o;->bEb:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/o;->bDH:[I
+    iget-object v0, p0, Lorg/a/a/o;->bEb:[I
 
     aput p2, v0, p1
 
@@ -947,7 +947,7 @@
     return-void
 .end method
 
-.method private eS(Ljava/lang/String;)V
+.method private eN(Ljava/lang/String;)V
     .locals 4
 
     const/4 v0, 0x0
@@ -964,7 +964,7 @@
 
     if-ne v0, v3, :cond_0
 
-    invoke-static {p1}, Lorg/a/a/aa;->fd(Ljava/lang/String;)I
+    invoke-static {p1}, Lorg/a/a/aa;->eY(Ljava/lang/String;)I
 
     move-result p1
 
@@ -972,7 +972,7 @@
 
     sub-int/2addr p1, v1
 
-    invoke-direct {p0, p1}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {p0, p1}, Lorg/a/a/o;->eg(I)V
 
     return-void
 
@@ -988,21 +988,21 @@
     goto :goto_0
 
     :cond_1
-    invoke-direct {p0, v1}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {p0, v1}, Lorg/a/a/o;->eg(I)V
 
     return-void
 
     :cond_2
     :goto_0
-    invoke-direct {p0, v2}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {p0, v2}, Lorg/a/a/o;->eg(I)V
 
     return-void
 .end method
 
-.method private ej(I)I
+.method private ef(I)I
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/o;->bDH:[I
+    iget-object v0, p0, Lorg/a/a/o;->bEb:[I
 
     const/high16 v1, 0x4000000
 
@@ -1033,10 +1033,10 @@
     return p1
 .end method
 
-.method private ek(I)V
+.method private eg(I)V
     .locals 2
 
-    iget-short v0, p0, Lorg/a/a/o;->bDK:S
+    iget-short v0, p0, Lorg/a/a/o;->bEe:S
 
     if-lt v0, p1, :cond_0
 
@@ -1044,12 +1044,12 @@
 
     int-to-short p1, v0
 
-    iput-short p1, p0, Lorg/a/a/o;->bDK:S
+    iput-short p1, p0, Lorg/a/a/o;->bEe:S
 
     return-void
 
     :cond_0
-    iget-short v1, p0, Lorg/a/a/o;->bDJ:S
+    iget-short v1, p0, Lorg/a/a/o;->bEd:S
 
     sub-int/2addr p1, v0
 
@@ -1057,11 +1057,11 @@
 
     int-to-short p1, v1
 
-    iput-short p1, p0, Lorg/a/a/o;->bDJ:S
+    iput-short p1, p0, Lorg/a/a/o;->bEd:S
 
     const/4 p1, 0x0
 
-    iput-short p1, p0, Lorg/a/a/o;->bDK:S
+    iput-short p1, p0, Lorg/a/a/o;->bEe:S
 
     return-void
 .end method
@@ -1069,17 +1069,17 @@
 .method private pop()I
     .locals 2
 
-    iget-short v0, p0, Lorg/a/a/o;->bDK:S
+    iget-short v0, p0, Lorg/a/a/o;->bEe:S
 
     if-lez v0, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/o;->bDI:[I
+    iget-object v1, p0, Lorg/a/a/o;->bEc:[I
 
     add-int/lit8 v0, v0, -0x1
 
     int-to-short v0, v0
 
-    iput-short v0, p0, Lorg/a/a/o;->bDK:S
+    iput-short v0, p0, Lorg/a/a/o;->bEe:S
 
     aget v0, v1, v0
 
@@ -1088,13 +1088,13 @@
     :cond_0
     const/high16 v0, 0x5000000
 
-    iget-short v1, p0, Lorg/a/a/o;->bDJ:S
+    iget-short v1, p0, Lorg/a/a/o;->bEd:S
 
     add-int/lit8 v1, v1, -0x1
 
     int-to-short v1, v1
 
-    iput-short v1, p0, Lorg/a/a/o;->bDJ:S
+    iput-short v1, p0, Lorg/a/a/o;->bEd:S
 
     neg-int v1, v1
 
@@ -1106,7 +1106,7 @@
 .method private push(I)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/o;->bDI:[I
+    iget-object v0, p0, Lorg/a/a/o;->bEc:[I
 
     if-nez v0, :cond_0
 
@@ -1114,14 +1114,14 @@
 
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lorg/a/a/o;->bDI:[I
+    iput-object v0, p0, Lorg/a/a/o;->bEc:[I
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/o;->bDI:[I
+    iget-object v0, p0, Lorg/a/a/o;->bEc:[I
 
     array-length v0, v0
 
-    iget-short v1, p0, Lorg/a/a/o;->bDK:S
+    iget-short v1, p0, Lorg/a/a/o;->bEe:S
 
     if-lt v1, v0, :cond_1
 
@@ -1135,44 +1135,44 @@
 
     new-array v1, v1, [I
 
-    iget-object v2, p0, Lorg/a/a/o;->bDI:[I
+    iget-object v2, p0, Lorg/a/a/o;->bEc:[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, Lorg/a/a/o;->bDI:[I
+    iput-object v1, p0, Lorg/a/a/o;->bEc:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/o;->bDI:[I
+    iget-object v0, p0, Lorg/a/a/o;->bEc:[I
 
-    iget-short v1, p0, Lorg/a/a/o;->bDK:S
+    iget-short v1, p0, Lorg/a/a/o;->bEe:S
 
     add-int/lit8 v2, v1, 0x1
 
     int-to-short v2, v2
 
-    iput-short v2, p0, Lorg/a/a/o;->bDK:S
+    iput-short v2, p0, Lorg/a/a/o;->bEe:S
 
     aput p1, v0, v1
 
-    iget-short p1, p0, Lorg/a/a/o;->bDJ:S
+    iget-short p1, p0, Lorg/a/a/o;->bEd:S
 
-    iget-short v0, p0, Lorg/a/a/o;->bDK:S
+    iget-short v0, p0, Lorg/a/a/o;->bEe:S
 
     add-int/2addr p1, v0
 
     int-to-short p1, p1
 
-    iget-object v0, p0, Lorg/a/a/o;->bDE:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/o;->bDY:Lorg/a/a/r;
 
-    iget-short v0, v0, Lorg/a/a/r;->bEd:S
+    iget-short v0, v0, Lorg/a/a/r;->bEx:S
 
     if-le p1, v0, :cond_2
 
-    iget-object v0, p0, Lorg/a/a/o;->bDE:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/o;->bDY:Lorg/a/a/r;
 
-    iput-short p1, v0, Lorg/a/a/r;->bEd:S
+    iput-short p1, v0, Lorg/a/a/r;->bEx:S
 
     :cond_2
     return-void
@@ -1238,7 +1238,7 @@
     throw v1
 
     :pswitch_0
-    invoke-direct {v0, v2}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v2}, Lorg/a/a/o;->eg(I)V
 
     iget-object v1, v3, Lorg/a/a/y;->value:Ljava/lang/String;
 
@@ -1262,7 +1262,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {v4, v1}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {v4, v1}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result v1
 
@@ -1300,7 +1300,7 @@
     :cond_1
     const/high16 v2, 0x12000000
 
-    invoke-virtual {v4, v1}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {v4, v1}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result v1
 
@@ -1395,7 +1395,7 @@
     :pswitch_d
     iget-object v1, v3, Lorg/a/a/y;->value:Ljava/lang/String;
 
-    invoke-direct {v0, v1}, Lorg/a/a/o;->eS(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Lorg/a/a/o;->eN(Ljava/lang/String;)V
 
     iget-object v1, v3, Lorg/a/a/y;->value:Ljava/lang/String;
 
@@ -1406,7 +1406,7 @@
     :pswitch_e
     iget-object v2, v3, Lorg/a/a/y;->value:Ljava/lang/String;
 
-    invoke-direct {v0, v2}, Lorg/a/a/o;->eS(Ljava/lang/String;)V
+    invoke-direct {v0, v2}, Lorg/a/a/o;->eN(Ljava/lang/String;)V
 
     const/16 v2, 0xb8
 
@@ -1430,20 +1430,20 @@
 
     if-ne v1, v5, :cond_4
 
-    iget-object v1, v0, Lorg/a/a/o;->bDM:[I
+    iget-object v1, v0, Lorg/a/a/o;->bEg:[I
 
     if-nez v1, :cond_2
 
     new-array v1, v14, [I
 
-    iput-object v1, v0, Lorg/a/a/o;->bDM:[I
+    iput-object v1, v0, Lorg/a/a/o;->bEg:[I
 
     :cond_2
-    iget-object v1, v0, Lorg/a/a/o;->bDM:[I
+    iget-object v1, v0, Lorg/a/a/o;->bEg:[I
 
     array-length v1, v1
 
-    iget v5, v0, Lorg/a/a/o;->bDL:I
+    iget v5, v0, Lorg/a/a/o;->bEf:I
 
     if-lt v5, v1, :cond_3
 
@@ -1457,20 +1457,20 @@
 
     new-array v5, v5, [I
 
-    iget-object v6, v0, Lorg/a/a/o;->bDM:[I
+    iget-object v6, v0, Lorg/a/a/o;->bEg:[I
 
     invoke-static {v6, v12, v5, v12, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v5, v0, Lorg/a/a/o;->bDM:[I
+    iput-object v5, v0, Lorg/a/a/o;->bEg:[I
 
     :cond_3
-    iget-object v1, v0, Lorg/a/a/o;->bDM:[I
+    iget-object v1, v0, Lorg/a/a/o;->bEg:[I
 
-    iget v5, v0, Lorg/a/a/o;->bDL:I
+    iget v5, v0, Lorg/a/a/o;->bEf:I
 
     add-int/lit8 v6, v5, 0x1
 
-    iput v6, v0, Lorg/a/a/o;->bDL:I
+    iput v6, v0, Lorg/a/a/o;->bEf:I
 
     aput v2, v1, v5
 
@@ -1484,14 +1484,14 @@
     :pswitch_f
     iget-object v1, v3, Lorg/a/a/y;->value:Ljava/lang/String;
 
-    invoke-direct {v0, v1}, Lorg/a/a/o;->eS(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Lorg/a/a/o;->eN(Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lorg/a/a/o;->pop()I
 
     return-void
 
     :pswitch_10
-    invoke-direct {v0, v15}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v15}, Lorg/a/a/o;->eg(I)V
 
     iget-object v1, v3, Lorg/a/a/y;->value:Ljava/lang/String;
 
@@ -1502,7 +1502,7 @@
     :pswitch_11
     iget-object v1, v3, Lorg/a/a/y;->value:Ljava/lang/String;
 
-    invoke-direct {v0, v1}, Lorg/a/a/o;->eS(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Lorg/a/a/o;->eN(Ljava/lang/String;)V
 
     return-void
 
@@ -1523,21 +1523,21 @@
     throw v1
 
     :pswitch_14
-    invoke-direct {v0, v13}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v13}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct {v0, v8}, Lorg/a/a/o;->push(I)V
 
     return-void
 
     :pswitch_15
-    invoke-direct {v0, v15}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v15}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct {v0, v8}, Lorg/a/a/o;->push(I)V
 
     return-void
 
     :pswitch_16
-    invoke-direct {v0, v15}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v15}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct {v0, v9}, Lorg/a/a/o;->push(I)V
 
@@ -1546,14 +1546,14 @@
     return-void
 
     :pswitch_17
-    invoke-direct {v0, v15}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v15}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct {v0, v6}, Lorg/a/a/o;->push(I)V
 
     return-void
 
     :pswitch_18
-    invoke-direct {v0, v15}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v15}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct {v0, v10}, Lorg/a/a/o;->push(I)V
 
@@ -1562,14 +1562,14 @@
     return-void
 
     :pswitch_19
-    invoke-direct {v0, v2, v8}, Lorg/a/a/o;->ah(II)V
+    invoke-direct {v0, v2, v8}, Lorg/a/a/o;->ag(II)V
 
     return-void
 
     :pswitch_1a
     const/4 v1, 0x3
 
-    invoke-direct {v0, v1}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v1}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct {v0, v10}, Lorg/a/a/o;->push(I)V
 
@@ -1578,7 +1578,7 @@
     return-void
 
     :pswitch_1b
-    invoke-direct {v0, v13}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v13}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct {v0, v9}, Lorg/a/a/o;->push(I)V
 
@@ -1587,7 +1587,7 @@
     return-void
 
     :pswitch_1c
-    invoke-direct {v0, v13}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v13}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct {v0, v10}, Lorg/a/a/o;->push(I)V
 
@@ -1737,45 +1737,45 @@
     return-void
 
     :pswitch_24
-    invoke-direct {v0, v14}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v14}, Lorg/a/a/o;->eg(I)V
 
     return-void
 
     :pswitch_25
-    invoke-direct {v0, v15}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v15}, Lorg/a/a/o;->eg(I)V
 
     return-void
 
     :pswitch_26
-    invoke-direct {v0, v13}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v13}, Lorg/a/a/o;->eg(I)V
 
     return-void
 
     :pswitch_27
     const/4 v1, 0x3
 
-    invoke-direct {v0, v1}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v1}, Lorg/a/a/o;->eg(I)V
 
     return-void
 
     :pswitch_28
-    invoke-direct {v0, v15}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v15}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct/range {p0 .. p0}, Lorg/a/a/o;->pop()I
 
     move-result v1
 
-    invoke-direct {v0, v2, v1}, Lorg/a/a/o;->ah(II)V
+    invoke-direct {v0, v2, v1}, Lorg/a/a/o;->ag(II)V
 
     add-int/lit8 v1, v2, 0x1
 
-    invoke-direct {v0, v1, v11}, Lorg/a/a/o;->ah(II)V
+    invoke-direct {v0, v1, v11}, Lorg/a/a/o;->ag(II)V
 
     if-lez v2, :cond_d
 
     add-int/lit8 v1, v2, -0x1
 
-    invoke-direct {v0, v1}, Lorg/a/a/o;->ej(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/o;->ef(I)I
 
     move-result v2
 
@@ -1799,14 +1799,14 @@
 
     or-int/2addr v2, v3
 
-    invoke-direct {v0, v1, v2}, Lorg/a/a/o;->ah(II)V
+    invoke-direct {v0, v1, v2}, Lorg/a/a/o;->ag(II)V
 
     :cond_7
     return-void
 
     :cond_8
     :goto_0
-    invoke-direct {v0, v1, v11}, Lorg/a/a/o;->ah(II)V
+    invoke-direct {v0, v1, v11}, Lorg/a/a/o;->ag(II)V
 
     return-void
 
@@ -1815,13 +1815,13 @@
 
     move-result v1
 
-    invoke-direct {v0, v2, v1}, Lorg/a/a/o;->ah(II)V
+    invoke-direct {v0, v2, v1}, Lorg/a/a/o;->ag(II)V
 
     if-lez v2, :cond_d
 
     add-int/lit8 v1, v2, -0x1
 
-    invoke-direct {v0, v1}, Lorg/a/a/o;->ej(I)I
+    invoke-direct {v0, v1}, Lorg/a/a/o;->ef(I)I
 
     move-result v2
 
@@ -1845,20 +1845,20 @@
 
     or-int/2addr v2, v3
 
-    invoke-direct {v0, v1, v2}, Lorg/a/a/o;->ah(II)V
+    invoke-direct {v0, v1, v2}, Lorg/a/a/o;->ag(II)V
 
     :cond_b
     return-void
 
     :cond_c
     :goto_1
-    invoke-direct {v0, v1, v11}, Lorg/a/a/o;->ah(II)V
+    invoke-direct {v0, v1, v11}, Lorg/a/a/o;->ag(II)V
 
     :cond_d
     return-void
 
     :pswitch_2a
-    invoke-direct {v0, v15}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v15}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct/range {p0 .. p0}, Lorg/a/a/o;->pop()I
 
@@ -1879,7 +1879,7 @@
     return-void
 
     :pswitch_2b
-    invoke-direct {v0, v14}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v14}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct {v0, v9}, Lorg/a/a/o;->push(I)V
 
@@ -1888,14 +1888,14 @@
     return-void
 
     :pswitch_2c
-    invoke-direct {v0, v14}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v14}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct {v0, v6}, Lorg/a/a/o;->push(I)V
 
     return-void
 
     :pswitch_2d
-    invoke-direct {v0, v14}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v14}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct {v0, v10}, Lorg/a/a/o;->push(I)V
 
@@ -1904,14 +1904,14 @@
     return-void
 
     :pswitch_2e
-    invoke-direct {v0, v14}, Lorg/a/a/o;->ek(I)V
+    invoke-direct {v0, v14}, Lorg/a/a/o;->eg(I)V
 
     invoke-direct {v0, v8}, Lorg/a/a/o;->push(I)V
 
     return-void
 
     :pswitch_2f
-    invoke-direct {v0, v2}, Lorg/a/a/o;->ej(I)I
+    invoke-direct {v0, v2}, Lorg/a/a/o;->ef(I)I
 
     move-result v1
 
@@ -1942,7 +1942,7 @@
     :pswitch_32
     const-string v1, "java/lang/invoke/MethodType"
 
-    invoke-virtual {v4, v1}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {v4, v1}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result v1
 
@@ -1955,7 +1955,7 @@
     :pswitch_33
     const-string v1, "java/lang/invoke/MethodHandle"
 
-    invoke-virtual {v4, v1}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {v4, v1}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result v1
 
@@ -1968,7 +1968,7 @@
     :pswitch_34
     const-string v1, "java/lang/String"
 
-    invoke-virtual {v4, v1}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {v4, v1}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result v1
 
@@ -1981,7 +1981,7 @@
     :pswitch_35
     const-string v1, "java/lang/Class"
 
-    invoke-virtual {v4, v1}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {v4, v1}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result v1
 
@@ -2255,7 +2255,7 @@
 .method final a(Lorg/a/a/u;)V
     .locals 14
 
-    iget-object v0, p0, Lorg/a/a/o;->bDF:[I
+    iget-object v0, p0, Lorg/a/a/o;->bDZ:[I
 
     const/4 v1, 0x0
 
@@ -2310,7 +2310,7 @@
     goto :goto_0
 
     :cond_3
-    iget-object v2, p0, Lorg/a/a/o;->bDG:[I
+    iget-object v2, p0, Lorg/a/a/o;->bEa:[I
 
     const/4 v4, 0x0
 
@@ -2346,9 +2346,9 @@
     goto :goto_3
 
     :cond_6
-    iget-object v4, p0, Lorg/a/a/o;->bDE:Lorg/a/a/r;
+    iget-object v4, p0, Lorg/a/a/o;->bDY:Lorg/a/a/r;
 
-    iget v4, v4, Lorg/a/a/r;->bDZ:I
+    iget v4, v4, Lorg/a/a/r;->bEt:I
 
     invoke-virtual {p1, v4, v3, v5}, Lorg/a/a/u;->q(III)I
 
@@ -2385,7 +2385,7 @@
 
     add-int/lit8 v12, v10, 0x1
 
-    iget-object v13, p1, Lorg/a/a/u;->bES:[I
+    iget-object v13, p1, Lorg/a/a/u;->bFm:[I
 
     aput v3, v13, v10
 
@@ -2423,7 +2423,7 @@
 
     add-int/lit8 v4, v10, 0x1
 
-    iget-object v5, p1, Lorg/a/a/u;->bES:[I
+    iget-object v5, p1, Lorg/a/a/u;->bFm:[I
 
     aput v3, v5, v10
 
@@ -2434,7 +2434,7 @@
     goto :goto_9
 
     :cond_c
-    invoke-virtual {p1}, Lorg/a/a/u;->Je()V
+    invoke-virtual {p1}, Lorg/a/a/u;->IR()V
 
     return-void
 .end method
@@ -2444,13 +2444,13 @@
 
     new-array v0, p4, [I
 
-    iput-object v0, p0, Lorg/a/a/o;->bDF:[I
+    iput-object v0, p0, Lorg/a/a/o;->bDZ:[I
 
     const/4 v0, 0x0
 
     new-array v1, v0, [I
 
-    iput-object v1, p0, Lorg/a/a/o;->bDG:[I
+    iput-object v1, p0, Lorg/a/a/o;->bEa:[I
 
     and-int/lit8 v1, p2, 0x8
 
@@ -2464,13 +2464,13 @@
 
     if-nez p2, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/o;->bDF:[I
+    iget-object p2, p0, Lorg/a/a/o;->bDZ:[I
 
     const/high16 v1, 0x2000000
 
     iget-object v3, p1, Lorg/a/a/z;->className:Ljava/lang/String;
 
-    invoke-virtual {p1, v3}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {p1, v3}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result v3
 
@@ -2481,7 +2481,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/o;->bDF:[I
+    iget-object p2, p0, Lorg/a/a/o;->bDZ:[I
 
     const v1, 0x1000006
 
@@ -2493,7 +2493,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    invoke-static {p3}, Lorg/a/a/aa;->fc(Ljava/lang/String;)[Lorg/a/a/aa;
+    invoke-static {p3}, Lorg/a/a/aa;->eX(Ljava/lang/String;)[Lorg/a/a/aa;
 
     move-result-object p2
 
@@ -2516,7 +2516,7 @@
 
     move-result v4
 
-    iget-object v5, p0, Lorg/a/a/o;->bDF:[I
+    iget-object v5, p0, Lorg/a/a/o;->bDZ:[I
 
     add-int/lit8 v6, v2, 0x1
 
@@ -2539,7 +2539,7 @@
 
     :cond_3
     :goto_2
-    iget-object v2, p0, Lorg/a/a/o;->bDF:[I
+    iget-object v2, p0, Lorg/a/a/o;->bDZ:[I
 
     add-int/lit8 v4, v6, 0x1
 
@@ -2556,7 +2556,7 @@
     :goto_4
     if-ge v2, p4, :cond_5
 
-    iget-object p1, p0, Lorg/a/a/o;->bDF:[I
+    iget-object p1, p0, Lorg/a/a/o;->bDZ:[I
 
     add-int/lit8 p2, v2, 0x1
 
@@ -2581,21 +2581,21 @@
 
     move/from16 v3, p3
 
-    iget-object v4, v0, Lorg/a/a/o;->bDF:[I
+    iget-object v4, v0, Lorg/a/a/o;->bDZ:[I
 
     array-length v4, v4
 
-    iget-object v5, v0, Lorg/a/a/o;->bDG:[I
+    iget-object v5, v0, Lorg/a/a/o;->bEa:[I
 
     array-length v5, v5
 
-    iget-object v6, v2, Lorg/a/a/o;->bDF:[I
+    iget-object v6, v2, Lorg/a/a/o;->bDZ:[I
 
     if-nez v6, :cond_0
 
     new-array v6, v4, [I
 
-    iput-object v6, v2, Lorg/a/a/o;->bDF:[I
+    iput-object v6, v2, Lorg/a/a/o;->bDZ:[I
 
     const/4 v6, 0x1
 
@@ -2628,7 +2628,7 @@
 
     if-ge v6, v4, :cond_7
 
-    iget-object v7, v0, Lorg/a/a/o;->bDH:[I
+    iget-object v7, v0, Lorg/a/a/o;->bEb:[I
 
     if-eqz v7, :cond_5
 
@@ -2646,7 +2646,7 @@
 
     if-ne v12, v11, :cond_3
 
-    iget-object v10, v0, Lorg/a/a/o;->bDF:[I
+    iget-object v10, v0, Lorg/a/a/o;->bDZ:[I
 
     and-int v11, v7, v17
 
@@ -2676,7 +2676,7 @@
     :cond_3
     if-ne v12, v10, :cond_4
 
-    iget-object v10, v0, Lorg/a/a/o;->bDG:[I
+    iget-object v10, v0, Lorg/a/a/o;->bEa:[I
 
     and-int v11, v7, v17
 
@@ -2702,12 +2702,12 @@
     goto :goto_3
 
     :cond_5
-    iget-object v7, v0, Lorg/a/a/o;->bDF:[I
+    iget-object v7, v0, Lorg/a/a/o;->bDZ:[I
 
     aget v15, v7, v6
 
     :goto_3
-    iget-object v7, v0, Lorg/a/a/o;->bDM:[I
+    iget-object v7, v0, Lorg/a/a/o;->bEg:[I
 
     if-eqz v7, :cond_6
 
@@ -2716,7 +2716,7 @@
     move-result v15
 
     :cond_6
-    iget-object v7, v2, Lorg/a/a/o;->bDF:[I
+    iget-object v7, v2, Lorg/a/a/o;->bDZ:[I
 
     invoke-static {v1, v15, v7, v6}, Lorg/a/a/o;->a(Lorg/a/a/z;I[II)Z
 
@@ -2738,11 +2738,11 @@
     :goto_4
     if-ge v5, v4, :cond_8
 
-    iget-object v6, v0, Lorg/a/a/o;->bDF:[I
+    iget-object v6, v0, Lorg/a/a/o;->bDZ:[I
 
     aget v6, v6, v5
 
-    iget-object v7, v2, Lorg/a/a/o;->bDF:[I
+    iget-object v7, v2, Lorg/a/a/o;->bDZ:[I
 
     invoke-static {v1, v6, v7, v5}, Lorg/a/a/o;->a(Lorg/a/a/z;I[II)Z
 
@@ -2755,7 +2755,7 @@
     goto :goto_4
 
     :cond_8
-    iget-object v4, v2, Lorg/a/a/o;->bDG:[I
+    iget-object v4, v2, Lorg/a/a/o;->bEa:[I
 
     if-nez v4, :cond_9
 
@@ -2763,7 +2763,7 @@
 
     new-array v5, v4, [I
 
-    iput-object v5, v2, Lorg/a/a/o;->bDG:[I
+    iput-object v5, v2, Lorg/a/a/o;->bEa:[I
 
     goto :goto_5
 
@@ -2771,7 +2771,7 @@
     move v4, v8
 
     :goto_5
-    iget-object v2, v2, Lorg/a/a/o;->bDG:[I
+    iget-object v2, v2, Lorg/a/a/o;->bEa:[I
 
     const/4 v6, 0x0
 
@@ -2788,25 +2788,25 @@
 
     const/4 v6, 0x0
 
-    iget-object v3, v0, Lorg/a/a/o;->bDG:[I
+    iget-object v3, v0, Lorg/a/a/o;->bEa:[I
 
     array-length v3, v3
 
-    iget-short v7, v0, Lorg/a/a/o;->bDJ:S
+    iget-short v7, v0, Lorg/a/a/o;->bEd:S
 
     add-int/2addr v3, v7
 
-    iget-object v7, v2, Lorg/a/a/o;->bDG:[I
+    iget-object v7, v2, Lorg/a/a/o;->bEa:[I
 
     if-nez v7, :cond_b
 
-    iget-short v7, v0, Lorg/a/a/o;->bDK:S
+    iget-short v7, v0, Lorg/a/a/o;->bEe:S
 
     add-int/2addr v7, v3
 
     new-array v7, v7, [I
 
-    iput-object v7, v2, Lorg/a/a/o;->bDG:[I
+    iput-object v7, v2, Lorg/a/a/o;->bEa:[I
 
     goto :goto_6
 
@@ -2821,11 +2821,11 @@
     :goto_7
     if-ge v4, v3, :cond_d
 
-    iget-object v8, v0, Lorg/a/a/o;->bDG:[I
+    iget-object v8, v0, Lorg/a/a/o;->bEa:[I
 
     aget v8, v8, v4
 
-    iget-object v9, v0, Lorg/a/a/o;->bDM:[I
+    iget-object v9, v0, Lorg/a/a/o;->bEg:[I
 
     if-eqz v9, :cond_c
 
@@ -2834,7 +2834,7 @@
     move-result v8
 
     :cond_c
-    iget-object v9, v2, Lorg/a/a/o;->bDG:[I
+    iget-object v9, v2, Lorg/a/a/o;->bEa:[I
 
     invoke-static {v1, v8, v9, v4}, Lorg/a/a/o;->a(Lorg/a/a/z;I[II)Z
 
@@ -2848,11 +2848,11 @@
 
     :cond_d
     :goto_8
-    iget-short v4, v0, Lorg/a/a/o;->bDK:S
+    iget-short v4, v0, Lorg/a/a/o;->bEe:S
 
     if-ge v6, v4, :cond_13
 
-    iget-object v4, v0, Lorg/a/a/o;->bDI:[I
+    iget-object v4, v0, Lorg/a/a/o;->bEc:[I
 
     aget v4, v4, v6
 
@@ -2862,7 +2862,7 @@
 
     if-ne v9, v11, :cond_f
 
-    iget-object v9, v0, Lorg/a/a/o;->bDF:[I
+    iget-object v9, v0, Lorg/a/a/o;->bDZ:[I
 
     and-int v18, v4, v17
 
@@ -2887,7 +2887,7 @@
     :cond_f
     if-ne v9, v10, :cond_10
 
-    iget-object v9, v0, Lorg/a/a/o;->bDG:[I
+    iget-object v9, v0, Lorg/a/a/o;->bEa:[I
 
     and-int v18, v4, v17
 
@@ -2912,7 +2912,7 @@
 
     :cond_11
     :goto_a
-    iget-object v4, v0, Lorg/a/a/o;->bDM:[I
+    iget-object v4, v0, Lorg/a/a/o;->bEg:[I
 
     if-eqz v4, :cond_12
 
@@ -2921,7 +2921,7 @@
     move-result v8
 
     :cond_12
-    iget-object v4, v2, Lorg/a/a/o;->bDG:[I
+    iget-object v4, v2, Lorg/a/a/o;->bEa:[I
 
     add-int v9, v3, v6
 
diff --git a/com.discord/smali_classes2/org/a/a/p.smali b/com.discord/smali_classes2/org/a/a/p.smali
index 4d1dfb86d7..f522d98aac 100644
--- a/com.discord/smali_classes2/org/a/a/p.smali
+++ b/com.discord/smali_classes2/org/a/a/p.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final bDN:Ljava/lang/String;
+.field final bEh:Ljava/lang/String;
 
-.field final bDO:Z
+.field final bEi:Z
 
 .field final descriptor:Ljava/lang/String;
 
@@ -23,13 +23,13 @@
 
     iput p1, p0, Lorg/a/a/p;->tag:I
 
-    iput-object p2, p0, Lorg/a/a/p;->bDN:Ljava/lang/String;
+    iput-object p2, p0, Lorg/a/a/p;->bEh:Ljava/lang/String;
 
     iput-object p3, p0, Lorg/a/a/p;->name:Ljava/lang/String;
 
     iput-object p4, p0, Lorg/a/a/p;->descriptor:Ljava/lang/String;
 
-    iput-boolean p5, p0, Lorg/a/a/p;->bDO:Z
+    iput-boolean p5, p0, Lorg/a/a/p;->bEi:Z
 
     return-void
 .end method
@@ -63,15 +63,15 @@
 
     if-ne v1, v3, :cond_2
 
-    iget-boolean v1, p0, Lorg/a/a/p;->bDO:Z
+    iget-boolean v1, p0, Lorg/a/a/p;->bEi:Z
 
-    iget-boolean v3, p1, Lorg/a/a/p;->bDO:Z
+    iget-boolean v3, p1, Lorg/a/a/p;->bEi:Z
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lorg/a/a/p;->bDN:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/p;->bEh:Ljava/lang/String;
 
-    iget-object v3, p1, Lorg/a/a/p;->bDN:Ljava/lang/String;
+    iget-object v3, p1, Lorg/a/a/p;->bEh:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -110,7 +110,7 @@
 
     iget v0, p0, Lorg/a/a/p;->tag:I
 
-    iget-boolean v1, p0, Lorg/a/a/p;->bDO:Z
+    iget-boolean v1, p0, Lorg/a/a/p;->bEi:Z
 
     if-eqz v1, :cond_0
 
@@ -124,7 +124,7 @@
     :goto_0
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lorg/a/a/p;->bDN:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/p;->bEh:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
@@ -158,7 +158,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lorg/a/a/p;->bDN:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/p;->bEh:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -182,7 +182,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lorg/a/a/p;->bDO:Z
+    iget-boolean v1, p0, Lorg/a/a/p;->bEi:Z
 
     if-eqz v1, :cond_0
 
diff --git a/com.discord/smali_classes2/org/a/a/q.smali b/com.discord/smali_classes2/org/a/a/q.smali
index 7b1c1d7b24..10c6ee36ae 100644
--- a/com.discord/smali_classes2/org/a/a/q.smali
+++ b/com.discord/smali_classes2/org/a/a/q.smali
@@ -4,28 +4,28 @@
 
 
 # instance fields
-.field final bDP:Lorg/a/a/r;
+.field final bEj:Lorg/a/a/r;
 
-.field final bDQ:Lorg/a/a/r;
+.field final bEk:Lorg/a/a/r;
 
-.field final bDR:Lorg/a/a/r;
+.field final bEl:Lorg/a/a/r;
 
-.field final bDS:I
+.field final bEm:I
 
-.field final bDT:Ljava/lang/String;
+.field final bEn:Ljava/lang/String;
 
-.field bDU:Lorg/a/a/q;
+.field bEo:Lorg/a/a/q;
 
 
 # direct methods
 .method private constructor <init>(Lorg/a/a/q;Lorg/a/a/r;Lorg/a/a/r;)V
     .locals 6
 
-    iget-object v3, p1, Lorg/a/a/q;->bDR:Lorg/a/a/r;
+    iget-object v3, p1, Lorg/a/a/q;->bEl:Lorg/a/a/r;
 
-    iget v4, p1, Lorg/a/a/q;->bDS:I
+    iget v4, p1, Lorg/a/a/q;->bEm:I
 
-    iget-object v5, p1, Lorg/a/a/q;->bDT:Ljava/lang/String;
+    iget-object v5, p1, Lorg/a/a/q;->bEn:Ljava/lang/String;
 
     move-object v0, p0
 
@@ -35,9 +35,9 @@
 
     invoke-direct/range {v0 .. v5}, Lorg/a/a/q;-><init>(Lorg/a/a/r;Lorg/a/a/r;Lorg/a/a/r;ILjava/lang/String;)V
 
-    iget-object p1, p1, Lorg/a/a/q;->bDU:Lorg/a/a/q;
+    iget-object p1, p1, Lorg/a/a/q;->bEo:Lorg/a/a/q;
 
-    iput-object p1, p0, Lorg/a/a/q;->bDU:Lorg/a/a/q;
+    iput-object p1, p0, Lorg/a/a/q;->bEo:Lorg/a/a/q;
 
     return-void
 .end method
@@ -47,15 +47,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/q;->bDP:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/q;->bEj:Lorg/a/a/r;
 
-    iput-object p2, p0, Lorg/a/a/q;->bDQ:Lorg/a/a/r;
+    iput-object p2, p0, Lorg/a/a/q;->bEk:Lorg/a/a/r;
 
-    iput-object p3, p0, Lorg/a/a/q;->bDR:Lorg/a/a/r;
+    iput-object p3, p0, Lorg/a/a/q;->bEl:Lorg/a/a/r;
 
-    iput p4, p0, Lorg/a/a/q;->bDS:I
+    iput p4, p0, Lorg/a/a/q;->bEm:I
 
-    iput-object p5, p0, Lorg/a/a/q;->bDT:Ljava/lang/String;
+    iput-object p5, p0, Lorg/a/a/q;->bEn:Ljava/lang/String;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     add-int/lit8 v0, v0, 0x1
 
-    iget-object p0, p0, Lorg/a/a/q;->bDU:Lorg/a/a/q;
+    iget-object p0, p0, Lorg/a/a/q;->bEo:Lorg/a/a/q;
 
     goto :goto_0
 
@@ -88,23 +88,23 @@
     return-object p0
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/q;->bDU:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->bEo:Lorg/a/a/q;
 
     invoke-static {v0, p1, p2}, Lorg/a/a/q;->a(Lorg/a/a/q;Lorg/a/a/r;Lorg/a/a/r;)Lorg/a/a/q;
 
     move-result-object v0
 
-    iput-object v0, p0, Lorg/a/a/q;->bDU:Lorg/a/a/q;
+    iput-object v0, p0, Lorg/a/a/q;->bEo:Lorg/a/a/q;
 
-    iget-object v0, p0, Lorg/a/a/q;->bDP:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/q;->bEj:Lorg/a/a/r;
 
-    iget v0, v0, Lorg/a/a/r;->bDZ:I
+    iget v0, v0, Lorg/a/a/r;->bEt:I
 
-    iget-object v1, p0, Lorg/a/a/q;->bDQ:Lorg/a/a/r;
+    iget-object v1, p0, Lorg/a/a/q;->bEk:Lorg/a/a/r;
 
-    iget v1, v1, Lorg/a/a/r;->bDZ:I
+    iget v1, v1, Lorg/a/a/r;->bEt:I
 
-    iget v2, p1, Lorg/a/a/r;->bDZ:I
+    iget v2, p1, Lorg/a/a/r;->bEt:I
 
     if-nez p2, :cond_1
 
@@ -113,7 +113,7 @@
     goto :goto_0
 
     :cond_1
-    iget v3, p2, Lorg/a/a/r;->bDZ:I
+    iget v3, p2, Lorg/a/a/r;->bEt:I
 
     :goto_0
     if-ge v2, v1, :cond_6
@@ -127,14 +127,14 @@
 
     if-lt v3, v1, :cond_3
 
-    iget-object p0, p0, Lorg/a/a/q;->bDU:Lorg/a/a/q;
+    iget-object p0, p0, Lorg/a/a/q;->bEo:Lorg/a/a/q;
 
     return-object p0
 
     :cond_3
     new-instance p1, Lorg/a/a/q;
 
-    iget-object v0, p0, Lorg/a/a/q;->bDQ:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/q;->bEk:Lorg/a/a/r;
 
     invoke-direct {p1, p0, p2, v0}, Lorg/a/a/q;-><init>(Lorg/a/a/q;Lorg/a/a/r;Lorg/a/a/r;)V
 
@@ -145,7 +145,7 @@
 
     new-instance p2, Lorg/a/a/q;
 
-    iget-object v0, p0, Lorg/a/a/q;->bDP:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/q;->bEj:Lorg/a/a/r;
 
     invoke-direct {p2, p0, v0, p1}, Lorg/a/a/q;-><init>(Lorg/a/a/q;Lorg/a/a/r;Lorg/a/a/r;)V
 
@@ -154,15 +154,15 @@
     :cond_5
     new-instance v0, Lorg/a/a/q;
 
-    iget-object v1, p0, Lorg/a/a/q;->bDQ:Lorg/a/a/r;
+    iget-object v1, p0, Lorg/a/a/q;->bEk:Lorg/a/a/r;
 
     invoke-direct {v0, p0, p2, v1}, Lorg/a/a/q;-><init>(Lorg/a/a/q;Lorg/a/a/r;Lorg/a/a/r;)V
 
-    iput-object v0, p0, Lorg/a/a/q;->bDU:Lorg/a/a/q;
+    iput-object v0, p0, Lorg/a/a/q;->bEo:Lorg/a/a/q;
 
     new-instance p2, Lorg/a/a/q;
 
-    iget-object v0, p0, Lorg/a/a/q;->bDP:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/q;->bEj:Lorg/a/a/r;
 
     invoke-direct {p2, p0, v0, p1}, Lorg/a/a/q;-><init>(Lorg/a/a/q;Lorg/a/a/r;Lorg/a/a/r;)V
 
diff --git a/com.discord/smali_classes2/org/a/a/r.smali b/com.discord/smali_classes2/org/a/a/r.smali
index 956b92b79f..af25e3147b 100644
--- a/com.discord/smali_classes2/org/a/a/r.smali
+++ b/com.discord/smali_classes2/org/a/a/r.smali
@@ -4,35 +4,35 @@
 
 
 # static fields
-.field static final bDV:Lorg/a/a/r;
+.field static final bEp:Lorg/a/a/r;
 
 
 # instance fields
-.field bDW:S
+.field bEA:Lorg/a/a/r;
 
-.field private bDX:S
+.field bEB:Lorg/a/a/l;
 
-.field private bDY:[I
+.field bEC:Lorg/a/a/r;
 
-.field bDZ:I
+.field bEq:S
 
-.field private bEa:[I
+.field private bEr:S
 
-.field bEb:S
+.field private bEs:[I
 
-.field bEc:S
+.field bEt:I
 
-.field bEd:S
+.field private bEu:[I
 
-.field bEe:S
+.field bEv:S
 
-.field bEf:Lorg/a/a/o;
+.field bEw:S
 
-.field bEg:Lorg/a/a/r;
+.field bEx:S
 
-.field bEh:Lorg/a/a/l;
+.field bEy:S
 
-.field bEi:Lorg/a/a/r;
+.field bEz:Lorg/a/a/o;
 
 
 # direct methods
@@ -43,7 +43,7 @@
 
     invoke-direct {v0}, Lorg/a/a/r;-><init>()V
 
-    sput-object v0, Lorg/a/a/r;->bDV:Lorg/a/a/r;
+    sput-object v0, Lorg/a/a/r;->bEp:Lorg/a/a/r;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 .method private p(III)V
     .locals 6
 
-    iget-object v0, p0, Lorg/a/a/r;->bEa:[I
+    iget-object v0, p0, Lorg/a/a/r;->bEu:[I
 
     const/4 v1, 0x6
 
@@ -67,10 +67,10 @@
 
     new-array v0, v1, [I
 
-    iput-object v0, p0, Lorg/a/a/r;->bEa:[I
+    iput-object v0, p0, Lorg/a/a/r;->bEu:[I
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/r;->bEa:[I
+    iget-object v0, p0, Lorg/a/a/r;->bEu:[I
 
     const/4 v2, 0x0
 
@@ -92,10 +92,10 @@
 
     invoke-static {v0, v2, v1, v2, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v1, p0, Lorg/a/a/r;->bEa:[I
+    iput-object v1, p0, Lorg/a/a/r;->bEu:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/r;->bEa:[I
+    iget-object v0, p0, Lorg/a/a/r;->bEu:[I
 
     add-int/lit8 v3, v3, 0x1
 
@@ -114,17 +114,17 @@
 
 
 # virtual methods
-.method final Jb()Lorg/a/a/r;
+.method final IO()Lorg/a/a/r;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     if-nez v0, :cond_0
 
     return-object p0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/o;->bDE:Lorg/a/a/r;
+    iget-object v0, v0, Lorg/a/a/o;->bDY:Lorg/a/a/r;
 
     return-object v0
 .end method
@@ -132,20 +132,20 @@
 .method final a(Lorg/a/a/r;)Lorg/a/a/r;
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iget-object v0, p0, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
     :goto_0
     if-eqz v0, :cond_2
 
-    iget-short v1, p0, Lorg/a/a/r;->bDW:S
+    iget-short v1, p0, Lorg/a/a/r;->bEq:S
 
     and-int/lit8 v1, v1, 0x10
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iget-object v1, p0, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
-    iget-object v1, v1, Lorg/a/a/l;->bDz:Lorg/a/a/l;
+    iget-object v1, v1, Lorg/a/a/l;->bDT:Lorg/a/a/l;
 
     if-ne v0, v1, :cond_0
 
@@ -159,20 +159,20 @@
     :goto_1
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lorg/a/a/l;->bDy:Lorg/a/a/r;
+    iget-object v1, v0, Lorg/a/a/l;->bDS:Lorg/a/a/r;
 
-    iget-object v1, v1, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iget-object v1, v1, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lorg/a/a/l;->bDy:Lorg/a/a/r;
+    iget-object v1, v0, Lorg/a/a/l;->bDS:Lorg/a/a/r;
 
-    iput-object p1, v1, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iput-object p1, v1, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
-    iget-object p1, v0, Lorg/a/a/l;->bDy:Lorg/a/a/r;
+    iget-object p1, v0, Lorg/a/a/l;->bDS:Lorg/a/a/r;
 
     :cond_1
-    iget-object v0, v0, Lorg/a/a/l;->bDz:Lorg/a/a/l;
+    iget-object v0, v0, Lorg/a/a/l;->bDT:Lorg/a/a/l;
 
     goto :goto_0
 
@@ -183,7 +183,7 @@
 .method final a(Lorg/a/a/d;IZ)V
     .locals 2
 
-    iget-short v0, p0, Lorg/a/a/r;->bDW:S
+    iget-short v0, p0, Lorg/a/a/r;->bEq:S
 
     and-int/lit8 v0, v0, 0x4
 
@@ -199,7 +199,7 @@
 
     invoke-direct {p0, p2, p3, v1}, Lorg/a/a/r;->p(III)V
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     return-void
 
@@ -210,27 +210,27 @@
 
     invoke-direct {p0, p2, p3, v1}, Lorg/a/a/r;->p(III)V
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 
     :cond_1
     if-eqz p3, :cond_2
 
-    iget p3, p0, Lorg/a/a/r;->bDZ:I
+    iget p3, p0, Lorg/a/a/r;->bEt:I
 
     sub-int/2addr p3, p2
 
-    invoke-virtual {p1, p3}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {p1, p3}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     return-void
 
     :cond_2
-    iget p3, p0, Lorg/a/a/r;->bDZ:I
+    iget p3, p0, Lorg/a/a/r;->bEt:I
 
     sub-int/2addr p3, p2
 
-    invoke-virtual {p1, p3}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p3}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 .end method
@@ -242,7 +242,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-short p2, p0, Lorg/a/a/r;->bDX:S
+    iget-short p2, p0, Lorg/a/a/r;->bEr:S
 
     if-eqz p2, :cond_0
 
@@ -252,14 +252,14 @@
 
     invoke-virtual {p1, p2, p0}, Lorg/a/a/t;->b(ILorg/a/a/r;)V
 
-    iget-object p2, p0, Lorg/a/a/r;->bDY:[I
+    iget-object p2, p0, Lorg/a/a/r;->bEs:[I
 
     if-eqz p2, :cond_0
 
     const/4 p2, 0x1
 
     :goto_0
-    iget-object v0, p0, Lorg/a/a/r;->bDY:[I
+    iget-object v0, p0, Lorg/a/a/r;->bEs:[I
 
     const/4 v1, 0x0
 
@@ -282,28 +282,28 @@
 .method final b(S)V
     .locals 3
 
-    sget-object v0, Lorg/a/a/r;->bDV:Lorg/a/a/r;
+    sget-object v0, Lorg/a/a/r;->bEp:Lorg/a/a/r;
 
-    iput-object v0, p0, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iput-object v0, p0, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
     move-object v0, p0
 
     :goto_0
-    sget-object v1, Lorg/a/a/r;->bDV:Lorg/a/a/r;
+    sget-object v1, Lorg/a/a/r;->bEp:Lorg/a/a/r;
 
     if-eq v0, v1, :cond_1
 
-    iget-object v1, v0, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iget-object v1, v0, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iput-object v2, v0, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
-    iget-short v2, v0, Lorg/a/a/r;->bEe:S
+    iget-short v2, v0, Lorg/a/a/r;->bEy:S
 
     if-nez v2, :cond_0
 
-    iput-short p1, v0, Lorg/a/a/r;->bEe:S
+    iput-short p1, v0, Lorg/a/a/r;->bEy:S
 
     invoke-virtual {v0, v1}, Lorg/a/a/r;->a(Lorg/a/a/r;)Lorg/a/a/r;
 
@@ -320,21 +320,21 @@
     return-void
 .end method
 
-.method final el(I)V
+.method final eh(I)V
     .locals 5
 
-    iget-short v0, p0, Lorg/a/a/r;->bDX:S
+    iget-short v0, p0, Lorg/a/a/r;->bEr:S
 
     if-nez v0, :cond_0
 
     int-to-short p1, p1
 
-    iput-short p1, p0, Lorg/a/a/r;->bDX:S
+    iput-short p1, p0, Lorg/a/a/r;->bEr:S
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/r;->bDY:[I
+    iget-object v0, p0, Lorg/a/a/r;->bEs:[I
 
     const/4 v1, 0x4
 
@@ -342,10 +342,10 @@
 
     new-array v0, v1, [I
 
-    iput-object v0, p0, Lorg/a/a/r;->bDY:[I
+    iput-object v0, p0, Lorg/a/a/r;->bEs:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/r;->bDY:[I
+    iget-object v0, p0, Lorg/a/a/r;->bEs:[I
 
     const/4 v2, 0x0
 
@@ -369,10 +369,10 @@
 
     invoke-static {v0, v2, v1, v2, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v1, p0, Lorg/a/a/r;->bDY:[I
+    iput-object v1, p0, Lorg/a/a/r;->bEs:[I
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/r;->bDY:[I
+    iget-object v0, p0, Lorg/a/a/r;->bEs:[I
 
     aput p1, v0, v3
 
@@ -382,17 +382,17 @@
 .method final n([BI)Z
     .locals 7
 
-    iget-short v0, p0, Lorg/a/a/r;->bDW:S
+    iget-short v0, p0, Lorg/a/a/r;->bEq:S
 
     or-int/lit8 v0, v0, 0x4
 
     int-to-short v0, v0
 
-    iput-short v0, p0, Lorg/a/a/r;->bDW:S
+    iput-short v0, p0, Lorg/a/a/r;->bEq:S
 
-    iput p2, p0, Lorg/a/a/r;->bDZ:I
+    iput p2, p0, Lorg/a/a/r;->bEt:I
 
-    iget-object v0, p0, Lorg/a/a/r;->bEa:[I
+    iget-object v0, p0, Lorg/a/a/r;->bEu:[I
 
     const/4 v1, 0x0
 
@@ -406,7 +406,7 @@
     :goto_0
     if-lez v0, :cond_5
 
-    iget-object v2, p0, Lorg/a/a/r;->bEa:[I
+    iget-object v2, p0, Lorg/a/a/r;->bEu:[I
 
     add-int/lit8 v3, v0, -0x1
 
diff --git a/com.discord/smali_classes2/org/a/a/t.smali b/com.discord/smali_classes2/org/a/a/t.smali
index cfda45965b..0a684e3c25 100644
--- a/com.discord/smali_classes2/org/a/a/t.smali
+++ b/com.discord/smali_classes2/org/a/a/t.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field protected final bCl:I
+.field protected final bCF:I
 
-.field protected bEj:Lorg/a/a/t;
+.field protected bED:Lorg/a/a/t;
 
 
 # direct methods
@@ -27,25 +27,25 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/t;->bCl:I
+    iput p1, p0, Lorg/a/a/t;->bCF:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iput-object p1, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public Jc()Lorg/a/a/a;
+.method public IP()Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lorg/a/a/t;->Jc()Lorg/a/a/a;
+    invoke-virtual {v0}, Lorg/a/a/t;->IP()Lorg/a/a/a;
 
     move-result-object v0
 
@@ -60,7 +60,7 @@
 .method public a(ILjava/lang/String;Z)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -79,13 +79,13 @@
 .method public a(ILorg/a/a/ab;Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/t;->bCl:I
+    iget v0, p0, Lorg/a/a/t;->bCF:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -115,13 +115,13 @@
 
     move-object v0, p0
 
-    iget v1, v0, Lorg/a/a/t;->bCl:I
+    iget v1, v0, Lorg/a/a/t;->bCF:I
 
     const/high16 v2, 0x50000
 
     if-lt v1, v2, :cond_1
 
-    iget-object v3, v0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v3, v0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v3, :cond_0
 
@@ -163,7 +163,7 @@
 .method public varargs a(IILorg/a/a/r;[Lorg/a/a/r;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -176,7 +176,7 @@
 .method public a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
     .locals 6
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -199,7 +199,7 @@
 .method public a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -212,7 +212,7 @@
 .method public a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 6
 
-    iget v0, p0, Lorg/a/a/t;->bCl:I
+    iget v0, p0, Lorg/a/a/t;->bCF:I
 
     const/high16 v1, 0x50000
 
@@ -246,7 +246,7 @@
     throw p1
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_3
 
@@ -269,7 +269,7 @@
 .method public a(ILorg/a/a/r;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -282,7 +282,7 @@
 .method public a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/a/a/r;Lorg/a/a/r;I)V
     .locals 7
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -307,13 +307,13 @@
 .method public varargs a(Ljava/lang/String;Ljava/lang/String;Lorg/a/a/p;[Ljava/lang/Object;)V
     .locals 2
 
-    iget v0, p0, Lorg/a/a/t;->bCl:I
+    iget v0, p0, Lorg/a/a/t;->bCF:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -335,7 +335,7 @@
 .method public a(Lorg/a/a/r;Lorg/a/a/r;Lorg/a/a/r;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -348,7 +348,7 @@
 .method public a(Lorg/a/a/r;[I[Lorg/a/a/r;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -358,10 +358,23 @@
     return-void
 .end method
 
+.method public ah(II)V
+    .locals 1
+
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0, p1, p2}, Lorg/a/a/t;->ah(II)V
+
+    :cond_0
+    return-void
+.end method
+
 .method public ai(II)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -374,7 +387,7 @@
 .method public aj(II)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -387,7 +400,7 @@
 .method public ak(II)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -397,29 +410,16 @@
     return-void
 .end method
 
-.method public al(II)V
-    .locals 1
-
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0, p1, p2}, Lorg/a/a/t;->al(II)V
-
-    :cond_0
-    return-void
-.end method
-
 .method public b(ILorg/a/a/ab;Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/t;->bCl:I
+    iget v0, p0, Lorg/a/a/t;->bCF:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -452,7 +452,7 @@
     move-object v0, p0
 
     :goto_0
-    iget v1, v0, Lorg/a/a/t;->bCl:I
+    iget v1, v0, Lorg/a/a/t;->bCF:I
 
     const/high16 v2, 0x50000
 
@@ -487,7 +487,7 @@
     return-void
 
     :cond_1
-    iget-object v0, v0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, v0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_2
 
@@ -500,7 +500,7 @@
 .method public b(ILorg/a/a/r;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -513,7 +513,7 @@
 .method public b(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -526,7 +526,7 @@
 .method public b(Lorg/a/a/r;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -539,7 +539,7 @@
 .method public bF(Ljava/lang/Object;)V
     .locals 2
 
-    iget v0, p0, Lorg/a/a/t;->bCl:I
+    iget v0, p0, Lorg/a/a/t;->bCF:I
 
     const/high16 v1, 0x50000
 
@@ -557,7 +557,7 @@
 
     check-cast v0, Lorg/a/a/aa;
 
-    invoke-virtual {v0}, Lorg/a/a/aa;->Jk()I
+    invoke-virtual {v0}, Lorg/a/a/aa;->IX()I
 
     move-result v0
 
@@ -578,7 +578,7 @@
 
     :cond_1
     :goto_0
-    iget v0, p0, Lorg/a/a/t;->bCl:I
+    iget v0, p0, Lorg/a/a/t;->bCF:I
 
     const/high16 v1, 0x70000
 
@@ -601,7 +601,7 @@
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_4
 
@@ -614,13 +614,13 @@
 .method public c(ILorg/a/a/ab;Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/t;->bCl:I
+    iget v0, p0, Lorg/a/a/t;->bCF:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -645,14 +645,14 @@
     throw p1
 .end method
 
-.method public em(I)V
+.method public ei(I)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1}, Lorg/a/a/t;->em(I)V
+    invoke-virtual {v0, p1}, Lorg/a/a/t;->ei(I)V
 
     :cond_0
     return-void
@@ -661,7 +661,7 @@
 .method public f(IZ)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -674,7 +674,7 @@
 .method public i(ILjava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -687,7 +687,7 @@
 .method public j(Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -706,13 +706,13 @@
 .method public n(Ljava/lang/String;I)V
     .locals 2
 
-    iget v0, p0, Lorg/a/a/t;->bCl:I
+    iget v0, p0, Lorg/a/a/t;->bCF:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -734,7 +734,7 @@
 .method public o(Ljava/lang/String;I)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bEj:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bED:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/org/a/a/u.smali b/com.discord/smali_classes2/org/a/a/u.smali
index cbc21d0e75..ebd3d041e1 100644
--- a/com.discord/smali_classes2/org/a/a/u.smali
+++ b/com.discord/smali_classes2/org/a/a/u.smali
@@ -4,109 +4,109 @@
 
 
 # static fields
-.field private static final bEk:[I
+.field private static final bEE:[I
 
 
 # instance fields
-.field final bCD:I
+.field final bCH:Lorg/a/a/z;
 
-.field final bCQ:I
+.field final bCX:I
 
-.field bCT:Lorg/a/a/b;
+.field final bDV:I
 
-.field bCU:Lorg/a/a/b;
+.field final bDW:I
 
-.field bCV:Lorg/a/a/b;
+.field final bDk:I
 
-.field bCW:Lorg/a/a/b;
+.field bDn:Lorg/a/a/b;
 
-.field final bCn:Lorg/a/a/z;
+.field bDo:Lorg/a/a/b;
 
-.field final bDB:I
+.field bDp:Lorg/a/a/b;
 
-.field final bDC:I
+.field bDq:Lorg/a/a/b;
 
-.field bDb:Lorg/a/a/c;
+.field bDv:Lorg/a/a/c;
 
-.field private final bDc:I
-
-.field bEA:Lorg/a/a/c;
-
-.field final bEB:I
-
-.field final bEC:[I
-
-.field bED:I
-
-.field bEE:[Lorg/a/a/b;
+.field private final bDw:I
 
 .field bEF:I
 
-.field bEG:[Lorg/a/a/b;
+.field bEG:I
 
-.field bEH:Lorg/a/a/d;
+.field final bEH:Lorg/a/a/d;
 
-.field bEI:I
+.field bEI:Lorg/a/a/q;
 
-.field bEJ:Lorg/a/a/d;
+.field private bEJ:Lorg/a/a/q;
 
-.field private bEK:Lorg/a/a/r;
+.field bEK:I
 
-.field private bEL:Lorg/a/a/r;
+.field bEL:Lorg/a/a/d;
 
-.field private bEM:Lorg/a/a/r;
+.field bEM:I
 
-.field private bEN:I
+.field bEN:Lorg/a/a/d;
 
-.field private bEO:I
+.field bEO:I
 
-.field private bEP:I
+.field bEP:Lorg/a/a/d;
 
-.field private bEQ:I
+.field bEQ:I
 
-.field private bER:[I
+.field bER:Lorg/a/a/d;
 
-.field bES:[I
+.field bES:Lorg/a/a/b;
 
-.field private bET:Z
+.field bET:Lorg/a/a/b;
 
-.field bEU:Z
+.field bEU:Lorg/a/a/c;
 
-.field private bEV:I
+.field final bEV:I
 
-.field bEW:I
+.field final bEW:[I
 
 .field bEX:I
 
-.field bEl:I
+.field bEY:[Lorg/a/a/b;
 
-.field bEm:I
+.field bEZ:I
 
-.field final bEn:Lorg/a/a/d;
+.field bFa:[Lorg/a/a/b;
 
-.field bEo:Lorg/a/a/q;
+.field bFb:Lorg/a/a/d;
 
-.field private bEp:Lorg/a/a/q;
+.field bFc:I
 
-.field bEq:I
+.field bFd:Lorg/a/a/d;
 
-.field bEr:Lorg/a/a/d;
+.field private bFe:Lorg/a/a/r;
 
-.field bEs:I
+.field private bFf:Lorg/a/a/r;
 
-.field bEt:Lorg/a/a/d;
+.field private bFg:Lorg/a/a/r;
 
-.field bEu:I
+.field private bFh:I
 
-.field bEv:Lorg/a/a/d;
+.field private bFi:I
 
-.field bEw:I
+.field private bFj:I
 
-.field bEx:Lorg/a/a/d;
+.field private bFk:I
 
-.field bEy:Lorg/a/a/b;
+.field private bFl:[I
 
-.field bEz:Lorg/a/a/b;
+.field bFm:[I
+
+.field private bFn:Z
+
+.field bFo:Z
+
+.field private bFp:I
+
+.field bFq:I
+
+.field bFr:I
 
 .field final descriptor:Ljava/lang/String;
 
@@ -123,7 +123,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lorg/a/a/u;->bEk:[I
+    sput-object v0, Lorg/a/a/u;->bEE:[I
 
     return-void
 
@@ -343,9 +343,9 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    iput-object p1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iput-object p1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const-string v0, "<init>"
 
@@ -365,21 +365,21 @@
     move v0, p2
 
     :goto_0
-    iput v0, p0, Lorg/a/a/u;->bCD:I
+    iput v0, p0, Lorg/a/a/u;->bCX:I
 
-    invoke-virtual {p1, p3}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p1, p3}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v0
 
-    iput v0, p0, Lorg/a/a/u;->bDB:I
+    iput v0, p0, Lorg/a/a/u;->bDV:I
 
     iput-object p3, p0, Lorg/a/a/u;->name:Ljava/lang/String;
 
-    invoke-virtual {p1, p4}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p1, p4}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p3
 
-    iput p3, p0, Lorg/a/a/u;->bDC:I
+    iput p3, p0, Lorg/a/a/u;->bDW:I
 
     iput-object p4, p0, Lorg/a/a/u;->descriptor:Ljava/lang/String;
 
@@ -392,12 +392,12 @@
     goto :goto_1
 
     :cond_1
-    invoke-virtual {p1, p5}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p1, p5}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p5
 
     :goto_1
-    iput p5, p0, Lorg/a/a/u;->bCQ:I
+    iput p5, p0, Lorg/a/a/u;->bDk:I
 
     if-eqz p6, :cond_2
 
@@ -407,20 +407,20 @@
 
     array-length p5, p6
 
-    iput p5, p0, Lorg/a/a/u;->bEB:I
+    iput p5, p0, Lorg/a/a/u;->bEV:I
 
-    iget p5, p0, Lorg/a/a/u;->bEB:I
+    iget p5, p0, Lorg/a/a/u;->bEV:I
 
     new-array p5, p5, [I
 
-    iput-object p5, p0, Lorg/a/a/u;->bEC:[I
+    iput-object p5, p0, Lorg/a/a/u;->bEW:[I
 
     :goto_2
-    iget p5, p0, Lorg/a/a/u;->bEB:I
+    iget p5, p0, Lorg/a/a/u;->bEV:I
 
     if-ge p3, p5, :cond_3
 
-    iget-object p5, p0, Lorg/a/a/u;->bEC:[I
+    iget-object p5, p0, Lorg/a/a/u;->bEW:[I
 
     aget-object v0, p6, p3
 
@@ -439,18 +439,18 @@
     goto :goto_2
 
     :cond_2
-    iput p3, p0, Lorg/a/a/u;->bEB:I
+    iput p3, p0, Lorg/a/a/u;->bEV:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/u;->bEC:[I
+    iput-object p1, p0, Lorg/a/a/u;->bEW:[I
 
     :cond_3
-    iput p7, p0, Lorg/a/a/u;->bDc:I
+    iput p7, p0, Lorg/a/a/u;->bDw:I
 
     if-eqz p7, :cond_5
 
-    invoke-static {p4}, Lorg/a/a/aa;->fd(Ljava/lang/String;)I
+    invoke-static {p4}, Lorg/a/a/aa;->eY(Ljava/lang/String;)I
 
     move-result p1
 
@@ -463,17 +463,17 @@
     add-int/lit8 p1, p1, -0x1
 
     :cond_4
-    iput p1, p0, Lorg/a/a/u;->bEm:I
+    iput p1, p0, Lorg/a/a/u;->bEG:I
 
-    iput p1, p0, Lorg/a/a/u;->bEP:I
+    iput p1, p0, Lorg/a/a/u;->bFj:I
 
     new-instance p1, Lorg/a/a/r;
 
     invoke-direct {p1}, Lorg/a/a/r;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/u;->bEK:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bFe:Lorg/a/a/r;
 
-    iget-object p1, p0, Lorg/a/a/u;->bEK:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bFe:Lorg/a/a/r;
 
     invoke-virtual {p0, p1}, Lorg/a/a/u;->b(Lorg/a/a/r;)V
 
@@ -481,10 +481,10 @@
     return-void
 .end method
 
-.method private Jd()V
+.method private IQ()V
     .locals 4
 
-    iget v0, p0, Lorg/a/a/u;->bDc:I
+    iget v0, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v1, 0x0
 
@@ -500,25 +500,25 @@
 
     invoke-direct {v2, v0}, Lorg/a/a/o;-><init>(Lorg/a/a/r;)V
 
-    iput-object v2, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iput-object v2, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget-object v2, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget-object v2, v2, Lorg/a/a/d;->data:[B
 
-    iget-object v3, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v3, v3, Lorg/a/a/d;->length:I
 
     invoke-virtual {v0, v2, v3}, Lorg/a/a/r;->n([BI)Z
 
-    iget-object v2, p0, Lorg/a/a/u;->bEL:Lorg/a/a/r;
+    iget-object v2, p0, Lorg/a/a/u;->bFf:Lorg/a/a/r;
 
-    iput-object v0, v2, Lorg/a/a/r;->bEg:Lorg/a/a/r;
+    iput-object v0, v2, Lorg/a/a/r;->bEA:Lorg/a/a/r;
 
-    iput-object v0, p0, Lorg/a/a/u;->bEL:Lorg/a/a/r;
+    iput-object v0, p0, Lorg/a/a/u;->bFf:Lorg/a/a/r;
 
-    iput-object v1, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iput-object v1, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     return-void
 
@@ -527,26 +527,26 @@
 
     if-ne v0, v2, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget v2, p0, Lorg/a/a/u;->bEO:I
+    iget v2, p0, Lorg/a/a/u;->bFi:I
 
     int-to-short v2, v2
 
-    iput-short v2, v0, Lorg/a/a/r;->bEd:S
+    iput-short v2, v0, Lorg/a/a/r;->bEx:S
 
-    iput-object v1, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iput-object v1, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     :cond_1
     return-void
 .end method
 
-.method private Jf()V
+.method private IS()V
     .locals 16
 
     move-object/from16 v0, p0
 
-    iget-object v1, v0, Lorg/a/a/u;->bES:[I
+    iget-object v1, v0, Lorg/a/a/u;->bFm:[I
 
     const/4 v2, 0x1
 
@@ -556,9 +556,9 @@
 
     aget v1, v1, v4
 
-    iget-object v4, v0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, v0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget v4, v4, Lorg/a/a/z;->bFz:I
+    iget v4, v4, Lorg/a/a/z;->bFT:I
 
     const/4 v5, 0x0
 
@@ -568,49 +568,49 @@
 
     if-ge v4, v7, :cond_0
 
-    iget-object v2, v0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
-    iget-object v4, v0, Lorg/a/a/u;->bES:[I
+    iget-object v4, v0, Lorg/a/a/u;->bFm:[I
 
     aget v4, v4, v5
 
-    invoke-virtual {v2, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    invoke-virtual {v2, v3}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v3}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     add-int/2addr v3, v6
 
-    invoke-direct {v0, v6, v3}, Lorg/a/a/u;->am(II)V
+    invoke-direct {v0, v6, v3}, Lorg/a/a/u;->al(II)V
 
-    iget-object v2, v0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
-    invoke-virtual {v2, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     add-int/2addr v1, v3
 
-    invoke-direct {v0, v3, v1}, Lorg/a/a/u;->am(II)V
+    invoke-direct {v0, v3, v1}, Lorg/a/a/u;->al(II)V
 
     return-void
 
     :cond_0
-    iget v4, v0, Lorg/a/a/u;->bEw:I
+    iget v4, v0, Lorg/a/a/u;->bEQ:I
 
     if-nez v4, :cond_1
 
-    iget-object v4, v0, Lorg/a/a/u;->bES:[I
+    iget-object v4, v0, Lorg/a/a/u;->bFm:[I
 
     aget v4, v4, v5
 
     goto :goto_0
 
     :cond_1
-    iget-object v4, v0, Lorg/a/a/u;->bES:[I
+    iget-object v4, v0, Lorg/a/a/u;->bFm:[I
 
     aget v4, v4, v5
 
-    iget-object v7, v0, Lorg/a/a/u;->bER:[I
+    iget-object v7, v0, Lorg/a/a/u;->bFl:[I
 
     aget v7, v7, v5
 
@@ -619,7 +619,7 @@
     sub-int/2addr v4, v2
 
     :goto_0
-    iget-object v7, v0, Lorg/a/a/u;->bER:[I
+    iget-object v7, v0, Lorg/a/a/u;->bFl:[I
 
     aget v7, v7, v2
 
@@ -697,11 +697,11 @@
 
     if-ge v5, v3, :cond_7
 
-    iget-object v6, v0, Lorg/a/a/u;->bES:[I
+    iget-object v6, v0, Lorg/a/a/u;->bFm:[I
 
     aget v6, v6, v15
 
-    iget-object v13, v0, Lorg/a/a/u;->bER:[I
+    iget-object v13, v0, Lorg/a/a/u;->bFl:[I
 
     aget v13, v13, v15
 
@@ -736,117 +736,117 @@
 
     if-eq v2, v9, :cond_8
 
-    iget-object v2, v0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     const/16 v5, 0xff
 
-    invoke-virtual {v2, v5}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v2, v5}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    invoke-virtual {v2, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    invoke-virtual {v2, v3}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v3}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     const/4 v2, 0x3
 
     add-int/2addr v3, v2
 
-    invoke-direct {v0, v2, v3}, Lorg/a/a/u;->am(II)V
+    invoke-direct {v0, v2, v3}, Lorg/a/a/u;->al(II)V
 
-    iget-object v2, v0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
-    invoke-virtual {v2, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     add-int/2addr v1, v3
 
-    invoke-direct {v0, v3, v1}, Lorg/a/a/u;->am(II)V
+    invoke-direct {v0, v3, v1}, Lorg/a/a/u;->al(II)V
 
     return-void
 
     :cond_8
     const/4 v2, 0x3
 
-    iget-object v1, v0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     add-int/2addr v8, v14
 
-    invoke-virtual {v1, v8}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v1, v8}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    invoke-virtual {v1, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     add-int/2addr v7, v2
 
     add-int/2addr v3, v2
 
-    invoke-direct {v0, v7, v3}, Lorg/a/a/u;->am(II)V
+    invoke-direct {v0, v7, v3}, Lorg/a/a/u;->al(II)V
 
     return-void
 
     :cond_9
-    iget-object v1, v0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
-    invoke-virtual {v1, v14}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v1, v14}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    invoke-virtual {v1, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 
     :cond_a
-    iget-object v1, v0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     add-int/2addr v8, v14
 
-    invoke-virtual {v1, v8}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v1, v8}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    invoke-virtual {v1, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 
     :cond_b
-    iget-object v1, v0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
-    invoke-virtual {v1, v11}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v1, v11}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    invoke-virtual {v1, v4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     add-int/lit8 v1, v3, 0x3
 
     add-int/lit8 v3, v3, 0x4
 
-    invoke-direct {v0, v1, v3}, Lorg/a/a/u;->am(II)V
+    invoke-direct {v0, v1, v3}, Lorg/a/a/u;->al(II)V
 
     return-void
 
     :cond_c
-    iget-object v1, v0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     add-int/2addr v4, v12
 
-    invoke-virtual {v1, v4}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v1, v4}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     add-int/lit8 v1, v3, 0x3
 
     add-int/lit8 v3, v3, 0x4
 
-    invoke-direct {v0, v1, v3}, Lorg/a/a/u;->am(II)V
+    invoke-direct {v0, v1, v3}, Lorg/a/a/u;->al(II)V
 
     return-void
 
     :cond_d
-    iget-object v1, v0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
-    invoke-virtual {v1, v4}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v1, v4}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     return-void
 
@@ -865,11 +865,11 @@
 .method private a(Lorg/a/a/r;[Lorg/a/a/r;)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz v0, :cond_2
 
-    iget v1, p0, Lorg/a/a/u;->bDc:I
+    iget v1, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v2, 0x4
 
@@ -877,7 +877,7 @@
 
     if-ne v1, v2, :cond_0
 
-    iget-object v0, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     const/16 v1, 0xab
 
@@ -887,17 +887,17 @@
 
     invoke-direct {p0, v3, p1}, Lorg/a/a/u;->c(ILorg/a/a/r;)V
 
-    invoke-virtual {p1}, Lorg/a/a/r;->Jb()Lorg/a/a/r;
+    invoke-virtual {p1}, Lorg/a/a/r;->IO()Lorg/a/a/r;
 
     move-result-object p1
 
-    iget-short v0, p1, Lorg/a/a/r;->bDW:S
+    iget-short v0, p1, Lorg/a/a/r;->bEq:S
 
     or-int/lit8 v0, v0, 0x2
 
     int-to-short v0, v0
 
-    iput-short v0, p1, Lorg/a/a/r;->bDW:S
+    iput-short v0, p1, Lorg/a/a/r;->bEq:S
 
     array-length p1, p2
 
@@ -910,17 +910,17 @@
 
     invoke-direct {p0, v3, v1}, Lorg/a/a/u;->c(ILorg/a/a/r;)V
 
-    invoke-virtual {v1}, Lorg/a/a/r;->Jb()Lorg/a/a/r;
+    invoke-virtual {v1}, Lorg/a/a/r;->IO()Lorg/a/a/r;
 
     move-result-object v1
 
-    iget-short v2, v1, Lorg/a/a/r;->bDW:S
+    iget-short v2, v1, Lorg/a/a/r;->bEq:S
 
     or-int/lit8 v2, v2, 0x2
 
     int-to-short v2, v2
 
-    iput-short v2, v1, Lorg/a/a/r;->bDW:S
+    iput-short v2, v1, Lorg/a/a/r;->bEq:S
 
     add-int/lit8 v0, v0, 0x1
 
@@ -931,13 +931,13 @@
 
     if-ne v1, v0, :cond_1
 
-    iget v1, p0, Lorg/a/a/u;->bEN:I
+    iget v1, p0, Lorg/a/a/u;->bFh:I
 
     sub-int/2addr v1, v0
 
-    iput v1, p0, Lorg/a/a/u;->bEN:I
+    iput v1, p0, Lorg/a/a/u;->bFh:I
 
-    iget v0, p0, Lorg/a/a/u;->bEN:I
+    iget v0, p0, Lorg/a/a/u;->bFh:I
 
     invoke-direct {p0, v0, p1}, Lorg/a/a/u;->c(ILorg/a/a/r;)V
 
@@ -948,7 +948,7 @@
 
     aget-object v0, p2, v3
 
-    iget v1, p0, Lorg/a/a/u;->bEN:I
+    iget v1, p0, Lorg/a/a/u;->bFh:I
 
     invoke-direct {p0, v1, v0}, Lorg/a/a/u;->c(ILorg/a/a/r;)V
 
@@ -957,25 +957,25 @@
     goto :goto_1
 
     :cond_1
-    invoke-direct {p0}, Lorg/a/a/u;->Jd()V
+    invoke-direct {p0}, Lorg/a/a/u;->IQ()V
 
     :cond_2
     return-void
 .end method
 
-.method private am(II)V
+.method private al(II)V
     .locals 3
 
     :goto_0
     if-ge p1, p2, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/u;->bES:[I
+    iget-object v1, p0, Lorg/a/a/u;->bFm:[I
 
     aget v1, v1, p1
 
-    iget-object v2, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     invoke-static {v0, v1, v2}, Lorg/a/a/o;->a(Lorg/a/a/z;ILorg/a/a/d;)V
 
@@ -994,7 +994,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     check-cast p1, Ljava/lang/Integer;
 
@@ -1002,7 +1002,7 @@
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     return-void
 
@@ -1011,15 +1011,15 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     const/4 v1, 0x7
 
-    invoke-virtual {v0, v1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v0, v1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v0
 
-    iget-object v2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     check-cast p1, Ljava/lang/String;
 
@@ -1029,24 +1029,24 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     const/16 v1, 0x8
 
-    invoke-virtual {v0, v1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v0, v1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v0
 
     check-cast p1, Lorg/a/a/r;
 
-    iget p1, p1, Lorg/a/a/r;->bDZ:I
+    iget p1, p1, Lorg/a/a/r;->bEt:I
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 .end method
@@ -1054,35 +1054,35 @@
 .method private c(ILorg/a/a/r;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     new-instance v1, Lorg/a/a/l;
 
-    iget-object v2, v0, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iget-object v2, v0, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
     invoke-direct {v1, p1, p2, v2}, Lorg/a/a/l;-><init>(ILorg/a/a/r;Lorg/a/a/l;)V
 
-    iput-object v1, v0, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iput-object v1, v0, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Jc()Lorg/a/a/a;
+.method public final IP()Lorg/a/a/a;
     .locals 5
 
     new-instance v0, Lorg/a/a/d;
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bFb:Lorg/a/a/d;
 
     new-instance v0, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object v2, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/u;->bFb:Lorg/a/a/d;
 
     const/4 v3, 0x0
 
@@ -1093,14 +1093,14 @@
     return-object v0
 .end method
 
-.method final Je()V
+.method final IR()V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/u;->bER:[I
+    iget-object v0, p0, Lorg/a/a/u;->bFl:[I
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -1108,25 +1108,25 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     :cond_0
-    invoke-direct {p0}, Lorg/a/a/u;->Jf()V
+    invoke-direct {p0}, Lorg/a/a/u;->IS()V
 
-    iget v0, p0, Lorg/a/a/u;->bEw:I
+    iget v0, p0, Lorg/a/a/u;->bEQ:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/u;->bEw:I
+    iput v0, p0, Lorg/a/a/u;->bEQ:I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/u;->bES:[I
+    iget-object v0, p0, Lorg/a/a/u;->bFm:[I
 
-    iput-object v0, p0, Lorg/a/a/u;->bER:[I
+    iput-object v0, p0, Lorg/a/a/u;->bFl:[I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lorg/a/a/u;->bES:[I
+    iput-object v0, p0, Lorg/a/a/u;->bFm:[I
 
     return-void
 .end method
@@ -1138,29 +1138,29 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iget-object v1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, p2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, p2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p2
 
-    invoke-virtual {v0, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p2
 
     const/4 v1, 0x0
 
-    invoke-virtual {p2, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p2, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     if-eqz p3, :cond_1
 
-    iget-object p2, p0, Lorg/a/a/u;->bEE:[Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/u;->bEY:[Lorg/a/a/b;
 
     if-nez p2, :cond_0
 
     iget-object p2, p0, Lorg/a/a/u;->descriptor:Ljava/lang/String;
 
-    invoke-static {p2}, Lorg/a/a/aa;->fc(Ljava/lang/String;)[Lorg/a/a/aa;
+    invoke-static {p2}, Lorg/a/a/aa;->eX(Ljava/lang/String;)[Lorg/a/a/aa;
 
     move-result-object p2
 
@@ -1168,14 +1168,14 @@
 
     new-array p2, p2, [Lorg/a/a/b;
 
-    iput-object p2, p0, Lorg/a/a/u;->bEE:[Lorg/a/a/b;
+    iput-object p2, p0, Lorg/a/a/u;->bEY:[Lorg/a/a/b;
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/u;->bEE:[Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/u;->bEY:[Lorg/a/a/b;
 
     new-instance p3, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     aget-object v2, p2, p1
 
@@ -1186,13 +1186,13 @@
     return-object p3
 
     :cond_1
-    iget-object p2, p0, Lorg/a/a/u;->bEG:[Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/u;->bFa:[Lorg/a/a/b;
 
     if-nez p2, :cond_2
 
     iget-object p2, p0, Lorg/a/a/u;->descriptor:Ljava/lang/String;
 
-    invoke-static {p2}, Lorg/a/a/aa;->fc(Ljava/lang/String;)[Lorg/a/a/aa;
+    invoke-static {p2}, Lorg/a/a/aa;->eX(Ljava/lang/String;)[Lorg/a/a/aa;
 
     move-result-object p2
 
@@ -1200,14 +1200,14 @@
 
     new-array p2, p2, [Lorg/a/a/b;
 
-    iput-object p2, p0, Lorg/a/a/u;->bEG:[Lorg/a/a/b;
+    iput-object p2, p0, Lorg/a/a/u;->bFa:[Lorg/a/a/b;
 
     :cond_2
-    iget-object p2, p0, Lorg/a/a/u;->bEG:[Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/u;->bFa:[Lorg/a/a/b;
 
     new-instance p3, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     aget-object v2, p2, p1
 
@@ -1229,44 +1229,44 @@
 
     invoke-static {p2, v0}, Lorg/a/a/ab;->a(Lorg/a/a/ab;Lorg/a/a/d;)V
 
-    iget-object p1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {p1, p3}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p1, p3}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     if-eqz p4, :cond_0
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bCV:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bDp:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, p3}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/u;->bCV:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bDp:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bCW:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bDq:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, p3}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/u;->bCW:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bDq:Lorg/a/a/b;
 
     return-object p1
 .end method
@@ -1280,13 +1280,13 @@
 
     ushr-int/lit8 p1, p1, 0x18
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object p1
 
     array-length v1, p3
 
-    invoke-virtual {p1, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     const/4 p1, 0x0
 
@@ -1299,29 +1299,29 @@
 
     aget-object v2, p3, v1
 
-    iget v2, v2, Lorg/a/a/r;->bDZ:I
+    iget v2, v2, Lorg/a/a/r;->bEt:I
 
-    invoke-virtual {v0, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
     aget-object v3, p4, v1
 
-    iget v3, v3, Lorg/a/a/r;->bDZ:I
+    iget v3, v3, Lorg/a/a/r;->bEt:I
 
     aget-object v4, p3, v1
 
-    iget v4, v4, Lorg/a/a/r;->bDZ:I
+    iget v4, v4, Lorg/a/a/r;->bEt:I
 
     sub-int/2addr v3, v4
 
-    invoke-virtual {v2, v3}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v3}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v2
 
     aget v3, p5, v1
 
-    invoke-virtual {v2, v3}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v2, v3}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     add-int/lit8 v1, v1, 0x1
 
@@ -1330,42 +1330,42 @@
     :cond_0
     invoke-static {p2, v0}, Lorg/a/a/ab;->a(Lorg/a/a/ab;Lorg/a/a/d;)V
 
-    iget-object p2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {p2, p6}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p2, p6}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p2
 
-    invoke-virtual {v0, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p2
 
-    invoke-virtual {p2, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p2, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     if-eqz p7, :cond_1
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bEy:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bES:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, p3}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/u;->bEy:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bES:Lorg/a/a/b;
 
     return-object p1
 
     :cond_1
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bEz:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bET:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, p3}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/u;->bEz:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bET:Lorg/a/a/b;
 
     return-object p1
 .end method
@@ -1373,21 +1373,21 @@
 .method public final varargs a(IILorg/a/a/r;[Lorg/a/a/r;)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bEV:I
+    iput v0, p0, Lorg/a/a/u;->bFp:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     const/16 v1, 0xaa
 
-    invoke-virtual {v0, v1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v0, v1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v0
 
-    iget-object v1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v1, v1, Lorg/a/a/d;->length:I
 
@@ -1403,21 +1403,21 @@
 
     invoke-virtual {v0, v3, v2, v1}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    iget v1, p0, Lorg/a/a/u;->bEV:I
+    iget v1, p0, Lorg/a/a/u;->bFp:I
 
     const/4 v3, 0x1
 
     invoke-virtual {p3, v0, v1, v3}, Lorg/a/a/r;->a(Lorg/a/a/d;IZ)V
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     array-length p1, p4
 
@@ -1426,9 +1426,9 @@
 
     aget-object p2, p4, v2
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    iget v1, p0, Lorg/a/a/u;->bEV:I
+    iget v1, p0, Lorg/a/a/u;->bFp:I
 
     invoke-virtual {p2, v0, v1, v3}, Lorg/a/a/r;->a(Lorg/a/a/d;IZ)V
 
@@ -1445,7 +1445,7 @@
 .method public final a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
     .locals 10
 
-    iget v0, p0, Lorg/a/a/u;->bDc:I
+    iget v0, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v1, 0x4
 
@@ -1466,35 +1466,35 @@
 
     if-ne v0, v4, :cond_d
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     if-nez v0, :cond_1
 
-    iget-object p1, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     new-instance p3, Lorg/a/a/k;
 
     invoke-direct {p3, p1}, Lorg/a/a/k;-><init>(Lorg/a/a/r;)V
 
-    iput-object p3, p1, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iput-object p3, p1, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget-object p1, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget-object p3, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p3, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget v0, p0, Lorg/a/a/u;->bCD:I
+    iget v0, p0, Lorg/a/a/u;->bCX:I
 
     iget-object v1, p0, Lorg/a/a/u;->descriptor:Ljava/lang/String;
 
     invoke-virtual {p1, p3, v0, v1, p2}, Lorg/a/a/o;->a(Lorg/a/a/z;ILjava/lang/String;I)V
 
-    iget-object p1, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     invoke-virtual {p1, p0}, Lorg/a/a/o;->a(Lorg/a/a/u;)V
 
@@ -1503,11 +1503,11 @@
     :cond_1
     if-ne p1, v2, :cond_c
 
-    iget-object p1, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const/4 v1, 0x0
 
@@ -1518,7 +1518,7 @@
 
     if-ge v1, p2, :cond_4
 
-    iget-object v7, p1, Lorg/a/a/o;->bDF:[I
+    iget-object v7, p1, Lorg/a/a/o;->bDZ:[I
 
     add-int/lit8 v8, v2, 0x1
 
@@ -1532,13 +1532,13 @@
 
     aget-object v2, p3, v1
 
-    sget-object v7, Lorg/a/a/x;->bFt:Ljava/lang/Integer;
+    sget-object v7, Lorg/a/a/x;->bFN:Ljava/lang/Integer;
 
     if-eq v2, v7, :cond_3
 
     aget-object v2, p3, v1
 
-    sget-object v7, Lorg/a/a/x;->bFs:Ljava/lang/Integer;
+    sget-object v7, Lorg/a/a/x;->bFM:Ljava/lang/Integer;
 
     if-ne v2, v7, :cond_2
 
@@ -1551,7 +1551,7 @@
 
     :cond_3
     :goto_1
-    iget-object v2, p1, Lorg/a/a/o;->bDF:[I
+    iget-object v2, p1, Lorg/a/a/o;->bDZ:[I
 
     add-int/lit8 v7, v8, 0x1
 
@@ -1566,13 +1566,13 @@
 
     :cond_4
     :goto_3
-    iget-object p2, p1, Lorg/a/a/o;->bDF:[I
+    iget-object p2, p1, Lorg/a/a/o;->bDZ:[I
 
     array-length p2, p2
 
     if-ge v2, p2, :cond_5
 
-    iget-object p2, p1, Lorg/a/a/o;->bDF:[I
+    iget-object p2, p1, Lorg/a/a/o;->bDZ:[I
 
     add-int/lit8 p3, v2, 0x1
 
@@ -1592,13 +1592,13 @@
 
     aget-object v1, p5, p2
 
-    sget-object v2, Lorg/a/a/x;->bFt:Ljava/lang/Integer;
+    sget-object v2, Lorg/a/a/x;->bFN:Ljava/lang/Integer;
 
     if-eq v1, v2, :cond_6
 
     aget-object v1, p5, p2
 
-    sget-object v2, Lorg/a/a/x;->bFs:Ljava/lang/Integer;
+    sget-object v2, Lorg/a/a/x;->bFM:Ljava/lang/Integer;
 
     if-ne v1, v2, :cond_7
 
@@ -1615,7 +1615,7 @@
 
     new-array p2, p3, [I
 
-    iput-object p2, p1, Lorg/a/a/o;->bDG:[I
+    iput-object p2, p1, Lorg/a/a/o;->bEa:[I
 
     const/4 p2, 0x0
 
@@ -1624,7 +1624,7 @@
     :goto_5
     if-ge p2, p4, :cond_b
 
-    iget-object v1, p1, Lorg/a/a/o;->bDG:[I
+    iget-object v1, p1, Lorg/a/a/o;->bEa:[I
 
     add-int/lit8 v2, p3, 0x1
 
@@ -1638,13 +1638,13 @@
 
     aget-object p3, p5, p2
 
-    sget-object v1, Lorg/a/a/x;->bFt:Ljava/lang/Integer;
+    sget-object v1, Lorg/a/a/x;->bFN:Ljava/lang/Integer;
 
     if-eq p3, v1, :cond_a
 
     aget-object p3, p5, p2
 
-    sget-object v1, Lorg/a/a/x;->bFs:Ljava/lang/Integer;
+    sget-object v1, Lorg/a/a/x;->bFM:Ljava/lang/Integer;
 
     if-ne p3, v1, :cond_9
 
@@ -1657,7 +1657,7 @@
 
     :cond_a
     :goto_6
-    iget-object p3, p1, Lorg/a/a/o;->bDG:[I
+    iget-object p3, p1, Lorg/a/a/o;->bEa:[I
 
     add-int/lit8 v1, v2, 0x1
 
@@ -1671,14 +1671,14 @@
     goto :goto_5
 
     :cond_b
-    iput-short v5, p1, Lorg/a/a/o;->bDK:S
+    iput-short v5, p1, Lorg/a/a/o;->bEe:S
 
-    iput v5, p1, Lorg/a/a/o;->bDL:I
+    iput v5, p1, Lorg/a/a/o;->bEf:I
 
     :cond_c
-    iget-object p1, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     invoke-virtual {p1, p0}, Lorg/a/a/o;->a(Lorg/a/a/u;)V
 
@@ -1687,13 +1687,13 @@
     :cond_d
     if-ne p1, v2, :cond_11
 
-    iget-object p1, p0, Lorg/a/a/u;->bER:[I
+    iget-object p1, p0, Lorg/a/a/u;->bFl:[I
 
     if-nez p1, :cond_e
 
     iget-object p1, p0, Lorg/a/a/u;->descriptor:Ljava/lang/String;
 
-    invoke-static {p1}, Lorg/a/a/aa;->fd(Ljava/lang/String;)I
+    invoke-static {p1}, Lorg/a/a/aa;->eY(Ljava/lang/String;)I
 
     move-result p1
 
@@ -1707,9 +1707,9 @@
 
     invoke-direct {v0, v1}, Lorg/a/a/o;-><init>(Lorg/a/a/r;)V
 
-    iget-object v1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget v2, p0, Lorg/a/a/u;->bCD:I
+    iget v2, p0, Lorg/a/a/u;->bCX:I
 
     iget-object v4, p0, Lorg/a/a/u;->descriptor:Ljava/lang/String;
 
@@ -1718,9 +1718,9 @@
     invoke-virtual {v0, p0}, Lorg/a/a/o;->a(Lorg/a/a/u;)V
 
     :cond_e
-    iput p2, p0, Lorg/a/a/u;->bEP:I
+    iput p2, p0, Lorg/a/a/u;->bFj:I
 
-    iget-object p1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget p1, p1, Lorg/a/a/d;->length:I
 
@@ -1735,11 +1735,11 @@
     :goto_8
     if-ge p1, p2, :cond_f
 
-    iget-object v1, p0, Lorg/a/a/u;->bES:[I
+    iget-object v1, p0, Lorg/a/a/u;->bFm:[I
 
     add-int/lit8 v2, v0, 0x1
 
-    iget-object v4, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     aget-object v7, p3, p1
 
@@ -1761,11 +1761,11 @@
     :goto_9
     if-ge p1, p4, :cond_10
 
-    iget-object p2, p0, Lorg/a/a/u;->bES:[I
+    iget-object p2, p0, Lorg/a/a/u;->bFm:[I
 
     add-int/lit8 p3, v0, 0x1
 
-    iget-object v1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     aget-object v2, p5, p1
 
@@ -1782,12 +1782,12 @@
     goto :goto_9
 
     :cond_10
-    invoke-virtual {p0}, Lorg/a/a/u;->Je()V
+    invoke-virtual {p0}, Lorg/a/a/u;->IR()V
 
     goto/16 :goto_10
 
     :cond_11
-    iget-object v0, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     if-nez v0, :cond_12
 
@@ -1795,20 +1795,20 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
     goto :goto_a
 
     :cond_12
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iget v2, p0, Lorg/a/a/u;->bEQ:I
+    iget v2, p0, Lorg/a/a/u;->bFk:I
 
     sub-int/2addr v0, v2
 
@@ -1845,24 +1845,24 @@
 
     if-ge v0, p2, :cond_15
 
-    iget-object p1, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     add-int/2addr v0, p2
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     goto :goto_b
 
     :cond_15
-    iget-object p1, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     const/16 p2, 0xf7
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :goto_b
     aget-object p1, p5, v5
@@ -1881,58 +1881,58 @@
     :cond_17
     if-ge v0, p2, :cond_18
 
-    iget-object p1, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     goto :goto_f
 
     :cond_18
-    iget-object p1, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
-    invoke-virtual {p1, p3}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, p3}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     goto :goto_f
 
     :cond_19
-    iget p1, p0, Lorg/a/a/u;->bEP:I
+    iget p1, p0, Lorg/a/a/u;->bFj:I
 
     sub-int/2addr p1, p2
 
-    iput p1, p0, Lorg/a/a/u;->bEP:I
+    iput p1, p0, Lorg/a/a/u;->bFj:I
 
-    iget-object p1, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     sub-int/2addr p3, p2
 
-    invoke-virtual {p1, p3}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, p3}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     goto :goto_f
 
     :cond_1a
-    iget p1, p0, Lorg/a/a/u;->bEP:I
+    iget p1, p0, Lorg/a/a/u;->bFj:I
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lorg/a/a/u;->bEP:I
+    iput p1, p0, Lorg/a/a/u;->bFj:I
 
-    iget-object p1, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     add-int/lit16 v1, p2, 0xfb
 
-    invoke-virtual {p1, v1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, v1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     const/4 p1, 0x0
 
@@ -1948,21 +1948,21 @@
     goto :goto_c
 
     :cond_1b
-    iput p2, p0, Lorg/a/a/u;->bEP:I
+    iput p2, p0, Lorg/a/a/u;->bFj:I
 
-    iget-object p1, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
     const/16 v1, 0xff
 
-    invoke-virtual {p1, v1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, v1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     const/4 p1, 0x0
 
@@ -1978,9 +1978,9 @@
     goto :goto_d
 
     :cond_1c
-    iget-object p1, p0, Lorg/a/a/u;->bEx:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bER:Lorg/a/a/d;
 
-    invoke-virtual {p1, p4}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p4}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     const/4 p1, 0x0
 
@@ -1997,46 +1997,46 @@
 
     :cond_1d
     :goto_f
-    iget-object p1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget p1, p1, Lorg/a/a/d;->length:I
 
-    iput p1, p0, Lorg/a/a/u;->bEQ:I
+    iput p1, p0, Lorg/a/a/u;->bFk:I
 
-    iget p1, p0, Lorg/a/a/u;->bEw:I
+    iget p1, p0, Lorg/a/a/u;->bEQ:I
 
     add-int/2addr p1, v6
 
-    iput p1, p0, Lorg/a/a/u;->bEw:I
+    iput p1, p0, Lorg/a/a/u;->bEQ:I
 
     :goto_10
-    iget p1, p0, Lorg/a/a/u;->bDc:I
+    iget p1, p0, Lorg/a/a/u;->bDw:I
 
     if-ne p1, v3, :cond_21
 
-    iput p4, p0, Lorg/a/a/u;->bEN:I
+    iput p4, p0, Lorg/a/a/u;->bFh:I
 
     :goto_11
     if-ge v5, p4, :cond_20
 
     aget-object p1, p5, v5
 
-    sget-object p2, Lorg/a/a/x;->bFt:Ljava/lang/Integer;
+    sget-object p2, Lorg/a/a/x;->bFN:Ljava/lang/Integer;
 
     if-eq p1, p2, :cond_1e
 
     aget-object p1, p5, v5
 
-    sget-object p2, Lorg/a/a/x;->bFs:Ljava/lang/Integer;
+    sget-object p2, Lorg/a/a/x;->bFM:Ljava/lang/Integer;
 
     if-ne p1, p2, :cond_1f
 
     :cond_1e
-    iget p1, p0, Lorg/a/a/u;->bEN:I
+    iget p1, p0, Lorg/a/a/u;->bFh:I
 
     add-int/2addr p1, v6
 
-    iput p1, p0, Lorg/a/a/u;->bEN:I
+    iput p1, p0, Lorg/a/a/u;->bFh:I
 
     :cond_1f
     add-int/lit8 v5, v5, 0x1
@@ -2044,32 +2044,32 @@
     goto :goto_11
 
     :cond_20
-    iget p1, p0, Lorg/a/a/u;->bEN:I
+    iget p1, p0, Lorg/a/a/u;->bFh:I
 
-    iget p2, p0, Lorg/a/a/u;->bEO:I
+    iget p2, p0, Lorg/a/a/u;->bFi:I
 
     if-le p1, p2, :cond_21
 
-    iput p1, p0, Lorg/a/a/u;->bEO:I
+    iput p1, p0, Lorg/a/a/u;->bFi:I
 
     :cond_21
-    iget p1, p0, Lorg/a/a/u;->bEl:I
+    iget p1, p0, Lorg/a/a/u;->bEF:I
 
     invoke-static {p1, p4}, Ljava/lang/Math;->max(II)I
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/u;->bEl:I
+    iput p1, p0, Lorg/a/a/u;->bEF:I
 
-    iget p1, p0, Lorg/a/a/u;->bEm:I
+    iget p1, p0, Lorg/a/a/u;->bEG:I
 
-    iget p2, p0, Lorg/a/a/u;->bEP:I
+    iget p2, p0, Lorg/a/a/u;->bFj:I
 
     invoke-static {p1, p2}, Ljava/lang/Math;->max(II)I
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/u;->bEm:I
+    iput p1, p0, Lorg/a/a/u;->bEG:I
 
     return-void
 .end method
@@ -2077,29 +2077,29 @@
 .method public final a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bEV:I
+    iput v0, p0, Lorg/a/a/u;->bFp:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v0, p2, p3, p4}, Lorg/a/a/z;->n(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/y;
 
     move-result-object p2
 
-    iget-object p3, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p3, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, p2, Lorg/a/a/y;->index:I
 
-    invoke-virtual {p3, p1, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p3, p1, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
-    iget-object p3, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object p3, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz p3, :cond_9
 
-    iget p3, p0, Lorg/a/a/u;->bDc:I
+    iget p3, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v0, 0x4
 
@@ -2128,7 +2128,7 @@
 
     packed-switch p1, :pswitch_data_0
 
-    iget p1, p0, Lorg/a/a/u;->bEN:I
+    iget p1, p0, Lorg/a/a/u;->bFh:I
 
     if-eq p2, v2, :cond_5
 
@@ -2137,7 +2137,7 @@
     goto :goto_1
 
     :pswitch_0
-    iget p1, p0, Lorg/a/a/u;->bEN:I
+    iget p1, p0, Lorg/a/a/u;->bFh:I
 
     if-eq p2, v2, :cond_4
 
@@ -2151,7 +2151,7 @@
     goto :goto_0
 
     :pswitch_1
-    iget p1, p0, Lorg/a/a/u;->bEN:I
+    iget p1, p0, Lorg/a/a/u;->bFh:I
 
     if-eq p2, v2, :cond_6
 
@@ -2165,7 +2165,7 @@
     goto :goto_2
 
     :pswitch_2
-    iget p1, p0, Lorg/a/a/u;->bEN:I
+    iget p1, p0, Lorg/a/a/u;->bFh:I
 
     if-eq p2, v2, :cond_3
 
@@ -2189,24 +2189,24 @@
     add-int/2addr p1, p4
 
     :goto_3
-    iget p2, p0, Lorg/a/a/u;->bEO:I
+    iget p2, p0, Lorg/a/a/u;->bFi:I
 
     if-le p1, p2, :cond_7
 
-    iput p1, p0, Lorg/a/a/u;->bEO:I
+    iput p1, p0, Lorg/a/a/u;->bFi:I
 
     :cond_7
-    iput p1, p0, Lorg/a/a/u;->bEN:I
+    iput p1, p0, Lorg/a/a/u;->bFh:I
 
     goto :goto_5
 
     :cond_8
     :goto_4
-    iget-object p3, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object p3, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object p3, p3, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object p3, p3, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget-object p4, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p4, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {p3, p1, v1, p2, p4}, Lorg/a/a/o;->a(IILorg/a/a/y;Lorg/a/a/z;)V
 
@@ -2227,13 +2227,13 @@
 .method public final a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bEV:I
+    iput v0, p0, Lorg/a/a/u;->bFp:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v0, p2, p3, p4, p5}, Lorg/a/a/z;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lorg/a/a/y;
 
@@ -2245,37 +2245,37 @@
 
     if-ne p1, p4, :cond_0
 
-    iget-object p5, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p5, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, p2, Lorg/a/a/y;->index:I
 
-    invoke-virtual {p5, p4, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p5, p4, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     move-result-object p4
 
-    invoke-virtual {p2}, Lorg/a/a/y;->Jg()I
+    invoke-virtual {p2}, Lorg/a/a/y;->IT()I
 
     move-result p5
 
     shr-int/lit8 p5, p5, 0x2
 
-    invoke-virtual {p4, p5, p3}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
+    invoke-virtual {p4, p5, p3}, Lorg/a/a/d;->ad(II)Lorg/a/a/d;
 
     goto :goto_0
 
     :cond_0
-    iget-object p4, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p4, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget p5, p2, Lorg/a/a/y;->index:I
 
-    invoke-virtual {p4, p1, p5}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p4, p1, p5}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     :goto_0
-    iget-object p4, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object p4, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz p4, :cond_5
 
-    iget p4, p0, Lorg/a/a/u;->bDc:I
+    iget p4, p0, Lorg/a/a/u;->bDw:I
 
     const/4 p5, 0x4
 
@@ -2288,7 +2288,7 @@
     goto :goto_2
 
     :cond_1
-    invoke-virtual {p2}, Lorg/a/a/y;->Jg()I
+    invoke-virtual {p2}, Lorg/a/a/y;->IT()I
 
     move-result p2
 
@@ -2302,7 +2302,7 @@
 
     if-ne p1, p2, :cond_2
 
-    iget p1, p0, Lorg/a/a/u;->bEN:I
+    iget p1, p0, Lorg/a/a/u;->bFh:I
 
     add-int/2addr p1, p3
 
@@ -2311,29 +2311,29 @@
     goto :goto_1
 
     :cond_2
-    iget p1, p0, Lorg/a/a/u;->bEN:I
+    iget p1, p0, Lorg/a/a/u;->bFh:I
 
     add-int/2addr p1, p3
 
     :goto_1
-    iget p2, p0, Lorg/a/a/u;->bEO:I
+    iget p2, p0, Lorg/a/a/u;->bFi:I
 
     if-le p1, p2, :cond_3
 
-    iput p1, p0, Lorg/a/a/u;->bEO:I
+    iput p1, p0, Lorg/a/a/u;->bFi:I
 
     :cond_3
-    iput p1, p0, Lorg/a/a/u;->bEN:I
+    iput p1, p0, Lorg/a/a/u;->bFh:I
 
     goto :goto_3
 
     :cond_4
     :goto_2
-    iget-object p4, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object p4, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object p4, p4, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object p4, p4, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget-object p5, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p5, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {p4, p1, p3, p2, p5}, Lorg/a/a/o;->a(IILorg/a/a/y;Lorg/a/a/z;)V
 
@@ -2345,11 +2345,11 @@
 .method public final a(ILorg/a/a/r;)V
     .locals 10
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bEV:I
+    iput v0, p0, Lorg/a/a/u;->bFp:I
 
     const/16 v0, 0xc8
 
@@ -2363,7 +2363,7 @@
     move v1, p1
 
     :goto_0
-    iget-short v2, p2, Lorg/a/a/r;->bDW:S
+    iget-short v2, p2, Lorg/a/a/r;->bEq:S
 
     const/4 v3, 0x4
 
@@ -2379,9 +2379,9 @@
 
     if-eqz v2, :cond_4
 
-    iget v2, p2, Lorg/a/a/r;->bDZ:I
+    iget v2, p2, Lorg/a/a/r;->bEt:I
 
-    iget-object v8, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v8, v8, Lorg/a/a/d;->length:I
 
@@ -2393,20 +2393,20 @@
 
     if-ne v1, v5, :cond_1
 
-    iget-object p1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     goto :goto_1
 
     :cond_1
     if-ne v1, v4, :cond_2
 
-    iget-object p1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     const/16 v0, 0xc9
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     :goto_1
     const/4 p1, 0x0
@@ -2414,7 +2414,7 @@
     goto :goto_3
 
     :cond_2
-    iget-object p1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     const/16 v0, 0xc6
 
@@ -2432,26 +2432,26 @@
     sub-int/2addr v0, v7
 
     :goto_2
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
-    iget-object p1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     const/16 v0, 0x8
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object p1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     const/16 v0, 0xdc
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
-    iput-boolean v7, p0, Lorg/a/a/u;->bEU:Z
+    iput-boolean v7, p0, Lorg/a/a/u;->bFo:Z
 
     const/4 p1, 0x1
 
     :goto_3
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v2, v0, Lorg/a/a/d;->length:I
 
@@ -2464,11 +2464,11 @@
     :cond_4
     if-eq v1, p1, :cond_5
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
-    iget-object p1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, p1, Lorg/a/a/d;->length:I
 
@@ -2479,11 +2479,11 @@
     goto :goto_4
 
     :cond_5
-    iget-object p1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    invoke-virtual {p1, v1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {p1, v1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
-    iget-object p1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, p1, Lorg/a/a/d;->length:I
 
@@ -2495,11 +2495,11 @@
     const/4 p1, 0x0
 
     :goto_5
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz v0, :cond_e
 
-    iget v2, p0, Lorg/a/a/u;->bDc:I
+    iget v2, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v8, 0x2
 
@@ -2507,21 +2507,21 @@
 
     if-ne v2, v3, :cond_6
 
-    iget-object v0, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     invoke-virtual {v0, v1, v6, v9, v9}, Lorg/a/a/o;->a(IILorg/a/a/y;Lorg/a/a/z;)V
 
-    invoke-virtual {p2}, Lorg/a/a/r;->Jb()Lorg/a/a/r;
+    invoke-virtual {p2}, Lorg/a/a/r;->IO()Lorg/a/a/r;
 
     move-result-object v0
 
-    iget-short v2, v0, Lorg/a/a/r;->bDW:S
+    iget-short v2, v0, Lorg/a/a/r;->bEq:S
 
     or-int/2addr v2, v8
 
     int-to-short v2, v2
 
-    iput-short v2, v0, Lorg/a/a/r;->bDW:S
+    iput-short v2, v0, Lorg/a/a/r;->bEq:S
 
     invoke-direct {p0, v6, p2}, Lorg/a/a/u;->c(ILorg/a/a/r;)V
 
@@ -2538,7 +2538,7 @@
 
     if-ne v2, v3, :cond_7
 
-    iget-object p2, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object p2, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     invoke-virtual {p2, v1, v6, v9, v9}, Lorg/a/a/o;->a(IILorg/a/a/y;Lorg/a/a/z;)V
 
@@ -2547,49 +2547,49 @@
     :cond_7
     if-ne v2, v8, :cond_8
 
-    iget p2, p0, Lorg/a/a/u;->bEN:I
+    iget p2, p0, Lorg/a/a/u;->bFh:I
 
-    sget-object v0, Lorg/a/a/u;->bEk:[I
+    sget-object v0, Lorg/a/a/u;->bEE:[I
 
     aget v0, v0, v1
 
     add-int/2addr p2, v0
 
-    iput p2, p0, Lorg/a/a/u;->bEN:I
+    iput p2, p0, Lorg/a/a/u;->bFh:I
 
     goto :goto_6
 
     :cond_8
     if-ne v1, v4, :cond_a
 
-    iget-short v0, p2, Lorg/a/a/r;->bDW:S
+    iget-short v0, p2, Lorg/a/a/r;->bEq:S
 
     and-int/lit8 v0, v0, 0x20
 
     if-nez v0, :cond_9
 
-    iget-short v0, p2, Lorg/a/a/r;->bDW:S
+    iget-short v0, p2, Lorg/a/a/r;->bEq:S
 
     or-int/lit8 v0, v0, 0x20
 
     int-to-short v0, v0
 
-    iput-short v0, p2, Lorg/a/a/r;->bDW:S
+    iput-short v0, p2, Lorg/a/a/r;->bEq:S
 
-    iput-boolean v7, p0, Lorg/a/a/u;->bET:Z
+    iput-boolean v7, p0, Lorg/a/a/u;->bFn:Z
 
     :cond_9
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-short v2, v0, Lorg/a/a/r;->bDW:S
+    iget-short v2, v0, Lorg/a/a/r;->bEq:S
 
     or-int/lit8 v2, v2, 0x10
 
     int-to-short v2, v2
 
-    iput-short v2, v0, Lorg/a/a/r;->bDW:S
+    iput-short v2, v0, Lorg/a/a/r;->bEq:S
 
-    iget v0, p0, Lorg/a/a/u;->bEN:I
+    iget v0, p0, Lorg/a/a/u;->bFh:I
 
     add-int/2addr v0, v7
 
@@ -2602,17 +2602,17 @@
     goto :goto_6
 
     :cond_a
-    iget v0, p0, Lorg/a/a/u;->bEN:I
+    iget v0, p0, Lorg/a/a/u;->bFh:I
 
-    sget-object v2, Lorg/a/a/u;->bEk:[I
+    sget-object v2, Lorg/a/a/u;->bEE:[I
 
     aget v2, v2, v1
 
     add-int/2addr v0, v2
 
-    iput v0, p0, Lorg/a/a/u;->bEN:I
+    iput v0, p0, Lorg/a/a/u;->bFh:I
 
-    iget v0, p0, Lorg/a/a/u;->bEN:I
+    iget v0, p0, Lorg/a/a/u;->bFh:I
 
     invoke-direct {p0, v0, p2}, Lorg/a/a/u;->c(ILorg/a/a/r;)V
 
@@ -2622,13 +2622,13 @@
 
     if-eqz p1, :cond_c
 
-    iget-short p1, v9, Lorg/a/a/r;->bDW:S
+    iget-short p1, v9, Lorg/a/a/r;->bEq:S
 
     or-int/2addr p1, v8
 
     int-to-short p1, p1
 
-    iput-short p1, v9, Lorg/a/a/r;->bDW:S
+    iput-short p1, v9, Lorg/a/a/r;->bEq:S
 
     :cond_c
     invoke-virtual {p0, v9}, Lorg/a/a/u;->b(Lorg/a/a/r;)V
@@ -2636,7 +2636,7 @@
     :cond_d
     if-ne v1, v5, :cond_e
 
-    invoke-direct {p0}, Lorg/a/a/u;->Jd()V
+    invoke-direct {p0}, Lorg/a/a/u;->IQ()V
 
     :cond_e
     return-void
@@ -2649,7 +2649,7 @@
 
     if-eqz p3, :cond_1
 
-    iget-object v1, p0, Lorg/a/a/u;->bEv:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bEP:Lorg/a/a/d;
 
     if-nez v1, :cond_0
 
@@ -2657,57 +2657,57 @@
 
     invoke-direct {v1}, Lorg/a/a/d;-><init>()V
 
-    iput-object v1, p0, Lorg/a/a/u;->bEv:Lorg/a/a/d;
+    iput-object v1, p0, Lorg/a/a/u;->bEP:Lorg/a/a/d;
 
     :cond_0
-    iget v1, p0, Lorg/a/a/u;->bEu:I
+    iget v1, p0, Lorg/a/a/u;->bEO:I
 
     add-int/2addr v1, v0
 
-    iput v1, p0, Lorg/a/a/u;->bEu:I
+    iput v1, p0, Lorg/a/a/u;->bEO:I
 
-    iget-object v1, p0, Lorg/a/a/u;->bEv:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bEP:Lorg/a/a/d;
 
-    iget v2, p4, Lorg/a/a/r;->bDZ:I
+    iget v2, p4, Lorg/a/a/r;->bEt:I
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget v2, p5, Lorg/a/a/r;->bDZ:I
+    iget v2, p5, Lorg/a/a/r;->bEt:I
 
-    iget v3, p4, Lorg/a/a/r;->bDZ:I
+    iget v3, p4, Lorg/a/a/r;->bEt:I
 
     sub-int/2addr v2, v3
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget-object v2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v2, p1}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v2, p1}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v2
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget-object v2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v2, p3}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v2, p3}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p3
 
-    invoke-virtual {v1, p3}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, p3}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p3
 
-    invoke-virtual {p3, p6}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p3, p6}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :cond_1
-    iget-object p3, p0, Lorg/a/a/u;->bEt:Lorg/a/a/d;
+    iget-object p3, p0, Lorg/a/a/u;->bEN:Lorg/a/a/d;
 
     if-nez p3, :cond_2
 
@@ -2715,56 +2715,56 @@
 
     invoke-direct {p3}, Lorg/a/a/d;-><init>()V
 
-    iput-object p3, p0, Lorg/a/a/u;->bEt:Lorg/a/a/d;
+    iput-object p3, p0, Lorg/a/a/u;->bEN:Lorg/a/a/d;
 
     :cond_2
-    iget p3, p0, Lorg/a/a/u;->bEs:I
+    iget p3, p0, Lorg/a/a/u;->bEM:I
 
     add-int/2addr p3, v0
 
-    iput p3, p0, Lorg/a/a/u;->bEs:I
+    iput p3, p0, Lorg/a/a/u;->bEM:I
 
-    iget-object p3, p0, Lorg/a/a/u;->bEt:Lorg/a/a/d;
+    iget-object p3, p0, Lorg/a/a/u;->bEN:Lorg/a/a/d;
 
-    iget v1, p4, Lorg/a/a/r;->bDZ:I
+    iget v1, p4, Lorg/a/a/r;->bEt:I
 
-    invoke-virtual {p3, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p3, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p3
 
-    iget p5, p5, Lorg/a/a/r;->bDZ:I
+    iget p5, p5, Lorg/a/a/r;->bEt:I
 
-    iget p4, p4, Lorg/a/a/r;->bDZ:I
+    iget p4, p4, Lorg/a/a/r;->bEt:I
 
     sub-int/2addr p5, p4
 
-    invoke-virtual {p3, p5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p3, p5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p3
 
-    iget-object p4, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p4, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {p4, p1}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p4, p1}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    invoke-virtual {p3, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p3, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    iget-object p3, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p3, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {p3, p2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p3, p2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p3
 
-    invoke-virtual {p1, p3}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p3}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    invoke-virtual {p1, p6}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p6}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget p1, p0, Lorg/a/a/u;->bDc:I
+    iget p1, p0, Lorg/a/a/u;->bDw:I
 
     if-eqz p1, :cond_5
 
@@ -2788,11 +2788,11 @@
     :cond_4
     add-int/2addr p6, v0
 
-    iget p1, p0, Lorg/a/a/u;->bEm:I
+    iget p1, p0, Lorg/a/a/u;->bEG:I
 
     if-le p6, p1, :cond_5
 
-    iput p6, p0, Lorg/a/a/u;->bEm:I
+    iput p6, p0, Lorg/a/a/u;->bEG:I
 
     :cond_5
     return-void
@@ -2801,13 +2801,13 @@
 .method public final varargs a(Ljava/lang/String;Ljava/lang/String;Lorg/a/a/p;[Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bEV:I
+    iput v0, p0, Lorg/a/a/u;->bFp:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v0, p3, p4}, Lorg/a/a/z;->a(Lorg/a/a/p;[Ljava/lang/Object;)Lorg/a/a/y;
 
@@ -2821,25 +2821,25 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget p3, p1, Lorg/a/a/y;->index:I
 
     const/16 p4, 0xba
 
-    invoke-virtual {p2, p4, p3}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {p2, p4, p3}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     const/4 p3, 0x0
 
-    invoke-virtual {p2, p3}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p2, p3}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object p2, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz p2, :cond_3
 
-    iget p2, p0, Lorg/a/a/u;->bDc:I
+    iget p2, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v0, 0x4
 
@@ -2852,7 +2852,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p1}, Lorg/a/a/y;->Jg()I
+    invoke-virtual {p1}, Lorg/a/a/y;->IT()I
 
     move-result p1
 
@@ -2864,28 +2864,28 @@
 
     add-int/lit8 p2, p2, 0x1
 
-    iget p1, p0, Lorg/a/a/u;->bEN:I
+    iget p1, p0, Lorg/a/a/u;->bFh:I
 
     add-int/2addr p1, p2
 
-    iget p2, p0, Lorg/a/a/u;->bEO:I
+    iget p2, p0, Lorg/a/a/u;->bFi:I
 
     if-le p1, p2, :cond_1
 
-    iput p1, p0, Lorg/a/a/u;->bEO:I
+    iput p1, p0, Lorg/a/a/u;->bFi:I
 
     :cond_1
-    iput p1, p0, Lorg/a/a/u;->bEN:I
+    iput p1, p0, Lorg/a/a/u;->bFh:I
 
     goto :goto_1
 
     :cond_2
     :goto_0
-    iget-object p2, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object p2, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object p2, p2, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object p2, p2, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {p2, p4, p3, p1, v0}, Lorg/a/a/o;->a(IILorg/a/a/y;Lorg/a/a/z;)V
 
@@ -2901,9 +2901,9 @@
 
     if-eqz p4, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v0, p4}, Lorg/a/a/z;->eW(Ljava/lang/String;)Lorg/a/a/y;
+    invoke-virtual {v0, p4}, Lorg/a/a/z;->eR(Ljava/lang/String;)Lorg/a/a/y;
 
     move-result-object v0
 
@@ -2931,21 +2931,21 @@
 
     invoke-direct/range {v0 .. v5}, Lorg/a/a/q;-><init>(Lorg/a/a/r;Lorg/a/a/r;Lorg/a/a/r;ILjava/lang/String;)V
 
-    iget-object p1, p0, Lorg/a/a/u;->bEo:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bEI:Lorg/a/a/q;
 
     if-nez p1, :cond_1
 
-    iput-object v6, p0, Lorg/a/a/u;->bEo:Lorg/a/a/q;
+    iput-object v6, p0, Lorg/a/a/u;->bEI:Lorg/a/a/q;
 
     goto :goto_1
 
     :cond_1
-    iget-object p1, p0, Lorg/a/a/u;->bEp:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bEJ:Lorg/a/a/q;
 
-    iput-object v6, p1, Lorg/a/a/q;->bDU:Lorg/a/a/q;
+    iput-object v6, p1, Lorg/a/a/q;->bEo:Lorg/a/a/q;
 
     :goto_1
-    iput-object v6, p0, Lorg/a/a/u;->bEp:Lorg/a/a/q;
+    iput-object v6, p0, Lorg/a/a/u;->bEJ:Lorg/a/a/q;
 
     return-void
 .end method
@@ -2953,21 +2953,21 @@
 .method public final a(Lorg/a/a/r;[I[Lorg/a/a/r;)V
     .locals 5
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bEV:I
+    iput v0, p0, Lorg/a/a/u;->bFp:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     const/16 v1, 0xab
 
-    invoke-virtual {v0, v1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v0, v1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v0
 
-    iget-object v1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v1, v1, Lorg/a/a/d;->length:I
 
@@ -2983,36 +2983,36 @@
 
     invoke-virtual {v0, v3, v2, v1}, Lorg/a/a/d;->o([BII)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    iget v1, p0, Lorg/a/a/u;->bEV:I
+    iget v1, p0, Lorg/a/a/u;->bFp:I
 
     const/4 v3, 0x1
 
     invoke-virtual {p1, v0, v1, v3}, Lorg/a/a/r;->a(Lorg/a/a/d;IZ)V
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     array-length v1, p3
 
-    invoke-virtual {v0, v1}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v0, v1}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     :goto_0
     array-length v0, p3
 
     if-ge v2, v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     aget v1, p2, v2
 
-    invoke-virtual {v0, v1}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v0, v1}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     aget-object v0, p3, v2
 
-    iget-object v1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    iget v4, p0, Lorg/a/a/u;->bEV:I
+    iget v4, p0, Lorg/a/a/u;->bFp:I
 
     invoke-virtual {v0, v1, v4, v3}, Lorg/a/a/r;->a(Lorg/a/a/d;IZ)V
 
@@ -3026,36 +3026,36 @@
     return-void
 .end method
 
-.method public final ai(II)V
+.method public final ah(II)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bEV:I
+    iput v0, p0, Lorg/a/a/u;->bFp:I
 
     const/16 v0, 0x11
 
     if-ne p1, v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    invoke-virtual {v0, p1, p2}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v0, p1, p2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    invoke-virtual {v0, p1, p2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
+    invoke-virtual {v0, p1, p2}, Lorg/a/a/d;->ad(II)Lorg/a/a/d;
 
     :goto_0
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz v0, :cond_4
 
-    iget v0, p0, Lorg/a/a/u;->bDc:I
+    iget v0, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v1, 0x4
 
@@ -3072,26 +3072,26 @@
 
     if-eq p1, p2, :cond_4
 
-    iget p1, p0, Lorg/a/a/u;->bEN:I
+    iget p1, p0, Lorg/a/a/u;->bFh:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iget p2, p0, Lorg/a/a/u;->bEO:I
+    iget p2, p0, Lorg/a/a/u;->bFi:I
 
     if-le p1, p2, :cond_2
 
-    iput p1, p0, Lorg/a/a/u;->bEO:I
+    iput p1, p0, Lorg/a/a/u;->bFi:I
 
     :cond_2
-    iput p1, p0, Lorg/a/a/u;->bEN:I
+    iput p1, p0, Lorg/a/a/u;->bFh:I
 
     goto :goto_2
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     const/4 v1, 0x0
 
@@ -3102,14 +3102,14 @@
     return-void
 .end method
 
-.method public final aj(II)V
+.method public final ai(II)V
     .locals 6
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bEV:I
+    iput v0, p0, Lorg/a/a/u;->bFp:I
 
     const/16 v0, 0xa9
 
@@ -3141,9 +3141,9 @@
     :goto_0
     add-int/2addr v3, p2
 
-    iget-object v4, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v4, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    invoke-virtual {v4, v3}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v4, v3}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     goto :goto_1
 
@@ -3152,29 +3152,29 @@
 
     if-lt p2, v3, :cond_2
 
-    iget-object v3, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     const/16 v4, 0xc4
 
-    invoke-virtual {v3, v4}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v3, v4}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v3
 
-    invoke-virtual {v3, p1, p2}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v3, p1, p2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     goto :goto_1
 
     :cond_2
-    iget-object v3, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    invoke-virtual {v3, p1, p2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
+    invoke-virtual {v3, p1, p2}, Lorg/a/a/d;->ad(II)Lorg/a/a/d;
 
     :goto_1
-    iget-object v3, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v3, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz v3, :cond_7
 
-    iget v4, p0, Lorg/a/a/u;->bDc:I
+    iget v4, p0, Lorg/a/a/u;->bDw:I
 
     if-eq v4, v2, :cond_6
 
@@ -3187,51 +3187,51 @@
     :cond_3
     if-ne p1, v0, :cond_4
 
-    iget-short v0, v3, Lorg/a/a/r;->bDW:S
+    iget-short v0, v3, Lorg/a/a/r;->bEq:S
 
     or-int/lit8 v0, v0, 0x40
 
     int-to-short v0, v0
 
-    iput-short v0, v3, Lorg/a/a/r;->bDW:S
+    iput-short v0, v3, Lorg/a/a/r;->bEq:S
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget v3, p0, Lorg/a/a/u;->bEN:I
+    iget v3, p0, Lorg/a/a/u;->bFh:I
 
     int-to-short v3, v3
 
-    iput-short v3, v0, Lorg/a/a/r;->bEc:S
+    iput-short v3, v0, Lorg/a/a/r;->bEw:S
 
-    invoke-direct {p0}, Lorg/a/a/u;->Jd()V
+    invoke-direct {p0}, Lorg/a/a/u;->IQ()V
 
     goto :goto_3
 
     :cond_4
-    iget v0, p0, Lorg/a/a/u;->bEN:I
+    iget v0, p0, Lorg/a/a/u;->bFh:I
 
-    sget-object v3, Lorg/a/a/u;->bEk:[I
+    sget-object v3, Lorg/a/a/u;->bEE:[I
 
     aget v3, v3, p1
 
     add-int/2addr v0, v3
 
-    iget v3, p0, Lorg/a/a/u;->bEO:I
+    iget v3, p0, Lorg/a/a/u;->bFi:I
 
     if-le v0, v3, :cond_5
 
-    iput v0, p0, Lorg/a/a/u;->bEO:I
+    iput v0, p0, Lorg/a/a/u;->bFi:I
 
     :cond_5
-    iput v0, p0, Lorg/a/a/u;->bEN:I
+    iput v0, p0, Lorg/a/a/u;->bFh:I
 
     goto :goto_3
 
     :cond_6
     :goto_2
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     const/4 v3, 0x0
 
@@ -3239,7 +3239,7 @@
 
     :cond_7
     :goto_3
-    iget v0, p0, Lorg/a/a/u;->bDc:I
+    iget v0, p0, Lorg/a/a/u;->bDw:I
 
     if-eqz v0, :cond_a
 
@@ -3271,20 +3271,20 @@
     add-int/lit8 p2, p2, 0x2
 
     :goto_5
-    iget v0, p0, Lorg/a/a/u;->bEm:I
+    iget v0, p0, Lorg/a/a/u;->bEG:I
 
     if-le p2, v0, :cond_a
 
-    iput p2, p0, Lorg/a/a/u;->bEm:I
+    iput p2, p0, Lorg/a/a/u;->bEG:I
 
     :cond_a
     if-lt p1, v1, :cond_b
 
-    iget p1, p0, Lorg/a/a/u;->bDc:I
+    iget p1, p0, Lorg/a/a/u;->bDw:I
 
     if-ne p1, v2, :cond_b
 
-    iget-object p1, p0, Lorg/a/a/u;->bEo:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bEI:Lorg/a/a/q;
 
     if-eqz p1, :cond_b
 
@@ -3298,14 +3298,14 @@
     return-void
 .end method
 
-.method public final ak(II)V
+.method public final aj(II)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bEV:I
+    iput v0, p0, Lorg/a/a/u;->bFp:I
 
     const/16 v0, 0x84
 
@@ -3324,38 +3324,38 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    invoke-virtual {v1, v0}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v1, v0}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    invoke-virtual {v1, p1, p2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
+    invoke-virtual {v1, p1, p2}, Lorg/a/a/d;->ad(II)Lorg/a/a/d;
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iget-object v1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     const/16 v2, 0xc4
 
-    invoke-virtual {v1, v2}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v1, v2}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    invoke-virtual {v1, v0, p1}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v1, v0, p1}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     move-result-object v1
 
-    invoke-virtual {v1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     :goto_1
-    iget-object p2, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object p2, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz p2, :cond_3
 
-    iget p2, p0, Lorg/a/a/u;->bDc:I
+    iget p2, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v1, 0x4
 
@@ -3366,35 +3366,35 @@
     if-ne p2, v1, :cond_3
 
     :cond_2
-    iget-object p2, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object p2, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object p2, p2, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object p2, p2, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     const/4 v1, 0x0
 
     invoke-virtual {p2, v0, p1, v1, v1}, Lorg/a/a/o;->a(IILorg/a/a/y;Lorg/a/a/z;)V
 
     :cond_3
-    iget p2, p0, Lorg/a/a/u;->bDc:I
+    iget p2, p0, Lorg/a/a/u;->bDw:I
 
     if-eqz p2, :cond_4
 
     add-int/lit8 p1, p1, 0x1
 
-    iget p2, p0, Lorg/a/a/u;->bEm:I
+    iget p2, p0, Lorg/a/a/u;->bEG:I
 
     if-le p1, p2, :cond_4
 
-    iput p1, p0, Lorg/a/a/u;->bEm:I
+    iput p1, p0, Lorg/a/a/u;->bEG:I
 
     :cond_4
     return-void
 .end method
 
-.method public final al(II)V
+.method public final ak(II)V
     .locals 12
 
-    iget v0, p0, Lorg/a/a/u;->bDc:I
+    iget v0, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v1, 0x0
 
@@ -3406,52 +3406,52 @@
 
     if-ne v0, v4, :cond_c
 
-    iget-object p1, p0, Lorg/a/a/u;->bEo:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bEI:Lorg/a/a/q;
 
     :goto_0
     const-string p2, "java/lang/Throwable"
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p1, Lorg/a/a/q;->bDT:Ljava/lang/String;
+    iget-object v0, p1, Lorg/a/a/q;->bEn:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
     goto :goto_1
 
     :cond_0
-    iget-object p2, p1, Lorg/a/a/q;->bDT:Ljava/lang/String;
+    iget-object p2, p1, Lorg/a/a/q;->bEn:Ljava/lang/String;
 
     :goto_1
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-static {v0, p2}, Lorg/a/a/o;->a(Lorg/a/a/z;Ljava/lang/String;)I
 
     move-result p2
 
-    iget-object v0, p1, Lorg/a/a/q;->bDR:Lorg/a/a/r;
+    iget-object v0, p1, Lorg/a/a/q;->bEl:Lorg/a/a/r;
 
-    invoke-virtual {v0}, Lorg/a/a/r;->Jb()Lorg/a/a/r;
+    invoke-virtual {v0}, Lorg/a/a/r;->IO()Lorg/a/a/r;
 
     move-result-object v0
 
-    iget-short v4, v0, Lorg/a/a/r;->bDW:S
+    iget-short v4, v0, Lorg/a/a/r;->bEq:S
 
     or-int/2addr v4, v2
 
     int-to-short v4, v4
 
-    iput-short v4, v0, Lorg/a/a/r;->bDW:S
+    iput-short v4, v0, Lorg/a/a/r;->bEq:S
 
-    iget-object v4, p1, Lorg/a/a/q;->bDP:Lorg/a/a/r;
+    iget-object v4, p1, Lorg/a/a/q;->bEj:Lorg/a/a/r;
 
-    invoke-virtual {v4}, Lorg/a/a/r;->Jb()Lorg/a/a/r;
+    invoke-virtual {v4}, Lorg/a/a/r;->IO()Lorg/a/a/r;
 
     move-result-object v4
 
-    iget-object v5, p1, Lorg/a/a/q;->bDQ:Lorg/a/a/r;
+    iget-object v5, p1, Lorg/a/a/q;->bEk:Lorg/a/a/r;
 
-    invoke-virtual {v5}, Lorg/a/a/r;->Jb()Lorg/a/a/r;
+    invoke-virtual {v5}, Lorg/a/a/r;->IO()Lorg/a/a/r;
 
     move-result-object v5
 
@@ -3460,72 +3460,72 @@
 
     new-instance v6, Lorg/a/a/l;
 
-    iget-object v7, v4, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iget-object v7, v4, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
     invoke-direct {v6, p2, v0, v7}, Lorg/a/a/l;-><init>(ILorg/a/a/r;Lorg/a/a/l;)V
 
-    iput-object v6, v4, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iput-object v6, v4, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
-    iget-object v4, v4, Lorg/a/a/r;->bEg:Lorg/a/a/r;
+    iget-object v4, v4, Lorg/a/a/r;->bEA:Lorg/a/a/r;
 
     goto :goto_2
 
     :cond_1
-    iget-object p1, p1, Lorg/a/a/q;->bDU:Lorg/a/a/q;
+    iget-object p1, p1, Lorg/a/a/q;->bEo:Lorg/a/a/q;
 
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lorg/a/a/u;->bEK:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bFe:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget v2, p0, Lorg/a/a/u;->bCD:I
+    iget v2, p0, Lorg/a/a/u;->bCX:I
 
     iget-object v4, p0, Lorg/a/a/u;->descriptor:Ljava/lang/String;
 
-    iget v5, p0, Lorg/a/a/u;->bEm:I
+    iget v5, p0, Lorg/a/a/u;->bEG:I
 
     invoke-virtual {p1, v0, v2, v4, v5}, Lorg/a/a/o;->a(Lorg/a/a/z;ILjava/lang/String;I)V
 
     invoke-virtual {p1, p0}, Lorg/a/a/o;->a(Lorg/a/a/u;)V
 
-    iget-object p1, p0, Lorg/a/a/u;->bEK:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bFe:Lorg/a/a/r;
 
-    sget-object v0, Lorg/a/a/r;->bDV:Lorg/a/a/r;
+    sget-object v0, Lorg/a/a/r;->bEp:Lorg/a/a/r;
 
-    iput-object v0, p1, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iput-object v0, p1, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
     const/4 v0, 0x0
 
     const/4 v2, 0x0
 
     :goto_3
-    sget-object v4, Lorg/a/a/r;->bDV:Lorg/a/a/r;
+    sget-object v4, Lorg/a/a/r;->bEp:Lorg/a/a/r;
 
     if-eq p1, v4, :cond_6
 
-    iget-object v4, p1, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iget-object v4, p1, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
-    iput-object v1, p1, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iput-object v1, p1, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
-    iget-short v5, p1, Lorg/a/a/r;->bDW:S
+    iget-short v5, p1, Lorg/a/a/r;->bEq:S
 
     or-int/lit8 v5, v5, 0x8
 
     int-to-short v5, v5
 
-    iput-short v5, p1, Lorg/a/a/r;->bDW:S
+    iput-short v5, p1, Lorg/a/a/r;->bEq:S
 
-    iget-object v5, p1, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v5, p1, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget-object v5, v5, Lorg/a/a/o;->bDG:[I
+    iget-object v5, v5, Lorg/a/a/o;->bEa:[I
 
     array-length v5, v5
 
-    iget-short v6, p1, Lorg/a/a/r;->bEd:S
+    iget-short v6, p1, Lorg/a/a/r;->bEx:S
 
     add-int/2addr v5, v6
 
@@ -3534,22 +3534,22 @@
     move v2, v5
 
     :cond_3
-    iget-object v5, p1, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iget-object v5, p1, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
     :goto_4
     if-eqz v5, :cond_5
 
-    iget-object v6, v5, Lorg/a/a/l;->bDy:Lorg/a/a/r;
+    iget-object v6, v5, Lorg/a/a/l;->bDS:Lorg/a/a/r;
 
-    invoke-virtual {v6}, Lorg/a/a/r;->Jb()Lorg/a/a/r;
+    invoke-virtual {v6}, Lorg/a/a/r;->IO()Lorg/a/a/r;
 
     move-result-object v6
 
-    iget-object v7, p1, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v7, p1, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget-object v8, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v8, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object v9, v6, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v9, v6, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     iget v10, v5, Lorg/a/a/l;->info:I
 
@@ -3559,16 +3559,16 @@
 
     if-eqz v7, :cond_4
 
-    iget-object v7, v6, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iget-object v7, v6, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
     if-nez v7, :cond_4
 
-    iput-object v4, v6, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iput-object v4, v6, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
     move-object v4, v6
 
     :cond_4
-    iget-object v5, v5, Lorg/a/a/l;->bDz:Lorg/a/a/l;
+    iget-object v5, v5, Lorg/a/a/l;->bDT:Lorg/a/a/l;
 
     goto :goto_4
 
@@ -3578,12 +3578,12 @@
     goto :goto_3
 
     :cond_6
-    iget-object p1, p0, Lorg/a/a/u;->bEK:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bFe:Lorg/a/a/r;
 
     :goto_5
     if-eqz p1, :cond_b
 
-    iget-short v1, p1, Lorg/a/a/r;->bDW:S
+    iget-short v1, p1, Lorg/a/a/r;->bEq:S
 
     const/16 v4, 0xa
 
@@ -3591,31 +3591,31 @@
 
     if-ne v1, v4, :cond_7
 
-    iget-object v1, p1, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v1, p1, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     invoke-virtual {v1, p0}, Lorg/a/a/o;->a(Lorg/a/a/u;)V
 
     :cond_7
-    iget-short v1, p1, Lorg/a/a/r;->bDW:S
+    iget-short v1, p1, Lorg/a/a/r;->bEq:S
 
     and-int/lit8 v1, v1, 0x8
 
     if-nez v1, :cond_a
 
-    iget-object v1, p1, Lorg/a/a/r;->bEg:Lorg/a/a/r;
+    iget-object v1, p1, Lorg/a/a/r;->bEA:Lorg/a/a/r;
 
-    iget v4, p1, Lorg/a/a/r;->bDZ:I
+    iget v4, p1, Lorg/a/a/r;->bEt:I
 
     if-nez v1, :cond_8
 
-    iget-object v5, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
     goto :goto_6
 
     :cond_8
-    iget v5, v1, Lorg/a/a/r;->bDZ:I
+    iget v5, v1, Lorg/a/a/r;->bEt:I
 
     :goto_6
     sub-int/2addr v5, v3
@@ -3627,7 +3627,7 @@
     :goto_7
     if-ge v6, v5, :cond_9
 
-    iget-object v7, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v7, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget-object v7, v7, Lorg/a/a/d;->data:[B
 
@@ -3638,7 +3638,7 @@
     goto :goto_7
 
     :cond_9
-    iget-object v6, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v6, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget-object v6, v6, Lorg/a/a/d;->data:[B
 
@@ -3648,11 +3648,11 @@
 
     invoke-virtual {p0, v4, v0, v3}, Lorg/a/a/u;->q(III)I
 
-    iget-object v4, p0, Lorg/a/a/u;->bES:[I
+    iget-object v4, p0, Lorg/a/a/u;->bFm:[I
 
     const/4 v5, 0x3
 
-    iget-object v6, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v6, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-static {v6, p2}, Lorg/a/a/o;->a(Lorg/a/a/z;Ljava/lang/String;)I
 
@@ -3660,15 +3660,15 @@
 
     aput v6, v4, v5
 
-    invoke-virtual {p0}, Lorg/a/a/u;->Je()V
+    invoke-virtual {p0}, Lorg/a/a/u;->IR()V
 
-    iget-object v4, p0, Lorg/a/a/u;->bEo:Lorg/a/a/q;
+    iget-object v4, p0, Lorg/a/a/u;->bEI:Lorg/a/a/q;
 
     invoke-static {v4, p1, v1}, Lorg/a/a/q;->a(Lorg/a/a/q;Lorg/a/a/r;Lorg/a/a/r;)Lorg/a/a/q;
 
     move-result-object v1
 
-    iput-object v1, p0, Lorg/a/a/u;->bEo:Lorg/a/a/q;
+    iput-object v1, p0, Lorg/a/a/u;->bEI:Lorg/a/a/q;
 
     invoke-static {v2, v3}, Ljava/lang/Math;->max(II)I
 
@@ -3677,35 +3677,35 @@
     move v2, v1
 
     :cond_a
-    iget-object p1, p1, Lorg/a/a/r;->bEg:Lorg/a/a/r;
+    iget-object p1, p1, Lorg/a/a/r;->bEA:Lorg/a/a/r;
 
     goto :goto_5
 
     :cond_b
-    iput v2, p0, Lorg/a/a/u;->bEl:I
+    iput v2, p0, Lorg/a/a/u;->bEF:I
 
     return-void
 
     :cond_c
     if-ne v0, v3, :cond_1d
 
-    iget-object p1, p0, Lorg/a/a/u;->bEo:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bEI:Lorg/a/a/q;
 
     :goto_8
     const p2, 0x7fffffff
 
     if-eqz p1, :cond_f
 
-    iget-object v0, p1, Lorg/a/a/q;->bDR:Lorg/a/a/r;
+    iget-object v0, p1, Lorg/a/a/q;->bEl:Lorg/a/a/r;
 
-    iget-object v2, p1, Lorg/a/a/q;->bDP:Lorg/a/a/r;
+    iget-object v2, p1, Lorg/a/a/q;->bEj:Lorg/a/a/r;
 
-    iget-object v4, p1, Lorg/a/a/q;->bDQ:Lorg/a/a/r;
+    iget-object v4, p1, Lorg/a/a/q;->bEk:Lorg/a/a/r;
 
     :goto_9
     if-eq v2, v4, :cond_e
 
-    iget-short v5, v2, Lorg/a/a/r;->bDW:S
+    iget-short v5, v2, Lorg/a/a/r;->bEq:S
 
     and-int/lit8 v5, v5, 0x10
 
@@ -3713,47 +3713,47 @@
 
     new-instance v5, Lorg/a/a/l;
 
-    iget-object v6, v2, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iget-object v6, v2, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
     invoke-direct {v5, p2, v0, v6}, Lorg/a/a/l;-><init>(ILorg/a/a/r;Lorg/a/a/l;)V
 
-    iput-object v5, v2, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iput-object v5, v2, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
     goto :goto_a
 
     :cond_d
-    iget-object v5, v2, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iget-object v5, v2, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
-    iget-object v5, v5, Lorg/a/a/l;->bDz:Lorg/a/a/l;
+    iget-object v5, v5, Lorg/a/a/l;->bDT:Lorg/a/a/l;
 
     new-instance v6, Lorg/a/a/l;
 
-    iget-object v7, v2, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iget-object v7, v2, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
-    iget-object v7, v7, Lorg/a/a/l;->bDz:Lorg/a/a/l;
+    iget-object v7, v7, Lorg/a/a/l;->bDT:Lorg/a/a/l;
 
-    iget-object v7, v7, Lorg/a/a/l;->bDz:Lorg/a/a/l;
+    iget-object v7, v7, Lorg/a/a/l;->bDT:Lorg/a/a/l;
 
     invoke-direct {v6, p2, v0, v7}, Lorg/a/a/l;-><init>(ILorg/a/a/r;Lorg/a/a/l;)V
 
-    iput-object v6, v5, Lorg/a/a/l;->bDz:Lorg/a/a/l;
+    iput-object v6, v5, Lorg/a/a/l;->bDT:Lorg/a/a/l;
 
     :goto_a
-    iget-object v2, v2, Lorg/a/a/r;->bEg:Lorg/a/a/r;
+    iget-object v2, v2, Lorg/a/a/r;->bEA:Lorg/a/a/r;
 
     goto :goto_9
 
     :cond_e
-    iget-object p1, p1, Lorg/a/a/q;->bDU:Lorg/a/a/q;
+    iget-object p1, p1, Lorg/a/a/q;->bEo:Lorg/a/a/q;
 
     goto :goto_8
 
     :cond_f
-    iget-boolean p1, p0, Lorg/a/a/u;->bET:Z
+    iget-boolean p1, p0, Lorg/a/a/u;->bFn:Z
 
     if-eqz p1, :cond_16
 
-    iget-object p1, p0, Lorg/a/a/u;->bEK:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bFe:Lorg/a/a/r;
 
     invoke-virtual {p1, v3}, Lorg/a/a/r;->b(S)V
 
@@ -3764,28 +3764,28 @@
     :goto_b
     if-gt p1, v0, :cond_12
 
-    iget-object v2, p0, Lorg/a/a/u;->bEK:Lorg/a/a/r;
+    iget-object v2, p0, Lorg/a/a/u;->bFe:Lorg/a/a/r;
 
     :goto_c
     if-eqz v2, :cond_11
 
-    iget-short v4, v2, Lorg/a/a/r;->bDW:S
+    iget-short v4, v2, Lorg/a/a/r;->bEq:S
 
     and-int/lit8 v4, v4, 0x10
 
     if-eqz v4, :cond_10
 
-    iget-short v4, v2, Lorg/a/a/r;->bEe:S
+    iget-short v4, v2, Lorg/a/a/r;->bEy:S
 
     if-ne v4, p1, :cond_10
 
-    iget-object v4, v2, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iget-object v4, v2, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
-    iget-object v4, v4, Lorg/a/a/l;->bDz:Lorg/a/a/l;
+    iget-object v4, v4, Lorg/a/a/l;->bDT:Lorg/a/a/l;
 
-    iget-object v4, v4, Lorg/a/a/l;->bDy:Lorg/a/a/r;
+    iget-object v4, v4, Lorg/a/a/l;->bDS:Lorg/a/a/r;
 
-    iget-short v5, v4, Lorg/a/a/r;->bEe:S
+    iget-short v5, v4, Lorg/a/a/r;->bEy:S
 
     if-nez v5, :cond_10
 
@@ -3796,7 +3796,7 @@
     invoke-virtual {v4, v0}, Lorg/a/a/r;->b(S)V
 
     :cond_10
-    iget-object v2, v2, Lorg/a/a/r;->bEg:Lorg/a/a/r;
+    iget-object v2, v2, Lorg/a/a/r;->bEA:Lorg/a/a/r;
 
     goto :goto_c
 
@@ -3808,28 +3808,28 @@
     goto :goto_b
 
     :cond_12
-    iget-object p1, p0, Lorg/a/a/u;->bEK:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bFe:Lorg/a/a/r;
 
     :goto_d
     if-eqz p1, :cond_16
 
-    iget-short v0, p1, Lorg/a/a/r;->bDW:S
+    iget-short v0, p1, Lorg/a/a/r;->bEq:S
 
     and-int/lit8 v0, v0, 0x10
 
     if-eqz v0, :cond_15
 
-    iget-object v0, p1, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iget-object v0, p1, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
-    iget-object v0, v0, Lorg/a/a/l;->bDz:Lorg/a/a/l;
+    iget-object v0, v0, Lorg/a/a/l;->bDT:Lorg/a/a/l;
 
-    iget-object v0, v0, Lorg/a/a/l;->bDy:Lorg/a/a/r;
+    iget-object v0, v0, Lorg/a/a/l;->bDS:Lorg/a/a/r;
 
-    sget-object v2, Lorg/a/a/r;->bDV:Lorg/a/a/r;
+    sget-object v2, Lorg/a/a/r;->bEp:Lorg/a/a/r;
 
-    sget-object v4, Lorg/a/a/r;->bDV:Lorg/a/a/r;
+    sget-object v4, Lorg/a/a/r;->bEp:Lorg/a/a/r;
 
-    iput-object v4, v0, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iput-object v4, v0, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
     :goto_e
     move-object v11, v2
@@ -3838,39 +3838,39 @@
 
     move-object v0, v11
 
-    sget-object v4, Lorg/a/a/r;->bDV:Lorg/a/a/r;
+    sget-object v4, Lorg/a/a/r;->bEp:Lorg/a/a/r;
 
     if-eq v2, v4, :cond_14
 
-    iget-object v4, v2, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iget-object v4, v2, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
-    iput-object v0, v2, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iput-object v0, v2, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
-    iget-short v0, v2, Lorg/a/a/r;->bDW:S
+    iget-short v0, v2, Lorg/a/a/r;->bEq:S
 
     and-int/lit8 v0, v0, 0x40
 
     if-eqz v0, :cond_13
 
-    iget-short v0, v2, Lorg/a/a/r;->bEe:S
+    iget-short v0, v2, Lorg/a/a/r;->bEy:S
 
-    iget-short v5, p1, Lorg/a/a/r;->bEe:S
+    iget-short v5, p1, Lorg/a/a/r;->bEy:S
 
     if-eq v0, v5, :cond_13
 
     new-instance v0, Lorg/a/a/l;
 
-    iget-short v5, v2, Lorg/a/a/r;->bEc:S
+    iget-short v5, v2, Lorg/a/a/r;->bEw:S
 
-    iget-object v6, p1, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iget-object v6, p1, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
-    iget-object v6, v6, Lorg/a/a/l;->bDy:Lorg/a/a/r;
+    iget-object v6, v6, Lorg/a/a/l;->bDS:Lorg/a/a/r;
 
-    iget-object v7, v2, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iget-object v7, v2, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
     invoke-direct {v0, v5, v6, v7}, Lorg/a/a/l;-><init>(ILorg/a/a/r;Lorg/a/a/l;)V
 
-    iput-object v0, v2, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iput-object v0, v2, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
     :cond_13
     invoke-virtual {v2, v4}, Lorg/a/a/r;->a(Lorg/a/a/r;)Lorg/a/a/r;
@@ -3881,42 +3881,42 @@
 
     :cond_14
     :goto_f
-    sget-object v2, Lorg/a/a/r;->bDV:Lorg/a/a/r;
+    sget-object v2, Lorg/a/a/r;->bEp:Lorg/a/a/r;
 
     if-eq v0, v2, :cond_15
 
-    iget-object v2, v0, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iget-object v2, v0, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
-    iput-object v1, v0, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iput-object v1, v0, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
     move-object v0, v2
 
     goto :goto_f
 
     :cond_15
-    iget-object p1, p1, Lorg/a/a/r;->bEg:Lorg/a/a/r;
+    iget-object p1, p1, Lorg/a/a/r;->bEA:Lorg/a/a/r;
 
     goto :goto_d
 
     :cond_16
-    iget-object p1, p0, Lorg/a/a/u;->bEK:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bFe:Lorg/a/a/r;
 
-    sget-object v0, Lorg/a/a/r;->bDV:Lorg/a/a/r;
+    sget-object v0, Lorg/a/a/r;->bEp:Lorg/a/a/r;
 
-    iput-object v0, p1, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iput-object v0, p1, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
-    iget v0, p0, Lorg/a/a/u;->bEl:I
+    iget v0, p0, Lorg/a/a/u;->bEF:I
 
     :cond_17
-    sget-object v1, Lorg/a/a/r;->bDV:Lorg/a/a/r;
+    sget-object v1, Lorg/a/a/r;->bEp:Lorg/a/a/r;
 
     if-eq p1, v1, :cond_1c
 
-    iget-object v1, p1, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iget-object v1, p1, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
-    iget-short v2, p1, Lorg/a/a/r;->bEb:S
+    iget-short v2, p1, Lorg/a/a/r;->bEv:S
 
-    iget-short v4, p1, Lorg/a/a/r;->bEd:S
+    iget-short v4, p1, Lorg/a/a/r;->bEx:S
 
     add-int/2addr v4, v2
 
@@ -3925,15 +3925,15 @@
     move v0, v4
 
     :cond_18
-    iget-object v4, p1, Lorg/a/a/r;->bEh:Lorg/a/a/l;
+    iget-object v4, p1, Lorg/a/a/r;->bEB:Lorg/a/a/l;
 
-    iget-short p1, p1, Lorg/a/a/r;->bDW:S
+    iget-short p1, p1, Lorg/a/a/r;->bEq:S
 
     and-int/lit8 p1, p1, 0x10
 
     if-eqz p1, :cond_19
 
-    iget-object v4, v4, Lorg/a/a/l;->bDz:Lorg/a/a/l;
+    iget-object v4, v4, Lorg/a/a/l;->bDT:Lorg/a/a/l;
 
     :cond_19
     move-object p1, v1
@@ -3941,9 +3941,9 @@
     :goto_10
     if-eqz v4, :cond_17
 
-    iget-object v1, v4, Lorg/a/a/l;->bDy:Lorg/a/a/r;
+    iget-object v1, v4, Lorg/a/a/l;->bDS:Lorg/a/a/r;
 
-    iget-object v5, v1, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iget-object v5, v1, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
     if-nez v5, :cond_1b
 
@@ -3963,35 +3963,35 @@
     :goto_11
     int-to-short v5, v5
 
-    iput-short v5, v1, Lorg/a/a/r;->bEb:S
+    iput-short v5, v1, Lorg/a/a/r;->bEv:S
 
-    iput-object p1, v1, Lorg/a/a/r;->bEi:Lorg/a/a/r;
+    iput-object p1, v1, Lorg/a/a/r;->bEC:Lorg/a/a/r;
 
     move-object p1, v1
 
     :cond_1b
-    iget-object v4, v4, Lorg/a/a/l;->bDz:Lorg/a/a/l;
+    iget-object v4, v4, Lorg/a/a/l;->bDT:Lorg/a/a/l;
 
     goto :goto_10
 
     :cond_1c
-    iput v0, p0, Lorg/a/a/u;->bEl:I
+    iput v0, p0, Lorg/a/a/u;->bEF:I
 
     return-void
 
     :cond_1d
     if-ne v0, v2, :cond_1e
 
-    iget p1, p0, Lorg/a/a/u;->bEO:I
+    iget p1, p0, Lorg/a/a/u;->bFi:I
 
-    iput p1, p0, Lorg/a/a/u;->bEl:I
+    iput p1, p0, Lorg/a/a/u;->bEF:I
 
     return-void
 
     :cond_1e
-    iput p1, p0, Lorg/a/a/u;->bEl:I
+    iput p1, p0, Lorg/a/a/u;->bEF:I
 
-    iput p2, p0, Lorg/a/a/u;->bEm:I
+    iput p2, p0, Lorg/a/a/u;->bEG:I
 
     return-void
 .end method
@@ -4007,7 +4007,7 @@
 
     and-int/2addr p1, v1
 
-    iget v1, p0, Lorg/a/a/u;->bEV:I
+    iget v1, p0, Lorg/a/a/u;->bFp:I
 
     shl-int/lit8 v1, v1, 0x8
 
@@ -4017,44 +4017,44 @@
 
     invoke-static {p2, v0}, Lorg/a/a/ab;->a(Lorg/a/a/ab;Lorg/a/a/d;)V
 
-    iget-object p1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {p1, p3}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p1, p3}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     if-eqz p4, :cond_0
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bEy:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bES:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, p3}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/u;->bEy:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bES:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bEz:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bET:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, p3}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/u;->bEz:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bET:Lorg/a/a/b;
 
     return-object p1
 .end method
@@ -4062,7 +4062,7 @@
 .method public final b(ILorg/a/a/r;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/u;->bEr:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEL:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -4070,24 +4070,24 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/u;->bEr:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bEL:Lorg/a/a/d;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/u;->bEq:I
+    iget v0, p0, Lorg/a/a/u;->bEK:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/u;->bEq:I
+    iput v0, p0, Lorg/a/a/u;->bEK:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bEr:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEL:Lorg/a/a/d;
 
-    iget p2, p2, Lorg/a/a/r;->bDZ:I
+    iget p2, p2, Lorg/a/a/r;->bEt:I
 
-    invoke-virtual {v0, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/u;->bEr:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/u;->bEL:Lorg/a/a/d;
 
-    invoke-virtual {p2, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p2, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 .end method
@@ -4095,11 +4095,11 @@
 .method public final b(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/u;->bDb:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/u;->bDv:Lorg/a/a/c;
 
-    iput-object v0, p1, Lorg/a/a/c;->bCu:Lorg/a/a/c;
+    iput-object v0, p1, Lorg/a/a/c;->bCO:Lorg/a/a/c;
 
-    iput-object p1, p0, Lorg/a/a/u;->bDb:Lorg/a/a/c;
+    iput-object p1, p0, Lorg/a/a/u;->bDv:Lorg/a/a/c;
 
     return-void
 .end method
@@ -4107,13 +4107,13 @@
 .method public final b(Lorg/a/a/r;)V
     .locals 5
 
-    iget-boolean v0, p0, Lorg/a/a/u;->bEU:Z
+    iget-boolean v0, p0, Lorg/a/a/u;->bFo:Z
 
-    iget-object v1, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget-object v1, v1, Lorg/a/a/d;->data:[B
 
-    iget-object v2, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v2, v2, Lorg/a/a/d;->length:I
 
@@ -4123,9 +4123,9 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lorg/a/a/u;->bEU:Z
+    iput-boolean v0, p0, Lorg/a/a/u;->bFo:Z
 
-    iget-short v0, p1, Lorg/a/a/r;->bDW:S
+    iget-short v0, p1, Lorg/a/a/r;->bEq:S
 
     const/4 v1, 0x1
 
@@ -4136,7 +4136,7 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lorg/a/a/u;->bDc:I
+    iget v0, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v2, 0x4
 
@@ -4146,23 +4146,23 @@
 
     if-ne v0, v2, :cond_5
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz v0, :cond_2
 
-    iget v0, p1, Lorg/a/a/r;->bDZ:I
+    iget v0, p1, Lorg/a/a/r;->bEt:I
 
-    iget-object v1, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v1, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget v1, v1, Lorg/a/a/r;->bDZ:I
+    iget v1, v1, Lorg/a/a/r;->bEt:I
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-short v1, v0, Lorg/a/a/r;->bDW:S
+    iget-short v1, v0, Lorg/a/a/r;->bEq:S
 
-    iget-short v2, p1, Lorg/a/a/r;->bDW:S
+    iget-short v2, p1, Lorg/a/a/r;->bEq:S
 
     and-int/2addr v2, v4
 
@@ -4170,13 +4170,13 @@
 
     int-to-short v1, v1
 
-    iput-short v1, v0, Lorg/a/a/r;->bDW:S
+    iput-short v1, v0, Lorg/a/a/r;->bEq:S
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iput-object v0, p1, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iput-object v0, p1, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     return-void
 
@@ -4184,23 +4184,23 @@
     invoke-direct {p0, v3, p1}, Lorg/a/a/u;->c(ILorg/a/a/r;)V
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/u;->bEL:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFf:Lorg/a/a/r;
 
     if-eqz v0, :cond_4
 
-    iget v0, p1, Lorg/a/a/r;->bDZ:I
+    iget v0, p1, Lorg/a/a/r;->bEt:I
 
-    iget-object v1, p0, Lorg/a/a/u;->bEL:Lorg/a/a/r;
+    iget-object v1, p0, Lorg/a/a/u;->bFf:Lorg/a/a/r;
 
-    iget v1, v1, Lorg/a/a/r;->bDZ:I
+    iget v1, v1, Lorg/a/a/r;->bEt:I
 
     if-ne v0, v1, :cond_3
 
-    iget-object v0, p0, Lorg/a/a/u;->bEL:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFf:Lorg/a/a/r;
 
-    iget-short v1, v0, Lorg/a/a/r;->bDW:S
+    iget-short v1, v0, Lorg/a/a/r;->bEq:S
 
-    iget-short v2, p1, Lorg/a/a/r;->bDW:S
+    iget-short v2, p1, Lorg/a/a/r;->bEq:S
 
     and-int/2addr v2, v4
 
@@ -4208,35 +4208,35 @@
 
     int-to-short v1, v1
 
-    iput-short v1, v0, Lorg/a/a/r;->bDW:S
+    iput-short v1, v0, Lorg/a/a/r;->bEq:S
 
-    iget-object v0, p0, Lorg/a/a/u;->bEL:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFf:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iput-object v0, p1, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iput-object v0, p1, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget-object p1, p0, Lorg/a/a/u;->bEL:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bFf:Lorg/a/a/r;
 
-    iput-object p1, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     return-void
 
     :cond_3
-    iget-object v0, p0, Lorg/a/a/u;->bEL:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFf:Lorg/a/a/r;
 
-    iput-object p1, v0, Lorg/a/a/r;->bEg:Lorg/a/a/r;
+    iput-object p1, v0, Lorg/a/a/r;->bEA:Lorg/a/a/r;
 
     :cond_4
-    iput-object p1, p0, Lorg/a/a/u;->bEL:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bFf:Lorg/a/a/r;
 
-    iput-object p1, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     new-instance v0, Lorg/a/a/o;
 
     invoke-direct {v0, p1}, Lorg/a/a/o;-><init>(Lorg/a/a/r;)V
 
-    iput-object v0, p1, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iput-object v0, p1, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     return-void
 
@@ -4245,64 +4245,64 @@
 
     if-ne v0, v2, :cond_7
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-nez v0, :cond_6
 
-    iput-object p1, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     return-void
 
     :cond_6
-    iget-object v0, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iput-object p1, v0, Lorg/a/a/o;->bDE:Lorg/a/a/r;
+    iput-object p1, v0, Lorg/a/a/o;->bDY:Lorg/a/a/r;
 
     return-void
 
     :cond_7
     if-ne v0, v1, :cond_a
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz v0, :cond_8
 
-    iget v1, p0, Lorg/a/a/u;->bEO:I
+    iget v1, p0, Lorg/a/a/u;->bFi:I
 
     int-to-short v1, v1
 
-    iput-short v1, v0, Lorg/a/a/r;->bEd:S
+    iput-short v1, v0, Lorg/a/a/r;->bEx:S
 
-    iget v0, p0, Lorg/a/a/u;->bEN:I
+    iget v0, p0, Lorg/a/a/u;->bFh:I
 
     invoke-direct {p0, v0, p1}, Lorg/a/a/u;->c(ILorg/a/a/r;)V
 
     :cond_8
-    iput-object p1, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iput v3, p0, Lorg/a/a/u;->bEN:I
+    iput v3, p0, Lorg/a/a/u;->bFh:I
 
-    iput v3, p0, Lorg/a/a/u;->bEO:I
+    iput v3, p0, Lorg/a/a/u;->bFi:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bEL:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFf:Lorg/a/a/r;
 
     if-eqz v0, :cond_9
 
-    iput-object p1, v0, Lorg/a/a/r;->bEg:Lorg/a/a/r;
+    iput-object p1, v0, Lorg/a/a/r;->bEA:Lorg/a/a/r;
 
     :cond_9
-    iput-object p1, p0, Lorg/a/a/u;->bEL:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bFf:Lorg/a/a/r;
 
     return-void
 
     :cond_a
     if-ne v0, v4, :cond_b
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-nez v0, :cond_b
 
-    iput-object p1, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     :cond_b
     return-void
@@ -4311,13 +4311,13 @@
 .method public final bF(Ljava/lang/Object;)V
     .locals 7
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bEV:I
+    iput v0, p0, Lorg/a/a/u;->bFp:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v0, p1}, Lorg/a/a/z;->bH(Ljava/lang/Object;)Lorg/a/a/y;
 
@@ -4377,11 +4377,11 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v5, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     const/16 v6, 0x14
 
-    invoke-virtual {v5, v6, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v5, v6, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     goto :goto_2
 
@@ -4390,25 +4390,25 @@
 
     if-lt v0, v5, :cond_3
 
-    iget-object v5, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     const/16 v6, 0x13
 
-    invoke-virtual {v5, v6, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v5, v6, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     goto :goto_2
 
     :cond_3
-    iget-object v5, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    invoke-virtual {v5, v4, v0}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
+    invoke-virtual {v5, v4, v0}, Lorg/a/a/d;->ad(II)Lorg/a/a/d;
 
     :goto_2
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz v0, :cond_8
 
-    iget v0, p0, Lorg/a/a/u;->bDc:I
+    iget v0, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v5, 0x4
 
@@ -4421,7 +4421,7 @@
     goto :goto_3
 
     :cond_4
-    iget p1, p0, Lorg/a/a/u;->bEN:I
+    iget p1, p0, Lorg/a/a/u;->bFh:I
 
     if-eqz v1, :cond_5
 
@@ -4430,24 +4430,24 @@
     :cond_5
     add-int/2addr p1, v2
 
-    iget v0, p0, Lorg/a/a/u;->bEO:I
+    iget v0, p0, Lorg/a/a/u;->bFi:I
 
     if-le p1, v0, :cond_6
 
-    iput p1, p0, Lorg/a/a/u;->bEO:I
+    iput p1, p0, Lorg/a/a/u;->bFi:I
 
     :cond_6
-    iput p1, p0, Lorg/a/a/u;->bEN:I
+    iput p1, p0, Lorg/a/a/u;->bFh:I
 
     goto :goto_4
 
     :cond_7
     :goto_3
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget-object v1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v0, v4, v3, p1, v1}, Lorg/a/a/o;->a(IILorg/a/a/y;Lorg/a/a/z;)V
 
@@ -4467,66 +4467,66 @@
 
     invoke-static {p2, v0}, Lorg/a/a/ab;->a(Lorg/a/a/ab;Lorg/a/a/d;)V
 
-    iget-object p1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {p1, p3}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p1, p3}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     if-eqz p4, :cond_0
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bEy:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bES:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, p3}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/u;->bEy:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bES:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bEz:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bET:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, p3}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/u;->bEz:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bET:Lorg/a/a/b;
 
     return-object p1
 .end method
 
-.method public final em(I)V
+.method public final ei(I)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bEV:I
+    iput v0, p0, Lorg/a/a/u;->bFp:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz v0, :cond_5
 
-    iget v0, p0, Lorg/a/a/u;->bDc:I
+    iget v0, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v1, 0x4
 
@@ -4539,30 +4539,30 @@
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lorg/a/a/u;->bEN:I
+    iget v0, p0, Lorg/a/a/u;->bFh:I
 
-    sget-object v1, Lorg/a/a/u;->bEk:[I
+    sget-object v1, Lorg/a/a/u;->bEE:[I
 
     aget v1, v1, p1
 
     add-int/2addr v0, v1
 
-    iget v1, p0, Lorg/a/a/u;->bEO:I
+    iget v1, p0, Lorg/a/a/u;->bFi:I
 
     if-le v0, v1, :cond_1
 
-    iput v0, p0, Lorg/a/a/u;->bEO:I
+    iput v0, p0, Lorg/a/a/u;->bFi:I
 
     :cond_1
-    iput v0, p0, Lorg/a/a/u;->bEN:I
+    iput v0, p0, Lorg/a/a/u;->bFh:I
 
     goto :goto_1
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
     const/4 v1, 0x0
 
@@ -4585,7 +4585,7 @@
     if-ne p1, v0, :cond_5
 
     :cond_4
-    invoke-direct {p0}, Lorg/a/a/u;->Jd()V
+    invoke-direct {p0}, Lorg/a/a/u;->IQ()V
 
     :cond_5
     return-void
@@ -4596,12 +4596,12 @@
 
     if-eqz p2, :cond_0
 
-    iput p1, p0, Lorg/a/a/u;->bED:I
+    iput p1, p0, Lorg/a/a/u;->bEX:I
 
     return-void
 
     :cond_0
-    iput p1, p0, Lorg/a/a/u;->bEF:I
+    iput p1, p0, Lorg/a/a/u;->bEZ:I
 
     return-void
 .end method
@@ -4609,13 +4609,13 @@
 .method public final i(ILjava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bEV:I
+    iput v0, p0, Lorg/a/a/u;->bFp:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -4623,17 +4623,17 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v1, p2, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v0, p1, v1}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v0, p1, v1}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz v0, :cond_3
 
-    iget v0, p0, Lorg/a/a/u;->bDc:I
+    iget v0, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v1, 0x4
 
@@ -4650,30 +4650,30 @@
 
     if-ne p1, p2, :cond_3
 
-    iget p1, p0, Lorg/a/a/u;->bEN:I
+    iget p1, p0, Lorg/a/a/u;->bFh:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iget p2, p0, Lorg/a/a/u;->bEO:I
+    iget p2, p0, Lorg/a/a/u;->bFi:I
 
     if-le p1, p2, :cond_1
 
-    iput p1, p0, Lorg/a/a/u;->bEO:I
+    iput p1, p0, Lorg/a/a/u;->bFi:I
 
     :cond_1
-    iput p1, p0, Lorg/a/a/u;->bEN:I
+    iput p1, p0, Lorg/a/a/u;->bFh:I
 
     goto :goto_1
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget v1, p0, Lorg/a/a/u;->bEV:I
+    iget v1, p0, Lorg/a/a/u;->bFp:I
 
-    iget-object v2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v0, p1, v1, p2, v2}, Lorg/a/a/o;->a(IILorg/a/a/y;Lorg/a/a/z;)V
 
@@ -4689,44 +4689,44 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iget-object v1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, p1}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, p1}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
     const/4 v1, 0x0
 
-    invoke-virtual {p1, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     if-eqz p2, :cond_0
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/u;->bCT:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/u;->bDn:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, v1}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/u;->bCT:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bDn:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/u;->bCU:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/u;->bDo:Lorg/a/a/b;
 
     invoke-direct {p1, p2, v0, v1}, Lorg/a/a/b;-><init>(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V
 
-    iput-object p1, p0, Lorg/a/a/u;->bCU:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bDo:Lorg/a/a/b;
 
     return-object p1
 .end method
@@ -4734,7 +4734,7 @@
 .method public final n(Ljava/lang/String;I)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/u;->bEJ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bFd:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -4742,16 +4742,16 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/u;->bEJ:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bFd:Lorg/a/a/d;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/u;->bEI:I
+    iget v0, p0, Lorg/a/a/u;->bFc:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/u;->bEI:I
+    iput v0, p0, Lorg/a/a/u;->bFc:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bEJ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bFd:Lorg/a/a/d;
 
     if-nez p1, :cond_1
 
@@ -4760,18 +4760,18 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {v1, p1}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {v1, p1}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p1
 
     :goto_0
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     return-void
 .end method
@@ -4779,13 +4779,13 @@
 .method public final o(Ljava/lang/String;I)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bEV:I
+    iput v0, p0, Lorg/a/a/u;->bFp:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -4793,23 +4793,23 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lorg/a/a/u;->bEn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bEH:Lorg/a/a/d;
 
     iget v1, p1, Lorg/a/a/y;->index:I
 
     const/16 v2, 0xc5
 
-    invoke-virtual {v0, v2, v1}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v0, v2, v1}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     move-result-object v0
 
-    invoke-virtual {v0, p2}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v0, p2}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lorg/a/a/u;->bDc:I
+    iget v0, p0, Lorg/a/a/u;->bDw:I
 
     const/4 v1, 0x4
 
@@ -4822,23 +4822,23 @@
     goto :goto_0
 
     :cond_0
-    iget p1, p0, Lorg/a/a/u;->bEN:I
+    iget p1, p0, Lorg/a/a/u;->bFh:I
 
     rsub-int/lit8 p2, p2, 0x1
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lorg/a/a/u;->bEN:I
+    iput p1, p0, Lorg/a/a/u;->bFh:I
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lorg/a/a/u;->bEM:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bFg:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bEf:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bEz:Lorg/a/a/o;
 
-    iget-object v1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v0, v2, p2, p1, v1}, Lorg/a/a/o;->a(IILorg/a/a/y;Lorg/a/a/z;)V
 
@@ -4854,7 +4854,7 @@
 
     add-int/2addr v0, p3
 
-    iget-object v1, p0, Lorg/a/a/u;->bES:[I
+    iget-object v1, p0, Lorg/a/a/u;->bFm:[I
 
     if-eqz v1, :cond_0
 
@@ -4865,10 +4865,10 @@
     :cond_0
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lorg/a/a/u;->bES:[I
+    iput-object v0, p0, Lorg/a/a/u;->bFm:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/u;->bES:[I
+    iget-object v0, p0, Lorg/a/a/u;->bFm:[I
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/org/a/a/v.smali b/com.discord/smali_classes2/org/a/a/v.smali
index eb2a059002..656cbb8249 100644
--- a/com.discord/smali_classes2/org/a/a/v.smali
+++ b/com.discord/smali_classes2/org/a/a/v.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field protected final bCl:I
+.field protected final bCF:I
 
-.field protected bEY:Lorg/a/a/v;
+.field protected bFs:Lorg/a/a/v;
 
 
 # direct methods
@@ -27,11 +27,11 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/v;->bCl:I
+    iput p1, p0, Lorg/a/a/v;->bCF:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/v;->bEY:Lorg/a/a/v;
+    iput-object p1, p0, Lorg/a/a/v;->bFs:Lorg/a/a/v;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 .method public varargs a(Ljava/lang/String;I[Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/v;->bEY:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bFs:Lorg/a/a/v;
 
     if-eqz v0, :cond_0
 
@@ -54,7 +54,7 @@
 .method public varargs b(Ljava/lang/String;I[Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/v;->bEY:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bFs:Lorg/a/a/v;
 
     if-eqz v0, :cond_0
 
@@ -67,7 +67,7 @@
 .method public varargs d(Ljava/lang/String;[Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/v;->bEY:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bFs:Lorg/a/a/v;
 
     if-eqz v0, :cond_0
 
@@ -80,7 +80,7 @@
 .method public e(Ljava/lang/String;ILjava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/v;->bEY:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bFs:Lorg/a/a/v;
 
     if-eqz v0, :cond_0
 
@@ -90,40 +90,40 @@
     return-void
 .end method
 
-.method public eT(Ljava/lang/String;)V
+.method public eO(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/v;->bEY:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bFs:Lorg/a/a/v;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1}, Lorg/a/a/v;->eT(Ljava/lang/String;)V
+    invoke-virtual {v0, p1}, Lorg/a/a/v;->eO(Ljava/lang/String;)V
 
     :cond_0
     return-void
 .end method
 
-.method public eU(Ljava/lang/String;)V
+.method public eP(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/v;->bEY:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bFs:Lorg/a/a/v;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1}, Lorg/a/a/v;->eU(Ljava/lang/String;)V
+    invoke-virtual {v0, p1}, Lorg/a/a/v;->eP(Ljava/lang/String;)V
 
     :cond_0
     return-void
 .end method
 
-.method public eV(Ljava/lang/String;)V
+.method public eQ(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/v;->bEY:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bFs:Lorg/a/a/v;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1}, Lorg/a/a/v;->eV(Ljava/lang/String;)V
+    invoke-virtual {v0, p1}, Lorg/a/a/v;->eQ(Ljava/lang/String;)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/org/a/a/w.smali b/com.discord/smali_classes2/org/a/a/w.smali
index d82d949540..e015046e29 100644
--- a/com.discord/smali_classes2/org/a/a/w.smali
+++ b/com.discord/smali_classes2/org/a/a/w.smali
@@ -4,39 +4,39 @@
 
 
 # instance fields
-.field final bCn:Lorg/a/a/z;
+.field final bCH:Lorg/a/a/z;
 
-.field final bEZ:I
+.field bFA:I
 
-.field final bFa:I
+.field final bFB:Lorg/a/a/d;
 
-.field final bFb:I
+.field bFC:I
 
-.field bFc:I
+.field final bFD:Lorg/a/a/d;
 
-.field final bFd:Lorg/a/a/d;
+.field bFE:I
 
-.field bFe:I
+.field final bFF:Lorg/a/a/d;
 
-.field final bFf:Lorg/a/a/d;
+.field bFG:I
 
-.field bFg:I
+.field final bFH:Lorg/a/a/d;
 
-.field final bFh:Lorg/a/a/d;
+.field bFI:I
 
-.field bFi:I
+.field final bFt:I
 
-.field final bFj:Lorg/a/a/d;
+.field final bFu:I
 
-.field bFk:I
+.field final bFv:I
 
-.field final bFl:Lorg/a/a/d;
+.field bFw:I
 
-.field bFm:I
+.field final bFx:Lorg/a/a/d;
 
-.field final bFn:Lorg/a/a/d;
+.field bFy:I
 
-.field bFo:I
+.field final bFz:Lorg/a/a/d;
 
 
 # direct methods
@@ -45,49 +45,49 @@
 
     invoke-direct {p0}, Lorg/a/a/v;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iput-object p1, p0, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
-    iput p2, p0, Lorg/a/a/w;->bEZ:I
+    iput p2, p0, Lorg/a/a/w;->bFt:I
 
-    iput p3, p0, Lorg/a/a/w;->bFa:I
+    iput p3, p0, Lorg/a/a/w;->bFu:I
 
-    iput p4, p0, Lorg/a/a/w;->bFb:I
+    iput p4, p0, Lorg/a/a/w;->bFv:I
 
     new-instance p1, Lorg/a/a/d;
 
     invoke-direct {p1}, Lorg/a/a/d;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/w;->bFd:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/w;->bFx:Lorg/a/a/d;
 
     new-instance p1, Lorg/a/a/d;
 
     invoke-direct {p1}, Lorg/a/a/d;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/w;->bFf:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/w;->bFz:Lorg/a/a/d;
 
     new-instance p1, Lorg/a/a/d;
 
     invoke-direct {p1}, Lorg/a/a/d;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/w;->bFh:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/w;->bFB:Lorg/a/a/d;
 
     new-instance p1, Lorg/a/a/d;
 
     invoke-direct {p1}, Lorg/a/a/d;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/w;->bFj:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/w;->bFD:Lorg/a/a/d;
 
     new-instance p1, Lorg/a/a/d;
 
     invoke-direct {p1}, Lorg/a/a/d;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/w;->bFl:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/w;->bFF:Lorg/a/a/d;
 
     new-instance p1, Lorg/a/a/d;
 
     invoke-direct {p1}, Lorg/a/a/d;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/w;->bFn:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/w;->bFH:Lorg/a/a/d;
 
     return-void
 .end method
@@ -97,9 +97,9 @@
 .method public final varargs a(Ljava/lang/String;I[Ljava/lang/String;)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/w;->bFf:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bFz:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const/16 v2, 0x14
 
@@ -109,28 +109,28 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     const/4 p1, 0x0
 
     if-nez p3, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/w;->bFf:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/w;->bFz:Lorg/a/a/d;
 
-    invoke-virtual {p2, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p2, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     goto :goto_1
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/w;->bFf:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/w;->bFz:Lorg/a/a/d;
 
     array-length v0, p3
 
-    invoke-virtual {p2, v0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p2, v0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     array-length p2, p3
 
@@ -139,9 +139,9 @@
 
     aget-object v0, p3, p1
 
-    iget-object v1, p0, Lorg/a/a/w;->bFf:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/w;->bFz:Lorg/a/a/d;
 
-    iget-object v2, p0, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const/16 v3, 0x13
 
@@ -151,7 +151,7 @@
 
     iget v0, v0, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v1, v0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     add-int/lit8 p1, p1, 0x1
 
@@ -159,11 +159,11 @@
 
     :cond_1
     :goto_1
-    iget p1, p0, Lorg/a/a/w;->bFe:I
+    iget p1, p0, Lorg/a/a/w;->bFy:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bFe:I
+    iput p1, p0, Lorg/a/a/w;->bFy:I
 
     return-void
 .end method
@@ -171,9 +171,9 @@
 .method public final varargs b(Ljava/lang/String;I[Ljava/lang/String;)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/w;->bFh:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bFB:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const/16 v2, 0x14
 
@@ -183,28 +183,28 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     const/4 p1, 0x0
 
     if-nez p3, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/w;->bFh:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/w;->bFB:Lorg/a/a/d;
 
-    invoke-virtual {p2, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p2, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     goto :goto_1
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/w;->bFh:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/w;->bFB:Lorg/a/a/d;
 
     array-length v0, p3
 
-    invoke-virtual {p2, v0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p2, v0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     array-length p2, p3
 
@@ -213,9 +213,9 @@
 
     aget-object v0, p3, p1
 
-    iget-object v1, p0, Lorg/a/a/w;->bFh:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/w;->bFB:Lorg/a/a/d;
 
-    iget-object v2, p0, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const/16 v3, 0x13
 
@@ -225,7 +225,7 @@
 
     iget v0, v0, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v1, v0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v1, v0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     add-int/lit8 p1, p1, 0x1
 
@@ -233,11 +233,11 @@
 
     :cond_1
     :goto_1
-    iget p1, p0, Lorg/a/a/w;->bFg:I
+    iget p1, p0, Lorg/a/a/w;->bFA:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bFg:I
+    iput p1, p0, Lorg/a/a/w;->bFA:I
 
     return-void
 .end method
@@ -245,9 +245,9 @@
 .method public final varargs d(Ljava/lang/String;[Ljava/lang/String;)V
     .locals 5
 
-    iget-object v0, p0, Lorg/a/a/w;->bFl:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bFF:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const/4 v2, 0x7
 
@@ -257,13 +257,13 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget-object p1, p0, Lorg/a/a/w;->bFl:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/w;->bFF:Lorg/a/a/d;
 
     array-length v0, p2
 
-    invoke-virtual {p1, v0}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, v0}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     array-length p1, p2
 
@@ -274,9 +274,9 @@
 
     aget-object v1, p2, v0
 
-    iget-object v3, p0, Lorg/a/a/w;->bFl:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/w;->bFF:Lorg/a/a/d;
 
-    iget-object v4, p0, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     invoke-virtual {v4, v2, v1}, Lorg/a/a/z;->j(ILjava/lang/String;)Lorg/a/a/y;
 
@@ -284,18 +284,18 @@
 
     iget v1, v1, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v3, v1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v3, v1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     add-int/lit8 v0, v0, 0x1
 
     goto :goto_0
 
     :cond_0
-    iget p1, p0, Lorg/a/a/w;->bFk:I
+    iget p1, p0, Lorg/a/a/w;->bFE:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bFk:I
+    iput p1, p0, Lorg/a/a/w;->bFE:I
 
     return-void
 .end method
@@ -303,9 +303,9 @@
 .method public final e(Ljava/lang/String;ILjava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/w;->bFd:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bFx:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const/16 v2, 0x13
 
@@ -315,11 +315,11 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     move-result-object p1
 
@@ -330,28 +330,28 @@
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
-    invoke-virtual {p2, p3}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p2, p3}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result p2
 
     :goto_0
-    invoke-virtual {p1, p2}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {p1, p2}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget p1, p0, Lorg/a/a/w;->bFc:I
+    iget p1, p0, Lorg/a/a/w;->bFw:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bFc:I
+    iput p1, p0, Lorg/a/a/w;->bFw:I
 
     return-void
 .end method
 
-.method public final eT(Ljava/lang/String;)V
+.method public final eO(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -361,17 +361,17 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    iput p1, p0, Lorg/a/a/w;->bFo:I
+    iput p1, p0, Lorg/a/a/w;->bFI:I
 
     return-void
 .end method
 
-.method public final eU(Ljava/lang/String;)V
+.method public final eP(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/w;->bFn:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bFH:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const/16 v2, 0x14
 
@@ -381,23 +381,23 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget p1, p0, Lorg/a/a/w;->bFm:I
+    iget p1, p0, Lorg/a/a/w;->bFG:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bFm:I
+    iput p1, p0, Lorg/a/a/w;->bFG:I
 
     return-void
 .end method
 
-.method public final eV(Ljava/lang/String;)V
+.method public final eQ(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/w;->bFj:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bFD:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bCn:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bCH:Lorg/a/a/z;
 
     const/4 v2, 0x7
 
@@ -407,13 +407,13 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
-    iget p1, p0, Lorg/a/a/w;->bFi:I
+    iget p1, p0, Lorg/a/a/w;->bFC:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bFi:I
+    iput p1, p0, Lorg/a/a/w;->bFC:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/org/a/a/x.smali b/com.discord/smali_classes2/org/a/a/x.smali
index 15a978293b..00769ba3bc 100644
--- a/com.discord/smali_classes2/org/a/a/x.smali
+++ b/com.discord/smali_classes2/org/a/a/x.smali
@@ -4,19 +4,19 @@
 
 
 # static fields
-.field public static final bFp:Ljava/lang/Integer;
+.field public static final bFJ:Ljava/lang/Integer;
 
-.field public static final bFq:Ljava/lang/Integer;
+.field public static final bFK:Ljava/lang/Integer;
 
-.field public static final bFr:Ljava/lang/Integer;
+.field public static final bFL:Ljava/lang/Integer;
 
-.field public static final bFs:Ljava/lang/Integer;
+.field public static final bFM:Ljava/lang/Integer;
 
-.field public static final bFt:Ljava/lang/Integer;
+.field public static final bFN:Ljava/lang/Integer;
 
-.field public static final bFu:Ljava/lang/Integer;
+.field public static final bFO:Ljava/lang/Integer;
 
-.field public static final bFv:Ljava/lang/Integer;
+.field public static final bFP:Ljava/lang/Integer;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bFp:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bFJ:Ljava/lang/Integer;
 
     const/4 v0, 0x1
 
@@ -37,7 +37,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bFq:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bFK:Ljava/lang/Integer;
 
     const/4 v0, 0x2
 
@@ -45,7 +45,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bFr:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bFL:Ljava/lang/Integer;
 
     const/4 v0, 0x3
 
@@ -53,7 +53,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bFs:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bFM:Ljava/lang/Integer;
 
     const/4 v0, 0x4
 
@@ -61,7 +61,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bFt:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bFN:Ljava/lang/Integer;
 
     const/4 v0, 0x5
 
@@ -69,7 +69,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bFu:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bFO:Ljava/lang/Integer;
 
     const/4 v0, 0x6
 
@@ -77,7 +77,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bFv:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bFP:Ljava/lang/Integer;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/org/a/a/y.smali b/com.discord/smali_classes2/org/a/a/y.smali
index 9bfc5cbc37..0d19606d01 100644
--- a/com.discord/smali_classes2/org/a/a/y.smali
+++ b/com.discord/smali_classes2/org/a/a/y.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final bDN:Ljava/lang/String;
+.field final bEh:Ljava/lang/String;
 
-.field final bFw:J
+.field final bFQ:J
 
 .field final index:I
 
@@ -29,20 +29,20 @@
 
     iput p2, p0, Lorg/a/a/y;->tag:I
 
-    iput-object p3, p0, Lorg/a/a/y;->bDN:Ljava/lang/String;
+    iput-object p3, p0, Lorg/a/a/y;->bEh:Ljava/lang/String;
 
     iput-object p4, p0, Lorg/a/a/y;->name:Ljava/lang/String;
 
     iput-object p5, p0, Lorg/a/a/y;->value:Ljava/lang/String;
 
-    iput-wide p6, p0, Lorg/a/a/y;->bFw:J
+    iput-wide p6, p0, Lorg/a/a/y;->bFQ:J
 
     return-void
 .end method
 
 
 # virtual methods
-.method final Jg()I
+.method final IT()I
     .locals 1
 
     iget v0, p0, Lorg/a/a/y;->info:I
@@ -51,7 +51,7 @@
 
     iget-object v0, p0, Lorg/a/a/y;->value:Ljava/lang/String;
 
-    invoke-static {v0}, Lorg/a/a/aa;->fd(Ljava/lang/String;)I
+    invoke-static {v0}, Lorg/a/a/aa;->eY(Ljava/lang/String;)I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/org/a/a/z$a.smali b/com.discord/smali_classes2/org/a/a/z$a.smali
index 6aa6da8a4a..39c71c0c66 100644
--- a/com.discord/smali_classes2/org/a/a/z$a.smali
+++ b/com.discord/smali_classes2/org/a/a/z$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field bFH:Lorg/a/a/z$a;
+.field bGb:Lorg/a/a/z$a;
 
 .field final cG:I
 
diff --git a/com.discord/smali_classes2/org/a/a/z.smali b/com.discord/smali_classes2/org/a/a/z.smali
index af99f2406d..15763a3b37 100644
--- a/com.discord/smali_classes2/org/a/a/z.smali
+++ b/com.discord/smali_classes2/org/a/a/z.smali
@@ -12,25 +12,25 @@
 
 
 # instance fields
-.field private bFA:I
+.field final bFR:Lorg/a/a/h;
 
-.field private bFB:[Lorg/a/a/z$a;
+.field final bFS:Lorg/a/a/e;
 
-.field bFC:Lorg/a/a/d;
+.field bFT:I
 
-.field bFD:I
+.field private bFU:I
 
-.field bFE:Lorg/a/a/d;
+.field private bFV:[Lorg/a/a/z$a;
 
-.field private bFF:I
+.field bFW:Lorg/a/a/d;
 
-.field bFG:[Lorg/a/a/z$a;
+.field bFX:I
 
-.field final bFx:Lorg/a/a/h;
+.field bFY:Lorg/a/a/d;
 
-.field final bFy:Lorg/a/a/e;
+.field private bFZ:I
 
-.field bFz:I
+.field bGa:[Lorg/a/a/z$a;
 
 .field className:Ljava/lang/String;
 
@@ -43,17 +43,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/z;->bFx:Lorg/a/a/h;
+    iput-object p1, p0, Lorg/a/a/z;->bFR:Lorg/a/a/h;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/z;->bFy:Lorg/a/a/e;
+    iput-object p1, p0, Lorg/a/a/z;->bFS:Lorg/a/a/e;
 
     const/16 p1, 0x100
 
     new-array p1, p1, [Lorg/a/a/z$a;
 
-    iput-object p1, p0, Lorg/a/a/z;->bFB:[Lorg/a/a/z$a;
+    iput-object p1, p0, Lorg/a/a/z;->bFV:[Lorg/a/a/z$a;
 
     const/4 p1, 0x1
 
@@ -63,7 +63,7 @@
 
     invoke-direct {p1}, Lorg/a/a/d;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/z;->bFC:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/z;->bFW:Lorg/a/a/d;
 
     return-void
 .end method
@@ -71,9 +71,9 @@
 .method private a(Lorg/a/a/z$a;)Lorg/a/a/z$a;
     .locals 7
 
-    iget v0, p0, Lorg/a/a/z;->bFA:I
+    iget v0, p0, Lorg/a/a/z;->bFU:I
 
-    iget-object v1, p0, Lorg/a/a/z;->bFB:[Lorg/a/a/z$a;
+    iget-object v1, p0, Lorg/a/a/z;->bFV:[Lorg/a/a/z$a;
 
     array-length v2, v1
 
@@ -96,7 +96,7 @@
     :goto_0
     if-ltz v0, :cond_1
 
-    iget-object v3, p0, Lorg/a/a/z;->bFB:[Lorg/a/a/z$a;
+    iget-object v3, p0, Lorg/a/a/z;->bFV:[Lorg/a/a/z$a;
 
     aget-object v3, v3, v0
 
@@ -107,11 +107,11 @@
 
     rem-int/2addr v4, v1
 
-    iget-object v5, v3, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iget-object v5, v3, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     aget-object v6, v2, v4
 
-    iput-object v6, v3, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iput-object v6, v3, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     aput-object v3, v2, v4
 
@@ -125,18 +125,18 @@
     goto :goto_0
 
     :cond_1
-    iput-object v2, p0, Lorg/a/a/z;->bFB:[Lorg/a/a/z$a;
+    iput-object v2, p0, Lorg/a/a/z;->bFV:[Lorg/a/a/z$a;
 
     :cond_2
-    iget v0, p0, Lorg/a/a/z;->bFA:I
+    iget v0, p0, Lorg/a/a/z;->bFU:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/z;->bFA:I
+    iput v0, p0, Lorg/a/a/z;->bFU:I
 
     iget v0, p1, Lorg/a/a/z$a;->cG:I
 
-    iget-object v1, p0, Lorg/a/a/z;->bFB:[Lorg/a/a/z$a;
+    iget-object v1, p0, Lorg/a/a/z;->bFV:[Lorg/a/a/z$a;
 
     array-length v2, v1
 
@@ -144,7 +144,7 @@
 
     aget-object v2, v1, v0
 
-    iput-object v2, p1, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iput-object v2, p1, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     aput-object p1, v1, v0
 
@@ -206,7 +206,7 @@
 .method private b(Lorg/a/a/z$a;)I
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/z;->bFG:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bGa:[Lorg/a/a/z$a;
 
     if-nez v0, :cond_0
 
@@ -214,12 +214,12 @@
 
     new-array v0, v0, [Lorg/a/a/z$a;
 
-    iput-object v0, p0, Lorg/a/a/z;->bFG:[Lorg/a/a/z$a;
+    iput-object v0, p0, Lorg/a/a/z;->bGa:[Lorg/a/a/z$a;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/z;->bFF:I
+    iget v0, p0, Lorg/a/a/z;->bFZ:I
 
-    iget-object v1, p0, Lorg/a/a/z;->bFG:[Lorg/a/a/z$a;
+    iget-object v1, p0, Lorg/a/a/z;->bGa:[Lorg/a/a/z$a;
 
     array-length v2, v1
 
@@ -237,16 +237,16 @@
 
     invoke-static {v1, v3, v0, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v0, p0, Lorg/a/a/z;->bFG:[Lorg/a/a/z$a;
+    iput-object v0, p0, Lorg/a/a/z;->bGa:[Lorg/a/a/z$a;
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bFG:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bGa:[Lorg/a/a/z$a;
 
-    iget v1, p0, Lorg/a/a/z;->bFF:I
+    iget v1, p0, Lorg/a/a/z;->bFZ:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lorg/a/a/z;->bFF:I
+    iput v2, p0, Lorg/a/a/z;->bFZ:I
 
     aput-object p1, v0, v1
 
@@ -266,7 +266,7 @@
 
     move-result v8
 
-    invoke-direct {p0, v8}, Lorg/a/a/z;->en(I)Lorg/a/a/z$a;
+    invoke-direct {p0, v8}, Lorg/a/a/z;->ej(I)Lorg/a/a/z$a;
 
     move-result-object v0
 
@@ -283,7 +283,7 @@
 
     if-ne v1, v8, :cond_0
 
-    iget-wide v1, v0, Lorg/a/a/z$a;->bFw:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bFQ:J
 
     int-to-long v3, p1
 
@@ -291,7 +291,7 @@
 
     if-nez v5, :cond_0
 
-    iget-object v1, v0, Lorg/a/a/z$a;->bDN:Ljava/lang/String;
+    iget-object v1, v0, Lorg/a/a/z$a;->bEh:Ljava/lang/String;
 
     invoke-virtual {v1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -318,7 +318,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     goto :goto_0
 
@@ -327,7 +327,7 @@
 
     if-gt p1, v0, :cond_2
 
-    iget-object p5, p0, Lorg/a/a/z;->bFC:Lorg/a/a/d;
+    iget-object p5, p0, Lorg/a/a/z;->bFW:Lorg/a/a/d;
 
     invoke-virtual {p0, p2, p3, p4}, Lorg/a/a/z;->n(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/y;
 
@@ -335,12 +335,12 @@
 
     iget v0, v0, Lorg/a/a/y;->index:I
 
-    invoke-virtual {p5, p1, v0}, Lorg/a/a/d;->ag(II)Lorg/a/a/d;
+    invoke-virtual {p5, p1, v0}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
 
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/z;->bFC:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bFW:Lorg/a/a/d;
 
     invoke-virtual {p0, p2, p3, p4, p5}, Lorg/a/a/z;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lorg/a/a/y;
 
@@ -348,7 +348,7 @@
 
     iget p5, p5, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v0, p1, p5}, Lorg/a/a/d;->ag(II)Lorg/a/a/d;
+    invoke-virtual {v0, p1, p5}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
 
     :goto_1
     new-instance p5, Lorg/a/a/z$a;
@@ -431,7 +431,7 @@
 
     move-result v8
 
-    invoke-direct {p0, v8}, Lorg/a/a/z;->en(I)Lorg/a/a/z$a;
+    invoke-direct {p0, v8}, Lorg/a/a/z;->ej(I)Lorg/a/a/z$a;
 
     move-result-object v0
 
@@ -446,7 +446,7 @@
 
     if-ne v1, v8, :cond_0
 
-    iget-object v1, v0, Lorg/a/a/z$a;->bDN:Ljava/lang/String;
+    iget-object v1, v0, Lorg/a/a/z$a;->bEh:Ljava/lang/String;
 
     invoke-virtual {v1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -473,12 +473,12 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bFC:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bFW:Lorg/a/a/d;
 
     const/4 v1, 0x7
 
@@ -551,10 +551,10 @@
     return p0
 .end method
 
-.method private en(I)Lorg/a/a/z$a;
+.method private ej(I)Lorg/a/a/z$a;
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/z;->bFB:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bFV:[Lorg/a/a/z$a;
 
     array-length v1, v0
 
@@ -624,11 +624,11 @@
 .method private r(III)Lorg/a/a/y;
     .locals 8
 
-    iget-object v0, p0, Lorg/a/a/z;->bFE:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bFY:Lorg/a/a/d;
 
     iget-object v0, v0, Lorg/a/a/d;->data:[B
 
-    invoke-direct {p0, p3}, Lorg/a/a/z;->en(I)Lorg/a/a/z$a;
+    invoke-direct {p0, p3}, Lorg/a/a/z;->ej(I)Lorg/a/a/z$a;
 
     move-result-object v1
 
@@ -645,7 +645,7 @@
 
     if-ne v2, p3, :cond_2
 
-    iget-wide v2, v1, Lorg/a/a/z$a;->bFw:J
+    iget-wide v2, v1, Lorg/a/a/z$a;->bFQ:J
 
     long-to-int v3, v2
 
@@ -679,25 +679,25 @@
     :goto_2
     if-eqz v2, :cond_2
 
-    iget-object p2, p0, Lorg/a/a/z;->bFE:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/z;->bFY:Lorg/a/a/d;
 
     iput p1, p2, Lorg/a/a/d;->length:I
 
     return-object v1
 
     :cond_2
-    iget-object v1, v1, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iget-object v1, v1, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_3
     new-instance p2, Lorg/a/a/z$a;
 
-    iget v3, p0, Lorg/a/a/z;->bFD:I
+    iget v3, p0, Lorg/a/a/z;->bFX:I
 
     add-int/lit8 v0, v3, 0x1
 
-    iput v0, p0, Lorg/a/a/z;->bFD:I
+    iput v0, p0, Lorg/a/a/z;->bFX:I
 
     const/16 v4, 0x40
 
@@ -718,7 +718,7 @@
 
 
 # virtual methods
-.method final E(F)Lorg/a/a/y;
+.method final D(F)Lorg/a/a/y;
     .locals 1
 
     invoke-static {p1}, Ljava/lang/Float;->floatToRawIntBits(F)I
@@ -727,25 +727,25 @@
 
     const/4 v0, 0x4
 
-    invoke-virtual {p0, v0, p1}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {p0, v0, p1}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method final Jh()I
+.method final IU()I
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/z;->bFE:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bFY:Lorg/a/a/d;
 
     if-eqz v0, :cond_0
 
     const-string v0, "BootstrapMethods"
 
-    invoke-virtual {p0, v0}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p0, v0}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
-    iget-object v0, p0, Lorg/a/a/z;->bFE:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bFY:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
@@ -762,7 +762,7 @@
 .method final varargs a(Lorg/a/a/p;[Ljava/lang/Object;)Lorg/a/a/y;
     .locals 9
 
-    iget-object v0, p0, Lorg/a/a/z;->bFE:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bFY:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -770,7 +770,7 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/z;->bFE:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/z;->bFY:Lorg/a/a/d;
 
     :cond_0
     array-length v1, p2
@@ -795,13 +795,13 @@
 
     iget v4, p1, Lorg/a/a/p;->tag:I
 
-    iget-object v5, p1, Lorg/a/a/p;->bDN:Ljava/lang/String;
+    iget-object v5, p1, Lorg/a/a/p;->bEh:Ljava/lang/String;
 
     iget-object v6, p1, Lorg/a/a/p;->name:Ljava/lang/String;
 
     iget-object v7, p1, Lorg/a/a/p;->descriptor:Ljava/lang/String;
 
-    iget-boolean v8, p1, Lorg/a/a/p;->bDO:Z
+    iget-boolean v8, p1, Lorg/a/a/p;->bEi:Z
 
     move-object v3, p0
 
@@ -811,11 +811,11 @@
 
     iget v3, v3, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v0, v3}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, v3}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     array-length v3, p2
 
-    invoke-virtual {v0, v3}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, v3}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     array-length v3, p2
 
@@ -832,7 +832,7 @@
 
     iget v5, v5, Lorg/a/a/y;->index:I
 
-    invoke-virtual {v0, v5}, Lorg/a/a/d;->ea(I)Lorg/a/a/d;
+    invoke-virtual {v0, v5}, Lorg/a/a/d;->dW(I)Lorg/a/a/d;
 
     add-int/lit8 v4, v4, 0x1
 
@@ -876,7 +876,7 @@
     return-object p1
 .end method
 
-.method final an(II)Lorg/a/a/y;
+.method final am(II)Lorg/a/a/y;
     .locals 8
 
     add-int v0, p1, p2
@@ -885,7 +885,7 @@
 
     and-int v7, v0, v1
 
-    invoke-direct {p0, v7}, Lorg/a/a/z;->en(I)Lorg/a/a/z$a;
+    invoke-direct {p0, v7}, Lorg/a/a/z;->ej(I)Lorg/a/a/z$a;
 
     move-result-object v0
 
@@ -900,7 +900,7 @@
 
     if-ne v1, v7, :cond_0
 
-    iget-wide v1, v0, Lorg/a/a/z$a;->bFw:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bFQ:J
 
     int-to-long v3, p2
 
@@ -911,18 +911,18 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bFC:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bFW:Lorg/a/a/d;
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v0
 
-    invoke-virtual {v0, p2}, Lorg/a/a/d;->eb(I)Lorg/a/a/d;
+    invoke-virtual {v0, p2}, Lorg/a/a/d;->dX(I)Lorg/a/a/d;
 
     new-instance v0, Lorg/a/a/z$a;
 
@@ -947,7 +947,7 @@
     return-object p1
 .end method
 
-.method final ao(II)I
+.method final an(II)I
     .locals 10
 
     int-to-long v0, p1
@@ -970,7 +970,7 @@
 
     and-int v9, v0, v2
 
-    invoke-direct {p0, v9}, Lorg/a/a/z;->en(I)Lorg/a/a/z$a;
+    invoke-direct {p0, v9}, Lorg/a/a/z;->ej(I)Lorg/a/a/z$a;
 
     move-result-object v0
 
@@ -985,7 +985,7 @@
 
     if-ne v2, v9, :cond_0
 
-    iget-wide v2, v0, Lorg/a/a/z$a;->bFw:J
+    iget-wide v2, v0, Lorg/a/a/z$a;->bFQ:J
 
     cmp-long v4, v2, v7
 
@@ -996,36 +996,36 @@
     return p1
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bFG:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bGa:[Lorg/a/a/z$a;
 
     aget-object p1, v0, p1
 
     iget-object p1, p1, Lorg/a/a/z$a;->value:Ljava/lang/String;
 
-    iget-object v0, p0, Lorg/a/a/z;->bFG:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bGa:[Lorg/a/a/z$a;
 
     aget-object p2, v0, p2
 
     iget-object p2, p2, Lorg/a/a/z$a;->value:Ljava/lang/String;
 
-    iget-object v0, p0, Lorg/a/a/z;->bFx:Lorg/a/a/h;
+    iget-object v0, p0, Lorg/a/a/z;->bFR:Lorg/a/a/h;
 
     invoke-virtual {v0, p1, p2}, Lorg/a/a/h;->av(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lorg/a/a/z;->eY(Ljava/lang/String;)I
+    invoke-virtual {p0, p1}, Lorg/a/a/z;->eT(Ljava/lang/String;)I
 
     move-result p1
 
     new-instance p2, Lorg/a/a/z$a;
 
-    iget v5, p0, Lorg/a/a/z;->bFF:I
+    iget v5, p0, Lorg/a/a/z;->bFZ:I
 
     const/16 v6, 0x82
 
@@ -1049,7 +1049,7 @@
 
     move-result v0
 
-    invoke-direct {p0, v0}, Lorg/a/a/z;->en(I)Lorg/a/a/z$a;
+    invoke-direct {p0, v0}, Lorg/a/a/z;->ej(I)Lorg/a/a/z$a;
 
     move-result-object v1
 
@@ -1087,18 +1087,18 @@
     return p1
 
     :cond_0
-    iget-object v1, v1, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iget-object v1, v1, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lorg/a/a/z;->bFC:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/z;->bFW:Lorg/a/a/d;
 
-    invoke-virtual {p0, p1}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p0, p1}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v3
 
-    invoke-virtual {p0, p2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p0, p2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v4
 
@@ -1130,7 +1130,7 @@
 
     move-result v8
 
-    invoke-direct {p0, v8}, Lorg/a/a/z;->en(I)Lorg/a/a/z$a;
+    invoke-direct {p0, v8}, Lorg/a/a/z;->ej(I)Lorg/a/a/z$a;
 
     move-result-object v0
 
@@ -1145,7 +1145,7 @@
 
     if-ne v1, v8, :cond_0
 
-    iget-wide v1, v0, Lorg/a/a/z$a;->bFw:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bFQ:J
 
     int-to-long v3, p4
 
@@ -1172,12 +1172,12 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bFC:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bFW:Lorg/a/a/d;
 
     invoke-virtual {p0, p2, p3}, Lorg/a/a/z;->aw(Ljava/lang/String;Ljava/lang/String;)I
 
@@ -1229,7 +1229,7 @@
 
     move-result p1
 
-    invoke-virtual {p0, v1, p1}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {p0, v1, p1}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object p1
 
@@ -1246,7 +1246,7 @@
 
     move-result p1
 
-    invoke-virtual {p0, v1, p1}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {p0, v1, p1}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object p1
 
@@ -1263,7 +1263,7 @@
 
     move-result p1
 
-    invoke-virtual {p0, v1, p1}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {p0, v1, p1}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object p1
 
@@ -1280,7 +1280,7 @@
 
     move-result p1
 
-    invoke-virtual {p0, v1, p1}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {p0, v1, p1}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object p1
 
@@ -1297,7 +1297,7 @@
 
     move-result p1
 
-    invoke-virtual {p0, v1, p1}, Lorg/a/a/z;->an(II)Lorg/a/a/y;
+    invoke-virtual {p0, v1, p1}, Lorg/a/a/z;->am(II)Lorg/a/a/y;
 
     move-result-object p1
 
@@ -1314,7 +1314,7 @@
 
     move-result p1
 
-    invoke-virtual {p0, p1}, Lorg/a/a/z;->E(F)Lorg/a/a/y;
+    invoke-virtual {p0, p1}, Lorg/a/a/z;->D(F)Lorg/a/a/y;
 
     move-result-object p1
 
@@ -1378,7 +1378,7 @@
 
     check-cast p1, Lorg/a/a/aa;
 
-    invoke-virtual {p1}, Lorg/a/a/aa;->Jk()I
+    invoke-virtual {p1}, Lorg/a/a/aa;->IX()I
 
     move-result v0
 
@@ -1388,7 +1388,7 @@
 
     if-ne v0, v1, :cond_9
 
-    invoke-virtual {p1}, Lorg/a/a/aa;->Jj()Ljava/lang/String;
+    invoke-virtual {p1}, Lorg/a/a/aa;->IW()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1435,13 +1435,13 @@
 
     iget v1, p1, Lorg/a/a/p;->tag:I
 
-    iget-object v2, p1, Lorg/a/a/p;->bDN:Ljava/lang/String;
+    iget-object v2, p1, Lorg/a/a/p;->bEh:Ljava/lang/String;
 
     iget-object v3, p1, Lorg/a/a/p;->name:Ljava/lang/String;
 
     iget-object v4, p1, Lorg/a/a/p;->descriptor:Ljava/lang/String;
 
-    iget-boolean v5, p1, Lorg/a/a/p;->bDO:Z
+    iget-boolean v5, p1, Lorg/a/a/p;->bEi:Z
 
     move-object v0, p0
 
@@ -1462,9 +1462,9 @@
 
     iget-object v1, p1, Lorg/a/a/i;->descriptor:Ljava/lang/String;
 
-    iget-object v2, p1, Lorg/a/a/i;->bDd:Lorg/a/a/p;
+    iget-object v2, p1, Lorg/a/a/i;->bDx:Lorg/a/a/p;
 
-    iget-object p1, p1, Lorg/a/a/i;->bDe:[Ljava/lang/Object;
+    iget-object p1, p1, Lorg/a/a/i;->bDy:[Ljava/lang/Object;
 
     invoke-direct {p0, v0, v1, v2, p1}, Lorg/a/a/z;->b(Ljava/lang/String;Ljava/lang/String;Lorg/a/a/p;[Ljava/lang/Object;)Lorg/a/a/y;
 
@@ -1510,7 +1510,7 @@
     return-object p1
 .end method
 
-.method final eW(Ljava/lang/String;)Lorg/a/a/y;
+.method final eR(Ljava/lang/String;)Lorg/a/a/y;
     .locals 1
 
     const/4 v0, 0x7
@@ -1522,7 +1522,7 @@
     return-object p1
 .end method
 
-.method final eX(Ljava/lang/String;)I
+.method final eS(Ljava/lang/String;)I
     .locals 5
 
     const/4 v0, 0x1
@@ -1531,7 +1531,7 @@
 
     move-result v1
 
-    invoke-direct {p0, v1}, Lorg/a/a/z;->en(I)Lorg/a/a/z$a;
+    invoke-direct {p0, v1}, Lorg/a/a/z;->ej(I)Lorg/a/a/z$a;
 
     move-result-object v2
 
@@ -1559,18 +1559,18 @@
     return p1
 
     :cond_0
-    iget-object v2, v2, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iget-object v2, v2, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v2, p0, Lorg/a/a/z;->bFC:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/z;->bFW:Lorg/a/a/d;
 
-    invoke-virtual {v2, v0}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v2, v0}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    invoke-virtual {v2, p1}, Lorg/a/a/d;->eP(Ljava/lang/String;)Lorg/a/a/d;
+    invoke-virtual {v2, p1}, Lorg/a/a/d;->eK(Ljava/lang/String;)Lorg/a/a/d;
 
     new-instance v2, Lorg/a/a/z$a;
 
@@ -1591,7 +1591,7 @@
     return p1
 .end method
 
-.method final eY(Ljava/lang/String;)I
+.method final eT(Ljava/lang/String;)I
     .locals 4
 
     const/16 v0, 0x80
@@ -1600,7 +1600,7 @@
 
     move-result v1
 
-    invoke-direct {p0, v1}, Lorg/a/a/z;->en(I)Lorg/a/a/z$a;
+    invoke-direct {p0, v1}, Lorg/a/a/z;->ej(I)Lorg/a/a/z$a;
 
     move-result-object v2
 
@@ -1628,14 +1628,14 @@
     return p1
 
     :cond_0
-    iget-object v2, v2, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iget-object v2, v2, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
     new-instance v2, Lorg/a/a/z$a;
 
-    iget v3, p0, Lorg/a/a/z;->bFF:I
+    iget v3, p0, Lorg/a/a/z;->bFZ:I
 
     invoke-direct {v2, v3, v0, p1, v1}, Lorg/a/a/z$a;-><init>(IILjava/lang/String;I)V
 
@@ -1669,7 +1669,7 @@
 
     move-result v0
 
-    invoke-direct {p0, v0}, Lorg/a/a/z;->en(I)Lorg/a/a/z$a;
+    invoke-direct {p0, v0}, Lorg/a/a/z;->ej(I)Lorg/a/a/z$a;
 
     move-result-object v1
 
@@ -1695,18 +1695,18 @@
     return-object v1
 
     :cond_0
-    iget-object v1, v1, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iget-object v1, v1, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lorg/a/a/z;->bFC:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/z;->bFW:Lorg/a/a/d;
 
-    invoke-virtual {p0, p2}, Lorg/a/a/z;->eX(Ljava/lang/String;)I
+    invoke-virtual {p0, p2}, Lorg/a/a/z;->eS(Ljava/lang/String;)I
 
     move-result v2
 
-    invoke-virtual {v1, p1, v2}, Lorg/a/a/d;->af(II)Lorg/a/a/d;
+    invoke-virtual {v1, p1, v2}, Lorg/a/a/d;->ae(II)Lorg/a/a/d;
 
     new-instance v1, Lorg/a/a/z$a;
 
@@ -1744,7 +1744,7 @@
 
     move-result v5
 
-    invoke-direct {p0, v5}, Lorg/a/a/z;->en(I)Lorg/a/a/z$a;
+    invoke-direct {p0, v5}, Lorg/a/a/z;->ej(I)Lorg/a/a/z$a;
 
     move-result-object v0
 
@@ -1759,7 +1759,7 @@
 
     if-ne v1, v5, :cond_0
 
-    iget-wide v1, v0, Lorg/a/a/z$a;->bFw:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bFQ:J
 
     cmp-long v3, v1, p2
 
@@ -1768,16 +1768,16 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
     iget v1, p0, Lorg/a/a/z;->constantPoolCount:I
 
-    iget-object v0, p0, Lorg/a/a/z;->bFC:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bFW:Lorg/a/a/d;
 
-    invoke-virtual {v0, p1}, Lorg/a/a/d;->dZ(I)Lorg/a/a/d;
+    invoke-virtual {v0, p1}, Lorg/a/a/d;->dV(I)Lorg/a/a/d;
 
     move-result-object v0
 
@@ -1813,7 +1813,7 @@
 
     move-result v5
 
-    invoke-direct {p0, v5}, Lorg/a/a/z;->en(I)Lorg/a/a/z$a;
+    invoke-direct {p0, v5}, Lorg/a/a/z;->ej(I)Lorg/a/a/z$a;
 
     move-result-object v0
 
@@ -1830,7 +1830,7 @@
 
     if-ne v1, v5, :cond_0
 
-    iget-wide v1, v0, Lorg/a/a/z$a;->bFw:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bFQ:J
 
     int-to-long v3, p2
 
@@ -1851,14 +1851,14 @@
     return p1
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bFH:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bGb:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
     new-instance v6, Lorg/a/a/z$a;
 
-    iget v1, p0, Lorg/a/a/z;->bFF:I
+    iget v1, p0, Lorg/a/a/z;->bFZ:I
 
     int-to-long v3, p2
 
diff --git a/com.discord/smali_classes2/org/apache/commons/a/a/a.smali b/com.discord/smali_classes2/org/apache/commons/a/a/a.smali
index b453c086f9..eff121f9d2 100644
--- a/com.discord/smali_classes2/org/apache/commons/a/a/a.smali
+++ b/com.discord/smali_classes2/org/apache/commons/a/a/a.smali
@@ -4,27 +4,27 @@
 
 
 # static fields
-.field private static final bBR:[B
+.field private static final bCl:[B
 
-.field private static final bBS:[B
+.field private static final bCm:[B
 
-.field private static final bBT:[B
+.field private static final bCn:[B
 
-.field private static final bBU:[B
+.field private static final bCo:[B
 
-.field private static final bBV:[B
+.field private static final bCp:[B
 
 
 # instance fields
-.field private final bBW:I
+.field private final bCq:I
 
-.field private final bBX:[B
+.field private final bCr:[B
 
-.field private final bBY:I
+.field private final bCs:I
 
-.field private final bBZ:[B
+.field private final bCt:[B
 
-.field private final bCa:[B
+.field private final bCu:[B
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lorg/apache/commons/a/a/a;->bBR:[B
+    sput-object v0, Lorg/apache/commons/a/a/a;->bCl:[B
 
     const/16 v0, 0x5b
 
@@ -45,7 +45,7 @@
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lorg/apache/commons/a/a/a;->bBS:[B
+    sput-object v0, Lorg/apache/commons/a/a/a;->bCm:[B
 
     const/16 v0, 0x20
 
@@ -53,7 +53,7 @@
 
     fill-array-data v1, :array_2
 
-    sput-object v1, Lorg/apache/commons/a/a/a;->bBT:[B
+    sput-object v1, Lorg/apache/commons/a/a/a;->bCn:[B
 
     const/16 v1, 0x58
 
@@ -61,13 +61,13 @@
 
     fill-array-data v1, :array_3
 
-    sput-object v1, Lorg/apache/commons/a/a/a;->bBU:[B
+    sput-object v1, Lorg/apache/commons/a/a/a;->bCo:[B
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_4
 
-    sput-object v0, Lorg/apache/commons/a/a/a;->bBV:[B
+    sput-object v0, Lorg/apache/commons/a/a/a;->bCp:[B
 
     return-void
 
@@ -368,27 +368,27 @@
 
     invoke-direct {p0, p1, p1}, Lorg/apache/commons/a/a/b;-><init>(II)V
 
-    sget-object p1, Lorg/apache/commons/a/a/a;->bBT:[B
+    sget-object p1, Lorg/apache/commons/a/a/a;->bCn:[B
 
-    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    sget-object p1, Lorg/apache/commons/a/a/a;->bBS:[B
+    sget-object p1, Lorg/apache/commons/a/a/a;->bCm:[B
 
-    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bBX:[B
+    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bCr:[B
 
     const/16 p1, 0x8
 
-    iput p1, p0, Lorg/apache/commons/a/a/a;->bBY:I
+    iput p1, p0, Lorg/apache/commons/a/a/a;->bCs:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bCa:[B
+    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bCu:[B
 
-    iget p1, p0, Lorg/apache/commons/a/a/a;->bBY:I
+    iget p1, p0, Lorg/apache/commons/a/a/a;->bCs:I
 
     add-int/lit8 p1, p1, -0x1
 
-    iput p1, p0, Lorg/apache/commons/a/a/a;->bBW:I
+    iput p1, p0, Lorg/apache/commons/a/a/a;->bCq:I
 
     return-void
 .end method
@@ -413,18 +413,18 @@
 
     iput-boolean v1, p4, Lorg/apache/commons/a/a/b$a;->eof:Z
 
-    iget p1, p4, Lorg/apache/commons/a/a/b$a;->bCk:I
+    iget p1, p4, Lorg/apache/commons/a/a/b$a;->bCE:I
 
     if-nez p1, :cond_1
 
-    iget p1, p0, Lorg/apache/commons/a/a/a;->bCe:I
+    iget p1, p0, Lorg/apache/commons/a/a/a;->bCy:I
 
     if-nez p1, :cond_1
 
     return-void
 
     :cond_1
-    iget p1, p0, Lorg/apache/commons/a/a/a;->bBY:I
+    iget p1, p0, Lorg/apache/commons/a/a/a;->bCs:I
 
     invoke-virtual {p0, p1, p4}, Lorg/apache/commons/a/a/a;->a(ILorg/apache/commons/a/a/b$a;)[B
 
@@ -432,7 +432,7 @@
 
     iget p2, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bCk:I
+    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bCE:I
 
     if-eqz p3, :cond_6
 
@@ -458,9 +458,9 @@
 
     iput v1, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v7, 0x1b
 
@@ -480,9 +480,9 @@
 
     iput v1, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v7, 0x16
 
@@ -502,9 +502,9 @@
 
     iput v1, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v7, 0x11
 
@@ -524,9 +524,9 @@
 
     iput v1, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v7, 0xc
 
@@ -546,9 +546,9 @@
 
     iput v1, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/4 v7, 0x7
 
@@ -568,9 +568,9 @@
 
     iput v1, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     shr-long/2addr v5, v3
 
@@ -588,9 +588,9 @@
 
     iput v1, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     shl-long v2, v5, v2
 
@@ -621,7 +621,7 @@
 
     invoke-direct {p2, p3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bCk:I
+    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bCE:I
 
     invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -640,9 +640,9 @@
 
     iput v2, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v3, 0x13
 
@@ -662,9 +662,9 @@
 
     iput v2, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v3, 0xe
 
@@ -684,9 +684,9 @@
 
     iput v2, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v3, 0x9
 
@@ -706,9 +706,9 @@
 
     iput v2, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     shr-long v5, v6, v5
 
@@ -726,9 +726,9 @@
 
     iput v2, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     shl-long/2addr v5, v1
 
@@ -773,9 +773,9 @@
 
     iput v2, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v3, 0xb
 
@@ -795,9 +795,9 @@
 
     iput v2, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/4 v3, 0x6
 
@@ -817,9 +817,9 @@
 
     iput v2, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     shr-long/2addr v6, v1
 
@@ -837,9 +837,9 @@
 
     iput v1, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v2, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v2, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     shl-long/2addr v2, v5
 
@@ -892,9 +892,9 @@
 
     iput v1, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     shr-long/2addr v5, v2
 
@@ -912,9 +912,9 @@
 
     iput v1, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     shl-long v2, v5, v3
 
@@ -976,7 +976,7 @@
 
     :cond_6
     :goto_0
-    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bCj:I
+    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bCD:I
 
     iget v1, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
@@ -984,21 +984,21 @@
 
     add-int/2addr p3, v1
 
-    iput p3, p4, Lorg/apache/commons/a/a/b$a;->bCj:I
+    iput p3, p4, Lorg/apache/commons/a/a/b$a;->bCD:I
 
-    iget p2, p0, Lorg/apache/commons/a/a/a;->bCe:I
+    iget p2, p0, Lorg/apache/commons/a/a/a;->bCy:I
 
     if-lez p2, :cond_7
 
-    iget p2, p4, Lorg/apache/commons/a/a/b$a;->bCj:I
+    iget p2, p4, Lorg/apache/commons/a/a/b$a;->bCD:I
 
     if-lez p2, :cond_7
 
-    iget-object p2, p0, Lorg/apache/commons/a/a/a;->bCa:[B
+    iget-object p2, p0, Lorg/apache/commons/a/a/a;->bCu:[B
 
     iget p3, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bCa:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bCu:[B
 
     array-length v1, v1
 
@@ -1006,7 +1006,7 @@
 
     iget p1, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object p2, p0, Lorg/apache/commons/a/a/a;->bCa:[B
+    iget-object p2, p0, Lorg/apache/commons/a/a/a;->bCu:[B
 
     array-length p2, p2
 
@@ -1025,13 +1025,13 @@
     :goto_1
     if-ge p2, p3, :cond_b
 
-    iget v3, p0, Lorg/apache/commons/a/a/a;->bBY:I
+    iget v3, p0, Lorg/apache/commons/a/a/a;->bCs:I
 
     invoke-virtual {p0, v3, p4}, Lorg/apache/commons/a/a/a;->a(ILorg/apache/commons/a/a/b$a;)[B
 
     move-result-object v3
 
-    iget v4, p4, Lorg/apache/commons/a/a/b$a;->bCk:I
+    iget v4, p4, Lorg/apache/commons/a/a/b$a;->bCE:I
 
     add-int/2addr v4, v1
 
@@ -1039,7 +1039,7 @@
 
     rem-int/2addr v4, v5
 
-    iput v4, p4, Lorg/apache/commons/a/a/b$a;->bCk:I
+    iput v4, p4, Lorg/apache/commons/a/a/b$a;->bCE:I
 
     add-int/lit8 v4, v2, 0x1
 
@@ -1050,7 +1050,7 @@
     add-int/lit16 v2, v2, 0x100
 
     :cond_9
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v8, 0x8
 
@@ -1060,9 +1060,9 @@
 
     add-long/2addr v6, v9
 
-    iput-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iput-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
-    iget v2, p4, Lorg/apache/commons/a/a/b$a;->bCk:I
+    iget v2, p4, Lorg/apache/commons/a/a/b$a;->bCE:I
 
     if-nez v2, :cond_a
 
@@ -1072,9 +1072,9 @@
 
     iput v6, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v7, 0x23
 
@@ -1094,9 +1094,9 @@
 
     iput v6, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v7, 0x1e
 
@@ -1116,9 +1116,9 @@
 
     iput v6, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v7, 0x19
 
@@ -1138,9 +1138,9 @@
 
     iput v6, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v7, 0x14
 
@@ -1160,9 +1160,9 @@
 
     iput v6, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v7, 0xf
 
@@ -1182,9 +1182,9 @@
 
     iput v6, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     const/16 v7, 0xa
 
@@ -1204,9 +1204,9 @@
 
     iput v6, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     shr-long/2addr v9, v5
 
@@ -1224,9 +1224,9 @@
 
     iput v5, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v5, p0, Lorg/apache/commons/a/a/a;->bBZ:[B
+    iget-object v5, p0, Lorg/apache/commons/a/a/a;->bCt:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     long-to-int v7, v6
 
@@ -1236,27 +1236,27 @@
 
     aput-byte v5, v3, v2
 
-    iget v2, p4, Lorg/apache/commons/a/a/b$a;->bCj:I
+    iget v2, p4, Lorg/apache/commons/a/a/b$a;->bCD:I
 
     add-int/2addr v2, v8
 
-    iput v2, p4, Lorg/apache/commons/a/a/b$a;->bCj:I
+    iput v2, p4, Lorg/apache/commons/a/a/b$a;->bCD:I
 
-    iget v2, p0, Lorg/apache/commons/a/a/a;->bCe:I
+    iget v2, p0, Lorg/apache/commons/a/a/a;->bCy:I
 
     if-lez v2, :cond_a
 
-    iget v2, p0, Lorg/apache/commons/a/a/a;->bCe:I
+    iget v2, p0, Lorg/apache/commons/a/a/a;->bCy:I
 
-    iget v5, p4, Lorg/apache/commons/a/a/b$a;->bCj:I
+    iget v5, p4, Lorg/apache/commons/a/a/b$a;->bCD:I
 
     if-gt v2, v5, :cond_a
 
-    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bCa:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bCu:[B
 
     iget v5, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bCa:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bCu:[B
 
     array-length v6, v6
 
@@ -1264,7 +1264,7 @@
 
     iget v2, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v3, p0, Lorg/apache/commons/a/a/a;->bCa:[B
+    iget-object v3, p0, Lorg/apache/commons/a/a/a;->bCu:[B
 
     array-length v3, v3
 
@@ -1272,7 +1272,7 @@
 
     iput v2, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iput v0, p4, Lorg/apache/commons/a/a/b$a;->bCj:I
+    iput v0, p4, Lorg/apache/commons/a/a/b$a;->bCD:I
 
     :cond_a
     add-int/lit8 p2, p2, 0x1
diff --git a/com.discord/smali_classes2/org/apache/commons/a/a/b$a.smali b/com.discord/smali_classes2/org/apache/commons/a/a/b$a.smali
index 979e50a89c..80582faf24 100644
--- a/com.discord/smali_classes2/org/apache/commons/a/a/b$a.smali
+++ b/com.discord/smali_classes2/org/apache/commons/a/a/b$a.smali
@@ -15,15 +15,15 @@
 
 
 # instance fields
-.field bCg:I
+.field bCA:I
 
-.field bCh:J
+.field bCB:J
 
-.field public bCi:I
+.field public bCC:I
 
-.field bCj:I
+.field bCD:I
 
-.field bCk:I
+.field bCE:I
 
 .field public buffer:[B
 
@@ -72,7 +72,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bCj:I
+    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bCD:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -92,7 +92,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bCg:I
+    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bCA:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -102,7 +102,7 @@
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lorg/apache/commons/a/a/b$a;->bCh:J
+    iget-wide v1, p0, Lorg/apache/commons/a/a/b$a;->bCB:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -112,7 +112,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bCk:I
+    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bCE:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -132,7 +132,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bCi:I
+    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bCC:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/org/apache/commons/a/a/b.smali b/com.discord/smali_classes2/org/apache/commons/a/a/b.smali
index 834551568a..578bd46628 100644
--- a/com.discord/smali_classes2/org/apache/commons/a/a/b.smali
+++ b/com.discord/smali_classes2/org/apache/commons/a/a/b.smali
@@ -12,15 +12,15 @@
 
 
 # instance fields
-.field protected final bCb:B
+.field protected final bCv:B
 
-.field private final bCc:I
+.field private final bCw:I
 
-.field private final bCd:I
+.field private final bCx:I
 
-.field protected final bCe:I
+.field protected final bCy:I
 
-.field private final bCf:I
+.field private final bCz:I
 
 
 # direct methods
@@ -31,21 +31,21 @@
 
     const/16 p1, 0x3d
 
-    iput-byte p1, p0, Lorg/apache/commons/a/a/b;->bCb:B
+    iput-byte p1, p0, Lorg/apache/commons/a/a/b;->bCv:B
 
     const/4 p1, 0x5
 
-    iput p1, p0, Lorg/apache/commons/a/a/b;->bCc:I
+    iput p1, p0, Lorg/apache/commons/a/a/b;->bCw:I
 
     const/16 p1, 0x8
 
-    iput p1, p0, Lorg/apache/commons/a/a/b;->bCd:I
+    iput p1, p0, Lorg/apache/commons/a/a/b;->bCx:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lorg/apache/commons/a/a/b;->bCe:I
+    iput p1, p0, Lorg/apache/commons/a/a/b;->bCy:I
 
-    iput p1, p0, Lorg/apache/commons/a/a/b;->bCf:I
+    iput p1, p0, Lorg/apache/commons/a/a/b;->bCz:I
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     iput v1, p0, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iput v1, p0, Lorg/apache/commons/a/a/b$a;->bCi:I
+    iput v1, p0, Lorg/apache/commons/a/a/b$a;->bCC:I
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/org/b/a/a/a.smali b/com.discord/smali_classes2/org/b/a/a/a.smali
index 5b7acc8dba..a6144f8762 100644
--- a/com.discord/smali_classes2/org/b/a/a/a.smali
+++ b/com.discord/smali_classes2/org/b/a/a/a.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final bFX:Ljava/lang/reflect/Method;
+.field private final bGr:Ljava/lang/reflect/Method;
 
 .field private final type:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
@@ -47,16 +47,16 @@
 
     iput-object p1, p0, Lorg/b/a/a/a;->type:Ljava/lang/Class;
 
-    invoke-static {}, Lorg/b/a/a/a;->Jm()Ljava/lang/reflect/Method;
+    invoke-static {}, Lorg/b/a/a/a;->IZ()Ljava/lang/reflect/Method;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/a;->bFX:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/a/a;->bGr:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method private static Jm()Ljava/lang/reflect/Method;
+.method private static IZ()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -123,7 +123,7 @@
     :try_start_0
     iget-object v0, p0, Lorg/b/a/a/a;->type:Ljava/lang/Class;
 
-    iget-object v1, p0, Lorg/b/a/a/a;->bFX:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lorg/b/a/a/a;->bGr:Ljava/lang/reflect/Method;
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/org/b/a/a/b.smali b/com.discord/smali_classes2/org/b/a/a/b.smali
index d21ef4409a..6db1f3ee9a 100644
--- a/com.discord/smali_classes2/org/b/a/a/b.smali
+++ b/com.discord/smali_classes2/org/b/a/a/b.smali
@@ -20,9 +20,9 @@
 
 
 # instance fields
-.field private final bFY:Ljava/lang/reflect/Method;
+.field private final bGs:Ljava/lang/reflect/Method;
 
-.field private final bFZ:Ljava/lang/Integer;
+.field private final bGt:Ljava/lang/Integer;
 
 .field private final type:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
@@ -49,22 +49,22 @@
 
     iput-object p1, p0, Lorg/b/a/a/b;->type:Ljava/lang/Class;
 
-    invoke-static {}, Lorg/b/a/a/b;->Jn()Ljava/lang/reflect/Method;
+    invoke-static {}, Lorg/b/a/a/b;->Ja()Ljava/lang/reflect/Method;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/b;->bFY:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/a/b;->bGs:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lorg/b/a/a/b;->Jo()Ljava/lang/Integer;
+    invoke-static {}, Lorg/b/a/a/b;->Jb()Ljava/lang/Integer;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/b;->bFZ:Ljava/lang/Integer;
+    iput-object p1, p0, Lorg/b/a/a/b;->bGt:Ljava/lang/Integer;
 
     return-void
 .end method
 
-.method private static Jn()Ljava/lang/reflect/Method;
+.method private static Ja()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -118,7 +118,7 @@
     throw v1
 .end method
 
-.method private static Jo()Ljava/lang/Integer;
+.method private static Jb()Ljava/lang/Integer;
     .locals 6
 
     :try_start_0
@@ -213,7 +213,7 @@
     :try_start_0
     iget-object v0, p0, Lorg/b/a/a/b;->type:Ljava/lang/Class;
 
-    iget-object v1, p0, Lorg/b/a/a/b;->bFY:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lorg/b/a/a/b;->bGs:Ljava/lang/reflect/Method;
 
     const/4 v2, 0x0
 
@@ -229,7 +229,7 @@
 
     const/4 v4, 0x1
 
-    iget-object v5, p0, Lorg/b/a/a/b;->bFZ:Ljava/lang/Integer;
+    iget-object v5, p0, Lorg/b/a/a/b;->bGt:Ljava/lang/Integer;
 
     aput-object v5, v3, v4
 
diff --git a/com.discord/smali_classes2/org/b/a/a/c.smali b/com.discord/smali_classes2/org/b/a/a/c.smali
index 9be2d74cc9..4538a7b62b 100644
--- a/com.discord/smali_classes2/org/b/a/a/c.smali
+++ b/com.discord/smali_classes2/org/b/a/a/c.smali
@@ -20,9 +20,9 @@
 
 
 # instance fields
-.field private final bFY:Ljava/lang/reflect/Method;
+.field private final bGs:Ljava/lang/reflect/Method;
 
-.field private final bGa:Ljava/lang/Long;
+.field private final bGu:Ljava/lang/Long;
 
 .field private final type:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
@@ -49,22 +49,22 @@
 
     iput-object p1, p0, Lorg/b/a/a/c;->type:Ljava/lang/Class;
 
-    invoke-static {}, Lorg/b/a/a/c;->Jn()Ljava/lang/reflect/Method;
+    invoke-static {}, Lorg/b/a/a/c;->Ja()Ljava/lang/reflect/Method;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/c;->bFY:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/a/c;->bGs:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lorg/b/a/a/c;->Jp()Ljava/lang/Long;
+    invoke-static {}, Lorg/b/a/a/c;->Jc()Ljava/lang/Long;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/c;->bGa:Ljava/lang/Long;
+    iput-object p1, p0, Lorg/b/a/a/c;->bGu:Ljava/lang/Long;
 
     return-void
 .end method
 
-.method private static Jn()Ljava/lang/reflect/Method;
+.method private static Ja()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -118,7 +118,7 @@
     throw v1
 .end method
 
-.method private static Jp()Ljava/lang/Long;
+.method private static Jc()Ljava/lang/Long;
     .locals 6
 
     :try_start_0
@@ -213,7 +213,7 @@
     :try_start_0
     iget-object v0, p0, Lorg/b/a/a/c;->type:Ljava/lang/Class;
 
-    iget-object v1, p0, Lorg/b/a/a/c;->bFY:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lorg/b/a/a/c;->bGs:Ljava/lang/reflect/Method;
 
     const/4 v2, 0x0
 
@@ -229,7 +229,7 @@
 
     const/4 v4, 0x1
 
-    iget-object v5, p0, Lorg/b/a/a/c;->bGa:Ljava/lang/Long;
+    iget-object v5, p0, Lorg/b/a/a/c;->bGu:Ljava/lang/Long;
 
     aput-object v5, v3, v4
 
diff --git a/com.discord/smali_classes2/org/b/a/b/a.smali b/com.discord/smali_classes2/org/b/a/b/a.smali
index c3845d6796..d051b4f9df 100644
--- a/com.discord/smali_classes2/org/b/a/b/a.smali
+++ b/com.discord/smali_classes2/org/b/a/b/a.smali
@@ -28,11 +28,11 @@
 
     invoke-direct {p0, p1}, Lorg/b/a/b/b;-><init>(Ljava/lang/Class;)V
 
-    iget-object p1, p0, Lorg/b/a/b/a;->bGb:Ljava/lang/reflect/Constructor;
+    iget-object p1, p0, Lorg/b/a/b/a;->bGv:Ljava/lang/reflect/Constructor;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lorg/b/a/b/a;->bGb:Ljava/lang/reflect/Constructor;
+    iget-object p1, p0, Lorg/b/a/b/a;->bGv:Ljava/lang/reflect/Constructor;
 
     const/4 v0, 0x1
 
diff --git a/com.discord/smali_classes2/org/b/a/b/b.smali b/com.discord/smali_classes2/org/b/a/b/b.smali
index d79ddbf8b7..0f3c55b349 100644
--- a/com.discord/smali_classes2/org/b/a/b/b.smali
+++ b/com.discord/smali_classes2/org/b/a/b/b.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field protected bGb:Ljava/lang/reflect/Constructor;
+.field protected bGv:Ljava/lang/reflect/Constructor;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/reflect/Constructor<",
@@ -50,7 +50,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/b/b;->bGb:Ljava/lang/reflect/Constructor;
+    iput-object p1, p0, Lorg/b/a/b/b;->bGv:Ljava/lang/reflect/Constructor;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -77,7 +77,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lorg/b/a/b/b;->bGb:Ljava/lang/reflect/Constructor;
+    iget-object v0, p0, Lorg/b/a/b/b;->bGv:Ljava/lang/reflect/Constructor;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/org/b/a/b/c$a.smali b/com.discord/smali_classes2/org/b/a/b/c$a.smali
index c9c27b8488..8132bd99c5 100644
--- a/com.discord/smali_classes2/org/b/a/b/c$a.smali
+++ b/com.discord/smali_classes2/org/b/a/b/c$a.smali
@@ -15,21 +15,21 @@
 
 
 # static fields
-.field private static final bGf:[I
+.field private static bGC:[B
 
-.field private static bGi:[B
+.field private static bGD:[B
 
-.field private static bGj:[B
+.field private static final bGz:[I
 
 
 # instance fields
-.field private bGd:I
+.field private bGA:[[B
 
-.field private bGe:I
+.field private final bGB:[B
 
-.field private bGg:[[B
+.field private bGx:I
 
-.field private final bGh:[B
+.field private bGy:I
 
 .field private data:[B
 
@@ -44,7 +44,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lorg/b/a/b/c$a;->bGf:[I
+    sput-object v0, Lorg/b/a/b/c$a;->bGz:[I
 
     :try_start_0
     new-instance v0, Ljava/io/ByteArrayOutputStream;
@@ -67,7 +67,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/a/b/c$a;->bGi:[B
+    sput-object v0, Lorg/b/a/b/c$a;->bGC:[B
 
     new-instance v0, Ljava/io/ByteArrayOutputStream;
 
@@ -93,7 +93,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/a/b/c$a;->bGj:[B
+    sput-object v0, Lorg/b/a/b/c$a;->bGD:[B
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -146,11 +146,11 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lorg/b/a/b/c$a;->bGd:I
+    iput v0, p0, Lorg/b/a/b/c$a;->bGx:I
 
-    iput v0, p0, Lorg/b/a/b/c$a;->bGe:I
+    iput v0, p0, Lorg/b/a/b/c$a;->bGy:I
 
-    sget-object v1, Lorg/b/a/b/c$a;->bGi:[B
+    sget-object v1, Lorg/b/a/b/c$a;->bGC:[B
 
     iput-object v1, p0, Lorg/b/a/b/c$a;->data:[B
 
@@ -207,27 +207,27 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lorg/b/a/b/c$a;->bGh:[B
+    iput-object v1, p0, Lorg/b/a/b/c$a;->bGB:[B
 
     const/4 v1, 0x3
 
     new-array v1, v1, [[B
 
-    sget-object v2, Lorg/b/a/b/c$a;->bGi:[B
+    sget-object v2, Lorg/b/a/b/c$a;->bGC:[B
 
     aput-object v2, v1, v0
 
     const/4 v0, 0x1
 
-    iget-object v2, p0, Lorg/b/a/b/c$a;->bGh:[B
+    iget-object v2, p0, Lorg/b/a/b/c$a;->bGB:[B
 
     aput-object v2, v1, v0
 
-    sget-object v0, Lorg/b/a/b/c$a;->bGj:[B
+    sget-object v0, Lorg/b/a/b/c$a;->bGD:[B
 
     aput-object v0, v1, p1
 
-    iput-object v1, p0, Lorg/b/a/b/c$a;->bGg:[[B
+    iput-object v1, p0, Lorg/b/a/b/c$a;->bGA:[[B
 
     return-void
 
@@ -257,24 +257,24 @@
     throw v0
 .end method
 
-.method private Jq()V
+.method private Jd()V
     .locals 2
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lorg/b/a/b/c$a;->bGd:I
+    iput v0, p0, Lorg/b/a/b/c$a;->bGx:I
 
-    sget-object v0, Lorg/b/a/b/c$a;->bGf:[I
+    sget-object v0, Lorg/b/a/b/c$a;->bGz:[I
 
-    iget v1, p0, Lorg/b/a/b/c$a;->bGe:I
+    iget v1, p0, Lorg/b/a/b/c$a;->bGy:I
 
     aget v0, v0, v1
 
-    iput v0, p0, Lorg/b/a/b/c$a;->bGe:I
+    iput v0, p0, Lorg/b/a/b/c$a;->bGy:I
 
-    iget-object v0, p0, Lorg/b/a/b/c$a;->bGg:[[B
+    iget-object v0, p0, Lorg/b/a/b/c$a;->bGA:[[B
 
-    iget v1, p0, Lorg/b/a/b/c$a;->bGe:I
+    iget v1, p0, Lorg/b/a/b/c$a;->bGy:I
 
     aget-object v0, v0, v1
 
@@ -308,21 +308,21 @@
 
     iget-object v0, p0, Lorg/b/a/b/c$a;->data:[B
 
-    iget v1, p0, Lorg/b/a/b/c$a;->bGd:I
+    iget v1, p0, Lorg/b/a/b/c$a;->bGx:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lorg/b/a/b/c$a;->bGd:I
+    iput v2, p0, Lorg/b/a/b/c$a;->bGx:I
 
     aget-byte v1, v0, v1
 
-    iget v2, p0, Lorg/b/a/b/c$a;->bGd:I
+    iget v2, p0, Lorg/b/a/b/c$a;->bGx:I
 
     array-length v0, v0
 
     if-lt v2, v0, :cond_0
 
-    invoke-direct {p0}, Lorg/b/a/b/c$a;->Jq()V
+    invoke-direct {p0}, Lorg/b/a/b/c$a;->Jd()V
 
     :cond_0
     return v1
@@ -340,7 +340,7 @@
 
     array-length v0, v0
 
-    iget v1, p0, Lorg/b/a/b/c$a;->bGd:I
+    iget v1, p0, Lorg/b/a/b/c$a;->bGx:I
 
     sub-int/2addr v0, v1
 
@@ -353,7 +353,7 @@
 
     iget-object v2, p0, Lorg/b/a/b/c$a;->data:[B
 
-    iget v3, p0, Lorg/b/a/b/c$a;->bGd:I
+    iget v3, p0, Lorg/b/a/b/c$a;->bGx:I
 
     invoke-static {v2, v3, p1, v1, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -361,13 +361,13 @@
 
     sub-int/2addr p2, v0
 
-    invoke-direct {p0}, Lorg/b/a/b/c$a;->Jq()V
+    invoke-direct {p0}, Lorg/b/a/b/c$a;->Jd()V
 
     iget-object v0, p0, Lorg/b/a/b/c$a;->data:[B
 
     array-length v0, v0
 
-    iget v2, p0, Lorg/b/a/b/c$a;->bGd:I
+    iget v2, p0, Lorg/b/a/b/c$a;->bGx:I
 
     sub-int/2addr v0, v2
 
@@ -378,15 +378,15 @@
 
     iget-object v0, p0, Lorg/b/a/b/c$a;->data:[B
 
-    iget v2, p0, Lorg/b/a/b/c$a;->bGd:I
+    iget v2, p0, Lorg/b/a/b/c$a;->bGx:I
 
     invoke-static {v0, v2, p1, v1, p2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget p1, p0, Lorg/b/a/b/c$a;->bGd:I
+    iget p1, p0, Lorg/b/a/b/c$a;->bGx:I
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lorg/b/a/b/c$a;->bGd:I
+    iput p1, p0, Lorg/b/a/b/c$a;->bGx:I
 
     :cond_1
     return p3
diff --git a/com.discord/smali_classes2/org/b/a/b/c.smali b/com.discord/smali_classes2/org/b/a/b/c.smali
index 1a7ca54e27..690f5459fc 100644
--- a/com.discord/smali_classes2/org/b/a/b/c.smali
+++ b/com.discord/smali_classes2/org/b/a/b/c.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field private bGc:Ljava/io/ObjectInputStream;
+.field private bGw:Ljava/io/ObjectInputStream;
 
 
 # direct methods
@@ -59,7 +59,7 @@
 
     invoke-direct {v0, v1}, Ljava/io/ObjectInputStream;-><init>(Ljava/io/InputStream;)V
 
-    iput-object v0, p0, Lorg/b/a/b/c;->bGc:Ljava/io/ObjectInputStream;
+    iput-object v0, p0, Lorg/b/a/b/c;->bGw:Ljava/io/ObjectInputStream;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -127,7 +127,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lorg/b/a/b/c;->bGc:Ljava/io/ObjectInputStream;
+    iget-object v0, p0, Lorg/b/a/b/c;->bGw:Ljava/io/ObjectInputStream;
 
     invoke-virtual {v0}, Ljava/io/ObjectInputStream;->readObject()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/org/b/a/c/a.smali b/com.discord/smali_classes2/org/b/a/c/a.smali
index 787587612a..0eee9c5f35 100644
--- a/com.discord/smali_classes2/org/b/a/c/a.smali
+++ b/com.discord/smali_classes2/org/b/a/c/a.smali
@@ -44,9 +44,9 @@
     :try_start_0
     iget-object v0, p0, Lorg/b/a/c/a;->type:Ljava/lang/Class;
 
-    sget-object v1, Lorg/b/a/c/a;->bGk:Ljava/lang/reflect/Method;
+    sget-object v1, Lorg/b/a/c/a;->bGE:Ljava/lang/reflect/Method;
 
-    sget-object v2, Lorg/b/a/c/a;->bGl:Ljava/io/ObjectInputStream;
+    sget-object v2, Lorg/b/a/c/a;->bGF:Ljava/io/ObjectInputStream;
 
     const/4 v3, 0x2
 
diff --git a/com.discord/smali_classes2/org/b/a/c/b.smali b/com.discord/smali_classes2/org/b/a/c/b.smali
index 599746538a..8680a3a915 100644
--- a/com.discord/smali_classes2/org/b/a/c/b.smali
+++ b/com.discord/smali_classes2/org/b/a/c/b.smali
@@ -26,9 +26,9 @@
 
 
 # static fields
-.field static bGk:Ljava/lang/reflect/Method;
+.field static bGE:Ljava/lang/reflect/Method;
 
-.field static bGl:Ljava/io/ObjectInputStream;
+.field static bGF:Ljava/io/ObjectInputStream;
 
 
 # instance fields
@@ -63,7 +63,7 @@
 
     iput-object p1, p0, Lorg/b/a/c/b;->type:Ljava/lang/Class;
 
-    sget-object p1, Lorg/b/a/c/b;->bGk:Ljava/lang/reflect/Method;
+    sget-object p1, Lorg/b/a/c/b;->bGE:Ljava/lang/reflect/Method;
 
     if-nez p1, :cond_0
 
@@ -92,7 +92,7 @@
 
     move-result-object p1
 
-    sput-object p1, Lorg/b/a/c/b;->bGk:Ljava/lang/reflect/Method;
+    sput-object p1, Lorg/b/a/c/b;->bGE:Ljava/lang/reflect/Method;
 
     invoke-virtual {p1, v3}, Ljava/lang/reflect/Method;->setAccessible(Z)V
 
@@ -100,7 +100,7 @@
 
     invoke-direct {p1}, Lorg/b/a/c/b$a;-><init>()V
 
-    sput-object p1, Lorg/b/a/c/b;->bGl:Ljava/io/ObjectInputStream;
+    sput-object p1, Lorg/b/a/c/b;->bGF: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
diff --git a/com.discord/smali_classes2/org/b/a/d/a.smali b/com.discord/smali_classes2/org/b/a/d/a.smali
index 251d685757..81d6996c0b 100644
--- a/com.discord/smali_classes2/org/b/a/d/a.smali
+++ b/com.discord/smali_classes2/org/b/a/d/a.smali
@@ -20,9 +20,9 @@
 
 
 # instance fields
-.field private final bFY:Ljava/lang/reflect/Method;
+.field private final bGG:[Ljava/lang/Object;
 
-.field private final bGm:[Ljava/lang/Object;
+.field private final bGs:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -54,9 +54,9 @@
 
     aput-object v3, v1, v4
 
-    iput-object v1, p0, Lorg/b/a/d/a;->bGm:[Ljava/lang/Object;
+    iput-object v1, p0, Lorg/b/a/d/a;->bGG:[Ljava/lang/Object;
 
-    iget-object v1, p0, Lorg/b/a/d/a;->bGm:[Ljava/lang/Object;
+    iget-object v1, p0, Lorg/b/a/d/a;->bGG:[Ljava/lang/Object;
 
     aput-object p1, v1, v2
 
@@ -79,9 +79,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/d/a;->bFY:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/d/a;->bGs:Ljava/lang/reflect/Method;
 
-    iget-object p1, p0, Lorg/b/a/d/a;->bFY:Ljava/lang/reflect/Method;
+    iget-object p1, p0, Lorg/b/a/d/a;->bGs:Ljava/lang/reflect/Method;
 
     invoke-virtual {p1, v4}, Ljava/lang/reflect/Method;->setAccessible(Z)V
     :try_end_0
@@ -120,11 +120,11 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lorg/b/a/d/a;->bFY:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lorg/b/a/d/a;->bGs:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
-    iget-object v2, p0, Lorg/b/a/d/a;->bGm:[Ljava/lang/Object;
+    iget-object v2, p0, Lorg/b/a/d/a;->bGG:[Ljava/lang/Object;
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/org/b/a/e/a.smali b/com.discord/smali_classes2/org/b/a/e/a.smali
index cafa8862b1..fa0e664ff8 100644
--- a/com.discord/smali_classes2/org/b/a/e/a.smali
+++ b/com.discord/smali_classes2/org/b/a/e/a.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method private static Jr()Ljava/lang/Class;
+.method private static Je()Ljava/lang/Class;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -173,7 +173,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lorg/b/a/e/a;->Jr()Ljava/lang/Class;
+    invoke-static {}, Lorg/b/a/e/a;->Je()Ljava/lang/Class;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/org/b/a/e/b.smali b/com.discord/smali_classes2/org/b/a/e/b.smali
index fe76202d75..a895bcebbb 100644
--- a/com.discord/smali_classes2/org/b/a/e/b.smali
+++ b/com.discord/smali_classes2/org/b/a/e/b.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final bGn:Ljava/lang/reflect/Constructor;
+.field private final bGH:Ljava/lang/reflect/Constructor;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/reflect/Constructor<",
@@ -43,7 +43,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lorg/b/a/e/b;->Js()Ljava/lang/reflect/Constructor;
+    invoke-static {}, Lorg/b/a/e/b;->Jf()Ljava/lang/reflect/Constructor;
 
     move-result-object v0
 
@@ -51,9 +51,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/e/b;->bGn:Ljava/lang/reflect/Constructor;
+    iput-object p1, p0, Lorg/b/a/e/b;->bGH:Ljava/lang/reflect/Constructor;
 
-    iget-object p1, p0, Lorg/b/a/e/b;->bGn:Ljava/lang/reflect/Constructor;
+    iget-object p1, p0, Lorg/b/a/e/b;->bGH:Ljava/lang/reflect/Constructor;
 
     const/4 v0, 0x1
 
@@ -62,7 +62,7 @@
     return-void
 .end method
 
-.method private static Js()Ljava/lang/reflect/Constructor;
+.method private static Jf()Ljava/lang/reflect/Constructor;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -107,7 +107,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lorg/b/a/e/b;->bGn:Ljava/lang/reflect/Constructor;
+    iget-object v0, p0, Lorg/b/a/e/b;->bGH:Ljava/lang/reflect/Constructor;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/org/b/a/e/c.smali b/com.discord/smali_classes2/org/b/a/e/c.smali
index b121aca0a8..13f531e7b4 100644
--- a/com.discord/smali_classes2/org/b/a/e/c.smali
+++ b/com.discord/smali_classes2/org/b/a/e/c.smali
@@ -20,7 +20,7 @@
 
 
 # static fields
-.field private static bGo:Lsun/misc/Unsafe;
+.field private static bGI:Lsun/misc/Unsafe;
 
 
 # instance fields
@@ -47,7 +47,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lorg/b/a/e/c;->bGo:Lsun/misc/Unsafe;
+    sget-object v0, Lorg/b/a/e/c;->bGI:Lsun/misc/Unsafe;
 
     if-nez v0, :cond_0
 
@@ -75,7 +75,7 @@
 
     check-cast v0, Lsun/misc/Unsafe;
 
-    sput-object v0, Lorg/b/a/e/c;->bGo:Lsun/misc/Unsafe;
+    sput-object v0, Lorg/b/a/e/c;->bGI:Lsun/misc/Unsafe;
     :try_end_1
     .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_0
 
@@ -119,7 +119,7 @@
     :try_start_0
     iget-object v0, p0, Lorg/b/a/e/c;->type:Ljava/lang/Class;
 
-    sget-object v1, Lorg/b/a/e/c;->bGo:Lsun/misc/Unsafe;
+    sget-object v1, Lorg/b/a/e/c;->bGI:Lsun/misc/Unsafe;
 
     iget-object v2, p0, Lorg/b/a/e/c;->type:Ljava/lang/Class;
 
diff --git a/com.discord/smali_classes2/org/b/b/c.smali b/com.discord/smali_classes2/org/b/b/c.smali
index f716cbd155..3ddefa51c0 100644
--- a/com.discord/smali_classes2/org/b/b/c.smali
+++ b/com.discord/smali_classes2/org/b/b/c.smali
@@ -4,23 +4,23 @@
 
 
 # static fields
-.field public static final bGp:Ljava/lang/String;
+.field public static final bGJ:Ljava/lang/String;
 
-.field public static final bGq:Ljava/lang/String;
+.field public static final bGK:Ljava/lang/String;
 
-.field public static final bGr:Ljava/lang/String;
+.field public static final bGL:Ljava/lang/String;
 
-.field public static final bGs:Ljava/lang/String;
+.field public static final bGM:Ljava/lang/String;
 
-.field public static final bGt:Ljava/lang/String;
+.field public static final bGN:Ljava/lang/String;
 
-.field public static final bGu:Ljava/lang/String;
+.field public static final bGO:Ljava/lang/String;
 
-.field public static final bGv:I
+.field public static final bGP:I
 
-.field public static final bGw:Z
+.field public static final bGQ:Z
 
-.field public static final bGx:Ljava/lang/String;
+.field public static final bGR:Ljava/lang/String;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bGp:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bGJ:Ljava/lang/String;
 
     const-string v0, "java.runtime.version"
 
@@ -41,7 +41,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bGq:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bGK:Ljava/lang/String;
 
     const-string v0, "java.vm.info"
 
@@ -49,7 +49,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bGr:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bGL:Ljava/lang/String;
 
     const-string v0, "java.vm.version"
 
@@ -57,7 +57,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bGs:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bGM:Ljava/lang/String;
 
     const-string v0, "java.vm.vendor"
 
@@ -65,7 +65,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bGt:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bGN:Ljava/lang/String;
 
     const-string v0, "java.vm.name"
 
@@ -73,15 +73,15 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bGu:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bGO:Ljava/lang/String;
 
-    invoke-static {}, Lorg/b/b/c;->Jv()I
+    invoke-static {}, Lorg/b/b/c;->Ji()I
 
     move-result v0
 
-    sput v0, Lorg/b/b/c;->bGv:I
+    sput v0, Lorg/b/b/c;->bGP:I
 
-    invoke-static {}, Lorg/b/b/c;->Jv()I
+    invoke-static {}, Lorg/b/b/c;->Ji()I
 
     move-result v0
 
@@ -115,7 +115,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lorg/b/b/c;->bGw:Z
+    sput-boolean v0, Lorg/b/b/c;->bGQ:Z
 
     const-string v0, "com.google.appengine.runtime.version"
 
@@ -123,23 +123,23 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bGx:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bGR:Ljava/lang/String;
 
     return-void
 .end method
 
-.method public static Jt()Z
+.method public static Jg()Z
     .locals 1
 
-    sget-boolean v0, Lorg/b/b/c;->bGw:Z
+    sget-boolean v0, Lorg/b/b/c;->bGQ:Z
 
     return v0
 .end method
 
-.method public static Ju()Z
+.method public static Jh()Z
     .locals 1
 
-    sget-object v0, Lorg/b/b/c;->bGx:Ljava/lang/String;
+    sget-object v0, Lorg/b/b/c;->bGR:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -153,10 +153,10 @@
     return v0
 .end method
 
-.method private static Jv()I
+.method private static Ji()I
     .locals 2
 
-    sget-object v0, Lorg/b/b/c;->bGu:Ljava/lang/String;
+    sget-object v0, Lorg/b/b/c;->bGO:Ljava/lang/String;
 
     const-string v1, "Dalvik"
 
@@ -171,14 +171,14 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lorg/b/b/c;->Jw()I
+    invoke-static {}, Lorg/b/b/c;->Jj()I
 
     move-result v0
 
     return v0
 .end method
 
-.method private static Jw()I
+.method private static Jj()I
     .locals 2
 
     :try_start_0
@@ -297,10 +297,10 @@
     throw v0
 .end method
 
-.method public static fe(Ljava/lang/String;)Z
+.method public static eZ(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lorg/b/b/c;->bGu:Ljava/lang/String;
+    sget-object v0, Lorg/b/b/c;->bGO:Ljava/lang/String;
 
     invoke-virtual {v0, p0}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
 
diff --git a/com.discord/smali_classes2/org/b/b/d.smali b/com.discord/smali_classes2/org/b/b/d.smali
index 7d709ee531..06dc72a035 100644
--- a/com.discord/smali_classes2/org/b/b/d.smali
+++ b/com.discord/smali_classes2/org/b/b/d.smali
@@ -30,7 +30,7 @@
 
     const-string v0, "Java HotSpot"
 
-    invoke-static {v0}, Lorg/b/b/c;->fe(Ljava/lang/String;)Z
+    invoke-static {v0}, Lorg/b/b/c;->eZ(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -38,7 +38,7 @@
 
     const-string v0, "OpenJDK"
 
-    invoke-static {v0}, Lorg/b/b/c;->fe(Ljava/lang/String;)Z
+    invoke-static {v0}, Lorg/b/b/c;->eZ(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -49,13 +49,13 @@
     :cond_0
     const-string v0, "Dalvik"
 
-    invoke-static {v0}, Lorg/b/b/c;->fe(Ljava/lang/String;)Z
+    invoke-static {v0}, Lorg/b/b/c;->eZ(Ljava/lang/String;)Z
 
     move-result v0
 
     if-eqz v0, :cond_4
 
-    invoke-static {}, Lorg/b/b/c;->Jt()Z
+    invoke-static {}, Lorg/b/b/c;->Jg()Z
 
     move-result v0
 
@@ -68,7 +68,7 @@
     return-object v0
 
     :cond_1
-    sget v0, Lorg/b/b/c;->bGv:I
+    sget v0, Lorg/b/b/c;->bGP:I
 
     const/16 v1, 0xa
 
@@ -81,7 +81,7 @@
     return-object v0
 
     :cond_2
-    sget v0, Lorg/b/b/c;->bGv:I
+    sget v0, Lorg/b/b/c;->bGP:I
 
     const/16 v1, 0x11
 
@@ -103,7 +103,7 @@
     :cond_4
     const-string v0, "BEA"
 
-    invoke-static {v0}, Lorg/b/b/c;->fe(Ljava/lang/String;)Z
+    invoke-static {v0}, Lorg/b/b/c;->eZ(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -118,7 +118,7 @@
     :cond_5
     const-string v0, "GNU libgcj"
 
-    invoke-static {v0}, Lorg/b/b/c;->fe(Ljava/lang/String;)Z
+    invoke-static {v0}, Lorg/b/b/c;->eZ(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -133,7 +133,7 @@
     :cond_6
     const-string v0, "PERC"
 
-    invoke-static {v0}, Lorg/b/b/c;->fe(Ljava/lang/String;)Z
+    invoke-static {v0}, Lorg/b/b/c;->eZ(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -154,7 +154,7 @@
 
     :cond_8
     :goto_0
-    invoke-static {}, Lorg/b/b/c;->Ju()Z
+    invoke-static {}, Lorg/b/b/c;->Jh()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack.smali b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack.smali
index 5c6d4e605d..b2f534a228 100644
--- a/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack.smali
+++ b/com.discord/smali_classes2/org/webrtc/voiceengine/WebRtcAudioTrack.smali
@@ -53,6 +53,8 @@
 
 .field private final threadChecker:Lorg/webrtc/ThreadUtils$ThreadChecker;
 
+.field private final useMediaTrack:Z
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -79,7 +81,7 @@
     return-void
 .end method
 
-.method constructor <init>(J)V
+.method constructor <init>(JZ)V
     .locals 2
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
@@ -122,6 +124,8 @@
 
     iput-wide p1, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->nativeAudioTrack:J
 
+    iput-boolean p3, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->useMediaTrack:Z
+
     invoke-static {}, Lorg/webrtc/ContextUtils;->getApplicationContext()Landroid/content/Context;
 
     move-result-object p1
@@ -237,7 +241,7 @@
     return p1
 .end method
 
-.method private static createAudioTrackOnLollipopOrHigher(III)Landroid/media/AudioTrack;
+.method private static createAudioTrackOnLollipopOrHigher(IIIZ)Landroid/media/AudioTrack;
     .locals 8
 
     const-string v0, "WebRtcAudioTrack"
@@ -246,7 +250,9 @@
 
     invoke-static {v0, v1}, Lorg/webrtc/Logging;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    const/4 v1, 0x0
+    invoke-static {p3}, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->getAudioManagerStreamType(Z)I
+
+    move-result v1
 
     invoke-static {v1}, Landroid/media/AudioTrack;->getNativeOutputSampleRate(I)I
 
@@ -300,29 +306,42 @@
 
     invoke-direct {v1}, Landroid/media/AudioAttributes$Builder;-><init>()V
 
-    sget v2, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->usageAttribute:I
-
-    invoke-virtual {v1, v2}, Landroid/media/AudioAttributes$Builder;->setUsage(I)Landroid/media/AudioAttributes$Builder;
-
-    move-result-object v1
-
     const/4 v2, 0x1
 
-    invoke-virtual {v1, v2}, Landroid/media/AudioAttributes$Builder;->setContentType(I)Landroid/media/AudioAttributes$Builder;
+    if-eqz p3, :cond_2
+
+    const/4 v3, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    sget v3, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->usageAttribute:I
+
+    :goto_0
+    invoke-virtual {v1, v3}, Landroid/media/AudioAttributes$Builder;->setUsage(I)Landroid/media/AudioAttributes$Builder;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Landroid/media/AudioAttributes$Builder;->build()Landroid/media/AudioAttributes;
+    const/4 v3, 0x2
 
-    move-result-object v3
+    if-eqz p3, :cond_3
+
+    const/4 v2, 0x2
+
+    :cond_3
+    invoke-virtual {v1, v2}, Landroid/media/AudioAttributes$Builder;->setContentType(I)Landroid/media/AudioAttributes$Builder;
+
+    move-result-object p3
+
+    invoke-virtual {p3}, Landroid/media/AudioAttributes$Builder;->build()Landroid/media/AudioAttributes;
+
+    move-result-object p3
 
     new-instance v1, Landroid/media/AudioFormat$Builder;
 
     invoke-direct {v1}, Landroid/media/AudioFormat$Builder;-><init>()V
 
-    const/4 v2, 0x2
-
-    invoke-virtual {v1, v2}, Landroid/media/AudioFormat$Builder;->setEncoding(I)Landroid/media/AudioFormat$Builder;
+    invoke-virtual {v1, v3}, Landroid/media/AudioFormat$Builder;->setEncoding(I)Landroid/media/AudioFormat$Builder;
 
     move-result-object v1
 
@@ -344,6 +363,8 @@
 
     move-object v2, v0
 
+    move-object v3, p3
+
     move v5, p2
 
     invoke-direct/range {v2 .. v7}, Landroid/media/AudioTrack;-><init>(Landroid/media/AudioAttributes;Landroid/media/AudioFormat;III)V
@@ -375,6 +396,33 @@
     return-object v7
 .end method
 
+.method private getAudioManagerStreamType()I
+    .locals 1
+
+    iget-boolean v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->useMediaTrack:Z
+
+    invoke-static {v0}, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->getAudioManagerStreamType(Z)I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method private static getAudioManagerStreamType(Z)I
+    .locals 0
+
+    if-eqz p0, :cond_0
+
+    const/4 p0, 0x3
+
+    return p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    return p0
+.end method
+
 .method private static getDefaultUsageAttribute()I
     .locals 1
 
@@ -419,8 +467,6 @@
 
     iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->audioManager:Landroid/media/AudioManager;
 
-    const/4 v1, 0x0
-
     if-eqz v0, :cond_0
 
     const/4 v0, 0x1
@@ -435,6 +481,10 @@
 
     iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->audioManager:Landroid/media/AudioManager;
 
+    invoke-direct {p0}, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->getAudioManagerStreamType()I
+
+    move-result v1
+
     invoke-virtual {v0, v1}, Landroid/media/AudioManager;->getStreamMaxVolume(I)I
 
     move-result v0
@@ -457,8 +507,6 @@
 
     iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->audioManager:Landroid/media/AudioManager;
 
-    const/4 v1, 0x0
-
     if-eqz v0, :cond_0
 
     const/4 v0, 0x1
@@ -473,6 +521,10 @@
 
     iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->audioManager:Landroid/media/AudioManager;
 
+    invoke-direct {p0}, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->getAudioManagerStreamType()I
+
+    move-result v1
+
     invoke-virtual {v0, v1}, Landroid/media/AudioManager;->getStreamVolume(I)I
 
     move-result v0
@@ -618,7 +670,9 @@
 
     if-eqz v1, :cond_2
 
-    invoke-static {p1, p2, v0}, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->createAudioTrackOnLollipopOrHigher(III)Landroid/media/AudioTrack;
+    iget-boolean v1, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->useMediaTrack:Z
+
+    invoke-static {p1, p2, v0, v1}, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->createAudioTrackOnLollipopOrHigher(IIIZ)Landroid/media/AudioTrack;
 
     move-result-object p1
 
@@ -1174,7 +1228,11 @@
     :cond_1
     iget-object v0, p0, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->audioManager:Landroid/media/AudioManager;
 
-    invoke-virtual {v0, v3, p1, v3}, Landroid/media/AudioManager;->setStreamVolume(III)V
+    invoke-direct {p0}, Lorg/webrtc/voiceengine/WebRtcAudioTrack;->getAudioManagerStreamType()I
+
+    move-result v1
+
+    invoke-virtual {v0, v1, p1, v3}, Landroid/media/AudioManager;->setStreamVolume(III)V
 
     return v2
 .end method
diff --git a/com.discord/smali_classes2/rx/Emitter$a.smali b/com.discord/smali_classes2/rx/Emitter$a.smali
index c2f3530f6f..6e778af257 100644
--- a/com.discord/smali_classes2/rx/Emitter$a.smali
+++ b/com.discord/smali_classes2/rx/Emitter$a.smali
@@ -23,17 +23,17 @@
 
 
 # static fields
-.field public static final bIA:I = 0x2
+.field public static final bIT:I = 0x1
 
-.field public static final bIB:I = 0x3
+.field public static final bIU:I = 0x2
 
-.field public static final bIC:I = 0x4
+.field public static final bIV:I = 0x3
 
-.field public static final bID:I = 0x5
+.field public static final bIW:I = 0x4
 
-.field private static final synthetic bIE:[I
+.field public static final bIX:I = 0x5
 
-.field public static final bIz:I = 0x1
+.field private static final synthetic bIY:[I
 
 
 # direct methods
@@ -44,45 +44,45 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lrx/Emitter$a;->bIz:I
+    sget v1, Lrx/Emitter$a;->bIT:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lrx/Emitter$a;->bIA:I
+    sget v1, Lrx/Emitter$a;->bIU:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lrx/Emitter$a;->bIB:I
+    sget v1, Lrx/Emitter$a;->bIV:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lrx/Emitter$a;->bIC:I
+    sget v1, Lrx/Emitter$a;->bIW:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sget v1, Lrx/Emitter$a;->bID:I
+    sget v1, Lrx/Emitter$a;->bIX:I
 
     const/4 v2, 0x4
 
     aput v1, v0, v2
 
-    sput-object v0, Lrx/Emitter$a;->bIE:[I
+    sput-object v0, Lrx/Emitter$a;->bIY:[I
 
     return-void
 .end method
 
-.method public static JT()[I
+.method public static JG()[I
     .locals 1
 
-    sget-object v0, Lrx/Emitter$a;->bIE:[I
+    sget-object v0, Lrx/Emitter$a;->bIY:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/Scheduler.smali b/com.discord/smali_classes2/rx/Scheduler.smali
index 27beee547f..e92a270dae 100644
--- a/com.discord/smali_classes2/rx/Scheduler.smali
+++ b/com.discord/smali_classes2/rx/Scheduler.smali
@@ -32,5 +32,5 @@
 
 
 # virtual methods
-.method public abstract Kk()Lrx/Scheduler$Worker;
+.method public abstract JY()Lrx/Scheduler$Worker;
 .end method
diff --git a/com.discord/smali_classes2/rx/a$a.smali b/com.discord/smali_classes2/rx/a$a.smali
index c063a5ed63..a28be6d5e1 100644
--- a/com.discord/smali_classes2/rx/a$a.smali
+++ b/com.discord/smali_classes2/rx/a$a.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field static final bIq:Lrx/a$a;
+.field static final bIK:Lrx/a$a;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lrx/a$a;-><init>()V
 
-    sput-object v0, Lrx/a$a;->bIq:Lrx/a$a;
+    sput-object v0, Lrx/a$a;->bIK:Lrx/a$a;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 
 
 # virtual methods
-.method public final JS()Z
+.method public final JF()Z
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/rx/a$b.smali b/com.discord/smali_classes2/rx/a$b.smali
index 382439f489..b4cca60a02 100644
--- a/com.discord/smali_classes2/rx/a$b.smali
+++ b/com.discord/smali_classes2/rx/a$b.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field static final bIr:Lrx/a$b;
+.field static final bIL:Lrx/a$b;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lrx/a$b;-><init>()V
 
-    sput-object v0, Lrx/a$b;->bIr:Lrx/a$b;
+    sput-object v0, Lrx/a$b;->bIL:Lrx/a$b;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 
 
 # virtual methods
-.method public final JS()Z
+.method public final JF()Z
     .locals 1
 
     const/4 v0, 0x1
diff --git a/com.discord/smali_classes2/rx/a$c.smali b/com.discord/smali_classes2/rx/a$c.smali
index 68a37183a1..2a94e9f665 100644
--- a/com.discord/smali_classes2/rx/a$c.smali
+++ b/com.discord/smali_classes2/rx/a$c.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field static final bIs:Lrx/a$c;
+.field static final bIM:Lrx/a$c;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lrx/a$c;-><init>()V
 
-    sput-object v0, Lrx/a$c;->bIs:Lrx/a$c;
+    sput-object v0, Lrx/a$c;->bIM:Lrx/a$c;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 
 
 # virtual methods
-.method public final JS()Z
+.method public final JF()Z
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali_classes2/rx/a$d.smali b/com.discord/smali_classes2/rx/a$d.smali
index fe90b3e808..38090353e7 100644
--- a/com.discord/smali_classes2/rx/a$d.smali
+++ b/com.discord/smali_classes2/rx/a$d.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract JS()Z
+.method public abstract JF()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Lrx/a/c;
diff --git a/com.discord/smali_classes2/rx/a.smali b/com.discord/smali_classes2/rx/a.smali
index f2b8c43e8d..af32cccbef 100644
--- a/com.discord/smali_classes2/rx/a.smali
+++ b/com.discord/smali_classes2/rx/a.smali
@@ -15,32 +15,32 @@
 
 
 # static fields
-.field public static final bIm:Lrx/a$d;
+.field public static final bIG:Lrx/a$d;
 
-.field public static final bIn:Lrx/a$d;
+.field public static final bIH:Lrx/a$d;
 
-.field public static final bIo:Lrx/a$d;
+.field public static final bII:Lrx/a$d;
 
-.field public static final bIp:Lrx/a$d;
+.field public static final bIJ:Lrx/a$d;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lrx/a$c;->bIs:Lrx/a$c;
+    sget-object v0, Lrx/a$c;->bIM:Lrx/a$c;
 
-    sput-object v0, Lrx/a;->bIm:Lrx/a$d;
+    sput-object v0, Lrx/a;->bIG:Lrx/a$d;
 
-    sput-object v0, Lrx/a;->bIn:Lrx/a$d;
+    sput-object v0, Lrx/a;->bIH:Lrx/a$d;
 
-    sget-object v0, Lrx/a$b;->bIr:Lrx/a$b;
+    sget-object v0, Lrx/a$b;->bIL:Lrx/a$b;
 
-    sput-object v0, Lrx/a;->bIo:Lrx/a$d;
+    sput-object v0, Lrx/a;->bII:Lrx/a$d;
 
-    sget-object v0, Lrx/a$a;->bIq:Lrx/a$a;
+    sget-object v0, Lrx/a$a;->bIK:Lrx/a$a;
 
-    sput-object v0, Lrx/a;->bIp:Lrx/a$d;
+    sput-object v0, Lrx/a;->bIJ:Lrx/a$d;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/a/a$b.smali b/com.discord/smali_classes2/rx/a/a$b.smali
index fad3065006..e52203bfe1 100644
--- a/com.discord/smali_classes2/rx/a/a$b.smali
+++ b/com.discord/smali_classes2/rx/a/a$b.smali
@@ -25,7 +25,7 @@
 
 
 # virtual methods
-.method abstract Kp()Ljava/lang/Object;
+.method abstract Kd()Ljava/lang/Object;
 .end method
 
 .method abstract println(Ljava/lang/Object;)V
diff --git a/com.discord/smali_classes2/rx/a/a$c.smali b/com.discord/smali_classes2/rx/a/a$c.smali
index db06d1b50c..c6119d78f0 100644
--- a/com.discord/smali_classes2/rx/a/a$c.smali
+++ b/com.discord/smali_classes2/rx/a/a$c.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final bIU:Ljava/io/PrintStream;
+.field private final bJo:Ljava/io/PrintStream;
 
 
 # direct methods
@@ -24,17 +24,17 @@
 
     invoke-direct {p0}, Lrx/a/a$b;-><init>()V
 
-    iput-object p1, p0, Lrx/a/a$c;->bIU:Ljava/io/PrintStream;
+    iput-object p1, p0, Lrx/a/a$c;->bJo:Ljava/io/PrintStream;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final Kp()Ljava/lang/Object;
+.method final Kd()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$c;->bIU:Ljava/io/PrintStream;
+    iget-object v0, p0, Lrx/a/a$c;->bJo:Ljava/io/PrintStream;
 
     return-object v0
 .end method
@@ -42,7 +42,7 @@
 .method final println(Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$c;->bIU:Ljava/io/PrintStream;
+    iget-object v0, p0, Lrx/a/a$c;->bJo:Ljava/io/PrintStream;
 
     invoke-virtual {v0, p1}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/a/a$d.smali b/com.discord/smali_classes2/rx/a/a$d.smali
index b5f9f2159a..227bc8d3cc 100644
--- a/com.discord/smali_classes2/rx/a/a$d.smali
+++ b/com.discord/smali_classes2/rx/a/a$d.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final bIV:Ljava/io/PrintWriter;
+.field private final bJp:Ljava/io/PrintWriter;
 
 
 # direct methods
@@ -24,17 +24,17 @@
 
     invoke-direct {p0}, Lrx/a/a$b;-><init>()V
 
-    iput-object p1, p0, Lrx/a/a$d;->bIV:Ljava/io/PrintWriter;
+    iput-object p1, p0, Lrx/a/a$d;->bJp:Ljava/io/PrintWriter;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final Kp()Ljava/lang/Object;
+.method final Kd()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$d;->bIV:Ljava/io/PrintWriter;
+    iget-object v0, p0, Lrx/a/a$d;->bJp:Ljava/io/PrintWriter;
 
     return-object v0
 .end method
@@ -42,7 +42,7 @@
 .method final println(Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$d;->bIV:Ljava/io/PrintWriter;
+    iget-object v0, p0, Lrx/a/a$d;->bJp:Ljava/io/PrintWriter;
 
     invoke-virtual {v0, p1}, Ljava/io/PrintWriter;->println(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/a/a.smali b/com.discord/smali_classes2/rx/a/a.smali
index 5b03c6d94f..178c524c17 100644
--- a/com.discord/smali_classes2/rx/a/a.smali
+++ b/com.discord/smali_classes2/rx/a/a.smali
@@ -448,7 +448,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-virtual {p1}, Lrx/a/a$b;->Kp()Ljava/lang/Object;
+    invoke-virtual {p1}, Lrx/a/a$b;->Kd()Ljava/lang/Object;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/rx/a/g$a$a.smali b/com.discord/smali_classes2/rx/a/g$a$a.smali
index e7cea43ab7..fedfd619b1 100644
--- a/com.discord/smali_classes2/rx/a/g$a$a.smali
+++ b/com.discord/smali_classes2/rx/a/g$a$a.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final bIW:Ljava/util/Set;
+.field static final bJq:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -66,7 +66,7 @@
 
     invoke-interface {v0, v1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    sput-object v0, Lrx/a/g$a$a;->bIW:Ljava/util/Set;
+    sput-object v0, Lrx/a/g$a$a;->bJq:Ljava/util/Set;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/a/g$a.smali b/com.discord/smali_classes2/rx/a/g$a.smali
index f537cc4ab6..4fdb7c82d3 100644
--- a/com.discord/smali_classes2/rx/a/g$a.smali
+++ b/com.discord/smali_classes2/rx/a/g$a.smali
@@ -45,7 +45,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lrx/a/g$a$a;->bIW:Ljava/util/Set;
+    sget-object v1, Lrx/a/g$a$a;->bJq:Ljava/util/Set;
 
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -90,11 +90,11 @@
     goto :goto_0
 
     :cond_3
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {v1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/rx/android/a/a.smali b/com.discord/smali_classes2/rx/android/a/a.smali
index b85ba496f2..124c865c01 100644
--- a/com.discord/smali_classes2/rx/android/a/a.smali
+++ b/com.discord/smali_classes2/rx/android/a/a.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static final bIO:Lrx/android/a/a;
+.field private static final bJi:Lrx/android/a/a;
 
 
 # instance fields
-.field private final bIP:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bJj:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -27,7 +27,7 @@
 
     invoke-direct {v0}, Lrx/android/a/a;-><init>()V
 
-    sput-object v0, Lrx/android/a/a;->bIO:Lrx/android/a/a;
+    sput-object v0, Lrx/android/a/a;->bJi:Lrx/android/a/a;
 
     return-void
 .end method
@@ -41,25 +41,25 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lrx/android/a/a;->bIP:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/android/a/a;->bJj:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
 
-.method public static Kl()Lrx/android/a/a;
+.method public static JZ()Lrx/android/a/a;
     .locals 1
 
-    sget-object v0, Lrx/android/a/a;->bIO:Lrx/android/a/a;
+    sget-object v0, Lrx/android/a/a;->bJi:Lrx/android/a/a;
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method public final Km()Lrx/android/a/b;
+.method public final Ka()Lrx/android/a/b;
     .locals 3
 
-    iget-object v0, p0, Lrx/android/a/a;->bIP:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/android/a/a;->bJj:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -67,18 +67,18 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/android/a/a;->bIP:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/android/a/a;->bJj:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
-    invoke-static {}, Lrx/android/a/b;->Kn()Lrx/android/a/b;
+    invoke-static {}, Lrx/android/a/b;->Kb()Lrx/android/a/b;
 
     move-result-object v2
 
     invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     :cond_0
-    iget-object v0, p0, Lrx/android/a/a;->bIP:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/android/a/a;->bJj:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/android/a/b.smali b/com.discord/smali_classes2/rx/android/a/b.smali
index e400476c68..1b9d46c002 100644
--- a/com.discord/smali_classes2/rx/android/a/b.smali
+++ b/com.discord/smali_classes2/rx/android/a/b.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bIQ:Lrx/android/a/b;
+.field private static final bJk:Lrx/android/a/b;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/android/a/b;-><init>()V
 
-    sput-object v0, Lrx/android/a/b;->bIQ:Lrx/android/a/b;
+    sput-object v0, Lrx/android/a/b;->bJk:Lrx/android/a/b;
 
     return-void
 .end method
@@ -28,10 +28,10 @@
     return-void
 .end method
 
-.method public static Kn()Lrx/android/a/b;
+.method public static Kb()Lrx/android/a/b;
     .locals 1
 
-    sget-object v0, Lrx/android/a/b;->bIQ:Lrx/android/a/b;
+    sget-object v0, Lrx/android/a/b;->bJk:Lrx/android/a/b;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/android/b/a.smali b/com.discord/smali_classes2/rx/android/b/a.smali
index 243254b16c..71b71f974b 100644
--- a/com.discord/smali_classes2/rx/android/b/a.smali
+++ b/com.discord/smali_classes2/rx/android/b/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final aTb:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aTt:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field private final bIR:Lrx/Scheduler;
+.field private final bJl:Lrx/Scheduler;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sput-object v0, Lrx/android/b/a;->aTb:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lrx/android/b/a;->aTt:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -37,11 +37,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lrx/android/a/a;->Kl()Lrx/android/a/a;
+    invoke-static {}, Lrx/android/a/a;->JZ()Lrx/android/a/a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/android/a/a;->Km()Lrx/android/a/b;
+    invoke-virtual {v0}, Lrx/android/a/a;->Ka()Lrx/android/a/b;
 
     new-instance v0, Lrx/android/b/b;
 
@@ -51,16 +51,16 @@
 
     invoke-direct {v0, v1}, Lrx/android/b/b;-><init>(Landroid/os/Looper;)V
 
-    iput-object v0, p0, Lrx/android/b/a;->bIR:Lrx/Scheduler;
+    iput-object v0, p0, Lrx/android/b/a;->bJl:Lrx/Scheduler;
 
     return-void
 .end method
 
-.method public static Ko()Lrx/Scheduler;
+.method public static Kc()Lrx/Scheduler;
     .locals 3
 
     :cond_0
-    sget-object v0, Lrx/android/b/a;->aTb:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/android/b/a;->aTt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -77,7 +77,7 @@
 
     invoke-direct {v0}, Lrx/android/b/a;-><init>()V
 
-    sget-object v1, Lrx/android/b/a;->aTb:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lrx/android/b/a;->aTt:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v2, 0x0
 
@@ -88,7 +88,7 @@
     if-eqz v1, :cond_0
 
     :goto_0
-    iget-object v0, v0, Lrx/android/b/a;->bIR:Lrx/Scheduler;
+    iget-object v0, v0, Lrx/android/b/a;->bJl:Lrx/Scheduler;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/android/b/b$a.smali b/com.discord/smali_classes2/rx/android/b/b$a.smali
index 12f0b39adb..5720d2496d 100644
--- a/com.discord/smali_classes2/rx/android/b/b$a.smali
+++ b/com.discord/smali_classes2/rx/android/b/b$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field private final bIS:Lrx/android/a/b;
+.field private final bJm:Lrx/android/a/b;
 
-.field private volatile bIT:Z
+.field private volatile bJn:Z
 
 .field private final handler:Landroid/os/Handler;
 
@@ -30,15 +30,15 @@
 
     iput-object p1, p0, Lrx/android/b/b$a;->handler:Landroid/os/Handler;
 
-    invoke-static {}, Lrx/android/a/a;->Kl()Lrx/android/a/a;
+    invoke-static {}, Lrx/android/a/a;->JZ()Lrx/android/a/a;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/android/a/a;->Km()Lrx/android/a/b;
+    invoke-virtual {p1}, Lrx/android/a/a;->Ka()Lrx/android/a/b;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/android/b/b$a;->bIS:Lrx/android/a/b;
+    iput-object p1, p0, Lrx/android/b/b$a;->bJm:Lrx/android/a/b;
 
     return-void
 .end method
@@ -48,11 +48,11 @@
 .method public final a(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
     .locals 2
 
-    iget-boolean v0, p0, Lrx/android/b/b$a;->bIT:Z
+    iget-boolean v0, p0, Lrx/android/b/b$a;->bJn:Z
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object p1
 
@@ -85,7 +85,7 @@
 
     invoke-virtual {v1, p1, p2, p3}, Landroid/os/Handler;->sendMessageDelayed(Landroid/os/Message;J)Z
 
-    iget-boolean p1, p0, Lrx/android/b/b$a;->bIT:Z
+    iget-boolean p1, p0, Lrx/android/b/b$a;->bJn:Z
 
     if-eqz p1, :cond_1
 
@@ -93,7 +93,7 @@
 
     invoke-virtual {p1, v0}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object p1
 
@@ -120,7 +120,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-boolean v0, p0, Lrx/android/b/b$a;->bIT:Z
+    iget-boolean v0, p0, Lrx/android/b/b$a;->bJn:Z
 
     return v0
 .end method
@@ -130,7 +130,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/android/b/b$a;->bIT:Z
+    iput-boolean v0, p0, Lrx/android/b/b$a;->bJn:Z
 
     iget-object v0, p0, Lrx/android/b/b$a;->handler:Landroid/os/Handler;
 
diff --git a/com.discord/smali_classes2/rx/android/b/b$b.smali b/com.discord/smali_classes2/rx/android/b/b$b.smali
index 8650a9a75e..ec8d892819 100644
--- a/com.discord/smali_classes2/rx/android/b/b$b.smali
+++ b/com.discord/smali_classes2/rx/android/b/b$b.smali
@@ -21,7 +21,7 @@
 # instance fields
 .field private final action:Lrx/functions/Action0;
 
-.field private volatile bIT:Z
+.field private volatile bJn:Z
 
 .field private final handler:Landroid/os/Handler;
 
@@ -44,7 +44,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-boolean v0, p0, Lrx/android/b/b$b;->bIT:Z
+    iget-boolean v0, p0, Lrx/android/b/b$b;->bJn:Z
 
     return v0
 .end method
@@ -84,11 +84,11 @@
     invoke-direct {v1, v2, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :goto_0
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {v0}, Lrx/c/f;->Lh()Lrx/c/b;
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
@@ -108,7 +108,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/android/b/b$b;->bIT:Z
+    iput-boolean v0, p0, Lrx/android/b/b$b;->bJn:Z
 
     iget-object v0, p0, Lrx/android/b/b$b;->handler:Landroid/os/Handler;
 
diff --git a/com.discord/smali_classes2/rx/android/b/b.smali b/com.discord/smali_classes2/rx/android/b/b.smali
index de2a95174b..45553a07a1 100644
--- a/com.discord/smali_classes2/rx/android/b/b.smali
+++ b/com.discord/smali_classes2/rx/android/b/b.smali
@@ -33,7 +33,7 @@
 
 
 # virtual methods
-.method public final Kk()Lrx/Scheduler$Worker;
+.method public final JY()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/android/b/b$a;
diff --git a/com.discord/smali_classes2/rx/b$1.smali b/com.discord/smali_classes2/rx/b$1.smali
index 9ff4ade367..053c607a86 100644
--- a/com.discord/smali_classes2/rx/b$1.smali
+++ b/com.discord/smali_classes2/rx/b$1.smali
@@ -31,7 +31,7 @@
 .method public final synthetic call(Ljava/lang/Object;)V
     .locals 0
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/b$2$1.smali b/com.discord/smali_classes2/rx/b$2$1.smali
index 32e914374b..669d878ddc 100644
--- a/com.discord/smali_classes2/rx/b$2$1.smali
+++ b/com.discord/smali_classes2/rx/b$2$1.smali
@@ -23,18 +23,18 @@
 
 
 # instance fields
-.field final synthetic bIx:Lrx/c;
+.field final synthetic bIR:Lrx/c;
 
-.field final synthetic bIy:Lrx/b$2;
+.field final synthetic bIS:Lrx/b$2;
 
 
 # direct methods
 .method constructor <init>(Lrx/b$2;Lrx/c;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/b$2$1;->bIy:Lrx/b$2;
+    iput-object p1, p0, Lrx/b$2$1;->bIS:Lrx/b$2;
 
-    iput-object p2, p0, Lrx/b$2$1;->bIx:Lrx/c;
+    iput-object p2, p0, Lrx/b$2$1;->bIR:Lrx/c;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
diff --git a/com.discord/smali_classes2/rx/b$2.smali b/com.discord/smali_classes2/rx/b$2.smali
index 58e6f1867c..a570f62d64 100644
--- a/com.discord/smali_classes2/rx/b$2.smali
+++ b/com.discord/smali_classes2/rx/b$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bIw:Lrx/Observable;
+.field final synthetic bIQ:Lrx/Observable;
 
 
 # direct methods
 .method constructor <init>(Lrx/Observable;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/b$2;->bIw:Lrx/Observable;
+    iput-object p1, p0, Lrx/b$2;->bIQ:Lrx/Observable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,7 +43,7 @@
 
     invoke-direct {v0, p0, p1}, Lrx/b$2$1;-><init>(Lrx/b$2;Lrx/c;)V
 
-    iget-object p1, p0, Lrx/b$2;->bIw:Lrx/Observable;
+    iget-object p1, p0, Lrx/b$2;->bIQ:Lrx/Observable;
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/b$3.smali b/com.discord/smali_classes2/rx/b$3.smali
index c5a627ce2a..c9983ccbd0 100644
--- a/com.discord/smali_classes2/rx/b$3.smali
+++ b/com.discord/smali_classes2/rx/b$3.smali
@@ -31,7 +31,7 @@
 .method public final synthetic call(Ljava/lang/Object;)V
     .locals 0
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/b.smali b/com.discord/smali_classes2/rx/b.smali
index b00dbd31fd..dc0afc8f5f 100644
--- a/com.discord/smali_classes2/rx/b.smali
+++ b/com.discord/smali_classes2/rx/b.smali
@@ -13,13 +13,13 @@
 
 
 # static fields
-.field static final bIu:Lrx/b;
+.field static final bIO:Lrx/b;
 
-.field static final bIv:Lrx/b;
+.field static final bIP:Lrx/b;
 
 
 # instance fields
-.field private final bIt:Lrx/b$a;
+.field private final bIN:Lrx/b$a;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct {v0, v1, v2}, Lrx/b;-><init>(Lrx/b$a;B)V
 
-    sput-object v0, Lrx/b;->bIu:Lrx/b;
+    sput-object v0, Lrx/b;->bIO:Lrx/b;
 
     new-instance v0, Lrx/b;
 
@@ -46,7 +46,7 @@
 
     invoke-direct {v0, v1, v2}, Lrx/b;-><init>(Lrx/b$a;B)V
 
-    sput-object v0, Lrx/b;->bIv:Lrx/b;
+    sput-object v0, Lrx/b;->bIP:Lrx/b;
 
     return-void
 .end method
@@ -60,7 +60,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/b;->bIt:Lrx/b$a;
+    iput-object p1, p0, Lrx/b;->bIN:Lrx/b$a;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/b;->bIt:Lrx/b$a;
+    iput-object p1, p0, Lrx/b;->bIN:Lrx/b$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/b/a$1.smali b/com.discord/smali_classes2/rx/b/a$1.smali
index 9f24a859fc..a3ac2d6f64 100644
--- a/com.discord/smali_classes2/rx/b/a$1.smali
+++ b/com.discord/smali_classes2/rx/b/a$1.smali
@@ -22,11 +22,11 @@
 
 
 # instance fields
-.field final synthetic bQq:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic bQL:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field final synthetic bQr:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic bQM:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field final synthetic bQs:Lrx/b/a;
+.field final synthetic bQN:Lrx/b/a;
 
 .field final synthetic val$latch:Ljava/util/concurrent/CountDownLatch;
 
@@ -35,13 +35,13 @@
 .method constructor <init>(Lrx/b/a;Ljava/util/concurrent/CountDownLatch;Ljava/util/concurrent/atomic/AtomicReference;Ljava/util/concurrent/atomic/AtomicReference;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/b/a$1;->bQs:Lrx/b/a;
+    iput-object p1, p0, Lrx/b/a$1;->bQN:Lrx/b/a;
 
     iput-object p2, p0, Lrx/b/a$1;->val$latch:Ljava/util/concurrent/CountDownLatch;
 
-    iput-object p3, p0, Lrx/b/a$1;->bQq:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p3, p0, Lrx/b/a$1;->bQL:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p4, p0, Lrx/b/a$1;->bQr:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p4, p0, Lrx/b/a$1;->bQM:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -63,7 +63,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/b/a$1;->bQq:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/b/a$1;->bQL:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
@@ -82,7 +82,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/b/a$1;->bQr:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/b/a$1;->bQM:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/b/a.smali b/com.discord/smali_classes2/rx/b/a.smali
index 00f1dbc946..0ce1f78fc3 100644
--- a/com.discord/smali_classes2/rx/b/a.smali
+++ b/com.discord/smali_classes2/rx/b/a.smali
@@ -15,15 +15,15 @@
 
 
 # static fields
-.field static final bQn:Ljava/lang/Object;
+.field static final bQI:Ljava/lang/Object;
 
-.field static final bQo:Ljava/lang/Object;
+.field static final bQJ:Ljava/lang/Object;
 
-.field static final bQp:Ljava/lang/Object;
+.field static final bQK:Ljava/lang/Object;
 
 
 # instance fields
-.field public final bQm:Lrx/Observable;
+.field public final bQH:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -41,19 +41,19 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/b/a;->bQn:Ljava/lang/Object;
+    sput-object v0, Lrx/b/a;->bQI:Ljava/lang/Object;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/b/a;->bQo:Ljava/lang/Object;
+    sput-object v0, Lrx/b/a;->bQJ:Ljava/lang/Object;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/b/a;->bQp:Ljava/lang/Object;
+    sput-object v0, Lrx/b/a;->bQK:Ljava/lang/Object;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/b/a;->bQm:Lrx/Observable;
+    iput-object p1, p0, Lrx/b/a;->bQH:Lrx/Observable;
 
     return-void
 .end method
@@ -154,7 +154,7 @@
 
 
 # virtual methods
-.method public final Ln()Ljava/lang/Object;
+.method public final Lb()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -162,9 +162,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/b/a;->bQm:Lrx/Observable;
+    iget-object v0, p0, Lrx/b/a;->bQH:Lrx/Observable;
 
-    invoke-virtual {v0}, Lrx/Observable;->Ke()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->JS()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/rx/b/b.smali b/com.discord/smali_classes2/rx/b/b.smali
index 9f1c75d344..e1ff5bed63 100644
--- a/com.discord/smali_classes2/rx/b/b.smali
+++ b/com.discord/smali_classes2/rx/b/b.smali
@@ -33,7 +33,7 @@
 
 
 # virtual methods
-.method public final Lo()Lrx/Observable;
+.method public final Lc()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/rx/c/c$1.smali b/com.discord/smali_classes2/rx/c/c$1.smali
index 5797f75769..ed5a58011f 100644
--- a/com.discord/smali_classes2/rx/c/c$1.smali
+++ b/com.discord/smali_classes2/rx/c/c$1.smali
@@ -40,11 +40,11 @@
 .method public final synthetic call(Ljava/lang/Object;)V
     .locals 0
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/c/c$10.smali b/com.discord/smali_classes2/rx/c/c$10.smali
index a7a6c7b967..ac6f6e5f36 100644
--- a/com.discord/smali_classes2/rx/c/c$10.smali
+++ b/com.discord/smali_classes2/rx/c/c$10.smali
@@ -43,11 +43,11 @@
 
     check-cast p1, Lrx/Subscription;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lu()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->Li()Lrx/c/d;
 
     invoke-static {p1}, Lrx/c/d;->d(Lrx/Subscription;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/c/c$11.smali b/com.discord/smali_classes2/rx/c/c$11.smali
index 0bcd2045ff..c237f5fd8a 100644
--- a/com.discord/smali_classes2/rx/c/c$11.smali
+++ b/com.discord/smali_classes2/rx/c/c$11.smali
@@ -44,15 +44,15 @@
 
     check-cast p2, Lrx/f$a;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lv()Lrx/c/h;
+    invoke-virtual {p1}, Lrx/c/f;->Lj()Lrx/c/h;
 
     move-result-object p1
 
-    invoke-static {}, Lrx/c/i;->LC()Lrx/c/h;
+    invoke-static {}, Lrx/c/i;->Lq()Lrx/c/h;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/rx/c/c$12.smali b/com.discord/smali_classes2/rx/c/c$12.smali
index 27ca041247..fe3993caab 100644
--- a/com.discord/smali_classes2/rx/c/c$12.smali
+++ b/com.discord/smali_classes2/rx/c/c$12.smali
@@ -43,11 +43,11 @@
 
     check-cast p1, Lrx/Subscription;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lv()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->Lj()Lrx/c/h;
 
     invoke-static {p1}, Lrx/c/h;->d(Lrx/Subscription;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/c/c$13.smali b/com.discord/smali_classes2/rx/c/c$13.smali
index 0feb20c3eb..6a3e387892 100644
--- a/com.discord/smali_classes2/rx/c/c$13.smali
+++ b/com.discord/smali_classes2/rx/c/c$13.smali
@@ -44,11 +44,11 @@
 
     check-cast p2, Lrx/b$a;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lw()Lrx/c/a;
+    invoke-virtual {p1}, Lrx/c/f;->Lk()Lrx/c/a;
 
     invoke-static {p2}, Lrx/c/a;->c(Lrx/b$a;)Lrx/b$a;
 
diff --git a/com.discord/smali_classes2/rx/c/c$14.smali b/com.discord/smali_classes2/rx/c/c$14.smali
index 90224af661..df9c32ee6b 100644
--- a/com.discord/smali_classes2/rx/c/c$14.smali
+++ b/com.discord/smali_classes2/rx/c/c$14.smali
@@ -43,11 +43,11 @@
 
     check-cast p1, Lrx/functions/Action0;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lx()Lrx/c/g;
+    invoke-virtual {v0}, Lrx/c/f;->Ll()Lrx/c/g;
 
     invoke-static {p1}, Lrx/c/g;->c(Lrx/functions/Action0;)Lrx/functions/Action0;
 
diff --git a/com.discord/smali_classes2/rx/c/c$15.smali b/com.discord/smali_classes2/rx/c/c$15.smali
index c03f76c813..f9945c904b 100644
--- a/com.discord/smali_classes2/rx/c/c$15.smali
+++ b/com.discord/smali_classes2/rx/c/c$15.smali
@@ -43,11 +43,11 @@
 
     check-cast p1, Ljava/lang/Throwable;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lu()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->Li()Lrx/c/d;
 
     invoke-static {p1}, Lrx/c/d;->T(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
diff --git a/com.discord/smali_classes2/rx/c/c$16.smali b/com.discord/smali_classes2/rx/c/c$16.smali
index ed2b36e0b2..4c4a1ec1e0 100644
--- a/com.discord/smali_classes2/rx/c/c$16.smali
+++ b/com.discord/smali_classes2/rx/c/c$16.smali
@@ -43,11 +43,11 @@
 
     check-cast p1, Lrx/Observable$b;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lu()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->Li()Lrx/c/d;
 
     invoke-static {p1}, Lrx/c/d;->d(Lrx/Observable$b;)Lrx/Observable$b;
 
diff --git a/com.discord/smali_classes2/rx/c/c$2.smali b/com.discord/smali_classes2/rx/c/c$2.smali
index 49530fe6e0..0746c37817 100644
--- a/com.discord/smali_classes2/rx/c/c$2.smali
+++ b/com.discord/smali_classes2/rx/c/c$2.smali
@@ -43,11 +43,11 @@
 
     check-cast p1, Ljava/lang/Throwable;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lv()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->Lj()Lrx/c/h;
 
     invoke-static {p1}, Lrx/c/h;->T(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
diff --git a/com.discord/smali_classes2/rx/c/c$3.smali b/com.discord/smali_classes2/rx/c/c$3.smali
index b87651c5dd..49b2f3a542 100644
--- a/com.discord/smali_classes2/rx/c/c$3.smali
+++ b/com.discord/smali_classes2/rx/c/c$3.smali
@@ -43,11 +43,11 @@
 
     check-cast p1, Lrx/Observable$b;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lv()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->Lj()Lrx/c/h;
 
     invoke-static {p1}, Lrx/c/h;->d(Lrx/Observable$b;)Lrx/Observable$b;
 
diff --git a/com.discord/smali_classes2/rx/c/c$4.smali b/com.discord/smali_classes2/rx/c/c$4.smali
index ef4c3457f2..0fc0f65660 100644
--- a/com.discord/smali_classes2/rx/c/c$4.smali
+++ b/com.discord/smali_classes2/rx/c/c$4.smali
@@ -43,11 +43,11 @@
 
     check-cast p1, Ljava/lang/Throwable;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lw()Lrx/c/a;
+    invoke-virtual {v0}, Lrx/c/f;->Lk()Lrx/c/a;
 
     invoke-static {p1}, Lrx/c/a;->T(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
diff --git a/com.discord/smali_classes2/rx/c/c$5.smali b/com.discord/smali_classes2/rx/c/c$5.smali
index e0fc3f27d9..6685474bdb 100644
--- a/com.discord/smali_classes2/rx/c/c$5.smali
+++ b/com.discord/smali_classes2/rx/c/c$5.smali
@@ -43,11 +43,11 @@
 
     check-cast p1, Lrx/b$b;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lw()Lrx/c/a;
+    invoke-virtual {v0}, Lrx/c/f;->Lk()Lrx/c/a;
 
     invoke-static {p1}, Lrx/c/a;->a(Lrx/b$b;)Lrx/b$b;
 
diff --git a/com.discord/smali_classes2/rx/c/c$6.smali b/com.discord/smali_classes2/rx/c/c$6.smali
index 78c2bbb9a0..fa46eb0ce2 100644
--- a/com.discord/smali_classes2/rx/c/c$6.smali
+++ b/com.discord/smali_classes2/rx/c/c$6.smali
@@ -43,11 +43,11 @@
 
     check-cast p1, Lrx/Observable$a;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lu()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->Li()Lrx/c/d;
 
     invoke-static {p1}, Lrx/c/d;->c(Lrx/Observable$a;)Lrx/Observable$a;
 
diff --git a/com.discord/smali_classes2/rx/c/c$7.smali b/com.discord/smali_classes2/rx/c/c$7.smali
index 38fda55662..e57f40b25c 100644
--- a/com.discord/smali_classes2/rx/c/c$7.smali
+++ b/com.discord/smali_classes2/rx/c/c$7.smali
@@ -43,11 +43,11 @@
 
     check-cast p1, Lrx/f$a;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lv()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->Lj()Lrx/c/h;
 
     invoke-static {p1}, Lrx/c/h;->a(Lrx/f$a;)Lrx/f$a;
 
diff --git a/com.discord/smali_classes2/rx/c/c$8.smali b/com.discord/smali_classes2/rx/c/c$8.smali
index 54591de2fc..b62289aa79 100644
--- a/com.discord/smali_classes2/rx/c/c$8.smali
+++ b/com.discord/smali_classes2/rx/c/c$8.smali
@@ -43,11 +43,11 @@
 
     check-cast p1, Lrx/b$a;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lw()Lrx/c/a;
+    invoke-virtual {v0}, Lrx/c/f;->Lk()Lrx/c/a;
 
     invoke-static {p1}, Lrx/c/a;->b(Lrx/b$a;)Lrx/b$a;
 
diff --git a/com.discord/smali_classes2/rx/c/c$9.smali b/com.discord/smali_classes2/rx/c/c$9.smali
index 3931d67e66..354ff3ac0d 100644
--- a/com.discord/smali_classes2/rx/c/c$9.smali
+++ b/com.discord/smali_classes2/rx/c/c$9.smali
@@ -44,11 +44,11 @@
 
     check-cast p2, Lrx/Observable$a;
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Lu()Lrx/c/d;
+    invoke-virtual {p1}, Lrx/c/f;->Li()Lrx/c/d;
 
     invoke-static {p2}, Lrx/c/d;->d(Lrx/Observable$a;)Lrx/Observable$a;
 
diff --git a/com.discord/smali_classes2/rx/c/c.smali b/com.discord/smali_classes2/rx/c/c.smali
index 25d8472c0b..268b78f1b9 100644
--- a/com.discord/smali_classes2/rx/c/c.smali
+++ b/com.discord/smali_classes2/rx/c/c.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static volatile bPf:Lrx/functions/Action1;
+.field static volatile bPA:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -14,7 +14,29 @@
     .end annotation
 .end field
 
-.field static volatile bQA:Lrx/functions/b;
+.field static volatile bQT:Lrx/functions/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/b<",
+            "Lrx/Observable$a;",
+            "Lrx/Observable$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field static volatile bQU:Lrx/functions/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/b<",
+            "Lrx/f$a;",
+            "Lrx/f$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field static volatile bQV:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -25,7 +47,7 @@
     .end annotation
 .end field
 
-.field static volatile bQB:Lrx/functions/Func2;
+.field static volatile bQW:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -37,7 +59,7 @@
     .end annotation
 .end field
 
-.field static volatile bQC:Lrx/functions/Func2;
+.field static volatile bQX:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -49,7 +71,7 @@
     .end annotation
 .end field
 
-.field static volatile bQD:Lrx/functions/Func2;
+.field static volatile bQY:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -61,7 +83,7 @@
     .end annotation
 .end field
 
-.field static volatile bQE:Lrx/functions/b;
+.field static volatile bQZ:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -72,7 +94,7 @@
     .end annotation
 .end field
 
-.field static volatile bQF:Lrx/functions/b;
+.field static volatile bRa:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -83,7 +105,7 @@
     .end annotation
 .end field
 
-.field static volatile bQG:Lrx/functions/b;
+.field static volatile bRb:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -94,7 +116,7 @@
     .end annotation
 .end field
 
-.field static volatile bQH:Lrx/functions/b;
+.field static volatile bRc:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -105,7 +127,7 @@
     .end annotation
 .end field
 
-.field static volatile bQI:Lrx/functions/b;
+.field static volatile bRd:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -116,7 +138,7 @@
     .end annotation
 .end field
 
-.field static volatile bQJ:Lrx/functions/Func0;
+.field static volatile bRe:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -127,7 +149,7 @@
     .end annotation
 .end field
 
-.field static volatile bQK:Lrx/functions/b;
+.field static volatile bRf:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -138,7 +160,7 @@
     .end annotation
 .end field
 
-.field static volatile bQL:Lrx/functions/b;
+.field static volatile bRg:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -149,7 +171,7 @@
     .end annotation
 .end field
 
-.field static volatile bQM:Lrx/functions/b;
+.field static volatile bRh:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -160,7 +182,7 @@
     .end annotation
 .end field
 
-.field static volatile bQN:Lrx/functions/b;
+.field static volatile bRi:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -171,7 +193,7 @@
     .end annotation
 .end field
 
-.field static volatile bQO:Lrx/functions/b;
+.field static volatile bRj:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -182,7 +204,7 @@
     .end annotation
 .end field
 
-.field static volatile bQP:Lrx/functions/b;
+.field static volatile bRk:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -193,28 +215,6 @@
     .end annotation
 .end field
 
-.field static volatile bQy:Lrx/functions/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/b<",
-            "Lrx/Observable$a;",
-            "Lrx/Observable$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field static volatile bQz:Lrx/functions/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/b<",
-            "Lrx/f$a;",
-            "Lrx/f$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -224,102 +224,102 @@
 
     invoke-direct {v0}, Lrx/c/c$1;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bPf:Lrx/functions/Action1;
+    sput-object v0, Lrx/c/c;->bPA:Lrx/functions/Action1;
 
     new-instance v0, Lrx/c/c$9;
 
     invoke-direct {v0}, Lrx/c/c$9;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQB:Lrx/functions/Func2;
+    sput-object v0, Lrx/c/c;->bQW:Lrx/functions/Func2;
 
     new-instance v0, Lrx/c/c$10;
 
     invoke-direct {v0}, Lrx/c/c$10;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQH:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bRc:Lrx/functions/b;
 
     new-instance v0, Lrx/c/c$11;
 
     invoke-direct {v0}, Lrx/c/c$11;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQC:Lrx/functions/Func2;
+    sput-object v0, Lrx/c/c;->bQX:Lrx/functions/Func2;
 
     new-instance v0, Lrx/c/c$12;
 
     invoke-direct {v0}, Lrx/c/c$12;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQI:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bRd:Lrx/functions/b;
 
     new-instance v0, Lrx/c/c$13;
 
     invoke-direct {v0}, Lrx/c/c$13;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQD:Lrx/functions/Func2;
+    sput-object v0, Lrx/c/c;->bQY:Lrx/functions/Func2;
 
     new-instance v0, Lrx/c/c$14;
 
     invoke-direct {v0}, Lrx/c/c$14;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQG:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bRb:Lrx/functions/b;
 
     new-instance v0, Lrx/c/c$15;
 
     invoke-direct {v0}, Lrx/c/c$15;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQK:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bRf:Lrx/functions/b;
 
     new-instance v0, Lrx/c/c$16;
 
     invoke-direct {v0}, Lrx/c/c$16;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQN:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bRi:Lrx/functions/b;
 
     new-instance v0, Lrx/c/c$2;
 
     invoke-direct {v0}, Lrx/c/c$2;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQL:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bRg:Lrx/functions/b;
 
     new-instance v0, Lrx/c/c$3;
 
     invoke-direct {v0}, Lrx/c/c$3;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQO:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bRj:Lrx/functions/b;
 
     new-instance v0, Lrx/c/c$4;
 
     invoke-direct {v0}, Lrx/c/c$4;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQM:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bRh:Lrx/functions/b;
 
     new-instance v0, Lrx/c/c$5;
 
     invoke-direct {v0}, Lrx/c/c$5;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQP:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bRk:Lrx/functions/b;
 
     new-instance v0, Lrx/c/c$6;
 
     invoke-direct {v0}, Lrx/c/c$6;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQy:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bQT:Lrx/functions/b;
 
     new-instance v0, Lrx/c/c$7;
 
     invoke-direct {v0}, Lrx/c/c$7;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQz:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bQU:Lrx/functions/b;
 
     new-instance v0, Lrx/c/c$8;
 
     invoke-direct {v0}, Lrx/c/c$8;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bQA:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bQV:Lrx/functions/b;
 
     return-void
 .end method
 
-.method public static Lq()Lrx/functions/Func0;
+.method public static Le()Lrx/functions/Func0;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -331,7 +331,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bQJ:Lrx/functions/Func0;
+    sget-object v0, Lrx/c/c;->bRe:Lrx/functions/Func0;
 
     return-object v0
 .end method
@@ -355,7 +355,7 @@
 .method public static V(Ljava/lang/Throwable;)Ljava/lang/Throwable;
     .locals 1
 
-    sget-object v0, Lrx/c/c;->bQK:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bRf:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -385,7 +385,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bQB:Lrx/functions/Func2;
+    sget-object v0, Lrx/c/c;->bQW:Lrx/functions/Func2;
 
     if-eqz v0, :cond_0
 
@@ -415,7 +415,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bQz:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bQU:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -445,7 +445,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bQN:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bRi:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -462,7 +462,7 @@
 .method public static b(Lrx/b$a;)Lrx/b$a;
     .locals 1
 
-    sget-object v0, Lrx/c/c;->bQA:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bQV:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -490,7 +490,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bQy:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bQT:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -520,7 +520,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bQO:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bRj:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -537,7 +537,7 @@
 .method public static c(Lrx/Subscription;)Lrx/Subscription;
     .locals 1
 
-    sget-object v0, Lrx/c/c;->bQH:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bRc:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -554,7 +554,7 @@
 .method public static d(Lrx/Scheduler;)Lrx/Scheduler;
     .locals 1
 
-    sget-object v0, Lrx/c/c;->bQE:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bQZ:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -571,7 +571,7 @@
 .method public static e(Lrx/Scheduler;)Lrx/Scheduler;
     .locals 1
 
-    sget-object v0, Lrx/c/c;->bQF:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bRa:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -588,7 +588,7 @@
 .method public static e(Lrx/functions/Action0;)Lrx/functions/Action0;
     .locals 1
 
-    sget-object v0, Lrx/c/c;->bQG:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bRb:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -605,7 +605,7 @@
 .method public static onError(Ljava/lang/Throwable;)V
     .locals 4
 
-    sget-object v0, Lrx/c/c;->bPf:Lrx/functions/Action1;
+    sget-object v0, Lrx/c/c;->bPA:Lrx/functions/Action1;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/rx/c/e.smali b/com.discord/smali_classes2/rx/c/e.smali
index 188a91e432..8c11c70b35 100644
--- a/com.discord/smali_classes2/rx/c/e.smali
+++ b/com.discord/smali_classes2/rx/c/e.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bQQ:Lrx/c/e;
+.field private static final bRl:Lrx/c/e;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/c/e;-><init>()V
 
-    sput-object v0, Lrx/c/e;->bQQ:Lrx/c/e;
+    sput-object v0, Lrx/c/e;->bRl:Lrx/c/e;
 
     return-void
 .end method
@@ -28,10 +28,10 @@
     return-void
 .end method
 
-.method public static Lr()Lrx/c/d;
+.method public static Lf()Lrx/c/d;
     .locals 1
 
-    sget-object v0, Lrx/c/e;->bQQ:Lrx/c/e;
+    sget-object v0, Lrx/c/e;->bRl:Lrx/c/e;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/c/f$2.smali b/com.discord/smali_classes2/rx/c/f$2.smali
index d0e4825ca3..960976a633 100644
--- a/com.discord/smali_classes2/rx/c/f$2.smali
+++ b/com.discord/smali_classes2/rx/c/f$2.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lrx/c/f;->Lw()Lrx/c/a;
+    value = Lrx/c/f;->Lk()Lrx/c/a;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bQX:Lrx/c/f;
+.field final synthetic bRs:Lrx/c/f;
 
 
 # direct methods
 .method constructor <init>(Lrx/c/f;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/c/f$2;->bQX:Lrx/c/f;
+    iput-object p1, p0, Lrx/c/f$2;->bRs:Lrx/c/f;
 
     invoke-direct {p0}, Lrx/c/a;-><init>()V
 
diff --git a/com.discord/smali_classes2/rx/c/f.smali b/com.discord/smali_classes2/rx/c/f.smali
index 0a9a8e0087..d780097a14 100644
--- a/com.discord/smali_classes2/rx/c/f.smali
+++ b/com.discord/smali_classes2/rx/c/f.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static final bQR:Lrx/c/f;
+.field private static final bRm:Lrx/c/f;
 
-.field static final bQW:Lrx/c/b;
+.field static final bRr:Lrx/c/b;
 
 
 # instance fields
-.field private final bIP:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bJj:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -20,7 +20,7 @@
     .end annotation
 .end field
 
-.field private final bQS:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bRn:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field private final bQT:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bRo:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field private final bQU:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bRp:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -50,7 +50,7 @@
     .end annotation
 .end field
 
-.field private final bQV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bRq:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -69,13 +69,13 @@
 
     invoke-direct {v0}, Lrx/c/f;-><init>()V
 
-    sput-object v0, Lrx/c/f;->bQR:Lrx/c/f;
+    sput-object v0, Lrx/c/f;->bRm:Lrx/c/f;
 
     new-instance v0, Lrx/c/f$1;
 
     invoke-direct {v0}, Lrx/c/f$1;-><init>()V
 
-    sput-object v0, Lrx/c/f;->bQW:Lrx/c/b;
+    sput-object v0, Lrx/c/f;->bRr:Lrx/c/b;
 
     return-void
 .end method
@@ -89,41 +89,41 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lrx/c/f;->bQS:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bRn: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, Lrx/c/f;->bQT:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bRo: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, Lrx/c/f;->bQU:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bRp: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, Lrx/c/f;->bQV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bRq: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, Lrx/c/f;->bIP:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bJj:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
 
-.method public static Ls()Lrx/c/f;
+.method public static Lg()Lrx/c/f;
     .locals 1
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    sget-object v0, Lrx/c/f;->bQR:Lrx/c/f;
+    sget-object v0, Lrx/c/f;->bRm:Lrx/c/f;
 
     return-object v0
 .end method
@@ -439,10 +439,10 @@
 
 
 # virtual methods
-.method public final Lt()Lrx/c/b;
+.method public final Lh()Lrx/c/b;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bQS:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bRn:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -464,16 +464,16 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/c/f;->bQS:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bRn:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v2, Lrx/c/f;->bQW:Lrx/c/b;
+    sget-object v2, Lrx/c/f;->bRr:Lrx/c/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, Lrx/c/f;->bQS:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bRn:Ljava/util/concurrent/atomic/AtomicReference;
 
     check-cast v0, Lrx/c/b;
 
@@ -481,7 +481,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/c/f;->bQS:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bRn:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -492,10 +492,10 @@
     return-object v0
 .end method
 
-.method public final Lu()Lrx/c/d;
+.method public final Li()Lrx/c/d;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bQT:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bRo:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -517,9 +517,9 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/c/f;->bQT:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bRo:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-static {}, Lrx/c/e;->Lr()Lrx/c/d;
+    invoke-static {}, Lrx/c/e;->Lf()Lrx/c/d;
 
     move-result-object v2
 
@@ -528,7 +528,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->bQT:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bRo:Ljava/util/concurrent/atomic/AtomicReference;
 
     check-cast v0, Lrx/c/d;
 
@@ -536,7 +536,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/c/f;->bQT:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bRo:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -547,10 +547,10 @@
     return-object v0
 .end method
 
-.method public final Lv()Lrx/c/h;
+.method public final Lj()Lrx/c/h;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bQU:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bRp:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -572,9 +572,9 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/c/f;->bQU:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bRp:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-static {}, Lrx/c/i;->LC()Lrx/c/h;
+    invoke-static {}, Lrx/c/i;->Lq()Lrx/c/h;
 
     move-result-object v2
 
@@ -583,7 +583,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->bQU:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bRp:Ljava/util/concurrent/atomic/AtomicReference;
 
     check-cast v0, Lrx/c/h;
 
@@ -591,7 +591,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/c/f;->bQU:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bRp:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -602,10 +602,10 @@
     return-object v0
 .end method
 
-.method public final Lw()Lrx/c/a;
+.method public final Lk()Lrx/c/a;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bQV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bRq:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -627,7 +627,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/c/f;->bQV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bRq:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance v2, Lrx/c/f$2;
 
@@ -638,7 +638,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->bQV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bRq:Ljava/util/concurrent/atomic/AtomicReference;
 
     check-cast v0, Lrx/c/a;
 
@@ -646,7 +646,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/c/f;->bQV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bRq:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -657,10 +657,10 @@
     return-object v0
 .end method
 
-.method public final Lx()Lrx/c/g;
+.method public final Ll()Lrx/c/g;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bIP:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bJj:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -682,9 +682,9 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/c/f;->bIP:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bJj:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-static {}, Lrx/c/g;->LB()Lrx/c/g;
+    invoke-static {}, Lrx/c/g;->Lp()Lrx/c/g;
 
     move-result-object v2
 
@@ -693,7 +693,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->bIP:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bJj:Ljava/util/concurrent/atomic/AtomicReference;
 
     check-cast v0, Lrx/c/g;
 
@@ -701,7 +701,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/c/f;->bIP:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bJj:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/c/g.smali b/com.discord/smali_classes2/rx/c/g.smali
index d1a7cab266..70de67e2a3 100644
--- a/com.discord/smali_classes2/rx/c/g.smali
+++ b/com.discord/smali_classes2/rx/c/g.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bQY:Lrx/c/g;
+.field private static final bRt:Lrx/c/g;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/c/g;-><init>()V
 
-    sput-object v0, Lrx/c/g;->bQY:Lrx/c/g;
+    sput-object v0, Lrx/c/g;->bRt:Lrx/c/g;
 
     return-void
 .end method
@@ -28,31 +28,7 @@
     return-void
 .end method
 
-.method public static LA()Lrx/Scheduler;
-    .locals 2
-
-    new-instance v0, Lrx/internal/util/j;
-
-    const-string v1, "RxNewThreadScheduler-"
-
-    invoke-direct {v0, v1}, Lrx/internal/util/j;-><init>(Ljava/lang/String;)V
-
-    new-instance v1, Lrx/internal/c/g;
-
-    invoke-direct {v1, v0}, Lrx/internal/c/g;-><init>(Ljava/util/concurrent/ThreadFactory;)V
-
-    return-object v1
-.end method
-
-.method public static LB()Lrx/c/g;
-    .locals 1
-
-    sget-object v0, Lrx/c/g;->bQY:Lrx/c/g;
-
-    return-object v0
-.end method
-
-.method public static Ly()Lrx/Scheduler;
+.method public static Lm()Lrx/Scheduler;
     .locals 2
 
     new-instance v0, Lrx/internal/util/j;
@@ -68,7 +44,7 @@
     return-object v1
 .end method
 
-.method public static Lz()Lrx/Scheduler;
+.method public static Ln()Lrx/Scheduler;
     .locals 2
 
     new-instance v0, Lrx/internal/util/j;
@@ -84,6 +60,30 @@
     return-object v1
 .end method
 
+.method public static Lo()Lrx/Scheduler;
+    .locals 2
+
+    new-instance v0, Lrx/internal/util/j;
+
+    const-string v1, "RxNewThreadScheduler-"
+
+    invoke-direct {v0, v1}, Lrx/internal/util/j;-><init>(Ljava/lang/String;)V
+
+    new-instance v1, Lrx/internal/c/g;
+
+    invoke-direct {v1, v0}, Lrx/internal/c/g;-><init>(Ljava/util/concurrent/ThreadFactory;)V
+
+    return-object v1
+.end method
+
+.method public static Lp()Lrx/c/g;
+    .locals 1
+
+    sget-object v0, Lrx/c/g;->bRt:Lrx/c/g;
+
+    return-object v0
+.end method
+
 .method public static c(Lrx/functions/Action0;)Lrx/functions/Action0;
     .locals 0
     .annotation runtime Ljava/lang/Deprecated;
diff --git a/com.discord/smali_classes2/rx/c/i.smali b/com.discord/smali_classes2/rx/c/i.smali
index 15798322db..33f39bd5da 100644
--- a/com.discord/smali_classes2/rx/c/i.smali
+++ b/com.discord/smali_classes2/rx/c/i.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bQZ:Lrx/c/i;
+.field private static final bRu:Lrx/c/i;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/c/i;-><init>()V
 
-    sput-object v0, Lrx/c/i;->bQZ:Lrx/c/i;
+    sput-object v0, Lrx/c/i;->bRu:Lrx/c/i;
 
     return-void
 .end method
@@ -28,10 +28,10 @@
     return-void
 .end method
 
-.method public static LC()Lrx/c/h;
+.method public static Lq()Lrx/c/h;
     .locals 1
 
-    sget-object v0, Lrx/c/i;->bQZ:Lrx/c/i;
+    sget-object v0, Lrx/c/i;->bRu:Lrx/c/i;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/d$a.smali b/com.discord/smali_classes2/rx/d$a.smali
index f042d544ca..79cc1857aa 100644
--- a/com.discord/smali_classes2/rx/d$a.smali
+++ b/com.discord/smali_classes2/rx/d$a.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
-.field public static final enum bIH:Lrx/d$a;
+.field public static final enum bJb:Lrx/d$a;
 
-.field public static final enum bII:Lrx/d$a;
+.field public static final enum bJc:Lrx/d$a;
 
-.field public static final enum bIJ:Lrx/d$a;
+.field public static final enum bJd:Lrx/d$a;
 
-.field private static final synthetic bIK:[Lrx/d$a;
+.field private static final synthetic bJe:[Lrx/d$a;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0, v2, v1}, Lrx/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lrx/d$a;->bIH:Lrx/d$a;
+    sput-object v0, Lrx/d$a;->bJb:Lrx/d$a;
 
     new-instance v0, Lrx/d$a;
 
@@ -54,7 +54,7 @@
 
     invoke-direct {v0, v3, v2}, Lrx/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lrx/d$a;->bII:Lrx/d$a;
+    sput-object v0, Lrx/d$a;->bJc:Lrx/d$a;
 
     new-instance v0, Lrx/d$a;
 
@@ -64,25 +64,25 @@
 
     invoke-direct {v0, v4, v3}, Lrx/d$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lrx/d$a;->bIJ:Lrx/d$a;
+    sput-object v0, Lrx/d$a;->bJd:Lrx/d$a;
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lrx/d$a;
 
-    sget-object v4, Lrx/d$a;->bIH:Lrx/d$a;
+    sget-object v4, Lrx/d$a;->bJb:Lrx/d$a;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lrx/d$a;->bII:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bJc:Lrx/d$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lrx/d$a;->bIJ:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bJd:Lrx/d$a;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lrx/d$a;->bIK:[Lrx/d$a;
+    sput-object v0, Lrx/d$a;->bJe:[Lrx/d$a;
 
     return-void
 .end method
@@ -117,7 +117,7 @@
 .method public static values()[Lrx/d$a;
     .locals 1
 
-    sget-object v0, Lrx/d$a;->bIK:[Lrx/d$a;
+    sget-object v0, Lrx/d$a;->bJe:[Lrx/d$a;
 
     invoke-virtual {v0}, [Lrx/d$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/d.smali b/com.discord/smali_classes2/rx/d.smali
index 42529f745e..9110acc7e6 100644
--- a/com.discord/smali_classes2/rx/d.smali
+++ b/com.discord/smali_classes2/rx/d.smali
@@ -21,7 +21,7 @@
 
 
 # static fields
-.field private static final bIG:Lrx/d;
+.field private static final bJa:Lrx/d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/d<",
@@ -33,7 +33,7 @@
 
 
 # instance fields
-.field public final bIF:Lrx/d$a;
+.field public final bIZ:Lrx/d$a;
 
 .field public final throwable:Ljava/lang/Throwable;
 
@@ -52,13 +52,13 @@
 
     new-instance v0, Lrx/d;
 
-    sget-object v1, Lrx/d$a;->bIJ:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bJd:Lrx/d$a;
 
     const/4 v2, 0x0
 
     invoke-direct {v0, v1, v2, v2}, Lrx/d;-><init>(Lrx/d$a;Ljava/lang/Object;Ljava/lang/Throwable;)V
 
-    sput-object v0, Lrx/d;->bIG:Lrx/d;
+    sput-object v0, Lrx/d;->bJa:Lrx/d;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     iput-object p3, p0, Lrx/d;->throwable:Ljava/lang/Throwable;
 
-    iput-object p1, p0, Lrx/d;->bIF:Lrx/d$a;
+    iput-object p1, p0, Lrx/d;->bIZ:Lrx/d$a;
 
     return-void
 .end method
@@ -104,7 +104,7 @@
 
     new-instance v0, Lrx/d;
 
-    sget-object v1, Lrx/d$a;->bII:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bJc:Lrx/d$a;
 
     const/4 v2, 0x0
 
@@ -113,7 +113,7 @@
     return-object v0
 .end method
 
-.method public static JU()Lrx/d;
+.method public static JH()Lrx/d;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -127,7 +127,7 @@
 
     new-instance v0, Lrx/d;
 
-    sget-object v1, Lrx/d$a;->bIH:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bJb:Lrx/d$a;
 
     const/4 v2, 0x0
 
@@ -136,7 +136,7 @@
     return-object v0
 .end method
 
-.method public static JV()Lrx/d;
+.method public static JI()Lrx/d;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -148,15 +148,15 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/d;->bIG:Lrx/d;
+    sget-object v0, Lrx/d;->bJa:Lrx/d;
 
     return-object v0
 .end method
 
-.method private JW()Z
+.method private JJ()Z
     .locals 1
 
-    invoke-virtual {p0}, Lrx/d;->JX()Z
+    invoke-virtual {p0}, Lrx/d;->JK()Z
 
     move-result v0
 
@@ -179,9 +179,9 @@
 .method private hasValue()Z
     .locals 4
 
-    iget-object v0, p0, Lrx/d;->bIF:Lrx/d$a;
+    iget-object v0, p0, Lrx/d;->bIZ:Lrx/d$a;
 
-    sget-object v1, Lrx/d$a;->bIH:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bJb:Lrx/d$a;
 
     const/4 v2, 0x1
 
@@ -211,12 +211,12 @@
 
 
 # virtual methods
-.method public final JX()Z
+.method public final JK()Z
     .locals 2
 
-    iget-object v0, p0, Lrx/d;->bIF:Lrx/d$a;
+    iget-object v0, p0, Lrx/d;->bIZ:Lrx/d$a;
 
-    sget-object v1, Lrx/d$a;->bII:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bJc:Lrx/d$a;
 
     if-ne v0, v1, :cond_0
 
@@ -262,9 +262,9 @@
     :cond_2
     check-cast p1, Lrx/d;
 
-    iget-object v2, p1, Lrx/d;->bIF:Lrx/d$a;
+    iget-object v2, p1, Lrx/d;->bIZ:Lrx/d$a;
 
-    iget-object v3, p0, Lrx/d;->bIF:Lrx/d$a;
+    iget-object v3, p0, Lrx/d;->bIZ:Lrx/d$a;
 
     if-ne v2, v3, :cond_5
 
@@ -307,7 +307,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lrx/d;->bIF:Lrx/d$a;
+    iget-object v0, p0, Lrx/d;->bIZ:Lrx/d$a;
 
     invoke-virtual {v0}, Lrx/d$a;->hashCode()I
 
@@ -330,7 +330,7 @@
     add-int/2addr v0, v1
 
     :cond_0
-    invoke-direct {p0}, Lrx/d;->JW()Z
+    invoke-direct {p0}, Lrx/d;->JJ()Z
 
     move-result v1
 
@@ -373,7 +373,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lrx/d;->bIF:Lrx/d$a;
+    iget-object v2, p0, Lrx/d;->bIZ:Lrx/d$a;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -390,7 +390,7 @@
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     :cond_0
-    invoke-direct {p0}, Lrx/d;->JW()Z
+    invoke-direct {p0}, Lrx/d;->JJ()Z
 
     move-result v2
 
diff --git a/com.discord/smali_classes2/rx/d/a.smali b/com.discord/smali_classes2/rx/d/a.smali
index e1203a2879..85bcea6e2e 100644
--- a/com.discord/smali_classes2/rx/d/a.smali
+++ b/com.discord/smali_classes2/rx/d/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final aTb:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aTt:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -16,11 +16,11 @@
 
 
 # instance fields
-.field private final bRa:Lrx/Scheduler;
+.field private final bRv:Lrx/Scheduler;
 
-.field private final bRb:Lrx/Scheduler;
+.field private final bRw:Lrx/Scheduler;
 
-.field private final bRc:Lrx/Scheduler;
+.field private final bRx:Lrx/Scheduler;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sput-object v0, Lrx/d/a;->aTb:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lrx/d/a;->aTt:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -41,38 +41,38 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Lx()Lrx/c/g;
+    invoke-virtual {v0}, Lrx/c/f;->Ll()Lrx/c/g;
 
-    invoke-static {}, Lrx/c/g;->Ly()Lrx/Scheduler;
+    invoke-static {}, Lrx/c/g;->Lm()Lrx/Scheduler;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/d/a;->bRa:Lrx/Scheduler;
+    iput-object v0, p0, Lrx/d/a;->bRv:Lrx/Scheduler;
 
-    invoke-static {}, Lrx/c/g;->Lz()Lrx/Scheduler;
+    invoke-static {}, Lrx/c/g;->Ln()Lrx/Scheduler;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/d/a;->bRb:Lrx/Scheduler;
+    iput-object v0, p0, Lrx/d/a;->bRw:Lrx/Scheduler;
 
-    invoke-static {}, Lrx/c/g;->LA()Lrx/Scheduler;
+    invoke-static {}, Lrx/c/g;->Lo()Lrx/Scheduler;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/d/a;->bRc:Lrx/Scheduler;
+    iput-object v0, p0, Lrx/d/a;->bRx:Lrx/Scheduler;
 
     return-void
 .end method
 
-.method private static LD()Lrx/d/a;
+.method private static Lr()Lrx/d/a;
     .locals 3
 
     :goto_0
-    sget-object v0, Lrx/d/a;->aTb:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/d/a;->aTt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -89,7 +89,7 @@
 
     invoke-direct {v0}, Lrx/d/a;-><init>()V
 
-    sget-object v1, Lrx/d/a;->aTb:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lrx/d/a;->aTt:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v2, 0x0
 
@@ -102,27 +102,27 @@
     return-object v0
 
     :cond_1
-    invoke-direct {v0}, Lrx/d/a;->LH()V
+    invoke-direct {v0}, Lrx/d/a;->Lv()V
 
     goto :goto_0
 .end method
 
-.method public static LE()Lrx/Scheduler;
+.method public static Ls()Lrx/Scheduler;
     .locals 1
 
-    sget-object v0, Lrx/internal/c/m;->bOW:Lrx/internal/c/m;
+    sget-object v0, Lrx/internal/c/m;->bPr:Lrx/internal/c/m;
 
     return-object v0
 .end method
 
-.method public static LF()Lrx/Scheduler;
+.method public static Lt()Lrx/Scheduler;
     .locals 1
 
-    invoke-static {}, Lrx/d/a;->LD()Lrx/d/a;
+    invoke-static {}, Lrx/d/a;->Lr()Lrx/d/a;
 
     move-result-object v0
 
-    iget-object v0, v0, Lrx/d/a;->bRa:Lrx/Scheduler;
+    iget-object v0, v0, Lrx/d/a;->bRv:Lrx/Scheduler;
 
     invoke-static {v0}, Lrx/c/c;->d(Lrx/Scheduler;)Lrx/Scheduler;
 
@@ -131,14 +131,14 @@
     return-object v0
 .end method
 
-.method public static LG()Lrx/Scheduler;
+.method public static Lu()Lrx/Scheduler;
     .locals 1
 
-    invoke-static {}, Lrx/d/a;->LD()Lrx/d/a;
+    invoke-static {}, Lrx/d/a;->Lr()Lrx/d/a;
 
     move-result-object v0
 
-    iget-object v0, v0, Lrx/d/a;->bRb:Lrx/Scheduler;
+    iget-object v0, v0, Lrx/d/a;->bRw:Lrx/Scheduler;
 
     invoke-static {v0}, Lrx/c/c;->e(Lrx/Scheduler;)Lrx/Scheduler;
 
@@ -147,45 +147,45 @@
     return-object v0
 .end method
 
-.method private declared-synchronized LH()V
+.method private declared-synchronized Lv()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lrx/d/a;->bRa:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bRv:Lrx/Scheduler;
 
     instance-of v0, v0, Lrx/internal/c/k;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/d/a;->bRa:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bRv:Lrx/Scheduler;
 
     check-cast v0, Lrx/internal/c/k;
 
     invoke-interface {v0}, Lrx/internal/c/k;->shutdown()V
 
     :cond_0
-    iget-object v0, p0, Lrx/d/a;->bRb:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bRw:Lrx/Scheduler;
 
     instance-of v0, v0, Lrx/internal/c/k;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/d/a;->bRb:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bRw:Lrx/Scheduler;
 
     check-cast v0, Lrx/internal/c/k;
 
     invoke-interface {v0}, Lrx/internal/c/k;->shutdown()V
 
     :cond_1
-    iget-object v0, p0, Lrx/d/a;->bRc:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bRx:Lrx/Scheduler;
 
     instance-of v0, v0, Lrx/internal/c/k;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lrx/d/a;->bRc:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bRx:Lrx/Scheduler;
 
     check-cast v0, Lrx/internal/c/k;
 
diff --git a/com.discord/smali_classes2/rx/f.smali b/com.discord/smali_classes2/rx/f.smali
index 22c2533824..1a61b5d2d1 100644
--- a/com.discord/smali_classes2/rx/f.smali
+++ b/com.discord/smali_classes2/rx/f.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field final bIM:Lrx/f$a;
+.field final bJg:Lrx/f$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/f$a<",
@@ -48,7 +48,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/f;->bIM:Lrx/f$a;
+    iput-object p1, p0, Lrx/f;->bJg:Lrx/f$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/functions/a.smali b/com.discord/smali_classes2/rx/functions/a.smali
index 5bdf269110..55e50bdc07 100644
--- a/com.discord/smali_classes2/rx/functions/a.smali
+++ b/com.discord/smali_classes2/rx/functions/a.smali
@@ -13,7 +13,7 @@
 
 
 # static fields
-.field private static final bIX:Lrx/functions/a$b;
+.field private static final bJr:Lrx/functions/a$b;
 
 
 # direct methods
@@ -24,12 +24,12 @@
 
     invoke-direct {v0}, Lrx/functions/a$b;-><init>()V
 
-    sput-object v0, Lrx/functions/a;->bIX:Lrx/functions/a$b;
+    sput-object v0, Lrx/functions/a;->bJr:Lrx/functions/a$b;
 
     return-void
 .end method
 
-.method public static Kq()Lrx/functions/a$b;
+.method public static Ke()Lrx/functions/a$b;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -57,7 +57,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/functions/a;->bIX:Lrx/functions/a$b;
+    sget-object v0, Lrx/functions/a;->bJr:Lrx/functions/a$b;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/functions/c$1.smali b/com.discord/smali_classes2/rx/functions/c$1.smali
index ec0212ebd0..0345f5289a 100644
--- a/com.discord/smali_classes2/rx/functions/c$1.smali
+++ b/com.discord/smali_classes2/rx/functions/c$1.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bIY:Lrx/functions/Func9;
+.field final synthetic bJs:Lrx/functions/Func9;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func9;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$1;->bIY:Lrx/functions/Func9;
+    iput-object p1, p0, Lrx/functions/c$1;->bJs:Lrx/functions/Func9;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v2, p0, Lrx/functions/c$1;->bIY:Lrx/functions/Func9;
+    iget-object v2, p0, Lrx/functions/c$1;->bJs:Lrx/functions/Func9;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/rx/functions/c$2.smali b/com.discord/smali_classes2/rx/functions/c$2.smali
index 7bd02cf91d..be807fd5a6 100644
--- a/com.discord/smali_classes2/rx/functions/c$2.smali
+++ b/com.discord/smali_classes2/rx/functions/c$2.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bIZ:Lrx/functions/Func2;
+.field final synthetic bJt:Lrx/functions/Func2;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func2;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$2;->bIZ:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/functions/c$2;->bJt:Lrx/functions/Func2;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/functions/c$2;->bIZ:Lrx/functions/Func2;
+    iget-object v0, p0, Lrx/functions/c$2;->bJt:Lrx/functions/Func2;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/rx/functions/c$3.smali b/com.discord/smali_classes2/rx/functions/c$3.smali
index 60947d5969..713294fab1 100644
--- a/com.discord/smali_classes2/rx/functions/c$3.smali
+++ b/com.discord/smali_classes2/rx/functions/c$3.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bJa:Lrx/functions/Func3;
+.field final synthetic bJu:Lrx/functions/Func3;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func3;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$3;->bJa:Lrx/functions/Func3;
+    iput-object p1, p0, Lrx/functions/c$3;->bJu:Lrx/functions/Func3;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/functions/c$3;->bJa:Lrx/functions/Func3;
+    iget-object v0, p0, Lrx/functions/c$3;->bJu:Lrx/functions/Func3;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/rx/functions/c$4.smali b/com.discord/smali_classes2/rx/functions/c$4.smali
index fab8149104..58cf033d02 100644
--- a/com.discord/smali_classes2/rx/functions/c$4.smali
+++ b/com.discord/smali_classes2/rx/functions/c$4.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bJb:Lrx/functions/Func4;
+.field final synthetic bJv:Lrx/functions/Func4;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func4;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$4;->bJb:Lrx/functions/Func4;
+    iput-object p1, p0, Lrx/functions/c$4;->bJv:Lrx/functions/Func4;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/functions/c$4;->bJb:Lrx/functions/Func4;
+    iget-object v0, p0, Lrx/functions/c$4;->bJv:Lrx/functions/Func4;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/rx/functions/c$5.smali b/com.discord/smali_classes2/rx/functions/c$5.smali
index 7340439331..8ee0a412bc 100644
--- a/com.discord/smali_classes2/rx/functions/c$5.smali
+++ b/com.discord/smali_classes2/rx/functions/c$5.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bJc:Lrx/functions/Func5;
+.field final synthetic bJw:Lrx/functions/Func5;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func5;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$5;->bJc:Lrx/functions/Func5;
+    iput-object p1, p0, Lrx/functions/c$5;->bJw:Lrx/functions/Func5;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v2, p0, Lrx/functions/c$5;->bJc:Lrx/functions/Func5;
+    iget-object v2, p0, Lrx/functions/c$5;->bJw:Lrx/functions/Func5;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/rx/functions/c$6.smali b/com.discord/smali_classes2/rx/functions/c$6.smali
index e994ff14ec..b8fbe02161 100644
--- a/com.discord/smali_classes2/rx/functions/c$6.smali
+++ b/com.discord/smali_classes2/rx/functions/c$6.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bJd:Lrx/functions/Func6;
+.field final synthetic bJx:Lrx/functions/Func6;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func6;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$6;->bJd:Lrx/functions/Func6;
+    iput-object p1, p0, Lrx/functions/c$6;->bJx:Lrx/functions/Func6;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v2, p0, Lrx/functions/c$6;->bJd:Lrx/functions/Func6;
+    iget-object v2, p0, Lrx/functions/c$6;->bJx:Lrx/functions/Func6;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/rx/functions/c$7.smali b/com.discord/smali_classes2/rx/functions/c$7.smali
index 80ba843b1b..4eb5f9e03e 100644
--- a/com.discord/smali_classes2/rx/functions/c$7.smali
+++ b/com.discord/smali_classes2/rx/functions/c$7.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bJe:Lrx/functions/Func7;
+.field final synthetic bJy:Lrx/functions/Func7;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func7;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$7;->bJe:Lrx/functions/Func7;
+    iput-object p1, p0, Lrx/functions/c$7;->bJy:Lrx/functions/Func7;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v2, p0, Lrx/functions/c$7;->bJe:Lrx/functions/Func7;
+    iget-object v2, p0, Lrx/functions/c$7;->bJy:Lrx/functions/Func7;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/rx/functions/c$8.smali b/com.discord/smali_classes2/rx/functions/c$8.smali
index cade52b340..174a578bd6 100644
--- a/com.discord/smali_classes2/rx/functions/c$8.smali
+++ b/com.discord/smali_classes2/rx/functions/c$8.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bJf:Lrx/functions/Func8;
+.field final synthetic bJz:Lrx/functions/Func8;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func8;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$8;->bJf:Lrx/functions/Func8;
+    iput-object p1, p0, Lrx/functions/c$8;->bJz:Lrx/functions/Func8;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v2, p0, Lrx/functions/c$8;->bJf:Lrx/functions/Func8;
+    iget-object v2, p0, Lrx/functions/c$8;->bJz:Lrx/functions/Func8;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/rx/g.smali b/com.discord/smali_classes2/rx/g.smali
index e579c0d044..7416057399 100644
--- a/com.discord/smali_classes2/rx/g.smali
+++ b/com.discord/smali_classes2/rx/g.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field private final bIN:Lrx/internal/util/SubscriptionList;
+.field private final bJh:Lrx/internal/util/SubscriptionList;
 
 
 # direct methods
@@ -32,7 +32,7 @@
 
     invoke-direct {v0}, Lrx/internal/util/SubscriptionList;-><init>()V
 
-    iput-object v0, p0, Lrx/g;->bIN:Lrx/internal/util/SubscriptionList;
+    iput-object v0, p0, Lrx/g;->bJh:Lrx/internal/util/SubscriptionList;
 
     return-void
 .end method
@@ -42,7 +42,7 @@
 .method public final add(Lrx/Subscription;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/g;->bIN:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/g;->bJh:Lrx/internal/util/SubscriptionList;
 
     invoke-virtual {v0, p1}, Lrx/internal/util/SubscriptionList;->add(Lrx/Subscription;)V
 
@@ -52,7 +52,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/g;->bIN:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/g;->bJh:Lrx/internal/util/SubscriptionList;
 
     invoke-virtual {v0}, Lrx/internal/util/SubscriptionList;->isUnsubscribed()Z
 
@@ -75,7 +75,7 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/g;->bIN:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/g;->bJh:Lrx/internal/util/SubscriptionList;
 
     invoke-virtual {v0}, Lrx/internal/util/SubscriptionList;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/aa$1.smali b/com.discord/smali_classes2/rx/internal/a/aa$1.smali
index 420fc0698d..82e51630c5 100644
--- a/com.discord/smali_classes2/rx/internal/a/aa$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aa$1.smali
@@ -22,13 +22,13 @@
 
 
 # instance fields
-.field bKQ:Z
+.field final synthetic bKv:Lrx/Subscriber;
 
-.field final synthetic bKR:Lrx/internal/b/b;
+.field bLl:Z
 
-.field final synthetic bKS:Lrx/internal/a/aa;
+.field final synthetic bLm:Lrx/internal/b/b;
 
-.field final synthetic bKa:Lrx/Subscriber;
+.field final synthetic bLn:Lrx/internal/a/aa;
 
 .field done:Z
 
@@ -37,11 +37,11 @@
 .method constructor <init>(Lrx/internal/a/aa;Lrx/internal/b/b;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/aa$1;->bKS:Lrx/internal/a/aa;
+    iput-object p1, p0, Lrx/internal/a/aa$1;->bLn:Lrx/internal/a/aa;
 
-    iput-object p2, p0, Lrx/internal/a/aa$1;->bKR:Lrx/internal/b/b;
+    iput-object p2, p0, Lrx/internal/a/aa$1;->bLm:Lrx/internal/b/b;
 
-    iput-object p3, p0, Lrx/internal/a/aa$1;->bKa:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/aa$1;->bKv:Lrx/Subscriber;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -61,11 +61,11 @@
 
     iput-boolean v0, p0, Lrx/internal/a/aa$1;->done:Z
 
-    iget-boolean v0, p0, Lrx/internal/a/aa$1;->bKQ:Z
+    iget-boolean v0, p0, Lrx/internal/a/aa$1;->bLl:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/aa$1;->bKR:Lrx/internal/b/b;
+    iget-object v0, p0, Lrx/internal/a/aa$1;->bLm:Lrx/internal/b/b;
 
     sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
@@ -74,11 +74,11 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/aa$1;->bKR:Lrx/internal/b/b;
+    iget-object v0, p0, Lrx/internal/a/aa$1;->bLm:Lrx/internal/b/b;
 
-    iget-object v1, p0, Lrx/internal/a/aa$1;->bKS:Lrx/internal/a/aa;
+    iget-object v1, p0, Lrx/internal/a/aa$1;->bLn:Lrx/internal/a/aa;
 
-    iget-boolean v1, v1, Lrx/internal/a/aa;->bKP:Z
+    iget-boolean v1, v1, Lrx/internal/a/aa;->bLk:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -101,7 +101,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/aa$1;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/aa$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aa$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -130,12 +130,12 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/aa$1;->bKQ:Z
+    iput-boolean v0, p0, Lrx/internal/a/aa$1;->bLl:Z
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/aa$1;->bKS:Lrx/internal/a/aa;
+    iget-object v1, p0, Lrx/internal/a/aa$1;->bLn:Lrx/internal/a/aa;
 
-    iget-object v1, v1, Lrx/internal/a/aa;->bJM:Lrx/functions/b;
+    iget-object v1, v1, Lrx/internal/a/aa;->bKh:Lrx/functions/b;
 
     invoke-interface {v1, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -153,11 +153,11 @@
 
     iput-boolean v0, p0, Lrx/internal/a/aa$1;->done:Z
 
-    iget-object p1, p0, Lrx/internal/a/aa$1;->bKR:Lrx/internal/b/b;
+    iget-object p1, p0, Lrx/internal/a/aa$1;->bLm:Lrx/internal/b/b;
 
-    iget-object v1, p0, Lrx/internal/a/aa$1;->bKS:Lrx/internal/a/aa;
+    iget-object v1, p0, Lrx/internal/a/aa$1;->bLn:Lrx/internal/a/aa;
 
-    iget-boolean v1, v1, Lrx/internal/a/aa;->bKP:Z
+    iget-boolean v1, v1, Lrx/internal/a/aa;->bLk:Z
 
     xor-int/2addr v0, v1
 
diff --git a/com.discord/smali_classes2/rx/internal/a/aa.smali b/com.discord/smali_classes2/rx/internal/a/aa.smali
index 5dacef0836..dc1ff1955a 100644
--- a/com.discord/smali_classes2/rx/internal/a/aa.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aa.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field final bJM:Lrx/functions/b;
+.field final bKh:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field final bKP:Z
+.field final bLk:Z
 
 
 # direct methods
@@ -50,11 +50,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/aa;->bJM:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/aa;->bKh:Lrx/functions/b;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/aa;->bKP:Z
+    iput-boolean p1, p0, Lrx/internal/a/aa;->bLk:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/ab$a$1.smali b/com.discord/smali_classes2/rx/internal/a/ab$a$1.smali
index f036fc00c9..a78f972f8e 100644
--- a/com.discord/smali_classes2/rx/internal/a/ab$a$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ab$a$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bKX:Lrx/internal/a/ab$a;
+.field final synthetic bLs:Lrx/internal/a/ab$a;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/ab$a;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ab$a$1;->bKX:Lrx/internal/a/ab$a;
+    iput-object p1, p0, Lrx/internal/a/ab$a$1;->bLs:Lrx/internal/a/ab$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final call()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/a/ab$a$1;->bKX:Lrx/internal/a/ab$a;
+    iget-object v0, p0, Lrx/internal/a/ab$a$1;->bLs:Lrx/internal/a/ab$a;
 
     monitor-enter v0
 
@@ -51,13 +51,13 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lrx/internal/a/ab$a;->bKV:Ljava/util/List;
+    iget-object v1, v0, Lrx/internal/a/ab$a;->bLq:Ljava/util/List;
 
     new-instance v2, Ljava/util/ArrayList;
 
     invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v2, v0, Lrx/internal/a/ab$a;->bKV:Ljava/util/List;
+    iput-object v2, v0, Lrx/internal/a/ab$a;->bLq:Ljava/util/List;
 
     monitor-exit v0
     :try_end_0
diff --git a/com.discord/smali_classes2/rx/internal/a/ab$a.smali b/com.discord/smali_classes2/rx/internal/a/ab$a.smali
index d15cc9e804..93909259c7 100644
--- a/com.discord/smali_classes2/rx/internal/a/ab$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ab$a.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field bKV:Ljava/util/List;
+.field bLq:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field final synthetic bKW:Lrx/internal/a/ab;
+.field final synthetic bLr:Lrx/internal/a/ab;
 
 .field final child:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -64,7 +64,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lrx/internal/a/ab$a;->bKW:Lrx/internal/a/ab;
+    iput-object p1, p0, Lrx/internal/a/ab$a;->bLr:Lrx/internal/a/ab;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -76,7 +76,7 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ab$a;->bKV:Ljava/util/List;
+    iput-object p1, p0, Lrx/internal/a/ab$a;->bLq:Ljava/util/List;
 
     return-void
 .end method
@@ -109,11 +109,11 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ab$a;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/ab$a;->bKV:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/a/ab$a;->bLq:Ljava/util/List;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/internal/a/ab$a;->bKV:Ljava/util/List;
+    iput-object v1, p0, Lrx/internal/a/ab$a;->bLq:Ljava/util/List;
 
     monitor-exit p0
     :try_end_1
@@ -178,7 +178,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lrx/internal/a/ab$a;->bKV:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/ab$a;->bLq:Ljava/util/List;
 
     monitor-exit p0
     :try_end_0
@@ -223,29 +223,29 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/ab$a;->bKV:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/a/ab$a;->bLq:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lrx/internal/a/ab$a;->bKV:Ljava/util/List;
+    iget-object p1, p0, Lrx/internal/a/ab$a;->bLq:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
     move-result p1
 
-    iget-object v0, p0, Lrx/internal/a/ab$a;->bKW:Lrx/internal/a/ab;
+    iget-object v0, p0, Lrx/internal/a/ab$a;->bLr:Lrx/internal/a/ab;
 
     iget v0, v0, Lrx/internal/a/ab;->count:I
 
     if-ne p1, v0, :cond_1
 
-    iget-object p1, p0, Lrx/internal/a/ab$a;->bKV:Ljava/util/List;
+    iget-object p1, p0, Lrx/internal/a/ab$a;->bLq:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/a/ab$a;->bKV:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/ab$a;->bLq:Ljava/util/List;
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ab$b$1.smali b/com.discord/smali_classes2/rx/internal/a/ab$b$1.smali
index 8cd55a1efb..56e4da957a 100644
--- a/com.discord/smali_classes2/rx/internal/a/ab$b$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ab$b$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bKY:Lrx/internal/a/ab$b;
+.field final synthetic bLt:Lrx/internal/a/ab$b;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/ab$b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ab$b$1;->bKY:Lrx/internal/a/ab$b;
+    iput-object p1, p0, Lrx/internal/a/ab$b$1;->bLt:Lrx/internal/a/ab$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final call()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ab$b$1;->bKY:Lrx/internal/a/ab$b;
+    iget-object v0, p0, Lrx/internal/a/ab$b$1;->bLt:Lrx/internal/a/ab$b;
 
-    invoke-virtual {v0}, Lrx/internal/a/ab$b;->Ky()V
+    invoke-virtual {v0}, Lrx/internal/a/ab$b;->Km()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/ab$b$2.smali b/com.discord/smali_classes2/rx/internal/a/ab$b$2.smali
index 97693376c9..93a32c24f7 100644
--- a/com.discord/smali_classes2/rx/internal/a/ab$b$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ab$b$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lrx/internal/a/ab$b;->Ky()V
+    value = Lrx/internal/a/ab$b;->Km()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bKY:Lrx/internal/a/ab$b;
+.field final synthetic bLt:Lrx/internal/a/ab$b;
 
-.field final synthetic bKZ:Ljava/util/List;
+.field final synthetic bLu:Ljava/util/List;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/ab$b;Ljava/util/List;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ab$b$2;->bKY:Lrx/internal/a/ab$b;
+    iput-object p1, p0, Lrx/internal/a/ab$b$2;->bLt:Lrx/internal/a/ab$b;
 
-    iput-object p2, p0, Lrx/internal/a/ab$b$2;->bKZ:Ljava/util/List;
+    iput-object p2, p0, Lrx/internal/a/ab$b$2;->bLu:Ljava/util/List;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final call()V
     .locals 4
 
-    iget-object v0, p0, Lrx/internal/a/ab$b$2;->bKY:Lrx/internal/a/ab$b;
+    iget-object v0, p0, Lrx/internal/a/ab$b$2;->bLt:Lrx/internal/a/ab$b;
 
-    iget-object v1, p0, Lrx/internal/a/ab$b$2;->bKZ:Ljava/util/List;
+    iget-object v1, p0, Lrx/internal/a/ab$b$2;->bLu:Ljava/util/List;
 
     monitor-enter v0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ab$b.smali b/com.discord/smali_classes2/rx/internal/a/ab$b.smali
index 813e8fcc8f..d1f6762be8 100644
--- a/com.discord/smali_classes2/rx/internal/a/ab$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ab$b.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field final synthetic bKW:Lrx/internal/a/ab;
+.field final synthetic bLr:Lrx/internal/a/ab;
 
 .field final child:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -65,7 +65,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lrx/internal/a/ab$b;->bKW:Lrx/internal/a/ab;
+    iput-object p1, p0, Lrx/internal/a/ab$b;->bLr:Lrx/internal/a/ab;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -84,7 +84,7 @@
 
 
 # virtual methods
-.method final Ky()V
+.method final Km()V
     .locals 5
 
     new-instance v0, Ljava/util/ArrayList;
@@ -117,11 +117,11 @@
 
     invoke-direct {v2, p0, v0}, Lrx/internal/a/ab$b$2;-><init>(Lrx/internal/a/ab$b;Ljava/util/List;)V
 
-    iget-object v0, p0, Lrx/internal/a/ab$b;->bKW:Lrx/internal/a/ab;
+    iget-object v0, p0, Lrx/internal/a/ab$b;->bLr:Lrx/internal/a/ab;
 
-    iget-wide v3, v0, Lrx/internal/a/ab;->bKT:J
+    iget-wide v3, v0, Lrx/internal/a/ab;->bLo:J
 
-    iget-object v0, p0, Lrx/internal/a/ab$b;->bKW:Lrx/internal/a/ab;
+    iget-object v0, p0, Lrx/internal/a/ab$b;->bLr:Lrx/internal/a/ab;
 
     iget-object v0, v0, Lrx/internal/a/ab;->unit:Ljava/util/concurrent/TimeUnit;
 
@@ -328,7 +328,7 @@
 
     move-result v3
 
-    iget-object v4, p0, Lrx/internal/a/ab$b;->bKW:Lrx/internal/a/ab;
+    iget-object v4, p0, Lrx/internal/a/ab$b;->bLr:Lrx/internal/a/ab;
 
     iget v4, v4, Lrx/internal/a/ab;->count:I
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ab.smali b/com.discord/smali_classes2/rx/internal/a/ab.smali
index e1aa05da3b..94fbac69e1 100644
--- a/com.discord/smali_classes2/rx/internal/a/ab.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ab.smali
@@ -28,9 +28,9 @@
 
 
 # instance fields
-.field final bKT:J
+.field final bLo:J
 
-.field final bKU:J
+.field final bLp:J
 
 .field final count:I
 
@@ -45,9 +45,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide p1, p0, Lrx/internal/a/ab;->bKT:J
+    iput-wide p1, p0, Lrx/internal/a/ab;->bLo:J
 
-    iput-wide p3, p0, Lrx/internal/a/ab;->bKU:J
+    iput-wide p3, p0, Lrx/internal/a/ab;->bLp:J
 
     iput-object p5, p0, Lrx/internal/a/ab;->unit:Ljava/util/concurrent/TimeUnit;
 
@@ -74,7 +74,7 @@
 
     iget-object v0, p0, Lrx/internal/a/ab;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
@@ -82,9 +82,9 @@
 
     invoke-direct {v1, p1}, Lrx/observers/SerializedSubscriber;-><init>(Lrx/Subscriber;)V
 
-    iget-wide v2, p0, Lrx/internal/a/ab;->bKT:J
+    iget-wide v2, p0, Lrx/internal/a/ab;->bLo:J
 
-    iget-wide v4, p0, Lrx/internal/a/ab;->bKU:J
+    iget-wide v4, p0, Lrx/internal/a/ab;->bLp:J
 
     cmp-long v6, v2, v4
 
@@ -104,15 +104,15 @@
 
     invoke-direct {v4, v2}, Lrx/internal/a/ab$a$1;-><init>(Lrx/internal/a/ab$a;)V
 
-    iget-object p1, v2, Lrx/internal/a/ab$a;->bKW:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$a;->bLr:Lrx/internal/a/ab;
 
-    iget-wide v5, p1, Lrx/internal/a/ab;->bKT:J
+    iget-wide v5, p1, Lrx/internal/a/ab;->bLo:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$a;->bKW:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$a;->bLr:Lrx/internal/a/ab;
 
-    iget-wide v7, p1, Lrx/internal/a/ab;->bKT:J
+    iget-wide v7, p1, Lrx/internal/a/ab;->bLo:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$a;->bKW:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$a;->bLr:Lrx/internal/a/ab;
 
     iget-object v9, p1, Lrx/internal/a/ab;->unit:Ljava/util/concurrent/TimeUnit;
 
@@ -129,7 +129,7 @@
 
     invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    invoke-virtual {v2}, Lrx/internal/a/ab$b;->Ky()V
+    invoke-virtual {v2}, Lrx/internal/a/ab$b;->Km()V
 
     iget-object v3, v2, Lrx/internal/a/ab$b;->inner:Lrx/Scheduler$Worker;
 
@@ -137,15 +137,15 @@
 
     invoke-direct {v4, v2}, Lrx/internal/a/ab$b$1;-><init>(Lrx/internal/a/ab$b;)V
 
-    iget-object p1, v2, Lrx/internal/a/ab$b;->bKW:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$b;->bLr:Lrx/internal/a/ab;
 
-    iget-wide v5, p1, Lrx/internal/a/ab;->bKU:J
+    iget-wide v5, p1, Lrx/internal/a/ab;->bLp:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$b;->bKW:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$b;->bLr:Lrx/internal/a/ab;
 
-    iget-wide v7, p1, Lrx/internal/a/ab;->bKU:J
+    iget-wide v7, p1, Lrx/internal/a/ab;->bLp:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$b;->bKW:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$b;->bLr:Lrx/internal/a/ab;
 
     iget-object v9, p1, Lrx/internal/a/ab;->unit:Ljava/util/concurrent/TimeUnit;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ac$1$1.smali b/com.discord/smali_classes2/rx/internal/a/ac$1$1.smali
index 4fc38e0d9d..987afeddc7 100644
--- a/com.discord/smali_classes2/rx/internal/a/ac$1$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ac$1$1.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic bLc:Lrx/internal/a/ac$1;
+.field final synthetic bLx:Lrx/internal/a/ac$1;
 
 .field final synthetic val$index:I
 
@@ -27,7 +27,7 @@
 .method constructor <init>(Lrx/internal/a/ac$1;I)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ac$1$1;->bLc:Lrx/internal/a/ac$1;
+    iput-object p1, p0, Lrx/internal/a/ac$1$1;->bLx:Lrx/internal/a/ac$1;
 
     iput p2, p0, Lrx/internal/a/ac$1$1;->val$index:I
 
@@ -41,17 +41,17 @@
 .method public final call()V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/ac$1$1;->bLc:Lrx/internal/a/ac$1;
+    iget-object v0, p0, Lrx/internal/a/ac$1$1;->bLx:Lrx/internal/a/ac$1;
 
-    iget-object v0, v0, Lrx/internal/a/ac$1;->bLa:Lrx/internal/a/ac$a;
+    iget-object v0, v0, Lrx/internal/a/ac$1;->bLv:Lrx/internal/a/ac$a;
 
     iget v1, p0, Lrx/internal/a/ac$1$1;->val$index:I
 
-    iget-object v2, p0, Lrx/internal/a/ac$1$1;->bLc:Lrx/internal/a/ac$1;
+    iget-object v2, p0, Lrx/internal/a/ac$1$1;->bLx:Lrx/internal/a/ac$1;
 
     iget-object v2, v2, Lrx/internal/a/ac$1;->val$s:Lrx/observers/SerializedSubscriber;
 
-    iget-object v3, p0, Lrx/internal/a/ac$1$1;->bLc:Lrx/internal/a/ac$1;
+    iget-object v3, p0, Lrx/internal/a/ac$1$1;->bLx:Lrx/internal/a/ac$1;
 
     iget-object v3, v3, Lrx/internal/a/ac$1;->self:Lrx/Subscriber;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ac$1.smali b/com.discord/smali_classes2/rx/internal/a/ac$1.smali
index 80b2f60b73..0d2a2e976b 100644
--- a/com.discord/smali_classes2/rx/internal/a/ac$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ac$1.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field final bLa:Lrx/internal/a/ac$a;
+.field final bLv:Lrx/internal/a/ac$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ac$a<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field final synthetic bLb:Lrx/internal/a/ac;
+.field final synthetic bLw:Lrx/internal/a/ac;
 
 .field final self:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -53,7 +53,7 @@
 .method constructor <init>(Lrx/internal/a/ac;Lrx/Subscriber;Lrx/subscriptions/SerialSubscription;Lrx/Scheduler$Worker;Lrx/observers/SerializedSubscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ac$1;->bLb:Lrx/internal/a/ac;
+    iput-object p1, p0, Lrx/internal/a/ac$1;->bLw:Lrx/internal/a/ac;
 
     iput-object p3, p0, Lrx/internal/a/ac$1;->val$serial:Lrx/subscriptions/SerialSubscription;
 
@@ -67,7 +67,7 @@
 
     invoke-direct {p1}, Lrx/internal/a/ac$a;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ac$1;->bLa:Lrx/internal/a/ac$a;
+    iput-object p1, p0, Lrx/internal/a/ac$1;->bLv:Lrx/internal/a/ac$a;
 
     iput-object p0, p0, Lrx/internal/a/ac$1;->self:Lrx/Subscriber;
 
@@ -79,7 +79,7 @@
 .method public final onCompleted()V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/ac$1;->bLa:Lrx/internal/a/ac$a;
+    iget-object v0, p0, Lrx/internal/a/ac$1;->bLv:Lrx/internal/a/ac$a;
 
     iget-object v1, p0, Lrx/internal/a/ac$1;->val$s:Lrx/observers/SerializedSubscriber;
 
@@ -159,7 +159,7 @@
 
     invoke-virtual {p0}, Lrx/internal/a/ac$1;->unsubscribe()V
 
-    iget-object p1, p0, Lrx/internal/a/ac$1;->bLa:Lrx/internal/a/ac$a;
+    iget-object p1, p0, Lrx/internal/a/ac$1;->bLv:Lrx/internal/a/ac$a;
 
     invoke-virtual {p1}, Lrx/internal/a/ac$a;->clear()V
 
@@ -174,7 +174,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ac$1;->bLa:Lrx/internal/a/ac$a;
+    iget-object v0, p0, Lrx/internal/a/ac$1;->bLv:Lrx/internal/a/ac$a;
 
     invoke-virtual {v0, p1}, Lrx/internal/a/ac$a;->next(Ljava/lang/Object;)I
 
@@ -188,11 +188,11 @@
 
     invoke-direct {v2, p0, p1}, Lrx/internal/a/ac$1$1;-><init>(Lrx/internal/a/ac$1;I)V
 
-    iget-object p1, p0, Lrx/internal/a/ac$1;->bLb:Lrx/internal/a/ac;
+    iget-object p1, p0, Lrx/internal/a/ac$1;->bLw:Lrx/internal/a/ac;
 
     iget-wide v3, p1, Lrx/internal/a/ac;->timeout:J
 
-    iget-object p1, p0, Lrx/internal/a/ac$1;->bLb:Lrx/internal/a/ac;
+    iget-object p1, p0, Lrx/internal/a/ac$1;->bLw:Lrx/internal/a/ac;
 
     iget-object p1, p1, Lrx/internal/a/ac;->unit:Ljava/util/concurrent/TimeUnit;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ac.smali b/com.discord/smali_classes2/rx/internal/a/ac.smali
index 33daade009..9cf87bd437 100644
--- a/com.discord/smali_classes2/rx/internal/a/ac.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ac.smali
@@ -59,7 +59,7 @@
 
     iget-object p1, p0, Lrx/internal/a/ac;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {p1}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {p1}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object v4
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ad$1$1.smali b/com.discord/smali_classes2/rx/internal/a/ad$1$1.smali
index 0707550724..334782ad5a 100644
--- a/com.discord/smali_classes2/rx/internal/a/ad$1$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ad$1$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bLe:Lrx/internal/a/ad$1;
+.field final synthetic bLz:Lrx/internal/a/ad$1;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/ad$1;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ad$1$1;->bLe:Lrx/internal/a/ad$1;
+    iput-object p1, p0, Lrx/internal/a/ad$1$1;->bLz:Lrx/internal/a/ad$1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,19 +37,19 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$1;->bLe:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$1;->bLz:Lrx/internal/a/ad$1;
 
     iget-boolean v0, v0, Lrx/internal/a/ad$1;->done:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$1;->bLe:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$1;->bLz:Lrx/internal/a/ad$1;
 
     const/4 v1, 0x1
 
     iput-boolean v1, v0, Lrx/internal/a/ad$1;->done:Z
 
-    iget-object v0, v0, Lrx/internal/a/ad$1;->bKa:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/ad$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ad$1$2.smali b/com.discord/smali_classes2/rx/internal/a/ad$1$2.smali
index abdfa004c4..6832f57ed5 100644
--- a/com.discord/smali_classes2/rx/internal/a/ad$1$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ad$1$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bLe:Lrx/internal/a/ad$1;
+.field final synthetic bLA:Ljava/lang/Throwable;
 
-.field final synthetic bLf:Ljava/lang/Throwable;
+.field final synthetic bLz:Lrx/internal/a/ad$1;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/ad$1;Ljava/lang/Throwable;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ad$1$2;->bLe:Lrx/internal/a/ad$1;
+    iput-object p1, p0, Lrx/internal/a/ad$1$2;->bLz:Lrx/internal/a/ad$1;
 
-    iput-object p2, p0, Lrx/internal/a/ad$1$2;->bLf:Ljava/lang/Throwable;
+    iput-object p2, p0, Lrx/internal/a/ad$1$2;->bLA:Ljava/lang/Throwable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,25 +41,25 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bLe:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bLz:Lrx/internal/a/ad$1;
 
     iget-boolean v0, v0, Lrx/internal/a/ad$1;->done:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bLe:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bLz:Lrx/internal/a/ad$1;
 
     const/4 v1, 0x1
 
     iput-boolean v1, v0, Lrx/internal/a/ad$1;->done:Z
 
-    iget-object v0, v0, Lrx/internal/a/ad$1;->bKa:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/ad$1;->bKv:Lrx/Subscriber;
 
-    iget-object v1, p0, Lrx/internal/a/ad$1$2;->bLf:Ljava/lang/Throwable;
+    iget-object v1, p0, Lrx/internal/a/ad$1$2;->bLA:Ljava/lang/Throwable;
 
     invoke-virtual {v0, v1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bLe:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bLz:Lrx/internal/a/ad$1;
 
     iget-object v0, v0, Lrx/internal/a/ad$1;->val$worker:Lrx/Scheduler$Worker;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ad$1$3.smali b/com.discord/smali_classes2/rx/internal/a/ad$1$3.smali
index 4f4c58fe91..539c9c3821 100644
--- a/com.discord/smali_classes2/rx/internal/a/ad$1$3.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ad$1$3.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bLe:Lrx/internal/a/ad$1;
+.field final synthetic bLB:Ljava/lang/Object;
 
-.field final synthetic bLg:Ljava/lang/Object;
+.field final synthetic bLz:Lrx/internal/a/ad$1;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/ad$1;Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ad$1$3;->bLe:Lrx/internal/a/ad$1;
+    iput-object p1, p0, Lrx/internal/a/ad$1$3;->bLz:Lrx/internal/a/ad$1;
 
-    iput-object p2, p0, Lrx/internal/a/ad$1$3;->bLg:Ljava/lang/Object;
+    iput-object p2, p0, Lrx/internal/a/ad$1$3;->bLB:Ljava/lang/Object;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,17 +41,17 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$3;->bLe:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$3;->bLz:Lrx/internal/a/ad$1;
 
     iget-boolean v0, v0, Lrx/internal/a/ad$1;->done:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$3;->bLe:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$3;->bLz:Lrx/internal/a/ad$1;
 
-    iget-object v0, v0, Lrx/internal/a/ad$1;->bKa:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/ad$1;->bKv:Lrx/Subscriber;
 
-    iget-object v1, p0, Lrx/internal/a/ad$1$3;->bLg:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/ad$1$3;->bLB:Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ad$1.smali b/com.discord/smali_classes2/rx/internal/a/ad$1.smali
index 5ed75339d8..90cbb58ba8 100644
--- a/com.discord/smali_classes2/rx/internal/a/ad$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ad$1.smali
@@ -22,9 +22,9 @@
 
 
 # instance fields
-.field final synthetic bKa:Lrx/Subscriber;
+.field final synthetic bKv:Lrx/Subscriber;
 
-.field final synthetic bLd:Lrx/internal/a/ad;
+.field final synthetic bLy:Lrx/internal/a/ad;
 
 .field done:Z
 
@@ -35,11 +35,11 @@
 .method constructor <init>(Lrx/internal/a/ad;Lrx/Subscriber;Lrx/Scheduler$Worker;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ad$1;->bLd:Lrx/internal/a/ad;
+    iput-object p1, p0, Lrx/internal/a/ad$1;->bLy:Lrx/internal/a/ad;
 
     iput-object p3, p0, Lrx/internal/a/ad$1;->val$worker:Lrx/Scheduler$Worker;
 
-    iput-object p4, p0, Lrx/internal/a/ad$1;->bKa:Lrx/Subscriber;
+    iput-object p4, p0, Lrx/internal/a/ad$1;->bKv:Lrx/Subscriber;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -57,11 +57,11 @@
 
     invoke-direct {v1, p0}, Lrx/internal/a/ad$1$1;-><init>(Lrx/internal/a/ad$1;)V
 
-    iget-object v2, p0, Lrx/internal/a/ad$1;->bLd:Lrx/internal/a/ad;
+    iget-object v2, p0, Lrx/internal/a/ad$1;->bLy:Lrx/internal/a/ad;
 
     iget-wide v2, v2, Lrx/internal/a/ad;->delay:J
 
-    iget-object v4, p0, Lrx/internal/a/ad$1;->bLd:Lrx/internal/a/ad;
+    iget-object v4, p0, Lrx/internal/a/ad$1;->bLy:Lrx/internal/a/ad;
 
     iget-object v4, v4, Lrx/internal/a/ad;->unit:Ljava/util/concurrent/TimeUnit;
 
@@ -98,11 +98,11 @@
 
     invoke-direct {v1, p0, p1}, Lrx/internal/a/ad$1$3;-><init>(Lrx/internal/a/ad$1;Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lrx/internal/a/ad$1;->bLd:Lrx/internal/a/ad;
+    iget-object p1, p0, Lrx/internal/a/ad$1;->bLy:Lrx/internal/a/ad;
 
     iget-wide v2, p1, Lrx/internal/a/ad;->delay:J
 
-    iget-object p1, p0, Lrx/internal/a/ad$1;->bLd:Lrx/internal/a/ad;
+    iget-object p1, p0, Lrx/internal/a/ad$1;->bLy:Lrx/internal/a/ad;
 
     iget-object p1, p1, Lrx/internal/a/ad;->unit:Ljava/util/concurrent/TimeUnit;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ad.smali b/com.discord/smali_classes2/rx/internal/a/ad.smali
index 90370d389f..a0eed2dfa0 100644
--- a/com.discord/smali_classes2/rx/internal/a/ad.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ad.smali
@@ -51,7 +51,7 @@
 
     iget-object v0, p0, Lrx/internal/a/ad;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ae$1.smali b/com.discord/smali_classes2/rx/internal/a/ae$1.smali
index 5ad3498322..f2e2e10356 100644
--- a/com.discord/smali_classes2/rx/internal/a/ae$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ae$1.smali
@@ -22,9 +22,9 @@
 
 
 # instance fields
-.field final synthetic bKa:Lrx/Subscriber;
+.field final synthetic bKv:Lrx/Subscriber;
 
-.field bLi:Ljava/lang/Object;
+.field bLD:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TU;"
@@ -32,18 +32,18 @@
     .end annotation
 .end field
 
-.field bLj:Z
+.field bLE:Z
 
-.field final synthetic bLk:Lrx/internal/a/ae;
+.field final synthetic bLF:Lrx/internal/a/ae;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/ae;Lrx/Subscriber;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ae$1;->bLk:Lrx/internal/a/ae;
+    iput-object p1, p0, Lrx/internal/a/ae$1;->bLF:Lrx/internal/a/ae;
 
-    iput-object p3, p0, Lrx/internal/a/ae$1;->bKa:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ae$1;->bKv:Lrx/Subscriber;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -55,7 +55,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ae$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -65,7 +65,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ae$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -81,9 +81,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/ae$1;->bLk:Lrx/internal/a/ae;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bLF:Lrx/internal/a/ae;
 
-    iget-object v0, v0, Lrx/internal/a/ae;->bKM:Lrx/functions/b;
+    iget-object v0, v0, Lrx/internal/a/ae;->bLh:Lrx/functions/b;
 
     invoke-interface {v0, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -91,18 +91,18 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    iget-object v1, p0, Lrx/internal/a/ae$1;->bLi:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/ae$1;->bLD:Ljava/lang/Object;
 
-    iput-object v0, p0, Lrx/internal/a/ae$1;->bLi:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/ae$1;->bLD:Ljava/lang/Object;
 
-    iget-boolean v2, p0, Lrx/internal/a/ae$1;->bLj:Z
+    iget-boolean v2, p0, Lrx/internal/a/ae$1;->bLE:Z
 
     if-eqz v2, :cond_1
 
     :try_start_1
-    iget-object v2, p0, Lrx/internal/a/ae$1;->bLk:Lrx/internal/a/ae;
+    iget-object v2, p0, Lrx/internal/a/ae$1;->bLF:Lrx/internal/a/ae;
 
-    iget-object v2, v2, Lrx/internal/a/ae;->bLh:Lrx/functions/Func2;
+    iget-object v2, v2, Lrx/internal/a/ae;->bLC:Lrx/functions/Func2;
 
     invoke-interface {v2, v1, v0}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -118,7 +118,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ae$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -134,7 +134,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object v1, p0, Lrx/internal/a/ae$1;->bKa:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/ae$1;->bKv:Lrx/Subscriber;
 
     invoke-static {p1, v1, v0}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;Ljava/lang/Object;)V
 
@@ -143,9 +143,9 @@
     :cond_1
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/ae$1;->bLj:Z
+    iput-boolean v0, p0, Lrx/internal/a/ae$1;->bLE:Z
 
-    iget-object v0, p0, Lrx/internal/a/ae$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -154,7 +154,7 @@
     :catchall_1
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/ae$1;->bKa:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/ae$1;->bKv:Lrx/Subscriber;
 
     invoke-static {v0, v1, p1}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ae$a.smali b/com.discord/smali_classes2/rx/internal/a/ae$a.smali
index 96b45dc5b9..414f82af57 100644
--- a/com.discord/smali_classes2/rx/internal/a/ae$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ae$a.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final bLl:Lrx/internal/a/ae;
+.field static final bLG:Lrx/internal/a/ae;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ae<",
@@ -31,11 +31,11 @@
 
     new-instance v0, Lrx/internal/a/ae;
 
-    sget-object v1, Lrx/internal/util/l$b;->bPI:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->bQd:Lrx/internal/util/l$b;
 
     invoke-direct {v0, v1}, Lrx/internal/a/ae;-><init>(Lrx/functions/b;)V
 
-    sput-object v0, Lrx/internal/a/ae$a;->bLl:Lrx/internal/a/ae;
+    sput-object v0, Lrx/internal/a/ae$a;->bLG:Lrx/internal/a/ae;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/ae.smali b/com.discord/smali_classes2/rx/internal/a/ae.smali
index d43633f6af..06f0ab7944 100644
--- a/com.discord/smali_classes2/rx/internal/a/ae.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ae.smali
@@ -33,16 +33,7 @@
 
 
 # instance fields
-.field final bKM:Lrx/functions/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/b<",
-            "-TT;+TU;>;"
-        }
-    .end annotation
-.end field
-
-.field final bLh:Lrx/functions/Func2;
+.field final bLC:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -53,6 +44,15 @@
     .end annotation
 .end field
 
+.field final bLh:Lrx/functions/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/b<",
+            "-TT;+TU;>;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method public constructor <init>(Lrx/functions/Func2;)V
@@ -69,11 +69,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lrx/internal/util/l$b;->bPI:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bQd:Lrx/internal/util/l$b;
 
-    iput-object v0, p0, Lrx/internal/a/ae;->bKM:Lrx/functions/b;
+    iput-object v0, p0, Lrx/internal/a/ae;->bLh:Lrx/functions/b;
 
-    iput-object p1, p0, Lrx/internal/a/ae;->bLh:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/internal/a/ae;->bLC:Lrx/functions/Func2;
 
     return-void
 .end method
@@ -90,14 +90,14 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ae;->bKM:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/ae;->bLh:Lrx/functions/b;
 
-    iput-object p0, p0, Lrx/internal/a/ae;->bLh:Lrx/functions/Func2;
+    iput-object p0, p0, Lrx/internal/a/ae;->bLC:Lrx/functions/Func2;
 
     return-void
 .end method
 
-.method public static Kz()Lrx/internal/a/ae;
+.method public static Kn()Lrx/internal/a/ae;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -109,7 +109,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/ae$a;->bLl:Lrx/internal/a/ae;
+    sget-object v0, Lrx/internal/a/ae$a;->bLG:Lrx/internal/a/ae;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/af.smali b/com.discord/smali_classes2/rx/internal/a/af.smali
index 814500b45a..cac73ea615 100644
--- a/com.discord/smali_classes2/rx/internal/a/af.smali
+++ b/com.discord/smali_classes2/rx/internal/a/af.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final bLm:Lrx/functions/Action0;
+.field private final bLH:Lrx/functions/Action0;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/af;->bLm:Lrx/functions/Action0;
+    iput-object p1, p0, Lrx/internal/a/af;->bLH:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/af;->bLm:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/a/af;->bLH:Lrx/functions/Action0;
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ag.smali b/com.discord/smali_classes2/rx/internal/a/ag.smali
index 9ff667f2f5..46bd043176 100644
--- a/com.discord/smali_classes2/rx/internal/a/ag.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ag.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final bLn:Lrx/functions/Action0;
+.field private final bLI:Lrx/functions/Action0;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ag;->bLn:Lrx/functions/Action0;
+    iput-object p1, p0, Lrx/internal/a/ag;->bLI:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/ag;->bLn:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/a/ag;->bLI:Lrx/functions/Action0;
 
     invoke-static {v0}, Lrx/subscriptions/c;->g(Lrx/functions/Action0;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ah$a.smali b/com.discord/smali_classes2/rx/internal/a/ah$a.smali
index 51ebb5cd6d..e7a204f557 100644
--- a/com.discord/smali_classes2/rx/internal/a/ah$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ah$a.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final bLq:Lrx/internal/a/ah;
+.field static final bLL:Lrx/internal/a/ah;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ah<",
@@ -36,7 +36,7 @@
 
     invoke-direct {v0, v1}, Lrx/internal/a/ah;-><init>(Z)V
 
-    sput-object v0, Lrx/internal/a/ah$a;->bLq:Lrx/internal/a/ah;
+    sput-object v0, Lrx/internal/a/ah$a;->bLL:Lrx/internal/a/ah;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/ah$b.smali b/com.discord/smali_classes2/rx/internal/a/ah$b.smali
index 1ff9411dea..a2f06844e0 100644
--- a/com.discord/smali_classes2/rx/internal/a/ah$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ah$b.smali
@@ -25,11 +25,11 @@
 
 
 # static fields
-.field static final bLu:I
+.field static final bLP:I
 
 
 # instance fields
-.field final bLr:Lrx/internal/a/ah$d;
+.field final bLM:Lrx/internal/a/ah$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ah$d<",
@@ -38,9 +38,9 @@
     .end annotation
 .end field
 
-.field volatile bLs:Lrx/internal/util/i;
+.field volatile bLN:Lrx/internal/util/i;
 
-.field bLt:I
+.field bLO:I
 
 .field volatile done:Z
 
@@ -55,7 +55,7 @@
 
     div-int/lit8 v0, v0, 0x4
 
-    sput v0, Lrx/internal/a/ah$b;->bLu:I
+    sput v0, Lrx/internal/a/ah$b;->bLP:I
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ah$b;->bLr:Lrx/internal/a/ah$d;
+    iput-object p1, p0, Lrx/internal/a/ah$b;->bLM:Lrx/internal/a/ah$d;
 
     iput-wide p2, p0, Lrx/internal/a/ah$b;->id:J
 
@@ -84,24 +84,24 @@
 .method public final aZ(J)V
     .locals 1
 
-    iget v0, p0, Lrx/internal/a/ah$b;->bLt:I
+    iget v0, p0, Lrx/internal/a/ah$b;->bLO:I
 
     long-to-int p2, p1
 
     sub-int/2addr v0, p2
 
-    sget p1, Lrx/internal/a/ah$b;->bLu:I
+    sget p1, Lrx/internal/a/ah$b;->bLP:I
 
     if-le v0, p1, :cond_0
 
-    iput v0, p0, Lrx/internal/a/ah$b;->bLt:I
+    iput v0, p0, Lrx/internal/a/ah$b;->bLO:I
 
     return-void
 
     :cond_0
     sget p1, Lrx/internal/util/i;->SIZE:I
 
-    iput p1, p0, Lrx/internal/a/ah$b;->bLt:I
+    iput p1, p0, Lrx/internal/a/ah$b;->bLO:I
 
     sget p1, Lrx/internal/util/i;->SIZE:I
 
@@ -124,9 +124,9 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ah$b;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/ah$b;->bLr:Lrx/internal/a/ah$d;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->bLM:Lrx/internal/a/ah$d;
 
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->KE()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Ks()V
 
     return-void
 .end method
@@ -138,17 +138,17 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ah$b;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/ah$b;->bLr:Lrx/internal/a/ah$d;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->bLM:Lrx/internal/a/ah$d;
 
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->KB()Ljava/util/Queue;
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Kp()Ljava/util/Queue;
 
     move-result-object v0
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lrx/internal/a/ah$b;->bLr:Lrx/internal/a/ah$d;
+    iget-object p1, p0, Lrx/internal/a/ah$b;->bLM:Lrx/internal/a/ah$d;
 
-    invoke-virtual {p1}, Lrx/internal/a/ah$d;->KE()V
+    invoke-virtual {p1}, Lrx/internal/a/ah$d;->Ks()V
 
     return-void
 .end method
@@ -161,9 +161,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ah$b;->bLr:Lrx/internal/a/ah$d;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->bLM:Lrx/internal/a/ah$d;
 
-    iget-object v1, v0, Lrx/internal/a/ah$d;->bLv:Lrx/internal/a/ah$c;
+    iget-object v1, v0, Lrx/internal/a/ah$d;->bLQ:Lrx/internal/a/ah$c;
 
     invoke-virtual {v1}, Lrx/internal/a/ah$c;->get()J
 
@@ -182,7 +182,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, v0, Lrx/internal/a/ah$d;->bLv:Lrx/internal/a/ah$c;
+    iget-object v1, v0, Lrx/internal/a/ah$d;->bLQ:Lrx/internal/a/ah$c;
 
     invoke-virtual {v1}, Lrx/internal/a/ah$c;->get()J
 
@@ -227,7 +227,7 @@
     :goto_1
     if-eqz v3, :cond_8
 
-    iget-object v3, p0, Lrx/internal/a/ah$b;->bLs:Lrx/internal/util/i;
+    iget-object v3, p0, Lrx/internal/a/ah$b;->bLN:Lrx/internal/util/i;
 
     if-eqz v3, :cond_3
 
@@ -242,7 +242,7 @@
     :cond_2
     invoke-static {p0, p1}, Lrx/internal/a/ah$d;->a(Lrx/internal/a/ah$b;Ljava/lang/Object;)V
 
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->KF()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Kt()V
 
     return-void
 
@@ -261,7 +261,7 @@
     move-exception p1
 
     :try_start_2
-    iget-boolean v3, v0, Lrx/internal/a/ah$d;->bLo:Z
+    iget-boolean v3, v0, Lrx/internal/a/ah$d;->bLJ:Z
 
     if-nez v3, :cond_4
 
@@ -285,7 +285,7 @@
 
     :cond_4
     :try_start_4
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->KB()Ljava/util/Queue;
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Kp()Ljava/util/Queue;
 
     move-result-object v3
 
@@ -298,7 +298,7 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, v0, Lrx/internal/a/ah$d;->bLv:Lrx/internal/a/ah$c;
+    iget-object p1, v0, Lrx/internal/a/ah$d;->bLQ:Lrx/internal/a/ah$c;
 
     const-wide/16 v1, -0x1
 
@@ -331,7 +331,7 @@
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_3
 
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->KF()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Kt()V
 
     return-void
 
@@ -381,7 +381,7 @@
     :cond_8
     invoke-static {p0, p1}, Lrx/internal/a/ah$d;->a(Lrx/internal/a/ah$b;Ljava/lang/Object;)V
 
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->KE()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Ks()V
 
     :goto_6
     return-void
@@ -392,7 +392,7 @@
 
     sget v0, Lrx/internal/util/i;->SIZE:I
 
-    iput v0, p0, Lrx/internal/a/ah$b;->bLt:I
+    iput v0, p0, Lrx/internal/a/ah$b;->bLO:I
 
     sget v0, Lrx/internal/util/i;->SIZE:I
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ah$c.smali b/com.discord/smali_classes2/rx/internal/a/ah$c.smali
index 43e0b05565..729a3c9323 100644
--- a/com.discord/smali_classes2/rx/internal/a/ah$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ah$c.smali
@@ -88,7 +88,7 @@
 
     iget-object p1, p0, Lrx/internal/a/ah$c;->subscriber:Lrx/internal/a/ah$d;
 
-    invoke-virtual {p1}, Lrx/internal/a/ah$d;->KE()V
+    invoke-virtual {p1}, Lrx/internal/a/ah$d;->Ks()V
 
     return-void
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ah$d.smali b/com.discord/smali_classes2/rx/internal/a/ah$d.smali
index 5898a1778a..8c41c3ef13 100644
--- a/com.discord/smali_classes2/rx/internal/a/ah$d.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ah$d.smali
@@ -26,7 +26,7 @@
 
 
 # static fields
-.field static final bLB:[Lrx/internal/a/ah$b;
+.field static final bLW:[Lrx/internal/a/ah$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -38,17 +38,11 @@
 
 
 # instance fields
-.field bLA:J
+.field final bLJ:Z
 
-.field final bLC:I
+.field final bLK:I
 
-.field bLD:I
-
-.field final bLo:Z
-
-.field final bLp:I
-
-.field bLv:Lrx/internal/a/ah$c;
+.field bLQ:Lrx/internal/a/ah$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ah$c<",
@@ -57,7 +51,7 @@
     .end annotation
 .end field
 
-.field volatile bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field volatile bLR:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -67,9 +61,9 @@
     .end annotation
 .end field
 
-.field final bLx:Ljava/lang/Object;
+.field final bLS:Ljava/lang/Object;
 
-.field volatile bLy:[Lrx/internal/a/ah$b;
+.field volatile bLT:[Lrx/internal/a/ah$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -79,7 +73,13 @@
     .end annotation
 .end field
 
-.field bLz:J
+.field bLU:J
+
+.field bLV:J
+
+.field final bLX:I
+
+.field bLY:I
 
 .field final child:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -119,7 +119,7 @@
 
     new-array v0, v0, [Lrx/internal/a/ah$b;
 
-    sput-object v0, Lrx/internal/a/ah$d;->bLB:[Lrx/internal/a/ah$b;
+    sput-object v0, Lrx/internal/a/ah$d;->bLW:[Lrx/internal/a/ah$b;
 
     return-void
 .end method
@@ -138,25 +138,25 @@
 
     iput-object p1, p0, Lrx/internal/a/ah$d;->child:Lrx/Subscriber;
 
-    iput-boolean p2, p0, Lrx/internal/a/ah$d;->bLo:Z
+    iput-boolean p2, p0, Lrx/internal/a/ah$d;->bLJ:Z
 
-    iput p3, p0, Lrx/internal/a/ah$d;->bLp:I
+    iput p3, p0, Lrx/internal/a/ah$d;->bLK:I
 
     new-instance p1, Ljava/lang/Object;
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ah$d;->bLx:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/ah$d;->bLS:Ljava/lang/Object;
 
-    sget-object p1, Lrx/internal/a/ah$d;->bLB:[Lrx/internal/a/ah$b;
+    sget-object p1, Lrx/internal/a/ah$d;->bLW:[Lrx/internal/a/ah$b;
 
-    iput-object p1, p0, Lrx/internal/a/ah$d;->bLy:[Lrx/internal/a/ah$b;
+    iput-object p1, p0, Lrx/internal/a/ah$d;->bLT:[Lrx/internal/a/ah$b;
 
     const p1, 0x7fffffff
 
     if-ne p3, p1, :cond_0
 
-    iput p1, p0, Lrx/internal/a/ah$d;->bLC:I
+    iput p1, p0, Lrx/internal/a/ah$d;->bLX:I
 
     const-wide p1, 0x7fffffffffffffffL
 
@@ -173,7 +173,7 @@
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/a/ah$d;->bLC:I
+    iput p1, p0, Lrx/internal/a/ah$d;->bLX:I
 
     int-to-long p1, p3
 
@@ -182,7 +182,7 @@
     return-void
 .end method
 
-.method private KC()Lrx/subscriptions/CompositeSubscription;
+.method private Kq()Lrx/subscriptions/CompositeSubscription;
     .locals 2
 
     iget-object v0, p0, Lrx/internal/a/ah$d;->subscriptions:Lrx/subscriptions/CompositeSubscription;
@@ -239,12 +239,12 @@
     return-object v0
 .end method
 
-.method private KD()V
+.method private Kr()V
     .locals 4
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lrx/internal/a/ah$d;->bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, p0, Lrx/internal/a/ah$d;->bLR:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
@@ -282,7 +282,7 @@
     return-void
 .end method
 
-.method private KG()Z
+.method private Ku()Z
     .locals 3
 
     iget-object v0, p0, Lrx/internal/a/ah$d;->child:Lrx/Subscriber;
@@ -298,9 +298,9 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/ah$d;->bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bLR:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
-    iget-boolean v2, p0, Lrx/internal/a/ah$d;->bLo:Z
+    iget-boolean v2, p0, Lrx/internal/a/ah$d;->bLJ:Z
 
     if-nez v2, :cond_1
 
@@ -313,7 +313,7 @@
     if-nez v0, :cond_1
 
     :try_start_0
-    invoke-direct {p0}, Lrx/internal/a/ah$d;->KD()V
+    invoke-direct {p0}, Lrx/internal/a/ah$d;->Kr()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -344,18 +344,18 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lrx/internal/a/ah$b;->bLs:Lrx/internal/util/i;
+    iget-object v0, p1, Lrx/internal/a/ah$b;->bLN:Lrx/internal/util/i;
 
     iget-object v0, p0, Lrx/internal/a/ah$d;->subscriptions:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0, p1}, Lrx/subscriptions/CompositeSubscription;->e(Lrx/Subscription;)V
 
-    iget-object v0, p0, Lrx/internal/a/ah$d;->bLx:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bLS:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/ah$d;->bLy:[Lrx/internal/a/ah$b;
+    iget-object v1, p0, Lrx/internal/a/ah$d;->bLT:[Lrx/internal/a/ah$b;
 
     array-length v2, v1
 
@@ -398,9 +398,9 @@
 
     if-ne v2, p1, :cond_3
 
-    sget-object p1, Lrx/internal/a/ah$d;->bLB:[Lrx/internal/a/ah$b;
+    sget-object p1, Lrx/internal/a/ah$d;->bLW:[Lrx/internal/a/ah$b;
 
-    iput-object p1, p0, Lrx/internal/a/ah$d;->bLy:[Lrx/internal/a/ah$b;
+    iput-object p1, p0, Lrx/internal/a/ah$d;->bLT:[Lrx/internal/a/ah$b;
 
     monitor-exit v0
 
@@ -421,7 +421,7 @@
 
     invoke-static {v1, v4, v5, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v5, p0, Lrx/internal/a/ah$d;->bLy:[Lrx/internal/a/ah$b;
+    iput-object v5, p0, Lrx/internal/a/ah$d;->bLT:[Lrx/internal/a/ah$b;
 
     monitor-exit v0
 
@@ -453,17 +453,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ah$b;->bLs:Lrx/internal/util/i;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->bLN:Lrx/internal/util/i;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lrx/internal/util/i;->Le()Lrx/internal/util/i;
+    invoke-static {}, Lrx/internal/util/i;->KS()Lrx/internal/util/i;
 
     move-result-object v0
 
     invoke-virtual {p0, v0}, Lrx/internal/a/ah$b;->add(Lrx/Subscription;)V
 
-    iput-object v0, p0, Lrx/internal/a/ah$b;->bLs:Lrx/internal/util/i;
+    iput-object v0, p0, Lrx/internal/a/ah$b;->bLN:Lrx/internal/util/i;
 
     :cond_0
     :try_start_0
@@ -516,7 +516,7 @@
 
     if-nez v0, :cond_4
 
-    iget v0, p0, Lrx/internal/a/ah$d;->bLp:I
+    iget v0, p0, Lrx/internal/a/ah$d;->bLK:I
 
     const v1, 0x7fffffff
 
@@ -547,7 +547,7 @@
     :goto_0
     if-eqz v1, :cond_3
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Lm()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->La()Z
 
     move-result v1
 
@@ -606,7 +606,7 @@
 
 
 # virtual methods
-.method final KB()Ljava/util/Queue;
+.method final Kp()Ljava/util/Queue;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -617,14 +617,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ah$d;->bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bLR:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/ah$d;->bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bLR:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     if-nez v0, :cond_0
 
@@ -632,7 +632,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/a/ah$d;->bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object v0, p0, Lrx/internal/a/ah$d;->bLR:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     :cond_0
     monitor-exit p0
@@ -653,7 +653,7 @@
     return-object v0
 .end method
 
-.method final KE()V
+.method final Ks()V
     .locals 2
 
     monitor-enter p0
@@ -678,7 +678,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->KF()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Kt()V
 
     return-void
 
@@ -693,7 +693,7 @@
     throw v0
 .end method
 
-.method KF()V
+.method Kt()V
     .locals 22
 
     move-object/from16 v1, p0
@@ -702,7 +702,7 @@
     iget-object v4, v1, Lrx/internal/a/ah$d;->child:Lrx/Subscriber;
 
     :goto_0
-    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->KG()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Ku()Z
 
     move-result v0
 
@@ -713,7 +713,7 @@
     :cond_0
     iget-object v5, v1, Lrx/internal/a/ah$d;->queue:Ljava/util/Queue;
 
-    iget-object v0, v1, Lrx/internal/a/ah$d;->bLv:Lrx/internal/a/ah$c;
+    iget-object v0, v1, Lrx/internal/a/ah$d;->bLQ:Lrx/internal/a/ah$c;
 
     invoke-virtual {v0}, Lrx/internal/a/ah$c;->get()J
 
@@ -757,7 +757,7 @@
 
     move-result-object v17
 
-    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->KG()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Ku()Z
 
     move-result v0
 
@@ -787,7 +787,7 @@
     move-object/from16 v18, v0
 
     :try_start_2
-    iget-boolean v0, v1, Lrx/internal/a/ah$d;->bLo:Z
+    iget-boolean v0, v1, Lrx/internal/a/ah$d;->bLJ:Z
 
     if-nez v0, :cond_3
 
@@ -817,7 +817,7 @@
     move-object/from16 v8, v18
 
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lrx/internal/a/ah$d;->KB()Ljava/util/Queue;
+    invoke-virtual/range {p0 .. p0}, Lrx/internal/a/ah$d;->Kp()Ljava/util/Queue;
 
     move-result-object v0
 
@@ -849,7 +849,7 @@
     goto :goto_5
 
     :cond_6
-    iget-object v6, v1, Lrx/internal/a/ah$d;->bLv:Lrx/internal/a/ah$c;
+    iget-object v6, v1, Lrx/internal/a/ah$d;->bLQ:Lrx/internal/a/ah$c;
 
     neg-int v2, v2
 
@@ -885,7 +885,7 @@
 
     iget-object v2, v1, Lrx/internal/a/ah$d;->queue:Ljava/util/Queue;
 
-    iget-object v5, v1, Lrx/internal/a/ah$d;->bLy:[Lrx/internal/a/ah$b;
+    iget-object v5, v1, Lrx/internal/a/ah$d;->bLT:[Lrx/internal/a/ah$b;
 
     array-length v8, v5
 
@@ -902,7 +902,7 @@
     :cond_b
     if-nez v8, :cond_e
 
-    iget-object v0, v1, Lrx/internal/a/ah$d;->bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, v1, Lrx/internal/a/ah$d;->bLR:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     if-eqz v0, :cond_d
 
@@ -915,7 +915,7 @@
     goto :goto_7
 
     :cond_c
-    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->KD()V
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Kr()V
 
     return-void
 
@@ -928,7 +928,7 @@
     :cond_e
     if-lez v8, :cond_21
 
-    iget-wide v11, v1, Lrx/internal/a/ah$d;->bLA:J
+    iget-wide v11, v1, Lrx/internal/a/ah$d;->bLV:J
 
     iget v0, v1, Lrx/internal/a/ah$d;->lastIndex:I
 
@@ -993,7 +993,7 @@
 
     iget-wide v3, v0, Lrx/internal/a/ah$b;->id:J
 
-    iput-wide v3, v1, Lrx/internal/a/ah$d;->bLA:J
+    iput-wide v3, v1, Lrx/internal/a/ah$d;->bLV:J
 
     move v0, v2
 
@@ -1007,7 +1007,7 @@
     :goto_b
     if-ge v0, v8, :cond_1f
 
-    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->KG()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Ku()Z
 
     move-result v4
 
@@ -1032,7 +1032,7 @@
 
     if-lez v21, :cond_16
 
-    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->KG()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Ku()Z
 
     move-result v21
 
@@ -1041,7 +1041,7 @@
     return-void
 
     :cond_15
-    iget-object v9, v4, Lrx/internal/a/ah$b;->bLs:Lrx/internal/util/i;
+    iget-object v9, v4, Lrx/internal/a/ah$b;->bLN:Lrx/internal/util/i;
 
     if-eqz v9, :cond_16
 
@@ -1115,7 +1115,7 @@
     if-nez v10, :cond_17
 
     :try_start_9
-    iget-object v9, v1, Lrx/internal/a/ah$d;->bLv:Lrx/internal/a/ah$c;
+    iget-object v9, v1, Lrx/internal/a/ah$d;->bLQ:Lrx/internal/a/ah$c;
 
     neg-int v11, v6
 
@@ -1159,7 +1159,7 @@
     :goto_f
     iget-boolean v6, v4, Lrx/internal/a/ah$b;->done:Z
 
-    iget-object v7, v4, Lrx/internal/a/ah$b;->bLs:Lrx/internal/util/i;
+    iget-object v7, v4, Lrx/internal/a/ah$b;->bLN:Lrx/internal/util/i;
 
     if-eqz v6, :cond_1d
 
@@ -1174,7 +1174,7 @@
     :cond_1b
     invoke-direct {v1, v4}, Lrx/internal/a/ah$d;->a(Lrx/internal/a/ah$b;)V
 
-    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->KG()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Ku()Z
 
     move-result v3
 
@@ -1221,7 +1221,7 @@
 
     iget-wide v4, v0, Lrx/internal/a/ah$b;->id:J
 
-    iput-wide v4, v1, Lrx/internal/a/ah$d;->bLA:J
+    iput-wide v4, v1, Lrx/internal/a/ah$d;->bLV:J
 
     move/from16 v0, v16
 
@@ -1365,7 +1365,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ah$d;->done:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->KE()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Ks()V
 
     return-void
 .end method
@@ -1373,7 +1373,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->KB()Ljava/util/Queue;
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Kp()Ljava/util/Queue;
 
     move-result-object v0
 
@@ -1383,7 +1383,7 @@
 
     iput-boolean p1, p0, Lrx/internal/a/ah$d;->done:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->KE()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Ks()V
 
     return-void
 .end method
@@ -1395,7 +1395,7 @@
 
     if-eqz p1, :cond_d
 
-    invoke-static {}, Lrx/Observable;->JZ()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->JM()Lrx/Observable;
 
     move-result-object v0
 
@@ -1405,15 +1405,15 @@
 
     if-ne p1, v0, :cond_1
 
-    iget p1, p0, Lrx/internal/a/ah$d;->bLD:I
+    iget p1, p0, Lrx/internal/a/ah$d;->bLY:I
 
     add-int/2addr p1, v1
 
-    iget v0, p0, Lrx/internal/a/ah$d;->bLC:I
+    iget v0, p0, Lrx/internal/a/ah$d;->bLX:I
 
     if-ne p1, v0, :cond_0
 
-    iput v2, p0, Lrx/internal/a/ah$d;->bLD:I
+    iput v2, p0, Lrx/internal/a/ah$d;->bLY:I
 
     int-to-long v0, p1
 
@@ -1422,7 +1422,7 @@
     return-void
 
     :cond_0
-    iput p1, p0, Lrx/internal/a/ah$d;->bLD:I
+    iput p1, p0, Lrx/internal/a/ah$d;->bLY:I
 
     return-void
 
@@ -1433,9 +1433,9 @@
 
     check-cast p1, Lrx/internal/util/k;
 
-    iget-object p1, p1, Lrx/internal/util/k;->bPx:Ljava/lang/Object;
+    iget-object p1, p1, Lrx/internal/util/k;->bPS:Ljava/lang/Object;
 
-    iget-object v0, p0, Lrx/internal/a/ah$d;->bLv:Lrx/internal/a/ah$c;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bLQ:Lrx/internal/a/ah$c;
 
     invoke-virtual {v0}, Lrx/internal/a/ah$c;->get()J
 
@@ -1450,7 +1450,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/ah$d;->bLv:Lrx/internal/a/ah$c;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bLQ:Lrx/internal/a/ah$c;
 
     invoke-virtual {v0}, Lrx/internal/a/ah$c;->get()J
 
@@ -1510,7 +1510,7 @@
     :cond_4
     invoke-direct {p0, p1}, Lrx/internal/a/ah$d;->bQ(Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->KF()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Kt()V
 
     return-void
 
@@ -1529,7 +1529,7 @@
     move-exception p1
 
     :try_start_2
-    iget-boolean v0, p0, Lrx/internal/a/ah$d;->bLo:Z
+    iget-boolean v0, p0, Lrx/internal/a/ah$d;->bLJ:Z
 
     if-nez v0, :cond_6
 
@@ -1553,7 +1553,7 @@
 
     :cond_6
     :try_start_4
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->KB()Ljava/util/Queue;
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Kp()Ljava/util/Queue;
 
     move-result-object v0
 
@@ -1566,22 +1566,22 @@
 
     if-eqz p1, :cond_7
 
-    iget-object p1, p0, Lrx/internal/a/ah$d;->bLv:Lrx/internal/a/ah$c;
+    iget-object p1, p0, Lrx/internal/a/ah$d;->bLQ:Lrx/internal/a/ah$c;
 
     const-wide/16 v3, -0x1
 
     invoke-virtual {p1, v3, v4}, Lrx/internal/a/ah$c;->addAndGet(J)J
 
     :cond_7
-    iget p1, p0, Lrx/internal/a/ah$d;->bLD:I
+    iget p1, p0, Lrx/internal/a/ah$d;->bLY:I
 
     add-int/2addr p1, v1
 
-    iget v0, p0, Lrx/internal/a/ah$d;->bLC:I
+    iget v0, p0, Lrx/internal/a/ah$d;->bLX:I
 
     if-ne p1, v0, :cond_8
 
-    iput v2, p0, Lrx/internal/a/ah$d;->bLD:I
+    iput v2, p0, Lrx/internal/a/ah$d;->bLY:I
 
     int-to-long v3, p1
 
@@ -1590,7 +1590,7 @@
     goto :goto_4
 
     :cond_8
-    iput p1, p0, Lrx/internal/a/ah$d;->bLD:I
+    iput p1, p0, Lrx/internal/a/ah$d;->bLY:I
 
     :goto_4
     monitor-enter p0
@@ -1615,7 +1615,7 @@
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_3
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->KF()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Kt()V
 
     return-void
 
@@ -1665,7 +1665,7 @@
     :cond_b
     invoke-direct {p0, p1}, Lrx/internal/a/ah$d;->bQ(Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->KE()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Ks()V
 
     :goto_7
     return-void
@@ -1673,28 +1673,28 @@
     :cond_c
     new-instance v0, Lrx/internal/a/ah$b;
 
-    iget-wide v3, p0, Lrx/internal/a/ah$d;->bLz:J
+    iget-wide v3, p0, Lrx/internal/a/ah$d;->bLU:J
 
     const-wide/16 v5, 0x1
 
     add-long/2addr v5, v3
 
-    iput-wide v5, p0, Lrx/internal/a/ah$d;->bLz:J
+    iput-wide v5, p0, Lrx/internal/a/ah$d;->bLU:J
 
     invoke-direct {v0, p0, v3, v4}, Lrx/internal/a/ah$b;-><init>(Lrx/internal/a/ah$d;J)V
 
-    invoke-direct {p0}, Lrx/internal/a/ah$d;->KC()Lrx/subscriptions/CompositeSubscription;
+    invoke-direct {p0}, Lrx/internal/a/ah$d;->Kq()Lrx/subscriptions/CompositeSubscription;
 
     move-result-object v1
 
     invoke-virtual {v1, v0}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
-    iget-object v1, p0, Lrx/internal/a/ah$d;->bLx:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/ah$d;->bLS:Ljava/lang/Object;
 
     monitor-enter v1
 
     :try_start_9
-    iget-object v3, p0, Lrx/internal/a/ah$d;->bLy:[Lrx/internal/a/ah$b;
+    iget-object v3, p0, Lrx/internal/a/ah$d;->bLT:[Lrx/internal/a/ah$b;
 
     array-length v4, v3
 
@@ -1706,7 +1706,7 @@
 
     aput-object v0, v5, v4
 
-    iput-object v5, p0, Lrx/internal/a/ah$d;->bLy:[Lrx/internal/a/ah$b;
+    iput-object v5, p0, Lrx/internal/a/ah$d;->bLT:[Lrx/internal/a/ah$b;
 
     monitor-exit v1
     :try_end_9
@@ -1714,7 +1714,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->KE()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Ks()V
 
     goto :goto_8
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ah.smali b/com.discord/smali_classes2/rx/internal/a/ah.smali
index 707350c2f7..2b20c43183 100644
--- a/com.discord/smali_classes2/rx/internal/a/ah.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ah.smali
@@ -31,9 +31,9 @@
 
 
 # instance fields
-.field final bLo:Z
+.field final bLJ:Z
 
-.field final bLp:I
+.field final bLK:I
 
 
 # direct methods
@@ -44,16 +44,16 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lrx/internal/a/ah;->bLo:Z
+    iput-boolean p1, p0, Lrx/internal/a/ah;->bLJ:Z
 
     const p1, 0x7fffffff
 
-    iput p1, p0, Lrx/internal/a/ah;->bLp:I
+    iput p1, p0, Lrx/internal/a/ah;->bLK:I
 
     return-void
 .end method
 
-.method public static KA()Lrx/internal/a/ah;
+.method public static Ko()Lrx/internal/a/ah;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -65,7 +65,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/ah$a;->bLq:Lrx/internal/a/ah;
+    sget-object v0, Lrx/internal/a/ah$a;->bLL:Lrx/internal/a/ah;
 
     return-object v0
 .end method
@@ -79,9 +79,9 @@
 
     new-instance v0, Lrx/internal/a/ah$d;
 
-    iget-boolean v1, p0, Lrx/internal/a/ah;->bLo:Z
+    iget-boolean v1, p0, Lrx/internal/a/ah;->bLJ:Z
 
-    iget v2, p0, Lrx/internal/a/ah;->bLp:I
+    iget v2, p0, Lrx/internal/a/ah;->bLK:I
 
     invoke-direct {v0, p1, v1, v2}, Lrx/internal/a/ah$d;-><init>(Lrx/Subscriber;ZI)V
 
@@ -89,7 +89,7 @@
 
     invoke-direct {v1, v0}, Lrx/internal/a/ah$c;-><init>(Lrx/internal/a/ah$d;)V
 
-    iput-object v1, v0, Lrx/internal/a/ah$d;->bLv:Lrx/internal/a/ah$c;
+    iput-object v1, v0, Lrx/internal/a/ah$d;->bLQ:Lrx/internal/a/ah$c;
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ai$a$1.smali b/com.discord/smali_classes2/rx/internal/a/ai$a$1.smali
index 415a2bf26c..4a06176174 100644
--- a/com.discord/smali_classes2/rx/internal/a/ai$a$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ai$a$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bLH:Lrx/internal/a/ai$a;
+.field final synthetic bMc:Lrx/internal/a/ai$a;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/ai$a;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ai$a$1;->bLH:Lrx/internal/a/ai$a;
+    iput-object p1, p0, Lrx/internal/a/ai$a$1;->bMc:Lrx/internal/a/ai$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,15 +43,15 @@
 
     if-lez v2, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ai$a$1;->bLH:Lrx/internal/a/ai$a;
+    iget-object v0, p0, Lrx/internal/a/ai$a$1;->bMc:Lrx/internal/a/ai$a;
 
     iget-object v0, v0, Lrx/internal/a/ai$a;->requested:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-static {v0, p1, p2}, Lrx/internal/a/a;->a(Ljava/util/concurrent/atomic/AtomicLong;J)J
 
-    iget-object p1, p0, Lrx/internal/a/ai$a$1;->bLH:Lrx/internal/a/ai$a;
+    iget-object p1, p0, Lrx/internal/a/ai$a$1;->bMc:Lrx/internal/a/ai$a;
 
-    invoke-virtual {p1}, Lrx/internal/a/ai$a;->KH()V
+    invoke-virtual {p1}, Lrx/internal/a/ai$a;->Kv()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/rx/internal/a/ai$a.smali b/com.discord/smali_classes2/rx/internal/a/ai$a.smali
index b2fd21e8c8..0c8a4d02c3 100644
--- a/com.discord/smali_classes2/rx/internal/a/ai$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ai$a.smali
@@ -29,13 +29,13 @@
 
 
 # instance fields
-.field final bLE:Lrx/Scheduler$Worker;
+.field final bLZ:Lrx/Scheduler$Worker;
 
-.field final bLF:Ljava/util/concurrent/atomic/AtomicLong;
+.field final bMa:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field bLG:J
+.field bMb:J
 
-.field volatile bze:Z
+.field volatile bzy:Z
 
 .field final child:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -89,15 +89,15 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/a/ai$a;->bLF:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object v0, p0, Lrx/internal/a/ai$a;->bMa:Ljava/util/concurrent/atomic/AtomicLong;
 
     iput-object p2, p0, Lrx/internal/a/ai$a;->child:Lrx/Subscriber;
 
-    invoke-virtual {p1}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {p1}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/a/ai$a;->bLE:Lrx/Scheduler$Worker;
+    iput-object p1, p0, Lrx/internal/a/ai$a;->bLZ:Lrx/Scheduler$Worker;
 
     iput-boolean p3, p0, Lrx/internal/a/ai$a;->delayError:Z
 
@@ -115,7 +115,7 @@
 
     iput p1, p0, Lrx/internal/a/ai$a;->limit:I
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Lm()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->La()Z
 
     move-result p1
 
@@ -193,7 +193,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :goto_0
-    iget-object p1, p0, Lrx/internal/a/ai$a;->bLE:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/ai$a;->bLZ:Lrx/Scheduler$Worker;
 
     invoke-virtual {p1}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -202,7 +202,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object p2, p0, Lrx/internal/a/ai$a;->bLE:Lrx/Scheduler$Worker;
+    iget-object p2, p0, Lrx/internal/a/ai$a;->bLZ:Lrx/Scheduler$Worker;
 
     invoke-virtual {p2}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -220,7 +220,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    iget-object p1, p0, Lrx/internal/a/ai$a;->bLE:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/ai$a;->bLZ:Lrx/Scheduler$Worker;
 
     invoke-virtual {p1}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -229,7 +229,7 @@
     :catchall_1
     move-exception p1
 
-    iget-object p2, p0, Lrx/internal/a/ai$a;->bLE:Lrx/Scheduler$Worker;
+    iget-object p2, p0, Lrx/internal/a/ai$a;->bLZ:Lrx/Scheduler$Worker;
 
     invoke-virtual {p2}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -243,7 +243,7 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_2
 
-    iget-object p1, p0, Lrx/internal/a/ai$a;->bLE:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/ai$a;->bLZ:Lrx/Scheduler$Worker;
 
     invoke-virtual {p1}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -252,7 +252,7 @@
     :catchall_2
     move-exception p1
 
-    iget-object p2, p0, Lrx/internal/a/ai$a;->bLE:Lrx/Scheduler$Worker;
+    iget-object p2, p0, Lrx/internal/a/ai$a;->bLZ:Lrx/Scheduler$Worker;
 
     invoke-virtual {p2}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -267,10 +267,10 @@
 
 
 # virtual methods
-.method protected final KH()V
+.method protected final Kv()V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/a/ai$a;->bLF:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/ai$a;->bMa:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
 
@@ -282,7 +282,7 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ai$a;->bLE:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/ai$a;->bLZ:Lrx/Scheduler$Worker;
 
     invoke-virtual {v0, p0}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;)Lrx/Subscription;
 
@@ -293,7 +293,7 @@
 .method public final call()V
     .locals 15
 
-    iget-wide v0, p0, Lrx/internal/a/ai$a;->bLG:J
+    iget-wide v0, p0, Lrx/internal/a/ai$a;->bMb:J
 
     iget-object v2, p0, Lrx/internal/a/ai$a;->queue:Ljava/util/Queue;
 
@@ -320,7 +320,7 @@
 
     if-eqz v12, :cond_4
 
-    iget-boolean v12, p0, Lrx/internal/a/ai$a;->bze:Z
+    iget-boolean v12, p0, Lrx/internal/a/ai$a;->bzy:Z
 
     invoke-interface {v2}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
@@ -380,7 +380,7 @@
 
     if-nez v12, :cond_5
 
-    iget-boolean v8, p0, Lrx/internal/a/ai$a;->bze:Z
+    iget-boolean v8, p0, Lrx/internal/a/ai$a;->bzy:Z
 
     invoke-interface {v2}, Ljava/util/Queue;->isEmpty()Z
 
@@ -395,9 +395,9 @@
     return-void
 
     :cond_5
-    iput-wide v6, p0, Lrx/internal/a/ai$a;->bLG:J
+    iput-wide v6, p0, Lrx/internal/a/ai$a;->bMb:J
 
-    iget-object v8, p0, Lrx/internal/a/ai$a;->bLF:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v8, p0, Lrx/internal/a/ai$a;->bMa:Ljava/util/concurrent/atomic/AtomicLong;
 
     neg-long v0, v0
 
@@ -421,7 +421,7 @@
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bze:Z
+    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bzy:Z
 
     if-eqz v0, :cond_0
 
@@ -430,9 +430,9 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/ai$a;->bze:Z
+    iput-boolean v0, p0, Lrx/internal/a/ai$a;->bzy:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ai$a;->KH()V
+    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Kv()V
 
     :cond_1
     :goto_0
@@ -448,7 +448,7 @@
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bze:Z
+    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bzy:Z
 
     if-eqz v0, :cond_0
 
@@ -459,9 +459,9 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/ai$a;->bze:Z
+    iput-boolean p1, p0, Lrx/internal/a/ai$a;->bzy:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ai$a;->KH()V
+    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Kv()V
 
     return-void
 
@@ -486,7 +486,7 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bze:Z
+    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bzy:Z
 
     if-eqz v0, :cond_0
 
@@ -514,7 +514,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lrx/internal/a/ai$a;->KH()V
+    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Kv()V
 
     :cond_2
     :goto_0
diff --git a/com.discord/smali_classes2/rx/internal/a/ai.smali b/com.discord/smali_classes2/rx/internal/a/ai.smali
index 204ac4e8ed..dd1593fac8 100644
--- a/com.discord/smali_classes2/rx/internal/a/ai.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ai.smali
@@ -97,7 +97,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    iget-object v0, v1, Lrx/internal/a/ai$a;->bLE:Lrx/Scheduler$Worker;
+    iget-object v0, v1, Lrx/internal/a/ai$a;->bLZ:Lrx/Scheduler$Worker;
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/aj$a.smali b/com.discord/smali_classes2/rx/internal/a/aj$a.smali
index 9597f96f5c..7907d5ec92 100644
--- a/com.discord/smali_classes2/rx/internal/a/aj$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aj$a.smali
@@ -29,17 +29,17 @@
 
 
 # instance fields
-.field private final bLJ:Lrx/functions/Action0;
+.field private final bMe:Lrx/functions/Action0;
 
-.field private final bLK:Lrx/a$d;
+.field private final bMf:Lrx/a$d;
 
-.field private final bLL:Ljava/util/concurrent/atomic/AtomicLong;
+.field private final bMg:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private final bLM:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final bMh:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final bLN:Lrx/internal/util/c;
+.field final bMi:Lrx/internal/util/c;
 
-.field private final bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field private final bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -80,7 +80,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/a/aj$a;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object v0, p0, Lrx/internal/a/aj$a;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
 
@@ -88,7 +88,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
-    iput-object v0, p0, Lrx/internal/a/aj$a;->bLM:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lrx/internal/a/aj$a;->bMh:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     iput-object p1, p0, Lrx/internal/a/aj$a;->child:Lrx/Subscriber;
 
@@ -108,25 +108,25 @@
     const/4 p1, 0x0
 
     :goto_0
-    iput-object p1, p0, Lrx/internal/a/aj$a;->bLL:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lrx/internal/a/aj$a;->bMg:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p3, p0, Lrx/internal/a/aj$a;->bLJ:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/a/aj$a;->bMe:Lrx/functions/Action0;
 
     new-instance p1, Lrx/internal/util/c;
 
     invoke-direct {p1, p0}, Lrx/internal/util/c;-><init>(Lrx/internal/util/c$a;)V
 
-    iput-object p1, p0, Lrx/internal/a/aj$a;->bLN:Lrx/internal/util/c;
+    iput-object p1, p0, Lrx/internal/a/aj$a;->bMi:Lrx/internal/util/c;
 
-    iput-object p4, p0, Lrx/internal/a/aj$a;->bLK:Lrx/a$d;
+    iput-object p4, p0, Lrx/internal/a/aj$a;->bMf:Lrx/a$d;
 
     return-void
 .end method
 
-.method private KJ()Z
+.method private Kx()Z
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bLL:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bMg:Ljava/util/concurrent/atomic/AtomicLong;
 
     const/4 v1, 0x1
 
@@ -135,7 +135,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bLL:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bMg:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -150,9 +150,9 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v4, p0, Lrx/internal/a/aj$a;->bLK:Lrx/a$d;
+    iget-object v4, p0, Lrx/internal/a/aj$a;->bMf:Lrx/a$d;
 
-    invoke-interface {v4}, Lrx/a$d;->JS()Z
+    invoke-interface {v4}, Lrx/a$d;->JF()Z
 
     move-result v4
 
@@ -173,7 +173,7 @@
     :catch_0
     move-exception v4
 
-    iget-object v5, p0, Lrx/internal/a/aj$a;->bLM:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v5, p0, Lrx/internal/a/aj$a;->bMh:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v5, v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
 
@@ -191,7 +191,7 @@
     const/4 v4, 0x0
 
     :goto_0
-    iget-object v5, p0, Lrx/internal/a/aj$a;->bLJ:Lrx/functions/Action0;
+    iget-object v5, p0, Lrx/internal/a/aj$a;->bMe:Lrx/functions/Action0;
 
     if-eqz v5, :cond_2
 
@@ -207,7 +207,7 @@
 
     invoke-static {v1}, Lrx/a/b;->I(Ljava/lang/Throwable;)V
 
-    iget-object v2, p0, Lrx/internal/a/aj$a;->bLN:Lrx/internal/util/c;
+    iget-object v2, p0, Lrx/internal/a/aj$a;->bMi:Lrx/internal/util/c;
 
     invoke-virtual {v2, v1}, Lrx/internal/util/c;->R(Ljava/lang/Throwable;)V
 
@@ -220,7 +220,7 @@
     return v0
 
     :cond_3
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bLL:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bMg:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-wide/16 v4, 0x1
 
@@ -271,7 +271,7 @@
 .method public final onCompleted()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bLM:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bMh:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -279,7 +279,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bLN:Lrx/internal/util/c;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bMi:Lrx/internal/util/c;
 
     const/4 v1, 0x1
 
@@ -294,7 +294,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bLM:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bMh:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -302,7 +302,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bLN:Lrx/internal/util/c;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bMi:Lrx/internal/util/c;
 
     invoke-virtual {v0, p1}, Lrx/internal/util/c;->R(Ljava/lang/Throwable;)V
 
@@ -318,7 +318,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lrx/internal/a/aj$a;->KJ()Z
+    invoke-direct {p0}, Lrx/internal/a/aj$a;->Kx()Z
 
     move-result v0
 
@@ -327,7 +327,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-static {p1}, Lrx/internal/a/g;->bJ(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -335,7 +335,7 @@
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->offer(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lrx/internal/a/aj$a;->bLN:Lrx/internal/util/c;
+    iget-object p1, p0, Lrx/internal/a/aj$a;->bMi:Lrx/internal/util/c;
 
     invoke-virtual {p1}, Lrx/internal/util/c;->drain()V
 
@@ -355,7 +355,7 @@
 .method public final peek()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->peek()Ljava/lang/Object;
 
@@ -367,13 +367,13 @@
 .method public final poll()Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v1, p0, Lrx/internal/a/aj$a;->bLL:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, p0, Lrx/internal/a/aj$a;->bMg:Ljava/util/concurrent/atomic/AtomicLong;
 
     if-eqz v1, :cond_0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/aj$b.smali b/com.discord/smali_classes2/rx/internal/a/aj$b.smali
index 1f72a568e5..c08ef0a548 100644
--- a/com.discord/smali_classes2/rx/internal/a/aj$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aj$b.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final bLO:Lrx/internal/a/aj;
+.field static final bMj:Lrx/internal/a/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/aj<",
@@ -33,7 +33,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/aj;-><init>()V
 
-    sput-object v0, Lrx/internal/a/aj$b;->bLO:Lrx/internal/a/aj;
+    sput-object v0, Lrx/internal/a/aj$b;->bMj:Lrx/internal/a/aj;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/aj.smali b/com.discord/smali_classes2/rx/internal/a/aj.smali
index 5400cbeb2d..0ca8ca2cf7 100644
--- a/com.discord/smali_classes2/rx/internal/a/aj.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aj.smali
@@ -27,11 +27,11 @@
 
 
 # instance fields
-.field private final bLI:Ljava/lang/Long;
+.field private final bMd:Ljava/lang/Long;
 
-.field private final bLJ:Lrx/functions/Action0;
+.field private final bMe:Lrx/functions/Action0;
 
-.field private final bLK:Lrx/a$d;
+.field private final bMf:Lrx/a$d;
 
 
 # direct methods
@@ -42,18 +42,18 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lrx/internal/a/aj;->bLI:Ljava/lang/Long;
+    iput-object v0, p0, Lrx/internal/a/aj;->bMd:Ljava/lang/Long;
 
-    iput-object v0, p0, Lrx/internal/a/aj;->bLJ:Lrx/functions/Action0;
+    iput-object v0, p0, Lrx/internal/a/aj;->bMe:Lrx/functions/Action0;
 
-    sget-object v0, Lrx/a;->bIn:Lrx/a$d;
+    sget-object v0, Lrx/a;->bIH:Lrx/a$d;
 
-    iput-object v0, p0, Lrx/internal/a/aj;->bLK:Lrx/a$d;
+    iput-object v0, p0, Lrx/internal/a/aj;->bMf:Lrx/a$d;
 
     return-void
 .end method
 
-.method public static KI()Lrx/internal/a/aj;
+.method public static Kw()Lrx/internal/a/aj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -65,7 +65,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/aj$b;->bLO:Lrx/internal/a/aj;
+    sget-object v0, Lrx/internal/a/aj$b;->bMj:Lrx/internal/a/aj;
 
     return-object v0
 .end method
@@ -79,17 +79,17 @@
 
     new-instance v0, Lrx/internal/a/aj$a;
 
-    iget-object v1, p0, Lrx/internal/a/aj;->bLI:Ljava/lang/Long;
+    iget-object v1, p0, Lrx/internal/a/aj;->bMd:Ljava/lang/Long;
 
-    iget-object v2, p0, Lrx/internal/a/aj;->bLJ:Lrx/functions/Action0;
+    iget-object v2, p0, Lrx/internal/a/aj;->bMe:Lrx/functions/Action0;
 
-    iget-object v3, p0, Lrx/internal/a/aj;->bLK:Lrx/a$d;
+    iget-object v3, p0, Lrx/internal/a/aj;->bMf:Lrx/a$d;
 
     invoke-direct {v0, p1, v1, v2, v3}, Lrx/internal/a/aj$a;-><init>(Lrx/Subscriber;Ljava/lang/Long;Lrx/functions/Action0;Lrx/a$d;)V
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object v1, v0, Lrx/internal/a/aj$a;->bLN:Lrx/internal/util/c;
+    iget-object v1, v0, Lrx/internal/a/aj$a;->bMi:Lrx/internal/util/c;
 
     invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ak$a.smali b/com.discord/smali_classes2/rx/internal/a/ak$a.smali
index 19e7a9b202..5672c2716c 100644
--- a/com.discord/smali_classes2/rx/internal/a/ak$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ak$a.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final bLP:Lrx/internal/a/ak;
+.field static final bMk:Lrx/internal/a/ak;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ak<",
@@ -34,7 +34,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/ak;-><init>()V
 
-    sput-object v0, Lrx/internal/a/ak$a;->bLP:Lrx/internal/a/ak;
+    sput-object v0, Lrx/internal/a/ak$a;->bMk:Lrx/internal/a/ak;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/ak$b.smali b/com.discord/smali_classes2/rx/internal/a/ak$b.smali
index 0f27331ca5..6e5496eada 100644
--- a/com.discord/smali_classes2/rx/internal/a/ak$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ak$b.smali
@@ -33,7 +33,7 @@
 
 
 # static fields
-.field static final bLQ:Ljava/lang/Object;
+.field static final bMl:Ljava/lang/Object;
 
 .field private static final serialVersionUID:J = -0x12ef4cd3e08498a2L
 
@@ -84,7 +84,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/a/ak$b;->bLQ:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/ak$b;->bMl:Ljava/lang/Object;
 
     return-void
 .end method
@@ -105,7 +105,7 @@
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v0, Lrx/internal/a/ak$b;->bLQ:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/ak$b;->bMl:Ljava/lang/Object;
 
     invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
@@ -118,7 +118,7 @@
     return-void
 .end method
 
-.method private KE()V
+.method private Ks()V
     .locals 9
 
     monitor-enter p0
@@ -174,7 +174,7 @@
 
     if-lez v7, :cond_2
 
-    sget-object v2, Lrx/internal/a/ak$b;->bLQ:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/a/ak$b;->bMl:Ljava/lang/Object;
 
     if-eq v4, v2, :cond_2
 
@@ -184,16 +184,16 @@
 
     iget-object v2, p0, Lrx/internal/a/ak$b;->value:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v3, Lrx/internal/a/ak$b;->bLQ:Ljava/lang/Object;
+    sget-object v3, Lrx/internal/a/ak$b;->bMl:Ljava/lang/Object;
 
     invoke-virtual {v2, v4, v3}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lrx/internal/a/ak$b;->KL()J
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Kz()J
 
-    sget-object v4, Lrx/internal/a/ak$b;->bLQ:Ljava/lang/Object;
+    sget-object v4, Lrx/internal/a/ak$b;->bMl:Ljava/lang/Object;
 
     :cond_2
-    sget-object v2, Lrx/internal/a/ak$b;->bLQ:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/a/ak$b;->bMl:Ljava/lang/Object;
 
     if-ne v4, v2, :cond_4
 
@@ -327,7 +327,7 @@
     goto :goto_5
 .end method
 
-.method private KL()J
+.method private Kz()J
     .locals 5
 
     :cond_0
@@ -389,7 +389,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ak$b;->done:Z
 
-    invoke-direct {p0}, Lrx/internal/a/ak$b;->KE()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Ks()V
 
     return-void
 .end method
@@ -403,7 +403,7 @@
 
     iput-boolean p1, p0, Lrx/internal/a/ak$b;->done:Z
 
-    invoke-direct {p0}, Lrx/internal/a/ak$b;->KE()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Ks()V
 
     return-void
 .end method
@@ -420,7 +420,7 @@
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lrx/internal/a/ak$b;->KE()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Ks()V
 
     return-void
 .end method
@@ -481,10 +481,10 @@
 
     iget-object p1, p0, Lrx/internal/a/ak$b;->parent:Lrx/internal/a/ak$c;
 
-    invoke-virtual {p1}, Lrx/internal/a/ak$c;->Kt()V
+    invoke-virtual {p1}, Lrx/internal/a/ak$c;->Kh()V
 
     :cond_4
-    invoke-direct {p0}, Lrx/internal/a/ak$b;->KE()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Ks()V
 
     :cond_5
     return-void
diff --git a/com.discord/smali_classes2/rx/internal/a/ak$c.smali b/com.discord/smali_classes2/rx/internal/a/ak$c.smali
index ad3bbb55be..eb78826a74 100644
--- a/com.discord/smali_classes2/rx/internal/a/ak$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ak$c.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final bLR:Lrx/internal/a/ak$b;
+.field private final bMm:Lrx/internal/a/ak$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ak$b<",
@@ -48,14 +48,14 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ak$c;->bLR:Lrx/internal/a/ak$b;
+    iput-object p1, p0, Lrx/internal/a/ak$c;->bMm:Lrx/internal/a/ak$b;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final Kt()V
+.method final Kh()V
     .locals 2
 
     const-wide v0, 0x7fffffffffffffffL
@@ -68,7 +68,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ak$c;->bLR:Lrx/internal/a/ak$b;
+    iget-object v0, p0, Lrx/internal/a/ak$c;->bMm:Lrx/internal/a/ak$b;
 
     invoke-virtual {v0}, Lrx/internal/a/ak$b;->onCompleted()V
 
@@ -78,7 +78,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ak$c;->bLR:Lrx/internal/a/ak$b;
+    iget-object v0, p0, Lrx/internal/a/ak$c;->bMm:Lrx/internal/a/ak$b;
 
     invoke-virtual {v0, p1}, Lrx/internal/a/ak$b;->onError(Ljava/lang/Throwable;)V
 
@@ -93,7 +93,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ak$c;->bLR:Lrx/internal/a/ak$b;
+    iget-object v0, p0, Lrx/internal/a/ak$c;->bMm:Lrx/internal/a/ak$b;
 
     invoke-virtual {v0, p1}, Lrx/internal/a/ak$b;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ak.smali b/com.discord/smali_classes2/rx/internal/a/ak.smali
index 9845e2dcd3..ef6e537402 100644
--- a/com.discord/smali_classes2/rx/internal/a/ak.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ak.smali
@@ -36,7 +36,7 @@
     return-void
 .end method
 
-.method public static KK()Lrx/internal/a/ak;
+.method public static Ky()Lrx/internal/a/ak;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -48,7 +48,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/ak$a;->bLP:Lrx/internal/a/ak;
+    sget-object v0, Lrx/internal/a/ak$a;->bMk:Lrx/internal/a/ak;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/al$1.smali b/com.discord/smali_classes2/rx/internal/a/al$1.smali
index 277394c8c7..02b2256b29 100644
--- a/com.discord/smali_classes2/rx/internal/a/al$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/al$1.smali
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic bLT:Lrx/functions/b;
+.field final synthetic bMo:Lrx/functions/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/al$1;->bLT:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/al$1;->bMo:Lrx/functions/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,7 +49,7 @@
 
     check-cast p1, Ljava/lang/Throwable;
 
-    iget-object v0, p0, Lrx/internal/a/al$1;->bLT:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/al$1;->bMo:Lrx/functions/b;
 
     invoke-interface {v0, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/al$2$1.smali b/com.discord/smali_classes2/rx/internal/a/al$2$1.smali
index 137ea58eae..15c5cebfcf 100644
--- a/com.discord/smali_classes2/rx/internal/a/al$2$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/al$2$1.smali
@@ -22,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic bLW:Lrx/internal/a/al$2;
+.field final synthetic bMr:Lrx/internal/a/al$2;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/al$2;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/al$2$1;->bLW:Lrx/internal/a/al$2;
+    iput-object p1, p0, Lrx/internal/a/al$2$1;->bMr:Lrx/internal/a/al$2;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/al$2$1;->bLW:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->bMr:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->bKa:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/al$2;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -53,9 +53,9 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/al$2$1;->bLW:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->bMr:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->bKa:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/al$2;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -70,9 +70,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/al$2$1;->bLW:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->bMr:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->bKa:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/al$2;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -82,9 +82,9 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/al$2$1;->bLW:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->bMr:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->bLU:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/al$2;->bMp:Lrx/internal/b/a;
 
     invoke-virtual {v0, p1}, Lrx/internal/b/a;->setProducer(Lrx/Producer;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/al$2.smali b/com.discord/smali_classes2/rx/internal/a/al$2.smali
index 2d4b387c91..715a912711 100644
--- a/com.discord/smali_classes2/rx/internal/a/al$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/al$2.smali
@@ -22,11 +22,11 @@
 
 
 # instance fields
-.field final synthetic bKa:Lrx/Subscriber;
+.field final synthetic bKv:Lrx/Subscriber;
 
-.field final synthetic bLU:Lrx/internal/b/a;
+.field final synthetic bMp:Lrx/internal/b/a;
 
-.field final synthetic bLV:Lrx/internal/a/al;
+.field final synthetic bMq:Lrx/internal/a/al;
 
 .field private done:Z
 
@@ -39,11 +39,11 @@
 .method constructor <init>(Lrx/internal/a/al;Lrx/Subscriber;Lrx/internal/b/a;Lrx/subscriptions/SerialSubscription;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/al$2;->bLV:Lrx/internal/a/al;
+    iput-object p1, p0, Lrx/internal/a/al$2;->bMq:Lrx/internal/a/al;
 
-    iput-object p2, p0, Lrx/internal/a/al$2;->bKa:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/al$2;->bKv:Lrx/Subscriber;
 
-    iput-object p3, p0, Lrx/internal/a/al$2;->bLU:Lrx/internal/b/a;
+    iput-object p3, p0, Lrx/internal/a/al$2;->bMp:Lrx/internal/b/a;
 
     iput-object p4, p0, Lrx/internal/a/al$2;->val$serial:Lrx/subscriptions/SerialSubscription;
 
@@ -68,7 +68,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/al$2;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/al$2;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/al$2;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -112,14 +112,14 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v3, p0, Lrx/internal/a/al$2;->bLU:Lrx/internal/b/a;
+    iget-object v3, p0, Lrx/internal/a/al$2;->bMp:Lrx/internal/b/a;
 
     invoke-virtual {v3, v1, v2}, Lrx/internal/b/a;->bc(J)V
 
     :cond_1
-    iget-object v1, p0, Lrx/internal/a/al$2;->bLV:Lrx/internal/a/al;
+    iget-object v1, p0, Lrx/internal/a/al$2;->bMq:Lrx/internal/a/al;
 
-    iget-object v1, v1, Lrx/internal/a/al;->bLS:Lrx/functions/b;
+    iget-object v1, v1, Lrx/internal/a/al;->bMn:Lrx/functions/b;
 
     invoke-interface {v1, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -136,7 +136,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lrx/internal/a/al$2;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/al$2;->bKv:Lrx/Subscriber;
 
     invoke-static {p1, v0}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;)V
 
@@ -166,7 +166,7 @@
 
     iput-wide v0, p0, Lrx/internal/a/al$2;->produced:J
 
-    iget-object v0, p0, Lrx/internal/a/al$2;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/al$2;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -176,7 +176,7 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/al$2;->bLU:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/al$2;->bMp:Lrx/internal/b/a;
 
     invoke-virtual {v0, p1}, Lrx/internal/b/a;->setProducer(Lrx/Producer;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/al.smali b/com.discord/smali_classes2/rx/internal/a/al.smali
index 8b60a39920..47f2966366 100644
--- a/com.discord/smali_classes2/rx/internal/a/al.smali
+++ b/com.discord/smali_classes2/rx/internal/a/al.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field final bLS:Lrx/functions/b;
+.field final bMn:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -51,7 +51,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/al;->bLS:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/al;->bMn:Lrx/functions/b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/am$1.smali b/com.discord/smali_classes2/rx/internal/a/am$1.smali
index 6d83a12ee4..bb679e6514 100644
--- a/com.discord/smali_classes2/rx/internal/a/am$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/am$1.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bLY:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic bMt:Ljava/util/concurrent/atomic/AtomicReference;
 
 
 # direct methods
 .method constructor <init>(Ljava/util/concurrent/atomic/AtomicReference;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/am$1;->bLY:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/a/am$1;->bMt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,7 +48,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/am$1;->bLY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/am$1;->bMt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -67,13 +67,13 @@
     :cond_1
     new-instance v1, Lrx/internal/a/am$b;
 
-    iget-object v2, p0, Lrx/internal/a/am$1;->bLY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am$1;->bMt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {v1, v2}, Lrx/internal/a/am$b;-><init>(Ljava/util/concurrent/atomic/AtomicReference;)V
 
     invoke-virtual {v1}, Lrx/internal/a/am$b;->init()V
 
-    iget-object v2, p0, Lrx/internal/a/am$1;->bLY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am$1;->bMt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -89,7 +89,7 @@
     invoke-direct {v1, v0, p1}, Lrx/internal/a/am$a;-><init>(Lrx/internal/a/am$b;Lrx/Subscriber;)V
 
     :cond_3
-    iget-object v2, v0, Lrx/internal/a/am$b;->bMc:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, v0, Lrx/internal/a/am$b;->bMx:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -97,7 +97,7 @@
 
     check-cast v2, [Lrx/internal/a/am$a;
 
-    sget-object v3, Lrx/internal/a/am$b;->bMb:[Lrx/internal/a/am$a;
+    sget-object v3, Lrx/internal/a/am$b;->bMw:[Lrx/internal/a/am$a;
 
     const/4 v4, 0x0
 
@@ -116,7 +116,7 @@
 
     aput-object v1, v5, v3
 
-    iget-object v3, v0, Lrx/internal/a/am$b;->bMc:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v3, v0, Lrx/internal/a/am$b;->bMx:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v3, v2, v5}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/rx/internal/a/am$a.smali b/com.discord/smali_classes2/rx/internal/a/am$a.smali
index 7dea391b57..03f1a3293e 100644
--- a/com.discord/smali_classes2/rx/internal/a/am$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/am$a.smali
@@ -81,7 +81,7 @@
 
 
 # virtual methods
-.method public final KL()J
+.method public final Kz()J
     .locals 7
 
     :cond_0
@@ -253,7 +253,7 @@
 
     iget-object p1, p0, Lrx/internal/a/am$a;->parent:Lrx/internal/a/am$b;
 
-    invoke-virtual {p1}, Lrx/internal/a/am$b;->KM()V
+    invoke-virtual {p1}, Lrx/internal/a/am$b;->KA()V
 
     return-void
 .end method
@@ -282,7 +282,7 @@
     iget-object v0, p0, Lrx/internal/a/am$a;->parent:Lrx/internal/a/am$b;
 
     :cond_0
-    iget-object v1, v0, Lrx/internal/a/am$b;->bMc:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, v0, Lrx/internal/a/am$b;->bMx:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -290,11 +290,11 @@
 
     check-cast v1, [Lrx/internal/a/am$a;
 
-    sget-object v2, Lrx/internal/a/am$b;->bMa:[Lrx/internal/a/am$a;
+    sget-object v2, Lrx/internal/a/am$b;->bMv:[Lrx/internal/a/am$a;
 
     if-eq v1, v2, :cond_5
 
-    sget-object v2, Lrx/internal/a/am$b;->bMb:[Lrx/internal/a/am$a;
+    sget-object v2, Lrx/internal/a/am$b;->bMw:[Lrx/internal/a/am$a;
 
     if-ne v1, v2, :cond_1
 
@@ -337,7 +337,7 @@
 
     if-ne v3, v5, :cond_4
 
-    sget-object v2, Lrx/internal/a/am$b;->bMa:[Lrx/internal/a/am$a;
+    sget-object v2, Lrx/internal/a/am$b;->bMv:[Lrx/internal/a/am$a;
 
     goto :goto_2
 
@@ -359,7 +359,7 @@
     move-object v2, v6
 
     :goto_2
-    iget-object v3, v0, Lrx/internal/a/am$b;->bMc:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v3, v0, Lrx/internal/a/am$b;->bMx:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v3, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -371,7 +371,7 @@
     :goto_3
     iget-object v0, p0, Lrx/internal/a/am$a;->parent:Lrx/internal/a/am$b;
 
-    invoke-virtual {v0}, Lrx/internal/a/am$b;->KM()V
+    invoke-virtual {v0}, Lrx/internal/a/am$b;->KA()V
 
     :cond_6
     return-void
diff --git a/com.discord/smali_classes2/rx/internal/a/am$b$1.smali b/com.discord/smali_classes2/rx/internal/a/am$b$1.smali
index a7dbb751a7..e34a6bef41 100644
--- a/com.discord/smali_classes2/rx/internal/a/am$b$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/am$b$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bMe:Lrx/internal/a/am$b;
+.field final synthetic bMz:Lrx/internal/a/am$b;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/am$b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/am$b$1;->bMe:Lrx/internal/a/am$b;
+    iput-object p1, p0, Lrx/internal/a/am$b$1;->bMz:Lrx/internal/a/am$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,19 +37,19 @@
 .method public final call()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/a/am$b$1;->bMe:Lrx/internal/a/am$b;
+    iget-object v0, p0, Lrx/internal/a/am$b$1;->bMz:Lrx/internal/a/am$b;
 
-    iget-object v0, v0, Lrx/internal/a/am$b;->bMc:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/a/am$b;->bMx:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/a/am$b;->bMb:[Lrx/internal/a/am$a;
+    sget-object v1, Lrx/internal/a/am$b;->bMw:[Lrx/internal/a/am$a;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lrx/internal/a/am$b$1;->bMe:Lrx/internal/a/am$b;
+    iget-object v0, p0, Lrx/internal/a/am$b$1;->bMz:Lrx/internal/a/am$b;
 
-    iget-object v0, v0, Lrx/internal/a/am$b;->bLX:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/a/am$b;->bMs:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v1, p0, Lrx/internal/a/am$b$1;->bMe:Lrx/internal/a/am$b;
+    iget-object v1, p0, Lrx/internal/a/am$b$1;->bMz:Lrx/internal/a/am$b;
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/am$b.smali b/com.discord/smali_classes2/rx/internal/a/am$b.smali
index a908114967..3804aae088 100644
--- a/com.discord/smali_classes2/rx/internal/a/am$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/am$b.smali
@@ -29,13 +29,13 @@
 
 
 # static fields
-.field static final bMa:[Lrx/internal/a/am$a;
+.field static final bMv:[Lrx/internal/a/am$a;
 
-.field static final bMb:[Lrx/internal/a/am$a;
+.field static final bMw:[Lrx/internal/a/am$a;
 
 
 # instance fields
-.field final bLX:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bMs:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -45,9 +45,9 @@
     .end annotation
 .end field
 
-.field volatile bLZ:Ljava/lang/Object;
+.field volatile bMu:Ljava/lang/Object;
 
-.field final bMc:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bMx:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -58,7 +58,7 @@
     .end annotation
 .end field
 
-.field final bMd:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final bMy:Ljava/util/concurrent/atomic/AtomicBoolean;
 
 .field emitting:Z
 
@@ -83,11 +83,11 @@
 
     new-array v1, v0, [Lrx/internal/a/am$a;
 
-    sput-object v1, Lrx/internal/a/am$b;->bMa:[Lrx/internal/a/am$a;
+    sput-object v1, Lrx/internal/a/am$b;->bMv:[Lrx/internal/a/am$a;
 
     new-array v0, v0, [Lrx/internal/a/am$a;
 
-    sput-object v0, Lrx/internal/a/am$b;->bMb:[Lrx/internal/a/am$a;
+    sput-object v0, Lrx/internal/a/am$b;->bMw:[Lrx/internal/a/am$a;
 
     return-void
 .end method
@@ -105,7 +105,7 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Lm()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->La()Z
 
     move-result v0
 
@@ -131,19 +131,19 @@
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/a/am$b;->bMa:[Lrx/internal/a/am$a;
+    sget-object v1, Lrx/internal/a/am$b;->bMv:[Lrx/internal/a/am$a;
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lrx/internal/a/am$b;->bMc:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/a/am$b;->bMx:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p1, p0, Lrx/internal/a/am$b;->bLX:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/a/am$b;->bMs: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, Lrx/internal/a/am$b;->bMd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lrx/internal/a/am$b;->bMy:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-void
 .end method
@@ -167,14 +167,14 @@
 
     if-eqz p2, :cond_3
 
-    iget-object p1, p0, Lrx/internal/a/am$b;->bLX:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lrx/internal/a/am$b;->bMs: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, Lrx/internal/a/am$b;->bMc:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lrx/internal/a/am$b;->bMx:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object p2, Lrx/internal/a/am$b;->bMb:[Lrx/internal/a/am$a;
+    sget-object p2, Lrx/internal/a/am$b;->bMw:[Lrx/internal/a/am$a;
 
     invoke-virtual {p1, p2}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -216,14 +216,14 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lrx/internal/a/am$b;->bLX:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p2, p0, Lrx/internal/a/am$b;->bMs: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, Lrx/internal/a/am$b;->bMc:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p2, p0, Lrx/internal/a/am$b;->bMx:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/a/am$b;->bMb:[Lrx/internal/a/am$a;
+    sget-object v1, Lrx/internal/a/am$b;->bMw:[Lrx/internal/a/am$a;
 
     invoke-virtual {p2, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -266,7 +266,7 @@
 
 
 # virtual methods
-.method final KM()V
+.method final KA()V
     .locals 17
 
     move-object/from16 v1, p0
@@ -300,7 +300,7 @@
     :cond_1
     :goto_0
     :try_start_1
-    iget-object v0, v1, Lrx/internal/a/am$b;->bLZ:Ljava/lang/Object;
+    iget-object v0, v1, Lrx/internal/a/am$b;->bMu:Ljava/lang/Object;
 
     iget-object v4, v1, Lrx/internal/a/am$b;->queue:Ljava/util/Queue;
 
@@ -319,7 +319,7 @@
     :cond_2
     if-nez v4, :cond_10
 
-    iget-object v0, v1, Lrx/internal/a/am$b;->bMc:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v1, Lrx/internal/a/am$b;->bMx:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -380,7 +380,7 @@
     :cond_5
     if-ne v0, v7, :cond_8
 
-    iget-object v0, v1, Lrx/internal/a/am$b;->bLZ:Ljava/lang/Object;
+    iget-object v0, v1, Lrx/internal/a/am$b;->bMu:Ljava/lang/Object;
 
     iget-object v4, v1, Lrx/internal/a/am$b;->queue:Ljava/util/Queue;
 
@@ -425,7 +425,7 @@
 
     if-gez v8, :cond_e
 
-    iget-object v0, v1, Lrx/internal/a/am$b;->bLZ:Ljava/lang/Object;
+    iget-object v0, v1, Lrx/internal/a/am$b;->bMu:Ljava/lang/Object;
 
     iget-object v8, v1, Lrx/internal/a/am$b;->queue:Ljava/util/Queue;
 
@@ -485,7 +485,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    invoke-virtual {v14}, Lrx/internal/a/am$a;->KL()J
+    invoke-virtual {v14}, Lrx/internal/a/am$a;->Kz()J
 
     goto :goto_7
 
@@ -649,17 +649,17 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/am$b;->bLZ:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/am$b;->bMu:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lrx/internal/a/g;->Ks()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Kg()Ljava/lang/Object;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/a/am$b;->bLZ:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/am$b;->bMu:Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lrx/internal/a/am$b;->KM()V
+    invoke-virtual {p0}, Lrx/internal/a/am$b;->KA()V
 
     :cond_0
     return-void
@@ -668,7 +668,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/am$b;->bLZ:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/am$b;->bMu:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
@@ -676,9 +676,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/a/am$b;->bLZ:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/am$b;->bMu:Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lrx/internal/a/am$b;->KM()V
+    invoke-virtual {p0}, Lrx/internal/a/am$b;->KA()V
 
     :cond_0
     return-void
@@ -713,7 +713,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lrx/internal/a/am$b;->KM()V
+    invoke-virtual {p0}, Lrx/internal/a/am$b;->KA()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/am.smali b/com.discord/smali_classes2/rx/internal/a/am.smali
index 8193ca290a..a1749ef11d 100644
--- a/com.discord/smali_classes2/rx/internal/a/am.smali
+++ b/com.discord/smali_classes2/rx/internal/a/am.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field final bJx:Lrx/Observable;
+.field final bJS:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field final bLX:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bMs:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -61,9 +61,9 @@
 
     invoke-direct {p0, p1}, Lrx/b/b;-><init>(Lrx/Observable$a;)V
 
-    iput-object p2, p0, Lrx/internal/a/am;->bJx:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/am;->bJS:Lrx/Observable;
 
-    iput-object p3, p0, Lrx/internal/a/am;->bLX:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p3, p0, Lrx/internal/a/am;->bMs:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -112,7 +112,7 @@
     .end annotation
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/am;->bLX:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/am;->bMs:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -131,13 +131,13 @@
     :cond_1
     new-instance v1, Lrx/internal/a/am$b;
 
-    iget-object v2, p0, Lrx/internal/a/am;->bLX:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am;->bMs:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {v1, v2}, Lrx/internal/a/am$b;-><init>(Ljava/util/concurrent/atomic/AtomicReference;)V
 
     invoke-virtual {v1}, Lrx/internal/a/am$b;->init()V
 
-    iget-object v2, p0, Lrx/internal/a/am;->bLX:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am;->bMs:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -148,7 +148,7 @@
     move-object v0, v1
 
     :cond_2
-    iget-object v1, v0, Lrx/internal/a/am$b;->bMd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/am$b;->bMy:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -160,7 +160,7 @@
 
     if-nez v1, :cond_3
 
-    iget-object v1, v0, Lrx/internal/a/am$b;->bMd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/am$b;->bMy:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1, v3, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
 
@@ -178,7 +178,7 @@
 
     if-eqz v2, :cond_4
 
-    iget-object p1, p0, Lrx/internal/a/am;->bJx:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/am;->bJS:Lrx/Observable;
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/an$2.smali b/com.discord/smali_classes2/rx/internal/a/an$2.smali
index 82d3dd6e32..f4149e1155 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$2.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic bMh:I
+.field final synthetic bMC:I
 
 
 # direct methods
 .method constructor <init>(I)V
     .locals 0
 
-    iput p1, p0, Lrx/internal/a/an$2;->bMh:I
+    iput p1, p0, Lrx/internal/a/an$2;->bMC:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,7 +48,7 @@
 
     new-instance v0, Lrx/internal/a/an$f;
 
-    iget v1, p0, Lrx/internal/a/an$2;->bMh:I
+    iget v1, p0, Lrx/internal/a/an$2;->bMC:I
 
     invoke-direct {v0, v1}, Lrx/internal/a/an$f;-><init>(I)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/an$3.smali b/com.discord/smali_classes2/rx/internal/a/an$3.smali
index dacdb3440a..eaee233126 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$3.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$3.smali
@@ -26,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic bLY:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic bMD:Lrx/functions/Func0;
 
-.field final synthetic bMi:Lrx/functions/Func0;
+.field final synthetic bMt:Ljava/util/concurrent/atomic/AtomicReference;
 
 
 # direct methods
 .method constructor <init>(Ljava/util/concurrent/atomic/AtomicReference;Lrx/functions/Func0;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/an$3;->bLY:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/a/an$3;->bMt:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p2, p0, Lrx/internal/a/an$3;->bMi:Lrx/functions/Func0;
+    iput-object p2, p0, Lrx/internal/a/an$3;->bMD:Lrx/functions/Func0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,7 +52,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/an$3;->bLY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an$3;->bMt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -64,7 +64,7 @@
 
     new-instance v1, Lrx/internal/a/an$e;
 
-    iget-object v2, p0, Lrx/internal/a/an$3;->bMi:Lrx/functions/Func0;
+    iget-object v2, p0, Lrx/internal/a/an$3;->bMD:Lrx/functions/Func0;
 
     invoke-interface {v2}, Lrx/functions/Func0;->call()Ljava/lang/Object;
 
@@ -76,7 +76,7 @@
 
     invoke-virtual {v1}, Lrx/internal/a/an$e;->init()V
 
-    iget-object v2, p0, Lrx/internal/a/an$3;->bLY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/an$3;->bMt:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -95,7 +95,7 @@
 
     invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object v0, v0, Lrx/internal/a/an$e;->bMj:Lrx/internal/a/an$d;
+    iget-object v0, v0, Lrx/internal/a/an$e;->bME:Lrx/internal/a/an$d;
 
     invoke-interface {v0, v1}, Lrx/internal/a/an$d;->a(Lrx/internal/a/an$b;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/an$a.smali b/com.discord/smali_classes2/rx/internal/a/an$a.smali
index 39d5c87d86..3c1da68cfd 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$a.smali
@@ -83,7 +83,7 @@
 
 
 # virtual methods
-.method KN()V
+.method KB()V
     .locals 0
 
     return-void
@@ -370,7 +370,7 @@
 
     invoke-direct {p0, v0}, Lrx/internal/a/an$a;->a(Lrx/internal/a/an$c;)V
 
-    invoke-virtual {p0}, Lrx/internal/a/an$a;->KN()V
+    invoke-virtual {p0}, Lrx/internal/a/an$a;->KB()V
 
     return-void
 .end method
@@ -378,7 +378,7 @@
 .method public final complete()V
     .locals 6
 
-    invoke-static {}, Lrx/internal/a/g;->Ks()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Kg()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/an$b.smali b/com.discord/smali_classes2/rx/internal/a/an$b.smali
index 40a5408585..47a54bb847 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$b.smali
@@ -287,7 +287,7 @@
 
     iget-object p1, p0, Lrx/internal/a/an$b;->parent:Lrx/internal/a/an$e;
 
-    iget-object p1, p1, Lrx/internal/a/an$e;->bMj:Lrx/internal/a/an$d;
+    iget-object p1, p1, Lrx/internal/a/an$e;->bME:Lrx/internal/a/an$d;
 
     invoke-interface {p1, p0}, Lrx/internal/a/an$d;->a(Lrx/internal/a/an$b;)V
 
@@ -321,7 +321,7 @@
 
     if-nez v1, :cond_5
 
-    iget-object v1, v0, Lrx/internal/a/an$e;->bMm:Lrx/internal/util/g;
+    iget-object v1, v0, Lrx/internal/a/an$e;->bMH:Lrx/internal/util/g;
 
     monitor-enter v1
 
@@ -335,9 +335,9 @@
     goto :goto_2
 
     :cond_0
-    iget-object v2, v0, Lrx/internal/a/an$e;->bMm:Lrx/internal/util/g;
+    iget-object v2, v0, Lrx/internal/a/an$e;->bMH:Lrx/internal/util/g;
 
-    iget-object v3, v2, Lrx/internal/util/g;->bPt:[Ljava/lang/Object;
+    iget-object v3, v2, Lrx/internal/util/g;->bPO:[Ljava/lang/Object;
 
     iget v4, v2, Lrx/internal/util/g;->mask:I
 
@@ -345,7 +345,7 @@
 
     move-result v5
 
-    invoke-static {v5}, Lrx/internal/util/g;->eo(I)I
+    invoke-static {v5}, Lrx/internal/util/g;->ek(I)I
 
     move-result v5
 
@@ -386,7 +386,7 @@
 
     :cond_2
     :goto_0
-    iget-object v2, v0, Lrx/internal/a/an$e;->bMm:Lrx/internal/util/g;
+    iget-object v2, v0, Lrx/internal/a/an$e;->bMH:Lrx/internal/util/g;
 
     iget v2, v2, Lrx/internal/util/g;->size:I
 
@@ -400,18 +400,18 @@
     :goto_1
     if-eqz v7, :cond_4
 
-    sget-object v2, Lrx/internal/a/an$e;->bMk:[Lrx/internal/a/an$b;
+    sget-object v2, Lrx/internal/a/an$e;->bMF:[Lrx/internal/a/an$b;
 
-    iput-object v2, v0, Lrx/internal/a/an$e;->bMn:[Lrx/internal/a/an$b;
+    iput-object v2, v0, Lrx/internal/a/an$e;->bMI:[Lrx/internal/a/an$b;
 
     :cond_4
-    iget-wide v2, v0, Lrx/internal/a/an$e;->bMo:J
+    iget-wide v2, v0, Lrx/internal/a/an$e;->bMJ:J
 
     const-wide/16 v4, 0x1
 
     add-long/2addr v2, v4
 
-    iput-wide v2, v0, Lrx/internal/a/an$e;->bMo:J
+    iput-wide v2, v0, Lrx/internal/a/an$e;->bMJ:J
 
     monitor-exit v1
 
diff --git a/com.discord/smali_classes2/rx/internal/a/an$e$1.smali b/com.discord/smali_classes2/rx/internal/a/an$e$1.smali
index de1cfb4d84..ad12d7d07e 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$e$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$e$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bMu:Lrx/internal/a/an$e;
+.field final synthetic bMP:Lrx/internal/a/an$e;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/an$e;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/an$e$1;->bMu:Lrx/internal/a/an$e;
+    iput-object p1, p0, Lrx/internal/a/an$e$1;->bMP:Lrx/internal/a/an$e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,28 +37,28 @@
 .method public final call()V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/an$e$1;->bMu:Lrx/internal/a/an$e;
+    iget-object v0, p0, Lrx/internal/a/an$e$1;->bMP:Lrx/internal/a/an$e;
 
     iget-boolean v0, v0, Lrx/internal/a/an$e;->terminated:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/an$e$1;->bMu:Lrx/internal/a/an$e;
+    iget-object v0, p0, Lrx/internal/a/an$e$1;->bMP:Lrx/internal/a/an$e;
 
-    iget-object v0, v0, Lrx/internal/a/an$e;->bMm:Lrx/internal/util/g;
+    iget-object v0, v0, Lrx/internal/a/an$e;->bMH:Lrx/internal/util/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/an$e$1;->bMu:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->bMP:Lrx/internal/a/an$e;
 
     iget-boolean v1, v1, Lrx/internal/a/an$e;->terminated:Z
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lrx/internal/a/an$e$1;->bMu:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->bMP:Lrx/internal/a/an$e;
 
-    iget-object v1, v1, Lrx/internal/a/an$e;->bMm:Lrx/internal/util/g;
+    iget-object v1, v1, Lrx/internal/a/an$e;->bMH:Lrx/internal/util/g;
 
     const/4 v2, 0x0
 
@@ -68,19 +68,19 @@
 
     check-cast v2, [Ljava/lang/Object;
 
-    iput-object v2, v1, Lrx/internal/util/g;->bPt:[Ljava/lang/Object;
+    iput-object v2, v1, Lrx/internal/util/g;->bPO:[Ljava/lang/Object;
 
-    iget-object v1, p0, Lrx/internal/a/an$e$1;->bMu:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->bMP:Lrx/internal/a/an$e;
 
-    iget-wide v2, v1, Lrx/internal/a/an$e;->bMo:J
+    iget-wide v2, v1, Lrx/internal/a/an$e;->bMJ:J
 
     const-wide/16 v4, 0x1
 
     add-long/2addr v2, v4
 
-    iput-wide v2, v1, Lrx/internal/a/an$e;->bMo:J
+    iput-wide v2, v1, Lrx/internal/a/an$e;->bMJ:J
 
-    iget-object v1, p0, Lrx/internal/a/an$e$1;->bMu:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->bMP:Lrx/internal/a/an$e;
 
     const/4 v2, 0x1
 
diff --git a/com.discord/smali_classes2/rx/internal/a/an$e.smali b/com.discord/smali_classes2/rx/internal/a/an$e.smali
index 014545b6b7..8d9efb0cc3 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$e.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$e.smali
@@ -29,15 +29,13 @@
 
 
 # static fields
-.field static final bMk:[Lrx/internal/a/an$b;
+.field static final bMF:[Lrx/internal/a/an$b;
 
-.field static final bMl:[Lrx/internal/a/an$b;
+.field static final bMG:[Lrx/internal/a/an$b;
 
 
 # instance fields
-.field final bMd:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-.field final bMj:Lrx/internal/a/an$d;
+.field final bME:Lrx/internal/a/an$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/an$d<",
@@ -46,7 +44,7 @@
     .end annotation
 .end field
 
-.field final bMm:Lrx/internal/util/g;
+.field final bMH:Lrx/internal/util/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/util/g<",
@@ -56,7 +54,7 @@
     .end annotation
 .end field
 
-.field bMn:[Lrx/internal/a/an$b;
+.field bMI:[Lrx/internal/a/an$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -66,15 +64,15 @@
     .end annotation
 .end field
 
-.field volatile bMo:J
+.field volatile bMJ:J
 
-.field bMp:J
+.field bMK:J
 
-.field bMq:J
+.field bML:J
 
-.field bMr:J
+.field bMM:J
 
-.field bMs:Ljava/util/List;
+.field bMN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -84,7 +82,9 @@
     .end annotation
 .end field
 
-.field bMt:Z
+.field bMO:Z
+
+.field final bMy:Ljava/util/concurrent/atomic/AtomicBoolean;
 
 .field done:Z
 
@@ -105,11 +105,11 @@
 
     new-array v1, v0, [Lrx/internal/a/an$b;
 
-    sput-object v1, Lrx/internal/a/an$e;->bMk:[Lrx/internal/a/an$b;
+    sput-object v1, Lrx/internal/a/an$e;->bMF:[Lrx/internal/a/an$b;
 
     new-array v0, v0, [Lrx/internal/a/an$b;
 
-    sput-object v0, Lrx/internal/a/an$e;->bMl:[Lrx/internal/a/an$b;
+    sput-object v0, Lrx/internal/a/an$e;->bMG:[Lrx/internal/a/an$b;
 
     return-void
 .end method
@@ -126,23 +126,23 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/an$e;->bMj:Lrx/internal/a/an$d;
+    iput-object p1, p0, Lrx/internal/a/an$e;->bME:Lrx/internal/a/an$d;
 
     new-instance p1, Lrx/internal/util/g;
 
     invoke-direct {p1}, Lrx/internal/util/g;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/an$e;->bMm:Lrx/internal/util/g;
+    iput-object p1, p0, Lrx/internal/a/an$e;->bMH:Lrx/internal/util/g;
 
-    sget-object p1, Lrx/internal/a/an$e;->bMk:[Lrx/internal/a/an$b;
+    sget-object p1, Lrx/internal/a/an$e;->bMF:[Lrx/internal/a/an$b;
 
-    iput-object p1, p0, Lrx/internal/a/an$e;->bMn:[Lrx/internal/a/an$b;
+    iput-object p1, p0, Lrx/internal/a/an$e;->bMI:[Lrx/internal/a/an$b;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/an$e;->bMd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lrx/internal/a/an$e;->bMy:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const-wide/16 v0, 0x0
 
@@ -151,7 +151,7 @@
     return-void
 .end method
 
-.method private KO()[Lrx/internal/a/an$b;
+.method private KC()[Lrx/internal/a/an$b;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -161,14 +161,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/an$e;->bMm:Lrx/internal/util/g;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bMH:Lrx/internal/util/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/an$e;->bMm:Lrx/internal/util/g;
+    iget-object v1, p0, Lrx/internal/a/an$e;->bMH:Lrx/internal/util/g;
 
-    iget-object v1, v1, Lrx/internal/util/g;->bPt:[Ljava/lang/Object;
+    iget-object v1, v1, Lrx/internal/util/g;->bPO:[Ljava/lang/Object;
 
     array-length v2, v1
 
@@ -192,14 +192,14 @@
     throw v1
 .end method
 
-.method private KP()V
+.method private KD()V
     .locals 7
 
-    iget-object v0, p0, Lrx/internal/a/an$e;->bMn:[Lrx/internal/a/an$b;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bMI:[Lrx/internal/a/an$b;
 
-    iget-wide v1, p0, Lrx/internal/a/an$e;->bMp:J
+    iget-wide v1, p0, Lrx/internal/a/an$e;->bMK:J
 
-    iget-wide v3, p0, Lrx/internal/a/an$e;->bMo:J
+    iget-wide v3, p0, Lrx/internal/a/an$e;->bMJ:J
 
     const/4 v5, 0x0
 
@@ -207,16 +207,16 @@
 
     if-eqz v6, :cond_1
 
-    iget-object v1, p0, Lrx/internal/a/an$e;->bMm:Lrx/internal/util/g;
+    iget-object v1, p0, Lrx/internal/a/an$e;->bMH:Lrx/internal/util/g;
 
     monitor-enter v1
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/an$e;->bMn:[Lrx/internal/a/an$b;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bMI:[Lrx/internal/a/an$b;
 
-    iget-object v2, p0, Lrx/internal/a/an$e;->bMm:Lrx/internal/util/g;
+    iget-object v2, p0, Lrx/internal/a/an$e;->bMH:Lrx/internal/util/g;
 
-    iget-object v2, v2, Lrx/internal/util/g;->bPt:[Ljava/lang/Object;
+    iget-object v2, v2, Lrx/internal/util/g;->bPO:[Ljava/lang/Object;
 
     array-length v3, v2
 
@@ -226,14 +226,14 @@
 
     new-array v0, v3, [Lrx/internal/a/an$b;
 
-    iput-object v0, p0, Lrx/internal/a/an$e;->bMn:[Lrx/internal/a/an$b;
+    iput-object v0, p0, Lrx/internal/a/an$e;->bMI:[Lrx/internal/a/an$b;
 
     :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, Lrx/internal/a/an$e;->bMo:J
+    iget-wide v2, p0, Lrx/internal/a/an$e;->bMJ:J
 
-    iput-wide v2, p0, Lrx/internal/a/an$e;->bMp:J
+    iput-wide v2, p0, Lrx/internal/a/an$e;->bMK:J
 
     monitor-exit v1
 
@@ -250,7 +250,7 @@
 
     :cond_1
     :goto_0
-    iget-object v1, p0, Lrx/internal/a/an$e;->bMj:Lrx/internal/a/an$d;
+    iget-object v1, p0, Lrx/internal/a/an$e;->bME:Lrx/internal/a/an$d;
 
     array-length v2, v0
 
@@ -275,7 +275,7 @@
 .method private i(JJ)V
     .locals 6
 
-    iget-wide v0, p0, Lrx/internal/a/an$e;->bMr:J
+    iget-wide v0, p0, Lrx/internal/a/an$e;->bMM:J
 
     iget-object v2, p0, Lrx/internal/a/an$e;->producer:Lrx/Producer;
 
@@ -287,7 +287,7 @@
 
     if-eqz v5, :cond_3
 
-    iput-wide p1, p0, Lrx/internal/a/an$e;->bMq:J
+    iput-wide p1, p0, Lrx/internal/a/an$e;->bML:J
 
     if-eqz v2, :cond_1
 
@@ -295,7 +295,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-wide v3, p0, Lrx/internal/a/an$e;->bMr:J
+    iput-wide v3, p0, Lrx/internal/a/an$e;->bMM:J
 
     add-long/2addr v0, p3
 
@@ -318,7 +318,7 @@
     const-wide v0, 0x7fffffffffffffffL
 
     :cond_2
-    iput-wide v0, p0, Lrx/internal/a/an$e;->bMr:J
+    iput-wide v0, p0, Lrx/internal/a/an$e;->bMM:J
 
     return-void
 
@@ -329,7 +329,7 @@
 
     if-eqz v2, :cond_4
 
-    iput-wide v3, p0, Lrx/internal/a/an$e;->bMr:J
+    iput-wide v3, p0, Lrx/internal/a/an$e;->bMM:J
 
     invoke-interface {v2, v0, v1}, Lrx/Producer;->request(J)V
 
@@ -358,7 +358,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/an$e;->bMm:Lrx/internal/util/g;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bMH:Lrx/internal/util/g;
 
     monitor-enter v0
 
@@ -372,9 +372,9 @@
     return v1
 
     :cond_1
-    iget-object v1, p0, Lrx/internal/a/an$e;->bMm:Lrx/internal/util/g;
+    iget-object v1, p0, Lrx/internal/a/an$e;->bMH:Lrx/internal/util/g;
 
-    iget-object v2, v1, Lrx/internal/util/g;->bPt:[Ljava/lang/Object;
+    iget-object v2, v1, Lrx/internal/util/g;->bPO:[Ljava/lang/Object;
 
     iget v3, v1, Lrx/internal/util/g;->mask:I
 
@@ -382,7 +382,7 @@
 
     move-result v4
 
-    invoke-static {v4}, Lrx/internal/util/g;->eo(I)I
+    invoke-static {v4}, Lrx/internal/util/g;->ek(I)I
 
     move-result v4
 
@@ -430,7 +430,7 @@
 
     if-lt p1, v2, :cond_8
 
-    iget-object p1, v1, Lrx/internal/util/g;->bPt:[Ljava/lang/Object;
+    iget-object p1, v1, Lrx/internal/util/g;->bPO:[Ljava/lang/Object;
 
     array-length v2, p1
 
@@ -462,7 +462,7 @@
 
     move-result v7
 
-    invoke-static {v7}, Lrx/internal/util/g;->eo(I)I
+    invoke-static {v7}, Lrx/internal/util/g;->ek(I)I
 
     move-result v7
 
@@ -503,17 +503,17 @@
 
     iput p1, v1, Lrx/internal/util/g;->maxSize:I
 
-    iput-object v5, v1, Lrx/internal/util/g;->bPt:[Ljava/lang/Object;
+    iput-object v5, v1, Lrx/internal/util/g;->bPO:[Ljava/lang/Object;
 
     :cond_8
     :goto_1
-    iget-wide v1, p0, Lrx/internal/a/an$e;->bMo:J
+    iget-wide v1, p0, Lrx/internal/a/an$e;->bMJ:J
 
     const-wide/16 v3, 0x1
 
     add-long/2addr v1, v3
 
-    iput-wide v1, p0, Lrx/internal/a/an$e;->bMo:J
+    iput-wide v1, p0, Lrx/internal/a/an$e;->bMJ:J
 
     monitor-exit v0
 
@@ -565,7 +565,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/an$e;->bMs:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bMN:Ljava/util/List;
 
     if-nez v0, :cond_1
 
@@ -573,7 +573,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/a/an$e;->bMs:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/an$e;->bMN:Ljava/util/List;
 
     :cond_1
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
@@ -581,7 +581,7 @@
     goto :goto_0
 
     :cond_2
-    iput-boolean v1, p0, Lrx/internal/a/an$e;->bMt:Z
+    iput-boolean v1, p0, Lrx/internal/a/an$e;->bMO:Z
 
     :goto_0
     iput-boolean v1, p0, Lrx/internal/a/an$e;->missed:Z
@@ -597,7 +597,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    iget-wide v0, p0, Lrx/internal/a/an$e;->bMq:J
+    iget-wide v0, p0, Lrx/internal/a/an$e;->bML:J
 
     const/4 v2, 0x0
 
@@ -616,7 +616,7 @@
     goto :goto_2
 
     :cond_4
-    invoke-direct {p0}, Lrx/internal/a/an$e;->KO()[Lrx/internal/a/an$b;
+    invoke-direct {p0}, Lrx/internal/a/an$e;->KC()[Lrx/internal/a/an$b;
 
     move-result-object p1
 
@@ -680,21 +680,21 @@
     :cond_8
     iput-boolean v2, p0, Lrx/internal/a/an$e;->missed:Z
 
-    iget-object p1, p0, Lrx/internal/a/an$e;->bMs:Ljava/util/List;
+    iget-object p1, p0, Lrx/internal/a/an$e;->bMN:Ljava/util/List;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lrx/internal/a/an$e;->bMs:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/an$e;->bMN:Ljava/util/List;
 
-    iget-boolean v0, p0, Lrx/internal/a/an$e;->bMt:Z
+    iget-boolean v0, p0, Lrx/internal/a/an$e;->bMO:Z
 
-    iput-boolean v2, p0, Lrx/internal/a/an$e;->bMt:Z
+    iput-boolean v2, p0, Lrx/internal/a/an$e;->bMO:Z
 
     monitor-exit p0
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    iget-wide v3, p0, Lrx/internal/a/an$e;->bMq:J
+    iget-wide v3, p0, Lrx/internal/a/an$e;->bML:J
 
     if-eqz p1, :cond_9
 
@@ -735,7 +735,7 @@
     :cond_a
     if-eqz v0, :cond_c
 
-    invoke-direct {p0}, Lrx/internal/a/an$e;->KO()[Lrx/internal/a/an$b;
+    invoke-direct {p0}, Lrx/internal/a/an$e;->KC()[Lrx/internal/a/an$b;
 
     move-result-object p1
 
@@ -825,11 +825,11 @@
     iput-boolean v0, p0, Lrx/internal/a/an$e;->done:Z
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/an$e;->bMj:Lrx/internal/a/an$d;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bME:Lrx/internal/a/an$d;
 
     invoke-interface {v0}, Lrx/internal/a/an$d;->complete()V
 
-    invoke-direct {p0}, Lrx/internal/a/an$e;->KP()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->KD()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -860,11 +860,11 @@
     iput-boolean v0, p0, Lrx/internal/a/an$e;->done:Z
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/an$e;->bMj:Lrx/internal/a/an$d;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bME:Lrx/internal/a/an$d;
 
     invoke-interface {v0, p1}, Lrx/internal/a/an$d;->N(Ljava/lang/Throwable;)V
 
-    invoke-direct {p0}, Lrx/internal/a/an$e;->KP()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->KD()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -895,11 +895,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/an$e;->bMj:Lrx/internal/a/an$d;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bME:Lrx/internal/a/an$d;
 
     invoke-interface {v0, p1}, Lrx/internal/a/an$d;->bR(Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lrx/internal/a/an$e;->KP()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->KD()V
 
     :cond_0
     return-void
@@ -918,7 +918,7 @@
 
     invoke-virtual {p0, p1}, Lrx/internal/a/an$e;->c(Lrx/internal/a/an$b;)V
 
-    invoke-direct {p0}, Lrx/internal/a/an$e;->KP()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->KD()V
 
     return-void
 
diff --git a/com.discord/smali_classes2/rx/internal/a/an$f.smali b/com.discord/smali_classes2/rx/internal/a/an$f.smali
index 68c4f49790..aa403a76fa 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$f.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$f.smali
@@ -45,7 +45,7 @@
 
 
 # virtual methods
-.method final KN()V
+.method final KB()V
     .locals 2
 
     iget v0, p0, Lrx/internal/a/an$f;->size:I
diff --git a/com.discord/smali_classes2/rx/internal/a/an$g.smali b/com.discord/smali_classes2/rx/internal/a/an$g.smali
index 5834ff36cd..38a02008dd 100644
--- a/com.discord/smali_classes2/rx/internal/a/an$g.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an$g.smali
@@ -310,7 +310,7 @@
 .method public final complete()V
     .locals 1
 
-    invoke-static {}, Lrx/internal/a/g;->Ks()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Kg()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/an.smali b/com.discord/smali_classes2/rx/internal/a/an.smali
index 8dde43da12..07acb08901 100644
--- a/com.discord/smali_classes2/rx/internal/a/an.smali
+++ b/com.discord/smali_classes2/rx/internal/a/an.smali
@@ -32,11 +32,11 @@
 
 
 # static fields
-.field static final bMg:Lrx/functions/Func0;
+.field static final bMB:Lrx/functions/Func0;
 
 
 # instance fields
-.field final bJx:Lrx/Observable;
+.field final bJS:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -45,17 +45,7 @@
     .end annotation
 .end field
 
-.field final bLX:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lrx/internal/a/an$e<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-.field final bMf:Lrx/functions/Func0;
+.field final bMA:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -66,6 +56,16 @@
     .end annotation
 .end field
 
+.field final bMs:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Lrx/internal/a/an$e<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -75,7 +75,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/an$1;-><init>()V
 
-    sput-object v0, Lrx/internal/a/an;->bMg:Lrx/functions/Func0;
+    sput-object v0, Lrx/internal/a/an;->bMB:Lrx/functions/Func0;
 
     return-void
 .end method
@@ -101,11 +101,11 @@
 
     invoke-direct {p0, p1}, Lrx/b/b;-><init>(Lrx/Observable$a;)V
 
-    iput-object p2, p0, Lrx/internal/a/an;->bJx:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/an;->bJS:Lrx/Observable;
 
-    iput-object p3, p0, Lrx/internal/a/an;->bLX:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p3, p0, Lrx/internal/a/an;->bMs:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p4, p0, Lrx/internal/a/an;->bMf:Lrx/functions/Func0;
+    iput-object p4, p0, Lrx/internal/a/an;->bMA:Lrx/functions/Func0;
 
     return-void
 .end method
@@ -160,7 +160,7 @@
     .end annotation
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/an;->bLX:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an;->bMs:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -179,7 +179,7 @@
     :cond_1
     new-instance v1, Lrx/internal/a/an$e;
 
-    iget-object v2, p0, Lrx/internal/a/an;->bMf:Lrx/functions/Func0;
+    iget-object v2, p0, Lrx/internal/a/an;->bMA:Lrx/functions/Func0;
 
     invoke-interface {v2}, Lrx/functions/Func0;->call()Ljava/lang/Object;
 
@@ -191,7 +191,7 @@
 
     invoke-virtual {v1}, Lrx/internal/a/an$e;->init()V
 
-    iget-object v2, p0, Lrx/internal/a/an;->bLX:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/an;->bMs:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -202,7 +202,7 @@
     move-object v0, v1
 
     :cond_2
-    iget-object v1, v0, Lrx/internal/a/an$e;->bMd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/an$e;->bMy:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -214,7 +214,7 @@
 
     if-nez v1, :cond_3
 
-    iget-object v1, v0, Lrx/internal/a/an$e;->bMd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/an$e;->bMy:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1, v3, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
 
@@ -232,7 +232,7 @@
 
     if-eqz v2, :cond_4
 
-    iget-object p1, p0, Lrx/internal/a/an;->bJx:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/an;->bJS:Lrx/Observable;
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
@@ -243,7 +243,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/an;->bLX:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an;->bMs:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -276,7 +276,7 @@
 .method public final unsubscribe()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/an;->bLX:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an;->bMs:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ao$a.smali b/com.discord/smali_classes2/rx/internal/a/ao$a.smali
index 79d71787d8..2594583e57 100644
--- a/com.discord/smali_classes2/rx/internal/a/ao$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ao$a.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field private static final bMv:Ljava/lang/Object;
+.field private static final bMQ:Ljava/lang/Object;
 
 
 # instance fields
@@ -61,7 +61,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/a/ao$a;->bMv:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/ao$a;->bMQ:Ljava/lang/Object;
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/a/ao$a;->bMv:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ao$a;->bMQ:Ljava/lang/Object;
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
@@ -91,18 +91,18 @@
     return-void
 .end method
 
-.method private KQ()V
+.method private KE()V
     .locals 2
 
     iget-object v0, p0, Lrx/internal/a/ao$a;->value:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/a/ao$a;->bMv:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ao$a;->bMQ: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, Lrx/internal/a/ao$a;->bMv:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ao$a;->bMQ:Ljava/lang/Object;
 
     if-eq v0, v1, :cond_0
 
@@ -129,7 +129,7 @@
 .method public final call()V
     .locals 0
 
-    invoke-direct {p0}, Lrx/internal/a/ao$a;->KQ()V
+    invoke-direct {p0}, Lrx/internal/a/ao$a;->KE()V
 
     return-void
 .end method
@@ -137,7 +137,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    invoke-direct {p0}, Lrx/internal/a/ao$a;->KQ()V
+    invoke-direct {p0}, Lrx/internal/a/ao$a;->KE()V
 
     iget-object v0, p0, Lrx/internal/a/ao$a;->subscriber:Lrx/Subscriber;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ao.smali b/com.discord/smali_classes2/rx/internal/a/ao.smali
index aeb341649e..562a953876 100644
--- a/com.discord/smali_classes2/rx/internal/a/ao.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ao.smali
@@ -61,7 +61,7 @@
 
     iget-object v1, p0, Lrx/internal/a/ao;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v1}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {v1}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ap$1.smali b/com.discord/smali_classes2/rx/internal/a/ap$1.smali
index f248fa11f9..3f9743372a 100644
--- a/com.discord/smali_classes2/rx/internal/a/ap$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ap$1.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bJg:Ljava/lang/Object;
+.field final synthetic bJA:Ljava/lang/Object;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ap$1;->bJg:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/ap$1;->bJA:Ljava/lang/Object;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +50,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ap$1;->bJg:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/ap$1;->bJA:Ljava/lang/Object;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/ap$2.smali b/com.discord/smali_classes2/rx/internal/a/ap$2.smali
index 90ffc9096c..26bdb9f550 100644
--- a/com.discord/smali_classes2/rx/internal/a/ap$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ap$2.smali
@@ -22,11 +22,11 @@
 
 
 # instance fields
-.field bJE:Z
+.field bJZ:Z
 
-.field final synthetic bKa:Lrx/Subscriber;
+.field final synthetic bKv:Lrx/Subscriber;
 
-.field final synthetic bMz:Lrx/internal/a/ap;
+.field final synthetic bMU:Lrx/internal/a/ap;
 
 .field value:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -41,9 +41,9 @@
 .method constructor <init>(Lrx/internal/a/ap;Lrx/Subscriber;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ap$2;->bMz:Lrx/internal/a/ap;
+    iput-object p1, p0, Lrx/internal/a/ap$2;->bMU:Lrx/internal/a/ap;
 
-    iput-object p3, p0, Lrx/internal/a/ap$2;->bKa:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ap$2;->bKv:Lrx/Subscriber;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -55,7 +55,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ap$2;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ap$2;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -65,7 +65,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ap$2;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ap$2;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -80,13 +80,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/ap$2;->bJE:Z
+    iget-boolean v0, p0, Lrx/internal/a/ap$2;->bJZ:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/ap$2;->bJE:Z
+    iput-boolean v0, p0, Lrx/internal/a/ap$2;->bJZ:Z
 
     goto :goto_0
 
@@ -94,9 +94,9 @@
     iget-object v0, p0, Lrx/internal/a/ap$2;->value:Ljava/lang/Object;
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/ap$2;->bMz:Lrx/internal/a/ap;
+    iget-object v1, p0, Lrx/internal/a/ap$2;->bMU:Lrx/internal/a/ap;
 
-    iget-object v1, v1, Lrx/internal/a/ap;->bMx:Lrx/functions/Func2;
+    iget-object v1, v1, Lrx/internal/a/ap;->bMS:Lrx/functions/Func2;
 
     invoke-interface {v1, v0, p1}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -107,7 +107,7 @@
     :goto_0
     iput-object p1, p0, Lrx/internal/a/ap$2;->value:Ljava/lang/Object;
 
-    iget-object v0, p0, Lrx/internal/a/ap$2;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ap$2;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -116,7 +116,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/ap$2;->bKa:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/ap$2;->bKv:Lrx/Subscriber;
 
     invoke-static {v0, v1, p1}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ap$3.smali b/com.discord/smali_classes2/rx/internal/a/ap$3.smali
index f3ed61180d..5b6d16c534 100644
--- a/com.discord/smali_classes2/rx/internal/a/ap$3.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ap$3.smali
@@ -22,11 +22,11 @@
 
 
 # instance fields
-.field final synthetic bJg:Ljava/lang/Object;
+.field final synthetic bJA:Ljava/lang/Object;
 
-.field final synthetic bMA:Lrx/internal/a/ap$a;
+.field final synthetic bMU:Lrx/internal/a/ap;
 
-.field final synthetic bMz:Lrx/internal/a/ap;
+.field final synthetic bMV:Lrx/internal/a/ap$a;
 
 .field private value:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -41,15 +41,15 @@
 .method constructor <init>(Lrx/internal/a/ap;Ljava/lang/Object;Lrx/internal/a/ap$a;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ap$3;->bMz:Lrx/internal/a/ap;
+    iput-object p1, p0, Lrx/internal/a/ap$3;->bMU:Lrx/internal/a/ap;
 
-    iput-object p2, p0, Lrx/internal/a/ap$3;->bJg:Ljava/lang/Object;
+    iput-object p2, p0, Lrx/internal/a/ap$3;->bJA:Ljava/lang/Object;
 
-    iput-object p3, p0, Lrx/internal/a/ap$3;->bMA:Lrx/internal/a/ap$a;
+    iput-object p3, p0, Lrx/internal/a/ap$3;->bMV:Lrx/internal/a/ap$a;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iget-object p1, p0, Lrx/internal/a/ap$3;->bJg:Ljava/lang/Object;
+    iget-object p1, p0, Lrx/internal/a/ap$3;->bJA:Ljava/lang/Object;
 
     iput-object p1, p0, Lrx/internal/a/ap$3;->value:Ljava/lang/Object;
 
@@ -61,7 +61,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ap$3;->bMA:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->bMV:Lrx/internal/a/ap$a;
 
     invoke-virtual {v0}, Lrx/internal/a/ap$a;->onCompleted()V
 
@@ -71,7 +71,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ap$3;->bMA:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->bMV:Lrx/internal/a/ap$a;
 
     invoke-virtual {v0, p1}, Lrx/internal/a/ap$a;->onError(Ljava/lang/Throwable;)V
 
@@ -89,9 +89,9 @@
     iget-object v0, p0, Lrx/internal/a/ap$3;->value:Ljava/lang/Object;
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/ap$3;->bMz:Lrx/internal/a/ap;
+    iget-object v1, p0, Lrx/internal/a/ap$3;->bMU:Lrx/internal/a/ap;
 
-    iget-object v1, v1, Lrx/internal/a/ap;->bMx:Lrx/functions/Func2;
+    iget-object v1, v1, Lrx/internal/a/ap;->bMS:Lrx/functions/Func2;
 
     invoke-interface {v1, v0, p1}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -101,7 +101,7 @@
 
     iput-object p1, p0, Lrx/internal/a/ap$3;->value:Ljava/lang/Object;
 
-    iget-object v0, p0, Lrx/internal/a/ap$3;->bMA:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->bMV:Lrx/internal/a/ap$a;
 
     invoke-virtual {v0, p1}, Lrx/internal/a/ap$a;->onNext(Ljava/lang/Object;)V
 
@@ -118,7 +118,7 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 7
 
-    iget-object v0, p0, Lrx/internal/a/ap$3;->bMA:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->bMV:Lrx/internal/a/ap$a;
 
     if-eqz p1, :cond_3
 
@@ -131,7 +131,7 @@
 
     if-nez v2, :cond_2
 
-    iget-wide v2, v0, Lrx/internal/a/ap$a;->bMB:J
+    iget-wide v2, v0, Lrx/internal/a/ap$a;->bMW:J
 
     const-wide v4, 0x7fffffffffffffffL
 
@@ -146,7 +146,7 @@
     :cond_0
     const-wide/16 v4, 0x0
 
-    iput-wide v4, v0, Lrx/internal/a/ap$a;->bMB:J
+    iput-wide v4, v0, Lrx/internal/a/ap$a;->bMW:J
 
     iput-object p1, v0, Lrx/internal/a/ap$a;->producer:Lrx/Producer;
 
@@ -161,7 +161,7 @@
     invoke-interface {p1, v2, v3}, Lrx/Producer;->request(J)V
 
     :cond_1
-    invoke-virtual {v0}, Lrx/internal/a/ap$a;->KE()V
+    invoke-virtual {v0}, Lrx/internal/a/ap$a;->Ks()V
 
     return-void
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ap$a.smali b/com.discord/smali_classes2/rx/internal/a/ap$a.smali
index 06bc1f6fea..0afdafeb6c 100644
--- a/com.discord/smali_classes2/rx/internal/a/ap$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ap$a.smali
@@ -31,7 +31,7 @@
 
 
 # instance fields
-.field bMB:J
+.field bMW:J
 
 .field final child:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -80,7 +80,7 @@
 
     iput-object p2, p0, Lrx/internal/a/ap$a;->child:Lrx/Subscriber;
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Lm()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->La()Z
 
     move-result p2
 
@@ -115,7 +115,7 @@
     return-void
 .end method
 
-.method private KF()V
+.method private Kt()V
     .locals 13
 
     iget-object v0, p0, Lrx/internal/a/ap$a;->child:Lrx/Subscriber;
@@ -302,7 +302,7 @@
 
 
 # virtual methods
-.method final KE()V
+.method final Ks()V
     .locals 2
 
     monitor-enter p0
@@ -327,7 +327,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-direct {p0}, Lrx/internal/a/ap$a;->KF()V
+    invoke-direct {p0}, Lrx/internal/a/ap$a;->Kt()V
 
     return-void
 
@@ -349,7 +349,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ap$a;->done:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ap$a;->KE()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Ks()V
 
     return-void
 .end method
@@ -363,7 +363,7 @@
 
     iput-boolean p1, p0, Lrx/internal/a/ap$a;->done:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ap$a;->KE()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Ks()V
 
     return-void
 .end method
@@ -384,7 +384,7 @@
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ap$a;->KE()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Ks()V
 
     return-void
 .end method
@@ -419,13 +419,13 @@
 
     if-nez v0, :cond_0
 
-    iget-wide v2, p0, Lrx/internal/a/ap$a;->bMB:J
+    iget-wide v2, p0, Lrx/internal/a/ap$a;->bMW:J
 
     invoke-static {v2, v3, p1, p2}, Lrx/internal/a/a;->h(JJ)J
 
     move-result-wide v2
 
-    iput-wide v2, p0, Lrx/internal/a/ap$a;->bMB:J
+    iput-wide v2, p0, Lrx/internal/a/ap$a;->bMW:J
 
     :cond_0
     monitor-exit v1
@@ -448,7 +448,7 @@
     invoke-interface {v0, p1, p2}, Lrx/Producer;->request(J)V
 
     :cond_2
-    invoke-virtual {p0}, Lrx/internal/a/ap$a;->KE()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Ks()V
 
     :cond_3
     return-void
diff --git a/com.discord/smali_classes2/rx/internal/a/ap.smali b/com.discord/smali_classes2/rx/internal/a/ap.smali
index 1f73b9b15f..1339eabbf9 100644
--- a/com.discord/smali_classes2/rx/internal/a/ap.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ap.smali
@@ -28,11 +28,11 @@
 
 
 # static fields
-.field private static final bMy:Ljava/lang/Object;
+.field private static final bMT:Ljava/lang/Object;
 
 
 # instance fields
-.field private final bMw:Lrx/functions/Func0;
+.field private final bMR:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field final bMx:Lrx/functions/Func2;
+.field final bMS:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -59,7 +59,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/a/ap;->bMy:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/ap;->bMT:Ljava/lang/Object;
 
     return-void
 .end method
@@ -97,9 +97,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ap;->bMw:Lrx/functions/Func0;
+    iput-object p1, p0, Lrx/internal/a/ap;->bMR:Lrx/functions/Func0;
 
-    iput-object p2, p0, Lrx/internal/a/ap;->bMx:Lrx/functions/Func2;
+    iput-object p2, p0, Lrx/internal/a/ap;->bMS:Lrx/functions/Func2;
 
     return-void
 .end method
@@ -111,13 +111,13 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/ap;->bMw:Lrx/functions/Func0;
+    iget-object v0, p0, Lrx/internal/a/ap;->bMR:Lrx/functions/Func0;
 
     invoke-interface {v0}, Lrx/functions/Func0;->call()Ljava/lang/Object;
 
     move-result-object v0
 
-    sget-object v1, Lrx/internal/a/ap;->bMy:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ap;->bMT:Ljava/lang/Object;
 
     if-ne v0, v1, :cond_0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/aq$a.smali b/com.discord/smali_classes2/rx/internal/a/aq$a.smali
index c00dfadbe9..ee18a58a22 100644
--- a/com.discord/smali_classes2/rx/internal/a/aq$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aq$a.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final bMD:Lrx/internal/a/aq;
+.field static final bMY:Lrx/internal/a/aq;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/aq<",
@@ -33,7 +33,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/aq;-><init>()V
 
-    sput-object v0, Lrx/internal/a/aq$a;->bMD:Lrx/internal/a/aq;
+    sput-object v0, Lrx/internal/a/aq$a;->bMY:Lrx/internal/a/aq;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/aq$b.smali b/com.discord/smali_classes2/rx/internal/a/aq$b.smali
index 553eab452e..87a0fd9c16 100644
--- a/com.discord/smali_classes2/rx/internal/a/aq$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aq$b.smali
@@ -25,11 +25,11 @@
 
 
 # instance fields
-.field private final bMC:Z
+.field private final bMX:Z
 
-.field private bME:Z
+.field private bMZ:Z
 
-.field private bMF:Z
+.field private bNa:Z
 
 .field private final child:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -72,7 +72,7 @@
 
     iput-object p1, p0, Lrx/internal/a/aq$b;->child:Lrx/Subscriber;
 
-    iput-boolean p2, p0, Lrx/internal/a/aq$b;->bMC:Z
+    iput-boolean p2, p0, Lrx/internal/a/aq$b;->bMX:Z
 
     iput-object p3, p0, Lrx/internal/a/aq$b;->defaultValue:Ljava/lang/Object;
 
@@ -88,11 +88,11 @@
 .method public final onCompleted()V
     .locals 3
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bMF:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bNa:Z
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bME:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bMZ:Z
 
     if-eqz v0, :cond_0
 
@@ -109,7 +109,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bMC:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bMX:Z
 
     if-eqz v0, :cond_1
 
@@ -143,7 +143,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bMF:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bNa:Z
 
     if-eqz v0, :cond_0
 
@@ -167,17 +167,17 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bMF:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bNa:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bME:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bMZ:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_0
 
-    iput-boolean v1, p0, Lrx/internal/a/aq$b;->bMF:Z
+    iput-boolean v1, p0, Lrx/internal/a/aq$b;->bNa:Z
 
     iget-object p1, p0, Lrx/internal/a/aq$b;->child:Lrx/Subscriber;
 
@@ -196,7 +196,7 @@
     :cond_0
     iput-object p1, p0, Lrx/internal/a/aq$b;->value:Ljava/lang/Object;
 
-    iput-boolean v1, p0, Lrx/internal/a/aq$b;->bME:Z
+    iput-boolean v1, p0, Lrx/internal/a/aq$b;->bMZ:Z
 
     :cond_1
     return-void
diff --git a/com.discord/smali_classes2/rx/internal/a/aq.smali b/com.discord/smali_classes2/rx/internal/a/aq.smali
index 7b9a582143..795fbe895e 100644
--- a/com.discord/smali_classes2/rx/internal/a/aq.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aq.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field private final bMC:Z
+.field private final bMX:Z
 
 .field private final defaultValue:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -61,7 +61,7 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lrx/internal/a/aq;->bMC:Z
+    iput-boolean p1, p0, Lrx/internal/a/aq;->bMX:Z
 
     const/4 p1, 0x0
 
@@ -70,7 +70,7 @@
     return-void
 .end method
 
-.method public static KR()Lrx/internal/a/aq;
+.method public static KF()Lrx/internal/a/aq;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -82,7 +82,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/aq$a;->bMD:Lrx/internal/a/aq;
+    sget-object v0, Lrx/internal/a/aq$a;->bMY:Lrx/internal/a/aq;
 
     return-object v0
 .end method
@@ -96,7 +96,7 @@
 
     new-instance v0, Lrx/internal/a/aq$b;
 
-    iget-boolean v1, p0, Lrx/internal/a/aq;->bMC:Z
+    iget-boolean v1, p0, Lrx/internal/a/aq;->bMX:Z
 
     iget-object v2, p0, Lrx/internal/a/aq;->defaultValue:Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ar$1.smali b/com.discord/smali_classes2/rx/internal/a/ar$1.smali
index a034958550..dd2f925eca 100644
--- a/com.discord/smali_classes2/rx/internal/a/ar$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ar$1.smali
@@ -22,20 +22,20 @@
 
 
 # instance fields
-.field final synthetic bKa:Lrx/Subscriber;
+.field final synthetic bKv:Lrx/Subscriber;
 
-.field bMH:I
+.field bNc:I
 
-.field final synthetic bMI:Lrx/internal/a/ar;
+.field final synthetic bNd:Lrx/internal/a/ar;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/ar;Lrx/Subscriber;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ar$1;->bMI:Lrx/internal/a/ar;
+    iput-object p1, p0, Lrx/internal/a/ar$1;->bNd:Lrx/internal/a/ar;
 
-    iput-object p3, p0, Lrx/internal/a/ar$1;->bKa:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ar$1;->bKv:Lrx/Subscriber;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -47,7 +47,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -57,7 +57,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -72,26 +72,26 @@
         }
     .end annotation
 
-    iget v0, p0, Lrx/internal/a/ar$1;->bMH:I
+    iget v0, p0, Lrx/internal/a/ar$1;->bNc:I
 
-    iget-object v1, p0, Lrx/internal/a/ar$1;->bMI:Lrx/internal/a/ar;
+    iget-object v1, p0, Lrx/internal/a/ar$1;->bNd:Lrx/internal/a/ar;
 
-    iget v1, v1, Lrx/internal/a/ar;->bMG:I
+    iget v1, v1, Lrx/internal/a/ar;->bNb:I
 
     if-lt v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
     return-void
 
     :cond_0
-    iget p1, p0, Lrx/internal/a/ar$1;->bMH:I
+    iget p1, p0, Lrx/internal/a/ar$1;->bNc:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lrx/internal/a/ar$1;->bMH:I
+    iput p1, p0, Lrx/internal/a/ar$1;->bNc:I
 
     return-void
 .end method
@@ -99,13 +99,13 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->bMI:Lrx/internal/a/ar;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bNd:Lrx/internal/a/ar;
 
-    iget v0, v0, Lrx/internal/a/ar;->bMG:I
+    iget v0, v0, Lrx/internal/a/ar;->bNb:I
 
     int-to-long v0, v0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ar.smali b/com.discord/smali_classes2/rx/internal/a/ar.smali
index 42ed8f7b67..b73d77016e 100644
--- a/com.discord/smali_classes2/rx/internal/a/ar.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ar.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field final bMG:I
+.field final bNb:I
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lrx/internal/a/ar;->bMG:I
+    iput p1, p0, Lrx/internal/a/ar;->bNb:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/as$1.smali b/com.discord/smali_classes2/rx/internal/a/as$1.smali
index c6e354a9c4..88fa2d3953 100644
--- a/com.discord/smali_classes2/rx/internal/a/as$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/as$1.smali
@@ -22,11 +22,11 @@
 
 
 # instance fields
-.field final synthetic bKa:Lrx/Subscriber;
+.field final synthetic bKv:Lrx/Subscriber;
 
-.field bMK:Z
+.field bNf:Z
 
-.field final synthetic bML:Lrx/internal/a/as;
+.field final synthetic bNg:Lrx/internal/a/as;
 
 .field index:I
 
@@ -35,15 +35,15 @@
 .method constructor <init>(Lrx/internal/a/as;Lrx/Subscriber;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/as$1;->bML:Lrx/internal/a/as;
+    iput-object p1, p0, Lrx/internal/a/as$1;->bNg:Lrx/internal/a/as;
 
-    iput-object p3, p0, Lrx/internal/a/as$1;->bKa:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/as$1;->bKv:Lrx/Subscriber;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/as$1;->bMK:Z
+    iput-boolean p1, p0, Lrx/internal/a/as$1;->bNf:Z
 
     return-void
 .end method
@@ -53,7 +53,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/as$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -63,7 +63,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/as$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -78,11 +78,11 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/as$1;->bMK:Z
+    iget-boolean v0, p0, Lrx/internal/a/as$1;->bNf:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/as$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -90,9 +90,9 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/as$1;->bML:Lrx/internal/a/as;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bNg:Lrx/internal/a/as;
 
-    iget-object v0, v0, Lrx/internal/a/as;->bMJ:Lrx/functions/Func2;
+    iget-object v0, v0, Lrx/internal/a/as;->bNe:Lrx/functions/Func2;
 
     iget v1, p0, Lrx/internal/a/as$1;->index:I
 
@@ -120,9 +120,9 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lrx/internal/a/as$1;->bMK:Z
+    iput-boolean v0, p0, Lrx/internal/a/as$1;->bNf:Z
 
-    iget-object v0, p0, Lrx/internal/a/as$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -138,7 +138,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/as$1;->bKa:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/as$1;->bKv:Lrx/Subscriber;
 
     invoke-static {v0, v1, p1}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/as$2.smali b/com.discord/smali_classes2/rx/internal/a/as$2.smali
index 0f3ed16f9f..90b8de99de 100644
--- a/com.discord/smali_classes2/rx/internal/a/as$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/as$2.smali
@@ -29,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic bMM:Lrx/functions/b;
+.field final synthetic bNh:Lrx/functions/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/as$2;->bMM:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/as$2;->bNh:Lrx/functions/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,7 +48,7 @@
 .method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    iget-object p2, p0, Lrx/internal/a/as$2;->bMM:Lrx/functions/b;
+    iget-object p2, p0, Lrx/internal/a/as$2;->bNh:Lrx/functions/b;
 
     invoke-interface {p2, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/as.smali b/com.discord/smali_classes2/rx/internal/a/as.smali
index 98707d1cf3..f7988e37c1 100644
--- a/com.discord/smali_classes2/rx/internal/a/as.smali
+++ b/com.discord/smali_classes2/rx/internal/a/as.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field final bMJ:Lrx/functions/Func2;
+.field final bNe:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -49,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/as;->bMJ:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/internal/a/as;->bNe:Lrx/functions/Func2;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/at$a$1$1.smali b/com.discord/smali_classes2/rx/internal/a/at$a$1$1.smali
index bbf84053dc..5fbe3d813d 100644
--- a/com.discord/smali_classes2/rx/internal/a/at$a$1$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/at$a$1$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bMR:J
+.field final synthetic bNm:J
 
-.field final synthetic bMS:Lrx/internal/a/at$a$1;
+.field final synthetic bNn:Lrx/internal/a/at$a$1;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/at$a$1;J)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/at$a$1$1;->bMS:Lrx/internal/a/at$a$1;
+    iput-object p1, p0, Lrx/internal/a/at$a$1$1;->bNn:Lrx/internal/a/at$a$1;
 
-    iput-wide p2, p0, Lrx/internal/a/at$a$1$1;->bMR:J
+    iput-wide p2, p0, Lrx/internal/a/at$a$1$1;->bNm:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,11 +41,11 @@
 .method public final call()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/a/at$a$1$1;->bMS:Lrx/internal/a/at$a$1;
+    iget-object v0, p0, Lrx/internal/a/at$a$1$1;->bNn:Lrx/internal/a/at$a$1;
 
-    iget-object v0, v0, Lrx/internal/a/at$a$1;->bMP:Lrx/Producer;
+    iget-object v0, v0, Lrx/internal/a/at$a$1;->bNk:Lrx/Producer;
 
-    iget-wide v1, p0, Lrx/internal/a/at$a$1$1;->bMR:J
+    iget-wide v1, p0, Lrx/internal/a/at$a$1$1;->bNm:J
 
     invoke-interface {v0, v1, v2}, Lrx/Producer;->request(J)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/at$a$1.smali b/com.discord/smali_classes2/rx/internal/a/at$a$1.smali
index e0f3299f1b..adabe0fe87 100644
--- a/com.discord/smali_classes2/rx/internal/a/at$a$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/at$a$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bMP:Lrx/Producer;
+.field final synthetic bNk:Lrx/Producer;
 
-.field final synthetic bMQ:Lrx/internal/a/at$a;
+.field final synthetic bNl:Lrx/internal/a/at$a;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/at$a;Lrx/Producer;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/at$a$1;->bMQ:Lrx/internal/a/at$a;
+    iput-object p1, p0, Lrx/internal/a/at$a$1;->bNl:Lrx/internal/a/at$a;
 
-    iput-object p2, p0, Lrx/internal/a/at$a$1;->bMP:Lrx/Producer;
+    iput-object p2, p0, Lrx/internal/a/at$a$1;->bNk:Lrx/Producer;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final request(J)V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/at$a$1;->bMQ:Lrx/internal/a/at$a;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->bNl:Lrx/internal/a/at$a;
 
-    iget-object v0, v0, Lrx/internal/a/at$a;->bMO:Ljava/lang/Thread;
+    iget-object v0, v0, Lrx/internal/a/at$a;->bNj:Ljava/lang/Thread;
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
@@ -51,18 +51,18 @@
 
     if-eq v0, v1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/at$a$1;->bMQ:Lrx/internal/a/at$a;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->bNl:Lrx/internal/a/at$a;
 
-    iget-boolean v0, v0, Lrx/internal/a/at$a;->bMN:Z
+    iget-boolean v0, v0, Lrx/internal/a/at$a;->bNi:Z
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/at$a$1;->bMQ:Lrx/internal/a/at$a;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->bNl:Lrx/internal/a/at$a;
 
-    iget-object v0, v0, Lrx/internal/a/at$a;->bKC:Lrx/Scheduler$Worker;
+    iget-object v0, v0, Lrx/internal/a/at$a;->bKX:Lrx/Scheduler$Worker;
 
     new-instance v1, Lrx/internal/a/at$a$1$1;
 
@@ -74,7 +74,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/internal/a/at$a$1;->bMP:Lrx/Producer;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->bNk:Lrx/Producer;
 
     invoke-interface {v0, p1, p2}, Lrx/Producer;->request(J)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/at$a.smali b/com.discord/smali_classes2/rx/internal/a/at$a.smali
index f3b433ed25..a2daa32b17 100644
--- a/com.discord/smali_classes2/rx/internal/a/at$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/at$a.smali
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field bJx:Lrx/Observable;
+.field bJS:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -47,11 +47,11 @@
     .end annotation
 .end field
 
-.field final bKC:Lrx/Scheduler$Worker;
+.field final bKX:Lrx/Scheduler$Worker;
 
-.field final bMN:Z
+.field final bNi:Z
 
-.field bMO:Ljava/lang/Thread;
+.field bNj:Ljava/lang/Thread;
 
 
 # direct methods
@@ -72,11 +72,11 @@
 
     iput-object p1, p0, Lrx/internal/a/at$a;->actual:Lrx/Subscriber;
 
-    iput-boolean p2, p0, Lrx/internal/a/at$a;->bMN:Z
+    iput-boolean p2, p0, Lrx/internal/a/at$a;->bNi:Z
 
-    iput-object p3, p0, Lrx/internal/a/at$a;->bKC:Lrx/Scheduler$Worker;
+    iput-object p3, p0, Lrx/internal/a/at$a;->bKX:Lrx/Scheduler$Worker;
 
-    iput-object p4, p0, Lrx/internal/a/at$a;->bJx:Lrx/Observable;
+    iput-object p4, p0, Lrx/internal/a/at$a;->bJS:Lrx/Observable;
 
     return-void
 .end method
@@ -86,17 +86,17 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/at$a;->bJx:Lrx/Observable;
+    iget-object v0, p0, Lrx/internal/a/at$a;->bJS:Lrx/Observable;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/internal/a/at$a;->bJx:Lrx/Observable;
+    iput-object v1, p0, Lrx/internal/a/at$a;->bJS:Lrx/Observable;
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
     move-result-object v1
 
-    iput-object v1, p0, Lrx/internal/a/at$a;->bMO:Ljava/lang/Thread;
+    iput-object v1, p0, Lrx/internal/a/at$a;->bNj:Ljava/lang/Thread;
 
     invoke-virtual {v0, p0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
@@ -113,7 +113,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lrx/internal/a/at$a;->bKC:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/at$a;->bKX:Lrx/Scheduler$Worker;
 
     invoke-virtual {v0}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -122,7 +122,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/at$a;->bKC:Lrx/Scheduler$Worker;
+    iget-object v1, p0, Lrx/internal/a/at$a;->bKX:Lrx/Scheduler$Worker;
 
     invoke-virtual {v1}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -139,7 +139,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lrx/internal/a/at$a;->bKC:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/at$a;->bKX:Lrx/Scheduler$Worker;
 
     invoke-virtual {p1}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -148,7 +148,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lrx/internal/a/at$a;->bKC:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/at$a;->bKX:Lrx/Scheduler$Worker;
 
     invoke-virtual {v0}, Lrx/Scheduler$Worker;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/at.smali b/com.discord/smali_classes2/rx/internal/a/at.smali
index 6f364cf95f..ed36a3a40b 100644
--- a/com.discord/smali_classes2/rx/internal/a/at.smali
+++ b/com.discord/smali_classes2/rx/internal/a/at.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field final bJx:Lrx/Observable;
+.field final bJS:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field final bMN:Z
+.field final bNi:Z
 
 .field final scheduler:Lrx/Scheduler;
 
@@ -57,9 +57,9 @@
 
     iput-object p2, p0, Lrx/internal/a/at;->scheduler:Lrx/Scheduler;
 
-    iput-object p1, p0, Lrx/internal/a/at;->bJx:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/at;->bJS:Lrx/Observable;
 
-    iput-boolean p3, p0, Lrx/internal/a/at;->bMN:Z
+    iput-boolean p3, p0, Lrx/internal/a/at;->bNi:Z
 
     return-void
 .end method
@@ -73,15 +73,15 @@
 
     iget-object v0, p0, Lrx/internal/a/at;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
     new-instance v1, Lrx/internal/a/at$a;
 
-    iget-boolean v2, p0, Lrx/internal/a/at;->bMN:Z
+    iget-boolean v2, p0, Lrx/internal/a/at;->bNi:Z
 
-    iget-object v3, p0, Lrx/internal/a/at;->bJx:Lrx/Observable;
+    iget-object v3, p0, Lrx/internal/a/at;->bJS:Lrx/Observable;
 
     invoke-direct {v1, p1, v2, v0, v3}, Lrx/internal/a/at$a;-><init>(Lrx/Subscriber;ZLrx/Scheduler$Worker;Lrx/Observable;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/au$a.smali b/com.discord/smali_classes2/rx/internal/a/au$a.smali
index 723dfbe580..71a5616516 100644
--- a/com.discord/smali_classes2/rx/internal/a/au$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/au$a.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final bMT:Lrx/internal/a/au;
+.field static final bNo:Lrx/internal/a/au;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/au<",
@@ -36,7 +36,7 @@
 
     invoke-direct {v0, v1}, Lrx/internal/a/au;-><init>(Z)V
 
-    sput-object v0, Lrx/internal/a/au$a;->bMT:Lrx/internal/a/au;
+    sput-object v0, Lrx/internal/a/au$a;->bNo:Lrx/internal/a/au;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/au$b.smali b/com.discord/smali_classes2/rx/internal/a/au$b.smali
index ad93d43e3b..d5dc3f0d6c 100644
--- a/com.discord/smali_classes2/rx/internal/a/au$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/au$b.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final bMU:Lrx/internal/a/au$c;
+.field private final bNp:Lrx/internal/a/au$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/au$c<",
@@ -52,7 +52,7 @@
 
     iput-wide p1, p0, Lrx/internal/a/au$b;->id:J
 
-    iput-object p3, p0, Lrx/internal/a/au$b;->bMU:Lrx/internal/a/au$c;
+    iput-object p3, p0, Lrx/internal/a/au$b;->bNp:Lrx/internal/a/au$c;
 
     return-void
 .end method
@@ -62,14 +62,14 @@
 .method public final onCompleted()V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/au$b;->bMU:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->bNp:Lrx/internal/a/au$c;
 
     iget-wide v1, p0, Lrx/internal/a/au$b;->id:J
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v3, v0, Lrx/internal/a/au$c;->bKD:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/au$c;->bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -86,7 +86,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    iput-boolean v1, v0, Lrx/internal/a/au$c;->bMW:Z
+    iput-boolean v1, v0, Lrx/internal/a/au$c;->bNr:Z
 
     const/4 v1, 0x0
 
@@ -114,14 +114,14 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/au$b;->bMU:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->bNp:Lrx/internal/a/au$c;
 
     iget-wide v1, p0, Lrx/internal/a/au$b;->id:J
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v3, v0, Lrx/internal/a/au$c;->bKD:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/au$c;->bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -137,7 +137,7 @@
 
     const/4 v2, 0x0
 
-    iput-boolean v2, v0, Lrx/internal/a/au$c;->bMW:Z
+    iput-boolean v2, v0, Lrx/internal/a/au$c;->bNr:Z
 
     const/4 v2, 0x0
 
@@ -183,12 +183,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/au$b;->bMU:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->bNp:Lrx/internal/a/au$c;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, v0, Lrx/internal/a/au$c;->bKD:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, v0, Lrx/internal/a/au$c;->bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -235,14 +235,14 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/au$b;->bMU:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->bNp:Lrx/internal/a/au$c;
 
     iget-wide v1, p0, Lrx/internal/a/au$b;->id:J
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v3, v0, Lrx/internal/a/au$c;->bKD:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/au$c;->bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
diff --git a/com.discord/smali_classes2/rx/internal/a/au$c$1.smali b/com.discord/smali_classes2/rx/internal/a/au$c$1.smali
index 37e9343d67..89020cad11 100644
--- a/com.discord/smali_classes2/rx/internal/a/au$c$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/au$c$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bMY:Lrx/internal/a/au$c;
+.field final synthetic bNt:Lrx/internal/a/au$c;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/au$c;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/au$c$1;->bMY:Lrx/internal/a/au$c;
+    iput-object p1, p0, Lrx/internal/a/au$c$1;->bNt:Lrx/internal/a/au$c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/au$c$1;->bMY:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$c$1;->bNt:Lrx/internal/a/au$c;
 
     monitor-enter v0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/au$c$2.smali b/com.discord/smali_classes2/rx/internal/a/au$c$2.smali
index 9f4dd964ad..21159060df 100644
--- a/com.discord/smali_classes2/rx/internal/a/au$c$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/au$c$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bMY:Lrx/internal/a/au$c;
+.field final synthetic bNt:Lrx/internal/a/au$c;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/au$c;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/au$c$2;->bMY:Lrx/internal/a/au$c;
+    iput-object p1, p0, Lrx/internal/a/au$c$2;->bNt:Lrx/internal/a/au$c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,7 +43,7 @@
 
     if-lez v2, :cond_1
 
-    iget-object v2, p0, Lrx/internal/a/au$c$2;->bMY:Lrx/internal/a/au$c;
+    iget-object v2, p0, Lrx/internal/a/au$c$2;->bNt:Lrx/internal/a/au$c;
 
     monitor-enter v2
 
diff --git a/com.discord/smali_classes2/rx/internal/a/au$c.smali b/com.discord/smali_classes2/rx/internal/a/au$c.smali
index 0199330730..4c88bbe3ef 100644
--- a/com.discord/smali_classes2/rx/internal/a/au$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/au$c.smali
@@ -26,15 +26,15 @@
 
 
 # static fields
-.field static final bMX:Ljava/lang/Throwable;
+.field static final bNs:Ljava/lang/Throwable;
 
 
 # instance fields
-.field final bKD:Ljava/util/concurrent/atomic/AtomicLong;
+.field final bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field volatile bMV:Z
+.field volatile bNq:Z
 
-.field bMW:Z
+.field bNr:Z
 
 .field final child:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -80,7 +80,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/Throwable;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/a/au$c;->bMX:Ljava/lang/Throwable;
+    sput-object v0, Lrx/internal/a/au$c;->bNs:Ljava/lang/Throwable;
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 
     invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/au$c;->bKD:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lrx/internal/a/au$c;->bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
     new-instance p1, Lrx/internal/util/a/f;
 
@@ -203,7 +203,7 @@
 
     iget-object v0, p0, Lrx/internal/a/au$c;->error:Ljava/lang/Throwable;
 
-    sget-object v1, Lrx/internal/a/au$c;->bMX:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/a/au$c;->bNs:Ljava/lang/Throwable;
 
     const/4 v2, 0x0
 
@@ -285,7 +285,7 @@
     :cond_0
     iput-boolean v1, v8, Lrx/internal/a/au$c;->emitting:Z
 
-    iget-boolean v0, v8, Lrx/internal/a/au$c;->bMW:Z
+    iget-boolean v0, v8, Lrx/internal/a/au$c;->bNr:Z
 
     iget-wide v1, v8, Lrx/internal/a/au$c;->requested:J
 
@@ -293,7 +293,7 @@
 
     if-eqz v3, :cond_1
 
-    sget-object v4, Lrx/internal/a/au$c;->bMX:Ljava/lang/Throwable;
+    sget-object v4, Lrx/internal/a/au$c;->bNs:Ljava/lang/Throwable;
 
     if-eq v3, v4, :cond_1
 
@@ -301,7 +301,7 @@
 
     if-nez v4, :cond_1
 
-    sget-object v4, Lrx/internal/a/au$c;->bMX:Ljava/lang/Throwable;
+    sget-object v4, Lrx/internal/a/au$c;->bNs:Ljava/lang/Throwable;
 
     iput-object v4, v8, Lrx/internal/a/au$c;->error:Ljava/lang/Throwable;
 
@@ -312,11 +312,11 @@
 
     iget-object v9, v8, Lrx/internal/a/au$c;->queue:Lrx/internal/util/a/f;
 
-    iget-object v10, v8, Lrx/internal/a/au$c;->bKD:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v10, v8, Lrx/internal/a/au$c;->bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
     iget-object v11, v8, Lrx/internal/a/au$c;->child:Lrx/Subscriber;
 
-    iget-boolean v4, v8, Lrx/internal/a/au$c;->bMV:Z
+    iget-boolean v4, v8, Lrx/internal/a/au$c;->bNq:Z
 
     move-wide v12, v1
 
@@ -419,7 +419,7 @@
     return-void
 
     :cond_6
-    iget-boolean v2, v8, Lrx/internal/a/au$c;->bMV:Z
+    iget-boolean v2, v8, Lrx/internal/a/au$c;->bNq:Z
 
     invoke-virtual {v9}, Lrx/internal/util/a/f;->isEmpty()Z
 
@@ -477,15 +477,15 @@
     :cond_9
     iput-boolean v1, v8, Lrx/internal/a/au$c;->missed:Z
 
-    iget-boolean v15, v8, Lrx/internal/a/au$c;->bMV:Z
+    iget-boolean v15, v8, Lrx/internal/a/au$c;->bNq:Z
 
-    iget-boolean v0, v8, Lrx/internal/a/au$c;->bMW:Z
+    iget-boolean v0, v8, Lrx/internal/a/au$c;->bNr:Z
 
     iget-object v14, v8, Lrx/internal/a/au$c;->error:Ljava/lang/Throwable;
 
     if-eqz v14, :cond_a
 
-    sget-object v1, Lrx/internal/a/au$c;->bMX:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/a/au$c;->bNs:Ljava/lang/Throwable;
 
     if-eq v14, v1, :cond_a
 
@@ -493,7 +493,7 @@
 
     if-nez v1, :cond_a
 
-    sget-object v1, Lrx/internal/a/au$c;->bMX:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/a/au$c;->bNs:Ljava/lang/Throwable;
 
     iput-object v1, v8, Lrx/internal/a/au$c;->error:Ljava/lang/Throwable;
 
@@ -533,7 +533,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/au$c;->bMV:Z
+    iput-boolean v0, p0, Lrx/internal/a/au$c;->bNq:Z
 
     invoke-virtual {p0}, Lrx/internal/a/au$c;->drain()V
 
@@ -558,7 +558,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/au$c;->bMV:Z
+    iput-boolean p1, p0, Lrx/internal/a/au$c;->bNq:Z
 
     invoke-virtual {p0}, Lrx/internal/a/au$c;->drain()V
 
@@ -585,7 +585,7 @@
 
     check-cast p1, Lrx/Observable;
 
-    iget-object v0, p0, Lrx/internal/a/au$c;->bKD:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/au$c;->bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
 
@@ -593,9 +593,9 @@
 
     iget-object v2, p0, Lrx/internal/a/au$c;->serial:Lrx/subscriptions/SerialSubscription;
 
-    iget-object v2, v2, Lrx/subscriptions/SerialSubscription;->bRB:Lrx/internal/d/a;
+    iget-object v2, v2, Lrx/subscriptions/SerialSubscription;->bRW:Lrx/internal/d/a;
 
-    invoke-virtual {v2}, Lrx/internal/d/a;->La()Lrx/Subscription;
+    invoke-virtual {v2}, Lrx/internal/d/a;->KO()Lrx/Subscription;
 
     move-result-object v2
 
@@ -613,7 +613,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/au$c;->bMW:Z
+    iput-boolean v0, p0, Lrx/internal/a/au$c;->bNr:Z
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/au.smali b/com.discord/smali_classes2/rx/internal/a/au.smali
index 80f7081fff..286f538267 100644
--- a/com.discord/smali_classes2/rx/internal/a/au.smali
+++ b/com.discord/smali_classes2/rx/internal/a/au.smali
@@ -46,7 +46,7 @@
     return-void
 .end method
 
-.method public static KS()Lrx/internal/a/au;
+.method public static KG()Lrx/internal/a/au;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/au$a;->bMT:Lrx/internal/a/au;
+    sget-object v0, Lrx/internal/a/au$a;->bNo:Lrx/internal/a/au;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/av$1$1.smali b/com.discord/smali_classes2/rx/internal/a/av$1$1.smali
index 4262425343..f39824f514 100644
--- a/com.discord/smali_classes2/rx/internal/a/av$1$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/av$1$1.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field final synthetic bNa:Lrx/Producer;
+.field final synthetic bNv:Lrx/Producer;
 
-.field final synthetic bNb:Lrx/internal/a/av$1;
+.field final synthetic bNw:Lrx/internal/a/av$1;
 
 .field final requested:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -29,9 +29,9 @@
 .method constructor <init>(Lrx/internal/a/av$1;Lrx/Producer;)V
     .locals 2
 
-    iput-object p1, p0, Lrx/internal/a/av$1$1;->bNb:Lrx/internal/a/av$1;
+    iput-object p1, p0, Lrx/internal/a/av$1$1;->bNw:Lrx/internal/a/av$1;
 
-    iput-object p2, p0, Lrx/internal/a/av$1$1;->bNa:Lrx/Producer;
+    iput-object p2, p0, Lrx/internal/a/av$1$1;->bNv:Lrx/Producer;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,9 +57,9 @@
 
     if-lez v2, :cond_1
 
-    iget-object v2, p0, Lrx/internal/a/av$1$1;->bNb:Lrx/internal/a/av$1;
+    iget-object v2, p0, Lrx/internal/a/av$1$1;->bNw:Lrx/internal/a/av$1;
 
-    iget-boolean v2, v2, Lrx/internal/a/av$1;->byh:Z
+    iget-boolean v2, v2, Lrx/internal/a/av$1;->byB:Z
 
     if-nez v2, :cond_1
 
@@ -70,9 +70,9 @@
 
     move-result-wide v2
 
-    iget-object v4, p0, Lrx/internal/a/av$1$1;->bNb:Lrx/internal/a/av$1;
+    iget-object v4, p0, Lrx/internal/a/av$1$1;->bNw:Lrx/internal/a/av$1;
 
-    iget-object v4, v4, Lrx/internal/a/av$1;->bMZ:Lrx/internal/a/av;
+    iget-object v4, v4, Lrx/internal/a/av$1;->bNu:Lrx/internal/a/av;
 
     iget v4, v4, Lrx/internal/a/av;->limit:I
 
@@ -98,7 +98,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p0, Lrx/internal/a/av$1$1;->bNa:Lrx/Producer;
+    iget-object p1, p0, Lrx/internal/a/av$1$1;->bNv:Lrx/Producer;
 
     invoke-interface {p1, v4, v5}, Lrx/Producer;->request(J)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/av$1.smali b/com.discord/smali_classes2/rx/internal/a/av$1.smali
index 57aad9c0a8..afaa6bc8e7 100644
--- a/com.discord/smali_classes2/rx/internal/a/av$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/av$1.smali
@@ -22,11 +22,11 @@
 
 
 # instance fields
-.field final synthetic bKa:Lrx/Subscriber;
+.field final synthetic bKv:Lrx/Subscriber;
 
-.field final synthetic bMZ:Lrx/internal/a/av;
+.field final synthetic bNu:Lrx/internal/a/av;
 
-.field byh:Z
+.field byB:Z
 
 .field count:I
 
@@ -35,9 +35,9 @@
 .method constructor <init>(Lrx/internal/a/av;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/av$1;->bMZ:Lrx/internal/a/av;
+    iput-object p1, p0, Lrx/internal/a/av$1;->bNu:Lrx/internal/a/av;
 
-    iput-object p2, p0, Lrx/internal/a/av$1;->bKa:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/av$1;->bKv:Lrx/Subscriber;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -49,15 +49,15 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-boolean v0, p0, Lrx/internal/a/av$1;->byh:Z
+    iget-boolean v0, p0, Lrx/internal/a/av$1;->byB:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/av$1;->byh:Z
+    iput-boolean v0, p0, Lrx/internal/a/av$1;->byB:Z
 
-    iget-object v0, p0, Lrx/internal/a/av$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/av$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -68,16 +68,16 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-boolean v0, p0, Lrx/internal/a/av$1;->byh:Z
+    iget-boolean v0, p0, Lrx/internal/a/av$1;->byB:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/av$1;->byh:Z
+    iput-boolean v0, p0, Lrx/internal/a/av$1;->byB:Z
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/av$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/av$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
     :try_end_0
@@ -118,7 +118,7 @@
 
     iput v1, p0, Lrx/internal/a/av$1;->count:I
 
-    iget-object v1, p0, Lrx/internal/a/av$1;->bMZ:Lrx/internal/a/av;
+    iget-object v1, p0, Lrx/internal/a/av$1;->bNu:Lrx/internal/a/av;
 
     iget v1, v1, Lrx/internal/a/av;->limit:I
 
@@ -126,7 +126,7 @@
 
     iget v0, p0, Lrx/internal/a/av$1;->count:I
 
-    iget-object v1, p0, Lrx/internal/a/av$1;->bMZ:Lrx/internal/a/av;
+    iget-object v1, p0, Lrx/internal/a/av$1;->bNu:Lrx/internal/a/av;
 
     iget v1, v1, Lrx/internal/a/av;->limit:I
 
@@ -142,20 +142,20 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lrx/internal/a/av$1;->bKa:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/av$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v1, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
     if-eqz v0, :cond_1
 
-    iget-boolean p1, p0, Lrx/internal/a/av$1;->byh:Z
+    iget-boolean p1, p0, Lrx/internal/a/av$1;->byB:Z
 
     if-nez p1, :cond_1
 
-    iput-boolean v2, p0, Lrx/internal/a/av$1;->byh:Z
+    iput-boolean v2, p0, Lrx/internal/a/av$1;->byB:Z
 
     :try_start_0
-    iget-object p1, p0, Lrx/internal/a/av$1;->bKa:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/av$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {p1}, Lrx/Subscriber;->onCompleted()V
     :try_end_0
@@ -179,7 +179,7 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/av$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/av$1;->bKv:Lrx/Subscriber;
 
     new-instance v1, Lrx/internal/a/av$1$1;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/aw$1.smali b/com.discord/smali_classes2/rx/internal/a/aw$1.smali
index e0cdd6537a..da439d32cc 100644
--- a/com.discord/smali_classes2/rx/internal/a/aw$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aw$1.smali
@@ -22,18 +22,18 @@
 
 
 # instance fields
-.field final synthetic bNd:Lrx/Subscriber;
+.field final synthetic bNy:Lrx/Subscriber;
 
-.field final synthetic bNe:Lrx/internal/a/aw;
+.field final synthetic bNz:Lrx/internal/a/aw;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/aw;Lrx/Subscriber;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/aw$1;->bNe:Lrx/internal/a/aw;
+    iput-object p1, p0, Lrx/internal/a/aw$1;->bNz:Lrx/internal/a/aw;
 
-    iput-object p3, p0, Lrx/internal/a/aw$1;->bNd:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/aw$1;->bNy:Lrx/Subscriber;
 
     const/4 p1, 0x0
 
@@ -48,13 +48,13 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/aw$1;->bNd:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bNy:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lrx/internal/a/aw$1;->bNd:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bNy:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
 
@@ -63,7 +63,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/aw$1;->bNd:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/aw$1;->bNy:Lrx/Subscriber;
 
     invoke-virtual {v1}, Lrx/Subscriber;->unsubscribe()V
 
@@ -74,13 +74,13 @@
     .locals 1
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/aw$1;->bNd:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bNy:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lrx/internal/a/aw$1;->bNd:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/aw$1;->bNy:Lrx/Subscriber;
 
     invoke-virtual {p1}, Lrx/Subscriber;->unsubscribe()V
 
@@ -89,7 +89,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lrx/internal/a/aw$1;->bNd:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bNy:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
 
@@ -104,7 +104,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/aw$1;->bNd:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bNy:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/aw$2.smali b/com.discord/smali_classes2/rx/internal/a/aw$2.smali
index b09e52637f..a1fecbb2f6 100644
--- a/com.discord/smali_classes2/rx/internal/a/aw$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aw$2.smali
@@ -22,18 +22,18 @@
 
 
 # instance fields
-.field final synthetic bNe:Lrx/internal/a/aw;
+.field final synthetic bNA:Lrx/Subscriber;
 
-.field final synthetic bNf:Lrx/Subscriber;
+.field final synthetic bNz:Lrx/internal/a/aw;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/aw;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/aw$2;->bNe:Lrx/internal/a/aw;
+    iput-object p1, p0, Lrx/internal/a/aw$2;->bNz:Lrx/internal/a/aw;
 
-    iput-object p2, p0, Lrx/internal/a/aw$2;->bNf:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/aw$2;->bNA:Lrx/Subscriber;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -45,7 +45,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/aw$2;->bNf:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$2;->bNA:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -55,7 +55,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/aw$2;->bNf:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$2;->bNA:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/aw.smali b/com.discord/smali_classes2/rx/internal/a/aw.smali
index cbf64c4271..5975ad76d5 100644
--- a/com.discord/smali_classes2/rx/internal/a/aw.smali
+++ b/com.discord/smali_classes2/rx/internal/a/aw.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field private final bNc:Lrx/Observable;
+.field private final bNx:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -45,7 +45,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/aw;->bNc:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/aw;->bNx:Lrx/Observable;
 
     return-void
 .end method
@@ -77,7 +77,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/aw;->bNc:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/aw;->bNx:Lrx/Observable;
 
     invoke-virtual {p1, v2}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ax$1.smali b/com.discord/smali_classes2/rx/internal/a/ax$1.smali
index 211328dbc2..8b498d4e44 100644
--- a/com.discord/smali_classes2/rx/internal/a/ax$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ax$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bNh:Lrx/internal/a/ax$a;
+.field final synthetic bNC:Lrx/internal/a/ax$a;
 
-.field final synthetic bNi:Lrx/internal/a/ax;
+.field final synthetic bND:Lrx/internal/a/ax;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/ax;Lrx/internal/a/ax$a;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ax$1;->bNi:Lrx/internal/a/ax;
+    iput-object p1, p0, Lrx/internal/a/ax$1;->bND:Lrx/internal/a/ax;
 
-    iput-object p2, p0, Lrx/internal/a/ax$1;->bNh:Lrx/internal/a/ax$a;
+    iput-object p2, p0, Lrx/internal/a/ax$1;->bNC:Lrx/internal/a/ax$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final request(J)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ax$1;->bNh:Lrx/internal/a/ax$a;
+    iget-object v0, p0, Lrx/internal/a/ax$1;->bNC:Lrx/internal/a/ax$a;
 
     invoke-virtual {v0, p1, p2}, Lrx/internal/a/ax$a;->aV(J)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ax$a.smali b/com.discord/smali_classes2/rx/internal/a/ax$a.smali
index 89d859e162..1299546505 100644
--- a/com.discord/smali_classes2/rx/internal/a/ax$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ax$a.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field final synthetic bNi:Lrx/internal/a/ax;
+.field final synthetic bND:Lrx/internal/a/ax;
 
 .field private final child:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -47,7 +47,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lrx/internal/a/ax$a;->bNi:Lrx/internal/a/ax;
+    iput-object p1, p0, Lrx/internal/a/ax$a;->bND:Lrx/internal/a/ax;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -111,9 +111,9 @@
     const/4 v0, 0x1
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/ax$a;->bNi:Lrx/internal/a/ax;
+    iget-object v1, p0, Lrx/internal/a/ax$a;->bND:Lrx/internal/a/ax;
 
-    iget-object v1, v1, Lrx/internal/a/ax;->bNg:Lrx/functions/b;
+    iget-object v1, v1, Lrx/internal/a/ax;->bNB:Lrx/functions/b;
 
     invoke-interface {v1, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ax.smali b/com.discord/smali_classes2/rx/internal/a/ax.smali
index 992eeb2983..1623fc5ded 100644
--- a/com.discord/smali_classes2/rx/internal/a/ax.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ax.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field final bNg:Lrx/functions/b;
+.field final bNB:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -53,7 +53,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ax;->bNg:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/ax;->bNB:Lrx/functions/b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/ay$1.smali b/com.discord/smali_classes2/rx/internal/a/ay$1.smali
index 77b9016ae7..cbe140e424 100644
--- a/com.discord/smali_classes2/rx/internal/a/ay$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ay$1.smali
@@ -29,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic bNj:Lrx/functions/b;
+.field final synthetic bNE:Lrx/functions/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ay$1;->bNj:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/ay$1;->bNE:Lrx/functions/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,7 +48,7 @@
 .method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    iget-object p2, p0, Lrx/internal/a/ay$1;->bNj:Lrx/functions/b;
+    iget-object p2, p0, Lrx/internal/a/ay$1;->bNE:Lrx/functions/b;
 
     invoke-interface {p2, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ay$2.smali b/com.discord/smali_classes2/rx/internal/a/ay$2.smali
index 2a6628c034..53dac76727 100644
--- a/com.discord/smali_classes2/rx/internal/a/ay$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ay$2.smali
@@ -22,11 +22,11 @@
 
 
 # instance fields
-.field final synthetic bKq:Lrx/Subscriber;
+.field final synthetic bKL:Lrx/Subscriber;
 
-.field final synthetic bNk:Lrx/internal/a/ay;
+.field final synthetic bNF:Lrx/internal/a/ay;
 
-.field private blN:I
+.field private bmh:I
 
 .field private done:Z
 
@@ -35,9 +35,9 @@
 .method constructor <init>(Lrx/internal/a/ay;Lrx/Subscriber;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ay$2;->bNk:Lrx/internal/a/ay;
+    iput-object p1, p0, Lrx/internal/a/ay$2;->bNF:Lrx/internal/a/ay;
 
-    iput-object p3, p0, Lrx/internal/a/ay$2;->bKq:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ay$2;->bKL:Lrx/Subscriber;
 
     const/4 p1, 0x0
 
@@ -55,7 +55,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ay$2;->bKq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->bKL:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -70,7 +70,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ay$2;->bKq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->bKL:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -89,15 +89,15 @@
     const/4 v0, 0x1
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/ay$2;->bNk:Lrx/internal/a/ay;
+    iget-object v1, p0, Lrx/internal/a/ay$2;->bNF:Lrx/internal/a/ay;
 
-    iget-object v1, v1, Lrx/internal/a/ay;->bMJ:Lrx/functions/Func2;
+    iget-object v1, v1, Lrx/internal/a/ay;->bNe:Lrx/functions/Func2;
 
-    iget v2, p0, Lrx/internal/a/ay$2;->blN:I
+    iget v2, p0, Lrx/internal/a/ay$2;->bmh:I
 
     add-int/lit8 v3, v2, 0x1
 
-    iput v3, p0, Lrx/internal/a/ay$2;->blN:I
+    iput v3, p0, Lrx/internal/a/ay$2;->bmh:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -117,7 +117,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ay$2;->bKq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->bKL:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
@@ -126,7 +126,7 @@
     :cond_0
     iput-boolean v0, p0, Lrx/internal/a/ay$2;->done:Z
 
-    iget-object p1, p0, Lrx/internal/a/ay$2;->bKq:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/ay$2;->bKL:Lrx/Subscriber;
 
     invoke-virtual {p1}, Lrx/Subscriber;->onCompleted()V
 
@@ -139,7 +139,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ay$2;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/ay$2;->bKq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->bKL:Lrx/Subscriber;
 
     invoke-static {v1, v0, p1}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ay.smali b/com.discord/smali_classes2/rx/internal/a/ay.smali
index 2197dd9380..c4cc411aed 100644
--- a/com.discord/smali_classes2/rx/internal/a/ay.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ay.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field final bMJ:Lrx/functions/Func2;
+.field final bNe:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -49,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ay;->bMJ:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/internal/a/ay;->bNe:Lrx/functions/Func2;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/az$1.smali b/com.discord/smali_classes2/rx/internal/a/az$1.smali
index eb13457a85..be387175bb 100644
--- a/com.discord/smali_classes2/rx/internal/a/az$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/az$1.smali
@@ -22,9 +22,9 @@
 
 
 # instance fields
-.field final synthetic bKq:Lrx/Subscriber;
+.field final synthetic bKL:Lrx/Subscriber;
 
-.field final synthetic bNl:Lrx/internal/a/az;
+.field final synthetic bNG:Lrx/internal/a/az;
 
 .field private lastOnNext:J
 
@@ -33,9 +33,9 @@
 .method constructor <init>(Lrx/internal/a/az;Lrx/Subscriber;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/az$1;->bNl:Lrx/internal/a/az;
+    iput-object p1, p0, Lrx/internal/a/az$1;->bNG:Lrx/internal/a/az;
 
-    iput-object p3, p0, Lrx/internal/a/az$1;->bKq:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/az$1;->bKL:Lrx/Subscriber;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -51,7 +51,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/az$1;->bKq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/az$1;->bKL:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -61,7 +61,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/az$1;->bKq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/az$1;->bKL:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -94,7 +94,7 @@
 
     sub-long v2, v0, v2
 
-    iget-object v4, p0, Lrx/internal/a/az$1;->bNl:Lrx/internal/a/az;
+    iget-object v4, p0, Lrx/internal/a/az$1;->bNG:Lrx/internal/a/az;
 
     iget-wide v4, v4, Lrx/internal/a/az;->timeInMilliseconds:J
 
@@ -105,7 +105,7 @@
     :cond_0
     iput-wide v0, p0, Lrx/internal/a/az$1;->lastOnNext:J
 
-    iget-object v0, p0, Lrx/internal/a/az$1;->bKq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/az$1;->bKL:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/b$1.smali b/com.discord/smali_classes2/rx/internal/a/b$1.smali
index a95bfe3370..73338fdb57 100644
--- a/com.discord/smali_classes2/rx/internal/a/b$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/b$1.smali
@@ -26,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic bJg:Ljava/lang/Object;
+.field final synthetic bJA:Ljava/lang/Object;
 
-.field final synthetic bJh:Lrx/Observable;
+.field final synthetic bJB:Lrx/Observable;
 
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Object;Lrx/Observable;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/b$1;->bJg:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/b$1;->bJA:Ljava/lang/Object;
 
-    iput-object p2, p0, Lrx/internal/a/b$1;->bJh:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/b$1;->bJB:Lrx/Observable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,11 +58,11 @@
 
     new-instance v0, Lrx/internal/a/b$a;
 
-    iget-object v1, p0, Lrx/internal/a/b$1;->bJg:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$1;->bJA:Ljava/lang/Object;
 
     invoke-direct {v0, v1}, Lrx/internal/a/b$a;-><init>(Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lrx/internal/a/b$1;->bJh:Lrx/Observable;
+    iget-object v1, p0, Lrx/internal/a/b$1;->bJB:Lrx/Observable;
 
     invoke-static {v0, v1}, Lrx/Observable;->a(Lrx/Subscriber;Lrx/Observable;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/b$a$1.smali b/com.discord/smali_classes2/rx/internal/a/b$a$1.smali
index 6f34d3ca12..dd9685de1b 100644
--- a/com.discord/smali_classes2/rx/internal/a/b$a$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/b$a$1.smali
@@ -26,16 +26,16 @@
 
 
 # instance fields
-.field private bJi:Ljava/lang/Object;
+.field private bJC:Ljava/lang/Object;
 
-.field final synthetic bJj:Lrx/internal/a/b$a;
+.field final synthetic bJD:Lrx/internal/a/b$a;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/b$a;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/b$a$1;->bJj:Lrx/internal/a/b$a;
+    iput-object p1, p0, Lrx/internal/a/b$a$1;->bJD:Lrx/internal/a/b$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,13 +47,13 @@
 .method public final hasNext()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/b$a$1;->bJj:Lrx/internal/a/b$a;
+    iget-object v0, p0, Lrx/internal/a/b$a$1;->bJD:Lrx/internal/a/b$a;
 
     iget-object v0, v0, Lrx/internal/a/b$a;->value:Ljava/lang/Object;
 
-    iput-object v0, p0, Lrx/internal/a/b$a$1;->bJi:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/b$a$1;->bJC:Ljava/lang/Object;
 
-    iget-object v0, p0, Lrx/internal/a/b$a$1;->bJi:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/b$a$1;->bJC:Ljava/lang/Object;
 
     invoke-static {v0}, Lrx/internal/a/g;->bK(Ljava/lang/Object;)Z
 
@@ -82,18 +82,18 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bJi:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bJC:Ljava/lang/Object;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bJj:Lrx/internal/a/b$a;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bJD:Lrx/internal/a/b$a;
 
     iget-object v1, v1, Lrx/internal/a/b$a;->value:Ljava/lang/Object;
 
-    iput-object v1, p0, Lrx/internal/a/b$a$1;->bJi:Ljava/lang/Object;
+    iput-object v1, p0, Lrx/internal/a/b$a$1;->bJC:Ljava/lang/Object;
 
     :cond_0
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bJi:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bJC:Ljava/lang/Object;
 
     invoke-static {v1}, Lrx/internal/a/g;->bK(Ljava/lang/Object;)Z
 
@@ -101,7 +101,7 @@
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bJi:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bJC:Ljava/lang/Object;
 
     invoke-static {v1}, Lrx/internal/a/g;->bL(Ljava/lang/Object;)Z
 
@@ -109,7 +109,7 @@
 
     if-nez v1, :cond_1
 
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bJi:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bJC:Ljava/lang/Object;
 
     invoke-static {v1}, Lrx/internal/a/g;->bN(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -117,13 +117,13 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iput-object v0, p0, Lrx/internal/a/b$a$1;->bJi:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/b$a$1;->bJC:Ljava/lang/Object;
 
     return-object v1
 
     :cond_1
     :try_start_1
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bJi:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bJC:Ljava/lang/Object;
 
     invoke-static {v1}, Lrx/internal/a/g;->bO(Ljava/lang/Object;)Ljava/lang/Throwable;
 
@@ -147,7 +147,7 @@
     :catchall_0
     move-exception v1
 
-    iput-object v0, p0, Lrx/internal/a/b$a$1;->bJi:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/b$a$1;->bJC:Ljava/lang/Object;
 
     throw v1
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/b$a.smali b/com.discord/smali_classes2/rx/internal/a/b$a.smali
index 395871ed1d..b964924087 100644
--- a/com.discord/smali_classes2/rx/internal/a/b$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/b$a.smali
@@ -53,7 +53,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    invoke-static {}, Lrx/internal/a/g;->Ks()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Kg()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ba$1.smali b/com.discord/smali_classes2/rx/internal/a/ba$1.smali
index 2c06dd0e07..3941e1403b 100644
--- a/com.discord/smali_classes2/rx/internal/a/ba$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ba$1.smali
@@ -22,13 +22,13 @@
 
 
 # instance fields
-.field final synthetic bKR:Lrx/internal/b/b;
+.field final synthetic bLm:Lrx/internal/b/b;
 
-.field final synthetic bNm:Lrx/Subscriber;
+.field final synthetic bNH:Lrx/Subscriber;
 
-.field final synthetic bNn:Lrx/internal/a/ba;
+.field final synthetic bNI:Lrx/internal/a/ba;
 
-.field byh:Z
+.field byB:Z
 
 .field list:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
@@ -44,11 +44,11 @@
 .method constructor <init>(Lrx/internal/a/ba;Lrx/internal/b/b;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ba$1;->bNn:Lrx/internal/a/ba;
+    iput-object p1, p0, Lrx/internal/a/ba$1;->bNI:Lrx/internal/a/ba;
 
-    iput-object p2, p0, Lrx/internal/a/ba$1;->bKR:Lrx/internal/b/b;
+    iput-object p2, p0, Lrx/internal/a/ba$1;->bLm:Lrx/internal/b/b;
 
-    iput-object p3, p0, Lrx/internal/a/ba$1;->bNm:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ba$1;->bNH:Lrx/Subscriber;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -66,13 +66,13 @@
 .method public final onCompleted()V
     .locals 2
 
-    iget-boolean v0, p0, Lrx/internal/a/ba$1;->byh:Z
+    iget-boolean v0, p0, Lrx/internal/a/ba$1;->byB:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/ba$1;->byh:Z
+    iput-boolean v0, p0, Lrx/internal/a/ba$1;->byB:Z
 
     :try_start_0
     new-instance v0, Ljava/util/ArrayList;
@@ -87,7 +87,7 @@
 
     iput-object v1, p0, Lrx/internal/a/ba$1;->list:Ljava/util/List;
 
-    iget-object v1, p0, Lrx/internal/a/ba$1;->bKR:Lrx/internal/b/b;
+    iget-object v1, p0, Lrx/internal/a/ba$1;->bLm:Lrx/internal/b/b;
 
     invoke-virtual {v1, v0}, Lrx/internal/b/b;->setValue(Ljava/lang/Object;)V
 
@@ -106,7 +106,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/ba$1;->bNm:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ba$1;->bNH:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -121,7 +121,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/ba$1;->byh:Z
+    iget-boolean v0, p0, Lrx/internal/a/ba$1;->byB:Z
 
     if-nez v0, :cond_0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/ba$a.smali b/com.discord/smali_classes2/rx/internal/a/ba$a.smali
index 958abe89a2..948919073d 100644
--- a/com.discord/smali_classes2/rx/internal/a/ba$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ba$a.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final bNo:Lrx/internal/a/ba;
+.field static final bNJ:Lrx/internal/a/ba;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ba<",
@@ -34,7 +34,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/ba;-><init>()V
 
-    sput-object v0, Lrx/internal/a/ba$a;->bNo:Lrx/internal/a/ba;
+    sput-object v0, Lrx/internal/a/ba$a;->bNJ:Lrx/internal/a/ba;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/ba.smali b/com.discord/smali_classes2/rx/internal/a/ba.smali
index e716f00006..ac396c4140 100644
--- a/com.discord/smali_classes2/rx/internal/a/ba.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ba.smali
@@ -35,7 +35,7 @@
     return-void
 .end method
 
-.method public static KT()Lrx/internal/a/ba;
+.method public static KH()Lrx/internal/a/ba;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -47,7 +47,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/ba$a;->bNo:Lrx/internal/a/ba;
+    sget-object v0, Lrx/internal/a/ba$a;->bNJ:Lrx/internal/a/ba;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/bb$1.smali b/com.discord/smali_classes2/rx/internal/a/bb$1.smali
index b22b58260a..ba062f36e4 100644
--- a/com.discord/smali_classes2/rx/internal/a/bb$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bb$1.smali
@@ -26,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic bNs:Lrx/functions/Func2;
+.field final synthetic bNN:Lrx/functions/Func2;
 
-.field final synthetic bNt:Lrx/internal/a/bb;
+.field final synthetic bNO:Lrx/internal/a/bb;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/bb;Lrx/functions/Func2;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/bb$1;->bNt:Lrx/internal/a/bb;
+    iput-object p1, p0, Lrx/internal/a/bb$1;->bNO:Lrx/internal/a/bb;
 
-    iput-object p2, p0, Lrx/internal/a/bb$1;->bNs:Lrx/functions/Func2;
+    iput-object p2, p0, Lrx/internal/a/bb$1;->bNN:Lrx/functions/Func2;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,7 +54,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/bb$1;->bNs:Lrx/functions/Func2;
+    iget-object v0, p0, Lrx/internal/a/bb$1;->bNN: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/rx/internal/a/bb$2.smali b/com.discord/smali_classes2/rx/internal/a/bb$2.smali
index c9f1e82f00..4e155371e6 100644
--- a/com.discord/smali_classes2/rx/internal/a/bb$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bb$2.smali
@@ -22,13 +22,13 @@
 
 
 # instance fields
-.field final synthetic bKR:Lrx/internal/b/b;
+.field final synthetic bKv:Lrx/Subscriber;
 
-.field final synthetic bKa:Lrx/Subscriber;
+.field final synthetic bLm:Lrx/internal/b/b;
 
-.field final synthetic bNt:Lrx/internal/a/bb;
+.field final synthetic bNO:Lrx/internal/a/bb;
 
-.field byh:Z
+.field byB:Z
 
 .field list:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
@@ -44,19 +44,19 @@
 .method constructor <init>(Lrx/internal/a/bb;Lrx/internal/b/b;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/bb$2;->bNt:Lrx/internal/a/bb;
+    iput-object p1, p0, Lrx/internal/a/bb$2;->bNO:Lrx/internal/a/bb;
 
-    iput-object p2, p0, Lrx/internal/a/bb$2;->bKR:Lrx/internal/b/b;
+    iput-object p2, p0, Lrx/internal/a/bb$2;->bLm:Lrx/internal/b/b;
 
-    iput-object p3, p0, Lrx/internal/a/bb$2;->bKa:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/bb$2;->bKv:Lrx/Subscriber;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
     new-instance p1, Ljava/util/ArrayList;
 
-    iget-object p2, p0, Lrx/internal/a/bb$2;->bNt:Lrx/internal/a/bb;
+    iget-object p2, p0, Lrx/internal/a/bb$2;->bNO:Lrx/internal/a/bb;
 
-    iget p2, p2, Lrx/internal/a/bb;->bNq:I
+    iget p2, p2, Lrx/internal/a/bb;->bNL:I
 
     invoke-direct {p1, p2}, Ljava/util/ArrayList;-><init>(I)V
 
@@ -70,13 +70,13 @@
 .method public final onCompleted()V
     .locals 2
 
-    iget-boolean v0, p0, Lrx/internal/a/bb$2;->byh:Z
+    iget-boolean v0, p0, Lrx/internal/a/bb$2;->byB:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/bb$2;->byh:Z
+    iput-boolean v0, p0, Lrx/internal/a/bb$2;->byB:Z
 
     iget-object v0, p0, Lrx/internal/a/bb$2;->list:Ljava/util/List;
 
@@ -85,15 +85,15 @@
     iput-object v1, p0, Lrx/internal/a/bb$2;->list:Ljava/util/List;
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/bb$2;->bNt:Lrx/internal/a/bb;
+    iget-object v1, p0, Lrx/internal/a/bb$2;->bNO:Lrx/internal/a/bb;
 
-    iget-object v1, v1, Lrx/internal/a/bb;->bNp:Ljava/util/Comparator;
+    iget-object v1, v1, Lrx/internal/a/bb;->bNK: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, Lrx/internal/a/bb$2;->bKR:Lrx/internal/b/b;
+    iget-object v1, p0, Lrx/internal/a/bb$2;->bLm:Lrx/internal/b/b;
 
     invoke-virtual {v1, v0}, Lrx/internal/b/b;->setValue(Ljava/lang/Object;)V
 
@@ -112,7 +112,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/bb$2;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/bb$2;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -127,7 +127,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/bb$2;->byh:Z
+    iget-boolean v0, p0, Lrx/internal/a/bb$2;->byB:Z
 
     if-nez v0, :cond_0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/bb.smali b/com.discord/smali_classes2/rx/internal/a/bb.smali
index 1f50927bf2..9b9697d672 100644
--- a/com.discord/smali_classes2/rx/internal/a/bb.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bb.smali
@@ -27,11 +27,11 @@
 
 
 # static fields
-.field private static final bNr:Ljava/util/Comparator;
+.field private static final bNM:Ljava/util/Comparator;
 
 
 # instance fields
-.field final bNp:Ljava/util/Comparator;
+.field final bNK:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field final bNq:I
+.field final bNL:I
 
 
 # direct methods
@@ -51,7 +51,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/bb$a;-><init>()V
 
-    sput-object v0, Lrx/internal/a/bb;->bNr:Ljava/util/Comparator;
+    sput-object v0, Lrx/internal/a/bb;->bNM:Ljava/util/Comparator;
 
     return-void
 .end method
@@ -61,13 +61,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lrx/internal/a/bb;->bNr:Ljava/util/Comparator;
+    sget-object v0, Lrx/internal/a/bb;->bNM:Ljava/util/Comparator;
 
-    iput-object v0, p0, Lrx/internal/a/bb;->bNp:Ljava/util/Comparator;
+    iput-object v0, p0, Lrx/internal/a/bb;->bNK:Ljava/util/Comparator;
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lrx/internal/a/bb;->bNq:I
+    iput v0, p0, Lrx/internal/a/bb;->bNL:I
 
     return-void
 .end method
@@ -88,13 +88,13 @@
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lrx/internal/a/bb;->bNq:I
+    iput v0, p0, Lrx/internal/a/bb;->bNL:I
 
     new-instance v0, Lrx/internal/a/bb$1;
 
     invoke-direct {v0, p0, p1}, Lrx/internal/a/bb$1;-><init>(Lrx/internal/a/bb;Lrx/functions/Func2;)V
 
-    iput-object v0, p0, Lrx/internal/a/bb;->bNp:Ljava/util/Comparator;
+    iput-object v0, p0, Lrx/internal/a/bb;->bNK:Ljava/util/Comparator;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/bc$a$a.smali b/com.discord/smali_classes2/rx/internal/a/bc$a$a.smali
index 6db7dd5e39..c8b515ab9c 100644
--- a/com.discord/smali_classes2/rx/internal/a/bc$a$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bc$a$a.smali
@@ -15,24 +15,24 @@
 
 
 # instance fields
-.field final bNv:Lrx/internal/util/i;
+.field final bNQ:Lrx/internal/util/i;
 
-.field final synthetic bNw:Lrx/internal/a/bc$a;
+.field final synthetic bNR:Lrx/internal/a/bc$a;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/bc$a;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/bc$a$a;->bNw:Lrx/internal/a/bc$a;
+    iput-object p1, p0, Lrx/internal/a/bc$a$a;->bNR:Lrx/internal/a/bc$a;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    invoke-static {}, Lrx/internal/util/i;->Lf()Lrx/internal/util/i;
+    invoke-static {}, Lrx/internal/util/i;->KT()Lrx/internal/util/i;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/a/bc$a$a;->bNv:Lrx/internal/util/i;
+    iput-object p1, p0, Lrx/internal/a/bc$a$a;->bNQ:Lrx/internal/util/i;
 
     return-void
 .end method
@@ -50,20 +50,20 @@
 .method public final onCompleted()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bNv:Lrx/internal/util/i;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bNQ:Lrx/internal/util/i;
 
-    iget-object v1, v0, Lrx/internal/util/i;->bPv:Ljava/lang/Object;
+    iget-object v1, v0, Lrx/internal/util/i;->bPQ:Ljava/lang/Object;
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lrx/internal/a/g;->Ks()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Kg()Ljava/lang/Object;
 
     move-result-object v1
 
-    iput-object v1, v0, Lrx/internal/util/i;->bPv:Ljava/lang/Object;
+    iput-object v1, v0, Lrx/internal/util/i;->bPQ:Ljava/lang/Object;
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bNw:Lrx/internal/a/bc$a;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bNR:Lrx/internal/a/bc$a;
 
     invoke-virtual {v0}, Lrx/internal/a/bc$a;->tick()V
 
@@ -73,7 +73,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bNw:Lrx/internal/a/bc$a;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bNR:Lrx/internal/a/bc$a;
 
     iget-object v0, v0, Lrx/internal/a/bc$a;->child:Lrx/e;
 
@@ -86,7 +86,7 @@
     .locals 1
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bNv:Lrx/internal/util/i;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bNQ:Lrx/internal/util/i;
 
     invoke-virtual {v0, p1}, Lrx/internal/util/i;->onNext(Ljava/lang/Object;)V
     :try_end_0
@@ -100,7 +100,7 @@
     invoke-virtual {p0, p1}, Lrx/internal/a/bc$a$a;->onError(Ljava/lang/Throwable;)V
 
     :goto_0
-    iget-object p1, p0, Lrx/internal/a/bc$a$a;->bNw:Lrx/internal/a/bc$a;
+    iget-object p1, p0, Lrx/internal/a/bc$a$a;->bNR:Lrx/internal/a/bc$a;
 
     invoke-virtual {p1}, Lrx/internal/a/bc$a;->tick()V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/bc$a.smali b/com.discord/smali_classes2/rx/internal/a/bc$a.smali
index d9746a5a27..71fde1f934 100644
--- a/com.discord/smali_classes2/rx/internal/a/bc$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bc$a.smali
@@ -30,7 +30,7 @@
 
 
 # static fields
-.field static final bNu:I
+.field static final bNP:I
 
 .field private static final serialVersionUID:J = 0x53337eae55d8937dL
 
@@ -79,7 +79,7 @@
 
     double-to-int v0, v0
 
-    sput v0, Lrx/internal/a/bc$a;->bNu:I
+    sput v0, Lrx/internal/a/bc$a;->bNP:I
 
     return-void
 .end method
@@ -162,7 +162,7 @@
 
     check-cast v11, Lrx/internal/a/bc$a$a;
 
-    iget-object v11, v11, Lrx/internal/a/bc$a$a;->bNv:Lrx/internal/util/i;
+    iget-object v11, v11, Lrx/internal/a/bc$a$a;->bNQ:Lrx/internal/util/i;
 
     invoke-virtual {v11}, Lrx/internal/util/i;->peek()Ljava/lang/Object;
 
@@ -242,7 +242,7 @@
 
     check-cast v9, Lrx/internal/a/bc$a$a;
 
-    iget-object v9, v9, Lrx/internal/a/bc$a$a;->bNv:Lrx/internal/util/i;
+    iget-object v9, v9, Lrx/internal/a/bc$a$a;->bNQ:Lrx/internal/util/i;
 
     invoke-virtual {v9}, Lrx/internal/util/i;->poll()Ljava/lang/Object;
 
@@ -272,7 +272,7 @@
     :cond_6
     iget v6, p0, Lrx/internal/a/bc$a;->emitted:I
 
-    sget v8, Lrx/internal/a/bc$a;->bNu:I
+    sget v8, Lrx/internal/a/bc$a;->bNP:I
 
     if-le v6, v8, :cond_1
 
diff --git a/com.discord/smali_classes2/rx/internal/a/bc$c.smali b/com.discord/smali_classes2/rx/internal/a/bc$c.smali
index 26c9c67f15..9752a75529 100644
--- a/com.discord/smali_classes2/rx/internal/a/bc$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bc$c.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field final bNx:Lrx/internal/a/bc$b;
+.field final bNS:Lrx/internal/a/bc$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/bc$b<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field final synthetic bNy:Lrx/internal/a/bc;
+.field final synthetic bNT:Lrx/internal/a/bc;
 
 .field final child:Lrx/Subscriber;
     .annotation system Ldalvik/annotation/Signature;
@@ -71,7 +71,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lrx/internal/a/bc$c;->bNy:Lrx/internal/a/bc;
+    iput-object p1, p0, Lrx/internal/a/bc$c;->bNT:Lrx/internal/a/bc;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -79,7 +79,7 @@
 
     iput-object p3, p0, Lrx/internal/a/bc$c;->zipper:Lrx/internal/a/bc$a;
 
-    iput-object p4, p0, Lrx/internal/a/bc$c;->bNx:Lrx/internal/a/bc$b;
+    iput-object p4, p0, Lrx/internal/a/bc$c;->bNS:Lrx/internal/a/bc$b;
 
     return-void
 .end method
@@ -131,7 +131,7 @@
 
     iget-object v0, p0, Lrx/internal/a/bc$c;->zipper:Lrx/internal/a/bc$a;
 
-    iget-object v1, p0, Lrx/internal/a/bc$c;->bNx:Lrx/internal/a/bc$b;
+    iget-object v1, p0, Lrx/internal/a/bc$c;->bNS:Lrx/internal/a/bc$b;
 
     array-length v2, p1
 
diff --git a/com.discord/smali_classes2/rx/internal/a/bd$a.smali b/com.discord/smali_classes2/rx/internal/a/bd$a.smali
index d08e6f28cd..07e028f28e 100644
--- a/com.discord/smali_classes2/rx/internal/a/bd$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bd$a.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field final bNA:Lrx/g;
+.field final bNV:Lrx/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/g<",
@@ -58,7 +58,7 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/bd$a;->bNA:Lrx/g;
+    iput-object p1, p0, Lrx/internal/a/bd$a;->bNV:Lrx/g;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/bd$a;->bNA:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/bd$a;->bNV:Lrx/g;
 
     new-instance v1, Ljava/util/NoSuchElementException;
 
@@ -97,7 +97,7 @@
 
     iput-object v1, p0, Lrx/internal/a/bd$a;->value:Ljava/lang/Object;
 
-    iget-object v1, p0, Lrx/internal/a/bd$a;->bNA:Lrx/g;
+    iget-object v1, p0, Lrx/internal/a/bd$a;->bNV:Lrx/g;
 
     invoke-virtual {v1, v0}, Lrx/g;->onSuccess(Ljava/lang/Object;)V
 
@@ -123,7 +123,7 @@
 
     iput-object v0, p0, Lrx/internal/a/bd$a;->value:Ljava/lang/Object;
 
-    iget-object v0, p0, Lrx/internal/a/bd$a;->bNA:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/bd$a;->bNV:Lrx/g;
 
     invoke-virtual {v0, p1}, Lrx/g;->onError(Ljava/lang/Throwable;)V
 
@@ -157,7 +157,7 @@
 
     iput p1, p0, Lrx/internal/a/bd$a;->state:I
 
-    iget-object p1, p0, Lrx/internal/a/bd$a;->bNA:Lrx/g;
+    iget-object p1, p0, Lrx/internal/a/bd$a;->bNV:Lrx/g;
 
     new-instance v0, Ljava/lang/IndexOutOfBoundsException;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/bd.smali b/com.discord/smali_classes2/rx/internal/a/bd.smali
index 51c143187f..8f3e6b1b8c 100644
--- a/com.discord/smali_classes2/rx/internal/a/bd.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bd.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field final bNz:Lrx/Observable$a;
+.field final bNU:Lrx/Observable$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$a<",
@@ -49,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/bd;->bNz:Lrx/Observable$a;
+    iput-object p1, p0, Lrx/internal/a/bd;->bNU:Lrx/Observable$a;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     invoke-virtual {p1, v0}, Lrx/g;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/bd;->bNz:Lrx/Observable$a;
+    iget-object p1, p0, Lrx/internal/a/bd;->bNU:Lrx/Observable$a;
 
     invoke-interface {p1, v0}, Lrx/Observable$a;->call(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/be.smali b/com.discord/smali_classes2/rx/internal/a/be.smali
index 9816ec89fe..7fca291cb7 100644
--- a/com.discord/smali_classes2/rx/internal/a/be.smali
+++ b/com.discord/smali_classes2/rx/internal/a/be.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field final bNB:Lrx/f$a;
+.field final bNW:Lrx/f$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/f$a<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final bNC:Lrx/Observable$b;
+.field final bNX:Lrx/Observable$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$b<",
@@ -60,7 +60,7 @@
     invoke-virtual {p1, v0}, Lrx/g;->add(Lrx/Subscription;)V
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/be;->bNC:Lrx/Observable$b;
+    iget-object v1, p0, Lrx/internal/a/be;->bNX:Lrx/Observable$b;
 
     invoke-static {v1}, Lrx/c/c;->c(Lrx/Observable$b;)Lrx/Observable$b;
 
@@ -80,7 +80,7 @@
 
     invoke-virtual {v0}, Lrx/Subscriber;->onStart()V
 
-    iget-object v0, p0, Lrx/internal/a/be;->bNB:Lrx/f$a;
+    iget-object v0, p0, Lrx/internal/a/be;->bNW:Lrx/f$a;
 
     invoke-interface {v0, v1}, Lrx/f$a;->call(Ljava/lang/Object;)V
     :try_end_0
diff --git a/com.discord/smali_classes2/rx/internal/a/bf.smali b/com.discord/smali_classes2/rx/internal/a/bf.smali
index 972c8167fb..998dfede04 100644
--- a/com.discord/smali_classes2/rx/internal/a/bf.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bf.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field final bNB:Lrx/f$a;
+.field final bNW:Lrx/f$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/f$a<",
@@ -43,7 +43,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/bf;->bNB:Lrx/f$a;
+    iput-object p1, p0, Lrx/internal/a/bf;->bNW:Lrx/f$a;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/bf;->bNB:Lrx/f$a;
+    iget-object p1, p0, Lrx/internal/a/bf;->bNW:Lrx/f$a;
 
     invoke-interface {p1, v0}, Lrx/f$a;->call(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/c$a.smali b/com.discord/smali_classes2/rx/internal/a/c$a.smali
index 575006daa6..8d383d42e1 100644
--- a/com.discord/smali_classes2/rx/internal/a/c$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/c$a.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final bJl:Lrx/internal/a/c;
+.field final bJF:Lrx/internal/a/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/c<",
@@ -41,7 +41,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/c$a;->bJl:Lrx/internal/a/c;
+    iput-object p1, p0, Lrx/internal/a/c$a;->bJF:Lrx/internal/a/c;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
 .method public final request(J)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/c$a;->bJl:Lrx/internal/a/c;
+    iget-object v0, p0, Lrx/internal/a/c$a;->bJF:Lrx/internal/a/c;
 
     invoke-virtual {v0, p1, p2}, Lrx/internal/a/c;->aV(J)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/c.smali b/com.discord/smali_classes2/rx/internal/a/c.smali
index 67cd76c7ff..f1ed90b15d 100644
--- a/com.discord/smali_classes2/rx/internal/a/c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/c.smali
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field final bJk:Ljava/util/concurrent/atomic/AtomicInteger;
+.field final bJE:Ljava/util/concurrent/atomic/AtomicInteger;
 
 .field protected hasValue:Z
 
@@ -65,7 +65,7 @@
 
     invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/c;->bJk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lrx/internal/a/c;->bJE:Ljava/util/concurrent/atomic/AtomicInteger;
 
     return-void
 .end method
@@ -88,7 +88,7 @@
     iget-object p1, p0, Lrx/internal/a/c;->actual:Lrx/Subscriber;
 
     :cond_0
-    iget-object p2, p0, Lrx/internal/a/c;->bJk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lrx/internal/a/c;->bJE:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -115,7 +115,7 @@
 
     if-ne p2, v2, :cond_3
 
-    iget-object p2, p0, Lrx/internal/a/c;->bJk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lrx/internal/a/c;->bJE:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p2, v2, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
 
@@ -139,7 +139,7 @@
     return-void
 
     :cond_3
-    iget-object p2, p0, Lrx/internal/a/c;->bJk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lrx/internal/a/c;->bJE:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/4 v1, 0x0
 
@@ -214,7 +214,7 @@
     iget-object v1, p0, Lrx/internal/a/c;->actual:Lrx/Subscriber;
 
     :cond_0
-    iget-object v2, p0, Lrx/internal/a/c;->bJk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lrx/internal/a/c;->bJE:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -252,7 +252,7 @@
     invoke-virtual {v1}, Lrx/Subscriber;->onCompleted()V
 
     :cond_2
-    iget-object v0, p0, Lrx/internal/a/c;->bJk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lrx/internal/a/c;->bJE:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0, v4}, Ljava/util/concurrent/atomic/AtomicInteger;->lazySet(I)V
 
@@ -261,7 +261,7 @@
     :cond_3
     iput-object v0, p0, Lrx/internal/a/c;->value:Ljava/lang/Object;
 
-    iget-object v2, p0, Lrx/internal/a/c;->bJk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lrx/internal/a/c;->bJE:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/4 v4, 0x0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/e.smali b/com.discord/smali_classes2/rx/internal/a/e.smali
index 702bf8d7bf..f740593054 100644
--- a/com.discord/smali_classes2/rx/internal/a/e.smali
+++ b/com.discord/smali_classes2/rx/internal/a/e.smali
@@ -20,7 +20,9 @@
 
 
 # static fields
-.field static final EMPTY:Lrx/Observable;
+.field public static final enum bJG:Lrx/internal/a/e;
+
+.field static final bJH:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -30,9 +32,7 @@
     .end annotation
 .end field
 
-.field public static final enum bJm:Lrx/internal/a/e;
-
-.field private static final synthetic bJn:[Lrx/internal/a/e;
+.field private static final synthetic bJI:[Lrx/internal/a/e;
 
 
 # direct methods
@@ -45,25 +45,25 @@
 
     invoke-direct {v0, v1}, Lrx/internal/a/e;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/a/e;->bJm:Lrx/internal/a/e;
+    sput-object v0, Lrx/internal/a/e;->bJG:Lrx/internal/a/e;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/a/e;
 
-    sget-object v1, Lrx/internal/a/e;->bJm:Lrx/internal/a/e;
+    sget-object v1, Lrx/internal/a/e;->bJG:Lrx/internal/a/e;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/a/e;->bJn:[Lrx/internal/a/e;
+    sput-object v0, Lrx/internal/a/e;->bJI:[Lrx/internal/a/e;
 
     invoke-static {v1}, Lrx/Observable;->b(Lrx/Observable$a;)Lrx/Observable;
 
     move-result-object v0
 
-    sput-object v0, Lrx/internal/a/e;->EMPTY:Lrx/Observable;
+    sput-object v0, Lrx/internal/a/e;->bJH:Lrx/Observable;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
     return-void
 .end method
 
-.method public static Kr()Lrx/Observable;
+.method public static Kf()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/e;->EMPTY:Lrx/Observable;
+    sget-object v0, Lrx/internal/a/e;->bJH:Lrx/Observable;
 
     return-object v0
 .end method
@@ -117,7 +117,7 @@
 .method public static values()[Lrx/internal/a/e;
     .locals 1
 
-    sget-object v0, Lrx/internal/a/e;->bJn:[Lrx/internal/a/e;
+    sget-object v0, Lrx/internal/a/e;->bJI:[Lrx/internal/a/e;
 
     invoke-virtual {v0}, [Lrx/internal/a/e;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/f.smali b/com.discord/smali_classes2/rx/internal/a/f.smali
index f817a94d29..12f345278f 100644
--- a/com.discord/smali_classes2/rx/internal/a/f.smali
+++ b/com.discord/smali_classes2/rx/internal/a/f.smali
@@ -20,9 +20,9 @@
 
 
 # static fields
-.field public static final enum bJo:Lrx/internal/a/f;
+.field public static final enum bJJ:Lrx/internal/a/f;
 
-.field static final bJp:Lrx/Observable;
+.field static final bJK:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private static final synthetic bJq:[Lrx/internal/a/f;
+.field private static final synthetic bJL:[Lrx/internal/a/f;
 
 
 # direct methods
@@ -45,25 +45,25 @@
 
     invoke-direct {v0, v1}, Lrx/internal/a/f;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/a/f;->bJo:Lrx/internal/a/f;
+    sput-object v0, Lrx/internal/a/f;->bJJ:Lrx/internal/a/f;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/a/f;
 
-    sget-object v1, Lrx/internal/a/f;->bJo:Lrx/internal/a/f;
+    sget-object v1, Lrx/internal/a/f;->bJJ:Lrx/internal/a/f;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/a/f;->bJq:[Lrx/internal/a/f;
+    sput-object v0, Lrx/internal/a/f;->bJL:[Lrx/internal/a/f;
 
     invoke-static {v1}, Lrx/Observable;->b(Lrx/Observable$a;)Lrx/Observable;
 
     move-result-object v0
 
-    sput-object v0, Lrx/internal/a/f;->bJp:Lrx/Observable;
+    sput-object v0, Lrx/internal/a/f;->bJK:Lrx/Observable;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
     return-void
 .end method
 
-.method public static Kr()Lrx/Observable;
+.method public static Kf()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/f;->bJp:Lrx/Observable;
+    sget-object v0, Lrx/internal/a/f;->bJK:Lrx/Observable;
 
     return-object v0
 .end method
@@ -117,7 +117,7 @@
 .method public static values()[Lrx/internal/a/f;
     .locals 1
 
-    sget-object v0, Lrx/internal/a/f;->bJq:[Lrx/internal/a/f;
+    sget-object v0, Lrx/internal/a/f;->bJL:[Lrx/internal/a/f;
 
     invoke-virtual {v0}, [Lrx/internal/a/f;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/g.smali b/com.discord/smali_classes2/rx/internal/a/g.smali
index fbec5f52db..868e985c7f 100644
--- a/com.discord/smali_classes2/rx/internal/a/g.smali
+++ b/com.discord/smali_classes2/rx/internal/a/g.smali
@@ -12,9 +12,9 @@
 
 
 # static fields
-.field private static final bJr:Ljava/lang/Object;
+.field private static final bJM:Ljava/lang/Object;
 
-.field private static final bJs:Ljava/lang/Object;
+.field private static final bJN:Ljava/lang/Object;
 
 
 # direct methods
@@ -25,13 +25,13 @@
 
     invoke-direct {v0}, Lrx/internal/a/g$1;-><init>()V
 
-    sput-object v0, Lrx/internal/a/g;->bJr:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/g;->bJM:Ljava/lang/Object;
 
     new-instance v0, Lrx/internal/a/g$2;
 
     invoke-direct {v0}, Lrx/internal/a/g$2;-><init>()V
 
-    sput-object v0, Lrx/internal/a/g;->bJs:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/g;->bJN:Ljava/lang/Object;
 
     return-void
 .end method
@@ -46,10 +46,10 @@
     return-object v0
 .end method
 
-.method public static Ks()Ljava/lang/Object;
+.method public static Kg()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lrx/internal/a/g;->bJr:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bJM:Ljava/lang/Object;
 
     return-object v0
 .end method
@@ -68,7 +68,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/g;->bJr:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bJM:Ljava/lang/Object;
 
     const/4 v1, 0x1
 
@@ -79,7 +79,7 @@
     return v1
 
     :cond_0
-    sget-object v0, Lrx/internal/a/g;->bJs:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bJN:Ljava/lang/Object;
 
     const/4 v2, 0x0
 
@@ -138,7 +138,7 @@
 
     if-nez p0, :cond_0
 
-    sget-object p0, Lrx/internal/a/g;->bJs:Ljava/lang/Object;
+    sget-object p0, Lrx/internal/a/g;->bJN:Ljava/lang/Object;
 
     :cond_0
     return-object p0
@@ -147,7 +147,7 @@
 .method public static bK(Ljava/lang/Object;)Z
     .locals 1
 
-    sget-object v0, Lrx/internal/a/g;->bJr:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bJM:Ljava/lang/Object;
 
     if-ne p0, v0, :cond_0
 
@@ -206,7 +206,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/g;->bJs:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bJN:Ljava/lang/Object;
 
     if-ne p0, v0, :cond_0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/h$a.smali b/com.discord/smali_classes2/rx/internal/a/h$a.smali
index a164c8735d..c4cc485de6 100644
--- a/com.discord/smali_classes2/rx/internal/a/h$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/h$a.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field final bJv:Lrx/internal/a/h$b;
+.field final bJQ:Lrx/internal/a/h$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/h$b<",
@@ -54,7 +54,7 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/h$a;->bJv:Lrx/internal/a/h$b;
+    iput-object p1, p0, Lrx/internal/a/h$a;->bJQ:Lrx/internal/a/h$b;
 
     iput p2, p0, Lrx/internal/a/h$a;->index:I
 
@@ -69,7 +69,7 @@
 
 
 # virtual methods
-.method public final Kt()V
+.method public final Kh()V
     .locals 2
 
     const-wide/16 v0, 0x1
@@ -93,7 +93,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/h$a;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/h$a;->bJv:Lrx/internal/a/h$b;
+    iget-object v0, p0, Lrx/internal/a/h$a;->bJQ:Lrx/internal/a/h$b;
 
     const/4 v1, 0x0
 
@@ -116,7 +116,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/h$a;->bJv:Lrx/internal/a/h$b;
+    iget-object v0, p0, Lrx/internal/a/h$a;->bJQ:Lrx/internal/a/h$b;
 
     iget-object v0, v0, Lrx/internal/a/h$b;->error:Ljava/util/concurrent/atomic/AtomicReference;
 
@@ -186,7 +186,7 @@
 
     iput-boolean v2, p0, Lrx/internal/a/h$a;->done:Z
 
-    iget-object p1, p0, Lrx/internal/a/h$a;->bJv:Lrx/internal/a/h$b;
+    iget-object p1, p0, Lrx/internal/a/h$a;->bJQ:Lrx/internal/a/h$b;
 
     const/4 v0, 0x0
 
@@ -212,7 +212,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/h$a;->bJv:Lrx/internal/a/h$b;
+    iget-object v0, p0, Lrx/internal/a/h$a;->bJQ:Lrx/internal/a/h$b;
 
     invoke-static {p1}, Lrx/internal/a/g;->bJ(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/h$b.smali b/com.discord/smali_classes2/rx/internal/a/h$b.smali
index 41db97ec00..7eaefbce5b 100644
--- a/com.discord/smali_classes2/rx/internal/a/h$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/h$b.smali
@@ -32,7 +32,7 @@
 
 
 # static fields
-.field static final bJw:Ljava/lang/Object;
+.field static final bJR:Ljava/lang/Object;
 
 .field private static final serialVersionUID:J = 0x76e7117251786db1L
 
@@ -111,7 +111,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/a/h$b;->bJw:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/h$b;->bJR:Ljava/lang/Object;
 
     return-void
 .end method
@@ -144,7 +144,7 @@
 
     iget-object p1, p0, Lrx/internal/a/h$b;->latest:[Ljava/lang/Object;
 
-    sget-object p2, Lrx/internal/a/h$b;->bJw:Ljava/lang/Object;
+    sget-object p2, Lrx/internal/a/h$b;->bJR:Ljava/lang/Object;
 
     invoke-static {p1, p2}, Ljava/util/Arrays;->fill([Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -431,7 +431,7 @@
 
     invoke-virtual {v9, v1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
-    invoke-virtual/range {v17 .. v17}, Lrx/internal/a/h$a;->Kt()V
+    invoke-virtual/range {v17 .. v17}, Lrx/internal/a/h$a;->Kh()V
 
     const-wide/16 v1, 0x1
 
@@ -515,7 +515,7 @@
 
     iget v3, p0, Lrx/internal/a/h$b;->active:I
 
-    sget-object v4, Lrx/internal/a/h$b;->bJw:Ljava/lang/Object;
+    sget-object v4, Lrx/internal/a/h$b;->bJR:Ljava/lang/Object;
 
     if-ne v2, v4, :cond_0
 
@@ -562,7 +562,7 @@
 
     if-nez p1, :cond_4
 
-    sget-object v1, Lrx/internal/a/h$b;->bJw:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/h$b;->bJR:Ljava/lang/Object;
 
     if-ne v2, v1, :cond_4
 
@@ -599,7 +599,7 @@
 
     if-eqz p2, :cond_8
 
-    sget-object p2, Lrx/internal/a/h$b;->bJw:Ljava/lang/Object;
+    sget-object p2, Lrx/internal/a/h$b;->bJR:Ljava/lang/Object;
 
     if-eq v2, p2, :cond_6
 
@@ -625,7 +625,7 @@
 
     if-eqz p1, :cond_9
 
-    invoke-virtual {v0}, Lrx/internal/a/h$a;->Kt()V
+    invoke-virtual {v0}, Lrx/internal/a/h$a;->Kh()V
 
     return-void
 
diff --git a/com.discord/smali_classes2/rx/internal/a/h.smali b/com.discord/smali_classes2/rx/internal/a/h.smali
index 7a4385052f..5764970e26 100644
--- a/com.discord/smali_classes2/rx/internal/a/h.smali
+++ b/com.discord/smali_classes2/rx/internal/a/h.smali
@@ -29,7 +29,7 @@
 
 
 # instance fields
-.field final bJt:[Lrx/Observable;
+.field final bJO:[Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field final bJu:Ljava/lang/Iterable;
+.field final bJP:Ljava/lang/Iterable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Iterable<",
@@ -104,9 +104,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lrx/internal/a/h;->bJt:[Lrx/Observable;
+    iput-object v0, p0, Lrx/internal/a/h;->bJO:[Lrx/Observable;
 
-    iput-object p1, p0, Lrx/internal/a/h;->bJu:Ljava/lang/Iterable;
+    iput-object p1, p0, Lrx/internal/a/h;->bJP:Ljava/lang/Iterable;
 
     iput-object p2, p0, Lrx/internal/a/h;->combiner:Lrx/functions/FuncN;
 
@@ -128,13 +128,13 @@
 
     check-cast v1, Lrx/Subscriber;
 
-    iget-object p1, p0, Lrx/internal/a/h;->bJt:[Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/h;->bJO:[Lrx/Observable;
 
     const/4 v6, 0x0
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lrx/internal/a/h;->bJu:Ljava/lang/Iterable;
+    iget-object p1, p0, Lrx/internal/a/h;->bJP:Ljava/lang/Iterable;
 
     instance-of v0, p1, Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/i$1.smali b/com.discord/smali_classes2/rx/internal/a/i$1.smali
index 4e81995ea3..9ed3901448 100644
--- a/com.discord/smali_classes2/rx/internal/a/i$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/i$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bJB:Lrx/internal/a/i$c;
+.field final synthetic bJW:Lrx/internal/a/i$c;
 
-.field final synthetic bJC:Lrx/internal/a/i;
+.field final synthetic bJX:Lrx/internal/a/i;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/i;Lrx/internal/a/i$c;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/i$1;->bJC:Lrx/internal/a/i;
+    iput-object p1, p0, Lrx/internal/a/i$1;->bJX:Lrx/internal/a/i;
 
-    iput-object p2, p0, Lrx/internal/a/i$1;->bJB:Lrx/internal/a/i$c;
+    iput-object p2, p0, Lrx/internal/a/i$1;->bJW:Lrx/internal/a/i$c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final request(J)V
     .locals 4
 
-    iget-object v0, p0, Lrx/internal/a/i$1;->bJB:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$1;->bJW:Lrx/internal/a/i$c;
 
     const-wide/16 v1, 0x0
 
@@ -49,7 +49,7 @@
 
     if-lez v3, :cond_0
 
-    iget-object v0, v0, Lrx/internal/a/i$c;->bJF:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/i$c;->bKa:Lrx/internal/b/a;
 
     invoke-virtual {v0, p1, p2}, Lrx/internal/b/a;->request(J)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/i$a.smali b/com.discord/smali_classes2/rx/internal/a/i$a.smali
index c1539fa306..3be9f46428 100644
--- a/com.discord/smali_classes2/rx/internal/a/i$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/i$a.smali
@@ -30,7 +30,7 @@
 
 
 # instance fields
-.field final bJD:Lrx/internal/a/i$c;
+.field final bJY:Lrx/internal/a/i$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/i$c<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field bJE:Z
+.field bJZ:Z
 
 .field final value:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -65,7 +65,7 @@
 
     iput-object p1, p0, Lrx/internal/a/i$a;->value:Ljava/lang/Object;
 
-    iput-object p2, p0, Lrx/internal/a/i$a;->bJD:Lrx/internal/a/i$c;
+    iput-object p2, p0, Lrx/internal/a/i$a;->bJY:Lrx/internal/a/i$c;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 .method public final request(J)V
     .locals 3
 
-    iget-boolean v0, p0, Lrx/internal/a/i$a;->bJE:Z
+    iget-boolean v0, p0, Lrx/internal/a/i$a;->bJZ:Z
 
     if-nez v0, :cond_0
 
@@ -87,9 +87,9 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/i$a;->bJE:Z
+    iput-boolean p1, p0, Lrx/internal/a/i$a;->bJZ:Z
 
-    iget-object p1, p0, Lrx/internal/a/i$a;->bJD:Lrx/internal/a/i$c;
+    iget-object p1, p0, Lrx/internal/a/i$a;->bJY:Lrx/internal/a/i$c;
 
     iget-object p2, p0, Lrx/internal/a/i$a;->value:Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/i$b.smali b/com.discord/smali_classes2/rx/internal/a/i$b.smali
index 0b25db2a1c..075a499ac3 100644
--- a/com.discord/smali_classes2/rx/internal/a/i$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/i$b.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field final bJD:Lrx/internal/a/i$c;
+.field final bJY:Lrx/internal/a/i$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/i$c<",
@@ -52,7 +52,7 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/i$b;->bJD:Lrx/internal/a/i$c;
+    iput-object p1, p0, Lrx/internal/a/i$b;->bJY:Lrx/internal/a/i$c;
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 .method public final onCompleted()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/a/i$b;->bJD:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->bJY:Lrx/internal/a/i$c;
 
     iget-wide v1, p0, Lrx/internal/a/i$b;->produced:J
 
@@ -74,7 +74,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/a/i$b;->bJD:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->bJY:Lrx/internal/a/i$c;
 
     iget-wide v1, p0, Lrx/internal/a/i$b;->produced:J
 
@@ -91,7 +91,7 @@
     return-void
 
     :cond_0
-    iget p1, v0, Lrx/internal/a/i$c;->bJA:I
+    iget p1, v0, Lrx/internal/a/i$c;->bJV:I
 
     if-nez p1, :cond_2
 
@@ -123,7 +123,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, v0, Lrx/internal/a/i$c;->bJF:Lrx/internal/b/a;
+    iget-object p1, v0, Lrx/internal/a/i$c;->bKa:Lrx/internal/b/a;
 
     invoke-virtual {p1, v1, v2}, Lrx/internal/b/a;->bc(J)V
 
@@ -153,7 +153,7 @@
 
     iput-wide v0, p0, Lrx/internal/a/i$b;->produced:J
 
-    iget-object v0, p0, Lrx/internal/a/i$b;->bJD:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->bJY:Lrx/internal/a/i$c;
 
     invoke-virtual {v0, p1}, Lrx/internal/a/i$c;->bP(Ljava/lang/Object;)V
 
@@ -163,9 +163,9 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/i$b;->bJD:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->bJY:Lrx/internal/a/i$c;
 
-    iget-object v0, v0, Lrx/internal/a/i$c;->bJF:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/i$c;->bKa:Lrx/internal/b/a;
 
     invoke-virtual {v0, p1}, Lrx/internal/b/a;->setProducer(Lrx/Producer;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/i$c.smali b/com.discord/smali_classes2/rx/internal/a/i$c.smali
index 7c69048848..783ba57ccf 100644
--- a/com.discord/smali_classes2/rx/internal/a/i$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/i$c.smali
@@ -38,13 +38,7 @@
     .end annotation
 .end field
 
-.field final bJA:I
-
-.field final bJF:Lrx/internal/b/a;
-
-.field final bJG:Lrx/subscriptions/SerialSubscription;
-
-.field final bJy:Lrx/functions/b;
+.field final bJT:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -55,6 +49,12 @@
     .end annotation
 .end field
 
+.field final bJV:I
+
+.field final bKa:Lrx/internal/b/a;
+
+.field final bKb:Lrx/subscriptions/SerialSubscription;
+
 .field volatile done:Z
 
 .field final error:Ljava/util/concurrent/atomic/AtomicReference;
@@ -99,15 +99,15 @@
 
     iput-object p1, p0, Lrx/internal/a/i$c;->actual:Lrx/Subscriber;
 
-    iput-object p2, p0, Lrx/internal/a/i$c;->bJy:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/i$c;->bJT:Lrx/functions/b;
 
-    iput p4, p0, Lrx/internal/a/i$c;->bJA:I
+    iput p4, p0, Lrx/internal/a/i$c;->bJV:I
 
     new-instance p1, Lrx/internal/b/a;
 
     invoke-direct {p1}, Lrx/internal/b/a;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/i$c;->bJF:Lrx/internal/b/a;
+    iput-object p1, p0, Lrx/internal/a/i$c;->bKa:Lrx/internal/b/a;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
 
@@ -121,7 +121,7 @@
 
     iput-object p1, p0, Lrx/internal/a/i$c;->error:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Lm()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->La()Z
 
     move-result p1
 
@@ -145,7 +145,7 @@
 
     invoke-direct {p1}, Lrx/subscriptions/SerialSubscription;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/i$c;->bJG:Lrx/subscriptions/SerialSubscription;
+    iput-object p1, p0, Lrx/internal/a/i$c;->bKb:Lrx/subscriptions/SerialSubscription;
 
     int-to-long p1, p3
 
@@ -203,7 +203,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/i$c;->bJF:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/i$c;->bKa:Lrx/internal/b/a;
 
     invoke-virtual {v0, p1, p2}, Lrx/internal/b/a;->bc(J)V
 
@@ -246,7 +246,7 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lrx/internal/a/i$c;->bJA:I
+    iget v0, p0, Lrx/internal/a/i$c;->bJV:I
 
     :cond_1
     :goto_0
@@ -351,7 +351,7 @@
     if-nez v4, :cond_d
 
     :try_start_0
-    iget-object v2, p0, Lrx/internal/a/i$c;->bJy:Lrx/functions/b;
+    iget-object v2, p0, Lrx/internal/a/i$c;->bJT:Lrx/functions/b;
 
     invoke-static {v3}, Lrx/internal/a/g;->bN(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -378,7 +378,7 @@
     return-void
 
     :cond_9
-    invoke-static {}, Lrx/Observable;->JZ()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->JM()Lrx/Observable;
 
     move-result-object v3
 
@@ -394,11 +394,11 @@
 
     iput-boolean v1, p0, Lrx/internal/a/i$c;->active:Z
 
-    iget-object v1, p0, Lrx/internal/a/i$c;->bJF:Lrx/internal/b/a;
+    iget-object v1, p0, Lrx/internal/a/i$c;->bKa:Lrx/internal/b/a;
 
     new-instance v3, Lrx/internal/a/i$a;
 
-    iget-object v2, v2, Lrx/internal/util/k;->bPx:Ljava/lang/Object;
+    iget-object v2, v2, Lrx/internal/util/k;->bPS:Ljava/lang/Object;
 
     invoke-direct {v3, v2, p0}, Lrx/internal/a/i$a;-><init>(Ljava/lang/Object;Lrx/internal/a/i$c;)V
 
@@ -411,7 +411,7 @@
 
     invoke-direct {v3, p0}, Lrx/internal/a/i$b;-><init>(Lrx/internal/a/i$c;)V
 
-    iget-object v6, p0, Lrx/internal/a/i$c;->bJG:Lrx/subscriptions/SerialSubscription;
+    iget-object v6, p0, Lrx/internal/a/i$c;->bKb:Lrx/subscriptions/SerialSubscription;
 
     invoke-virtual {v6, v3}, Lrx/subscriptions/SerialSubscription;->f(Lrx/Subscription;)V
 
@@ -487,7 +487,7 @@
 
     iput-boolean p1, p0, Lrx/internal/a/i$c;->done:Z
 
-    iget p1, p0, Lrx/internal/a/i$c;->bJA:I
+    iget p1, p0, Lrx/internal/a/i$c;->bJV:I
 
     if-nez p1, :cond_1
 
@@ -508,7 +508,7 @@
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
     :cond_0
-    iget-object p1, p0, Lrx/internal/a/i$c;->bJG:Lrx/subscriptions/SerialSubscription;
+    iget-object p1, p0, Lrx/internal/a/i$c;->bKb:Lrx/subscriptions/SerialSubscription;
 
     invoke-virtual {p1}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/i.smali b/com.discord/smali_classes2/rx/internal/a/i.smali
index f1e0cc7ec1..4baca5bf7b 100644
--- a/com.discord/smali_classes2/rx/internal/a/i.smali
+++ b/com.discord/smali_classes2/rx/internal/a/i.smali
@@ -30,9 +30,7 @@
 
 
 # instance fields
-.field final bJA:I
-
-.field final bJx:Lrx/Observable;
+.field final bJS:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -41,7 +39,7 @@
     .end annotation
 .end field
 
-.field final bJy:Lrx/functions/b;
+.field final bJT:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -52,7 +50,9 @@
     .end annotation
 .end field
 
-.field final bJz:I
+.field final bJU:I
+
+.field final bJV:I
 
 
 # direct methods
@@ -72,17 +72,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/i;->bJx:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/i;->bJS:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/i;->bJy:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/i;->bJT:Lrx/functions/b;
 
     const/4 p1, 0x2
 
-    iput p1, p0, Lrx/internal/a/i;->bJz:I
+    iput p1, p0, Lrx/internal/a/i;->bJU:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lrx/internal/a/i;->bJA:I
+    iput p1, p0, Lrx/internal/a/i;->bJV:I
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget v0, p0, Lrx/internal/a/i;->bJA:I
+    iget v0, p0, Lrx/internal/a/i;->bJV:I
 
     if-nez v0, :cond_0
 
@@ -110,17 +110,17 @@
     :goto_0
     new-instance v1, Lrx/internal/a/i$c;
 
-    iget-object v2, p0, Lrx/internal/a/i;->bJy:Lrx/functions/b;
+    iget-object v2, p0, Lrx/internal/a/i;->bJT:Lrx/functions/b;
 
-    iget v3, p0, Lrx/internal/a/i;->bJz:I
+    iget v3, p0, Lrx/internal/a/i;->bJU:I
 
-    iget v4, p0, Lrx/internal/a/i;->bJA:I
+    iget v4, p0, Lrx/internal/a/i;->bJV:I
 
     invoke-direct {v1, v0, v2, v3, v4}, Lrx/internal/a/i$c;-><init>(Lrx/Subscriber;Lrx/functions/b;II)V
 
     invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object v0, v1, Lrx/internal/a/i$c;->bJG:Lrx/subscriptions/SerialSubscription;
+    iget-object v0, v1, Lrx/internal/a/i$c;->bKb:Lrx/subscriptions/SerialSubscription;
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
@@ -136,7 +136,7 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lrx/internal/a/i;->bJx:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/i;->bJS:Lrx/Observable;
 
     invoke-virtual {p1, v1}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/j$1.smali b/com.discord/smali_classes2/rx/internal/a/j$1.smali
index 46feb5e3ed..8d48995144 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$1.smali
@@ -15,14 +15,14 @@
 
 
 # static fields
-.field static final synthetic bJJ:[I
+.field static final synthetic bKe:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lrx/Emitter$a;->JT()[I
+    invoke-static {}, Lrx/Emitter$a;->JG()[I
 
     move-result-object v0
 
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lrx/internal/a/j$1;->bJJ:[I
+    sput-object v0, Lrx/internal/a/j$1;->bKe:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lrx/internal/a/j$1;->bJJ:[I
+    sget-object v1, Lrx/internal/a/j$1;->bKe:[I
 
-    sget v2, Lrx/Emitter$a;->bIz:I
+    sget v2, Lrx/Emitter$a;->bIT:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lrx/internal/a/j$1;->bJJ:[I
+    sget-object v1, Lrx/internal/a/j$1;->bKe:[I
 
-    sget v2, Lrx/Emitter$a;->bIA:I
+    sget v2, Lrx/Emitter$a;->bIU:I
 
     sub-int/2addr v2, v0
 
@@ -61,9 +61,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lrx/internal/a/j$1;->bJJ:[I
+    sget-object v1, Lrx/internal/a/j$1;->bKe:[I
 
-    sget v2, Lrx/Emitter$a;->bIC:I
+    sget v2, Lrx/Emitter$a;->bIW:I
 
     sub-int/2addr v2, v0
 
@@ -75,9 +75,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v1, Lrx/internal/a/j$1;->bJJ:[I
+    sget-object v1, Lrx/internal/a/j$1;->bKe:[I
 
-    sget v2, Lrx/Emitter$a;->bID:I
+    sget v2, Lrx/Emitter$a;->bIX:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/j$a.smali b/com.discord/smali_classes2/rx/internal/a/j$a.smali
index 78cea40523..0ffa6f3cb9 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$a.smali
@@ -75,13 +75,13 @@
 
 
 # virtual methods
-.method Ku()V
+.method Ki()V
     .locals 0
 
     return-void
 .end method
 
-.method Kv()V
+.method Kj()V
     .locals 0
 
     return-void
@@ -184,7 +184,7 @@
 
     invoke-static {p0, p1, p2}, Lrx/internal/a/a;->a(Ljava/util/concurrent/atomic/AtomicLong;J)J
 
-    invoke-virtual {p0}, Lrx/internal/a/j$a;->Kv()V
+    invoke-virtual {p0}, Lrx/internal/a/j$a;->Kj()V
 
     :cond_0
     return-void
@@ -197,7 +197,7 @@
 
     invoke-virtual {v0}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
 
-    invoke-virtual {p0}, Lrx/internal/a/j$a;->Ku()V
+    invoke-virtual {p0}, Lrx/internal/a/j$a;->Ki()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/j$b.smali b/com.discord/smali_classes2/rx/internal/a/j$b.smali
index 94a866754a..c77e013141 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$b.smali
@@ -59,7 +59,7 @@
 
     invoke-direct {p0, p1}, Lrx/internal/a/j$a;-><init>(Lrx/Subscriber;)V
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Lm()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->La()Z
 
     move-result p1
 
@@ -245,7 +245,7 @@
 
 
 # virtual methods
-.method final Ku()V
+.method final Ki()V
     .locals 1
 
     iget-object v0, p0, Lrx/internal/a/j$b;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
@@ -264,7 +264,7 @@
     return-void
 .end method
 
-.method final Kv()V
+.method final Kj()V
     .locals 0
 
     invoke-direct {p0}, Lrx/internal/a/j$b;->drain()V
diff --git a/com.discord/smali_classes2/rx/internal/a/j$c.smali b/com.discord/smali_classes2/rx/internal/a/j$c.smali
index 3ed55164ba..bc81063106 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$c.smali
@@ -46,7 +46,7 @@
 
 
 # virtual methods
-.method final Kw()V
+.method final Kk()V
     .locals 0
 
     return-void
diff --git a/com.discord/smali_classes2/rx/internal/a/j$d.smali b/com.discord/smali_classes2/rx/internal/a/j$d.smali
index 779ba84c54..480db7b9d8 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$d.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$d.smali
@@ -50,7 +50,7 @@
 
 
 # virtual methods
-.method final Kw()V
+.method final Kk()V
     .locals 2
 
     new-instance v0, Lrx/a/c;
diff --git a/com.discord/smali_classes2/rx/internal/a/j$e.smali b/com.discord/smali_classes2/rx/internal/a/j$e.smali
index 89c5eefe95..a9e04b2bbd 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$e.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$e.smali
@@ -240,7 +240,7 @@
 
 
 # virtual methods
-.method final Ku()V
+.method final Ki()V
     .locals 2
 
     iget-object v0, p0, Lrx/internal/a/j$e;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
@@ -261,7 +261,7 @@
     return-void
 .end method
 
-.method final Kv()V
+.method final Kj()V
     .locals 0
 
     invoke-direct {p0}, Lrx/internal/a/j$e;->drain()V
diff --git a/com.discord/smali_classes2/rx/internal/a/j$f.smali b/com.discord/smali_classes2/rx/internal/a/j$f.smali
index c1ecef562b..4ba20b15b3 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$f.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$f.smali
@@ -46,7 +46,7 @@
 
 
 # virtual methods
-.method abstract Kw()V
+.method abstract Kk()V
 .end method
 
 .method public onNext(Ljava/lang/Object;)V
@@ -89,7 +89,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lrx/internal/a/j$f;->Kw()V
+    invoke-virtual {p0}, Lrx/internal/a/j$f;->Kk()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/j.smali b/com.discord/smali_classes2/rx/internal/a/j.smali
index ffcfede2ef..dbce71aa56 100644
--- a/com.discord/smali_classes2/rx/internal/a/j.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j.smali
@@ -32,7 +32,7 @@
 
 
 # instance fields
-.field final bJH:Lrx/functions/Action1;
+.field final bKc:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -42,7 +42,7 @@
     .end annotation
 .end field
 
-.field final bJI:I
+.field final bKd:I
 
 
 # direct methods
@@ -59,9 +59,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/j;->bJH:Lrx/functions/Action1;
+    iput-object p1, p0, Lrx/internal/a/j;->bKc:Lrx/functions/Action1;
 
-    iput p2, p0, Lrx/internal/a/j;->bJI:I
+    iput p2, p0, Lrx/internal/a/j;->bKd:I
 
     return-void
 .end method
@@ -73,9 +73,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    sget-object v0, Lrx/internal/a/j$1;->bJJ:[I
+    sget-object v0, Lrx/internal/a/j$1;->bKe:[I
 
-    iget v1, p0, Lrx/internal/a/j;->bJI:I
+    iget v1, p0, Lrx/internal/a/j;->bKd:I
 
     const/4 v2, 0x1
 
@@ -136,7 +136,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    iget-object p1, p0, Lrx/internal/a/j;->bJH:Lrx/functions/Action1;
+    iget-object p1, p0, Lrx/internal/a/j;->bKc:Lrx/functions/Action1;
 
     invoke-interface {p1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/k.smali b/com.discord/smali_classes2/rx/internal/a/k.smali
index b2d7538c79..1577f93ee3 100644
--- a/com.discord/smali_classes2/rx/internal/a/k.smali
+++ b/com.discord/smali_classes2/rx/internal/a/k.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field final bJK:Lrx/functions/Func0;
+.field final bKf:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -47,7 +47,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/k;->bJK:Lrx/functions/Func0;
+    iput-object p1, p0, Lrx/internal/a/k;->bKf:Lrx/functions/Func0;
 
     return-void
 .end method
@@ -60,7 +60,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/k;->bJK:Lrx/functions/Func0;
+    iget-object v0, p0, Lrx/internal/a/k;->bKf:Lrx/functions/Func0;
 
     invoke-interface {v0}, Lrx/functions/Func0;->call()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/l$a.smali b/com.discord/smali_classes2/rx/internal/a/l$a.smali
index 54773d2250..2736957f18 100644
--- a/com.discord/smali_classes2/rx/internal/a/l$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/l$a.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final bJL:Lrx/e;
+.field private final bKg:Lrx/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/e<",
@@ -63,7 +63,7 @@
 
     iput-object p1, p0, Lrx/internal/a/l$a;->subscriber:Lrx/Subscriber;
 
-    iput-object p2, p0, Lrx/internal/a/l$a;->bJL:Lrx/e;
+    iput-object p2, p0, Lrx/internal/a/l$a;->bKg:Lrx/e;
 
     return-void
 .end method
@@ -81,7 +81,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/l$a;->bJL:Lrx/e;
+    iget-object v0, p0, Lrx/internal/a/l$a;->bKg:Lrx/e;
 
     invoke-interface {v0}, Lrx/e;->onCompleted()V
     :try_end_0
@@ -122,7 +122,7 @@
     iput-boolean v0, p0, Lrx/internal/a/l$a;->done:Z
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/l$a;->bJL:Lrx/e;
+    iget-object v1, p0, Lrx/internal/a/l$a;->bKg:Lrx/e;
 
     invoke-interface {v1, p1}, Lrx/e;->onError(Ljava/lang/Throwable;)V
     :try_end_0
@@ -180,7 +180,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/l$a;->bJL:Lrx/e;
+    iget-object v0, p0, Lrx/internal/a/l$a;->bKg:Lrx/e;
 
     invoke-interface {v0, p1}, Lrx/e;->onNext(Ljava/lang/Object;)V
     :try_end_0
diff --git a/com.discord/smali_classes2/rx/internal/a/l.smali b/com.discord/smali_classes2/rx/internal/a/l.smali
index 486eb93d4e..833a80e2ad 100644
--- a/com.discord/smali_classes2/rx/internal/a/l.smali
+++ b/com.discord/smali_classes2/rx/internal/a/l.smali
@@ -26,16 +26,7 @@
 
 
 # instance fields
-.field private final bJL:Lrx/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/e<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field private final bJx:Lrx/Observable;
+.field private final bJS:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -44,6 +35,15 @@
     .end annotation
 .end field
 
+.field private final bKg:Lrx/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/e<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method public constructor <init>(Lrx/Observable;Lrx/e;)V
@@ -60,9 +60,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/l;->bJx:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/l;->bJS:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/l;->bJL:Lrx/e;
+    iput-object p2, p0, Lrx/internal/a/l;->bKg:Lrx/e;
 
     return-void
 .end method
@@ -74,11 +74,11 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/l;->bJx:Lrx/Observable;
+    iget-object v0, p0, Lrx/internal/a/l;->bJS:Lrx/Observable;
 
     new-instance v1, Lrx/internal/a/l$a;
 
-    iget-object v2, p0, Lrx/internal/a/l;->bJL:Lrx/e;
+    iget-object v2, p0, Lrx/internal/a/l;->bKg:Lrx/e;
 
     invoke-direct {v1, p1, v2}, Lrx/internal/a/l$a;-><init>(Lrx/Subscriber;Lrx/e;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/m$a.smali b/com.discord/smali_classes2/rx/internal/a/m$a.smali
index 48b73d429c..d31d228633 100644
--- a/com.discord/smali_classes2/rx/internal/a/m$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/m$a.smali
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field final bJM:Lrx/functions/b;
+.field final bKh:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -67,7 +67,7 @@
 
     iput-object p1, p0, Lrx/internal/a/m$a;->actual:Lrx/Subscriber;
 
-    iput-object p2, p0, Lrx/internal/a/m$a;->bJM:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/m$a;->bKh:Lrx/functions/b;
 
     const-wide/16 p1, 0x0
 
@@ -127,7 +127,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/m$a;->bJM:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/m$a;->bKh:Lrx/functions/b;
 
     invoke-interface {v0, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/m.smali b/com.discord/smali_classes2/rx/internal/a/m.smali
index 6108491da4..357d7e306d 100644
--- a/com.discord/smali_classes2/rx/internal/a/m.smali
+++ b/com.discord/smali_classes2/rx/internal/a/m.smali
@@ -26,7 +26,16 @@
 
 
 # instance fields
-.field final bJM:Lrx/functions/b;
+.field final bJS:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field final bKh:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -37,15 +46,6 @@
     .end annotation
 .end field
 
-.field final bJx:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
 
 # direct methods
 .method public constructor <init>(Lrx/Observable;Lrx/functions/b;)V
@@ -64,9 +64,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/m;->bJx:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/m;->bJS:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/m;->bJM:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/m;->bKh:Lrx/functions/b;
 
     return-void
 .end method
@@ -80,13 +80,13 @@
 
     new-instance v0, Lrx/internal/a/m$a;
 
-    iget-object v1, p0, Lrx/internal/a/m;->bJM:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/m;->bKh:Lrx/functions/b;
 
     invoke-direct {v0, p1, v1}, Lrx/internal/a/m$a;-><init>(Lrx/Subscriber;Lrx/functions/b;)V
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/m;->bJx:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/m;->bJS:Lrx/Observable;
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/n$1.smali b/com.discord/smali_classes2/rx/internal/a/n$1.smali
index 6c7f6f7554..760e9c3064 100644
--- a/com.discord/smali_classes2/rx/internal/a/n$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/n$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bJN:Lrx/internal/a/n$a;
+.field final synthetic bKi:Lrx/internal/a/n$a;
 
-.field final synthetic bJO:Lrx/internal/a/n;
+.field final synthetic bKj:Lrx/internal/a/n;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/n;Lrx/internal/a/n$a;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/n$1;->bJO:Lrx/internal/a/n;
+    iput-object p1, p0, Lrx/internal/a/n$1;->bKj:Lrx/internal/a/n;
 
-    iput-object p2, p0, Lrx/internal/a/n$1;->bJN:Lrx/internal/a/n$a;
+    iput-object p2, p0, Lrx/internal/a/n$1;->bKi:Lrx/internal/a/n$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final request(J)V
     .locals 4
 
-    iget-object v0, p0, Lrx/internal/a/n$1;->bJN:Lrx/internal/a/n$a;
+    iget-object v0, p0, Lrx/internal/a/n$1;->bKi:Lrx/internal/a/n$a;
 
     const-wide/16 v1, 0x0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/n$a.smali b/com.discord/smali_classes2/rx/internal/a/n$a.smali
index ee382d95f2..5fca434b66 100644
--- a/com.discord/smali_classes2/rx/internal/a/n$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/n$a.smali
@@ -36,18 +36,7 @@
     .end annotation
 .end field
 
-.field final bJP:J
-
-.field bJQ:Ljava/util/Iterator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Iterator<",
-            "+TR;>;"
-        }
-    .end annotation
-.end field
-
-.field final bJy:Lrx/functions/b;
+.field final bJT:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -58,6 +47,17 @@
     .end annotation
 .end field
 
+.field final bKk:J
+
+.field bKl:Ljava/util/Iterator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Iterator<",
+            "+TR;>;"
+        }
+    .end annotation
+.end field
+
 .field volatile done:Z
 
 .field final error:Ljava/util/concurrent/atomic/AtomicReference;
@@ -106,7 +106,7 @@
 
     iput-object p1, p0, Lrx/internal/a/n$a;->actual:Lrx/Subscriber;
 
-    iput-object p2, p0, Lrx/internal/a/n$a;->bJy:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/n$a;->bJT:Lrx/functions/b;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
@@ -132,7 +132,7 @@
 
     const-wide p1, 0x7fffffffffffffffL
 
-    iput-wide p1, p0, Lrx/internal/a/n$a;->bJP:J
+    iput-wide p1, p0, Lrx/internal/a/n$a;->bKk:J
 
     new-instance p1, Lrx/internal/util/a/f;
 
@@ -151,9 +151,9 @@
 
     int-to-long p1, p1
 
-    iput-wide p1, p0, Lrx/internal/a/n$a;->bJP:J
+    iput-wide p1, p0, Lrx/internal/a/n$a;->bKk:J
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Lm()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->La()Z
 
     move-result p1
 
@@ -206,7 +206,7 @@
 
     invoke-interface {p4}, Ljava/util/Queue;->clear()V
 
-    iput-object v1, p0, Lrx/internal/a/n$a;->bJQ:Ljava/util/Iterator;
+    iput-object v1, p0, Lrx/internal/a/n$a;->bKl:Ljava/util/Iterator;
 
     return v2
 
@@ -233,7 +233,7 @@
 
     invoke-interface {p4}, Ljava/util/Queue;->clear()V
 
-    iput-object v1, p0, Lrx/internal/a/n$a;->bJQ:Ljava/util/Iterator;
+    iput-object v1, p0, Lrx/internal/a/n$a;->bKl:Ljava/util/Iterator;
 
     invoke-virtual {p3, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -278,7 +278,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, v1, Lrx/internal/a/n$a;->bJQ:Ljava/util/Iterator;
+    iget-object v0, v1, Lrx/internal/a/n$a;->bKl:Ljava/util/Iterator;
 
     const-wide/16 v6, 0x1
 
@@ -321,7 +321,7 @@
 
     move v15, v5
 
-    iget-wide v4, v1, Lrx/internal/a/n$a;->bJP:J
+    iget-wide v4, v1, Lrx/internal/a/n$a;->bKk:J
 
     cmp-long v0, v13, v4
 
@@ -338,7 +338,7 @@
 
     :goto_2
     :try_start_0
-    iget-object v0, v1, Lrx/internal/a/n$a;->bJy:Lrx/functions/b;
+    iget-object v0, v1, Lrx/internal/a/n$a;->bJT:Lrx/functions/b;
 
     invoke-static {v12}, Lrx/internal/a/g;->bN(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -362,7 +362,7 @@
 
     if-eqz v4, :cond_d
 
-    iput-object v0, v1, Lrx/internal/a/n$a;->bJQ:Ljava/util/Iterator;
+    iput-object v0, v1, Lrx/internal/a/n$a;->bKl:Ljava/util/Iterator;
 
     goto :goto_3
 
@@ -438,7 +438,7 @@
 
     if-nez v11, :cond_6
 
-    iput-object v14, v1, Lrx/internal/a/n$a;->bJQ:Ljava/util/Iterator;
+    iput-object v14, v1, Lrx/internal/a/n$a;->bKl:Ljava/util/Iterator;
 
     goto :goto_4
 
@@ -449,7 +449,7 @@
 
     invoke-static {v6}, Lrx/a/b;->I(Ljava/lang/Throwable;)V
 
-    iput-object v14, v1, Lrx/internal/a/n$a;->bJQ:Ljava/util/Iterator;
+    iput-object v14, v1, Lrx/internal/a/n$a;->bKl:Ljava/util/Iterator;
 
     invoke-virtual {v1, v6}, Lrx/internal/a/n$a;->onError(Ljava/lang/Throwable;)V
 
@@ -462,7 +462,7 @@
 
     invoke-static {v6}, Lrx/a/b;->I(Ljava/lang/Throwable;)V
 
-    iput-object v14, v1, Lrx/internal/a/n$a;->bJQ:Ljava/util/Iterator;
+    iput-object v14, v1, Lrx/internal/a/n$a;->bKl:Ljava/util/Iterator;
 
     invoke-virtual {v1, v6}, Lrx/internal/a/n$a;->onError(Ljava/lang/Throwable;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/n$b.smali b/com.discord/smali_classes2/rx/internal/a/n$b.smali
index 9f2e6a444e..cac2f9088d 100644
--- a/com.discord/smali_classes2/rx/internal/a/n$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/n$b.smali
@@ -31,7 +31,7 @@
 
 
 # instance fields
-.field final bJy:Lrx/functions/b;
+.field final bJT:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -68,7 +68,7 @@
 
     iput-object p1, p0, Lrx/internal/a/n$b;->value:Ljava/lang/Object;
 
-    iput-object p2, p0, Lrx/internal/a/n$b;->bJy:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/n$b;->bJT:Lrx/functions/b;
 
     return-void
 .end method
@@ -81,7 +81,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/n$b;->bJy:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/n$b;->bJT:Lrx/functions/b;
 
     iget-object v1, p0, Lrx/internal/a/n$b;->value:Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/n.smali b/com.discord/smali_classes2/rx/internal/a/n.smali
index 4aa407d8e0..b9c230eff2 100644
--- a/com.discord/smali_classes2/rx/internal/a/n.smali
+++ b/com.discord/smali_classes2/rx/internal/a/n.smali
@@ -29,7 +29,7 @@
 
 
 # instance fields
-.field final bJx:Lrx/Observable;
+.field final bJS:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field final bJy:Lrx/functions/b;
+.field final bJT:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -49,7 +49,7 @@
     .end annotation
 .end field
 
-.field final bJz:I
+.field final bJU:I
 
 
 # direct methods
@@ -69,11 +69,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/n;->bJx:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/n;->bJS:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/n;->bJy:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/n;->bJT:Lrx/functions/b;
 
-    iput p3, p0, Lrx/internal/a/n;->bJz:I
+    iput p3, p0, Lrx/internal/a/n;->bJU:I
 
     return-void
 .end method
@@ -104,7 +104,7 @@
 
     check-cast p0, Lrx/internal/util/k;
 
-    iget-object p0, p0, Lrx/internal/util/k;->bPx:Ljava/lang/Object;
+    iget-object p0, p0, Lrx/internal/util/k;->bPS:Ljava/lang/Object;
 
     new-instance p2, Lrx/internal/a/n$b;
 
@@ -137,9 +137,9 @@
 
     new-instance v0, Lrx/internal/a/n$a;
 
-    iget-object v1, p0, Lrx/internal/a/n;->bJy:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/n;->bJT:Lrx/functions/b;
 
-    iget v2, p0, Lrx/internal/a/n;->bJz:I
+    iget v2, p0, Lrx/internal/a/n;->bJU:I
 
     invoke-direct {v0, p1, v1, v2}, Lrx/internal/a/n$a;-><init>(Lrx/Subscriber;Lrx/functions/b;I)V
 
@@ -151,7 +151,7 @@
 
     invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    iget-object p1, p0, Lrx/internal/a/n;->bJx:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/n;->bJS:Lrx/Observable;
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/o$a.smali b/com.discord/smali_classes2/rx/internal/a/o$a.smali
index c1f8702a98..684bffe05a 100644
--- a/com.discord/smali_classes2/rx/internal/a/o$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/o$a.smali
@@ -72,7 +72,7 @@
     return-void
 .end method
 
-.method private Kx()V
+.method private Kl()V
     .locals 6
 
     iget-object v0, p0, Lrx/internal/a/o$a;->child:Lrx/Subscriber;
@@ -228,7 +228,7 @@
 
     if-nez v2, :cond_1
 
-    invoke-direct {p0}, Lrx/internal/a/o$a;->Kx()V
+    invoke-direct {p0}, Lrx/internal/a/o$a;->Kl()V
 
     return-void
 
diff --git a/com.discord/smali_classes2/rx/internal/a/p.smali b/com.discord/smali_classes2/rx/internal/a/p.smali
index 143a2796b1..bd5fe9af6b 100644
--- a/com.discord/smali_classes2/rx/internal/a/p.smali
+++ b/com.discord/smali_classes2/rx/internal/a/p.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field final bJR:Ljava/lang/Iterable;
+.field final bKm:Ljava/lang/Iterable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Iterable<",
@@ -51,7 +51,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lrx/internal/a/p;->bJR:Ljava/lang/Iterable;
+    iput-object p1, p0, Lrx/internal/a/p;->bKm:Ljava/lang/Iterable;
 
     return-void
 
@@ -73,7 +73,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/p;->bJR:Ljava/lang/Iterable;
+    iget-object v0, p0, Lrx/internal/a/p;->bKm:Ljava/lang/Iterable;
 
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/q.smali b/com.discord/smali_classes2/rx/internal/a/q.smali
index fbbe60b7af..e0f6147538 100644
--- a/com.discord/smali_classes2/rx/internal/a/q.smali
+++ b/com.discord/smali_classes2/rx/internal/a/q.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field final bJS:Lrx/Observable$a;
+.field final bKn:Lrx/Observable$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$a<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field final bJT:Lrx/Observable$b;
+.field final bKo:Lrx/Observable$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$b<",
@@ -56,9 +56,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/q;->bJS:Lrx/Observable$a;
+    iput-object p1, p0, Lrx/internal/a/q;->bKn:Lrx/Observable$a;
 
-    iput-object p2, p0, Lrx/internal/a/q;->bJT:Lrx/Observable$b;
+    iput-object p2, p0, Lrx/internal/a/q;->bKo:Lrx/Observable$b;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/q;->bJT:Lrx/Observable$b;
+    iget-object v0, p0, Lrx/internal/a/q;->bKo:Lrx/Observable$b;
 
     invoke-static {v0}, Lrx/c/c;->b(Lrx/Observable$b;)Lrx/Observable$b;
 
@@ -88,7 +88,7 @@
     :try_start_1
     invoke-virtual {v0}, Lrx/Subscriber;->onStart()V
 
-    iget-object v1, p0, Lrx/internal/a/q;->bJS:Lrx/Observable$a;
+    iget-object v1, p0, Lrx/internal/a/q;->bKn:Lrx/Observable$a;
 
     invoke-interface {v1, v0}, Lrx/Observable$a;->call(Ljava/lang/Object;)V
     :try_end_1
diff --git a/com.discord/smali_classes2/rx/internal/a/r$a.smali b/com.discord/smali_classes2/rx/internal/a/r$a.smali
index 2805218dc9..5652f35a1a 100644
--- a/com.discord/smali_classes2/rx/internal/a/r$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/r$a.smali
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field final bJy:Lrx/functions/b;
+.field final bJT:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -65,7 +65,7 @@
 
     iput-object p1, p0, Lrx/internal/a/r$a;->actual:Lrx/Subscriber;
 
-    iput-object p2, p0, Lrx/internal/a/r$a;->bJy:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/r$a;->bJT:Lrx/functions/b;
 
     return-void
 .end method
@@ -121,7 +121,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/r$a;->bJy:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/r$a;->bJT:Lrx/functions/b;
 
     invoke-interface {v0, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/r.smali b/com.discord/smali_classes2/rx/internal/a/r.smali
index 6e7b7ff7f7..e52d3b2d89 100644
--- a/com.discord/smali_classes2/rx/internal/a/r.smali
+++ b/com.discord/smali_classes2/rx/internal/a/r.smali
@@ -28,16 +28,7 @@
 
 
 # instance fields
-.field final bJU:Lrx/functions/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/b<",
-            "-TT;+TR;>;"
-        }
-    .end annotation
-.end field
-
-.field final bJx:Lrx/Observable;
+.field final bJS:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -46,6 +37,15 @@
     .end annotation
 .end field
 
+.field final bKp:Lrx/functions/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/b<",
+            "-TT;+TR;>;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method public constructor <init>(Lrx/Observable;Lrx/functions/b;)V
@@ -62,9 +62,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/r;->bJx:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/r;->bJS:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/r;->bJU:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/r;->bKp:Lrx/functions/b;
 
     return-void
 .end method
@@ -78,13 +78,13 @@
 
     new-instance v0, Lrx/internal/a/r$a;
 
-    iget-object v1, p0, Lrx/internal/a/r;->bJU:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/r;->bKp:Lrx/functions/b;
 
     invoke-direct {v0, p1, v1}, Lrx/internal/a/r$a;-><init>(Lrx/Subscriber;Lrx/functions/b;)V
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/r;->bJx:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/r;->bJS:Lrx/Observable;
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/s$1$1.smali b/com.discord/smali_classes2/rx/internal/a/s$1$1.smali
index a3652c684e..a62a8504cf 100644
--- a/com.discord/smali_classes2/rx/internal/a/s$1$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s$1$1.smali
@@ -29,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic bJZ:Lrx/internal/a/s$1;
+.field final synthetic bKu:Lrx/internal/a/s$1;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/s$1;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/s$1$1;->bJZ:Lrx/internal/a/s$1;
+    iput-object p1, p0, Lrx/internal/a/s$1$1;->bKu:Lrx/internal/a/s$1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,7 +48,7 @@
 .method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-static {}, Lrx/d;->JU()Lrx/d;
+    invoke-static {}, Lrx/d;->JH()Lrx/d;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/rx/internal/a/s$2$1.smali b/com.discord/smali_classes2/rx/internal/a/s$2$1.smali
index cc542dae27..e4c8232ca2 100644
--- a/com.discord/smali_classes2/rx/internal/a/s$2$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s$2$1.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field final synthetic bKg:Lrx/internal/a/s$2;
+.field final synthetic bKB:Lrx/internal/a/s$2;
 
 .field done:Z
 
@@ -31,7 +31,7 @@
 .method constructor <init>(Lrx/internal/a/s$2;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/s$2$1;->bKg:Lrx/internal/a/s$2;
+    iput-object p1, p0, Lrx/internal/a/s$2$1;->bKB:Lrx/internal/a/s$2;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -53,11 +53,11 @@
 
     invoke-virtual {p0}, Lrx/internal/a/s$2$1;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/a/s$2$1;->bKg:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->bKB:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->bKb:Lrx/subjects/Subject;
+    iget-object v0, v0, Lrx/internal/a/s$2;->bKw:Lrx/subjects/Subject;
 
-    invoke-static {}, Lrx/d;->JV()Lrx/d;
+    invoke-static {}, Lrx/d;->JI()Lrx/d;
 
     move-result-object v1
 
@@ -80,9 +80,9 @@
 
     invoke-virtual {p0}, Lrx/internal/a/s$2$1;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/a/s$2$1;->bKg:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->bKB:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->bKb:Lrx/subjects/Subject;
+    iget-object v0, v0, Lrx/internal/a/s$2;->bKw:Lrx/subjects/Subject;
 
     invoke-static {p1}, Lrx/d;->F(Ljava/lang/Throwable;)Lrx/d;
 
@@ -106,16 +106,16 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/s$2$1;->bKg:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->bKB:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->bKa:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/s$2;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
     :cond_0
-    iget-object p1, p0, Lrx/internal/a/s$2$1;->bKg:Lrx/internal/a/s$2;
+    iget-object p1, p0, Lrx/internal/a/s$2$1;->bKB:Lrx/internal/a/s$2;
 
-    iget-object p1, p1, Lrx/internal/a/s$2;->bKd:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object p1, p1, Lrx/internal/a/s$2;->bKy:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -129,9 +129,9 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lrx/internal/a/s$2$1;->bKg:Lrx/internal/a/s$2;
+    iget-object p1, p0, Lrx/internal/a/s$2$1;->bKB:Lrx/internal/a/s$2;
 
-    iget-object p1, p1, Lrx/internal/a/s$2;->bKd:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object p1, p1, Lrx/internal/a/s$2;->bKy:Ljava/util/concurrent/atomic/AtomicLong;
 
     sub-long v2, v0, v4
 
@@ -142,9 +142,9 @@
     if-eqz p1, :cond_0
 
     :cond_1
-    iget-object p1, p0, Lrx/internal/a/s$2$1;->bKg:Lrx/internal/a/s$2;
+    iget-object p1, p0, Lrx/internal/a/s$2$1;->bKB:Lrx/internal/a/s$2;
 
-    iget-object p1, p1, Lrx/internal/a/s$2;->bKc:Lrx/internal/b/a;
+    iget-object p1, p1, Lrx/internal/a/s$2;->bKx:Lrx/internal/b/a;
 
     invoke-virtual {p1, v4, v5}, Lrx/internal/b/a;->bc(J)V
 
@@ -155,9 +155,9 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/s$2$1;->bKg:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->bKB:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->bKc:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/s$2;->bKx:Lrx/internal/b/a;
 
     invoke-virtual {v0, p1}, Lrx/internal/b/a;->setProducer(Lrx/Producer;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/s$2.smali b/com.discord/smali_classes2/rx/internal/a/s$2.smali
index be5e51044a..163300376f 100644
--- a/com.discord/smali_classes2/rx/internal/a/s$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s$2.smali
@@ -18,34 +18,34 @@
 
 
 # instance fields
-.field final synthetic bKa:Lrx/Subscriber;
+.field final synthetic bKA:Lrx/internal/a/s;
 
-.field final synthetic bKb:Lrx/subjects/Subject;
+.field final synthetic bKv:Lrx/Subscriber;
 
-.field final synthetic bKc:Lrx/internal/b/a;
+.field final synthetic bKw:Lrx/subjects/Subject;
 
-.field final synthetic bKd:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic bKx:Lrx/internal/b/a;
 
-.field final synthetic bKe:Lrx/subscriptions/SerialSubscription;
+.field final synthetic bKy:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final synthetic bKf:Lrx/internal/a/s;
+.field final synthetic bKz:Lrx/subscriptions/SerialSubscription;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/s;Lrx/Subscriber;Lrx/subjects/Subject;Lrx/internal/b/a;Ljava/util/concurrent/atomic/AtomicLong;Lrx/subscriptions/SerialSubscription;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/s$2;->bKf:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$2;->bKA:Lrx/internal/a/s;
 
-    iput-object p2, p0, Lrx/internal/a/s$2;->bKa:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/s$2;->bKv:Lrx/Subscriber;
 
-    iput-object p3, p0, Lrx/internal/a/s$2;->bKb:Lrx/subjects/Subject;
+    iput-object p3, p0, Lrx/internal/a/s$2;->bKw:Lrx/subjects/Subject;
 
-    iput-object p4, p0, Lrx/internal/a/s$2;->bKc:Lrx/internal/b/a;
+    iput-object p4, p0, Lrx/internal/a/s$2;->bKx:Lrx/internal/b/a;
 
-    iput-object p5, p0, Lrx/internal/a/s$2;->bKd:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p5, p0, Lrx/internal/a/s$2;->bKy:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p6, p0, Lrx/internal/a/s$2;->bKe:Lrx/subscriptions/SerialSubscription;
+    iput-object p6, p0, Lrx/internal/a/s$2;->bKz:Lrx/subscriptions/SerialSubscription;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,7 +57,7 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/s$2;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$2;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
 
@@ -72,13 +72,13 @@
 
     invoke-direct {v0, p0}, Lrx/internal/a/s$2$1;-><init>(Lrx/internal/a/s$2;)V
 
-    iget-object v1, p0, Lrx/internal/a/s$2;->bKe:Lrx/subscriptions/SerialSubscription;
+    iget-object v1, p0, Lrx/internal/a/s$2;->bKz:Lrx/subscriptions/SerialSubscription;
 
     invoke-virtual {v1, v0}, Lrx/subscriptions/SerialSubscription;->f(Lrx/Subscription;)V
 
-    iget-object v1, p0, Lrx/internal/a/s$2;->bKf:Lrx/internal/a/s;
+    iget-object v1, p0, Lrx/internal/a/s$2;->bKA:Lrx/internal/a/s;
 
-    iget-object v1, v1, Lrx/internal/a/s;->bJx:Lrx/Observable;
+    iget-object v1, v1, Lrx/internal/a/s;->bJS:Lrx/Observable;
 
     invoke-virtual {v1, v0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/s$3$1.smali b/com.discord/smali_classes2/rx/internal/a/s$3$1.smali
index a9e73a8c7a..02cbbc3445 100644
--- a/com.discord/smali_classes2/rx/internal/a/s$3$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s$3$1.smali
@@ -23,18 +23,18 @@
 
 
 # instance fields
-.field final synthetic bKh:Lrx/Subscriber;
+.field final synthetic bKC:Lrx/Subscriber;
 
-.field final synthetic bKi:Lrx/internal/a/s$3;
+.field final synthetic bKD:Lrx/internal/a/s$3;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/s$3;Lrx/Subscriber;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/s$3$1;->bKi:Lrx/internal/a/s$3;
+    iput-object p1, p0, Lrx/internal/a/s$3$1;->bKD:Lrx/internal/a/s$3;
 
-    iput-object p3, p0, Lrx/internal/a/s$3$1;->bKh:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/s$3$1;->bKC:Lrx/Subscriber;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -46,7 +46,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->bKh:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bKC:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -56,7 +56,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->bKh:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bKC:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -68,9 +68,9 @@
 
     check-cast p1, Lrx/d;
 
-    iget-object v0, p1, Lrx/d;->bIF:Lrx/d$a;
+    iget-object v0, p1, Lrx/d;->bIZ:Lrx/d$a;
 
-    sget-object v1, Lrx/d$a;->bIJ:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bJd:Lrx/d$a;
 
     if-ne v0, v1, :cond_0
 
@@ -84,36 +84,36 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->bKi:Lrx/internal/a/s$3;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bKD:Lrx/internal/a/s$3;
 
-    iget-object v0, v0, Lrx/internal/a/s$3;->bKf:Lrx/internal/a/s;
+    iget-object v0, v0, Lrx/internal/a/s$3;->bKA:Lrx/internal/a/s;
 
-    iget-boolean v0, v0, Lrx/internal/a/s;->bJW:Z
+    iget-boolean v0, v0, Lrx/internal/a/s;->bKr:Z
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p0, Lrx/internal/a/s$3$1;->bKh:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/s$3$1;->bKC:Lrx/Subscriber;
 
     invoke-virtual {p1}, Lrx/Subscriber;->onCompleted()V
 
     return-void
 
     :cond_1
-    invoke-virtual {p1}, Lrx/d;->JX()Z
+    invoke-virtual {p1}, Lrx/d;->JK()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->bKi:Lrx/internal/a/s$3;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bKD:Lrx/internal/a/s$3;
 
-    iget-object v0, v0, Lrx/internal/a/s$3;->bKf:Lrx/internal/a/s;
+    iget-object v0, v0, Lrx/internal/a/s$3;->bKA:Lrx/internal/a/s;
 
-    iget-boolean v0, v0, Lrx/internal/a/s;->bJX:Z
+    iget-boolean v0, v0, Lrx/internal/a/s;->bKs:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->bKh:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bKC:Lrx/Subscriber;
 
     iget-object p1, p1, Lrx/d;->throwable:Ljava/lang/Throwable;
 
@@ -122,7 +122,7 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->bKh:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bKC:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/s$3.smali b/com.discord/smali_classes2/rx/internal/a/s$3.smali
index 61ef429486..215ca350b9 100644
--- a/com.discord/smali_classes2/rx/internal/a/s$3.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s$3.smali
@@ -29,14 +29,14 @@
 
 
 # instance fields
-.field final synthetic bKf:Lrx/internal/a/s;
+.field final synthetic bKA:Lrx/internal/a/s;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/s;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/s$3;->bKf:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$3;->bKA:Lrx/internal/a/s;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/s$4$1.smali b/com.discord/smali_classes2/rx/internal/a/s$4$1.smali
index 1f60066a48..846d09aee2 100644
--- a/com.discord/smali_classes2/rx/internal/a/s$4$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s$4$1.smali
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic bKm:Lrx/internal/a/s$4;
+.field final synthetic bKH:Lrx/internal/a/s$4;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/s$4;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/s$4$1;->bKm:Lrx/internal/a/s$4;
+    iput-object p1, p0, Lrx/internal/a/s$4$1;->bKH:Lrx/internal/a/s$4;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -42,9 +42,9 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/s$4$1;->bKm:Lrx/internal/a/s$4;
+    iget-object v0, p0, Lrx/internal/a/s$4$1;->bKH:Lrx/internal/a/s$4;
 
-    iget-object v0, v0, Lrx/internal/a/s$4;->bKa:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/s$4;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -54,9 +54,9 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/s$4$1;->bKm:Lrx/internal/a/s$4;
+    iget-object v0, p0, Lrx/internal/a/s$4$1;->bKH:Lrx/internal/a/s$4;
 
-    iget-object v0, v0, Lrx/internal/a/s$4;->bKa:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/s$4;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -66,9 +66,9 @@
 .method public final onNext(Ljava/lang/Object;)V
     .locals 4
 
-    iget-object p1, p0, Lrx/internal/a/s$4$1;->bKm:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->bKH:Lrx/internal/a/s$4;
 
-    iget-object p1, p1, Lrx/internal/a/s$4;->bKa:Lrx/Subscriber;
+    iget-object p1, p1, Lrx/internal/a/s$4;->bKv:Lrx/Subscriber;
 
     invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
 
@@ -76,9 +76,9 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lrx/internal/a/s$4$1;->bKm:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->bKH:Lrx/internal/a/s$4;
 
-    iget-object p1, p1, Lrx/internal/a/s$4;->bKd:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object p1, p1, Lrx/internal/a/s$4;->bKy:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -90,22 +90,22 @@
 
     if-lez p1, :cond_0
 
-    iget-object p1, p0, Lrx/internal/a/s$4$1;->bKm:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->bKH:Lrx/internal/a/s$4;
 
     iget-object p1, p1, Lrx/internal/a/s$4;->val$worker:Lrx/Scheduler$Worker;
 
-    iget-object v0, p0, Lrx/internal/a/s$4$1;->bKm:Lrx/internal/a/s$4;
+    iget-object v0, p0, Lrx/internal/a/s$4$1;->bKH:Lrx/internal/a/s$4;
 
-    iget-object v0, v0, Lrx/internal/a/s$4;->bKk:Lrx/functions/Action0;
+    iget-object v0, v0, Lrx/internal/a/s$4;->bKF:Lrx/functions/Action0;
 
     invoke-virtual {p1, v0}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;)Lrx/Subscription;
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lrx/internal/a/s$4$1;->bKm:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->bKH:Lrx/internal/a/s$4;
 
-    iget-object p1, p1, Lrx/internal/a/s$4;->bKl:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p1, Lrx/internal/a/s$4;->bKG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/s$4.smali b/com.discord/smali_classes2/rx/internal/a/s$4.smali
index 09f2413e55..6681c37845 100644
--- a/com.discord/smali_classes2/rx/internal/a/s$4.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s$4.smali
@@ -18,17 +18,17 @@
 
 
 # instance fields
-.field final synthetic bKa:Lrx/Subscriber;
+.field final synthetic bKA:Lrx/internal/a/s;
 
-.field final synthetic bKd:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic bKE:Lrx/Observable;
 
-.field final synthetic bKf:Lrx/internal/a/s;
+.field final synthetic bKF:Lrx/functions/Action0;
 
-.field final synthetic bKj:Lrx/Observable;
+.field final synthetic bKG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic bKk:Lrx/functions/Action0;
+.field final synthetic bKv:Lrx/Subscriber;
 
-.field final synthetic bKl:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic bKy:Ljava/util/concurrent/atomic/AtomicLong;
 
 .field final synthetic val$worker:Lrx/Scheduler$Worker;
 
@@ -37,19 +37,19 @@
 .method constructor <init>(Lrx/internal/a/s;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 p1, p0, Lrx/internal/a/s$4;->bKf:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$4;->bKA:Lrx/internal/a/s;
 
-    iput-object p2, p0, Lrx/internal/a/s$4;->bKj:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/s$4;->bKE:Lrx/Observable;
 
-    iput-object p3, p0, Lrx/internal/a/s$4;->bKa:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/s$4;->bKv:Lrx/Subscriber;
 
-    iput-object p4, p0, Lrx/internal/a/s$4;->bKd:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p4, p0, Lrx/internal/a/s$4;->bKy:Ljava/util/concurrent/atomic/AtomicLong;
 
     iput-object p5, p0, Lrx/internal/a/s$4;->val$worker:Lrx/Scheduler$Worker;
 
-    iput-object p6, p0, Lrx/internal/a/s$4;->bKk:Lrx/functions/Action0;
+    iput-object p6, p0, Lrx/internal/a/s$4;->bKF:Lrx/functions/Action0;
 
-    iput-object p7, p0, Lrx/internal/a/s$4;->bKl:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p7, p0, Lrx/internal/a/s$4;->bKG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -61,11 +61,11 @@
 .method public final call()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/a/s$4;->bKj:Lrx/Observable;
+    iget-object v0, p0, Lrx/internal/a/s$4;->bKE:Lrx/Observable;
 
     new-instance v1, Lrx/internal/a/s$4$1;
 
-    iget-object v2, p0, Lrx/internal/a/s$4;->bKa:Lrx/Subscriber;
+    iget-object v2, p0, Lrx/internal/a/s$4;->bKv:Lrx/Subscriber;
 
     invoke-direct {v1, p0, v2}, Lrx/internal/a/s$4$1;-><init>(Lrx/internal/a/s$4;Lrx/Subscriber;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/s$5.smali b/com.discord/smali_classes2/rx/internal/a/s$5.smali
index 3ecaf83de6..be44ad0c38 100644
--- a/com.discord/smali_classes2/rx/internal/a/s$5.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s$5.smali
@@ -18,15 +18,15 @@
 
 
 # instance fields
-.field final synthetic bKc:Lrx/internal/b/a;
+.field final synthetic bKA:Lrx/internal/a/s;
 
-.field final synthetic bKd:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic bKF:Lrx/functions/Action0;
 
-.field final synthetic bKf:Lrx/internal/a/s;
+.field final synthetic bKG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic bKk:Lrx/functions/Action0;
+.field final synthetic bKx:Lrx/internal/b/a;
 
-.field final synthetic bKl:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic bKy:Ljava/util/concurrent/atomic/AtomicLong;
 
 .field final synthetic val$worker:Lrx/Scheduler$Worker;
 
@@ -35,17 +35,17 @@
 .method constructor <init>(Lrx/internal/a/s;Ljava/util/concurrent/atomic/AtomicLong;Lrx/internal/b/a;Ljava/util/concurrent/atomic/AtomicBoolean;Lrx/Scheduler$Worker;Lrx/functions/Action0;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/s$5;->bKf:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$5;->bKA:Lrx/internal/a/s;
 
-    iput-object p2, p0, Lrx/internal/a/s$5;->bKd:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p2, p0, Lrx/internal/a/s$5;->bKy:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p3, p0, Lrx/internal/a/s$5;->bKc:Lrx/internal/b/a;
+    iput-object p3, p0, Lrx/internal/a/s$5;->bKx:Lrx/internal/b/a;
 
-    iput-object p4, p0, Lrx/internal/a/s$5;->bKl:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p4, p0, Lrx/internal/a/s$5;->bKG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     iput-object p5, p0, Lrx/internal/a/s$5;->val$worker:Lrx/Scheduler$Worker;
 
-    iput-object p6, p0, Lrx/internal/a/s$5;->bKk:Lrx/functions/Action0;
+    iput-object p6, p0, Lrx/internal/a/s$5;->bKF:Lrx/functions/Action0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,15 +63,15 @@
 
     if-lez v2, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/s$5;->bKd:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/s$5;->bKy:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-static {v0, p1, p2}, Lrx/internal/a/a;->a(Ljava/util/concurrent/atomic/AtomicLong;J)J
 
-    iget-object v0, p0, Lrx/internal/a/s$5;->bKc:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/s$5;->bKx:Lrx/internal/b/a;
 
     invoke-virtual {v0, p1, p2}, Lrx/internal/b/a;->request(J)V
 
-    iget-object p1, p0, Lrx/internal/a/s$5;->bKl:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lrx/internal/a/s$5;->bKG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 p2, 0x1
 
@@ -85,7 +85,7 @@
 
     iget-object p1, p0, Lrx/internal/a/s$5;->val$worker:Lrx/Scheduler$Worker;
 
-    iget-object p2, p0, Lrx/internal/a/s$5;->bKk:Lrx/functions/Action0;
+    iget-object p2, p0, Lrx/internal/a/s$5;->bKF:Lrx/functions/Action0;
 
     invoke-virtual {p1, p2}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/s.smali b/com.discord/smali_classes2/rx/internal/a/s.smali
index 084112c0b7..41a56088fa 100644
--- a/com.discord/smali_classes2/rx/internal/a/s.smali
+++ b/com.discord/smali_classes2/rx/internal/a/s.smali
@@ -20,7 +20,7 @@
 
 
 # static fields
-.field static final bJY:Lrx/functions/b;
+.field static final bKt:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -36,7 +36,16 @@
 
 
 # instance fields
-.field private final bJV:Lrx/functions/b;
+.field final bJS:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field private final bKq:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -51,18 +60,9 @@
     .end annotation
 .end field
 
-.field final bJW:Z
+.field final bKr:Z
 
-.field final bJX:Z
-
-.field final bJx:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
+.field final bKs:Z
 
 .field private final scheduler:Lrx/Scheduler;
 
@@ -75,7 +75,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/s$1;-><init>()V
 
-    sput-object v0, Lrx/internal/a/s;->bJY:Lrx/functions/b;
+    sput-object v0, Lrx/internal/a/s;->bKt:Lrx/functions/b;
 
     return-void
 .end method
@@ -102,13 +102,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/s;->bJx:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/s;->bJS:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/s;->bJV:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/s;->bKq:Lrx/functions/b;
 
-    iput-boolean p3, p0, Lrx/internal/a/s;->bJW:Z
+    iput-boolean p3, p0, Lrx/internal/a/s;->bKr:Z
 
-    iput-boolean p4, p0, Lrx/internal/a/s;->bJX:Z
+    iput-boolean p4, p0, Lrx/internal/a/s;->bKs:Z
 
     iput-object p5, p0, Lrx/internal/a/s;->scheduler:Lrx/Scheduler;
 
@@ -139,7 +139,7 @@
 
     new-instance v6, Lrx/internal/a/s;
 
-    invoke-static {}, Lrx/d/a;->LE()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ls()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -186,7 +186,7 @@
 
     new-instance v6, Lrx/internal/a/s;
 
-    invoke-static {}, Lrx/d/a;->LE()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ls()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -228,7 +228,7 @@
 
     iget-object v0, p0, Lrx/internal/a/s;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object v10
 
@@ -240,7 +240,7 @@
 
     invoke-virtual {p1, v6}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->LI()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Lw()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -266,7 +266,7 @@
     move-object v7, v1
 
     :goto_0
-    invoke-static {}, Lrx/observers/a;->Lp()Lrx/e;
+    invoke-static {}, Lrx/observers/a;->Ld()Lrx/e;
 
     move-result-object v0
 
@@ -296,7 +296,7 @@
 
     invoke-direct/range {v0 .. v6}, Lrx/internal/a/s$2;-><init>(Lrx/internal/a/s;Lrx/Subscriber;Lrx/subjects/Subject;Lrx/internal/b/a;Ljava/util/concurrent/atomic/AtomicLong;Lrx/subscriptions/SerialSubscription;)V
 
-    iget-object v0, p0, Lrx/internal/a/s;->bJV:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/s;->bKq:Lrx/functions/b;
 
     new-instance v1, Lrx/internal/a/s$3;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/t$1.smali b/com.discord/smali_classes2/rx/internal/a/t$1.smali
index f2b1bcb314..1fc38b222b 100644
--- a/com.discord/smali_classes2/rx/internal/a/t$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/t$1.smali
@@ -27,22 +27,22 @@
 
 
 # instance fields
-.field final synthetic bKq:Lrx/Subscriber;
+.field final synthetic bKL:Lrx/Subscriber;
 
-.field final synthetic bKr:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic bKM:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic bKs:Lrx/internal/a/t;
+.field final synthetic bKN:Lrx/internal/a/t;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/t;Lrx/Subscriber;Ljava/util/concurrent/atomic/AtomicBoolean;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/t$1;->bKs:Lrx/internal/a/t;
+    iput-object p1, p0, Lrx/internal/a/t$1;->bKN:Lrx/internal/a/t;
 
-    iput-object p2, p0, Lrx/internal/a/t$1;->bKq:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/t$1;->bKL:Lrx/Subscriber;
 
-    iput-object p3, p0, Lrx/internal/a/t$1;->bKr:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p3, p0, Lrx/internal/a/t$1;->bKM:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,31 +59,31 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/t$1;->bKs:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$1;->bKN:Lrx/internal/a/t;
 
-    iget-object v1, v1, Lrx/internal/a/t;->bKo:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, v1, Lrx/internal/a/t;->bKJ:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v1, p1}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/t$1;->bKs:Lrx/internal/a/t;
+    iget-object p1, p0, Lrx/internal/a/t$1;->bKN:Lrx/internal/a/t;
 
-    iget-object v1, p0, Lrx/internal/a/t$1;->bKq:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/t$1;->bKL:Lrx/Subscriber;
 
-    iget-object v2, p0, Lrx/internal/a/t$1;->bKs:Lrx/internal/a/t;
+    iget-object v2, p0, Lrx/internal/a/t$1;->bKN:Lrx/internal/a/t;
 
-    iget-object v2, v2, Lrx/internal/a/t;->bKo:Lrx/subscriptions/CompositeSubscription;
+    iget-object v2, v2, Lrx/internal/a/t;->bKJ:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {p1, v1, v2}, Lrx/internal/a/t;->a(Lrx/Subscriber;Lrx/subscriptions/CompositeSubscription;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lrx/internal/a/t$1;->bKs:Lrx/internal/a/t;
+    iget-object p1, p0, Lrx/internal/a/t$1;->bKN:Lrx/internal/a/t;
 
     iget-object p1, p1, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
-    iget-object p1, p0, Lrx/internal/a/t$1;->bKr:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lrx/internal/a/t$1;->bKM:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {p1, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
@@ -92,13 +92,13 @@
     :catchall_0
     move-exception p1
 
-    iget-object v1, p0, Lrx/internal/a/t$1;->bKs:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$1;->bKN:Lrx/internal/a/t;
 
     iget-object v1, v1, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
-    iget-object v1, p0, Lrx/internal/a/t$1;->bKr:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, p0, Lrx/internal/a/t$1;->bKM:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/t$2.smali b/com.discord/smali_classes2/rx/internal/a/t$2.smali
index d8711b3df5..d199e95cd9 100644
--- a/com.discord/smali_classes2/rx/internal/a/t$2.smali
+++ b/com.discord/smali_classes2/rx/internal/a/t$2.smali
@@ -22,22 +22,22 @@
 
 
 # instance fields
-.field final synthetic bKq:Lrx/Subscriber;
+.field final synthetic bKL:Lrx/Subscriber;
 
-.field final synthetic bKs:Lrx/internal/a/t;
+.field final synthetic bKN:Lrx/internal/a/t;
 
-.field final synthetic bKt:Lrx/subscriptions/CompositeSubscription;
+.field final synthetic bKO:Lrx/subscriptions/CompositeSubscription;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/t;Lrx/Subscriber;Lrx/Subscriber;Lrx/subscriptions/CompositeSubscription;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/t$2;->bKs:Lrx/internal/a/t;
+    iput-object p1, p0, Lrx/internal/a/t$2;->bKN:Lrx/internal/a/t;
 
-    iput-object p3, p0, Lrx/internal/a/t$2;->bKq:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/t$2;->bKL:Lrx/Subscriber;
 
-    iput-object p4, p0, Lrx/internal/a/t$2;->bKt:Lrx/subscriptions/CompositeSubscription;
+    iput-object p4, p0, Lrx/internal/a/t$2;->bKO:Lrx/subscriptions/CompositeSubscription;
 
     invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -47,22 +47,22 @@
 .method private cleanup()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bKN:Lrx/internal/a/t;
 
     iget-object v0, v0, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/t$2;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bKN:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bKo:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->bKJ:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v1, p0, Lrx/internal/a/t$2;->bKt:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/a/t$2;->bKO:Lrx/subscriptions/CompositeSubscription;
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bKN:Lrx/internal/a/t;
 
     invoke-static {v0}, Lrx/internal/a/t;->a(Lrx/internal/a/t;)Lrx/b/b;
 
@@ -72,7 +72,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bKN:Lrx/internal/a/t;
 
     invoke-static {v0}, Lrx/internal/a/t;->a(Lrx/internal/a/t;)Lrx/b/b;
 
@@ -83,23 +83,23 @@
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/t$2;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bKN:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bKo:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->bKJ:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bKN:Lrx/internal/a/t;
 
     new-instance v1, Lrx/subscriptions/CompositeSubscription;
 
     invoke-direct {v1}, Lrx/subscriptions/CompositeSubscription;-><init>()V
 
-    iput-object v1, v0, Lrx/internal/a/t;->bKo:Lrx/subscriptions/CompositeSubscription;
+    iput-object v1, v0, Lrx/internal/a/t;->bKJ:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bKN:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bKp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lrx/internal/a/t;->bKK:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/4 v1, 0x0
 
@@ -108,7 +108,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :cond_1
-    iget-object v0, p0, Lrx/internal/a/t$2;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bKN:Lrx/internal/a/t;
 
     iget-object v0, v0, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
 
@@ -119,7 +119,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/t$2;->bKs:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$2;->bKN:Lrx/internal/a/t;
 
     iget-object v1, v1, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
 
@@ -135,7 +135,7 @@
 
     invoke-direct {p0}, Lrx/internal/a/t$2;->cleanup()V
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bKq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bKL:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -147,7 +147,7 @@
 
     invoke-direct {p0}, Lrx/internal/a/t$2;->cleanup()V
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bKq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bKL:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -162,7 +162,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bKq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bKL:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/t$3.smali b/com.discord/smali_classes2/rx/internal/a/t$3.smali
index b29ed96183..d826be4949 100644
--- a/com.discord/smali_classes2/rx/internal/a/t$3.smali
+++ b/com.discord/smali_classes2/rx/internal/a/t$3.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bKs:Lrx/internal/a/t;
+.field final synthetic bKN:Lrx/internal/a/t;
 
-.field final synthetic bKu:Lrx/subscriptions/CompositeSubscription;
+.field final synthetic bKP:Lrx/subscriptions/CompositeSubscription;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/t;Lrx/subscriptions/CompositeSubscription;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/t$3;->bKs:Lrx/internal/a/t;
+    iput-object p1, p0, Lrx/internal/a/t$3;->bKN:Lrx/internal/a/t;
 
-    iput-object p2, p0, Lrx/internal/a/t$3;->bKu:Lrx/subscriptions/CompositeSubscription;
+    iput-object p2, p0, Lrx/internal/a/t$3;->bKP:Lrx/subscriptions/CompositeSubscription;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,24 +41,24 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bKN:Lrx/internal/a/t;
 
     iget-object v0, v0, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/t$3;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bKN:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bKo:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->bKJ:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v1, p0, Lrx/internal/a/t$3;->bKu:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/a/t$3;->bKP:Lrx/subscriptions/CompositeSubscription;
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bKN:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bKp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lrx/internal/a/t;->bKK:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
 
@@ -66,7 +66,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bKN:Lrx/internal/a/t;
 
     invoke-static {v0}, Lrx/internal/a/t;->a(Lrx/internal/a/t;)Lrx/b/b;
 
@@ -76,7 +76,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bKN:Lrx/internal/a/t;
 
     invoke-static {v0}, Lrx/internal/a/t;->a(Lrx/internal/a/t;)Lrx/b/b;
 
@@ -87,24 +87,24 @@
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/t$3;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bKN:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bKo:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->bKJ:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bKN:Lrx/internal/a/t;
 
     new-instance v1, Lrx/subscriptions/CompositeSubscription;
 
     invoke-direct {v1}, Lrx/subscriptions/CompositeSubscription;-><init>()V
 
-    iput-object v1, v0, Lrx/internal/a/t;->bKo:Lrx/subscriptions/CompositeSubscription;
+    iput-object v1, v0, Lrx/internal/a/t;->bKJ:Lrx/subscriptions/CompositeSubscription;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :cond_1
-    iget-object v0, p0, Lrx/internal/a/t$3;->bKs:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bKN:Lrx/internal/a/t;
 
     iget-object v0, v0, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
 
@@ -115,7 +115,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/t$3;->bKs:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$3;->bKN:Lrx/internal/a/t;
 
     iget-object v1, v1, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/t.smali b/com.discord/smali_classes2/rx/internal/a/t.smali
index 0e17052e61..6da7cbed2b 100644
--- a/com.discord/smali_classes2/rx/internal/a/t.smali
+++ b/com.discord/smali_classes2/rx/internal/a/t.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final bKn:Lrx/b/b;
+.field private final bKI:Lrx/b/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/b/b<",
@@ -29,9 +29,9 @@
     .end annotation
 .end field
 
-.field volatile bKo:Lrx/subscriptions/CompositeSubscription;
+.field volatile bKJ:Lrx/subscriptions/CompositeSubscription;
 
-.field final bKp:Ljava/util/concurrent/atomic/AtomicInteger;
+.field final bKK:Ljava/util/concurrent/atomic/AtomicInteger;
 
 .field final lock:Ljava/util/concurrent/locks/ReentrantLock;
 
@@ -53,7 +53,7 @@
 
     invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/a/t;->bKo:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lrx/internal/a/t;->bKJ:Lrx/subscriptions/CompositeSubscription;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
 
@@ -61,7 +61,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object v0, p0, Lrx/internal/a/t;->bKp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lrx/internal/a/t;->bKK:Ljava/util/concurrent/atomic/AtomicInteger;
 
     new-instance v0, Ljava/util/concurrent/locks/ReentrantLock;
 
@@ -69,7 +69,7 @@
 
     iput-object v0, p0, Lrx/internal/a/t;->lock:Ljava/util/concurrent/locks/ReentrantLock;
 
-    iput-object p1, p0, Lrx/internal/a/t;->bKn:Lrx/b/b;
+    iput-object p1, p0, Lrx/internal/a/t;->bKI:Lrx/b/b;
 
     return-void
 .end method
@@ -77,7 +77,7 @@
 .method static synthetic a(Lrx/internal/a/t;)Lrx/b/b;
     .locals 0
 
-    iget-object p0, p0, Lrx/internal/a/t;->bKn:Lrx/b/b;
+    iget-object p0, p0, Lrx/internal/a/t;->bKI:Lrx/b/b;
 
     return-object p0
 .end method
@@ -106,7 +106,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object v0, p0, Lrx/internal/a/t;->bKn:Lrx/b/b;
+    iget-object v0, p0, Lrx/internal/a/t;->bKI:Lrx/b/b;
 
     new-instance v1, Lrx/internal/a/t$2;
 
@@ -126,7 +126,7 @@
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
 
-    iget-object v0, p0, Lrx/internal/a/t;->bKp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lrx/internal/a/t;->bKK:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
@@ -141,7 +141,7 @@
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/t;->bKn:Lrx/b/b;
+    iget-object v1, p0, Lrx/internal/a/t;->bKI:Lrx/b/b;
 
     new-instance v2, Lrx/internal/a/t$1;
 
@@ -182,7 +182,7 @@
 
     :cond_2
     :try_start_1
-    iget-object v0, p0, Lrx/internal/a/t;->bKo:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/a/t;->bKJ:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {p0, p1, v0}, Lrx/internal/a/t;->a(Lrx/Subscriber;Lrx/subscriptions/CompositeSubscription;)V
     :try_end_1
diff --git a/com.discord/smali_classes2/rx/internal/a/u$1.smali b/com.discord/smali_classes2/rx/internal/a/u$1.smali
index 3773eff323..b94b074535 100644
--- a/com.discord/smali_classes2/rx/internal/a/u$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/u$1.smali
@@ -22,13 +22,11 @@
 
 
 # instance fields
-.field final synthetic bKA:Lrx/internal/a/u;
+.field private bKR:Z
 
-.field private bKw:Z
+.field private bKS:Z
 
-.field private bKx:Z
-
-.field private bKy:Ljava/lang/Object;
+.field private bKT:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -36,16 +34,18 @@
     .end annotation
 .end field
 
-.field final synthetic bKz:Lrx/g;
+.field final synthetic bKU:Lrx/g;
+
+.field final synthetic bKV:Lrx/internal/a/u;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/u;Lrx/g;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/u$1;->bKA:Lrx/internal/a/u;
+    iput-object p1, p0, Lrx/internal/a/u$1;->bKV:Lrx/internal/a/u;
 
-    iput-object p2, p0, Lrx/internal/a/u$1;->bKz:Lrx/g;
+    iput-object p2, p0, Lrx/internal/a/u$1;->bKU:Lrx/g;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -57,24 +57,24 @@
 .method public final onCompleted()V
     .locals 3
 
-    iget-boolean v0, p0, Lrx/internal/a/u$1;->bKw:Z
+    iget-boolean v0, p0, Lrx/internal/a/u$1;->bKR:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/u$1;->bKx:Z
+    iget-boolean v0, p0, Lrx/internal/a/u$1;->bKS:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/u$1;->bKz:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/u$1;->bKU:Lrx/g;
 
-    iget-object v1, p0, Lrx/internal/a/u$1;->bKy:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/u$1;->bKT:Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Lrx/g;->onSuccess(Ljava/lang/Object;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/u$1;->bKz:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/u$1;->bKU:Lrx/g;
 
     new-instance v1, Ljava/util/NoSuchElementException;
 
@@ -91,7 +91,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/u$1;->bKz:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/u$1;->bKU:Lrx/g;
 
     invoke-virtual {v0, p1}, Lrx/g;->onError(Ljava/lang/Throwable;)V
 
@@ -108,15 +108,15 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/u$1;->bKx:Z
+    iget-boolean v0, p0, Lrx/internal/a/u$1;->bKS:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_0
 
-    iput-boolean v1, p0, Lrx/internal/a/u$1;->bKw:Z
+    iput-boolean v1, p0, Lrx/internal/a/u$1;->bKR:Z
 
-    iget-object p1, p0, Lrx/internal/a/u$1;->bKz:Lrx/g;
+    iget-object p1, p0, Lrx/internal/a/u$1;->bKU:Lrx/g;
 
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
@@ -131,9 +131,9 @@
     return-void
 
     :cond_0
-    iput-boolean v1, p0, Lrx/internal/a/u$1;->bKx:Z
+    iput-boolean v1, p0, Lrx/internal/a/u$1;->bKS:Z
 
-    iput-object p1, p0, Lrx/internal/a/u$1;->bKy:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/u$1;->bKT:Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/u.smali b/com.discord/smali_classes2/rx/internal/a/u.smali
index e310fffa05..0ce76bbd43 100644
--- a/com.discord/smali_classes2/rx/internal/a/u.smali
+++ b/com.discord/smali_classes2/rx/internal/a/u.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final bKv:Lrx/Observable;
+.field private final bKQ:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -43,7 +43,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/u;->bKv:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/u;->bKQ:Lrx/Observable;
 
     return-void
 .end method
@@ -82,7 +82,7 @@
 
     invoke-virtual {p1, v0}, Lrx/g;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/u;->bKv:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/u;->bKQ:Lrx/Observable;
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Subscriber;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/w$a.smali b/com.discord/smali_classes2/rx/internal/a/w$a.smali
index d6c5215356..f61ce8eff7 100644
--- a/com.discord/smali_classes2/rx/internal/a/w$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/w$a.smali
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field final bJF:Lrx/internal/b/a;
+.field final bKa:Lrx/internal/b/a;
 
 
 # direct methods
@@ -54,7 +54,7 @@
 
     iput-object p1, p0, Lrx/internal/a/w$a;->actual:Lrx/Subscriber;
 
-    iput-object p2, p0, Lrx/internal/a/w$a;->bJF:Lrx/internal/b/a;
+    iput-object p2, p0, Lrx/internal/a/w$a;->bKa:Lrx/internal/b/a;
 
     return-void
 .end method
@@ -99,7 +99,7 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/w$a;->bJF:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/w$a;->bKa:Lrx/internal/b/a;
 
     invoke-virtual {v0, p1}, Lrx/internal/b/a;->setProducer(Lrx/Producer;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/w$b$a.smali b/com.discord/smali_classes2/rx/internal/a/w$b$a.smali
index f75c57046d..4a28e06d8f 100644
--- a/com.discord/smali_classes2/rx/internal/a/w$b$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/w$b$a.smali
@@ -18,20 +18,20 @@
 
 
 # instance fields
-.field final bKH:J
+.field final bLc:J
 
-.field final synthetic bKI:Lrx/internal/a/w$b;
+.field final synthetic bLd:Lrx/internal/a/w$b;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/w$b;J)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/w$b$a;->bKI:Lrx/internal/a/w$b;
+    iput-object p1, p0, Lrx/internal/a/w$b$a;->bLd:Lrx/internal/a/w$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide p2, p0, Lrx/internal/a/w$b$a;->bKH:J
+    iput-wide p2, p0, Lrx/internal/a/w$b$a;->bLc:J
 
     return-void
 .end method
@@ -41,11 +41,11 @@
 .method public final call()V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/w$b$a;->bKI:Lrx/internal/a/w$b;
+    iget-object v0, p0, Lrx/internal/a/w$b$a;->bLd:Lrx/internal/a/w$b;
 
-    iget-wide v1, p0, Lrx/internal/a/w$b$a;->bKH:J
+    iget-wide v1, p0, Lrx/internal/a/w$b$a;->bLc:J
 
-    iget-object v3, v0, Lrx/internal/a/w$b;->bKD:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/w$b;->bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-wide v4, 0x7fffffffffffffffL
 
@@ -57,7 +57,7 @@
 
     invoke-virtual {v0}, Lrx/internal/a/w$b;->unsubscribe()V
 
-    iget-object v1, v0, Lrx/internal/a/w$b;->bKB:Lrx/Observable;
+    iget-object v1, v0, Lrx/internal/a/w$b;->bKW:Lrx/Observable;
 
     if-nez v1, :cond_0
 
@@ -72,7 +72,7 @@
     return-void
 
     :cond_0
-    iget-wide v1, v0, Lrx/internal/a/w$b;->bKG:J
+    iget-wide v1, v0, Lrx/internal/a/w$b;->bLb:J
 
     const-wide/16 v3, 0x0
 
@@ -80,7 +80,7 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v3, v0, Lrx/internal/a/w$b;->bJF:Lrx/internal/b/a;
+    iget-object v3, v0, Lrx/internal/a/w$b;->bKa:Lrx/internal/b/a;
 
     invoke-virtual {v3, v1, v2}, Lrx/internal/b/a;->bc(J)V
 
@@ -89,11 +89,11 @@
 
     iget-object v2, v0, Lrx/internal/a/w$b;->actual:Lrx/Subscriber;
 
-    iget-object v3, v0, Lrx/internal/a/w$b;->bJF:Lrx/internal/b/a;
+    iget-object v3, v0, Lrx/internal/a/w$b;->bKa:Lrx/internal/b/a;
 
     invoke-direct {v1, v2, v3}, Lrx/internal/a/w$a;-><init>(Lrx/Subscriber;Lrx/internal/b/a;)V
 
-    iget-object v2, v0, Lrx/internal/a/w$b;->bKF:Lrx/internal/d/a;
+    iget-object v2, v0, Lrx/internal/a/w$b;->bLa:Lrx/internal/d/a;
 
     invoke-virtual {v2, v1}, Lrx/internal/d/a;->b(Lrx/Subscription;)Z
 
@@ -101,7 +101,7 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v0, v0, Lrx/internal/a/w$b;->bKB:Lrx/Observable;
+    iget-object v0, v0, Lrx/internal/a/w$b;->bKW:Lrx/Observable;
 
     invoke-static {v1, v0}, Lrx/Observable;->a(Lrx/Subscriber;Lrx/Observable;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/w$b.smali b/com.discord/smali_classes2/rx/internal/a/w$b.smali
index 2c9500adeb..2c75ceb465 100644
--- a/com.discord/smali_classes2/rx/internal/a/w$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/w$b.smali
@@ -40,9 +40,7 @@
     .end annotation
 .end field
 
-.field final bJF:Lrx/internal/b/a;
-
-.field final bKB:Lrx/Observable;
+.field final bKW:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -51,15 +49,17 @@
     .end annotation
 .end field
 
-.field final bKC:Lrx/Scheduler$Worker;
+.field final bKX:Lrx/Scheduler$Worker;
 
-.field final bKD:Ljava/util/concurrent/atomic/AtomicLong;
+.field final bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final bKE:Lrx/internal/d/a;
+.field final bKZ:Lrx/internal/d/a;
 
-.field final bKF:Lrx/internal/d/a;
+.field final bKa:Lrx/internal/b/a;
 
-.field bKG:J
+.field final bLa:Lrx/internal/d/a;
+
+.field bLb:J
 
 .field final timeout:J
 
@@ -89,37 +89,37 @@
 
     iput-object p4, p0, Lrx/internal/a/w$b;->unit:Ljava/util/concurrent/TimeUnit;
 
-    iput-object p5, p0, Lrx/internal/a/w$b;->bKC:Lrx/Scheduler$Worker;
+    iput-object p5, p0, Lrx/internal/a/w$b;->bKX:Lrx/Scheduler$Worker;
 
-    iput-object p6, p0, Lrx/internal/a/w$b;->bKB:Lrx/Observable;
+    iput-object p6, p0, Lrx/internal/a/w$b;->bKW:Lrx/Observable;
 
     new-instance p1, Lrx/internal/b/a;
 
     invoke-direct {p1}, Lrx/internal/b/a;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/w$b;->bJF:Lrx/internal/b/a;
+    iput-object p1, p0, Lrx/internal/a/w$b;->bKa:Lrx/internal/b/a;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/w$b;->bKD:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lrx/internal/a/w$b;->bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
     new-instance p1, Lrx/internal/d/a;
 
     invoke-direct {p1}, Lrx/internal/d/a;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/w$b;->bKE:Lrx/internal/d/a;
+    iput-object p1, p0, Lrx/internal/a/w$b;->bKZ:Lrx/internal/d/a;
 
     new-instance p1, Lrx/internal/d/a;
 
     invoke-direct {p1, p0}, Lrx/internal/d/a;-><init>(Lrx/Subscription;)V
 
-    iput-object p1, p0, Lrx/internal/a/w$b;->bKF:Lrx/internal/d/a;
+    iput-object p1, p0, Lrx/internal/a/w$b;->bLa:Lrx/internal/d/a;
 
     invoke-virtual {p0, p5}, Lrx/internal/a/w$b;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/w$b;->bKE:Lrx/internal/d/a;
+    iget-object p1, p0, Lrx/internal/a/w$b;->bKZ:Lrx/internal/d/a;
 
     invoke-virtual {p0, p1}, Lrx/internal/a/w$b;->add(Lrx/Subscription;)V
 
@@ -131,9 +131,9 @@
 .method final aY(J)V
     .locals 4
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->bKE:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bKZ:Lrx/internal/d/a;
 
-    iget-object v1, p0, Lrx/internal/a/w$b;->bKC:Lrx/Scheduler$Worker;
+    iget-object v1, p0, Lrx/internal/a/w$b;->bKX:Lrx/Scheduler$Worker;
 
     new-instance v2, Lrx/internal/a/w$b$a;
 
@@ -155,7 +155,7 @@
 .method public final onCompleted()V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->bKD:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-wide v1, 0x7fffffffffffffffL
 
@@ -167,7 +167,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->bKE:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bKZ:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->unsubscribe()V
 
@@ -175,7 +175,7 @@
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->bKC:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bKX:Lrx/Scheduler$Worker;
 
     invoke-virtual {v0}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -186,7 +186,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->bKD:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-wide v1, 0x7fffffffffffffffL
 
@@ -198,7 +198,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->bKE:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bKZ:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->unsubscribe()V
 
@@ -206,7 +206,7 @@
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
-    iget-object p1, p0, Lrx/internal/a/w$b;->bKC:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/w$b;->bKX:Lrx/Scheduler$Worker;
 
     invoke-virtual {p1}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -226,7 +226,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->bKD:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -238,7 +238,7 @@
 
     if-eqz v4, :cond_2
 
-    iget-object v2, p0, Lrx/internal/a/w$b;->bKD:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v2, p0, Lrx/internal/a/w$b;->bKY:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-wide/16 v3, 0x1
 
@@ -253,7 +253,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/w$b;->bKE:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bKZ:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->get()Ljava/lang/Object;
 
@@ -266,11 +266,11 @@
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     :cond_1
-    iget-wide v0, p0, Lrx/internal/a/w$b;->bKG:J
+    iget-wide v0, p0, Lrx/internal/a/w$b;->bLb:J
 
     add-long/2addr v0, v3
 
-    iput-wide v0, p0, Lrx/internal/a/w$b;->bKG:J
+    iput-wide v0, p0, Lrx/internal/a/w$b;->bLb:J
 
     iget-object v0, p0, Lrx/internal/a/w$b;->actual:Lrx/Subscriber;
 
@@ -286,7 +286,7 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->bJF:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bKa:Lrx/internal/b/a;
 
     invoke-virtual {v0, p1}, Lrx/internal/b/a;->setProducer(Lrx/Producer;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/w.smali b/com.discord/smali_classes2/rx/internal/a/w.smali
index 157c319dcd..9928a3dbce 100644
--- a/com.discord/smali_classes2/rx/internal/a/w.smali
+++ b/com.discord/smali_classes2/rx/internal/a/w.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field final bJx:Lrx/Observable;
+.field final bJS:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field final bKB:Lrx/Observable;
+.field final bKW:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -69,7 +69,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/w;->bJx:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/w;->bJS:Lrx/Observable;
 
     iput-wide p2, p0, Lrx/internal/a/w;->timeout:J
 
@@ -79,7 +79,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lrx/internal/a/w;->bKB:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/w;->bKW:Lrx/Observable;
 
     return-void
 .end method
@@ -99,11 +99,11 @@
 
     iget-object v0, p0, Lrx/internal/a/w;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object v5
 
-    iget-object v6, p0, Lrx/internal/a/w;->bKB:Lrx/Observable;
+    iget-object v6, p0, Lrx/internal/a/w;->bKW:Lrx/Observable;
 
     move-object v0, v7
 
@@ -111,11 +111,11 @@
 
     invoke-direct/range {v0 .. v6}, Lrx/internal/a/w$b;-><init>(Lrx/Subscriber;JLjava/util/concurrent/TimeUnit;Lrx/Scheduler$Worker;Lrx/Observable;)V
 
-    iget-object v0, v7, Lrx/internal/a/w$b;->bKF:Lrx/internal/d/a;
+    iget-object v0, v7, Lrx/internal/a/w$b;->bLa:Lrx/internal/d/a;
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object v0, v7, Lrx/internal/a/w$b;->bJF:Lrx/internal/b/a;
+    iget-object v0, v7, Lrx/internal/a/w$b;->bKa:Lrx/internal/b/a;
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
@@ -123,7 +123,7 @@
 
     invoke-virtual {v7, v0, v1}, Lrx/internal/a/w$b;->aY(J)V
 
-    iget-object p1, p0, Lrx/internal/a/w;->bJx:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/w;->bJS:Lrx/Observable;
 
     invoke-static {v7, p1}, Lrx/Observable;->a(Lrx/Subscriber;Lrx/Observable;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/x$1.smali b/com.discord/smali_classes2/rx/internal/a/x$1.smali
index 54aead29bb..5c1a8a943b 100644
--- a/com.discord/smali_classes2/rx/internal/a/x$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/x$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bKJ:Lrx/internal/a/x;
+.field final synthetic bKv:Lrx/Subscriber;
 
-.field final synthetic bKa:Lrx/Subscriber;
+.field final synthetic bLe:Lrx/internal/a/x;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/x;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/x$1;->bKJ:Lrx/internal/a/x;
+    iput-object p1, p0, Lrx/internal/a/x$1;->bLe:Lrx/internal/a/x;
 
-    iput-object p2, p0, Lrx/internal/a/x$1;->bKa:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/x$1;->bKv:Lrx/Subscriber;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/x$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/x$1;->bKv:Lrx/Subscriber;
 
     const-wide/16 v1, 0x0
 
@@ -54,7 +54,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lrx/internal/a/x$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/x$1;->bKv:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -63,7 +63,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/a/x$1;->bKa:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/x$1;->bKv:Lrx/Subscriber;
 
     invoke-static {v0, v1}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/x.smali b/com.discord/smali_classes2/rx/internal/a/x.smali
index 5ea3bed015..3168dcef59 100644
--- a/com.discord/smali_classes2/rx/internal/a/x.smali
+++ b/com.discord/smali_classes2/rx/internal/a/x.smali
@@ -49,7 +49,7 @@
 
     iget-object v0, p0, Lrx/internal/a/x;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/y$1.smali b/com.discord/smali_classes2/rx/internal/a/y$1.smali
index 56e9d72c13..67cec291e6 100644
--- a/com.discord/smali_classes2/rx/internal/a/y$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/y$1.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field bKK:J
+.field final synthetic bKv:Lrx/Subscriber;
 
-.field final synthetic bKL:Lrx/internal/a/y;
+.field bLf:J
 
-.field final synthetic bKa:Lrx/Subscriber;
+.field final synthetic bLg:Lrx/internal/a/y;
 
 .field final synthetic val$worker:Lrx/Scheduler$Worker;
 
@@ -31,9 +31,9 @@
 .method constructor <init>(Lrx/internal/a/y;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/y$1;->bKL:Lrx/internal/a/y;
+    iput-object p1, p0, Lrx/internal/a/y$1;->bLg:Lrx/internal/a/y;
 
-    iput-object p2, p0, Lrx/internal/a/y$1;->bKa:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/y$1;->bKv:Lrx/Subscriber;
 
     iput-object p3, p0, Lrx/internal/a/y$1;->val$worker:Lrx/Scheduler$Worker;
 
@@ -48,15 +48,15 @@
     .locals 5
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/y$1;->bKa:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/y$1;->bKv:Lrx/Subscriber;
 
-    iget-wide v1, p0, Lrx/internal/a/y$1;->bKK:J
+    iget-wide v1, p0, Lrx/internal/a/y$1;->bLf:J
 
     const-wide/16 v3, 0x1
 
     add-long/2addr v3, v1
 
-    iput-wide v3, p0, Lrx/internal/a/y$1;->bKK:J
+    iput-wide v3, p0, Lrx/internal/a/y$1;->bLf:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -78,7 +78,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    iget-object v1, p0, Lrx/internal/a/y$1;->bKa:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/y$1;->bKv:Lrx/Subscriber;
 
     invoke-static {v0, v1}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;)V
 
@@ -87,7 +87,7 @@
     :catchall_1
     move-exception v1
 
-    iget-object v2, p0, Lrx/internal/a/y$1;->bKa:Lrx/Subscriber;
+    iget-object v2, p0, Lrx/internal/a/y$1;->bKv:Lrx/Subscriber;
 
     invoke-static {v0, v2}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/a/y.smali b/com.discord/smali_classes2/rx/internal/a/y.smali
index feb4bd30a0..afc67a0c66 100644
--- a/com.discord/smali_classes2/rx/internal/a/y.smali
+++ b/com.discord/smali_classes2/rx/internal/a/y.smali
@@ -53,7 +53,7 @@
 
     iget-object v0, p0, Lrx/internal/a/y;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/rx/internal/a/z$a.smali b/com.discord/smali_classes2/rx/internal/a/z$a.smali
index 277050b854..b3984ca06b 100644
--- a/com.discord/smali_classes2/rx/internal/a/z$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/z$a.smali
@@ -31,7 +31,7 @@
 
 
 # instance fields
-.field final bKM:Lrx/functions/b;
+.field final bLh:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field final bKN:Lrx/functions/b;
+.field final bLi:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -77,9 +77,9 @@
 
     iput-boolean p1, p0, Lrx/internal/a/z$a;->hasValue:Z
 
-    iput-object p3, p0, Lrx/internal/a/z$a;->bKM:Lrx/functions/b;
+    iput-object p3, p0, Lrx/internal/a/z$a;->bLh:Lrx/functions/b;
 
-    iput-object p4, p0, Lrx/internal/a/z$a;->bKN:Lrx/functions/b;
+    iput-object p4, p0, Lrx/internal/a/z$a;->bLi:Lrx/functions/b;
 
     return-void
 .end method
@@ -102,13 +102,13 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/z$a;->bKM:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/z$a;->bLh:Lrx/functions/b;
 
     invoke-interface {v0, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v1, p0, Lrx/internal/a/z$a;->bKN:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/z$a;->bLi:Lrx/functions/b;
 
     invoke-interface {v1, p1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/a/z.smali b/com.discord/smali_classes2/rx/internal/a/z.smali
index a29c38ad41..038b5ddc19 100644
--- a/com.discord/smali_classes2/rx/internal/a/z.smali
+++ b/com.discord/smali_classes2/rx/internal/a/z.smali
@@ -35,7 +35,7 @@
 
 
 # instance fields
-.field final bJx:Lrx/Observable;
+.field final bJS:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -44,7 +44,7 @@
     .end annotation
 .end field
 
-.field final bKM:Lrx/functions/b;
+.field final bLh:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -53,7 +53,7 @@
     .end annotation
 .end field
 
-.field final bKN:Lrx/functions/b;
+.field final bLi:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -62,7 +62,7 @@
     .end annotation
 .end field
 
-.field final bKO:Lrx/functions/Func0;
+.field final bLj:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -112,13 +112,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/z;->bJx:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/z;->bJS:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/z;->bKM:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/z;->bLh:Lrx/functions/b;
 
-    iput-object p3, p0, Lrx/internal/a/z;->bKN:Lrx/functions/b;
+    iput-object p3, p0, Lrx/internal/a/z;->bLi:Lrx/functions/b;
 
-    iput-object p0, p0, Lrx/internal/a/z;->bKO:Lrx/functions/Func0;
+    iput-object p0, p0, Lrx/internal/a/z;->bLj:Lrx/functions/Func0;
 
     return-void
 .end method
@@ -141,7 +141,7 @@
     check-cast p1, Lrx/Subscriber;
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/z;->bKO:Lrx/functions/Func0;
+    iget-object v0, p0, Lrx/internal/a/z;->bLj:Lrx/functions/Func0;
 
     invoke-interface {v0}, Lrx/functions/Func0;->call()Ljava/lang/Object;
 
@@ -153,13 +153,13 @@
 
     new-instance v1, Lrx/internal/a/z$a;
 
-    iget-object v2, p0, Lrx/internal/a/z;->bKM:Lrx/functions/b;
+    iget-object v2, p0, Lrx/internal/a/z;->bLh:Lrx/functions/b;
 
-    iget-object v3, p0, Lrx/internal/a/z;->bKN:Lrx/functions/b;
+    iget-object v3, p0, Lrx/internal/a/z;->bLi:Lrx/functions/b;
 
     invoke-direct {v1, p1, v0, v2, v3}, Lrx/internal/a/z$a;-><init>(Lrx/Subscriber;Ljava/util/Map;Lrx/functions/b;Lrx/functions/b;)V
 
-    iget-object p1, p0, Lrx/internal/a/z;->bJx:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/z;->bJS:Lrx/Observable;
 
     invoke-virtual {v1, p1}, Lrx/internal/a/z$a;->d(Lrx/Observable;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/b/a.smali b/com.discord/smali_classes2/rx/internal/b/a.smali
index 57ffe1dfb5..42b4efd7d3 100644
--- a/com.discord/smali_classes2/rx/internal/b/a.smali
+++ b/com.discord/smali_classes2/rx/internal/b/a.smali
@@ -7,17 +7,17 @@
 
 
 # static fields
-.field static final bNG:Lrx/Producer;
+.field static final bOb:Lrx/Producer;
 
 
 # instance fields
-.field bMB:J
+.field bMW:J
 
-.field bND:Lrx/Producer;
+.field bNY:Lrx/Producer;
 
-.field bNE:J
+.field bNZ:J
 
-.field bNF:Lrx/Producer;
+.field bOa:Lrx/Producer;
 
 .field emitting:Z
 
@@ -32,7 +32,7 @@
 
     invoke-direct {v0}, Lrx/internal/b/a$1;-><init>()V
 
-    sput-object v0, Lrx/internal/b/a;->bNG:Lrx/Producer;
+    sput-object v0, Lrx/internal/b/a;->bOb:Lrx/Producer;
 
     return-void
 .end method
@@ -45,7 +45,7 @@
     return-void
 .end method
 
-.method private KF()V
+.method private Kt()V
     .locals 13
 
     :cond_0
@@ -53,11 +53,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lrx/internal/b/a;->bMB:J
+    iget-wide v0, p0, Lrx/internal/b/a;->bMW:J
 
-    iget-wide v2, p0, Lrx/internal/b/a;->bNE:J
+    iget-wide v2, p0, Lrx/internal/b/a;->bNZ:J
 
-    iget-object v4, p0, Lrx/internal/b/a;->bNF:Lrx/Producer;
+    iget-object v4, p0, Lrx/internal/b/a;->bOa:Lrx/Producer;
 
     const-wide/16 v5, 0x0
 
@@ -80,13 +80,13 @@
     return-void
 
     :cond_1
-    iput-wide v5, p0, Lrx/internal/b/a;->bMB:J
+    iput-wide v5, p0, Lrx/internal/b/a;->bMW:J
 
-    iput-wide v5, p0, Lrx/internal/b/a;->bNE:J
+    iput-wide v5, p0, Lrx/internal/b/a;->bNZ:J
 
     const/4 v7, 0x0
 
-    iput-object v7, p0, Lrx/internal/b/a;->bNF:Lrx/Producer;
+    iput-object v7, p0, Lrx/internal/b/a;->bOa:Lrx/Producer;
 
     monitor-exit p0
     :try_end_0
@@ -142,23 +142,23 @@
     :goto_2
     if-eqz v4, :cond_7
 
-    sget-object v0, Lrx/internal/b/a;->bNG:Lrx/Producer;
+    sget-object v0, Lrx/internal/b/a;->bOb:Lrx/Producer;
 
     if-ne v4, v0, :cond_6
 
-    iput-object v7, p0, Lrx/internal/b/a;->bND:Lrx/Producer;
+    iput-object v7, p0, Lrx/internal/b/a;->bNY:Lrx/Producer;
 
     goto :goto_0
 
     :cond_6
-    iput-object v4, p0, Lrx/internal/b/a;->bND:Lrx/Producer;
+    iput-object v4, p0, Lrx/internal/b/a;->bNY:Lrx/Producer;
 
     invoke-interface {v4, v8, v9}, Lrx/Producer;->request(J)V
 
     goto :goto_0
 
     :cond_7
-    iget-object v2, p0, Lrx/internal/b/a;->bND:Lrx/Producer;
+    iget-object v2, p0, Lrx/internal/b/a;->bNY:Lrx/Producer;
 
     if-eqz v2, :cond_0
 
@@ -205,11 +205,11 @@
 
     if-eqz v2, :cond_0
 
-    iget-wide v0, p0, Lrx/internal/b/a;->bNE:J
+    iget-wide v0, p0, Lrx/internal/b/a;->bNZ:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lrx/internal/b/a;->bNE:J
+    iput-wide v0, p0, Lrx/internal/b/a;->bNZ:J
 
     monitor-exit p0
 
@@ -254,7 +254,7 @@
 
     :cond_2
     :goto_0
-    invoke-direct {p0}, Lrx/internal/b/a;->KF()V
+    invoke-direct {p0}, Lrx/internal/b/a;->Kt()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -329,11 +329,11 @@
 
     if-eqz v2, :cond_1
 
-    iget-wide v0, p0, Lrx/internal/b/a;->bMB:J
+    iget-wide v0, p0, Lrx/internal/b/a;->bMW:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lrx/internal/b/a;->bMB:J
+    iput-wide v0, p0, Lrx/internal/b/a;->bMW:J
 
     monitor-exit p0
 
@@ -362,14 +362,14 @@
     :cond_2
     iput-wide v2, p0, Lrx/internal/b/a;->requested:J
 
-    iget-object v0, p0, Lrx/internal/b/a;->bND:Lrx/Producer;
+    iget-object v0, p0, Lrx/internal/b/a;->bNY:Lrx/Producer;
 
     if-eqz v0, :cond_3
 
     invoke-interface {v0, p1, p2}, Lrx/Producer;->request(J)V
 
     :cond_3
-    invoke-direct {p0}, Lrx/internal/b/a;->KF()V
+    invoke-direct {p0}, Lrx/internal/b/a;->Kt()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -433,10 +433,10 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lrx/internal/b/a;->bNG:Lrx/Producer;
+    sget-object p1, Lrx/internal/b/a;->bOb:Lrx/Producer;
 
     :cond_0
-    iput-object p1, p0, Lrx/internal/b/a;->bNF:Lrx/Producer;
+    iput-object p1, p0, Lrx/internal/b/a;->bOa:Lrx/Producer;
 
     monitor-exit p0
 
@@ -452,7 +452,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
     :try_start_1
-    iput-object p1, p0, Lrx/internal/b/a;->bND:Lrx/Producer;
+    iput-object p1, p0, Lrx/internal/b/a;->bNY:Lrx/Producer;
 
     if-eqz p1, :cond_2
 
@@ -461,7 +461,7 @@
     invoke-interface {p1, v0, v1}, Lrx/Producer;->request(J)V
 
     :cond_2
-    invoke-direct {p0}, Lrx/internal/b/a;->KF()V
+    invoke-direct {p0}, Lrx/internal/b/a;->Kt()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
diff --git a/com.discord/smali_classes2/rx/internal/c/a$a$1.smali b/com.discord/smali_classes2/rx/internal/c/a$a$1.smali
index 23221a3a10..3c3e74422e 100644
--- a/com.discord/smali_classes2/rx/internal/c/a$a$1.smali
+++ b/com.discord/smali_classes2/rx/internal/c/a$a$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bNR:Ljava/util/concurrent/ThreadFactory;
+.field final synthetic bOm:Ljava/util/concurrent/ThreadFactory;
 
-.field final synthetic bNS:Lrx/internal/c/a$a;
+.field final synthetic bOn:Lrx/internal/c/a$a;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/c/a$a;Ljava/util/concurrent/ThreadFactory;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/c/a$a$1;->bNS:Lrx/internal/c/a$a;
+    iput-object p1, p0, Lrx/internal/c/a$a$1;->bOn:Lrx/internal/c/a$a;
 
-    iput-object p2, p0, Lrx/internal/c/a$a$1;->bNR:Ljava/util/concurrent/ThreadFactory;
+    iput-object p2, p0, Lrx/internal/c/a$a$1;->bOm:Ljava/util/concurrent/ThreadFactory;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/c/a$a$1;->bNR:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lrx/internal/c/a$a$1;->bOm:Ljava/util/concurrent/ThreadFactory;
 
     invoke-interface {v0, p1}, Ljava/util/concurrent/ThreadFactory;->newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
 
diff --git a/com.discord/smali_classes2/rx/internal/c/a$a$2.smali b/com.discord/smali_classes2/rx/internal/c/a$a$2.smali
index b1cdf5b81e..0c4318f0c6 100644
--- a/com.discord/smali_classes2/rx/internal/c/a$a$2.smali
+++ b/com.discord/smali_classes2/rx/internal/c/a$a$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bNS:Lrx/internal/c/a$a;
+.field final synthetic bOn:Lrx/internal/c/a$a;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/c/a$a;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/c/a$a$2;->bNS:Lrx/internal/c/a$a;
+    iput-object p1, p0, Lrx/internal/c/a$a$2;->bOn:Lrx/internal/c/a$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final run()V
     .locals 8
 
-    iget-object v0, p0, Lrx/internal/c/a$a$2;->bNS:Lrx/internal/c/a$a;
+    iget-object v0, p0, Lrx/internal/c/a$a$2;->bOn:Lrx/internal/c/a$a;
 
-    iget-object v1, v0, Lrx/internal/c/a$a;->bNN:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, v0, Lrx/internal/c/a$a;->bOi:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->isEmpty()Z
 
@@ -51,7 +51,7 @@
 
     move-result-wide v1
 
-    iget-object v3, v0, Lrx/internal/c/a$a;->bNN:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v3, v0, Lrx/internal/c/a$a;->bOi:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v3}, Ljava/util/concurrent/ConcurrentLinkedQueue;->iterator()Ljava/util/Iterator;
 
@@ -71,13 +71,13 @@
 
     check-cast v4, Lrx/internal/c/a$c;
 
-    iget-wide v5, v4, Lrx/internal/c/a$c;->bNZ:J
+    iget-wide v5, v4, Lrx/internal/c/a$c;->bOu:J
 
     cmp-long v7, v5, v1
 
     if-gtz v7, :cond_1
 
-    iget-object v5, v0, Lrx/internal/c/a$a;->bNN:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v5, v0, Lrx/internal/c/a$a;->bOi:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v5, v4}, Ljava/util/concurrent/ConcurrentLinkedQueue;->remove(Ljava/lang/Object;)Z
 
@@ -85,7 +85,7 @@
 
     if-eqz v5, :cond_0
 
-    iget-object v5, v0, Lrx/internal/c/a$a;->bNO:Lrx/subscriptions/CompositeSubscription;
+    iget-object v5, v0, Lrx/internal/c/a$a;->bOj:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v5, v4}, Lrx/subscriptions/CompositeSubscription;->e(Lrx/Subscription;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/a$a.smali b/com.discord/smali_classes2/rx/internal/c/a$a.smali
index d1eea18a28..9f87672e8b 100644
--- a/com.discord/smali_classes2/rx/internal/c/a$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/a$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field final bNM:J
+.field final bOh:J
 
-.field final bNN:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field final bOi:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -27,11 +27,11 @@
     .end annotation
 .end field
 
-.field final bNO:Lrx/subscriptions/CompositeSubscription;
+.field final bOj:Lrx/subscriptions/CompositeSubscription;
 
-.field private final bNP:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final bOk:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private final bNQ:Ljava/util/concurrent/Future;
+.field private final bOl:Ljava/util/concurrent/Future;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/Future<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field private final bgx:Ljava/util/concurrent/ThreadFactory;
+.field private final bgR:Ljava/util/concurrent/ThreadFactory;
 
 
 # direct methods
@@ -49,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/a$a;->bgx:Ljava/util/concurrent/ThreadFactory;
+    iput-object p1, p0, Lrx/internal/c/a$a;->bgR:Ljava/util/concurrent/ThreadFactory;
 
     if-eqz p4, :cond_0
 
@@ -63,19 +63,19 @@
     const-wide/16 p2, 0x0
 
     :goto_0
-    iput-wide p2, p0, Lrx/internal/c/a$a;->bNM:J
+    iput-wide p2, p0, Lrx/internal/c/a$a;->bOh:J
 
     new-instance p2, Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-direct {p2}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
 
-    iput-object p2, p0, Lrx/internal/c/a$a;->bNN:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p2, p0, Lrx/internal/c/a$a;->bOi:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     new-instance p2, Lrx/subscriptions/CompositeSubscription;
 
     invoke-direct {p2}, Lrx/subscriptions/CompositeSubscription;-><init>()V
 
-    iput-object p2, p0, Lrx/internal/c/a$a;->bNO:Lrx/subscriptions/CompositeSubscription;
+    iput-object p2, p0, Lrx/internal/c/a$a;->bOj:Lrx/subscriptions/CompositeSubscription;
 
     const/4 p2, 0x0
 
@@ -97,7 +97,7 @@
 
     invoke-direct {v1, p0}, Lrx/internal/c/a$a$2;-><init>(Lrx/internal/c/a$a;)V
 
-    iget-wide v4, p0, Lrx/internal/c/a$a;->bNM:J
+    iget-wide v4, p0, Lrx/internal/c/a$a;->bOh:J
 
     sget-object v6, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -115,19 +115,19 @@
     move-object p1, p2
 
     :goto_1
-    iput-object p1, p0, Lrx/internal/c/a$a;->bNP:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lrx/internal/c/a$a;->bOk:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iput-object p2, p0, Lrx/internal/c/a$a;->bNQ:Ljava/util/concurrent/Future;
+    iput-object p2, p0, Lrx/internal/c/a$a;->bOl:Ljava/util/concurrent/Future;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final KU()Lrx/internal/c/a$c;
+.method final KI()Lrx/internal/c/a$c;
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->bNO:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bOj:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->isUnsubscribed()Z
 
@@ -135,12 +135,12 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lrx/internal/c/a;->bNJ:Lrx/internal/c/a$c;
+    sget-object v0, Lrx/internal/c/a;->bOe:Lrx/internal/c/a$c;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/a$a;->bNN:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bOi:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->isEmpty()Z
 
@@ -148,7 +148,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->bNN:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bOi:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
@@ -163,11 +163,11 @@
     :cond_1
     new-instance v0, Lrx/internal/c/a$c;
 
-    iget-object v1, p0, Lrx/internal/c/a$a;->bgx:Ljava/util/concurrent/ThreadFactory;
+    iget-object v1, p0, Lrx/internal/c/a$a;->bgR:Ljava/util/concurrent/ThreadFactory;
 
     invoke-direct {v0, v1}, Lrx/internal/c/a$c;-><init>(Ljava/util/concurrent/ThreadFactory;)V
 
-    iget-object v1, p0, Lrx/internal/c/a$a;->bNO:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/a$a;->bOj:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v1, v0}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
@@ -178,29 +178,29 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/c/a$a;->bNQ:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bOl:Ljava/util/concurrent/Future;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->bNQ:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bOl: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, Lrx/internal/c/a$a;->bNP:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bOk:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->bNP:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bOk: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, Lrx/internal/c/a$a;->bNO:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bOj:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
@@ -209,7 +209,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/c/a$a;->bNO:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/a$a;->bOj:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v1}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/a$b$1.smali b/com.discord/smali_classes2/rx/internal/c/a$b$1.smali
index 6addc3ee12..dc7a40112e 100644
--- a/com.discord/smali_classes2/rx/internal/c/a$b$1.smali
+++ b/com.discord/smali_classes2/rx/internal/c/a$b$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bNX:Lrx/functions/Action0;
+.field final synthetic bOs:Lrx/functions/Action0;
 
-.field final synthetic bNY:Lrx/internal/c/a$b;
+.field final synthetic bOt:Lrx/internal/c/a$b;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/c/a$b;Lrx/functions/Action0;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/c/a$b$1;->bNY:Lrx/internal/c/a$b;
+    iput-object p1, p0, Lrx/internal/c/a$b$1;->bOt:Lrx/internal/c/a$b;
 
-    iput-object p2, p0, Lrx/internal/c/a$b$1;->bNX:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/c/a$b$1;->bOs:Lrx/functions/Action0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final call()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/a$b$1;->bNY:Lrx/internal/c/a$b;
+    iget-object v0, p0, Lrx/internal/c/a$b$1;->bOt:Lrx/internal/c/a$b;
 
     invoke-virtual {v0}, Lrx/internal/c/a$b;->isUnsubscribed()Z
 
@@ -52,7 +52,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/a$b$1;->bNX:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/a$b$1;->bOs:Lrx/functions/Action0;
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/a$b.smali b/com.discord/smali_classes2/rx/internal/c/a$b.smali
index dd51d22bac..d2ac099157 100644
--- a/com.discord/smali_classes2/rx/internal/c/a$b.smali
+++ b/com.discord/smali_classes2/rx/internal/c/a$b.smali
@@ -18,13 +18,13 @@
 
 
 # instance fields
-.field private final bNT:Lrx/subscriptions/CompositeSubscription;
+.field private final bOo:Lrx/subscriptions/CompositeSubscription;
 
-.field private final bNU:Lrx/internal/c/a$a;
+.field private final bOp:Lrx/internal/c/a$a;
 
-.field private final bNV:Lrx/internal/c/a$c;
+.field private final bOq:Lrx/internal/c/a$c;
 
-.field final bNW:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final bOr:Ljava/util/concurrent/atomic/AtomicBoolean;
 
 
 # direct methods
@@ -37,21 +37,21 @@
 
     invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/c/a$b;->bNT:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lrx/internal/c/a$b;->bOo:Lrx/subscriptions/CompositeSubscription;
 
-    iput-object p1, p0, Lrx/internal/c/a$b;->bNU:Lrx/internal/c/a$a;
+    iput-object p1, p0, Lrx/internal/c/a$b;->bOp:Lrx/internal/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, Lrx/internal/c/a$b;->bNW:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lrx/internal/c/a$b;->bOr:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    invoke-virtual {p1}, Lrx/internal/c/a$a;->KU()Lrx/internal/c/a$c;
+    invoke-virtual {p1}, Lrx/internal/c/a$a;->KI()Lrx/internal/c/a$c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/c/a$b;->bNV:Lrx/internal/c/a$c;
+    iput-object p1, p0, Lrx/internal/c/a$b;->bOq:Lrx/internal/c/a$c;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 .method public final a(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/c/a$b;->bNT:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bOo:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->isUnsubscribed()Z
 
@@ -69,14 +69,14 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object p1
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/a$b;->bNV:Lrx/internal/c/a$c;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bOq:Lrx/internal/c/a$c;
 
     new-instance v1, Lrx/internal/c/a$b$1;
 
@@ -86,11 +86,11 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lrx/internal/c/a$b;->bNT:Lrx/subscriptions/CompositeSubscription;
+    iget-object p2, p0, Lrx/internal/c/a$b;->bOo:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {p2, p1}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
-    iget-object p2, p0, Lrx/internal/c/a$b;->bNT:Lrx/subscriptions/CompositeSubscription;
+    iget-object p2, p0, Lrx/internal/c/a$b;->bOo:Lrx/subscriptions/CompositeSubscription;
 
     iget-object p3, p1, Lrx/internal/c/j;->cancel:Lrx/internal/util/SubscriptionList;
 
@@ -120,21 +120,21 @@
 .method public final call()V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/c/a$b;->bNU:Lrx/internal/c/a$a;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bOp:Lrx/internal/c/a$a;
 
-    iget-object v1, p0, Lrx/internal/c/a$b;->bNV:Lrx/internal/c/a$c;
+    iget-object v1, p0, Lrx/internal/c/a$b;->bOq:Lrx/internal/c/a$c;
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
     move-result-wide v2
 
-    iget-wide v4, v0, Lrx/internal/c/a$a;->bNM:J
+    iget-wide v4, v0, Lrx/internal/c/a$a;->bOh:J
 
     add-long/2addr v2, v4
 
-    iput-wide v2, v1, Lrx/internal/c/a$c;->bNZ:J
+    iput-wide v2, v1, Lrx/internal/c/a$c;->bOu:J
 
-    iget-object v0, v0, Lrx/internal/c/a$a;->bNN:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, v0, Lrx/internal/c/a$a;->bOi:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->offer(Ljava/lang/Object;)Z
 
@@ -144,7 +144,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/a$b;->bNT:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bOo:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->isUnsubscribed()Z
 
@@ -156,7 +156,7 @@
 .method public final unsubscribe()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/c/a$b;->bNW:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bOr:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v1, 0x0
 
@@ -168,12 +168,12 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/c/a$b;->bNV:Lrx/internal/c/a$c;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bOq:Lrx/internal/c/a$c;
 
     invoke-virtual {v0, p0}, Lrx/internal/c/a$c;->b(Lrx/functions/Action0;)Lrx/Subscription;
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/a$b;->bNT:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bOo:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/a$c.smali b/com.discord/smali_classes2/rx/internal/c/a$c.smali
index 9cbde204d0..02c1cec43f 100644
--- a/com.discord/smali_classes2/rx/internal/c/a$c.smali
+++ b/com.discord/smali_classes2/rx/internal/c/a$c.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field bNZ:J
+.field bOu:J
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lrx/internal/c/a$c;->bNZ:J
+    iput-wide v0, p0, Lrx/internal/c/a$c;->bOu:J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/c/a.smali b/com.discord/smali_classes2/rx/internal/c/a.smali
index 644bc86093..a5921c2896 100644
--- a/com.discord/smali_classes2/rx/internal/c/a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/a.smali
@@ -17,17 +17,17 @@
 
 
 # static fields
-.field private static final bNH:J
+.field private static final bOc:J
 
-.field private static final bNI:Ljava/util/concurrent/TimeUnit;
+.field private static final bOd:Ljava/util/concurrent/TimeUnit;
 
-.field static final bNJ:Lrx/internal/c/a$c;
+.field static final bOe:Lrx/internal/c/a$c;
 
-.field static final bNK:Lrx/internal/c/a$a;
+.field static final bOf:Lrx/internal/c/a$a;
 
 
 # instance fields
-.field final bNL:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bOg:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final bgx:Ljava/util/concurrent/ThreadFactory;
+.field final bgR:Ljava/util/concurrent/ThreadFactory;
 
 
 # direct methods
@@ -46,15 +46,15 @@
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sput-object v0, Lrx/internal/c/a;->bNI:Ljava/util/concurrent/TimeUnit;
+    sput-object v0, Lrx/internal/c/a;->bOd:Ljava/util/concurrent/TimeUnit;
 
     new-instance v0, Lrx/internal/c/a$c;
 
-    sget-object v1, Lrx/internal/util/j;->bPw:Ljava/util/concurrent/ThreadFactory;
+    sget-object v1, Lrx/internal/util/j;->bPR:Ljava/util/concurrent/ThreadFactory;
 
     invoke-direct {v0, v1}, Lrx/internal/c/a$c;-><init>(Ljava/util/concurrent/ThreadFactory;)V
 
-    sput-object v0, Lrx/internal/c/a;->bNJ:Lrx/internal/c/a$c;
+    sput-object v0, Lrx/internal/c/a;->bOe:Lrx/internal/c/a$c;
 
     invoke-virtual {v0}, Lrx/internal/c/a$c;->unsubscribe()V
 
@@ -66,7 +66,7 @@
 
     invoke-direct {v0, v1, v2, v3, v1}, Lrx/internal/c/a$a;-><init>(Ljava/util/concurrent/ThreadFactory;JLjava/util/concurrent/TimeUnit;)V
 
-    sput-object v0, Lrx/internal/c/a;->bNK:Lrx/internal/c/a$a;
+    sput-object v0, Lrx/internal/c/a;->bOf:Lrx/internal/c/a$a;
 
     invoke-virtual {v0}, Lrx/internal/c/a$a;->shutdown()V
 
@@ -84,7 +84,7 @@
 
     int-to-long v0, v0
 
-    sput-wide v0, Lrx/internal/c/a;->bNH:J
+    sput-wide v0, Lrx/internal/c/a;->bOc:J
 
     return-void
 .end method
@@ -94,29 +94,29 @@
 
     invoke-direct {p0}, Lrx/Scheduler;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/a;->bgx:Ljava/util/concurrent/ThreadFactory;
+    iput-object p1, p0, Lrx/internal/c/a;->bgR:Ljava/util/concurrent/ThreadFactory;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v0, Lrx/internal/c/a;->bNK:Lrx/internal/c/a$a;
+    sget-object v0, Lrx/internal/c/a;->bOf:Lrx/internal/c/a$a;
 
     invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object p1, p0, Lrx/internal/c/a;->bNL:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/c/a;->bOg:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance p1, Lrx/internal/c/a$a;
 
-    iget-object v0, p0, Lrx/internal/c/a;->bgx:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lrx/internal/c/a;->bgR:Ljava/util/concurrent/ThreadFactory;
 
-    sget-wide v1, Lrx/internal/c/a;->bNH:J
+    sget-wide v1, Lrx/internal/c/a;->bOc:J
 
-    sget-object v3, Lrx/internal/c/a;->bNI:Ljava/util/concurrent/TimeUnit;
+    sget-object v3, Lrx/internal/c/a;->bOd:Ljava/util/concurrent/TimeUnit;
 
     invoke-direct {p1, v0, v1, v2, v3}, Lrx/internal/c/a$a;-><init>(Ljava/util/concurrent/ThreadFactory;JLjava/util/concurrent/TimeUnit;)V
 
-    iget-object v0, p0, Lrx/internal/c/a;->bNL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/a;->bOg:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/c/a;->bNK:Lrx/internal/c/a$a;
+    sget-object v1, Lrx/internal/c/a;->bOf:Lrx/internal/c/a$a;
 
     invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -132,12 +132,12 @@
 
 
 # virtual methods
-.method public final Kk()Lrx/Scheduler$Worker;
+.method public final JY()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/internal/c/a$b;
 
-    iget-object v1, p0, Lrx/internal/c/a;->bNL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lrx/internal/c/a;->bOg:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -154,7 +154,7 @@
     .locals 3
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/a;->bNL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/a;->bOg:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -162,14 +162,14 @@
 
     check-cast v0, Lrx/internal/c/a$a;
 
-    sget-object v1, Lrx/internal/c/a;->bNK:Lrx/internal/c/a$a;
+    sget-object v1, Lrx/internal/c/a;->bOf:Lrx/internal/c/a$a;
 
     if-ne v0, v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v2, p0, Lrx/internal/c/a;->bNL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/c/a;->bOg:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/rx/internal/c/b$a$1.smali b/com.discord/smali_classes2/rx/internal/c/b$a$1.smali
index 7673ef3667..ade19930a5 100644
--- a/com.discord/smali_classes2/rx/internal/c/b$a$1.smali
+++ b/com.discord/smali_classes2/rx/internal/c/b$a$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bNX:Lrx/functions/Action0;
+.field final synthetic bOC:Lrx/internal/c/b$a;
 
-.field final synthetic bOh:Lrx/internal/c/b$a;
+.field final synthetic bOs:Lrx/functions/Action0;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/c/b$a;Lrx/functions/Action0;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/c/b$a$1;->bOh:Lrx/internal/c/b$a;
+    iput-object p1, p0, Lrx/internal/c/b$a$1;->bOC:Lrx/internal/c/b$a;
 
-    iput-object p2, p0, Lrx/internal/c/b$a$1;->bNX:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/c/b$a$1;->bOs:Lrx/functions/Action0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final call()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/b$a$1;->bOh:Lrx/internal/c/b$a;
+    iget-object v0, p0, Lrx/internal/c/b$a$1;->bOC:Lrx/internal/c/b$a;
 
     invoke-virtual {v0}, Lrx/internal/c/b$a;->isUnsubscribed()Z
 
@@ -52,7 +52,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b$a$1;->bNX:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/b$a$1;->bOs:Lrx/functions/Action0;
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/b$a$2.smali b/com.discord/smali_classes2/rx/internal/c/b$a$2.smali
index f5a08c179b..1a504358aa 100644
--- a/com.discord/smali_classes2/rx/internal/c/b$a$2.smali
+++ b/com.discord/smali_classes2/rx/internal/c/b$a$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bNX:Lrx/functions/Action0;
+.field final synthetic bOC:Lrx/internal/c/b$a;
 
-.field final synthetic bOh:Lrx/internal/c/b$a;
+.field final synthetic bOs:Lrx/functions/Action0;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/c/b$a;Lrx/functions/Action0;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/c/b$a$2;->bOh:Lrx/internal/c/b$a;
+    iput-object p1, p0, Lrx/internal/c/b$a$2;->bOC:Lrx/internal/c/b$a;
 
-    iput-object p2, p0, Lrx/internal/c/b$a$2;->bNX:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/c/b$a$2;->bOs:Lrx/functions/Action0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final call()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/b$a$2;->bOh:Lrx/internal/c/b$a;
+    iget-object v0, p0, Lrx/internal/c/b$a$2;->bOC:Lrx/internal/c/b$a;
 
     invoke-virtual {v0}, Lrx/internal/c/b$a;->isUnsubscribed()Z
 
@@ -52,7 +52,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b$a$2;->bNX:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/b$a$2;->bOs:Lrx/functions/Action0;
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/b$a.smali b/com.discord/smali_classes2/rx/internal/c/b$a.smali
index 99bab1f7a7..d616398a3c 100644
--- a/com.discord/smali_classes2/rx/internal/c/b$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/b$a.smali
@@ -15,13 +15,13 @@
 
 
 # instance fields
-.field private final bOd:Lrx/internal/util/SubscriptionList;
+.field private final bOA:Lrx/internal/util/SubscriptionList;
 
-.field private final bOe:Lrx/subscriptions/CompositeSubscription;
+.field private final bOB:Lrx/internal/c/b$c;
 
-.field private final bOf:Lrx/internal/util/SubscriptionList;
+.field private final bOy:Lrx/internal/util/SubscriptionList;
 
-.field private final bOg:Lrx/internal/c/b$c;
+.field private final bOz:Lrx/subscriptions/CompositeSubscription;
 
 
 # direct methods
@@ -34,13 +34,13 @@
 
     invoke-direct {v0}, Lrx/internal/util/SubscriptionList;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/c/b$a;->bOd:Lrx/internal/util/SubscriptionList;
+    iput-object v0, p0, Lrx/internal/c/b$a;->bOy:Lrx/internal/util/SubscriptionList;
 
     new-instance v0, Lrx/subscriptions/CompositeSubscription;
 
     invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/c/b$a;->bOe:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lrx/internal/c/b$a;->bOz:Lrx/subscriptions/CompositeSubscription;
 
     new-instance v0, Lrx/internal/util/SubscriptionList;
 
@@ -48,13 +48,13 @@
 
     new-array v1, v1, [Lrx/Subscription;
 
-    iget-object v2, p0, Lrx/internal/c/b$a;->bOd:Lrx/internal/util/SubscriptionList;
+    iget-object v2, p0, Lrx/internal/c/b$a;->bOy:Lrx/internal/util/SubscriptionList;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lrx/internal/c/b$a;->bOe:Lrx/subscriptions/CompositeSubscription;
+    iget-object v2, p0, Lrx/internal/c/b$a;->bOz:Lrx/subscriptions/CompositeSubscription;
 
     const/4 v3, 0x1
 
@@ -62,9 +62,9 @@
 
     invoke-direct {v0, v1}, Lrx/internal/util/SubscriptionList;-><init>([Lrx/Subscription;)V
 
-    iput-object v0, p0, Lrx/internal/c/b$a;->bOf:Lrx/internal/util/SubscriptionList;
+    iput-object v0, p0, Lrx/internal/c/b$a;->bOA:Lrx/internal/util/SubscriptionList;
 
-    iput-object p1, p0, Lrx/internal/c/b$a;->bOg:Lrx/internal/c/b$c;
+    iput-object p1, p0, Lrx/internal/c/b$a;->bOB:Lrx/internal/c/b$c;
 
     return-void
 .end method
@@ -80,20 +80,20 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object p1
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b$a;->bOg:Lrx/internal/c/b$c;
+    iget-object v0, p0, Lrx/internal/c/b$a;->bOB:Lrx/internal/c/b$c;
 
     new-instance v1, Lrx/internal/c/b$a$2;
 
     invoke-direct {v1, p0, p1}, Lrx/internal/c/b$a$2;-><init>(Lrx/internal/c/b$a;Lrx/functions/Action0;)V
 
-    iget-object p1, p0, Lrx/internal/c/b$a;->bOe:Lrx/subscriptions/CompositeSubscription;
+    iget-object p1, p0, Lrx/internal/c/b$a;->bOz:Lrx/subscriptions/CompositeSubscription;
 
     invoke-static {v1}, Lrx/c/c;->e(Lrx/functions/Action0;)Lrx/functions/Action0;
 
@@ -111,7 +111,7 @@
 
     if-gtz p1, :cond_1
 
-    iget-object p1, v0, Lrx/internal/c/h;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, v0, Lrx/internal/c/h;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {p1, v2}, Ljava/util/concurrent/ScheduledExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
 
@@ -120,7 +120,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p1, v0, Lrx/internal/c/h;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, v0, Lrx/internal/c/h;->oW: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;
 
@@ -141,20 +141,20 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object p1
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b$a;->bOg:Lrx/internal/c/b$c;
+    iget-object v0, p0, Lrx/internal/c/b$a;->bOB:Lrx/internal/c/b$c;
 
     new-instance v1, Lrx/internal/c/b$a$1;
 
     invoke-direct {v1, p0, p1}, Lrx/internal/c/b$a$1;-><init>(Lrx/internal/c/b$a;Lrx/functions/Action0;)V
 
-    iget-object p1, p0, Lrx/internal/c/b$a;->bOd:Lrx/internal/util/SubscriptionList;
+    iget-object p1, p0, Lrx/internal/c/b$a;->bOy:Lrx/internal/util/SubscriptionList;
 
     invoke-static {v1}, Lrx/c/c;->e(Lrx/functions/Action0;)Lrx/functions/Action0;
 
@@ -166,7 +166,7 @@
 
     invoke-virtual {p1, v2}, Lrx/internal/util/SubscriptionList;->add(Lrx/Subscription;)V
 
-    iget-object p1, v0, Lrx/internal/c/h;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, v0, Lrx/internal/c/h;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {p1, v2}, Ljava/util/concurrent/ScheduledExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
 
@@ -180,7 +180,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/b$a;->bOf:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/internal/c/b$a;->bOA:Lrx/internal/util/SubscriptionList;
 
     invoke-virtual {v0}, Lrx/internal/util/SubscriptionList;->isUnsubscribed()Z
 
@@ -192,7 +192,7 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/b$a;->bOf:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/internal/c/b$a;->bOA:Lrx/internal/util/SubscriptionList;
 
     invoke-virtual {v0}, Lrx/internal/util/SubscriptionList;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/b$b.smali b/com.discord/smali_classes2/rx/internal/c/b$b.smali
index f73f1be6d9..3fb7fb601e 100644
--- a/com.discord/smali_classes2/rx/internal/c/b$b.smali
+++ b/com.discord/smali_classes2/rx/internal/c/b$b.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field final bOi:I
+.field final bOD:I
 
-.field final bOj:[Lrx/internal/c/b$c;
+.field final bOE:[Lrx/internal/c/b$c;
 
-.field bOk:J
+.field bOF:J
 
 
 # direct methods
@@ -28,18 +28,18 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p2, p0, Lrx/internal/c/b$b;->bOi:I
+    iput p2, p0, Lrx/internal/c/b$b;->bOD:I
 
     new-array v0, p2, [Lrx/internal/c/b$c;
 
-    iput-object v0, p0, Lrx/internal/c/b$b;->bOj:[Lrx/internal/c/b$c;
+    iput-object v0, p0, Lrx/internal/c/b$b;->bOE:[Lrx/internal/c/b$c;
 
     const/4 v0, 0x0
 
     :goto_0
     if-ge v0, p2, :cond_0
 
-    iget-object v1, p0, Lrx/internal/c/b$b;->bOj:[Lrx/internal/c/b$c;
+    iget-object v1, p0, Lrx/internal/c/b$b;->bOE:[Lrx/internal/c/b$c;
 
     new-instance v2, Lrx/internal/c/b$c;
 
@@ -57,27 +57,27 @@
 
 
 # virtual methods
-.method public final KV()Lrx/internal/c/b$c;
+.method public final KJ()Lrx/internal/c/b$c;
     .locals 6
 
-    iget v0, p0, Lrx/internal/c/b$b;->bOi:I
+    iget v0, p0, Lrx/internal/c/b$b;->bOD:I
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lrx/internal/c/b;->bOb:Lrx/internal/c/b$c;
+    sget-object v0, Lrx/internal/c/b;->bOw:Lrx/internal/c/b$c;
 
     return-object v0
 
     :cond_0
-    iget-object v1, p0, Lrx/internal/c/b$b;->bOj:[Lrx/internal/c/b$c;
+    iget-object v1, p0, Lrx/internal/c/b$b;->bOE:[Lrx/internal/c/b$c;
 
-    iget-wide v2, p0, Lrx/internal/c/b$b;->bOk:J
+    iget-wide v2, p0, Lrx/internal/c/b$b;->bOF:J
 
     const-wide/16 v4, 0x1
 
     add-long/2addr v4, v2
 
-    iput-wide v4, p0, Lrx/internal/c/b$b;->bOk:J
+    iput-wide v4, p0, Lrx/internal/c/b$b;->bOF:J
 
     int-to-long v4, v0
 
@@ -93,7 +93,7 @@
 .method public final shutdown()V
     .locals 4
 
-    iget-object v0, p0, Lrx/internal/c/b$b;->bOj:[Lrx/internal/c/b$c;
+    iget-object v0, p0, Lrx/internal/c/b$b;->bOE:[Lrx/internal/c/b$c;
 
     array-length v1, v0
 
diff --git a/com.discord/smali_classes2/rx/internal/c/b.smali b/com.discord/smali_classes2/rx/internal/c/b.smali
index 42b4938334..deafb0af8b 100644
--- a/com.discord/smali_classes2/rx/internal/c/b.smali
+++ b/com.discord/smali_classes2/rx/internal/c/b.smali
@@ -17,15 +17,15 @@
 
 
 # static fields
-.field static final bOa:I
+.field static final bOv:I
 
-.field static final bOb:Lrx/internal/c/b$c;
+.field static final bOw:Lrx/internal/c/b$c;
 
-.field static final bOc:Lrx/internal/c/b$b;
+.field static final bOx:Lrx/internal/c/b$b;
 
 
 # instance fields
-.field public final bNL:Ljava/util/concurrent/atomic/AtomicReference;
+.field public final bOg:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field final bgx:Ljava/util/concurrent/ThreadFactory;
+.field final bgR:Ljava/util/concurrent/ThreadFactory;
 
 
 # direct methods
@@ -70,15 +70,15 @@
     move v1, v2
 
     :cond_1
-    sput v1, Lrx/internal/c/b;->bOa:I
+    sput v1, Lrx/internal/c/b;->bOv:I
 
     new-instance v1, Lrx/internal/c/b$c;
 
-    sget-object v2, Lrx/internal/util/j;->bPw:Ljava/util/concurrent/ThreadFactory;
+    sget-object v2, Lrx/internal/util/j;->bPR:Ljava/util/concurrent/ThreadFactory;
 
     invoke-direct {v1, v2}, Lrx/internal/c/b$c;-><init>(Ljava/util/concurrent/ThreadFactory;)V
 
-    sput-object v1, Lrx/internal/c/b;->bOb:Lrx/internal/c/b$c;
+    sput-object v1, Lrx/internal/c/b;->bOw:Lrx/internal/c/b$c;
 
     invoke-virtual {v1}, Lrx/internal/c/b$c;->unsubscribe()V
 
@@ -88,7 +88,7 @@
 
     invoke-direct {v1, v2, v0}, Lrx/internal/c/b$b;-><init>(Ljava/util/concurrent/ThreadFactory;I)V
 
-    sput-object v1, Lrx/internal/c/b;->bOc:Lrx/internal/c/b$b;
+    sput-object v1, Lrx/internal/c/b;->bOx:Lrx/internal/c/b$b;
 
     return-void
 .end method
@@ -98,27 +98,27 @@
 
     invoke-direct {p0}, Lrx/Scheduler;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/b;->bgx:Ljava/util/concurrent/ThreadFactory;
+    iput-object p1, p0, Lrx/internal/c/b;->bgR:Ljava/util/concurrent/ThreadFactory;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v0, Lrx/internal/c/b;->bOc:Lrx/internal/c/b$b;
+    sget-object v0, Lrx/internal/c/b;->bOx:Lrx/internal/c/b$b;
 
     invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object p1, p0, Lrx/internal/c/b;->bNL:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/c/b;->bOg:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance p1, Lrx/internal/c/b$b;
 
-    iget-object v0, p0, Lrx/internal/c/b;->bgx:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lrx/internal/c/b;->bgR:Ljava/util/concurrent/ThreadFactory;
 
-    sget v1, Lrx/internal/c/b;->bOa:I
+    sget v1, Lrx/internal/c/b;->bOv:I
 
     invoke-direct {p1, v0, v1}, Lrx/internal/c/b$b;-><init>(Ljava/util/concurrent/ThreadFactory;I)V
 
-    iget-object v0, p0, Lrx/internal/c/b;->bNL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/b;->bOg:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/c/b;->bOc:Lrx/internal/c/b$b;
+    sget-object v1, Lrx/internal/c/b;->bOx:Lrx/internal/c/b$b;
 
     invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -134,12 +134,12 @@
 
 
 # virtual methods
-.method public final Kk()Lrx/Scheduler$Worker;
+.method public final JY()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/internal/c/b$a;
 
-    iget-object v1, p0, Lrx/internal/c/b;->bNL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lrx/internal/c/b;->bOg:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -147,7 +147,7 @@
 
     check-cast v1, Lrx/internal/c/b$b;
 
-    invoke-virtual {v1}, Lrx/internal/c/b$b;->KV()Lrx/internal/c/b$c;
+    invoke-virtual {v1}, Lrx/internal/c/b$b;->KJ()Lrx/internal/c/b$c;
 
     move-result-object v1
 
@@ -160,7 +160,7 @@
     .locals 3
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b;->bNL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/b;->bOg:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -168,14 +168,14 @@
 
     check-cast v0, Lrx/internal/c/b$b;
 
-    sget-object v1, Lrx/internal/c/b;->bOc:Lrx/internal/c/b$b;
+    sget-object v1, Lrx/internal/c/b;->bOx:Lrx/internal/c/b$b;
 
     if-ne v0, v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v2, p0, Lrx/internal/c/b;->bNL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/c/b;->bOg:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/rx/internal/c/c$a$1.smali b/com.discord/smali_classes2/rx/internal/c/c$a$1.smali
index 003eb46599..f45c5f25cd 100644
--- a/com.discord/smali_classes2/rx/internal/c/c$a$1.smali
+++ b/com.discord/smali_classes2/rx/internal/c/c$a$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bOn:Lrx/subscriptions/b;
+.field final synthetic bOI:Lrx/subscriptions/b;
 
-.field final synthetic bOo:Lrx/internal/c/c$a;
+.field final synthetic bOJ:Lrx/internal/c/c$a;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/c/c$a;Lrx/subscriptions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/c/c$a$1;->bOo:Lrx/internal/c/c$a;
+    iput-object p1, p0, Lrx/internal/c/c$a$1;->bOJ:Lrx/internal/c/c$a;
 
-    iput-object p2, p0, Lrx/internal/c/c$a$1;->bOn:Lrx/subscriptions/b;
+    iput-object p2, p0, Lrx/internal/c/c$a$1;->bOI:Lrx/subscriptions/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,11 +41,11 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/c/c$a$1;->bOo:Lrx/internal/c/c$a;
+    iget-object v0, p0, Lrx/internal/c/c$a$1;->bOJ:Lrx/internal/c/c$a;
 
-    iget-object v0, v0, Lrx/internal/c/c$a;->bOl:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/c/c$a;->bOG:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v1, p0, Lrx/internal/c/c$a$1;->bOn:Lrx/subscriptions/b;
+    iget-object v1, p0, Lrx/internal/c/c$a$1;->bOI:Lrx/subscriptions/b;
 
     invoke-virtual {v0, v1}, Lrx/subscriptions/CompositeSubscription;->e(Lrx/Subscription;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/c$a$2.smali b/com.discord/smali_classes2/rx/internal/c/c$a$2.smali
index e30bf2013a..ffcb6592fe 100644
--- a/com.discord/smali_classes2/rx/internal/c/c$a$2.smali
+++ b/com.discord/smali_classes2/rx/internal/c/c$a$2.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field final synthetic bOn:Lrx/subscriptions/b;
+.field final synthetic bOI:Lrx/subscriptions/b;
 
-.field final synthetic bOo:Lrx/internal/c/c$a;
+.field final synthetic bOJ:Lrx/internal/c/c$a;
 
-.field final synthetic bOp:Lrx/functions/Action0;
+.field final synthetic bOK:Lrx/functions/Action0;
 
-.field final synthetic bOq:Lrx/Subscription;
+.field final synthetic bOL:Lrx/Subscription;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/c/c$a;Lrx/subscriptions/b;Lrx/functions/Action0;Lrx/Subscription;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/c/c$a$2;->bOo:Lrx/internal/c/c$a;
+    iput-object p1, p0, Lrx/internal/c/c$a$2;->bOJ:Lrx/internal/c/c$a;
 
-    iput-object p2, p0, Lrx/internal/c/c$a$2;->bOn:Lrx/subscriptions/b;
+    iput-object p2, p0, Lrx/internal/c/c$a$2;->bOI:Lrx/subscriptions/b;
 
-    iput-object p3, p0, Lrx/internal/c/c$a$2;->bOp:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/c/c$a$2;->bOK:Lrx/functions/Action0;
 
-    iput-object p4, p0, Lrx/internal/c/c$a$2;->bOq:Lrx/Subscription;
+    iput-object p4, p0, Lrx/internal/c/c$a$2;->bOL:Lrx/Subscription;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,7 +49,7 @@
 .method public final call()V
     .locals 3
 
-    iget-object v0, p0, Lrx/internal/c/c$a$2;->bOn:Lrx/subscriptions/b;
+    iget-object v0, p0, Lrx/internal/c/c$a$2;->bOI:Lrx/subscriptions/b;
 
     invoke-virtual {v0}, Lrx/subscriptions/b;->isUnsubscribed()Z
 
@@ -60,15 +60,15 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/c$a$2;->bOo:Lrx/internal/c/c$a;
+    iget-object v0, p0, Lrx/internal/c/c$a$2;->bOJ:Lrx/internal/c/c$a;
 
-    iget-object v1, p0, Lrx/internal/c/c$a$2;->bOp:Lrx/functions/Action0;
+    iget-object v1, p0, Lrx/internal/c/c$a$2;->bOK:Lrx/functions/Action0;
 
     invoke-virtual {v0, v1}, Lrx/internal/c/c$a;->b(Lrx/functions/Action0;)Lrx/Subscription;
 
     move-result-object v0
 
-    iget-object v1, p0, Lrx/internal/c/c$a$2;->bOn:Lrx/subscriptions/b;
+    iget-object v1, p0, Lrx/internal/c/c$a$2;->bOI:Lrx/subscriptions/b;
 
     invoke-virtual {v1, v0}, Lrx/subscriptions/b;->f(Lrx/Subscription;)V
 
@@ -82,7 +82,7 @@
 
     check-cast v0, Lrx/internal/c/j;
 
-    iget-object v1, p0, Lrx/internal/c/c$a$2;->bOq:Lrx/Subscription;
+    iget-object v1, p0, Lrx/internal/c/c$a$2;->bOL:Lrx/Subscription;
 
     iget-object v0, v0, Lrx/internal/c/j;->cancel:Lrx/internal/util/SubscriptionList;
 
diff --git a/com.discord/smali_classes2/rx/internal/c/c$a.smali b/com.discord/smali_classes2/rx/internal/c/c$a.smali
index d7f5f05028..43fd394eb5 100644
--- a/com.discord/smali_classes2/rx/internal/c/c$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/c$a.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field final bOl:Lrx/subscriptions/CompositeSubscription;
+.field final bOG:Lrx/subscriptions/CompositeSubscription;
 
-.field final bOm:Ljava/util/concurrent/ScheduledExecutorService;
+.field final bOH:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field final bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field final bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -49,7 +49,7 @@
 
     invoke-direct {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/c$a;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p1, p0, Lrx/internal/c/c$a;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
 
@@ -61,13 +61,13 @@
 
     invoke-direct {p1}, Lrx/subscriptions/CompositeSubscription;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/c$a;->bOl:Lrx/subscriptions/CompositeSubscription;
+    iput-object p1, p0, Lrx/internal/c/c$a;->bOG:Lrx/subscriptions/CompositeSubscription;
 
-    invoke-static {}, Lrx/internal/c/d;->KW()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-static {}, Lrx/internal/c/d;->KK()Ljava/util/concurrent/ScheduledExecutorService;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/c/c$a;->bOm:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lrx/internal/c/c$a;->bOH:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-void
 .end method
@@ -96,7 +96,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object p1
 
@@ -117,7 +117,7 @@
 
     invoke-virtual {v1, v0}, Lrx/subscriptions/b;->f(Lrx/Subscription;)V
 
-    iget-object v2, p0, Lrx/internal/c/c$a;->bOl:Lrx/subscriptions/CompositeSubscription;
+    iget-object v2, p0, Lrx/internal/c/c$a;->bOG:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v2, v1}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
@@ -140,7 +140,7 @@
     invoke-virtual {v0, v3}, Lrx/subscriptions/b;->f(Lrx/Subscription;)V
 
     :try_start_0
-    iget-object p1, p0, Lrx/internal/c/c$a;->bOm:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p0, Lrx/internal/c/c$a;->bOH:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {p1, v3, p2, p3, p4}, Ljava/util/concurrent/ScheduledExecutorService;->schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
 
@@ -169,7 +169,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object p1
 
@@ -182,15 +182,15 @@
 
     new-instance v0, Lrx/internal/c/j;
 
-    iget-object v1, p0, Lrx/internal/c/c$a;->bOl:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/c$a;->bOG:Lrx/subscriptions/CompositeSubscription;
 
     invoke-direct {v0, p1, v1}, Lrx/internal/c/j;-><init>(Lrx/functions/Action0;Lrx/subscriptions/CompositeSubscription;)V
 
-    iget-object p1, p0, Lrx/internal/c/c$a;->bOl:Lrx/subscriptions/CompositeSubscription;
+    iget-object p1, p0, Lrx/internal/c/c$a;->bOG:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {p1, v0}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/c/c$a;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object p1, p0, Lrx/internal/c/c$a;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {p1, v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->offer(Ljava/lang/Object;)Z
 
@@ -214,7 +214,7 @@
     :catch_0
     move-exception p1
 
-    iget-object v1, p0, Lrx/internal/c/c$a;->bOl:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/c$a;->bOG:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v1, v0}, Lrx/subscriptions/CompositeSubscription;->e(Lrx/Subscription;)V
 
@@ -234,7 +234,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/c$a;->bOl:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bOG:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->isUnsubscribed()Z
 
@@ -247,7 +247,7 @@
     .locals 2
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/c$a;->bOl:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bOG:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->isUnsubscribed()Z
 
@@ -255,14 +255,14 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/internal/c/c$a;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Lrx/internal/c/c$a;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
@@ -281,7 +281,7 @@
 
     if-nez v1, :cond_4
 
-    iget-object v1, p0, Lrx/internal/c/c$a;->bOl:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/c$a;->bOG:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v1}, Lrx/subscriptions/CompositeSubscription;->isUnsubscribed()Z
 
@@ -294,7 +294,7 @@
     goto :goto_0
 
     :cond_3
-    iget-object v0, p0, Lrx/internal/c/c$a;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
 
@@ -316,11 +316,11 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/c$a;->bOl:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bOG:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/c/c$a;->bpl:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bpF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/c.smali b/com.discord/smali_classes2/rx/internal/c/c.smali
index 33bed9e10a..a3a34d0ced 100644
--- a/com.discord/smali_classes2/rx/internal/c/c.smali
+++ b/com.discord/smali_classes2/rx/internal/c/c.smali
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public final Kk()Lrx/Scheduler$Worker;
+.method public final JY()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/internal/c/c$a;
diff --git a/com.discord/smali_classes2/rx/internal/c/d.smali b/com.discord/smali_classes2/rx/internal/c/d.smali
index 1664c3ac46..6b2672cd07 100644
--- a/com.discord/smali_classes2/rx/internal/c/d.smali
+++ b/com.discord/smali_classes2/rx/internal/c/d.smali
@@ -7,17 +7,17 @@
 
 
 # static fields
-.field private static final bOr:[Ljava/util/concurrent/ScheduledExecutorService;
+.field private static final bOM:[Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private static final bOs:Ljava/util/concurrent/ScheduledExecutorService;
+.field private static final bON:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field public static final bOt:Lrx/internal/c/d;
+.field public static final bOO:Lrx/internal/c/d;
 
-.field private static bOv:I
+.field private static bOQ:I
 
 
 # instance fields
-.field private final bOu:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bOP:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -37,13 +37,13 @@
 
     new-array v1, v0, [Ljava/util/concurrent/ScheduledExecutorService;
 
-    sput-object v1, Lrx/internal/c/d;->bOr:[Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v1, Lrx/internal/c/d;->bOM:[Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-static {v0}, Ljava/util/concurrent/Executors;->newScheduledThreadPool(I)Ljava/util/concurrent/ScheduledExecutorService;
 
     move-result-object v0
 
-    sput-object v0, Lrx/internal/c/d;->bOs:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v0, Lrx/internal/c/d;->bON:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {v0}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
 
@@ -51,7 +51,7 @@
 
     invoke-direct {v0}, Lrx/internal/c/d;-><init>()V
 
-    sput-object v0, Lrx/internal/c/d;->bOt:Lrx/internal/c/d;
+    sput-object v0, Lrx/internal/c/d;->bOO:Lrx/internal/c/d;
 
     return-void
 .end method
@@ -63,23 +63,23 @@
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/c/d;->bOr:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lrx/internal/c/d;->bOM:[Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lrx/internal/c/d;->bOu:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/c/d;->bOP:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Lrx/internal/c/d;->start()V
 
     return-void
 .end method
 
-.method public static KW()Ljava/util/concurrent/ScheduledExecutorService;
+.method public static KK()Ljava/util/concurrent/ScheduledExecutorService;
     .locals 3
 
-    sget-object v0, Lrx/internal/c/d;->bOt:Lrx/internal/c/d;
+    sget-object v0, Lrx/internal/c/d;->bOO:Lrx/internal/c/d;
 
-    iget-object v0, v0, Lrx/internal/c/d;->bOu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/c/d;->bOP:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -87,16 +87,16 @@
 
     check-cast v0, [Ljava/util/concurrent/ScheduledExecutorService;
 
-    sget-object v1, Lrx/internal/c/d;->bOr:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lrx/internal/c/d;->bOM:[Ljava/util/concurrent/ScheduledExecutorService;
 
     if-ne v0, v1, :cond_0
 
-    sget-object v0, Lrx/internal/c/d;->bOs:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Lrx/internal/c/d;->bON:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-object v0
 
     :cond_0
-    sget v1, Lrx/internal/c/d;->bOv:I
+    sget v1, Lrx/internal/c/d;->bOQ:I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -107,7 +107,7 @@
     const/4 v1, 0x0
 
     :cond_1
-    sput v1, Lrx/internal/c/d;->bOv:I
+    sput v1, Lrx/internal/c/d;->bOQ:I
 
     aget-object v0, v0, v1
 
@@ -148,7 +148,7 @@
     :goto_0
     if-ge v3, v0, :cond_2
 
-    invoke-static {}, Lrx/internal/c/e;->KX()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-static {}, Lrx/internal/c/e;->KL()Ljava/util/concurrent/ScheduledExecutorService;
 
     move-result-object v4
 
@@ -159,9 +159,9 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lrx/internal/c/d;->bOu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/d;->bOP:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v3, Lrx/internal/c/d;->bOr:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v3, Lrx/internal/c/d;->bOM:[Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-virtual {v0, v3, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -222,7 +222,7 @@
     .locals 4
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/d;->bOu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/d;->bOP:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -230,14 +230,14 @@
 
     check-cast v0, [Ljava/util/concurrent/ScheduledExecutorService;
 
-    sget-object v1, Lrx/internal/c/d;->bOr:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lrx/internal/c/d;->bOM:[Ljava/util/concurrent/ScheduledExecutorService;
 
     if-ne v0, v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v2, p0, Lrx/internal/c/d;->bOu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/c/d;->bOP:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/rx/internal/c/e.smali b/com.discord/smali_classes2/rx/internal/c/e.smali
index 6c0b3ba71e..0b0b70a166 100644
--- a/com.discord/smali_classes2/rx/internal/c/e.smali
+++ b/com.discord/smali_classes2/rx/internal/c/e.smali
@@ -14,9 +14,9 @@
 
 
 # static fields
-.field static final bOw:Lrx/internal/util/j;
+.field static final bOR:Lrx/internal/util/j;
 
-.field private static final synthetic bOx:[Lrx/internal/c/e;
+.field private static final synthetic bOS:[Lrx/internal/c/e;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     new-array v0, v0, [Lrx/internal/c/e;
 
-    sput-object v0, Lrx/internal/c/e;->bOx:[Lrx/internal/c/e;
+    sput-object v0, Lrx/internal/c/e;->bOS:[Lrx/internal/c/e;
 
     new-instance v0, Lrx/internal/util/j;
 
@@ -35,15 +35,15 @@
 
     invoke-direct {v0, v1}, Lrx/internal/util/j;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/c/e;->bOw:Lrx/internal/util/j;
+    sput-object v0, Lrx/internal/c/e;->bOR:Lrx/internal/util/j;
 
     return-void
 .end method
 
-.method public static KX()Ljava/util/concurrent/ScheduledExecutorService;
+.method public static KL()Ljava/util/concurrent/ScheduledExecutorService;
     .locals 2
 
-    invoke-static {}, Lrx/c/c;->Lq()Lrx/functions/Func0;
+    invoke-static {}, Lrx/c/c;->Le()Lrx/functions/Func0;
 
     move-result-object v0
 
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x1
 
-    sget-object v1, Lrx/internal/c/e;->bOw:Lrx/internal/util/j;
+    sget-object v1, Lrx/internal/c/e;->bOR:Lrx/internal/util/j;
 
     invoke-static {v0, v1}, Ljava/util/concurrent/Executors;->newScheduledThreadPool(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;
 
@@ -86,7 +86,7 @@
 .method public static values()[Lrx/internal/c/e;
     .locals 1
 
-    sget-object v0, Lrx/internal/c/e;->bOx:[Lrx/internal/c/e;
+    sget-object v0, Lrx/internal/c/e;->bOS:[Lrx/internal/c/e;
 
     invoke-virtual {v0}, [Lrx/internal/c/e;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/c/f$a.smali b/com.discord/smali_classes2/rx/internal/c/f$a.smali
index e4bf7683fd..721b634504 100644
--- a/com.discord/smali_classes2/rx/internal/c/f$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/f$a.smali
@@ -18,16 +18,16 @@
 
 
 # instance fields
-.field final synthetic bOA:Lrx/internal/c/f;
+.field final bOU:Lrx/subscriptions/a;
 
-.field final bOz:Lrx/subscriptions/a;
+.field final synthetic bOV:Lrx/internal/c/f;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/c/f;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/c/f$a;->bOA:Lrx/internal/c/f;
+    iput-object p1, p0, Lrx/internal/c/f$a;->bOV:Lrx/internal/c/f;
 
     invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
 
@@ -35,7 +35,7 @@
 
     invoke-direct {p1}, Lrx/subscriptions/a;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/f$a;->bOz:Lrx/subscriptions/a;
+    iput-object p1, p0, Lrx/internal/c/f$a;->bOU:Lrx/subscriptions/a;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-interface {p1}, Lrx/functions/Action0;->call()V
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object p1
 
@@ -81,7 +81,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/f$a;->bOz:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/f$a;->bOU:Lrx/subscriptions/a;
 
     invoke-virtual {v0}, Lrx/subscriptions/a;->isUnsubscribed()Z
 
@@ -93,7 +93,7 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/f$a;->bOz:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/f$a;->bOU:Lrx/subscriptions/a;
 
     invoke-virtual {v0}, Lrx/subscriptions/a;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/f.smali b/com.discord/smali_classes2/rx/internal/c/f.smali
index eb8a5acf9f..8708597384 100644
--- a/com.discord/smali_classes2/rx/internal/c/f.smali
+++ b/com.discord/smali_classes2/rx/internal/c/f.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field public static final bOy:Lrx/internal/c/f;
+.field public static final bOT:Lrx/internal/c/f;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Lrx/internal/c/f;-><init>()V
 
-    sput-object v0, Lrx/internal/c/f;->bOy:Lrx/internal/c/f;
+    sput-object v0, Lrx/internal/c/f;->bOT:Lrx/internal/c/f;
 
     return-void
 .end method
@@ -38,7 +38,7 @@
 
 
 # virtual methods
-.method public final Kk()Lrx/Scheduler$Worker;
+.method public final JY()Lrx/Scheduler$Worker;
     .locals 1
 
     new-instance v0, Lrx/internal/c/f$a;
diff --git a/com.discord/smali_classes2/rx/internal/c/g.smali b/com.discord/smali_classes2/rx/internal/c/g.smali
index 948d82bde9..e3e5acd78f 100644
--- a/com.discord/smali_classes2/rx/internal/c/g.smali
+++ b/com.discord/smali_classes2/rx/internal/c/g.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final bgx:Ljava/util/concurrent/ThreadFactory;
+.field private final bgR:Ljava/util/concurrent/ThreadFactory;
 
 
 # direct methods
@@ -13,19 +13,19 @@
 
     invoke-direct {p0}, Lrx/Scheduler;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/g;->bgx:Ljava/util/concurrent/ThreadFactory;
+    iput-object p1, p0, Lrx/internal/c/g;->bgR:Ljava/util/concurrent/ThreadFactory;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Kk()Lrx/Scheduler$Worker;
+.method public final JY()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/internal/c/h;
 
-    iget-object v1, p0, Lrx/internal/c/g;->bgx:Ljava/util/concurrent/ThreadFactory;
+    iget-object v1, p0, Lrx/internal/c/g;->bgR:Ljava/util/concurrent/ThreadFactory;
 
     invoke-direct {v0, v1}, Lrx/internal/c/h;-><init>(Ljava/util/concurrent/ThreadFactory;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/h$1.smali b/com.discord/smali_classes2/rx/internal/c/h$1.smali
index 5be5b283ab..f3f4bf109a 100644
--- a/com.discord/smali_classes2/rx/internal/c/h$1.smali
+++ b/com.discord/smali_classes2/rx/internal/c/h$1.smali
@@ -31,7 +31,7 @@
 .method public final run()V
     .locals 0
 
-    invoke-static {}, Lrx/internal/c/h;->KY()V
+    invoke-static {}, Lrx/internal/c/h;->KM()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/c/h.smali b/com.discord/smali_classes2/rx/internal/c/h.smali
index ebe4d9996c..0c804fa717 100644
--- a/com.discord/smali_classes2/rx/internal/c/h.smali
+++ b/com.discord/smali_classes2/rx/internal/c/h.smali
@@ -7,11 +7,11 @@
 
 
 # static fields
-.field private static final bOC:Z
+.field private static final bOX:Z
 
-.field public static final bOD:I
+.field public static final bOY:I
 
-.field private static final bOE:Ljava/util/concurrent/ConcurrentHashMap;
+.field private static final bOZ:Ljava/util/concurrent/ConcurrentHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentHashMap<",
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field private static final bOF:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final bPa:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -32,15 +32,15 @@
     .end annotation
 .end field
 
-.field private static volatile bOG:Ljava/lang/Object;
+.field private static volatile bPb:Ljava/lang/Object;
 
-.field private static final bOH:Ljava/lang/Object;
+.field private static final bPc:Ljava/lang/Object;
 
 
 # instance fields
-.field volatile bOB:Z
+.field volatile bOW:Z
 
-.field final oX:Ljava/util/concurrent/ScheduledExecutorService;
+.field final oW:Ljava/util/concurrent/ScheduledExecutorService;
 
 
 # direct methods
@@ -51,19 +51,19 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/c/h;->bOH:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/c/h;->bPc:Ljava/lang/Object;
 
     new-instance v0, Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
 
-    sput-object v0, Lrx/internal/c/h;->bOE:Ljava/util/concurrent/ConcurrentHashMap;
+    sput-object v0, Lrx/internal/c/h;->bOZ: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, Lrx/internal/c/h;->bOF:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lrx/internal/c/h;->bPa:Ljava/util/concurrent/atomic/AtomicReference;
 
     const-string v0, "rx.scheduler.jdk6.purge-frequency-millis"
 
@@ -77,7 +77,7 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/c/h;->bOD:I
+    sput v0, Lrx/internal/c/h;->bOY:I
 
     const-string v0, "rx.scheduler.jdk6.purge-force"
 
@@ -85,7 +85,7 @@
 
     move-result v0
 
-    invoke-static {}, Lrx/internal/util/h;->Lc()I
+    invoke-static {}, Lrx/internal/util/h;->KQ()I
 
     move-result v1
 
@@ -106,7 +106,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lrx/internal/c/h;->bOC:Z
+    sput-boolean v0, Lrx/internal/c/h;->bOX:Z
 
     return-void
 .end method
@@ -139,16 +139,16 @@
     invoke-static {v0}, Lrx/internal/c/h;->a(Ljava/util/concurrent/ScheduledThreadPoolExecutor;)V
 
     :cond_0
-    iput-object p1, p0, Lrx/internal/c/h;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lrx/internal/c/h;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-void
 .end method
 
-.method static KY()V
+.method static KM()V
     .locals 3
 
     :try_start_0
-    sget-object v0, Lrx/internal/c/h;->bOE:Ljava/util/concurrent/ConcurrentHashMap;
+    sget-object v0, Lrx/internal/c/h;->bOZ:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -204,7 +204,7 @@
 .method public static a(Ljava/util/concurrent/ScheduledExecutorService;)V
     .locals 1
 
-    sget-object v0, Lrx/internal/c/h;->bOE:Ljava/util/concurrent/ConcurrentHashMap;
+    sget-object v0, Lrx/internal/c/h;->bOZ:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v0, p0}, Ljava/util/concurrent/ConcurrentHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -215,7 +215,7 @@
     .locals 10
 
     :goto_0
-    sget-object v0, Lrx/internal/c/h;->bOF:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/internal/c/h;->bPa:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -237,7 +237,7 @@
 
     move-result-object v3
 
-    sget-object v0, Lrx/internal/c/h;->bOF:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/internal/c/h;->bPa:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
@@ -251,7 +251,7 @@
 
     invoke-direct {v4}, Lrx/internal/c/h$1;-><init>()V
 
-    sget v0, Lrx/internal/c/h;->bOD:I
+    sget v0, Lrx/internal/c/h;->bOY:I
 
     int-to-long v5, v0
 
@@ -270,7 +270,7 @@
 
     :cond_1
     :goto_1
-    sget-object v0, Lrx/internal/c/h;->bOE:Ljava/util/concurrent/ConcurrentHashMap;
+    sget-object v0, Lrx/internal/c/h;->bOZ:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v0, p0, p0}, Ljava/util/concurrent/ConcurrentHashMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -280,7 +280,7 @@
 .method public static b(Ljava/util/concurrent/ScheduledExecutorService;)Z
     .locals 5
 
-    sget-boolean v0, Lrx/internal/c/h;->bOC:Z
+    sget-boolean v0, Lrx/internal/c/h;->bOX:Z
 
     const/4 v1, 0x0
 
@@ -290,9 +290,9 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lrx/internal/c/h;->bOG:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/c/h;->bPb:Ljava/lang/Object;
 
-    sget-object v2, Lrx/internal/c/h;->bOH:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/c/h;->bPc:Ljava/lang/Object;
 
     if-ne v0, v2, :cond_0
 
@@ -312,10 +312,10 @@
     goto :goto_0
 
     :cond_1
-    sget-object v2, Lrx/internal/c/h;->bOH:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/c/h;->bPc:Ljava/lang/Object;
 
     :goto_0
-    sput-object v2, Lrx/internal/c/h;->bOG:Ljava/lang/Object;
+    sput-object v2, Lrx/internal/c/h;->bPb:Ljava/lang/Object;
 
     goto :goto_1
 
@@ -441,11 +441,11 @@
 .method public final a(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
     .locals 1
 
-    iget-boolean v0, p0, Lrx/internal/c/h;->bOB:Z
+    iget-boolean v0, p0, Lrx/internal/c/h;->bOW:Z
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object p1
 
@@ -490,7 +490,7 @@
 
     if-gtz p1, :cond_0
 
-    iget-object p1, p0, Lrx/internal/c/h;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p0, Lrx/internal/c/h;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {p1, v0}, Ljava/util/concurrent/ScheduledExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
 
@@ -499,7 +499,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lrx/internal/c/h;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p0, Lrx/internal/c/h;->oW: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;
 
@@ -514,7 +514,7 @@
 .method public isUnsubscribed()Z
     .locals 1
 
-    iget-boolean v0, p0, Lrx/internal/c/h;->bOB:Z
+    iget-boolean v0, p0, Lrx/internal/c/h;->bOW:Z
 
     return v0
 .end method
@@ -524,13 +524,13 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/c/h;->bOB:Z
+    iput-boolean v0, p0, Lrx/internal/c/h;->bOW:Z
 
-    iget-object v0, p0, Lrx/internal/c/h;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/h;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {v0}, Ljava/util/concurrent/ScheduledExecutorService;->shutdownNow()Ljava/util/List;
 
-    iget-object v0, p0, Lrx/internal/c/h;->oX:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/h;->oW:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-static {v0}, Lrx/internal/c/h;->a(Ljava/util/concurrent/ScheduledExecutorService;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/i$1.smali b/com.discord/smali_classes2/rx/internal/c/i$1.smali
index d52fe6a5c5..cf57dffb5c 100644
--- a/com.discord/smali_classes2/rx/internal/c/i$1.smali
+++ b/com.discord/smali_classes2/rx/internal/c/i$1.smali
@@ -18,23 +18,23 @@
 
 
 # instance fields
-.field final synthetic bNX:Lrx/functions/Action0;
+.field final synthetic bOs:Lrx/functions/Action0;
 
-.field bOJ:J
+.field bPe:J
 
-.field bOK:J
+.field bPf:J
 
-.field bOL:J
+.field bPg:J
 
-.field final synthetic bOM:J
+.field final synthetic bPh:J
 
-.field final synthetic bON:J
+.field final synthetic bPi:J
 
-.field final synthetic bOO:Lrx/internal/d/a;
+.field final synthetic bPj:Lrx/internal/d/a;
 
-.field final synthetic bOP:Lrx/internal/c/i$a;
+.field final synthetic bPk:Lrx/internal/c/i$a;
 
-.field final synthetic bOQ:J
+.field final synthetic bPl:J
 
 .field final synthetic val$worker:Lrx/Scheduler$Worker;
 
@@ -43,31 +43,31 @@
 .method constructor <init>(JJLrx/functions/Action0;Lrx/internal/d/a;Lrx/internal/c/i$a;Lrx/Scheduler$Worker;J)V
     .locals 0
 
-    iput-wide p1, p0, Lrx/internal/c/i$1;->bOM:J
+    iput-wide p1, p0, Lrx/internal/c/i$1;->bPh:J
 
-    iput-wide p3, p0, Lrx/internal/c/i$1;->bON:J
+    iput-wide p3, p0, Lrx/internal/c/i$1;->bPi:J
 
-    iput-object p5, p0, Lrx/internal/c/i$1;->bNX:Lrx/functions/Action0;
+    iput-object p5, p0, Lrx/internal/c/i$1;->bOs:Lrx/functions/Action0;
 
-    iput-object p6, p0, Lrx/internal/c/i$1;->bOO:Lrx/internal/d/a;
+    iput-object p6, p0, Lrx/internal/c/i$1;->bPj:Lrx/internal/d/a;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lrx/internal/c/i$1;->bOP:Lrx/internal/c/i$a;
+    iput-object p1, p0, Lrx/internal/c/i$1;->bPk:Lrx/internal/c/i$a;
 
     iput-object p8, p0, Lrx/internal/c/i$1;->val$worker:Lrx/Scheduler$Worker;
 
-    iput-wide p9, p0, Lrx/internal/c/i$1;->bOQ:J
+    iput-wide p9, p0, Lrx/internal/c/i$1;->bPl:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-wide p1, p0, Lrx/internal/c/i$1;->bOM:J
+    iget-wide p1, p0, Lrx/internal/c/i$1;->bPh:J
 
-    iput-wide p1, p0, Lrx/internal/c/i$1;->bOK:J
+    iput-wide p1, p0, Lrx/internal/c/i$1;->bPf:J
 
-    iget-wide p1, p0, Lrx/internal/c/i$1;->bON:J
+    iget-wide p1, p0, Lrx/internal/c/i$1;->bPi:J
 
-    iput-wide p1, p0, Lrx/internal/c/i$1;->bOL:J
+    iput-wide p1, p0, Lrx/internal/c/i$1;->bPg:J
 
     return-void
 .end method
@@ -77,11 +77,11 @@
 .method public final call()V
     .locals 10
 
-    iget-object v0, p0, Lrx/internal/c/i$1;->bNX:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/i$1;->bOs:Lrx/functions/Action0;
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
-    iget-object v0, p0, Lrx/internal/c/i$1;->bOO:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/c/i$1;->bPj:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->isUnsubscribed()Z
 
@@ -89,11 +89,11 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lrx/internal/c/i$1;->bOP:Lrx/internal/c/i$a;
+    iget-object v0, p0, Lrx/internal/c/i$1;->bPk:Lrx/internal/c/i$a;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lrx/internal/c/i$a;->KZ()J
+    invoke-interface {v0}, Lrx/internal/c/i$a;->KN()J
 
     move-result-wide v0
 
@@ -111,11 +111,11 @@
     move-result-wide v0
 
     :goto_0
-    sget-wide v2, Lrx/internal/c/i;->bOI:J
+    sget-wide v2, Lrx/internal/c/i;->bPd:J
 
     add-long/2addr v2, v0
 
-    iget-wide v4, p0, Lrx/internal/c/i$1;->bOK:J
+    iget-wide v4, p0, Lrx/internal/c/i$1;->bPf:J
 
     const-wide/16 v6, 0x1
 
@@ -123,11 +123,11 @@
 
     if-ltz v8, :cond_2
 
-    iget-wide v2, p0, Lrx/internal/c/i$1;->bOQ:J
+    iget-wide v2, p0, Lrx/internal/c/i$1;->bPl:J
 
     add-long/2addr v4, v2
 
-    sget-wide v2, Lrx/internal/c/i;->bOI:J
+    sget-wide v2, Lrx/internal/c/i;->bPd:J
 
     add-long/2addr v4, v2
 
@@ -138,15 +138,15 @@
     goto :goto_1
 
     :cond_1
-    iget-wide v2, p0, Lrx/internal/c/i$1;->bOL:J
+    iget-wide v2, p0, Lrx/internal/c/i$1;->bPg:J
 
-    iget-wide v4, p0, Lrx/internal/c/i$1;->bOJ:J
+    iget-wide v4, p0, Lrx/internal/c/i$1;->bPe:J
 
     add-long/2addr v4, v6
 
-    iput-wide v4, p0, Lrx/internal/c/i$1;->bOJ:J
+    iput-wide v4, p0, Lrx/internal/c/i$1;->bPe:J
 
-    iget-wide v6, p0, Lrx/internal/c/i$1;->bOQ:J
+    iget-wide v6, p0, Lrx/internal/c/i$1;->bPl:J
 
     mul-long v4, v4, v6
 
@@ -156,30 +156,30 @@
 
     :cond_2
     :goto_1
-    iget-wide v2, p0, Lrx/internal/c/i$1;->bOQ:J
+    iget-wide v2, p0, Lrx/internal/c/i$1;->bPl:J
 
     add-long v4, v0, v2
 
-    iget-wide v8, p0, Lrx/internal/c/i$1;->bOJ:J
+    iget-wide v8, p0, Lrx/internal/c/i$1;->bPe:J
 
     add-long/2addr v8, v6
 
-    iput-wide v8, p0, Lrx/internal/c/i$1;->bOJ:J
+    iput-wide v8, p0, Lrx/internal/c/i$1;->bPe:J
 
     mul-long v2, v2, v8
 
     sub-long v2, v4, v2
 
-    iput-wide v2, p0, Lrx/internal/c/i$1;->bOL:J
+    iput-wide v2, p0, Lrx/internal/c/i$1;->bPg:J
 
     move-wide v2, v4
 
     :goto_2
-    iput-wide v0, p0, Lrx/internal/c/i$1;->bOK:J
+    iput-wide v0, p0, Lrx/internal/c/i$1;->bPf:J
 
     sub-long/2addr v2, v0
 
-    iget-object v0, p0, Lrx/internal/c/i$1;->bOO:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/c/i$1;->bPj:Lrx/internal/d/a;
 
     iget-object v1, p0, Lrx/internal/c/i$1;->val$worker:Lrx/Scheduler$Worker;
 
diff --git a/com.discord/smali_classes2/rx/internal/c/i$a.smali b/com.discord/smali_classes2/rx/internal/c/i$a.smali
index e507bf5be9..9a5f361533 100644
--- a/com.discord/smali_classes2/rx/internal/c/i$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/i$a.smali
@@ -15,5 +15,5 @@
 
 
 # virtual methods
-.method public abstract KZ()J
+.method public abstract KN()J
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/c/i.smali b/com.discord/smali_classes2/rx/internal/c/i.smali
index acb97cc9a1..a15d02ccf0 100644
--- a/com.discord/smali_classes2/rx/internal/c/i.smali
+++ b/com.discord/smali_classes2/rx/internal/c/i.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field public static final bOI:J
+.field public static final bPd:J
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/c/i;->bOI:J
+    sput-wide v0, Lrx/internal/c/i;->bPd:J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/c/j$a.smali b/com.discord/smali_classes2/rx/internal/c/j$a.smali
index 3e5dea6edf..80daf45a97 100644
--- a/com.discord/smali_classes2/rx/internal/c/j$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/j$a.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final bOR:Ljava/util/concurrent/Future;
+.field private final bPm:Ljava/util/concurrent/Future;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/Future<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field final synthetic bOS:Lrx/internal/c/j;
+.field final synthetic bPn:Lrx/internal/c/j;
 
 
 # direct methods
@@ -41,11 +41,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lrx/internal/c/j$a;->bOS:Lrx/internal/c/j;
+    iput-object p1, p0, Lrx/internal/c/j$a;->bPn:Lrx/internal/c/j;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lrx/internal/c/j$a;->bOR:Ljava/util/concurrent/Future;
+    iput-object p2, p0, Lrx/internal/c/j$a;->bPm:Ljava/util/concurrent/Future;
 
     return-void
 .end method
@@ -55,7 +55,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/j$a;->bOR:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/j$a;->bPm:Ljava/util/concurrent/Future;
 
     invoke-interface {v0}, Ljava/util/concurrent/Future;->isCancelled()Z
 
@@ -67,7 +67,7 @@
 .method public final unsubscribe()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/c/j$a;->bOS:Lrx/internal/c/j;
+    iget-object v0, p0, Lrx/internal/c/j$a;->bPn:Lrx/internal/c/j;
 
     invoke-virtual {v0}, Lrx/internal/c/j;->get()Ljava/lang/Object;
 
@@ -79,7 +79,7 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/internal/c/j$a;->bOR:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/j$a;->bPm:Ljava/util/concurrent/Future;
 
     const/4 v1, 0x1
 
@@ -88,7 +88,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/j$a;->bOR:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/j$a;->bPm:Ljava/util/concurrent/Future;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/rx/internal/c/j$c.smali b/com.discord/smali_classes2/rx/internal/c/j$c.smali
index aa98d65d15..e9c97a68b5 100644
--- a/com.discord/smali_classes2/rx/internal/c/j$c.smali
+++ b/com.discord/smali_classes2/rx/internal/c/j$c.smali
@@ -71,7 +71,7 @@
 
     iget-object v1, p0, Lrx/internal/c/j$c;->s:Lrx/internal/c/j;
 
-    iget-boolean v2, v0, Lrx/internal/util/SubscriptionList;->bIT:Z
+    iget-boolean v2, v0, Lrx/internal/util/SubscriptionList;->bJn:Z
 
     if-nez v2, :cond_2
 
@@ -80,7 +80,7 @@
     :try_start_0
     iget-object v2, v0, Lrx/internal/util/SubscriptionList;->subscriptions:Ljava/util/List;
 
-    iget-boolean v3, v0, Lrx/internal/util/SubscriptionList;->bIT:Z
+    iget-boolean v3, v0, Lrx/internal/util/SubscriptionList;->bJn:Z
 
     if-nez v3, :cond_1
 
diff --git a/com.discord/smali_classes2/rx/internal/c/l.smali b/com.discord/smali_classes2/rx/internal/c/l.smali
index fb185a821a..00cb726253 100644
--- a/com.discord/smali_classes2/rx/internal/c/l.smali
+++ b/com.discord/smali_classes2/rx/internal/c/l.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final bOT:Lrx/functions/Action0;
+.field private final bPo:Lrx/functions/Action0;
 
-.field private final bOU:Lrx/Scheduler$Worker;
+.field private final bPp:Lrx/Scheduler$Worker;
 
-.field private final bOV:J
+.field private final bPq:J
 
 
 # direct methods
@@ -20,11 +20,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/l;->bOT:Lrx/functions/Action0;
+    iput-object p1, p0, Lrx/internal/c/l;->bPo:Lrx/functions/Action0;
 
-    iput-object p2, p0, Lrx/internal/c/l;->bOU:Lrx/Scheduler$Worker;
+    iput-object p2, p0, Lrx/internal/c/l;->bPp:Lrx/Scheduler$Worker;
 
-    iput-wide p3, p0, Lrx/internal/c/l;->bOV:J
+    iput-wide p3, p0, Lrx/internal/c/l;->bPq:J
 
     return-void
 .end method
@@ -34,7 +34,7 @@
 .method public final call()V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/c/l;->bOU:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/c/l;->bPp:Lrx/Scheduler$Worker;
 
     invoke-virtual {v0}, Lrx/Scheduler$Worker;->isUnsubscribed()Z
 
@@ -45,7 +45,7 @@
     return-void
 
     :cond_0
-    iget-wide v0, p0, Lrx/internal/c/l;->bOV:J
+    iget-wide v0, p0, Lrx/internal/c/l;->bPq:J
 
     invoke-static {}, Lrx/Scheduler$Worker;->now()J
 
@@ -79,7 +79,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/internal/c/l;->bOU:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/c/l;->bPp:Lrx/Scheduler$Worker;
 
     invoke-virtual {v0}, Lrx/Scheduler$Worker;->isUnsubscribed()Z
 
@@ -90,7 +90,7 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lrx/internal/c/l;->bOT:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/l;->bPo:Lrx/functions/Action0;
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/m$a$1.smali b/com.discord/smali_classes2/rx/internal/c/m$a$1.smali
index a7675847fc..028b79eed0 100644
--- a/com.discord/smali_classes2/rx/internal/c/m$a$1.smali
+++ b/com.discord/smali_classes2/rx/internal/c/m$a$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bOZ:Lrx/internal/c/m$b;
+.field final synthetic bPu:Lrx/internal/c/m$b;
 
-.field final synthetic bPa:Lrx/internal/c/m$a;
+.field final synthetic bPv:Lrx/internal/c/m$a;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/c/m$a;Lrx/internal/c/m$b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/c/m$a$1;->bPa:Lrx/internal/c/m$a;
+    iput-object p1, p0, Lrx/internal/c/m$a$1;->bPv:Lrx/internal/c/m$a;
 
-    iput-object p2, p0, Lrx/internal/c/m$a$1;->bOZ:Lrx/internal/c/m$b;
+    iput-object p2, p0, Lrx/internal/c/m$a$1;->bPu:Lrx/internal/c/m$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,11 +41,11 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/c/m$a$1;->bPa:Lrx/internal/c/m$a;
+    iget-object v0, p0, Lrx/internal/c/m$a$1;->bPv:Lrx/internal/c/m$a;
 
-    iget-object v0, v0, Lrx/internal/c/m$a;->bOY:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object v0, v0, Lrx/internal/c/m$a;->bPt:Ljava/util/concurrent/PriorityBlockingQueue;
 
-    iget-object v1, p0, Lrx/internal/c/m$a$1;->bOZ:Lrx/internal/c/m$b;
+    iget-object v1, p0, Lrx/internal/c/m$a$1;->bPu:Lrx/internal/c/m$b;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/PriorityBlockingQueue;->remove(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/rx/internal/c/m$a.smali b/com.discord/smali_classes2/rx/internal/c/m$a.smali
index 0cb0111c85..03721fac03 100644
--- a/com.discord/smali_classes2/rx/internal/c/m$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/m$a.smali
@@ -18,9 +18,11 @@
 
 
 # instance fields
-.field final bOX:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final bOU:Lrx/subscriptions/a;
 
-.field final bOY:Ljava/util/concurrent/PriorityBlockingQueue;
+.field final bPs:Ljava/util/concurrent/atomic/AtomicInteger;
+
+.field final bPt:Ljava/util/concurrent/PriorityBlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/PriorityBlockingQueue<",
@@ -30,8 +32,6 @@
     .end annotation
 .end field
 
-.field private final bOz:Lrx/subscriptions/a;
-
 .field private final wip:Ljava/util/concurrent/atomic/AtomicInteger;
 
 
@@ -45,19 +45,19 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/c/m$a;->bOX:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lrx/internal/c/m$a;->bPs: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, Lrx/internal/c/m$a;->bOY:Ljava/util/concurrent/PriorityBlockingQueue;
+    iput-object v0, p0, Lrx/internal/c/m$a;->bPt:Ljava/util/concurrent/PriorityBlockingQueue;
 
     new-instance v0, Lrx/subscriptions/a;
 
     invoke-direct {v0}, Lrx/subscriptions/a;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/c/m$a;->bOz:Lrx/subscriptions/a;
+    iput-object v0, p0, Lrx/internal/c/m$a;->bOU:Lrx/subscriptions/a;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
 
@@ -71,7 +71,7 @@
 .method private a(Lrx/functions/Action0;J)Lrx/Subscription;
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/m$a;->bOz:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/m$a;->bOU:Lrx/subscriptions/a;
 
     invoke-virtual {v0}, Lrx/subscriptions/a;->isUnsubscribed()Z
 
@@ -79,7 +79,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object p1
 
@@ -92,7 +92,7 @@
 
     move-result-object p2
 
-    iget-object p3, p0, Lrx/internal/c/m$a;->bOX:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p3, p0, Lrx/internal/c/m$a;->bPs:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p3}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
@@ -100,7 +100,7 @@
 
     invoke-direct {v0, p1, p2, p3}, Lrx/internal/c/m$b;-><init>(Lrx/functions/Action0;Ljava/lang/Long;I)V
 
-    iget-object p1, p0, Lrx/internal/c/m$a;->bOY:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object p1, p0, Lrx/internal/c/m$a;->bPt:Ljava/util/concurrent/PriorityBlockingQueue;
 
     invoke-virtual {p1, v0}, Ljava/util/concurrent/PriorityBlockingQueue;->add(Ljava/lang/Object;)Z
 
@@ -113,7 +113,7 @@
     if-nez p1, :cond_3
 
     :cond_1
-    iget-object p1, p0, Lrx/internal/c/m$a;->bOY:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object p1, p0, Lrx/internal/c/m$a;->bPt:Ljava/util/concurrent/PriorityBlockingQueue;
 
     invoke-virtual {p1}, Ljava/util/concurrent/PriorityBlockingQueue;->poll()Ljava/lang/Object;
 
@@ -136,7 +136,7 @@
 
     if-gtz p1, :cond_1
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object p1
 
@@ -197,7 +197,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/m$a;->bOz:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/m$a;->bOU:Lrx/subscriptions/a;
 
     invoke-virtual {v0}, Lrx/subscriptions/a;->isUnsubscribed()Z
 
@@ -209,7 +209,7 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/c/m$a;->bOz:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/m$a;->bOU:Lrx/subscriptions/a;
 
     invoke-virtual {v0}, Lrx/subscriptions/a;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/internal/c/m$b.smali b/com.discord/smali_classes2/rx/internal/c/m$b.smali
index 9e3d46b056..971369feaf 100644
--- a/com.discord/smali_classes2/rx/internal/c/m$b.smali
+++ b/com.discord/smali_classes2/rx/internal/c/m$b.smali
@@ -29,7 +29,7 @@
 # instance fields
 .field final action:Lrx/functions/Action0;
 
-.field final bPb:Ljava/lang/Long;
+.field final bPw:Ljava/lang/Long;
 
 .field final count:I
 
@@ -42,7 +42,7 @@
 
     iput-object p1, p0, Lrx/internal/c/m$b;->action:Lrx/functions/Action0;
 
-    iput-object p2, p0, Lrx/internal/c/m$b;->bPb:Ljava/lang/Long;
+    iput-object p2, p0, Lrx/internal/c/m$b;->bPw:Ljava/lang/Long;
 
     iput p3, p0, Lrx/internal/c/m$b;->count:I
 
@@ -56,9 +56,9 @@
 
     check-cast p1, Lrx/internal/c/m$b;
 
-    iget-object v0, p0, Lrx/internal/c/m$b;->bPb:Ljava/lang/Long;
+    iget-object v0, p0, Lrx/internal/c/m$b;->bPw:Ljava/lang/Long;
 
-    iget-object v1, p1, Lrx/internal/c/m$b;->bPb:Ljava/lang/Long;
+    iget-object v1, p1, Lrx/internal/c/m$b;->bPw:Ljava/lang/Long;
 
     invoke-virtual {v0, v1}, Ljava/lang/Long;->compareTo(Ljava/lang/Long;)I
 
diff --git a/com.discord/smali_classes2/rx/internal/c/m.smali b/com.discord/smali_classes2/rx/internal/c/m.smali
index d3124d9615..16daeed3b5 100644
--- a/com.discord/smali_classes2/rx/internal/c/m.smali
+++ b/com.discord/smali_classes2/rx/internal/c/m.smali
@@ -13,7 +13,7 @@
 
 
 # static fields
-.field public static final bOW:Lrx/internal/c/m;
+.field public static final bPr:Lrx/internal/c/m;
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {v0}, Lrx/internal/c/m;-><init>()V
 
-    sput-object v0, Lrx/internal/c/m;->bOW:Lrx/internal/c/m;
+    sput-object v0, Lrx/internal/c/m;->bPr:Lrx/internal/c/m;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
 
 # virtual methods
-.method public final Kk()Lrx/Scheduler$Worker;
+.method public final JY()Lrx/Scheduler$Worker;
     .locals 1
 
     new-instance v0, Lrx/internal/c/m$a;
diff --git a/com.discord/smali_classes2/rx/internal/d/a.smali b/com.discord/smali_classes2/rx/internal/d/a.smali
index 9a133a4a5f..1a2e501b9c 100644
--- a/com.discord/smali_classes2/rx/internal/d/a.smali
+++ b/com.discord/smali_classes2/rx/internal/d/a.smali
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final La()Lrx/Subscription;
+.method public final KO()Lrx/Subscription;
     .locals 2
 
     invoke-super {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
@@ -51,11 +51,11 @@
 
     check-cast v0, Lrx/Subscription;
 
-    sget-object v1, Lrx/internal/d/b;->bPc:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bPx:Lrx/internal/d/b;
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->LL()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->Lz()Lrx/Subscription;
 
     move-result-object v0
 
@@ -73,7 +73,7 @@
 
     check-cast v0, Lrx/Subscription;
 
-    sget-object v1, Lrx/internal/d/b;->bPc:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bPx:Lrx/internal/d/b;
 
     if-ne v0, v1, :cond_2
 
@@ -113,7 +113,7 @@
 
     check-cast v0, Lrx/Subscription;
 
-    sget-object v1, Lrx/internal/d/b;->bPc:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bPx:Lrx/internal/d/b;
 
     if-ne v0, v1, :cond_2
 
@@ -145,7 +145,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lrx/internal/d/b;->bPc:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bPx:Lrx/internal/d/b;
 
     if-ne v0, v1, :cond_0
 
@@ -168,11 +168,11 @@
 
     check-cast v0, Lrx/Subscription;
 
-    sget-object v1, Lrx/internal/d/b;->bPc:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bPx:Lrx/internal/d/b;
 
     if-eq v0, v1, :cond_0
 
-    sget-object v0, Lrx/internal/d/b;->bPc:Lrx/internal/d/b;
+    sget-object v0, Lrx/internal/d/b;->bPx:Lrx/internal/d/b;
 
     invoke-virtual {p0, v0}, Lrx/internal/d/a;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -182,7 +182,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lrx/internal/d/b;->bPc:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bPx:Lrx/internal/d/b;
 
     if-eq v0, v1, :cond_0
 
diff --git a/com.discord/smali_classes2/rx/internal/d/b.smali b/com.discord/smali_classes2/rx/internal/d/b.smali
index 2063ecc29f..34f5da7c86 100644
--- a/com.discord/smali_classes2/rx/internal/d/b.smali
+++ b/com.discord/smali_classes2/rx/internal/d/b.smali
@@ -18,9 +18,9 @@
 
 
 # static fields
-.field public static final enum bPc:Lrx/internal/d/b;
+.field public static final enum bPx:Lrx/internal/d/b;
 
-.field private static final synthetic bPd:[Lrx/internal/d/b;
+.field private static final synthetic bPy:[Lrx/internal/d/b;
 
 
 # direct methods
@@ -33,19 +33,19 @@
 
     invoke-direct {v0, v1}, Lrx/internal/d/b;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/d/b;->bPc:Lrx/internal/d/b;
+    sput-object v0, Lrx/internal/d/b;->bPx:Lrx/internal/d/b;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/d/b;
 
-    sget-object v1, Lrx/internal/d/b;->bPc:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bPx:Lrx/internal/d/b;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/d/b;->bPd:[Lrx/internal/d/b;
+    sput-object v0, Lrx/internal/d/b;->bPy:[Lrx/internal/d/b;
 
     return-void
 .end method
@@ -82,7 +82,7 @@
 .method public static values()[Lrx/internal/d/b;
     .locals 1
 
-    sget-object v0, Lrx/internal/d/b;->bPd:[Lrx/internal/d/b;
+    sget-object v0, Lrx/internal/d/b;->bPy:[Lrx/internal/d/b;
 
     invoke-virtual {v0}, [Lrx/internal/d/b;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/SubscriptionList.smali b/com.discord/smali_classes2/rx/internal/util/SubscriptionList.smali
index 339a9f3e8f..57909b4296 100644
--- a/com.discord/smali_classes2/rx/internal/util/SubscriptionList.smali
+++ b/com.discord/smali_classes2/rx/internal/util/SubscriptionList.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field public volatile bIT:Z
+.field public volatile bJn:Z
 
 .field public subscriptions:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
@@ -79,14 +79,14 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bIT:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bJn:Z
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bIT:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bJn:Z
 
     if-nez v0, :cond_2
 
@@ -131,7 +131,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bIT:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bJn:Z
 
     return v0
 .end method
@@ -139,14 +139,14 @@
 .method public final unsubscribe()V
     .locals 3
 
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bIT:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bJn:Z
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bIT:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bJn:Z
 
     if-eqz v0, :cond_0
 
@@ -157,7 +157,7 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bIT:Z
+    iput-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bJn:Z
 
     iget-object v0, p0, Lrx/internal/util/SubscriptionList;->subscriptions:Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/a.smali b/com.discord/smali_classes2/rx/internal/util/a.smali
index f446e73b48..55a51a7d84 100644
--- a/com.discord/smali_classes2/rx/internal/util/a.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a.smali
@@ -20,16 +20,7 @@
 
 
 # instance fields
-.field final bPe:Lrx/functions/Action1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Action1<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field final bPf:Lrx/functions/Action1;
+.field final bPA:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -40,7 +31,16 @@
     .end annotation
 .end field
 
-.field final bPg:Lrx/functions/Action0;
+.field final bPB:Lrx/functions/Action0;
+
+.field final bPz:Lrx/functions/Action1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Action1<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
@@ -62,11 +62,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/util/a;->bPe:Lrx/functions/Action1;
+    iput-object p1, p0, Lrx/internal/util/a;->bPz:Lrx/functions/Action1;
 
-    iput-object p2, p0, Lrx/internal/util/a;->bPf:Lrx/functions/Action1;
+    iput-object p2, p0, Lrx/internal/util/a;->bPA:Lrx/functions/Action1;
 
-    iput-object p3, p0, Lrx/internal/util/a;->bPg:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/util/a;->bPB:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -76,7 +76,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/util/a;->bPg:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/util/a;->bPB:Lrx/functions/Action0;
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
@@ -86,7 +86,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/util/a;->bPf:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/a;->bPA:Lrx/functions/Action1;
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
@@ -101,7 +101,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a;->bPe:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/a;->bPz:Lrx/functions/Action1;
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/util/a/a.smali b/com.discord/smali_classes2/rx/internal/util/a/a.smali
index 2fb7aa305e..8daeb8dc06 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/a.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/a.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field protected final bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field protected final bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -34,7 +34,7 @@
 
     invoke-direct {p0}, Ljava/util/AbstractQueue;-><init>()V
 
-    invoke-static {p1}, Lrx/internal/util/b/h;->eq(I)I
+    invoke-static {p1}, Lrx/internal/util/b/h;->em(I)I
 
     move-result p1
 
@@ -46,7 +46,7 @@
 
     invoke-direct {v0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v0, p0, Lrx/internal/util/a/a;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/a;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     return-void
 .end method
@@ -84,7 +84,7 @@
     return-void
 .end method
 
-.method protected final ep(I)Ljava/lang/Object;
+.method protected final el(I)Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -92,7 +92,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/a;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/a;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/a/b.smali b/com.discord/smali_classes2/rx/internal/util/a/b.smali
index c6b70f170a..53823847d7 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/b.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/b.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field final bPK:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bQf:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final bPL:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bQg:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -47,18 +47,18 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/util/a/b;->bPK:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/util/a/b;->bQf: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, Lrx/internal/util/a/b;->bPL:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/util/a/b;->bQg:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
 
-.method private Lg()Lrx/internal/util/a/c;
+.method private KU()Lrx/internal/util/a/c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -68,7 +68,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/b;->bPK:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bQf:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -79,7 +79,7 @@
     return-object v0
 .end method
 
-.method private Lh()Lrx/internal/util/a/c;
+.method private KV()Lrx/internal/util/a/c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -89,7 +89,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/b;->bPL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bQg:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -102,7 +102,7 @@
 
 
 # virtual methods
-.method protected final Li()Lrx/internal/util/a/c;
+.method protected final KW()Lrx/internal/util/a/c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -112,7 +112,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/b;->bPL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bQg:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -133,7 +133,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/b;->bPK:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bQf:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
 
@@ -150,7 +150,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/b;->bPL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bQg:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
 
@@ -160,11 +160,11 @@
 .method public final isEmpty()Z
     .locals 2
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->Lh()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->KV()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->Lg()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->KU()Lrx/internal/util/a/c;
 
     move-result-object v1
 
@@ -200,11 +200,11 @@
 .method public final size()I
     .locals 4
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->Lh()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->KV()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->Lg()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->KU()Lrx/internal/util/a/c;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/rx/internal/util/a/c.smali b/com.discord/smali_classes2/rx/internal/util/a/c.smali
index 79ee8350bf..c21a46304d 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/c.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/c.smali
@@ -56,7 +56,7 @@
 
 
 # virtual methods
-.method public final Lj()Ljava/lang/Object;
+.method public final KX()Ljava/lang/Object;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/rx/internal/util/a/d.smali b/com.discord/smali_classes2/rx/internal/util/a/d.smali
index 3d281efeb9..74304c2603 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/d.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/d.smali
@@ -16,13 +16,13 @@
 
 
 # static fields
-.field private static final bPM:Ljava/lang/Integer;
+.field private static final bQh:Ljava/lang/Integer;
 
 
 # instance fields
-.field bPN:J
+.field bQi:J
 
-.field final bPO:I
+.field final bQj:I
 
 .field final consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -41,7 +41,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lrx/internal/util/a/d;->bPM:Ljava/lang/Integer;
+    sput-object v0, Lrx/internal/util/a/d;->bQh:Ljava/lang/Integer;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     div-int/lit8 p1, p1, 0x4
 
-    sget-object v0, Lrx/internal/util/a/d;->bPM:Ljava/lang/Integer;
+    sget-object v0, Lrx/internal/util/a/d;->bQh:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -75,7 +75,7 @@
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/a/d;->bPO:I
+    iput p1, p0, Lrx/internal/util/a/d;->bQj:I
 
     return-void
 .end method
@@ -139,7 +139,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lrx/internal/util/a/d;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/d;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget v1, p0, Lrx/internal/util/a/d;->mask:I
 
@@ -153,13 +153,13 @@
 
     and-int/2addr v4, v1
 
-    iget-wide v5, p0, Lrx/internal/util/a/d;->bPN:J
+    iget-wide v5, p0, Lrx/internal/util/a/d;->bQi:J
 
     cmp-long v7, v2, v5
 
     if-ltz v7, :cond_1
 
-    iget v5, p0, Lrx/internal/util/a/d;->bPO:I
+    iget v5, p0, Lrx/internal/util/a/d;->bQj:I
 
     int-to-long v5, v5
 
@@ -175,7 +175,7 @@
 
     if-nez v1, :cond_0
 
-    iput-wide v5, p0, Lrx/internal/util/a/d;->bPN:J
+    iput-wide v5, p0, Lrx/internal/util/a/d;->bQi:J
 
     goto :goto_0
 
@@ -234,7 +234,7 @@
 
     move-result v0
 
-    invoke-virtual {p0, v0}, Lrx/internal/util/a/d;->ep(I)Ljava/lang/Object;
+    invoke-virtual {p0, v0}, Lrx/internal/util/a/d;->el(I)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -259,7 +259,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lrx/internal/util/a/d;->bpD:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v3, p0, Lrx/internal/util/a/d;->bpX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/a/e.smali b/com.discord/smali_classes2/rx/internal/util/a/e.smali
index 2ed27360ae..5ecf8bee6f 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/e.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/e.smali
@@ -38,7 +38,7 @@
 .method public constructor <init>(I)V
     .locals 2
 
-    invoke-static {p1}, Lrx/internal/util/b/h;->eq(I)I
+    invoke-static {p1}, Lrx/internal/util/b/h;->em(I)I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/rx/internal/util/a/f.smali b/com.discord/smali_classes2/rx/internal/util/a/f.smali
index e81d5d7f61..b7d17b26b4 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/f.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/f.smali
@@ -20,19 +20,19 @@
 
 
 # static fields
-.field static final bPP:I
+.field static final bQk:I
 
-.field private static final bPV:Ljava/lang/Object;
+.field private static final bQq:Ljava/lang/Object;
 
 
 # instance fields
-.field bPN:J
+.field bQi:J
 
-.field bPQ:I
+.field bQl:I
 
-.field bPR:I
+.field bQm:I
 
-.field bPS:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field bQn:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -42,9 +42,9 @@
     .end annotation
 .end field
 
-.field bPT:I
+.field bQo:I
 
-.field bPU:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field bQp:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -75,13 +75,13 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/a/f;->bPP:I
+    sput v0, Lrx/internal/util/a/f;->bQk:I
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/util/a/f;->bPV:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/util/a/f;->bQq:Ljava/lang/Object;
 
     return-void
 .end method
@@ -91,7 +91,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {p1}, Lrx/internal/util/b/h;->eq(I)I
+    invoke-static {p1}, Lrx/internal/util/b/h;->em(I)I
 
     move-result p1
 
@@ -103,29 +103,29 @@
 
     invoke-direct {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v1, p0, Lrx/internal/util/a/f;->bPS:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/f;->bQn:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/f;->bPR:I
+    iput v0, p0, Lrx/internal/util/a/f;->bQm:I
 
     div-int/lit8 p1, p1, 0x4
 
-    sget v2, Lrx/internal/util/a/f;->bPP:I
+    sget v2, Lrx/internal/util/a/f;->bQk:I
 
     invoke-static {p1, v2}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/a/f;->bPQ:I
+    iput p1, p0, Lrx/internal/util/a/f;->bQl:I
 
-    iput-object v1, p0, Lrx/internal/util/a/f;->bPU:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/f;->bQp:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/f;->bPT:I
+    iput v0, p0, Lrx/internal/util/a/f;->bQo:I
 
     add-int/lit8 v0, v0, -0x1
 
     int-to-long v0, v0
 
-    iput-wide v0, p0, Lrx/internal/util/a/f;->bPN:J
+    iput-wide v0, p0, Lrx/internal/util/a/f;->bQi:J
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -389,7 +389,7 @@
         }
     .end annotation
 
-    iget-object v1, p0, Lrx/internal/util/a/f;->bPS:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lrx/internal/util/a/f;->bQn:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v0, p0, Lrx/internal/util/a/f;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -397,13 +397,13 @@
 
     move-result-wide v3
 
-    iget v0, p0, Lrx/internal/util/a/f;->bPR:I
+    iget v0, p0, Lrx/internal/util/a/f;->bQm:I
 
     long-to-int v2, v3
 
     and-int v5, v2, v0
 
-    iget-wide v6, p0, Lrx/internal/util/a/f;->bPN:J
+    iget-wide v6, p0, Lrx/internal/util/a/f;->bQi:J
 
     cmp-long v2, v3, v6
 
@@ -420,7 +420,7 @@
     return p1
 
     :cond_0
-    iget v2, p0, Lrx/internal/util/a/f;->bPQ:I
+    iget v2, p0, Lrx/internal/util/a/f;->bQl:I
 
     int-to-long v6, v2
 
@@ -440,7 +440,7 @@
 
     sub-long/2addr v6, v8
 
-    iput-wide v6, p0, Lrx/internal/util/a/f;->bPN:J
+    iput-wide v6, p0, Lrx/internal/util/a/f;->bQi:J
 
     move-object v0, p0
 
@@ -486,19 +486,19 @@
 
     invoke-direct {v2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v2, p0, Lrx/internal/util/a/f;->bPS:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v2, p0, Lrx/internal/util/a/f;->bQn:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     add-long/2addr v3, v10
 
     sub-long/2addr v3, v8
 
-    iput-wide v3, p0, Lrx/internal/util/a/f;->bPN:J
+    iput-wide v3, p0, Lrx/internal/util/a/f;->bQi:J
 
     invoke-virtual {v2, v5, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
 
     invoke-static {v1, v2}, Lrx/internal/util/a/f;->a(Ljava/util/concurrent/atomic/AtomicReferenceArray;Ljava/util/concurrent/atomic/AtomicReferenceArray;)V
 
-    sget-object p1, Lrx/internal/util/a/f;->bPV:Ljava/lang/Object;
+    sget-object p1, Lrx/internal/util/a/f;->bQq:Ljava/lang/Object;
 
     invoke-virtual {v1, v5, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
 
@@ -517,7 +517,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/f;->bPS:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/f;->bQn:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v1, p0, Lrx/internal/util/a/f;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -525,7 +525,7 @@
 
     move-result-wide v1
 
-    iget v3, p0, Lrx/internal/util/a/f;->bPR:I
+    iget v3, p0, Lrx/internal/util/a/f;->bQm:I
 
     const-wide/16 v4, 0x2
 
@@ -564,7 +564,7 @@
 
     invoke-direct {v7, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v7, p0, Lrx/internal/util/a/f;->bPS:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v7, p0, Lrx/internal/util/a/f;->bQn:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     long-to-int v2, v1
 
@@ -578,7 +578,7 @@
 
     invoke-static {v0, v7}, Lrx/internal/util/a/f;->a(Ljava/util/concurrent/atomic/AtomicReferenceArray;Ljava/util/concurrent/atomic/AtomicReferenceArray;)V
 
-    sget-object p1, Lrx/internal/util/a/f;->bPV:Ljava/lang/Object;
+    sget-object p1, Lrx/internal/util/a/f;->bQq:Ljava/lang/Object;
 
     invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
 
@@ -598,7 +598,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/f;->bPU:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/f;->bQp:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v1, p0, Lrx/internal/util/a/f;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -606,7 +606,7 @@
 
     move-result-wide v1
 
-    iget v3, p0, Lrx/internal/util/a/f;->bPT:I
+    iget v3, p0, Lrx/internal/util/a/f;->bQo:I
 
     long-to-int v2, v1
 
@@ -616,7 +616,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lrx/internal/util/a/f;->bPV:Ljava/lang/Object;
+    sget-object v3, Lrx/internal/util/a/f;->bQq:Ljava/lang/Object;
 
     if-ne v2, v3, :cond_0
 
@@ -624,7 +624,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/a/f;->bPU:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/f;->bQp:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -644,7 +644,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/f;->bPU:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/f;->bQp:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v1, p0, Lrx/internal/util/a/f;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -652,7 +652,7 @@
 
     move-result-wide v1
 
-    iget v3, p0, Lrx/internal/util/a/f;->bPT:I
+    iget v3, p0, Lrx/internal/util/a/f;->bQo:I
 
     long-to-int v4, v1
 
@@ -662,7 +662,7 @@
 
     move-result-object v4
 
-    sget-object v5, Lrx/internal/util/a/f;->bPV:Ljava/lang/Object;
+    sget-object v5, Lrx/internal/util/a/f;->bQq:Ljava/lang/Object;
 
     if-ne v4, v5, :cond_0
 
@@ -697,7 +697,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/a/f;->bPU:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/f;->bQp:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/a/g.smali b/com.discord/smali_classes2/rx/internal/util/a/g.smali
index 73eb7e74f6..1d444439c9 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/g.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/g.smali
@@ -52,7 +52,7 @@
 
     invoke-direct {v0, p1}, Lrx/internal/util/a/c;-><init>(Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lrx/internal/util/a/b;->bPK:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lrx/internal/util/a/b;->bQf:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -86,7 +86,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lrx/internal/util/a/g;->Li()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/a/g;->KW()Lrx/internal/util/a/c;
 
     move-result-object v0
 
@@ -116,7 +116,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lrx/internal/util/a/g;->Li()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/a/g;->KW()Lrx/internal/util/a/c;
 
     move-result-object v0
 
@@ -128,7 +128,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lrx/internal/util/a/c;->Lj()Ljava/lang/Object;
+    invoke-virtual {v0}, Lrx/internal/util/a/c;->KX()Ljava/lang/Object;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/rx/internal/util/a/h.smali b/com.discord/smali_classes2/rx/internal/util/a/h.smali
index 535dd12fc1..a50807abd6 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/h.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/h.smali
@@ -20,19 +20,19 @@
 
 
 # static fields
-.field static final bPP:I
+.field static final bQk:I
 
-.field private static final bPV:Ljava/lang/Object;
+.field private static final bQq:Ljava/lang/Object;
 
 
 # instance fields
-.field bPN:J
+.field bQi:J
 
-.field bPQ:I
+.field bQl:I
 
-.field bPR:I
+.field bQm:I
 
-.field bPS:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field bQn:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -42,9 +42,9 @@
     .end annotation
 .end field
 
-.field bPT:I
+.field bQo:I
 
-.field bPU:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field bQp:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -75,13 +75,13 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/a/h;->bPP:I
+    sput v0, Lrx/internal/util/a/h;->bQk:I
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/util/a/h;->bPV:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/util/a/h;->bQq:Ljava/lang/Object;
 
     return-void
 .end method
@@ -97,7 +97,7 @@
 
     move-result p1
 
-    invoke-static {p1}, Lrx/internal/util/b/h;->eq(I)I
+    invoke-static {p1}, Lrx/internal/util/b/h;->em(I)I
 
     move-result p1
 
@@ -121,29 +121,29 @@
 
     invoke-direct {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v1, p0, Lrx/internal/util/a/h;->bPS:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/h;->bQn:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/h;->bPR:I
+    iput v0, p0, Lrx/internal/util/a/h;->bQm:I
 
     div-int/lit8 p1, p1, 0x4
 
-    sget v2, Lrx/internal/util/a/h;->bPP:I
+    sget v2, Lrx/internal/util/a/h;->bQk:I
 
     invoke-static {p1, v2}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/a/h;->bPQ:I
+    iput p1, p0, Lrx/internal/util/a/h;->bQl:I
 
-    iput-object v1, p0, Lrx/internal/util/a/h;->bPU:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/h;->bQp:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/h;->bPT:I
+    iput v0, p0, Lrx/internal/util/a/h;->bQo:I
 
     add-int/lit8 v0, v0, -0x1
 
     int-to-long v0, v0
 
-    iput-wide v0, p0, Lrx/internal/util/a/h;->bPN:J
+    iput-wide v0, p0, Lrx/internal/util/a/h;->bQi:J
 
     const-wide/16 v0, 0x0
 
@@ -376,7 +376,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object v1, p0, Lrx/internal/util/a/h;->bPS:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lrx/internal/util/a/h;->bQn:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v0, p0, Lrx/internal/util/a/h;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -384,13 +384,13 @@
 
     move-result-wide v3
 
-    iget v0, p0, Lrx/internal/util/a/h;->bPR:I
+    iget v0, p0, Lrx/internal/util/a/h;->bQm:I
 
     long-to-int v2, v3
 
     and-int v5, v2, v0
 
-    iget-wide v6, p0, Lrx/internal/util/a/h;->bPN:J
+    iget-wide v6, p0, Lrx/internal/util/a/h;->bQi:J
 
     cmp-long v2, v3, v6
 
@@ -407,7 +407,7 @@
     return p1
 
     :cond_0
-    iget v2, p0, Lrx/internal/util/a/h;->bPQ:I
+    iget v2, p0, Lrx/internal/util/a/h;->bQl:I
 
     int-to-long v6, v2
 
@@ -427,7 +427,7 @@
 
     sub-long/2addr v6, v8
 
-    iput-wide v6, p0, Lrx/internal/util/a/h;->bPN:J
+    iput-wide v6, p0, Lrx/internal/util/a/h;->bQi:J
 
     move-object v0, p0
 
@@ -473,13 +473,13 @@
 
     invoke-direct {v2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v2, p0, Lrx/internal/util/a/h;->bPS:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v2, p0, Lrx/internal/util/a/h;->bQn:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     add-long/2addr v3, v10
 
     sub-long/2addr v3, v8
 
-    iput-wide v3, p0, Lrx/internal/util/a/h;->bPN:J
+    iput-wide v3, p0, Lrx/internal/util/a/h;->bQi:J
 
     invoke-direct {p0, v6, v7}, Lrx/internal/util/a/h;->be(J)V
 
@@ -495,7 +495,7 @@
 
     invoke-virtual {v1, p1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
 
-    sget-object p1, Lrx/internal/util/a/h;->bPV:Ljava/lang/Object;
+    sget-object p1, Lrx/internal/util/a/h;->bQq:Ljava/lang/Object;
 
     invoke-virtual {v1, v5, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
 
@@ -517,7 +517,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/h;->bPU:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/h;->bQp:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v1, p0, Lrx/internal/util/a/h;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -525,7 +525,7 @@
 
     move-result-wide v1
 
-    iget v3, p0, Lrx/internal/util/a/h;->bPT:I
+    iget v3, p0, Lrx/internal/util/a/h;->bQo:I
 
     long-to-int v2, v1
 
@@ -535,7 +535,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lrx/internal/util/a/h;->bPV:Ljava/lang/Object;
+    sget-object v3, Lrx/internal/util/a/h;->bQq:Ljava/lang/Object;
 
     if-ne v2, v3, :cond_0
 
@@ -543,7 +543,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/a/h;->bPU:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/h;->bQp:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
@@ -563,7 +563,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/h;->bPU:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/h;->bQp:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v1, p0, Lrx/internal/util/a/h;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -571,7 +571,7 @@
 
     move-result-wide v1
 
-    iget v3, p0, Lrx/internal/util/a/h;->bPT:I
+    iget v3, p0, Lrx/internal/util/a/h;->bQo:I
 
     long-to-int v4, v1
 
@@ -581,7 +581,7 @@
 
     move-result-object v4
 
-    sget-object v5, Lrx/internal/util/a/h;->bPV:Ljava/lang/Object;
+    sget-object v5, Lrx/internal/util/a/h;->bQq:Ljava/lang/Object;
 
     if-ne v4, v5, :cond_0
 
@@ -616,7 +616,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/a/h;->bPU:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/h;->bQp:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b.smali b/com.discord/smali_classes2/rx/internal/util/b.smali
index 305410bf80..266048b303 100644
--- a/com.discord/smali_classes2/rx/internal/util/b.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b.smali
@@ -16,16 +16,7 @@
 
 
 # instance fields
-.field final bPe:Lrx/functions/Action1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Action1<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field final bPf:Lrx/functions/Action1;
+.field final bPA:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -35,7 +26,16 @@
     .end annotation
 .end field
 
-.field final bPg:Lrx/functions/Action0;
+.field final bPB:Lrx/functions/Action0;
+
+.field final bPz:Lrx/functions/Action1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Action1<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
@@ -56,11 +56,11 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/util/b;->bPe:Lrx/functions/Action1;
+    iput-object p1, p0, Lrx/internal/util/b;->bPz:Lrx/functions/Action1;
 
-    iput-object p2, p0, Lrx/internal/util/b;->bPf:Lrx/functions/Action1;
+    iput-object p2, p0, Lrx/internal/util/b;->bPA:Lrx/functions/Action1;
 
-    iput-object p3, p0, Lrx/internal/util/b;->bPg:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/util/b;->bPB:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/util/b;->bPg:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/util/b;->bPB:Lrx/functions/Action0;
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
@@ -80,7 +80,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/util/b;->bPf:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/b;->bPA:Lrx/functions/Action1;
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/b;->bPe:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/b;->bPz:Lrx/functions/Action1;
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/a.smali b/com.discord/smali_classes2/rx/internal/util/b/a.smali
index aadbb5caf1..68f7767a49 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/a.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/a.smali
@@ -29,11 +29,11 @@
 .method public final isEmpty()Z
     .locals 2
 
-    invoke-virtual {p0}, Lrx/internal/util/b/a;->Lh()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->KV()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lrx/internal/util/b/a;->Lg()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->KU()Lrx/internal/util/a/c;
 
     move-result-object v1
 
@@ -69,11 +69,11 @@
 .method public final size()I
     .locals 4
 
-    invoke-virtual {p0}, Lrx/internal/util/b/a;->Lh()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->KV()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lrx/internal/util/b/a;->Lg()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->KU()Lrx/internal/util/a/c;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/ac.smali b/com.discord/smali_classes2/rx/internal/util/b/ac.smali
index a0aaac771b..a05a0596d6 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/ac.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/ac.smali
@@ -16,13 +16,9 @@
 
 
 # instance fields
-.field protected bPN:J
+.field protected bQD:J
 
-.field protected bPQ:I
-
-.field protected bQi:J
-
-.field protected bQj:[Ljava/lang/Object;
+.field protected bQE:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TE;"
@@ -30,6 +26,10 @@
     .end annotation
 .end field
 
+.field protected bQi:J
+
+.field protected bQl:I
+
 
 # direct methods
 .method constructor <init>()V
diff --git a/com.discord/smali_classes2/rx/internal/util/b/ae.smali b/com.discord/smali_classes2/rx/internal/util/b/ae.smali
index 256df3393f..b14aa8ac27 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/ae.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/ae.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field public static final bQk:Lsun/misc/Unsafe;
+.field public static final bQF:Lsun/misc/Unsafe;
 
-.field private static final bQl:Z
+.field private static final bQG:Z
 
 
 # direct methods
@@ -31,7 +31,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lrx/internal/util/b/ae;->bQl:Z
+    sput-boolean v0, Lrx/internal/util/b/ae;->bQG:Z
 
     const/4 v0, 0x0
 
@@ -57,19 +57,19 @@
     move-object v0, v1
 
     :catchall_0
-    sput-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sput-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     return-void
 .end method
 
-.method public static Lm()Z
+.method public static La()Z
     .locals 1
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     if-eqz v0, :cond_0
 
-    sget-boolean v0, Lrx/internal/util/b/ae;->bQl:Z
+    sget-boolean v0, Lrx/internal/util/b/ae;->bQG:Z
 
     if-nez v0, :cond_0
 
@@ -100,7 +100,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object p1, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     invoke-virtual {p1, p0}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/b.smali b/com.discord/smali_classes2/rx/internal/util/b/b.smali
index cf4ee11b7f..f74a940972 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/b.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/b.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field protected static final bPW:J
+.field protected static final bQr:J
 
 
 # instance fields
@@ -42,7 +42,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/b;->bPW:J
+    sput-wide v0, Lrx/internal/util/b/b;->bQr:J
 
     return-void
 .end method
@@ -57,7 +57,7 @@
 
 
 # virtual methods
-.method protected final Lh()Lrx/internal/util/a/c;
+.method protected final KV()Lrx/internal/util/a/c;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -67,9 +67,9 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/b;->bPW:J
+    sget-wide v1, Lrx/internal/util/b/b;->bQr:J
 
     invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getObjectVolatile(Ljava/lang/Object;J)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/e.smali b/com.discord/smali_classes2/rx/internal/util/b/e.smali
index 0edb1b80fa..b0cd929310 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/e.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/e.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field protected static final bPX:J
+.field protected static final bQs:J
 
 
 # instance fields
@@ -42,7 +42,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/e;->bPX:J
+    sput-wide v0, Lrx/internal/util/b/e;->bQs:J
 
     return-void
 .end method
@@ -57,7 +57,7 @@
 
 
 # virtual methods
-.method protected final Lg()Lrx/internal/util/a/c;
+.method protected final KU()Lrx/internal/util/a/c;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -67,9 +67,9 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/e;->bPX:J
+    sget-wide v1, Lrx/internal/util/b/e;->bQs:J
 
     invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getObjectVolatile(Ljava/lang/Object;J)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/f.smali b/com.discord/smali_classes2/rx/internal/util/b/f.smali
index e7be8e9eb7..9c3f429d88 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/f.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/f.smali
@@ -16,17 +16,17 @@
 
 
 # static fields
-.field protected static final bPY:I
+.field protected static final bQt:I
 
-.field private static final bPZ:J
+.field private static final bQu:J
 
-.field private static final bQa:I
+.field private static final bQv:I
 
 
 # instance fields
-.field protected final bQb:J
+.field protected final bQw:J
 
-.field protected final bQc:[Ljava/lang/Object;
+.field protected final bQx:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TE;"
@@ -51,9 +51,9 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/b/f;->bPY:I
+    sput v0, Lrx/internal/util/b/f;->bQt:I
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     const-class v1, [Ljava/lang/Object;
 
@@ -65,11 +65,11 @@
 
     if-ne v1, v0, :cond_0
 
-    sget v0, Lrx/internal/util/b/f;->bPY:I
+    sget v0, Lrx/internal/util/b/f;->bQt:I
 
     add-int/lit8 v0, v0, 0x2
 
-    sput v0, Lrx/internal/util/b/f;->bQa:I
+    sput v0, Lrx/internal/util/b/f;->bQv:I
 
     goto :goto_0
 
@@ -78,14 +78,14 @@
 
     if-ne v1, v0, :cond_1
 
-    sget v0, Lrx/internal/util/b/f;->bPY:I
+    sget v0, Lrx/internal/util/b/f;->bQt:I
 
     add-int/lit8 v0, v0, 0x3
 
-    sput v0, Lrx/internal/util/b/f;->bQa:I
+    sput v0, Lrx/internal/util/b/f;->bQv:I
 
     :goto_0
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     const-class v1, [Ljava/lang/Object;
 
@@ -95,9 +95,9 @@
 
     const/16 v1, 0x20
 
-    sget v2, Lrx/internal/util/b/f;->bQa:I
+    sget v2, Lrx/internal/util/b/f;->bQv:I
 
-    sget v3, Lrx/internal/util/b/f;->bPY:I
+    sget v3, Lrx/internal/util/b/f;->bQt:I
 
     sub-int/2addr v2, v3
 
@@ -107,7 +107,7 @@
 
     int-to-long v0, v0
 
-    sput-wide v0, Lrx/internal/util/b/f;->bPZ:J
+    sput-wide v0, Lrx/internal/util/b/f;->bQu:J
 
     return-void
 
@@ -126,7 +126,7 @@
 
     invoke-direct {p0}, Lrx/internal/util/b/g;-><init>()V
 
-    invoke-static {p1}, Lrx/internal/util/b/h;->eq(I)I
+    invoke-static {p1}, Lrx/internal/util/b/h;->em(I)I
 
     move-result p1
 
@@ -134,9 +134,9 @@
 
     int-to-long v0, v0
 
-    iput-wide v0, p0, Lrx/internal/util/b/f;->bQb:J
+    iput-wide v0, p0, Lrx/internal/util/b/f;->bQw:J
 
-    sget v0, Lrx/internal/util/b/f;->bPY:I
+    sget v0, Lrx/internal/util/b/f;->bQt:I
 
     shl-int/2addr p1, v0
 
@@ -146,7 +146,7 @@
 
     check-cast p1, [Ljava/lang/Object;
 
-    iput-object p1, p0, Lrx/internal/util/b/f;->bQc:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/util/b/f;->bQx:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -159,7 +159,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0, p1, p2}, Lsun/misc/Unsafe;->getObjectVolatile(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -176,7 +176,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0, p1, p2, p3}, Lsun/misc/Unsafe;->putOrderedObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -188,13 +188,13 @@
 .method protected final bg(J)J
     .locals 4
 
-    iget-wide v0, p0, Lrx/internal/util/b/f;->bQb:J
+    iget-wide v0, p0, Lrx/internal/util/b/f;->bQw:J
 
-    sget-wide v2, Lrx/internal/util/b/f;->bPZ:J
+    sget-wide v2, Lrx/internal/util/b/f;->bQu:J
 
     and-long/2addr p1, v0
 
-    sget v0, Lrx/internal/util/b/f;->bQa:I
+    sget v0, Lrx/internal/util/b/f;->bQv:I
 
     shl-long/2addr p1, v0
 
@@ -211,7 +211,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/b/f;->bQc:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/f;->bQx:[Ljava/lang/Object;
 
     invoke-static {v0, p1, p2}, Lrx/internal/util/b/f;->a([Ljava/lang/Object;J)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/h.smali b/com.discord/smali_classes2/rx/internal/util/b/h.smali
index b0198c78b8..56793f8105 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/h.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/h.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static eq(I)I
+.method public static em(I)I
     .locals 1
 
     const/4 v0, 0x1
diff --git a/com.discord/smali_classes2/rx/internal/util/b/i.smali b/com.discord/smali_classes2/rx/internal/util/b/i.smali
index 5c8415e123..c481809580 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/i.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/i.smali
@@ -57,9 +57,9 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lrx/internal/util/b/i;->bQc:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/i;->bQx:[Ljava/lang/Object;
 
-    iget-wide v1, p0, Lrx/internal/util/b/i;->bQb:J
+    iget-wide v1, p0, Lrx/internal/util/b/i;->bQw:J
 
     iget-wide v3, p0, Lrx/internal/util/b/o;->producerIndex:J
 
@@ -93,7 +93,7 @@
     if-nez v1, :cond_0
 
     :cond_1
-    sget-object v1, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v1, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     invoke-virtual {v1, v0, v5, v6, p1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -131,7 +131,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lrx/internal/util/b/p;->bQf:J
+    iget-wide v0, p0, Lrx/internal/util/b/p;->bQA:J
 
     :cond_0
     iget-wide v2, p0, Lrx/internal/util/b/j;->consumerIndex:J
@@ -151,7 +151,7 @@
     return-object v0
 
     :cond_1
-    iput-wide v4, p0, Lrx/internal/util/b/p;->bQf:J
+    iput-wide v4, p0, Lrx/internal/util/b/p;->bQA:J
 
     :cond_2
     invoke-virtual {p0, v2, v3}, Lrx/internal/util/b/i;->bg(J)J
@@ -175,7 +175,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lrx/internal/util/b/p;->bQf:J
+    iget-wide v0, p0, Lrx/internal/util/b/p;->bQA:J
 
     :cond_0
     iget-wide v2, p0, Lrx/internal/util/b/j;->consumerIndex:J
@@ -195,7 +195,7 @@
     return-object v4
 
     :cond_1
-    iput-wide v5, p0, Lrx/internal/util/b/p;->bQf:J
+    iput-wide v5, p0, Lrx/internal/util/b/p;->bQA:J
 
     :cond_2
     const-wide/16 v5, 0x1
@@ -212,9 +212,9 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lrx/internal/util/b/i;->bQc:[Ljava/lang/Object;
+    iget-object v2, p0, Lrx/internal/util/b/i;->bQx:[Ljava/lang/Object;
 
-    sget-object v3, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v3, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     invoke-virtual {v3, v2, v0, v1}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/j.smali b/com.discord/smali_classes2/rx/internal/util/b/j.smali
index a68270ef83..c86d578ea8 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/j.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/j.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field protected static final bQd:J
+.field protected static final bQy:J
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/j;->bQd:J
+    sput-wide v0, Lrx/internal/util/b/j;->bQy:J
 
     return-void
 .end method
@@ -53,9 +53,9 @@
 .method protected final j(JJ)Z
     .locals 8
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/j;->bQd:J
+    sget-wide v2, Lrx/internal/util/b/j;->bQy:J
 
     move-object v1, p0
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/o.smali b/com.discord/smali_classes2/rx/internal/util/b/o.smali
index 5e81b14c89..dbbcc63a6f 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/o.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/o.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field protected static final bQe:J
+.field protected static final bQz:J
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/o;->bQe:J
+    sput-wide v0, Lrx/internal/util/b/o;->bQz:J
 
     return-void
 .end method
@@ -53,9 +53,9 @@
 .method protected final bi(J)V
     .locals 6
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/o;->bQe:J
+    sget-wide v2, Lrx/internal/util/b/o;->bQz:J
 
     move-object v1, p0
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/p.smali b/com.discord/smali_classes2/rx/internal/util/b/p.smali
index 27d1e35dcb..281992e2f2 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/p.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/p.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field volatile bQf:J
+.field volatile bQA:J
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/rx/internal/util/b/q.smali b/com.discord/smali_classes2/rx/internal/util/b/q.smali
index eebb012ef9..1863666661 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/q.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/q.smali
@@ -24,12 +24,12 @@
     return-void
 .end method
 
-.method private Lk()J
+.method private KY()J
     .locals 3
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/q;->bQe:J
+    sget-wide v1, Lrx/internal/util/b/q;->bQz:J
 
     invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
 
@@ -38,12 +38,12 @@
     return-wide v0
 .end method
 
-.method private Ll()J
+.method private KZ()J
     .locals 3
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/q;->bQd:J
+    sget-wide v1, Lrx/internal/util/b/q;->bQy:J
 
     invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
 
@@ -57,11 +57,11 @@
 .method public final isEmpty()Z
     .locals 5
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->Lk()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->KY()J
 
     move-result-wide v0
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->Ll()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->KZ()J
 
     move-result-wide v2
 
@@ -89,7 +89,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/util/b/q;->bQc:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/q;->bQx:[Ljava/lang/Object;
 
     iget-wide v1, p0, Lrx/internal/util/b/q;->producerIndex:J
 
@@ -114,9 +114,9 @@
 
     add-long v9, v1, v3
 
-    sget-object v5, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v5, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
-    sget-wide v7, Lrx/internal/util/b/q;->bQe:J
+    sget-wide v7, Lrx/internal/util/b/q;->bQz:J
 
     move-object v6, p0
 
@@ -171,7 +171,7 @@
 
     move-result-wide v2
 
-    iget-object v4, p0, Lrx/internal/util/b/q;->bQc:[Ljava/lang/Object;
+    iget-object v4, p0, Lrx/internal/util/b/q;->bQx:[Ljava/lang/Object;
 
     invoke-static {v4, v2, v3}, Lrx/internal/util/b/q;->a([Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -190,9 +190,9 @@
 
     add-long v10, v0, v2
 
-    sget-object v6, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v6, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
-    sget-wide v8, Lrx/internal/util/b/q;->bQd:J
+    sget-wide v8, Lrx/internal/util/b/q;->bQy:J
 
     move-object v7, p0
 
@@ -204,16 +204,16 @@
 .method public final size()I
     .locals 7
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->Ll()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->KZ()J
 
     move-result-wide v0
 
     :goto_0
-    invoke-direct {p0}, Lrx/internal/util/b/q;->Lk()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->KY()J
 
     move-result-wide v2
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->Ll()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->KZ()J
 
     move-result-wide v4
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/r.smali b/com.discord/smali_classes2/rx/internal/util/b/r.smali
index 5aefef4914..1019e69381 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/r.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/r.smali
@@ -16,11 +16,11 @@
 
 
 # static fields
-.field private static final bPM:Ljava/lang/Integer;
+.field private static final bQh:Ljava/lang/Integer;
 
 
 # instance fields
-.field protected final bPO:I
+.field protected final bQj:I
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lrx/internal/util/b/r;->bPM:Ljava/lang/Integer;
+    sput-object v0, Lrx/internal/util/b/r;->bQh:Ljava/lang/Integer;
 
     return-void
 .end method
@@ -47,7 +47,7 @@
 
     div-int/lit8 p1, p1, 0x4
 
-    sget-object v0, Lrx/internal/util/b/r;->bPM:Ljava/lang/Integer;
+    sget-object v0, Lrx/internal/util/b/r;->bQh:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -57,7 +57,7 @@
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/b/r;->bPO:I
+    iput p1, p0, Lrx/internal/util/b/r;->bQj:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/util/b/s.smali b/com.discord/smali_classes2/rx/internal/util/b/s.smali
index 7389a2b637..f088fdfc09 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/s.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/s.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field protected static final bQd:J
+.field protected static final bQy:J
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/s;->bQd:J
+    sput-wide v0, Lrx/internal/util/b/s;->bQy:J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/util/b/w.smali b/com.discord/smali_classes2/rx/internal/util/b/w.smali
index ed45e8cd22..05bdf2148e 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/w.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/w.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field protected static final bQe:J
+.field protected static final bQz:J
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/w;->bQe:J
+    sput-wide v0, Lrx/internal/util/b/w;->bQz:J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/util/b/x.smali b/com.discord/smali_classes2/rx/internal/util/b/x.smali
index 3e99ead5ee..867823843c 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/x.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/x.smali
@@ -122,7 +122,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lrx/internal/util/a/c;->Lj()Ljava/lang/Object;
+    invoke-virtual {v0}, Lrx/internal/util/a/c;->KX()Ljava/lang/Object;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/y.smali b/com.discord/smali_classes2/rx/internal/util/b/y.smali
index e5e9625ebb..dd2bf7ddd5 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/y.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/y.smali
@@ -16,17 +16,17 @@
 
 
 # static fields
-.field static final bPP:I
+.field static final bQk:I
 
-.field private static final bPV:Ljava/lang/Object;
+.field private static final bQq:Ljava/lang/Object;
 
-.field private static final bPZ:J
+.field private static final bQu:J
 
-.field private static final bQa:I
+.field private static final bQv:I
 
-.field private static final bQd:J
+.field private static final bQy:J
 
-.field private static final bQe:J
+.field private static final bQz:J
 
 
 # direct methods
@@ -45,15 +45,15 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/b/y;->bPP:I
+    sput v0, Lrx/internal/util/b/y;->bQk:I
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/util/b/y;->bPV:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/util/b/y;->bQq:Ljava/lang/Object;
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     const-class v1, [Ljava/lang/Object;
 
@@ -67,7 +67,7 @@
 
     const/4 v0, 0x2
 
-    sput v0, Lrx/internal/util/b/y;->bQa:I
+    sput v0, Lrx/internal/util/b/y;->bQv:I
 
     goto :goto_0
 
@@ -78,10 +78,10 @@
 
     const/4 v0, 0x3
 
-    sput v0, Lrx/internal/util/b/y;->bQa:I
+    sput v0, Lrx/internal/util/b/y;->bQv:I
 
     :goto_0
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     const-class v1, [Ljava/lang/Object;
 
@@ -91,7 +91,7 @@
 
     int-to-long v0, v0
 
-    sput-wide v0, Lrx/internal/util/b/y;->bPZ:J
+    sput-wide v0, Lrx/internal/util/b/y;->bQu:J
 
     :try_start_0
     const-class v0, Lrx/internal/util/b/ad;
@@ -102,13 +102,13 @@
 
     move-result-object v0
 
-    sget-object v1, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v1, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/y;->bQe:J
+    sput-wide v0, Lrx/internal/util/b/y;->bQz:J
     :try_end_0
     .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_1
 
@@ -121,13 +121,13 @@
 
     move-result-object v0
 
-    sget-object v1, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v1, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/y;->bQd:J
+    sput-wide v0, Lrx/internal/util/b/y;->bQy:J
     :try_end_1
     .catch Ljava/lang/NoSuchFieldException; {:try_start_1 .. :try_end_1} :catch_0
 
@@ -170,7 +170,7 @@
 
     invoke-direct {p0}, Lrx/internal/util/b/aa;-><init>()V
 
-    invoke-static {p1}, Lrx/internal/util/b/h;->eq(I)I
+    invoke-static {p1}, Lrx/internal/util/b/h;->em(I)I
 
     move-result p1
 
@@ -184,29 +184,29 @@
 
     check-cast v2, [Ljava/lang/Object;
 
-    iput-object v2, p0, Lrx/internal/util/b/y;->bQj:[Ljava/lang/Object;
+    iput-object v2, p0, Lrx/internal/util/b/y;->bQE:[Ljava/lang/Object;
 
-    iput-wide v0, p0, Lrx/internal/util/b/y;->bQi:J
+    iput-wide v0, p0, Lrx/internal/util/b/y;->bQD:J
 
     div-int/lit8 p1, p1, 0x4
 
-    sget v3, Lrx/internal/util/b/y;->bPP:I
+    sget v3, Lrx/internal/util/b/y;->bQk:I
 
     invoke-static {p1, v3}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/b/y;->bPQ:I
+    iput p1, p0, Lrx/internal/util/b/y;->bQl:I
 
-    iput-object v2, p0, Lrx/internal/util/b/y;->bQh:[Ljava/lang/Object;
+    iput-object v2, p0, Lrx/internal/util/b/y;->bQC:[Ljava/lang/Object;
 
-    iput-wide v0, p0, Lrx/internal/util/b/y;->bQg:J
+    iput-wide v0, p0, Lrx/internal/util/b/y;->bQB:J
 
     const-wide/16 v2, 0x1
 
     sub-long/2addr v0, v2
 
-    iput-wide v0, p0, Lrx/internal/util/b/y;->bPN:J
+    iput-wide v0, p0, Lrx/internal/util/b/y;->bQi:J
 
     const-wide/16 v0, 0x0
 
@@ -215,12 +215,12 @@
     return-void
 .end method
 
-.method private Ll()J
+.method private KZ()J
     .locals 3
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/y;->bQd:J
+    sget-wide v1, Lrx/internal/util/b/y;->bQy:J
 
     invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
 
@@ -240,7 +240,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0, p1, p2}, Lsun/misc/Unsafe;->getObjectVolatile(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -252,7 +252,7 @@
 .method private static a([Ljava/lang/Object;JLjava/lang/Object;)V
     .locals 1
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0, p1, p2, p3}, Lsun/misc/Unsafe;->putOrderedObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -283,9 +283,9 @@
 .method private be(J)V
     .locals 6
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/y;->bQe:J
+    sget-wide v2, Lrx/internal/util/b/y;->bQz:J
 
     move-object v1, p0
 
@@ -299,9 +299,9 @@
 .method private bf(J)V
     .locals 6
 
-    sget-object v0, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/y;->bQd:J
+    sget-wide v2, Lrx/internal/util/b/y;->bQy:J
 
     move-object v1, p0
 
@@ -315,9 +315,9 @@
 .method private static bj(J)J
     .locals 3
 
-    sget-wide v0, Lrx/internal/util/b/y;->bPZ:J
+    sget-wide v0, Lrx/internal/util/b/y;->bQu:J
 
-    sget v2, Lrx/internal/util/b/y;->bQa:I
+    sget v2, Lrx/internal/util/b/y;->bQv:I
 
     shl-long/2addr p0, v2
 
@@ -326,7 +326,7 @@
     return-wide v0
 .end method
 
-.method private static v([Ljava/lang/Object;)[Ljava/lang/Object;
+.method private static u([Ljava/lang/Object;)[Ljava/lang/Object;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -388,11 +388,11 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v1, v7, Lrx/internal/util/b/y;->bQj:[Ljava/lang/Object;
+    iget-object v1, v7, Lrx/internal/util/b/y;->bQE:[Ljava/lang/Object;
 
     iget-wide v3, v7, Lrx/internal/util/b/y;->producerIndex:J
 
-    iget-wide v5, v7, Lrx/internal/util/b/y;->bQi:J
+    iget-wide v5, v7, Lrx/internal/util/b/y;->bQD:J
 
     and-long v8, v3, v5
 
@@ -400,7 +400,7 @@
 
     move-result-wide v8
 
-    iget-wide v10, v7, Lrx/internal/util/b/y;->bPN:J
+    iget-wide v10, v7, Lrx/internal/util/b/y;->bQi:J
 
     cmp-long v0, v3, v10
 
@@ -419,7 +419,7 @@
     return v0
 
     :cond_0
-    iget v0, v7, Lrx/internal/util/b/y;->bPQ:I
+    iget v0, v7, Lrx/internal/util/b/y;->bQl:I
 
     int-to-long v10, v0
 
@@ -441,7 +441,7 @@
 
     sub-long/2addr v10, v12
 
-    iput-wide v10, v7, Lrx/internal/util/b/y;->bPN:J
+    iput-wide v10, v7, Lrx/internal/util/b/y;->bQi:J
 
     move-object/from16 v0, p0
 
@@ -489,13 +489,13 @@
 
     check-cast v0, [Ljava/lang/Object;
 
-    iput-object v0, v7, Lrx/internal/util/b/y;->bQj:[Ljava/lang/Object;
+    iput-object v0, v7, Lrx/internal/util/b/y;->bQE:[Ljava/lang/Object;
 
     add-long/2addr v3, v5
 
     sub-long/2addr v3, v12
 
-    iput-wide v3, v7, Lrx/internal/util/b/y;->bPN:J
+    iput-wide v3, v7, Lrx/internal/util/b/y;->bQi:J
 
     invoke-static {v0, v8, v9, v2}, Lrx/internal/util/b/y;->a([Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -513,7 +513,7 @@
 
     invoke-static {v1, v4, v5, v0}, Lrx/internal/util/b/y;->a([Ljava/lang/Object;JLjava/lang/Object;)V
 
-    sget-object v0, Lrx/internal/util/b/y;->bPV:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/util/b/y;->bQq:Ljava/lang/Object;
 
     invoke-static {v1, v8, v9, v0}, Lrx/internal/util/b/y;->a([Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -539,11 +539,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/b/y;->bQh:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/y;->bQC:[Ljava/lang/Object;
 
     iget-wide v1, p0, Lrx/internal/util/b/y;->consumerIndex:J
 
-    iget-wide v3, p0, Lrx/internal/util/b/y;->bQg:J
+    iget-wide v3, p0, Lrx/internal/util/b/y;->bQB:J
 
     and-long/2addr v1, v3
 
@@ -555,15 +555,15 @@
 
     move-result-object v3
 
-    sget-object v4, Lrx/internal/util/b/y;->bPV:Ljava/lang/Object;
+    sget-object v4, Lrx/internal/util/b/y;->bQq:Ljava/lang/Object;
 
     if-ne v3, v4, :cond_0
 
-    invoke-static {v0}, Lrx/internal/util/b/y;->v([Ljava/lang/Object;)[Ljava/lang/Object;
+    invoke-static {v0}, Lrx/internal/util/b/y;->u([Ljava/lang/Object;)[Ljava/lang/Object;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/b/y;->bQh:[Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/util/b/y;->bQC:[Ljava/lang/Object;
 
     invoke-static {v1, v2}, Lrx/internal/util/b/y;->bj(J)J
 
@@ -587,11 +587,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/b/y;->bQh:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/y;->bQC:[Ljava/lang/Object;
 
     iget-wide v1, p0, Lrx/internal/util/b/y;->consumerIndex:J
 
-    iget-wide v3, p0, Lrx/internal/util/b/y;->bQg:J
+    iget-wide v3, p0, Lrx/internal/util/b/y;->bQB:J
 
     and-long/2addr v3, v1
 
@@ -603,7 +603,7 @@
 
     move-result-object v7
 
-    sget-object v8, Lrx/internal/util/b/y;->bPV:Ljava/lang/Object;
+    sget-object v8, Lrx/internal/util/b/y;->bQq:Ljava/lang/Object;
 
     if-ne v7, v8, :cond_0
 
@@ -634,11 +634,11 @@
     :cond_1
     if-eqz v8, :cond_3
 
-    invoke-static {v0}, Lrx/internal/util/b/y;->v([Ljava/lang/Object;)[Ljava/lang/Object;
+    invoke-static {v0}, Lrx/internal/util/b/y;->u([Ljava/lang/Object;)[Ljava/lang/Object;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/b/y;->bQh:[Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/util/b/y;->bQC:[Ljava/lang/Object;
 
     invoke-static {v3, v4}, Lrx/internal/util/b/y;->bj(J)J
 
@@ -668,20 +668,20 @@
 .method public final size()I
     .locals 7
 
-    invoke-direct {p0}, Lrx/internal/util/b/y;->Ll()J
+    invoke-direct {p0}, Lrx/internal/util/b/y;->KZ()J
 
     move-result-wide v0
 
     :goto_0
-    sget-object v2, Lrx/internal/util/b/ae;->bQk:Lsun/misc/Unsafe;
+    sget-object v2, Lrx/internal/util/b/ae;->bQF:Lsun/misc/Unsafe;
 
-    sget-wide v3, Lrx/internal/util/b/y;->bQe:J
+    sget-wide v3, Lrx/internal/util/b/y;->bQz:J
 
     invoke-virtual {v2, p0, v3, v4}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
 
     move-result-wide v2
 
-    invoke-direct {p0}, Lrx/internal/util/b/y;->Ll()J
+    invoke-direct {p0}, Lrx/internal/util/b/y;->KZ()J
 
     move-result-wide v4
 
diff --git a/com.discord/smali_classes2/rx/internal/util/b/z.smali b/com.discord/smali_classes2/rx/internal/util/b/z.smali
index 6c10528ade..c2c7dd1114 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/z.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/z.smali
@@ -16,9 +16,9 @@
 
 
 # instance fields
-.field protected bQg:J
+.field protected bQB:J
 
-.field protected bQh:[Ljava/lang/Object;
+.field protected bQC:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TE;"
diff --git a/com.discord/smali_classes2/rx/internal/util/e.smali b/com.discord/smali_classes2/rx/internal/util/e.smali
index ee91357804..874d8955d0 100644
--- a/com.discord/smali_classes2/rx/internal/util/e.smali
+++ b/com.discord/smali_classes2/rx/internal/util/e.smali
@@ -14,9 +14,9 @@
 
 
 # static fields
-.field private static final bPh:Ljava/lang/Throwable;
+.field private static final bPC:Ljava/lang/Throwable;
 
-.field private static final synthetic bPi:[Lrx/internal/util/e;
+.field private static final synthetic bPD:[Lrx/internal/util/e;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     new-array v0, v0, [Lrx/internal/util/e;
 
-    sput-object v0, Lrx/internal/util/e;->bPi:[Lrx/internal/util/e;
+    sput-object v0, Lrx/internal/util/e;->bPD:[Lrx/internal/util/e;
 
     new-instance v0, Ljava/lang/Throwable;
 
@@ -35,7 +35,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/Throwable;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/util/e;->bPh:Ljava/lang/Throwable;
+    sput-object v0, Lrx/internal/util/e;->bPC:Ljava/lang/Throwable;
 
     return-void
 .end method
@@ -43,7 +43,7 @@
 .method public static S(Ljava/lang/Throwable;)Z
     .locals 1
 
-    sget-object v0, Lrx/internal/util/e;->bPh:Ljava/lang/Throwable;
+    sget-object v0, Lrx/internal/util/e;->bPC:Ljava/lang/Throwable;
 
     if-ne p0, v0, :cond_0
 
@@ -77,7 +77,7 @@
 
     check-cast v0, Ljava/lang/Throwable;
 
-    sget-object v1, Lrx/internal/util/e;->bPh:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/util/e;->bPC:Ljava/lang/Throwable;
 
     const/4 v2, 0x0
 
@@ -160,7 +160,7 @@
 
     check-cast v0, Ljava/lang/Throwable;
 
-    sget-object v1, Lrx/internal/util/e;->bPh:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/util/e;->bPC:Ljava/lang/Throwable;
 
     if-eq v0, v1, :cond_0
 
@@ -193,7 +193,7 @@
 .method public static values()[Lrx/internal/util/e;
     .locals 1
 
-    sget-object v0, Lrx/internal/util/e;->bPi:[Lrx/internal/util/e;
+    sget-object v0, Lrx/internal/util/e;->bPD:[Lrx/internal/util/e;
 
     invoke-virtual {v0}, [Lrx/internal/util/e;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/f$f.smali b/com.discord/smali_classes2/rx/internal/util/f$f.smali
index 589b0fc528..85532b419f 100644
--- a/com.discord/smali_classes2/rx/internal/util/f$f.smali
+++ b/com.discord/smali_classes2/rx/internal/util/f$f.smali
@@ -31,7 +31,7 @@
 
 
 # instance fields
-.field final bPs:Lrx/functions/b;
+.field final bPN:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -66,7 +66,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/util/f$f;->bPs:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/util/f$f;->bPN:Lrx/functions/b;
 
     return-void
 .end method
@@ -78,9 +78,9 @@
 
     check-cast p1, Lrx/Observable;
 
-    iget-object v0, p0, Lrx/internal/util/f$f;->bPs:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/util/f$f;->bPN:Lrx/functions/b;
 
-    sget-object v1, Lrx/internal/util/f;->bPm:Lrx/internal/util/f$h;
+    sget-object v1, Lrx/internal/util/f;->bPH:Lrx/internal/util/f$h;
 
     invoke-virtual {p1, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/f$g.smali b/com.discord/smali_classes2/rx/internal/util/f$g.smali
index 867b51f021..48b4c665f8 100644
--- a/com.discord/smali_classes2/rx/internal/util/f$g.smali
+++ b/com.discord/smali_classes2/rx/internal/util/f$g.smali
@@ -31,7 +31,7 @@
 
 
 # instance fields
-.field final bPs:Lrx/functions/b;
+.field final bPN:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -66,7 +66,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/util/f$g;->bPs:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/util/f$g;->bPN:Lrx/functions/b;
 
     return-void
 .end method
@@ -78,9 +78,9 @@
 
     check-cast p1, Lrx/Observable;
 
-    iget-object v0, p0, Lrx/internal/util/f$g;->bPs:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/util/f$g;->bPN:Lrx/functions/b;
 
-    sget-object v1, Lrx/internal/util/f;->bPo:Lrx/internal/util/f$b;
+    sget-object v1, Lrx/internal/util/f;->bPJ:Lrx/internal/util/f$b;
 
     invoke-virtual {p1, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/f.smali b/com.discord/smali_classes2/rx/internal/util/f.smali
index 83d86ca577..4dc0f35fb4 100644
--- a/com.discord/smali_classes2/rx/internal/util/f.smali
+++ b/com.discord/smali_classes2/rx/internal/util/f.smali
@@ -28,19 +28,19 @@
 
 
 # static fields
-.field public static final bPj:Lrx/internal/util/f$e;
+.field public static final bPE:Lrx/internal/util/f$e;
 
-.field public static final bPk:Lrx/internal/util/f$c;
+.field public static final bPF:Lrx/internal/util/f$c;
 
-.field public static final bPl:Lrx/internal/util/f$i;
+.field public static final bPG:Lrx/internal/util/f$i;
 
-.field static final bPm:Lrx/internal/util/f$h;
+.field static final bPH:Lrx/internal/util/f$h;
 
-.field public static final bPn:Lrx/internal/util/f$d;
+.field public static final bPI:Lrx/internal/util/f$d;
 
-.field static final bPo:Lrx/internal/util/f$b;
+.field static final bPJ:Lrx/internal/util/f$b;
 
-.field public static final bPp:Lrx/functions/Action1;
+.field public static final bPK:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -50,7 +50,7 @@
     .end annotation
 .end field
 
-.field public static final bPq:Lrx/Observable$b;
+.field public static final bPL:Lrx/Observable$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$b<",
@@ -61,7 +61,7 @@
     .end annotation
 .end field
 
-.field private static final synthetic bPr:[Lrx/internal/util/f;
+.field private static final synthetic bPM:[Lrx/internal/util/f;
 
 
 # direct methods
@@ -72,57 +72,57 @@
 
     new-array v0, v0, [Lrx/internal/util/f;
 
-    sput-object v0, Lrx/internal/util/f;->bPr:[Lrx/internal/util/f;
+    sput-object v0, Lrx/internal/util/f;->bPM:[Lrx/internal/util/f;
 
     new-instance v0, Lrx/internal/util/f$e;
 
     invoke-direct {v0}, Lrx/internal/util/f$e;-><init>()V
 
-    sput-object v0, Lrx/internal/util/f;->bPj:Lrx/internal/util/f$e;
+    sput-object v0, Lrx/internal/util/f;->bPE:Lrx/internal/util/f$e;
 
     new-instance v0, Lrx/internal/util/f$c;
 
     invoke-direct {v0}, Lrx/internal/util/f$c;-><init>()V
 
-    sput-object v0, Lrx/internal/util/f;->bPk:Lrx/internal/util/f$c;
+    sput-object v0, Lrx/internal/util/f;->bPF:Lrx/internal/util/f$c;
 
     new-instance v0, Lrx/internal/util/f$i;
 
     invoke-direct {v0}, Lrx/internal/util/f$i;-><init>()V
 
-    sput-object v0, Lrx/internal/util/f;->bPl:Lrx/internal/util/f$i;
+    sput-object v0, Lrx/internal/util/f;->bPG:Lrx/internal/util/f$i;
 
     new-instance v0, Lrx/internal/util/f$h;
 
     invoke-direct {v0}, Lrx/internal/util/f$h;-><init>()V
 
-    sput-object v0, Lrx/internal/util/f;->bPm:Lrx/internal/util/f$h;
+    sput-object v0, Lrx/internal/util/f;->bPH:Lrx/internal/util/f$h;
 
     new-instance v0, Lrx/internal/util/f$d;
 
     invoke-direct {v0}, Lrx/internal/util/f$d;-><init>()V
 
-    sput-object v0, Lrx/internal/util/f;->bPn:Lrx/internal/util/f$d;
+    sput-object v0, Lrx/internal/util/f;->bPI:Lrx/internal/util/f$d;
 
     new-instance v0, Lrx/internal/util/f$b;
 
     invoke-direct {v0}, Lrx/internal/util/f$b;-><init>()V
 
-    sput-object v0, Lrx/internal/util/f;->bPo:Lrx/internal/util/f$b;
+    sput-object v0, Lrx/internal/util/f;->bPJ:Lrx/internal/util/f$b;
 
     new-instance v0, Lrx/internal/util/f$a;
 
     invoke-direct {v0}, Lrx/internal/util/f$a;-><init>()V
 
-    sput-object v0, Lrx/internal/util/f;->bPp:Lrx/functions/Action1;
+    sput-object v0, Lrx/internal/util/f;->bPK:Lrx/functions/Action1;
 
     new-instance v0, Lrx/internal/a/aa;
 
-    sget-object v1, Lrx/internal/util/l$a;->bPG:Lrx/internal/util/l$a;
+    sget-object v1, Lrx/internal/util/l$a;->bQb:Lrx/internal/util/l$a;
 
     invoke-direct {v0, v1}, Lrx/internal/a/aa;-><init>(Lrx/functions/b;)V
 
-    sput-object v0, Lrx/internal/util/f;->bPq:Lrx/Observable$b;
+    sput-object v0, Lrx/internal/util/f;->bPL:Lrx/Observable$b;
 
     return-void
 .end method
@@ -204,7 +204,7 @@
 .method public static values()[Lrx/internal/util/f;
     .locals 1
 
-    sget-object v0, Lrx/internal/util/f;->bPr:[Lrx/internal/util/f;
+    sget-object v0, Lrx/internal/util/f;->bPM:[Lrx/internal/util/f;
 
     invoke-virtual {v0}, [Lrx/internal/util/f;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/g.smali b/com.discord/smali_classes2/rx/internal/util/g.smali
index 7b2d8c4042..af14ab5b0f 100644
--- a/com.discord/smali_classes2/rx/internal/util/g.smali
+++ b/com.discord/smali_classes2/rx/internal/util/g.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public bPt:[Ljava/lang/Object;
+.field public bPO:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TT;"
@@ -54,7 +54,7 @@
 
     const/16 v0, 0x10
 
-    invoke-static {v0}, Lrx/internal/util/b/h;->eq(I)I
+    invoke-static {v0}, Lrx/internal/util/b/h;->em(I)I
 
     move-result v0
 
@@ -74,12 +74,12 @@
 
     check-cast p1, [Ljava/lang/Object;
 
-    iput-object p1, p0, Lrx/internal/util/g;->bPt:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/util/g;->bPO:[Ljava/lang/Object;
 
     return-void
 .end method
 
-.method public static eo(I)I
+.method public static ek(I)I
     .locals 1
 
     const v0, -0x61c88647
@@ -132,7 +132,7 @@
 
     move-result v3
 
-    invoke-static {v3}, Lrx/internal/util/g;->eo(I)I
+    invoke-static {v3}, Lrx/internal/util/g;->ek(I)I
 
     move-result v3
 
diff --git a/com.discord/smali_classes2/rx/internal/util/h.smali b/com.discord/smali_classes2/rx/internal/util/h.smali
index ffe3191902..1c8a9d1769 100644
--- a/com.discord/smali_classes2/rx/internal/util/h.smali
+++ b/com.discord/smali_classes2/rx/internal/util/h.smali
@@ -6,18 +6,18 @@
 # static fields
 .field private static final IS_ANDROID:Z
 
-.field private static final bPu:I
+.field private static final bPP:I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lrx/internal/util/h;->Ld()I
+    invoke-static {}, Lrx/internal/util/h;->KR()I
 
     move-result v0
 
-    sput v0, Lrx/internal/util/h;->bPu:I
+    sput v0, Lrx/internal/util/h;->bPP:I
 
     if-eqz v0, :cond_0
 
@@ -34,7 +34,7 @@
     return-void
 .end method
 
-.method public static Lb()Z
+.method public static KP()Z
     .locals 1
 
     sget-boolean v0, Lrx/internal/util/h;->IS_ANDROID:Z
@@ -42,15 +42,15 @@
     return v0
 .end method
 
-.method public static Lc()I
+.method public static KQ()I
     .locals 1
 
-    sget v0, Lrx/internal/util/h;->bPu:I
+    sget v0, Lrx/internal/util/h;->bPP:I
 
     return v0
 .end method
 
-.method private static Ld()I
+.method private static KR()I
     .locals 2
 
     :try_start_0
diff --git a/com.discord/smali_classes2/rx/internal/util/i.smali b/com.discord/smali_classes2/rx/internal/util/i.smali
index 698e868949..03cdddad7f 100644
--- a/com.discord/smali_classes2/rx/internal/util/i.smali
+++ b/com.discord/smali_classes2/rx/internal/util/i.smali
@@ -11,7 +11,7 @@
 
 
 # instance fields
-.field public volatile bPv:Ljava/lang/Object;
+.field public volatile bPQ:Ljava/lang/Object;
 
 .field private queue:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
@@ -30,7 +30,7 @@
 .method static constructor <clinit>()V
     .locals 6
 
-    invoke-static {}, Lrx/internal/util/h;->Lb()Z
+    invoke-static {}, Lrx/internal/util/h;->KP()Z
 
     move-result v0
 
@@ -159,10 +159,10 @@
     return-void
 .end method
 
-.method public static Le()Lrx/internal/util/i;
+.method public static KS()Lrx/internal/util/i;
     .locals 3
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Lm()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->La()Z
 
     move-result v0
 
@@ -186,10 +186,10 @@
     return-object v0
 .end method
 
-.method public static Lf()Lrx/internal/util/i;
+.method public static KT()Lrx/internal/util/i;
     .locals 3
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Lm()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->La()Z
 
     move-result v0
 
@@ -374,7 +374,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lrx/internal/util/i;->bPv:Ljava/lang/Object;
+    iget-object v2, p0, Lrx/internal/util/i;->bPQ:Ljava/lang/Object;
 
     if-nez v1, :cond_1
 
@@ -424,7 +424,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lrx/internal/util/i;->bPv:Ljava/lang/Object;
+    iget-object v3, p0, Lrx/internal/util/i;->bPQ:Ljava/lang/Object;
 
     if-nez v2, :cond_1
 
@@ -436,7 +436,7 @@
 
     if-nez v0, :cond_1
 
-    iput-object v1, p0, Lrx/internal/util/i;->bPv:Ljava/lang/Object;
+    iput-object v1, p0, Lrx/internal/util/i;->bPQ:Ljava/lang/Object;
 
     move-object v2, v3
 
diff --git a/com.discord/smali_classes2/rx/internal/util/j.smali b/com.discord/smali_classes2/rx/internal/util/j.smali
index b6d2ecd801..462745bc28 100644
--- a/com.discord/smali_classes2/rx/internal/util/j.smali
+++ b/com.discord/smali_classes2/rx/internal/util/j.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field public static final bPw:Ljava/util/concurrent/ThreadFactory;
+.field public static final bPR:Ljava/util/concurrent/ThreadFactory;
 
 .field private static final serialVersionUID:J = -0x7ab1e491ecc1649fL
 
@@ -24,7 +24,7 @@
 
     invoke-direct {v0}, Lrx/internal/util/j$1;-><init>()V
 
-    sput-object v0, Lrx/internal/util/j;->bPw:Ljava/util/concurrent/ThreadFactory;
+    sput-object v0, Lrx/internal/util/j;->bPR:Ljava/util/concurrent/ThreadFactory;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/util/k$1.smali b/com.discord/smali_classes2/rx/internal/util/k$1.smali
index 34d23c8ddc..789f213e09 100644
--- a/com.discord/smali_classes2/rx/internal/util/k$1.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k$1.smali
@@ -28,18 +28,18 @@
 
 
 # instance fields
-.field final synthetic bPA:Lrx/internal/util/k;
+.field final synthetic bPU:Lrx/internal/c/b;
 
-.field final synthetic bPz:Lrx/internal/c/b;
+.field final synthetic bPV:Lrx/internal/util/k;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/util/k;Lrx/internal/c/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/util/k$1;->bPA:Lrx/internal/util/k;
+    iput-object p1, p0, Lrx/internal/util/k$1;->bPV:Lrx/internal/util/k;
 
-    iput-object p2, p0, Lrx/internal/util/k$1;->bPz:Lrx/internal/c/b;
+    iput-object p2, p0, Lrx/internal/util/k$1;->bPU:Lrx/internal/c/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,9 +53,9 @@
 
     check-cast p1, Lrx/functions/Action0;
 
-    iget-object v0, p0, Lrx/internal/util/k$1;->bPz:Lrx/internal/c/b;
+    iget-object v0, p0, Lrx/internal/util/k$1;->bPU:Lrx/internal/c/b;
 
-    iget-object v0, v0, Lrx/internal/c/b;->bNL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/c/b;->bOg:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -63,7 +63,7 @@
 
     check-cast v0, Lrx/internal/c/b$b;
 
-    invoke-virtual {v0}, Lrx/internal/c/b$b;->KV()Lrx/internal/c/b$c;
+    invoke-virtual {v0}, Lrx/internal/c/b$b;->KJ()Lrx/internal/c/b$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/rx/internal/util/k$2$1.smali b/com.discord/smali_classes2/rx/internal/util/k$2$1.smali
index 946d7283d2..f7546c4180 100644
--- a/com.discord/smali_classes2/rx/internal/util/k$2$1.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k$2$1.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic bPC:Lrx/functions/Action0;
+.field final synthetic bPX:Lrx/functions/Action0;
 
-.field final synthetic bPD:Lrx/Scheduler$Worker;
+.field final synthetic bPY:Lrx/Scheduler$Worker;
 
-.field final synthetic bPE:Lrx/internal/util/k$2;
+.field final synthetic bPZ:Lrx/internal/util/k$2;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/util/k$2;Lrx/functions/Action0;Lrx/Scheduler$Worker;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/util/k$2$1;->bPE:Lrx/internal/util/k$2;
+    iput-object p1, p0, Lrx/internal/util/k$2$1;->bPZ:Lrx/internal/util/k$2;
 
-    iput-object p2, p0, Lrx/internal/util/k$2$1;->bPC:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/util/k$2$1;->bPX:Lrx/functions/Action0;
 
-    iput-object p3, p0, Lrx/internal/util/k$2$1;->bPD:Lrx/Scheduler$Worker;
+    iput-object p3, p0, Lrx/internal/util/k$2$1;->bPY:Lrx/Scheduler$Worker;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,13 +46,13 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/util/k$2$1;->bPC:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/util/k$2$1;->bPX: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, Lrx/internal/util/k$2$1;->bPD:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/util/k$2$1;->bPY:Lrx/Scheduler$Worker;
 
     invoke-virtual {v0}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -61,7 +61,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lrx/internal/util/k$2$1;->bPD:Lrx/Scheduler$Worker;
+    iget-object v1, p0, Lrx/internal/util/k$2$1;->bPY:Lrx/Scheduler$Worker;
 
     invoke-virtual {v1}, Lrx/Scheduler$Worker;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/internal/util/k$2.smali b/com.discord/smali_classes2/rx/internal/util/k$2.smali
index 1fc997ed49..39a0c0cb8f 100644
--- a/com.discord/smali_classes2/rx/internal/util/k$2.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k$2.smali
@@ -28,18 +28,18 @@
 
 
 # instance fields
-.field final synthetic bPA:Lrx/internal/util/k;
+.field final synthetic bPV:Lrx/internal/util/k;
 
-.field final synthetic bPB:Lrx/Scheduler;
+.field final synthetic bPW:Lrx/Scheduler;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/util/k;Lrx/Scheduler;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/util/k$2;->bPA:Lrx/internal/util/k;
+    iput-object p1, p0, Lrx/internal/util/k$2;->bPV:Lrx/internal/util/k;
 
-    iput-object p2, p0, Lrx/internal/util/k$2;->bPB:Lrx/Scheduler;
+    iput-object p2, p0, Lrx/internal/util/k$2;->bPW:Lrx/Scheduler;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,9 +53,9 @@
 
     check-cast p1, Lrx/functions/Action0;
 
-    iget-object v0, p0, Lrx/internal/util/k$2;->bPB:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/internal/util/k$2;->bPW:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->Kk()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->JY()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/rx/internal/util/k$3.smali b/com.discord/smali_classes2/rx/internal/util/k$3.smali
index a8d0a3340c..6464a7859e 100644
--- a/com.discord/smali_classes2/rx/internal/util/k$3.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k$3.smali
@@ -26,18 +26,18 @@
 
 
 # instance fields
-.field final synthetic bPA:Lrx/internal/util/k;
+.field final synthetic bPV:Lrx/internal/util/k;
 
-.field final synthetic bPF:Lrx/functions/b;
+.field final synthetic bQa:Lrx/functions/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/util/k;Lrx/functions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/util/k$3;->bPA:Lrx/internal/util/k;
+    iput-object p1, p0, Lrx/internal/util/k$3;->bPV:Lrx/internal/util/k;
 
-    iput-object p2, p0, Lrx/internal/util/k$3;->bPF:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/util/k$3;->bQa:Lrx/functions/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,11 +51,11 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/util/k$3;->bPF:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/util/k$3;->bQa:Lrx/functions/b;
 
-    iget-object v1, p0, Lrx/internal/util/k$3;->bPA:Lrx/internal/util/k;
+    iget-object v1, p0, Lrx/internal/util/k$3;->bPV:Lrx/internal/util/k;
 
-    iget-object v1, v1, Lrx/internal/util/k;->bPx:Ljava/lang/Object;
+    iget-object v1, v1, Lrx/internal/util/k;->bPS:Ljava/lang/Object;
 
     invoke-interface {v0, v1}, Lrx/functions/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -69,7 +69,7 @@
 
     check-cast v0, Lrx/internal/util/k;
 
-    iget-object v0, v0, Lrx/internal/util/k;->bPx:Ljava/lang/Object;
+    iget-object v0, v0, Lrx/internal/util/k;->bPS:Ljava/lang/Object;
 
     invoke-static {p1, v0}, Lrx/internal/util/k;->b(Lrx/Subscriber;Ljava/lang/Object;)Lrx/Producer;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/k$d.smali b/com.discord/smali_classes2/rx/internal/util/k$d.smali
index 2660aef9c8..db88b6b624 100644
--- a/com.discord/smali_classes2/rx/internal/util/k$d.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k$d.smali
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field bJE:Z
+.field bJZ:Z
 
 .field final value:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
@@ -73,7 +73,7 @@
 .method public final request(J)V
     .locals 3
 
-    iget-boolean v0, p0, Lrx/internal/util/k$d;->bJE:Z
+    iget-boolean v0, p0, Lrx/internal/util/k$d;->bJZ:Z
 
     if-eqz v0, :cond_0
 
@@ -95,7 +95,7 @@
     :cond_1
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/util/k$d;->bJE:Z
+    iput-boolean p1, p0, Lrx/internal/util/k$d;->bJZ:Z
 
     iget-object p1, p0, Lrx/internal/util/k$d;->actual:Lrx/Subscriber;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/k.smali b/com.discord/smali_classes2/rx/internal/util/k.smali
index dd60e10038..737ce39a2f 100644
--- a/com.discord/smali_classes2/rx/internal/util/k.smali
+++ b/com.discord/smali_classes2/rx/internal/util/k.smali
@@ -25,11 +25,11 @@
 
 
 # static fields
-.field static final bPy:Z
+.field static final bPT:Z
 
 
 # instance fields
-.field public final bPx:Ljava/lang/Object;
+.field public final bPS:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -58,7 +58,7 @@
 
     move-result v0
 
-    sput-boolean v0, Lrx/internal/util/k;->bPy:Z
+    sput-boolean v0, Lrx/internal/util/k;->bPT:Z
 
     return-void
 .end method
@@ -81,7 +81,7 @@
 
     invoke-direct {p0, v0}, Lrx/Observable;-><init>(Lrx/Observable$a;)V
 
-    iput-object p1, p0, Lrx/internal/util/k;->bPx:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/util/k;->bPS:Ljava/lang/Object;
 
     return-void
 .end method
@@ -99,7 +99,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lrx/internal/util/k;->bPy:Z
+    sget-boolean v0, Lrx/internal/util/k;->bPT:Z
 
     if-eqz v0, :cond_0
 
@@ -170,7 +170,7 @@
     :goto_0
     new-instance p1, Lrx/internal/util/k$b;
 
-    iget-object v1, p0, Lrx/internal/util/k;->bPx:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/util/k;->bPS:Ljava/lang/Object;
 
     invoke-direct {p1, v1, v0}, Lrx/internal/util/k$b;-><init>(Ljava/lang/Object;Lrx/functions/b;)V
 
diff --git a/com.discord/smali_classes2/rx/internal/util/l$a.smali b/com.discord/smali_classes2/rx/internal/util/l$a.smali
index 4d13332c46..f09e2731f5 100644
--- a/com.discord/smali_classes2/rx/internal/util/l$a.smali
+++ b/com.discord/smali_classes2/rx/internal/util/l$a.smali
@@ -30,9 +30,9 @@
 
 
 # static fields
-.field public static final enum bPG:Lrx/internal/util/l$a;
+.field public static final enum bQb:Lrx/internal/util/l$a;
 
-.field private static final synthetic bPH:[Lrx/internal/util/l$a;
+.field private static final synthetic bQc:[Lrx/internal/util/l$a;
 
 
 # direct methods
@@ -45,19 +45,19 @@
 
     invoke-direct {v0, v1}, Lrx/internal/util/l$a;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/util/l$a;->bPG:Lrx/internal/util/l$a;
+    sput-object v0, Lrx/internal/util/l$a;->bQb:Lrx/internal/util/l$a;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/util/l$a;
 
-    sget-object v1, Lrx/internal/util/l$a;->bPG:Lrx/internal/util/l$a;
+    sget-object v1, Lrx/internal/util/l$a;->bQb:Lrx/internal/util/l$a;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/util/l$a;->bPH:[Lrx/internal/util/l$a;
+    sput-object v0, Lrx/internal/util/l$a;->bQc:[Lrx/internal/util/l$a;
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 .method public static values()[Lrx/internal/util/l$a;
     .locals 1
 
-    sget-object v0, Lrx/internal/util/l$a;->bPH:[Lrx/internal/util/l$a;
+    sget-object v0, Lrx/internal/util/l$a;->bQc:[Lrx/internal/util/l$a;
 
     invoke-virtual {v0}, [Lrx/internal/util/l$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/internal/util/l$b.smali b/com.discord/smali_classes2/rx/internal/util/l$b.smali
index 0fccf5e28a..75252178be 100644
--- a/com.discord/smali_classes2/rx/internal/util/l$b.smali
+++ b/com.discord/smali_classes2/rx/internal/util/l$b.smali
@@ -30,9 +30,9 @@
 
 
 # static fields
-.field public static final enum bPI:Lrx/internal/util/l$b;
+.field public static final enum bQd:Lrx/internal/util/l$b;
 
-.field private static final synthetic bPJ:[Lrx/internal/util/l$b;
+.field private static final synthetic bQe:[Lrx/internal/util/l$b;
 
 
 # direct methods
@@ -45,19 +45,19 @@
 
     invoke-direct {v0, v1}, Lrx/internal/util/l$b;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lrx/internal/util/l$b;->bPI:Lrx/internal/util/l$b;
+    sput-object v0, Lrx/internal/util/l$b;->bQd:Lrx/internal/util/l$b;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/util/l$b;
 
-    sget-object v1, Lrx/internal/util/l$b;->bPI:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->bQd:Lrx/internal/util/l$b;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/util/l$b;->bPJ:[Lrx/internal/util/l$b;
+    sput-object v0, Lrx/internal/util/l$b;->bQe:[Lrx/internal/util/l$b;
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 .method public static values()[Lrx/internal/util/l$b;
     .locals 1
 
-    sget-object v0, Lrx/internal/util/l$b;->bPJ:[Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bQe:[Lrx/internal/util/l$b;
 
     invoke-virtual {v0}, [Lrx/internal/util/l$b;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/observers/SerializedSubscriber.smali b/com.discord/smali_classes2/rx/observers/SerializedSubscriber.smali
index a62afbfe77..6f1e7aa9e2 100644
--- a/com.discord/smali_classes2/rx/observers/SerializedSubscriber.smali
+++ b/com.discord/smali_classes2/rx/observers/SerializedSubscriber.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field private final bQw:Lrx/e;
+.field private final bQR:Lrx/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/e<",
@@ -60,7 +60,7 @@
 
     invoke-direct {p2, p1}, Lrx/observers/c;-><init>(Lrx/e;)V
 
-    iput-object p2, p0, Lrx/observers/SerializedSubscriber;->bQw:Lrx/e;
+    iput-object p2, p0, Lrx/observers/SerializedSubscriber;->bQR:Lrx/e;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 .method public onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bQw:Lrx/e;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bQR:Lrx/e;
 
     invoke-interface {v0}, Lrx/e;->onCompleted()V
 
@@ -80,7 +80,7 @@
 .method public onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bQw:Lrx/e;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bQR:Lrx/e;
 
     invoke-interface {v0, p1}, Lrx/e;->onError(Ljava/lang/Throwable;)V
 
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bQw:Lrx/e;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bQR:Lrx/e;
 
     invoke-interface {v0, p1}, Lrx/e;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/observers/a.smali b/com.discord/smali_classes2/rx/observers/a.smali
index ef391aae1b..3c3329c7a8 100644
--- a/com.discord/smali_classes2/rx/observers/a.smali
+++ b/com.discord/smali_classes2/rx/observers/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bQt:Lrx/e;
+.field private static final bQO:Lrx/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/e<",
@@ -23,12 +23,12 @@
 
     invoke-direct {v0}, Lrx/observers/a$1;-><init>()V
 
-    sput-object v0, Lrx/observers/a;->bQt:Lrx/e;
+    sput-object v0, Lrx/observers/a;->bQO:Lrx/e;
 
     return-void
 .end method
 
-.method public static Lp()Lrx/e;
+.method public static Ld()Lrx/e;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -40,7 +40,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/observers/a;->bQt:Lrx/e;
+    sget-object v0, Lrx/observers/a;->bQO:Lrx/e;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/observers/b.smali b/com.discord/smali_classes2/rx/observers/b.smali
index c5acb42112..51a67c5160 100644
--- a/com.discord/smali_classes2/rx/observers/b.smali
+++ b/com.discord/smali_classes2/rx/observers/b.smali
@@ -150,11 +150,11 @@
 
     iput-boolean v0, p0, Lrx/observers/b;->done:Z
 
-    invoke-static {}, Lrx/c/f;->Ls()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Lg()Lrx/c/f;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/c/f;->Lt()Lrx/c/b;
+    invoke-virtual {v1}, Lrx/c/f;->Lh()Lrx/c/b;
 
     const/4 v1, 0x2
 
diff --git a/com.discord/smali_classes2/rx/observers/c.smali b/com.discord/smali_classes2/rx/observers/c.smali
index c29035c996..79d81f83f4 100644
--- a/com.discord/smali_classes2/rx/observers/c.smali
+++ b/com.discord/smali_classes2/rx/observers/c.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field private final bQu:Lrx/e;
+.field private final bQP:Lrx/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/e<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private bQv:Lrx/observers/c$a;
+.field private bQQ:Lrx/observers/c$a;
 
 .field private emitting:Z
 
@@ -55,7 +55,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/observers/c;->bQu:Lrx/e;
+    iput-object p1, p0, Lrx/observers/c;->bQP:Lrx/e;
 
     return-void
 .end method
@@ -92,7 +92,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v0, p0, Lrx/observers/c;->bQv:Lrx/observers/c$a;
+    iget-object v0, p0, Lrx/observers/c;->bQQ:Lrx/observers/c$a;
 
     if-nez v0, :cond_2
 
@@ -100,10 +100,10 @@
 
     invoke-direct {v0}, Lrx/observers/c$a;-><init>()V
 
-    iput-object v0, p0, Lrx/observers/c;->bQv:Lrx/observers/c$a;
+    iput-object v0, p0, Lrx/observers/c;->bQQ:Lrx/observers/c$a;
 
     :cond_2
-    invoke-static {}, Lrx/internal/a/g;->Ks()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Kg()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -120,7 +120,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lrx/observers/c;->bQu:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->bQP:Lrx/e;
 
     invoke-interface {v0}, Lrx/e;->onCompleted()V
 
@@ -169,7 +169,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v0, p0, Lrx/observers/c;->bQv:Lrx/observers/c$a;
+    iget-object v0, p0, Lrx/observers/c;->bQQ:Lrx/observers/c$a;
 
     if-nez v0, :cond_2
 
@@ -177,7 +177,7 @@
 
     invoke-direct {v0}, Lrx/observers/c$a;-><init>()V
 
-    iput-object v0, p0, Lrx/observers/c;->bQv:Lrx/observers/c$a;
+    iput-object v0, p0, Lrx/observers/c;->bQQ:Lrx/observers/c$a;
 
     :cond_2
     invoke-static {p1}, Lrx/internal/a/g;->K(Ljava/lang/Throwable;)Ljava/lang/Object;
@@ -197,7 +197,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lrx/observers/c;->bQu:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->bQP:Lrx/e;
 
     invoke-interface {v0, p1}, Lrx/e;->onError(Ljava/lang/Throwable;)V
 
@@ -245,7 +245,7 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lrx/observers/c;->bQv:Lrx/observers/c$a;
+    iget-object v0, p0, Lrx/observers/c;->bQQ:Lrx/observers/c$a;
 
     if-nez v0, :cond_2
 
@@ -253,7 +253,7 @@
 
     invoke-direct {v0}, Lrx/observers/c$a;-><init>()V
 
-    iput-object v0, p0, Lrx/observers/c;->bQv:Lrx/observers/c$a;
+    iput-object v0, p0, Lrx/observers/c;->bQQ:Lrx/observers/c$a;
 
     :cond_2
     invoke-static {p1}, Lrx/internal/a/g;->bJ(Ljava/lang/Object;)Ljava/lang/Object;
@@ -276,7 +276,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
     :try_start_1
-    iget-object v1, p0, Lrx/observers/c;->bQu:Lrx/e;
+    iget-object v1, p0, Lrx/observers/c;->bQP:Lrx/e;
 
     invoke-interface {v1, p1}, Lrx/e;->onNext(Ljava/lang/Object;)V
     :try_end_1
@@ -286,7 +286,7 @@
     monitor-enter p0
 
     :try_start_2
-    iget-object v1, p0, Lrx/observers/c;->bQv:Lrx/observers/c$a;
+    iget-object v1, p0, Lrx/observers/c;->bQQ:Lrx/observers/c$a;
 
     const/4 v2, 0x0
 
@@ -301,7 +301,7 @@
     :cond_5
     const/4 v3, 0x0
 
-    iput-object v3, p0, Lrx/observers/c;->bQv:Lrx/observers/c$a;
+    iput-object v3, p0, Lrx/observers/c;->bQQ:Lrx/observers/c$a;
 
     monitor-exit p0
     :try_end_2
@@ -319,7 +319,7 @@
     if-eqz v4, :cond_4
 
     :try_start_3
-    iget-object v5, p0, Lrx/observers/c;->bQu:Lrx/e;
+    iget-object v5, p0, Lrx/observers/c;->bQP:Lrx/e;
 
     invoke-static {v5, v4}, Lrx/internal/a/g;->a(Lrx/e;Ljava/lang/Object;)Z
 
@@ -345,7 +345,7 @@
 
     invoke-static {v1}, Lrx/a/b;->I(Ljava/lang/Throwable;)V
 
-    iget-object v0, p0, Lrx/observers/c;->bQu:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->bQP:Lrx/e;
 
     invoke-static {v1, p1}, Lrx/a/g;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
 
@@ -370,7 +370,7 @@
 
     iput-boolean v0, p0, Lrx/observers/c;->terminated:Z
 
-    iget-object v0, p0, Lrx/observers/c;->bQu:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->bQP:Lrx/e;
 
     invoke-static {v1, v0, p1}, Lrx/a/b;->a(Ljava/lang/Throwable;Lrx/e;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/observers/d$1.smali b/com.discord/smali_classes2/rx/observers/d$1.smali
index df508b26c9..4eb9ba15f6 100644
--- a/com.discord/smali_classes2/rx/observers/d$1.smali
+++ b/com.discord/smali_classes2/rx/observers/d$1.smali
@@ -22,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic bQx:Lrx/e;
+.field final synthetic bQS:Lrx/e;
 
 
 # direct methods
 .method public constructor <init>(Lrx/e;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/observers/d$1;->bQx:Lrx/e;
+    iput-object p1, p0, Lrx/observers/d$1;->bQS:Lrx/e;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/d$1;->bQx:Lrx/e;
+    iget-object v0, p0, Lrx/observers/d$1;->bQS:Lrx/e;
 
     invoke-interface {v0}, Lrx/e;->onCompleted()V
 
@@ -51,7 +51,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/d$1;->bQx:Lrx/e;
+    iget-object v0, p0, Lrx/observers/d$1;->bQS:Lrx/e;
 
     invoke-interface {v0, p1}, Lrx/e;->onError(Ljava/lang/Throwable;)V
 
@@ -66,7 +66,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/observers/d$1;->bQx:Lrx/e;
+    iget-object v0, p0, Lrx/observers/d$1;->bQS:Lrx/e;
 
     invoke-interface {v0, p1}, Lrx/e;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/observers/d$2.smali b/com.discord/smali_classes2/rx/observers/d$2.smali
index d334b61b24..1ed72e0402 100644
--- a/com.discord/smali_classes2/rx/observers/d$2.smali
+++ b/com.discord/smali_classes2/rx/observers/d$2.smali
@@ -22,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic bKq:Lrx/Subscriber;
+.field final synthetic bKL:Lrx/Subscriber;
 
 
 # direct methods
 .method constructor <init>(Lrx/Subscriber;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p2, p0, Lrx/observers/d$2;->bKq:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/observers/d$2;->bKL:Lrx/Subscriber;
 
     invoke-direct {p0, p1}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
 
@@ -41,7 +41,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/d$2;->bKq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/observers/d$2;->bKL:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->onCompleted()V
 
@@ -51,7 +51,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/d$2;->bKq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/observers/d$2;->bKL:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -66,7 +66,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/observers/d$2;->bKq:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/observers/d$2;->bKL:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/subjects/BehaviorSubject$1.smali b/com.discord/smali_classes2/rx/subjects/BehaviorSubject$1.smali
index 6fd8de369a..55395d5734 100644
--- a/com.discord/smali_classes2/rx/subjects/BehaviorSubject$1.smali
+++ b/com.discord/smali_classes2/rx/subjects/BehaviorSubject$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic bRf:Lrx/subjects/b;
+.field final synthetic bRA:Lrx/subjects/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/subjects/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/subjects/BehaviorSubject$1;->bRf:Lrx/subjects/b;
+    iput-object p1, p0, Lrx/subjects/BehaviorSubject$1;->bRA:Lrx/subjects/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,14 +48,14 @@
 
     check-cast p1, Lrx/subjects/b$b;
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject$1;->bRf:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject$1;->bRA:Lrx/subjects/b;
 
     iget-object v0, v0, Lrx/subjects/b;->latest:Ljava/lang/Object;
 
     monitor-enter p1
 
     :try_start_0
-    iget-boolean v1, p1, Lrx/subjects/b$b;->bgt:Z
+    iget-boolean v1, p1, Lrx/subjects/b$b;->bgN:Z
 
     if-eqz v1, :cond_7
 
@@ -68,7 +68,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    iput-boolean v1, p1, Lrx/subjects/b$b;->bgt:Z
+    iput-boolean v1, p1, Lrx/subjects/b$b;->bgN:Z
 
     const/4 v2, 0x1
 
@@ -139,9 +139,9 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    iget-object v4, p1, Lrx/subjects/b$b;->bRw:Ljava/util/List;
+    iget-object v4, p1, Lrx/subjects/b$b;->bRR:Ljava/util/List;
 
-    iput-object v3, p1, Lrx/subjects/b$b;->bRw:Ljava/util/List;
+    iput-object v3, p1, Lrx/subjects/b$b;->bRR:Ljava/util/List;
 
     if-nez v4, :cond_4
 
diff --git a/com.discord/smali_classes2/rx/subjects/BehaviorSubject.smali b/com.discord/smali_classes2/rx/subjects/BehaviorSubject.smali
index ab0b75c6f9..1a36062b29 100644
--- a/com.discord/smali_classes2/rx/subjects/BehaviorSubject.smali
+++ b/com.discord/smali_classes2/rx/subjects/BehaviorSubject.smali
@@ -16,11 +16,11 @@
 
 
 # static fields
-.field private static final bRd:[Ljava/lang/Object;
+.field private static final bRy:[Ljava/lang/Object;
 
 
 # instance fields
-.field private final bRe:Lrx/subjects/b;
+.field private final bRz:Lrx/subjects/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/b<",
@@ -38,7 +38,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    sput-object v0, Lrx/subjects/BehaviorSubject;->bRd:[Ljava/lang/Object;
+    sput-object v0, Lrx/subjects/BehaviorSubject;->bRy:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -57,12 +57,12 @@
 
     invoke-direct {p0, p1}, Lrx/subjects/Subject;-><init>(Lrx/Observable$a;)V
 
-    iput-object p2, p0, Lrx/subjects/BehaviorSubject;->bRe:Lrx/subjects/b;
+    iput-object p2, p0, Lrx/subjects/BehaviorSubject;->bRz:Lrx/subjects/b;
 
     return-void
 .end method
 
-.method public static LI()Lrx/subjects/BehaviorSubject;
+.method public static Lw()Lrx/subjects/BehaviorSubject;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -158,7 +158,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRe:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRz:Lrx/subjects/b;
 
     iget-object v0, v0, Lrx/subjects/b;->latest:Ljava/lang/Object;
 
@@ -183,24 +183,24 @@
 .method public final onCompleted()V
     .locals 5
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRe:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRz:Lrx/subjects/b;
 
     iget-object v0, v0, Lrx/subjects/b;->latest:Ljava/lang/Object;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRe:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRz:Lrx/subjects/b;
 
     iget-boolean v0, v0, Lrx/subjects/b;->active:Z
 
     if-eqz v0, :cond_1
 
     :cond_0
-    invoke-static {}, Lrx/internal/a/g;->Ks()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Kg()Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->bRe:Lrx/subjects/b;
+    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->bRz:Lrx/subjects/b;
 
     invoke-virtual {v1, v0}, Lrx/subjects/b;->bU(Ljava/lang/Object;)[Lrx/subjects/b$b;
 
@@ -228,13 +228,13 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 5
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRe:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRz:Lrx/subjects/b;
 
     iget-object v0, v0, Lrx/subjects/b;->latest:Ljava/lang/Object;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRe:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRz:Lrx/subjects/b;
 
     iget-boolean v0, v0, Lrx/subjects/b;->active:Z
 
@@ -247,7 +247,7 @@
 
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->bRe:Lrx/subjects/b;
+    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->bRz:Lrx/subjects/b;
 
     invoke-virtual {v1, p1}, Lrx/subjects/b;->bU(Ljava/lang/Object;)[Lrx/subjects/b$b;
 
@@ -301,13 +301,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRe:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRz:Lrx/subjects/b;
 
     iget-object v0, v0, Lrx/subjects/b;->latest:Ljava/lang/Object;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRe:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRz:Lrx/subjects/b;
 
     iget-boolean v0, v0, Lrx/subjects/b;->active:Z
 
@@ -318,7 +318,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRe:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bRz:Lrx/subjects/b;
 
     iput-object p1, v0, Lrx/subjects/b;->latest:Ljava/lang/Object;
 
@@ -328,7 +328,7 @@
 
     check-cast v0, Lrx/subjects/b$a;
 
-    iget-object v0, v0, Lrx/subjects/b$a;->bRs:[Lrx/subjects/b$b;
+    iget-object v0, v0, Lrx/subjects/b$a;->bRN:[Lrx/subjects/b$b;
 
     array-length v1, v0
 
diff --git a/com.discord/smali_classes2/rx/subjects/PublishSubject$b.smali b/com.discord/smali_classes2/rx/subjects/PublishSubject$b.smali
index e590ec5b53..065c34a3dd 100644
--- a/com.discord/smali_classes2/rx/subjects/PublishSubject$b.smali
+++ b/com.discord/smali_classes2/rx/subjects/PublishSubject$b.smali
@@ -35,9 +35,9 @@
 
 
 # static fields
-.field static final bRh:[Lrx/subjects/PublishSubject$a;
+.field static final bRC:[Lrx/subjects/PublishSubject$a;
 
-.field static final bRi:[Lrx/subjects/PublishSubject$a;
+.field static final bRD:[Lrx/subjects/PublishSubject$a;
 
 .field private static final serialVersionUID:J = -0x690a478d773d9c84L
 
@@ -54,11 +54,11 @@
 
     new-array v1, v0, [Lrx/subjects/PublishSubject$a;
 
-    sput-object v1, Lrx/subjects/PublishSubject$b;->bRh:[Lrx/subjects/PublishSubject$a;
+    sput-object v1, Lrx/subjects/PublishSubject$b;->bRC:[Lrx/subjects/PublishSubject$a;
 
     new-array v0, v0, [Lrx/subjects/PublishSubject$a;
 
-    sput-object v0, Lrx/subjects/PublishSubject$b;->bRi:[Lrx/subjects/PublishSubject$a;
+    sput-object v0, Lrx/subjects/PublishSubject$b;->bRD:[Lrx/subjects/PublishSubject$a;
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sget-object v0, Lrx/subjects/PublishSubject$b;->bRh:[Lrx/subjects/PublishSubject$a;
+    sget-object v0, Lrx/subjects/PublishSubject$b;->bRC:[Lrx/subjects/PublishSubject$a;
 
     invoke-virtual {p0, v0}, Lrx/subjects/PublishSubject$b;->lazySet(Ljava/lang/Object;)V
 
@@ -94,11 +94,11 @@
 
     check-cast v0, [Lrx/subjects/PublishSubject$a;
 
-    sget-object v1, Lrx/subjects/PublishSubject$b;->bRi:[Lrx/subjects/PublishSubject$a;
+    sget-object v1, Lrx/subjects/PublishSubject$b;->bRD:[Lrx/subjects/PublishSubject$a;
 
     if-eq v0, v1, :cond_6
 
-    sget-object v1, Lrx/subjects/PublishSubject$b;->bRh:[Lrx/subjects/PublishSubject$a;
+    sget-object v1, Lrx/subjects/PublishSubject$b;->bRC:[Lrx/subjects/PublishSubject$a;
 
     if-ne v0, v1, :cond_1
 
@@ -140,7 +140,7 @@
 
     if-ne v1, v4, :cond_5
 
-    sget-object v1, Lrx/subjects/PublishSubject$b;->bRh:[Lrx/subjects/PublishSubject$a;
+    sget-object v1, Lrx/subjects/PublishSubject$b;->bRC:[Lrx/subjects/PublishSubject$a;
 
     goto :goto_2
 
@@ -193,7 +193,7 @@
 
     check-cast v1, [Lrx/subjects/PublishSubject$a;
 
-    sget-object v2, Lrx/subjects/PublishSubject$b;->bRi:[Lrx/subjects/PublishSubject$a;
+    sget-object v2, Lrx/subjects/PublishSubject$b;->bRD:[Lrx/subjects/PublishSubject$a;
 
     const/4 v3, 0x0
 
@@ -252,7 +252,7 @@
 .method public final onCompleted()V
     .locals 4
 
-    sget-object v0, Lrx/subjects/PublishSubject$b;->bRi:[Lrx/subjects/PublishSubject$a;
+    sget-object v0, Lrx/subjects/PublishSubject$b;->bRD:[Lrx/subjects/PublishSubject$a;
 
     invoke-virtual {p0, v0}, Lrx/subjects/PublishSubject$b;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -284,7 +284,7 @@
 
     iput-object p1, p0, Lrx/subjects/PublishSubject$b;->error:Ljava/lang/Throwable;
 
-    sget-object v0, Lrx/subjects/PublishSubject$b;->bRi:[Lrx/subjects/PublishSubject$a;
+    sget-object v0, Lrx/subjects/PublishSubject$b;->bRD:[Lrx/subjects/PublishSubject$a;
 
     invoke-virtual {p0, v0}, Lrx/subjects/PublishSubject$b;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/subjects/PublishSubject.smali b/com.discord/smali_classes2/rx/subjects/PublishSubject.smali
index 5564ed9d6e..3f2d1da6e8 100644
--- a/com.discord/smali_classes2/rx/subjects/PublishSubject.smali
+++ b/com.discord/smali_classes2/rx/subjects/PublishSubject.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field final bRg:Lrx/subjects/PublishSubject$b;
+.field final bRB:Lrx/subjects/PublishSubject$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/PublishSubject$b<",
@@ -46,12 +46,12 @@
 
     invoke-direct {p0, p1}, Lrx/subjects/Subject;-><init>(Lrx/Observable$a;)V
 
-    iput-object p1, p0, Lrx/subjects/PublishSubject;->bRg:Lrx/subjects/PublishSubject$b;
+    iput-object p1, p0, Lrx/subjects/PublishSubject;->bRB:Lrx/subjects/PublishSubject$b;
 
     return-void
 .end method
 
-.method public static LJ()Lrx/subjects/PublishSubject;
+.method public static Lx()Lrx/subjects/PublishSubject;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -79,7 +79,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/subjects/PublishSubject;->bRg:Lrx/subjects/PublishSubject$b;
+    iget-object v0, p0, Lrx/subjects/PublishSubject;->bRB:Lrx/subjects/PublishSubject$b;
 
     invoke-virtual {v0}, Lrx/subjects/PublishSubject$b;->onCompleted()V
 
@@ -89,7 +89,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/subjects/PublishSubject;->bRg:Lrx/subjects/PublishSubject$b;
+    iget-object v0, p0, Lrx/subjects/PublishSubject;->bRB:Lrx/subjects/PublishSubject$b;
 
     invoke-virtual {v0, p1}, Lrx/subjects/PublishSubject$b;->onError(Ljava/lang/Throwable;)V
 
@@ -104,7 +104,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/PublishSubject;->bRg:Lrx/subjects/PublishSubject$b;
+    iget-object v0, p0, Lrx/subjects/PublishSubject;->bRB:Lrx/subjects/PublishSubject$b;
 
     invoke-virtual {v0, p1}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/subjects/SerializedSubject$1.smali b/com.discord/smali_classes2/rx/subjects/SerializedSubject$1.smali
index e83665b92d..c62160649e 100644
--- a/com.discord/smali_classes2/rx/subjects/SerializedSubject$1.smali
+++ b/com.discord/smali_classes2/rx/subjects/SerializedSubject$1.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bRp:Lrx/subjects/Subject;
+.field final synthetic bRK:Lrx/subjects/Subject;
 
 
 # direct methods
 .method constructor <init>(Lrx/subjects/Subject;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/subjects/SerializedSubject$1;->bRp:Lrx/subjects/Subject;
+    iput-object p1, p0, Lrx/subjects/SerializedSubject$1;->bRK:Lrx/subjects/Subject;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,7 +47,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/subjects/SerializedSubject$1;->bRp:Lrx/subjects/Subject;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject$1;->bRK:Lrx/subjects/Subject;
 
     invoke-virtual {v0, p1}, Lrx/subjects/Subject;->a(Lrx/Subscriber;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/rx/subjects/SerializedSubject.smali b/com.discord/smali_classes2/rx/subjects/SerializedSubject.smali
index 138a53b039..70fb48eced 100644
--- a/com.discord/smali_classes2/rx/subjects/SerializedSubject.smali
+++ b/com.discord/smali_classes2/rx/subjects/SerializedSubject.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final bRn:Lrx/observers/c;
+.field private final bRI:Lrx/observers/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/observers/c<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final bRo:Lrx/subjects/Subject;
+.field private final bRJ:Lrx/subjects/Subject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/Subject<",
@@ -54,13 +54,13 @@
 
     invoke-direct {p0, v0}, Lrx/subjects/Subject;-><init>(Lrx/Observable$a;)V
 
-    iput-object p1, p0, Lrx/subjects/SerializedSubject;->bRo:Lrx/subjects/Subject;
+    iput-object p1, p0, Lrx/subjects/SerializedSubject;->bRJ:Lrx/subjects/Subject;
 
     new-instance v0, Lrx/observers/c;
 
     invoke-direct {v0, p1}, Lrx/observers/c;-><init>(Lrx/e;)V
 
-    iput-object v0, p0, Lrx/subjects/SerializedSubject;->bRn:Lrx/observers/c;
+    iput-object v0, p0, Lrx/subjects/SerializedSubject;->bRI:Lrx/observers/c;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 .method public onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bRn:Lrx/observers/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bRI:Lrx/observers/c;
 
     invoke-virtual {v0}, Lrx/observers/c;->onCompleted()V
 
@@ -80,7 +80,7 @@
 .method public onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bRn:Lrx/observers/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bRI:Lrx/observers/c;
 
     invoke-virtual {v0, p1}, Lrx/observers/c;->onError(Ljava/lang/Throwable;)V
 
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bRn:Lrx/observers/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bRI:Lrx/observers/c;
 
     invoke-virtual {v0, p1}, Lrx/observers/c;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/rx/subjects/a$c.smali b/com.discord/smali_classes2/rx/subjects/a$c.smali
index f289647dd1..3e7eab8284 100644
--- a/com.discord/smali_classes2/rx/subjects/a$c.smali
+++ b/com.discord/smali_classes2/rx/subjects/a$c.smali
@@ -35,9 +35,9 @@
 
 
 # static fields
-.field static final bRj:[Lrx/subjects/a$b;
+.field static final bRE:[Lrx/subjects/a$b;
 
-.field static final bRk:[Lrx/subjects/a$b;
+.field static final bRF:[Lrx/subjects/a$b;
 
 .field private static final serialVersionUID:J = 0x529b0a217109d450L
 
@@ -61,11 +61,11 @@
 
     new-array v1, v0, [Lrx/subjects/a$b;
 
-    sput-object v1, Lrx/subjects/a$c;->bRj:[Lrx/subjects/a$b;
+    sput-object v1, Lrx/subjects/a$c;->bRE:[Lrx/subjects/a$b;
 
     new-array v0, v0, [Lrx/subjects/a$b;
 
-    sput-object v0, Lrx/subjects/a$c;->bRk:[Lrx/subjects/a$b;
+    sput-object v0, Lrx/subjects/a$c;->bRF:[Lrx/subjects/a$b;
 
     return-void
 .end method
@@ -84,7 +84,7 @@
 
     iput-object p1, p0, Lrx/subjects/a$c;->buffer:Lrx/subjects/a$a;
 
-    sget-object p1, Lrx/subjects/a$c;->bRj:[Lrx/subjects/a$b;
+    sget-object p1, Lrx/subjects/a$c;->bRE:[Lrx/subjects/a$b;
 
     invoke-virtual {p0, p1}, Lrx/subjects/a$c;->lazySet(Ljava/lang/Object;)V
 
@@ -110,11 +110,11 @@
 
     check-cast v0, [Lrx/subjects/a$b;
 
-    sget-object v1, Lrx/subjects/a$c;->bRk:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bRF:[Lrx/subjects/a$b;
 
     if-eq v0, v1, :cond_6
 
-    sget-object v1, Lrx/subjects/a$c;->bRj:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bRE:[Lrx/subjects/a$b;
 
     if-ne v0, v1, :cond_1
 
@@ -156,7 +156,7 @@
 
     if-ne v1, v4, :cond_5
 
-    sget-object v1, Lrx/subjects/a$c;->bRj:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bRE:[Lrx/subjects/a$b;
 
     goto :goto_2
 
@@ -209,7 +209,7 @@
 
     check-cast p1, [Lrx/subjects/a$b;
 
-    sget-object v1, Lrx/subjects/a$c;->bRk:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bRF:[Lrx/subjects/a$b;
 
     const/4 v2, 0x0
 
@@ -264,7 +264,7 @@
 
     invoke-interface {v0}, Lrx/subjects/a$a;->complete()V
 
-    sget-object v1, Lrx/subjects/a$c;->bRk:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bRF:[Lrx/subjects/a$b;
 
     invoke-virtual {p0, v1}, Lrx/subjects/a$c;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -298,7 +298,7 @@
 
     invoke-interface {v0, p1}, Lrx/subjects/a$a;->N(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lrx/subjects/a$c;->bRk:[Lrx/subjects/a$b;
+    sget-object p1, Lrx/subjects/a$c;->bRF:[Lrx/subjects/a$b;
 
     invoke-virtual {p0, p1}, Lrx/subjects/a$c;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/subjects/a$d.smali b/com.discord/smali_classes2/rx/subjects/a$d.smali
index f5762848f0..d48aaad027 100644
--- a/com.discord/smali_classes2/rx/subjects/a$d.smali
+++ b/com.discord/smali_classes2/rx/subjects/a$d.smali
@@ -29,9 +29,9 @@
 
 
 # instance fields
-.field final bRl:[Ljava/lang/Object;
+.field final bRG:[Ljava/lang/Object;
 
-.field bRm:[Ljava/lang/Object;
+.field bRH:[Ljava/lang/Object;
 
 .field final capacity:I
 
@@ -58,9 +58,9 @@
 
     new-array p1, p1, [Ljava/lang/Object;
 
-    iput-object p1, p0, Lrx/subjects/a$d;->bRl:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/subjects/a$d;->bRG:[Ljava/lang/Object;
 
-    iput-object p1, p0, Lrx/subjects/a$d;->bRm:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/subjects/a$d;->bRH:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -134,7 +134,7 @@
 
     if-nez v8, :cond_2
 
-    iget-object v8, v0, Lrx/subjects/a$d;->bRl:[Ljava/lang/Object;
+    iget-object v8, v0, Lrx/subjects/a$d;->bRG:[Ljava/lang/Object;
 
     :cond_2
     iget v9, v1, Lrx/subjects/a$b;->tailIndex:I
@@ -334,7 +334,7 @@
     :cond_0
     iget v0, p0, Lrx/subjects/a$d;->tailIndex:I
 
-    iget-object v1, p0, Lrx/subjects/a$d;->bRm:[Ljava/lang/Object;
+    iget-object v1, p0, Lrx/subjects/a$d;->bRH:[Ljava/lang/Object;
 
     array-length v2, v1
 
@@ -356,7 +356,7 @@
 
     aput-object v2, v1, v0
 
-    iput-object v2, p0, Lrx/subjects/a$d;->bRm:[Ljava/lang/Object;
+    iput-object v2, p0, Lrx/subjects/a$d;->bRH:[Ljava/lang/Object;
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/rx/subjects/a.smali b/com.discord/smali_classes2/rx/subjects/a.smali
index 97b882431b..808dff4315 100644
--- a/com.discord/smali_classes2/rx/subjects/a.smali
+++ b/com.discord/smali_classes2/rx/subjects/a.smali
@@ -25,7 +25,7 @@
 
 
 # static fields
-.field private static final bRd:[Ljava/lang/Object;
+.field private static final bRy:[Ljava/lang/Object;
 
 
 # instance fields
@@ -47,7 +47,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    sput-object v0, Lrx/subjects/a;->bRd:[Ljava/lang/Object;
+    sput-object v0, Lrx/subjects/a;->bRy:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
     return-void
 .end method
 
-.method public static LK()Lrx/subjects/a;
+.method public static Ly()Lrx/subjects/a;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/rx/subjects/b$1.smali b/com.discord/smali_classes2/rx/subjects/b$1.smali
index cf22e2ac32..1940446eb4 100644
--- a/com.discord/smali_classes2/rx/subjects/b$1.smali
+++ b/com.discord/smali_classes2/rx/subjects/b$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bRq:Lrx/subjects/b$b;
+.field final synthetic bRL:Lrx/subjects/b$b;
 
-.field final synthetic bRr:Lrx/subjects/b;
+.field final synthetic bRM:Lrx/subjects/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/subjects/b;Lrx/subjects/b$b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/subjects/b$1;->bRr:Lrx/subjects/b;
+    iput-object p1, p0, Lrx/subjects/b$1;->bRM:Lrx/subjects/b;
 
-    iput-object p2, p0, Lrx/subjects/b$1;->bRq:Lrx/subjects/b$b;
+    iput-object p2, p0, Lrx/subjects/b$1;->bRL:Lrx/subjects/b$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final call()V
     .locals 2
 
-    iget-object v0, p0, Lrx/subjects/b$1;->bRr:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/b$1;->bRM:Lrx/subjects/b;
 
-    iget-object v1, p0, Lrx/subjects/b$1;->bRq:Lrx/subjects/b$b;
+    iget-object v1, p0, Lrx/subjects/b$1;->bRL:Lrx/subjects/b$b;
 
     invoke-virtual {v0, v1}, Lrx/subjects/b;->a(Lrx/subjects/b$b;)V
 
diff --git a/com.discord/smali_classes2/rx/subjects/b$a.smali b/com.discord/smali_classes2/rx/subjects/b$a.smali
index c06955adeb..4cb0d46790 100644
--- a/com.discord/smali_classes2/rx/subjects/b$a.smali
+++ b/com.discord/smali_classes2/rx/subjects/b$a.smali
@@ -24,15 +24,15 @@
 
 
 # static fields
-.field static final bRt:[Lrx/subjects/b$b;
+.field static final bRO:[Lrx/subjects/b$b;
 
-.field static final bRu:Lrx/subjects/b$a;
+.field static final bRP:Lrx/subjects/b$a;
 
-.field static final bRv:Lrx/subjects/b$a;
+.field static final bRQ:Lrx/subjects/b$a;
 
 
 # instance fields
-.field final bRs:[Lrx/subjects/b$b;
+.field final bRN:[Lrx/subjects/b$b;
 
 .field final terminated:Z
 
@@ -45,25 +45,25 @@
 
     new-array v1, v0, [Lrx/subjects/b$b;
 
-    sput-object v1, Lrx/subjects/b$a;->bRt:[Lrx/subjects/b$b;
+    sput-object v1, Lrx/subjects/b$a;->bRO:[Lrx/subjects/b$b;
 
     new-instance v1, Lrx/subjects/b$a;
 
-    sget-object v2, Lrx/subjects/b$a;->bRt:[Lrx/subjects/b$b;
+    sget-object v2, Lrx/subjects/b$a;->bRO:[Lrx/subjects/b$b;
 
     const/4 v3, 0x1
 
     invoke-direct {v1, v3, v2}, Lrx/subjects/b$a;-><init>(Z[Lrx/subjects/b$b;)V
 
-    sput-object v1, Lrx/subjects/b$a;->bRu:Lrx/subjects/b$a;
+    sput-object v1, Lrx/subjects/b$a;->bRP:Lrx/subjects/b$a;
 
     new-instance v1, Lrx/subjects/b$a;
 
-    sget-object v2, Lrx/subjects/b$a;->bRt:[Lrx/subjects/b$b;
+    sget-object v2, Lrx/subjects/b$a;->bRO:[Lrx/subjects/b$b;
 
     invoke-direct {v1, v0, v2}, Lrx/subjects/b$a;-><init>(Z[Lrx/subjects/b$b;)V
 
-    sput-object v1, Lrx/subjects/b$a;->bRv:Lrx/subjects/b$a;
+    sput-object v1, Lrx/subjects/b$a;->bRQ:Lrx/subjects/b$a;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 
     iput-boolean p1, p0, Lrx/subjects/b$a;->terminated:Z
 
-    iput-object p2, p0, Lrx/subjects/b$a;->bRs:[Lrx/subjects/b$b;
+    iput-object p2, p0, Lrx/subjects/b$a;->bRN:[Lrx/subjects/b$b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/subjects/b$b.smali b/com.discord/smali_classes2/rx/subjects/b$b.smali
index 4261a89df4..ef01c6fec2 100644
--- a/com.discord/smali_classes2/rx/subjects/b$b.smali
+++ b/com.discord/smali_classes2/rx/subjects/b$b.smali
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field bRw:Ljava/util/List;
+.field bRR:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -48,9 +48,9 @@
     .end annotation
 .end field
 
-.field bRx:Z
+.field bRS:Z
 
-.field bgt:Z
+.field bgN:Z
 
 .field emitting:Z
 
@@ -70,7 +70,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/subjects/b$b;->bgt:Z
+    iput-boolean v0, p0, Lrx/subjects/b$b;->bgN:Z
 
     iput-object p1, p0, Lrx/subjects/b$b;->actual:Lrx/Subscriber;
 
@@ -95,7 +95,7 @@
 .method final bV(Ljava/lang/Object;)V
     .locals 1
 
-    iget-boolean v0, p0, Lrx/subjects/b$b;->bRx:Z
+    iget-boolean v0, p0, Lrx/subjects/b$b;->bRS:Z
 
     if-nez v0, :cond_2
 
@@ -104,13 +104,13 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iput-boolean v0, p0, Lrx/subjects/b$b;->bgt:Z
+    iput-boolean v0, p0, Lrx/subjects/b$b;->bgN:Z
 
     iget-boolean v0, p0, Lrx/subjects/b$b;->emitting:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/subjects/b$b;->bRw:Ljava/util/List;
+    iget-object v0, p0, Lrx/subjects/b$b;->bRR:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -118,10 +118,10 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lrx/subjects/b$b;->bRw:Ljava/util/List;
+    iput-object v0, p0, Lrx/subjects/b$b;->bRR:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lrx/subjects/b$b;->bRw:Ljava/util/List;
+    iget-object v0, p0, Lrx/subjects/b$b;->bRR:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -136,7 +136,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/subjects/b$b;->bRx:Z
+    iput-boolean v0, p0, Lrx/subjects/b$b;->bRS:Z
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/rx/subjects/b.smali b/com.discord/smali_classes2/rx/subjects/b.smali
index 486c31af05..a04e480f3c 100644
--- a/com.discord/smali_classes2/rx/subjects/b.smali
+++ b/com.discord/smali_classes2/rx/subjects/b.smali
@@ -72,7 +72,7 @@
 .method public constructor <init>()V
     .locals 1
 
-    sget-object v0, Lrx/subjects/b$a;->bRv:Lrx/subjects/b$a;
+    sget-object v0, Lrx/subjects/b$a;->bRQ:Lrx/subjects/b$a;
 
     invoke-direct {p0, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
@@ -80,19 +80,19 @@
 
     iput-boolean v0, p0, Lrx/subjects/b;->active:Z
 
-    invoke-static {}, Lrx/functions/a;->Kq()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Ke()Lrx/functions/a$b;
 
     move-result-object v0
 
     iput-object v0, p0, Lrx/subjects/b;->onStart:Lrx/functions/Action1;
 
-    invoke-static {}, Lrx/functions/a;->Kq()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Ke()Lrx/functions/a$b;
 
     move-result-object v0
 
     iput-object v0, p0, Lrx/subjects/b;->onAdded:Lrx/functions/Action1;
 
-    invoke-static {}, Lrx/functions/a;->Kq()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Ke()Lrx/functions/a$b;
 
     move-result-object v0
 
@@ -127,7 +127,7 @@
     return-void
 
     :cond_1
-    iget-object v1, v0, Lrx/subjects/b$a;->bRs:[Lrx/subjects/b$b;
+    iget-object v1, v0, Lrx/subjects/b$a;->bRN:[Lrx/subjects/b$b;
 
     array-length v2, v1
 
@@ -141,7 +141,7 @@
 
     if-ne v3, p1, :cond_2
 
-    sget-object v1, Lrx/subjects/b$a;->bRv:Lrx/subjects/b$a;
+    sget-object v1, Lrx/subjects/b$a;->bRQ:Lrx/subjects/b$a;
 
     goto :goto_3
 
@@ -188,7 +188,7 @@
     :cond_6
     if-nez v7, :cond_7
 
-    sget-object v1, Lrx/subjects/b$a;->bRv:Lrx/subjects/b$a;
+    sget-object v1, Lrx/subjects/b$a;->bRQ:Lrx/subjects/b$a;
 
     goto :goto_3
 
@@ -254,12 +254,12 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lrx/subjects/b$a;->bRt:[Lrx/subjects/b$b;
+    sget-object p1, Lrx/subjects/b$a;->bRO:[Lrx/subjects/b$b;
 
     return-object p1
 
     :cond_0
-    sget-object p1, Lrx/subjects/b$a;->bRu:Lrx/subjects/b$a;
+    sget-object p1, Lrx/subjects/b$a;->bRP:Lrx/subjects/b$a;
 
     invoke-virtual {p0, p1}, Lrx/subjects/b;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -267,7 +267,7 @@
 
     check-cast p1, Lrx/subjects/b$a;
 
-    iget-object p1, p1, Lrx/subjects/b$a;->bRs:[Lrx/subjects/b$b;
+    iget-object p1, p1, Lrx/subjects/b$a;->bRN:[Lrx/subjects/b$b;
 
     return-object p1
 .end method
@@ -321,7 +321,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v2, v1, Lrx/subjects/b$a;->bRs:[Lrx/subjects/b$b;
+    iget-object v2, v1, Lrx/subjects/b$a;->bRN:[Lrx/subjects/b$b;
 
     array-length v2, v2
 
@@ -329,7 +329,7 @@
 
     new-array v4, v4, [Lrx/subjects/b$b;
 
-    iget-object v5, v1, Lrx/subjects/b$a;->bRs:[Lrx/subjects/b$b;
+    iget-object v5, v1, Lrx/subjects/b$a;->bRN:[Lrx/subjects/b$b;
 
     invoke-static {v5, v3, v4, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
diff --git a/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali b/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali
index 1cf83f157b..95a37f8914 100644
--- a/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali
+++ b/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private volatile bIT:Z
+.field private volatile bJn:Z
 
-.field private bRA:Ljava/util/Set;
+.field private bRV:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -42,7 +42,7 @@
 
     invoke-direct {v0, p1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    iput-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRA:Ljava/util/Set;
+    iput-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRV:Ljava/util/Set;
 
     return-void
 .end method
@@ -123,18 +123,18 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bIT:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bJn:Z
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bIT:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bJn:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRA:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRV:Ljava/util/Set;
 
     if-nez v0, :cond_1
 
@@ -144,10 +144,10 @@
 
     invoke-direct {v0, v1}, Ljava/util/HashSet;-><init>(I)V
 
-    iput-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRA:Ljava/util/Set;
+    iput-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRV:Ljava/util/Set;
 
     :cond_1
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRA:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRV:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -179,29 +179,29 @@
 .method public final clear()V
     .locals 2
 
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bIT:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bJn:Z
 
     if-nez v0, :cond_2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bIT:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bJn:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRA:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRV:Ljava/util/Set;
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRA:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRV:Ljava/util/Set;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->bRA:Ljava/util/Set;
+    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->bRV:Ljava/util/Set;
 
     monitor-exit p0
     :try_end_0
@@ -235,25 +235,25 @@
 .method public final e(Lrx/Subscription;)V
     .locals 1
 
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bIT:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bJn:Z
 
     if-nez v0, :cond_2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bIT:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bJn:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRA:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRV:Ljava/util/Set;
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRA:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRV:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
@@ -293,7 +293,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bIT:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bJn:Z
 
     return v0
 .end method
@@ -301,14 +301,14 @@
 .method public final unsubscribe()V
     .locals 2
 
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bIT:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bJn:Z
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bIT:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bJn:Z
 
     if-eqz v0, :cond_0
 
@@ -319,13 +319,13 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bIT:Z
+    iput-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bJn:Z
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRA:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bRV:Ljava/util/Set;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->bRA:Ljava/util/Set;
+    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->bRV:Ljava/util/Set;
 
     monitor-exit p0
     :try_end_0
diff --git a/com.discord/smali_classes2/rx/subscriptions/SerialSubscription.smali b/com.discord/smali_classes2/rx/subscriptions/SerialSubscription.smali
index cb64d9f1cc..3fcb8a898f 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 bRB:Lrx/internal/d/a;
+.field public final bRW:Lrx/internal/d/a;
 
 
 # direct methods
@@ -20,7 +20,7 @@
 
     invoke-direct {v0}, Lrx/internal/d/a;-><init>()V
 
-    iput-object v0, p0, Lrx/subscriptions/SerialSubscription;->bRB:Lrx/internal/d/a;
+    iput-object v0, p0, Lrx/subscriptions/SerialSubscription;->bRW:Lrx/internal/d/a;
 
     return-void
 .end method
@@ -32,7 +32,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bRB:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bRW:Lrx/internal/d/a;
 
     invoke-virtual {v0, p1}, Lrx/internal/d/a;->a(Lrx/Subscription;)Z
 
@@ -51,7 +51,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bRB:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bRW:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->isUnsubscribed()Z
 
@@ -63,7 +63,7 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bRB:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bRW:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/subscriptions/a.smali b/com.discord/smali_classes2/rx/subscriptions/a.smali
index aa353018ec..f92fd30e5d 100644
--- a/com.discord/smali_classes2/rx/subscriptions/a.smali
+++ b/com.discord/smali_classes2/rx/subscriptions/a.smali
@@ -7,11 +7,11 @@
 
 
 # static fields
-.field static final bRz:Lrx/functions/Action0;
+.field static final bRU:Lrx/functions/Action0;
 
 
 # instance fields
-.field final bRy:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bRT:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -30,7 +30,7 @@
 
     invoke-direct {v0}, Lrx/subscriptions/a$1;-><init>()V
 
-    sput-object v0, Lrx/subscriptions/a;->bRz:Lrx/functions/Action0;
+    sput-object v0, Lrx/subscriptions/a;->bRU:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lrx/subscriptions/a;->bRy:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/subscriptions/a;->bRT:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 
     invoke-direct {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lrx/subscriptions/a;->bRy:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/subscriptions/a;->bRT:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -78,13 +78,13 @@
 .method public final isUnsubscribed()Z
     .locals 2
 
-    iget-object v0, p0, Lrx/subscriptions/a;->bRy:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/subscriptions/a;->bRT:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
     move-result-object v0
 
-    sget-object v1, Lrx/subscriptions/a;->bRz:Lrx/functions/Action0;
+    sget-object v1, Lrx/subscriptions/a;->bRU:Lrx/functions/Action0;
 
     if-ne v0, v1, :cond_0
 
@@ -101,7 +101,7 @@
 .method public final unsubscribe()V
     .locals 2
 
-    iget-object v0, p0, Lrx/subscriptions/a;->bRy:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/subscriptions/a;->bRT:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -109,11 +109,11 @@
 
     check-cast v0, Lrx/functions/Action0;
 
-    sget-object v1, Lrx/subscriptions/a;->bRz:Lrx/functions/Action0;
+    sget-object v1, Lrx/subscriptions/a;->bRU:Lrx/functions/Action0;
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/subscriptions/a;->bRy:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/subscriptions/a;->bRT:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -123,7 +123,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lrx/subscriptions/a;->bRz:Lrx/functions/Action0;
+    sget-object v1, Lrx/subscriptions/a;->bRU:Lrx/functions/Action0;
 
     if-eq v0, v1, :cond_0
 
diff --git a/com.discord/smali_classes2/rx/subscriptions/b.smali b/com.discord/smali_classes2/rx/subscriptions/b.smali
index 4f87e25f1a..e0bfaa4cba 100644
--- a/com.discord/smali_classes2/rx/subscriptions/b.smali
+++ b/com.discord/smali_classes2/rx/subscriptions/b.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field final bRB:Lrx/internal/d/a;
+.field final bRW:Lrx/internal/d/a;
 
 
 # direct methods
@@ -20,7 +20,7 @@
 
     invoke-direct {v0}, Lrx/internal/d/a;-><init>()V
 
-    iput-object v0, p0, Lrx/subscriptions/b;->bRB:Lrx/internal/d/a;
+    iput-object v0, p0, Lrx/subscriptions/b;->bRW:Lrx/internal/d/a;
 
     return-void
 .end method
@@ -32,7 +32,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lrx/subscriptions/b;->bRB:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/b;->bRW:Lrx/internal/d/a;
 
     invoke-virtual {v0, p1}, Lrx/internal/d/a;->b(Lrx/Subscription;)Z
 
@@ -51,7 +51,7 @@
 .method public final isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/subscriptions/b;->bRB:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/b;->bRW:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->isUnsubscribed()Z
 
@@ -63,7 +63,7 @@
 .method public final unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/subscriptions/b;->bRB:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/b;->bRW:Lrx/internal/d/a;
 
     invoke-virtual {v0}, Lrx/internal/d/a;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/rx/subscriptions/c.smali b/com.discord/smali_classes2/rx/subscriptions/c.smali
index bed7a7c5f0..d54948817b 100644
--- a/com.discord/smali_classes2/rx/subscriptions/c.smali
+++ b/com.discord/smali_classes2/rx/subscriptions/c.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field private static final bRC:Lrx/subscriptions/c$a;
+.field private static final bRX:Lrx/subscriptions/c$a;
 
 
 # direct methods
@@ -23,15 +23,15 @@
 
     invoke-direct {v0}, Lrx/subscriptions/c$a;-><init>()V
 
-    sput-object v0, Lrx/subscriptions/c;->bRC:Lrx/subscriptions/c$a;
+    sput-object v0, Lrx/subscriptions/c;->bRX:Lrx/subscriptions/c$a;
 
     return-void
 .end method
 
-.method public static LL()Lrx/Subscription;
+.method public static Lz()Lrx/Subscription;
     .locals 1
 
-    sget-object v0, Lrx/subscriptions/c;->bRC:Lrx/subscriptions/c$a;
+    sget-object v0, Lrx/subscriptions/c;->bRX:Lrx/subscriptions/c$a;
 
     return-object v0
 .end method